diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/AdviceGenerator.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/AdviceGenerator.java
index e2f175512bf..f6ca4dad059 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/AdviceGenerator.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/AdviceGenerator.java
@@ -11,26 +11,26 @@
  */
 public interface AdviceGenerator {
 
-  @Nonnull
-  CallSiteResult generate(@Nonnull CallSiteSpecification callSite);
+    @Nonnull
+    CallSiteResult generate(@Nonnull CallSiteSpecification callSite);
 
-  final class CallSiteResult extends BaseValidationContext {
+    final class CallSiteResult extends BaseValidationContext {
 
-    private final CallSiteSpecification specification;
+        private final CallSiteSpecification specification;
 
-    private final File file;
+        private final File file;
 
-    public CallSiteResult(@Nonnull final CallSiteSpecification specification, final File file) {
-      this.specification = specification;
-      this.file = file;
-    }
+        public CallSiteResult(@Nonnull final CallSiteSpecification specification, final File file) {
+            this.specification = specification;
+            this.file = file;
+        }
 
-    public CallSiteSpecification getSpecification() {
-      return specification;
-    }
+        public CallSiteSpecification getSpecification() {
+            return specification;
+        }
 
-    public File getFile() {
-      return file;
+        public File getFile() {
+            return file;
+        }
     }
-  }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/AdvicePointcutParser.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/AdvicePointcutParser.java
index 3636f05b6e3..b339e5d8131 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/AdvicePointcutParser.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/AdvicePointcutParser.java
@@ -12,21 +12,21 @@
  */
 public interface AdvicePointcutParser {
 
-  @Nonnull
-  MethodType parse(@Nonnull String signature);
+    @Nonnull
+    MethodType parse(@Nonnull String signature);
 
-  class SignatureParsingError extends HasErrorsException {
+    class SignatureParsingError extends HasErrorsException {
 
-    public SignatureParsingError(@Nonnull final HasErrors errors) {
-      super(errors);
-    }
+        public SignatureParsingError(@Nonnull final HasErrors errors) {
+            super(errors);
+        }
 
-    public SignatureParsingError(@Nonnull final Collection<Failure> errors) {
-      super(errors);
-    }
+        public SignatureParsingError(@Nonnull final Collection<Failure> errors) {
+            super(errors);
+        }
 
-    public SignatureParsingError(@Nonnull final Failure... errors) {
-      super(errors);
+        public SignatureParsingError(@Nonnull final Failure... errors) {
+            super(errors);
+        }
     }
-  }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/CallSiteReporter.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/CallSiteReporter.java
index 20a4fa8561d..6024be8a275 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/CallSiteReporter.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/CallSiteReporter.java
@@ -15,68 +15,68 @@
 
 public interface CallSiteReporter {
 
-  void report(List<CallSiteResult> results, boolean error);
+    void report(List<CallSiteResult> results, boolean error);
 
-  static Set<CallSiteReporter> getReporter(PluginApplication.Configuration configuration) {
-    Set<CallSiteReporter> reporters = new HashSet<>();
-    for (String type : configuration.getReporters()) {
-      if ("CONSOLE".equals(type)) {
-        reporters.add(new ConsoleReporter());
-      } else if ("ERROR_CONSOLE".equals(type)) {
-        reporters.add(new ErrorConsoleReporter());
-      } else {
-        throw new IllegalArgumentException("Reporter of type '" + type + "' not supported");
-      }
+    static Set<CallSiteReporter> getReporter(PluginApplication.Configuration configuration) {
+        Set<CallSiteReporter> reporters = new HashSet<>();
+        for (String type : configuration.getReporters()) {
+            if ("CONSOLE".equals(type)) {
+                reporters.add(new ConsoleReporter());
+            } else if ("ERROR_CONSOLE".equals(type)) {
+                reporters.add(new ErrorConsoleReporter());
+            } else {
+                throw new IllegalArgumentException("Reporter of type '" + type + "' not supported");
+            }
+        }
+        return reporters;
     }
-    return reporters;
-  }
 
-  abstract class FreemarkerReporter implements CallSiteReporter {
-    private final String templateName;
+    abstract class FreemarkerReporter implements CallSiteReporter {
+        private final String templateName;
 
-    protected FreemarkerReporter(final String templateName) {
-      this.templateName = templateName;
-    }
+        protected FreemarkerReporter(final String templateName) {
+            this.templateName = templateName;
+        }
 
-    protected void write(final List<CallSiteResult> results, final Writer writer) {
-      try {
-        final Configuration cfg = new Configuration(Configuration.VERSION_2_3_30);
-        cfg.setClassLoaderForTemplateLoading(Thread.currentThread().getContextClassLoader(), "csi");
-        cfg.setDefaultEncoding("UTF-8");
-        final Map<String, Object> input = new HashMap<>();
-        input.put("results", results);
-        final Template template = cfg.getTemplate(templateName);
-        template.process(input, writer);
-      } catch (final Exception e) {
-        throw new RuntimeException(e);
-      }
+        protected void write(final List<CallSiteResult> results, final Writer writer) {
+            try {
+                final Configuration cfg = new Configuration(Configuration.VERSION_2_3_30);
+                cfg.setClassLoaderForTemplateLoading(Thread.currentThread().getContextClassLoader(), "csi");
+                cfg.setDefaultEncoding("UTF-8");
+                final Map<String, Object> input = new HashMap<>();
+                input.put("results", results);
+                final Template template = cfg.getTemplate(templateName);
+                template.process(input, writer);
+            } catch (final Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
     }
-  }
 
-  class ConsoleReporter extends FreemarkerReporter {
-    protected ConsoleReporter() {
-      super("console.ftl");
-    }
+    class ConsoleReporter extends FreemarkerReporter {
+        protected ConsoleReporter() {
+            super("console.ftl");
+        }
 
-    @Override
-    public void report(final List<CallSiteResult> results, final boolean error) {
-      final PrintStream stream = error ? System.err : System.out;
-      final StringWriter writer = new StringWriter();
-      write(results, writer);
-      stream.println(writer);
+        @Override
+        public void report(final List<CallSiteResult> results, final boolean error) {
+            final PrintStream stream = error ? System.err : System.out;
+            final StringWriter writer = new StringWriter();
+            write(results, writer);
+            stream.println(writer);
+        }
     }
-  }
 
-  class ErrorConsoleReporter extends FreemarkerReporter {
-    protected ErrorConsoleReporter() {
-      super("console.ftl");
-    }
+    class ErrorConsoleReporter extends FreemarkerReporter {
+        protected ErrorConsoleReporter() {
+            super("console.ftl");
+        }
 
-    @Override
-    public void report(final List<CallSiteResult> results, final boolean error) {
-      if (error) {
-        write(results, new PrintWriter(System.err));
-      }
+        @Override
+        public void report(final List<CallSiteResult> results, final boolean error) {
+            if (error) {
+                write(results, new PrintWriter(System.err));
+            }
+        }
     }
-  }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/Extension.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/Extension.java
index 16a5de1660e..f163bd453fd 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/Extension.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/Extension.java
@@ -10,9 +10,9 @@
 
 public interface Extension {
 
-  boolean appliesTo(@Nonnull CallSiteSpecification spec);
+    boolean appliesTo(@Nonnull CallSiteSpecification spec);
 
-  void apply(@Nonnull Configuration configuration, @Nonnull CallSiteResult result) throws Exception;
+    void apply(@Nonnull Configuration configuration, @Nonnull CallSiteResult result) throws Exception;
 
-  List<Extension> EXTENSIONS = Collections.singletonList(new IastExtension());
+    List<Extension> EXTENSIONS = Collections.singletonList(new IastExtension());
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/HasErrors.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/HasErrors.java
index fb6ab718bbc..c3f011807d3 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/HasErrors.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/HasErrors.java
@@ -13,139 +13,134 @@
 
 public interface HasErrors {
 
-  List<Failure> getErrors();
+    List<Failure> getErrors();
 
-  void addError(@Nonnull Failure failure);
+    void addError(@Nonnull Failure failure);
 
-  default void addError(@Nonnull final ErrorCode error, final Object... args) {
-    addError(new Failure(error, args));
-  }
-
-  default void addError(
-      @Nonnull final Throwable cause, @Nonnull final ErrorCode error, final Object... args) {
-    addError(new Failure(cause, error, args));
-  }
-
-  default boolean isSuccess() {
-    return !getErrors().isEmpty();
-  }
-
-  final class Failure {
-    private final ErrorCode error;
-    private final Object[] params;
-    private final Throwable cause;
-
-    public Failure(@Nonnull final ErrorCode error, @Nonnull final Object... params) {
-      this.error = error;
-      this.params = params;
-      this.cause = null;
+    default void addError(@Nonnull final ErrorCode error, final Object... args) {
+        addError(new Failure(error, args));
     }
 
-    public Failure(
-        @Nonnull final Throwable cause,
-        @Nonnull final ErrorCode error,
-        @Nonnull final Object... params) {
-      this.error = error;
-      this.params = params;
-      this.cause = cause;
+    default void addError(@Nonnull final Throwable cause, @Nonnull final ErrorCode error, final Object... args) {
+        addError(new Failure(cause, error, args));
     }
 
-    public ErrorCode getErrorCode() {
-      return error;
+    default boolean isSuccess() {
+        return !getErrors().isEmpty();
     }
 
-    public Object[] getParams() {
-      return params;
-    }
+    final class Failure {
+        private final ErrorCode error;
+        private final Object[] params;
+        private final Throwable cause;
 
-    public Throwable getCause() {
-      return cause;
-    }
+        public Failure(@Nonnull final ErrorCode error, @Nonnull final Object... params) {
+            this.error = error;
+            this.params = params;
+            this.cause = null;
+        }
 
-    public String getCauseString() {
-      if (cause == null) {
-        return null;
-      }
-      StringWriter writer = new StringWriter();
-      cause.printStackTrace(new PrintWriter(writer));
-      return writer.toString();
-    }
+        public Failure(
+                @Nonnull final Throwable cause, @Nonnull final ErrorCode error, @Nonnull final Object... params) {
+            this.error = error;
+            this.params = params;
+            this.cause = cause;
+        }
 
-    public String getMessage() {
-      return error.apply(params);
-    }
+        public ErrorCode getErrorCode() {
+            return error;
+        }
 
-    @Override
-    public String toString() {
-      return error.name();
-    }
-  }
+        public Object[] getParams() {
+            return params;
+        }
 
-  class HasErrorsImpl implements HasErrors {
+        public Throwable getCause() {
+            return cause;
+        }
 
-    private final List<Failure> errors;
+        public String getCauseString() {
+            if (cause == null) {
+                return null;
+            }
+            StringWriter writer = new StringWriter();
+            cause.printStackTrace(new PrintWriter(writer));
+            return writer.toString();
+        }
 
-    public HasErrorsImpl(@Nonnull final Collection<Failure> errors) {
-      this.errors = new ArrayList<>(errors);
-    }
+        public String getMessage() {
+            return error.apply(params);
+        }
 
-    public HasErrorsImpl(@Nonnull final Failure... errors) {
-      this(Arrays.asList(errors));
+        @Override
+        public String toString() {
+            return error.name();
+        }
     }
 
-    public List<Failure> getErrors() {
-      return errors;
-    }
+    class HasErrorsImpl implements HasErrors {
 
-    @Override
-    public boolean isSuccess() {
-      return errors.isEmpty();
-    }
+        private final List<Failure> errors;
 
-    @Override
-    public void addError(@Nonnull final Failure failure) {
-      errors.add(failure);
-    }
-  }
+        public HasErrorsImpl(@Nonnull final Collection<Failure> errors) {
+            this.errors = new ArrayList<>(errors);
+        }
 
-  class HasErrorsException extends RuntimeException implements HasErrors {
-    private final HasErrors errors;
+        public HasErrorsImpl(@Nonnull final Failure... errors) {
+            this(Arrays.asList(errors));
+        }
 
-    public HasErrorsException(@Nonnull final HasErrors errors) {
-      super(buildMessage(errors), firstCause(errors));
-      this.errors = errors;
-    }
+        public List<Failure> getErrors() {
+            return errors;
+        }
 
-    public HasErrorsException(@Nonnull final Collection<Failure> errors) {
-      this(new HasErrorsImpl(errors));
-    }
+        @Override
+        public boolean isSuccess() {
+            return errors.isEmpty();
+        }
 
-    public HasErrorsException(@Nonnull final Failure... errors) {
-      this(new HasErrorsImpl(errors));
+        @Override
+        public void addError(@Nonnull final Failure failure) {
+            errors.add(failure);
+        }
     }
 
-    @Override
-    public List<Failure> getErrors() {
-      return errors.getErrors();
-    }
+    class HasErrorsException extends RuntimeException implements HasErrors {
+        private final HasErrors errors;
 
-    @Override
-    public void addError(@Nonnull final Failure failure) {
-      errors.addError(failure);
-    }
+        public HasErrorsException(@Nonnull final HasErrors errors) {
+            super(buildMessage(errors), firstCause(errors));
+            this.errors = errors;
+        }
 
-    private static String buildMessage(@Nonnull final HasErrors errors) {
-      return errors.getErrors().stream()
-          .map(Failure::getMessage)
-          .collect(Collectors.joining(" | "));
-    }
+        public HasErrorsException(@Nonnull final Collection<Failure> errors) {
+            this(new HasErrorsImpl(errors));
+        }
+
+        public HasErrorsException(@Nonnull final Failure... errors) {
+            this(new HasErrorsImpl(errors));
+        }
 
-    private static Throwable firstCause(@Nonnull final HasErrors errors) {
-      return errors.getErrors().stream()
-          .map(Failure::getCause)
-          .filter(Objects::nonNull)
-          .findFirst()
-          .orElse(null);
+        @Override
+        public List<Failure> getErrors() {
+            return errors.getErrors();
+        }
+
+        @Override
+        public void addError(@Nonnull final Failure failure) {
+            errors.addError(failure);
+        }
+
+        private static String buildMessage(@Nonnull final HasErrors errors) {
+            return errors.getErrors().stream().map(Failure::getMessage).collect(Collectors.joining(" | "));
+        }
+
+        private static Throwable firstCause(@Nonnull final HasErrors errors) {
+            return errors.getErrors().stream()
+                    .map(Failure::getCause)
+                    .filter(Objects::nonNull)
+                    .findFirst()
+                    .orElse(null);
+        }
     }
-  }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/PluginApplication.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/PluginApplication.java
index 341c66f15ad..8714bb9b219 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/PluginApplication.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/PluginApplication.java
@@ -26,153 +26,144 @@
 
 public class PluginApplication {
 
-  public static void main(final String[] args) {
-    try {
-      final Path parameters = getParameters(args);
-      final Configuration configuration = getConfiguration(parameters);
-      final List<CallSiteSpecification> specs = searchForCallSites(configuration);
-      final List<CallSiteResult> result =
-          specs.stream().map(generateAdviceClosure(configuration)).collect(Collectors.toList());
-      final boolean failed = result.stream().anyMatch(it -> !it.isSuccess());
-      printReport(configuration, result, failed);
-      System.exit(failed ? 1 : 0);
-    } catch (final RuntimeException e) {
-      e.printStackTrace(System.err);
-      System.exit(1);
+    public static void main(final String[] args) {
+        try {
+            final Path parameters = getParameters(args);
+            final Configuration configuration = getConfiguration(parameters);
+            final List<CallSiteSpecification> specs = searchForCallSites(configuration);
+            final List<CallSiteResult> result =
+                    specs.stream().map(generateAdviceClosure(configuration)).collect(Collectors.toList());
+            final boolean failed = result.stream().anyMatch(it -> !it.isSuccess());
+            printReport(configuration, result, failed);
+            System.exit(failed ? 1 : 0);
+        } catch (final RuntimeException e) {
+            e.printStackTrace(System.err);
+            System.exit(1);
+        }
     }
-  }
-
-  private static Function<CallSiteSpecification, CallSiteResult> generateAdviceClosure(
-      final Configuration configuration) {
-    final AdviceGenerator adviceGenerator = getAdviceGenerator(configuration);
-    return spec -> {
-      final CallSiteResult result = adviceGenerator.generate(spec);
-      if (result.isSuccess()) {
-        Extension.EXTENSIONS.stream()
-            .filter(ext -> ext.appliesTo(spec))
-            .forEach(
-                ext -> {
-                  try {
-                    ext.apply(configuration, result);
-                  } catch (final Throwable e) {
-                    result.addError(e, ErrorCode.EXTENSION_ERROR, ext.getClass());
-                  }
+
+    private static Function<CallSiteSpecification, CallSiteResult> generateAdviceClosure(
+            final Configuration configuration) {
+        final AdviceGenerator adviceGenerator = getAdviceGenerator(configuration);
+        return spec -> {
+            final CallSiteResult result = adviceGenerator.generate(spec);
+            if (result.isSuccess()) {
+                Extension.EXTENSIONS.stream().filter(ext -> ext.appliesTo(spec)).forEach(ext -> {
+                    try {
+                        ext.apply(configuration, result);
+                    } catch (final Throwable e) {
+                        result.addError(e, ErrorCode.EXTENSION_ERROR, ext.getClass());
+                    }
                 });
-      }
-      return result;
-    };
-  }
-
-  private static void printReport(
-      final Configuration configuration, final List<CallSiteResult> result, final boolean failed) {
-    CallSiteReporter.getReporter(configuration)
-        .forEach(reporter -> reporter.report(result, failed));
-  }
-
-  private static List<CallSiteSpecification> searchForCallSites(final Configuration configuration) {
-    try {
-      final SpecificationBuilder builder = specificationBuilder();
-      final List<CallSiteSpecification> result = new ArrayList<>();
-      final Pattern pattern = Pattern.compile(".*" + configuration.suffix + "\\.class$");
-      Files.walkFileTree(
-          configuration.classesFolder,
-          new SimpleFileVisitor<Path>() {
-            public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) {
-              if (Files.isRegularFile(file)
-                  && pattern.matcher(file.getFileName().toString()).matches()) {
-                builder.build(file.toFile()).ifPresent(result::add);
-              }
-              return FileVisitResult.CONTINUE;
             }
-          });
-      return result;
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private static AdviceGenerator getAdviceGenerator(final Configuration configuration) {
-    final URL[] urls =
-        configuration.classPath.stream().map(CallSiteUtils::toURL).toArray(URL[]::new);
-    final ClassLoader loader = new URLClassLoader(urls);
-    final TypeResolver resolver = typeResolver(loader);
-    return adviceGenerator(configuration.targetFolder.toFile(), resolver);
-  }
-
-  private static Configuration getConfiguration(final Path parameters) {
-    try {
-      final List<String> lines = Files.readAllLines(parameters);
-      final Path projectFolder = Paths.get(lines.get(0));
-      final Path classesFolder = Paths.get(lines.get(1));
-      final Path targetFolder = Paths.get(lines.get(2));
-      final String suffix = lines.get(3).trim();
-      final List<String> reporters = Arrays.asList(lines.get(4).trim().split(","));
-      final List<Path> classPaths =
-          lines.stream().skip(5).map(Paths::get).collect(Collectors.toList());
-      return new Configuration(
-          projectFolder, classesFolder, targetFolder, classPaths, suffix, reporters);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private static Path getParameters(final String[] args) {
-    if (args.length != 1) {
-      throw new IllegalArgumentException(
-          "The application expected a single parameter with the configuration");
-    }
-    final Path parameters = Paths.get(args[0]);
-    if (!Files.exists(parameters)) {
-      throw new IllegalArgumentException("File '" + parameters + "' not found%n");
-    }
-    return parameters;
-  }
-
-  public static class Configuration {
-    private final Path srcFolder;
-    private final Path classesFolder;
-    private final Path targetFolder;
-    private final List<Path> classPath;
-    private final String suffix;
-    private final List<String> reporters;
-
-    public Configuration(
-        final Path srcFolder,
-        final Path classesFolder,
-        final Path targetFolder,
-        final List<Path> classPath,
-        final String suffix,
-        final List<String> reporters) {
-      this.srcFolder = srcFolder;
-      this.classesFolder = classesFolder;
-      this.targetFolder = targetFolder;
-      this.classPath = classPath;
-      this.suffix = suffix;
-      this.reporters = reporters;
+            return result;
+        };
     }
 
-    public Path getSrcFolder() {
-      return srcFolder;
+    private static void printReport(
+            final Configuration configuration, final List<CallSiteResult> result, final boolean failed) {
+        CallSiteReporter.getReporter(configuration).forEach(reporter -> reporter.report(result, failed));
     }
 
-    public Path getClassesFolder() {
-      return classesFolder;
+    private static List<CallSiteSpecification> searchForCallSites(final Configuration configuration) {
+        try {
+            final SpecificationBuilder builder = specificationBuilder();
+            final List<CallSiteSpecification> result = new ArrayList<>();
+            final Pattern pattern = Pattern.compile(".*" + configuration.suffix + "\\.class$");
+            Files.walkFileTree(configuration.classesFolder, new SimpleFileVisitor<Path>() {
+                public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) {
+                    if (Files.isRegularFile(file)
+                            && pattern.matcher(file.getFileName().toString()).matches()) {
+                        builder.build(file.toFile()).ifPresent(result::add);
+                    }
+                    return FileVisitResult.CONTINUE;
+                }
+            });
+            return result;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    public Path getTargetFolder() {
-      return targetFolder;
+    private static AdviceGenerator getAdviceGenerator(final Configuration configuration) {
+        final URL[] urls =
+                configuration.classPath.stream().map(CallSiteUtils::toURL).toArray(URL[]::new);
+        final ClassLoader loader = new URLClassLoader(urls);
+        final TypeResolver resolver = typeResolver(loader);
+        return adviceGenerator(configuration.targetFolder.toFile(), resolver);
     }
 
-    public List<Path> getClassPath() {
-      return classPath;
+    private static Configuration getConfiguration(final Path parameters) {
+        try {
+            final List<String> lines = Files.readAllLines(parameters);
+            final Path projectFolder = Paths.get(lines.get(0));
+            final Path classesFolder = Paths.get(lines.get(1));
+            final Path targetFolder = Paths.get(lines.get(2));
+            final String suffix = lines.get(3).trim();
+            final List<String> reporters = Arrays.asList(lines.get(4).trim().split(","));
+            final List<Path> classPaths = lines.stream().skip(5).map(Paths::get).collect(Collectors.toList());
+            return new Configuration(projectFolder, classesFolder, targetFolder, classPaths, suffix, reporters);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    public String getSuffix() {
-      return suffix;
+    private static Path getParameters(final String[] args) {
+        if (args.length != 1) {
+            throw new IllegalArgumentException("The application expected a single parameter with the configuration");
+        }
+        final Path parameters = Paths.get(args[0]);
+        if (!Files.exists(parameters)) {
+            throw new IllegalArgumentException("File '" + parameters + "' not found%n");
+        }
+        return parameters;
     }
 
-    public List<String> getReporters() {
-      return reporters;
+    public static class Configuration {
+        private final Path srcFolder;
+        private final Path classesFolder;
+        private final Path targetFolder;
+        private final List<Path> classPath;
+        private final String suffix;
+        private final List<String> reporters;
+
+        public Configuration(
+                final Path srcFolder,
+                final Path classesFolder,
+                final Path targetFolder,
+                final List<Path> classPath,
+                final String suffix,
+                final List<String> reporters) {
+            this.srcFolder = srcFolder;
+            this.classesFolder = classesFolder;
+            this.targetFolder = targetFolder;
+            this.classPath = classPath;
+            this.suffix = suffix;
+            this.reporters = reporters;
+        }
+
+        public Path getSrcFolder() {
+            return srcFolder;
+        }
+
+        public Path getClassesFolder() {
+            return classesFolder;
+        }
+
+        public Path getTargetFolder() {
+            return targetFolder;
+        }
+
+        public List<Path> getClassPath() {
+            return classPath;
+        }
+
+        public String getSuffix() {
+            return suffix;
+        }
+
+        public List<String> getReporters() {
+            return reporters;
+        }
     }
-  }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/SpecificationBuilder.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/SpecificationBuilder.java
index 1fc40be8bf5..c5056d9d5e8 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/SpecificationBuilder.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/SpecificationBuilder.java
@@ -14,6 +14,6 @@
  */
 public interface SpecificationBuilder {
 
-  @Nonnull
-  Optional<CallSiteSpecification> build(@Nonnull File classFile);
+    @Nonnull
+    Optional<CallSiteSpecification> build(@Nonnull File classFile);
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/TypeResolver.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/TypeResolver.java
index 666a460a3d1..460f9407dfd 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/TypeResolver.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/TypeResolver.java
@@ -10,24 +10,24 @@
 
 public interface TypeResolver extends TypeSolver {
 
-  @Nonnull
-  Class<?> resolveType(@Nonnull Type type) throws ResolutionException;
+    @Nonnull
+    Class<?> resolveType(@Nonnull Type type) throws ResolutionException;
 
-  @Nonnull
-  Executable resolveMethod(@Nonnull MethodType method) throws ResolutionException;
+    @Nonnull
+    Executable resolveMethod(@Nonnull MethodType method) throws ResolutionException;
 
-  class ResolutionException extends HasErrorsException {
+    class ResolutionException extends HasErrorsException {
 
-    public ResolutionException(@Nonnull final HasErrors errors) {
-      super(errors);
-    }
+        public ResolutionException(@Nonnull final HasErrors errors) {
+            super(errors);
+        }
 
-    public ResolutionException(@Nonnull final Collection<Failure> errors) {
-      super(errors);
-    }
+        public ResolutionException(@Nonnull final Collection<Failure> errors) {
+            super(errors);
+        }
 
-    public ResolutionException(@Nonnull final Failure... errors) {
-      super(errors);
+        public ResolutionException(@Nonnull final Failure... errors) {
+            super(errors);
+        }
     }
-  }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/Validatable.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/Validatable.java
index 9c8570caf49..f5ad45b436f 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/Validatable.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/Validatable.java
@@ -4,5 +4,5 @@
 
 public interface Validatable {
 
-  void validate(@Nonnull ValidationContext context);
+    void validate(@Nonnull ValidationContext context);
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/ValidationContext.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/ValidationContext.java
index 719d77cc406..9962815a3bb 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/ValidationContext.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/ValidationContext.java
@@ -5,23 +5,23 @@
 import javax.annotation.Nonnull;
 
 public interface ValidationContext extends HasErrors {
-  <E> E getContextProperty(@Nonnull String name);
+    <E> E getContextProperty(@Nonnull String name);
 
-  void addContextProperty(@Nonnull String name, Object object);
+    void addContextProperty(@Nonnull String name, Object object);
 
-  class BaseValidationContext extends HasErrorsImpl implements ValidationContext {
+    class BaseValidationContext extends HasErrorsImpl implements ValidationContext {
 
-    private final Map<String, Object> context = new HashMap<>();
+        private final Map<String, Object> context = new HashMap<>();
 
-    @SuppressWarnings("unchecked")
-    @Override
-    public final <E> E getContextProperty(@Nonnull final String name) {
-      return (E) context.get(name);
-    }
+        @SuppressWarnings("unchecked")
+        @Override
+        public final <E> E getContextProperty(@Nonnull final String name) {
+            return (E) context.get(name);
+        }
 
-    @Override
-    public final void addContextProperty(@Nonnull final String name, final Object object) {
-      context.put(name, object);
+        @Override
+        public final void addContextProperty(@Nonnull final String name, final Object object) {
+            context.put(name, object);
+        }
     }
-  }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/AdviceGeneratorImpl.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/AdviceGeneratorImpl.java
index d517834c3a6..3746cbb0165 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/AdviceGeneratorImpl.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/AdviceGeneratorImpl.java
@@ -70,396 +70,367 @@
 @SuppressWarnings("OptionalGetWithoutIsPresent")
 public class AdviceGeneratorImpl implements AdviceGenerator {
 
-  private final File targetFolder;
-  private final AdvicePointcutParser pointcutParser;
-  private final TypeResolver typeResolver;
+    private final File targetFolder;
+    private final AdvicePointcutParser pointcutParser;
+    private final TypeResolver typeResolver;
 
-  public AdviceGeneratorImpl(
-      @Nonnull final File targetFolder, @Nonnull final AdvicePointcutParser pointcutParser) {
-    this(targetFolder, pointcutParser, typeResolver());
-  }
+    public AdviceGeneratorImpl(@Nonnull final File targetFolder, @Nonnull final AdvicePointcutParser pointcutParser) {
+        this(targetFolder, pointcutParser, typeResolver());
+    }
 
-  public AdviceGeneratorImpl(
-      @Nonnull final File targetFolder,
-      @Nonnull final AdvicePointcutParser pointcutParser,
-      @Nonnull final TypeResolver typeResolver) {
-    this.targetFolder = targetFolder;
-    this.pointcutParser = pointcutParser;
-    this.typeResolver = typeResolver;
-  }
+    public AdviceGeneratorImpl(
+            @Nonnull final File targetFolder,
+            @Nonnull final AdvicePointcutParser pointcutParser,
+            @Nonnull final TypeResolver typeResolver) {
+        this.targetFolder = targetFolder;
+        this.pointcutParser = pointcutParser;
+        this.typeResolver = typeResolver;
+    }
 
-  @Override
-  @Nonnull
-  public CallSiteResult generate(@Nonnull final CallSiteSpecification spec) {
-    final Type callSitesType =
-        Type.getType(String.format("L%ss;", spec.getClazz().getInternalName()));
-    final File callSitesFile = new File(targetFolder, callSitesType.getInternalName() + ".java");
-    final CallSiteResult result = new CallSiteResult(spec, callSitesFile);
-    result.addContextProperty(TYPE_RESOLVER, typeResolver);
-    try {
-      spec.validate(result);
-      if (result.isSuccess()) {
-        final CompilationUnit javaClass = buildJavaClass(spec, callSitesType, callSitesFile);
-        final ClassOrInterfaceDeclaration mainType = getPrimaryType(javaClass);
-        final BlockStmt acceptBody = new BlockStmt();
-        mainType
-            .addMethod("accept", PUBLIC)
-            .setType(void.class)
-            .setBody(acceptBody)
-            .addAnnotation(Override.class.getName())
-            .setParameters(
-                new NodeList<>(new Parameter().setName("container").setType("Container")));
-        if (spec.getEnabled() != null) {
-          addEnabledCheck(mainType, spec.getEnabled());
-        }
-        addHelpersInvocation(spec.getHelpers(), acceptBody);
-        for (final AdviceSpecification advice : spec.getAdvices()) {
-          try {
-            advice.parseSignature(pointcutParser);
-            advice.validate(result);
+    @Override
+    @Nonnull
+    public CallSiteResult generate(@Nonnull final CallSiteSpecification spec) {
+        final Type callSitesType =
+                Type.getType(String.format("L%ss;", spec.getClazz().getInternalName()));
+        final File callSitesFile = new File(targetFolder, callSitesType.getInternalName() + ".java");
+        final CallSiteResult result = new CallSiteResult(spec, callSitesFile);
+        result.addContextProperty(TYPE_RESOLVER, typeResolver);
+        try {
+            spec.validate(result);
             if (result.isSuccess()) {
-              addAdviceLambda(advice, acceptBody);
+                final CompilationUnit javaClass = buildJavaClass(spec, callSitesType, callSitesFile);
+                final ClassOrInterfaceDeclaration mainType = getPrimaryType(javaClass);
+                final BlockStmt acceptBody = new BlockStmt();
+                mainType.addMethod("accept", PUBLIC)
+                        .setType(void.class)
+                        .setBody(acceptBody)
+                        .addAnnotation(Override.class.getName())
+                        .setParameters(new NodeList<>(
+                                new Parameter().setName("container").setType("Container")));
+                if (spec.getEnabled() != null) {
+                    addEnabledCheck(mainType, spec.getEnabled());
+                }
+                addHelpersInvocation(spec.getHelpers(), acceptBody);
+                for (final AdviceSpecification advice : spec.getAdvices()) {
+                    try {
+                        advice.parseSignature(pointcutParser);
+                        advice.validate(result);
+                        if (result.isSuccess()) {
+                            addAdviceLambda(advice, acceptBody);
+                        }
+                    } catch (Throwable e) {
+                        handleThrowable(result, e);
+                    }
+                }
+                javaClass.getStorage().get().save();
             }
-          } catch (Throwable e) {
+        } catch (Throwable e) {
             handleThrowable(result, e);
-          }
         }
-        javaClass.getStorage().get().save();
-      }
-    } catch (Throwable e) {
-      handleThrowable(result, e);
-    }
-    if (!result.isSuccess()) {
-      deleteFile(callSitesFile);
+        if (!result.isSuccess()) {
+            deleteFile(callSitesFile);
+        }
+        return result;
     }
-    return result;
-  }
 
-  private static CompilationUnit buildJavaClass(
-      final CallSiteSpecification spec, final Type type, final File javaFile) {
-    final CompilationUnit javaClass = new CompilationUnit();
-    javaClass.setStorage(javaFile.toPath());
-    final String packageName = getPackageName(spec.getClazz());
-    if (packageName != null) {
-      javaClass.setPackageDeclaration(getPackageName(spec.getClazz()));
+    private static CompilationUnit buildJavaClass(
+            final CallSiteSpecification spec, final Type type, final File javaFile) {
+        final CompilationUnit javaClass = new CompilationUnit();
+        javaClass.setStorage(javaFile.toPath());
+        final String packageName = getPackageName(spec.getClazz());
+        if (packageName != null) {
+            javaClass.setPackageDeclaration(getPackageName(spec.getClazz()));
+        }
+        javaClass.addImport(OPCODES_FQDN);
+        javaClass.addImport(HANDLE_FQDN);
+        javaClass.addImport(CALL_SITES_FQCN);
+        javaClass.addImport(CALL_SITE_ADVICE_FQCN + ".*");
+        final ClassOrInterfaceDeclaration javaType = callSitesType(javaClass, spec, type);
+        addAutoServiceAnnotation(javaType, spec);
+        return javaClass;
     }
-    javaClass.addImport(OPCODES_FQDN);
-    javaClass.addImport(HANDLE_FQDN);
-    javaClass.addImport(CALL_SITES_FQCN);
-    javaClass.addImport(CALL_SITE_ADVICE_FQCN + ".*");
-    final ClassOrInterfaceDeclaration javaType = callSitesType(javaClass, spec, type);
-    addAutoServiceAnnotation(javaType, spec);
-    return javaClass;
-  }
 
-  private static ClassOrInterfaceDeclaration callSitesType(
-      final CompilationUnit javaClass, final CallSiteSpecification callSite, final Type advice) {
-    final ClassOrInterfaceDeclaration type = new ClassOrInterfaceDeclaration();
-    type.setModifier(PUBLIC, true);
-    type.setName(getClassName(advice));
-    type.addImplementedType(CALL_SITES_CLASS);
-    for (final Type spi : callSite.getSpi()) {
-      if (!CALL_SITES_FQCN.equals(spi.getClassName())) {
-        javaClass.addImport(spi.getClassName());
-        type.addImplementedType(getClassName(spi, false));
-      }
+    private static ClassOrInterfaceDeclaration callSitesType(
+            final CompilationUnit javaClass, final CallSiteSpecification callSite, final Type advice) {
+        final ClassOrInterfaceDeclaration type = new ClassOrInterfaceDeclaration();
+        type.setModifier(PUBLIC, true);
+        type.setName(getClassName(advice));
+        type.addImplementedType(CALL_SITES_CLASS);
+        for (final Type spi : callSite.getSpi()) {
+            if (!CALL_SITES_FQCN.equals(spi.getClassName())) {
+                javaClass.addImport(spi.getClassName());
+                type.addImplementedType(getClassName(spi, false));
+            }
+        }
+        javaClass.addType(type);
+        return type;
     }
-    javaClass.addType(type);
-    return type;
-  }
 
-  private static void addAutoServiceAnnotation(
-      final ClassOrInterfaceDeclaration javaClass, final CallSiteSpecification callSite) {
-    final NormalAnnotationExpr autoService = new NormalAnnotationExpr();
-    autoService.setName(AUTO_SERVICE_FQDN);
-    final Type[] spiTypes = callSite.getSpi();
-    final List<Expression> spiExprs = new ArrayList<>(spiTypes.length);
-    for (final Type spi : spiTypes) {
-      spiExprs.add(new ClassExpr(new ClassOrInterfaceType().setName(getClassName(spi, false))));
+    private static void addAutoServiceAnnotation(
+            final ClassOrInterfaceDeclaration javaClass, final CallSiteSpecification callSite) {
+        final NormalAnnotationExpr autoService = new NormalAnnotationExpr();
+        autoService.setName(AUTO_SERVICE_FQDN);
+        final Type[] spiTypes = callSite.getSpi();
+        final List<Expression> spiExprs = new ArrayList<>(spiTypes.length);
+        for (final Type spi : spiTypes) {
+            spiExprs.add(new ClassExpr(new ClassOrInterfaceType().setName(getClassName(spi, false))));
+        }
+        autoService.addPair("value", new ArrayInitializerExpr().setValues(new NodeList<>(spiExprs)));
+        javaClass.addAnnotation(autoService);
     }
-    autoService.addPair("value", new ArrayInitializerExpr().setValues(new NodeList<>(spiExprs)));
-    javaClass.addAnnotation(autoService);
-  }
 
-  private void addAdviceLambda(
-      @Nonnull final AdviceSpecification spec, @Nonnull final BlockStmt body) {
-    final MethodType pointCut = spec.getPointcut();
-    final BlockStmt adviceBody = new BlockStmt();
-    final Expression advice;
-    final String type;
-    if (spec.isInvokeDynamic()) {
-      advice = invokeDynamicAdviceSignature(adviceBody);
-    } else {
-      advice = invokeAdviceSignature(adviceBody);
-    }
-    if (spec instanceof BeforeSpecification) {
-      type = "BEFORE";
-      writeStackOperations(spec, adviceBody);
-      writeAdviceMethodCall(spec, adviceBody);
-      writeOriginalMethodCall(spec, adviceBody);
-    } else if (spec instanceof AfterSpecification) {
-      type = "AFTER";
-      writeStackOperations(spec, adviceBody);
-      writeOriginalMethodCall(spec, adviceBody);
-      writeAdviceMethodCall(spec, adviceBody);
-    } else {
-      type = "AROUND";
-      writeAdviceMethodCall(spec, adviceBody);
+    private void addAdviceLambda(@Nonnull final AdviceSpecification spec, @Nonnull final BlockStmt body) {
+        final MethodType pointCut = spec.getPointcut();
+        final BlockStmt adviceBody = new BlockStmt();
+        final Expression advice;
+        final String type;
+        if (spec.isInvokeDynamic()) {
+            advice = invokeDynamicAdviceSignature(adviceBody);
+        } else {
+            advice = invokeAdviceSignature(adviceBody);
+        }
+        if (spec instanceof BeforeSpecification) {
+            type = "BEFORE";
+            writeStackOperations(spec, adviceBody);
+            writeAdviceMethodCall(spec, adviceBody);
+            writeOriginalMethodCall(spec, adviceBody);
+        } else if (spec instanceof AfterSpecification) {
+            type = "AFTER";
+            writeStackOperations(spec, adviceBody);
+            writeOriginalMethodCall(spec, adviceBody);
+            writeAdviceMethodCall(spec, adviceBody);
+        } else {
+            type = "AROUND";
+            writeAdviceMethodCall(spec, adviceBody);
+        }
+        body.addStatement(new MethodCallExpr()
+                .setScope(new NameExpr("container"))
+                .setName("addAdvice")
+                .setArguments(new NodeList<>(
+                        new FieldAccessExpr()
+                                .setScope(new TypeExpr(new ClassOrInterfaceType().setName(ADVICE_TYPE_CLASS)))
+                                .setName(type),
+                        new StringLiteralExpr(pointCut.getOwner().getInternalName()),
+                        new StringLiteralExpr(pointCut.getMethodName()),
+                        new StringLiteralExpr(pointCut.getMethodType().getDescriptor()),
+                        advice)));
     }
-    body.addStatement(
-        new MethodCallExpr()
-            .setScope(new NameExpr("container"))
-            .setName("addAdvice")
-            .setArguments(
-                new NodeList<>(
-                    new FieldAccessExpr()
-                        .setScope(
-                            new TypeExpr(new ClassOrInterfaceType().setName(ADVICE_TYPE_CLASS)))
-                        .setName(type),
-                    new StringLiteralExpr(pointCut.getOwner().getInternalName()),
-                    new StringLiteralExpr(pointCut.getMethodName()),
-                    new StringLiteralExpr(pointCut.getMethodType().getDescriptor()),
-                    advice)));
-  }
 
-  private static void addHelpersInvocation(final Type[] helpers, final BlockStmt body) {
-    if (helpers != null && helpers.length > 0) {
-      final List<Expression> helperTypes =
-          Arrays.stream(helpers)
-              .map(type -> new StringLiteralExpr(type.getClassName()))
-              .collect(Collectors.toList());
-      body.addStatement(
-          new MethodCallExpr()
-              .setScope(new NameExpr("container"))
-              .setName("addHelpers")
-              .setArguments(new NodeList<>(helperTypes)));
+    private static void addHelpersInvocation(final Type[] helpers, final BlockStmt body) {
+        if (helpers != null && helpers.length > 0) {
+            final List<Expression> helperTypes = Arrays.stream(helpers)
+                    .map(type -> new StringLiteralExpr(type.getClassName()))
+                    .collect(Collectors.toList());
+            body.addStatement(new MethodCallExpr()
+                    .setScope(new NameExpr("container"))
+                    .setName("addHelpers")
+                    .setArguments(new NodeList<>(helperTypes)));
+        }
     }
-  }
 
-  private static void addEnabledCheck(
-      final ClassOrInterfaceDeclaration type, final Enabled enabled) {
-    type.addImplementedType(HAS_ENABLED_PROPERTY_CLASS);
+    private static void addEnabledCheck(final ClassOrInterfaceDeclaration type, final Enabled enabled) {
+        type.addImplementedType(HAS_ENABLED_PROPERTY_CLASS);
 
-    final MethodType method = enabled.getMethod();
-    final String ownerPackage = getPackageName(method.getOwner());
-    final String ownerClassName = getClassName(method.getOwner(), false);
-    final List<Expression> parameters =
-        enabled.getArguments().stream().map(StringLiteralExpr::new).collect(Collectors.toList());
+        final MethodType method = enabled.getMethod();
+        final String ownerPackage = getPackageName(method.getOwner());
+        final String ownerClassName = getClassName(method.getOwner(), false);
+        final List<Expression> parameters =
+                enabled.getArguments().stream().map(StringLiteralExpr::new).collect(Collectors.toList());
 
-    final Expression enabledCheckExpression =
-        new MethodCallExpr()
-            .setScope(new NameExpr(ownerPackage + "." + ownerClassName))
-            .setName(method.getMethodName())
-            .setArguments(new NodeList<>(parameters));
+        final Expression enabledCheckExpression = new MethodCallExpr()
+                .setScope(new NameExpr(ownerPackage + "." + ownerClassName))
+                .setName(method.getMethodName())
+                .setArguments(new NodeList<>(parameters));
 
-    type.addMethod("isEnabled", PUBLIC)
-        .setType(boolean.class)
-        .addAnnotation(Override.class)
-        .setBody(
-            new BlockStmt().addStatement(new ReturnStmt().setExpression(enabledCheckExpression)));
-  }
+        type.addMethod("isEnabled", PUBLIC)
+                .setType(boolean.class)
+                .addAnnotation(Override.class)
+                .setBody(new BlockStmt().addStatement(new ReturnStmt().setExpression(enabledCheckExpression)));
+    }
 
-  private static void writeStackOperations(final AdviceSpecification advice, final BlockStmt body) {
-    final boolean instanceMethod = !advice.isStaticPointcut();
-    final AllArgsSpecification allArgsSpec = advice.findAllArguments();
-    if (allArgsSpec == null && advice.isPositionalArguments()) {
-      final List<Expression> parameterIndicesValues =
-          advice
-              .getArguments()
-              .map(argSpec -> intLiteral(argSpec.getIndex()))
-              .collect(Collectors.toList());
-      final VariableDeclarator parameterIndices =
-          new VariableDeclarator()
-              .setName("parameterIndices")
-              .setType(new ArrayType(new PrimitiveType(PrimitiveType.Primitive.INT)))
-              .setInitializer(
-                  new ArrayCreationExpr()
-                      .setElementType(int.class)
-                      .setInitializer(
-                          new ArrayInitializerExpr()
-                              .setValues(new NodeList<>(parameterIndicesValues))));
-      body.addStatement(new VariableDeclarationExpr().addVariable(parameterIndices));
-      final MethodCallExpr dupMethod = new MethodCallExpr().setScope(new NameExpr("handler"));
-      if (advice.includeThis()) {
-        dupMethod.setName("dupInvoke");
-        dupMethod.addArgument(new NameExpr("owner"));
-        dupMethod.addArgument(new NameExpr("descriptor"));
-        dupMethod.addArgument(new NameExpr(parameterIndices.getNameAsString()));
-      } else {
-        dupMethod.setName("dupParameters");
-        dupMethod.addArgument(new NameExpr("descriptor"));
-        dupMethod.addArgument(new NameExpr("parameterIndices"));
-        dupMethod.addArgument(instanceMethod ? new NameExpr("owner") : new NullLiteralExpr());
-      }
-      body.addStatement(dupMethod);
-    } else {
-      final MethodCallExpr dupMethod = new MethodCallExpr().setScope(new NameExpr("handler"));
-      if (advice.includeThis()) {
-        dupMethod.setName("dupInvoke");
-        dupMethod.addArgument(new NameExpr("owner"));
-        dupMethod.addArgument(new NameExpr("descriptor"));
-      } else {
-        dupMethod.setName("dupParameters");
-        dupMethod.addArgument(new NameExpr("descriptor"));
-      }
-      String mode = "COPY";
-      if (allArgsSpec != null) {
-        if (advice instanceof AfterSpecification) {
-          mode = advice.isConstructor() ? "PREPEND_ARRAY_CTOR" : "PREPEND_ARRAY";
+    private static void writeStackOperations(final AdviceSpecification advice, final BlockStmt body) {
+        final boolean instanceMethod = !advice.isStaticPointcut();
+        final AllArgsSpecification allArgsSpec = advice.findAllArguments();
+        if (allArgsSpec == null && advice.isPositionalArguments()) {
+            final List<Expression> parameterIndicesValues = advice.getArguments()
+                    .map(argSpec -> intLiteral(argSpec.getIndex()))
+                    .collect(Collectors.toList());
+            final VariableDeclarator parameterIndices = new VariableDeclarator()
+                    .setName("parameterIndices")
+                    .setType(new ArrayType(new PrimitiveType(PrimitiveType.Primitive.INT)))
+                    .setInitializer(new ArrayCreationExpr()
+                            .setElementType(int.class)
+                            .setInitializer(
+                                    new ArrayInitializerExpr().setValues(new NodeList<>(parameterIndicesValues))));
+            body.addStatement(new VariableDeclarationExpr().addVariable(parameterIndices));
+            final MethodCallExpr dupMethod = new MethodCallExpr().setScope(new NameExpr("handler"));
+            if (advice.includeThis()) {
+                dupMethod.setName("dupInvoke");
+                dupMethod.addArgument(new NameExpr("owner"));
+                dupMethod.addArgument(new NameExpr("descriptor"));
+                dupMethod.addArgument(new NameExpr(parameterIndices.getNameAsString()));
+            } else {
+                dupMethod.setName("dupParameters");
+                dupMethod.addArgument(new NameExpr("descriptor"));
+                dupMethod.addArgument(new NameExpr("parameterIndices"));
+                dupMethod.addArgument(instanceMethod ? new NameExpr("owner") : new NullLiteralExpr());
+            }
+            body.addStatement(dupMethod);
         } else {
-          mode = "APPEND_ARRAY";
+            final MethodCallExpr dupMethod = new MethodCallExpr().setScope(new NameExpr("handler"));
+            if (advice.includeThis()) {
+                dupMethod.setName("dupInvoke");
+                dupMethod.addArgument(new NameExpr("owner"));
+                dupMethod.addArgument(new NameExpr("descriptor"));
+            } else {
+                dupMethod.setName("dupParameters");
+                dupMethod.addArgument(new NameExpr("descriptor"));
+            }
+            String mode = "COPY";
+            if (allArgsSpec != null) {
+                if (advice instanceof AfterSpecification) {
+                    mode = advice.isConstructor() ? "PREPEND_ARRAY_CTOR" : "PREPEND_ARRAY";
+                } else {
+                    mode = "APPEND_ARRAY";
+                }
+            }
+            dupMethod.addArgument(new FieldAccessExpr()
+                    .setScope(new TypeExpr(new ClassOrInterfaceType().setName(STACK_DUP_MODE_CLASS)))
+                    .setName(mode));
+            body.addStatement(dupMethod);
         }
-      }
-      dupMethod.addArgument(
-          new FieldAccessExpr()
-              .setScope(new TypeExpr(new ClassOrInterfaceType().setName(STACK_DUP_MODE_CLASS)))
-              .setName(mode));
-      body.addStatement(dupMethod);
     }
-  }
 
-  private static void writeAdviceMethodCall(
-      final AdviceSpecification advice, final BlockStmt body) {
-    final MethodType method = advice.getAdvice();
-    if (advice instanceof AroundSpecification && advice.isInvokeDynamic()) {
-      final Expression newHandle =
-          new ObjectCreationExpr()
-              .setType("Handle")
-              .addArgument(opCode("H_INVOKESTATIC"))
-              .addArgument(new StringLiteralExpr(method.getOwner().getInternalName()))
-              .addArgument(new StringLiteralExpr(method.getMethodName()))
-              .addArgument(new StringLiteralExpr(method.getMethodType().getDescriptor()))
-              .addArgument(new BooleanLiteralExpr(false));
-      final MethodCallExpr invokeDynamic =
-          new MethodCallExpr()
-              .setScope(new NameExpr("handler"))
-              .setName("invokeDynamic")
-              .addArgument(new NameExpr("name"))
-              .addArgument(new NameExpr("descriptor"))
-              .addArgument(newHandle)
-              .addArgument(new NameExpr("bootstrapMethodArguments"));
-      body.addStatement(invokeDynamic);
-    } else {
-      if (advice.isInvokeDynamic() && advice.findInvokeDynamicConstants() != null) {
-        // we should add the boostrap method constants before the method call
-        final MethodCallExpr loadConstantArray =
-            new MethodCallExpr()
-                .setScope(new NameExpr("handler"))
-                .setName("loadConstantArray")
-                .addArgument(new NameExpr("bootstrapMethodArguments"));
-        body.addStatement(loadConstantArray);
-      }
-      final MethodCallExpr invokeStatic =
-          new MethodCallExpr()
-              .setScope(new NameExpr("handler"))
-              .setName("advice")
-              .addArgument(new StringLiteralExpr(method.getOwner().getInternalName()))
-              .addArgument(new StringLiteralExpr(method.getMethodName()))
-              .addArgument(new StringLiteralExpr(method.getMethodType().getDescriptor()));
-      body.addStatement(invokeStatic);
-    }
-    if (requiresCast(advice)) {
-      final MethodType pointcut = advice.getPointcut();
-      final Type expectedReturn =
-          pointcut.isConstructor() ? pointcut.getOwner() : pointcut.getMethodType().getReturnType();
-      if (!expectedReturn.equals(method.getMethodType().getReturnType())) {
-        body.addStatement(
-            new MethodCallExpr()
-                .setScope(new NameExpr("handler"))
-                .setName("instruction")
-                .addArgument(opCode("CHECKCAST"))
-                .addArgument(new StringLiteralExpr(expectedReturn.getInternalName())));
-      }
+    private static void writeAdviceMethodCall(final AdviceSpecification advice, final BlockStmt body) {
+        final MethodType method = advice.getAdvice();
+        if (advice instanceof AroundSpecification && advice.isInvokeDynamic()) {
+            final Expression newHandle = new ObjectCreationExpr()
+                    .setType("Handle")
+                    .addArgument(opCode("H_INVOKESTATIC"))
+                    .addArgument(new StringLiteralExpr(method.getOwner().getInternalName()))
+                    .addArgument(new StringLiteralExpr(method.getMethodName()))
+                    .addArgument(new StringLiteralExpr(method.getMethodType().getDescriptor()))
+                    .addArgument(new BooleanLiteralExpr(false));
+            final MethodCallExpr invokeDynamic = new MethodCallExpr()
+                    .setScope(new NameExpr("handler"))
+                    .setName("invokeDynamic")
+                    .addArgument(new NameExpr("name"))
+                    .addArgument(new NameExpr("descriptor"))
+                    .addArgument(newHandle)
+                    .addArgument(new NameExpr("bootstrapMethodArguments"));
+            body.addStatement(invokeDynamic);
+        } else {
+            if (advice.isInvokeDynamic() && advice.findInvokeDynamicConstants() != null) {
+                // we should add the boostrap method constants before the method call
+                final MethodCallExpr loadConstantArray = new MethodCallExpr()
+                        .setScope(new NameExpr("handler"))
+                        .setName("loadConstantArray")
+                        .addArgument(new NameExpr("bootstrapMethodArguments"));
+                body.addStatement(loadConstantArray);
+            }
+            final MethodCallExpr invokeStatic = new MethodCallExpr()
+                    .setScope(new NameExpr("handler"))
+                    .setName("advice")
+                    .addArgument(new StringLiteralExpr(method.getOwner().getInternalName()))
+                    .addArgument(new StringLiteralExpr(method.getMethodName()))
+                    .addArgument(new StringLiteralExpr(method.getMethodType().getDescriptor()));
+            body.addStatement(invokeStatic);
+        }
+        if (requiresCast(advice)) {
+            final MethodType pointcut = advice.getPointcut();
+            final Type expectedReturn = pointcut.isConstructor()
+                    ? pointcut.getOwner()
+                    : pointcut.getMethodType().getReturnType();
+            if (!expectedReturn.equals(method.getMethodType().getReturnType())) {
+                body.addStatement(new MethodCallExpr()
+                        .setScope(new NameExpr("handler"))
+                        .setName("instruction")
+                        .addArgument(opCode("CHECKCAST"))
+                        .addArgument(new StringLiteralExpr(expectedReturn.getInternalName())));
+            }
+        }
     }
-  }
 
-  private static boolean requiresCast(final AdviceSpecification advice) {
-    if (advice instanceof AroundSpecification) {
-      return true; // around always replaces the original method call
-    }
-    if (advice instanceof AfterSpecification) {
-      return !advice.isInvokeDynamic(); // dynamic invokes original method call returns CallSite
+    private static boolean requiresCast(final AdviceSpecification advice) {
+        if (advice instanceof AroundSpecification) {
+            return true; // around always replaces the original method call
+        }
+        if (advice instanceof AfterSpecification) {
+            return !advice.isInvokeDynamic(); // dynamic invokes original method call returns CallSite
+        }
+        return false;
     }
-    return false;
-  }
 
-  private static void writeOriginalMethodCall(
-      final AdviceSpecification advice, final BlockStmt body) {
-    final MethodCallExpr invoke = new MethodCallExpr().setScope(new NameExpr("handler"));
-    if (advice.isInvokeDynamic()) {
-      invoke
-          .setName("invokeDynamic")
-          .addArgument(new NameExpr("name"))
-          .addArgument(new NameExpr("descriptor"))
-          .addArgument(new NameExpr("bootstrapMethodHandle"))
-          .addArgument(new NameExpr("bootstrapMethodArguments"));
-    } else {
-      invoke
-          .setName("method")
-          .addArgument(new NameExpr("opcode"))
-          .addArgument(new NameExpr("owner"))
-          .addArgument(new NameExpr("name"))
-          .addArgument(new NameExpr("descriptor"))
-          .addArgument(new NameExpr("isInterface"));
+    private static void writeOriginalMethodCall(final AdviceSpecification advice, final BlockStmt body) {
+        final MethodCallExpr invoke = new MethodCallExpr().setScope(new NameExpr("handler"));
+        if (advice.isInvokeDynamic()) {
+            invoke.setName("invokeDynamic")
+                    .addArgument(new NameExpr("name"))
+                    .addArgument(new NameExpr("descriptor"))
+                    .addArgument(new NameExpr("bootstrapMethodHandle"))
+                    .addArgument(new NameExpr("bootstrapMethodArguments"));
+        } else {
+            invoke.setName("method")
+                    .addArgument(new NameExpr("opcode"))
+                    .addArgument(new NameExpr("owner"))
+                    .addArgument(new NameExpr("name"))
+                    .addArgument(new NameExpr("descriptor"))
+                    .addArgument(new NameExpr("isInterface"));
+        }
+        body.addStatement(invoke);
     }
-    body.addStatement(invoke);
-  }
 
-  private static Expression invokeAdviceSignature(final BlockStmt body) {
-    return new LambdaExpr(
-        new NodeList<>(
-            new Parameter().setName("handler").setType(METHOD_HANDLER_CLASS),
-            new Parameter().setName("opcode").setType(int.class),
-            new Parameter().setName("owner").setType(String.class),
-            new Parameter().setName("name").setType(String.class),
-            new Parameter().setName("descriptor").setType(String.class),
-            new Parameter().setName("isInterface").setType(boolean.class)),
-        body);
-  }
+    private static Expression invokeAdviceSignature(final BlockStmt body) {
+        return new LambdaExpr(
+                new NodeList<>(
+                        new Parameter().setName("handler").setType(METHOD_HANDLER_CLASS),
+                        new Parameter().setName("opcode").setType(int.class),
+                        new Parameter().setName("owner").setType(String.class),
+                        new Parameter().setName("name").setType(String.class),
+                        new Parameter().setName("descriptor").setType(String.class),
+                        new Parameter().setName("isInterface").setType(boolean.class)),
+                body);
+    }
 
-  private static Expression invokeDynamicAdviceSignature(final BlockStmt body) {
-    return new LambdaExpr(
-        new NodeList<>(
-            new Parameter().setName("handler").setType(METHOD_HANDLER_CLASS),
-            new Parameter().setName("name").setType(String.class),
-            new Parameter().setName("descriptor").setType(String.class),
-            new Parameter().setName("bootstrapMethodHandle").setType(HANDLE_FQDN),
-            new Parameter()
-                .setVarArgs(true)
-                .setType(Object.class)
-                .setName("bootstrapMethodArguments")),
-        body);
-  }
+    private static Expression invokeDynamicAdviceSignature(final BlockStmt body) {
+        return new LambdaExpr(
+                new NodeList<>(
+                        new Parameter().setName("handler").setType(METHOD_HANDLER_CLASS),
+                        new Parameter().setName("name").setType(String.class),
+                        new Parameter().setName("descriptor").setType(String.class),
+                        new Parameter().setName("bootstrapMethodHandle").setType(HANDLE_FQDN),
+                        new Parameter().setVarArgs(true).setType(Object.class).setName("bootstrapMethodArguments")),
+                body);
+    }
 
-  private static Expression opCode(final String opCode) {
-    return new FieldAccessExpr()
-        .setScope(new TypeExpr(new ClassOrInterfaceType().setName("Opcodes")))
-        .setName(opCode);
-  }
+    private static Expression opCode(final String opCode) {
+        return new FieldAccessExpr()
+                .setScope(new TypeExpr(new ClassOrInterfaceType().setName("Opcodes")))
+                .setName(opCode);
+    }
 
-  private static void handleThrowable(
-      @Nonnull final ValidationContext container, @Nonnull final Throwable t) {
-    if (t instanceof HasErrors) {
-      ((HasErrors) t).getErrors().forEach(container::addError);
-    } else {
-      container.addError(t, ErrorCode.UNCAUGHT_ERROR);
+    private static void handleThrowable(@Nonnull final ValidationContext container, @Nonnull final Throwable t) {
+        if (t instanceof HasErrors) {
+            ((HasErrors) t).getErrors().forEach(container::addError);
+        } else {
+            container.addError(t, ErrorCode.UNCAUGHT_ERROR);
+        }
     }
-  }
 
-  private static String getPackageName(final Type type) {
-    final String className = type.getClassName();
-    final int index = type.getClassName().lastIndexOf('.');
-    return index >= 0 ? className.substring(0, index) : null;
-  }
+    private static String getPackageName(final Type type) {
+        final String className = type.getClassName();
+        final int index = type.getClassName().lastIndexOf('.');
+        return index >= 0 ? className.substring(0, index) : null;
+    }
 
-  private static String getClassName(final Type type) {
-    return getClassName(type, true);
-  }
+    private static String getClassName(final Type type) {
+        return getClassName(type, true);
+    }
 
-  private static String getClassName(final Type type, final boolean definition) {
-    final String className = type.getClassName();
-    final int index = type.getClassName().lastIndexOf('.');
-    final String result = index >= 0 ? className.substring(index + 1) : className;
-    return definition ? result : result.replace('$', '.');
-  }
+    private static String getClassName(final Type type, final boolean definition) {
+        final String className = type.getClassName();
+        final int index = type.getClassName().lastIndexOf('.');
+        final String result = index >= 0 ? className.substring(index + 1) : className;
+        return definition ? result : result.replace('$', '.');
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/AsmSpecificationBuilder.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/AsmSpecificationBuilder.java
index 00a93721f51..fc4ea958c8e 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/AsmSpecificationBuilder.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/AsmSpecificationBuilder.java
@@ -55,250 +55,240 @@
  */
 public class AsmSpecificationBuilder implements SpecificationBuilder {
 
-  @Override
-  @Nonnull
-  public Optional<CallSiteSpecification> build(@Nonnull final File file) {
-    try (final InputStream stream = Files.newInputStream(file.toPath())) {
-      final ClassReader reader = new ClassReader(stream);
-      final SpecificationVisitor visitor = new SpecificationVisitor();
-      reader.accept(visitor, SKIP_CODE | SKIP_FRAMES | SKIP_DEBUG);
-      return visitor.getResult();
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+    @Override
+    @Nonnull
+    public Optional<CallSiteSpecification> build(@Nonnull final File file) {
+        try (final InputStream stream = Files.newInputStream(file.toPath())) {
+            final ClassReader reader = new ClassReader(stream);
+            final SpecificationVisitor visitor = new SpecificationVisitor();
+            reader.accept(visitor, SKIP_CODE | SKIP_FRAMES | SKIP_DEBUG);
+            return visitor.getResult();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  private static class SpecificationVisitor extends ClassVisitor {
+    private static class SpecificationVisitor extends ClassVisitor {
 
-    private static final String CALL_SITE = classNameToDescriptor(CALL_SITE_ANNOTATION);
+        private static final String CALL_SITE = classNameToDescriptor(CALL_SITE_ANNOTATION);
 
-    private Type clazz;
-    private boolean isCallSite;
-    private final List<AdviceSpecification> advices = new ArrayList<>();
-    private final Set<Type> helpers = new HashSet<>();
-    private final Set<Type> spi = new HashSet<>();
-    private List<String> enabled = new ArrayList<>();
-    private CallSiteSpecification result;
+        private Type clazz;
+        private boolean isCallSite;
+        private final List<AdviceSpecification> advices = new ArrayList<>();
+        private final Set<Type> helpers = new HashSet<>();
+        private final Set<Type> spi = new HashSet<>();
+        private List<String> enabled = new ArrayList<>();
+        private CallSiteSpecification result;
 
-    public SpecificationVisitor() {
-      super(ASM_API_VERSION);
-    }
+        public SpecificationVisitor() {
+            super(ASM_API_VERSION);
+        }
 
-    @Override
-    public void visit(
-        final int version,
-        final int access,
-        final String name,
-        final String signature,
-        final String superName,
-        final String[] interfaces) {
-      clazz = classNameToType(name);
-    }
+        @Override
+        public void visit(
+                final int version,
+                final int access,
+                final String name,
+                final String signature,
+                final String superName,
+                final String[] interfaces) {
+            clazz = classNameToType(name);
+        }
 
-    @Override
-    public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
-      isCallSite = CALL_SITE.equals(descriptor);
-      if (isCallSite) {
-        helpers.add(clazz);
-        return new AnnotationVisitor(ASM_API_VERSION) {
+        @Override
+        public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
+            isCallSite = CALL_SITE.equals(descriptor);
+            if (isCallSite) {
+                helpers.add(clazz);
+                return new AnnotationVisitor(ASM_API_VERSION) {
 
-          @Override
-          public AnnotationVisitor visitArray(final String name) {
-            if ("spi".equals(name)) {
-              return new AnnotationVisitor(ASM_API_VERSION) {
-                @Override
-                public void visit(final String name, final Object value) {
-                  spi.add((Type) value);
-                }
-              };
-            } else if ("helpers".equals(name)) {
-              return new AnnotationVisitor(ASM_API_VERSION) {
-                @Override
-                public void visit(final String name, final Object value) {
-                  helpers.add((Type) value);
-                }
-              };
-            } else if ("enabled".equals(name)) {
-              return new AnnotationVisitor(ASM_API_VERSION) {
-                @Override
-                public void visit(final String name, final Object value) {
-                  enabled.add((String) value);
-                }
-              };
+                    @Override
+                    public AnnotationVisitor visitArray(final String name) {
+                        if ("spi".equals(name)) {
+                            return new AnnotationVisitor(ASM_API_VERSION) {
+                                @Override
+                                public void visit(final String name, final Object value) {
+                                    spi.add((Type) value);
+                                }
+                            };
+                        } else if ("helpers".equals(name)) {
+                            return new AnnotationVisitor(ASM_API_VERSION) {
+                                @Override
+                                public void visit(final String name, final Object value) {
+                                    helpers.add((Type) value);
+                                }
+                            };
+                        } else if ("enabled".equals(name)) {
+                            return new AnnotationVisitor(ASM_API_VERSION) {
+                                @Override
+                                public void visit(final String name, final Object value) {
+                                    enabled.add((String) value);
+                                }
+                            };
+                        }
+                        return null;
+                    }
+                };
             }
             return null;
-          }
-        };
-      }
-      return null;
-    }
+        }
 
-    @Override
-    public MethodVisitor visitMethod(
-        final int access,
-        final String name,
-        final String descriptor,
-        final String signature,
-        final String[] exceptions) {
-      if (isCallSite) {
-        return new AdviceMethodVisitor(this, name, Type.getMethodType(descriptor));
-      }
-      return null;
-    }
+        @Override
+        public MethodVisitor visitMethod(
+                final int access,
+                final String name,
+                final String descriptor,
+                final String signature,
+                final String[] exceptions) {
+            if (isCallSite) {
+                return new AdviceMethodVisitor(this, name, Type.getMethodType(descriptor));
+            }
+            return null;
+        }
 
-    @Override
-    public void visitEnd() {
-      if (isCallSite) {
-        result = new CallSiteSpecification(clazz, advices, spi, enabled, helpers);
-      }
-    }
+        @Override
+        public void visitEnd() {
+            if (isCallSite) {
+                result = new CallSiteSpecification(clazz, advices, spi, enabled, helpers);
+            }
+        }
 
-    public Optional<CallSiteSpecification> getResult() {
-      return Optional.ofNullable(result);
+        public Optional<CallSiteSpecification> getResult() {
+            return Optional.ofNullable(result);
+        }
     }
-  }
 
-  private static class AdviceMethodVisitor extends MethodVisitor {
+    private static class AdviceMethodVisitor extends MethodVisitor {
 
-    private static final Map<String, AdviceSpecificationCtor> ADVICE_BUILDERS = new HashMap<>();
+        private static final Map<String, AdviceSpecificationCtor> ADVICE_BUILDERS = new HashMap<>();
 
-    private static final Set<String> REPEATABLE_ADVICES = new HashSet<>();
+        private static final Set<String> REPEATABLE_ADVICES = new HashSet<>();
 
-    private static final Map<String, ParameterSpecificationCtor> PARAMETER_BUILDERS =
-        new HashMap<>();
+        private static final Map<String, ParameterSpecificationCtor> PARAMETER_BUILDERS = new HashMap<>();
 
-    static {
-      ADVICE_BUILDERS.put(classNameToDescriptor(BEFORE_ANNOTATION), BeforeSpecification::new);
-      ADVICE_BUILDERS.put(classNameToDescriptor(AROUND_ANNOTATION), AroundSpecification::new);
-      ADVICE_BUILDERS.put(classNameToDescriptor(AFTER_ANNOTATION), AfterSpecification::new);
-      REPEATABLE_ADVICES.add(classNameToDescriptor(BEFORE_ARRAY_ANNOTATION));
-      REPEATABLE_ADVICES.add(classNameToDescriptor(AROUND_ARRAY_ANNOTATION));
-      REPEATABLE_ADVICES.add(classNameToDescriptor(AFTER_ARRAY_ANNOTATION));
-      PARAMETER_BUILDERS.put(classNameToDescriptor(THIS_ANNOTATION), ThisSpecification::new);
-      PARAMETER_BUILDERS.put(
-          classNameToDescriptor(ARGUMENT_ANNOTATION), ArgumentSpecification::new);
-      PARAMETER_BUILDERS.put(classNameToDescriptor(RETURN_ANNOTATION), ReturnSpecification::new);
-      PARAMETER_BUILDERS.put(classNameToDescriptor(ALL_ARGS_ANNOTATION), AllArgsSpecification::new);
-      PARAMETER_BUILDERS.put(
-          classNameToDescriptor(INVOKE_DYNAMIC_CONSTANTS_ANNOTATION),
-          InvokeDynamicConstantsSpecification::new);
-    }
+        static {
+            ADVICE_BUILDERS.put(classNameToDescriptor(BEFORE_ANNOTATION), BeforeSpecification::new);
+            ADVICE_BUILDERS.put(classNameToDescriptor(AROUND_ANNOTATION), AroundSpecification::new);
+            ADVICE_BUILDERS.put(classNameToDescriptor(AFTER_ANNOTATION), AfterSpecification::new);
+            REPEATABLE_ADVICES.add(classNameToDescriptor(BEFORE_ARRAY_ANNOTATION));
+            REPEATABLE_ADVICES.add(classNameToDescriptor(AROUND_ARRAY_ANNOTATION));
+            REPEATABLE_ADVICES.add(classNameToDescriptor(AFTER_ARRAY_ANNOTATION));
+            PARAMETER_BUILDERS.put(classNameToDescriptor(THIS_ANNOTATION), ThisSpecification::new);
+            PARAMETER_BUILDERS.put(classNameToDescriptor(ARGUMENT_ANNOTATION), ArgumentSpecification::new);
+            PARAMETER_BUILDERS.put(classNameToDescriptor(RETURN_ANNOTATION), ReturnSpecification::new);
+            PARAMETER_BUILDERS.put(classNameToDescriptor(ALL_ARGS_ANNOTATION), AllArgsSpecification::new);
+            PARAMETER_BUILDERS.put(
+                    classNameToDescriptor(INVOKE_DYNAMIC_CONSTANTS_ANNOTATION),
+                    InvokeDynamicConstantsSpecification::new);
+        }
 
-    private final SpecificationVisitor spec;
-    private final MethodType advice;
-    private final Map<Integer, ParameterSpecification> parameters = new HashMap<>();
-    private final Map<AdviceSpecificationCtor, List<AdviceSpecificationData>> adviceData =
-        new HashMap<>();
+        private final SpecificationVisitor spec;
+        private final MethodType advice;
+        private final Map<Integer, ParameterSpecification> parameters = new HashMap<>();
+        private final Map<AdviceSpecificationCtor, List<AdviceSpecificationData>> adviceData = new HashMap<>();
 
-    public AdviceMethodVisitor(
-        @Nonnull final SpecificationVisitor spec,
-        @Nonnull final String method,
-        @Nonnull final Type methodType) {
-      super(ASM_API_VERSION);
-      this.spec = spec;
-      advice = new MethodType(spec.clazz, method, methodType);
-    }
+        public AdviceMethodVisitor(
+                @Nonnull final SpecificationVisitor spec,
+                @Nonnull final String method,
+                @Nonnull final Type methodType) {
+            super(ASM_API_VERSION);
+            this.spec = spec;
+            advice = new MethodType(spec.clazz, method, methodType);
+        }
 
-    @Override
-    public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
-      AdviceSpecificationCtor ctor = ADVICE_BUILDERS.get(descriptor);
-      if (ctor != null) {
-        final List<AdviceSpecificationData> list =
-            adviceData.computeIfAbsent(ctor, c -> new ArrayList<>());
-        final AdviceSpecificationData data = new AdviceSpecificationData();
-        list.add(data);
-        return new AnnotationVisitor(ASM_API_VERSION) {
-          @Override
-          public void visit(final String key, final Object value) {
-            if ("value".equals(key)) {
-              data.signature = (String) value;
-            } else if ("invokeDynamic".equals(key)) {
-              data.invokeDynamic = (boolean) value;
+        @Override
+        public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
+            AdviceSpecificationCtor ctor = ADVICE_BUILDERS.get(descriptor);
+            if (ctor != null) {
+                final List<AdviceSpecificationData> list = adviceData.computeIfAbsent(ctor, c -> new ArrayList<>());
+                final AdviceSpecificationData data = new AdviceSpecificationData();
+                list.add(data);
+                return new AnnotationVisitor(ASM_API_VERSION) {
+                    @Override
+                    public void visit(final String key, final Object value) {
+                        if ("value".equals(key)) {
+                            data.signature = (String) value;
+                        } else if ("invokeDynamic".equals(key)) {
+                            data.invokeDynamic = (boolean) value;
+                        }
+                    }
+                };
             }
-          }
-        };
-      }
-      if (REPEATABLE_ADVICES.contains(descriptor)) {
-        return new AnnotationVisitor(ASM_API_VERSION) {
-          @Override
-          public AnnotationVisitor visitArray(final String name) {
-            if ("value".equals(name)) {
-              return new AnnotationVisitor(ASM_API_VERSION) {
-                @Override
-                public AnnotationVisitor visitAnnotation(
-                    final String name, final String descriptor) {
-                  return AdviceMethodVisitor.this.visitAnnotation(descriptor, true);
-                }
-              };
+            if (REPEATABLE_ADVICES.contains(descriptor)) {
+                return new AnnotationVisitor(ASM_API_VERSION) {
+                    @Override
+                    public AnnotationVisitor visitArray(final String name) {
+                        if ("value".equals(name)) {
+                            return new AnnotationVisitor(ASM_API_VERSION) {
+                                @Override
+                                public AnnotationVisitor visitAnnotation(final String name, final String descriptor) {
+                                    return AdviceMethodVisitor.this.visitAnnotation(descriptor, true);
+                                }
+                            };
+                        }
+                        return null;
+                    }
+                };
             }
             return null;
-          }
-        };
-      }
-      return null;
-    }
+        }
 
-    @Override
-    public AnnotationVisitor visitParameterAnnotation(
-        final int parameter, final String descriptor, final boolean visible) {
-      if (!adviceData.isEmpty()) {
-        final ParameterSpecificationCtor parameterCtor = PARAMETER_BUILDERS.get(descriptor);
-        if (parameterCtor != null) {
-          ParameterSpecification parameterSpec = parameterCtor.build();
-          if (parameterSpec instanceof ArgumentSpecification) {
-            final long index =
-                parameters.values().stream()
-                    .filter(it -> it instanceof ArgumentSpecification)
-                    .count();
-            ((ArgumentSpecification) parameterSpec)
-                .setIndex((int) index); // can change in annotation visitor
-          }
-          parameters.put(parameter, parameterSpec);
+        @Override
+        public AnnotationVisitor visitParameterAnnotation(
+                final int parameter, final String descriptor, final boolean visible) {
+            if (!adviceData.isEmpty()) {
+                final ParameterSpecificationCtor parameterCtor = PARAMETER_BUILDERS.get(descriptor);
+                if (parameterCtor != null) {
+                    ParameterSpecification parameterSpec = parameterCtor.build();
+                    if (parameterSpec instanceof ArgumentSpecification) {
+                        final long index = parameters.values().stream()
+                                .filter(it -> it instanceof ArgumentSpecification)
+                                .count();
+                        ((ArgumentSpecification) parameterSpec)
+                                .setIndex((int) index); // can change in annotation visitor
+                    }
+                    parameters.put(parameter, parameterSpec);
 
-          return new AnnotationVisitor(ASM_API_VERSION) {
-            @Override
-            public void visit(final String key, final Object value) {
-              if ("includeThis".equals(key) && parameterSpec instanceof AllArgsSpecification) {
-                final AllArgsSpecification allArgs = (AllArgsSpecification) parameterSpec;
-                allArgs.setIncludeThis((boolean) value);
-              } else if ("value".equals(key) && parameterSpec instanceof ArgumentSpecification) {
-                ((ArgumentSpecification) parameterSpec).setIndex((Integer) value);
-              }
+                    return new AnnotationVisitor(ASM_API_VERSION) {
+                        @Override
+                        public void visit(final String key, final Object value) {
+                            if ("includeThis".equals(key) && parameterSpec instanceof AllArgsSpecification) {
+                                final AllArgsSpecification allArgs = (AllArgsSpecification) parameterSpec;
+                                allArgs.setIncludeThis((boolean) value);
+                            } else if ("value".equals(key) && parameterSpec instanceof ArgumentSpecification) {
+                                ((ArgumentSpecification) parameterSpec).setIndex((Integer) value);
+                            }
+                        }
+                    };
+                }
             }
-          };
+            return null;
         }
-      }
-      return null;
-    }
 
-    @Override
-    public void visitEnd() {
-      adviceData.forEach(
-          (adviceCtor, list) ->
-              list.stream()
-                  .map(
-                      data ->
-                          adviceCtor.build(advice, parameters, data.signature, data.invokeDynamic))
-                  .forEach(spec.advices::add));
+        @Override
+        public void visitEnd() {
+            adviceData.forEach((adviceCtor, list) -> list.stream()
+                    .map(data -> adviceCtor.build(advice, parameters, data.signature, data.invokeDynamic))
+                    .forEach(spec.advices::add));
+        }
     }
-  }
 
-  @FunctionalInterface
-  private interface AdviceSpecificationCtor {
-    AdviceSpecification build(
-        @Nonnull MethodType advice,
-        @Nonnull Map<Integer, ParameterSpecification> parameters,
-        @Nonnull String signature,
-        boolean invokeDynamic);
-  }
+    @FunctionalInterface
+    private interface AdviceSpecificationCtor {
+        AdviceSpecification build(
+                @Nonnull MethodType advice,
+                @Nonnull Map<Integer, ParameterSpecification> parameters,
+                @Nonnull String signature,
+                boolean invokeDynamic);
+    }
 
-  @FunctionalInterface
-  private interface ParameterSpecificationCtor {
-    ParameterSpecification build();
-  }
+    @FunctionalInterface
+    private interface ParameterSpecificationCtor {
+        ParameterSpecification build();
+    }
 
-  private static class AdviceSpecificationData {
-    private String signature;
-    private boolean invokeDynamic;
-  }
+    private static class AdviceSpecificationData {
+        private String signature;
+        private boolean invokeDynamic;
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/CallSiteFactory.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/CallSiteFactory.java
index 2e7d22c96d6..6868535498b 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/CallSiteFactory.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/CallSiteFactory.java
@@ -9,30 +9,30 @@
 
 public abstract class CallSiteFactory {
 
-  private CallSiteFactory() {}
+    private CallSiteFactory() {}
 
-  public static AdviceGenerator adviceGenerator(final File targetFolder) {
-    return adviceGenerator(targetFolder, typeResolver());
-  }
+    public static AdviceGenerator adviceGenerator(final File targetFolder) {
+        return adviceGenerator(targetFolder, typeResolver());
+    }
 
-  public static AdviceGenerator adviceGenerator(
-      @Nonnull final File targetFolder, @Nonnull final TypeResolver typeResolver) {
-    return new AdviceGeneratorImpl(targetFolder, pointcutParser(), typeResolver);
-  }
+    public static AdviceGenerator adviceGenerator(
+            @Nonnull final File targetFolder, @Nonnull final TypeResolver typeResolver) {
+        return new AdviceGeneratorImpl(targetFolder, pointcutParser(), typeResolver);
+    }
 
-  public static SpecificationBuilder specificationBuilder() {
-    return new AsmSpecificationBuilder();
-  }
+    public static SpecificationBuilder specificationBuilder() {
+        return new AsmSpecificationBuilder();
+    }
 
-  public static AdvicePointcutParser pointcutParser() {
-    return new RegexpAdvicePointcutParser();
-  }
+    public static AdvicePointcutParser pointcutParser() {
+        return new RegexpAdvicePointcutParser();
+    }
 
-  public static TypeResolver typeResolver() {
-    return typeResolver(Thread.currentThread().getContextClassLoader());
-  }
+    public static TypeResolver typeResolver() {
+        return typeResolver(Thread.currentThread().getContextClassLoader());
+    }
 
-  public static TypeResolver typeResolver(@Nonnull final ClassLoader... classpath) {
-    return new TypeResolverPool(classpath);
-  }
+    public static TypeResolver typeResolver(@Nonnull final ClassLoader... classpath) {
+        return new TypeResolverPool(classpath);
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/CallSiteSpecification.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/CallSiteSpecification.java
index 7ce110d33e8..c68cf2c69d3 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/CallSiteSpecification.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/CallSiteSpecification.java
@@ -30,675 +30,645 @@
 /** Description of a class annotated with {@link datadog.trace.agent.tooling.csi.CallSite} */
 public class CallSiteSpecification implements Validatable {
 
-  private final Type clazz;
-  private final List<AdviceSpecification> advices;
-  private final Type[] spi;
-  private final Enabled enabled;
-  private final Type[] helpers;
-
-  public CallSiteSpecification(
-      @Nonnull final Type clazz,
-      @Nonnull final List<AdviceSpecification> advices,
-      @Nonnull final Set<Type> spi,
-      @Nonnull final List<String> enabled,
-      @Nonnull final Set<Type> helpers) {
-    this.clazz = clazz;
-    this.advices = advices;
-    this.spi = spi.toArray(new Type[0]);
-    this.enabled = enabled.isEmpty() ? null : new Enabled(enabled);
-    this.helpers = helpers.toArray(new Type[0]);
-  }
-
-  @Override
-  public void validate(@Nonnull final ValidationContext context) {
-    final TypeResolver typeResolver = context.getContextProperty(TYPE_RESOLVER);
-    try {
-      for (Type spiType : spi) {
-        Class<?> spiClass = typeResolver.resolveType(spiType);
-        if (!spiClass.isInterface()) {
-          context.addError(ErrorCode.CALL_SITE_SPI_SHOULD_BE_AN_INTERFACE, spiClass);
-        } else {
-          if (spiClass.getDeclaredMethods().length > 0) {
-            context.addError(ErrorCode.CALL_SITE_SPI_SHOULD_BE_EMPTY, spiClass);
-          }
-        }
-      }
-    } catch (ResolutionException e) {
-      e.getErrors().forEach(context::addError);
-    }
-    if (enabled != null) {
-      try {
-        final Method enabledMethod = (Method) typeResolver.resolveMethod(enabled.getMethod());
-        final int modifiers = enabledMethod.getModifiers();
-        if (!Modifier.isPublic(modifiers) || !Modifier.isStatic(modifiers)) {
-          context.addError(ErrorCode.CALL_SITE_ENABLED_SHOULD_BE_STATIC_AND_PUBLIC, enabledMethod);
-        }
-      } catch (ResolutionException e) {
-        e.getErrors().forEach(context::addError);
-      }
-    }
-    if (advices.isEmpty()) {
-      context.addError(ErrorCode.CALL_SITE_SHOULD_HAVE_ADVICE_METHODS);
-    }
-  }
-
-  public Type getClazz() {
-    return clazz;
-  }
-
-  public Type[] getSpi() {
-    return spi;
-  }
-
-  public Enabled getEnabled() {
-    return enabled;
-  }
-
-  public Type[] getHelpers() {
-    return helpers;
-  }
-
-  public List<AdviceSpecification> getAdvices() {
-    return advices;
-  }
-
-  /**
-   * Description of a method annotated with {@link datadog.trace.agent.tooling.csi.CallSite.After},
-   * {@link datadog.trace.agent.tooling.csi.CallSite.Before} or {@link
-   * datadog.trace.agent.tooling.csi.CallSite.Around}
-   */
-  public abstract static class AdviceSpecification implements Validatable {
-
-    protected final MethodType advice;
-    private final Map<Integer /* param idx on the advice */, ParameterSpecification> parameters;
-    protected final String signature;
-    protected final boolean invokeDynamic;
-    protected MethodType pointcut;
-    protected Executable pointcutMethod;
-
-    public AdviceSpecification(
-        @Nonnull final MethodType advice,
-        @Nonnull final Map<Integer, ParameterSpecification> parameters,
-        @Nonnull final String signature,
-        final boolean invokeDynamic) {
-      this.advice = advice;
-      this.parameters = new TreeMap<>(parameters);
-      this.signature = signature;
-      this.invokeDynamic = invokeDynamic;
+    private final Type clazz;
+    private final List<AdviceSpecification> advices;
+    private final Type[] spi;
+    private final Enabled enabled;
+    private final Type[] helpers;
+
+    public CallSiteSpecification(
+            @Nonnull final Type clazz,
+            @Nonnull final List<AdviceSpecification> advices,
+            @Nonnull final Set<Type> spi,
+            @Nonnull final List<String> enabled,
+            @Nonnull final Set<Type> helpers) {
+        this.clazz = clazz;
+        this.advices = advices;
+        this.spi = spi.toArray(new Type[0]);
+        this.enabled = enabled.isEmpty() ? null : new Enabled(enabled);
+        this.helpers = helpers.toArray(new Type[0]);
     }
 
     @Override
     public void validate(@Nonnull final ValidationContext context) {
-      validatePointcut(context);
-      validateAdvice(context);
-      validateCompatibility(context);
-    }
-
-    protected void validateCompatibility(final ValidationContext context) {
-      try {
-        final Type[] adviceArgumentTypes = advice.getMethodType().getArgumentTypes();
-        final Set<Integer> pointcutParameters = new HashSet<>();
-        for (int i = 0; i < pointcut.getMethodType().getArgumentTypes().length; i++) {
-          pointcutParameters.add(i);
-        }
-        validateAllArgsSpecCompatibility(context, adviceArgumentTypes, pointcutParameters);
-        if (isInvokeDynamic()) {
-          validateInvokeDynamicConstCompatibility(context, adviceArgumentTypes, pointcutParameters);
-          if (this instanceof AroundSpecification) {
-            validateArgumentSpecCompatibility(context, adviceArgumentTypes, pointcutParameters);
-          }
-        } else {
-          validateAdviceReturnTypeCompatibility(context);
-          validateThisSpecCompatibility(context, adviceArgumentTypes);
-          validateArgumentSpecCompatibility(context, adviceArgumentTypes, pointcutParameters);
-          validateReturnSpecCompatibility(context, adviceArgumentTypes);
-        }
-      } catch (ResolutionException e) {
-        e.getErrors().forEach(context::addError);
-      }
+        final TypeResolver typeResolver = context.getContextProperty(TYPE_RESOLVER);
+        try {
+            for (Type spiType : spi) {
+                Class<?> spiClass = typeResolver.resolveType(spiType);
+                if (!spiClass.isInterface()) {
+                    context.addError(ErrorCode.CALL_SITE_SPI_SHOULD_BE_AN_INTERFACE, spiClass);
+                } else {
+                    if (spiClass.getDeclaredMethods().length > 0) {
+                        context.addError(ErrorCode.CALL_SITE_SPI_SHOULD_BE_EMPTY, spiClass);
+                    }
+                }
+            }
+        } catch (ResolutionException e) {
+            e.getErrors().forEach(context::addError);
+        }
+        if (enabled != null) {
+            try {
+                final Method enabledMethod = (Method) typeResolver.resolveMethod(enabled.getMethod());
+                final int modifiers = enabledMethod.getModifiers();
+                if (!Modifier.isPublic(modifiers) || !Modifier.isStatic(modifiers)) {
+                    context.addError(ErrorCode.CALL_SITE_ENABLED_SHOULD_BE_STATIC_AND_PUBLIC, enabledMethod);
+                }
+            } catch (ResolutionException e) {
+                e.getErrors().forEach(context::addError);
+            }
+        }
+        if (advices.isEmpty()) {
+            context.addError(ErrorCode.CALL_SITE_SHOULD_HAVE_ADVICE_METHODS);
+        }
     }
 
-    private void validateArgumentSpecCompatibility(
-        final ValidationContext context,
-        final Type[] adviceArgumentTypes,
-        final Set<Integer> pointcutParameters) {
-      withParameter(
-          ArgumentSpecification.class,
-          (i, spec) -> {
-            final Type argType = pointcut.getMethodType().getArgumentTypes()[spec.index];
-            final Type advice = adviceArgumentTypes[i];
-            if (!pointcutParameters.remove(spec.index)) {
-              context.addError(ErrorCode.ADVICE_PARAMETER_ARGUMENT_OUT_OF_BOUNDS);
-            }
-            validateCompatibility(
-                context, argType, advice, ErrorCode.ADVICE_METHOD_PARAM_NOT_COMPATIBLE, i);
-          });
+    public Type getClazz() {
+        return clazz;
     }
 
-    private void validateReturnSpecCompatibility(
-        final ValidationContext context, final Type[] adviceArgumentTypes) {
-      withParameter(
-          ReturnSpecification.class,
-          (i, spec) -> {
-            final Type rType =
-                pointcut.isConstructor()
-                    ? pointcut.getOwner()
-                    : pointcut.getMethodType().getReturnType();
-            final Type advice = adviceArgumentTypes[i];
-            validateCompatibility(
-                context, rType, advice, ErrorCode.ADVICE_METHOD_PARAM_RETURN_NOT_COMPATIBLE, i);
-          });
+    public Type[] getSpi() {
+        return spi;
     }
 
-    private void validateThisSpecCompatibility(
-        final ValidationContext context, final Type[] adviceArgumentTypes) {
-      withParameter(
-          ThisSpecification.class,
-          (i, spec) -> {
-            final Type owner = pointcut.getOwner();
-            final Type advice = adviceArgumentTypes[i];
-            validateCompatibility(
-                context, owner, advice, ErrorCode.ADVICE_METHOD_PARAM_THIS_NOT_COMPATIBLE, i);
-          });
+    public Enabled getEnabled() {
+        return enabled;
     }
 
-    protected void validateAdviceReturnTypeCompatibility(final ValidationContext context) {
-      if (!advice.isVoidReturn()) {
-        final Type pointcutType =
-            pointcut.isConstructor()
-                ? pointcut.getOwner()
-                : pointcut.getMethodType().getReturnType();
-        final Type adviceType = advice.getMethodType().getReturnType();
-        validateCompatibility(
-            context, pointcutType, adviceType, ErrorCode.ADVICE_METHOD_RETURN_NOT_COMPATIBLE, -1);
-      }
+    public Type[] getHelpers() {
+        return helpers;
     }
 
-    private void validateInvokeDynamicConstCompatibility(
-        final ValidationContext context,
-        final Type[] adviceArgumentTypes,
-        final Set<Integer> pointcutParameters) {
-      withParameter(
-          InvokeDynamicConstantsSpecification.class,
-          (i, spec) -> {
-            final Type type = Types.OBJECT_ARRAY;
-            final Type advice = adviceArgumentTypes[i];
-            pointcutParameters.clear();
-            validateCompatibility(
-                context,
-                type,
-                advice,
-                ErrorCode.ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_NOT_COMPATIBLE,
-                i);
-          });
+    public List<AdviceSpecification> getAdvices() {
+        return advices;
     }
 
-    private void validateAllArgsSpecCompatibility(
-        final ValidationContext context,
-        final Type[] adviceArgumentTypes,
-        final Set<Integer> pointcutParameters) {
-      withParameter(
-          AllArgsSpecification.class,
-          (i, spec) -> {
-            final Type type = Types.OBJECT_ARRAY;
-            final Type advice = adviceArgumentTypes[i];
-            pointcutParameters.clear();
-            validateCompatibility(
-                context, type, advice, ErrorCode.ADVICE_METHOD_PARAM_ALL_ARGS_NOT_COMPATIBLE, i);
-          });
-    }
+    /**
+     * Description of a method annotated with {@link datadog.trace.agent.tooling.csi.CallSite.After},
+     * {@link datadog.trace.agent.tooling.csi.CallSite.Before} or {@link
+     * datadog.trace.agent.tooling.csi.CallSite.Around}
+     */
+    public abstract static class AdviceSpecification implements Validatable {
 
-    protected void validateCompatibility(
-        final ValidationContext context,
-        final Type pointcutType,
-        final Type adviceType,
-        final ErrorCode errorCode,
-        final int index) {
-      final TypeResolver typeResolver = context.getContextProperty(TYPE_RESOLVER);
-      if (!typeResolver
-          .resolveType(adviceType)
-          .isAssignableFrom(typeResolver.resolveType(pointcutType))) {
-        context.addError(errorCode, pointcutType, adviceType, index);
-      }
-    }
+        protected final MethodType advice;
+        private final Map<Integer /* param idx on the advice */, ParameterSpecification> parameters;
+        protected final String signature;
+        protected final boolean invokeDynamic;
+        protected MethodType pointcut;
+        protected Executable pointcutMethod;
 
-    protected void validateAdvice(@Nonnull final ValidationContext context) {
-      try {
-        validateAdviceParameters(context);
-        final TypeResolver typeResolver = context.getContextProperty(TYPE_RESOLVER);
-        final Method executable = (Method) typeResolver.resolveMethod(advice);
-        final int access = executable.getModifiers();
-        if (!Modifier.isPublic(access) || !Modifier.isStatic(access)) {
-          context.addError(ErrorCode.ADVICE_METHOD_NOT_STATIC_AND_PUBLIC, this);
-        }
-      } catch (ResolutionException e) {
-        e.getErrors().forEach(context::addError);
-      }
-    }
+        public AdviceSpecification(
+                @Nonnull final MethodType advice,
+                @Nonnull final Map<Integer, ParameterSpecification> parameters,
+                @Nonnull final String signature,
+                final boolean invokeDynamic) {
+            this.advice = advice;
+            this.parameters = new TreeMap<>(parameters);
+            this.signature = signature;
+            this.invokeDynamic = invokeDynamic;
+        }
 
-    protected void validateAdviceParameters(@Nonnull final ValidationContext context) {
-      final Type[] adviceArguments = advice.getMethodType().getArgumentTypes();
-      boolean thisFound = false,
-          returnFound = false,
-          allArgsFound = false,
-          argumentFound = false,
-          dynamicConstantsFound = false;
-      for (int i = 0; i < adviceArguments.length; i++) {
-        ParameterSpecification spec = parameters.get(i);
-        if (spec == null) {
-          context.addError(ErrorCode.ADVICE_PARAMETER_NOT_ANNOTATED, i);
-        } else {
-          if (spec instanceof ThisSpecification) {
-            validateThisSpec(context, thisFound, i);
-            thisFound = true;
-          } else if (spec instanceof ReturnSpecification) {
-            validateReturnSpec(context, returnFound, i);
-            returnFound = true;
-          } else if (spec instanceof AllArgsSpecification) {
-            validateAllArgsSpec(context, allArgsFound, argumentFound, i);
-            allArgsFound = true;
-          } else if (spec instanceof InvokeDynamicConstantsSpecification) {
-            validateInvokeDynamicConstSpec(context, dynamicConstantsFound, i);
-            dynamicConstantsFound = true;
-          } else {
-            validateArgumentSpec(context, allArgsFound, i);
-            argumentFound = true;
-          }
-        }
-      }
-    }
+        @Override
+        public void validate(@Nonnull final ValidationContext context) {
+            validatePointcut(context);
+            validateAdvice(context);
+            validateCompatibility(context);
+        }
 
-    private void validateArgumentSpec(
-        final ValidationContext context, final boolean allArgsFound, final int i) {
-      if (allArgsFound) {
-        context.addError(ErrorCode.ADVICE_PARAMETER_ALL_ARGS_MIXED, i);
-      }
-      if (isInvokeDynamic() && !(this instanceof AroundSpecification)) {
-        context.addError(ErrorCode.ADVICE_PARAMETER_ON_INVOKE_DYNAMIC, i);
-      }
-    }
+        protected void validateCompatibility(final ValidationContext context) {
+            try {
+                final Type[] adviceArgumentTypes = advice.getMethodType().getArgumentTypes();
+                final Set<Integer> pointcutParameters = new HashSet<>();
+                for (int i = 0; i < pointcut.getMethodType().getArgumentTypes().length; i++) {
+                    pointcutParameters.add(i);
+                }
+                validateAllArgsSpecCompatibility(context, adviceArgumentTypes, pointcutParameters);
+                if (isInvokeDynamic()) {
+                    validateInvokeDynamicConstCompatibility(context, adviceArgumentTypes, pointcutParameters);
+                    if (this instanceof AroundSpecification) {
+                        validateArgumentSpecCompatibility(context, adviceArgumentTypes, pointcutParameters);
+                    }
+                } else {
+                    validateAdviceReturnTypeCompatibility(context);
+                    validateThisSpecCompatibility(context, adviceArgumentTypes);
+                    validateArgumentSpecCompatibility(context, adviceArgumentTypes, pointcutParameters);
+                    validateReturnSpecCompatibility(context, adviceArgumentTypes);
+                }
+            } catch (ResolutionException e) {
+                e.getErrors().forEach(context::addError);
+            }
+        }
 
-    private void validateInvokeDynamicConstSpec(
-        final ValidationContext context, final boolean dynamicConstantsFound, final int i) {
-      if (dynamicConstantsFound) {
-        context.addError(ErrorCode.ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_DUPLICATED, i);
-      }
-      if (!isInvokeDynamic()) {
-        context.addError(
-            ErrorCode.ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_ON_NON_INVOKE_DYNAMIC, i);
-      }
-      if (!(this instanceof AfterSpecification)) {
-        context.addError(ErrorCode.ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_NON_AFTER_ADVICE, i);
-      }
-      final Type[] arguments = advice.getMethodType().getArgumentTypes();
-      if (i != arguments.length - 1) {
-        context.addError(ErrorCode.ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_SHOULD_BE_LAST, i);
-      }
-    }
+        private void validateArgumentSpecCompatibility(
+                final ValidationContext context,
+                final Type[] adviceArgumentTypes,
+                final Set<Integer> pointcutParameters) {
+            withParameter(ArgumentSpecification.class, (i, spec) -> {
+                final Type argType = pointcut.getMethodType().getArgumentTypes()[spec.index];
+                final Type advice = adviceArgumentTypes[i];
+                if (!pointcutParameters.remove(spec.index)) {
+                    context.addError(ErrorCode.ADVICE_PARAMETER_ARGUMENT_OUT_OF_BOUNDS);
+                }
+                validateCompatibility(context, argType, advice, ErrorCode.ADVICE_METHOD_PARAM_NOT_COMPATIBLE, i);
+            });
+        }
 
-    private void validateAllArgsSpec(
-        final ValidationContext context,
-        final boolean allArgsFound,
-        final boolean argumentFound,
-        final int i) {
-      if (allArgsFound) {
-        context.addError(ErrorCode.ADVICE_PARAMETER_ALL_ARGS_DUPLICATED, i);
-      }
-      if (argumentFound) {
-        context.addError(ErrorCode.ADVICE_PARAMETER_ALL_ARGS_MIXED, i);
-      }
-    }
+        private void validateReturnSpecCompatibility(
+                final ValidationContext context, final Type[] adviceArgumentTypes) {
+            withParameter(ReturnSpecification.class, (i, spec) -> {
+                final Type rType = pointcut.isConstructor()
+                        ? pointcut.getOwner()
+                        : pointcut.getMethodType().getReturnType();
+                final Type advice = adviceArgumentTypes[i];
+                validateCompatibility(context, rType, advice, ErrorCode.ADVICE_METHOD_PARAM_RETURN_NOT_COMPATIBLE, i);
+            });
+        }
 
-    private void validateReturnSpec(
-        final ValidationContext context, final boolean returnFound, final int i) {
-      if (returnFound) {
-        context.addError(ErrorCode.ADVICE_PARAMETER_RETURN_DUPLICATED, i);
-      }
-      final Type[] arguments = advice.getMethodType().getArgumentTypes();
-      if (i != arguments.length - 1) {
-        if (isInvokeDynamic()) {
-          if (i != arguments.length - 2
-              && !(parameters.get(arguments.length - 1)
-                  instanceof InvokeDynamicConstantsSpecification)) {}
-
-        } else {
-          context.addError(ErrorCode.ADVICE_PARAMETER_RETURN_SHOULD_BE_LAST, i);
-        }
-      }
-      if (!(this instanceof AfterSpecification)) {
-        context.addError(ErrorCode.ADVICE_PARAMETER_RETURN_NON_AFTER_ADVICE, i);
-      }
-    }
+        private void validateThisSpecCompatibility(final ValidationContext context, final Type[] adviceArgumentTypes) {
+            withParameter(ThisSpecification.class, (i, spec) -> {
+                final Type owner = pointcut.getOwner();
+                final Type advice = adviceArgumentTypes[i];
+                validateCompatibility(context, owner, advice, ErrorCode.ADVICE_METHOD_PARAM_THIS_NOT_COMPATIBLE, i);
+            });
+        }
 
-    private void validateThisSpec(
-        final ValidationContext context, final boolean thisFound, final int i) {
-      if (thisFound) {
-        context.addError(ErrorCode.ADVICE_PARAMETER_THIS_DUPLICATED, i);
-      }
-      if (i != 0) {
-        context.addError(ErrorCode.ADVICE_PARAMETER_THIS_SHOULD_BE_FIRST, i);
-      }
-      if (isStaticPointcut()) {
-        context.addError(ErrorCode.ADVICE_PARAMETER_THIS_ON_STATIC_METHOD, i);
-      }
-      if (isInvokeDynamic()) {
-        context.addError(ErrorCode.ADVICE_PARAMETER_THIS_ON_INVOKE_DYNAMIC, i);
-      }
-    }
+        protected void validateAdviceReturnTypeCompatibility(final ValidationContext context) {
+            if (!advice.isVoidReturn()) {
+                final Type pointcutType = pointcut.isConstructor()
+                        ? pointcut.getOwner()
+                        : pointcut.getMethodType().getReturnType();
+                final Type adviceType = advice.getMethodType().getReturnType();
+                validateCompatibility(
+                        context, pointcutType, adviceType, ErrorCode.ADVICE_METHOD_RETURN_NOT_COMPATIBLE, -1);
+            }
+        }
 
-    protected void validatePointcut(@Nonnull final ValidationContext context) {
-      if (pointcut != null) {
-        try {
-          final TypeResolver typeResolver = context.getContextProperty(TYPE_RESOLVER);
-          if (pointcut.isConstructor() && !pointcut.isVoidReturn()) {
-            context.addError(ErrorCode.ADVICE_POINTCUT_CONSTRUCTOR_NOT_VOID, pointcut);
-          }
-          pointcutMethod = typeResolver.resolveMethod(pointcut);
-        } catch (ResolutionException e) {
-          e.getErrors().forEach(context::addError);
+        private void validateInvokeDynamicConstCompatibility(
+                final ValidationContext context,
+                final Type[] adviceArgumentTypes,
+                final Set<Integer> pointcutParameters) {
+            withParameter(InvokeDynamicConstantsSpecification.class, (i, spec) -> {
+                final Type type = Types.OBJECT_ARRAY;
+                final Type advice = adviceArgumentTypes[i];
+                pointcutParameters.clear();
+                validateCompatibility(
+                        context, type, advice, ErrorCode.ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_NOT_COMPATIBLE, i);
+            });
         }
-      }
-    }
 
-    public void parseSignature(@Nonnull final AdvicePointcutParser parser) {
-      pointcut = parser.parse(signature);
-    }
+        private void validateAllArgsSpecCompatibility(
+                final ValidationContext context,
+                final Type[] adviceArgumentTypes,
+                final Set<Integer> pointcutParameters) {
+            withParameter(AllArgsSpecification.class, (i, spec) -> {
+                final Type type = Types.OBJECT_ARRAY;
+                final Type advice = adviceArgumentTypes[i];
+                pointcutParameters.clear();
+                validateCompatibility(context, type, advice, ErrorCode.ADVICE_METHOD_PARAM_ALL_ARGS_NOT_COMPATIBLE, i);
+            });
+        }
 
-    public MethodType getAdvice() {
-      return advice;
-    }
+        protected void validateCompatibility(
+                final ValidationContext context,
+                final Type pointcutType,
+                final Type adviceType,
+                final ErrorCode errorCode,
+                final int index) {
+            final TypeResolver typeResolver = context.getContextProperty(TYPE_RESOLVER);
+            if (!typeResolver.resolveType(adviceType).isAssignableFrom(typeResolver.resolveType(pointcutType))) {
+                context.addError(errorCode, pointcutType, adviceType, index);
+            }
+        }
 
-    public MethodType getPointcut() {
-      return pointcut;
-    }
+        protected void validateAdvice(@Nonnull final ValidationContext context) {
+            try {
+                validateAdviceParameters(context);
+                final TypeResolver typeResolver = context.getContextProperty(TYPE_RESOLVER);
+                final Method executable = (Method) typeResolver.resolveMethod(advice);
+                final int access = executable.getModifiers();
+                if (!Modifier.isPublic(access) || !Modifier.isStatic(access)) {
+                    context.addError(ErrorCode.ADVICE_METHOD_NOT_STATIC_AND_PUBLIC, this);
+                }
+            } catch (ResolutionException e) {
+                e.getErrors().forEach(context::addError);
+            }
+        }
 
-    public String getSignature() {
-      return signature;
-    }
+        protected void validateAdviceParameters(@Nonnull final ValidationContext context) {
+            final Type[] adviceArguments = advice.getMethodType().getArgumentTypes();
+            boolean thisFound = false,
+                    returnFound = false,
+                    allArgsFound = false,
+                    argumentFound = false,
+                    dynamicConstantsFound = false;
+            for (int i = 0; i < adviceArguments.length; i++) {
+                ParameterSpecification spec = parameters.get(i);
+                if (spec == null) {
+                    context.addError(ErrorCode.ADVICE_PARAMETER_NOT_ANNOTATED, i);
+                } else {
+                    if (spec instanceof ThisSpecification) {
+                        validateThisSpec(context, thisFound, i);
+                        thisFound = true;
+                    } else if (spec instanceof ReturnSpecification) {
+                        validateReturnSpec(context, returnFound, i);
+                        returnFound = true;
+                    } else if (spec instanceof AllArgsSpecification) {
+                        validateAllArgsSpec(context, allArgsFound, argumentFound, i);
+                        allArgsFound = true;
+                    } else if (spec instanceof InvokeDynamicConstantsSpecification) {
+                        validateInvokeDynamicConstSpec(context, dynamicConstantsFound, i);
+                        dynamicConstantsFound = true;
+                    } else {
+                        validateArgumentSpec(context, allArgsFound, i);
+                        argumentFound = true;
+                    }
+                }
+            }
+        }
 
-    public boolean isStaticPointcut() {
-      return pointcutMethod != null && Modifier.isStatic(pointcutMethod.getModifiers());
-    }
+        private void validateArgumentSpec(final ValidationContext context, final boolean allArgsFound, final int i) {
+            if (allArgsFound) {
+                context.addError(ErrorCode.ADVICE_PARAMETER_ALL_ARGS_MIXED, i);
+            }
+            if (isInvokeDynamic() && !(this instanceof AroundSpecification)) {
+                context.addError(ErrorCode.ADVICE_PARAMETER_ON_INVOKE_DYNAMIC, i);
+            }
+        }
 
-    public boolean isInvokeDynamic() {
-      return invokeDynamic;
-    }
+        private void validateInvokeDynamicConstSpec(
+                final ValidationContext context, final boolean dynamicConstantsFound, final int i) {
+            if (dynamicConstantsFound) {
+                context.addError(ErrorCode.ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_DUPLICATED, i);
+            }
+            if (!isInvokeDynamic()) {
+                context.addError(ErrorCode.ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_ON_NON_INVOKE_DYNAMIC, i);
+            }
+            if (!(this instanceof AfterSpecification)) {
+                context.addError(ErrorCode.ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_NON_AFTER_ADVICE, i);
+            }
+            final Type[] arguments = advice.getMethodType().getArgumentTypes();
+            if (i != arguments.length - 1) {
+                context.addError(ErrorCode.ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_SHOULD_BE_LAST, i);
+            }
+        }
 
-    /* Whether not all of the pointcut arguments are consumed or they're not
-     * consumed in sequential order or there are no pointcut arguments at all */
-    public boolean isPositionalArguments() {
-      if (parameters.isEmpty()) {
-        return true;
-      }
-      if (pointcut.getMethodType().getArgumentTypes().length != getArguments().count()) {
-        return true;
-      }
-
-      Iterator<ArgumentSpecification> iterator = getArguments().iterator();
-      int i = 0;
-      while (iterator.hasNext()) {
-        ArgumentSpecification spec = iterator.next();
-        if (spec.getIndex() != i) {
-          return true;
-        }
-        i++;
-      }
-      return false;
-    }
+        private void validateAllArgsSpec(
+                final ValidationContext context, final boolean allArgsFound, final boolean argumentFound, final int i) {
+            if (allArgsFound) {
+                context.addError(ErrorCode.ADVICE_PARAMETER_ALL_ARGS_DUPLICATED, i);
+            }
+            if (argumentFound) {
+                context.addError(ErrorCode.ADVICE_PARAMETER_ALL_ARGS_MIXED, i);
+            }
+        }
 
-    public boolean includeThis() {
-      if (findThis() != null) {
-        return true;
-      }
-      final AllArgsSpecification allArgs = findAllArguments();
-      return allArgs != null && allArgs.includeThis;
-    }
+        private void validateReturnSpec(final ValidationContext context, final boolean returnFound, final int i) {
+            if (returnFound) {
+                context.addError(ErrorCode.ADVICE_PARAMETER_RETURN_DUPLICATED, i);
+            }
+            final Type[] arguments = advice.getMethodType().getArgumentTypes();
+            if (i != arguments.length - 1) {
+                if (isInvokeDynamic()) {
+                    if (i != arguments.length - 2
+                            && !(parameters.get(arguments.length - 1)
+                                    instanceof InvokeDynamicConstantsSpecification)) {}
+
+                } else {
+                    context.addError(ErrorCode.ADVICE_PARAMETER_RETURN_SHOULD_BE_LAST, i);
+                }
+            }
+            if (!(this instanceof AfterSpecification)) {
+                context.addError(ErrorCode.ADVICE_PARAMETER_RETURN_NON_AFTER_ADVICE, i);
+            }
+        }
 
-    public ThisSpecification findThis() {
-      return findParameter(ThisSpecification.class);
-    }
+        private void validateThisSpec(final ValidationContext context, final boolean thisFound, final int i) {
+            if (thisFound) {
+                context.addError(ErrorCode.ADVICE_PARAMETER_THIS_DUPLICATED, i);
+            }
+            if (i != 0) {
+                context.addError(ErrorCode.ADVICE_PARAMETER_THIS_SHOULD_BE_FIRST, i);
+            }
+            if (isStaticPointcut()) {
+                context.addError(ErrorCode.ADVICE_PARAMETER_THIS_ON_STATIC_METHOD, i);
+            }
+            if (isInvokeDynamic()) {
+                context.addError(ErrorCode.ADVICE_PARAMETER_THIS_ON_INVOKE_DYNAMIC, i);
+            }
+        }
 
-    public ReturnSpecification findReturn() {
-      return findParameter(ReturnSpecification.class);
-    }
+        protected void validatePointcut(@Nonnull final ValidationContext context) {
+            if (pointcut != null) {
+                try {
+                    final TypeResolver typeResolver = context.getContextProperty(TYPE_RESOLVER);
+                    if (pointcut.isConstructor() && !pointcut.isVoidReturn()) {
+                        context.addError(ErrorCode.ADVICE_POINTCUT_CONSTRUCTOR_NOT_VOID, pointcut);
+                    }
+                    pointcutMethod = typeResolver.resolveMethod(pointcut);
+                } catch (ResolutionException e) {
+                    e.getErrors().forEach(context::addError);
+                }
+            }
+        }
 
-    public AllArgsSpecification findAllArguments() {
-      return findParameter(AllArgsSpecification.class);
-    }
+        public void parseSignature(@Nonnull final AdvicePointcutParser parser) {
+            pointcut = parser.parse(signature);
+        }
 
-    public InvokeDynamicConstantsSpecification findInvokeDynamicConstants() {
-      return findParameter(InvokeDynamicConstantsSpecification.class);
-    }
+        public MethodType getAdvice() {
+            return advice;
+        }
 
-    private <E extends ParameterSpecification> void withParameter(
-        final Class<E> spec, final BiConsumer<Integer, E> consumer) {
-      parameters.entrySet().stream()
-          .filter(entry -> spec.isInstance(entry.getValue()))
-          .forEach(entry -> consumer.accept(entry.getKey(), spec.cast(entry.getValue())));
-    }
+        public MethodType getPointcut() {
+            return pointcut;
+        }
 
-    private <E extends ParameterSpecification> E findParameter(final Class<E> spec) {
-      return parameters.values().stream()
-          .filter(spec::isInstance)
-          .map(spec::cast)
-          .findFirst()
-          .orElse(null);
-    }
+        public String getSignature() {
+            return signature;
+        }
 
-    public boolean isConstructor() {
-      return pointcut.isConstructor();
-    }
+        public boolean isStaticPointcut() {
+            return pointcutMethod != null && Modifier.isStatic(pointcutMethod.getModifiers());
+        }
 
-    public Stream<ArgumentSpecification> getArguments() {
-      return parameters.values().stream()
-          .filter(it -> it instanceof ArgumentSpecification)
-          .map(it -> (ArgumentSpecification) it);
-    }
-  }
-
-  public static final class BeforeSpecification extends AdviceSpecification {
-    public BeforeSpecification(
-        @Nonnull final MethodType advice,
-        @Nonnull final Map<Integer, ParameterSpecification> parameters,
-        @Nonnull final String signature,
-        final boolean invokeDynamic) {
-      super(advice, parameters, signature, invokeDynamic);
-    }
+        public boolean isInvokeDynamic() {
+            return invokeDynamic;
+        }
 
-    @Override
-    protected void validateAdvice(@Nonnull final ValidationContext context) {
-      if (!advice.isVoidReturn()) {
-        context.addError(ErrorCode.ADVICE_BEFORE_SHOULD_RETURN_VOID, advice);
-      }
-      if (findReturn() != null) {
-        context.addError(ErrorCode.ADVICE_BEFORE_SHOULD_NOT_CONTAIN_RETURN);
-      }
-      if (pointcut.isConstructor() && includeThis()) {
-        context.addError(ErrorCode.ADVICE_BEFORE_CTOR_SHOULD_NOT_CONTAIN_THIS);
-      }
-      super.validateAdvice(context);
-    }
+        /* Whether not all of the pointcut arguments are consumed or they're not
+         * consumed in sequential order or there are no pointcut arguments at all */
+        public boolean isPositionalArguments() {
+            if (parameters.isEmpty()) {
+                return true;
+            }
+            if (pointcut.getMethodType().getArgumentTypes().length
+                    != getArguments().count()) {
+                return true;
+            }
 
-    @Override
-    public String toString() {
-      return "@CallSite.Before(" + signature + ")";
-    }
-  }
-
-  public static final class AroundSpecification extends AdviceSpecification {
-    public AroundSpecification(
-        @Nonnull final MethodType advice,
-        @Nonnull final Map<Integer, ParameterSpecification> parameters,
-        @Nonnull final String signature,
-        final boolean invokeDynamic) {
-      super(advice, parameters, signature, invokeDynamic);
-    }
+            Iterator<ArgumentSpecification> iterator = getArguments().iterator();
+            int i = 0;
+            while (iterator.hasNext()) {
+                ArgumentSpecification spec = iterator.next();
+                if (spec.getIndex() != i) {
+                    return true;
+                }
+                i++;
+            }
+            return false;
+        }
 
-    @Override
-    protected void validateAdvice(@Nonnull final ValidationContext context) {
-      if (advice.isVoidReturn()) {
-        context.addError(ErrorCode.ADVICE_AROUND_SHOULD_NOT_RETURN_VOID);
-      }
-      if (findReturn() != null) {
-        context.addError(ErrorCode.ADVICE_AROUND_SHOULD_NOT_CONTAIN_RETURN);
-      }
-      super.validateAdvice(context);
-    }
+        public boolean includeThis() {
+            if (findThis() != null) {
+                return true;
+            }
+            final AllArgsSpecification allArgs = findAllArguments();
+            return allArgs != null && allArgs.includeThis;
+        }
 
-    @Override
-    protected void validatePointcut(@Nonnull final ValidationContext context) {
-      if (pointcut.isConstructor()) {
-        context.addError(ErrorCode.ADVICE_AROUND_POINTCUT_CTOR);
-      }
-      super.validatePointcut(context);
-    }
+        public ThisSpecification findThis() {
+            return findParameter(ThisSpecification.class);
+        }
 
-    @Override
-    public String toString() {
-      return "@CallSite.Around(" + signature + ")";
-    }
-  }
-
-  public static final class AfterSpecification extends AdviceSpecification {
-    public AfterSpecification(
-        @Nonnull final MethodType advice,
-        @Nonnull final Map<Integer, ParameterSpecification> parameters,
-        @Nonnull final String signature,
-        final boolean invokeDynamic) {
-      super(advice, parameters, signature, invokeDynamic);
-    }
+        public ReturnSpecification findReturn() {
+            return findParameter(ReturnSpecification.class);
+        }
 
-    @Override
-    protected void validateAdvice(@Nonnull final ValidationContext context) {
-      if (shouldNotUseReturn(pointcut)) {
-        if (!advice.isVoidReturn()) {
-          context.addError(ErrorCode.ADVICE_AFTER_VOID_METHOD_SHOULD_RETURN_VOID);
+        public AllArgsSpecification findAllArguments() {
+            return findParameter(AllArgsSpecification.class);
         }
-        if (findReturn() != null) {
-          context.addError(ErrorCode.ADVICE_AFTER_VOID_METHOD_SHOULD_NOT_HAVE_RETURN);
+
+        public InvokeDynamicConstantsSpecification findInvokeDynamicConstants() {
+            return findParameter(InvokeDynamicConstantsSpecification.class);
         }
-      } else {
-        if (advice.isVoidReturn()) {
-          context.addError(ErrorCode.ADVICE_AFTER_SHOULD_NOT_RETURN_VOID);
+
+        private <E extends ParameterSpecification> void withParameter(
+                final Class<E> spec, final BiConsumer<Integer, E> consumer) {
+            parameters.entrySet().stream()
+                    .filter(entry -> spec.isInstance(entry.getValue()))
+                    .forEach(entry -> consumer.accept(entry.getKey(), spec.cast(entry.getValue())));
         }
-        if (findReturn() == null) {
-          context.addError(ErrorCode.ADVICE_AFTER_SHOULD_HAVE_RETURN);
+
+        private <E extends ParameterSpecification> E findParameter(final Class<E> spec) {
+            return parameters.values().stream()
+                    .filter(spec::isInstance)
+                    .map(spec::cast)
+                    .findFirst()
+                    .orElse(null);
         }
-      }
-      if (!pointcut.isConstructor()) {
-        if (!isStaticPointcut() && !includeThis()) {
-          context.addError(ErrorCode.ADVICE_AFTER_SHOULD_HAVE_THIS);
+
+        public boolean isConstructor() {
+            return pointcut.isConstructor();
         }
-      } else {
-        if (findAllArguments() == null) {
-          context.addError(ErrorCode.ADVICE_AFTER_CONSTRUCTOR_ALL_ARGUMENTS);
+
+        public Stream<ArgumentSpecification> getArguments() {
+            return parameters.values().stream()
+                    .filter(it -> it instanceof ArgumentSpecification)
+                    .map(it -> (ArgumentSpecification) it);
         }
-      }
-      super.validateAdvice(context);
     }
 
-    private boolean shouldNotUseReturn(final MethodType type) {
-      return !type.isConstructor() && type.isVoidReturn();
-    }
+    public static final class BeforeSpecification extends AdviceSpecification {
+        public BeforeSpecification(
+                @Nonnull final MethodType advice,
+                @Nonnull final Map<Integer, ParameterSpecification> parameters,
+                @Nonnull final String signature,
+                final boolean invokeDynamic) {
+            super(advice, parameters, signature, invokeDynamic);
+        }
 
-    @Override
-    public String toString() {
-      return "@CallSite.After(" + signature + ")";
-    }
-  }
-
-  /**
-   * Description of a method parameter annotated with: {@link
-   * datadog.trace.agent.tooling.csi.CallSite.This}, {@link
-   * datadog.trace.agent.tooling.csi.CallSite.Argument}, {@link
-   * datadog.trace.agent.tooling.csi.CallSite.AllArguments}, {@link
-   * datadog.trace.agent.tooling.csi.CallSite.InvokeDynamicConstants}, {@link
-   * datadog.trace.agent.tooling.csi.CallSite.Return}
-   */
-  public abstract static class ParameterSpecification {}
-
-  public static final class ThisSpecification extends ParameterSpecification {
-    @Override
-    public String toString() {
-      return "@This";
-    }
-  }
+        @Override
+        protected void validateAdvice(@Nonnull final ValidationContext context) {
+            if (!advice.isVoidReturn()) {
+                context.addError(ErrorCode.ADVICE_BEFORE_SHOULD_RETURN_VOID, advice);
+            }
+            if (findReturn() != null) {
+                context.addError(ErrorCode.ADVICE_BEFORE_SHOULD_NOT_CONTAIN_RETURN);
+            }
+            if (pointcut.isConstructor() && includeThis()) {
+                context.addError(ErrorCode.ADVICE_BEFORE_CTOR_SHOULD_NOT_CONTAIN_THIS);
+            }
+            super.validateAdvice(context);
+        }
 
-  public static final class ReturnSpecification extends ParameterSpecification {
-    @Override
-    public String toString() {
-      return "@Return";
+        @Override
+        public String toString() {
+            return "@CallSite.Before(" + signature + ")";
+        }
     }
-  }
 
-  public static final class AllArgsSpecification extends ParameterSpecification {
+    public static final class AroundSpecification extends AdviceSpecification {
+        public AroundSpecification(
+                @Nonnull final MethodType advice,
+                @Nonnull final Map<Integer, ParameterSpecification> parameters,
+                @Nonnull final String signature,
+                final boolean invokeDynamic) {
+            super(advice, parameters, signature, invokeDynamic);
+        }
 
-    private boolean includeThis;
+        @Override
+        protected void validateAdvice(@Nonnull final ValidationContext context) {
+            if (advice.isVoidReturn()) {
+                context.addError(ErrorCode.ADVICE_AROUND_SHOULD_NOT_RETURN_VOID);
+            }
+            if (findReturn() != null) {
+                context.addError(ErrorCode.ADVICE_AROUND_SHOULD_NOT_CONTAIN_RETURN);
+            }
+            super.validateAdvice(context);
+        }
 
-    public boolean isIncludeThis() {
-      return includeThis;
-    }
+        @Override
+        protected void validatePointcut(@Nonnull final ValidationContext context) {
+            if (pointcut.isConstructor()) {
+                context.addError(ErrorCode.ADVICE_AROUND_POINTCUT_CTOR);
+            }
+            super.validatePointcut(context);
+        }
 
-    public void setIncludeThis(boolean includeThis) {
-      this.includeThis = includeThis;
+        @Override
+        public String toString() {
+            return "@CallSite.Around(" + signature + ")";
+        }
     }
 
-    @Override
-    public String toString() {
-      return "@AllArguments(includeThis=" + includeThis + ")";
-    }
-  }
+    public static final class AfterSpecification extends AdviceSpecification {
+        public AfterSpecification(
+                @Nonnull final MethodType advice,
+                @Nonnull final Map<Integer, ParameterSpecification> parameters,
+                @Nonnull final String signature,
+                final boolean invokeDynamic) {
+            super(advice, parameters, signature, invokeDynamic);
+        }
 
-  public static final class ArgumentSpecification extends ParameterSpecification {
+        @Override
+        protected void validateAdvice(@Nonnull final ValidationContext context) {
+            if (shouldNotUseReturn(pointcut)) {
+                if (!advice.isVoidReturn()) {
+                    context.addError(ErrorCode.ADVICE_AFTER_VOID_METHOD_SHOULD_RETURN_VOID);
+                }
+                if (findReturn() != null) {
+                    context.addError(ErrorCode.ADVICE_AFTER_VOID_METHOD_SHOULD_NOT_HAVE_RETURN);
+                }
+            } else {
+                if (advice.isVoidReturn()) {
+                    context.addError(ErrorCode.ADVICE_AFTER_SHOULD_NOT_RETURN_VOID);
+                }
+                if (findReturn() == null) {
+                    context.addError(ErrorCode.ADVICE_AFTER_SHOULD_HAVE_RETURN);
+                }
+            }
+            if (!pointcut.isConstructor()) {
+                if (!isStaticPointcut() && !includeThis()) {
+                    context.addError(ErrorCode.ADVICE_AFTER_SHOULD_HAVE_THIS);
+                }
+            } else {
+                if (findAllArguments() == null) {
+                    context.addError(ErrorCode.ADVICE_AFTER_CONSTRUCTOR_ALL_ARGUMENTS);
+                }
+            }
+            super.validateAdvice(context);
+        }
 
-    private int index;
+        private boolean shouldNotUseReturn(final MethodType type) {
+            return !type.isConstructor() && type.isVoidReturn();
+        }
 
-    public int getIndex() {
-      return index;
+        @Override
+        public String toString() {
+            return "@CallSite.After(" + signature + ")";
+        }
     }
 
-    public void setIndex(final int index) {
-      this.index = index;
+    /**
+     * Description of a method parameter annotated with: {@link
+     * datadog.trace.agent.tooling.csi.CallSite.This}, {@link
+     * datadog.trace.agent.tooling.csi.CallSite.Argument}, {@link
+     * datadog.trace.agent.tooling.csi.CallSite.AllArguments}, {@link
+     * datadog.trace.agent.tooling.csi.CallSite.InvokeDynamicConstants}, {@link
+     * datadog.trace.agent.tooling.csi.CallSite.Return}
+     */
+    public abstract static class ParameterSpecification {}
+
+    public static final class ThisSpecification extends ParameterSpecification {
+        @Override
+        public String toString() {
+            return "@This";
+        }
     }
 
-    @Override
-    public String toString() {
-      return "@Argument(" + index + ")";
+    public static final class ReturnSpecification extends ParameterSpecification {
+        @Override
+        public String toString() {
+            return "@Return";
+        }
     }
-  }
 
-  public static final class InvokeDynamicConstantsSpecification extends ParameterSpecification {
-    @Override
-    public String toString() {
-      return "@InvokeDynamicConstants";
-    }
-  }
-
-  public static final class Enabled {
-    private final MethodType method;
-    private final List<String> arguments;
-
-    public Enabled(final List<String> enabled) {
-      this.arguments = enabled.size() <= 2 ? emptyList() : enabled.subList(2, enabled.size());
-      this.method =
-          new MethodType(
-              classNameToType(enabled.get(0)),
-              enabled.get(1),
-              Type.getMethodType(Types.BOOLEAN, stringTypeArray(arguments.size())));
+    public static final class AllArgsSpecification extends ParameterSpecification {
+
+        private boolean includeThis;
+
+        public boolean isIncludeThis() {
+            return includeThis;
+        }
+
+        public void setIncludeThis(boolean includeThis) {
+            this.includeThis = includeThis;
+        }
+
+        @Override
+        public String toString() {
+            return "@AllArguments(includeThis=" + includeThis + ")";
+        }
     }
 
-    public MethodType getMethod() {
-      return method;
+    public static final class ArgumentSpecification extends ParameterSpecification {
+
+        private int index;
+
+        public int getIndex() {
+            return index;
+        }
+
+        public void setIndex(final int index) {
+            this.index = index;
+        }
+
+        @Override
+        public String toString() {
+            return "@Argument(" + index + ")";
+        }
     }
 
-    public List<String> getArguments() {
-      return arguments;
+    public static final class InvokeDynamicConstantsSpecification extends ParameterSpecification {
+        @Override
+        public String toString() {
+            return "@InvokeDynamicConstants";
+        }
     }
 
-    private Type[] stringTypeArray(final int size) {
-      final Type[] types = new Type[size];
-      Arrays.fill(types, Types.STRING);
-      return types;
+    public static final class Enabled {
+        private final MethodType method;
+        private final List<String> arguments;
+
+        public Enabled(final List<String> enabled) {
+            this.arguments = enabled.size() <= 2 ? emptyList() : enabled.subList(2, enabled.size());
+            this.method = new MethodType(
+                    classNameToType(enabled.get(0)),
+                    enabled.get(1),
+                    Type.getMethodType(Types.BOOLEAN, stringTypeArray(arguments.size())));
+        }
+
+        public MethodType getMethod() {
+            return method;
+        }
+
+        public List<String> getArguments() {
+            return arguments;
+        }
+
+        private Type[] stringTypeArray(final int size) {
+            final Type[] types = new Type[size];
+            Arrays.fill(types, Types.STRING);
+            return types;
+        }
     }
-  }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/RegexpAdvicePointcutParser.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/RegexpAdvicePointcutParser.java
index d3205dfd0d3..cf488e45e21 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/RegexpAdvicePointcutParser.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/RegexpAdvicePointcutParser.java
@@ -23,120 +23,110 @@
  */
 public class RegexpAdvicePointcutParser implements AdvicePointcutParser {
 
-  private static final Pattern ADVICE_SIGNATURE_PATTERN =
-      Pattern.compile("^(?<return>\\S*)\\s+(?<type>\\S*)\\.(?<method>\\S*)\\s*\\((?<args>.*)\\)$");
-  private static final char ARRAY_DESCRIPTOR = '[';
-  private static final Map<String, Type> PRIMITIVE_TYPES = new HashMap<>(9);
+    private static final Pattern ADVICE_SIGNATURE_PATTERN =
+            Pattern.compile("^(?<return>\\S*)\\s+(?<type>\\S*)\\.(?<method>\\S*)\\s*\\((?<args>.*)\\)$");
+    private static final char ARRAY_DESCRIPTOR = '[';
+    private static final Map<String, Type> PRIMITIVE_TYPES = new HashMap<>(9);
 
-  static {
-    PRIMITIVE_TYPES.put("byte", Type.BYTE_TYPE);
-    PRIMITIVE_TYPES.put("char", Type.CHAR_TYPE);
-    PRIMITIVE_TYPES.put("double", Type.DOUBLE_TYPE);
-    PRIMITIVE_TYPES.put("float", Type.FLOAT_TYPE);
-    PRIMITIVE_TYPES.put("int", Type.INT_TYPE);
-    PRIMITIVE_TYPES.put("long", Type.LONG_TYPE);
-    PRIMITIVE_TYPES.put("short", Type.SHORT_TYPE);
-    PRIMITIVE_TYPES.put("boolean", Type.BOOLEAN_TYPE);
-    PRIMITIVE_TYPES.put("void", Type.VOID_TYPE);
-  }
-
-  @Override
-  @Nonnull
-  public MethodType parse(@Nonnull final String signature) {
-    final Matcher matcher = ADVICE_SIGNATURE_PATTERN.matcher(signature.trim());
-    if (!matcher.matches()) {
-      final String pattern = ADVICE_SIGNATURE_PATTERN.pattern();
-      throw new SignatureParsingError(
-          new Failure(ErrorCode.POINTCUT_SIGNATURE_INVALID, signature, pattern));
-    }
-    final HasErrors errors = new HasErrorsImpl();
-    final Type target = parseTarget(signature, matcher, errors);
-    final Type returnType = parseReturn(signature, matcher, errors);
-    final Type[] argTypes = parseArguments(signature, matcher, errors);
-    if (!errors.isSuccess()) {
-      throw new SignatureParsingError(errors);
+    static {
+        PRIMITIVE_TYPES.put("byte", Type.BYTE_TYPE);
+        PRIMITIVE_TYPES.put("char", Type.CHAR_TYPE);
+        PRIMITIVE_TYPES.put("double", Type.DOUBLE_TYPE);
+        PRIMITIVE_TYPES.put("float", Type.FLOAT_TYPE);
+        PRIMITIVE_TYPES.put("int", Type.INT_TYPE);
+        PRIMITIVE_TYPES.put("long", Type.LONG_TYPE);
+        PRIMITIVE_TYPES.put("short", Type.SHORT_TYPE);
+        PRIMITIVE_TYPES.put("boolean", Type.BOOLEAN_TYPE);
+        PRIMITIVE_TYPES.put("void", Type.VOID_TYPE);
     }
-    final String method = matcher.group("method").trim();
-    assert target != null && returnType != null;
-    return new MethodType(target, method, Type.getMethodType(returnType, argTypes));
-  }
 
-  private static Type parseTarget(
-      @Nonnull final String signature,
-      @Nonnull final Matcher matcher,
-      @Nonnull final HasErrors errors) {
-    final String typeName = matcher.group("type");
-    try {
-      return parseType(typeName);
-    } catch (Throwable e) {
-      errors.addError(e, ErrorCode.POINTCUT_SIGNATURE_INVALID_TYPE, signature, typeName);
-      return null;
+    @Override
+    @Nonnull
+    public MethodType parse(@Nonnull final String signature) {
+        final Matcher matcher = ADVICE_SIGNATURE_PATTERN.matcher(signature.trim());
+        if (!matcher.matches()) {
+            final String pattern = ADVICE_SIGNATURE_PATTERN.pattern();
+            throw new SignatureParsingError(new Failure(ErrorCode.POINTCUT_SIGNATURE_INVALID, signature, pattern));
+        }
+        final HasErrors errors = new HasErrorsImpl();
+        final Type target = parseTarget(signature, matcher, errors);
+        final Type returnType = parseReturn(signature, matcher, errors);
+        final Type[] argTypes = parseArguments(signature, matcher, errors);
+        if (!errors.isSuccess()) {
+            throw new SignatureParsingError(errors);
+        }
+        final String method = matcher.group("method").trim();
+        assert target != null && returnType != null;
+        return new MethodType(target, method, Type.getMethodType(returnType, argTypes));
     }
-  }
 
-  private static Type parseReturn(
-      @Nonnull final String signature,
-      @Nonnull final Matcher matcher,
-      @Nonnull final HasErrors errors) {
-    final String returnTypeName = matcher.group("return").trim();
-    try {
-      return parseType(returnTypeName);
-    } catch (Throwable e) {
-      errors.addError(e, ErrorCode.POINTCUT_SIGNATURE_INVALID_TYPE, signature, returnTypeName);
-      return null;
+    private static Type parseTarget(
+            @Nonnull final String signature, @Nonnull final Matcher matcher, @Nonnull final HasErrors errors) {
+        final String typeName = matcher.group("type");
+        try {
+            return parseType(typeName);
+        } catch (Throwable e) {
+            errors.addError(e, ErrorCode.POINTCUT_SIGNATURE_INVALID_TYPE, signature, typeName);
+            return null;
+        }
     }
-  }
 
-  private static Type[] parseArguments(
-      @Nonnull final String signature,
-      @Nonnull final Matcher matcher,
-      @Nonnull final HasErrors errors) {
-    final String argsGroup = matcher.group("args");
-    final String names = argsGroup == null ? "" : argsGroup.trim();
-    if (names.isEmpty()) {
-      return new Type[0];
+    private static Type parseReturn(
+            @Nonnull final String signature, @Nonnull final Matcher matcher, @Nonnull final HasErrors errors) {
+        final String returnTypeName = matcher.group("return").trim();
+        try {
+            return parseType(returnTypeName);
+        } catch (Throwable e) {
+            errors.addError(e, ErrorCode.POINTCUT_SIGNATURE_INVALID_TYPE, signature, returnTypeName);
+            return null;
+        }
     }
-    String[] argNames = names.split(",");
-    Type[] result = new Type[argNames.length];
-    for (int i = 0; i < argNames.length; i++) {
-      String argTypeName = argNames[i];
-      try {
-        result[i] = parseType(argTypeName.trim());
-      } catch (Throwable e) {
-        errors.addError(e, ErrorCode.POINTCUT_SIGNATURE_INVALID_TYPE, signature, argTypeName);
-      }
-    }
-    return result;
-  }
 
-  private static Type parseType(final String name) {
-    if (name == null || name.isEmpty()) {
-      throw new IllegalArgumentException("Type name cannot be null or empty");
+    private static Type[] parseArguments(
+            @Nonnull final String signature, @Nonnull final Matcher matcher, @Nonnull final HasErrors errors) {
+        final String argsGroup = matcher.group("args");
+        final String names = argsGroup == null ? "" : argsGroup.trim();
+        if (names.isEmpty()) {
+            return new Type[0];
+        }
+        String[] argNames = names.split(",");
+        Type[] result = new Type[argNames.length];
+        for (int i = 0; i < argNames.length; i++) {
+            String argTypeName = argNames[i];
+            try {
+                result[i] = parseType(argTypeName.trim());
+            } catch (Throwable e) {
+                errors.addError(e, ErrorCode.POINTCUT_SIGNATURE_INVALID_TYPE, signature, argTypeName);
+            }
+        }
+        return result;
     }
-    int startOfArray = name.indexOf(ARRAY_DESCRIPTOR);
-    if (startOfArray >= 0) {
-      final Type arrayType = parseType(name.substring(0, startOfArray));
-      String arrayDeclaration = name.substring(startOfArray);
-      int dimension =
-          (int)
-              arrayDeclaration
-                  .chars()
-                  .filter(it -> it == ARRAY_DESCRIPTOR)
-                  .count(); // assumes array notation is well-formed
-      String elementType =
-          arrayType.getSort() == Type.OBJECT
-              ? classNameToDescriptor(arrayType.getClassName())
-              : arrayType.getInternalName();
-      return Type.getType(repeat(ARRAY_DESCRIPTOR, dimension) + elementType);
+
+    private static Type parseType(final String name) {
+        if (name == null || name.isEmpty()) {
+            throw new IllegalArgumentException("Type name cannot be null or empty");
+        }
+        int startOfArray = name.indexOf(ARRAY_DESCRIPTOR);
+        if (startOfArray >= 0) {
+            final Type arrayType = parseType(name.substring(0, startOfArray));
+            String arrayDeclaration = name.substring(startOfArray);
+            int dimension = (int) arrayDeclaration
+                    .chars()
+                    .filter(it -> it == ARRAY_DESCRIPTOR)
+                    .count(); // assumes array notation is well-formed
+            String elementType = arrayType.getSort() == Type.OBJECT
+                    ? classNameToDescriptor(arrayType.getClassName())
+                    : arrayType.getInternalName();
+            return Type.getType(repeat(ARRAY_DESCRIPTOR, dimension) + elementType);
+        }
+        return classNameOrPrimitiveToType(name);
     }
-    return classNameOrPrimitiveToType(name);
-  }
 
-  public static Type classNameOrPrimitiveToType(final String name) {
-    if (name == null || name.isEmpty()) {
-      return null;
+    public static Type classNameOrPrimitiveToType(final String name) {
+        if (name == null || name.isEmpty()) {
+            return null;
+        }
+        final Type type = PRIMITIVE_TYPES.get(name);
+        return type != null ? type : classNameToType(name);
     }
-    final Type type = PRIMITIVE_TYPES.get(name);
-    return type != null ? type : classNameToType(name);
-  }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/TypeResolverPool.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/TypeResolverPool.java
index f1d5159a46a..a1653a8205b 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/TypeResolverPool.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/TypeResolverPool.java
@@ -21,139 +21,137 @@
 
 public class TypeResolverPool implements TypeResolver {
 
-  private final List<ClassLoader> classpath;
-  private final Map<Type, Class<?>> resolvedTypes = new HashMap<>();
-  private final Map<MethodType, Executable> resolvedMethods = new HashMap<>();
+    private final List<ClassLoader> classpath;
+    private final Map<Type, Class<?>> resolvedTypes = new HashMap<>();
+    private final Map<MethodType, Executable> resolvedMethods = new HashMap<>();
 
-  public TypeResolverPool() {
-    this(Thread.currentThread().getContextClassLoader());
-  }
-
-  public TypeResolverPool(@Nonnull final ClassLoader... classpath) {
-    this.classpath = Arrays.asList(classpath);
-    resolvedTypes.put(Type.BYTE_TYPE, byte.class);
-    resolvedTypes.put(Type.CHAR_TYPE, char.class);
-    resolvedTypes.put(Type.DOUBLE_TYPE, double.class);
-    resolvedTypes.put(Type.FLOAT_TYPE, float.class);
-    resolvedTypes.put(Type.INT_TYPE, int.class);
-    resolvedTypes.put(Type.LONG_TYPE, long.class);
-    resolvedTypes.put(Type.SHORT_TYPE, short.class);
-    resolvedTypes.put(Type.BOOLEAN_TYPE, boolean.class);
-    resolvedTypes.put(Type.VOID_TYPE, void.class);
-  }
-
-  @Override
-  @Nonnull
-  public Class<?> resolveType(@Nonnull final Type type) {
-    return resolvedTypes.computeIfAbsent(type, this::resolveNewType);
-  }
-
-  private Class<?> resolveNewType(@Nonnull final Type type) {
-    if (type.getSort() == Type.METHOD) {
-      throw new IllegalArgumentException(type + " is a method");
+    public TypeResolverPool() {
+        this(Thread.currentThread().getContextClassLoader());
     }
-    Throwable cause = null;
-    final String className = getResolvableClassName(type);
-    for (ClassLoader classLoader : classpath) {
-      try {
-        return Class.forName(className, true, classLoader);
-      } catch (Throwable t) {
-        cause = t;
-      }
+
+    public TypeResolverPool(@Nonnull final ClassLoader... classpath) {
+        this.classpath = Arrays.asList(classpath);
+        resolvedTypes.put(Type.BYTE_TYPE, byte.class);
+        resolvedTypes.put(Type.CHAR_TYPE, char.class);
+        resolvedTypes.put(Type.DOUBLE_TYPE, double.class);
+        resolvedTypes.put(Type.FLOAT_TYPE, float.class);
+        resolvedTypes.put(Type.INT_TYPE, int.class);
+        resolvedTypes.put(Type.LONG_TYPE, long.class);
+        resolvedTypes.put(Type.SHORT_TYPE, short.class);
+        resolvedTypes.put(Type.BOOLEAN_TYPE, boolean.class);
+        resolvedTypes.put(Type.VOID_TYPE, void.class);
     }
-    if (cause == null) {
-      throw new ResolutionException(new Failure(ErrorCode.UNRESOLVED_TYPE, type));
-    } else {
-      throw new ResolutionException(new Failure(cause, ErrorCode.UNRESOLVED_TYPE, type));
+
+    @Override
+    @Nonnull
+    public Class<?> resolveType(@Nonnull final Type type) {
+        return resolvedTypes.computeIfAbsent(type, this::resolveNewType);
     }
-  }
 
-  private String getResolvableClassName(final Type type) {
-    switch (type.getSort()) {
-      case Type.ARRAY:
-        Type element = type.getElementType();
-        String elementClassName =
-            element.getSort() == Type.OBJECT
-                ? "L" + element.getClassName() + ";"
-                : element.getInternalName();
-        return repeat('[', type.getDimensions()) + elementClassName;
-      case Type.OBJECT:
-        return type.getClassName();
-      default:
-        throw new IllegalArgumentException(
-            "Primitive types should have already been resolved " + type);
+    private Class<?> resolveNewType(@Nonnull final Type type) {
+        if (type.getSort() == Type.METHOD) {
+            throw new IllegalArgumentException(type + " is a method");
+        }
+        Throwable cause = null;
+        final String className = getResolvableClassName(type);
+        for (ClassLoader classLoader : classpath) {
+            try {
+                return Class.forName(className, true, classLoader);
+            } catch (Throwable t) {
+                cause = t;
+            }
+        }
+        if (cause == null) {
+            throw new ResolutionException(new Failure(ErrorCode.UNRESOLVED_TYPE, type));
+        } else {
+            throw new ResolutionException(new Failure(cause, ErrorCode.UNRESOLVED_TYPE, type));
+        }
     }
-  }
 
-  @Override
-  @Nonnull
-  public Executable resolveMethod(@Nonnull final MethodType method) {
-    return resolvedMethods.computeIfAbsent(method, this::resolveNewMethod);
-  }
+    private String getResolvableClassName(final Type type) {
+        switch (type.getSort()) {
+            case Type.ARRAY:
+                Type element = type.getElementType();
+                String elementClassName = element.getSort() == Type.OBJECT
+                        ? "L" + element.getClassName() + ";"
+                        : element.getInternalName();
+                return repeat('[', type.getDimensions()) + elementClassName;
+            case Type.OBJECT:
+                return type.getClassName();
+            default:
+                throw new IllegalArgumentException("Primitive types should have already been resolved " + type);
+        }
+    }
 
-  private Executable resolveNewMethod(@Nonnull final MethodType method) {
-    final Class<?> owner = resolveType(method.getOwner());
-    final Type[] argumentTypes = method.getMethodType().getArgumentTypes();
-    final Class<?>[] arguments = new Class<?>[argumentTypes.length];
-    for (int i = 0; i < argumentTypes.length; i++) {
-      arguments[i] = resolveType(argumentTypes[i]);
+    @Override
+    @Nonnull
+    public Executable resolveMethod(@Nonnull final MethodType method) {
+        return resolvedMethods.computeIfAbsent(method, this::resolveNewMethod);
     }
-    try {
-      if (method.isConstructor()) {
-        try {
-          return owner.getDeclaredConstructor(arguments);
-        } catch (final NoSuchMethodException e) {
-          return owner.getConstructor(arguments);
+
+    private Executable resolveNewMethod(@Nonnull final MethodType method) {
+        final Class<?> owner = resolveType(method.getOwner());
+        final Type[] argumentTypes = method.getMethodType().getArgumentTypes();
+        final Class<?>[] arguments = new Class<?>[argumentTypes.length];
+        for (int i = 0; i < argumentTypes.length; i++) {
+            arguments[i] = resolveType(argumentTypes[i]);
         }
-      } else {
         try {
-          return owner.getDeclaredMethod(method.getMethodName(), arguments);
-        } catch (final NoSuchMethodException e) {
-          return owner.getMethod(method.getMethodName(), arguments);
+            if (method.isConstructor()) {
+                try {
+                    return owner.getDeclaredConstructor(arguments);
+                } catch (final NoSuchMethodException e) {
+                    return owner.getConstructor(arguments);
+                }
+            } else {
+                try {
+                    return owner.getDeclaredMethod(method.getMethodName(), arguments);
+                } catch (final NoSuchMethodException e) {
+                    return owner.getMethod(method.getMethodName(), arguments);
+                }
+            }
+        } catch (final ResolutionException e) {
+            throw e;
+        } catch (final Throwable e) {
+            throw new ResolutionException(new Failure(e, ErrorCode.UNRESOLVED_METHOD, method));
         }
-      }
-    } catch (final ResolutionException e) {
-      throw e;
-    } catch (final Throwable e) {
-      throw new ResolutionException(new Failure(e, ErrorCode.UNRESOLVED_METHOD, method));
     }
-  }
 
-  @Override
-  public TypeSolver getParent() {
-    return null;
-  }
+    @Override
+    public TypeSolver getParent() {
+        return null;
+    }
 
-  @Override
-  public void setParent(final TypeSolver parent) {}
+    @Override
+    public void setParent(final TypeSolver parent) {}
 
-  @Override
-  public SymbolReference<ResolvedReferenceTypeDeclaration> tryToSolveType(final String name) {
-    try {
-      // inner classes use a dollar instead of a dot in the class name
-      final StringBuilder builder = new StringBuilder(name.length());
-      final String[] parts = name.split("\\.");
-      for (int i = 0; i < parts.length; i++) {
-        final String part = parts[i];
-        if (i > 0) {
-          final String prev = parts[i - 1];
-          final boolean inner =
-              Character.isUpperCase(prev.charAt(0)) && Character.isUpperCase(part.charAt(0));
-          builder.append(inner ? '$' : '.');
+    @Override
+    public SymbolReference<ResolvedReferenceTypeDeclaration> tryToSolveType(final String name) {
+        try {
+            // inner classes use a dollar instead of a dot in the class name
+            final StringBuilder builder = new StringBuilder(name.length());
+            final String[] parts = name.split("\\.");
+            for (int i = 0; i < parts.length; i++) {
+                final String part = parts[i];
+                if (i > 0) {
+                    final String prev = parts[i - 1];
+                    final boolean inner =
+                            Character.isUpperCase(prev.charAt(0)) && Character.isUpperCase(part.charAt(0));
+                    builder.append(inner ? '$' : '.');
+                }
+                builder.append(part);
+            }
+            final Type type = classNameToType(builder.toString());
+            final Class<?> clazz = resolveType(type);
+            return SymbolReference.solved(ReflectionFactory.typeDeclarationFor(clazz, getRoot()));
+        } catch (final Throwable e) {
+            return SymbolReference.unsolved();
         }
-        builder.append(part);
-      }
-      final Type type = classNameToType(builder.toString());
-      final Class<?> clazz = resolveType(type);
-      return SymbolReference.solved(ReflectionFactory.typeDeclarationFor(clazz, getRoot()));
-    } catch (final Throwable e) {
-      return SymbolReference.unsolved();
     }
-  }
 
-  @Override
-  public SymbolReference<ResolvedReferenceTypeDeclaration> tryToSolveTypeInModule(
-      String qualifiedModuleName, String simpleTypeName) {
-    return tryToSolveType(simpleTypeName);
-  }
+    @Override
+    public SymbolReference<ResolvedReferenceTypeDeclaration> tryToSolveTypeInModule(
+            String qualifiedModuleName, String simpleTypeName) {
+        return tryToSolveType(simpleTypeName);
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/ext/IastExtension.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/ext/IastExtension.java
index 9373073291c..070ae52ca46 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/ext/IastExtension.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/ext/IastExtension.java
@@ -61,433 +61,410 @@
 @SuppressWarnings("OptionalGetWithoutIsPresent")
 public class IastExtension implements Extension {
 
-  private static final String IAST_CALL_SITES_CLASS = "IastCallSites";
-  static final String IAST_CALL_SITES_FQCN = "datadog.trace.api.iast." + IAST_CALL_SITES_CLASS;
-  private static final String HAS_TELEMETRY_INTERFACE = IAST_CALL_SITES_CLASS + ".HasTelemetry";
-  private static final String IAST_METRIC_COLLECTOR_CLASS = "IastMetricCollector";
-  private static final String IAST_METRIC_COLLECTOR_FQCN =
-      "datadog.trace.api.iast.telemetry." + IAST_METRIC_COLLECTOR_CLASS;
-
-  private static final String IAST_METRIC_COLLECTOR_INTERNAL_NAME =
-      IAST_METRIC_COLLECTOR_FQCN.replaceAll("\\.", "/");
-
-  private static final String VERBOSITY_CLASS = "Verbosity";
-  private static final String VERBOSITY_FQCN =
-      "datadog.trace.api.iast.telemetry." + VERBOSITY_CLASS;
-
-  private static final String IAST_METRIC_CLASS = "IastMetric";
-  private static final String IAST_METRIC_FQCN =
-      "datadog.trace.api.iast.telemetry." + IAST_METRIC_CLASS;
-
-  private static final String IAST_METRIC_INTERNAL_NAME = IAST_METRIC_FQCN.replaceAll("\\.", "/");
-
-  @Override
-  public boolean appliesTo(@Nonnull final CallSiteSpecification spec) {
-    for (Type spi : spec.getSpi()) {
-      if (IAST_CALL_SITES_FQCN.equals(spi.getClassName())) {
-        return true;
-      }
+    private static final String IAST_CALL_SITES_CLASS = "IastCallSites";
+    static final String IAST_CALL_SITES_FQCN = "datadog.trace.api.iast." + IAST_CALL_SITES_CLASS;
+    private static final String HAS_TELEMETRY_INTERFACE = IAST_CALL_SITES_CLASS + ".HasTelemetry";
+    private static final String IAST_METRIC_COLLECTOR_CLASS = "IastMetricCollector";
+    private static final String IAST_METRIC_COLLECTOR_FQCN =
+            "datadog.trace.api.iast.telemetry." + IAST_METRIC_COLLECTOR_CLASS;
+
+    private static final String IAST_METRIC_COLLECTOR_INTERNAL_NAME = IAST_METRIC_COLLECTOR_FQCN.replaceAll("\\.", "/");
+
+    private static final String VERBOSITY_CLASS = "Verbosity";
+    private static final String VERBOSITY_FQCN = "datadog.trace.api.iast.telemetry." + VERBOSITY_CLASS;
+
+    private static final String IAST_METRIC_CLASS = "IastMetric";
+    private static final String IAST_METRIC_FQCN = "datadog.trace.api.iast.telemetry." + IAST_METRIC_CLASS;
+
+    private static final String IAST_METRIC_INTERNAL_NAME = IAST_METRIC_FQCN.replaceAll("\\.", "/");
+
+    @Override
+    public boolean appliesTo(@Nonnull final CallSiteSpecification spec) {
+        for (Type spi : spec.getSpi()) {
+            if (IAST_CALL_SITES_FQCN.equals(spi.getClassName())) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
-
-  @Override
-  public void apply(
-      @Nonnull final Configuration configuration, @Nonnull final CallSiteResult result)
-      throws Exception {
-    addTelemetry(configuration, result);
-  }
-
-  private void addTelemetry(final Configuration configuration, final CallSiteResult result)
-      throws Exception {
-    final TypeResolver resolver = getTypeResolver(configuration);
-
-    // class with the addAdvices methods
-    final CompilationUnit providerJavaFile = parseJavaFile(resolver, result.getFile());
-    final ClassOrInterfaceDeclaration provider = getPrimaryType(providerJavaFile);
-    if (implementsInterface(provider, HAS_TELEMETRY_INTERFACE)) {
-      // already processed
-      return;
+
+    @Override
+    public void apply(@Nonnull final Configuration configuration, @Nonnull final CallSiteResult result)
+            throws Exception {
+        addTelemetry(configuration, result);
     }
 
-    // find all the advices in the provider
-    final Map<AdviceSpecification, LambdaExpr> advices = findAdvices(result, provider);
-
-    // parse current call site class and fetch all metadata regarding telemetry
-    final CompilationUnit originalCallSiteFile =
-        findOriginalCallSite(configuration, resolver, result);
-    final ClassOrInterfaceDeclaration originalCallSite = getPrimaryType(originalCallSiteFile);
-    final AdviceMetadata globalMetadata = AdviceMetadata.findAdviceMetadata(originalCallSite);
-
-    // add telemetry to each of the advices
-    boolean hasTelemetry = false;
-    for (final MethodDeclaration callSiteMethod : originalCallSite.getMethods()) {
-      if (isCallSite(callSiteMethod)) {
-        final AdviceMetadata methodMetadata = AdviceMetadata.findAdviceMetadata(callSiteMethod);
-        final AdviceMetadata metaData = methodMetadata != null ? methodMetadata : globalMetadata;
-        // if the call site class or the method has been annotated then apply the extension
-        if (metaData != null) {
-          final List<LambdaExpr> adviceLambdas = filterAdviceLambdas(advices, callSiteMethod);
-          for (final LambdaExpr advice : adviceLambdas) {
-            addTelemetryToAdvice(resolver, advice, metaData);
-            hasTelemetry = true;
-          }
+    private void addTelemetry(final Configuration configuration, final CallSiteResult result) throws Exception {
+        final TypeResolver resolver = getTypeResolver(configuration);
+
+        // class with the addAdvices methods
+        final CompilationUnit providerJavaFile = parseJavaFile(resolver, result.getFile());
+        final ClassOrInterfaceDeclaration provider = getPrimaryType(providerJavaFile);
+        if (implementsInterface(provider, HAS_TELEMETRY_INTERFACE)) {
+            // already processed
+            return;
         }
-      }
-    }
 
-    if (hasTelemetry) {
-      // add telemetry support to the provider class
-      addTelemetryInterface(providerJavaFile);
+        // find all the advices in the provider
+        final Map<AdviceSpecification, LambdaExpr> advices = findAdvices(result, provider);
+
+        // parse current call site class and fetch all metadata regarding telemetry
+        final CompilationUnit originalCallSiteFile = findOriginalCallSite(configuration, resolver, result);
+        final ClassOrInterfaceDeclaration originalCallSite = getPrimaryType(originalCallSiteFile);
+        final AdviceMetadata globalMetadata = AdviceMetadata.findAdviceMetadata(originalCallSite);
+
+        // add telemetry to each of the advices
+        boolean hasTelemetry = false;
+        for (final MethodDeclaration callSiteMethod : originalCallSite.getMethods()) {
+            if (isCallSite(callSiteMethod)) {
+                final AdviceMetadata methodMetadata = AdviceMetadata.findAdviceMetadata(callSiteMethod);
+                final AdviceMetadata metaData = methodMetadata != null ? methodMetadata : globalMetadata;
+                // if the call site class or the method has been annotated then apply the extension
+                if (metaData != null) {
+                    final List<LambdaExpr> adviceLambdas = filterAdviceLambdas(advices, callSiteMethod);
+                    for (final LambdaExpr advice : adviceLambdas) {
+                        addTelemetryToAdvice(resolver, advice, metaData);
+                        hasTelemetry = true;
+                    }
+                }
+            }
+        }
+
+        if (hasTelemetry) {
+            // add telemetry support to the provider class
+            addTelemetryInterface(providerJavaFile);
+
+            // save the result
+            providerJavaFile.getStorage().get().save();
+        }
+    }
 
-      // save the result
-      providerJavaFile.getStorage().get().save();
+    private void addTelemetryInterface(final CompilationUnit javaClass) {
+        javaClass.addImport(IAST_METRIC_COLLECTOR_FQCN);
+        javaClass.addImport(IAST_METRIC_FQCN);
+        javaClass.addImport(VERBOSITY_FQCN);
+        final ClassOrInterfaceDeclaration mainType = getPrimaryType(javaClass);
+        mainType.addImplementedType(HAS_TELEMETRY_INTERFACE);
+        final FieldDeclaration verbosityField =
+                mainType.addField(VERBOSITY_CLASS, "verbosity", Modifier.Keyword.PRIVATE);
+        verbosityField
+                .getVariable(0)
+                .setInitializer(new FieldAccessExpr()
+                        .setScope(new NameExpr(VERBOSITY_CLASS))
+                        .setName("OFF"));
+        final MethodDeclaration enableTelemetry = mainType.addMethod("setVerbosity", Modifier.Keyword.PUBLIC)
+                .addParameter(VERBOSITY_CLASS, "verbosity")
+                .addAnnotation(Override.class);
+        final BlockStmt enableTelemetryBody = new BlockStmt();
+        enableTelemetryBody.addStatement(
+                new AssignExpr().setTarget(accessLocalField("verbosity")).setValue(new NameExpr("verbosity")));
+        enableTelemetry.setBody(enableTelemetryBody);
     }
-  }
-
-  private void addTelemetryInterface(final CompilationUnit javaClass) {
-    javaClass.addImport(IAST_METRIC_COLLECTOR_FQCN);
-    javaClass.addImport(IAST_METRIC_FQCN);
-    javaClass.addImport(VERBOSITY_FQCN);
-    final ClassOrInterfaceDeclaration mainType = getPrimaryType(javaClass);
-    mainType.addImplementedType(HAS_TELEMETRY_INTERFACE);
-    final FieldDeclaration verbosityField =
-        mainType.addField(VERBOSITY_CLASS, "verbosity", Modifier.Keyword.PRIVATE);
-    verbosityField
-        .getVariable(0)
-        .setInitializer(
-            new FieldAccessExpr().setScope(new NameExpr(VERBOSITY_CLASS)).setName("OFF"));
-    final MethodDeclaration enableTelemetry =
-        mainType
-            .addMethod("setVerbosity", Modifier.Keyword.PUBLIC)
-            .addParameter(VERBOSITY_CLASS, "verbosity")
-            .addAnnotation(Override.class);
-    final BlockStmt enableTelemetryBody = new BlockStmt();
-    enableTelemetryBody.addStatement(
-        new AssignExpr()
-            .setTarget(accessLocalField("verbosity"))
-            .setValue(new NameExpr("verbosity")));
-    enableTelemetry.setBody(enableTelemetryBody);
-  }
-
-  private CompilationUnit findOriginalCallSite(
-      final Configuration configuration, final TypeResolver resolver, final CallSiteResult result)
-      throws FileNotFoundException {
-    final String originalClass = result.getSpecification().getClazz().getClassName();
-    final String separator = File.separator.equals("\\") ? "\\\\" : File.separator;
-    final String javaFile = originalClass.replaceAll("\\.", separator);
-    return parseSourceFile(configuration, resolver, javaFile);
-  }
-
-  private void addTelemetryToAdvice(
-      final TypeResolver resolver, final LambdaExpr adviceLambda, final AdviceMetadata metaData) {
-    final BlockStmt lambdaBody = adviceLambda.getBody().asBlockStmt();
-    final String metric = getMetricName(metaData);
-    final Byte tagValue = getMetricTagValue(resolver, metaData);
-    final String instrumentedMetric = "INSTRUMENTED_" + metric;
-    final IfStmt instrumentedStatement =
-        new IfStmt()
-            .setCondition(isEnabledCondition(instrumentedMetric))
-            .setThenStmt(
-                new BlockStmt()
-                    .addStatement(addTelemetryCollectorMethod(instrumentedMetric, tagValue)));
-    lambdaBody.addStatement(0, instrumentedStatement);
-    final String executedMetric = "EXECUTED_" + metric;
-    final IfStmt executedStatement =
-        new IfStmt()
-            .setCondition(isEnabledCondition(executedMetric))
-            .setThenStmt(addTelemetryCollectorByteCode(executedMetric, tagValue));
-    lambdaBody.addStatement(1, executedStatement);
-  }
-
-  private static Expression isEnabledCondition(final String metric) {
-    return new MethodCallExpr()
-        .setScope(new FieldAccessExpr().setScope(new NameExpr(IAST_METRIC_CLASS)).setName(metric))
-        .setName("isEnabled")
-        .addArgument(accessLocalField("verbosity"));
-  }
-
-  private static MethodCallExpr addTelemetryCollectorMethod(
-      final String metric, final Byte tagValue) {
-    final MethodCallExpr method =
-        new MethodCallExpr()
-            .setScope(new NameExpr(IAST_METRIC_COLLECTOR_CLASS))
-            .setName("add")
-            .addArgument(
-                new FieldAccessExpr().setScope(new NameExpr(IAST_METRIC_CLASS)).setName(metric));
-    if (tagValue != null) {
-      method.addArgument(
-          new CastExpr()
-              .setExpression(new IntegerLiteralExpr(Byte.toString(tagValue)))
-              .setType(byte.class));
+
+    private CompilationUnit findOriginalCallSite(
+            final Configuration configuration, final TypeResolver resolver, final CallSiteResult result)
+            throws FileNotFoundException {
+        final String originalClass = result.getSpecification().getClazz().getClassName();
+        final String separator = File.separator.equals("\\") ? "\\\\" : File.separator;
+        final String javaFile = originalClass.replaceAll("\\.", separator);
+        return parseSourceFile(configuration, resolver, javaFile);
     }
-    method.addArgument(intLiteral(1));
-    return method;
-  }
-
-  private static BlockStmt addTelemetryCollectorByteCode(final String metric, final Byte tagValue) {
-    final BlockStmt stmt = new BlockStmt();
-    // this code generates the java source code needed to provide the bytecode for the statement
-    // IastTelemetryCollector.add(${metric}, 1); or IastTelemetryCollector.add(${metric}, ${tag},
-    // 1);
-    stmt.addStatement(
-        new MethodCallExpr()
-            .setScope(new NameExpr("handler"))
-            .setName("field")
-            .addArgument(
-                new FieldAccessExpr().setScope(new NameExpr(OPCODES_FQDN)).setName("GETSTATIC"))
-            .addArgument(new StringLiteralExpr(IAST_METRIC_INTERNAL_NAME))
-            .addArgument(new StringLiteralExpr(metric))
-            .addArgument(new StringLiteralExpr("L" + IAST_METRIC_INTERNAL_NAME + ";")));
-    if (tagValue != null) {
-      stmt.addStatement(pushByteExpression(tagValue));
+
+    private void addTelemetryToAdvice(
+            final TypeResolver resolver, final LambdaExpr adviceLambda, final AdviceMetadata metaData) {
+        final BlockStmt lambdaBody = adviceLambda.getBody().asBlockStmt();
+        final String metric = getMetricName(metaData);
+        final Byte tagValue = getMetricTagValue(resolver, metaData);
+        final String instrumentedMetric = "INSTRUMENTED_" + metric;
+        final IfStmt instrumentedStatement = new IfStmt()
+                .setCondition(isEnabledCondition(instrumentedMetric))
+                .setThenStmt(new BlockStmt().addStatement(addTelemetryCollectorMethod(instrumentedMetric, tagValue)));
+        lambdaBody.addStatement(0, instrumentedStatement);
+        final String executedMetric = "EXECUTED_" + metric;
+        final IfStmt executedStatement = new IfStmt()
+                .setCondition(isEnabledCondition(executedMetric))
+                .setThenStmt(addTelemetryCollectorByteCode(executedMetric, tagValue));
+        lambdaBody.addStatement(1, executedStatement);
     }
-    stmt.addStatement(
-        new MethodCallExpr()
-            .setScope(new NameExpr("handler"))
-            .setName("instruction")
-            .addArgument(
-                new FieldAccessExpr().setScope(new NameExpr(OPCODES_FQDN)).setName("ICONST_1")));
-    final String descriptor =
-        tagValue != null
-            ? "(L" + IAST_METRIC_INTERNAL_NAME + ";BI)V"
-            : "(L" + IAST_METRIC_INTERNAL_NAME + ";I)V";
-    stmt.addStatement(
-        new MethodCallExpr()
-            .setScope(new NameExpr("handler"))
-            .setName("method")
-            .addArgument(
-                new FieldAccessExpr().setScope(new NameExpr(OPCODES_FQDN)).setName("INVOKESTATIC"))
-            .addArgument(new StringLiteralExpr(IAST_METRIC_COLLECTOR_INTERNAL_NAME))
-            .addArgument(new StringLiteralExpr("add"))
-            .addArgument(new StringLiteralExpr(descriptor))
-            .addArgument(new BooleanLiteralExpr(false)));
-    return stmt;
-  }
-
-  private static String getMetricName(final AdviceMetadata metaData) {
-    final AnnotationExpr kind = metaData.getKind();
-    return kind.getName().getId().toUpperCase();
-  }
-
-  private static Byte getMetricTagValue(
-      final TypeResolver resolver, final AdviceMetadata metadata) {
-    if (metadata.getTag() == null) {
-      return null;
+
+    private static Expression isEnabledCondition(final String metric) {
+        return new MethodCallExpr()
+                .setScope(new FieldAccessExpr()
+                        .setScope(new NameExpr(IAST_METRIC_CLASS))
+                        .setName(metric))
+                .setName("isEnabled")
+                .addArgument(accessLocalField("verbosity"));
     }
-    final Expression tag = metadata.getTag();
-    if (tag.isIntegerLiteralExpr()) {
-      return tag.asIntegerLiteralExpr().asNumber().byteValue();
-    } else {
-      return getFieldValue(resolver, tag.asFieldAccessExpr());
+
+    private static MethodCallExpr addTelemetryCollectorMethod(final String metric, final Byte tagValue) {
+        final MethodCallExpr method = new MethodCallExpr()
+                .setScope(new NameExpr(IAST_METRIC_COLLECTOR_CLASS))
+                .setName("add")
+                .addArgument(new FieldAccessExpr()
+                        .setScope(new NameExpr(IAST_METRIC_CLASS))
+                        .setName(metric));
+        if (tagValue != null) {
+            method.addArgument(new CastExpr()
+                    .setExpression(new IntegerLiteralExpr(Byte.toString(tagValue)))
+                    .setType(byte.class));
+        }
+        method.addArgument(intLiteral(1));
+        return method;
     }
-  }
-
-  private static Byte getFieldValue(final TypeResolver resolver, final FieldAccessExpr tag) {
-    final FieldAccessExpr fieldAccessExpr = tag.asFieldAccessExpr();
-    final ResolvedFieldDeclaration value = fieldAccessExpr.resolve().asField();
-    try {
-      final Field field = getField(value);
-      field.setAccessible(true);
-      return (Byte) field.get(field.getDeclaringClass());
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+
+    private static BlockStmt addTelemetryCollectorByteCode(final String metric, final Byte tagValue) {
+        final BlockStmt stmt = new BlockStmt();
+        // this code generates the java source code needed to provide the bytecode for the statement
+        // IastTelemetryCollector.add(${metric}, 1); or IastTelemetryCollector.add(${metric}, ${tag},
+        // 1);
+        stmt.addStatement(new MethodCallExpr()
+                .setScope(new NameExpr("handler"))
+                .setName("field")
+                .addArgument(new FieldAccessExpr()
+                        .setScope(new NameExpr(OPCODES_FQDN))
+                        .setName("GETSTATIC"))
+                .addArgument(new StringLiteralExpr(IAST_METRIC_INTERNAL_NAME))
+                .addArgument(new StringLiteralExpr(metric))
+                .addArgument(new StringLiteralExpr("L" + IAST_METRIC_INTERNAL_NAME + ";")));
+        if (tagValue != null) {
+            stmt.addStatement(pushByteExpression(tagValue));
+        }
+        stmt.addStatement(new MethodCallExpr()
+                .setScope(new NameExpr("handler"))
+                .setName("instruction")
+                .addArgument(new FieldAccessExpr()
+                        .setScope(new NameExpr(OPCODES_FQDN))
+                        .setName("ICONST_1")));
+        final String descriptor = tagValue != null
+                ? "(L" + IAST_METRIC_INTERNAL_NAME + ";BI)V"
+                : "(L" + IAST_METRIC_INTERNAL_NAME + ";I)V";
+        stmt.addStatement(new MethodCallExpr()
+                .setScope(new NameExpr("handler"))
+                .setName("method")
+                .addArgument(new FieldAccessExpr()
+                        .setScope(new NameExpr(OPCODES_FQDN))
+                        .setName("INVOKESTATIC"))
+                .addArgument(new StringLiteralExpr(IAST_METRIC_COLLECTOR_INTERNAL_NAME))
+                .addArgument(new StringLiteralExpr("add"))
+                .addArgument(new StringLiteralExpr(descriptor))
+                .addArgument(new BooleanLiteralExpr(false)));
+        return stmt;
     }
-  }
-
-  private static Field getField(final ResolvedFieldDeclaration resolved) {
-    try {
-      final Field field = resolved.getClass().getDeclaredField("field");
-      field.setAccessible(true);
-      return (Field) field.get(resolved);
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+
+    private static String getMetricName(final AdviceMetadata metaData) {
+        final AnnotationExpr kind = metaData.getKind();
+        return kind.getName().getId().toUpperCase();
     }
-  }
-
-  /** Find all advice lambdas in the generated call site provider */
-  private static Map<AdviceSpecification, LambdaExpr> findAdvices(
-      final CallSiteResult result, final ClassOrInterfaceDeclaration callSiteProvider) {
-    final MethodDeclaration acceptMethod =
-        callSiteProvider.getMethodsBySignature("accept", "Container").get(0);
-    final BlockStmt body = acceptMethod.getBody().get().asBlockStmt();
-    final List<MethodCallExpr> addAdviceMethods =
-        body.getStatements().stream()
-            .filter(IastExtension::isAddAdviceMethodCall)
-            .map(it -> it.asExpressionStmt().getExpression().asMethodCallExpr())
-            .collect(Collectors.toList());
-    return result.getSpecification().getAdvices().stream()
-        .collect(
-            Collectors.toMap(
-                Function.identity(), spec -> findAdviceLambda(spec, addAdviceMethods)));
-  }
-
-  /**
-   * Return only the lambdas that match the specified call site method by looking into the
-   * signatures
-   */
-  private static List<LambdaExpr> filterAdviceLambdas(
-      final Map<AdviceSpecification, LambdaExpr> advices, final MethodDeclaration callSiteMethod) {
-
-    final List<LambdaExpr> result = new ArrayList<>();
-    for (final Map.Entry<AdviceSpecification, LambdaExpr> entry : advices.entrySet()) {
-      final AdviceSpecification spec = entry.getKey();
-      final MethodType methodType = spec.getAdvice();
-      if (!methodType.getMethodName().equals(callSiteMethod.getNameAsString())) {
-        continue;
-      }
-      // java parser has issues with inner classes and descriptors, remove the dollar to do the
-      // matching)
-      final String descriptor = methodType.getMethodType().getDescriptor().replaceAll("\\$", "/");
-      if (!descriptor.equals(callSiteMethod.toDescriptor())) {
-        continue;
-      }
-      result.add(entry.getValue());
+
+    private static Byte getMetricTagValue(final TypeResolver resolver, final AdviceMetadata metadata) {
+        if (metadata.getTag() == null) {
+            return null;
+        }
+        final Expression tag = metadata.getTag();
+        if (tag.isIntegerLiteralExpr()) {
+            return tag.asIntegerLiteralExpr().asNumber().byteValue();
+        } else {
+            return getFieldValue(resolver, tag.asFieldAccessExpr());
+        }
     }
-    return result;
-  }
 
-  private static boolean isAddAdviceMethodCall(final Statement statement) {
-    if (!statement.isExpressionStmt()) {
-      return false;
+    private static Byte getFieldValue(final TypeResolver resolver, final FieldAccessExpr tag) {
+        final FieldAccessExpr fieldAccessExpr = tag.asFieldAccessExpr();
+        final ResolvedFieldDeclaration value = fieldAccessExpr.resolve().asField();
+        try {
+            final Field field = getField(value);
+            field.setAccessible(true);
+            return (Byte) field.get(field.getDeclaringClass());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
-    final Expression expression = statement.asExpressionStmt().getExpression();
-    if (!expression.isMethodCallExpr()) {
-      return false;
+
+    private static Field getField(final ResolvedFieldDeclaration resolved) {
+        try {
+            final Field field = resolved.getClass().getDeclaredField("field");
+            field.setAccessible(true);
+            return (Field) field.get(resolved);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
-    final MethodCallExpr methodCall = expression.asMethodCallExpr();
-    if (!methodCall.getScope().get().toString().equals("container")) {
-      return false;
+
+    /** Find all advice lambdas in the generated call site provider */
+    private static Map<AdviceSpecification, LambdaExpr> findAdvices(
+            final CallSiteResult result, final ClassOrInterfaceDeclaration callSiteProvider) {
+        final MethodDeclaration acceptMethod =
+                callSiteProvider.getMethodsBySignature("accept", "Container").get(0);
+        final BlockStmt body = acceptMethod.getBody().get().asBlockStmt();
+        final List<MethodCallExpr> addAdviceMethods = body.getStatements().stream()
+                .filter(IastExtension::isAddAdviceMethodCall)
+                .map(it -> it.asExpressionStmt().getExpression().asMethodCallExpr())
+                .collect(Collectors.toList());
+        return result.getSpecification().getAdvices().stream()
+                .collect(Collectors.toMap(Function.identity(), spec -> findAdviceLambda(spec, addAdviceMethods)));
     }
-    return methodCall.getNameAsString().equals("addAdvice");
-  }
-
-  private static LambdaExpr findAdviceLambda(
-      final AdviceSpecification spec, final List<MethodCallExpr> addAdvices) {
-    final MethodType pointcut = spec.getPointcut();
-    for (final MethodCallExpr add : addAdvices) {
-      final NodeList<Expression> arguments = add.getArguments();
-      final String owner = arguments.get(1).asStringLiteralExpr().asString();
-      if (!owner.equals(pointcut.getOwner().getInternalName())) {
-        continue;
-      }
-      final String method = arguments.get(2).asStringLiteralExpr().asString();
-      if (!method.equals(pointcut.getMethodName())) {
-        continue;
-      }
-      final String description = arguments.get(3).asStringLiteralExpr().asString();
-      if (!description.equals(pointcut.getMethodType().getDescriptor())) {
-        continue;
-      }
-      return arguments.get(4).asLambdaExpr();
+
+    /**
+     * Return only the lambdas that match the specified call site method by looking into the
+     * signatures
+     */
+    private static List<LambdaExpr> filterAdviceLambdas(
+            final Map<AdviceSpecification, LambdaExpr> advices, final MethodDeclaration callSiteMethod) {
+
+        final List<LambdaExpr> result = new ArrayList<>();
+        for (final Map.Entry<AdviceSpecification, LambdaExpr> entry : advices.entrySet()) {
+            final AdviceSpecification spec = entry.getKey();
+            final MethodType methodType = spec.getAdvice();
+            if (!methodType.getMethodName().equals(callSiteMethod.getNameAsString())) {
+                continue;
+            }
+            // java parser has issues with inner classes and descriptors, remove the dollar to do the
+            // matching)
+            final String descriptor = methodType.getMethodType().getDescriptor().replaceAll("\\$", "/");
+            if (!descriptor.equals(callSiteMethod.toDescriptor())) {
+                continue;
+            }
+            result.add(entry.getValue());
+        }
+        return result;
     }
-    throw new IllegalArgumentException("Cannot find lambda expression for pointcut " + pointcut);
-  }
-
-  private static boolean isCallSite(final MethodDeclaration method) {
-    return Stream.of("Before", "Around", "After")
-        .map(method::getAnnotationByName)
-        .anyMatch(Optional::isPresent);
-  }
-
-  private static TypeResolver getTypeResolver(final Configuration configuration) {
-    final URL[] urls =
-        configuration.getClassPath().stream().map(CallSiteUtils::toURL).toArray(URL[]::new);
-    final ClassLoader loader = new URLClassLoader(urls);
-    return typeResolver(loader, Thread.currentThread().getContextClassLoader());
-  }
-
-  private static CompilationUnit parseSourceFile(
-      final Configuration configuration, final TypeResolver resolver, final String file)
-      throws FileNotFoundException {
-    final Path callSiteSource = configuration.getSrcFolder().resolve(file + ".java");
-    if (!Files.exists(callSiteSource)) {
-      throw new RuntimeException("Error finding original call site at " + callSiteSource);
+
+    private static boolean isAddAdviceMethodCall(final Statement statement) {
+        if (!statement.isExpressionStmt()) {
+            return false;
+        }
+        final Expression expression = statement.asExpressionStmt().getExpression();
+        if (!expression.isMethodCallExpr()) {
+            return false;
+        }
+        final MethodCallExpr methodCall = expression.asMethodCallExpr();
+        if (!methodCall.getScope().get().toString().equals("container")) {
+            return false;
+        }
+        return methodCall.getNameAsString().equals("addAdvice");
     }
-    return parseJavaFile(resolver, callSiteSource.toFile());
-  }
-
-  private static CompilationUnit parseJavaFile(final TypeResolver resolver, final File file)
-      throws FileNotFoundException {
-    final JavaSymbolSolver solver = new JavaSymbolSolver(resolver);
-    final JavaParser parser = new JavaParser(new ParserConfiguration().setSymbolResolver(solver));
-    return parser.parse(file).getResult().get();
-  }
-
-  private static Expression getAnnotationExpression(final AnnotationExpr expr) {
-    if (expr.isMarkerAnnotationExpr()) {
-      return null;
-    } else if (expr.isSingleMemberAnnotationExpr()) {
-      return expr.asSingleMemberAnnotationExpr().getMemberValue();
-    } else {
-      final List<MemberValuePair> pairs = expr.asNormalAnnotationExpr().getPairs();
-      return pairs.stream()
-          .filter(it -> it.getName().toString().equals("value"))
-          .map(MemberValuePair::getValue)
-          .findFirst()
-          .orElse(null);
+
+    private static LambdaExpr findAdviceLambda(final AdviceSpecification spec, final List<MethodCallExpr> addAdvices) {
+        final MethodType pointcut = spec.getPointcut();
+        for (final MethodCallExpr add : addAdvices) {
+            final NodeList<Expression> arguments = add.getArguments();
+            final String owner = arguments.get(1).asStringLiteralExpr().asString();
+            if (!owner.equals(pointcut.getOwner().getInternalName())) {
+                continue;
+            }
+            final String method = arguments.get(2).asStringLiteralExpr().asString();
+            if (!method.equals(pointcut.getMethodName())) {
+                continue;
+            }
+            final String description = arguments.get(3).asStringLiteralExpr().asString();
+            if (!description.equals(pointcut.getMethodType().getDescriptor())) {
+                continue;
+            }
+            return arguments.get(4).asLambdaExpr();
+        }
+        throw new IllegalArgumentException("Cannot find lambda expression for pointcut " + pointcut);
     }
-  }
-
-  public static Expression pushByteExpression(final byte value) {
-    final FieldAccessExpr opCodes = new FieldAccessExpr().setScope(new NameExpr(OPCODES_FQDN));
-    final MethodCallExpr result =
-        new MethodCallExpr().setScope(new NameExpr("handler")).setName("instruction");
-    switch (value) {
-      case -1:
-        result.addArgument(opCodes.setName("ICONST_M1"));
-        break;
-      case 0:
-      case 1:
-      case 2:
-      case 3:
-      case 4:
-      case 5:
-        result.addArgument(opCodes.setName("ICONST_" + value));
-        break;
-      default:
-        result
-            .addArgument(opCodes.setName("BIPUSH"))
-            .addArgument(new IntegerLiteralExpr(Integer.toString(value)));
-        break;
+
+    private static boolean isCallSite(final MethodDeclaration method) {
+        return Stream.of("Before", "Around", "After")
+                .map(method::getAnnotationByName)
+                .anyMatch(Optional::isPresent);
     }
-    return result;
-  }
 
-  private static class AdviceMetadata {
-    private final AnnotationExpr kind;
-    private final Expression tag;
+    private static TypeResolver getTypeResolver(final Configuration configuration) {
+        final URL[] urls =
+                configuration.getClassPath().stream().map(CallSiteUtils::toURL).toArray(URL[]::new);
+        final ClassLoader loader = new URLClassLoader(urls);
+        return typeResolver(loader, Thread.currentThread().getContextClassLoader());
+    }
 
-    private AdviceMetadata(final AnnotationExpr kind, final Expression tag) {
-      this.kind = kind;
-      this.tag = tag;
+    private static CompilationUnit parseSourceFile(
+            final Configuration configuration, final TypeResolver resolver, final String file)
+            throws FileNotFoundException {
+        final Path callSiteSource = configuration.getSrcFolder().resolve(file + ".java");
+        if (!Files.exists(callSiteSource)) {
+            throw new RuntimeException("Error finding original call site at " + callSiteSource);
+        }
+        return parseJavaFile(resolver, callSiteSource.toFile());
     }
 
-    private static AdviceMetadata findAdviceMetadata(final BodyDeclaration<?> target) {
-      return target.getAnnotations().stream()
-          .filter(AdviceMetadata::isAdviceAnnotation)
-          .map(
-              annotation -> {
-                final Expression tag = getAnnotationExpression(annotation);
-                return new AdviceMetadata(annotation, tag);
-              })
-          .findFirst()
-          .orElse(null);
+    private static CompilationUnit parseJavaFile(final TypeResolver resolver, final File file)
+            throws FileNotFoundException {
+        final JavaSymbolSolver solver = new JavaSymbolSolver(resolver);
+        final JavaParser parser = new JavaParser(new ParserConfiguration().setSymbolResolver(solver));
+        return parser.parse(file).getResult().get();
     }
 
-    private static boolean isAdviceAnnotation(final AnnotationExpr expr) {
-      final String identifier = expr.getName().getIdentifier();
-      return identifier.equals("Source")
-          || identifier.equals("Propagation")
-          || identifier.equals("Sink");
+    private static Expression getAnnotationExpression(final AnnotationExpr expr) {
+        if (expr.isMarkerAnnotationExpr()) {
+            return null;
+        } else if (expr.isSingleMemberAnnotationExpr()) {
+            return expr.asSingleMemberAnnotationExpr().getMemberValue();
+        } else {
+            final List<MemberValuePair> pairs = expr.asNormalAnnotationExpr().getPairs();
+            return pairs.stream()
+                    .filter(it -> it.getName().toString().equals("value"))
+                    .map(MemberValuePair::getValue)
+                    .findFirst()
+                    .orElse(null);
+        }
     }
 
-    public AnnotationExpr getKind() {
-      return kind;
+    public static Expression pushByteExpression(final byte value) {
+        final FieldAccessExpr opCodes = new FieldAccessExpr().setScope(new NameExpr(OPCODES_FQDN));
+        final MethodCallExpr result =
+                new MethodCallExpr().setScope(new NameExpr("handler")).setName("instruction");
+        switch (value) {
+            case -1:
+                result.addArgument(opCodes.setName("ICONST_M1"));
+                break;
+            case 0:
+            case 1:
+            case 2:
+            case 3:
+            case 4:
+            case 5:
+                result.addArgument(opCodes.setName("ICONST_" + value));
+                break;
+            default:
+                result.addArgument(opCodes.setName("BIPUSH"))
+                        .addArgument(new IntegerLiteralExpr(Integer.toString(value)));
+                break;
+        }
+        return result;
     }
 
-    public Expression getTag() {
-      return tag;
+    private static class AdviceMetadata {
+        private final AnnotationExpr kind;
+        private final Expression tag;
+
+        private AdviceMetadata(final AnnotationExpr kind, final Expression tag) {
+            this.kind = kind;
+            this.tag = tag;
+        }
+
+        private static AdviceMetadata findAdviceMetadata(final BodyDeclaration<?> target) {
+            return target.getAnnotations().stream()
+                    .filter(AdviceMetadata::isAdviceAnnotation)
+                    .map(annotation -> {
+                        final Expression tag = getAnnotationExpression(annotation);
+                        return new AdviceMetadata(annotation, tag);
+                    })
+                    .findFirst()
+                    .orElse(null);
+        }
+
+        private static boolean isAdviceAnnotation(final AnnotationExpr expr) {
+            final String identifier = expr.getName().getIdentifier();
+            return identifier.equals("Source") || identifier.equals("Propagation") || identifier.equals("Sink");
+        }
+
+        public AnnotationExpr getKind() {
+            return kind;
+        }
+
+        public Expression getTag() {
+            return tag;
+        }
     }
-  }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/CallSiteConstants.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/CallSiteConstants.java
index 8613af8958d..22b8e4ab20c 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/CallSiteConstants.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/CallSiteConstants.java
@@ -3,53 +3,51 @@
 import org.objectweb.asm.Opcodes;
 
 public abstract class CallSiteConstants {
-  private CallSiteConstants() {}
+    private CallSiteConstants() {}
 
-  public static final String CALL_SITE_PACKAGE = "datadog.trace.agent.tooling.csi";
-  public static final String CALL_SITE_ANNOTATION = CALL_SITE_PACKAGE + ".CallSite";
-  public static final String BEFORE_ANNOTATION = CALL_SITE_ANNOTATION + "$Before";
-  public static final String BEFORE_ARRAY_ANNOTATION = CALL_SITE_ANNOTATION + "$BeforeArray";
-  public static final String AROUND_ANNOTATION = CALL_SITE_ANNOTATION + "$Around";
-  public static final String AROUND_ARRAY_ANNOTATION = CALL_SITE_ANNOTATION + "$AroundArray";
-  public static final String AFTER_ANNOTATION = CALL_SITE_ANNOTATION + "$After";
-  public static final String AFTER_ARRAY_ANNOTATION = CALL_SITE_ANNOTATION + "$AfterArray";
-  public static final String THIS_ANNOTATION = CALL_SITE_ANNOTATION + "$This";
-  public static final String ALL_ARGS_ANNOTATION = CALL_SITE_ANNOTATION + "$AllArguments";
-  public static final String INVOKE_DYNAMIC_CONSTANTS_ANNOTATION =
-      CALL_SITE_ANNOTATION + "$InvokeDynamicConstants";
+    public static final String CALL_SITE_PACKAGE = "datadog.trace.agent.tooling.csi";
+    public static final String CALL_SITE_ANNOTATION = CALL_SITE_PACKAGE + ".CallSite";
+    public static final String BEFORE_ANNOTATION = CALL_SITE_ANNOTATION + "$Before";
+    public static final String BEFORE_ARRAY_ANNOTATION = CALL_SITE_ANNOTATION + "$BeforeArray";
+    public static final String AROUND_ANNOTATION = CALL_SITE_ANNOTATION + "$Around";
+    public static final String AROUND_ARRAY_ANNOTATION = CALL_SITE_ANNOTATION + "$AroundArray";
+    public static final String AFTER_ANNOTATION = CALL_SITE_ANNOTATION + "$After";
+    public static final String AFTER_ARRAY_ANNOTATION = CALL_SITE_ANNOTATION + "$AfterArray";
+    public static final String THIS_ANNOTATION = CALL_SITE_ANNOTATION + "$This";
+    public static final String ALL_ARGS_ANNOTATION = CALL_SITE_ANNOTATION + "$AllArguments";
+    public static final String INVOKE_DYNAMIC_CONSTANTS_ANNOTATION = CALL_SITE_ANNOTATION + "$InvokeDynamicConstants";
 
-  public static final String ARGUMENT_ANNOTATION = CALL_SITE_ANNOTATION + "$Argument";
-  public static final String RETURN_ANNOTATION = CALL_SITE_ANNOTATION + "$Return";
-  public static final String CALL_SITE_ADVICE_CLASS = "CallSiteAdvice";
+    public static final String ARGUMENT_ANNOTATION = CALL_SITE_ANNOTATION + "$Argument";
+    public static final String RETURN_ANNOTATION = CALL_SITE_ANNOTATION + "$Return";
+    public static final String CALL_SITE_ADVICE_CLASS = "CallSiteAdvice";
 
-  public static final String CALL_SITE_ADVICE_FQCN =
-      CALL_SITE_PACKAGE + "." + CALL_SITE_ADVICE_CLASS;
+    public static final String CALL_SITE_ADVICE_FQCN = CALL_SITE_PACKAGE + "." + CALL_SITE_ADVICE_CLASS;
 
-  public static final String CALL_SITES_CLASS = "CallSites";
-  public static final String CALL_SITES_FQCN = CALL_SITE_PACKAGE + "." + CALL_SITES_CLASS;
+    public static final String CALL_SITES_CLASS = "CallSites";
+    public static final String CALL_SITES_FQCN = CALL_SITE_PACKAGE + "." + CALL_SITES_CLASS;
 
-  public static final String HAS_ENABLED_PROPERTY_CLASS = CALL_SITES_CLASS + ".HasEnabledProperty";
+    public static final String HAS_ENABLED_PROPERTY_CLASS = CALL_SITES_CLASS + ".HasEnabledProperty";
 
-  public static final String ADVICE_TYPE_CLASS = "AdviceType";
+    public static final String ADVICE_TYPE_CLASS = "AdviceType";
 
-  public static final String STACK_DUP_MODE_CLASS = "StackDupMode";
+    public static final String STACK_DUP_MODE_CLASS = "StackDupMode";
 
-  public static final String METHOD_HANDLER_CLASS = "MethodHandler";
+    public static final String METHOD_HANDLER_CLASS = "MethodHandler";
 
-  public static final String CONSTRUCTOR_METHOD = "<init>";
+    public static final String CONSTRUCTOR_METHOD = "<init>";
 
-  /**
-   * {@link datadog.trace.plugin.csi.ValidationContext} property name for the {@link
-   * datadog.trace.plugin.csi.TypeResolver}
-   */
-  public static final String TYPE_RESOLVER = "typeResolver";
+    /**
+     * {@link datadog.trace.plugin.csi.ValidationContext} property name for the {@link
+     * datadog.trace.plugin.csi.TypeResolver}
+     */
+    public static final String TYPE_RESOLVER = "typeResolver";
 
-  /** ASM version to use in all CSI related tasks */
-  public static final int ASM_API_VERSION = Opcodes.ASM7;
+    /** ASM version to use in all CSI related tasks */
+    public static final int ASM_API_VERSION = Opcodes.ASM7;
 
-  public static final String AUTO_SERVICE_FQDN = "com.google.auto.service.AutoService";
+    public static final String AUTO_SERVICE_FQDN = "com.google.auto.service.AutoService";
 
-  public static final String HANDLE_FQDN = "net.bytebuddy.jar.asm.Handle";
+    public static final String HANDLE_FQDN = "net.bytebuddy.jar.asm.Handle";
 
-  public static final String OPCODES_FQDN = "net.bytebuddy.jar.asm.Opcodes";
+    public static final String OPCODES_FQDN = "net.bytebuddy.jar.asm.Opcodes";
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/CallSiteUtils.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/CallSiteUtils.java
index 1f9ecdc5aad..a5fcb9515c1 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/CallSiteUtils.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/CallSiteUtils.java
@@ -12,58 +12,59 @@
 
 public abstract class CallSiteUtils {
 
-  private CallSiteUtils() {}
+    private CallSiteUtils() {}
 
-  public static Type classNameToType(@Nonnull final String className) {
-    return Type.getType(classNameToDescriptor(className));
-  }
-
-  public static String classNameToDescriptor(@Nonnull final Class<?> clazz) {
-    return classNameToDescriptor(clazz.getName());
-  }
+    public static Type classNameToType(@Nonnull final String className) {
+        return Type.getType(classNameToDescriptor(className));
+    }
 
-  public static String classNameToDescriptor(@Nonnull final String className) {
-    return "L" + className.replaceAll("\\.", "/") + ";";
-  }
+    public static String classNameToDescriptor(@Nonnull final Class<?> clazz) {
+        return classNameToDescriptor(clazz.getName());
+    }
 
-  public static void deleteFile(@Nonnull final File file) {
-    if (file.exists() && !file.delete()) {
-      throw new RuntimeException("Cannot delete file: " + file);
+    public static String classNameToDescriptor(@Nonnull final String className) {
+        return "L" + className.replaceAll("\\.", "/") + ";";
     }
-  }
 
-  public static String repeat(@Nonnull final String value, int count) {
-    if (count < 0) {
-      throw new IllegalArgumentException("count is negative: " + count);
+    public static void deleteFile(@Nonnull final File file) {
+        if (file.exists() && !file.delete()) {
+            throw new RuntimeException("Cannot delete file: " + file);
+        }
     }
-    if (count == 1) {
-      return value;
+
+    public static String repeat(@Nonnull final String value, int count) {
+        if (count < 0) {
+            throw new IllegalArgumentException("count is negative: " + count);
+        }
+        if (count == 1) {
+            return value;
+        }
+        return IntStream.range(0, count).mapToObj(i -> value).collect(Collectors.joining());
     }
-    return IntStream.range(0, count).mapToObj(i -> value).collect(Collectors.joining());
-  }
 
-  public static String repeat(final char value, int count) {
-    return repeat(Character.toString(value), count);
-  }
+    public static String repeat(final char value, int count) {
+        return repeat(Character.toString(value), count);
+    }
 
-  public static URL toURL(final Path path) {
-    try {
-      URL url = path.toUri().toURL();
-      // URLClassLoader interprets URLs ending with '/' as directories. If the trailing '/' is
-      // missing, a directory URL is treated as a JAR. If the path does yet exist on disk
-      // assumes that paths not ending with ".jar" are directories.
-      boolean shouldAddSlash =
-          Files.exists(path) ? Files.isDirectory(path) : !path.toString().endsWith(".jar");
+    public static URL toURL(final Path path) {
+        try {
+            URL url = path.toUri().toURL();
+            // URLClassLoader interprets URLs ending with '/' as directories. If the trailing '/' is
+            // missing, a directory URL is treated as a JAR. If the path does yet exist on disk
+            // assumes that paths not ending with ".jar" are directories.
+            boolean shouldAddSlash = Files.exists(path)
+                    ? Files.isDirectory(path)
+                    : !path.toString().endsWith(".jar");
 
-      if (shouldAddSlash) {
-        String urlString = url.toString();
-        if (!urlString.endsWith("/")) {
-          url = new URL(urlString + "/");
+            if (shouldAddSlash) {
+                String urlString = url.toString();
+                if (!urlString.endsWith("/")) {
+                    url = new URL(urlString + "/");
+                }
+            }
+            return url;
+        } catch (MalformedURLException e) {
+            throw new RuntimeException(e);
         }
-      }
-      return url;
-    } catch (MalformedURLException e) {
-      throw new RuntimeException(e);
     }
-  }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/ErrorCode.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/ErrorCode.java
index 293125a76ee..33b99158dc8 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/ErrorCode.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/ErrorCode.java
@@ -6,422 +6,418 @@
 
 public enum ErrorCode implements Function<Object[], String> {
 
-  // TypeResolver
-
-  UNRESOLVED_TYPE {
-    @Override
-    public String apply(final Object[] objects) {
-      final Type type = (Type) objects[0];
-      return String.format("Cannot resolve type '%s'", type.getClassName());
-    }
-  },
-
-  UNRESOLVED_METHOD {
-    @Override
-    public String apply(final Object[] objects) {
-      final MethodType method = (MethodType) objects[0];
-      return String.format(
-          "Cannot resolve method '%s' in type '%s' with descriptor '%s'",
-          method.getMethodName(), method.getOwner(), method.getMethodType().getDescriptor());
-    }
-  },
-
-  // Specification
-
-  CALL_SITE_SHOULD_HAVE_ADVICE_METHODS {
-    @Override
-    public String apply(final Object[] objects) {
-      return "@CallSite annotated class should contain advice methods (@Before, @Around or @After)";
-    }
-  },
-
-  CALL_SITE_SPI_SHOULD_BE_AN_INTERFACE {
-    @Override
-    public String apply(final Object[] objects) {
-      final Class<?> spiClass = (Class<?>) objects[0];
-      return String.format("@CallSite spi class should be an interface, received '%s'", spiClass);
-    }
-  },
-
-  CALL_SITE_ENABLED_SHOULD_BE_STATIC_AND_PUBLIC {
-    @Override
-    public String apply(final Object[] objects) {
-      final Method method = (Method) objects[0];
-      return String.format(
-          "@CallSite enabled method should be static and public, received '%s'", method);
-    }
-  },
-
-  CALL_SITE_SPI_SHOULD_BE_EMPTY {
-    @Override
-    public String apply(final Object[] objects) {
-      final Class<?> spiClass = (Class<?>) objects[0];
-      return String.format(
-          "@CallSite spi class should not define any methods, spi class '%s'", spiClass);
-    }
-  },
-
-  ADVICE_METHOD_NOT_STATIC_AND_PUBLIC {
-    @Override
-    public String apply(final Object[] objects) {
-      return "Advice method should be static and public";
-    }
-  },
-
-  ADVICE_METHOD_RETURN_NOT_COMPATIBLE {
-    @Override
-    public String apply(final Object[] objects) {
-      final Type pointcut = (Type) objects[0];
-      final Type callSite = (Type) objects[1];
-      return String.format(
-          "Call site return '%s' not compatible with pointcut return '%s'",
-          callSite.getClassName(), pointcut.getClassName());
-    }
-  },
-
-  ADVICE_METHOD_PARAM_THIS_NOT_COMPATIBLE {
-    @Override
-    public String apply(final Object[] objects) {
-      final Type pointcut = (Type) objects[0];
-      final Type callSite = (Type) objects[1];
-      return String.format(
-          "Call site @This with type '%s' not compatible with pointcut owner '%s'",
-          callSite.getClassName(), pointcut.getClassName());
-    }
-  },
-
-  ADVICE_METHOD_PARAM_RETURN_NOT_COMPATIBLE {
-    @Override
-    public String apply(final Object[] objects) {
-      final Type pointcut = (Type) objects[0];
-      final Type callSite = (Type) objects[1];
-      return String.format(
-          "Call site @Return with type '%s' not compatible with pointcut owner '%s'",
-          callSite.getClassName(), pointcut.getClassName());
-    }
-  },
-
-  ADVICE_METHOD_PARAM_ALL_ARGS_NOT_COMPATIBLE {
-    @Override
-    public String apply(final Object[] objects) {
-      final Type pointcut = (Type) objects[0];
-      final Type callSite = (Type) objects[1];
-      return String.format(
-          "Call site @AllArguments with type '%s' not compatible with '%s'",
-          callSite.getClassName(), pointcut.getClassName());
-    }
-  },
-
-  ADVICE_METHOD_PARAM_NOT_COMPATIBLE {
-    @Override
-    public String apply(final Object[] objects) {
-      final Type pointcut = (Type) objects[0];
-      final Type callSite = (Type) objects[1];
-      final int index = (int) objects[2];
-      return String.format(
-          "Call site @Argument with type '%s' not compatible with pointcut parameter type '%s', found at index '%s'",
-          callSite.getClassName(), pointcut.getClassName(), index);
-    }
-  },
-
-  ADVICE_PARAMETER_NOT_ANNOTATED {
-    @Override
-    public String apply(final Object[] objects) {
-      final int index = (int) objects[0];
-      return String.format("Call site parameter not annotated, found at index '%s'", index);
-    }
-  },
-
-  ADVICE_PARAMETER_THIS_DUPLICATED {
-    @Override
-    public String apply(final Object[] objects) {
-      final int index = (int) objects[0];
-      return String.format(
-          "Call site parameter annotated with @This is duplicated, found at index '%s'", index);
-    }
-  },
-
-  ADVICE_PARAMETER_THIS_SHOULD_BE_FIRST {
-    @Override
-    public String apply(final Object[] objects) {
-      final int index = (int) objects[0];
-      return String.format(
-          "Call site parameter annotated with @This should be the first, found at index '%s'",
-          index);
-    }
-  },
-
-  ADVICE_PARAMETER_THIS_ON_STATIC_METHOD {
-    @Override
-    public String apply(final Object[] objects) {
-      final int index = (int) objects[0];
-      return String.format(
-          "Call site parameter can't be annotated with @This for static pointcut methods, found at index '%s'",
-          index);
-    }
-  },
-
-  ADVICE_PARAMETER_THIS_ON_INVOKE_DYNAMIC {
-    @Override
-    public String apply(final Object[] objects) {
-      final int index = (int) objects[0];
-      return String.format(
-          "Call site parameter can't be annotated with @This for invoke dynamic instructions, found at index '%s'",
-          index);
-    }
-  },
-
-  ADVICE_PARAMETER_RETURN_DUPLICATED {
-    @Override
-    public String apply(final Object[] objects) {
-      final int index = (int) objects[0];
-      return String.format(
-          "Call site parameter annotated with @Return duplicated, found at index '%s'", index);
-    }
-  },
-
-  ADVICE_PARAMETER_ALL_ARGS_DUPLICATED {
-    @Override
-    public String apply(final Object[] objects) {
-      final int index = (int) objects[0];
-      return String.format(
-          "Call site parameter annotated with @AllArguments duplicated, found at index '%s'",
-          index);
-    }
-  },
-
-  ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_DUPLICATED {
-    @Override
-    public String apply(final Object[] objects) {
-      final int index = (int) objects[0];
-      return String.format(
-          "Call site parameter annotated with @InvokeDynamicConstants duplicated, found at index '%s'",
-          index);
-    }
-  },
-
-  ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_NOT_COMPATIBLE {
-    @Override
-    public String apply(final Object[] objects) {
-      final Type pointcut = (Type) objects[0];
-      final Type callSite = (Type) objects[1];
-      return String.format(
-          "Call site @InvokeDynamicConstants with type '%s' not compatible with '%s'",
-          callSite.getClassName(), pointcut.getClassName());
-    }
-  },
-
-  ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_SHOULD_BE_LAST {
-    @Override
-    public String apply(final Object[] objects) {
-      final int index = (int) objects[0];
-      return String.format(
-          "Call site parameter annotated with @InvokeDynamicConstants should be the last, found at index '%s'",
-          index);
-    }
-  },
-
-  ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_NON_AFTER_ADVICE {
-    @Override
-    public String apply(final Object[] objects) {
-      final int index = (int) objects[0];
-      return String.format(
-          "Call site parameter annotated with @InvokeDynamicConstants should only be used on @After call sites, found at index '%s'",
-          index);
-    }
-  },
-
-  ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_ON_NON_INVOKE_DYNAMIC {
-    @Override
-    public String apply(final Object[] objects) {
-      final int index = (int) objects[0];
-      return String.format(
-          "Call site parameter annotated with @InvokeDynamicConstants should target only invoke dynamic instructions, found at index '%s'",
-          index);
-    }
-  },
-
-  ADVICE_PARAMETER_ALL_ARGS_MIXED {
-    @Override
-    public String apply(final Object[] objects) {
-      final int index = (int) objects[0];
-      return String.format(
-          "Call site parameter annotated with @AllArguments mixed with @Argument, found at index '%s'",
-          index);
-    }
-  },
-
-  ADVICE_PARAMETER_ARGUMENT_OUT_OF_BOUNDS {
-    @Override
-    public String apply(final Object[] objects) {
-      final int index = (int) objects[0];
-      return String.format(
-          "Call site parameter annotated with @Argument out of bounds for pointcut, found at index '%s'",
-          index);
-    }
-  },
-
-  ADVICE_PARAMETER_ON_INVOKE_DYNAMIC {
-    @Override
-    public String apply(final Object[] objects) {
-      final int index = (int) objects[0];
-      return String.format(
-          "Call site parameters can't be annotated with @Argument for invoke dynamic instructions, found at index '%s'",
-          index);
-    }
-  },
-
-  ADVICE_PARAMETER_RETURN_SHOULD_BE_LAST {
-    @Override
-    public String apply(final Object[] objects) {
-      final int index = (int) objects[0];
-      return String.format(
-          "Call site parameter annotated with @Return should be last, found at index '%s'", index);
-    }
-  },
-
-  ADVICE_PARAMETER_RETURN_NON_AFTER_ADVICE {
-    @Override
-    public String apply(final Object[] objects) {
-      final int index = (int) objects[0];
-      return String.format(
-          "Call site parameter annotated with @Return should only be used on @After call sites, found at index '%s'",
-          index);
-    }
-  },
-
-  ADVICE_POINTCUT_CONSTRUCTOR_NOT_VOID {
-    @Override
-    public String apply(final Object[] objects) {
-      final MethodType pointcut = (MethodType) objects[0];
-      return String.format(
-          "Pointcut return type should be void for constructors, found '%s'",
-          pointcut.getMethodType().getReturnType().getClassName());
-    }
-  },
-
-  ADVICE_BEFORE_SHOULD_RETURN_VOID {
-    @Override
-    public String apply(final Object[] objects) {
-      final MethodType advice = (MethodType) objects[0];
-      return String.format(
-          "Before advice should return void, received '%s'",
-          advice.getMethodType().getReturnType().getClassName());
-    }
-  },
-
-  ADVICE_BEFORE_SHOULD_NOT_CONTAIN_RETURN {
-    @Override
-    public String apply(final Object[] objects) {
-      return "Before advice should not contain @Return annotated parameters";
-    }
-  },
-
-  ADVICE_BEFORE_CTOR_SHOULD_NOT_CONTAIN_THIS {
-    @Override
-    public String apply(final Object[] objects) {
-      return "Before advice should not contain @This annotated parameters in constructors";
-    }
-  },
-
-  ADVICE_AROUND_SHOULD_NOT_RETURN_VOID {
-    @Override
-    public String apply(final Object[] objects) {
-      return "Around advice should not return void";
-    }
-  },
-
-  ADVICE_AROUND_POINTCUT_CTOR {
-    @Override
-    public String apply(final Object[] objects) {
-      return "Around advice not yet supported for constructors";
-    }
-  },
-
-  ADVICE_AROUND_SHOULD_NOT_CONTAIN_RETURN {
-    @Override
-    public String apply(final Object[] objects) {
-      return "Around advice should not contain @Return annotated parameters";
-    }
-  },
-
-  ADVICE_AFTER_SHOULD_NOT_RETURN_VOID {
-    @Override
-    public String apply(final Object[] objects) {
-      return "After advice should not return void";
-    }
-  },
-
-  ADVICE_AFTER_SHOULD_HAVE_THIS {
-    @Override
-    public String apply(final Object[] objects) {
-      return "After advice first parameter should be annotated with @This or @AllArguments(includeThis = true)";
-    }
-  },
-
-  ADVICE_AFTER_VOID_METHOD_SHOULD_RETURN_VOID {
-    @Override
-    public String apply(final Object[] objects) {
-      return "After advice for void method should return void";
-    }
-  },
-
-  ADVICE_AFTER_VOID_METHOD_SHOULD_NOT_HAVE_RETURN {
-    @Override
-    public String apply(final Object[] objects) {
-      return "After advice for void method should not contain @Return annotated parameters";
-    }
-  },
-
-  ADVICE_AFTER_SHOULD_HAVE_RETURN {
-    @Override
-    public String apply(final Object[] objects) {
-      return "After advice last parameter should be annotated with @Return";
-    }
-  },
-
-  ADVICE_AFTER_CONSTRUCTOR_ALL_ARGUMENTS {
-    @Override
-    public String apply(final Object[] objects) {
-      return "After advice in constructors should use @AllArguments";
-    }
-  },
-
-  POINTCUT_SIGNATURE_INVALID {
-    @Override
-    public String apply(final Object[] objects) {
-      final String signature = (String) objects[0];
-      final String pattern = (String) objects[1];
-      return String.format(
-          "Pointcut signature '%s' does not match the regular expression '%s'", signature, pattern);
-    }
-  },
-
-  POINTCUT_SIGNATURE_INVALID_TYPE {
-    @Override
-    public String apply(final Object[] objects) {
-      final String signature = (String) objects[0];
-      final String type = (String) objects[1];
-      return String.format("Pointcut signature '%s' contains in valid type '%s'", signature, type);
-    }
-  },
-
-  // Errors in extensions
-
-  EXTENSION_ERROR {
-    @Override
-    public String apply(final Object[] objects) {
-      final Class<?> extension = (Class<?>) objects[0];
-      return String.format("Failed to apply extension %s", extension);
-    }
-  },
-
-  // Others
-
-  UNCAUGHT_ERROR {
-    @Override
-    public String apply(final Object[] objects) {
-      return "Uncaught error";
+    // TypeResolver
+
+    UNRESOLVED_TYPE {
+        @Override
+        public String apply(final Object[] objects) {
+            final Type type = (Type) objects[0];
+            return String.format("Cannot resolve type '%s'", type.getClassName());
+        }
+    },
+
+    UNRESOLVED_METHOD {
+        @Override
+        public String apply(final Object[] objects) {
+            final MethodType method = (MethodType) objects[0];
+            return String.format(
+                    "Cannot resolve method '%s' in type '%s' with descriptor '%s'",
+                    method.getMethodName(),
+                    method.getOwner(),
+                    method.getMethodType().getDescriptor());
+        }
+    },
+
+    // Specification
+
+    CALL_SITE_SHOULD_HAVE_ADVICE_METHODS {
+        @Override
+        public String apply(final Object[] objects) {
+            return "@CallSite annotated class should contain advice methods (@Before, @Around or @After)";
+        }
+    },
+
+    CALL_SITE_SPI_SHOULD_BE_AN_INTERFACE {
+        @Override
+        public String apply(final Object[] objects) {
+            final Class<?> spiClass = (Class<?>) objects[0];
+            return String.format("@CallSite spi class should be an interface, received '%s'", spiClass);
+        }
+    },
+
+    CALL_SITE_ENABLED_SHOULD_BE_STATIC_AND_PUBLIC {
+        @Override
+        public String apply(final Object[] objects) {
+            final Method method = (Method) objects[0];
+            return String.format("@CallSite enabled method should be static and public, received '%s'", method);
+        }
+    },
+
+    CALL_SITE_SPI_SHOULD_BE_EMPTY {
+        @Override
+        public String apply(final Object[] objects) {
+            final Class<?> spiClass = (Class<?>) objects[0];
+            return String.format("@CallSite spi class should not define any methods, spi class '%s'", spiClass);
+        }
+    },
+
+    ADVICE_METHOD_NOT_STATIC_AND_PUBLIC {
+        @Override
+        public String apply(final Object[] objects) {
+            return "Advice method should be static and public";
+        }
+    },
+
+    ADVICE_METHOD_RETURN_NOT_COMPATIBLE {
+        @Override
+        public String apply(final Object[] objects) {
+            final Type pointcut = (Type) objects[0];
+            final Type callSite = (Type) objects[1];
+            return String.format(
+                    "Call site return '%s' not compatible with pointcut return '%s'",
+                    callSite.getClassName(), pointcut.getClassName());
+        }
+    },
+
+    ADVICE_METHOD_PARAM_THIS_NOT_COMPATIBLE {
+        @Override
+        public String apply(final Object[] objects) {
+            final Type pointcut = (Type) objects[0];
+            final Type callSite = (Type) objects[1];
+            return String.format(
+                    "Call site @This with type '%s' not compatible with pointcut owner '%s'",
+                    callSite.getClassName(), pointcut.getClassName());
+        }
+    },
+
+    ADVICE_METHOD_PARAM_RETURN_NOT_COMPATIBLE {
+        @Override
+        public String apply(final Object[] objects) {
+            final Type pointcut = (Type) objects[0];
+            final Type callSite = (Type) objects[1];
+            return String.format(
+                    "Call site @Return with type '%s' not compatible with pointcut owner '%s'",
+                    callSite.getClassName(), pointcut.getClassName());
+        }
+    },
+
+    ADVICE_METHOD_PARAM_ALL_ARGS_NOT_COMPATIBLE {
+        @Override
+        public String apply(final Object[] objects) {
+            final Type pointcut = (Type) objects[0];
+            final Type callSite = (Type) objects[1];
+            return String.format(
+                    "Call site @AllArguments with type '%s' not compatible with '%s'",
+                    callSite.getClassName(), pointcut.getClassName());
+        }
+    },
+
+    ADVICE_METHOD_PARAM_NOT_COMPATIBLE {
+        @Override
+        public String apply(final Object[] objects) {
+            final Type pointcut = (Type) objects[0];
+            final Type callSite = (Type) objects[1];
+            final int index = (int) objects[2];
+            return String.format(
+                    "Call site @Argument with type '%s' not compatible with pointcut parameter type '%s', found at index '%s'",
+                    callSite.getClassName(), pointcut.getClassName(), index);
+        }
+    },
+
+    ADVICE_PARAMETER_NOT_ANNOTATED {
+        @Override
+        public String apply(final Object[] objects) {
+            final int index = (int) objects[0];
+            return String.format("Call site parameter not annotated, found at index '%s'", index);
+        }
+    },
+
+    ADVICE_PARAMETER_THIS_DUPLICATED {
+        @Override
+        public String apply(final Object[] objects) {
+            final int index = (int) objects[0];
+            return String.format("Call site parameter annotated with @This is duplicated, found at index '%s'", index);
+        }
+    },
+
+    ADVICE_PARAMETER_THIS_SHOULD_BE_FIRST {
+        @Override
+        public String apply(final Object[] objects) {
+            final int index = (int) objects[0];
+            return String.format(
+                    "Call site parameter annotated with @This should be the first, found at index '%s'", index);
+        }
+    },
+
+    ADVICE_PARAMETER_THIS_ON_STATIC_METHOD {
+        @Override
+        public String apply(final Object[] objects) {
+            final int index = (int) objects[0];
+            return String.format(
+                    "Call site parameter can't be annotated with @This for static pointcut methods, found at index '%s'",
+                    index);
+        }
+    },
+
+    ADVICE_PARAMETER_THIS_ON_INVOKE_DYNAMIC {
+        @Override
+        public String apply(final Object[] objects) {
+            final int index = (int) objects[0];
+            return String.format(
+                    "Call site parameter can't be annotated with @This for invoke dynamic instructions, found at index '%s'",
+                    index);
+        }
+    },
+
+    ADVICE_PARAMETER_RETURN_DUPLICATED {
+        @Override
+        public String apply(final Object[] objects) {
+            final int index = (int) objects[0];
+            return String.format("Call site parameter annotated with @Return duplicated, found at index '%s'", index);
+        }
+    },
+
+    ADVICE_PARAMETER_ALL_ARGS_DUPLICATED {
+        @Override
+        public String apply(final Object[] objects) {
+            final int index = (int) objects[0];
+            return String.format(
+                    "Call site parameter annotated with @AllArguments duplicated, found at index '%s'", index);
+        }
+    },
+
+    ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_DUPLICATED {
+        @Override
+        public String apply(final Object[] objects) {
+            final int index = (int) objects[0];
+            return String.format(
+                    "Call site parameter annotated with @InvokeDynamicConstants duplicated, found at index '%s'",
+                    index);
+        }
+    },
+
+    ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_NOT_COMPATIBLE {
+        @Override
+        public String apply(final Object[] objects) {
+            final Type pointcut = (Type) objects[0];
+            final Type callSite = (Type) objects[1];
+            return String.format(
+                    "Call site @InvokeDynamicConstants with type '%s' not compatible with '%s'",
+                    callSite.getClassName(), pointcut.getClassName());
+        }
+    },
+
+    ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_SHOULD_BE_LAST {
+        @Override
+        public String apply(final Object[] objects) {
+            final int index = (int) objects[0];
+            return String.format(
+                    "Call site parameter annotated with @InvokeDynamicConstants should be the last, found at index '%s'",
+                    index);
+        }
+    },
+
+    ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_NON_AFTER_ADVICE {
+        @Override
+        public String apply(final Object[] objects) {
+            final int index = (int) objects[0];
+            return String.format(
+                    "Call site parameter annotated with @InvokeDynamicConstants should only be used on @After call sites, found at index '%s'",
+                    index);
+        }
+    },
+
+    ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_ON_NON_INVOKE_DYNAMIC {
+        @Override
+        public String apply(final Object[] objects) {
+            final int index = (int) objects[0];
+            return String.format(
+                    "Call site parameter annotated with @InvokeDynamicConstants should target only invoke dynamic instructions, found at index '%s'",
+                    index);
+        }
+    },
+
+    ADVICE_PARAMETER_ALL_ARGS_MIXED {
+        @Override
+        public String apply(final Object[] objects) {
+            final int index = (int) objects[0];
+            return String.format(
+                    "Call site parameter annotated with @AllArguments mixed with @Argument, found at index '%s'",
+                    index);
+        }
+    },
+
+    ADVICE_PARAMETER_ARGUMENT_OUT_OF_BOUNDS {
+        @Override
+        public String apply(final Object[] objects) {
+            final int index = (int) objects[0];
+            return String.format(
+                    "Call site parameter annotated with @Argument out of bounds for pointcut, found at index '%s'",
+                    index);
+        }
+    },
+
+    ADVICE_PARAMETER_ON_INVOKE_DYNAMIC {
+        @Override
+        public String apply(final Object[] objects) {
+            final int index = (int) objects[0];
+            return String.format(
+                    "Call site parameters can't be annotated with @Argument for invoke dynamic instructions, found at index '%s'",
+                    index);
+        }
+    },
+
+    ADVICE_PARAMETER_RETURN_SHOULD_BE_LAST {
+        @Override
+        public String apply(final Object[] objects) {
+            final int index = (int) objects[0];
+            return String.format(
+                    "Call site parameter annotated with @Return should be last, found at index '%s'", index);
+        }
+    },
+
+    ADVICE_PARAMETER_RETURN_NON_AFTER_ADVICE {
+        @Override
+        public String apply(final Object[] objects) {
+            final int index = (int) objects[0];
+            return String.format(
+                    "Call site parameter annotated with @Return should only be used on @After call sites, found at index '%s'",
+                    index);
+        }
+    },
+
+    ADVICE_POINTCUT_CONSTRUCTOR_NOT_VOID {
+        @Override
+        public String apply(final Object[] objects) {
+            final MethodType pointcut = (MethodType) objects[0];
+            return String.format(
+                    "Pointcut return type should be void for constructors, found '%s'",
+                    pointcut.getMethodType().getReturnType().getClassName());
+        }
+    },
+
+    ADVICE_BEFORE_SHOULD_RETURN_VOID {
+        @Override
+        public String apply(final Object[] objects) {
+            final MethodType advice = (MethodType) objects[0];
+            return String.format(
+                    "Before advice should return void, received '%s'",
+                    advice.getMethodType().getReturnType().getClassName());
+        }
+    },
+
+    ADVICE_BEFORE_SHOULD_NOT_CONTAIN_RETURN {
+        @Override
+        public String apply(final Object[] objects) {
+            return "Before advice should not contain @Return annotated parameters";
+        }
+    },
+
+    ADVICE_BEFORE_CTOR_SHOULD_NOT_CONTAIN_THIS {
+        @Override
+        public String apply(final Object[] objects) {
+            return "Before advice should not contain @This annotated parameters in constructors";
+        }
+    },
+
+    ADVICE_AROUND_SHOULD_NOT_RETURN_VOID {
+        @Override
+        public String apply(final Object[] objects) {
+            return "Around advice should not return void";
+        }
+    },
+
+    ADVICE_AROUND_POINTCUT_CTOR {
+        @Override
+        public String apply(final Object[] objects) {
+            return "Around advice not yet supported for constructors";
+        }
+    },
+
+    ADVICE_AROUND_SHOULD_NOT_CONTAIN_RETURN {
+        @Override
+        public String apply(final Object[] objects) {
+            return "Around advice should not contain @Return annotated parameters";
+        }
+    },
+
+    ADVICE_AFTER_SHOULD_NOT_RETURN_VOID {
+        @Override
+        public String apply(final Object[] objects) {
+            return "After advice should not return void";
+        }
+    },
+
+    ADVICE_AFTER_SHOULD_HAVE_THIS {
+        @Override
+        public String apply(final Object[] objects) {
+            return "After advice first parameter should be annotated with @This or @AllArguments(includeThis = true)";
+        }
+    },
+
+    ADVICE_AFTER_VOID_METHOD_SHOULD_RETURN_VOID {
+        @Override
+        public String apply(final Object[] objects) {
+            return "After advice for void method should return void";
+        }
+    },
+
+    ADVICE_AFTER_VOID_METHOD_SHOULD_NOT_HAVE_RETURN {
+        @Override
+        public String apply(final Object[] objects) {
+            return "After advice for void method should not contain @Return annotated parameters";
+        }
+    },
+
+    ADVICE_AFTER_SHOULD_HAVE_RETURN {
+        @Override
+        public String apply(final Object[] objects) {
+            return "After advice last parameter should be annotated with @Return";
+        }
+    },
+
+    ADVICE_AFTER_CONSTRUCTOR_ALL_ARGUMENTS {
+        @Override
+        public String apply(final Object[] objects) {
+            return "After advice in constructors should use @AllArguments";
+        }
+    },
+
+    POINTCUT_SIGNATURE_INVALID {
+        @Override
+        public String apply(final Object[] objects) {
+            final String signature = (String) objects[0];
+            final String pattern = (String) objects[1];
+            return String.format(
+                    "Pointcut signature '%s' does not match the regular expression '%s'", signature, pattern);
+        }
+    },
+
+    POINTCUT_SIGNATURE_INVALID_TYPE {
+        @Override
+        public String apply(final Object[] objects) {
+            final String signature = (String) objects[0];
+            final String type = (String) objects[1];
+            return String.format("Pointcut signature '%s' contains in valid type '%s'", signature, type);
+        }
+    },
+
+    // Errors in extensions
+
+    EXTENSION_ERROR {
+        @Override
+        public String apply(final Object[] objects) {
+            final Class<?> extension = (Class<?>) objects[0];
+            return String.format("Failed to apply extension %s", extension);
+        }
+    },
+
+    // Others
+
+    UNCAUGHT_ERROR {
+        @Override
+        public String apply(final Object[] objects) {
+            return "Uncaught error";
+        }
     }
-  }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/JavaParserUtils.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/JavaParserUtils.java
index 5d45b5d09f8..3658884ef27 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/JavaParserUtils.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/JavaParserUtils.java
@@ -9,26 +9,25 @@
 
 public abstract class JavaParserUtils {
 
-  private JavaParserUtils() {}
+    private JavaParserUtils() {}
 
-  public static Expression intLiteral(final int value) {
-    return new IntegerLiteralExpr().setValue(Integer.toString(value));
-  }
+    public static Expression intLiteral(final int value) {
+        return new IntegerLiteralExpr().setValue(Integer.toString(value));
+    }
 
-  public static FieldAccessExpr accessLocalField(final String name) {
-    return new FieldAccessExpr().setScope(new ThisExpr()).setName(name);
-  }
+    public static FieldAccessExpr accessLocalField(final String name) {
+        return new FieldAccessExpr().setScope(new ThisExpr()).setName(name);
+    }
 
-  public static ClassOrInterfaceDeclaration getPrimaryType(final CompilationUnit javaClass) {
-    return javaClass
-        .getPrimaryType()
-        .orElseGet(() -> javaClass.getTypes().get(0))
-        .asClassOrInterfaceDeclaration();
-  }
+    public static ClassOrInterfaceDeclaration getPrimaryType(final CompilationUnit javaClass) {
+        return javaClass
+                .getPrimaryType()
+                .orElseGet(() -> javaClass.getTypes().get(0))
+                .asClassOrInterfaceDeclaration();
+    }
 
-  public static boolean implementsInterface(
-      final ClassOrInterfaceDeclaration type, final String interfaceName) {
-    return type.getImplementedTypes().stream()
-        .anyMatch(it -> it.getNameAsString().equals(interfaceName));
-  }
+    public static boolean implementsInterface(final ClassOrInterfaceDeclaration type, final String interfaceName) {
+        return type.getImplementedTypes().stream()
+                .anyMatch(it -> it.getNameAsString().equals(interfaceName));
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/MethodType.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/MethodType.java
index ea1dddf5eb8..a0344146033 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/MethodType.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/MethodType.java
@@ -11,73 +11,72 @@
 /** Description of a method including its declaring type, name and descriptor. */
 public class MethodType {
 
-  private final Type owner;
-  private final String methodName;
-  private final Type methodType;
-  private final boolean constructor;
+    private final Type owner;
+    private final String methodName;
+    private final Type methodType;
+    private final boolean constructor;
 
-  public MethodType(
-      @Nonnull final Type owner, @Nonnull final String methodName, @Nonnull final Type methodType) {
-    if (owner.getSort() == Type.METHOD) {
-      throw new IllegalArgumentException("Owner should not be a method " + owner);
+    public MethodType(@Nonnull final Type owner, @Nonnull final String methodName, @Nonnull final Type methodType) {
+        if (owner.getSort() == Type.METHOD) {
+            throw new IllegalArgumentException("Owner should not be a method " + owner);
+        }
+        if (methodType.getSort() != Type.METHOD) {
+            throw new IllegalArgumentException("Type should be a method " + methodType);
+        }
+        this.owner = owner;
+        this.methodName = methodName;
+        this.methodType = methodType;
+        constructor = CONSTRUCTOR_METHOD.equals(methodName);
     }
-    if (methodType.getSort() != Type.METHOD) {
-      throw new IllegalArgumentException("Type should be a method " + methodType);
-    }
-    this.owner = owner;
-    this.methodName = methodName;
-    this.methodType = methodType;
-    constructor = CONSTRUCTOR_METHOD.equals(methodName);
-  }
-
-  public Type getOwner() {
-    return owner;
-  }
 
-  public String getMethodName() {
-    return methodName;
-  }
+    public Type getOwner() {
+        return owner;
+    }
 
-  public Type getMethodType() {
-    return methodType;
-  }
+    public String getMethodName() {
+        return methodName;
+    }
 
-  public boolean isConstructor() {
-    return constructor;
-  }
+    public Type getMethodType() {
+        return methodType;
+    }
 
-  public boolean isVoidReturn() {
-    return Type.VOID_TYPE.equals(methodType.getReturnType());
-  }
+    public boolean isConstructor() {
+        return constructor;
+    }
 
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) {
-      return true;
+    public boolean isVoidReturn() {
+        return Type.VOID_TYPE.equals(methodType.getReturnType());
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        MethodType that = (MethodType) o;
+        return Objects.equals(owner, that.owner)
+                && Objects.equals(methodName, that.methodName)
+                && Objects.equals(methodType, that.methodType);
     }
-    MethodType that = (MethodType) o;
-    return Objects.equals(owner, that.owner)
-        && Objects.equals(methodName, that.methodName)
-        && Objects.equals(methodType, that.methodType);
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(owner, methodName, methodType);
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(owner, methodName, methodType);
+    }
 
-  @Override
-  public String toString() {
-    return String.format(
-        "%s %s.%s(%s)",
-        methodType.getReturnType().getClassName(),
-        owner.getClassName(),
-        methodName,
-        Arrays.stream(methodType.getArgumentTypes())
-            .map(Type::getClassName)
-            .collect(Collectors.joining(", ")));
-  }
+    @Override
+    public String toString() {
+        return String.format(
+                "%s %s.%s(%s)",
+                methodType.getReturnType().getClassName(),
+                owner.getClassName(),
+                methodName,
+                Arrays.stream(methodType.getArgumentTypes())
+                        .map(Type::getClassName)
+                        .collect(Collectors.joining(", ")));
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/Types.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/Types.java
index d4ff86e1399..a2684a0d92a 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/Types.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/util/Types.java
@@ -3,9 +3,9 @@
 import org.objectweb.asm.Type;
 
 public abstract class Types {
-  private Types() {}
+    private Types() {}
 
-  public static final Type BOOLEAN = Type.BOOLEAN_TYPE;
-  public static final Type STRING = Type.getType(String.class);
-  public static final Type OBJECT_ARRAY = Type.getType(Object[].class);
+    public static final Type BOOLEAN = Type.BOOLEAN_TYPE;
+    public static final Type STRING = Type.getType(String.class);
+    public static final Type OBJECT_ARRAY = Type.getType(Object[].class);
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/AdviceGeneratorTest.java b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/AdviceGeneratorTest.java
index 3206b3c9b31..04c31ac2dab 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/AdviceGeneratorTest.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/AdviceGeneratorTest.java
@@ -23,556 +23,496 @@
 
 class AdviceGeneratorTest extends BaseCsiPluginTest {
 
-  @TempDir private File buildDir;
-
-  @CallSite(spi = CallSites.class)
-  public static class BeforeAdvice {
-    @CallSite.Before(
-        "java.security.MessageDigest java.security.MessageDigest.getInstance(java.lang.String)")
-    public static void before(@CallSite.Argument String algorithm) {}
-  }
-
-  @Test
-  void testBeforeAdvice() {
-    CallSiteSpecification spec = buildClassSpecification(BeforeAdvice.class);
-    AdviceGenerator generator = buildAdviceGenerator(buildDir);
-
-    CallSiteResult result = generator.generate(spec);
-
-    assertNoErrors(result);
-    CallSiteAssert asserter = assertCallSites(result.getFile());
-    asserter.interfaces(CallSites.class);
-    asserter.helpers(BeforeAdvice.class);
-    asserter.advices(
-        0,
-        advice -> {
-          advice.type("BEFORE");
-          advice.pointcut(
-              "java/security/MessageDigest",
-              "getInstance",
-              "(Ljava/lang/String;)Ljava/security/MessageDigest;");
-          advice.statements(
-              "handler.dupParameters(descriptor, StackDupMode.COPY);",
-              "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$BeforeAdvice\", \"before\", \"(Ljava/lang/String;)V\");",
-              "handler.method(opcode, owner, name, descriptor, isInterface);");
+    @TempDir
+    private File buildDir;
+
+    @CallSite(spi = CallSites.class)
+    public static class BeforeAdvice {
+        @CallSite.Before("java.security.MessageDigest java.security.MessageDigest.getInstance(java.lang.String)")
+        public static void before(@CallSite.Argument String algorithm) {}
+    }
+
+    @Test
+    void testBeforeAdvice() {
+        CallSiteSpecification spec = buildClassSpecification(BeforeAdvice.class);
+        AdviceGenerator generator = buildAdviceGenerator(buildDir);
+
+        CallSiteResult result = generator.generate(spec);
+
+        assertNoErrors(result);
+        CallSiteAssert asserter = assertCallSites(result.getFile());
+        asserter.interfaces(CallSites.class);
+        asserter.helpers(BeforeAdvice.class);
+        asserter.advices(0, advice -> {
+            advice.type("BEFORE");
+            advice.pointcut(
+                    "java/security/MessageDigest", "getInstance", "(Ljava/lang/String;)Ljava/security/MessageDigest;");
+            advice.statements(
+                    "handler.dupParameters(descriptor, StackDupMode.COPY);",
+                    "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$BeforeAdvice\", \"before\", \"(Ljava/lang/String;)V\");",
+                    "handler.method(opcode, owner, name, descriptor, isInterface);");
         });
-  }
-
-  @CallSite(spi = CallSites.class)
-  public static class AroundAdvice {
-    @CallSite.Around(
-        "java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)")
-    public static String around(
-        @CallSite.This String self,
-        @CallSite.Argument String regexp,
-        @CallSite.Argument String replacement) {
-      return self.replaceAll(regexp, replacement);
-    }
-  }
-
-  @Test
-  void testAroundAdvice() {
-    CallSiteSpecification spec = buildClassSpecification(AroundAdvice.class);
-    AdviceGenerator generator = buildAdviceGenerator(buildDir);
-
-    CallSiteResult result = generator.generate(spec);
-
-    assertNoErrors(result);
-    CallSiteAssert asserter = assertCallSites(result.getFile());
-    asserter.interfaces(CallSites.class);
-    asserter.helpers(AroundAdvice.class);
-    asserter.advices(
-        0,
-        advice -> {
-          advice.type("AROUND");
-          advice.pointcut(
-              "java/lang/String",
-              "replaceAll",
-              "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;");
-          advice.statements(
-              "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$AroundAdvice\", \"around\", \"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;\");");
+    }
+
+    @CallSite(spi = CallSites.class)
+    public static class AroundAdvice {
+        @CallSite.Around("java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)")
+        public static String around(
+                @CallSite.This String self, @CallSite.Argument String regexp, @CallSite.Argument String replacement) {
+            return self.replaceAll(regexp, replacement);
+        }
+    }
+
+    @Test
+    void testAroundAdvice() {
+        CallSiteSpecification spec = buildClassSpecification(AroundAdvice.class);
+        AdviceGenerator generator = buildAdviceGenerator(buildDir);
+
+        CallSiteResult result = generator.generate(spec);
+
+        assertNoErrors(result);
+        CallSiteAssert asserter = assertCallSites(result.getFile());
+        asserter.interfaces(CallSites.class);
+        asserter.helpers(AroundAdvice.class);
+        asserter.advices(0, advice -> {
+            advice.type("AROUND");
+            advice.pointcut(
+                    "java/lang/String", "replaceAll", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;");
+            advice.statements(
+                    "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$AroundAdvice\", \"around\", \"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;\");");
         });
-  }
-
-  @CallSite(spi = CallSites.class)
-  public static class AfterAdvice {
-    @CallSite.After("java.lang.String java.lang.String.concat(java.lang.String)")
-    public static String after(
-        @CallSite.This String self,
-        @CallSite.Argument String param,
-        @CallSite.Return String result) {
-      return result;
-    }
-  }
-
-  @Test
-  void testAfterAdvice() {
-    CallSiteSpecification spec = buildClassSpecification(AfterAdvice.class);
-    AdviceGenerator generator = buildAdviceGenerator(buildDir);
-
-    CallSiteResult result = generator.generate(spec);
-
-    assertNoErrors(result);
-    CallSiteAssert asserter = assertCallSites(result.getFile());
-    asserter.interfaces(CallSites.class);
-    asserter.helpers(AfterAdvice.class);
-    asserter.advices(
-        0,
-        advice -> {
-          advice.type("AFTER");
-          advice.pointcut("java/lang/String", "concat", "(Ljava/lang/String;)Ljava/lang/String;");
-          advice.statements(
-              "handler.dupInvoke(owner, descriptor, StackDupMode.COPY);",
-              "handler.method(opcode, owner, name, descriptor, isInterface);",
-              "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$AfterAdvice\", \"after\", \"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;\");");
+    }
+
+    @CallSite(spi = CallSites.class)
+    public static class AfterAdvice {
+        @CallSite.After("java.lang.String java.lang.String.concat(java.lang.String)")
+        public static String after(
+                @CallSite.This String self, @CallSite.Argument String param, @CallSite.Return String result) {
+            return result;
+        }
+    }
+
+    @Test
+    void testAfterAdvice() {
+        CallSiteSpecification spec = buildClassSpecification(AfterAdvice.class);
+        AdviceGenerator generator = buildAdviceGenerator(buildDir);
+
+        CallSiteResult result = generator.generate(spec);
+
+        assertNoErrors(result);
+        CallSiteAssert asserter = assertCallSites(result.getFile());
+        asserter.interfaces(CallSites.class);
+        asserter.helpers(AfterAdvice.class);
+        asserter.advices(0, advice -> {
+            advice.type("AFTER");
+            advice.pointcut("java/lang/String", "concat", "(Ljava/lang/String;)Ljava/lang/String;");
+            advice.statements(
+                    "handler.dupInvoke(owner, descriptor, StackDupMode.COPY);",
+                    "handler.method(opcode, owner, name, descriptor, isInterface);",
+                    "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$AfterAdvice\", \"after\", \"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;\");");
         });
-  }
-
-  @CallSite(spi = CallSites.class)
-  public static class AfterAdviceCtor {
-    @CallSite.After("void java.net.URL.<init>(java.lang.String)")
-    public static URL after(@CallSite.AllArguments Object[] args, @CallSite.Return URL url) {
-      return url;
-    }
-  }
-
-  @Test
-  void testAfterAdviceCtor() {
-    CallSiteSpecification spec = buildClassSpecification(AfterAdviceCtor.class);
-    AdviceGenerator generator = buildAdviceGenerator(buildDir);
-
-    CallSiteResult result = generator.generate(spec);
-
-    assertNoErrors(result);
-    CallSiteAssert asserter = assertCallSites(result.getFile());
-    asserter.interfaces(CallSites.class);
-    asserter.helpers(AfterAdviceCtor.class);
-    asserter.advices(
-        0,
-        advice -> {
-          advice.pointcut("java/net/URL", "<init>", "(Ljava/lang/String;)V");
-          advice.statements(
-              "handler.dupParameters(descriptor, StackDupMode.PREPEND_ARRAY_CTOR);",
-              "handler.method(opcode, owner, name, descriptor, isInterface);",
-              "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$AfterAdviceCtor\", \"after\", \"([Ljava/lang/Object;Ljava/net/URL;)Ljava/net/URL;\");");
+    }
+
+    @CallSite(spi = CallSites.class)
+    public static class AfterAdviceCtor {
+        @CallSite.After("void java.net.URL.<init>(java.lang.String)")
+        public static URL after(@CallSite.AllArguments Object[] args, @CallSite.Return URL url) {
+            return url;
+        }
+    }
+
+    @Test
+    void testAfterAdviceCtor() {
+        CallSiteSpecification spec = buildClassSpecification(AfterAdviceCtor.class);
+        AdviceGenerator generator = buildAdviceGenerator(buildDir);
+
+        CallSiteResult result = generator.generate(spec);
+
+        assertNoErrors(result);
+        CallSiteAssert asserter = assertCallSites(result.getFile());
+        asserter.interfaces(CallSites.class);
+        asserter.helpers(AfterAdviceCtor.class);
+        asserter.advices(0, advice -> {
+            advice.pointcut("java/net/URL", "<init>", "(Ljava/lang/String;)V");
+            advice.statements(
+                    "handler.dupParameters(descriptor, StackDupMode.PREPEND_ARRAY_CTOR);",
+                    "handler.method(opcode, owner, name, descriptor, isInterface);",
+                    "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$AfterAdviceCtor\", \"after\", \"([Ljava/lang/Object;Ljava/net/URL;)Ljava/net/URL;\");");
         });
-  }
-
-  @CallSite(spi = SpiAdvice.SampleSpi.class)
-  public static class SpiAdvice {
-    @CallSite.Before(
-        "java.security.MessageDigest java.security.MessageDigest.getInstance(java.lang.String)")
-    public static void before(@CallSite.Argument String algorithm) {}
-
-    interface SampleSpi {}
-  }
-
-  @Test
-  void testGeneratorWithSpi() {
-    CallSiteSpecification spec = buildClassSpecification(SpiAdvice.class);
-    AdviceGenerator generator = buildAdviceGenerator(buildDir);
-
-    CallSiteResult result = generator.generate(spec);
-
-    assertNoErrors(result);
-    CallSiteAssert asserter = assertCallSites(result.getFile());
-    asserter.interfaces(CallSites.class, SpiAdvice.SampleSpi.class);
-  }
-
-  @CallSite(spi = CallSites.class)
-  public static class InvokeDynamicAfterAdvice {
-    @CallSite.After(
-        value =
-            "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
-        invokeDynamic = true)
-    public static String after(
-        @CallSite.AllArguments Object[] arguments, @CallSite.Return String result) {
-      return result;
-    }
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_9)
-  void testInvokeDynamicAfterAdvice() {
-    CallSiteSpecification spec = buildClassSpecification(InvokeDynamicAfterAdvice.class);
-    AdviceGenerator generator = buildAdviceGenerator(buildDir);
-
-    CallSiteResult result = generator.generate(spec);
-
-    assertNoErrors(result);
-    CallSiteAssert asserter = assertCallSites(result.getFile());
-    asserter.interfaces(CallSites.class);
-    asserter.helpers(InvokeDynamicAfterAdvice.class);
-    asserter.advices(
-        0,
-        advice -> {
-          advice.pointcut(
-              "java/lang/invoke/StringConcatFactory",
-              "makeConcatWithConstants",
-              "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;");
-          advice.statements(
-              "handler.dupParameters(descriptor, StackDupMode.PREPEND_ARRAY);",
-              "handler.invokeDynamic(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);",
-              "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$InvokeDynamicAfterAdvice\", \"after\", \"([Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;\");");
+    }
+
+    @CallSite(spi = SpiAdvice.SampleSpi.class)
+    public static class SpiAdvice {
+        @CallSite.Before("java.security.MessageDigest java.security.MessageDigest.getInstance(java.lang.String)")
+        public static void before(@CallSite.Argument String algorithm) {}
+
+        interface SampleSpi {}
+    }
+
+    @Test
+    void testGeneratorWithSpi() {
+        CallSiteSpecification spec = buildClassSpecification(SpiAdvice.class);
+        AdviceGenerator generator = buildAdviceGenerator(buildDir);
+
+        CallSiteResult result = generator.generate(spec);
+
+        assertNoErrors(result);
+        CallSiteAssert asserter = assertCallSites(result.getFile());
+        asserter.interfaces(CallSites.class, SpiAdvice.SampleSpi.class);
+    }
+
+    @CallSite(spi = CallSites.class)
+    public static class InvokeDynamicAfterAdvice {
+        @CallSite.After(
+                value =
+                        "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
+                invokeDynamic = true)
+        public static String after(@CallSite.AllArguments Object[] arguments, @CallSite.Return String result) {
+            return result;
+        }
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_9)
+    void testInvokeDynamicAfterAdvice() {
+        CallSiteSpecification spec = buildClassSpecification(InvokeDynamicAfterAdvice.class);
+        AdviceGenerator generator = buildAdviceGenerator(buildDir);
+
+        CallSiteResult result = generator.generate(spec);
+
+        assertNoErrors(result);
+        CallSiteAssert asserter = assertCallSites(result.getFile());
+        asserter.interfaces(CallSites.class);
+        asserter.helpers(InvokeDynamicAfterAdvice.class);
+        asserter.advices(0, advice -> {
+            advice.pointcut(
+                    "java/lang/invoke/StringConcatFactory",
+                    "makeConcatWithConstants",
+                    "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;");
+            advice.statements(
+                    "handler.dupParameters(descriptor, StackDupMode.PREPEND_ARRAY);",
+                    "handler.invokeDynamic(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);",
+                    "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$InvokeDynamicAfterAdvice\", \"after\", \"([Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;\");");
         });
-  }
-
-  @CallSite(spi = CallSites.class)
-  public static class InvokeDynamicAroundAdvice {
-    @CallSite.Around(
-        value =
-            "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
-        invokeDynamic = true)
-    public static java.lang.invoke.CallSite around(
-        @CallSite.Argument MethodHandles.Lookup lookup,
-        @CallSite.Argument String name,
-        @CallSite.Argument MethodType concatType,
-        @CallSite.Argument String recipe,
-        @CallSite.Argument Object... constants) {
-      return null;
-    }
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_9)
-  void testInvokeDynamicAroundAdvice() {
-    CallSiteSpecification spec = buildClassSpecification(InvokeDynamicAroundAdvice.class);
-    AdviceGenerator generator = buildAdviceGenerator(buildDir);
-
-    CallSiteResult result = generator.generate(spec);
-
-    assertNoErrors(result);
-    CallSiteAssert asserter = assertCallSites(result.getFile());
-    asserter.interfaces(CallSites.class);
-    asserter.helpers(InvokeDynamicAroundAdvice.class);
-    asserter.advices(
-        0,
-        advice -> {
-          advice.pointcut(
-              "java/lang/invoke/StringConcatFactory",
-              "makeConcatWithConstants",
-              "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;");
-          advice.statements(
-              "handler.invokeDynamic(name, descriptor, new Handle(Opcodes.H_INVOKESTATIC, \"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$InvokeDynamicAroundAdvice\", \"around\", \"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;\", false), bootstrapMethodArguments);");
+    }
+
+    @CallSite(spi = CallSites.class)
+    public static class InvokeDynamicAroundAdvice {
+        @CallSite.Around(
+                value =
+                        "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
+                invokeDynamic = true)
+        public static java.lang.invoke.CallSite around(
+                @CallSite.Argument MethodHandles.Lookup lookup,
+                @CallSite.Argument String name,
+                @CallSite.Argument MethodType concatType,
+                @CallSite.Argument String recipe,
+                @CallSite.Argument Object... constants) {
+            return null;
+        }
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_9)
+    void testInvokeDynamicAroundAdvice() {
+        CallSiteSpecification spec = buildClassSpecification(InvokeDynamicAroundAdvice.class);
+        AdviceGenerator generator = buildAdviceGenerator(buildDir);
+
+        CallSiteResult result = generator.generate(spec);
+
+        assertNoErrors(result);
+        CallSiteAssert asserter = assertCallSites(result.getFile());
+        asserter.interfaces(CallSites.class);
+        asserter.helpers(InvokeDynamicAroundAdvice.class);
+        asserter.advices(0, advice -> {
+            advice.pointcut(
+                    "java/lang/invoke/StringConcatFactory",
+                    "makeConcatWithConstants",
+                    "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;");
+            advice.statements(
+                    "handler.invokeDynamic(name, descriptor, new Handle(Opcodes.H_INVOKESTATIC, \"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$InvokeDynamicAroundAdvice\", \"around\", \"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;\", false), bootstrapMethodArguments);");
         });
-  }
-
-  @CallSite(spi = CallSites.class)
-  public static class InvokeDynamicWithConstantsAdvice {
-    @CallSite.After(
-        value =
-            "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
-        invokeDynamic = true)
-    public static String after(
-        @CallSite.AllArguments Object[] arguments,
-        @CallSite.Return String result,
-        @CallSite.InvokeDynamicConstants Object[] constants) {
-      return result;
-    }
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_9)
-  void testInvokeDynamicWithConstantsAdvice() {
-    CallSiteSpecification spec = buildClassSpecification(InvokeDynamicWithConstantsAdvice.class);
-    AdviceGenerator generator = buildAdviceGenerator(buildDir);
-
-    CallSiteResult result = generator.generate(spec);
-
-    assertNoErrors(result);
-    CallSiteAssert asserter = assertCallSites(result.getFile());
-    asserter.interfaces(CallSites.class);
-    asserter.helpers(InvokeDynamicWithConstantsAdvice.class);
-    asserter.advices(
-        0,
-        advice -> {
-          advice.pointcut(
-              "java/lang/invoke/StringConcatFactory",
-              "makeConcatWithConstants",
-              "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;");
-          advice.statements(
-              "handler.dupParameters(descriptor, StackDupMode.PREPEND_ARRAY);",
-              "handler.invokeDynamic(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);",
-              "handler.loadConstantArray(bootstrapMethodArguments);",
-              "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$InvokeDynamicWithConstantsAdvice\", \"after\", \"([Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;\");");
+    }
+
+    @CallSite(spi = CallSites.class)
+    public static class InvokeDynamicWithConstantsAdvice {
+        @CallSite.After(
+                value =
+                        "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
+                invokeDynamic = true)
+        public static String after(
+                @CallSite.AllArguments Object[] arguments,
+                @CallSite.Return String result,
+                @CallSite.InvokeDynamicConstants Object[] constants) {
+            return result;
+        }
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_9)
+    void testInvokeDynamicWithConstantsAdvice() {
+        CallSiteSpecification spec = buildClassSpecification(InvokeDynamicWithConstantsAdvice.class);
+        AdviceGenerator generator = buildAdviceGenerator(buildDir);
+
+        CallSiteResult result = generator.generate(spec);
+
+        assertNoErrors(result);
+        CallSiteAssert asserter = assertCallSites(result.getFile());
+        asserter.interfaces(CallSites.class);
+        asserter.helpers(InvokeDynamicWithConstantsAdvice.class);
+        asserter.advices(0, advice -> {
+            advice.pointcut(
+                    "java/lang/invoke/StringConcatFactory",
+                    "makeConcatWithConstants",
+                    "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;");
+            advice.statements(
+                    "handler.dupParameters(descriptor, StackDupMode.PREPEND_ARRAY);",
+                    "handler.invokeDynamic(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);",
+                    "handler.loadConstantArray(bootstrapMethodArguments);",
+                    "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$InvokeDynamicWithConstantsAdvice\", \"after\", \"([Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;\");");
         });
-  }
-
-  @CallSite(spi = CallSites.class)
-  public static class ArrayAdvice {
-    @CallSite.AfterArray({
-      @CallSite.After("java.util.Map javax.servlet.ServletRequest.getParameterMap()"),
-      @CallSite.After("java.util.Map javax.servlet.ServletRequestWrapper.getParameterMap()")
-    })
-    public static Map after(
-        @CallSite.This ServletRequest request, @CallSite.Return Map parameters) {
-      return parameters;
-    }
-  }
-
-  @Test
-  void testArrayAdvice() {
-    CallSiteSpecification spec = buildClassSpecification(ArrayAdvice.class);
-    AdviceGenerator generator = buildAdviceGenerator(buildDir);
-
-    CallSiteResult result = generator.generate(spec);
-
-    assertNoErrors(result);
-    CallSiteAssert asserter = assertCallSites(result.getFile());
-    asserter.advices(
-        0,
-        advice -> {
-          advice.pointcut("javax/servlet/ServletRequest", "getParameterMap", "()Ljava/util/Map;");
+    }
+
+    @CallSite(spi = CallSites.class)
+    public static class ArrayAdvice {
+        @CallSite.AfterArray({
+            @CallSite.After("java.util.Map javax.servlet.ServletRequest.getParameterMap()"),
+            @CallSite.After("java.util.Map javax.servlet.ServletRequestWrapper.getParameterMap()")
+        })
+        public static Map after(@CallSite.This ServletRequest request, @CallSite.Return Map parameters) {
+            return parameters;
+        }
+    }
+
+    @Test
+    void testArrayAdvice() {
+        CallSiteSpecification spec = buildClassSpecification(ArrayAdvice.class);
+        AdviceGenerator generator = buildAdviceGenerator(buildDir);
+
+        CallSiteResult result = generator.generate(spec);
+
+        assertNoErrors(result);
+        CallSiteAssert asserter = assertCallSites(result.getFile());
+        asserter.advices(0, advice -> {
+            advice.pointcut("javax/servlet/ServletRequest", "getParameterMap", "()Ljava/util/Map;");
         });
-    asserter.advices(
-        1,
-        advice -> {
-          advice.pointcut(
-              "javax/servlet/ServletRequestWrapper", "getParameterMap", "()Ljava/util/Map;");
+        asserter.advices(1, advice -> {
+            advice.pointcut("javax/servlet/ServletRequestWrapper", "getParameterMap", "()Ljava/util/Map;");
         });
-  }
-
-  public static class MinJavaVersionCheck {
-    public static boolean isAtLeast(String version) {
-      return Integer.parseInt(version) >= 9;
-    }
-  }
-
-  @CallSite(
-      spi = CallSites.class,
-      enabled = {
-        "datadog.trace.plugin.csi.impl.AdviceGeneratorTest$MinJavaVersionCheck",
-        "isAtLeast",
-        "18"
-      })
-  public static class MinJavaVersionAdvice {
-    @CallSite.After("java.lang.String java.lang.String.concat(java.lang.String)")
-    public static String after(
-        @CallSite.This String self,
-        @CallSite.Argument String param,
-        @CallSite.Return String result) {
-      return result;
-    }
-  }
-
-  @Test
-  void testCustomEnabledProperty() throws Exception {
-    CallSiteSpecification spec = buildClassSpecification(MinJavaVersionAdvice.class);
-    AdviceGenerator generator = buildAdviceGenerator(buildDir);
-
-    CallSiteResult result = generator.generate(spec);
-
-    assertNoErrors(result);
-    CallSiteAssert asserter = assertCallSites(result.getFile());
-    asserter.interfaces(CallSites.class, CallSites.HasEnabledProperty.class);
-    asserter.enabled(MinJavaVersionCheck.class.getDeclaredMethod("isAtLeast", String.class), "18");
-  }
-
-  @CallSite(spi = CallSites.class)
-  public static class PartialArgumentsBeforeAdvice {
-    @CallSite.Before("int java.sql.Statement.executeUpdate(java.lang.String, java.lang.String[])")
-    public static void before(@CallSite.Argument(0) String arg1) {}
-
-    @CallSite.Before(
-        "java.lang.String java.lang.String.format(java.lang.String, java.lang.Object[])")
-    public static void before(@CallSite.Argument(1) Object[] arg) {}
-
-    @CallSite.Before("java.lang.CharSequence java.lang.String.subSequence(int, int)")
-    public static void before(@CallSite.This String thiz, @CallSite.Argument(0) int arg) {}
-  }
-
-  @Test
-  void partialArgumentsWithBeforeAdvice() {
-    CallSiteSpecification spec = buildClassSpecification(PartialArgumentsBeforeAdvice.class);
-    AdviceGenerator generator = buildAdviceGenerator(buildDir);
-
-    CallSiteResult result = generator.generate(spec);
-
-    assertNoErrors(result);
-    CallSiteAssert asserter = assertCallSites(result.getFile());
-    asserter.advices(
-        0,
-        advice -> {
-          advice.pointcut(
-              "java/sql/Statement", "executeUpdate", "(Ljava/lang/String;[Ljava/lang/String;)I");
-          advice.statements(
-              "int[] parameterIndices = new int[] { 0 };",
-              "handler.dupParameters(descriptor, parameterIndices, owner);",
-              "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$PartialArgumentsBeforeAdvice\", \"before\", \"(Ljava/lang/String;)V\");",
-              "handler.method(opcode, owner, name, descriptor, isInterface);");
+    }
+
+    public static class MinJavaVersionCheck {
+        public static boolean isAtLeast(String version) {
+            return Integer.parseInt(version) >= 9;
+        }
+    }
+
+    @CallSite(
+            spi = CallSites.class,
+            enabled = {"datadog.trace.plugin.csi.impl.AdviceGeneratorTest$MinJavaVersionCheck", "isAtLeast", "18"})
+    public static class MinJavaVersionAdvice {
+        @CallSite.After("java.lang.String java.lang.String.concat(java.lang.String)")
+        public static String after(
+                @CallSite.This String self, @CallSite.Argument String param, @CallSite.Return String result) {
+            return result;
+        }
+    }
+
+    @Test
+    void testCustomEnabledProperty() throws Exception {
+        CallSiteSpecification spec = buildClassSpecification(MinJavaVersionAdvice.class);
+        AdviceGenerator generator = buildAdviceGenerator(buildDir);
+
+        CallSiteResult result = generator.generate(spec);
+
+        assertNoErrors(result);
+        CallSiteAssert asserter = assertCallSites(result.getFile());
+        asserter.interfaces(CallSites.class, CallSites.HasEnabledProperty.class);
+        asserter.enabled(MinJavaVersionCheck.class.getDeclaredMethod("isAtLeast", String.class), "18");
+    }
+
+    @CallSite(spi = CallSites.class)
+    public static class PartialArgumentsBeforeAdvice {
+        @CallSite.Before("int java.sql.Statement.executeUpdate(java.lang.String, java.lang.String[])")
+        public static void before(@CallSite.Argument(0) String arg1) {}
+
+        @CallSite.Before("java.lang.String java.lang.String.format(java.lang.String, java.lang.Object[])")
+        public static void before(@CallSite.Argument(1) Object[] arg) {}
+
+        @CallSite.Before("java.lang.CharSequence java.lang.String.subSequence(int, int)")
+        public static void before(@CallSite.This String thiz, @CallSite.Argument(0) int arg) {}
+    }
+
+    @Test
+    void partialArgumentsWithBeforeAdvice() {
+        CallSiteSpecification spec = buildClassSpecification(PartialArgumentsBeforeAdvice.class);
+        AdviceGenerator generator = buildAdviceGenerator(buildDir);
+
+        CallSiteResult result = generator.generate(spec);
+
+        assertNoErrors(result);
+        CallSiteAssert asserter = assertCallSites(result.getFile());
+        asserter.advices(0, advice -> {
+            advice.pointcut("java/sql/Statement", "executeUpdate", "(Ljava/lang/String;[Ljava/lang/String;)I");
+            advice.statements(
+                    "int[] parameterIndices = new int[] { 0 };",
+                    "handler.dupParameters(descriptor, parameterIndices, owner);",
+                    "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$PartialArgumentsBeforeAdvice\", \"before\", \"(Ljava/lang/String;)V\");",
+                    "handler.method(opcode, owner, name, descriptor, isInterface);");
         });
-    asserter.advices(
-        1,
-        advice -> {
-          advice.pointcut(
-              "java/lang/String",
-              "format",
-              "(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;");
-          advice.statements(
-              "int[] parameterIndices = new int[] { 1 };",
-              "handler.dupParameters(descriptor, parameterIndices, null);",
-              "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$PartialArgumentsBeforeAdvice\", \"before\", \"([Ljava/lang/Object;)V\");",
-              "handler.method(opcode, owner, name, descriptor, isInterface);");
+        asserter.advices(1, advice -> {
+            advice.pointcut("java/lang/String", "format", "(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;");
+            advice.statements(
+                    "int[] parameterIndices = new int[] { 1 };",
+                    "handler.dupParameters(descriptor, parameterIndices, null);",
+                    "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$PartialArgumentsBeforeAdvice\", \"before\", \"([Ljava/lang/Object;)V\");",
+                    "handler.method(opcode, owner, name, descriptor, isInterface);");
         });
-    asserter.advices(
-        2,
-        advice -> {
-          advice.pointcut("java/lang/String", "subSequence", "(II)Ljava/lang/CharSequence;");
-          advice.statements(
-              "int[] parameterIndices = new int[] { 0 };",
-              "handler.dupInvoke(owner, descriptor, parameterIndices);",
-              "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$PartialArgumentsBeforeAdvice\", \"before\", \"(Ljava/lang/String;I)V\");",
-              "handler.method(opcode, owner, name, descriptor, isInterface);");
+        asserter.advices(2, advice -> {
+            advice.pointcut("java/lang/String", "subSequence", "(II)Ljava/lang/CharSequence;");
+            advice.statements(
+                    "int[] parameterIndices = new int[] { 0 };",
+                    "handler.dupInvoke(owner, descriptor, parameterIndices);",
+                    "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$PartialArgumentsBeforeAdvice\", \"before\", \"(Ljava/lang/String;I)V\");",
+                    "handler.method(opcode, owner, name, descriptor, isInterface);");
         });
-  }
-
-  /**
-   * Captures two of three arguments positionally. Before the fix, Stream.sorted() without a
-   * comparator threw ClassCastException (ArgumentSpecification is not Comparable). The parameters
-   * TreeMap is keyed by advice-parameter index, so the stream is already in the correct order —
-   * sorted() must not be called. The reversed case verifies that parameterIndices follows the
-   * advice signature order, not the pointcut index order.
-   */
-  @CallSite(spi = CallSites.class)
-  public static class MultiplePartialArgumentsBeforeAdvice {
-    /** Captures args 0 and 1 in the same order as the pointcut. */
-    @CallSite.Before(
-        "java.lang.String java.lang.String.format(java.util.Locale, java.lang.String, java.lang.Object[])")
-    public static void before(
-        @CallSite.Argument(0) java.util.Locale locale, @CallSite.Argument(1) String format) {}
+    }
 
     /**
-     * Captures the same two args but with their advice positions reversed. parameterIndices must be
-     * {1, 0} (advice order), not {0, 1} (pointcut index order).
+     * Captures two of three arguments positionally. Before the fix, Stream.sorted() without a
+     * comparator threw ClassCastException (ArgumentSpecification is not Comparable). The parameters
+     * TreeMap is keyed by advice-parameter index, so the stream is already in the correct order —
+     * sorted() must not be called. The reversed case verifies that parameterIndices follows the
+     * advice signature order, not the pointcut index order.
      */
-    @CallSite.Before(
-        "java.lang.String java.lang.String.format(java.util.Locale, java.lang.String, java.lang.Object[])")
-    public static void beforeReversed(
-        @CallSite.Argument(1) String format, @CallSite.Argument(0) java.util.Locale locale) {}
-  }
-
-  @Test
-  void multiplePartialArgumentsWithBeforeAdvice() {
-    CallSiteSpecification spec =
-        buildClassSpecification(MultiplePartialArgumentsBeforeAdvice.class);
-    AdviceGenerator generator = buildAdviceGenerator(buildDir);
-
-    CallSiteResult result = generator.generate(spec);
-
-    assertNoErrors(result);
-    CallSiteAssert asserter = assertCallSites(result.getFile());
-    // In-order capture: {0, 1} matches both advice and pointcut order
-    asserter.advices(
-        0,
-        advice -> {
-          advice.pointcut(
-              "java/lang/String",
-              "format",
-              "(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;");
-          advice.statements(
-              "int[] parameterIndices = new int[] { 0, 1 };",
-              "handler.dupParameters(descriptor, parameterIndices, null);",
-              "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$MultiplePartialArgumentsBeforeAdvice\", \"before\", \"(Ljava/util/Locale;Ljava/lang/String;)V\");",
-              "handler.method(opcode, owner, name, descriptor, isInterface);");
+    @CallSite(spi = CallSites.class)
+    public static class MultiplePartialArgumentsBeforeAdvice {
+        /** Captures args 0 and 1 in the same order as the pointcut. */
+        @CallSite.Before(
+                "java.lang.String java.lang.String.format(java.util.Locale, java.lang.String, java.lang.Object[])")
+        public static void before(@CallSite.Argument(0) java.util.Locale locale, @CallSite.Argument(1) String format) {}
+
+        /**
+         * Captures the same two args but with their advice positions reversed. parameterIndices must be
+         * {1, 0} (advice order), not {0, 1} (pointcut index order).
+         */
+        @CallSite.Before(
+                "java.lang.String java.lang.String.format(java.util.Locale, java.lang.String, java.lang.Object[])")
+        public static void beforeReversed(
+                @CallSite.Argument(1) String format, @CallSite.Argument(0) java.util.Locale locale) {}
+    }
+
+    @Test
+    void multiplePartialArgumentsWithBeforeAdvice() {
+        CallSiteSpecification spec = buildClassSpecification(MultiplePartialArgumentsBeforeAdvice.class);
+        AdviceGenerator generator = buildAdviceGenerator(buildDir);
+
+        CallSiteResult result = generator.generate(spec);
+
+        assertNoErrors(result);
+        CallSiteAssert asserter = assertCallSites(result.getFile());
+        // In-order capture: {0, 1} matches both advice and pointcut order
+        asserter.advices(0, advice -> {
+            advice.pointcut(
+                    "java/lang/String",
+                    "format",
+                    "(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;");
+            advice.statements(
+                    "int[] parameterIndices = new int[] { 0, 1 };",
+                    "handler.dupParameters(descriptor, parameterIndices, null);",
+                    "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$MultiplePartialArgumentsBeforeAdvice\", \"before\", \"(Ljava/util/Locale;Ljava/lang/String;)V\");",
+                    "handler.method(opcode, owner, name, descriptor, isInterface);");
         });
-    // Reversed capture: {1, 0} follows the advice signature, not the pointcut index order {0, 1}
-    asserter.advices(
-        1,
-        advice -> {
-          advice.pointcut(
-              "java/lang/String",
-              "format",
-              "(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;");
-          advice.statements(
-              "int[] parameterIndices = new int[] { 1, 0 };",
-              "handler.dupParameters(descriptor, parameterIndices, null);",
-              "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$MultiplePartialArgumentsBeforeAdvice\", \"beforeReversed\", \"(Ljava/lang/String;Ljava/util/Locale;)V\");",
-              "handler.method(opcode, owner, name, descriptor, isInterface);");
+        // Reversed capture: {1, 0} follows the advice signature, not the pointcut index order {0, 1}
+        asserter.advices(1, advice -> {
+            advice.pointcut(
+                    "java/lang/String",
+                    "format",
+                    "(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;");
+            advice.statements(
+                    "int[] parameterIndices = new int[] { 1, 0 };",
+                    "handler.dupParameters(descriptor, parameterIndices, null);",
+                    "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$MultiplePartialArgumentsBeforeAdvice\", \"beforeReversed\", \"(Ljava/lang/String;Ljava/util/Locale;)V\");",
+                    "handler.method(opcode, owner, name, descriptor, isInterface);");
         });
-  }
-
-  @CallSite(spi = CallSites.class)
-  public static class SuperTypeReturnAdvice {
-    @CallSite.After("void java.lang.StringBuilder.<init>(java.lang.String)")
-    public static Object after(
-        @CallSite.AllArguments Object[] args, @CallSite.Return Object result) {
-      return result;
-    }
-  }
-
-  @Test
-  void testReturningSuperType() {
-    CallSiteSpecification spec = buildClassSpecification(SuperTypeReturnAdvice.class);
-    AdviceGenerator generator = buildAdviceGenerator(buildDir);
-
-    CallSiteResult result = generator.generate(spec);
-
-    assertNoErrors(result);
-    CallSiteAssert asserter = assertCallSites(result.getFile());
-    asserter.advices(
-        0,
-        advice -> {
-          advice.pointcut("java/lang/StringBuilder", "<init>", "(Ljava/lang/String;)V");
-          advice.statements(
-              "handler.dupParameters(descriptor, StackDupMode.PREPEND_ARRAY_CTOR);",
-              "handler.method(opcode, owner, name, descriptor, isInterface);",
-              "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$SuperTypeReturnAdvice\", \"after\", \"([Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;\");",
-              "handler.instruction(Opcodes.CHECKCAST, \"java/lang/StringBuilder\");");
+    }
+
+    @CallSite(spi = CallSites.class)
+    public static class SuperTypeReturnAdvice {
+        @CallSite.After("void java.lang.StringBuilder.<init>(java.lang.String)")
+        public static Object after(@CallSite.AllArguments Object[] args, @CallSite.Return Object result) {
+            return result;
+        }
+    }
+
+    @Test
+    void testReturningSuperType() {
+        CallSiteSpecification spec = buildClassSpecification(SuperTypeReturnAdvice.class);
+        AdviceGenerator generator = buildAdviceGenerator(buildDir);
+
+        CallSiteResult result = generator.generate(spec);
+
+        assertNoErrors(result);
+        CallSiteAssert asserter = assertCallSites(result.getFile());
+        asserter.advices(0, advice -> {
+            advice.pointcut("java/lang/StringBuilder", "<init>", "(Ljava/lang/String;)V");
+            advice.statements(
+                    "handler.dupParameters(descriptor, StackDupMode.PREPEND_ARRAY_CTOR);",
+                    "handler.method(opcode, owner, name, descriptor, isInterface);",
+                    "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$SuperTypeReturnAdvice\", \"after\", \"([Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;\");",
+                    "handler.instruction(Opcodes.CHECKCAST, \"java/lang/StringBuilder\");");
         });
-  }
-
-  @CallSite(spi = {IastCallSites.class, RaspCallSites.class})
-  public static class MultipleSpiClassesAdvice {
-    @CallSite.After("void java.lang.StringBuilder.<init>(java.lang.String)")
-    public static Object after(
-        @CallSite.AllArguments Object[] args, @CallSite.Return Object result) {
-      return result;
-    }
-  }
-
-  @Test
-  void testMultipleSpiClasses() {
-    CallSiteSpecification spec = buildClassSpecification(MultipleSpiClassesAdvice.class);
-    AdviceGenerator generator = buildAdviceGenerator(buildDir);
-
-    CallSiteResult result = generator.generate(spec);
-
-    assertNoErrors(result);
-    CallSiteAssert asserter = assertCallSites(result.getFile());
-    asserter.spi(IastCallSites.class, RaspCallSites.class);
-  }
-
-  @CallSite(spi = CallSites.class)
-  public static class AfterAdviceWithVoidReturn {
-    @CallSite.After("void java.lang.StringBuilder.setLength(int)")
-    public static void after(@CallSite.This StringBuilder self, @CallSite.Argument(0) int length) {}
-  }
-
-  @Test
-  void testAfterAdviceWithVoidReturn() {
-    CallSiteSpecification spec = buildClassSpecification(AfterAdviceWithVoidReturn.class);
-    AdviceGenerator generator = buildAdviceGenerator(buildDir);
-
-    CallSiteResult result = generator.generate(spec);
-
-    assertNoErrors(result);
-    CallSiteAssert asserter = assertCallSites(result.getFile());
-    asserter.advices(
-        0,
-        advice -> {
-          advice.pointcut("java/lang/StringBuilder", "setLength", "(I)V");
-          advice.statements(
-              "handler.dupInvoke(owner, descriptor, StackDupMode.COPY);",
-              "handler.method(opcode, owner, name, descriptor, isInterface);",
-              "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$AfterAdviceWithVoidReturn\", \"after\", \"(Ljava/lang/StringBuilder;I)V\");");
+    }
+
+    @CallSite(spi = {IastCallSites.class, RaspCallSites.class})
+    public static class MultipleSpiClassesAdvice {
+        @CallSite.After("void java.lang.StringBuilder.<init>(java.lang.String)")
+        public static Object after(@CallSite.AllArguments Object[] args, @CallSite.Return Object result) {
+            return result;
+        }
+    }
+
+    @Test
+    void testMultipleSpiClasses() {
+        CallSiteSpecification spec = buildClassSpecification(MultipleSpiClassesAdvice.class);
+        AdviceGenerator generator = buildAdviceGenerator(buildDir);
+
+        CallSiteResult result = generator.generate(spec);
+
+        assertNoErrors(result);
+        CallSiteAssert asserter = assertCallSites(result.getFile());
+        asserter.spi(IastCallSites.class, RaspCallSites.class);
+    }
+
+    @CallSite(spi = CallSites.class)
+    public static class AfterAdviceWithVoidReturn {
+        @CallSite.After("void java.lang.StringBuilder.setLength(int)")
+        public static void after(@CallSite.This StringBuilder self, @CallSite.Argument(0) int length) {}
+    }
+
+    @Test
+    void testAfterAdviceWithVoidReturn() {
+        CallSiteSpecification spec = buildClassSpecification(AfterAdviceWithVoidReturn.class);
+        AdviceGenerator generator = buildAdviceGenerator(buildDir);
+
+        CallSiteResult result = generator.generate(spec);
+
+        assertNoErrors(result);
+        CallSiteAssert asserter = assertCallSites(result.getFile());
+        asserter.advices(0, advice -> {
+            advice.pointcut("java/lang/StringBuilder", "setLength", "(I)V");
+            advice.statements(
+                    "handler.dupInvoke(owner, descriptor, StackDupMode.COPY);",
+                    "handler.method(opcode, owner, name, descriptor, isInterface);",
+                    "handler.advice(\"datadog/trace/plugin/csi/impl/AdviceGeneratorTest$AfterAdviceWithVoidReturn\", \"after\", \"(Ljava/lang/StringBuilder;I)V\");");
         });
-  }
+    }
 
-  private static AdviceGenerator buildAdviceGenerator(File targetFolder) {
-    return new AdviceGeneratorImpl(targetFolder, pointcutParser());
-  }
+    private static AdviceGenerator buildAdviceGenerator(File targetFolder) {
+        return new AdviceGeneratorImpl(targetFolder, pointcutParser());
+    }
 
-  private static CallSiteAssert assertCallSites(File generated) {
-    return new AssertBuilder(generated).build();
-  }
+    private static CallSiteAssert assertCallSites(File generated) {
+        return new AssertBuilder(generated).build();
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/AdviceSpecificationTest.java b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/AdviceSpecificationTest.java
index 3c9fe3cacb5..30f3fbd0dba 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/AdviceSpecificationTest.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/AdviceSpecificationTest.java
@@ -40,684 +40,619 @@
 
 class AdviceSpecificationTest extends BaseCsiPluginTest {
 
-  @CallSite(spi = CallSites.class)
-  static class EmptyAdvice {}
-
-  @Test
-  void testClassGeneratorErrorCallSiteWithoutAdvices() {
-    ValidationContext context = mockValidationContext();
-    CallSiteSpecification spec = buildClassSpecification(EmptyAdvice.class);
-
-    spec.validate(context);
-    verify(context).addError(eq(ErrorCode.CALL_SITE_SHOULD_HAVE_ADVICE_METHODS), any());
-  }
-
-  @CallSite(spi = CallSites.class)
-  static class NonPublicStaticMethodAdvice {
-    @CallSite.Before("void java.lang.Runnable.run()")
-    private void advice(@CallSite.This Runnable run) {}
-  }
-
-  @Test
-  void testClassGeneratorErrorNonPublicStaticMethod() {
-    ValidationContext context = mockValidationContext();
-    CallSiteSpecification spec = buildClassSpecification(NonPublicStaticMethodAdvice.class);
-
-    spec.getAdvices().forEach(it -> it.validate(context));
-
-    verify(context).addError(eq(ErrorCode.ADVICE_METHOD_NOT_STATIC_AND_PUBLIC), any());
-  }
-
-  static class BeforeStringConcat {
-    static void concat(String self, String value) {}
-  }
-
-  static Stream<Arguments> adviceClassShouldBeOnClasspathProvider() {
-    return Stream.of(
-        Arguments.of(Type.getType("Lfoo/bar/FooBar;"), 1),
-        Arguments.of(Type.getType(BeforeStringConcat.class), 0));
-  }
-
-  @ParameterizedTest
-  @MethodSource("adviceClassShouldBeOnClasspathProvider")
-  void testAdviceClassShouldBeOnTheClasspath(Type type, int errors) throws Exception {
-    ValidationContext context = mockValidationContext();
-    BeforeSpecification spec =
-        createBeforeSpec(
-            BeforeStringConcat.class.getDeclaredMethod("concat", String.class, String.class),
-            type,
-            Arrays.asList(new ThisSpecification(), new ArgumentSpecification()),
-            "java.lang.String java.lang.String.concat(java.lang.String)");
-
-    spec.validate(context);
-    verify(context, times(errors))
-        .addError(
-            argThat((Failure failure) -> failure.getErrorCode() == ErrorCode.UNRESOLVED_TYPE));
-  }
-
-  static Stream<Arguments> beforeAdviceShouldReturnVoidProvider() {
-    return Stream.of(Arguments.of(String.class, 1), Arguments.of(void.class, 0));
-  }
-
-  @ParameterizedTest
-  @MethodSource("beforeAdviceShouldReturnVoidProvider")
-  void testBeforeAdviceShouldReturnVoid(Class<?> returnType, int errors) {
-    ValidationContext context = mockValidationContext();
-    BeforeSpecification spec =
-        createBeforeSpec(
-            BeforeStringConcat.class,
-            "concat",
-            returnType,
-            new Class<?>[] {String.class, String.class},
-            Arrays.asList(new ThisSpecification(), new ArgumentSpecification()),
-            "java.lang.String java.lang.String.concat(java.lang.String)");
-
-    spec.validate(context);
-    verify(context, times(errors)).addError(eq(ErrorCode.ADVICE_BEFORE_SHOULD_RETURN_VOID), any());
-  }
-
-  static class AroundStringConcat {
-    static String concat(String self, String value) {
-      return self.concat(value);
-    }
-  }
-
-  static Stream<Arguments> aroundAdviceReturnTypeProvider() {
-    return Stream.of(
-        Arguments.of(MessageDigest.class, 1),
-        Arguments.of(Object.class, 0),
-        Arguments.of(String.class, 0));
-  }
-
-  @ParameterizedTest
-  @MethodSource("aroundAdviceReturnTypeProvider")
-  void testAroundAdviceShouldReturnTypeCompatibleWithPointcut(Class<?> returnType, int errors) {
-    ValidationContext context = mockValidationContext();
-    AroundSpecification spec =
-        createAroundSpec(
-            AroundStringConcat.class,
-            "concat",
-            returnType,
-            new Class<?>[] {String.class, String.class},
-            Arrays.asList(new ThisSpecification(), new ArgumentSpecification()),
-            "java.lang.String java.lang.String.concat(java.lang.String)");
-
-    spec.validate(context);
-    verify(context, times(errors))
-        .addError(eq(ErrorCode.ADVICE_METHOD_RETURN_NOT_COMPATIBLE), any());
-  }
-
-  static class AfterStringConcat {
-    static String concat(String self, String value, String result) {
-      return result;
-    }
-  }
-
-  static Stream<Arguments> afterAdviceReturnTypeProvider() {
-    return Stream.of(
-        Arguments.of(MessageDigest.class, 1),
-        Arguments.of(Object.class, 0),
-        Arguments.of(String.class, 0));
-  }
-
-  @ParameterizedTest
-  @MethodSource("afterAdviceReturnTypeProvider")
-  void testAfterAdviceShouldReturnTypeCompatibleWithPointcut(Class<?> returnType, int errors) {
-    ValidationContext context = mockValidationContext();
-    AfterSpecification spec =
-        createAfterSpec(
-            AfterStringConcat.class,
-            "concat",
-            returnType,
-            new Class<?>[] {String.class, String.class, String.class},
-            Arrays.asList(
-                new ThisSpecification(), new ArgumentSpecification(), new ReturnSpecification()),
-            "java.lang.String java.lang.String.concat(java.lang.String)");
-
-    spec.validate(context);
-    verify(context, times(errors))
-        .addError(eq(ErrorCode.ADVICE_METHOD_RETURN_NOT_COMPATIBLE), any());
-  }
-
-  static Stream<Arguments> thisParameterShouldBeFirstProvider() {
-    return Stream.of(
-        Arguments.of(Arrays.asList(new ThisSpecification(), new ArgumentSpecification()), 0),
-        Arguments.of(Arrays.asList(new ArgumentSpecification(), new ThisSpecification()), 1));
-  }
-
-  @ParameterizedTest
-  @MethodSource("thisParameterShouldBeFirstProvider")
-  void testThisParameterShouldAlwaysBeTheFirst(List<ParameterSpecification> params, int errors)
-      throws Exception {
-    ValidationContext context = mockValidationContext();
-    AroundSpecification spec =
-        createAroundSpec(
-            AroundStringConcat.class.getDeclaredMethod("concat", String.class, String.class),
-            params,
-            "java.lang.String java.lang.String.concat(java.lang.String)");
-
-    spec.validate(context);
-    verify(context, times(errors))
-        .addError(eq(ErrorCode.ADVICE_PARAMETER_THIS_SHOULD_BE_FIRST), any());
-  }
-
-  static Stream<Arguments> thisParameterCompatibilityProvider() {
-    return Stream.of(
-        Arguments.of(MessageDigest.class, 1),
-        Arguments.of(Object.class, 0),
-        Arguments.of(String.class, 0));
-  }
-
-  @ParameterizedTest
-  @MethodSource("thisParameterCompatibilityProvider")
-  void testThisParameterShouldBeCompatibleWithPointcut(Class<?> type, int errors) {
-    ValidationContext context = mockValidationContext();
-    AroundSpecification spec =
-        createAroundSpec(
-            AroundStringConcat.class,
-            "concat",
-            String.class,
-            new Class<?>[] {type, String.class},
-            Arrays.asList(new ThisSpecification(), new ArgumentSpecification()),
-            "java.lang.String java.lang.String.concat(java.lang.String)");
-
-    spec.validate(context);
-    verify(context, times(errors))
-        .addError(eq(ErrorCode.ADVICE_METHOD_PARAM_THIS_NOT_COMPATIBLE), any());
-    if (type != String.class) {
-      verify(context)
-          .addError(
-              argThat((Failure failure) -> failure.getErrorCode() == ErrorCode.UNRESOLVED_METHOD));
-    }
-  }
-
-  static Stream<Arguments> returnParameterShouldBeLastProvider() {
-    return Stream.of(
-        Arguments.of(
-            Arrays.asList(
-                new ThisSpecification(), new ArgumentSpecification(), new ReturnSpecification()),
-            0),
-        Arguments.of(
-            Arrays.asList(
-                new ThisSpecification(), new ReturnSpecification(), new ArgumentSpecification()),
-            1));
-  }
-
-  @ParameterizedTest
-  @MethodSource("returnParameterShouldBeLastProvider")
-  void testReturnParameterShouldAlwaysBeTheLast(List<ParameterSpecification> params, int errors)
-      throws Exception {
-    ValidationContext context = mockValidationContext();
-    AfterSpecification spec =
-        createAfterSpec(
-            AfterStringConcat.class.getDeclaredMethod(
-                "concat", String.class, String.class, String.class),
-            params,
-            "java.lang.String java.lang.String.concat(java.lang.String)");
-
-    spec.validate(context);
-    verify(context, times(errors))
-        .addError(eq(ErrorCode.ADVICE_PARAMETER_RETURN_SHOULD_BE_LAST), any());
-  }
-
-  static Stream<Arguments> returnParameterCompatibilityProvider() {
-    return Stream.of(
-        Arguments.of(MessageDigest.class, 1),
-        Arguments.of(String.class, 0),
-        Arguments.of(Object.class, 0));
-  }
-
-  @ParameterizedTest
-  @MethodSource("returnParameterCompatibilityProvider")
-  void testReturnParameterShouldBeCompatibleWithPointcut(Class<?> returnType, int errors) {
-    ValidationContext context = mockValidationContext();
-    AfterSpecification spec =
-        createAfterSpec(
-            AfterStringConcat.class,
-            "concat",
-            String.class,
-            new Class<?>[] {String.class, String.class, returnType},
-            Arrays.asList(
-                new ThisSpecification(), new ArgumentSpecification(), new ReturnSpecification()),
-            "java.lang.String java.lang.String.concat(java.lang.String)");
-
-    spec.validate(context);
-    verify(context, times(errors))
-        .addError(eq(ErrorCode.ADVICE_METHOD_PARAM_RETURN_NOT_COMPATIBLE), any());
-    if (returnType != String.class) {
-      verify(context)
-          .addError(
-              argThat((Failure failure) -> failure.getErrorCode() == ErrorCode.UNRESOLVED_METHOD));
-    }
-  }
-
-  static Stream<Arguments> argumentParameterCompatibilityProvider() {
-    return Stream.of(
-        Arguments.of(MessageDigest.class, 1),
-        Arguments.of(String.class, 0),
-        Arguments.of(Object.class, 0));
-  }
-
-  @ParameterizedTest
-  @MethodSource("argumentParameterCompatibilityProvider")
-  void testArgumentParameterShouldBeCompatibleWithPointcut(Class<?> parameterType, int errors) {
-    ValidationContext context = mockValidationContext();
-    AfterSpecification spec =
-        createAfterSpec(
-            AfterStringConcat.class,
-            "concat",
-            String.class,
-            new Class<?>[] {String.class, parameterType, String.class},
-            Arrays.asList(
-                new ThisSpecification(), new ArgumentSpecification(), new ReturnSpecification()),
-            "java.lang.String java.lang.String.concat(java.lang.String)");
-
-    spec.validate(context);
-    verify(context, times(errors))
-        .addError(eq(ErrorCode.ADVICE_METHOD_PARAM_NOT_COMPATIBLE), any());
-    if (parameterType != String.class) {
-      verify(context)
-          .addError(
-              argThat((Failure failure) -> failure.getErrorCode() == ErrorCode.UNRESOLVED_METHOD));
-    }
-  }
-
-  static class BadAfterStringConcat {
-    static String concat(String param1, String param2) {
-      return param2;
-    }
-  }
-
-  static Stream<Arguments> afterAdviceRequiresThisAndReturnProvider() {
-    return Stream.of(
-        Arguments.of(
-            Arrays.asList(new ArgumentSpecification(), new ReturnSpecification()),
-            ErrorCode.ADVICE_AFTER_SHOULD_HAVE_THIS),
-        Arguments.of(
-            Arrays.asList(new ThisSpecification(), new ArgumentSpecification()),
-            ErrorCode.ADVICE_AFTER_SHOULD_HAVE_RETURN));
-  }
-
-  @ParameterizedTest
-  @MethodSource("afterAdviceRequiresThisAndReturnProvider")
-  void testAfterAdviceRequiresThisAndReturnParameters(
-      List<ParameterSpecification> params, ErrorCode error) throws Exception {
-    ValidationContext context = mockValidationContext();
-    AfterSpecification spec =
-        createAfterSpec(
-            BadAfterStringConcat.class.getDeclaredMethod("concat", String.class, String.class),
-            params,
-            "java.lang.String java.lang.String.concat(java.lang.String)");
-
-    spec.validate(context);
-    verify(context).addError(eq(error), any());
-  }
-
-  static class BadAllArgsAfterStringConcat {
-    static String concat(Object[] param1, String param2, String param3) {
-      return param3;
-    }
-  }
-
-  @Test
-  void shouldNotMixAllArgumentsAndArgument() throws Exception {
-    ValidationContext context = mockValidationContext();
-    AllArgsSpecification allArgs = new AllArgsSpecification();
-    allArgs.setIncludeThis(true);
-    AfterSpecification spec =
-        createAfterSpec(
-            BadAllArgsAfterStringConcat.class.getDeclaredMethod(
-                "concat", Object[].class, String.class, String.class),
-            Arrays.asList(allArgs, new ArgumentSpecification(), new ReturnSpecification()),
-            "java.lang.String java.lang.String.concat(java.lang.String)");
-
-    spec.validate(context);
-    verify(context).addError(eq(ErrorCode.ADVICE_PARAMETER_ALL_ARGS_MIXED), any());
-    verify(context).addError(eq(ErrorCode.ADVICE_PARAMETER_ARGUMENT_OUT_OF_BOUNDS), any());
-  }
-
-  static class TestInheritedMethod {
-    static String after(ServletRequest request, String parameter, String value) {
-      return value;
-    }
-  }
-
-  @Test
-  void testInheritedMethods() throws Exception {
-    ValidationContext context = mockValidationContext();
-    AfterSpecification spec =
-        createAfterSpec(
-            TestInheritedMethod.class.getDeclaredMethod(
-                "after", ServletRequest.class, String.class, String.class),
-            Arrays.asList(
-                new ThisSpecification(), new ArgumentSpecification(), new ReturnSpecification()),
-            "java.lang.String javax.servlet.http.HttpServletRequest.getParameter(java.lang.String)");
-
-    spec.validate(context);
-  }
-
-  static class TestInvokeDynamicConstants {
-    static Object after(Object[] parameter, Object result, Object[] constants) {
-      return result;
-    }
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_9)
-  void testInvokeDynamicConstants() throws Exception {
-    ValidationContext context = mockValidationContext();
-    AfterSpecification spec =
-        createAfterSpec(
-            TestInvokeDynamicConstants.class.getDeclaredMethod(
-                "after", Object[].class, Object.class, Object[].class),
-            Arrays.asList(
-                new AllArgsSpecification(),
-                new ReturnSpecification(),
-                new InvokeDynamicConstantsSpecification()),
-            "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
-            true);
-
-    spec.validate(context);
-  }
-
-  static Stream<Arguments> invokeDynamicConstantsShouldBeLastProvider() {
-    return Stream.of(
-        Arguments.of(
-            Arrays.asList(
-                new AllArgsSpecification(),
-                new ReturnSpecification(),
-                new InvokeDynamicConstantsSpecification()),
-            null),
-        Arguments.of(
-            Arrays.asList(
-                new AllArgsSpecification(),
-                new InvokeDynamicConstantsSpecification(),
-                new ReturnSpecification()),
-            ErrorCode.ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_SHOULD_BE_LAST));
-  }
-
-  @ParameterizedTest
-  @MethodSource("invokeDynamicConstantsShouldBeLastProvider")
-  @EnabledForJreRange(min = JRE.JAVA_9)
-  void testInvokeDynamicConstantsShouldBeLast(List<ParameterSpecification> params, ErrorCode error)
-      throws Exception {
-    ValidationContext context = mockValidationContext();
-    AfterSpecification spec =
-        createAfterSpec(
-            TestInvokeDynamicConstants.class.getDeclaredMethod(
-                "after", Object[].class, Object.class, Object[].class),
-            params,
-            "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
-            true);
-
-    spec.validate(context);
-    if (error != null) {
-      verify(context).addError(eq(error), any());
-    }
-  }
-
-  static class TestInvokeDynamicConstantsNonInvokeDynamic {
-    static Object after(Object self, Object[] parameter, Object value, Object[] constants) {
-      return value;
-    }
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_9)
-  void testInvokeDynamicConstantsOnNonInvokeDynamicPointcut() throws Exception {
-    ValidationContext context = mockValidationContext();
-    AfterSpecification spec =
-        createAfterSpec(
-            TestInvokeDynamicConstantsNonInvokeDynamic.class.getDeclaredMethod(
-                "after", Object.class, Object[].class, Object.class, Object[].class),
-            Arrays.asList(
-                new ThisSpecification(),
-                new AllArgsSpecification(),
-                new InvokeDynamicConstantsSpecification(),
-                new ReturnSpecification()),
-            "java.lang.String java.lang.String.concat(java.lang.String)");
-
-    spec.validate(context);
-    verify(context)
-        .addError(
-            eq(ErrorCode.ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_ON_NON_INVOKE_DYNAMIC), any());
-  }
-
-  static class TestInvokeDynamicConstantsBefore {
-    static void before(Object[] parameter, Object[] constants) {}
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_9)
-  void testInvokeDynamicConstantsOnNonAfterAdvice() throws Exception {
-    ValidationContext context = mockValidationContext();
-    BeforeSpecification spec =
-        createBeforeSpec(
-            TestInvokeDynamicConstantsBefore.class.getDeclaredMethod(
-                "before", Object[].class, Object[].class),
-            Arrays.asList(new AllArgsSpecification(), new InvokeDynamicConstantsSpecification()),
-            "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
-            true);
-
-    spec.validate(context);
-    verify(context)
-        .addError(eq(ErrorCode.ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_NON_AFTER_ADVICE), any());
-  }
-
-  static class TestInvokeDynamicConstantsAround {
-    static java.lang.invoke.CallSite around(
-        MethodHandles.Lookup lookup,
-        String name,
-        java.lang.invoke.MethodType concatType,
-        String recipe,
-        Object... constants) {
-      return null;
-    }
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_9)
-  void testInvokeDynamicOnAroundAdvice() throws Exception {
-    ValidationContext context = mockValidationContext();
-    AroundSpecification spec =
-        createAroundSpec(
-            TestInvokeDynamicConstantsAround.class.getDeclaredMethod(
-                "around",
-                MethodHandles.Lookup.class,
+    @CallSite(spi = CallSites.class)
+    static class EmptyAdvice {}
+
+    @Test
+    void testClassGeneratorErrorCallSiteWithoutAdvices() {
+        ValidationContext context = mockValidationContext();
+        CallSiteSpecification spec = buildClassSpecification(EmptyAdvice.class);
+
+        spec.validate(context);
+        verify(context).addError(eq(ErrorCode.CALL_SITE_SHOULD_HAVE_ADVICE_METHODS), any());
+    }
+
+    @CallSite(spi = CallSites.class)
+    static class NonPublicStaticMethodAdvice {
+        @CallSite.Before("void java.lang.Runnable.run()")
+        private void advice(@CallSite.This Runnable run) {}
+    }
+
+    @Test
+    void testClassGeneratorErrorNonPublicStaticMethod() {
+        ValidationContext context = mockValidationContext();
+        CallSiteSpecification spec = buildClassSpecification(NonPublicStaticMethodAdvice.class);
+
+        spec.getAdvices().forEach(it -> it.validate(context));
+
+        verify(context).addError(eq(ErrorCode.ADVICE_METHOD_NOT_STATIC_AND_PUBLIC), any());
+    }
+
+    static class BeforeStringConcat {
+        static void concat(String self, String value) {}
+    }
+
+    static Stream<Arguments> adviceClassShouldBeOnClasspathProvider() {
+        return Stream.of(
+                Arguments.of(Type.getType("Lfoo/bar/FooBar;"), 1),
+                Arguments.of(Type.getType(BeforeStringConcat.class), 0));
+    }
+
+    @ParameterizedTest
+    @MethodSource("adviceClassShouldBeOnClasspathProvider")
+    void testAdviceClassShouldBeOnTheClasspath(Type type, int errors) throws Exception {
+        ValidationContext context = mockValidationContext();
+        BeforeSpecification spec = createBeforeSpec(
+                BeforeStringConcat.class.getDeclaredMethod("concat", String.class, String.class),
+                type,
+                Arrays.asList(new ThisSpecification(), new ArgumentSpecification()),
+                "java.lang.String java.lang.String.concat(java.lang.String)");
+
+        spec.validate(context);
+        verify(context, times(errors))
+                .addError(argThat((Failure failure) -> failure.getErrorCode() == ErrorCode.UNRESOLVED_TYPE));
+    }
+
+    static Stream<Arguments> beforeAdviceShouldReturnVoidProvider() {
+        return Stream.of(Arguments.of(String.class, 1), Arguments.of(void.class, 0));
+    }
+
+    @ParameterizedTest
+    @MethodSource("beforeAdviceShouldReturnVoidProvider")
+    void testBeforeAdviceShouldReturnVoid(Class<?> returnType, int errors) {
+        ValidationContext context = mockValidationContext();
+        BeforeSpecification spec = createBeforeSpec(
+                BeforeStringConcat.class,
+                "concat",
+                returnType,
+                new Class<?>[] {String.class, String.class},
+                Arrays.asList(new ThisSpecification(), new ArgumentSpecification()),
+                "java.lang.String java.lang.String.concat(java.lang.String)");
+
+        spec.validate(context);
+        verify(context, times(errors)).addError(eq(ErrorCode.ADVICE_BEFORE_SHOULD_RETURN_VOID), any());
+    }
+
+    static class AroundStringConcat {
+        static String concat(String self, String value) {
+            return self.concat(value);
+        }
+    }
+
+    static Stream<Arguments> aroundAdviceReturnTypeProvider() {
+        return Stream.of(
+                Arguments.of(MessageDigest.class, 1), Arguments.of(Object.class, 0), Arguments.of(String.class, 0));
+    }
+
+    @ParameterizedTest
+    @MethodSource("aroundAdviceReturnTypeProvider")
+    void testAroundAdviceShouldReturnTypeCompatibleWithPointcut(Class<?> returnType, int errors) {
+        ValidationContext context = mockValidationContext();
+        AroundSpecification spec = createAroundSpec(
+                AroundStringConcat.class,
+                "concat",
+                returnType,
+                new Class<?>[] {String.class, String.class},
+                Arrays.asList(new ThisSpecification(), new ArgumentSpecification()),
+                "java.lang.String java.lang.String.concat(java.lang.String)");
+
+        spec.validate(context);
+        verify(context, times(errors)).addError(eq(ErrorCode.ADVICE_METHOD_RETURN_NOT_COMPATIBLE), any());
+    }
+
+    static class AfterStringConcat {
+        static String concat(String self, String value, String result) {
+            return result;
+        }
+    }
+
+    static Stream<Arguments> afterAdviceReturnTypeProvider() {
+        return Stream.of(
+                Arguments.of(MessageDigest.class, 1), Arguments.of(Object.class, 0), Arguments.of(String.class, 0));
+    }
+
+    @ParameterizedTest
+    @MethodSource("afterAdviceReturnTypeProvider")
+    void testAfterAdviceShouldReturnTypeCompatibleWithPointcut(Class<?> returnType, int errors) {
+        ValidationContext context = mockValidationContext();
+        AfterSpecification spec = createAfterSpec(
+                AfterStringConcat.class,
+                "concat",
+                returnType,
+                new Class<?>[] {String.class, String.class, String.class},
+                Arrays.asList(new ThisSpecification(), new ArgumentSpecification(), new ReturnSpecification()),
+                "java.lang.String java.lang.String.concat(java.lang.String)");
+
+        spec.validate(context);
+        verify(context, times(errors)).addError(eq(ErrorCode.ADVICE_METHOD_RETURN_NOT_COMPATIBLE), any());
+    }
+
+    static Stream<Arguments> thisParameterShouldBeFirstProvider() {
+        return Stream.of(
+                Arguments.of(Arrays.asList(new ThisSpecification(), new ArgumentSpecification()), 0),
+                Arguments.of(Arrays.asList(new ArgumentSpecification(), new ThisSpecification()), 1));
+    }
+
+    @ParameterizedTest
+    @MethodSource("thisParameterShouldBeFirstProvider")
+    void testThisParameterShouldAlwaysBeTheFirst(List<ParameterSpecification> params, int errors) throws Exception {
+        ValidationContext context = mockValidationContext();
+        AroundSpecification spec = createAroundSpec(
+                AroundStringConcat.class.getDeclaredMethod("concat", String.class, String.class),
+                params,
+                "java.lang.String java.lang.String.concat(java.lang.String)");
+
+        spec.validate(context);
+        verify(context, times(errors)).addError(eq(ErrorCode.ADVICE_PARAMETER_THIS_SHOULD_BE_FIRST), any());
+    }
+
+    static Stream<Arguments> thisParameterCompatibilityProvider() {
+        return Stream.of(
+                Arguments.of(MessageDigest.class, 1), Arguments.of(Object.class, 0), Arguments.of(String.class, 0));
+    }
+
+    @ParameterizedTest
+    @MethodSource("thisParameterCompatibilityProvider")
+    void testThisParameterShouldBeCompatibleWithPointcut(Class<?> type, int errors) {
+        ValidationContext context = mockValidationContext();
+        AroundSpecification spec = createAroundSpec(
+                AroundStringConcat.class,
+                "concat",
                 String.class,
-                java.lang.invoke.MethodType.class,
+                new Class<?>[] {type, String.class},
+                Arrays.asList(new ThisSpecification(), new ArgumentSpecification()),
+                "java.lang.String java.lang.String.concat(java.lang.String)");
+
+        spec.validate(context);
+        verify(context, times(errors)).addError(eq(ErrorCode.ADVICE_METHOD_PARAM_THIS_NOT_COMPATIBLE), any());
+        if (type != String.class) {
+            verify(context)
+                    .addError(argThat((Failure failure) -> failure.getErrorCode() == ErrorCode.UNRESOLVED_METHOD));
+        }
+    }
+
+    static Stream<Arguments> returnParameterShouldBeLastProvider() {
+        return Stream.of(
+                Arguments.of(
+                        Arrays.asList(new ThisSpecification(), new ArgumentSpecification(), new ReturnSpecification()),
+                        0),
+                Arguments.of(
+                        Arrays.asList(new ThisSpecification(), new ReturnSpecification(), new ArgumentSpecification()),
+                        1));
+    }
+
+    @ParameterizedTest
+    @MethodSource("returnParameterShouldBeLastProvider")
+    void testReturnParameterShouldAlwaysBeTheLast(List<ParameterSpecification> params, int errors) throws Exception {
+        ValidationContext context = mockValidationContext();
+        AfterSpecification spec = createAfterSpec(
+                AfterStringConcat.class.getDeclaredMethod("concat", String.class, String.class, String.class),
+                params,
+                "java.lang.String java.lang.String.concat(java.lang.String)");
+
+        spec.validate(context);
+        verify(context, times(errors)).addError(eq(ErrorCode.ADVICE_PARAMETER_RETURN_SHOULD_BE_LAST), any());
+    }
+
+    static Stream<Arguments> returnParameterCompatibilityProvider() {
+        return Stream.of(
+                Arguments.of(MessageDigest.class, 1), Arguments.of(String.class, 0), Arguments.of(Object.class, 0));
+    }
+
+    @ParameterizedTest
+    @MethodSource("returnParameterCompatibilityProvider")
+    void testReturnParameterShouldBeCompatibleWithPointcut(Class<?> returnType, int errors) {
+        ValidationContext context = mockValidationContext();
+        AfterSpecification spec = createAfterSpec(
+                AfterStringConcat.class,
+                "concat",
                 String.class,
-                Object[].class),
-            Arrays.asList(
-                new ArgumentSpecification(),
-                new ArgumentSpecification(),
-                new ArgumentSpecification(),
-                new ArgumentSpecification(),
-                new ArgumentSpecification()),
-            "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
-            true);
-
-    spec.validate(context);
-  }
-
-  @CallSite(spi = CallSites.class)
-  static class AfterWithVoidWrongAdvice {
-    @CallSite.After("void java.lang.String.getChars(int, int, char[], int)")
-    static String after(@CallSite.AllArguments Object[] args, @CallSite.Return String result) {
-      return result;
-    }
-  }
-
-  @Test
-  void testAfterAdviceWithVoidShouldNotUseReturn() {
-    ValidationContext context = mockValidationContext();
-    CallSiteSpecification spec = buildClassSpecification(AfterWithVoidWrongAdvice.class);
-
-    spec.getAdvices().forEach(it -> it.validate(context));
-
-    verify(context).addError(eq(ErrorCode.ADVICE_AFTER_VOID_METHOD_SHOULD_RETURN_VOID), any());
-    verify(context).addError(eq(ErrorCode.ADVICE_AFTER_VOID_METHOD_SHOULD_NOT_HAVE_RETURN), any());
-  }
-
-  // Helper methods to create specifications
-  private BeforeSpecification createBeforeSpec(
-      Method method, List<ParameterSpecification> params, String signature) {
-    return createBeforeSpec(method, null, params, signature, false);
-  }
-
-  private BeforeSpecification createBeforeSpec(
-      Method method, List<ParameterSpecification> params, String signature, boolean invokeDynamic) {
-    return createBeforeSpec(method, null, params, signature, invokeDynamic);
-  }
-
-  private BeforeSpecification createBeforeSpec(
-      Method method, Type ownerOverride, List<ParameterSpecification> params, String signature) {
-    return createBeforeSpec(method, ownerOverride, params, signature, false);
-  }
-
-  private BeforeSpecification createBeforeSpec(
-      Method method,
-      Type ownerOverride,
-      List<ParameterSpecification> params,
-      String signature,
-      boolean invokeDynamic) {
-    Type owner = ownerOverride != null ? ownerOverride : Type.getType(method.getDeclaringClass());
-    Type[] argTypes =
-        Arrays.stream(method.getParameterTypes()).map(Type::getType).toArray(Type[]::new);
-    Type returnType = Type.getType(method.getReturnType());
-    MethodType methodType =
-        new MethodType(owner, method.getName(), Type.getMethodType(returnType, argTypes));
-    Map<Integer, ParameterSpecification> paramMap = new HashMap<>();
-    for (int i = 0; i < params.size(); i++) {
-      paramMap.put(i, params.get(i));
-    }
-    updateArgumentIndices(paramMap);
-    BeforeSpecification spec =
-        new BeforeSpecification(methodType, paramMap, signature, invokeDynamic);
-    spec.parseSignature(CallSiteFactory.pointcutParser());
-    return spec;
-  }
-
-  private BeforeSpecification createBeforeSpec(
-      Class<?> clazz,
-      String methodName,
-      Class<?> returnType,
-      Class<?>[] argTypes,
-      List<ParameterSpecification> params,
-      String signature) {
-    Type owner = Type.getType(clazz);
-    Type[] argTypesAsm = Arrays.stream(argTypes).map(Type::getType).toArray(Type[]::new);
-    Type returnTypeAsm = Type.getType(returnType);
-    MethodType methodType =
-        new MethodType(owner, methodName, Type.getMethodType(returnTypeAsm, argTypesAsm));
-    Map<Integer, ParameterSpecification> paramMap = new HashMap<>();
-    for (int i = 0; i < params.size(); i++) {
-      paramMap.put(i, params.get(i));
-    }
-    updateArgumentIndices(paramMap);
-    BeforeSpecification spec = new BeforeSpecification(methodType, paramMap, signature, false);
-    spec.parseSignature(CallSiteFactory.pointcutParser());
-    return spec;
-  }
-
-  private AroundSpecification createAroundSpec(
-      Method method, List<ParameterSpecification> params, String signature) {
-    return createAroundSpec(method, params, signature, false);
-  }
-
-  private AroundSpecification createAroundSpec(
-      Method method, List<ParameterSpecification> params, String signature, boolean invokeDynamic) {
-    Type owner = Type.getType(method.getDeclaringClass());
-    Type[] argTypes =
-        Arrays.stream(method.getParameterTypes()).map(Type::getType).toArray(Type[]::new);
-    Type returnType = Type.getType(method.getReturnType());
-    MethodType methodType =
-        new MethodType(owner, method.getName(), Type.getMethodType(returnType, argTypes));
-    Map<Integer, ParameterSpecification> paramMap = new HashMap<>();
-    for (int i = 0; i < params.size(); i++) {
-      paramMap.put(i, params.get(i));
-    }
-    updateArgumentIndices(paramMap);
-    AroundSpecification spec =
-        new AroundSpecification(methodType, paramMap, signature, invokeDynamic);
-    spec.parseSignature(CallSiteFactory.pointcutParser());
-    return spec;
-  }
-
-  private AroundSpecification createAroundSpec(
-      Class<?> clazz,
-      String methodName,
-      Class<?> returnType,
-      Class<?>[] argTypes,
-      List<ParameterSpecification> params,
-      String signature) {
-    Type owner = Type.getType(clazz);
-    Type[] argTypesAsm = Arrays.stream(argTypes).map(Type::getType).toArray(Type[]::new);
-    Type returnTypeAsm = Type.getType(returnType);
-    MethodType methodType =
-        new MethodType(owner, methodName, Type.getMethodType(returnTypeAsm, argTypesAsm));
-    Map<Integer, ParameterSpecification> paramMap = new HashMap<>();
-    for (int i = 0; i < params.size(); i++) {
-      paramMap.put(i, params.get(i));
-    }
-    updateArgumentIndices(paramMap);
-    AroundSpecification spec = new AroundSpecification(methodType, paramMap, signature, false);
-    spec.parseSignature(CallSiteFactory.pointcutParser());
-    return spec;
-  }
-
-  private AfterSpecification createAfterSpec(
-      Method method, List<ParameterSpecification> params, String signature) {
-    return createAfterSpec(method, params, signature, false);
-  }
-
-  private AfterSpecification createAfterSpec(
-      Method method, List<ParameterSpecification> params, String signature, boolean invokeDynamic) {
-    Type owner = Type.getType(method.getDeclaringClass());
-    Type[] argTypes =
-        Arrays.stream(method.getParameterTypes()).map(Type::getType).toArray(Type[]::new);
-    Type returnType = Type.getType(method.getReturnType());
-    MethodType methodType =
-        new MethodType(owner, method.getName(), Type.getMethodType(returnType, argTypes));
-    Map<Integer, ParameterSpecification> paramMap = new HashMap<>();
-    for (int i = 0; i < params.size(); i++) {
-      paramMap.put(i, params.get(i));
-    }
-    updateArgumentIndices(paramMap);
-    AfterSpecification spec =
-        new AfterSpecification(methodType, paramMap, signature, invokeDynamic);
-    spec.parseSignature(CallSiteFactory.pointcutParser());
-    return spec;
-  }
-
-  private AfterSpecification createAfterSpec(
-      Class<?> clazz,
-      String methodName,
-      Class<?> returnType,
-      Class<?>[] argTypes,
-      List<ParameterSpecification> params,
-      String signature) {
-    Type owner = Type.getType(clazz);
-    Type[] argTypesAsm = Arrays.stream(argTypes).map(Type::getType).toArray(Type[]::new);
-    Type returnTypeAsm = Type.getType(returnType);
-    MethodType methodType =
-        new MethodType(owner, methodName, Type.getMethodType(returnTypeAsm, argTypesAsm));
-    Map<Integer, ParameterSpecification> paramMap = new HashMap<>();
-    for (int i = 0; i < params.size(); i++) {
-      paramMap.put(i, params.get(i));
-    }
-    updateArgumentIndices(paramMap);
-    AfterSpecification spec = new AfterSpecification(methodType, paramMap, signature, false);
-    spec.parseSignature(CallSiteFactory.pointcutParser());
-    return spec;
-  }
-
-  private void updateArgumentIndices(Map<Integer, ParameterSpecification> paramMap) {
-    int index = 0;
-    for (ParameterSpecification param : paramMap.values()) {
-      if (param instanceof ArgumentSpecification) {
-        ((ArgumentSpecification) param).setIndex(index++);
-      }
-    }
-  }
+                new Class<?>[] {String.class, String.class, returnType},
+                Arrays.asList(new ThisSpecification(), new ArgumentSpecification(), new ReturnSpecification()),
+                "java.lang.String java.lang.String.concat(java.lang.String)");
+
+        spec.validate(context);
+        verify(context, times(errors)).addError(eq(ErrorCode.ADVICE_METHOD_PARAM_RETURN_NOT_COMPATIBLE), any());
+        if (returnType != String.class) {
+            verify(context)
+                    .addError(argThat((Failure failure) -> failure.getErrorCode() == ErrorCode.UNRESOLVED_METHOD));
+        }
+    }
+
+    static Stream<Arguments> argumentParameterCompatibilityProvider() {
+        return Stream.of(
+                Arguments.of(MessageDigest.class, 1), Arguments.of(String.class, 0), Arguments.of(Object.class, 0));
+    }
+
+    @ParameterizedTest
+    @MethodSource("argumentParameterCompatibilityProvider")
+    void testArgumentParameterShouldBeCompatibleWithPointcut(Class<?> parameterType, int errors) {
+        ValidationContext context = mockValidationContext();
+        AfterSpecification spec = createAfterSpec(
+                AfterStringConcat.class,
+                "concat",
+                String.class,
+                new Class<?>[] {String.class, parameterType, String.class},
+                Arrays.asList(new ThisSpecification(), new ArgumentSpecification(), new ReturnSpecification()),
+                "java.lang.String java.lang.String.concat(java.lang.String)");
+
+        spec.validate(context);
+        verify(context, times(errors)).addError(eq(ErrorCode.ADVICE_METHOD_PARAM_NOT_COMPATIBLE), any());
+        if (parameterType != String.class) {
+            verify(context)
+                    .addError(argThat((Failure failure) -> failure.getErrorCode() == ErrorCode.UNRESOLVED_METHOD));
+        }
+    }
+
+    static class BadAfterStringConcat {
+        static String concat(String param1, String param2) {
+            return param2;
+        }
+    }
+
+    static Stream<Arguments> afterAdviceRequiresThisAndReturnProvider() {
+        return Stream.of(
+                Arguments.of(
+                        Arrays.asList(new ArgumentSpecification(), new ReturnSpecification()),
+                        ErrorCode.ADVICE_AFTER_SHOULD_HAVE_THIS),
+                Arguments.of(
+                        Arrays.asList(new ThisSpecification(), new ArgumentSpecification()),
+                        ErrorCode.ADVICE_AFTER_SHOULD_HAVE_RETURN));
+    }
+
+    @ParameterizedTest
+    @MethodSource("afterAdviceRequiresThisAndReturnProvider")
+    void testAfterAdviceRequiresThisAndReturnParameters(List<ParameterSpecification> params, ErrorCode error)
+            throws Exception {
+        ValidationContext context = mockValidationContext();
+        AfterSpecification spec = createAfterSpec(
+                BadAfterStringConcat.class.getDeclaredMethod("concat", String.class, String.class),
+                params,
+                "java.lang.String java.lang.String.concat(java.lang.String)");
+
+        spec.validate(context);
+        verify(context).addError(eq(error), any());
+    }
+
+    static class BadAllArgsAfterStringConcat {
+        static String concat(Object[] param1, String param2, String param3) {
+            return param3;
+        }
+    }
+
+    @Test
+    void shouldNotMixAllArgumentsAndArgument() throws Exception {
+        ValidationContext context = mockValidationContext();
+        AllArgsSpecification allArgs = new AllArgsSpecification();
+        allArgs.setIncludeThis(true);
+        AfterSpecification spec = createAfterSpec(
+                BadAllArgsAfterStringConcat.class.getDeclaredMethod(
+                        "concat", Object[].class, String.class, String.class),
+                Arrays.asList(allArgs, new ArgumentSpecification(), new ReturnSpecification()),
+                "java.lang.String java.lang.String.concat(java.lang.String)");
+
+        spec.validate(context);
+        verify(context).addError(eq(ErrorCode.ADVICE_PARAMETER_ALL_ARGS_MIXED), any());
+        verify(context).addError(eq(ErrorCode.ADVICE_PARAMETER_ARGUMENT_OUT_OF_BOUNDS), any());
+    }
+
+    static class TestInheritedMethod {
+        static String after(ServletRequest request, String parameter, String value) {
+            return value;
+        }
+    }
+
+    @Test
+    void testInheritedMethods() throws Exception {
+        ValidationContext context = mockValidationContext();
+        AfterSpecification spec = createAfterSpec(
+                TestInheritedMethod.class.getDeclaredMethod("after", ServletRequest.class, String.class, String.class),
+                Arrays.asList(new ThisSpecification(), new ArgumentSpecification(), new ReturnSpecification()),
+                "java.lang.String javax.servlet.http.HttpServletRequest.getParameter(java.lang.String)");
+
+        spec.validate(context);
+    }
+
+    static class TestInvokeDynamicConstants {
+        static Object after(Object[] parameter, Object result, Object[] constants) {
+            return result;
+        }
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_9)
+    void testInvokeDynamicConstants() throws Exception {
+        ValidationContext context = mockValidationContext();
+        AfterSpecification spec = createAfterSpec(
+                TestInvokeDynamicConstants.class.getDeclaredMethod(
+                        "after", Object[].class, Object.class, Object[].class),
+                Arrays.asList(
+                        new AllArgsSpecification(),
+                        new ReturnSpecification(),
+                        new InvokeDynamicConstantsSpecification()),
+                "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
+                true);
+
+        spec.validate(context);
+    }
+
+    static Stream<Arguments> invokeDynamicConstantsShouldBeLastProvider() {
+        return Stream.of(
+                Arguments.of(
+                        Arrays.asList(
+                                new AllArgsSpecification(),
+                                new ReturnSpecification(),
+                                new InvokeDynamicConstantsSpecification()),
+                        null),
+                Arguments.of(
+                        Arrays.asList(
+                                new AllArgsSpecification(),
+                                new InvokeDynamicConstantsSpecification(),
+                                new ReturnSpecification()),
+                        ErrorCode.ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_SHOULD_BE_LAST));
+    }
+
+    @ParameterizedTest
+    @MethodSource("invokeDynamicConstantsShouldBeLastProvider")
+    @EnabledForJreRange(min = JRE.JAVA_9)
+    void testInvokeDynamicConstantsShouldBeLast(List<ParameterSpecification> params, ErrorCode error) throws Exception {
+        ValidationContext context = mockValidationContext();
+        AfterSpecification spec = createAfterSpec(
+                TestInvokeDynamicConstants.class.getDeclaredMethod(
+                        "after", Object[].class, Object.class, Object[].class),
+                params,
+                "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
+                true);
+
+        spec.validate(context);
+        if (error != null) {
+            verify(context).addError(eq(error), any());
+        }
+    }
+
+    static class TestInvokeDynamicConstantsNonInvokeDynamic {
+        static Object after(Object self, Object[] parameter, Object value, Object[] constants) {
+            return value;
+        }
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_9)
+    void testInvokeDynamicConstantsOnNonInvokeDynamicPointcut() throws Exception {
+        ValidationContext context = mockValidationContext();
+        AfterSpecification spec = createAfterSpec(
+                TestInvokeDynamicConstantsNonInvokeDynamic.class.getDeclaredMethod(
+                        "after", Object.class, Object[].class, Object.class, Object[].class),
+                Arrays.asList(
+                        new ThisSpecification(),
+                        new AllArgsSpecification(),
+                        new InvokeDynamicConstantsSpecification(),
+                        new ReturnSpecification()),
+                "java.lang.String java.lang.String.concat(java.lang.String)");
+
+        spec.validate(context);
+        verify(context).addError(eq(ErrorCode.ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_ON_NON_INVOKE_DYNAMIC), any());
+    }
+
+    static class TestInvokeDynamicConstantsBefore {
+        static void before(Object[] parameter, Object[] constants) {}
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_9)
+    void testInvokeDynamicConstantsOnNonAfterAdvice() throws Exception {
+        ValidationContext context = mockValidationContext();
+        BeforeSpecification spec = createBeforeSpec(
+                TestInvokeDynamicConstantsBefore.class.getDeclaredMethod("before", Object[].class, Object[].class),
+                Arrays.asList(new AllArgsSpecification(), new InvokeDynamicConstantsSpecification()),
+                "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
+                true);
+
+        spec.validate(context);
+        verify(context).addError(eq(ErrorCode.ADVICE_PARAMETER_INVOKE_DYNAMIC_CONSTANTS_NON_AFTER_ADVICE), any());
+    }
+
+    static class TestInvokeDynamicConstantsAround {
+        static java.lang.invoke.CallSite around(
+                MethodHandles.Lookup lookup,
+                String name,
+                java.lang.invoke.MethodType concatType,
+                String recipe,
+                Object... constants) {
+            return null;
+        }
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_9)
+    void testInvokeDynamicOnAroundAdvice() throws Exception {
+        ValidationContext context = mockValidationContext();
+        AroundSpecification spec = createAroundSpec(
+                TestInvokeDynamicConstantsAround.class.getDeclaredMethod(
+                        "around",
+                        MethodHandles.Lookup.class,
+                        String.class,
+                        java.lang.invoke.MethodType.class,
+                        String.class,
+                        Object[].class),
+                Arrays.asList(
+                        new ArgumentSpecification(),
+                        new ArgumentSpecification(),
+                        new ArgumentSpecification(),
+                        new ArgumentSpecification(),
+                        new ArgumentSpecification()),
+                "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
+                true);
+
+        spec.validate(context);
+    }
+
+    @CallSite(spi = CallSites.class)
+    static class AfterWithVoidWrongAdvice {
+        @CallSite.After("void java.lang.String.getChars(int, int, char[], int)")
+        static String after(@CallSite.AllArguments Object[] args, @CallSite.Return String result) {
+            return result;
+        }
+    }
+
+    @Test
+    void testAfterAdviceWithVoidShouldNotUseReturn() {
+        ValidationContext context = mockValidationContext();
+        CallSiteSpecification spec = buildClassSpecification(AfterWithVoidWrongAdvice.class);
+
+        spec.getAdvices().forEach(it -> it.validate(context));
+
+        verify(context).addError(eq(ErrorCode.ADVICE_AFTER_VOID_METHOD_SHOULD_RETURN_VOID), any());
+        verify(context).addError(eq(ErrorCode.ADVICE_AFTER_VOID_METHOD_SHOULD_NOT_HAVE_RETURN), any());
+    }
+
+    // Helper methods to create specifications
+    private BeforeSpecification createBeforeSpec(Method method, List<ParameterSpecification> params, String signature) {
+        return createBeforeSpec(method, null, params, signature, false);
+    }
+
+    private BeforeSpecification createBeforeSpec(
+            Method method, List<ParameterSpecification> params, String signature, boolean invokeDynamic) {
+        return createBeforeSpec(method, null, params, signature, invokeDynamic);
+    }
+
+    private BeforeSpecification createBeforeSpec(
+            Method method, Type ownerOverride, List<ParameterSpecification> params, String signature) {
+        return createBeforeSpec(method, ownerOverride, params, signature, false);
+    }
+
+    private BeforeSpecification createBeforeSpec(
+            Method method,
+            Type ownerOverride,
+            List<ParameterSpecification> params,
+            String signature,
+            boolean invokeDynamic) {
+        Type owner = ownerOverride != null ? ownerOverride : Type.getType(method.getDeclaringClass());
+        Type[] argTypes =
+                Arrays.stream(method.getParameterTypes()).map(Type::getType).toArray(Type[]::new);
+        Type returnType = Type.getType(method.getReturnType());
+        MethodType methodType = new MethodType(owner, method.getName(), Type.getMethodType(returnType, argTypes));
+        Map<Integer, ParameterSpecification> paramMap = new HashMap<>();
+        for (int i = 0; i < params.size(); i++) {
+            paramMap.put(i, params.get(i));
+        }
+        updateArgumentIndices(paramMap);
+        BeforeSpecification spec = new BeforeSpecification(methodType, paramMap, signature, invokeDynamic);
+        spec.parseSignature(CallSiteFactory.pointcutParser());
+        return spec;
+    }
+
+    private BeforeSpecification createBeforeSpec(
+            Class<?> clazz,
+            String methodName,
+            Class<?> returnType,
+            Class<?>[] argTypes,
+            List<ParameterSpecification> params,
+            String signature) {
+        Type owner = Type.getType(clazz);
+        Type[] argTypesAsm = Arrays.stream(argTypes).map(Type::getType).toArray(Type[]::new);
+        Type returnTypeAsm = Type.getType(returnType);
+        MethodType methodType = new MethodType(owner, methodName, Type.getMethodType(returnTypeAsm, argTypesAsm));
+        Map<Integer, ParameterSpecification> paramMap = new HashMap<>();
+        for (int i = 0; i < params.size(); i++) {
+            paramMap.put(i, params.get(i));
+        }
+        updateArgumentIndices(paramMap);
+        BeforeSpecification spec = new BeforeSpecification(methodType, paramMap, signature, false);
+        spec.parseSignature(CallSiteFactory.pointcutParser());
+        return spec;
+    }
+
+    private AroundSpecification createAroundSpec(Method method, List<ParameterSpecification> params, String signature) {
+        return createAroundSpec(method, params, signature, false);
+    }
+
+    private AroundSpecification createAroundSpec(
+            Method method, List<ParameterSpecification> params, String signature, boolean invokeDynamic) {
+        Type owner = Type.getType(method.getDeclaringClass());
+        Type[] argTypes =
+                Arrays.stream(method.getParameterTypes()).map(Type::getType).toArray(Type[]::new);
+        Type returnType = Type.getType(method.getReturnType());
+        MethodType methodType = new MethodType(owner, method.getName(), Type.getMethodType(returnType, argTypes));
+        Map<Integer, ParameterSpecification> paramMap = new HashMap<>();
+        for (int i = 0; i < params.size(); i++) {
+            paramMap.put(i, params.get(i));
+        }
+        updateArgumentIndices(paramMap);
+        AroundSpecification spec = new AroundSpecification(methodType, paramMap, signature, invokeDynamic);
+        spec.parseSignature(CallSiteFactory.pointcutParser());
+        return spec;
+    }
+
+    private AroundSpecification createAroundSpec(
+            Class<?> clazz,
+            String methodName,
+            Class<?> returnType,
+            Class<?>[] argTypes,
+            List<ParameterSpecification> params,
+            String signature) {
+        Type owner = Type.getType(clazz);
+        Type[] argTypesAsm = Arrays.stream(argTypes).map(Type::getType).toArray(Type[]::new);
+        Type returnTypeAsm = Type.getType(returnType);
+        MethodType methodType = new MethodType(owner, methodName, Type.getMethodType(returnTypeAsm, argTypesAsm));
+        Map<Integer, ParameterSpecification> paramMap = new HashMap<>();
+        for (int i = 0; i < params.size(); i++) {
+            paramMap.put(i, params.get(i));
+        }
+        updateArgumentIndices(paramMap);
+        AroundSpecification spec = new AroundSpecification(methodType, paramMap, signature, false);
+        spec.parseSignature(CallSiteFactory.pointcutParser());
+        return spec;
+    }
+
+    private AfterSpecification createAfterSpec(Method method, List<ParameterSpecification> params, String signature) {
+        return createAfterSpec(method, params, signature, false);
+    }
+
+    private AfterSpecification createAfterSpec(
+            Method method, List<ParameterSpecification> params, String signature, boolean invokeDynamic) {
+        Type owner = Type.getType(method.getDeclaringClass());
+        Type[] argTypes =
+                Arrays.stream(method.getParameterTypes()).map(Type::getType).toArray(Type[]::new);
+        Type returnType = Type.getType(method.getReturnType());
+        MethodType methodType = new MethodType(owner, method.getName(), Type.getMethodType(returnType, argTypes));
+        Map<Integer, ParameterSpecification> paramMap = new HashMap<>();
+        for (int i = 0; i < params.size(); i++) {
+            paramMap.put(i, params.get(i));
+        }
+        updateArgumentIndices(paramMap);
+        AfterSpecification spec = new AfterSpecification(methodType, paramMap, signature, invokeDynamic);
+        spec.parseSignature(CallSiteFactory.pointcutParser());
+        return spec;
+    }
+
+    private AfterSpecification createAfterSpec(
+            Class<?> clazz,
+            String methodName,
+            Class<?> returnType,
+            Class<?>[] argTypes,
+            List<ParameterSpecification> params,
+            String signature) {
+        Type owner = Type.getType(clazz);
+        Type[] argTypesAsm = Arrays.stream(argTypes).map(Type::getType).toArray(Type[]::new);
+        Type returnTypeAsm = Type.getType(returnType);
+        MethodType methodType = new MethodType(owner, methodName, Type.getMethodType(returnTypeAsm, argTypesAsm));
+        Map<Integer, ParameterSpecification> paramMap = new HashMap<>();
+        for (int i = 0; i < params.size(); i++) {
+            paramMap.put(i, params.get(i));
+        }
+        updateArgumentIndices(paramMap);
+        AfterSpecification spec = new AfterSpecification(methodType, paramMap, signature, false);
+        spec.parseSignature(CallSiteFactory.pointcutParser());
+        return spec;
+    }
+
+    private void updateArgumentIndices(Map<Integer, ParameterSpecification> paramMap) {
+        int index = 0;
+        for (ParameterSpecification param : paramMap.values()) {
+            if (param instanceof ArgumentSpecification) {
+                ((ArgumentSpecification) param).setIndex(index++);
+            }
+        }
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/AsmSpecificationBuilderTest.java b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/AsmSpecificationBuilderTest.java
index 14ad65bfb0b..a7d4da7581a 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/AsmSpecificationBuilderTest.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/AsmSpecificationBuilderTest.java
@@ -31,559 +31,526 @@
 
 class AsmSpecificationBuilderTest extends BaseCsiPluginTest {
 
-  static class NonCallSite {}
+    static class NonCallSite {}
 
-  @Test
-  void testSpecificationBuilderForNonCallSite() {
-    File advice = fetchClass(NonCallSite.class);
-    AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
+    @Test
+    void testSpecificationBuilderForNonCallSite() {
+        File advice = fetchClass(NonCallSite.class);
+        AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
 
-    Optional<CallSiteSpecification> result = specificationBuilder.build(advice);
+        Optional<CallSiteSpecification> result = specificationBuilder.build(advice);
 
-    assertFalse(result.isPresent());
-  }
+        assertFalse(result.isPresent());
+    }
 
-  @CallSite(spi = WithSpiClass.Spi.class)
-  static class WithSpiClass {
-    interface Spi {}
-  }
+    @CallSite(spi = WithSpiClass.Spi.class)
+    static class WithSpiClass {
+        interface Spi {}
+    }
 
-  @Test
-  void testSpecificationBuilderWithCustomSpiClass() {
-    File advice = fetchClass(WithSpiClass.class);
-    AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
+    @Test
+    void testSpecificationBuilderWithCustomSpiClass() {
+        File advice = fetchClass(WithSpiClass.class);
+        AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
 
-    CallSiteSpecification result =
-        specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
+        CallSiteSpecification result = specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
 
-    assertEquals(
-        Arrays.asList(Type.getType(WithSpiClass.Spi.class)), Arrays.asList(result.getSpi()));
-  }
+        assertEquals(Arrays.asList(Type.getType(WithSpiClass.Spi.class)), Arrays.asList(result.getSpi()));
+    }
 
-  @CallSite(
-      spi = CallSites.class,
-      helpers = {HelpersAdvice.SampleHelper1.class, HelpersAdvice.SampleHelper2.class})
-  static class HelpersAdvice {
-    static class SampleHelper1 {}
+    @CallSite(
+            spi = CallSites.class,
+            helpers = {HelpersAdvice.SampleHelper1.class, HelpersAdvice.SampleHelper2.class})
+    static class HelpersAdvice {
+        static class SampleHelper1 {}
 
-    static class SampleHelper2 {}
-  }
+        static class SampleHelper2 {}
+    }
 
-  @Test
-  void testSpecificationBuilderWithCustomHelperClasses() {
-    File advice = fetchClass(HelpersAdvice.class);
-    AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
+    @Test
+    void testSpecificationBuilderWithCustomHelperClasses() {
+        File advice = fetchClass(HelpersAdvice.class);
+        AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
 
-    CallSiteSpecification result =
-        specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
+        CallSiteSpecification result = specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
 
-    List<Type> helpers = Arrays.asList(result.getHelpers());
-    assertTrue(
-        helpers.containsAll(
-            Arrays.asList(
+        List<Type> helpers = Arrays.asList(result.getHelpers());
+        assertTrue(helpers.containsAll(Arrays.asList(
                 Type.getType(HelpersAdvice.class),
                 Type.getType(HelpersAdvice.SampleHelper1.class),
                 Type.getType(HelpersAdvice.SampleHelper2.class))));
-  }
-
-  @CallSite(spi = CallSites.class)
-  static class BeforeAdvice {
-    @CallSite.Before(
-        "java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)")
-    static void before(
-        @CallSite.This String self,
-        @CallSite.Argument String regexp,
-        @CallSite.Argument String replacement) {}
-  }
-
-  @Test
-  void testSpecificationBuilderForBeforeAdvice() {
-    File advice = fetchClass(BeforeAdvice.class);
-    AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
-
-    CallSiteSpecification result =
-        specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
-
-    assertEquals(BeforeAdvice.class.getName(), result.getClazz().getClassName());
-    BeforeSpecification beforeSpec = (BeforeSpecification) findAdvice(result, "before");
-    assertNotNull(beforeSpec);
-    assertEquals(
-        "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V",
-        beforeSpec.getAdvice().getMethodType().getDescriptor());
-    assertEquals(
-        "java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)",
-        beforeSpec.getSignature());
-    assertNotNull(beforeSpec.findThis());
-    assertNull(beforeSpec.findReturn());
-    assertNull(beforeSpec.findAllArguments());
-    assertNull(beforeSpec.findInvokeDynamicConstants());
-    List<Integer> arguments = getArguments(beforeSpec);
-    assertEquals(Arrays.asList(0, 1), arguments);
-  }
-
-  @CallSite(spi = CallSites.class)
-  static class AroundAdvice {
-    @CallSite.Around(
-        "java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)")
-    static String around(
-        @CallSite.This String self,
-        @CallSite.Argument String regexp,
-        @CallSite.Argument String replacement) {
-      return self.replaceAll(regexp, replacement);
-    }
-  }
-
-  @Test
-  void testSpecificationBuilderForAroundAdvice() {
-    File advice = fetchClass(AroundAdvice.class);
-    AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
-
-    CallSiteSpecification result =
-        specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
-
-    assertEquals(AroundAdvice.class.getName(), result.getClazz().getClassName());
-    AroundSpecification aroundSpec = (AroundSpecification) findAdvice(result, "around");
-    assertNotNull(aroundSpec);
-    assertEquals(
-        "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;",
-        aroundSpec.getAdvice().getMethodType().getDescriptor());
-    assertEquals(
-        "java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)",
-        aroundSpec.getSignature());
-    assertNotNull(aroundSpec.findThis());
-    assertNull(aroundSpec.findReturn());
-    assertNull(aroundSpec.findAllArguments());
-    assertNull(aroundSpec.findInvokeDynamicConstants());
-    List<Integer> arguments = getArguments(aroundSpec);
-    assertEquals(Arrays.asList(0, 1), arguments);
-  }
-
-  @CallSite(spi = CallSites.class)
-  static class AfterAdvice {
-    @CallSite.After(
-        "java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)")
-    static String after(
-        @CallSite.This String self,
-        @CallSite.Argument String regexp,
-        @CallSite.Argument String replacement,
-        @CallSite.Return String result) {
-      return result;
-    }
-  }
-
-  @Test
-  void testSpecificationBuilderForAfterAdvice() {
-    File advice = fetchClass(AfterAdvice.class);
-    AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
-
-    CallSiteSpecification result =
-        specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
-
-    assertEquals(AfterAdvice.class.getName(), result.getClazz().getClassName());
-    AfterSpecification afterSpec = (AfterSpecification) findAdvice(result, "after");
-    assertNotNull(afterSpec);
-    assertEquals(
-        "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;",
-        afterSpec.getAdvice().getMethodType().getDescriptor());
-    assertEquals(
-        "java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)",
-        afterSpec.getSignature());
-    assertNotNull(afterSpec.findThis());
-    assertNotNull(afterSpec.findReturn());
-    assertNull(afterSpec.findAllArguments());
-    assertNull(afterSpec.findInvokeDynamicConstants());
-    List<Integer> arguments = getArguments(afterSpec);
-    assertEquals(Arrays.asList(0, 1), arguments);
-  }
-
-  @CallSite(spi = CallSites.class)
-  static class AllArgsAdvice {
-    @CallSite.Around(
-        "java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)")
-    static String allArgs(
-        @CallSite.AllArguments(includeThis = true) Object[] arguments,
-        @CallSite.Return String result) {
-      return result;
-    }
-  }
-
-  @Test
-  void testSpecificationBuilderForAdviceWithAllArguments() {
-    File advice = fetchClass(AllArgsAdvice.class);
-    AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
-
-    CallSiteSpecification result =
-        specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
-
-    assertEquals(AllArgsAdvice.class.getName(), result.getClazz().getClassName());
-    AroundSpecification allArgsSpec = (AroundSpecification) findAdvice(result, "allArgs");
-    assertNotNull(allArgsSpec);
-    assertEquals(
-        "([Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;",
-        allArgsSpec.getAdvice().getMethodType().getDescriptor());
-    assertEquals(
-        "java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)",
-        allArgsSpec.getSignature());
-    assertNull(allArgsSpec.findThis());
-    assertNotNull(allArgsSpec.findReturn());
-    AllArgsSpecification allArguments = allArgsSpec.findAllArguments();
-    assertNotNull(allArguments);
-    assertTrue(allArguments.isIncludeThis());
-    assertNull(allArgsSpec.findInvokeDynamicConstants());
-    List<Integer> arguments = getArguments(allArgsSpec);
-    assertEquals(Arrays.asList(), arguments);
-  }
-
-  @CallSite(spi = CallSites.class)
-  static class InvokeDynamicBeforeAdvice {
-    @CallSite.After(
-        value =
-            "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
-        invokeDynamic = true)
-    static String invokeDynamic(
-        @CallSite.AllArguments Object[] arguments, @CallSite.Return String result) {
-      return result;
-    }
-  }
-
-  @Test
-  void testSpecificationBuilderForBeforeInvokeDynamic() {
-    File advice = fetchClass(InvokeDynamicBeforeAdvice.class);
-    AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
-
-    CallSiteSpecification result =
-        specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
-
-    assertEquals(InvokeDynamicBeforeAdvice.class.getName(), result.getClazz().getClassName());
-    AfterSpecification invokeDynamicSpec = (AfterSpecification) findAdvice(result, "invokeDynamic");
-    assertNotNull(invokeDynamicSpec);
-    assertEquals(
-        "([Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;",
-        invokeDynamicSpec.getAdvice().getMethodType().getDescriptor());
-    assertEquals(
-        "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
-        invokeDynamicSpec.getSignature());
-    assertNull(invokeDynamicSpec.findThis());
-    assertNotNull(invokeDynamicSpec.findReturn());
-    AllArgsSpecification allArguments = invokeDynamicSpec.findAllArguments();
-    assertNotNull(allArguments);
-    assertFalse(allArguments.isIncludeThis());
-    assertNull(invokeDynamicSpec.findInvokeDynamicConstants());
-    List<Integer> arguments = getArguments(invokeDynamicSpec);
-    assertEquals(Arrays.asList(), arguments);
-  }
-
-  @CallSite(spi = CallSites.class)
-  static class InvokeDynamicAroundAdvice {
-    @CallSite.Around(
-        value =
-            "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
-        invokeDynamic = true)
-    static java.lang.invoke.CallSite invokeDynamic(
-        @CallSite.Argument MethodHandles.Lookup lookup,
-        @CallSite.Argument String name,
-        @CallSite.Argument MethodType concatType,
-        @CallSite.Argument String recipe,
-        @CallSite.Argument Object... constants) {
-      return null;
-    }
-  }
-
-  @Test
-  void testSpecificationBuilderForAroundInvokeDynamic() {
-    File advice = fetchClass(InvokeDynamicAroundAdvice.class);
-    AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
-
-    CallSiteSpecification result =
-        specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
-
-    assertEquals(InvokeDynamicAroundAdvice.class.getName(), result.getClazz().getClassName());
-    AroundSpecification invokeDynamicSpec =
-        (AroundSpecification) findAdvice(result, "invokeDynamic");
-    assertNotNull(invokeDynamicSpec);
-    assertEquals(
-        "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;",
-        invokeDynamicSpec.getAdvice().getMethodType().getDescriptor());
-    assertEquals(
-        "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
-        invokeDynamicSpec.getSignature());
-    assertNull(invokeDynamicSpec.findThis());
-    assertNull(invokeDynamicSpec.findReturn());
-    assertNull(invokeDynamicSpec.findAllArguments());
-    assertNull(invokeDynamicSpec.findInvokeDynamicConstants());
-    List<Integer> arguments = getArguments(invokeDynamicSpec);
-    assertEquals(Arrays.asList(0, 1, 2, 3, 4), arguments);
-  }
-
-  @CallSite(spi = CallSites.class)
-  static class TestInvokeDynamicConstants {
-    @CallSite.After(
-        value =
-            "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
-        invokeDynamic = true)
-    static String after(
-        @CallSite.AllArguments Object[] parameter,
-        @CallSite.InvokeDynamicConstants Object[] constants,
-        @CallSite.Return String value) {
-      return value;
-    }
-  }
-
-  @Test
-  void testInvokeDynamicConstants() {
-    File advice = fetchClass(TestInvokeDynamicConstants.class);
-    AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
-
-    CallSiteSpecification result =
-        specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
-
-    assertEquals(TestInvokeDynamicConstants.class.getName(), result.getClazz().getClassName());
-    AfterSpecification inheritedSpec = (AfterSpecification) findAdvice(result, "after");
-    assertNotNull(inheritedSpec);
-    assertEquals(
-        "([Ljava/lang/Object;[Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;",
-        inheritedSpec.getAdvice().getMethodType().getDescriptor());
-    assertEquals(
-        "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
-        inheritedSpec.getSignature());
-    assertNull(inheritedSpec.findThis());
-    assertNotNull(inheritedSpec.findReturn());
-    assertNotNull(inheritedSpec.findInvokeDynamicConstants());
-    List<Integer> arguments = getArguments(inheritedSpec);
-    assertEquals(Arrays.asList(), arguments);
-  }
-
-  @CallSite(spi = CallSites.class)
-  static class TestBeforeArray {
-
-    @CallSite.BeforeArray({
-      @CallSite.Before("java.util.Map javax.servlet.ServletRequest.getParameterMap()"),
-      @CallSite.Before("java.util.Map javax.servlet.ServletRequestWrapper.getParameterMap()")
-    })
-    static void before(@CallSite.This ServletRequest request) {}
-  }
-
-  @Test
-  void testSpecificationBuilderForBeforeAdviceArray() {
-    File advice = fetchClass(TestBeforeArray.class);
-    AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
-
-    CallSiteSpecification result =
-        specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
-
-    assertEquals(TestBeforeArray.class.getName(), result.getClazz().getClassName());
-    List<AdviceSpecification> list = result.getAdvices();
-    assertEquals(2, list.size());
-    for (AdviceSpecification spec : list) {
-      assertInstanceOf(BeforeSpecification.class, spec);
-      assertEquals(
-          "(Ljavax/servlet/ServletRequest;)V", spec.getAdvice().getMethodType().getDescriptor());
-      assertTrue(
-          spec.getSignature().equals("java.util.Map javax.servlet.ServletRequest.getParameterMap()")
-              || spec.getSignature()
-                  .equals("java.util.Map javax.servlet.ServletRequestWrapper.getParameterMap()"));
-      assertNotNull(spec.findThis());
-      assertNull(spec.findReturn());
-      assertNull(spec.findAllArguments());
-      assertNull(spec.findInvokeDynamicConstants());
-      List<Integer> arguments = getArguments(spec);
-      assertEquals(Arrays.asList(), arguments);
-    }
-  }
-
-  @CallSite(spi = CallSites.class)
-  static class TestAroundArray {
-
-    @CallSite.AroundArray({
-      @CallSite.Around("java.util.Map javax.servlet.ServletRequest.getParameterMap()"),
-      @CallSite.Around("java.util.Map javax.servlet.ServletRequestWrapper.getParameterMap()")
-    })
-    static Map around(@CallSite.This ServletRequest request) {
-      return request.getParameterMap();
-    }
-  }
-
-  @Test
-  void testSpecificationBuilderForAroundAdviceArray() {
-    File advice = fetchClass(TestAroundArray.class);
-    AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
-
-    CallSiteSpecification result =
-        specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
-
-    assertEquals(TestAroundArray.class.getName(), result.getClazz().getClassName());
-    List<AdviceSpecification> list = result.getAdvices();
-    assertEquals(2, list.size());
-    for (AdviceSpecification spec : list) {
-      assertInstanceOf(AroundSpecification.class, spec);
-      assertEquals(
-          "(Ljavax/servlet/ServletRequest;)Ljava/util/Map;",
-          spec.getAdvice().getMethodType().getDescriptor());
-      assertTrue(
-          spec.getSignature().equals("java.util.Map javax.servlet.ServletRequest.getParameterMap()")
-              || spec.getSignature()
-                  .equals("java.util.Map javax.servlet.ServletRequestWrapper.getParameterMap()"));
-      assertNotNull(spec.findThis());
-      assertNull(spec.findReturn());
-      assertNull(spec.findAllArguments());
-      assertNull(spec.findInvokeDynamicConstants());
-      List<Integer> arguments = getArguments(spec);
-      assertEquals(Arrays.asList(), arguments);
-    }
-  }
-
-  @CallSite(spi = CallSites.class)
-  static class TestAfterArray {
-
-    @CallSite.AfterArray({
-      @CallSite.After("java.util.Map javax.servlet.ServletRequest.getParameterMap()"),
-      @CallSite.After("java.util.Map javax.servlet.ServletRequestWrapper.getParameterMap()")
-    })
-    static Map after(@CallSite.This ServletRequest request, @CallSite.Return Map parameters) {
-      return parameters;
-    }
-  }
-
-  @Test
-  void testSpecificationBuilderForAfterAdviceArray() {
-    File advice = fetchClass(TestAfterArray.class);
-    AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
-
-    CallSiteSpecification result =
-        specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
-
-    assertEquals(TestAfterArray.class.getName(), result.getClazz().getClassName());
-    List<AdviceSpecification> list = result.getAdvices();
-    assertEquals(2, list.size());
-    for (AdviceSpecification spec : list) {
-      assertInstanceOf(AfterSpecification.class, spec);
-      assertEquals(
-          "(Ljavax/servlet/ServletRequest;Ljava/util/Map;)Ljava/util/Map;",
-          spec.getAdvice().getMethodType().getDescriptor());
-      assertTrue(
-          spec.getSignature().equals("java.util.Map javax.servlet.ServletRequest.getParameterMap()")
-              || spec.getSignature()
-                  .equals("java.util.Map javax.servlet.ServletRequestWrapper.getParameterMap()"));
-      assertNotNull(spec.findThis());
-      assertNotNull(spec.findReturn());
-      assertNull(spec.findAllArguments());
-      assertNull(spec.findInvokeDynamicConstants());
-      List<Integer> arguments = getArguments(spec);
-      assertEquals(Arrays.asList(), arguments);
-    }
-  }
-
-  @CallSite(spi = CallSites.class)
-  static class TestInheritedMethod {
-    @CallSite.After(
-        "java.lang.String javax.servlet.http.HttpServletRequest.getParameter(java.lang.String)")
-    static String after(
-        @CallSite.This ServletRequest request,
-        @CallSite.Argument String parameter,
-        @CallSite.Return String value) {
-      return value;
-    }
-  }
-
-  @Test
-  void testSpecificationBuilderForInheritedMethods() {
-    File advice = fetchClass(TestInheritedMethod.class);
-    AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
-
-    CallSiteSpecification result =
-        specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
-
-    assertEquals(TestInheritedMethod.class.getName(), result.getClazz().getClassName());
-    AfterSpecification inheritedSpec = (AfterSpecification) findAdvice(result, "after");
-    assertNotNull(inheritedSpec);
-    assertEquals(
-        "(Ljavax/servlet/ServletRequest;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;",
-        inheritedSpec.getAdvice().getMethodType().getDescriptor());
-    assertEquals(
-        "java.lang.String javax.servlet.http.HttpServletRequest.getParameter(java.lang.String)",
-        inheritedSpec.getSignature());
-    assertNotNull(inheritedSpec.findThis());
-    assertNotNull(inheritedSpec.findReturn());
-    assertNull(inheritedSpec.findAllArguments());
-    assertNull(inheritedSpec.findInvokeDynamicConstants());
-    List<Integer> arguments = getArguments(inheritedSpec);
-    assertEquals(Arrays.asList(0), arguments);
-  }
-
-  static class IsEnabled {
-    static boolean isEnabled(String defaultValue) {
-      return true;
-    }
-  }
-
-  @CallSite(
-      spi = CallSites.class,
-      enabled = {
-        "datadog.trace.plugin.csi.impl.AsmSpecificationBuilderTest$IsEnabled",
-        "isEnabled",
-        "true"
-      })
-  static class TestEnablement {
-    @CallSite.After(
-        "java.lang.String javax.servlet.http.HttpServletRequest.getParameter(java.lang.String)")
-    static String after(
-        @CallSite.This ServletRequest request,
-        @CallSite.Argument String parameter,
-        @CallSite.Return String value) {
-      return value;
-    }
-  }
-
-  @Test
-  void testSpecificationBuilderWithEnabledProperty() {
-    File advice = fetchClass(TestEnablement.class);
-    AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
-
-    CallSiteSpecification result =
-        specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
-
-    assertEquals(TestEnablement.class.getName(), result.getClazz().getClassName());
-    assertNotNull(result.getEnabled());
-    assertEquals(Type.getType(IsEnabled.class), result.getEnabled().getMethod().getOwner());
-    assertEquals("isEnabled", result.getEnabled().getMethod().getMethodName());
-    assertEquals(
-        Type.getMethodType(Types.BOOLEAN, Types.STRING),
-        result.getEnabled().getMethod().getMethodType());
-    assertEquals(Arrays.asList("true"), result.getEnabled().getArguments());
-  }
-
-  @CallSite(spi = CallSites.class)
-  static class TestWithOtherAnnotations {
-    @CallSite.Around("java.lang.StringBuilder java.lang.StringBuilder.append(java.lang.Object)")
-    @CallSite.Around("java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)")
-    @Nonnull
-    static Appendable aroundAppend(
-        @CallSite.This @Nullable Appendable self, @CallSite.Argument(0) @Nullable Object param)
-        throws Throwable {
-      return self.append(param.toString());
-    }
-  }
-
-  @Test
-  void testSpecificationBuilderWithMultipleMethodAnnotations() {
-    File advice = fetchClass(TestWithOtherAnnotations.class);
-    AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
-
-    CallSiteSpecification result =
-        specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
-
-    assertEquals(TestWithOtherAnnotations.class.getName(), result.getClazz().getClassName());
-    assertEquals(2, result.getAdvices().size());
-  }
-
-  private static List<Integer> getArguments(AdviceSpecification advice) {
-    return advice.getArguments().map(arg -> arg.getIndex()).collect(Collectors.toList());
-  }
-
-  private static AdviceSpecification findAdvice(CallSiteSpecification result, String name) {
-    return result.getAdvices().stream()
-        .filter(it -> it.getAdvice().getMethodName().equals(name))
-        .findFirst()
-        .orElse(null);
-  }
+    }
+
+    @CallSite(spi = CallSites.class)
+    static class BeforeAdvice {
+        @CallSite.Before("java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)")
+        static void before(
+                @CallSite.This String self, @CallSite.Argument String regexp, @CallSite.Argument String replacement) {}
+    }
+
+    @Test
+    void testSpecificationBuilderForBeforeAdvice() {
+        File advice = fetchClass(BeforeAdvice.class);
+        AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
+
+        CallSiteSpecification result = specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
+
+        assertEquals(BeforeAdvice.class.getName(), result.getClazz().getClassName());
+        BeforeSpecification beforeSpec = (BeforeSpecification) findAdvice(result, "before");
+        assertNotNull(beforeSpec);
+        assertEquals(
+                "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V",
+                beforeSpec.getAdvice().getMethodType().getDescriptor());
+        assertEquals(
+                "java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)",
+                beforeSpec.getSignature());
+        assertNotNull(beforeSpec.findThis());
+        assertNull(beforeSpec.findReturn());
+        assertNull(beforeSpec.findAllArguments());
+        assertNull(beforeSpec.findInvokeDynamicConstants());
+        List<Integer> arguments = getArguments(beforeSpec);
+        assertEquals(Arrays.asList(0, 1), arguments);
+    }
+
+    @CallSite(spi = CallSites.class)
+    static class AroundAdvice {
+        @CallSite.Around("java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)")
+        static String around(
+                @CallSite.This String self, @CallSite.Argument String regexp, @CallSite.Argument String replacement) {
+            return self.replaceAll(regexp, replacement);
+        }
+    }
+
+    @Test
+    void testSpecificationBuilderForAroundAdvice() {
+        File advice = fetchClass(AroundAdvice.class);
+        AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
+
+        CallSiteSpecification result = specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
+
+        assertEquals(AroundAdvice.class.getName(), result.getClazz().getClassName());
+        AroundSpecification aroundSpec = (AroundSpecification) findAdvice(result, "around");
+        assertNotNull(aroundSpec);
+        assertEquals(
+                "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;",
+                aroundSpec.getAdvice().getMethodType().getDescriptor());
+        assertEquals(
+                "java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)",
+                aroundSpec.getSignature());
+        assertNotNull(aroundSpec.findThis());
+        assertNull(aroundSpec.findReturn());
+        assertNull(aroundSpec.findAllArguments());
+        assertNull(aroundSpec.findInvokeDynamicConstants());
+        List<Integer> arguments = getArguments(aroundSpec);
+        assertEquals(Arrays.asList(0, 1), arguments);
+    }
+
+    @CallSite(spi = CallSites.class)
+    static class AfterAdvice {
+        @CallSite.After("java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)")
+        static String after(
+                @CallSite.This String self,
+                @CallSite.Argument String regexp,
+                @CallSite.Argument String replacement,
+                @CallSite.Return String result) {
+            return result;
+        }
+    }
+
+    @Test
+    void testSpecificationBuilderForAfterAdvice() {
+        File advice = fetchClass(AfterAdvice.class);
+        AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
+
+        CallSiteSpecification result = specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
+
+        assertEquals(AfterAdvice.class.getName(), result.getClazz().getClassName());
+        AfterSpecification afterSpec = (AfterSpecification) findAdvice(result, "after");
+        assertNotNull(afterSpec);
+        assertEquals(
+                "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;",
+                afterSpec.getAdvice().getMethodType().getDescriptor());
+        assertEquals(
+                "java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)",
+                afterSpec.getSignature());
+        assertNotNull(afterSpec.findThis());
+        assertNotNull(afterSpec.findReturn());
+        assertNull(afterSpec.findAllArguments());
+        assertNull(afterSpec.findInvokeDynamicConstants());
+        List<Integer> arguments = getArguments(afterSpec);
+        assertEquals(Arrays.asList(0, 1), arguments);
+    }
+
+    @CallSite(spi = CallSites.class)
+    static class AllArgsAdvice {
+        @CallSite.Around("java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)")
+        static String allArgs(
+                @CallSite.AllArguments(includeThis = true) Object[] arguments, @CallSite.Return String result) {
+            return result;
+        }
+    }
+
+    @Test
+    void testSpecificationBuilderForAdviceWithAllArguments() {
+        File advice = fetchClass(AllArgsAdvice.class);
+        AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
+
+        CallSiteSpecification result = specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
+
+        assertEquals(AllArgsAdvice.class.getName(), result.getClazz().getClassName());
+        AroundSpecification allArgsSpec = (AroundSpecification) findAdvice(result, "allArgs");
+        assertNotNull(allArgsSpec);
+        assertEquals(
+                "([Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;",
+                allArgsSpec.getAdvice().getMethodType().getDescriptor());
+        assertEquals(
+                "java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)",
+                allArgsSpec.getSignature());
+        assertNull(allArgsSpec.findThis());
+        assertNotNull(allArgsSpec.findReturn());
+        AllArgsSpecification allArguments = allArgsSpec.findAllArguments();
+        assertNotNull(allArguments);
+        assertTrue(allArguments.isIncludeThis());
+        assertNull(allArgsSpec.findInvokeDynamicConstants());
+        List<Integer> arguments = getArguments(allArgsSpec);
+        assertEquals(Arrays.asList(), arguments);
+    }
+
+    @CallSite(spi = CallSites.class)
+    static class InvokeDynamicBeforeAdvice {
+        @CallSite.After(
+                value =
+                        "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
+                invokeDynamic = true)
+        static String invokeDynamic(@CallSite.AllArguments Object[] arguments, @CallSite.Return String result) {
+            return result;
+        }
+    }
+
+    @Test
+    void testSpecificationBuilderForBeforeInvokeDynamic() {
+        File advice = fetchClass(InvokeDynamicBeforeAdvice.class);
+        AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
+
+        CallSiteSpecification result = specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
+
+        assertEquals(
+                InvokeDynamicBeforeAdvice.class.getName(), result.getClazz().getClassName());
+        AfterSpecification invokeDynamicSpec = (AfterSpecification) findAdvice(result, "invokeDynamic");
+        assertNotNull(invokeDynamicSpec);
+        assertEquals(
+                "([Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;",
+                invokeDynamicSpec.getAdvice().getMethodType().getDescriptor());
+        assertEquals(
+                "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
+                invokeDynamicSpec.getSignature());
+        assertNull(invokeDynamicSpec.findThis());
+        assertNotNull(invokeDynamicSpec.findReturn());
+        AllArgsSpecification allArguments = invokeDynamicSpec.findAllArguments();
+        assertNotNull(allArguments);
+        assertFalse(allArguments.isIncludeThis());
+        assertNull(invokeDynamicSpec.findInvokeDynamicConstants());
+        List<Integer> arguments = getArguments(invokeDynamicSpec);
+        assertEquals(Arrays.asList(), arguments);
+    }
+
+    @CallSite(spi = CallSites.class)
+    static class InvokeDynamicAroundAdvice {
+        @CallSite.Around(
+                value =
+                        "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
+                invokeDynamic = true)
+        static java.lang.invoke.CallSite invokeDynamic(
+                @CallSite.Argument MethodHandles.Lookup lookup,
+                @CallSite.Argument String name,
+                @CallSite.Argument MethodType concatType,
+                @CallSite.Argument String recipe,
+                @CallSite.Argument Object... constants) {
+            return null;
+        }
+    }
+
+    @Test
+    void testSpecificationBuilderForAroundInvokeDynamic() {
+        File advice = fetchClass(InvokeDynamicAroundAdvice.class);
+        AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
+
+        CallSiteSpecification result = specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
+
+        assertEquals(
+                InvokeDynamicAroundAdvice.class.getName(), result.getClazz().getClassName());
+        AroundSpecification invokeDynamicSpec = (AroundSpecification) findAdvice(result, "invokeDynamic");
+        assertNotNull(invokeDynamicSpec);
+        assertEquals(
+                "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;",
+                invokeDynamicSpec.getAdvice().getMethodType().getDescriptor());
+        assertEquals(
+                "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
+                invokeDynamicSpec.getSignature());
+        assertNull(invokeDynamicSpec.findThis());
+        assertNull(invokeDynamicSpec.findReturn());
+        assertNull(invokeDynamicSpec.findAllArguments());
+        assertNull(invokeDynamicSpec.findInvokeDynamicConstants());
+        List<Integer> arguments = getArguments(invokeDynamicSpec);
+        assertEquals(Arrays.asList(0, 1, 2, 3, 4), arguments);
+    }
+
+    @CallSite(spi = CallSites.class)
+    static class TestInvokeDynamicConstants {
+        @CallSite.After(
+                value =
+                        "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
+                invokeDynamic = true)
+        static String after(
+                @CallSite.AllArguments Object[] parameter,
+                @CallSite.InvokeDynamicConstants Object[] constants,
+                @CallSite.Return String value) {
+            return value;
+        }
+    }
+
+    @Test
+    void testInvokeDynamicConstants() {
+        File advice = fetchClass(TestInvokeDynamicConstants.class);
+        AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
+
+        CallSiteSpecification result = specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
+
+        assertEquals(
+                TestInvokeDynamicConstants.class.getName(), result.getClazz().getClassName());
+        AfterSpecification inheritedSpec = (AfterSpecification) findAdvice(result, "after");
+        assertNotNull(inheritedSpec);
+        assertEquals(
+                "([Ljava/lang/Object;[Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;",
+                inheritedSpec.getAdvice().getMethodType().getDescriptor());
+        assertEquals(
+                "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
+                inheritedSpec.getSignature());
+        assertNull(inheritedSpec.findThis());
+        assertNotNull(inheritedSpec.findReturn());
+        assertNotNull(inheritedSpec.findInvokeDynamicConstants());
+        List<Integer> arguments = getArguments(inheritedSpec);
+        assertEquals(Arrays.asList(), arguments);
+    }
+
+    @CallSite(spi = CallSites.class)
+    static class TestBeforeArray {
+
+        @CallSite.BeforeArray({
+            @CallSite.Before("java.util.Map javax.servlet.ServletRequest.getParameterMap()"),
+            @CallSite.Before("java.util.Map javax.servlet.ServletRequestWrapper.getParameterMap()")
+        })
+        static void before(@CallSite.This ServletRequest request) {}
+    }
+
+    @Test
+    void testSpecificationBuilderForBeforeAdviceArray() {
+        File advice = fetchClass(TestBeforeArray.class);
+        AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
+
+        CallSiteSpecification result = specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
+
+        assertEquals(TestBeforeArray.class.getName(), result.getClazz().getClassName());
+        List<AdviceSpecification> list = result.getAdvices();
+        assertEquals(2, list.size());
+        for (AdviceSpecification spec : list) {
+            assertInstanceOf(BeforeSpecification.class, spec);
+            assertEquals(
+                    "(Ljavax/servlet/ServletRequest;)V",
+                    spec.getAdvice().getMethodType().getDescriptor());
+            assertTrue(spec.getSignature().equals("java.util.Map javax.servlet.ServletRequest.getParameterMap()")
+                    || spec.getSignature()
+                            .equals("java.util.Map javax.servlet.ServletRequestWrapper.getParameterMap()"));
+            assertNotNull(spec.findThis());
+            assertNull(spec.findReturn());
+            assertNull(spec.findAllArguments());
+            assertNull(spec.findInvokeDynamicConstants());
+            List<Integer> arguments = getArguments(spec);
+            assertEquals(Arrays.asList(), arguments);
+        }
+    }
+
+    @CallSite(spi = CallSites.class)
+    static class TestAroundArray {
+
+        @CallSite.AroundArray({
+            @CallSite.Around("java.util.Map javax.servlet.ServletRequest.getParameterMap()"),
+            @CallSite.Around("java.util.Map javax.servlet.ServletRequestWrapper.getParameterMap()")
+        })
+        static Map around(@CallSite.This ServletRequest request) {
+            return request.getParameterMap();
+        }
+    }
+
+    @Test
+    void testSpecificationBuilderForAroundAdviceArray() {
+        File advice = fetchClass(TestAroundArray.class);
+        AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
+
+        CallSiteSpecification result = specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
+
+        assertEquals(TestAroundArray.class.getName(), result.getClazz().getClassName());
+        List<AdviceSpecification> list = result.getAdvices();
+        assertEquals(2, list.size());
+        for (AdviceSpecification spec : list) {
+            assertInstanceOf(AroundSpecification.class, spec);
+            assertEquals(
+                    "(Ljavax/servlet/ServletRequest;)Ljava/util/Map;",
+                    spec.getAdvice().getMethodType().getDescriptor());
+            assertTrue(spec.getSignature().equals("java.util.Map javax.servlet.ServletRequest.getParameterMap()")
+                    || spec.getSignature()
+                            .equals("java.util.Map javax.servlet.ServletRequestWrapper.getParameterMap()"));
+            assertNotNull(spec.findThis());
+            assertNull(spec.findReturn());
+            assertNull(spec.findAllArguments());
+            assertNull(spec.findInvokeDynamicConstants());
+            List<Integer> arguments = getArguments(spec);
+            assertEquals(Arrays.asList(), arguments);
+        }
+    }
+
+    @CallSite(spi = CallSites.class)
+    static class TestAfterArray {
+
+        @CallSite.AfterArray({
+            @CallSite.After("java.util.Map javax.servlet.ServletRequest.getParameterMap()"),
+            @CallSite.After("java.util.Map javax.servlet.ServletRequestWrapper.getParameterMap()")
+        })
+        static Map after(@CallSite.This ServletRequest request, @CallSite.Return Map parameters) {
+            return parameters;
+        }
+    }
+
+    @Test
+    void testSpecificationBuilderForAfterAdviceArray() {
+        File advice = fetchClass(TestAfterArray.class);
+        AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
+
+        CallSiteSpecification result = specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
+
+        assertEquals(TestAfterArray.class.getName(), result.getClazz().getClassName());
+        List<AdviceSpecification> list = result.getAdvices();
+        assertEquals(2, list.size());
+        for (AdviceSpecification spec : list) {
+            assertInstanceOf(AfterSpecification.class, spec);
+            assertEquals(
+                    "(Ljavax/servlet/ServletRequest;Ljava/util/Map;)Ljava/util/Map;",
+                    spec.getAdvice().getMethodType().getDescriptor());
+            assertTrue(spec.getSignature().equals("java.util.Map javax.servlet.ServletRequest.getParameterMap()")
+                    || spec.getSignature()
+                            .equals("java.util.Map javax.servlet.ServletRequestWrapper.getParameterMap()"));
+            assertNotNull(spec.findThis());
+            assertNotNull(spec.findReturn());
+            assertNull(spec.findAllArguments());
+            assertNull(spec.findInvokeDynamicConstants());
+            List<Integer> arguments = getArguments(spec);
+            assertEquals(Arrays.asList(), arguments);
+        }
+    }
+
+    @CallSite(spi = CallSites.class)
+    static class TestInheritedMethod {
+        @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequest.getParameter(java.lang.String)")
+        static String after(
+                @CallSite.This ServletRequest request,
+                @CallSite.Argument String parameter,
+                @CallSite.Return String value) {
+            return value;
+        }
+    }
+
+    @Test
+    void testSpecificationBuilderForInheritedMethods() {
+        File advice = fetchClass(TestInheritedMethod.class);
+        AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
+
+        CallSiteSpecification result = specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
+
+        assertEquals(TestInheritedMethod.class.getName(), result.getClazz().getClassName());
+        AfterSpecification inheritedSpec = (AfterSpecification) findAdvice(result, "after");
+        assertNotNull(inheritedSpec);
+        assertEquals(
+                "(Ljavax/servlet/ServletRequest;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;",
+                inheritedSpec.getAdvice().getMethodType().getDescriptor());
+        assertEquals(
+                "java.lang.String javax.servlet.http.HttpServletRequest.getParameter(java.lang.String)",
+                inheritedSpec.getSignature());
+        assertNotNull(inheritedSpec.findThis());
+        assertNotNull(inheritedSpec.findReturn());
+        assertNull(inheritedSpec.findAllArguments());
+        assertNull(inheritedSpec.findInvokeDynamicConstants());
+        List<Integer> arguments = getArguments(inheritedSpec);
+        assertEquals(Arrays.asList(0), arguments);
+    }
+
+    static class IsEnabled {
+        static boolean isEnabled(String defaultValue) {
+            return true;
+        }
+    }
+
+    @CallSite(
+            spi = CallSites.class,
+            enabled = {"datadog.trace.plugin.csi.impl.AsmSpecificationBuilderTest$IsEnabled", "isEnabled", "true"})
+    static class TestEnablement {
+        @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequest.getParameter(java.lang.String)")
+        static String after(
+                @CallSite.This ServletRequest request,
+                @CallSite.Argument String parameter,
+                @CallSite.Return String value) {
+            return value;
+        }
+    }
+
+    @Test
+    void testSpecificationBuilderWithEnabledProperty() {
+        File advice = fetchClass(TestEnablement.class);
+        AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
+
+        CallSiteSpecification result = specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
+
+        assertEquals(TestEnablement.class.getName(), result.getClazz().getClassName());
+        assertNotNull(result.getEnabled());
+        assertEquals(
+                Type.getType(IsEnabled.class), result.getEnabled().getMethod().getOwner());
+        assertEquals("isEnabled", result.getEnabled().getMethod().getMethodName());
+        assertEquals(
+                Type.getMethodType(Types.BOOLEAN, Types.STRING),
+                result.getEnabled().getMethod().getMethodType());
+        assertEquals(Arrays.asList("true"), result.getEnabled().getArguments());
+    }
+
+    @CallSite(spi = CallSites.class)
+    static class TestWithOtherAnnotations {
+        @CallSite.Around("java.lang.StringBuilder java.lang.StringBuilder.append(java.lang.Object)")
+        @CallSite.Around("java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)")
+        @Nonnull
+        static Appendable aroundAppend(
+                @CallSite.This @Nullable Appendable self, @CallSite.Argument(0) @Nullable Object param)
+                throws Throwable {
+            return self.append(param.toString());
+        }
+    }
+
+    @Test
+    void testSpecificationBuilderWithMultipleMethodAnnotations() {
+        File advice = fetchClass(TestWithOtherAnnotations.class);
+        AsmSpecificationBuilder specificationBuilder = new AsmSpecificationBuilder();
+
+        CallSiteSpecification result = specificationBuilder.build(advice).orElseThrow(RuntimeException::new);
+
+        assertEquals(TestWithOtherAnnotations.class.getName(), result.getClazz().getClassName());
+        assertEquals(2, result.getAdvices().size());
+    }
+
+    private static List<Integer> getArguments(AdviceSpecification advice) {
+        return advice.getArguments().map(arg -> arg.getIndex()).collect(Collectors.toList());
+    }
+
+    private static AdviceSpecification findAdvice(CallSiteSpecification result, String name) {
+        return result.getAdvices().stream()
+                .filter(it -> it.getAdvice().getMethodName().equals(name))
+                .findFirst()
+                .orElse(null);
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/BaseCsiPluginTest.java b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/BaseCsiPluginTest.java
index a2bd158d20b..98de15153c8 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/BaseCsiPluginTest.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/BaseCsiPluginTest.java
@@ -21,43 +21,41 @@
 
 public abstract class BaseCsiPluginTest {
 
-  protected static void assertNoErrors(HasErrors hasErrors) {
-    List<String> errors =
-        hasErrors.getErrors().stream()
-            .map(
-                error -> {
-                  String causeString = error.getCause() == null ? "-" : error.getCauseString();
-                  return error.getMessage() + ": " + causeString;
+    protected static void assertNoErrors(HasErrors hasErrors) {
+        List<String> errors = hasErrors.getErrors().stream()
+                .map(error -> {
+                    String causeString = error.getCause() == null ? "-" : error.getCauseString();
+                    return error.getMessage() + ": " + causeString;
                 })
-            .collect(Collectors.toList());
-    assertEquals(Collections.emptyList(), errors);
-  }
+                .collect(Collectors.toList());
+        assertEquals(Collections.emptyList(), errors);
+    }
 
-  protected static File fetchClass(Class<?> clazz) {
-    try {
-      Path folder = Paths.get(clazz.getResource("/").toURI()).resolve("../../");
-      String fileSeparator = File.separator.equals("\\") ? "\\\\" : File.separator;
-      String classFile = clazz.getName().replaceAll("\\.", fileSeparator) + ".class";
-      Path groovy = folder.resolve("groovy/test").resolve(classFile);
-      if (Files.exists(groovy)) {
-        return groovy.toFile();
-      }
-      return folder.resolve("java/test").resolve(classFile).toFile();
-    } catch (URISyntaxException e) {
-      throw new RuntimeException(e);
+    protected static File fetchClass(Class<?> clazz) {
+        try {
+            Path folder = Paths.get(clazz.getResource("/").toURI()).resolve("../../");
+            String fileSeparator = File.separator.equals("\\") ? "\\\\" : File.separator;
+            String classFile = clazz.getName().replaceAll("\\.", fileSeparator) + ".class";
+            Path groovy = folder.resolve("groovy/test").resolve(classFile);
+            if (Files.exists(groovy)) {
+                return groovy.toFile();
+            }
+            return folder.resolve("java/test").resolve(classFile).toFile();
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  protected static CallSiteSpecification buildClassSpecification(Class<?> clazz) {
-    File classFile = fetchClass(clazz);
-    CallSiteSpecification spec = specificationBuilder().build(classFile).get();
-    spec.getAdvices().forEach(advice -> advice.parseSignature(pointcutParser()));
-    return spec;
-  }
+    protected static CallSiteSpecification buildClassSpecification(Class<?> clazz) {
+        File classFile = fetchClass(clazz);
+        CallSiteSpecification spec = specificationBuilder().build(classFile).get();
+        spec.getAdvices().forEach(advice -> advice.parseSignature(pointcutParser()));
+        return spec;
+    }
 
-  protected ValidationContext mockValidationContext() {
-    ValidationContext context = mock(ValidationContext.class);
-    when(context.getContextProperty(TYPE_RESOLVER)).thenReturn(typeResolver());
-    return context;
-  }
+    protected ValidationContext mockValidationContext() {
+        ValidationContext context = mock(ValidationContext.class);
+        when(context.getContextProperty(TYPE_RESOLVER)).thenReturn(typeResolver());
+        return context;
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/CallSiteSpecificationTest.java b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/CallSiteSpecificationTest.java
index a0d60d379c1..f1175a4d689 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/CallSiteSpecificationTest.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/CallSiteSpecificationTest.java
@@ -17,53 +17,50 @@
 
 class CallSiteSpecificationTest extends BaseCsiPluginTest {
 
-  @Test
-  void testCallSiteSpiShouldBeAnInterface() {
-    ValidationContext context = mockValidationContext();
-    AdviceSpecification mockAdvice = mock(AdviceSpecification.class);
-    List<AdviceSpecification> advices = Collections.singletonList(mockAdvice);
-    Set<Type> spiTypes = Collections.singleton(Type.getType(String.class));
-    List<String> helperClassNames = Collections.emptyList();
-    Set<Type> constants = Collections.emptySet();
-    CallSiteSpecification spec =
-        new CallSiteSpecification(
-            Type.getType(String.class), advices, spiTypes, helperClassNames, constants);
+    @Test
+    void testCallSiteSpiShouldBeAnInterface() {
+        ValidationContext context = mockValidationContext();
+        AdviceSpecification mockAdvice = mock(AdviceSpecification.class);
+        List<AdviceSpecification> advices = Collections.singletonList(mockAdvice);
+        Set<Type> spiTypes = Collections.singleton(Type.getType(String.class));
+        List<String> helperClassNames = Collections.emptyList();
+        Set<Type> constants = Collections.emptySet();
+        CallSiteSpecification spec =
+                new CallSiteSpecification(Type.getType(String.class), advices, spiTypes, helperClassNames, constants);
 
-    spec.validate(context);
+        spec.validate(context);
 
-    verify(context).addError(eq(ErrorCode.CALL_SITE_SPI_SHOULD_BE_AN_INTERFACE), any());
-  }
+        verify(context).addError(eq(ErrorCode.CALL_SITE_SPI_SHOULD_BE_AN_INTERFACE), any());
+    }
 
-  @Test
-  void testCallSiteSpiShouldNotDefineAnyMethods() {
-    ValidationContext context = mockValidationContext();
-    AdviceSpecification mockAdvice = mock(AdviceSpecification.class);
-    List<AdviceSpecification> advices = Collections.singletonList(mockAdvice);
-    Set<Type> spiTypes = Collections.singleton(Type.getType(Comparable.class));
-    List<String> helperClassNames = Collections.emptyList();
-    Set<Type> constants = Collections.emptySet();
-    CallSiteSpecification spec =
-        new CallSiteSpecification(
-            Type.getType(String.class), advices, spiTypes, helperClassNames, constants);
+    @Test
+    void testCallSiteSpiShouldNotDefineAnyMethods() {
+        ValidationContext context = mockValidationContext();
+        AdviceSpecification mockAdvice = mock(AdviceSpecification.class);
+        List<AdviceSpecification> advices = Collections.singletonList(mockAdvice);
+        Set<Type> spiTypes = Collections.singleton(Type.getType(Comparable.class));
+        List<String> helperClassNames = Collections.emptyList();
+        Set<Type> constants = Collections.emptySet();
+        CallSiteSpecification spec =
+                new CallSiteSpecification(Type.getType(String.class), advices, spiTypes, helperClassNames, constants);
 
-    spec.validate(context);
+        spec.validate(context);
 
-    verify(context).addError(eq(ErrorCode.CALL_SITE_SPI_SHOULD_BE_EMPTY), any());
-  }
+        verify(context).addError(eq(ErrorCode.CALL_SITE_SPI_SHOULD_BE_EMPTY), any());
+    }
 
-  @Test
-  void testCallSiteShouldHaveAdvices() {
-    ValidationContext context = mockValidationContext();
-    List<AdviceSpecification> advices = Collections.emptyList();
-    Set<Type> spiTypes = Collections.singleton(Type.getType(CallSiteAdvice.class));
-    List<String> helperClassNames = Collections.emptyList();
-    Set<Type> constants = Collections.emptySet();
-    CallSiteSpecification spec =
-        new CallSiteSpecification(
-            Type.getType(String.class), advices, spiTypes, helperClassNames, constants);
+    @Test
+    void testCallSiteShouldHaveAdvices() {
+        ValidationContext context = mockValidationContext();
+        List<AdviceSpecification> advices = Collections.emptyList();
+        Set<Type> spiTypes = Collections.singleton(Type.getType(CallSiteAdvice.class));
+        List<String> helperClassNames = Collections.emptyList();
+        Set<Type> constants = Collections.emptySet();
+        CallSiteSpecification spec =
+                new CallSiteSpecification(Type.getType(String.class), advices, spiTypes, helperClassNames, constants);
 
-    spec.validate(context);
+        spec.validate(context);
 
-    verify(context).addError(eq(ErrorCode.CALL_SITE_SHOULD_HAVE_ADVICE_METHODS), any());
-  }
+        verify(context).addError(eq(ErrorCode.CALL_SITE_SHOULD_HAVE_ADVICE_METHODS), any());
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/RegexpAdvicePointcutParserTest.java b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/RegexpAdvicePointcutParserTest.java
index 550082ccb7d..72ee4390d2c 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/RegexpAdvicePointcutParserTest.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/RegexpAdvicePointcutParserTest.java
@@ -7,156 +7,148 @@
 
 class RegexpAdvicePointcutParserTest {
 
-  @Test
-  void resolveConstructor() {
-    RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
-
-    MethodType signature =
-        pointcutParser.parse(
-            "void datadog.trace.plugin.csi.samples.SignatureParserExample.<init>()");
-
-    assertEquals(
-        "datadog.trace.plugin.csi.samples.SignatureParserExample",
-        signature.getOwner().getClassName());
-    assertEquals("<init>", signature.getMethodName());
-    assertEquals("()V", signature.getMethodType().getDescriptor());
-  }
-
-  @Test
-  void resolveConstructorWithArgs() {
-    RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
-
-    MethodType signature =
-        pointcutParser.parse(
-            "void datadog.trace.plugin.csi.samples.SignatureParserExample.<init>(java.lang.String)");
-
-    assertEquals(
-        "datadog.trace.plugin.csi.samples.SignatureParserExample",
-        signature.getOwner().getClassName());
-    assertEquals("<init>", signature.getMethodName());
-    assertEquals("(Ljava/lang/String;)V", signature.getMethodType().getDescriptor());
-  }
-
-  @Test
-  void resolveWithoutArgs() {
-    RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
-
-    MethodType signature =
-        pointcutParser.parse(
-            "java.lang.String datadog.trace.plugin.csi.samples.SignatureParserExample.noParams()");
-
-    assertEquals(
-        "datadog.trace.plugin.csi.samples.SignatureParserExample",
-        signature.getOwner().getClassName());
-    assertEquals("noParams", signature.getMethodName());
-    assertEquals("()Ljava/lang/String;", signature.getMethodType().getDescriptor());
-  }
-
-  @Test
-  void resolveOneParam() {
-    RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
-
-    MethodType signature =
-        pointcutParser.parse(
-            "java.lang.String datadog.trace.plugin.csi.samples.SignatureParserExample.oneParam(java.util.Map)");
-
-    assertEquals(
-        "datadog.trace.plugin.csi.samples.SignatureParserExample",
-        signature.getOwner().getClassName());
-    assertEquals("oneParam", signature.getMethodName());
-    assertEquals("(Ljava/util/Map;)Ljava/lang/String;", signature.getMethodType().getDescriptor());
-  }
-
-  @Test
-  void resolveMultipleParams() {
-    RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
-
-    MethodType signature =
-        pointcutParser.parse(
-            "java.lang.String datadog.trace.plugin.csi.samples.SignatureParserExample.multipleParams(java.lang.String, int, java.util.List)");
-
-    assertEquals(
-        "datadog.trace.plugin.csi.samples.SignatureParserExample",
-        signature.getOwner().getClassName());
-    assertEquals("multipleParams", signature.getMethodName());
-    assertEquals(
-        "(Ljava/lang/String;ILjava/util/List;)Ljava/lang/String;",
-        signature.getMethodType().getDescriptor());
-  }
-
-  @Test
-  void resolveVarargs() {
-    RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
-
-    MethodType signature =
-        pointcutParser.parse(
-            "java.lang.String datadog.trace.plugin.csi.samples.SignatureParserExample.varargs(java.lang.String[])");
-
-    assertEquals(
-        "datadog.trace.plugin.csi.samples.SignatureParserExample",
-        signature.getOwner().getClassName());
-    assertEquals("varargs", signature.getMethodName());
-    assertEquals(
-        "([Ljava/lang/String;)Ljava/lang/String;", signature.getMethodType().getDescriptor());
-  }
-
-  @Test
-  void resolvePrimitive() {
-    RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
-
-    MethodType signature =
-        pointcutParser.parse(
-            "int datadog.trace.plugin.csi.samples.SignatureParserExample.primitive()");
-
-    assertEquals(
-        "datadog.trace.plugin.csi.samples.SignatureParserExample",
-        signature.getOwner().getClassName());
-    assertEquals("primitive", signature.getMethodName());
-    assertEquals("()I", signature.getMethodType().getDescriptor());
-  }
-
-  @Test
-  void resolvePrimitiveArrayType() {
-    RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
-
-    MethodType signature =
-        pointcutParser.parse(
-            "byte[] datadog.trace.plugin.csi.samples.SignatureParserExample.primitiveArray()");
-
-    assertEquals(
-        "datadog.trace.plugin.csi.samples.SignatureParserExample",
-        signature.getOwner().getClassName());
-    assertEquals("primitiveArray", signature.getMethodName());
-    assertEquals("()[B", signature.getMethodType().getDescriptor());
-  }
-
-  @Test
-  void resolveObjectArrayType() {
-    RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
-
-    MethodType signature =
-        pointcutParser.parse(
-            "java.lang.Object[] datadog.trace.plugin.csi.samples.SignatureParserExample.objectArray()");
-
-    assertEquals(
-        "datadog.trace.plugin.csi.samples.SignatureParserExample",
-        signature.getOwner().getClassName());
-    assertEquals("objectArray", signature.getMethodName());
-    assertEquals("()[Ljava/lang/Object;", signature.getMethodType().getDescriptor());
-  }
-
-  @Test
-  void resolveMultiDimensionalObjectArrayType() {
-    RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
-
-    MethodType signature =
-        pointcutParser.parse(
-            "java.lang.Object[][][] datadog.trace.plugin.csi.samples.SignatureParserExample.objectArray()");
-
-    assertEquals(
-        "datadog.trace.plugin.csi.samples.SignatureParserExample",
-        signature.getOwner().getClassName());
-    assertEquals("objectArray", signature.getMethodName());
-    assertEquals("()[[[Ljava/lang/Object;", signature.getMethodType().getDescriptor());
-  }
+    @Test
+    void resolveConstructor() {
+        RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
+
+        MethodType signature =
+                pointcutParser.parse("void datadog.trace.plugin.csi.samples.SignatureParserExample.<init>()");
+
+        assertEquals(
+                "datadog.trace.plugin.csi.samples.SignatureParserExample",
+                signature.getOwner().getClassName());
+        assertEquals("<init>", signature.getMethodName());
+        assertEquals("()V", signature.getMethodType().getDescriptor());
+    }
+
+    @Test
+    void resolveConstructorWithArgs() {
+        RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
+
+        MethodType signature = pointcutParser.parse(
+                "void datadog.trace.plugin.csi.samples.SignatureParserExample.<init>(java.lang.String)");
+
+        assertEquals(
+                "datadog.trace.plugin.csi.samples.SignatureParserExample",
+                signature.getOwner().getClassName());
+        assertEquals("<init>", signature.getMethodName());
+        assertEquals("(Ljava/lang/String;)V", signature.getMethodType().getDescriptor());
+    }
+
+    @Test
+    void resolveWithoutArgs() {
+        RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
+
+        MethodType signature = pointcutParser.parse(
+                "java.lang.String datadog.trace.plugin.csi.samples.SignatureParserExample.noParams()");
+
+        assertEquals(
+                "datadog.trace.plugin.csi.samples.SignatureParserExample",
+                signature.getOwner().getClassName());
+        assertEquals("noParams", signature.getMethodName());
+        assertEquals("()Ljava/lang/String;", signature.getMethodType().getDescriptor());
+    }
+
+    @Test
+    void resolveOneParam() {
+        RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
+
+        MethodType signature = pointcutParser.parse(
+                "java.lang.String datadog.trace.plugin.csi.samples.SignatureParserExample.oneParam(java.util.Map)");
+
+        assertEquals(
+                "datadog.trace.plugin.csi.samples.SignatureParserExample",
+                signature.getOwner().getClassName());
+        assertEquals("oneParam", signature.getMethodName());
+        assertEquals(
+                "(Ljava/util/Map;)Ljava/lang/String;", signature.getMethodType().getDescriptor());
+    }
+
+    @Test
+    void resolveMultipleParams() {
+        RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
+
+        MethodType signature = pointcutParser.parse(
+                "java.lang.String datadog.trace.plugin.csi.samples.SignatureParserExample.multipleParams(java.lang.String, int, java.util.List)");
+
+        assertEquals(
+                "datadog.trace.plugin.csi.samples.SignatureParserExample",
+                signature.getOwner().getClassName());
+        assertEquals("multipleParams", signature.getMethodName());
+        assertEquals(
+                "(Ljava/lang/String;ILjava/util/List;)Ljava/lang/String;",
+                signature.getMethodType().getDescriptor());
+    }
+
+    @Test
+    void resolveVarargs() {
+        RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
+
+        MethodType signature = pointcutParser.parse(
+                "java.lang.String datadog.trace.plugin.csi.samples.SignatureParserExample.varargs(java.lang.String[])");
+
+        assertEquals(
+                "datadog.trace.plugin.csi.samples.SignatureParserExample",
+                signature.getOwner().getClassName());
+        assertEquals("varargs", signature.getMethodName());
+        assertEquals(
+                "([Ljava/lang/String;)Ljava/lang/String;",
+                signature.getMethodType().getDescriptor());
+    }
+
+    @Test
+    void resolvePrimitive() {
+        RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
+
+        MethodType signature =
+                pointcutParser.parse("int datadog.trace.plugin.csi.samples.SignatureParserExample.primitive()");
+
+        assertEquals(
+                "datadog.trace.plugin.csi.samples.SignatureParserExample",
+                signature.getOwner().getClassName());
+        assertEquals("primitive", signature.getMethodName());
+        assertEquals("()I", signature.getMethodType().getDescriptor());
+    }
+
+    @Test
+    void resolvePrimitiveArrayType() {
+        RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
+
+        MethodType signature =
+                pointcutParser.parse("byte[] datadog.trace.plugin.csi.samples.SignatureParserExample.primitiveArray()");
+
+        assertEquals(
+                "datadog.trace.plugin.csi.samples.SignatureParserExample",
+                signature.getOwner().getClassName());
+        assertEquals("primitiveArray", signature.getMethodName());
+        assertEquals("()[B", signature.getMethodType().getDescriptor());
+    }
+
+    @Test
+    void resolveObjectArrayType() {
+        RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
+
+        MethodType signature = pointcutParser.parse(
+                "java.lang.Object[] datadog.trace.plugin.csi.samples.SignatureParserExample.objectArray()");
+
+        assertEquals(
+                "datadog.trace.plugin.csi.samples.SignatureParserExample",
+                signature.getOwner().getClassName());
+        assertEquals("objectArray", signature.getMethodName());
+        assertEquals("()[Ljava/lang/Object;", signature.getMethodType().getDescriptor());
+    }
+
+    @Test
+    void resolveMultiDimensionalObjectArrayType() {
+        RegexpAdvicePointcutParser pointcutParser = new RegexpAdvicePointcutParser();
+
+        MethodType signature = pointcutParser.parse(
+                "java.lang.Object[][][] datadog.trace.plugin.csi.samples.SignatureParserExample.objectArray()");
+
+        assertEquals(
+                "datadog.trace.plugin.csi.samples.SignatureParserExample",
+                signature.getOwner().getClassName());
+        assertEquals("objectArray", signature.getMethodName());
+        assertEquals("()[[[Ljava/lang/Object;", signature.getMethodType().getDescriptor());
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/TypeResolverPoolTest.java b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/TypeResolverPoolTest.java
index 39a49d26c8b..8a477d705de 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/TypeResolverPoolTest.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/TypeResolverPoolTest.java
@@ -11,57 +11,56 @@
 
 class TypeResolverPoolTest {
 
-  TypeResolverPool resolver = new TypeResolverPool();
+    TypeResolverPool resolver = new TypeResolverPool();
 
-  @Test
-  void testResolvePrimitive() {
-    assertEquals(int.class, resolver.resolveType(Type.INT_TYPE));
-  }
+    @Test
+    void testResolvePrimitive() {
+        assertEquals(int.class, resolver.resolveType(Type.INT_TYPE));
+    }
 
-  @Test
-  void testResolvePrimitiveArray() {
-    Type type = Type.getType("[I");
-    assertEquals(int[].class, resolver.resolveType(type));
-  }
+    @Test
+    void testResolvePrimitiveArray() {
+        Type type = Type.getType("[I");
+        assertEquals(int[].class, resolver.resolveType(type));
+    }
 
-  @Test
-  void testResolvePrimitiveMultidimensionalArray() {
-    Type type = Type.getType("[[[I");
-    assertEquals(int[][][].class, resolver.resolveType(type));
-  }
+    @Test
+    void testResolvePrimitiveMultidimensionalArray() {
+        Type type = Type.getType("[[[I");
+        assertEquals(int[][][].class, resolver.resolveType(type));
+    }
 
-  @Test
-  void testResolveClass() {
-    Type type = Type.getType(String.class);
-    assertEquals(String.class, resolver.resolveType(type));
-  }
+    @Test
+    void testResolveClass() {
+        Type type = Type.getType(String.class);
+        assertEquals(String.class, resolver.resolveType(type));
+    }
 
-  @Test
-  void testResolveClassArray() {
-    Type type = Type.getType(String[].class);
-    assertEquals(String[].class, resolver.resolveType(type));
-  }
+    @Test
+    void testResolveClassArray() {
+        Type type = Type.getType(String[].class);
+        assertEquals(String[].class, resolver.resolveType(type));
+    }
 
-  @Test
-  void testResolveClassMultidimensionalArray() {
-    Type type = Type.getType(String[][][].class);
-    assertEquals(String[][][].class, resolver.resolveType(type));
-  }
+    @Test
+    void testResolveClassMultidimensionalArray() {
+        Type type = Type.getType(String[][][].class);
+        assertEquals(String[][][].class, resolver.resolveType(type));
+    }
 
-  @Test
-  void testTypeResolverFromMethod() {
-    Type type =
-        Type.getMethodType(
-            Type.getType(String[].class), Type.getType(String.class), Type.getType(String.class));
-    assertEquals(String[].class, resolver.resolveType(type.getReturnType()));
-  }
+    @Test
+    void testTypeResolverFromMethod() {
+        Type type = Type.getMethodType(
+                Type.getType(String[].class), Type.getType(String.class), Type.getType(String.class));
+        assertEquals(String[].class, resolver.resolveType(type.getReturnType()));
+    }
 
-  @Test
-  void testInheritedMethods() throws Exception {
-    Type owner = Type.getType(HttpServletRequest.class);
-    String name = "getParameter";
-    Type descriptor = Type.getMethodType(Type.getType(String.class), Type.getType(String.class));
-    Method result = (Method) resolver.resolveMethod(new MethodType(owner, name, descriptor));
-    assertEquals(ServletRequest.class.getDeclaredMethod("getParameter", String.class), result);
-  }
+    @Test
+    void testInheritedMethods() throws Exception {
+        Type owner = Type.getType(HttpServletRequest.class);
+        String name = "getParameter";
+        Type descriptor = Type.getMethodType(Type.getType(String.class), Type.getType(String.class));
+        Method result = (Method) resolver.resolveMethod(new MethodType(owner, name, descriptor));
+        assertEquals(ServletRequest.class.getDeclaredMethod("getParameter", String.class), result);
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/assertion/AdviceAssert.java b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/assertion/AdviceAssert.java
index 9f814d7171d..29b2f057956 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/assertion/AdviceAssert.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/assertion/AdviceAssert.java
@@ -6,32 +6,31 @@
 import java.util.List;
 
 public class AdviceAssert {
-  protected String type;
-  protected String owner;
-  protected String method;
-  protected String descriptor;
-  protected List<String> statements;
+    protected String type;
+    protected String owner;
+    protected String method;
+    protected String descriptor;
+    protected List<String> statements;
 
-  public AdviceAssert(
-      String type, String owner, String method, String descriptor, List<String> statements) {
-    this.type = type;
-    this.owner = owner;
-    this.method = method;
-    this.descriptor = descriptor;
-    this.statements = statements;
-  }
+    public AdviceAssert(String type, String owner, String method, String descriptor, List<String> statements) {
+        this.type = type;
+        this.owner = owner;
+        this.method = method;
+        this.descriptor = descriptor;
+        this.statements = statements;
+    }
 
-  public void type(String type) {
-    assertEquals(type, this.type);
-  }
+    public void type(String type) {
+        assertEquals(type, this.type);
+    }
 
-  public void pointcut(String owner, String method, String descriptor) {
-    assertEquals(owner, this.owner);
-    assertEquals(method, this.method);
-    assertEquals(descriptor, this.descriptor);
-  }
+    public void pointcut(String owner, String method, String descriptor) {
+        assertEquals(owner, this.owner);
+        assertEquals(method, this.method);
+        assertEquals(descriptor, this.descriptor);
+    }
 
-  public void statements(String... values) {
-    assertArrayEquals(values, statements.toArray(new String[0]));
-  }
+    public void statements(String... values) {
+        assertArrayEquals(values, statements.toArray(new String[0]));
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/assertion/AssertBuilder.java b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/assertion/AssertBuilder.java
index 42e87842adc..538de75953e 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/assertion/AssertBuilder.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/assertion/AssertBuilder.java
@@ -24,182 +24,158 @@
 import java.util.stream.Collectors;
 
 public class AssertBuilder {
-  protected final File file;
+    protected final File file;
 
-  public AssertBuilder(File file) {
-    this.file = file;
-  }
+    public AssertBuilder(File file) {
+        this.file = file;
+    }
 
-  public CallSiteAssert build() {
-    CompilationUnit javaFile;
-    javaFile = parseJavaFile(file);
-    assertEquals(Node.Parsedness.PARSED, javaFile.getParsed());
-    ClassOrInterfaceDeclaration targetType =
-        javaFile.getPrimaryType().get().asClassOrInterfaceDeclaration();
-    Set<Class<?>> interfaces = getInterfaces(targetType);
-    Method enabled = null;
-    Set<String> enabledArgs = null;
-    Object[] enabledDeclaration = getEnabledDeclaration(targetType, interfaces);
-    enabled = (Method) enabledDeclaration[0];
-    enabledArgs = (Set<String>) enabledDeclaration[1];
-    return new CallSiteAssert(
-        interfaces,
-        getSpi(targetType),
-        getHelpers(targetType),
-        getAdvices(targetType),
-        enabled,
-        enabledArgs);
-  }
+    public CallSiteAssert build() {
+        CompilationUnit javaFile;
+        javaFile = parseJavaFile(file);
+        assertEquals(Node.Parsedness.PARSED, javaFile.getParsed());
+        ClassOrInterfaceDeclaration targetType = javaFile.getPrimaryType().get().asClassOrInterfaceDeclaration();
+        Set<Class<?>> interfaces = getInterfaces(targetType);
+        Method enabled = null;
+        Set<String> enabledArgs = null;
+        Object[] enabledDeclaration = getEnabledDeclaration(targetType, interfaces);
+        enabled = (Method) enabledDeclaration[0];
+        enabledArgs = (Set<String>) enabledDeclaration[1];
+        return new CallSiteAssert(
+                interfaces, getSpi(targetType), getHelpers(targetType), getAdvices(targetType), enabled, enabledArgs);
+    }
 
-  protected Set<Class<?>> getSpi(ClassOrInterfaceDeclaration type) {
-    return type.getAnnotationByName("AutoService")
-        .<Set<Class<?>>>map(
-            annotation ->
-                annotation.asNormalAnnotationExpr().getPairs().stream()
-                    .filter(pair -> pair.getNameAsString().equals("value"))
-                    .flatMap(
-                        pair ->
-                            pair.getValue().asArrayInitializerExpr().getValues().stream()
-                                .map(
-                                    value ->
-                                        value
-                                            .asClassExpr()
-                                            .getType()
-                                            .resolve()
-                                            .asReferenceType()
-                                            .getTypeDeclaration()
-                                            .get()
-                                            .getQualifiedName()))
-                    .map(AssertBuilder::loadClass)
-                    .collect(Collectors.toSet()))
-        .orElse(Collections.emptySet());
-  }
+    protected Set<Class<?>> getSpi(ClassOrInterfaceDeclaration type) {
+        return type.getAnnotationByName("AutoService")
+                .<Set<Class<?>>>map(annotation -> annotation.asNormalAnnotationExpr().getPairs().stream()
+                        .filter(pair -> pair.getNameAsString().equals("value"))
+                        .flatMap(pair -> pair.getValue().asArrayInitializerExpr().getValues().stream()
+                                .map(value -> value.asClassExpr()
+                                        .getType()
+                                        .resolve()
+                                        .asReferenceType()
+                                        .getTypeDeclaration()
+                                        .get()
+                                        .getQualifiedName()))
+                        .map(AssertBuilder::loadClass)
+                        .collect(Collectors.toSet()))
+                .orElse(Collections.emptySet());
+    }
 
-  protected Set<Class<?>> getInterfaces(ClassOrInterfaceDeclaration type) {
-    return type.getImplementedTypes().stream()
-        .map(
-            implementedType -> {
-              String qualifiedName =
-                  implementedType
-                      .asClassOrInterfaceType()
-                      .resolve()
-                      .asReferenceType()
-                      .getTypeDeclaration()
-                      .get()
-                      .getQualifiedName();
-              return loadClass(qualifiedName);
-            })
-        .collect(Collectors.toSet());
-  }
+    protected Set<Class<?>> getInterfaces(ClassOrInterfaceDeclaration type) {
+        return type.getImplementedTypes().stream()
+                .map(implementedType -> {
+                    String qualifiedName = implementedType
+                            .asClassOrInterfaceType()
+                            .resolve()
+                            .asReferenceType()
+                            .getTypeDeclaration()
+                            .get()
+                            .getQualifiedName();
+                    return loadClass(qualifiedName);
+                })
+                .collect(Collectors.toSet());
+    }
 
-  private static Class<?> loadClass(String qualifiedName) {
-    // Try progressively replacing dots with $ from right to left for inner classes
-    String current = qualifiedName;
-    int lastDot = current.lastIndexOf('.');
-    do {
-      try {
-        return Class.forName(current);
-      } catch (ClassNotFoundException e) {
-        if (lastDot <= 0) {
-          throw new RuntimeException(new ClassNotFoundException(qualifiedName));
-        }
-        current = current.substring(0, lastDot) + "$" + current.substring(lastDot + 1);
-        lastDot = current.lastIndexOf('.', lastDot - 1);
-      }
-    } while (true);
-  }
+    private static Class<?> loadClass(String qualifiedName) {
+        // Try progressively replacing dots with $ from right to left for inner classes
+        String current = qualifiedName;
+        int lastDot = current.lastIndexOf('.');
+        do {
+            try {
+                return Class.forName(current);
+            } catch (ClassNotFoundException e) {
+                if (lastDot <= 0) {
+                    throw new RuntimeException(new ClassNotFoundException(qualifiedName));
+                }
+                current = current.substring(0, lastDot) + "$" + current.substring(lastDot + 1);
+                lastDot = current.lastIndexOf('.', lastDot - 1);
+            }
+        } while (true);
+    }
 
-  protected Object[] getEnabledDeclaration(
-      ClassOrInterfaceDeclaration type, Set<Class<?>> interfaces) {
-    if (!interfaces.contains(CallSites.HasEnabledProperty.class)) {
-      return new Object[] {null, null};
+    protected Object[] getEnabledDeclaration(ClassOrInterfaceDeclaration type, Set<Class<?>> interfaces) {
+        if (!interfaces.contains(CallSites.HasEnabledProperty.class)) {
+            return new Object[] {null, null};
+        }
+        MethodDeclaration isEnabled = type.getMethodsByName("isEnabled").get(0);
+        MethodCallExpr enabledMethodCall = isEnabled
+                .getBody()
+                .get()
+                .getStatements()
+                .get(0)
+                .asReturnStmt()
+                .getExpression()
+                .get()
+                .asMethodCallExpr();
+        Method enabled = resolveMethod(enabledMethodCall);
+        Set<String> enabledArgs = enabledMethodCall.getArguments().stream()
+                .map(arg -> arg.asStringLiteralExpr().asString())
+                .collect(Collectors.toSet());
+        return new Object[] {enabled, enabledArgs};
     }
-    MethodDeclaration isEnabled = type.getMethodsByName("isEnabled").get(0);
-    MethodCallExpr enabledMethodCall =
-        isEnabled
-            .getBody()
-            .get()
-            .getStatements()
-            .get(0)
-            .asReturnStmt()
-            .getExpression()
-            .get()
-            .asMethodCallExpr();
-    Method enabled = resolveMethod(enabledMethodCall);
-    Set<String> enabledArgs =
-        enabledMethodCall.getArguments().stream()
-            .map(arg -> arg.asStringLiteralExpr().asString())
-            .collect(Collectors.toSet());
-    return new Object[] {enabled, enabledArgs};
-  }
 
-  protected Set<Class<?>> getHelpers(ClassOrInterfaceDeclaration type) {
-    MethodDeclaration acceptMethod = type.getMethodsByName("accept").get(0);
-    List<MethodCallExpr> methodCalls = getMethodCalls(acceptMethod);
-    return methodCalls.stream()
-        .filter(methodCall -> methodCall.getNameAsString().equals("addHelpers"))
-        .flatMap(methodCall -> methodCall.getArguments().stream())
-        .map(
-            arg -> {
-              String className = arg.asStringLiteralExpr().asString();
-              return typeResolver().resolveType(classNameToType(className));
-            })
-        .collect(Collectors.toSet());
-  }
+    protected Set<Class<?>> getHelpers(ClassOrInterfaceDeclaration type) {
+        MethodDeclaration acceptMethod = type.getMethodsByName("accept").get(0);
+        List<MethodCallExpr> methodCalls = getMethodCalls(acceptMethod);
+        return methodCalls.stream()
+                .filter(methodCall -> methodCall.getNameAsString().equals("addHelpers"))
+                .flatMap(methodCall -> methodCall.getArguments().stream())
+                .map(arg -> {
+                    String className = arg.asStringLiteralExpr().asString();
+                    return typeResolver().resolveType(classNameToType(className));
+                })
+                .collect(Collectors.toSet());
+    }
 
-  protected List<AdviceAssert> getAdvices(ClassOrInterfaceDeclaration type) {
-    MethodDeclaration acceptMethod = type.getMethodsByName("accept").get(0);
-    return getMethodCalls(acceptMethod).stream()
-        .filter(methodCall -> methodCall.getNameAsString().equals("addAdvice"))
-        .map(
-            methodCall -> {
-              String adviceType = methodCall.getArgument(0).asFieldAccessExpr().getNameAsString();
-              String owner = methodCall.getArgument(1).asStringLiteralExpr().asString();
-              String method = methodCall.getArgument(2).asStringLiteralExpr().asString();
-              String descriptor = methodCall.getArgument(3).asStringLiteralExpr().asString();
-              List<String> statements =
-                  methodCall
-                      .getArgument(4)
-                      .asLambdaExpr()
-                      .getBody()
-                      .asBlockStmt()
-                      .getStatements()
-                      .stream()
-                      .map(Object::toString)
-                      .collect(Collectors.toList());
-              return new AdviceAssert(adviceType, owner, method, descriptor, statements);
-            })
-        .collect(Collectors.toList());
-  }
+    protected List<AdviceAssert> getAdvices(ClassOrInterfaceDeclaration type) {
+        MethodDeclaration acceptMethod = type.getMethodsByName("accept").get(0);
+        return getMethodCalls(acceptMethod).stream()
+                .filter(methodCall -> methodCall.getNameAsString().equals("addAdvice"))
+                .map(methodCall -> {
+                    String adviceType =
+                            methodCall.getArgument(0).asFieldAccessExpr().getNameAsString();
+                    String owner =
+                            methodCall.getArgument(1).asStringLiteralExpr().asString();
+                    String method =
+                            methodCall.getArgument(2).asStringLiteralExpr().asString();
+                    String descriptor =
+                            methodCall.getArgument(3).asStringLiteralExpr().asString();
+                    List<String> statements =
+                            methodCall.getArgument(4).asLambdaExpr().getBody().asBlockStmt().getStatements().stream()
+                                    .map(Object::toString)
+                                    .collect(Collectors.toList());
+                    return new AdviceAssert(adviceType, owner, method, descriptor, statements);
+                })
+                .collect(Collectors.toList());
+    }
 
-  protected static List<MethodCallExpr> getMethodCalls(MethodDeclaration method) {
-    return method.getBody().get().asBlockStmt().getStatements().stream()
-        .filter(
-            stmt ->
-                stmt.isExpressionStmt()
-                    && stmt.asExpressionStmt().getExpression().isMethodCallExpr())
-        .map(stmt -> stmt.asExpressionStmt().getExpression().asMethodCallExpr())
-        .collect(Collectors.toList());
-  }
+    protected static List<MethodCallExpr> getMethodCalls(MethodDeclaration method) {
+        return method.getBody().get().asBlockStmt().getStatements().stream()
+                .filter(stmt -> stmt.isExpressionStmt()
+                        && stmt.asExpressionStmt().getExpression().isMethodCallExpr())
+                .map(stmt -> stmt.asExpressionStmt().getExpression().asMethodCallExpr())
+                .collect(Collectors.toList());
+    }
 
-  private static Method resolveMethod(MethodCallExpr methodCallExpr) {
-    ResolvedMethodDeclaration resolved = methodCallExpr.resolve();
-    try {
-      Field methodField = resolved.getClass().getDeclaredField("method");
-      methodField.setAccessible(true);
-      return (Method) methodField.get(resolved);
-    } catch (IllegalAccessException | NoSuchFieldException e) {
-      throw new RuntimeException(e);
+    private static Method resolveMethod(MethodCallExpr methodCallExpr) {
+        ResolvedMethodDeclaration resolved = methodCallExpr.resolve();
+        try {
+            Field methodField = resolved.getClass().getDeclaredField("method");
+            methodField.setAccessible(true);
+            return (Method) methodField.get(resolved);
+        } catch (IllegalAccessException | NoSuchFieldException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  private static CompilationUnit parseJavaFile(File file) {
-    JavaSymbolSolver solver = new JavaSymbolSolver(typeResolver());
-    JavaParser parser = new JavaParser(new ParserConfiguration().setSymbolResolver(solver));
-    try {
-      return parser.parse(file).getResult().get();
-    } catch (FileNotFoundException e) {
-      throw new RuntimeException(e);
+    private static CompilationUnit parseJavaFile(File file) {
+        JavaSymbolSolver solver = new JavaSymbolSolver(typeResolver());
+        JavaParser parser = new JavaParser(new ParserConfiguration().setSymbolResolver(solver));
+        try {
+            return parser.parse(file).getResult().get();
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/assertion/CallSiteAssert.java b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/assertion/CallSiteAssert.java
index 57ce0146921..bf75f37acfe 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/assertion/CallSiteAssert.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/assertion/CallSiteAssert.java
@@ -12,77 +12,77 @@
 
 public class CallSiteAssert {
 
-  protected Set<Class<?>> interfaces;
-  protected Set<Class<?>> spi;
-  protected Set<Class<?>> helpers;
-  protected List<AdviceAssert> advices;
-  protected Method enabled;
-  protected Set<String> enabledArgs;
-
-  public CallSiteAssert(
-      Set<Class<?>> interfaces,
-      Set<Class<?>> spi,
-      Set<Class<?>> helpers,
-      List<AdviceAssert> advices,
-      Method enabled,
-      Set<String> enabledArgs) {
-    this.interfaces = interfaces;
-    this.spi = spi;
-    this.helpers = helpers;
-    this.advices = advices;
-    this.enabled = enabled;
-    this.enabledArgs = enabledArgs;
-  }
-
-  public void interfaces(Class<?>... values) {
-    assertSameElements(interfaces, values);
-  }
-
-  public void helpers(Class<?>... values) {
-    assertSameElements(helpers, values);
-  }
-
-  public void spi(Class<?>... values) {
-    assertSameElements(spi, values);
-  }
-
-  public void advices(int index, Consumer<AdviceAssert> assertions) {
-    AdviceAssert asserter = advices.get(index);
-    assertions.accept(asserter);
-  }
-
-  public void enabled(Method method, String... args) {
-    assertEquals(method, enabled);
-    assertSameElements(enabledArgs, args);
-  }
-
-  private static <E> void assertSameElements(Set<E> expected, E... received) {
-    assertEquals(received.length, expected.size());
-    Set<E> receivedSet = new HashSet<>(Arrays.asList(received));
-    assertTrue(expected.containsAll(receivedSet) && receivedSet.containsAll(expected));
-  }
-
-  public Set<Class<?>> getInterfaces() {
-    return interfaces;
-  }
-
-  public Set<Class<?>> getSpi() {
-    return spi;
-  }
-
-  public Set<Class<?>> getHelpers() {
-    return helpers;
-  }
-
-  public List<AdviceAssert> getAdvices() {
-    return advices;
-  }
-
-  public Method getEnabled() {
-    return enabled;
-  }
-
-  public Set<String> getEnabledArgs() {
-    return enabledArgs;
-  }
+    protected Set<Class<?>> interfaces;
+    protected Set<Class<?>> spi;
+    protected Set<Class<?>> helpers;
+    protected List<AdviceAssert> advices;
+    protected Method enabled;
+    protected Set<String> enabledArgs;
+
+    public CallSiteAssert(
+            Set<Class<?>> interfaces,
+            Set<Class<?>> spi,
+            Set<Class<?>> helpers,
+            List<AdviceAssert> advices,
+            Method enabled,
+            Set<String> enabledArgs) {
+        this.interfaces = interfaces;
+        this.spi = spi;
+        this.helpers = helpers;
+        this.advices = advices;
+        this.enabled = enabled;
+        this.enabledArgs = enabledArgs;
+    }
+
+    public void interfaces(Class<?>... values) {
+        assertSameElements(interfaces, values);
+    }
+
+    public void helpers(Class<?>... values) {
+        assertSameElements(helpers, values);
+    }
+
+    public void spi(Class<?>... values) {
+        assertSameElements(spi, values);
+    }
+
+    public void advices(int index, Consumer<AdviceAssert> assertions) {
+        AdviceAssert asserter = advices.get(index);
+        assertions.accept(asserter);
+    }
+
+    public void enabled(Method method, String... args) {
+        assertEquals(method, enabled);
+        assertSameElements(enabledArgs, args);
+    }
+
+    private static <E> void assertSameElements(Set<E> expected, E... received) {
+        assertEquals(received.length, expected.size());
+        Set<E> receivedSet = new HashSet<>(Arrays.asList(received));
+        assertTrue(expected.containsAll(receivedSet) && receivedSet.containsAll(expected));
+    }
+
+    public Set<Class<?>> getInterfaces() {
+        return interfaces;
+    }
+
+    public Set<Class<?>> getSpi() {
+        return spi;
+    }
+
+    public Set<Class<?>> getHelpers() {
+        return helpers;
+    }
+
+    public List<AdviceAssert> getAdvices() {
+        return advices;
+    }
+
+    public Method getEnabled() {
+        return enabled;
+    }
+
+    public Set<String> getEnabledArgs() {
+        return enabledArgs;
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/IastExtensionTest.java b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/IastExtensionTest.java
index cf42e18cbd5..ab87e925de6 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/IastExtensionTest.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/IastExtensionTest.java
@@ -40,275 +40,251 @@
 
 class IastExtensionTest extends BaseCsiPluginTest {
 
-  @TempDir private File buildDir;
-  private Path targetFolder;
-  private Path projectFolder;
-  private Path srcFolder;
-
-  @BeforeEach
-  void setup() throws Exception {
-    targetFolder = createFolder("target");
-    projectFolder = createFolder("project");
-    srcFolder = createFolder("src/main/java");
-  }
-
-  private Path createFolder(String folderName) throws IOException {
-    Path folder = buildDir.toPath().resolve(folderName);
-    Files.createDirectories(folder);
-    return folder;
-  }
-
-  @ParameterizedTest
-  @CsvSource(
-      delimiter = '|',
-      nullValues = "null",
-      value = {
-        "datadog.trace.agent.tooling.csi.CallSites | false",
-        "datadog.trace.api.iast.IastCallSites      | true"
-      })
-  void testThatExtensionOnlyAppliesToIastAdvices(String typeName, boolean expected) {
-    Type type = classNameToType(typeName);
-    Type[] types = new Type[] {type};
-    CallSiteSpecification callSite = mock(CallSiteSpecification.class);
-    when(callSite.getSpi()).thenReturn(types);
-    IastExtension extension = new IastExtension();
-
-    boolean applies = extension.appliesTo(callSite);
-
-    assertEquals(expected, applies);
-  }
-
-  @Test
-  void testThatExtensionGeneratesACallSiteWithTelemetry() throws Exception {
-    Configuration config = mock(Configuration.class);
-    when(config.getTargetFolder()).thenReturn(targetFolder);
-    when(config.getSrcFolder()).thenReturn(getCallSiteSrcFolder());
-    when(config.getClassPath()).thenReturn(Collections.emptyList());
-    CallSiteSpecification spec = buildClassSpecification(IastExtensionCallSite.class);
-    AdviceGenerator generator = buildAdviceGenerator(buildDir);
-    CallSiteResult result = generator.generate(spec);
-    assertTrue(result.isSuccess());
-    IastExtension extension = new IastExtension();
-
-    extension.apply(config, result);
-
-    assertNoErrors(result);
-    IastExtensionCallSiteAssert asserter = assertCallSites(result.getFile());
-    asserter.iastAdvices(
-        0,
-        advice -> {
-          advice.pointcut(
-              "javax/servlet/http/HttpServletRequest",
-              "getHeader",
-              "(Ljava/lang/String;)Ljava/lang/String;");
-          advice.instrumentedMetric(
-              "IastMetric.INSTRUMENTED_SOURCE",
-              metric -> {
-                metric.metricStatements(
-                    "IastMetricCollector.add(IastMetric.INSTRUMENTED_SOURCE, (byte) 3, 1);");
-              });
-          advice.executedMetric(
-              "IastMetric.EXECUTED_SOURCE",
-              metric -> {
+    @TempDir
+    private File buildDir;
+
+    private Path targetFolder;
+    private Path projectFolder;
+    private Path srcFolder;
+
+    @BeforeEach
+    void setup() throws Exception {
+        targetFolder = createFolder("target");
+        projectFolder = createFolder("project");
+        srcFolder = createFolder("src/main/java");
+    }
+
+    private Path createFolder(String folderName) throws IOException {
+        Path folder = buildDir.toPath().resolve(folderName);
+        Files.createDirectories(folder);
+        return folder;
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+            delimiter = '|',
+            nullValues = "null",
+            value = {
+                "datadog.trace.agent.tooling.csi.CallSites | false",
+                "datadog.trace.api.iast.IastCallSites      | true"
+            })
+    void testThatExtensionOnlyAppliesToIastAdvices(String typeName, boolean expected) {
+        Type type = classNameToType(typeName);
+        Type[] types = new Type[] {type};
+        CallSiteSpecification callSite = mock(CallSiteSpecification.class);
+        when(callSite.getSpi()).thenReturn(types);
+        IastExtension extension = new IastExtension();
+
+        boolean applies = extension.appliesTo(callSite);
+
+        assertEquals(expected, applies);
+    }
+
+    @Test
+    void testThatExtensionGeneratesACallSiteWithTelemetry() throws Exception {
+        Configuration config = mock(Configuration.class);
+        when(config.getTargetFolder()).thenReturn(targetFolder);
+        when(config.getSrcFolder()).thenReturn(getCallSiteSrcFolder());
+        when(config.getClassPath()).thenReturn(Collections.emptyList());
+        CallSiteSpecification spec = buildClassSpecification(IastExtensionCallSite.class);
+        AdviceGenerator generator = buildAdviceGenerator(buildDir);
+        CallSiteResult result = generator.generate(spec);
+        assertTrue(result.isSuccess());
+        IastExtension extension = new IastExtension();
+
+        extension.apply(config, result);
+
+        assertNoErrors(result);
+        IastExtensionCallSiteAssert asserter = assertCallSites(result.getFile());
+        asserter.iastAdvices(0, advice -> {
+            advice.pointcut(
+                    "javax/servlet/http/HttpServletRequest", "getHeader", "(Ljava/lang/String;)Ljava/lang/String;");
+            advice.instrumentedMetric("IastMetric.INSTRUMENTED_SOURCE", metric -> {
+                metric.metricStatements("IastMetricCollector.add(IastMetric.INSTRUMENTED_SOURCE, (byte) 3, 1);");
+            });
+            advice.executedMetric("IastMetric.EXECUTED_SOURCE", metric -> {
                 metric.metricStatements(
-                    "handler.field(net.bytebuddy.jar.asm.Opcodes.GETSTATIC, \"datadog/trace/api/iast/telemetry/IastMetric\", \"EXECUTED_SOURCE\", \"Ldatadog/trace/api/iast/telemetry/IastMetric;\");",
-                    "handler.instruction(net.bytebuddy.jar.asm.Opcodes.ICONST_3);",
-                    "handler.instruction(net.bytebuddy.jar.asm.Opcodes.ICONST_1);",
-                    "handler.method(net.bytebuddy.jar.asm.Opcodes.INVOKESTATIC, \"datadog/trace/api/iast/telemetry/IastMetricCollector\", \"add\", \"(Ldatadog/trace/api/iast/telemetry/IastMetric;BI)V\", false);");
-              });
+                        "handler.field(net.bytebuddy.jar.asm.Opcodes.GETSTATIC, \"datadog/trace/api/iast/telemetry/IastMetric\", \"EXECUTED_SOURCE\", \"Ldatadog/trace/api/iast/telemetry/IastMetric;\");",
+                        "handler.instruction(net.bytebuddy.jar.asm.Opcodes.ICONST_3);",
+                        "handler.instruction(net.bytebuddy.jar.asm.Opcodes.ICONST_1);",
+                        "handler.method(net.bytebuddy.jar.asm.Opcodes.INVOKESTATIC, \"datadog/trace/api/iast/telemetry/IastMetricCollector\", \"add\", \"(Ldatadog/trace/api/iast/telemetry/IastMetric;BI)V\", false);");
+            });
         });
-    asserter.iastAdvices(
-        1,
-        advice -> {
-          advice.pointcut(
-              "javax/servlet/http/HttpServletRequest",
-              "getInputStream",
-              "()Ljavax/servlet/ServletInputStream;");
-          advice.instrumentedMetric(
-              "IastMetric.INSTRUMENTED_SOURCE",
-              metric -> {
-                metric.metricStatements(
-                    "IastMetricCollector.add(IastMetric.INSTRUMENTED_SOURCE, (byte) 127, 1);");
-              });
-          advice.executedMetric(
-              "IastMetric.EXECUTED_SOURCE",
-              metric -> {
+        asserter.iastAdvices(1, advice -> {
+            advice.pointcut(
+                    "javax/servlet/http/HttpServletRequest", "getInputStream", "()Ljavax/servlet/ServletInputStream;");
+            advice.instrumentedMetric("IastMetric.INSTRUMENTED_SOURCE", metric -> {
+                metric.metricStatements("IastMetricCollector.add(IastMetric.INSTRUMENTED_SOURCE, (byte) 127, 1);");
+            });
+            advice.executedMetric("IastMetric.EXECUTED_SOURCE", metric -> {
                 metric.metricStatements(
-                    "handler.field(net.bytebuddy.jar.asm.Opcodes.GETSTATIC, \"datadog/trace/api/iast/telemetry/IastMetric\", \"EXECUTED_SOURCE\", \"Ldatadog/trace/api/iast/telemetry/IastMetric;\");",
-                    "handler.instruction(net.bytebuddy.jar.asm.Opcodes.BIPUSH, 127);",
-                    "handler.instruction(net.bytebuddy.jar.asm.Opcodes.ICONST_1);",
-                    "handler.method(net.bytebuddy.jar.asm.Opcodes.INVOKESTATIC, \"datadog/trace/api/iast/telemetry/IastMetricCollector\", \"add\", \"(Ldatadog/trace/api/iast/telemetry/IastMetric;BI)V\", false);");
-              });
+                        "handler.field(net.bytebuddy.jar.asm.Opcodes.GETSTATIC, \"datadog/trace/api/iast/telemetry/IastMetric\", \"EXECUTED_SOURCE\", \"Ldatadog/trace/api/iast/telemetry/IastMetric;\");",
+                        "handler.instruction(net.bytebuddy.jar.asm.Opcodes.BIPUSH, 127);",
+                        "handler.instruction(net.bytebuddy.jar.asm.Opcodes.ICONST_1);",
+                        "handler.method(net.bytebuddy.jar.asm.Opcodes.INVOKESTATIC, \"datadog/trace/api/iast/telemetry/IastMetricCollector\", \"add\", \"(Ldatadog/trace/api/iast/telemetry/IastMetric;BI)V\", false);");
+            });
         });
-    asserter.iastAdvices(
-        2,
-        advice -> {
-          advice.pointcut(
-              "javax/servlet/ServletRequest", "getReader", "()Ljava/io/BufferedReader;");
-          advice.instrumentedMetric(
-              "IastMetric.INSTRUMENTED_PROPAGATION",
-              metric -> {
+        asserter.iastAdvices(2, advice -> {
+            advice.pointcut("javax/servlet/ServletRequest", "getReader", "()Ljava/io/BufferedReader;");
+            advice.instrumentedMetric("IastMetric.INSTRUMENTED_PROPAGATION", metric -> {
+                metric.metricStatements("IastMetricCollector.add(IastMetric.INSTRUMENTED_PROPAGATION, 1);");
+            });
+            advice.executedMetric("IastMetric.EXECUTED_PROPAGATION", metric -> {
                 metric.metricStatements(
-                    "IastMetricCollector.add(IastMetric.INSTRUMENTED_PROPAGATION, 1);");
-              });
-          advice.executedMetric(
-              "IastMetric.EXECUTED_PROPAGATION",
-              metric -> {
-                metric.metricStatements(
-                    "handler.field(net.bytebuddy.jar.asm.Opcodes.GETSTATIC, \"datadog/trace/api/iast/telemetry/IastMetric\", \"EXECUTED_PROPAGATION\", \"Ldatadog/trace/api/iast/telemetry/IastMetric;\");",
-                    "handler.instruction(net.bytebuddy.jar.asm.Opcodes.ICONST_1);",
-                    "handler.method(net.bytebuddy.jar.asm.Opcodes.INVOKESTATIC, \"datadog/trace/api/iast/telemetry/IastMetricCollector\", \"add\", \"(Ldatadog/trace/api/iast/telemetry/IastMetric;I)V\", false);");
-              });
+                        "handler.field(net.bytebuddy.jar.asm.Opcodes.GETSTATIC, \"datadog/trace/api/iast/telemetry/IastMetric\", \"EXECUTED_PROPAGATION\", \"Ldatadog/trace/api/iast/telemetry/IastMetric;\");",
+                        "handler.instruction(net.bytebuddy.jar.asm.Opcodes.ICONST_1);",
+                        "handler.method(net.bytebuddy.jar.asm.Opcodes.INVOKESTATIC, \"datadog/trace/api/iast/telemetry/IastMetricCollector\", \"add\", \"(Ldatadog/trace/api/iast/telemetry/IastMetric;I)V\", false);");
+            });
         });
-  }
-
-  private static AdviceGenerator buildAdviceGenerator(File targetFolder) {
-    return new AdviceGeneratorImpl(targetFolder, pointcutParser());
-  }
-
-  private static Path getCallSiteSrcFolder() throws Exception {
-    File file = new File(Thread.currentThread().getContextClassLoader().getResource("").toURI());
-    return file.toPath().resolve("../../../../src/test/java");
-  }
-
-  private static ClassOrInterfaceDeclaration parse(File path) throws Exception {
-    return new JavaParser()
-        .parse(path)
-        .getResult()
-        .get()
-        .getPrimaryType()
-        .get()
-        .asClassOrInterfaceDeclaration();
-  }
-
-  private static IastExtensionCallSiteAssert assertCallSites(File generated) {
-    try {
-      return new IastExtensionAssertBuilder(generated).build();
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  static class IastExtensionCallSiteAssert extends CallSiteAssert {
-
-    IastExtensionCallSiteAssert(
-        Set<Class<?>> interfaces,
-        Set<Class<?>> spi,
-        Set<Class<?>> helpers,
-        List<AdviceAssert> advices,
-        Method enabled,
-        Set<String> enabledArgs) {
-      super(interfaces, spi, helpers, advices, enabled, enabledArgs);
     }
 
-    public void iastAdvices(int index, Consumer<IastExtensionAdviceAssert> assertions) {
-      IastExtensionAdviceAssert asserter = (IastExtensionAdviceAssert) advices.get(index);
-      assertions.accept(asserter);
-    }
-  }
-
-  static class IastExtensionAdviceAssert extends AdviceAssert {
-
-    protected IastExtensionMetricAsserter instrumented;
-    protected IastExtensionMetricAsserter executed;
-
-    IastExtensionAdviceAssert(
-        String owner,
-        String method,
-        String descriptor,
-        IastExtensionMetricAsserter instrumented,
-        IastExtensionMetricAsserter executed,
-        List<String> statements) {
-      super(null, owner, method, descriptor, statements);
-      this.instrumented = instrumented;
-      this.executed = executed;
+    private static AdviceGenerator buildAdviceGenerator(File targetFolder) {
+        return new AdviceGeneratorImpl(targetFolder, pointcutParser());
     }
 
-    public void instrumentedMetric(
-        String metric, Consumer<IastExtensionMetricAsserter> assertions) {
-      assertEquals(metric, instrumented.metric);
-      assertions.accept(instrumented);
+    private static Path getCallSiteSrcFolder() throws Exception {
+        File file = new File(
+                Thread.currentThread().getContextClassLoader().getResource("").toURI());
+        return file.toPath().resolve("../../../../src/test/java");
     }
 
-    public void executedMetric(String metric, Consumer<IastExtensionMetricAsserter> assertions) {
-      assertEquals(metric, executed.metric);
-      assertions.accept(executed);
+    private static ClassOrInterfaceDeclaration parse(File path) throws Exception {
+        return new JavaParser()
+                .parse(path)
+                .getResult()
+                .get()
+                .getPrimaryType()
+                .get()
+                .asClassOrInterfaceDeclaration();
     }
-  }
-
-  static class IastExtensionMetricAsserter {
-    protected String metric;
-    protected List<String> statements;
 
-    IastExtensionMetricAsserter(String metric, List<String> statements) {
-      this.metric = metric;
-      this.statements = statements;
+    private static IastExtensionCallSiteAssert assertCallSites(File generated) {
+        try {
+            return new IastExtensionAssertBuilder(generated).build();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    public void metricStatements(String... values) {
-      assertArrayEquals(values, statements.toArray(new String[0]));
+    static class IastExtensionCallSiteAssert extends CallSiteAssert {
+
+        IastExtensionCallSiteAssert(
+                Set<Class<?>> interfaces,
+                Set<Class<?>> spi,
+                Set<Class<?>> helpers,
+                List<AdviceAssert> advices,
+                Method enabled,
+                Set<String> enabledArgs) {
+            super(interfaces, spi, helpers, advices, enabled, enabledArgs);
+        }
+
+        public void iastAdvices(int index, Consumer<IastExtensionAdviceAssert> assertions) {
+            IastExtensionAdviceAssert asserter = (IastExtensionAdviceAssert) advices.get(index);
+            assertions.accept(asserter);
+        }
     }
-  }
 
-  static class IastExtensionAssertBuilder extends AssertBuilder {
-
-    IastExtensionAssertBuilder(File file) {
-      super(file);
+    static class IastExtensionAdviceAssert extends AdviceAssert {
+
+        protected IastExtensionMetricAsserter instrumented;
+        protected IastExtensionMetricAsserter executed;
+
+        IastExtensionAdviceAssert(
+                String owner,
+                String method,
+                String descriptor,
+                IastExtensionMetricAsserter instrumented,
+                IastExtensionMetricAsserter executed,
+                List<String> statements) {
+            super(null, owner, method, descriptor, statements);
+            this.instrumented = instrumented;
+            this.executed = executed;
+        }
+
+        public void instrumentedMetric(String metric, Consumer<IastExtensionMetricAsserter> assertions) {
+            assertEquals(metric, instrumented.metric);
+            assertions.accept(instrumented);
+        }
+
+        public void executedMetric(String metric, Consumer<IastExtensionMetricAsserter> assertions) {
+            assertEquals(metric, executed.metric);
+            assertions.accept(executed);
+        }
     }
 
-    @Override
-    public IastExtensionCallSiteAssert build() {
-      CallSiteAssert base = super.build();
-      return new IastExtensionCallSiteAssert(
-          base.getInterfaces(),
-          base.getSpi(),
-          base.getHelpers(),
-          base.getAdvices(),
-          base.getEnabled(),
-          base.getEnabledArgs());
-    }
+    static class IastExtensionMetricAsserter {
+        protected String metric;
+        protected List<String> statements;
+
+        IastExtensionMetricAsserter(String metric, List<String> statements) {
+            this.metric = metric;
+            this.statements = statements;
+        }
 
-    @Override
-    protected List<AdviceAssert> getAdvices(ClassOrInterfaceDeclaration type) {
-      return getMethodCalls(type.getMethodsByName("accept").get(0)).stream()
-          .filter(methodCall -> methodCall.getNameAsString().equals("addAdvice"))
-          .map(
-              methodCall -> {
-                String owner = methodCall.getArgument(1).asStringLiteralExpr().asString();
-                String method = methodCall.getArgument(2).asStringLiteralExpr().asString();
-                String descriptor = methodCall.getArgument(3).asStringLiteralExpr().asString();
-                List<com.github.javaparser.ast.stmt.Statement> statements =
-                    methodCall
-                        .getArgument(4)
-                        .asLambdaExpr()
-                        .getBody()
-                        .asBlockStmt()
-                        .getStatements();
-                IfStmt instrumentedStmt = statements.get(0).asIfStmt();
-                IfStmt executedStmt = statements.get(1).asIfStmt();
-                List<String> nonIfStatements =
-                    statements.stream()
-                        .filter(stmt -> !stmt.isIfStmt())
-                        .map(Object::toString)
-                        .collect(Collectors.toList());
-                return new IastExtensionAdviceAssert(
-                    owner,
-                    method,
-                    descriptor,
-                    buildMetricAsserter(instrumentedStmt),
-                    buildMetricAsserter(executedStmt),
-                    nonIfStatements);
-              })
-          .collect(Collectors.toList());
+        public void metricStatements(String... values) {
+            assertArrayEquals(values, statements.toArray(new String[0]));
+        }
     }
 
-    protected IastExtensionMetricAsserter buildMetricAsserter(IfStmt ifStmt) {
-      String metric = ifStmt.getCondition().asMethodCallExpr().getScope().get().toString();
-      List<String> statements =
-          ifStmt.getThenStmt().asBlockStmt().getStatements().stream()
-              .map(Object::toString)
-              .collect(Collectors.toList());
-      return new IastExtensionMetricAsserter(metric, statements);
+    static class IastExtensionAssertBuilder extends AssertBuilder {
+
+        IastExtensionAssertBuilder(File file) {
+            super(file);
+        }
+
+        @Override
+        public IastExtensionCallSiteAssert build() {
+            CallSiteAssert base = super.build();
+            return new IastExtensionCallSiteAssert(
+                    base.getInterfaces(),
+                    base.getSpi(),
+                    base.getHelpers(),
+                    base.getAdvices(),
+                    base.getEnabled(),
+                    base.getEnabledArgs());
+        }
+
+        @Override
+        protected List<AdviceAssert> getAdvices(ClassOrInterfaceDeclaration type) {
+            return getMethodCalls(type.getMethodsByName("accept").get(0)).stream()
+                    .filter(methodCall -> methodCall.getNameAsString().equals("addAdvice"))
+                    .map(methodCall -> {
+                        String owner =
+                                methodCall.getArgument(1).asStringLiteralExpr().asString();
+                        String method =
+                                methodCall.getArgument(2).asStringLiteralExpr().asString();
+                        String descriptor =
+                                methodCall.getArgument(3).asStringLiteralExpr().asString();
+                        List<com.github.javaparser.ast.stmt.Statement> statements = methodCall
+                                .getArgument(4)
+                                .asLambdaExpr()
+                                .getBody()
+                                .asBlockStmt()
+                                .getStatements();
+                        IfStmt instrumentedStmt = statements.get(0).asIfStmt();
+                        IfStmt executedStmt = statements.get(1).asIfStmt();
+                        List<String> nonIfStatements = statements.stream()
+                                .filter(stmt -> !stmt.isIfStmt())
+                                .map(Object::toString)
+                                .collect(Collectors.toList());
+                        return new IastExtensionAdviceAssert(
+                                owner,
+                                method,
+                                descriptor,
+                                buildMetricAsserter(instrumentedStmt),
+                                buildMetricAsserter(executedStmt),
+                                nonIfStatements);
+                    })
+                    .collect(Collectors.toList());
+        }
+
+        protected IastExtensionMetricAsserter buildMetricAsserter(IfStmt ifStmt) {
+            String metric =
+                    ifStmt.getCondition().asMethodCallExpr().getScope().get().toString();
+            List<String> statements = ifStmt.getThenStmt().asBlockStmt().getStatements().stream()
+                    .map(Object::toString)
+                    .collect(Collectors.toList());
+            return new IastExtensionMetricAsserter(metric, statements);
+        }
     }
-  }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/tests/IastCallSites.java b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/tests/IastCallSites.java
index f5c2caefa79..cfedf8bf3f9 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/tests/IastCallSites.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/tests/IastCallSites.java
@@ -2,7 +2,7 @@
 
 public interface IastCallSites {
 
-  interface HasTelemetry {
-    void setVerbosity(Object verbosity);
-  }
+    interface HasTelemetry {
+        void setVerbosity(Object verbosity);
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/tests/IastExtensionCallSite.java b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/tests/IastExtensionCallSite.java
index 34bc4a5be9d..b44f26835e9 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/tests/IastExtensionCallSite.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/tests/IastExtensionCallSite.java
@@ -9,30 +9,26 @@
 @CallSite(spi = IastCallSites.class)
 public class IastExtensionCallSite {
 
-  @Source(SourceTypes.REQUEST_HEADER_NAME)
-  @CallSite.After(
-      "java.lang.String javax.servlet.http.HttpServletRequest.getHeader(java.lang.String)")
-  public static String afterGetHeader(
-      @CallSite.This final HttpServletRequest self,
-      @CallSite.Argument final String headerName,
-      @CallSite.Return final String headerValue) {
-    return headerValue;
-  }
+    @Source(SourceTypes.REQUEST_HEADER_NAME)
+    @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequest.getHeader(java.lang.String)")
+    public static String afterGetHeader(
+            @CallSite.This final HttpServletRequest self,
+            @CallSite.Argument final String headerName,
+            @CallSite.Return final String headerValue) {
+        return headerValue;
+    }
 
-  @Source(SourceTypes.REQUEST_BODY)
-  @CallSite.After(
-      "javax.servlet.ServletInputStream javax.servlet.http.HttpServletRequest.getInputStream()")
-  public static ServletInputStream afterGetInputStream(
-      @CallSite.This final HttpServletRequest self,
-      @CallSite.Return final ServletInputStream stream) {
-    return stream;
-  }
+    @Source(SourceTypes.REQUEST_BODY)
+    @CallSite.After("javax.servlet.ServletInputStream javax.servlet.http.HttpServletRequest.getInputStream()")
+    public static ServletInputStream afterGetInputStream(
+            @CallSite.This final HttpServletRequest self, @CallSite.Return final ServletInputStream stream) {
+        return stream;
+    }
 
-  @Propagation
-  @CallSite.After("java.io.BufferedReader javax.servlet.ServletRequest.getReader()")
-  public static BufferedReader afterGetReader(
-      @CallSite.This final ServletRequest self,
-      @CallSite.Return final BufferedReader bufferedReader) {
-    return bufferedReader;
-  }
+    @Propagation
+    @CallSite.After("java.io.BufferedReader javax.servlet.ServletRequest.getReader()")
+    public static BufferedReader afterGetReader(
+            @CallSite.This final ServletRequest self, @CallSite.Return final BufferedReader bufferedReader) {
+        return bufferedReader;
+    }
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/tests/Source.java b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/tests/Source.java
index 5cb5503fd9a..0d0434f3ddb 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/tests/Source.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/tests/Source.java
@@ -8,6 +8,6 @@
 @Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Source {
-  /** Source type */
-  byte value();
+    /** Source type */
+    byte value();
 }
diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/tests/SourceTypes.java b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/tests/SourceTypes.java
index e5e2d68f773..90de4b27a9c 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/tests/SourceTypes.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/tests/SourceTypes.java
@@ -2,7 +2,7 @@
 
 public class SourceTypes {
 
-  public static final byte REQUEST_HEADER_NAME = 3;
+    public static final byte REQUEST_HEADER_NAME = 3;
 
-  public static final byte REQUEST_BODY = 127;
+    public static final byte REQUEST_BODY = 127;
 }
diff --git a/buildSrc/modifiable-config-agent/src/main/java/datadog/trace/agent/test/config/ModifiableConfigAgent.java b/buildSrc/modifiable-config-agent/src/main/java/datadog/trace/agent/test/config/ModifiableConfigAgent.java
index dcc420ac8ba..66d1adbdb6e 100644
--- a/buildSrc/modifiable-config-agent/src/main/java/datadog/trace/agent/test/config/ModifiableConfigAgent.java
+++ b/buildSrc/modifiable-config-agent/src/main/java/datadog/trace/agent/test/config/ModifiableConfigAgent.java
@@ -21,59 +21,57 @@
  */
 public final class ModifiableConfigAgent {
 
-  private static final String CONFIG = "datadog/trace/api/Config";
-  private static final String INST_CONFIG = "datadog/trace/api/InstrumenterConfig";
-  private static final String INSTANCE = "INSTANCE";
+    private static final String CONFIG = "datadog/trace/api/Config";
+    private static final String INST_CONFIG = "datadog/trace/api/InstrumenterConfig";
+    private static final String INSTANCE = "INSTANCE";
 
-  private ModifiableConfigAgent() {}
+    private ModifiableConfigAgent() {}
 
-  public static void premain(String args, Instrumentation inst) {
-    inst.addTransformer(new InstanceFieldRewriter(), false);
-  }
-
-  static final class InstanceFieldRewriter implements ClassFileTransformer {
-    @Override
-    public byte[] transform(
-        ClassLoader loader,
-        String className,
-        Class<?> classBeingRedefined,
-        ProtectionDomain protectionDomain,
-        byte[] classfileBuffer)
-        throws IllegalClassFormatException {
-      if (className == null) {
-        return null;
-      }
-      if (!CONFIG.equals(className) && !INST_CONFIG.equals(className)) {
-        return null;
-      }
-      try {
-        ClassReader reader = new ClassReader(classfileBuffer);
-        ClassWriter writer = new ClassWriter(reader, 0);
-        reader.accept(new InstanceFieldClassVisitor(writer), 0);
-        return writer.toByteArray();
-      } catch (Throwable t) {
-        System.err.println("[modifiable-config-agent] failed to rewrite " + className + ": " + t);
-        return null;
-      }
+    public static void premain(String args, Instrumentation inst) {
+        inst.addTransformer(new InstanceFieldRewriter(), false);
     }
-  }
 
-  static final class InstanceFieldClassVisitor extends ClassVisitor {
-    InstanceFieldClassVisitor(ClassVisitor cv) {
-      super(Opcodes.ASM9, cv);
+    static final class InstanceFieldRewriter implements ClassFileTransformer {
+        @Override
+        public byte[] transform(
+                ClassLoader loader,
+                String className,
+                Class<?> classBeingRedefined,
+                ProtectionDomain protectionDomain,
+                byte[] classfileBuffer)
+                throws IllegalClassFormatException {
+            if (className == null) {
+                return null;
+            }
+            if (!CONFIG.equals(className) && !INST_CONFIG.equals(className)) {
+                return null;
+            }
+            try {
+                ClassReader reader = new ClassReader(classfileBuffer);
+                ClassWriter writer = new ClassWriter(reader, 0);
+                reader.accept(new InstanceFieldClassVisitor(writer), 0);
+                return writer.toByteArray();
+            } catch (Throwable t) {
+                System.err.println("[modifiable-config-agent] failed to rewrite " + className + ": " + t);
+                return null;
+            }
+        }
     }
 
-    @Override
-    public FieldVisitor visitField(
-        int access, String name, String descriptor, String signature, Object value) {
-      if (INSTANCE.equals(name)) {
-        int rewritten =
-            (access & ~(Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED | Opcodes.ACC_FINAL))
-                | Opcodes.ACC_PUBLIC
-                | Opcodes.ACC_VOLATILE;
-        return super.visitField(rewritten, name, descriptor, signature, value);
-      }
-      return super.visitField(access, name, descriptor, signature, value);
+    static final class InstanceFieldClassVisitor extends ClassVisitor {
+        InstanceFieldClassVisitor(ClassVisitor cv) {
+            super(Opcodes.ASM9, cv);
+        }
+
+        @Override
+        public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
+            if (INSTANCE.equals(name)) {
+                int rewritten = (access & ~(Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED | Opcodes.ACC_FINAL))
+                        | Opcodes.ACC_PUBLIC
+                        | Opcodes.ACC_VOLATILE;
+                return super.visitField(rewritten, name, descriptor, signature, value);
+            }
+            return super.visitField(access, name, descriptor, signature, value);
+        }
     }
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/BackendApi.java b/communication/src/main/java/datadog/communication/BackendApi.java
index aa4385d6d75..ff81288e82c 100644
--- a/communication/src/main/java/datadog/communication/BackendApi.java
+++ b/communication/src/main/java/datadog/communication/BackendApi.java
@@ -10,11 +10,11 @@
 /** API for posting HTTP requests to backend */
 public interface BackendApi {
 
-  <T> T post(
-      String uri,
-      RequestBody requestBody,
-      IOThrowingFunction<InputStream, T> responseParser,
-      @Nullable OkHttpUtils.CustomListener requestListener,
-      boolean requestCompression)
-      throws IOException;
+    <T> T post(
+            String uri,
+            RequestBody requestBody,
+            IOThrowingFunction<InputStream, T> responseParser,
+            @Nullable OkHttpUtils.CustomListener requestListener,
+            boolean requestCompression)
+            throws IOException;
 }
diff --git a/communication/src/main/java/datadog/communication/BackendApiFactory.java b/communication/src/main/java/datadog/communication/BackendApiFactory.java
index c1b471ebfc8..6c39b79a4e0 100644
--- a/communication/src/main/java/datadog/communication/BackendApiFactory.java
+++ b/communication/src/main/java/datadog/communication/BackendApiFactory.java
@@ -14,137 +14,132 @@
 
 public class BackendApiFactory {
 
-  private static final Logger log = LoggerFactory.getLogger(BackendApiFactory.class);
+    private static final Logger log = LoggerFactory.getLogger(BackendApiFactory.class);
 
-  private final Config config;
-  private final SharedCommunicationObjects sharedCommunicationObjects;
+    private final Config config;
+    private final SharedCommunicationObjects sharedCommunicationObjects;
 
-  public BackendApiFactory(Config config, SharedCommunicationObjects sharedCommunicationObjects) {
-    this.config = config;
-    this.sharedCommunicationObjects = sharedCommunicationObjects;
-  }
+    public BackendApiFactory(Config config, SharedCommunicationObjects sharedCommunicationObjects) {
+        this.config = config;
+        this.sharedCommunicationObjects = sharedCommunicationObjects;
+    }
+
+    public @Nullable BackendApi createBackendApi(Intake intake) {
+        return createBackendApi(intake, true);
+    }
 
-  public @Nullable BackendApi createBackendApi(Intake intake) {
-    return createBackendApi(intake, true);
-  }
+    public @Nullable BackendApi createBackendApi(Intake intake, boolean responseCompression) {
+        if (intake.isAgentlessEnabled(config)) {
+            return createDirectIntakeApi(intake, responseCompression);
+        }
+
+        BackendApi backendApi = createEvpProxyApi(intake, responseCompression);
+        if (backendApi == null) {
+            log.warn("Cannot create backend API client since agentless mode is disabled, "
+                    + "and agent does not support EVP proxy");
+        }
+        return backendApi;
+    }
 
-  public @Nullable BackendApi createBackendApi(Intake intake, boolean responseCompression) {
-    if (intake.isAgentlessEnabled(config)) {
-      return createDirectIntakeApi(intake, responseCompression);
+    /** Creates an authenticated API client that sends data directly to a Datadog intake. */
+    public BackendApi createDirectIntakeApi(Intake intake) {
+        return createDirectIntakeApi(intake, true);
     }
 
-    BackendApi backendApi = createEvpProxyApi(intake, responseCompression);
-    if (backendApi == null) {
-      log.warn(
-          "Cannot create backend API client since agentless mode is disabled, "
-              + "and agent does not support EVP proxy");
+    /** Creates an authenticated API client that sends data directly to a Datadog intake. */
+    public BackendApi createDirectIntakeApi(Intake intake, boolean responseCompression) {
+        return createDirectIntakeApi(intake, responseCompression, true);
     }
-    return backendApi;
-  }
-
-  /** Creates an authenticated API client that sends data directly to a Datadog intake. */
-  public BackendApi createDirectIntakeApi(Intake intake) {
-    return createDirectIntakeApi(intake, true);
-  }
-
-  /** Creates an authenticated API client that sends data directly to a Datadog intake. */
-  public BackendApi createDirectIntakeApi(Intake intake, boolean responseCompression) {
-    return createDirectIntakeApi(intake, responseCompression, true);
-  }
-
-  /** Creates an authenticated API client that sends data directly to a Datadog intake. */
-  public BackendApi createDirectIntakeApi(
-      Intake intake, boolean responseCompression, boolean followRedirects) {
-    HttpUrl agentlessUrl = buildDirectIntakeUrl(intake, config);
-    String apiKey = config.getApiKey();
-    if (apiKey == null || apiKey.isEmpty()) {
-      throw new FatalAgentMisconfigurationError(
-          "Agentless mode is enabled and API key is not set. Please set DD_API_KEY");
+
+    /** Creates an authenticated API client that sends data directly to a Datadog intake. */
+    public BackendApi createDirectIntakeApi(Intake intake, boolean responseCompression, boolean followRedirects) {
+        HttpUrl agentlessUrl = buildDirectIntakeUrl(intake, config);
+        String apiKey = config.getApiKey();
+        if (apiKey == null || apiKey.isEmpty()) {
+            throw new FatalAgentMisconfigurationError(
+                    "Agentless mode is enabled and API key is not set. Please set DD_API_KEY");
+        }
+        String traceId = config.getIdGenerationStrategy().generateTraceId().toString();
+        return new IntakeApi(
+                agentlessUrl,
+                apiKey,
+                traceId,
+                retryPolicyFactory(),
+                directIntakeHttpClient(sharedCommunicationObjects.getIntakeHttpClient(), followRedirects),
+                responseCompression);
     }
-    String traceId = config.getIdGenerationStrategy().generateTraceId().toString();
-    return new IntakeApi(
-        agentlessUrl,
-        apiKey,
-        traceId,
-        retryPolicyFactory(),
-        directIntakeHttpClient(sharedCommunicationObjects.getIntakeHttpClient(), followRedirects),
-        responseCompression);
-  }
-
-  static OkHttpClient directIntakeHttpClient(
-      final OkHttpClient intakeHttpClient, final boolean followRedirects) {
-    if (followRedirects) {
-      return intakeHttpClient;
+
+    static OkHttpClient directIntakeHttpClient(final OkHttpClient intakeHttpClient, final boolean followRedirects) {
+        if (followRedirects) {
+            return intakeHttpClient;
+        }
+        return intakeHttpClient.newBuilder().followRedirects(false).build();
     }
-    return intakeHttpClient.newBuilder().followRedirects(false).build();
-  }
 
-  private static HttpUrl buildDirectIntakeUrl(Intake intake, Config config) {
-    if (intake != Intake.EVENT_PLATFORM) {
-      return HttpUrl.get(intake.getAgentlessUrl(config));
+    private static HttpUrl buildDirectIntakeUrl(Intake intake, Config config) {
+        if (intake != Intake.EVENT_PLATFORM) {
+            return HttpUrl.get(intake.getAgentlessUrl(config));
+        }
+        return buildEventPlatformIntakeUrl(config.getSite());
     }
-    return buildEventPlatformIntakeUrl(config.getSite());
-  }
 
-  static HttpUrl buildEventPlatformIntakeUrl(String site) {
-    if (site == null || site.isEmpty()) {
-      throw new IllegalArgumentException("Invalid Datadog site");
+    static HttpUrl buildEventPlatformIntakeUrl(String site) {
+        if (site == null || site.isEmpty()) {
+            throw new IllegalArgumentException("Invalid Datadog site");
+        }
+
+        String expectedHost = Intake.EVENT_PLATFORM.getUrlPrefix() + "." + site;
+        HttpUrl url = new HttpUrl.Builder()
+                .scheme("https")
+                .host(expectedHost)
+                .addPathSegment("api")
+                .addPathSegment(Intake.EVENT_PLATFORM.getVersion())
+                .addPathSegment("")
+                .build();
+        if (!url.host().equalsIgnoreCase(expectedHost)) {
+            throw new IllegalArgumentException("Invalid Datadog site");
+        }
+        return url;
     }
 
-    String expectedHost = Intake.EVENT_PLATFORM.getUrlPrefix() + "." + site;
-    HttpUrl url =
-        new HttpUrl.Builder()
-            .scheme("https")
-            .host(expectedHost)
-            .addPathSegment("api")
-            .addPathSegment(Intake.EVENT_PLATFORM.getVersion())
-            .addPathSegment("")
-            .build();
-    if (!url.host().equalsIgnoreCase(expectedHost)) {
-      throw new IllegalArgumentException("Invalid Datadog site");
+    /** Creates an API client that uses the specified retry policy with a compatible local proxy. */
+    public @Nullable BackendApi createEvpProxyApi(Intake intake) {
+        return createEvpProxyApi(intake, true);
     }
-    return url;
-  }
-
-  /** Creates an API client that uses the specified retry policy with a compatible local proxy. */
-  public @Nullable BackendApi createEvpProxyApi(Intake intake) {
-    return createEvpProxyApi(intake, true);
-  }
-
-  /** Creates an API client that sends data through a compatible local EVP proxy. */
-  public @Nullable BackendApi createEvpProxyApi(Intake intake, boolean responseCompression) {
-    return createEvpProxyApi(intake, responseCompression, retryPolicyFactory());
-  }
-
-  /** Creates an API client that sends data through a compatible local EVP proxy. */
-  public @Nullable BackendApi createEvpProxyApi(
-      Intake intake, boolean responseCompression, HttpRetryPolicy.Factory retryPolicyFactory) {
-    DDAgentFeaturesDiscovery featuresDiscovery =
-        sharedCommunicationObjects.featuresDiscovery(config);
-    featuresDiscovery.discoverIfOutdated();
-    if (!featuresDiscovery.supportsEvpProxy()) {
-      return null;
+
+    /** Creates an API client that sends data through a compatible local EVP proxy. */
+    public @Nullable BackendApi createEvpProxyApi(Intake intake, boolean responseCompression) {
+        return createEvpProxyApi(intake, responseCompression, retryPolicyFactory());
+    }
+
+    /** Creates an API client that sends data through a compatible local EVP proxy. */
+    public @Nullable BackendApi createEvpProxyApi(
+            Intake intake, boolean responseCompression, HttpRetryPolicy.Factory retryPolicyFactory) {
+        DDAgentFeaturesDiscovery featuresDiscovery = sharedCommunicationObjects.featuresDiscovery(config);
+        featuresDiscovery.discoverIfOutdated();
+        if (!featuresDiscovery.supportsEvpProxy()) {
+            return null;
+        }
+        String evpProxyEndpoint = featuresDiscovery.getEvpProxyEndpoint();
+
+        String traceId = config.getIdGenerationStrategy().generateTraceId().toString();
+        log.debug(
+                "Creating EVP proxy client for {} using endpoint {} with responseCompression={}",
+                intake,
+                evpProxyEndpoint,
+                responseCompression);
+        HttpUrl evpProxyUrl = sharedCommunicationObjects.agentUrl.resolve(evpProxyEndpoint);
+        String subdomain = intake.getUrlPrefix();
+        return new EvpProxyApi(
+                traceId,
+                evpProxyUrl,
+                subdomain,
+                retryPolicyFactory,
+                sharedCommunicationObjects.agentHttpClient,
+                responseCompression);
+    }
+
+    private static HttpRetryPolicy.Factory retryPolicyFactory() {
+        return new HttpRetryPolicy.Factory(5, 100, 2.0, true);
     }
-    String evpProxyEndpoint = featuresDiscovery.getEvpProxyEndpoint();
-
-    String traceId = config.getIdGenerationStrategy().generateTraceId().toString();
-    log.debug(
-        "Creating EVP proxy client for {} using endpoint {} with responseCompression={}",
-        intake,
-        evpProxyEndpoint,
-        responseCompression);
-    HttpUrl evpProxyUrl = sharedCommunicationObjects.agentUrl.resolve(evpProxyEndpoint);
-    String subdomain = intake.getUrlPrefix();
-    return new EvpProxyApi(
-        traceId,
-        evpProxyUrl,
-        subdomain,
-        retryPolicyFactory,
-        sharedCommunicationObjects.agentHttpClient,
-        responseCompression);
-  }
-
-  private static HttpRetryPolicy.Factory retryPolicyFactory() {
-    return new HttpRetryPolicy.Factory(5, 100, 2.0, true);
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/EvpProxy.java b/communication/src/main/java/datadog/communication/EvpProxy.java
index c2453bccb25..5f0b482ff62 100644
--- a/communication/src/main/java/datadog/communication/EvpProxy.java
+++ b/communication/src/main/java/datadog/communication/EvpProxy.java
@@ -3,13 +3,13 @@
 /** Shared EVP proxy constants. */
 public final class EvpProxy {
 
-  public static final String SUBDOMAIN_HEADER = "X-Datadog-EVP-Subdomain";
+    public static final String SUBDOMAIN_HEADER = "X-Datadog-EVP-Subdomain";
 
-  /**
-   * Default SDK-side target for uncompressed EVP request bodies. Writers may split batches at or
-   * below this size to keep Agent proxy requests comfortably bounded.
-   */
-  public static final int PAYLOAD_SIZE_LIMIT_BYTES = 5 * 1024 * 1024;
+    /**
+     * Default SDK-side target for uncompressed EVP request bodies. Writers may split batches at or
+     * below this size to keep Agent proxy requests comfortably bounded.
+     */
+    public static final int PAYLOAD_SIZE_LIMIT_BYTES = 5 * 1024 * 1024;
 
-  private EvpProxy() {}
+    private EvpProxy() {}
 }
diff --git a/communication/src/main/java/datadog/communication/EvpProxyApi.java b/communication/src/main/java/datadog/communication/EvpProxyApi.java
index 8bb768b7e4e..68fb691f7ef 100644
--- a/communication/src/main/java/datadog/communication/EvpProxyApi.java
+++ b/communication/src/main/java/datadog/communication/EvpProxyApi.java
@@ -17,105 +17,103 @@
 /** API that uses DD Agent as a proxy to post request to backend. */
 public class EvpProxyApi implements BackendApi {
 
-  private static final Logger log = LoggerFactory.getLogger(EvpProxyApi.class);
-
-  private static final String API_VERSION = "v2";
-  private static final String X_DATADOG_TRACE_ID_HEADER = "x-datadog-trace-id";
-  private static final String X_DATADOG_PARENT_ID_HEADER = "x-datadog-parent-id";
-  private static final String ACCEPT_ENCODING_HEADER = "Accept-Encoding";
-  private static final String CONTENT_ENCODING_HEADER = "Content-Encoding";
-  private static final String GZIP_ENCODING = "gzip";
-  private static final String IDENTITY_ENCODING = "identity";
-
-  private final String traceId;
-  private final HttpRetryPolicy.Factory retryPolicyFactory;
-  private final HttpUrl evpProxyUrl;
-  private final String subdomain;
-  private final OkHttpClient httpClient;
-  private final boolean responseCompression;
-
-  public EvpProxyApi(
-      String traceId,
-      HttpUrl evpProxyUrl,
-      String subdomain,
-      HttpRetryPolicy.Factory retryPolicyFactory,
-      OkHttpClient httpClient,
-      boolean responseCompression) {
-    this.traceId = traceId;
-    this.evpProxyUrl = evpProxyUrl.resolve("api/" + API_VERSION + "/");
-    this.subdomain = subdomain;
-    this.retryPolicyFactory = retryPolicyFactory;
-    this.httpClient = httpClient;
-    this.responseCompression = responseCompression;
-  }
-
-  @Override
-  public <T> T post(
-      String uri,
-      RequestBody requestBody,
-      IOThrowingFunction<InputStream, T> responseParser,
-      @Nullable OkHttpUtils.CustomListener requestListener,
-      boolean requestCompression)
-      throws IOException {
-    final HttpUrl url = evpProxyUrl.resolve(uri);
-
-    Request.Builder requestBuilder =
-        new Request.Builder()
-            .url(url)
-            .addHeader(EvpProxy.SUBDOMAIN_HEADER, subdomain)
-            .addHeader(X_DATADOG_TRACE_ID_HEADER, traceId)
-            .addHeader(X_DATADOG_PARENT_ID_HEADER, traceId);
-
-    if (requestListener != null) {
-      requestBuilder.tag(OkHttpUtils.CustomListener.class, requestListener);
+    private static final Logger log = LoggerFactory.getLogger(EvpProxyApi.class);
+
+    private static final String API_VERSION = "v2";
+    private static final String X_DATADOG_TRACE_ID_HEADER = "x-datadog-trace-id";
+    private static final String X_DATADOG_PARENT_ID_HEADER = "x-datadog-parent-id";
+    private static final String ACCEPT_ENCODING_HEADER = "Accept-Encoding";
+    private static final String CONTENT_ENCODING_HEADER = "Content-Encoding";
+    private static final String GZIP_ENCODING = "gzip";
+    private static final String IDENTITY_ENCODING = "identity";
+
+    private final String traceId;
+    private final HttpRetryPolicy.Factory retryPolicyFactory;
+    private final HttpUrl evpProxyUrl;
+    private final String subdomain;
+    private final OkHttpClient httpClient;
+    private final boolean responseCompression;
+
+    public EvpProxyApi(
+            String traceId,
+            HttpUrl evpProxyUrl,
+            String subdomain,
+            HttpRetryPolicy.Factory retryPolicyFactory,
+            OkHttpClient httpClient,
+            boolean responseCompression) {
+        this.traceId = traceId;
+        this.evpProxyUrl = evpProxyUrl.resolve("api/" + API_VERSION + "/");
+        this.subdomain = subdomain;
+        this.retryPolicyFactory = retryPolicyFactory;
+        this.httpClient = httpClient;
+        this.responseCompression = responseCompression;
     }
 
-    if (requestCompression) {
-      requestBuilder.addHeader(CONTENT_ENCODING_HEADER, GZIP_ENCODING);
-    }
-
-    // OkHttp's BridgeInterceptor adds a transparent Accept-Encoding: gzip when the caller does not
-    // set one. Set the header explicitly on both paths so responseCompression=false actually
-    // suppresses gzip negotiation on the wire.
-    if (responseCompression) {
-      requestBuilder.addHeader(ACCEPT_ENCODING_HEADER, GZIP_ENCODING);
-    } else {
-      requestBuilder.addHeader(ACCEPT_ENCODING_HEADER, IDENTITY_ENCODING);
-    }
-
-    final Request request = requestBuilder.post(requestBody).build();
-    log.debug(
-        "Posting EVP request to {} with responseCompression={} requestCompression={}",
-        url,
-        responseCompression,
-        requestCompression);
-
-    try (okhttp3.Response response =
-        OkHttpUtils.sendWithRetries(httpClient, retryPolicyFactory, request)) {
-      if (response.isSuccessful()) {
-        log.debug("Request to {} returned successful response: {}", uri, response.code());
+    @Override
+    public <T> T post(
+            String uri,
+            RequestBody requestBody,
+            IOThrowingFunction<InputStream, T> responseParser,
+            @Nullable OkHttpUtils.CustomListener requestListener,
+            boolean requestCompression)
+            throws IOException {
+        final HttpUrl url = evpProxyUrl.resolve(uri);
+
+        Request.Builder requestBuilder = new Request.Builder()
+                .url(url)
+                .addHeader(EvpProxy.SUBDOMAIN_HEADER, subdomain)
+                .addHeader(X_DATADOG_TRACE_ID_HEADER, traceId)
+                .addHeader(X_DATADOG_PARENT_ID_HEADER, traceId);
+
+        if (requestListener != null) {
+            requestBuilder.tag(OkHttpUtils.CustomListener.class, requestListener);
+        }
 
-        InputStream responseBodyStream = response.body().byteStream();
+        if (requestCompression) {
+            requestBuilder.addHeader(CONTENT_ENCODING_HEADER, GZIP_ENCODING);
+        }
 
-        String contentEncoding = response.header(CONTENT_ENCODING_HEADER);
-        if (GZIP_ENCODING.equalsIgnoreCase(contentEncoding)) {
-          log.debug("Response content encoding is {}, unzipping response body", contentEncoding);
-          responseBodyStream = new GZIPInputStream(responseBodyStream);
+        // OkHttp's BridgeInterceptor adds a transparent Accept-Encoding: gzip when the caller does not
+        // set one. Set the header explicitly on both paths so responseCompression=false actually
+        // suppresses gzip negotiation on the wire.
+        if (responseCompression) {
+            requestBuilder.addHeader(ACCEPT_ENCODING_HEADER, GZIP_ENCODING);
+        } else {
+            requestBuilder.addHeader(ACCEPT_ENCODING_HEADER, IDENTITY_ENCODING);
         }
 
-        return responseParser.apply(responseBodyStream);
-      } else {
-        throw new HttpResponseException(
-            response.code(),
-            "Request to "
-                + uri
-                + " returned error response "
-                + response.code()
-                + ": "
-                + response.message()
-                + "; "
-                + (response.body() != null ? response.body().string() : ""));
-      }
+        final Request request = requestBuilder.post(requestBody).build();
+        log.debug(
+                "Posting EVP request to {} with responseCompression={} requestCompression={}",
+                url,
+                responseCompression,
+                requestCompression);
+
+        try (okhttp3.Response response = OkHttpUtils.sendWithRetries(httpClient, retryPolicyFactory, request)) {
+            if (response.isSuccessful()) {
+                log.debug("Request to {} returned successful response: {}", uri, response.code());
+
+                InputStream responseBodyStream = response.body().byteStream();
+
+                String contentEncoding = response.header(CONTENT_ENCODING_HEADER);
+                if (GZIP_ENCODING.equalsIgnoreCase(contentEncoding)) {
+                    log.debug("Response content encoding is {}, unzipping response body", contentEncoding);
+                    responseBodyStream = new GZIPInputStream(responseBodyStream);
+                }
+
+                return responseParser.apply(responseBodyStream);
+            } else {
+                throw new HttpResponseException(
+                        response.code(),
+                        "Request to "
+                                + uri
+                                + " returned error response "
+                                + response.code()
+                                + ": "
+                                + response.message()
+                                + "; "
+                                + (response.body() != null ? response.body().string() : ""));
+            }
+        }
     }
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/HttpResponseException.java b/communication/src/main/java/datadog/communication/HttpResponseException.java
index ac9b62cdb2d..b74e066f420 100644
--- a/communication/src/main/java/datadog/communication/HttpResponseException.java
+++ b/communication/src/main/java/datadog/communication/HttpResponseException.java
@@ -5,14 +5,14 @@
 /** An HTTP request failed with a non-success response. */
 public final class HttpResponseException extends IOException {
 
-  private final int statusCode;
+    private final int statusCode;
 
-  public HttpResponseException(final int statusCode, final String message) {
-    super(message);
-    this.statusCode = statusCode;
-  }
+    public HttpResponseException(final int statusCode, final String message) {
+        super(message);
+        this.statusCode = statusCode;
+    }
 
-  public int getStatusCode() {
-    return statusCode;
-  }
+    public int getStatusCode() {
+        return statusCode;
+    }
 }
diff --git a/communication/src/main/java/datadog/communication/IntakeApi.java b/communication/src/main/java/datadog/communication/IntakeApi.java
index 1a6f3f91bc7..a880dc7d413 100644
--- a/communication/src/main/java/datadog/communication/IntakeApi.java
+++ b/communication/src/main/java/datadog/communication/IntakeApi.java
@@ -17,93 +17,89 @@
 /** API for posting HTTP requests directly to backend, without the need for DD Agent */
 public class IntakeApi implements BackendApi {
 
-  private static final Logger log = LoggerFactory.getLogger(IntakeApi.class);
+    private static final Logger log = LoggerFactory.getLogger(IntakeApi.class);
 
-  private static final String DD_API_KEY_HEADER = "dd-api-key";
-  private static final String X_DATADOG_TRACE_ID_HEADER = "x-datadog-trace-id";
-  private static final String X_DATADOG_PARENT_ID_HEADER = "x-datadog-parent-id";
-  private static final String ACCEPT_ENCODING_HEADER = "Accept-Encoding";
-  private static final String CONTENT_ENCODING_HEADER = "Content-Encoding";
-  private static final String GZIP_ENCODING = "gzip";
-  private static final String IDENTITY_ENCODING = "identity";
+    private static final String DD_API_KEY_HEADER = "dd-api-key";
+    private static final String X_DATADOG_TRACE_ID_HEADER = "x-datadog-trace-id";
+    private static final String X_DATADOG_PARENT_ID_HEADER = "x-datadog-parent-id";
+    private static final String ACCEPT_ENCODING_HEADER = "Accept-Encoding";
+    private static final String CONTENT_ENCODING_HEADER = "Content-Encoding";
+    private static final String GZIP_ENCODING = "gzip";
+    private static final String IDENTITY_ENCODING = "identity";
 
-  private final String apiKey;
-  private final String traceId;
-  private final HttpRetryPolicy.Factory retryPolicyFactory;
-  private final boolean responseCompression;
-  private final HttpUrl hostUrl;
-  private final OkHttpClient httpClient;
+    private final String apiKey;
+    private final String traceId;
+    private final HttpRetryPolicy.Factory retryPolicyFactory;
+    private final boolean responseCompression;
+    private final HttpUrl hostUrl;
+    private final OkHttpClient httpClient;
 
-  public IntakeApi(
-      HttpUrl hostUrl,
-      String apiKey,
-      String traceId,
-      HttpRetryPolicy.Factory retryPolicyFactory,
-      OkHttpClient httpClient,
-      boolean responseCompression) {
-    this.hostUrl = hostUrl;
-    this.apiKey = apiKey;
-    this.traceId = traceId;
-    this.retryPolicyFactory = retryPolicyFactory;
-    this.responseCompression = responseCompression;
-    this.httpClient = httpClient;
-  }
+    public IntakeApi(
+            HttpUrl hostUrl,
+            String apiKey,
+            String traceId,
+            HttpRetryPolicy.Factory retryPolicyFactory,
+            OkHttpClient httpClient,
+            boolean responseCompression) {
+        this.hostUrl = hostUrl;
+        this.apiKey = apiKey;
+        this.traceId = traceId;
+        this.retryPolicyFactory = retryPolicyFactory;
+        this.responseCompression = responseCompression;
+        this.httpClient = httpClient;
+    }
 
-  @Override
-  public <T> T post(
-      String uri,
-      RequestBody requestBody,
-      IOThrowingFunction<InputStream, T> responseParser,
-      @Nullable OkHttpUtils.CustomListener requestListener,
-      boolean requestCompression)
-      throws IOException {
-    HttpUrl url = hostUrl.resolve(uri);
-    Request.Builder requestBuilder =
-        new Request.Builder()
-            .url(url)
-            .post(requestBody)
-            .addHeader(DD_API_KEY_HEADER, apiKey)
-            .addHeader(X_DATADOG_TRACE_ID_HEADER, traceId)
-            .addHeader(X_DATADOG_PARENT_ID_HEADER, traceId);
+    @Override
+    public <T> T post(
+            String uri,
+            RequestBody requestBody,
+            IOThrowingFunction<InputStream, T> responseParser,
+            @Nullable OkHttpUtils.CustomListener requestListener,
+            boolean requestCompression)
+            throws IOException {
+        HttpUrl url = hostUrl.resolve(uri);
+        Request.Builder requestBuilder = new Request.Builder()
+                .url(url)
+                .post(requestBody)
+                .addHeader(DD_API_KEY_HEADER, apiKey)
+                .addHeader(X_DATADOG_TRACE_ID_HEADER, traceId)
+                .addHeader(X_DATADOG_PARENT_ID_HEADER, traceId);
 
-    if (requestListener != null) {
-      requestBuilder.tag(OkHttpUtils.CustomListener.class, requestListener);
-    }
+        if (requestListener != null) {
+            requestBuilder.tag(OkHttpUtils.CustomListener.class, requestListener);
+        }
 
-    if (requestCompression) {
-      requestBuilder.addHeader(CONTENT_ENCODING_HEADER, GZIP_ENCODING);
-    }
+        if (requestCompression) {
+            requestBuilder.addHeader(CONTENT_ENCODING_HEADER, GZIP_ENCODING);
+        }
 
-    // OkHttp adds Accept-Encoding: gzip when this header is absent. Always set the header so a
-    // caller can disable response compression on the wire.
-    requestBuilder.addHeader(
-        ACCEPT_ENCODING_HEADER, responseCompression ? GZIP_ENCODING : IDENTITY_ENCODING);
+        // OkHttp adds Accept-Encoding: gzip when this header is absent. Always set the header so a
+        // caller can disable response compression on the wire.
+        requestBuilder.addHeader(ACCEPT_ENCODING_HEADER, responseCompression ? GZIP_ENCODING : IDENTITY_ENCODING);
 
-    Request request = requestBuilder.build();
-    try (okhttp3.Response response =
-        OkHttpUtils.sendWithRetries(httpClient, retryPolicyFactory, request)) {
-      if (response.isSuccessful()) {
-        log.debug("Request to {} returned successful response: {}", uri, response.code());
-        InputStream responseBodyStream = response.body().byteStream();
+        Request request = requestBuilder.build();
+        try (okhttp3.Response response = OkHttpUtils.sendWithRetries(httpClient, retryPolicyFactory, request)) {
+            if (response.isSuccessful()) {
+                log.debug("Request to {} returned successful response: {}", uri, response.code());
+                InputStream responseBodyStream = response.body().byteStream();
 
-        String contentEncoding = response.header(CONTENT_ENCODING_HEADER);
-        if (GZIP_ENCODING.equalsIgnoreCase(contentEncoding)) {
-          log.debug("Response content encoding is {}, unzipping response body", contentEncoding);
-          responseBodyStream = new GZIPInputStream(responseBodyStream);
-        }
+                String contentEncoding = response.header(CONTENT_ENCODING_HEADER);
+                if (GZIP_ENCODING.equalsIgnoreCase(contentEncoding)) {
+                    log.debug("Response content encoding is {}, unzipping response body", contentEncoding);
+                    responseBodyStream = new GZIPInputStream(responseBodyStream);
+                }
 
-        return responseParser.apply(responseBodyStream);
-      } else {
-        throw new IOException(
-            "Request to "
-                + uri
-                + " returned error response "
-                + response.code()
-                + ": "
-                + response.message()
-                + "; "
-                + (response.body() != null ? response.body().string() : ""));
-      }
+                return responseParser.apply(responseBodyStream);
+            } else {
+                throw new IOException("Request to "
+                        + uri
+                        + " returned error response "
+                        + response.code()
+                        + ": "
+                        + response.message()
+                        + "; "
+                        + (response.body() != null ? response.body().string() : ""));
+            }
+        }
     }
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/ddagent/AgentVersion.java b/communication/src/main/java/datadog/communication/ddagent/AgentVersion.java
index f3b30cb7baf..2d32e9f611f 100644
--- a/communication/src/main/java/datadog/communication/ddagent/AgentVersion.java
+++ b/communication/src/main/java/datadog/communication/ddagent/AgentVersion.java
@@ -5,68 +5,68 @@
 
 public class AgentVersion {
 
-  private static final Logger log = LoggerFactory.getLogger(AgentVersion.class);
+    private static final Logger log = LoggerFactory.getLogger(AgentVersion.class);
 
-  /**
-   * Checks if the given version string represents a version that is below the specified major,
-   * minor, and patch version.
-   *
-   * @param version the version string to check (e.g., "7.64.0")
-   * @param maxMajor maximum major version (exclusive)
-   * @param maxMinor maximum minor version (exclusive)
-   * @param maxPatch maximum patch version (exclusive)
-   * @return true if version is below the specified maximum (or if not parseable), false otherwise
-   */
-  public static boolean isVersionBelow(String version, int maxMajor, int maxMinor, int maxPatch) {
-    if (version == null || version.isEmpty()) {
-      return true;
-    }
+    /**
+     * Checks if the given version string represents a version that is below the specified major,
+     * minor, and patch version.
+     *
+     * @param version the version string to check (e.g., "7.64.0")
+     * @param maxMajor maximum major version (exclusive)
+     * @param maxMinor maximum minor version (exclusive)
+     * @param maxPatch maximum patch version (exclusive)
+     * @return true if version is below the specified maximum (or if not parseable), false otherwise
+     */
+    public static boolean isVersionBelow(String version, int maxMajor, int maxMinor, int maxPatch) {
+        if (version == null || version.isEmpty()) {
+            return true;
+        }
 
-    try {
-      // Parse version string in format "major.minor.patch" (e.g., "7.65.0")
-      // Assumes the 'version' is below if it can't be parsed.
-      int majorDot = version.indexOf('.');
-      if (majorDot == -1) {
-        return true;
-      }
+        try {
+            // Parse version string in format "major.minor.patch" (e.g., "7.65.0")
+            // Assumes the 'version' is below if it can't be parsed.
+            int majorDot = version.indexOf('.');
+            if (majorDot == -1) {
+                return true;
+            }
 
-      int major = Integer.parseInt(version.substring(0, majorDot));
+            int major = Integer.parseInt(version.substring(0, majorDot));
 
-      if (major < maxMajor) {
-        return true;
-      } else if (major > maxMajor) {
-        return false;
-      }
+            if (major < maxMajor) {
+                return true;
+            } else if (major > maxMajor) {
+                return false;
+            }
 
-      // major == maxMajor
-      int minorDot = version.indexOf('.', majorDot + 1);
-      if (minorDot == -1) {
-        return true;
-      }
+            // major == maxMajor
+            int minorDot = version.indexOf('.', majorDot + 1);
+            if (minorDot == -1) {
+                return true;
+            }
 
-      int minor = Integer.parseInt(version.substring(majorDot + 1, minorDot));
-      if (minor < maxMinor) {
-        return true;
-      } else if (minor > maxMinor) {
-        return false;
-      }
+            int minor = Integer.parseInt(version.substring(majorDot + 1, minorDot));
+            if (minor < maxMinor) {
+                return true;
+            } else if (minor > maxMinor) {
+                return false;
+            }
 
-      // major == maxMajor && minor == maxMinor
-      // Find end of patch version (may have suffix like "-rc.1")
-      int patchEnd = minorDot + 1;
-      while (patchEnd < version.length() && Character.isDigit(version.charAt(patchEnd))) {
-        patchEnd++;
-      }
+            // major == maxMajor && minor == maxMinor
+            // Find end of patch version (may have suffix like "-rc.1")
+            int patchEnd = minorDot + 1;
+            while (patchEnd < version.length() && Character.isDigit(version.charAt(patchEnd))) {
+                patchEnd++;
+            }
 
-      int patch = Integer.parseInt(version.substring(minorDot + 1, patchEnd));
-      if (patch != maxPatch) {
-        return patch < maxPatch;
-      } else {
-        // If there's a suffix (like "-rc.1"), consider it below the non-suffixed version
-        return patchEnd < version.length();
-      }
-    } catch (NumberFormatException | IndexOutOfBoundsException e) {
-      return true;
+            int patch = Integer.parseInt(version.substring(minorDot + 1, patchEnd));
+            if (patch != maxPatch) {
+                return patch < maxPatch;
+            } else {
+                // If there's a suffix (like "-rc.1"), consider it below the non-suffixed version
+                return patchEnd < version.length();
+            }
+        } catch (NumberFormatException | IndexOutOfBoundsException e) {
+            return true;
+        }
     }
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java b/communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java
index 16be2e84b98..3290ed95711 100644
--- a/communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java
+++ b/communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java
@@ -35,438 +35,423 @@
 
 public class DDAgentFeaturesDiscovery implements DroppingPolicy {
 
-  private static final Logger log = LoggerFactory.getLogger(DDAgentFeaturesDiscovery.class);
-
-  private static final JsonAdapter<Map<String, Object>> RESPONSE_ADAPTER =
-      new Moshi.Builder()
-          .build()
-          .adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
-
-  // Currently all the endpoints that we probe expect a msgpack body of an array of arrays, v3/v4
-  // arbitrary size and v5 two elements, so let's give them a two element array of empty arrays
-  private static final byte[] PROBE_MESSAGE = {
-    (byte) FIXARRAY | 2, (byte) FIXARRAY, (byte) FIXARRAY
-  };
-
-  public static final String V03_ENDPOINT = "v0.3/traces";
-  public static final String V04_ENDPOINT = "v0.4/traces";
-  public static final String V05_ENDPOINT = "v0.5/traces";
-  public static final String V1_ENDPOINT = "v1.0/traces";
-
-  public static final String V06_METRICS_ENDPOINT = "v0.6/stats";
-  public static final String V07_CONFIG_ENDPOINT = "v0.7/config";
-
-  public static final String V01_DATASTREAMS_ENDPOINT = "v0.1/pipeline_stats";
-
-  public static final String V2_EVP_PROXY_ENDPOINT = "evp_proxy/v2/";
-  public static final String V4_EVP_PROXY_ENDPOINT = "evp_proxy/v4/";
-
-  public static final String DATADOG_AGENT_STATE = "Datadog-Agent-State";
-
-  public static final String DEBUGGER_ENDPOINT_V1 = "debugger/v1/input";
-  public static final String DEBUGGER_ENDPOINT_V2 = "debugger/v2/input";
-  public static final String DEBUGGER_DIAGNOSTICS_ENDPOINT = "debugger/v1/diagnostics";
-
-  public static final String TELEMETRY_PROXY_ENDPOINT = "telemetry/proxy/";
-
-  private static final long MIN_FEATURE_DISCOVERY_INTERVAL_MILLIS = 60 * 1000;
-
-  private final OkHttpClient client;
-  private final HttpUrl agentBaseUrl;
-  private final Recording discoveryTimer;
-  private final ProtocolVersion protocolVersion;
-  private final String[] metricsEndpoints = {V06_METRICS_ENDPOINT};
-  private final String[] configEndpoints = {V07_CONFIG_ENDPOINT};
-  private final boolean metricsEnabled;
-  private final boolean ignoreAgentVersionForStats;
-  private final String[] dataStreamsEndpoints = {V01_DATASTREAMS_ENDPOINT};
-  // ordered from most recent to least recent, as the logic will stick with the first one that is
-  // available
-  private final String[] evpProxyEndpoints = {V4_EVP_PROXY_ENDPOINT, V2_EVP_PROXY_ENDPOINT};
-  private final String[] telemetryProxyEndpoints = {TELEMETRY_PROXY_ENDPOINT};
-
-  private static class State {
-    String traceEndpoint;
-    String metricsEndpoint;
-    String dataStreamsEndpoint;
-    boolean supportsLongRunning;
-    boolean supportsClientSideStats;
-    boolean supportsDropping;
-    String state;
-    String configEndpoint;
-    String debuggerLogEndpoint;
-    String debuggerSnapshotEndpoint;
-    String debuggerDiagnosticsEndpoint;
-    String evpProxyEndpoint;
-    String version;
-    String telemetryProxyEndpoint;
-    Set<String> peerTags = emptySet();
-    String orgPropagationMarker;
-    long lastTimeDiscovered;
-  }
-
-  private volatile State discoveryState;
-
-  public DDAgentFeaturesDiscovery(
-      OkHttpClient client,
-      Monitoring monitoring,
-      HttpUrl agentUrl,
-      ProtocolVersion protocolVersion,
-      boolean metricsEnabled,
-      boolean ignoreAgentVersionForStats) {
-    this.client = client;
-    this.agentBaseUrl = agentUrl;
-    this.metricsEnabled = metricsEnabled;
-    this.ignoreAgentVersionForStats = ignoreAgentVersionForStats;
-    this.protocolVersion = protocolVersion != null ? protocolVersion : V0_4;
-    this.discoveryTimer = monitoring.newTimer("trace.agent.discovery.time");
-    this.discoveryState = new State();
-  }
-
-  /** Run feature discovery, unconditionally. */
-  public void discover() {
-    discoverIfOutdated(0);
-  }
-
-  /** Run feature discovery, if it was not run recently. */
-  public void discoverIfOutdated() {
-    discoverIfOutdated(getFeaturesDiscoveryMinDelayMillis());
-  }
-
-  protected long getFeaturesDiscoveryMinDelayMillis() {
-    return MIN_FEATURE_DISCOVERY_INTERVAL_MILLIS;
-  }
-
-  private synchronized void discoverIfOutdated(final long maxElapsedMs) {
-    final long now = System.currentTimeMillis();
-    final long elapsed = now - discoveryState.lastTimeDiscovered;
-    if (elapsed > maxElapsedMs) {
-      final State newState = new State();
-      doDiscovery(newState);
-      newState.lastTimeDiscovered = now;
-      // swap atomically states
-      discoveryState = newState;
-    }
-  }
-
-  private void doDiscovery(State newState) {
-    // 1. try to fetch info about the agent, if the endpoint is there
-    // 2. try to parse the response, if it can be parsed, finish
-    // 3. fallback if the endpoint couldn't be found or the response couldn't be parsed
-    try (Recording recording = discoveryTimer.start()) {
-      boolean fallback = true;
-      final Request request =
-          prepareRequest(agentBaseUrl.resolve("info"), emptyMap()).get().build();
-      try (Response response = client.newCall(request).execute()) {
-        if (response.isSuccessful()) {
-          processInfoResponseHeaders(response);
-          fallback = !processInfoResponse(newState, response.body().string());
+    private static final Logger log = LoggerFactory.getLogger(DDAgentFeaturesDiscovery.class);
+
+    private static final JsonAdapter<Map<String, Object>> RESPONSE_ADAPTER =
+            new Moshi.Builder().build().adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
+
+    // Currently all the endpoints that we probe expect a msgpack body of an array of arrays, v3/v4
+    // arbitrary size and v5 two elements, so let's give them a two element array of empty arrays
+    private static final byte[] PROBE_MESSAGE = {(byte) FIXARRAY | 2, (byte) FIXARRAY, (byte) FIXARRAY};
+
+    public static final String V03_ENDPOINT = "v0.3/traces";
+    public static final String V04_ENDPOINT = "v0.4/traces";
+    public static final String V05_ENDPOINT = "v0.5/traces";
+    public static final String V1_ENDPOINT = "v1.0/traces";
+
+    public static final String V06_METRICS_ENDPOINT = "v0.6/stats";
+    public static final String V07_CONFIG_ENDPOINT = "v0.7/config";
+
+    public static final String V01_DATASTREAMS_ENDPOINT = "v0.1/pipeline_stats";
+
+    public static final String V2_EVP_PROXY_ENDPOINT = "evp_proxy/v2/";
+    public static final String V4_EVP_PROXY_ENDPOINT = "evp_proxy/v4/";
+
+    public static final String DATADOG_AGENT_STATE = "Datadog-Agent-State";
+
+    public static final String DEBUGGER_ENDPOINT_V1 = "debugger/v1/input";
+    public static final String DEBUGGER_ENDPOINT_V2 = "debugger/v2/input";
+    public static final String DEBUGGER_DIAGNOSTICS_ENDPOINT = "debugger/v1/diagnostics";
+
+    public static final String TELEMETRY_PROXY_ENDPOINT = "telemetry/proxy/";
+
+    private static final long MIN_FEATURE_DISCOVERY_INTERVAL_MILLIS = 60 * 1000;
+
+    private final OkHttpClient client;
+    private final HttpUrl agentBaseUrl;
+    private final Recording discoveryTimer;
+    private final ProtocolVersion protocolVersion;
+    private final String[] metricsEndpoints = {V06_METRICS_ENDPOINT};
+    private final String[] configEndpoints = {V07_CONFIG_ENDPOINT};
+    private final boolean metricsEnabled;
+    private final boolean ignoreAgentVersionForStats;
+    private final String[] dataStreamsEndpoints = {V01_DATASTREAMS_ENDPOINT};
+    // ordered from most recent to least recent, as the logic will stick with the first one that is
+    // available
+    private final String[] evpProxyEndpoints = {V4_EVP_PROXY_ENDPOINT, V2_EVP_PROXY_ENDPOINT};
+    private final String[] telemetryProxyEndpoints = {TELEMETRY_PROXY_ENDPOINT};
+
+    private static class State {
+        String traceEndpoint;
+        String metricsEndpoint;
+        String dataStreamsEndpoint;
+        boolean supportsLongRunning;
+        boolean supportsClientSideStats;
+        boolean supportsDropping;
+        String state;
+        String configEndpoint;
+        String debuggerLogEndpoint;
+        String debuggerSnapshotEndpoint;
+        String debuggerDiagnosticsEndpoint;
+        String evpProxyEndpoint;
+        String version;
+        String telemetryProxyEndpoint;
+        Set<String> peerTags = emptySet();
+        String orgPropagationMarker;
+        long lastTimeDiscovered;
+    }
+
+    private volatile State discoveryState;
+
+    public DDAgentFeaturesDiscovery(
+            OkHttpClient client,
+            Monitoring monitoring,
+            HttpUrl agentUrl,
+            ProtocolVersion protocolVersion,
+            boolean metricsEnabled,
+            boolean ignoreAgentVersionForStats) {
+        this.client = client;
+        this.agentBaseUrl = agentUrl;
+        this.metricsEnabled = metricsEnabled;
+        this.ignoreAgentVersionForStats = ignoreAgentVersionForStats;
+        this.protocolVersion = protocolVersion != null ? protocolVersion : V0_4;
+        this.discoveryTimer = monitoring.newTimer("trace.agent.discovery.time");
+        this.discoveryState = new State();
+    }
+
+    /** Run feature discovery, unconditionally. */
+    public void discover() {
+        discoverIfOutdated(0);
+    }
+
+    /** Run feature discovery, if it was not run recently. */
+    public void discoverIfOutdated() {
+        discoverIfOutdated(getFeaturesDiscoveryMinDelayMillis());
+    }
+
+    protected long getFeaturesDiscoveryMinDelayMillis() {
+        return MIN_FEATURE_DISCOVERY_INTERVAL_MILLIS;
+    }
+
+    private synchronized void discoverIfOutdated(final long maxElapsedMs) {
+        final long now = System.currentTimeMillis();
+        final long elapsed = now - discoveryState.lastTimeDiscovered;
+        if (elapsed > maxElapsedMs) {
+            final State newState = new State();
+            doDiscovery(newState);
+            newState.lastTimeDiscovered = now;
+            // swap atomically states
+            discoveryState = newState;
         }
-      } catch (Throwable error) {
-        errorQueryingEndpoint("info", error);
-      }
-      if (fallback) {
-        newState.supportsClientSideStats = false;
-        newState.supportsLongRunning = false;
-        log.debug("Falling back to probing, client dropping will be disabled");
-        // disable metrics unless the info endpoint is present, which prevents
-        // sending metrics to 7.26.0, which has a bug in reporting metric origin
-        newState.metricsEndpoint = null;
-      }
-
-      // don't want to rewire the traces pipeline
-      if (null == newState.traceEndpoint) {
-        newState.traceEndpoint = probeTracesEndpoint(newState, protocolVersion.endpointsToProbe());
-      } else if (newState.state == null || newState.state.isEmpty()) {
-        // Still need to probe so that state is correctly assigned
-        probeTracesEndpoint(newState, singletonList(newState.traceEndpoint));
-      }
-    }
-
-    if (log.isDebugEnabled()) {
-      log.debug(
-          "discovered traceEndpoint={}, metricsEndpoint={}, supportsDropping={}, supportsClientSideStats={}, supportsLongRunning={}, dataStreamsEndpoint={}, configEndpoint={}, logEndpoint={}, snapshotEndpoint={}, diagnosticsEndpoint={}, evpProxyEndpoint={}, telemetryProxyEndpoint={}",
-          newState.traceEndpoint,
-          newState.metricsEndpoint,
-          newState.supportsDropping,
-          newState.supportsClientSideStats,
-          newState.supportsLongRunning,
-          newState.dataStreamsEndpoint,
-          newState.configEndpoint,
-          newState.debuggerLogEndpoint,
-          newState.debuggerSnapshotEndpoint,
-          newState.debuggerDiagnosticsEndpoint,
-          newState.evpProxyEndpoint,
-          newState.telemetryProxyEndpoint);
-    }
-  }
-
-  private String probeTracesEndpoint(State newState, List<String> endpoints) {
-    for (String candidate : endpoints) {
-      try (Response response =
-          client
-              .newCall(
-                  prepareRequest(agentBaseUrl.resolve(candidate), emptyMap())
-                      .put(msgpackRequestBodyOf(singletonList(ByteBuffer.wrap(PROBE_MESSAGE))))
-                      .build())
-              .execute()) {
-        if (response.code() != 404) {
-          newState.state = response.header(DATADOG_AGENT_STATE);
-          return candidate;
+    }
+
+    private void doDiscovery(State newState) {
+        // 1. try to fetch info about the agent, if the endpoint is there
+        // 2. try to parse the response, if it can be parsed, finish
+        // 3. fallback if the endpoint couldn't be found or the response couldn't be parsed
+        try (Recording recording = discoveryTimer.start()) {
+            boolean fallback = true;
+            final Request request = prepareRequest(agentBaseUrl.resolve("info"), emptyMap())
+                    .get()
+                    .build();
+            try (Response response = client.newCall(request).execute()) {
+                if (response.isSuccessful()) {
+                    processInfoResponseHeaders(response);
+                    fallback = !processInfoResponse(newState, response.body().string());
+                }
+            } catch (Throwable error) {
+                errorQueryingEndpoint("info", error);
+            }
+            if (fallback) {
+                newState.supportsClientSideStats = false;
+                newState.supportsLongRunning = false;
+                log.debug("Falling back to probing, client dropping will be disabled");
+                // disable metrics unless the info endpoint is present, which prevents
+                // sending metrics to 7.26.0, which has a bug in reporting metric origin
+                newState.metricsEndpoint = null;
+            }
+
+            // don't want to rewire the traces pipeline
+            if (null == newState.traceEndpoint) {
+                newState.traceEndpoint = probeTracesEndpoint(newState, protocolVersion.endpointsToProbe());
+            } else if (newState.state == null || newState.state.isEmpty()) {
+                // Still need to probe so that state is correctly assigned
+                probeTracesEndpoint(newState, singletonList(newState.traceEndpoint));
+            }
         }
-      } catch (Throwable e) {
-        errorQueryingEndpoint(candidate, e);
-      }
-    }
-    return V03_ENDPOINT;
-  }
-
-  private void processInfoResponseHeaders(Response response) {
-    String newContainerTagsHash = response.header(DATADOG_CONTAINER_TAGS_HASH);
-    if (newContainerTagsHash != null) {
-      ContainerInfo containerInfo = ContainerInfo.get();
-      synchronized (containerInfo) {
-        if (!newContainerTagsHash.equals(containerInfo.getContainerTagsHash())) {
-          containerInfo.setContainerTagsHash(newContainerTagsHash);
-          BaseHash.recalcBaseHash(newContainerTagsHash);
+
+        if (log.isDebugEnabled()) {
+            log.debug(
+                    "discovered traceEndpoint={}, metricsEndpoint={}, supportsDropping={}, supportsClientSideStats={}, supportsLongRunning={}, dataStreamsEndpoint={}, configEndpoint={}, logEndpoint={}, snapshotEndpoint={}, diagnosticsEndpoint={}, evpProxyEndpoint={}, telemetryProxyEndpoint={}",
+                    newState.traceEndpoint,
+                    newState.metricsEndpoint,
+                    newState.supportsDropping,
+                    newState.supportsClientSideStats,
+                    newState.supportsLongRunning,
+                    newState.dataStreamsEndpoint,
+                    newState.configEndpoint,
+                    newState.debuggerLogEndpoint,
+                    newState.debuggerSnapshotEndpoint,
+                    newState.debuggerDiagnosticsEndpoint,
+                    newState.evpProxyEndpoint,
+                    newState.telemetryProxyEndpoint);
         }
-      }
     }
-  }
 
-  @SuppressWarnings("unchecked")
-  private boolean processInfoResponse(State newState, String response) {
-    try {
-      Map<String, Object> map = RESPONSE_ADAPTER.fromJson(response);
-      final Object endpointObj = map.get("endpoints");
-      if (!(endpointObj instanceof List)) {
-        log.debug("Bad response received from the agent. Ignoring it.");
-        return false;
-      }
-      discoverStatsDPort(map);
-      newState.version = (String) map.get("version");
-      Set<String> endpoints = new HashSet<>((List<String>) endpointObj);
-
-      String foundMetricsEndpoint = null;
-      if (metricsEnabled) {
-        for (String endpoint : metricsEndpoints) {
-          if (containsEndpoint(endpoints, endpoint)) {
-            foundMetricsEndpoint = endpoint;
-            break;
-          }
+    private String probeTracesEndpoint(State newState, List<String> endpoints) {
+        for (String candidate : endpoints) {
+            try (Response response = client.newCall(prepareRequest(agentBaseUrl.resolve(candidate), emptyMap())
+                            .put(msgpackRequestBodyOf(singletonList(ByteBuffer.wrap(PROBE_MESSAGE))))
+                            .build())
+                    .execute()) {
+                if (response.code() != 404) {
+                    newState.state = response.header(DATADOG_AGENT_STATE);
+                    return candidate;
+                }
+            } catch (Throwable e) {
+                errorQueryingEndpoint(candidate, e);
+            }
         }
-      }
+        return V03_ENDPOINT;
+    }
 
-      // This is done outside of the loop to set metricsEndpoint to null if not found
-      newState.metricsEndpoint = foundMetricsEndpoint;
+    private void processInfoResponseHeaders(Response response) {
+        String newContainerTagsHash = response.header(DATADOG_CONTAINER_TAGS_HASH);
+        if (newContainerTagsHash != null) {
+            ContainerInfo containerInfo = ContainerInfo.get();
+            synchronized (containerInfo) {
+                if (!newContainerTagsHash.equals(containerInfo.getContainerTagsHash())) {
+                    containerInfo.setContainerTagsHash(newContainerTagsHash);
+                    BaseHash.recalcBaseHash(newContainerTagsHash);
+                }
+            }
+        }
+    }
 
-      for (String endpoint : protocolVersion.endpointsToProbe()) {
-        if (containsEndpoint(endpoints, endpoint)) {
-          newState.traceEndpoint = endpoint;
-          break;
+    @SuppressWarnings("unchecked")
+    private boolean processInfoResponse(State newState, String response) {
+        try {
+            Map<String, Object> map = RESPONSE_ADAPTER.fromJson(response);
+            final Object endpointObj = map.get("endpoints");
+            if (!(endpointObj instanceof List)) {
+                log.debug("Bad response received from the agent. Ignoring it.");
+                return false;
+            }
+            discoverStatsDPort(map);
+            newState.version = (String) map.get("version");
+            Set<String> endpoints = new HashSet<>((List<String>) endpointObj);
+
+            String foundMetricsEndpoint = null;
+            if (metricsEnabled) {
+                for (String endpoint : metricsEndpoints) {
+                    if (containsEndpoint(endpoints, endpoint)) {
+                        foundMetricsEndpoint = endpoint;
+                        break;
+                    }
+                }
+            }
+
+            // This is done outside of the loop to set metricsEndpoint to null if not found
+            newState.metricsEndpoint = foundMetricsEndpoint;
+
+            for (String endpoint : protocolVersion.endpointsToProbe()) {
+                if (containsEndpoint(endpoints, endpoint)) {
+                    newState.traceEndpoint = endpoint;
+                    break;
+                }
+            }
+
+            for (String endpoint : configEndpoints) {
+                if (containsEndpoint(endpoints, endpoint)) {
+                    newState.configEndpoint = endpoint;
+                    break;
+                }
+            }
+
+            setDebuggerEndpoints(newState, endpoints);
+
+            for (String endpoint : dataStreamsEndpoints) {
+                if (containsEndpoint(endpoints, endpoint)) {
+                    newState.dataStreamsEndpoint = endpoint;
+                    break;
+                }
+            }
+
+            for (String endpoint : evpProxyEndpoints) {
+                if (containsEndpoint(endpoints, endpoint)) {
+                    newState.evpProxyEndpoint = endpoint;
+                    break;
+                }
+            }
+
+            for (String endpoint : telemetryProxyEndpoints) {
+                if (containsEndpoint(endpoints, endpoint)) {
+                    newState.telemetryProxyEndpoint = endpoint;
+                    break;
+                }
+            }
+
+            newState.supportsLongRunning = Boolean.TRUE.equals(map.getOrDefault("long_running_spans", false));
+
+            if (metricsEnabled) {
+                Object canDrop = map.get("client_drop_p0s");
+                newState.supportsDropping = null != canDrop
+                        && ("true".equalsIgnoreCase(String.valueOf(canDrop)) || Boolean.TRUE.equals(canDrop));
+
+                newState.supportsClientSideStats = newState.supportsDropping
+                        && (ignoreAgentVersionForStats || !AgentVersion.isVersionBelow(newState.version, 7, 65, 0));
+
+                Object peer_tags = map.get("peer_tags");
+                newState.peerTags = peer_tags instanceof List
+                        ? unmodifiableSet(new HashSet<>((List<String>) peer_tags))
+                        : emptySet();
+            }
+            Object opm = map.get("org_prop_marker");
+            newState.orgPropagationMarker = (opm instanceof String) ? (String) opm : null;
+            try {
+                newState.state = Strings.sha256(response);
+            } catch (Throwable ex) {
+                log.debug("Failed to hash trace agent /info response. Will probe {}", newState.traceEndpoint, ex);
+            }
+            return true;
+        } catch (Throwable error) {
+            log.debug("Error parsing trace agent /info response", error);
         }
-      }
+        return false;
+    }
 
-      for (String endpoint : configEndpoints) {
-        if (containsEndpoint(endpoints, endpoint)) {
-          newState.configEndpoint = endpoint;
-          break;
+    private static void setDebuggerEndpoints(State newState, Set<String> endpoints) {
+        // both debugger v2 and diagnostics endpoints are forwarding events to the DEBUGGER intake
+        // because older agents support diagnostics from DD agent 7.49
+        if (containsEndpoint(endpoints, DEBUGGER_ENDPOINT_V2)) {
+            newState.debuggerLogEndpoint = DEBUGGER_ENDPOINT_V2;
+        } else if (containsEndpoint(endpoints, DEBUGGER_DIAGNOSTICS_ENDPOINT)) {
+            newState.debuggerLogEndpoint = DEBUGGER_DIAGNOSTICS_ENDPOINT;
+        } else if (containsEndpoint(endpoints, DEBUGGER_ENDPOINT_V1)) {
+            newState.debuggerLogEndpoint = DEBUGGER_ENDPOINT_V1;
+        }
+        if (containsEndpoint(endpoints, DEBUGGER_ENDPOINT_V2)) {
+            newState.debuggerSnapshotEndpoint = DEBUGGER_ENDPOINT_V2;
+        } else if (containsEndpoint(endpoints, DEBUGGER_DIAGNOSTICS_ENDPOINT)) {
+            newState.debuggerSnapshotEndpoint = DEBUGGER_DIAGNOSTICS_ENDPOINT;
         }
-      }
+        if (containsEndpoint(endpoints, DEBUGGER_DIAGNOSTICS_ENDPOINT)) {
+            newState.debuggerDiagnosticsEndpoint = DEBUGGER_DIAGNOSTICS_ENDPOINT;
+        }
+    }
 
-      setDebuggerEndpoints(newState, endpoints);
+    private static boolean containsEndpoint(Set<String> endpoints, String endpoint) {
+        return endpoints.contains(endpoint) || endpoints.contains("/" + endpoint);
+    }
 
-      for (String endpoint : dataStreamsEndpoints) {
-        if (containsEndpoint(endpoints, endpoint)) {
-          newState.dataStreamsEndpoint = endpoint;
-          break;
+    @SuppressWarnings("unchecked")
+    private static void discoverStatsDPort(final Map<String, Object> info) {
+        try {
+            Map<String, ?> config = (Map<String, ?>) info.get("config");
+            if (config == null) {
+                log.debug("config missing from trace agent /info response");
+                return;
+            }
+            final Object statsdPortObj = config.get("statsd_port");
+            if (statsdPortObj == null) {
+                log.debug("statsd_port missing from trace agent /info response");
+                return;
+            }
+            int statsdPort = ((Number) statsdPortObj).intValue();
+            DDAgentStatsDClientManager.setDefaultStatsDPort(statsdPort);
+        } catch (Throwable ex) {
+            log.debug("statsd_port missing from trace agent /info response", ex);
         }
-      }
+    }
 
-      for (String endpoint : evpProxyEndpoints) {
-        if (containsEndpoint(endpoints, endpoint)) {
-          newState.evpProxyEndpoint = endpoint;
-          break;
-        }
-      }
+    public boolean supportsMetrics() {
+        return metricsEnabled && null != discoveryState.metricsEndpoint && discoveryState.supportsClientSideStats;
+    }
 
-      for (String endpoint : telemetryProxyEndpoints) {
-        if (containsEndpoint(endpoints, endpoint)) {
-          newState.telemetryProxyEndpoint = endpoint;
-          break;
-        }
-      }
-
-      newState.supportsLongRunning =
-          Boolean.TRUE.equals(map.getOrDefault("long_running_spans", false));
-
-      if (metricsEnabled) {
-        Object canDrop = map.get("client_drop_p0s");
-        newState.supportsDropping =
-            null != canDrop
-                && ("true".equalsIgnoreCase(String.valueOf(canDrop))
-                    || Boolean.TRUE.equals(canDrop));
-
-        newState.supportsClientSideStats =
-            newState.supportsDropping
-                && (ignoreAgentVersionForStats
-                    || !AgentVersion.isVersionBelow(newState.version, 7, 65, 0));
-
-        Object peer_tags = map.get("peer_tags");
-        newState.peerTags =
-            peer_tags instanceof List
-                ? unmodifiableSet(new HashSet<>((List<String>) peer_tags))
-                : emptySet();
-      }
-      Object opm = map.get("org_prop_marker");
-      newState.orgPropagationMarker = (opm instanceof String) ? (String) opm : null;
-      try {
-        newState.state = Strings.sha256(response);
-      } catch (Throwable ex) {
-        log.debug(
-            "Failed to hash trace agent /info response. Will probe {}", newState.traceEndpoint, ex);
-      }
-      return true;
-    } catch (Throwable error) {
-      log.debug("Error parsing trace agent /info response", error);
-    }
-    return false;
-  }
-
-  private static void setDebuggerEndpoints(State newState, Set<String> endpoints) {
-    // both debugger v2 and diagnostics endpoints are forwarding events to the DEBUGGER intake
-    // because older agents support diagnostics from DD agent 7.49
-    if (containsEndpoint(endpoints, DEBUGGER_ENDPOINT_V2)) {
-      newState.debuggerLogEndpoint = DEBUGGER_ENDPOINT_V2;
-    } else if (containsEndpoint(endpoints, DEBUGGER_DIAGNOSTICS_ENDPOINT)) {
-      newState.debuggerLogEndpoint = DEBUGGER_DIAGNOSTICS_ENDPOINT;
-    } else if (containsEndpoint(endpoints, DEBUGGER_ENDPOINT_V1)) {
-      newState.debuggerLogEndpoint = DEBUGGER_ENDPOINT_V1;
-    }
-    if (containsEndpoint(endpoints, DEBUGGER_ENDPOINT_V2)) {
-      newState.debuggerSnapshotEndpoint = DEBUGGER_ENDPOINT_V2;
-    } else if (containsEndpoint(endpoints, DEBUGGER_DIAGNOSTICS_ENDPOINT)) {
-      newState.debuggerSnapshotEndpoint = DEBUGGER_DIAGNOSTICS_ENDPOINT;
-    }
-    if (containsEndpoint(endpoints, DEBUGGER_DIAGNOSTICS_ENDPOINT)) {
-      newState.debuggerDiagnosticsEndpoint = DEBUGGER_DIAGNOSTICS_ENDPOINT;
-    }
-  }
-
-  private static boolean containsEndpoint(Set<String> endpoints, String endpoint) {
-    return endpoints.contains(endpoint) || endpoints.contains("/" + endpoint);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static void discoverStatsDPort(final Map<String, Object> info) {
-    try {
-      Map<String, ?> config = (Map<String, ?>) info.get("config");
-      if (config == null) {
-        log.debug("config missing from trace agent /info response");
-        return;
-      }
-      final Object statsdPortObj = config.get("statsd_port");
-      if (statsdPortObj == null) {
-        log.debug("statsd_port missing from trace agent /info response");
-        return;
-      }
-      int statsdPort = ((Number) statsdPortObj).intValue();
-      DDAgentStatsDClientManager.setDefaultStatsDPort(statsdPort);
-    } catch (Throwable ex) {
-      log.debug("statsd_port missing from trace agent /info response", ex);
-    }
-  }
-
-  public boolean supportsMetrics() {
-    return metricsEnabled
-        && null != discoveryState.metricsEndpoint
-        && discoveryState.supportsClientSideStats;
-  }
-
-  public boolean supportsDebugger() {
-    return discoveryState.debuggerLogEndpoint != null;
-  }
-
-  public String getDebuggerSnapshotEndpoint() {
-    return discoveryState.debuggerSnapshotEndpoint;
-  }
-
-  public String getDebuggerLogEndpoint() {
-    return discoveryState.debuggerLogEndpoint;
-  }
-
-  public boolean supportsDebuggerDiagnostics() {
-    return discoveryState.debuggerDiagnosticsEndpoint != null;
-  }
-
-  public boolean supportsLongRunning() {
-    return discoveryState.supportsLongRunning;
-  }
-
-  public Set<String> peerTags() {
-    return discoveryState.peerTags;
-  }
-
-  public String getMetricsEndpoint() {
-    return discoveryState.metricsEndpoint;
-  }
-
-  public String getTraceEndpoint() {
-    return discoveryState.traceEndpoint;
-  }
-
-  public String getDataStreamsEndpoint() {
-    return discoveryState.dataStreamsEndpoint;
-  }
-
-  public String getEvpProxyEndpoint() {
-    return discoveryState.evpProxyEndpoint;
-  }
-
-  public HttpUrl buildUrl(String endpoint) {
-    return agentBaseUrl.resolve(endpoint);
-  }
-
-  public boolean supportsDataStreams() {
-    return discoveryState.dataStreamsEndpoint != null;
-  }
-
-  public boolean supportsEvpProxy() {
-    return discoveryState.evpProxyEndpoint != null;
-  }
-
-  public boolean supportsContentEncodingHeadersWithEvpProxy() {
-    // content encoding headers are supported in /v4 and above
-    final String evpProxyEndpoint = discoveryState.evpProxyEndpoint;
-    return evpProxyEndpoint != null && V4_EVP_PROXY_ENDPOINT.compareTo(evpProxyEndpoint) <= 0;
-  }
-
-  public String getConfigEndpoint() {
-    return discoveryState.configEndpoint;
-  }
-
-  public String getVersion() {
-    return discoveryState.version;
-  }
-
-  private void errorQueryingEndpoint(String endpoint, Throwable t) {
-    log.debug(LogCollector.EXCLUDE_TELEMETRY, "Error querying {} at {}", endpoint, agentBaseUrl, t);
-  }
-
-  public String state() {
-    return discoveryState.state;
-  }
-
-  public String getOrgPropagationMarker() {
-    return discoveryState.orgPropagationMarker;
-  }
-
-  @Override
-  public boolean active() {
-    return supportsMetrics();
-  }
-
-  public boolean supportsTelemetryProxy() {
-    return discoveryState.telemetryProxyEndpoint != null;
-  }
+    public boolean supportsDebugger() {
+        return discoveryState.debuggerLogEndpoint != null;
+    }
+
+    public String getDebuggerSnapshotEndpoint() {
+        return discoveryState.debuggerSnapshotEndpoint;
+    }
+
+    public String getDebuggerLogEndpoint() {
+        return discoveryState.debuggerLogEndpoint;
+    }
+
+    public boolean supportsDebuggerDiagnostics() {
+        return discoveryState.debuggerDiagnosticsEndpoint != null;
+    }
+
+    public boolean supportsLongRunning() {
+        return discoveryState.supportsLongRunning;
+    }
+
+    public Set<String> peerTags() {
+        return discoveryState.peerTags;
+    }
+
+    public String getMetricsEndpoint() {
+        return discoveryState.metricsEndpoint;
+    }
+
+    public String getTraceEndpoint() {
+        return discoveryState.traceEndpoint;
+    }
+
+    public String getDataStreamsEndpoint() {
+        return discoveryState.dataStreamsEndpoint;
+    }
+
+    public String getEvpProxyEndpoint() {
+        return discoveryState.evpProxyEndpoint;
+    }
+
+    public HttpUrl buildUrl(String endpoint) {
+        return agentBaseUrl.resolve(endpoint);
+    }
+
+    public boolean supportsDataStreams() {
+        return discoveryState.dataStreamsEndpoint != null;
+    }
+
+    public boolean supportsEvpProxy() {
+        return discoveryState.evpProxyEndpoint != null;
+    }
+
+    public boolean supportsContentEncodingHeadersWithEvpProxy() {
+        // content encoding headers are supported in /v4 and above
+        final String evpProxyEndpoint = discoveryState.evpProxyEndpoint;
+        return evpProxyEndpoint != null && V4_EVP_PROXY_ENDPOINT.compareTo(evpProxyEndpoint) <= 0;
+    }
+
+    public String getConfigEndpoint() {
+        return discoveryState.configEndpoint;
+    }
+
+    public String getVersion() {
+        return discoveryState.version;
+    }
+
+    private void errorQueryingEndpoint(String endpoint, Throwable t) {
+        log.debug(LogCollector.EXCLUDE_TELEMETRY, "Error querying {} at {}", endpoint, agentBaseUrl, t);
+    }
+
+    public String state() {
+        return discoveryState.state;
+    }
+
+    public String getOrgPropagationMarker() {
+        return discoveryState.orgPropagationMarker;
+    }
+
+    @Override
+    public boolean active() {
+        return supportsMetrics();
+    }
+
+    public boolean supportsTelemetryProxy() {
+        return discoveryState.telemetryProxyEndpoint != null;
+    }
 }
diff --git a/communication/src/main/java/datadog/communication/ddagent/DroppingPolicy.java b/communication/src/main/java/datadog/communication/ddagent/DroppingPolicy.java
index 2e6e26141ce..acc2b9ffaf5 100644
--- a/communication/src/main/java/datadog/communication/ddagent/DroppingPolicy.java
+++ b/communication/src/main/java/datadog/communication/ddagent/DroppingPolicy.java
@@ -2,15 +2,15 @@
 
 public interface DroppingPolicy {
 
-  DroppingPolicy DISABLED = new DisabledDroppingPolicy();
+    DroppingPolicy DISABLED = new DisabledDroppingPolicy();
 
-  boolean active();
+    boolean active();
 
-  class DisabledDroppingPolicy implements DroppingPolicy {
+    class DisabledDroppingPolicy implements DroppingPolicy {
 
-    @Override
-    public boolean active() {
-      return false;
+        @Override
+        public boolean active() {
+            return false;
+        }
     }
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/ddagent/ExternalAgentLauncher.java b/communication/src/main/java/datadog/communication/ddagent/ExternalAgentLauncher.java
index 8eea13de224..aa12e57dcd1 100644
--- a/communication/src/main/java/datadog/communication/ddagent/ExternalAgentLauncher.java
+++ b/communication/src/main/java/datadog/communication/ddagent/ExternalAgentLauncher.java
@@ -14,101 +14,96 @@
 import org.slf4j.LoggerFactory;
 
 public class ExternalAgentLauncher implements Closeable {
-  private static final Logger log = LoggerFactory.getLogger(ExternalAgentLauncher.class);
-
-  private static final ProcessBuilder.Redirect DISCARD =
-      ProcessBuilder.Redirect.to(new File((OperatingSystem.isWindows() ? "NUL" : "/dev/null")));
-
-  private ProcessSupervisor traceProcessSupervisor;
-  private ProcessSupervisor dogStatsDProcessSupervisor;
-
-  public ExternalAgentLauncher(Config config) {
-    if (config.isAzureAppServices()) {
-      if (config.getTraceAgentPath() != null) {
-        ProcessBuilder traceProcessBuilder = new ProcessBuilder(config.getTraceAgentPath());
-        traceProcessBuilder.redirectOutput(DISCARD);
-        traceProcessBuilder.redirectError(DISCARD);
-        traceProcessBuilder.command().addAll(config.getTraceAgentArgs());
-
-        traceProcessSupervisor =
-            new ProcessSupervisor(
-                "trace-agent", traceProcessBuilder, healthCheck(config.getAgentNamedPipe()));
-      } else {
-        log.warn("Trace agent path not set. Will not start trace agent process");
-      }
-
-      if (config.getDogStatsDPath() != null) {
-        ProcessBuilder dogStatsDProcessBuilder = new ProcessBuilder(config.getDogStatsDPath());
-        dogStatsDProcessBuilder.redirectOutput(DISCARD);
-        dogStatsDProcessBuilder.redirectError(DISCARD);
-        dogStatsDProcessBuilder.command().addAll(config.getDogStatsDArgs());
-
-        dogStatsDProcessSupervisor =
-            new ProcessSupervisor(
-                "dogstatsd", dogStatsDProcessBuilder, healthCheck(config.getDogStatsDNamedPipe()));
-      } else {
-        log.warn("DogStatsD path not set. Will not start DogStatsD process");
-      }
+    private static final Logger log = LoggerFactory.getLogger(ExternalAgentLauncher.class);
+
+    private static final ProcessBuilder.Redirect DISCARD =
+            ProcessBuilder.Redirect.to(new File((OperatingSystem.isWindows() ? "NUL" : "/dev/null")));
+
+    private ProcessSupervisor traceProcessSupervisor;
+    private ProcessSupervisor dogStatsDProcessSupervisor;
+
+    public ExternalAgentLauncher(Config config) {
+        if (config.isAzureAppServices()) {
+            if (config.getTraceAgentPath() != null) {
+                ProcessBuilder traceProcessBuilder = new ProcessBuilder(config.getTraceAgentPath());
+                traceProcessBuilder.redirectOutput(DISCARD);
+                traceProcessBuilder.redirectError(DISCARD);
+                traceProcessBuilder.command().addAll(config.getTraceAgentArgs());
+
+                traceProcessSupervisor = new ProcessSupervisor(
+                        "trace-agent", traceProcessBuilder, healthCheck(config.getAgentNamedPipe()));
+            } else {
+                log.warn("Trace agent path not set. Will not start trace agent process");
+            }
+
+            if (config.getDogStatsDPath() != null) {
+                ProcessBuilder dogStatsDProcessBuilder = new ProcessBuilder(config.getDogStatsDPath());
+                dogStatsDProcessBuilder.redirectOutput(DISCARD);
+                dogStatsDProcessBuilder.redirectError(DISCARD);
+                dogStatsDProcessBuilder.command().addAll(config.getDogStatsDArgs());
+
+                dogStatsDProcessSupervisor = new ProcessSupervisor(
+                        "dogstatsd", dogStatsDProcessBuilder, healthCheck(config.getDogStatsDNamedPipe()));
+            } else {
+                log.warn("DogStatsD path not set. Will not start DogStatsD process");
+            }
+        }
     }
-  }
 
-  @Override
-  public void close() {
-    if (traceProcessSupervisor != null) {
-      traceProcessSupervisor.close();
-    }
+    @Override
+    public void close() {
+        if (traceProcessSupervisor != null) {
+            traceProcessSupervisor.close();
+        }
 
-    if (dogStatsDProcessSupervisor != null) {
-      dogStatsDProcessSupervisor.close();
+        if (dogStatsDProcessSupervisor != null) {
+            dogStatsDProcessSupervisor.close();
+        }
     }
-  }
 
-  private static ProcessSupervisor.HealthCheck healthCheck(String pipeName) {
-    return null != pipeName && !pipeName.trim().isEmpty()
-        ? new NamedPipeHealthCheck(pipeName)
-        : ALWAYS_READY;
-  }
+    private static ProcessSupervisor.HealthCheck healthCheck(String pipeName) {
+        return null != pipeName && !pipeName.trim().isEmpty() ? new NamedPipeHealthCheck(pipeName) : ALWAYS_READY;
+    }
 
-  static final class NamedPipeHealthCheck implements ProcessSupervisor.HealthCheck {
-    private static final String NAMED_PIPE_PREFIX = "\\\\.\\pipe\\";
+    static final class NamedPipeHealthCheck implements ProcessSupervisor.HealthCheck {
+        private static final String NAMED_PIPE_PREFIX = "\\\\.\\pipe\\";
 
-    private final File pipe;
+        private final File pipe;
 
-    NamedPipeHealthCheck(String pipeName) {
-      if (pipeName.startsWith(NAMED_PIPE_PREFIX)) {
-        this.pipe = new File(pipeName);
-      } else {
-        this.pipe = new File(NAMED_PIPE_PREFIX + pipeName);
-      }
-    }
+        NamedPipeHealthCheck(String pipeName) {
+            if (pipeName.startsWith(NAMED_PIPE_PREFIX)) {
+                this.pipe = new File(pipeName);
+            } else {
+                this.pipe = new File(NAMED_PIPE_PREFIX + pipeName);
+            }
+        }
 
-    @Override
-    public ProcessSupervisor.Health run(ProcessSupervisor.Health previousHealth)
-        throws InterruptedException {
+        @Override
+        public ProcessSupervisor.Health run(ProcessSupervisor.Health previousHealth) throws InterruptedException {
 
-      // first-time round do a more detailed check for existing bound named-pipe
-      if (previousHealth == NEVER_CHECKED) {
+            // first-time round do a more detailed check for existing bound named-pipe
+            if (previousHealth == NEVER_CHECKED) {
 
-        double delayMillis = 50;
-        for (int retries = 0; retries < 7; retries++) {
-          if (!pipe.exists()) {
-            return READY_TO_START; // no longer bound, start our own external process
-          }
+                double delayMillis = 50;
+                for (int retries = 0; retries < 7; retries++) {
+                    if (!pipe.exists()) {
+                        return READY_TO_START; // no longer bound, start our own external process
+                    }
 
-          // check at increasing intervals to make sure it's bound to a healthy process
-          Thread.sleep((long) delayMillis);
-          delayMillis = delayMillis * 1.75;
-        }
+                    // check at increasing intervals to make sure it's bound to a healthy process
+                    Thread.sleep((long) delayMillis);
+                    delayMillis = delayMillis * 1.75;
+                }
 
-        return HEALTHY; // use existing external process
-      }
+                return HEALTHY; // use existing external process
+            }
 
-      // otherwise just check that the pipe is still bound
-      if (pipe.exists()) {
-        return HEALTHY; // keep using external process
-      } else {
-        return READY_TO_START; // start our own process
-      }
+            // otherwise just check that the pipe is still bound
+            if (pipe.exists()) {
+                return HEALTHY; // keep using external process
+            } else {
+                return READY_TO_START; // start our own process
+            }
+        }
     }
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/ddagent/NoopFeaturesDiscovery.java b/communication/src/main/java/datadog/communication/ddagent/NoopFeaturesDiscovery.java
index 41c04b9cc94..4dac6fe09dd 100644
--- a/communication/src/main/java/datadog/communication/ddagent/NoopFeaturesDiscovery.java
+++ b/communication/src/main/java/datadog/communication/ddagent/NoopFeaturesDiscovery.java
@@ -11,15 +11,15 @@
  * network I/O.
  */
 public class NoopFeaturesDiscovery extends DDAgentFeaturesDiscovery {
-  public static final NoopFeaturesDiscovery INSTANCE = new NoopFeaturesDiscovery();
+    public static final NoopFeaturesDiscovery INSTANCE = new NoopFeaturesDiscovery();
 
-  private NoopFeaturesDiscovery() {
-    super(null, Monitoring.DISABLED, null, V0_4, false, false);
-  }
+    private NoopFeaturesDiscovery() {
+        super(null, Monitoring.DISABLED, null, V0_4, false, false);
+    }
 
-  @Override
-  public void discover() {}
+    @Override
+    public void discover() {}
 
-  @Override
-  public void discoverIfOutdated() {}
+    @Override
+    public void discoverIfOutdated() {}
 }
diff --git a/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java b/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java
index 73e9fbc037c..3b991887382 100644
--- a/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java
+++ b/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java
@@ -24,256 +24,248 @@
 import org.slf4j.LoggerFactory;
 
 public class SharedCommunicationObjects {
-  private static final Logger log = LoggerFactory.getLogger(SharedCommunicationObjects.class);
+    private static final Logger log = LoggerFactory.getLogger(SharedCommunicationObjects.class);
 
-  private static final String X_DATADOG_TEST_SESSION_TOKEN = "X-Datadog-Test-Session-Token";
+    private static final String X_DATADOG_TEST_SESSION_TOKEN = "X-Datadog-Test-Session-Token";
 
-  private final List<Runnable> pausedComponents = new ArrayList<>();
-  private volatile boolean paused;
+    private final List<Runnable> pausedComponents = new ArrayList<>();
+    private volatile boolean paused;
 
-  /**
-   * HTTP client for making requests to Datadog agent. Depending on configuration, this client may
-   * use regular HTTP, UDS or named pipe.
-   */
-  @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
-  public OkHttpClient agentHttpClient;
+    /**
+     * HTTP client for making requests to Datadog agent. Depending on configuration, this client may
+     * use regular HTTP, UDS or named pipe.
+     */
+    @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
+    public OkHttpClient agentHttpClient;
 
-  /**
-   * HTTP client for making requests directly to Datadog backend. Unlike {@link #agentHttpClient},
-   * this client is not configured to use UDS or named pipe.
-   */
-  private volatile OkHttpClient intakeHttpClient;
+    /**
+     * HTTP client for making requests directly to Datadog backend. Unlike {@link #agentHttpClient},
+     * this client is not configured to use UDS or named pipe.
+     */
+    private volatile OkHttpClient intakeHttpClient;
 
-  @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
-  public long httpClientTimeout;
+    @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
+    public long httpClientTimeout;
 
-  @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
-  public boolean forceClearTextHttpForIntakeClient;
+    @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
+    public boolean forceClearTextHttpForIntakeClient;
 
-  @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
-  public HttpUrl agentUrl;
+    @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
+    public HttpUrl agentUrl;
 
-  @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
-  public Monitoring monitoring;
+    @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
+    public Monitoring monitoring;
 
-  private volatile DDAgentFeaturesDiscovery featuresDiscovery;
-  private ConfigurationPoller configurationPoller;
+    private volatile DDAgentFeaturesDiscovery featuresDiscovery;
+    private ConfigurationPoller configurationPoller;
 
-  public SharedCommunicationObjects() {
-    this(false);
-  }
-
-  public SharedCommunicationObjects(boolean paused) {
-    this.paused = paused;
-  }
+    public SharedCommunicationObjects() {
+        this(false);
+    }
 
-  public void createRemaining(Config config) {
-    if (monitoring == null) {
-      monitoring = Monitoring.DISABLED;
+    public SharedCommunicationObjects(boolean paused) {
+        this.paused = paused;
     }
 
-    httpClientTimeout =
-        config.isCiVisibilityEnabled()
-            ? config.getCiVisibilityBackendApiTimeoutMillis()
-            : TimeUnit.SECONDS.toMillis(config.getAgentTimeout());
+    public void createRemaining(Config config) {
+        if (monitoring == null) {
+            monitoring = Monitoring.DISABLED;
+        }
 
-    forceClearTextHttpForIntakeClient = config.isForceClearTextHttpForIntakeClient();
+        httpClientTimeout = config.isCiVisibilityEnabled()
+                ? config.getCiVisibilityBackendApiTimeoutMillis()
+                : TimeUnit.SECONDS.toMillis(config.getAgentTimeout());
 
-    if (agentUrl == null) {
-      agentUrl = parseAgentUrl(config);
-      if (agentUrl == null) {
-        throw new IllegalArgumentException("Bad agent URL: " + config.getAgentUrl());
-      }
-    }
+        forceClearTextHttpForIntakeClient = config.isForceClearTextHttpForIntakeClient();
 
-    if (agentHttpClient == null) {
-      String unixDomainSocket = SocketUtils.discoverApmSocket(config);
-      String namedPipe = config.getAgentNamedPipe();
-      agentHttpClient =
-          OkHttpUtils.buildHttpClient(
-              OkHttpUtils.isPlainHttp(agentUrl), unixDomainSocket, namedPipe, httpClientTimeout);
-      String testSessionToken = config.getTestAgentSessionToken();
-      if (testSessionToken != null) {
-        agentHttpClient = injectTestAgentSessionHeaderInterceptor(testSessionToken);
-      }
+        if (agentUrl == null) {
+            agentUrl = parseAgentUrl(config);
+            if (agentUrl == null) {
+                throw new IllegalArgumentException("Bad agent URL: " + config.getAgentUrl());
+            }
+        }
+
+        if (agentHttpClient == null) {
+            String unixDomainSocket = SocketUtils.discoverApmSocket(config);
+            String namedPipe = config.getAgentNamedPipe();
+            agentHttpClient = OkHttpUtils.buildHttpClient(
+                    OkHttpUtils.isPlainHttp(agentUrl), unixDomainSocket, namedPipe, httpClientTimeout);
+            String testSessionToken = config.getTestAgentSessionToken();
+            if (testSessionToken != null) {
+                agentHttpClient = injectTestAgentSessionHeaderInterceptor(testSessionToken);
+            }
+        }
     }
-  }
-
-  private OkHttpClient injectTestAgentSessionHeaderInterceptor(String testSessionToken) {
-    return agentHttpClient
-        .newBuilder()
-        .addInterceptor(
-            chain ->
-                chain.proceed(
-                    chain
-                        .request()
+
+    private OkHttpClient injectTestAgentSessionHeaderInterceptor(String testSessionToken) {
+        return agentHttpClient
+                .newBuilder()
+                .addInterceptor(chain -> chain.proceed(chain.request()
                         .newBuilder()
                         .header(X_DATADOG_TEST_SESSION_TOKEN, testSessionToken)
                         .build()))
-        .build();
-  }
+                .build();
+    }
 
-  /** Registers a callback to be called when remote communications resume. */
-  public void whenReady(Runnable callback) {
-    if (paused) {
-      synchronized (pausedComponents) {
+    /** Registers a callback to be called when remote communications resume. */
+    public void whenReady(Runnable callback) {
         if (paused) {
-          pausedComponents.add(callback);
-          return;
+            synchronized (pausedComponents) {
+                if (paused) {
+                    pausedComponents.add(callback);
+                    return;
+                }
+            }
         }
-      }
+        callback.run(); // not paused, run immediately
     }
-    callback.run(); // not paused, run immediately
-  }
-
-  /** Resumes remote communications including any paused callbacks. */
-  public void resume() {
-    paused = false;
-    // attempt discovery first to avoid potential race condition on IBM Java8
-    if (null != featuresDiscovery) {
-      featuresDiscovery.discoverIfOutdated();
-    } else {
-      Security.getProviders(); // fallback to preloading provider extensions
+
+    /** Resumes remote communications including any paused callbacks. */
+    public void resume() {
+        paused = false;
+        // attempt discovery first to avoid potential race condition on IBM Java8
+        if (null != featuresDiscovery) {
+            featuresDiscovery.discoverIfOutdated();
+        } else {
+            Security.getProviders(); // fallback to preloading provider extensions
+        }
+        synchronized (pausedComponents) {
+            for (Runnable callback : pausedComponents) {
+                try {
+                    callback.run();
+                } catch (Throwable e) {
+                    log.warn("Problem resuming remote component {}", callback, e);
+                }
+            }
+            pausedComponents.clear();
+        }
     }
-    synchronized (pausedComponents) {
-      for (Runnable callback : pausedComponents) {
-        try {
-          callback.run();
-        } catch (Throwable e) {
-          log.warn("Problem resuming remote component {}", callback, e);
+
+    private static HttpUrl parseAgentUrl(Config config) {
+        String agentUrl = config.getAgentUrl();
+        if (agentUrl.startsWith("unix:")) {
+            // provide placeholder agent URL, in practice we'll be tunnelling over UDS
+            agentUrl = "http://" + config.getAgentHost() + ":" + config.getAgentPort();
         }
-      }
-      pausedComponents.clear();
+        return HttpUrl.parse(agentUrl);
     }
-  }
 
-  private static HttpUrl parseAgentUrl(Config config) {
-    String agentUrl = config.getAgentUrl();
-    if (agentUrl.startsWith("unix:")) {
-      // provide placeholder agent URL, in practice we'll be tunnelling over UDS
-      agentUrl = "http://" + config.getAgentHost() + ":" + config.getAgentPort();
+    public ConfigurationPoller configurationPoller(Config config) {
+        if (configurationPoller == null && config.isRemoteConfigEnabled()) {
+            configurationPoller = createPoller(config);
+        }
+        return configurationPoller;
     }
-    return HttpUrl.parse(agentUrl);
-  }
 
-  public ConfigurationPoller configurationPoller(Config config) {
-    if (configurationPoller == null && config.isRemoteConfigEnabled()) {
-      configurationPoller = createPoller(config);
+    private ConfigurationPoller createPoller(Config config) {
+        String containerId = ContainerInfo.get().getContainerId();
+        String entityId = ContainerInfo.getEntityId();
+        Supplier<String> configUrlSupplier;
+        String remoteConfigUrl = config.getFinalRemoteConfigUrl();
+        if (remoteConfigUrl != null) {
+            configUrlSupplier = new FixedConfigUrlSupplier(remoteConfigUrl);
+        } else {
+            createRemaining(config);
+            configUrlSupplier = new RetryConfigUrlSupplier(this, config);
+        }
+        return new DefaultConfigurationPoller(
+                config, TRACER_VERSION, containerId, entityId, configUrlSupplier, agentHttpClient);
     }
-    return configurationPoller;
-  }
-
-  private ConfigurationPoller createPoller(Config config) {
-    String containerId = ContainerInfo.get().getContainerId();
-    String entityId = ContainerInfo.getEntityId();
-    Supplier<String> configUrlSupplier;
-    String remoteConfigUrl = config.getFinalRemoteConfigUrl();
-    if (remoteConfigUrl != null) {
-      configUrlSupplier = new FixedConfigUrlSupplier(remoteConfigUrl);
-    } else {
-      createRemaining(config);
-      configUrlSupplier = new RetryConfigUrlSupplier(this, config);
+
+    // for testing
+    public void setFeaturesDiscovery(DDAgentFeaturesDiscovery featuresDiscovery) {
+        this.featuresDiscovery = featuresDiscovery;
     }
-    return new DefaultConfigurationPoller(
-        config, TRACER_VERSION, containerId, entityId, configUrlSupplier, agentHttpClient);
-  }
-
-  // for testing
-  public void setFeaturesDiscovery(DDAgentFeaturesDiscovery featuresDiscovery) {
-    this.featuresDiscovery = featuresDiscovery;
-  }
-
-  public DDAgentFeaturesDiscovery featuresDiscovery(Config config) {
-    DDAgentFeaturesDiscovery ret = featuresDiscovery;
-    if (ret == null) {
-      synchronized (this) {
-        if ((ret = featuresDiscovery) == null) {
-          if (config.isCiVisibilityEnabled() && BazelMode.get().isPayloadFilesEnabled()) {
-            // Hermetic Bazel runs write payloads to local files; don't probe the agent.
-            ret = NoopFeaturesDiscovery.INSTANCE;
-          } else {
-            createRemaining(config);
-            ret =
-                new DDAgentFeaturesDiscovery(
-                    agentHttpClient,
-                    monitoring,
-                    agentUrl,
-                    config.getProtocolVersion(),
-                    config.isTracerMetricsEnabled(),
-                    config.isTracerMetricsIgnoreAgentVersion());
-
-            if (paused) {
-              // defer remote discovery until remote I/O is allowed
-            } else {
-              if (AGENT_THREAD_GROUP.equals(Thread.currentThread().getThreadGroup())) {
-                ret.discover(); // safe to run on same thread
-              } else {
-                // avoid performing blocking I/O operation on application thread
-                AgentTaskScheduler.get().execute(ret::discoverIfOutdated);
-              }
+
+    public DDAgentFeaturesDiscovery featuresDiscovery(Config config) {
+        DDAgentFeaturesDiscovery ret = featuresDiscovery;
+        if (ret == null) {
+            synchronized (this) {
+                if ((ret = featuresDiscovery) == null) {
+                    if (config.isCiVisibilityEnabled() && BazelMode.get().isPayloadFilesEnabled()) {
+                        // Hermetic Bazel runs write payloads to local files; don't probe the agent.
+                        ret = NoopFeaturesDiscovery.INSTANCE;
+                    } else {
+                        createRemaining(config);
+                        ret = new DDAgentFeaturesDiscovery(
+                                agentHttpClient,
+                                monitoring,
+                                agentUrl,
+                                config.getProtocolVersion(),
+                                config.isTracerMetricsEnabled(),
+                                config.isTracerMetricsIgnoreAgentVersion());
+
+                        if (paused) {
+                            // defer remote discovery until remote I/O is allowed
+                        } else {
+                            if (AGENT_THREAD_GROUP.equals(Thread.currentThread().getThreadGroup())) {
+                                ret.discover(); // safe to run on same thread
+                            } else {
+                                // avoid performing blocking I/O operation on application thread
+                                AgentTaskScheduler.get().execute(ret::discoverIfOutdated);
+                            }
+                        }
+                    }
+                    featuresDiscovery = ret;
+                }
             }
-          }
-          featuresDiscovery = ret;
         }
-      }
+        return ret;
     }
-    return ret;
-  }
 
-  private static final class FixedConfigUrlSupplier implements Supplier<String> {
-    private final String configUrl;
+    private static final class FixedConfigUrlSupplier implements Supplier<String> {
+        private final String configUrl;
 
-    private FixedConfigUrlSupplier(String configUrl) {
-      this.configUrl = configUrl;
-    }
+        private FixedConfigUrlSupplier(String configUrl) {
+            this.configUrl = configUrl;
+        }
 
-    @Override
-    public String get() {
-      return this.configUrl;
+        @Override
+        public String get() {
+            return this.configUrl;
+        }
     }
-  }
 
-  private static final class RetryConfigUrlSupplier implements Supplier<String> {
-    private String configUrl;
-    private final SharedCommunicationObjects sco;
-    private final Config config;
+    private static final class RetryConfigUrlSupplier implements Supplier<String> {
+        private String configUrl;
+        private final SharedCommunicationObjects sco;
+        private final Config config;
 
-    private RetryConfigUrlSupplier(final SharedCommunicationObjects sco, final Config config) {
-      this.sco = sco;
-      this.config = config;
-    }
+        private RetryConfigUrlSupplier(final SharedCommunicationObjects sco, final Config config) {
+            this.sco = sco;
+            this.config = config;
+        }
 
-    @Override
-    public String get() {
-      if (configUrl != null) {
-        return configUrl;
-      }
-
-      final DDAgentFeaturesDiscovery discovery = sco.featuresDiscovery(config);
-      discovery.discoverIfOutdated();
-      final String configEndpoint = discovery.getConfigEndpoint();
-      if (configEndpoint == null) {
-        return null;
-      }
-      this.configUrl = discovery.buildUrl(configEndpoint).toString();
-      log.debug("Found remote config endpoint: {}", this.configUrl);
-      return this.configUrl;
-    }
-  }
+        @Override
+        public String get() {
+            if (configUrl != null) {
+                return configUrl;
+            }
 
-  public OkHttpClient getIntakeHttpClient() {
-    OkHttpClient client = this.intakeHttpClient;
-    if (client != null) {
-      return client;
+            final DDAgentFeaturesDiscovery discovery = sco.featuresDiscovery(config);
+            discovery.discoverIfOutdated();
+            final String configEndpoint = discovery.getConfigEndpoint();
+            if (configEndpoint == null) {
+                return null;
+            }
+            this.configUrl = discovery.buildUrl(configEndpoint).toString();
+            log.debug("Found remote config endpoint: {}", this.configUrl);
+            return this.configUrl;
+        }
     }
 
-    synchronized (this) {
-      if (this.intakeHttpClient == null) {
-        this.intakeHttpClient =
-            OkHttpUtils.buildHttpClient(
-                forceClearTextHttpForIntakeClient, null, null, httpClientTimeout);
-      }
-      return this.intakeHttpClient;
+    public OkHttpClient getIntakeHttpClient() {
+        OkHttpClient client = this.intakeHttpClient;
+        if (client != null) {
+            return client;
+        }
+
+        synchronized (this) {
+            if (this.intakeHttpClient == null) {
+                this.intakeHttpClient =
+                        OkHttpUtils.buildHttpClient(forceClearTextHttpForIntakeClient, null, null, httpClientTimeout);
+            }
+            return this.intakeHttpClient;
+        }
     }
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/ddagent/TracerVersion.java b/communication/src/main/java/datadog/communication/ddagent/TracerVersion.java
index db45e70b548..eaa0d78287a 100644
--- a/communication/src/main/java/datadog/communication/ddagent/TracerVersion.java
+++ b/communication/src/main/java/datadog/communication/ddagent/TracerVersion.java
@@ -5,18 +5,16 @@
 import java.nio.charset.StandardCharsets;
 
 public class TracerVersion {
-  public static final String TRACER_VERSION = getTracerVersion();
+    public static final String TRACER_VERSION = getTracerVersion();
 
-  private static String getTracerVersion() {
-    ClassLoader cl = ClassLoader.getSystemClassLoader();
-    try (final BufferedReader reader =
-        new BufferedReader(
-            new InputStreamReader(
-                cl.getResourceAsStream("dd-java-agent.version"), StandardCharsets.ISO_8859_1))) {
-      String line = reader.readLine();
-      return line != null ? line : "0.0.0";
-    } catch (Exception e) {
-      return "0.0.0";
+    private static String getTracerVersion() {
+        ClassLoader cl = ClassLoader.getSystemClassLoader();
+        try (final BufferedReader reader = new BufferedReader(
+                new InputStreamReader(cl.getResourceAsStream("dd-java-agent.version"), StandardCharsets.ISO_8859_1))) {
+            String line = reader.readLine();
+            return line != null ? line : "0.0.0";
+        } catch (Exception e) {
+            return "0.0.0";
+        }
     }
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/http/HttpRetryPolicy.java b/communication/src/main/java/datadog/communication/http/HttpRetryPolicy.java
index a645f53e29a..fcd1b4f838c 100644
--- a/communication/src/main/java/datadog/communication/http/HttpRetryPolicy.java
+++ b/communication/src/main/java/datadog/communication/http/HttpRetryPolicy.java
@@ -39,152 +39,146 @@
 @NotThreadSafe
 public class HttpRetryPolicy implements AutoCloseable {
 
-  private static final Logger log = LoggerFactory.getLogger(HttpRetryPolicy.class);
-
-  private static final int NO_RESPONSE_RECEIVED = -1;
-  private static final int TOO_MANY_REQUESTS_HTTP_CODE = 429;
-  private static final String X_RATELIMIT_RESET_HTTP_HEADER = "x-ratelimit-reset";
-  private static final int RATE_LIMIT_RESET_TIME_UNDEFINED = -1;
-  private static final int MAX_ALLOWED_WAIT_TIME_SECONDS = 10;
-  private static final int RATE_LIMIT_DELAY_RANDOM_COMPONENT_MAX_MILLIS = 401;
-
-  private int retriesLeft;
-  private long delay;
-  private boolean interrupted;
-  private final double delayFactor;
-  private final boolean suppressInterrupts;
-
-  /**
-   * Creates a retry policy.
-   *
-   * <p>Protected so products with a stricter cross-SDK retry contract can reuse the shared HTTP
-   * retry loop while supplying their own response, exception, and backoff rules.
-   */
-  protected HttpRetryPolicy(
-      int retriesLeft, long delay, double delayFactor, boolean suppressInterrupts) {
-    this.retriesLeft = retriesLeft;
-    this.delay = delay;
-    this.delayFactor = delayFactor;
-    this.suppressInterrupts = suppressInterrupts;
-  }
-
-  public boolean shouldRetry(Exception e) {
-    if (e instanceof ConnectException) {
-      return shouldRetry((okhttp3.Response) null);
-    }
-    if (e instanceof InterruptedIOException) {
-      if (suppressInterrupts) {
-        return shouldRetry((okhttp3.Response) null);
-      }
-    }
-    if (e instanceof InterruptedException) {
-      if (suppressInterrupts) {
-        // remember interrupted status to restore the thread's interrupted flag later
-        interrupted = true;
-        return shouldRetry((okhttp3.Response) null);
-      }
+    private static final Logger log = LoggerFactory.getLogger(HttpRetryPolicy.class);
+
+    private static final int NO_RESPONSE_RECEIVED = -1;
+    private static final int TOO_MANY_REQUESTS_HTTP_CODE = 429;
+    private static final String X_RATELIMIT_RESET_HTTP_HEADER = "x-ratelimit-reset";
+    private static final int RATE_LIMIT_RESET_TIME_UNDEFINED = -1;
+    private static final int MAX_ALLOWED_WAIT_TIME_SECONDS = 10;
+    private static final int RATE_LIMIT_DELAY_RANDOM_COMPONENT_MAX_MILLIS = 401;
+
+    private int retriesLeft;
+    private long delay;
+    private boolean interrupted;
+    private final double delayFactor;
+    private final boolean suppressInterrupts;
+
+    /**
+     * Creates a retry policy.
+     *
+     * <p>Protected so products with a stricter cross-SDK retry contract can reuse the shared HTTP
+     * retry loop while supplying their own response, exception, and backoff rules.
+     */
+    protected HttpRetryPolicy(int retriesLeft, long delay, double delayFactor, boolean suppressInterrupts) {
+        this.retriesLeft = retriesLeft;
+        this.delay = delay;
+        this.delayFactor = delayFactor;
+        this.suppressInterrupts = suppressInterrupts;
     }
-    return false;
-  }
 
-  public boolean shouldRetry(@Nullable okhttp3.Response response) {
-    if (retriesLeft == 0) {
-      return false;
+    public boolean shouldRetry(Exception e) {
+        if (e instanceof ConnectException) {
+            return shouldRetry((okhttp3.Response) null);
+        }
+        if (e instanceof InterruptedIOException) {
+            if (suppressInterrupts) {
+                return shouldRetry((okhttp3.Response) null);
+            }
+        }
+        if (e instanceof InterruptedException) {
+            if (suppressInterrupts) {
+                // remember interrupted status to restore the thread's interrupted flag later
+                interrupted = true;
+                return shouldRetry((okhttp3.Response) null);
+            }
+        }
+        return false;
     }
 
-    int responseCode = response != null ? response.code() : NO_RESPONSE_RECEIVED;
-    if (responseCode == TOO_MANY_REQUESTS_HTTP_CODE) {
-      long waitTimeSeconds = getRateLimitResetTime(response);
-      if (waitTimeSeconds == RATE_LIMIT_RESET_TIME_UNDEFINED) {
-        retriesLeft--; // doing a regular retry if proper reset time was not provided
-        return true;
-      }
-
-      if (waitTimeSeconds > MAX_ALLOWED_WAIT_TIME_SECONDS) {
-        return false; // too long to wait, will not retry
-      }
-
-      retriesLeft = 0;
-      delay =
-          TimeUnit.SECONDS.toMillis(waitTimeSeconds)
-              + ThreadLocalRandom.current().nextInt(RATE_LIMIT_DELAY_RANDOM_COMPONENT_MAX_MILLIS);
-      return true;
-
-    } else if (responseCode >= 500 || responseCode == NO_RESPONSE_RECEIVED) {
-      retriesLeft--;
-      return true;
-
-    } else {
-      return false;
+    public boolean shouldRetry(@Nullable okhttp3.Response response) {
+        if (retriesLeft == 0) {
+            return false;
+        }
+
+        int responseCode = response != null ? response.code() : NO_RESPONSE_RECEIVED;
+        if (responseCode == TOO_MANY_REQUESTS_HTTP_CODE) {
+            long waitTimeSeconds = getRateLimitResetTime(response);
+            if (waitTimeSeconds == RATE_LIMIT_RESET_TIME_UNDEFINED) {
+                retriesLeft--; // doing a regular retry if proper reset time was not provided
+                return true;
+            }
+
+            if (waitTimeSeconds > MAX_ALLOWED_WAIT_TIME_SECONDS) {
+                return false; // too long to wait, will not retry
+            }
+
+            retriesLeft = 0;
+            delay = TimeUnit.SECONDS.toMillis(waitTimeSeconds)
+                    + ThreadLocalRandom.current().nextInt(RATE_LIMIT_DELAY_RANDOM_COMPONENT_MAX_MILLIS);
+            return true;
+
+        } else if (responseCode >= 500 || responseCode == NO_RESPONSE_RECEIVED) {
+            retriesLeft--;
+            return true;
+
+        } else {
+            return false;
+        }
     }
-  }
 
-  private long getRateLimitResetTime(okhttp3.Response response) {
-    String rateLimitHeader = response.header(X_RATELIMIT_RESET_HTTP_HEADER);
-    if (rateLimitHeader == null) {
-      return RATE_LIMIT_RESET_TIME_UNDEFINED;
+    private long getRateLimitResetTime(okhttp3.Response response) {
+        String rateLimitHeader = response.header(X_RATELIMIT_RESET_HTTP_HEADER);
+        if (rateLimitHeader == null) {
+            return RATE_LIMIT_RESET_TIME_UNDEFINED;
+        }
+
+        try {
+            return Long.parseLong(rateLimitHeader);
+        } catch (NumberFormatException e) {
+            log.error("Could not parse {} header contents: {}", X_RATELIMIT_RESET_HTTP_HEADER, rateLimitHeader, e);
+            return RATE_LIMIT_RESET_TIME_UNDEFINED;
+        }
     }
 
-    try {
-      return Long.parseLong(rateLimitHeader);
-    } catch (NumberFormatException e) {
-      log.error(
-          "Could not parse {} header contents: {}",
-          X_RATELIMIT_RESET_HTTP_HEADER,
-          rateLimitHeader,
-          e);
-      return RATE_LIMIT_RESET_TIME_UNDEFINED;
+    long getBackoffDelay() {
+        long currentDelay = delay;
+        delay = (long) (delay * delayFactor);
+        return currentDelay;
     }
-  }
-
-  long getBackoffDelay() {
-    long currentDelay = delay;
-    delay = (long) (delay * delayFactor);
-    return currentDelay;
-  }
-
-  public void backoff() throws IOException {
-    try {
-      Thread.sleep(getBackoffDelay());
-    } catch (InterruptedException e) {
-      if (suppressInterrupts) {
-        // remember interrupted status to restore the thread's interrupted flag later
-        interrupted = true;
-      } else {
-        Thread.currentThread().interrupt();
-        throw new InterruptedIOException("thread interrupted");
-      }
+
+    public void backoff() throws IOException {
+        try {
+            Thread.sleep(getBackoffDelay());
+        } catch (InterruptedException e) {
+            if (suppressInterrupts) {
+                // remember interrupted status to restore the thread's interrupted flag later
+                interrupted = true;
+            } else {
+                Thread.currentThread().interrupt();
+                throw new InterruptedIOException("thread interrupted");
+            }
+        }
     }
-  }
 
-  @Override
-  public void close() {
-    if (interrupted) {
-      Thread.currentThread().interrupt();
+    @Override
+    public void close() {
+        if (interrupted) {
+            Thread.currentThread().interrupt();
+        }
     }
-  }
 
-  public static class Factory {
-    public static final Factory NEVER_RETRY = new Factory(0, 0, 0);
+    public static class Factory {
+        public static final Factory NEVER_RETRY = new Factory(0, 0, 0);
 
-    private final int maxRetries;
-    private final long initialDelay;
-    private final double delayFactor;
-    private final boolean retryInterrupts;
+        private final int maxRetries;
+        private final long initialDelay;
+        private final double delayFactor;
+        private final boolean retryInterrupts;
 
-    public Factory(int maxRetries, int initialDelay, double delayFactor) {
-      this(maxRetries, initialDelay, delayFactor, false);
-    }
+        public Factory(int maxRetries, int initialDelay, double delayFactor) {
+            this(maxRetries, initialDelay, delayFactor, false);
+        }
 
-    public Factory(int maxRetries, int initialDelay, double delayFactor, boolean retryInterrupts) {
-      this.maxRetries = maxRetries;
-      this.initialDelay = initialDelay;
-      this.delayFactor = delayFactor;
-      this.retryInterrupts = retryInterrupts;
-    }
+        public Factory(int maxRetries, int initialDelay, double delayFactor, boolean retryInterrupts) {
+            this.maxRetries = maxRetries;
+            this.initialDelay = initialDelay;
+            this.delayFactor = delayFactor;
+            this.retryInterrupts = retryInterrupts;
+        }
 
-    public HttpRetryPolicy create() {
-      return new HttpRetryPolicy(maxRetries, initialDelay, delayFactor, retryInterrupts);
+        public HttpRetryPolicy create() {
+            return new HttpRetryPolicy(maxRetries, initialDelay, delayFactor, retryInterrupts);
+        }
     }
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/http/OkHttpUtils.java b/communication/src/main/java/datadog/communication/http/OkHttpUtils.java
index 44105ae772d..e22ad803f6d 100644
--- a/communication/src/main/java/datadog/communication/http/OkHttpUtils.java
+++ b/communication/src/main/java/datadog/communication/http/OkHttpUtils.java
@@ -40,429 +40,413 @@
 import org.slf4j.LoggerFactory;
 
 public final class OkHttpUtils {
-  private static final Logger log = LoggerFactory.getLogger(OkHttpUtils.class);
-
-  private static final String DATADOG_META_LANG = "Datadog-Meta-Lang";
-  private static final String DATADOG_META_LANG_VERSION = "Datadog-Meta-Lang-Version";
-  private static final String DATADOG_META_LANG_INTERPRETER = "Datadog-Meta-Lang-Interpreter";
-  private static final String DATADOG_META_LANG_INTERPRETER_VENDOR =
-      "Datadog-Meta-Lang-Interpreter-Vendor";
-  public static final String DATADOG_CONTAINER_ID = "Datadog-Container-ID";
-  private static final String DATADOG_ENTITY_ID = "Datadog-Entity-ID";
-  public static final String DATADOG_CONTAINER_TAGS_HASH = "Datadog-Container-Tags-Hash";
-
-  private static final String DD_API_KEY = "DD-API-KEY";
-
-  private static final String JAVA_VERSION =
-      SystemProperties.getOrDefault("java.version", "unknown");
-  private static final String JAVA_VM_NAME =
-      SystemProperties.getOrDefault("java.vm.name", "unknown");
-  private static final String JAVA_VM_VENDOR =
-      SystemProperties.getOrDefault("java.vm.vendor", "unknown");
-
-  public static OkHttpClient buildHttpClient(final HttpUrl url, final long timeoutMillis) {
-    return buildHttpClient(isPlainHttp(url), null, null, timeoutMillis);
-  }
-
-  public static OkHttpClient buildHttpClient(
-      final boolean isPlainHttp,
-      final String unixDomainSocketPath,
-      final String namedPipe,
-      final long timeoutMillis) {
-    return buildHttpClient(
-        unixDomainSocketPath,
-        Config.get().isJdkSocketEnabled(),
-        namedPipe,
-        null,
-        isPlainHttp,
-        false,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        timeoutMillis,
-        Config.get().isAgentConfiguredUsingDefault());
-  }
-
-  public static OkHttpClient buildHttp2Client(
-      final boolean isPlainHttp,
-      final String unixDomainSocketPath,
-      final String namedPipe,
-      final long timeoutMillis) {
-    return buildHttpClient(
-        unixDomainSocketPath,
-        Config.get().isJdkSocketEnabled(),
-        namedPipe,
-        null,
-        isPlainHttp,
-        true,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        timeoutMillis,
-        Config.get().isAgentConfiguredUsingDefault());
-  }
-
-  public static OkHttpClient buildHttpClient(
-      final Config config,
-      final Dispatcher dispatcher,
-      final HttpUrl url,
-      final Boolean retryOnConnectionFailure,
-      final Integer maxRunningRequests,
-      final String proxyHost,
-      final Integer proxyPort,
-      final String proxyUsername,
-      final String proxyPassword,
-      final long timeoutMillis) {
-    return buildHttpClient(
-        discoverApmSocket(config),
-        config.isJdkSocketEnabled(),
-        config.getAgentNamedPipe(),
-        dispatcher,
-        isPlainHttp(url),
-        false,
-        retryOnConnectionFailure,
-        maxRunningRequests,
-        proxyHost,
-        proxyPort,
-        proxyUsername,
-        proxyPassword,
-        timeoutMillis,
-        config.isAgentConfiguredUsingDefault());
-  }
-
-  public abstract static class CustomListener extends EventListener {}
-
-  private static OkHttpClient buildHttpClient(
-      final String unixDomainSocketPath,
-      final boolean useJdkUnixDomainSocket,
-      final String namedPipe,
-      final Dispatcher dispatcher,
-      final boolean isPlainHttp,
-      final boolean isHttp2,
-      final Boolean retryOnConnectionFailure,
-      final Integer maxRunningRequests,
-      final String proxyHost,
-      final Integer proxyPort,
-      final String proxyUsername,
-      final String proxyPassword,
-      final long timeoutMillis,
-      final boolean agentConfiguredUsingDefault) {
-    final OkHttpClient.Builder builder = new OkHttpClient.Builder();
-
-    try {
-      builder.eventListenerFactory(
-          call -> {
-            Request request = call.request();
-            CustomListener listener = request.tag(CustomListener.class);
-            return listener != null ? listener : EventListener.NONE;
-          });
-    } catch (NoSuchMethodError e) {
-      // A workaround for OKHTTP instrumentation tests
-      // where the version of OKHTTP conflicts with the one used in this module.
-      // This should never happen in "real life" as OKHTTP classes
-      // used by the tracer core are relocated to a different package
-    }
+    private static final Logger log = LoggerFactory.getLogger(OkHttpUtils.class);
 
-    builder
-        .connectTimeout(timeoutMillis, MILLISECONDS)
-        .writeTimeout(timeoutMillis, MILLISECONDS)
-        .readTimeout(timeoutMillis, MILLISECONDS)
-        .proxySelector(AgentProxySelector.INSTANCE)
-        .dispatcher(
-            dispatcher != null ? dispatcher : new Dispatcher(RejectingExecutorService.INSTANCE));
-
-    if (unixDomainSocketPath != null) {
-      builder.socketFactory(
-          new UnixDomainSocketFactory(
-              new File(unixDomainSocketPath), useJdkUnixDomainSocket, agentConfiguredUsingDefault));
-      log.debug("Using UnixDomainSocket as http transport");
-    } else if (namedPipe != null) {
-      builder.socketFactory(new NamedPipeSocketFactory(namedPipe));
-      log.debug("Using NamedPipe as http transport");
-    }
+    private static final String DATADOG_META_LANG = "Datadog-Meta-Lang";
+    private static final String DATADOG_META_LANG_VERSION = "Datadog-Meta-Lang-Version";
+    private static final String DATADOG_META_LANG_INTERPRETER = "Datadog-Meta-Lang-Interpreter";
+    private static final String DATADOG_META_LANG_INTERPRETER_VENDOR = "Datadog-Meta-Lang-Interpreter-Vendor";
+    public static final String DATADOG_CONTAINER_ID = "Datadog-Container-ID";
+    private static final String DATADOG_ENTITY_ID = "Datadog-Entity-ID";
+    public static final String DATADOG_CONTAINER_TAGS_HASH = "Datadog-Container-Tags-Hash";
+
+    private static final String DD_API_KEY = "DD-API-KEY";
+
+    private static final String JAVA_VERSION = SystemProperties.getOrDefault("java.version", "unknown");
+    private static final String JAVA_VM_NAME = SystemProperties.getOrDefault("java.vm.name", "unknown");
+    private static final String JAVA_VM_VENDOR = SystemProperties.getOrDefault("java.vm.vendor", "unknown");
 
-    if (isPlainHttp) {
-      // force clear text when using http to avoid failures for JVMs without TLS
-      builder.connectionSpecs(Collections.singletonList(ConnectionSpec.CLEARTEXT));
+    public static OkHttpClient buildHttpClient(final HttpUrl url, final long timeoutMillis) {
+        return buildHttpClient(isPlainHttp(url), null, null, timeoutMillis);
     }
 
-    if (isHttp2) {
-      if (isPlainHttp) {
-        builder.protocols(Collections.singletonList(Protocol.H2_PRIOR_KNOWLEDGE));
-      } else {
-        builder.protocols(Arrays.asList(Protocol.HTTP_2, Protocol.HTTP_1_1));
-      }
+    public static OkHttpClient buildHttpClient(
+            final boolean isPlainHttp,
+            final String unixDomainSocketPath,
+            final String namedPipe,
+            final long timeoutMillis) {
+        return buildHttpClient(
+                unixDomainSocketPath,
+                Config.get().isJdkSocketEnabled(),
+                namedPipe,
+                null,
+                isPlainHttp,
+                false,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                timeoutMillis,
+                Config.get().isAgentConfiguredUsingDefault());
     }
 
-    if (retryOnConnectionFailure != null) {
-      builder.retryOnConnectionFailure(retryOnConnectionFailure);
+    public static OkHttpClient buildHttp2Client(
+            final boolean isPlainHttp,
+            final String unixDomainSocketPath,
+            final String namedPipe,
+            final long timeoutMillis) {
+        return buildHttpClient(
+                unixDomainSocketPath,
+                Config.get().isJdkSocketEnabled(),
+                namedPipe,
+                null,
+                isPlainHttp,
+                true,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                timeoutMillis,
+                Config.get().isAgentConfiguredUsingDefault());
     }
 
-    if (maxRunningRequests != null) {
-      // Reusing connections causes non daemon threads to be created which causes agent to prevent
-      // app from exiting. See https://github.com/square/okhttp/issues/4029 for some details.
-      builder.connectionPool(new ConnectionPool(maxRunningRequests, 1, SECONDS));
+    public static OkHttpClient buildHttpClient(
+            final Config config,
+            final Dispatcher dispatcher,
+            final HttpUrl url,
+            final Boolean retryOnConnectionFailure,
+            final Integer maxRunningRequests,
+            final String proxyHost,
+            final Integer proxyPort,
+            final String proxyUsername,
+            final String proxyPassword,
+            final long timeoutMillis) {
+        return buildHttpClient(
+                discoverApmSocket(config),
+                config.isJdkSocketEnabled(),
+                config.getAgentNamedPipe(),
+                dispatcher,
+                isPlainHttp(url),
+                false,
+                retryOnConnectionFailure,
+                maxRunningRequests,
+                proxyHost,
+                proxyPort,
+                proxyUsername,
+                proxyPassword,
+                timeoutMillis,
+                config.isAgentConfiguredUsingDefault());
     }
 
-    if (proxyHost != null) {
-      builder.proxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort)));
-      if (proxyUsername != null) {
-        builder.proxyAuthenticator(
-            (route, response) -> {
-              final String credential =
-                  Credentials.basic(proxyUsername, proxyPassword == null ? "" : proxyPassword);
-
-              return response
-                  .request()
-                  .newBuilder()
-                  .header("Proxy-Authorization", credential)
-                  .build();
+    public abstract static class CustomListener extends EventListener {}
+
+    private static OkHttpClient buildHttpClient(
+            final String unixDomainSocketPath,
+            final boolean useJdkUnixDomainSocket,
+            final String namedPipe,
+            final Dispatcher dispatcher,
+            final boolean isPlainHttp,
+            final boolean isHttp2,
+            final Boolean retryOnConnectionFailure,
+            final Integer maxRunningRequests,
+            final String proxyHost,
+            final Integer proxyPort,
+            final String proxyUsername,
+            final String proxyPassword,
+            final long timeoutMillis,
+            final boolean agentConfiguredUsingDefault) {
+        final OkHttpClient.Builder builder = new OkHttpClient.Builder();
+
+        try {
+            builder.eventListenerFactory(call -> {
+                Request request = call.request();
+                CustomListener listener = request.tag(CustomListener.class);
+                return listener != null ? listener : EventListener.NONE;
             });
-      }
-    }
+        } catch (NoSuchMethodError e) {
+            // A workaround for OKHTTP instrumentation tests
+            // where the version of OKHTTP conflicts with the one used in this module.
+            // This should never happen in "real life" as OKHTTP classes
+            // used by the tracer core are relocated to a different package
+        }
 
-    OkHttpClient client = builder.build();
+        builder.connectTimeout(timeoutMillis, MILLISECONDS)
+                .writeTimeout(timeoutMillis, MILLISECONDS)
+                .readTimeout(timeoutMillis, MILLISECONDS)
+                .proxySelector(AgentProxySelector.INSTANCE)
+                .dispatcher(dispatcher != null ? dispatcher : new Dispatcher(RejectingExecutorService.INSTANCE));
+
+        if (unixDomainSocketPath != null) {
+            builder.socketFactory(new UnixDomainSocketFactory(
+                    new File(unixDomainSocketPath), useJdkUnixDomainSocket, agentConfiguredUsingDefault));
+            log.debug("Using UnixDomainSocket as http transport");
+        } else if (namedPipe != null) {
+            builder.socketFactory(new NamedPipeSocketFactory(namedPipe));
+            log.debug("Using NamedPipe as http transport");
+        }
 
-    if (maxRunningRequests != null) {
-      client.dispatcher().setMaxRequests(maxRunningRequests);
-      // We are mainly talking to the same(ish) host so we need to raise this limit
-      client.dispatcher().setMaxRequestsPerHost(maxRunningRequests);
-    }
+        if (isPlainHttp) {
+            // force clear text when using http to avoid failures for JVMs without TLS
+            builder.connectionSpecs(Collections.singletonList(ConnectionSpec.CLEARTEXT));
+        }
 
-    return client;
-  }
+        if (isHttp2) {
+            if (isPlainHttp) {
+                builder.protocols(Collections.singletonList(Protocol.H2_PRIOR_KNOWLEDGE));
+            } else {
+                builder.protocols(Arrays.asList(Protocol.HTTP_2, Protocol.HTTP_1_1));
+            }
+        }
 
-  public static Request.Builder prepareRequest(final HttpUrl url, Map<String, String> headers) {
+        if (retryOnConnectionFailure != null) {
+            builder.retryOnConnectionFailure(retryOnConnectionFailure);
+        }
 
-    final Request.Builder builder =
-        new Request.Builder()
-            .url(url)
-            .addHeader(DATADOG_META_LANG, "java")
-            .addHeader(DATADOG_META_LANG_VERSION, JAVA_VERSION)
-            .addHeader(DATADOG_META_LANG_INTERPRETER, JAVA_VM_NAME)
-            .addHeader(DATADOG_META_LANG_INTERPRETER_VENDOR, JAVA_VM_VENDOR);
+        if (maxRunningRequests != null) {
+            // Reusing connections causes non daemon threads to be created which causes agent to prevent
+            // app from exiting. See https://github.com/square/okhttp/issues/4029 for some details.
+            builder.connectionPool(new ConnectionPool(maxRunningRequests, 1, SECONDS));
+        }
 
-    final String containerId = ContainerInfo.get().getContainerId();
-    final String entityId = ContainerInfo.getEntityId();
-    if (containerId != null) {
-      builder.addHeader(DATADOG_CONTAINER_ID, containerId);
-    }
-    if (entityId != null) {
-      builder.addHeader(DATADOG_ENTITY_ID, entityId);
-    }
+        if (proxyHost != null) {
+            builder.proxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort)));
+            if (proxyUsername != null) {
+                builder.proxyAuthenticator((route, response) -> {
+                    final String credential =
+                            Credentials.basic(proxyUsername, proxyPassword == null ? "" : proxyPassword);
+
+                    return response.request()
+                            .newBuilder()
+                            .header("Proxy-Authorization", credential)
+                            .build();
+                });
+            }
+        }
 
-    for (Map.Entry<String, String> e : headers.entrySet()) {
-      builder.addHeader(e.getKey(), e.getValue());
-    }
+        OkHttpClient client = builder.build();
+
+        if (maxRunningRequests != null) {
+            client.dispatcher().setMaxRequests(maxRunningRequests);
+            // We are mainly talking to the same(ish) host so we need to raise this limit
+            client.dispatcher().setMaxRequestsPerHost(maxRunningRequests);
+        }
 
-    return builder;
-  }
-
-  public static Request.Builder prepareRequest(
-      final HttpUrl url,
-      final Map<String, String> headers,
-      final Config config,
-      final boolean agentless) {
-    Request.Builder builder = prepareRequest(url, headers);
-
-    final String apiKey = config.getApiKey();
-    if (agentless && apiKey != null) {
-      // we only add the api key header if we know we're doing agentless. No point in adding it to
-      // other agent-based requests since we know the datadog-agent isn't going to make use of it.
-      builder = builder.addHeader(DD_API_KEY, apiKey);
+        return client;
     }
 
-    return builder;
-  }
+    public static Request.Builder prepareRequest(final HttpUrl url, Map<String, String> headers) {
 
-  public static RequestBody msgpackRequestBodyOf(List<ByteBuffer> buffers) {
-    return new ByteBufferRequestBody(buffers);
-  }
+        final Request.Builder builder = new Request.Builder()
+                .url(url)
+                .addHeader(DATADOG_META_LANG, "java")
+                .addHeader(DATADOG_META_LANG_VERSION, JAVA_VERSION)
+                .addHeader(DATADOG_META_LANG_INTERPRETER, JAVA_VM_NAME)
+                .addHeader(DATADOG_META_LANG_INTERPRETER_VENDOR, JAVA_VM_VENDOR);
 
-  public static RequestBody gzippedMsgpackRequestBodyOf(List<ByteBuffer> buffers) {
-    return new GZipByteBufferRequestBody(buffers);
-  }
+        final String containerId = ContainerInfo.get().getContainerId();
+        final String entityId = ContainerInfo.getEntityId();
+        if (containerId != null) {
+            builder.addHeader(DATADOG_CONTAINER_ID, containerId);
+        }
+        if (entityId != null) {
+            builder.addHeader(DATADOG_ENTITY_ID, entityId);
+        }
 
-  public static RequestBody gzippedRequestBodyOf(RequestBody delegate) {
-    return new GZipRequestBodyDecorator(delegate);
-  }
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            builder.addHeader(e.getKey(), e.getValue());
+        }
 
-  public static RequestBody jsonRequestBodyOf(byte[] json) {
-    return new JsonRequestBody(json);
-  }
+        return builder;
+    }
 
-  private static class JsonRequestBody extends RequestBody {
+    public static Request.Builder prepareRequest(
+            final HttpUrl url, final Map<String, String> headers, final Config config, final boolean agentless) {
+        Request.Builder builder = prepareRequest(url, headers);
 
-    private static final MediaType JSON = MediaType.get("application/json");
+        final String apiKey = config.getApiKey();
+        if (agentless && apiKey != null) {
+            // we only add the api key header if we know we're doing agentless. No point in adding it to
+            // other agent-based requests since we know the datadog-agent isn't going to make use of it.
+            builder = builder.addHeader(DD_API_KEY, apiKey);
+        }
 
-    private final byte[] json;
+        return builder;
+    }
 
-    private JsonRequestBody(byte[] json) {
-      this.json = json;
+    public static RequestBody msgpackRequestBodyOf(List<ByteBuffer> buffers) {
+        return new ByteBufferRequestBody(buffers);
     }
 
-    @Override
-    public long contentLength() {
-      return json.length;
+    public static RequestBody gzippedMsgpackRequestBodyOf(List<ByteBuffer> buffers) {
+        return new GZipByteBufferRequestBody(buffers);
     }
 
-    @Override
-    public MediaType contentType() {
-      return JSON;
+    public static RequestBody gzippedRequestBodyOf(RequestBody delegate) {
+        return new GZipRequestBodyDecorator(delegate);
     }
 
-    @Override
-    public void writeTo(BufferedSink sink) throws IOException {
-      sink.write(json);
+    public static RequestBody jsonRequestBodyOf(byte[] json) {
+        return new JsonRequestBody(json);
     }
-  }
 
-  private static class ByteBufferRequestBody extends RequestBody {
+    private static class JsonRequestBody extends RequestBody {
 
-    private static final MediaType MSGPACK = MediaType.get("application/msgpack");
+        private static final MediaType JSON = MediaType.get("application/json");
 
-    private final List<ByteBuffer> buffers;
+        private final byte[] json;
 
-    private ByteBufferRequestBody(List<ByteBuffer> buffers) {
-      this.buffers = buffers;
-    }
+        private JsonRequestBody(byte[] json) {
+            this.json = json;
+        }
 
-    @Override
-    public long contentLength() {
-      long length = 0;
-      for (ByteBuffer buffer : buffers) {
-        length += buffer.remaining();
-      }
-      return length;
-    }
+        @Override
+        public long contentLength() {
+            return json.length;
+        }
 
-    @Override
-    public MediaType contentType() {
-      return MSGPACK;
-    }
+        @Override
+        public MediaType contentType() {
+            return JSON;
+        }
 
-    @Override
-    public void writeTo(BufferedSink sink) throws IOException {
-      for (ByteBuffer buffer : buffers) {
-        while (buffer.hasRemaining()) {
-          sink.write(buffer);
+        @Override
+        public void writeTo(BufferedSink sink) throws IOException {
+            sink.write(json);
         }
-      }
     }
-  }
 
-  private static final class GZipByteBufferRequestBody extends ByteBufferRequestBody {
-    private GZipByteBufferRequestBody(List<ByteBuffer> buffers) {
-      super(buffers);
-    }
+    private static class ByteBufferRequestBody extends RequestBody {
+
+        private static final MediaType MSGPACK = MediaType.get("application/msgpack");
 
-    @Override
-    public long contentLength() {
-      return -1;
+        private final List<ByteBuffer> buffers;
+
+        private ByteBufferRequestBody(List<ByteBuffer> buffers) {
+            this.buffers = buffers;
+        }
+
+        @Override
+        public long contentLength() {
+            long length = 0;
+            for (ByteBuffer buffer : buffers) {
+                length += buffer.remaining();
+            }
+            return length;
+        }
+
+        @Override
+        public MediaType contentType() {
+            return MSGPACK;
+        }
+
+        @Override
+        public void writeTo(BufferedSink sink) throws IOException {
+            for (ByteBuffer buffer : buffers) {
+                while (buffer.hasRemaining()) {
+                    sink.write(buffer);
+                }
+            }
+        }
     }
 
-    @Override
-    public void writeTo(BufferedSink sink) throws IOException {
-      BufferedSink gzipSink = Okio.buffer(new GzipSink(sink));
+    private static final class GZipByteBufferRequestBody extends ByteBufferRequestBody {
+        private GZipByteBufferRequestBody(List<ByteBuffer> buffers) {
+            super(buffers);
+        }
+
+        @Override
+        public long contentLength() {
+            return -1;
+        }
+
+        @Override
+        public void writeTo(BufferedSink sink) throws IOException {
+            BufferedSink gzipSink = Okio.buffer(new GzipSink(sink));
 
-      super.writeTo(gzipSink);
+            super.writeTo(gzipSink);
 
-      gzipSink.close();
+            gzipSink.close();
+        }
     }
-  }
 
-  private static final class GZipRequestBodyDecorator extends RequestBody {
-    private final RequestBody delegate;
+    private static final class GZipRequestBodyDecorator extends RequestBody {
+        private final RequestBody delegate;
+
+        private GZipRequestBodyDecorator(RequestBody delegate) {
+            this.delegate = delegate;
+        }
+
+        @Nullable
+        @Override
+        public MediaType contentType() {
+            return delegate.contentType();
+        }
+
+        @Override
+        public long contentLength() {
+            return -1;
+        }
 
-    private GZipRequestBodyDecorator(RequestBody delegate) {
-      this.delegate = delegate;
+        @Override
+        public void writeTo(BufferedSink sink) throws IOException {
+            BufferedSink gzipSink = Okio.buffer(new GzipSink(sink));
+            delegate.writeTo(gzipSink);
+            gzipSink.close();
+        }
+    }
+
+    public static Response sendWithRetries(
+            OkHttpClient httpClient, HttpRetryPolicy.Factory retryPolicyFactory, Request request) throws IOException {
+        return sendWithRetries((Call.Factory) httpClient, retryPolicyFactory, request);
     }
 
-    @Nullable
-    @Override
-    public MediaType contentType() {
-      return delegate.contentType();
+    public static Response sendWithRetries(
+            Call.Factory callFactory, HttpRetryPolicy.Factory retryPolicyFactory, Request request) throws IOException {
+        return sendWithRetries(callFactory, retryPolicyFactory, request, response -> response);
     }
 
-    @Override
-    public long contentLength() {
-      return -1;
+    public static <T> T sendWithRetries(
+            Call.Factory callFactory,
+            HttpRetryPolicy.Factory retryPolicyFactory,
+            Request request,
+            ResponseMapper<T> responseMapper)
+            throws IOException {
+        try (HttpRetryPolicy retryPolicy = retryPolicyFactory.create()) {
+            while (true) {
+                Response response = null;
+                try {
+                    response = callFactory.newCall(request).execute();
+                    if (response.isSuccessful()) {
+                        return responseMapper.map(response);
+                    }
+                    if (!retryPolicy.shouldRetry(response)) {
+                        return responseMapper.map(response);
+                    } else {
+                        closeQuietly(response);
+                        response = null;
+                    }
+                } catch (Exception ex) {
+                    if (response != null) {
+                        closeQuietly(response);
+                    }
+                    if (!retryPolicy.shouldRetry(ex)) {
+                        throw ex;
+                    }
+                }
+                // If we get here, there has been an error, and we still have retries left
+                retryPolicy.backoff();
+            }
+        }
     }
 
-    @Override
-    public void writeTo(BufferedSink sink) throws IOException {
-      BufferedSink gzipSink = Okio.buffer(new GzipSink(sink));
-      delegate.writeTo(gzipSink);
-      gzipSink.close();
+    @FunctionalInterface
+    public interface ResponseMapper<T> {
+        T map(Response response) throws IOException;
     }
-  }
-
-  public static Response sendWithRetries(
-      OkHttpClient httpClient, HttpRetryPolicy.Factory retryPolicyFactory, Request request)
-      throws IOException {
-    return sendWithRetries((Call.Factory) httpClient, retryPolicyFactory, request);
-  }
-
-  public static Response sendWithRetries(
-      Call.Factory callFactory, HttpRetryPolicy.Factory retryPolicyFactory, Request request)
-      throws IOException {
-    return sendWithRetries(callFactory, retryPolicyFactory, request, response -> response);
-  }
-
-  public static <T> T sendWithRetries(
-      Call.Factory callFactory,
-      HttpRetryPolicy.Factory retryPolicyFactory,
-      Request request,
-      ResponseMapper<T> responseMapper)
-      throws IOException {
-    try (HttpRetryPolicy retryPolicy = retryPolicyFactory.create()) {
-      while (true) {
-        Response response = null;
+
+    private static void closeQuietly(Response response) {
         try {
-          response = callFactory.newCall(request).execute();
-          if (response.isSuccessful()) {
-            return responseMapper.map(response);
-          }
-          if (!retryPolicy.shouldRetry(response)) {
-            return responseMapper.map(response);
-          } else {
-            closeQuietly(response);
-            response = null;
-          }
-        } catch (Exception ex) {
-          if (response != null) {
-            closeQuietly(response);
-          }
-          if (!retryPolicy.shouldRetry(ex)) {
-            throw ex;
-          }
+            response.close();
+        } catch (Exception e) {
+            // ignore
         }
-        // If we get here, there has been an error, and we still have retries left
-        retryPolicy.backoff();
-      }
-    }
-  }
-
-  @FunctionalInterface
-  public interface ResponseMapper<T> {
-    T map(Response response) throws IOException;
-  }
-
-  private static void closeQuietly(Response response) {
-    try {
-      response.close();
-    } catch (Exception e) {
-      // ignore
     }
-  }
 
-  public static boolean isPlainHttp(final HttpUrl url) {
-    return url != null && "http".equalsIgnoreCase(url.scheme());
-  }
+    public static boolean isPlainHttp(final HttpUrl url) {
+        return url != null && "http".equalsIgnoreCase(url.scheme());
+    }
 }
diff --git a/communication/src/main/java/datadog/communication/http/RejectingExecutorService.java b/communication/src/main/java/datadog/communication/http/RejectingExecutorService.java
index 1ec83a4fccc..7a5daf2a8bb 100644
--- a/communication/src/main/java/datadog/communication/http/RejectingExecutorService.java
+++ b/communication/src/main/java/datadog/communication/http/RejectingExecutorService.java
@@ -9,33 +9,33 @@
 
 /** {@link ExecutorService} that always rejects requests. */
 public final class RejectingExecutorService extends AbstractExecutorService {
-  public static final RejectingExecutorService INSTANCE = new RejectingExecutorService();
-
-  @Override
-  public void execute(final Runnable command) {
-    throw new RejectedExecutionException("Unexpected request to execute async task");
-  }
-
-  @Override
-  public void shutdown() {}
-
-  @Override
-  public List<Runnable> shutdownNow() {
-    return Collections.emptyList();
-  }
-
-  @Override
-  public boolean isShutdown() {
-    return true;
-  }
-
-  @Override
-  public boolean isTerminated() {
-    return true;
-  }
-
-  @Override
-  public boolean awaitTermination(final long timeout, final TimeUnit unit) {
-    return true;
-  }
+    public static final RejectingExecutorService INSTANCE = new RejectingExecutorService();
+
+    @Override
+    public void execute(final Runnable command) {
+        throw new RejectedExecutionException("Unexpected request to execute async task");
+    }
+
+    @Override
+    public void shutdown() {}
+
+    @Override
+    public List<Runnable> shutdownNow() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public boolean isShutdown() {
+        return true;
+    }
+
+    @Override
+    public boolean isTerminated() {
+        return true;
+    }
+
+    @Override
+    public boolean awaitTermination(final long timeout, final TimeUnit unit) {
+        return true;
+    }
 }
diff --git a/communication/src/main/java/datadog/communication/http/SocketUtils.java b/communication/src/main/java/datadog/communication/http/SocketUtils.java
index ed0dcaa118d..0011b3d276b 100644
--- a/communication/src/main/java/datadog/communication/http/SocketUtils.java
+++ b/communication/src/main/java/datadog/communication/http/SocketUtils.java
@@ -13,27 +13,27 @@
 import org.slf4j.LoggerFactory;
 
 public final class SocketUtils {
-  private static final Logger log = LoggerFactory.getLogger(SocketUtils.class);
+    private static final Logger log = LoggerFactory.getLogger(SocketUtils.class);
 
-  @SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
-  public static String discoverApmSocket(final Config config) {
-    String unixDomainSocket = config.getAgentUnixDomainSocket();
-    if (!OperatingSystem.isWindows()) {
-      if (unixDomainSocket == null
-          && Config.get().isAgentConfiguredUsingDefault()
-          && Files.exists(new File(DEFAULT_TRACE_AGENT_SOCKET_PATH))) {
-        log.info("Detected {}.  Using it to send trace data.", DEFAULT_TRACE_AGENT_SOCKET_PATH);
-        unixDomainSocket = DEFAULT_TRACE_AGENT_SOCKET_PATH;
-      }
-    } else /* windows */ {
-      if (unixDomainSocket != null) {
-        log.warn(
-            "{} setting not supported on {}. Reverting to the default.",
-            TracerConfig.AGENT_UNIX_DOMAIN_SOCKET,
-            SystemProperties.get("os.name"));
-        unixDomainSocket = null;
-      }
+    @SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
+    public static String discoverApmSocket(final Config config) {
+        String unixDomainSocket = config.getAgentUnixDomainSocket();
+        if (!OperatingSystem.isWindows()) {
+            if (unixDomainSocket == null
+                    && Config.get().isAgentConfiguredUsingDefault()
+                    && Files.exists(new File(DEFAULT_TRACE_AGENT_SOCKET_PATH))) {
+                log.info("Detected {}.  Using it to send trace data.", DEFAULT_TRACE_AGENT_SOCKET_PATH);
+                unixDomainSocket = DEFAULT_TRACE_AGENT_SOCKET_PATH;
+            }
+        } else /* windows */ {
+            if (unixDomainSocket != null) {
+                log.warn(
+                        "{} setting not supported on {}. Reverting to the default.",
+                        TracerConfig.AGENT_UNIX_DOMAIN_SOCKET,
+                        SystemProperties.get("os.name"));
+                unixDomainSocket = null;
+            }
+        }
+        return unixDomainSocket;
     }
-    return unixDomainSocket;
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/ByteBufferConsumer.java b/communication/src/main/java/datadog/communication/serialization/ByteBufferConsumer.java
index 7c3e39f324e..96d146c3eec 100644
--- a/communication/src/main/java/datadog/communication/serialization/ByteBufferConsumer.java
+++ b/communication/src/main/java/datadog/communication/serialization/ByteBufferConsumer.java
@@ -4,5 +4,5 @@
 
 public interface ByteBufferConsumer {
 
-  void accept(int messageCount, ByteBuffer buffer);
+    void accept(int messageCount, ByteBuffer buffer);
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/Caching.java b/communication/src/main/java/datadog/communication/serialization/Caching.java
index 868170fcac3..f648ba9d437 100644
--- a/communication/src/main/java/datadog/communication/serialization/Caching.java
+++ b/communication/src/main/java/datadog/communication/serialization/Caching.java
@@ -4,79 +4,79 @@
 
 /** Some common static functions used by simple & generational caches */
 final class Caching {
-  private Caching() {}
+    private Caching() {}
 
-  /**
-   * Provides the cache size that holds the requestedCapacity
-   *
-   * @param requestedCapacity > 0
-   * @return size >= requestedCapacity
-   */
-  static final int cacheSizeFor(int requestedCapacity) {
-    int pow;
-    for (pow = 1; pow < requestedCapacity; pow *= 2)
-      ;
-    return pow;
-  }
+    /**
+     * Provides the cache size that holds the requestedCapacity
+     *
+     * @param requestedCapacity > 0
+     * @return size >= requestedCapacity
+     */
+    static final int cacheSizeFor(int requestedCapacity) {
+        int pow;
+        for (pow = 1; pow < requestedCapacity; pow *= 2)
+            ;
+        return pow;
+    }
 
-  /** Provides an "adjusted" (e.g. non-zero) hash for the given String */
-  static final int adjHash(String value) {
-    int hash = value.hashCode();
-    return (hash == 0) ? 0xDA7AD06 : hash;
-  }
+    /** Provides an "adjusted" (e.g. non-zero) hash for the given String */
+    static final int adjHash(String value) {
+        int hash = value.hashCode();
+        return (hash == 0) ? 0xDA7AD06 : hash;
+    }
 
-  /** Resets markers to zero */
-  static final void reset(int[] marks) {
-    Arrays.fill(marks, 0);
-  }
+    /** Resets markers to zero */
+    static final void reset(int[] marks) {
+        Arrays.fill(marks, 0);
+    }
 
-  /**
-   * Changes the mark status of the corresponding slot in the marking array. If there was previously
-   * a matching mark, resets the slot to zero and returns true If there was previously a mismatching
-   * mark, updates the slot and returns false
-   *
-   * <p>A return value of true indicates that the requested value has likely been seen previously
-   * and cache entry should be created.
-   */
-  static final boolean mark(int[] marks, int newAdjHash) {
-    int index = bucketIndex(marks, newAdjHash);
+    /**
+     * Changes the mark status of the corresponding slot in the marking array. If there was previously
+     * a matching mark, resets the slot to zero and returns true If there was previously a mismatching
+     * mark, updates the slot and returns false
+     *
+     * <p>A return value of true indicates that the requested value has likely been seen previously
+     * and cache entry should be created.
+     */
+    static final boolean mark(int[] marks, int newAdjHash) {
+        int index = bucketIndex(marks, newAdjHash);
 
-    // This is the 4th iteration of the marking strategy
-    // First version - used a mark entry, but that would prematurely
-    // burn a slot in the cache
-    // Second version - used a mark boolean, that worked well, but
-    // was a overly permissive in allowing the next request to the same slot
-    // to immediately create a CacheEntry
-    // Third version - used a mark hash that to match exactly,
-    // that could lead to access order fights over the cache slot
-    // So this version is a hybrid of 2nd & 3rd, using a bloom filter
-    // that effectively degenerates to a boolean
+        // This is the 4th iteration of the marking strategy
+        // First version - used a mark entry, but that would prematurely
+        // burn a slot in the cache
+        // Second version - used a mark boolean, that worked well, but
+        // was a overly permissive in allowing the next request to the same slot
+        // to immediately create a CacheEntry
+        // Third version - used a mark hash that to match exactly,
+        // that could lead to access order fights over the cache slot
+        // So this version is a hybrid of 2nd & 3rd, using a bloom filter
+        // that effectively degenerates to a boolean
 
-    // This approach provides a nice balance when there's an A-B-A access pattern
-    // The first A will mark the slot
-    // Then B will mark the slot with A | B
-    // Then either A or B can claim and reset the slot
+        // This approach provides a nice balance when there's an A-B-A access pattern
+        // The first A will mark the slot
+        // Then B will mark the slot with A | B
+        // Then either A or B can claim and reset the slot
 
-    int priorMarkHash = marks[index];
-    boolean match = ((priorMarkHash & newAdjHash) == newAdjHash);
-    if (match) {
-      marks[index] = 0;
-    } else {
-      marks[index] = priorMarkHash | newAdjHash;
+        int priorMarkHash = marks[index];
+        boolean match = ((priorMarkHash & newAdjHash) == newAdjHash);
+        if (match) {
+            marks[index] = 0;
+        } else {
+            marks[index] = priorMarkHash | newAdjHash;
+        }
+        return match;
     }
-    return match;
-  }
 
-  /** Provides the corresponding index into the marking array */
-  static final int bucketIndex(int[] marks, int adjHash) {
-    return adjHash & (marks.length - 1);
-  }
+    /** Provides the corresponding index into the marking array */
+    static final int bucketIndex(int[] marks, int adjHash) {
+        return adjHash & (marks.length - 1);
+    }
 
-  /**
-   * Provides the corresponding index into an entry array Assumes that array size was determined by
-   * using {@Caching#cacheSizeFor}
-   */
-  static final <E> int bucketIndex(E[] entries, int adjHash) {
-    return adjHash & (entries.length - 1);
-  }
+    /**
+     * Provides the corresponding index into an entry array Assumes that array size was determined by
+     * using {@Caching#cacheSizeFor}
+     */
+    static final <E> int bucketIndex(E[] entries, int adjHash) {
+        return adjHash & (entries.length - 1);
+    }
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/Codec.java b/communication/src/main/java/datadog/communication/serialization/Codec.java
index b0eb5530827..4e385bfe89a 100644
--- a/communication/src/main/java/datadog/communication/serialization/Codec.java
+++ b/communication/src/main/java/datadog/communication/serialization/Codec.java
@@ -18,296 +18,295 @@
 
 public final class Codec extends ClassValue<ValueWriter<?>> {
 
-  public static final Codec INSTANCE;
-
-  static {
-    final Map<Class<?>, ValueWriter<?>> writers = new HashMap<>(1 << 3);
-    writers.put(StackTraceEvent.class, new StackTraceEventWriter());
-    writers.put(StackTraceFrame.class, new StackTraceEventFrameWriter());
-    if (Config.get().isAiGuardEnabled()) {
-      writers.put(AIGuard.Message.class, new MessageWriter());
-      writers.put(AIGuard.ToolCall.class, new ToolCallWriter());
-      writers.put(AIGuard.ToolCall.Function.class, new FunctionWriter());
+    public static final Codec INSTANCE;
+
+    static {
+        final Map<Class<?>, ValueWriter<?>> writers = new HashMap<>(1 << 3);
+        writers.put(StackTraceEvent.class, new StackTraceEventWriter());
+        writers.put(StackTraceFrame.class, new StackTraceEventFrameWriter());
+        if (Config.get().isAiGuardEnabled()) {
+            writers.put(AIGuard.Message.class, new MessageWriter());
+            writers.put(AIGuard.ToolCall.class, new ToolCallWriter());
+            writers.put(AIGuard.ToolCall.Function.class, new FunctionWriter());
+        }
+        INSTANCE = new Codec(writers);
     }
-    INSTANCE = new Codec(writers);
-  }
 
-  private final Map<Class<?>, ValueWriter<?>> config;
+    private final Map<Class<?>, ValueWriter<?>> config;
 
-  public Codec(Map<Class<?>, ValueWriter<?>> config) {
-    this.config = config;
-  }
-
-  @SuppressWarnings("unchecked")
-  public Codec() {
-    this(Collections.<Class<?>, ValueWriter<?>>emptyMap());
-  }
-
-  @Override
-  protected ValueWriter<?> computeValue(Class<?> clazz) {
-    ValueWriter<?> writer = config.get(clazz);
-    if (null != writer) {
-      return writer;
-    }
-    if (Number.class.isAssignableFrom(clazz)) {
-      if (Double.class == clazz) {
-        return new DoubleWriter();
-      }
-      if (Float.class == clazz) {
-        return new FloatWriter();
-      }
-      if (Integer.class == clazz) {
-        return new IntWriter();
-      }
-      if (Long.class == clazz) {
-        return new LongWriter();
-      }
-      if (Short.class == clazz) {
-        return new ShortWriter();
-      }
-      // This is some other Number type, that will be treated as a metric by the
-      // serializer, so let's write out its double value to be protocol compatible
-      return new NumberDoubleWriter();
-    }
-    if (clazz.isArray()) {
-      if (byte[].class == clazz) {
-        return new ByteArrayWriter();
-      }
-      if (int[].class == clazz) {
-        return new IntArrayWriter();
-      }
-      if (long[].class == clazz) {
-        return new LongArrayWriter();
-      }
-      if (double[].class == clazz) {
-        return new DoubleArrayWriter();
-      }
-      if (float[].class == clazz) {
-        return new FloatArrayWriter();
-      }
-      if (short[].class == clazz) {
-        return new ShortArrayWriter();
-      }
-      if (char[].class == clazz) {
-        return new CharArrayWriter();
-      }
-      if (boolean[].class == clazz) {
-        return new BooleanArrayWriter();
-      }
-      return new ObjectArrayWriter();
+    public Codec(Map<Class<?>, ValueWriter<?>> config) {
+        this.config = config;
     }
-    if (Boolean.class == clazz) {
-      return new BooleanWriter();
-    }
-    if (CharSequence.class.isAssignableFrom(clazz)) {
-      return CharSequenceWriter.INSTANCE;
-    }
-    if (Map.class.isAssignableFrom(clazz)) {
-      return new MapWriter();
-    }
-    if (Collection.class.isAssignableFrom(clazz)) {
-      return new CollectionWriter();
+
+    @SuppressWarnings("unchecked")
+    public Codec() {
+        this(Collections.<Class<?>, ValueWriter<?>>emptyMap());
     }
-    if (ByteBuffer.class.isAssignableFrom(clazz)) {
-      return new ByteBufferWriter();
+
+    @Override
+    protected ValueWriter<?> computeValue(Class<?> clazz) {
+        ValueWriter<?> writer = config.get(clazz);
+        if (null != writer) {
+            return writer;
+        }
+        if (Number.class.isAssignableFrom(clazz)) {
+            if (Double.class == clazz) {
+                return new DoubleWriter();
+            }
+            if (Float.class == clazz) {
+                return new FloatWriter();
+            }
+            if (Integer.class == clazz) {
+                return new IntWriter();
+            }
+            if (Long.class == clazz) {
+                return new LongWriter();
+            }
+            if (Short.class == clazz) {
+                return new ShortWriter();
+            }
+            // This is some other Number type, that will be treated as a metric by the
+            // serializer, so let's write out its double value to be protocol compatible
+            return new NumberDoubleWriter();
+        }
+        if (clazz.isArray()) {
+            if (byte[].class == clazz) {
+                return new ByteArrayWriter();
+            }
+            if (int[].class == clazz) {
+                return new IntArrayWriter();
+            }
+            if (long[].class == clazz) {
+                return new LongArrayWriter();
+            }
+            if (double[].class == clazz) {
+                return new DoubleArrayWriter();
+            }
+            if (float[].class == clazz) {
+                return new FloatArrayWriter();
+            }
+            if (short[].class == clazz) {
+                return new ShortArrayWriter();
+            }
+            if (char[].class == clazz) {
+                return new CharArrayWriter();
+            }
+            if (boolean[].class == clazz) {
+                return new BooleanArrayWriter();
+            }
+            return new ObjectArrayWriter();
+        }
+        if (Boolean.class == clazz) {
+            return new BooleanWriter();
+        }
+        if (CharSequence.class.isAssignableFrom(clazz)) {
+            return CharSequenceWriter.INSTANCE;
+        }
+        if (Map.class.isAssignableFrom(clazz)) {
+            return new MapWriter();
+        }
+        if (Collection.class.isAssignableFrom(clazz)) {
+            return new CollectionWriter();
+        }
+        if (ByteBuffer.class.isAssignableFrom(clazz)) {
+            return new ByteBufferWriter();
+        }
+        return DefaultWriter.INSTANCE;
     }
-    return DefaultWriter.INSTANCE;
-  }
 
-  private static final class IntArrayWriter implements ValueWriter<int[]> {
+    private static final class IntArrayWriter implements ValueWriter<int[]> {
 
-    @Override
-    public void write(int[] value, Writable packer, EncodingCache encodingCache) {
-      packer.startArray(value.length);
-      for (int i : value) {
-        packer.writeInt(i);
-      }
+        @Override
+        public void write(int[] value, Writable packer, EncodingCache encodingCache) {
+            packer.startArray(value.length);
+            for (int i : value) {
+                packer.writeInt(i);
+            }
+        }
     }
-  }
 
-  private static final class ShortArrayWriter implements ValueWriter<short[]> {
+    private static final class ShortArrayWriter implements ValueWriter<short[]> {
 
-    @Override
-    public void write(short[] value, Writable packer, EncodingCache encodingCache) {
-      packer.startArray(value.length);
-      for (short i : value) {
-        packer.writeInt(i);
-      }
+        @Override
+        public void write(short[] value, Writable packer, EncodingCache encodingCache) {
+            packer.startArray(value.length);
+            for (short i : value) {
+                packer.writeInt(i);
+            }
+        }
     }
-  }
 
-  private static final class ByteArrayWriter implements ValueWriter<byte[]> {
+    private static final class ByteArrayWriter implements ValueWriter<byte[]> {
 
-    @Override
-    public void write(byte[] value, Writable packer, EncodingCache encodingCache) {
-      packer.writeBinary(value, 0, value.length);
+        @Override
+        public void write(byte[] value, Writable packer, EncodingCache encodingCache) {
+            packer.writeBinary(value, 0, value.length);
+        }
     }
-  }
 
-  private static final class ByteBufferWriter implements ValueWriter<ByteBuffer> {
+    private static final class ByteBufferWriter implements ValueWriter<ByteBuffer> {
 
-    @Override
-    public void write(ByteBuffer buffer, Writable packer, EncodingCache encodingCache) {
-      packer.writeBinary(buffer);
+        @Override
+        public void write(ByteBuffer buffer, Writable packer, EncodingCache encodingCache) {
+            packer.writeBinary(buffer);
+        }
     }
-  }
 
-  private static final class BooleanArrayWriter implements ValueWriter<boolean[]> {
+    private static final class BooleanArrayWriter implements ValueWriter<boolean[]> {
 
-    @Override
-    public void write(boolean[] value, Writable packer, EncodingCache encodingCache) {
-      packer.startArray(value.length);
-      for (boolean i : value) {
-        packer.writeBoolean(i);
-      }
+        @Override
+        public void write(boolean[] value, Writable packer, EncodingCache encodingCache) {
+            packer.startArray(value.length);
+            for (boolean i : value) {
+                packer.writeBoolean(i);
+            }
+        }
     }
-  }
 
-  private static final class DoubleArrayWriter implements ValueWriter<double[]> {
+    private static final class DoubleArrayWriter implements ValueWriter<double[]> {
 
-    @Override
-    public void write(double[] value, Writable packer, EncodingCache encodingCache) {
-      packer.startArray(value.length);
-      for (double i : value) {
-        packer.writeDouble(i);
-      }
+        @Override
+        public void write(double[] value, Writable packer, EncodingCache encodingCache) {
+            packer.startArray(value.length);
+            for (double i : value) {
+                packer.writeDouble(i);
+            }
+        }
     }
-  }
 
-  private static final class FloatArrayWriter implements ValueWriter<float[]> {
+    private static final class FloatArrayWriter implements ValueWriter<float[]> {
 
-    @Override
-    public void write(float[] value, Writable packer, EncodingCache encodingCache) {
-      packer.startArray(value.length);
-      for (float i : value) {
-        packer.writeFloat(i);
-      }
+        @Override
+        public void write(float[] value, Writable packer, EncodingCache encodingCache) {
+            packer.startArray(value.length);
+            for (float i : value) {
+                packer.writeFloat(i);
+            }
+        }
     }
-  }
 
-  private static final class LongArrayWriter implements ValueWriter<long[]> {
+    private static final class LongArrayWriter implements ValueWriter<long[]> {
 
-    @Override
-    public void write(long[] value, Writable packer, EncodingCache encodingCache) {
-      packer.startArray(value.length);
-      for (long i : value) {
-        packer.writeLong(i);
-      }
+        @Override
+        public void write(long[] value, Writable packer, EncodingCache encodingCache) {
+            packer.startArray(value.length);
+            for (long i : value) {
+                packer.writeLong(i);
+            }
+        }
     }
-  }
 
-  private static final class CollectionWriter implements ValueWriter<Collection<?>> {
+    private static final class CollectionWriter implements ValueWriter<Collection<?>> {
 
-    @Override
-    public void write(Collection<?> collection, Writable packer, EncodingCache encodingCache) {
-      packer.startArray(collection.size());
-      for (Object value : collection) {
-        packer.writeObject(value, encodingCache);
-      }
+        @Override
+        public void write(Collection<?> collection, Writable packer, EncodingCache encodingCache) {
+            packer.startArray(collection.size());
+            for (Object value : collection) {
+                packer.writeObject(value, encodingCache);
+            }
+        }
     }
-  }
 
-  private static final class ObjectArrayWriter implements ValueWriter<Object[]> {
+    private static final class ObjectArrayWriter implements ValueWriter<Object[]> {
 
-    @Override
-    public void write(Object[] array, Writable packer, EncodingCache encodingCache) {
-      packer.startArray(array.length);
-      for (Object value : array) {
-        packer.writeObject(value, encodingCache);
-      }
+        @Override
+        public void write(Object[] array, Writable packer, EncodingCache encodingCache) {
+            packer.startArray(array.length);
+            for (Object value : array) {
+                packer.writeObject(value, encodingCache);
+            }
+        }
     }
-  }
 
-  private static final class MapWriter implements ValueWriter<Map<? extends CharSequence, Object>> {
+    private static final class MapWriter implements ValueWriter<Map<? extends CharSequence, Object>> {
 
-    @Override
-    public void write(
-        Map<? extends CharSequence, Object> value, Writable packer, EncodingCache encodingCache) {
-      packer.writeMap(value, encodingCache);
+        @Override
+        public void write(Map<? extends CharSequence, Object> value, Writable packer, EncodingCache encodingCache) {
+            packer.writeMap(value, encodingCache);
+        }
     }
-  }
 
-  private static final class DoubleWriter implements ValueWriter<Double> {
+    private static final class DoubleWriter implements ValueWriter<Double> {
 
-    @Override
-    public void write(Double value, Writable packer, EncodingCache encodingCache) {
-      packer.writeDouble(value);
+        @Override
+        public void write(Double value, Writable packer, EncodingCache encodingCache) {
+            packer.writeDouble(value);
+        }
     }
-  }
 
-  private static final class BooleanWriter implements ValueWriter<Boolean> {
+    private static final class BooleanWriter implements ValueWriter<Boolean> {
 
-    @Override
-    public void write(Boolean value, Writable packer, EncodingCache encodingCache) {
-      packer.writeBoolean(value);
+        @Override
+        public void write(Boolean value, Writable packer, EncodingCache encodingCache) {
+            packer.writeBoolean(value);
+        }
     }
-  }
 
-  private static final class FloatWriter implements ValueWriter<Float> {
+    private static final class FloatWriter implements ValueWriter<Float> {
 
-    @Override
-    public void write(Float value, Writable packer, EncodingCache encodingCache) {
-      packer.writeFloat(value);
+        @Override
+        public void write(Float value, Writable packer, EncodingCache encodingCache) {
+            packer.writeFloat(value);
+        }
     }
-  }
 
-  private static final class IntWriter implements ValueWriter<Integer> {
+    private static final class IntWriter implements ValueWriter<Integer> {
 
-    @Override
-    public void write(Integer value, Writable packer, EncodingCache encodingCache) {
-      packer.writeInt(value);
+        @Override
+        public void write(Integer value, Writable packer, EncodingCache encodingCache) {
+            packer.writeInt(value);
+        }
     }
-  }
 
-  private static final class ShortWriter implements ValueWriter<Short> {
+    private static final class ShortWriter implements ValueWriter<Short> {
 
-    @Override
-    public void write(Short value, Writable packer, EncodingCache encodingCache) {
-      packer.writeInt(value);
+        @Override
+        public void write(Short value, Writable packer, EncodingCache encodingCache) {
+            packer.writeInt(value);
+        }
     }
-  }
 
-  private static final class LongWriter implements ValueWriter<Long> {
+    private static final class LongWriter implements ValueWriter<Long> {
 
-    @Override
-    public void write(Long value, Writable packer, EncodingCache encodingCache) {
-      packer.writeLong(value);
+        @Override
+        public void write(Long value, Writable packer, EncodingCache encodingCache) {
+            packer.writeLong(value);
+        }
     }
-  }
 
-  private static final class NumberDoubleWriter implements ValueWriter<Number> {
+    private static final class NumberDoubleWriter implements ValueWriter<Number> {
 
-    @Override
-    public void write(Number value, Writable packer, EncodingCache encodingCache) {
-      packer.writeDouble(value.doubleValue());
+        @Override
+        public void write(Number value, Writable packer, EncodingCache encodingCache) {
+            packer.writeDouble(value.doubleValue());
+        }
     }
-  }
 
-  private static final class CharSequenceWriter implements ValueWriter<CharSequence> {
+    private static final class CharSequenceWriter implements ValueWriter<CharSequence> {
 
-    public static final CharSequenceWriter INSTANCE = new CharSequenceWriter();
+        public static final CharSequenceWriter INSTANCE = new CharSequenceWriter();
 
-    @Override
-    public void write(CharSequence value, Writable packer, EncodingCache encodingCache) {
-      packer.writeString(value, encodingCache);
+        @Override
+        public void write(CharSequence value, Writable packer, EncodingCache encodingCache) {
+            packer.writeString(value, encodingCache);
+        }
     }
-  }
 
-  private static final class CharArrayWriter implements ValueWriter<char[]> {
+    private static final class CharArrayWriter implements ValueWriter<char[]> {
 
-    @Override
-    public void write(char[] value, Writable packer, EncodingCache encodingCache) {
-      packer.writeString(CharBuffer.wrap(value), null);
+        @Override
+        public void write(char[] value, Writable packer, EncodingCache encodingCache) {
+            packer.writeString(CharBuffer.wrap(value), null);
+        }
     }
-  }
 
-  private static final class DefaultWriter implements ValueWriter<Object> {
+    private static final class DefaultWriter implements ValueWriter<Object> {
 
-    public static final DefaultWriter INSTANCE = new DefaultWriter();
+        public static final DefaultWriter INSTANCE = new DefaultWriter();
 
-    @Override
-    public void write(Object value, Writable packer, EncodingCache encodingCache) {
-      CharSequenceWriter.INSTANCE.write(String.valueOf(value), packer, null);
+        @Override
+        public void write(Object value, Writable packer, EncodingCache encodingCache) {
+            CharSequenceWriter.INSTANCE.write(String.valueOf(value), packer, null);
+        }
     }
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/EncodingCache.java b/communication/src/main/java/datadog/communication/serialization/EncodingCache.java
index 4833eb8695a..036c8535729 100644
--- a/communication/src/main/java/datadog/communication/serialization/EncodingCache.java
+++ b/communication/src/main/java/datadog/communication/serialization/EncodingCache.java
@@ -3,5 +3,5 @@
 // TODO @FunctionalInterface
 public interface EncodingCache {
 
-  byte[] encode(CharSequence s);
+    byte[] encode(CharSequence s);
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/FlushingBuffer.java b/communication/src/main/java/datadog/communication/serialization/FlushingBuffer.java
index e3087bd5f27..c0e5fc55bb4 100644
--- a/communication/src/main/java/datadog/communication/serialization/FlushingBuffer.java
+++ b/communication/src/main/java/datadog/communication/serialization/FlushingBuffer.java
@@ -5,110 +5,110 @@
 
 public final class FlushingBuffer implements StreamingBuffer {
 
-  private final ByteBuffer buffer;
-  private final ByteBufferConsumer consumer;
-
-  private int messageCount;
-  private int mark;
-
-  public FlushingBuffer(int capacity, ByteBufferConsumer consumer) {
-    this.buffer = ByteBuffer.allocate(capacity);
-    this.consumer = consumer;
-  }
-
-  @Override
-  public int capacity() {
-    return buffer.capacity();
-  }
-
-  @Override
-  public boolean isDirty() {
-    return mark > 0;
-  }
-
-  @Override
-  public void mark() {
-    int current = buffer.position();
-    if (current != mark) {
-      // count only non-empty messages
-      ++messageCount;
-      mark = current;
-    }
-  }
-
-  @Override
-  public boolean flush() {
-    if (messageCount == 0) {
-      return false;
-    }
-    buffer.limit(mark);
-    buffer.flip();
-    ByteBuffer toPublish = buffer.slice();
-    consumer.accept(messageCount, toPublish);
-    reset();
-    return true;
-  }
-
-  @Override
-  public void put(byte b) {
-    buffer.put(b);
-  }
-
-  @Override
-  public void putShort(short s) {
-    buffer.putShort(s);
-  }
-
-  @Override
-  public void putChar(char c) {
-    buffer.putChar(c);
-  }
-
-  @Override
-  public void putInt(int i) {
-    buffer.putInt(i);
-  }
-
-  @Override
-  public void putLong(long l) {
-    buffer.putLong(l);
-  }
-
-  @Override
-  public void putFloat(float f) {
-    buffer.putFloat(f);
-  }
-
-  @Override
-  public void putDouble(double d) {
-    buffer.putDouble(d);
-  }
-
-  @Override
-  public void put(byte[] bytes) {
-    buffer.put(bytes);
-  }
-
-  @Override
-  public void put(byte[] bytes, int offset, int length) {
-    buffer.put(bytes, offset, length);
-  }
-
-  @Override
-  public void put(ByteBuffer buffer) {
-    this.buffer.put(buffer);
-  }
-
-  @Override
-  public void reset() {
-    messageCount = 0;
-    buffer.position(0);
-    buffer.limit(buffer.capacity());
-    mark = 0;
-  }
-
-  @VisibleForTesting
-  int getMessageCount() {
-    return messageCount;
-  }
+    private final ByteBuffer buffer;
+    private final ByteBufferConsumer consumer;
+
+    private int messageCount;
+    private int mark;
+
+    public FlushingBuffer(int capacity, ByteBufferConsumer consumer) {
+        this.buffer = ByteBuffer.allocate(capacity);
+        this.consumer = consumer;
+    }
+
+    @Override
+    public int capacity() {
+        return buffer.capacity();
+    }
+
+    @Override
+    public boolean isDirty() {
+        return mark > 0;
+    }
+
+    @Override
+    public void mark() {
+        int current = buffer.position();
+        if (current != mark) {
+            // count only non-empty messages
+            ++messageCount;
+            mark = current;
+        }
+    }
+
+    @Override
+    public boolean flush() {
+        if (messageCount == 0) {
+            return false;
+        }
+        buffer.limit(mark);
+        buffer.flip();
+        ByteBuffer toPublish = buffer.slice();
+        consumer.accept(messageCount, toPublish);
+        reset();
+        return true;
+    }
+
+    @Override
+    public void put(byte b) {
+        buffer.put(b);
+    }
+
+    @Override
+    public void putShort(short s) {
+        buffer.putShort(s);
+    }
+
+    @Override
+    public void putChar(char c) {
+        buffer.putChar(c);
+    }
+
+    @Override
+    public void putInt(int i) {
+        buffer.putInt(i);
+    }
+
+    @Override
+    public void putLong(long l) {
+        buffer.putLong(l);
+    }
+
+    @Override
+    public void putFloat(float f) {
+        buffer.putFloat(f);
+    }
+
+    @Override
+    public void putDouble(double d) {
+        buffer.putDouble(d);
+    }
+
+    @Override
+    public void put(byte[] bytes) {
+        buffer.put(bytes);
+    }
+
+    @Override
+    public void put(byte[] bytes, int offset, int length) {
+        buffer.put(bytes, offset, length);
+    }
+
+    @Override
+    public void put(ByteBuffer buffer) {
+        this.buffer.put(buffer);
+    }
+
+    @Override
+    public void reset() {
+        messageCount = 0;
+        buffer.position(0);
+        buffer.limit(buffer.capacity());
+        mark = 0;
+    }
+
+    @VisibleForTesting
+    int getMessageCount() {
+        return messageCount;
+    }
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/GenerationalUtf8Cache.java b/communication/src/main/java/datadog/communication/serialization/GenerationalUtf8Cache.java
index 099ff56e0e0..d6c71095635 100644
--- a/communication/src/main/java/datadog/communication/serialization/GenerationalUtf8Cache.java
+++ b/communication/src/main/java/datadog/communication/serialization/GenerationalUtf8Cache.java
@@ -65,406 +65,402 @@
  */
 @ThreadSafe
 @SuppressFBWarnings(
-    value = "IS2_INCONSISTENT_SYNC",
-    justification =
-        "stat updates are deliberately racy - sync is only used to prevent simultaneous bulk updates")
+        value = "IS2_INCONSISTENT_SYNC",
+        justification = "stat updates are deliberately racy - sync is only used to prevent simultaneous bulk updates")
 public final class GenerationalUtf8Cache implements EncodingCache {
-  static final int MAX_EDEN_CAPACITY = 512;
-  static final int MAX_TENURED_CAPACITY = 1024;
+    static final int MAX_EDEN_CAPACITY = 512;
+    static final int MAX_TENURED_CAPACITY = 1024;
 
-  private static final int MAX_EDEN_PROBES = 4;
-  private static final int MAX_TENURED_PROBES = 8;
-
-  private static final int MIN_PROMOTION_THRESHOLD = 2;
-  private static final int INITIAL_PROMOTION_THRESHOLD = 16;
-
-  private static final double SCORE_DECAY = 0.5D;
-  private static final double PURGE_THRESHOLD = 0.25D;
-  private static final double PROMOTION_THRESHOLD_ADJ_FACTOR = 1.5;
-
-  private static final double EDEN_PROPORTION = 1D / 3D;
-  private static final double TENURED_PROPORTION = 1 - EDEN_PROPORTION;
-
-  static final int MAX_ENTRY_LEN = 256;
-
-  final CacheEntry[] edenEntries;
-  private final int[] edenMarkers;
-
-  final CacheEntry[] tenuredEntries;
-
-  private long accessTimeMs;
-  private double promotionThreshold = INITIAL_PROMOTION_THRESHOLD;
-
-  int edenHits = 0;
-  int tenuredHits = 0;
-  int earlyPromotions = 0;
-  int promotions = 0;
-  int edenEvictions = 0;
-  int tenuredEvictions = 0;
-
-  public GenerationalUtf8Cache(int capacity) {
-    this.accessTimeMs = System.currentTimeMillis();
-
-    int edenCapacity = (int) (capacity * EDEN_PROPORTION);
-    int edenSize = Caching.cacheSizeFor(Math.min(edenCapacity, MAX_EDEN_CAPACITY));
-
-    // These sizes must be powers of 2
-    this.edenEntries = new CacheEntry[edenSize];
-    this.edenMarkers = new int[edenSize];
-
-    int tenuredCapacity = (int) (capacity * TENURED_PROPORTION);
-    int tenuredSize = Caching.cacheSizeFor(Math.min(tenuredCapacity, MAX_TENURED_CAPACITY));
-
-    // The size must be a power of 2
-    this.tenuredEntries = new CacheEntry[tenuredSize];
-  }
-
-  public GenerationalUtf8Cache(int edenCapacity, int tenuredCapacity) {
-    this.accessTimeMs = System.currentTimeMillis();
-
-    int edenSize = Caching.cacheSizeFor(Math.min(edenCapacity, MAX_EDEN_CAPACITY));
-    this.edenEntries = new CacheEntry[edenSize];
-    this.edenMarkers = new int[edenSize];
-
-    int tenuredSize = Caching.cacheSizeFor(Math.min(tenuredCapacity, MAX_TENURED_CAPACITY));
-    this.tenuredEntries = new CacheEntry[tenuredSize];
-  }
-
-  public int edenCapacity() {
-    return this.edenEntries.length;
-  }
-
-  public int tenuredCapacity() {
-    return this.tenuredEntries.length;
-  }
-
-  /** Updates the access time used by {@link #getUtf8(String)} to the provided value. */
-  @SuppressFBWarnings("AT_NONATOMIC_64BIT_PRIMITIVE")
-  public void updateAccessTime(long accessTimeMs) {
-    this.accessTimeMs = accessTimeMs;
-  }
-
-  /** Updates access time to the @link {@link System#currentTimeMillis()} */
-  public void refreshAccessTime() {
-    this.updateAccessTime(System.currentTimeMillis());
-  }
-
-  public synchronized void recalibrate() {
-    this.recalibrate(System.currentTimeMillis());
-  }
-
-  /**
-   * Recalibrates the cache Applies a decay to existing entries - and purges entries below the
-   * PURGE_THRESHOLD
-   *
-   * <p>Adjusts the promotion threshold depending on ratio of promotions to evictions, since prior
-   * recalibration
-   *
-   * <p>While still racy this method is synchronized to avoid simultaneous recalibrations
-   */
-  public synchronized void recalibrate(long accessTimeMs) {
-    this.accessTimeMs = accessTimeMs;
-
-    recalibrate(this.edenEntries);
-    Caching.reset(this.edenMarkers);
-    recalibrate(this.tenuredEntries);
-
-    int totalPromotions = this.promotions + this.earlyPromotions;
-    if (totalPromotions == 0 && this.promotionThreshold >= MIN_PROMOTION_THRESHOLD) {
-      this.promotionThreshold /= PROMOTION_THRESHOLD_ADJ_FACTOR;
-    } else if (totalPromotions > this.tenuredEvictions / 2) {
-      this.promotionThreshold *= PROMOTION_THRESHOLD_ADJ_FACTOR;
-    }
+    private static final int MAX_EDEN_PROBES = 4;
+    private static final int MAX_TENURED_PROBES = 8;
 
-    this.edenHits = 0;
-    this.tenuredHits = 0;
-    this.earlyPromotions = 0;
-    this.promotions = 0;
-    this.edenEvictions = 0;
-    this.tenuredEvictions = 0;
-  }
-
-  static final void recalibrate(CacheEntry[] entries) {
-    for (int i = 0; i < entries.length; ++i) {
-      CacheEntry entry = entries[i];
-      if (entry == null) continue;
-
-      boolean purge = entry.decay();
-      if (purge) entries[i] = null;
-    }
-  }
-
-  @Override
-  public byte[] encode(CharSequence charSeq) {
-    if (charSeq instanceof String) {
-      String str = (String) charSeq;
-      return this.getUtf8(str);
-    } else {
-      return null;
-    }
-  }
-
-  /** Returns the UTF-8 encoding of value -- using a cache value if available */
-  public final byte[] getUtf8(String value) {
-    return this.getUtf8(value, this.accessTimeMs);
-  }
-
-  /**
-   * Returns the UTF-8 encoding of value -- using a cache value if available If there is cache hit,
-   * the specified accessTimeMs is used to update the cache entry
-   */
-  public final byte[] getUtf8(String value, long accessTimeMs) {
-    if (value.length() > MAX_ENTRY_LEN) return CacheEntry.utf8(value);
-
-    int adjHash = Caching.adjHash(value);
-
-    CacheEntry[] tenuredEntries = this.tenuredEntries;
-    int matchingTenuredIndex = lookupEntryIndex(tenuredEntries, MAX_TENURED_PROBES, adjHash, value);
-    if (matchingTenuredIndex != -1) {
-      // The slot can be mutated concurrently between the lookup and this read: nulled (recalibrate
-      // purge / eviction) or reassigned to a *different* value. CacheEntry identity is immutable
-      // (adjHash/value/valueUtf8 are final), so re-validate the loaded reference against the
-      // request; anything but a match means the slot moved out from under us, so fall through and
-      // treat it as a miss rather than NPE'ing (null) or returning another value's bytes
-      // (reassigned).
-      CacheEntry tenuredEntry = tenuredEntries[matchingTenuredIndex];
-      if (tenuredEntry != null && tenuredEntry.matches(adjHash, value)) {
-        tenuredEntry.hit(accessTimeMs);
-
-        this.tenuredHits += 1;
-        return tenuredEntry.utf8();
-      }
-    }
+    private static final int MIN_PROMOTION_THRESHOLD = 2;
+    private static final int INITIAL_PROMOTION_THRESHOLD = 16;
 
-    CacheEntry[] edenEntries = this.edenEntries;
-    int matchingEdenIndex = lookupEntryIndex(edenEntries, MAX_EDEN_PROBES, adjHash, value);
-    if (matchingEdenIndex != -1) {
-      // Same lookup-then-read race as tenured, plus concurrent promotion nulls the slot (line
-      // below); re-validate the loaded reference and treat null-or-mismatch as a miss.
-      CacheEntry edenEntry = edenEntries[matchingEdenIndex];
-      if (edenEntry != null && edenEntry.matches(adjHash, value)) {
-        double hits = edenEntry.hit(accessTimeMs);
-        if (hits > this.promotionThreshold) {
-          // mark promoted first - to avoid racy insertions
-          this.promotions += 1;
-
-          boolean evicted = lruInsert(this.tenuredEntries, MAX_TENURED_PROBES, edenEntry);
-          if (evicted) this.tenuredEvictions += 1;
-
-          edenEntries[matchingEdenIndex] = null;
-        }
+    private static final double SCORE_DECAY = 0.5D;
+    private static final double PURGE_THRESHOLD = 0.25D;
+    private static final double PROMOTION_THRESHOLD_ADJ_FACTOR = 1.5;
 
-        this.edenHits += 1;
-        return edenEntry.utf8();
-      }
-    }
+    private static final double EDEN_PROPORTION = 1D / 3D;
+    private static final double TENURED_PROPORTION = 1 - EDEN_PROPORTION;
 
-    boolean wasMarked = Caching.mark(this.edenMarkers, adjHash);
+    static final int MAX_ENTRY_LEN = 256;
 
-    // If slot isn't marked, this is likely the first request
-    // Don't create an entry yet
-    if (!wasMarked) return CacheEntry.utf8(value);
+    final CacheEntry[] edenEntries;
+    private final int[] edenMarkers;
 
-    CacheEntry newEntry = new CacheEntry(adjHash, value);
-    // First request was swallowed by marking, so double hit
-    newEntry.hit(accessTimeMs);
-    newEntry.hit(accessTimeMs);
+    final CacheEntry[] tenuredEntries;
 
-    // search for empty slot or failing that the MFU entry
-    int edenMfuIndex = findFirstAvailableOrMfuIndex(edenEntries, MAX_EDEN_PROBES, adjHash);
-    CacheEntry edenMfuEntry = edenEntries[edenMfuIndex];
+    private long accessTimeMs;
+    private double promotionThreshold = INITIAL_PROMOTION_THRESHOLD;
 
-    // Found an empty slot - fill it
-    if (edenMfuEntry == null) {
-      edenEntries[edenMfuIndex] = newEntry;
-      return newEntry.utf8();
-    }
+    int edenHits = 0;
+    int tenuredHits = 0;
+    int earlyPromotions = 0;
+    int promotions = 0;
+    int edenEvictions = 0;
+    int tenuredEvictions = 0;
+
+    public GenerationalUtf8Cache(int capacity) {
+        this.accessTimeMs = System.currentTimeMillis();
 
-    // See if we can early promote the local MFU entry into the global cache
-    // Early promotion doesn't evict from the global cache
+        int edenCapacity = (int) (capacity * EDEN_PROPORTION);
+        int edenSize = Caching.cacheSizeFor(Math.min(edenCapacity, MAX_EDEN_CAPACITY));
 
-    // NOTE: Need to make sure to use hash of the entry being promoted,
-    // since it may differ from the requested hash
-    int tenuredAvailableIndex =
-        findAvailableIndex(tenuredEntries, MAX_TENURED_PROBES, edenMfuEntry.adjHash());
-    if (tenuredAvailableIndex != -1) {
-      tenuredEntries[tenuredAvailableIndex] = edenMfuEntry;
-      this.earlyPromotions += 1;
+        // These sizes must be powers of 2
+        this.edenEntries = new CacheEntry[edenSize];
+        this.edenMarkers = new int[edenSize];
 
-      edenEntries[edenMfuIndex] = newEntry;
-      return newEntry.utf8();
+        int tenuredCapacity = (int) (capacity * TENURED_PROPORTION);
+        int tenuredSize = Caching.cacheSizeFor(Math.min(tenuredCapacity, MAX_TENURED_CAPACITY));
+
+        // The size must be a power of 2
+        this.tenuredEntries = new CacheEntry[tenuredSize];
     }
 
-    // No empty slot - or space to promote into the global cache
-    // Insert into local cache while evicting the LFU
-    boolean evicted = lfuInsert(edenEntries, MAX_EDEN_PROBES, newEntry);
-    if (evicted) this.edenEvictions += 1;
+    public GenerationalUtf8Cache(int edenCapacity, int tenuredCapacity) {
+        this.accessTimeMs = System.currentTimeMillis();
 
-    return newEntry.utf8();
-  }
+        int edenSize = Caching.cacheSizeFor(Math.min(edenCapacity, MAX_EDEN_CAPACITY));
+        this.edenEntries = new CacheEntry[edenSize];
+        this.edenMarkers = new int[edenSize];
 
-  static final int findAvailableIndex(CacheEntry[] entries, int numProbes, int newAdjHash) {
-    int initialBucketIndex = Caching.bucketIndex(entries, newAdjHash);
-    for (int probe = 0, index = initialBucketIndex; probe < numProbes; ++probe, ++index) {
-      if (index >= entries.length) index = 0;
+        int tenuredSize = Caching.cacheSizeFor(Math.min(tenuredCapacity, MAX_TENURED_CAPACITY));
+        this.tenuredEntries = new CacheEntry[tenuredSize];
+    }
 
-      CacheEntry entry = entries[index];
-      if (entry == null || entry.isPurgeable()) return index;
+    public int edenCapacity() {
+        return this.edenEntries.length;
     }
-    return -1;
-  }
-
-  static final int findFirstAvailableOrMfuIndex(
-      CacheEntry[] entries, int numProbes, int newAdjHash) {
-    double mfuScore = Double.MIN_VALUE;
-    int mfuIndex = -1;
-
-    int initialBucketIndex = Caching.bucketIndex(entries, newAdjHash);
-    for (int probe = 0, index = initialBucketIndex; probe < numProbes; ++probe, ++index) {
-      if (index >= entries.length) index = 0;
-
-      CacheEntry entry = entries[index];
-      if (entry == null) return index;
-
-      double score = entry.score();
-      if (score > mfuScore) {
-        mfuScore = score;
-        mfuIndex = index;
-      }
+
+    public int tenuredCapacity() {
+        return this.tenuredEntries.length;
     }
-    return mfuIndex;
-  }
-
-  static final boolean lfuInsert(CacheEntry[] entries, int numProbes, CacheEntry newEntry) {
-    int initialBucketIndex = Caching.bucketIndex(entries, newEntry.adjHash());
-
-    // initial scan to see if there's an empty slot or marker entry is already present
-    double lowestScore = Double.MAX_VALUE;
-    int lfuIndex = -1;
-    for (int probe = 0, index = initialBucketIndex; probe < numProbes; ++probe, ++index) {
-      if (index >= entries.length) index = 0;
-
-      CacheEntry entry = entries[index];
-      if (entry == null || entry.isPurgeable()) {
-        entries[index] = newEntry;
-        return false;
-      } else {
-        double score = entry.score();
-        if (score < lowestScore) {
-          lowestScore = score;
-          lfuIndex = index;
-        }
-      }
+
+    /** Updates the access time used by {@link #getUtf8(String)} to the provided value. */
+    @SuppressFBWarnings("AT_NONATOMIC_64BIT_PRIMITIVE")
+    public void updateAccessTime(long accessTimeMs) {
+        this.accessTimeMs = accessTimeMs;
     }
 
-    // If we get here, then we're evicting the LFU
-    entries[lfuIndex] = newEntry;
-    return true;
-  }
-
-  static final boolean lruInsert(CacheEntry[] entries, int numProbes, CacheEntry newEntry) {
-    int initialBucketIndex = Caching.bucketIndex(entries, newEntry.adjHash());
-
-    // initial scan to see if there's an empty slot or entry is already present
-    long lowestUsedMs = Long.MAX_VALUE;
-    int lruIndex = -1;
-    for (int probe = 0, index = initialBucketIndex; probe < numProbes; ++probe, ++index) {
-      if (index >= entries.length) index = 0;
-
-      CacheEntry entry = entries[index];
-      if (entry == null || entry.matches(newEntry)) {
-        entries[index] = newEntry;
-        return false;
-      }
-
-      long lastUsedMs = entry.lastUsedMs();
-      if (lastUsedMs < lowestUsedMs) {
-        lowestUsedMs = lastUsedMs;
-        lruIndex = index;
-      }
+    /** Updates access time to the @link {@link System#currentTimeMillis()} */
+    public void refreshAccessTime() {
+        this.updateAccessTime(System.currentTimeMillis());
     }
 
-    entries[lruIndex] = newEntry;
-    return true;
-  }
+    public synchronized void recalibrate() {
+        this.recalibrate(System.currentTimeMillis());
+    }
 
-  static final int lookupEntryIndex(
-      CacheEntry[] entries, int numProbes, int adjHash, String value) {
-    int initialBucketIndex = Caching.bucketIndex(entries, adjHash);
-    for (int probe = 0, index = initialBucketIndex; probe < numProbes; ++probe, ++index) {
-      if (index >= entries.length) index = 0;
+    /**
+     * Recalibrates the cache Applies a decay to existing entries - and purges entries below the
+     * PURGE_THRESHOLD
+     *
+     * <p>Adjusts the promotion threshold depending on ratio of promotions to evictions, since prior
+     * recalibration
+     *
+     * <p>While still racy this method is synchronized to avoid simultaneous recalibrations
+     */
+    public synchronized void recalibrate(long accessTimeMs) {
+        this.accessTimeMs = accessTimeMs;
+
+        recalibrate(this.edenEntries);
+        Caching.reset(this.edenMarkers);
+        recalibrate(this.tenuredEntries);
+
+        int totalPromotions = this.promotions + this.earlyPromotions;
+        if (totalPromotions == 0 && this.promotionThreshold >= MIN_PROMOTION_THRESHOLD) {
+            this.promotionThreshold /= PROMOTION_THRESHOLD_ADJ_FACTOR;
+        } else if (totalPromotions > this.tenuredEvictions / 2) {
+            this.promotionThreshold *= PROMOTION_THRESHOLD_ADJ_FACTOR;
+        }
 
-      CacheEntry entry = entries[index];
-      if (entry != null && entry.matches(adjHash, value)) {
-        return index;
-      }
-    }
-    return -1;
-  }
-
-  static final class CacheEntry {
-    final int adjHash;
-    final String value;
-    final byte[] valueUtf8;
-
-    boolean promoted = false;
-    long lastUsedMs = 0;
-    double score = 0;
-
-    public CacheEntry(int adjHash, String value) {
-      this.adjHash = adjHash;
-      this.value = value;
-      this.valueUtf8 = utf8(value);
+        this.edenHits = 0;
+        this.tenuredHits = 0;
+        this.earlyPromotions = 0;
+        this.promotions = 0;
+        this.edenEvictions = 0;
+        this.tenuredEvictions = 0;
     }
 
-    boolean matches(CacheEntry thatEntry) {
-      return (this == thatEntry) || this.matches(thatEntry.adjHash, thatEntry.value);
-    }
+    static final void recalibrate(CacheEntry[] entries) {
+        for (int i = 0; i < entries.length; ++i) {
+            CacheEntry entry = entries[i];
+            if (entry == null) continue;
 
-    boolean matches(int adjHash, String value) {
-      return (this.adjHash == adjHash) && value.equals(this.value);
+            boolean purge = entry.decay();
+            if (purge) entries[i] = null;
+        }
     }
 
-    int adjHash() {
-      return this.adjHash;
+    @Override
+    public byte[] encode(CharSequence charSeq) {
+        if (charSeq instanceof String) {
+            String str = (String) charSeq;
+            return this.getUtf8(str);
+        } else {
+            return null;
+        }
     }
 
-    double score() {
-      return this.score;
+    /** Returns the UTF-8 encoding of value -- using a cache value if available */
+    public final byte[] getUtf8(String value) {
+        return this.getUtf8(value, this.accessTimeMs);
     }
 
-    long lastUsedMs() {
-      return this.lastUsedMs;
+    /**
+     * Returns the UTF-8 encoding of value -- using a cache value if available If there is cache hit,
+     * the specified accessTimeMs is used to update the cache entry
+     */
+    public final byte[] getUtf8(String value, long accessTimeMs) {
+        if (value.length() > MAX_ENTRY_LEN) return CacheEntry.utf8(value);
+
+        int adjHash = Caching.adjHash(value);
+
+        CacheEntry[] tenuredEntries = this.tenuredEntries;
+        int matchingTenuredIndex = lookupEntryIndex(tenuredEntries, MAX_TENURED_PROBES, adjHash, value);
+        if (matchingTenuredIndex != -1) {
+            // The slot can be mutated concurrently between the lookup and this read: nulled (recalibrate
+            // purge / eviction) or reassigned to a *different* value. CacheEntry identity is immutable
+            // (adjHash/value/valueUtf8 are final), so re-validate the loaded reference against the
+            // request; anything but a match means the slot moved out from under us, so fall through and
+            // treat it as a miss rather than NPE'ing (null) or returning another value's bytes
+            // (reassigned).
+            CacheEntry tenuredEntry = tenuredEntries[matchingTenuredIndex];
+            if (tenuredEntry != null && tenuredEntry.matches(adjHash, value)) {
+                tenuredEntry.hit(accessTimeMs);
+
+                this.tenuredHits += 1;
+                return tenuredEntry.utf8();
+            }
+        }
+
+        CacheEntry[] edenEntries = this.edenEntries;
+        int matchingEdenIndex = lookupEntryIndex(edenEntries, MAX_EDEN_PROBES, adjHash, value);
+        if (matchingEdenIndex != -1) {
+            // Same lookup-then-read race as tenured, plus concurrent promotion nulls the slot (line
+            // below); re-validate the loaded reference and treat null-or-mismatch as a miss.
+            CacheEntry edenEntry = edenEntries[matchingEdenIndex];
+            if (edenEntry != null && edenEntry.matches(adjHash, value)) {
+                double hits = edenEntry.hit(accessTimeMs);
+                if (hits > this.promotionThreshold) {
+                    // mark promoted first - to avoid racy insertions
+                    this.promotions += 1;
+
+                    boolean evicted = lruInsert(this.tenuredEntries, MAX_TENURED_PROBES, edenEntry);
+                    if (evicted) this.tenuredEvictions += 1;
+
+                    edenEntries[matchingEdenIndex] = null;
+                }
+
+                this.edenHits += 1;
+                return edenEntry.utf8();
+            }
+        }
+
+        boolean wasMarked = Caching.mark(this.edenMarkers, adjHash);
+
+        // If slot isn't marked, this is likely the first request
+        // Don't create an entry yet
+        if (!wasMarked) return CacheEntry.utf8(value);
+
+        CacheEntry newEntry = new CacheEntry(adjHash, value);
+        // First request was swallowed by marking, so double hit
+        newEntry.hit(accessTimeMs);
+        newEntry.hit(accessTimeMs);
+
+        // search for empty slot or failing that the MFU entry
+        int edenMfuIndex = findFirstAvailableOrMfuIndex(edenEntries, MAX_EDEN_PROBES, adjHash);
+        CacheEntry edenMfuEntry = edenEntries[edenMfuIndex];
+
+        // Found an empty slot - fill it
+        if (edenMfuEntry == null) {
+            edenEntries[edenMfuIndex] = newEntry;
+            return newEntry.utf8();
+        }
+
+        // See if we can early promote the local MFU entry into the global cache
+        // Early promotion doesn't evict from the global cache
+
+        // NOTE: Need to make sure to use hash of the entry being promoted,
+        // since it may differ from the requested hash
+        int tenuredAvailableIndex = findAvailableIndex(tenuredEntries, MAX_TENURED_PROBES, edenMfuEntry.adjHash());
+        if (tenuredAvailableIndex != -1) {
+            tenuredEntries[tenuredAvailableIndex] = edenMfuEntry;
+            this.earlyPromotions += 1;
+
+            edenEntries[edenMfuIndex] = newEntry;
+            return newEntry.utf8();
+        }
+
+        // No empty slot - or space to promote into the global cache
+        // Insert into local cache while evicting the LFU
+        boolean evicted = lfuInsert(edenEntries, MAX_EDEN_PROBES, newEntry);
+        if (evicted) this.edenEvictions += 1;
+
+        return newEntry.utf8();
     }
 
-    byte[] utf8() {
-      return this.valueUtf8;
+    static final int findAvailableIndex(CacheEntry[] entries, int numProbes, int newAdjHash) {
+        int initialBucketIndex = Caching.bucketIndex(entries, newAdjHash);
+        for (int probe = 0, index = initialBucketIndex; probe < numProbes; ++probe, ++index) {
+            if (index >= entries.length) index = 0;
+
+            CacheEntry entry = entries[index];
+            if (entry == null || entry.isPurgeable()) return index;
+        }
+        return -1;
     }
 
-    double hit(long lastUsedMs) {
-      this.lastUsedMs = lastUsedMs;
-      this.score += 1;
+    static final int findFirstAvailableOrMfuIndex(CacheEntry[] entries, int numProbes, int newAdjHash) {
+        double mfuScore = Double.MIN_VALUE;
+        int mfuIndex = -1;
 
-      return this.score;
+        int initialBucketIndex = Caching.bucketIndex(entries, newAdjHash);
+        for (int probe = 0, index = initialBucketIndex; probe < numProbes; ++probe, ++index) {
+            if (index >= entries.length) index = 0;
+
+            CacheEntry entry = entries[index];
+            if (entry == null) return index;
+
+            double score = entry.score();
+            if (score > mfuScore) {
+                mfuScore = score;
+                mfuIndex = index;
+            }
+        }
+        return mfuIndex;
     }
 
-    boolean decay() {
-      this.score *= SCORE_DECAY;
+    static final boolean lfuInsert(CacheEntry[] entries, int numProbes, CacheEntry newEntry) {
+        int initialBucketIndex = Caching.bucketIndex(entries, newEntry.adjHash());
+
+        // initial scan to see if there's an empty slot or marker entry is already present
+        double lowestScore = Double.MAX_VALUE;
+        int lfuIndex = -1;
+        for (int probe = 0, index = initialBucketIndex; probe < numProbes; ++probe, ++index) {
+            if (index >= entries.length) index = 0;
+
+            CacheEntry entry = entries[index];
+            if (entry == null || entry.isPurgeable()) {
+                entries[index] = newEntry;
+                return false;
+            } else {
+                double score = entry.score();
+                if (score < lowestScore) {
+                    lowestScore = score;
+                    lfuIndex = index;
+                }
+            }
+        }
 
-      return this.isPurgeable();
+        // If we get here, then we're evicting the LFU
+        entries[lfuIndex] = newEntry;
+        return true;
     }
 
-    boolean isPurgeable() {
-      return (this.score < PURGE_THRESHOLD);
+    static final boolean lruInsert(CacheEntry[] entries, int numProbes, CacheEntry newEntry) {
+        int initialBucketIndex = Caching.bucketIndex(entries, newEntry.adjHash());
+
+        // initial scan to see if there's an empty slot or entry is already present
+        long lowestUsedMs = Long.MAX_VALUE;
+        int lruIndex = -1;
+        for (int probe = 0, index = initialBucketIndex; probe < numProbes; ++probe, ++index) {
+            if (index >= entries.length) index = 0;
+
+            CacheEntry entry = entries[index];
+            if (entry == null || entry.matches(newEntry)) {
+                entries[index] = newEntry;
+                return false;
+            }
+
+            long lastUsedMs = entry.lastUsedMs();
+            if (lastUsedMs < lowestUsedMs) {
+                lowestUsedMs = lastUsedMs;
+                lruIndex = index;
+            }
+        }
+
+        entries[lruIndex] = newEntry;
+        return true;
     }
 
-    static final byte[] utf8(String value) {
-      return value.getBytes(StandardCharsets.UTF_8);
+    static final int lookupEntryIndex(CacheEntry[] entries, int numProbes, int adjHash, String value) {
+        int initialBucketIndex = Caching.bucketIndex(entries, adjHash);
+        for (int probe = 0, index = initialBucketIndex; probe < numProbes; ++probe, ++index) {
+            if (index >= entries.length) index = 0;
+
+            CacheEntry entry = entries[index];
+            if (entry != null && entry.matches(adjHash, value)) {
+                return index;
+            }
+        }
+        return -1;
     }
 
-    @Override
-    public String toString() {
-      return this.value + " - score: " + this.score + " used (ms): " + this.lastUsedMs;
+    static final class CacheEntry {
+        final int adjHash;
+        final String value;
+        final byte[] valueUtf8;
+
+        boolean promoted = false;
+        long lastUsedMs = 0;
+        double score = 0;
+
+        public CacheEntry(int adjHash, String value) {
+            this.adjHash = adjHash;
+            this.value = value;
+            this.valueUtf8 = utf8(value);
+        }
+
+        boolean matches(CacheEntry thatEntry) {
+            return (this == thatEntry) || this.matches(thatEntry.adjHash, thatEntry.value);
+        }
+
+        boolean matches(int adjHash, String value) {
+            return (this.adjHash == adjHash) && value.equals(this.value);
+        }
+
+        int adjHash() {
+            return this.adjHash;
+        }
+
+        double score() {
+            return this.score;
+        }
+
+        long lastUsedMs() {
+            return this.lastUsedMs;
+        }
+
+        byte[] utf8() {
+            return this.valueUtf8;
+        }
+
+        double hit(long lastUsedMs) {
+            this.lastUsedMs = lastUsedMs;
+            this.score += 1;
+
+            return this.score;
+        }
+
+        boolean decay() {
+            this.score *= SCORE_DECAY;
+
+            return this.isPurgeable();
+        }
+
+        boolean isPurgeable() {
+            return (this.score < PURGE_THRESHOLD);
+        }
+
+        static final byte[] utf8(String value) {
+            return value.getBytes(StandardCharsets.UTF_8);
+        }
+
+        @Override
+        public String toString() {
+            return this.value + " - score: " + this.score + " used (ms): " + this.lastUsedMs;
+        }
     }
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/GrowableBuffer.java b/communication/src/main/java/datadog/communication/serialization/GrowableBuffer.java
index 54894efec52..5cc5665c22c 100644
--- a/communication/src/main/java/datadog/communication/serialization/GrowableBuffer.java
+++ b/communication/src/main/java/datadog/communication/serialization/GrowableBuffer.java
@@ -10,126 +10,126 @@
  */
 public final class GrowableBuffer implements StreamingBuffer {
 
-  private final int initialCapacity;
-  private ByteBuffer buffer;
-  private int messageCount;
-
-  public GrowableBuffer(int requiredCapacity) {
-    this.initialCapacity = nextPowerOfTwo(requiredCapacity);
-    this.buffer = ByteBuffer.allocate(initialCapacity);
-  }
-
-  /** Flips the buffer and returns a new slice which shares the buffered content. */
-  public ByteBuffer slice() {
-    buffer.flip();
-    return buffer.slice();
-  }
-
-  /** Flips the buffer and returns the buffered content. */
-  public ByteBuffer flip() {
-    buffer.flip();
-    return buffer;
-  }
-
-  public int messageCount() {
-    return messageCount;
-  }
-
-  @Override
-  public void reset() {
-    messageCount = 0;
-    buffer.position(0);
-    buffer.limit(buffer.capacity());
-  }
-
-  @Override
-  public int capacity() {
-    return buffer.capacity();
-  }
-
-  @Override
-  public boolean isDirty() {
-    return messageCount > 0;
-  }
-
-  @Override
-  public void mark() {
-    ++messageCount;
-  }
-
-  @Override
-  public boolean flush() {
-    return false;
-  }
-
-  @Override
-  public void put(byte b) {
-    checkCapacity(1);
-    buffer.put(b);
-  }
-
-  @Override
-  public void putShort(short s) {
-    checkCapacity(2);
-    buffer.putShort(s);
-  }
-
-  @Override
-  public void putChar(char c) {
-    checkCapacity(2);
-    buffer.putChar(c);
-  }
-
-  @Override
-  public void putInt(int i) {
-    checkCapacity(4);
-    buffer.putInt(i);
-  }
-
-  @Override
-  public void putLong(long l) {
-    checkCapacity(8);
-    buffer.putLong(l);
-  }
-
-  @Override
-  public void putFloat(float f) {
-    checkCapacity(4);
-    buffer.putFloat(f);
-  }
-
-  @Override
-  public void putDouble(double d) {
-    checkCapacity(8);
-    buffer.putDouble(d);
-  }
-
-  @Override
-  public void put(byte[] bytes) {
-    checkCapacity(bytes.length);
-    buffer.put(bytes);
-  }
-
-  @Override
-  public void put(byte[] bytes, int offset, int length) {
-    checkCapacity(length);
-    buffer.put(bytes, offset, length);
-  }
-
-  @Override
-  public void put(ByteBuffer buffer) {
-    checkCapacity(buffer.remaining());
-    this.buffer.put(buffer);
-  }
-
-  private void checkCapacity(int required) {
-    if (buffer.remaining() < required) {
-      // round up to next multiple of initialCapacity that can accommodate required
-      int newSize = (buffer.capacity() + required + initialCapacity - 1) & -initialCapacity;
-      ByteBuffer newBuffer = ByteBuffer.allocate(newSize);
-      buffer.flip();
-      newBuffer.put(buffer);
-      buffer = newBuffer;
-    }
-  }
+    private final int initialCapacity;
+    private ByteBuffer buffer;
+    private int messageCount;
+
+    public GrowableBuffer(int requiredCapacity) {
+        this.initialCapacity = nextPowerOfTwo(requiredCapacity);
+        this.buffer = ByteBuffer.allocate(initialCapacity);
+    }
+
+    /** Flips the buffer and returns a new slice which shares the buffered content. */
+    public ByteBuffer slice() {
+        buffer.flip();
+        return buffer.slice();
+    }
+
+    /** Flips the buffer and returns the buffered content. */
+    public ByteBuffer flip() {
+        buffer.flip();
+        return buffer;
+    }
+
+    public int messageCount() {
+        return messageCount;
+    }
+
+    @Override
+    public void reset() {
+        messageCount = 0;
+        buffer.position(0);
+        buffer.limit(buffer.capacity());
+    }
+
+    @Override
+    public int capacity() {
+        return buffer.capacity();
+    }
+
+    @Override
+    public boolean isDirty() {
+        return messageCount > 0;
+    }
+
+    @Override
+    public void mark() {
+        ++messageCount;
+    }
+
+    @Override
+    public boolean flush() {
+        return false;
+    }
+
+    @Override
+    public void put(byte b) {
+        checkCapacity(1);
+        buffer.put(b);
+    }
+
+    @Override
+    public void putShort(short s) {
+        checkCapacity(2);
+        buffer.putShort(s);
+    }
+
+    @Override
+    public void putChar(char c) {
+        checkCapacity(2);
+        buffer.putChar(c);
+    }
+
+    @Override
+    public void putInt(int i) {
+        checkCapacity(4);
+        buffer.putInt(i);
+    }
+
+    @Override
+    public void putLong(long l) {
+        checkCapacity(8);
+        buffer.putLong(l);
+    }
+
+    @Override
+    public void putFloat(float f) {
+        checkCapacity(4);
+        buffer.putFloat(f);
+    }
+
+    @Override
+    public void putDouble(double d) {
+        checkCapacity(8);
+        buffer.putDouble(d);
+    }
+
+    @Override
+    public void put(byte[] bytes) {
+        checkCapacity(bytes.length);
+        buffer.put(bytes);
+    }
+
+    @Override
+    public void put(byte[] bytes, int offset, int length) {
+        checkCapacity(length);
+        buffer.put(bytes, offset, length);
+    }
+
+    @Override
+    public void put(ByteBuffer buffer) {
+        checkCapacity(buffer.remaining());
+        this.buffer.put(buffer);
+    }
+
+    private void checkCapacity(int required) {
+        if (buffer.remaining() < required) {
+            // round up to next multiple of initialCapacity that can accommodate required
+            int newSize = (buffer.capacity() + required + initialCapacity - 1) & -initialCapacity;
+            ByteBuffer newBuffer = ByteBuffer.allocate(newSize);
+            buffer.flip();
+            newBuffer.put(buffer);
+            buffer = newBuffer;
+        }
+    }
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/Mapper.java b/communication/src/main/java/datadog/communication/serialization/Mapper.java
index 71c38641abc..cf49355c4ff 100644
--- a/communication/src/main/java/datadog/communication/serialization/Mapper.java
+++ b/communication/src/main/java/datadog/communication/serialization/Mapper.java
@@ -2,11 +2,11 @@
 
 @FunctionalInterface
 public interface Mapper<T> {
-  void map(T data, Writable packer);
+    void map(T data, Writable packer);
 
-  default void map(T data, Writable packer, boolean retry) {
-    map(data, packer);
-  }
+    default void map(T data, Writable packer, boolean retry) {
+        map(data, packer);
+    }
 
-  default void reset() {}
+    default void reset() {}
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/MessageFormatter.java b/communication/src/main/java/datadog/communication/serialization/MessageFormatter.java
index 4ddb934483d..7863d54ff7a 100644
--- a/communication/src/main/java/datadog/communication/serialization/MessageFormatter.java
+++ b/communication/src/main/java/datadog/communication/serialization/MessageFormatter.java
@@ -1,7 +1,7 @@
 package datadog.communication.serialization;
 
 public interface MessageFormatter {
-  <T> boolean format(T message, Mapper<T> mapper);
+    <T> boolean format(T message, Mapper<T> mapper);
 
-  void flush();
+    void flush();
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/SimpleUtf8Cache.java b/communication/src/main/java/datadog/communication/serialization/SimpleUtf8Cache.java
index 8eb12d48465..0b9715767c8 100644
--- a/communication/src/main/java/datadog/communication/serialization/SimpleUtf8Cache.java
+++ b/communication/src/main/java/datadog/communication/serialization/SimpleUtf8Cache.java
@@ -44,182 +44,182 @@
  */
 @ThreadSafe
 public final class SimpleUtf8Cache implements EncodingCache {
-  static final int MAX_CAPACITY = 1024;
+    static final int MAX_CAPACITY = 1024;
 
-  private static final int MAX_PROBES = 4;
+    private static final int MAX_PROBES = 4;
 
-  private final int[] markers;
-  private final CacheEntry[] entries;
+    private final int[] markers;
+    private final CacheEntry[] entries;
 
-  private static final double HIT_DECAY = 0.5D;
-  private static final double PURGE_THRESHOLD = 0.25D;
+    private static final double HIT_DECAY = 0.5D;
+    private static final double PURGE_THRESHOLD = 0.25D;
 
-  static final int MAX_ENTRY_LEN = 128;
+    static final int MAX_ENTRY_LEN = 128;
 
-  protected int hits = 0;
-  protected int evictions = 0;
+    protected int hits = 0;
+    protected int evictions = 0;
 
-  public SimpleUtf8Cache(int capacity) {
-    int size = Caching.cacheSizeFor(Math.min(capacity, MAX_CAPACITY));
+    public SimpleUtf8Cache(int capacity) {
+        int size = Caching.cacheSizeFor(Math.min(capacity, MAX_CAPACITY));
 
-    this.markers = new int[size];
-    this.entries = new CacheEntry[size];
-  }
-
-  public int capacity() {
-    return this.entries.length;
-  }
-
-  /**
-   * Recalibrates the cache Applies a decay to existing entries - and purges entries below the
-   * PURGE_THRESHOLD
-   *
-   * <p>While still racy this method is synchronized to avoid simultaneous recalibrations
-   */
-  public synchronized void recalibrate() {
-    CacheEntry[] thisEntries = this.entries;
-    for (int i = 0; i < thisEntries.length; ++i) {
-      CacheEntry entry = thisEntries[i];
-      if (entry == null) continue;
-
-      boolean purge = entry.decay();
-      if (purge) thisEntries[i] = null;
+        this.markers = new int[size];
+        this.entries = new CacheEntry[size];
     }
 
-    Caching.reset(this.markers);
-  }
-
-  @Override
-  public byte[] encode(CharSequence charSeq) {
-    if (charSeq instanceof String) {
-      String str = (String) charSeq;
-      return this.getUtf8(str);
-    } else {
-      return null;
+    public int capacity() {
+        return this.entries.length;
     }
-  }
 
-  /** Returns the UTF-8 encoding of value -- using a cache value if available */
-  public final byte[] getUtf8(String value) {
-    if (value.length() > MAX_ENTRY_LEN) return CacheEntry.utf8(value);
+    /**
+     * Recalibrates the cache Applies a decay to existing entries - and purges entries below the
+     * PURGE_THRESHOLD
+     *
+     * <p>While still racy this method is synchronized to avoid simultaneous recalibrations
+     */
+    public synchronized void recalibrate() {
+        CacheEntry[] thisEntries = this.entries;
+        for (int i = 0; i < thisEntries.length; ++i) {
+            CacheEntry entry = thisEntries[i];
+            if (entry == null) continue;
+
+            boolean purge = entry.decay();
+            if (purge) thisEntries[i] = null;
+        }
+
+        Caching.reset(this.markers);
+    }
 
-    CacheEntry[] thisEntries = this.entries;
+    @Override
+    public byte[] encode(CharSequence charSeq) {
+        if (charSeq instanceof String) {
+            String str = (String) charSeq;
+            return this.getUtf8(str);
+        } else {
+            return null;
+        }
+    }
 
-    int adjHash = Caching.adjHash(value);
+    /** Returns the UTF-8 encoding of value -- using a cache value if available */
+    public final byte[] getUtf8(String value) {
+        if (value.length() > MAX_ENTRY_LEN) return CacheEntry.utf8(value);
 
-    CacheEntry matchingEntry = lookupEntry(thisEntries, adjHash, value);
-    if (matchingEntry != null) {
-      matchingEntry.hit();
+        CacheEntry[] thisEntries = this.entries;
 
-      this.hits += 1;
-      return matchingEntry.utf8();
-    }
+        int adjHash = Caching.adjHash(value);
 
-    boolean wasMarked = Caching.mark(this.markers, adjHash);
-    if (!wasMarked) return CacheEntry.utf8(value);
+        CacheEntry matchingEntry = lookupEntry(thisEntries, adjHash, value);
+        if (matchingEntry != null) {
+            matchingEntry.hit();
 
-    CacheEntry newEntry = new CacheEntry(adjHash, value);
-    newEntry.hit();
+            this.hits += 1;
+            return matchingEntry.utf8();
+        }
 
-    boolean evicted = lfuInsert(thisEntries, newEntry);
-    if (evicted) this.evictions += 1;
+        boolean wasMarked = Caching.mark(this.markers, adjHash);
+        if (!wasMarked) return CacheEntry.utf8(value);
 
-    return newEntry.utf8();
-  }
+        CacheEntry newEntry = new CacheEntry(adjHash, value);
+        newEntry.hit();
 
-  static final CacheEntry lookupEntry(CacheEntry[] entries, int adjHash, String value) {
-    int initialBucketIndex = Caching.bucketIndex(entries, adjHash);
-    for (int probe = 0, index = initialBucketIndex; probe < MAX_PROBES; ++probe, ++index) {
-      if (index >= entries.length) index = 0;
+        boolean evicted = lfuInsert(thisEntries, newEntry);
+        if (evicted) this.evictions += 1;
 
-      CacheEntry entry = entries[index];
-      if (entry != null && entry.matches(adjHash, value)) {
-        return entry;
-      }
+        return newEntry.utf8();
     }
-    return null;
-  }
-
-  static final boolean lfuInsert(CacheEntry[] entries, CacheEntry newEntry) {
-    int initialBucketIndex = Caching.bucketIndex(entries, newEntry.adjHash());
-
-    // initial scan to see if there's an empty slot or marker entry is already present
-    double lowestHits = Double.MAX_VALUE;
-    int lfuIndex = -1;
-    for (int probe = 0, index = initialBucketIndex; probe < MAX_PROBES; ++probe, ++index) {
-      if (index >= entries.length) index = 0;
-
-      CacheEntry entry = entries[index];
-      if (entry == null || entry.isPurgeable()) {
-        entries[index] = newEntry;
-        return false;
-      }
-
-      double hits = entry.score();
-      if (hits < lowestHits) {
-        lowestHits = hits;
-        lfuIndex = index;
-      }
+
+    static final CacheEntry lookupEntry(CacheEntry[] entries, int adjHash, String value) {
+        int initialBucketIndex = Caching.bucketIndex(entries, adjHash);
+        for (int probe = 0, index = initialBucketIndex; probe < MAX_PROBES; ++probe, ++index) {
+            if (index >= entries.length) index = 0;
+
+            CacheEntry entry = entries[index];
+            if (entry != null && entry.matches(adjHash, value)) {
+                return entry;
+            }
+        }
+        return null;
     }
 
-    // If we get here, then we're evicting the LFU
-    entries[lfuIndex] = newEntry;
-    return true;
-  }
+    static final boolean lfuInsert(CacheEntry[] entries, CacheEntry newEntry) {
+        int initialBucketIndex = Caching.bucketIndex(entries, newEntry.adjHash());
+
+        // initial scan to see if there's an empty slot or marker entry is already present
+        double lowestHits = Double.MAX_VALUE;
+        int lfuIndex = -1;
+        for (int probe = 0, index = initialBucketIndex; probe < MAX_PROBES; ++probe, ++index) {
+            if (index >= entries.length) index = 0;
+
+            CacheEntry entry = entries[index];
+            if (entry == null || entry.isPurgeable()) {
+                entries[index] = newEntry;
+                return false;
+            }
+
+            double hits = entry.score();
+            if (hits < lowestHits) {
+                lowestHits = hits;
+                lfuIndex = index;
+            }
+        }
+
+        // If we get here, then we're evicting the LFU
+        entries[lfuIndex] = newEntry;
+        return true;
+    }
 
-  static final class CacheEntry {
-    final int adjHash;
-    final String value;
-    final byte[] valueUtf8;
+    static final class CacheEntry {
+        final int adjHash;
+        final String value;
+        final byte[] valueUtf8;
 
-    boolean promoted = false;
-    double score = 0;
+        boolean promoted = false;
+        double score = 0;
 
-    public CacheEntry(int adjHash, String value) {
-      this.adjHash = adjHash;
-      this.value = value;
-      this.valueUtf8 = utf8(value);
-    }
+        public CacheEntry(int adjHash, String value) {
+            this.adjHash = adjHash;
+            this.value = value;
+            this.valueUtf8 = utf8(value);
+        }
 
-    boolean matches(int adjHash, String value) {
-      return (this.adjHash == adjHash) && value.equals(this.value);
-    }
+        boolean matches(int adjHash, String value) {
+            return (this.adjHash == adjHash) && value.equals(this.value);
+        }
 
-    int adjHash() {
-      return this.adjHash;
-    }
+        int adjHash() {
+            return this.adjHash;
+        }
 
-    double score() {
-      return this.score;
-    }
+        double score() {
+            return this.score;
+        }
 
-    byte[] utf8() {
-      return this.valueUtf8;
-    }
+        byte[] utf8() {
+            return this.valueUtf8;
+        }
 
-    double hit() {
-      this.score += 1;
+        double hit() {
+            this.score += 1;
 
-      return this.score;
-    }
+            return this.score;
+        }
 
-    boolean decay() {
-      this.score *= HIT_DECAY;
+        boolean decay() {
+            this.score *= HIT_DECAY;
 
-      return this.isPurgeable();
-    }
+            return this.isPurgeable();
+        }
 
-    boolean isPurgeable() {
-      return (this.score < PURGE_THRESHOLD);
-    }
+        boolean isPurgeable() {
+            return (this.score < PURGE_THRESHOLD);
+        }
 
-    static final byte[] utf8(String value) {
-      return value.getBytes(StandardCharsets.UTF_8);
-    }
+        static final byte[] utf8(String value) {
+            return value.getBytes(StandardCharsets.UTF_8);
+        }
 
-    @Override
-    public String toString() {
-      return this.value + " - score: " + this.score;
+        @Override
+        public String toString() {
+            return this.value + " - score: " + this.score;
+        }
     }
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/StreamingBuffer.java b/communication/src/main/java/datadog/communication/serialization/StreamingBuffer.java
index a88bf137e9c..368c7bf2303 100644
--- a/communication/src/main/java/datadog/communication/serialization/StreamingBuffer.java
+++ b/communication/src/main/java/datadog/communication/serialization/StreamingBuffer.java
@@ -4,33 +4,33 @@
 
 public interface StreamingBuffer {
 
-  int capacity();
+    int capacity();
 
-  boolean isDirty();
+    boolean isDirty();
 
-  void mark();
+    void mark();
 
-  boolean flush();
+    boolean flush();
 
-  void put(byte b);
+    void put(byte b);
 
-  void putShort(short s);
+    void putShort(short s);
 
-  void putChar(char c);
+    void putChar(char c);
 
-  void putInt(int i);
+    void putInt(int i);
 
-  void putLong(long l);
+    void putLong(long l);
 
-  void putFloat(float f);
+    void putFloat(float f);
 
-  void putDouble(double d);
+    void putDouble(double d);
 
-  void put(byte[] bytes);
+    void put(byte[] bytes);
 
-  void put(byte[] bytes, int offset, int length);
+    void put(byte[] bytes, int offset, int length);
 
-  void put(ByteBuffer buffer);
+    void put(ByteBuffer buffer);
 
-  void reset();
+    void reset();
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/ValueWriter.java b/communication/src/main/java/datadog/communication/serialization/ValueWriter.java
index 60b33e092a3..478c29597d6 100644
--- a/communication/src/main/java/datadog/communication/serialization/ValueWriter.java
+++ b/communication/src/main/java/datadog/communication/serialization/ValueWriter.java
@@ -2,5 +2,5 @@
 
 // TODO @FunctionalInterface
 public interface ValueWriter<T> {
-  void write(T value, Writable writable, EncodingCache encodingCache);
+    void write(T value, Writable writable, EncodingCache encodingCache);
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/Writable.java b/communication/src/main/java/datadog/communication/serialization/Writable.java
index 7450e66d512..7fe14aa189e 100644
--- a/communication/src/main/java/datadog/communication/serialization/Writable.java
+++ b/communication/src/main/java/datadog/communication/serialization/Writable.java
@@ -5,70 +5,70 @@
 import java.util.Map;
 
 public interface Writable {
-  void writeNull();
+    void writeNull();
 
-  void writeBoolean(boolean value);
+    void writeBoolean(boolean value);
 
-  void writeObject(Object value, EncodingCache encodingCache);
+    void writeObject(Object value, EncodingCache encodingCache);
 
-  void writeObjectString(Object value, EncodingCache encodingCache);
+    void writeObjectString(Object value, EncodingCache encodingCache);
 
-  void writeMap(Map<? extends CharSequence, ?> map, EncodingCache encodingCache);
+    void writeMap(Map<? extends CharSequence, ?> map, EncodingCache encodingCache);
 
-  void writeString(CharSequence s, EncodingCache encodingCache);
+    void writeString(CharSequence s, EncodingCache encodingCache);
 
-  void writeUTF8(byte[] string, int offset, int length);
+    void writeUTF8(byte[] string, int offset, int length);
 
-  void writeUTF8(byte[] string);
+    void writeUTF8(byte[] string);
 
-  void writeUTF8(UTF8BytesString string);
+    void writeUTF8(UTF8BytesString string);
 
-  void writeBinary(byte[] binary);
+    void writeBinary(byte[] binary);
 
-  void writeBinary(byte[] binary, int offset, int length);
+    void writeBinary(byte[] binary, int offset, int length);
 
-  /**
-   * Encodes 128 bits as binary.
-   *
-   * @param hi the high-order 64 bits.
-   * @param lo The low-order 64 bits.
-   */
-  void writeBinary(long hi, long lo);
+    /**
+     * Encodes 128 bits as binary.
+     *
+     * @param hi the high-order 64 bits.
+     * @param lo The low-order 64 bits.
+     */
+    void writeBinary(long hi, long lo);
 
-  /**
-   * Start a part of the message containing key-value pairs
-   *
-   * @param elementCount how many key-value pairs in the section of the message
-   */
-  void startMap(int elementCount);
+    /**
+     * Start a part of the message containing key-value pairs
+     *
+     * @param elementCount how many key-value pairs in the section of the message
+     */
+    void startMap(int elementCount);
 
-  /**
-   * Start a part of the message containing fields or values at ordinal positions
-   *
-   * @param elementCount how many fields in the section of the message
-   */
-  void startStruct(int elementCount);
+    /**
+     * Start a part of the message containing fields or values at ordinal positions
+     *
+     * @param elementCount how many fields in the section of the message
+     */
+    void startStruct(int elementCount);
 
-  /**
-   * Start a part of the message containing positional values
-   *
-   * @param elementCount how many array elements in the section of the message
-   */
-  void startArray(int elementCount);
+    /**
+     * Start a part of the message containing positional values
+     *
+     * @param elementCount how many array elements in the section of the message
+     */
+    void startArray(int elementCount);
 
-  void writeBinary(ByteBuffer buffer);
+    void writeBinary(ByteBuffer buffer);
 
-  void writeInt(int value);
+    void writeInt(int value);
 
-  void writeSignedInt(int value);
+    void writeSignedInt(int value);
 
-  void writeLong(long value);
+    void writeLong(long value);
 
-  void writeUnsignedLong(long value);
+    void writeUnsignedLong(long value);
 
-  void writeSignedLong(long value);
+    void writeSignedLong(long value);
 
-  void writeFloat(float value);
+    void writeFloat(float value);
 
-  void writeDouble(double value);
+    void writeDouble(double value);
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/custom/aiguard/FunctionWriter.java b/communication/src/main/java/datadog/communication/serialization/custom/aiguard/FunctionWriter.java
index 8db825f4d04..0e84f8d84b8 100644
--- a/communication/src/main/java/datadog/communication/serialization/custom/aiguard/FunctionWriter.java
+++ b/communication/src/main/java/datadog/communication/serialization/custom/aiguard/FunctionWriter.java
@@ -7,15 +7,13 @@
 
 public class FunctionWriter implements ValueWriter<AIGuard.ToolCall.Function> {
 
-  @Override
-  public void write(
-      final AIGuard.ToolCall.Function function,
-      final Writable writable,
-      final EncodingCache encodingCache) {
-    writable.startMap(2);
-    writable.writeString("name", encodingCache);
-    writable.writeString(function.getName(), encodingCache);
-    writable.writeString("arguments", encodingCache);
-    writable.writeString(function.getArguments(), encodingCache);
-  }
+    @Override
+    public void write(
+            final AIGuard.ToolCall.Function function, final Writable writable, final EncodingCache encodingCache) {
+        writable.startMap(2);
+        writable.writeString("name", encodingCache);
+        writable.writeString(function.getName(), encodingCache);
+        writable.writeString("arguments", encodingCache);
+        writable.writeString(function.getArguments(), encodingCache);
+    }
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/custom/aiguard/MessageWriter.java b/communication/src/main/java/datadog/communication/serialization/custom/aiguard/MessageWriter.java
index 55669be9afa..daddc8c225d 100644
--- a/communication/src/main/java/datadog/communication/serialization/custom/aiguard/MessageWriter.java
+++ b/communication/src/main/java/datadog/communication/serialization/custom/aiguard/MessageWriter.java
@@ -9,91 +9,90 @@
 
 public class MessageWriter implements ValueWriter<AIGuard.Message> {
 
-  @Override
-  public void write(
-      final AIGuard.Message value, final Writable writable, final EncodingCache encodingCache) {
-    final int[] size = {0};
-    final boolean hasRole = present(Strings.isNotBlank(value.getRole()), size);
-    final boolean hasToolCallId = present(Strings.isNotBlank(value.getToolCallId()), size);
-    final boolean hasToolCalls = present(isNotEmpty(value.getToolCalls()), size);
+    @Override
+    public void write(final AIGuard.Message value, final Writable writable, final EncodingCache encodingCache) {
+        final int[] size = {0};
+        final boolean hasRole = present(Strings.isNotBlank(value.getRole()), size);
+        final boolean hasToolCallId = present(Strings.isNotBlank(value.getToolCallId()), size);
+        final boolean hasToolCalls = present(isNotEmpty(value.getToolCalls()), size);
 
-    final boolean hasContentParts = present(isNotEmpty(value.getContentParts()), size);
-    // An empty content string is still written: "" is what the redaction remove strategy leaves
-    // behind, and dropping it would be indistinguishable from a message that never had content.
-    final boolean hasContentString = present(!hasContentParts && value.getContent() != null, size);
+        final boolean hasContentParts = present(isNotEmpty(value.getContentParts()), size);
+        // An empty content string is still written: "" is what the redaction remove strategy leaves
+        // behind, and dropping it would be indistinguishable from a message that never had content.
+        final boolean hasContentString = present(!hasContentParts && value.getContent() != null, size);
 
-    writable.startMap(size[0]);
-    writeString(hasRole, "role", value.getRole(), writable, encodingCache);
+        writable.startMap(size[0]);
+        writeString(hasRole, "role", value.getRole(), writable, encodingCache);
 
-    if (hasContentParts) {
-      writeContentParts("content", value.getContentParts(), writable, encodingCache);
-    } else {
-      writeString(hasContentString, "content", value.getContent(), writable, encodingCache);
-    }
+        if (hasContentParts) {
+            writeContentParts("content", value.getContentParts(), writable, encodingCache);
+        } else {
+            writeString(hasContentString, "content", value.getContent(), writable, encodingCache);
+        }
 
-    writeString(hasToolCallId, "tool_call_id", value.getToolCallId(), writable, encodingCache);
-    writeToolCallArray(hasToolCalls, "tool_calls", value.getToolCalls(), writable, encodingCache);
-  }
+        writeString(hasToolCallId, "tool_call_id", value.getToolCallId(), writable, encodingCache);
+        writeToolCallArray(hasToolCalls, "tool_calls", value.getToolCalls(), writable, encodingCache);
+    }
 
-  private static void writeContentParts(
-      final String key,
-      final List<AIGuard.ContentPart> contentParts,
-      final Writable writable,
-      final EncodingCache encodingCache) {
-    writable.writeString(key, encodingCache);
-    writable.startArray(contentParts.size());
+    private static void writeContentParts(
+            final String key,
+            final List<AIGuard.ContentPart> contentParts,
+            final Writable writable,
+            final EncodingCache encodingCache) {
+        writable.writeString(key, encodingCache);
+        writable.startArray(contentParts.size());
 
-    for (final AIGuard.ContentPart part : contentParts) {
-      writable.startMap(2);
+        for (final AIGuard.ContentPart part : contentParts) {
+            writable.startMap(2);
 
-      writable.writeString("type", encodingCache);
-      writable.writeString(part.getType().toString(), encodingCache);
+            writable.writeString("type", encodingCache);
+            writable.writeString(part.getType().toString(), encodingCache);
 
-      if (part.getType() == AIGuard.ContentPart.Type.TEXT) {
-        writable.writeString("text", encodingCache);
-        writable.writeString(part.getText(), encodingCache);
-      } else if (part.getType() == AIGuard.ContentPart.Type.IMAGE_URL) {
-        writable.writeString("image_url", encodingCache);
-        writable.startMap(1);
-        writable.writeString("url", encodingCache);
-        writable.writeString(part.getImageUrl().getUrl(), encodingCache);
-      }
+            if (part.getType() == AIGuard.ContentPart.Type.TEXT) {
+                writable.writeString("text", encodingCache);
+                writable.writeString(part.getText(), encodingCache);
+            } else if (part.getType() == AIGuard.ContentPart.Type.IMAGE_URL) {
+                writable.writeString("image_url", encodingCache);
+                writable.startMap(1);
+                writable.writeString("url", encodingCache);
+                writable.writeString(part.getImageUrl().getUrl(), encodingCache);
+            }
+        }
     }
-  }
 
-  private static void writeString(
-      final boolean present,
-      final String key,
-      final String value,
-      final Writable writable,
-      final EncodingCache encodingCache) {
-    if (present) {
-      writable.writeString(key, encodingCache);
-      writable.writeString(value, encodingCache);
+    private static void writeString(
+            final boolean present,
+            final String key,
+            final String value,
+            final Writable writable,
+            final EncodingCache encodingCache) {
+        if (present) {
+            writable.writeString(key, encodingCache);
+            writable.writeString(value, encodingCache);
+        }
     }
-  }
 
-  private static void writeToolCallArray(
-      final boolean present,
-      final String key,
-      final List<AIGuard.ToolCall> values,
-      final Writable writable,
-      final EncodingCache encodingCache) {
-    if (present) {
-      writable.writeString(key, encodingCache);
-      writable.writeObject(values, encodingCache);
+    private static void writeToolCallArray(
+            final boolean present,
+            final String key,
+            final List<AIGuard.ToolCall> values,
+            final Writable writable,
+            final EncodingCache encodingCache) {
+        if (present) {
+            writable.writeString(key, encodingCache);
+            writable.writeObject(values, encodingCache);
+        }
     }
-  }
 
-  /** Counts a field towards the map size when it is present, and reports whether it is. */
-  private static boolean present(final boolean present, final int[] fieldCount) {
-    if (present) {
-      fieldCount[0]++;
+    /** Counts a field towards the map size when it is present, and reports whether it is. */
+    private static boolean present(final boolean present, final int[] fieldCount) {
+        if (present) {
+            fieldCount[0]++;
+        }
+        return present;
     }
-    return present;
-  }
 
-  private static boolean isNotEmpty(final List<?> value) {
-    return value != null && !value.isEmpty();
-  }
+    private static boolean isNotEmpty(final List<?> value) {
+        return value != null && !value.isEmpty();
+    }
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/custom/aiguard/ToolCallWriter.java b/communication/src/main/java/datadog/communication/serialization/custom/aiguard/ToolCallWriter.java
index 2b5107e1eb7..bfa32d856f4 100644
--- a/communication/src/main/java/datadog/communication/serialization/custom/aiguard/ToolCallWriter.java
+++ b/communication/src/main/java/datadog/communication/serialization/custom/aiguard/ToolCallWriter.java
@@ -7,13 +7,12 @@
 
 public class ToolCallWriter implements ValueWriter<AIGuard.ToolCall> {
 
-  @Override
-  public void write(
-      final AIGuard.ToolCall value, final Writable writable, final EncodingCache encodingCache) {
-    writable.startMap(2);
-    writable.writeString("id", encodingCache);
-    writable.writeString(value.getId(), encodingCache);
-    writable.writeString("function", encodingCache);
-    writable.writeObject(value.getFunction(), encodingCache);
-  }
+    @Override
+    public void write(final AIGuard.ToolCall value, final Writable writable, final EncodingCache encodingCache) {
+        writable.startMap(2);
+        writable.writeString("id", encodingCache);
+        writable.writeString(value.getId(), encodingCache);
+        writable.writeString("function", encodingCache);
+        writable.writeObject(value.getFunction(), encodingCache);
+    }
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/custom/stacktrace/StackTraceEventFrameWriter.java b/communication/src/main/java/datadog/communication/serialization/custom/stacktrace/StackTraceEventFrameWriter.java
index 0977448bfd7..ca611defd72 100644
--- a/communication/src/main/java/datadog/communication/serialization/custom/stacktrace/StackTraceEventFrameWriter.java
+++ b/communication/src/main/java/datadog/communication/serialization/custom/stacktrace/StackTraceEventFrameWriter.java
@@ -8,51 +8,51 @@
 
 public class StackTraceEventFrameWriter implements ValueWriter<StackTraceFrame> {
 
-  @Override
-  public void write(StackTraceFrame value, Writable writable, EncodingCache encodingCache) {
-    int mapSize = 1; // id always present
-    boolean hasText = Strings.isNotBlank(value.getText());
-    boolean hasFile = Strings.isNotBlank(value.getFile());
-    boolean hasLine = value.getLine() != null;
-    boolean hasClass = Strings.isNotBlank(value.getClass_name());
-    boolean hasFunction = Strings.isNotBlank(value.getFunction());
-    if (hasText) {
-      mapSize++;
+    @Override
+    public void write(StackTraceFrame value, Writable writable, EncodingCache encodingCache) {
+        int mapSize = 1; // id always present
+        boolean hasText = Strings.isNotBlank(value.getText());
+        boolean hasFile = Strings.isNotBlank(value.getFile());
+        boolean hasLine = value.getLine() != null;
+        boolean hasClass = Strings.isNotBlank(value.getClass_name());
+        boolean hasFunction = Strings.isNotBlank(value.getFunction());
+        if (hasText) {
+            mapSize++;
+        }
+        if (hasFile) {
+            mapSize++;
+        }
+        if (hasLine) {
+            mapSize++;
+        }
+        if (hasClass) {
+            mapSize++;
+        }
+        if (hasFunction) {
+            mapSize++;
+        }
+        writable.startMap(mapSize);
+        writable.writeString("id", encodingCache);
+        writable.writeInt(value.getId());
+        if (hasText) {
+            writable.writeString("text", encodingCache);
+            writable.writeString(value.getText(), encodingCache);
+        }
+        if (hasFile) {
+            writable.writeString("file", encodingCache);
+            writable.writeString(value.getFile(), encodingCache);
+        }
+        if (hasLine) {
+            writable.writeString("line", encodingCache);
+            writable.writeInt(value.getLine());
+        }
+        if (hasClass) {
+            writable.writeString("class_name", encodingCache);
+            writable.writeString(value.getClass_name(), encodingCache);
+        }
+        if (hasFunction) {
+            writable.writeString("function", encodingCache);
+            writable.writeString(value.getFunction(), encodingCache);
+        }
     }
-    if (hasFile) {
-      mapSize++;
-    }
-    if (hasLine) {
-      mapSize++;
-    }
-    if (hasClass) {
-      mapSize++;
-    }
-    if (hasFunction) {
-      mapSize++;
-    }
-    writable.startMap(mapSize);
-    writable.writeString("id", encodingCache);
-    writable.writeInt(value.getId());
-    if (hasText) {
-      writable.writeString("text", encodingCache);
-      writable.writeString(value.getText(), encodingCache);
-    }
-    if (hasFile) {
-      writable.writeString("file", encodingCache);
-      writable.writeString(value.getFile(), encodingCache);
-    }
-    if (hasLine) {
-      writable.writeString("line", encodingCache);
-      writable.writeInt(value.getLine());
-    }
-    if (hasClass) {
-      writable.writeString("class_name", encodingCache);
-      writable.writeString(value.getClass_name(), encodingCache);
-    }
-    if (hasFunction) {
-      writable.writeString("function", encodingCache);
-      writable.writeString(value.getFunction(), encodingCache);
-    }
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/custom/stacktrace/StackTraceEventWriter.java b/communication/src/main/java/datadog/communication/serialization/custom/stacktrace/StackTraceEventWriter.java
index f2b56b3bba6..294c7367c63 100644
--- a/communication/src/main/java/datadog/communication/serialization/custom/stacktrace/StackTraceEventWriter.java
+++ b/communication/src/main/java/datadog/communication/serialization/custom/stacktrace/StackTraceEventWriter.java
@@ -8,35 +8,35 @@
 
 public class StackTraceEventWriter implements ValueWriter<StackTraceEvent> {
 
-  @Override
-  public void write(StackTraceEvent value, Writable writable, EncodingCache encodingCache) {
-    int mapSize = 1; // frames always present
-    boolean hasId = Strings.isNotBlank(value.getId());
-    boolean hasLanguage = Strings.isNotBlank(value.getLanguage());
-    boolean hasMessage = Strings.isNotBlank(value.getMessage());
-    if (hasId) {
-      mapSize++;
+    @Override
+    public void write(StackTraceEvent value, Writable writable, EncodingCache encodingCache) {
+        int mapSize = 1; // frames always present
+        boolean hasId = Strings.isNotBlank(value.getId());
+        boolean hasLanguage = Strings.isNotBlank(value.getLanguage());
+        boolean hasMessage = Strings.isNotBlank(value.getMessage());
+        if (hasId) {
+            mapSize++;
+        }
+        if (hasLanguage) {
+            mapSize++;
+        }
+        if (hasMessage) {
+            mapSize++;
+        }
+        writable.startMap(mapSize);
+        if (hasId) {
+            writable.writeString("id", encodingCache);
+            writable.writeString(value.getId(), encodingCache);
+        }
+        if (hasLanguage) {
+            writable.writeString("language", encodingCache);
+            writable.writeString(value.getLanguage(), encodingCache);
+        }
+        if (hasMessage) {
+            writable.writeString("message", encodingCache);
+            writable.writeString(value.getMessage(), encodingCache);
+        }
+        writable.writeString("frames", encodingCache);
+        writable.writeObject(value.getFrames(), encodingCache);
     }
-    if (hasLanguage) {
-      mapSize++;
-    }
-    if (hasMessage) {
-      mapSize++;
-    }
-    writable.startMap(mapSize);
-    if (hasId) {
-      writable.writeString("id", encodingCache);
-      writable.writeString(value.getId(), encodingCache);
-    }
-    if (hasLanguage) {
-      writable.writeString("language", encodingCache);
-      writable.writeString(value.getLanguage(), encodingCache);
-    }
-    if (hasMessage) {
-      writable.writeString("message", encodingCache);
-      writable.writeString(value.getMessage(), encodingCache);
-    }
-    writable.writeString("frames", encodingCache);
-    writable.writeObject(value.getFrames(), encodingCache);
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/serialization/msgpack/MsgPackWriter.java b/communication/src/main/java/datadog/communication/serialization/msgpack/MsgPackWriter.java
index c86ce35bcac..f1b03ae9ad5 100644
--- a/communication/src/main/java/datadog/communication/serialization/msgpack/MsgPackWriter.java
+++ b/communication/src/main/java/datadog/communication/serialization/msgpack/MsgPackWriter.java
@@ -18,574 +18,574 @@
 /** Not thread-safe (use one per thread). */
 public class MsgPackWriter implements WritableFormatter {
 
-  private static final Logger log = LoggerFactory.getLogger(MsgPackWriter.class);
+    private static final Logger log = LoggerFactory.getLogger(MsgPackWriter.class);
 
-  // see https://github.com/msgpack/msgpack/blob/master/spec.md
-  public static final byte NULL = (byte) 0xC0;
+    // see https://github.com/msgpack/msgpack/blob/master/spec.md
+    public static final byte NULL = (byte) 0xC0;
 
-  public static final byte FALSE = (byte) 0xC2;
-  public static final byte TRUE = (byte) 0xC3;
+    public static final byte FALSE = (byte) 0xC2;
+    public static final byte TRUE = (byte) 0xC3;
 
-  public static final byte UINT8 = (byte) 0xCC;
-  public static final byte UINT16 = (byte) 0xCD;
-  public static final byte UINT32 = (byte) 0xCE;
-  public static final byte UINT64 = (byte) 0xCF;
+    public static final byte UINT8 = (byte) 0xCC;
+    public static final byte UINT16 = (byte) 0xCD;
+    public static final byte UINT32 = (byte) 0xCE;
+    public static final byte UINT64 = (byte) 0xCF;
 
-  public static final byte INT8 = (byte) 0xD0;
-  public static final byte INT16 = (byte) 0xD1;
-  public static final byte INT32 = (byte) 0xD2;
-  public static final byte INT64 = (byte) 0xD3;
+    public static final byte INT8 = (byte) 0xD0;
+    public static final byte INT16 = (byte) 0xD1;
+    public static final byte INT32 = (byte) 0xD2;
+    public static final byte INT64 = (byte) 0xD3;
 
-  public static final byte FLOAT32 = (byte) 0xCA;
-  public static final byte FLOAT64 = (byte) 0xCB;
+    public static final byte FLOAT32 = (byte) 0xCA;
+    public static final byte FLOAT64 = (byte) 0xCB;
 
-  public static final byte STR8 = (byte) 0xD9;
-  public static final byte STR16 = (byte) 0xDA;
-  public static final byte STR32 = (byte) 0xDB;
+    public static final byte STR8 = (byte) 0xD9;
+    public static final byte STR16 = (byte) 0xDA;
+    public static final byte STR32 = (byte) 0xDB;
 
-  public static final byte BIN8 = (byte) 0xC4;
-  public static final byte BIN16 = (byte) 0xC5;
-  public static final byte BIN32 = (byte) 0xC6;
+    public static final byte BIN8 = (byte) 0xC4;
+    public static final byte BIN16 = (byte) 0xC5;
+    public static final byte BIN32 = (byte) 0xC6;
 
-  public static final byte ARRAY16 = (byte) 0xDC;
-  public static final byte ARRAY32 = (byte) 0xDD;
+    public static final byte ARRAY16 = (byte) 0xDC;
+    public static final byte ARRAY32 = (byte) 0xDD;
 
-  public static final byte MAP16 = (byte) 0xDE;
-  public static final byte MAP32 = (byte) 0xDF;
+    public static final byte MAP16 = (byte) 0xDE;
+    public static final byte MAP32 = (byte) 0xDF;
 
-  public static final int NEGFIXNUM = 0xE0;
-  public static final int FIXSTR = 0xA0;
-  public static final int FIXARRAY = 0x90;
-  public static final int FIXMAP = 0x80;
+    public static final int NEGFIXNUM = 0xE0;
+    public static final int FIXSTR = 0xA0;
+    public static final int FIXARRAY = 0x90;
+    public static final int FIXMAP = 0x80;
 
-  private final Codec codec;
+    private final Codec codec;
 
-  private final StreamingBuffer buffer;
+    private final StreamingBuffer buffer;
 
-  public MsgPackWriter(StreamingBuffer buffer) {
-    this(Codec.INSTANCE, buffer);
-  }
+    public MsgPackWriter(StreamingBuffer buffer) {
+        this(Codec.INSTANCE, buffer);
+    }
 
-  public MsgPackWriter(Codec codec, StreamingBuffer buffer) {
-    this.codec = codec;
-    this.buffer = buffer;
-  }
+    public MsgPackWriter(Codec codec, StreamingBuffer buffer) {
+        this.codec = codec;
+        this.buffer = buffer;
+    }
 
-  @Override
-  public void flush() {
-    if (buffer.isDirty()) {
-      buffer.flush();
+    @Override
+    public void flush() {
+        if (buffer.isDirty()) {
+            buffer.flush();
+        }
     }
-  }
-
-  @Override
-  public <T> boolean format(T message, Mapper<T> mapper) {
-    try {
-      mapper.map(message, this);
-      buffer.mark();
-      return true;
-    } catch (BufferOverflowException overflow) {
-      // if the buffer has finite capacity, it will overflow
-      // if we tried to serialise a message larger than the
-      // max capacity, then reject the message
-      if (buffer.flush()) {
+
+    @Override
+    public <T> boolean format(T message, Mapper<T> mapper) {
         try {
-          mapper.reset();
-          mapper.map(message, this, true);
-          buffer.mark();
-          return true;
-        } catch (BufferOverflowException fatal) {
-          log.debug(
-              "dropping message because its serialized size is too large (> {}MB)",
-              (buffer.capacity() >>> 20));
+            mapper.map(message, this);
+            buffer.mark();
+            return true;
+        } catch (BufferOverflowException overflow) {
+            // if the buffer has finite capacity, it will overflow
+            // if we tried to serialise a message larger than the
+            // max capacity, then reject the message
+            if (buffer.flush()) {
+                try {
+                    mapper.reset();
+                    mapper.map(message, this, true);
+                    buffer.mark();
+                    return true;
+                } catch (BufferOverflowException fatal) {
+                    log.debug(
+                            "dropping message because its serialized size is too large (> {}MB)",
+                            (buffer.capacity() >>> 20));
+                }
+            }
+            buffer.reset();
+            // the buffer is now empty, so drop any mapper state from the rejected message
+            mapper.reset();
+            return false;
         }
-      }
-      buffer.reset();
-      // the buffer is now empty, so drop any mapper state from the rejected message
-      mapper.reset();
-      return false;
     }
-  }
 
-  // NOTE - implementations pulled up to this level should
-  // not write directly to the buffer
+    // NOTE - implementations pulled up to this level should
+    // not write directly to the buffer
 
-  @Override
-  public void writeMap(Map<? extends CharSequence, ?> map, EncodingCache encodingCache) {
-    startMap(map.size());
-    for (Map.Entry<? extends CharSequence, ?> entry : map.entrySet()) {
-      writeString(entry.getKey(), encodingCache);
-      writeObject(entry.getValue(), encodingCache);
+    @Override
+    public void writeMap(Map<? extends CharSequence, ?> map, EncodingCache encodingCache) {
+        startMap(map.size());
+        for (Map.Entry<? extends CharSequence, ?> entry : map.entrySet()) {
+            writeString(entry.getKey(), encodingCache);
+            writeObject(entry.getValue(), encodingCache);
+        }
     }
-  }
-
-  @Override
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  public void writeObject(Object value, EncodingCache encodingCache) {
-    // unpeel a very common case, but should try to move away from sending
-    // UTF8BytesString down this codepath at all
-    if (value instanceof UTF8BytesString) {
-      writeUTF8((UTF8BytesString) value);
-    } else if (null == value) {
-      writeNull();
-    } else {
-      ValueWriter writer = codec.get(value.getClass());
-      writer.write(value, this, encodingCache);
+
+    @Override
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public void writeObject(Object value, EncodingCache encodingCache) {
+        // unpeel a very common case, but should try to move away from sending
+        // UTF8BytesString down this codepath at all
+        if (value instanceof UTF8BytesString) {
+            writeUTF8((UTF8BytesString) value);
+        } else if (null == value) {
+            writeNull();
+        } else {
+            ValueWriter writer = codec.get(value.getClass());
+            writer.write(value, this, encodingCache);
+        }
     }
-  }
-
-  @Override
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  public void writeObjectString(Object value, EncodingCache encodingCache) {
-    // unpeel a very common case, but should try to move away from sending
-    // UTF8BytesString down this codepath at all
-    if (value instanceof UTF8BytesString) {
-      writeUTF8((UTF8BytesString) value);
-    } else if (null == value) {
-      writeNull();
-    } else {
-      String s = String.valueOf(value);
-      if (null != encodingCache) {
-        byte[] utf8 = encodingCache.encode(s);
-        if (null != utf8) {
-          writeUTF8(utf8);
-          return;
+
+    @Override
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public void writeObjectString(Object value, EncodingCache encodingCache) {
+        // unpeel a very common case, but should try to move away from sending
+        // UTF8BytesString down this codepath at all
+        if (value instanceof UTF8BytesString) {
+            writeUTF8((UTF8BytesString) value);
+        } else if (null == value) {
+            writeNull();
+        } else {
+            String s = String.valueOf(value);
+            if (null != encodingCache) {
+                byte[] utf8 = encodingCache.encode(s);
+                if (null != utf8) {
+                    writeUTF8(utf8);
+                    return;
+                }
+            }
+            writeUTF8(s.getBytes(UTF_8));
         }
-      }
-      writeUTF8(s.getBytes(UTF_8));
     }
-  }
-
-  @Override
-  public void writeNull() {
-    buffer.put(NULL);
-  }
-
-  @Override
-  public void writeBoolean(boolean value) {
-    buffer.put(value ? TRUE : FALSE);
-  }
-
-  @Override
-  public void writeString(CharSequence s, EncodingCache encodingCache) {
-    if (null == s) {
-      writeNull();
-    } else {
-      if (null != encodingCache) {
-        byte[] utf8 = encodingCache.encode(s);
-        if (null != utf8) {
-          writeUTF8(utf8);
-          return;
+
+    @Override
+    public void writeNull() {
+        buffer.put(NULL);
+    }
+
+    @Override
+    public void writeBoolean(boolean value) {
+        buffer.put(value ? TRUE : FALSE);
+    }
+
+    @Override
+    public void writeString(CharSequence s, EncodingCache encodingCache) {
+        if (null == s) {
+            writeNull();
+        } else {
+            if (null != encodingCache) {
+                byte[] utf8 = encodingCache.encode(s);
+                if (null != utf8) {
+                    writeUTF8(utf8);
+                    return;
+                }
+            }
+            if (s instanceof UTF8BytesString) {
+                writeUTF8((UTF8BytesString) s);
+            } else {
+                writeUTF8(String.valueOf(s).getBytes(UTF_8));
+            }
         }
-      }
-      if (s instanceof UTF8BytesString) {
-        writeUTF8((UTF8BytesString) s);
-      } else {
-        writeUTF8(String.valueOf(s).getBytes(UTF_8));
-      }
     }
-  }
-
-  @Override
-  public void writeUTF8(byte[] string, int offset, int length) {
-    writeStringHeader(length);
-    buffer.put(string, offset, length);
-  }
-
-  @Override
-  public void writeUTF8(byte[] string) {
-    writeUTF8(string, 0, string.length);
-  }
-
-  @Override
-  public void writeUTF8(UTF8BytesString string) {
-    writeStringHeader(string.encodedLength());
-    buffer.put(string.getUtf8Bytes());
-  }
-
-  @Override
-  public void writeBinary(byte[] binary) {
-    writeBinaryHeader(binary.length);
-    buffer.put(binary);
-  }
-
-  @Override
-  public void writeBinary(byte[] binary, int offset, int length) {
-    writeBinaryHeader(length);
-    buffer.put(binary, offset, length);
-  }
-
-  @Override
-  public void writeBinary(long hi, long lo) {
-    writeBinaryHeader(16);
-    buffer.putLong(hi);
-    buffer.putLong(lo);
-  }
-
-  @Override
-  public void writeBinary(ByteBuffer binary) {
-    ByteBuffer slice = binary.slice();
-    writeBinaryHeader(slice.limit() - slice.position());
-    buffer.put(slice);
-  }
-
-  @Override
-  public void writeInt(int value) {
-    if (value < 0) {
-      switch (Integer.numberOfLeadingZeros(~value)) {
-        case 0:
-        case 1:
-        case 2:
-        case 3:
-        case 4:
-        case 5:
-        case 6:
-        case 7:
-        case 8:
-        case 9:
-        case 10:
-        case 11:
-        case 12:
-        case 13:
-        case 14:
-        case 15:
-        case 16:
-          buffer.put(INT32);
-          buffer.putInt(value);
-          break;
-        case 17:
-        case 18:
-        case 19:
-        case 20:
-        case 21:
-        case 22:
-        case 23:
-        case 24:
-          buffer.put(INT16);
-          buffer.putChar((char) value);
-          break;
-        case 25:
-        case 26:
-          buffer.put(INT8);
-          buffer.put((byte) value);
-          break;
-        case 27:
-        case 28:
-        case 29:
-        case 30:
-        case 31:
-        case 32:
-        default:
-          buffer.put((byte) (NEGFIXNUM | value));
-      }
-    } else {
-      switch (Integer.numberOfLeadingZeros(value)) {
-        case 0:
-        case 1:
-        case 2:
-        case 3:
-        case 4:
-        case 5:
-        case 6:
-        case 7:
-        case 8:
-        case 9:
-        case 10:
-        case 11:
-        case 12:
-        case 13:
-        case 14:
-        case 15:
-          buffer.put(UINT32);
-          buffer.putInt(value);
-          break;
-        case 16:
-        case 17:
-        case 18:
-        case 19:
-        case 20:
-        case 21:
-        case 22:
-        case 23:
-          buffer.put(UINT16);
-          buffer.putChar((char) value);
-          break;
-        case 24:
-          buffer.put(UINT8);
-          buffer.put((byte) value);
-          break;
-        case 25:
-        case 26:
-        case 27:
-        case 28:
-        case 29:
-        case 30:
-        case 31:
-        case 32:
-        default:
-          buffer.put((byte) value);
-      }
+
+    @Override
+    public void writeUTF8(byte[] string, int offset, int length) {
+        writeStringHeader(length);
+        buffer.put(string, offset, length);
     }
-  }
-
-  @Override
-  public void writeSignedInt(int value) {
-    writeInt(value);
-  }
-
-  @Override
-  public void writeLong(long value) {
-    writeLongInternal(value, false);
-  }
-
-  @Override
-  public void writeUnsignedLong(long value) {
-    writeLongInternal(value, true);
-  }
-
-  public void writeLongInternal(long value, boolean forceUnsigned) {
-    if (value < 0 && !forceUnsigned) {
-      switch (Long.numberOfLeadingZeros(~value)) {
-        case 0:
-        case 1:
-        case 2:
-        case 3:
-        case 4:
-        case 5:
-        case 6:
-        case 7:
-        case 8:
-        case 9:
-        case 10:
-        case 11:
-        case 12:
-        case 13:
-        case 14:
-        case 15:
-        case 16:
-        case 17:
-        case 18:
-        case 19:
-        case 20:
-        case 21:
-        case 22:
-        case 23:
-        case 24:
-        case 25:
-        case 26:
-        case 27:
-        case 28:
-        case 29:
-        case 30:
-        case 31:
-        case 32:
-          buffer.put(INT64);
-          buffer.putLong(value);
-          break;
-        case 33:
-        case 34:
-        case 35:
-        case 36:
-        case 37:
-        case 38:
-        case 39:
-        case 40:
-        case 41:
-        case 42:
-        case 43:
-        case 44:
-        case 45:
-        case 46:
-        case 47:
-        case 48:
-          buffer.put(INT32);
-          buffer.putInt((int) value);
-          break;
-        case 49:
-        case 50:
-        case 51:
-        case 52:
-        case 53:
-        case 54:
-        case 55:
-        case 56:
-          buffer.put(INT16);
-          buffer.putChar((char) value);
-          break;
-        case 57:
-        case 58:
-          buffer.put(INT8);
-          buffer.put((byte) value);
-          break;
-        case 59:
-        case 60:
-        case 61:
-        case 62:
-        case 63:
-        case 64:
-        default:
-          buffer.put((byte) (NEGFIXNUM | value));
-      }
-    } else {
-      switch (Long.numberOfLeadingZeros(value)) {
-        case 0:
-        case 1:
-        case 2:
-        case 3:
-        case 4:
-        case 5:
-        case 6:
-        case 7:
-        case 8:
-        case 9:
-        case 10:
-        case 11:
-        case 12:
-        case 13:
-        case 14:
-        case 15:
-        case 16:
-        case 17:
-        case 18:
-        case 19:
-        case 20:
-        case 21:
-        case 22:
-        case 23:
-        case 24:
-        case 25:
-        case 26:
-        case 27:
-        case 28:
-        case 29:
-        case 30:
-        case 31:
-          buffer.put(UINT64);
-          buffer.putLong(value);
-          break;
-        case 32:
-        case 33:
-        case 34:
-        case 35:
-        case 36:
-        case 37:
-        case 38:
-        case 39:
-        case 40:
-        case 41:
-        case 42:
-        case 43:
-        case 44:
-        case 45:
-        case 46:
-        case 47:
-          buffer.put(UINT32);
-          buffer.putInt((int) value);
-          break;
-        case 48:
-        case 49:
-        case 50:
-        case 51:
-        case 52:
-        case 53:
-        case 54:
-        case 55:
-          buffer.put(UINT16);
-          buffer.putChar((char) value);
-          break;
-        case 56:
-          buffer.put(UINT8);
-          buffer.put((byte) value);
-          break;
-        case 57:
-        case 59:
-        case 60:
-        case 61:
-        case 62:
-        case 63:
-        case 64:
-        default:
-          buffer.put((byte) value);
-      }
+
+    @Override
+    public void writeUTF8(byte[] string) {
+        writeUTF8(string, 0, string.length);
+    }
+
+    @Override
+    public void writeUTF8(UTF8BytesString string) {
+        writeStringHeader(string.encodedLength());
+        buffer.put(string.getUtf8Bytes());
     }
-  }
-
-  @Override
-  public void writeSignedLong(long value) {
-    writeLong(value);
-  }
-
-  @Override
-  public void writeFloat(float value) {
-    // The datadog agent fails to decode FLOAT32 even though the code in read_bytes.go looks like
-    // it will try to decode FLOAT32 just fine. Even if there will be a fix in a future datadog
-    // agent release, we need to be backwards compatible here by sending it as a FLOAT64 instead.
-    buffer.put(FLOAT64);
-    buffer.putDouble(value);
-  }
-
-  @Override
-  public void writeDouble(double value) {
-    buffer.put(FLOAT64);
-    buffer.putDouble(value);
-  }
-
-  @Override
-  public void startMap(int elementCount) {
-    if (elementCount < 0x10) {
-      buffer.put((byte) (FIXMAP | elementCount));
-    } else if (elementCount < 0x10000) {
-      buffer.put(MAP16);
-      buffer.putShort((short) elementCount);
-    } else {
-      buffer.put(MAP32);
-      buffer.putInt(elementCount);
+
+    @Override
+    public void writeBinary(byte[] binary) {
+        writeBinaryHeader(binary.length);
+        buffer.put(binary);
     }
-  }
-
-  @Override
-  public void startStruct(int elementCount) {
-    startArray(elementCount);
-  }
-
-  @Override
-  public void startArray(int elementCount) {
-    if (elementCount < 0x10) {
-      buffer.put((byte) (FIXARRAY | elementCount));
-    } else if (elementCount < 0x10000) {
-      buffer.put(ARRAY16);
-      buffer.putShort((short) elementCount);
-    } else {
-      buffer.put(ARRAY32);
-      buffer.putInt(elementCount);
+
+    @Override
+    public void writeBinary(byte[] binary, int offset, int length) {
+        writeBinaryHeader(length);
+        buffer.put(binary, offset, length);
+    }
+
+    @Override
+    public void writeBinary(long hi, long lo) {
+        writeBinaryHeader(16);
+        buffer.putLong(hi);
+        buffer.putLong(lo);
     }
-  }
-
-  void writeStringHeader(int length) {
-    if (length < 0x10) {
-      buffer.put((byte) (FIXSTR | length));
-    } else if (length < 0x100) {
-      buffer.put(STR8);
-      buffer.put((byte) length);
-    } else if (length < 0x10000) {
-      buffer.put(STR16);
-      buffer.putShort((short) length);
-    } else {
-      buffer.put(STR32);
-      buffer.putInt(length);
+
+    @Override
+    public void writeBinary(ByteBuffer binary) {
+        ByteBuffer slice = binary.slice();
+        writeBinaryHeader(slice.limit() - slice.position());
+        buffer.put(slice);
+    }
+
+    @Override
+    public void writeInt(int value) {
+        if (value < 0) {
+            switch (Integer.numberOfLeadingZeros(~value)) {
+                case 0:
+                case 1:
+                case 2:
+                case 3:
+                case 4:
+                case 5:
+                case 6:
+                case 7:
+                case 8:
+                case 9:
+                case 10:
+                case 11:
+                case 12:
+                case 13:
+                case 14:
+                case 15:
+                case 16:
+                    buffer.put(INT32);
+                    buffer.putInt(value);
+                    break;
+                case 17:
+                case 18:
+                case 19:
+                case 20:
+                case 21:
+                case 22:
+                case 23:
+                case 24:
+                    buffer.put(INT16);
+                    buffer.putChar((char) value);
+                    break;
+                case 25:
+                case 26:
+                    buffer.put(INT8);
+                    buffer.put((byte) value);
+                    break;
+                case 27:
+                case 28:
+                case 29:
+                case 30:
+                case 31:
+                case 32:
+                default:
+                    buffer.put((byte) (NEGFIXNUM | value));
+            }
+        } else {
+            switch (Integer.numberOfLeadingZeros(value)) {
+                case 0:
+                case 1:
+                case 2:
+                case 3:
+                case 4:
+                case 5:
+                case 6:
+                case 7:
+                case 8:
+                case 9:
+                case 10:
+                case 11:
+                case 12:
+                case 13:
+                case 14:
+                case 15:
+                    buffer.put(UINT32);
+                    buffer.putInt(value);
+                    break;
+                case 16:
+                case 17:
+                case 18:
+                case 19:
+                case 20:
+                case 21:
+                case 22:
+                case 23:
+                    buffer.put(UINT16);
+                    buffer.putChar((char) value);
+                    break;
+                case 24:
+                    buffer.put(UINT8);
+                    buffer.put((byte) value);
+                    break;
+                case 25:
+                case 26:
+                case 27:
+                case 28:
+                case 29:
+                case 30:
+                case 31:
+                case 32:
+                default:
+                    buffer.put((byte) value);
+            }
+        }
+    }
+
+    @Override
+    public void writeSignedInt(int value) {
+        writeInt(value);
     }
-  }
-
-  void writeBinaryHeader(int length) {
-    if (length < 0x100) {
-      buffer.put(BIN8);
-      buffer.put((byte) length);
-    } else if (length < 0x10000) {
-      buffer.put(BIN16);
-      buffer.putShort((short) length);
-    } else {
-      buffer.put(BIN32);
-      buffer.putInt(length);
+
+    @Override
+    public void writeLong(long value) {
+        writeLongInternal(value, false);
+    }
+
+    @Override
+    public void writeUnsignedLong(long value) {
+        writeLongInternal(value, true);
+    }
+
+    public void writeLongInternal(long value, boolean forceUnsigned) {
+        if (value < 0 && !forceUnsigned) {
+            switch (Long.numberOfLeadingZeros(~value)) {
+                case 0:
+                case 1:
+                case 2:
+                case 3:
+                case 4:
+                case 5:
+                case 6:
+                case 7:
+                case 8:
+                case 9:
+                case 10:
+                case 11:
+                case 12:
+                case 13:
+                case 14:
+                case 15:
+                case 16:
+                case 17:
+                case 18:
+                case 19:
+                case 20:
+                case 21:
+                case 22:
+                case 23:
+                case 24:
+                case 25:
+                case 26:
+                case 27:
+                case 28:
+                case 29:
+                case 30:
+                case 31:
+                case 32:
+                    buffer.put(INT64);
+                    buffer.putLong(value);
+                    break;
+                case 33:
+                case 34:
+                case 35:
+                case 36:
+                case 37:
+                case 38:
+                case 39:
+                case 40:
+                case 41:
+                case 42:
+                case 43:
+                case 44:
+                case 45:
+                case 46:
+                case 47:
+                case 48:
+                    buffer.put(INT32);
+                    buffer.putInt((int) value);
+                    break;
+                case 49:
+                case 50:
+                case 51:
+                case 52:
+                case 53:
+                case 54:
+                case 55:
+                case 56:
+                    buffer.put(INT16);
+                    buffer.putChar((char) value);
+                    break;
+                case 57:
+                case 58:
+                    buffer.put(INT8);
+                    buffer.put((byte) value);
+                    break;
+                case 59:
+                case 60:
+                case 61:
+                case 62:
+                case 63:
+                case 64:
+                default:
+                    buffer.put((byte) (NEGFIXNUM | value));
+            }
+        } else {
+            switch (Long.numberOfLeadingZeros(value)) {
+                case 0:
+                case 1:
+                case 2:
+                case 3:
+                case 4:
+                case 5:
+                case 6:
+                case 7:
+                case 8:
+                case 9:
+                case 10:
+                case 11:
+                case 12:
+                case 13:
+                case 14:
+                case 15:
+                case 16:
+                case 17:
+                case 18:
+                case 19:
+                case 20:
+                case 21:
+                case 22:
+                case 23:
+                case 24:
+                case 25:
+                case 26:
+                case 27:
+                case 28:
+                case 29:
+                case 30:
+                case 31:
+                    buffer.put(UINT64);
+                    buffer.putLong(value);
+                    break;
+                case 32:
+                case 33:
+                case 34:
+                case 35:
+                case 36:
+                case 37:
+                case 38:
+                case 39:
+                case 40:
+                case 41:
+                case 42:
+                case 43:
+                case 44:
+                case 45:
+                case 46:
+                case 47:
+                    buffer.put(UINT32);
+                    buffer.putInt((int) value);
+                    break;
+                case 48:
+                case 49:
+                case 50:
+                case 51:
+                case 52:
+                case 53:
+                case 54:
+                case 55:
+                    buffer.put(UINT16);
+                    buffer.putChar((char) value);
+                    break;
+                case 56:
+                    buffer.put(UINT8);
+                    buffer.put((byte) value);
+                    break;
+                case 57:
+                case 59:
+                case 60:
+                case 61:
+                case 62:
+                case 63:
+                case 64:
+                default:
+                    buffer.put((byte) value);
+            }
+        }
+    }
+
+    @Override
+    public void writeSignedLong(long value) {
+        writeLong(value);
+    }
+
+    @Override
+    public void writeFloat(float value) {
+        // The datadog agent fails to decode FLOAT32 even though the code in read_bytes.go looks like
+        // it will try to decode FLOAT32 just fine. Even if there will be a fix in a future datadog
+        // agent release, we need to be backwards compatible here by sending it as a FLOAT64 instead.
+        buffer.put(FLOAT64);
+        buffer.putDouble(value);
+    }
+
+    @Override
+    public void writeDouble(double value) {
+        buffer.put(FLOAT64);
+        buffer.putDouble(value);
+    }
+
+    @Override
+    public void startMap(int elementCount) {
+        if (elementCount < 0x10) {
+            buffer.put((byte) (FIXMAP | elementCount));
+        } else if (elementCount < 0x10000) {
+            buffer.put(MAP16);
+            buffer.putShort((short) elementCount);
+        } else {
+            buffer.put(MAP32);
+            buffer.putInt(elementCount);
+        }
+    }
+
+    @Override
+    public void startStruct(int elementCount) {
+        startArray(elementCount);
+    }
+
+    @Override
+    public void startArray(int elementCount) {
+        if (elementCount < 0x10) {
+            buffer.put((byte) (FIXARRAY | elementCount));
+        } else if (elementCount < 0x10000) {
+            buffer.put(ARRAY16);
+            buffer.putShort((short) elementCount);
+        } else {
+            buffer.put(ARRAY32);
+            buffer.putInt(elementCount);
+        }
+    }
+
+    void writeStringHeader(int length) {
+        if (length < 0x10) {
+            buffer.put((byte) (FIXSTR | length));
+        } else if (length < 0x100) {
+            buffer.put(STR8);
+            buffer.put((byte) length);
+        } else if (length < 0x10000) {
+            buffer.put(STR16);
+            buffer.putShort((short) length);
+        } else {
+            buffer.put(STR32);
+            buffer.putInt(length);
+        }
+    }
+
+    void writeBinaryHeader(int length) {
+        if (length < 0x100) {
+            buffer.put(BIN8);
+            buffer.put((byte) length);
+        } else if (length < 0x10000) {
+            buffer.put(BIN16);
+            buffer.putShort((short) length);
+        } else {
+            buffer.put(BIN32);
+            buffer.putInt(length);
+        }
     }
-  }
 }
diff --git a/communication/src/main/java/datadog/communication/util/IOThrowingFunction.java b/communication/src/main/java/datadog/communication/util/IOThrowingFunction.java
index e6cd18d96ed..a69ab9bd64d 100644
--- a/communication/src/main/java/datadog/communication/util/IOThrowingFunction.java
+++ b/communication/src/main/java/datadog/communication/util/IOThrowingFunction.java
@@ -5,5 +5,5 @@
 @FunctionalInterface
 public interface IOThrowingFunction<T, U> {
 
-  U apply(T t) throws IOException;
+    U apply(T t) throws IOException;
 }
diff --git a/communication/src/main/java/datadog/communication/util/IOUtils.java b/communication/src/main/java/datadog/communication/util/IOUtils.java
index 819e4bb3e18..c7f4529e063 100644
--- a/communication/src/main/java/datadog/communication/util/IOUtils.java
+++ b/communication/src/main/java/datadog/communication/util/IOUtils.java
@@ -19,66 +19,61 @@
 
 public abstract class IOUtils {
 
-  private static final int DEFAULT_BUFFER_SIZE = 4096;
+    private static final int DEFAULT_BUFFER_SIZE = 4096;
 
-  private IOUtils() {}
+    private IOUtils() {}
 
-  public static @Nonnull String readFully(InputStream input) throws IOException {
-    return readFully(input, Charset.defaultCharset());
-  }
+    public static @Nonnull String readFully(InputStream input) throws IOException {
+        return readFully(input, Charset.defaultCharset());
+    }
 
-  public static @Nonnull String readFully(InputStream input, Charset charset) throws IOException {
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    readFully(input, output);
-    return new String(output.toByteArray(), charset);
-  }
+    public static @Nonnull String readFully(InputStream input, Charset charset) throws IOException {
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        readFully(input, output);
+        return new String(output.toByteArray(), charset);
+    }
 
-  public static void readFully(InputStream input, OutputStream output) throws IOException {
-    byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
-    int count;
-    while ((count = input.read(buffer)) != -1) {
-      output.write(buffer, 0, count);
+    public static void readFully(InputStream input, OutputStream output) throws IOException {
+        byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
+        int count;
+        while ((count = input.read(buffer)) != -1) {
+            output.write(buffer, 0, count);
+        }
     }
-  }
 
-  public static @Nonnull List<String> readLines(final InputStream input) throws IOException {
-    return readLines(input, Charset.defaultCharset());
-  }
+    public static @Nonnull List<String> readLines(final InputStream input) throws IOException {
+        return readLines(input, Charset.defaultCharset());
+    }
 
-  public static @Nonnull List<String> readLines(final InputStream input, final Charset charset)
-      throws IOException {
-    final InputStreamReader reader = new InputStreamReader(input, charset);
-    return readLines(reader);
-  }
+    public static @Nonnull List<String> readLines(final InputStream input, final Charset charset) throws IOException {
+        final InputStreamReader reader = new InputStreamReader(input, charset);
+        return readLines(reader);
+    }
 
-  public static @Nonnull List<String> readLines(final Reader input) throws IOException {
-    final BufferedReader reader = new BufferedReader(input, DEFAULT_BUFFER_SIZE);
-    final List<String> list = new ArrayList<>();
-    String line = reader.readLine();
-    while (line != null) {
-      list.add(line);
-      line = reader.readLine();
+    public static @Nonnull List<String> readLines(final Reader input) throws IOException {
+        final BufferedReader reader = new BufferedReader(input, DEFAULT_BUFFER_SIZE);
+        final List<String> list = new ArrayList<>();
+        String line = reader.readLine();
+        while (line != null) {
+            list.add(line);
+            line = reader.readLine();
+        }
+        return list;
     }
-    return list;
-  }
 
-  public static void copyFolder(Path src, Path dest) throws IOException {
-    Files.walkFileTree(
-        src,
-        new SimpleFileVisitor<Path>() {
-          @Override
-          public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
-              throws IOException {
-            Files.createDirectories(dest.resolve(src.relativize(dir)));
-            return FileVisitResult.CONTINUE;
-          }
+    public static void copyFolder(Path src, Path dest) throws IOException {
+        Files.walkFileTree(src, new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+                Files.createDirectories(dest.resolve(src.relativize(dir)));
+                return FileVisitResult.CONTINUE;
+            }
 
-          @Override
-          public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-              throws IOException {
-            Files.copy(file, dest.resolve(src.relativize(file)));
-            return FileVisitResult.CONTINUE;
-          }
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                Files.copy(file, dest.resolve(src.relativize(file)));
+                return FileVisitResult.CONTINUE;
+            }
         });
-  }
+    }
 }
diff --git a/communication/src/main/java/okhttp3/internal/PatchUtil.java b/communication/src/main/java/okhttp3/internal/PatchUtil.java
index dde57821c31..db3df222403 100644
--- a/communication/src/main/java/okhttp3/internal/PatchUtil.java
+++ b/communication/src/main/java/okhttp3/internal/PatchUtil.java
@@ -56,635 +56,622 @@
 
 /** Junk drawer of utility methods. */
 public final class PatchUtil {
-  public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
-  public static final String[] EMPTY_STRING_ARRAY = new String[0];
-
-  public static final ResponseBody EMPTY_RESPONSE = ResponseBody.create(null, EMPTY_BYTE_ARRAY);
-  public static final RequestBody EMPTY_REQUEST = RequestBody.create(null, EMPTY_BYTE_ARRAY);
-
-  private static final ByteString UTF_8_BOM = ByteString.decodeHex("efbbbf");
-  private static final ByteString UTF_16_BE_BOM = ByteString.decodeHex("feff");
-  private static final ByteString UTF_16_LE_BOM = ByteString.decodeHex("fffe");
-  private static final ByteString UTF_32_BE_BOM = ByteString.decodeHex("0000ffff");
-  private static final ByteString UTF_32_LE_BOM = ByteString.decodeHex("ffff0000");
-
-  public static final Charset UTF_8 = Charset.forName("UTF-8");
-  public static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
-  private static final Charset UTF_16_BE = Charset.forName("UTF-16BE");
-  private static final Charset UTF_16_LE = Charset.forName("UTF-16LE");
-  private static final Charset UTF_32_BE = Charset.forName("UTF-32BE");
-  private static final Charset UTF_32_LE = Charset.forName("UTF-32LE");
-
-  /** GMT and UTC are equivalent for our purposes. */
-  public static final TimeZone UTC = TimeZone.getTimeZone("GMT");
-
-  public static final Comparator<String> NATURAL_ORDER =
-      new Comparator<String>() {
+    public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+    public static final String[] EMPTY_STRING_ARRAY = new String[0];
+
+    public static final ResponseBody EMPTY_RESPONSE = ResponseBody.create(null, EMPTY_BYTE_ARRAY);
+    public static final RequestBody EMPTY_REQUEST = RequestBody.create(null, EMPTY_BYTE_ARRAY);
+
+    private static final ByteString UTF_8_BOM = ByteString.decodeHex("efbbbf");
+    private static final ByteString UTF_16_BE_BOM = ByteString.decodeHex("feff");
+    private static final ByteString UTF_16_LE_BOM = ByteString.decodeHex("fffe");
+    private static final ByteString UTF_32_BE_BOM = ByteString.decodeHex("0000ffff");
+    private static final ByteString UTF_32_LE_BOM = ByteString.decodeHex("ffff0000");
+
+    public static final Charset UTF_8 = Charset.forName("UTF-8");
+    public static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
+    private static final Charset UTF_16_BE = Charset.forName("UTF-16BE");
+    private static final Charset UTF_16_LE = Charset.forName("UTF-16LE");
+    private static final Charset UTF_32_BE = Charset.forName("UTF-32BE");
+    private static final Charset UTF_32_LE = Charset.forName("UTF-32LE");
+
+    /** GMT and UTC are equivalent for our purposes. */
+    public static final TimeZone UTC = TimeZone.getTimeZone("GMT");
+
+    public static final Comparator<String> NATURAL_ORDER = new Comparator<String>() {
         @Override
         public int compare(String a, String b) {
-          return a.compareTo(b);
-        }
-      };
-
-  private static final Method addSuppressedExceptionMethod;
-
-  static {
-    Method m;
-    try {
-      m = Throwable.class.getDeclaredMethod("addSuppressed", Throwable.class);
-    } catch (Exception e) {
-      m = null;
-    }
-    addSuppressedExceptionMethod = m;
-  }
-
-  public static void addSuppressedIfPossible(Throwable e, Throwable suppressed) {
-    if (addSuppressedExceptionMethod != null) {
-      try {
-        addSuppressedExceptionMethod.invoke(e, suppressed);
-      } catch (InvocationTargetException | IllegalAccessException ignored) {
-      }
-    }
-  }
-
-  /**
-   * Quick and dirty pattern to differentiate IP addresses from hostnames. This is an approximation
-   * of Android's private InetAddress#isNumeric API.
-   *
-   * <p>This matches IPv6 addresses as a hex string containing at least one colon, and possibly
-   * including dots after the first colon. It matches IPv4 addresses as strings containing only
-   * decimal digits and dots. This pattern matches strings like "a:.23" and "54" that are neither IP
-   * addresses nor hostnames; they will be verified as IP addresses (which is a more strict
-   * verification).
-   */
-  private static final Pattern VERIFY_AS_IP_ADDRESS =
-      Pattern.compile("([0-9a-fA-F]*:[0-9a-fA-F:.]*)|([\\d.]+)");
-
-  private PatchUtil() {}
-
-  public static void checkOffsetAndCount(long arrayLength, long offset, long count) {
-    if ((offset | count) < 0 || offset > arrayLength || arrayLength - offset < count) {
-      throw new ArrayIndexOutOfBoundsException();
-    }
-  }
-
-  /** Returns true if two possibly-null objects are equal. */
-  public static boolean equal(Object a, Object b) {
-    return a == b || (a != null && a.equals(b));
-  }
-
-  /**
-   * Closes {@code closeable}, ignoring any checked exceptions. Does nothing if {@code closeable} is
-   * null.
-   */
-  public static void closeQuietly(Closeable closeable) {
-    if (closeable != null) {
-      try {
-        closeable.close();
-      } catch (RuntimeException rethrown) {
-        throw rethrown;
-      } catch (Exception ignored) {
-      }
-    }
-  }
-
-  /**
-   * Closes {@code socket}, ignoring any checked exceptions. Does nothing if {@code socket} is null.
-   */
-  public static void closeQuietly(Socket socket) {
-    if (socket != null) {
-      try {
-        socket.close();
-      } catch (AssertionError e) {
-        if (!isAndroidGetsocknameError(e)) throw e;
-      } catch (RuntimeException rethrown) {
-        if ("bio == null".equals(rethrown.getMessage())) {
-          // Conscrypt in Android 10 and 11 may throw closing an SSLSocket. This is safe to ignore.
-          // https://issuetracker.google.com/issues/177450597
-          return;
-        }
-        throw rethrown;
-      } catch (Exception ignored) {
-      }
-    }
-  }
-
-  /**
-   * Closes {@code serverSocket}, ignoring any checked exceptions. Does nothing if {@code
-   * serverSocket} is null.
-   */
-  public static void closeQuietly(ServerSocket serverSocket) {
-    if (serverSocket != null) {
-      try {
-        serverSocket.close();
-      } catch (RuntimeException rethrown) {
-        throw rethrown;
-      } catch (Exception ignored) {
-      }
-    }
-  }
-
-  /**
-   * Attempts to exhaust {@code source}, returning true if successful. This is useful when reading a
-   * complete source is helpful, such as when doing so completes a cache body or frees a socket
-   * connection for reuse.
-   */
-  public static boolean discard(Source source, int timeout, TimeUnit timeUnit) {
-    try {
-      return skipAll(source, timeout, timeUnit);
-    } catch (IOException e) {
-      return false;
-    }
-  }
-
-  /**
-   * Reads until {@code in} is exhausted or the deadline has been reached. This is careful to not
-   * extend the deadline if one exists already.
-   */
-  public static boolean skipAll(Source source, int duration, TimeUnit timeUnit) throws IOException {
-    long now = System.nanoTime();
-    long originalDuration =
-        source.timeout().hasDeadline() ? source.timeout().deadlineNanoTime() - now : Long.MAX_VALUE;
-    source.timeout().deadlineNanoTime(now + Math.min(originalDuration, timeUnit.toNanos(duration)));
-    try {
-      Buffer skipBuffer = new Buffer();
-      while (source.read(skipBuffer, 8192) != -1) {
-        skipBuffer.clear();
-      }
-      return true; // Success! The source has been exhausted.
-    } catch (InterruptedIOException e) {
-      return false; // We ran out of time before exhausting the source.
-    } finally {
-      if (originalDuration == Long.MAX_VALUE) {
-        source.timeout().clearDeadline();
-      } else {
-        source.timeout().deadlineNanoTime(now + originalDuration);
-      }
-    }
-  }
-
-  /** Returns an immutable copy of {@code list}. */
-  public static <T> List<T> immutableList(List<T> list) {
-    return Collections.unmodifiableList(new ArrayList<>(list));
-  }
-
-  /** Returns an immutable copy of {@code map}. */
-  public static <K, V> Map<K, V> immutableMap(Map<K, V> map) {
-    return map.isEmpty()
-        ? Collections.<K, V>emptyMap()
-        : Collections.unmodifiableMap(new LinkedHashMap<>(map));
-  }
-
-  /** Returns an immutable list containing {@code elements}. */
-  public static <T> List<T> immutableList(T... elements) {
-    return Collections.unmodifiableList(Arrays.asList(elements.clone()));
-  }
-
-  public static ThreadFactory threadFactory(final String name, final boolean daemon) {
-    return new ThreadFactory() {
-      @Override
-      public Thread newThread(Runnable runnable) {
-        Thread result = new Thread(runnable, name);
-        result.setDaemon(true); // always create daemon threads
-        return result;
-      }
+            return a.compareTo(b);
+        }
     };
-  }
-
-  /**
-   * Returns an array containing only elements found in {@code first} and also in {@code second}.
-   * The returned elements are in the same order as in {@code first}.
-   */
-  @SuppressWarnings("unchecked")
-  public static String[] intersect(
-      Comparator<? super String> comparator, String[] first, String[] second) {
-    List<String> result = new ArrayList<>();
-    for (String a : first) {
-      for (String b : second) {
-        if (comparator.compare(a, b) == 0) {
-          result.add(a);
-          break;
-        }
-      }
-    }
-    return result.toArray(new String[result.size()]);
-  }
-
-  /**
-   * Returns true if there is an element in {@code first} that is also in {@code second}. This
-   * method terminates if any intersection is found. The sizes of both arguments are assumed to be
-   * so small, and the likelihood of an intersection so great, that it is not worth the CPU cost of
-   * sorting or the memory cost of hashing.
-   */
-  public static boolean nonEmptyIntersection(
-      Comparator<String> comparator, String[] first, String[] second) {
-    if (first == null || second == null || first.length == 0 || second.length == 0) {
-      return false;
-    }
-    for (String a : first) {
-      for (String b : second) {
-        if (comparator.compare(a, b) == 0) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  public static String hostHeader(HttpUrl url, boolean includeDefaultPort) {
-    String host = url.host().contains(":") ? "[" + url.host() + "]" : url.host();
-    return includeDefaultPort || url.port() != HttpUrl.defaultPort(url.scheme())
-        ? host + ":" + url.port()
-        : host;
-  }
-
-  /**
-   * Returns true if {@code e} is due to a firmware bug fixed after Android 4.2.2.
-   * https://code.google.com/p/android/issues/detail?id=54072
-   */
-  public static boolean isAndroidGetsocknameError(AssertionError e) {
-    return e.getCause() != null
-        && e.getMessage() != null
-        && e.getMessage().contains("getsockname failed");
-  }
-
-  public static int indexOf(Comparator<String> comparator, String[] array, String value) {
-    for (int i = 0, size = array.length; i < size; i++) {
-      if (comparator.compare(array[i], value) == 0) return i;
-    }
-    return -1;
-  }
-
-  public static String[] concat(String[] array, String value) {
-    String[] result = new String[array.length + 1];
-    System.arraycopy(array, 0, result, 0, array.length);
-    result[result.length - 1] = value;
-    return result;
-  }
-
-  /**
-   * Increments {@code pos} until {@code input[pos]} is not ASCII whitespace. Stops at {@code
-   * limit}.
-   */
-  public static int skipLeadingAsciiWhitespace(String input, int pos, int limit) {
-    for (int i = pos; i < limit; i++) {
-      switch (input.charAt(i)) {
-        case '\t':
-        case '\n':
-        case '\f':
-        case '\r':
-        case ' ':
-          continue;
-        default:
-          return i;
-      }
-    }
-    return limit;
-  }
-
-  /**
-   * Decrements {@code limit} until {@code input[limit - 1]} is not ASCII whitespace. Stops at
-   * {@code pos}.
-   */
-  public static int skipTrailingAsciiWhitespace(String input, int pos, int limit) {
-    for (int i = limit - 1; i >= pos; i--) {
-      switch (input.charAt(i)) {
-        case '\t':
-        case '\n':
-        case '\f':
-        case '\r':
-        case ' ':
-          continue;
-        default:
-          return i + 1;
-      }
-    }
-    return pos;
-  }
-
-  /** Equivalent to {@code string.substring(pos, limit).trim()}. */
-  public static String trimSubstring(String string, int pos, int limit) {
-    int start = skipLeadingAsciiWhitespace(string, pos, limit);
-    int end = skipTrailingAsciiWhitespace(string, start, limit);
-    return string.substring(start, end);
-  }
-
-  /**
-   * Returns the index of the first character in {@code input} that contains a character in {@code
-   * delimiters}. Returns limit if there is no such character.
-   */
-  public static int delimiterOffset(String input, int pos, int limit, String delimiters) {
-    for (int i = pos; i < limit; i++) {
-      if (delimiters.indexOf(input.charAt(i)) != -1) return i;
-    }
-    return limit;
-  }
-
-  /**
-   * Returns the index of the first character in {@code input} that is {@code delimiter}. Returns
-   * limit if there is no such character.
-   */
-  public static int delimiterOffset(String input, int pos, int limit, char delimiter) {
-    for (int i = pos; i < limit; i++) {
-      if (input.charAt(i) == delimiter) return i;
-    }
-    return limit;
-  }
-
-  /**
-   * If {@code host} is an IP address, this returns the IP address in canonical form.
-   *
-   * <p>Otherwise this performs IDN ToASCII encoding and canonicalize the result to lowercase. For
-   * example this converts {@code ☃.net} to {@code xn--n3h.net}, and {@code WwW.GoOgLe.cOm} to
-   * {@code www.google.com}. {@code null} will be returned if the host cannot be ToASCII encoded or
-   * if the result contains unsupported ASCII characters.
-   */
-  public static String canonicalizeHost(String host) {
-    // If the input contains a :, it’s an IPv6 address.
-    if (host.contains(":")) {
-      // If the input is encased in square braces "[...]", drop 'em.
-      InetAddress inetAddress =
-          host.startsWith("[") && host.endsWith("]")
-              ? decodeIpv6(host, 1, host.length() - 1)
-              : decodeIpv6(host, 0, host.length());
-      if (inetAddress == null) return null;
-      byte[] address = inetAddress.getAddress();
-      if (address.length == 16) return inet6AddressToAscii(address);
-      throw new AssertionError("Invalid IPv6 address: '" + host + "'");
-    }
-
-    try {
-      String result = IDN.toASCII(host).toLowerCase(Locale.US);
-      if (result.isEmpty()) return null;
-
-      // Confirm that the IDN ToASCII result doesn't contain any illegal characters.
-      if (containsInvalidHostnameAsciiCodes(result)) {
-        return null;
-      }
-      // TODO: implement all label limits.
-      return result;
-    } catch (IllegalArgumentException e) {
-      return null;
-    }
-  }
-
-  private static boolean containsInvalidHostnameAsciiCodes(String hostnameAscii) {
-    for (int i = 0; i < hostnameAscii.length(); i++) {
-      char c = hostnameAscii.charAt(i);
-      // The WHATWG Host parsing rules accepts some character codes which are invalid by
-      // definition for OkHttp's host header checks (and the WHATWG Host syntax definition). Here
-      // we rule out characters that would cause problems in host headers.
-      if (c <= '\u001f' || c >= '\u007f') {
-        return true;
-      }
-      // Check for the characters mentioned in the WHATWG Host parsing spec:
-      // U+0000, U+0009, U+000A, U+000D, U+0020, "#", "%", "/", ":", "?", "@", "[", "\", and "]"
-      // (excluding the characters covered above).
-      if (" #%/:?@[\\]".indexOf(c) != -1) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Returns the index of the first character in {@code input} that is either a control character
-   * (like {@code \u0000 or \n}) or a non-ASCII character. Returns -1 if {@code input} has no such
-   * characters.
-   */
-  public static int indexOfControlOrNonAscii(String input) {
-    for (int i = 0, length = input.length(); i < length; i++) {
-      char c = input.charAt(i);
-      if (c <= '\u001f' || c >= '\u007f') {
-        return i;
-      }
-    }
-    return -1;
-  }
-
-  /** Returns true if {@code host} is not a host name and might be an IP address. */
-  public static boolean verifyAsIpAddress(String host) {
-    return VERIFY_AS_IP_ADDRESS.matcher(host).matches();
-  }
-
-  /** Returns a {@link Locale#US} formatted {@link String}. */
-  public static String format(String format, Object... args) {
-    return String.format(Locale.US, format, args);
-  }
-
-  public static Charset bomAwareCharset(BufferedSource source, Charset charset) throws IOException {
-    if (source.rangeEquals(0, UTF_8_BOM)) {
-      source.skip(UTF_8_BOM.size());
-      return UTF_8;
-    }
-    if (source.rangeEquals(0, UTF_16_BE_BOM)) {
-      source.skip(UTF_16_BE_BOM.size());
-      return UTF_16_BE;
-    }
-    if (source.rangeEquals(0, UTF_16_LE_BOM)) {
-      source.skip(UTF_16_LE_BOM.size());
-      return UTF_16_LE;
-    }
-    if (source.rangeEquals(0, UTF_32_BE_BOM)) {
-      source.skip(UTF_32_BE_BOM.size());
-      return UTF_32_BE;
-    }
-    if (source.rangeEquals(0, UTF_32_LE_BOM)) {
-      source.skip(UTF_32_LE_BOM.size());
-      return UTF_32_LE;
-    }
-    return charset;
-  }
-
-  public static int checkDuration(String name, long duration, TimeUnit unit) {
-    if (duration < 0) throw new IllegalArgumentException(name + " < 0");
-    if (unit == null) throw new NullPointerException("unit == null");
-    long millis = unit.toMillis(duration);
-    if (millis > Integer.MAX_VALUE) throw new IllegalArgumentException(name + " too large.");
-    if (millis == 0 && duration > 0) throw new IllegalArgumentException(name + " too small.");
-    return (int) millis;
-  }
-
-  public static AssertionError assertionError(String message, Exception e) {
-    AssertionError assertionError = new AssertionError(message);
-    try {
-      assertionError.initCause(e);
-    } catch (IllegalStateException ise) {
-      // ignored, shouldn't happen
-    }
-    return assertionError;
-  }
-
-  public static int decodeHexDigit(char c) {
-    if (c >= '0' && c <= '9') return c - '0';
-    if (c >= 'a' && c <= 'f') return c - 'a' + 10;
-    if (c >= 'A' && c <= 'F') return c - 'A' + 10;
-    return -1;
-  }
-
-  /** Decodes an IPv6 address like 1111:2222:3333:4444:5555:6666:7777:8888 or ::1. */
-  private static @Nullable InetAddress decodeIpv6(String input, int pos, int limit) {
-    byte[] address = new byte[16];
-    int b = 0;
-    int compress = -1;
-    int groupOffset = -1;
-
-    for (int i = pos; i < limit; ) {
-      if (b == address.length) return null; // Too many groups.
-
-      // Read a delimiter.
-      if (i + 2 <= limit && input.regionMatches(i, "::", 0, 2)) {
-        // Compression "::" delimiter, which is anywhere in the input, including its prefix.
-        if (compress != -1) return null; // Multiple "::" delimiters.
-        i += 2;
-        b += 2;
-        compress = b;
-        if (i == limit) break;
-      } else if (b != 0) {
-        // Group separator ":" delimiter.
-        if (input.regionMatches(i, ":", 0, 1)) {
-          i++;
-        } else if (input.regionMatches(i, ".", 0, 1)) {
-          // If we see a '.', rewind to the beginning of the previous group and parse as IPv4.
-          if (!decodeIpv4Suffix(input, groupOffset, limit, address, b - 2)) return null;
-          b += 2; // We rewound two bytes and then added four.
-          break;
-        } else {
-          return null; // Wrong delimiter.
-        }
-      }
-
-      // Read a group, one to four hex digits.
-      int value = 0;
-      groupOffset = i;
-      for (; i < limit; i++) {
-        char c = input.charAt(i);
-        int hexDigit = decodeHexDigit(c);
-        if (hexDigit == -1) break;
-        value = (value << 4) + hexDigit;
-      }
-      int groupLength = i - groupOffset;
-      if (groupLength == 0 || groupLength > 4) return null; // Group is the wrong size.
-
-      // We've successfully read a group. Assign its value to our byte array.
-      address[b++] = (byte) ((value >>> 8) & 0xff);
-      address[b++] = (byte) (value & 0xff);
-    }
-
-    // All done. If compression happened, we need to move bytes to the right place in the
-    // address. Here's a sample:
-    //
-    //      input: "1111:2222:3333::7777:8888"
-    //     before: { 11, 11, 22, 22, 33, 33, 00, 00, 77, 77, 88, 88, 00, 00, 00, 00  }
-    //   compress: 6
-    //          b: 10
-    //      after: { 11, 11, 22, 22, 33, 33, 00, 00, 00, 00, 00, 00, 77, 77, 88, 88 }
-    //
-    if (b != address.length) {
-      if (compress == -1) return null; // Address didn't have compression or enough groups.
-      System.arraycopy(address, compress, address, address.length - (b - compress), b - compress);
-      Arrays.fill(address, compress, compress + (address.length - b), (byte) 0);
-    }
-
-    try {
-      return InetAddress.getByAddress(address);
-    } catch (UnknownHostException e) {
-      throw new AssertionError();
-    }
-  }
-
-  /** Decodes an IPv4 address suffix of an IPv6 address, like 1111::5555:6666:192.168.0.1. */
-  private static boolean decodeIpv4Suffix(
-      String input, int pos, int limit, byte[] address, int addressOffset) {
-    int b = addressOffset;
-
-    for (int i = pos; i < limit; ) {
-      if (b == address.length) return false; // Too many groups.
-
-      // Read a delimiter.
-      if (b != addressOffset) {
-        if (input.charAt(i) != '.') return false; // Wrong delimiter.
-        i++;
-      }
-
-      // Read 1 or more decimal digits for a value in 0..255.
-      int value = 0;
-      int groupOffset = i;
-      for (; i < limit; i++) {
-        char c = input.charAt(i);
-        if (c < '0' || c > '9') break;
-        if (value == 0 && groupOffset != i) return false; // Reject unnecessary leading '0's.
-        value = (value * 10) + c - '0';
-        if (value > 255) return false; // Value out of range.
-      }
-      int groupLength = i - groupOffset;
-      if (groupLength == 0) return false; // No digits.
-
-      // We've successfully read a byte.
-      address[b++] = (byte) value;
-    }
-
-    if (b != addressOffset + 4) return false; // Too few groups. We wanted exactly four.
-    return true; // Success.
-  }
-
-  /** Encodes an IPv6 address in canonical form according to RFC 5952. */
-  private static String inet6AddressToAscii(byte[] address) {
-    // Go through the address looking for the longest run of 0s. Each group is 2-bytes.
-    // A run must be longer than one group (section 4.2.2).
-    // If there are multiple equal runs, the first one must be used (section 4.2.3).
-    int longestRunOffset = -1;
-    int longestRunLength = 0;
-    for (int i = 0; i < address.length; i += 2) {
-      int currentRunOffset = i;
-      while (i < 16 && address[i] == 0 && address[i + 1] == 0) {
-        i += 2;
-      }
-      int currentRunLength = i - currentRunOffset;
-      if (currentRunLength > longestRunLength && currentRunLength >= 4) {
-        longestRunOffset = currentRunOffset;
-        longestRunLength = currentRunLength;
-      }
-    }
-
-    // Emit each 2-byte group in hex, separated by ':'. The longest run of zeroes is "::".
-    Buffer result = new Buffer();
-    for (int i = 0; i < address.length; ) {
-      if (i == longestRunOffset) {
-        result.writeByte(':');
-        i += longestRunLength;
-        if (i == 16) result.writeByte(':');
-      } else {
-        if (i > 0) result.writeByte(':');
-        int group = (address[i] & 0xff) << 8 | address[i + 1] & 0xff;
-        result.writeHexadecimalUnsignedLong(group);
-        i += 2;
-      }
-    }
-    return result.readUtf8();
-  }
-
-  public static X509TrustManager platformTrustManager() {
-    try {
-      TrustManagerFactory trustManagerFactory =
-          TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-      trustManagerFactory.init((KeyStore) null);
-      TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
-      if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager)) {
-        throw new IllegalStateException(
-            "Unexpected default trust managers:" + Arrays.toString(trustManagers));
-      }
-      return (X509TrustManager) trustManagers[0];
-    } catch (GeneralSecurityException e) {
-      throw assertionError("No System TLS", e); // The system has no TLS. Just give up.
-    }
-  }
-
-  public static Headers toHeaders(List<Header> headerBlock) {
-    Headers.Builder builder = new Headers.Builder();
-    for (Header header : headerBlock) {
-      Internal.instance.addLenient(builder, header.name.utf8(), header.value.utf8());
-    }
-    return builder.build();
-  }
+
+    private static final Method addSuppressedExceptionMethod;
+
+    static {
+        Method m;
+        try {
+            m = Throwable.class.getDeclaredMethod("addSuppressed", Throwable.class);
+        } catch (Exception e) {
+            m = null;
+        }
+        addSuppressedExceptionMethod = m;
+    }
+
+    public static void addSuppressedIfPossible(Throwable e, Throwable suppressed) {
+        if (addSuppressedExceptionMethod != null) {
+            try {
+                addSuppressedExceptionMethod.invoke(e, suppressed);
+            } catch (InvocationTargetException | IllegalAccessException ignored) {
+            }
+        }
+    }
+
+    /**
+     * Quick and dirty pattern to differentiate IP addresses from hostnames. This is an approximation
+     * of Android's private InetAddress#isNumeric API.
+     *
+     * <p>This matches IPv6 addresses as a hex string containing at least one colon, and possibly
+     * including dots after the first colon. It matches IPv4 addresses as strings containing only
+     * decimal digits and dots. This pattern matches strings like "a:.23" and "54" that are neither IP
+     * addresses nor hostnames; they will be verified as IP addresses (which is a more strict
+     * verification).
+     */
+    private static final Pattern VERIFY_AS_IP_ADDRESS = Pattern.compile("([0-9a-fA-F]*:[0-9a-fA-F:.]*)|([\\d.]+)");
+
+    private PatchUtil() {}
+
+    public static void checkOffsetAndCount(long arrayLength, long offset, long count) {
+        if ((offset | count) < 0 || offset > arrayLength || arrayLength - offset < count) {
+            throw new ArrayIndexOutOfBoundsException();
+        }
+    }
+
+    /** Returns true if two possibly-null objects are equal. */
+    public static boolean equal(Object a, Object b) {
+        return a == b || (a != null && a.equals(b));
+    }
+
+    /**
+     * Closes {@code closeable}, ignoring any checked exceptions. Does nothing if {@code closeable} is
+     * null.
+     */
+    public static void closeQuietly(Closeable closeable) {
+        if (closeable != null) {
+            try {
+                closeable.close();
+            } catch (RuntimeException rethrown) {
+                throw rethrown;
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    /**
+     * Closes {@code socket}, ignoring any checked exceptions. Does nothing if {@code socket} is null.
+     */
+    public static void closeQuietly(Socket socket) {
+        if (socket != null) {
+            try {
+                socket.close();
+            } catch (AssertionError e) {
+                if (!isAndroidGetsocknameError(e)) throw e;
+            } catch (RuntimeException rethrown) {
+                if ("bio == null".equals(rethrown.getMessage())) {
+                    // Conscrypt in Android 10 and 11 may throw closing an SSLSocket. This is safe to ignore.
+                    // https://issuetracker.google.com/issues/177450597
+                    return;
+                }
+                throw rethrown;
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    /**
+     * Closes {@code serverSocket}, ignoring any checked exceptions. Does nothing if {@code
+     * serverSocket} is null.
+     */
+    public static void closeQuietly(ServerSocket serverSocket) {
+        if (serverSocket != null) {
+            try {
+                serverSocket.close();
+            } catch (RuntimeException rethrown) {
+                throw rethrown;
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    /**
+     * Attempts to exhaust {@code source}, returning true if successful. This is useful when reading a
+     * complete source is helpful, such as when doing so completes a cache body or frees a socket
+     * connection for reuse.
+     */
+    public static boolean discard(Source source, int timeout, TimeUnit timeUnit) {
+        try {
+            return skipAll(source, timeout, timeUnit);
+        } catch (IOException e) {
+            return false;
+        }
+    }
+
+    /**
+     * Reads until {@code in} is exhausted or the deadline has been reached. This is careful to not
+     * extend the deadline if one exists already.
+     */
+    public static boolean skipAll(Source source, int duration, TimeUnit timeUnit) throws IOException {
+        long now = System.nanoTime();
+        long originalDuration =
+                source.timeout().hasDeadline() ? source.timeout().deadlineNanoTime() - now : Long.MAX_VALUE;
+        source.timeout().deadlineNanoTime(now + Math.min(originalDuration, timeUnit.toNanos(duration)));
+        try {
+            Buffer skipBuffer = new Buffer();
+            while (source.read(skipBuffer, 8192) != -1) {
+                skipBuffer.clear();
+            }
+            return true; // Success! The source has been exhausted.
+        } catch (InterruptedIOException e) {
+            return false; // We ran out of time before exhausting the source.
+        } finally {
+            if (originalDuration == Long.MAX_VALUE) {
+                source.timeout().clearDeadline();
+            } else {
+                source.timeout().deadlineNanoTime(now + originalDuration);
+            }
+        }
+    }
+
+    /** Returns an immutable copy of {@code list}. */
+    public static <T> List<T> immutableList(List<T> list) {
+        return Collections.unmodifiableList(new ArrayList<>(list));
+    }
+
+    /** Returns an immutable copy of {@code map}. */
+    public static <K, V> Map<K, V> immutableMap(Map<K, V> map) {
+        return map.isEmpty() ? Collections.<K, V>emptyMap() : Collections.unmodifiableMap(new LinkedHashMap<>(map));
+    }
+
+    /** Returns an immutable list containing {@code elements}. */
+    public static <T> List<T> immutableList(T... elements) {
+        return Collections.unmodifiableList(Arrays.asList(elements.clone()));
+    }
+
+    public static ThreadFactory threadFactory(final String name, final boolean daemon) {
+        return new ThreadFactory() {
+            @Override
+            public Thread newThread(Runnable runnable) {
+                Thread result = new Thread(runnable, name);
+                result.setDaemon(true); // always create daemon threads
+                return result;
+            }
+        };
+    }
+
+    /**
+     * Returns an array containing only elements found in {@code first} and also in {@code second}.
+     * The returned elements are in the same order as in {@code first}.
+     */
+    @SuppressWarnings("unchecked")
+    public static String[] intersect(Comparator<? super String> comparator, String[] first, String[] second) {
+        List<String> result = new ArrayList<>();
+        for (String a : first) {
+            for (String b : second) {
+                if (comparator.compare(a, b) == 0) {
+                    result.add(a);
+                    break;
+                }
+            }
+        }
+        return result.toArray(new String[result.size()]);
+    }
+
+    /**
+     * Returns true if there is an element in {@code first} that is also in {@code second}. This
+     * method terminates if any intersection is found. The sizes of both arguments are assumed to be
+     * so small, and the likelihood of an intersection so great, that it is not worth the CPU cost of
+     * sorting or the memory cost of hashing.
+     */
+    public static boolean nonEmptyIntersection(Comparator<String> comparator, String[] first, String[] second) {
+        if (first == null || second == null || first.length == 0 || second.length == 0) {
+            return false;
+        }
+        for (String a : first) {
+            for (String b : second) {
+                if (comparator.compare(a, b) == 0) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public static String hostHeader(HttpUrl url, boolean includeDefaultPort) {
+        String host = url.host().contains(":") ? "[" + url.host() + "]" : url.host();
+        return includeDefaultPort || url.port() != HttpUrl.defaultPort(url.scheme()) ? host + ":" + url.port() : host;
+    }
+
+    /**
+     * Returns true if {@code e} is due to a firmware bug fixed after Android 4.2.2.
+     * https://code.google.com/p/android/issues/detail?id=54072
+     */
+    public static boolean isAndroidGetsocknameError(AssertionError e) {
+        return e.getCause() != null && e.getMessage() != null && e.getMessage().contains("getsockname failed");
+    }
+
+    public static int indexOf(Comparator<String> comparator, String[] array, String value) {
+        for (int i = 0, size = array.length; i < size; i++) {
+            if (comparator.compare(array[i], value) == 0) return i;
+        }
+        return -1;
+    }
+
+    public static String[] concat(String[] array, String value) {
+        String[] result = new String[array.length + 1];
+        System.arraycopy(array, 0, result, 0, array.length);
+        result[result.length - 1] = value;
+        return result;
+    }
+
+    /**
+     * Increments {@code pos} until {@code input[pos]} is not ASCII whitespace. Stops at {@code
+     * limit}.
+     */
+    public static int skipLeadingAsciiWhitespace(String input, int pos, int limit) {
+        for (int i = pos; i < limit; i++) {
+            switch (input.charAt(i)) {
+                case '\t':
+                case '\n':
+                case '\f':
+                case '\r':
+                case ' ':
+                    continue;
+                default:
+                    return i;
+            }
+        }
+        return limit;
+    }
+
+    /**
+     * Decrements {@code limit} until {@code input[limit - 1]} is not ASCII whitespace. Stops at
+     * {@code pos}.
+     */
+    public static int skipTrailingAsciiWhitespace(String input, int pos, int limit) {
+        for (int i = limit - 1; i >= pos; i--) {
+            switch (input.charAt(i)) {
+                case '\t':
+                case '\n':
+                case '\f':
+                case '\r':
+                case ' ':
+                    continue;
+                default:
+                    return i + 1;
+            }
+        }
+        return pos;
+    }
+
+    /** Equivalent to {@code string.substring(pos, limit).trim()}. */
+    public static String trimSubstring(String string, int pos, int limit) {
+        int start = skipLeadingAsciiWhitespace(string, pos, limit);
+        int end = skipTrailingAsciiWhitespace(string, start, limit);
+        return string.substring(start, end);
+    }
+
+    /**
+     * Returns the index of the first character in {@code input} that contains a character in {@code
+     * delimiters}. Returns limit if there is no such character.
+     */
+    public static int delimiterOffset(String input, int pos, int limit, String delimiters) {
+        for (int i = pos; i < limit; i++) {
+            if (delimiters.indexOf(input.charAt(i)) != -1) return i;
+        }
+        return limit;
+    }
+
+    /**
+     * Returns the index of the first character in {@code input} that is {@code delimiter}. Returns
+     * limit if there is no such character.
+     */
+    public static int delimiterOffset(String input, int pos, int limit, char delimiter) {
+        for (int i = pos; i < limit; i++) {
+            if (input.charAt(i) == delimiter) return i;
+        }
+        return limit;
+    }
+
+    /**
+     * If {@code host} is an IP address, this returns the IP address in canonical form.
+     *
+     * <p>Otherwise this performs IDN ToASCII encoding and canonicalize the result to lowercase. For
+     * example this converts {@code ☃.net} to {@code xn--n3h.net}, and {@code WwW.GoOgLe.cOm} to
+     * {@code www.google.com}. {@code null} will be returned if the host cannot be ToASCII encoded or
+     * if the result contains unsupported ASCII characters.
+     */
+    public static String canonicalizeHost(String host) {
+        // If the input contains a :, it’s an IPv6 address.
+        if (host.contains(":")) {
+            // If the input is encased in square braces "[...]", drop 'em.
+            InetAddress inetAddress = host.startsWith("[") && host.endsWith("]")
+                    ? decodeIpv6(host, 1, host.length() - 1)
+                    : decodeIpv6(host, 0, host.length());
+            if (inetAddress == null) return null;
+            byte[] address = inetAddress.getAddress();
+            if (address.length == 16) return inet6AddressToAscii(address);
+            throw new AssertionError("Invalid IPv6 address: '" + host + "'");
+        }
+
+        try {
+            String result = IDN.toASCII(host).toLowerCase(Locale.US);
+            if (result.isEmpty()) return null;
+
+            // Confirm that the IDN ToASCII result doesn't contain any illegal characters.
+            if (containsInvalidHostnameAsciiCodes(result)) {
+                return null;
+            }
+            // TODO: implement all label limits.
+            return result;
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    private static boolean containsInvalidHostnameAsciiCodes(String hostnameAscii) {
+        for (int i = 0; i < hostnameAscii.length(); i++) {
+            char c = hostnameAscii.charAt(i);
+            // The WHATWG Host parsing rules accepts some character codes which are invalid by
+            // definition for OkHttp's host header checks (and the WHATWG Host syntax definition). Here
+            // we rule out characters that would cause problems in host headers.
+            if (c <= '\u001f' || c >= '\u007f') {
+                return true;
+            }
+            // Check for the characters mentioned in the WHATWG Host parsing spec:
+            // U+0000, U+0009, U+000A, U+000D, U+0020, "#", "%", "/", ":", "?", "@", "[", "\", and "]"
+            // (excluding the characters covered above).
+            if (" #%/:?@[\\]".indexOf(c) != -1) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns the index of the first character in {@code input} that is either a control character
+     * (like {@code \u0000 or \n}) or a non-ASCII character. Returns -1 if {@code input} has no such
+     * characters.
+     */
+    public static int indexOfControlOrNonAscii(String input) {
+        for (int i = 0, length = input.length(); i < length; i++) {
+            char c = input.charAt(i);
+            if (c <= '\u001f' || c >= '\u007f') {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    /** Returns true if {@code host} is not a host name and might be an IP address. */
+    public static boolean verifyAsIpAddress(String host) {
+        return VERIFY_AS_IP_ADDRESS.matcher(host).matches();
+    }
+
+    /** Returns a {@link Locale#US} formatted {@link String}. */
+    public static String format(String format, Object... args) {
+        return String.format(Locale.US, format, args);
+    }
+
+    public static Charset bomAwareCharset(BufferedSource source, Charset charset) throws IOException {
+        if (source.rangeEquals(0, UTF_8_BOM)) {
+            source.skip(UTF_8_BOM.size());
+            return UTF_8;
+        }
+        if (source.rangeEquals(0, UTF_16_BE_BOM)) {
+            source.skip(UTF_16_BE_BOM.size());
+            return UTF_16_BE;
+        }
+        if (source.rangeEquals(0, UTF_16_LE_BOM)) {
+            source.skip(UTF_16_LE_BOM.size());
+            return UTF_16_LE;
+        }
+        if (source.rangeEquals(0, UTF_32_BE_BOM)) {
+            source.skip(UTF_32_BE_BOM.size());
+            return UTF_32_BE;
+        }
+        if (source.rangeEquals(0, UTF_32_LE_BOM)) {
+            source.skip(UTF_32_LE_BOM.size());
+            return UTF_32_LE;
+        }
+        return charset;
+    }
+
+    public static int checkDuration(String name, long duration, TimeUnit unit) {
+        if (duration < 0) throw new IllegalArgumentException(name + " < 0");
+        if (unit == null) throw new NullPointerException("unit == null");
+        long millis = unit.toMillis(duration);
+        if (millis > Integer.MAX_VALUE) throw new IllegalArgumentException(name + " too large.");
+        if (millis == 0 && duration > 0) throw new IllegalArgumentException(name + " too small.");
+        return (int) millis;
+    }
+
+    public static AssertionError assertionError(String message, Exception e) {
+        AssertionError assertionError = new AssertionError(message);
+        try {
+            assertionError.initCause(e);
+        } catch (IllegalStateException ise) {
+            // ignored, shouldn't happen
+        }
+        return assertionError;
+    }
+
+    public static int decodeHexDigit(char c) {
+        if (c >= '0' && c <= '9') return c - '0';
+        if (c >= 'a' && c <= 'f') return c - 'a' + 10;
+        if (c >= 'A' && c <= 'F') return c - 'A' + 10;
+        return -1;
+    }
+
+    /** Decodes an IPv6 address like 1111:2222:3333:4444:5555:6666:7777:8888 or ::1. */
+    private static @Nullable InetAddress decodeIpv6(String input, int pos, int limit) {
+        byte[] address = new byte[16];
+        int b = 0;
+        int compress = -1;
+        int groupOffset = -1;
+
+        for (int i = pos; i < limit; ) {
+            if (b == address.length) return null; // Too many groups.
+
+            // Read a delimiter.
+            if (i + 2 <= limit && input.regionMatches(i, "::", 0, 2)) {
+                // Compression "::" delimiter, which is anywhere in the input, including its prefix.
+                if (compress != -1) return null; // Multiple "::" delimiters.
+                i += 2;
+                b += 2;
+                compress = b;
+                if (i == limit) break;
+            } else if (b != 0) {
+                // Group separator ":" delimiter.
+                if (input.regionMatches(i, ":", 0, 1)) {
+                    i++;
+                } else if (input.regionMatches(i, ".", 0, 1)) {
+                    // If we see a '.', rewind to the beginning of the previous group and parse as IPv4.
+                    if (!decodeIpv4Suffix(input, groupOffset, limit, address, b - 2)) return null;
+                    b += 2; // We rewound two bytes and then added four.
+                    break;
+                } else {
+                    return null; // Wrong delimiter.
+                }
+            }
+
+            // Read a group, one to four hex digits.
+            int value = 0;
+            groupOffset = i;
+            for (; i < limit; i++) {
+                char c = input.charAt(i);
+                int hexDigit = decodeHexDigit(c);
+                if (hexDigit == -1) break;
+                value = (value << 4) + hexDigit;
+            }
+            int groupLength = i - groupOffset;
+            if (groupLength == 0 || groupLength > 4) return null; // Group is the wrong size.
+
+            // We've successfully read a group. Assign its value to our byte array.
+            address[b++] = (byte) ((value >>> 8) & 0xff);
+            address[b++] = (byte) (value & 0xff);
+        }
+
+        // All done. If compression happened, we need to move bytes to the right place in the
+        // address. Here's a sample:
+        //
+        //      input: "1111:2222:3333::7777:8888"
+        //     before: { 11, 11, 22, 22, 33, 33, 00, 00, 77, 77, 88, 88, 00, 00, 00, 00  }
+        //   compress: 6
+        //          b: 10
+        //      after: { 11, 11, 22, 22, 33, 33, 00, 00, 00, 00, 00, 00, 77, 77, 88, 88 }
+        //
+        if (b != address.length) {
+            if (compress == -1) return null; // Address didn't have compression or enough groups.
+            System.arraycopy(address, compress, address, address.length - (b - compress), b - compress);
+            Arrays.fill(address, compress, compress + (address.length - b), (byte) 0);
+        }
+
+        try {
+            return InetAddress.getByAddress(address);
+        } catch (UnknownHostException e) {
+            throw new AssertionError();
+        }
+    }
+
+    /** Decodes an IPv4 address suffix of an IPv6 address, like 1111::5555:6666:192.168.0.1. */
+    private static boolean decodeIpv4Suffix(String input, int pos, int limit, byte[] address, int addressOffset) {
+        int b = addressOffset;
+
+        for (int i = pos; i < limit; ) {
+            if (b == address.length) return false; // Too many groups.
+
+            // Read a delimiter.
+            if (b != addressOffset) {
+                if (input.charAt(i) != '.') return false; // Wrong delimiter.
+                i++;
+            }
+
+            // Read 1 or more decimal digits for a value in 0..255.
+            int value = 0;
+            int groupOffset = i;
+            for (; i < limit; i++) {
+                char c = input.charAt(i);
+                if (c < '0' || c > '9') break;
+                if (value == 0 && groupOffset != i) return false; // Reject unnecessary leading '0's.
+                value = (value * 10) + c - '0';
+                if (value > 255) return false; // Value out of range.
+            }
+            int groupLength = i - groupOffset;
+            if (groupLength == 0) return false; // No digits.
+
+            // We've successfully read a byte.
+            address[b++] = (byte) value;
+        }
+
+        if (b != addressOffset + 4) return false; // Too few groups. We wanted exactly four.
+        return true; // Success.
+    }
+
+    /** Encodes an IPv6 address in canonical form according to RFC 5952. */
+    private static String inet6AddressToAscii(byte[] address) {
+        // Go through the address looking for the longest run of 0s. Each group is 2-bytes.
+        // A run must be longer than one group (section 4.2.2).
+        // If there are multiple equal runs, the first one must be used (section 4.2.3).
+        int longestRunOffset = -1;
+        int longestRunLength = 0;
+        for (int i = 0; i < address.length; i += 2) {
+            int currentRunOffset = i;
+            while (i < 16 && address[i] == 0 && address[i + 1] == 0) {
+                i += 2;
+            }
+            int currentRunLength = i - currentRunOffset;
+            if (currentRunLength > longestRunLength && currentRunLength >= 4) {
+                longestRunOffset = currentRunOffset;
+                longestRunLength = currentRunLength;
+            }
+        }
+
+        // Emit each 2-byte group in hex, separated by ':'. The longest run of zeroes is "::".
+        Buffer result = new Buffer();
+        for (int i = 0; i < address.length; ) {
+            if (i == longestRunOffset) {
+                result.writeByte(':');
+                i += longestRunLength;
+                if (i == 16) result.writeByte(':');
+            } else {
+                if (i > 0) result.writeByte(':');
+                int group = (address[i] & 0xff) << 8 | address[i + 1] & 0xff;
+                result.writeHexadecimalUnsignedLong(group);
+                i += 2;
+            }
+        }
+        return result.readUtf8();
+    }
+
+    public static X509TrustManager platformTrustManager() {
+        try {
+            TrustManagerFactory trustManagerFactory =
+                    TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            trustManagerFactory.init((KeyStore) null);
+            TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
+            if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager)) {
+                throw new IllegalStateException("Unexpected default trust managers:" + Arrays.toString(trustManagers));
+            }
+            return (X509TrustManager) trustManagers[0];
+        } catch (GeneralSecurityException e) {
+            throw assertionError("No System TLS", e); // The system has no TLS. Just give up.
+        }
+    }
+
+    public static Headers toHeaders(List<Header> headerBlock) {
+        Headers.Builder builder = new Headers.Builder();
+        for (Header header : headerBlock) {
+            Internal.instance.addLenient(builder, header.name.utf8(), header.value.utf8());
+        }
+        return builder.build();
+    }
 }
diff --git a/communication/src/main/java/okhttp3/internal/platform/PatchPlatform.java b/communication/src/main/java/okhttp3/internal/platform/PatchPlatform.java
index dc9f9c2d4b6..792a4b51894 100644
--- a/communication/src/main/java/okhttp3/internal/platform/PatchPlatform.java
+++ b/communication/src/main/java/okhttp3/internal/platform/PatchPlatform.java
@@ -78,255 +78,251 @@
  * <p>Supported on Android 6.0+ via {@code NetworkSecurityPolicy}.
  */
 public class PatchPlatform {
-  private static final Platform PLATFORM = findPlatform();
-  public static final int INFO = 4;
-  public static final int WARN = 5;
-  private static final Logger logger = Logger.getLogger(OkHttpClient.class.getName());
-
-  public static Platform get() {
-    return PLATFORM;
-  }
-
-  /** Prefix used on custom headers. */
-  public String getPrefix() {
-    return "OkHttp";
-  }
-
-  @SuppressForbidden // allow this use of Class.forName()
-  protected @Nullable X509TrustManager trustManager(SSLSocketFactory sslSocketFactory) {
-    // Attempt to get the trust manager from an OpenJDK socket factory. We attempt this on all
-    // platforms in order to support Robolectric, which mixes classes from both Android and the
-    // Oracle JDK. Note that we don't support HTTP/2 or other nice features on Robolectric.
-    try {
-      Class<?> sslContextClass = Class.forName("sun.security.ssl.SSLContextImpl");
-      Object context = readFieldOrNull(sslSocketFactory, sslContextClass, "context");
-      if (context == null) return null;
-      return readFieldOrNull(context, X509TrustManager.class, "trustManager");
-    } catch (ClassNotFoundException e) {
-      return null;
+    private static final Platform PLATFORM = findPlatform();
+    public static final int INFO = 4;
+    public static final int WARN = 5;
+    private static final Logger logger = Logger.getLogger(OkHttpClient.class.getName());
+
+    public static Platform get() {
+        return PLATFORM;
+    }
+
+    /** Prefix used on custom headers. */
+    public String getPrefix() {
+        return "OkHttp";
+    }
+
+    @SuppressForbidden // allow this use of Class.forName()
+    protected @Nullable X509TrustManager trustManager(SSLSocketFactory sslSocketFactory) {
+        // Attempt to get the trust manager from an OpenJDK socket factory. We attempt this on all
+        // platforms in order to support Robolectric, which mixes classes from both Android and the
+        // Oracle JDK. Note that we don't support HTTP/2 or other nice features on Robolectric.
+        try {
+            Class<?> sslContextClass = Class.forName("sun.security.ssl.SSLContextImpl");
+            Object context = readFieldOrNull(sslSocketFactory, sslContextClass, "context");
+            if (context == null) return null;
+            return readFieldOrNull(context, X509TrustManager.class, "trustManager");
+        } catch (ClassNotFoundException e) {
+            return null;
+        }
     }
-  }
-
-  /**
-   * Configure TLS extensions on {@code sslSocket} for {@code route}.
-   *
-   * @param hostname non-null for client-side handshakes; null for server-side handshakes.
-   */
-  public void configureTlsExtensions(
-      SSLSocket sslSocket, @Nullable String hostname, List<Protocol> protocols)
-      throws IOException {}
-
-  /**
-   * Called after the TLS handshake to release resources allocated by {@link
-   * #configureTlsExtensions}.
-   */
-  public void afterHandshake(SSLSocket sslSocket) {}
-
-  /** Returns the negotiated protocol, or null if no protocol was negotiated. */
-  public @Nullable String getSelectedProtocol(SSLSocket socket) {
-    return null;
-  }
-
-  public void connectSocket(Socket socket, InetSocketAddress address, int connectTimeout)
-      throws IOException {
-    socket.connect(address, connectTimeout);
-  }
-
-  public void log(int level, String message, @Nullable Throwable t) {
-    Level logLevel = level == WARN ? Level.WARNING : Level.INFO;
-    logger.log(logLevel, message, t);
-  }
-
-  public boolean isCleartextTrafficPermitted(String hostname) {
-    return true;
-  }
-
-  /**
-   * Returns an object that holds a stack trace created at the moment this method is executed. This
-   * should be used specifically for {@link java.io.Closeable} objects and in conjunction with
-   * {@link #logCloseableLeak(String, Object)}.
-   */
-  public Object getStackTraceForCloseable(String closer) {
-    if (logger.isLoggable(Level.FINE)) {
-      return new Throwable(closer); // These are expensive to allocate.
+
+    /**
+     * Configure TLS extensions on {@code sslSocket} for {@code route}.
+     *
+     * @param hostname non-null for client-side handshakes; null for server-side handshakes.
+     */
+    public void configureTlsExtensions(SSLSocket sslSocket, @Nullable String hostname, List<Protocol> protocols)
+            throws IOException {}
+
+    /**
+     * Called after the TLS handshake to release resources allocated by {@link
+     * #configureTlsExtensions}.
+     */
+    public void afterHandshake(SSLSocket sslSocket) {}
+
+    /** Returns the negotiated protocol, or null if no protocol was negotiated. */
+    public @Nullable String getSelectedProtocol(SSLSocket socket) {
+        return null;
     }
-    return null;
-  }
-
-  public void logCloseableLeak(String message, Object stackTrace) {
-    if (stackTrace == null) {
-      message +=
-          " To see where this was allocated, set the OkHttpClient logger level to FINE: "
-              + "Logger.getLogger(OkHttpClient.class.getName()).setLevel(Level.FINE);";
+
+    public void connectSocket(Socket socket, InetSocketAddress address, int connectTimeout) throws IOException {
+        socket.connect(address, connectTimeout);
     }
-    log(WARN, message, (Throwable) stackTrace);
-  }
-
-  public static List<String> alpnProtocolNames(List<Protocol> protocols) {
-    List<String> names = new ArrayList<>(protocols.size());
-    for (int i = 0, size = protocols.size(); i < size; i++) {
-      Protocol protocol = protocols.get(i);
-      if (protocol == Protocol.HTTP_1_0) continue; // No HTTP/1.0 for ALPN.
-      names.add(protocol.toString());
+
+    public void log(int level, String message, @Nullable Throwable t) {
+        Level logLevel = level == WARN ? Level.WARNING : Level.INFO;
+        logger.log(logLevel, message, t);
     }
-    return names;
-  }
-
-  public CertificateChainCleaner buildCertificateChainCleaner(X509TrustManager trustManager) {
-    return new BasicCertificateChainCleaner(buildTrustRootIndex(trustManager));
-  }
-
-  public CertificateChainCleaner buildCertificateChainCleaner(SSLSocketFactory sslSocketFactory) {
-    X509TrustManager trustManager = trustManager(sslSocketFactory);
-
-    if (trustManager == null) {
-      throw new IllegalStateException(
-          "Unable to extract the trust manager on "
-              + Platform.get()
-              + ", sslSocketFactory is "
-              + sslSocketFactory.getClass());
+
+    public boolean isCleartextTrafficPermitted(String hostname) {
+        return true;
+    }
+
+    /**
+     * Returns an object that holds a stack trace created at the moment this method is executed. This
+     * should be used specifically for {@link java.io.Closeable} objects and in conjunction with
+     * {@link #logCloseableLeak(String, Object)}.
+     */
+    public Object getStackTraceForCloseable(String closer) {
+        if (logger.isLoggable(Level.FINE)) {
+            return new Throwable(closer); // These are expensive to allocate.
+        }
+        return null;
+    }
+
+    public void logCloseableLeak(String message, Object stackTrace) {
+        if (stackTrace == null) {
+            message += " To see where this was allocated, set the OkHttpClient logger level to FINE: "
+                    + "Logger.getLogger(OkHttpClient.class.getName()).setLevel(Level.FINE);";
+        }
+        log(WARN, message, (Throwable) stackTrace);
+    }
+
+    public static List<String> alpnProtocolNames(List<Protocol> protocols) {
+        List<String> names = new ArrayList<>(protocols.size());
+        for (int i = 0, size = protocols.size(); i < size; i++) {
+            Protocol protocol = protocols.get(i);
+            if (protocol == Protocol.HTTP_1_0) continue; // No HTTP/1.0 for ALPN.
+            names.add(protocol.toString());
+        }
+        return names;
     }
 
-    return buildCertificateChainCleaner(trustManager);
-  }
-
-  /* Avoid eager call to Security.getProviders()
-  ----------------------------------------------
-  | public static boolean isConscryptPreferred() {
-  |   // mainly to allow tests to run cleanly
-  |   if ("conscrypt".equals(System.getProperty("okhttp.platform"))) {
-  |     return true;
-  |   }
-  |
-  |   // check if Provider manually installed
-  |   String preferredProvider = Security.getProviders()[0].getName();
-  |   return "Conscrypt".equals(preferredProvider);
-  | }
-  ---------------------------------------------- */
-
-  /** Attempt to match the host runtime to a capable Platform implementation. */
-  private static Platform findPlatform() {
-    if (isAndroid()) {
-      return findAndroidPlatform();
-    } else {
-      return findJvmPlatform();
+    public CertificateChainCleaner buildCertificateChainCleaner(X509TrustManager trustManager) {
+        return new BasicCertificateChainCleaner(buildTrustRootIndex(trustManager));
     }
-  }
 
-  public static boolean isAndroid() {
-    // This explicit check avoids activating in Android Studio with Android specific classes
-    // available when running plugins inside the IDE.
-    return "Dalvik".equals(System.getProperty("java.vm.name"));
-  }
+    public CertificateChainCleaner buildCertificateChainCleaner(SSLSocketFactory sslSocketFactory) {
+        X509TrustManager trustManager = trustManager(sslSocketFactory);
+
+        if (trustManager == null) {
+            throw new IllegalStateException("Unable to extract the trust manager on "
+                    + Platform.get()
+                    + ", sslSocketFactory is "
+                    + sslSocketFactory.getClass());
+        }
+
+        return buildCertificateChainCleaner(trustManager);
+    }
 
-  private static Platform findJvmPlatform() {
     /* Avoid eager call to Security.getProviders()
     ----------------------------------------------
-    | if (isConscryptPreferred()) {
-    |   Platform conscrypt = ConscryptPlatform.buildIfSupported();
-    |
-    |   if (conscrypt != null) {
-    |     return conscrypt;
+    | public static boolean isConscryptPreferred() {
+    |   // mainly to allow tests to run cleanly
+    |   if ("conscrypt".equals(System.getProperty("okhttp.platform"))) {
+    |     return true;
     |   }
+    |
+    |   // check if Provider manually installed
+    |   String preferredProvider = Security.getProviders()[0].getName();
+    |   return "Conscrypt".equals(preferredProvider);
     | }
     ---------------------------------------------- */
 
-    Platform jdk9 = Jdk9Platform.buildIfSupported();
+    /** Attempt to match the host runtime to a capable Platform implementation. */
+    private static Platform findPlatform() {
+        if (isAndroid()) {
+            return findAndroidPlatform();
+        } else {
+            return findJvmPlatform();
+        }
+    }
 
-    if (jdk9 != null) {
-      return jdk9;
+    public static boolean isAndroid() {
+        // This explicit check avoids activating in Android Studio with Android specific classes
+        // available when running plugins inside the IDE.
+        return "Dalvik".equals(System.getProperty("java.vm.name"));
     }
 
-    Platform jdkWithJettyBoot = JdkWithJettyBootPlatform.buildIfSupported();
+    private static Platform findJvmPlatform() {
+        /* Avoid eager call to Security.getProviders()
+        ----------------------------------------------
+        | if (isConscryptPreferred()) {
+        |   Platform conscrypt = ConscryptPlatform.buildIfSupported();
+        |
+        |   if (conscrypt != null) {
+        |     return conscrypt;
+        |   }
+        | }
+        ---------------------------------------------- */
 
-    if (jdkWithJettyBoot != null) {
-      return jdkWithJettyBoot;
-    }
+        Platform jdk9 = Jdk9Platform.buildIfSupported();
 
-    // Probably an Oracle JDK like OpenJDK.
-    return new Platform();
-  }
+        if (jdk9 != null) {
+            return jdk9;
+        }
 
-  private static Platform findAndroidPlatform() {
-    Platform android10 = Android10Platform.buildIfSupported();
+        Platform jdkWithJettyBoot = JdkWithJettyBootPlatform.buildIfSupported();
 
-    if (android10 != null) {
-      return android10;
+        if (jdkWithJettyBoot != null) {
+            return jdkWithJettyBoot;
+        }
+
+        // Probably an Oracle JDK like OpenJDK.
+        return new Platform();
     }
 
-    Platform android = AndroidPlatform.buildIfSupported();
+    private static Platform findAndroidPlatform() {
+        Platform android10 = Android10Platform.buildIfSupported();
 
-    if (android == null) {
-      throw new NullPointerException("No platform found on Android");
-    }
+        if (android10 != null) {
+            return android10;
+        }
 
-    return android;
-  }
-
-  /**
-   * Returns the concatenation of 8-bit, length prefixed protocol names.
-   * http://tools.ietf.org/html/draft-agl-tls-nextprotoneg-04#page-4
-   */
-  static byte[] concatLengthPrefixed(List<Protocol> protocols) {
-    Buffer result = new Buffer();
-    for (int i = 0, size = protocols.size(); i < size; i++) {
-      Protocol protocol = protocols.get(i);
-      if (protocol == Protocol.HTTP_1_0) continue; // No HTTP/1.0 for ALPN.
-      result.writeByte(protocol.toString().length());
-      result.writeUtf8(protocol.toString());
-    }
-    return result.readByteArray();
-  }
-
-  static @Nullable <T> T readFieldOrNull(Object instance, Class<T> fieldType, String fieldName) {
-    for (Class<?> c = instance.getClass(); c != Object.class; c = c.getSuperclass()) {
-      try {
-        Field field = c.getDeclaredField(fieldName);
-        field.setAccessible(true);
-        Object value = field.get(instance);
-        if (value == null || !fieldType.isInstance(value)) return null;
-        return fieldType.cast(value);
-      } catch (NoSuchFieldException ignored) {
-      } catch (IllegalAccessException e) {
-        throw new AssertionError();
-      }
+        Platform android = AndroidPlatform.buildIfSupported();
+
+        if (android == null) {
+            throw new NullPointerException("No platform found on Android");
+        }
+
+        return android;
     }
 
-    // Didn't find the field we wanted. As a last gasp attempt, try to find the value on a delegate.
-    if (!fieldName.equals("delegate")) {
-      Object delegate = readFieldOrNull(instance, Object.class, "delegate");
-      if (delegate != null) return readFieldOrNull(delegate, fieldType, fieldName);
+    /**
+     * Returns the concatenation of 8-bit, length prefixed protocol names.
+     * http://tools.ietf.org/html/draft-agl-tls-nextprotoneg-04#page-4
+     */
+    static byte[] concatLengthPrefixed(List<Protocol> protocols) {
+        Buffer result = new Buffer();
+        for (int i = 0, size = protocols.size(); i < size; i++) {
+            Protocol protocol = protocols.get(i);
+            if (protocol == Protocol.HTTP_1_0) continue; // No HTTP/1.0 for ALPN.
+            result.writeByte(protocol.toString().length());
+            result.writeUtf8(protocol.toString());
+        }
+        return result.readByteArray();
     }
 
-    return null;
-  }
-
-  public SSLContext getSSLContext() {
-    String jvmVersion = System.getProperty("java.specification.version");
-    if ("1.7".equals(jvmVersion)) {
-      try {
-        // JDK 1.7 (public version) only support > TLSv1 with named protocols
-        return SSLContext.getInstance("TLSv1.2");
-      } catch (NoSuchAlgorithmException e) {
-        // fallback to TLS
-      }
+    static @Nullable <T> T readFieldOrNull(Object instance, Class<T> fieldType, String fieldName) {
+        for (Class<?> c = instance.getClass(); c != Object.class; c = c.getSuperclass()) {
+            try {
+                Field field = c.getDeclaredField(fieldName);
+                field.setAccessible(true);
+                Object value = field.get(instance);
+                if (value == null || !fieldType.isInstance(value)) return null;
+                return fieldType.cast(value);
+            } catch (NoSuchFieldException ignored) {
+            } catch (IllegalAccessException e) {
+                throw new AssertionError();
+            }
+        }
+
+        // Didn't find the field we wanted. As a last gasp attempt, try to find the value on a delegate.
+        if (!fieldName.equals("delegate")) {
+            Object delegate = readFieldOrNull(instance, Object.class, "delegate");
+            if (delegate != null) return readFieldOrNull(delegate, fieldType, fieldName);
+        }
+
+        return null;
     }
 
-    try {
-      return SSLContext.getInstance("TLS");
-    } catch (NoSuchAlgorithmException e) {
-      throw new IllegalStateException("No TLS provider", e);
+    public SSLContext getSSLContext() {
+        String jvmVersion = System.getProperty("java.specification.version");
+        if ("1.7".equals(jvmVersion)) {
+            try {
+                // JDK 1.7 (public version) only support > TLSv1 with named protocols
+                return SSLContext.getInstance("TLSv1.2");
+            } catch (NoSuchAlgorithmException e) {
+                // fallback to TLS
+            }
+        }
+
+        try {
+            return SSLContext.getInstance("TLS");
+        } catch (NoSuchAlgorithmException e) {
+            throw new IllegalStateException("No TLS provider", e);
+        }
     }
-  }
 
-  public TrustRootIndex buildTrustRootIndex(X509TrustManager trustManager) {
-    return new BasicTrustRootIndex(trustManager.getAcceptedIssuers());
-  }
+    public TrustRootIndex buildTrustRootIndex(X509TrustManager trustManager) {
+        return new BasicTrustRootIndex(trustManager.getAcceptedIssuers());
+    }
 
-  public void configureSslSocketFactory(SSLSocketFactory socketFactory) {}
+    public void configureSslSocketFactory(SSLSocketFactory socketFactory) {}
 
-  @Override
-  public String toString() {
-    return getClass().getSimpleName();
-  }
+    @Override
+    public String toString() {
+        return getClass().getSimpleName();
+    }
 }
diff --git a/communication/src/test/groovy/datadog/communication/serialization/FlushingBufferTest.java b/communication/src/test/groovy/datadog/communication/serialization/FlushingBufferTest.java
index 708a5cb8514..b0b95f1e249 100644
--- a/communication/src/test/groovy/datadog/communication/serialization/FlushingBufferTest.java
+++ b/communication/src/test/groovy/datadog/communication/serialization/FlushingBufferTest.java
@@ -6,49 +6,49 @@
 
 public class FlushingBufferTest {
 
-  @Test
-  public void testBufferCapacity() {
-    assertEquals(5, new FlushingBuffer(5, (messageCount, buffer) -> {}).capacity());
-  }
-
-  @Test
-  public void testMessageCount() {
-    FlushingBuffer fb = new FlushingBuffer(10, (messageCount, buffer) -> {});
-
-    // initial counter
-    assertEquals(0, fb.getMessageCount());
-
-    fb.mark();
-    fb.mark();
-
-    // counter doesn't change if no data pushed into the buffer
-    assertEquals(0, fb.getMessageCount());
-
-    fb.put((byte) 1);
-    // still zero because the message counter increases on mark
-    assertEquals(0, fb.getMessageCount());
-
-    fb.mark();
-    // expect increased message counter
-    assertEquals(1, fb.getMessageCount());
-
-    fb.mark();
-    fb.mark();
-    // no change to the counter expected for consecutive mark calls
-
-    fb.putChar('a');
-    fb.putChar('b');
-    fb.putChar('c');
-    // no change to the message counter expected before mark call
-    assertEquals(1, fb.getMessageCount());
-
-    fb.mark();
-    // expect increased message counter
-    assertEquals(2, fb.getMessageCount());
-
-    fb.mark();
-    fb.mark();
-    // no change to the counter expected for consecutive mark calls
-    assertEquals(2, fb.getMessageCount());
-  }
+    @Test
+    public void testBufferCapacity() {
+        assertEquals(5, new FlushingBuffer(5, (messageCount, buffer) -> {}).capacity());
+    }
+
+    @Test
+    public void testMessageCount() {
+        FlushingBuffer fb = new FlushingBuffer(10, (messageCount, buffer) -> {});
+
+        // initial counter
+        assertEquals(0, fb.getMessageCount());
+
+        fb.mark();
+        fb.mark();
+
+        // counter doesn't change if no data pushed into the buffer
+        assertEquals(0, fb.getMessageCount());
+
+        fb.put((byte) 1);
+        // still zero because the message counter increases on mark
+        assertEquals(0, fb.getMessageCount());
+
+        fb.mark();
+        // expect increased message counter
+        assertEquals(1, fb.getMessageCount());
+
+        fb.mark();
+        fb.mark();
+        // no change to the counter expected for consecutive mark calls
+
+        fb.putChar('a');
+        fb.putChar('b');
+        fb.putChar('c');
+        // no change to the message counter expected before mark call
+        assertEquals(1, fb.getMessageCount());
+
+        fb.mark();
+        // expect increased message counter
+        assertEquals(2, fb.getMessageCount());
+
+        fb.mark();
+        fb.mark();
+        // no change to the counter expected for consecutive mark calls
+        assertEquals(2, fb.getMessageCount());
+    }
 }
diff --git a/communication/src/test/java/datadog/communication/BackendApiFactoryTest.java b/communication/src/test/java/datadog/communication/BackendApiFactoryTest.java
index 44690ef1c3f..e651ca50368 100644
--- a/communication/src/test/java/datadog/communication/BackendApiFactoryTest.java
+++ b/communication/src/test/java/datadog/communication/BackendApiFactoryTest.java
@@ -30,207 +30,194 @@
 
 class BackendApiFactoryTest {
 
-  private static final MediaType JSON = MediaType.parse("application/json");
-
-  @ParameterizedTest
-  @ValueSource(strings = {"datadoghq.com", "custom.example", "DATADOGHQ.EU"})
-  void eventPlatformDirectIntakeUsesExactHttpsHost(String site) {
-    final HttpUrl url = BackendApiFactory.buildEventPlatformIntakeUrl(site);
-
-    assertEquals("https", url.scheme());
-    assertEquals("event-platform-intake." + site.toLowerCase(Locale.ROOT), url.host());
-    assertEquals(443, url.port());
-    assertEquals("/api/v2/", url.encodedPath());
-    assertEquals("", url.username());
-    assertEquals("", url.password());
-    assertNull(url.encodedQuery());
-    assertNull(url.encodedFragment());
-  }
-
-  @ParameterizedTest
-  @NullAndEmptySource
-  @ValueSource(
-      strings = {
-        "datadoghq.com@evil.example",
-        "datadoghq.com:password@evil.example",
-        "https://datadoghq.com",
-        "datadoghq.com:443",
-        "datadoghq.com:8443",
-        "datadoghq.com/path",
-        "datadoghq.com?query=value",
-        "datadoghq.com#fragment",
-        "dätadoghq.com",
-        "data doghq.com",
-        " datadoghq.com",
-        "datadoghq.com ",
-        "datadoghq.com\\evil.example"
-      })
-  void eventPlatformDirectIntakeRejectsUnsafeSite(String site) {
-    assertThrows(
-        IllegalArgumentException.class, () -> BackendApiFactory.buildEventPlatformIntakeUrl(site));
-  }
-
-  @ParameterizedTest
-  @ValueSource(ints = {301, 302, 307, 308})
-  void featureFlagDirectIntakeDoesNotFollowRedirects(final int statusCode) throws Exception {
-    final MockWebServer intake = new MockWebServer();
-    final MockWebServer redirectTarget = new MockWebServer();
-    final OkHttpClient sharedClient = new OkHttpClient.Builder().build();
-    final OkHttpClient directClient = BackendApiFactory.directIntakeHttpClient(sharedClient, false);
-    redirectTarget.start();
-    intake.enqueue(
-        new MockResponse()
-            .setResponseCode(statusCode)
-            .setHeader("Location", redirectTarget.url("/redirected")));
-    intake.start();
-    try {
-      final IntakeApi api =
-          new IntakeApi(
-              intake.url("/api/v2/"),
-              "api-key",
-              "123",
-              HttpRetryPolicy.Factory.NEVER_RETRY,
-              directClient,
-              false);
-
-      assertThrows(
-          IOException.class,
-          () ->
-              api.post(
-                  "flagevaluation",
-                  RequestBody.create(JSON, "{}".getBytes(StandardCharsets.UTF_8)),
-                  stream -> null,
-                  null,
-                  false));
-
-      final RecordedRequest request = intake.takeRequest();
-      assertEquals("api-key", request.getHeader("DD-API-KEY"));
-      assertEquals(1, intake.getRequestCount());
-      assertEquals(0, redirectTarget.getRequestCount());
-    } finally {
-      directClient.dispatcher().executorService().shutdownNow();
-      directClient.connectionPool().evictAll();
-      sharedClient.dispatcher().executorService().shutdownNow();
-      sharedClient.connectionPool().evictAll();
-      intake.shutdown();
-      redirectTarget.shutdown();
+    private static final MediaType JSON = MediaType.parse("application/json");
+
+    @ParameterizedTest
+    @ValueSource(strings = {"datadoghq.com", "custom.example", "DATADOGHQ.EU"})
+    void eventPlatformDirectIntakeUsesExactHttpsHost(String site) {
+        final HttpUrl url = BackendApiFactory.buildEventPlatformIntakeUrl(site);
+
+        assertEquals("https", url.scheme());
+        assertEquals("event-platform-intake." + site.toLowerCase(Locale.ROOT), url.host());
+        assertEquals(443, url.port());
+        assertEquals("/api/v2/", url.encodedPath());
+        assertEquals("", url.username());
+        assertEquals("", url.password());
+        assertNull(url.encodedQuery());
+        assertNull(url.encodedFragment());
     }
-  }
-
-  @Test
-  void noBackendApiWhenAgentDoesNotAdvertiseEvpProxy() {
-    final FakeFeaturesDiscovery discovery = new FakeFeaturesDiscovery(null);
-    final BackendApiFactory factory =
-        new BackendApiFactory(Config.get(), sharedCommunicationObjects(discovery, null));
-
-    assertNull(factory.createBackendApi(Intake.EVENT_PLATFORM, false));
-  }
-
-  @Test
-  void advertisedEvpProxyEndpointSupportsDisabledResponseCompression() throws Exception {
-    final MockWebServer agent = new MockWebServer();
-    agent.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
-    agent.start();
-    try {
-      final FakeFeaturesDiscovery discovery = new FakeFeaturesDiscovery(V4_EVP_PROXY_ENDPOINT);
-      final BackendApiFactory factory =
-          new BackendApiFactory(
-              Config.get(), sharedCommunicationObjects(discovery, agent.url("/")));
-      final BackendApi api = factory.createBackendApi(Intake.EVENT_PLATFORM, false);
-
-      assertNotNull(api);
-      api.post(
-          "flagevaluation",
-          RequestBody.create(JSON, "{}".getBytes(StandardCharsets.UTF_8)),
-          stream -> null,
-          null,
-          false);
-
-      final RecordedRequest request = agent.takeRequest();
-      assertEquals("/evp_proxy/v4/api/v2/flagevaluation", request.getPath());
-    } finally {
-      agent.shutdown();
+
+    @ParameterizedTest
+    @NullAndEmptySource
+    @ValueSource(
+            strings = {
+                "datadoghq.com@evil.example",
+                "datadoghq.com:password@evil.example",
+                "https://datadoghq.com",
+                "datadoghq.com:443",
+                "datadoghq.com:8443",
+                "datadoghq.com/path",
+                "datadoghq.com?query=value",
+                "datadoghq.com#fragment",
+                "dätadoghq.com",
+                "data doghq.com",
+                " datadoghq.com",
+                "datadoghq.com ",
+                "datadoghq.com\\evil.example"
+            })
+    void eventPlatformDirectIntakeRejectsUnsafeSite(String site) {
+        assertThrows(IllegalArgumentException.class, () -> BackendApiFactory.buildEventPlatformIntakeUrl(site));
     }
-  }
-
-  @Test
-  void explicitNoRetryProxyPolicyDoesNotReplayAmbiguousFailure() throws Exception {
-    final MockWebServer agent = new MockWebServer();
-    agent.enqueue(new MockResponse().setResponseCode(500).setBody("ambiguous"));
-    agent.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
-    agent.start();
-    try {
-      final FakeFeaturesDiscovery discovery = new FakeFeaturesDiscovery(V4_EVP_PROXY_ENDPOINT);
-      final BackendApiFactory factory =
-          new BackendApiFactory(
-              Config.get(), sharedCommunicationObjects(discovery, agent.url("/")));
-      final BackendApi api =
-          factory.createEvpProxyApi(
-              Intake.EVENT_PLATFORM, false, HttpRetryPolicy.Factory.NEVER_RETRY);
-
-      assertNotNull(api);
-      assertThrows(
-          HttpResponseException.class,
-          () ->
-              api.post(
-                  "flagevaluation",
-                  RequestBody.create(JSON, "{}".getBytes(StandardCharsets.UTF_8)),
-                  stream -> null,
-                  null,
-                  false));
-
-      assertEquals(1, agent.getRequestCount());
-    } finally {
-      agent.shutdown();
+
+    @ParameterizedTest
+    @ValueSource(ints = {301, 302, 307, 308})
+    void featureFlagDirectIntakeDoesNotFollowRedirects(final int statusCode) throws Exception {
+        final MockWebServer intake = new MockWebServer();
+        final MockWebServer redirectTarget = new MockWebServer();
+        final OkHttpClient sharedClient = new OkHttpClient.Builder().build();
+        final OkHttpClient directClient = BackendApiFactory.directIntakeHttpClient(sharedClient, false);
+        redirectTarget.start();
+        intake.enqueue(new MockResponse()
+                .setResponseCode(statusCode)
+                .setHeader("Location", redirectTarget.url("/redirected")));
+        intake.start();
+        try {
+            final IntakeApi api = new IntakeApi(
+                    intake.url("/api/v2/"), "api-key", "123", HttpRetryPolicy.Factory.NEVER_RETRY, directClient, false);
+
+            assertThrows(
+                    IOException.class,
+                    () -> api.post(
+                            "flagevaluation",
+                            RequestBody.create(JSON, "{}".getBytes(StandardCharsets.UTF_8)),
+                            stream -> null,
+                            null,
+                            false));
+
+            final RecordedRequest request = intake.takeRequest();
+            assertEquals("api-key", request.getHeader("DD-API-KEY"));
+            assertEquals(1, intake.getRequestCount());
+            assertEquals(0, redirectTarget.getRequestCount());
+        } finally {
+            directClient.dispatcher().executorService().shutdownNow();
+            directClient.connectionPool().evictAll();
+            sharedClient.dispatcher().executorService().shutdownNow();
+            sharedClient.connectionPool().evictAll();
+            intake.shutdown();
+            redirectTarget.shutdown();
+        }
     }
-  }
 
-  private static SharedCommunicationObjects sharedCommunicationObjects(
-      final DDAgentFeaturesDiscovery discovery, final HttpUrl agentUrl) {
-    final TestSharedCommunicationObjects sco = new TestSharedCommunicationObjects(discovery);
-    sco.agentUrl = agentUrl != null ? agentUrl : HttpUrl.get("http://localhost:8126/");
-    sco.agentHttpClient = new OkHttpClient();
-    return sco;
-  }
+    @Test
+    void noBackendApiWhenAgentDoesNotAdvertiseEvpProxy() {
+        final FakeFeaturesDiscovery discovery = new FakeFeaturesDiscovery(null);
+        final BackendApiFactory factory =
+                new BackendApiFactory(Config.get(), sharedCommunicationObjects(discovery, null));
 
-  private static final class TestSharedCommunicationObjects extends SharedCommunicationObjects {
-    private final DDAgentFeaturesDiscovery discovery;
+        assertNull(factory.createBackendApi(Intake.EVENT_PLATFORM, false));
+    }
 
-    private TestSharedCommunicationObjects(final DDAgentFeaturesDiscovery discovery) {
-      this.discovery = discovery;
+    @Test
+    void advertisedEvpProxyEndpointSupportsDisabledResponseCompression() throws Exception {
+        final MockWebServer agent = new MockWebServer();
+        agent.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
+        agent.start();
+        try {
+            final FakeFeaturesDiscovery discovery = new FakeFeaturesDiscovery(V4_EVP_PROXY_ENDPOINT);
+            final BackendApiFactory factory =
+                    new BackendApiFactory(Config.get(), sharedCommunicationObjects(discovery, agent.url("/")));
+            final BackendApi api = factory.createBackendApi(Intake.EVENT_PLATFORM, false);
+
+            assertNotNull(api);
+            api.post(
+                    "flagevaluation",
+                    RequestBody.create(JSON, "{}".getBytes(StandardCharsets.UTF_8)),
+                    stream -> null,
+                    null,
+                    false);
+
+            final RecordedRequest request = agent.takeRequest();
+            assertEquals("/evp_proxy/v4/api/v2/flagevaluation", request.getPath());
+        } finally {
+            agent.shutdown();
+        }
     }
 
-    @Override
-    public DDAgentFeaturesDiscovery featuresDiscovery(final Config config) {
-      return discovery;
+    @Test
+    void explicitNoRetryProxyPolicyDoesNotReplayAmbiguousFailure() throws Exception {
+        final MockWebServer agent = new MockWebServer();
+        agent.enqueue(new MockResponse().setResponseCode(500).setBody("ambiguous"));
+        agent.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
+        agent.start();
+        try {
+            final FakeFeaturesDiscovery discovery = new FakeFeaturesDiscovery(V4_EVP_PROXY_ENDPOINT);
+            final BackendApiFactory factory =
+                    new BackendApiFactory(Config.get(), sharedCommunicationObjects(discovery, agent.url("/")));
+            final BackendApi api =
+                    factory.createEvpProxyApi(Intake.EVENT_PLATFORM, false, HttpRetryPolicy.Factory.NEVER_RETRY);
+
+            assertNotNull(api);
+            assertThrows(
+                    HttpResponseException.class,
+                    () -> api.post(
+                            "flagevaluation",
+                            RequestBody.create(JSON, "{}".getBytes(StandardCharsets.UTF_8)),
+                            stream -> null,
+                            null,
+                            false));
+
+            assertEquals(1, agent.getRequestCount());
+        } finally {
+            agent.shutdown();
+        }
     }
-  }
-
-  private static final class FakeFeaturesDiscovery extends DDAgentFeaturesDiscovery {
-    private final String evpProxyEndpoint;
-
-    private FakeFeaturesDiscovery(final String evpProxyEndpoint) {
-      super(
-          new OkHttpClient(),
-          Monitoring.DISABLED,
-          HttpUrl.get("http://localhost:8126/"),
-          ProtocolVersion.V0_5,
-          true,
-          false);
-      this.evpProxyEndpoint = evpProxyEndpoint;
+
+    private static SharedCommunicationObjects sharedCommunicationObjects(
+            final DDAgentFeaturesDiscovery discovery, final HttpUrl agentUrl) {
+        final TestSharedCommunicationObjects sco = new TestSharedCommunicationObjects(discovery);
+        sco.agentUrl = agentUrl != null ? agentUrl : HttpUrl.get("http://localhost:8126/");
+        sco.agentHttpClient = new OkHttpClient();
+        return sco;
     }
 
-    @Override
-    public void discoverIfOutdated() {}
+    private static final class TestSharedCommunicationObjects extends SharedCommunicationObjects {
+        private final DDAgentFeaturesDiscovery discovery;
+
+        private TestSharedCommunicationObjects(final DDAgentFeaturesDiscovery discovery) {
+            this.discovery = discovery;
+        }
 
-    @Override
-    public String getEvpProxyEndpoint() {
-      return evpProxyEndpoint;
+        @Override
+        public DDAgentFeaturesDiscovery featuresDiscovery(final Config config) {
+            return discovery;
+        }
     }
 
-    @Override
-    public boolean supportsEvpProxy() {
-      return evpProxyEndpoint != null;
+    private static final class FakeFeaturesDiscovery extends DDAgentFeaturesDiscovery {
+        private final String evpProxyEndpoint;
+
+        private FakeFeaturesDiscovery(final String evpProxyEndpoint) {
+            super(
+                    new OkHttpClient(),
+                    Monitoring.DISABLED,
+                    HttpUrl.get("http://localhost:8126/"),
+                    ProtocolVersion.V0_5,
+                    true,
+                    false);
+            this.evpProxyEndpoint = evpProxyEndpoint;
+        }
+
+        @Override
+        public void discoverIfOutdated() {}
+
+        @Override
+        public String getEvpProxyEndpoint() {
+            return evpProxyEndpoint;
+        }
+
+        @Override
+        public boolean supportsEvpProxy() {
+            return evpProxyEndpoint != null;
+        }
     }
-  }
 }
diff --git a/communication/src/test/java/datadog/communication/EvpProxyApiTest.java b/communication/src/test/java/datadog/communication/EvpProxyApiTest.java
index 14c6962bf8e..126661fff20 100644
--- a/communication/src/test/java/datadog/communication/EvpProxyApiTest.java
+++ b/communication/src/test/java/datadog/communication/EvpProxyApiTest.java
@@ -17,49 +17,46 @@
 
 class EvpProxyApiTest {
 
-  private MockWebServer server;
-  private OkHttpClient client;
-
-  @BeforeEach
-  void setUp() throws IOException {
-    server = new MockWebServer();
-    server.start();
-    client = new OkHttpClient.Builder().build();
-  }
-
-  @AfterEach
-  void tearDown() throws IOException {
-    client.dispatcher().executorService().shutdownNow();
-    client.connectionPool().evictAll();
-    server.shutdown();
-  }
-
-  @Test
-  void reportsHttpStatusForRejectedRequest() throws Exception {
-    server.enqueue(new MockResponse().setResponseCode(404).setBody("not found"));
-    final EvpProxyApi api =
-        new EvpProxyApi(
-            "123",
-            server.url("/evp_proxy/v4/"),
-            "event-platform-intake",
-            HttpRetryPolicy.Factory.NEVER_RETRY,
-            client,
-            false);
-
-    final HttpResponseException exception =
-        assertThrows(
-            HttpResponseException.class,
-            () ->
-                api.post(
-                    "exposures",
-                    RequestBody.create(MediaType.parse("application/json"), "{}"),
-                    stream -> null,
-                    null,
-                    false));
-
-    assertEquals(404, exception.getStatusCode());
-    final RecordedRequest request = server.takeRequest();
-    assertEquals("/evp_proxy/v4/api/v2/exposures", request.getPath());
-    assertEquals("event-platform-intake", request.getHeader("X-Datadog-EVP-Subdomain"));
-  }
+    private MockWebServer server;
+    private OkHttpClient client;
+
+    @BeforeEach
+    void setUp() throws IOException {
+        server = new MockWebServer();
+        server.start();
+        client = new OkHttpClient.Builder().build();
+    }
+
+    @AfterEach
+    void tearDown() throws IOException {
+        client.dispatcher().executorService().shutdownNow();
+        client.connectionPool().evictAll();
+        server.shutdown();
+    }
+
+    @Test
+    void reportsHttpStatusForRejectedRequest() throws Exception {
+        server.enqueue(new MockResponse().setResponseCode(404).setBody("not found"));
+        final EvpProxyApi api = new EvpProxyApi(
+                "123",
+                server.url("/evp_proxy/v4/"),
+                "event-platform-intake",
+                HttpRetryPolicy.Factory.NEVER_RETRY,
+                client,
+                false);
+
+        final HttpResponseException exception = assertThrows(
+                HttpResponseException.class,
+                () -> api.post(
+                        "exposures",
+                        RequestBody.create(MediaType.parse("application/json"), "{}"),
+                        stream -> null,
+                        null,
+                        false));
+
+        assertEquals(404, exception.getStatusCode());
+        final RecordedRequest request = server.takeRequest();
+        assertEquals("/evp_proxy/v4/api/v2/exposures", request.getPath());
+        assertEquals("event-platform-intake", request.getHeader("X-Datadog-EVP-Subdomain"));
+    }
 }
diff --git a/communication/src/test/java/datadog/communication/IntakeApiTest.java b/communication/src/test/java/datadog/communication/IntakeApiTest.java
index 326cf21ca84..b27a23cd3cd 100644
--- a/communication/src/test/java/datadog/communication/IntakeApiTest.java
+++ b/communication/src/test/java/datadog/communication/IntakeApiTest.java
@@ -16,50 +16,49 @@
 
 class IntakeApiTest {
 
-  private static final MediaType JSON = MediaType.parse("application/json");
+    private static final MediaType JSON = MediaType.parse("application/json");
 
-  private MockWebServer server;
-  private OkHttpClient client;
+    private MockWebServer server;
+    private OkHttpClient client;
 
-  @BeforeEach
-  void setUp() throws IOException {
-    server = new MockWebServer();
-    server.start();
-    client = new OkHttpClient.Builder().build();
-  }
+    @BeforeEach
+    void setUp() throws IOException {
+        server = new MockWebServer();
+        server.start();
+        client = new OkHttpClient.Builder().build();
+    }
 
-  @AfterEach
-  void tearDown() throws IOException {
-    client.dispatcher().executorService().shutdownNow();
-    client.connectionPool().evictAll();
-    server.shutdown();
-  }
+    @AfterEach
+    void tearDown() throws IOException {
+        client.dispatcher().executorService().shutdownNow();
+        client.connectionPool().evictAll();
+        server.shutdown();
+    }
 
-  @Test
-  void requestsGzipResponseCompressionWhenEnabled() throws Exception {
-    assertEquals("gzip", postAndReadAcceptEncoding(true));
-  }
+    @Test
+    void requestsGzipResponseCompressionWhenEnabled() throws Exception {
+        assertEquals("gzip", postAndReadAcceptEncoding(true));
+    }
 
-  @Test
-  void requestsIdentityResponseEncodingWhenCompressionIsDisabled() throws Exception {
-    assertEquals("identity", postAndReadAcceptEncoding(false));
-  }
+    @Test
+    void requestsIdentityResponseEncodingWhenCompressionIsDisabled() throws Exception {
+        assertEquals("identity", postAndReadAcceptEncoding(false));
+    }
 
-  private String postAndReadAcceptEncoding(final boolean responseCompression) throws Exception {
-    server.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
-    final IntakeApi api =
-        new IntakeApi(
-            server.url("/api/v2/"),
-            "api-key",
-            "123",
-            HttpRetryPolicy.Factory.NEVER_RETRY,
-            client,
-            responseCompression);
+    private String postAndReadAcceptEncoding(final boolean responseCompression) throws Exception {
+        server.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
+        final IntakeApi api = new IntakeApi(
+                server.url("/api/v2/"),
+                "api-key",
+                "123",
+                HttpRetryPolicy.Factory.NEVER_RETRY,
+                client,
+                responseCompression);
 
-    api.post("flagevaluation", RequestBody.create(JSON, "{}"), responseBody -> null, null, false);
+        api.post("flagevaluation", RequestBody.create(JSON, "{}"), responseBody -> null, null, false);
 
-    final RecordedRequest request = server.takeRequest();
-    assertEquals("/api/v2/flagevaluation", request.getPath());
-    return request.getHeader("Accept-Encoding");
-  }
+        final RecordedRequest request = server.takeRequest();
+        assertEquals("/api/v2/flagevaluation", request.getPath());
+        return request.getHeader("Accept-Encoding");
+    }
 }
diff --git a/communication/src/test/java/datadog/communication/ddagent/AgentVersionTest.java b/communication/src/test/java/datadog/communication/ddagent/AgentVersionTest.java
index 6ca2ee1da75..d4284809b06 100644
--- a/communication/src/test/java/datadog/communication/ddagent/AgentVersionTest.java
+++ b/communication/src/test/java/datadog/communication/ddagent/AgentVersionTest.java
@@ -7,59 +7,59 @@
 
 class AgentVersionTest {
 
-  @Test
-  void testIsVersionBelow_VersionBelowThreshold() {
-    assertTrue(AgentVersion.isVersionBelow("7.64.0", 7, 65, 0));
-    assertTrue(AgentVersion.isVersionBelow("7.64.9", 7, 65, 0));
-    assertTrue(AgentVersion.isVersionBelow("6.99.99", 7, 65, 0));
-    assertTrue(AgentVersion.isVersionBelow("7.0.0", 7, 65, 0));
-  }
+    @Test
+    void testIsVersionBelow_VersionBelowThreshold() {
+        assertTrue(AgentVersion.isVersionBelow("7.64.0", 7, 65, 0));
+        assertTrue(AgentVersion.isVersionBelow("7.64.9", 7, 65, 0));
+        assertTrue(AgentVersion.isVersionBelow("6.99.99", 7, 65, 0));
+        assertTrue(AgentVersion.isVersionBelow("7.0.0", 7, 65, 0));
+    }
 
-  @Test
-  void testIsVersionBelow_VersionEqualToThreshold() {
-    assertFalse(AgentVersion.isVersionBelow("7.65.0", 7, 65, 0));
-  }
+    @Test
+    void testIsVersionBelow_VersionEqualToThreshold() {
+        assertFalse(AgentVersion.isVersionBelow("7.65.0", 7, 65, 0));
+    }
 
-  @Test
-  void testIsVersionBelow_VersionAboveThreshold() {
-    assertFalse(AgentVersion.isVersionBelow("7.65.1", 7, 65, 0));
-    assertFalse(AgentVersion.isVersionBelow("7.66.0", 7, 65, 0));
-    assertFalse(AgentVersion.isVersionBelow("8.0.0", 7, 65, 0));
-    assertFalse(AgentVersion.isVersionBelow("7.65.10", 7, 65, 0));
-  }
+    @Test
+    void testIsVersionBelow_VersionAboveThreshold() {
+        assertFalse(AgentVersion.isVersionBelow("7.65.1", 7, 65, 0));
+        assertFalse(AgentVersion.isVersionBelow("7.66.0", 7, 65, 0));
+        assertFalse(AgentVersion.isVersionBelow("8.0.0", 7, 65, 0));
+        assertFalse(AgentVersion.isVersionBelow("7.65.10", 7, 65, 0));
+    }
 
-  @Test
-  void testIsVersionBelow_MajorVersionComparison() {
-    assertTrue(AgentVersion.isVersionBelow("6.100.100", 7, 0, 0));
-    assertFalse(AgentVersion.isVersionBelow("8.0.0", 7, 100, 100));
-  }
+    @Test
+    void testIsVersionBelow_MajorVersionComparison() {
+        assertTrue(AgentVersion.isVersionBelow("6.100.100", 7, 0, 0));
+        assertFalse(AgentVersion.isVersionBelow("8.0.0", 7, 100, 100));
+    }
 
-  @Test
-  void testIsVersionBelow_MinorVersionComparison() {
-    assertTrue(AgentVersion.isVersionBelow("7.64.100", 7, 65, 0));
-    assertFalse(AgentVersion.isVersionBelow("7.66.0", 7, 65, 100));
-  }
+    @Test
+    void testIsVersionBelow_MinorVersionComparison() {
+        assertTrue(AgentVersion.isVersionBelow("7.64.100", 7, 65, 0));
+        assertFalse(AgentVersion.isVersionBelow("7.66.0", 7, 65, 100));
+    }
 
-  @Test
-  void testIsVersionBelow_WithSuffix() {
-    assertTrue(AgentVersion.isVersionBelow("7.64.0-rc.1", 7, 65, 0));
-    assertTrue(AgentVersion.isVersionBelow("7.65.0-rc.1", 7, 65, 0));
-    assertFalse(AgentVersion.isVersionBelow("7.65.1-snapshot", 7, 65, 0));
-  }
+    @Test
+    void testIsVersionBelow_WithSuffix() {
+        assertTrue(AgentVersion.isVersionBelow("7.64.0-rc.1", 7, 65, 0));
+        assertTrue(AgentVersion.isVersionBelow("7.65.0-rc.1", 7, 65, 0));
+        assertFalse(AgentVersion.isVersionBelow("7.65.1-snapshot", 7, 65, 0));
+    }
 
-  @Test
-  void testIsVersionBelow_NullOrEmpty() {
-    assertTrue(AgentVersion.isVersionBelow(null, 7, 65, 0));
-    assertTrue(AgentVersion.isVersionBelow("", 7, 65, 0));
-  }
+    @Test
+    void testIsVersionBelow_NullOrEmpty() {
+        assertTrue(AgentVersion.isVersionBelow(null, 7, 65, 0));
+        assertTrue(AgentVersion.isVersionBelow("", 7, 65, 0));
+    }
 
-  @Test
-  void testIsVersionBelow_InvalidFormat() {
-    assertTrue(AgentVersion.isVersionBelow("invalid", 7, 65, 0));
-    assertTrue(AgentVersion.isVersionBelow("7", 7, 65, 0));
-    assertTrue(AgentVersion.isVersionBelow("7.", 7, 65, 0));
-    assertTrue(AgentVersion.isVersionBelow("7.65", 7, 65, 0));
-    assertTrue(AgentVersion.isVersionBelow("7.65.", 7, 65, 0));
-    assertTrue(AgentVersion.isVersionBelow("a.b.c", 7, 65, 0));
-  }
+    @Test
+    void testIsVersionBelow_InvalidFormat() {
+        assertTrue(AgentVersion.isVersionBelow("invalid", 7, 65, 0));
+        assertTrue(AgentVersion.isVersionBelow("7", 7, 65, 0));
+        assertTrue(AgentVersion.isVersionBelow("7.", 7, 65, 0));
+        assertTrue(AgentVersion.isVersionBelow("7.65", 7, 65, 0));
+        assertTrue(AgentVersion.isVersionBelow("7.65.", 7, 65, 0));
+        assertTrue(AgentVersion.isVersionBelow("a.b.c", 7, 65, 0));
+    }
 }
diff --git a/communication/src/test/java/datadog/communication/http/OkHttpUtilsRetryTest.java b/communication/src/test/java/datadog/communication/http/OkHttpUtilsRetryTest.java
index 45f84a4810a..00ec6d0efed 100644
--- a/communication/src/test/java/datadog/communication/http/OkHttpUtilsRetryTest.java
+++ b/communication/src/test/java/datadog/communication/http/OkHttpUtilsRetryTest.java
@@ -15,39 +15,36 @@
 
 class OkHttpUtilsRetryTest {
 
-  @Test
-  void retriesResponseMappingFailureThroughCallFactory() throws Exception {
-    final MockWebServer server = new MockWebServer();
-    final OkHttpClient client = new OkHttpClient();
-    final AtomicInteger mappingAttempts = new AtomicInteger();
-    server.enqueue(new MockResponse().setBody("first"));
-    server.enqueue(new MockResponse().setBody("second"));
-    server.start();
+    @Test
+    void retriesResponseMappingFailureThroughCallFactory() throws Exception {
+        final MockWebServer server = new MockWebServer();
+        final OkHttpClient client = new OkHttpClient();
+        final AtomicInteger mappingAttempts = new AtomicInteger();
+        server.enqueue(new MockResponse().setBody("first"));
+        server.enqueue(new MockResponse().setBody("second"));
+        server.start();
 
-    try {
-      final Request request = new Request.Builder().url(server.url("/configuration")).build();
+        try {
+            final Request request =
+                    new Request.Builder().url(server.url("/configuration")).build();
 
-      final String body =
-          sendWithRetries(
-              (Call.Factory) client,
-              new HttpRetryPolicy.Factory(1, 0, 1),
-              request,
-              response -> {
-                try (ResponseBody responseBody = response.body()) {
-                  if (mappingAttempts.getAndIncrement() == 0) {
-                    throw new ConnectException("response body could not be mapped");
-                  }
-                  return responseBody.string();
-                }
-              });
+            final String body =
+                    sendWithRetries((Call.Factory) client, new HttpRetryPolicy.Factory(1, 0, 1), request, response -> {
+                        try (ResponseBody responseBody = response.body()) {
+                            if (mappingAttempts.getAndIncrement() == 0) {
+                                throw new ConnectException("response body could not be mapped");
+                            }
+                            return responseBody.string();
+                        }
+                    });
 
-      assertEquals("second", body);
-      assertEquals(2, mappingAttempts.get());
-      assertEquals(2, server.getRequestCount());
-    } finally {
-      client.dispatcher().executorService().shutdownNow();
-      client.connectionPool().evictAll();
-      server.shutdown();
+            assertEquals("second", body);
+            assertEquals(2, mappingAttempts.get());
+            assertEquals(2, server.getRequestCount());
+        } finally {
+            client.dispatcher().executorService().shutdownNow();
+            client.connectionPool().evictAll();
+            server.shutdown();
+        }
     }
-  }
 }
diff --git a/communication/src/test/java/datadog/communication/serialization/CachingTest.java b/communication/src/test/java/datadog/communication/serialization/CachingTest.java
index 1ca9cc9b12c..fca2c16bd4d 100644
--- a/communication/src/test/java/datadog/communication/serialization/CachingTest.java
+++ b/communication/src/test/java/datadog/communication/serialization/CachingTest.java
@@ -7,39 +7,39 @@
 import org.junit.jupiter.api.Test;
 
 public class CachingTest {
-  @Test
-  public void capacity() {
-    // exact
-    assertEquals(64, Caching.cacheSizeFor(64));
-    assertEquals(128, Caching.cacheSizeFor(128));
-
-    // next power of 2
-    assertEquals(64, Caching.cacheSizeFor(63));
-    assertEquals(64, Caching.cacheSizeFor(33));
-  }
-
-  @Test
-  public void marking_exact() {
-    int[] marks = new int[Caching.cacheSizeFor(32)];
-
-    assertFalse(Caching.mark(marks, 31));
-    assertTrue(Caching.mark(marks, 31));
-
-    // should have been reset
-    assertFalse(Caching.mark(marks, 31));
-  }
-
-  @Test
-  public void marking_collision() {
-    // deliberately using tiny array to force collision
-    int[] marks = new int[1];
-
-    // powers of 2 to reduce false positives in test
-    assertFalse(Caching.mark(marks, 128));
-    assertFalse(Caching.mark(marks, 64));
-
-    assertTrue(Caching.mark(marks, 128));
-    // should now be reset
-    assertFalse(Caching.mark(marks, 64));
-  }
+    @Test
+    public void capacity() {
+        // exact
+        assertEquals(64, Caching.cacheSizeFor(64));
+        assertEquals(128, Caching.cacheSizeFor(128));
+
+        // next power of 2
+        assertEquals(64, Caching.cacheSizeFor(63));
+        assertEquals(64, Caching.cacheSizeFor(33));
+    }
+
+    @Test
+    public void marking_exact() {
+        int[] marks = new int[Caching.cacheSizeFor(32)];
+
+        assertFalse(Caching.mark(marks, 31));
+        assertTrue(Caching.mark(marks, 31));
+
+        // should have been reset
+        assertFalse(Caching.mark(marks, 31));
+    }
+
+    @Test
+    public void marking_collision() {
+        // deliberately using tiny array to force collision
+        int[] marks = new int[1];
+
+        // powers of 2 to reduce false positives in test
+        assertFalse(Caching.mark(marks, 128));
+        assertFalse(Caching.mark(marks, 64));
+
+        assertTrue(Caching.mark(marks, 128));
+        // should now be reset
+        assertFalse(Caching.mark(marks, 64));
+    }
 }
diff --git a/communication/src/test/java/datadog/communication/serialization/GenerationalUtf8CacheTest.java b/communication/src/test/java/datadog/communication/serialization/GenerationalUtf8CacheTest.java
index f7f9ff502dc..9ab453cadb9 100644
--- a/communication/src/test/java/datadog/communication/serialization/GenerationalUtf8CacheTest.java
+++ b/communication/src/test/java/datadog/communication/serialization/GenerationalUtf8CacheTest.java
@@ -18,335 +18,324 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 public class GenerationalUtf8CacheTest {
-  static final GenerationalUtf8Cache create() {
-    return new GenerationalUtf8Cache(64, 128);
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"foo", "bar", "baz", "quux"})
-  public void getUtf8(String value) {
-    GenerationalUtf8Cache cache = create();
-
-    for (int i = 0; i < 10; ++i) {
-      byte[] valueUtf8 = cache.getUtf8(value);
-      assertArrayEquals(value.getBytes(StandardCharsets.UTF_8), valueUtf8);
+    static final GenerationalUtf8Cache create() {
+        return new GenerationalUtf8Cache(64, 128);
     }
-  }
-
-  @Test
-  public void capacity() {
-    GenerationalUtf8Cache cache = new GenerationalUtf8Cache(192);
-    assertEquals(64, cache.edenCapacity());
-    assertEquals(128, cache.tenuredCapacity());
-  }
-
-  @Test
-  public void capacity_twoArg() {
-    GenerationalUtf8Cache cache = new GenerationalUtf8Cache(64, 256);
-    assertEquals(64, cache.edenCapacity());
-    assertEquals(256, cache.tenuredCapacity());
-  }
-
-  @Test
-  public void maxCapacity() {
-    GenerationalUtf8Cache cache =
-        new GenerationalUtf8Cache(
-            GenerationalUtf8Cache.MAX_EDEN_CAPACITY + 1,
-            GenerationalUtf8Cache.MAX_TENURED_CAPACITY + 1);
-
-    assertEquals(GenerationalUtf8Cache.MAX_EDEN_CAPACITY, cache.edenCapacity());
-    assertEquals(GenerationalUtf8Cache.MAX_TENURED_CAPACITY, cache.tenuredCapacity());
-  }
-
-  @Test
-  public void maxCapacity_combined() {
-    GenerationalUtf8Cache cache =
-        new GenerationalUtf8Cache(
-            GenerationalUtf8Cache.MAX_EDEN_CAPACITY
-                + GenerationalUtf8Cache.MAX_TENURED_CAPACITY
-                + 2);
-
-    assertEquals(GenerationalUtf8Cache.MAX_EDEN_CAPACITY, cache.edenCapacity());
-    assertEquals(GenerationalUtf8Cache.MAX_TENURED_CAPACITY, cache.tenuredCapacity());
-  }
-
-  @Test
-  public void caching() {
-    GenerationalUtf8Cache cache = create();
-
-    String value = "bar";
-    byte[] expected = value.getBytes(StandardCharsets.UTF_8);
-
-    byte[] first = cache.getUtf8(value);
-    assertArrayEquals(expected, first);
-
-    // first request isn't cached - to avoid burning slots
-    byte[] second = cache.getUtf8(value);
-    assertArrayEquals(expected, second);
-    assertNotSame(first, second);
-
-    // after first request, the entry should be cached
-    byte[] third = cache.getUtf8(value);
-    assertArrayEquals(expected, third);
-    assertSame(second, third);
-
-    assertNotEquals(0, cache.edenHits);
-  }
-
-  @Test
-  public void getUtf8_perCallAccessTime_overridesField() {
-    GenerationalUtf8Cache cache = create();
-    // The field value should not leak into the entry when an explicit time is supplied.
-    cache.updateAccessTime(0L);
-
-    String value = "bar";
-    long callTime = 12345L;
-
-    // First call only marks; the second call creates the entry.
-    cache.getUtf8(value, callTime);
-    cache.getUtf8(value, callTime);
-
-    assertEquals(callTime, lookupEdenLastUsedMs(cache, value));
-
-    // Drive enough hits to promote into tenured.
-    while (cache.promotions == 0) {
-      cache.getUtf8(value, callTime);
+
+    @ParameterizedTest
+    @ValueSource(strings = {"foo", "bar", "baz", "quux"})
+    public void getUtf8(String value) {
+        GenerationalUtf8Cache cache = create();
+
+        for (int i = 0; i < 10; ++i) {
+            byte[] valueUtf8 = cache.getUtf8(value);
+            assertArrayEquals(value.getBytes(StandardCharsets.UTF_8), valueUtf8);
+        }
     }
 
-    assertEquals(callTime, lookupTenuredLastUsedMs(cache, value));
-  }
+    @Test
+    public void capacity() {
+        GenerationalUtf8Cache cache = new GenerationalUtf8Cache(192);
+        assertEquals(64, cache.edenCapacity());
+        assertEquals(128, cache.tenuredCapacity());
+    }
 
-  @Test
-  public void promotion() {
-    GenerationalUtf8Cache cache = create();
+    @Test
+    public void capacity_twoArg() {
+        GenerationalUtf8Cache cache = new GenerationalUtf8Cache(64, 256);
+        assertEquals(64, cache.edenCapacity());
+        assertEquals(256, cache.tenuredCapacity());
+    }
 
-    String value = "bar";
-    byte[] expected = value.getBytes(StandardCharsets.UTF_8);
+    @Test
+    public void maxCapacity() {
+        GenerationalUtf8Cache cache = new GenerationalUtf8Cache(
+                GenerationalUtf8Cache.MAX_EDEN_CAPACITY + 1, GenerationalUtf8Cache.MAX_TENURED_CAPACITY + 1);
 
-    byte[] first = cache.getUtf8(value);
-    assertArrayEquals(expected, first);
+        assertEquals(GenerationalUtf8Cache.MAX_EDEN_CAPACITY, cache.edenCapacity());
+        assertEquals(GenerationalUtf8Cache.MAX_TENURED_CAPACITY, cache.tenuredCapacity());
+    }
 
-    byte[] second = cache.getUtf8(value);
-    assertArrayEquals(expected, second);
-    assertNotSame(second, first);
+    @Test
+    public void maxCapacity_combined() {
+        GenerationalUtf8Cache cache = new GenerationalUtf8Cache(
+                GenerationalUtf8Cache.MAX_EDEN_CAPACITY + GenerationalUtf8Cache.MAX_TENURED_CAPACITY + 2);
 
-    while (cache.promotions == 0) {
-      byte[] cached = cache.getUtf8(value);
-      assertArrayEquals(expected, cached);
-      assertSame(cached, second);
+        assertEquals(GenerationalUtf8Cache.MAX_EDEN_CAPACITY, cache.edenCapacity());
+        assertEquals(GenerationalUtf8Cache.MAX_TENURED_CAPACITY, cache.tenuredCapacity());
     }
 
-    assertNotEquals(0, cache.edenHits);
+    @Test
+    public void caching() {
+        GenerationalUtf8Cache cache = create();
 
-    for (int i = 0; i < 10; ++i) {
-      byte[] cached = cache.getUtf8(value);
+        String value = "bar";
+        byte[] expected = value.getBytes(StandardCharsets.UTF_8);
 
-      assertArrayEquals(expected, cached);
-      assertSame(cached, second);
+        byte[] first = cache.getUtf8(value);
+        assertArrayEquals(expected, first);
+
+        // first request isn't cached - to avoid burning slots
+        byte[] second = cache.getUtf8(value);
+        assertArrayEquals(expected, second);
+        assertNotSame(first, second);
+
+        // after first request, the entry should be cached
+        byte[] third = cache.getUtf8(value);
+        assertArrayEquals(expected, third);
+        assertSame(second, third);
+
+        assertNotEquals(0, cache.edenHits);
     }
 
-    assertNotEquals(0, cache.tenuredHits);
-  }
+    @Test
+    public void getUtf8_perCallAccessTime_overridesField() {
+        GenerationalUtf8Cache cache = create();
+        // The field value should not leak into the entry when an explicit time is supplied.
+        cache.updateAccessTime(0L);
 
-  @Test
-  public void fuzz() {
-    Random random = ThreadLocalRandom.current();
+        String value = "bar";
+        long callTime = 12345L;
 
-    int edenHits = 0;
-    int promotedHits = 0;
+        // First call only marks; the second call creates the entry.
+        cache.getUtf8(value, callTime);
+        cache.getUtf8(value, callTime);
 
-    GenerationalUtf8Cache cache = create();
-    for (int i = 0; i < 1_000; ++i) {
-      cache.recalibrate();
+        assertEquals(callTime, lookupEdenLastUsedMs(cache, value));
 
-      int cycles = 500 + random.nextInt(2_000);
-      for (int j = 0; j < cycles; ++j) {
-        String nextTag = nextTag();
-        String nextValue = nextValue();
-        byte[] nextExpected = nextValue.getBytes(StandardCharsets.UTF_8);
+        // Drive enough hits to promote into tenured.
+        while (cache.promotions == 0) {
+            cache.getUtf8(value, callTime);
+        }
+
+        assertEquals(callTime, lookupTenuredLastUsedMs(cache, value));
+    }
 
-        byte[] nextValueUtf8 = cache.getUtf8(nextValue);
-        assertArrayEquals(nextExpected, nextValueUtf8);
-      }
+    @Test
+    public void promotion() {
+        GenerationalUtf8Cache cache = create();
 
-      edenHits += cache.edenHits;
-      promotedHits += cache.tenuredHits;
+        String value = "bar";
+        byte[] expected = value.getBytes(StandardCharsets.UTF_8);
 
-      printStats(cache);
+        byte[] first = cache.getUtf8(value);
+        assertArrayEquals(expected, first);
+
+        byte[] second = cache.getUtf8(value);
+        assertArrayEquals(expected, second);
+        assertNotSame(second, first);
+
+        while (cache.promotions == 0) {
+            byte[] cached = cache.getUtf8(value);
+            assertArrayEquals(expected, cached);
+            assertSame(cached, second);
+        }
+
+        assertNotEquals(0, cache.edenHits);
+
+        for (int i = 0; i < 10; ++i) {
+            byte[] cached = cache.getUtf8(value);
+
+            assertArrayEquals(expected, cached);
+            assertSame(cached, second);
+        }
+
+        assertNotEquals(0, cache.tenuredHits);
     }
 
-    assertNotEquals(0, edenHits);
-    assertNotEquals(0, promotedHits);
-  }
-
-  @Test
-  public void concurrentAccess_neverThrowsOrReturnsWrongBytes() throws InterruptedException {
-    // Regression test for a lookup-then-read race in getUtf8(): a slot can be nulled (recalibrate
-    // purge / eviction) or reassigned to a *different* value between lookupEntryIndex() and the
-    // array read. Before the fix this either NPE'd (null slot) or, worse, silently returned another
-    // value's bytes (reassigned slot). Serialization is single-threaded today, but the cache is
-    // built to allow concurrent use, so this exercises that contract.
-    final GenerationalUtf8Cache cache = create();
-
-    // More distinct values than the cache can hold, so promotions/evictions churn slots hard.
-    final String[] values = new String[256];
-    for (int i = 0; i < values.length; ++i) {
-      values[i] = "value-" + i;
+    @Test
+    public void fuzz() {
+        Random random = ThreadLocalRandom.current();
+
+        int edenHits = 0;
+        int promotedHits = 0;
+
+        GenerationalUtf8Cache cache = create();
+        for (int i = 0; i < 1_000; ++i) {
+            cache.recalibrate();
+
+            int cycles = 500 + random.nextInt(2_000);
+            for (int j = 0; j < cycles; ++j) {
+                String nextTag = nextTag();
+                String nextValue = nextValue();
+                byte[] nextExpected = nextValue.getBytes(StandardCharsets.UTF_8);
+
+                byte[] nextValueUtf8 = cache.getUtf8(nextValue);
+                assertArrayEquals(nextExpected, nextValueUtf8);
+            }
+
+            edenHits += cache.edenHits;
+            promotedHits += cache.tenuredHits;
+
+            printStats(cache);
+        }
+
+        assertNotEquals(0, edenHits);
+        assertNotEquals(0, promotedHits);
     }
 
-    final int threadCount = 8;
-    final int iterationsPerThread = 200_000;
-    final CountDownLatch start = new CountDownLatch(1);
-    final AtomicReference<Throwable> failure = new AtomicReference<>();
-    final AtomicInteger readersRunning = new AtomicInteger(threadCount);
-
-    Thread[] readers = new Thread[threadCount];
-    for (int t = 0; t < threadCount; ++t) {
-      readers[t] =
-          new Thread(
-              () -> {
+    @Test
+    public void concurrentAccess_neverThrowsOrReturnsWrongBytes() throws InterruptedException {
+        // Regression test for a lookup-then-read race in getUtf8(): a slot can be nulled (recalibrate
+        // purge / eviction) or reassigned to a *different* value between lookupEntryIndex() and the
+        // array read. Before the fix this either NPE'd (null slot) or, worse, silently returned another
+        // value's bytes (reassigned slot). Serialization is single-threaded today, but the cache is
+        // built to allow concurrent use, so this exercises that contract.
+        final GenerationalUtf8Cache cache = create();
+
+        // More distinct values than the cache can hold, so promotions/evictions churn slots hard.
+        final String[] values = new String[256];
+        for (int i = 0; i < values.length; ++i) {
+            values[i] = "value-" + i;
+        }
+
+        final int threadCount = 8;
+        final int iterationsPerThread = 200_000;
+        final CountDownLatch start = new CountDownLatch(1);
+        final AtomicReference<Throwable> failure = new AtomicReference<>();
+        final AtomicInteger readersRunning = new AtomicInteger(threadCount);
+
+        Thread[] readers = new Thread[threadCount];
+        for (int t = 0; t < threadCount; ++t) {
+            readers[t] = new Thread(() -> {
                 try {
-                  start.await();
-                  ThreadLocalRandom random = ThreadLocalRandom.current();
-                  for (int i = 0; i < iterationsPerThread && failure.get() == null; ++i) {
-                    String value = values[random.nextInt(values.length)];
-                    byte[] result = cache.getUtf8(value);
-                    if (!Arrays.equals(value.getBytes(StandardCharsets.UTF_8), result)) {
-                      failure.compareAndSet(
-                          null,
-                          new AssertionError(
-                              "getUtf8(\""
-                                  + value
-                                  + "\") returned bytes for \""
-                                  + new String(result, StandardCharsets.UTF_8)
-                                  + "\""));
-                      return;
+                    start.await();
+                    ThreadLocalRandom random = ThreadLocalRandom.current();
+                    for (int i = 0; i < iterationsPerThread && failure.get() == null; ++i) {
+                        String value = values[random.nextInt(values.length)];
+                        byte[] result = cache.getUtf8(value);
+                        if (!Arrays.equals(value.getBytes(StandardCharsets.UTF_8), result)) {
+                            failure.compareAndSet(
+                                    null,
+                                    new AssertionError("getUtf8(\""
+                                            + value
+                                            + "\") returned bytes for \""
+                                            + new String(result, StandardCharsets.UTF_8)
+                                            + "\""));
+                            return;
+                        }
                     }
-                  }
                 } catch (Throwable e) {
-                  failure.compareAndSet(null, e);
+                    failure.compareAndSet(null, e);
                 } finally {
-                  readersRunning.decrementAndGet();
+                    readersRunning.decrementAndGet();
                 }
-              });
-    }
+            });
+        }
 
-    // Recalibrate in a tight loop for the duration, nulling decayed slots concurrently with reads.
-    Thread recalibrator =
-        new Thread(
-            () -> {
-              try {
+        // Recalibrate in a tight loop for the duration, nulling decayed slots concurrently with reads.
+        Thread recalibrator = new Thread(() -> {
+            try {
                 start.await();
                 while (readersRunning.get() > 0 && failure.get() == null) {
-                  cache.recalibrate();
+                    cache.recalibrate();
                 }
-              } catch (Throwable e) {
+            } catch (Throwable e) {
                 failure.compareAndSet(null, e);
-              }
-            });
-
-    for (Thread reader : readers) {
-      reader.start();
-    }
-    recalibrator.start();
-    start.countDown();
-
-    for (Thread reader : readers) {
-      reader.join();
-    }
-    recalibrator.join();
-
-    if (failure.get() != null) {
-      throw new AssertionError("concurrent getUtf8() failed", failure.get());
+            }
+        });
+
+        for (Thread reader : readers) {
+            reader.start();
+        }
+        recalibrator.start();
+        start.countDown();
+
+        for (Thread reader : readers) {
+            reader.join();
+        }
+        recalibrator.join();
+
+        if (failure.get() != null) {
+            throw new AssertionError("concurrent getUtf8() failed", failure.get());
+        }
     }
-  }
 
-  @Test
-  public void bigString_dont_cache() {
-    String lorem = "Lorem ipsum dolor sit amet";
-    while (lorem.length() <= GenerationalUtf8Cache.MAX_ENTRY_LEN) {
-      lorem += lorem;
+    @Test
+    public void bigString_dont_cache() {
+        String lorem = "Lorem ipsum dolor sit amet";
+        while (lorem.length() <= GenerationalUtf8Cache.MAX_ENTRY_LEN) {
+            lorem += lorem;
+        }
+        byte[] expected = lorem.getBytes(StandardCharsets.UTF_8);
+
+        GenerationalUtf8Cache cache = create();
+        byte[] first = cache.getUtf8(lorem);
+        assertArrayEquals(expected, first);
+
+        byte[] second = cache.getUtf8(lorem);
+        assertArrayEquals(expected, second);
+        assertNotSame(first, second);
+
+        for (int i = 0; i < 10; ++i) {
+            byte[] result = cache.getUtf8(lorem);
+            assertArrayEquals(expected, result);
+
+            assertNotSame(first, result);
+            assertNotSame(second, result);
+        }
+        assertEquals(0, cache.edenHits);
+        assertEquals(0, cache.tenuredHits);
     }
-    byte[] expected = lorem.getBytes(StandardCharsets.UTF_8);
 
-    GenerationalUtf8Cache cache = create();
-    byte[] first = cache.getUtf8(lorem);
-    assertArrayEquals(expected, first);
+    static final String[] TAGS = {"foo", "bar", "baz"};
 
-    byte[] second = cache.getUtf8(lorem);
-    assertArrayEquals(expected, second);
-    assertNotSame(first, second);
+    static final String[] BASE_STRINGS = {"Hello", "world", "foo", "bar", "baz", "quux"};
 
-    for (int i = 0; i < 10; ++i) {
-      byte[] result = cache.getUtf8(lorem);
-      assertArrayEquals(expected, result);
+    static final String nextTag() {
+        ThreadLocalRandom random = ThreadLocalRandom.current();
 
-      assertNotSame(first, result);
-      assertNotSame(second, result);
+        int tagIndex = random.nextInt(TAGS.length + 1);
+        if (tagIndex >= TAGS.length) {
+            return "tag-" + random.nextInt();
+        } else {
+            return TAGS[tagIndex];
+        }
     }
-    assertEquals(0, cache.edenHits);
-    assertEquals(0, cache.tenuredHits);
-  }
 
-  static final String[] TAGS = {"foo", "bar", "baz"};
+    static final String nextValue() {
+        ThreadLocalRandom random = ThreadLocalRandom.current();
 
-  static final String[] BASE_STRINGS = {"Hello", "world", "foo", "bar", "baz", "quux"};
+        if (random.nextDouble() < 0.1) {
+            return Integer.toString(random.nextInt());
+        }
 
-  static final String nextTag() {
-    ThreadLocalRandom random = ThreadLocalRandom.current();
-
-    int tagIndex = random.nextInt(TAGS.length + 1);
-    if (tagIndex >= TAGS.length) {
-      return "tag-" + random.nextInt();
-    } else {
-      return TAGS[tagIndex];
-    }
-  }
+        int baseIndex = random.nextInt(BASE_STRINGS.length);
+        String baseString = BASE_STRINGS[baseIndex];
 
-  static final String nextValue() {
-    ThreadLocalRandom random = ThreadLocalRandom.current();
+        if (random.nextDouble() < 0.2) {
+            baseString = baseString.toLowerCase();
+        }
 
-    if (random.nextDouble() < 0.1) {
-      return Integer.toString(random.nextInt());
+        int valueSuffix = random.nextInt(2 * baseIndex + 1);
+        return baseString + valueSuffix;
     }
 
-    int baseIndex = random.nextInt(BASE_STRINGS.length);
-    String baseString = BASE_STRINGS[baseIndex];
-
-    if (random.nextDouble() < 0.2) {
-      baseString = baseString.toLowerCase();
+    static long lookupEdenLastUsedMs(GenerationalUtf8Cache cache, String value) {
+        return lookupLastUsedMs(cache.edenEntries, "edenEntries", value);
     }
 
-    int valueSuffix = random.nextInt(2 * baseIndex + 1);
-    return baseString + valueSuffix;
-  }
-
-  static long lookupEdenLastUsedMs(GenerationalUtf8Cache cache, String value) {
-    return lookupLastUsedMs(cache.edenEntries, "edenEntries", value);
-  }
+    static long lookupTenuredLastUsedMs(GenerationalUtf8Cache cache, String value) {
+        return lookupLastUsedMs(cache.tenuredEntries, "tenuredEntries", value);
+    }
 
-  static long lookupTenuredLastUsedMs(GenerationalUtf8Cache cache, String value) {
-    return lookupLastUsedMs(cache.tenuredEntries, "tenuredEntries", value);
-  }
+    private static long lookupLastUsedMs(GenerationalUtf8Cache.CacheEntry[] entries, String arrayName, String value) {
+        for (GenerationalUtf8Cache.CacheEntry entry : entries) {
+            if (entry != null && value.equals(entry.value)) {
+                return entry.lastUsedMs();
+            }
+        }
+        throw new AssertionError("entry for value '" + value + "' not found in " + arrayName);
+    }
 
-  private static long lookupLastUsedMs(
-      GenerationalUtf8Cache.CacheEntry[] entries, String arrayName, String value) {
-    for (GenerationalUtf8Cache.CacheEntry entry : entries) {
-      if (entry != null && value.equals(entry.value)) {
-        return entry.lastUsedMs();
-      }
+    static final void printStats(GenerationalUtf8Cache cache) {
+        System.out.printf(
+                "eden hits: %5d\tpromotion hits: %5d\tpromotions: %5d\tearly: %5d\tlocal evictions: %5d\tglobal evictions: %5d%n",
+                cache.edenHits,
+                cache.tenuredHits,
+                cache.promotions,
+                cache.earlyPromotions,
+                cache.edenEvictions,
+                cache.tenuredEvictions);
     }
-    throw new AssertionError("entry for value '" + value + "' not found in " + arrayName);
-  }
-
-  static final void printStats(GenerationalUtf8Cache cache) {
-    System.out.printf(
-        "eden hits: %5d\tpromotion hits: %5d\tpromotions: %5d\tearly: %5d\tlocal evictions: %5d\tglobal evictions: %5d%n",
-        cache.edenHits,
-        cache.tenuredHits,
-        cache.promotions,
-        cache.earlyPromotions,
-        cache.edenEvictions,
-        cache.tenuredEvictions);
-  }
 }
diff --git a/communication/src/test/java/datadog/communication/serialization/GrowableBufferTest.java b/communication/src/test/java/datadog/communication/serialization/GrowableBufferTest.java
index c018cce7aa3..d86860c5bb8 100644
--- a/communication/src/test/java/datadog/communication/serialization/GrowableBufferTest.java
+++ b/communication/src/test/java/datadog/communication/serialization/GrowableBufferTest.java
@@ -9,77 +9,77 @@
 
 public class GrowableBufferTest {
 
-  @Test
-  public void byteBufferTriggersResize() {
-    GrowableBuffer gb = new GrowableBuffer(5);
-    ByteBuffer buffer = ByteBuffer.allocate(20);
-    for (int i = 0; i < 5; ++i) {
-      buffer.putInt(i);
+    @Test
+    public void byteBufferTriggersResize() {
+        GrowableBuffer gb = new GrowableBuffer(5);
+        ByteBuffer buffer = ByteBuffer.allocate(20);
+        for (int i = 0; i < 5; ++i) {
+            buffer.putInt(i);
+        }
+        buffer.flip();
+        gb.put(buffer);
+        ByteBuffer contentsAfterResize = gb.slice();
+        for (int i = 0; i < 5; ++i) {
+            assertEquals(i, contentsAfterResize.getInt());
+        }
     }
-    buffer.flip();
-    gb.put(buffer);
-    ByteBuffer contentsAfterResize = gb.slice();
-    for (int i = 0; i < 5; ++i) {
-      assertEquals(i, contentsAfterResize.getInt());
-    }
-  }
 
-  @Test
-  public void testBufferCapacity() {
-    GrowableBuffer gb = new GrowableBuffer(5);
-    assertEquals(8, gb.capacity());
-    ByteBuffer buffer = ByteBuffer.allocate(20);
-    for (int i = 0; i < 5; ++i) {
-      buffer.putInt(i);
+    @Test
+    public void testBufferCapacity() {
+        GrowableBuffer gb = new GrowableBuffer(5);
+        assertEquals(8, gb.capacity());
+        ByteBuffer buffer = ByteBuffer.allocate(20);
+        for (int i = 0; i < 5; ++i) {
+            buffer.putInt(i);
+        }
+        buffer.flip();
+        gb.put(buffer);
+        assertEquals(32, gb.capacity());
     }
-    buffer.flip();
-    gb.put(buffer);
-    assertEquals(32, gb.capacity());
-  }
 
-  @Test
-  public void testBufferReset() {
-    GrowableBuffer gb = new GrowableBuffer(5);
-    gb.put((byte) 1);
-    gb.mark();
-    assertTrue(gb.isDirty());
+    @Test
+    public void testBufferReset() {
+        GrowableBuffer gb = new GrowableBuffer(5);
+        gb.put((byte) 1);
+        gb.mark();
+        assertTrue(gb.isDirty());
 
-    gb.reset();
-    assertFalse(gb.isDirty());
+        gb.reset();
+        assertFalse(gb.isDirty());
 
-    gb.put((byte) 42);
-    ByteBuffer slice = gb.slice();
-    assertEquals(0, gb.messageCount());
-    assertEquals(42, slice.get());
-  }
+        gb.put((byte) 42);
+        ByteBuffer slice = gb.slice();
+        assertEquals(0, gb.messageCount());
+        assertEquals(42, slice.get());
+    }
 
-  @Test
-  public void testFlush() {
-    GrowableBuffer gb = new GrowableBuffer(5);
-    gb.put((byte) 1);
-    assertFalse(gb.flush());
-  }
+    @Test
+    public void testFlush() {
+        GrowableBuffer gb = new GrowableBuffer(5);
+        gb.put((byte) 1);
+        assertFalse(gb.flush());
+    }
 
-  @Test
-  public void testPutVariants() {
-    GrowableBuffer gb = new GrowableBuffer(5);
-    gb.putShort((short) 1);
-    gb.putChar((char) 2);
-    gb.putInt(4);
-    gb.putLong(8L);
-    gb.putFloat(16.0f);
-    gb.putDouble(32.0);
-    gb.put(new byte[] {64});
-    gb.put(new byte[] {-128}, 0, 1);
+    @Test
+    public void testPutVariants() {
+        GrowableBuffer gb = new GrowableBuffer(5);
+        gb.putShort((short) 1);
+        gb.putChar((char) 2);
+        gb.putInt(4);
+        gb.putLong(8L);
+        gb.putFloat(16.0f);
+        gb.putDouble(32.0);
+        gb.put(new byte[] {64});
+        gb.put(new byte[] {-128}, 0, 1);
 
-    ByteBuffer slice = gb.slice();
-    assertEquals((short) 1, slice.getShort());
-    assertEquals((char) 2, slice.getChar());
-    assertEquals(4, slice.getInt());
-    assertEquals(8L, slice.getLong());
-    assertEquals(16.0f, slice.getFloat());
-    assertEquals(32.0, slice.getDouble());
-    assertEquals((byte) 64, slice.get());
-    assertEquals((byte) -128, slice.get());
-  }
+        ByteBuffer slice = gb.slice();
+        assertEquals((short) 1, slice.getShort());
+        assertEquals((char) 2, slice.getChar());
+        assertEquals(4, slice.getInt());
+        assertEquals(8L, slice.getLong());
+        assertEquals(16.0f, slice.getFloat());
+        assertEquals(32.0, slice.getDouble());
+        assertEquals((byte) 64, slice.get());
+        assertEquals((byte) -128, slice.get());
+    }
 }
diff --git a/communication/src/test/java/datadog/communication/serialization/IntPackingTest.java b/communication/src/test/java/datadog/communication/serialization/IntPackingTest.java
index ef5f1c8b13e..7c7ea041c54 100644
--- a/communication/src/test/java/datadog/communication/serialization/IntPackingTest.java
+++ b/communication/src/test/java/datadog/communication/serialization/IntPackingTest.java
@@ -14,137 +14,131 @@
 
 public class IntPackingTest {
 
-  public static Object[][] inputs() {
-    return new Object[][] {
-      {
-        new long[] {
-          -1,
-          Long.MIN_VALUE,
-          Long.MAX_VALUE,
-          0,
-          1,
-          0x80,
-          0xF,
-          0xFF,
-          0xFFF,
-          0xFFFF,
-          0xF000,
-          0xFFFFF,
-          0xFFFFFF,
-          0xFFFFFF,
-          0xFFFFFFFF,
-          0xFFFFFFFFFL,
-          0xFFFFFFFFFFL,
-          0xFFFFFFFFFFFFL,
-          0xEFEFEFEFEFEFEFEFL,
-          -0xF,
-          -0xFF,
-          -0xFFF,
-          -0xFFFF,
-          -0xF000,
-          -0xFFFFF,
-          -0xFFFFFF,
-          -0xFFFFFF,
-          -0xFFFFFFFF,
-          -0xFFFFFFFFFL,
-          -0xFFFFFFFFFFL,
-          -0xFFFFFFFFFFFFL
-        }
-      },
-      {
-        new long[] {
-          -1,
-          Integer.MIN_VALUE,
-          Integer.MAX_VALUE,
-          0,
-          1,
-          0x80,
-          0xF,
-          0xFF,
-          0xFFF,
-          0xFFFF,
-          0xF000,
-          0xFFFFF,
-          0xFFFFFF,
-          0xFFFFFF,
-          0xFFFFFFFF,
-          0xEFEFEFEF,
-          -0xF,
-          -0xFF,
-          -0xFFF,
-          -0xFFFF,
-          -0xFFFFFF
-        }
-      },
-      {random(100)},
-      {random(10_000)},
-      {random(100_000)},
-    };
-  }
+    public static Object[][] inputs() {
+        return new Object[][] {
+            {
+                new long[] {
+                    -1,
+                    Long.MIN_VALUE,
+                    Long.MAX_VALUE,
+                    0,
+                    1,
+                    0x80,
+                    0xF,
+                    0xFF,
+                    0xFFF,
+                    0xFFFF,
+                    0xF000,
+                    0xFFFFF,
+                    0xFFFFFF,
+                    0xFFFFFF,
+                    0xFFFFFFFF,
+                    0xFFFFFFFFFL,
+                    0xFFFFFFFFFFL,
+                    0xFFFFFFFFFFFFL,
+                    0xEFEFEFEFEFEFEFEFL,
+                    -0xF,
+                    -0xFF,
+                    -0xFFF,
+                    -0xFFFF,
+                    -0xF000,
+                    -0xFFFFF,
+                    -0xFFFFFF,
+                    -0xFFFFFF,
+                    -0xFFFFFFFF,
+                    -0xFFFFFFFFFL,
+                    -0xFFFFFFFFFFL,
+                    -0xFFFFFFFFFFFFL
+                }
+            },
+            {
+                new long[] {
+                    -1,
+                    Integer.MIN_VALUE,
+                    Integer.MAX_VALUE,
+                    0,
+                    1,
+                    0x80,
+                    0xF,
+                    0xFF,
+                    0xFFF,
+                    0xFFFF,
+                    0xF000,
+                    0xFFFFF,
+                    0xFFFFFF,
+                    0xFFFFFF,
+                    0xFFFFFFFF,
+                    0xEFEFEFEF,
+                    -0xF,
+                    -0xFF,
+                    -0xFFF,
+                    -0xFFFF,
+                    -0xFFFFFF
+                }
+            },
+            {random(100)},
+            {random(10_000)},
+            {random(100_000)},
+        };
+    }
 
-  private static long[] random(int size) {
-    long[] random = new long[size];
-    for (int i = 0; i < random.length; ++i) {
-      // yeah, JDK7...
-      int signum = ThreadLocalRandom.current().nextBoolean() ? 1 : -1;
-      random[i] = signum * ThreadLocalRandom.current().nextLong(0, Long.MAX_VALUE);
+    private static long[] random(int size) {
+        long[] random = new long[size];
+        for (int i = 0; i < random.length; ++i) {
+            // yeah, JDK7...
+            int signum = ThreadLocalRandom.current().nextBoolean() ? 1 : -1;
+            random[i] = signum * ThreadLocalRandom.current().nextLong(0, Long.MAX_VALUE);
+        }
+        return random;
     }
-    return random;
-  }
 
-  @ParameterizedTest(name = "Input case {index}")
-  @MethodSource("inputs")
-  public void packLongs(long[] input) {
-    ByteBuffer buffer = ByteBuffer.allocate(input.length * 9 + 10);
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                input.length * 9 + 10,
-                (messageCount, buffy) -> {
-                  try {
-                    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy);
-                    assertEquals(1, messageCount);
-                    assertEquals(input.length, unpacker.unpackArrayHeader());
-                    for (long i : input) {
-                      assertEquals(i, unpacker.unpackLong());
+    @ParameterizedTest(name = "Input case {index}")
+    @MethodSource("inputs")
+    public void packLongs(long[] input) {
+        ByteBuffer buffer = ByteBuffer.allocate(input.length * 9 + 10);
+        MessageFormatter messageFormatter =
+                new MsgPackWriter(newBuffer(input.length * 9 + 10, (messageCount, buffy) -> {
+                    try {
+                        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy);
+                        assertEquals(1, messageCount);
+                        assertEquals(input.length, unpacker.unpackArrayHeader());
+                        for (long i : input) {
+                            assertEquals(i, unpacker.unpackLong());
+                        }
+                    } catch (IOException e) {
+                        Assertions.fail(e.getMessage());
                     }
-                  } catch (IOException e) {
-                    Assertions.fail(e.getMessage());
-                  }
                 }));
-    messageFormatter.format(input, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @ParameterizedTest(name = "Input case {index}")
-  @MethodSource("inputs")
-  public void packInts(long[] input) {
-    final int[] asInts = new int[input.length];
-    for (int i = 0; i < input.length; ++i) {
-      asInts[i] = (int) input[i];
+        messageFormatter.format(input, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
     }
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                input.length * 5 + 10,
-                (messageCount, buffy) -> {
-                  try {
-                    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy);
-                    assertEquals(1, messageCount);
-                    assertEquals(asInts.length, unpacker.unpackArrayHeader());
-                    for (int i : asInts) {
-                      assertEquals(i, unpacker.unpackInt());
+
+    @ParameterizedTest(name = "Input case {index}")
+    @MethodSource("inputs")
+    public void packInts(long[] input) {
+        final int[] asInts = new int[input.length];
+        for (int i = 0; i < input.length; ++i) {
+            asInts[i] = (int) input[i];
+        }
+        MessageFormatter messageFormatter =
+                new MsgPackWriter(newBuffer(input.length * 5 + 10, (messageCount, buffy) -> {
+                    try {
+                        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy);
+                        assertEquals(1, messageCount);
+                        assertEquals(asInts.length, unpacker.unpackArrayHeader());
+                        for (int i : asInts) {
+                            assertEquals(i, unpacker.unpackInt());
+                        }
+                    } catch (IOException e) {
+                        Assertions.fail(e.getMessage());
                     }
-                  } catch (IOException e) {
-                    Assertions.fail(e.getMessage());
-                  }
                 }));
 
-    messageFormatter.format(asInts, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
+        messageFormatter.format(asInts, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
 
-  private StreamingBuffer newBuffer(int capacity, ByteBufferConsumer consumer) {
-    return new FlushingBuffer(capacity, consumer);
-  }
+    private StreamingBuffer newBuffer(int capacity, ByteBufferConsumer consumer) {
+        return new FlushingBuffer(capacity, consumer);
+    }
 }
diff --git a/communication/src/test/java/datadog/communication/serialization/SimpleUtf8CacheTest.java b/communication/src/test/java/datadog/communication/serialization/SimpleUtf8CacheTest.java
index d07221bd892..be095eca915 100644
--- a/communication/src/test/java/datadog/communication/serialization/SimpleUtf8CacheTest.java
+++ b/communication/src/test/java/datadog/communication/serialization/SimpleUtf8CacheTest.java
@@ -14,145 +14,145 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 public class SimpleUtf8CacheTest {
-  static final SimpleUtf8Cache create() {
-    return new SimpleUtf8Cache(64);
-  }
-
-  @Test
-  public void capacity() {
-    SimpleUtf8Cache cache = new SimpleUtf8Cache(128);
-    assertEquals(128, cache.capacity());
-  }
-
-  @Test
-  public void maxCapacity() {
-    SimpleUtf8Cache cache = new SimpleUtf8Cache(SimpleUtf8Cache.MAX_CAPACITY + 1);
-
-    assertEquals(SimpleUtf8Cache.MAX_CAPACITY, cache.capacity());
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"foo", "bar", "baz", "quux"})
-  public void getUtf8(String value) {
-    SimpleUtf8Cache cache = create();
-
-    for (int i = 0; i < 10; ++i) {
-      byte[] valueUtf8 = cache.getUtf8(value);
-      assertArrayEquals(value.getBytes(StandardCharsets.UTF_8), valueUtf8);
+    static final SimpleUtf8Cache create() {
+        return new SimpleUtf8Cache(64);
     }
-  }
 
-  @Test
-  public void caching() {
-    SimpleUtf8Cache cache = create();
+    @Test
+    public void capacity() {
+        SimpleUtf8Cache cache = new SimpleUtf8Cache(128);
+        assertEquals(128, cache.capacity());
+    }
 
-    String value = "bar";
-    byte[] expected = value.getBytes(StandardCharsets.UTF_8);
+    @Test
+    public void maxCapacity() {
+        SimpleUtf8Cache cache = new SimpleUtf8Cache(SimpleUtf8Cache.MAX_CAPACITY + 1);
 
-    byte[] first = cache.getUtf8(value);
-    assertArrayEquals(expected, first);
+        assertEquals(SimpleUtf8Cache.MAX_CAPACITY, cache.capacity());
+    }
 
-    // first request isn't cached - to avoid burning slots
-    byte[] second = cache.getUtf8(value);
-    assertArrayEquals(expected, second);
-    assertNotSame(first, second);
+    @ParameterizedTest
+    @ValueSource(strings = {"foo", "bar", "baz", "quux"})
+    public void getUtf8(String value) {
+        SimpleUtf8Cache cache = create();
 
-    // after first request, the entry should be cached
-    byte[] third = cache.getUtf8(value);
-    assertArrayEquals(expected, third);
-    assertSame(second, third);
+        for (int i = 0; i < 10; ++i) {
+            byte[] valueUtf8 = cache.getUtf8(value);
+            assertArrayEquals(value.getBytes(StandardCharsets.UTF_8), valueUtf8);
+        }
+    }
 
-    assertNotEquals(0, cache.hits);
-  }
+    @Test
+    public void caching() {
+        SimpleUtf8Cache cache = create();
 
-  @Test
-  public void fuzz() {
-    Random random = ThreadLocalRandom.current();
+        String value = "bar";
+        byte[] expected = value.getBytes(StandardCharsets.UTF_8);
 
-    int hits = 0;
+        byte[] first = cache.getUtf8(value);
+        assertArrayEquals(expected, first);
 
-    SimpleUtf8Cache cache = create();
-    for (int i = 0; i < 1_000; ++i) {
-      cache.recalibrate();
+        // first request isn't cached - to avoid burning slots
+        byte[] second = cache.getUtf8(value);
+        assertArrayEquals(expected, second);
+        assertNotSame(first, second);
 
-      int cycles = 500 + random.nextInt(2_000);
-      for (int j = 0; j < cycles; ++j) {
-        String nextTag = nextTag();
-        String nextValue = nextValue();
-        byte[] nextExpected = nextValue.getBytes(StandardCharsets.UTF_8);
+        // after first request, the entry should be cached
+        byte[] third = cache.getUtf8(value);
+        assertArrayEquals(expected, third);
+        assertSame(second, third);
 
-        byte[] nextValueUtf8 = cache.getUtf8(nextValue);
-        assertArrayEquals(nextExpected, nextValueUtf8);
-      }
+        assertNotEquals(0, cache.hits);
+    }
 
-      hits += cache.hits;
+    @Test
+    public void fuzz() {
+        Random random = ThreadLocalRandom.current();
 
-      printStats(cache);
-    }
+        int hits = 0;
 
-    assertNotEquals(0, hits);
-  }
+        SimpleUtf8Cache cache = create();
+        for (int i = 0; i < 1_000; ++i) {
+            cache.recalibrate();
 
-  @Test
-  public void bigString_dont_cache() {
-    String lorem = "Lorem ipsum dolor sit amet";
-    while (lorem.length() <= SimpleUtf8Cache.MAX_ENTRY_LEN) {
-      lorem += lorem;
-    }
-    byte[] expected = lorem.getBytes(StandardCharsets.UTF_8);
+            int cycles = 500 + random.nextInt(2_000);
+            for (int j = 0; j < cycles; ++j) {
+                String nextTag = nextTag();
+                String nextValue = nextValue();
+                byte[] nextExpected = nextValue.getBytes(StandardCharsets.UTF_8);
 
-    SimpleUtf8Cache cache = create();
-    byte[] first = cache.getUtf8(lorem);
-    assertArrayEquals(expected, first);
+                byte[] nextValueUtf8 = cache.getUtf8(nextValue);
+                assertArrayEquals(nextExpected, nextValueUtf8);
+            }
 
-    byte[] second = cache.getUtf8(lorem);
-    assertArrayEquals(expected, second);
-    assertNotSame(first, second);
+            hits += cache.hits;
 
-    for (int i = 0; i < 10; ++i) {
-      byte[] result = cache.getUtf8(lorem);
-      assertArrayEquals(expected, result);
+            printStats(cache);
+        }
 
-      assertNotSame(first, result);
-      assertNotSame(second, result);
+        assertNotEquals(0, hits);
     }
-    assertEquals(0, cache.hits);
-  }
 
-  static final String[] TAGS = {"foo", "bar", "baz"};
+    @Test
+    public void bigString_dont_cache() {
+        String lorem = "Lorem ipsum dolor sit amet";
+        while (lorem.length() <= SimpleUtf8Cache.MAX_ENTRY_LEN) {
+            lorem += lorem;
+        }
+        byte[] expected = lorem.getBytes(StandardCharsets.UTF_8);
+
+        SimpleUtf8Cache cache = create();
+        byte[] first = cache.getUtf8(lorem);
+        assertArrayEquals(expected, first);
+
+        byte[] second = cache.getUtf8(lorem);
+        assertArrayEquals(expected, second);
+        assertNotSame(first, second);
+
+        for (int i = 0; i < 10; ++i) {
+            byte[] result = cache.getUtf8(lorem);
+            assertArrayEquals(expected, result);
+
+            assertNotSame(first, result);
+            assertNotSame(second, result);
+        }
+        assertEquals(0, cache.hits);
+    }
+
+    static final String[] TAGS = {"foo", "bar", "baz"};
 
-  static final String[] BASE_STRINGS = {"Hello", "world", "foo", "bar", "baz", "quux"};
+    static final String[] BASE_STRINGS = {"Hello", "world", "foo", "bar", "baz", "quux"};
 
-  static final String nextTag() {
-    ThreadLocalRandom random = ThreadLocalRandom.current();
+    static final String nextTag() {
+        ThreadLocalRandom random = ThreadLocalRandom.current();
 
-    int tagIndex = random.nextInt(TAGS.length + 1);
-    if (tagIndex >= TAGS.length) {
-      return "tag-" + random.nextInt();
-    } else {
-      return TAGS[tagIndex];
+        int tagIndex = random.nextInt(TAGS.length + 1);
+        if (tagIndex >= TAGS.length) {
+            return "tag-" + random.nextInt();
+        } else {
+            return TAGS[tagIndex];
+        }
     }
-  }
 
-  static final String nextValue() {
-    ThreadLocalRandom random = ThreadLocalRandom.current();
+    static final String nextValue() {
+        ThreadLocalRandom random = ThreadLocalRandom.current();
 
-    if (random.nextDouble() < 0.1) {
-      return Integer.toString(random.nextInt());
-    }
+        if (random.nextDouble() < 0.1) {
+            return Integer.toString(random.nextInt());
+        }
 
-    int baseIndex = random.nextInt(BASE_STRINGS.length);
-    String baseString = BASE_STRINGS[baseIndex];
+        int baseIndex = random.nextInt(BASE_STRINGS.length);
+        String baseString = BASE_STRINGS[baseIndex];
 
-    if (random.nextDouble() < 0.2) {
-      baseString = baseString.toLowerCase();
-    }
+        if (random.nextDouble() < 0.2) {
+            baseString = baseString.toLowerCase();
+        }
 
-    int valueSuffix = random.nextInt(2 * baseIndex + 1);
-    return baseString + valueSuffix;
-  }
+        int valueSuffix = random.nextInt(2 * baseIndex + 1);
+        return baseString + valueSuffix;
+    }
 
-  static final void printStats(SimpleUtf8Cache cache) {
-    System.out.printf("eden hits: %5d\tpromotions: %5d%n", cache.hits, cache.evictions);
-  }
+    static final void printStats(SimpleUtf8Cache cache) {
+        System.out.printf("eden hits: %5d\tpromotions: %5d%n", cache.hits, cache.evictions);
+    }
 }
diff --git a/communication/src/test/java/datadog/communication/serialization/SmokeTest.java b/communication/src/test/java/datadog/communication/serialization/SmokeTest.java
index c646d0b835d..56260307c9f 100644
--- a/communication/src/test/java/datadog/communication/serialization/SmokeTest.java
+++ b/communication/src/test/java/datadog/communication/serialization/SmokeTest.java
@@ -20,102 +20,95 @@
 
 public class SmokeTest {
 
-  static class Foo {
-    long id1;
-    long id2;
-    String name;
-    int[] values;
-    Map<String, Object> tags;
+    static class Foo {
+        long id1;
+        long id2;
+        String name;
+        int[] values;
+        Map<String, Object> tags;
 
-    static Foo create() {
-      Foo foo = new Foo();
-      foo.id1 = ThreadLocalRandom.current().nextLong();
-      foo.id2 = ThreadLocalRandom.current().nextLong();
-      foo.name = UUID.randomUUID().toString();
-      foo.values = new int[10];
-      Arrays.fill(foo.values, ThreadLocalRandom.current().nextInt());
-      foo.tags = new HashMap<>();
-      foo.tags.put("foo", 9f);
-      foo.tags.put("bar", 9d);
-      foo.tags.put("qux", "tag");
-      foo.tags.put("provoke size recalculation", "道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道");
-      foo.tags.put("provoke re-encoding", "Straßenschilder");
-      foo.tags.put("list", Collections.singletonList("element"));
-      return foo;
+        static Foo create() {
+            Foo foo = new Foo();
+            foo.id1 = ThreadLocalRandom.current().nextLong();
+            foo.id2 = ThreadLocalRandom.current().nextLong();
+            foo.name = UUID.randomUUID().toString();
+            foo.values = new int[10];
+            Arrays.fill(foo.values, ThreadLocalRandom.current().nextInt());
+            foo.tags = new HashMap<>();
+            foo.tags.put("foo", 9f);
+            foo.tags.put("bar", 9d);
+            foo.tags.put("qux", "tag");
+            foo.tags.put("provoke size recalculation", "道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道道");
+            foo.tags.put("provoke re-encoding", "Straßenschilder");
+            foo.tags.put("list", Collections.singletonList("element"));
+            return foo;
+        }
     }
-  }
 
-  Map<? extends CharSequence, byte[]> constantPool =
-      new HashMap<CharSequence, byte[]>() {
+    Map<? extends CharSequence, byte[]> constantPool = new HashMap<CharSequence, byte[]>() {
         {
-          put("foo", "foo".getBytes(StandardCharsets.UTF_8));
-          put("id1", "id1".getBytes(StandardCharsets.UTF_8));
+            put("foo", "foo".getBytes(StandardCharsets.UTF_8));
+            put("id1", "id1".getBytes(StandardCharsets.UTF_8));
         }
-      };
-  EncodingCache encodingCache = null;
+    };
+    EncodingCache encodingCache = null;
 
-  @Test
-  public void testWriteMessage() {
-    final Foo message = Foo.create();
-    MsgPackWriter packer =
-        new MsgPackWriter(
-            new FlushingBuffer(
-                1024,
-                (messageCount, buffy) -> {
-                  assertEquals(1, messageCount);
-                  try {
-                    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy);
-                    assertEquals("id1", unpacker.unpackString());
-                    assertEquals(message.id1, unpacker.unpackLong());
-                    assertEquals("id2", unpacker.unpackString());
-                    assertEquals(message.id2, unpacker.unpackLong());
-                    assertEquals("name", unpacker.unpackString());
-                    assertEquals(message.name, unpacker.unpackString());
-                    assertEquals("values", unpacker.unpackString());
-                    int length = unpacker.unpackArrayHeader();
-                    assertEquals(message.values.length, length);
-                    for (int i : message.values) {
-                      assertEquals(i, unpacker.unpackInt());
-                    }
-                    assertEquals("tags", unpacker.unpackString());
-                    int mapHeader = unpacker.unpackMapHeader();
-                    assertEquals(message.tags.size(), mapHeader);
-                    for (int i = 0; i < mapHeader; ++i) {
-                      String key = unpacker.unpackString();
-                      Object expected = message.tags.get(key);
-                      assertNotNull(expected);
-                      if (expected instanceof Float) {
+    @Test
+    public void testWriteMessage() {
+        final Foo message = Foo.create();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, (messageCount, buffy) -> {
+            assertEquals(1, messageCount);
+            try {
+                MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy);
+                assertEquals("id1", unpacker.unpackString());
+                assertEquals(message.id1, unpacker.unpackLong());
+                assertEquals("id2", unpacker.unpackString());
+                assertEquals(message.id2, unpacker.unpackLong());
+                assertEquals("name", unpacker.unpackString());
+                assertEquals(message.name, unpacker.unpackString());
+                assertEquals("values", unpacker.unpackString());
+                int length = unpacker.unpackArrayHeader();
+                assertEquals(message.values.length, length);
+                for (int i : message.values) {
+                    assertEquals(i, unpacker.unpackInt());
+                }
+                assertEquals("tags", unpacker.unpackString());
+                int mapHeader = unpacker.unpackMapHeader();
+                assertEquals(message.tags.size(), mapHeader);
+                for (int i = 0; i < mapHeader; ++i) {
+                    String key = unpacker.unpackString();
+                    Object expected = message.tags.get(key);
+                    assertNotNull(expected);
+                    if (expected instanceof Float) {
                         assertEquals((Float) expected, unpacker.unpackFloat(), 0.0001);
-                      } else if (expected instanceof Double) {
+                    } else if (expected instanceof Double) {
                         assertEquals((Double) expected, unpacker.unpackDouble(), 0.0001);
-                      } else if (expected instanceof List) {
+                    } else if (expected instanceof List) {
                         List<String> l = (List<String>) expected;
                         assertEquals(l.size(), unpacker.unpackArrayHeader());
                         for (String element : l) {
-                          assertEquals(element, unpacker.unpackString());
+                            assertEquals(element, unpacker.unpackString());
                         }
-                      } else if (expected instanceof String) {
+                    } else if (expected instanceof String) {
                         assertEquals(expected, unpacker.unpackString());
-                      }
                     }
-                  } catch (IOException e) {
-                    Assertions.fail(e.getMessage());
-                  }
-                }));
-    packer.format(
-        message,
-        (data, p) -> {
-          p.writeString("id1", encodingCache);
-          p.writeLong(data.id1);
-          p.writeString("id2", encodingCache);
-          p.writeLong(data.id2);
-          p.writeString("name", encodingCache);
-          p.writeString(data.name, encodingCache);
-          p.writeString("values", encodingCache);
-          p.writeObject(data.values, encodingCache);
-          p.writeString("tags", encodingCache);
-          p.writeMap(data.tags, encodingCache);
+                }
+            } catch (IOException e) {
+                Assertions.fail(e.getMessage());
+            }
+        }));
+        packer.format(message, (data, p) -> {
+            p.writeString("id1", encodingCache);
+            p.writeLong(data.id1);
+            p.writeString("id2", encodingCache);
+            p.writeLong(data.id2);
+            p.writeString("name", encodingCache);
+            p.writeString(data.name, encodingCache);
+            p.writeString("values", encodingCache);
+            p.writeObject(data.values, encodingCache);
+            p.writeString("tags", encodingCache);
+            p.writeMap(data.tags, encodingCache);
         });
-    packer.flush();
-  }
+        packer.flush();
+    }
 }
diff --git a/communication/src/test/java/datadog/communication/serialization/StringWritingTest.java b/communication/src/test/java/datadog/communication/serialization/StringWritingTest.java
index 17732d2b9a4..3384c96ac53 100644
--- a/communication/src/test/java/datadog/communication/serialization/StringWritingTest.java
+++ b/communication/src/test/java/datadog/communication/serialization/StringWritingTest.java
@@ -19,146 +19,144 @@
 
 public class StringWritingTest {
 
-  private static final EncodingCache NO_CACHE = null;
+    private static final EncodingCache NO_CACHE = null;
 
-  private static final Map<CharSequence, byte[]> MEMOISATION = new HashMap<>();
-  private static final EncodingCache CACHE =
-      s -> MEMOISATION.computeIfAbsent(s, s1 -> ((String) s1).getBytes(StandardCharsets.UTF_8));
+    private static final Map<CharSequence, byte[]> MEMOISATION = new HashMap<>();
+    private static final EncodingCache CACHE =
+            s -> MEMOISATION.computeIfAbsent(s, s1 -> ((String) s1).getBytes(StandardCharsets.UTF_8));
 
-  private static final int TEN_KB = 10 << 10;
+    private static final int TEN_KB = 10 << 10;
 
-  public static Object[][] maps() {
-    return new Object[][] {
-      {
-        Arrays.asList(
-            new HashMap<String, String>() {
-              {
-                put("english", "bye");
-                put("foo", "bar");
-              }
+    public static Object[][] maps() {
+        return new Object[][] {
+            {
+                Arrays.asList(
+                        new HashMap<String, String>() {
+                            {
+                                put("english", "bye");
+                                put("foo", "bar");
+                            }
+                        },
+                        new HashMap<String, String>() {
+                            {
+                                put("german", "tschüß");
+                                put("foo", "bar");
+                            }
+                        },
+                        new HashMap<String, String>() {
+                            {
+                                put("hani", "道");
+                                put("foo", "bar");
+                            }
+                        },
+                        new HashMap<String, String>() {
+                            {
+                                put("hani", "道道道");
+                                put("foo", "bar");
+                            }
+                        },
+                        new HashMap<String, String>() {
+                            {
+                                put("CJK", "罿潯罿潯罿潯罿潯罿潯");
+                            }
+                        }),
             },
-            new HashMap<String, String>() {
-              {
-                put("german", "tschüß");
-                put("foo", "bar");
-              }
+            {
+                Arrays.asList(
+                        new HashMap<String, String>() {
+                            {
+                                put("123456789012390-2394-3", "alshjdhlasjhLKASJKLDAHsdlkAHSDKLJAHsdklHASDKSa");
+                                put("foo", "bar");
+                            }
+                        },
+                        new HashMap<String, String>() {
+                            {
+                                put("123456789012390-2394-3", "Straßenschilder");
+                                put("foo", "bar");
+                            }
+                        },
+                        new HashMap<String, String>() {
+                            {
+                                put("hani", "道可道非常道名可名非常名");
+                                put("foo", "bar");
+                            }
+                        })
             },
-            new HashMap<String, String>() {
-              {
-                put("hani", "道");
-                put("foo", "bar");
-              }
+            {
+                Arrays.asList(
+                        new HashMap<String, String>() {
+                            {
+                                put(
+                                        "123456789012390-2394-3",
+                                        "ßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßß");
+                                put("foo", "bar");
+                            }
+                        },
+                        new HashMap<String, String>() {
+                            {
+                                put("hani", "道可道非常道名可名非常名名名名名名名名名名名");
+                                put("foo", "bar");
+                            }
+                        })
             },
-            new HashMap<String, String>() {
-              {
-                put("hani", "道道道");
-                put("foo", "bar");
-              }
-            },
-            new HashMap<String, String>() {
-              {
-                put("CJK", "罿潯罿潯罿潯罿潯罿潯");
-              }
-            }),
-      },
-      {
-        Arrays.asList(
-            new HashMap<String, String>() {
-              {
-                put("123456789012390-2394-3", "alshjdhlasjhLKASJKLDAHsdlkAHSDKLJAHsdklHASDKSa");
-                put("foo", "bar");
-              }
-            },
-            new HashMap<String, String>() {
-              {
-                put("123456789012390-2394-3", "Straßenschilder");
-                put("foo", "bar");
-              }
-            },
-            new HashMap<String, String>() {
-              {
-                put("hani", "道可道非常道名可名非常名");
-                put("foo", "bar");
-              }
-            })
-      },
-      {
-        Arrays.asList(
-            new HashMap<String, String>() {
-              {
-                put(
-                    "123456789012390-2394-3",
-                    "ßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßß");
-                put("foo", "bar");
-              }
-            },
-            new HashMap<String, String>() {
-              {
-                put("hani", "道可道非常道名可名非常名名名名名名名名名名名");
-                put("foo", "bar");
-              }
-            })
-      },
-      {
-        Arrays.asList(
-            new HashMap<String, String>() {
-              {
-                put("emoji", "\uD83D\uDC4D");
-                put("foo", "bar");
-              }
-            },
-            new HashMap<String, String>() {
-              {
-                put(
-                    "emoji",
-                    "\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D");
-                put("foo", "bar");
-              }
-            })
-      }
-    };
-  }
+            {
+                Arrays.asList(
+                        new HashMap<String, String>() {
+                            {
+                                put("emoji", "\uD83D\uDC4D");
+                                put("foo", "bar");
+                            }
+                        },
+                        new HashMap<String, String>() {
+                            {
+                                put(
+                                        "emoji",
+                                        "\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D\uD83D\uDC4D");
+                                put("foo", "bar");
+                            }
+                        })
+            }
+        };
+    }
 
-  @ParameterizedTest
-  @MethodSource("maps")
-  public void testSerialiseTextMapWithCache(List<Map<String, String>> maps) {
-    MsgPackWriter packer =
-        new MsgPackWriter(
-            new FlushingBuffer(TEN_KB, (messageCount, buffer) -> testBufferContents(buffer, maps)));
-    for (Map<String, String> map : maps) {
-      packer.format(map, (m, p) -> p.writeMap(m, CACHE));
+    @ParameterizedTest
+    @MethodSource("maps")
+    public void testSerialiseTextMapWithCache(List<Map<String, String>> maps) {
+        MsgPackWriter packer = new MsgPackWriter(
+                new FlushingBuffer(TEN_KB, (messageCount, buffer) -> testBufferContents(buffer, maps)));
+        for (Map<String, String> map : maps) {
+            packer.format(map, (m, p) -> p.writeMap(m, CACHE));
+        }
+        packer.flush();
     }
-    packer.flush();
-  }
 
-  @ParameterizedTest
-  @MethodSource("maps")
-  public void testSerialiseTextMapWithoutCache(List<Map<String, String>> maps) {
-    MsgPackWriter packer =
-        new MsgPackWriter(
-            new FlushingBuffer(TEN_KB, (messageCount, buffer) -> testBufferContents(buffer, maps)));
-    for (Map<String, String> map : maps) {
-      packer.format(map, (m, p) -> p.writeMap(m, NO_CACHE));
+    @ParameterizedTest
+    @MethodSource("maps")
+    public void testSerialiseTextMapWithoutCache(List<Map<String, String>> maps) {
+        MsgPackWriter packer = new MsgPackWriter(
+                new FlushingBuffer(TEN_KB, (messageCount, buffer) -> testBufferContents(buffer, maps)));
+        for (Map<String, String> map : maps) {
+            packer.format(map, (m, p) -> p.writeMap(m, NO_CACHE));
+        }
+        packer.flush();
     }
-    packer.flush();
-  }
 
-  private void testBufferContents(ByteBuffer buffer, List<Map<String, String>> maps) {
-    try {
-      MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer);
-      for (Map<String, String> map : maps) {
-        int mapSize = unpacker.unpackMapHeader();
-        assertEquals(map.size(), mapSize);
-        int pos = 0;
-        while (pos++ < mapSize) {
-          String key = unpacker.unpackString();
-          String expectedValue = map.get(key);
-          assertNotNull(expectedValue);
-          assertEquals(expectedValue, unpacker.unpackString());
+    private void testBufferContents(ByteBuffer buffer, List<Map<String, String>> maps) {
+        try {
+            MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer);
+            for (Map<String, String> map : maps) {
+                int mapSize = unpacker.unpackMapHeader();
+                assertEquals(map.size(), mapSize);
+                int pos = 0;
+                while (pos++ < mapSize) {
+                    String key = unpacker.unpackString();
+                    String expectedValue = map.get(key);
+                    assertNotNull(expectedValue);
+                    assertEquals(expectedValue, unpacker.unpackString());
+                }
+            }
+        } catch (IOException e) {
+            fail(e.getMessage());
         }
-      }
-    } catch (IOException e) {
-      fail(e.getMessage());
     }
-  }
 }
diff --git a/communication/src/test/java/datadog/communication/serialization/msgpack/MsgPackWriterTest.java b/communication/src/test/java/datadog/communication/serialization/msgpack/MsgPackWriterTest.java
index ecd57f010e5..ef04967f306 100644
--- a/communication/src/test/java/datadog/communication/serialization/msgpack/MsgPackWriterTest.java
+++ b/communication/src/test/java/datadog/communication/serialization/msgpack/MsgPackWriterTest.java
@@ -34,959 +34,791 @@
 import org.msgpack.core.MessageUnpacker;
 
 public class MsgPackWriterTest {
-  private static final String NON_ASCII_STRING = "foobár_☺";
-  private static final byte[] NON_ASCII_BYTES = NON_ASCII_STRING.getBytes(UTF_8);
-  private static final int NON_ASCII_BUFFER_CAPACITY = NON_ASCII_BYTES.length + 1;
-
-  @Test
-  public void testOverflow() {
-    MessageFormatter packer = new MsgPackWriter(newBuffer(25, (messageCount, buffer) -> {}));
-    assertFalse(
-        packer.format(
-            new HashMap<String, String>() {
-              {
-                put("foo", "abcdefghijklmnopqrstuvwxyz");
-              }
-            },
-            (Mapper<Map<String, String>>) (data, writable) -> writable.writeObject(data, null)));
-  }
-
-  @Test
-  public void testInsertAfterOverflow() {
-    Mapper<String> mapper = (data, writable) -> writable.writeString(data, null);
-    MessageFormatter packer =
-        new MsgPackWriter(
-            newBuffer(
+    private static final String NON_ASCII_STRING = "foobár_☺";
+    private static final byte[] NON_ASCII_BYTES = NON_ASCII_STRING.getBytes(UTF_8);
+    private static final int NON_ASCII_BUFFER_CAPACITY = NON_ASCII_BYTES.length + 1;
+
+    @Test
+    public void testOverflow() {
+        MessageFormatter packer = new MsgPackWriter(newBuffer(25, (messageCount, buffer) -> {}));
+        assertFalse(packer.format(
+                new HashMap<String, String>() {
+                    {
+                        put("foo", "abcdefghijklmnopqrstuvwxyz");
+                    }
+                },
+                (Mapper<Map<String, String>>) (data, writable) -> writable.writeObject(data, null)));
+    }
+
+    @Test
+    public void testInsertAfterOverflow() {
+        Mapper<String> mapper = (data, writable) -> writable.writeString(data, null);
+        MessageFormatter packer = new MsgPackWriter(newBuffer(
                 2 + 25, // enough space for a 25 element string and its 2 byte header
                 (messageCount, buffer) -> {}));
-    assertTrue(packer.format("abcdefghijklmnopqrstuvwxy", mapper), "data fits in buffer");
-    assertFalse(
-        packer.format("abcdefghijklmnopqrstuvwxyz", mapper), "data doesn't fit in finite buffer");
-    assertTrue(
-        packer.format("abcdefghijklmnopqrstuvwxy", mapper), "data fits in buffer after overflow");
-  }
-
-  @Test
-  public void testMapperResetWhenOversizedMessageRejectedFromEmptyBuffer() {
-    CountingResetMapper mapper = new CountingResetMapper();
-    MessageFormatter packer = new MsgPackWriter(newBuffer(2 + 25, (messageCount, buffer) -> {}));
-    assertFalse(packer.format("abcdefghijklmnopqrstuvwxyz", mapper));
-    assertEquals(1, mapper.resets);
-  }
-
-  @Test
-  public void testMapperResetWhenOversizedMessageRejectedAfterFlush() {
-    CountingResetMapper mapper = new CountingResetMapper();
-    MessageFormatter packer = new MsgPackWriter(newBuffer(2 + 25, (messageCount, buffer) -> {}));
-    assertTrue(packer.format("abc", mapper));
-    assertFalse(packer.format("abcdefghijklmnopqrstuvwxyz", mapper));
-    // once before the retry, once after the retry is rejected
-    assertEquals(2, mapper.resets);
-  }
-
-  private static final class CountingResetMapper implements Mapper<String> {
-    int resets;
-
-    @Override
-    public void map(String data, Writable writable) {
-      writable.writeString(data, null);
-    }
-
-    @Override
-    public void reset() {
-      resets++;
-    }
-  }
-
-  @Test
-  public void testFlushOfOverflow() {
-    final List<String> flushed = new ArrayList<>();
-    Mapper<String> mapper = (data, writable) -> writable.writeString(data, null);
-    MessageFormatter packer =
-        new MsgPackWriter(
-            newBuffer(
+        assertTrue(packer.format("abcdefghijklmnopqrstuvwxy", mapper), "data fits in buffer");
+        assertFalse(packer.format("abcdefghijklmnopqrstuvwxyz", mapper), "data doesn't fit in finite buffer");
+        assertTrue(packer.format("abcdefghijklmnopqrstuvwxy", mapper), "data fits in buffer after overflow");
+    }
+
+    @Test
+    public void testMapperResetWhenOversizedMessageRejectedFromEmptyBuffer() {
+        CountingResetMapper mapper = new CountingResetMapper();
+        MessageFormatter packer = new MsgPackWriter(newBuffer(2 + 25, (messageCount, buffer) -> {}));
+        assertFalse(packer.format("abcdefghijklmnopqrstuvwxyz", mapper));
+        assertEquals(1, mapper.resets);
+    }
+
+    @Test
+    public void testMapperResetWhenOversizedMessageRejectedAfterFlush() {
+        CountingResetMapper mapper = new CountingResetMapper();
+        MessageFormatter packer = new MsgPackWriter(newBuffer(2 + 25, (messageCount, buffer) -> {}));
+        assertTrue(packer.format("abc", mapper));
+        assertFalse(packer.format("abcdefghijklmnopqrstuvwxyz", mapper));
+        // once before the retry, once after the retry is rejected
+        assertEquals(2, mapper.resets);
+    }
+
+    private static final class CountingResetMapper implements Mapper<String> {
+        int resets;
+
+        @Override
+        public void map(String data, Writable writable) {
+            writable.writeString(data, null);
+        }
+
+        @Override
+        public void reset() {
+            resets++;
+        }
+    }
+
+    @Test
+    public void testFlushOfOverflow() {
+        final List<String> flushed = new ArrayList<>();
+        Mapper<String> mapper = (data, writable) -> writable.writeString(data, null);
+        MessageFormatter packer = new MsgPackWriter(newBuffer(
                 2 + 25, // enough space for a 25 element string and its 2 byte header
                 (messageCount, buffer) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
-                    for (int i = 0; i < messageCount; ++i) {
-                      try {
-                        flushed.add(unpacker.unpackString());
-                      } catch (Exception error) {
+                    try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
+                        for (int i = 0; i < messageCount; ++i) {
+                            try {
+                                flushed.add(unpacker.unpackString());
+                            } catch (Exception error) {
+                                fail(error.getMessage());
+                            }
+                        }
+                    } catch (IOException error) {
                         fail(error.getMessage());
-                      }
                     }
-                  } catch (IOException error) {
-                    fail(error.getMessage());
-                  }
                 }));
-    assertTrue(packer.format("abcdefghijklm", mapper), "data fits in buffer");
-    assertTrue(
-        packer.format("nopqrstuvwxyz", mapper), "data fits in empty buffer but triggers flush");
-    assertTrue(
-        packer.format("abcdefghijklmnopqrstuvwxy", mapper), "data fits in buffer after overflow");
-    assertEquals(2, flushed.size());
-    assertEquals("abcdefghijklm", flushed.get(0));
-    assertEquals("nopqrstuvwxyz", flushed.get(1));
-  }
-
-  @Test
-  public void testRecycle() {
-    final AtomicInteger i = new AtomicInteger();
-    Map<String, String> map =
-        new HashMap<String, String>() {
-          {
-            put("foo", "abcd");
-          }
+        assertTrue(packer.format("abcdefghijklm", mapper), "data fits in buffer");
+        assertTrue(packer.format("nopqrstuvwxyz", mapper), "data fits in empty buffer but triggers flush");
+        assertTrue(packer.format("abcdefghijklmnopqrstuvwxy", mapper), "data fits in buffer after overflow");
+        assertEquals(2, flushed.size());
+        assertEquals("abcdefghijklm", flushed.get(0));
+        assertEquals("nopqrstuvwxyz", flushed.get(1));
+    }
+
+    @Test
+    public void testRecycle() {
+        final AtomicInteger i = new AtomicInteger();
+        Map<String, String> map = new HashMap<String, String>() {
+            {
+                put("foo", "abcd");
+            }
         };
-    MsgPackWriter packer =
-        new MsgPackWriter(newBuffer(25, (messageCount, buffer) -> i.getAndIncrement()));
-    Mapper<Object> mapper = (data, writable) -> writable.writeObject(data, null);
-    packer.format(map, mapper);
-    packer.format(map, mapper);
-    packer.format(map, mapper);
-    packer.format(map, mapper);
-    assertEquals(1, i.getAndIncrement());
-  }
-
-  @Test
-  public void testWriteBinary() {
-    final byte[] data = new byte[] {1, 2, 3, 4};
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                25,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    int length = unpacker.unpackBinaryHeader();
-                    assertEquals(4, length);
-                    assertArrayEquals(data, unpacker.readPayload(length));
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(
-        data, (data1, writable) -> writable.writeBinary(data1, 0, data1.length));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteBinaryNoArgVariant() {
-    MsgPackWriter writer =
-        new MsgPackWriter(
-            newBuffer(
-                10,
-                (messageCount, buffer) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
-                    assertEquals(6, unpacker.unpackBinaryHeader());
-                    assertArrayEquals(unpacker.readPayload(6), "foobar".getBytes(UTF_8));
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    writer.writeBinary("foobar".getBytes(UTF_8));
-  }
-
-  @Test
-  public void testWriteBinaryLongPair() {
-    final long hi = 0x1122334455667788L;
-    final long lo = 0x99AABBCCDDEEFF00L;
-    final byte[] data = ByteBuffer.allocate(16).putLong(hi).putLong(lo).array();
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                25,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    int length = unpacker.unpackBinaryHeader();
-                    assertEquals(16, length);
-                    assertArrayEquals(data, unpacker.readPayload(length));
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data, (ignored, writable) -> writable.writeBinary(hi, lo));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteBinaryAsObject() {
-    final byte[] data = new byte[] {1, 2, 3, 4};
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                25,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    int length = unpacker.unpackBinaryHeader();
-                    assertEquals(4, length);
-                    assertArrayEquals(data, unpacker.readPayload(length));
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data, (ba, writable) -> writable.writeObject(ba, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteByteBuffer() {
-    final byte[] data = new byte[] {1, 2, 3, 4};
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                25,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    int length = unpacker.unpackBinaryHeader();
-                    assertEquals(4, length);
-                    assertArrayEquals(data, unpacker.readPayload(length));
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(ByteBuffer.wrap(data), (bb, writable) -> writable.writeBinary(bb));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteByteBufferAsObject() {
-    final byte[] data = new byte[] {1, 2, 3, 4};
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                25,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    int length = unpacker.unpackBinaryHeader();
-                    assertEquals(4, length);
-                    assertArrayEquals(data, unpacker.readPayload(length));
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(
-        ByteBuffer.wrap(data), (bb, writable) -> writable.writeObject(bb, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteNull() {
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                25,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    unpacker.unpackNil();
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(null, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteBooleanAsObject() {
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                25,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertTrue(unpacker.unpackBoolean());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(true, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteBoolean() {
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                25,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertTrue(unpacker.unpackBoolean());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(true, (x, w) -> w.writeBoolean(x));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteGenericNumber() {
-    final BigDecimal data = BigDecimal.valueOf(47.11);
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                25,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals(data.doubleValue(), unpacker.unpackDouble(), 0);
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data, (Mapper<Number>) (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteCharArray() {
-    final String data = "xyz";
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                25,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals(data, unpacker.unpackString());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data.toCharArray(), (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteUTF8ByteString() {
-    final UTF8BytesString utf8BytesString = UTF8BytesString.create("xyz");
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                25,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals("xyz", unpacker.unpackString());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(utf8BytesString, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteBooleanArray() {
-    final boolean[] data = new boolean[] {true, false, true, true};
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                25,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals(4, unpacker.unpackArrayHeader());
-                    for (boolean datum : data) {
-                      assertEquals(datum, unpacker.unpackBoolean());
-                    }
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteFloatArray() {
-    final float[] data = new float[] {0.1f, 0.2f, 0.3f, 0.4f};
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                100,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals(4, unpacker.unpackArrayHeader());
-                    for (float datum : data) {
-                      assertEquals(datum, unpacker.unpackFloat(), 0.001);
-                    }
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteDoubleArray() {
-    final double[] data = new double[] {0.1f, 0.2f, 0.3f, 0.4f};
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                100,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals(4, unpacker.unpackArrayHeader());
-                    for (double datum : data) {
-                      assertEquals(datum, unpacker.unpackDouble(), 0.001);
-                    }
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteLongArray() {
-    final long[] data = new long[] {1, 2, 3, 4};
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                100,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals(4, unpacker.unpackArrayHeader());
-                    for (long datum : data) {
-                      assertEquals(datum, unpacker.unpackLong());
-                    }
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteIntArray() {
-    final int[] data = new int[] {1, 2, 3, 4};
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                100,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals(4, unpacker.unpackArrayHeader());
-                    for (int datum : data) {
-                      assertEquals(datum, unpacker.unpackInt());
-                    }
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteShortArray() {
-    final short[] data = new short[] {1, 2, 3, 4};
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                100,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals(4, unpacker.unpackArrayHeader());
-                    for (short datum : data) {
-                      assertEquals(datum, unpacker.unpackInt());
-                    }
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteLongBoxed() {
-    final long data = 1234L;
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                100,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals(data, unpacker.unpackLong());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteLongPrimitive() {
-    final long data = 1234L;
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                100,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals(data, unpacker.unpackLong());
-                    assertEquals(data, unpacker.unpackLong());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(
-        data,
-        (x, w) -> {
-          w.writeLong(x);
-          w.writeSignedLong(x);
+        MsgPackWriter packer = new MsgPackWriter(newBuffer(25, (messageCount, buffer) -> i.getAndIncrement()));
+        Mapper<Object> mapper = (data, writable) -> writable.writeObject(data, null);
+        packer.format(map, mapper);
+        packer.format(map, mapper);
+        packer.format(map, mapper);
+        packer.format(map, mapper);
+        assertEquals(1, i.getAndIncrement());
+    }
+
+    @Test
+    public void testWriteBinary() {
+        final byte[] data = new byte[] {1, 2, 3, 4};
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(25, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                int length = unpacker.unpackBinaryHeader();
+                assertEquals(4, length);
+                assertArrayEquals(data, unpacker.readPayload(length));
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (data1, writable) -> writable.writeBinary(data1, 0, data1.length));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteBinaryNoArgVariant() {
+        MsgPackWriter writer = new MsgPackWriter(newBuffer(10, (messageCount, buffer) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
+                assertEquals(6, unpacker.unpackBinaryHeader());
+                assertArrayEquals(unpacker.readPayload(6), "foobar".getBytes(UTF_8));
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        writer.writeBinary("foobar".getBytes(UTF_8));
+    }
+
+    @Test
+    public void testWriteBinaryLongPair() {
+        final long hi = 0x1122334455667788L;
+        final long lo = 0x99AABBCCDDEEFF00L;
+        final byte[] data = ByteBuffer.allocate(16).putLong(hi).putLong(lo).array();
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(25, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                int length = unpacker.unpackBinaryHeader();
+                assertEquals(16, length);
+                assertArrayEquals(data, unpacker.readPayload(length));
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (ignored, writable) -> writable.writeBinary(hi, lo));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteBinaryAsObject() {
+        final byte[] data = new byte[] {1, 2, 3, 4};
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(25, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                int length = unpacker.unpackBinaryHeader();
+                assertEquals(4, length);
+                assertArrayEquals(data, unpacker.readPayload(length));
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (ba, writable) -> writable.writeObject(ba, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteByteBuffer() {
+        final byte[] data = new byte[] {1, 2, 3, 4};
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(25, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                int length = unpacker.unpackBinaryHeader();
+                assertEquals(4, length);
+                assertArrayEquals(data, unpacker.readPayload(length));
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(ByteBuffer.wrap(data), (bb, writable) -> writable.writeBinary(bb));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteByteBufferAsObject() {
+        final byte[] data = new byte[] {1, 2, 3, 4};
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(25, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                int length = unpacker.unpackBinaryHeader();
+                assertEquals(4, length);
+                assertArrayEquals(data, unpacker.readPayload(length));
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(ByteBuffer.wrap(data), (bb, writable) -> writable.writeObject(bb, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteNull() {
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(25, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                unpacker.unpackNil();
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(null, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteBooleanAsObject() {
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(25, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertTrue(unpacker.unpackBoolean());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(true, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteBoolean() {
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(25, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertTrue(unpacker.unpackBoolean());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(true, (x, w) -> w.writeBoolean(x));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteGenericNumber() {
+        final BigDecimal data = BigDecimal.valueOf(47.11);
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(25, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals(data.doubleValue(), unpacker.unpackDouble(), 0);
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (Mapper<Number>) (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteCharArray() {
+        final String data = "xyz";
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(25, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals(data, unpacker.unpackString());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data.toCharArray(), (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteUTF8ByteString() {
+        final UTF8BytesString utf8BytesString = UTF8BytesString.create("xyz");
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(25, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals("xyz", unpacker.unpackString());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(utf8BytesString, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteBooleanArray() {
+        final boolean[] data = new boolean[] {true, false, true, true};
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(25, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals(4, unpacker.unpackArrayHeader());
+                for (boolean datum : data) {
+                    assertEquals(datum, unpacker.unpackBoolean());
+                }
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteFloatArray() {
+        final float[] data = new float[] {0.1f, 0.2f, 0.3f, 0.4f};
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(100, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals(4, unpacker.unpackArrayHeader());
+                for (float datum : data) {
+                    assertEquals(datum, unpacker.unpackFloat(), 0.001);
+                }
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteDoubleArray() {
+        final double[] data = new double[] {0.1f, 0.2f, 0.3f, 0.4f};
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(100, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals(4, unpacker.unpackArrayHeader());
+                for (double datum : data) {
+                    assertEquals(datum, unpacker.unpackDouble(), 0.001);
+                }
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteLongArray() {
+        final long[] data = new long[] {1, 2, 3, 4};
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(100, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals(4, unpacker.unpackArrayHeader());
+                for (long datum : data) {
+                    assertEquals(datum, unpacker.unpackLong());
+                }
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteIntArray() {
+        final int[] data = new int[] {1, 2, 3, 4};
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(100, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals(4, unpacker.unpackArrayHeader());
+                for (int datum : data) {
+                    assertEquals(datum, unpacker.unpackInt());
+                }
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteShortArray() {
+        final short[] data = new short[] {1, 2, 3, 4};
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(100, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals(4, unpacker.unpackArrayHeader());
+                for (short datum : data) {
+                    assertEquals(datum, unpacker.unpackInt());
+                }
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteLongBoxed() {
+        final long data = 1234L;
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(100, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals(data, unpacker.unpackLong());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteLongPrimitive() {
+        final long data = 1234L;
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(100, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals(data, unpacker.unpackLong());
+                assertEquals(data, unpacker.unpackLong());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (x, w) -> {
+            w.writeLong(x);
+            w.writeSignedLong(x);
         });
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteNegativeLongPrimitive() {
-    final long data = -1234L;
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                100,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals(data, unpacker.unpackLong());
-                    assertEquals(data, unpacker.unpackLong());
-                    // Can't unpack unsigned long directly as the unpacker refuses negative values
-                    assertEquals(data, unpacker.unpackValue().asNumberValue().toLong());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(
-        data,
-        (x, w) -> {
-          w.writeLong(x);
-          w.writeSignedLong(x);
-          w.writeUnsignedLong(x);
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteNegativeLongPrimitive() {
+        final long data = -1234L;
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(100, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals(data, unpacker.unpackLong());
+                assertEquals(data, unpacker.unpackLong());
+                // Can't unpack unsigned long directly as the unpacker refuses negative values
+                assertEquals(data, unpacker.unpackValue().asNumberValue().toLong());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (x, w) -> {
+            w.writeLong(x);
+            w.writeSignedLong(x);
+            w.writeUnsignedLong(x);
         });
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteIntBoxed() {
-    final int data = 1234;
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                100,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals(data, unpacker.unpackInt());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteIntPrimitive() {
-    final int data = 1234;
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                100,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals(data, unpacker.unpackInt());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data, (x, w) -> w.writeInt(x));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteShortBoxed() {
-    final short data = 1234;
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                100,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals(data, unpacker.unpackInt());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testUnknownObject() {
-    final Object data = Codec.INSTANCE;
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                100,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals(data.toString(), unpacker.unpackString());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteObjectArray() {
-    final Object[] data = new Object[] {"foo", "bar"};
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                100,
-                (messageCount, buffy) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
-                    assertEquals(data.length, unpacker.unpackArrayHeader());
-                    assertEquals(data[0].toString(), unpacker.unpackString());
-                    assertEquals(data[1].toString(), unpacker.unpackString());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testWriteStringUTF8BytesString() {
-    UTF8BytesString value = UTF8BytesString.create(NON_ASCII_STRING);
-    MsgPackWriter writer =
-        new MsgPackWriter(
-            newBuffer(
-                NON_ASCII_BUFFER_CAPACITY * 2,
-                (messageCount, buffer) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
-                    assertEquals(NON_ASCII_STRING, unpacker.unpackString());
-                    assertEquals(NON_ASCII_STRING, unpacker.unpackString());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    writer.writeObjectString(value, null);
-    writer.writeString(value, null);
-  }
-
-  @Test
-  public void testWriteStringNull() {
-    MsgPackWriter writer =
-        new MsgPackWriter(
-            newBuffer(
-                20,
-                (messageCount, buffer) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
-                    unpacker.unpackNil();
-                    unpacker.unpackNil();
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    writer.writeObjectString(null, null);
-    writer.writeString(null, null);
-  }
-
-  @Test
-  public void testWriteObjectStringGeneralPath() {
-    Object value =
-        new Object() {
-          @Override
-          public String toString() {
-            return NON_ASCII_STRING;
-          }
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteIntBoxed() {
+        final int data = 1234;
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(100, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals(data, unpacker.unpackInt());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteIntPrimitive() {
+        final int data = 1234;
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(100, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals(data, unpacker.unpackInt());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (x, w) -> w.writeInt(x));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteShortBoxed() {
+        final short data = 1234;
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(100, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals(data, unpacker.unpackInt());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testUnknownObject() {
+        final Object data = Codec.INSTANCE;
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(100, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals(data.toString(), unpacker.unpackString());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteObjectArray() {
+        final Object[] data = new Object[] {"foo", "bar"};
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(100, (messageCount, buffy) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy)) {
+                assertEquals(data.length, unpacker.unpackArrayHeader());
+                assertEquals(data[0].toString(), unpacker.unpackString());
+                assertEquals(data[1].toString(), unpacker.unpackString());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testWriteStringUTF8BytesString() {
+        UTF8BytesString value = UTF8BytesString.create(NON_ASCII_STRING);
+        MsgPackWriter writer = new MsgPackWriter(newBuffer(NON_ASCII_BUFFER_CAPACITY * 2, (messageCount, buffer) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
+                assertEquals(NON_ASCII_STRING, unpacker.unpackString());
+                assertEquals(NON_ASCII_STRING, unpacker.unpackString());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        writer.writeObjectString(value, null);
+        writer.writeString(value, null);
+    }
+
+    @Test
+    public void testWriteStringNull() {
+        MsgPackWriter writer = new MsgPackWriter(newBuffer(20, (messageCount, buffer) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
+                unpacker.unpackNil();
+                unpacker.unpackNil();
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        writer.writeObjectString(null, null);
+        writer.writeString(null, null);
+    }
+
+    @Test
+    public void testWriteObjectStringGeneralPath() {
+        Object value = new Object() {
+            @Override
+            public String toString() {
+                return NON_ASCII_STRING;
+            }
         };
-    MsgPackWriter writer =
-        new MsgPackWriter(
-            newBuffer(
-                40,
-                (messageCount, buffer) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
-                    assertEquals(NON_ASCII_STRING, unpacker.unpackString());
-                    assertEquals(NON_ASCII_STRING, unpacker.unpackString());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    writer.writeObjectString(value, null);
-    writer.writeObjectString(value, s -> NON_ASCII_BYTES);
-  }
-
-  @Test
-  public void testWriteStringGeneralCharSequence() {
-    MsgPackWriter writer =
-        new MsgPackWriter(
-            newBuffer(
-                NON_ASCII_BUFFER_CAPACITY,
-                (messageCount, buffer) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
-                    assertEquals(NON_ASCII_STRING, unpacker.unpackString());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    CharBuffer charSeq = CharBuffer.wrap(NON_ASCII_STRING);
-    writer.writeString(charSeq, null);
-  }
-
-  @Test
-  public void testWriteStringEncodingCache() {
-    MsgPackWriter writer =
-        new MsgPackWriter(
-            newBuffer(
-                NON_ASCII_BUFFER_CAPACITY,
-                (messageCount, buffer) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
-                    assertEquals(NON_ASCII_STRING, unpacker.unpackString());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    writer.writeString("", s -> NON_ASCII_BYTES);
-  }
-
-  @Test
-  public void testStartArray() {
-    MsgPackWriter writer =
-        new MsgPackWriter(
-            newBuffer(
-                10,
-                (messageCount, buffer) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
-                    assertEquals(1, unpacker.unpackArrayHeader());
-                    assertEquals(0xFFFF, unpacker.unpackArrayHeader());
-                    assertEquals(0x10000, unpacker.unpackArrayHeader());
-                    assertEquals(1, unpacker.unpackArrayHeader());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    writer.startArray(1);
-    writer.startArray(0xFFFF);
-    writer.startArray(0x10000);
-    writer.startStruct(1);
-  }
-
-  @Test
-  public void testStartMap() {
-    MsgPackWriter writer =
-        new MsgPackWriter(
-            newBuffer(
-                10,
-                (messageCount, buffer) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
-                    assertEquals(1, unpacker.unpackMapHeader());
-                    assertEquals(0xFFFF, unpacker.unpackMapHeader());
-                    assertEquals(0x10000, unpacker.unpackMapHeader());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    writer.startMap(1);
-    writer.startMap(0xFFFF);
-    writer.startMap(0x10000);
-  }
-
-  @Test
-  public void testStartStringHeader() {
-    MsgPackWriter writer =
-        new MsgPackWriter(
-            newBuffer(
-                10,
-                (messageCount, buffer) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
-                    assertEquals(1, unpacker.unpackRawStringHeader());
-                    assertEquals(0xFFFF, unpacker.unpackRawStringHeader());
-                    assertEquals(0x10000, unpacker.unpackRawStringHeader());
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    writer.writeStringHeader(1);
-    writer.writeStringHeader(0xFFFF);
-    writer.writeStringHeader(0x10000);
-  }
-
-  @Test
-  public void testStackTraceBatch() {
-    Map<String, List<StackTraceEvent>> batch = new HashMap<>();
-    batch.put("product_key", buildStacktraceEvents());
-    testStackTraceBatch(batch);
-  }
-
-  @Test
-  public void tesEmptyContentInStackTraceBatch() {
-    Map<String, List<StackTraceEvent>> batch = new HashMap<>();
-    testStackTraceBatch(batch);
-  }
-
-  @Test
-  public void testSimpleStackTraceEvent() {
-    final StackTraceFrame frame =
-        new StackTraceFrame(1, new StackTraceElement("class1", "method1", "file1", 1));
-    StackTraceEvent data = new StackTraceEvent(Collections.singletonList(frame), null, null, null);
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                1000,
-                (messageCount, buffer) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
-                    checkStackTraceEvent(data, unpacker);
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  @Test
-  public void testSimpleStackTraceFrame() {
-    final StackTraceFrame frame = new StackTraceFrame(1, null, "null", -1, null, null);
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                1000,
-                (messageCount, buffer) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
-                    checkStackTraceFrame(frame, unpacker);
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(frame, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  private void testStackTraceBatch(final Map<String, List<StackTraceEvent>> batch) {
-    MessageFormatter messageFormatter =
-        new MsgPackWriter(
-            newBuffer(
-                100000,
-                (messageCount, buffer) -> {
-                  try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
-                    checkStackTraceBatch(batch, unpacker);
-                  } catch (IOException e) {
-                    fail(e.getMessage());
-                  }
-                }));
-    messageFormatter.format(batch, (x, w) -> w.writeObject(x, null));
-    messageFormatter.flush();
-  }
-
-  private void checkStackTraceBatch(
-      Map<String, List<StackTraceEvent>> batch, MessageUnpacker unpacker) throws IOException {
-
-    assertEquals(batch.size(), unpacker.unpackMapHeader());
-    if (batch.isEmpty()) {
-      return;
-    }
-    assertEquals("product_key", unpacker.unpackString());
-    List<StackTraceEvent> events = batch.get("product_key");
-    assertEquals(events.size(), unpacker.unpackArrayHeader());
-    for (StackTraceEvent event : events) {
-      checkStackTraceEvent(event, unpacker);
-    }
-  }
-
-  private void checkStackTraceEvent(StackTraceEvent event, MessageUnpacker unpacker)
-      throws IOException {
-    boolean hasId = event.getId() != null && !event.getId().isEmpty();
-    boolean hasLanguage = event.getLanguage() != null && !event.getLanguage().isEmpty();
-    boolean hasMessage = event.getMessage() != null && !event.getMessage().isEmpty();
-    int mapSize = 1 + (hasId ? 1 : 0) + (hasLanguage ? 1 : 0) + (hasMessage ? 1 : 0);
-    assertEquals(mapSize, unpacker.unpackMapHeader());
-    if (hasId) {
-      assertEquals("id", unpacker.unpackString());
-      assertEquals(event.getId(), unpacker.unpackString());
-    }
-    if (hasLanguage) {
-      assertEquals("language", unpacker.unpackString());
-      assertEquals(event.getLanguage(), unpacker.unpackString());
-    }
-    if (hasMessage) {
-      assertEquals("message", unpacker.unpackString());
-      assertEquals(event.getMessage(), unpacker.unpackString());
-    }
-    assertEquals("frames", unpacker.unpackString());
-    assertEquals(event.getFrames().size(), unpacker.unpackArrayHeader());
-    for (StackTraceFrame frame : event.getFrames()) {
-      checkStackTraceFrame(frame, unpacker);
-    }
-  }
-
-  private void checkStackTraceFrame(StackTraceFrame frame, MessageUnpacker unpacker)
-      throws IOException {
-    boolean hasText = frame.getText() != null && !frame.getText().isEmpty();
-    boolean hasFile = frame.getFile() != null && !frame.getFile().isEmpty();
-    boolean hasLine = frame.getLine() != null;
-    boolean hasClass = frame.getClass_name() != null && !frame.getClass_name().isEmpty();
-    boolean hasFunction = frame.getFunction() != null && !frame.getFunction().isEmpty();
-
-    int mapSize = 1; // id is always present
-    if (hasText) {
-      mapSize++;
-    }
-    if (hasFile) {
-      mapSize++;
-    }
-    if (hasLine) {
-      mapSize++;
-    }
-    if (hasClass) {
-      mapSize++;
-    }
-    if (hasFunction) {
-      mapSize++;
-    }
-    assertEquals(mapSize, unpacker.unpackMapHeader());
-    assertEquals("id", unpacker.unpackString());
-    assertEquals(frame.getId(), unpacker.unpackInt());
-    if (hasText) {
-      assertEquals("text", unpacker.unpackString());
-      assertEquals(frame.getText(), unpacker.unpackString());
-    }
-    if (hasFile) {
-      assertEquals("file", unpacker.unpackString());
-      assertEquals(frame.getFile(), unpacker.unpackString());
-    }
-    if (hasLine) {
-      assertEquals("line", unpacker.unpackString());
-      assertEquals(frame.getLine(), unpacker.unpackInt());
-    }
-    if (hasClass) {
-      assertEquals("class_name", unpacker.unpackString());
-      assertEquals(frame.getClass_name(), unpacker.unpackString());
-    }
-    if (hasFunction) {
-      assertEquals("function", unpacker.unpackString());
-      assertEquals(frame.getFunction(), unpacker.unpackString());
-    }
-  }
-
-  private List<StackTraceEvent> buildStacktraceEvents() {
-    final StackTraceFrame frame1 =
-        new StackTraceFrame(1, new StackTraceElement("class1", "method1", "file1", 1));
-    final StackTraceFrame frame2 =
-        new StackTraceFrame(2, new StackTraceElement("class2", "method2", "file2", 2));
-
-    return Arrays.asList(
-        new StackTraceEvent(Arrays.asList(frame1, frame2), DEFAULT_LANGUAGE, "id1", "event1"),
-        new StackTraceEvent(Arrays.asList(frame1, frame2), DEFAULT_LANGUAGE, "id2", "event2"));
-  }
-
-  private StreamingBuffer newBuffer(int capacity, ByteBufferConsumer consumer) {
-    return new FlushingBuffer(capacity, consumer);
-  }
+        MsgPackWriter writer = new MsgPackWriter(newBuffer(40, (messageCount, buffer) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
+                assertEquals(NON_ASCII_STRING, unpacker.unpackString());
+                assertEquals(NON_ASCII_STRING, unpacker.unpackString());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        writer.writeObjectString(value, null);
+        writer.writeObjectString(value, s -> NON_ASCII_BYTES);
+    }
+
+    @Test
+    public void testWriteStringGeneralCharSequence() {
+        MsgPackWriter writer = new MsgPackWriter(newBuffer(NON_ASCII_BUFFER_CAPACITY, (messageCount, buffer) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
+                assertEquals(NON_ASCII_STRING, unpacker.unpackString());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        CharBuffer charSeq = CharBuffer.wrap(NON_ASCII_STRING);
+        writer.writeString(charSeq, null);
+    }
+
+    @Test
+    public void testWriteStringEncodingCache() {
+        MsgPackWriter writer = new MsgPackWriter(newBuffer(NON_ASCII_BUFFER_CAPACITY, (messageCount, buffer) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
+                assertEquals(NON_ASCII_STRING, unpacker.unpackString());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        writer.writeString("", s -> NON_ASCII_BYTES);
+    }
+
+    @Test
+    public void testStartArray() {
+        MsgPackWriter writer = new MsgPackWriter(newBuffer(10, (messageCount, buffer) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
+                assertEquals(1, unpacker.unpackArrayHeader());
+                assertEquals(0xFFFF, unpacker.unpackArrayHeader());
+                assertEquals(0x10000, unpacker.unpackArrayHeader());
+                assertEquals(1, unpacker.unpackArrayHeader());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        writer.startArray(1);
+        writer.startArray(0xFFFF);
+        writer.startArray(0x10000);
+        writer.startStruct(1);
+    }
+
+    @Test
+    public void testStartMap() {
+        MsgPackWriter writer = new MsgPackWriter(newBuffer(10, (messageCount, buffer) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
+                assertEquals(1, unpacker.unpackMapHeader());
+                assertEquals(0xFFFF, unpacker.unpackMapHeader());
+                assertEquals(0x10000, unpacker.unpackMapHeader());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        writer.startMap(1);
+        writer.startMap(0xFFFF);
+        writer.startMap(0x10000);
+    }
+
+    @Test
+    public void testStartStringHeader() {
+        MsgPackWriter writer = new MsgPackWriter(newBuffer(10, (messageCount, buffer) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
+                assertEquals(1, unpacker.unpackRawStringHeader());
+                assertEquals(0xFFFF, unpacker.unpackRawStringHeader());
+                assertEquals(0x10000, unpacker.unpackRawStringHeader());
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        writer.writeStringHeader(1);
+        writer.writeStringHeader(0xFFFF);
+        writer.writeStringHeader(0x10000);
+    }
+
+    @Test
+    public void testStackTraceBatch() {
+        Map<String, List<StackTraceEvent>> batch = new HashMap<>();
+        batch.put("product_key", buildStacktraceEvents());
+        testStackTraceBatch(batch);
+    }
+
+    @Test
+    public void tesEmptyContentInStackTraceBatch() {
+        Map<String, List<StackTraceEvent>> batch = new HashMap<>();
+        testStackTraceBatch(batch);
+    }
+
+    @Test
+    public void testSimpleStackTraceEvent() {
+        final StackTraceFrame frame = new StackTraceFrame(1, new StackTraceElement("class1", "method1", "file1", 1));
+        StackTraceEvent data = new StackTraceEvent(Collections.singletonList(frame), null, null, null);
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(1000, (messageCount, buffer) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
+                checkStackTraceEvent(data, unpacker);
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(data, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    @Test
+    public void testSimpleStackTraceFrame() {
+        final StackTraceFrame frame = new StackTraceFrame(1, null, "null", -1, null, null);
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(1000, (messageCount, buffer) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
+                checkStackTraceFrame(frame, unpacker);
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(frame, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    private void testStackTraceBatch(final Map<String, List<StackTraceEvent>> batch) {
+        MessageFormatter messageFormatter = new MsgPackWriter(newBuffer(100000, (messageCount, buffer) -> {
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)) {
+                checkStackTraceBatch(batch, unpacker);
+            } catch (IOException e) {
+                fail(e.getMessage());
+            }
+        }));
+        messageFormatter.format(batch, (x, w) -> w.writeObject(x, null));
+        messageFormatter.flush();
+    }
+
+    private void checkStackTraceBatch(Map<String, List<StackTraceEvent>> batch, MessageUnpacker unpacker)
+            throws IOException {
+
+        assertEquals(batch.size(), unpacker.unpackMapHeader());
+        if (batch.isEmpty()) {
+            return;
+        }
+        assertEquals("product_key", unpacker.unpackString());
+        List<StackTraceEvent> events = batch.get("product_key");
+        assertEquals(events.size(), unpacker.unpackArrayHeader());
+        for (StackTraceEvent event : events) {
+            checkStackTraceEvent(event, unpacker);
+        }
+    }
+
+    private void checkStackTraceEvent(StackTraceEvent event, MessageUnpacker unpacker) throws IOException {
+        boolean hasId = event.getId() != null && !event.getId().isEmpty();
+        boolean hasLanguage =
+                event.getLanguage() != null && !event.getLanguage().isEmpty();
+        boolean hasMessage = event.getMessage() != null && !event.getMessage().isEmpty();
+        int mapSize = 1 + (hasId ? 1 : 0) + (hasLanguage ? 1 : 0) + (hasMessage ? 1 : 0);
+        assertEquals(mapSize, unpacker.unpackMapHeader());
+        if (hasId) {
+            assertEquals("id", unpacker.unpackString());
+            assertEquals(event.getId(), unpacker.unpackString());
+        }
+        if (hasLanguage) {
+            assertEquals("language", unpacker.unpackString());
+            assertEquals(event.getLanguage(), unpacker.unpackString());
+        }
+        if (hasMessage) {
+            assertEquals("message", unpacker.unpackString());
+            assertEquals(event.getMessage(), unpacker.unpackString());
+        }
+        assertEquals("frames", unpacker.unpackString());
+        assertEquals(event.getFrames().size(), unpacker.unpackArrayHeader());
+        for (StackTraceFrame frame : event.getFrames()) {
+            checkStackTraceFrame(frame, unpacker);
+        }
+    }
+
+    private void checkStackTraceFrame(StackTraceFrame frame, MessageUnpacker unpacker) throws IOException {
+        boolean hasText = frame.getText() != null && !frame.getText().isEmpty();
+        boolean hasFile = frame.getFile() != null && !frame.getFile().isEmpty();
+        boolean hasLine = frame.getLine() != null;
+        boolean hasClass =
+                frame.getClass_name() != null && !frame.getClass_name().isEmpty();
+        boolean hasFunction =
+                frame.getFunction() != null && !frame.getFunction().isEmpty();
+
+        int mapSize = 1; // id is always present
+        if (hasText) {
+            mapSize++;
+        }
+        if (hasFile) {
+            mapSize++;
+        }
+        if (hasLine) {
+            mapSize++;
+        }
+        if (hasClass) {
+            mapSize++;
+        }
+        if (hasFunction) {
+            mapSize++;
+        }
+        assertEquals(mapSize, unpacker.unpackMapHeader());
+        assertEquals("id", unpacker.unpackString());
+        assertEquals(frame.getId(), unpacker.unpackInt());
+        if (hasText) {
+            assertEquals("text", unpacker.unpackString());
+            assertEquals(frame.getText(), unpacker.unpackString());
+        }
+        if (hasFile) {
+            assertEquals("file", unpacker.unpackString());
+            assertEquals(frame.getFile(), unpacker.unpackString());
+        }
+        if (hasLine) {
+            assertEquals("line", unpacker.unpackString());
+            assertEquals(frame.getLine(), unpacker.unpackInt());
+        }
+        if (hasClass) {
+            assertEquals("class_name", unpacker.unpackString());
+            assertEquals(frame.getClass_name(), unpacker.unpackString());
+        }
+        if (hasFunction) {
+            assertEquals("function", unpacker.unpackString());
+            assertEquals(frame.getFunction(), unpacker.unpackString());
+        }
+    }
+
+    private List<StackTraceEvent> buildStacktraceEvents() {
+        final StackTraceFrame frame1 = new StackTraceFrame(1, new StackTraceElement("class1", "method1", "file1", 1));
+        final StackTraceFrame frame2 = new StackTraceFrame(2, new StackTraceElement("class2", "method2", "file2", 2));
+
+        return Arrays.asList(
+                new StackTraceEvent(Arrays.asList(frame1, frame2), DEFAULT_LANGUAGE, "id1", "event1"),
+                new StackTraceEvent(Arrays.asList(frame1, frame2), DEFAULT_LANGUAGE, "id2", "event2"));
+    }
+
+    private StreamingBuffer newBuffer(int capacity, ByteBufferConsumer consumer) {
+        return new FlushingBuffer(capacity, consumer);
+    }
 }
diff --git a/components/context/src/main/java/datadog/context/Context.java b/components/context/src/main/java/datadog/context/Context.java
index 34a07524de8..cabe1c68ab4 100644
--- a/components/context/src/main/java/datadog/context/Context.java
+++ b/components/context/src/main/java/datadog/context/Context.java
@@ -36,145 +36,142 @@
  * @see ContextKey
  */
 public interface Context {
-  /**
-   * Returns the root context.
-   *
-   * @return the initial local context that all contexts extend.
-   */
-  static Context root() {
-    return EmptyContext.INSTANCE;
-  }
+    /**
+     * Returns the root context.
+     *
+     * @return the initial local context that all contexts extend.
+     */
+    static Context root() {
+        return EmptyContext.INSTANCE;
+    }
 
-  /**
-   * Returns the context attached to the current execution unit.
-   *
-   * @return the attached context; {@link #root()} if there is none.
-   */
-  static Context current() {
-    return manager().current();
-  }
+    /**
+     * Returns the context attached to the current execution unit.
+     *
+     * @return the attached context; {@link #root()} if there is none.
+     */
+    static Context current() {
+        return manager().current();
+    }
 
-  /**
-   * Attaches this context to the current execution unit.
-   *
-   * @return a scope to be closed when the context is invalid.
-   */
-  default ContextScope attach() {
-    return manager().attach(this);
-  }
+    /**
+     * Attaches this context to the current execution unit.
+     *
+     * @return a scope to be closed when the context is invalid.
+     */
+    default ContextScope attach() {
+        return manager().attach(this);
+    }
 
-  /**
-   * Swaps this context with the one attached to current execution unit.
-   *
-   * @return the previously attached context; {@link #root()} if there was none.
-   */
-  default Context swap() {
-    return manager().swap(this);
-  }
+    /**
+     * Swaps this context with the one attached to current execution unit.
+     *
+     * @return the previously attached context; {@link #root()} if there was none.
+     */
+    default Context swap() {
+        return manager().swap(this);
+    }
 
-  /**
-   * Returns the context attached to the given carrier object.
-   *
-   * @param carrier the carrier object to get the context from.
-   * @return the attached context; {@link #root()} if there is none.
-   */
-  static Context from(Object carrier) {
-    return binder().from(carrier);
-  }
+    /**
+     * Returns the context attached to the given carrier object.
+     *
+     * @param carrier the carrier object to get the context from.
+     * @return the attached context; {@link #root()} if there is none.
+     */
+    static Context from(Object carrier) {
+        return binder().from(carrier);
+    }
 
-  /**
-   * Attaches this context to the given carrier object.
-   *
-   * @param carrier the object to carry the context.
-   */
-  default void attachTo(Object carrier) {
-    binder().attachTo(carrier, this);
-  }
+    /**
+     * Attaches this context to the given carrier object.
+     *
+     * @param carrier the object to carry the context.
+     */
+    default void attachTo(Object carrier) {
+        binder().attachTo(carrier, this);
+    }
 
-  /**
-   * Detaches the context attached to the given carrier object, leaving it context-less.
-   *
-   * @param carrier the carrier object to detach its context from.
-   * @return the previously attached context; {@link #root()} if there was none.
-   */
-  static Context detachFrom(Object carrier) {
-    return binder().detachFrom(carrier);
-  }
+    /**
+     * Detaches the context attached to the given carrier object, leaving it context-less.
+     *
+     * @param carrier the carrier object to detach its context from.
+     * @return the previously attached context; {@link #root()} if there was none.
+     */
+    static Context detachFrom(Object carrier) {
+        return binder().detachFrom(carrier);
+    }
 
-  /**
-   * Captures this (attached) context so it can be resumed in another execution unit.
-   *
-   * @return continuation capturing this context.
-   */
-  default ContextContinuation capture() {
-    return manager().capture(this);
-  }
+    /**
+     * Captures this (attached) context so it can be resumed in another execution unit.
+     *
+     * @return continuation capturing this context.
+     */
+    default ContextContinuation capture() {
+        return manager().capture(this);
+    }
 
-  /**
-   * Gets the value stored in this context under the given key.
-   *
-   * @param <T> the type of the value.
-   * @param key the key used to store the value.
-   * @return the value stored under the key; {@code null} if there is none.
-   */
-  @Nullable
-  <T> T get(ContextKey<T> key);
+    /**
+     * Gets the value stored in this context under the given key.
+     *
+     * @param <T> the type of the value.
+     * @param key the key used to store the value.
+     * @return the value stored under the key; {@code null} if there is none.
+     */
+    @Nullable
+    <T> T get(ContextKey<T> key);
 
-  /**
-   * Creates a copy of this context with the given key-value set.
-   *
-   * <p>Existing value with the given key will be replaced. Mapping to a {@code null} value will
-   * remove the key-value from the context copy.
-   *
-   * @param <T> the type of the value.
-   * @param key the key to store the value.
-   * @param value the value to store.
-   * @return a new context with the key-value set.
-   */
-  <T> Context with(ContextKey<T> key, @Nullable T value);
+    /**
+     * Creates a copy of this context with the given key-value set.
+     *
+     * <p>Existing value with the given key will be replaced. Mapping to a {@code null} value will
+     * remove the key-value from the context copy.
+     *
+     * @param <T> the type of the value.
+     * @param key the key to store the value.
+     * @param value the value to store.
+     * @return a new context with the key-value set.
+     */
+    <T> Context with(ContextKey<T> key, @Nullable T value);
 
-  /**
-   * Creates a copy of this context with the given pair of key-values.
-   *
-   * <p>Existing values with the given keys will be replaced. Mapping to a {@code null} value will
-   * remove the key-value from the context copy.
-   *
-   * @param <T> the type of the first value.
-   * @param <U> the type of the second value.
-   * @param firstKey the first key to store the first value.
-   * @param firstValue the first value to store.
-   * @param secondKey the second key to store the second value.
-   * @param secondValue the second value to store.
-   * @return a new context with the pair of key-values set.
-   */
-  default <T, U> Context with(
-      ContextKey<T> firstKey,
-      @Nullable T firstValue,
-      ContextKey<U> secondKey,
-      @Nullable U secondValue) {
-    return with(firstKey, firstValue).with(secondKey, secondValue);
-  }
+    /**
+     * Creates a copy of this context with the given pair of key-values.
+     *
+     * <p>Existing values with the given keys will be replaced. Mapping to a {@code null} value will
+     * remove the key-value from the context copy.
+     *
+     * @param <T> the type of the first value.
+     * @param <U> the type of the second value.
+     * @param firstKey the first key to store the first value.
+     * @param firstValue the first value to store.
+     * @param secondKey the second key to store the second value.
+     * @param secondValue the second value to store.
+     * @return a new context with the pair of key-values set.
+     */
+    default <T, U> Context with(
+            ContextKey<T> firstKey, @Nullable T firstValue, ContextKey<U> secondKey, @Nullable U secondValue) {
+        return with(firstKey, firstValue).with(secondKey, secondValue);
+    }
 
-  /**
-   * Creates a copy of this context with the implicit key is mapped to the value.
-   *
-   * @param value the value to store.
-   * @return a new context with the implicitly keyed value set.
-   * @see #with(ContextKey, Object)
-   */
-  default Context with(@Nullable ImplicitContextKeyed value) {
-    if (value == null) {
-      return this;
+    /**
+     * Creates a copy of this context with the implicit key is mapped to the value.
+     *
+     * @param value the value to store.
+     * @return a new context with the implicitly keyed value set.
+     * @see #with(ContextKey, Object)
+     */
+    default Context with(@Nullable ImplicitContextKeyed value) {
+        if (value == null) {
+            return this;
+        }
+        return value.storeInto(this);
     }
-    return value.storeInto(this);
-  }
 
-  /**
-   * Wraps context as a scope without attaching it to the current execution unit.
-   *
-   * @return a scope that has no effect on execution units.
-   */
-  default ContextScope asScope() {
-    return new NoopContextScope(this);
-  }
+    /**
+     * Wraps context as a scope without attaching it to the current execution unit.
+     *
+     * @return a scope that has no effect on execution units.
+     */
+    default ContextScope asScope() {
+        return new NoopContextScope(this);
+    }
 }
diff --git a/components/context/src/main/java/datadog/context/ContextBinder.java b/components/context/src/main/java/datadog/context/ContextBinder.java
index 8a268028c52..0bc71ec2f81 100644
--- a/components/context/src/main/java/datadog/context/ContextBinder.java
+++ b/components/context/src/main/java/datadog/context/ContextBinder.java
@@ -2,48 +2,48 @@
 
 /** Binds context to carrier objects. */
 public interface ContextBinder {
-  /**
-   * Returns the context attached to the given carrier object.
-   *
-   * @param carrier the carrier object to get the context from.
-   * @return the attached context; {@link Context#root()} if there is none.
-   */
-  Context from(Object carrier);
+    /**
+     * Returns the context attached to the given carrier object.
+     *
+     * @param carrier the carrier object to get the context from.
+     * @return the attached context; {@link Context#root()} if there is none.
+     */
+    Context from(Object carrier);
 
-  /**
-   * Attaches the given context to the given carrier object.
-   *
-   * @param carrier the object to carry the context.
-   * @param context the context to attach.
-   */
-  void attachTo(Object carrier, Context context);
+    /**
+     * Attaches the given context to the given carrier object.
+     *
+     * @param carrier the object to carry the context.
+     * @param context the context to attach.
+     */
+    void attachTo(Object carrier, Context context);
 
-  /**
-   * Detaches the context attached to the given carrier object, leaving it context-less.
-   *
-   * @param carrier the carrier object to detach its context from.
-   * @return the previously attached context; {@link Context#root()} if there was none.
-   */
-  Context detachFrom(Object carrier);
+    /**
+     * Detaches the context attached to the given carrier object, leaving it context-less.
+     *
+     * @param carrier the carrier object to detach its context from.
+     * @return the previously attached context; {@link Context#root()} if there was none.
+     */
+    Context detachFrom(Object carrier);
 
-  /**
-   * Requests use of a custom {@link ContextBinder}.
-   *
-   * <p>Once the registered binder is used it cannot be replaced and this method will have no
-   * effect. To test different binders, make sure {@link #allowTesting()} is called early on.
-   *
-   * @param binder the binder to use.
-   */
-  static void register(ContextBinder binder) {
-    ContextProviders.customBinder = binder;
-  }
+    /**
+     * Requests use of a custom {@link ContextBinder}.
+     *
+     * <p>Once the registered binder is used it cannot be replaced and this method will have no
+     * effect. To test different binders, make sure {@link #allowTesting()} is called early on.
+     *
+     * @param binder the binder to use.
+     */
+    static void register(ContextBinder binder) {
+        ContextProviders.customBinder = binder;
+    }
 
-  /**
-   * Allow re-registration of custom {@link ContextBinder}s for testing.
-   *
-   * @return {@code true} if re-registration is allowed; otherwise {@code false}
-   */
-  static boolean allowTesting() {
-    return TestContextBinder.register();
-  }
+    /**
+     * Allow re-registration of custom {@link ContextBinder}s for testing.
+     *
+     * @return {@code true} if re-registration is allowed; otherwise {@code false}
+     */
+    static boolean allowTesting() {
+        return TestContextBinder.register();
+    }
 }
diff --git a/components/context/src/main/java/datadog/context/ContextContinuation.java b/components/context/src/main/java/datadog/context/ContextContinuation.java
index c516a7b35bf..713ebab1777 100644
--- a/components/context/src/main/java/datadog/context/ContextContinuation.java
+++ b/components/context/src/main/java/datadog/context/ContextContinuation.java
@@ -49,31 +49,31 @@
  */
 public interface ContextContinuation {
 
-  /**
-   * Optional builder method to stop {@link #resume()} from implicitly releasing the captured
-   * context. This is useful when multiple threads may concurrently resume the context. You must
-   * then explicitly {@link #release() release} the context once all threads are resumed/done.
-   *
-   * @return this continuation, but with implicit release-after-resume turned off.
-   */
-  ContextContinuation hold();
+    /**
+     * Optional builder method to stop {@link #resume()} from implicitly releasing the captured
+     * context. This is useful when multiple threads may concurrently resume the context. You must
+     * then explicitly {@link #release() release} the context once all threads are resumed/done.
+     *
+     * @return this continuation, but with implicit release-after-resume turned off.
+     */
+    ContextContinuation hold();
 
-  /**
-   * Returns the context captured by this continuation.
-   *
-   * @return the captured context.
-   */
-  Context context();
+    /**
+     * Returns the context captured by this continuation.
+     *
+     * @return the captured context.
+     */
+    Context context();
 
-  /**
-   * Resumes the context captured by this continuation by attaching it to the current execution
-   * unit. Implicitly {@link #release() releases} the captured context at the end of the resumed
-   * scope, unless {@link #hold()} was called when creating the continuation.
-   *
-   * @return a scope to be closed when the resumed context is invalid.
-   */
-  ContextScope resume();
+    /**
+     * Resumes the context captured by this continuation by attaching it to the current execution
+     * unit. Implicitly {@link #release() releases} the captured context at the end of the resumed
+     * scope, unless {@link #hold()} was called when creating the continuation.
+     *
+     * @return a scope to be closed when the resumed context is invalid.
+     */
+    ContextScope resume();
 
-  /** Explicitly releases the context captured by this continuation. */
-  void release();
+    /** Explicitly releases the context captured by this continuation. */
+    void release();
 }
diff --git a/components/context/src/main/java/datadog/context/ContextHelpers.java b/components/context/src/main/java/datadog/context/ContextHelpers.java
index 12eddf91e99..20cb513f91d 100644
--- a/components/context/src/main/java/datadog/context/ContextHelpers.java
+++ b/components/context/src/main/java/datadog/context/ContextHelpers.java
@@ -32,134 +32,134 @@
  * where {@link #CURRENT} denotes a carrier with the current context.
  */
 public final class ContextHelpers {
-  /** A helper object carrying the {@link Context#current()} context. */
-  public static final Object CURRENT = new Object();
+    /** A helper object carrying the {@link Context#current()} context. */
+    public static final Object CURRENT = new Object();
 
-  private ContextHelpers() {}
+    private ContextHelpers() {}
 
-  /**
-   * Find the first context value from given context carriers.
-   *
-   * @param key The key used to store the value.
-   * @param carriers The carrier to get context and value from.
-   * @param <T> The type of the value to look for.
-   * @return The first context value found, {@code null} if not found.
-   */
-  public static <T> T findFirst(ContextKey<T> key, Object... carriers) {
-    requireNonNull(key, "key cannot be null");
-    for (Object carrier : carriers) {
-      requireNonNull(carrier, "carrier cannot be null");
-      Context context = carrier == CURRENT ? Context.current() : Context.from(carrier);
-      T value = context.get(key);
-      if (value != null) {
-        return value;
-      }
+    /**
+     * Find the first context value from given context carriers.
+     *
+     * @param key The key used to store the value.
+     * @param carriers The carrier to get context and value from.
+     * @param <T> The type of the value to look for.
+     * @return The first context value found, {@code null} if not found.
+     */
+    public static <T> T findFirst(ContextKey<T> key, Object... carriers) {
+        requireNonNull(key, "key cannot be null");
+        for (Object carrier : carriers) {
+            requireNonNull(carrier, "carrier cannot be null");
+            Context context = carrier == CURRENT ? Context.current() : Context.from(carrier);
+            T value = context.get(key);
+            if (value != null) {
+                return value;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  /**
-   * Find all the context values from the given context carriers.
-   *
-   * @param key The key used to store the value.
-   * @param carriers The carriers to get context and value from.
-   * @param <T> The type of the values to look for.
-   * @return A list of all values found, in context order.
-   */
-  public static <T> List<T> findAll(ContextKey<T> key, Object... carriers) {
-    requireNonNull(key, "key cannot be null");
-    List<T> values = new ArrayList<>(carriers.length);
-    for (Object carrier : carriers) {
-      requireNonNull(carrier, "carrier cannot be null");
-      Context context = carrier == CURRENT ? Context.current() : Context.from(carrier);
-      T value = context.get(key);
-      if (value != null) {
-        values.add(value);
-      }
+    /**
+     * Find all the context values from the given context carriers.
+     *
+     * @param key The key used to store the value.
+     * @param carriers The carriers to get context and value from.
+     * @param <T> The type of the values to look for.
+     * @return A list of all values found, in context order.
+     */
+    public static <T> List<T> findAll(ContextKey<T> key, Object... carriers) {
+        requireNonNull(key, "key cannot be null");
+        List<T> values = new ArrayList<>(carriers.length);
+        for (Object carrier : carriers) {
+            requireNonNull(carrier, "carrier cannot be null");
+            Context context = carrier == CURRENT ? Context.current() : Context.from(carrier);
+            T value = context.get(key);
+            if (value != null) {
+                values.add(value);
+            }
+        }
+        return values;
     }
-    return values;
-  }
-
-  /**
-   * Combine contexts and their values, keeping the first founds.
-   *
-   * @param contexts The contexts to combine.
-   * @return A context containing all the values from all the given context, keeping the first value
-   *     found for a given key.
-   */
-  public static Context combine(Context... contexts) {
-    return combine(ContextHelpers::combineKeepingFirst, contexts);
-  }
 
-  /**
-   * Combine multiple contexts into a single one.
-   *
-   * @param combiner The context combiner, taking already combined context as first parameter, any
-   *     following one as second parameter, and returning the combined context.
-   * @param contexts The contexts to combine.
-   * @return The combined context.
-   */
-  public static Context combine(BinaryOperator<Context> combiner, Context... contexts) {
-    requireNonNull(combiner, "combiner cannot be null");
-    Context result = new IndexedContext(new Object[0]);
-    for (Context context : contexts) {
-      requireNonNull(context, "context cannot be null");
-      result = combiner.apply(result, context);
+    /**
+     * Combine contexts and their values, keeping the first founds.
+     *
+     * @param contexts The contexts to combine.
+     * @return A context containing all the values from all the given context, keeping the first value
+     *     found for a given key.
+     */
+    public static Context combine(Context... contexts) {
+        return combine(ContextHelpers::combineKeepingFirst, contexts);
     }
-    return result;
-  }
 
-  private static Context combineKeepingFirst(Context current, Context next) {
-    if (!(current instanceof IndexedContext)) {
-      throw new IllegalStateException("Left context is supposed to be an IndexedContext");
+    /**
+     * Combine multiple contexts into a single one.
+     *
+     * @param combiner The context combiner, taking already combined context as first parameter, any
+     *     following one as second parameter, and returning the combined context.
+     * @param contexts The contexts to combine.
+     * @return The combined context.
+     */
+    public static Context combine(BinaryOperator<Context> combiner, Context... contexts) {
+        requireNonNull(combiner, "combiner cannot be null");
+        Context result = new IndexedContext(new Object[0]);
+        for (Context context : contexts) {
+            requireNonNull(context, "context cannot be null");
+            result = combiner.apply(result, context);
+        }
+        return result;
     }
-    IndexedContext currentIndexed = (IndexedContext) current;
-    if (next instanceof EmptyContext) {
-      return current;
-    } else if (next instanceof SingletonContext) {
-      SingletonContext nextSingleton = (SingletonContext) next;
-      // Check if the single next value is already define in current so next context can be skipped
-      if (nextSingleton.index < currentIndexed.store.length
-          && currentIndexed.store[nextSingleton.index] != null) {
-        return current;
-      }
-      // Always store next value otherwise
-      Object[] store =
-          copyOfRange(
-              currentIndexed.store, 0, max(currentIndexed.store.length, nextSingleton.index + 1));
-      store[nextSingleton.index] = nextSingleton.value;
-      return new IndexedContext(store);
-    } else if (next instanceof IndexedContext) {
-      IndexedContext nextIndexed = (IndexedContext) next;
-      // Don't prematurely allocate store. Only allocate if:
-      // * nextIndexed has more values that currentIndexed,
-      //   so the additional values will always be kept
-      // * nextIndexed has values that currentIndexed do not have
-      Object[] store = null;
-      // Allocate store if nextIndexed has more elements than currentIndexed
-      if (nextIndexed.store.length > currentIndexed.store.length) {
-        store = copyOfRange(currentIndexed.store, 0, nextIndexed.store.length);
-      }
-      // Apply nextIndexed values if not set in currentIndexed
-      for (int i = 0; i < currentIndexed.store.length; i++) {
-        Object nextValue = nextIndexed.store[i];
-        if (nextValue != null && currentIndexed.store[i] == null) {
-          if (store == null) {
-            store = copyOfRange(currentIndexed.store, 0, currentIndexed.store.length);
-          }
-          store[i] = nextValue;
+
+    private static Context combineKeepingFirst(Context current, Context next) {
+        if (!(current instanceof IndexedContext)) {
+            throw new IllegalStateException("Left context is supposed to be an IndexedContext");
         }
-      }
-      // Apply any additional values from nextIndexed if any
-      for (int i = currentIndexed.store.length; i < nextIndexed.store.length; i++) {
-        Object nextValue = nextIndexed.store[i];
-        if (nextValue != null) {
-          store[i] = nextValue;
+        IndexedContext currentIndexed = (IndexedContext) current;
+        if (next instanceof EmptyContext) {
+            return current;
+        } else if (next instanceof SingletonContext) {
+            SingletonContext nextSingleton = (SingletonContext) next;
+            // Check if the single next value is already define in current so next context can be skipped
+            if (nextSingleton.index < currentIndexed.store.length
+                    && currentIndexed.store[nextSingleton.index] != null) {
+                return current;
+            }
+            // Always store next value otherwise
+            Object[] store =
+                    copyOfRange(currentIndexed.store, 0, max(currentIndexed.store.length, nextSingleton.index + 1));
+            store[nextSingleton.index] = nextSingleton.value;
+            return new IndexedContext(store);
+        } else if (next instanceof IndexedContext) {
+            IndexedContext nextIndexed = (IndexedContext) next;
+            // Don't prematurely allocate store. Only allocate if:
+            // * nextIndexed has more values that currentIndexed,
+            //   so the additional values will always be kept
+            // * nextIndexed has values that currentIndexed do not have
+            Object[] store = null;
+            // Allocate store if nextIndexed has more elements than currentIndexed
+            if (nextIndexed.store.length > currentIndexed.store.length) {
+                store = copyOfRange(currentIndexed.store, 0, nextIndexed.store.length);
+            }
+            // Apply nextIndexed values if not set in currentIndexed
+            for (int i = 0; i < currentIndexed.store.length; i++) {
+                Object nextValue = nextIndexed.store[i];
+                if (nextValue != null && currentIndexed.store[i] == null) {
+                    if (store == null) {
+                        store = copyOfRange(currentIndexed.store, 0, currentIndexed.store.length);
+                    }
+                    store[i] = nextValue;
+                }
+            }
+            // Apply any additional values from nextIndexed if any
+            for (int i = currentIndexed.store.length; i < nextIndexed.store.length; i++) {
+                Object nextValue = nextIndexed.store[i];
+                if (nextValue != null) {
+                    store[i] = nextValue;
+                }
+            }
+            // If store was not allocated, no value from nextIndexed was taken
+            return store == null ? current : new IndexedContext(store);
         }
-      }
-      // If store was not allocated, no value from nextIndexed was taken
-      return store == null ? current : new IndexedContext(store);
+        throw new IllegalStateException(
+                "Unsupported context type: " + next.getClass().getName());
     }
-    throw new IllegalStateException("Unsupported context type: " + next.getClass().getName());
-  }
 }
diff --git a/components/context/src/main/java/datadog/context/ContextKey.java b/components/context/src/main/java/datadog/context/ContextKey.java
index 2576fec4a50..1be87dcf549 100644
--- a/components/context/src/main/java/datadog/context/ContextKey.java
+++ b/components/context/src/main/java/datadog/context/ContextKey.java
@@ -9,38 +9,38 @@
  * share its key for re-use or implement {@link ImplicitContextKeyed} to keep its key private.
  */
 public final class ContextKey<T> {
-  private static final AtomicInteger NEXT_INDEX = new AtomicInteger(0);
-
-  /** The key name, for debugging purpose only. */
-  private final String name;
-
-  /** The key unique context, related to {@link IndexedContext} implementation. */
-  final int index;
-
-  private ContextKey(String name) {
-    this.name = name;
-    this.index = NEXT_INDEX.getAndIncrement();
-  }
-
-  /**
-   * Creates a new key with the given name.
-   *
-   * @param name the key name, for debugging purpose only.
-   * @return the newly created unique key.
-   */
-  public static <T> ContextKey<T> named(String name) {
-    return new ContextKey<>(name);
-  }
-
-  @Override
-  public int hashCode() {
-    return this.index;
-  }
-
-  // we want identity equality, so no need to override equals()
-
-  @Override
-  public String toString() {
-    return this.name;
-  }
+    private static final AtomicInteger NEXT_INDEX = new AtomicInteger(0);
+
+    /** The key name, for debugging purpose only. */
+    private final String name;
+
+    /** The key unique context, related to {@link IndexedContext} implementation. */
+    final int index;
+
+    private ContextKey(String name) {
+        this.name = name;
+        this.index = NEXT_INDEX.getAndIncrement();
+    }
+
+    /**
+     * Creates a new key with the given name.
+     *
+     * @param name the key name, for debugging purpose only.
+     * @return the newly created unique key.
+     */
+    public static <T> ContextKey<T> named(String name) {
+        return new ContextKey<>(name);
+    }
+
+    @Override
+    public int hashCode() {
+        return this.index;
+    }
+
+    // we want identity equality, so no need to override equals()
+
+    @Override
+    public String toString() {
+        return this.name;
+    }
 }
diff --git a/components/context/src/main/java/datadog/context/ContextListener.java b/components/context/src/main/java/datadog/context/ContextListener.java
index f657fb769aa..85a832662fc 100644
--- a/components/context/src/main/java/datadog/context/ContextListener.java
+++ b/components/context/src/main/java/datadog/context/ContextListener.java
@@ -3,25 +3,25 @@
 /** Listener of context events. */
 public interface ContextListener {
 
-  /**
-   * Notifies that the context has been updated for the current execution unit.
-   *
-   * @param before the context before.
-   * @param after the context after.
-   */
-  default void onUpdate(Context before, Context after) {}
+    /**
+     * Notifies that the context has been updated for the current execution unit.
+     *
+     * @param before the context before.
+     * @param after the context after.
+     */
+    default void onUpdate(Context before, Context after) {}
 
-  /**
-   * Notifies that the given context has been captured by a continuation.
-   *
-   * @param context the captured context.
-   */
-  default void onCapture(Context context) {}
+    /**
+     * Notifies that the given context has been captured by a continuation.
+     *
+     * @param context the captured context.
+     */
+    default void onCapture(Context context) {}
 
-  /**
-   * Notifies that the given context has been released from a continuation.
-   *
-   * @param context the released context.
-   */
-  default void onRelease(Context context) {}
+    /**
+     * Notifies that the given context has been released from a continuation.
+     *
+     * @param context the released context.
+     */
+    default void onRelease(Context context) {}
 }
diff --git a/components/context/src/main/java/datadog/context/ContextManager.java b/components/context/src/main/java/datadog/context/ContextManager.java
index 6828352d1d4..66ae8151c27 100644
--- a/components/context/src/main/java/datadog/context/ContextManager.java
+++ b/components/context/src/main/java/datadog/context/ContextManager.java
@@ -4,70 +4,70 @@
 
 /** Manages context across execution units. */
 public interface ContextManager {
-  /**
-   * Returns the context attached to the current execution unit.
-   *
-   * @return the attached context; {@link Context#root()} if there is none.
-   */
-  Context current();
+    /**
+     * Returns the context attached to the current execution unit.
+     *
+     * @return the attached context; {@link Context#root()} if there is none.
+     */
+    Context current();
 
-  /**
-   * Attaches the given context to the current execution unit.
-   *
-   * @param context the context to attach.
-   * @return a scope to be closed when the context is invalid.
-   */
-  ContextScope attach(Context context);
+    /**
+     * Attaches the given context to the current execution unit.
+     *
+     * @param context the context to attach.
+     * @return a scope to be closed when the context is invalid.
+     */
+    ContextScope attach(Context context);
 
-  /**
-   * Swaps the given context with the one attached to current execution unit.
-   *
-   * @param context the context to swap.
-   * @return the previously attached context; {@link Context#root()} if there was none.
-   */
-  Context swap(Context context);
+    /**
+     * Swaps the given context with the one attached to current execution unit.
+     *
+     * @param context the context to swap.
+     * @return the previously attached context; {@link Context#root()} if there was none.
+     */
+    Context swap(Context context);
 
-  /**
-   * Captures the given (attached) context so it can be resumed in another execution unit.
-   *
-   * @return continuation capturing the context.
-   */
-  ContextContinuation capture(Context context);
+    /**
+     * Captures the given (attached) context so it can be resumed in another execution unit.
+     *
+     * @return continuation capturing the context.
+     */
+    ContextContinuation capture(Context context);
 
-  /**
-   * Registers the given listener to receive context events.
-   *
-   * @param listener the listener to register
-   */
-  void addListener(ContextListener listener);
+    /**
+     * Registers the given listener to receive context events.
+     *
+     * @param listener the listener to register
+     */
+    void addListener(ContextListener listener);
 
-  /**
-   * Registers the given listener to receive context events.
-   *
-   * @param listener the listener to register.
-   */
-  static void register(ContextListener listener) {
-    manager().addListener(listener);
-  }
+    /**
+     * Registers the given listener to receive context events.
+     *
+     * @param listener the listener to register.
+     */
+    static void register(ContextListener listener) {
+        manager().addListener(listener);
+    }
 
-  /**
-   * Requests use of a custom {@link ContextManager}.
-   *
-   * <p>Once the registered manager is used it cannot be replaced and this method will have no
-   * effect. To test different managers, make sure {@link #allowTesting()} is called early on.
-   *
-   * @param manager the manager to use.
-   */
-  static void register(ContextManager manager) {
-    ContextProviders.customManager = manager;
-  }
+    /**
+     * Requests use of a custom {@link ContextManager}.
+     *
+     * <p>Once the registered manager is used it cannot be replaced and this method will have no
+     * effect. To test different managers, make sure {@link #allowTesting()} is called early on.
+     *
+     * @param manager the manager to use.
+     */
+    static void register(ContextManager manager) {
+        ContextProviders.customManager = manager;
+    }
 
-  /**
-   * Allow re-registration of custom {@link ContextManager}s for testing.
-   *
-   * @return {@code true} if re-registration is allowed; otherwise {@code false}
-   */
-  static boolean allowTesting() {
-    return TestContextManager.register();
-  }
+    /**
+     * Allow re-registration of custom {@link ContextManager}s for testing.
+     *
+     * @return {@code true} if re-registration is allowed; otherwise {@code false}
+     */
+    static boolean allowTesting() {
+        return TestContextManager.register();
+    }
 }
diff --git a/components/context/src/main/java/datadog/context/ContextProviders.java b/components/context/src/main/java/datadog/context/ContextProviders.java
index a7431eaa196..69b99df8761 100644
--- a/components/context/src/main/java/datadog/context/ContextProviders.java
+++ b/components/context/src/main/java/datadog/context/ContextProviders.java
@@ -3,28 +3,26 @@
 /** Provides {@link ContextManager} and {@link ContextBinder} implementations. */
 final class ContextProviders {
 
-  static volatile ContextManager customManager;
-  static volatile ContextBinder customBinder;
+    static volatile ContextManager customManager;
+    static volatile ContextBinder customBinder;
 
-  private static final class ProvidedManager {
-    static final ContextManager INSTANCE =
-        null != ContextProviders.customManager
-            ? ContextProviders.customManager
-            : ThreadLocalContextManager.INSTANCE;
-  }
+    private static final class ProvidedManager {
+        static final ContextManager INSTANCE = null != ContextProviders.customManager
+                ? ContextProviders.customManager
+                : ThreadLocalContextManager.INSTANCE;
+    }
 
-  private static final class ProvidedBinder {
-    static final ContextBinder INSTANCE =
-        null != ContextProviders.customBinder
-            ? ContextProviders.customBinder
-            : ObjectStoreContextBinder.INSTANCE;
-  }
+    private static final class ProvidedBinder {
+        static final ContextBinder INSTANCE = null != ContextProviders.customBinder
+                ? ContextProviders.customBinder
+                : ObjectStoreContextBinder.INSTANCE;
+    }
 
-  static ContextManager manager() {
-    return ProvidedManager.INSTANCE; // may be overridden by instrumentation
-  }
+    static ContextManager manager() {
+        return ProvidedManager.INSTANCE; // may be overridden by instrumentation
+    }
 
-  static ContextBinder binder() {
-    return ProvidedBinder.INSTANCE; // may be overridden by instrumentation
-  }
+    static ContextBinder binder() {
+        return ProvidedBinder.INSTANCE; // may be overridden by instrumentation
+    }
 }
diff --git a/components/context/src/main/java/datadog/context/ContextScope.java b/components/context/src/main/java/datadog/context/ContextScope.java
index 7788a077615..799a1c27f9e 100644
--- a/components/context/src/main/java/datadog/context/ContextScope.java
+++ b/components/context/src/main/java/datadog/context/ContextScope.java
@@ -2,10 +2,10 @@
 
 /** Controls the validity of context attached to an execution unit. */
 public interface ContextScope extends AutoCloseable {
-  /** Returns the context controlled by this scope. */
-  Context context();
+    /** Returns the context controlled by this scope. */
+    Context context();
 
-  /** Detaches the context from the execution unit. */
-  @Override
-  void close();
+    /** Detaches the context from the execution unit. */
+    @Override
+    void close();
 }
diff --git a/components/context/src/main/java/datadog/context/EmptyContext.java b/components/context/src/main/java/datadog/context/EmptyContext.java
index e9fee391373..459215bc6d4 100644
--- a/components/context/src/main/java/datadog/context/EmptyContext.java
+++ b/components/context/src/main/java/datadog/context/EmptyContext.java
@@ -6,27 +6,27 @@
 
 /** {@link Context} containing no values. */
 final class EmptyContext implements SelfScopedContext {
-  static final Context INSTANCE = new EmptyContext();
+    static final Context INSTANCE = new EmptyContext();
 
-  private EmptyContext() {}
+    private EmptyContext() {}
 
-  @Override
-  @Nullable
-  public <T> T get(ContextKey<T> key) {
-    return null;
-  }
+    @Override
+    @Nullable
+    public <T> T get(ContextKey<T> key) {
+        return null;
+    }
 
-  @Override
-  public <T> Context with(ContextKey<T> key, @Nullable T value) {
-    requireNonNull(key, "Context key cannot be null");
-    if (value == null) {
-      return this;
+    @Override
+    public <T> Context with(ContextKey<T> key, @Nullable T value) {
+        requireNonNull(key, "Context key cannot be null");
+        if (value == null) {
+            return this;
+        }
+        return new SingletonContext(key.index, value);
     }
-    return new SingletonContext(key.index, value);
-  }
 
-  @Override
-  public String toString() {
-    return "EmptyContext{}";
-  }
+    @Override
+    public String toString() {
+        return "EmptyContext{}";
+    }
 }
diff --git a/components/context/src/main/java/datadog/context/ImplicitContextKeyed.java b/components/context/src/main/java/datadog/context/ImplicitContextKeyed.java
index cdc4107d01a..596967a54ad 100644
--- a/components/context/src/main/java/datadog/context/ImplicitContextKeyed.java
+++ b/components/context/src/main/java/datadog/context/ImplicitContextKeyed.java
@@ -2,12 +2,12 @@
 
 /** {@link Context} value that has its own implicit {@link ContextKey}. */
 public interface ImplicitContextKeyed {
-  /**
-   * Creates a new context with this value under its chosen key.
-   *
-   * @param context the context to copy the original values from.
-   * @return the new context with the implicitly keyed value.
-   * @see Context#with(ImplicitContextKeyed)
-   */
-  Context storeInto(Context context);
+    /**
+     * Creates a new context with this value under its chosen key.
+     *
+     * @param context the context to copy the original values from.
+     * @return the new context with the implicitly keyed value.
+     * @see Context#with(ImplicitContextKeyed)
+     */
+    Context storeInto(Context context);
 }
diff --git a/components/context/src/main/java/datadog/context/IndexedContext.java b/components/context/src/main/java/datadog/context/IndexedContext.java
index d4590b6f859..3903f16f1d9 100644
--- a/components/context/src/main/java/datadog/context/IndexedContext.java
+++ b/components/context/src/main/java/datadog/context/IndexedContext.java
@@ -9,50 +9,50 @@
 
 /** {@link Context} containing many values. */
 final class IndexedContext implements SelfScopedContext {
-  final Object[] store;
-
-  IndexedContext(Object[] store) {
-    this.store = store;
-  }
-
-  @Override
-  @Nullable
-  @SuppressWarnings("unchecked")
-  public <T> T get(ContextKey<T> key) {
-    requireNonNull(key, "Context key cannot be null");
-    int index = key.index;
-    return index < this.store.length ? (T) this.store[index] : null;
-  }
-
-  @Override
-  public <T> Context with(ContextKey<T> key, @Nullable T value) {
-    requireNonNull(key, "Context key cannot be null");
-    int index = key.index;
-    if (index < this.store.length && this.store[index] == value) {
-      return this;
+    final Object[] store;
+
+    IndexedContext(Object[] store) {
+        this.store = store;
+    }
+
+    @Override
+    @Nullable
+    @SuppressWarnings("unchecked")
+    public <T> T get(ContextKey<T> key) {
+        requireNonNull(key, "Context key cannot be null");
+        int index = key.index;
+        return index < this.store.length ? (T) this.store[index] : null;
+    }
+
+    @Override
+    public <T> Context with(ContextKey<T> key, @Nullable T value) {
+        requireNonNull(key, "Context key cannot be null");
+        int index = key.index;
+        if (index < this.store.length && this.store[index] == value) {
+            return this;
+        }
+        Object[] newStore = copyOfRange(this.store, 0, max(this.store.length, index + 1));
+        newStore[index] = value;
+        return new IndexedContext(newStore);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        IndexedContext that = (IndexedContext) o;
+        return Arrays.equals(this.store, that.store);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 31;
+        result = 31 * result + Arrays.hashCode(this.store);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "IndexedContext{store=" + Arrays.toString(this.store) + '}';
     }
-    Object[] newStore = copyOfRange(this.store, 0, max(this.store.length, index + 1));
-    newStore[index] = value;
-    return new IndexedContext(newStore);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    IndexedContext that = (IndexedContext) o;
-    return Arrays.equals(this.store, that.store);
-  }
-
-  @Override
-  public int hashCode() {
-    int result = 31;
-    result = 31 * result + Arrays.hashCode(this.store);
-    return result;
-  }
-
-  @Override
-  public String toString() {
-    return "IndexedContext{store=" + Arrays.toString(this.store) + '}';
-  }
 }
diff --git a/components/context/src/main/java/datadog/context/NoopContextContinuation.java b/components/context/src/main/java/datadog/context/NoopContextContinuation.java
index 02ede9b862d..e7d20f73e65 100644
--- a/components/context/src/main/java/datadog/context/NoopContextContinuation.java
+++ b/components/context/src/main/java/datadog/context/NoopContextContinuation.java
@@ -2,30 +2,30 @@
 
 /** {@link ContextContinuation} that has no effect on execution units. */
 final class NoopContextContinuation implements ContextContinuation, ContextScope {
-  private final Context context;
+    private final Context context;
 
-  NoopContextContinuation(Context context) {
-    this.context = context;
-  }
+    NoopContextContinuation(Context context) {
+        this.context = context;
+    }
 
-  @Override
-  public ContextContinuation hold() {
-    return this;
-  }
+    @Override
+    public ContextContinuation hold() {
+        return this;
+    }
 
-  @Override
-  public Context context() {
-    return context;
-  }
+    @Override
+    public Context context() {
+        return context;
+    }
 
-  @Override
-  public ContextScope resume() {
-    return this; // acts as no-op scope, avoiding allocation
-  }
+    @Override
+    public ContextScope resume() {
+        return this; // acts as no-op scope, avoiding allocation
+    }
 
-  @Override
-  public void release() {}
+    @Override
+    public void release() {}
 
-  @Override
-  public void close() {}
+    @Override
+    public void close() {}
 }
diff --git a/components/context/src/main/java/datadog/context/NoopContextScope.java b/components/context/src/main/java/datadog/context/NoopContextScope.java
index 648221036c5..266d2f490ee 100644
--- a/components/context/src/main/java/datadog/context/NoopContextScope.java
+++ b/components/context/src/main/java/datadog/context/NoopContextScope.java
@@ -2,17 +2,17 @@
 
 /** {@link ContextScope} that has no effect on execution units. */
 final class NoopContextScope implements ContextScope {
-  private final Context context;
+    private final Context context;
 
-  NoopContextScope(Context context) {
-    this.context = context;
-  }
+    NoopContextScope(Context context) {
+        this.context = context;
+    }
 
-  @Override
-  public Context context() {
-    return context;
-  }
+    @Override
+    public Context context() {
+        return context;
+    }
 
-  @Override
-  public void close() {}
+    @Override
+    public void close() {}
 }
diff --git a/components/context/src/main/java/datadog/context/ObjectStoreContextBinder.java b/components/context/src/main/java/datadog/context/ObjectStoreContextBinder.java
index d9af1947033..847e39a4c9f 100644
--- a/components/context/src/main/java/datadog/context/ObjectStoreContextBinder.java
+++ b/components/context/src/main/java/datadog/context/ObjectStoreContextBinder.java
@@ -7,29 +7,28 @@
 
 /** {@link ContextBinder} that uses {@link ObjectStore} to track context carriers. */
 final class ObjectStoreContextBinder implements ContextBinder {
-  static final ContextBinder INSTANCE = new ObjectStoreContextBinder();
+    static final ContextBinder INSTANCE = new ObjectStoreContextBinder();
 
-  private static final ObjectStore<Object, Context> CONTEXT_STORE =
-      ObjectStore.of(Object.class, Context.class);
+    private static final ObjectStore<Object, Context> CONTEXT_STORE = ObjectStore.of(Object.class, Context.class);
 
-  @Override
-  public Context from(Object carrier) {
-    requireNonNull(carrier, "Context carrier cannot be null");
-    Context bound = CONTEXT_STORE.get(carrier);
-    return null != bound ? bound : root();
-  }
+    @Override
+    public Context from(Object carrier) {
+        requireNonNull(carrier, "Context carrier cannot be null");
+        Context bound = CONTEXT_STORE.get(carrier);
+        return null != bound ? bound : root();
+    }
 
-  @Override
-  public void attachTo(Object carrier, Context context) {
-    requireNonNull(carrier, "Context carrier cannot be null");
-    requireNonNull(context, "Context cannot be null. Use detachFrom() instead.");
-    CONTEXT_STORE.put(carrier, context);
-  }
+    @Override
+    public void attachTo(Object carrier, Context context) {
+        requireNonNull(carrier, "Context carrier cannot be null");
+        requireNonNull(context, "Context cannot be null. Use detachFrom() instead.");
+        CONTEXT_STORE.put(carrier, context);
+    }
 
-  @Override
-  public Context detachFrom(Object carrier) {
-    requireNonNull(carrier, "Context key cannot be null");
-    Context previous = CONTEXT_STORE.remove(carrier);
-    return null != previous ? previous : root();
-  }
+    @Override
+    public Context detachFrom(Object carrier) {
+        requireNonNull(carrier, "Context key cannot be null");
+        Context previous = CONTEXT_STORE.remove(carrier);
+        return null != previous ? previous : root();
+    }
 }
diff --git a/components/context/src/main/java/datadog/context/SelfScopedContext.java b/components/context/src/main/java/datadog/context/SelfScopedContext.java
index f19dbf98b73..047d05f1ddd 100644
--- a/components/context/src/main/java/datadog/context/SelfScopedContext.java
+++ b/components/context/src/main/java/datadog/context/SelfScopedContext.java
@@ -2,16 +2,16 @@
 
 /** Context that acts as its own unattached scope. */
 public interface SelfScopedContext extends Context, ContextScope {
-  @Override
-  default ContextScope asScope() {
-    return this; // acts as no-op scope, avoiding allocation
-  }
+    @Override
+    default ContextScope asScope() {
+        return this; // acts as no-op scope, avoiding allocation
+    }
 
-  @Override
-  default Context context() {
-    return this;
-  }
+    @Override
+    default Context context() {
+        return this;
+    }
 
-  @Override
-  default void close() {}
+    @Override
+    default void close() {}
 }
diff --git a/components/context/src/main/java/datadog/context/SingletonContext.java b/components/context/src/main/java/datadog/context/SingletonContext.java
index 300c9247798..3d31654bc1f 100644
--- a/components/context/src/main/java/datadog/context/SingletonContext.java
+++ b/components/context/src/main/java/datadog/context/SingletonContext.java
@@ -8,60 +8,60 @@
 
 /** {@link Context} containing a single value. */
 final class SingletonContext implements SelfScopedContext {
-  final int index;
-  final Object value;
+    final int index;
+    final Object value;
 
-  SingletonContext(int index, Object value) {
-    this.index = index;
-    this.value = value;
-  }
+    SingletonContext(int index, Object value) {
+        this.index = index;
+        this.value = value;
+    }
 
-  @Override
-  @Nullable
-  @SuppressWarnings("unchecked")
-  public <V> V get(ContextKey<V> key) {
-    requireNonNull(key, "Context key cannot be null");
-    return this.index == key.index ? (V) this.value : null;
-  }
+    @Override
+    @Nullable
+    @SuppressWarnings("unchecked")
+    public <V> V get(ContextKey<V> key) {
+        requireNonNull(key, "Context key cannot be null");
+        return this.index == key.index ? (V) this.value : null;
+    }
 
-  @Override
-  public <V> Context with(ContextKey<V> secondKey, @Nullable V secondValue) {
-    requireNonNull(secondKey, "Context key cannot be null");
-    int secondIndex = secondKey.index;
-    if (this.index == secondIndex) {
-      if (secondValue == null) {
-        return EmptyContext.INSTANCE;
-      } else if (secondValue != this.value) {
-        return new SingletonContext(this.index, secondValue);
-      } else {
-        return this;
-      }
-    } else {
-      Object[] store = new Object[max(this.index, secondIndex) + 1];
-      store[this.index] = this.value;
-      store[secondIndex] = secondValue;
-      return new IndexedContext(store);
+    @Override
+    public <V> Context with(ContextKey<V> secondKey, @Nullable V secondValue) {
+        requireNonNull(secondKey, "Context key cannot be null");
+        int secondIndex = secondKey.index;
+        if (this.index == secondIndex) {
+            if (secondValue == null) {
+                return EmptyContext.INSTANCE;
+            } else if (secondValue != this.value) {
+                return new SingletonContext(this.index, secondValue);
+            } else {
+                return this;
+            }
+        } else {
+            Object[] store = new Object[max(this.index, secondIndex) + 1];
+            store[this.index] = this.value;
+            store[secondIndex] = secondValue;
+            return new IndexedContext(store);
+        }
     }
-  }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    SingletonContext that = (SingletonContext) o;
-    return this.index == that.index && Objects.equals(this.value, that.value);
-  }
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        SingletonContext that = (SingletonContext) o;
+        return this.index == that.index && Objects.equals(this.value, that.value);
+    }
 
-  @Override
-  public int hashCode() {
-    int result = 31;
-    result = 31 * result + this.index;
-    result = 31 * result + Objects.hashCode(this.value);
-    return result;
-  }
+    @Override
+    public int hashCode() {
+        int result = 31;
+        result = 31 * result + this.index;
+        result = 31 * result + Objects.hashCode(this.value);
+        return result;
+    }
 
-  @Override
-  public String toString() {
-    return "SingletonContext{" + "index=" + this.index + ", value=" + this.value + '}';
-  }
+    @Override
+    public String toString() {
+        return "SingletonContext{" + "index=" + this.index + ", value=" + this.value + '}';
+    }
 }
diff --git a/components/context/src/main/java/datadog/context/TestContextBinder.java b/components/context/src/main/java/datadog/context/TestContextBinder.java
index 8717019d9cd..18774465965 100644
--- a/components/context/src/main/java/datadog/context/TestContextBinder.java
+++ b/components/context/src/main/java/datadog/context/TestContextBinder.java
@@ -2,38 +2,38 @@
 
 /** Test class that always delegates to the latest registered {@link ContextBinder}. */
 final class TestContextBinder implements ContextBinder {
-  private static final ContextBinder TEST_INSTANCE = new TestContextBinder();
+    private static final ContextBinder TEST_INSTANCE = new TestContextBinder();
 
-  private TestContextBinder() {}
+    private TestContextBinder() {}
 
-  static boolean register() {
-    // attempt to register before binder choice is locked, then check if we succeeded
-    ContextProviders.customBinder = TEST_INSTANCE;
-    return ContextProviders.binder() == TEST_INSTANCE;
-  }
+    static boolean register() {
+        // attempt to register before binder choice is locked, then check if we succeeded
+        ContextProviders.customBinder = TEST_INSTANCE;
+        return ContextProviders.binder() == TEST_INSTANCE;
+    }
 
-  @Override
-  public Context from(Object carrier) {
-    return delegate().from(carrier);
-  }
+    @Override
+    public Context from(Object carrier) {
+        return delegate().from(carrier);
+    }
 
-  @Override
-  public void attachTo(Object carrier, Context context) {
-    delegate().attachTo(carrier, context);
-  }
+    @Override
+    public void attachTo(Object carrier, Context context) {
+        delegate().attachTo(carrier, context);
+    }
 
-  @Override
-  public Context detachFrom(Object carrier) {
-    return delegate().detachFrom(carrier);
-  }
+    @Override
+    public Context detachFrom(Object carrier) {
+        return delegate().detachFrom(carrier);
+    }
 
-  private static ContextBinder delegate() {
-    ContextBinder delegate = ContextProviders.customBinder;
-    if (delegate == TEST_INSTANCE) {
-      // fall back to default context binder
-      return ObjectStoreContextBinder.INSTANCE;
-    } else {
-      return delegate;
+    private static ContextBinder delegate() {
+        ContextBinder delegate = ContextProviders.customBinder;
+        if (delegate == TEST_INSTANCE) {
+            // fall back to default context binder
+            return ObjectStoreContextBinder.INSTANCE;
+        } else {
+            return delegate;
+        }
     }
-  }
 }
diff --git a/components/context/src/main/java/datadog/context/TestContextManager.java b/components/context/src/main/java/datadog/context/TestContextManager.java
index a0b1302653c..f2e3c653e09 100644
--- a/components/context/src/main/java/datadog/context/TestContextManager.java
+++ b/components/context/src/main/java/datadog/context/TestContextManager.java
@@ -2,52 +2,52 @@
 
 /** Test class that always delegates to the latest registered {@link ContextManager}. */
 final class TestContextManager implements ContextManager {
-  private static final ContextManager TEST_INSTANCE = new TestContextManager();
-
-  private TestContextManager() {}
-
-  static boolean register() {
-    // attempt to register before manager choice is locked, then check if we succeeded
-    ContextProviders.customManager = TEST_INSTANCE;
-    return ContextProviders.manager() == TEST_INSTANCE;
-  }
-
-  @Override
-  public Context current() {
-    return delegate().current();
-  }
-
-  @Override
-  public ContextScope attach(Context context) {
-    return delegate().attach(context);
-  }
-
-  @Override
-  public Context swap(Context context) {
-    return delegate().swap(context);
-  }
-
-  @Override
-  public ContextContinuation capture(Context context) {
-    return delegate().capture(context);
-  }
-
-  @Override
-  public void addListener(ContextListener listener) {
-    delegate().addListener(listener);
-  }
-
-  static void clearListeners() {
-    ThreadLocalContextManager.INSTANCE.clearListeners();
-  }
-
-  private static ContextManager delegate() {
-    ContextManager delegate = ContextProviders.customManager;
-    if (delegate == TEST_INSTANCE) {
-      // fall back to default context manager
-      return ThreadLocalContextManager.INSTANCE;
-    } else {
-      return delegate;
-    }
-  }
+    private static final ContextManager TEST_INSTANCE = new TestContextManager();
+
+    private TestContextManager() {}
+
+    static boolean register() {
+        // attempt to register before manager choice is locked, then check if we succeeded
+        ContextProviders.customManager = TEST_INSTANCE;
+        return ContextProviders.manager() == TEST_INSTANCE;
+    }
+
+    @Override
+    public Context current() {
+        return delegate().current();
+    }
+
+    @Override
+    public ContextScope attach(Context context) {
+        return delegate().attach(context);
+    }
+
+    @Override
+    public Context swap(Context context) {
+        return delegate().swap(context);
+    }
+
+    @Override
+    public ContextContinuation capture(Context context) {
+        return delegate().capture(context);
+    }
+
+    @Override
+    public void addListener(ContextListener listener) {
+        delegate().addListener(listener);
+    }
+
+    static void clearListeners() {
+        ThreadLocalContextManager.INSTANCE.clearListeners();
+    }
+
+    private static ContextManager delegate() {
+        ContextManager delegate = ContextProviders.customManager;
+        if (delegate == TEST_INSTANCE) {
+            // fall back to default context manager
+            return ThreadLocalContextManager.INSTANCE;
+        } else {
+            return delegate;
+        }
+    }
 }
diff --git a/components/context/src/main/java/datadog/context/ThreadLocalContextManager.java b/components/context/src/main/java/datadog/context/ThreadLocalContextManager.java
index ccb3a641565..f97cdb29efe 100644
--- a/components/context/src/main/java/datadog/context/ThreadLocalContextManager.java
+++ b/components/context/src/main/java/datadog/context/ThreadLocalContextManager.java
@@ -6,263 +6,262 @@
 
 /** {@link ContextManager} that uses a {@link ThreadLocal} to track context per thread. */
 final class ThreadLocalContextManager implements ContextManager {
-  static final ThreadLocalContextManager INSTANCE = new ThreadLocalContextManager();
-
-  private static final ThreadLocal<ContextHolder> CONTEXT_HOLDER =
-      ThreadLocal.withInitial(ContextHolder::new);
-
-  private static final NoopContextContinuation ROOT_CONTINUATION =
-      new NoopContextContinuation(Context.root());
-
-  private final Object listenersWriteLock = new Object();
-  volatile ContextListener[] listeners = {};
-
-  @Override
-  public Context current() {
-    return CONTEXT_HOLDER.get().current;
-  }
-
-  @Override
-  public ContextScope attach(Context context) {
-    return doAttach(context, null);
-  }
-
-  ContextScope doAttach(Context context, @Nullable ContextContinuationImpl continuation) {
-    ContextHolder holder = CONTEXT_HOLDER.get();
-
-    Context beforeAttach = holder.current;
-    if (context == beforeAttach) {
-      if (continuation != null) {
-        // already attached, safe to release early to avoid resource leak
-        continuation.releaseOnScopeClose();
-        return continuation; // acts as no-op scope, avoiding allocation
-      }
-      return context.asScope(); // convert to scope without attaching
-    }
+    static final ThreadLocalContextManager INSTANCE = new ThreadLocalContextManager();
 
-    holder.current = context;
-    notifyUpdate(listeners, beforeAttach, context);
-    return continuation == null
-        ? new ContextScopeImpl(context, holder, beforeAttach)
-        : new ResumedScopeImpl(context, holder, beforeAttach, continuation);
-  }
+    private static final ThreadLocal<ContextHolder> CONTEXT_HOLDER = ThreadLocal.withInitial(ContextHolder::new);
 
-  @Override
-  public Context swap(Context context) {
-    ContextHolder holder = CONTEXT_HOLDER.get();
+    private static final NoopContextContinuation ROOT_CONTINUATION = new NoopContextContinuation(Context.root());
 
-    Context beforeSwap = holder.current;
-    if (context == beforeSwap) {
-      return beforeSwap;
-    }
+    private final Object listenersWriteLock = new Object();
+    volatile ContextListener[] listeners = {};
 
-    holder.current = context;
-    notifyUpdate(listeners, beforeSwap, context);
-    return beforeSwap;
-  }
-
-  @Override
-  public ContextContinuation capture(Context context) {
-    return context == Context.root() ? ROOT_CONTINUATION : new ContextContinuationImpl(context);
-  }
-
-  @Override
-  public void addListener(ContextListener listener) {
-    synchronized (listenersWriteLock) {
-      for (ContextListener l : listeners) {
-        if (l == listener) {
-          return;
-        }
-      }
-      int oldLength = listeners.length;
-      ContextListener[] update = Arrays.copyOf(listeners, oldLength + 1);
-      update[oldLength] = listener;
-      listeners = update;
+    @Override
+    public Context current() {
+        return CONTEXT_HOLDER.get().current;
     }
-  }
 
-  void clearListeners() {
-    synchronized (listenersWriteLock) {
-      listeners = new ContextListener[] {};
-    }
-  }
-
-  static void notifyUpdate(ContextListener[] listeners, Context before, Context after) {
-    for (ContextListener l : listeners) {
-      try {
-        l.onUpdate(before, after);
-      } catch (Throwable ignore) {
-      }
-    }
-  }
-
-  static void notifyCapture(ContextListener[] listeners, Context context) {
-    // only called for non-empty continuations
-    for (ContextListener l : listeners) {
-      try {
-        l.onCapture(context);
-      } catch (Throwable ignore) {
-      }
-    }
-  }
-
-  static void notifyRelease(ContextListener[] listeners, Context context) {
-    // only called for non-empty continuations
-    for (ContextListener l : listeners) {
-      try {
-        l.onRelease(context);
-      } catch (Throwable ignore) {
-      }
+    @Override
+    public ContextScope attach(Context context) {
+        return doAttach(context, null);
     }
-  }
-
-  private static class ContextScopeImpl implements ContextScope {
-
-    private final Context context;
-    private final ContextHolder holder;
-    private final Context beforeAttach;
 
-    private boolean closed;
+    ContextScope doAttach(Context context, @Nullable ContextContinuationImpl continuation) {
+        ContextHolder holder = CONTEXT_HOLDER.get();
+
+        Context beforeAttach = holder.current;
+        if (context == beforeAttach) {
+            if (continuation != null) {
+                // already attached, safe to release early to avoid resource leak
+                continuation.releaseOnScopeClose();
+                return continuation; // acts as no-op scope, avoiding allocation
+            }
+            return context.asScope(); // convert to scope without attaching
+        }
 
-    ContextScopeImpl(Context context, ContextHolder holder, Context beforeAttach) {
-      this.context = context;
-      this.holder = holder;
-      this.beforeAttach = beforeAttach;
+        holder.current = context;
+        notifyUpdate(listeners, beforeAttach, context);
+        return continuation == null
+                ? new ContextScopeImpl(context, holder, beforeAttach)
+                : new ResumedScopeImpl(context, holder, beforeAttach, continuation);
     }
 
     @Override
-    public final Context context() {
-      return context;
+    public Context swap(Context context) {
+        ContextHolder holder = CONTEXT_HOLDER.get();
+
+        Context beforeSwap = holder.current;
+        if (context == beforeSwap) {
+            return beforeSwap;
+        }
+
+        holder.current = context;
+        notifyUpdate(listeners, beforeSwap, context);
+        return beforeSwap;
     }
 
     @Override
-    public void close() {
-      // check for out-of-order close to avoid corrupting the current state
-      if (!closed && context == holder.current) {
-        holder.current = beforeAttach;
-        notifyUpdate(INSTANCE.listeners, context, beforeAttach);
-        closed = true;
-      }
-    }
-  }
-
-  private static final class ResumedScopeImpl extends ContextScopeImpl {
-    @Nullable private ContextContinuationImpl continuation;
-
-    ResumedScopeImpl(
-        Context context,
-        ContextHolder holder,
-        Context beforeAttach,
-        @Nullable ContextContinuationImpl continuation) {
-      super(context, holder, beforeAttach);
-      this.continuation = continuation;
+    public ContextContinuation capture(Context context) {
+        return context == Context.root() ? ROOT_CONTINUATION : new ContextContinuationImpl(context);
     }
 
     @Override
-    public void close() {
-      if (continuation != null) {
-        // release first to avoid resource leak, even on out-of-order close
-        continuation.releaseOnScopeClose();
-        continuation = null;
-      }
-      super.close(); // proceed to try and update the current execution unit
+    public void addListener(ContextListener listener) {
+        synchronized (listenersWriteLock) {
+            for (ContextListener l : listeners) {
+                if (l == listener) {
+                    return;
+                }
+            }
+            int oldLength = listeners.length;
+            ContextListener[] update = Arrays.copyOf(listeners, oldLength + 1);
+            update[oldLength] = listener;
+            listeners = update;
+        }
     }
-  }
-
-  private static final class ContextContinuationImpl implements ContextContinuation, ContextScope {
-
-    private static final AtomicIntegerFieldUpdater<ContextContinuationImpl> COUNT =
-        AtomicIntegerFieldUpdater.newUpdater(ContextContinuationImpl.class, "count");
-
-    // these boundaries were selected to allow for speculative counting and fuzzy checks
-    private static final int RELEASED = Integer.MIN_VALUE >> 1;
-    private static final int HELD = (Integer.MAX_VALUE >> 1) + 1;
-
-    private final Context context;
-
-    /**
-     * When positive this reflects the number of outstanding resumed scopes as well as whether there
-     * is an active hold on the continuation:
-     *
-     * <table>
-     * <tr><th>Value</th> <th>Meaning</th></tr>
-     * <tr><td>0</td><td>Not held or resumed</td></tr>
-     * <tr><td>1..HELD-1</td><td>Resumed, not held</td></tr>
-     * <tr><td>HELD</td><td>Held, not yet resumed</td></tr>
-     * <tr><td>HELD..MAX_INT</td><td>Resumed and held</td></tr>
-     * </table>
-     *
-     * where HELD is at the mid-point between 1 and MAX_INT.
-     *
-     * <p>A negative value of RELEASED reflects that the continuation has either been resumed and
-     * all associated scopes are now closed, or it has been explicitly released. This value was
-     * chosen to be half the size of MIN_INT to avoid speculative additions in {@link #resume()}
-     * from overflowing to a positive count.
-     */
-    private volatile int count = 0;
-
-    ContextContinuationImpl(Context context) {
-      this.context = context;
-      notifyCapture(INSTANCE.listeners, context);
+
+    void clearListeners() {
+        synchronized (listenersWriteLock) {
+            listeners = new ContextListener[] {};
+        }
     }
 
-    @Override
-    public ContextContinuation hold() {
-      // update initial count to record that this continuation has a hold
-      COUNT.compareAndSet(this, 0, HELD);
-      return this;
+    static void notifyUpdate(ContextListener[] listeners, Context before, Context after) {
+        for (ContextListener l : listeners) {
+            try {
+                l.onUpdate(before, after);
+            } catch (Throwable ignore) {
+            }
+        }
     }
 
-    @Override
-    public Context context() {
-      return context;
+    static void notifyCapture(ContextListener[] listeners, Context context) {
+        // only called for non-empty continuations
+        for (ContextListener l : listeners) {
+            try {
+                l.onCapture(context);
+            } catch (Throwable ignore) {
+            }
+        }
     }
 
-    @Override
-    public ContextScope resume() {
-      if (COUNT.incrementAndGet(this) > 0) {
-        // speculative update succeeded, continuation can be resumed
-        return INSTANCE.doAttach(context, this);
-      } else {
-        // continuation released or too many resumes; rollback count
-        COUNT.decrementAndGet(this);
-        return this; // acts as no-op scope, avoiding allocation
-      }
+    static void notifyRelease(ContextListener[] listeners, Context context) {
+        // only called for non-empty continuations
+        for (ContextListener l : listeners) {
+            try {
+                l.onRelease(context);
+            } catch (Throwable ignore) {
+            }
+        }
     }
 
-    @Override
-    public void release() {
-      int current = count;
-      while (current >= HELD) {
-        // remove the hold on this continuation by removing the offset
-        COUNT.compareAndSet(this, current, current - HELD);
-        current = count;
-      }
-      while (current == 0) {
-        // no outstanding resumes and hold has been removed
-        if (COUNT.compareAndSet(this, current, RELEASED)) {
-          notifyRelease(INSTANCE.listeners, context);
-          return;
+    private static class ContextScopeImpl implements ContextScope {
+
+        private final Context context;
+        private final ContextHolder holder;
+        private final Context beforeAttach;
+
+        private boolean closed;
+
+        ContextScopeImpl(Context context, ContextHolder holder, Context beforeAttach) {
+            this.context = context;
+            this.holder = holder;
+            this.beforeAttach = beforeAttach;
+        }
+
+        @Override
+        public final Context context() {
+            return context;
+        }
+
+        @Override
+        public void close() {
+            // check for out-of-order close to avoid corrupting the current state
+            if (!closed && context == holder.current) {
+                holder.current = beforeAttach;
+                notifyUpdate(INSTANCE.listeners, context, beforeAttach);
+                closed = true;
+            }
         }
-        current = count;
-      }
     }
 
-    void releaseOnScopeClose() {
-      if (COUNT.compareAndSet(this, 1, RELEASED)) {
-        // fast path: only one resume of the continuation (no hold)
-        notifyRelease(INSTANCE.listeners, context);
-      } else if (COUNT.decrementAndGet(this) == 0) {
-        // slow path: multiple resumes, all scopes now closed (no hold)
-        release();
-      } /* else there are outstanding resumes or hold is in place */
+    private static final class ResumedScopeImpl extends ContextScopeImpl {
+        @Nullable
+        private ContextContinuationImpl continuation;
+
+        ResumedScopeImpl(
+                Context context,
+                ContextHolder holder,
+                Context beforeAttach,
+                @Nullable ContextContinuationImpl continuation) {
+            super(context, holder, beforeAttach);
+            this.continuation = continuation;
+        }
+
+        @Override
+        public void close() {
+            if (continuation != null) {
+                // release first to avoid resource leak, even on out-of-order close
+                continuation.releaseOnScopeClose();
+                continuation = null;
+            }
+            super.close(); // proceed to try and update the current execution unit
+        }
     }
 
-    @Override
-    public void close() {}
-  }
+    private static final class ContextContinuationImpl implements ContextContinuation, ContextScope {
+
+        private static final AtomicIntegerFieldUpdater<ContextContinuationImpl> COUNT =
+                AtomicIntegerFieldUpdater.newUpdater(ContextContinuationImpl.class, "count");
+
+        // these boundaries were selected to allow for speculative counting and fuzzy checks
+        private static final int RELEASED = Integer.MIN_VALUE >> 1;
+        private static final int HELD = (Integer.MAX_VALUE >> 1) + 1;
+
+        private final Context context;
+
+        /**
+         * When positive this reflects the number of outstanding resumed scopes as well as whether there
+         * is an active hold on the continuation:
+         *
+         * <table>
+         * <tr><th>Value</th> <th>Meaning</th></tr>
+         * <tr><td>0</td><td>Not held or resumed</td></tr>
+         * <tr><td>1..HELD-1</td><td>Resumed, not held</td></tr>
+         * <tr><td>HELD</td><td>Held, not yet resumed</td></tr>
+         * <tr><td>HELD..MAX_INT</td><td>Resumed and held</td></tr>
+         * </table>
+         *
+         * where HELD is at the mid-point between 1 and MAX_INT.
+         *
+         * <p>A negative value of RELEASED reflects that the continuation has either been resumed and
+         * all associated scopes are now closed, or it has been explicitly released. This value was
+         * chosen to be half the size of MIN_INT to avoid speculative additions in {@link #resume()}
+         * from overflowing to a positive count.
+         */
+        private volatile int count = 0;
+
+        ContextContinuationImpl(Context context) {
+            this.context = context;
+            notifyCapture(INSTANCE.listeners, context);
+        }
 
-  private static final class ContextHolder {
-    Context current = Context.root();
-  }
+        @Override
+        public ContextContinuation hold() {
+            // update initial count to record that this continuation has a hold
+            COUNT.compareAndSet(this, 0, HELD);
+            return this;
+        }
+
+        @Override
+        public Context context() {
+            return context;
+        }
+
+        @Override
+        public ContextScope resume() {
+            if (COUNT.incrementAndGet(this) > 0) {
+                // speculative update succeeded, continuation can be resumed
+                return INSTANCE.doAttach(context, this);
+            } else {
+                // continuation released or too many resumes; rollback count
+                COUNT.decrementAndGet(this);
+                return this; // acts as no-op scope, avoiding allocation
+            }
+        }
+
+        @Override
+        public void release() {
+            int current = count;
+            while (current >= HELD) {
+                // remove the hold on this continuation by removing the offset
+                COUNT.compareAndSet(this, current, current - HELD);
+                current = count;
+            }
+            while (current == 0) {
+                // no outstanding resumes and hold has been removed
+                if (COUNT.compareAndSet(this, current, RELEASED)) {
+                    notifyRelease(INSTANCE.listeners, context);
+                    return;
+                }
+                current = count;
+            }
+        }
+
+        void releaseOnScopeClose() {
+            if (COUNT.compareAndSet(this, 1, RELEASED)) {
+                // fast path: only one resume of the continuation (no hold)
+                notifyRelease(INSTANCE.listeners, context);
+            } else if (COUNT.decrementAndGet(this) == 0) {
+                // slow path: multiple resumes, all scopes now closed (no hold)
+                release();
+            } /* else there are outstanding resumes or hold is in place */
+        }
+
+        @Override
+        public void close() {}
+    }
+
+    private static final class ContextHolder {
+        Context current = Context.root();
+    }
 }
diff --git a/components/context/src/main/java/datadog/context/propagation/CarrierSetter.java b/components/context/src/main/java/datadog/context/propagation/CarrierSetter.java
index 76a6abda835..b78f904fa91 100644
--- a/components/context/src/main/java/datadog/context/propagation/CarrierSetter.java
+++ b/components/context/src/main/java/datadog/context/propagation/CarrierSetter.java
@@ -2,12 +2,12 @@
 
 @FunctionalInterface
 public interface CarrierSetter<C> {
-  /**
-   * Sets a carrier key/value pair.
-   *
-   * @param carrier the carrier to store key/value into.
-   * @param key the key to set.
-   * @param value the value to set.
-   */
-  void set(C carrier, String key, String value);
+    /**
+     * Sets a carrier key/value pair.
+     *
+     * @param carrier the carrier to store key/value into.
+     * @param key the key to set.
+     * @param value the value to set.
+     */
+    void set(C carrier, String key, String value);
 }
diff --git a/components/context/src/main/java/datadog/context/propagation/CarrierVisitor.java b/components/context/src/main/java/datadog/context/propagation/CarrierVisitor.java
index e35183d21d5..6bd1e01589e 100644
--- a/components/context/src/main/java/datadog/context/propagation/CarrierVisitor.java
+++ b/components/context/src/main/java/datadog/context/propagation/CarrierVisitor.java
@@ -16,11 +16,11 @@
  */
 @FunctionalInterface
 public interface CarrierVisitor<C> {
-  /**
-   * Iterates over the carrier content and calls the visitor callback for every key/value found.
-   *
-   * @param carrier the carrier to iterate over.
-   * @param visitor the callback to call for each carrier key/value pair found.
-   */
-  void forEachKeyValue(C carrier, BiConsumer<String, String> visitor);
+    /**
+     * Iterates over the carrier content and calls the visitor callback for every key/value found.
+     *
+     * @param carrier the carrier to iterate over.
+     * @param visitor the callback to call for each carrier key/value pair found.
+     */
+    void forEachKeyValue(C carrier, BiConsumer<String, String> visitor);
 }
diff --git a/components/context/src/main/java/datadog/context/propagation/CompositePropagator.java b/components/context/src/main/java/datadog/context/propagation/CompositePropagator.java
index 9484b2a8054..051fced0c2e 100644
--- a/components/context/src/main/java/datadog/context/propagation/CompositePropagator.java
+++ b/components/context/src/main/java/datadog/context/propagation/CompositePropagator.java
@@ -6,50 +6,50 @@
 import java.util.function.BiConsumer;
 
 class CompositePropagator implements Propagator {
-  private final Propagator[] propagators;
+    private final Propagator[] propagators;
 
-  CompositePropagator(Propagator[] propagators) {
-    this.propagators = propagators;
-  }
-
-  @Override
-  public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {
-    for (int i = this.propagators.length - 1; i >= 0; i--) {
-      this.propagators[i].inject(context, carrier, setter);
-    }
-  }
-
-  @Override
-  public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
-    // Extract and cache carrier key/value pairs
-    CarrierCache carrierCache = new CarrierCache();
-    visitor.forEachKeyValue(carrier, carrierCache);
-    // Run the multiple extractions on cache
-    for (Propagator propagator : this.propagators) {
-      context = propagator.extract(context, carrierCache, carrierCache);
+    CompositePropagator(Propagator[] propagators) {
+        this.propagators = propagators;
     }
-    return context;
-  }
-
-  static class CarrierCache implements BiConsumer<String, String>, CarrierVisitor<CarrierCache> {
-    /** Cached key/values from carrier (even indexes are keys, odd indexes are values). */
-    private final List<String> keysAndValues;
 
-    public CarrierCache() {
-      this.keysAndValues = new ArrayList<>(32);
+    @Override
+    public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {
+        for (int i = this.propagators.length - 1; i >= 0; i--) {
+            this.propagators[i].inject(context, carrier, setter);
+        }
     }
 
     @Override
-    public void accept(String key, String value) {
-      this.keysAndValues.add(key);
-      this.keysAndValues.add(value);
+    public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
+        // Extract and cache carrier key/value pairs
+        CarrierCache carrierCache = new CarrierCache();
+        visitor.forEachKeyValue(carrier, carrierCache);
+        // Run the multiple extractions on cache
+        for (Propagator propagator : this.propagators) {
+            context = propagator.extract(context, carrierCache, carrierCache);
+        }
+        return context;
     }
 
-    @Override
-    public void forEachKeyValue(CarrierCache carrier, BiConsumer<String, String> visitor) {
-      for (int i = 0; i < carrier.keysAndValues.size() - 1; i += 2) {
-        visitor.accept(carrier.keysAndValues.get(i), carrier.keysAndValues.get(i + 1));
-      }
+    static class CarrierCache implements BiConsumer<String, String>, CarrierVisitor<CarrierCache> {
+        /** Cached key/values from carrier (even indexes are keys, odd indexes are values). */
+        private final List<String> keysAndValues;
+
+        public CarrierCache() {
+            this.keysAndValues = new ArrayList<>(32);
+        }
+
+        @Override
+        public void accept(String key, String value) {
+            this.keysAndValues.add(key);
+            this.keysAndValues.add(value);
+        }
+
+        @Override
+        public void forEachKeyValue(CarrierCache carrier, BiConsumer<String, String> visitor) {
+            for (int i = 0; i < carrier.keysAndValues.size() - 1; i += 2) {
+                visitor.accept(carrier.keysAndValues.get(i), carrier.keysAndValues.get(i + 1));
+            }
+        }
     }
-  }
 }
diff --git a/components/context/src/main/java/datadog/context/propagation/Concern.java b/components/context/src/main/java/datadog/context/propagation/Concern.java
index ed7681369ac..710fcdcee46 100644
--- a/components/context/src/main/java/datadog/context/propagation/Concern.java
+++ b/components/context/src/main/java/datadog/context/propagation/Concern.java
@@ -6,54 +6,54 @@
 
 /** This class defines a cross-cutting concern to be propagated from a {@link Context}. */
 public class Concern {
-  /** The concern default priority. */
-  public static final int DEFAULT_PRIORITY = 100;
-
-  /** The concern name, for debugging purpose only. */
-  private final String name;
-
-  /** The concern priority, lower value means higher priority. */
-  private final int priority;
-
-  /**
-   * Creates a concern.
-   *
-   * @param name the concern name, for debugging purpose only.
-   * @return The created concern.
-   */
-  public static Concern named(String name) {
-    return new Concern(name, DEFAULT_PRIORITY);
-  }
-
-  /**
-   * Creates a concern with a specific priority.
-   *
-   * @param name the concern name, for debugging purpose only.
-   * @param priority the concern priority (lower value means higher priority, while the default is
-   *     {@link #DEFAULT_PRIORITY}),
-   * @return The created concern.
-   */
-  public static Concern withPriority(String name, int priority) {
-    return new Concern(name, priority);
-  }
-
-  private Concern(String name, int priority) {
-    requireNonNull(name, "Concern name cannot be null");
-    if (priority < 0) {
-      throw new IllegalArgumentException("Concern priority cannot be negative");
+    /** The concern default priority. */
+    public static final int DEFAULT_PRIORITY = 100;
+
+    /** The concern name, for debugging purpose only. */
+    private final String name;
+
+    /** The concern priority, lower value means higher priority. */
+    private final int priority;
+
+    /**
+     * Creates a concern.
+     *
+     * @param name the concern name, for debugging purpose only.
+     * @return The created concern.
+     */
+    public static Concern named(String name) {
+        return new Concern(name, DEFAULT_PRIORITY);
     }
-    this.name = name;
-    this.priority = priority;
-  }
 
-  int priority() {
-    return this.priority;
-  }
+    /**
+     * Creates a concern with a specific priority.
+     *
+     * @param name the concern name, for debugging purpose only.
+     * @param priority the concern priority (lower value means higher priority, while the default is
+     *     {@link #DEFAULT_PRIORITY}),
+     * @return The created concern.
+     */
+    public static Concern withPriority(String name, int priority) {
+        return new Concern(name, priority);
+    }
+
+    private Concern(String name, int priority) {
+        requireNonNull(name, "Concern name cannot be null");
+        if (priority < 0) {
+            throw new IllegalArgumentException("Concern priority cannot be negative");
+        }
+        this.name = name;
+        this.priority = priority;
+    }
 
-  // We want identity equality, so no need to override equals().
+    int priority() {
+        return this.priority;
+    }
+
+    // We want identity equality, so no need to override equals().
 
-  @Override
-  public String toString() {
-    return this.name;
-  }
+    @Override
+    public String toString() {
+        return this.name;
+    }
 }
diff --git a/components/context/src/main/java/datadog/context/propagation/NoopPropagator.java b/components/context/src/main/java/datadog/context/propagation/NoopPropagator.java
index 88a1ab7d724..a1f5726d77a 100644
--- a/components/context/src/main/java/datadog/context/propagation/NoopPropagator.java
+++ b/components/context/src/main/java/datadog/context/propagation/NoopPropagator.java
@@ -3,17 +3,17 @@
 import datadog.context.Context;
 
 final class NoopPropagator implements Propagator {
-  static final NoopPropagator INSTANCE = new NoopPropagator();
+    static final NoopPropagator INSTANCE = new NoopPropagator();
 
-  private NoopPropagator() {}
+    private NoopPropagator() {}
 
-  @Override
-  public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {
-    // noop
-  }
+    @Override
+    public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {
+        // noop
+    }
 
-  @Override
-  public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
-    return context;
-  }
+    @Override
+    public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
+        return context;
+    }
 }
diff --git a/components/context/src/main/java/datadog/context/propagation/Propagator.java b/components/context/src/main/java/datadog/context/propagation/Propagator.java
index cfd9b3d963a..97e86237d7f 100644
--- a/components/context/src/main/java/datadog/context/propagation/Propagator.java
+++ b/components/context/src/main/java/datadog/context/propagation/Propagator.java
@@ -11,25 +11,25 @@
  * store and retrieve key/value pairs from carriers.
  */
 public interface Propagator {
-  /**
-   * Injects a context into a downstream service using the given carrier.
-   *
-   * @param context the context containing the values to be injected.
-   * @param carrier the instance that will receive the key/value pairs to propagate.
-   * @param setter the callback to set key/value pairs into the carrier.
-   * @param <C> the type of carrier instance.
-   */
-  <C> void inject(Context context, C carrier, CarrierSetter<C> setter);
+    /**
+     * Injects a context into a downstream service using the given carrier.
+     *
+     * @param context the context containing the values to be injected.
+     * @param carrier the instance that will receive the key/value pairs to propagate.
+     * @param setter the callback to set key/value pairs into the carrier.
+     * @param <C> the type of carrier instance.
+     */
+    <C> void inject(Context context, C carrier, CarrierSetter<C> setter);
 
-  /**
-   * Extracts a context from un upstream service.
-   *
-   * @param context the base context to store the extracted values on top, use {@link
-   *     Context#root()} for a default base context.
-   * @param carrier the instance to fetch the propagated key/value pairs from.
-   * @param visitor the callback to walk over the carrier and extract its key/value pais.
-   * @param <C> the type of the carrier.
-   * @return A context with the extracted values on top of the given base context.
-   */
-  <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor);
+    /**
+     * Extracts a context from un upstream service.
+     *
+     * @param context the base context to store the extracted values on top, use {@link
+     *     Context#root()} for a default base context.
+     * @param carrier the instance to fetch the propagated key/value pairs from.
+     * @param visitor the callback to walk over the carrier and extract its key/value pais.
+     * @param <C> the type of the carrier.
+     * @return A context with the extracted values on top of the given base context.
+     */
+    <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor);
 }
diff --git a/components/context/src/main/java/datadog/context/propagation/Propagators.java b/components/context/src/main/java/datadog/context/propagation/Propagators.java
index cbf1bd0ae5f..8d42d3b0693 100644
--- a/components/context/src/main/java/datadog/context/propagation/Propagators.java
+++ b/components/context/src/main/java/datadog/context/propagation/Propagators.java
@@ -11,136 +11,133 @@
  * Propagator} to use.
  */
 public final class Propagators {
-  private static final Map<Concern, RegisteredPropagator> PROPAGATORS =
-      synchronizedMap(new IdentityHashMap<>());
-  private static final RegisteredPropagator NOOP =
-      RegisteredPropagator.of(NoopPropagator.INSTANCE, false);
-  private static volatile Propagator defaultPropagator = null;
-  private static volatile boolean rebuildDefaultPropagator = true;
-
-  private Propagators() {}
-
-  /**
-   * Gets the default propagator that applies all registered propagators in their priority order.
-   *
-   * @return The default propagator.
-   */
-  public static Propagator defaultPropagator() {
-    if (rebuildDefaultPropagator) {
-      Propagator[] propagatorsByPriority =
-          PROPAGATORS.entrySet().stream()
-              .filter(entry -> entry.getValue().isUsedAsDefault())
-              .sorted(comparingInt(entry -> entry.getKey().priority()))
-              .map(Map.Entry::getValue)
-              .map(RegisteredPropagator::propagator)
-              .toArray(Propagator[]::new);
-      defaultPropagator = composite(propagatorsByPriority);
-      rebuildDefaultPropagator = false;
+    private static final Map<Concern, RegisteredPropagator> PROPAGATORS = synchronizedMap(new IdentityHashMap<>());
+    private static final RegisteredPropagator NOOP = RegisteredPropagator.of(NoopPropagator.INSTANCE, false);
+    private static volatile Propagator defaultPropagator = null;
+    private static volatile boolean rebuildDefaultPropagator = true;
+
+    private Propagators() {}
+
+    /**
+     * Gets the default propagator that applies all registered propagators in their priority order.
+     *
+     * @return The default propagator.
+     */
+    public static Propagator defaultPropagator() {
+        if (rebuildDefaultPropagator) {
+            Propagator[] propagatorsByPriority = PROPAGATORS.entrySet().stream()
+                    .filter(entry -> entry.getValue().isUsedAsDefault())
+                    .sorted(comparingInt(entry -> entry.getKey().priority()))
+                    .map(Map.Entry::getValue)
+                    .map(RegisteredPropagator::propagator)
+                    .toArray(Propagator[]::new);
+            defaultPropagator = composite(propagatorsByPriority);
+            rebuildDefaultPropagator = false;
+        }
+        return defaultPropagator;
     }
-    return defaultPropagator;
-  }
-
-  /**
-   * Gets the propagator for a given concern.
-   *
-   * @param concern the concern to get propagator for.
-   * @return the related propagator if registered, a {@link #noop()} propagator otherwise.
-   */
-  public static Propagator forConcern(Concern concern) {
-    return PROPAGATORS.getOrDefault(concern, NOOP).propagator();
-  }
-
-  /**
-   * Gets the propagator for the given concerns.
-   *
-   * @param concerns the concerns to get propagators for.
-   * @return A propagator that will apply the concern propagators if registered, in the given
-   *     concern order.
-   */
-  public static Propagator forConcerns(Concern... concerns) {
-    Propagator[] propagators = new Propagator[concerns.length];
-    for (int i = 0; i < concerns.length; i++) {
-      propagators[i] = forConcern(concerns[i]);
-    }
-    return composite(propagators);
-  }
-
-  /**
-   * Returns a noop propagator.
-   *
-   * @return a noop propagator.
-   */
-  public static Propagator noop() {
-    return NoopPropagator.INSTANCE;
-  }
-
-  /**
-   * Creates a composite propagator.
-   *
-   * @param propagators the elements that composes the returned propagator.
-   * @return the composite propagator that will apply the propagators in their given order for
-   *     context extraction, and reverse given order for context injection.
-   */
-  public static Propagator composite(Propagator... propagators) {
-    if (propagators.length == 0) {
-      return NoopPropagator.INSTANCE;
-    } else if (propagators.length == 1) {
-      return propagators[0];
-    } else {
-      return new CompositePropagator(propagators);
+
+    /**
+     * Gets the propagator for a given concern.
+     *
+     * @param concern the concern to get propagator for.
+     * @return the related propagator if registered, a {@link #noop()} propagator otherwise.
+     */
+    public static Propagator forConcern(Concern concern) {
+        return PROPAGATORS.getOrDefault(concern, NOOP).propagator();
     }
-  }
-
-  /**
-   * Registers a propagator for concern.
-   *
-   * @param concern The concern to register a propagator for.
-   * @param propagator The propagator to register.
-   */
-  public static void register(Concern concern, Propagator propagator) {
-    register(concern, propagator, true);
-  }
-
-  /**
-   * Registers a propagator for concern.
-   *
-   * @param concern The concern to register a propagator for.
-   * @param propagator The propagator to register.
-   * @param usedAsDefault Whether the propagator should be used as default propagator.
-   * @see Propagators#defaultPropagator()
-   */
-  public static void register(Concern concern, Propagator propagator, boolean usedAsDefault) {
-    PROPAGATORS.put(concern, RegisteredPropagator.of(propagator, usedAsDefault));
-    if (usedAsDefault) {
-      rebuildDefaultPropagator = true;
+
+    /**
+     * Gets the propagator for the given concerns.
+     *
+     * @param concerns the concerns to get propagators for.
+     * @return A propagator that will apply the concern propagators if registered, in the given
+     *     concern order.
+     */
+    public static Propagator forConcerns(Concern... concerns) {
+        Propagator[] propagators = new Propagator[concerns.length];
+        for (int i = 0; i < concerns.length; i++) {
+            propagators[i] = forConcern(concerns[i]);
+        }
+        return composite(propagators);
     }
-  }
 
-  /** Clear all registered propagators. For testing purpose only. */
-  static void reset() {
-    PROPAGATORS.clear();
-    rebuildDefaultPropagator = true;
-  }
+    /**
+     * Returns a noop propagator.
+     *
+     * @return a noop propagator.
+     */
+    public static Propagator noop() {
+        return NoopPropagator.INSTANCE;
+    }
 
-  static class RegisteredPropagator {
-    private final Propagator propagator;
-    private final boolean usedAsDefault;
+    /**
+     * Creates a composite propagator.
+     *
+     * @param propagators the elements that composes the returned propagator.
+     * @return the composite propagator that will apply the propagators in their given order for
+     *     context extraction, and reverse given order for context injection.
+     */
+    public static Propagator composite(Propagator... propagators) {
+        if (propagators.length == 0) {
+            return NoopPropagator.INSTANCE;
+        } else if (propagators.length == 1) {
+            return propagators[0];
+        } else {
+            return new CompositePropagator(propagators);
+        }
+    }
 
-    private RegisteredPropagator(Propagator propagator, boolean usedAsDefault) {
-      this.propagator = propagator;
-      this.usedAsDefault = usedAsDefault;
+    /**
+     * Registers a propagator for concern.
+     *
+     * @param concern The concern to register a propagator for.
+     * @param propagator The propagator to register.
+     */
+    public static void register(Concern concern, Propagator propagator) {
+        register(concern, propagator, true);
     }
 
-    static RegisteredPropagator of(Propagator propagator, boolean useAsDefault) {
-      return new RegisteredPropagator(propagator, useAsDefault);
+    /**
+     * Registers a propagator for concern.
+     *
+     * @param concern The concern to register a propagator for.
+     * @param propagator The propagator to register.
+     * @param usedAsDefault Whether the propagator should be used as default propagator.
+     * @see Propagators#defaultPropagator()
+     */
+    public static void register(Concern concern, Propagator propagator, boolean usedAsDefault) {
+        PROPAGATORS.put(concern, RegisteredPropagator.of(propagator, usedAsDefault));
+        if (usedAsDefault) {
+            rebuildDefaultPropagator = true;
+        }
     }
 
-    Propagator propagator() {
-      return this.propagator;
+    /** Clear all registered propagators. For testing purpose only. */
+    static void reset() {
+        PROPAGATORS.clear();
+        rebuildDefaultPropagator = true;
     }
 
-    boolean isUsedAsDefault() {
-      return this.usedAsDefault;
+    static class RegisteredPropagator {
+        private final Propagator propagator;
+        private final boolean usedAsDefault;
+
+        private RegisteredPropagator(Propagator propagator, boolean usedAsDefault) {
+            this.propagator = propagator;
+            this.usedAsDefault = usedAsDefault;
+        }
+
+        static RegisteredPropagator of(Propagator propagator, boolean useAsDefault) {
+            return new RegisteredPropagator(propagator, useAsDefault);
+        }
+
+        Propagator propagator() {
+            return this.propagator;
+        }
+
+        boolean isUsedAsDefault() {
+            return this.usedAsDefault;
+        }
     }
-  }
 }
diff --git a/components/context/src/test/java/datadog/context/ContextBinderTest.java b/components/context/src/test/java/datadog/context/ContextBinderTest.java
index eb2bb35563e..6da4ab8abb1 100644
--- a/components/context/src/test/java/datadog/context/ContextBinderTest.java
+++ b/components/context/src/test/java/datadog/context/ContextBinderTest.java
@@ -11,41 +11,41 @@
 import org.junit.jupiter.api.Test;
 
 class ContextBinderTest extends ContextTestBase {
-  @Test
-  void testAttachAndDetach() {
-    // Setting up test
-    Context context = root().with(STRING_KEY, "value");
-    Object carrier = new Object();
-    assertEquals(root(), from(carrier), "Carrier expected to hold root context by default");
-    // Attaching context
-    context.attachTo(carrier);
-    assertEquals(context, from(carrier), "Carrier expected to hold new context");
-    assertEquals(root(), current(), "Current execution expected to stay root");
-    // Detaching removes all context
-    assertEquals(context, detachFrom(carrier), "Detached context expected to new context");
-    assertEquals(root(), detachFrom(carrier), "Carrier expected to hold no more context");
-    assertEquals(root(), from(carrier), "Carrier expected to hold no more context");
-  }
+    @Test
+    void testAttachAndDetach() {
+        // Setting up test
+        Context context = root().with(STRING_KEY, "value");
+        Object carrier = new Object();
+        assertEquals(root(), from(carrier), "Carrier expected to hold root context by default");
+        // Attaching context
+        context.attachTo(carrier);
+        assertEquals(context, from(carrier), "Carrier expected to hold new context");
+        assertEquals(root(), current(), "Current execution expected to stay root");
+        // Detaching removes all context
+        assertEquals(context, detachFrom(carrier), "Detached context expected to new context");
+        assertEquals(root(), detachFrom(carrier), "Carrier expected to hold no more context");
+        assertEquals(root(), from(carrier), "Carrier expected to hold no more context");
+    }
 
-  @Test
-  void testNullCarrier() {
-    assertThrows(
-        NullPointerException.class,
-        () -> assertEquals(root(), from(null), "Binder expected to return non-null context"),
-        "Null carrier expected to hold root context");
-    assertThrows(
-        NullPointerException.class,
-        () -> assertEquals(root(), detachFrom(null), "Binder expected to return non-null context"),
-        "Null carrier expected to hold root context");
-  }
+    @Test
+    void testNullCarrier() {
+        assertThrows(
+                NullPointerException.class,
+                () -> assertEquals(root(), from(null), "Binder expected to return non-null context"),
+                "Null carrier expected to hold root context");
+        assertThrows(
+                NullPointerException.class,
+                () -> assertEquals(root(), detachFrom(null), "Binder expected to return non-null context"),
+                "Null carrier expected to hold root context");
+    }
 
-  @Test
-  void testNullContext() {
-    ContextBinder binder = ContextProviders.binder();
-    Object carrier = new Object();
-    assertThrows(
-        NullPointerException.class,
-        () -> binder.attachTo(carrier, null),
-        "Attaching null context not expected to throw");
-  }
+    @Test
+    void testNullContext() {
+        ContextBinder binder = ContextProviders.binder();
+        Object carrier = new Object();
+        assertThrows(
+                NullPointerException.class,
+                () -> binder.attachTo(carrier, null),
+                "Attaching null context not expected to throw");
+    }
 }
diff --git a/components/context/src/test/java/datadog/context/ContextContinuationTest.java b/components/context/src/test/java/datadog/context/ContextContinuationTest.java
index 5f818332c89..981ead65cee 100644
--- a/components/context/src/test/java/datadog/context/ContextContinuationTest.java
+++ b/components/context/src/test/java/datadog/context/ContextContinuationTest.java
@@ -21,346 +21,334 @@
 @ParametersAreNonnullByDefault
 class ContextContinuationTest extends ContextTestBase {
 
-  @Test
-  void testCaptureRootContextIsNoop() {
-    ContextContinuation continuation = root().capture();
-    assertEquals(root(), continuation.context());
-    assertSame(continuation, continuation.hold()); // hold is a no-op, returns self
-    try (ContextScope scope = continuation.resume()) {
-      assertEquals(root(), current()); // nothing changes for root
+    @Test
+    void testCaptureRootContextIsNoop() {
+        ContextContinuation continuation = root().capture();
+        assertEquals(root(), continuation.context());
+        assertSame(continuation, continuation.hold()); // hold is a no-op, returns self
+        try (ContextScope scope = continuation.resume()) {
+            assertEquals(root(), current()); // nothing changes for root
+        }
+        assertEquals(root(), current());
+        continuation.release(); // no-op
     }
-    assertEquals(root(), current());
-    continuation.release(); // no-op
-  }
 
-  @Test
-  void testCaptureStoresContext() {
-    Context context = root().with(TEST_KEY, "captured");
-    try (ContextScope scope = context.attach()) {
-      ContextContinuation continuation = context.capture();
-      assertEquals(context, continuation.context());
-      continuation.release();
+    @Test
+    void testCaptureStoresContext() {
+        Context context = root().with(TEST_KEY, "captured");
+        try (ContextScope scope = context.attach()) {
+            ContextContinuation continuation = context.capture();
+            assertEquals(context, continuation.context());
+            continuation.release();
+        }
     }
-  }
 
-  @Test
-  void testCaptureFiresOnCaptureEvent() {
-    TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
-    Context context = root().with(TEST_KEY, "value");
-    try (ContextScope scope = context.attach()) {
-      ContextContinuation continuation =
-          context.capture(); // capture while active (recommended pattern)
-      listener.assertNewEvents("update:{root}->value", "capture:value");
-      continuation.release();
+    @Test
+    void testCaptureFiresOnCaptureEvent() {
+        TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
+        Context context = root().with(TEST_KEY, "value");
+        try (ContextScope scope = context.attach()) {
+            ContextContinuation continuation = context.capture(); // capture while active (recommended pattern)
+            listener.assertNewEvents("update:{root}->value", "capture:value");
+            continuation.release();
+        }
+        listener.assertNewEvents("release:value", "update:value->{root}");
     }
-    listener.assertNewEvents("release:value", "update:value->{root}");
-  }
 
-  @Test
-  void testResumeAttachesContextAndRestoresPreviousOnClose() {
-    Context context = root().with(TEST_KEY, "value");
-    ContextContinuation continuation;
-    try (ContextScope scope = context.attach()) {
-      continuation = context.capture(); // capture while active (recommended pattern)
+    @Test
+    void testResumeAttachesContextAndRestoresPreviousOnClose() {
+        Context context = root().with(TEST_KEY, "value");
+        ContextContinuation continuation;
+        try (ContextScope scope = context.attach()) {
+            continuation = context.capture(); // capture while active (recommended pattern)
+        }
+        // original scope is closed; resume the continuation here (same or different thread)
+        try (ContextScope scope = continuation.resume()) {
+            assertEquals(context, current());
+            assertEquals(context, scope.context());
+        }
+        assertEquals(root(), current());
     }
-    // original scope is closed; resume the continuation here (same or different thread)
-    try (ContextScope scope = continuation.resume()) {
-      assertEquals(context, current());
-      assertEquals(context, scope.context());
-    }
-    assertEquals(root(), current());
-  }
 
-  @Test
-  void testResumeAndScopeCloseFiresLifecycleEvents() {
-    TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
-    Context context = root().with(TEST_KEY, "value");
-    ContextContinuation continuation;
-    try (ContextScope scope = context.attach()) {
-      continuation = context.capture(); // capture while active
-    }
-    listener.assertNewEvents("update:{root}->value", "capture:value", "update:value->{root}");
-    try (ContextScope scope = continuation.resume()) {
-      listener.assertNewEvents("update:{root}->value");
+    @Test
+    void testResumeAndScopeCloseFiresLifecycleEvents() {
+        TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
+        Context context = root().with(TEST_KEY, "value");
+        ContextContinuation continuation;
+        try (ContextScope scope = context.attach()) {
+            continuation = context.capture(); // capture while active
+        }
+        listener.assertNewEvents("update:{root}->value", "capture:value", "update:value->{root}");
+        try (ContextScope scope = continuation.resume()) {
+            listener.assertNewEvents("update:{root}->value");
+        }
+        // release fires before update (continuation is released first inside ContextScopeImpl.close)
+        listener.assertNewEvents("release:value", "update:value->{root}");
     }
-    // release fires before update (continuation is released first inside ContextScopeImpl.close)
-    listener.assertNewEvents("release:value", "update:value->{root}");
-  }
 
-  @Test
-  void testHoldPreventsAutoReleaseOnScopeClose() {
-    TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
-    Context context = root().with(TEST_KEY, "value");
-    ContextContinuation continuation;
-    try (ContextScope scope = context.attach()) {
-      continuation = context.capture(); // capture while active
-      continuation.hold();
-      listener.assertNewEvents("update:{root}->value", "capture:value");
-    }
-    listener.assertNewEvents("update:value->{root}");
-    try (ContextScope scope = continuation.resume()) {
-      assertEquals(context, current());
-      listener.assertNewEvents("update:{root}->value");
+    @Test
+    void testHoldPreventsAutoReleaseOnScopeClose() {
+        TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
+        Context context = root().with(TEST_KEY, "value");
+        ContextContinuation continuation;
+        try (ContextScope scope = context.attach()) {
+            continuation = context.capture(); // capture while active
+            continuation.hold();
+            listener.assertNewEvents("update:{root}->value", "capture:value");
+        }
+        listener.assertNewEvents("update:value->{root}");
+        try (ContextScope scope = continuation.resume()) {
+            assertEquals(context, current());
+            listener.assertNewEvents("update:{root}->value");
+        }
+        assertEquals(root(), current());
+        listener.assertNewEvents("update:value->{root}"); // release should not fire while hold is active
+        continuation.release();
+        listener.assertNewEvents("release:value");
     }
-    assertEquals(root(), current());
-    listener.assertNewEvents(
-        "update:value->{root}"); // release should not fire while hold is active
-    continuation.release();
-    listener.assertNewEvents("release:value");
-  }
 
-  @Test
-  void testExplicitReleaseWithoutResumeFiresReleaseEvent() {
-    TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
-    Context context = root().with(TEST_KEY, "value");
-    ContextContinuation continuation;
-    try (ContextScope scope = context.attach()) {
-      continuation = context.capture(); // capture while active
+    @Test
+    void testExplicitReleaseWithoutResumeFiresReleaseEvent() {
+        TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
+        Context context = root().with(TEST_KEY, "value");
+        ContextContinuation continuation;
+        try (ContextScope scope = context.attach()) {
+            continuation = context.capture(); // capture while active
+        }
+        listener.assertNewEvents("update:{root}->value", "capture:value", "update:value->{root}");
+        continuation.release();
+        listener.assertNewEvents("release:value");
     }
-    listener.assertNewEvents("update:{root}->value", "capture:value", "update:value->{root}");
-    continuation.release();
-    listener.assertNewEvents("release:value");
-  }
 
-  @Test
-  void testResumeAfterReleaseIsNoop() {
-    Context context = root().with(TEST_KEY, "value");
-    ContextContinuation continuation;
-    try (ContextScope scope = context.attach()) {
-      continuation = context.capture(); // capture while active
+    @Test
+    void testResumeAfterReleaseIsNoop() {
+        Context context = root().with(TEST_KEY, "value");
+        ContextContinuation continuation;
+        try (ContextScope scope = context.attach()) {
+            continuation = context.capture(); // capture while active
+        }
+        continuation.release();
+        // Resuming a released continuation should not attach the context
+        try (ContextScope scope = continuation.resume()) {
+            assertEquals(root(), current());
+        }
+        assertEquals(root(), current());
     }
-    continuation.release();
-    // Resuming a released continuation should not attach the context
-    try (ContextScope scope = continuation.resume()) {
-      assertEquals(root(), current());
-    }
-    assertEquals(root(), current());
-  }
 
-  @Test
-  void testResumeOnDifferentThread() {
-    Context context = root().with(TEST_KEY, "value");
-    ContextContinuation continuation;
-    try (ContextScope scope = context.attach()) {
-      continuation = context.capture(); // capture while active (recommended pattern)
-    }
-    // original scope is closed; resume the context on another thread
-    ExecutorService executor = Executors.newSingleThreadExecutor();
-    try {
-      Future<?> future =
-          executor.submit(
-              () -> {
+    @Test
+    void testResumeOnDifferentThread() {
+        Context context = root().with(TEST_KEY, "value");
+        ContextContinuation continuation;
+        try (ContextScope scope = context.attach()) {
+            continuation = context.capture(); // capture while active (recommended pattern)
+        }
+        // original scope is closed; resume the context on another thread
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        try {
+            Future<?> future = executor.submit(() -> {
                 assertEquals(root(), current()); // thread starts with root context
                 try (ContextScope scope = continuation.resume()) {
-                  assertEquals(context, current());
+                    assertEquals(context, current());
                 }
                 assertEquals(root(), current()); // restored after scope close
-              });
-      assertDoesNotThrow(() -> future.get());
-    } finally {
-      executor.shutdown();
+            });
+            assertDoesNotThrow(() -> future.get());
+        } finally {
+            executor.shutdown();
+        }
     }
-  }
 
-  @Test
-  void testMultipleResumesReleaseAfterLastScopeCloses() throws InterruptedException {
-    List<String> events = synchronizedList(new ArrayList<>());
-    ContextManager.register(
-        new ContextListener() {
-          @Override
-          public void onRelease(Context c) {
-            events.add("release");
-          }
+    @Test
+    void testMultipleResumesReleaseAfterLastScopeCloses() throws InterruptedException {
+        List<String> events = synchronizedList(new ArrayList<>());
+        ContextManager.register(new ContextListener() {
+            @Override
+            public void onRelease(Context c) {
+                events.add("release");
+            }
         });
-    Context context = root().with(TEST_KEY, "value");
-    ContextContinuation continuation;
-    try (ContextScope scope = context.attach()) {
-      continuation = context.capture(); // capture while active
-    }
-    CountDownLatch bothResumed = new CountDownLatch(2);
-    CountDownLatch closeFirst = new CountDownLatch(1);
-    CountDownLatch firstClosed = new CountDownLatch(1);
-    CountDownLatch closeSecond = new CountDownLatch(1);
-    ExecutorService executor = Executors.newFixedThreadPool(2);
-    try {
-      Future<?> f1 =
-          executor.submit(
-              () -> {
+        Context context = root().with(TEST_KEY, "value");
+        ContextContinuation continuation;
+        try (ContextScope scope = context.attach()) {
+            continuation = context.capture(); // capture while active
+        }
+        CountDownLatch bothResumed = new CountDownLatch(2);
+        CountDownLatch closeFirst = new CountDownLatch(1);
+        CountDownLatch firstClosed = new CountDownLatch(1);
+        CountDownLatch closeSecond = new CountDownLatch(1);
+        ExecutorService executor = Executors.newFixedThreadPool(2);
+        try {
+            Future<?> f1 = executor.submit(() -> {
                 try (ContextScope scope = continuation.resume()) {
-                  bothResumed.countDown();
-                  closeFirst.await();
+                    bothResumed.countDown();
+                    closeFirst.await();
                 } catch (InterruptedException e) {
-                  Thread.currentThread().interrupt();
+                    Thread.currentThread().interrupt();
                 } finally {
-                  firstClosed.countDown();
+                    firstClosed.countDown();
                 }
-              });
-      Future<?> f2 =
-          executor.submit(
-              () -> {
+            });
+            Future<?> f2 = executor.submit(() -> {
                 try (ContextScope scope = continuation.resume()) {
-                  bothResumed.countDown();
-                  closeSecond.await();
+                    bothResumed.countDown();
+                    closeSecond.await();
                 } catch (InterruptedException e) {
-                  Thread.currentThread().interrupt();
+                    Thread.currentThread().interrupt();
                 }
-              });
-      bothResumed.await();
-      assertTrue(events.isEmpty(), "release should not fire while scopes are open");
-      closeFirst.countDown();
-      firstClosed.await(); // wait for f1's scope to fully close
-      assertTrue(events.isEmpty(), "release should not fire after first scope closes");
-      closeSecond.countDown();
-      assertDoesNotThrow(() -> f1.get());
-      assertDoesNotThrow(() -> f2.get());
-      assertEquals(singletonList("release"), events);
-    } finally {
-      executor.shutdown();
-    }
-  }
-
-  @Test
-  void testSameContextResumeReleasesImmediately() {
-    TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
-    Context context = root().with(TEST_KEY, "value");
-    try (ContextScope outer = context.attach()) {
-      // Context is already current; resume is a noop and continuation is released immediately
-      ContextContinuation continuation = context.capture();
-      try (ContextScope noop = continuation.resume()) {
-        assertEquals(context, current());
-        listener.assertNewEvents(
-            "update:{root}->value", "capture:value", "release:value"); // released synchronously
-      }
-      assertEquals(context, current()); // outer scope still holds context
+            });
+            bothResumed.await();
+            assertTrue(events.isEmpty(), "release should not fire while scopes are open");
+            closeFirst.countDown();
+            firstClosed.await(); // wait for f1's scope to fully close
+            assertTrue(events.isEmpty(), "release should not fire after first scope closes");
+            closeSecond.countDown();
+            assertDoesNotThrow(() -> f1.get());
+            assertDoesNotThrow(() -> f2.get());
+            assertEquals(singletonList("release"), events);
+        } finally {
+            executor.shutdown();
+        }
     }
-    listener.assertNewEvents("update:value->{root}");
-  }
 
-  @Test
-  void testOutOfOrderScopeCloseReleasesImmediately() {
-    // Recommended pattern: attach C, capture, close original scope
-    Context contextC = root().with(TEST_KEY, "C");
-    ContextContinuation continuation;
-    try (ContextScope scope = contextC.attach()) {
-      continuation = contextC.capture();
+    @Test
+    void testSameContextResumeReleasesImmediately() {
+        TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
+        Context context = root().with(TEST_KEY, "value");
+        try (ContextScope outer = context.attach()) {
+            // Context is already current; resume is a noop and continuation is released immediately
+            ContextContinuation continuation = context.capture();
+            try (ContextScope noop = continuation.resume()) {
+                assertEquals(context, current());
+                listener.assertNewEvents(
+                        "update:{root}->value", "capture:value", "release:value"); // released synchronously
+            }
+            assertEquals(context, current()); // outer scope still holds context
+        }
+        listener.assertNewEvents("update:value->{root}");
     }
 
-    TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
+    @Test
+    void testOutOfOrderScopeCloseReleasesImmediately() {
+        // Recommended pattern: attach C, capture, close original scope
+        Context contextC = root().with(TEST_KEY, "C");
+        ContextContinuation continuation;
+        try (ContextScope scope = contextC.attach()) {
+            continuation = contextC.capture();
+        }
 
-    Context contextD = root().with(TEST_KEY, "D");
-    try (ContextScope scopeR = continuation.resume()) {
-      assertEquals(contextC, current());
-      try (ContextScope scopeD = contextD.attach()) { // attaching D fires update:C->D
-        assertEquals(contextD, current());
+        TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
 
-        // close the resume scope out-of-order while D is still nested on top;
-        // release fires immediately, but update:C->{root} does not (C is not current)
-        scopeR.close();
-        listener.assertNewEvents("update:{root}->C", "update:C->D", "release:C");
-        assertEquals(contextD, current()); // D is still current
-      } // scopeD closes here: unwind D normally, restores C
-      listener.assertNewEvents("update:D->C");
-    } // try-with-resources closes scopeR again; no second release, C unwinds to root
+        Context contextD = root().with(TEST_KEY, "D");
+        try (ContextScope scopeR = continuation.resume()) {
+            assertEquals(contextC, current());
+            try (ContextScope scopeD = contextD.attach()) { // attaching D fires update:C->D
+                assertEquals(contextD, current());
 
-    assertEquals(root(), current());
-    listener.assertNewEvents("update:C->{root}");
-  }
+                // close the resume scope out-of-order while D is still nested on top;
+                // release fires immediately, but update:C->{root} does not (C is not current)
+                scopeR.close();
+                listener.assertNewEvents("update:{root}->C", "update:C->D", "release:C");
+                assertEquals(contextD, current()); // D is still current
+            } // scopeD closes here: unwind D normally, restores C
+            listener.assertNewEvents("update:D->C");
+        } // try-with-resources closes scopeR again; no second release, C unwinds to root
 
-  @Test
-  void testHoldWithOutOfOrderScopeCloseFiresReleaseOnExplicitRelease() {
-    // Regression test: hold() + out-of-order close must not corrupt the count,
-    // which would cause release() to silently no-op and lose the release event.
-    Context contextC = root().with(TEST_KEY, "C");
-    ContextContinuation continuation;
-    try (ContextScope scope = contextC.attach()) {
-      continuation = contextC.capture();
-      continuation.hold();
+        assertEquals(root(), current());
+        listener.assertNewEvents("update:C->{root}");
     }
 
-    TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
+    @Test
+    void testHoldWithOutOfOrderScopeCloseFiresReleaseOnExplicitRelease() {
+        // Regression test: hold() + out-of-order close must not corrupt the count,
+        // which would cause release() to silently no-op and lose the release event.
+        Context contextC = root().with(TEST_KEY, "C");
+        ContextContinuation continuation;
+        try (ContextScope scope = contextC.attach()) {
+            continuation = contextC.capture();
+            continuation.hold();
+        }
 
-    Context contextD = root().with(TEST_KEY, "D");
-    try (ContextScope scopeR = continuation.resume()) {
-      assertEquals(contextC, current());
-      try (ContextScope scopeD = contextD.attach()) { // attaching D fires update:C->D
-        assertEquals(contextD, current());
+        TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
 
-        scopeR.close(); // out-of-order close while D is still on top; hold prevents auto-release
-        listener.assertNewEvents("update:{root}->C", "update:C->D");
-        assertEquals(contextD, current());
-      } // scopeD closes here: unwind D, restores C
-    } // TWR closes scopeR again (now in-order); update:C->{root}, no release yet (hold is active)
+        Context contextD = root().with(TEST_KEY, "D");
+        try (ContextScope scopeR = continuation.resume()) {
+            assertEquals(contextC, current());
+            try (ContextScope scopeD = contextD.attach()) { // attaching D fires update:C->D
+                assertEquals(contextD, current());
 
-    assertEquals(root(), current());
-    listener.assertNewEvents("update:D->C", "update:C->{root}");
+                scopeR.close(); // out-of-order close while D is still on top; hold prevents auto-release
+                listener.assertNewEvents("update:{root}->C", "update:C->D");
+                assertEquals(contextD, current());
+            } // scopeD closes here: unwind D, restores C
+        } // TWR closes scopeR again (now in-order); update:C->{root}, no release yet (hold is active)
 
-    continuation.release(); // explicit release must fire release:C
-    listener.assertNewEvents("release:C");
-  }
+        assertEquals(root(), current());
+        listener.assertNewEvents("update:D->C", "update:C->{root}");
 
-  @Test
-  void testMultipleHoldCallsAreIdempotent() {
-    // Calling hold() more than once should not require more than one explicit release().
-    TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
-    Context context = root().with(TEST_KEY, "value");
-    ContextContinuation continuation;
-    try (ContextScope scope = context.attach()) {
-      continuation = context.capture();
-      continuation.hold();
-      continuation.hold(); // second hold must be a no-op
+        continuation.release(); // explicit release must fire release:C
+        listener.assertNewEvents("release:C");
     }
-    // One explicit release() is enough — no extra releases needed for the second hold().
-    continuation.release();
-    listener.assertNewEvents(
-        "update:{root}->value", "capture:value", "update:value->{root}", "release:value");
-    continuation.release(); // still idempotent after the final release
-    listener.assertNoNewEvents();
-  }
 
-  @Test
-  void testHoldAfterReleaseIsIgnored() {
-    // hold() on an already-released continuation must not resurrect it.
-    TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
-    Context context = root().with(TEST_KEY, "value");
-    ContextContinuation continuation;
-    try (ContextScope scope = context.attach()) {
-      continuation = context.capture();
+    @Test
+    void testMultipleHoldCallsAreIdempotent() {
+        // Calling hold() more than once should not require more than one explicit release().
+        TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
+        Context context = root().with(TEST_KEY, "value");
+        ContextContinuation continuation;
+        try (ContextScope scope = context.attach()) {
+            continuation = context.capture();
+            continuation.hold();
+            continuation.hold(); // second hold must be a no-op
+        }
+        // One explicit release() is enough — no extra releases needed for the second hold().
+        continuation.release();
+        listener.assertNewEvents("update:{root}->value", "capture:value", "update:value->{root}", "release:value");
+        continuation.release(); // still idempotent after the final release
+        listener.assertNoNewEvents();
     }
-    continuation.release();
-    listener.assertNewEvents(
-        "update:{root}->value", "capture:value", "update:value->{root}", "release:value");
-    continuation.hold(); // must be silently ignored
-    // resume() after release is already a noop, even with the spurious hold()
-    try (ContextScope scope = continuation.resume()) {
-      assertEquals(root(), current());
+
+    @Test
+    void testHoldAfterReleaseIsIgnored() {
+        // hold() on an already-released continuation must not resurrect it.
+        TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
+        Context context = root().with(TEST_KEY, "value");
+        ContextContinuation continuation;
+        try (ContextScope scope = context.attach()) {
+            continuation = context.capture();
+        }
+        continuation.release();
+        listener.assertNewEvents("update:{root}->value", "capture:value", "update:value->{root}", "release:value");
+        continuation.hold(); // must be silently ignored
+        // resume() after release is already a noop, even with the spurious hold()
+        try (ContextScope scope = continuation.resume()) {
+            assertEquals(root(), current());
+        }
+        continuation.release(); // must not fire a second release event
+        listener.assertNoNewEvents();
     }
-    continuation.release(); // must not fire a second release event
-    listener.assertNoNewEvents();
-  }
 
-  @Test
-  void testHoldAllowsMultipleReleaseCalls() {
-    TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
-    Context context = root().with(TEST_KEY, "value");
-    ContextContinuation continuation;
-    try (ContextScope scope = context.attach()) {
-      continuation = context.capture(); // capture while active
-      continuation.hold();
+    @Test
+    void testHoldAllowsMultipleReleaseCalls() {
+        TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
+        Context context = root().with(TEST_KEY, "value");
+        ContextContinuation continuation;
+        try (ContextScope scope = context.attach()) {
+            continuation = context.capture(); // capture while active
+            continuation.hold();
+        }
+        continuation.release();
+        listener.assertNewEvents("update:{root}->value", "capture:value", "update:value->{root}", "release:value");
+        continuation.release(); // second release is a no-op
+        listener.assertNoNewEvents();
     }
-    continuation.release();
-    listener.assertNewEvents(
-        "update:{root}->value", "capture:value", "update:value->{root}", "release:value");
-    continuation.release(); // second release is a no-op
-    listener.assertNoNewEvents();
-  }
 }
diff --git a/components/context/src/test/java/datadog/context/ContextHelpersTest.java b/components/context/src/test/java/datadog/context/ContextHelpersTest.java
index de2f1610a87..dc4de233707 100644
--- a/components/context/src/test/java/datadog/context/ContextHelpersTest.java
+++ b/components/context/src/test/java/datadog/context/ContextHelpersTest.java
@@ -34,206 +34,194 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 class ContextHelpersTest {
-  private static final Object CARRIER_1 = new Object();
-  private static final Object CARRIER_2 = new Object();
-  private static final Object UNSET_CARRIER = new Object();
-  private static final Object NON_CARRIER = new Object();
-  private static final String VALUE_1 = "value1";
-  private static final String VALUE_2 = "value2";
-
-  @BeforeAll
-  static void init() {
-    Context context1 = root().with(STRING_KEY, VALUE_1);
-    context1.attachTo(CARRIER_1);
-
-    Context context2 = root().with(STRING_KEY, VALUE_2);
-    context2.attachTo(CARRIER_2);
-
-    root().attachTo(UNSET_CARRIER);
-  }
-
-  @ParameterizedTest
-  @MethodSource("findFirstArguments")
-  void testFindFirst(Object[] carriers, String expected) {
-    assertEquals(expected, findFirst(STRING_KEY, carriers), "Cannot find first value");
-  }
-
-  static Stream<Arguments> findFirstArguments() {
-    return Stream.of(
-        arguments(emptyArray(), null),
-        arguments(arrayOf(NON_CARRIER), null),
-        arguments(arrayOf(UNSET_CARRIER), null),
-        arguments(arrayOf(CARRIER_1), VALUE_1),
-        arguments(arrayOf(CARRIER_1, CARRIER_2), VALUE_1),
-        arguments(arrayOf(NON_CARRIER, CARRIER_1), VALUE_1),
-        arguments(arrayOf(UNSET_CARRIER, CARRIER_1), VALUE_1),
-        arguments(arrayOf(CARRIER_1, NON_CARRIER), VALUE_1),
-        arguments(arrayOf(CARRIER_1, UNSET_CARRIER), VALUE_1));
-  }
-
-  @ParameterizedTest
-  @MethodSource("findAllArguments")
-  void testFindAll(Object[] carriers, Iterable<String> expected) {
-    assertIterableEquals(expected, findAll(STRING_KEY, carriers), "Cannot find all values");
-  }
-
-  static Stream<Arguments> findAllArguments() {
-    return Stream.of(
-        arguments(emptyArray(), emptyList()),
-        arguments(arrayOf(CARRIER_1), singleton(VALUE_1)),
-        arguments(arrayOf(CARRIER_1, CARRIER_2), asList(VALUE_1, VALUE_2)),
-        arguments(arrayOf(NON_CARRIER, CARRIER_1), singleton(VALUE_1)),
-        arguments(arrayOf(UNSET_CARRIER, CARRIER_1), singleton(VALUE_1)),
-        arguments(arrayOf(CARRIER_1, NON_CARRIER), singleton(VALUE_1)),
-        arguments(arrayOf(CARRIER_1, UNSET_CARRIER), singleton(VALUE_1)));
-  }
-
-  @Test
-  void testNullCarriers() {
-    assertThrows(
-        NullPointerException.class, () -> findFirst(null, CARRIER_1), "Should fail on null key");
-    assertThrows(
-        NullPointerException.class,
-        () -> findFirst(STRING_KEY, (Object) null),
-        "Should fail on null context");
-    assertThrows(
-        NullPointerException.class,
-        () -> findFirst(STRING_KEY, null, CARRIER_1),
-        "Should fail on null context");
-    assertThrows(
-        NullPointerException.class, () -> findAll(null, CARRIER_1), "Should fail on null key");
-    assertThrows(
-        NullPointerException.class,
-        () -> findAll(STRING_KEY, (Object) null),
-        "Should fail on null context");
-    assertThrows(
-        NullPointerException.class,
-        () -> findAll(STRING_KEY, null, CARRIER_1),
-        "Should fail on null context");
-  }
-
-  @Test
-  void testCurrent() {
-    assertEquals(root(), current(), "Current context is already set");
-    Context context = root().with(STRING_KEY, VALUE_1);
-    try (ContextScope ignored = context.attach()) {
-      assertEquals(
-          VALUE_1, findFirst(STRING_KEY, CURRENT), "Failed to get value from current context");
-      assertIterableEquals(
-          singleton(VALUE_1),
-          findAll(STRING_KEY, CURRENT),
-          "Failed to get value from current context");
+    private static final Object CARRIER_1 = new Object();
+    private static final Object CARRIER_2 = new Object();
+    private static final Object UNSET_CARRIER = new Object();
+    private static final Object NON_CARRIER = new Object();
+    private static final String VALUE_1 = "value1";
+    private static final String VALUE_2 = "value2";
+
+    @BeforeAll
+    static void init() {
+        Context context1 = root().with(STRING_KEY, VALUE_1);
+        context1.attachTo(CARRIER_1);
+
+        Context context2 = root().with(STRING_KEY, VALUE_2);
+        context2.attachTo(CARRIER_2);
+
+        root().attachTo(UNSET_CARRIER);
     }
-    assertEquals(root(), current(), "Current context stayed attached");
-  }
-
-  @Test
-  void testCombine() {
-    // Test general case
-    Context context1 = root().with(STRING_KEY, VALUE_1).with(BOOLEAN_KEY, true);
-    Context context2 = root().with(STRING_KEY, VALUE_2).with(FLOAT_KEY, 3.14F);
-    Context context3 = root();
-    Context context4 = root().with(FLOAT_KEY, 567F);
-
-    Context combined = combine(context1, context2, context3, context4);
-    assertEquals(VALUE_1, combined.get(STRING_KEY), "First duplicate value should be kept");
-    assertEquals(true, combined.get(BOOLEAN_KEY), "Values from first context should be kept");
-    assertEquals(3.14F, combined.get(FLOAT_KEY), "Values from second context should be kept");
-
-    // Test SingletonContext optimization
-    context1 = root().with(STRING_KEY, VALUE_1);
-    context2 = root().with(STRING_KEY, VALUE_2);
-    combined = combine(context1, context2);
-    assertEquals(VALUE_1, combined.get(STRING_KEY), "First duplicate value should be kept");
-
-    // Test IndexedContext optimization where later context has more elements
-    context1 = root().with(STRING_KEY, VALUE_1).with(FLOAT_KEY, 3.14F);
-    context2 = root().with(STRING_KEY, VALUE_2).with(LONG_KEY, 567L);
-    combined = combine(context1, context2);
-    assertEquals(VALUE_1, combined.get(STRING_KEY), "First duplicate value should be kept");
-    assertEquals(3.14F, combined.get(FLOAT_KEY), "Values from first context should be kept");
-    assertEquals(567L, combined.get(LONG_KEY), "Values from first context should be kept");
-
-    // Test IndexedContext optimization where context has same size but only later context has value
-    context1 = root().with(LONG_KEY, 567L).with(STRING_KEY, VALUE_1);
-    context2 = root().with(LONG_KEY, 789L).with(FLOAT_KEY, 3.14F);
-    combined = combine(context1, context2);
-    assertEquals(567L, combined.get(LONG_KEY), "First duplicate value should be kept");
-    assertEquals(VALUE_1, combined.get(STRING_KEY), "Values from first context should be kept");
-    assertEquals(3.14F, combined.get(FLOAT_KEY), "Values from first context should be kept");
-
-    // Test IndexedContext optimization with same size context and no new values
-    context1 = root().with(STRING_KEY, VALUE_1).with(LONG_KEY, 567L);
-    context2 = root().with(STRING_KEY, VALUE_2).with(LONG_KEY, 789L);
-    combined = combine(context1, context2);
-    assertEquals(VALUE_1, combined.get(STRING_KEY), "First duplicate value should be kept");
-    assertEquals(567L, combined.get(LONG_KEY), "First duplicate value should be kept");
-  }
-
-  @Test
-  void testCombiner() {
-    ContextKey<ErrorStats> errorKey = ContextKey.named("error");
-    Context context1 = root().with(errorKey, ErrorStats.from(INFO, 12)).with(STRING_KEY, VALUE_1);
-    Context context2 = root().with(errorKey, ErrorStats.from(SEVERE, 1)).with(FLOAT_KEY, 3.14F);
-    Context context3 = root().with(errorKey, ErrorStats.from(WARNING, 6)).with(BOOLEAN_KEY, true);
-
-    BinaryOperator<Context> errorStatsMerger =
-        (left, right) -> {
-          ErrorStats mergedStats = ErrorStats.merge(left.get(errorKey), right.get(errorKey));
-          return left.with(errorKey, mergedStats);
+
+    @ParameterizedTest
+    @MethodSource("findFirstArguments")
+    void testFindFirst(Object[] carriers, String expected) {
+        assertEquals(expected, findFirst(STRING_KEY, carriers), "Cannot find first value");
+    }
+
+    static Stream<Arguments> findFirstArguments() {
+        return Stream.of(
+                arguments(emptyArray(), null),
+                arguments(arrayOf(NON_CARRIER), null),
+                arguments(arrayOf(UNSET_CARRIER), null),
+                arguments(arrayOf(CARRIER_1), VALUE_1),
+                arguments(arrayOf(CARRIER_1, CARRIER_2), VALUE_1),
+                arguments(arrayOf(NON_CARRIER, CARRIER_1), VALUE_1),
+                arguments(arrayOf(UNSET_CARRIER, CARRIER_1), VALUE_1),
+                arguments(arrayOf(CARRIER_1, NON_CARRIER), VALUE_1),
+                arguments(arrayOf(CARRIER_1, UNSET_CARRIER), VALUE_1));
+    }
+
+    @ParameterizedTest
+    @MethodSource("findAllArguments")
+    void testFindAll(Object[] carriers, Iterable<String> expected) {
+        assertIterableEquals(expected, findAll(STRING_KEY, carriers), "Cannot find all values");
+    }
+
+    static Stream<Arguments> findAllArguments() {
+        return Stream.of(
+                arguments(emptyArray(), emptyList()),
+                arguments(arrayOf(CARRIER_1), singleton(VALUE_1)),
+                arguments(arrayOf(CARRIER_1, CARRIER_2), asList(VALUE_1, VALUE_2)),
+                arguments(arrayOf(NON_CARRIER, CARRIER_1), singleton(VALUE_1)),
+                arguments(arrayOf(UNSET_CARRIER, CARRIER_1), singleton(VALUE_1)),
+                arguments(arrayOf(CARRIER_1, NON_CARRIER), singleton(VALUE_1)),
+                arguments(arrayOf(CARRIER_1, UNSET_CARRIER), singleton(VALUE_1)));
+    }
+
+    @Test
+    void testNullCarriers() {
+        assertThrows(NullPointerException.class, () -> findFirst(null, CARRIER_1), "Should fail on null key");
+        assertThrows(
+                NullPointerException.class, () -> findFirst(STRING_KEY, (Object) null), "Should fail on null context");
+        assertThrows(
+                NullPointerException.class,
+                () -> findFirst(STRING_KEY, null, CARRIER_1),
+                "Should fail on null context");
+        assertThrows(NullPointerException.class, () -> findAll(null, CARRIER_1), "Should fail on null key");
+        assertThrows(
+                NullPointerException.class, () -> findAll(STRING_KEY, (Object) null), "Should fail on null context");
+        assertThrows(
+                NullPointerException.class, () -> findAll(STRING_KEY, null, CARRIER_1), "Should fail on null context");
+    }
+
+    @Test
+    void testCurrent() {
+        assertEquals(root(), current(), "Current context is already set");
+        Context context = root().with(STRING_KEY, VALUE_1);
+        try (ContextScope ignored = context.attach()) {
+            assertEquals(VALUE_1, findFirst(STRING_KEY, CURRENT), "Failed to get value from current context");
+            assertIterableEquals(
+                    singleton(VALUE_1), findAll(STRING_KEY, CURRENT), "Failed to get value from current context");
+        }
+        assertEquals(root(), current(), "Current context stayed attached");
+    }
+
+    @Test
+    void testCombine() {
+        // Test general case
+        Context context1 = root().with(STRING_KEY, VALUE_1).with(BOOLEAN_KEY, true);
+        Context context2 = root().with(STRING_KEY, VALUE_2).with(FLOAT_KEY, 3.14F);
+        Context context3 = root();
+        Context context4 = root().with(FLOAT_KEY, 567F);
+
+        Context combined = combine(context1, context2, context3, context4);
+        assertEquals(VALUE_1, combined.get(STRING_KEY), "First duplicate value should be kept");
+        assertEquals(true, combined.get(BOOLEAN_KEY), "Values from first context should be kept");
+        assertEquals(3.14F, combined.get(FLOAT_KEY), "Values from second context should be kept");
+
+        // Test SingletonContext optimization
+        context1 = root().with(STRING_KEY, VALUE_1);
+        context2 = root().with(STRING_KEY, VALUE_2);
+        combined = combine(context1, context2);
+        assertEquals(VALUE_1, combined.get(STRING_KEY), "First duplicate value should be kept");
+
+        // Test IndexedContext optimization where later context has more elements
+        context1 = root().with(STRING_KEY, VALUE_1).with(FLOAT_KEY, 3.14F);
+        context2 = root().with(STRING_KEY, VALUE_2).with(LONG_KEY, 567L);
+        combined = combine(context1, context2);
+        assertEquals(VALUE_1, combined.get(STRING_KEY), "First duplicate value should be kept");
+        assertEquals(3.14F, combined.get(FLOAT_KEY), "Values from first context should be kept");
+        assertEquals(567L, combined.get(LONG_KEY), "Values from first context should be kept");
+
+        // Test IndexedContext optimization where context has same size but only later context has value
+        context1 = root().with(LONG_KEY, 567L).with(STRING_KEY, VALUE_1);
+        context2 = root().with(LONG_KEY, 789L).with(FLOAT_KEY, 3.14F);
+        combined = combine(context1, context2);
+        assertEquals(567L, combined.get(LONG_KEY), "First duplicate value should be kept");
+        assertEquals(VALUE_1, combined.get(STRING_KEY), "Values from first context should be kept");
+        assertEquals(3.14F, combined.get(FLOAT_KEY), "Values from first context should be kept");
+
+        // Test IndexedContext optimization with same size context and no new values
+        context1 = root().with(STRING_KEY, VALUE_1).with(LONG_KEY, 567L);
+        context2 = root().with(STRING_KEY, VALUE_2).with(LONG_KEY, 789L);
+        combined = combine(context1, context2);
+        assertEquals(VALUE_1, combined.get(STRING_KEY), "First duplicate value should be kept");
+        assertEquals(567L, combined.get(LONG_KEY), "First duplicate value should be kept");
+    }
+
+    @Test
+    void testCombiner() {
+        ContextKey<ErrorStats> errorKey = ContextKey.named("error");
+        Context context1 = root().with(errorKey, ErrorStats.from(INFO, 12)).with(STRING_KEY, VALUE_1);
+        Context context2 = root().with(errorKey, ErrorStats.from(SEVERE, 1)).with(FLOAT_KEY, 3.14F);
+        Context context3 = root().with(errorKey, ErrorStats.from(WARNING, 6)).with(BOOLEAN_KEY, true);
+
+        BinaryOperator<Context> errorStatsMerger = (left, right) -> {
+            ErrorStats mergedStats = ErrorStats.merge(left.get(errorKey), right.get(errorKey));
+            return left.with(errorKey, mergedStats);
         };
-    Context combined = combine(errorStatsMerger, context1, context2, context3);
-    ErrorStats combinedStats = combined.get(errorKey);
-    assertNotNull(combinedStats, "Failed to combined error stats");
-    assertEquals(19, combinedStats.errorCount, "Failed to combine error stats");
-    assertEquals(SEVERE, combinedStats.maxLevel, "Failed to combine error stats");
-    assertNull(combined.get(STRING_KEY), "Combiner should drop any other context values");
-    assertNull(combined.get(FLOAT_KEY), "Combiner should drop any other context values");
-    assertNull(combined.get(BOOLEAN_KEY), "Combiner should drop any other context values");
-  }
-
-  @Test
-  void testNullCombine() {
-    assertThrows(
-        NullPointerException.class,
-        () -> combine((BinaryOperator<Context>) null, root()),
-        "Should fail on null combiner");
-    assertThrows(
-        NullPointerException.class,
-        () -> combine((left, right) -> left, (Context) null),
-        "Should fail on null context");
-  }
-
-  private static class ErrorStats {
-    int errorCount;
-    Level maxLevel;
-
-    public ErrorStats() {
-      this.errorCount = 0;
-      this.maxLevel = ALL;
+        Context combined = combine(errorStatsMerger, context1, context2, context3);
+        ErrorStats combinedStats = combined.get(errorKey);
+        assertNotNull(combinedStats, "Failed to combined error stats");
+        assertEquals(19, combinedStats.errorCount, "Failed to combine error stats");
+        assertEquals(SEVERE, combinedStats.maxLevel, "Failed to combine error stats");
+        assertNull(combined.get(STRING_KEY), "Combiner should drop any other context values");
+        assertNull(combined.get(FLOAT_KEY), "Combiner should drop any other context values");
+        assertNull(combined.get(BOOLEAN_KEY), "Combiner should drop any other context values");
     }
 
-    public static ErrorStats from(Level logLevel, int count) {
-      ErrorStats stats = new ErrorStats();
-      stats.errorCount = count;
-      stats.maxLevel = logLevel;
-      return stats;
+    @Test
+    void testNullCombine() {
+        assertThrows(
+                NullPointerException.class,
+                () -> combine((BinaryOperator<Context>) null, root()),
+                "Should fail on null combiner");
+        assertThrows(
+                NullPointerException.class,
+                () -> combine((left, right) -> left, (Context) null),
+                "Should fail on null context");
     }
 
-    public static ErrorStats merge(ErrorStats a, ErrorStats b) {
-      if (a == null) {
-        return b;
-      }
-      Level maxLevel = a.maxLevel.intValue() > b.maxLevel.intValue() ? a.maxLevel : b.maxLevel;
-      return from(maxLevel, a.errorCount + b.errorCount);
+    private static class ErrorStats {
+        int errorCount;
+        Level maxLevel;
+
+        public ErrorStats() {
+            this.errorCount = 0;
+            this.maxLevel = ALL;
+        }
+
+        public static ErrorStats from(Level logLevel, int count) {
+            ErrorStats stats = new ErrorStats();
+            stats.errorCount = count;
+            stats.maxLevel = logLevel;
+            return stats;
+        }
+
+        public static ErrorStats merge(ErrorStats a, ErrorStats b) {
+            if (a == null) {
+                return b;
+            }
+            Level maxLevel = a.maxLevel.intValue() > b.maxLevel.intValue() ? a.maxLevel : b.maxLevel;
+            return from(maxLevel, a.errorCount + b.errorCount);
+        }
     }
-  }
 
-  private static Object[] emptyArray() {
-    return new Object[0];
-  }
+    private static Object[] emptyArray() {
+        return new Object[0];
+    }
 
-  private static Object[] arrayOf(Object... objects) {
-    return objects;
-  }
+    private static Object[] arrayOf(Object... objects) {
+        return objects;
+    }
 }
diff --git a/components/context/src/test/java/datadog/context/ContextKeyTest.java b/components/context/src/test/java/datadog/context/ContextKeyTest.java
index 3ff674145da..75f81ee3216 100644
--- a/components/context/src/test/java/datadog/context/ContextKeyTest.java
+++ b/components/context/src/test/java/datadog/context/ContextKeyTest.java
@@ -13,48 +13,41 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 class ContextKeyTest {
-  @ParameterizedTest
-  @NullAndEmptySource
-  @ValueSource(strings = {"key"})
-  void testConstructor(String name) {
-    ContextKey<String> key = ContextKey.named(name);
-    assertNotNull(key, "created key should not be null");
-    assertEquals(name, key.toString(), name + " label should be supported");
-  }
+    @ParameterizedTest
+    @NullAndEmptySource
+    @ValueSource(strings = {"key"})
+    void testConstructor(String name) {
+        ContextKey<String> key = ContextKey.named(name);
+        assertNotNull(key, "created key should not be null");
+        assertEquals(name, key.toString(), name + " label should be supported");
+    }
 
-  @Test
-  void testKeyNameCollision() {
-    ContextKey<String> key1 = ContextKey.named("same-name");
-    ContextKey<String> key2 = ContextKey.named("same-name");
-    assertNotEquals(key1, key2, "distinct keys should not be equal");
-    String value = "value";
-    Context context = Context.root().with(key1, value);
-    assertEquals(value, context.get(key1), "the original key should be able to retrieve the value");
-    assertNull(context.get(key2), "the distinct keys should not be able to retrieve the value");
-  }
+    @Test
+    void testKeyNameCollision() {
+        ContextKey<String> key1 = ContextKey.named("same-name");
+        ContextKey<String> key2 = ContextKey.named("same-name");
+        assertNotEquals(key1, key2, "distinct keys should not be equal");
+        String value = "value";
+        Context context = Context.root().with(key1, value);
+        assertEquals(value, context.get(key1), "the original key should be able to retrieve the value");
+        assertNull(context.get(key2), "the distinct keys should not be able to retrieve the value");
+    }
 
-  @SuppressWarnings({
-    "EqualsWithItself",
-    "SimplifiableAssertion",
-    "ConstantValue",
-    "EqualsBetweenInconvertibleTypes"
-  })
-  @Test
-  void testEqualsAndHashCode() {
-    ContextKey<String> key1 = ContextKey.named("some-name");
-    ContextKey<String> key2 = ContextKey.named("some-name");
-    // Test equals on self
-    assertTrue(key1.equals(key1), "Key should be equal with itself");
-    assertEquals(key1.hashCode(), key1.hashCode(), "key hash should be constant");
-    // Test equals on null
-    assertFalse(key1.equals(null), "key should not be equal to null value");
-    // Test equals on different object type
-    assertFalse(key1.equals("value"), "key should not be equal to a different type");
-    // Test equals on different keys with the same name
-    assertFalse(key1.equals(key2), "different keys with the same name should not be equal");
-    assertNotEquals(
-        key1.hashCode(),
-        key2.hashCode(),
-        "different keys with the same name should have the same hash");
-  }
+    @SuppressWarnings({"EqualsWithItself", "SimplifiableAssertion", "ConstantValue", "EqualsBetweenInconvertibleTypes"})
+    @Test
+    void testEqualsAndHashCode() {
+        ContextKey<String> key1 = ContextKey.named("some-name");
+        ContextKey<String> key2 = ContextKey.named("some-name");
+        // Test equals on self
+        assertTrue(key1.equals(key1), "Key should be equal with itself");
+        assertEquals(key1.hashCode(), key1.hashCode(), "key hash should be constant");
+        // Test equals on null
+        assertFalse(key1.equals(null), "key should not be equal to null value");
+        // Test equals on different object type
+        assertFalse(key1.equals("value"), "key should not be equal to a different type");
+        // Test equals on different keys with the same name
+        assertFalse(key1.equals(key2), "different keys with the same name should not be equal");
+        assertNotEquals(
+                key1.hashCode(), key2.hashCode(), "different keys with the same name should have the same hash");
+    }
 }
diff --git a/components/context/src/test/java/datadog/context/ContextListenerEventTest.java b/components/context/src/test/java/datadog/context/ContextListenerEventTest.java
index db71cc8438f..54500896a93 100644
--- a/components/context/src/test/java/datadog/context/ContextListenerEventTest.java
+++ b/components/context/src/test/java/datadog/context/ContextListenerEventTest.java
@@ -8,91 +8,91 @@
 import org.junit.jupiter.api.Test;
 
 class ContextListenerEventTest extends ContextTestBase {
-  @Test
-  void testListenersNotifiedOnAttachAndDetach() {
-    TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
-    Context context = root().with(TEST_KEY, "value");
-    try (ContextScope scope = context.attach()) {
-      listener.assertNewEvents("update:{root}->value");
+    @Test
+    void testListenersNotifiedOnAttachAndDetach() {
+        TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
+        Context context = root().with(TEST_KEY, "value");
+        try (ContextScope scope = context.attach()) {
+            listener.assertNewEvents("update:{root}->value");
+        }
+        listener.assertNewEvents("update:value->{root}");
     }
-    listener.assertNewEvents("update:value->{root}");
-  }
 
-  @Test
-  void testListenersNotNotifiedForSameContextAttachOrSwap() {
-    TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
-    root().attach(); // current is already root, no events
-    listener.assertNoEvents();
-    root().swap(); // current is already root, no events
-    listener.assertNoEvents();
-    Context context = root().with(TEST_KEY, "value");
-    try (ContextScope scope = context.attach()) {
-      listener.assertNewEvents("update:{root}->value");
+    @Test
+    void testListenersNotNotifiedForSameContextAttachOrSwap() {
+        TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
+        root().attach(); // current is already root, no events
+        listener.assertNoEvents();
+        root().swap(); // current is already root, no events
+        listener.assertNoEvents();
+        Context context = root().with(TEST_KEY, "value");
+        try (ContextScope scope = context.attach()) {
+            listener.assertNewEvents("update:{root}->value");
+        }
+        listener.assertNewEvents("update:value->{root}");
     }
-    listener.assertNewEvents("update:value->{root}");
-  }
 
-  @Test
-  void testListenersNotNotifiedOnSameContextAttach() {
-    TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
-    Context context = root().with(TEST_KEY, "same");
-    try (ContextScope outer = context.attach()) {
-      listener.assertNewEvents("update:{root}->same");
-      try (ContextScope noop = context.attach()) {
-        assertEquals(context, current());
-        listener.assertNoNewEvents(); // no new events on same-context attach
-      }
-      listener.assertNoNewEvents(); // noop close fires no events either
+    @Test
+    void testListenersNotNotifiedOnSameContextAttach() {
+        TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
+        Context context = root().with(TEST_KEY, "same");
+        try (ContextScope outer = context.attach()) {
+            listener.assertNewEvents("update:{root}->same");
+            try (ContextScope noop = context.attach()) {
+                assertEquals(context, current());
+                listener.assertNoNewEvents(); // no new events on same-context attach
+            }
+            listener.assertNoNewEvents(); // noop close fires no events either
+        }
+        listener.assertNewEvents("update:same->{root}");
     }
-    listener.assertNewEvents("update:same->{root}");
-  }
 
-  @Test
-  void testListenersNotNotifiedOnSameContextSwap() {
-    TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
-    Context context = root().with(TEST_KEY, "same");
-    context.swap();
-    listener.assertNewEvents("update:{root}->same");
-    context.swap(); // same context again, no events
-    listener.assertNoNewEvents();
-    root().swap();
-    listener.assertNewEvents("update:same->{root}");
-  }
+    @Test
+    void testListenersNotNotifiedOnSameContextSwap() {
+        TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
+        Context context = root().with(TEST_KEY, "same");
+        context.swap();
+        listener.assertNewEvents("update:{root}->same");
+        context.swap(); // same context again, no events
+        listener.assertNoNewEvents();
+        root().swap();
+        listener.assertNewEvents("update:same->{root}");
+    }
 
-  @Test
-  void testDuplicateListenerIgnored() {
-    TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
-    ContextManager.register(listener); // should be ignored
-    try (ContextScope scope = root().with(TEST_KEY, "value").attach()) {}
-    listener.assertEvents("update:{root}->value", "update:value->{root}");
-  }
+    @Test
+    void testDuplicateListenerIgnored() {
+        TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
+        ContextManager.register(listener); // should be ignored
+        try (ContextScope scope = root().with(TEST_KEY, "value").attach()) {}
+        listener.assertEvents("update:{root}->value", "update:value->{root}");
+    }
 
-  @Test
-  void testMultipleListenersAllNotified() {
-    TrackingListener listener1 = trackingListener();
-    TrackingListener listener2 = trackingListener();
-    ContextManager.register(listener1);
-    ContextManager.register(listener2);
-    try (ContextScope scope = root().with(TEST_KEY, "value").attach()) {}
-    listener1.assertEvents("update:{root}->value", "update:value->{root}");
-    listener2.assertEvents("update:{root}->value", "update:value->{root}");
-  }
+    @Test
+    void testMultipleListenersAllNotified() {
+        TrackingListener listener1 = trackingListener();
+        TrackingListener listener2 = trackingListener();
+        ContextManager.register(listener1);
+        ContextManager.register(listener2);
+        try (ContextScope scope = root().with(TEST_KEY, "value").attach()) {}
+        listener1.assertEvents("update:{root}->value", "update:value->{root}");
+        listener2.assertEvents("update:{root}->value", "update:value->{root}");
+    }
 
-  @Test
-  void testSwapNotifiesListeners() {
-    TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
-    Context context = root().with(TEST_KEY, "value");
-    Context previous = context.swap();
-    assertSame(root(), previous);
-    listener.assertNewEvents("update:{root}->value");
-    previous = root().swap();
-    assertSame(context, previous);
-    listener.assertNewEvents("update:value->{root}");
-  }
+    @Test
+    void testSwapNotifiesListeners() {
+        TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
+        Context context = root().with(TEST_KEY, "value");
+        Context previous = context.swap();
+        assertSame(root(), previous);
+        listener.assertNewEvents("update:{root}->value");
+        previous = root().swap();
+        assertSame(context, previous);
+        listener.assertNewEvents("update:value->{root}");
+    }
 }
diff --git a/components/context/src/test/java/datadog/context/ContextListenerExceptionTest.java b/components/context/src/test/java/datadog/context/ContextListenerExceptionTest.java
index 160873e7103..ddd113f5087 100644
--- a/components/context/src/test/java/datadog/context/ContextListenerExceptionTest.java
+++ b/components/context/src/test/java/datadog/context/ContextListenerExceptionTest.java
@@ -11,58 +11,53 @@
 
 @ParametersAreNonnullByDefault
 class ContextListenerExceptionTest extends ContextTestBase {
-  @Test
-  void testListenerExceptionSwallowed() {
-    ContextManager.register(
-        new ContextListener() {
-          @Override
-          public void onUpdate(Context before, Context after) {
-            throw new RuntimeException("listener failure");
-          }
+    @Test
+    void testListenerExceptionSwallowed() {
+        ContextManager.register(new ContextListener() {
+            @Override
+            public void onUpdate(Context before, Context after) {
+                throw new RuntimeException("listener failure");
+            }
         });
-    Context context = root().with(TEST_KEY, "value");
-    assertDoesNotThrow(
-        () -> {
-          try (ContextScope scope = context.attach()) {
-            assertEquals(context, current());
-          }
+        Context context = root().with(TEST_KEY, "value");
+        assertDoesNotThrow(() -> {
+            try (ContextScope scope = context.attach()) {
+                assertEquals(context, current());
+            }
         });
-  }
+    }
 
-  @Test
-  void testListenerExceptionSwallowedOnCapture() {
-    ContextManager.register(
-        new ContextListener() {
-          @Override
-          public void onCapture(Context c) {
-            throw new RuntimeException("listener failure on capture");
-          }
+    @Test
+    void testListenerExceptionSwallowedOnCapture() {
+        ContextManager.register(new ContextListener() {
+            @Override
+            public void onCapture(Context c) {
+                throw new RuntimeException("listener failure on capture");
+            }
         });
-    Context context = root().with(TEST_KEY, "value");
-    try (ContextScope scope = context.attach()) {
-      assertDoesNotThrow(
-          () -> {
-            ContextContinuation continuation = context.capture();
-            assertNotNull(continuation);
-            assertEquals(context, continuation.context());
-            continuation.release();
-          });
+        Context context = root().with(TEST_KEY, "value");
+        try (ContextScope scope = context.attach()) {
+            assertDoesNotThrow(() -> {
+                ContextContinuation continuation = context.capture();
+                assertNotNull(continuation);
+                assertEquals(context, continuation.context());
+                continuation.release();
+            });
+        }
     }
-  }
 
-  @Test
-  void testListenerExceptionSwallowedOnRelease() {
-    ContextManager.register(
-        new ContextListener() {
-          @Override
-          public void onRelease(Context c) {
-            throw new RuntimeException("listener failure on release");
-          }
+    @Test
+    void testListenerExceptionSwallowedOnRelease() {
+        ContextManager.register(new ContextListener() {
+            @Override
+            public void onRelease(Context c) {
+                throw new RuntimeException("listener failure on release");
+            }
         });
-    Context context = root().with(TEST_KEY, "value");
-    try (ContextScope scope = context.attach()) {
-      ContextContinuation continuation = context.capture();
-      assertDoesNotThrow(continuation::release);
+        Context context = root().with(TEST_KEY, "value");
+        try (ContextScope scope = context.attach()) {
+            ContextContinuation continuation = context.capture();
+            assertDoesNotThrow(continuation::release);
+        }
     }
-  }
 }
diff --git a/components/context/src/test/java/datadog/context/ContextManagerTest.java b/components/context/src/test/java/datadog/context/ContextManagerTest.java
index 789f6fc6eaf..4dc011e8185 100644
--- a/components/context/src/test/java/datadog/context/ContextManagerTest.java
+++ b/components/context/src/test/java/datadog/context/ContextManagerTest.java
@@ -13,176 +13,172 @@
 import org.junit.jupiter.api.Test;
 
 class ContextManagerTest extends ContextTestBase {
-  @Test
-  void testContextAttachment() {
-    Context context1 = root().with(STRING_KEY, "value1");
-    try (ContextScope scope1 = context1.attach()) {
-      // Test context1 is attached
-      assertEquals(context1, current());
-      assertEquals(context1, scope1.context());
-      Context context2 = context1.with(STRING_KEY, "value2");
-      try (ContextScope scope2 = context2.attach()) {
+    @Test
+    void testContextAttachment() {
+        Context context1 = root().with(STRING_KEY, "value1");
+        try (ContextScope scope1 = context1.attach()) {
+            // Test context1 is attached
+            assertEquals(context1, current());
+            assertEquals(context1, scope1.context());
+            Context context2 = context1.with(STRING_KEY, "value2");
+            try (ContextScope scope2 = context2.attach()) {
+                // Test context2 is attached
+                assertEquals(context2, current());
+                assertEquals(context2, scope2.context());
+                // Can still access context1 from its scope
+                assertEquals(context1, scope1.context());
+            }
+            // Test context1 is restored
+            assertEquals(context1, current());
+        }
+    }
+
+    @Test
+    void testContextSwapping() {
+        Context context1 = root().with(STRING_KEY, "value1");
+        assertEquals(root(), current());
+        assertEquals(root(), context1.swap());
+        // Test context1 is attached
+        Context context2 = context1.with(STRING_KEY, "value2");
+        assertEquals(context1, current());
+        assertEquals(context1, context2.swap());
         // Test context2 is attached
         assertEquals(context2, current());
-        assertEquals(context2, scope2.context());
-        // Can still access context1 from its scope
-        assertEquals(context1, scope1.context());
-      }
-      // Test context1 is restored
-      assertEquals(context1, current());
+        assertEquals(context2, root().swap());
+        // Test we're now context-less
+        assertEquals(root(), current());
     }
-  }
-
-  @Test
-  void testContextSwapping() {
-    Context context1 = root().with(STRING_KEY, "value1");
-    assertEquals(root(), current());
-    assertEquals(root(), context1.swap());
-    // Test context1 is attached
-    Context context2 = context1.with(STRING_KEY, "value2");
-    assertEquals(context1, current());
-    assertEquals(context1, context2.swap());
-    // Test context2 is attached
-    assertEquals(context2, current());
-    assertEquals(context2, root().swap());
-    // Test we're now context-less
-    assertEquals(root(), current());
-  }
 
-  @Test
-  void testNoopScopeContextReturnsAttachedContext() {
-    Context context = root().with(STRING_KEY, "value");
-    try (ContextScope outer = context.attach()) {
-      // second attach returns a noop scope; verify context() reflects the attached context
-      try (ContextScope noop = context.attach()) {
-        assertEquals(context, noop.context());
-      }
+    @Test
+    void testNoopScopeContextReturnsAttachedContext() {
+        Context context = root().with(STRING_KEY, "value");
+        try (ContextScope outer = context.attach()) {
+            // second attach returns a noop scope; verify context() reflects the attached context
+            try (ContextScope noop = context.attach()) {
+                assertEquals(context, noop.context());
+            }
+        }
     }
-  }
 
-  @Test
-  void testNoopScopeReturnsCorrectContext() {
-    Context context = root().with(STRING_KEY, "value");
-    try (ContextScope outer = context.attach()) {
-      try (ContextScope noop1 = context.attach();
-          ContextScope noop2 = context.attach()) {
-        assertEquals(context, noop1.context());
-        assertEquals(context, noop2.context());
-      }
+    @Test
+    void testNoopScopeReturnsCorrectContext() {
+        Context context = root().with(STRING_KEY, "value");
+        try (ContextScope outer = context.attach()) {
+            try (ContextScope noop1 = context.attach();
+                    ContextScope noop2 = context.attach()) {
+                assertEquals(context, noop1.context());
+                assertEquals(context, noop2.context());
+            }
+        }
     }
-  }
 
-  @Test
-  void testNoopScopeCorrectContextAcrossManyContexts() {
-    for (int i = 0; i < 200; i++) {
-      Context ctx = root().with(STRING_KEY, "ctx-" + i);
-      try (ContextScope outer = ctx.attach()) {
-        try (ContextScope noop = ctx.attach()) {
-          assertEquals(ctx, noop.context());
+    @Test
+    void testNoopScopeCorrectContextAcrossManyContexts() {
+        for (int i = 0; i < 200; i++) {
+            Context ctx = root().with(STRING_KEY, "ctx-" + i);
+            try (ContextScope outer = ctx.attach()) {
+                try (ContextScope noop = ctx.attach()) {
+                    assertEquals(ctx, noop.context());
+                }
+            }
         }
-      }
     }
-  }
 
-  @Test
-  void testAttachSameContextMultipleTimes() {
-    Context context = root().with(STRING_KEY, "value1");
-    try (ContextScope scope1 = context.attach()) {
-      assertEquals(context, current());
-      // re-attaching an already-active context returns a noop scope
-      try (ContextScope noop2 = context.attach()) {
-        assertEquals(context, noop2.context());
-        try (ContextScope noop3 = context.attach()) {
-          assertEquals(context, noop3.context());
+    @Test
+    void testAttachSameContextMultipleTimes() {
+        Context context = root().with(STRING_KEY, "value1");
+        try (ContextScope scope1 = context.attach()) {
+            assertEquals(context, current());
+            // re-attaching an already-active context returns a noop scope
+            try (ContextScope noop2 = context.attach()) {
+                assertEquals(context, noop2.context());
+                try (ContextScope noop3 = context.attach()) {
+                    assertEquals(context, noop3.context());
+                }
+                assertEquals(context, current()); // noop close: context remains active
+            }
+            assertEquals(context, current()); // still active after all noop closes
         }
-        assertEquals(context, current()); // noop close: context remains active
-      }
-      assertEquals(context, current()); // still active after all noop closes
+        assertEquals(root(), current()); // only the original scope deactivates on close
     }
-    assertEquals(root(), current()); // only the original scope deactivates on close
-  }
 
-  @Test
-  void testOnlyCurrentScopeCanBeClosed() {
-    Context context1 = root().with(STRING_KEY, "value1");
-    try (ContextScope scope1 = context1.attach()) {
-      Context context2 = context1.with(STRING_KEY, "value2");
-      try (ContextScope ignored = context2.attach()) {
-        // Try closing the non-current scope
-        scope1.close();
-        // Test context2 is still attached
-        assertEquals(context2, current());
-      }
-      // Test context1 is restored
-      assertEquals(context1, current());
+    @Test
+    void testOnlyCurrentScopeCanBeClosed() {
+        Context context1 = root().with(STRING_KEY, "value1");
+        try (ContextScope scope1 = context1.attach()) {
+            Context context2 = context1.with(STRING_KEY, "value2");
+            try (ContextScope ignored = context2.attach()) {
+                // Try closing the non-current scope
+                scope1.close();
+                // Test context2 is still attached
+                assertEquals(context2, current());
+            }
+            // Test context1 is restored
+            assertEquals(context1, current());
+        }
     }
-  }
 
-  @Test
-  void testClosingMultipleTimes() {
-    Context context1 = root().with(STRING_KEY, "value1");
-    try (ContextScope ignored = context1.attach()) {
-      Context context2 = context1.with(STRING_KEY, "value2");
-      try (ContextScope scope = context2.attach()) {
-        // Test current context
-        assertEquals(context2, current());
-        // Test current context deactivation
-        scope.close();
-        assertEquals(context1, current());
-        // Test multiple context deactivations don’t change current context
-        scope.close();
-        assertEquals(context1, current());
-      }
+    @Test
+    void testClosingMultipleTimes() {
+        Context context1 = root().with(STRING_KEY, "value1");
+        try (ContextScope ignored = context1.attach()) {
+            Context context2 = context1.with(STRING_KEY, "value2");
+            try (ContextScope scope = context2.attach()) {
+                // Test current context
+                assertEquals(context2, current());
+                // Test current context deactivation
+                scope.close();
+                assertEquals(context1, current());
+                // Test multiple context deactivations don’t change current context
+                scope.close();
+                assertEquals(context1, current());
+            }
+        }
     }
-  }
 
-  @Test
-  void testThreadIndependence() {
-    /*
-     * This test has 2 executors in addition to the main thread.
-     * They are synchronized using a Phaser, and arrived before each assert phase.
-     * If an assert fails in of one the executor, the executor is "deregister" to unblock the test,
-     * and the exception is restored at the end of the test using "Future.get()".
-     */
-    ExecutorService executor = Executors.newFixedThreadPool(2);
-    Phaser phaser = new Phaser(3);
-    /*
-     * Create first executor.
-     */
-    Future<?> future1 =
-        executor.submit(
-            () -> {
-              try {
+    @Test
+    void testThreadIndependence() {
+        /*
+         * This test has 2 executors in addition to the main thread.
+         * They are synchronized using a Phaser, and arrived before each assert phase.
+         * If an assert fails in of one the executor, the executor is "deregister" to unblock the test,
+         * and the exception is restored at the end of the test using "Future.get()".
+         */
+        ExecutorService executor = Executors.newFixedThreadPool(2);
+        Phaser phaser = new Phaser(3);
+        /*
+         * Create first executor.
+         */
+        Future<?> future1 = executor.submit(() -> {
+            try {
                 // Fist step: check empty context
                 phaser.arriveAndAwaitAdvance();
                 assertEquals(root(), current());
                 // Second step: set context on first executor
                 Context context1 = root().with(STRING_KEY, "executor1");
                 try (ContextScope ignored1 = context1.attach()) {
-                  phaser.arriveAndAwaitAdvance();
-                  assertEquals(context1, current());
-                  // Third step: set context on second executor
-                  phaser.arriveAndAwaitAdvance();
-                  assertEquals(context1, current());
-                  // Fourth step: set child context on first executor
-                  Context context11 = context1.with(STRING_KEY, "executor1.1");
-                  try (ContextScope ignored11 = context11.attach()) {
                     phaser.arriveAndAwaitAdvance();
-                    assertEquals(context11, current());
-                  }
+                    assertEquals(context1, current());
+                    // Third step: set context on second executor
+                    phaser.arriveAndAwaitAdvance();
+                    assertEquals(context1, current());
+                    // Fourth step: set child context on first executor
+                    Context context11 = context1.with(STRING_KEY, "executor1.1");
+                    try (ContextScope ignored11 = context11.attach()) {
+                        phaser.arriveAndAwaitAdvance();
+                        assertEquals(context11, current());
+                    }
                 }
-              } finally {
+            } finally {
                 // Complete the execution
                 phaser.arriveAndDeregister();
-              }
-            });
-    /*
-     * Create second executor.
-     */
-    Future<?> future2 =
-        executor.submit(
-            () -> {
-              try {
+            }
+        });
+        /*
+         * Create second executor.
+         */
+        Future<?> future2 = executor.submit(() -> {
+            try {
                 // First step: check empty context
                 phaser.arriveAndAwaitAdvance();
                 assertEquals(root(), current());
@@ -192,48 +188,48 @@ void testThreadIndependence() {
                 // Third step: set context on second executor
                 Context context2 = root().with(STRING_KEY, "executor2");
                 try (ContextScope ignored2 = context2.attach()) {
-                  phaser.arriveAndAwaitAdvance();
-                  assertEquals(context2, current());
-                  // Fourth step: set child context on first executor
-                  phaser.arriveAndAwaitAdvance();
-                  assertEquals(context2, current());
+                    phaser.arriveAndAwaitAdvance();
+                    assertEquals(context2, current());
+                    // Fourth step: set child context on first executor
+                    phaser.arriveAndAwaitAdvance();
+                    assertEquals(context2, current());
                 }
-              } finally {
+            } finally {
                 // Complete the execution
                 phaser.arriveAndDeregister();
-              }
-            });
-    /*
-     * Run main thread.
-     */
-    // First step: check empty context
-    phaser.arriveAndAwaitAdvance();
-    assertEquals(root(), current());
-    // Second step: set context on first executor
-    phaser.arriveAndAwaitAdvance();
-    assertEquals(root(), current());
-    // Third step: set context on second executor
-    phaser.arriveAndAwaitAdvance();
-    assertEquals(root(), current());
-    // Fourth step: set child context on first executor
-    phaser.arriveAndAwaitAdvance();
-    assertEquals(root(), current());
-    // Complete execution and wait for the others
-    phaser.arriveAndAwaitAdvance();
-    executor.shutdown();
-    // Check any test error in executors
-    assertDoesNotThrow(() -> future1.get());
-    assertDoesNotThrow(() -> future2.get());
-  }
+            }
+        });
+        /*
+         * Run main thread.
+         */
+        // First step: check empty context
+        phaser.arriveAndAwaitAdvance();
+        assertEquals(root(), current());
+        // Second step: set context on first executor
+        phaser.arriveAndAwaitAdvance();
+        assertEquals(root(), current());
+        // Third step: set context on second executor
+        phaser.arriveAndAwaitAdvance();
+        assertEquals(root(), current());
+        // Fourth step: set child context on first executor
+        phaser.arriveAndAwaitAdvance();
+        assertEquals(root(), current());
+        // Complete execution and wait for the others
+        phaser.arriveAndAwaitAdvance();
+        executor.shutdown();
+        // Check any test error in executors
+        assertDoesNotThrow(() -> future1.get());
+        assertDoesNotThrow(() -> future2.get());
+    }
 
-  @Test
-  void testNonThreadInheritance() {
-    Context context = root().with(STRING_KEY, "value");
-    try (ContextScope ignored = context.attach()) {
-      // Check new thread don't inherit from current context
-      ExecutorService executor = Executors.newSingleThreadExecutor();
-      Future<?> future = executor.submit(() -> assertEquals(root(), current()));
-      assertDoesNotThrow(() -> future.get());
+    @Test
+    void testNonThreadInheritance() {
+        Context context = root().with(STRING_KEY, "value");
+        try (ContextScope ignored = context.attach()) {
+            // Check new thread don't inherit from current context
+            ExecutorService executor = Executors.newSingleThreadExecutor();
+            Future<?> future = executor.submit(() -> assertEquals(root(), current()));
+            assertDoesNotThrow(() -> future.get());
+        }
     }
-  }
 }
diff --git a/components/context/src/test/java/datadog/context/ContextProvidersForkedTest.java b/components/context/src/test/java/datadog/context/ContextProvidersForkedTest.java
index 73c55a28c6f..7b7a825411e 100644
--- a/components/context/src/test/java/datadog/context/ContextProvidersForkedTest.java
+++ b/components/context/src/test/java/datadog/context/ContextProvidersForkedTest.java
@@ -11,116 +11,114 @@
 import org.junit.jupiter.api.Test;
 
 class ContextProvidersForkedTest {
-  @Test
-  void testCustomBinder() {
-    assertTrue(ContextBinder.allowTesting());
-
-    Context context = root().with(STRING_KEY, "value");
-    assertNotEquals(root(), context);
-
-    Object carrier = new Object();
-
-    // should delegate to the default binder
-    context.attachTo(carrier);
-    assertSame(context, Context.from(carrier));
-    assertSame(context, Context.detachFrom(carrier));
-    assertSame(root(), Context.from(carrier));
-
-    // now register a NOOP context binder
-    ContextBinder.register(
-        new ContextBinder() {
-          @Override
-          public Context from(@Nonnull Object carrier) {
-            return root();
-          }
-
-          @Override
-          public void attachTo(@Nonnull Object carrier, @Nonnull Context context) {
-            // no-op
-          }
-
-          @Override
-          public Context detachFrom(@Nonnull Object carrier) {
-            return root();
-          }
+    @Test
+    void testCustomBinder() {
+        assertTrue(ContextBinder.allowTesting());
+
+        Context context = root().with(STRING_KEY, "value");
+        assertNotEquals(root(), context);
+
+        Object carrier = new Object();
+
+        // should delegate to the default binder
+        context.attachTo(carrier);
+        assertSame(context, Context.from(carrier));
+        assertSame(context, Context.detachFrom(carrier));
+        assertSame(root(), Context.from(carrier));
+
+        // now register a NOOP context binder
+        ContextBinder.register(new ContextBinder() {
+            @Override
+            public Context from(@Nonnull Object carrier) {
+                return root();
+            }
+
+            @Override
+            public void attachTo(@Nonnull Object carrier, @Nonnull Context context) {
+                // no-op
+            }
+
+            @Override
+            public Context detachFrom(@Nonnull Object carrier) {
+                return root();
+            }
         });
 
-    // NOOP binder, context will always be root
-    context.attachTo(carrier);
-    assertSame(root(), Context.from(carrier));
-    assertSame(root(), Context.detachFrom(carrier));
-    assertSame(root(), Context.from(carrier));
-  }
-
-  @Test
-  void testCustomManager() {
-    assertTrue(ContextManager.allowTesting());
-
-    Context context = root().with(STRING_KEY, "value");
-    assertNotEquals(root(), context);
-
-    // should delegate to the default manager
-    try (ContextScope scope = context.attach()) {
-      assertSame(context, scope.context());
-      assertSame(context, Context.current());
-      ContextContinuation cont = context.capture();
-      assertSame(context, cont.context());
-      cont.release();
+        // NOOP binder, context will always be root
+        context.attachTo(carrier);
+        assertSame(root(), Context.from(carrier));
+        assertSame(root(), Context.detachFrom(carrier));
+        assertSame(root(), Context.from(carrier));
     }
 
-    Context swapped = context.swap();
-    assertSame(root(), swapped);
-    assertSame(context, Context.current());
-    assertSame(context, swapped.swap());
-    assertSame(root(), Context.current());
-
-    // now register a NOOP context manager
-    ContextManager.register(
-        new ContextManager() {
-          @Override
-          public Context current() {
-            return root();
-          }
-
-          @Override
-          public ContextScope attach(@Nonnull Context context) {
-            return new NoopContextScope(root());
-          }
-
-          @Override
-          public Context swap(@Nonnull Context context) {
-            return root();
-          }
-
-          @Override
-          public ContextContinuation capture(@Nonnull Context context) {
-            return new NoopContextContinuation(root());
-          }
-
-          @Override
-          public void addListener(@Nonnull ContextListener listener) {}
+    @Test
+    void testCustomManager() {
+        assertTrue(ContextManager.allowTesting());
+
+        Context context = root().with(STRING_KEY, "value");
+        assertNotEquals(root(), context);
+
+        // should delegate to the default manager
+        try (ContextScope scope = context.attach()) {
+            assertSame(context, scope.context());
+            assertSame(context, Context.current());
+            ContextContinuation cont = context.capture();
+            assertSame(context, cont.context());
+            cont.release();
+        }
+
+        Context swapped = context.swap();
+        assertSame(root(), swapped);
+        assertSame(context, Context.current());
+        assertSame(context, swapped.swap());
+        assertSame(root(), Context.current());
+
+        // now register a NOOP context manager
+        ContextManager.register(new ContextManager() {
+            @Override
+            public Context current() {
+                return root();
+            }
+
+            @Override
+            public ContextScope attach(@Nonnull Context context) {
+                return new NoopContextScope(root());
+            }
+
+            @Override
+            public Context swap(@Nonnull Context context) {
+                return root();
+            }
+
+            @Override
+            public ContextContinuation capture(@Nonnull Context context) {
+                return new NoopContextContinuation(root());
+            }
+
+            @Override
+            public void addListener(@Nonnull ContextListener listener) {}
         });
 
-    ContextTestBase.TrackingListener listener = trackingListener();
-    ContextManager.register(listener);
-
-    // NOOP manager, context will always be root
-    try (ContextScope scope = context.attach()) {
-      assertSame(root(), scope.context());
-      assertSame(root(), Context.current());
-      ContextContinuation cont = context.capture();
-      assertSame(root(), cont.context());
-      cont.release();
+        ContextTestBase.TrackingListener listener = trackingListener();
+        ContextManager.register(listener);
+
+        // NOOP manager, context will always be root
+        try (ContextScope scope = context.attach()) {
+            assertSame(root(), scope.context());
+            assertSame(root(), Context.current());
+            ContextContinuation cont = context.capture();
+            assertSame(root(), cont.context());
+            cont.release();
+        }
+
+        // NOOP manager, context will always be root
+        swapped = context.swap();
+        assertSame(root(), swapped);
+        assertSame(root(), Context.current());
+        assertSame(root(), swapped.swap());
+        assertSame(root(), Context.current());
+
+        // NOOP manager, no events emitted
+        listener.assertNoEvents();
     }
-
-    // NOOP manager, context will always be root
-    swapped = context.swap();
-    assertSame(root(), swapped);
-    assertSame(root(), Context.current());
-    assertSame(root(), swapped.swap());
-    assertSame(root(), Context.current());
-
-    // NOOP manager, no events emitted
-    listener.assertNoEvents();
-  }
 }
diff --git a/components/context/src/test/java/datadog/context/ContextProvidersTest.java b/components/context/src/test/java/datadog/context/ContextProvidersTest.java
index 31cff5d3254..037b0ae2901 100644
--- a/components/context/src/test/java/datadog/context/ContextProvidersTest.java
+++ b/components/context/src/test/java/datadog/context/ContextProvidersTest.java
@@ -8,27 +8,27 @@
 import org.junit.jupiter.api.Test;
 
 class ContextProvidersTest {
-  @Test
-  void testCannotChangeBinderAfterUse() {
-    Context context = root().with(STRING_KEY, "value");
-    Object carrier = new Object();
+    @Test
+    void testCannotChangeBinderAfterUse() {
+        Context context = root().with(STRING_KEY, "value");
+        Object carrier = new Object();
 
-    context.attachTo(carrier);
-    Context.detachFrom(carrier);
+        context.attachTo(carrier);
+        Context.detachFrom(carrier);
 
-    // cannot change binder at this late stage
-    assertFalse(ContextBinder.allowTesting());
-  }
+        // cannot change binder at this late stage
+        assertFalse(ContextBinder.allowTesting());
+    }
 
-  @Test
-  void testCannotChangeManagerAfterUse() {
-    Context context = root().with(STRING_KEY, "value");
+    @Test
+    void testCannotChangeManagerAfterUse() {
+        Context context = root().with(STRING_KEY, "value");
 
-    try (ContextScope ignored = context.attach()) {
-      assertNotEquals(root(), Context.current());
-    }
+        try (ContextScope ignored = context.attach()) {
+            assertNotEquals(root(), Context.current());
+        }
 
-    // cannot change manager at this late stage
-    assertFalse(ContextManager.allowTesting());
-  }
+        // cannot change manager at this late stage
+        assertFalse(ContextManager.allowTesting());
+    }
 }
diff --git a/components/context/src/test/java/datadog/context/ContextTest.java b/components/context/src/test/java/datadog/context/ContextTest.java
index d8f50a00df3..692f8df62e2 100644
--- a/components/context/src/test/java/datadog/context/ContextTest.java
+++ b/components/context/src/test/java/datadog/context/ContextTest.java
@@ -17,202 +17,192 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 class ContextTest {
-  static final ContextKey<String> STRING_KEY = ContextKey.named("string-key");
-  static final ContextKey<Boolean> BOOLEAN_KEY = ContextKey.named("boolean-key");
-  static final ContextKey<Float> FLOAT_KEY = ContextKey.named("float-key");
-  static final ContextKey<Long> LONG_KEY = ContextKey.named("long-key");
-
-  @Test
-  void testRoot() {
-    // Test root is always the same
-    Context root = root();
-    assertEquals(root, root(), "Root context should be consistent");
-    // Test root is not mutated
-    String stringValue = "value";
-    root.with(STRING_KEY, stringValue);
-    assertEquals(root, root(), "Root context should be immutable");
-  }
-
-  static Stream<Context> contextImplementations() {
-    SingletonContext singletonContext = new SingletonContext(ContextKey.named("test").index, true);
-    IndexedContext indexedContext = new IndexedContext(new Object[0]);
-    return Stream.of(Context.root(), singletonContext, indexedContext);
-  }
-
-  @ParameterizedTest
-  @MethodSource("contextImplementations")
-  void testWith(Context context) {
-    // Test accessing non-set value
-    assertNull(context.get(STRING_KEY));
-    // Test retrieving value
-    String stringValue = "value";
-    Context context1 = context.with(STRING_KEY, stringValue);
-    assertEquals(stringValue, context1.get(STRING_KEY));
-    // Test overriding value
-    String stringValue2 = "value2";
-    Context context2 = context1.with(STRING_KEY, stringValue2);
-    assertEquals(stringValue2, context2.get(STRING_KEY));
-    // Test clearing value
-    Context context3 = context2.with(STRING_KEY, null);
-    assertNull(context3.get(STRING_KEY));
-    // Test null key handling
-    assertThrows(
-        NullPointerException.class, () -> context.with(null, "test"), "Context forbids null keys");
-    // Test null value handling
-    assertDoesNotThrow(
-        () -> context.with(BOOLEAN_KEY, null), "Null value should not throw exception");
-    // Test null implicitly keyed value handling - should preserve existing context, not discard it
-    Context withNull = context1.with((ImplicitContextKeyed) null);
-    assertEquals(
-        context1, withNull, "Null implicitly keyed value should preserve existing context");
-  }
-
-  @ParameterizedTest
-  @MethodSource("contextImplementations")
-  void testWithPair(Context context) {
-    // Test retrieving value
-    String stringValue = "value";
-    Context context1 = context.with(BOOLEAN_KEY, false, STRING_KEY, stringValue);
-    assertEquals(stringValue, context1.get(STRING_KEY));
-    assertEquals(false, context1.get(BOOLEAN_KEY));
-    // Test overriding value
-    String stringValue2 = "value2";
-    Context context2 = context1.with(STRING_KEY, stringValue2, BOOLEAN_KEY, true);
-    assertEquals(stringValue2, context2.get(STRING_KEY));
-    assertEquals(true, context2.get(BOOLEAN_KEY));
-    // Test clearing value
-    Context context3 = context2.with(BOOLEAN_KEY, null, STRING_KEY, null);
-    assertNull(context3.get(STRING_KEY));
-    assertNull(context3.get(BOOLEAN_KEY));
-    // Test null key handling
-    assertThrows(
-        NullPointerException.class,
-        () -> context.with(null, "test", STRING_KEY, "test"),
-        "Context forbids null keys");
-    assertThrows(
-        NullPointerException.class,
-        () -> context.with(STRING_KEY, "test", null, "test"),
-        "Context forbids null keys");
-    // Test null value handling
-    assertDoesNotThrow(
-        () -> context.with(BOOLEAN_KEY, null, STRING_KEY, "test"),
-        "Null value should not throw exception");
-    assertDoesNotThrow(
-        () -> context.with(STRING_KEY, "test", BOOLEAN_KEY, null),
-        "Null value should not throw exception");
-  }
-
-  @ParameterizedTest
-  @MethodSource("contextImplementations")
-  void testGet(Context original) {
-    // Setup context
-    String value = "value";
-    Context context = original.with(STRING_KEY, value);
-    // Test null key handling
-    assertThrows(NullPointerException.class, () -> context.get(null), "Context forbids null keys");
-    // Test unset key
-    assertNull(context.get(BOOLEAN_KEY), "Missing key expected to return null");
-    // Test set key
-    assertEquals(value, context.get(STRING_KEY), "Value expected to be retrieved");
-  }
-
-  @SuppressWarnings({
-    "EqualsWithItself",
-    "SimplifiableAssertion",
-    "ConstantValue",
-    "EqualsBetweenInconvertibleTypes"
-  })
-  @Test
-  void testEqualsAndHashCode() {
-    // Setup contexts
-    Context root = root();
-    Context context1 = root.with(STRING_KEY, "value");
-    Context context2 = root.with(STRING_KEY, "value    ");
-    Context context3 = root.with(STRING_KEY, "value    ".trim());
-    Context context4 = root.with(STRING_KEY, "value").with(BOOLEAN_KEY, true);
-    // Test equals on self
-    assertTrue(root.equals(root));
-    assertTrue(context1.equals(context1));
-    assertTrue(context4.equals(context4));
-    // Test equals on null
-    assertFalse(context1.equals(null));
-    assertFalse(context4.equals(null));
-    // Test equals on different object type
-    assertFalse(context1.equals("value"));
-    assertFalse(context4.equals("value"));
-    // Test equals on different contexts with the same values
-    assertTrue(context1.equals(context3));
-    assertEquals(context1.hashCode(), context3.hashCode());
-    // Test equals on different contexts
-    assertFalse(context1.equals(root));
-    assertNotEquals(context1.hashCode(), root.hashCode());
-    assertFalse(context1.equals(context2));
-    assertNotEquals(context1.hashCode(), context2.hashCode());
-    assertFalse(context1.equals(context4));
-    assertNotEquals(context1.hashCode(), context4.hashCode());
-    assertFalse(root.equals(context1));
-    assertNotEquals(root.hashCode(), context1.hashCode());
-    assertFalse(context2.equals(context1));
-    assertNotEquals(context2.hashCode(), context1.hashCode());
-    assertFalse(context4.equals(context1));
-    assertNotEquals(context4.hashCode(), context1.hashCode());
-  }
-
-  @ParameterizedTest
-  @MethodSource("contextImplementations")
-  void testToString(Context context) {
-    String debugString = context.toString();
-    assertNotNull(debugString, "Context string representation should not be null");
-    assertTrue(
-        debugString.contains(context.getClass().getSimpleName()),
-        "Context string representation should contain implementation name");
-  }
-
-  @ParameterizedTest
-  @MethodSource("contextImplementations")
-  void testWithSameValueReturnsThis(Context context) {
-    String value = "value";
-    Context context1 = context.with(STRING_KEY, value);
-    // storing the same value again should return the same instance
-    assertSame(context1, context1.with(STRING_KEY, value));
-    // storing a different value should return a new instance
-    assertNotEquals(context1, context1.with(STRING_KEY, "other"));
-  }
-
-  @SuppressWarnings({"SimplifiableAssertion"})
-  @Test
-  void testInflation() {
-    Context empty = root();
-
-    Context one = empty.with(STRING_KEY, "unset").with(STRING_KEY, "one");
-    Context two = one.with(BOOLEAN_KEY, false).with(BOOLEAN_KEY, true);
-    Context three = two.with(FLOAT_KEY, 0.0f).with(FLOAT_KEY, 3.3f);
-
-    assertNull(empty.get(STRING_KEY));
-    assertNull(empty.get(BOOLEAN_KEY));
-    assertNull(empty.get(FLOAT_KEY));
-    assertNull(empty.get(LONG_KEY));
-
-    assertEquals("one", one.get(STRING_KEY));
-    assertNull(one.get(BOOLEAN_KEY));
-    assertNull(one.get(FLOAT_KEY));
-    assertNull(one.get(LONG_KEY));
-
-    assertEquals("one", two.get(STRING_KEY));
-    assertEquals(true, two.get(BOOLEAN_KEY));
-    assertNull(two.get(FLOAT_KEY));
-    assertNull(two.get(LONG_KEY));
-
-    assertEquals("one", three.get(STRING_KEY));
-    assertEquals(true, three.get(BOOLEAN_KEY));
-    assertEquals(3.3f, three.get(FLOAT_KEY));
-    assertNull(three.get(LONG_KEY));
-
-    assertFalse(empty.equals(one));
-    assertFalse(one.equals(two));
-    assertFalse(two.equals(three));
-    assertNotEquals(one.hashCode(), empty.hashCode());
-    assertNotEquals(two.hashCode(), one.hashCode());
-    assertNotEquals(three.hashCode(), two.hashCode());
-  }
+    static final ContextKey<String> STRING_KEY = ContextKey.named("string-key");
+    static final ContextKey<Boolean> BOOLEAN_KEY = ContextKey.named("boolean-key");
+    static final ContextKey<Float> FLOAT_KEY = ContextKey.named("float-key");
+    static final ContextKey<Long> LONG_KEY = ContextKey.named("long-key");
+
+    @Test
+    void testRoot() {
+        // Test root is always the same
+        Context root = root();
+        assertEquals(root, root(), "Root context should be consistent");
+        // Test root is not mutated
+        String stringValue = "value";
+        root.with(STRING_KEY, stringValue);
+        assertEquals(root, root(), "Root context should be immutable");
+    }
+
+    static Stream<Context> contextImplementations() {
+        SingletonContext singletonContext = new SingletonContext(ContextKey.named("test").index, true);
+        IndexedContext indexedContext = new IndexedContext(new Object[0]);
+        return Stream.of(Context.root(), singletonContext, indexedContext);
+    }
+
+    @ParameterizedTest
+    @MethodSource("contextImplementations")
+    void testWith(Context context) {
+        // Test accessing non-set value
+        assertNull(context.get(STRING_KEY));
+        // Test retrieving value
+        String stringValue = "value";
+        Context context1 = context.with(STRING_KEY, stringValue);
+        assertEquals(stringValue, context1.get(STRING_KEY));
+        // Test overriding value
+        String stringValue2 = "value2";
+        Context context2 = context1.with(STRING_KEY, stringValue2);
+        assertEquals(stringValue2, context2.get(STRING_KEY));
+        // Test clearing value
+        Context context3 = context2.with(STRING_KEY, null);
+        assertNull(context3.get(STRING_KEY));
+        // Test null key handling
+        assertThrows(NullPointerException.class, () -> context.with(null, "test"), "Context forbids null keys");
+        // Test null value handling
+        assertDoesNotThrow(() -> context.with(BOOLEAN_KEY, null), "Null value should not throw exception");
+        // Test null implicitly keyed value handling - should preserve existing context, not discard it
+        Context withNull = context1.with((ImplicitContextKeyed) null);
+        assertEquals(context1, withNull, "Null implicitly keyed value should preserve existing context");
+    }
+
+    @ParameterizedTest
+    @MethodSource("contextImplementations")
+    void testWithPair(Context context) {
+        // Test retrieving value
+        String stringValue = "value";
+        Context context1 = context.with(BOOLEAN_KEY, false, STRING_KEY, stringValue);
+        assertEquals(stringValue, context1.get(STRING_KEY));
+        assertEquals(false, context1.get(BOOLEAN_KEY));
+        // Test overriding value
+        String stringValue2 = "value2";
+        Context context2 = context1.with(STRING_KEY, stringValue2, BOOLEAN_KEY, true);
+        assertEquals(stringValue2, context2.get(STRING_KEY));
+        assertEquals(true, context2.get(BOOLEAN_KEY));
+        // Test clearing value
+        Context context3 = context2.with(BOOLEAN_KEY, null, STRING_KEY, null);
+        assertNull(context3.get(STRING_KEY));
+        assertNull(context3.get(BOOLEAN_KEY));
+        // Test null key handling
+        assertThrows(
+                NullPointerException.class,
+                () -> context.with(null, "test", STRING_KEY, "test"),
+                "Context forbids null keys");
+        assertThrows(
+                NullPointerException.class,
+                () -> context.with(STRING_KEY, "test", null, "test"),
+                "Context forbids null keys");
+        // Test null value handling
+        assertDoesNotThrow(
+                () -> context.with(BOOLEAN_KEY, null, STRING_KEY, "test"), "Null value should not throw exception");
+        assertDoesNotThrow(
+                () -> context.with(STRING_KEY, "test", BOOLEAN_KEY, null), "Null value should not throw exception");
+    }
+
+    @ParameterizedTest
+    @MethodSource("contextImplementations")
+    void testGet(Context original) {
+        // Setup context
+        String value = "value";
+        Context context = original.with(STRING_KEY, value);
+        // Test null key handling
+        assertThrows(NullPointerException.class, () -> context.get(null), "Context forbids null keys");
+        // Test unset key
+        assertNull(context.get(BOOLEAN_KEY), "Missing key expected to return null");
+        // Test set key
+        assertEquals(value, context.get(STRING_KEY), "Value expected to be retrieved");
+    }
+
+    @SuppressWarnings({"EqualsWithItself", "SimplifiableAssertion", "ConstantValue", "EqualsBetweenInconvertibleTypes"})
+    @Test
+    void testEqualsAndHashCode() {
+        // Setup contexts
+        Context root = root();
+        Context context1 = root.with(STRING_KEY, "value");
+        Context context2 = root.with(STRING_KEY, "value    ");
+        Context context3 = root.with(STRING_KEY, "value    ".trim());
+        Context context4 = root.with(STRING_KEY, "value").with(BOOLEAN_KEY, true);
+        // Test equals on self
+        assertTrue(root.equals(root));
+        assertTrue(context1.equals(context1));
+        assertTrue(context4.equals(context4));
+        // Test equals on null
+        assertFalse(context1.equals(null));
+        assertFalse(context4.equals(null));
+        // Test equals on different object type
+        assertFalse(context1.equals("value"));
+        assertFalse(context4.equals("value"));
+        // Test equals on different contexts with the same values
+        assertTrue(context1.equals(context3));
+        assertEquals(context1.hashCode(), context3.hashCode());
+        // Test equals on different contexts
+        assertFalse(context1.equals(root));
+        assertNotEquals(context1.hashCode(), root.hashCode());
+        assertFalse(context1.equals(context2));
+        assertNotEquals(context1.hashCode(), context2.hashCode());
+        assertFalse(context1.equals(context4));
+        assertNotEquals(context1.hashCode(), context4.hashCode());
+        assertFalse(root.equals(context1));
+        assertNotEquals(root.hashCode(), context1.hashCode());
+        assertFalse(context2.equals(context1));
+        assertNotEquals(context2.hashCode(), context1.hashCode());
+        assertFalse(context4.equals(context1));
+        assertNotEquals(context4.hashCode(), context1.hashCode());
+    }
+
+    @ParameterizedTest
+    @MethodSource("contextImplementations")
+    void testToString(Context context) {
+        String debugString = context.toString();
+        assertNotNull(debugString, "Context string representation should not be null");
+        assertTrue(
+                debugString.contains(context.getClass().getSimpleName()),
+                "Context string representation should contain implementation name");
+    }
+
+    @ParameterizedTest
+    @MethodSource("contextImplementations")
+    void testWithSameValueReturnsThis(Context context) {
+        String value = "value";
+        Context context1 = context.with(STRING_KEY, value);
+        // storing the same value again should return the same instance
+        assertSame(context1, context1.with(STRING_KEY, value));
+        // storing a different value should return a new instance
+        assertNotEquals(context1, context1.with(STRING_KEY, "other"));
+    }
+
+    @SuppressWarnings({"SimplifiableAssertion"})
+    @Test
+    void testInflation() {
+        Context empty = root();
+
+        Context one = empty.with(STRING_KEY, "unset").with(STRING_KEY, "one");
+        Context two = one.with(BOOLEAN_KEY, false).with(BOOLEAN_KEY, true);
+        Context three = two.with(FLOAT_KEY, 0.0f).with(FLOAT_KEY, 3.3f);
+
+        assertNull(empty.get(STRING_KEY));
+        assertNull(empty.get(BOOLEAN_KEY));
+        assertNull(empty.get(FLOAT_KEY));
+        assertNull(empty.get(LONG_KEY));
+
+        assertEquals("one", one.get(STRING_KEY));
+        assertNull(one.get(BOOLEAN_KEY));
+        assertNull(one.get(FLOAT_KEY));
+        assertNull(one.get(LONG_KEY));
+
+        assertEquals("one", two.get(STRING_KEY));
+        assertEquals(true, two.get(BOOLEAN_KEY));
+        assertNull(two.get(FLOAT_KEY));
+        assertNull(two.get(LONG_KEY));
+
+        assertEquals("one", three.get(STRING_KEY));
+        assertEquals(true, three.get(BOOLEAN_KEY));
+        assertEquals(3.3f, three.get(FLOAT_KEY));
+        assertNull(three.get(LONG_KEY));
+
+        assertFalse(empty.equals(one));
+        assertFalse(one.equals(two));
+        assertFalse(two.equals(three));
+        assertNotEquals(one.hashCode(), empty.hashCode());
+        assertNotEquals(two.hashCode(), one.hashCode());
+        assertNotEquals(three.hashCode(), two.hashCode());
+    }
 }
diff --git a/components/context/src/test/java/datadog/context/ContextTestBase.java b/components/context/src/test/java/datadog/context/ContextTestBase.java
index ac4c76f2482..774ae0ff91e 100644
--- a/components/context/src/test/java/datadog/context/ContextTestBase.java
+++ b/components/context/src/test/java/datadog/context/ContextTestBase.java
@@ -13,78 +13,78 @@
 
 @ParametersAreNonnullByDefault
 abstract class ContextTestBase {
-  static final ContextKey<String> TEST_KEY = ContextKey.named("test-key");
+    static final ContextKey<String> TEST_KEY = ContextKey.named("test-key");
 
-  @BeforeEach
-  void verifyNoContextBefore() {
-    assertEquals(root(), current());
-  }
+    @BeforeEach
+    void verifyNoContextBefore() {
+        assertEquals(root(), current());
+    }
 
-  @AfterEach
-  void verifyNoContextAfter() {
-    TestContextManager.clearListeners();
-    assertEquals(root(), current());
-  }
+    @AfterEach
+    void verifyNoContextAfter() {
+        TestContextManager.clearListeners();
+        assertEquals(root(), current());
+    }
 
-  static TrackingListener trackingListener() {
-    return new TrackingListener();
-  }
+    static TrackingListener trackingListener() {
+        return new TrackingListener();
+    }
 
-  /**
-   * A {@link ContextListener} that records events suffixed with {@link #TEST_KEY} context values.
-   * Uses {@code {root}} when the key is absent from the context.
-   */
-  static final class TrackingListener implements ContextListener {
-    private final List<String> events = new ArrayList<>();
-    private int checkpoint;
+    /**
+     * A {@link ContextListener} that records events suffixed with {@link #TEST_KEY} context values.
+     * Uses {@code {root}} when the key is absent from the context.
+     */
+    static final class TrackingListener implements ContextListener {
+        private final List<String> events = new ArrayList<>();
+        private int checkpoint;
 
-    @Override
-    public void onUpdate(Context before, Context after) {
-      this.events.add("update:" + label(before) + "->" + label(after));
-    }
+        @Override
+        public void onUpdate(Context before, Context after) {
+            this.events.add("update:" + label(before) + "->" + label(after));
+        }
 
-    @Override
-    public void onCapture(Context context) {
-      this.events.add("capture:" + label(context));
-    }
+        @Override
+        public void onCapture(Context context) {
+            this.events.add("capture:" + label(context));
+        }
 
-    @Override
-    public void onRelease(Context context) {
-      this.events.add("release:" + label(context));
-    }
+        @Override
+        public void onRelease(Context context) {
+            this.events.add("release:" + label(context));
+        }
 
-    private static String label(Context context) {
-      String value = context.get(TEST_KEY);
-      return value != null ? value : "{root}";
-    }
+        private static String label(Context context) {
+            String value = context.get(TEST_KEY);
+            return value != null ? value : "{root}";
+        }
 
-    /** Asserts the full sequence of recorded events equals {@code expected}. */
-    void assertEvents(String... expected) {
-      assertEquals(asList(expected), new ArrayList<>(this.events));
-    }
+        /** Asserts the full sequence of recorded events equals {@code expected}. */
+        void assertEvents(String... expected) {
+            assertEquals(asList(expected), new ArrayList<>(this.events));
+        }
 
-    /** Asserts that no events have been recorded at all. */
-    void assertNoEvents() {
-      assertEvents();
-    }
+        /** Asserts that no events have been recorded at all. */
+        void assertNoEvents() {
+            assertEvents();
+        }
 
-    /**
-     * Asserts the events recorded since the previous {@link #assertNewEvents} call equal {@code
-     * expected}, then advances the checkpoint past them.
-     */
-    void assertNewEvents(String... expected) {
-      List<String> snapshot = new ArrayList<>(this.events);
-      List<String> newEvents = new ArrayList<>(snapshot.subList(this.checkpoint, snapshot.size()));
-      assertEquals(asList(expected), newEvents);
-      this.checkpoint = snapshot.size();
-    }
+        /**
+         * Asserts the events recorded since the previous {@link #assertNewEvents} call equal {@code
+         * expected}, then advances the checkpoint past them.
+         */
+        void assertNewEvents(String... expected) {
+            List<String> snapshot = new ArrayList<>(this.events);
+            List<String> newEvents = new ArrayList<>(snapshot.subList(this.checkpoint, snapshot.size()));
+            assertEquals(asList(expected), newEvents);
+            this.checkpoint = snapshot.size();
+        }
 
-    /**
-     * Asserts that no events have been recorded since the previous {@link #assertNewEvents} or
-     * {@link #assertNoNewEvents} call.
-     */
-    void assertNoNewEvents() {
-      assertNewEvents();
+        /**
+         * Asserts that no events have been recorded since the previous {@link #assertNewEvents} or
+         * {@link #assertNoNewEvents} call.
+         */
+        void assertNoNewEvents() {
+            assertNewEvents();
+        }
     }
-  }
 }
diff --git a/components/context/src/test/java/datadog/context/ImplicitContextKeyedTest.java b/components/context/src/test/java/datadog/context/ImplicitContextKeyedTest.java
index 33e149bbb95..4944f04cd93 100644
--- a/components/context/src/test/java/datadog/context/ImplicitContextKeyedTest.java
+++ b/components/context/src/test/java/datadog/context/ImplicitContextKeyedTest.java
@@ -9,30 +9,29 @@
 import org.junit.jupiter.api.Test;
 
 class ImplicitContextKeyedTest {
-  /** This class demonstrate how values can hide their context keys. */
-  static class ValueWithKey implements ImplicitContextKeyed {
-    /** The private key used to store and retrieve context value. */
-    private static final ContextKey<ValueWithKey> HIDDEN_KEY = ContextKey.named("hidden-key");
+    /** This class demonstrate how values can hide their context keys. */
+    static class ValueWithKey implements ImplicitContextKeyed {
+        /** The private key used to store and retrieve context value. */
+        private static final ContextKey<ValueWithKey> HIDDEN_KEY = ContextKey.named("hidden-key");
 
-    @Override
-    public Context storeInto(@Nonnull Context context) {
-      return context.with(HIDDEN_KEY, this);
-    }
+        @Override
+        public Context storeInto(@Nonnull Context context) {
+            return context.with(HIDDEN_KEY, this);
+        }
 
-    @Nullable
-    public static ValueWithKey from(@Nonnull Context context) {
-      return context.get(HIDDEN_KEY);
+        @Nullable
+        public static ValueWithKey from(@Nonnull Context context) {
+            return context.get(HIDDEN_KEY);
+        }
     }
-  }
 
-  @Test
-  void testImplicitKey() {
-    // Setup context
-    Context root = root();
-    ValueWithKey valueWithKey = new ValueWithKey();
-    Context context = root.with(valueWithKey);
-    assertNull(ValueWithKey.from(root), "No value expected to be extracted from root context");
-    assertEquals(
-        valueWithKey, ValueWithKey.from(context), "Expected to retrieve the implicit keyed value");
-  }
+    @Test
+    void testImplicitKey() {
+        // Setup context
+        Context root = root();
+        ValueWithKey valueWithKey = new ValueWithKey();
+        Context context = root.with(valueWithKey);
+        assertNull(ValueWithKey.from(root), "No value expected to be extracted from root context");
+        assertEquals(valueWithKey, ValueWithKey.from(context), "Expected to retrieve the implicit keyed value");
+    }
 }
diff --git a/components/context/src/test/java/datadog/context/propagation/ConcernTest.java b/components/context/src/test/java/datadog/context/propagation/ConcernTest.java
index d4779b1130c..f5dbde4f945 100644
--- a/components/context/src/test/java/datadog/context/propagation/ConcernTest.java
+++ b/components/context/src/test/java/datadog/context/propagation/ConcernTest.java
@@ -8,33 +8,30 @@
 import org.junit.jupiter.api.Test;
 
 class ConcernTest {
-  @Test
-  void testNamed() {
-    assertThrows(
-        NullPointerException.class,
-        () -> Concern.named(null),
-        "Should not create null named concern");
-    assertNotNull(Concern.named("name"));
-  }
+    @Test
+    void testNamed() {
+        assertThrows(NullPointerException.class, () -> Concern.named(null), "Should not create null named concern");
+        assertNotNull(Concern.named("name"));
+    }
 
-  @Test
-  void testWithPriority() {
-    assertThrows(
-        NullPointerException.class,
-        () -> Concern.withPriority(null, DEFAULT_PRIORITY),
-        "Should not create null named concern");
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> Concern.withPriority("name", -1),
-        "Should not create negative priority concern");
-    assertNotNull(Concern.withPriority("high-priority", DEFAULT_PRIORITY - 10));
-    assertNotNull(Concern.withPriority("low-priority", DEFAULT_PRIORITY + 10));
-  }
+    @Test
+    void testWithPriority() {
+        assertThrows(
+                NullPointerException.class,
+                () -> Concern.withPriority(null, DEFAULT_PRIORITY),
+                "Should not create null named concern");
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> Concern.withPriority("name", -1),
+                "Should not create negative priority concern");
+        assertNotNull(Concern.withPriority("high-priority", DEFAULT_PRIORITY - 10));
+        assertNotNull(Concern.withPriority("low-priority", DEFAULT_PRIORITY + 10));
+    }
 
-  @Test
-  void testName() {
-    String debugName = "name";
-    Concern concern = Concern.named(debugName);
-    assertEquals(debugName, concern.toString(), "Concern name mismatch");
-  }
+    @Test
+    void testName() {
+        String debugName = "name";
+        Concern concern = Concern.named(debugName);
+        assertEquals(debugName, concern.toString(), "Concern name mismatch");
+    }
 }
diff --git a/components/context/src/test/java/datadog/context/propagation/PropagatorsTest.java b/components/context/src/test/java/datadog/context/propagation/PropagatorsTest.java
index a8611014ede..b786ff22fb8 100644
--- a/components/context/src/test/java/datadog/context/propagation/PropagatorsTest.java
+++ b/components/context/src/test/java/datadog/context/propagation/PropagatorsTest.java
@@ -20,215 +20,199 @@
 import org.junit.jupiter.api.Test;
 
 class PropagatorsTest {
-  static final MapCarrierAccessor ACCESSOR = new MapCarrierAccessor();
-
-  static final Concern TRACING = Concern.named("tracing");
-  static final ContextKey<String> TRACING_KEY = ContextKey.named("tracing");
-  static final Propagator TRACING_PROPAGATOR = new BasicPropagator(TRACING_KEY, "tracing");
-
-  static final Concern IAST = Concern.named("iast");
-  static final ContextKey<String> IAST_KEY = ContextKey.named("iast");
-  static final Propagator IAST_PROPAGATOR = new BasicPropagator(IAST_KEY, "iast");
-
-  static final Concern DEBUGGER = Concern.withPriority("debugger", DEFAULT_PRIORITY - 10);
-  static final ContextKey<String> DEBUGGER_KEY = ContextKey.named("debugger");
-  static final DependentPropagator DEBUGGER_PROPAGATOR =
-      new DependentPropagator(DEBUGGER_KEY, "debugger", TRACING_KEY);
-
-  static final Concern PROFILING = Concern.withPriority("profiling", DEFAULT_PRIORITY + 10);
-  static final ContextKey<String> PROFILING_KEY = ContextKey.named("profiling");
-  static final DependentPropagator PROFILING_PROPAGATOR =
-      new DependentPropagator(PROFILING_KEY, "profiling", TRACING_KEY);
-
-  static final Context CONTEXT =
-      root()
-          .with(TRACING_KEY, "sampled")
-          .with(IAST_KEY, "standalone")
-          .with(DEBUGGER_KEY, "debug")
-          .with(PROFILING_KEY, "profile");
-
-  @ParametersAreNonnullByDefault
-  static class MapCarrierAccessor
-      implements CarrierSetter<Map<String, String>>, CarrierVisitor<Map<String, String>> {
-    @Override
-    public void set(Map<String, String> carrier, String key, String value) {
-      if (carrier != null && key != null && value != null) {
-        carrier.put(key, value);
-      }
-    }
+    static final MapCarrierAccessor ACCESSOR = new MapCarrierAccessor();
+
+    static final Concern TRACING = Concern.named("tracing");
+    static final ContextKey<String> TRACING_KEY = ContextKey.named("tracing");
+    static final Propagator TRACING_PROPAGATOR = new BasicPropagator(TRACING_KEY, "tracing");
+
+    static final Concern IAST = Concern.named("iast");
+    static final ContextKey<String> IAST_KEY = ContextKey.named("iast");
+    static final Propagator IAST_PROPAGATOR = new BasicPropagator(IAST_KEY, "iast");
+
+    static final Concern DEBUGGER = Concern.withPriority("debugger", DEFAULT_PRIORITY - 10);
+    static final ContextKey<String> DEBUGGER_KEY = ContextKey.named("debugger");
+    static final DependentPropagator DEBUGGER_PROPAGATOR =
+            new DependentPropagator(DEBUGGER_KEY, "debugger", TRACING_KEY);
+
+    static final Concern PROFILING = Concern.withPriority("profiling", DEFAULT_PRIORITY + 10);
+    static final ContextKey<String> PROFILING_KEY = ContextKey.named("profiling");
+    static final DependentPropagator PROFILING_PROPAGATOR =
+            new DependentPropagator(PROFILING_KEY, "profiling", TRACING_KEY);
+
+    static final Context CONTEXT = root().with(TRACING_KEY, "sampled")
+            .with(IAST_KEY, "standalone")
+            .with(DEBUGGER_KEY, "debug")
+            .with(PROFILING_KEY, "profile");
+
+    @ParametersAreNonnullByDefault
+    static class MapCarrierAccessor implements CarrierSetter<Map<String, String>>, CarrierVisitor<Map<String, String>> {
+        @Override
+        public void set(Map<String, String> carrier, String key, String value) {
+            if (carrier != null && key != null && value != null) {
+                carrier.put(key, value);
+            }
+        }
 
-    @Override
-    public void forEachKeyValue(Map<String, String> carrier, BiConsumer<String, String> visitor) {
-      carrier.forEach(visitor);
+        @Override
+        public void forEachKeyValue(Map<String, String> carrier, BiConsumer<String, String> visitor) {
+            carrier.forEach(visitor);
+        }
     }
-  }
 
-  static class BasicPropagator implements Propagator {
-    private final ContextKey<String> contextKey;
-    private final String carrierKey;
+    static class BasicPropagator implements Propagator {
+        private final ContextKey<String> contextKey;
+        private final String carrierKey;
+
+        public BasicPropagator(ContextKey<String> contextKey, String carrierKey) {
+            this.contextKey = requireNonNull(contextKey);
+            this.carrierKey = requireNonNull(carrierKey);
+        }
 
-    public BasicPropagator(ContextKey<String> contextKey, String carrierKey) {
-      this.contextKey = requireNonNull(contextKey);
-      this.carrierKey = requireNonNull(carrierKey);
+        @Override
+        public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {
+            String value = context.get(this.contextKey);
+            if (value != null) {
+                setter.set(carrier, this.carrierKey, value);
+            }
+        }
+
+        @Override
+        public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
+            String[] valueRef = new String[1];
+            visitor.forEachKeyValue(carrier, (key, value) -> {
+                if (this.carrierKey.equals(key)) {
+                    valueRef[0] = value;
+                }
+            });
+            if (valueRef[0] != null) {
+                context = context.with(this.contextKey, valueRef[0]);
+            }
+            return context;
+        }
     }
 
-    @Override
-    public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {
-      String value = context.get(this.contextKey);
-      if (value != null) {
-        setter.set(carrier, this.carrierKey, value);
-      }
+    static class DependentPropagator extends BasicPropagator implements Propagator {
+        private final ContextKey<String> requiredContextKey;
+        private boolean keyFound;
+
+        public DependentPropagator(
+                ContextKey<String> contextKey, String carrierKey, ContextKey<String> requiredContextKey) {
+            super(contextKey, carrierKey);
+            this.requiredContextKey = requiredContextKey;
+            this.keyFound = false;
+        }
+
+        @Override
+        public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
+            this.keyFound = context.get(this.requiredContextKey) != null;
+            return super.extract(context, carrier, visitor);
+        }
+
+        public void reset() {
+            this.keyFound = false;
+        }
     }
 
-    @Override
-    public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
-      String[] valueRef = new String[1];
-      visitor.forEachKeyValue(
-          carrier,
-          (key, value) -> {
-            if (this.carrierKey.equals(key)) {
-              valueRef[0] = value;
-            }
-          });
-      if (valueRef[0] != null) {
-        context = context.with(this.contextKey, valueRef[0]);
-      }
-      return context;
+    @BeforeEach
+    @AfterEach
+    void resetPropagators() {
+        Propagators.reset();
+        DEBUGGER_PROPAGATOR.reset();
+        PROFILING_PROPAGATOR.reset();
     }
-  }
 
-  static class DependentPropagator extends BasicPropagator implements Propagator {
-    private final ContextKey<String> requiredContextKey;
-    private boolean keyFound;
+    @Test
+    void testDefaultPropagator() {
+        Propagator noopPropagator = Propagators.defaultPropagator();
+        assertNotNull(noopPropagator, "Default propagator should not be null when no propagator is registered");
+        assertInjectExtractContext(CONTEXT, noopPropagator);
+
+        Propagators.register(TRACING, TRACING_PROPAGATOR);
+        Propagator single = Propagators.defaultPropagator();
+        assertInjectExtractContext(CONTEXT, single, TRACING_KEY);
+
+        Propagators.register(IAST, IAST_PROPAGATOR, false);
+        Propagators.register(DEBUGGER, DEBUGGER_PROPAGATOR);
+        Propagators.register(PROFILING, PROFILING_PROPAGATOR);
+        Propagator composite = Propagators.defaultPropagator();
+        assertDoNotInjectExtractContext(CONTEXT, composite, IAST_KEY);
+        assertInjectExtractContext(CONTEXT, composite, TRACING_KEY, DEBUGGER_KEY, PROFILING_KEY);
+        assertFalse(DEBUGGER_PROPAGATOR.keyFound, "Debugger propagator should have run before tracing propagator");
+        assertTrue(PROFILING_PROPAGATOR.keyFound, "Profiling propagator should have run after tracing propagator");
+
+        Propagator cached = Propagators.defaultPropagator();
+        assertEquals(composite, cached, "default propagator should be cached");
+    }
 
-    public DependentPropagator(
-        ContextKey<String> contextKey, String carrierKey, ContextKey<String> requiredContextKey) {
-      super(contextKey, carrierKey);
-      this.requiredContextKey = requiredContextKey;
-      this.keyFound = false;
+    @Test
+    void testForConcern() {
+        // Test when not registered
+        Propagator propagator = Propagators.forConcern(TRACING);
+        assertNotNull(propagator, "Propagator should not be null when no propagator is registered");
+        assertNoopPropagator(propagator);
+        // Test when registered
+        Propagators.register(TRACING, TRACING_PROPAGATOR);
+        propagator = Propagators.forConcern(TRACING);
+        assertNotNull(propagator, "Propagator should not be null when registered");
+        assertInjectExtractContext(CONTEXT, propagator, TRACING_KEY);
     }
 
-    @Override
-    public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
-      this.keyFound = context.get(this.requiredContextKey) != null;
-      return super.extract(context, carrier, visitor);
+    @Test
+    void testForConcerns() {
+        // Test when none registered
+        Propagator propagator = Propagators.forConcerns(TRACING, IAST);
+        assertNotNull(propagator, "Propagator should not be null when no propagator is registered");
+        assertNoopPropagator(propagator);
+        // Test when only one is registered
+        Propagators.register(TRACING, TRACING_PROPAGATOR);
+        propagator = Propagators.forConcerns(TRACING, IAST);
+        assertNotNull(propagator, "Propagator should not be null when one is registered");
+        assertInjectExtractContext(CONTEXT, propagator, TRACING_KEY);
+        // Test when all registered
+        Propagators.register(IAST, IAST_PROPAGATOR);
+        propagator = Propagators.forConcerns(TRACING, IAST);
+        assertNotNull(propagator, "Propagator should not be null when all are registered");
+        assertInjectExtractContext(CONTEXT, propagator, TRACING_KEY, IAST_KEY);
+        // Test propagator order follow the given concerns order despite concern priority
+        Propagators.register(DEBUGGER, DEBUGGER_PROPAGATOR);
+        Propagators.register(PROFILING, PROFILING_PROPAGATOR);
+        propagator = Propagators.forConcerns(PROFILING, TRACING, DEBUGGER);
+        assertInjectExtractContext(CONTEXT, propagator, PROFILING_KEY, TRACING_KEY, DEBUGGER_KEY);
+        assertFalse(PROFILING_PROPAGATOR.keyFound, "Profiling propagator should have run before tracing propagator");
+        assertTrue(DEBUGGER_PROPAGATOR.keyFound, "Debugger propagator should have run before tracing propagator");
     }
 
-    public void reset() {
-      this.keyFound = false;
+    @Test
+    void testNoopPropagator() {
+        Propagator noopPropagator = Propagators.noop();
+        assertNotNull(noopPropagator, "noop propagator should not be null");
+        assertNoopPropagator(noopPropagator);
     }
-  }
-
-  @BeforeEach
-  @AfterEach
-  void resetPropagators() {
-    Propagators.reset();
-    DEBUGGER_PROPAGATOR.reset();
-    PROFILING_PROPAGATOR.reset();
-  }
-
-  @Test
-  void testDefaultPropagator() {
-    Propagator noopPropagator = Propagators.defaultPropagator();
-    assertNotNull(
-        noopPropagator, "Default propagator should not be null when no propagator is registered");
-    assertInjectExtractContext(CONTEXT, noopPropagator);
-
-    Propagators.register(TRACING, TRACING_PROPAGATOR);
-    Propagator single = Propagators.defaultPropagator();
-    assertInjectExtractContext(CONTEXT, single, TRACING_KEY);
-
-    Propagators.register(IAST, IAST_PROPAGATOR, false);
-    Propagators.register(DEBUGGER, DEBUGGER_PROPAGATOR);
-    Propagators.register(PROFILING, PROFILING_PROPAGATOR);
-    Propagator composite = Propagators.defaultPropagator();
-    assertDoNotInjectExtractContext(CONTEXT, composite, IAST_KEY);
-    assertInjectExtractContext(CONTEXT, composite, TRACING_KEY, DEBUGGER_KEY, PROFILING_KEY);
-    assertFalse(
-        DEBUGGER_PROPAGATOR.keyFound,
-        "Debugger propagator should have run before tracing propagator");
-    assertTrue(
-        PROFILING_PROPAGATOR.keyFound,
-        "Profiling propagator should have run after tracing propagator");
-
-    Propagator cached = Propagators.defaultPropagator();
-    assertEquals(composite, cached, "default propagator should be cached");
-  }
-
-  @Test
-  void testForConcern() {
-    // Test when not registered
-    Propagator propagator = Propagators.forConcern(TRACING);
-    assertNotNull(propagator, "Propagator should not be null when no propagator is registered");
-    assertNoopPropagator(propagator);
-    // Test when registered
-    Propagators.register(TRACING, TRACING_PROPAGATOR);
-    propagator = Propagators.forConcern(TRACING);
-    assertNotNull(propagator, "Propagator should not be null when registered");
-    assertInjectExtractContext(CONTEXT, propagator, TRACING_KEY);
-  }
-
-  @Test
-  void testForConcerns() {
-    // Test when none registered
-    Propagator propagator = Propagators.forConcerns(TRACING, IAST);
-    assertNotNull(propagator, "Propagator should not be null when no propagator is registered");
-    assertNoopPropagator(propagator);
-    // Test when only one is registered
-    Propagators.register(TRACING, TRACING_PROPAGATOR);
-    propagator = Propagators.forConcerns(TRACING, IAST);
-    assertNotNull(propagator, "Propagator should not be null when one is registered");
-    assertInjectExtractContext(CONTEXT, propagator, TRACING_KEY);
-    // Test when all registered
-    Propagators.register(IAST, IAST_PROPAGATOR);
-    propagator = Propagators.forConcerns(TRACING, IAST);
-    assertNotNull(propagator, "Propagator should not be null when all are registered");
-    assertInjectExtractContext(CONTEXT, propagator, TRACING_KEY, IAST_KEY);
-    // Test propagator order follow the given concerns order despite concern priority
-    Propagators.register(DEBUGGER, DEBUGGER_PROPAGATOR);
-    Propagators.register(PROFILING, PROFILING_PROPAGATOR);
-    propagator = Propagators.forConcerns(PROFILING, TRACING, DEBUGGER);
-    assertInjectExtractContext(CONTEXT, propagator, PROFILING_KEY, TRACING_KEY, DEBUGGER_KEY);
-    assertFalse(
-        PROFILING_PROPAGATOR.keyFound,
-        "Profiling propagator should have run before tracing propagator");
-    assertTrue(
-        DEBUGGER_PROPAGATOR.keyFound,
-        "Debugger propagator should have run before tracing propagator");
-  }
-
-  @Test
-  void testNoopPropagator() {
-    Propagator noopPropagator = Propagators.noop();
-    assertNotNull(noopPropagator, "noop propagator should not be null");
-    assertNoopPropagator(noopPropagator);
-  }
-
-  void assertNoopPropagator(Propagator noopPropagator) {
-    Map<String, String> carrier = new HashMap<>();
-    noopPropagator.inject(CONTEXT, carrier, ACCESSOR);
-    assertTrue(carrier.isEmpty(), "carrier should be empty");
-    Context extracted = noopPropagator.extract(root(), carrier, ACCESSOR);
-    assertEquals(root(), extracted, "extracted context should be empty");
-  }
-
-  void assertInjectExtractContext(Context context, Propagator propagator, ContextKey<?>... keys) {
-    Map<String, String> carrier = new HashMap<>();
-    propagator.inject(context, carrier, ACCESSOR);
-    Context extracted = propagator.extract(root(), carrier, ACCESSOR);
-    for (ContextKey<?> key : keys) {
-      assertEquals(
-          context.get(key), extracted.get(key), "Key " + key + " not injected nor extracted");
+
+    void assertNoopPropagator(Propagator noopPropagator) {
+        Map<String, String> carrier = new HashMap<>();
+        noopPropagator.inject(CONTEXT, carrier, ACCESSOR);
+        assertTrue(carrier.isEmpty(), "carrier should be empty");
+        Context extracted = noopPropagator.extract(root(), carrier, ACCESSOR);
+        assertEquals(root(), extracted, "extracted context should be empty");
     }
-  }
-
-  private void assertDoNotInjectExtractContext(
-      Context context, Propagator propagator, ContextKey<?>... keys) {
-    Map<String, String> carrier = new HashMap<>();
-    propagator.inject(context, carrier, ACCESSOR);
-    Context extracted = propagator.extract(root(), carrier, ACCESSOR);
-    for (ContextKey<?> key : keys) {
-      assertNull(extracted.get(key), "Key " + key + " was injected");
+
+    void assertInjectExtractContext(Context context, Propagator propagator, ContextKey<?>... keys) {
+        Map<String, String> carrier = new HashMap<>();
+        propagator.inject(context, carrier, ACCESSOR);
+        Context extracted = propagator.extract(root(), carrier, ACCESSOR);
+        for (ContextKey<?> key : keys) {
+            assertEquals(context.get(key), extracted.get(key), "Key " + key + " not injected nor extracted");
+        }
+    }
+
+    private void assertDoNotInjectExtractContext(Context context, Propagator propagator, ContextKey<?>... keys) {
+        Map<String, String> carrier = new HashMap<>();
+        propagator.inject(context, carrier, ACCESSOR);
+        Context extracted = propagator.extract(root(), carrier, ACCESSOR);
+        for (ContextKey<?> key : keys) {
+            assertNull(extracted.get(key), "Key " + key + " was injected");
+        }
     }
-  }
 }
diff --git a/components/environment/src/main/java/datadog/environment/CommandLine.java b/components/environment/src/main/java/datadog/environment/CommandLine.java
index 79f78bef2af..f75ede76a7b 100644
--- a/components/environment/src/main/java/datadog/environment/CommandLine.java
+++ b/components/environment/src/main/java/datadog/environment/CommandLine.java
@@ -23,26 +23,27 @@
  * become available.
  */
 class CommandLine {
-  private static final String SUN_JAVA_COMMAND_PROPERTY = "sun.java.command";
-  private final List<String> fullCommand = findFullCommand();
-  final String name = getCommandName();
-  final List<String> arguments = getCommandArguments();
+    private static final String SUN_JAVA_COMMAND_PROPERTY = "sun.java.command";
+    private final List<String> fullCommand = findFullCommand();
+    final String name = getCommandName();
+    final List<String> arguments = getCommandArguments();
 
-  @SuppressForbidden // split on single-character uses a fast path
-  private List<String> findFullCommand() {
-    String command = SystemProperties.getOrDefault(SUN_JAVA_COMMAND_PROPERTY, "").trim();
-    return command.isEmpty() ? emptyList() : Arrays.asList(command.split(" "));
-  }
+    @SuppressForbidden // split on single-character uses a fast path
+    private List<String> findFullCommand() {
+        String command =
+                SystemProperties.getOrDefault(SUN_JAVA_COMMAND_PROPERTY, "").trim();
+        return command.isEmpty() ? emptyList() : Arrays.asList(command.split(" "));
+    }
 
-  private String getCommandName() {
-    return this.fullCommand.isEmpty() ? null : this.fullCommand.get(0);
-  }
+    private String getCommandName() {
+        return this.fullCommand.isEmpty() ? null : this.fullCommand.get(0);
+    }
 
-  private List<String> getCommandArguments() {
-    if (this.fullCommand.isEmpty()) {
-      return this.fullCommand;
-    } else {
-      return this.fullCommand.subList(1, this.fullCommand.size());
+    private List<String> getCommandArguments() {
+        if (this.fullCommand.isEmpty()) {
+            return this.fullCommand;
+        } else {
+            return this.fullCommand.subList(1, this.fullCommand.size());
+        }
     }
-  }
 }
diff --git a/components/environment/src/main/java/datadog/environment/EnvironmentVariables.java b/components/environment/src/main/java/datadog/environment/EnvironmentVariables.java
index c27c13e6f12..4ddfcb4f1f2 100644
--- a/components/environment/src/main/java/datadog/environment/EnvironmentVariables.java
+++ b/components/environment/src/main/java/datadog/environment/EnvironmentVariables.java
@@ -15,69 +15,69 @@
  *     Manager</a>
  */
 public final class EnvironmentVariables {
-  private EnvironmentVariables() {}
+    private EnvironmentVariables() {}
 
-  public static class EnvironmentVariablesProvider {
+    public static class EnvironmentVariablesProvider {
 
-    // Environment Component has SecurityException handling, so it is safe to call System.getenv
-    // here
-    @SuppressForbidden
-    public String get(String name) {
-      return System.getenv(name);
-    }
+        // Environment Component has SecurityException handling, so it is safe to call System.getenv
+        // here
+        @SuppressForbidden
+        public String get(String name) {
+            return System.getenv(name);
+        }
 
-    @SuppressForbidden
-    public Map<String, String> getAll() {
-      return System.getenv();
+        @SuppressForbidden
+        public Map<String, String> getAll() {
+            return System.getenv();
+        }
     }
-  }
-
-  // Make it accessible from tests.
-  public static EnvironmentVariablesProvider provider = new EnvironmentVariablesProvider();
 
-  /**
-   * Gets an environment variable value.
-   *
-   * @param name The environment variable name.
-   * @return The environment variable value, {@code null} if missing, can't be retrieved, or the
-   *     environment variable name is {@code null}.
-   */
-  public static @Nullable String get(String name) {
-    return getOrDefault(name, null);
-  }
+    // Make it accessible from tests.
+    public static EnvironmentVariablesProvider provider = new EnvironmentVariablesProvider();
 
-  /**
-   * Gets an environment variable value, or default value if missing or can't be retrieved.
-   *
-   * @param name The environment variable name.
-   * @param defaultValue The default value to return if the environment variable is missing or can't
-   *     be retrieved.
-   * @return The environment variable value, {@code defaultValue} if missing, can't be retrieved or
-   *     the environment variable name is {@code null}.
-   */
-  public static String getOrDefault(String name, String defaultValue) {
-    if (name == null) {
-      return defaultValue;
+    /**
+     * Gets an environment variable value.
+     *
+     * @param name The environment variable name.
+     * @return The environment variable value, {@code null} if missing, can't be retrieved, or the
+     *     environment variable name is {@code null}.
+     */
+    public static @Nullable String get(String name) {
+        return getOrDefault(name, null);
     }
-    try {
-      String value = provider.get(name);
-      return value == null ? defaultValue : value;
-    } catch (SecurityException e) {
-      return defaultValue;
+
+    /**
+     * Gets an environment variable value, or default value if missing or can't be retrieved.
+     *
+     * @param name The environment variable name.
+     * @param defaultValue The default value to return if the environment variable is missing or can't
+     *     be retrieved.
+     * @return The environment variable value, {@code defaultValue} if missing, can't be retrieved or
+     *     the environment variable name is {@code null}.
+     */
+    public static String getOrDefault(String name, String defaultValue) {
+        if (name == null) {
+            return defaultValue;
+        }
+        try {
+            String value = provider.get(name);
+            return value == null ? defaultValue : value;
+        } catch (SecurityException e) {
+            return defaultValue;
+        }
     }
-  }
 
-  /**
-   * Gets all environment variables.
-   *
-   * @return All environment variables captured in an unmodifiable {@link Map}, or an empty {@link
-   *     Map} if they can't be retrieved.
-   */
-  public static Map<String, String> getAll() {
-    try {
-      return unmodifiableMap(new HashMap<>(provider.getAll()));
-    } catch (SecurityException e) {
-      return emptyMap();
+    /**
+     * Gets all environment variables.
+     *
+     * @return All environment variables captured in an unmodifiable {@link Map}, or an empty {@link
+     *     Map} if they can't be retrieved.
+     */
+    public static Map<String, String> getAll() {
+        try {
+            return unmodifiableMap(new HashMap<>(provider.getAll()));
+        } catch (SecurityException e) {
+            return emptyMap();
+        }
     }
-  }
 }
diff --git a/components/environment/src/main/java/datadog/environment/JavaVersion.java b/components/environment/src/main/java/datadog/environment/JavaVersion.java
index e880adfa158..5b808468762 100644
--- a/components/environment/src/main/java/datadog/environment/JavaVersion.java
+++ b/components/environment/src/main/java/datadog/environment/JavaVersion.java
@@ -10,102 +10,101 @@
  *     Naming Convention</a>
  */
 final class JavaVersion {
-  final int major;
-  final int minor;
-  final int update;
-
-  JavaVersion(int major, int minor, int update) {
-    this.major = major;
-    this.minor = minor;
-    this.update = update;
-  }
-
-  static JavaVersion getRuntimeVersion() {
-    return parseJavaVersion(SystemProperties.getOrDefault("java.version", ""));
-  }
-
-  static JavaVersion parseJavaVersion(String javaVersion) {
-    // Remove pre-release part, usually -ea
-    final int indexOfDash = javaVersion.indexOf('-');
-    if (indexOfDash >= 0) {
-      javaVersion = javaVersion.substring(0, indexOfDash);
+    final int major;
+    final int minor;
+    final int update;
+
+    JavaVersion(int major, int minor, int update) {
+        this.major = major;
+        this.minor = minor;
+        this.update = update;
     }
 
-    int major = 0;
-    int minor = 0;
-    int update = 0;
-
-    try {
-      List<Integer> nums = splitDigits(javaVersion);
-      major = nums.get(0);
-
-      // for java 1.6/1.7/1.8
-      if (major == 1) {
-        major = nums.get(1);
-        minor = nums.get(2);
-        update = nums.get(3);
-      } else {
-        minor = nums.get(1);
-        update = nums.get(2);
-      }
-    } catch (NumberFormatException | IndexOutOfBoundsException e) {
-      // unable to parse version string - do nothing
+    static JavaVersion getRuntimeVersion() {
+        return parseJavaVersion(SystemProperties.getOrDefault("java.version", ""));
     }
-    return new JavaVersion(major, minor, update);
-  }
-
-  /* The method splits java version string by digits. Delimiters are: dot, underscore and plus */
-  private static List<Integer> splitDigits(String str) {
-    List<Integer> results = new ArrayList<>();
-
-    int len = str.length();
-    int value = 0;
-    for (int i = 0; i < len; i++) {
-      char ch = str.charAt(i);
-      if (ch >= '0' && ch <= '9') {
-        value = value * 10 + (ch - '0');
-      } else if (ch == '.' || ch == '_' || ch == '+') {
+
+    static JavaVersion parseJavaVersion(String javaVersion) {
+        // Remove pre-release part, usually -ea
+        final int indexOfDash = javaVersion.indexOf('-');
+        if (indexOfDash >= 0) {
+            javaVersion = javaVersion.substring(0, indexOfDash);
+        }
+
+        int major = 0;
+        int minor = 0;
+        int update = 0;
+
+        try {
+            List<Integer> nums = splitDigits(javaVersion);
+            major = nums.get(0);
+
+            // for java 1.6/1.7/1.8
+            if (major == 1) {
+                major = nums.get(1);
+                minor = nums.get(2);
+                update = nums.get(3);
+            } else {
+                minor = nums.get(1);
+                update = nums.get(2);
+            }
+        } catch (NumberFormatException | IndexOutOfBoundsException e) {
+            // unable to parse version string - do nothing
+        }
+        return new JavaVersion(major, minor, update);
+    }
+
+    /* The method splits java version string by digits. Delimiters are: dot, underscore and plus */
+    private static List<Integer> splitDigits(String str) {
+        List<Integer> results = new ArrayList<>();
+
+        int len = str.length();
+        int value = 0;
+        for (int i = 0; i < len; i++) {
+            char ch = str.charAt(i);
+            if (ch >= '0' && ch <= '9') {
+                value = value * 10 + (ch - '0');
+            } else if (ch == '.' || ch == '_' || ch == '+') {
+                results.add(value);
+                value = 0;
+            } else {
+                throw new NumberFormatException();
+            }
+        }
         results.add(value);
-        value = 0;
-      } else {
-        throw new NumberFormatException();
-      }
+        return results;
+    }
+
+    public boolean is(int major) {
+        return this.major == major;
+    }
+
+    public boolean is(int major, int minor) {
+        return this.major == major && this.minor == minor;
+    }
+
+    public boolean is(int major, int minor, int update) {
+        return this.major == major && this.minor == minor && this.update == update;
+    }
+
+    public boolean isAtLeast(int major) {
+        return isAtLeast(major, 0, 0);
+    }
+
+    public boolean isAtLeast(int major, int minor, int update) {
+        return isAtLeast(this.major, this.minor, this.update, major, minor, update);
+    }
+
+    public boolean isBetween(int fromMajor, int fromMinor, int fromUpdate, int toMajor, int toMinor, int toUpdate) {
+        return isAtLeast(toMajor, toMinor, toUpdate, fromMajor, fromMinor, fromUpdate)
+                && isAtLeast(fromMajor, fromMinor, fromUpdate)
+                && !isAtLeast(toMajor, toMinor, toUpdate);
+    }
+
+    private static boolean isAtLeast(
+            int major, int minor, int update, int atLeastMajor, int atLeastMinor, int atLeastUpdate) {
+        return (major > atLeastMajor)
+                || (major == atLeastMajor && minor > atLeastMinor)
+                || (major == atLeastMajor && minor == atLeastMinor && update >= atLeastUpdate);
     }
-    results.add(value);
-    return results;
-  }
-
-  public boolean is(int major) {
-    return this.major == major;
-  }
-
-  public boolean is(int major, int minor) {
-    return this.major == major && this.minor == minor;
-  }
-
-  public boolean is(int major, int minor, int update) {
-    return this.major == major && this.minor == minor && this.update == update;
-  }
-
-  public boolean isAtLeast(int major) {
-    return isAtLeast(major, 0, 0);
-  }
-
-  public boolean isAtLeast(int major, int minor, int update) {
-    return isAtLeast(this.major, this.minor, this.update, major, minor, update);
-  }
-
-  public boolean isBetween(
-      int fromMajor, int fromMinor, int fromUpdate, int toMajor, int toMinor, int toUpdate) {
-    return isAtLeast(toMajor, toMinor, toUpdate, fromMajor, fromMinor, fromUpdate)
-        && isAtLeast(fromMajor, fromMinor, fromUpdate)
-        && !isAtLeast(toMajor, toMinor, toUpdate);
-  }
-
-  private static boolean isAtLeast(
-      int major, int minor, int update, int atLeastMajor, int atLeastMinor, int atLeastUpdate) {
-    return (major > atLeastMajor)
-        || (major == atLeastMajor && minor > atLeastMinor)
-        || (major == atLeastMajor && minor == atLeastMinor && update >= atLeastUpdate);
-  }
 }
diff --git a/components/environment/src/main/java/datadog/environment/JavaVirtualMachine.java b/components/environment/src/main/java/datadog/environment/JavaVirtualMachine.java
index d6fe120c98b..e8ce243c1e5 100644
--- a/components/environment/src/main/java/datadog/environment/JavaVirtualMachine.java
+++ b/components/environment/src/main/java/datadog/environment/JavaVirtualMachine.java
@@ -6,223 +6,220 @@
 import javax.annotation.Nullable;
 
 public final class JavaVirtualMachine {
-  private static final CommandLine commandLine = new CommandLine();
-  private static final JavaVersion javaVersion = JavaVersion.getRuntimeVersion();
-  private static final Runtime runtime = new Runtime();
-
-  private JavaVirtualMachine() {}
-
-  public static boolean isJavaVersion(int major) {
-    return javaVersion.is(major);
-  }
-
-  public static boolean isJavaVersion(int major, int minor) {
-    return javaVersion.is(major, minor);
-  }
-
-  public static boolean isJavaVersion(int major, int minor, int update) {
-    return javaVersion.is(major, minor, update);
-  }
-
-  public static boolean isJavaVersionAtLeast(int major) {
-    return isJavaVersionAtLeast(major, 0, 0);
-  }
-
-  public static boolean isJavaVersionAtLeast(int major, int minor) {
-    return isJavaVersionAtLeast(major, minor, 0);
-  }
-
-  public static boolean isJavaVersionAtLeast(int major, int minor, int update) {
-    return javaVersion.isAtLeast(major, minor, update);
-  }
-
-  /**
-   * Checks if the Java version is between {@code fromMajor} (inclusive) and {@code toMajor}
-   * (exclusive).
-   *
-   * @param fromMajor major from version (inclusive)
-   * @param toMajor major to version (exclusive)
-   * @return if the current java version is between the from version (inclusive) and the to version
-   *     exclusive
-   */
-  public static boolean isJavaVersionBetween(int fromMajor, int toMajor) {
-    return isJavaVersionBetween(fromMajor, 0, toMajor, 0);
-  }
-
-  /**
-   * Checks if the Java version is between {@code fromMajor.fromMinor} (inclusive) and {@code
-   * toMajor.toMinor} (exclusive).
-   *
-   * @param fromMajor major from version (inclusive)
-   * @param fromMinor minor from version (inclusive)
-   * @param toMajor major to version (exclusive)
-   * @param toMinor minor to version (exclusive)
-   * @return if the current java version is between the from version (inclusive) and the to version
-   *     exclusive
-   */
-  public static boolean isJavaVersionBetween(
-      int fromMajor, int fromMinor, int toMajor, int toMinor) {
-    return isJavaVersionBetween(fromMajor, fromMinor, 0, toMajor, toMinor, 0);
-  }
-
-  /**
-   * Checks if the Java version is between {@code fromMajor.fromMinor.fromUpdate} (inclusive) and
-   * {@code toMajor.toMinor.toUpdate} (exclusive).
-   *
-   * @param fromMajor major from version (inclusive)
-   * @param fromMinor minor from version (inclusive)
-   * @param fromUpdate update from version (inclusive)
-   * @param toMajor major to version (exclusive)
-   * @param toMinor minor to version (exclusive)
-   * @param toUpdate update to version (exclusive)
-   * @return if the current java version is between the from version (inclusive) and the to version
-   *     exclusive
-   */
-  public static boolean isJavaVersionBetween(
-      int fromMajor, int fromMinor, int fromUpdate, int toMajor, int toMinor, int toUpdate) {
-    return javaVersion.isBetween(fromMajor, fromMinor, fromUpdate, toMajor, toMinor, toUpdate);
-  }
-
-  /**
-   * Checks whether the current JVM is an Oracle JDK 8.
-   *
-   * @return {@code true} if the current JVM is an Oracle JDK 8, {@code false} otherwise.
-   */
-  public static boolean isOracleJDK8() {
-    return isJavaVersion(8)
-        && runtime.vendor.contains("Oracle")
-        && !runtime.name.contains("OpenJDK");
-  }
-
-  public static boolean isHotspot() {
-    String prop = SystemProperties.getOrDefault("java.vm.name", "");
-    if (prop.isEmpty()) {
-      return false;
-    }
-    return prop.contains("OpenJDK")
-        || prop.contains("HotSpot")
-        || prop.contains("GraalVM")
-        || prop.contains("Dynamic Code Evolution");
-  }
-
-  public static boolean isJ9() {
-    return SystemProperties.getOrDefault("java.vm.name", "").contains("J9");
-  }
-
-  public static boolean isIbm() {
-    return runtime.vendor.contains("IBM");
-  }
-
-  public static boolean isIbm8() {
-    return isIbm() && isJavaVersion(8);
-  }
-
-  public static boolean isZulu8() {
-    return runtime.vendor.contains("Azul") && isJavaVersion(8);
-  }
-
-  public static boolean isGraalVM() {
-    return runtime.vendorVersion.toLowerCase().contains("graalvm");
-  }
-
-  public static String getLangVersion() {
-    return String.valueOf(javaVersion.major);
-  }
-
-  public static String getRuntimeVendor() {
-    return runtime.vendor;
-  }
-
-  public static String getRuntimeVersion() {
-    return runtime.version;
-  }
-
-  public static String getRuntimePatches() {
-    return runtime.patches;
-  }
-
-  /**
-   * Gets the JVM options.
-   *
-   * @return The JVM options, an empty collection if they can't be retrieved.
-   */
-  public static List<String> getVmOptions() {
-    return JvmOptionsHolder.JVM_OPTIONS.VM_OPTIONS;
-  }
-
-  /**
-   * Gets the command arguments.
-   *
-   * @return The command arguments, an empty collection if missing or can't be retrieved.
-   */
-  public static List<String> getCommandArguments() {
-    return commandLine.arguments;
-  }
-
-  /**
-   * Gets the JVM runtime main class name.
-   *
-   * @return The JVM runtime main class name, {@code null} if using JAR file instead or can't be
-   *     retrieved.
-   */
-  public static @Nullable String getMainClass() {
-    return commandLine.name != null && !isJarName(commandLine.name) ? commandLine.name : null;
-  }
-
-  /**
-   * Gets the JVM runtime jar file.
-   *
-   * @return The JVM runtime jar file, {@code null} if using main class instead or can't be
-   *     retrieved.
-   */
-  public static @Nullable String getJarFile() {
-    return commandLine.name != null && isJarName(commandLine.name) ? commandLine.name : null;
-  }
-
-  private static boolean isJarName(String argument) {
-    return argument.toLowerCase(Locale.ROOT).endsWith(".jar");
-  }
-
-  private static class JvmOptionsHolder {
-    private static final JvmOptions JVM_OPTIONS = new JvmOptions();
-  }
-
-  static final class Runtime {
-    /*
-     * Example:
-     *    jvm     -> "AdoptOpenJDK 1.8.0_265-b01"
+    private static final CommandLine commandLine = new CommandLine();
+    private static final JavaVersion javaVersion = JavaVersion.getRuntimeVersion();
+    private static final Runtime runtime = new Runtime();
+
+    private JavaVirtualMachine() {}
+
+    public static boolean isJavaVersion(int major) {
+        return javaVersion.is(major);
+    }
+
+    public static boolean isJavaVersion(int major, int minor) {
+        return javaVersion.is(major, minor);
+    }
+
+    public static boolean isJavaVersion(int major, int minor, int update) {
+        return javaVersion.is(major, minor, update);
+    }
+
+    public static boolean isJavaVersionAtLeast(int major) {
+        return isJavaVersionAtLeast(major, 0, 0);
+    }
+
+    public static boolean isJavaVersionAtLeast(int major, int minor) {
+        return isJavaVersionAtLeast(major, minor, 0);
+    }
+
+    public static boolean isJavaVersionAtLeast(int major, int minor, int update) {
+        return javaVersion.isAtLeast(major, minor, update);
+    }
+
+    /**
+     * Checks if the Java version is between {@code fromMajor} (inclusive) and {@code toMajor}
+     * (exclusive).
+     *
+     * @param fromMajor major from version (inclusive)
+     * @param toMajor major to version (exclusive)
+     * @return if the current java version is between the from version (inclusive) and the to version
+     *     exclusive
+     */
+    public static boolean isJavaVersionBetween(int fromMajor, int toMajor) {
+        return isJavaVersionBetween(fromMajor, 0, toMajor, 0);
+    }
+
+    /**
+     * Checks if the Java version is between {@code fromMajor.fromMinor} (inclusive) and {@code
+     * toMajor.toMinor} (exclusive).
      *
-     *    name    -> "OpenJDK"
-     *    vendor  -> "AdoptOpenJDK"
-     *    version -> "1.8.0_265"
-     *    patches -> "b01"
+     * @param fromMajor major from version (inclusive)
+     * @param fromMinor minor from version (inclusive)
+     * @param toMajor major to version (exclusive)
+     * @param toMinor minor to version (exclusive)
+     * @return if the current java version is between the from version (inclusive) and the to version
+     *     exclusive
      */
-    public final String name;
-
-    public final String vendor;
-    public final String version;
-    public final String vendorVersion;
-    public final String patches;
-
-    public Runtime() {
-      this(
-          SystemProperties.get("java.version"),
-          SystemProperties.get("java.runtime.version"),
-          SystemProperties.get("java.runtime.name"),
-          SystemProperties.get("java.vm.vendor"),
-          SystemProperties.get("java.vendor.version"));
-    }
-
-    @VisibleForTesting
-    Runtime(String javaVer, String rtVer, String name, String vendor, String vendorVersion) {
-      this.name = name == null ? "" : name;
-      this.vendor = vendor == null ? "" : vendor;
-      javaVer = javaVer == null ? "" : javaVer;
-      this.version = javaVer;
-      this.vendorVersion = vendorVersion == null ? "" : vendorVersion;
-      rtVer = javaVer.isEmpty() || rtVer == null ? javaVer : rtVer;
-      int patchStart = javaVer.length() + 1;
-      this.patches = (patchStart >= rtVer.length()) ? "" : rtVer.substring(javaVer.length() + 1);
-    }
-  }
+    public static boolean isJavaVersionBetween(int fromMajor, int fromMinor, int toMajor, int toMinor) {
+        return isJavaVersionBetween(fromMajor, fromMinor, 0, toMajor, toMinor, 0);
+    }
+
+    /**
+     * Checks if the Java version is between {@code fromMajor.fromMinor.fromUpdate} (inclusive) and
+     * {@code toMajor.toMinor.toUpdate} (exclusive).
+     *
+     * @param fromMajor major from version (inclusive)
+     * @param fromMinor minor from version (inclusive)
+     * @param fromUpdate update from version (inclusive)
+     * @param toMajor major to version (exclusive)
+     * @param toMinor minor to version (exclusive)
+     * @param toUpdate update to version (exclusive)
+     * @return if the current java version is between the from version (inclusive) and the to version
+     *     exclusive
+     */
+    public static boolean isJavaVersionBetween(
+            int fromMajor, int fromMinor, int fromUpdate, int toMajor, int toMinor, int toUpdate) {
+        return javaVersion.isBetween(fromMajor, fromMinor, fromUpdate, toMajor, toMinor, toUpdate);
+    }
+
+    /**
+     * Checks whether the current JVM is an Oracle JDK 8.
+     *
+     * @return {@code true} if the current JVM is an Oracle JDK 8, {@code false} otherwise.
+     */
+    public static boolean isOracleJDK8() {
+        return isJavaVersion(8) && runtime.vendor.contains("Oracle") && !runtime.name.contains("OpenJDK");
+    }
+
+    public static boolean isHotspot() {
+        String prop = SystemProperties.getOrDefault("java.vm.name", "");
+        if (prop.isEmpty()) {
+            return false;
+        }
+        return prop.contains("OpenJDK")
+                || prop.contains("HotSpot")
+                || prop.contains("GraalVM")
+                || prop.contains("Dynamic Code Evolution");
+    }
+
+    public static boolean isJ9() {
+        return SystemProperties.getOrDefault("java.vm.name", "").contains("J9");
+    }
+
+    public static boolean isIbm() {
+        return runtime.vendor.contains("IBM");
+    }
+
+    public static boolean isIbm8() {
+        return isIbm() && isJavaVersion(8);
+    }
+
+    public static boolean isZulu8() {
+        return runtime.vendor.contains("Azul") && isJavaVersion(8);
+    }
+
+    public static boolean isGraalVM() {
+        return runtime.vendorVersion.toLowerCase().contains("graalvm");
+    }
+
+    public static String getLangVersion() {
+        return String.valueOf(javaVersion.major);
+    }
+
+    public static String getRuntimeVendor() {
+        return runtime.vendor;
+    }
+
+    public static String getRuntimeVersion() {
+        return runtime.version;
+    }
+
+    public static String getRuntimePatches() {
+        return runtime.patches;
+    }
+
+    /**
+     * Gets the JVM options.
+     *
+     * @return The JVM options, an empty collection if they can't be retrieved.
+     */
+    public static List<String> getVmOptions() {
+        return JvmOptionsHolder.JVM_OPTIONS.VM_OPTIONS;
+    }
+
+    /**
+     * Gets the command arguments.
+     *
+     * @return The command arguments, an empty collection if missing or can't be retrieved.
+     */
+    public static List<String> getCommandArguments() {
+        return commandLine.arguments;
+    }
+
+    /**
+     * Gets the JVM runtime main class name.
+     *
+     * @return The JVM runtime main class name, {@code null} if using JAR file instead or can't be
+     *     retrieved.
+     */
+    public static @Nullable String getMainClass() {
+        return commandLine.name != null && !isJarName(commandLine.name) ? commandLine.name : null;
+    }
+
+    /**
+     * Gets the JVM runtime jar file.
+     *
+     * @return The JVM runtime jar file, {@code null} if using main class instead or can't be
+     *     retrieved.
+     */
+    public static @Nullable String getJarFile() {
+        return commandLine.name != null && isJarName(commandLine.name) ? commandLine.name : null;
+    }
+
+    private static boolean isJarName(String argument) {
+        return argument.toLowerCase(Locale.ROOT).endsWith(".jar");
+    }
+
+    private static class JvmOptionsHolder {
+        private static final JvmOptions JVM_OPTIONS = new JvmOptions();
+    }
+
+    static final class Runtime {
+        /*
+         * Example:
+         *    jvm     -> "AdoptOpenJDK 1.8.0_265-b01"
+         *
+         *    name    -> "OpenJDK"
+         *    vendor  -> "AdoptOpenJDK"
+         *    version -> "1.8.0_265"
+         *    patches -> "b01"
+         */
+        public final String name;
+
+        public final String vendor;
+        public final String version;
+        public final String vendorVersion;
+        public final String patches;
+
+        public Runtime() {
+            this(
+                    SystemProperties.get("java.version"),
+                    SystemProperties.get("java.runtime.version"),
+                    SystemProperties.get("java.runtime.name"),
+                    SystemProperties.get("java.vm.vendor"),
+                    SystemProperties.get("java.vendor.version"));
+        }
+
+        @VisibleForTesting
+        Runtime(String javaVer, String rtVer, String name, String vendor, String vendorVersion) {
+            this.name = name == null ? "" : name;
+            this.vendor = vendor == null ? "" : vendor;
+            javaVer = javaVer == null ? "" : javaVer;
+            this.version = javaVer;
+            this.vendorVersion = vendorVersion == null ? "" : vendorVersion;
+            rtVer = javaVer.isEmpty() || rtVer == null ? javaVer : rtVer;
+            int patchStart = javaVer.length() + 1;
+            this.patches = (patchStart >= rtVer.length()) ? "" : rtVer.substring(javaVer.length() + 1);
+        }
+    }
 }
diff --git a/components/environment/src/main/java/datadog/environment/JvmOptions.java b/components/environment/src/main/java/datadog/environment/JvmOptions.java
index 7dd77e29ff9..f09ae7e6279 100644
--- a/components/environment/src/main/java/datadog/environment/JvmOptions.java
+++ b/components/environment/src/main/java/datadog/environment/JvmOptions.java
@@ -20,192 +20,192 @@
 
 /** Fetches and captures the JVM options. */
 class JvmOptions {
-  static final String JAVA_TOOL_OPTIONS = "JAVA_TOOL_OPTIONS";
-  static final String JDK_JAVA_OPTIONS = "JDK_JAVA_OPTIONS";
-  final String[] PROCFS_CMDLINE = readProcFsCmdLine();
-  final List<String> VM_OPTIONS = findVmOptions();
+    static final String JAVA_TOOL_OPTIONS = "JAVA_TOOL_OPTIONS";
+    static final String JDK_JAVA_OPTIONS = "JDK_JAVA_OPTIONS";
+    final String[] PROCFS_CMDLINE = readProcFsCmdLine();
+    final List<String> VM_OPTIONS = findVmOptions();
 
-  @SuppressForbidden // split on single-character uses a fast path
-  private String[] readProcFsCmdLine() {
-    if (isLinux()) {
-      try {
-        Path cmdlinePath = Paths.get("/proc/self/cmdline");
-        if (Files.exists(cmdlinePath) && Files.isReadable(cmdlinePath)) {
-          try (BufferedReader in = Files.newBufferedReader(cmdlinePath)) {
-            return in.readLine().split("\0");
-          }
+    @SuppressForbidden // split on single-character uses a fast path
+    private String[] readProcFsCmdLine() {
+        if (isLinux()) {
+            try {
+                Path cmdlinePath = Paths.get("/proc/self/cmdline");
+                if (Files.exists(cmdlinePath) && Files.isReadable(cmdlinePath)) {
+                    try (BufferedReader in = Files.newBufferedReader(cmdlinePath)) {
+                        return in.readLine().split("\0");
+                    }
+                }
+            } catch (Throwable ignored) {
+            }
         }
-      } catch (Throwable ignored) {
-      }
+        return null;
     }
-    return null;
-  }
 
-  @SuppressForbidden // Class.forName() as backup
-  private List<String> findVmOptions() {
-    // Try ProcFS on Linux
-    if (PROCFS_CMDLINE != null) {
-      return findVmOptionsFromProcFs(PROCFS_CMDLINE);
-    }
+    @SuppressForbidden // Class.forName() as backup
+    private List<String> findVmOptions() {
+        // Try ProcFS on Linux
+        if (PROCFS_CMDLINE != null) {
+            return findVmOptionsFromProcFs(PROCFS_CMDLINE);
+        }
 
-    // Try Oracle-based
-    // IBM Semeru Runtime 1.8.0_345-b01 will throw UnsatisfiedLinkError here.
-    try {
-      final Class<?> managementFactoryHelperClass =
-          Class.forName("sun.management.ManagementFactoryHelper");
-      final Class<?> vmManagementClass = Class.forName("sun.management.VMManagement");
+        // Try Oracle-based
+        // IBM Semeru Runtime 1.8.0_345-b01 will throw UnsatisfiedLinkError here.
+        try {
+            final Class<?> managementFactoryHelperClass = Class.forName("sun.management.ManagementFactoryHelper");
+            final Class<?> vmManagementClass = Class.forName("sun.management.VMManagement");
 
-      Object vmManagement;
-      try {
-        vmManagement =
-            managementFactoryHelperClass.getDeclaredMethod("getVMManagement").invoke(null);
-      } catch (final Throwable e) {
-        // Older vm before getVMManagement() existed
-        final Field field = managementFactoryHelperClass.getDeclaredField("jvm");
-        field.setAccessible(true);
-        vmManagement = field.get(null);
-        field.setAccessible(false);
-      }
-      //noinspection unchecked
-      return (List<String>) vmManagementClass.getMethod("getVmArguments").invoke(vmManagement);
-    } catch (final Throwable ignored) {
-      // Ignored exception
-    }
+            Object vmManagement;
+            try {
+                vmManagement = managementFactoryHelperClass
+                        .getDeclaredMethod("getVMManagement")
+                        .invoke(null);
+            } catch (final Throwable e) {
+                // Older vm before getVMManagement() existed
+                final Field field = managementFactoryHelperClass.getDeclaredField("jvm");
+                field.setAccessible(true);
+                vmManagement = field.get(null);
+                field.setAccessible(false);
+            }
+            //noinspection unchecked
+            return (List<String>) vmManagementClass.getMethod("getVmArguments").invoke(vmManagement);
+        } catch (final Throwable ignored) {
+            // Ignored exception
+        }
 
-    // Try IBM-based.
-    try {
-      final Class<?> VMClass = Class.forName("com.ibm.oti.vm.VM");
-      final String[] argArray = (String[]) VMClass.getMethod("getVMArgs").invoke(null);
-      return asList(argArray);
-    } catch (final Throwable ignored) {
-      // Ignored exception
-    }
+        // Try IBM-based.
+        try {
+            final Class<?> VMClass = Class.forName("com.ibm.oti.vm.VM");
+            final String[] argArray = (String[]) VMClass.getMethod("getVMArgs").invoke(null);
+            return asList(argArray);
+        } catch (final Throwable ignored) {
+            // Ignored exception
+        }
 
-    // Fallback to default
-    try {
-      return ManagementFactory.getRuntimeMXBean().getInputArguments();
-    } catch (final Throwable t) {
-      // Throws InvocationTargetException on modularized applications
-      // with a non-opened java.management module
-      System.err.println("WARNING: Unable to get VM args using managed beans");
+        // Fallback to default
+        try {
+            return ManagementFactory.getRuntimeMXBean().getInputArguments();
+        } catch (final Throwable t) {
+            // Throws InvocationTargetException on modularized applications
+            // with a non-opened java.management module
+            System.err.println("WARNING: Unable to get VM args using managed beans");
+        }
+        return emptyList();
     }
-    return emptyList();
-  }
 
-  // Be aware that when running a native image, the command line in /proc/self/cmdline is just the
-  // executable
-  @VisibleForTesting
-  List<String> findVmOptionsFromProcFs(String[] procfsCmdline) {
-    // Create the list of VM options
-    List<String> vmOptions = new ArrayList<>();
-    // Look for the first self-standing argument that is not prefixed with "-" or end of VM options
-    // while simultaneously, collect all arguments in the VM options
-    // Starts from 1 as 0 is the java command itself (or native-image)
-    for (int index = 1; index < procfsCmdline.length; index++) {
-      String argument = procfsCmdline[index];
-      // Inflate arg files
-      if (argument.startsWith("@")) {
-        vmOptions.addAll(getArgumentsFromFile(argument));
-      }
-      // Skip classpath argument (not part of VM options)
-      else if ("-cp".equals(argument)) {
-        index++;
-      }
-      // Check "-jar" or class name argument as the end of the VM options
-      else if ("-jar".equals(argument) || !argument.startsWith("-")) {
-        // End of VM options
-        break;
-      }
-      // Otherwise add as a VM option
-      else {
-        vmOptions.add(argument);
-      }
-    }
-    // Insert JDK_JAVA_OPTIONS at the start if present and supported
-    List<String> jdkJavaOptions = getJdkJavaOptions();
-    if (!jdkJavaOptions.isEmpty()) {
-      vmOptions.addAll(0, jdkJavaOptions);
-    }
-    // Insert JAVA_TOOL_OPTIONS at the start if present
-    List<String> javaToolOptions = getJavaToolOptions();
-    if (!javaToolOptions.isEmpty()) {
-      vmOptions.addAll(0, javaToolOptions);
+    // Be aware that when running a native image, the command line in /proc/self/cmdline is just the
+    // executable
+    @VisibleForTesting
+    List<String> findVmOptionsFromProcFs(String[] procfsCmdline) {
+        // Create the list of VM options
+        List<String> vmOptions = new ArrayList<>();
+        // Look for the first self-standing argument that is not prefixed with "-" or end of VM options
+        // while simultaneously, collect all arguments in the VM options
+        // Starts from 1 as 0 is the java command itself (or native-image)
+        for (int index = 1; index < procfsCmdline.length; index++) {
+            String argument = procfsCmdline[index];
+            // Inflate arg files
+            if (argument.startsWith("@")) {
+                vmOptions.addAll(getArgumentsFromFile(argument));
+            }
+            // Skip classpath argument (not part of VM options)
+            else if ("-cp".equals(argument)) {
+                index++;
+            }
+            // Check "-jar" or class name argument as the end of the VM options
+            else if ("-jar".equals(argument) || !argument.startsWith("-")) {
+                // End of VM options
+                break;
+            }
+            // Otherwise add as a VM option
+            else {
+                vmOptions.add(argument);
+            }
+        }
+        // Insert JDK_JAVA_OPTIONS at the start if present and supported
+        List<String> jdkJavaOptions = getJdkJavaOptions();
+        if (!jdkJavaOptions.isEmpty()) {
+            vmOptions.addAll(0, jdkJavaOptions);
+        }
+        // Insert JAVA_TOOL_OPTIONS at the start if present
+        List<String> javaToolOptions = getJavaToolOptions();
+        if (!javaToolOptions.isEmpty()) {
+            vmOptions.addAll(0, javaToolOptions);
+        }
+        return vmOptions;
     }
-    return vmOptions;
-  }
 
-  private static List<String> getArgumentsFromFile(String argFile) {
-    String filename = argFile.substring(1);
-    Path path = Paths.get(filename);
-    if (!Files.exists(path) || !Files.isReadable(path)) {
-      return singletonList(argFile);
-    }
-    List<String> args = new ArrayList<>();
-    try {
-      for (String line : Files.readAllLines(path)) {
-        // Use default delimiters that match argfiles separator specification
-        StringTokenizer tokenizer = new StringTokenizer(line);
-        while (tokenizer.hasMoreTokens()) {
-          args.add(tokenizer.nextToken());
+    private static List<String> getArgumentsFromFile(String argFile) {
+        String filename = argFile.substring(1);
+        Path path = Paths.get(filename);
+        if (!Files.exists(path) || !Files.isReadable(path)) {
+            return singletonList(argFile);
+        }
+        List<String> args = new ArrayList<>();
+        try {
+            for (String line : Files.readAllLines(path)) {
+                // Use default delimiters that match argfiles separator specification
+                StringTokenizer tokenizer = new StringTokenizer(line);
+                while (tokenizer.hasMoreTokens()) {
+                    args.add(tokenizer.nextToken());
+                }
+            }
+            return args;
+        } catch (IOException e) {
+            return singletonList(argFile);
         }
-      }
-      return args;
-    } catch (IOException e) {
-      return singletonList(argFile);
     }
-  }
 
-  private static List<String> getJavaToolOptions() {
-    String javaToolOptions = EnvironmentVariables.getOrDefault(JAVA_TOOL_OPTIONS, "");
-    return javaToolOptions.isEmpty() ? emptyList() : parseOptions(javaToolOptions);
-  }
+    private static List<String> getJavaToolOptions() {
+        String javaToolOptions = EnvironmentVariables.getOrDefault(JAVA_TOOL_OPTIONS, "");
+        return javaToolOptions.isEmpty() ? emptyList() : parseOptions(javaToolOptions);
+    }
 
-  private static List<String> getJdkJavaOptions() {
-    if (!JavaVirtualMachine.isJavaVersionAtLeast(9)) {
-      return emptyList();
+    private static List<String> getJdkJavaOptions() {
+        if (!JavaVirtualMachine.isJavaVersionAtLeast(9)) {
+            return emptyList();
+        }
+        String sdkToolOptions = EnvironmentVariables.getOrDefault(JDK_JAVA_OPTIONS, "");
+        return sdkToolOptions.isEmpty() ? emptyList() : parseOptions(sdkToolOptions);
     }
-    String sdkToolOptions = EnvironmentVariables.getOrDefault(JDK_JAVA_OPTIONS, "");
-    return sdkToolOptions.isEmpty() ? emptyList() : parseOptions(sdkToolOptions);
-  }
 
-  /**
-   * Parse the JAVA_TOOL_OPTIONS environment variable according the JVMTI specifications.
-   *
-   * @param javaToolOptions The JAVA_TOOL_OPTIONS environment variable.
-   * @return The parsed JVM options.
-   * @see <a
-   *     href="https://docs.oracle.com/en/java/javase/21/docs/specs/jvmti.html#tooloptions">JVMTI
-   *     specifications</a>
-   */
-  static List<String> parseOptions(String javaToolOptions) {
-    List<String> options = new ArrayList<>();
-    StringBuilder option = new StringBuilder();
-    boolean inQuotes = false;
-    char quoteChar = 0;
+    /**
+     * Parse the JAVA_TOOL_OPTIONS environment variable according the JVMTI specifications.
+     *
+     * @param javaToolOptions The JAVA_TOOL_OPTIONS environment variable.
+     * @return The parsed JVM options.
+     * @see <a
+     *     href="https://docs.oracle.com/en/java/javase/21/docs/specs/jvmti.html#tooloptions">JVMTI
+     *     specifications</a>
+     */
+    static List<String> parseOptions(String javaToolOptions) {
+        List<String> options = new ArrayList<>();
+        StringBuilder option = new StringBuilder();
+        boolean inQuotes = false;
+        char quoteChar = 0;
 
-    for (int i = 0; i < javaToolOptions.length(); i++) {
-      char c = javaToolOptions.charAt(i);
-      if (inQuotes) {
-        if (quoteChar == c) {
-          inQuotes = false;
-        } else {
-          option.append(c);
+        for (int i = 0; i < javaToolOptions.length(); i++) {
+            char c = javaToolOptions.charAt(i);
+            if (inQuotes) {
+                if (quoteChar == c) {
+                    inQuotes = false;
+                } else {
+                    option.append(c);
+                }
+            } else if (c == '"' || c == '\'') {
+                inQuotes = true;
+                quoteChar = c;
+            } else if (Character.isWhitespace(c)) {
+                if (option.length() > 0) {
+                    options.add(option.toString());
+                    option.setLength(0);
+                }
+            } else {
+                option.append(c);
+            }
         }
-      } else if (c == '"' || c == '\'') {
-        inQuotes = true;
-        quoteChar = c;
-      } else if (Character.isWhitespace(c)) {
         if (option.length() > 0) {
-          options.add(option.toString());
-          option.setLength(0);
+            options.add(option.toString());
         }
-      } else {
-        option.append(c);
-      }
-    }
-    if (option.length() > 0) {
-      options.add(option.toString());
+        return options;
     }
-    return options;
-  }
 }
diff --git a/components/environment/src/main/java/datadog/environment/OperatingSystem.java b/components/environment/src/main/java/datadog/environment/OperatingSystem.java
index 7e64e6bdb33..875f72e76e2 100644
--- a/components/environment/src/main/java/datadog/environment/OperatingSystem.java
+++ b/components/environment/src/main/java/datadog/environment/OperatingSystem.java
@@ -18,209 +18,211 @@
 
 /** Detects operating systems and libc library. */
 public final class OperatingSystem {
-  private static final String OS_NAME_PROPERTY = "os.name";
-  private static final String OS_ARCH_PROPERTY = "os.arch";
-  private static final Type TYPE = Type.current();
-  private static final Architecture ARCHITECTURE = Architecture.current();
-
-  private OperatingSystem() {}
-
-  /**
-   * Checks whether the operating system is Linux based.
-   *
-   * @return @{@code true} if operating system is Linux based, {@code false} otherwise.
-   */
-  public static boolean isLinux() {
-    return TYPE == LINUX;
-  }
-
-  /**
-   * Checks whether the operating system is Windows.
-   *
-   * @return @{@code true} if operating system is Windows, {@code false} otherwise.
-   */
-  public static boolean isWindows() {
-    return TYPE == WINDOWS;
-  }
-
-  /**
-   * Checks whether the operating system is macOS.
-   *
-   * @return @{@code true} if operating system is macOS, {@code false} otherwise.
-   */
-  public static boolean isMacOs() {
-    return TYPE == MACOS;
-  }
-
-  /**
-   * Gets the operating system type.
-   *
-   * @return The operating system type, {@link Type#UNKNOWN} if not properly detected or supported.
-   */
-  public static Type type() {
-    return TYPE;
-  }
-
-  /** Gets the operating system architecture . */
-  public static Architecture architecture() {
-    return ARCHITECTURE;
-  }
-
-  /**
-   * Checks whether the libc is MUSL.
-   *
-   * @return {@code true} if the libc is MUSL, {@code false} otherwise.
-   */
-  public static boolean isMusl() {
-    if (!isLinux()) {
-      return false;
+    private static final String OS_NAME_PROPERTY = "os.name";
+    private static final String OS_ARCH_PROPERTY = "os.arch";
+    private static final Type TYPE = Type.current();
+    private static final Architecture ARCHITECTURE = Architecture.current();
+
+    private OperatingSystem() {}
+
+    /**
+     * Checks whether the operating system is Linux based.
+     *
+     * @return @{@code true} if operating system is Linux based, {@code false} otherwise.
+     */
+    public static boolean isLinux() {
+        return TYPE == LINUX;
     }
-    // check the Java exe then fall back to proc/self maps
-    try {
-      return isMuslJavaExecutable();
-    } catch (IOException e) {
-      try {
-        return isMuslProcSelfMaps();
-      } catch (IOException ignore) {
-        return false;
-      }
+
+    /**
+     * Checks whether the operating system is Windows.
+     *
+     * @return @{@code true} if operating system is Windows, {@code false} otherwise.
+     */
+    public static boolean isWindows() {
+        return TYPE == WINDOWS;
     }
-  }
-
-  private static boolean isMuslProcSelfMaps() throws IOException {
-    try (BufferedReader reader = new BufferedReader(new FileReader("/proc/self/maps"))) {
-      String line;
-      while ((line = reader.readLine()) != null) {
-        if (line.contains("-musl-")) {
-          return true;
+
+    /**
+     * Checks whether the operating system is macOS.
+     *
+     * @return @{@code true} if operating system is macOS, {@code false} otherwise.
+     */
+    public static boolean isMacOs() {
+        return TYPE == MACOS;
+    }
+
+    /**
+     * Gets the operating system type.
+     *
+     * @return The operating system type, {@link Type#UNKNOWN} if not properly detected or supported.
+     */
+    public static Type type() {
+        return TYPE;
+    }
+
+    /** Gets the operating system architecture . */
+    public static Architecture architecture() {
+        return ARCHITECTURE;
+    }
+
+    /**
+     * Checks whether the libc is MUSL.
+     *
+     * @return {@code true} if the libc is MUSL, {@code false} otherwise.
+     */
+    public static boolean isMusl() {
+        if (!isLinux()) {
+            return false;
         }
-        if (line.contains("/libc.")) {
-          return false;
+        // check the Java exe then fall back to proc/self maps
+        try {
+            return isMuslJavaExecutable();
+        } catch (IOException e) {
+            try {
+                return isMuslProcSelfMaps();
+            } catch (IOException ignore) {
+                return false;
+            }
         }
-      }
     }
-    return false;
-  }
-
-  /**
-   * There is information about the linking in the ELF file. Since properly parsing ELF is not
-   * trivial this code will attempt a brute-force approach and will scan the first 4096 bytes of the
-   * 'java' program image for anything prefixed with `/ld-` - in practice this will contain
-   * `/ld-musl` for musl systems and probably something else for non-musl systems (e.g.
-   * `/ld-linux-...`). However, if such string is missing should indicate that the system is not a
-   * musl one.
-   */
-  private static boolean isMuslJavaExecutable() throws IOException {
-    byte[] magic = new byte[] {(byte) 0x7f, (byte) 'E', (byte) 'L', (byte) 'F'};
-    byte[] prefix = new byte[] {(byte) '/', (byte) 'l', (byte) 'd', (byte) '-'}; // '/ld-*'
-    byte[] musl = new byte[] {(byte) 'm', (byte) 'u', (byte) 's', (byte) 'l'}; // 'musl'
-
-    Path binary = Paths.get(SystemProperties.getOrDefault("java.home", ""), "bin", "java");
-    byte[] buffer = new byte[4096];
-
-    try (InputStream is = Files.newInputStream(binary)) {
-      int read = is.read(buffer, 0, 4);
-      if (read != 4 || !containsArray(buffer, 0, magic)) {
-        throw new IOException(Arrays.toString(buffer));
-      }
-      read = is.read(buffer);
-      if (read <= 0) {
-        throw new IOException();
-      }
-      int prefixPos = 0;
-      for (int i = 0; i < read; i++) {
-        if (buffer[i] == prefix[prefixPos]) {
-          if (++prefixPos == prefix.length) {
-            return containsArray(buffer, i + 1, musl);
-          }
-        } else {
-          prefixPos = 0;
+
+    private static boolean isMuslProcSelfMaps() throws IOException {
+        try (BufferedReader reader = new BufferedReader(new FileReader("/proc/self/maps"))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (line.contains("-musl-")) {
+                    return true;
+                }
+                if (line.contains("/libc.")) {
+                    return false;
+                }
+            }
         }
-      }
+        return false;
     }
-    return false;
-  }
 
-  private static boolean containsArray(byte[] container, int offset, byte[] contained) {
-    for (int i = 0; i < contained.length; i++) {
-      int leftPos = offset + i;
-      if (leftPos >= container.length) {
-        return false;
-      }
-      if (container[leftPos] != contained[i]) {
+    /**
+     * There is information about the linking in the ELF file. Since properly parsing ELF is not
+     * trivial this code will attempt a brute-force approach and will scan the first 4096 bytes of the
+     * 'java' program image for anything prefixed with `/ld-` - in practice this will contain
+     * `/ld-musl` for musl systems and probably something else for non-musl systems (e.g.
+     * `/ld-linux-...`). However, if such string is missing should indicate that the system is not a
+     * musl one.
+     */
+    private static boolean isMuslJavaExecutable() throws IOException {
+        byte[] magic = new byte[] {(byte) 0x7f, (byte) 'E', (byte) 'L', (byte) 'F'};
+        byte[] prefix = new byte[] {(byte) '/', (byte) 'l', (byte) 'd', (byte) '-'}; // '/ld-*'
+        byte[] musl = new byte[] {(byte) 'm', (byte) 'u', (byte) 's', (byte) 'l'}; // 'musl'
+
+        Path binary = Paths.get(SystemProperties.getOrDefault("java.home", ""), "bin", "java");
+        byte[] buffer = new byte[4096];
+
+        try (InputStream is = Files.newInputStream(binary)) {
+            int read = is.read(buffer, 0, 4);
+            if (read != 4 || !containsArray(buffer, 0, magic)) {
+                throw new IOException(Arrays.toString(buffer));
+            }
+            read = is.read(buffer);
+            if (read <= 0) {
+                throw new IOException();
+            }
+            int prefixPos = 0;
+            for (int i = 0; i < read; i++) {
+                if (buffer[i] == prefix[prefixPos]) {
+                    if (++prefixPos == prefix.length) {
+                        return containsArray(buffer, i + 1, musl);
+                    }
+                } else {
+                    prefixPos = 0;
+                }
+            }
+        }
         return false;
-      }
     }
-    return true;
-  }
 
-  public enum Type {
-    WINDOWS("Windows"),
-    MACOS("MacOS"),
-    LINUX("Linux"),
-    UNKNOWN("unknown");
+    private static boolean containsArray(byte[] container, int offset, byte[] contained) {
+        for (int i = 0; i < contained.length; i++) {
+            int leftPos = offset + i;
+            if (leftPos >= container.length) {
+                return false;
+            }
+            if (container[leftPos] != contained[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
 
-    private final String name;
+    public enum Type {
+        WINDOWS("Windows"),
+        MACOS("MacOS"),
+        LINUX("Linux"),
+        UNKNOWN("unknown");
 
-    Type(String name) {
-      this.name = name;
-    }
+        private final String name;
 
-    static Type current() {
-      String property = SystemProperties.getOrDefault(OS_NAME_PROPERTY, "").toLowerCase(ROOT);
-      // https://mkyong.com/java/how-to-detect-os-in-java-systemgetpropertyosname/
-      if (property.contains("linux")) {
-        return LINUX;
-      } else if (property.contains("win")) {
-        return WINDOWS;
-      } else if (property.contains("mac")) {
-        return MACOS;
-      } else {
-        return UNKNOWN;
-      }
-    }
+        Type(String name) {
+            this.name = name;
+        }
 
-    @Override
-    public String toString() {
-      return this.name;
+        static Type current() {
+            String property =
+                    SystemProperties.getOrDefault(OS_NAME_PROPERTY, "").toLowerCase(ROOT);
+            // https://mkyong.com/java/how-to-detect-os-in-java-systemgetpropertyosname/
+            if (property.contains("linux")) {
+                return LINUX;
+            } else if (property.contains("win")) {
+                return WINDOWS;
+            } else if (property.contains("mac")) {
+                return MACOS;
+            } else {
+                return UNKNOWN;
+            }
+        }
+
+        @Override
+        public String toString() {
+            return this.name;
+        }
     }
-  }
 
-  /** Detects the operating system architecture. */
-  public enum Architecture {
-    X64("x86_64", "amd64", "k8"),
-    X86("x86", "i386", "i486", "i586", "i686"),
-    ARM("arm", "aarch32"),
-    ARM64("arm64", "aarch64"),
-    UNKNOWN();
+    /** Detects the operating system architecture. */
+    public enum Architecture {
+        X64("x86_64", "amd64", "k8"),
+        X86("x86", "i386", "i486", "i586", "i686"),
+        ARM("arm", "aarch32"),
+        ARM64("arm64", "aarch64"),
+        UNKNOWN();
 
-    private final Set<String> identifiers;
+        private final Set<String> identifiers;
 
-    Architecture(String... identifiers) {
-      this.identifiers = new HashSet<>(Arrays.asList(identifiers));
-    }
+        Architecture(String... identifiers) {
+            this.identifiers = new HashSet<>(Arrays.asList(identifiers));
+        }
 
-    static Architecture of(String identifier) {
-      for (Architecture architecture : Architecture.values()) {
-        if (architecture.identifiers.contains(identifier)) {
-          return architecture;
+        static Architecture of(String identifier) {
+            for (Architecture architecture : Architecture.values()) {
+                if (architecture.identifiers.contains(identifier)) {
+                    return architecture;
+                }
+            }
+            return UNKNOWN;
         }
-      }
-      return UNKNOWN;
-    }
 
-    static Architecture current() {
-      String property = SystemProperties.getOrDefault(OS_ARCH_PROPERTY, "").toLowerCase(ROOT);
-      return Architecture.of(property);
-    }
+        static Architecture current() {
+            String property =
+                    SystemProperties.getOrDefault(OS_ARCH_PROPERTY, "").toLowerCase(ROOT);
+            return Architecture.of(property);
+        }
 
-    /**
-     * Checks whether the architecture is arm64.
-     *
-     * @return {@code true} if architecture is arm64, {@code false} otherwise.
-     */
-    public boolean isArm64() {
-      return this == ARM64;
+        /**
+         * Checks whether the architecture is arm64.
+         *
+         * @return {@code true} if architecture is arm64, {@code false} otherwise.
+         */
+        public boolean isArm64() {
+            return this == ARM64;
+        }
     }
-  }
 }
diff --git a/components/environment/src/main/java/datadog/environment/SystemProperties.java b/components/environment/src/main/java/datadog/environment/SystemProperties.java
index dde075fbf4d..10969407685 100644
--- a/components/environment/src/main/java/datadog/environment/SystemProperties.java
+++ b/components/environment/src/main/java/datadog/environment/SystemProperties.java
@@ -14,91 +14,91 @@
  *     Manager</a>
  */
 public final class SystemProperties {
-  private SystemProperties() {}
+    private SystemProperties() {}
 
-  /**
-   * Gets a system property value.
-   *
-   * @param property The system property name.
-   * @return The system property value, {@code null} if missing, can't be retrieved, or the system
-   *     property name is {@code null}.
-   */
-  public static @Nullable String get(String property) {
-    return getOrDefault(property, null);
-  }
-
-  /**
-   * Gets a system property value, or default value if missing or can't be retrieved.
-   *
-   * @param property The system property name.
-   * @param defaultValue The default value to return if the system property is missing or can't be
-   *     retrieved.
-   * @return The system property value, {@code defaultValue} if missing, can't be retrieved, or the
-   *     system property name is {@code null}.
-   */
-  public static String getOrDefault(String property, String defaultValue) {
-    if (property == null) {
-      return defaultValue;
-    }
-    try {
-      return System.getProperty(property, defaultValue);
-    } catch (SecurityException ignored) {
-      return defaultValue;
+    /**
+     * Gets a system property value.
+     *
+     * @param property The system property name.
+     * @return The system property value, {@code null} if missing, can't be retrieved, or the system
+     *     property name is {@code null}.
+     */
+    public static @Nullable String get(String property) {
+        return getOrDefault(property, null);
     }
-  }
 
-  /**
-   * Convert system properties to an unmodifiable {@link Map}.
-   *
-   * @return All system properties captured in an unmodifiable {@link Map}, or an empty {@link Map}
-   *     if they can't be retrieved.
-   */
-  public static Map<String, String> asStringMap() {
-    try {
-      Map<String, String> map = new HashMap<>();
-      for (String propertyName : System.getProperties().stringPropertyNames()) {
-        map.put(propertyName, System.getProperty(propertyName));
-      }
-      return unmodifiableMap(map);
-    } catch (SecurityException ignored) {
-      return emptyMap();
+    /**
+     * Gets a system property value, or default value if missing or can't be retrieved.
+     *
+     * @param property The system property name.
+     * @param defaultValue The default value to return if the system property is missing or can't be
+     *     retrieved.
+     * @return The system property value, {@code defaultValue} if missing, can't be retrieved, or the
+     *     system property name is {@code null}.
+     */
+    public static String getOrDefault(String property, String defaultValue) {
+        if (property == null) {
+            return defaultValue;
+        }
+        try {
+            return System.getProperty(property, defaultValue);
+        } catch (SecurityException ignored) {
+            return defaultValue;
+        }
     }
-  }
 
-  /**
-   * Sets a system property value.
-   *
-   * @param property The system property name.
-   * @param value The system property value to set.
-   * @return {@code true} if the system property was successfully set, {@code} false otherwise.
-   */
-  public static boolean set(String property, String value) {
-    if (property == null || value == null) {
-      return false;
+    /**
+     * Convert system properties to an unmodifiable {@link Map}.
+     *
+     * @return All system properties captured in an unmodifiable {@link Map}, or an empty {@link Map}
+     *     if they can't be retrieved.
+     */
+    public static Map<String, String> asStringMap() {
+        try {
+            Map<String, String> map = new HashMap<>();
+            for (String propertyName : System.getProperties().stringPropertyNames()) {
+                map.put(propertyName, System.getProperty(propertyName));
+            }
+            return unmodifiableMap(map);
+        } catch (SecurityException ignored) {
+            return emptyMap();
+        }
     }
-    try {
-      System.setProperty(property, value);
-      return true;
-    } catch (SecurityException ignored) {
-      return false;
-    }
-  }
 
-  /**
-   * Clears a system property.
-   *
-   * @param property The system property name to clear.
-   * @return The previous value of the system property, {@code null} if there was no prior property
-   *     and property can't be cleared.
-   */
-  public static @Nullable String clear(String property) {
-    if (property == null) {
-      return null;
+    /**
+     * Sets a system property value.
+     *
+     * @param property The system property name.
+     * @param value The system property value to set.
+     * @return {@code true} if the system property was successfully set, {@code} false otherwise.
+     */
+    public static boolean set(String property, String value) {
+        if (property == null || value == null) {
+            return false;
+        }
+        try {
+            System.setProperty(property, value);
+            return true;
+        } catch (SecurityException ignored) {
+            return false;
+        }
     }
-    try {
-      return System.clearProperty(property);
-    } catch (SecurityException ignored) {
-      return null;
+
+    /**
+     * Clears a system property.
+     *
+     * @param property The system property name to clear.
+     * @return The previous value of the system property, {@code null} if there was no prior property
+     *     and property can't be cleared.
+     */
+    public static @Nullable String clear(String property) {
+        if (property == null) {
+            return null;
+        }
+        try {
+            return System.clearProperty(property);
+        } catch (SecurityException ignored) {
+            return null;
+        }
     }
-  }
 }
diff --git a/components/environment/src/main/java/datadog/environment/ThreadSupport.java b/components/environment/src/main/java/datadog/environment/ThreadSupport.java
index 4c3221ceca1..a85b1eb49d8 100644
--- a/components/environment/src/main/java/datadog/environment/ThreadSupport.java
+++ b/components/environment/src/main/java/datadog/environment/ThreadSupport.java
@@ -16,127 +16,125 @@
  * overhead.
  */
 public final class ThreadSupport {
-  static final MethodHandle THREAD_ID_MH = findThreadIdMethodHandle();
-  static final MethodHandle IS_VIRTUAL_MH = findIsVirtualMethodHandle();
-  static final MethodHandle NEW_VIRTUAL_THREAD_PER_TASK_EXECUTOR_MH =
-      findNewVirtualThreadPerTaskExecutorMethodHandle();
+    static final MethodHandle THREAD_ID_MH = findThreadIdMethodHandle();
+    static final MethodHandle IS_VIRTUAL_MH = findIsVirtualMethodHandle();
+    static final MethodHandle NEW_VIRTUAL_THREAD_PER_TASK_EXECUTOR_MH =
+            findNewVirtualThreadPerTaskExecutorMethodHandle();
 
-  private ThreadSupport() {}
+    private ThreadSupport() {}
 
-  /**
-   * Provides the best identifier available for the current {@link Thread}. Uses {@code
-   * Thread.threadId()} on 19+ or {@link Thread#getId()} on older JVMs.
-   *
-   * @return The best identifier available for the current {@link Thread}.
-   */
-  public static long threadId() {
-    return threadId(Thread.currentThread());
-  }
+    /**
+     * Provides the best identifier available for the current {@link Thread}. Uses {@code
+     * Thread.threadId()} on 19+ or {@link Thread#getId()} on older JVMs.
+     *
+     * @return The best identifier available for the current {@link Thread}.
+     */
+    public static long threadId() {
+        return threadId(Thread.currentThread());
+    }
 
-  /**
-   * Provides the best identifier available for the given {@link Thread}. Uses {@code
-   * Thread.threadId()} on 19+ or {@link Thread#getId()} on older JVMs.
-   *
-   * @return The best identifier available for the given {@link Thread}.
-   */
-  public static long threadId(Thread thread) {
-    if (THREAD_ID_MH != null) {
-      try {
-        return (long) THREAD_ID_MH.invoke(thread);
-      } catch (Throwable ignored) {
-      }
+    /**
+     * Provides the best identifier available for the given {@link Thread}. Uses {@code
+     * Thread.threadId()} on 19+ or {@link Thread#getId()} on older JVMs.
+     *
+     * @return The best identifier available for the given {@link Thread}.
+     */
+    public static long threadId(Thread thread) {
+        if (THREAD_ID_MH != null) {
+            try {
+                return (long) THREAD_ID_MH.invoke(thread);
+            } catch (Throwable ignored) {
+            }
+        }
+        return thread.getId();
     }
-    return thread.getId();
-  }
 
-  /**
-   * Checks whether virtual threads are supported on this JVM.
-   *
-   * @return {@code true} if virtual threads are supported, {@code false} otherwise.
-   */
-  public static boolean supportsVirtualThreads() {
-    return (IS_VIRTUAL_MH != null);
-  }
+    /**
+     * Checks whether virtual threads are supported on this JVM.
+     *
+     * @return {@code true} if virtual threads are supported, {@code false} otherwise.
+     */
+    public static boolean supportsVirtualThreads() {
+        return (IS_VIRTUAL_MH != null);
+    }
 
-  /**
-   * Checks whether the current thread is a virtual thread.
-   *
-   * @return {@code true} if the current thread is a virtual thread, {@code false} otherwise.
-   */
-  public static boolean isVirtual() {
-    // IS_VIRTUAL_MH will constant propagate -- then dead code eliminate -- and inline as needed
-    return IS_VIRTUAL_MH != null && isVirtual(Thread.currentThread());
-  }
+    /**
+     * Checks whether the current thread is a virtual thread.
+     *
+     * @return {@code true} if the current thread is a virtual thread, {@code false} otherwise.
+     */
+    public static boolean isVirtual() {
+        // IS_VIRTUAL_MH will constant propagate -- then dead code eliminate -- and inline as needed
+        return IS_VIRTUAL_MH != null && isVirtual(Thread.currentThread());
+    }
 
-  /**
-   * Checks whether the given thread is a virtual thread.
-   *
-   * @param thread The thread to check.
-   * @return {@code true} if the given thread is virtual, {@code false} otherwise.
-   */
-  public static boolean isVirtual(Thread thread) {
-    // IS_VIRTUAL_MH will constant propagate -- then dead code eliminate -- and inline as needed
-    if (IS_VIRTUAL_MH != null) {
-      try {
-        return (boolean) IS_VIRTUAL_MH.invoke(thread);
-      } catch (Throwable ignored) {
-      }
+    /**
+     * Checks whether the given thread is a virtual thread.
+     *
+     * @param thread The thread to check.
+     * @return {@code true} if the given thread is virtual, {@code false} otherwise.
+     */
+    public static boolean isVirtual(Thread thread) {
+        // IS_VIRTUAL_MH will constant propagate -- then dead code eliminate -- and inline as needed
+        if (IS_VIRTUAL_MH != null) {
+            try {
+                return (boolean) IS_VIRTUAL_MH.invoke(thread);
+            } catch (Throwable ignored) {
+            }
+        }
+        return false;
     }
-    return false;
-  }
 
-  /**
-   * Returns the virtual thread per task executor if available.
-   *
-   * @return The virtual thread per task executor if available wrapped into an {@link Optional}, or
-   *     {@link Optional#empty()} otherwise.
-   */
-  public static Optional<ExecutorService> newVirtualThreadPerTaskExecutor() {
-    if (NEW_VIRTUAL_THREAD_PER_TASK_EXECUTOR_MH != null) {
-      try {
-        ExecutorService executorService =
-            (ExecutorService) NEW_VIRTUAL_THREAD_PER_TASK_EXECUTOR_MH.invoke();
-        return Optional.of(executorService);
-      } catch (Throwable ignored) {
-      }
+    /**
+     * Returns the virtual thread per task executor if available.
+     *
+     * @return The virtual thread per task executor if available wrapped into an {@link Optional}, or
+     *     {@link Optional#empty()} otherwise.
+     */
+    public static Optional<ExecutorService> newVirtualThreadPerTaskExecutor() {
+        if (NEW_VIRTUAL_THREAD_PER_TASK_EXECUTOR_MH != null) {
+            try {
+                ExecutorService executorService = (ExecutorService) NEW_VIRTUAL_THREAD_PER_TASK_EXECUTOR_MH.invoke();
+                return Optional.of(executorService);
+            } catch (Throwable ignored) {
+            }
+        }
+        return Optional.empty();
     }
-    return Optional.empty();
-  }
 
-  private static MethodHandle findThreadIdMethodHandle() {
-    if (JavaVirtualMachine.isJavaVersionAtLeast(19)) {
-      try {
-        return MethodHandles.lookup()
-            .findVirtual(Thread.class, "threadId", MethodType.methodType(long.class));
-      } catch (Throwable ignored) {
+    private static MethodHandle findThreadIdMethodHandle() {
+        if (JavaVirtualMachine.isJavaVersionAtLeast(19)) {
+            try {
+                return MethodHandles.lookup().findVirtual(Thread.class, "threadId", MethodType.methodType(long.class));
+            } catch (Throwable ignored) {
+                return null;
+            }
+        }
         return null;
-      }
     }
-    return null;
-  }
 
-  private static MethodHandle findIsVirtualMethodHandle() {
-    if (JavaVirtualMachine.isJavaVersionAtLeast(21)) {
-      try {
-        return MethodHandles.lookup()
-            .findVirtual(Thread.class, "isVirtual", MethodType.methodType(boolean.class));
-      } catch (Throwable ignored) {
-      }
+    private static MethodHandle findIsVirtualMethodHandle() {
+        if (JavaVirtualMachine.isJavaVersionAtLeast(21)) {
+            try {
+                return MethodHandles.lookup()
+                        .findVirtual(Thread.class, "isVirtual", MethodType.methodType(boolean.class));
+            } catch (Throwable ignored) {
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  private static MethodHandle findNewVirtualThreadPerTaskExecutorMethodHandle() {
-    if (JavaVirtualMachine.isJavaVersionAtLeast(21)) {
-      try {
-        return MethodHandles.lookup()
-            .findStatic(
-                Executors.class,
-                "newVirtualThreadPerTaskExecutor",
-                MethodType.methodType(ExecutorService.class));
-      } catch (Throwable ignored) {
-      }
+    private static MethodHandle findNewVirtualThreadPerTaskExecutorMethodHandle() {
+        if (JavaVirtualMachine.isJavaVersionAtLeast(21)) {
+            try {
+                return MethodHandles.lookup()
+                        .findStatic(
+                                Executors.class,
+                                "newVirtualThreadPerTaskExecutor",
+                                MethodType.methodType(ExecutorService.class));
+            } catch (Throwable ignored) {
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/components/environment/src/test/java/datadog/environment/CommandLineHelper.java b/components/environment/src/test/java/datadog/environment/CommandLineHelper.java
index d2e17ba0150..43c9767b417 100644
--- a/components/environment/src/test/java/datadog/environment/CommandLineHelper.java
+++ b/components/environment/src/test/java/datadog/environment/CommandLineHelper.java
@@ -12,125 +12,121 @@
 import java.util.Map;
 
 class CommandLineHelper {
-  private static final String JVM_OPTIONS_MARKER = "-- JVM OPTIONS --";
-  private static final String MAIN_CLASS_MARKER = "-- MAIN CLASS --";
-  private static final String CMD_ARGUMENTS_MARKER = "-- CMD ARGUMENTS --";
-  private static final String REAL_CMD_ARGUMENTS_MARKER = "-- REAL CMD ARGUMENTS --";
-  static final String TEST_PROCESS_CLASS_NAME = CommandLineTestProcess.class.getName();
+    private static final String JVM_OPTIONS_MARKER = "-- JVM OPTIONS --";
+    private static final String MAIN_CLASS_MARKER = "-- MAIN CLASS --";
+    private static final String CMD_ARGUMENTS_MARKER = "-- CMD ARGUMENTS --";
+    private static final String REAL_CMD_ARGUMENTS_MARKER = "-- REAL CMD ARGUMENTS --";
+    static final String TEST_PROCESS_CLASS_NAME = CommandLineTestProcess.class.getName();
 
-  static Result forkAndRunWithArgs(RunArguments arguments)
-      throws IOException, InterruptedException {
-    return forkAndRunWithArgs(arguments, emptyMap());
-  }
+    static Result forkAndRunWithArgs(RunArguments arguments) throws IOException, InterruptedException {
+        return forkAndRunWithArgs(arguments, emptyMap());
+    }
 
-  static Result forkAndRunWithArgs(RunArguments arguments, Map<String, String> environmentVariables)
-      throws IOException, InterruptedException {
-    // Build the command to run a new Java process
-    List<String> command = new ArrayList<>();
-    command.add(System.getProperty("java.home") + separator + "bin" + separator + "java");
-    command.addAll(arguments.jvmOptions);
-    command.add("-cp");
-    command.add(System.getProperty("java.class.path"));
-    command.add(CommandLineTestProcess.class.getName());
-    command.addAll(arguments.cmdArgs);
-    // Start the process
-    ProcessBuilder processBuilder = new ProcessBuilder(command);
-    processBuilder.environment().putAll(environmentVariables);
-    Process process = processBuilder.start();
-    // Read and parse output and error streams
-    Result result = new Result();
-    List<String> current = null;
-    String output = "";
-    try (BufferedReader reader =
-        new BufferedReader(new InputStreamReader(process.getInputStream()))) {
-      String line;
-      while ((line = reader.readLine()) != null) {
-        if (JVM_OPTIONS_MARKER.equals(line)) {
-          current = result.jvmOptions;
-        } else if (MAIN_CLASS_MARKER.equals(line)) {
-          current = result.mainClasses;
-        } else if (CMD_ARGUMENTS_MARKER.equals(line)) {
-          current = result.cmdArgs;
-        } else if (REAL_CMD_ARGUMENTS_MARKER.equals(line)) {
-          current = result.realCmdArgs;
-        } else if (current != null) {
-          current.add(line);
+    static Result forkAndRunWithArgs(RunArguments arguments, Map<String, String> environmentVariables)
+            throws IOException, InterruptedException {
+        // Build the command to run a new Java process
+        List<String> command = new ArrayList<>();
+        command.add(System.getProperty("java.home") + separator + "bin" + separator + "java");
+        command.addAll(arguments.jvmOptions);
+        command.add("-cp");
+        command.add(System.getProperty("java.class.path"));
+        command.add(CommandLineTestProcess.class.getName());
+        command.addAll(arguments.cmdArgs);
+        // Start the process
+        ProcessBuilder processBuilder = new ProcessBuilder(command);
+        processBuilder.environment().putAll(environmentVariables);
+        Process process = processBuilder.start();
+        // Read and parse output and error streams
+        Result result = new Result();
+        List<String> current = null;
+        String output = "";
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (JVM_OPTIONS_MARKER.equals(line)) {
+                    current = result.jvmOptions;
+                } else if (MAIN_CLASS_MARKER.equals(line)) {
+                    current = result.mainClasses;
+                } else if (CMD_ARGUMENTS_MARKER.equals(line)) {
+                    current = result.cmdArgs;
+                } else if (REAL_CMD_ARGUMENTS_MARKER.equals(line)) {
+                    current = result.realCmdArgs;
+                } else if (current != null) {
+                    current.add(line);
+                }
+                output += line + "\n";
+            }
+            // Drop classpath from JVM options as only supported by /proc/fs but not the fallbacks
+            int indexOfCp;
+            if ((indexOfCp = result.jvmOptions.indexOf("-cp")) != -1 && indexOfCp < result.jvmOptions.size()) {
+                // Remove both "-cp" and the classpath
+                result.jvmOptions.remove(indexOfCp);
+                result.jvmOptions.remove(indexOfCp);
+            }
         }
-        output += line + "\n";
-      }
-      // Drop classpath from JVM options as only supported by /proc/fs but not the fallbacks
-      int indexOfCp;
-      if ((indexOfCp = result.jvmOptions.indexOf("-cp")) != -1
-          && indexOfCp < result.jvmOptions.size()) {
-        // Remove both "-cp" and the classpath
-        result.jvmOptions.remove(indexOfCp);
-        result.jvmOptions.remove(indexOfCp);
-      }
-    }
-    String error = "";
-    try (BufferedReader reader =
-        new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
-      String line;
-      while ((line = reader.readLine()) != null) {
-        error += line + "\n";
-      }
-    }
-    // Wait for the process to complete
-    int exitCode = process.waitFor();
-    // Dumping state on error
-    if (exitCode != 0) {
-      System.err.println("Error running command: " + String.join(" ", command));
-      System.err.println("Exit code " + exitCode + " with output:");
-      System.err.println(output);
-      System.err.println("and error:");
-      System.err.println(error);
+        String error = "";
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                error += line + "\n";
+            }
+        }
+        // Wait for the process to complete
+        int exitCode = process.waitFor();
+        // Dumping state on error
+        if (exitCode != 0) {
+            System.err.println("Error running command: " + String.join(" ", command));
+            System.err.println("Exit code " + exitCode + " with output:");
+            System.err.println(output);
+            System.err.println("and error:");
+            System.err.println(error);
+        }
+        assertEquals(0, exitCode, "Process should exit normally");
+        return result;
     }
-    assertEquals(0, exitCode, "Process should exit normally");
-    return result;
-  }
 
-  static class RunArguments {
-    List<String> jvmOptions = new ArrayList<>();
-    List<String> cmdArgs = new ArrayList<>();
+    static class RunArguments {
+        List<String> jvmOptions = new ArrayList<>();
+        List<String> cmdArgs = new ArrayList<>();
 
-    static RunArguments of(List<String> jvmArgs, List<String> cmdArgs) {
-      RunArguments arguments = new RunArguments();
-      arguments.jvmOptions = jvmArgs;
-      arguments.cmdArgs = cmdArgs;
-      return arguments;
+        static RunArguments of(List<String> jvmArgs, List<String> cmdArgs) {
+            RunArguments arguments = new RunArguments();
+            arguments.jvmOptions = jvmArgs;
+            arguments.cmdArgs = cmdArgs;
+            return arguments;
+        }
     }
-  }
 
-  static class Result extends RunArguments {
-    List<String> realCmdArgs = new ArrayList<>();
-    List<String> mainClasses = new ArrayList<>();
+    static class Result extends RunArguments {
+        List<String> realCmdArgs = new ArrayList<>();
+        List<String> mainClasses = new ArrayList<>();
 
-    String mainClass() {
-      return String.join(",", this.mainClasses);
+        String mainClass() {
+            return String.join(",", this.mainClasses);
+        }
     }
-  }
 
-  // This class will be executed in the subprocess
-  public static class CommandLineTestProcess {
-    public static void main(String[] args) {
-      // Print each VM argument on a new line
-      System.out.println(JVM_OPTIONS_MARKER);
-      for (String option : JavaVirtualMachine.getVmOptions()) {
-        System.out.println(option);
-      }
-      // Print main class
-      System.out.println(MAIN_CLASS_MARKER);
-      System.out.println(JavaVirtualMachine.getMainClass());
-      // Print each command argument on a new line
-      System.out.println(CMD_ARGUMENTS_MARKER);
-      for (String arg : JavaVirtualMachine.getCommandArguments()) {
-        System.out.println(arg);
-      }
-      // Print each real command argument on a new line
-      System.out.println(REAL_CMD_ARGUMENTS_MARKER);
-      for (String arg : args) {
-        System.out.println(arg);
-      }
+    // This class will be executed in the subprocess
+    public static class CommandLineTestProcess {
+        public static void main(String[] args) {
+            // Print each VM argument on a new line
+            System.out.println(JVM_OPTIONS_MARKER);
+            for (String option : JavaVirtualMachine.getVmOptions()) {
+                System.out.println(option);
+            }
+            // Print main class
+            System.out.println(MAIN_CLASS_MARKER);
+            System.out.println(JavaVirtualMachine.getMainClass());
+            // Print each command argument on a new line
+            System.out.println(CMD_ARGUMENTS_MARKER);
+            for (String arg : JavaVirtualMachine.getCommandArguments()) {
+                System.out.println(arg);
+            }
+            // Print each real command argument on a new line
+            System.out.println(REAL_CMD_ARGUMENTS_MARKER);
+            for (String arg : args) {
+                System.out.println(arg);
+            }
+        }
     }
-  }
 }
diff --git a/components/environment/src/test/java/datadog/environment/CommandLineTest.java b/components/environment/src/test/java/datadog/environment/CommandLineTest.java
index b1673b80a29..4aab9ccfdc9 100644
--- a/components/environment/src/test/java/datadog/environment/CommandLineTest.java
+++ b/components/environment/src/test/java/datadog/environment/CommandLineTest.java
@@ -27,8 +27,8 @@
 
 class CommandLineTest {
 
-  static Stream<Arguments> data() {
-    // spotless:off
+    static Stream<Arguments> data() {
+        // spotless:off
     return Stream.of(
         arguments(
             "No JVM options nor command argument",
@@ -65,73 +65,71 @@ static Stream<Arguments> data() {
             of(flatten("-Dtest.property=value", expectedArsFromArgFile("tab-separated")), asList("arg1", "arg2")))
     );
     // spotless:on
-  }
-
-  @ParameterizedTest(name = "[{index}] {0}")
-  @MethodSource("data")
-  void testGetVmArguments(String useCase, RunArguments arguments, RunArguments expectedArguments)
-      throws Exception {
-    // Skip unsupported test cases
-    skipArgFileTestOnJava8(arguments);
-    // Run test process
-    Result result = forkAndRunWithArgs(arguments);
-    // Check results
-    assertEquals(expectedArguments.jvmOptions, result.jvmOptions, "Failed to get JVM options");
-    assertEquals(TEST_PROCESS_CLASS_NAME, result.mainClass(), "Failed to get main class");
-    assertEquals(result.realCmdArgs, result.cmdArgs, "Failed to get command arguments");
-    assertEquals(result.realCmdArgs, expectedArguments.cmdArgs, "Unexpected command arguments");
-  }
+    }
 
-  private static void skipArgFileTestOnJava8(RunArguments arguments) {
-    boolean useArgFile = false;
-    for (String jvmOption : arguments.jvmOptions) {
-      if (jvmOption.startsWith("@")) {
-        useArgFile = true;
-        break;
-      }
+    @ParameterizedTest(name = "[{index}] {0}")
+    @MethodSource("data")
+    void testGetVmArguments(String useCase, RunArguments arguments, RunArguments expectedArguments) throws Exception {
+        // Skip unsupported test cases
+        skipArgFileTestOnJava8(arguments);
+        // Run test process
+        Result result = forkAndRunWithArgs(arguments);
+        // Check results
+        assertEquals(expectedArguments.jvmOptions, result.jvmOptions, "Failed to get JVM options");
+        assertEquals(TEST_PROCESS_CLASS_NAME, result.mainClass(), "Failed to get main class");
+        assertEquals(result.realCmdArgs, result.cmdArgs, "Failed to get command arguments");
+        assertEquals(result.realCmdArgs, expectedArguments.cmdArgs, "Unexpected command arguments");
     }
-    if (!useArgFile) {
-      for (String cmdArg : arguments.cmdArgs) {
-        if (cmdArg.startsWith("@")) {
-          useArgFile = true;
-          break;
+
+    private static void skipArgFileTestOnJava8(RunArguments arguments) {
+        boolean useArgFile = false;
+        for (String jvmOption : arguments.jvmOptions) {
+            if (jvmOption.startsWith("@")) {
+                useArgFile = true;
+                break;
+            }
+        }
+        if (!useArgFile) {
+            for (String cmdArg : arguments.cmdArgs) {
+                if (cmdArg.startsWith("@")) {
+                    useArgFile = true;
+                    break;
+                }
+            }
+        }
+        if (useArgFile) {
+            assumeTrue(JavaVirtualMachine.isJavaVersionAtLeast(9));
         }
-      }
-    }
-    if (useArgFile) {
-      assumeTrue(JavaVirtualMachine.isJavaVersionAtLeast(9));
     }
-  }
 
-  private static String argFile(String name) {
-    return "@src/test/resources/argfiles/" + name + ".txt";
-  }
+    private static String argFile(String name) {
+        return "@src/test/resources/argfiles/" + name + ".txt";
+    }
 
-  private static List<String> expectedArsFromArgFile(String name) {
-    List<String> arguments = new ArrayList<>();
-    try (InputStream stream =
-            requireNonNull(
-                CommandLineTest.class.getResourceAsStream("/argfiles/" + name + "-expected.txt"));
-        BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) {
-      String line;
-      while ((line = reader.readLine()) != null) {
-        arguments.add(line);
-      }
-    } catch (IOException e) {
-      Assertions.fail("Failed to read expected args from " + name + "argfile", e);
+    private static List<String> expectedArsFromArgFile(String name) {
+        List<String> arguments = new ArrayList<>();
+        try (InputStream stream = requireNonNull(
+                        CommandLineTest.class.getResourceAsStream("/argfiles/" + name + "-expected.txt"));
+                BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                arguments.add(line);
+            }
+        } catch (IOException e) {
+            Assertions.fail("Failed to read expected args from " + name + "argfile", e);
+        }
+        return arguments;
     }
-    return arguments;
-  }
 
-  private static List<String> flatten(Object... values) {
-    List<String> result = new ArrayList<>();
-    for (Object value : values) {
-      if (value instanceof Collection) {
-        result.addAll((Collection<? extends String>) value);
-      } else {
-        result.add(value.toString());
-      }
+    private static List<String> flatten(Object... values) {
+        List<String> result = new ArrayList<>();
+        for (Object value : values) {
+            if (value instanceof Collection) {
+                result.addAll((Collection<? extends String>) value);
+            } else {
+                result.add(value.toString());
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/components/environment/src/test/java/datadog/environment/EnvironmentVariablesTest.java b/components/environment/src/test/java/datadog/environment/EnvironmentVariablesTest.java
index 98b0a0adf99..f655d20651e 100644
--- a/components/environment/src/test/java/datadog/environment/EnvironmentVariablesTest.java
+++ b/components/environment/src/test/java/datadog/environment/EnvironmentVariablesTest.java
@@ -11,41 +11,41 @@
 import org.junit.jupiter.api.Test;
 
 class EnvironmentVariablesTest {
-  private static final String EXISTING_ENV_VAR = "PATH";
-  private static final String MISSING_ENV_VAR = "UNDEFINED_ENV_VAR";
-  private static final String DEFAULT_VALUE = "DEFAULT";
+    private static final String EXISTING_ENV_VAR = "PATH";
+    private static final String MISSING_ENV_VAR = "UNDEFINED_ENV_VAR";
+    private static final String DEFAULT_VALUE = "DEFAULT";
 
-  @Test
-  void testGet() {
-    // Existing environment variable
-    assertNotNull(EnvironmentVariables.get(EXISTING_ENV_VAR));
-    // Missing environment variable
-    assertNull(EnvironmentVariables.get(MISSING_ENV_VAR));
-    // Null values
-    assertDoesNotThrow(() -> EnvironmentVariables.get(null));
-    assertNull(EnvironmentVariables.get(null));
-  }
+    @Test
+    void testGet() {
+        // Existing environment variable
+        assertNotNull(EnvironmentVariables.get(EXISTING_ENV_VAR));
+        // Missing environment variable
+        assertNull(EnvironmentVariables.get(MISSING_ENV_VAR));
+        // Null values
+        assertDoesNotThrow(() -> EnvironmentVariables.get(null));
+        assertNull(EnvironmentVariables.get(null));
+    }
 
-  @Test
-  void testGetOrDefault() {
-    // Existing environment variable
-    assertNotNull(EnvironmentVariables.getOrDefault(EXISTING_ENV_VAR, null));
-    // Missing environment variable
-    assertEquals(DEFAULT_VALUE, EnvironmentVariables.getOrDefault(MISSING_ENV_VAR, DEFAULT_VALUE));
-    assertNull(EnvironmentVariables.getOrDefault(MISSING_ENV_VAR, null));
-    // Null values
-    assertDoesNotThrow(() -> EnvironmentVariables.getOrDefault(null, DEFAULT_VALUE));
-    assertEquals(DEFAULT_VALUE, EnvironmentVariables.getOrDefault(null, DEFAULT_VALUE));
-    assertDoesNotThrow(() -> EnvironmentVariables.getOrDefault(MISSING_ENV_VAR, null));
-    assertNull(EnvironmentVariables.getOrDefault(MISSING_ENV_VAR, null));
-  }
+    @Test
+    void testGetOrDefault() {
+        // Existing environment variable
+        assertNotNull(EnvironmentVariables.getOrDefault(EXISTING_ENV_VAR, null));
+        // Missing environment variable
+        assertEquals(DEFAULT_VALUE, EnvironmentVariables.getOrDefault(MISSING_ENV_VAR, DEFAULT_VALUE));
+        assertNull(EnvironmentVariables.getOrDefault(MISSING_ENV_VAR, null));
+        // Null values
+        assertDoesNotThrow(() -> EnvironmentVariables.getOrDefault(null, DEFAULT_VALUE));
+        assertEquals(DEFAULT_VALUE, EnvironmentVariables.getOrDefault(null, DEFAULT_VALUE));
+        assertDoesNotThrow(() -> EnvironmentVariables.getOrDefault(MISSING_ENV_VAR, null));
+        assertNull(EnvironmentVariables.getOrDefault(MISSING_ENV_VAR, null));
+    }
 
-  @Test
-  void testGetAll() {
-    Map<String, String> all = EnvironmentVariables.getAll();
-    assertNotNull(all);
-    assertFalse(all.isEmpty());
-    // Unmodifiable collection
-    assertThrows(UnsupportedOperationException.class, all::clear);
-  }
+    @Test
+    void testGetAll() {
+        Map<String, String> all = EnvironmentVariables.getAll();
+        assertNotNull(all);
+        assertFalse(all.isEmpty());
+        // Unmodifiable collection
+        assertThrows(UnsupportedOperationException.class, all::clear);
+    }
 }
diff --git a/components/environment/src/test/java/datadog/environment/JavaVersionTest.java b/components/environment/src/test/java/datadog/environment/JavaVersionTest.java
index 9fcb3fc3a13..5405efdf4fb 100644
--- a/components/environment/src/test/java/datadog/environment/JavaVersionTest.java
+++ b/components/environment/src/test/java/datadog/environment/JavaVersionTest.java
@@ -12,92 +12,92 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 class JavaVersionTest {
-  static Stream<Arguments> argumentsParsing() {
-    return Stream.of(
-        of("", 0, 0, 0),
-        of("a.0.0", 0, 0, 0),
-        of("0.a.0", 0, 0, 0),
-        of("0.0.a", 0, 0, 0),
-        of("1.a.0_0", 0, 0, 0),
-        of("1.8.a_0", 0, 0, 0),
-        of("1.8.0_a", 0, 0, 0),
-        of("1.7", 7, 0, 0),
-        of("1.7.0", 7, 0, 0),
-        of("1.7.0_221", 7, 0, 221),
-        of("1.8", 8, 0, 0),
-        of("1.8.0", 8, 0, 0),
-        of("1.8.0_212", 8, 0, 212),
-        of("1.8.0_292", 8, 0, 292),
-        of("9-ea", 9, 0, 0),
-        of("9.0.4", 9, 0, 4),
-        of("9.1.2", 9, 1, 2),
-        of("10.0.2", 10, 0, 2),
-        of("11", 11, 0, 0),
-        of("11.0.6", 11, 0, 6),
-        of("11.0.11", 11, 0, 11),
-        of("12.0.2", 12, 0, 2),
-        of("13.0.2", 13, 0, 2),
-        of("14", 14, 0, 0),
-        of("14.0.2", 14, 0, 2),
-        of("15", 15, 0, 0),
-        of("15.0.2", 15, 0, 2),
-        of("16.0.1", 16, 0, 1),
-        of("11.0.9.1+1", 11, 0, 9),
-        of("11.0.6+10", 11, 0, 6),
-        of("17.0.4-x", 17, 0, 4));
-  }
+    static Stream<Arguments> argumentsParsing() {
+        return Stream.of(
+                of("", 0, 0, 0),
+                of("a.0.0", 0, 0, 0),
+                of("0.a.0", 0, 0, 0),
+                of("0.0.a", 0, 0, 0),
+                of("1.a.0_0", 0, 0, 0),
+                of("1.8.a_0", 0, 0, 0),
+                of("1.8.0_a", 0, 0, 0),
+                of("1.7", 7, 0, 0),
+                of("1.7.0", 7, 0, 0),
+                of("1.7.0_221", 7, 0, 221),
+                of("1.8", 8, 0, 0),
+                of("1.8.0", 8, 0, 0),
+                of("1.8.0_212", 8, 0, 212),
+                of("1.8.0_292", 8, 0, 292),
+                of("9-ea", 9, 0, 0),
+                of("9.0.4", 9, 0, 4),
+                of("9.1.2", 9, 1, 2),
+                of("10.0.2", 10, 0, 2),
+                of("11", 11, 0, 0),
+                of("11.0.6", 11, 0, 6),
+                of("11.0.11", 11, 0, 11),
+                of("12.0.2", 12, 0, 2),
+                of("13.0.2", 13, 0, 2),
+                of("14", 14, 0, 0),
+                of("14.0.2", 14, 0, 2),
+                of("15", 15, 0, 0),
+                of("15.0.2", 15, 0, 2),
+                of("16.0.1", 16, 0, 1),
+                of("11.0.9.1+1", 11, 0, 9),
+                of("11.0.6+10", 11, 0, 6),
+                of("17.0.4-x", 17, 0, 4));
+    }
 
-  @ParameterizedTest(name = "[{index}] {0} parsed as {1}.{2}.{3}")
-  @MethodSource("argumentsParsing")
-  void testParsing(String version, int major, int minor, int update) {
-    JavaVersion javaVersion = JavaVersion.parseJavaVersion(version);
+    @ParameterizedTest(name = "[{index}] {0} parsed as {1}.{2}.{3}")
+    @MethodSource("argumentsParsing")
+    void testParsing(String version, int major, int minor, int update) {
+        JavaVersion javaVersion = JavaVersion.parseJavaVersion(version);
 
-    assertEquals(major, javaVersion.major);
-    assertEquals(minor, javaVersion.minor);
-    assertEquals(update, javaVersion.update);
+        assertEquals(major, javaVersion.major);
+        assertEquals(minor, javaVersion.minor);
+        assertEquals(update, javaVersion.update);
 
-    assertFalse(javaVersion.is(major - 1));
-    assertTrue(javaVersion.is(major));
-    assertFalse(javaVersion.is(major + 1));
+        assertFalse(javaVersion.is(major - 1));
+        assertTrue(javaVersion.is(major));
+        assertFalse(javaVersion.is(major + 1));
 
-    assertFalse(javaVersion.is(major, minor - 1));
-    assertTrue(javaVersion.is(major, minor));
-    assertFalse(javaVersion.is(major, minor + 1));
+        assertFalse(javaVersion.is(major, minor - 1));
+        assertTrue(javaVersion.is(major, minor));
+        assertFalse(javaVersion.is(major, minor + 1));
 
-    assertFalse(javaVersion.is(major, minor, update - 1));
-    assertTrue(javaVersion.is(major, minor, update));
-    assertFalse(javaVersion.is(major, minor, update + 1));
+        assertFalse(javaVersion.is(major, minor, update - 1));
+        assertTrue(javaVersion.is(major, minor, update));
+        assertFalse(javaVersion.is(major, minor, update + 1));
 
-    assertTrue(javaVersion.isAtLeast(major, minor, update));
+        assertTrue(javaVersion.isAtLeast(major, minor, update));
 
-    assertFalse(javaVersion.isBetween(major, minor, update, major, minor, update));
+        assertFalse(javaVersion.isBetween(major, minor, update, major, minor, update));
 
-    assertTrue(javaVersion.isBetween(major, minor, update, MAX_VALUE, MAX_VALUE, MAX_VALUE));
-    assertTrue(javaVersion.isBetween(major, minor, update, major + 1, 0, 0));
-    assertTrue(javaVersion.isBetween(major, minor, update, major, minor + 1, 0));
-    assertTrue(javaVersion.isBetween(major, minor, update, major, minor, update + 1));
+        assertTrue(javaVersion.isBetween(major, minor, update, MAX_VALUE, MAX_VALUE, MAX_VALUE));
+        assertTrue(javaVersion.isBetween(major, minor, update, major + 1, 0, 0));
+        assertTrue(javaVersion.isBetween(major, minor, update, major, minor + 1, 0));
+        assertTrue(javaVersion.isBetween(major, minor, update, major, minor, update + 1));
 
-    assertFalse(javaVersion.isBetween(major, minor, update, major - 1, 0, 0));
-    assertFalse(javaVersion.isBetween(major, minor, update, major, minor - 1, 0));
-    assertFalse(javaVersion.isBetween(major, minor, update, major, minor, update - 1));
-  }
+        assertFalse(javaVersion.isBetween(major, minor, update, major - 1, 0, 0));
+        assertFalse(javaVersion.isBetween(major, minor, update, major, minor - 1, 0));
+        assertFalse(javaVersion.isBetween(major, minor, update, major, minor, update - 1));
+    }
 
-  static Stream<Arguments> argumentsAtLeast() {
-    return Stream.of(
-        of("17.0.5+8", 17, 0, 5),
-        of("17.0.5", 17, 0, 5),
-        of("17.0.6+8", 17, 0, 5),
-        of("11.0.17+8", 11, 0, 17),
-        of("11.0.18+8", 11, 0, 17),
-        of("11.0.17", 11, 0, 17),
-        of("1.8.0_352", 8, 0, 352),
-        of("1.8.0_362", 8, 0, 352));
-  }
+    static Stream<Arguments> argumentsAtLeast() {
+        return Stream.of(
+                of("17.0.5+8", 17, 0, 5),
+                of("17.0.5", 17, 0, 5),
+                of("17.0.6+8", 17, 0, 5),
+                of("11.0.17+8", 11, 0, 17),
+                of("11.0.18+8", 11, 0, 17),
+                of("11.0.17", 11, 0, 17),
+                of("1.8.0_352", 8, 0, 352),
+                of("1.8.0_362", 8, 0, 352));
+    }
 
-  @ParameterizedTest(name = "[{index}] {0} is at least {1}.{2}.{3}")
-  @MethodSource("argumentsAtLeast")
-  void testIsAtLeast(String version, int major, int minor, int update) {
-    JavaVersion javaVersion = JavaVersion.parseJavaVersion(version);
-    assertTrue(javaVersion.isAtLeast(major, minor, update));
-  }
+    @ParameterizedTest(name = "[{index}] {0} is at least {1}.{2}.{3}")
+    @MethodSource("argumentsAtLeast")
+    void testIsAtLeast(String version, int major, int minor, int update) {
+        JavaVersion javaVersion = JavaVersion.parseJavaVersion(version);
+        assertTrue(javaVersion.isAtLeast(major, minor, update));
+    }
 }
diff --git a/components/environment/src/test/java/datadog/environment/JavaVirtualMachineTest.java b/components/environment/src/test/java/datadog/environment/JavaVirtualMachineTest.java
index 99edf00159d..196216d8d5a 100644
--- a/components/environment/src/test/java/datadog/environment/JavaVirtualMachineTest.java
+++ b/components/environment/src/test/java/datadog/environment/JavaVirtualMachineTest.java
@@ -18,164 +18,163 @@
 import org.junit.jupiter.params.provider.CsvSource;
 
 class JavaVirtualMachineTest {
-  @Test
-  @EnabledOnJre(JAVA_8)
-  void onJava8Only() {
-    assertTrue(JavaVirtualMachine.isJavaVersion(8));
-    assertFalse(JavaVirtualMachine.isJavaVersion(11));
-  }
-
-  @Test
-  @EnabledOnJre(JAVA_11)
-  void onJava11Only() {
-    assertFalse(JavaVirtualMachine.isJavaVersion(8));
-    assertTrue(JavaVirtualMachine.isJavaVersion(11));
-    assertFalse(JavaVirtualMachine.isJavaVersion(17));
-  }
-
-  @Test
-  @EnabledOnJre(JAVA_17)
-  void onJava17Only() {
-    assertFalse(JavaVirtualMachine.isJavaVersion(11));
-    assertTrue(JavaVirtualMachine.isJavaVersion(17));
-    assertFalse(JavaVirtualMachine.isJavaVersion(21));
-  }
-
-  @Test
-  @EnabledOnJre(JAVA_21)
-  void onJava21Only() {
-    assertFalse(JavaVirtualMachine.isJavaVersion(17));
-    assertTrue(JavaVirtualMachine.isJavaVersion(21));
-    assertFalse(JavaVirtualMachine.isJavaVersion(25));
-  }
-
-  @Test
-  void onJava7andHigher() {
-    assertTrue(JavaVirtualMachine.isJavaVersionAtLeast(7));
-  }
-
-  @Test
-  void onJava8AndHigher() {
-    for (int version = 7; version <= 8; version++) {
-      assertTrue(JavaVirtualMachine.isJavaVersionAtLeast(version));
-    }
-  }
-
-  @Test
-  @EnabledForJreRange(min = JAVA_11)
-  void onJava11AndHigher() {
-    for (int version = 7; version <= 11; version++) {
-      assertTrue(JavaVirtualMachine.isJavaVersionAtLeast(version));
-    }
-  }
-
-  @Test
-  @EnabledForJreRange(min = JAVA_17)
-  void onJava17AndHigher() {
-    for (int version = 7; version <= 17; version++) {
-      assertTrue(JavaVirtualMachine.isJavaVersionAtLeast(version));
-    }
-  }
-
-  @Test
-  @EnabledForJreRange(min = JAVA_21)
-  void onJava21AndHigher() {
-    for (int version = 7; version <= 21; version++) {
-      assertTrue(JavaVirtualMachine.isJavaVersionAtLeast(version));
-    }
-  }
-
-  @Test
-  @EnabledForJreRange(min = JAVA_8, max = JAVA_9)
-  void fromJava8to9() {
-    assertFalse(JavaVirtualMachine.isJavaVersionBetween(7, 8));
-    assertTrue(JavaVirtualMachine.isJavaVersionBetween(8, 10));
-    assertFalse(JavaVirtualMachine.isJavaVersionBetween(10, 11));
-  }
-
-  @Test
-  @EnabledForJreRange(min = JAVA_11, max = JAVA_11)
-  void fromJava11to17() {
-    assertFalse(JavaVirtualMachine.isJavaVersionBetween(8, 11));
-    assertTrue(JavaVirtualMachine.isJavaVersionBetween(11, 18));
-    assertFalse(JavaVirtualMachine.isJavaVersionBetween(18, 21));
-  }
-
-  @Test
-  @EnabledIfSystemProperty(named = "java.vendor.version", matches = ".*graalvm.*")
-  void onlyOnGraalVm() {
-    assertTrue(JavaVirtualMachine.isGraalVM());
-    assertFalse(JavaVirtualMachine.isIbm8());
-    assertFalse(JavaVirtualMachine.isJ9());
-    assertFalse(JavaVirtualMachine.isOracleJDK8());
-  }
-
-  @Test
-  @EnabledIfSystemProperty(named = "java.vm.vendor", matches = ".*IBM.*")
-  @EnabledOnJre(JAVA_8)
-  void onlyOnIbm8() {
-    assertFalse(JavaVirtualMachine.isGraalVM());
-    assertTrue(JavaVirtualMachine.isIbm());
-    assertTrue(JavaVirtualMachine.isIbm8());
-    assertTrue(JavaVirtualMachine.isJ9());
-    assertFalse(JavaVirtualMachine.isOracleJDK8());
-  }
-
-  @Test
-  @EnabledIfSystemProperty(named = "java.vm.name", matches = ".*J9.*")
-  void onlyOnJ9() {
-    assertFalse(JavaVirtualMachine.isGraalVM());
-    assertTrue(JavaVirtualMachine.isJ9());
-    assertFalse(JavaVirtualMachine.isOracleJDK8());
-  }
-
-  @Test
-  @EnabledIfSystemProperty(named = "java.vm.vendor", matches = ".*Oracle.*")
-  @DisabledIfSystemProperty(named = "java.runtime.name", matches = ".*OpenJDK.*")
-  @EnabledOnJre(JAVA_8)
-  void onlyOnOracleJDK8() {
-    assertFalse(JavaVirtualMachine.isGraalVM());
-    assertFalse(JavaVirtualMachine.isIbm8());
-    assertFalse(JavaVirtualMachine.isJ9());
-    assertTrue(JavaVirtualMachine.isOracleJDK8());
-  }
-
-  @Test
-  @EnabledIfSystemProperty(named = "java.vm.vendor", matches = ".*Azul.*")
-  @EnabledOnJre(JAVA_8)
-  void onlyOnZulu8() {
-    assertFalse(JavaVirtualMachine.isGraalVM());
-    assertFalse(JavaVirtualMachine.isIbm8());
-    assertFalse(JavaVirtualMachine.isOracleJDK8());
-    assertTrue(JavaVirtualMachine.isZulu8());
-  }
-
-  @ParameterizedTest
-  @CsvSource(
-      value = {
-        "1.8.0_265 | 1.8.0_265-b01 | OpenJDK        | AdoptOpenJDK | 1.8.0_265 | b01 | OpenJDK        | AdoptOpenJDK",
-        "1.8.0_265 | 1.8-b01       | OpenJDK        | AdoptOpenJDK | 1.8.0_265 | ''  | OpenJDK        | AdoptOpenJDK",
-        "19        | 19            | OpenJDK 64-Bit | Homebrew     | 19        | ''  | OpenJDK 64-Bit | Homebrew",
-        "17        | null          | null           | null         | 17        | ''  | ''             | ''",
-        "null      | 17            | null           | null         | ''        | ''  | ''             | ''",
-      },
-      nullValues = "null",
-      delimiter = '|')
-  void testRuntimeParsing(
-      String javaVersion,
-      String javaRuntimeVersion,
-      String javaRuntimeName,
-      String javaVmVendor,
-      String expectedVersion,
-      String expectedPatches,
-      String expectedName,
-      String expectedVendor) {
-    JavaVirtualMachine.Runtime runtime =
-        new JavaVirtualMachine.Runtime(
-            javaVersion, javaRuntimeVersion, javaRuntimeName, javaVmVendor, null);
-    assertEquals(expectedVersion, runtime.version);
-    assertEquals(expectedPatches, runtime.patches);
-    assertEquals(expectedName, runtime.name);
-    assertEquals(expectedVendor, runtime.vendor);
-  }
+    @Test
+    @EnabledOnJre(JAVA_8)
+    void onJava8Only() {
+        assertTrue(JavaVirtualMachine.isJavaVersion(8));
+        assertFalse(JavaVirtualMachine.isJavaVersion(11));
+    }
+
+    @Test
+    @EnabledOnJre(JAVA_11)
+    void onJava11Only() {
+        assertFalse(JavaVirtualMachine.isJavaVersion(8));
+        assertTrue(JavaVirtualMachine.isJavaVersion(11));
+        assertFalse(JavaVirtualMachine.isJavaVersion(17));
+    }
+
+    @Test
+    @EnabledOnJre(JAVA_17)
+    void onJava17Only() {
+        assertFalse(JavaVirtualMachine.isJavaVersion(11));
+        assertTrue(JavaVirtualMachine.isJavaVersion(17));
+        assertFalse(JavaVirtualMachine.isJavaVersion(21));
+    }
+
+    @Test
+    @EnabledOnJre(JAVA_21)
+    void onJava21Only() {
+        assertFalse(JavaVirtualMachine.isJavaVersion(17));
+        assertTrue(JavaVirtualMachine.isJavaVersion(21));
+        assertFalse(JavaVirtualMachine.isJavaVersion(25));
+    }
+
+    @Test
+    void onJava7andHigher() {
+        assertTrue(JavaVirtualMachine.isJavaVersionAtLeast(7));
+    }
+
+    @Test
+    void onJava8AndHigher() {
+        for (int version = 7; version <= 8; version++) {
+            assertTrue(JavaVirtualMachine.isJavaVersionAtLeast(version));
+        }
+    }
+
+    @Test
+    @EnabledForJreRange(min = JAVA_11)
+    void onJava11AndHigher() {
+        for (int version = 7; version <= 11; version++) {
+            assertTrue(JavaVirtualMachine.isJavaVersionAtLeast(version));
+        }
+    }
+
+    @Test
+    @EnabledForJreRange(min = JAVA_17)
+    void onJava17AndHigher() {
+        for (int version = 7; version <= 17; version++) {
+            assertTrue(JavaVirtualMachine.isJavaVersionAtLeast(version));
+        }
+    }
+
+    @Test
+    @EnabledForJreRange(min = JAVA_21)
+    void onJava21AndHigher() {
+        for (int version = 7; version <= 21; version++) {
+            assertTrue(JavaVirtualMachine.isJavaVersionAtLeast(version));
+        }
+    }
+
+    @Test
+    @EnabledForJreRange(min = JAVA_8, max = JAVA_9)
+    void fromJava8to9() {
+        assertFalse(JavaVirtualMachine.isJavaVersionBetween(7, 8));
+        assertTrue(JavaVirtualMachine.isJavaVersionBetween(8, 10));
+        assertFalse(JavaVirtualMachine.isJavaVersionBetween(10, 11));
+    }
+
+    @Test
+    @EnabledForJreRange(min = JAVA_11, max = JAVA_11)
+    void fromJava11to17() {
+        assertFalse(JavaVirtualMachine.isJavaVersionBetween(8, 11));
+        assertTrue(JavaVirtualMachine.isJavaVersionBetween(11, 18));
+        assertFalse(JavaVirtualMachine.isJavaVersionBetween(18, 21));
+    }
+
+    @Test
+    @EnabledIfSystemProperty(named = "java.vendor.version", matches = ".*graalvm.*")
+    void onlyOnGraalVm() {
+        assertTrue(JavaVirtualMachine.isGraalVM());
+        assertFalse(JavaVirtualMachine.isIbm8());
+        assertFalse(JavaVirtualMachine.isJ9());
+        assertFalse(JavaVirtualMachine.isOracleJDK8());
+    }
+
+    @Test
+    @EnabledIfSystemProperty(named = "java.vm.vendor", matches = ".*IBM.*")
+    @EnabledOnJre(JAVA_8)
+    void onlyOnIbm8() {
+        assertFalse(JavaVirtualMachine.isGraalVM());
+        assertTrue(JavaVirtualMachine.isIbm());
+        assertTrue(JavaVirtualMachine.isIbm8());
+        assertTrue(JavaVirtualMachine.isJ9());
+        assertFalse(JavaVirtualMachine.isOracleJDK8());
+    }
+
+    @Test
+    @EnabledIfSystemProperty(named = "java.vm.name", matches = ".*J9.*")
+    void onlyOnJ9() {
+        assertFalse(JavaVirtualMachine.isGraalVM());
+        assertTrue(JavaVirtualMachine.isJ9());
+        assertFalse(JavaVirtualMachine.isOracleJDK8());
+    }
+
+    @Test
+    @EnabledIfSystemProperty(named = "java.vm.vendor", matches = ".*Oracle.*")
+    @DisabledIfSystemProperty(named = "java.runtime.name", matches = ".*OpenJDK.*")
+    @EnabledOnJre(JAVA_8)
+    void onlyOnOracleJDK8() {
+        assertFalse(JavaVirtualMachine.isGraalVM());
+        assertFalse(JavaVirtualMachine.isIbm8());
+        assertFalse(JavaVirtualMachine.isJ9());
+        assertTrue(JavaVirtualMachine.isOracleJDK8());
+    }
+
+    @Test
+    @EnabledIfSystemProperty(named = "java.vm.vendor", matches = ".*Azul.*")
+    @EnabledOnJre(JAVA_8)
+    void onlyOnZulu8() {
+        assertFalse(JavaVirtualMachine.isGraalVM());
+        assertFalse(JavaVirtualMachine.isIbm8());
+        assertFalse(JavaVirtualMachine.isOracleJDK8());
+        assertTrue(JavaVirtualMachine.isZulu8());
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+            value = {
+                "1.8.0_265 | 1.8.0_265-b01 | OpenJDK        | AdoptOpenJDK | 1.8.0_265 | b01 | OpenJDK        | AdoptOpenJDK",
+                "1.8.0_265 | 1.8-b01       | OpenJDK        | AdoptOpenJDK | 1.8.0_265 | ''  | OpenJDK        | AdoptOpenJDK",
+                "19        | 19            | OpenJDK 64-Bit | Homebrew     | 19        | ''  | OpenJDK 64-Bit | Homebrew",
+                "17        | null          | null           | null         | 17        | ''  | ''             | ''",
+                "null      | 17            | null           | null         | ''        | ''  | ''             | ''",
+            },
+            nullValues = "null",
+            delimiter = '|')
+    void testRuntimeParsing(
+            String javaVersion,
+            String javaRuntimeVersion,
+            String javaRuntimeName,
+            String javaVmVendor,
+            String expectedVersion,
+            String expectedPatches,
+            String expectedName,
+            String expectedVendor) {
+        JavaVirtualMachine.Runtime runtime =
+                new JavaVirtualMachine.Runtime(javaVersion, javaRuntimeVersion, javaRuntimeName, javaVmVendor, null);
+        assertEquals(expectedVersion, runtime.version);
+        assertEquals(expectedPatches, runtime.patches);
+        assertEquals(expectedName, runtime.name);
+        assertEquals(expectedVendor, runtime.vendor);
+    }
 }
diff --git a/components/environment/src/test/java/datadog/environment/JvmOptionsTest.java b/components/environment/src/test/java/datadog/environment/JvmOptionsTest.java
index 3d66c562262..9239d024f58 100644
--- a/components/environment/src/test/java/datadog/environment/JvmOptionsTest.java
+++ b/components/environment/src/test/java/datadog/environment/JvmOptionsTest.java
@@ -30,31 +30,29 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 class JvmOptionsTest {
-  static Stream<Arguments> options() {
-    return Stream.of(
-        arguments("", emptyList()),
-        arguments("-Xmx512m", singletonList("-Xmx512m")),
-        arguments("-Xms256m -Xmx512m", asList("-Xms256m", "-Xmx512m")),
-        arguments("   -Xms256m     -Xmx512m  ", asList("-Xms256m", "-Xmx512m")),
-        arguments("-Xms256m\t-Xmx512m", asList("-Xms256m", "-Xmx512m")),
-        arguments("\t -Xms256m \t -Xmx512m \t", asList("-Xms256m", "-Xmx512m")),
-        arguments(
-            "-Xmx512m -Dprop=\"value with space\"", asList("-Xmx512m", "-Dprop=value with space")),
-        arguments(
-            "-Xmx512m -Dprop='value with space'", asList("-Xmx512m", "-Dprop=value with space")),
-        arguments("-Xmx512m -Dprop='mixing\"quotes'", asList("-Xmx512m", "-Dprop=mixing\"quotes")),
-        arguments("-Xmx512m -Dprop=\"mixing'quotes\"", asList("-Xmx512m", "-Dprop=mixing'quotes")));
-  }
+    static Stream<Arguments> options() {
+        return Stream.of(
+                arguments("", emptyList()),
+                arguments("-Xmx512m", singletonList("-Xmx512m")),
+                arguments("-Xms256m -Xmx512m", asList("-Xms256m", "-Xmx512m")),
+                arguments("   -Xms256m     -Xmx512m  ", asList("-Xms256m", "-Xmx512m")),
+                arguments("-Xms256m\t-Xmx512m", asList("-Xms256m", "-Xmx512m")),
+                arguments("\t -Xms256m \t -Xmx512m \t", asList("-Xms256m", "-Xmx512m")),
+                arguments("-Xmx512m -Dprop=\"value with space\"", asList("-Xmx512m", "-Dprop=value with space")),
+                arguments("-Xmx512m -Dprop='value with space'", asList("-Xmx512m", "-Dprop=value with space")),
+                arguments("-Xmx512m -Dprop='mixing\"quotes'", asList("-Xmx512m", "-Dprop=mixing\"quotes")),
+                arguments("-Xmx512m -Dprop=\"mixing'quotes\"", asList("-Xmx512m", "-Dprop=mixing'quotes")));
+    }
 
-  @ParameterizedTest
-  @MethodSource("options")
-  void testParseOptions(String javaToolOptions, List<String> expectedVmOptions) {
-    List<String> vmOptions = JvmOptions.parseOptions(javaToolOptions);
-    assertEquals(expectedVmOptions, vmOptions);
-  }
+    @ParameterizedTest
+    @MethodSource("options")
+    void testParseOptions(String javaToolOptions, List<String> expectedVmOptions) {
+        List<String> vmOptions = JvmOptions.parseOptions(javaToolOptions);
+        assertEquals(expectedVmOptions, vmOptions);
+    }
 
-  static Stream<Arguments> data() {
-    // spotless:off
+    static Stream<Arguments> data() {
+        // spotless:off
     return Stream.of(
         arguments(
             "CLI options only",
@@ -95,27 +93,27 @@ static Stream<Arguments> data() {
 
     );
     // spotless:on
-  }
+    }
 
-  @ParameterizedTest(name = "[{index}] {0}")
-  @MethodSource("data")
-  void testFindVmOptions(
-      String useCase,
-      Map<String, String> environmentVariables,
-      CommandLineHelper.RunArguments arguments,
-      CommandLineHelper.RunArguments expectedArguments)
-      throws Exception {
-    // Skip unsupported test cases
-    skipJdkJavaOptionsOnJava8(environmentVariables);
-    // Run test process
-    Result result = forkAndRunWithArgs(arguments, environmentVariables);
-    // Check results
-    assertEquals(expectedArguments.jvmOptions, result.jvmOptions, "Failed to get JVM options");
-  }
+    @ParameterizedTest(name = "[{index}] {0}")
+    @MethodSource("data")
+    void testFindVmOptions(
+            String useCase,
+            Map<String, String> environmentVariables,
+            CommandLineHelper.RunArguments arguments,
+            CommandLineHelper.RunArguments expectedArguments)
+            throws Exception {
+        // Skip unsupported test cases
+        skipJdkJavaOptionsOnJava8(environmentVariables);
+        // Run test process
+        Result result = forkAndRunWithArgs(arguments, environmentVariables);
+        // Check results
+        assertEquals(expectedArguments.jvmOptions, result.jvmOptions, "Failed to get JVM options");
+    }
 
-  @MethodSource
-  private static Stream<Arguments> procFsCmdLine() {
-    // spotless:off
+    @MethodSource
+    private static Stream<Arguments> procFsCmdLine() {
+        // spotless:off
     return Stream.of(
         arguments(
             "No arguments",
@@ -163,62 +161,59 @@ private static Stream<Arguments> procFsCmdLine() {
             flatten("-Dargfile.prop=test", "-verbose:class", expectedArsFromArgFile("tab-separated"))
         ));
     // spotless:on
-  }
-
-  @ParameterizedTest(name = "[{index}] {0}")
-  @MethodSource("procFsCmdLine")
-  void testFindVmOptionsFromProcFs(String useCase, String[] procfsCmdline, List<String> expected) {
-    JvmOptions vmOptions = new JvmOptions();
-    List<String> found = vmOptions.findVmOptionsFromProcFs(procfsCmdline);
-    assertEquals(expected, found);
-  }
+    }
 
-  private void skipJdkJavaOptionsOnJava8(Map<String, String> environmentVariables) {
-    assumeTrue(
-        JavaVirtualMachine.isJavaVersionAtLeast(9)
-            || !environmentVariables.containsKey("JDK_JAVA_OPTIONS"));
-  }
+    @ParameterizedTest(name = "[{index}] {0}")
+    @MethodSource("procFsCmdLine")
+    void testFindVmOptionsFromProcFs(String useCase, String[] procfsCmdline, List<String> expected) {
+        JvmOptions vmOptions = new JvmOptions();
+        List<String> found = vmOptions.findVmOptionsFromProcFs(procfsCmdline);
+        assertEquals(expected, found);
+    }
 
-  private static Map<String, String> env(String... keysAndValues) {
-    if (keysAndValues.length % 2 != 0) {
-      throw new IllegalArgumentException("Invalid key-value pair");
+    private void skipJdkJavaOptionsOnJava8(Map<String, String> environmentVariables) {
+        assumeTrue(JavaVirtualMachine.isJavaVersionAtLeast(9) || !environmentVariables.containsKey("JDK_JAVA_OPTIONS"));
     }
-    Map<String, String> env = new HashMap<>();
-    for (int i = 0; i < keysAndValues.length; i += 2) {
-      env.put(keysAndValues[i], keysAndValues[i + 1]);
+
+    private static Map<String, String> env(String... keysAndValues) {
+        if (keysAndValues.length % 2 != 0) {
+            throw new IllegalArgumentException("Invalid key-value pair");
+        }
+        Map<String, String> env = new HashMap<>();
+        for (int i = 0; i < keysAndValues.length; i += 2) {
+            env.put(keysAndValues[i], keysAndValues[i + 1]);
+        }
+        return env;
     }
-    return env;
-  }
 
-  private static String argFile(String name) {
-    return "@src/test/resources/argfiles/" + name + ".txt";
-  }
+    private static String argFile(String name) {
+        return "@src/test/resources/argfiles/" + name + ".txt";
+    }
 
-  private static List<String> expectedArsFromArgFile(String name) {
-    List<String> arguments = new ArrayList<>();
-    try (InputStream stream =
-            requireNonNull(
-                CommandLineTest.class.getResourceAsStream("/argfiles/" + name + "-expected.txt"));
-        BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) {
-      String line;
-      while ((line = reader.readLine()) != null) {
-        arguments.add(line);
-      }
-    } catch (IOException e) {
-      Assertions.fail("Failed to read expected args from " + name + "argfile", e);
+    private static List<String> expectedArsFromArgFile(String name) {
+        List<String> arguments = new ArrayList<>();
+        try (InputStream stream = requireNonNull(
+                        CommandLineTest.class.getResourceAsStream("/argfiles/" + name + "-expected.txt"));
+                BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                arguments.add(line);
+            }
+        } catch (IOException e) {
+            Assertions.fail("Failed to read expected args from " + name + "argfile", e);
+        }
+        return arguments;
     }
-    return arguments;
-  }
 
-  private static List<String> flatten(Object... values) {
-    List<String> result = new ArrayList<>();
-    for (Object value : values) {
-      if (value instanceof Collection) {
-        result.addAll((Collection<? extends String>) value);
-      } else {
-        result.add(value.toString());
-      }
+    private static List<String> flatten(Object... values) {
+        List<String> result = new ArrayList<>();
+        for (Object value : values) {
+            if (value instanceof Collection) {
+                result.addAll((Collection<? extends String>) value);
+            } else {
+                result.add(value.toString());
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/components/environment/src/test/java/datadog/environment/OperatingSystemTest.java b/components/environment/src/test/java/datadog/environment/OperatingSystemTest.java
index ff5bbe9b871..cfb4b4623d5 100644
--- a/components/environment/src/test/java/datadog/environment/OperatingSystemTest.java
+++ b/components/environment/src/test/java/datadog/environment/OperatingSystemTest.java
@@ -16,54 +16,54 @@
 import org.junit.jupiter.api.condition.EnabledOnOs;
 
 class OperatingSystemTest {
-  @Test
-  @EnabledOnOs(LINUX)
-  void onLinuxOnly() {
-    assertTrue(OperatingSystem.isLinux());
-    assertFalse(OperatingSystem.isMacOs());
-    assertFalse(OperatingSystem.isWindows());
-    assertEquals(Type.LINUX, OperatingSystem.type());
-  }
+    @Test
+    @EnabledOnOs(LINUX)
+    void onLinuxOnly() {
+        assertTrue(OperatingSystem.isLinux());
+        assertFalse(OperatingSystem.isMacOs());
+        assertFalse(OperatingSystem.isWindows());
+        assertEquals(Type.LINUX, OperatingSystem.type());
+    }
 
-  @Test
-  @EnabledOnOs(MAC)
-  void onMacOsOnly() {
-    assertFalse(OperatingSystem.isLinux());
-    assertTrue(OperatingSystem.isMacOs());
-    assertFalse(OperatingSystem.isWindows());
-    assertEquals(Type.MACOS, OperatingSystem.type());
-  }
+    @Test
+    @EnabledOnOs(MAC)
+    void onMacOsOnly() {
+        assertFalse(OperatingSystem.isLinux());
+        assertTrue(OperatingSystem.isMacOs());
+        assertFalse(OperatingSystem.isWindows());
+        assertEquals(Type.MACOS, OperatingSystem.type());
+    }
 
-  @Test
-  @EnabledOnOs(WINDOWS)
-  void onWindowsOnly() {
-    assertFalse(OperatingSystem.isLinux());
-    assertFalse(OperatingSystem.isMacOs());
-    assertTrue(OperatingSystem.isWindows());
-    assertEquals(Type.WINDOWS, OperatingSystem.type());
-  }
+    @Test
+    @EnabledOnOs(WINDOWS)
+    void onWindowsOnly() {
+        assertFalse(OperatingSystem.isLinux());
+        assertFalse(OperatingSystem.isMacOs());
+        assertTrue(OperatingSystem.isWindows());
+        assertEquals(Type.WINDOWS, OperatingSystem.type());
+    }
 
-  @Test
-  @EnabledOnOs(architectures = {"x86_64", "amd64", "k8"})
-  void onX64() {
-    assertEquals(X64, OperatingSystem.architecture());
-  }
+    @Test
+    @EnabledOnOs(architectures = {"x86_64", "amd64", "k8"})
+    void onX64() {
+        assertEquals(X64, OperatingSystem.architecture());
+    }
 
-  @Test
-  @EnabledOnOs(architectures = {"x86", "i386", "i486", "i586", "i686"})
-  void onX86() {
-    assertEquals(X86, OperatingSystem.architecture());
-  }
+    @Test
+    @EnabledOnOs(architectures = {"x86", "i386", "i486", "i586", "i686"})
+    void onX86() {
+        assertEquals(X86, OperatingSystem.architecture());
+    }
 
-  @Test
-  @EnabledOnOs(architectures = {"arm", "aarch32"})
-  void onArm() {
-    assertEquals(ARM, OperatingSystem.architecture());
-  }
+    @Test
+    @EnabledOnOs(architectures = {"arm", "aarch32"})
+    void onArm() {
+        assertEquals(ARM, OperatingSystem.architecture());
+    }
 
-  @Test
-  @EnabledOnOs(architectures = {"arm64", "aarch64"})
-  void onArm64() {
-    assertEquals(ARM64, OperatingSystem.architecture());
-  }
+    @Test
+    @EnabledOnOs(architectures = {"arm64", "aarch64"})
+    void onArm64() {
+        assertEquals(ARM64, OperatingSystem.architecture());
+    }
 }
diff --git a/components/environment/src/test/java/datadog/environment/SystemPropertiesTest.java b/components/environment/src/test/java/datadog/environment/SystemPropertiesTest.java
index 390f69239ae..4139adfbf37 100644
--- a/components/environment/src/test/java/datadog/environment/SystemPropertiesTest.java
+++ b/components/environment/src/test/java/datadog/environment/SystemPropertiesTest.java
@@ -13,72 +13,69 @@
 import org.junit.jupiter.api.Test;
 
 class SystemPropertiesTest {
-  private static final String EXISTING_SYSTEM_PROPERTY = "java.home";
-  private static final String MISSING_SYSTEM_PROPERTY = "undefined.system.property";
-  private static final String DEFAULT_VALUE = "DEFAULT";
+    private static final String EXISTING_SYSTEM_PROPERTY = "java.home";
+    private static final String MISSING_SYSTEM_PROPERTY = "undefined.system.property";
+    private static final String DEFAULT_VALUE = "DEFAULT";
 
-  @Test
-  void testGet() {
-    // Existing system properties
-    assertNotNull(SystemProperties.get(EXISTING_SYSTEM_PROPERTY));
-    // Missing system properties
-    assertNull(SystemProperties.get(MISSING_SYSTEM_PROPERTY));
-    // Null values
-    assertDoesNotThrow(() -> SystemProperties.get(null));
-    assertNull(SystemProperties.get(null));
-  }
+    @Test
+    void testGet() {
+        // Existing system properties
+        assertNotNull(SystemProperties.get(EXISTING_SYSTEM_PROPERTY));
+        // Missing system properties
+        assertNull(SystemProperties.get(MISSING_SYSTEM_PROPERTY));
+        // Null values
+        assertDoesNotThrow(() -> SystemProperties.get(null));
+        assertNull(SystemProperties.get(null));
+    }
 
-  @Test
-  void testGetOrDefault() {
-    // Existing system properties
-    assertNotNull(SystemProperties.getOrDefault(EXISTING_SYSTEM_PROPERTY, null));
-    // Missing system properties
-    assertEquals(
-        DEFAULT_VALUE, SystemProperties.getOrDefault(MISSING_SYSTEM_PROPERTY, DEFAULT_VALUE));
-    assertNull(SystemProperties.getOrDefault(MISSING_SYSTEM_PROPERTY, null));
-    // Null values
-    assertDoesNotThrow(() -> SystemProperties.getOrDefault(null, DEFAULT_VALUE));
-    assertEquals(DEFAULT_VALUE, SystemProperties.getOrDefault(null, DEFAULT_VALUE));
-    assertDoesNotThrow(() -> SystemProperties.getOrDefault(MISSING_SYSTEM_PROPERTY, null));
-    assertNull(SystemProperties.getOrDefault(MISSING_SYSTEM_PROPERTY, null));
-  }
+    @Test
+    void testGetOrDefault() {
+        // Existing system properties
+        assertNotNull(SystemProperties.getOrDefault(EXISTING_SYSTEM_PROPERTY, null));
+        // Missing system properties
+        assertEquals(DEFAULT_VALUE, SystemProperties.getOrDefault(MISSING_SYSTEM_PROPERTY, DEFAULT_VALUE));
+        assertNull(SystemProperties.getOrDefault(MISSING_SYSTEM_PROPERTY, null));
+        // Null values
+        assertDoesNotThrow(() -> SystemProperties.getOrDefault(null, DEFAULT_VALUE));
+        assertEquals(DEFAULT_VALUE, SystemProperties.getOrDefault(null, DEFAULT_VALUE));
+        assertDoesNotThrow(() -> SystemProperties.getOrDefault(MISSING_SYSTEM_PROPERTY, null));
+        assertNull(SystemProperties.getOrDefault(MISSING_SYSTEM_PROPERTY, null));
+    }
 
-  @Test
-  void testSet() {
-    String testProperty = "test.set.property";
-    String testValue = "test.set.value";
-    assertNull(SystemProperties.get(testProperty));
-    assertTrue(SystemProperties.set(testProperty, testValue));
-    assertEquals(testValue, SystemProperties.get(testProperty));
-    // Null values
-    assertDoesNotThrow(() -> SystemProperties.set(testProperty, null));
-    assertFalse(SystemProperties.set(testProperty, null));
-    assertDoesNotThrow(() -> SystemProperties.set(null, testValue));
-    assertFalse(SystemProperties.set(null, testValue));
-  }
+    @Test
+    void testSet() {
+        String testProperty = "test.set.property";
+        String testValue = "test.set.value";
+        assertNull(SystemProperties.get(testProperty));
+        assertTrue(SystemProperties.set(testProperty, testValue));
+        assertEquals(testValue, SystemProperties.get(testProperty));
+        // Null values
+        assertDoesNotThrow(() -> SystemProperties.set(testProperty, null));
+        assertFalse(SystemProperties.set(testProperty, null));
+        assertDoesNotThrow(() -> SystemProperties.set(null, testValue));
+        assertFalse(SystemProperties.set(null, testValue));
+    }
 
-  @Test
-  void testClear() {
-    String testProperty = "test.clear.property";
-    String testValue = "test.clear.value";
-    assertNull(SystemProperties.get(testProperty));
-    assertNull(SystemProperties.clear(testProperty));
-    assumeTrue(SystemProperties.set(testProperty, testValue));
-    assertEquals(testValue, SystemProperties.clear(testProperty));
-    assertNull(SystemProperties.clear(testProperty));
-    // Null values
-    assertDoesNotThrow(() -> SystemProperties.clear(null));
-    assertNull(SystemProperties.clear(null));
-  }
+    @Test
+    void testClear() {
+        String testProperty = "test.clear.property";
+        String testValue = "test.clear.value";
+        assertNull(SystemProperties.get(testProperty));
+        assertNull(SystemProperties.clear(testProperty));
+        assumeTrue(SystemProperties.set(testProperty, testValue));
+        assertEquals(testValue, SystemProperties.clear(testProperty));
+        assertNull(SystemProperties.clear(testProperty));
+        // Null values
+        assertDoesNotThrow(() -> SystemProperties.clear(null));
+        assertNull(SystemProperties.clear(null));
+    }
 
-  @Test
-  void testAsStringMap() {
-    Map<String, String> stringMap = SystemProperties.asStringMap();
-    assertNotNull(stringMap);
-    assertFalse(stringMap.isEmpty());
-    // Unmodifiable collection
-    assertThrows(
-        UnsupportedOperationException.class,
-        () -> stringMap.put(MISSING_SYSTEM_PROPERTY, DEFAULT_VALUE));
-  }
+    @Test
+    void testAsStringMap() {
+        Map<String, String> stringMap = SystemProperties.asStringMap();
+        assertNotNull(stringMap);
+        assertFalse(stringMap.isEmpty());
+        // Unmodifiable collection
+        assertThrows(UnsupportedOperationException.class, () -> stringMap.put(MISSING_SYSTEM_PROPERTY, DEFAULT_VALUE));
+    }
 }
diff --git a/components/environment/src/test/java/datadog/environment/ThreadSupportTest.java b/components/environment/src/test/java/datadog/environment/ThreadSupportTest.java
index be2032c5470..46ec570624b 100644
--- a/components/environment/src/test/java/datadog/environment/ThreadSupportTest.java
+++ b/components/environment/src/test/java/datadog/environment/ThreadSupportTest.java
@@ -14,69 +14,68 @@
 import org.junit.jupiter.api.condition.EnabledOnJre;
 
 class ThreadSupportTest {
-  private static ExecutorService singleThreadExecutor;
-  private static ExecutorService newVirtualThreadPerTaskExecutor;
+    private static ExecutorService singleThreadExecutor;
+    private static ExecutorService newVirtualThreadPerTaskExecutor;
 
-  @BeforeAll
-  static void beforeAll() {
-    singleThreadExecutor = Executors.newSingleThreadExecutor();
-    newVirtualThreadPerTaskExecutor = ThreadSupport.newVirtualThreadPerTaskExecutor().orElse(null);
-  }
+    @BeforeAll
+    static void beforeAll() {
+        singleThreadExecutor = Executors.newSingleThreadExecutor();
+        newVirtualThreadPerTaskExecutor =
+                ThreadSupport.newVirtualThreadPerTaskExecutor().orElse(null);
+    }
 
-  @Test
-  public void testThreadId() throws InterruptedException {
-    AtomicLong threadId = new AtomicLong();
-    Thread thread = new Thread(() -> threadId.set(ThreadSupport.threadId()), "foo");
-    thread.start();
-    try {
-      // always works on Thread's where getId isn't overridden by child class
-      assertEquals(thread.getId(), ThreadSupport.threadId(thread));
-    } finally {
-      thread.join();
+    @Test
+    public void testThreadId() throws InterruptedException {
+        AtomicLong threadId = new AtomicLong();
+        Thread thread = new Thread(() -> threadId.set(ThreadSupport.threadId()), "foo");
+        thread.start();
+        try {
+            // always works on Thread's where getId isn't overridden by child class
+            assertEquals(thread.getId(), ThreadSupport.threadId(thread));
+        } finally {
+            thread.join();
+        }
+        assertEquals(thread.getId(), threadId.get());
     }
-    assertEquals(thread.getId(), threadId.get());
-  }
 
-  @Test
-  void testSupportsVirtualThreads() {
-    assertEquals(
-        JavaVirtualMachine.isJavaVersionAtLeast(21),
-        ThreadSupport.supportsVirtualThreads(),
-        "expected virtual threads support status");
-  }
+    @Test
+    void testSupportsVirtualThreads() {
+        assertEquals(
+                JavaVirtualMachine.isJavaVersionAtLeast(21),
+                ThreadSupport.supportsVirtualThreads(),
+                "expected virtual threads support status");
+    }
 
-  @Test
-  void testPlatformThread() {
-    assertVirtualThread(singleThreadExecutor, false);
-  }
+    @Test
+    void testPlatformThread() {
+        assertVirtualThread(singleThreadExecutor, false);
+    }
 
-  @Test
-  @EnabledOnJre(JAVA_21)
-  void testVirtualThread() {
-    assertVirtualThread(newVirtualThreadPerTaskExecutor, true);
-  }
+    @Test
+    @EnabledOnJre(JAVA_21)
+    void testVirtualThread() {
+        assertVirtualThread(newVirtualThreadPerTaskExecutor, true);
+    }
 
-  static void assertVirtualThread(ExecutorService executorService, boolean expected) {
-    Future<Boolean> futureCurrent = executorService.submit(() -> ThreadSupport.isVirtual());
-    Future<Boolean> futureGiven =
-        executorService.submit(
-            () -> {
-              Thread thread = Thread.currentThread();
-              return ThreadSupport.isVirtual(thread);
-            });
-    try {
-      assertEquals(expected, futureCurrent.get(), "invalid current thread virtual status");
-      assertEquals(expected, futureGiven.get(), "invalid given thread virtual status");
-    } catch (Throwable e) {
-      fail("Can't get thread virtual status", e);
+    static void assertVirtualThread(ExecutorService executorService, boolean expected) {
+        Future<Boolean> futureCurrent = executorService.submit(() -> ThreadSupport.isVirtual());
+        Future<Boolean> futureGiven = executorService.submit(() -> {
+            Thread thread = Thread.currentThread();
+            return ThreadSupport.isVirtual(thread);
+        });
+        try {
+            assertEquals(expected, futureCurrent.get(), "invalid current thread virtual status");
+            assertEquals(expected, futureGiven.get(), "invalid given thread virtual status");
+        } catch (Throwable e) {
+            fail("Can't get thread virtual status", e);
+        }
     }
-  }
 
-  @AfterAll
-  static void afterAll() {
-    singleThreadExecutor.shutdown();
-    if (newVirtualThreadPerTaskExecutor != null) {
-      newVirtualThreadPerTaskExecutor.shutdown();
+    @AfterAll
+    static void afterAll() {
+        singleThreadExecutor.shutdown();
+        if (newVirtualThreadPerTaskExecutor != null) {
+            newVirtualThreadPerTaskExecutor.shutdown();
+        }
     }
-  }
 }
diff --git a/components/http/http-api/src/main/java/datadog/http/client/HttpClient.java b/components/http/http-api/src/main/java/datadog/http/client/HttpClient.java
index fb6a637cfdc..dd16acc0977 100644
--- a/components/http/http-api/src/main/java/datadog/http/client/HttpClient.java
+++ b/components/http/http-api/src/main/java/datadog/http/client/HttpClient.java
@@ -16,98 +16,98 @@
  * <p>HttpClient instances should be reused across requests for connection pooling.
  */
 public interface HttpClient {
-  /**
-   * Executes an HTTP request synchronously and returns the response. The caller is responsible for
-   * closing the response.
-   *
-   * @param request the request to execute
-   * @return the HTTP response
-   * @throws IOException if an I/O error occurs
-   */
-  HttpResponse execute(HttpRequest request) throws IOException;
-
-  /**
-   * Executes an HTTP request asynchronously and returns a {@link CompletableFuture}. The caller is
-   * responsible for closing the response.
-   *
-   * @param request the request to execute
-   * @return a CompletableFuture that completes with the HTTP response
-   */
-  CompletableFuture<HttpResponse> executeAsync(HttpRequest request);
-
-  /**
-   * Creates a new {@link Builder} for constructing HTTP clients.
-   *
-   * @return a new http client builder
-   */
-  static Builder newBuilder() {
-    return HttpProviders.get().newClientBuilder();
-  }
-
-  /** Builder for constructing {@link HttpClient} instances. */
-  interface Builder {
     /**
-     * Sets the client timeouts, including the connection.
+     * Executes an HTTP request synchronously and returns the response. The caller is responsible for
+     * closing the response.
      *
-     * @param timeout the timeout duration
-     * @return this builder
+     * @param request the request to execute
+     * @return the HTTP response
+     * @throws IOException if an I/O error occurs
      */
-    Builder connectTimeout(Duration timeout);
+    HttpResponse execute(HttpRequest request) throws IOException;
 
     /**
-     * Sets the proxy configuration.
+     * Executes an HTTP request asynchronously and returns a {@link CompletableFuture}. The caller is
+     * responsible for closing the response.
      *
-     * @param proxy the proxy to use
-     * @return this builder
+     * @param request the request to execute
+     * @return a CompletableFuture that completes with the HTTP response
      */
-    Builder proxy(Proxy proxy);
+    CompletableFuture<HttpResponse> executeAsync(HttpRequest request);
 
     /**
-     * Sets proxy authentication credentials.
+     * Creates a new {@link Builder} for constructing HTTP clients.
      *
-     * @param username the proxy username
-     * @param password the proxy password, or {@code null} to use an empty password
-     * @return this builder
+     * @return a new http client builder
      */
-    Builder proxyAuthenticator(String username, @Nullable String password);
+    static Builder newBuilder() {
+        return HttpProviders.get().newClientBuilder();
+    }
 
-    /**
-     * Configures the client to use a Unix domain socket.
-     *
-     * @param socketFile the Unix domain socket file
-     * @return this builder
-     */
-    Builder unixDomainSocket(File socketFile);
+    /** Builder for constructing {@link HttpClient} instances. */
+    interface Builder {
+        /**
+         * Sets the client timeouts, including the connection.
+         *
+         * @param timeout the timeout duration
+         * @return this builder
+         */
+        Builder connectTimeout(Duration timeout);
 
-    /**
-     * Configures the client to use a named pipe (Windows).
-     *
-     * @param pipeName the named pipe name
-     * @return this builder
-     */
-    Builder namedPipe(String pipeName);
+        /**
+         * Sets the proxy configuration.
+         *
+         * @param proxy the proxy to use
+         * @return this builder
+         */
+        Builder proxy(Proxy proxy);
 
-    /**
-     * Forces clear text (HTTP) connections, disabling TLS.
-     *
-     * @param clearText {@code true} to force HTTP, {@code false} to allow HTTPS
-     * @return this builder
-     */
-    Builder clearText(boolean clearText);
+        /**
+         * Sets proxy authentication credentials.
+         *
+         * @param username the proxy username
+         * @param password the proxy password, or {@code null} to use an empty password
+         * @return this builder
+         */
+        Builder proxyAuthenticator(String username, @Nullable String password);
 
-    /**
-     * Sets a custom executor for executing async requests.
-     *
-     * @param executor the executor to use for async requests
-     * @return this builder
-     */
-    Builder executor(Executor executor);
+        /**
+         * Configures the client to use a Unix domain socket.
+         *
+         * @param socketFile the Unix domain socket file
+         * @return this builder
+         */
+        Builder unixDomainSocket(File socketFile);
 
-    /**
-     * Builds the {@link HttpClient} with the configured settings.
-     *
-     * @return the constructed HttpClient
-     */
-    HttpClient build();
-  }
+        /**
+         * Configures the client to use a named pipe (Windows).
+         *
+         * @param pipeName the named pipe name
+         * @return this builder
+         */
+        Builder namedPipe(String pipeName);
+
+        /**
+         * Forces clear text (HTTP) connections, disabling TLS.
+         *
+         * @param clearText {@code true} to force HTTP, {@code false} to allow HTTPS
+         * @return this builder
+         */
+        Builder clearText(boolean clearText);
+
+        /**
+         * Sets a custom executor for executing async requests.
+         *
+         * @param executor the executor to use for async requests
+         * @return this builder
+         */
+        Builder executor(Executor executor);
+
+        /**
+         * Builds the {@link HttpClient} with the configured settings.
+         *
+         * @return the constructed HttpClient
+         */
+        HttpClient build();
+    }
 }
diff --git a/components/http/http-api/src/main/java/datadog/http/client/HttpProvider.java b/components/http/http-api/src/main/java/datadog/http/client/HttpProvider.java
index 4754ad5139f..fe3bb4c73a9 100644
--- a/components/http/http-api/src/main/java/datadog/http/client/HttpProvider.java
+++ b/components/http/http-api/src/main/java/datadog/http/client/HttpProvider.java
@@ -6,23 +6,23 @@
 
 /** Factory class providing the various HTTP client class implementations. */
 public abstract class HttpProvider {
-  public abstract HttpClient.Builder newClientBuilder();
+    public abstract HttpClient.Builder newClientBuilder();
 
-  public abstract HttpRequest.Builder newRequestBuilder();
+    public abstract HttpRequest.Builder newRequestBuilder();
 
-  public abstract HttpUrl.Builder newUrlBuilder();
+    public abstract HttpUrl.Builder newUrlBuilder();
 
-  public abstract HttpUrl httpUrlParse(String url);
+    public abstract HttpUrl httpUrlParse(String url);
 
-  public abstract HttpUrl httpUrlFrom(URI uri);
+    public abstract HttpUrl httpUrlFrom(URI uri);
 
-  public abstract HttpRequestBody requestBodyOfString(String content);
+    public abstract HttpRequestBody requestBodyOfString(String content);
 
-  public abstract HttpRequestBody requestBodyOfBytes(byte[] bytes);
+    public abstract HttpRequestBody requestBodyOfBytes(byte[] bytes);
 
-  public abstract HttpRequestBody requestBodyOfByteBuffers(List<ByteBuffer> buffers);
+    public abstract HttpRequestBody requestBodyOfByteBuffers(List<ByteBuffer> buffers);
 
-  public abstract HttpRequestBody requestBodyGzip(HttpRequestBody body);
+    public abstract HttpRequestBody requestBodyGzip(HttpRequestBody body);
 
-  public abstract HttpRequestBody.MultipartBuilder requestBodyMultipart();
+    public abstract HttpRequestBody.MultipartBuilder requestBodyMultipart();
 }
diff --git a/components/http/http-api/src/main/java/datadog/http/client/HttpProviders.java b/components/http/http-api/src/main/java/datadog/http/client/HttpProviders.java
index efa217c0dfc..b8a5f1f91f8 100644
--- a/components/http/http-api/src/main/java/datadog/http/client/HttpProviders.java
+++ b/components/http/http-api/src/main/java/datadog/http/client/HttpProviders.java
@@ -18,57 +18,55 @@
  * thread-safe and all methods can be safely called from multiple threads.
  */
 public final class HttpProviders {
-  private static final String JDK_HTTP_PROVIDER_CLASS_NAME =
-      "datadog.http.client.jdk.JdkHttpProvider";
-  private static final String OKHTTP_PROVIDER_CLASS_NAME =
-      "datadog.http.client.okhttp.OkHttpProvider";
-  private static volatile boolean compatibilityMode = false;
-  private static HttpProvider provider;
+    private static final String JDK_HTTP_PROVIDER_CLASS_NAME = "datadog.http.client.jdk.JdkHttpProvider";
+    private static final String OKHTTP_PROVIDER_CLASS_NAME = "datadog.http.client.okhttp.OkHttpProvider";
+    private static volatile boolean compatibilityMode = false;
+    private static HttpProvider provider;
 
-  private HttpProviders() {}
+    private HttpProviders() {}
 
-  public static void forceCompatClient() {
-    // Skip if already in compat mode
-    if (compatibilityMode) {
-      return;
+    public static void forceCompatClient() {
+        // Skip if already in compat mode
+        if (compatibilityMode) {
+            return;
+        }
+        compatibilityMode = true;
+        provider = null;
     }
-    compatibilityMode = true;
-    provider = null;
-  }
 
-  public static HttpProvider get() {
-    if (provider == null) {
-      provider = findProvider();
+    public static HttpProvider get() {
+        if (provider == null) {
+            provider = findProvider();
+        }
+        return provider;
     }
-    return provider;
-  }
 
-  @SuppressForbidden // Class#forName(String) used to dynamically load the http API implementation
-  private static HttpProvider findProvider() {
-    Class<?> clazz = null;
-    // Load the default client class
-    if (!compatibilityMode) {
-      try {
-        clazz = Class.forName(JDK_HTTP_PROVIDER_CLASS_NAME);
-      } catch (ClassNotFoundException | UnsupportedClassVersionError ignored) {
-        compatibilityMode = true;
-      }
-    }
-    // If not loaded, load the compat client class
-    if (clazz == null) {
-      try {
-        clazz = Class.forName(OKHTTP_PROVIDER_CLASS_NAME);
-      } catch (ClassNotFoundException ignored) {
-      }
-    }
-    // If no class loaded, raise the illegal state
-    if (clazz == null) {
-      throw new IllegalStateException("No http client implementation found");
-    }
-    try {
-      return (HttpProvider) clazz.getDeclaredConstructor().newInstance();
-    } catch (ReflectiveOperationException e) {
-      throw new IllegalStateException("No http client implementation found", e);
+    @SuppressForbidden // Class#forName(String) used to dynamically load the http API implementation
+    private static HttpProvider findProvider() {
+        Class<?> clazz = null;
+        // Load the default client class
+        if (!compatibilityMode) {
+            try {
+                clazz = Class.forName(JDK_HTTP_PROVIDER_CLASS_NAME);
+            } catch (ClassNotFoundException | UnsupportedClassVersionError ignored) {
+                compatibilityMode = true;
+            }
+        }
+        // If not loaded, load the compat client class
+        if (clazz == null) {
+            try {
+                clazz = Class.forName(OKHTTP_PROVIDER_CLASS_NAME);
+            } catch (ClassNotFoundException ignored) {
+            }
+        }
+        // If no class loaded, raise the illegal state
+        if (clazz == null) {
+            throw new IllegalStateException("No http client implementation found");
+        }
+        try {
+            return (HttpProvider) clazz.getDeclaredConstructor().newInstance();
+        } catch (ReflectiveOperationException e) {
+            throw new IllegalStateException("No http client implementation found", e);
+        }
     }
-  }
 }
diff --git a/components/http/http-api/src/main/java/datadog/http/client/HttpRequest.java b/components/http/http-api/src/main/java/datadog/http/client/HttpRequest.java
index b4649f4da27..bf5f7155eaf 100644
--- a/components/http/http-api/src/main/java/datadog/http/client/HttpRequest.java
+++ b/components/http/http-api/src/main/java/datadog/http/client/HttpRequest.java
@@ -8,133 +8,133 @@
  * body.
  */
 public interface HttpRequest {
-  /* Common headers names and values widely used in HTTP requests */
-  String CONTENT_TYPE = "Content-Type";
-  String APPLICATION_JSON = "application/json; charset=utf-8";
-
-  /**
-   * Returns the request URL.
-   *
-   * @return the HttpUrl
-   */
-  HttpUrl url();
-
-  /**
-   * Returns the HTTP method ({@code GET}, {@code POST}, {@code PUT}, etc.).
-   *
-   * @return the method name
-   */
-  String method();
-
-  /**
-   * Returns the first header value for the given name, or {@code null} if not present.
-   *
-   * @param name the header name
-   * @return the first header value, or {@code null} if not present
-   */
-  @Nullable
-  String header(String name);
-
-  /**
-   * Returns all header values for the given name.
-   *
-   * @param name the header name
-   * @return list of header values, an empty list if not present
-   */
-  List<String> headers(String name);
-
-  /**
-   * Returns the request body, or {@code null} if this request has no body (e.g., GET requests).
-   *
-   * @return the request body, or {@code null} if this request has no body
-   */
-  @Nullable
-  HttpRequestBody body();
-
-  /**
-   * Creates a new {@link Builder} for constructing HTTP requests.
-   *
-   * @return a new builder
-   */
-  static Builder newBuilder() {
-    return HttpProviders.get().newRequestBuilder();
-  }
-
-  /** Builder for constructing {@link HttpRequest} instances. */
-  interface Builder {
-    /**
-     * Sets the request URL.
-     *
-     * @param url the URL
-     * @return this builder
-     */
-    Builder url(HttpUrl url);
-
-    /**
-     * Sets the request URL from a {@link String}.
-     *
-     * @param url the URL string
-     * @return this builder
-     */
-    Builder url(String url);
-
-    /**
-     * Sets the request method to {@code GET}. This is the default method if other methods are not
-     * set.
-     *
-     * @return this builder
-     */
-    Builder get();
+    /* Common headers names and values widely used in HTTP requests */
+    String CONTENT_TYPE = "Content-Type";
+    String APPLICATION_JSON = "application/json; charset=utf-8";
 
     /**
-     * Sets the request method to {@code POST} with the given body.
+     * Returns the request URL.
      *
-     * @param body the request body
-     * @return this builder
+     * @return the HttpUrl
      */
-    Builder post(HttpRequestBody body);
+    HttpUrl url();
 
     /**
-     * Sets the request method to {@code PUT} with the given body.
+     * Returns the HTTP method ({@code GET}, {@code POST}, {@code PUT}, etc.).
      *
-     * @param body the request body
-     * @return this builder
+     * @return the method name
      */
-    Builder put(HttpRequestBody body);
+    String method();
 
     /**
-     * Sets a header, replacing any existing values for the same name.
+     * Returns the first header value for the given name, or {@code null} if not present.
      *
      * @param name the header name
-     * @param value the header value
-     * @return this builder
+     * @return the first header value, or {@code null} if not present
      */
-    Builder header(String name, String value);
+    @Nullable
+    String header(String name);
 
     /**
-     * Adds a header without removing existing values for the same name.
+     * Returns all header values for the given name.
      *
      * @param name the header name
-     * @param value the header value
-     * @return this builder
+     * @return list of header values, an empty list if not present
      */
-    Builder addHeader(String name, String value);
+    List<String> headers(String name);
 
     /**
-     * Sets the request listener.
+     * Returns the request body, or {@code null} if this request has no body (e.g., GET requests).
      *
-     * @param listener the listener to notify of request events or {@code null} to remove any
-     *     existing listener.
-     * @return this builder
+     * @return the request body, or {@code null} if this request has no body
      */
-    Builder listener(@Nullable HttpRequestListener listener);
+    @Nullable
+    HttpRequestBody body();
 
     /**
-     * Builds the HttpRequest.
+     * Creates a new {@link Builder} for constructing HTTP requests.
      *
-     * @return the constructed HttpRequest
-     * @throws IllegalStateException if required fields (like url) are missing
+     * @return a new builder
      */
-    HttpRequest build();
-  }
+    static Builder newBuilder() {
+        return HttpProviders.get().newRequestBuilder();
+    }
+
+    /** Builder for constructing {@link HttpRequest} instances. */
+    interface Builder {
+        /**
+         * Sets the request URL.
+         *
+         * @param url the URL
+         * @return this builder
+         */
+        Builder url(HttpUrl url);
+
+        /**
+         * Sets the request URL from a {@link String}.
+         *
+         * @param url the URL string
+         * @return this builder
+         */
+        Builder url(String url);
+
+        /**
+         * Sets the request method to {@code GET}. This is the default method if other methods are not
+         * set.
+         *
+         * @return this builder
+         */
+        Builder get();
+
+        /**
+         * Sets the request method to {@code POST} with the given body.
+         *
+         * @param body the request body
+         * @return this builder
+         */
+        Builder post(HttpRequestBody body);
+
+        /**
+         * Sets the request method to {@code PUT} with the given body.
+         *
+         * @param body the request body
+         * @return this builder
+         */
+        Builder put(HttpRequestBody body);
+
+        /**
+         * Sets a header, replacing any existing values for the same name.
+         *
+         * @param name the header name
+         * @param value the header value
+         * @return this builder
+         */
+        Builder header(String name, String value);
+
+        /**
+         * Adds a header without removing existing values for the same name.
+         *
+         * @param name the header name
+         * @param value the header value
+         * @return this builder
+         */
+        Builder addHeader(String name, String value);
+
+        /**
+         * Sets the request listener.
+         *
+         * @param listener the listener to notify of request events or {@code null} to remove any
+         *     existing listener.
+         * @return this builder
+         */
+        Builder listener(@Nullable HttpRequestListener listener);
+
+        /**
+         * Builds the HttpRequest.
+         *
+         * @return the constructed HttpRequest
+         * @throws IllegalStateException if required fields (like url) are missing
+         */
+        HttpRequest build();
+    }
 }
diff --git a/components/http/http-api/src/main/java/datadog/http/client/HttpRequestBody.java b/components/http/http-api/src/main/java/datadog/http/client/HttpRequestBody.java
index b46fc223771..e271ab970ca 100644
--- a/components/http/http-api/src/main/java/datadog/http/client/HttpRequestBody.java
+++ b/components/http/http-api/src/main/java/datadog/http/client/HttpRequestBody.java
@@ -12,122 +12,122 @@
  * compression and multipart/form-data.
  */
 public interface HttpRequestBody {
-  /**
-   * Returns the content length in bytes, or {@code -1} if unknown (e.g., for gzipped content).
-   *
-   * @return the content length, or {@code -1} if unknown
-   */
-  long contentLength();
-
-  /**
-   * Writes the body content to the given output stream.
-   *
-   * @param out the output stream to write to
-   * @throws IOException if an I/O error occurs
-   */
-  void writeTo(OutputStream out) throws IOException;
-
-  /**
-   * Creates a request body from a String using UTF-8 encoding. Content-Type should be set via
-   * request headers.
-   *
-   * @param content the string content
-   * @return a new {@link HttpRequestBody}
-   */
-  static HttpRequestBody of(String content) {
-    return HttpProviders.get().requestBodyOfString(content);
-  }
-
-  /**
-   * Creates a request body from raw bytes. Content-Type should be set via request headers.
-   *
-   * @param bytes the byte array content
-   * @return a new {@link HttpRequestBody}
-   */
-  static HttpRequestBody of(byte[] bytes) {
-    return HttpProviders.get().requestBodyOfBytes(bytes);
-  }
-
-  /**
-   * Creates a request body from a list of {@link ByteBuffer}s. Content-Type should be set via
-   * request headers.
-   *
-   * @param buffers the list of byte buffers content
-   * @return a new {@link HttpRequestBody}
-   */
-  static HttpRequestBody of(List<ByteBuffer> buffers) {
-    return HttpProviders.get().requestBodyOfByteBuffers(buffers);
-  }
-
-  /**
-   * Wraps a request body with gzip compression. The body is compressed eagerly and the content
-   * length reflects the compressed size. Content-Encoding header should be set to "gzip" separately
-   * via request headers.
-   *
-   * @param body the body to compress
-   * @return a new gzip-compressed {@link HttpRequestBody}
-   */
-  static HttpRequestBody gzip(HttpRequestBody body) {
-    return HttpProviders.get().requestBodyGzip(body);
-  }
+    /**
+     * Returns the content length in bytes, or {@code -1} if unknown (e.g., for gzipped content).
+     *
+     * @return the content length, or {@code -1} if unknown
+     */
+    long contentLength();
 
-  /**
-   * Creates a builder for multipart/form-data request bodies.
-   *
-   * @return a new {@link MultipartBuilder}
-   */
-  static MultipartBuilder multipart() {
-    return HttpProviders.get().requestBodyMultipart();
-  }
+    /**
+     * Writes the body content to the given output stream.
+     *
+     * @param out the output stream to write to
+     * @throws IOException if an I/O error occurs
+     */
+    void writeTo(OutputStream out) throws IOException;
 
-  /**
-   * Builder for creating multipart/form-data request bodies. Implements RFC 7578
-   * multipart/form-data format.
-   */
-  interface MultipartBuilder {
     /**
-     * Adds a form data part with a text value.
+     * Creates a request body from a String using UTF-8 encoding. Content-Type should be set via
+     * request headers.
      *
-     * @param name the field name
-     * @param value the field value
-     * @return this builder
+     * @param content the string content
+     * @return a new {@link HttpRequestBody}
      */
-    MultipartBuilder addFormDataPart(String name, String value);
+    static HttpRequestBody of(String content) {
+        return HttpProviders.get().requestBodyOfString(content);
+    }
 
     /**
-     * Adds a form data part with a file attachment.
+     * Creates a request body from raw bytes. Content-Type should be set via request headers.
      *
-     * @param name the field name
-     * @param filename the filename
-     * @param body the file content
-     * @return this builder
+     * @param bytes the byte array content
+     * @return a new {@link HttpRequestBody}
      */
-    MultipartBuilder addFormDataPart(String name, String filename, HttpRequestBody body);
+    static HttpRequestBody of(byte[] bytes) {
+        return HttpProviders.get().requestBodyOfBytes(bytes);
+    }
 
     /**
-     * Adds a part with custom headers (advanced usage). Use this when you need full control over
-     * part headers.
+     * Creates a request body from a list of {@link ByteBuffer}s. Content-Type should be set via
+     * request headers.
      *
-     * @param headers map of header name to value (e.g., {@code Content-Disposition}, {@code
-     *     Content-Type})
-     * @param body the part content
-     * @return this builder
+     * @param buffers the list of byte buffers content
+     * @return a new {@link HttpRequestBody}
      */
-    MultipartBuilder addPart(Map<String, String> headers, HttpRequestBody body);
+    static HttpRequestBody of(List<ByteBuffer> buffers) {
+        return HttpProviders.get().requestBodyOfByteBuffers(buffers);
+    }
 
     /**
-     * Returns the {@code Content-Type} header value for this multipart body. Includes the boundary
-     * parameter required for parsing. Can be called before or after build().
+     * Wraps a request body with gzip compression. The body is compressed eagerly and the content
+     * length reflects the compressed size. Content-Encoding header should be set to "gzip" separately
+     * via request headers.
      *
-     * @return the content type string (e.g., "multipart/form-data; boundary=...")
+     * @param body the body to compress
+     * @return a new gzip-compressed {@link HttpRequestBody}
      */
-    String contentType();
+    static HttpRequestBody gzip(HttpRequestBody body) {
+        return HttpProviders.get().requestBodyGzip(body);
+    }
 
     /**
-     * Builds the multipart request body.
+     * Creates a builder for multipart/form-data request bodies.
      *
-     * @return the constructed {@link HttpRequestBody}
+     * @return a new {@link MultipartBuilder}
+     */
+    static MultipartBuilder multipart() {
+        return HttpProviders.get().requestBodyMultipart();
+    }
+
+    /**
+     * Builder for creating multipart/form-data request bodies. Implements RFC 7578
+     * multipart/form-data format.
      */
-    HttpRequestBody build();
-  }
+    interface MultipartBuilder {
+        /**
+         * Adds a form data part with a text value.
+         *
+         * @param name the field name
+         * @param value the field value
+         * @return this builder
+         */
+        MultipartBuilder addFormDataPart(String name, String value);
+
+        /**
+         * Adds a form data part with a file attachment.
+         *
+         * @param name the field name
+         * @param filename the filename
+         * @param body the file content
+         * @return this builder
+         */
+        MultipartBuilder addFormDataPart(String name, String filename, HttpRequestBody body);
+
+        /**
+         * Adds a part with custom headers (advanced usage). Use this when you need full control over
+         * part headers.
+         *
+         * @param headers map of header name to value (e.g., {@code Content-Disposition}, {@code
+         *     Content-Type})
+         * @param body the part content
+         * @return this builder
+         */
+        MultipartBuilder addPart(Map<String, String> headers, HttpRequestBody body);
+
+        /**
+         * Returns the {@code Content-Type} header value for this multipart body. Includes the boundary
+         * parameter required for parsing. Can be called before or after build().
+         *
+         * @return the content type string (e.g., "multipart/form-data; boundary=...")
+         */
+        String contentType();
+
+        /**
+         * Builds the multipart request body.
+         *
+         * @return the constructed {@link HttpRequestBody}
+         */
+        HttpRequestBody build();
+    }
 }
diff --git a/components/http/http-api/src/main/java/datadog/http/client/HttpRequestListener.java b/components/http/http-api/src/main/java/datadog/http/client/HttpRequestListener.java
index 4d86b99d890..5c4818a64c3 100644
--- a/components/http/http-api/src/main/java/datadog/http/client/HttpRequestListener.java
+++ b/components/http/http-api/src/main/java/datadog/http/client/HttpRequestListener.java
@@ -8,26 +8,26 @@
  * request timing, log requests, or handle errors.
  */
 public interface HttpRequestListener {
-  /**
-   * Called when a request is about to be sent.
-   *
-   * @param request the request being sent
-   */
-  void onRequestStart(HttpRequest request);
+    /**
+     * Called when a request is about to be sent.
+     *
+     * @param request the request being sent
+     */
+    void onRequestStart(HttpRequest request);
 
-  /**
-   * Called when a response is received successfully.
-   *
-   * @param request the request that was sent
-   * @param response the response received, or {@code null} if response body hasn't been read yet
-   */
-  void onRequestEnd(HttpRequest request, @Nullable HttpResponse response);
+    /**
+     * Called when a response is received successfully.
+     *
+     * @param request the request that was sent
+     * @param response the response received, or {@code null} if response body hasn't been read yet
+     */
+    void onRequestEnd(HttpRequest request, @Nullable HttpResponse response);
 
-  /**
-   * Called when a request fails with an exception.
-   *
-   * @param request the request that failed
-   * @param exception the exception that occurred
-   */
-  void onRequestFailure(HttpRequest request, IOException exception);
+    /**
+     * Called when a request fails with an exception.
+     *
+     * @param request the request that failed
+     * @param exception the exception that occurred
+     */
+    void onRequestFailure(HttpRequest request, IOException exception);
 }
diff --git a/components/http/http-api/src/main/java/datadog/http/client/HttpResponse.java b/components/http/http-api/src/main/java/datadog/http/client/HttpResponse.java
index 09751b6244e..928f3edc9d8 100644
--- a/components/http/http-api/src/main/java/datadog/http/client/HttpResponse.java
+++ b/components/http/http-api/src/main/java/datadog/http/client/HttpResponse.java
@@ -13,59 +13,59 @@
  * <p>HttpResponse instances must be closed after use to release resources.
  */
 public interface HttpResponse {
-  /**
-   * Returns the HTTP status code.
-   *
-   * @return the status code (e.g., 200, 404, 500)
-   */
-  int code();
+    /**
+     * Returns the HTTP status code.
+     *
+     * @return the status code (e.g., 200, 404, 500)
+     */
+    int code();
 
-  /**
-   * Check whether the response code is in [200..300), indicating the request was successful.
-   *
-   * @return {@code true} if successful, {@code false} otherwise
-   */
-  boolean isSuccessful();
+    /**
+     * Check whether the response code is in [200..300), indicating the request was successful.
+     *
+     * @return {@code true} if successful, {@code false} otherwise
+     */
+    boolean isSuccessful();
 
-  /**
-   * Returns the first header value for the given name, or {@code null} if not present. Header names
-   * are case-insensitive.
-   *
-   * @param name the header name
-   * @return the first header value, or {@code null} if not present
-   */
-  @Nullable
-  String header(String name);
+    /**
+     * Returns the first header value for the given name, or {@code null} if not present. Header names
+     * are case-insensitive.
+     *
+     * @param name the header name
+     * @return the first header value, or {@code null} if not present
+     */
+    @Nullable
+    String header(String name);
 
-  /**
-   * Returns all header values for the given name. Header names are case-insensitive.
-   *
-   * @param name the header name
-   * @return list of header values, an empty list if not present
-   */
-  List<String> headers(String name);
+    /**
+     * Returns all header values for the given name. Header names are case-insensitive.
+     *
+     * @param name the header name
+     * @return list of header values, an empty list if not present
+     */
+    List<String> headers(String name);
 
-  /**
-   * Returns all header names in this response. Header names are returned in their canonical form.
-   *
-   * @return set of header names, empty if no headers present
-   */
-  Set<String> headerNames();
+    /**
+     * Returns all header names in this response. Header names are returned in their canonical form.
+     *
+     * @return set of header names, empty if no headers present
+     */
+    Set<String> headerNames();
 
-  /**
-   * Returns the response body as an {@link InputStream}. The caller is responsible for closing the
-   * stream.
-   *
-   * @return the response body stream
-   */
-  InputStream body();
+    /**
+     * Returns the response body as an {@link InputStream}. The caller is responsible for closing the
+     * stream.
+     *
+     * @return the response body stream
+     */
+    InputStream body();
 
-  /**
-   * Returns the response body as a {@link String} using {@code Content-Type} charset or UTF-8 if
-   * absent.
-   *
-   * @return the response body as a {@link String}
-   * @throws IOException if an I/O error occurs
-   */
-  String bodyAsString() throws IOException;
+    /**
+     * Returns the response body as a {@link String} using {@code Content-Type} charset or UTF-8 if
+     * absent.
+     *
+     * @return the response body as a {@link String}
+     * @throws IOException if an I/O error occurs
+     */
+    String bodyAsString() throws IOException;
 }
diff --git a/components/http/http-api/src/main/java/datadog/http/client/HttpUrl.java b/components/http/http-api/src/main/java/datadog/http/client/HttpUrl.java
index 4bdeb2ada1f..752df043b16 100644
--- a/components/http/http-api/src/main/java/datadog/http/client/HttpUrl.java
+++ b/components/http/http-api/src/main/java/datadog/http/client/HttpUrl.java
@@ -11,131 +11,131 @@
  * #from(URI)}, or parse from strings using {@link #parse(String)}.
  */
 public interface HttpUrl {
-  /**
-   * Returns the complete URL as a string.
-   *
-   * @return the URL string
-   */
-  String url();
-
-  /**
-   * Returns the scheme (protocol) of this URL.
-   *
-   * @return the scheme (e.g., "http", "https")
-   */
-  String scheme();
-
-  /**
-   * Returns the host of this URL.
-   *
-   * @return the host name or IP address
-   */
-  String host();
-
-  /**
-   * Returns the port of this URL. Returns the default port for the scheme if not explicitly set (80
-   * for http, 443 for https).
-   *
-   * @return the port number
-   */
-  int port();
-
-  /**
-   * Resolves a relative URL against this URL.
-   *
-   * @param path the relative path to resolve
-   * @return a new {@link HttpUrl} with the resolved path
-   */
-  HttpUrl resolve(String path);
-
-  /**
-   * Returns a {@link Builder} to modify this URL.
-   *
-   * @return a new {@link Builder} based on this URL
-   */
-  Builder newBuilder();
-
-  /**
-   * Parses a URL string into an {@link HttpUrl}.
-   *
-   * @param url the URL string to parse
-   * @return the parsed {@link HttpUrl}
-   * @throws IllegalArgumentException if the URL is malformed
-   */
-  static HttpUrl parse(String url) throws IllegalArgumentException {
-    requireNonNull(url, "url");
-    return HttpProviders.get().httpUrlParse(url);
-  }
-
-  /**
-   * Creates an HttpUrl from an {@link URI}.
-   *
-   * @param uri the {@link URI} to get an {@link HttpUrl} from
-   * @return the {@link HttpUrl} related to the URI
-   */
-  static HttpUrl from(URI uri) {
-    requireNonNull(uri, "uri");
-    return HttpProviders.get().httpUrlFrom(uri);
-  }
-
-  /**
-   * Creates a new {@link Builder}der for constructing URLs.
-   *
-   * @return a new {@link Builder}
-   */
-  static Builder builder() {
-    return HttpProviders.get().newUrlBuilder();
-  }
-
-  /** Builder for constructing {@link HttpUrl} instances. */
-  interface Builder {
     /**
-     * Sets the scheme (protocol) for the URL.
+     * Returns the complete URL as a string.
      *
-     * @param scheme the scheme (e.g., "http", "https")
-     * @return this builder
+     * @return the URL string
      */
-    Builder scheme(String scheme);
+    String url();
 
     /**
-     * Sets the host for the URL.
+     * Returns the scheme (protocol) of this URL.
      *
-     * @param host the host name or IP address
-     * @return this builder
+     * @return the scheme (e.g., "http", "https")
      */
-    Builder host(String host);
+    String scheme();
 
     /**
-     * Sets the port for the URL.
+     * Returns the host of this URL.
      *
-     * @param port the port number
-     * @return this builder
+     * @return the host name or IP address
      */
-    Builder port(int port);
+    String host();
 
     /**
-     * Adds a path segment to the URL.
+     * Returns the port of this URL. Returns the default port for the scheme if not explicitly set (80
+     * for http, 443 for https).
      *
-     * @param segment the path segment to add
-     * @return this builder
+     * @return the port number
      */
-    Builder addPathSegment(String segment);
+    int port();
 
     /**
-     * Adds a query parameter to the URL.
+     * Resolves a relative URL against this URL.
      *
-     * @param name the parameter name
-     * @param value the parameter value
-     * @return this builder
+     * @param path the relative path to resolve
+     * @return a new {@link HttpUrl} with the resolved path
      */
-    Builder addQueryParameter(String name, @Nullable String value);
+    HttpUrl resolve(String path);
 
     /**
-     * Builds the HttpUrl.
+     * Returns a {@link Builder} to modify this URL.
      *
-     * @return the constructed HttpUrl
-     * @throws IllegalStateException if required fields are missing
+     * @return a new {@link Builder} based on this URL
      */
-    HttpUrl build();
-  }
+    Builder newBuilder();
+
+    /**
+     * Parses a URL string into an {@link HttpUrl}.
+     *
+     * @param url the URL string to parse
+     * @return the parsed {@link HttpUrl}
+     * @throws IllegalArgumentException if the URL is malformed
+     */
+    static HttpUrl parse(String url) throws IllegalArgumentException {
+        requireNonNull(url, "url");
+        return HttpProviders.get().httpUrlParse(url);
+    }
+
+    /**
+     * Creates an HttpUrl from an {@link URI}.
+     *
+     * @param uri the {@link URI} to get an {@link HttpUrl} from
+     * @return the {@link HttpUrl} related to the URI
+     */
+    static HttpUrl from(URI uri) {
+        requireNonNull(uri, "uri");
+        return HttpProviders.get().httpUrlFrom(uri);
+    }
+
+    /**
+     * Creates a new {@link Builder}der for constructing URLs.
+     *
+     * @return a new {@link Builder}
+     */
+    static Builder builder() {
+        return HttpProviders.get().newUrlBuilder();
+    }
+
+    /** Builder for constructing {@link HttpUrl} instances. */
+    interface Builder {
+        /**
+         * Sets the scheme (protocol) for the URL.
+         *
+         * @param scheme the scheme (e.g., "http", "https")
+         * @return this builder
+         */
+        Builder scheme(String scheme);
+
+        /**
+         * Sets the host for the URL.
+         *
+         * @param host the host name or IP address
+         * @return this builder
+         */
+        Builder host(String host);
+
+        /**
+         * Sets the port for the URL.
+         *
+         * @param port the port number
+         * @return this builder
+         */
+        Builder port(int port);
+
+        /**
+         * Adds a path segment to the URL.
+         *
+         * @param segment the path segment to add
+         * @return this builder
+         */
+        Builder addPathSegment(String segment);
+
+        /**
+         * Adds a query parameter to the URL.
+         *
+         * @param name the parameter name
+         * @param value the parameter value
+         * @return this builder
+         */
+        Builder addQueryParameter(String name, @Nullable String value);
+
+        /**
+         * Builds the HttpUrl.
+         *
+         * @return the constructed HttpUrl
+         * @throws IllegalStateException if required fields are missing
+         */
+        HttpUrl build();
+    }
 }
diff --git a/components/http/http-api/src/test/java/datadog/http/client/HttpProvidersTest.java b/components/http/http-api/src/test/java/datadog/http/client/HttpProvidersTest.java
index fcf12314b48..22ad992ae65 100644
--- a/components/http/http-api/src/test/java/datadog/http/client/HttpProvidersTest.java
+++ b/components/http/http-api/src/test/java/datadog/http/client/HttpProvidersTest.java
@@ -11,62 +11,62 @@
 import org.junit.jupiter.api.condition.EnabledForJreRange;
 
 abstract class HttpProvidersTest {
-  abstract String getImplementationPackage();
+    abstract String getImplementationPackage();
 
-  @Test
-  void testProviderLookup() {
-    // Check runtime type
-    HttpProvider httpProvider = HttpProviders.get();
-    assertType(httpProvider);
-    // Downgrade to compatibility mode
-    HttpProviders.forceCompatClient();
-    httpProvider = HttpProviders.get();
-    assertCompatType(httpProvider);
-    // Ensure downgrade is idempotent
-    HttpProviders.forceCompatClient();
-    httpProvider = HttpProviders.get();
-    assertCompatType(httpProvider);
-  }
-
-  private void assertType(Object type) {
-    assertNotNull(type);
-    assertTrue(type.getClass().getName().startsWith(getImplementationPackage()));
-  }
+    @Test
+    void testProviderLookup() {
+        // Check runtime type
+        HttpProvider httpProvider = HttpProviders.get();
+        assertType(httpProvider);
+        // Downgrade to compatibility mode
+        HttpProviders.forceCompatClient();
+        httpProvider = HttpProviders.get();
+        assertCompatType(httpProvider);
+        // Ensure downgrade is idempotent
+        HttpProviders.forceCompatClient();
+        httpProvider = HttpProviders.get();
+        assertCompatType(httpProvider);
+    }
 
-  private void assertCompatType(Object type) {
-    assertNotNull(type);
-    assertTrue(type.getClass().getName().startsWith("datadog.http.client.okhttp"));
-  }
+    private void assertType(Object type) {
+        assertNotNull(type);
+        assertTrue(type.getClass().getName().startsWith(getImplementationPackage()));
+    }
 
-  @Disabled
-  @EnabledForJreRange(max = JAVA_10)
-  static class OkHttpProvidersForkedTest extends HttpProvidersTest {
-    @Override
-    String getImplementationPackage() {
-      return "datadog.http.client.okhttp";
+    private void assertCompatType(Object type) {
+        assertNotNull(type);
+        assertTrue(type.getClass().getName().startsWith("datadog.http.client.okhttp"));
     }
-  }
 
-  @Disabled
-  @EnabledForJreRange(min = JAVA_11)
-  static class JdkHttpProvidersForkedTest extends HttpProvidersTest {
-    @Override
-    String getImplementationPackage() {
-      return "datadog.http.client.jdk";
+    @Disabled
+    @EnabledForJreRange(max = JAVA_10)
+    static class OkHttpProvidersForkedTest extends HttpProvidersTest {
+        @Override
+        String getImplementationPackage() {
+            return "datadog.http.client.okhttp";
+        }
     }
-  }
 
-  @Disabled
-  @EnabledForJreRange(min = JAVA_11)
-  static class HttpProvidersCompatForkedTest extends HttpProvidersTest {
-    @BeforeAll
-    static void beforeAll() {
-      HttpProviders.forceCompatClient();
+    @Disabled
+    @EnabledForJreRange(min = JAVA_11)
+    static class JdkHttpProvidersForkedTest extends HttpProvidersTest {
+        @Override
+        String getImplementationPackage() {
+            return "datadog.http.client.jdk";
+        }
     }
 
-    @Override
-    String getImplementationPackage() {
-      return "datadog.http.client.okhttp";
+    @Disabled
+    @EnabledForJreRange(min = JAVA_11)
+    static class HttpProvidersCompatForkedTest extends HttpProvidersTest {
+        @BeforeAll
+        static void beforeAll() {
+            HttpProviders.forceCompatClient();
+        }
+
+        @Override
+        String getImplementationPackage() {
+            return "datadog.http.client.okhttp";
+        }
     }
-  }
 }
diff --git a/components/http/http-api/src/test/test/java/datadog/http/client/HttpProvidersTest.java b/components/http/http-api/src/test/test/java/datadog/http/client/HttpProvidersTest.java
index d337299c1d6..06cdd395631 100644
--- a/components/http/http-api/src/test/test/java/datadog/http/client/HttpProvidersTest.java
+++ b/components/http/http-api/src/test/test/java/datadog/http/client/HttpProvidersTest.java
@@ -19,141 +19,138 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 abstract class HttpProvidersTest {
-  private static final String URL_EXAMPLE = "http://localhost";
-  private static final String CONTENT_EXAMPLE = "content";
-
-  abstract String getImplementationPackage();
-
-  @ParameterizedTest(name = "[{index}] {0} builder")
-  @MethodSource("builders")
-  void testNewBuilder(String type, Supplier<?> builderSupplier) {
-    Object builder = builderSupplier.get();
-    assertType(builder);
-  }
-
-  static Stream<Arguments> builders() {
-    return Stream.of(
-        arguments("client", (Supplier<?>) HttpProviders::newClientBuilder),
-        arguments("request", (Supplier<?>) HttpProviders::newRequestBuilder),
-        arguments("url", (Supplier<?>) HttpProviders::newUrlBuilder));
-  }
-
-  @Test
-  void testHttpUrlParse() {
-    HttpUrl url = HttpProviders.httpUrlParse(URL_EXAMPLE);
-    assertType(url);
-  }
-
-  @Test
-  void testHttpUrlParseInvalidUrl() {
-    // An invalid URL causes the underlying parse() to throw IllegalArgumentException,
-    // wrapped as InvocationTargetException. HttpProviders unwraps and re-throws it.
-    assertThrows(
-        IllegalArgumentException.class, () -> HttpProviders.httpUrlParse("not a valid url"));
-  }
-
-  @Test
-  void testHttpUrlFromUri() {
-    HttpUrl url = HttpProviders.httpUrlFrom(URI.create(URL_EXAMPLE));
-    assertType(url);
-  }
-
-  @Test
-  void testRequestBodyOfString() {
-    HttpRequestBody body = HttpProviders.requestBodyOfString(CONTENT_EXAMPLE);
-    assertType(body);
-  }
-
-  @Test
-  void testRequestBodyOfBytes() {
-    HttpRequestBody body = HttpProviders.requestBodyOfBytes(new byte[0]);
-    assertType(body);
-  }
-
-  @Test
-  void testRequestBodyOfByteBuffers() {
-    HttpRequestBody body = HttpProviders.requestBodyOfByteBuffers(emptyList());
-    assertType(body);
-  }
-
-  @Test
-  void testRequestBodyGzip() {
-    HttpRequestBody body =
-        HttpProviders.requestBodyGzip(HttpProviders.requestBodyOfString(CONTENT_EXAMPLE));
-    assertType(body);
-  }
-
-  @Test
-  void testRequestBodyMultipart() {
-    HttpRequestBody.MultipartBuilder builder = HttpProviders.requestBodyMultipart();
-    assertType(builder);
-  }
-
-  @Test
-  void testCachedProviders() {
-    // First calls — populate all lazy-init caches
-    HttpProviders.newClientBuilder();
-    HttpProviders.newRequestBuilder();
-    HttpProviders.newUrlBuilder();
-    HttpProviders.httpUrlParse(URL_EXAMPLE);
-    HttpProviders.httpUrlFrom(URI.create(URL_EXAMPLE));
-    HttpProviders.requestBodyOfString(CONTENT_EXAMPLE);
-    HttpProviders.requestBodyOfBytes(new byte[0]);
-    HttpProviders.requestBodyOfByteBuffers(emptyList());
-    HttpProviders.requestBodyGzip(HttpProviders.requestBodyOfString(CONTENT_EXAMPLE));
-    HttpProviders.requestBodyMultipart();
-    // Second calls — hit the non-null (cached) branch for every lazy field
-    assertNotNull(HttpProviders.newClientBuilder());
-    assertNotNull(HttpProviders.newRequestBuilder());
-    assertNotNull(HttpProviders.newUrlBuilder());
-    assertNotNull(HttpProviders.httpUrlParse(URL_EXAMPLE));
-    assertNotNull(HttpProviders.httpUrlFrom(URI.create(URL_EXAMPLE)));
-    assertNotNull(HttpProviders.requestBodyOfString(CONTENT_EXAMPLE));
-    assertNotNull(HttpProviders.requestBodyOfBytes(new byte[0]));
-    assertNotNull(HttpProviders.requestBodyOfByteBuffers(emptyList()));
-    assertNotNull(
-        HttpProviders.requestBodyGzip(HttpProviders.requestBodyOfString(CONTENT_EXAMPLE)));
-    assertNotNull(HttpProviders.requestBodyMultipart());
-  }
-
-  private void assertType(Object builder) {
-    assertNotNull(builder);
-    assertTrue(builder.getClass().getName().startsWith(getImplementationPackage()));
-  }
-
-  @EnabledForJreRange(max = JAVA_10)
-  static class OkHttpProvidersForkedTest extends HttpProvidersTest {
-    @Override
-    String getImplementationPackage() {
-      return "datadog.http.client.okhttp";
+    private static final String URL_EXAMPLE = "http://localhost";
+    private static final String CONTENT_EXAMPLE = "content";
+
+    abstract String getImplementationPackage();
+
+    @ParameterizedTest(name = "[{index}] {0} builder")
+    @MethodSource("builders")
+    void testNewBuilder(String type, Supplier<?> builderSupplier) {
+        Object builder = builderSupplier.get();
+        assertType(builder);
+    }
+
+    static Stream<Arguments> builders() {
+        return Stream.of(
+                arguments("client", (Supplier<?>) HttpProviders::newClientBuilder),
+                arguments("request", (Supplier<?>) HttpProviders::newRequestBuilder),
+                arguments("url", (Supplier<?>) HttpProviders::newUrlBuilder));
+    }
+
+    @Test
+    void testHttpUrlParse() {
+        HttpUrl url = HttpProviders.httpUrlParse(URL_EXAMPLE);
+        assertType(url);
+    }
+
+    @Test
+    void testHttpUrlParseInvalidUrl() {
+        // An invalid URL causes the underlying parse() to throw IllegalArgumentException,
+        // wrapped as InvocationTargetException. HttpProviders unwraps and re-throws it.
+        assertThrows(IllegalArgumentException.class, () -> HttpProviders.httpUrlParse("not a valid url"));
+    }
+
+    @Test
+    void testHttpUrlFromUri() {
+        HttpUrl url = HttpProviders.httpUrlFrom(URI.create(URL_EXAMPLE));
+        assertType(url);
+    }
+
+    @Test
+    void testRequestBodyOfString() {
+        HttpRequestBody body = HttpProviders.requestBodyOfString(CONTENT_EXAMPLE);
+        assertType(body);
+    }
+
+    @Test
+    void testRequestBodyOfBytes() {
+        HttpRequestBody body = HttpProviders.requestBodyOfBytes(new byte[0]);
+        assertType(body);
     }
-  }
 
-  @EnabledForJreRange(min = JAVA_11)
-  static class JdkHttpProvidersForkedTest extends HttpProvidersTest {
-    @Override
-    String getImplementationPackage() {
-      return "datadog.http.client.jdk";
+    @Test
+    void testRequestBodyOfByteBuffers() {
+        HttpRequestBody body = HttpProviders.requestBodyOfByteBuffers(emptyList());
+        assertType(body);
     }
-  }
 
-  @EnabledForJreRange(min = JAVA_11)
-  static class HttpProvidersCompatForkedTest extends HttpProvidersTest {
-    @BeforeAll
-    static void beforeAll() {
-      HttpProviders.forceCompatClient();
+    @Test
+    void testRequestBodyGzip() {
+        HttpRequestBody body = HttpProviders.requestBodyGzip(HttpProviders.requestBodyOfString(CONTENT_EXAMPLE));
+        assertType(body);
     }
 
-    @Override
-    String getImplementationPackage() {
-      return "datadog.http.client.okhttp";
+    @Test
+    void testRequestBodyMultipart() {
+        HttpRequestBody.MultipartBuilder builder = HttpProviders.requestBodyMultipart();
+        assertType(builder);
     }
 
     @Test
-    void testForceCompatClientIsIdempotent() {
-      // compatibilityMode is already true — second call must hit early return (no NPE, no reset)
-      HttpProviders.forceCompatClient();
-      assertNotNull(HttpProviders.newClientBuilder());
+    void testCachedProviders() {
+        // First calls — populate all lazy-init caches
+        HttpProviders.newClientBuilder();
+        HttpProviders.newRequestBuilder();
+        HttpProviders.newUrlBuilder();
+        HttpProviders.httpUrlParse(URL_EXAMPLE);
+        HttpProviders.httpUrlFrom(URI.create(URL_EXAMPLE));
+        HttpProviders.requestBodyOfString(CONTENT_EXAMPLE);
+        HttpProviders.requestBodyOfBytes(new byte[0]);
+        HttpProviders.requestBodyOfByteBuffers(emptyList());
+        HttpProviders.requestBodyGzip(HttpProviders.requestBodyOfString(CONTENT_EXAMPLE));
+        HttpProviders.requestBodyMultipart();
+        // Second calls — hit the non-null (cached) branch for every lazy field
+        assertNotNull(HttpProviders.newClientBuilder());
+        assertNotNull(HttpProviders.newRequestBuilder());
+        assertNotNull(HttpProviders.newUrlBuilder());
+        assertNotNull(HttpProviders.httpUrlParse(URL_EXAMPLE));
+        assertNotNull(HttpProviders.httpUrlFrom(URI.create(URL_EXAMPLE)));
+        assertNotNull(HttpProviders.requestBodyOfString(CONTENT_EXAMPLE));
+        assertNotNull(HttpProviders.requestBodyOfBytes(new byte[0]));
+        assertNotNull(HttpProviders.requestBodyOfByteBuffers(emptyList()));
+        assertNotNull(HttpProviders.requestBodyGzip(HttpProviders.requestBodyOfString(CONTENT_EXAMPLE)));
+        assertNotNull(HttpProviders.requestBodyMultipart());
+    }
+
+    private void assertType(Object builder) {
+        assertNotNull(builder);
+        assertTrue(builder.getClass().getName().startsWith(getImplementationPackage()));
+    }
+
+    @EnabledForJreRange(max = JAVA_10)
+    static class OkHttpProvidersForkedTest extends HttpProvidersTest {
+        @Override
+        String getImplementationPackage() {
+            return "datadog.http.client.okhttp";
+        }
+    }
+
+    @EnabledForJreRange(min = JAVA_11)
+    static class JdkHttpProvidersForkedTest extends HttpProvidersTest {
+        @Override
+        String getImplementationPackage() {
+            return "datadog.http.client.jdk";
+        }
+    }
+
+    @EnabledForJreRange(min = JAVA_11)
+    static class HttpProvidersCompatForkedTest extends HttpProvidersTest {
+        @BeforeAll
+        static void beforeAll() {
+            HttpProviders.forceCompatClient();
+        }
+
+        @Override
+        String getImplementationPackage() {
+            return "datadog.http.client.okhttp";
+        }
+
+        @Test
+        void testForceCompatClientIsIdempotent() {
+            // compatibilityMode is already true — second call must hit early return (no NPE, no reset)
+            HttpProviders.forceCompatClient();
+            assertNotNull(HttpProviders.newClientBuilder());
+        }
     }
-  }
 }
diff --git a/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpClientAsyncTest.java b/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpClientAsyncTest.java
index 30c2df16168..9bd48050888 100644
--- a/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpClientAsyncTest.java
+++ b/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpClientAsyncTest.java
@@ -24,218 +24,214 @@
 
 @ExtendWith(MockServerExtension.class)
 public class HttpClientAsyncTest {
-  private static final int TIMEOUT_SECONDS = 5;
-  private ClientAndServer server;
-  private HttpClient client;
-  private String baseUrl;
-
-  @BeforeEach
-  void setUp(ClientAndServer server) {
-    this.server = server;
-    this.client = HttpClient.newBuilder().build();
-    this.baseUrl = "http://localhost:" + server.getPort();
-  }
-
-  @AfterEach
-  void tearDown() {
-    this.server.reset();
-  }
-
-  @Test
-  void testExecuteAsyncSuccess() throws Exception {
-    org.mockserver.model.HttpRequest expectedRequest =
-        request().withMethod("GET").withPath("/test");
-    this.server.when(expectedRequest).respond(response().withStatusCode(200).withBody("success"));
-
-    HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
-    HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
-
-    CompletableFuture<HttpResponse> future = this.client.executeAsync(request);
-
-    HttpResponse response = future.get(TIMEOUT_SECONDS, SECONDS);
-    assertNotNull(response);
-    assertEquals(200, response.code());
-    assertTrue(response.isSuccessful());
-    assertEquals("success", response.bodyAsString());
-
-    this.server.verify(expectedRequest);
-  }
-
-  @Test
-  void testExecuteAsyncHttpError() throws Exception {
-    org.mockserver.model.HttpRequest expectedRequest =
-        request().withMethod("GET").withPath("/notfound");
-    this.server.when(expectedRequest).respond(response().withStatusCode(404));
-
-    HttpUrl url = HttpUrl.parse(this.baseUrl + "/notfound");
-    HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
-
-    CompletableFuture<HttpResponse> future = this.client.executeAsync(request);
-
-    // HTTP errors (4xx, 5xx) should complete normally, not exceptionally
-    HttpResponse response = future.get(TIMEOUT_SECONDS, SECONDS);
-    assertNotNull(response);
-    assertEquals(404, response.code());
-
-    this.server.verify(expectedRequest);
-  }
-
-  @Test
-  void testExecuteAsyncWithListener() throws Exception {
-    org.mockserver.model.HttpRequest expectedRequest =
-        request().withMethod("GET").withPath("/test");
-    this.server.when(expectedRequest).respond(response().withStatusCode(200));
-
-    AtomicBoolean startCalled = new AtomicBoolean(false);
-    AtomicBoolean endCalled = new AtomicBoolean(false);
-    AtomicReference<HttpResponse> capturedResponse = new AtomicReference<>();
-    CountDownLatch latch = new CountDownLatch(1);
-
-    HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
-    HttpRequest request =
-        HttpRequest.newBuilder()
-            .url(url)
-            .get()
-            .listener(
-                new HttpRequestListener() {
-                  @Override
-                  public void onRequestStart(HttpRequest request) {
-                    startCalled.set(true);
-                  }
-
-                  @Override
-                  public void onRequestEnd(HttpRequest request, HttpResponse response) {
-                    endCalled.set(true);
-                    capturedResponse.set(response);
-                    latch.countDown();
-                  }
-
-                  @Override
-                  public void onRequestFailure(HttpRequest request, IOException exception) {
-                    fail("Should not fail");
-                  }
+    private static final int TIMEOUT_SECONDS = 5;
+    private ClientAndServer server;
+    private HttpClient client;
+    private String baseUrl;
+
+    @BeforeEach
+    void setUp(ClientAndServer server) {
+        this.server = server;
+        this.client = HttpClient.newBuilder().build();
+        this.baseUrl = "http://localhost:" + server.getPort();
+    }
+
+    @AfterEach
+    void tearDown() {
+        this.server.reset();
+    }
+
+    @Test
+    void testExecuteAsyncSuccess() throws Exception {
+        org.mockserver.model.HttpRequest expectedRequest =
+                request().withMethod("GET").withPath("/test");
+        this.server.when(expectedRequest).respond(response().withStatusCode(200).withBody("success"));
+
+        HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
+        HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
+
+        CompletableFuture<HttpResponse> future = this.client.executeAsync(request);
+
+        HttpResponse response = future.get(TIMEOUT_SECONDS, SECONDS);
+        assertNotNull(response);
+        assertEquals(200, response.code());
+        assertTrue(response.isSuccessful());
+        assertEquals("success", response.bodyAsString());
+
+        this.server.verify(expectedRequest);
+    }
+
+    @Test
+    void testExecuteAsyncHttpError() throws Exception {
+        org.mockserver.model.HttpRequest expectedRequest =
+                request().withMethod("GET").withPath("/notfound");
+        this.server.when(expectedRequest).respond(response().withStatusCode(404));
+
+        HttpUrl url = HttpUrl.parse(this.baseUrl + "/notfound");
+        HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
+
+        CompletableFuture<HttpResponse> future = this.client.executeAsync(request);
+
+        // HTTP errors (4xx, 5xx) should complete normally, not exceptionally
+        HttpResponse response = future.get(TIMEOUT_SECONDS, SECONDS);
+        assertNotNull(response);
+        assertEquals(404, response.code());
+
+        this.server.verify(expectedRequest);
+    }
+
+    @Test
+    void testExecuteAsyncWithListener() throws Exception {
+        org.mockserver.model.HttpRequest expectedRequest =
+                request().withMethod("GET").withPath("/test");
+        this.server.when(expectedRequest).respond(response().withStatusCode(200));
+
+        AtomicBoolean startCalled = new AtomicBoolean(false);
+        AtomicBoolean endCalled = new AtomicBoolean(false);
+        AtomicReference<HttpResponse> capturedResponse = new AtomicReference<>();
+        CountDownLatch latch = new CountDownLatch(1);
+
+        HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
+        HttpRequest request = HttpRequest.newBuilder()
+                .url(url)
+                .get()
+                .listener(new HttpRequestListener() {
+                    @Override
+                    public void onRequestStart(HttpRequest request) {
+                        startCalled.set(true);
+                    }
+
+                    @Override
+                    public void onRequestEnd(HttpRequest request, HttpResponse response) {
+                        endCalled.set(true);
+                        capturedResponse.set(response);
+                        latch.countDown();
+                    }
+
+                    @Override
+                    public void onRequestFailure(HttpRequest request, IOException exception) {
+                        fail("Should not fail");
+                    }
                 })
-            .build();
-
-    this.client.executeAsync(request);
-
-    assertTrue(latch.await(TIMEOUT_SECONDS, SECONDS), "Listener should be called");
-    assertTrue(startCalled.get(), "onRequestStart should be called");
-    assertTrue(endCalled.get(), "onRequestEnd should be called");
-    assertNotNull(capturedResponse.get());
-    assertEquals(200, capturedResponse.get().code());
-
-    this.server.verify(expectedRequest);
-  }
-
-  @Test
-  void testExecuteAsyncWithListenerOnFailure() throws Exception {
-    // Use an invalid port to cause connection failure
-    HttpUrl url = HttpUrl.parse("http://localhost:1/test");
-
-    AtomicBoolean startCalled = new AtomicBoolean(false);
-    AtomicBoolean failureCalled = new AtomicBoolean(false);
-    AtomicReference<IOException> capturedException = new AtomicReference<>();
-    CountDownLatch latch = new CountDownLatch(1);
-
-    HttpRequest request =
-        HttpRequest.newBuilder()
-            .url(url)
-            .get()
-            .listener(
-                new HttpRequestListener() {
-                  @Override
-                  public void onRequestStart(HttpRequest request) {
-                    startCalled.set(true);
-                  }
-
-                  @Override
-                  public void onRequestEnd(HttpRequest request, HttpResponse response) {
-                    fail("Should not succeed");
-                  }
-
-                  @Override
-                  public void onRequestFailure(HttpRequest request, IOException exception) {
-                    failureCalled.set(true);
-                    capturedException.set(exception);
-                    latch.countDown();
-                  }
+                .build();
+
+        this.client.executeAsync(request);
+
+        assertTrue(latch.await(TIMEOUT_SECONDS, SECONDS), "Listener should be called");
+        assertTrue(startCalled.get(), "onRequestStart should be called");
+        assertTrue(endCalled.get(), "onRequestEnd should be called");
+        assertNotNull(capturedResponse.get());
+        assertEquals(200, capturedResponse.get().code());
+
+        this.server.verify(expectedRequest);
+    }
+
+    @Test
+    void testExecuteAsyncWithListenerOnFailure() throws Exception {
+        // Use an invalid port to cause connection failure
+        HttpUrl url = HttpUrl.parse("http://localhost:1/test");
+
+        AtomicBoolean startCalled = new AtomicBoolean(false);
+        AtomicBoolean failureCalled = new AtomicBoolean(false);
+        AtomicReference<IOException> capturedException = new AtomicReference<>();
+        CountDownLatch latch = new CountDownLatch(1);
+
+        HttpRequest request = HttpRequest.newBuilder()
+                .url(url)
+                .get()
+                .listener(new HttpRequestListener() {
+                    @Override
+                    public void onRequestStart(HttpRequest request) {
+                        startCalled.set(true);
+                    }
+
+                    @Override
+                    public void onRequestEnd(HttpRequest request, HttpResponse response) {
+                        fail("Should not succeed");
+                    }
+
+                    @Override
+                    public void onRequestFailure(HttpRequest request, IOException exception) {
+                        failureCalled.set(true);
+                        capturedException.set(exception);
+                        latch.countDown();
+                    }
                 })
-            .build();
+                .build();
+
+        CompletableFuture<HttpResponse> future = this.client.executeAsync(request);
+
+        assertTrue(latch.await(TIMEOUT_SECONDS, SECONDS), "Listener should be called");
+        assertTrue(startCalled.get(), "onRequestStart should be called");
+        assertTrue(failureCalled.get(), "onRequestFailure should be called");
+        assertNotNull(capturedException.get());
+
+        // The future should also complete exceptionally
+        try {
+            future.get(TIMEOUT_SECONDS, SECONDS);
+            fail("Future should complete exceptionally");
+        } catch (ExecutionException e) {
+            assertInstanceOf(IOException.class, e.getCause());
+        }
+    }
+
+    @Test
+    void testExecuteAsyncComposition() throws Exception {
+        org.mockserver.model.HttpRequest expectedRequest =
+                request().withMethod("GET").withPath("/test");
+        this.server.when(expectedRequest).respond(response().withStatusCode(200).withBody("42"));
 
-    CompletableFuture<HttpResponse> future = this.client.executeAsync(request);
+        HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
+        HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
 
-    assertTrue(latch.await(TIMEOUT_SECONDS, SECONDS), "Listener should be called");
-    assertTrue(startCalled.get(), "onRequestStart should be called");
-    assertTrue(failureCalled.get(), "onRequestFailure should be called");
-    assertNotNull(capturedException.get());
+        // Test thenApply composition
+        CompletableFuture<Integer> future = this.client.executeAsync(request).thenApply(response -> {
+            try {
+                return Integer.parseInt(response.bodyAsString().trim());
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        Integer result = future.get(TIMEOUT_SECONDS, SECONDS);
+        assertEquals(42, result);
+
+        this.server.verify(expectedRequest);
+    }
 
-    // The future should also complete exceptionally
-    try {
-      future.get(TIMEOUT_SECONDS, SECONDS);
-      fail("Future should complete exceptionally");
-    } catch (ExecutionException e) {
-      assertInstanceOf(IOException.class, e.getCause());
+    @Test
+    void testExecuteAsyncMultipleRequests() throws Exception {
+        org.mockserver.model.HttpRequest expectedRequest1 =
+                request().withMethod("GET").withPath("/test1");
+        org.mockserver.model.HttpRequest expectedRequest2 =
+                request().withMethod("GET").withPath("/test2");
+        this.server
+                .when(expectedRequest1)
+                .respond(response().withStatusCode(200).withBody("response1"));
+        this.server
+                .when(expectedRequest2)
+                .respond(response().withStatusCode(200).withBody("response2"));
+
+        HttpRequest request1 = HttpRequest.newBuilder()
+                .url(HttpUrl.parse(this.baseUrl + "/test1"))
+                .get()
+                .build();
+        HttpRequest request2 = HttpRequest.newBuilder()
+                .url(HttpUrl.parse(this.baseUrl + "/test2"))
+                .get()
+                .build();
+
+        // Execute both requests concurrently
+        CompletableFuture<HttpResponse> future1 = this.client.executeAsync(request1);
+        CompletableFuture<HttpResponse> future2 = this.client.executeAsync(request2);
+
+        // Wait for both
+        CompletableFuture.allOf(future1, future2).get(TIMEOUT_SECONDS, SECONDS);
+
+        HttpResponse response1 = future1.get();
+        HttpResponse response2 = future2.get();
+
+        assertEquals("response1", response1.bodyAsString());
+        assertEquals("response2", response2.bodyAsString());
     }
-  }
-
-  @Test
-  void testExecuteAsyncComposition() throws Exception {
-    org.mockserver.model.HttpRequest expectedRequest =
-        request().withMethod("GET").withPath("/test");
-    this.server.when(expectedRequest).respond(response().withStatusCode(200).withBody("42"));
-
-    HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
-    HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
-
-    // Test thenApply composition
-    CompletableFuture<Integer> future =
-        this.client
-            .executeAsync(request)
-            .thenApply(
-                response -> {
-                  try {
-                    return Integer.parseInt(response.bodyAsString().trim());
-                  } catch (IOException e) {
-                    throw new RuntimeException(e);
-                  }
-                });
-
-    Integer result = future.get(TIMEOUT_SECONDS, SECONDS);
-    assertEquals(42, result);
-
-    this.server.verify(expectedRequest);
-  }
-
-  @Test
-  void testExecuteAsyncMultipleRequests() throws Exception {
-    org.mockserver.model.HttpRequest expectedRequest1 =
-        request().withMethod("GET").withPath("/test1");
-    org.mockserver.model.HttpRequest expectedRequest2 =
-        request().withMethod("GET").withPath("/test2");
-    this.server
-        .when(expectedRequest1)
-        .respond(response().withStatusCode(200).withBody("response1"));
-    this.server
-        .when(expectedRequest2)
-        .respond(response().withStatusCode(200).withBody("response2"));
-
-    HttpRequest request1 =
-        HttpRequest.newBuilder().url(HttpUrl.parse(this.baseUrl + "/test1")).get().build();
-    HttpRequest request2 =
-        HttpRequest.newBuilder().url(HttpUrl.parse(this.baseUrl + "/test2")).get().build();
-
-    // Execute both requests concurrently
-    CompletableFuture<HttpResponse> future1 = this.client.executeAsync(request1);
-    CompletableFuture<HttpResponse> future2 = this.client.executeAsync(request2);
-
-    // Wait for both
-    CompletableFuture.allOf(future1, future2).get(TIMEOUT_SECONDS, SECONDS);
-
-    HttpResponse response1 = future1.get();
-    HttpResponse response2 = future2.get();
-
-    assertEquals("response1", response1.bodyAsString());
-    assertEquals("response2", response2.bodyAsString());
-  }
 }
diff --git a/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpClientTest.java b/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpClientTest.java
index 811ed742723..caa85d39f91 100644
--- a/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpClientTest.java
+++ b/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpClientTest.java
@@ -18,183 +18,176 @@
 
 @ExtendWith(MockServerExtension.class)
 public class HttpClientTest {
-  private ClientAndServer server;
-  private HttpClient client;
-  private String baseUrl;
-
-  @BeforeEach
-  void setUp(ClientAndServer server) {
-    this.server = server;
-    this.client = HttpClient.newBuilder().build();
-    this.baseUrl = "http://localhost:" + server.getPort();
-  }
-
-  @AfterEach
-  void tearDown() {
-    this.server.reset();
-  }
-
-  @Test
-  void testGetRequest() throws IOException {
-    org.mockserver.model.HttpRequest expectedRequest =
-        request().withMethod("GET").withPath("/test");
-    this.server.when(expectedRequest).respond(response());
-
-    HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
-    HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
-
-    HttpResponse response = this.client.execute(request);
-
-    assertNotNull(response);
-    assertEquals(200, response.code());
-    assertTrue(response.isSuccessful());
-
-    this.server.verify(expectedRequest);
-  }
-
-  @Test
-  void testPostRequest() throws IOException {
-    String payload = "{\"key\":\"value\"}";
-    org.mockserver.model.HttpRequest expectedRequest =
-        request()
-            .withMethod("POST")
-            .withPath("/test")
-            .withHeader("Content-Type", "application/json")
-            .withBody(payload);
-    this.server.when(expectedRequest).respond(response().withStatusCode(201));
-
-    HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
-    HttpRequestBody body = HttpRequestBody.of(payload);
-    HttpRequest request =
-        HttpRequest.newBuilder()
-            .url(url)
-            .header("Content-Type", "application/json")
-            .post(body)
-            .build();
-
-    HttpResponse response = this.client.execute(request);
-
-    assertNotNull(response);
-    assertEquals(201, response.code());
-    assertTrue(response.isSuccessful());
-
-    this.server.verify(expectedRequest);
-  }
-
-  @Test
-  void testPutRequest() throws IOException {
-    String payload = "{\"key\":\"value\"}";
-    org.mockserver.model.HttpRequest expectedRequest =
-        request()
-            .withMethod("PUT")
-            .withPath("/test")
-            .withHeader("Content-Type", "application/json")
-            .withBody(payload);
-    this.server.when(expectedRequest).respond(response().withStatusCode(200));
-
-    HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
-    HttpRequestBody body = HttpRequestBody.of(payload);
-    HttpRequest request =
-        HttpRequest.newBuilder()
-            .url(url)
-            .header("Content-Type", "application/json")
-            .put(body)
-            .build();
-
-    HttpResponse response = this.client.execute(request);
-
-    assertNotNull(response);
-    assertEquals(200, response.code());
-    assertTrue(response.isSuccessful());
-
-    this.server.verify(expectedRequest);
-  }
-
-  @Test
-  void testErrorResponse() throws IOException {
-    org.mockserver.model.HttpRequest expectedRequest =
-        request().withMethod("GET").withPath("/missing");
-    this.server.when(expectedRequest).respond(response().withStatusCode(404));
-
-    HttpUrl url = HttpUrl.parse(this.baseUrl + "/missing");
-    HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
-
-    HttpResponse response = this.client.execute(request);
-
-    assertNotNull(response);
-    assertEquals(404, response.code());
-    assertFalse(response.isSuccessful());
-
-    this.server.verify(expectedRequest);
-  }
-
-  @Test
-  void testRequestHeaders() throws IOException {
-    org.mockserver.model.HttpRequest expectedRequest =
-        request()
-            .withMethod("GET")
-            .withPath("/test")
-            .withHeader("Accept", "text/plain")
-            .withHeader("X-Custom-Header", "custom-value1", "custom-value2", "custom-value3");
-    this.server.when(expectedRequest).respond(response().withStatusCode(200));
-
-    HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
-    HttpRequest request =
-        HttpRequest.newBuilder()
-            .url(url)
-            .get()
-            .header("Accept", "text/plain")
-            .addHeader("X-Custom-Header", "custom-value1")
-            .addHeader("X-Custom-Header", "custom-value2")
-            .addHeader("X-Custom-Header", "custom-value3")
-            .build();
-
-    HttpResponse response = this.client.execute(request);
-
-    assertNotNull(response);
-    assertEquals(200, response.code());
-    assertTrue(response.isSuccessful());
-
-    this.server.verify(expectedRequest);
-  }
-
-  @Test
-  void testResponseHeaders() throws IOException {
-    org.mockserver.model.HttpRequest expectedRequest =
-        request().withMethod("GET").withPath("/test");
-    org.mockserver.model.HttpResponse resultResponse =
-        response()
-            .withStatusCode(200)
-            .withHeader("Content-Type", "text/plain")
-            .withHeader("X-Custom-Header", "value1", "value2", "value3")
-            .withBody("test-response");
-    this.server.when(expectedRequest).respond(resultResponse);
-
-    HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
-    HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
-
-    HttpResponse response = this.client.execute(request);
-
-    assertNotNull(response);
-    assertEquals(200, response.code());
-    assertTrue(response.isSuccessful());
-    assertEquals("text/plain", response.header("Content-Type"));
-    assertEquals("value1", response.header("X-Custom-Header"));
-    List<String> customHeaderValues = response.headers("X-Custom-Header");
-    assertEquals(3, customHeaderValues.size());
-    assertEquals("value1", customHeaderValues.get(0));
-    assertEquals("value2", customHeaderValues.get(1));
-    assertEquals("value3", customHeaderValues.get(2));
-
-    this.server.verify(expectedRequest);
-  }
-
-  @Test
-  void testNewBuilder() {
-    HttpClient.Builder builder = HttpClient.newBuilder();
-    assertNotNull(builder);
-
-    HttpClient client = builder.build();
-    assertNotNull(client);
-  }
+    private ClientAndServer server;
+    private HttpClient client;
+    private String baseUrl;
+
+    @BeforeEach
+    void setUp(ClientAndServer server) {
+        this.server = server;
+        this.client = HttpClient.newBuilder().build();
+        this.baseUrl = "http://localhost:" + server.getPort();
+    }
+
+    @AfterEach
+    void tearDown() {
+        this.server.reset();
+    }
+
+    @Test
+    void testGetRequest() throws IOException {
+        org.mockserver.model.HttpRequest expectedRequest =
+                request().withMethod("GET").withPath("/test");
+        this.server.when(expectedRequest).respond(response());
+
+        HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
+        HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
+
+        HttpResponse response = this.client.execute(request);
+
+        assertNotNull(response);
+        assertEquals(200, response.code());
+        assertTrue(response.isSuccessful());
+
+        this.server.verify(expectedRequest);
+    }
+
+    @Test
+    void testPostRequest() throws IOException {
+        String payload = "{\"key\":\"value\"}";
+        org.mockserver.model.HttpRequest expectedRequest = request()
+                .withMethod("POST")
+                .withPath("/test")
+                .withHeader("Content-Type", "application/json")
+                .withBody(payload);
+        this.server.when(expectedRequest).respond(response().withStatusCode(201));
+
+        HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
+        HttpRequestBody body = HttpRequestBody.of(payload);
+        HttpRequest request = HttpRequest.newBuilder()
+                .url(url)
+                .header("Content-Type", "application/json")
+                .post(body)
+                .build();
+
+        HttpResponse response = this.client.execute(request);
+
+        assertNotNull(response);
+        assertEquals(201, response.code());
+        assertTrue(response.isSuccessful());
+
+        this.server.verify(expectedRequest);
+    }
+
+    @Test
+    void testPutRequest() throws IOException {
+        String payload = "{\"key\":\"value\"}";
+        org.mockserver.model.HttpRequest expectedRequest = request()
+                .withMethod("PUT")
+                .withPath("/test")
+                .withHeader("Content-Type", "application/json")
+                .withBody(payload);
+        this.server.when(expectedRequest).respond(response().withStatusCode(200));
+
+        HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
+        HttpRequestBody body = HttpRequestBody.of(payload);
+        HttpRequest request = HttpRequest.newBuilder()
+                .url(url)
+                .header("Content-Type", "application/json")
+                .put(body)
+                .build();
+
+        HttpResponse response = this.client.execute(request);
+
+        assertNotNull(response);
+        assertEquals(200, response.code());
+        assertTrue(response.isSuccessful());
+
+        this.server.verify(expectedRequest);
+    }
+
+    @Test
+    void testErrorResponse() throws IOException {
+        org.mockserver.model.HttpRequest expectedRequest =
+                request().withMethod("GET").withPath("/missing");
+        this.server.when(expectedRequest).respond(response().withStatusCode(404));
+
+        HttpUrl url = HttpUrl.parse(this.baseUrl + "/missing");
+        HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
+
+        HttpResponse response = this.client.execute(request);
+
+        assertNotNull(response);
+        assertEquals(404, response.code());
+        assertFalse(response.isSuccessful());
+
+        this.server.verify(expectedRequest);
+    }
+
+    @Test
+    void testRequestHeaders() throws IOException {
+        org.mockserver.model.HttpRequest expectedRequest = request()
+                .withMethod("GET")
+                .withPath("/test")
+                .withHeader("Accept", "text/plain")
+                .withHeader("X-Custom-Header", "custom-value1", "custom-value2", "custom-value3");
+        this.server.when(expectedRequest).respond(response().withStatusCode(200));
+
+        HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
+        HttpRequest request = HttpRequest.newBuilder()
+                .url(url)
+                .get()
+                .header("Accept", "text/plain")
+                .addHeader("X-Custom-Header", "custom-value1")
+                .addHeader("X-Custom-Header", "custom-value2")
+                .addHeader("X-Custom-Header", "custom-value3")
+                .build();
+
+        HttpResponse response = this.client.execute(request);
+
+        assertNotNull(response);
+        assertEquals(200, response.code());
+        assertTrue(response.isSuccessful());
+
+        this.server.verify(expectedRequest);
+    }
+
+    @Test
+    void testResponseHeaders() throws IOException {
+        org.mockserver.model.HttpRequest expectedRequest =
+                request().withMethod("GET").withPath("/test");
+        org.mockserver.model.HttpResponse resultResponse = response()
+                .withStatusCode(200)
+                .withHeader("Content-Type", "text/plain")
+                .withHeader("X-Custom-Header", "value1", "value2", "value3")
+                .withBody("test-response");
+        this.server.when(expectedRequest).respond(resultResponse);
+
+        HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
+        HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
+
+        HttpResponse response = this.client.execute(request);
+
+        assertNotNull(response);
+        assertEquals(200, response.code());
+        assertTrue(response.isSuccessful());
+        assertEquals("text/plain", response.header("Content-Type"));
+        assertEquals("value1", response.header("X-Custom-Header"));
+        List<String> customHeaderValues = response.headers("X-Custom-Header");
+        assertEquals(3, customHeaderValues.size());
+        assertEquals("value1", customHeaderValues.get(0));
+        assertEquals("value2", customHeaderValues.get(1));
+        assertEquals("value3", customHeaderValues.get(2));
+
+        this.server.verify(expectedRequest);
+    }
+
+    @Test
+    void testNewBuilder() {
+        HttpClient.Builder builder = HttpClient.newBuilder();
+        assertNotNull(builder);
+
+        HttpClient client = builder.build();
+        assertNotNull(client);
+    }
 }
diff --git a/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpRequestBodyTest.java b/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpRequestBodyTest.java
index 966175b070b..2e439e48685 100644
--- a/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpRequestBodyTest.java
+++ b/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpRequestBodyTest.java
@@ -17,139 +17,137 @@
 
 public class HttpRequestBodyTest {
 
-  // TODO Test empty string
-  // TODO Test empty byte array
-  // TODO Test empty ByteBuffer list
-
-  @Test
-  void testNullString() {
-    assertThrows(NullPointerException.class, () -> HttpRequestBody.of((String) null));
-  }
-
-  @Test
-  void testNullBytes() {
-    assertThrows(NullPointerException.class, () -> HttpRequestBody.of((byte[]) null));
-  }
-
-  @Test
-  void testNullByteBuffer() {
-    assertThrows(NullPointerException.class, () -> HttpRequestBody.of((List<ByteBuffer>) null));
-  }
-
-  @Test
-  void testMultipartBuilder() {
-    HttpRequestBody.MultipartBuilder builder = HttpRequestBody.multipart();
-    assertNotNull(builder);
-  }
-
-  @Test
-  void testMultipartContentType() {
-    HttpRequestBody.MultipartBuilder builder = HttpRequestBody.multipart();
-    builder.addFormDataPart("name", "value");
-    String contentType = builder.contentType();
-    assertTrue(contentType.startsWith("multipart/form-data; boundary="));
-  }
-
-  @Test
-  void testMultipartAddFormDataPart() throws IOException {
-    HttpRequestBody.MultipartBuilder builder = HttpRequestBody.multipart();
-    builder.addFormDataPart("name", "value");
-    HttpRequestBody body = builder.build();
-
-    assertNotNull(body);
-    assertTrue(body.contentLength() > 0);
-
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    body.writeTo(out);
-    String content = out.toString("UTF-8");
-    assertTrue(content.contains("name=\"name\""));
-    assertTrue(content.contains("value"));
-  }
-
-  @Test
-  void testMultipartAddFormDataPartWithFile() throws IOException {
-    HttpRequestBody.MultipartBuilder builder = HttpRequestBody.multipart();
-    HttpRequestBody fileBody = HttpRequestBody.of("file content");
-    builder.addFormDataPart("file", "test.txt", fileBody);
-    HttpRequestBody body = builder.build();
-
-    assertNotNull(body);
-    assertTrue(body.contentLength() > 0);
-
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    body.writeTo(out);
-    String content = out.toString("UTF-8");
-    assertTrue(content.contains("name=\"file\""));
-    assertTrue(content.contains("filename=\"test.txt\""));
-    assertTrue(content.contains("file content"));
-  }
-
-  @Test
-  void testMultipartAddPart() throws IOException {
-    HttpRequestBody.MultipartBuilder builder = HttpRequestBody.multipart();
-    Map<String, String> headers = new HashMap<>();
-    headers.put("Content-Disposition", "form-data; name=\"custom\"; filename=\"data.bin\"");
-    HttpRequestBody partBody = HttpRequestBody.of("custom content");
-    builder.addPart(headers, partBody);
-    HttpRequestBody body = builder.build();
-
-    assertNotNull(body);
-    assertTrue(body.contentLength() > 0);
-
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    body.writeTo(out);
-    String content = out.toString("UTF-8");
-    assertTrue(content.contains("name=\"custom\""));
-    assertTrue(content.contains("custom content"));
-  }
-
-  @Test
-  void testMultipartNullParams() {
-    HttpRequestBody.MultipartBuilder builder = HttpRequestBody.multipart();
-    assertThrows(NullPointerException.class, () -> builder.addFormDataPart(null, "value"));
-    assertThrows(NullPointerException.class, () -> builder.addFormDataPart("name", null));
-
-    HttpRequestBody fileBody = HttpRequestBody.of("content");
-    assertThrows(
-        NullPointerException.class, () -> builder.addFormDataPart(null, "file.txt", fileBody));
-    assertThrows(NullPointerException.class, () -> builder.addFormDataPart("name", null, fileBody));
-    assertThrows(
-        NullPointerException.class, () -> builder.addFormDataPart("name", "file.txt", null));
-
-    HttpRequestBody partBody = HttpRequestBody.of("content");
-    Map<String, String> headers = new HashMap<>();
-    headers.put("Content-Disposition", "form-data; name=\"test\"");
-    assertThrows(NullPointerException.class, () -> builder.addPart(null, partBody));
-    assertThrows(NullPointerException.class, () -> builder.addPart(headers, null));
-  }
-
-  @Test
-  void testGzipBody() throws IOException {
-    String content = "this is test content for gzip compression";
-    HttpRequestBody originalBody = HttpRequestBody.of(content);
-    HttpRequestBody gzippedBody = HttpRequestBody.gzip(originalBody);
-    assertNotNull(gzippedBody);
-    // Content length is unknown since compression is done lazily
-    assertEquals(-1, gzippedBody.contentLength());
-    // Dump zipped content to bytes
-    ByteArrayOutputStream compressedOut = new ByteArrayOutputStream();
-    gzippedBody.writeTo(compressedOut);
-    byte[] compressedBytes = compressedOut.toByteArray();
-    // Decompress and verify content matches the original content
-    try (GZIPInputStream gzipIn = new GZIPInputStream(new ByteArrayInputStream(compressedBytes));
-        ByteArrayOutputStream decompressedOut = new ByteArrayOutputStream()) {
-      byte[] buffer = new byte[1024];
-      int len;
-      while ((len = gzipIn.read(buffer)) != -1) {
-        decompressedOut.write(buffer, 0, len);
-      }
-      String decompressedContent = decompressedOut.toString("UTF-8");
-      assertEquals(content, decompressedContent);
+    // TODO Test empty string
+    // TODO Test empty byte array
+    // TODO Test empty ByteBuffer list
+
+    @Test
+    void testNullString() {
+        assertThrows(NullPointerException.class, () -> HttpRequestBody.of((String) null));
+    }
+
+    @Test
+    void testNullBytes() {
+        assertThrows(NullPointerException.class, () -> HttpRequestBody.of((byte[]) null));
+    }
+
+    @Test
+    void testNullByteBuffer() {
+        assertThrows(NullPointerException.class, () -> HttpRequestBody.of((List<ByteBuffer>) null));
+    }
+
+    @Test
+    void testMultipartBuilder() {
+        HttpRequestBody.MultipartBuilder builder = HttpRequestBody.multipart();
+        assertNotNull(builder);
+    }
+
+    @Test
+    void testMultipartContentType() {
+        HttpRequestBody.MultipartBuilder builder = HttpRequestBody.multipart();
+        builder.addFormDataPart("name", "value");
+        String contentType = builder.contentType();
+        assertTrue(contentType.startsWith("multipart/form-data; boundary="));
+    }
+
+    @Test
+    void testMultipartAddFormDataPart() throws IOException {
+        HttpRequestBody.MultipartBuilder builder = HttpRequestBody.multipart();
+        builder.addFormDataPart("name", "value");
+        HttpRequestBody body = builder.build();
+
+        assertNotNull(body);
+        assertTrue(body.contentLength() > 0);
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        body.writeTo(out);
+        String content = out.toString("UTF-8");
+        assertTrue(content.contains("name=\"name\""));
+        assertTrue(content.contains("value"));
+    }
+
+    @Test
+    void testMultipartAddFormDataPartWithFile() throws IOException {
+        HttpRequestBody.MultipartBuilder builder = HttpRequestBody.multipart();
+        HttpRequestBody fileBody = HttpRequestBody.of("file content");
+        builder.addFormDataPart("file", "test.txt", fileBody);
+        HttpRequestBody body = builder.build();
+
+        assertNotNull(body);
+        assertTrue(body.contentLength() > 0);
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        body.writeTo(out);
+        String content = out.toString("UTF-8");
+        assertTrue(content.contains("name=\"file\""));
+        assertTrue(content.contains("filename=\"test.txt\""));
+        assertTrue(content.contains("file content"));
+    }
+
+    @Test
+    void testMultipartAddPart() throws IOException {
+        HttpRequestBody.MultipartBuilder builder = HttpRequestBody.multipart();
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Content-Disposition", "form-data; name=\"custom\"; filename=\"data.bin\"");
+        HttpRequestBody partBody = HttpRequestBody.of("custom content");
+        builder.addPart(headers, partBody);
+        HttpRequestBody body = builder.build();
+
+        assertNotNull(body);
+        assertTrue(body.contentLength() > 0);
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        body.writeTo(out);
+        String content = out.toString("UTF-8");
+        assertTrue(content.contains("name=\"custom\""));
+        assertTrue(content.contains("custom content"));
     }
-  }
 
-  @Test
-  void testGzipNullBody() {
-    assertThrows(NullPointerException.class, () -> HttpRequestBody.gzip(null));
-  }
+    @Test
+    void testMultipartNullParams() {
+        HttpRequestBody.MultipartBuilder builder = HttpRequestBody.multipart();
+        assertThrows(NullPointerException.class, () -> builder.addFormDataPart(null, "value"));
+        assertThrows(NullPointerException.class, () -> builder.addFormDataPart("name", null));
+
+        HttpRequestBody fileBody = HttpRequestBody.of("content");
+        assertThrows(NullPointerException.class, () -> builder.addFormDataPart(null, "file.txt", fileBody));
+        assertThrows(NullPointerException.class, () -> builder.addFormDataPart("name", null, fileBody));
+        assertThrows(NullPointerException.class, () -> builder.addFormDataPart("name", "file.txt", null));
+
+        HttpRequestBody partBody = HttpRequestBody.of("content");
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Content-Disposition", "form-data; name=\"test\"");
+        assertThrows(NullPointerException.class, () -> builder.addPart(null, partBody));
+        assertThrows(NullPointerException.class, () -> builder.addPart(headers, null));
+    }
+
+    @Test
+    void testGzipBody() throws IOException {
+        String content = "this is test content for gzip compression";
+        HttpRequestBody originalBody = HttpRequestBody.of(content);
+        HttpRequestBody gzippedBody = HttpRequestBody.gzip(originalBody);
+        assertNotNull(gzippedBody);
+        // Content length is unknown since compression is done lazily
+        assertEquals(-1, gzippedBody.contentLength());
+        // Dump zipped content to bytes
+        ByteArrayOutputStream compressedOut = new ByteArrayOutputStream();
+        gzippedBody.writeTo(compressedOut);
+        byte[] compressedBytes = compressedOut.toByteArray();
+        // Decompress and verify content matches the original content
+        try (GZIPInputStream gzipIn = new GZIPInputStream(new ByteArrayInputStream(compressedBytes));
+                ByteArrayOutputStream decompressedOut = new ByteArrayOutputStream()) {
+            byte[] buffer = new byte[1024];
+            int len;
+            while ((len = gzipIn.read(buffer)) != -1) {
+                decompressedOut.write(buffer, 0, len);
+            }
+            String decompressedContent = decompressedOut.toString("UTF-8");
+            assertEquals(content, decompressedContent);
+        }
+    }
+
+    @Test
+    void testGzipNullBody() {
+        assertThrows(NullPointerException.class, () -> HttpRequestBody.gzip(null));
+    }
 }
diff --git a/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpRequestTest.java b/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpRequestTest.java
index 28b9efb0484..1b6b6546c41 100644
--- a/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpRequestTest.java
+++ b/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpRequestTest.java
@@ -10,133 +10,134 @@
 import org.junit.jupiter.api.Test;
 
 public class HttpRequestTest {
-  @Test
-  void testGetRequest() {
-    HttpUrl url = HttpUrl.parse("http://localhost:8080/api");
-    HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
-
-    assertNotNull(request);
-    assertEquals(url, request.url());
-    assertEquals("GET", request.method());
-  }
-
-  @Test
-  void testPostRequest() {
-    HttpUrl url = HttpUrl.parse("http://localhost:8080/api");
-    String payload = "{\"key\":\"value\"}";
-    HttpRequestBody body = HttpRequestBody.of(payload);
-
-    HttpRequest request = HttpRequest.newBuilder().url(url).post(body).build();
-
-    assertNotNull(request);
-    assertEquals(url, request.url());
-    assertEquals("POST", request.method());
-  }
-
-  @Test
-  void testPutRequest() {
-    HttpUrl url = HttpUrl.parse("http://localhost:8080/api");
-    String payload = "{\"key\":\"value\"}";
-    HttpRequestBody body = HttpRequestBody.of(payload);
-
-    HttpRequest request = HttpRequest.newBuilder().url(url).put(body).build();
-
-    assertEquals("PUT", request.method());
-  }
-
-  @Test
-  void testWithoutMethod() {
-    HttpRequest request = HttpRequest.newBuilder().url("http://localhost:8080/test").build();
-    assertEquals("GET", request.method());
-  }
-
-  @Test
-  void testRequestWithUrlString() {
-    HttpRequest request = HttpRequest.newBuilder().url("http://localhost:8080/test").get().build();
-
-    assertNotNull(request);
-    assertEquals("http://localhost:8080/test", request.url().url());
-  }
-
-  @Test
-  void testRequestWithSingleHeader() {
-    HttpRequest request =
-        HttpRequest.newBuilder()
-            .url("http://localhost:8080/test")
-            .header("Content-Type", "application/json")
-            .get()
-            .build();
-
-    assertEquals("application/json", request.header("Content-Type"));
-  }
-
-  @Test
-  void testRequestWithMultipleHeaders() {
-    HttpRequest request =
-        HttpRequest.newBuilder()
-            .url("http://localhost:8080/test")
-            .header("Content-Type", "application/json")
-            .header("Accept", "application/json")
-            .addHeader("X-Custom-Header", "value1")
-            .addHeader("X-Custom-Header", "value2")
-            .get()
-            .build();
-
-    assertEquals("application/json", request.header("Content-Type"));
-    assertEquals("application/json", request.header("Accept"));
-
-    List<String> customHeaders = request.headers("X-Custom-Header");
-    assertEquals(2, customHeaders.size());
-    assertTrue(customHeaders.contains("value1"));
-    assertTrue(customHeaders.contains("value2"));
-  }
-
-  @Test
-  void testWithoutUrl() {
-    assertThrows(IllegalStateException.class, () -> HttpRequest.newBuilder().get().build());
-  }
-
-  @Test
-  void testHeaderReplacement() {
-    HttpRequest request =
-        HttpRequest.newBuilder()
-            .url("http://localhost:8080/test")
-            .header("Content-Type", "text/plain")
-            .header("Content-Type", "application/json")
-            .get()
-            .build();
-
-    assertEquals("application/json", request.header("Content-Type"));
-  }
-
-  @Test
-  void testMissingHeader() {
-    HttpRequest request = HttpRequest.newBuilder().url("http://localhost:8080/test").get().build();
-
-    assertNull(request.header("X-Missing"));
-    List<String> missing = request.headers("X-Missing");
-    assertNotNull(missing);
-    assertTrue(missing.isEmpty());
-  }
-
-  @Test
-  void testEmptyHeaderValue() {
-    HttpRequest request =
-        HttpRequest.newBuilder()
-            .url("http://localhost:8080/test")
-            .header("X-Empty-Header", "")
-            .get()
-            .build();
-
-    assertEquals("", request.header("X-Empty-Header"));
-  }
-
-  @Test
-  void testNullHeader() {
-    HttpRequest.Builder builder = HttpRequest.newBuilder().url("http://localhost:8080/test");
-    assertThrows(NullPointerException.class, () -> builder.header(null, "value"));
-    assertThrows(NullPointerException.class, () -> builder.header("X-Custom-Header", null));
-    assertThrows(NullPointerException.class, () -> builder.addHeader(null, "value"));
-    assertThrows(NullPointerException.class, () -> builder.addHeader("X-Custom-Header", null));
-  }
+    @Test
+    void testGetRequest() {
+        HttpUrl url = HttpUrl.parse("http://localhost:8080/api");
+        HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
+
+        assertNotNull(request);
+        assertEquals(url, request.url());
+        assertEquals("GET", request.method());
+    }
+
+    @Test
+    void testPostRequest() {
+        HttpUrl url = HttpUrl.parse("http://localhost:8080/api");
+        String payload = "{\"key\":\"value\"}";
+        HttpRequestBody body = HttpRequestBody.of(payload);
+
+        HttpRequest request = HttpRequest.newBuilder().url(url).post(body).build();
+
+        assertNotNull(request);
+        assertEquals(url, request.url());
+        assertEquals("POST", request.method());
+    }
+
+    @Test
+    void testPutRequest() {
+        HttpUrl url = HttpUrl.parse("http://localhost:8080/api");
+        String payload = "{\"key\":\"value\"}";
+        HttpRequestBody body = HttpRequestBody.of(payload);
+
+        HttpRequest request = HttpRequest.newBuilder().url(url).put(body).build();
+
+        assertEquals("PUT", request.method());
+    }
+
+    @Test
+    void testWithoutMethod() {
+        HttpRequest request =
+                HttpRequest.newBuilder().url("http://localhost:8080/test").build();
+        assertEquals("GET", request.method());
+    }
+
+    @Test
+    void testRequestWithUrlString() {
+        HttpRequest request =
+                HttpRequest.newBuilder().url("http://localhost:8080/test").get().build();
+
+        assertNotNull(request);
+        assertEquals("http://localhost:8080/test", request.url().url());
+    }
+
+    @Test
+    void testRequestWithSingleHeader() {
+        HttpRequest request = HttpRequest.newBuilder()
+                .url("http://localhost:8080/test")
+                .header("Content-Type", "application/json")
+                .get()
+                .build();
+
+        assertEquals("application/json", request.header("Content-Type"));
+    }
+
+    @Test
+    void testRequestWithMultipleHeaders() {
+        HttpRequest request = HttpRequest.newBuilder()
+                .url("http://localhost:8080/test")
+                .header("Content-Type", "application/json")
+                .header("Accept", "application/json")
+                .addHeader("X-Custom-Header", "value1")
+                .addHeader("X-Custom-Header", "value2")
+                .get()
+                .build();
+
+        assertEquals("application/json", request.header("Content-Type"));
+        assertEquals("application/json", request.header("Accept"));
+
+        List<String> customHeaders = request.headers("X-Custom-Header");
+        assertEquals(2, customHeaders.size());
+        assertTrue(customHeaders.contains("value1"));
+        assertTrue(customHeaders.contains("value2"));
+    }
+
+    @Test
+    void testWithoutUrl() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> HttpRequest.newBuilder().get().build());
+    }
+
+    @Test
+    void testHeaderReplacement() {
+        HttpRequest request = HttpRequest.newBuilder()
+                .url("http://localhost:8080/test")
+                .header("Content-Type", "text/plain")
+                .header("Content-Type", "application/json")
+                .get()
+                .build();
+
+        assertEquals("application/json", request.header("Content-Type"));
+    }
+
+    @Test
+    void testMissingHeader() {
+        HttpRequest request =
+                HttpRequest.newBuilder().url("http://localhost:8080/test").get().build();
+
+        assertNull(request.header("X-Missing"));
+        List<String> missing = request.headers("X-Missing");
+        assertNotNull(missing);
+        assertTrue(missing.isEmpty());
+    }
+
+    @Test
+    void testEmptyHeaderValue() {
+        HttpRequest request = HttpRequest.newBuilder()
+                .url("http://localhost:8080/test")
+                .header("X-Empty-Header", "")
+                .get()
+                .build();
+
+        assertEquals("", request.header("X-Empty-Header"));
+    }
+
+    @Test
+    void testNullHeader() {
+        HttpRequest.Builder builder = HttpRequest.newBuilder().url("http://localhost:8080/test");
+        assertThrows(NullPointerException.class, () -> builder.header(null, "value"));
+        assertThrows(NullPointerException.class, () -> builder.header("X-Custom-Header", null));
+        assertThrows(NullPointerException.class, () -> builder.addHeader(null, "value"));
+        assertThrows(NullPointerException.class, () -> builder.addHeader("X-Custom-Header", null));
+    }
 }
diff --git a/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpResponseTest.java b/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpResponseTest.java
index 2bfde756dcc..8e93469478e 100644
--- a/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpResponseTest.java
+++ b/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpResponseTest.java
@@ -22,115 +22,113 @@
 
 @ExtendWith(MockServerExtension.class)
 public class HttpResponseTest {
-  private ClientAndServer server;
-  private HttpClient client;
-  private String baseUrl;
-
-  @BeforeEach
-  void setUp(ClientAndServer server) {
-    this.server = server;
-    this.client = HttpClient.newBuilder().build();
-    this.baseUrl = "http://localhost:" + server.getPort();
-  }
-
-  @AfterEach
-  void tearDown() {
-    this.server.reset();
-  }
-
-  @Test
-  void testBody() throws IOException {
-    org.mockserver.model.HttpRequest expectedRequest =
-        request().withMethod("GET").withPath("/test");
-    String responseBody = "content";
-    this.server.when(expectedRequest).respond(response().withBody(responseBody));
-
-    HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
-    HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
-
-    HttpResponse response = this.client.execute(request);
-
-    assertNotNull(response);
-    assertEquals(200, response.code());
-    assertTrue(response.isSuccessful());
-    try (InputStream body = response.body()) {
-      assertEquals(responseBody, readAll(body));
+    private ClientAndServer server;
+    private HttpClient client;
+    private String baseUrl;
+
+    @BeforeEach
+    void setUp(ClientAndServer server) {
+        this.server = server;
+        this.client = HttpClient.newBuilder().build();
+        this.baseUrl = "http://localhost:" + server.getPort();
     }
-  }
 
-  @Test
-  void testEmptyBody() throws IOException {
-    org.mockserver.model.HttpRequest expectedRequest =
-        request().withMethod("GET").withPath("/test");
-    this.server.when(expectedRequest).respond(response());
+    @AfterEach
+    void tearDown() {
+        this.server.reset();
+    }
+
+    @Test
+    void testBody() throws IOException {
+        org.mockserver.model.HttpRequest expectedRequest =
+                request().withMethod("GET").withPath("/test");
+        String responseBody = "content";
+        this.server.when(expectedRequest).respond(response().withBody(responseBody));
+
+        HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
+        HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
+
+        HttpResponse response = this.client.execute(request);
+
+        assertNotNull(response);
+        assertEquals(200, response.code());
+        assertTrue(response.isSuccessful());
+        try (InputStream body = response.body()) {
+            assertEquals(responseBody, readAll(body));
+        }
+    }
 
-    HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
-    HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
+    @Test
+    void testEmptyBody() throws IOException {
+        org.mockserver.model.HttpRequest expectedRequest =
+                request().withMethod("GET").withPath("/test");
+        this.server.when(expectedRequest).respond(response());
 
-    HttpResponse response = this.client.execute(request);
+        HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
+        HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
 
-    assertNotNull(response);
-    assertEquals(200, response.code());
-    assertTrue(response.isSuccessful());
-    try (InputStream body = response.body()) {
-      assertEquals("", readAll(body));
+        HttpResponse response = this.client.execute(request);
+
+        assertNotNull(response);
+        assertEquals(200, response.code());
+        assertTrue(response.isSuccessful());
+        try (InputStream body = response.body()) {
+            assertEquals("", readAll(body));
+        }
+    }
+
+    @Test
+    void testHeader() throws IOException {
+        org.mockserver.model.HttpRequest expectedRequest =
+                request().withMethod("GET").withPath("/test");
+        org.mockserver.model.HttpResponse resultResponse = response().withHeader("Content-Type", "text/plain");
+        this.server.when(expectedRequest).respond(resultResponse);
+
+        HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
+        HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
+
+        HttpResponse response = this.client.execute(request);
+
+        // case-insensitive
+        assertEquals("text/plain", response.header("Content-Type"));
+        assertEquals("text/plain", response.header("content-type"));
+        assertEquals("text/plain", response.header("CONTENT-TYPE"));
+        // missing header
+        assertNull(response.header("X-Missing-Header"));
+        assertTrue(response.headers("X-Missing-Header").isEmpty());
     }
-  }
-
-  @Test
-  void testHeader() throws IOException {
-    org.mockserver.model.HttpRequest expectedRequest =
-        request().withMethod("GET").withPath("/test");
-    org.mockserver.model.HttpResponse resultResponse =
-        response().withHeader("Content-Type", "text/plain");
-    this.server.when(expectedRequest).respond(resultResponse);
-
-    HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
-    HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
-
-    HttpResponse response = this.client.execute(request);
-
-    // case-insensitive
-    assertEquals("text/plain", response.header("Content-Type"));
-    assertEquals("text/plain", response.header("content-type"));
-    assertEquals("text/plain", response.header("CONTENT-TYPE"));
-    // missing header
-    assertNull(response.header("X-Missing-Header"));
-    assertTrue(response.headers("X-Missing-Header").isEmpty());
-  }
-
-  @Test
-  void testHeaderNames() throws IOException {
-    org.mockserver.model.HttpRequest expectedRequest =
-        request().withMethod("GET").withPath("/test");
-    org.mockserver.model.HttpResponse resultResponse =
-        response()
-            .withHeader("Content-Type", "application/json")
-            .withHeader("X-Custom-Header", "custom-value")
-            .withHeader("X-Another-Header", "another-value");
-    this.server.when(expectedRequest).respond(resultResponse);
-
-    HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
-    HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
-
-    HttpResponse response = this.client.execute(request);
-
-    Set<String> headerNames = response.headerNames();
-    assertTrue(headerNames.contains("Content-Type"));
-    assertTrue(headerNames.contains("X-Custom-Header"));
-    assertTrue(headerNames.contains("X-Another-Header"));
-  }
-
-  private String readAll(InputStream in) throws IOException {
-    BufferedReader reader = new BufferedReader(new InputStreamReader(in, UTF_8));
-    StringBuilder sb = new StringBuilder();
-    String line;
-    while ((line = reader.readLine()) != null) {
-      if (sb.length() > 0) {
-        sb.append('\n');
-      }
-      sb.append(line);
+
+    @Test
+    void testHeaderNames() throws IOException {
+        org.mockserver.model.HttpRequest expectedRequest =
+                request().withMethod("GET").withPath("/test");
+        org.mockserver.model.HttpResponse resultResponse = response()
+                .withHeader("Content-Type", "application/json")
+                .withHeader("X-Custom-Header", "custom-value")
+                .withHeader("X-Another-Header", "another-value");
+        this.server.when(expectedRequest).respond(resultResponse);
+
+        HttpUrl url = HttpUrl.parse(this.baseUrl + "/test");
+        HttpRequest request = HttpRequest.newBuilder().url(url).get().build();
+
+        HttpResponse response = this.client.execute(request);
+
+        Set<String> headerNames = response.headerNames();
+        assertTrue(headerNames.contains("Content-Type"));
+        assertTrue(headerNames.contains("X-Custom-Header"));
+        assertTrue(headerNames.contains("X-Another-Header"));
+    }
+
+    private String readAll(InputStream in) throws IOException {
+        BufferedReader reader = new BufferedReader(new InputStreamReader(in, UTF_8));
+        StringBuilder sb = new StringBuilder();
+        String line;
+        while ((line = reader.readLine()) != null) {
+            if (sb.length() > 0) {
+                sb.append('\n');
+            }
+            sb.append(line);
+        }
+        return sb.toString();
     }
-    return sb.toString();
-  }
 }
diff --git a/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpUrlTest.java b/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpUrlTest.java
index da4f6f1b513..8897cff7b85 100644
--- a/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpUrlTest.java
+++ b/components/http/http-api/src/testFixtures/java/datadog/http/client/HttpUrlTest.java
@@ -12,414 +12,414 @@
 // Mostly a bunch of generated tests to ensure similar behavior of the different implementations
 public class HttpUrlTest {
 
-  // ==================== parse() tests ====================
-
-  @Test
-  void testParseSimpleUrl() {
-    HttpUrl url = HttpUrl.parse("https://example.com");
-
-    assertNotNull(url);
-    assertEquals("https", url.scheme());
-    assertEquals("example.com", url.host());
-    assertEquals(443, url.port());
-  }
-
-  @Test
-  void testParseUrlWithPort() {
-    HttpUrl url = HttpUrl.parse("http://localhost:8080");
-
-    assertEquals("http", url.scheme());
-    assertEquals("localhost", url.host());
-    assertEquals(8080, url.port());
-  }
-
-  @Test
-  void testParseUrlWithPath() {
-    HttpUrl url = HttpUrl.parse("https://example.com/api/v1/users");
-
-    assertEquals("https", url.scheme());
-    assertEquals("example.com", url.host());
-    assertTrue(url.url().contains("/api/v1/users"));
-  }
-
-  @Test
-  void testParseUrlWithQueryParameters() {
-    HttpUrl url = HttpUrl.parse("https://example.com/search?q=test&page=1");
-
-    assertTrue(url.url().contains("q=test"));
-    assertTrue(url.url().contains("page=1"));
-  }
-
-  @Test
-  void testParseInvalidUrl() {
-    assertThrows(IllegalArgumentException.class, () -> HttpUrl.parse("not a valid url"));
-  }
-
-  @Test
-  void testParseNullUrl() {
-    assertThrows(NullPointerException.class, () -> HttpUrl.parse(null));
-  }
-
-  // ==================== from(URI) tests ====================
-
-  @Test
-  void testFromUri() {
-    URI uri = URI.create("https://example.com:8443/path");
-    HttpUrl url = HttpUrl.from(uri);
-
-    assertNotNull(url);
-    assertEquals("https", url.scheme());
-    assertEquals("example.com", url.host());
-    assertEquals(8443, url.port());
-    assertTrue(url.url().contains("/path"));
-  }
-
-  @Test
-  void testFromUriNull() {
-    assertThrows(NullPointerException.class, () -> HttpUrl.from(null));
-  }
-
-  // ==================== scheme() tests ====================
-
-  @Test
-  void testSchemeHttp() {
-    HttpUrl url = HttpUrl.parse("http://example.com");
-    assertEquals("http", url.scheme());
-  }
-
-  @Test
-  void testSchemeHttps() {
-    HttpUrl url = HttpUrl.parse("https://example.com");
-    assertEquals("https", url.scheme());
-  }
-
-  // ==================== host() tests ====================
-
-  @Test
-  void testHostDomain() {
-    HttpUrl url = HttpUrl.parse("https://www.example.com");
-    assertEquals("www.example.com", url.host());
-  }
-
-  @Test
-  void testHostLocalhost() {
-    HttpUrl url = HttpUrl.parse("http://localhost:8080");
-    assertEquals("localhost", url.host());
-  }
-
-  @Test
-  void testHostIpAddress() {
-    HttpUrl url = HttpUrl.parse("http://192.168.1.1:8080");
-    assertEquals("192.168.1.1", url.host());
-  }
-
-  // ==================== port() tests ====================
-
-  @Test
-  void testPortExplicit() {
-    HttpUrl url = HttpUrl.parse("https://example.com:8443");
-    assertEquals(8443, url.port());
-  }
-
-  @Test
-  void testPortDefaultHttp() {
-    HttpUrl url = HttpUrl.parse("http://example.com");
-    assertEquals(80, url.port());
-  }
-
-  @Test
-  void testPortDefaultHttps() {
-    HttpUrl url = HttpUrl.parse("https://example.com");
-    assertEquals(443, url.port());
-  }
-
-  // ==================== resolve() tests ====================
-
-  @Test
-  void testResolveRelativePath() {
-    HttpUrl baseUrl = HttpUrl.parse("https://example.com/api");
-    HttpUrl resolved = baseUrl.resolve("users");
-
-    assertTrue(resolved.url().contains("example.com"));
-    assertTrue(resolved.url().contains("users"));
-  }
-
-  @Test
-  void testResolveAbsolutePath() {
-    HttpUrl baseUrl = HttpUrl.parse("https://example.com/api/v1");
-    HttpUrl resolved = baseUrl.resolve("/v2/users");
-
-    assertTrue(resolved.url().contains("example.com"));
-    assertTrue(resolved.url().contains("/v2/users"));
-    assertFalse(resolved.url().contains("/api"));
-  }
-
-  @Test
-  void testResolveWithQueryParameters() {
-    HttpUrl baseUrl = HttpUrl.parse("https://example.com/api");
-    HttpUrl resolved = baseUrl.resolve("search?q=test");
-
-    assertTrue(resolved.url().contains("search"));
-    assertTrue(resolved.url().contains("q=test"));
-  }
-
-  // ==================== newBuilder() tests ====================
-
-  @Test
-  void testNewBuilderPreservesUrl() {
-    HttpUrl original = HttpUrl.parse("https://example.com:8443/api");
-    HttpUrl rebuilt = original.newBuilder().build();
-
-    assertEquals(original.scheme(), rebuilt.scheme());
-    assertEquals(original.host(), rebuilt.host());
-    assertEquals(original.port(), rebuilt.port());
-  }
-
-  @Test
-  void testNewBuilderAllowsModification() {
-    HttpUrl original = HttpUrl.parse("https://example.com/api");
-    HttpUrl modified = original.newBuilder().addPathSegment("v2").build();
-
-    assertTrue(modified.url().contains("/api"));
-    assertTrue(modified.url().contains("v2"));
-  }
-
-  // ==================== addPathSegment() tests ====================
-
-  @Test
-  void testAddPathSegmentSingle() {
-    HttpUrl url =
-        HttpUrl.builder().scheme("https").host("example.com").addPathSegment("api").build();
-
-    assertTrue(url.url().contains("/api"));
-  }
-
-  @Test
-  void testAddPathSegmentMultiple() {
-    HttpUrl url =
-        HttpUrl.builder()
-            .scheme("https")
-            .host("example.com")
-            .addPathSegment("api")
-            .addPathSegment("v1")
-            .addPathSegment("users")
-            .build();
-
-    String urlString = url.url();
-    assertTrue(urlString.contains("/api"));
-    assertTrue(urlString.contains("/v1"));
-    assertTrue(urlString.contains("/users"));
-  }
-
-  @Test
-  void testAddPathSegmentWithPort() {
-    HttpUrl url =
-        HttpUrl.builder()
-            .scheme("https")
-            .host("example.com")
-            .port(8443)
-            .addPathSegment("api")
-            .build();
-
-    String urlString = url.url();
-    assertTrue(urlString.contains(":8443"));
-    assertTrue(urlString.contains("/api"));
-  }
-
-  // ==================== builder scheme/host/port tests ====================
-
-  @Test
-  void testBuilderSchemeHostPort() {
-    HttpUrl url = HttpUrl.builder().scheme("https").host("api.example.com").port(8443).build();
-
-    assertEquals("https", url.scheme());
-    assertEquals("api.example.com", url.host());
-    assertEquals(8443, url.port());
-  }
-
-  @Test
-  void testBuilderDefaultScheme() {
-    HttpUrl url = HttpUrl.builder().host("example.com").build();
-
-    assertEquals("http", url.scheme());
-  }
-
-  // ==================== addQueryParameter() tests ====================
-
-  @Test
-  void testAddQueryParameterSingle() {
-    HttpUrl url =
-        HttpUrl.builder()
-            .scheme("https")
-            .host("example.com")
-            .addQueryParameter("key", "value")
-            .build();
-
-    String urlString = url.url();
-    // OkHttp adds trailing slash, JDK doesn't - both are valid
-    assertTrue(
-        urlString.matches("https://example\\.com/?\\?key=value"),
-        "Expected URL with query parameter, got: " + urlString);
-  }
-
-  @Test
-  void testAddQueryParameterMultiple() {
-    HttpUrl url =
-        HttpUrl.builder()
-            .scheme("https")
-            .host("example.com")
-            .addQueryParameter("key1", "value1")
-            .addQueryParameter("key2", "value2")
-            .addQueryParameter("key3", "value3")
-            .build();
-
-    String urlString = url.url();
-    // OkHttp adds trailing slash, JDK doesn't - both are valid
-    assertTrue(
-        urlString.matches("https://example\\.com/?\\?.*"),
-        "Expected URL with query parameters, got: " + urlString);
-    assertTrue(urlString.contains("key1=value1"));
-    assertTrue(urlString.contains("key2=value2"));
-    assertTrue(urlString.contains("key3=value3"));
-    assertTrue(urlString.contains("&"));
-  }
-
-  @Test
-  void testAddQueryParameterWithNullValue() {
-    HttpUrl url =
-        HttpUrl.builder()
-            .scheme("https")
-            .host("example.com")
-            .addQueryParameter("flag", null)
-            .build();
-
-    String urlString = url.url();
-    assertTrue(urlString.contains("flag"));
-    assertFalse(urlString.contains("="));
-    assertFalse(urlString.contains("null"));
-  }
-
-  @Test
-  void testAddQueryParameterWithEncoding() {
-    HttpUrl url =
-        HttpUrl.builder()
-            .scheme("https")
-            .host("example.com")
-            .addQueryParameter("message", "hello world")
-            .addQueryParameter("special", "a=b&c=d")
-            .build();
-
-    String urlString = url.url();
-    // Values should be URL encoded - accept both + and %20 for space
-    assertTrue(
-        urlString.contains("message=hello+world") || urlString.contains("message=hello%20world"),
-        "Expected encoded space in URL, got: " + urlString);
-    assertTrue(
-        urlString.contains("special=a%3Db%26c%3Dd"),
-        "Expected encoded special chars in URL, got: " + urlString);
-  }
-
-  @Test
-  void testAddQueryParameterWithPath() {
-    HttpUrl url =
-        HttpUrl.builder()
-            .scheme("https")
-            .host("example.com")
-            .addPathSegment("api")
-            .addPathSegment("v1")
-            .addQueryParameter("page", "1")
-            .addQueryParameter("limit", "10")
-            .build();
-
-    String urlString = url.url();
-    assertTrue(urlString.contains("example.com/api/v1"));
-    assertTrue(urlString.contains("page=1"));
-    assertTrue(urlString.contains("limit=10"));
-  }
-
-  @Test
-  void testAddQueryParameterFromExistingUrl() {
-    HttpUrl baseUrl = HttpUrl.parse("https://example.com/api");
-    HttpUrl url = baseUrl.newBuilder().addQueryParameter("token", "abc123").build();
-
-    String urlString = url.url();
-    assertTrue(urlString.contains("example.com/api"));
-    assertTrue(urlString.contains("token=abc123"));
-  }
-
-  @Test
-  void testAddQueryParameterPreservesExistingQuery() {
-    HttpUrl baseUrl = HttpUrl.parse("https://example.com/api?existing=param");
-    HttpUrl url = baseUrl.newBuilder().addQueryParameter("new", "value").build();
-
-    String urlString = url.url();
-    assertTrue(urlString.contains("existing=param"));
-    assertTrue(urlString.contains("new=value"));
-  }
-
-  @Test
-  void testAddQueryParameterEmptyValue() {
-    HttpUrl url =
-        HttpUrl.builder().scheme("https").host("example.com").addQueryParameter("key", "").build();
-
-    String urlString = url.url();
-    assertTrue(urlString.contains("key="));
-  }
-
-  @Test
-  void testAddQueryParameterSpecialCharactersInName() {
-    HttpUrl url =
-        HttpUrl.builder()
-            .scheme("https")
-            .host("example.com")
-            .addQueryParameter("my-key", "value")
-            .addQueryParameter("my_key", "value2")
-            .build();
-
-    String urlString = url.url();
-    assertTrue(urlString.contains("my-key=value"));
-    assertTrue(urlString.contains("my_key=value2"));
-  }
-
-  @Test
-  void testAddQueryParameterWithPort() {
-    HttpUrl url =
-        HttpUrl.builder()
-            .scheme("https")
-            .host("example.com")
-            .port(8443)
-            .addQueryParameter("key", "value")
-            .build();
-
-    String urlString = url.url();
-    assertTrue(urlString.contains(":8443"));
-    assertTrue(urlString.contains("key=value"));
-  }
-
-  // ==================== url() tests ====================
-
-  @Test
-  void testUrlReturnsCompleteUrl() {
-    HttpUrl url =
-        HttpUrl.builder()
-            .scheme("https")
-            .host("example.com")
-            .port(8443)
-            .addPathSegment("api")
-            .addQueryParameter("key", "value")
-            .build();
-
-    String urlString = url.url();
-    assertTrue(urlString.startsWith("https://"));
-    assertTrue(urlString.contains("example.com"));
-    assertTrue(urlString.contains(":8443"));
-    assertTrue(urlString.contains("/api"));
-    assertTrue(urlString.contains("key=value"));
-  }
-
-  @Test
-  void testUrlMatchesToString() {
-    HttpUrl url = HttpUrl.parse("https://example.com/api");
-    assertEquals(url.url(), url.toString());
-  }
+    // ==================== parse() tests ====================
+
+    @Test
+    void testParseSimpleUrl() {
+        HttpUrl url = HttpUrl.parse("https://example.com");
+
+        assertNotNull(url);
+        assertEquals("https", url.scheme());
+        assertEquals("example.com", url.host());
+        assertEquals(443, url.port());
+    }
+
+    @Test
+    void testParseUrlWithPort() {
+        HttpUrl url = HttpUrl.parse("http://localhost:8080");
+
+        assertEquals("http", url.scheme());
+        assertEquals("localhost", url.host());
+        assertEquals(8080, url.port());
+    }
+
+    @Test
+    void testParseUrlWithPath() {
+        HttpUrl url = HttpUrl.parse("https://example.com/api/v1/users");
+
+        assertEquals("https", url.scheme());
+        assertEquals("example.com", url.host());
+        assertTrue(url.url().contains("/api/v1/users"));
+    }
+
+    @Test
+    void testParseUrlWithQueryParameters() {
+        HttpUrl url = HttpUrl.parse("https://example.com/search?q=test&page=1");
+
+        assertTrue(url.url().contains("q=test"));
+        assertTrue(url.url().contains("page=1"));
+    }
+
+    @Test
+    void testParseInvalidUrl() {
+        assertThrows(IllegalArgumentException.class, () -> HttpUrl.parse("not a valid url"));
+    }
+
+    @Test
+    void testParseNullUrl() {
+        assertThrows(NullPointerException.class, () -> HttpUrl.parse(null));
+    }
+
+    // ==================== from(URI) tests ====================
+
+    @Test
+    void testFromUri() {
+        URI uri = URI.create("https://example.com:8443/path");
+        HttpUrl url = HttpUrl.from(uri);
+
+        assertNotNull(url);
+        assertEquals("https", url.scheme());
+        assertEquals("example.com", url.host());
+        assertEquals(8443, url.port());
+        assertTrue(url.url().contains("/path"));
+    }
+
+    @Test
+    void testFromUriNull() {
+        assertThrows(NullPointerException.class, () -> HttpUrl.from(null));
+    }
+
+    // ==================== scheme() tests ====================
+
+    @Test
+    void testSchemeHttp() {
+        HttpUrl url = HttpUrl.parse("http://example.com");
+        assertEquals("http", url.scheme());
+    }
+
+    @Test
+    void testSchemeHttps() {
+        HttpUrl url = HttpUrl.parse("https://example.com");
+        assertEquals("https", url.scheme());
+    }
+
+    // ==================== host() tests ====================
+
+    @Test
+    void testHostDomain() {
+        HttpUrl url = HttpUrl.parse("https://www.example.com");
+        assertEquals("www.example.com", url.host());
+    }
+
+    @Test
+    void testHostLocalhost() {
+        HttpUrl url = HttpUrl.parse("http://localhost:8080");
+        assertEquals("localhost", url.host());
+    }
+
+    @Test
+    void testHostIpAddress() {
+        HttpUrl url = HttpUrl.parse("http://192.168.1.1:8080");
+        assertEquals("192.168.1.1", url.host());
+    }
+
+    // ==================== port() tests ====================
+
+    @Test
+    void testPortExplicit() {
+        HttpUrl url = HttpUrl.parse("https://example.com:8443");
+        assertEquals(8443, url.port());
+    }
+
+    @Test
+    void testPortDefaultHttp() {
+        HttpUrl url = HttpUrl.parse("http://example.com");
+        assertEquals(80, url.port());
+    }
+
+    @Test
+    void testPortDefaultHttps() {
+        HttpUrl url = HttpUrl.parse("https://example.com");
+        assertEquals(443, url.port());
+    }
+
+    // ==================== resolve() tests ====================
+
+    @Test
+    void testResolveRelativePath() {
+        HttpUrl baseUrl = HttpUrl.parse("https://example.com/api");
+        HttpUrl resolved = baseUrl.resolve("users");
+
+        assertTrue(resolved.url().contains("example.com"));
+        assertTrue(resolved.url().contains("users"));
+    }
+
+    @Test
+    void testResolveAbsolutePath() {
+        HttpUrl baseUrl = HttpUrl.parse("https://example.com/api/v1");
+        HttpUrl resolved = baseUrl.resolve("/v2/users");
+
+        assertTrue(resolved.url().contains("example.com"));
+        assertTrue(resolved.url().contains("/v2/users"));
+        assertFalse(resolved.url().contains("/api"));
+    }
+
+    @Test
+    void testResolveWithQueryParameters() {
+        HttpUrl baseUrl = HttpUrl.parse("https://example.com/api");
+        HttpUrl resolved = baseUrl.resolve("search?q=test");
+
+        assertTrue(resolved.url().contains("search"));
+        assertTrue(resolved.url().contains("q=test"));
+    }
+
+    // ==================== newBuilder() tests ====================
+
+    @Test
+    void testNewBuilderPreservesUrl() {
+        HttpUrl original = HttpUrl.parse("https://example.com:8443/api");
+        HttpUrl rebuilt = original.newBuilder().build();
+
+        assertEquals(original.scheme(), rebuilt.scheme());
+        assertEquals(original.host(), rebuilt.host());
+        assertEquals(original.port(), rebuilt.port());
+    }
+
+    @Test
+    void testNewBuilderAllowsModification() {
+        HttpUrl original = HttpUrl.parse("https://example.com/api");
+        HttpUrl modified = original.newBuilder().addPathSegment("v2").build();
+
+        assertTrue(modified.url().contains("/api"));
+        assertTrue(modified.url().contains("v2"));
+    }
+
+    // ==================== addPathSegment() tests ====================
+
+    @Test
+    void testAddPathSegmentSingle() {
+        HttpUrl url = HttpUrl.builder()
+                .scheme("https")
+                .host("example.com")
+                .addPathSegment("api")
+                .build();
+
+        assertTrue(url.url().contains("/api"));
+    }
+
+    @Test
+    void testAddPathSegmentMultiple() {
+        HttpUrl url = HttpUrl.builder()
+                .scheme("https")
+                .host("example.com")
+                .addPathSegment("api")
+                .addPathSegment("v1")
+                .addPathSegment("users")
+                .build();
+
+        String urlString = url.url();
+        assertTrue(urlString.contains("/api"));
+        assertTrue(urlString.contains("/v1"));
+        assertTrue(urlString.contains("/users"));
+    }
+
+    @Test
+    void testAddPathSegmentWithPort() {
+        HttpUrl url = HttpUrl.builder()
+                .scheme("https")
+                .host("example.com")
+                .port(8443)
+                .addPathSegment("api")
+                .build();
+
+        String urlString = url.url();
+        assertTrue(urlString.contains(":8443"));
+        assertTrue(urlString.contains("/api"));
+    }
+
+    // ==================== builder scheme/host/port tests ====================
+
+    @Test
+    void testBuilderSchemeHostPort() {
+        HttpUrl url = HttpUrl.builder()
+                .scheme("https")
+                .host("api.example.com")
+                .port(8443)
+                .build();
+
+        assertEquals("https", url.scheme());
+        assertEquals("api.example.com", url.host());
+        assertEquals(8443, url.port());
+    }
+
+    @Test
+    void testBuilderDefaultScheme() {
+        HttpUrl url = HttpUrl.builder().host("example.com").build();
+
+        assertEquals("http", url.scheme());
+    }
+
+    // ==================== addQueryParameter() tests ====================
+
+    @Test
+    void testAddQueryParameterSingle() {
+        HttpUrl url = HttpUrl.builder()
+                .scheme("https")
+                .host("example.com")
+                .addQueryParameter("key", "value")
+                .build();
+
+        String urlString = url.url();
+        // OkHttp adds trailing slash, JDK doesn't - both are valid
+        assertTrue(
+                urlString.matches("https://example\\.com/?\\?key=value"),
+                "Expected URL with query parameter, got: " + urlString);
+    }
+
+    @Test
+    void testAddQueryParameterMultiple() {
+        HttpUrl url = HttpUrl.builder()
+                .scheme("https")
+                .host("example.com")
+                .addQueryParameter("key1", "value1")
+                .addQueryParameter("key2", "value2")
+                .addQueryParameter("key3", "value3")
+                .build();
+
+        String urlString = url.url();
+        // OkHttp adds trailing slash, JDK doesn't - both are valid
+        assertTrue(
+                urlString.matches("https://example\\.com/?\\?.*"),
+                "Expected URL with query parameters, got: " + urlString);
+        assertTrue(urlString.contains("key1=value1"));
+        assertTrue(urlString.contains("key2=value2"));
+        assertTrue(urlString.contains("key3=value3"));
+        assertTrue(urlString.contains("&"));
+    }
+
+    @Test
+    void testAddQueryParameterWithNullValue() {
+        HttpUrl url = HttpUrl.builder()
+                .scheme("https")
+                .host("example.com")
+                .addQueryParameter("flag", null)
+                .build();
+
+        String urlString = url.url();
+        assertTrue(urlString.contains("flag"));
+        assertFalse(urlString.contains("="));
+        assertFalse(urlString.contains("null"));
+    }
+
+    @Test
+    void testAddQueryParameterWithEncoding() {
+        HttpUrl url = HttpUrl.builder()
+                .scheme("https")
+                .host("example.com")
+                .addQueryParameter("message", "hello world")
+                .addQueryParameter("special", "a=b&c=d")
+                .build();
+
+        String urlString = url.url();
+        // Values should be URL encoded - accept both + and %20 for space
+        assertTrue(
+                urlString.contains("message=hello+world") || urlString.contains("message=hello%20world"),
+                "Expected encoded space in URL, got: " + urlString);
+        assertTrue(
+                urlString.contains("special=a%3Db%26c%3Dd"),
+                "Expected encoded special chars in URL, got: " + urlString);
+    }
+
+    @Test
+    void testAddQueryParameterWithPath() {
+        HttpUrl url = HttpUrl.builder()
+                .scheme("https")
+                .host("example.com")
+                .addPathSegment("api")
+                .addPathSegment("v1")
+                .addQueryParameter("page", "1")
+                .addQueryParameter("limit", "10")
+                .build();
+
+        String urlString = url.url();
+        assertTrue(urlString.contains("example.com/api/v1"));
+        assertTrue(urlString.contains("page=1"));
+        assertTrue(urlString.contains("limit=10"));
+    }
+
+    @Test
+    void testAddQueryParameterFromExistingUrl() {
+        HttpUrl baseUrl = HttpUrl.parse("https://example.com/api");
+        HttpUrl url = baseUrl.newBuilder().addQueryParameter("token", "abc123").build();
+
+        String urlString = url.url();
+        assertTrue(urlString.contains("example.com/api"));
+        assertTrue(urlString.contains("token=abc123"));
+    }
+
+    @Test
+    void testAddQueryParameterPreservesExistingQuery() {
+        HttpUrl baseUrl = HttpUrl.parse("https://example.com/api?existing=param");
+        HttpUrl url = baseUrl.newBuilder().addQueryParameter("new", "value").build();
+
+        String urlString = url.url();
+        assertTrue(urlString.contains("existing=param"));
+        assertTrue(urlString.contains("new=value"));
+    }
+
+    @Test
+    void testAddQueryParameterEmptyValue() {
+        HttpUrl url = HttpUrl.builder()
+                .scheme("https")
+                .host("example.com")
+                .addQueryParameter("key", "")
+                .build();
+
+        String urlString = url.url();
+        assertTrue(urlString.contains("key="));
+    }
+
+    @Test
+    void testAddQueryParameterSpecialCharactersInName() {
+        HttpUrl url = HttpUrl.builder()
+                .scheme("https")
+                .host("example.com")
+                .addQueryParameter("my-key", "value")
+                .addQueryParameter("my_key", "value2")
+                .build();
+
+        String urlString = url.url();
+        assertTrue(urlString.contains("my-key=value"));
+        assertTrue(urlString.contains("my_key=value2"));
+    }
+
+    @Test
+    void testAddQueryParameterWithPort() {
+        HttpUrl url = HttpUrl.builder()
+                .scheme("https")
+                .host("example.com")
+                .port(8443)
+                .addQueryParameter("key", "value")
+                .build();
+
+        String urlString = url.url();
+        assertTrue(urlString.contains(":8443"));
+        assertTrue(urlString.contains("key=value"));
+    }
+
+    // ==================== url() tests ====================
+
+    @Test
+    void testUrlReturnsCompleteUrl() {
+        HttpUrl url = HttpUrl.builder()
+                .scheme("https")
+                .host("example.com")
+                .port(8443)
+                .addPathSegment("api")
+                .addQueryParameter("key", "value")
+                .build();
+
+        String urlString = url.url();
+        assertTrue(urlString.startsWith("https://"));
+        assertTrue(urlString.contains("example.com"));
+        assertTrue(urlString.contains(":8443"));
+        assertTrue(urlString.contains("/api"));
+        assertTrue(urlString.contains("key=value"));
+    }
+
+    @Test
+    void testUrlMatchesToString() {
+        HttpUrl url = HttpUrl.parse("https://example.com/api");
+        assertEquals(url.url(), url.toString());
+    }
 }
diff --git a/components/json/src/jmh/java/datadog/json/JsonWriterBenchmark.java b/components/json/src/jmh/java/datadog/json/JsonWriterBenchmark.java
index 6e9adc62efc..a67aacaa31a 100644
--- a/components/json/src/jmh/java/datadog/json/JsonWriterBenchmark.java
+++ b/components/json/src/jmh/java/datadog/json/JsonWriterBenchmark.java
@@ -14,93 +14,90 @@
 @Fork(value = 1)
 @SuppressWarnings("unused")
 public class JsonWriterBenchmark {
-  @Benchmark
-  public void writeSimpleArray(Blackhole blackhole) {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer
-          .beginArray()
-          .beginObject()
-          .name("true")
-          .value(true)
-          .endObject()
-          .beginObject()
-          .name("false")
-          .value(false)
-          .endObject()
-          .endArray();
-      blackhole.consume(writer.toString());
+    @Benchmark
+    public void writeSimpleArray(Blackhole blackhole) {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginArray()
+                    .beginObject()
+                    .name("true")
+                    .value(true)
+                    .endObject()
+                    .beginObject()
+                    .name("false")
+                    .value(false)
+                    .endObject()
+                    .endArray();
+            blackhole.consume(writer.toString());
+        }
     }
-  }
 
-  @Benchmark
-  public void writeComplexArray(Blackhole blackhole) {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer
-          .beginArray()
-          .value("first level")
-          .beginArray()
-          .value("second level")
-          .beginArray()
-          .value("third level")
-          .beginObject()
-          .name("key")
-          .value("value")
-          .endObject()
-          .beginObject()
-          .name("key")
-          .value("value")
-          .endObject()
-          .endArray() // second level
-          .beginObject()
-          .name("key")
-          .value("value")
-          .endObject()
-          .endArray() // first level
-          .beginObject()
-          .name("key")
-          .value("value")
-          .endObject()
-          .value("last value")
-          .endArray();
-      blackhole.consume(writer.toString());
+    @Benchmark
+    public void writeComplexArray(Blackhole blackhole) {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginArray()
+                    .value("first level")
+                    .beginArray()
+                    .value("second level")
+                    .beginArray()
+                    .value("third level")
+                    .beginObject()
+                    .name("key")
+                    .value("value")
+                    .endObject()
+                    .beginObject()
+                    .name("key")
+                    .value("value")
+                    .endObject()
+                    .endArray() // second level
+                    .beginObject()
+                    .name("key")
+                    .value("value")
+                    .endObject()
+                    .endArray() // first level
+                    .beginObject()
+                    .name("key")
+                    .value("value")
+                    .endObject()
+                    .value("last value")
+                    .endArray();
+            blackhole.consume(writer.toString());
+        }
     }
-  }
 
-  @Benchmark
-  public void writeComplexObject(Blackhole blackhole) {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer
-          .beginObject()
-          .name("attrs")
-          .beginObject()
-          .name("attr1")
-          .value("value1")
-          .name("attr2")
-          .value("value2")
-          .endObject()
-          .name("data")
-          .beginArray()
-          .beginObject()
-          .name("x")
-          .value(1)
-          .name("y")
-          .value(12.3)
-          .endObject()
-          .beginObject()
-          .name("x")
-          .value(2)
-          .name("y")
-          .value(4.56)
-          .endObject()
-          .beginObject()
-          .name("x")
-          .value(3)
-          .name("y")
-          .value(789)
-          .endObject()
-          .endArray()
-          .endObject();
-      blackhole.consume(writer.toString());
+    @Benchmark
+    public void writeComplexObject(Blackhole blackhole) {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginObject()
+                    .name("attrs")
+                    .beginObject()
+                    .name("attr1")
+                    .value("value1")
+                    .name("attr2")
+                    .value("value2")
+                    .endObject()
+                    .name("data")
+                    .beginArray()
+                    .beginObject()
+                    .name("x")
+                    .value(1)
+                    .name("y")
+                    .value(12.3)
+                    .endObject()
+                    .beginObject()
+                    .name("x")
+                    .value(2)
+                    .name("y")
+                    .value(4.56)
+                    .endObject()
+                    .beginObject()
+                    .name("x")
+                    .value(3)
+                    .name("y")
+                    .value(789)
+                    .endObject()
+                    .endArray()
+                    .endObject();
+            blackhole.consume(writer.toString());
+        }
     }
-  }
 }
diff --git a/components/json/src/main/java/datadog/json/JsonMapper.java b/components/json/src/main/java/datadog/json/JsonMapper.java
index a997d6b9d5b..bb9e3d8e1da 100644
--- a/components/json/src/main/java/datadog/json/JsonMapper.java
+++ b/components/json/src/main/java/datadog/json/JsonMapper.java
@@ -12,210 +12,211 @@
 /** Utility class for simple Java structure mapping into JSON strings. */
 public final class JsonMapper {
 
-  private JsonMapper() {}
-
-  /**
-   * Converts a {@link String} to a JSON string.
-   *
-   * @param string The string to convert.
-   * @return The converted JSON string.
-   */
-  public static String toJson(String string) {
-    if (string == null || string.isEmpty()) {
-      return "";
+    private JsonMapper() {}
+
+    /**
+     * Converts a {@link String} to a JSON string.
+     *
+     * @param string The string to convert.
+     * @return The converted JSON string.
+     */
+    public static String toJson(String string) {
+        if (string == null || string.isEmpty()) {
+            return "";
+        }
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.value(string);
+            return writer.toString();
+        }
+    }
+
+    /**
+     * Converts a {@link Map} to a JSON object.
+     *
+     * @param map The map to convert.
+     * @return The converted JSON object as Java string.
+     */
+    public static String toJson(Map<String, ?> map) {
+        if (map == null || map.isEmpty()) {
+            return "{}";
+        }
+        try (JsonWriter writer = new JsonWriter()) {
+            writeMap(writer, map);
+            return writer.toString();
+        }
+    }
+
+    /**
+     * Writes the map as JSON value to the given mapper.
+     *
+     * @param writer The writer to write the map as value to.
+     * @param map The map to write.
+     */
+    public static void writeAsJsonValue(JsonWriter writer, Map<String, ?> map) {
+        if (writer == null) {
+            throw new NullPointerException("writer cannot be null");
+        }
+        if (map == null) {
+            writer.beginObject();
+            writer.endObject();
+        } else {
+            writeMap(writer, map);
+        }
+    }
+
+    private static void writeMap(JsonWriter writer, Map<String, ?> map) {
+        writer.beginObject();
+        for (Map.Entry<String, ?> entry : map.entrySet()) {
+            writer.name(entry.getKey());
+            Object value = entry.getValue();
+            if (value == null) {
+                writer.nullValue();
+            } else if (value instanceof String) {
+                writer.value((String) value);
+            } else if (value instanceof Double) {
+                writer.value((Double) value);
+            } else if (value instanceof Float) {
+                writer.value((Float) value);
+            } else if (value instanceof Long) {
+                writer.value((Long) value);
+            } else if (value instanceof Integer) {
+                writer.value((Integer) value);
+            } else if (value instanceof Boolean) {
+                writer.value((Boolean) value);
+            } else {
+                writer.value(value.toString());
+            }
+        }
+        writer.endObject();
+    }
+
+    /**
+     * Converts a {@code Collection<String>} to a JSON array.
+     *
+     * @param items The iterable to convert.
+     * @return The converted JSON array as Java string.
+     */
+    @SuppressWarnings("DuplicatedCode")
+    public static String toJson(Collection<String> items) {
+        if (items == null || items.isEmpty()) {
+            return "[]";
+        }
+        try (JsonWriter writer = new JsonWriter()) {
+            writeArray(items, writer);
+            return writer.toString();
+        }
+    }
+
+    /**
+     * Writes the {@code Collection<String>} as a JSON array to the given writer.
+     *
+     * @param items The collection to write.
+     * @param writer The writer to write the collection as JSON array to.
+     */
+    public static void writeAsJsonValue(Collection<String> items, JsonWriter writer) {
+        if (writer == null) {
+            throw new NullPointerException("writer cannot be null");
+        }
+        if (items == null) {
+            writer.beginArray();
+            writer.endArray();
+        } else {
+            writeArray(items, writer);
+        }
+    }
+
+    private static void writeArray(Iterable<String> items, JsonWriter writer) {
+        writer.beginArray();
+        for (String item : items) {
+            writer.value(item);
+        }
+        writer.endArray();
+    }
+
+    /**
+     * Converts a String array to a JSON array.
+     *
+     * @param items The array to convert.
+     * @return The converted JSON array as Java string.
+     */
+    @SuppressWarnings("DuplicatedCode")
+    public static String toJson(String[] items) {
+        if (items == null) {
+            return "[]";
+        }
+        try (JsonWriter writer = new JsonWriter()) {
+            writeArray(items, writer);
+            return writer.toString();
+        }
+    }
+
+    /**
+     * Writes the String array as a JSON array to the given writer.
+     *
+     * @param items The array to write.
+     * @param writer The writer to write the array as JSON array to.
+     */
+    public static void writeAsJsonValue(String[] items, JsonWriter writer) {
+        if (writer == null) {
+            throw new NullPointerException("writer cannot be null");
+        }
+        if (items == null) {
+            writer.beginArray();
+            writer.endArray();
+        } else {
+            writeArray(items, writer);
+        }
+    }
+
+    private static void writeArray(String[] items, JsonWriter writer) {
+        writer.beginArray();
+        for (String item : items) {
+            writer.value(item);
+        }
+        writer.endArray();
+    }
+
+    /**
+     * Parses a JSON string into a {@link Map}.
+     *
+     * @param json The JSON string to parse.
+     * @return A {@link Map} containing the parsed JSON object's key-value pairs.
+     * @throws IOException If the JSON is invalid or a reader error occurs.
+     */
+    @SuppressWarnings("unchecked")
+    public static Map<String, Object> fromJsonToMap(String json) throws IOException {
+        if (json == null || json.isEmpty() || "{}".equals(json) || "null".equals(json)) {
+            return emptyMap();
+        }
+        try (JsonReader reader = new JsonReader(json)) {
+            Object value = reader.nextValue();
+            if (!(value instanceof Map)) {
+                throw new IOException(
+                        "Expected JSON object but was " + value.getClass().getSimpleName());
+            }
+            return (Map<String, Object>) value;
+        }
+    }
+
+    /**
+     * Parses a JSON string array into a {@code List<String>}.
+     *
+     * @param json The JSON string array to parse.
+     * @return A {@code List<String>} containing the parsed JSON strings.
+     * @throws IOException If the JSON is invalid or a reader error occurs.
+     */
+    public static List<String> fromJsonToList(String json) throws IOException {
+        if (json == null || json.isEmpty() || "[]".equals(json) || "null".equals(json)) {
+            return emptyList();
+        }
+        try (JsonReader reader = new JsonReader(json)) {
+            List<String> list = new ArrayList<>();
+            reader.beginArray();
+            while (reader.hasNext()) {
+                list.add(reader.nextString());
+            }
+            reader.endArray();
+            return list;
+        }
     }
-    try (JsonWriter writer = new JsonWriter()) {
-      writer.value(string);
-      return writer.toString();
-    }
-  }
-
-  /**
-   * Converts a {@link Map} to a JSON object.
-   *
-   * @param map The map to convert.
-   * @return The converted JSON object as Java string.
-   */
-  public static String toJson(Map<String, ?> map) {
-    if (map == null || map.isEmpty()) {
-      return "{}";
-    }
-    try (JsonWriter writer = new JsonWriter()) {
-      writeMap(writer, map);
-      return writer.toString();
-    }
-  }
-
-  /**
-   * Writes the map as JSON value to the given mapper.
-   *
-   * @param writer The writer to write the map as value to.
-   * @param map The map to write.
-   */
-  public static void writeAsJsonValue(JsonWriter writer, Map<String, ?> map) {
-    if (writer == null) {
-      throw new NullPointerException("writer cannot be null");
-    }
-    if (map == null) {
-      writer.beginObject();
-      writer.endObject();
-    } else {
-      writeMap(writer, map);
-    }
-  }
-
-  private static void writeMap(JsonWriter writer, Map<String, ?> map) {
-    writer.beginObject();
-    for (Map.Entry<String, ?> entry : map.entrySet()) {
-      writer.name(entry.getKey());
-      Object value = entry.getValue();
-      if (value == null) {
-        writer.nullValue();
-      } else if (value instanceof String) {
-        writer.value((String) value);
-      } else if (value instanceof Double) {
-        writer.value((Double) value);
-      } else if (value instanceof Float) {
-        writer.value((Float) value);
-      } else if (value instanceof Long) {
-        writer.value((Long) value);
-      } else if (value instanceof Integer) {
-        writer.value((Integer) value);
-      } else if (value instanceof Boolean) {
-        writer.value((Boolean) value);
-      } else {
-        writer.value(value.toString());
-      }
-    }
-    writer.endObject();
-  }
-
-  /**
-   * Converts a {@code Collection<String>} to a JSON array.
-   *
-   * @param items The iterable to convert.
-   * @return The converted JSON array as Java string.
-   */
-  @SuppressWarnings("DuplicatedCode")
-  public static String toJson(Collection<String> items) {
-    if (items == null || items.isEmpty()) {
-      return "[]";
-    }
-    try (JsonWriter writer = new JsonWriter()) {
-      writeArray(items, writer);
-      return writer.toString();
-    }
-  }
-
-  /**
-   * Writes the {@code Collection<String>} as a JSON array to the given writer.
-   *
-   * @param items The collection to write.
-   * @param writer The writer to write the collection as JSON array to.
-   */
-  public static void writeAsJsonValue(Collection<String> items, JsonWriter writer) {
-    if (writer == null) {
-      throw new NullPointerException("writer cannot be null");
-    }
-    if (items == null) {
-      writer.beginArray();
-      writer.endArray();
-    } else {
-      writeArray(items, writer);
-    }
-  }
-
-  private static void writeArray(Iterable<String> items, JsonWriter writer) {
-    writer.beginArray();
-    for (String item : items) {
-      writer.value(item);
-    }
-    writer.endArray();
-  }
-
-  /**
-   * Converts a String array to a JSON array.
-   *
-   * @param items The array to convert.
-   * @return The converted JSON array as Java string.
-   */
-  @SuppressWarnings("DuplicatedCode")
-  public static String toJson(String[] items) {
-    if (items == null) {
-      return "[]";
-    }
-    try (JsonWriter writer = new JsonWriter()) {
-      writeArray(items, writer);
-      return writer.toString();
-    }
-  }
-
-  /**
-   * Writes the String array as a JSON array to the given writer.
-   *
-   * @param items The array to write.
-   * @param writer The writer to write the array as JSON array to.
-   */
-  public static void writeAsJsonValue(String[] items, JsonWriter writer) {
-    if (writer == null) {
-      throw new NullPointerException("writer cannot be null");
-    }
-    if (items == null) {
-      writer.beginArray();
-      writer.endArray();
-    } else {
-      writeArray(items, writer);
-    }
-  }
-
-  private static void writeArray(String[] items, JsonWriter writer) {
-    writer.beginArray();
-    for (String item : items) {
-      writer.value(item);
-    }
-    writer.endArray();
-  }
-
-  /**
-   * Parses a JSON string into a {@link Map}.
-   *
-   * @param json The JSON string to parse.
-   * @return A {@link Map} containing the parsed JSON object's key-value pairs.
-   * @throws IOException If the JSON is invalid or a reader error occurs.
-   */
-  @SuppressWarnings("unchecked")
-  public static Map<String, Object> fromJsonToMap(String json) throws IOException {
-    if (json == null || json.isEmpty() || "{}".equals(json) || "null".equals(json)) {
-      return emptyMap();
-    }
-    try (JsonReader reader = new JsonReader(json)) {
-      Object value = reader.nextValue();
-      if (!(value instanceof Map)) {
-        throw new IOException("Expected JSON object but was " + value.getClass().getSimpleName());
-      }
-      return (Map<String, Object>) value;
-    }
-  }
-
-  /**
-   * Parses a JSON string array into a {@code List<String>}.
-   *
-   * @param json The JSON string array to parse.
-   * @return A {@code List<String>} containing the parsed JSON strings.
-   * @throws IOException If the JSON is invalid or a reader error occurs.
-   */
-  public static List<String> fromJsonToList(String json) throws IOException {
-    if (json == null || json.isEmpty() || "[]".equals(json) || "null".equals(json)) {
-      return emptyList();
-    }
-    try (JsonReader reader = new JsonReader(json)) {
-      List<String> list = new ArrayList<>();
-      reader.beginArray();
-      while (reader.hasNext()) {
-        list.add(reader.nextString());
-      }
-      reader.endArray();
-      return list;
-    }
-  }
 }
diff --git a/components/json/src/main/java/datadog/json/JsonReader.java b/components/json/src/main/java/datadog/json/JsonReader.java
index 771617cf0a2..2cc0d253530 100644
--- a/components/json/src/main/java/datadog/json/JsonReader.java
+++ b/components/json/src/main/java/datadog/json/JsonReader.java
@@ -13,503 +13,499 @@
  * checks unless using the lenient mode.
  */
 public class JsonReader implements AutoCloseable {
-  private static final int BUFFER_SIZE = 1024;
-  private final Reader reader;
-  private final char[] buffer = new char[BUFFER_SIZE];
-  private final JsonStructure structure;
-  private int position = 0;
-  private int limit = 0;
-  private int lineNumber = 1;
-  private int linePosition = 0;
-
-  /** Creates a reader with structure check. */
-  public JsonReader(String json) {
-    this(new StringReader(json), true);
-  }
-
-  /** Creates a reader with structure check. */
-  public JsonReader(Reader reader) {
-    this(reader, true);
-  }
-
-  /**
-   * Creates a reader.
-   *
-   * @param reader The source reader.
-   * @param safe {@code true} to use safe structure check, {@code false} for lenient mode.
-   */
-  public JsonReader(Reader reader, boolean safe) {
-    if (reader == null) {
-      throw new IllegalArgumentException("reader cannot be null");
+    private static final int BUFFER_SIZE = 1024;
+    private final Reader reader;
+    private final char[] buffer = new char[BUFFER_SIZE];
+    private final JsonStructure structure;
+    private int position = 0;
+    private int limit = 0;
+    private int lineNumber = 1;
+    private int linePosition = 0;
+
+    /** Creates a reader with structure check. */
+    public JsonReader(String json) {
+        this(new StringReader(json), true);
     }
-    this.reader = reader;
-    this.structure = safe ? new SafeJsonStructure() : new LenientJsonStructure();
-  }
-
-  /**
-   * Begins reading a JSON object.
-   *
-   * @return This reader instance.
-   * @throws IOException If an I/O error occurs.
-   */
-  public JsonReader beginObject() throws IOException {
-    char c = advanceUpToNextValueChar();
-    if (c != '{') {
-      throw unexpectedSyntaxError("'{'", c);
+
+    /** Creates a reader with structure check. */
+    public JsonReader(Reader reader) {
+        this(reader, true);
+    }
+
+    /**
+     * Creates a reader.
+     *
+     * @param reader The source reader.
+     * @param safe {@code true} to use safe structure check, {@code false} for lenient mode.
+     */
+    public JsonReader(Reader reader, boolean safe) {
+        if (reader == null) {
+            throw new IllegalArgumentException("reader cannot be null");
+        }
+        this.reader = reader;
+        this.structure = safe ? new SafeJsonStructure() : new LenientJsonStructure();
+    }
+
+    /**
+     * Begins reading a JSON object.
+     *
+     * @return This reader instance.
+     * @throws IOException If an I/O error occurs.
+     */
+    public JsonReader beginObject() throws IOException {
+        char c = advanceUpToNextValueChar();
+        if (c != '{') {
+            throw unexpectedSyntaxError("'{'", c);
+        }
+        advance();
+        this.structure.beginObject();
+        return this;
     }
-    advance();
-    this.structure.beginObject();
-    return this;
-  }
-
-  /**
-   * Ends reading a JSON object.
-   *
-   * @return This reader instance.
-   * @throws IOException If an I/O error occurs.
-   */
-  public JsonReader endObject() throws IOException {
-    consumeWhitespace();
-    char c = peek();
-    if (c != '}') {
-      throw unexpectedSyntaxError("'}'", c);
+
+    /**
+     * Ends reading a JSON object.
+     *
+     * @return This reader instance.
+     * @throws IOException If an I/O error occurs.
+     */
+    public JsonReader endObject() throws IOException {
+        consumeWhitespace();
+        char c = peek();
+        if (c != '}') {
+            throw unexpectedSyntaxError("'}'", c);
+        }
+        advance();
+        this.structure.endObject();
+        return this;
     }
-    advance();
-    this.structure.endObject();
-    return this;
-  }
-
-  /**
-   * Begins reading a JSON array.
-   *
-   * @return This reader instance.
-   * @throws IOException If an I/O error occurs.
-   */
-  public JsonReader beginArray() throws IOException {
-    char c = advanceUpToNextValueChar();
-    if (c != '[') {
-      throw unexpectedSyntaxError("'['", c);
+
+    /**
+     * Begins reading a JSON array.
+     *
+     * @return This reader instance.
+     * @throws IOException If an I/O error occurs.
+     */
+    public JsonReader beginArray() throws IOException {
+        char c = advanceUpToNextValueChar();
+        if (c != '[') {
+            throw unexpectedSyntaxError("'['", c);
+        }
+        advance();
+        this.structure.beginArray();
+        return this;
     }
-    advance();
-    this.structure.beginArray();
-    return this;
-  }
-
-  /**
-   * Ends reading a JSON array.
-   *
-   * @return This reader instance.
-   * @throws IOException If an I/O error occurs.
-   */
-  public JsonReader endArray() throws IOException {
-    consumeWhitespace();
-    char c = peek();
-    if (c != ']') {
-      throw unexpectedSyntaxError("']'", c);
+
+    /**
+     * Ends reading a JSON array.
+     *
+     * @return This reader instance.
+     * @throws IOException If an I/O error occurs.
+     */
+    public JsonReader endArray() throws IOException {
+        consumeWhitespace();
+        char c = peek();
+        if (c != ']') {
+            throw unexpectedSyntaxError("']'", c);
+        }
+        advance();
+        this.structure.endArray();
+        return this;
     }
-    advance();
-    this.structure.endArray();
-    return this;
-  }
-
-  /**
-   * Reads the next property name in an object.
-   *
-   * @return The property name or null if the object is empty or ended.
-   * @throws IOException If an I/O error occurs.
-   */
-  public String nextName() throws IOException {
-    char c = advanceUpToNextValueChar();
-    if (c == '}') {
-      return null;
+
+    /**
+     * Reads the next property name in an object.
+     *
+     * @return The property name or null if the object is empty or ended.
+     * @throws IOException If an I/O error occurs.
+     */
+    public String nextName() throws IOException {
+        char c = advanceUpToNextValueChar();
+        if (c == '}') {
+            return null;
+        }
+        if (c != '"') {
+            throw unexpectedSyntaxError("'\"'", c);
+        }
+        String name = readString();
+        consumeWhitespace();
+        c = peek();
+        if (c != ':') {
+            throw unexpectedSyntaxError("':'", c);
+        }
+        advance();
+        this.structure.addName();
+        return name;
     }
-    if (c != '"') {
-      throw unexpectedSyntaxError("'\"'", c);
+
+    /**
+     * Checks if the current value is null.
+     *
+     * @return true if the value is null.
+     * @throws IOException If an I/O error occurs.
+     */
+    public boolean isNull() throws IOException {
+        return advanceUpToNextValueChar() == 'n';
     }
-    String name = readString();
-    consumeWhitespace();
-    c = peek();
-    if (c != ':') {
-      throw unexpectedSyntaxError("':'", c);
+
+    /**
+     * Reads a boolean value.
+     *
+     * @return The boolean value.
+     * @throws IOException If an I/O error occurs.
+     */
+    public boolean nextBoolean() throws IOException {
+        char c = advanceUpToNextValueChar();
+        String value;
+        if (c == 't') {
+            value = readLiteral(4);
+            if (!"true".equals(value)) {
+                throw unexpectedSyntaxError("'true'", value);
+            }
+            return true;
+        } else if (c == 'f') {
+            value = readLiteral(5);
+            if (!"false".equals(value)) {
+                throw unexpectedSyntaxError("'false'", value);
+            }
+            return false;
+        }
+        throw unexpectedSyntaxError("'true' or 'false", c);
     }
-    advance();
-    this.structure.addName();
-    return name;
-  }
-
-  /**
-   * Checks if the current value is null.
-   *
-   * @return true if the value is null.
-   * @throws IOException If an I/O error occurs.
-   */
-  public boolean isNull() throws IOException {
-    return advanceUpToNextValueChar() == 'n';
-  }
-
-  /**
-   * Reads a boolean value.
-   *
-   * @return The boolean value.
-   * @throws IOException If an I/O error occurs.
-   */
-  public boolean nextBoolean() throws IOException {
-    char c = advanceUpToNextValueChar();
-    String value;
-    if (c == 't') {
-      value = readLiteral(4);
-      if (!"true".equals(value)) {
-        throw unexpectedSyntaxError("'true'", value);
-      }
-      return true;
-    } else if (c == 'f') {
-      value = readLiteral(5);
-      if (!"false".equals(value)) {
-        throw unexpectedSyntaxError("'false'", value);
-      }
-      return false;
+
+    /**
+     * Reads a string value.
+     *
+     * @return The string value.
+     * @throws IOException If an I/O error occurs.
+     */
+    public String nextString() throws IOException {
+        char c = advanceUpToNextValueChar();
+        if (c != '"') {
+            throw unexpectedSyntaxError("'\"'", c);
+        }
+        return readString();
     }
-    throw unexpectedSyntaxError("'true' or 'false", c);
-  }
-
-  /**
-   * Reads a string value.
-   *
-   * @return The string value.
-   * @throws IOException If an I/O error occurs.
-   */
-  public String nextString() throws IOException {
-    char c = advanceUpToNextValueChar();
-    if (c != '"') {
-      throw unexpectedSyntaxError("'\"'", c);
+
+    /**
+     * Reads a number as an int value.
+     *
+     * @return The int value.
+     * @throws IOException If the value is not an int, or a reader error occurs.
+     */
+    public int nextInt() throws IOException {
+        String number = readNumber();
+        try {
+            return Integer.parseInt(number);
+        } catch (NumberFormatException e) {
+            throw unexpectedSyntaxError("an integer", number);
+        }
     }
-    return readString();
-  }
-
-  /**
-   * Reads a number as an int value.
-   *
-   * @return The int value.
-   * @throws IOException If the value is not an int, or a reader error occurs.
-   */
-  public int nextInt() throws IOException {
-    String number = readNumber();
-    try {
-      return Integer.parseInt(number);
-    } catch (NumberFormatException e) {
-      throw unexpectedSyntaxError("an integer", number);
+
+    /**
+     * Reads a number as a long value.
+     *
+     * @return The long value.
+     * @throws IOException If the value is not a long, or a reader error occurs.
+     */
+    public long nextLong() throws IOException {
+        String number = readNumber();
+        try {
+            return Long.parseLong(number);
+        } catch (NumberFormatException e) {
+            throw unexpectedSyntaxError("a long", number);
+        }
     }
-  }
-
-  /**
-   * Reads a number as a long value.
-   *
-   * @return The long value.
-   * @throws IOException If the value is not a long, or a reader error occurs.
-   */
-  public long nextLong() throws IOException {
-    String number = readNumber();
-    try {
-      return Long.parseLong(number);
-    } catch (NumberFormatException e) {
-      throw unexpectedSyntaxError("a long", number);
+
+    /**
+     * Reads a number as a double value.
+     *
+     * @return The double value.
+     * @throws IOException If an I/O error occurs.
+     */
+    public double nextDouble() throws IOException {
+        String number = readNumber();
+        try {
+            return Double.parseDouble(number);
+        } catch (NumberFormatException e) {
+            throw unexpectedSyntaxError("a double", number);
+        }
     }
-  }
-
-  /**
-   * Reads a number as a double value.
-   *
-   * @return The double value.
-   * @throws IOException If an I/O error occurs.
-   */
-  public double nextDouble() throws IOException {
-    String number = readNumber();
-    try {
-      return Double.parseDouble(number);
-    } catch (NumberFormatException e) {
-      throw unexpectedSyntaxError("a double", number);
+
+    /**
+     * Checks if there are more elements in the current array or object.
+     *
+     * @return {@code true} if there are more elements, {@code false} otherwise.
+     * @throws IOException If an I/O error occurs.
+     */
+    public boolean hasNext() throws IOException {
+        consumeWhitespace();
+        char c = peek();
+        return c != ']' && c != '}';
     }
-  }
-
-  /**
-   * Checks if there are more elements in the current array or object.
-   *
-   * @return {@code true} if there are more elements, {@code false} otherwise.
-   * @throws IOException If an I/O error occurs.
-   */
-  public boolean hasNext() throws IOException {
-    consumeWhitespace();
-    char c = peek();
-    return c != ']' && c != '}';
-  }
-
-  /**
-   * Reads the next value and automatically detects its type.
-   *
-   * <p>Supported types are:
-   *
-   * <ul>
-   *   <li>{@link String} for quoted values
-   *   <li>{@link Boolean} for {@code true}/{@code false}
-   *   <li>{@link Integer}/{@link Long}/{@link Double} for numbers
-   *   <li>{@link Map} for objects
-   *   <li>{@link List} for arrays
-   * </ul>
-   *
-   * @return The next value as its related Java type.
-   * @throws IOException If the JSON is invalid, or a reader error occurs.
-   */
-  public Object nextValue() throws IOException {
-    char c = advanceUpToNextValueChar();
-    switch (c) {
-      case '"':
-        return nextString();
-      case '{':
-        Map<String, Object> map = new HashMap<>();
-        beginObject();
-        String name;
-        while ((name = nextName()) != null) {
-          map.put(name, nextValue());
+
+    /**
+     * Reads the next value and automatically detects its type.
+     *
+     * <p>Supported types are:
+     *
+     * <ul>
+     *   <li>{@link String} for quoted values
+     *   <li>{@link Boolean} for {@code true}/{@code false}
+     *   <li>{@link Integer}/{@link Long}/{@link Double} for numbers
+     *   <li>{@link Map} for objects
+     *   <li>{@link List} for arrays
+     * </ul>
+     *
+     * @return The next value as its related Java type.
+     * @throws IOException If the JSON is invalid, or a reader error occurs.
+     */
+    public Object nextValue() throws IOException {
+        char c = advanceUpToNextValueChar();
+        switch (c) {
+            case '"':
+                return nextString();
+            case '{':
+                Map<String, Object> map = new HashMap<>();
+                beginObject();
+                String name;
+                while ((name = nextName()) != null) {
+                    map.put(name, nextValue());
+                }
+                endObject();
+                return map;
+            case '[':
+                List<Object> list = new ArrayList<>();
+                beginArray();
+                while (hasNext()) {
+                    list.add(nextValue());
+                }
+                endArray();
+                return list;
+            case 't':
+            case 'f':
+                return nextBoolean();
+            case 'n':
+                readLiteral(4); // Skip "null"
+                return null;
+            case '-':
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                String number = readNumber();
+                // Try parsing as integer first, then long, then fall back to double
+                if (!number.contains(".") && !number.contains("e") && !number.contains("E")) {
+                    try {
+                        return Integer.parseInt(number);
+                    } catch (NumberFormatException e) {
+                        try {
+                            return Long.parseLong(number);
+                        } catch (NumberFormatException e2) {
+                            // Fall through to double
+                        }
+                    }
+                }
+                return Double.parseDouble(number);
+            default:
+                throw syntaxError("Unexpected character: " + c);
         }
-        endObject();
-        return map;
-      case '[':
-        List<Object> list = new ArrayList<>();
-        beginArray();
-        while (hasNext()) {
-          list.add(nextValue());
+    }
+
+    private char advanceUpToNextValueChar() throws IOException {
+        consumeWhitespace();
+        char c = peek();
+        // Handle comma between values
+        if (c == ',') {
+            advance(); // Skip comma
+            consumeWhitespace();
+            c = peek();
         }
-        endArray();
-        return list;
-      case 't':
-      case 'f':
-        return nextBoolean();
-      case 'n':
-        readLiteral(4); // Skip "null"
-        return null;
-      case '-':
-      case '0':
-      case '1':
-      case '2':
-      case '3':
-      case '4':
-      case '5':
-      case '6':
-      case '7':
-      case '8':
-      case '9':
-        String number = readNumber();
-        // Try parsing as integer first, then long, then fall back to double
-        if (!number.contains(".") && !number.contains("e") && !number.contains("E")) {
-          try {
-            return Integer.parseInt(number);
-          } catch (NumberFormatException e) {
-            try {
-              return Long.parseLong(number);
-            } catch (NumberFormatException e2) {
-              // Fall through to double
+        return c;
+    }
+
+    private void consumeWhitespace() throws IOException {
+        while (true) {
+            char c = peek();
+            if (c == ' ' || c == '\n' || c == '\r' || c == '\t') {
+                advance();
+                if (c == '\n') {
+                    this.lineNumber++;
+                    this.linePosition = 0;
+                }
+            } else {
+                break;
             }
-          }
         }
-        return Double.parseDouble(number);
-      default:
-        throw syntaxError("Unexpected character: " + c);
-    }
-  }
-
-  private char advanceUpToNextValueChar() throws IOException {
-    consumeWhitespace();
-    char c = peek();
-    // Handle comma between values
-    if (c == ',') {
-      advance(); // Skip comma
-      consumeWhitespace();
-      c = peek();
     }
-    return c;
-  }
 
-  private void consumeWhitespace() throws IOException {
-    while (true) {
-      char c = peek();
-      if (c == ' ' || c == '\n' || c == '\r' || c == '\t') {
-        advance();
-        if (c == '\n') {
-          this.lineNumber++;
-          this.linePosition = 0;
+    private char peek() throws IOException {
+        if (this.position >= this.limit) {
+            fillBuffer();
         }
-      } else {
-        break;
-      }
+        return this.position < this.limit ? this.buffer[this.position] : '\0';
     }
-  }
 
-  private char peek() throws IOException {
-    if (this.position >= this.limit) {
-      fillBuffer();
+    private void advance() throws IOException {
+        if (this.position >= this.limit) {
+            fillBuffer();
+        }
+        if (this.position < this.limit) {
+            this.position++;
+            this.linePosition++;
+        }
     }
-    return this.position < this.limit ? this.buffer[this.position] : '\0';
-  }
 
-  private void advance() throws IOException {
-    if (this.position >= this.limit) {
-      fillBuffer();
+    private void fillBuffer() throws IOException {
+        this.limit = this.reader.read(this.buffer, 0, this.buffer.length);
+        this.position = 0;
+        if (this.limit == -1) {
+            this.limit = 0;
+        }
     }
-    if (this.position < this.limit) {
-      this.position++;
-      this.linePosition++;
+
+    private String readString() throws IOException {
+        StringBuilder sb = new StringBuilder();
+        advance(); // Skip opening quote
+        while (true) {
+            char c = peek();
+            if (c == '"') {
+                advance();
+                break;
+            }
+            if (c == '\\') {
+                advance();
+                c = peek();
+                switch (c) {
+                    case '"':
+                    case '\\':
+                    case '/':
+                        sb.append(c);
+                        break;
+                    case 'b':
+                        sb.append('\b');
+                        break;
+                    case 'f':
+                        sb.append('\f');
+                        break;
+                    case 'n':
+                        sb.append('\n');
+                        break;
+                    case 'r':
+                        sb.append('\r');
+                        break;
+                    case 't':
+                        sb.append('\t');
+                        break;
+                    case 'u':
+                        sb.append(readUnicodeEscape());
+                        continue;
+                    default:
+                        throw syntaxError("Invalid escape sequence: \\" + c);
+                }
+            } else if (c < ' ') {
+                throw syntaxError("Unterminated string");
+            } else {
+                sb.append(c);
+            }
+            advance();
+        }
+        return sb.toString();
     }
-  }
 
-  private void fillBuffer() throws IOException {
-    this.limit = this.reader.read(this.buffer, 0, this.buffer.length);
-    this.position = 0;
-    if (this.limit == -1) {
-      this.limit = 0;
+    private char readUnicodeEscape() throws IOException {
+        advance(); // Skip 'u'
+        StringBuilder hex = new StringBuilder(4);
+        for (int i = 0; i < 4; i++) {
+            hex.append(peek());
+            advance();
+        }
+        try {
+            return (char) Integer.parseInt(hex.toString(), 16);
+        } catch (NumberFormatException e) {
+            throw syntaxError("Invalid unicode escape sequence: \\u" + hex);
+        }
     }
-  }
-
-  private String readString() throws IOException {
-    StringBuilder sb = new StringBuilder();
-    advance(); // Skip opening quote
-    while (true) {
-      char c = peek();
-      if (c == '"') {
-        advance();
-        break;
-      }
-      if (c == '\\') {
-        advance();
+
+    private String readNumber() throws IOException {
+        StringBuilder sb = new StringBuilder();
+        char c = peek();
+        // Optional minus sign
+        if (c == '-') {
+            sb.append(c);
+            advance();
+        }
+        // Integer part
+        readDigits(sb);
+        // Fractional part
+        if (peek() == '.') {
+            sb.append('.');
+            advance();
+            readDigits(sb);
+        }
+        // Exponent part
         c = peek();
-        switch (c) {
-          case '"':
-          case '\\':
-          case '/':
+        if (c == 'e' || c == 'E') {
             sb.append(c);
-            break;
-          case 'b':
-            sb.append('\b');
-            break;
-          case 'f':
-            sb.append('\f');
-            break;
-          case 'n':
-            sb.append('\n');
-            break;
-          case 'r':
-            sb.append('\r');
-            break;
-          case 't':
-            sb.append('\t');
-            break;
-          case 'u':
-            sb.append(readUnicodeEscape());
-            continue;
-          default:
-            throw syntaxError("Invalid escape sequence: \\" + c);
+            advance();
+            c = peek();
+            if (c == '+' || c == '-') {
+                sb.append(c);
+                advance();
+            }
+            readDigits(sb);
         }
-      } else if (c < ' ') {
-        throw syntaxError("Unterminated string");
-      } else {
-        sb.append(c);
-      }
-      advance();
-    }
-    return sb.toString();
-  }
-
-  private char readUnicodeEscape() throws IOException {
-    advance(); // Skip 'u'
-    StringBuilder hex = new StringBuilder(4);
-    for (int i = 0; i < 4; i++) {
-      hex.append(peek());
-      advance();
-    }
-    try {
-      return (char) Integer.parseInt(hex.toString(), 16);
-    } catch (NumberFormatException e) {
-      throw syntaxError("Invalid unicode escape sequence: \\u" + hex);
+        return sb.toString();
     }
-  }
-
-  private String readNumber() throws IOException {
-    StringBuilder sb = new StringBuilder();
-    char c = peek();
-    // Optional minus sign
-    if (c == '-') {
-      sb.append(c);
-      advance();
+
+    private void readDigits(StringBuilder sb) throws IOException {
+        char c = peek();
+        if (c < '0' || c > '9') {
+            throw unexpectedSyntaxError("digit", c);
+        }
+        while (true) {
+            c = peek();
+            if (c < '0' || c > '9') {
+                break;
+            }
+            sb.append(c);
+            advance();
+        }
     }
-    // Integer part
-    readDigits(sb);
-    // Fractional part
-    if (peek() == '.') {
-      sb.append('.');
-      advance();
-      readDigits(sb);
+
+    private String readLiteral(int length) throws IOException {
+        StringBuilder sb = new StringBuilder(length);
+        for (int i = 0; i < length; i++) {
+            sb.append(peek());
+            advance();
+        }
+        return sb.toString();
     }
-    // Exponent part
-    c = peek();
-    if (c == 'e' || c == 'E') {
-      sb.append(c);
-      advance();
-      c = peek();
-      if (c == '+' || c == '-') {
-        sb.append(c);
-        advance();
-      }
-      readDigits(sb);
+
+    private IOException unexpectedSyntaxError(String expected, String found) {
+        return new IOException(String.format(
+                "Syntax error at line %d, position %d: expected %s but found '%s'",
+                this.lineNumber, this.linePosition, expected, found));
     }
-    return sb.toString();
-  }
 
-  private void readDigits(StringBuilder sb) throws IOException {
-    char c = peek();
-    if (c < '0' || c > '9') {
-      throw unexpectedSyntaxError("digit", c);
+    private IOException unexpectedSyntaxError(String expected, char found) {
+        return new IOException(String.format(
+                "Syntax error at line %d, position %d: expected %s but found '%s'",
+                this.lineNumber, this.linePosition, expected, found));
     }
-    while (true) {
-      c = peek();
-      if (c < '0' || c > '9') {
-        break;
-      }
-      sb.append(c);
-      advance();
+
+    private IOException syntaxError(String message) {
+        return new IOException(
+                String.format("Syntax error at line %d, position %d: %s", this.lineNumber, this.linePosition, message));
     }
-  }
 
-  private String readLiteral(int length) throws IOException {
-    StringBuilder sb = new StringBuilder(length);
-    for (int i = 0; i < length; i++) {
-      sb.append(peek());
-      advance();
+    @Override
+    public void close() throws IOException {
+        this.reader.close();
     }
-    return sb.toString();
-  }
-
-  private IOException unexpectedSyntaxError(String expected, String found) {
-    return new IOException(
-        String.format(
-            "Syntax error at line %d, position %d: expected %s but found '%s'",
-            this.lineNumber, this.linePosition, expected, found));
-  }
-
-  private IOException unexpectedSyntaxError(String expected, char found) {
-    return new IOException(
-        String.format(
-            "Syntax error at line %d, position %d: expected %s but found '%s'",
-            this.lineNumber, this.linePosition, expected, found));
-  }
-
-  private IOException syntaxError(String message) {
-    return new IOException(
-        String.format(
-            "Syntax error at line %d, position %d: %s",
-            this.lineNumber, this.linePosition, message));
-  }
-
-  @Override
-  public void close() throws IOException {
-    this.reader.close();
-  }
 }
diff --git a/components/json/src/main/java/datadog/json/JsonStructure.java b/components/json/src/main/java/datadog/json/JsonStructure.java
index 72efe81ec31..c06dbf69809 100644
--- a/components/json/src/main/java/datadog/json/JsonStructure.java
+++ b/components/json/src/main/java/datadog/json/JsonStructure.java
@@ -2,55 +2,55 @@
 
 /** The {@link JsonStructure} keeps track of JSON value being built. */
 interface JsonStructure {
-  /**
-   * Begins an object.
-   *
-   * @throws IllegalStateException if the object can not be started at this position.
-   */
-  void beginObject();
-
-  /**
-   * Checks whether the current position is within an object.
-   *
-   * @return {@code true} if the current position is within an object, {@code false} otherwise.
-   */
-  boolean objectStarted();
-
-  /**
-   * Ends the current object.
-   *
-   * @throws IllegalStateException if the current position is not within an object.
-   */
-  void endObject();
-
-  /** Begins an array. */
-  void beginArray();
-
-  /**
-   * Checks whether the current position is within an array.
-   *
-   * @return {@code true} if the current position is within an array, {@code false} otherwise.
-   */
-  boolean arrayStarted();
-
-  /**
-   * Ends the current array.
-   *
-   * @throws IllegalStateException if the current position is not within an array.
-   */
-  void endArray();
-
-  /**
-   * Adds a name to the current object.
-   *
-   * @throws IllegalStateException if the current position is not within an object.
-   */
-  void addName();
-
-  /**
-   * Adds a value.
-   *
-   * @throws IllegalStateException if the current position can not have a value.
-   */
-  void addValue();
+    /**
+     * Begins an object.
+     *
+     * @throws IllegalStateException if the object can not be started at this position.
+     */
+    void beginObject();
+
+    /**
+     * Checks whether the current position is within an object.
+     *
+     * @return {@code true} if the current position is within an object, {@code false} otherwise.
+     */
+    boolean objectStarted();
+
+    /**
+     * Ends the current object.
+     *
+     * @throws IllegalStateException if the current position is not within an object.
+     */
+    void endObject();
+
+    /** Begins an array. */
+    void beginArray();
+
+    /**
+     * Checks whether the current position is within an array.
+     *
+     * @return {@code true} if the current position is within an array, {@code false} otherwise.
+     */
+    boolean arrayStarted();
+
+    /**
+     * Ends the current array.
+     *
+     * @throws IllegalStateException if the current position is not within an array.
+     */
+    void endArray();
+
+    /**
+     * Adds a name to the current object.
+     *
+     * @throws IllegalStateException if the current position is not within an object.
+     */
+    void addName();
+
+    /**
+     * Adds a value.
+     *
+     * @throws IllegalStateException if the current position can not have a value.
+     */
+    void addValue();
 }
diff --git a/components/json/src/main/java/datadog/json/JsonWriter.java b/components/json/src/main/java/datadog/json/JsonWriter.java
index ec476d574c1..19b6cee8da9 100644
--- a/components/json/src/main/java/datadog/json/JsonWriter.java
+++ b/components/json/src/main/java/datadog/json/JsonWriter.java
@@ -12,344 +12,344 @@
  * using the lenient mode.
  */
 public final class JsonWriter implements Flushable, AutoCloseable {
-  private static final int INITIAL_CAPACITY = 256;
-  private static final char[] HEX_DIGITS = "0123456789ABCDEF".toCharArray();
-  private final ByteArrayOutputStream outputStream;
-  private final OutputStreamWriter writer;
-  private final JsonStructure structure;
+    private static final int INITIAL_CAPACITY = 256;
+    private static final char[] HEX_DIGITS = "0123456789ABCDEF".toCharArray();
+    private final ByteArrayOutputStream outputStream;
+    private final OutputStreamWriter writer;
+    private final JsonStructure structure;
 
-  private boolean requireComma;
+    private boolean requireComma;
 
-  /** Creates a writer with structure check. */
-  public JsonWriter() {
-    this(true);
-  }
+    /** Creates a writer with structure check. */
+    public JsonWriter() {
+        this(true);
+    }
 
-  /**
-   * Creates a writer.
-   *
-   * @param safe {@code true} to use safe structure check, {@code false} for lenient mode.
-   */
-  public JsonWriter(boolean safe) {
-    this.outputStream = new ByteArrayOutputStream(INITIAL_CAPACITY);
-    this.writer = new OutputStreamWriter(this.outputStream, UTF_8);
-    this.structure = safe ? new SafeJsonStructure() : new LenientJsonStructure();
-    this.requireComma = false;
-  }
+    /**
+     * Creates a writer.
+     *
+     * @param safe {@code true} to use safe structure check, {@code false} for lenient mode.
+     */
+    public JsonWriter(boolean safe) {
+        this.outputStream = new ByteArrayOutputStream(INITIAL_CAPACITY);
+        this.writer = new OutputStreamWriter(this.outputStream, UTF_8);
+        this.structure = safe ? new SafeJsonStructure() : new LenientJsonStructure();
+        this.requireComma = false;
+    }
 
-  /**
-   * Starts a JSON object.
-   *
-   * @return This writer instance.
-   */
-  public JsonWriter beginObject() {
-    this.structure.beginObject();
-    injectCommaIfNeeded();
-    write('{');
-    return this;
-  }
+    /**
+     * Starts a JSON object.
+     *
+     * @return This writer instance.
+     */
+    public JsonWriter beginObject() {
+        this.structure.beginObject();
+        injectCommaIfNeeded();
+        write('{');
+        return this;
+    }
 
-  /**
-   * * Ends the current JSON object.
-   *
-   * @return This writer.
-   */
-  public JsonWriter endObject() {
-    this.structure.endObject();
-    write('}');
-    endsValue();
-    return this;
-  }
+    /**
+     * * Ends the current JSON object.
+     *
+     * @return This writer.
+     */
+    public JsonWriter endObject() {
+        this.structure.endObject();
+        write('}');
+        endsValue();
+        return this;
+    }
 
-  /**
-   * Writes an object property name.
-   *
-   * @param name The property name.
-   * @return This writer.
-   */
-  public JsonWriter name(String name) {
-    if (name == null) {
-      throw new IllegalArgumentException("name cannot be null");
+    /**
+     * Writes an object property name.
+     *
+     * @param name The property name.
+     * @return This writer.
+     */
+    public JsonWriter name(String name) {
+        if (name == null) {
+            throw new IllegalArgumentException("name cannot be null");
+        }
+        this.structure.addName();
+        injectCommaIfNeeded();
+        writeStringLiteral(name);
+        write(':');
+        return this;
     }
-    this.structure.addName();
-    injectCommaIfNeeded();
-    writeStringLiteral(name);
-    write(':');
-    return this;
-  }
 
-  /**
-   * Writes a {@code null} value.
-   *
-   * @return This writer.
-   */
-  public JsonWriter nullValue() {
-    this.structure.addValue();
-    injectCommaIfNeeded();
-    writeStringRaw("null");
-    endsValue();
-    return this;
-  }
+    /**
+     * Writes a {@code null} value.
+     *
+     * @return This writer.
+     */
+    public JsonWriter nullValue() {
+        this.structure.addValue();
+        injectCommaIfNeeded();
+        writeStringRaw("null");
+        endsValue();
+        return this;
+    }
 
-  /**
-   * Writes JSON value without escaping it.
-   *
-   * @param value The JSON value to write.
-   * @return This writer.
-   */
-  public JsonWriter jsonValue(String value) {
-    // No structure check here assuming raw JSON is safe to write
-    injectCommaIfNeeded();
-    writeStringRaw(value);
-    endsValue();
-    return this;
-  }
+    /**
+     * Writes JSON value without escaping it.
+     *
+     * @param value The JSON value to write.
+     * @return This writer.
+     */
+    public JsonWriter jsonValue(String value) {
+        // No structure check here assuming raw JSON is safe to write
+        injectCommaIfNeeded();
+        writeStringRaw(value);
+        endsValue();
+        return this;
+    }
 
-  /**
-   * Writes a boolean value.
-   *
-   * @param value The value to write.
-   * @return This writer.
-   */
-  public JsonWriter value(boolean value) {
-    this.structure.addValue();
-    injectCommaIfNeeded();
-    writeStringRaw(value ? "true" : "false");
-    endsValue();
-    return this;
-  }
+    /**
+     * Writes a boolean value.
+     *
+     * @param value The value to write.
+     * @return This writer.
+     */
+    public JsonWriter value(boolean value) {
+        this.structure.addValue();
+        injectCommaIfNeeded();
+        writeStringRaw(value ? "true" : "false");
+        endsValue();
+        return this;
+    }
 
-  /**
-   * Writes a string value.
-   *
-   * @param value The value to write.
-   * @return This writer.
-   */
-  public JsonWriter value(String value) {
-    if (value == null) {
-      return nullValue();
+    /**
+     * Writes a string value.
+     *
+     * @param value The value to write.
+     * @return This writer.
+     */
+    public JsonWriter value(String value) {
+        if (value == null) {
+            return nullValue();
+        }
+        this.structure.addValue();
+        injectCommaIfNeeded();
+        writeStringLiteral(value);
+        endsValue();
+        return this;
     }
-    this.structure.addValue();
-    injectCommaIfNeeded();
-    writeStringLiteral(value);
-    endsValue();
-    return this;
-  }
 
-  /**
-   * Writes an integer as a number value.
-   *
-   * @param value The integer to write.
-   * @return This writer.
-   */
-  public JsonWriter value(int value) {
-    this.structure.addValue();
-    injectCommaIfNeeded();
-    writeStringRaw(Integer.toString(value));
-    endsValue();
-    return this;
-  }
+    /**
+     * Writes an integer as a number value.
+     *
+     * @param value The integer to write.
+     * @return This writer.
+     */
+    public JsonWriter value(int value) {
+        this.structure.addValue();
+        injectCommaIfNeeded();
+        writeStringRaw(Integer.toString(value));
+        endsValue();
+        return this;
+    }
 
-  /**
-   * Writes a long as a number value.
-   *
-   * @param value The long to write.
-   * @return This writer.
-   */
-  public JsonWriter value(long value) {
-    this.structure.addValue();
-    injectCommaIfNeeded();
-    writeStringRaw(Long.toString(value));
-    endsValue();
-    return this;
-  }
+    /**
+     * Writes a long as a number value.
+     *
+     * @param value The long to write.
+     * @return This writer.
+     */
+    public JsonWriter value(long value) {
+        this.structure.addValue();
+        injectCommaIfNeeded();
+        writeStringRaw(Long.toString(value));
+        endsValue();
+        return this;
+    }
 
-  /**
-   * Writes a float as a number value.
-   *
-   * @param value The float to write.
-   * @return This writer.
-   */
-  public JsonWriter value(float value) {
-    if (Float.isNaN(value)) {
-      return nullValue();
+    /**
+     * Writes a float as a number value.
+     *
+     * @param value The float to write.
+     * @return This writer.
+     */
+    public JsonWriter value(float value) {
+        if (Float.isNaN(value)) {
+            return nullValue();
+        }
+        this.structure.addValue();
+        injectCommaIfNeeded();
+        writeStringRaw(Float.toString(value));
+        endsValue();
+        return this;
     }
-    this.structure.addValue();
-    injectCommaIfNeeded();
-    writeStringRaw(Float.toString(value));
-    endsValue();
-    return this;
-  }
 
-  /**
-   * Writes a double as a number value.
-   *
-   * @param value The value to write.
-   * @return This writer.
-   */
-  public JsonWriter value(double value) {
-    if (Double.isNaN(value)) {
-      return nullValue();
+    /**
+     * Writes a double as a number value.
+     *
+     * @param value The value to write.
+     * @return This writer.
+     */
+    public JsonWriter value(double value) {
+        if (Double.isNaN(value)) {
+            return nullValue();
+        }
+        this.structure.addValue();
+        injectCommaIfNeeded();
+        writeStringRaw(Double.toString(value));
+        endsValue();
+        return this;
     }
-    this.structure.addValue();
-    injectCommaIfNeeded();
-    writeStringRaw(Double.toString(value));
-    endsValue();
-    return this;
-  }
 
-  /**
-   * Starts a JSON array.
-   *
-   * @return This writer.
-   */
-  public JsonWriter beginArray() {
-    this.structure.beginArray();
-    injectCommaIfNeeded();
-    write('[');
-    return this;
-  }
+    /**
+     * Starts a JSON array.
+     *
+     * @return This writer.
+     */
+    public JsonWriter beginArray() {
+        this.structure.beginArray();
+        injectCommaIfNeeded();
+        write('[');
+        return this;
+    }
 
-  /**
-   * Ends the current JSON array.
-   *
-   * @return This writer.
-   */
-  public JsonWriter endArray() {
-    this.structure.endArray();
-    endsValue();
-    write(']');
-    return this;
-  }
+    /**
+     * Ends the current JSON array.
+     *
+     * @return This writer.
+     */
+    public JsonWriter endArray() {
+        this.structure.endArray();
+        endsValue();
+        write(']');
+        return this;
+    }
 
-  /**
-   * Gets the JSON String as a UTF-8 byte array.
-   *
-   * @return The JSON String as a UTF-8 byte array.
-   */
-  public byte[] toByteArray() {
-    flush();
-    return this.outputStream.toByteArray();
-  }
+    /**
+     * Gets the JSON String as a UTF-8 byte array.
+     *
+     * @return The JSON String as a UTF-8 byte array.
+     */
+    public byte[] toByteArray() {
+        flush();
+        return this.outputStream.toByteArray();
+    }
 
-  @Override
-  public String toString() {
-    return new String(toByteArray(), UTF_8);
-  }
+    @Override
+    public String toString() {
+        return new String(toByteArray(), UTF_8);
+    }
 
-  @Override
-  public void flush() {
-    try {
-      this.writer.flush();
-    } catch (IOException ignored) {
+    @Override
+    public void flush() {
+        try {
+            this.writer.flush();
+        } catch (IOException ignored) {
+        }
     }
-  }
 
-  /**
-   * Returns the current JSON size in bytes.
-   *
-   * @return The JSON size in bytes.
-   * @see #toByteArray()
-   */
-  public int size() {
-    flush();
-    return this.outputStream.size();
-  }
+    /**
+     * Returns the current JSON size in bytes.
+     *
+     * @return The JSON size in bytes.
+     * @see #toByteArray()
+     */
+    public int size() {
+        flush();
+        return this.outputStream.size();
+    }
 
-  @Override
-  public void close() {
-    try {
-      this.outputStream.close();
-      this.writer.close();
-    } catch (IOException ignored) {
+    @Override
+    public void close() {
+        try {
+            this.outputStream.close();
+            this.writer.close();
+        } catch (IOException ignored) {
+        }
     }
-  }
 
-  private void injectCommaIfNeeded() {
-    if (this.requireComma) {
-      write(',');
+    private void injectCommaIfNeeded() {
+        if (this.requireComma) {
+            write(',');
+        }
+        this.requireComma = false;
     }
-    this.requireComma = false;
-  }
 
-  private void endsValue() {
-    this.requireComma = true;
-  }
+    private void endsValue() {
+        this.requireComma = true;
+    }
 
-  private void write(char ch) {
-    try {
-      this.writer.write(ch);
-    } catch (IOException ignored) {
+    private void write(char ch) {
+        try {
+            this.writer.write(ch);
+        } catch (IOException ignored) {
+        }
     }
-  }
 
-  private void writeStringLiteral(String str) {
-    try {
-      this.writer.write('"');
+    private void writeStringLiteral(String str) {
+        try {
+            this.writer.write('"');
 
-      for (int i = 0; i < str.length(); ++i) {
-        char c = str.charAt(i);
-        // Escape any char outside ASCII to their Unicode equivalent
-        if (c > 127) {
-          this.writer.write('\\');
-          this.writer.write('u');
-          this.writer.write(HEX_DIGITS[(c >>> 12) & 0xF]);
-          this.writer.write(HEX_DIGITS[(c >>> 8) & 0xF]);
-          this.writer.write(HEX_DIGITS[(c >>> 4) & 0xF]);
-          this.writer.write(HEX_DIGITS[c & 0xF]);
-        } else {
-          switch (c) {
-            case '"': // Quotation mark
-            case '\\': // Reverse solidus
-            case '/': // Solidus
-              this.writer.write('\\');
-              this.writer.write(c);
-              break;
-            case '\b': // Backspace
-              this.writer.write('\\');
-              this.writer.write('b');
-              break;
-            case '\f': // Form feed
-              this.writer.write('\\');
-              this.writer.write('f');
-              break;
-            case '\n': // Line feed
-              this.writer.write('\\');
-              this.writer.write('n');
-              break;
-            case '\r': // Carriage return
-              this.writer.write('\\');
-              this.writer.write('r');
-              break;
-            case '\t': // Horizontal tab
-              this.writer.write('\\');
-              this.writer.write('t');
-              break;
-            default:
-              if (c < 0x20) {
-                this.writer.write('\\');
-                this.writer.write('u');
-                this.writer.write('0');
-                this.writer.write('0');
-                this.writer.write(HEX_DIGITS[(c >>> 4) & 0xF]);
-                this.writer.write(HEX_DIGITS[c & 0xF]);
-              } else {
-                this.writer.write(c);
-              }
-              break;
-          }
-        }
-      }
+            for (int i = 0; i < str.length(); ++i) {
+                char c = str.charAt(i);
+                // Escape any char outside ASCII to their Unicode equivalent
+                if (c > 127) {
+                    this.writer.write('\\');
+                    this.writer.write('u');
+                    this.writer.write(HEX_DIGITS[(c >>> 12) & 0xF]);
+                    this.writer.write(HEX_DIGITS[(c >>> 8) & 0xF]);
+                    this.writer.write(HEX_DIGITS[(c >>> 4) & 0xF]);
+                    this.writer.write(HEX_DIGITS[c & 0xF]);
+                } else {
+                    switch (c) {
+                        case '"': // Quotation mark
+                        case '\\': // Reverse solidus
+                        case '/': // Solidus
+                            this.writer.write('\\');
+                            this.writer.write(c);
+                            break;
+                        case '\b': // Backspace
+                            this.writer.write('\\');
+                            this.writer.write('b');
+                            break;
+                        case '\f': // Form feed
+                            this.writer.write('\\');
+                            this.writer.write('f');
+                            break;
+                        case '\n': // Line feed
+                            this.writer.write('\\');
+                            this.writer.write('n');
+                            break;
+                        case '\r': // Carriage return
+                            this.writer.write('\\');
+                            this.writer.write('r');
+                            break;
+                        case '\t': // Horizontal tab
+                            this.writer.write('\\');
+                            this.writer.write('t');
+                            break;
+                        default:
+                            if (c < 0x20) {
+                                this.writer.write('\\');
+                                this.writer.write('u');
+                                this.writer.write('0');
+                                this.writer.write('0');
+                                this.writer.write(HEX_DIGITS[(c >>> 4) & 0xF]);
+                                this.writer.write(HEX_DIGITS[c & 0xF]);
+                            } else {
+                                this.writer.write(c);
+                            }
+                            break;
+                    }
+                }
+            }
 
-      this.writer.write('"');
-    } catch (IOException ignored) {
+            this.writer.write('"');
+        } catch (IOException ignored) {
+        }
     }
-  }
 
-  private void writeStringRaw(String str) {
-    try {
-      this.writer.write(str);
-    } catch (IOException ignored) {
+    private void writeStringRaw(String str) {
+        try {
+            this.writer.write(str);
+        } catch (IOException ignored) {
+        }
     }
-  }
 }
diff --git a/components/json/src/main/java/datadog/json/LenientJsonStructure.java b/components/json/src/main/java/datadog/json/LenientJsonStructure.java
index ee1cfd7331e..aa12f9a673c 100644
--- a/components/json/src/main/java/datadog/json/LenientJsonStructure.java
+++ b/components/json/src/main/java/datadog/json/LenientJsonStructure.java
@@ -2,33 +2,33 @@
 
 /** A permissive {@link JsonStructure} that performs no structural checks on the built JSON. */
 class LenientJsonStructure implements JsonStructure {
-  LenientJsonStructure() {}
+    LenientJsonStructure() {}
 
-  @Override
-  public void beginObject() {}
+    @Override
+    public void beginObject() {}
 
-  @Override
-  public boolean objectStarted() {
-    return true;
-  }
+    @Override
+    public boolean objectStarted() {
+        return true;
+    }
 
-  @Override
-  public void endObject() {}
+    @Override
+    public void endObject() {}
 
-  @Override
-  public void beginArray() {}
+    @Override
+    public void beginArray() {}
 
-  @Override
-  public boolean arrayStarted() {
-    return true;
-  }
+    @Override
+    public boolean arrayStarted() {
+        return true;
+    }
 
-  @Override
-  public void endArray() {}
+    @Override
+    public void endArray() {}
 
-  @Override
-  public void addName() {}
+    @Override
+    public void addName() {}
 
-  @Override
-  public void addValue() {}
+    @Override
+    public void addValue() {}
 }
diff --git a/components/json/src/main/java/datadog/json/SafeJsonStructure.java b/components/json/src/main/java/datadog/json/SafeJsonStructure.java
index d6ac0adabf5..ffb733026c9 100644
--- a/components/json/src/main/java/datadog/json/SafeJsonStructure.java
+++ b/components/json/src/main/java/datadog/json/SafeJsonStructure.java
@@ -7,83 +7,83 @@
  * coherent.
  */
 class SafeJsonStructure implements JsonStructure {
-  private final BitSet structure;
-  private int depth;
-  private boolean complete;
+    private final BitSet structure;
+    private int depth;
+    private boolean complete;
 
-  SafeJsonStructure() {
-    this.structure = new BitSet();
-    this.depth = -1;
-    this.complete = false;
-  }
-
-  @Override
-  public void beginObject() {
-    if (this.complete) {
-      throw new IllegalStateException("Object is complete");
+    SafeJsonStructure() {
+        this.structure = new BitSet();
+        this.depth = -1;
+        this.complete = false;
     }
-    this.structure.set(++this.depth);
-  }
-
-  @Override
-  public boolean objectStarted() {
-    return this.depth >= 0 && this.structure.get(this.depth);
-  }
 
-  @Override
-  public void endObject() {
-    if (!objectStarted()) {
-      throw new IllegalStateException("Object not started");
+    @Override
+    public void beginObject() {
+        if (this.complete) {
+            throw new IllegalStateException("Object is complete");
+        }
+        this.structure.set(++this.depth);
     }
-    this.depth--;
-    if (this.depth < 0) {
-      this.complete = true;
-    }
-  }
 
-  @Override
-  public void beginArray() {
-    if (this.complete) {
-      throw new IllegalStateException("Object is complete");
+    @Override
+    public boolean objectStarted() {
+        return this.depth >= 0 && this.structure.get(this.depth);
     }
-    this.structure.clear(++this.depth);
-  }
 
-  @Override
-  public boolean arrayStarted() {
-    return this.depth >= 0 && !this.structure.get(this.depth);
-  }
+    @Override
+    public void endObject() {
+        if (!objectStarted()) {
+            throw new IllegalStateException("Object not started");
+        }
+        this.depth--;
+        if (this.depth < 0) {
+            this.complete = true;
+        }
+    }
 
-  @Override
-  public void endArray() {
-    if (!arrayStarted()) {
-      throw new IllegalStateException("Array not started");
+    @Override
+    public void beginArray() {
+        if (this.complete) {
+            throw new IllegalStateException("Object is complete");
+        }
+        this.structure.clear(++this.depth);
     }
-    this.depth--;
-    if (this.depth < 0) {
-      this.complete = true;
+
+    @Override
+    public boolean arrayStarted() {
+        return this.depth >= 0 && !this.structure.get(this.depth);
     }
-  }
 
-  @Override
-  public void addName() {
-    if (!objectStarted()) {
-      throw new IllegalStateException("Object not started");
+    @Override
+    public void endArray() {
+        if (!arrayStarted()) {
+            throw new IllegalStateException("Array not started");
+        }
+        this.depth--;
+        if (this.depth < 0) {
+            this.complete = true;
+        }
     }
-  }
 
-  @Override
-  public void addValue() {
-    if (this.complete) {
-      throw new IllegalStateException("Object is complete");
+    @Override
+    public void addName() {
+        if (!objectStarted()) {
+            throw new IllegalStateException("Object not started");
+        }
     }
-    if (this.depth < 0) {
-      this.complete = true;
+
+    @Override
+    public void addValue() {
+        if (this.complete) {
+            throw new IllegalStateException("Object is complete");
+        }
+        if (this.depth < 0) {
+            this.complete = true;
+        }
     }
-  }
 
-  @Override
-  public String toString() {
-    return (this.complete ? "complete" : "") + this.structure;
-  }
+    @Override
+    public String toString() {
+        return (this.complete ? "complete" : "") + this.structure;
+    }
 }
diff --git a/components/json/src/test/java/datadog/json/JsonMapperTest.java b/components/json/src/test/java/datadog/json/JsonMapperTest.java
index 46110942275..b7da3046aa1 100644
--- a/components/json/src/test/java/datadog/json/JsonMapperTest.java
+++ b/components/json/src/test/java/datadog/json/JsonMapperTest.java
@@ -23,202 +23,197 @@
 import org.tabletest.junit.TableTest;
 
 class JsonMapperTest {
-  @TableTest({
-    "Scenario       | Input                              | Expected                                               ",
-    "null input     |                                    | '{}'                                                   ",
-    "empty map      | [:]                                | '{}'                                                   ",
-    "single entry   | [key1: value1]                     | '{\"key1\":\"value1\"}'                                ",
-    "two entries    | [key1: value1, key2: value2]       | '{\"key1\":\"value1\",\"key2\":\"value2\"}'            ",
-    "quoted entries | [key1: va\"lu\"e1, ke\"y2: value2] | '{\"key1\":\"va\\\"lu\\\"e1\",\"ke\\\"y2\":\"value2\"}'"
-  })
-  @ParameterizedTest(name = "test mapping to JSON object: {0}")
-  @MethodSource("testMappingToJsonObjectArguments")
-  void testMappingToJsonObject(
-      @Scenario String ignoredScenario, Map<String, Object> input, String expected)
-      throws IOException {
-    String json = JsonMapper.toJson(input);
-    assertEquals(expected, json);
-
-    Map<String, Object> parsed = JsonMapper.fromJsonToMap(json);
-    if (input == null) {
-      assertEquals(emptyMap(), parsed);
-    } else {
-      assertEquals(input.size(), parsed.size());
-      for (Map.Entry<String, Object> entry : input.entrySet()) {
-        String expectedKey = entry.getKey();
-        Object expectedValue = entry.getValue();
-        assertTrue(parsed.containsKey(expectedKey));
-        Object parsedValue = parsed.get(expectedKey);
-        if (expectedValue instanceof UnsupportedType) {
-          assertEquals(expectedValue.toString(), parsedValue);
-        } else if (expectedValue instanceof Float) {
-          assertInstanceOf(Double.class, parsedValue);
-          assertEquals((Float) expectedValue, (Double) parsedValue, 0.001);
+    @TableTest({
+      "Scenario       | Input                              | Expected                                               ",
+      "null input     |                                    | '{}'                                                   ",
+      "empty map      | [:]                                | '{}'                                                   ",
+      "single entry   | [key1: value1]                     | '{\"key1\":\"value1\"}'                                ",
+      "two entries    | [key1: value1, key2: value2]       | '{\"key1\":\"value1\",\"key2\":\"value2\"}'            ",
+      "quoted entries | [key1: va\"lu\"e1, ke\"y2: value2] | '{\"key1\":\"va\\\"lu\\\"e1\",\"ke\\\"y2\":\"value2\"}'"
+    })
+    @ParameterizedTest(name = "test mapping to JSON object: {0}")
+    @MethodSource("testMappingToJsonObjectArguments")
+    void testMappingToJsonObject(@Scenario String ignoredScenario, Map<String, Object> input, String expected)
+            throws IOException {
+        String json = JsonMapper.toJson(input);
+        assertEquals(expected, json);
+
+        Map<String, Object> parsed = JsonMapper.fromJsonToMap(json);
+        if (input == null) {
+            assertEquals(emptyMap(), parsed);
         } else {
-          assertEquals(expectedValue, parsedValue);
+            assertEquals(input.size(), parsed.size());
+            for (Map.Entry<String, Object> entry : input.entrySet()) {
+                String expectedKey = entry.getKey();
+                Object expectedValue = entry.getValue();
+                assertTrue(parsed.containsKey(expectedKey));
+                Object parsedValue = parsed.get(expectedKey);
+                if (expectedValue instanceof UnsupportedType) {
+                    assertEquals(expectedValue.toString(), parsedValue);
+                } else if (expectedValue instanceof Float) {
+                    assertInstanceOf(Double.class, parsedValue);
+                    assertEquals((Float) expectedValue, (Double) parsedValue, 0.001);
+                } else {
+                    assertEquals(expectedValue, parsedValue);
+                }
+            }
         }
-      }
     }
-  }
-
-  static Stream<Arguments> testMappingToJsonObjectArguments() {
-    Map<String, Object> complexMap = new LinkedHashMap<>();
-    complexMap.put("key1", null);
-    complexMap.put("key2", "bar");
-    complexMap.put("key3", 3);
-    complexMap.put("key4", 3456789123L);
-    complexMap.put("key5", 3.142f);
-    complexMap.put("key6", Math.PI);
-    complexMap.put("key7", true);
-    complexMap.put("key8", new UnsupportedType());
-
-    return Stream.of(
-        arguments(
-            "complex map",
-            complexMap,
-            "{\"key1\":null,\"key2\":\"bar\",\"key3\":3,\"key4\":3456789123,\"key5\":3.142,\"key6\":3.141592653589793,\"key7\":true,\"key8\":\"toString\"}"));
-  }
-
-  @TableTest({
-    "Scenario | Map                          | Expected                                   ",
-    "null     |                              | '{}'                                       ",
-    "empty    | [:]                          | '{}'                                       ",
-    "default  | [key1: value1, key2: value2] | '{\"key1\":\"value1\",\"key2\":\"value2\"}'"
-  })
-  void testWritingAsJsonValue(
-      @Scenario String ignoredScenario, Map<String, Object> map, String expected) {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer.beginObject();
-      writer.name("map");
-      JsonMapper.writeAsJsonValue(writer, (Map<String, ?>) map);
-      writer.endObject();
-      assertEquals("{\"map\":" + expected + "}", writer.toString());
+
+    static Stream<Arguments> testMappingToJsonObjectArguments() {
+        Map<String, Object> complexMap = new LinkedHashMap<>();
+        complexMap.put("key1", null);
+        complexMap.put("key2", "bar");
+        complexMap.put("key3", 3);
+        complexMap.put("key4", 3456789123L);
+        complexMap.put("key5", 3.142f);
+        complexMap.put("key6", Math.PI);
+        complexMap.put("key7", true);
+        complexMap.put("key8", new UnsupportedType());
+
+        return Stream.of(
+                arguments(
+                        "complex map",
+                        complexMap,
+                        "{\"key1\":null,\"key2\":\"bar\",\"key3\":3,\"key4\":3456789123,\"key5\":3.142,\"key6\":3.141592653589793,\"key7\":true,\"key8\":\"toString\"}"));
+    }
+
+    @TableTest({
+      "Scenario | Map                          | Expected                                   ",
+      "null     |                              | '{}'                                       ",
+      "empty    | [:]                          | '{}'                                       ",
+      "default  | [key1: value1, key2: value2] | '{\"key1\":\"value1\",\"key2\":\"value2\"}'"
+    })
+    void testWritingAsJsonValue(@Scenario String ignoredScenario, Map<String, Object> map, String expected) {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginObject();
+            writer.name("map");
+            JsonMapper.writeAsJsonValue(writer, (Map<String, ?>) map);
+            writer.endObject();
+            assertEquals("{\"map\":" + expected + "}", writer.toString());
+        }
+    }
+
+    @ParameterizedTest(name = "test mapping to Map from empty JSON object: {0}")
+    @NullSource
+    @ValueSource(strings = {"null", "", "{}"})
+    void testMappingToMapFromEmptyJsonObject(String json) throws IOException {
+        Map<String, Object> parsed = JsonMapper.fromJsonToMap(json);
+        assertEquals(emptyMap(), parsed);
+    }
+
+    @ParameterizedTest(name = "test mapping to Map from non-object JSON: {0}")
+    @ValueSource(strings = {"1", "[1, 2]"})
+    void testMappingToMapFromNonObjectJson(String json) {
+        assertThrows(IOException.class, () -> JsonMapper.fromJsonToMap(json));
+    }
+
+    @TableTest({
+      "Scenario      | Input                | Expected                         ",
+      "null input    |                      | '[]'                             ",
+      "empty list    | []                   | '[]'                             ",
+      "single value  | [value1]             | '[\"value1\"]'                   ",
+      "two values    | [value1, value2]     | '[\"value1\",\"value2\"]'        ",
+      "quoted values | [va\"lu\"e1, value2] | '[\"va\\\"lu\\\"e1\",\"value2\"]'"
+    })
+    @ParameterizedTest(name = "test mapping iterable to JSON array: {0}")
+    void testMappingIterableToJsonArray(List<String> input, String expected) throws IOException {
+        String json = JsonMapper.toJson(input);
+        assertEquals(expected, json);
+
+        List<String> parsed = JsonMapper.fromJsonToList(json);
+        assertEquals(input != null ? input : emptyList(), parsed);
+    }
+
+    @TableTest({
+      "Scenario | Collection       | Expected                 ",
+      "null     |                  | '[]'                     ",
+      "empty    | []               | '[]'                     ",
+      "default  | [value1, value2] | '[\"value1\",\"value2\"]'"
+    })
+    void testWritingCollectionAsJsonValue(@Scenario String ignoredScenario, List<String> collection, String expected) {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginObject();
+            writer.name("collection");
+            JsonMapper.writeAsJsonValue(collection, writer);
+            writer.endObject();
+            assertEquals("{\"collection\":" + expected + "}", writer.toString());
+        }
+    }
+
+    @TableTest({
+      "Scenario       | Input                | Expected                         ",
+      "null input     |                      | '[]'                             ",
+      "empty array    | []                   | '[]'                             ",
+      "single element | [value1]             | '[\"value1\"]'                   ",
+      "two elements   | [value1, value2]     | '[\"value1\",\"value2\"]'        ",
+      "escaped quotes | [va\"lu\"e1, value2] | '[\"va\\\"lu\\\"e1\",\"value2\"]'"
+    })
+    @ParameterizedTest(name = "test mapping array to JSON array: {0}")
+    void testMappingArrayToJsonArray(String ignoredScenario, String[] input, String expected) throws IOException {
+        String json = JsonMapper.toJson(input);
+        assertEquals(expected, json);
+
+        String[] parsed = JsonMapper.fromJsonToList(json).toArray(new String[] {});
+        assertArrayEquals(input != null ? input : new String[] {}, parsed);
+    }
+
+    @TableTest({
+      "Scenario | Array            | Expected                 ",
+      "null     |                  | '[]'                     ",
+      "empty    | []               | '[]'                     ",
+      "default  | [value1, value2] | '[\"value1\",\"value2\"]'"
+    })
+    void testWritingArrayAsJsonValue(@Scenario String ignoredScenario, String[] array, String expected) {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginObject();
+            writer.name("array");
+            JsonMapper.writeAsJsonValue(array, writer);
+            writer.endObject();
+            assertEquals("{\"array\":" + expected + "}", writer.toString());
+        }
     }
-  }
-
-  @ParameterizedTest(name = "test mapping to Map from empty JSON object: {0}")
-  @NullSource
-  @ValueSource(strings = {"null", "", "{}"})
-  void testMappingToMapFromEmptyJsonObject(String json) throws IOException {
-    Map<String, Object> parsed = JsonMapper.fromJsonToMap(json);
-    assertEquals(emptyMap(), parsed);
-  }
-
-  @ParameterizedTest(name = "test mapping to Map from non-object JSON: {0}")
-  @ValueSource(strings = {"1", "[1, 2]"})
-  void testMappingToMapFromNonObjectJson(String json) {
-    assertThrows(IOException.class, () -> JsonMapper.fromJsonToMap(json));
-  }
-
-  @TableTest({
-    "Scenario      | Input                | Expected                         ",
-    "null input    |                      | '[]'                             ",
-    "empty list    | []                   | '[]'                             ",
-    "single value  | [value1]             | '[\"value1\"]'                   ",
-    "two values    | [value1, value2]     | '[\"value1\",\"value2\"]'        ",
-    "quoted values | [va\"lu\"e1, value2] | '[\"va\\\"lu\\\"e1\",\"value2\"]'"
-  })
-  @ParameterizedTest(name = "test mapping iterable to JSON array: {0}")
-  void testMappingIterableToJsonArray(List<String> input, String expected) throws IOException {
-    String json = JsonMapper.toJson(input);
-    assertEquals(expected, json);
-
-    List<String> parsed = JsonMapper.fromJsonToList(json);
-    assertEquals(input != null ? input : emptyList(), parsed);
-  }
-
-  @TableTest({
-    "Scenario | Collection       | Expected                 ",
-    "null     |                  | '[]'                     ",
-    "empty    | []               | '[]'                     ",
-    "default  | [value1, value2] | '[\"value1\",\"value2\"]'"
-  })
-  void testWritingCollectionAsJsonValue(
-      @Scenario String ignoredScenario, List<String> collection, String expected) {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer.beginObject();
-      writer.name("collection");
-      JsonMapper.writeAsJsonValue(collection, writer);
-      writer.endObject();
-      assertEquals("{\"collection\":" + expected + "}", writer.toString());
+
+    @ParameterizedTest(name = "test mapping to List from empty JSON object: {0}")
+    @NullSource
+    @ValueSource(strings = {"null", "", "[]"})
+    void testMappingToListFromEmptyJsonObject(String json) throws IOException {
+        List<String> parsed = JsonMapper.fromJsonToList(json);
+        assertEquals(emptyList(), parsed);
+    }
+
+    @TableTest({
+      "Scenario     | input | expected ",
+      "null value   |       | ''       ",
+      "empty string | ''    | ''       ",
+      "\\b          | '\b'  | '\"\\b\"'",
+      "\\t          | '\t'  | '\"\\t\"'",
+      "\\f          | '\f'  | '\"\\f\"'",
+      "a            | 'a'   | '\"a\"'  ",
+      "/            | '/'   | '\"\\/\"'"
+    })
+    @ParameterizedTest(name = "test mapping to JSON string: {0}")
+    @MethodSource("testMappingToJsonStringArguments")
+    void testMappingToJsonString(@Scenario String ignoredScenario, String input, String expected) {
+        String json = JsonMapper.toJson(input);
+        assertEquals(expected, json);
     }
-  }
-
-  @TableTest({
-    "Scenario       | Input                | Expected                         ",
-    "null input     |                      | '[]'                             ",
-    "empty array    | []                   | '[]'                             ",
-    "single element | [value1]             | '[\"value1\"]'                   ",
-    "two elements   | [value1, value2]     | '[\"value1\",\"value2\"]'        ",
-    "escaped quotes | [va\"lu\"e1, value2] | '[\"va\\\"lu\\\"e1\",\"value2\"]'"
-  })
-  @ParameterizedTest(name = "test mapping array to JSON array: {0}")
-  void testMappingArrayToJsonArray(String ignoredScenario, String[] input, String expected)
-      throws IOException {
-    String json = JsonMapper.toJson(input);
-    assertEquals(expected, json);
-
-    String[] parsed = JsonMapper.fromJsonToList(json).toArray(new String[] {});
-    assertArrayEquals(input != null ? input : new String[] {}, parsed);
-  }
-
-  @TableTest({
-    "Scenario | Array            | Expected                 ",
-    "null     |                  | '[]'                     ",
-    "empty    | []               | '[]'                     ",
-    "default  | [value1, value2] | '[\"value1\",\"value2\"]'"
-  })
-  void testWritingArrayAsJsonValue(
-      @Scenario String ignoredScenario, String[] array, String expected) {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer.beginObject();
-      writer.name("array");
-      JsonMapper.writeAsJsonValue(array, writer);
-      writer.endObject();
-      assertEquals("{\"array\":" + expected + "}", writer.toString());
+
+    static Stream<Arguments> testMappingToJsonStringArguments() {
+        return Stream.of(
+                arguments("char #4096", String.valueOf((char) 4096), "\"\\u1000\""),
+                arguments("char #256", String.valueOf((char) 256), "\"\\u0100\""),
+                arguments("char #128", String.valueOf((char) 128), "\"\\u0080\""),
+                arguments("\\n", "\n", "\"\\n\""),
+                arguments("\\r", "\r", "\"\\r\""),
+                arguments("\"", "\"", "\"\\\"\""),
+                arguments("\\", "\\", "\"\\\\\""));
     }
-  }
-
-  @ParameterizedTest(name = "test mapping to List from empty JSON object: {0}")
-  @NullSource
-  @ValueSource(strings = {"null", "", "[]"})
-  void testMappingToListFromEmptyJsonObject(String json) throws IOException {
-    List<String> parsed = JsonMapper.fromJsonToList(json);
-    assertEquals(emptyList(), parsed);
-  }
-
-  @TableTest({
-    "Scenario     | input | expected ",
-    "null value   |       | ''       ",
-    "empty string | ''    | ''       ",
-    "\\b          | '\b'  | '\"\\b\"'",
-    "\\t          | '\t'  | '\"\\t\"'",
-    "\\f          | '\f'  | '\"\\f\"'",
-    "a            | 'a'   | '\"a\"'  ",
-    "/            | '/'   | '\"\\/\"'"
-  })
-  @ParameterizedTest(name = "test mapping to JSON string: {0}")
-  @MethodSource("testMappingToJsonStringArguments")
-  void testMappingToJsonString(@Scenario String ignoredScenario, String input, String expected) {
-    String json = JsonMapper.toJson(input);
-    assertEquals(expected, json);
-  }
-
-  static Stream<Arguments> testMappingToJsonStringArguments() {
-    return Stream.of(
-        arguments("char #4096", String.valueOf((char) 4096), "\"\\u1000\""),
-        arguments("char #256", String.valueOf((char) 256), "\"\\u0100\""),
-        arguments("char #128", String.valueOf((char) 128), "\"\\u0080\""),
-        arguments("\\n", "\n", "\"\\n\""),
-        arguments("\\r", "\r", "\"\\r\""),
-        arguments("\"", "\"", "\"\\\"\""),
-        arguments("\\", "\\", "\"\\\\\""));
-  }
-
-  private static class UnsupportedType {
-    @Override
-    public String toString() {
-      return "toString";
+
+    private static class UnsupportedType {
+        @Override
+        public String toString() {
+            return "toString";
+        }
     }
-  }
 }
diff --git a/components/json/src/test/java/datadog/json/JsonReaderTest.java b/components/json/src/test/java/datadog/json/JsonReaderTest.java
index e716a625103..cc7bf05676d 100644
--- a/components/json/src/test/java/datadog/json/JsonReaderTest.java
+++ b/components/json/src/test/java/datadog/json/JsonReaderTest.java
@@ -17,335 +17,300 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 class JsonReaderTest {
-  @Test
-  void testReadObject() {
-    String json =
-        "{\"string\":\"bar\",\"int\":3,\"long\":3456789123,\"float\":3.142,\"double\":3.141592653589793,\"true\":true,\"false\":false,\"null\":null}";
-    try (JsonReader reader = new JsonReader(json)) {
-      reader.beginObject();
-      assertEquals("string", reader.nextName());
-      assertEquals("bar", reader.nextString());
-      assertEquals("int", reader.nextName());
-      assertEquals(3, reader.nextInt());
-      assertEquals("long", reader.nextName());
-      assertEquals(3456789123L, reader.nextLong());
-      assertEquals("float", reader.nextName());
-      assertEquals(3.142, reader.nextDouble(), 0.001);
-      assertEquals("double", reader.nextName());
-      assertEquals(3.141592653589793, reader.nextDouble(), 0.000000000000001);
-      assertEquals("true", reader.nextName());
-      assertTrue(reader.nextBoolean());
-      assertEquals("false", reader.nextName());
-      assertFalse(reader.nextBoolean());
-      assertEquals("null", reader.nextName());
-      assertTrue(reader.isNull());
-      assertNull(reader.nextValue());
-      assertFalse(reader.hasNext());
-      reader.endObject();
-    } catch (IOException e) {
-      fail("Failed to read JSON object", e);
+    @Test
+    void testReadObject() {
+        String json =
+                "{\"string\":\"bar\",\"int\":3,\"long\":3456789123,\"float\":3.142,\"double\":3.141592653589793,\"true\":true,\"false\":false,\"null\":null}";
+        try (JsonReader reader = new JsonReader(json)) {
+            reader.beginObject();
+            assertEquals("string", reader.nextName());
+            assertEquals("bar", reader.nextString());
+            assertEquals("int", reader.nextName());
+            assertEquals(3, reader.nextInt());
+            assertEquals("long", reader.nextName());
+            assertEquals(3456789123L, reader.nextLong());
+            assertEquals("float", reader.nextName());
+            assertEquals(3.142, reader.nextDouble(), 0.001);
+            assertEquals("double", reader.nextName());
+            assertEquals(3.141592653589793, reader.nextDouble(), 0.000000000000001);
+            assertEquals("true", reader.nextName());
+            assertTrue(reader.nextBoolean());
+            assertEquals("false", reader.nextName());
+            assertFalse(reader.nextBoolean());
+            assertEquals("null", reader.nextName());
+            assertTrue(reader.isNull());
+            assertNull(reader.nextValue());
+            assertFalse(reader.hasNext());
+            reader.endObject();
+        } catch (IOException e) {
+            fail("Failed to read JSON object", e);
+        }
     }
-  }
 
-  @Test
-  void testReadEmptyObject() {
-    String json = "{}";
-    try (JsonReader reader = new JsonReader(json)) {
-      reader.beginObject();
-      reader.endObject();
-    } catch (IOException e) {
-      fail("Failed to read JSON empty object", e);
+    @Test
+    void testReadEmptyObject() {
+        String json = "{}";
+        try (JsonReader reader = new JsonReader(json)) {
+            reader.beginObject();
+            reader.endObject();
+        } catch (IOException e) {
+            fail("Failed to read JSON empty object", e);
+        }
     }
-  }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"", "null", "1", "[]", "true", "false"})
-  void testInvalidObjectStart(String json) {
-    assertThrows(
-        IOException.class,
-        () -> {
-          try (JsonReader reader = new JsonReader(json)) {
-            reader.beginObject();
-          }
+    @ParameterizedTest
+    @ValueSource(strings = {"", "null", "1", "[]", "true", "false"})
+    void testInvalidObjectStart(String json) {
+        assertThrows(IOException.class, () -> {
+            try (JsonReader reader = new JsonReader(json)) {
+                reader.beginObject();
+            }
         });
-  }
+    }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"{", "{\"key\":\"value\"}", "{null}", "{]"})
-  void testInvalidObjectEnd(String json) {
-    assertThrows(
-        IOException.class,
-        () -> {
-          try (JsonReader reader = new JsonReader(json)) {
-            reader.beginObject();
-            reader.endObject();
-          }
+    @ParameterizedTest
+    @ValueSource(strings = {"{", "{\"key\":\"value\"}", "{null}", "{]"})
+    void testInvalidObjectEnd(String json) {
+        assertThrows(IOException.class, () -> {
+            try (JsonReader reader = new JsonReader(json)) {
+                reader.beginObject();
+                reader.endObject();
+            }
         });
-  }
+    }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"{\"key\"}", "{\"key\"\"value\"}", "{key:\"value\"}"})
-  void testInvalidObjectNames(String json) {
-    assertThrows(
-        IOException.class,
-        () -> {
-          try (JsonReader reader = new JsonReader(json)) {
-            reader.beginObject();
-            reader.nextName();
-          }
+    @ParameterizedTest
+    @ValueSource(strings = {"{\"key\"}", "{\"key\"\"value\"}", "{key:\"value\"}"})
+    void testInvalidObjectNames(String json) {
+        assertThrows(IOException.class, () -> {
+            try (JsonReader reader = new JsonReader(json)) {
+                reader.beginObject();
+                reader.nextName();
+            }
         });
-  }
+    }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"{\"key\":value}"})
-  void testInvalidObjectValue(String json) {
-    assertThrows(
-        IOException.class,
-        () -> {
-          try (JsonReader reader = new JsonReader(json)) {
-            reader.beginObject();
-            reader.nextName();
-            reader.nextValue();
-          }
+    @ParameterizedTest
+    @ValueSource(strings = {"{\"key\":value}"})
+    void testInvalidObjectValue(String json) {
+        assertThrows(IOException.class, () -> {
+            try (JsonReader reader = new JsonReader(json)) {
+                reader.beginObject();
+                reader.nextName();
+                reader.nextValue();
+            }
         });
-  }
-
-  @Test
-  void testReadArray() {
-    String json = "[\"foo\",\"baz\",\"bar\",\"quux\"]";
-    try (JsonReader reader = new JsonReader(json)) {
-      reader.beginArray();
-      assertEquals("foo", reader.nextString());
-      assertEquals("baz", reader.nextString());
-      assertEquals("bar", reader.nextString());
-      assertEquals("quux", reader.nextString());
-      assertFalse(reader.hasNext());
-      reader.endArray();
-    } catch (IOException e) {
-      fail("Failed to read JSON array", e);
     }
-  }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"", "null", "1", "{}", "true", "false"})
-  void testInvalidArrayStart(String json) {
-    assertThrows(
-        IOException.class,
-        () -> {
-          try (JsonReader reader = new JsonReader(json)) {
-            reader.beginArray();
-          }
-        },
-        "Failed to detect invalid array start");
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"[", "[\"value\"]", "[null", "[}"})
-  void testInvalidArrayEnd(String json) {
-    assertThrows(
-        IOException.class,
-        () -> {
-          try (JsonReader reader = new JsonReader(json)) {
+    @Test
+    void testReadArray() {
+        String json = "[\"foo\",\"baz\",\"bar\",\"quux\"]";
+        try (JsonReader reader = new JsonReader(json)) {
             reader.beginArray();
+            assertEquals("foo", reader.nextString());
+            assertEquals("baz", reader.nextString());
+            assertEquals("bar", reader.nextString());
+            assertEquals("quux", reader.nextString());
+            assertFalse(reader.hasNext());
             reader.endArray();
-          }
-        },
-        "Failed to detect invalid array end");
-  }
+        } catch (IOException e) {
+            fail("Failed to read JSON array", e);
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"", "null", "1", "{}", "true", "false"})
+    void testInvalidArrayStart(String json) {
+        assertThrows(
+                IOException.class,
+                () -> {
+                    try (JsonReader reader = new JsonReader(json)) {
+                        reader.beginArray();
+                    }
+                },
+                "Failed to detect invalid array start");
+    }
 
-  @Test
-  void testIsNull() {
-    try (JsonReader reader = new JsonReader("null")) {
-      assertTrue(reader.isNull());
-    } catch (IOException e) {
-      fail("Failed to read null value JSON", e);
+    @ParameterizedTest
+    @ValueSource(strings = {"[", "[\"value\"]", "[null", "[}"})
+    void testInvalidArrayEnd(String json) {
+        assertThrows(
+                IOException.class,
+                () -> {
+                    try (JsonReader reader = new JsonReader(json)) {
+                        reader.beginArray();
+                        reader.endArray();
+                    }
+                },
+                "Failed to detect invalid array end");
     }
-  }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"\"bar\"", "3", "3456789123", "3.142", "true", "false", "{}", "[]"})
-  void testIsNotNull(String json) {
-    try (JsonReader reader = new JsonReader(json)) {
-      assertFalse(reader.isNull());
-    } catch (IOException e) {
-      fail("Failed to read non-null value JSON", e);
+    @Test
+    void testIsNull() {
+        try (JsonReader reader = new JsonReader("null")) {
+            assertTrue(reader.isNull());
+        } catch (IOException e) {
+            fail("Failed to read null value JSON", e);
+        }
     }
-  }
 
-  @Test
-  void testReadBoolean() {
-    assertDoesNotThrow(
-        () -> {
-          assertTrue(readBoolean("true"));
-          assertFalse(readBoolean("false"));
-        },
-        "Failed to read boolean value");
-  }
+    @ParameterizedTest
+    @ValueSource(strings = {"\"bar\"", "3", "3456789123", "3.142", "true", "false", "{}", "[]"})
+    void testIsNotNull(String json) {
+        try (JsonReader reader = new JsonReader(json)) {
+            assertFalse(reader.isNull());
+        } catch (IOException e) {
+            fail("Failed to read non-null value JSON", e);
+        }
+    }
 
-  @ParameterizedTest
-  @ValueSource(
-      strings = {
-        "ttrue",
-        "ffalse",
-        "TRUE",
-        "FALSE",
-        "null",
-        "\"bar\"",
-        "3",
-        "3456789123",
-        "3.142",
-        "{}",
-        "[]"
-      })
-  void testInvalidBoolean(String json) {
-    assertThrows(
-        IOException.class, () -> readBoolean(json), "Failed to detect invalid boolean value");
-  }
+    @Test
+    void testReadBoolean() {
+        assertDoesNotThrow(
+                () -> {
+                    assertTrue(readBoolean("true"));
+                    assertFalse(readBoolean("false"));
+                },
+                "Failed to read boolean value");
+    }
 
-  @Test
-  void testStringEscaping() {
-    String json = "[\"\\\"\",\"\\\\\",\"\\/\",\"\\b\",\"\\f\",\"\\n\",\"\\r\",\"\\t\",\"\\u00C9\"]";
-    try (JsonReader reader = new JsonReader(json)) {
-      reader.beginArray();
-      assertEquals("\"", reader.nextString());
-      assertEquals("\\", reader.nextString());
-      assertEquals("/", reader.nextString());
-      assertEquals("\b", reader.nextString());
-      assertEquals("\f", reader.nextString());
-      assertEquals("\n", reader.nextString());
-      assertEquals("\r", reader.nextString());
-      assertEquals("\t", reader.nextString());
-      assertEquals("É", reader.nextString());
-      reader.endArray();
-    } catch (IOException e) {
-      fail("Failed to read escaped JSON strings", e);
+    @ParameterizedTest
+    @ValueSource(
+            strings = {"ttrue", "ffalse", "TRUE", "FALSE", "null", "\"bar\"", "3", "3456789123", "3.142", "{}", "[]"})
+    void testInvalidBoolean(String json) {
+        assertThrows(IOException.class, () -> readBoolean(json), "Failed to detect invalid boolean value");
     }
-  }
 
-  @ParameterizedTest
-  @ValueSource(
-      strings = {
-        "bar",
-        "true",
-        "false",
-        "null",
-        "3",
-        "3456789123",
-        "3.142",
-        "{}",
-        "[]",
-        "\"\\uGHIJ\""
-      })
-  void testInvalidString(String json) {
-    assertThrows(
-        IOException.class,
-        () -> {
-          try (JsonReader reader = new JsonReader(json)) {
-            reader.nextString();
-          }
-        },
-        "Failed to detect invalid string value");
-  }
+    @Test
+    void testStringEscaping() {
+        String json = "[\"\\\"\",\"\\\\\",\"\\/\",\"\\b\",\"\\f\",\"\\n\",\"\\r\",\"\\t\",\"\\u00C9\"]";
+        try (JsonReader reader = new JsonReader(json)) {
+            reader.beginArray();
+            assertEquals("\"", reader.nextString());
+            assertEquals("\\", reader.nextString());
+            assertEquals("/", reader.nextString());
+            assertEquals("\b", reader.nextString());
+            assertEquals("\f", reader.nextString());
+            assertEquals("\n", reader.nextString());
+            assertEquals("\r", reader.nextString());
+            assertEquals("\t", reader.nextString());
+            assertEquals("É", reader.nextString());
+            reader.endArray();
+        } catch (IOException e) {
+            fail("Failed to read escaped JSON strings", e);
+        }
+    }
 
-  @Test
-  void testReadInt() {
-    assertDoesNotThrow(
-        () -> {
-          assertEquals(1, readInt("1"));
-          assertEquals(0, readInt("0"));
-          assertEquals(-1, readInt("-1"));
-          assertEquals(Integer.MAX_VALUE, readInt("2147483647"));
-          assertEquals(Integer.MIN_VALUE, readInt("-2147483648"));
-        },
-        "Failed to read int value");
-  }
+    @ParameterizedTest
+    @ValueSource(strings = {"bar", "true", "false", "null", "3", "3456789123", "3.142", "{}", "[]", "\"\\uGHIJ\""})
+    void testInvalidString(String json) {
+        assertThrows(
+                IOException.class,
+                () -> {
+                    try (JsonReader reader = new JsonReader(json)) {
+                        reader.nextString();
+                    }
+                },
+                "Failed to detect invalid string value");
+    }
 
-  @ParameterizedTest
-  @ValueSource(
-      strings = {"\"bar\"", "true", "false", "null", "3456789123", "3.142", "1e100", "{}", "[]"})
-  void testInvalidInt(String json) {
-    assertThrows(IOException.class, () -> readInt(json), "Failed to detect invalid int value");
-  }
+    @Test
+    void testReadInt() {
+        assertDoesNotThrow(
+                () -> {
+                    assertEquals(1, readInt("1"));
+                    assertEquals(0, readInt("0"));
+                    assertEquals(-1, readInt("-1"));
+                    assertEquals(Integer.MAX_VALUE, readInt("2147483647"));
+                    assertEquals(Integer.MIN_VALUE, readInt("-2147483648"));
+                },
+                "Failed to read int value");
+    }
 
-  @Test
-  void testReadLong() {
-    assertDoesNotThrow(
-        () -> {
-          assertEquals(1L, readLong("1"));
-          assertEquals(0L, readLong("0"));
-          assertEquals(-1L, readLong("-1"));
-          assertEquals(Long.MAX_VALUE, readLong("9223372036854775807"));
-          assertEquals(Long.MIN_VALUE, readLong("-9223372036854775808"));
-        },
-        "Failed to read long value");
-  }
+    @ParameterizedTest
+    @ValueSource(strings = {"\"bar\"", "true", "false", "null", "3456789123", "3.142", "1e100", "{}", "[]"})
+    void testInvalidInt(String json) {
+        assertThrows(IOException.class, () -> readInt(json), "Failed to detect invalid int value");
+    }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"\"bar\"", "true", "false", "null", "3.142", "1e100", "{}", "[]"})
-  void testInvalidLong(String json) {
-    assertThrows(IOException.class, () -> readLong(json), "Failed to detect invalid long value");
-  }
+    @Test
+    void testReadLong() {
+        assertDoesNotThrow(
+                () -> {
+                    assertEquals(1L, readLong("1"));
+                    assertEquals(0L, readLong("0"));
+                    assertEquals(-1L, readLong("-1"));
+                    assertEquals(Long.MAX_VALUE, readLong("9223372036854775807"));
+                    assertEquals(Long.MIN_VALUE, readLong("-9223372036854775808"));
+                },
+                "Failed to read long value");
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"\"bar\"", "true", "false", "null", "3.142", "1e100", "{}", "[]"})
+    void testInvalidLong(String json) {
+        assertThrows(IOException.class, () -> readLong(json), "Failed to detect invalid long value");
+    }
 
-  @Test
-  void testReadDouble() {
-    assertDoesNotThrow(
-        () -> {
-          assertEquals(3.14, readDouble("3.14"), 0.01);
-          assertEquals(-3.14, readDouble("-3.14"), 0.01);
-          assertEquals(-3.14, readDouble("-3.14e0"), 0.01);
-          assertEquals(314, readDouble("3.14e2"), 1);
-          assertEquals(0.0314, readDouble("3.14e-2"), 0.0001);
-        },
-        "Failed to read double value");
-  }
+    @Test
+    void testReadDouble() {
+        assertDoesNotThrow(
+                () -> {
+                    assertEquals(3.14, readDouble("3.14"), 0.01);
+                    assertEquals(-3.14, readDouble("-3.14"), 0.01);
+                    assertEquals(-3.14, readDouble("-3.14e0"), 0.01);
+                    assertEquals(314, readDouble("3.14e2"), 1);
+                    assertEquals(0.0314, readDouble("3.14e-2"), 0.0001);
+                },
+                "Failed to read double value");
+    }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"\"bar\"", "true", "false", "null", "1ee1", "1e", "{}", "[]"})
-  void testInvalidDouble(String json) {
-    assertThrows(
-        IOException.class, () -> readDouble(json), "Failed to detect invalid double value");
-  }
+    @ParameterizedTest
+    @ValueSource(strings = {"\"bar\"", "true", "false", "null", "1ee1", "1e", "{}", "[]"})
+    void testInvalidDouble(String json) {
+        assertThrows(IOException.class, () -> readDouble(json), "Failed to detect invalid double value");
+    }
 
-  @Test
-  void testReaderOnHugePayload() {
-    try (InputStream stream = JsonReader.class.getResourceAsStream("/lorem-ipsum.json");
-        JsonReader reader = new JsonReader(new InputStreamReader(requireNonNull(stream)))) {
-      reader.beginArray();
-      while (reader.hasNext()) {
-        reader.nextString();
-      }
-      reader.endArray();
-    } catch (IOException e) {
-      fail("Failed to read JSON stream", e);
+    @Test
+    void testReaderOnHugePayload() {
+        try (InputStream stream = JsonReader.class.getResourceAsStream("/lorem-ipsum.json");
+                JsonReader reader = new JsonReader(new InputStreamReader(requireNonNull(stream)))) {
+            reader.beginArray();
+            while (reader.hasNext()) {
+                reader.nextString();
+            }
+            reader.endArray();
+        } catch (IOException e) {
+            fail("Failed to read JSON stream", e);
+        }
     }
-  }
 
-  @Test
-  void testConstructor() {
-    assertThrows(IllegalArgumentException.class, () -> new JsonReader(null, false).close());
-  }
+    @Test
+    void testConstructor() {
+        assertThrows(IllegalArgumentException.class, () -> new JsonReader(null, false).close());
+    }
 
-  private boolean readBoolean(String json) throws IOException {
-    try (JsonReader reader = new JsonReader(json)) {
-      return reader.nextBoolean();
+    private boolean readBoolean(String json) throws IOException {
+        try (JsonReader reader = new JsonReader(json)) {
+            return reader.nextBoolean();
+        }
     }
-  }
 
-  private int readInt(String json) throws IOException {
-    try (JsonReader reader = new JsonReader(json)) {
-      return reader.nextInt();
+    private int readInt(String json) throws IOException {
+        try (JsonReader reader = new JsonReader(json)) {
+            return reader.nextInt();
+        }
     }
-  }
 
-  private long readLong(String json) throws IOException {
-    try (JsonReader reader = new JsonReader(json)) {
-      return reader.nextLong();
+    private long readLong(String json) throws IOException {
+        try (JsonReader reader = new JsonReader(json)) {
+            return reader.nextLong();
+        }
     }
-  }
 
-  private double readDouble(String json) throws IOException {
-    try (JsonReader reader = new JsonReader(json)) {
-      return reader.nextDouble();
+    private double readDouble(String json) throws IOException {
+        try (JsonReader reader = new JsonReader(json)) {
+            return reader.nextDouble();
+        }
     }
-  }
 }
diff --git a/components/json/src/test/java/datadog/json/JsonStructureTest.java b/components/json/src/test/java/datadog/json/JsonStructureTest.java
index e3fb9d16802..03e68e5ffb9 100644
--- a/components/json/src/test/java/datadog/json/JsonStructureTest.java
+++ b/components/json/src/test/java/datadog/json/JsonStructureTest.java
@@ -7,27 +7,27 @@
 import org.junit.jupiter.api.Test;
 
 class JsonStructureTest {
-  // toString is only for debug purpose and has no behavior to cover
-  @Test
-  void coverToString() {
-    SafeJsonStructure safeJsonStructure = new SafeJsonStructure();
-    assertNotNull(safeJsonStructure.toString());
-    safeJsonStructure.beginObject();
-    safeJsonStructure.endObject();
-    assertNotNull(safeJsonStructure.toString());
-  }
+    // toString is only for debug purpose and has no behavior to cover
+    @Test
+    void coverToString() {
+        SafeJsonStructure safeJsonStructure = new SafeJsonStructure();
+        assertNotNull(safeJsonStructure.toString());
+        safeJsonStructure.beginObject();
+        safeJsonStructure.endObject();
+        assertNotNull(safeJsonStructure.toString());
+    }
 
-  // Lenient is a stub and has no behavior to cover
-  @Test
-  void lenientStructure() {
-    LenientJsonStructure lenientJsonStructure = new LenientJsonStructure();
-    lenientJsonStructure.beginObject();
-    assertTrue(lenientJsonStructure.objectStarted());
-    lenientJsonStructure.endObject();
-    lenientJsonStructure.beginArray();
-    assertTrue(lenientJsonStructure.arrayStarted());
-    lenientJsonStructure.endArray();
-    assertDoesNotThrow(lenientJsonStructure::addName);
-    assertDoesNotThrow(lenientJsonStructure::addValue);
-  }
+    // Lenient is a stub and has no behavior to cover
+    @Test
+    void lenientStructure() {
+        LenientJsonStructure lenientJsonStructure = new LenientJsonStructure();
+        lenientJsonStructure.beginObject();
+        assertTrue(lenientJsonStructure.objectStarted());
+        lenientJsonStructure.endObject();
+        lenientJsonStructure.beginArray();
+        assertTrue(lenientJsonStructure.arrayStarted());
+        lenientJsonStructure.endArray();
+        assertDoesNotThrow(lenientJsonStructure::addName);
+        assertDoesNotThrow(lenientJsonStructure::addValue);
+    }
 }
diff --git a/components/json/src/test/java/datadog/json/JsonWriterTest.java b/components/json/src/test/java/datadog/json/JsonWriterTest.java
index 5740fef29f5..be8aaded72f 100644
--- a/components/json/src/test/java/datadog/json/JsonWriterTest.java
+++ b/components/json/src/test/java/datadog/json/JsonWriterTest.java
@@ -7,221 +7,218 @@
 import org.junit.jupiter.api.Test;
 
 class JsonWriterTest {
-  @Test
-  void testObject() {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer
-          .beginObject()
-          .name("string")
-          .value("bar")
-          .name("int")
-          .value(3)
-          .name("long")
-          .value(3456789123L)
-          .name("float")
-          .value(3.142)
-          .name("double")
-          .value(PI)
-          .name("true")
-          .value(true)
-          .name("false")
-          .value(false)
-          .name("null")
-          .nullValue()
-          .endObject();
-
-      assertEquals(
-          "{\"string\":\"bar\",\"int\":3,\"long\":3456789123,\"float\":3.142,\"double\":3.141592653589793,\"true\":true,\"false\":false,\"null\":null}",
-          writer.toString(),
-          "Check object writer");
+    @Test
+    void testObject() {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginObject()
+                    .name("string")
+                    .value("bar")
+                    .name("int")
+                    .value(3)
+                    .name("long")
+                    .value(3456789123L)
+                    .name("float")
+                    .value(3.142)
+                    .name("double")
+                    .value(PI)
+                    .name("true")
+                    .value(true)
+                    .name("false")
+                    .value(false)
+                    .name("null")
+                    .nullValue()
+                    .endObject();
+
+            assertEquals(
+                    "{\"string\":\"bar\",\"int\":3,\"long\":3456789123,\"float\":3.142,\"double\":3.141592653589793,\"true\":true,\"false\":false,\"null\":null}",
+                    writer.toString(),
+                    "Check object writer");
+        }
     }
-  }
-
-  @Test
-  void testNullName() {
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> {
-          try (JsonWriter writer = new JsonWriter()) {
+
+    @Test
+    void testNullName() {
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    try (JsonWriter writer = new JsonWriter()) {
+                        writer.beginObject();
+                        writer.name(null);
+                    }
+                },
+                "Check null name");
+    }
+
+    @Test
+    void testNullValue() {
+        try (JsonWriter writer = new JsonWriter()) {
             writer.beginObject();
-            writer.name(null);
-          }
-        },
-        "Check null name");
-  }
-
-  @Test
-  void testNullValue() {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer.beginObject();
-      writer.name("string").value(null);
-      writer.endObject();
-      assertEquals("{\"string\":null}", writer.toString(), "Check null string");
+            writer.name("string").value(null);
+            writer.endObject();
+            assertEquals("{\"string\":null}", writer.toString(), "Check null string");
+        }
     }
-  }
-
-  @Test
-  void testNaNValues() {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer.beginObject();
-      writer.name("float").value(Float.NaN);
-      writer.name("double").value(Double.NaN);
-      writer.endObject();
-      assertEquals("{\"float\":null,\"double\":null}", writer.toString(), "Check NaN values");
+
+    @Test
+    void testNaNValues() {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginObject();
+            writer.name("float").value(Float.NaN);
+            writer.name("double").value(Double.NaN);
+            writer.endObject();
+            assertEquals("{\"float\":null,\"double\":null}", writer.toString(), "Check NaN values");
+        }
     }
-  }
 
-  @Test
-  void testArray() {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer.beginArray().value("foo").value("baz").value("bar").value("quux").endArray();
-      assertEquals("[\"foo\",\"baz\",\"bar\",\"quux\"]", writer.toString(), "Check array writer");
+    @Test
+    void testArray() {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginArray()
+                    .value("foo")
+                    .value("baz")
+                    .value("bar")
+                    .value("quux")
+                    .endArray();
+            assertEquals("[\"foo\",\"baz\",\"bar\",\"quux\"]", writer.toString(), "Check array writer");
+        }
     }
-  }
-
-  @Test
-  void testStringEscaping() {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer
-          .beginArray()
-          .value("\"")
-          .value("\\")
-          .value("/")
-          .value("\b")
-          .value("\f")
-          .value("\n")
-          .value("\r")
-          .value("\t")
-          .endArray();
-
-      assertEquals(
-          "[\"\\\"\",\"\\\\\",\"\\/\",\"\\b\",\"\\f\",\"\\n\",\"\\r\",\"\\t\"]",
-          writer.toString(),
-          "Check string escaping");
+
+    @Test
+    void testStringEscaping() {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginArray()
+                    .value("\"")
+                    .value("\\")
+                    .value("/")
+                    .value("\b")
+                    .value("\f")
+                    .value("\n")
+                    .value("\r")
+                    .value("\t")
+                    .endArray();
+
+            assertEquals(
+                    "[\"\\\"\",\"\\\\\",\"\\/\",\"\\b\",\"\\f\",\"\\n\",\"\\r\",\"\\t\"]",
+                    writer.toString(),
+                    "Check string escaping");
+        }
     }
-  }
 
-  @Test
-  void testControlCharacterEscaping() {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer.beginArray().value("\u0001").value("\u001F").endArray();
+    @Test
+    void testControlCharacterEscaping() {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginArray().value("\u0001").value("\u001F").endArray();
 
-      assertEquals(
-          "[\"\\u0001\",\"\\u001F\"]", writer.toString(), "Check control character escaping");
+            assertEquals("[\"\\u0001\",\"\\u001F\"]", writer.toString(), "Check control character escaping");
+        }
     }
-  }
-
-  @Test
-  void testArrayObjectNesting() {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer
-          .beginObject()
-          .name("array")
-          .beginArray()
-          .value("true")
-          .value("false")
-          .endArray()
-          .endObject();
-
-      assertEquals(
-          "{\"array\":[\"true\",\"false\"]}", writer.toString(), "Check array / object nesting");
+
+    @Test
+    void testArrayObjectNesting() {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginObject()
+                    .name("array")
+                    .beginArray()
+                    .value("true")
+                    .value("false")
+                    .endArray()
+                    .endObject();
+
+            assertEquals("{\"array\":[\"true\",\"false\"]}", writer.toString(), "Check array / object nesting");
+        }
     }
-  }
-
-  @Test
-  void testObjectArrayNesting() {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer
-          .beginArray()
-          .beginObject()
-          .name("true")
-          .value(true)
-          .endObject()
-          .beginObject()
-          .name("false")
-          .value(false)
-          .endObject()
-          .endArray();
-
-      assertEquals(
-          "[{\"true\":true},{\"false\":false}]", writer.toString(), "Check object / array nesting");
+
+    @Test
+    void testObjectArrayNesting() {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginArray()
+                    .beginObject()
+                    .name("true")
+                    .value(true)
+                    .endObject()
+                    .beginObject()
+                    .name("false")
+                    .value(false)
+                    .endObject()
+                    .endArray();
+
+            assertEquals("[{\"true\":true},{\"false\":false}]", writer.toString(), "Check object / array nesting");
+        }
     }
-  }
 
-  @Test
-  void testNameOnlyInObject() {
-    try (JsonWriter writer = new JsonWriter()) {
-      assertThrows(
-          IllegalStateException.class, () -> writer.name("key"), "Check name only in object");
+    @Test
+    void testNameOnlyInObject() {
+        try (JsonWriter writer = new JsonWriter()) {
+            assertThrows(IllegalStateException.class, () -> writer.name("key"), "Check name only in object");
+        }
     }
-  }
-
-  @Test
-  void testCompleteObject() {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer.beginObject();
-      writer.endObject();
-      assertThrows(IllegalStateException.class, writer::beginObject, "Check complete object");
-      assertThrows(IllegalStateException.class, writer::beginArray, "Check complete object");
+
+    @Test
+    void testCompleteObject() {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginObject();
+            writer.endObject();
+            assertThrows(IllegalStateException.class, writer::beginObject, "Check complete object");
+            assertThrows(IllegalStateException.class, writer::beginArray, "Check complete object");
+        }
     }
-  }
 
-  @Test
-  void testSize() {
-    try (JsonWriter writer = new JsonWriter()) {
-      assertEquals(0, writer.size(), "Check empty writer size");
+    @Test
+    void testSize() {
+        try (JsonWriter writer = new JsonWriter()) {
+            assertEquals(0, writer.size(), "Check empty writer size");
 
-      writer.beginArray();
-      assertSizeInBytes(writer, "Check size after plain ASCII string");
-      writer.value("bar");
+            writer.beginArray();
+            assertSizeInBytes(writer, "Check size after plain ASCII string");
+            writer.value("bar");
 
-      assertSizeInBytes(writer, "Check size after escaped characters");
-      writer.value("\"\\/");
+            assertSizeInBytes(writer, "Check size after escaped characters");
+            writer.value("\"\\/");
 
-      assertSizeInBytes(writer, "Check size after named escapes");
-      writer.value("\b\f\n\r\t");
+            assertSizeInBytes(writer, "Check size after named escapes");
+            writer.value("\b\f\n\r\t");
 
-      assertSizeInBytes(writer, "Check size after control character escape");
-      writer.value("\u0001");
+            assertSizeInBytes(writer, "Check size after control character escape");
+            writer.value("\u0001");
 
-      assertSizeInBytes(writer, "Check size after non-ASCII character escape");
-      writer.value("café");
+            assertSizeInBytes(writer, "Check size after non-ASCII character escape");
+            writer.value("café");
 
-      assertSizeInBytes(writer, "Check size after int value");
-      writer.value(3);
+            assertSizeInBytes(writer, "Check size after int value");
+            writer.value(3);
 
-      assertSizeInBytes(writer, "Check size after long value");
-      writer.value(3456789123L);
+            assertSizeInBytes(writer, "Check size after long value");
+            writer.value(3456789123L);
 
-      assertSizeInBytes(writer, "Check size after float value");
-      writer.value(3.142f);
+            assertSizeInBytes(writer, "Check size after float value");
+            writer.value(3.142f);
 
-      assertSizeInBytes(writer, "Check size after double value");
-      writer.value(PI);
+            assertSizeInBytes(writer, "Check size after double value");
+            writer.value(PI);
 
-      assertSizeInBytes(writer, "Check size after boolean value");
-      writer.value(true);
+            assertSizeInBytes(writer, "Check size after boolean value");
+            writer.value(true);
 
-      assertSizeInBytes(writer, "Check size after null value");
-      writer.nullValue();
+            assertSizeInBytes(writer, "Check size after null value");
+            writer.nullValue();
 
-      writer.endArray();
-      assertSizeInBytes(writer, "Check final size matches written bytes");
+            writer.endArray();
+            assertSizeInBytes(writer, "Check final size matches written bytes");
+        }
     }
-  }
-
-  private static void assertSizeInBytes(JsonWriter writer, String message) {
-    int size = writer.size();
-    assertEquals(writer.toByteArray().length, size, message);
-  }
-
-  @Test
-  void testCompleteArray() {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer.beginArray();
-      writer.endArray();
-      assertThrows(IllegalStateException.class, writer::beginObject, "Check complete array");
-      assertThrows(IllegalStateException.class, writer::beginArray, "Check complete array");
+
+    private static void assertSizeInBytes(JsonWriter writer, String message) {
+        int size = writer.size();
+        assertEquals(writer.toByteArray().length, size, message);
+    }
+
+    @Test
+    void testCompleteArray() {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginArray();
+            writer.endArray();
+            assertThrows(IllegalStateException.class, writer::beginObject, "Check complete array");
+            assertThrows(IllegalStateException.class, writer::beginArray, "Check complete array");
+        }
     }
-  }
 }
diff --git a/components/json/src/test/java/datadog/json/SafeJsonWriterTest.java b/components/json/src/test/java/datadog/json/SafeJsonWriterTest.java
index 9bdd7960d05..14ffb0519b7 100644
--- a/components/json/src/test/java/datadog/json/SafeJsonWriterTest.java
+++ b/components/json/src/test/java/datadog/json/SafeJsonWriterTest.java
@@ -6,128 +6,126 @@
 import org.junit.jupiter.api.Test;
 
 class SafeJsonWriterTest {
-  @Test
-  void testRootElement() {
-    assertDoesNotThrow(
-        () -> {
-          try (JsonWriter writer = new JsonWriter()) {
-            writer.beginObject().endObject();
-          }
-        },
-        "Check object allowed as root element");
-    assertDoesNotThrow(
-        () -> {
-          try (JsonWriter writer = new JsonWriter()) {
-            writer.beginObject().beginArray();
-          }
-        },
-        "Check array allowed as root element");
-    assertDoesNotThrow(
-        () -> {
-          try (JsonWriter writer = new JsonWriter()) {
-            writer.value("string");
-          }
-        },
-        "Check string allowed as root element");
-    assertDoesNotThrow(
-        () -> {
-          try (JsonWriter writer = new JsonWriter()) {
-            writer.value(1);
-          }
-        },
-        "Check number allowed as root element");
-    assertDoesNotThrow(
-        () -> {
-          try (JsonWriter writer = new JsonWriter()) {
-            writer.value(true);
-          }
-        },
-        "Check boolean allowed as root element");
-    assertDoesNotThrow(
-        () -> {
-          try (JsonWriter writer = new JsonWriter()) {
-            writer.nullValue();
-          }
-        },
-        "Check null value allowed as root element");
-  }
+    @Test
+    void testRootElement() {
+        assertDoesNotThrow(
+                () -> {
+                    try (JsonWriter writer = new JsonWriter()) {
+                        writer.beginObject().endObject();
+                    }
+                },
+                "Check object allowed as root element");
+        assertDoesNotThrow(
+                () -> {
+                    try (JsonWriter writer = new JsonWriter()) {
+                        writer.beginObject().beginArray();
+                    }
+                },
+                "Check array allowed as root element");
+        assertDoesNotThrow(
+                () -> {
+                    try (JsonWriter writer = new JsonWriter()) {
+                        writer.value("string");
+                    }
+                },
+                "Check string allowed as root element");
+        assertDoesNotThrow(
+                () -> {
+                    try (JsonWriter writer = new JsonWriter()) {
+                        writer.value(1);
+                    }
+                },
+                "Check number allowed as root element");
+        assertDoesNotThrow(
+                () -> {
+                    try (JsonWriter writer = new JsonWriter()) {
+                        writer.value(true);
+                    }
+                },
+                "Check boolean allowed as root element");
+        assertDoesNotThrow(
+                () -> {
+                    try (JsonWriter writer = new JsonWriter()) {
+                        writer.nullValue();
+                    }
+                },
+                "Check null value allowed as root element");
+    }
 
-  @Test
-  void testNestedElements() {
-    assertDoesNotThrow(
-        () -> {
-          try (JsonWriter writer = new JsonWriter()) {
-            writer
-                .beginObject()
-                .beginObject()
-                .beginObject()
-                .endObject()
-                .beginObject()
-                .endObject()
-                .endObject()
-                .endObject();
-          }
-        },
-        "Check nested objects");
-    assertDoesNotThrow(
-        () -> {
-          try (JsonWriter writer = new JsonWriter()) {
-            writer
-                .beginArray()
-                .beginArray()
-                .beginArray()
-                .endArray()
-                .beginArray()
-                .endArray()
-                .endArray()
-                .endArray();
-          }
-        },
-        "Check nested arrays");
+    @Test
+    void testNestedElements() {
+        assertDoesNotThrow(
+                () -> {
+                    try (JsonWriter writer = new JsonWriter()) {
+                        writer.beginObject()
+                                .beginObject()
+                                .beginObject()
+                                .endObject()
+                                .beginObject()
+                                .endObject()
+                                .endObject()
+                                .endObject();
+                    }
+                },
+                "Check nested objects");
+        assertDoesNotThrow(
+                () -> {
+                    try (JsonWriter writer = new JsonWriter()) {
+                        writer.beginArray()
+                                .beginArray()
+                                .beginArray()
+                                .endArray()
+                                .beginArray()
+                                .endArray()
+                                .endArray()
+                                .endArray();
+                    }
+                },
+                "Check nested arrays");
 
-    assertThrows(
-        IllegalStateException.class,
-        () -> {
-          try (JsonWriter writer = new JsonWriter()) {
-            writer.beginObject().beginObject().endObject().endArray();
-          }
-        },
-        "Check invalid array end");
-    assertThrows(
-        IllegalStateException.class,
-        () -> {
-          try (JsonWriter writer = new JsonWriter()) {
-            writer.beginArray().beginArray().endArray().endObject();
-          }
-        },
-        "Check invalid object end");
-  }
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    try (JsonWriter writer = new JsonWriter()) {
+                        writer.beginObject().beginObject().endObject().endArray();
+                    }
+                },
+                "Check invalid array end");
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    try (JsonWriter writer = new JsonWriter()) {
+                        writer.beginArray().beginArray().endArray().endObject();
+                    }
+                },
+                "Check invalid object end");
+    }
 
-  @Test
-  void testCompleteJson() {
-    assertThrows(
-        IllegalStateException.class,
-        () -> {
-          try (JsonWriter writer = new JsonWriter()) {
-            writer.beginObject().endObject().value("invalid");
-          }
-        },
-        "Check complete object");
-    assertThrows(
-        IllegalStateException.class,
-        () -> {
-          try (JsonWriter writer = new JsonWriter()) {
-            writer.beginArray().endArray().value("invalid");
-          }
-        },
-        "Check complete array");
-    assertThrows(
-        IllegalStateException.class,
-        () -> {
-          try (JsonWriter writer = new JsonWriter()) {
-            writer.value("string").value("invalid");
-          }
-        },
-        "Check complete value");
-  }
+    @Test
+    void testCompleteJson() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    try (JsonWriter writer = new JsonWriter()) {
+                        writer.beginObject().endObject().value("invalid");
+                    }
+                },
+                "Check complete object");
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    try (JsonWriter writer = new JsonWriter()) {
+                        writer.beginArray().endArray().value("invalid");
+                    }
+                },
+                "Check complete array");
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    try (JsonWriter writer = new JsonWriter()) {
+                        writer.value("string").value("invalid");
+                    }
+                },
+                "Check complete value");
+    }
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/ClassLoaderResourcePathLocator.java b/components/native-loader/src/main/java/datadog/nativeloader/ClassLoaderResourcePathLocator.java
index 1aef0ff3ca8..88d0158e883 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/ClassLoaderResourcePathLocator.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/ClassLoaderResourcePathLocator.java
@@ -5,31 +5,29 @@
 
 /** ClassLoaderResourcePathLocator locates library paths inside a {@link ClassLoader} */
 final class ClassLoaderResourcePathLocator implements PathLocator {
-  private final ClassLoader classLoader;
-  private final String baseResource;
+    private final ClassLoader classLoader;
+    private final String baseResource;
 
-  public ClassLoaderResourcePathLocator(final ClassLoader classLoader, final String baseResource) {
-    this.classLoader = classLoader;
-    this.baseResource = baseResource;
-  }
+    public ClassLoaderResourcePathLocator(final ClassLoader classLoader, final String baseResource) {
+        this.classLoader = classLoader;
+        this.baseResource = baseResource;
+    }
 
-  @Override
-  public URL locate(String optionalComponent, String path) {
-    return this.classLoader.getResource(
-        PathUtils.concatPath(optionalComponent, this.baseResource, path));
-  }
+    @Override
+    public URL locate(String optionalComponent, String path) {
+        return this.classLoader.getResource(PathUtils.concatPath(optionalComponent, this.baseResource, path));
+    }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(this.classLoader, this.baseResource);
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.classLoader, this.baseResource);
+    }
 
-  @Override
-  public boolean equals(Object obj) {
-    if (!(obj instanceof ClassLoaderResourcePathLocator)) return false;
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ClassLoaderResourcePathLocator)) return false;
 
-    ClassLoaderResourcePathLocator that = (ClassLoaderResourcePathLocator) obj;
-    return this.classLoader.equals(that.classLoader)
-        && Objects.equals(this.baseResource, that.baseResource);
-  }
+        ClassLoaderResourcePathLocator that = (ClassLoaderResourcePathLocator) obj;
+        return this.classLoader.equals(that.classLoader) && Objects.equals(this.baseResource, that.baseResource);
+    }
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/CompositeLibraryLoadingListener.java b/components/native-loader/src/main/java/datadog/nativeloader/CompositeLibraryLoadingListener.java
index 6f87121b6d2..4d6039c0c75 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/CompositeLibraryLoadingListener.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/CompositeLibraryLoadingListener.java
@@ -7,134 +7,120 @@
 import java.util.Collection;
 
 final class CompositeLibraryLoadingListener extends SafeLibraryLoadingListener {
-  private final Collection<? extends LibraryLoadingListener> listeners;
+    private final Collection<? extends LibraryLoadingListener> listeners;
 
-  CompositeLibraryLoadingListener(LibraryLoadingListener... listeners) {
-    this(Arrays.asList(listeners));
-  }
+    CompositeLibraryLoadingListener(LibraryLoadingListener... listeners) {
+        this(Arrays.asList(listeners));
+    }
 
-  CompositeLibraryLoadingListener(Collection<? extends LibraryLoadingListener> listeners) {
-    this.listeners = listeners;
-  }
+    CompositeLibraryLoadingListener(Collection<? extends LibraryLoadingListener> listeners) {
+        this.listeners = listeners;
+    }
 
-  @Override
-  public boolean isNop() {
-    return this.listeners.isEmpty();
-  }
+    @Override
+    public boolean isNop() {
+        return this.listeners.isEmpty();
+    }
 
-  int size() {
-    return this.listeners.size();
-  }
+    int size() {
+        return this.listeners.size();
+    }
 
-  @Override
-  public void onResolveDynamic(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      boolean isPreloaded,
-      URL optionalUrl) {
-    for (LibraryLoadingListener listener : this.listeners) {
-      try {
-        listener.onResolveDynamic(
-            platformSpec, optionalComponent, libName, isPreloaded, optionalUrl);
-      } catch (Throwable ignored) {
-      }
+    @Override
+    public void onResolveDynamic(
+            PlatformSpec platformSpec, String optionalComponent, String libName, boolean isPreloaded, URL optionalUrl) {
+        for (LibraryLoadingListener listener : this.listeners) {
+            try {
+                listener.onResolveDynamic(platformSpec, optionalComponent, libName, isPreloaded, optionalUrl);
+            } catch (Throwable ignored) {
+            }
+        }
     }
-  }
 
-  @Override
-  public void onResolveDynamicFailure(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      Throwable optionalCause) {
-    for (LibraryLoadingListener listener : this.listeners) {
-      try {
-        listener.onResolveDynamicFailure(platformSpec, optionalComponent, libName, optionalCause);
-      } catch (Throwable ignored) {
-      }
+    @Override
+    public void onResolveDynamicFailure(
+            PlatformSpec platformSpec, String optionalComponent, String libName, Throwable optionalCause) {
+        for (LibraryLoadingListener listener : this.listeners) {
+            try {
+                listener.onResolveDynamicFailure(platformSpec, optionalComponent, libName, optionalCause);
+            } catch (Throwable ignored) {
+            }
+        }
     }
-  }
 
-  @Override
-  public void onLoad(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      boolean isPreloaded,
-      Path optionalLibPath) {
-    for (LibraryLoadingListener listener : this.listeners) {
-      try {
-        listener.onLoad(platformSpec, optionalComponent, libName, isPreloaded, optionalLibPath);
-      } catch (Throwable ignored) {
-      }
+    @Override
+    public void onLoad(
+            PlatformSpec platformSpec,
+            String optionalComponent,
+            String libName,
+            boolean isPreloaded,
+            Path optionalLibPath) {
+        for (LibraryLoadingListener listener : this.listeners) {
+            try {
+                listener.onLoad(platformSpec, optionalComponent, libName, isPreloaded, optionalLibPath);
+            } catch (Throwable ignored) {
+            }
+        }
     }
-  }
 
-  @Override
-  public void onLoadFailure(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      Throwable optionalCause) {
-    for (LibraryLoadingListener listener : this.listeners) {
-      try {
-        listener.onLoadFailure(platformSpec, optionalComponent, libName, optionalCause);
-      } catch (Throwable ignored) {
-      }
+    @Override
+    public void onLoadFailure(
+            PlatformSpec platformSpec, String optionalComponent, String libName, Throwable optionalCause) {
+        for (LibraryLoadingListener listener : this.listeners) {
+            try {
+                listener.onLoadFailure(platformSpec, optionalComponent, libName, optionalCause);
+            } catch (Throwable ignored) {
+            }
+        }
     }
-  }
 
-  @Override
-  public void onTempFileCreated(
-      PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
-    for (LibraryLoadingListener listener : this.listeners) {
-      try {
-        listener.onTempFileCreated(platformSpec, optionalComponent, libName, tempFile);
-      } catch (Throwable ignored) {
-      }
+    @Override
+    public void onTempFileCreated(PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
+        for (LibraryLoadingListener listener : this.listeners) {
+            try {
+                listener.onTempFileCreated(platformSpec, optionalComponent, libName, tempFile);
+            } catch (Throwable ignored) {
+            }
+        }
     }
-  }
 
-  @Override
-  public void onTempFileCreationFailure(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      Path tempDir,
-      String libExt,
-      Throwable optionalCause) {
-    for (LibraryLoadingListener listener : this.listeners) {
-      try {
-        listener.onTempFileCreationFailure(
-            platformSpec, optionalComponent, libName, tempDir, libExt, optionalCause);
-      } catch (Throwable ignored) {
-      }
+    @Override
+    public void onTempFileCreationFailure(
+            PlatformSpec platformSpec,
+            String optionalComponent,
+            String libName,
+            Path tempDir,
+            String libExt,
+            Throwable optionalCause) {
+        for (LibraryLoadingListener listener : this.listeners) {
+            try {
+                listener.onTempFileCreationFailure(
+                        platformSpec, optionalComponent, libName, tempDir, libExt, optionalCause);
+            } catch (Throwable ignored) {
+            }
+        }
     }
-  }
 
-  @Override
-  public void onTempFileCleanup(
-      PlatformSpec platformSpec, String optionalComponent, String libName, Path tempPath) {
-    for (LibraryLoadingListener listener : this.listeners) {
-      try {
-        listener.onTempFileCleanup(platformSpec, optionalComponent, libName, tempPath);
-      } catch (Throwable ignored) {
-      }
+    @Override
+    public void onTempFileCleanup(PlatformSpec platformSpec, String optionalComponent, String libName, Path tempPath) {
+        for (LibraryLoadingListener listener : this.listeners) {
+            try {
+                listener.onTempFileCleanup(platformSpec, optionalComponent, libName, tempPath);
+            } catch (Throwable ignored) {
+            }
+        }
     }
-  }
 
-  @Override
-  public CompositeLibraryLoadingListener join(LibraryLoadingListener... listeners) {
-    ArrayList<LibraryLoadingListener> combinedListeners =
-        new ArrayList<>(this.listeners.size() + listeners.length);
-    combinedListeners.addAll(this.listeners);
-    combinedListeners.addAll(Arrays.asList(listeners));
-    return new CompositeLibraryLoadingListener(combinedListeners);
-  }
+    @Override
+    public CompositeLibraryLoadingListener join(LibraryLoadingListener... listeners) {
+        ArrayList<LibraryLoadingListener> combinedListeners = new ArrayList<>(this.listeners.size() + listeners.length);
+        combinedListeners.addAll(this.listeners);
+        combinedListeners.addAll(Arrays.asList(listeners));
+        return new CompositeLibraryLoadingListener(combinedListeners);
+    }
 
-  @Override
-  public String toString() {
-    return this.getClass().getSimpleName() + ":" + this.listeners.toString();
-  }
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName() + ":" + this.listeners.toString();
+    }
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/FlatDirLibraryResolver.java b/components/native-loader/src/main/java/datadog/nativeloader/FlatDirLibraryResolver.java
index 9730b8de7f5..38f465b9235 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/FlatDirLibraryResolver.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/FlatDirLibraryResolver.java
@@ -7,49 +7,49 @@
  * {os}-{arch}-{libc/musl}</code>
  */
 public final class FlatDirLibraryResolver implements LibraryResolver {
-  public static final FlatDirLibraryResolver INSTANCE = new FlatDirLibraryResolver();
+    public static final FlatDirLibraryResolver INSTANCE = new FlatDirLibraryResolver();
 
-  private FlatDirLibraryResolver() {}
+    private FlatDirLibraryResolver() {}
 
-  @Override
-  public final URL resolve(
-      PathLocator pathLocator, PlatformSpec platformSpec, String optionalComponent, String libName)
-      throws Exception {
-    PathLocatorHelper pathLocatorHelper = new PathLocatorHelper(libName, pathLocator);
+    @Override
+    public final URL resolve(
+            PathLocator pathLocator, PlatformSpec platformSpec, String optionalComponent, String libName)
+            throws Exception {
+        PathLocatorHelper pathLocatorHelper = new PathLocatorHelper(libName, pathLocator);
 
-    String libFileName = PathUtils.libFileName(platformSpec, libName);
+        String libFileName = PathUtils.libFileName(platformSpec, libName);
 
-    String osPath = PathUtils.osPartOf(platformSpec);
-    String archPath = PathUtils.archPartOf(platformSpec);
-    String libcPath = PathUtils.libcPartOf(platformSpec);
+        String osPath = PathUtils.osPartOf(platformSpec);
+        String archPath = PathUtils.archPartOf(platformSpec);
+        String libcPath = PathUtils.libcPartOf(platformSpec);
 
-    URL url;
-    String regularPath = osPath + "-" + archPath;
+        URL url;
+        String regularPath = osPath + "-" + archPath;
 
-    if (libcPath != null) {
-      String specializedPath = regularPath + "-" + libcPath;
-      url = pathLocatorHelper.locate(optionalComponent, specializedPath + "/" + libFileName);
-      if (url != null) return url;
-    }
+        if (libcPath != null) {
+            String specializedPath = regularPath + "-" + libcPath;
+            url = pathLocatorHelper.locate(optionalComponent, specializedPath + "/" + libFileName);
+            if (url != null) return url;
+        }
 
-    url = pathLocatorHelper.locate(optionalComponent, regularPath + "/" + libFileName);
-    if (url != null) return url;
+        url = pathLocatorHelper.locate(optionalComponent, regularPath + "/" + libFileName);
+        if (url != null) return url;
 
-    url = pathLocatorHelper.locate(optionalComponent, osPath + "/" + libFileName);
-    if (url != null) return url;
+        url = pathLocatorHelper.locate(optionalComponent, osPath + "/" + libFileName);
+        if (url != null) return url;
 
-    // fallback to searching at top-level, mostly concession to good out-of-box behavior
-    // with java.library.path
-    url = pathLocatorHelper.locate(optionalComponent, libFileName);
-    if (url != null) return url;
+        // fallback to searching at top-level, mostly concession to good out-of-box behavior
+        // with java.library.path
+        url = pathLocatorHelper.locate(optionalComponent, libFileName);
+        if (url != null) return url;
 
-    if (optionalComponent != null) {
-      url = pathLocatorHelper.locate(null, libFileName);
-      if (url != null) return url;
-    }
+        if (optionalComponent != null) {
+            url = pathLocatorHelper.locate(null, libFileName);
+            if (url != null) return url;
+        }
 
-    pathLocatorHelper.tryThrow();
+        pathLocatorHelper.tryThrow();
 
-    return null;
-  }
+        return null;
+    }
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/IntrospectPlatformSpec.java b/components/native-loader/src/main/java/datadog/nativeloader/IntrospectPlatformSpec.java
index 00ef82d6d69..f21601200f9 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/IntrospectPlatformSpec.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/IntrospectPlatformSpec.java
@@ -7,59 +7,59 @@
  * Default PlatformSpec used in dd-trace-java -- wraps detection code in component:environment
  */
 final class IntrospectPlatformSpec extends PlatformSpec {
-  static final PlatformSpec INSTANCE = new IntrospectPlatformSpec();
+    static final PlatformSpec INSTANCE = new IntrospectPlatformSpec();
 
-  @Override
-  public boolean isLinux() {
-    return OperatingSystem.isLinux();
-  }
+    @Override
+    public boolean isLinux() {
+        return OperatingSystem.isLinux();
+    }
 
-  @Override
-  public boolean isMac() {
-    return OperatingSystem.isMacOs();
-  }
+    @Override
+    public boolean isMac() {
+        return OperatingSystem.isMacOs();
+    }
 
-  @Override
-  public boolean isWindows() {
-    return OperatingSystem.isWindows();
-  }
+    @Override
+    public boolean isWindows() {
+        return OperatingSystem.isWindows();
+    }
 
-  @Override
-  public boolean isMusl() {
-    return OperatingSystem.isMusl();
-  }
+    @Override
+    public boolean isMusl() {
+        return OperatingSystem.isMusl();
+    }
 
-  @Override
-  public boolean isAarch64() {
-    return isArch(Architecture.ARM64);
-  }
+    @Override
+    public boolean isAarch64() {
+        return isArch(Architecture.ARM64);
+    }
 
-  @Override
-  public boolean isArm32() {
-    return isArch(Architecture.ARM);
-  }
+    @Override
+    public boolean isArm32() {
+        return isArch(Architecture.ARM);
+    }
 
-  @Override
-  public boolean isX86_32() {
-    return isArch(Architecture.X86);
-  }
+    @Override
+    public boolean isX86_32() {
+        return isArch(Architecture.X86);
+    }
 
-  @Override
-  public boolean isX86_64() {
-    return isArch(Architecture.X64);
-  }
+    @Override
+    public boolean isX86_64() {
+        return isArch(Architecture.X64);
+    }
 
-  static final boolean isArch(OperatingSystem.Architecture arch) {
-    return (OperatingSystem.architecture() == arch);
-  }
+    static final boolean isArch(OperatingSystem.Architecture arch) {
+        return (OperatingSystem.architecture() == arch);
+    }
 
-  @Override
-  public int hashCode() {
-    return IntrospectPlatformSpec.class.hashCode();
-  }
+    @Override
+    public int hashCode() {
+        return IntrospectPlatformSpec.class.hashCode();
+    }
 
-  @Override
-  public boolean equals(Object obj) {
-    return (obj instanceof IntrospectPlatformSpec);
-  }
+    @Override
+    public boolean equals(Object obj) {
+        return (obj instanceof IntrospectPlatformSpec);
+    }
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/LibDirBasedPathLocator.java b/components/native-loader/src/main/java/datadog/nativeloader/LibDirBasedPathLocator.java
index 2ed0528c161..4ce77ba2104 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/LibDirBasedPathLocator.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/LibDirBasedPathLocator.java
@@ -7,43 +7,43 @@
 
 /** LibDirBasedPathLocator locates libraries inside a list of library directories */
 final class LibDirBasedPathLocator implements PathLocator {
-  private final File[] libDirs;
+    private final File[] libDirs;
 
-  public LibDirBasedPathLocator(File... libDirs) {
-    this.libDirs = libDirs;
-  }
+    public LibDirBasedPathLocator(File... libDirs) {
+        this.libDirs = libDirs;
+    }
 
-  @Override
-  public URL locate(String optionalComponent, String path) {
-    String fullPath = PathUtils.concatPath(optionalComponent, path);
+    @Override
+    public URL locate(String optionalComponent, String path) {
+        String fullPath = PathUtils.concatPath(optionalComponent, path);
 
-    for (File libDir : this.libDirs) {
-      File libFile = new File(libDir, fullPath);
-      if (libFile.exists()) return toUrl(libFile);
-    }
+        for (File libDir : this.libDirs) {
+            File libFile = new File(libDir, fullPath);
+            if (libFile.exists()) return toUrl(libFile);
+        }
 
-    return null;
-  }
+        return null;
+    }
 
-  @SuppressWarnings("deprecation")
-  private static final URL toUrl(File file) {
-    try {
-      return file.toURL();
-    } catch (MalformedURLException e) {
-      return null;
+    @SuppressWarnings("deprecation")
+    private static final URL toUrl(File file) {
+        try {
+            return file.toURL();
+        } catch (MalformedURLException e) {
+            return null;
+        }
     }
-  }
 
-  @Override
-  public int hashCode() {
-    return Arrays.hashCode(this.libDirs);
-  }
+    @Override
+    public int hashCode() {
+        return Arrays.hashCode(this.libDirs);
+    }
 
-  @Override
-  public boolean equals(Object obj) {
-    if (!(obj instanceof LibDirBasedPathLocator)) return false;
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof LibDirBasedPathLocator)) return false;
 
-    LibDirBasedPathLocator that = (LibDirBasedPathLocator) obj;
-    return Arrays.equals(this.libDirs, that.libDirs);
-  }
+        LibDirBasedPathLocator that = (LibDirBasedPathLocator) obj;
+        return Arrays.equals(this.libDirs, that.libDirs);
+    }
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/LibFile.java b/components/native-loader/src/main/java/datadog/nativeloader/LibFile.java
index 80a1957e5e8..bbade5dfb94 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/LibFile.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/LibFile.java
@@ -13,117 +13,108 @@
  * </ul>
  */
 public final class LibFile implements AutoCloseable {
-  static final boolean NO_CLEAN_UP = false;
-  static final boolean CLEAN_UP = true;
-
-  static final LibFile preloaded(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      SafeLibraryLoadingListener listeners) {
-    return new LibFile(platformSpec, optionalComponent, libName, null, NO_CLEAN_UP, listeners);
-  }
-
-  static final LibFile fromFile(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      File optionalFile,
-      SafeLibraryLoadingListener listeners) {
-    return new LibFile(
-        platformSpec, optionalComponent, libName, optionalFile, NO_CLEAN_UP, listeners);
-  }
-
-  static final LibFile fromTempFile(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      File optionalFile,
-      SafeLibraryLoadingListener listeners) {
-    return new LibFile(platformSpec, optionalComponent, libName, optionalFile, CLEAN_UP, listeners);
-  }
-
-  final PlatformSpec platformSpec;
-  final String optionalComponent;
-  final String libName;
-
-  final File optionalFile;
-  final boolean needsCleanup;
-
-  final SafeLibraryLoadingListener listeners;
-
-  LibFile(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      File optionalFile,
-      boolean needsCleanup,
-      SafeLibraryLoadingListener listeners) {
-    this.platformSpec = platformSpec;
-    this.optionalComponent = optionalComponent;
-    this.libName = libName;
-
-    this.optionalFile = optionalFile;
-    this.needsCleanup = needsCleanup;
-
-    this.listeners = listeners;
-  }
-
-  /** Indicates if this library was "preloaded" */
-  public boolean isPreloaded() {
-    return (this.optionalFile == null);
-  }
-
-  /** Loads the underlying library into the JVM */
-  public void load() throws LibraryLoadException {
-    boolean isPreloaded = this.isPreloaded();
-    if (isPreloaded) {
-      this.listeners.onLoad(
-          this.platformSpec, this.optionalComponent, this.libName, isPreloaded, null);
-      return;
+    static final boolean NO_CLEAN_UP = false;
+    static final boolean CLEAN_UP = true;
+
+    static final LibFile preloaded(
+            PlatformSpec platformSpec, String optionalComponent, String libName, SafeLibraryLoadingListener listeners) {
+        return new LibFile(platformSpec, optionalComponent, libName, null, NO_CLEAN_UP, listeners);
+    }
+
+    static final LibFile fromFile(
+            PlatformSpec platformSpec,
+            String optionalComponent,
+            String libName,
+            File optionalFile,
+            SafeLibraryLoadingListener listeners) {
+        return new LibFile(platformSpec, optionalComponent, libName, optionalFile, NO_CLEAN_UP, listeners);
+    }
+
+    static final LibFile fromTempFile(
+            PlatformSpec platformSpec,
+            String optionalComponent,
+            String libName,
+            File optionalFile,
+            SafeLibraryLoadingListener listeners) {
+        return new LibFile(platformSpec, optionalComponent, libName, optionalFile, CLEAN_UP, listeners);
     }
 
-    try {
-      Runtime.getRuntime().load(this.getAbsolutePath());
+    final PlatformSpec platformSpec;
+    final String optionalComponent;
+    final String libName;
+
+    final File optionalFile;
+    final boolean needsCleanup;
+
+    final SafeLibraryLoadingListener listeners;
+
+    LibFile(
+            PlatformSpec platformSpec,
+            String optionalComponent,
+            String libName,
+            File optionalFile,
+            boolean needsCleanup,
+            SafeLibraryLoadingListener listeners) {
+        this.platformSpec = platformSpec;
+        this.optionalComponent = optionalComponent;
+        this.libName = libName;
+
+        this.optionalFile = optionalFile;
+        this.needsCleanup = needsCleanup;
+
+        this.listeners = listeners;
+    }
+
+    /** Indicates if this library was "preloaded" */
+    public boolean isPreloaded() {
+        return (this.optionalFile == null);
+    }
+
+    /** Loads the underlying library into the JVM */
+    public void load() throws LibraryLoadException {
+        boolean isPreloaded = this.isPreloaded();
+        if (isPreloaded) {
+            this.listeners.onLoad(this.platformSpec, this.optionalComponent, this.libName, isPreloaded, null);
+            return;
+        }
+
+        try {
+            Runtime.getRuntime().load(this.getAbsolutePath());
+
+            if (true) throw new RuntimeException("real load - worked?");
+        } catch (Throwable t) {
+            this.listeners.onLoadFailure(this.platformSpec, this.optionalComponent, this.libName, t);
+            throw new LibraryLoadException(this.libName, t);
+        }
+
+        this.listeners.onLoad(
+                this.platformSpec, this.optionalComponent, this.libName, isPreloaded, this.optionalFile.toPath());
+    }
+
+    /** Provides a File to the library -- returns null for pre-loaded libraries */
+    public final File toFile() {
+        return this.optionalFile;
+    }
+
+    /** Provides a Path to the library -- return null for pre-loaded libraries */
+    public final Path toPath() {
+        return this.optionalFile == null ? null : this.optionalFile.toPath();
+    }
 
-      if (true) throw new RuntimeException("real load - worked?");
-    } catch (Throwable t) {
-      this.listeners.onLoadFailure(this.platformSpec, this.optionalComponent, this.libName, t);
-      throw new LibraryLoadException(this.libName, t);
+    /** Provides the an absolute path to the library -- returns null for pre-loaded libraries */
+    public final String getAbsolutePath() {
+        return this.optionalFile == null ? null : this.optionalFile.getAbsolutePath();
     }
 
-    this.listeners.onLoad(
-        this.platformSpec,
-        this.optionalComponent,
-        this.libName,
-        isPreloaded,
-        this.optionalFile.toPath());
-  }
-
-  /** Provides a File to the library -- returns null for pre-loaded libraries */
-  public final File toFile() {
-    return this.optionalFile;
-  }
-
-  /** Provides a Path to the library -- return null for pre-loaded libraries */
-  public final Path toPath() {
-    return this.optionalFile == null ? null : this.optionalFile.toPath();
-  }
-
-  /** Provides the an absolute path to the library -- returns null for pre-loaded libraries */
-  public final String getAbsolutePath() {
-    return this.optionalFile == null ? null : this.optionalFile.getAbsolutePath();
-  }
-
-  /** Schedules clean-up of underlying optionalFile -- if the file is a temp file */
-  @Override
-  public void close() {
-    if (this.needsCleanup) {
-      boolean deleted = NativeLoader.delete(this.optionalFile);
-      if (deleted) {
-        this.listeners.onTempFileCleanup(
-            this.platformSpec, this.optionalComponent, this.libName, this.optionalFile.toPath());
-      }
+    /** Schedules clean-up of underlying optionalFile -- if the file is a temp file */
+    @Override
+    public void close() {
+        if (this.needsCleanup) {
+            boolean deleted = NativeLoader.delete(this.optionalFile);
+            if (deleted) {
+                this.listeners.onTempFileCleanup(
+                        this.platformSpec, this.optionalComponent, this.libName, this.optionalFile.toPath());
+            }
+        }
     }
-  }
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/LibraryLoadException.java b/components/native-loader/src/main/java/datadog/nativeloader/LibraryLoadException.java
index 12a8779958e..3ea43483ae1 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/LibraryLoadException.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/LibraryLoadException.java
@@ -2,28 +2,28 @@
 
 /** Exception raised when NativeLoader fails to resolve or load a library */
 public class LibraryLoadException extends Exception {
-  static final String UNSUPPORTED_OS = "Unsupported OS";
-  static final String UNSUPPORTED_ARCH = "Unsupported arch";
+    static final String UNSUPPORTED_OS = "Unsupported OS";
+    static final String UNSUPPORTED_ARCH = "Unsupported arch";
 
-  private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-  public LibraryLoadException(String libName) {
-    super(message(libName));
-  }
+    public LibraryLoadException(String libName) {
+        super(message(libName));
+    }
 
-  public LibraryLoadException(String libName, Throwable cause) {
-    this(message(libName), cause.getMessage(), cause);
-  }
+    public LibraryLoadException(String libName, Throwable cause) {
+        this(message(libName), cause.getMessage(), cause);
+    }
 
-  public LibraryLoadException(String libName, String message) {
-    super(message(libName) + " - " + message);
-  }
+    public LibraryLoadException(String libName, String message) {
+        super(message(libName) + " - " + message);
+    }
 
-  public LibraryLoadException(String libName, String message, Throwable cause) {
-    super(message(libName) + " - " + message, cause);
-  }
+    public LibraryLoadException(String libName, String message, Throwable cause) {
+        super(message(libName) + " - " + message, cause);
+    }
 
-  static final String message(String libName) {
-    return "Unable to resolve library " + libName;
-  }
+    static final String message(String libName) {
+        return "Unable to resolve library " + libName;
+    }
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/LibraryLoadingListener.java b/components/native-loader/src/main/java/datadog/nativeloader/LibraryLoadingListener.java
index 8fa68a4feb0..6be889a1c3d 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/LibraryLoadingListener.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/LibraryLoadingListener.java
@@ -4,63 +4,57 @@
 import java.nio.file.Path;
 
 public interface LibraryLoadingListener {
-  /**
-   * Called when a dynamic library is resolved. This includes resolving a pre-loaded or already
-   * loaded library
-   *
-   * <p>If the library is pre-loaded <code>optionalUrl</code> will be <code>null</code>
-   */
-  default void onResolveDynamic(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      boolean isPreloaded,
-      URL optionalUrl) {}
+    /**
+     * Called when a dynamic library is resolved. This includes resolving a pre-loaded or already
+     * loaded library
+     *
+     * <p>If the library is pre-loaded <code>optionalUrl</code> will be <code>null</code>
+     */
+    default void onResolveDynamic(
+            PlatformSpec platformSpec,
+            String optionalComponent,
+            String libName,
+            boolean isPreloaded,
+            URL optionalUrl) {}
 
-  /**
-   * Called when a dynamic library fails to resolve. This can occur because the library was not
-   * found -- or an exception occurred during resolution
-   */
-  default void onResolveDynamicFailure(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      Throwable optionalCause) {}
+    /**
+     * Called when a dynamic library fails to resolve. This can occur because the library was not
+     * found -- or an exception occurred during resolution
+     */
+    default void onResolveDynamicFailure(
+            PlatformSpec platformSpec, String optionalComponent, String libName, Throwable optionalCause) {}
 
-  /**
-   * Called when a dynamic library loads successfully This includes loading a pre-loaded or already
-   * loaded library
-   */
-  default void onLoad(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      boolean isPreloaded,
-      Path optionalLibPath) {}
+    /**
+     * Called when a dynamic library loads successfully This includes loading a pre-loaded or already
+     * loaded library
+     */
+    default void onLoad(
+            PlatformSpec platformSpec,
+            String optionalComponent,
+            String libName,
+            boolean isPreloaded,
+            Path optionalLibPath) {}
 
-  /** Called when a dynamic library fails to load */
-  default void onLoadFailure(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      Throwable optionalCause) {}
+    /** Called when a dynamic library fails to load */
+    default void onLoadFailure(
+            PlatformSpec platformSpec, String optionalComponent, String libName, Throwable optionalCause) {}
 
-  /** Called when a temp file is successfully created to hold the library */
-  default void onTempFileCreated(
-      PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {}
+    /** Called when a temp file is successfully created to hold the library */
+    default void onTempFileCreated(
+            PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {}
 
-  /** Called when a temp file could not be created */
-  default void onTempFileCreationFailure(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      Path tempDir,
-      String libExt,
-      Throwable optionalCause) {}
+    /** Called when a temp file could not be created */
+    default void onTempFileCreationFailure(
+            PlatformSpec platformSpec,
+            String optionalComponent,
+            String libName,
+            Path tempDir,
+            String libExt,
+            Throwable optionalCause) {}
 
-  /** Called when a temp file is cleaned up */
-  default void onTempFileCleanup(
-      PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {}
+    /** Called when a temp file is cleaned up */
+    default void onTempFileCleanup(
+            PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {}
 }
 
 /**
@@ -70,9 +64,9 @@ default void onTempFileCleanup(
  * listeners and {@link NopLibraryLoadingListener} used to optimize the nop case.
  */
 abstract class SafeLibraryLoadingListener implements LibraryLoadingListener {
-  /** Used to create a new safe listener with the provided listeners append onto this one */
-  public abstract SafeLibraryLoadingListener join(LibraryLoadingListener... listeners);
+    /** Used to create a new safe listener with the provided listeners append onto this one */
+    public abstract SafeLibraryLoadingListener join(LibraryLoadingListener... listeners);
 
-  /** Indicates if all listener operates are nops */
-  public abstract boolean isNop();
+    /** Indicates if all listener operates are nops */
+    public abstract boolean isNop();
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/LibraryResolver.java b/components/native-loader/src/main/java/datadog/nativeloader/LibraryResolver.java
index 66ab56c0169..34dd6303e79 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/LibraryResolver.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/LibraryResolver.java
@@ -11,11 +11,10 @@
  */
 @FunctionalInterface
 public interface LibraryResolver {
-  default boolean isPreloaded(PlatformSpec platform, String libName) {
-    return false;
-  }
+    default boolean isPreloaded(PlatformSpec platform, String libName) {
+        return false;
+    }
 
-  URL resolve(
-      PathLocator pathLocator, PlatformSpec platformSpec, String optionalComponent, String libName)
-      throws Exception;
+    URL resolve(PathLocator pathLocator, PlatformSpec platformSpec, String optionalComponent, String libName)
+            throws Exception;
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/LibraryResolvers.java b/components/native-loader/src/main/java/datadog/nativeloader/LibraryResolvers.java
index bcbb434a3a1..77eb746950a 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/LibraryResolvers.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/LibraryResolvers.java
@@ -6,42 +6,37 @@
 import java.util.Set;
 
 public final class LibraryResolvers {
-  private LibraryResolvers() {}
-
-  public static final LibraryResolver defaultLibraryResolver() {
-    return flatDirs();
-  }
-
-  public static final LibraryResolver withPreloaded(
-      LibraryResolver baseResolver, String... preloadedLibNames) {
-    return withPreloaded(baseResolver, new HashSet<>(Arrays.asList(preloadedLibNames)));
-  }
-
-  public static final LibraryResolver withPreloaded(
-      LibraryResolver baseResolver, Set<String> preloadedLibNames) {
-    return new LibraryResolver() {
-      @Override
-      public boolean isPreloaded(PlatformSpec platform, String libName) {
-        return preloadedLibNames.contains(libName);
-      }
-
-      @Override
-      public URL resolve(
-          PathLocator pathLocator,
-          PlatformSpec platformSpec,
-          String optionalComponent,
-          String libName)
-          throws Exception {
-        return baseResolver.resolve(pathLocator, platformSpec, optionalComponent, libName);
-      }
-    };
-  }
-
-  public static final LibraryResolver flatDirs() {
-    return FlatDirLibraryResolver.INSTANCE;
-  }
-
-  public static final LibraryResolver nestedDirs() {
-    return NestedDirLibraryResolver.INSTANCE;
-  }
+    private LibraryResolvers() {}
+
+    public static final LibraryResolver defaultLibraryResolver() {
+        return flatDirs();
+    }
+
+    public static final LibraryResolver withPreloaded(LibraryResolver baseResolver, String... preloadedLibNames) {
+        return withPreloaded(baseResolver, new HashSet<>(Arrays.asList(preloadedLibNames)));
+    }
+
+    public static final LibraryResolver withPreloaded(LibraryResolver baseResolver, Set<String> preloadedLibNames) {
+        return new LibraryResolver() {
+            @Override
+            public boolean isPreloaded(PlatformSpec platform, String libName) {
+                return preloadedLibNames.contains(libName);
+            }
+
+            @Override
+            public URL resolve(
+                    PathLocator pathLocator, PlatformSpec platformSpec, String optionalComponent, String libName)
+                    throws Exception {
+                return baseResolver.resolve(pathLocator, platformSpec, optionalComponent, libName);
+            }
+        };
+    }
+
+    public static final LibraryResolver flatDirs() {
+        return FlatDirLibraryResolver.INSTANCE;
+    }
+
+    public static final LibraryResolver nestedDirs() {
+        return NestedDirLibraryResolver.INSTANCE;
+    }
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/NativeLoader.java b/components/native-loader/src/main/java/datadog/nativeloader/NativeLoader.java
index 8a55eabe570..ae1d7e99edf 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/NativeLoader.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/NativeLoader.java
@@ -23,380 +23,370 @@
  * LibraryResolver} and path resolution {@link PathLocator}
  */
 public final class NativeLoader {
-  public static final class Builder {
-    private PlatformSpec platformSpec;
-    private Path tempDir;
-    private String[] preloadedLibNames;
-    private LibraryResolver libResolver;
-    private PathLocator pathLocator;
-    private List<LibraryLoadingListener> listeners = new ArrayList<>();
-
-    Builder() {}
-
-    /** Sets the default {@link PlatformSpec} used by the {@link NativeLoader} */
-    public Builder platformSpec(PlatformSpec platform) {
-      this.platformSpec = platform;
-      return this;
-    }
+    public static final class Builder {
+        private PlatformSpec platformSpec;
+        private Path tempDir;
+        private String[] preloadedLibNames;
+        private LibraryResolver libResolver;
+        private PathLocator pathLocator;
+        private List<LibraryLoadingListener> listeners = new ArrayList<>();
+
+        Builder() {}
+
+        /** Sets the default {@link PlatformSpec} used by the {@link NativeLoader} */
+        public Builder platformSpec(PlatformSpec platform) {
+            this.platformSpec = platform;
+            return this;
+        }
+
+        /** Uses a nested directory layout -- {@link LibraryResolvers#nestedDirs()} */
+        public Builder nestedLayout() {
+            return this.libResolver(LibraryResolvers.nestedDirs());
+        }
+
+        /** Uses a flat directory layout -- {@link LibraryResolvers#flatDirs()} */
+        public Builder flatLayout() {
+            return this.libResolver(LibraryResolvers.flatDirs());
+        }
+
+        /**
+         * Indicates that libraries (or signatures from those libraries) are already loaded into the JVM
+         * {@link LibraryResolver#isPreloaded}
+         *
+         * @param libNames - lib names
+         */
+        public Builder preloaded(String... libNames) {
+            this.preloadedLibNames = libNames;
+            return this;
+        }
+
+        /**
+         * Uses the specified {@link LibraryResolver} can be used to implement an alternate file layout
+         */
+        public Builder libResolver(LibraryResolver libResolver) {
+            this.libResolver = libResolver;
+            return this;
+        }
+
+        /** Searches for the native libraries in the provided {@link ClassLoader} */
+        public Builder fromClassLoader(ClassLoader classLoader) {
+            return this.pathLocator(PathLocators.fromClassLoader(classLoader));
+        }
+
+        /**
+         * Searches for the native libraries in the provided {@link ClassLoader} using the specified
+         * <code>baseResource</code>
+         */
+        public Builder fromClassLoader(ClassLoader classLoader, String baseResource) {
+            return this.pathLocator(PathLocators.fromClassLoader(classLoader, baseResource));
+        }
+
+        /** Searches for the native libraries in the specified directory */
+        public Builder fromDir(String includeDir) {
+            return this.pathLocator(PathLocators.fromLibDirs(includeDir));
+        }
+
+        /** Searches for the native libraries in the specified directories */
+        public Builder fromDirs(String... includeDirs) {
+            return this.pathLocator(PathLocators.fromLibDirs(includeDirs));
+        }
+
+        /** Searches for the native libraries in the specified directory */
+        public Builder fromDir(File includeDir) {
+            return this.pathLocator(PathLocators.fromLibDirs(includeDir));
+        }
+
+        /** Searches for the native libraries in the specified directories */
+        public Builder fromDirs(File... includeDirs) {
+            return this.pathLocator(PathLocators.fromLibDirs(includeDirs));
+        }
+
+        /** Searches for the native libraries in the specified directory */
+        public Builder fromDir(Path includeDir) {
+            return this.pathLocator(PathLocators.fromLibDirs(includeDir));
+        }
+
+        /** Searches for the native libraries in the specified directories */
+        public Builder fromDirs(Path... paths) {
+            return this.pathLocator(PathLocators.fromLibDirs(paths));
+        }
+
+        /** Searches for the native libraries using the provided {@link PathLocator} */
+        public Builder pathLocator(PathLocator pathLocator) {
+            this.pathLocator = pathLocator;
+            return this;
+        }
+
+        /**
+         * Specifies temporary directory where native libraries are copied if the {@link PathLocator}
+         * returns a non-file {@link URL}
+         */
+        public Builder tempDir(File tempDir) {
+            return this.tempDir(tempDir.toPath());
+        }
+
+        /**
+         * Specifies temporary directory where native libraries are copied if the {@link PathLocator}
+         * returns a non-file {@link URL}
+         */
+        public Builder tempDir(Path tempPath) {
+            this.tempDir = tempPath;
+            return this;
+        }
+
+        /**
+         * Specifies temporary directory where native libraries are copied if the {@link PathLocator}
+         * returns a non-file {@link URL}
+         */
+        public Builder tempDir(String tmpPath) {
+            return this.tempDir(Paths.get(tmpPath));
+        }
+
+        public Builder addListener(LibraryLoadingListener listener) {
+            this.listeners.add(listener);
+            return this;
+        }
+
+        public Builder addListeners(LibraryLoadingListener... listeners) {
+            this.listeners.addAll(Arrays.asList(listeners));
+            return this;
+        }
+
+        /** Constructs and returns the {@link NativeLoader} */
+        public NativeLoader build() {
+            return new NativeLoader(this);
+        }
+
+        PlatformSpec platformSpec() {
+            return (this.platformSpec == null) ? PlatformSpec.defaultPlatformSpec() : this.platformSpec;
+        }
 
-    /** Uses a nested directory layout -- {@link LibraryResolvers#nestedDirs()} */
-    public Builder nestedLayout() {
-      return this.libResolver(LibraryResolvers.nestedDirs());
-    }
+        PathLocator pathLocator() {
+            return (this.pathLocator == null) ? PathLocators.defaultPathLocator() : this.pathLocator;
+        }
 
-    /** Uses a flat directory layout -- {@link LibraryResolvers#flatDirs()} */
-    public Builder flatLayout() {
-      return this.libResolver(LibraryResolvers.flatDirs());
-    }
+        SafeLibraryLoadingListener listeners() {
+            return this.listeners.isEmpty()
+                    ? NopLibraryLoadingListener.INSTANCE
+                    : new CompositeLibraryLoadingListener(this.listeners);
+        }
 
-    /**
-     * Indicates that libraries (or signatures from those libraries) are already loaded into the JVM
-     * {@link LibraryResolver#isPreloaded}
-     *
-     * @param libNames - lib names
-     */
-    public Builder preloaded(String... libNames) {
-      this.preloadedLibNames = libNames;
-      return this;
-    }
+        LibraryResolver libResolver() {
+            LibraryResolver baseResolver =
+                    (this.libResolver == null) ? LibraryResolvers.defaultLibraryResolver() : this.libResolver;
 
-    /**
-     * Uses the specified {@link LibraryResolver} can be used to implement an alternate file layout
-     */
-    public Builder libResolver(LibraryResolver libResolver) {
-      this.libResolver = libResolver;
-      return this;
-    }
+            return (this.preloadedLibNames == null)
+                    ? baseResolver
+                    : LibraryResolvers.withPreloaded(baseResolver, this.preloadedLibNames);
+        }
 
-    /** Searches for the native libraries in the provided {@link ClassLoader} */
-    public Builder fromClassLoader(ClassLoader classLoader) {
-      return this.pathLocator(PathLocators.fromClassLoader(classLoader));
+        Path tempDir() {
+            return this.tempDir;
+        }
     }
 
-    /**
-     * Searches for the native libraries in the provided {@link ClassLoader} using the specified
-     * <code>baseResource</code>
-     */
-    public Builder fromClassLoader(ClassLoader classLoader, String baseResource) {
-      return this.pathLocator(PathLocators.fromClassLoader(classLoader, baseResource));
+    public static final Builder builder() {
+        return new Builder();
     }
 
-    /** Searches for the native libraries in the specified directory */
-    public Builder fromDir(String includeDir) {
-      return this.pathLocator(PathLocators.fromLibDirs(includeDir));
-    }
+    private static final URL NO_URL = null;
+    private static final Throwable NO_CAUSE = null;
+    private static final LibraryLoadingListener[] EMPTY_LISTENERS = {};
 
-    /** Searches for the native libraries in the specified directories */
-    public Builder fromDirs(String... includeDirs) {
-      return this.pathLocator(PathLocators.fromLibDirs(includeDirs));
-    }
+    private final PlatformSpec defaultPlatformSpec;
+    private final LibraryResolver libResolver;
+    private final PathLocator pathResolver;
+    private final SafeLibraryLoadingListener listeners;
+    private final Path tempDir;
 
-    /** Searches for the native libraries in the specified directory */
-    public Builder fromDir(File includeDir) {
-      return this.pathLocator(PathLocators.fromLibDirs(includeDir));
+    private NativeLoader(Builder builder) {
+        this.defaultPlatformSpec = builder.platformSpec();
+        this.libResolver = builder.libResolver();
+        this.pathResolver = builder.pathLocator();
+        this.listeners = builder.listeners();
+        this.tempDir = builder.tempDir();
     }
 
-    /** Searches for the native libraries in the specified directories */
-    public Builder fromDirs(File... includeDirs) {
-      return this.pathLocator(PathLocators.fromLibDirs(includeDirs));
+    public boolean isPlatformSupported() {
+        if (this.defaultPlatformSpec.isUnknownOs()) return false;
+        if (this.defaultPlatformSpec.isUnknownArch()) return false;
+        return true;
     }
 
-    /** Searches for the native libraries in the specified directory */
-    public Builder fromDir(Path includeDir) {
-      return this.pathLocator(PathLocators.fromLibDirs(includeDir));
+    /** Indicates if a library is considered "pre-loaded" */
+    public boolean isPreloaded(String libName) {
+        return this.libResolver.isPreloaded(this.defaultPlatformSpec, libName);
     }
 
-    /** Searches for the native libraries in the specified directories */
-    public Builder fromDirs(Path... paths) {
-      return this.pathLocator(PathLocators.fromLibDirs(paths));
+    /** Indicates if a library is considered "pre-loaded" for the specified {@link PlatformSpec} */
+    public boolean isPreloaded(PlatformSpec platformSpec, String libName) {
+        return this.libResolver.isPreloaded(platformSpec, libName);
     }
 
-    /** Searches for the native libraries using the provided {@link PathLocator} */
-    public Builder pathLocator(PathLocator pathLocator) {
-      this.pathLocator = pathLocator;
-      return this;
+    /** Loads a library */
+    public void load(String libName) throws LibraryLoadException {
+        this.loadImpl(null, libName, EMPTY_LISTENERS);
     }
 
-    /**
-     * Specifies temporary directory where native libraries are copied if the {@link PathLocator}
-     * returns a non-file {@link URL}
-     */
-    public Builder tempDir(File tempDir) {
-      return this.tempDir(tempDir.toPath());
+    public void load(String libName, LibraryLoadingListener... scopedListeners) throws LibraryLoadException {
+        this.loadImpl(null, libName, scopedListeners);
     }
 
-    /**
-     * Specifies temporary directory where native libraries are copied if the {@link PathLocator}
-     * returns a non-file {@link URL}
-     */
-    public Builder tempDir(Path tempPath) {
-      this.tempDir = tempPath;
-      return this;
+    /** Loads a library associated with an associated component */
+    public void load(String component, String libName) throws LibraryLoadException {
+        this.loadImpl(component, libName, EMPTY_LISTENERS);
     }
 
-    /**
-     * Specifies temporary directory where native libraries are copied if the {@link PathLocator}
-     * returns a non-file {@link URL}
-     */
-    public Builder tempDir(String tmpPath) {
-      return this.tempDir(Paths.get(tmpPath));
+    public void load(String component, String libName, LibraryLoadingListener... scopedListeners)
+            throws LibraryLoadException {
+        this.loadImpl(component, libName, scopedListeners);
     }
 
-    public Builder addListener(LibraryLoadingListener listener) {
-      this.listeners.add(listener);
-      return this;
-    }
+    private void loadImpl(String component, String libName, LibraryLoadingListener... scopedListeners)
+            throws LibraryLoadException {
 
-    public Builder addListeners(LibraryLoadingListener... listeners) {
-      this.listeners.addAll(Arrays.asList(listeners));
-      return this;
+        // scopedListeners are attached to the LibFile by resolveDynamicImpl
+        try (LibFile libFile = this.resolveDynamicImpl(this.defaultPlatformSpec, component, libName, scopedListeners)) {
+            libFile.load();
+        }
     }
 
-    /** Constructs and returns the {@link NativeLoader} */
-    public NativeLoader build() {
-      return new NativeLoader(this);
+    /** Resolves a library to a LibFile - creating a temporary file if necessary */
+    public LibFile resolveDynamic(String libName) throws LibraryLoadException {
+        return this.resolveDynamicImpl(this.defaultPlatformSpec, null, libName, EMPTY_LISTENERS);
     }
 
-    PlatformSpec platformSpec() {
-      return (this.platformSpec == null) ? PlatformSpec.defaultPlatformSpec() : this.platformSpec;
+    public LibFile resolveDynamic(String libName, LibraryLoadingListener... scopedListeners)
+            throws LibraryLoadException {
+        return this.resolveDynamicImpl(this.defaultPlatformSpec, null, libName, scopedListeners);
     }
 
-    PathLocator pathLocator() {
-      return (this.pathLocator == null) ? PathLocators.defaultPathLocator() : this.pathLocator;
+    /** Resolves a library with an associated component */
+    public LibFile resolveDynamic(String component, String libName) throws LibraryLoadException {
+        return this.resolveDynamicImpl(this.defaultPlatformSpec, component, libName, EMPTY_LISTENERS);
     }
 
-    SafeLibraryLoadingListener listeners() {
-      return this.listeners.isEmpty()
-          ? NopLibraryLoadingListener.INSTANCE
-          : new CompositeLibraryLoadingListener(this.listeners);
-    }
-
-    LibraryResolver libResolver() {
-      LibraryResolver baseResolver =
-          (this.libResolver == null) ? LibraryResolvers.defaultLibraryResolver() : this.libResolver;
-
-      return (this.preloadedLibNames == null)
-          ? baseResolver
-          : LibraryResolvers.withPreloaded(baseResolver, this.preloadedLibNames);
-    }
-
-    Path tempDir() {
-      return this.tempDir;
-    }
-  }
-
-  public static final Builder builder() {
-    return new Builder();
-  }
-
-  private static final URL NO_URL = null;
-  private static final Throwable NO_CAUSE = null;
-  private static final LibraryLoadingListener[] EMPTY_LISTENERS = {};
-
-  private final PlatformSpec defaultPlatformSpec;
-  private final LibraryResolver libResolver;
-  private final PathLocator pathResolver;
-  private final SafeLibraryLoadingListener listeners;
-  private final Path tempDir;
-
-  private NativeLoader(Builder builder) {
-    this.defaultPlatformSpec = builder.platformSpec();
-    this.libResolver = builder.libResolver();
-    this.pathResolver = builder.pathLocator();
-    this.listeners = builder.listeners();
-    this.tempDir = builder.tempDir();
-  }
-
-  public boolean isPlatformSupported() {
-    if (this.defaultPlatformSpec.isUnknownOs()) return false;
-    if (this.defaultPlatformSpec.isUnknownArch()) return false;
-    return true;
-  }
-
-  /** Indicates if a library is considered "pre-loaded" */
-  public boolean isPreloaded(String libName) {
-    return this.libResolver.isPreloaded(this.defaultPlatformSpec, libName);
-  }
-
-  /** Indicates if a library is considered "pre-loaded" for the specified {@link PlatformSpec} */
-  public boolean isPreloaded(PlatformSpec platformSpec, String libName) {
-    return this.libResolver.isPreloaded(platformSpec, libName);
-  }
-
-  /** Loads a library */
-  public void load(String libName) throws LibraryLoadException {
-    this.loadImpl(null, libName, EMPTY_LISTENERS);
-  }
-
-  public void load(String libName, LibraryLoadingListener... scopedListeners)
-      throws LibraryLoadException {
-    this.loadImpl(null, libName, scopedListeners);
-  }
-
-  /** Loads a library associated with an associated component */
-  public void load(String component, String libName) throws LibraryLoadException {
-    this.loadImpl(component, libName, EMPTY_LISTENERS);
-  }
-
-  public void load(String component, String libName, LibraryLoadingListener... scopedListeners)
-      throws LibraryLoadException {
-    this.loadImpl(component, libName, scopedListeners);
-  }
-
-  private void loadImpl(String component, String libName, LibraryLoadingListener... scopedListeners)
-      throws LibraryLoadException {
-
-    // scopedListeners are attached to the LibFile by resolveDynamicImpl
-    try (LibFile libFile =
-        this.resolveDynamicImpl(this.defaultPlatformSpec, component, libName, scopedListeners)) {
-      libFile.load();
-    }
-  }
-
-  /** Resolves a library to a LibFile - creating a temporary file if necessary */
-  public LibFile resolveDynamic(String libName) throws LibraryLoadException {
-    return this.resolveDynamicImpl(this.defaultPlatformSpec, null, libName, EMPTY_LISTENERS);
-  }
-
-  public LibFile resolveDynamic(String libName, LibraryLoadingListener... scopedListeners)
-      throws LibraryLoadException {
-    return this.resolveDynamicImpl(this.defaultPlatformSpec, null, libName, scopedListeners);
-  }
-
-  /** Resolves a library with an associated component */
-  public LibFile resolveDynamic(String component, String libName) throws LibraryLoadException {
-    return this.resolveDynamicImpl(this.defaultPlatformSpec, component, libName, EMPTY_LISTENERS);
-  }
-
-  /**
-   * Resolves a library using a different {@link PlatformSpec} than the default for this {@link
-   * NativeLoader}
-   */
-  public LibFile resolveDynamic(PlatformSpec platformSpec, String libName)
-      throws LibraryLoadException {
-    return this.resolveDynamicImpl(platformSpec, null, libName, EMPTY_LISTENERS);
-  }
-
-  public LibFile resolveDynamic(
-      PlatformSpec platformSpec, String libName, LibraryLoadingListener... scopedListeners)
-      throws LibraryLoadException {
-    return this.resolveDynamicImpl(platformSpec, null, libName, scopedListeners);
-  }
-
-  /**
-   * Resolves a library with an associated component with a different {@link PlatformSpec} than the
-   * default
-   */
-  public LibFile resolveDynamic(PlatformSpec platformSpec, String component, String libName)
-      throws LibraryLoadException {
-    return this.resolveDynamicImpl(platformSpec, component, libName, EMPTY_LISTENERS);
-  }
-
-  private LibFile resolveDynamicImpl(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      LibraryLoadingListener[] scopedListeners)
-      throws LibraryLoadException {
-    SafeLibraryLoadingListener allListeners =
-        (scopedListeners == null
-                || scopedListeners == EMPTY_LISTENERS
-                || scopedListeners.length == 0)
-            ? this.listeners
-            : this.listeners.join(scopedListeners);
-
-    if (platformSpec.isUnknownOs() || platformSpec.isUnknownArch()) {
-      allListeners.onResolveDynamicFailure(platformSpec, optionalComponent, libName, NO_CAUSE);
-      throw new LibraryLoadException(libName, "Unsupported platform");
-    }
-
-    boolean isPreloaded = this.isPreloaded(platformSpec, libName);
-    if (isPreloaded) {
-      allListeners.onResolveDynamic(platformSpec, optionalComponent, libName, isPreloaded, NO_URL);
-      return LibFile.preloaded(platformSpec, optionalComponent, libName, allListeners);
-    }
-
-    URL url;
-    try {
-      url = this.libResolver.resolve(this.pathResolver, platformSpec, optionalComponent, libName);
-    } catch (LibraryLoadException e) {
-      // don't wrap if it is already a LibraryLoadException
-      allListeners.onResolveDynamicFailure(platformSpec, optionalComponent, libName, e.getCause());
-      throw e;
-    } catch (Throwable t) {
-      allListeners.onResolveDynamicFailure(platformSpec, optionalComponent, libName, t);
-      throw new LibraryLoadException(libName, t);
+    /**
+     * Resolves a library using a different {@link PlatformSpec} than the default for this {@link
+     * NativeLoader}
+     */
+    public LibFile resolveDynamic(PlatformSpec platformSpec, String libName) throws LibraryLoadException {
+        return this.resolveDynamicImpl(platformSpec, null, libName, EMPTY_LISTENERS);
     }
 
-    if (url == null) {
-      allListeners.onResolveDynamicFailure(platformSpec, optionalComponent, libName, NO_CAUSE);
-      throw new LibraryLoadException(libName);
+    public LibFile resolveDynamic(PlatformSpec platformSpec, String libName, LibraryLoadingListener... scopedListeners)
+            throws LibraryLoadException {
+        return this.resolveDynamicImpl(platformSpec, null, libName, scopedListeners);
     }
 
-    // For listener purposes - at this point resolution completed successfully
-    // Although, the resolveDynamic method can still fail if we need a temp file and cannot create
-    // it
-    allListeners.onResolveDynamic(platformSpec, optionalComponent, libName, isPreloaded, url);
-
-    if (url.getProtocol().equals("file")) {
-      return LibFile.fromFile(
-          platformSpec, optionalComponent, libName, new File(url.getPath()), allListeners);
-    } else {
-      Path tempFile;
-      try {
-        tempFile = createTempFile(this.tempDir, platformSpec, libName, url);
-        allListeners.onTempFileCreated(platformSpec, optionalComponent, libName, tempFile);
-
-        return LibFile.fromTempFile(
-            platformSpec, optionalComponent, libName, tempFile.toFile(), allListeners);
-      } catch (Throwable t) {
-        allListeners.onTempFileCreationFailure(
-            platformSpec, optionalComponent, libName, this.tempDir, libName, t);
-
-        throw new LibraryLoadException(libName, t);
-      }
+    /**
+     * Resolves a library with an associated component with a different {@link PlatformSpec} than the
+     * default
+     */
+    public LibFile resolveDynamic(PlatformSpec platformSpec, String component, String libName)
+            throws LibraryLoadException {
+        return this.resolveDynamicImpl(platformSpec, component, libName, EMPTY_LISTENERS);
+    }
+
+    private LibFile resolveDynamicImpl(
+            PlatformSpec platformSpec,
+            String optionalComponent,
+            String libName,
+            LibraryLoadingListener[] scopedListeners)
+            throws LibraryLoadException {
+        SafeLibraryLoadingListener allListeners =
+                (scopedListeners == null || scopedListeners == EMPTY_LISTENERS || scopedListeners.length == 0)
+                        ? this.listeners
+                        : this.listeners.join(scopedListeners);
+
+        if (platformSpec.isUnknownOs() || platformSpec.isUnknownArch()) {
+            allListeners.onResolveDynamicFailure(platformSpec, optionalComponent, libName, NO_CAUSE);
+            throw new LibraryLoadException(libName, "Unsupported platform");
+        }
+
+        boolean isPreloaded = this.isPreloaded(platformSpec, libName);
+        if (isPreloaded) {
+            allListeners.onResolveDynamic(platformSpec, optionalComponent, libName, isPreloaded, NO_URL);
+            return LibFile.preloaded(platformSpec, optionalComponent, libName, allListeners);
+        }
+
+        URL url;
+        try {
+            url = this.libResolver.resolve(this.pathResolver, platformSpec, optionalComponent, libName);
+        } catch (LibraryLoadException e) {
+            // don't wrap if it is already a LibraryLoadException
+            allListeners.onResolveDynamicFailure(platformSpec, optionalComponent, libName, e.getCause());
+            throw e;
+        } catch (Throwable t) {
+            allListeners.onResolveDynamicFailure(platformSpec, optionalComponent, libName, t);
+            throw new LibraryLoadException(libName, t);
+        }
+
+        if (url == null) {
+            allListeners.onResolveDynamicFailure(platformSpec, optionalComponent, libName, NO_CAUSE);
+            throw new LibraryLoadException(libName);
+        }
+
+        // For listener purposes - at this point resolution completed successfully
+        // Although, the resolveDynamic method can still fail if we need a temp file and cannot create
+        // it
+        allListeners.onResolveDynamic(platformSpec, optionalComponent, libName, isPreloaded, url);
+
+        if (url.getProtocol().equals("file")) {
+            return LibFile.fromFile(platformSpec, optionalComponent, libName, new File(url.getPath()), allListeners);
+        } else {
+            Path tempFile;
+            try {
+                tempFile = createTempFile(this.tempDir, platformSpec, libName, url);
+                allListeners.onTempFileCreated(platformSpec, optionalComponent, libName, tempFile);
+
+                return LibFile.fromTempFile(platformSpec, optionalComponent, libName, tempFile.toFile(), allListeners);
+            } catch (Throwable t) {
+                allListeners.onTempFileCreationFailure(
+                        platformSpec, optionalComponent, libName, this.tempDir, libName, t);
+
+                throw new LibraryLoadException(libName, t);
+            }
+        }
+    }
+
+    private static Path createTempFile(Path tempDir, PlatformSpec platformSpec, String libName, URL url)
+            throws IOException {
+        String libExt = PathUtils.dynamicLibExtension(platformSpec);
+
+        Path tempFile = TempFileHelper.createTempFile(tempDir, libName, libExt);
+        try (InputStream in = url.openStream()) {
+            Files.copy(in, tempFile, StandardCopyOption.REPLACE_EXISTING);
+        }
+
+        return tempFile;
     }
-  }
-
-  private static Path createTempFile(
-      Path tempDir, PlatformSpec platformSpec, String libName, URL url) throws IOException {
-    String libExt = PathUtils.dynamicLibExtension(platformSpec);
 
-    Path tempFile = TempFileHelper.createTempFile(tempDir, libName, libExt);
-    try (InputStream in = url.openStream()) {
-      Files.copy(in, tempFile, StandardCopyOption.REPLACE_EXISTING);
+    static boolean delete(File tempFile) {
+        return TempFileHelper.delete(tempFile);
     }
 
-    return tempFile;
-  }
-
-  static boolean delete(File tempFile) {
-    return TempFileHelper.delete(tempFile);
-  }
+    static final class TempFileHelper {
+        private TempFileHelper() {}
 
-  static final class TempFileHelper {
-    private TempFileHelper() {}
+        static Path createTempFile(Path tempDir, String libname, String libExt) throws IOException, SecurityException {
+            FileAttribute<Set<PosixFilePermission>> permAttrs =
+                    PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------"));
 
-    static Path createTempFile(Path tempDir, String libname, String libExt)
-        throws IOException, SecurityException {
-      FileAttribute<Set<PosixFilePermission>> permAttrs =
-          PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------"));
+            if (tempDir == null) {
+                return Files.createTempFile(libname, "." + libExt, permAttrs);
+            } else {
+                Files.createDirectories(
+                        tempDir, PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
 
-      if (tempDir == null) {
-        return Files.createTempFile(libname, "." + libExt, permAttrs);
-      } else {
-        Files.createDirectories(
-            tempDir,
-            PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
+                return Files.createTempFile(tempDir, libname, "." + libExt, permAttrs);
+            }
+        }
 
-        return Files.createTempFile(tempDir, libname, "." + libExt, permAttrs);
-      }
-    }
-
-    static boolean delete(File tempFile) {
-      boolean deleted = tempFile.delete();
-      if (!deleted) tempFile.deleteOnExit();
-      return deleted;
+        static boolean delete(File tempFile) {
+            boolean deleted = tempFile.delete();
+            if (!deleted) tempFile.deleteOnExit();
+            return deleted;
+        }
     }
-  }
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/NestedDirLibraryResolver.java b/components/native-loader/src/main/java/datadog/nativeloader/NestedDirLibraryResolver.java
index 0137ca1d07e..f57eed6e37d 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/NestedDirLibraryResolver.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/NestedDirLibraryResolver.java
@@ -7,48 +7,48 @@
  * <code>{os} / {arch} / {libc}</code>
  */
 final class NestedDirLibraryResolver implements LibraryResolver {
-  public static final NestedDirLibraryResolver INSTANCE = new NestedDirLibraryResolver();
+    public static final NestedDirLibraryResolver INSTANCE = new NestedDirLibraryResolver();
 
-  @Override
-  public final URL resolve(
-      PathLocator pathLocator, PlatformSpec platformSpec, String optionalComponent, String libName)
-      throws Exception {
-    PathLocatorHelper pathLocatorHelper = new PathLocatorHelper(libName, pathLocator);
+    @Override
+    public final URL resolve(
+            PathLocator pathLocator, PlatformSpec platformSpec, String optionalComponent, String libName)
+            throws Exception {
+        PathLocatorHelper pathLocatorHelper = new PathLocatorHelper(libName, pathLocator);
 
-    String libFileName = PathUtils.libFileName(platformSpec, libName);
+        String libFileName = PathUtils.libFileName(platformSpec, libName);
 
-    String osPath = PathUtils.osPartOf(platformSpec);
-    String archPath = PathUtils.archPartOf(platformSpec);
+        String osPath = PathUtils.osPartOf(platformSpec);
+        String archPath = PathUtils.archPartOf(platformSpec);
 
-    String libcPath = PathUtils.libcPartOf(platformSpec);
+        String libcPath = PathUtils.libcPartOf(platformSpec);
 
-    URL url;
-    String regularPath = osPath + "/" + archPath;
+        URL url;
+        String regularPath = osPath + "/" + archPath;
 
-    if (libcPath != null) {
-      String specializedPath = regularPath + "/" + libcPath;
-      url = pathLocatorHelper.locate(optionalComponent, specializedPath + "/" + libFileName);
-      if (url != null) return url;
-    }
+        if (libcPath != null) {
+            String specializedPath = regularPath + "/" + libcPath;
+            url = pathLocatorHelper.locate(optionalComponent, specializedPath + "/" + libFileName);
+            if (url != null) return url;
+        }
 
-    url = pathLocatorHelper.locate(optionalComponent, regularPath + "/" + libFileName);
-    if (url != null) return url;
+        url = pathLocatorHelper.locate(optionalComponent, regularPath + "/" + libFileName);
+        if (url != null) return url;
 
-    url = pathLocatorHelper.locate(optionalComponent, osPath + "/" + libFileName);
-    if (url != null) return url;
+        url = pathLocatorHelper.locate(optionalComponent, osPath + "/" + libFileName);
+        if (url != null) return url;
 
-    // fallback to searching at top-level, mostly concession to good out-of-box behavior
-    // with java.library.path
-    url = pathLocatorHelper.locate(optionalComponent, libFileName);
-    if (url != null) return url;
+        // fallback to searching at top-level, mostly concession to good out-of-box behavior
+        // with java.library.path
+        url = pathLocatorHelper.locate(optionalComponent, libFileName);
+        if (url != null) return url;
 
-    if (optionalComponent != null) {
-      url = pathLocatorHelper.locate(null, libFileName);
-      if (url != null) return url;
-    }
+        if (optionalComponent != null) {
+            url = pathLocatorHelper.locate(null, libFileName);
+            if (url != null) return url;
+        }
 
-    pathLocatorHelper.tryThrow();
+        pathLocatorHelper.tryThrow();
 
-    return null;
-  }
+        return null;
+    }
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/NopLibraryLoadingListener.java b/components/native-loader/src/main/java/datadog/nativeloader/NopLibraryLoadingListener.java
index afec8dc1b1f..2cb7b6aa5e8 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/NopLibraryLoadingListener.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/NopLibraryLoadingListener.java
@@ -3,17 +3,17 @@
 import java.util.Arrays;
 
 final class NopLibraryLoadingListener extends SafeLibraryLoadingListener {
-  static final NopLibraryLoadingListener INSTANCE = new NopLibraryLoadingListener();
+    static final NopLibraryLoadingListener INSTANCE = new NopLibraryLoadingListener();
 
-  private NopLibraryLoadingListener() {}
+    private NopLibraryLoadingListener() {}
 
-  @Override
-  public boolean isNop() {
-    return true;
-  }
+    @Override
+    public boolean isNop() {
+        return true;
+    }
 
-  @Override
-  public SafeLibraryLoadingListener join(LibraryLoadingListener... listeners) {
-    return new CompositeLibraryLoadingListener(Arrays.asList(listeners));
-  }
+    @Override
+    public SafeLibraryLoadingListener join(LibraryLoadingListener... listeners) {
+        return new CompositeLibraryLoadingListener(Arrays.asList(listeners));
+    }
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/PathLocator.java b/components/native-loader/src/main/java/datadog/nativeloader/PathLocator.java
index aae3c2e0b5a..a181e937e0a 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/PathLocator.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/PathLocator.java
@@ -5,14 +5,14 @@
 /** Resolves a component / path pair to a {@link URL} - called by a {@link LibraryResolver} */
 @FunctionalInterface
 public interface PathLocator {
-  /**
-   * URL to the requested resource -- or null if the resource could not be found
-   *
-   * <p>If the returned URL uses file protocol, then {@link NativeLoader} will provide direct access
-   * to the file
-   *
-   * <p>If the returned URL uses a non-file protocol, then {@link NativeLoader} will call {@link
-   * URL#openStream()} and copy the contents to a temporary file
-   */
-  URL locate(String optionalComponent, String path) throws Exception;
+    /**
+     * URL to the requested resource -- or null if the resource could not be found
+     *
+     * <p>If the returned URL uses file protocol, then {@link NativeLoader} will provide direct access
+     * to the file
+     *
+     * <p>If the returned URL uses a non-file protocol, then {@link NativeLoader} will call {@link
+     * URL#openStream()} and copy the contents to a temporary file
+     */
+    URL locate(String optionalComponent, String path) throws Exception;
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/PathLocatorHelper.java b/components/native-loader/src/main/java/datadog/nativeloader/PathLocatorHelper.java
index 8842d642afb..d861d4048b1 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/PathLocatorHelper.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/PathLocatorHelper.java
@@ -7,32 +7,32 @@
  * be used to wrap another {@link PathLocator} and make the exception handling easier.
  */
 public final class PathLocatorHelper implements PathLocator {
-  final String libName;
-  final PathLocator locator;
+    final String libName;
+    final PathLocator locator;
 
-  private Throwable firstCause;
+    private Throwable firstCause;
 
-  public PathLocatorHelper(String libName, PathLocator locator) {
-    this.libName = libName;
-    this.locator = locator;
-  }
+    public PathLocatorHelper(String libName, PathLocator locator) {
+        this.libName = libName;
+        this.locator = locator;
+    }
 
-  @Override
-  public URL locate(String optionalComponent, String path) {
-    try {
-      return this.locator.locate(optionalComponent, path);
-    } catch (Throwable t) {
-      if (this.firstCause == null) this.firstCause = t;
-      return null;
+    @Override
+    public URL locate(String optionalComponent, String path) {
+        try {
+            return this.locator.locate(optionalComponent, path);
+        } catch (Throwable t) {
+            if (this.firstCause == null) this.firstCause = t;
+            return null;
+        }
     }
-  }
 
-  /** Raises a LibraryLoadException if an exception occurred during a prior call to locate */
-  public void tryThrow() throws LibraryLoadException {
-    if (this.firstCause instanceof LibraryLoadException) {
-      throw (LibraryLoadException) this.firstCause;
-    } else if (this.firstCause != null) {
-      throw new LibraryLoadException(this.libName, this.firstCause);
+    /** Raises a LibraryLoadException if an exception occurred during a prior call to locate */
+    public void tryThrow() throws LibraryLoadException {
+        if (this.firstCause instanceof LibraryLoadException) {
+            throw (LibraryLoadException) this.firstCause;
+        } else if (this.firstCause != null) {
+            throw new LibraryLoadException(this.libName, this.firstCause);
+        }
     }
-  }
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/PathLocators.java b/components/native-loader/src/main/java/datadog/nativeloader/PathLocators.java
index f3b368f98ea..c336e772b64 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/PathLocators.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/PathLocators.java
@@ -6,53 +6,53 @@
 
 /** Helper factory class for common {@link PathLocator} */
 public final class PathLocators {
-  private PathLocators() {}
-
-  public static final PathLocator defaultPathLocator() {
-    return fromJavaLibraryPath();
-  }
-
-  public static final PathLocator fromLibDirs(Path... libDirs) {
-    File[] libDirFiles = new File[libDirs.length];
-    for (int i = 0; i < libDirs.length; ++i) {
-      libDirFiles[i] = libDirs[i].toFile();
-    }
-    return fromLibDirs(libDirFiles);
-  }
-
-  public static final PathLocator fromLibDirs(String... libDirs) {
-    File[] libDirFiles = new File[libDirs.length];
-    for (int i = 0; i < libDirs.length; ++i) {
-      libDirFiles[i] = new File(libDirs[i]);
-    }
-    return fromLibDirs(libDirFiles);
-  }
-
-  public static final PathLocator fromLibDirs(File... libDirs) {
-    return new LibDirBasedPathLocator(libDirs);
-  }
-
-  public static final PathLocator fromJavaLibraryPath() {
-    String libPaths;
-    try {
-      libPaths = System.getProperty("java.library.path");
-    } catch (SecurityException e) {
-      return new LibDirBasedPathLocator();
-    }
-    return fromLibPathString(libPaths);
-  }
-
-  public static final PathLocator fromLibPathString(String javaLibPath) {
-    // Typically, this method will be called at most once per run,
-    // so not storing pattern in a static because we don't want memory consumed forever
-    return fromLibDirs(Pattern.compile("\\:").split(javaLibPath));
-  }
-
-  public static final PathLocator fromClassLoader(ClassLoader classLoader) {
-    return new ClassLoaderResourcePathLocator(classLoader, null);
-  }
-
-  public static final PathLocator fromClassLoader(ClassLoader classLoader, String baseResource) {
-    return new ClassLoaderResourcePathLocator(classLoader, baseResource);
-  }
+    private PathLocators() {}
+
+    public static final PathLocator defaultPathLocator() {
+        return fromJavaLibraryPath();
+    }
+
+    public static final PathLocator fromLibDirs(Path... libDirs) {
+        File[] libDirFiles = new File[libDirs.length];
+        for (int i = 0; i < libDirs.length; ++i) {
+            libDirFiles[i] = libDirs[i].toFile();
+        }
+        return fromLibDirs(libDirFiles);
+    }
+
+    public static final PathLocator fromLibDirs(String... libDirs) {
+        File[] libDirFiles = new File[libDirs.length];
+        for (int i = 0; i < libDirs.length; ++i) {
+            libDirFiles[i] = new File(libDirs[i]);
+        }
+        return fromLibDirs(libDirFiles);
+    }
+
+    public static final PathLocator fromLibDirs(File... libDirs) {
+        return new LibDirBasedPathLocator(libDirs);
+    }
+
+    public static final PathLocator fromJavaLibraryPath() {
+        String libPaths;
+        try {
+            libPaths = System.getProperty("java.library.path");
+        } catch (SecurityException e) {
+            return new LibDirBasedPathLocator();
+        }
+        return fromLibPathString(libPaths);
+    }
+
+    public static final PathLocator fromLibPathString(String javaLibPath) {
+        // Typically, this method will be called at most once per run,
+        // so not storing pattern in a static because we don't want memory consumed forever
+        return fromLibDirs(Pattern.compile("\\:").split(javaLibPath));
+    }
+
+    public static final PathLocator fromClassLoader(ClassLoader classLoader) {
+        return new ClassLoaderResourcePathLocator(classLoader, null);
+    }
+
+    public static final PathLocator fromClassLoader(ClassLoader classLoader, String baseResource) {
+        return new ClassLoaderResourcePathLocator(classLoader, baseResource);
+    }
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/PathUtils.java b/components/native-loader/src/main/java/datadog/nativeloader/PathUtils.java
index 66e69ed357f..e2e304aca6c 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/PathUtils.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/PathUtils.java
@@ -5,94 +5,94 @@
 
 /** Utilities for generating library file paths to be requested from a {@link PathLocator} */
 public final class PathUtils {
-  private PathUtils() {}
+    private PathUtils() {}
 
-  public static final String libPrefix(PlatformSpec platformSpec) {
-    if (platformSpec.isMac() || platformSpec.isLinux()) {
-      return "lib";
-    } else if (platformSpec.isWindows()) {
-      return "";
-    } else {
-      throw new IllegalArgumentException(UNSUPPORTED_OS);
+    public static final String libPrefix(PlatformSpec platformSpec) {
+        if (platformSpec.isMac() || platformSpec.isLinux()) {
+            return "lib";
+        } else if (platformSpec.isWindows()) {
+            return "";
+        } else {
+            throw new IllegalArgumentException(UNSUPPORTED_OS);
+        }
     }
-  }
 
-  public static final String libFileName(PlatformSpec platformSpec, String libName) {
-    return libPrefix(platformSpec) + libName + "." + dynamicLibExtension(platformSpec);
-  }
+    public static final String libFileName(PlatformSpec platformSpec, String libName) {
+        return libPrefix(platformSpec) + libName + "." + dynamicLibExtension(platformSpec);
+    }
 
-  public static final String dynamicLibExtension(PlatformSpec platformSpec) {
-    if (platformSpec.isLinux()) {
-      return "so";
-    } else if (platformSpec.isWindows()) {
-      return "dll";
-    } else if (platformSpec.isMac()) {
-      return "dylib";
-    } else {
-      throw new IllegalArgumentException(UNSUPPORTED_OS);
+    public static final String dynamicLibExtension(PlatformSpec platformSpec) {
+        if (platformSpec.isLinux()) {
+            return "so";
+        } else if (platformSpec.isWindows()) {
+            return "dll";
+        } else if (platformSpec.isMac()) {
+            return "dylib";
+        } else {
+            throw new IllegalArgumentException(UNSUPPORTED_OS);
+        }
     }
-  }
 
-  public static final String osPartOf(PlatformSpec platformSpec) {
-    if (platformSpec.isLinux()) {
-      return "linux";
-    } else if (platformSpec.isWindows()) {
-      return "win";
-    } else if (platformSpec.isMac()) {
-      return "macos";
-    } else {
-      throw new IllegalArgumentException(UNSUPPORTED_OS);
+    public static final String osPartOf(PlatformSpec platformSpec) {
+        if (platformSpec.isLinux()) {
+            return "linux";
+        } else if (platformSpec.isWindows()) {
+            return "win";
+        } else if (platformSpec.isMac()) {
+            return "macos";
+        } else {
+            throw new IllegalArgumentException(UNSUPPORTED_OS);
+        }
     }
-  }
 
-  public static final String archPartOf(PlatformSpec platformSpec) {
-    if (platformSpec.isX86_64()) {
-      return "x86_64";
-    } else if (platformSpec.isAarch64()) {
-      return "aarch64";
-    } else if (platformSpec.isX86_32()) {
-      return "x86_32";
-    } else if (platformSpec.isArm32()) {
-      return "arm32";
-    } else {
-      throw new IllegalArgumentException(UNSUPPORTED_ARCH);
+    public static final String archPartOf(PlatformSpec platformSpec) {
+        if (platformSpec.isX86_64()) {
+            return "x86_64";
+        } else if (platformSpec.isAarch64()) {
+            return "aarch64";
+        } else if (platformSpec.isX86_32()) {
+            return "x86_32";
+        } else if (platformSpec.isArm32()) {
+            return "arm32";
+        } else {
+            throw new IllegalArgumentException(UNSUPPORTED_ARCH);
+        }
     }
-  }
 
-  public static final String libcPartOf(PlatformSpec platformSpec) {
-    if (!platformSpec.isLinux()) {
-      return null;
-    } else if (platformSpec.isMusl()) {
-      return "musl";
-    } else {
-      return "libc";
+    public static final String libcPartOf(PlatformSpec platformSpec) {
+        if (!platformSpec.isLinux()) {
+            return null;
+        } else if (platformSpec.isMusl()) {
+            return "musl";
+        } else {
+            return "libc";
+        }
     }
-  }
 
-  /** Helper for concatenating paths with / Handles null & empty for both parts */
-  public static final String concatPath(String pathPart1, String pathPart2) {
-    if (isEmpty(pathPart1)) {
-      return pathPart2;
-    } else if (isEmpty(pathPart2)) {
-      return pathPart1;
-    } else {
-      return pathPart1 + "/" + pathPart2;
+    /** Helper for concatenating paths with / Handles null & empty for both parts */
+    public static final String concatPath(String pathPart1, String pathPart2) {
+        if (isEmpty(pathPart1)) {
+            return pathPart2;
+        } else if (isEmpty(pathPart2)) {
+            return pathPart1;
+        } else {
+            return pathPart1 + "/" + pathPart2;
+        }
     }
-  }
 
-  /** Helper for concatenating parts with / Handles null & empty anywhere in the var-arg array */
-  public static final String concatPath(String... pathParts) {
-    StringBuilder builder = new StringBuilder();
-    for (String pathPart : pathParts) {
-      if (isEmpty(pathPart)) continue;
+    /** Helper for concatenating parts with / Handles null & empty anywhere in the var-arg array */
+    public static final String concatPath(String... pathParts) {
+        StringBuilder builder = new StringBuilder();
+        for (String pathPart : pathParts) {
+            if (isEmpty(pathPart)) continue;
 
-      if (builder.length() != 0) builder.append('/');
-      builder.append(pathPart);
+            if (builder.length() != 0) builder.append('/');
+            builder.append(pathPart);
+        }
+        return builder.toString();
     }
-    return builder.toString();
-  }
 
-  static final boolean isEmpty(String pathPart) {
-    return (pathPart == null) || pathPart.isEmpty();
-  }
+    static final boolean isEmpty(String pathPart) {
+        return (pathPart == null) || pathPart.isEmpty();
+    }
 }
diff --git a/components/native-loader/src/main/java/datadog/nativeloader/PlatformSpec.java b/components/native-loader/src/main/java/datadog/nativeloader/PlatformSpec.java
index c8e0a9e5902..783b520daa6 100644
--- a/components/native-loader/src/main/java/datadog/nativeloader/PlatformSpec.java
+++ b/components/native-loader/src/main/java/datadog/nativeloader/PlatformSpec.java
@@ -5,41 +5,41 @@
  * and libc variation
  */
 public abstract class PlatformSpec {
-  public static final PlatformSpec defaultPlatformSpec() {
-    return IntrospectPlatformSpec.INSTANCE;
-  }
+    public static final PlatformSpec defaultPlatformSpec() {
+        return IntrospectPlatformSpec.INSTANCE;
+    }
 
-  /** Is the target OS MacOS? */
-  public abstract boolean isMac();
+    /** Is the target OS MacOS? */
+    public abstract boolean isMac();
 
-  /** Is the target OS Windows? */
-  public abstract boolean isWindows();
+    /** Is the target OS Windows? */
+    public abstract boolean isWindows();
 
-  /** Is the target OS Linux? */
-  public abstract boolean isLinux();
+    /** Is the target OS Linux? */
+    public abstract boolean isLinux();
 
-  /** Is the target OS unknown / not handled by {@link NativeLoader}? */
-  public final boolean isUnknownOs() {
-    return !this.isLinux() && !this.isMac() && !this.isWindows();
-  }
+    /** Is the target OS unknown / not handled by {@link NativeLoader}? */
+    public final boolean isUnknownOs() {
+        return !this.isLinux() && !this.isMac() && !this.isWindows();
+    }
 
-  /** Is the target architecture x86-32 bit? */
-  public abstract boolean isX86_32();
+    /** Is the target architecture x86-32 bit? */
+    public abstract boolean isX86_32();
 
-  /** Is the target architecture x86-64 bit? */
-  public abstract boolean isX86_64();
+    /** Is the target architecture x86-64 bit? */
+    public abstract boolean isX86_64();
 
-  /** Is the target architecture ARM 32-bit? */
-  public abstract boolean isArm32();
+    /** Is the target architecture ARM 32-bit? */
+    public abstract boolean isArm32();
 
-  /** Is the target architecture ARM 64-bit? */
-  public abstract boolean isAarch64();
+    /** Is the target architecture ARM 64-bit? */
+    public abstract boolean isAarch64();
 
-  /** Is the target architecture unknown / not handled by {@link NativeLoader}? */
-  public final boolean isUnknownArch() {
-    return !this.isX86_64() && !this.isAarch64() && !this.isX86_32() && !this.isArm32();
-  }
+    /** Is the target architecture unknown / not handled by {@link NativeLoader}? */
+    public final boolean isUnknownArch() {
+        return !this.isX86_64() && !this.isAarch64() && !this.isX86_32() && !this.isArm32();
+    }
 
-  /** Is the target using MUSL libc? */
-  public abstract boolean isMusl();
+    /** Is the target using MUSL libc? */
+    public abstract boolean isMusl();
 }
diff --git a/components/native-loader/src/test/java/datadog/nativeloader/CapturingPathLocator.java b/components/native-loader/src/test/java/datadog/nativeloader/CapturingPathLocator.java
index b002b2c144d..c5fe2c3aafc 100644
--- a/components/native-loader/src/test/java/datadog/nativeloader/CapturingPathLocator.java
+++ b/components/native-loader/src/test/java/datadog/nativeloader/CapturingPathLocator.java
@@ -8,136 +8,133 @@
 import java.util.LinkedList;
 
 public final class CapturingPathLocator implements PathLocator {
-  public static final boolean WITH_OMIT_COMP_FALLBACK = true;
-  public static final boolean WITHOUT_OMIT_COMP_FALLBACK = false;
-
-  public static final void testFailOnExceptions(
-      LibraryResolver resolver,
-      PlatformSpec platformSpec,
-      boolean withSkipCompFallback,
-      String... expectedPaths) {
-    try {
-      test(resolver, platformSpec, withSkipCompFallback, expectedPaths);
-    } catch (Exception e) {
-      throw new IllegalStateException("unexpected exception", e);
-    }
-  }
-
-  public static final void test(
-      LibraryResolver resolver,
-      PlatformSpec platformSpec,
-      boolean withSkipCompFallback,
-      String... expectedPaths)
-      throws Exception {
-    String comp = "comp";
-
-    CapturingPathLocator fullCaptureLocator = new CapturingPathLocator(Integer.MAX_VALUE);
-    resolver.resolve(fullCaptureLocator, platformSpec, comp, "test");
-
-    for (int i = 0; !fullCaptureLocator.isEmpty(); ++i) {
-      if (i >= expectedPaths.length) {
-        // checking the final fallback here was confusing when debugging tests
-
-        if (!withSkipCompFallback) {
-          fullCaptureLocator.assertDone();
-        } else {
-          // checked at at the end of the method
-          fullCaptureLocator.nextRequest();
-          fullCaptureLocator.assertDone();
+    public static final boolean WITH_OMIT_COMP_FALLBACK = true;
+    public static final boolean WITHOUT_OMIT_COMP_FALLBACK = false;
+
+    public static final void testFailOnExceptions(
+            LibraryResolver resolver,
+            PlatformSpec platformSpec,
+            boolean withSkipCompFallback,
+            String... expectedPaths) {
+        try {
+            test(resolver, platformSpec, withSkipCompFallback, expectedPaths);
+        } catch (Exception e) {
+            throw new IllegalStateException("unexpected exception", e);
         }
-      } else {
-        fullCaptureLocator.assertRequested(comp, expectedPaths[i]);
-      }
     }
 
-    for (int i = 0; i < expectedPaths.length; ++i) {
-      CapturingPathLocator fallbackLocator = new CapturingPathLocator(i);
-      resolver.resolve(fallbackLocator, platformSpec, comp, "test");
+    public static final void test(
+            LibraryResolver resolver, PlatformSpec platformSpec, boolean withSkipCompFallback, String... expectedPaths)
+            throws Exception {
+        String comp = "comp";
+
+        CapturingPathLocator fullCaptureLocator = new CapturingPathLocator(Integer.MAX_VALUE);
+        resolver.resolve(fullCaptureLocator, platformSpec, comp, "test");
+
+        for (int i = 0; !fullCaptureLocator.isEmpty(); ++i) {
+            if (i >= expectedPaths.length) {
+                // checking the final fallback here was confusing when debugging tests
+
+                if (!withSkipCompFallback) {
+                    fullCaptureLocator.assertDone();
+                } else {
+                    // checked at at the end of the method
+                    fullCaptureLocator.nextRequest();
+                    fullCaptureLocator.assertDone();
+                }
+            } else {
+                fullCaptureLocator.assertRequested(comp, expectedPaths[i]);
+            }
+        }
 
-      for (int j = 0; j <= i; ++j) {
-        fallbackLocator.assertRequested(comp, expectedPaths[j]);
-      }
-      fallbackLocator.assertDone();
-    }
+        for (int i = 0; i < expectedPaths.length; ++i) {
+            CapturingPathLocator fallbackLocator = new CapturingPathLocator(i);
+            resolver.resolve(fallbackLocator, platformSpec, comp, "test");
+
+            for (int j = 0; j <= i; ++j) {
+                fallbackLocator.assertRequested(comp, expectedPaths[j]);
+            }
+            fallbackLocator.assertDone();
+        }
 
-    if (withSkipCompFallback) {
-      CapturingPathLocator fallbackLocator = new CapturingPathLocator(expectedPaths.length);
-      resolver.resolve(fallbackLocator, platformSpec, comp, "test");
+        if (withSkipCompFallback) {
+            CapturingPathLocator fallbackLocator = new CapturingPathLocator(expectedPaths.length);
+            resolver.resolve(fallbackLocator, platformSpec, comp, "test");
 
-      for (int j = 0; j < expectedPaths.length; ++j) {
-        fallbackLocator.assertRequested(comp, expectedPaths[j]);
-      }
-      fallbackLocator.assertRequested(null, expectedPaths[expectedPaths.length - 1]);
-      fallbackLocator.assertDone();
+            for (int j = 0; j < expectedPaths.length; ++j) {
+                fallbackLocator.assertRequested(comp, expectedPaths[j]);
+            }
+            fallbackLocator.assertRequested(null, expectedPaths[expectedPaths.length - 1]);
+            fallbackLocator.assertDone();
+        }
     }
-  }
 
-  final int simulateNotFoundCount;
-  int numRequests;
+    final int simulateNotFoundCount;
+    int numRequests;
 
-  final Deque<LocateRequest> locateRequests = new LinkedList<>();
+    final Deque<LocateRequest> locateRequests = new LinkedList<>();
 
-  public CapturingPathLocator() {
-    this(0);
-  }
+    public CapturingPathLocator() {
+        this(0);
+    }
 
-  public CapturingPathLocator(int simulateNotFoundCount) {
-    this.numRequests = 0;
-    this.simulateNotFoundCount = simulateNotFoundCount;
-  }
+    public CapturingPathLocator(int simulateNotFoundCount) {
+        this.numRequests = 0;
+        this.simulateNotFoundCount = simulateNotFoundCount;
+    }
 
-  @Override
-  public URL locate(String optionalComponent, String path) {
-    this.locateRequests.addLast(new LocateRequest(optionalComponent, path));
+    @Override
+    public URL locate(String optionalComponent, String path) {
+        this.locateRequests.addLast(new LocateRequest(optionalComponent, path));
 
-    if (this.numRequests++ < this.simulateNotFoundCount) return null;
-    try {
-      return new URL("http://localhost");
-    } catch (MalformedURLException e) {
-      throw new IllegalStateException(e);
+        if (this.numRequests++ < this.simulateNotFoundCount) return null;
+        try {
+            return new URL("http://localhost");
+        } catch (MalformedURLException e) {
+            throw new IllegalStateException(e);
+        }
     }
-  }
 
-  int numLocateRequests() {
-    return this.locateRequests.size();
-  }
+    int numLocateRequests() {
+        return this.locateRequests.size();
+    }
 
-  boolean isEmpty() {
-    return this.locateRequests.isEmpty();
-  }
+    boolean isEmpty() {
+        return this.locateRequests.isEmpty();
+    }
 
-  LocateRequest nextRequest() {
-    return this.locateRequests.removeFirst();
-  }
+    LocateRequest nextRequest() {
+        return this.locateRequests.removeFirst();
+    }
 
-  void assertRequested(LocateRequest request) {
-    this.assertRequested(request.requestedComponent, request.requestedPath);
-  }
+    void assertRequested(LocateRequest request) {
+        this.assertRequested(request.requestedComponent, request.requestedPath);
+    }
 
-  void assertRequested(String expectedComponent, String expectedPath) {
-    this.nextRequest().assertRequested(expectedComponent, expectedPath);
-  }
+    void assertRequested(String expectedComponent, String expectedPath) {
+        this.nextRequest().assertRequested(expectedComponent, expectedPath);
+    }
 
-  void assertDone() {
-    // written this way to aid in debugging and fleshing out the test
-    if (!this.isEmpty()) {
-      this.assertRequested("", "");
+    void assertDone() {
+        // written this way to aid in debugging and fleshing out the test
+        if (!this.isEmpty()) {
+            this.assertRequested("", "");
+        }
     }
-  }
 
-  final class LocateRequest {
-    private final String requestedComponent;
-    private final String requestedPath;
+    final class LocateRequest {
+        private final String requestedComponent;
+        private final String requestedPath;
 
-    LocateRequest(String requestedComponent, String requestedPath) {
-      this.requestedComponent = requestedComponent;
-      this.requestedPath = requestedPath;
-    }
+        LocateRequest(String requestedComponent, String requestedPath) {
+            this.requestedComponent = requestedComponent;
+            this.requestedPath = requestedPath;
+        }
 
-    void assertRequested(String expectedComponent, String expectedPath) {
-      // order is inverted, since usually test writer is worrying about comp directly
-      assertEquals(expectedPath, this.requestedPath);
-      assertEquals(expectedComponent, this.requestedComponent);
+        void assertRequested(String expectedComponent, String expectedPath) {
+            // order is inverted, since usually test writer is worrying about comp directly
+            assertEquals(expectedPath, this.requestedPath);
+            assertEquals(expectedComponent, this.requestedComponent);
+        }
     }
-  }
 }
diff --git a/components/native-loader/src/test/java/datadog/nativeloader/CompositeLibraryLoadingListenerTest.java b/components/native-loader/src/test/java/datadog/nativeloader/CompositeLibraryLoadingListenerTest.java
index 019f09c2138..4c8673f4df7 100644
--- a/components/native-loader/src/test/java/datadog/nativeloader/CompositeLibraryLoadingListenerTest.java
+++ b/components/native-loader/src/test/java/datadog/nativeloader/CompositeLibraryLoadingListenerTest.java
@@ -14,163 +14,150 @@
 import org.junit.jupiter.api.Test;
 
 public final class CompositeLibraryLoadingListenerTest {
-  @Test
-  public void onResolveDynamic() throws MalformedURLException {
-    TestLibraryLoadingListener listener1 =
-        new TestLibraryLoadingListener().expectResolveDynamic("foo");
+    @Test
+    public void onResolveDynamic() throws MalformedURLException {
+        TestLibraryLoadingListener listener1 = new TestLibraryLoadingListener().expectResolveDynamic("foo");
 
-    TestLibraryLoadingListener listener2 = listener1.copy();
+        TestLibraryLoadingListener listener2 = listener1.copy();
 
-    listeners(listener1, listener2)
-        .onResolveDynamic(
-            PlatformSpec.defaultPlatformSpec(), null, "foo", false, new URL("http://localhost"));
+        listeners(listener1, listener2)
+                .onResolveDynamic(PlatformSpec.defaultPlatformSpec(), null, "foo", false, new URL("http://localhost"));
 
-    listener1.assertDone();
-    listener2.assertDone();
-  }
+        listener1.assertDone();
+        listener2.assertDone();
+    }
 
-  @Test
-  public void onResolveDynamicFailure() {
-    TestLibraryLoadingListener listener1 =
-        new TestLibraryLoadingListener().expectResolveDynamicFailure("foo");
+    @Test
+    public void onResolveDynamicFailure() {
+        TestLibraryLoadingListener listener1 = new TestLibraryLoadingListener().expectResolveDynamicFailure("foo");
 
-    TestLibraryLoadingListener listener2 = listener1.copy();
+        TestLibraryLoadingListener listener2 = listener1.copy();
 
-    listeners(listener1, listener2)
-        .onResolveDynamicFailure(
-            PlatformSpec.defaultPlatformSpec(), null, "foo", new Exception("foo"));
+        listeners(listener1, listener2)
+                .onResolveDynamicFailure(PlatformSpec.defaultPlatformSpec(), null, "foo", new Exception("foo"));
 
-    listener1.assertDone();
-    listener2.assertDone();
-  }
+        listener1.assertDone();
+        listener2.assertDone();
+    }
 
-  @Test
-  public void onLoad() {
-    TestLibraryLoadingListener listener1 = new TestLibraryLoadingListener().expectLoad("foo");
+    @Test
+    public void onLoad() {
+        TestLibraryLoadingListener listener1 = new TestLibraryLoadingListener().expectLoad("foo");
 
-    TestLibraryLoadingListener listener2 = listener1.copy();
+        TestLibraryLoadingListener listener2 = listener1.copy();
 
-    listeners(listener1, listener2)
-        .onLoad(PlatformSpec.defaultPlatformSpec(), null, "foo", false, null);
+        listeners(listener1, listener2).onLoad(PlatformSpec.defaultPlatformSpec(), null, "foo", false, null);
 
-    listener1.assertDone();
-    listener2.assertDone();
-  }
+        listener1.assertDone();
+        listener2.assertDone();
+    }
 
-  @Test
-  public void onLoadFailure() {
-    TestLibraryLoadingListener listener1 =
-        new TestLibraryLoadingListener().expectLoadFailure("foo");
+    @Test
+    public void onLoadFailure() {
+        TestLibraryLoadingListener listener1 = new TestLibraryLoadingListener().expectLoadFailure("foo");
 
-    TestLibraryLoadingListener listener2 = listener1.copy();
+        TestLibraryLoadingListener listener2 = listener1.copy();
 
-    listeners(listener1, listener2)
-        .onLoadFailure(PlatformSpec.defaultPlatformSpec(), null, "foo", null);
+        listeners(listener1, listener2).onLoadFailure(PlatformSpec.defaultPlatformSpec(), null, "foo", null);
 
-    listener1.assertDone();
-    listener2.assertDone();
-  }
+        listener1.assertDone();
+        listener2.assertDone();
+    }
 
-  @Test
-  public void onTempFileCreated() {
-    TestLibraryLoadingListener listener1 =
-        new TestLibraryLoadingListener().expectTempFileCreated("foo");
+    @Test
+    public void onTempFileCreated() {
+        TestLibraryLoadingListener listener1 = new TestLibraryLoadingListener().expectTempFileCreated("foo");
 
-    TestLibraryLoadingListener listener2 = listener1.copy();
+        TestLibraryLoadingListener listener2 = listener1.copy();
 
-    listeners(listener1, listener2)
-        .onTempFileCreated(
-            PlatformSpec.defaultPlatformSpec(), null, "foo", Paths.get("/tmp/foo.dll"));
+        listeners(listener1, listener2)
+                .onTempFileCreated(PlatformSpec.defaultPlatformSpec(), null, "foo", Paths.get("/tmp/foo.dll"));
 
-    listener1.assertDone();
-    listener2.assertDone();
-  }
+        listener1.assertDone();
+        listener2.assertDone();
+    }
 
-  @Test
-  public void onTempFileCreationFailure() {
-    TestLibraryLoadingListener listener1 =
-        new TestLibraryLoadingListener().expectTempFileCreationFailure("foo");
+    @Test
+    public void onTempFileCreationFailure() {
+        TestLibraryLoadingListener listener1 = new TestLibraryLoadingListener().expectTempFileCreationFailure("foo");
 
-    TestLibraryLoadingListener listener2 = listener1.copy();
+        TestLibraryLoadingListener listener2 = listener1.copy();
 
-    listeners(listener1, listener2)
-        .onTempFileCreationFailure(
-            PlatformSpec.defaultPlatformSpec(),
-            null,
-            "foo",
-            Paths.get("/tmp"),
-            "dylib",
-            new IOException("perm"));
+        listeners(listener1, listener2)
+                .onTempFileCreationFailure(
+                        PlatformSpec.defaultPlatformSpec(),
+                        null,
+                        "foo",
+                        Paths.get("/tmp"),
+                        "dylib",
+                        new IOException("perm"));
 
-    listener1.assertDone();
-    listener2.assertDone();
-  }
+        listener1.assertDone();
+        listener2.assertDone();
+    }
 
-  @Test
-  public void onTempFileCleanup() {
-    TestLibraryLoadingListener listener1 =
-        new TestLibraryLoadingListener().expectTempFileCleanup("foo");
+    @Test
+    public void onTempFileCleanup() {
+        TestLibraryLoadingListener listener1 = new TestLibraryLoadingListener().expectTempFileCleanup("foo");
 
-    TestLibraryLoadingListener listener2 = listener1.copy();
+        TestLibraryLoadingListener listener2 = listener1.copy();
 
-    listeners(listener1, listener2)
-        .onTempFileCleanup(
-            PlatformSpec.defaultPlatformSpec(), null, "foo", Paths.get("/tmp/foo.dll"));
+        listeners(listener1, listener2)
+                .onTempFileCleanup(PlatformSpec.defaultPlatformSpec(), null, "foo", Paths.get("/tmp/foo.dll"));
 
-    listener1.assertDone();
-    listener2.assertDone();
-  }
+        listener1.assertDone();
+        listener2.assertDone();
+    }
 
-  @Test
-  public void join() {
-    TestLibraryLoadingListener listener1 = new TestLibraryLoadingListener().expectLoad("foo");
+    @Test
+    public void join() {
+        TestLibraryLoadingListener listener1 = new TestLibraryLoadingListener().expectLoad("foo");
 
-    CompositeLibraryLoadingListener composite = new CompositeLibraryLoadingListener(listener1);
-    assertEquals(1, composite.size());
+        CompositeLibraryLoadingListener composite = new CompositeLibraryLoadingListener(listener1);
+        assertEquals(1, composite.size());
 
-    TestLibraryLoadingListener listener2 = listener1.copy();
+        TestLibraryLoadingListener listener2 = listener1.copy();
 
-    CompositeLibraryLoadingListener composite2 = composite.join(listener2);
-    assertEquals(2, composite2.size());
+        CompositeLibraryLoadingListener composite2 = composite.join(listener2);
+        assertEquals(2, composite2.size());
 
-    TestLibraryLoadingListener listener3 = listener1.copy();
-    TestLibraryLoadingListener listener4 = listener1.copy();
+        TestLibraryLoadingListener listener3 = listener1.copy();
+        TestLibraryLoadingListener listener4 = listener1.copy();
 
-    CompositeLibraryLoadingListener finalComposite = composite2.join(listener3, listener4);
-    assertEquals(4, finalComposite.size());
+        CompositeLibraryLoadingListener finalComposite = composite2.join(listener3, listener4);
+        assertEquals(4, finalComposite.size());
 
-    finalComposite.onLoad(
-        PlatformSpec.defaultPlatformSpec(), null, "foo", false, Paths.get("/tmp/foo.dll"));
+        finalComposite.onLoad(PlatformSpec.defaultPlatformSpec(), null, "foo", false, Paths.get("/tmp/foo.dll"));
 
-    listener1.assertDone();
-    listener2.assertDone();
-    listener3.assertDone();
-    listener4.assertDone();
-  }
+        listener1.assertDone();
+        listener2.assertDone();
+        listener3.assertDone();
+        listener4.assertDone();
+    }
 
-  @Test
-  public void _toString() {
-    // just for coverage
-    assertNotNull(new CompositeLibraryLoadingListener().toString());
-  }
-
-  /*
-   * Constructs a composite listener that includes the provided listeners
-   * To test robustness...
-   * - adds in additional failing listeners
-   * - adds in additional default listeners
-   * - shuffles the order of the listeners
-   */
-  static CompositeLibraryLoadingListener listeners(LibraryLoadingListener... listeners) {
-    List<LibraryLoadingListener> shuffledListeners = new ArrayList<>(listeners.length * 3);
-    shuffledListeners.addAll(Arrays.asList(listeners));
-
-    for (int i = 0; i < listeners.length; ++i) {
-      shuffledListeners.add(new LibraryLoadingListener() {});
-      shuffledListeners.add(new ThrowingLibraryLoadingListener());
+    @Test
+    public void _toString() {
+        // just for coverage
+        assertNotNull(new CompositeLibraryLoadingListener().toString());
     }
 
-    Collections.shuffle(shuffledListeners);
-    return new CompositeLibraryLoadingListener(shuffledListeners);
-  }
+    /*
+     * Constructs a composite listener that includes the provided listeners
+     * To test robustness...
+     * - adds in additional failing listeners
+     * - adds in additional default listeners
+     * - shuffles the order of the listeners
+     */
+    static CompositeLibraryLoadingListener listeners(LibraryLoadingListener... listeners) {
+        List<LibraryLoadingListener> shuffledListeners = new ArrayList<>(listeners.length * 3);
+        shuffledListeners.addAll(Arrays.asList(listeners));
+
+        for (int i = 0; i < listeners.length; ++i) {
+            shuffledListeners.add(new LibraryLoadingListener() {});
+            shuffledListeners.add(new ThrowingLibraryLoadingListener());
+        }
+
+        Collections.shuffle(shuffledListeners);
+        return new CompositeLibraryLoadingListener(shuffledListeners);
+    }
 }
diff --git a/components/native-loader/src/test/java/datadog/nativeloader/FlatDirLibraryResolverTest.java b/components/native-loader/src/test/java/datadog/nativeloader/FlatDirLibraryResolverTest.java
index 2438770288e..01d5d6d8ff1 100644
--- a/components/native-loader/src/test/java/datadog/nativeloader/FlatDirLibraryResolverTest.java
+++ b/components/native-loader/src/test/java/datadog/nativeloader/FlatDirLibraryResolverTest.java
@@ -11,54 +11,46 @@
 import org.junit.jupiter.api.Test;
 
 public class FlatDirLibraryResolverTest {
-  @Test
-  public void linux_x86_64_libc() {
-    test(
-        TestPlatformSpec.of(LINUX, X86_64, GLIBC),
-        "linux-x86_64-libc/libtest.so",
-        "linux-x86_64/libtest.so",
-        "linux/libtest.so",
-        "libtest.so");
-  }
-
-  @Test
-  public void linux_x86_64_musl() {
-    test(
-        TestPlatformSpec.of(LINUX, X86_64, MUSL),
-        "linux-x86_64-musl/libtest.so",
-        "linux-x86_64/libtest.so",
-        "linux/libtest.so",
-        "libtest.so");
-  }
-
-  @Test
-  public void osx_x86_64() {
-    test(
-        TestPlatformSpec.of(MAC, X86_64),
-        "macos-x86_64/libtest.dylib",
-        "macos/libtest.dylib",
-        "libtest.dylib");
-  }
-
-  @Test
-  public void osx_aarch64() {
-    test(
-        TestPlatformSpec.of(MAC, AARCH64),
-        "macos-aarch64/libtest.dylib",
-        "macos/libtest.dylib",
-        "libtest.dylib");
-  }
-
-  @Test
-  public void windows_x86_64() {
-    test(TestPlatformSpec.of(WINDOWS, X86_64), "win-x86_64/test.dll", "win/test.dll", "test.dll");
-  }
-
-  static final void test(PlatformSpec platformSpec, String... expectedPaths) {
-    CapturingPathLocator.testFailOnExceptions(
-        FlatDirLibraryResolver.INSTANCE,
-        platformSpec,
-        CapturingPathLocator.WITH_OMIT_COMP_FALLBACK,
-        expectedPaths);
-  }
+    @Test
+    public void linux_x86_64_libc() {
+        test(
+                TestPlatformSpec.of(LINUX, X86_64, GLIBC),
+                "linux-x86_64-libc/libtest.so",
+                "linux-x86_64/libtest.so",
+                "linux/libtest.so",
+                "libtest.so");
+    }
+
+    @Test
+    public void linux_x86_64_musl() {
+        test(
+                TestPlatformSpec.of(LINUX, X86_64, MUSL),
+                "linux-x86_64-musl/libtest.so",
+                "linux-x86_64/libtest.so",
+                "linux/libtest.so",
+                "libtest.so");
+    }
+
+    @Test
+    public void osx_x86_64() {
+        test(TestPlatformSpec.of(MAC, X86_64), "macos-x86_64/libtest.dylib", "macos/libtest.dylib", "libtest.dylib");
+    }
+
+    @Test
+    public void osx_aarch64() {
+        test(TestPlatformSpec.of(MAC, AARCH64), "macos-aarch64/libtest.dylib", "macos/libtest.dylib", "libtest.dylib");
+    }
+
+    @Test
+    public void windows_x86_64() {
+        test(TestPlatformSpec.of(WINDOWS, X86_64), "win-x86_64/test.dll", "win/test.dll", "test.dll");
+    }
+
+    static final void test(PlatformSpec platformSpec, String... expectedPaths) {
+        CapturingPathLocator.testFailOnExceptions(
+                FlatDirLibraryResolver.INSTANCE,
+                platformSpec,
+                CapturingPathLocator.WITH_OMIT_COMP_FALLBACK,
+                expectedPaths);
+    }
 }
diff --git a/components/native-loader/src/test/java/datadog/nativeloader/IntrospectPlatformSpecTest.java b/components/native-loader/src/test/java/datadog/nativeloader/IntrospectPlatformSpecTest.java
index 75da5ae18cd..972e12babd4 100644
--- a/components/native-loader/src/test/java/datadog/nativeloader/IntrospectPlatformSpecTest.java
+++ b/components/native-loader/src/test/java/datadog/nativeloader/IntrospectPlatformSpecTest.java
@@ -9,42 +9,42 @@
 import org.junit.jupiter.api.Test;
 
 public class IntrospectPlatformSpecTest {
-  @Test
-  public void os() {
-    PlatformSpec platformSpec = IntrospectPlatformSpec.INSTANCE;
-
-    // a bit silly since this just mirrors the underlying implementation
-    assertEquals(OperatingSystem.isMacOs(), platformSpec.isMac());
-    assertEquals(OperatingSystem.isLinux(), platformSpec.isLinux());
-    assertEquals(OperatingSystem.isWindows(), platformSpec.isWindows());
-  }
-
-  @Test
-  public void arch() {
-    PlatformSpec platformSpec = IntrospectPlatformSpec.INSTANCE;
-
-    assertEquals(OperatingSystem.architecture() == Architecture.X86, platformSpec.isX86_32());
-    assertEquals(OperatingSystem.architecture() == Architecture.X64, platformSpec.isX86_64());
-    assertEquals(OperatingSystem.architecture() == Architecture.ARM, platformSpec.isArm32());
-    assertEquals(OperatingSystem.architecture() == Architecture.ARM64, platformSpec.isAarch64());
-  }
-
-  @Test
-  public void musl() {
-    PlatformSpec platformSpec = IntrospectPlatformSpec.INSTANCE;
-
-    assertEquals(OperatingSystem.isMusl(), platformSpec.isMusl());
-  }
-
-  @Test
-  public void equals() {
-    // just a sanity check, since assertEquals is used in other tests
-    assertTrue(IntrospectPlatformSpec.INSTANCE.equals(IntrospectPlatformSpec.INSTANCE));
-  }
-
-  @Test
-  public void notEquals_diffType() {
-    // just a sanity check, since assertEquals is used in other tests
-    assertFalse(IntrospectPlatformSpec.INSTANCE.equals(TestPlatformSpec.unsupportedOs()));
-  }
+    @Test
+    public void os() {
+        PlatformSpec platformSpec = IntrospectPlatformSpec.INSTANCE;
+
+        // a bit silly since this just mirrors the underlying implementation
+        assertEquals(OperatingSystem.isMacOs(), platformSpec.isMac());
+        assertEquals(OperatingSystem.isLinux(), platformSpec.isLinux());
+        assertEquals(OperatingSystem.isWindows(), platformSpec.isWindows());
+    }
+
+    @Test
+    public void arch() {
+        PlatformSpec platformSpec = IntrospectPlatformSpec.INSTANCE;
+
+        assertEquals(OperatingSystem.architecture() == Architecture.X86, platformSpec.isX86_32());
+        assertEquals(OperatingSystem.architecture() == Architecture.X64, platformSpec.isX86_64());
+        assertEquals(OperatingSystem.architecture() == Architecture.ARM, platformSpec.isArm32());
+        assertEquals(OperatingSystem.architecture() == Architecture.ARM64, platformSpec.isAarch64());
+    }
+
+    @Test
+    public void musl() {
+        PlatformSpec platformSpec = IntrospectPlatformSpec.INSTANCE;
+
+        assertEquals(OperatingSystem.isMusl(), platformSpec.isMusl());
+    }
+
+    @Test
+    public void equals() {
+        // just a sanity check, since assertEquals is used in other tests
+        assertTrue(IntrospectPlatformSpec.INSTANCE.equals(IntrospectPlatformSpec.INSTANCE));
+    }
+
+    @Test
+    public void notEquals_diffType() {
+        // just a sanity check, since assertEquals is used in other tests
+        assertFalse(IntrospectPlatformSpec.INSTANCE.equals(TestPlatformSpec.unsupportedOs()));
+    }
 }
diff --git a/components/native-loader/src/test/java/datadog/nativeloader/NativeLoaderBuilderTest.java b/components/native-loader/src/test/java/datadog/nativeloader/NativeLoaderBuilderTest.java
index db5a25b4541..3068bb2f92b 100644
--- a/components/native-loader/src/test/java/datadog/nativeloader/NativeLoaderBuilderTest.java
+++ b/components/native-loader/src/test/java/datadog/nativeloader/NativeLoaderBuilderTest.java
@@ -10,172 +10,170 @@
 import org.junit.jupiter.api.Test;
 
 public class NativeLoaderBuilderTest {
-  @Test
-  public void defaultPlatformSpec() {
-    NativeLoader.Builder builder = NativeLoader.builder();
+    @Test
+    public void defaultPlatformSpec() {
+        NativeLoader.Builder builder = NativeLoader.builder();
 
-    assertEquals(PlatformSpec.defaultPlatformSpec(), builder.platformSpec());
-  }
+        assertEquals(PlatformSpec.defaultPlatformSpec(), builder.platformSpec());
+    }
 
-  @Test
-  public void customPlatformSpec() {
-    PlatformSpec platformSpec =
-        TestPlatformSpec.of(TestPlatformSpec.LINUX, TestPlatformSpec.ARM32, TestPlatformSpec.GLIBC);
+    @Test
+    public void customPlatformSpec() {
+        PlatformSpec platformSpec =
+                TestPlatformSpec.of(TestPlatformSpec.LINUX, TestPlatformSpec.ARM32, TestPlatformSpec.GLIBC);
 
-    NativeLoader.Builder builder = NativeLoader.builder().platformSpec(platformSpec);
-    assertSame(platformSpec, builder.platformSpec());
-  }
+        NativeLoader.Builder builder = NativeLoader.builder().platformSpec(platformSpec);
+        assertSame(platformSpec, builder.platformSpec());
+    }
 
-  @Test
-  public void defaultListeners() {
-    NativeLoader.Builder builder = NativeLoader.builder();
+    @Test
+    public void defaultListeners() {
+        NativeLoader.Builder builder = NativeLoader.builder();
 
-    assertTrue(builder.listeners().isNop());
-  }
+        assertTrue(builder.listeners().isNop());
+    }
 
-  @Test
-  public void addListener() {
-    TestLibraryLoadingListener listener1 = new TestLibraryLoadingListener().expectLoad("foo");
-    TestLibraryLoadingListener listener2 = listener1.copy();
+    @Test
+    public void addListener() {
+        TestLibraryLoadingListener listener1 = new TestLibraryLoadingListener().expectLoad("foo");
+        TestLibraryLoadingListener listener2 = listener1.copy();
 
-    NativeLoader.Builder builder =
-        NativeLoader.builder().addListener(listener1).addListener(listener2);
+        NativeLoader.Builder builder =
+                NativeLoader.builder().addListener(listener1).addListener(listener2);
 
-    SafeLibraryLoadingListener listener = builder.listeners();
-    assertFalse(listener.isNop());
+        SafeLibraryLoadingListener listener = builder.listeners();
+        assertFalse(listener.isNop());
 
-    listener.onLoad(builder.platformSpec(), null, "foo", false, Paths.get("/tmp/foo.dylib"));
+        listener.onLoad(builder.platformSpec(), null, "foo", false, Paths.get("/tmp/foo.dylib"));
 
-    listener1.assertDone();
-    listener2.assertDone();
-  }
+        listener1.assertDone();
+        listener2.assertDone();
+    }
 
-  @Test
-  public void addListeners() {
-    TestLibraryLoadingListener listener1 = new TestLibraryLoadingListener().expectLoad("foo");
-    TestLibraryLoadingListener listener2 = listener1.copy();
+    @Test
+    public void addListeners() {
+        TestLibraryLoadingListener listener1 = new TestLibraryLoadingListener().expectLoad("foo");
+        TestLibraryLoadingListener listener2 = listener1.copy();
 
-    NativeLoader.Builder builder = NativeLoader.builder().addListeners(listener1, listener2);
+        NativeLoader.Builder builder = NativeLoader.builder().addListeners(listener1, listener2);
 
-    SafeLibraryLoadingListener listener = builder.listeners();
-    assertFalse(listener.isNop());
+        SafeLibraryLoadingListener listener = builder.listeners();
+        assertFalse(listener.isNop());
 
-    listener.onLoad(builder.platformSpec(), null, "foo", false, Paths.get("/tmp/foo.dylib"));
+        listener.onLoad(builder.platformSpec(), null, "foo", false, Paths.get("/tmp/foo.dylib"));
 
-    listener1.assertDone();
-    listener2.assertDone();
-  }
+        listener1.assertDone();
+        listener2.assertDone();
+    }
 
-  @Test
-  public void defaultLibraryResolver() {
-    NativeLoader.Builder builder = NativeLoader.builder();
+    @Test
+    public void defaultLibraryResolver() {
+        NativeLoader.Builder builder = NativeLoader.builder();
 
-    assertEquals(LibraryResolvers.defaultLibraryResolver(), builder.libResolver());
-  }
+        assertEquals(LibraryResolvers.defaultLibraryResolver(), builder.libResolver());
+    }
 
-  @Test
-  public void flatLayout() {
-    NativeLoader.Builder builder = NativeLoader.builder().flatLayout();
+    @Test
+    public void flatLayout() {
+        NativeLoader.Builder builder = NativeLoader.builder().flatLayout();
 
-    assertEquals(LibraryResolvers.flatDirs(), builder.libResolver());
-  }
+        assertEquals(LibraryResolvers.flatDirs(), builder.libResolver());
+    }
 
-  @Test
-  public void nestedLayout() {
-    NativeLoader.Builder builder = NativeLoader.builder().nestedLayout();
+    @Test
+    public void nestedLayout() {
+        NativeLoader.Builder builder = NativeLoader.builder().nestedLayout();
 
-    assertEquals(LibraryResolvers.nestedDirs(), builder.libResolver());
-  }
+        assertEquals(LibraryResolvers.nestedDirs(), builder.libResolver());
+    }
 
-  @Test
-  public void preloaded() {
-    PlatformSpec platformSpec =
-        TestPlatformSpec.of(TestPlatformSpec.LINUX, TestPlatformSpec.ARM32, TestPlatformSpec.GLIBC);
+    @Test
+    public void preloaded() {
+        PlatformSpec platformSpec =
+                TestPlatformSpec.of(TestPlatformSpec.LINUX, TestPlatformSpec.ARM32, TestPlatformSpec.GLIBC);
 
-    NativeLoader.Builder builder =
-        NativeLoader.builder().platformSpec(platformSpec).preloaded("foo", "bar");
+        NativeLoader.Builder builder =
+                NativeLoader.builder().platformSpec(platformSpec).preloaded("foo", "bar");
 
-    LibraryResolver libResolver = builder.libResolver();
-    assertTrue(libResolver.isPreloaded(platformSpec, "foo"));
-    assertTrue(libResolver.isPreloaded(platformSpec, "bar"));
+        LibraryResolver libResolver = builder.libResolver();
+        assertTrue(libResolver.isPreloaded(platformSpec, "foo"));
+        assertTrue(libResolver.isPreloaded(platformSpec, "bar"));
 
-    assertFalse(libResolver.isPreloaded(platformSpec, "not-preloaded"));
-  }
+        assertFalse(libResolver.isPreloaded(platformSpec, "not-preloaded"));
+    }
 
-  @Test
-  public void defaultPathLocator() {
-    NativeLoader.Builder builder = NativeLoader.builder();
+    @Test
+    public void defaultPathLocator() {
+        NativeLoader.Builder builder = NativeLoader.builder();
 
-    assertEquals(PathLocators.defaultPathLocator(), builder.pathLocator());
-  }
+        assertEquals(PathLocators.defaultPathLocator(), builder.pathLocator());
+    }
 
-  @Test
-  public void dirBasedLocator_string() {
-    NativeLoader.Builder builder = NativeLoader.builder().fromDir("libs");
+    @Test
+    public void dirBasedLocator_string() {
+        NativeLoader.Builder builder = NativeLoader.builder().fromDir("libs");
 
-    assertEquals(PathLocators.fromLibDirs("libs"), builder.pathLocator());
-  }
+        assertEquals(PathLocators.fromLibDirs("libs"), builder.pathLocator());
+    }
 
-  @Test
-  public void dirBasedLocator_strings_multiple() {
-    NativeLoader.Builder builder = NativeLoader.builder().fromDirs("libs1", "libs2");
+    @Test
+    public void dirBasedLocator_strings_multiple() {
+        NativeLoader.Builder builder = NativeLoader.builder().fromDirs("libs1", "libs2");
 
-    assertEquals(PathLocators.fromLibDirs("libs1", "libs2"), builder.pathLocator());
-  }
+        assertEquals(PathLocators.fromLibDirs("libs1", "libs2"), builder.pathLocator());
+    }
 
-  @Test
-  public void dirBasedLocator_file() {
-    NativeLoader.Builder builder = NativeLoader.builder().fromDir(new File("libs"));
+    @Test
+    public void dirBasedLocator_file() {
+        NativeLoader.Builder builder = NativeLoader.builder().fromDir(new File("libs"));
 
-    assertEquals(PathLocators.fromLibDirs("libs"), builder.pathLocator());
-  }
+        assertEquals(PathLocators.fromLibDirs("libs"), builder.pathLocator());
+    }
 
-  @Test
-  public void dirBasedLocator_files_multiple() {
-    NativeLoader.Builder builder =
-        NativeLoader.builder().fromDirs(new File("libs1"), new File("libs2"));
+    @Test
+    public void dirBasedLocator_files_multiple() {
+        NativeLoader.Builder builder = NativeLoader.builder().fromDirs(new File("libs1"), new File("libs2"));
 
-    assertEquals(PathLocators.fromLibDirs("libs1", "libs2"), builder.pathLocator());
-  }
+        assertEquals(PathLocators.fromLibDirs("libs1", "libs2"), builder.pathLocator());
+    }
 
-  @Test
-  public void dirBasedLocator_path() {
-    NativeLoader.Builder builder = NativeLoader.builder().fromDir(Paths.get("libs"));
+    @Test
+    public void dirBasedLocator_path() {
+        NativeLoader.Builder builder = NativeLoader.builder().fromDir(Paths.get("libs"));
 
-    assertEquals(PathLocators.fromLibDirs("libs"), builder.pathLocator());
-  }
+        assertEquals(PathLocators.fromLibDirs("libs"), builder.pathLocator());
+    }
 
-  @Test
-  public void dirBasedLocator_paths_multiple() {
-    NativeLoader.Builder builder =
-        NativeLoader.builder().fromDirs(Paths.get("libs1"), Paths.get("libs2"));
+    @Test
+    public void dirBasedLocator_paths_multiple() {
+        NativeLoader.Builder builder = NativeLoader.builder().fromDirs(Paths.get("libs1"), Paths.get("libs2"));
 
-    assertEquals(PathLocators.fromLibDirs("libs1", "libs2"), builder.pathLocator());
-  }
+        assertEquals(PathLocators.fromLibDirs("libs1", "libs2"), builder.pathLocator());
+    }
 
-  @Test
-  public void classLoaderBasedLocator() {
-    ClassLoader sysClassLoader = ClassLoader.getSystemClassLoader();
-    NativeLoader.Builder builder = NativeLoader.builder().fromClassLoader(sysClassLoader);
+    @Test
+    public void classLoaderBasedLocator() {
+        ClassLoader sysClassLoader = ClassLoader.getSystemClassLoader();
+        NativeLoader.Builder builder = NativeLoader.builder().fromClassLoader(sysClassLoader);
 
-    assertEquals(PathLocators.fromClassLoader(sysClassLoader), builder.pathLocator());
-  }
+        assertEquals(PathLocators.fromClassLoader(sysClassLoader), builder.pathLocator());
+    }
 
-  @Test
-  public void tempDir_string() {
-    NativeLoader.Builder builder = NativeLoader.builder().tempDir("tmp");
-    assertEquals(builder.tempDir(), Paths.get("tmp"));
-  }
+    @Test
+    public void tempDir_string() {
+        NativeLoader.Builder builder = NativeLoader.builder().tempDir("tmp");
+        assertEquals(builder.tempDir(), Paths.get("tmp"));
+    }
 
-  @Test
-  public void tempDir_file() {
-    NativeLoader.Builder builder = NativeLoader.builder().tempDir(new File("tmp"));
-    assertEquals(builder.tempDir(), Paths.get("tmp"));
-  }
+    @Test
+    public void tempDir_file() {
+        NativeLoader.Builder builder = NativeLoader.builder().tempDir(new File("tmp"));
+        assertEquals(builder.tempDir(), Paths.get("tmp"));
+    }
 
-  @Test
-  public void tempDir_path() {
-    NativeLoader.Builder builder = NativeLoader.builder().tempDir(Paths.get("tmp"));
-    assertEquals(builder.tempDir(), Paths.get("tmp"));
-  }
+    @Test
+    public void tempDir_path() {
+        NativeLoader.Builder builder = NativeLoader.builder().tempDir(Paths.get("tmp"));
+        assertEquals(builder.tempDir(), Paths.get("tmp"));
+    }
 }
diff --git a/components/native-loader/src/test/java/datadog/nativeloader/NativeLoaderTest.java b/components/native-loader/src/test/java/datadog/nativeloader/NativeLoaderTest.java
index 0a44b91f912..91b27f3ae07 100644
--- a/components/native-loader/src/test/java/datadog/nativeloader/NativeLoaderTest.java
+++ b/components/native-loader/src/test/java/datadog/nativeloader/NativeLoaderTest.java
@@ -29,577 +29,581 @@
 import org.junit.jupiter.api.Test;
 
 public class NativeLoaderTest {
-  @Test
-  public void preloaded() throws LibraryLoadException {
-    NativeLoader loader = NativeLoader.builder().preloaded("preloaded1", "preloaded2").build();
+    @Test
+    public void preloaded() throws LibraryLoadException {
+        NativeLoader loader =
+                NativeLoader.builder().preloaded("preloaded1", "preloaded2").build();
 
-    assertTrue(loader.isPreloaded("preloaded1"));
-    assertTrue(loader.isPreloaded("preloaded2"));
+        assertTrue(loader.isPreloaded("preloaded1"));
+        assertTrue(loader.isPreloaded("preloaded2"));
 
-    assertFalse(loader.isPreloaded("dne"));
+        assertFalse(loader.isPreloaded("dne"));
 
-    try (LibFile lib = loader.resolveDynamic("preloaded1")) {
-      assertPreloaded(lib);
+        try (LibFile lib = loader.resolveDynamic("preloaded1")) {
+            assertPreloaded(lib);
 
-      // already considered loaded -- so this is a nop
-      lib.load();
-    }
+            // already considered loaded -- so this is a nop
+            lib.load();
+        }
 
-    // already considered loaded -- so this is a nop
-    loader.load("preloaded2");
+        // already considered loaded -- so this is a nop
+        loader.load("preloaded2");
 
-    // not already loaded - so passes through to underlying resolver
-    assertThrows(LibraryLoadException.class, () -> loader.load("dne"));
-  }
+        // not already loaded - so passes through to underlying resolver
+        assertThrows(LibraryLoadException.class, () -> loader.load("dne"));
+    }
 
-  @Test
-  public void preloaded_listenerSupport() throws LibraryLoadException {
-    TestLibraryLoadingListener sharedListener = new TestLibraryLoadingListener();
+    @Test
+    public void preloaded_listenerSupport() throws LibraryLoadException {
+        TestLibraryLoadingListener sharedListener = new TestLibraryLoadingListener();
 
-    NativeLoader loader =
-        NativeLoader.builder()
-            .preloaded("preloaded1", "preloaded2")
-            .addListener(sharedListener)
-            .build();
+        NativeLoader loader = NativeLoader.builder()
+                .preloaded("preloaded1", "preloaded2")
+                .addListener(sharedListener)
+                .build();
 
-    // debatable - but no listener calls just for checking
-    assertTrue(loader.isPreloaded("preloaded1"));
-    assertTrue(loader.isPreloaded("preloaded2"));
+        // debatable - but no listener calls just for checking
+        assertTrue(loader.isPreloaded("preloaded1"));
+        assertTrue(loader.isPreloaded("preloaded2"));
 
-    sharedListener.expectResolvePreloaded("preloaded1");
-    sharedListener.expectLoadPreloaded("preloaded1");
+        sharedListener.expectResolvePreloaded("preloaded1");
+        sharedListener.expectLoadPreloaded("preloaded1");
 
-    TestLibraryLoadingListener scopedListener1 =
-        new TestLibraryLoadingListener()
-            .expectResolvePreloaded("preloaded1")
-            .expectLoadPreloaded("preloaded1");
+        TestLibraryLoadingListener scopedListener1 = new TestLibraryLoadingListener()
+                .expectResolvePreloaded("preloaded1")
+                .expectLoadPreloaded("preloaded1");
 
-    try (LibFile lib = loader.resolveDynamic("preloaded1", scopedListener1)) {
-      lib.load();
-    }
+        try (LibFile lib = loader.resolveDynamic("preloaded1", scopedListener1)) {
+            lib.load();
+        }
 
-    sharedListener.assertDone();
-    scopedListener1.assertDone();
+        sharedListener.assertDone();
+        scopedListener1.assertDone();
 
-    sharedListener.expectResolvePreloaded("preloaded2");
-    sharedListener.expectLoadPreloaded("preloaded2");
+        sharedListener.expectResolvePreloaded("preloaded2");
+        sharedListener.expectLoadPreloaded("preloaded2");
 
-    TestLibraryLoadingListener scopedListener2 =
-        new TestLibraryLoadingListener()
-            .expectResolvePreloaded("preloaded2")
-            .expectLoadPreloaded("preloaded2");
+        TestLibraryLoadingListener scopedListener2 = new TestLibraryLoadingListener()
+                .expectResolvePreloaded("preloaded2")
+                .expectLoadPreloaded("preloaded2");
 
-    // load is just convenience for resolve & load
-    loader.load("preloaded2", scopedListener2);
+        // load is just convenience for resolve & load
+        loader.load("preloaded2", scopedListener2);
 
-    sharedListener.assertDone();
-    scopedListener2.assertDone();
+        sharedListener.assertDone();
+        scopedListener2.assertDone();
 
-    sharedListener.expectResolveDynamicFailure("dne");
+        sharedListener.expectResolveDynamicFailure("dne");
 
-    TestLibraryLoadingListener scopedListener3 =
-        new TestLibraryLoadingListener().expectResolveDynamicFailure("dne");
+        TestLibraryLoadingListener scopedListener3 =
+                new TestLibraryLoadingListener().expectResolveDynamicFailure("dne");
 
-    // not already loaded - so passes through to underlying resolver
-    assertThrows(LibraryLoadException.class, () -> loader.load("dne", scopedListener3));
+        // not already loaded - so passes through to underlying resolver
+        assertThrows(LibraryLoadException.class, () -> loader.load("dne", scopedListener3));
 
-    sharedListener.assertDone();
-    scopedListener3.assertDone();
-  }
+        sharedListener.assertDone();
+        scopedListener3.assertDone();
+    }
 
-  @Test
-  public void unsupportedPlatform() {
-    TestLibraryLoadingListener sharedListener = new TestLibraryLoadingListener();
+    @Test
+    public void unsupportedPlatform() {
+        TestLibraryLoadingListener sharedListener = new TestLibraryLoadingListener();
 
-    PlatformSpec unsupportedOsSpec = TestPlatformSpec.of(UNSUPPORTED_OS, AARCH64);
-    NativeLoader loader =
-        NativeLoader.builder().platformSpec(unsupportedOsSpec).addListener(sharedListener).build();
+        PlatformSpec unsupportedOsSpec = TestPlatformSpec.of(UNSUPPORTED_OS, AARCH64);
+        NativeLoader loader = NativeLoader.builder()
+                .platformSpec(unsupportedOsSpec)
+                .addListener(sharedListener)
+                .build();
 
-    assertFalse(loader.isPlatformSupported());
+        assertFalse(loader.isPlatformSupported());
 
-    sharedListener.expectResolveDynamicFailure("dummy");
+        sharedListener.expectResolveDynamicFailure("dummy");
 
-    // short-circuit fails during resolution because os isn't supported
-    assertThrows(LibraryLoadException.class, () -> loader.resolveDynamic("dummy"));
+        // short-circuit fails during resolution because os isn't supported
+        assertThrows(LibraryLoadException.class, () -> loader.resolveDynamic("dummy"));
 
-    sharedListener.assertDone();
-  }
+        sharedListener.assertDone();
+    }
 
-  @Test
-  public void unsupportArch() {
-    PlatformSpec unsupportedOsSpec = TestPlatformSpec.of(LINUX, UNSUPPORTED_ARCH);
-    NativeLoader loader = NativeLoader.builder().platformSpec(unsupportedOsSpec).build();
+    @Test
+    public void unsupportArch() {
+        PlatformSpec unsupportedOsSpec = TestPlatformSpec.of(LINUX, UNSUPPORTED_ARCH);
+        NativeLoader loader =
+                NativeLoader.builder().platformSpec(unsupportedOsSpec).build();
 
-    assertFalse(loader.isPlatformSupported());
+        assertFalse(loader.isPlatformSupported());
 
-    TestLibraryLoadingListener scopedListener =
-        new TestLibraryLoadingListener().expectResolveDynamicFailure("dummy");
+        TestLibraryLoadingListener scopedListener =
+                new TestLibraryLoadingListener().expectResolveDynamicFailure("dummy");
 
-    // short-circuit fails during resolution because arch isn't supported
-    assertThrows(LibraryLoadException.class, () -> loader.resolveDynamic("dummy", scopedListener));
+        // short-circuit fails during resolution because arch isn't supported
+        assertThrows(LibraryLoadException.class, () -> loader.resolveDynamic("dummy", scopedListener));
 
-    scopedListener.assertDone();
-  }
+        scopedListener.assertDone();
+    }
 
-  @Test
-  public void loadFailure() throws LibraryLoadException {
-    TestLibraryLoadingListener sharedListener = new TestLibraryLoadingListener();
+    @Test
+    public void loadFailure() throws LibraryLoadException {
+        TestLibraryLoadingListener sharedListener = new TestLibraryLoadingListener();
 
-    NativeLoader loader = NativeLoader.builder().addListener(sharedListener).build();
-    assumeTrue(loader.isPlatformSupported());
+        NativeLoader loader = NativeLoader.builder().addListener(sharedListener).build();
+        assumeTrue(loader.isPlatformSupported());
 
-    sharedListener.expectResolveDynamic("dummy");
-    sharedListener.expectLoadFailure("dummy");
+        sharedListener.expectResolveDynamic("dummy");
+        sharedListener.expectLoadFailure("dummy");
 
-    TestLibraryLoadingListener scopedListener =
-        new TestLibraryLoadingListener().expectResolveDynamic("dummy").expectLoadFailure("dummy");
+        TestLibraryLoadingListener scopedListener =
+                new TestLibraryLoadingListener().expectResolveDynamic("dummy").expectLoadFailure("dummy");
 
-    // test libraries are just text files, so they shouldn't load & link properly
-    // NativeLoader is supposed to wrap the loading failures, so that we
-    // remember to handle them
+        // test libraries are just text files, so they shouldn't load & link properly
+        // NativeLoader is supposed to wrap the loading failures, so that we
+        // remember to handle them
 
-    // on supported platforms, there is a dummy library file, so this will resolve but fail to load
-    // & link
-    assertThrows(LibraryLoadException.class, () -> loader.load("dummy", scopedListener));
-  }
+        // on supported platforms, there is a dummy library file, so this will resolve but fail to load
+        // & link
+        assertThrows(LibraryLoadException.class, () -> loader.load("dummy", scopedListener));
+    }
 
-  @Test
-  public void resolutionFailure_in_LibraryResolver() {
-    Exception exception = new Exception("boom!");
+    @Test
+    public void resolutionFailure_in_LibraryResolver() {
+        Exception exception = new Exception("boom!");
 
-    NativeLoader loader =
-        NativeLoader.builder()
-            .libResolver(
-                (pathLocator, platformSpec, component, libName) -> {
-                  throw exception;
+        NativeLoader loader = NativeLoader.builder()
+                .libResolver((pathLocator, platformSpec, component, libName) -> {
+                    throw exception;
                 })
-            .build();
+                .build();
 
-    TestLibraryLoadingListener scopedListener =
-        new TestLibraryLoadingListener().expectResolveDynamicFailure("dummy", exception);
+        TestLibraryLoadingListener scopedListener =
+                new TestLibraryLoadingListener().expectResolveDynamicFailure("dummy", exception);
 
-    assertThrows(LibraryLoadException.class, () -> loader.load("dummy", scopedListener));
+        assertThrows(LibraryLoadException.class, () -> loader.load("dummy", scopedListener));
 
-    scopedListener.assertDone();
-  }
+        scopedListener.assertDone();
+    }
 
-  @Test
-  public void resolutionFailure_in_PathLocator() {
-    TestLibraryLoadingListener sharedListener = new TestLibraryLoadingListener();
+    @Test
+    public void resolutionFailure_in_PathLocator() {
+        TestLibraryLoadingListener sharedListener = new TestLibraryLoadingListener();
 
-    Exception exception = new Exception("boom!");
+        Exception exception = new Exception("boom!");
 
-    NativeLoader loader =
-        NativeLoader.builder()
-            .addListener(sharedListener)
-            .pathLocator(
-                (comp, path) -> {
-                  throw exception;
+        NativeLoader loader = NativeLoader.builder()
+                .addListener(sharedListener)
+                .pathLocator((comp, path) -> {
+                    throw exception;
                 })
-            .build();
+                .build();
 
-    sharedListener.expectResolveDynamicFailure("dummy", exception);
+        sharedListener.expectResolveDynamicFailure("dummy", exception);
 
-    assertThrows(LibraryLoadException.class, () -> loader.load("dummy"));
+        assertThrows(LibraryLoadException.class, () -> loader.load("dummy"));
 
-    sharedListener.assertDone();
-  }
+        sharedListener.assertDone();
+    }
 
-  @Test
-  public void fromDir() throws LibraryLoadException {
-    NativeLoader loader = NativeLoader.builder().fromDir("test-data").build();
+    @Test
+    public void fromDir() throws LibraryLoadException {
+        NativeLoader loader = NativeLoader.builder().fromDir("test-data").build();
 
-    try (LibFile lib = loader.resolveDynamic("dummy")) {
-      // loaded directly from directory, so no clean-up required
-      assertRegularFile(lib);
+        try (LibFile lib = loader.resolveDynamic("dummy")) {
+            // loaded directly from directory, so no clean-up required
+            assertRegularFile(lib);
 
-      // file isn't actually a dynamic library
-      assertThrows(LibraryLoadException.class, () -> lib.load());
+            // file isn't actually a dynamic library
+            assertThrows(LibraryLoadException.class, () -> lib.load());
+        }
     }
-  }
 
-  @Test
-  public void fromDir_override_windows() throws LibraryLoadException {
-    TestLibraryLoadingListener sharedListener = new TestLibraryLoadingListener();
+    @Test
+    public void fromDir_override_windows() throws LibraryLoadException {
+        TestLibraryLoadingListener sharedListener = new TestLibraryLoadingListener();
 
-    NativeLoader loader =
-        NativeLoader.builder().fromDir("test-data").addListener(sharedListener).build();
+        NativeLoader loader = NativeLoader.builder()
+                .fromDir("test-data")
+                .addListener(sharedListener)
+                .build();
 
-    sharedListener.expectResolveDynamic(TestPlatformSpec.windows(), "dummy");
+        sharedListener.expectResolveDynamic(TestPlatformSpec.windows(), "dummy");
+
+        try (LibFile lib = loader.resolveDynamic(TestPlatformSpec.windows(), "dummy")) {
+            // loaded directly from directory, so no clean-up required
+            assertRegularFile(lib);
+            assertTrue(lib.getAbsolutePath().endsWith("dummy.dll"));
+        }
 
-    try (LibFile lib = loader.resolveDynamic(TestPlatformSpec.windows(), "dummy")) {
-      // loaded directly from directory, so no clean-up required
-      assertRegularFile(lib);
-      assertTrue(lib.getAbsolutePath().endsWith("dummy.dll"));
+        sharedListener.assertDone();
     }
 
-    sharedListener.assertDone();
-  }
+    @Test
+    public void fromDir_override_mac() throws LibraryLoadException {
+        NativeLoader loader = NativeLoader.builder().fromDir("test-data").build();
 
-  @Test
-  public void fromDir_override_mac() throws LibraryLoadException {
-    NativeLoader loader = NativeLoader.builder().fromDir("test-data").build();
+        TestLibraryLoadingListener scopedListener =
+                new TestLibraryLoadingListener().expectResolveDynamic(TestPlatformSpec.mac(), "dummy");
 
-    TestLibraryLoadingListener scopedListener =
-        new TestLibraryLoadingListener().expectResolveDynamic(TestPlatformSpec.mac(), "dummy");
+        try (LibFile lib = loader.resolveDynamic(TestPlatformSpec.mac(), "dummy", scopedListener)) {
+            // loaded directly from directory, so no clean-up required
+            assertRegularFile(lib);
+            assertTrue(lib.getAbsolutePath().endsWith("libdummy.dylib"));
+        }
 
-    try (LibFile lib = loader.resolveDynamic(TestPlatformSpec.mac(), "dummy", scopedListener)) {
-      // loaded directly from directory, so no clean-up required
-      assertRegularFile(lib);
-      assertTrue(lib.getAbsolutePath().endsWith("libdummy.dylib"));
+        scopedListener.assertDone();
     }
 
-    scopedListener.assertDone();
-  }
+    @Test
+    public void fromDir_override_linux() throws LibraryLoadException {
+        NativeLoader loader = NativeLoader.builder().fromDir("test-data").build();
 
-  @Test
-  public void fromDir_override_linux() throws LibraryLoadException {
-    NativeLoader loader = NativeLoader.builder().fromDir("test-data").build();
-
-    try (LibFile lib = loader.resolveDynamic(TestPlatformSpec.linux(), "dummy")) {
-      // loaded directly from directory, so no clean-up required
-      assertRegularFile(lib);
-      assertTrue(lib.getAbsolutePath().endsWith("libdummy.so"));
+        try (LibFile lib = loader.resolveDynamic(TestPlatformSpec.linux(), "dummy")) {
+            // loaded directly from directory, so no clean-up required
+            assertRegularFile(lib);
+            assertTrue(lib.getAbsolutePath().endsWith("libdummy.so"));
+        }
     }
-  }
 
-  @Test
-  public void fromDirList() throws LibraryLoadException {
-    NativeLoader loader = NativeLoader.builder().fromDirs("dne1", "dne2", "test-data").build();
+    @Test
+    public void fromDirList() throws LibraryLoadException {
+        NativeLoader loader =
+                NativeLoader.builder().fromDirs("dne1", "dne2", "test-data").build();
 
-    try (LibFile lib = loader.resolveDynamic("dummy")) {
-      // loaded directly from directory, so no clean-up required
-      assertRegularFile(lib);
+        try (LibFile lib = loader.resolveDynamic("dummy")) {
+            // loaded directly from directory, so no clean-up required
+            assertRegularFile(lib);
+        }
     }
-  }
-
-  @Test
-  public void fromDir_with_component() throws LibraryLoadException {
-    TestLibraryLoadingListener sharedListener = new TestLibraryLoadingListener();
 
-    NativeLoader loader =
-        NativeLoader.builder().fromDir("test-data").addListener(sharedListener).build();
+    @Test
+    public void fromDir_with_component() throws LibraryLoadException {
+        TestLibraryLoadingListener sharedListener = new TestLibraryLoadingListener();
 
-    sharedListener.expectResolveDynamic("comp1", "dummy");
+        NativeLoader loader = NativeLoader.builder()
+                .fromDir("test-data")
+                .addListener(sharedListener)
+                .build();
 
-    try (LibFile lib = loader.resolveDynamic("comp1", "dummy")) {
-      assertRegularFile(lib);
-      assertTrue(lib.getAbsolutePath().contains("comp1"));
-    }
+        sharedListener.expectResolveDynamic("comp1", "dummy");
 
-    sharedListener.assertDone();
+        try (LibFile lib = loader.resolveDynamic("comp1", "dummy")) {
+            assertRegularFile(lib);
+            assertTrue(lib.getAbsolutePath().contains("comp1"));
+        }
 
-    sharedListener.expectResolveDynamic("comp2", "dummy");
+        sharedListener.assertDone();
 
-    try (LibFile lib = loader.resolveDynamic("comp2", "dummy")) {
-      assertRegularFile(lib);
-      assertTrue(lib.getAbsolutePath().contains("comp2"));
-    }
+        sharedListener.expectResolveDynamic("comp2", "dummy");
 
-    sharedListener.assertDone();
-  }
+        try (LibFile lib = loader.resolveDynamic("comp2", "dummy")) {
+            assertRegularFile(lib);
+            assertTrue(lib.getAbsolutePath().contains("comp2"));
+        }
 
-  @Test
-  public void fromDir_load_with_component() {
-    NativeLoader loader = NativeLoader.builder().fromDir("test-data").build();
+        sharedListener.assertDone();
+    }
 
-    // lib file is a dummy, so fails during loading and linking
-    assertThrows(LibraryLoadException.class, () -> loader.load("comp1", "dummy"));
+    @Test
+    public void fromDir_load_with_component() {
+        NativeLoader loader = NativeLoader.builder().fromDir("test-data").build();
 
-    TestLibraryLoadingListener scopedListener2 =
-        new TestLibraryLoadingListener()
-            .expectResolveDynamic("comp2", "dummy")
-            .expectLoadFailure("comp2", "dummy");
+        // lib file is a dummy, so fails during loading and linking
+        assertThrows(LibraryLoadException.class, () -> loader.load("comp1", "dummy"));
 
-    assertThrows(LibraryLoadException.class, () -> loader.load("comp2", "dummy", scopedListener2));
+        TestLibraryLoadingListener scopedListener2 = new TestLibraryLoadingListener()
+                .expectResolveDynamic("comp2", "dummy")
+                .expectLoadFailure("comp2", "dummy");
 
-    scopedListener2.assertDone();
-  }
+        assertThrows(LibraryLoadException.class, () -> loader.load("comp2", "dummy", scopedListener2));
 
-  @Test
-  public void fromDirBackedClassLoader() throws IOException, LibraryLoadException {
-    // ClassLoader pulling from a directory, so there's still a normal file
-    URL[] urls = {new File("test-data").toURL()};
+        scopedListener2.assertDone();
+    }
 
-    try (URLClassLoader classLoader = new URLClassLoader(urls)) {
-      NativeLoader loader = NativeLoader.builder().fromClassLoader(classLoader).build();
-      try (LibFile lib = loader.resolveDynamic("dummy")) {
-        // since there's a normal file, no need to copy to a temp file and clean-up
-        assertRegularFile(lib);
-      }
+    @Test
+    public void fromDirBackedClassLoader() throws IOException, LibraryLoadException {
+        // ClassLoader pulling from a directory, so there's still a normal file
+        URL[] urls = {new File("test-data").toURL()};
+
+        try (URLClassLoader classLoader = new URLClassLoader(urls)) {
+            NativeLoader loader =
+                    NativeLoader.builder().fromClassLoader(classLoader).build();
+            try (LibFile lib = loader.resolveDynamic("dummy")) {
+                // since there's a normal file, no need to copy to a temp file and clean-up
+                assertRegularFile(lib);
+            }
+        }
     }
-  }
 
-  @Test
-  public void fromDirBackedClassLoader_with_component() throws IOException, LibraryLoadException {
-    // ClassLoader pulling from a directory, so there's still a normal file
-    URL[] urls = {new File("test-data").toURL()};
+    @Test
+    public void fromDirBackedClassLoader_with_component() throws IOException, LibraryLoadException {
+        // ClassLoader pulling from a directory, so there's still a normal file
+        URL[] urls = {new File("test-data").toURL()};
 
-    try (URLClassLoader classLoader = new URLClassLoader(urls)) {
-      NativeLoader loader = NativeLoader.builder().fromClassLoader(classLoader).build();
+        try (URLClassLoader classLoader = new URLClassLoader(urls)) {
+            NativeLoader loader =
+                    NativeLoader.builder().fromClassLoader(classLoader).build();
 
-      try (LibFile lib = loader.resolveDynamic("comp1", "dummy")) {
-        assertRegularFile(lib);
-        assertTrue(lib.getAbsolutePath().contains("comp1"));
-      }
+            try (LibFile lib = loader.resolveDynamic("comp1", "dummy")) {
+                assertRegularFile(lib);
+                assertTrue(lib.getAbsolutePath().contains("comp1"));
+            }
 
-      try (LibFile lib = loader.resolveDynamic("comp2", "dummy")) {
-        assertRegularFile(lib);
-        assertTrue(lib.getAbsolutePath().contains("comp2"));
-      }
+            try (LibFile lib = loader.resolveDynamic("comp2", "dummy")) {
+                assertRegularFile(lib);
+                assertTrue(lib.getAbsolutePath().contains("comp2"));
+            }
+        }
     }
-  }
 
-  @Test
-  public void fromDirBackedClassLoader_with_subResource() throws IOException, LibraryLoadException {
-    // ClassLoader pulling from a directory, so there's still a normal file
-    URL[] urls = {new File("test-data").toURL()};
-
-    try (URLClassLoader classLoader = new URLClassLoader(urls)) {
-      NativeLoader loader = NativeLoader.builder().fromClassLoader(classLoader, "resource").build();
-      try (LibFile lib = loader.resolveDynamic("dummy")) {
-        // since there's a normal file, no need to copy to a temp file and clean-up
-        assertRegularFile(lib);
-        assertTrue(lib.getAbsolutePath().contains("resource"));
-      }
+    @Test
+    public void fromDirBackedClassLoader_with_subResource() throws IOException, LibraryLoadException {
+        // ClassLoader pulling from a directory, so there's still a normal file
+        URL[] urls = {new File("test-data").toURL()};
+
+        try (URLClassLoader classLoader = new URLClassLoader(urls)) {
+            NativeLoader loader = NativeLoader.builder()
+                    .fromClassLoader(classLoader, "resource")
+                    .build();
+            try (LibFile lib = loader.resolveDynamic("dummy")) {
+                // since there's a normal file, no need to copy to a temp file and clean-up
+                assertRegularFile(lib);
+                assertTrue(lib.getAbsolutePath().contains("resource"));
+            }
+        }
     }
-  }
 
-  @Test
-  public void fromDirBackedClassLoader_with_subResource_and_comp()
-      throws IOException, LibraryLoadException {
-    // ClassLoader pulling from a directory, so there's still a normal file
-    try (URLClassLoader classLoader = createClassLoader(Paths.get("test-data"))) {
-      NativeLoader loader = NativeLoader.builder().fromClassLoader(classLoader, "resource").build();
-      try (LibFile lib = loader.resolveDynamic("comp1", "dummy")) {
-        // since there's a normal file, no need to copy to a temp file and clean-up
-        assertRegularFile(lib);
-        assertTrue(lib.getAbsolutePath().contains("comp1"));
-        assertTrue(lib.getAbsolutePath().contains("resource"));
-      }
+    @Test
+    public void fromDirBackedClassLoader_with_subResource_and_comp() throws IOException, LibraryLoadException {
+        // ClassLoader pulling from a directory, so there's still a normal file
+        try (URLClassLoader classLoader = createClassLoader(Paths.get("test-data"))) {
+            NativeLoader loader = NativeLoader.builder()
+                    .fromClassLoader(classLoader, "resource")
+                    .build();
+            try (LibFile lib = loader.resolveDynamic("comp1", "dummy")) {
+                // since there's a normal file, no need to copy to a temp file and clean-up
+                assertRegularFile(lib);
+                assertTrue(lib.getAbsolutePath().contains("comp1"));
+                assertTrue(lib.getAbsolutePath().contains("resource"));
+            }
+        }
     }
-  }
 
-  @Test
-  public void fromJarBackedClassLoader() throws IOException, LibraryLoadException {
-    Path jar = jar("test-data");
-    try {
-      try (URLClassLoader classLoader = createClassLoader(jar)) {
-        NativeLoader loader = NativeLoader.builder().fromClassLoader(classLoader).build();
+    @Test
+    public void fromJarBackedClassLoader() throws IOException, LibraryLoadException {
+        Path jar = jar("test-data");
+        try {
+            try (URLClassLoader classLoader = createClassLoader(jar)) {
+                NativeLoader loader =
+                        NativeLoader.builder().fromClassLoader(classLoader).build();
+
+                TestLibraryLoadingListener scopedListener = new TestLibraryLoadingListener()
+                        .expectResolveDynamic("dummy")
+                        .expectTempFileCreated("dummy")
+                        .expectTempFileCleanup("dummy");
+
+                try (LibFile lib = loader.resolveDynamic("dummy", scopedListener)) {
+                    // loaded from a jar, so copied to temp file
+                    assertTempFile(lib);
+                }
 
-        TestLibraryLoadingListener scopedListener =
-            new TestLibraryLoadingListener()
-                .expectResolveDynamic("dummy")
-                .expectTempFileCreated("dummy")
-                .expectTempFileCleanup("dummy");
-
-        try (LibFile lib = loader.resolveDynamic("dummy", scopedListener)) {
-          // loaded from a jar, so copied to temp file
-          assertTempFile(lib);
+                scopedListener.assertDone();
+            }
+        } finally {
+            deleteHelper(jar);
         }
-
-        scopedListener.assertDone();
-      }
-    } finally {
-      deleteHelper(jar);
     }
-  }
 
-  @Test
-  public void fromJarBackedClassLoader_load_with_component()
-      throws IOException, LibraryLoadException {
-    Path jar = jar("test-data");
-    try {
-      try (URLClassLoader classLoader = createClassLoader(jar)) {
-        NativeLoader loader = NativeLoader.builder().fromClassLoader(classLoader).build();
+    @Test
+    public void fromJarBackedClassLoader_load_with_component() throws IOException, LibraryLoadException {
+        Path jar = jar("test-data");
+        try {
+            try (URLClassLoader classLoader = createClassLoader(jar)) {
+                NativeLoader loader =
+                        NativeLoader.builder().fromClassLoader(classLoader).build();
+
+                // lib file is a dummy, so fails during loading and linking
+                assertThrows(LibraryLoadException.class, () -> loader.load("comp1", "dummy"));
+
+                TestLibraryLoadingListener scopedListener2 = new TestLibraryLoadingListener()
+                        .expectResolveDynamic("comp2", "dummy")
+                        .expectTempFileCreated("comp2", "dummy")
+                        .expectLoadFailure("comp2", "dummy")
+                        .expectTempFileCleanup("comp2", "dummy");
+
+                assertThrows(LibraryLoadException.class, () -> loader.load("comp2", "dummy", scopedListener2));
+
+                scopedListener2.assertDone();
+            }
+        } finally {
+            deleteHelper(jar);
+        }
+    }
 
-        // lib file is a dummy, so fails during loading and linking
-        assertThrows(LibraryLoadException.class, () -> loader.load("comp1", "dummy"));
+    @Test
+    public void fromJarBackedClassLoader_with_tempDir() throws IOException, LibraryLoadException {
+        Path jar = jar("test-data");
+        try {
+            Path tempDir = Paths.get("temp");
+            deleteHelper(tempDir);
+
+            try (URLClassLoader classLoader = createClassLoader(jar)) {
+                NativeLoader loader = NativeLoader.builder()
+                        .fromClassLoader(classLoader)
+                        .tempDir(tempDir)
+                        .build();
+                try (LibFile lib = loader.resolveDynamic("dummy")) {
+                    // loaded from a jar, so copied to temp file
+                    assertTempFile(lib);
+                }
+            } finally {
+                deleteHelper(tempDir);
+            }
+        } finally {
+            deleteHelper(jar);
+        }
+    }
 
-        TestLibraryLoadingListener scopedListener2 =
-            new TestLibraryLoadingListener()
-                .expectResolveDynamic("comp2", "dummy")
-                .expectTempFileCreated("comp2", "dummy")
-                .expectLoadFailure("comp2", "dummy")
-                .expectTempFileCleanup("comp2", "dummy");
+    @Test
+    public void fromJarBackedClassLoader_with_unwritable_tempDir() throws IOException, LibraryLoadException {
+        Path jar = jar("test-data");
+        try {
+            Path noWriteDir = Paths.get("no-write-temp");
+            deleteHelper(noWriteDir);
+            Files.createDirectories(noWriteDir, posixAttr("r-x------"));
+
+            try (URLClassLoader classLoader = createClassLoader(jar)) {
+                NativeLoader loader = NativeLoader.builder()
+                        .fromClassLoader(classLoader)
+                        .tempDir(noWriteDir)
+                        .build();
+
+                TestLibraryLoadingListener scopedListener = new TestLibraryLoadingListener()
+                        .expectResolveDynamic("dummy")
+                        .expectTempFileCreationFailure("dummy");
+
+                // unable to resolve to a File because tempDir isn't writable
+                assertThrows(LibraryLoadException.class, () -> loader.resolveDynamic("dummy", scopedListener));
+
+                scopedListener.assertDone();
+            } finally {
+                deleteHelper(noWriteDir);
+            }
+        } finally {
+            deleteHelper(jar);
+        }
+    }
 
-        assertThrows(
-            LibraryLoadException.class, () -> loader.load("comp2", "dummy", scopedListener2));
+    @Test
+    public void fromJarBackedClassLoader_with_locked_file() throws IOException, LibraryLoadException {
+        Path jar = jar("test-data");
+        try {
+            Path tempDir = Paths.get("temp");
+            deleteHelper(tempDir);
+
+            try (URLClassLoader classLoader = createClassLoader(jar)) {
+                NativeLoader loader = NativeLoader.builder()
+                        .fromClassLoader(classLoader)
+                        .tempDir(tempDir)
+                        .build();
+                try (LibFile lib = loader.resolveDynamic("dummy")) {
+                    // loaded from a jar, so copied to temp file
+                    assertTempFile(lib);
+
+                    // simulating lock - by blocking ability to delete from parent dir
+                    // forces fallback to deleteOnExit
+                    Files.setPosixFilePermissions(lib.toPath().getParent(), posixPerms("r-x------"));
+                }
+            } finally {
+                deleteHelper(tempDir);
+            }
+        } finally {
+            deleteHelper(jar);
+        }
+    }
 
-        scopedListener2.assertDone();
-      }
-    } finally {
-      deleteHelper(jar);
+    void deleteHelper(Path dir) {
+        try {
+            Files.setPosixFilePermissions(dir, posixPerms("rwx------"));
+            Files.delete(dir);
+        } catch (IOException e) {
+        }
     }
-  }
 
-  @Test
-  public void fromJarBackedClassLoader_with_tempDir() throws IOException, LibraryLoadException {
-    Path jar = jar("test-data");
-    try {
-      Path tempDir = Paths.get("temp");
-      deleteHelper(tempDir);
+    static URLClassLoader createClassLoader(Path... paths) {
+        return new URLClassLoader(urls(paths));
+    }
 
-      try (URLClassLoader classLoader = createClassLoader(jar)) {
-        NativeLoader loader =
-            NativeLoader.builder().fromClassLoader(classLoader).tempDir(tempDir).build();
-        try (LibFile lib = loader.resolveDynamic("dummy")) {
-          // loaded from a jar, so copied to temp file
-          assertTempFile(lib);
+    static URL[] urls(Path... paths) {
+        URL[] urls = new URL[paths.length];
+        for (int i = 0; i < urls.length; ++i) {
+            try {
+                urls[i] = paths[i].toUri().toURL();
+            } catch (MalformedURLException e) {
+                throw new IllegalStateException(e);
+            }
         }
-      } finally {
-        deleteHelper(tempDir);
-      }
-    } finally {
-      deleteHelper(jar);
-    }
-  }
-
-  @Test
-  public void fromJarBackedClassLoader_with_unwritable_tempDir()
-      throws IOException, LibraryLoadException {
-    Path jar = jar("test-data");
-    try {
-      Path noWriteDir = Paths.get("no-write-temp");
-      deleteHelper(noWriteDir);
-      Files.createDirectories(noWriteDir, posixAttr("r-x------"));
-
-      try (URLClassLoader classLoader = createClassLoader(jar)) {
-        NativeLoader loader =
-            NativeLoader.builder().fromClassLoader(classLoader).tempDir(noWriteDir).build();
+        return urls;
+    }
 
-        TestLibraryLoadingListener scopedListener =
-            new TestLibraryLoadingListener()
-                .expectResolveDynamic("dummy")
-                .expectTempFileCreationFailure("dummy");
+    static Path jar(String dirName) {
+        return jar(Paths.get(dirName));
+    }
 
-        // unable to resolve to a File because tempDir isn't writable
-        assertThrows(
-            LibraryLoadException.class, () -> loader.resolveDynamic("dummy", scopedListener));
+    static Path jar(Path dir) {
+        try {
+            return jarHelper(dir);
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+    }
 
-        scopedListener.assertDone();
-      } finally {
-        deleteHelper(noWriteDir);
-      }
-    } finally {
-      deleteHelper(jar);
-    }
-  }
-
-  @Test
-  public void fromJarBackedClassLoader_with_locked_file() throws IOException, LibraryLoadException {
-    Path jar = jar("test-data");
-    try {
-      Path tempDir = Paths.get("temp");
-      deleteHelper(tempDir);
-
-      try (URLClassLoader classLoader = createClassLoader(jar)) {
-        NativeLoader loader =
-            NativeLoader.builder().fromClassLoader(classLoader).tempDir(tempDir).build();
-        try (LibFile lib = loader.resolveDynamic("dummy")) {
-          // loaded from a jar, so copied to temp file
-          assertTempFile(lib);
+    static Path jarHelper(Path dir) throws IOException {
+        Path jarPath = Files.createTempFile(dir.toFile().getName(), ".jar", posixAttr("rwx------"));
 
-          // simulating lock - by blocking ability to delete from parent dir
-          // forces fallback to deleteOnExit
-          Files.setPosixFilePermissions(lib.toPath().getParent(), posixPerms("r-x------"));
-        }
-      } finally {
-        deleteHelper(tempDir);
-      }
-    } finally {
-      deleteHelper(jar);
-    }
-  }
-
-  void deleteHelper(Path dir) {
-    try {
-      Files.setPosixFilePermissions(dir, posixPerms("rwx------"));
-      Files.delete(dir);
-    } catch (IOException e) {
-    }
-  }
-
-  static URLClassLoader createClassLoader(Path... paths) {
-    return new URLClassLoader(urls(paths));
-  }
-
-  static URL[] urls(Path... paths) {
-    URL[] urls = new URL[paths.length];
-    for (int i = 0; i < urls.length; ++i) {
-      try {
-        urls[i] = paths[i].toUri().toURL();
-      } catch (MalformedURLException e) {
-        throw new IllegalStateException(e);
-      }
-    }
-    return urls;
-  }
-
-  static Path jar(String dirName) {
-    return jar(Paths.get(dirName));
-  }
-
-  static Path jar(Path dir) {
-    try {
-      return jarHelper(dir);
-    } catch (IOException e) {
-      throw new IllegalStateException(e);
-    }
-  }
-
-  static Path jarHelper(Path dir) throws IOException {
-    Path jarPath = Files.createTempFile(dir.toFile().getName(), ".jar", posixAttr("rwx------"));
-
-    try (JarOutputStream jarStream = new JarOutputStream(Files.newOutputStream(jarPath))) {
-      Files.walk(dir)
-          .filter(path -> !Files.isDirectory(path))
-          .forEach(
-              path -> {
+        try (JarOutputStream jarStream = new JarOutputStream(Files.newOutputStream(jarPath))) {
+            Files.walk(dir).filter(path -> !Files.isDirectory(path)).forEach(path -> {
                 try {
-                  JarEntry jarEntry = new JarEntry(dir.relativize(path).toString());
-                  jarStream.putNextEntry(jarEntry);
-                  Files.copy(path, jarStream);
-                  jarStream.closeEntry();
+                    JarEntry jarEntry = new JarEntry(dir.relativize(path).toString());
+                    jarStream.putNextEntry(jarEntry);
+                    Files.copy(path, jarStream);
+                    jarStream.closeEntry();
                 } catch (IOException e) {
-                  throw new UncheckedIOException(e);
+                    throw new UncheckedIOException(e);
                 }
-              });
-    }
-    return jarPath;
-  }
-
-  static FileAttribute<Set<PosixFilePermission>> posixAttr(String posixStr) {
-    return PosixFilePermissions.asFileAttribute(posixPerms(posixStr));
-  }
-
-  static Set<PosixFilePermission> posixPerms(String posixStr) {
-    return PosixFilePermissions.fromString(posixStr);
-  }
-
-  static void assertPreloaded(LibFile lib) {
-    assertTrue(lib.isPreloaded());
-    assertNull(lib.toFile());
-    assertNull(lib.toPath());
-    assertNull(lib.getAbsolutePath());
-    assertFalse(lib.needsCleanup);
-  }
-
-  static void assertRegularFile(LibFile lib) {
-    assertFalse(lib.isPreloaded());
-    assertNotNull(lib.toFile());
-    assertNotNull(lib.toPath());
-    assertTrue(lib.toFile().exists());
-    assertNotNull(lib.getAbsolutePath());
-    assertFalse(lib.needsCleanup);
-  }
-
-  static void assertTempFile(LibFile lib) {
-    assertFalse(lib.isPreloaded());
-    assertNotNull(lib.toFile());
-    assertNotNull(lib.toPath());
-    assertTrue(lib.toFile().exists());
-    assertNotNull(lib.getAbsolutePath());
-    assertTrue(lib.needsCleanup);
-  }
+            });
+        }
+        return jarPath;
+    }
+
+    static FileAttribute<Set<PosixFilePermission>> posixAttr(String posixStr) {
+        return PosixFilePermissions.asFileAttribute(posixPerms(posixStr));
+    }
+
+    static Set<PosixFilePermission> posixPerms(String posixStr) {
+        return PosixFilePermissions.fromString(posixStr);
+    }
+
+    static void assertPreloaded(LibFile lib) {
+        assertTrue(lib.isPreloaded());
+        assertNull(lib.toFile());
+        assertNull(lib.toPath());
+        assertNull(lib.getAbsolutePath());
+        assertFalse(lib.needsCleanup);
+    }
+
+    static void assertRegularFile(LibFile lib) {
+        assertFalse(lib.isPreloaded());
+        assertNotNull(lib.toFile());
+        assertNotNull(lib.toPath());
+        assertTrue(lib.toFile().exists());
+        assertNotNull(lib.getAbsolutePath());
+        assertFalse(lib.needsCleanup);
+    }
+
+    static void assertTempFile(LibFile lib) {
+        assertFalse(lib.isPreloaded());
+        assertNotNull(lib.toFile());
+        assertNotNull(lib.toPath());
+        assertTrue(lib.toFile().exists());
+        assertNotNull(lib.getAbsolutePath());
+        assertTrue(lib.needsCleanup);
+    }
 }
diff --git a/components/native-loader/src/test/java/datadog/nativeloader/NestedDirLibraryResolverTest.java b/components/native-loader/src/test/java/datadog/nativeloader/NestedDirLibraryResolverTest.java
index a85e68a269a..cbb4b0ae7ee 100644
--- a/components/native-loader/src/test/java/datadog/nativeloader/NestedDirLibraryResolverTest.java
+++ b/components/native-loader/src/test/java/datadog/nativeloader/NestedDirLibraryResolverTest.java
@@ -11,54 +11,46 @@
 import org.junit.jupiter.api.Test;
 
 public class NestedDirLibraryResolverTest {
-  @Test
-  public void linux_x86_64_libc() {
-    test(
-        TestPlatformSpec.of(LINUX, X86_64, GLIBC),
-        "linux/x86_64/libc/libtest.so",
-        "linux/x86_64/libtest.so",
-        "linux/libtest.so",
-        "libtest.so");
-  }
-
-  @Test
-  public void linux_x86_64_musl() {
-    test(
-        TestPlatformSpec.of(LINUX, X86_64, MUSL),
-        "linux/x86_64/musl/libtest.so",
-        "linux/x86_64/libtest.so",
-        "linux/libtest.so",
-        "libtest.so");
-  }
-
-  @Test
-  public void osx_x86_64() {
-    test(
-        TestPlatformSpec.of(MAC, X86_64),
-        "macos/x86_64/libtest.dylib",
-        "macos/libtest.dylib",
-        "libtest.dylib");
-  }
-
-  @Test
-  public void osx_aarch() {
-    test(
-        TestPlatformSpec.of(MAC, AARCH64),
-        "macos/aarch64/libtest.dylib",
-        "macos/libtest.dylib",
-        "libtest.dylib");
-  }
-
-  @Test
-  public void windows_x86_64() {
-    test(TestPlatformSpec.of(WINDOWS, X86_64), "win/x86_64/test.dll", "win/test.dll", "test.dll");
-  }
-
-  static final void test(PlatformSpec platformSpec, String... expectedPaths) {
-    CapturingPathLocator.testFailOnExceptions(
-        NestedDirLibraryResolver.INSTANCE,
-        platformSpec,
-        CapturingPathLocator.WITH_OMIT_COMP_FALLBACK,
-        expectedPaths);
-  }
+    @Test
+    public void linux_x86_64_libc() {
+        test(
+                TestPlatformSpec.of(LINUX, X86_64, GLIBC),
+                "linux/x86_64/libc/libtest.so",
+                "linux/x86_64/libtest.so",
+                "linux/libtest.so",
+                "libtest.so");
+    }
+
+    @Test
+    public void linux_x86_64_musl() {
+        test(
+                TestPlatformSpec.of(LINUX, X86_64, MUSL),
+                "linux/x86_64/musl/libtest.so",
+                "linux/x86_64/libtest.so",
+                "linux/libtest.so",
+                "libtest.so");
+    }
+
+    @Test
+    public void osx_x86_64() {
+        test(TestPlatformSpec.of(MAC, X86_64), "macos/x86_64/libtest.dylib", "macos/libtest.dylib", "libtest.dylib");
+    }
+
+    @Test
+    public void osx_aarch() {
+        test(TestPlatformSpec.of(MAC, AARCH64), "macos/aarch64/libtest.dylib", "macos/libtest.dylib", "libtest.dylib");
+    }
+
+    @Test
+    public void windows_x86_64() {
+        test(TestPlatformSpec.of(WINDOWS, X86_64), "win/x86_64/test.dll", "win/test.dll", "test.dll");
+    }
+
+    static final void test(PlatformSpec platformSpec, String... expectedPaths) {
+        CapturingPathLocator.testFailOnExceptions(
+                NestedDirLibraryResolver.INSTANCE,
+                platformSpec,
+                CapturingPathLocator.WITH_OMIT_COMP_FALLBACK,
+                expectedPaths);
+    }
 }
diff --git a/components/native-loader/src/test/java/datadog/nativeloader/PathLocationHelperTest.java b/components/native-loader/src/test/java/datadog/nativeloader/PathLocationHelperTest.java
index dae51056efd..ce4dbfaaef7 100644
--- a/components/native-loader/src/test/java/datadog/nativeloader/PathLocationHelperTest.java
+++ b/components/native-loader/src/test/java/datadog/nativeloader/PathLocationHelperTest.java
@@ -9,97 +9,94 @@
 import org.junit.jupiter.api.Test;
 
 public final class PathLocationHelperTest {
-  @Test
-  public void happyPath() throws MalformedURLException {
-    URL expected = new URL("http://localhost");
-
-    PathLocator pathLocator = (comp, path) -> expected;
-    PathLocatorHelper helper = new PathLocatorHelper("test", pathLocator);
-
-    URL result = helper.locate(null, "path");
-    assertSame(expected, result);
-  }
-
-  @Test
-  public void throwingException() {
-    Exception expectedCause = new IllegalStateException("wrong!");
-    PathLocator throwingPathLocator =
-        (comp, path) -> {
-          throw expectedCause;
+    @Test
+    public void happyPath() throws MalformedURLException {
+        URL expected = new URL("http://localhost");
+
+        PathLocator pathLocator = (comp, path) -> expected;
+        PathLocatorHelper helper = new PathLocatorHelper("test", pathLocator);
+
+        URL result = helper.locate(null, "path");
+        assertSame(expected, result);
+    }
+
+    @Test
+    public void throwingException() {
+        Exception expectedCause = new IllegalStateException("wrong!");
+        PathLocator throwingPathLocator = (comp, path) -> {
+            throw expectedCause;
         };
 
-    PathLocatorHelper helper = new PathLocatorHelper("test", throwingPathLocator);
+        PathLocatorHelper helper = new PathLocatorHelper("test", throwingPathLocator);
 
-    // on exception, PathLocator returns null, but stores the exception for use when tryThrow is
-    // called later
-    URL result = helper.locate(null, "path");
-    assertNull(result);
+        // on exception, PathLocator returns null, but stores the exception for use when tryThrow is
+        // called later
+        URL result = helper.locate(null, "path");
+        assertNull(result);
 
-    try {
-      // should throw, since an exception occurred earlier
-      helper.tryThrow();
+        try {
+            // should throw, since an exception occurred earlier
+            helper.tryThrow();
 
-      fail("should raise a LibraryLoadException");
-    } catch (LibraryLoadException e) {
-      assertSame(expectedCause, e.getCause());
+            fail("should raise a LibraryLoadException");
+        } catch (LibraryLoadException e) {
+            assertSame(expectedCause, e.getCause());
+        }
     }
-  }
-
-  @Test
-  public void throwingLibraryLoadException() {
-    Exception expectedCause = new LibraryLoadException("test", "wrong!");
-    PathLocator throwingPathLocator =
-        (comp, path) -> {
-          throw expectedCause;
+
+    @Test
+    public void throwingLibraryLoadException() {
+        Exception expectedCause = new LibraryLoadException("test", "wrong!");
+        PathLocator throwingPathLocator = (comp, path) -> {
+            throw expectedCause;
         };
 
-    PathLocatorHelper helper = new PathLocatorHelper("test", throwingPathLocator);
+        PathLocatorHelper helper = new PathLocatorHelper("test", throwingPathLocator);
 
-    // on exception, PathLocator returns null, but stores the exception for use when tryThrow is
-    // called later
-    URL result = helper.locate(null, "path");
-    assertNull(result);
+        // on exception, PathLocator returns null, but stores the exception for use when tryThrow is
+        // called later
+        URL result = helper.locate(null, "path");
+        assertNull(result);
 
-    try {
-      // should throw, since an exception occurred earlier
-      helper.tryThrow();
+        try {
+            // should throw, since an exception occurred earlier
+            helper.tryThrow();
 
-      fail("should raise a LibraryLoadException");
-    } catch (LibraryLoadException e) {
-      assertSame(expectedCause, e);
+            fail("should raise a LibraryLoadException");
+        } catch (LibraryLoadException e) {
+            assertSame(expectedCause, e);
+        }
     }
-  }
-
-  @Test
-  public void throwingMultipleExceptions() {
-    Exception firstCause = new IllegalStateException("wrong!");
-    Exception secondCause = new IllegalStateException("wrong again!");
-
-    PathLocator throwingPathLocator =
-        (comp, path) -> {
-          if (path.equals("firstPath")) {
-            throw firstCause;
-          } else {
-            throw secondCause;
-          }
+
+    @Test
+    public void throwingMultipleExceptions() {
+        Exception firstCause = new IllegalStateException("wrong!");
+        Exception secondCause = new IllegalStateException("wrong again!");
+
+        PathLocator throwingPathLocator = (comp, path) -> {
+            if (path.equals("firstPath")) {
+                throw firstCause;
+            } else {
+                throw secondCause;
+            }
         };
 
-    // on exception, PathLocator returns null, but stores the first exception
-    PathLocatorHelper helper = new PathLocatorHelper("test", throwingPathLocator);
-    URL firstResult = helper.locate(null, "firstPath");
-    assertNull(firstResult);
+        // on exception, PathLocator returns null, but stores the first exception
+        PathLocatorHelper helper = new PathLocatorHelper("test", throwingPathLocator);
+        URL firstResult = helper.locate(null, "firstPath");
+        assertNull(firstResult);
 
-    // still retgurns null, but doesn't store exception
-    URL secondResult = helper.locate(null, "secondPath");
-    assertNull(secondResult);
+        // still retgurns null, but doesn't store exception
+        URL secondResult = helper.locate(null, "secondPath");
+        assertNull(secondResult);
 
-    try {
-      helper.tryThrow();
+        try {
+            helper.tryThrow();
 
-      fail("should raise a LibraryLoadException");
-    } catch (LibraryLoadException e) {
-      // expect just the first cause to be captured
-      assertSame(firstCause, e.getCause());
+            fail("should raise a LibraryLoadException");
+        } catch (LibraryLoadException e) {
+            // expect just the first cause to be captured
+            assertSame(firstCause, e.getCause());
+        }
     }
-  }
 }
diff --git a/components/native-loader/src/test/java/datadog/nativeloader/PathLocatorsTest.java b/components/native-loader/src/test/java/datadog/nativeloader/PathLocatorsTest.java
index 84fb1134a70..6bbc321cb5e 100644
--- a/components/native-loader/src/test/java/datadog/nativeloader/PathLocatorsTest.java
+++ b/components/native-loader/src/test/java/datadog/nativeloader/PathLocatorsTest.java
@@ -16,97 +16,97 @@
  * Although equals is used in other tests & usual contract obliges defining hashCode, too
  */
 public class PathLocatorsTest {
-  @Test
-  public void dirBased_equals() {
-    PathLocator dirLocator1 = PathLocators.fromLibDirs("foo");
-    PathLocator dirLocator2 = PathLocators.fromLibDirs(new File("foo"));
-    PathLocator dirLocator3 = PathLocators.fromLibDirs(Paths.get("foo"));
+    @Test
+    public void dirBased_equals() {
+        PathLocator dirLocator1 = PathLocators.fromLibDirs("foo");
+        PathLocator dirLocator2 = PathLocators.fromLibDirs(new File("foo"));
+        PathLocator dirLocator3 = PathLocators.fromLibDirs(Paths.get("foo"));
 
-    assertEqualsAndHashCode(dirLocator1, dirLocator2);
-    assertEqualsAndHashCode(dirLocator1, dirLocator3);
-  }
+        assertEqualsAndHashCode(dirLocator1, dirLocator2);
+        assertEqualsAndHashCode(dirLocator1, dirLocator3);
+    }
 
-  @Test
-  public void dirBased_notEquals() {
-    PathLocator dirLocator1 = PathLocators.fromLibDirs("foo1");
-    PathLocator dirLocator2 = PathLocators.fromLibDirs(new File("foo2"));
-    PathLocator dirLocator3 = PathLocators.fromLibDirs(Paths.get("foo3"));
+    @Test
+    public void dirBased_notEquals() {
+        PathLocator dirLocator1 = PathLocators.fromLibDirs("foo1");
+        PathLocator dirLocator2 = PathLocators.fromLibDirs(new File("foo2"));
+        PathLocator dirLocator3 = PathLocators.fromLibDirs(Paths.get("foo3"));
 
-    assertNotEquals(dirLocator1, dirLocator2);
-    assertNotEquals(dirLocator1, dirLocator3);
-  }
+        assertNotEquals(dirLocator1, dirLocator2);
+        assertNotEquals(dirLocator1, dirLocator3);
+    }
 
-  @Test
-  public void dirBased_diffType_notEquals() {
-    PathLocator dirLocator = PathLocators.fromLibDirs("foo1");
-    PathLocator otherLocator = (comp, path) -> null;
+    @Test
+    public void dirBased_diffType_notEquals() {
+        PathLocator dirLocator = PathLocators.fromLibDirs("foo1");
+        PathLocator otherLocator = (comp, path) -> null;
 
-    // be explicit about which equals is being used
-    assertFalse(dirLocator.equals(otherLocator));
-  }
+        // be explicit about which equals is being used
+        assertFalse(dirLocator.equals(otherLocator));
+    }
 
-  @Test
-  public void libPath() {
-    PathLocator dirLocator1 = PathLocators.fromLibPathString("foo:bar:baz");
-    PathLocator dirLocator2 = PathLocators.fromLibDirs("foo", "bar", "baz");
+    @Test
+    public void libPath() {
+        PathLocator dirLocator1 = PathLocators.fromLibPathString("foo:bar:baz");
+        PathLocator dirLocator2 = PathLocators.fromLibDirs("foo", "bar", "baz");
 
-    assertEqualsAndHashCode(dirLocator1, dirLocator2);
-  }
+        assertEqualsAndHashCode(dirLocator1, dirLocator2);
+    }
 
-  @Test
-  public void classLoaderBased_equals() {
-    ClassLoader loader = ClassLoader.getSystemClassLoader();
+    @Test
+    public void classLoaderBased_equals() {
+        ClassLoader loader = ClassLoader.getSystemClassLoader();
 
-    PathLocator locator1 = PathLocators.fromClassLoader(loader);
-    PathLocator locator2 = PathLocators.fromClassLoader(loader);
+        PathLocator locator1 = PathLocators.fromClassLoader(loader);
+        PathLocator locator2 = PathLocators.fromClassLoader(loader);
 
-    assertEqualsAndHashCode(locator1, locator2);
-  }
+        assertEqualsAndHashCode(locator1, locator2);
+    }
 
-  @Test
-  public void classLoaderBased_with_resource_equals() {
-    ClassLoader loader = ClassLoader.getSystemClassLoader();
+    @Test
+    public void classLoaderBased_with_resource_equals() {
+        ClassLoader loader = ClassLoader.getSystemClassLoader();
 
-    PathLocator locator1 = PathLocators.fromClassLoader(loader, "resource");
-    PathLocator locator2 = PathLocators.fromClassLoader(loader, "resource");
+        PathLocator locator1 = PathLocators.fromClassLoader(loader, "resource");
+        PathLocator locator2 = PathLocators.fromClassLoader(loader, "resource");
 
-    assertEqualsAndHashCode(locator1, locator2);
-  }
+        assertEqualsAndHashCode(locator1, locator2);
+    }
 
-  @Test
-  public void classLoaderBased_notEequals_loader() {
-    ClassLoader loader1 = ClassLoader.getSystemClassLoader();
-    ClassLoader loader2 = new URLClassLoader(new URL[0]);
+    @Test
+    public void classLoaderBased_notEequals_loader() {
+        ClassLoader loader1 = ClassLoader.getSystemClassLoader();
+        ClassLoader loader2 = new URLClassLoader(new URL[0]);
 
-    PathLocator locator1 = PathLocators.fromClassLoader(loader1);
-    PathLocator locator2 = PathLocators.fromClassLoader(loader2);
+        PathLocator locator1 = PathLocators.fromClassLoader(loader1);
+        PathLocator locator2 = PathLocators.fromClassLoader(loader2);
 
-    assertNotEquals(locator1, locator2);
-  }
+        assertNotEquals(locator1, locator2);
+    }
 
-  @Test
-  public void classLoaderBased_notEequals_resource() {
-    ClassLoader loader = ClassLoader.getSystemClassLoader();
+    @Test
+    public void classLoaderBased_notEequals_resource() {
+        ClassLoader loader = ClassLoader.getSystemClassLoader();
 
-    PathLocator locator1 = PathLocators.fromClassLoader(loader, "resource1");
-    PathLocator locator2 = PathLocators.fromClassLoader(loader, "resource2");
+        PathLocator locator1 = PathLocators.fromClassLoader(loader, "resource1");
+        PathLocator locator2 = PathLocators.fromClassLoader(loader, "resource2");
 
-    assertNotEquals(locator1, locator2);
-  }
+        assertNotEquals(locator1, locator2);
+    }
 
-  @Test
-  public void classLoaderBased_diffType_notEequals() {
-    ClassLoader loader = ClassLoader.getSystemClassLoader();
+    @Test
+    public void classLoaderBased_diffType_notEequals() {
+        ClassLoader loader = ClassLoader.getSystemClassLoader();
 
-    PathLocator locator1 = PathLocators.fromClassLoader(loader, "resource1");
-    PathLocator locator2 = (comp, path) -> null;
+        PathLocator locator1 = PathLocators.fromClassLoader(loader, "resource1");
+        PathLocator locator2 = (comp, path) -> null;
 
-    // be explicit about which equals is being used
-    assertFalse(locator1.equals(locator2));
-  }
+        // be explicit about which equals is being used
+        assertFalse(locator1.equals(locator2));
+    }
 
-  static final void assertEqualsAndHashCode(Object lhs, Object rhs) {
-    assertEquals(lhs.hashCode(), rhs.hashCode());
-    assertTrue(lhs.equals(rhs));
-  }
+    static final void assertEqualsAndHashCode(Object lhs, Object rhs) {
+        assertEquals(lhs.hashCode(), rhs.hashCode());
+        assertTrue(lhs.equals(rhs));
+    }
 }
diff --git a/components/native-loader/src/test/java/datadog/nativeloader/PathUtilsTest.java b/components/native-loader/src/test/java/datadog/nativeloader/PathUtilsTest.java
index f2432eaabdb..a110b24b191 100644
--- a/components/native-loader/src/test/java/datadog/nativeloader/PathUtilsTest.java
+++ b/components/native-loader/src/test/java/datadog/nativeloader/PathUtilsTest.java
@@ -18,149 +18,148 @@
 import org.junit.jupiter.api.Test;
 
 public class PathUtilsTest {
-  @Test
-  public void libFileName_mac() {
-    assertEquals("libtest.dylib", PathUtils.libFileName(mac(), "test"));
-  }
-
-  @Test
-  public void libFileName_linux() {
-    assertEquals("libtest.so", PathUtils.libFileName(linux(), "test"));
-  }
-
-  @Test
-  public void libFileName_windows() {
-    assertEquals("test.dll", PathUtils.libFileName(windows(), "test"));
-  }
-
-  @Test
-  public void libPrefix_mac() {
-    assertEquals("lib", PathUtils.libPrefix(mac()));
-  }
-
-  @Test
-  public void libPrefix_linux() {
-    assertEquals("lib", PathUtils.libPrefix(linux()));
-  }
-
-  @Test
-  public void libPrefix_windows() {
-    assertEquals("", PathUtils.libPrefix(windows()));
-  }
-
-  @Test
-  public void libPrefix_unsupportedOs() {
-    assertThrows(IllegalArgumentException.class, () -> PathUtils.libPrefix(unsupportedOs()));
-  }
-
-  @Test
-  public void dynamicLibExtension_mac() {
-    assertEquals("dylib", PathUtils.dynamicLibExtension(mac()));
-  }
-
-  @Test
-  public void dynamicLibExtension_linux() {
-    assertEquals("so", PathUtils.dynamicLibExtension(linux()));
-  }
-
-  @Test
-  public void dynamicLibExtension_windows() {
-    assertEquals("dll", PathUtils.dynamicLibExtension(windows()));
-  }
-
-  @Test
-  public void dynamicLibExtension_unsupportedOs() {
-    assertThrows(
-        IllegalArgumentException.class, () -> PathUtils.dynamicLibExtension(unsupportedOs()));
-  }
-
-  @Test
-  public void osPart_linux() {
-    assertEquals("linux", PathUtils.osPartOf(linux()));
-  }
-
-  @Test
-  public void osPart_mac() {
-    assertEquals("macos", PathUtils.osPartOf(mac()));
-  }
-
-  @Test
-  public void osPart_windows() {
-    assertEquals("win", PathUtils.osPartOf(windows()));
-  }
-
-  @Test
-  public void osPart_unsupportedOs() {
-    assertThrows(IllegalArgumentException.class, () -> PathUtils.osPartOf(unsupportedOs()));
-  }
-
-  @Test
-  public void archPart_x86_32() {
-    assertEquals("x86_32", PathUtils.archPartOf(linux_x86_32()));
-  }
-
-  @Test
-  public void archPart_x86_64() {
-    assertEquals("x86_64", PathUtils.archPartOf(linux_x86_64()));
-  }
-
-  @Test
-  public void archPart_arm32() {
-    assertEquals("arm32", PathUtils.archPartOf(linux_arm32()));
-  }
-
-  @Test
-  public void archPart_arm64() {
-    assertEquals("aarch64", PathUtils.archPartOf(linux_arm64()));
-  }
-
-  @Test
-  public void archPart_unsupportedArch() {
-    assertThrows(IllegalArgumentException.class, () -> PathUtils.archPartOf(unsupportedArch()));
-  }
-
-  @Test
-  public void libcPart_linux_glibc() {
-    assertEquals("libc", PathUtils.libcPartOf(linux_glibc()));
-  }
-
-  @Test
-  public void libcPart_linux_musl() {
-    assertEquals("musl", PathUtils.libcPartOf(linux_musl()));
-  }
-
-  @Test
-  public void libcPart_mac() {
-    assertNull(PathUtils.libcPartOf(mac()));
-  }
-
-  @Test
-  public void libcPart_windows() {
-    assertNull(PathUtils.libcPartOf(windows()));
-  }
-
-  @Test
-  public void concat_nonEmpty_nonEmpty() {
-    assertEquals("foo/bar", PathUtils.concatPath("foo", "bar"));
-  }
-
-  @Test
-  public void concat_null_nonEmpty() {
-    assertEquals("bar", PathUtils.concatPath(null, "bar"));
-  }
-
-  @Test
-  public void concat_nonEmpty_null() {
-    assertEquals("foo", PathUtils.concatPath("foo", null));
-  }
-
-  @Test
-  public void concat_empty_nonEmpty() {
-    assertEquals("bar", PathUtils.concatPath("", "bar"));
-  }
-
-  @Test
-  public void concat_null_empty_nonEmpty() {
-    assertEquals("bar", PathUtils.concatPath(null, "", "bar"));
-  }
+    @Test
+    public void libFileName_mac() {
+        assertEquals("libtest.dylib", PathUtils.libFileName(mac(), "test"));
+    }
+
+    @Test
+    public void libFileName_linux() {
+        assertEquals("libtest.so", PathUtils.libFileName(linux(), "test"));
+    }
+
+    @Test
+    public void libFileName_windows() {
+        assertEquals("test.dll", PathUtils.libFileName(windows(), "test"));
+    }
+
+    @Test
+    public void libPrefix_mac() {
+        assertEquals("lib", PathUtils.libPrefix(mac()));
+    }
+
+    @Test
+    public void libPrefix_linux() {
+        assertEquals("lib", PathUtils.libPrefix(linux()));
+    }
+
+    @Test
+    public void libPrefix_windows() {
+        assertEquals("", PathUtils.libPrefix(windows()));
+    }
+
+    @Test
+    public void libPrefix_unsupportedOs() {
+        assertThrows(IllegalArgumentException.class, () -> PathUtils.libPrefix(unsupportedOs()));
+    }
+
+    @Test
+    public void dynamicLibExtension_mac() {
+        assertEquals("dylib", PathUtils.dynamicLibExtension(mac()));
+    }
+
+    @Test
+    public void dynamicLibExtension_linux() {
+        assertEquals("so", PathUtils.dynamicLibExtension(linux()));
+    }
+
+    @Test
+    public void dynamicLibExtension_windows() {
+        assertEquals("dll", PathUtils.dynamicLibExtension(windows()));
+    }
+
+    @Test
+    public void dynamicLibExtension_unsupportedOs() {
+        assertThrows(IllegalArgumentException.class, () -> PathUtils.dynamicLibExtension(unsupportedOs()));
+    }
+
+    @Test
+    public void osPart_linux() {
+        assertEquals("linux", PathUtils.osPartOf(linux()));
+    }
+
+    @Test
+    public void osPart_mac() {
+        assertEquals("macos", PathUtils.osPartOf(mac()));
+    }
+
+    @Test
+    public void osPart_windows() {
+        assertEquals("win", PathUtils.osPartOf(windows()));
+    }
+
+    @Test
+    public void osPart_unsupportedOs() {
+        assertThrows(IllegalArgumentException.class, () -> PathUtils.osPartOf(unsupportedOs()));
+    }
+
+    @Test
+    public void archPart_x86_32() {
+        assertEquals("x86_32", PathUtils.archPartOf(linux_x86_32()));
+    }
+
+    @Test
+    public void archPart_x86_64() {
+        assertEquals("x86_64", PathUtils.archPartOf(linux_x86_64()));
+    }
+
+    @Test
+    public void archPart_arm32() {
+        assertEquals("arm32", PathUtils.archPartOf(linux_arm32()));
+    }
+
+    @Test
+    public void archPart_arm64() {
+        assertEquals("aarch64", PathUtils.archPartOf(linux_arm64()));
+    }
+
+    @Test
+    public void archPart_unsupportedArch() {
+        assertThrows(IllegalArgumentException.class, () -> PathUtils.archPartOf(unsupportedArch()));
+    }
+
+    @Test
+    public void libcPart_linux_glibc() {
+        assertEquals("libc", PathUtils.libcPartOf(linux_glibc()));
+    }
+
+    @Test
+    public void libcPart_linux_musl() {
+        assertEquals("musl", PathUtils.libcPartOf(linux_musl()));
+    }
+
+    @Test
+    public void libcPart_mac() {
+        assertNull(PathUtils.libcPartOf(mac()));
+    }
+
+    @Test
+    public void libcPart_windows() {
+        assertNull(PathUtils.libcPartOf(windows()));
+    }
+
+    @Test
+    public void concat_nonEmpty_nonEmpty() {
+        assertEquals("foo/bar", PathUtils.concatPath("foo", "bar"));
+    }
+
+    @Test
+    public void concat_null_nonEmpty() {
+        assertEquals("bar", PathUtils.concatPath(null, "bar"));
+    }
+
+    @Test
+    public void concat_nonEmpty_null() {
+        assertEquals("foo", PathUtils.concatPath("foo", null));
+    }
+
+    @Test
+    public void concat_empty_nonEmpty() {
+        assertEquals("bar", PathUtils.concatPath("", "bar"));
+    }
+
+    @Test
+    public void concat_null_empty_nonEmpty() {
+        assertEquals("bar", PathUtils.concatPath(null, "", "bar"));
+    }
 }
diff --git a/components/native-loader/src/test/java/datadog/nativeloader/PlatformSpecTest.java b/components/native-loader/src/test/java/datadog/nativeloader/PlatformSpecTest.java
index 3dce67b4d03..be91f6649db 100644
--- a/components/native-loader/src/test/java/datadog/nativeloader/PlatformSpecTest.java
+++ b/components/native-loader/src/test/java/datadog/nativeloader/PlatformSpecTest.java
@@ -15,62 +15,62 @@
 import org.junit.jupiter.api.Test;
 
 public class PlatformSpecTest {
-  @Test
-  public void macSpec() {
-    assertTrue(mac().isMac());
-    assertFalse(mac().isUnknownOs());
-  }
+    @Test
+    public void macSpec() {
+        assertTrue(mac().isMac());
+        assertFalse(mac().isUnknownOs());
+    }
 
-  @Test
-  public void linuxSpec() {
-    assertTrue(linux().isLinux());
-    assertFalse(linux().isUnknownOs());
-  }
+    @Test
+    public void linuxSpec() {
+        assertTrue(linux().isLinux());
+        assertFalse(linux().isUnknownOs());
+    }
 
-  @Test
-  public void windowsSpec() {
-    assertTrue(windows().isWindows());
-    assertFalse(windows().isUnknownOs());
-  }
+    @Test
+    public void windowsSpec() {
+        assertTrue(windows().isWindows());
+        assertFalse(windows().isUnknownOs());
+    }
 
-  @Test
-  public void unsupportedOsSpec() {
-    assertFalse(unsupportedOs().isMac());
-    assertFalse(unsupportedOs().isLinux());
-    assertFalse(unsupportedOs().isWindows());
-    assertTrue(unsupportedOs().isUnknownOs());
-  }
+    @Test
+    public void unsupportedOsSpec() {
+        assertFalse(unsupportedOs().isMac());
+        assertFalse(unsupportedOs().isLinux());
+        assertFalse(unsupportedOs().isWindows());
+        assertTrue(unsupportedOs().isUnknownOs());
+    }
 
-  @Test
-  public void arm32Spec() {
-    assertTrue(linux_arm32().isArm32());
-    assertFalse(linux_arm32().isUnknownArch());
-  }
+    @Test
+    public void arm32Spec() {
+        assertTrue(linux_arm32().isArm32());
+        assertFalse(linux_arm32().isUnknownArch());
+    }
 
-  @Test
-  public void arm64Spec() {
-    assertTrue(linux_arm64().isAarch64());
-    assertFalse(linux_arm64().isUnknownArch());
-  }
+    @Test
+    public void arm64Spec() {
+        assertTrue(linux_arm64().isAarch64());
+        assertFalse(linux_arm64().isUnknownArch());
+    }
 
-  @Test
-  public void x86_32Spec() {
-    assertTrue(linux_x86_32().isX86_32());
-    assertFalse(linux_x86_32().isUnknownArch());
-  }
+    @Test
+    public void x86_32Spec() {
+        assertTrue(linux_x86_32().isX86_32());
+        assertFalse(linux_x86_32().isUnknownArch());
+    }
 
-  @Test
-  public void x86_64Spec() {
-    assertTrue(linux_x86_64().isX86_64());
-    assertFalse(linux_x86_64().isUnknownArch());
-  }
+    @Test
+    public void x86_64Spec() {
+        assertTrue(linux_x86_64().isX86_64());
+        assertFalse(linux_x86_64().isUnknownArch());
+    }
 
-  @Test
-  public void unsupportedArchSpec() {
-    assertFalse(unsupportedArch().isArm32());
-    assertFalse(unsupportedArch().isAarch64());
-    assertFalse(unsupportedArch().isX86_32());
-    assertFalse(unsupportedArch().isX86_64());
-    assertTrue(unsupportedArch().isUnknownArch());
-  }
+    @Test
+    public void unsupportedArchSpec() {
+        assertFalse(unsupportedArch().isArm32());
+        assertFalse(unsupportedArch().isAarch64());
+        assertFalse(unsupportedArch().isX86_32());
+        assertFalse(unsupportedArch().isX86_64());
+        assertTrue(unsupportedArch().isUnknownArch());
+    }
 }
diff --git a/components/native-loader/src/test/java/datadog/nativeloader/TestLibraryLoadingListener.java b/components/native-loader/src/test/java/datadog/nativeloader/TestLibraryLoadingListener.java
index 65af2e522a0..fba3d61447f 100644
--- a/components/native-loader/src/test/java/datadog/nativeloader/TestLibraryLoadingListener.java
+++ b/components/native-loader/src/test/java/datadog/nativeloader/TestLibraryLoadingListener.java
@@ -14,522 +14,462 @@
 import java.util.LinkedList;
 
 public final class TestLibraryLoadingListener implements LibraryLoadingListener {
-  private final LinkedList<Check> checks;
-
-  private Check failedCheck = null;
-  private Throwable failedCause = null;
-
-  // By design, listeners are supposed to receive the underlying cause not a LibraryLoadException
-  // directly
-  static final ThrowableCheck NOT_LIB_LOAD_EXCEPTION =
-      (t) -> {
-        assertFalse(
-            t instanceof LibraryLoadException,
-            "LibraryLoadException - instead of underlying cause");
-      };
-
-  public TestLibraryLoadingListener() {
-    this.checks = new LinkedList<>();
-  }
-
-  private TestLibraryLoadingListener(TestLibraryLoadingListener that) {
-    this.checks = new LinkedList<>(that.checks);
-  }
-
-  public TestLibraryLoadingListener expectResolveDynamic(String expectedLibName) {
-    return this.expectResolveDynamic(new LibCheck(expectedLibName));
-  }
-
-  public TestLibraryLoadingListener expectResolveDynamic(
-      String expectedComponent, String expectedLibName) {
-    return this.expectResolveDynamic(new LibCheck(expectedComponent, expectedLibName));
-  }
-
-  public TestLibraryLoadingListener expectResolveDynamic(
-      PlatformSpec expectedPlatformSpec, String expectedLibName) {
-    return this.expectResolveDynamic(new LibCheck(expectedPlatformSpec, expectedLibName));
-  }
-
-  private TestLibraryLoadingListener expectResolveDynamic(LibCheck libCheck) {
-    return this.addCheck(
-        new Check("onResolveDynamic %s", libCheck) {
-          @Override
-          public void onResolveDynamic(
-              PlatformSpec platformSpec,
-              String optionalComponent,
-              String libName,
-              boolean isPreloaded,
-              URL optionalUrl) {
-            libCheck.assertMatches(platformSpec, optionalComponent, libName);
-          }
-        });
-  }
-
-  public TestLibraryLoadingListener expectResolvePreloaded(String expectedLibName) {
-    return this.expectResolvePreloaded(new LibCheck(expectedLibName));
-  }
-
-  private TestLibraryLoadingListener expectResolvePreloaded(LibCheck libCheck) {
-    return this.addCheck(
-        new Check("onResolveDynamic:preloaded %s", libCheck) {
-          @Override
-          public void onResolveDynamic(
-              PlatformSpec platformSpec,
-              String optionalComponent,
-              String libName,
-              boolean isPreloaded,
-              URL optionalUrl) {
-            libCheck.assertMatches(platformSpec, optionalComponent, libName);
-            assertTrue(isPreloaded);
-          }
-        });
-  }
-
-  public TestLibraryLoadingListener expectResolveDynamicFailure(String expectedLibName) {
-    return this.expectResolveDynamicFailure(new LibCheck(expectedLibName));
-  }
-
-  public TestLibraryLoadingListener expectResolveDynamicFailure(
-      String expectedLibName, Throwable expectedThrowable) {
-    return this.expectResolveDynamicFailure(
-        new LibCheck(expectedLibName), (t) -> assertSame(expectedThrowable, t));
-  }
-
-  private TestLibraryLoadingListener expectResolveDynamicFailure(LibCheck libCheck) {
-    return this.expectResolveDynamicFailure(libCheck, NOT_LIB_LOAD_EXCEPTION);
-  }
-
-  private TestLibraryLoadingListener expectResolveDynamicFailure(
-      LibCheck libCheck, ThrowableCheck throwableCheck) {
-    return this.addCheck(
-        new Check("onResolveDynamicFailure %s", libCheck) {
-          @Override
-          public void onResolveDynamicFailure(
-              PlatformSpec platformSpec,
-              String optionalComponent,
-              String libName,
-              Throwable optionalCause) {
-            libCheck.assertMatches(platformSpec, optionalComponent, libName);
-            throwableCheck.assertMatches(optionalCause);
-          }
-        });
-  }
-
-  public TestLibraryLoadingListener expectLoad(String expectedLibName) {
-    return this.expectLoad(new LibCheck(expectedLibName));
-  }
-
-  public TestLibraryLoadingListener expectLoad(String expectedComponent, String expectedLibName) {
-    return this.expectLoad(new LibCheck(expectedComponent, expectedLibName));
-  }
-
-  private TestLibraryLoadingListener expectLoad(LibCheck libCheck) {
-    return this.addCheck(
-        new Check("onLoad %s", libCheck) {
-          @Override
-          public void onLoad(
-              PlatformSpec platformSpec,
-              String optionalComponent,
-              String libName,
-              boolean isPreloaded,
-              Path optionalLibPath) {
-            libCheck.assertMatches(platformSpec, optionalComponent, libName);
-          }
+    private final LinkedList<Check> checks;
+
+    private Check failedCheck = null;
+    private Throwable failedCause = null;
+
+    // By design, listeners are supposed to receive the underlying cause not a LibraryLoadException
+    // directly
+    static final ThrowableCheck NOT_LIB_LOAD_EXCEPTION = (t) -> {
+        assertFalse(t instanceof LibraryLoadException, "LibraryLoadException - instead of underlying cause");
+    };
+
+    public TestLibraryLoadingListener() {
+        this.checks = new LinkedList<>();
+    }
+
+    private TestLibraryLoadingListener(TestLibraryLoadingListener that) {
+        this.checks = new LinkedList<>(that.checks);
+    }
+
+    public TestLibraryLoadingListener expectResolveDynamic(String expectedLibName) {
+        return this.expectResolveDynamic(new LibCheck(expectedLibName));
+    }
+
+    public TestLibraryLoadingListener expectResolveDynamic(String expectedComponent, String expectedLibName) {
+        return this.expectResolveDynamic(new LibCheck(expectedComponent, expectedLibName));
+    }
+
+    public TestLibraryLoadingListener expectResolveDynamic(PlatformSpec expectedPlatformSpec, String expectedLibName) {
+        return this.expectResolveDynamic(new LibCheck(expectedPlatformSpec, expectedLibName));
+    }
+
+    private TestLibraryLoadingListener expectResolveDynamic(LibCheck libCheck) {
+        return this.addCheck(new Check("onResolveDynamic %s", libCheck) {
+            @Override
+            public void onResolveDynamic(
+                    PlatformSpec platformSpec,
+                    String optionalComponent,
+                    String libName,
+                    boolean isPreloaded,
+                    URL optionalUrl) {
+                libCheck.assertMatches(platformSpec, optionalComponent, libName);
+            }
         });
-  }
-
-  public TestLibraryLoadingListener expectLoadPreloaded(String expectedLibName) {
-    return this.expectLoadPreloaded(new LibCheck(expectedLibName));
-  }
-
-  private TestLibraryLoadingListener expectLoadPreloaded(LibCheck libCheck) {
-    return this.addCheck(
-        new Check("onLoad:preloaded %s", libCheck) {
-          @Override
-          public void onLoad(
-              PlatformSpec platformSpec,
-              String optionalComponent,
-              String libName,
-              boolean isPreloaded,
-              Path optionalLibPath) {
-            libCheck.assertMatches(platformSpec, optionalComponent, libName);
-            assertTrue(isPreloaded);
-          }
+    }
+
+    public TestLibraryLoadingListener expectResolvePreloaded(String expectedLibName) {
+        return this.expectResolvePreloaded(new LibCheck(expectedLibName));
+    }
+
+    private TestLibraryLoadingListener expectResolvePreloaded(LibCheck libCheck) {
+        return this.addCheck(new Check("onResolveDynamic:preloaded %s", libCheck) {
+            @Override
+            public void onResolveDynamic(
+                    PlatformSpec platformSpec,
+                    String optionalComponent,
+                    String libName,
+                    boolean isPreloaded,
+                    URL optionalUrl) {
+                libCheck.assertMatches(platformSpec, optionalComponent, libName);
+                assertTrue(isPreloaded);
+            }
         });
-  }
-
-  public TestLibraryLoadingListener expectLoadFailure(String expectedLibName) {
-    return this.expectLoadFailure(new LibCheck(expectedLibName));
-  }
-
-  public TestLibraryLoadingListener expectLoadFailure(
-      String expectedComponent, String expectedLibName) {
-    return this.expectLoadFailure(new LibCheck(expectedComponent, expectedLibName));
-  }
-
-  private TestLibraryLoadingListener expectLoadFailure(LibCheck libCheck) {
-    return this.expectLoadFailure(libCheck, NOT_LIB_LOAD_EXCEPTION);
-  }
-
-  private TestLibraryLoadingListener expectLoadFailure(
-      LibCheck libCheck, ThrowableCheck throwableCheck) {
-    return this.addCheck(
-        new Check("onLoadFailure %s", libCheck) {
-          @Override
-          public void onLoadFailure(
-              PlatformSpec platformSpec,
-              String optionalComponent,
-              String libName,
-              Throwable optionalCause) {
-            libCheck.assertMatches(platformSpec, optionalComponent, libName);
-            throwableCheck.assertMatches(optionalCause);
-          }
+    }
+
+    public TestLibraryLoadingListener expectResolveDynamicFailure(String expectedLibName) {
+        return this.expectResolveDynamicFailure(new LibCheck(expectedLibName));
+    }
+
+    public TestLibraryLoadingListener expectResolveDynamicFailure(String expectedLibName, Throwable expectedThrowable) {
+        return this.expectResolveDynamicFailure(new LibCheck(expectedLibName), (t) -> assertSame(expectedThrowable, t));
+    }
+
+    private TestLibraryLoadingListener expectResolveDynamicFailure(LibCheck libCheck) {
+        return this.expectResolveDynamicFailure(libCheck, NOT_LIB_LOAD_EXCEPTION);
+    }
+
+    private TestLibraryLoadingListener expectResolveDynamicFailure(LibCheck libCheck, ThrowableCheck throwableCheck) {
+        return this.addCheck(new Check("onResolveDynamicFailure %s", libCheck) {
+            @Override
+            public void onResolveDynamicFailure(
+                    PlatformSpec platformSpec, String optionalComponent, String libName, Throwable optionalCause) {
+                libCheck.assertMatches(platformSpec, optionalComponent, libName);
+                throwableCheck.assertMatches(optionalCause);
+            }
         });
-  }
-
-  public TestLibraryLoadingListener expectTempFileCreated(String expectedLibName) {
-    return this.expectTempFileCreated(new LibCheck(expectedLibName));
-  }
-
-  public TestLibraryLoadingListener expectTempFileCreated(
-      String expectedComponent, String expectedLibName) {
-    return this.expectTempFileCreated(new LibCheck(expectedComponent, expectedLibName));
-  }
-
-  private TestLibraryLoadingListener expectTempFileCreated(LibCheck libCheck) {
-    return this.addCheck(
-        new Check("onTempFileCreated %s", libCheck) {
-          @Override
-          public void onTempFileCreated(
-              PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
-            libCheck.assertMatches(platformSpec, optionalComponent, libName);
-            assertNotNull(tempFile);
-          }
+    }
+
+    public TestLibraryLoadingListener expectLoad(String expectedLibName) {
+        return this.expectLoad(new LibCheck(expectedLibName));
+    }
+
+    public TestLibraryLoadingListener expectLoad(String expectedComponent, String expectedLibName) {
+        return this.expectLoad(new LibCheck(expectedComponent, expectedLibName));
+    }
+
+    private TestLibraryLoadingListener expectLoad(LibCheck libCheck) {
+        return this.addCheck(new Check("onLoad %s", libCheck) {
+            @Override
+            public void onLoad(
+                    PlatformSpec platformSpec,
+                    String optionalComponent,
+                    String libName,
+                    boolean isPreloaded,
+                    Path optionalLibPath) {
+                libCheck.assertMatches(platformSpec, optionalComponent, libName);
+            }
         });
-  }
-
-  public TestLibraryLoadingListener expectTempFileCreationFailure(String expectedLibName) {
-    return this.expectTempFileCreationFailure(new LibCheck(expectedLibName));
-  }
-
-  private TestLibraryLoadingListener expectTempFileCreationFailure(LibCheck libCheck) {
-    return this.expectTempFileCreationFailure(libCheck, NOT_LIB_LOAD_EXCEPTION);
-  }
-
-  private TestLibraryLoadingListener expectTempFileCreationFailure(
-      LibCheck libCheck, ThrowableCheck throwableCheck) {
-    return this.addCheck(
-        new Check("onTempFileCreationFailure %s", libCheck) {
-          @Override
-          public void onTempFileCreationFailure(
-              PlatformSpec platformSpec,
-              String optionalComponent,
-              String libName,
-              Path tempDir,
-              String libExt,
-              Throwable optionalCause) {
-            libCheck.assertMatches(platformSpec, optionalComponent, libName);
-            assertNotNull(tempDir);
-            assertNotNull(libExt);
-          }
+    }
+
+    public TestLibraryLoadingListener expectLoadPreloaded(String expectedLibName) {
+        return this.expectLoadPreloaded(new LibCheck(expectedLibName));
+    }
+
+    private TestLibraryLoadingListener expectLoadPreloaded(LibCheck libCheck) {
+        return this.addCheck(new Check("onLoad:preloaded %s", libCheck) {
+            @Override
+            public void onLoad(
+                    PlatformSpec platformSpec,
+                    String optionalComponent,
+                    String libName,
+                    boolean isPreloaded,
+                    Path optionalLibPath) {
+                libCheck.assertMatches(platformSpec, optionalComponent, libName);
+                assertTrue(isPreloaded);
+            }
         });
-  }
-
-  public TestLibraryLoadingListener expectTempFileCleanup(String expectedLibName) {
-    return this.expectTempFileCleanup(new LibCheck(expectedLibName));
-  }
-
-  public TestLibraryLoadingListener expectTempFileCleanup(
-      String expectedComponent, String expectedLibName) {
-    return this.expectTempFileCleanup(new LibCheck(expectedComponent, expectedLibName));
-  }
-
-  TestLibraryLoadingListener expectTempFileCleanup(LibCheck libCheck) {
-    return this.addCheck(
-        new Check("onTempFileCreationCleanup %s", libCheck) {
-          @Override
-          public void onTempFileCleanup(
-              PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
-            libCheck.assertMatches(platformSpec, optionalComponent, libName);
-            assertNotNull(tempFile);
-          }
+    }
+
+    public TestLibraryLoadingListener expectLoadFailure(String expectedLibName) {
+        return this.expectLoadFailure(new LibCheck(expectedLibName));
+    }
+
+    public TestLibraryLoadingListener expectLoadFailure(String expectedComponent, String expectedLibName) {
+        return this.expectLoadFailure(new LibCheck(expectedComponent, expectedLibName));
+    }
+
+    private TestLibraryLoadingListener expectLoadFailure(LibCheck libCheck) {
+        return this.expectLoadFailure(libCheck, NOT_LIB_LOAD_EXCEPTION);
+    }
+
+    private TestLibraryLoadingListener expectLoadFailure(LibCheck libCheck, ThrowableCheck throwableCheck) {
+        return this.addCheck(new Check("onLoadFailure %s", libCheck) {
+            @Override
+            public void onLoadFailure(
+                    PlatformSpec platformSpec, String optionalComponent, String libName, Throwable optionalCause) {
+                libCheck.assertMatches(platformSpec, optionalComponent, libName);
+                throwableCheck.assertMatches(optionalCause);
+            }
         });
-  }
-
-  public TestLibraryLoadingListener copy() {
-    return new TestLibraryLoadingListener(this);
-  }
-
-  public void assertDone() {
-    if (this.failedCheck != null) {
-      try {
-        fail("check failed: " + this.failedCheck, this.failedCause);
-      } catch (AssertionError e) {
-        e.initCause(this.failedCause);
-
-        throw e;
-      }
-    }
-
-    // written this way for better debugging
-    assertEquals(Collections.emptyList(), this.checks);
-  }
-
-  @Override
-  public void onResolveDynamic(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      boolean isPreloaded,
-      URL optionalUrl) {
-    this.nextCheck(
-        check ->
-            check.onResolveDynamic(
-                platformSpec, optionalComponent, libName, isPreloaded, optionalUrl));
-  }
-
-  @Override
-  public void onResolveDynamicFailure(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      Throwable optionalCause) {
-    this.nextCheck(
-        check ->
-            check.onResolveDynamicFailure(platformSpec, optionalComponent, libName, optionalCause));
-  }
-
-  @Override
-  public void onLoad(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      boolean isPreloaded,
-      Path optionalLibPath) {
-    this.nextCheck(
-        check ->
-            check.onLoad(platformSpec, optionalComponent, libName, isPreloaded, optionalLibPath));
-  }
-
-  @Override
-  public void onLoadFailure(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      Throwable optionalCause) {
-    this.nextCheck(
-        check -> check.onLoadFailure(platformSpec, optionalComponent, libName, optionalCause));
-  }
-
-  @Override
-  public void onTempFileCreated(
-      PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
-    this.nextCheck(
-        check -> check.onTempFileCreated(platformSpec, optionalComponent, libName, tempFile));
-  }
-
-  @Override
-  public void onTempFileCreationFailure(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      Path tempDir,
-      String libExt,
-      Throwable optionalCause) {
-    this.nextCheck(
-        check ->
-            check.onTempFileCreationFailure(
-                platformSpec, optionalComponent, libName, tempDir, libExt, optionalCause));
-  }
+    }
 
-  @Override
-  public void onTempFileCleanup(
-      PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
-    this.nextCheck(
-        check -> check.onTempFileCleanup(platformSpec, optionalComponent, libName, tempFile));
-  }
+    public TestLibraryLoadingListener expectTempFileCreated(String expectedLibName) {
+        return this.expectTempFileCreated(new LibCheck(expectedLibName));
+    }
 
-  public TestLibraryLoadingListener addCheck(Check check) {
-    this.checks.addLast(check);
-    return this;
-  }
+    public TestLibraryLoadingListener expectTempFileCreated(String expectedComponent, String expectedLibName) {
+        return this.expectTempFileCreated(new LibCheck(expectedComponent, expectedLibName));
+    }
 
-  private void nextCheck(CheckInvocation invocation) {
-    Check nextCheck = this.checks.isEmpty() ? Check.NOTHING : this.checks.removeFirst();
-    try {
-      invocation.invoke(nextCheck);
-    } catch (Throwable t) {
-      if (this.failedCheck == null) {
-        this.failedCheck = nextCheck;
-        this.failedCause = t;
-      }
+    private TestLibraryLoadingListener expectTempFileCreated(LibCheck libCheck) {
+        return this.addCheck(new Check("onTempFileCreated %s", libCheck) {
+            @Override
+            public void onTempFileCreated(
+                    PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
+                libCheck.assertMatches(platformSpec, optionalComponent, libName);
+                assertNotNull(tempFile);
+            }
+        });
     }
-  }
 
-  public abstract static class Check implements LibraryLoadingListener {
-    static final Check NOTHING = new Check("nothing") {};
+    public TestLibraryLoadingListener expectTempFileCreationFailure(String expectedLibName) {
+        return this.expectTempFileCreationFailure(new LibCheck(expectedLibName));
+    }
 
-    private final String name;
+    private TestLibraryLoadingListener expectTempFileCreationFailure(LibCheck libCheck) {
+        return this.expectTempFileCreationFailure(libCheck, NOT_LIB_LOAD_EXCEPTION);
+    }
 
-    Check(String nameFormat, Object... nameArgs) {
-      this(String.format(nameFormat, nameArgs));
+    private TestLibraryLoadingListener expectTempFileCreationFailure(LibCheck libCheck, ThrowableCheck throwableCheck) {
+        return this.addCheck(new Check("onTempFileCreationFailure %s", libCheck) {
+            @Override
+            public void onTempFileCreationFailure(
+                    PlatformSpec platformSpec,
+                    String optionalComponent,
+                    String libName,
+                    Path tempDir,
+                    String libExt,
+                    Throwable optionalCause) {
+                libCheck.assertMatches(platformSpec, optionalComponent, libName);
+                assertNotNull(tempDir);
+                assertNotNull(libExt);
+            }
+        });
     }
 
-    Check(String name) {
-      this.name = name;
+    public TestLibraryLoadingListener expectTempFileCleanup(String expectedLibName) {
+        return this.expectTempFileCleanup(new LibCheck(expectedLibName));
     }
 
-    @Override
-    public void onLoad(
-        PlatformSpec platformSpec,
-        String optionalComponent,
-        String libName,
-        boolean isPreloaded,
-        Path optionalLibPath) {
-      this.fallback(
-          "onLoad", platformSpec, optionalComponent, libName, isPreloaded, optionalLibPath);
+    public TestLibraryLoadingListener expectTempFileCleanup(String expectedComponent, String expectedLibName) {
+        return this.expectTempFileCleanup(new LibCheck(expectedComponent, expectedLibName));
     }
 
-    @Override
-    public void onLoadFailure(
-        PlatformSpec platformSpec,
-        String optionalComponent,
-        String libName,
-        Throwable optionalCause) {
-      this.fallback("onLoadFailure", platformSpec, optionalComponent, libName, optionalCause);
+    TestLibraryLoadingListener expectTempFileCleanup(LibCheck libCheck) {
+        return this.addCheck(new Check("onTempFileCreationCleanup %s", libCheck) {
+            @Override
+            public void onTempFileCleanup(
+                    PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
+                libCheck.assertMatches(platformSpec, optionalComponent, libName);
+                assertNotNull(tempFile);
+            }
+        });
+    }
+
+    public TestLibraryLoadingListener copy() {
+        return new TestLibraryLoadingListener(this);
+    }
+
+    public void assertDone() {
+        if (this.failedCheck != null) {
+            try {
+                fail("check failed: " + this.failedCheck, this.failedCause);
+            } catch (AssertionError e) {
+                e.initCause(this.failedCause);
+
+                throw e;
+            }
+        }
+
+        // written this way for better debugging
+        assertEquals(Collections.emptyList(), this.checks);
     }
 
     @Override
     public void onResolveDynamic(
-        PlatformSpec platformSpec,
-        String optionalComponent,
-        String libName,
-        boolean isPreloaded,
-        URL optionalUrl) {
-      this.fallback(
-          "onResolveDynamic", platformSpec, optionalComponent, libName, isPreloaded, optionalUrl);
+            PlatformSpec platformSpec, String optionalComponent, String libName, boolean isPreloaded, URL optionalUrl) {
+        this.nextCheck(
+                check -> check.onResolveDynamic(platformSpec, optionalComponent, libName, isPreloaded, optionalUrl));
     }
 
     @Override
     public void onResolveDynamicFailure(
-        PlatformSpec platformSpec,
-        String optionalComponent,
-        String libName,
-        Throwable optionalCause) {
-      this.fallback(
-          "onResolveDynamicFailure", platformSpec, optionalComponent, libName, optionalCause);
+            PlatformSpec platformSpec, String optionalComponent, String libName, Throwable optionalCause) {
+        this.nextCheck(check -> check.onResolveDynamicFailure(platformSpec, optionalComponent, libName, optionalCause));
     }
 
     @Override
-    public void onTempFileCreated(
-        PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
-      this.fallback("onTmepFileCreated", platformSpec, optionalComponent, libName, tempFile);
+    public void onLoad(
+            PlatformSpec platformSpec,
+            String optionalComponent,
+            String libName,
+            boolean isPreloaded,
+            Path optionalLibPath) {
+        this.nextCheck(check -> check.onLoad(platformSpec, optionalComponent, libName, isPreloaded, optionalLibPath));
     }
 
     @Override
-    public void onTempFileCreationFailure(
-        PlatformSpec platformSpec,
-        String optionalComponent,
-        String libName,
-        Path tempDir,
-        String libExt,
-        Throwable optionalCause) {
-      this.fallback(
-          "onTempFileCreationFailure",
-          platformSpec,
-          optionalComponent,
-          libName,
-          tempDir,
-          libExt,
-          optionalCause);
+    public void onLoadFailure(
+            PlatformSpec platformSpec, String optionalComponent, String libName, Throwable optionalCause) {
+        this.nextCheck(check -> check.onLoadFailure(platformSpec, optionalComponent, libName, optionalCause));
     }
 
     @Override
-    public void onTempFileCleanup(
-        PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
-      this.fallback("onTempFileCleanup", platformSpec, optionalComponent, libName, tempFile);
-    }
-
-    void fallback(String methodName, Object... args) {
-      fail("unxpected call: " + callToString(methodName, args) + " - expected: " + this.name);
+    public void onTempFileCreated(PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
+        this.nextCheck(check -> check.onTempFileCreated(platformSpec, optionalComponent, libName, tempFile));
     }
 
-    static final String callToString(String methodName, Object... args) {
-      StringBuilder builder = new StringBuilder();
-      builder.append(methodName);
-      builder.append('(');
-      for (int i = 0; i < args.length; ++i) {
-        if (i != 0) builder.append(", ");
-        builder.append(args[i]);
-      }
-      builder.append(')');
-      return builder.toString();
+    @Override
+    public void onTempFileCreationFailure(
+            PlatformSpec platformSpec,
+            String optionalComponent,
+            String libName,
+            Path tempDir,
+            String libExt,
+            Throwable optionalCause) {
+        this.nextCheck(check -> check.onTempFileCreationFailure(
+                platformSpec, optionalComponent, libName, tempDir, libExt, optionalCause));
     }
 
     @Override
-    public String toString() {
-      return this.name;
+    public void onTempFileCleanup(PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
+        this.nextCheck(check -> check.onTempFileCleanup(platformSpec, optionalComponent, libName, tempFile));
     }
-  }
-
-  @FunctionalInterface
-  interface CheckInvocation {
-    void invoke(Check check);
-  }
-
-  static final class LibCheck {
-    private final PlatformSpec expectedPlatformSpec;
-    private final String expectedComponent;
-    private final String expectedLibName;
 
-    LibCheck(PlatformSpec expectedPlatformSpec, String expectedLibName) {
-      this(null, null, expectedLibName);
+    public TestLibraryLoadingListener addCheck(Check check) {
+        this.checks.addLast(check);
+        return this;
     }
 
-    LibCheck(String expectedComponent, String expectedLibName) {
-      this(null, expectedComponent, expectedLibName);
+    private void nextCheck(CheckInvocation invocation) {
+        Check nextCheck = this.checks.isEmpty() ? Check.NOTHING : this.checks.removeFirst();
+        try {
+            invocation.invoke(nextCheck);
+        } catch (Throwable t) {
+            if (this.failedCheck == null) {
+                this.failedCheck = nextCheck;
+                this.failedCause = t;
+            }
+        }
     }
 
-    LibCheck(String expectedLibName) {
-      this(null, null, expectedLibName);
+    public abstract static class Check implements LibraryLoadingListener {
+        static final Check NOTHING = new Check("nothing") {};
+
+        private final String name;
+
+        Check(String nameFormat, Object... nameArgs) {
+            this(String.format(nameFormat, nameArgs));
+        }
+
+        Check(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public void onLoad(
+                PlatformSpec platformSpec,
+                String optionalComponent,
+                String libName,
+                boolean isPreloaded,
+                Path optionalLibPath) {
+            this.fallback("onLoad", platformSpec, optionalComponent, libName, isPreloaded, optionalLibPath);
+        }
+
+        @Override
+        public void onLoadFailure(
+                PlatformSpec platformSpec, String optionalComponent, String libName, Throwable optionalCause) {
+            this.fallback("onLoadFailure", platformSpec, optionalComponent, libName, optionalCause);
+        }
+
+        @Override
+        public void onResolveDynamic(
+                PlatformSpec platformSpec,
+                String optionalComponent,
+                String libName,
+                boolean isPreloaded,
+                URL optionalUrl) {
+            this.fallback("onResolveDynamic", platformSpec, optionalComponent, libName, isPreloaded, optionalUrl);
+        }
+
+        @Override
+        public void onResolveDynamicFailure(
+                PlatformSpec platformSpec, String optionalComponent, String libName, Throwable optionalCause) {
+            this.fallback("onResolveDynamicFailure", platformSpec, optionalComponent, libName, optionalCause);
+        }
+
+        @Override
+        public void onTempFileCreated(
+                PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
+            this.fallback("onTmepFileCreated", platformSpec, optionalComponent, libName, tempFile);
+        }
+
+        @Override
+        public void onTempFileCreationFailure(
+                PlatformSpec platformSpec,
+                String optionalComponent,
+                String libName,
+                Path tempDir,
+                String libExt,
+                Throwable optionalCause) {
+            this.fallback(
+                    "onTempFileCreationFailure",
+                    platformSpec,
+                    optionalComponent,
+                    libName,
+                    tempDir,
+                    libExt,
+                    optionalCause);
+        }
+
+        @Override
+        public void onTempFileCleanup(
+                PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
+            this.fallback("onTempFileCleanup", platformSpec, optionalComponent, libName, tempFile);
+        }
+
+        void fallback(String methodName, Object... args) {
+            fail("unxpected call: " + callToString(methodName, args) + " - expected: " + this.name);
+        }
+
+        static final String callToString(String methodName, Object... args) {
+            StringBuilder builder = new StringBuilder();
+            builder.append(methodName);
+            builder.append('(');
+            for (int i = 0; i < args.length; ++i) {
+                if (i != 0) builder.append(", ");
+                builder.append(args[i]);
+            }
+            builder.append(')');
+            return builder.toString();
+        }
+
+        @Override
+        public String toString() {
+            return this.name;
+        }
     }
 
-    LibCheck(PlatformSpec expectedPlatformSpec, String expectedComponent, String expectedLibName) {
-      this.expectedPlatformSpec = expectedPlatformSpec;
-      this.expectedComponent = expectedComponent;
-      this.expectedLibName = expectedLibName;
+    @FunctionalInterface
+    interface CheckInvocation {
+        void invoke(Check check);
     }
 
-    void assertMatches(PlatformSpec platformSpec, String optionalComponent, String libName) {
-      if (this.expectedPlatformSpec == null) {
-        // if no expectedPlatformSpec was provided -- just check that platformSpec is not null
-        assertNotNull(platformSpec);
-      } else {
-        assertEquals(this.expectedPlatformSpec, platformSpec);
-      }
-
-      if (this.expectedComponent == null) {
-        // a null expectedComponent is treated as not expecting a component
-        assertNull(optionalComponent);
-      } else {
-        assertEquals(this.expectedComponent, optionalComponent);
-      }
-
-      assertEquals(this.expectedLibName, libName);
+    static final class LibCheck {
+        private final PlatformSpec expectedPlatformSpec;
+        private final String expectedComponent;
+        private final String expectedLibName;
+
+        LibCheck(PlatformSpec expectedPlatformSpec, String expectedLibName) {
+            this(null, null, expectedLibName);
+        }
+
+        LibCheck(String expectedComponent, String expectedLibName) {
+            this(null, expectedComponent, expectedLibName);
+        }
+
+        LibCheck(String expectedLibName) {
+            this(null, null, expectedLibName);
+        }
+
+        LibCheck(PlatformSpec expectedPlatformSpec, String expectedComponent, String expectedLibName) {
+            this.expectedPlatformSpec = expectedPlatformSpec;
+            this.expectedComponent = expectedComponent;
+            this.expectedLibName = expectedLibName;
+        }
+
+        void assertMatches(PlatformSpec platformSpec, String optionalComponent, String libName) {
+            if (this.expectedPlatformSpec == null) {
+                // if no expectedPlatformSpec was provided -- just check that platformSpec is not null
+                assertNotNull(platformSpec);
+            } else {
+                assertEquals(this.expectedPlatformSpec, platformSpec);
+            }
+
+            if (this.expectedComponent == null) {
+                // a null expectedComponent is treated as not expecting a component
+                assertNull(optionalComponent);
+            } else {
+                assertEquals(this.expectedComponent, optionalComponent);
+            }
+
+            assertEquals(this.expectedLibName, libName);
+        }
+
+        @Override
+        public String toString() {
+            if (this.expectedComponent == null) {
+                return this.expectedLibName;
+            } else {
+                return this.expectedComponent + "/" + this.expectedLibName;
+            }
+        }
     }
 
-    @Override
-    public String toString() {
-      if (this.expectedComponent == null) {
-        return this.expectedLibName;
-      } else {
-        return this.expectedComponent + "/" + this.expectedLibName;
-      }
-    }
-  }
-
-  @FunctionalInterface
-  interface ThrowableCheck {
-    void assertMatches(Throwable t);
-  }
+    @FunctionalInterface
+    interface ThrowableCheck {
+        void assertMatches(Throwable t);
+    }
 }
diff --git a/components/native-loader/src/test/java/datadog/nativeloader/TestPlatformSpec.java b/components/native-loader/src/test/java/datadog/nativeloader/TestPlatformSpec.java
index dd875453045..6c7b59480b9 100644
--- a/components/native-loader/src/test/java/datadog/nativeloader/TestPlatformSpec.java
+++ b/components/native-loader/src/test/java/datadog/nativeloader/TestPlatformSpec.java
@@ -1,130 +1,130 @@
 package datadog.nativeloader;
 
 public class TestPlatformSpec extends PlatformSpec {
-  public static final String MAC = "mac";
-  public static final String WINDOWS = "win";
-  public static final String LINUX = "linux";
+    public static final String MAC = "mac";
+    public static final String WINDOWS = "win";
+    public static final String LINUX = "linux";
 
-  public static final String UNSUPPORTED_OS = "unsupported";
+    public static final String UNSUPPORTED_OS = "unsupported";
 
-  public static final String X86_32 = "x86_32";
-  public static final String X86_64 = "x86_64";
+    public static final String X86_32 = "x86_32";
+    public static final String X86_64 = "x86_64";
 
-  public static final String ARM32 = "arm32";
-  public static final String AARCH64 = "aarch64";
-
-  public static final String UNSUPPORTED_ARCH = "unsupported";
+    public static final String ARM32 = "arm32";
+    public static final String AARCH64 = "aarch64";
+
+    public static final String UNSUPPORTED_ARCH = "unsupported";
 
-  public static final boolean GLIBC = false;
-  public static final boolean MUSL = true;
-
-  public static final PlatformSpec of(String os, String arch) {
-    return new TestPlatformSpec(os, arch, false);
-  }
-
-  public static final TestPlatformSpec of(String os, String arch, boolean isMusl) {
-    return new TestPlatformSpec(os, arch, isMusl);
-  }
-
-  public static final PlatformSpec mac() {
-    return TestPlatformSpec.of(MAC, AARCH64);
-  }
-
-  public static final PlatformSpec linux() {
-    return TestPlatformSpec.of(LINUX, X86_64);
-  }
-
-  public static final PlatformSpec windows() {
-    return TestPlatformSpec.of(WINDOWS, X86_64);
-  }
-
-  public static final PlatformSpec unsupportedOs() {
-    return TestPlatformSpec.of(UNSUPPORTED_OS, AARCH64);
-  }
-
-  public static final PlatformSpec linux_x86_32() {
-    return TestPlatformSpec.of(WINDOWS, X86_32);
-  }
-
-  public static final PlatformSpec linux_x86_64() {
-    return TestPlatformSpec.of(MAC, X86_64);
-  }
-
-  public static final PlatformSpec linux_arm32() {
-    return TestPlatformSpec.of(LINUX, ARM32);
-  }
-
-  public static final PlatformSpec linux_arm64() {
-    return TestPlatformSpec.of(LINUX, AARCH64);
-  }
-
-  public static final PlatformSpec linux_glibc() {
-    return TestPlatformSpec.of(LINUX, AARCH64, GLIBC);
-  }
-
-  public static final PlatformSpec linux_musl() {
-    return TestPlatformSpec.of(LINUX, AARCH64, MUSL);
-  }
-
-  public static final PlatformSpec unsupportedArch() {
-    return TestPlatformSpec.of(LINUX, UNSUPPORTED_ARCH);
-  }
-
-  private final String os;
-  private final String arch;
-  private final boolean isMusl;
-
-  private TestPlatformSpec(String os, String arch, boolean isMusl) {
-    this.os = os;
-    this.arch = arch;
-    this.isMusl = isMusl;
-  }
-
-  @Override
-  public boolean isLinux() {
-    return this.isOs(LINUX);
-  }
-
-  @Override
-  public boolean isMac() {
-    return this.isOs(MAC);
-  }
-
-  @Override
-  public boolean isWindows() {
-    return this.isOs(WINDOWS);
-  }
-
-  private boolean isOs(String osConst) {
-    return osConst.equals(this.os);
-  }
-
-  @Override
-  public boolean isX86_32() {
-    return this.isArch(X86_32);
-  }
-
-  @Override
-  public boolean isAarch64() {
-    return this.isArch(AARCH64);
-  }
-
-  @Override
-  public boolean isArm32() {
-    return this.isArch(ARM32);
-  }
-
-  @Override
-  public boolean isX86_64() {
-    return this.isArch(X86_64);
-  }
-
-  @Override
-  public boolean isMusl() {
-    return this.isMusl;
-  }
-
-  private boolean isArch(String archConst) {
-    return archConst.equals(this.arch);
-  }
+    public static final boolean GLIBC = false;
+    public static final boolean MUSL = true;
+
+    public static final PlatformSpec of(String os, String arch) {
+        return new TestPlatformSpec(os, arch, false);
+    }
+
+    public static final TestPlatformSpec of(String os, String arch, boolean isMusl) {
+        return new TestPlatformSpec(os, arch, isMusl);
+    }
+
+    public static final PlatformSpec mac() {
+        return TestPlatformSpec.of(MAC, AARCH64);
+    }
+
+    public static final PlatformSpec linux() {
+        return TestPlatformSpec.of(LINUX, X86_64);
+    }
+
+    public static final PlatformSpec windows() {
+        return TestPlatformSpec.of(WINDOWS, X86_64);
+    }
+
+    public static final PlatformSpec unsupportedOs() {
+        return TestPlatformSpec.of(UNSUPPORTED_OS, AARCH64);
+    }
+
+    public static final PlatformSpec linux_x86_32() {
+        return TestPlatformSpec.of(WINDOWS, X86_32);
+    }
+
+    public static final PlatformSpec linux_x86_64() {
+        return TestPlatformSpec.of(MAC, X86_64);
+    }
+
+    public static final PlatformSpec linux_arm32() {
+        return TestPlatformSpec.of(LINUX, ARM32);
+    }
+
+    public static final PlatformSpec linux_arm64() {
+        return TestPlatformSpec.of(LINUX, AARCH64);
+    }
+
+    public static final PlatformSpec linux_glibc() {
+        return TestPlatformSpec.of(LINUX, AARCH64, GLIBC);
+    }
+
+    public static final PlatformSpec linux_musl() {
+        return TestPlatformSpec.of(LINUX, AARCH64, MUSL);
+    }
+
+    public static final PlatformSpec unsupportedArch() {
+        return TestPlatformSpec.of(LINUX, UNSUPPORTED_ARCH);
+    }
+
+    private final String os;
+    private final String arch;
+    private final boolean isMusl;
+
+    private TestPlatformSpec(String os, String arch, boolean isMusl) {
+        this.os = os;
+        this.arch = arch;
+        this.isMusl = isMusl;
+    }
+
+    @Override
+    public boolean isLinux() {
+        return this.isOs(LINUX);
+    }
+
+    @Override
+    public boolean isMac() {
+        return this.isOs(MAC);
+    }
+
+    @Override
+    public boolean isWindows() {
+        return this.isOs(WINDOWS);
+    }
+
+    private boolean isOs(String osConst) {
+        return osConst.equals(this.os);
+    }
+
+    @Override
+    public boolean isX86_32() {
+        return this.isArch(X86_32);
+    }
+
+    @Override
+    public boolean isAarch64() {
+        return this.isArch(AARCH64);
+    }
+
+    @Override
+    public boolean isArm32() {
+        return this.isArch(ARM32);
+    }
+
+    @Override
+    public boolean isX86_64() {
+        return this.isArch(X86_64);
+    }
+
+    @Override
+    public boolean isMusl() {
+        return this.isMusl;
+    }
+
+    private boolean isArch(String archConst) {
+        return archConst.equals(this.arch);
+    }
 }
diff --git a/components/native-loader/src/test/java/datadog/nativeloader/ThrowingLibraryLoadingListener.java b/components/native-loader/src/test/java/datadog/nativeloader/ThrowingLibraryLoadingListener.java
index 75f0a2ed6fc..9a90ca91a96 100644
--- a/components/native-loader/src/test/java/datadog/nativeloader/ThrowingLibraryLoadingListener.java
+++ b/components/native-loader/src/test/java/datadog/nativeloader/ThrowingLibraryLoadingListener.java
@@ -4,68 +4,58 @@
 import java.nio.file.Path;
 
 public class ThrowingLibraryLoadingListener implements LibraryLoadingListener {
-  @Override
-  public final void onLoad(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      boolean isPreloaded,
-      Path optionalLibPath) {
-    this.throwException("load");
-  }
-
-  @Override
-  public final void onLoadFailure(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      Throwable optionalCause) {
-    this.throwException("loadFailure");
-  }
-
-  @Override
-  public final void onResolveDynamic(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      boolean isPreloaded,
-      URL optionalUrl) {
-    this.throwException("resolveDynamic");
-  }
-
-  @Override
-  public final void onResolveDynamicFailure(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      Throwable optionalCause) {
-    this.throwException("resolveDynamicFailure");
-  }
-
-  @Override
-  public final void onTempFileCreated(
-      PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
-    this.throwException("tempFileCreated");
-  }
-
-  @Override
-  public final void onTempFileCreationFailure(
-      PlatformSpec platformSpec,
-      String optionalComponent,
-      String libName,
-      Path tempDir,
-      String libExt,
-      Throwable optionalCause) {
-    this.throwException("tempFileCreationFailure");
-  }
-
-  @Override
-  public final void onTempFileCleanup(
-      PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
-    this.throwException("tempFileCleanup");
-  }
-
-  void throwException(String event) {
-    throw new RuntimeException(event);
-  }
+    @Override
+    public final void onLoad(
+            PlatformSpec platformSpec,
+            String optionalComponent,
+            String libName,
+            boolean isPreloaded,
+            Path optionalLibPath) {
+        this.throwException("load");
+    }
+
+    @Override
+    public final void onLoadFailure(
+            PlatformSpec platformSpec, String optionalComponent, String libName, Throwable optionalCause) {
+        this.throwException("loadFailure");
+    }
+
+    @Override
+    public final void onResolveDynamic(
+            PlatformSpec platformSpec, String optionalComponent, String libName, boolean isPreloaded, URL optionalUrl) {
+        this.throwException("resolveDynamic");
+    }
+
+    @Override
+    public final void onResolveDynamicFailure(
+            PlatformSpec platformSpec, String optionalComponent, String libName, Throwable optionalCause) {
+        this.throwException("resolveDynamicFailure");
+    }
+
+    @Override
+    public final void onTempFileCreated(
+            PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
+        this.throwException("tempFileCreated");
+    }
+
+    @Override
+    public final void onTempFileCreationFailure(
+            PlatformSpec platformSpec,
+            String optionalComponent,
+            String libName,
+            Path tempDir,
+            String libExt,
+            Throwable optionalCause) {
+        this.throwException("tempFileCreationFailure");
+    }
+
+    @Override
+    public final void onTempFileCleanup(
+            PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
+        this.throwException("tempFileCleanup");
+    }
+
+    void throwException(String event) {
+        throw new RuntimeException(event);
+    }
 }
diff --git a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java
index 60b51ec0a4b..358202c95d0 100644
--- a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java
+++ b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java
@@ -64,566 +64,555 @@
  */
 public class AIGuardInternal implements Evaluator {
 
-  private static final Logger log = LoggerFactory.getLogger(AIGuardInternal.class);
+    private static final Logger log = LoggerFactory.getLogger(AIGuardInternal.class);
 
-  public static class BadConfigurationException extends RuntimeException {
-    public BadConfigurationException(final String message) {
-      super(message);
-    }
-  }
-
-  static final String SPAN_NAME = "ai_guard";
-  static final String TARGET_TAG = "ai_guard.target";
-  static final String TOOL_TAG = "ai_guard.tool_name";
-  static final String ACTION_TAG = "ai_guard.action";
-  static final String REASON_TAG = "ai_guard.reason";
-  static final String BLOCKED_TAG = "ai_guard.blocked";
-  static final String REDACTED_TAG = "ai_guard.redacted";
-
-  static final String RESPONSE_REDACTION_REPLACEMENTS = "redaction_replacements";
-
-  static final String META_STRUCT_TAG = "ai_guard";
-  static final String META_STRUCT_MESSAGES = "messages";
-  static final String META_STRUCT_CATEGORIES = "attack_categories";
-  static final String META_STRUCT_SDS = "sds";
-  static final String META_STRUCT_TAG_PROBS = "tag_probs";
-
-  /**
-   * Anomaly detection tags copied from the local root span onto every {@code ai_guard} span with
-   * the {@code ai_guard.} prefix, so the AI Guard backend can correlate AI Guard requests with the
-   * request context (client IP, user, session) without depending on the local root span.
-   */
-  static final String[] ANOMALY_DETECTION_TAGS = {
-    Tags.HTTP_CLIENT_IP, Tags.NETWORK_CLIENT_IP, Tags.HTTP_USER_AGENT, "usr.id", "usr.session_id"
-  };
-
-  public static void install() {
-    final Config config = Config.get();
-    final String apiKey = config.getApiKey();
-    final String appKey = config.getApplicationKey();
-    if (isBlank(apiKey) || isBlank(appKey)) {
-      throw new BadConfigurationException(
-          "AI Guard: Missing api and/or application key, use DD_API_KEY and DD_APP_KEY");
-    }
-    String endpoint = config.getAiGuardEndpoint();
-    if (isBlank(endpoint)) {
-      endpoint = String.format("https://app.%s/api/v2/ai-guard", config.getSite());
-    }
-    final Map<String, String> headers =
-        mapOf(
-            "DD-API-KEY",
-            apiKey,
-            "DD-APPLICATION-KEY",
-            appKey,
-            "DD-AI-GUARD-VERSION",
-            TRACER_VERSION,
-            "DD-AI-GUARD-SOURCE",
-            "SDK",
-            "DD-AI-GUARD-LANGUAGE",
-            "jvm");
-    final HttpUrl url = HttpUrl.get(endpoint).newBuilder().addPathSegment("evaluate").build();
-    final int timeout = config.getAiGuardTimeout();
-    final OkHttpClient client = buildClient(url, timeout);
-    Installer.install(new AIGuardInternal(url, headers, client));
-  }
-
-  /** Used by tests to reset status */
-  static void uninstall() {
-    Installer.install(new NoOpEvaluator());
-  }
-
-  private final HttpUrl url;
-  private final Moshi moshi;
-  private final OkHttpClient client;
-  private final Map<String, String> meta;
-  private final Map<String, String> headers;
-  private final MessageRedactor redactor;
-
-  AIGuardInternal(final HttpUrl url, final Map<String, String> headers, final OkHttpClient client) {
-    this.url = url;
-    this.headers = headers;
-    this.client = client;
-    this.moshi = new Moshi.Builder().add(new AIGuardFactory()).build();
-    final Config config = Config.get();
-    this.meta = mapOf("service", config.getServiceName(), "env", config.getEnv());
-    this.redactor =
-        config.isAiGuardRedactionEnabled()
-            ? new MessageRedactor.DefaultRedactor()
-            : new MessageRedactor.NoOp();
-  }
-
-  /**
-   * Creates a deep copy of the messages before storing them in the metastruct to avoid concurrent
-   * modifications prior to trace serialization.
-   */
-  private static List<Message> messagesForMetaStruct(final List<Message> messages) {
-    final Config config = Config.get();
-    final int size = Math.min(messages.size(), config.getAiGuardMaxMessagesLength());
-    if (size < messages.size()) {
-      WafMetricCollector.get().aiGuardTruncated(MESSAGES);
-    }
-    final List<Message> result = new ArrayList<>(size);
-    final int maxContent = config.getAiGuardMaxContentSize();
-    boolean contentTruncated = false;
-    for (int i = messages.size() - size; i < messages.size(); i++) {
-      final Message source = messages.get(i);
-
-      List<ToolCall> toolCalls = source.getToolCalls();
-      if (toolCalls != null) {
-        toolCalls = new ArrayList<>(toolCalls);
-      }
-
-      List<ContentPart> contentParts = source.getContentParts();
-      if (contentParts != null) {
-        final List<ContentPart> truncatedParts = new ArrayList<>(contentParts.size());
-        for (final ContentPart part : contentParts) {
-          if (part.getType() == ContentPart.Type.TEXT
-              && part.getText() != null
-              && part.getText().length() > maxContent) {
-            contentTruncated = true;
-            final String text = part.getText().substring(0, maxContent);
-            truncatedParts.add(ContentPart.text(text));
-          } else {
-            truncatedParts.add(part);
-          }
-        }
-
-        result.add(
-            new Message(source.getRole(), truncatedParts, toolCalls, source.getToolCallId()));
-      } else {
-        String content = source.getContent();
-        if (content != null && content.length() > maxContent) {
-          contentTruncated = true;
-          content = content.substring(0, maxContent);
-        }
-        result.add(new Message(source.getRole(), content, toolCalls, source.getToolCallId()));
-      }
-    }
-    if (contentTruncated) {
-      WafMetricCollector.get().aiGuardTruncated(CONTENT);
-    }
-    return result;
-  }
-
-  /**
-   * Applies the redaction requested by the AI Guard service and reports the outcome on the span.
-   *
-   * <p>This runs before the rest of the response is interpreted on purpose. Every surface that
-   * reports the conversation must report it redacted, and both the blocking decision and the
-   * response validation that precedes it can leave the evaluation through the meta struct: a
-   * blocked evaluation still reports through it, and so does a response the tracer rejects. The
-   * {@link AIGuardAbortError} raised on the blocked path deliberately carries no messages.
-   *
-   * <p>The {@code ai_guard.redacted} tag is set to {@code false} before the request is issued and
-   * only raised here, so an evaluation that fails before this point still reports that nothing was
-   * redacted rather than looking like the kill switch is off.
-   *
-   * @return the telemetry state, {@link AIGuardRedaction#DISABLED} when the kill switch is off, in
-   *     which case no {@code ai_guard.redacted} tag is attached at all
-   */
-  private AIGuardRedaction reportRedaction(
-      final AgentSpan span, final MessageRedactor.Result redaction) {
-    if (!redactor.enabled()) {
-      // No tag at all, so an absent tag ("redaction is off") stays distinguishable from a false
-      // one ("redaction is on and nothing was redacted").
-      return AIGuardRedaction.DISABLED;
-    }
-    if (redaction.skipped > 0) {
-      log.debug(
-          "AI Guard skipped {} redaction replacement(s) that could not be applied",
-          redaction.skipped);
-      // Reported and then forgotten: redaction is best effort and must never fail the evaluation
-      // it rode in on, so this counts an error without counting a failed request.
-      WafMetricCollector.get().aiGuardRedactionErrors(redaction.skipped);
-    }
-    if (!redaction.redacted()) {
-      // The tag was already set to false before the request; nothing to correct.
-      return AIGuardRedaction.NOT_APPLIED;
-    }
-    span.setTag(REDACTED_TAG, true);
-    return AIGuardRedaction.APPLIED;
-  }
-
-  private static boolean isToolCall(final Message message) {
-    return message.getToolCalls() != null || message.getToolCallId() != null;
-  }
-
-  private static String getToolName(final Message current, final List<Message> messages) {
-    if (current.getToolCalls() != null) {
-      // assistant message with tool calls
-      return current.getToolCalls().stream()
-          .map(ToolCall::getFunction)
-          .map(Function::getName)
-          .collect(Collectors.joining(","));
-    }
-    // assistant message with tool output (search the linked tool call in reverse order)
-    final String id = current.getToolCallId();
-    for (int i = messages.size() - 1; i >= 0; i--) {
-      final Message message = messages.get(i);
-      if (message.getToolCalls() != null) {
-        for (final ToolCall toolCall : message.getToolCalls()) {
-          if (toolCall.getId().equals(id)) {
-            return toolCall.getFunction() == null ? null : toolCall.getFunction().getName();
-          }
-        }
-      }
+    public static class BadConfigurationException extends RuntimeException {
+        public BadConfigurationException(final String message) {
+            super(message);
+        }
     }
-    return null;
-  }
 
-  private boolean isBlockingEnabled(final Options options, final Object isBlockingEnabled) {
-    if (isBlockingEnabled == null) {
-      return false;
-    }
-    return options.block() && "true".equalsIgnoreCase(isBlockingEnabled.toString());
-  }
-
-  /**
-   * Applies the {@link ClientIpAddressData} captured during HTTP server request decoration to the
-   * local root span. This is the lazy half of AI Guard client IP collection: {@code
-   * HttpServerDecorator} resolves the IP eagerly and stashes it on the {@link RequestContext}; we
-   * consume it here once an {@code ai_guard} span is created, so IP tags are not added to spans of
-   * non-AI requests in services that have AI Guard enabled.
-   */
-  private static void applyClientIpTags(final AgentSpan localRootSpan) {
-    final RequestContext requestContext = localRootSpan.getRequestContext();
-    if (requestContext == null) {
-      return;
-    }
-    final ClientIpAddressData clientIpAddressData = requestContext.getClientIpAddressData();
-    if (clientIpAddressData == null) {
-      return;
-    }
-    final String peerIp = clientIpAddressData.getPeerIp();
-    if (peerIp != null && localRootSpan.getTag(Tags.NETWORK_CLIENT_IP) == null) {
-      localRootSpan.setTag(Tags.NETWORK_CLIENT_IP, peerIp);
-    }
-    final String inferredClientIp = clientIpAddressData.getInferredClientIp();
-    if (inferredClientIp != null && localRootSpan.getTag(Tags.HTTP_CLIENT_IP) == null) {
-      localRootSpan.setTag(Tags.HTTP_CLIENT_IP, inferredClientIp);
+    static final String SPAN_NAME = "ai_guard";
+    static final String TARGET_TAG = "ai_guard.target";
+    static final String TOOL_TAG = "ai_guard.tool_name";
+    static final String ACTION_TAG = "ai_guard.action";
+    static final String REASON_TAG = "ai_guard.reason";
+    static final String BLOCKED_TAG = "ai_guard.blocked";
+    static final String REDACTED_TAG = "ai_guard.redacted";
+
+    static final String RESPONSE_REDACTION_REPLACEMENTS = "redaction_replacements";
+
+    static final String META_STRUCT_TAG = "ai_guard";
+    static final String META_STRUCT_MESSAGES = "messages";
+    static final String META_STRUCT_CATEGORIES = "attack_categories";
+    static final String META_STRUCT_SDS = "sds";
+    static final String META_STRUCT_TAG_PROBS = "tag_probs";
+
+    /**
+     * Anomaly detection tags copied from the local root span onto every {@code ai_guard} span with
+     * the {@code ai_guard.} prefix, so the AI Guard backend can correlate AI Guard requests with the
+     * request context (client IP, user, session) without depending on the local root span.
+     */
+    static final String[] ANOMALY_DETECTION_TAGS = {
+        Tags.HTTP_CLIENT_IP, Tags.NETWORK_CLIENT_IP, Tags.HTTP_USER_AGENT, "usr.id", "usr.session_id"
+    };
+
+    public static void install() {
+        final Config config = Config.get();
+        final String apiKey = config.getApiKey();
+        final String appKey = config.getApplicationKey();
+        if (isBlank(apiKey) || isBlank(appKey)) {
+            throw new BadConfigurationException(
+                    "AI Guard: Missing api and/or application key, use DD_API_KEY and DD_APP_KEY");
+        }
+        String endpoint = config.getAiGuardEndpoint();
+        if (isBlank(endpoint)) {
+            endpoint = String.format("https://app.%s/api/v2/ai-guard", config.getSite());
+        }
+        final Map<String, String> headers = mapOf(
+                "DD-API-KEY",
+                apiKey,
+                "DD-APPLICATION-KEY",
+                appKey,
+                "DD-AI-GUARD-VERSION",
+                TRACER_VERSION,
+                "DD-AI-GUARD-SOURCE",
+                "SDK",
+                "DD-AI-GUARD-LANGUAGE",
+                "jvm");
+        final HttpUrl url =
+                HttpUrl.get(endpoint).newBuilder().addPathSegment("evaluate").build();
+        final int timeout = config.getAiGuardTimeout();
+        final OkHttpClient client = buildClient(url, timeout);
+        Installer.install(new AIGuardInternal(url, headers, client));
+    }
+
+    /** Used by tests to reset status */
+    static void uninstall() {
+        Installer.install(new NoOpEvaluator());
+    }
+
+    private final HttpUrl url;
+    private final Moshi moshi;
+    private final OkHttpClient client;
+    private final Map<String, String> meta;
+    private final Map<String, String> headers;
+    private final MessageRedactor redactor;
+
+    AIGuardInternal(final HttpUrl url, final Map<String, String> headers, final OkHttpClient client) {
+        this.url = url;
+        this.headers = headers;
+        this.client = client;
+        this.moshi = new Moshi.Builder().add(new AIGuardFactory()).build();
+        final Config config = Config.get();
+        this.meta = mapOf("service", config.getServiceName(), "env", config.getEnv());
+        this.redactor =
+                config.isAiGuardRedactionEnabled() ? new MessageRedactor.DefaultRedactor() : new MessageRedactor.NoOp();
+    }
+
+    /**
+     * Creates a deep copy of the messages before storing them in the metastruct to avoid concurrent
+     * modifications prior to trace serialization.
+     */
+    private static List<Message> messagesForMetaStruct(final List<Message> messages) {
+        final Config config = Config.get();
+        final int size = Math.min(messages.size(), config.getAiGuardMaxMessagesLength());
+        if (size < messages.size()) {
+            WafMetricCollector.get().aiGuardTruncated(MESSAGES);
+        }
+        final List<Message> result = new ArrayList<>(size);
+        final int maxContent = config.getAiGuardMaxContentSize();
+        boolean contentTruncated = false;
+        for (int i = messages.size() - size; i < messages.size(); i++) {
+            final Message source = messages.get(i);
+
+            List<ToolCall> toolCalls = source.getToolCalls();
+            if (toolCalls != null) {
+                toolCalls = new ArrayList<>(toolCalls);
+            }
+
+            List<ContentPart> contentParts = source.getContentParts();
+            if (contentParts != null) {
+                final List<ContentPart> truncatedParts = new ArrayList<>(contentParts.size());
+                for (final ContentPart part : contentParts) {
+                    if (part.getType() == ContentPart.Type.TEXT
+                            && part.getText() != null
+                            && part.getText().length() > maxContent) {
+                        contentTruncated = true;
+                        final String text = part.getText().substring(0, maxContent);
+                        truncatedParts.add(ContentPart.text(text));
+                    } else {
+                        truncatedParts.add(part);
+                    }
+                }
+
+                result.add(new Message(source.getRole(), truncatedParts, toolCalls, source.getToolCallId()));
+            } else {
+                String content = source.getContent();
+                if (content != null && content.length() > maxContent) {
+                    contentTruncated = true;
+                    content = content.substring(0, maxContent);
+                }
+                result.add(new Message(source.getRole(), content, toolCalls, source.getToolCallId()));
+            }
+        }
+        if (contentTruncated) {
+            WafMetricCollector.get().aiGuardTruncated(CONTENT);
+        }
+        return result;
+    }
+
+    /**
+     * Applies the redaction requested by the AI Guard service and reports the outcome on the span.
+     *
+     * <p>This runs before the rest of the response is interpreted on purpose. Every surface that
+     * reports the conversation must report it redacted, and both the blocking decision and the
+     * response validation that precedes it can leave the evaluation through the meta struct: a
+     * blocked evaluation still reports through it, and so does a response the tracer rejects. The
+     * {@link AIGuardAbortError} raised on the blocked path deliberately carries no messages.
+     *
+     * <p>The {@code ai_guard.redacted} tag is set to {@code false} before the request is issued and
+     * only raised here, so an evaluation that fails before this point still reports that nothing was
+     * redacted rather than looking like the kill switch is off.
+     *
+     * @return the telemetry state, {@link AIGuardRedaction#DISABLED} when the kill switch is off, in
+     *     which case no {@code ai_guard.redacted} tag is attached at all
+     */
+    private AIGuardRedaction reportRedaction(final AgentSpan span, final MessageRedactor.Result redaction) {
+        if (!redactor.enabled()) {
+            // No tag at all, so an absent tag ("redaction is off") stays distinguishable from a false
+            // one ("redaction is on and nothing was redacted").
+            return AIGuardRedaction.DISABLED;
+        }
+        if (redaction.skipped > 0) {
+            log.debug("AI Guard skipped {} redaction replacement(s) that could not be applied", redaction.skipped);
+            // Reported and then forgotten: redaction is best effort and must never fail the evaluation
+            // it rode in on, so this counts an error without counting a failed request.
+            WafMetricCollector.get().aiGuardRedactionErrors(redaction.skipped);
+        }
+        if (!redaction.redacted()) {
+            // The tag was already set to false before the request; nothing to correct.
+            return AIGuardRedaction.NOT_APPLIED;
+        }
+        span.setTag(REDACTED_TAG, true);
+        return AIGuardRedaction.APPLIED;
     }
-  }
-
-  private static void copyAnomalyDetectionTags(
-      final AgentSpan span, final AgentSpan localRootSpan) {
-    for (final String tag : ANOMALY_DETECTION_TAGS) {
-      final Object value = localRootSpan.getTag(tag);
-      if (value != null) {
-        span.setTag("ai_guard." + tag, value.toString());
-      }
+
+    private static boolean isToolCall(final Message message) {
+        return message.getToolCalls() != null || message.getToolCallId() != null;
     }
-  }
 
-  @Override
-  public Evaluation evaluate(final List<Message> messages, final Options options) {
-    if (messages == null || messages.isEmpty()) {
-      throw new IllegalArgumentException("Messages must not be empty");
+    private static String getToolName(final Message current, final List<Message> messages) {
+        if (current.getToolCalls() != null) {
+            // assistant message with tool calls
+            return current.getToolCalls().stream()
+                    .map(ToolCall::getFunction)
+                    .map(Function::getName)
+                    .collect(Collectors.joining(","));
+        }
+        // assistant message with tool output (search the linked tool call in reverse order)
+        final String id = current.getToolCallId();
+        for (int i = messages.size() - 1; i >= 0; i--) {
+            final Message message = messages.get(i);
+            if (message.getToolCalls() != null) {
+                for (final ToolCall toolCall : message.getToolCalls()) {
+                    if (toolCall.getId().equals(id)) {
+                        return toolCall.getFunction() == null
+                                ? null
+                                : toolCall.getFunction().getName();
+                    }
+                }
+            }
+        }
+        return null;
     }
-    final AgentTracer.TracerAPI tracer = AgentTracer.get();
-    final AgentTracer.SpanBuilder builder = tracer.buildSpan(SPAN_NAME, SPAN_NAME);
-    final AgentSpan parent = AgentTracer.activeSpan();
-    if (parent != null) {
-      builder.asChildOf(parent.spanContext());
+
+    private boolean isBlockingEnabled(final Options options, final Object isBlockingEnabled) {
+        if (isBlockingEnabled == null) {
+            return false;
+        }
+        return options.block() && "true".equalsIgnoreCase(isBlockingEnabled.toString());
+    }
+
+    /**
+     * Applies the {@link ClientIpAddressData} captured during HTTP server request decoration to the
+     * local root span. This is the lazy half of AI Guard client IP collection: {@code
+     * HttpServerDecorator} resolves the IP eagerly and stashes it on the {@link RequestContext}; we
+     * consume it here once an {@code ai_guard} span is created, so IP tags are not added to spans of
+     * non-AI requests in services that have AI Guard enabled.
+     */
+    private static void applyClientIpTags(final AgentSpan localRootSpan) {
+        final RequestContext requestContext = localRootSpan.getRequestContext();
+        if (requestContext == null) {
+            return;
+        }
+        final ClientIpAddressData clientIpAddressData = requestContext.getClientIpAddressData();
+        if (clientIpAddressData == null) {
+            return;
+        }
+        final String peerIp = clientIpAddressData.getPeerIp();
+        if (peerIp != null && localRootSpan.getTag(Tags.NETWORK_CLIENT_IP) == null) {
+            localRootSpan.setTag(Tags.NETWORK_CLIENT_IP, peerIp);
+        }
+        final String inferredClientIp = clientIpAddressData.getInferredClientIp();
+        if (inferredClientIp != null && localRootSpan.getTag(Tags.HTTP_CLIENT_IP) == null) {
+            localRootSpan.setTag(Tags.HTTP_CLIENT_IP, inferredClientIp);
+        }
     }
-    final AgentSpan span = builder.start();
-    final AgentSpan localRootSpan = span.getLocalRootSpan();
-    if (localRootSpan != null) {
-      localRootSpan.setTag(Tags.AI_GUARD_KEEP, true);
-      localRootSpan.setTag(Tags.AI_GUARD_EVENT, true);
-      localRootSpan.setTag(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.AI_GUARD);
-      applyClientIpTags(localRootSpan);
-      // copyAnomalyDetectionTags MUST run after applyClientIpTags, to make
-      // sure client IP tags were populated.
-      copyAnomalyDetectionTags(span, localRootSpan);
+
+    private static void copyAnomalyDetectionTags(final AgentSpan span, final AgentSpan localRootSpan) {
+        for (final String tag : ANOMALY_DETECTION_TAGS) {
+            final Object value = localRootSpan.getTag(tag);
+            if (value != null) {
+                span.setTag("ai_guard." + tag, value.toString());
+            }
+        }
     }
-    List<Message> finalMessages = messages;
-    // Classifies the ai_guard.error metric when a raise below escapes. A transport failure, and
-    // anything the tracer cannot attribute to the response, keeps the default; the raises driven
-    // by the response itself narrow it first.
-    AIGuardError errorType = AIGuardError.CLIENT_ERROR;
-    try (final ContextScope scope = tracer.activateSpan(span)) {
-      final Message last = messages.get(messages.size() - 1);
-      if (isToolCall(last)) {
-        span.setTag(TARGET_TAG, "tool");
-        final String toolName = getToolName(last, messages);
-        if (toolName != null) {
-          span.setTag(TOOL_TAG, toolName);
-        }
-      } else {
-        span.setTag(TARGET_TAG, "prompt");
-      }
-      if (redactor.enabled()) {
-        // Reported before the request goes out so an evaluation that fails, and therefore redacts
-        // nothing, still says so. An absent tag stays reserved for the kill switch being off.
-        span.setTag(REDACTED_TAG, false);
-      }
-      final Map<String, Object> metaStruct = new HashMap<>(2);
-      span.setMetaStruct(META_STRUCT_TAG, metaStruct);
-      final Request.Builder request =
-          new Request.Builder()
-              .url(url)
-              .method("POST", new MoshiJsonRequestBody(moshi, messages, meta));
-      headers.forEach(request::header);
-      try (final Response response = client.newCall(request.build()).execute()) {
-        final Map<String, Object> result;
-        try {
-          result = parseResponseBody(response);
-        } catch (final Exception e) {
-          // A body we cannot read is a response problem, not a transport one, unless the status
-          // code already explains the failure on its own.
-          errorType = response.isSuccessful() ? AIGuardError.BAD_RESPONSE : AIGuardError.BAD_STATUS;
-          throw e;
-        }
-        // Resolved before anything else that can throw: once the service has told us what to
-        // redact, every reporting surface must carry the redacted conversation, including on the
-        // paths that reject the rest of the response.
-        final Object rawReplacements = result.get(RESPONSE_REDACTION_REPLACEMENTS);
-        // Reported back to the caller verbatim, including entries redaction could not apply.
-        final List<?> redactionReplacements =
-            rawReplacements instanceof List ? (List<?>) rawReplacements : null;
-        // The raw value goes to the redactor: a present payload that is not an array is a
-        // backend contract break the redactor counts, not something to drop silently.
-        final MessageRedactor.Result redaction = redactor.redact(messages, rawReplacements);
-        finalMessages = redaction.messages;
-        final AIGuardRedaction redactionState = reportRedaction(span, redaction);
-        final Action action;
-        final String reason;
-        final List<String> tags;
-        final List<?> sdsFindings;
-        final Map<String, Number> tagProbs;
-        try {
-          // Everything here reads the parsed body, so a raise means the service answered with
-          // something that does not honour the response contract.
-          final String actionStr = (String) result.get("action");
-          if (actionStr == null) {
-            throw new IllegalArgumentException("Action field is missing in the response");
-          }
-          action = Action.valueOf(actionStr);
-          reason = (String) result.get("reason");
-          @SuppressWarnings("unchecked")
-          final List<String> parsedTags = (List<String>) result.get("tags");
-          tags = parsedTags;
-          sdsFindings = (List<?>) result.get("sds_findings");
-          @SuppressWarnings("unchecked")
-          final Map<String, Number> parsedTagProbs = (Map<String, Number>) result.get("tag_probs");
-          tagProbs = parsedTagProbs;
+
+    @Override
+    public Evaluation evaluate(final List<Message> messages, final Options options) {
+        if (messages == null || messages.isEmpty()) {
+            throw new IllegalArgumentException("Messages must not be empty");
+        }
+        final AgentTracer.TracerAPI tracer = AgentTracer.get();
+        final AgentTracer.SpanBuilder builder = tracer.buildSpan(SPAN_NAME, SPAN_NAME);
+        final AgentSpan parent = AgentTracer.activeSpan();
+        if (parent != null) {
+            builder.asChildOf(parent.spanContext());
+        }
+        final AgentSpan span = builder.start();
+        final AgentSpan localRootSpan = span.getLocalRootSpan();
+        if (localRootSpan != null) {
+            localRootSpan.setTag(Tags.AI_GUARD_KEEP, true);
+            localRootSpan.setTag(Tags.AI_GUARD_EVENT, true);
+            localRootSpan.setTag(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.AI_GUARD);
+            applyClientIpTags(localRootSpan);
+            // copyAnomalyDetectionTags MUST run after applyClientIpTags, to make
+            // sure client IP tags were populated.
+            copyAnomalyDetectionTags(span, localRootSpan);
+        }
+        List<Message> finalMessages = messages;
+        // Classifies the ai_guard.error metric when a raise below escapes. A transport failure, and
+        // anything the tracer cannot attribute to the response, keeps the default; the raises driven
+        // by the response itself narrow it first.
+        AIGuardError errorType = AIGuardError.CLIENT_ERROR;
+        try (final ContextScope scope = tracer.activateSpan(span)) {
+            final Message last = messages.get(messages.size() - 1);
+            if (isToolCall(last)) {
+                span.setTag(TARGET_TAG, "tool");
+                final String toolName = getToolName(last, messages);
+                if (toolName != null) {
+                    span.setTag(TOOL_TAG, toolName);
+                }
+            } else {
+                span.setTag(TARGET_TAG, "prompt");
+            }
+            if (redactor.enabled()) {
+                // Reported before the request goes out so an evaluation that fails, and therefore redacts
+                // nothing, still says so. An absent tag stays reserved for the kill switch being off.
+                span.setTag(REDACTED_TAG, false);
+            }
+            final Map<String, Object> metaStruct = new HashMap<>(2);
+            span.setMetaStruct(META_STRUCT_TAG, metaStruct);
+            final Request.Builder request =
+                    new Request.Builder().url(url).method("POST", new MoshiJsonRequestBody(moshi, messages, meta));
+            headers.forEach(request::header);
+            try (final Response response = client.newCall(request.build()).execute()) {
+                final Map<String, Object> result;
+                try {
+                    result = parseResponseBody(response);
+                } catch (final Exception e) {
+                    // A body we cannot read is a response problem, not a transport one, unless the status
+                    // code already explains the failure on its own.
+                    errorType = response.isSuccessful() ? AIGuardError.BAD_RESPONSE : AIGuardError.BAD_STATUS;
+                    throw e;
+                }
+                // Resolved before anything else that can throw: once the service has told us what to
+                // redact, every reporting surface must carry the redacted conversation, including on the
+                // paths that reject the rest of the response.
+                final Object rawReplacements = result.get(RESPONSE_REDACTION_REPLACEMENTS);
+                // Reported back to the caller verbatim, including entries redaction could not apply.
+                final List<?> redactionReplacements =
+                        rawReplacements instanceof List ? (List<?>) rawReplacements : null;
+                // The raw value goes to the redactor: a present payload that is not an array is a
+                // backend contract break the redactor counts, not something to drop silently.
+                final MessageRedactor.Result redaction = redactor.redact(messages, rawReplacements);
+                finalMessages = redaction.messages;
+                final AIGuardRedaction redactionState = reportRedaction(span, redaction);
+                final Action action;
+                final String reason;
+                final List<String> tags;
+                final List<?> sdsFindings;
+                final Map<String, Number> tagProbs;
+                try {
+                    // Everything here reads the parsed body, so a raise means the service answered with
+                    // something that does not honour the response contract.
+                    final String actionStr = (String) result.get("action");
+                    if (actionStr == null) {
+                        throw new IllegalArgumentException("Action field is missing in the response");
+                    }
+                    action = Action.valueOf(actionStr);
+                    reason = (String) result.get("reason");
+                    @SuppressWarnings("unchecked")
+                    final List<String> parsedTags = (List<String>) result.get("tags");
+                    tags = parsedTags;
+                    sdsFindings = (List<?>) result.get("sds_findings");
+                    @SuppressWarnings("unchecked")
+                    final Map<String, Number> parsedTagProbs = (Map<String, Number>) result.get("tag_probs");
+                    tagProbs = parsedTagProbs;
+                } catch (final Exception e) {
+                    errorType = AIGuardError.BAD_RESPONSE;
+                    throw e;
+                }
+                span.setTag(ACTION_TAG, action);
+                if (reason != null) {
+                    span.setTag(REASON_TAG, reason);
+                }
+                if (tags != null && !tags.isEmpty()) {
+                    metaStruct.put(META_STRUCT_CATEGORIES, tags);
+                }
+                if (tagProbs != null && !tagProbs.isEmpty()) {
+                    metaStruct.put(META_STRUCT_TAG_PROBS, tagProbs);
+                }
+                if (sdsFindings != null && !sdsFindings.isEmpty()) {
+                    metaStruct.put(META_STRUCT_SDS, sdsFindings);
+                }
+                final boolean shouldBlock =
+                        isBlockingEnabled(options, result.get("is_blocking_enabled")) && action != Action.ALLOW;
+                WafMetricCollector.get().aiGuardRequest(action, shouldBlock, redactionState);
+                if (shouldBlock) {
+                    span.setTag(BLOCKED_TAG, true);
+                    throw new AIGuardAbortError(action, reason, tags, tagProbs, sdsFindings);
+                }
+                return new Evaluation(
+                        action, reason, tags, tagProbs, sdsFindings, redaction.messages, redactionReplacements);
+            } finally {
+                metaStruct.put(META_STRUCT_MESSAGES, messagesForMetaStruct(finalMessages));
+            }
+        } catch (AIGuardAbortError e) {
+            span.addThrowable(e);
+            throw e;
+        } catch (AIGuardClientError e) {
+            WafMetricCollector.get().aiGuardError(errorType);
+            span.addThrowable(e);
+            throw e;
         } catch (final Exception e) {
-          errorType = AIGuardError.BAD_RESPONSE;
-          throw e;
-        }
-        span.setTag(ACTION_TAG, action);
-        if (reason != null) {
-          span.setTag(REASON_TAG, reason);
-        }
-        if (tags != null && !tags.isEmpty()) {
-          metaStruct.put(META_STRUCT_CATEGORIES, tags);
-        }
-        if (tagProbs != null && !tagProbs.isEmpty()) {
-          metaStruct.put(META_STRUCT_TAG_PROBS, tagProbs);
-        }
-        if (sdsFindings != null && !sdsFindings.isEmpty()) {
-          metaStruct.put(META_STRUCT_SDS, sdsFindings);
-        }
-        final boolean shouldBlock =
-            isBlockingEnabled(options, result.get("is_blocking_enabled")) && action != Action.ALLOW;
-        WafMetricCollector.get().aiGuardRequest(action, shouldBlock, redactionState);
-        if (shouldBlock) {
-          span.setTag(BLOCKED_TAG, true);
-          throw new AIGuardAbortError(action, reason, tags, tagProbs, sdsFindings);
-        }
-        return new Evaluation(
-            action, reason, tags, tagProbs, sdsFindings, redaction.messages, redactionReplacements);
-      } finally {
-        metaStruct.put(META_STRUCT_MESSAGES, messagesForMetaStruct(finalMessages));
-      }
-    } catch (AIGuardAbortError e) {
-      span.addThrowable(e);
-      throw e;
-    } catch (AIGuardClientError e) {
-      WafMetricCollector.get().aiGuardError(errorType);
-      span.addThrowable(e);
-      throw e;
-    } catch (final Exception e) {
-      WafMetricCollector.get().aiGuardError(errorType);
-      final AIGuardClientError error =
-          new AIGuardClientError(
-              "AI Guard service returned unexpected response: " + e.getMessage(), e);
-      span.addThrowable(error);
-      throw error;
-    } finally {
-      span.finish();
+            WafMetricCollector.get().aiGuardError(errorType);
+            final AIGuardClientError error =
+                    new AIGuardClientError("AI Guard service returned unexpected response: " + e.getMessage(), e);
+            span.addThrowable(error);
+            throw error;
+        } finally {
+            span.finish();
+        }
     }
-  }
 
-  @SuppressWarnings("unchecked")
-  private Map<String, Object> parseResponseBody(final Response response) throws IOException {
-    final ResponseBody body = response.body();
-    if (body == null) {
-      throw fail(response.code(), null);
-    }
-    final JsonReader reader = JsonReader.of(body.source());
-    final Map<?, ?> parsedBody = moshi.adapter(Map.class).fromJson(reader);
-    final Object errors = parsedBody.get("errors");
-    if (errors != null) {
-      throw fail(response.code(), errors);
+    @SuppressWarnings("unchecked")
+    private Map<String, Object> parseResponseBody(final Response response) throws IOException {
+        final ResponseBody body = response.body();
+        if (body == null) {
+            throw fail(response.code(), null);
+        }
+        final JsonReader reader = JsonReader.of(body.source());
+        final Map<?, ?> parsedBody = moshi.adapter(Map.class).fromJson(reader);
+        final Object errors = parsedBody.get("errors");
+        if (errors != null) {
+            throw fail(response.code(), errors);
+        }
+        final Map<?, ?> data = (Map<?, ?>) parsedBody.get("data");
+        return (Map<String, Object>) data.get("attributes");
     }
-    final Map<?, ?> data = (Map<?, ?>) parsedBody.get("data");
-    return (Map<String, Object>) data.get("attributes");
-  }
-
-  private AIGuardClientError fail(final int statusCode, final Object errors) {
-    return new AIGuardClientError("AI Guard service call failed, status: " + statusCode, errors);
-  }
 
-  private static OkHttpClient buildClient(final HttpUrl url, final long timeout) {
-    return OkHttpUtils.buildHttpClient(url, timeout).newBuilder().build();
-  }
+    private AIGuardClientError fail(final int statusCode, final Object errors) {
+        return new AIGuardClientError("AI Guard service call failed, status: " + statusCode, errors);
+    }
 
-  private static Map<String, String> mapOf(final String... props) {
-    if (props.length % 2 != 0) {
-      throw new IllegalArgumentException("Props must be even");
+    private static OkHttpClient buildClient(final HttpUrl url, final long timeout) {
+        return OkHttpUtils.buildHttpClient(url, timeout).newBuilder().build();
     }
-    final Map<String, String> map = new HashMap<>(props.length << 1);
-    for (int i = 0; i < props.length; ) {
-      map.put(props[i++], props[i++]);
+
+    private static Map<String, String> mapOf(final String... props) {
+        if (props.length % 2 != 0) {
+            throw new IllegalArgumentException("Props must be even");
+        }
+        final Map<String, String> map = new HashMap<>(props.length << 1);
+        for (int i = 0; i < props.length; ) {
+            map.put(props[i++], props[i++]);
+        }
+        return map;
     }
-    return map;
-  }
 
-  private static class Installer extends AIGuard {
-    public static void install(final Evaluator evaluator) {
-      AIGuard.EVALUATOR = evaluator;
+    private static class Installer extends AIGuard {
+        public static void install(final Evaluator evaluator) {
+            AIGuard.EVALUATOR = evaluator;
+        }
     }
-  }
 
-  static class AIGuardFactory implements JsonAdapter.Factory {
+    static class AIGuardFactory implements JsonAdapter.Factory {
 
-    @Nullable
-    @Override
-    public JsonAdapter<?> create(
-        final Type type, final Set<? extends Annotation> annotations, final Moshi moshi) {
-      final Class<?> rawType = Types.getRawType(type);
-      if (rawType != AIGuard.Message.class) {
-        return null;
-      }
-      return new MessageAdapter(moshi.adapter(AIGuard.ToolCall.class)).nullSafe();
+        @Nullable
+        @Override
+        public JsonAdapter<?> create(final Type type, final Set<? extends Annotation> annotations, final Moshi moshi) {
+            final Class<?> rawType = Types.getRawType(type);
+            if (rawType != AIGuard.Message.class) {
+                return null;
+            }
+            return new MessageAdapter(moshi.adapter(AIGuard.ToolCall.class)).nullSafe();
+        }
     }
-  }
 
-  static class MessageAdapter extends JsonAdapter<Message> {
+    static class MessageAdapter extends JsonAdapter<Message> {
 
-    private final JsonAdapter<AIGuard.ToolCall> toolCallAdapter;
+        private final JsonAdapter<AIGuard.ToolCall> toolCallAdapter;
 
-    MessageAdapter(final JsonAdapter<ToolCall> toolCallAdapter) {
-      this.toolCallAdapter = toolCallAdapter;
-    }
+        MessageAdapter(final JsonAdapter<ToolCall> toolCallAdapter) {
+            this.toolCallAdapter = toolCallAdapter;
+        }
 
-    @Nullable
-    @Override
-    public Message fromJson(JsonReader reader) throws IOException {
-      throw new UnsupportedOperationException("Serializing only adapter");
-    }
+        @Nullable
+        @Override
+        public Message fromJson(JsonReader reader) throws IOException {
+            throw new UnsupportedOperationException("Serializing only adapter");
+        }
 
-    @Override
-    public void toJson(final JsonWriter writer, final Message value) throws IOException {
-      writer.beginObject();
-      writeValue(writer, "role", value.getRole());
-
-      if (value.getContentParts() != null) {
-        writeContentParts(writer, "content", value.getContentParts());
-      } else {
-        writeValue(writer, "content", value.getContent());
-      }
-
-      writeArray(writer, "tool_calls", value.getToolCalls());
-      writeValue(writer, "tool_call_id", value.getToolCallId());
-      writer.endObject();
-    }
+        @Override
+        public void toJson(final JsonWriter writer, final Message value) throws IOException {
+            writer.beginObject();
+            writeValue(writer, "role", value.getRole());
 
-    private void writeContentParts(
-        final JsonWriter writer, final String name, final List<ContentPart> contentParts)
-        throws IOException {
-      writer.name(name);
-      writer.beginArray();
-      for (final ContentPart part : contentParts) {
-        writer.beginObject();
-
-        writer.name("type");
-        writer.value(part.getType().toString());
-
-        if (part.getType() == ContentPart.Type.TEXT) {
-          writer.name("text");
-          writer.value(part.getText());
-        } else if (part.getType() == ContentPart.Type.IMAGE_URL) {
-          writer.name("image_url");
-          writer.beginObject();
-          writer.name("url");
-          writer.value(part.getImageUrl().getUrl());
-          writer.endObject();
-        }
-
-        writer.endObject();
-      }
-      writer.endArray();
-    }
+            if (value.getContentParts() != null) {
+                writeContentParts(writer, "content", value.getContentParts());
+            } else {
+                writeValue(writer, "content", value.getContent());
+            }
 
-    private void writeValue(final JsonWriter writer, final String name, final Object value)
-        throws IOException {
-      if (value != null) {
-        writer.name(name);
-        writer.jsonValue(value);
-      }
-    }
+            writeArray(writer, "tool_calls", value.getToolCalls());
+            writeValue(writer, "tool_call_id", value.getToolCallId());
+            writer.endObject();
+        }
+
+        private void writeContentParts(final JsonWriter writer, final String name, final List<ContentPart> contentParts)
+                throws IOException {
+            writer.name(name);
+            writer.beginArray();
+            for (final ContentPart part : contentParts) {
+                writer.beginObject();
+
+                writer.name("type");
+                writer.value(part.getType().toString());
+
+                if (part.getType() == ContentPart.Type.TEXT) {
+                    writer.name("text");
+                    writer.value(part.getText());
+                } else if (part.getType() == ContentPart.Type.IMAGE_URL) {
+                    writer.name("image_url");
+                    writer.beginObject();
+                    writer.name("url");
+                    writer.value(part.getImageUrl().getUrl());
+                    writer.endObject();
+                }
+
+                writer.endObject();
+            }
+            writer.endArray();
+        }
+
+        private void writeValue(final JsonWriter writer, final String name, final Object value) throws IOException {
+            if (value != null) {
+                writer.name(name);
+                writer.jsonValue(value);
+            }
+        }
 
-    private void writeArray(final JsonWriter writer, final String name, final List<ToolCall> value)
-        throws IOException {
-      if (value != null) {
-        writer.name(name);
-        writer.beginArray();
-        for (final ToolCall toolCall : value) {
-          toolCallAdapter.toJson(writer, toolCall);
+        private void writeArray(final JsonWriter writer, final String name, final List<ToolCall> value)
+                throws IOException {
+            if (value != null) {
+                writer.name(name);
+                writer.beginArray();
+                for (final ToolCall toolCall : value) {
+                    toolCallAdapter.toJson(writer, toolCall);
+                }
+                writer.endArray();
+            }
         }
-        writer.endArray();
-      }
     }
-  }
 
-  static class MoshiJsonRequestBody extends RequestBody {
+    static class MoshiJsonRequestBody extends RequestBody {
 
-    private static final MediaType JSON = MediaType.parse("application/json");
+        private static final MediaType JSON = MediaType.parse("application/json");
 
-    private final Moshi moshi;
-    private final Map<String, String> meta;
-    private final Collection<Message> messages;
+        private final Moshi moshi;
+        private final Map<String, String> meta;
+        private final Collection<Message> messages;
 
-    public MoshiJsonRequestBody(
-        final Moshi moshi, final Collection<Message> messages, final Map<String, String> meta) {
-      this.moshi = moshi;
-      this.messages = messages;
-      this.meta = meta;
-    }
+        public MoshiJsonRequestBody(
+                final Moshi moshi, final Collection<Message> messages, final Map<String, String> meta) {
+            this.moshi = moshi;
+            this.messages = messages;
+            this.meta = meta;
+        }
 
-    @Nullable
-    @Override
-    public MediaType contentType() {
-      return JSON;
-    }
+        @Nullable
+        @Override
+        public MediaType contentType() {
+            return JSON;
+        }
 
-    @Override
-    public void writeTo(final BufferedSink sink) throws IOException {
-      final JsonWriter writer = JsonWriter.of(sink);
-      writer.beginObject(); // request
-      writer.name("data");
-      writer.beginObject(); // data
-      writer.name("attributes");
-      writer.beginObject(); // attributes
-      writer.name("messages");
-      moshi.adapter(Object.class).toJson(writer, messages);
-      writer.name("meta");
-      writer.jsonValue(meta);
-      writer.endObject(); // attributes
-      writer.endObject(); // data
-      writer.endObject(); // request
+        @Override
+        public void writeTo(final BufferedSink sink) throws IOException {
+            final JsonWriter writer = JsonWriter.of(sink);
+            writer.beginObject(); // request
+            writer.name("data");
+            writer.beginObject(); // data
+            writer.name("attributes");
+            writer.beginObject(); // attributes
+            writer.name("messages");
+            moshi.adapter(Object.class).toJson(writer, messages);
+            writer.name("meta");
+            writer.jsonValue(meta);
+            writer.endObject(); // attributes
+            writer.endObject(); // data
+            writer.endObject(); // request
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardSystem.java b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardSystem.java
index 43dc227bb07..4db0787abd1 100644
--- a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardSystem.java
+++ b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardSystem.java
@@ -2,13 +2,13 @@
 
 public abstract class AIGuardSystem {
 
-  private AIGuardSystem() {}
+    private AIGuardSystem() {}
 
-  public static void start() {
-    initializeSDK();
-  }
+    public static void start() {
+        initializeSDK();
+    }
 
-  private static void initializeSDK() {
-    AIGuardInternal.install();
-  }
+    private static void initializeSDK() {
+        AIGuardInternal.install();
+    }
 }
diff --git a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/MessageRedactor.java b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/MessageRedactor.java
index 1c98c47b1bb..dbc9dc098cd 100644
--- a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/MessageRedactor.java
+++ b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/MessageRedactor.java
@@ -16,334 +16,325 @@
 
 public interface MessageRedactor {
 
-  /** Outcome of a redaction pass. */
-  final class Result {
+    /** Outcome of a redaction pass. */
+    final class Result {
 
-    /** The redacted messages, or the very same list that was passed in when nothing was applied. */
-    final List<Message> messages;
+        /** The redacted messages, or the very same list that was passed in when nothing was applied. */
+        final List<Message> messages;
 
-    /** Number of paths successfully overwritten. */
-    final int applied;
+        /** Number of paths successfully overwritten. */
+        final int applied;
 
-    /** Number of entries skipped fail-safe (unresolvable, non-string, missing or conflicting). */
-    final int skipped;
+        /** Number of entries skipped fail-safe (unresolvable, non-string, missing or conflicting). */
+        final int skipped;
 
-    private Result(final List<Message> messages, final int applied, final int skipped) {
-      this.messages = messages;
-      this.applied = applied;
-      this.skipped = skipped;
-    }
-
-    /** Whether at least one replacement was applied. */
-    boolean redacted() {
-      return applied > 0;
-    }
+        private Result(final List<Message> messages, final int applied, final int skipped) {
+            this.messages = messages;
+            this.applied = applied;
+            this.skipped = skipped;
+        }
 
-    private static Result nothingApplied(final List<Message> messages, final int skipped) {
-      return new Result(messages, 0, skipped);
-    }
-  }
-
-  /**
-   * @param replacements the raw {@code redaction_replacements} value from the response, exactly as
-   *     it was parsed. It is deliberately untyped: a present value that is not an array is a
-   *     backend contract break, and only an enabled redactor is in a position to count it.
-   */
-  Result redact(final List<Message> messages, @Nullable final Object replacements);
-
-  /**
-   * Whether redaction is active. When {@code false} the {@code ai_guard.redacted} tag is not
-   * reported at all, so an absent tag means "redaction is off", which stays distinguishable from a
-   * {@code false} one meaning "redaction is on and nothing was redacted".
-   */
-  boolean enabled();
-
-  class NoOp implements MessageRedactor {
-
-    @Override
-    public Result redact(final List<Message> messages, final @Nullable Object replacements) {
-      // The kill switch is off, so no redaction work is attempted and no redaction error is
-      // reported, not even for a malformed payload.
-      return Result.nothingApplied(messages, 0);
-    }
+        /** Whether at least one replacement was applied. */
+        boolean redacted() {
+            return applied > 0;
+        }
 
-    @Override
-    public boolean enabled() {
-      return false;
-    }
-  }
-
-  /**
-   * Applies the {@code redaction_replacements} returned by the AI Guard service to a message list.
-   *
-   * <p>The service returns the <em>fully redacted</em> string for each affected path, so this class
-   * never slices, concatenates, or reasons about offsets and string encodings: it resolves a path
-   * to a single string and overwrites it verbatim. Placeholder selection and redaction strategy are
-   * resolved server side and already baked into each replacement.
-   *
-   * <p>Two properties matter to callers:
-   *
-   * <ul>
-   *   <li><strong>Copy on write.</strong> The caller's list and messages are never mutated. Only
-   *       the messages that are actually redacted are rebuilt; the rest are shared with the input
-   *       list. When nothing is applied, {@link Result#messages} is the very same reference that
-   *       was passed in, so {@code result.messages != messages} tells the caller whether anything
-   *       changed.
-   *   <li><strong>Never throws.</strong> A malformed response must not break the caller's control
-   *       flow, so unresolvable paths, non-string targets, and missing or conflicting replacements
-   *       are skipped and counted in {@link Result#skipped}.
-   * </ul>
-   */
-  class DefaultRedactor implements MessageRedactor {
-
-    @Override
-    public boolean enabled() {
-      return true;
+        private static Result nothingApplied(final List<Message> messages, final int skipped) {
+            return new Result(messages, 0, skipped);
+        }
     }
 
     /**
-     * Matches a single path segment, e.g. {@code messages[1]} or {@code function}. Kept verbatim
-     * from the cross-tracer specification, so every tracer tokenizes paths identically.
+     * @param replacements the raw {@code redaction_replacements} value from the response, exactly as
+     *     it was parsed. It is deliberately untyped: a present value that is not an array is a
+     *     backend contract break, and only an enabled redactor is in a position to count it.
      */
-    private static final Pattern SEGMENT =
-        Pattern.compile("\\A([A-Za-z0-9_]+)(?:\\[([0-9]+)\\])?\\z");
-
-    /** No supported target is deeper than {@code messages[i].tool_calls[k].function.arguments}. */
-    private static final int MAX_SEGMENTS = 4;
-
-    private static final int NO_INDEX = -1;
-    private static final int INVALID_INDEX = -2;
-
-    /** Longest index we bother parsing; anything longer cannot address a real list. */
-    private static final int MAX_INDEX_DIGITS = 9;
+    Result redact(final List<Message> messages, @Nullable final Object replacements);
 
     /**
-     * Overwrites every path in {@code replacements} with its replacement string.
-     *
-     * @param messages the evaluated messages, never mutated
-     * @param rawReplacements the raw {@code redaction_replacements} value from the response
-     * @return the redaction outcome, holding {@code messages} itself when nothing was applied
+     * Whether redaction is active. When {@code false} the {@code ai_guard.redacted} tag is not
+     * reported at all, so an absent tag means "redaction is off", which stays distinguishable from a
+     * {@code false} one meaning "redaction is on and nothing was redacted".
      */
-    @Override
-    public Result redact(final List<Message> messages, @Nullable final Object rawReplacements) {
-      if (messages == null || messages.isEmpty() || rawReplacements == null) {
-        return Result.nothingApplied(messages, 0);
-      }
-      if (!(rawReplacements instanceof List)) {
-        // The field is present but is not an array, so there is no entry to even look at. Counted
-        // as one error rather than dropped: the backend broke the response contract.
-        return Result.nothingApplied(messages, 1);
-      }
-      final List<?> replacements = (List<?>) rawReplacements;
-      if (replacements.isEmpty()) {
-        return Result.nothingApplied(messages, 0);
-      }
-
-      int skipped = 0;
-
-      // Collect one authoritative replacement per path, dropping the ones the backend contradicts
-      // itself on. Insertion ordered so that a malformed response yields reproducible counters.
-      final Map<String, String> byPath = new LinkedHashMap<>();
-      Set<String> conflicting = null;
-      for (final Object entry : replacements) {
-        if (!(entry instanceof Map)) {
-          skipped++;
-          continue;
-        }
-        final Map<?, ?> map = (Map<?, ?>) entry;
-        final Object path = map.get("path");
-        final Object replacement = map.get("replacement");
-        // An empty replacement is legitimate: "" is a supported placeholder meaning "remove".
-        if (!(path instanceof String)
-            || ((String) path).isEmpty()
-            || !(replacement instanceof String)) {
-          skipped++;
-          continue;
-        }
-        final String previous = byPath.put((String) path, (String) replacement);
-        if (previous != null && !previous.equals(replacement)) {
-          // Conflicting replacements for one path: skip it rather than guess which one wins.
-          if (conflicting == null) {
-            conflicting = new HashSet<>(2);
-          }
-          conflicting.add((String) path);
-        }
-      }
-      if (conflicting != null) {
-        for (final String path : conflicting) {
-          byPath.remove(path);
-          skipped++;
-        }
-      }
-      if (byPath.isEmpty()) {
-        return Result.nothingApplied(messages, skipped);
-      }
-
-      final String[] names = new String[MAX_SEGMENTS];
-      final int[] indices = new int[MAX_SEGMENTS];
-      List<Message> working = null;
-      int applied = 0;
-
-      for (final Map.Entry<String, String> entry : byPath.entrySet()) {
-        final int count = parseSegments(entry.getKey(), names, indices);
-        // Paths are rooted at the evaluated array, so they always start with `messages[i]`.
-        if (count < 2
-            || indices[0] == NO_INDEX
-            || !"messages".equals(names[0])
-            || indices[0] >= messages.size()) {
-          skipped++;
-          continue;
-        }
-        final int index = indices[0];
-        final Message current = working == null ? messages.get(index) : working.get(index);
-        final Message updated = apply(current, names, indices, count, entry.getValue());
-        if (updated == null) {
-          skipped++;
-          continue;
+    boolean enabled();
+
+    class NoOp implements MessageRedactor {
+
+        @Override
+        public Result redact(final List<Message> messages, final @Nullable Object replacements) {
+            // The kill switch is off, so no redaction work is attempted and no redaction error is
+            // reported, not even for a malformed payload.
+            return Result.nothingApplied(messages, 0);
         }
-        if (working == null) {
-          working = new ArrayList<>(messages);
+
+        @Override
+        public boolean enabled() {
+            return false;
         }
-        working.set(index, updated);
-        applied++;
-      }
-
-      if (working == null) {
-        return Result.nothingApplied(messages, skipped);
-      }
-      return new Result(working, applied, skipped);
     }
 
     /**
-     * Rebuilds {@code message} with {@code replacement} written at the target the path resolves to.
+     * Applies the {@code redaction_replacements} returned by the AI Guard service to a message list.
+     *
+     * <p>The service returns the <em>fully redacted</em> string for each affected path, so this class
+     * never slices, concatenates, or reasons about offsets and string encodings: it resolves a path
+     * to a single string and overwrites it verbatim. Placeholder selection and redaction strategy are
+     * resolved server side and already baked into each replacement.
+     *
+     * <p>Two properties matter to callers:
      *
-     * @return the rebuilt message, or {@code null} when the path does not resolve to a writable
-     *     string, in which case the caller skips it fail-safe
+     * <ul>
+     *   <li><strong>Copy on write.</strong> The caller's list and messages are never mutated. Only
+     *       the messages that are actually redacted are rebuilt; the rest are shared with the input
+     *       list. When nothing is applied, {@link Result#messages} is the very same reference that
+     *       was passed in, so {@code result.messages != messages} tells the caller whether anything
+     *       changed.
+     *   <li><strong>Never throws.</strong> A malformed response must not break the caller's control
+     *       flow, so unresolvable paths, non-string targets, and missing or conflicting replacements
+     *       are skipped and counted in {@link Result#skipped}.
+     * </ul>
      */
-    @Nullable
-    private static Message apply(
-        final Message message,
-        final String[] names,
-        final int[] indices,
-        final int count,
-        final String replacement) {
-
-      if ("content".equals(names[1])) {
-        if (indices[1] == NO_INDEX) {
-          // messages[i].content
-          if (count != 2 || message.getContentParts() != null || message.getContent() == null) {
-            // A message holding content parts resolves to a list, not a string: skip.
-            return null;
-          }
-          return withContent(message, replacement);
-        }
-        // messages[i].content[j].text
-        if (count != 3 || !"text".equals(names[2]) || indices[2] != NO_INDEX) {
-          return null;
-        }
-        final List<ContentPart> parts = message.getContentParts();
-        if (parts == null || indices[1] >= parts.size()) {
-          return null;
-        }
-        final ContentPart part = parts.get(indices[1]);
-        // Only text parts are redactable; image locators are out of scope.
-        if (part.getType() != ContentPart.Type.TEXT) {
-          return null;
-        }
-        final List<ContentPart> updated = new ArrayList<>(parts);
-        updated.set(indices[1], ContentPart.text(replacement));
-        return withContentParts(message, updated);
-      }
-
-      if ("tool_calls".equals(names[1])) {
-        // messages[i].tool_calls[k].function.arguments
-        if (indices[1] == NO_INDEX
-            || count != 4
-            || !"function".equals(names[2])
-            || indices[2] != NO_INDEX
-            || !"arguments".equals(names[3])
-            || indices[3] != NO_INDEX) {
-          return null;
-        }
-        final List<ToolCall> toolCalls = message.getToolCalls();
-        if (toolCalls == null || indices[1] >= toolCalls.size()) {
-          return null;
-        }
-        final ToolCall toolCall = toolCalls.get(indices[1]);
-        final Function function = toolCall.getFunction();
-        if (function == null || function.getArguments() == null) {
-          return null;
+    class DefaultRedactor implements MessageRedactor {
+
+        @Override
+        public boolean enabled() {
+            return true;
         }
-        final List<ToolCall> updated = new ArrayList<>(toolCalls);
-        updated.set(
-            indices[1],
-            new ToolCall(toolCall.getId(), new Function(function.getName(), replacement)));
-        return withToolCalls(message, updated);
-      }
-
-      return null;
-    }
 
-    private static Message withContent(final Message message, final String content) {
-      return new Message(
-          message.getRole(), content, message.getToolCalls(), message.getToolCallId());
-    }
+        /**
+         * Matches a single path segment, e.g. {@code messages[1]} or {@code function}. Kept verbatim
+         * from the cross-tracer specification, so every tracer tokenizes paths identically.
+         */
+        private static final Pattern SEGMENT = Pattern.compile("\\A([A-Za-z0-9_]+)(?:\\[([0-9]+)\\])?\\z");
+
+        /** No supported target is deeper than {@code messages[i].tool_calls[k].function.arguments}. */
+        private static final int MAX_SEGMENTS = 4;
+
+        private static final int NO_INDEX = -1;
+        private static final int INVALID_INDEX = -2;
+
+        /** Longest index we bother parsing; anything longer cannot address a real list. */
+        private static final int MAX_INDEX_DIGITS = 9;
+
+        /**
+         * Overwrites every path in {@code replacements} with its replacement string.
+         *
+         * @param messages the evaluated messages, never mutated
+         * @param rawReplacements the raw {@code redaction_replacements} value from the response
+         * @return the redaction outcome, holding {@code messages} itself when nothing was applied
+         */
+        @Override
+        public Result redact(final List<Message> messages, @Nullable final Object rawReplacements) {
+            if (messages == null || messages.isEmpty() || rawReplacements == null) {
+                return Result.nothingApplied(messages, 0);
+            }
+            if (!(rawReplacements instanceof List)) {
+                // The field is present but is not an array, so there is no entry to even look at. Counted
+                // as one error rather than dropped: the backend broke the response contract.
+                return Result.nothingApplied(messages, 1);
+            }
+            final List<?> replacements = (List<?>) rawReplacements;
+            if (replacements.isEmpty()) {
+                return Result.nothingApplied(messages, 0);
+            }
+
+            int skipped = 0;
+
+            // Collect one authoritative replacement per path, dropping the ones the backend contradicts
+            // itself on. Insertion ordered so that a malformed response yields reproducible counters.
+            final Map<String, String> byPath = new LinkedHashMap<>();
+            Set<String> conflicting = null;
+            for (final Object entry : replacements) {
+                if (!(entry instanceof Map)) {
+                    skipped++;
+                    continue;
+                }
+                final Map<?, ?> map = (Map<?, ?>) entry;
+                final Object path = map.get("path");
+                final Object replacement = map.get("replacement");
+                // An empty replacement is legitimate: "" is a supported placeholder meaning "remove".
+                if (!(path instanceof String) || ((String) path).isEmpty() || !(replacement instanceof String)) {
+                    skipped++;
+                    continue;
+                }
+                final String previous = byPath.put((String) path, (String) replacement);
+                if (previous != null && !previous.equals(replacement)) {
+                    // Conflicting replacements for one path: skip it rather than guess which one wins.
+                    if (conflicting == null) {
+                        conflicting = new HashSet<>(2);
+                    }
+                    conflicting.add((String) path);
+                }
+            }
+            if (conflicting != null) {
+                for (final String path : conflicting) {
+                    byPath.remove(path);
+                    skipped++;
+                }
+            }
+            if (byPath.isEmpty()) {
+                return Result.nothingApplied(messages, skipped);
+            }
+
+            final String[] names = new String[MAX_SEGMENTS];
+            final int[] indices = new int[MAX_SEGMENTS];
+            List<Message> working = null;
+            int applied = 0;
+
+            for (final Map.Entry<String, String> entry : byPath.entrySet()) {
+                final int count = parseSegments(entry.getKey(), names, indices);
+                // Paths are rooted at the evaluated array, so they always start with `messages[i]`.
+                if (count < 2
+                        || indices[0] == NO_INDEX
+                        || !"messages".equals(names[0])
+                        || indices[0] >= messages.size()) {
+                    skipped++;
+                    continue;
+                }
+                final int index = indices[0];
+                final Message current = working == null ? messages.get(index) : working.get(index);
+                final Message updated = apply(current, names, indices, count, entry.getValue());
+                if (updated == null) {
+                    skipped++;
+                    continue;
+                }
+                if (working == null) {
+                    working = new ArrayList<>(messages);
+                }
+                working.set(index, updated);
+                applied++;
+            }
+
+            if (working == null) {
+                return Result.nothingApplied(messages, skipped);
+            }
+            return new Result(working, applied, skipped);
+        }
 
-    private static Message withContentParts(
-        final Message message, final List<ContentPart> contentParts) {
-      return new Message(
-          message.getRole(), contentParts, message.getToolCalls(), message.getToolCallId());
-    }
+        /**
+         * Rebuilds {@code message} with {@code replacement} written at the target the path resolves to.
+         *
+         * @return the rebuilt message, or {@code null} when the path does not resolve to a writable
+         *     string, in which case the caller skips it fail-safe
+         */
+        @Nullable
+        private static Message apply(
+                final Message message,
+                final String[] names,
+                final int[] indices,
+                final int count,
+                final String replacement) {
+
+            if ("content".equals(names[1])) {
+                if (indices[1] == NO_INDEX) {
+                    // messages[i].content
+                    if (count != 2 || message.getContentParts() != null || message.getContent() == null) {
+                        // A message holding content parts resolves to a list, not a string: skip.
+                        return null;
+                    }
+                    return withContent(message, replacement);
+                }
+                // messages[i].content[j].text
+                if (count != 3 || !"text".equals(names[2]) || indices[2] != NO_INDEX) {
+                    return null;
+                }
+                final List<ContentPart> parts = message.getContentParts();
+                if (parts == null || indices[1] >= parts.size()) {
+                    return null;
+                }
+                final ContentPart part = parts.get(indices[1]);
+                // Only text parts are redactable; image locators are out of scope.
+                if (part.getType() != ContentPart.Type.TEXT) {
+                    return null;
+                }
+                final List<ContentPart> updated = new ArrayList<>(parts);
+                updated.set(indices[1], ContentPart.text(replacement));
+                return withContentParts(message, updated);
+            }
+
+            if ("tool_calls".equals(names[1])) {
+                // messages[i].tool_calls[k].function.arguments
+                if (indices[1] == NO_INDEX
+                        || count != 4
+                        || !"function".equals(names[2])
+                        || indices[2] != NO_INDEX
+                        || !"arguments".equals(names[3])
+                        || indices[3] != NO_INDEX) {
+                    return null;
+                }
+                final List<ToolCall> toolCalls = message.getToolCalls();
+                if (toolCalls == null || indices[1] >= toolCalls.size()) {
+                    return null;
+                }
+                final ToolCall toolCall = toolCalls.get(indices[1]);
+                final Function function = toolCall.getFunction();
+                if (function == null || function.getArguments() == null) {
+                    return null;
+                }
+                final List<ToolCall> updated = new ArrayList<>(toolCalls);
+                updated.set(indices[1], new ToolCall(toolCall.getId(), new Function(function.getName(), replacement)));
+                return withToolCalls(message, updated);
+            }
 
-    private static Message withToolCalls(final Message message, final List<ToolCall> toolCalls) {
-      final List<ContentPart> contentParts = message.getContentParts();
-      // A message carries either content parts or a content string, never both; preserve whichever.
-      return contentParts != null
-          ? new Message(message.getRole(), contentParts, toolCalls, message.getToolCallId())
-          : new Message(
-              message.getRole(), message.getContent(), toolCalls, message.getToolCallId());
-    }
+            return null;
+        }
 
-    /**
-     * Splits a path on {@code .} and matches every segment against {@link #SEGMENT}, filling {@code
-     * names} and {@code indices}.
-     *
-     * @return the number of segments, or {@code -1} when any segment is malformed or the path is
-     *     deeper than any supported target
-     */
-    private static int parseSegments(final String path, final String[] names, final int[] indices) {
-      int count = 0;
-      int start = 0;
-      while (true) {
-        if (count == MAX_SEGMENTS) {
-          return -1;
+        private static Message withContent(final Message message, final String content) {
+            return new Message(message.getRole(), content, message.getToolCalls(), message.getToolCallId());
         }
-        final int dot = path.indexOf('.', start);
-        final String segment = dot < 0 ? path.substring(start) : path.substring(start, dot);
-        final Matcher matcher = SEGMENT.matcher(segment);
-        if (!matcher.matches()) {
-          return -1;
+
+        private static Message withContentParts(final Message message, final List<ContentPart> contentParts) {
+            return new Message(message.getRole(), contentParts, message.getToolCalls(), message.getToolCallId());
         }
-        final int index = parseIndex(matcher.group(2));
-        if (index == INVALID_INDEX) {
-          return -1;
+
+        private static Message withToolCalls(final Message message, final List<ToolCall> toolCalls) {
+            final List<ContentPart> contentParts = message.getContentParts();
+            // A message carries either content parts or a content string, never both; preserve whichever.
+            return contentParts != null
+                    ? new Message(message.getRole(), contentParts, toolCalls, message.getToolCallId())
+                    : new Message(message.getRole(), message.getContent(), toolCalls, message.getToolCallId());
         }
-        names[count] = matcher.group(1);
-        indices[count] = index;
-        count++;
-        if (dot < 0) {
-          return count;
+
+        /**
+         * Splits a path on {@code .} and matches every segment against {@link #SEGMENT}, filling {@code
+         * names} and {@code indices}.
+         *
+         * @return the number of segments, or {@code -1} when any segment is malformed or the path is
+         *     deeper than any supported target
+         */
+        private static int parseSegments(final String path, final String[] names, final int[] indices) {
+            int count = 0;
+            int start = 0;
+            while (true) {
+                if (count == MAX_SEGMENTS) {
+                    return -1;
+                }
+                final int dot = path.indexOf('.', start);
+                final String segment = dot < 0 ? path.substring(start) : path.substring(start, dot);
+                final Matcher matcher = SEGMENT.matcher(segment);
+                if (!matcher.matches()) {
+                    return -1;
+                }
+                final int index = parseIndex(matcher.group(2));
+                if (index == INVALID_INDEX) {
+                    return -1;
+                }
+                names[count] = matcher.group(1);
+                indices[count] = index;
+                count++;
+                if (dot < 0) {
+                    return count;
+                }
+                start = dot + 1;
+            }
         }
-        start = dot + 1;
-      }
-    }
 
-    private static int parseIndex(@Nullable final String index) {
-      if (index == null) {
-        return NO_INDEX;
-      }
-      // The regex guarantees digits only, so the sole remaining hazard is overflow.
-      return index.length() > MAX_INDEX_DIGITS ? INVALID_INDEX : Integer.parseInt(index);
+        private static int parseIndex(@Nullable final String index) {
+            if (index == null) {
+                return NO_INDEX;
+            }
+            // The regex guarantees digits only, so the sole remaining hazard is overflow.
+            return index.length() > MAX_INDEX_DIGITS ? INVALID_INDEX : Integer.parseInt(index);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/AIGuardInternalRedactionTest.java b/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/AIGuardInternalRedactionTest.java
index 4822bdf432d..4035c9eef50 100644
--- a/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/AIGuardInternalRedactionTest.java
+++ b/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/AIGuardInternalRedactionTest.java
@@ -53,368 +53,356 @@
 @ExtendWith(WithConfigExtension.class)
 class AIGuardInternalRedactionTest {
 
-  private static final HttpUrl URL =
-      HttpUrl.parse("https://app.datadoghq.com/api/v2/ai-guard/evaluate");
-
-  private static final String SENSITIVE = "My SSN is 123-45-6789";
-  private static final String REDACTED = "My SSN is <REDACTED>";
-
-  private static final List<Message> MESSAGES =
-      asList(
-          Message.message("system", "You are a helpful assistant."),
-          Message.message("user", SENSITIVE));
-
-  private AgentSpan span;
-  private AgentTracer.TracerAPI originalTracer;
-  private Map<String, Object> metaStruct;
-
-  @BeforeEach
-  void setUp() {
-    originalTracer = AgentTracer.get();
-
-    span = mock(AgentSpan.class);
-    lenient().when(span.getLocalRootSpan()).thenReturn(mock(AgentSpan.class));
-    doAnswer(
-            invocation -> {
-              metaStruct = invocation.getArgument(1);
-              return span;
-            })
-        .when(span)
-        .setMetaStruct(eq(META_STRUCT_TAG), any());
-
-    final AgentTracer.SpanBuilder builder = mock(AgentTracer.SpanBuilder.class, RETURNS_DEEP_STUBS);
-    lenient().when(builder.start()).thenReturn(span);
-    final AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
-    lenient().when(tracer.buildSpan(anyString(), anyString())).thenReturn(builder);
-    lenient().when(tracer.activateSpan(any())).thenReturn(mock(ContextScope.class));
-    AgentTracer.forceRegister(tracer);
-  }
-
-  @AfterEach
-  void tearDown() {
-    AgentTracer.forceRegister(originalTracer);
-    AIGuardInternal.uninstall();
-  }
-
-  @Test
-  void redactsMessagesAndRewritesMetaStruct() {
-    final Evaluation evaluation = evaluate(responseWith("ALLOW", false, replacements(REDACTED)));
-
-    assertEquals(REDACTED, evaluation.getMessages().get(1).getContent());
-    // the untouched message is carried over as is
-    assertEquals("You are a helpful assistant.", evaluation.getMessages().get(0).getContent());
-    assertEquals(REDACTED, metaStructMessages().get(1).getContent());
-    verify(span).setTag(REDACTED_TAG, true);
-    // the caller's list is left alone
-    assertEquals(SENSITIVE, MESSAGES.get(1).getContent());
-  }
-
-  @Test
-  void reportsNotRedactedWhenResponseCarriesNoReplacements() {
-    final Evaluation evaluation = evaluate(responseWith("ALLOW", false, null));
-
-    assertSame(MESSAGES, evaluation.getMessages());
-    assertEquals(SENSITIVE, metaStructMessages().get(1).getContent());
-    verify(span).setTag(REDACTED_TAG, false);
-  }
-
-  @Test
-  void reportsNotRedactedWhenReplacementsAreEmpty() {
-    final Evaluation evaluation = evaluate(responseWith("ALLOW", false, "[]"));
-
-    assertSame(MESSAGES, evaluation.getMessages());
-    verify(span).setTag(REDACTED_TAG, false);
-  }
-
-  @Test
-  void reportsNotRedactedWhenEveryReplacementIsSkipped() {
-    final String unresolvable = "[{\"path\":\"messages[9].content\",\"replacement\":\"nope\"}]";
-
-    final Evaluation evaluation = evaluate(responseWith("ALLOW", false, unresolvable));
-
-    assertSame(MESSAGES, evaluation.getMessages());
-    assertEquals(SENSITIVE, metaStructMessages().get(1).getContent());
-    verify(span).setTag(REDACTED_TAG, false);
-  }
-
-  @Test
-  void killSwitchLeavesMessagesUntouchedAndEmitsNoTag() {
-    WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false);
-
-    final Evaluation evaluation = evaluate(responseWith("ALLOW", false, replacements(REDACTED)));
-
-    assertSame(MESSAGES, evaluation.getMessages());
-    assertEquals(SENSITIVE, metaStructMessages().get(1).getContent());
-    // an absent tag means "redaction is off", which is distinct from a false one
-    verify(span, never()).setTag(eq(REDACTED_TAG), anyBoolean());
-  }
-
-  @Test
-  void redactsMetaStructOnBlockedEvaluation() {
-    final AIGuardAbortError error =
-        assertThrows(
-            AIGuardAbortError.class,
-            () -> evaluate(responseWith("DENY", true, replacements(REDACTED))));
-
-    // reporting is still redacted on the blocked path
-    assertEquals(REDACTED, metaStructMessages().get(1).getContent());
-    verify(span).setTag(REDACTED_TAG, true);
-
-    // the abort error must not carry the conversation, redacted or otherwise
-    assertFalse(errorText(error).contains(SENSITIVE));
-    assertFalse(errorText(error).contains(REDACTED));
-  }
-
-  /**
-   * The meta struct messages are built exactly once per evaluation, in the {@code finally} that
-   * closes the request, so one evaluation reports one truncation no matter how much redaction it
-   * applied.
-   */
-  @Test
-  void reportsContentTruncationOnlyOnceWhenRedacting() {
-    WithConfigExtension.injectEnvConfig("DD_AI_GUARD_MAX_CONTENT_SIZE", "8", false);
-    drainTelemetry();
-
-    evaluate(responseWith("ALLOW", false, replacements(REDACTED)));
-
-    assertEquals(1, truncationMetrics());
-  }
-
-  @Test
-  void reportsRedactedTrueInTelemetryWhenSomethingWasRedacted() {
-    drainTelemetry();
-
-    evaluate(responseWith("ALLOW", false, replacements(REDACTED)));
-
-    assertTrue(requestTags().contains("redacted:true"));
-  }
-
-  @Test
-  void reportsRedactedFalseInTelemetryWhenNothingWasRedacted() {
-    drainTelemetry();
-
-    evaluate(responseWith("ALLOW", false, null));
-
-    assertTrue(requestTags().contains("redacted:false"));
-  }
-
-  @Test
-  void reportsNoRedactedTagInTelemetryWhenKillSwitchIsOff() {
-    WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false);
-    drainTelemetry();
-
-    evaluate(responseWith("ALLOW", false, replacements(REDACTED)));
-
-    final List<String> tags = requestTags();
-    // absence of the tag is what tells a consumer that redaction is off
-    assertFalse(tags.contains("redacted:true"));
-    assertFalse(tags.contains("redacted:false"));
-    assertTrue(tags.contains("error:false"));
-  }
-
-  private static List<String> requestTags() {
-    WafMetricCollector.get().prepareMetrics();
-    for (final MetricCollector.Metric metric : WafMetricCollector.get().drain()) {
-      if ("requests".equals(metric.metricName)) {
-        return metric.tags;
-      }
-    }
-    throw new AssertionError("no ai_guard requests metric was reported");
-  }
-
-  private static void drainTelemetry() {
-    WafMetricCollector.get().prepareMetrics();
-    WafMetricCollector.get().drain();
-  }
-
-  private static long truncationMetrics() {
-    WafMetricCollector.get().prepareMetrics();
-    long count = 0;
-    for (final MetricCollector.Metric metric : WafMetricCollector.get().drain()) {
-      if ("truncated".equals(metric.metricName)) {
-        count += metric.value.longValue();
-      }
-    }
-    return count;
-  }
-
-  @Test
-  void reportsTheServiceReplacementsVerbatimIncludingUnappliedEntries() {
-    final String replacements =
-        "[{\"path\":\"messages[1].content\",\"replacement\":\""
-            + REDACTED
-            + "\"},{\"path\":\"messages[9].content\",\"replacement\":\"never applied\"}]";
-
-    final Evaluation evaluation = evaluate(responseWith("ALLOW", false, replacements));
-
-    assertEquals(REDACTED, evaluation.getMessages().get(1).getContent());
-    // messages[9] cannot resolve and is skipped fail-safe, but the service asked for it, so it is
-    // still reported back to the caller
-    assertEquals(2, evaluation.getRedactionReplacements().size());
-  }
-
-  @Test
-  void reportsTheServiceReplacementsEvenWhenTheKillSwitchIsOff() {
-    WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false);
-
-    final Evaluation evaluation = evaluate(responseWith("ALLOW", false, replacements(REDACTED)));
-
-    // nothing was applied, but the service's request is still visible to the caller
-    assertSame(MESSAGES, evaluation.getMessages());
-    assertEquals(1, evaluation.getRedactionReplacements().size());
-  }
-
-  @Test
-  void reportsNotRedactedWhenTheEvaluationFails() {
-    // no action field, so the response is rejected before any redaction work happens
-    assertThrows(
-        AIGuardClientError.class, () -> evaluate("{\"data\":{\"attributes\":{\"tags\":[]}}}"));
-
-    // a failed evaluation redacted nothing, and must not look like the kill switch is off
-    verify(span).setTag(REDACTED_TAG, false);
-    verify(span, never()).setTag(REDACTED_TAG, true);
-  }
+    private static final HttpUrl URL = HttpUrl.parse("https://app.datadoghq.com/api/v2/ai-guard/evaluate");
+
+    private static final String SENSITIVE = "My SSN is 123-45-6789";
+    private static final String REDACTED = "My SSN is <REDACTED>";
+
+    private static final List<Message> MESSAGES =
+            asList(Message.message("system", "You are a helpful assistant."), Message.message("user", SENSITIVE));
+
+    private AgentSpan span;
+    private AgentTracer.TracerAPI originalTracer;
+    private Map<String, Object> metaStruct;
+
+    @BeforeEach
+    void setUp() {
+        originalTracer = AgentTracer.get();
+
+        span = mock(AgentSpan.class);
+        lenient().when(span.getLocalRootSpan()).thenReturn(mock(AgentSpan.class));
+        doAnswer(invocation -> {
+                    metaStruct = invocation.getArgument(1);
+                    return span;
+                })
+                .when(span)
+                .setMetaStruct(eq(META_STRUCT_TAG), any());
+
+        final AgentTracer.SpanBuilder builder = mock(AgentTracer.SpanBuilder.class, RETURNS_DEEP_STUBS);
+        lenient().when(builder.start()).thenReturn(span);
+        final AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
+        lenient().when(tracer.buildSpan(anyString(), anyString())).thenReturn(builder);
+        lenient().when(tracer.activateSpan(any())).thenReturn(mock(ContextScope.class));
+        AgentTracer.forceRegister(tracer);
+    }
+
+    @AfterEach
+    void tearDown() {
+        AgentTracer.forceRegister(originalTracer);
+        AIGuardInternal.uninstall();
+    }
+
+    @Test
+    void redactsMessagesAndRewritesMetaStruct() {
+        final Evaluation evaluation = evaluate(responseWith("ALLOW", false, replacements(REDACTED)));
+
+        assertEquals(REDACTED, evaluation.getMessages().get(1).getContent());
+        // the untouched message is carried over as is
+        assertEquals(
+                "You are a helpful assistant.", evaluation.getMessages().get(0).getContent());
+        assertEquals(REDACTED, metaStructMessages().get(1).getContent());
+        verify(span).setTag(REDACTED_TAG, true);
+        // the caller's list is left alone
+        assertEquals(SENSITIVE, MESSAGES.get(1).getContent());
+    }
+
+    @Test
+    void reportsNotRedactedWhenResponseCarriesNoReplacements() {
+        final Evaluation evaluation = evaluate(responseWith("ALLOW", false, null));
+
+        assertSame(MESSAGES, evaluation.getMessages());
+        assertEquals(SENSITIVE, metaStructMessages().get(1).getContent());
+        verify(span).setTag(REDACTED_TAG, false);
+    }
+
+    @Test
+    void reportsNotRedactedWhenReplacementsAreEmpty() {
+        final Evaluation evaluation = evaluate(responseWith("ALLOW", false, "[]"));
+
+        assertSame(MESSAGES, evaluation.getMessages());
+        verify(span).setTag(REDACTED_TAG, false);
+    }
+
+    @Test
+    void reportsNotRedactedWhenEveryReplacementIsSkipped() {
+        final String unresolvable = "[{\"path\":\"messages[9].content\",\"replacement\":\"nope\"}]";
+
+        final Evaluation evaluation = evaluate(responseWith("ALLOW", false, unresolvable));
+
+        assertSame(MESSAGES, evaluation.getMessages());
+        assertEquals(SENSITIVE, metaStructMessages().get(1).getContent());
+        verify(span).setTag(REDACTED_TAG, false);
+    }
+
+    @Test
+    void killSwitchLeavesMessagesUntouchedAndEmitsNoTag() {
+        WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false);
+
+        final Evaluation evaluation = evaluate(responseWith("ALLOW", false, replacements(REDACTED)));
+
+        assertSame(MESSAGES, evaluation.getMessages());
+        assertEquals(SENSITIVE, metaStructMessages().get(1).getContent());
+        // an absent tag means "redaction is off", which is distinct from a false one
+        verify(span, never()).setTag(eq(REDACTED_TAG), anyBoolean());
+    }
+
+    @Test
+    void redactsMetaStructOnBlockedEvaluation() {
+        final AIGuardAbortError error = assertThrows(
+                AIGuardAbortError.class, () -> evaluate(responseWith("DENY", true, replacements(REDACTED))));
+
+        // reporting is still redacted on the blocked path
+        assertEquals(REDACTED, metaStructMessages().get(1).getContent());
+        verify(span).setTag(REDACTED_TAG, true);
+
+        // the abort error must not carry the conversation, redacted or otherwise
+        assertFalse(errorText(error).contains(SENSITIVE));
+        assertFalse(errorText(error).contains(REDACTED));
+    }
+
+    /**
+     * The meta struct messages are built exactly once per evaluation, in the {@code finally} that
+     * closes the request, so one evaluation reports one truncation no matter how much redaction it
+     * applied.
+     */
+    @Test
+    void reportsContentTruncationOnlyOnceWhenRedacting() {
+        WithConfigExtension.injectEnvConfig("DD_AI_GUARD_MAX_CONTENT_SIZE", "8", false);
+        drainTelemetry();
+
+        evaluate(responseWith("ALLOW", false, replacements(REDACTED)));
+
+        assertEquals(1, truncationMetrics());
+    }
+
+    @Test
+    void reportsRedactedTrueInTelemetryWhenSomethingWasRedacted() {
+        drainTelemetry();
+
+        evaluate(responseWith("ALLOW", false, replacements(REDACTED)));
+
+        assertTrue(requestTags().contains("redacted:true"));
+    }
+
+    @Test
+    void reportsRedactedFalseInTelemetryWhenNothingWasRedacted() {
+        drainTelemetry();
+
+        evaluate(responseWith("ALLOW", false, null));
+
+        assertTrue(requestTags().contains("redacted:false"));
+    }
+
+    @Test
+    void reportsNoRedactedTagInTelemetryWhenKillSwitchIsOff() {
+        WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false);
+        drainTelemetry();
+
+        evaluate(responseWith("ALLOW", false, replacements(REDACTED)));
+
+        final List<String> tags = requestTags();
+        // absence of the tag is what tells a consumer that redaction is off
+        assertFalse(tags.contains("redacted:true"));
+        assertFalse(tags.contains("redacted:false"));
+        assertTrue(tags.contains("error:false"));
+    }
+
+    private static List<String> requestTags() {
+        WafMetricCollector.get().prepareMetrics();
+        for (final MetricCollector.Metric metric : WafMetricCollector.get().drain()) {
+            if ("requests".equals(metric.metricName)) {
+                return metric.tags;
+            }
+        }
+        throw new AssertionError("no ai_guard requests metric was reported");
+    }
+
+    private static void drainTelemetry() {
+        WafMetricCollector.get().prepareMetrics();
+        WafMetricCollector.get().drain();
+    }
+
+    private static long truncationMetrics() {
+        WafMetricCollector.get().prepareMetrics();
+        long count = 0;
+        for (final MetricCollector.Metric metric : WafMetricCollector.get().drain()) {
+            if ("truncated".equals(metric.metricName)) {
+                count += metric.value.longValue();
+            }
+        }
+        return count;
+    }
+
+    @Test
+    void reportsTheServiceReplacementsVerbatimIncludingUnappliedEntries() {
+        final String replacements = "[{\"path\":\"messages[1].content\",\"replacement\":\""
+                + REDACTED
+                + "\"},{\"path\":\"messages[9].content\",\"replacement\":\"never applied\"}]";
+
+        final Evaluation evaluation = evaluate(responseWith("ALLOW", false, replacements));
+
+        assertEquals(REDACTED, evaluation.getMessages().get(1).getContent());
+        // messages[9] cannot resolve and is skipped fail-safe, but the service asked for it, so it is
+        // still reported back to the caller
+        assertEquals(2, evaluation.getRedactionReplacements().size());
+    }
 
-  @Test
-  void redactsMetaStructWhenTheResponseFailsAfterCarryingReplacements() {
-    // the replacements arrived, but the response is rejected for a missing action field
-    final String body =
-        "{\"data\":{\"attributes\":{\"tags\":[],\"redaction_replacements\":"
-            + replacements(REDACTED)
-            + "}}}";
-
-    assertThrows(AIGuardClientError.class, () -> evaluate(body));
-
-    // the tracer held the replacements, so what it reports must be redacted
-    assertEquals(REDACTED, metaStructMessages().get(1).getContent());
-  }
-
-  @Test
-  void emitsNoTagWhenTheEvaluationFailsAndTheKillSwitchIsOff() {
-    WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false);
-
-    assertThrows(
-        AIGuardClientError.class, () -> evaluate("{\"data\":{\"attributes\":{\"tags\":[]}}}"));
-
-    verify(span, never()).setTag(eq(REDACTED_TAG), anyBoolean());
-  }
-
-  @Test
-  void doesNotFailWhenReplacementsAreMalformed() {
-    drainTelemetry();
-
-    final Evaluation evaluation = evaluate(responseWith("ALLOW", false, "\"not-an-array\""));
-
-    assertSame(MESSAGES, evaluation.getMessages());
-    verify(span).setTag(REDACTED_TAG, false);
-    // the field is present but is not an array, so the backend broke the response contract
-    assertEquals(1, redactionErrors());
-  }
-
-  @Test
-  void reportsOneRedactionErrorPerReplacementItCouldNotApply() {
-    final String unresolvable =
-        "[{\"path\":\"messages[9].content\",\"replacement\":\"nope\"},"
-            + "{\"path\":\"not a path\",\"replacement\":\"nope\"}]";
-    drainTelemetry();
-
-    evaluate(responseWith("ALLOW", false, unresolvable));
-
-    assertEquals(2, redactionErrors());
-  }
-
-  @Test
-  void reportsNoRedactionErrorWhenEveryReplacementApplies() {
-    drainTelemetry();
-
-    evaluate(responseWith("ALLOW", false, replacements(REDACTED)));
-
-    assertEquals(0, redactionErrors());
-  }
-
-  @Test
-  void reportsNoRedactionErrorWhenTheKillSwitchIsOff() {
-    WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false);
-    drainTelemetry();
-
-    // no redaction work is attempted, so a malformed payload is not even looked at
-    evaluate(responseWith("ALLOW", false, "\"not-an-array\""));
-
-    assertEquals(0, redactionErrors());
-  }
-
-  /** A redaction error never counts as a failed request: it does not fail the evaluation. */
-  @Test
-  void doesNotCountARedactionErrorAsAFailedRequest() {
-    final String unresolvable = "[{\"path\":\"messages[9].content\",\"replacement\":\"nope\"}]";
-    drainTelemetry();
-
-    evaluate(responseWith("ALLOW", false, unresolvable));
-
-    assertTrue(requestTags().contains("error:false"));
-  }
-
-  private static long redactionErrors() {
-    WafMetricCollector.get().prepareMetrics();
-    long count = 0;
-    for (final MetricCollector.Metric metric : WafMetricCollector.get().drain()) {
-      if ("error".equals(metric.metricName) && metric.tags.contains("type:redaction_error")) {
-        count += metric.value.longValue();
-      }
-    }
-    return count;
-  }
-
-  private static String errorText(final AIGuardAbortError error) {
-    return String.valueOf(error.getMessage()) + error + String.valueOf(error.getReason());
-  }
-
-  @SuppressWarnings("unchecked")
-  private List<Message> metaStructMessages() {
-    assertNotNull(metaStruct, "meta struct was never attached to the span");
-    return (List<Message>) metaStruct.get(META_STRUCT_MESSAGES);
-  }
-
-  private static String replacements(final String replacement) {
-    return "[{\"path\":\"messages[1].content\",\"replacement\":\"" + replacement + "\"}]";
-  }
-
-  private static String responseWith(
-      final String action, final boolean blocking, final String redactionReplacements) {
-    final StringBuilder attributes = new StringBuilder();
-    attributes
-        .append("{\"action\":\"")
-        .append(action)
-        .append("\",\"reason\":\"a reason\",\"is_blocking_enabled\":")
-        .append(blocking)
-        .append(",\"tags\":[]");
-    if (redactionReplacements != null) {
-      attributes.append(",\"redaction_replacements\":").append(redactionReplacements);
-    }
-    attributes.append('}');
-    return "{\"data\":{\"id\":\"1\",\"type\":\"evaluations\",\"attributes\":" + attributes + "}}";
-  }
-
-  private Evaluation evaluate(final String responseBody) {
-    final OkHttpClient client = mock(OkHttpClient.class);
-    final Call call = mock(Call.class);
-    try {
-      lenient().when(call.execute()).thenReturn(response(responseBody));
-    } catch (final IOException e) {
-      throw new AssertionError(e);
-    }
-    lenient().when(client.newCall(any(Request.class))).thenReturn(call);
-    return new AIGuardInternal(URL, Collections.emptyMap(), client)
-        .evaluate(MESSAGES, new Options().block(true));
-  }
-
-  private static Response response(final String json) {
-    return new Response.Builder()
-        .protocol(Protocol.HTTP_1_1)
-        .message("ok")
-        .request(new Request.Builder().url(URL).build())
-        .code(200)
-        .body(ResponseBody.create(MediaType.parse("application/json"), json))
-        .build();
-  }
+    @Test
+    void reportsTheServiceReplacementsEvenWhenTheKillSwitchIsOff() {
+        WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false);
+
+        final Evaluation evaluation = evaluate(responseWith("ALLOW", false, replacements(REDACTED)));
+
+        // nothing was applied, but the service's request is still visible to the caller
+        assertSame(MESSAGES, evaluation.getMessages());
+        assertEquals(1, evaluation.getRedactionReplacements().size());
+    }
+
+    @Test
+    void reportsNotRedactedWhenTheEvaluationFails() {
+        // no action field, so the response is rejected before any redaction work happens
+        assertThrows(AIGuardClientError.class, () -> evaluate("{\"data\":{\"attributes\":{\"tags\":[]}}}"));
+
+        // a failed evaluation redacted nothing, and must not look like the kill switch is off
+        verify(span).setTag(REDACTED_TAG, false);
+        verify(span, never()).setTag(REDACTED_TAG, true);
+    }
+
+    @Test
+    void redactsMetaStructWhenTheResponseFailsAfterCarryingReplacements() {
+        // the replacements arrived, but the response is rejected for a missing action field
+        final String body =
+                "{\"data\":{\"attributes\":{\"tags\":[],\"redaction_replacements\":" + replacements(REDACTED) + "}}}";
+
+        assertThrows(AIGuardClientError.class, () -> evaluate(body));
+
+        // the tracer held the replacements, so what it reports must be redacted
+        assertEquals(REDACTED, metaStructMessages().get(1).getContent());
+    }
+
+    @Test
+    void emitsNoTagWhenTheEvaluationFailsAndTheKillSwitchIsOff() {
+        WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false);
+
+        assertThrows(AIGuardClientError.class, () -> evaluate("{\"data\":{\"attributes\":{\"tags\":[]}}}"));
+
+        verify(span, never()).setTag(eq(REDACTED_TAG), anyBoolean());
+    }
+
+    @Test
+    void doesNotFailWhenReplacementsAreMalformed() {
+        drainTelemetry();
+
+        final Evaluation evaluation = evaluate(responseWith("ALLOW", false, "\"not-an-array\""));
+
+        assertSame(MESSAGES, evaluation.getMessages());
+        verify(span).setTag(REDACTED_TAG, false);
+        // the field is present but is not an array, so the backend broke the response contract
+        assertEquals(1, redactionErrors());
+    }
+
+    @Test
+    void reportsOneRedactionErrorPerReplacementItCouldNotApply() {
+        final String unresolvable = "[{\"path\":\"messages[9].content\",\"replacement\":\"nope\"},"
+                + "{\"path\":\"not a path\",\"replacement\":\"nope\"}]";
+        drainTelemetry();
+
+        evaluate(responseWith("ALLOW", false, unresolvable));
+
+        assertEquals(2, redactionErrors());
+    }
+
+    @Test
+    void reportsNoRedactionErrorWhenEveryReplacementApplies() {
+        drainTelemetry();
+
+        evaluate(responseWith("ALLOW", false, replacements(REDACTED)));
+
+        assertEquals(0, redactionErrors());
+    }
+
+    @Test
+    void reportsNoRedactionErrorWhenTheKillSwitchIsOff() {
+        WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false);
+        drainTelemetry();
+
+        // no redaction work is attempted, so a malformed payload is not even looked at
+        evaluate(responseWith("ALLOW", false, "\"not-an-array\""));
+
+        assertEquals(0, redactionErrors());
+    }
+
+    /** A redaction error never counts as a failed request: it does not fail the evaluation. */
+    @Test
+    void doesNotCountARedactionErrorAsAFailedRequest() {
+        final String unresolvable = "[{\"path\":\"messages[9].content\",\"replacement\":\"nope\"}]";
+        drainTelemetry();
+
+        evaluate(responseWith("ALLOW", false, unresolvable));
+
+        assertTrue(requestTags().contains("error:false"));
+    }
+
+    private static long redactionErrors() {
+        WafMetricCollector.get().prepareMetrics();
+        long count = 0;
+        for (final MetricCollector.Metric metric : WafMetricCollector.get().drain()) {
+            if ("error".equals(metric.metricName) && metric.tags.contains("type:redaction_error")) {
+                count += metric.value.longValue();
+            }
+        }
+        return count;
+    }
+
+    private static String errorText(final AIGuardAbortError error) {
+        return String.valueOf(error.getMessage()) + error + String.valueOf(error.getReason());
+    }
+
+    @SuppressWarnings("unchecked")
+    private List<Message> metaStructMessages() {
+        assertNotNull(metaStruct, "meta struct was never attached to the span");
+        return (List<Message>) metaStruct.get(META_STRUCT_MESSAGES);
+    }
+
+    private static String replacements(final String replacement) {
+        return "[{\"path\":\"messages[1].content\",\"replacement\":\"" + replacement + "\"}]";
+    }
+
+    private static String responseWith(
+            final String action, final boolean blocking, final String redactionReplacements) {
+        final StringBuilder attributes = new StringBuilder();
+        attributes
+                .append("{\"action\":\"")
+                .append(action)
+                .append("\",\"reason\":\"a reason\",\"is_blocking_enabled\":")
+                .append(blocking)
+                .append(",\"tags\":[]");
+        if (redactionReplacements != null) {
+            attributes.append(",\"redaction_replacements\":").append(redactionReplacements);
+        }
+        attributes.append('}');
+        return "{\"data\":{\"id\":\"1\",\"type\":\"evaluations\",\"attributes\":" + attributes + "}}";
+    }
+
+    private Evaluation evaluate(final String responseBody) {
+        final OkHttpClient client = mock(OkHttpClient.class);
+        final Call call = mock(Call.class);
+        try {
+            lenient().when(call.execute()).thenReturn(response(responseBody));
+        } catch (final IOException e) {
+            throw new AssertionError(e);
+        }
+        lenient().when(client.newCall(any(Request.class))).thenReturn(call);
+        return new AIGuardInternal(URL, Collections.emptyMap(), client).evaluate(MESSAGES, new Options().block(true));
+    }
+
+    private static Response response(final String json) {
+        return new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .message("ok")
+                .request(new Request.Builder().url(URL).build())
+                .code(200)
+                .body(ResponseBody.create(MediaType.parse("application/json"), json))
+                .build();
+    }
 }
diff --git a/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/MessageRedactorTest.java b/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/MessageRedactorTest.java
index 1734cfc4cf6..81a96e04943 100644
--- a/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/MessageRedactorTest.java
+++ b/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/MessageRedactorTest.java
@@ -25,612 +25,552 @@
 
 class MessageRedactorTest {
 
-  private static final MessageRedactor REDACTOR = new MessageRedactor.DefaultRedactor();
-
-  private static Map<String, Object> replacement(final Object path, final Object replacement) {
-    final Map<String, Object> entry = new HashMap<>(2);
-    entry.put("path", path);
-    entry.put("replacement", replacement);
-    return entry;
-  }
-
-  private static List<Message> messages(final Message... messages) {
-    return new ArrayList<>(asList(messages));
-  }
-
-  @Nested
-  class ContentString {
-
-    @Test
-    void redactsPlainContent() {
-      final List<Message> messages =
-          messages(
-              Message.message("system", "You are a helpful assistant."),
-              Message.message("user", "My SSN is 123-45-6789"));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages, singletonList(replacement("messages[1].content", "My SSN is <REDACTED>")));
-
-      assertTrue(result.redacted());
-      assertEquals(1, result.applied);
-      assertEquals(0, result.skipped);
-      assertEquals("My SSN is <REDACTED>", result.messages.get(1).getContent());
-      // the untouched message is shared, not rebuilt
-      assertSame(messages.get(0), result.messages.get(0));
-    }
-
-    @Test
-    void neverMutatesTheCallersMessages() {
-      final Message original = Message.message("user", "My SSN is 123-45-6789");
-      final List<Message> messages = messages(original);
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages, singletonList(replacement("messages[0].content", "My SSN is <REDACTED>")));
-
-      assertNotSame(messages, result.messages);
-      assertEquals("My SSN is 123-45-6789", original.getContent());
-      assertEquals("My SSN is 123-45-6789", messages.get(0).getContent());
-    }
-
-    @Test
-    void preservesRoleAndToolCallId() {
-      final List<Message> messages = messages(Message.tool("call_1", "Account 000123456789"));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages, singletonList(replacement("messages[0].content", "Account <REDACTED>")));
-
-      final Message redacted = result.messages.get(0);
-      assertEquals("tool", redacted.getRole());
-      assertEquals("call_1", redacted.getToolCallId());
-      assertEquals("Account <REDACTED>", redacted.getContent());
-    }
-
-    @Test
-    void appliesEmptyReplacementBecauseItMeansRemoval() {
-      final List<Message> messages = messages(Message.message("user", "My SSN is 123-45-6789"));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(messages, singletonList(replacement("messages[0].content", "")));
-
-      assertTrue(result.redacted());
-      assertEquals(0, result.skipped);
-      assertEquals("", result.messages.get(0).getContent());
-    }
-
-    @Test
-    void copiesReplacementVerbatimIncludingAstralPlaneCharacters() {
-      final String replacement = "🎭 <REDACTED> 👨‍👩‍👧‍👦 café";
-      final List<Message> messages =
-          messages(Message.message("user", "🎭 123-45-6789 👨‍👩‍👧‍👦 café"));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(messages, singletonList(replacement("messages[0].content", replacement)));
-
-      assertEquals(replacement, result.messages.get(0).getContent());
-    }
-  }
-
-  @Nested
-  class ContentParts {
-
-    @Test
-    void redactsTextContentPart() {
-      final List<Message> messages =
-          messages(
-              Message.message(
-                  "user",
-                  asList(
-                      ContentPart.text("here is my card 4111111111111111"),
-                      ContentPart.imageUrl("https://example.com/image.jpg"))));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages,
-              singletonList(
-                  replacement("messages[0].content[0].text", "here is my card <REDACTED>")));
-
-      assertTrue(result.redacted());
-      final List<ContentPart> parts = result.messages.get(0).getContentParts();
-      assertEquals("here is my card <REDACTED>", parts.get(0).getText());
-      // the image part is untouched
-      assertEquals("https://example.com/image.jpg", parts.get(1).getImageUrl().getUrl());
-    }
-
-    @Test
-    void skipsImageUrlPart() {
-      final List<Message> messages =
-          messages(
-              Message.message(
-                  "user", singletonList(ContentPart.imageUrl("https://example.com/image.jpg"))));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages, singletonList(replacement("messages[0].content[0].text", "<REDACTED>")));
-
-      assertFalse(result.redacted());
-      assertEquals(1, result.skipped);
-      assertSame(messages, result.messages);
-    }
-
-    @Test
-    void skipsContentPartPathWhenMessageHoldsAPlainString() {
-      // messages[0].content[0].text has nothing to resolve against
-      final List<Message> messages = messages(Message.message("user", "plain content"));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages, singletonList(replacement("messages[0].content[0].text", "<REDACTED>")));
+    private static final MessageRedactor REDACTOR = new MessageRedactor.DefaultRedactor();
 
-      assertFalse(result.redacted());
-      assertEquals(1, result.skipped);
-      assertSame(messages, result.messages);
-    }
-
-    @Test
-    void skipsContentPathWhenMessageHoldsContentParts() {
-      // messages[0].content resolves to a list, not a string
-      final List<Message> messages =
-          messages(Message.message("user", singletonList(ContentPart.text("secret"))));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages, singletonList(replacement("messages[0].content", "<REDACTED>")));
-
-      assertFalse(result.redacted());
-      assertEquals(1, result.skipped);
-      assertSame(messages, result.messages);
-    }
-  }
-
-  @Nested
-  class ToolCallArguments {
-
-    @Test
-    void redactsToolCallArguments() {
-      final List<Message> messages =
-          messages(
-              Message.assistant(
-                  ToolCall.toolCall("call_1", "send_email", "{\"ssn\":\"123-45-6789\"}")));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages,
-              singletonList(
-                  replacement(
-                      "messages[0].tool_calls[0].function.arguments", "{\"ssn\":\"<REDACTED>\"}")));
-
-      assertTrue(result.redacted());
-      final ToolCall toolCall = result.messages.get(0).getToolCalls().get(0);
-      assertEquals("call_1", toolCall.getId());
-      assertEquals("send_email", toolCall.getFunction().getName());
-      assertEquals("{\"ssn\":\"<REDACTED>\"}", toolCall.getFunction().getArguments());
-    }
-
-    @Test
-    void skipsToolCallPathWhenMessageHasNoToolCalls() {
-      final List<Message> messages = messages(Message.message("user", "no tools here"));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages,
-              singletonList(
-                  replacement("messages[0].tool_calls[0].function.arguments", "<REDACTED>")));
-
-      assertFalse(result.redacted());
-      assertEquals(1, result.skipped);
-      assertSame(messages, result.messages);
-    }
-
-    @Test
-    void skipsToolCallWhoseFunctionCarriesNoArguments() {
-      final List<Message> messages =
-          messages(
-              Message.assistant(new ToolCall("call_1", new ToolCall.Function("send_email", null))));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages,
-              singletonList(
-                  replacement("messages[0].tool_calls[0].function.arguments", "<REDACTED>")));
-
-      assertFalse(result.redacted());
-      assertEquals(1, result.skipped);
-      assertSame(messages, result.messages);
-    }
-
-    @Test
-    void redactsOnlyTheTargetedToolCall() {
-      final List<Message> messages =
-          messages(
-              Message.assistant(
-                  ToolCall.toolCall("call_1", "a", "{\"x\":1}"),
-                  ToolCall.toolCall("call_2", "b", "{\"ssn\":\"123-45-6789\"}")));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages,
-              singletonList(
-                  replacement(
-                      "messages[0].tool_calls[1].function.arguments", "{\"ssn\":\"<REDACTED>\"}")));
-
-      final List<ToolCall> toolCalls = result.messages.get(0).getToolCalls();
-      assertEquals("{\"x\":1}", toolCalls.get(0).getFunction().getArguments());
-      assertEquals("{\"ssn\":\"<REDACTED>\"}", toolCalls.get(1).getFunction().getArguments());
-    }
-
-    @Test
-    void preservesContentPartsWhenRedactingToolCallOnTheSameMessage() {
-      final Message message =
-          new Message(
-              "assistant",
-              singletonList(ContentPart.text("calling a tool")),
-              singletonList(ToolCall.toolCall("call_1", "send", "{\"ssn\":\"123-45-6789\"}")),
-              null);
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages(message),
-              singletonList(
-                  replacement(
-                      "messages[0].tool_calls[0].function.arguments", "{\"ssn\":\"<REDACTED>\"}")));
-
-      final Message redacted = result.messages.get(0);
-      assertNull(redacted.getContent());
-      assertEquals("calling a tool", redacted.getContentParts().get(0).getText());
-      assertEquals(
-          "{\"ssn\":\"<REDACTED>\"}", redacted.getToolCalls().get(0).getFunction().getArguments());
-    }
-  }
-
-  @Nested
-  class MultipleReplacements {
-
-    @Test
-    void appliesReplacementsAcrossSeveralMessages() {
-      final List<Message> messages =
-          messages(
-              Message.message("system", "contact ops@acme.io"),
-              Message.message("user", "My SSN is 123-45-6789"),
-              Message.message("assistant", "nothing sensitive here"));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages,
-              asList(
-                  replacement("messages[0].content", "contact <REDACTED>"),
-                  replacement("messages[1].content", "My SSN is <REDACTED>")));
-
-      assertEquals(2, result.applied);
-      assertEquals("contact <REDACTED>", result.messages.get(0).getContent());
-      assertEquals("My SSN is <REDACTED>", result.messages.get(1).getContent());
-      assertSame(messages.get(2), result.messages.get(2));
-    }
-
-    @Test
-    void composesTwoReplacementsTargetingTheSameMessage() {
-      final Message message =
-          new Message(
-              "assistant",
-              asList(
-                  ContentPart.text("card 4111111111111111"), ContentPart.text("ssn 123-45-6789")),
-              singletonList(ToolCall.toolCall("call_1", "send", "{\"email\":\"a@b.io\"}")),
-              null);
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages(message),
-              asList(
-                  replacement("messages[0].content[0].text", "card <REDACTED>"),
-                  replacement("messages[0].content[1].text", "ssn <REDACTED>"),
-                  replacement(
-                      "messages[0].tool_calls[0].function.arguments",
-                      "{\"email\":\"<REDACTED>\"}")));
-
-      assertEquals(3, result.applied);
-      assertEquals(0, result.skipped);
-      final Message redacted = result.messages.get(0);
-      assertEquals("card <REDACTED>", redacted.getContentParts().get(0).getText());
-      assertEquals("ssn <REDACTED>", redacted.getContentParts().get(1).getText());
-      assertEquals(
-          "{\"email\":\"<REDACTED>\"}",
-          redacted.getToolCalls().get(0).getFunction().getArguments());
-    }
-
-    @Test
-    void appliesSurvivorsWhenOneEntryIsUnresolvable() {
-      final List<Message> messages = messages(Message.message("user", "My SSN is 123-45-6789"));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages,
-              asList(
-                  replacement("messages[0].content", "My SSN is <REDACTED>"),
-                  replacement("messages[9].content", "never applied")));
-
-      assertEquals(1, result.applied);
-      assertEquals(1, result.skipped);
-      assertEquals("My SSN is <REDACTED>", result.messages.get(0).getContent());
-    }
-  }
+    private static Map<String, Object> replacement(final Object path, final Object replacement) {
+        final Map<String, Object> entry = new HashMap<>(2);
+        entry.put("path", path);
+        entry.put("replacement", replacement);
+        return entry;
+    }
+
+    private static List<Message> messages(final Message... messages) {
+        return new ArrayList<>(asList(messages));
+    }
 
-  @Nested
-  class AppliedReplacements {
+    @Nested
+    class ContentString {
+
+        @Test
+        void redactsPlainContent() {
+            final List<Message> messages = messages(
+                    Message.message("system", "You are a helpful assistant."),
+                    Message.message("user", "My SSN is 123-45-6789"));
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages, singletonList(replacement("messages[1].content", "My SSN is <REDACTED>")));
+
+            assertTrue(result.redacted());
+            assertEquals(1, result.applied);
+            assertEquals(0, result.skipped);
+            assertEquals("My SSN is <REDACTED>", result.messages.get(1).getContent());
+            // the untouched message is shared, not rebuilt
+            assertSame(messages.get(0), result.messages.get(0));
+        }
+
+        @Test
+        void neverMutatesTheCallersMessages() {
+            final Message original = Message.message("user", "My SSN is 123-45-6789");
+            final List<Message> messages = messages(original);
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages, singletonList(replacement("messages[0].content", "My SSN is <REDACTED>")));
+
+            assertNotSame(messages, result.messages);
+            assertEquals("My SSN is 123-45-6789", original.getContent());
+            assertEquals("My SSN is 123-45-6789", messages.get(0).getContent());
+        }
 
-    @Test
-    void reportsOnlyTheEntriesThatWereApplied() {
-      final List<Message> messages = messages(Message.message("user", "My SSN is 123-45-6789"));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages,
-              asList(
-                  replacement("messages[0].content", "My SSN is <REDACTED>"),
-                  replacement("messages[9].content", "never applied")));
-
-      assertEquals(1, result.applied);
-      assertEquals(1, result.skipped);
-    }
-
-    @Test
-    void keepsAnEmptyReplacementWhichMeansRemove() {
-      final List<Message> messages = messages(Message.message("user", "SSN 123-45-6789"));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(messages, singletonList(replacement("messages[0].content", "")));
-
-      assertEquals(1, result.applied);
-      assertEquals("", result.messages.get(0).getContent());
-    }
-
-    @Test
-    void reportsNothingWhenNothingWasApplied() {
-      final List<Message> messages = messages(Message.message("user", "hello"));
-
-      assertEquals(0, REDACTOR.redact(messages, null).applied);
-      assertEquals(0, new MessageRedactor.NoOp().redact(messages, null).applied);
-    }
-  }
-
-  @Nested
-  class MalformedResponses {
-
-    @Test
-    void returnsSameListWhenReplacementsAreNull() {
-      final List<Message> messages = messages(Message.message("user", "hello"));
-
-      final MessageRedactor.Result result = REDACTOR.redact(messages, null);
-
-      assertSame(messages, result.messages);
-      assertFalse(result.redacted());
-      assertEquals(0, result.skipped);
-    }
-
-    @Test
-    void returnsSameListWhenReplacementsAreEmpty() {
-      final List<Message> messages = messages(Message.message("user", "hello"));
-
-      final MessageRedactor.Result result = REDACTOR.redact(messages, Collections.emptyList());
-
-      assertSame(messages, result.messages);
-      assertFalse(result.redacted());
-    }
-
-    @Test
-    void returnsSameListWhenThereAreNoMessages() {
-      final MessageRedactor.Result nullMessages =
-          REDACTOR.redact(null, singletonList(replacement("messages[0].content", "<REDACTED>")));
-      assertNull(nullMessages.messages);
-      assertFalse(nullMessages.redacted());
-
-      final List<Message> empty = Collections.emptyList();
-      final MessageRedactor.Result noMessages =
-          REDACTOR.redact(empty, singletonList(replacement("messages[0].content", "<REDACTED>")));
-      assertSame(empty, noMessages.messages);
-      assertFalse(noMessages.redacted());
-    }
-
-    @Test
-    void skipsEveryPathTheServiceContradictsItselfOn() {
-      final List<Message> messages =
-          messages(
-              Message.message("system", "contact ops@acme.io"),
-              Message.message("user", "My SSN is 123-45-6789"));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages,
-              asList(
-                  replacement("messages[0].content", "first"),
-                  replacement("messages[0].content", "second"),
-                  replacement("messages[1].content", "third"),
-                  replacement("messages[1].content", "fourth")));
-
-      assertFalse(result.redacted());
-      assertEquals(2, result.skipped);
-      assertSame(messages, result.messages);
-    }
-
-    @Test
-    void skipsConflictingReplacementsForTheSamePath() {
-      final List<Message> messages = messages(Message.message("user", "My SSN is 123-45-6789"));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages,
-              asList(
-                  replacement("messages[0].content", "first"),
-                  replacement("messages[0].content", "second")));
-
-      assertFalse(result.redacted());
-      assertEquals(1, result.skipped);
-      assertSame(messages, result.messages);
-      assertEquals("My SSN is 123-45-6789", messages.get(0).getContent());
-    }
-
-    @Test
-    void acceptsDuplicateReplacementsCarryingTheSameValue() {
-      final List<Message> messages = messages(Message.message("user", "My SSN is 123-45-6789"));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages,
-              asList(
-                  replacement("messages[0].content", "My SSN is <REDACTED>"),
-                  replacement("messages[0].content", "My SSN is <REDACTED>")));
-
-      assertEquals(1, result.applied);
-      assertEquals(0, result.skipped);
-      assertEquals("My SSN is <REDACTED>", result.messages.get(0).getContent());
-    }
-
-    @Test
-    void skipsEntriesThatAreNotObjects() {
-      final List<Message> messages = messages(Message.message("user", "hello"));
-
-      final MessageRedactor.Result result = REDACTOR.redact(messages, asList("not an object", 42));
-
-      assertFalse(result.redacted());
-      assertEquals(2, result.skipped);
-      assertSame(messages, result.messages);
-    }
-
-    @Test
-    void skipsEntriesWithMissingOrNonStringFields() {
-      final List<Message> messages = messages(Message.message("user", "hello"));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages,
-              asList(
-                  replacement(null, "<REDACTED>"),
-                  replacement("messages[0].content", null),
-                  replacement("", "<REDACTED>"),
-                  replacement(42, "<REDACTED>"),
-                  replacement("messages[0].content", 42),
-                  new HashMap<String, Object>()));
-
-      assertFalse(result.redacted());
-      assertEquals(6, result.skipped);
-      assertSame(messages, result.messages);
-    }
-
-    @Test
-    void neverThrowsOnAToolCallWithoutAFunction() {
-      final List<Message> messages =
-          messages(
-              new Message(
-                  "assistant", (String) null, singletonList(new ToolCall("call_1", null)), null));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages,
-              singletonList(
-                  replacement("messages[0].tool_calls[0].function.arguments", "<REDACTED>")));
-
-      assertFalse(result.redacted());
-      assertEquals(1, result.skipped);
-    }
-
-    @Test
-    void skipsContentPathOnAMessageWithoutContent() {
-      final List<Message> messages =
-          messages(Message.assistant(ToolCall.toolCall("call_1", "send", "{}")));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages, singletonList(replacement("messages[0].content", "<REDACTED>")));
-
-      assertFalse(result.redacted());
-      assertEquals(1, result.skipped);
-    }
-  }
-
-  @Nested
-  class PathGrammar {
-
-    @ParameterizedTest
-    @ValueSource(
-        strings = {
-          "", // empty path
-          "content", // not rooted at messages
-          "messages", // resolves to the list itself
-          "messages.content", // missing root index
-          "messages[0]", // resolves to a message, not a string
-          "messages[0].foo", // unknown field
-          "messages[0].content.text", // missing part index
-          "messages[0].content[0]", // resolves to a content part
-          "messages[0].content[0].foo", // unknown content part field
-          "messages[0].content[0].text.extra", // too deep
-          "messages[0].content[1].image_url.url", // image locator, out of scope
-          "messages[0].tool_calls.function.arguments", // missing tool call index
-          "messages[0].tool_calls[0].function", // resolves to a function
-          "messages[0].tool_calls[0].function.name", // not a redactable target
-          "messages[0].tool_calls[0].arguments", // missing function hop
-          "messages[-1].content", // negative index rejected by the segment regex
-          "messages[0].content ", // trailing space, whole segment must match
-          " messages[0].content", // leading space
-          "messages[0]..content", // empty segment
-          "messages[0].content[", // unbalanced bracket
-          "messages[0].con-tent", // hyphen is not a word character
-          "messages[99999999999].content", // index overflows
-          "messages[0].tool_calls[0].function.arguments.extra", // deeper than any target
-          "conversation[0].content", // rooted at something other than messages
-          "messages[0].content[0].text[0]", // an index on the text field itself
-          "messages[0].content[9].text", // content part index out of range
-          "messages[0].tool_calls[0].foo.arguments", // the hop is not `function`
-          "messages[0].tool_calls[0].function[0].arguments", // an index on `function`
-          "messages[0].tool_calls[0].function.arguments[0]", // an index on `arguments`
-          "messages[0].tool_calls[9].function.arguments" // tool call index out of range
-        })
-    void skipsUnsupportedPaths(final String path) {
-      final List<Message> messages =
-          messages(
-              new Message(
-                  "assistant",
-                  asList(
-                      ContentPart.text("text"), ContentPart.imageUrl("https://example.com/i.jpg")),
-                  singletonList(ToolCall.toolCall("call_1", "send", "{}")),
-                  null));
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(messages, singletonList(replacement(path, "<REDACTED>")));
-
-      assertFalse(result.redacted(), "expected path to be skipped: " + path);
-      assertEquals(1, result.skipped);
-      assertSame(messages, result.messages);
-    }
-
-    @Test
-    void acceptsMultiDigitIndexes() {
-      final List<Message> messages = new ArrayList<>();
-      for (int i = 0; i < 12; i++) {
-        messages.add(Message.message("user", "message " + i));
-      }
-
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages, singletonList(replacement("messages[11].content", "<REDACTED>")));
-
-      assertTrue(result.redacted());
-      assertEquals("<REDACTED>", result.messages.get(11).getContent());
-    }
+        @Test
+        void preservesRoleAndToolCallId() {
+            final List<Message> messages = messages(Message.tool("call_1", "Account 000123456789"));
 
-    @Test
-    void toleratesUnknownKeysOnAReplacementEntry() {
-      final Map<String, Object> entry = new LinkedHashMap<>();
-      entry.put("path", "messages[0].content");
-      entry.put("replacement", "<REDACTED>");
-      entry.put("category", "ssn");
+            final MessageRedactor.Result result =
+                    REDACTOR.redact(messages, singletonList(replacement("messages[0].content", "Account <REDACTED>")));
 
-      final MessageRedactor.Result result =
-          REDACTOR.redact(
-              messages(Message.message("user", "My SSN is 123-45-6789")), singletonList(entry));
+            final Message redacted = result.messages.get(0);
+            assertEquals("tool", redacted.getRole());
+            assertEquals("call_1", redacted.getToolCallId());
+            assertEquals("Account <REDACTED>", redacted.getContent());
+        }
 
-      assertTrue(result.redacted());
-      assertEquals("<REDACTED>", result.messages.get(0).getContent());
+        @Test
+        void appliesEmptyReplacementBecauseItMeansRemoval() {
+            final List<Message> messages = messages(Message.message("user", "My SSN is 123-45-6789"));
+
+            final MessageRedactor.Result result =
+                    REDACTOR.redact(messages, singletonList(replacement("messages[0].content", "")));
+
+            assertTrue(result.redacted());
+            assertEquals(0, result.skipped);
+            assertEquals("", result.messages.get(0).getContent());
+        }
+
+        @Test
+        void copiesReplacementVerbatimIncludingAstralPlaneCharacters() {
+            final String replacement = "🎭 <REDACTED> 👨‍👩‍👧‍👦 café";
+            final List<Message> messages = messages(Message.message("user", "🎭 123-45-6789 👨‍👩‍👧‍👦 café"));
+
+            final MessageRedactor.Result result =
+                    REDACTOR.redact(messages, singletonList(replacement("messages[0].content", replacement)));
+
+            assertEquals(replacement, result.messages.get(0).getContent());
+        }
+    }
+
+    @Nested
+    class ContentParts {
+
+        @Test
+        void redactsTextContentPart() {
+            final List<Message> messages = messages(Message.message(
+                    "user",
+                    asList(
+                            ContentPart.text("here is my card 4111111111111111"),
+                            ContentPart.imageUrl("https://example.com/image.jpg"))));
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages, singletonList(replacement("messages[0].content[0].text", "here is my card <REDACTED>")));
+
+            assertTrue(result.redacted());
+            final List<ContentPart> parts = result.messages.get(0).getContentParts();
+            assertEquals("here is my card <REDACTED>", parts.get(0).getText());
+            // the image part is untouched
+            assertEquals(
+                    "https://example.com/image.jpg", parts.get(1).getImageUrl().getUrl());
+        }
+
+        @Test
+        void skipsImageUrlPart() {
+            final List<Message> messages = messages(
+                    Message.message("user", singletonList(ContentPart.imageUrl("https://example.com/image.jpg"))));
+
+            final MessageRedactor.Result result =
+                    REDACTOR.redact(messages, singletonList(replacement("messages[0].content[0].text", "<REDACTED>")));
+
+            assertFalse(result.redacted());
+            assertEquals(1, result.skipped);
+            assertSame(messages, result.messages);
+        }
+
+        @Test
+        void skipsContentPartPathWhenMessageHoldsAPlainString() {
+            // messages[0].content[0].text has nothing to resolve against
+            final List<Message> messages = messages(Message.message("user", "plain content"));
+
+            final MessageRedactor.Result result =
+                    REDACTOR.redact(messages, singletonList(replacement("messages[0].content[0].text", "<REDACTED>")));
+
+            assertFalse(result.redacted());
+            assertEquals(1, result.skipped);
+            assertSame(messages, result.messages);
+        }
+
+        @Test
+        void skipsContentPathWhenMessageHoldsContentParts() {
+            // messages[0].content resolves to a list, not a string
+            final List<Message> messages = messages(Message.message("user", singletonList(ContentPart.text("secret"))));
+
+            final MessageRedactor.Result result =
+                    REDACTOR.redact(messages, singletonList(replacement("messages[0].content", "<REDACTED>")));
+
+            assertFalse(result.redacted());
+            assertEquals(1, result.skipped);
+            assertSame(messages, result.messages);
+        }
+    }
+
+    @Nested
+    class ToolCallArguments {
+
+        @Test
+        void redactsToolCallArguments() {
+            final List<Message> messages =
+                    messages(Message.assistant(ToolCall.toolCall("call_1", "send_email", "{\"ssn\":\"123-45-6789\"}")));
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages,
+                    singletonList(
+                            replacement("messages[0].tool_calls[0].function.arguments", "{\"ssn\":\"<REDACTED>\"}")));
+
+            assertTrue(result.redacted());
+            final ToolCall toolCall = result.messages.get(0).getToolCalls().get(0);
+            assertEquals("call_1", toolCall.getId());
+            assertEquals("send_email", toolCall.getFunction().getName());
+            assertEquals("{\"ssn\":\"<REDACTED>\"}", toolCall.getFunction().getArguments());
+        }
+
+        @Test
+        void skipsToolCallPathWhenMessageHasNoToolCalls() {
+            final List<Message> messages = messages(Message.message("user", "no tools here"));
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages, singletonList(replacement("messages[0].tool_calls[0].function.arguments", "<REDACTED>")));
+
+            assertFalse(result.redacted());
+            assertEquals(1, result.skipped);
+            assertSame(messages, result.messages);
+        }
+
+        @Test
+        void skipsToolCallWhoseFunctionCarriesNoArguments() {
+            final List<Message> messages =
+                    messages(Message.assistant(new ToolCall("call_1", new ToolCall.Function("send_email", null))));
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages, singletonList(replacement("messages[0].tool_calls[0].function.arguments", "<REDACTED>")));
+
+            assertFalse(result.redacted());
+            assertEquals(1, result.skipped);
+            assertSame(messages, result.messages);
+        }
+
+        @Test
+        void redactsOnlyTheTargetedToolCall() {
+            final List<Message> messages = messages(Message.assistant(
+                    ToolCall.toolCall("call_1", "a", "{\"x\":1}"),
+                    ToolCall.toolCall("call_2", "b", "{\"ssn\":\"123-45-6789\"}")));
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages,
+                    singletonList(
+                            replacement("messages[0].tool_calls[1].function.arguments", "{\"ssn\":\"<REDACTED>\"}")));
+
+            final List<ToolCall> toolCalls = result.messages.get(0).getToolCalls();
+            assertEquals("{\"x\":1}", toolCalls.get(0).getFunction().getArguments());
+            assertEquals(
+                    "{\"ssn\":\"<REDACTED>\"}", toolCalls.get(1).getFunction().getArguments());
+        }
+
+        @Test
+        void preservesContentPartsWhenRedactingToolCallOnTheSameMessage() {
+            final Message message = new Message(
+                    "assistant",
+                    singletonList(ContentPart.text("calling a tool")),
+                    singletonList(ToolCall.toolCall("call_1", "send", "{\"ssn\":\"123-45-6789\"}")),
+                    null);
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages(message),
+                    singletonList(
+                            replacement("messages[0].tool_calls[0].function.arguments", "{\"ssn\":\"<REDACTED>\"}")));
+
+            final Message redacted = result.messages.get(0);
+            assertNull(redacted.getContent());
+            assertEquals("calling a tool", redacted.getContentParts().get(0).getText());
+            assertEquals(
+                    "{\"ssn\":\"<REDACTED>\"}",
+                    redacted.getToolCalls().get(0).getFunction().getArguments());
+        }
+    }
+
+    @Nested
+    class MultipleReplacements {
+
+        @Test
+        void appliesReplacementsAcrossSeveralMessages() {
+            final List<Message> messages = messages(
+                    Message.message("system", "contact ops@acme.io"),
+                    Message.message("user", "My SSN is 123-45-6789"),
+                    Message.message("assistant", "nothing sensitive here"));
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages,
+                    asList(
+                            replacement("messages[0].content", "contact <REDACTED>"),
+                            replacement("messages[1].content", "My SSN is <REDACTED>")));
+
+            assertEquals(2, result.applied);
+            assertEquals("contact <REDACTED>", result.messages.get(0).getContent());
+            assertEquals("My SSN is <REDACTED>", result.messages.get(1).getContent());
+            assertSame(messages.get(2), result.messages.get(2));
+        }
+
+        @Test
+        void composesTwoReplacementsTargetingTheSameMessage() {
+            final Message message = new Message(
+                    "assistant",
+                    asList(ContentPart.text("card 4111111111111111"), ContentPart.text("ssn 123-45-6789")),
+                    singletonList(ToolCall.toolCall("call_1", "send", "{\"email\":\"a@b.io\"}")),
+                    null);
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages(message),
+                    asList(
+                            replacement("messages[0].content[0].text", "card <REDACTED>"),
+                            replacement("messages[0].content[1].text", "ssn <REDACTED>"),
+                            replacement("messages[0].tool_calls[0].function.arguments", "{\"email\":\"<REDACTED>\"}")));
+
+            assertEquals(3, result.applied);
+            assertEquals(0, result.skipped);
+            final Message redacted = result.messages.get(0);
+            assertEquals("card <REDACTED>", redacted.getContentParts().get(0).getText());
+            assertEquals("ssn <REDACTED>", redacted.getContentParts().get(1).getText());
+            assertEquals(
+                    "{\"email\":\"<REDACTED>\"}",
+                    redacted.getToolCalls().get(0).getFunction().getArguments());
+        }
+
+        @Test
+        void appliesSurvivorsWhenOneEntryIsUnresolvable() {
+            final List<Message> messages = messages(Message.message("user", "My SSN is 123-45-6789"));
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages,
+                    asList(
+                            replacement("messages[0].content", "My SSN is <REDACTED>"),
+                            replacement("messages[9].content", "never applied")));
+
+            assertEquals(1, result.applied);
+            assertEquals(1, result.skipped);
+            assertEquals("My SSN is <REDACTED>", result.messages.get(0).getContent());
+        }
+    }
+
+    @Nested
+    class AppliedReplacements {
+
+        @Test
+        void reportsOnlyTheEntriesThatWereApplied() {
+            final List<Message> messages = messages(Message.message("user", "My SSN is 123-45-6789"));
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages,
+                    asList(
+                            replacement("messages[0].content", "My SSN is <REDACTED>"),
+                            replacement("messages[9].content", "never applied")));
+
+            assertEquals(1, result.applied);
+            assertEquals(1, result.skipped);
+        }
+
+        @Test
+        void keepsAnEmptyReplacementWhichMeansRemove() {
+            final List<Message> messages = messages(Message.message("user", "SSN 123-45-6789"));
+
+            final MessageRedactor.Result result =
+                    REDACTOR.redact(messages, singletonList(replacement("messages[0].content", "")));
+
+            assertEquals(1, result.applied);
+            assertEquals("", result.messages.get(0).getContent());
+        }
+
+        @Test
+        void reportsNothingWhenNothingWasApplied() {
+            final List<Message> messages = messages(Message.message("user", "hello"));
+
+            assertEquals(0, REDACTOR.redact(messages, null).applied);
+            assertEquals(0, new MessageRedactor.NoOp().redact(messages, null).applied);
+        }
+    }
+
+    @Nested
+    class MalformedResponses {
+
+        @Test
+        void returnsSameListWhenReplacementsAreNull() {
+            final List<Message> messages = messages(Message.message("user", "hello"));
+
+            final MessageRedactor.Result result = REDACTOR.redact(messages, null);
+
+            assertSame(messages, result.messages);
+            assertFalse(result.redacted());
+            assertEquals(0, result.skipped);
+        }
+
+        @Test
+        void returnsSameListWhenReplacementsAreEmpty() {
+            final List<Message> messages = messages(Message.message("user", "hello"));
+
+            final MessageRedactor.Result result = REDACTOR.redact(messages, Collections.emptyList());
+
+            assertSame(messages, result.messages);
+            assertFalse(result.redacted());
+        }
+
+        @Test
+        void returnsSameListWhenThereAreNoMessages() {
+            final MessageRedactor.Result nullMessages =
+                    REDACTOR.redact(null, singletonList(replacement("messages[0].content", "<REDACTED>")));
+            assertNull(nullMessages.messages);
+            assertFalse(nullMessages.redacted());
+
+            final List<Message> empty = Collections.emptyList();
+            final MessageRedactor.Result noMessages =
+                    REDACTOR.redact(empty, singletonList(replacement("messages[0].content", "<REDACTED>")));
+            assertSame(empty, noMessages.messages);
+            assertFalse(noMessages.redacted());
+        }
+
+        @Test
+        void skipsEveryPathTheServiceContradictsItselfOn() {
+            final List<Message> messages = messages(
+                    Message.message("system", "contact ops@acme.io"), Message.message("user", "My SSN is 123-45-6789"));
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages,
+                    asList(
+                            replacement("messages[0].content", "first"),
+                            replacement("messages[0].content", "second"),
+                            replacement("messages[1].content", "third"),
+                            replacement("messages[1].content", "fourth")));
+
+            assertFalse(result.redacted());
+            assertEquals(2, result.skipped);
+            assertSame(messages, result.messages);
+        }
+
+        @Test
+        void skipsConflictingReplacementsForTheSamePath() {
+            final List<Message> messages = messages(Message.message("user", "My SSN is 123-45-6789"));
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages,
+                    asList(replacement("messages[0].content", "first"), replacement("messages[0].content", "second")));
+
+            assertFalse(result.redacted());
+            assertEquals(1, result.skipped);
+            assertSame(messages, result.messages);
+            assertEquals("My SSN is 123-45-6789", messages.get(0).getContent());
+        }
+
+        @Test
+        void acceptsDuplicateReplacementsCarryingTheSameValue() {
+            final List<Message> messages = messages(Message.message("user", "My SSN is 123-45-6789"));
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages,
+                    asList(
+                            replacement("messages[0].content", "My SSN is <REDACTED>"),
+                            replacement("messages[0].content", "My SSN is <REDACTED>")));
+
+            assertEquals(1, result.applied);
+            assertEquals(0, result.skipped);
+            assertEquals("My SSN is <REDACTED>", result.messages.get(0).getContent());
+        }
+
+        @Test
+        void skipsEntriesThatAreNotObjects() {
+            final List<Message> messages = messages(Message.message("user", "hello"));
+
+            final MessageRedactor.Result result = REDACTOR.redact(messages, asList("not an object", 42));
+
+            assertFalse(result.redacted());
+            assertEquals(2, result.skipped);
+            assertSame(messages, result.messages);
+        }
+
+        @Test
+        void skipsEntriesWithMissingOrNonStringFields() {
+            final List<Message> messages = messages(Message.message("user", "hello"));
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages,
+                    asList(
+                            replacement(null, "<REDACTED>"),
+                            replacement("messages[0].content", null),
+                            replacement("", "<REDACTED>"),
+                            replacement(42, "<REDACTED>"),
+                            replacement("messages[0].content", 42),
+                            new HashMap<String, Object>()));
+
+            assertFalse(result.redacted());
+            assertEquals(6, result.skipped);
+            assertSame(messages, result.messages);
+        }
+
+        @Test
+        void neverThrowsOnAToolCallWithoutAFunction() {
+            final List<Message> messages = messages(
+                    new Message("assistant", (String) null, singletonList(new ToolCall("call_1", null)), null));
+
+            final MessageRedactor.Result result = REDACTOR.redact(
+                    messages, singletonList(replacement("messages[0].tool_calls[0].function.arguments", "<REDACTED>")));
+
+            assertFalse(result.redacted());
+            assertEquals(1, result.skipped);
+        }
+
+        @Test
+        void skipsContentPathOnAMessageWithoutContent() {
+            final List<Message> messages = messages(Message.assistant(ToolCall.toolCall("call_1", "send", "{}")));
+
+            final MessageRedactor.Result result =
+                    REDACTOR.redact(messages, singletonList(replacement("messages[0].content", "<REDACTED>")));
+
+            assertFalse(result.redacted());
+            assertEquals(1, result.skipped);
+        }
+    }
+
+    @Nested
+    class PathGrammar {
+
+        @ParameterizedTest
+        @ValueSource(
+                strings = {
+                    "", // empty path
+                    "content", // not rooted at messages
+                    "messages", // resolves to the list itself
+                    "messages.content", // missing root index
+                    "messages[0]", // resolves to a message, not a string
+                    "messages[0].foo", // unknown field
+                    "messages[0].content.text", // missing part index
+                    "messages[0].content[0]", // resolves to a content part
+                    "messages[0].content[0].foo", // unknown content part field
+                    "messages[0].content[0].text.extra", // too deep
+                    "messages[0].content[1].image_url.url", // image locator, out of scope
+                    "messages[0].tool_calls.function.arguments", // missing tool call index
+                    "messages[0].tool_calls[0].function", // resolves to a function
+                    "messages[0].tool_calls[0].function.name", // not a redactable target
+                    "messages[0].tool_calls[0].arguments", // missing function hop
+                    "messages[-1].content", // negative index rejected by the segment regex
+                    "messages[0].content ", // trailing space, whole segment must match
+                    " messages[0].content", // leading space
+                    "messages[0]..content", // empty segment
+                    "messages[0].content[", // unbalanced bracket
+                    "messages[0].con-tent", // hyphen is not a word character
+                    "messages[99999999999].content", // index overflows
+                    "messages[0].tool_calls[0].function.arguments.extra", // deeper than any target
+                    "conversation[0].content", // rooted at something other than messages
+                    "messages[0].content[0].text[0]", // an index on the text field itself
+                    "messages[0].content[9].text", // content part index out of range
+                    "messages[0].tool_calls[0].foo.arguments", // the hop is not `function`
+                    "messages[0].tool_calls[0].function[0].arguments", // an index on `function`
+                    "messages[0].tool_calls[0].function.arguments[0]", // an index on `arguments`
+                    "messages[0].tool_calls[9].function.arguments" // tool call index out of range
+                })
+        void skipsUnsupportedPaths(final String path) {
+            final List<Message> messages = messages(new Message(
+                    "assistant",
+                    asList(ContentPart.text("text"), ContentPart.imageUrl("https://example.com/i.jpg")),
+                    singletonList(ToolCall.toolCall("call_1", "send", "{}")),
+                    null));
+
+            final MessageRedactor.Result result =
+                    REDACTOR.redact(messages, singletonList(replacement(path, "<REDACTED>")));
+
+            assertFalse(result.redacted(), "expected path to be skipped: " + path);
+            assertEquals(1, result.skipped);
+            assertSame(messages, result.messages);
+        }
+
+        @Test
+        void acceptsMultiDigitIndexes() {
+            final List<Message> messages = new ArrayList<>();
+            for (int i = 0; i < 12; i++) {
+                messages.add(Message.message("user", "message " + i));
+            }
+
+            final MessageRedactor.Result result =
+                    REDACTOR.redact(messages, singletonList(replacement("messages[11].content", "<REDACTED>")));
+
+            assertTrue(result.redacted());
+            assertEquals("<REDACTED>", result.messages.get(11).getContent());
+        }
+
+        @Test
+        void toleratesUnknownKeysOnAReplacementEntry() {
+            final Map<String, Object> entry = new LinkedHashMap<>();
+            entry.put("path", "messages[0].content");
+            entry.put("replacement", "<REDACTED>");
+            entry.put("category", "ssn");
+
+            final MessageRedactor.Result result =
+                    REDACTOR.redact(messages(Message.message("user", "My SSN is 123-45-6789")), singletonList(entry));
+
+            assertTrue(result.redacted());
+            assertEquals("<REDACTED>", result.messages.get(0).getContent());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/ExceptionLoggerBenchmark.java b/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/ExceptionLoggerBenchmark.java
index 807ac7c196c..c525a7fc3ca 100644
--- a/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/ExceptionLoggerBenchmark.java
+++ b/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/ExceptionLoggerBenchmark.java
@@ -19,10 +19,10 @@
 @Measurement(iterations = 5)
 @Threads(8)
 public class ExceptionLoggerBenchmark {
-  @Benchmark
-  public Logger getExceptionLogger() {
-    // This matches what happens in the bytecode weaving that defends against
-    // exception leaking out of instrumentation.
-    return LoggerFactory.getLogger(ExceptionLogger.class);
-  }
+    @Benchmark
+    public Logger getExceptionLogger() {
+        // This matches what happens in the bytecode weaving that defends against
+        // exception leaking out of instrumentation.
+        return LoggerFactory.getLogger(ExceptionLogger.class);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/buffer/InjectingPipeOutputStreamBenchmark.java b/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/buffer/InjectingPipeOutputStreamBenchmark.java
index 8f52f13ee86..e5f194f6f6a 100644
--- a/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/buffer/InjectingPipeOutputStreamBenchmark.java
+++ b/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/buffer/InjectingPipeOutputStreamBenchmark.java
@@ -33,33 +33,32 @@
 @OutputTimeUnit(MICROSECONDS)
 @Fork(value = 1)
 public class InjectingPipeOutputStreamBenchmark {
-  private static final List<String> htmlContent;
-  private static final byte[] marker;
-  private static final byte[] content;
+    private static final List<String> htmlContent;
+    private static final byte[] marker;
+    private static final byte[] content;
 
-  static {
-    try (InputStream is = new URL("https://www.google.com").openStream()) {
-      htmlContent = IOUtils.readLines(is, StandardCharsets.UTF_8);
-    } catch (IOException ioe) {
-      throw new RuntimeException(ioe);
+    static {
+        try (InputStream is = new URL("https://www.google.com").openStream()) {
+            htmlContent = IOUtils.readLines(is, StandardCharsets.UTF_8);
+        } catch (IOException ioe) {
+            throw new RuntimeException(ioe);
+        }
+        marker = "</head>".getBytes(StandardCharsets.UTF_8);
+        content = "<script/>".getBytes(StandardCharsets.UTF_8);
     }
-    marker = "</head>".getBytes(StandardCharsets.UTF_8);
-    content = "<script/>".getBytes(StandardCharsets.UTF_8);
-  }
 
-  @Benchmark
-  public void withPipe() throws Exception {
-    try (final PrintWriter out =
-        new PrintWriter(
-            new InjectingPipeOutputStream(new ByteArrayOutputStream(), marker, content))) {
-      htmlContent.forEach(out::println);
+    @Benchmark
+    public void withPipe() throws Exception {
+        try (final PrintWriter out =
+                new PrintWriter(new InjectingPipeOutputStream(new ByteArrayOutputStream(), marker, content))) {
+            htmlContent.forEach(out::println);
+        }
     }
-  }
 
-  @Benchmark
-  public void withoutPipe() throws Exception {
-    try (final PrintWriter out = new PrintWriter(new ByteArrayOutputStream())) {
-      htmlContent.forEach(out::println);
+    @Benchmark
+    public void withoutPipe() throws Exception {
+        try (final PrintWriter out = new PrintWriter(new ByteArrayOutputStream())) {
+            htmlContent.forEach(out::println);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenterBenchmark.java b/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenterBenchmark.java
index 9383605928f..685dc7e4c25 100644
--- a/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenterBenchmark.java
+++ b/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenterBenchmark.java
@@ -55,29 +55,29 @@
 @Threads(8)
 public class SharedDBCommenterBenchmark {
 
-  // Inner comment content (the surrounding "/*" "*/" already stripped by extractCommentContent),
-  // as a realistic mix: most queries carry a non-DD comment (or none); some already have ours.
-  static final String[] COMMENT_CONTENTS = {
-    "app generated comment", // non-DD -> all 9 contains checks (9 concats)
-    "route='/api/v1/users',batch=true", // non-DD
-    "framework='hibernate',layer='orm'", // non-DD
-    "ddps='web',dddbs='orders',traceparent='00-abc-def-01'", // DD -> short-circuits on 1st check
-  };
+    // Inner comment content (the surrounding "/*" "*/" already stripped by extractCommentContent),
+    // as a realistic mix: most queries carry a non-DD comment (or none); some already have ours.
+    static final String[] COMMENT_CONTENTS = {
+        "app generated comment", // non-DD -> all 9 contains checks (9 concats)
+        "route='/api/v1/users',batch=true", // non-DD
+        "framework='hibernate',layer='orm'", // non-DD
+        "ddps='web',dddbs='orders',traceparent='00-abc-def-01'", // DD -> short-circuits on 1st check
+    };
 
-  /** Per-thread cursor so threads don't contend on a shared index under {@code @Threads(8)}. */
-  @State(Scope.Thread)
-  public static class Cursor {
-    int index = 0;
+    /** Per-thread cursor so threads don't contend on a shared index under {@code @Threads(8)}. */
+    @State(Scope.Thread)
+    public static class Cursor {
+        int index = 0;
 
-    String next() {
-      int i = index;
-      index = (i + 1) % COMMENT_CONTENTS.length;
-      return COMMENT_CONTENTS[i];
+        String next() {
+            int i = index;
+            index = (i + 1) % COMMENT_CONTENTS.length;
+            return COMMENT_CONTENTS[i];
+        }
     }
-  }
 
-  @Benchmark
-  public boolean containsTraceComment(Cursor cursor) {
-    return SharedDBCommenter.containsTraceComment(cursor.next());
-  }
+    @Benchmark
+    public boolean containsTraceComment(Cursor cursor) {
+        return SharedDBCommenter.containsTraceComment(cursor.next());
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorBenchmark.java b/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorBenchmark.java
index e655c3213cd..6b397a74cab 100644
--- a/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorBenchmark.java
+++ b/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorBenchmark.java
@@ -42,132 +42,130 @@
 @Fork(value = 1)
 public class HttpServerDecoratorBenchmark {
 
-  @Param({"https://foo.bar:4711/normal/path", "https://foo.bar:4711/numb3r/path"})
-  String url;
-
-  Request request;
-  BenchmarkHttpServerDecorator decorator;
-  AgentSpan span;
-
-  @Setup(Level.Trial)
-  public void setUp() {
-    request = new Request("GET", URI.create(url));
-    CoreTracer tracer =
-        CoreTracer.builder()
-            .strictTraceWrites(
-                true) // Avoid any extra bookkeeping for traces since we write directly
-            .writer(new NoOpWriter()) // Avoid writing
-            .build();
-    GlobalTracer.forceRegister(tracer);
-    decorator = new BenchmarkHttpServerDecorator();
-    Context context = decorator.startSpan(emptyMap(), root());
-    span = fromContext(context);
-  }
-
-  @Benchmark
-  public void onRequest(Blackhole bh) {
-    decorator.onRequest(span, null, request, root());
-    bh.consume(span);
-  }
-
-  public static class Request {
-    private final String method;
-    private final URI uri;
-    private final URIDataAdapter uriDataAdapter;
-
-    public Request(String method, URI uri) {
-      this.method = method;
-      this.uri = uri;
-      this.uriDataAdapter = new URIDefaultDataAdapter(uri);
+    @Param({"https://foo.bar:4711/normal/path", "https://foo.bar:4711/numb3r/path"})
+    String url;
+
+    Request request;
+    BenchmarkHttpServerDecorator decorator;
+    AgentSpan span;
+
+    @Setup(Level.Trial)
+    public void setUp() {
+        request = new Request("GET", URI.create(url));
+        CoreTracer tracer = CoreTracer.builder()
+                .strictTraceWrites(true) // Avoid any extra bookkeeping for traces since we write directly
+                .writer(new NoOpWriter()) // Avoid writing
+                .build();
+        GlobalTracer.forceRegister(tracer);
+        decorator = new BenchmarkHttpServerDecorator();
+        Context context = decorator.startSpan(emptyMap(), root());
+        span = fromContext(context);
     }
 
-    public String method() {
-      return method;
+    @Benchmark
+    public void onRequest(Blackhole bh) {
+        decorator.onRequest(span, null, request, root());
+        bh.consume(span);
     }
 
-    public URIDataAdapter uriDataAdapter() {
-      return uriDataAdapter;
-    }
-  }
-
-  public static class BenchmarkHttpServerDecorator
-      extends HttpServerDecorator<Request, Void, Void, Map<String, String>> {
-
-    private static final CharSequence COMPONENT = UTF8BytesString.create("benchmark");
-
-    private final CharSequence SPAN_NAME;
-
-    public BenchmarkHttpServerDecorator() {
-      this.SPAN_NAME = UTF8BytesString.create(this.operationName());
-    }
-
-    @Override
-    protected String[] instrumentationNames() {
-      return new String[] {"benchmark"};
-    }
-
-    @Override
-    protected CharSequence component() {
-      return COMPONENT;
-    }
+    public static class Request {
+        private final String method;
+        private final URI uri;
+        private final URIDataAdapter uriDataAdapter;
 
-    @Override
-    protected AgentPropagation.ContextVisitor<Map<String, String>> getter() {
-      return ContextVisitors.stringValuesMap();
-    }
-
-    @Override
-    protected AgentPropagation.ContextVisitor<Void> responseGetter() {
-      return null;
-    }
-
-    @Override
-    public CharSequence spanName() {
-      return SPAN_NAME;
-    }
+        public Request(String method, URI uri) {
+            this.method = method;
+            this.uri = uri;
+            this.uriDataAdapter = new URIDefaultDataAdapter(uri);
+        }
 
-    @Override
-    protected String method(Request request) {
-      return request.method();
-    }
+        public String method() {
+            return method;
+        }
 
-    @Override
-    protected URIDataAdapter url(Request request) {
-      return request.uriDataAdapter();
+        public URIDataAdapter uriDataAdapter() {
+            return uriDataAdapter;
+        }
     }
 
-    @Override
-    protected String peerHostIP(Void connection) {
-      return null;
+    public static class BenchmarkHttpServerDecorator
+            extends HttpServerDecorator<Request, Void, Void, Map<String, String>> {
+
+        private static final CharSequence COMPONENT = UTF8BytesString.create("benchmark");
+
+        private final CharSequence SPAN_NAME;
+
+        public BenchmarkHttpServerDecorator() {
+            this.SPAN_NAME = UTF8BytesString.create(this.operationName());
+        }
+
+        @Override
+        protected String[] instrumentationNames() {
+            return new String[] {"benchmark"};
+        }
+
+        @Override
+        protected CharSequence component() {
+            return COMPONENT;
+        }
+
+        @Override
+        protected AgentPropagation.ContextVisitor<Map<String, String>> getter() {
+            return ContextVisitors.stringValuesMap();
+        }
+
+        @Override
+        protected AgentPropagation.ContextVisitor<Void> responseGetter() {
+            return null;
+        }
+
+        @Override
+        public CharSequence spanName() {
+            return SPAN_NAME;
+        }
+
+        @Override
+        protected String method(Request request) {
+            return request.method();
+        }
+
+        @Override
+        protected URIDataAdapter url(Request request) {
+            return request.uriDataAdapter();
+        }
+
+        @Override
+        protected String peerHostIP(Void connection) {
+            return null;
+        }
+
+        @Override
+        protected int peerPort(Void connection) {
+            return 0;
+        }
+
+        @Override
+        protected int status(Void response) {
+            return 0;
+        }
     }
 
-    @Override
-    protected int peerPort(Void connection) {
-      return 0;
-    }
+    private static class NoOpWriter implements Writer {
+        @Override
+        public void write(final List<DDSpan> trace) {}
 
-    @Override
-    protected int status(Void response) {
-      return 0;
-    }
-  }
+        @Override
+        public void start() {}
 
-  private static class NoOpWriter implements Writer {
-    @Override
-    public void write(final List<DDSpan> trace) {}
+        @Override
+        public boolean flush() {
+            return false;
+        }
 
-    @Override
-    public void start() {}
+        @Override
+        public void close() {}
 
-    @Override
-    public boolean flush() {
-      return false;
+        @Override
+        public void incrementDropCounts(final int spanCount) {}
     }
-
-    @Override
-    public void close() {}
-
-    @Override
-    public void incrementDropCounts(final int spanCount) {}
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionContextBenchmark.java b/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionContextBenchmark.java
index 5bc46035d41..713f5c7bf6c 100644
--- a/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionContextBenchmark.java
+++ b/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionContextBenchmark.java
@@ -29,21 +29,21 @@
 @Threads(8)
 public class JDBCConnectionContextBenchmark {
 
-  @State(Scope.Thread)
-  public static class ConnectionState {
-    private static final String BASE_HASH = "-6937226773133363462";
+    @State(Scope.Thread)
+    public static class ConnectionState {
+        private static final String BASE_HASH = "-6937226773133363462";
 
-    final JDBCConnectionContext context =
-        new JDBCConnectionContext(new DBInfo.Builder().type("oracle").build());
+        final JDBCConnectionContext context =
+                new JDBCConnectionContext(new DBInfo.Builder().type("oracle").build());
 
-    @Setup
-    public void setup() {
-      context.markOracleServiceHashSet(BASE_HASH);
+        @Setup
+        public void setup() {
+            context.markOracleServiceHashSet(BASE_HASH);
+        }
     }
-  }
 
-  @Benchmark
-  public boolean stableHash(ConnectionState state) {
-    return state.context.shouldSetOracleServiceHash(ConnectionState.BASE_HASH);
-  }
+    @Benchmark
+    public boolean stableHash(ConnectionState state) {
+        return state.context.shouldSetOracleServiceHash(ConnectionState.BASE_HASH);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
index 8e24c0d2b28..775571f8e0a 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
@@ -89,1932 +89,1864 @@
  */
 public class Agent {
 
-  private static final String SIMPLE_LOGGER_SHOW_DATE_TIME_PROPERTY =
-      "datadog.slf4j.simpleLogger.showDateTime";
-  private static final String SIMPLE_LOGGER_JSON_ENABLED_PROPERTY =
-      "datadog.slf4j.simpleLogger.jsonEnabled";
-  private static final String SIMPLE_LOGGER_DATE_TIME_FORMAT_JSON_DEFAULT =
-      "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
-  private static final String SIMPLE_LOGGER_DATE_TIME_FORMAT_PROPERTY =
-      "datadog.slf4j.simpleLogger.dateTimeFormat";
-  private static final String SIMPLE_LOGGER_DATE_TIME_FORMAT_DEFAULT =
-      "'[dd.trace 'yyyy-MM-dd HH:mm:ss:SSS Z']'";
-  private static final String SIMPLE_LOGGER_DEFAULT_LOG_LEVEL_PROPERTY =
-      "datadog.slf4j.simpleLogger.defaultLogLevel";
-
-  private static final String AGENT_INSTALLER_CLASS_NAME =
-      "datadog.trace.agent.tooling.AgentInstaller";
-
-  private static final int DEFAULT_JMX_START_DELAY = 15; // seconds
-
-  private static final long CLASSLOADER_CLEAN_FREQUENCY_SECONDS = 30;
-
-  private static final Logger log;
-
-  private enum AgentFeature {
-    TRACING(TraceInstrumentationConfig.TRACE_ENABLED, true),
-    JMXFETCH(JmxFetchConfig.JMX_FETCH_ENABLED, true),
-    STARTUP_LOGS(GeneralConfig.STARTUP_LOGS_ENABLED, DEFAULT_STARTUP_LOGS_ENABLED),
-    CRASH_TRACKING(
-        CrashTrackingConfig.CRASH_TRACKING_ENABLED,
-        CrashTrackingConfig.CRASH_TRACKING_ENABLED_DEFAULT),
-    PROFILING(ProfilingConfig.PROFILING_ENABLED, false),
-    APPSEC(AppSecConfig.APPSEC_ENABLED, false),
-    IAST(IastConfig.IAST_ENABLED, false),
-    REMOTE_CONFIG(RemoteConfigConfig.REMOTE_CONFIGURATION_ENABLED, true),
-    DEPRECATED_REMOTE_CONFIG(RemoteConfigConfig.REMOTE_CONFIG_ENABLED, true),
-    CWS(CwsConfig.CWS_ENABLED, false),
-    CIVISIBILITY(CiVisibilityConfig.CIVISIBILITY_ENABLED, false),
-    CIVISIBILITY_AGENTLESS(CiVisibilityConfig.CIVISIBILITY_AGENTLESS_ENABLED, false),
-    USM(UsmConfig.USM_ENABLED, false),
-    TELEMETRY(GeneralConfig.TELEMETRY_ENABLED, true),
-    DYNAMIC_INSTRUMENTATION(DebuggerConfig.DYNAMIC_INSTRUMENTATION_ENABLED, false),
-    EXCEPTION_REPLAY(DebuggerConfig.EXCEPTION_REPLAY_ENABLED, false),
-    CODE_ORIGIN(TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_ENABLED, false),
-    DATA_JOBS(GeneralConfig.DATA_JOBS_ENABLED, false),
-    AGENTLESS_LOG_SUBMISSION(GeneralConfig.AGENTLESS_LOG_SUBMISSION_ENABLED, false),
-    APP_LOGS_COLLECTION(GeneralConfig.APP_LOGS_COLLECTION_ENABLED, false),
-    LLMOBS(LlmObsConfig.LLMOBS_ENABLED, false),
-    LLMOBS_AGENTLESS(LlmObsConfig.LLMOBS_AGENTLESS_ENABLED, false);
-
-    private final String configKey;
-    private final String systemProp;
-    private final boolean enabledByDefault;
-
-    AgentFeature(final String configKey, final boolean enabledByDefault) {
-      this.configKey = configKey;
-      this.systemProp = propertyNameToSystemPropertyName(configKey);
-      this.enabledByDefault = enabledByDefault;
-    }
-
-    public String getConfigKey() {
-      return configKey;
-    }
-
-    public String getSystemProp() {
-      return systemProp;
-    }
-
-    public boolean isEnabledByDefault() {
-      return enabledByDefault;
-    }
-  }
-
-  static {
-    // We can configure logger here because datadog.trace.agent.AgentBootstrap doesn't touch it.
-    configureLogger();
-    log = LoggerFactory.getLogger(Agent.class);
-  }
-
-  private static final AtomicBoolean jmxStarting = new AtomicBoolean();
-
-  // fields must be managed under class lock
-  private static ClassLoader AGENT_CLASSLOADER = null;
-
-  private static volatile Runnable PROFILER_INIT_AFTER_JMX = null;
-  private static volatile Runnable CRASHTRACKER_INIT_AFTER_JMX = null;
-
-  private static boolean jmxFetchEnabled = true;
-  private static boolean profilingEnabled = false;
-  private static boolean crashTrackingEnabled = false;
-  private static boolean appSecEnabled;
-  private static boolean appSecFullyDisabled;
-  private static boolean remoteConfigEnabled = true;
-  private static boolean iastEnabled = false;
-  private static boolean iastFullyDisabled;
-  private static boolean cwsEnabled = false;
-  private static boolean ciVisibilityEnabled = false;
-  private static boolean llmObsEnabled = false;
-  private static boolean llmObsAgentlessEnabled = false;
-  private static boolean usmEnabled = false;
-  private static boolean telemetryEnabled = true;
-  private static boolean flareEnabled = true;
-  private static boolean dynamicInstrumentationEnabled = false;
-  private static boolean exceptionReplayEnabled = false;
-  private static boolean codeOriginEnabled = false;
-  private static boolean distributedDebuggerEnabled = false;
-  private static boolean agentlessLogSubmissionEnabled = false;
-  private static boolean appLogsCollectionEnabled = false;
-  private static boolean featureFlaggingEnabled = false;
-
-  private static void safelySetContextClassLoader(ClassLoader classLoader) {
-    try {
-      // this method call can cause a SecurityException if a security manager is installed.
-      Thread.currentThread().setContextClassLoader(classLoader);
-    } catch (final Throwable ignored) {
-    }
-  }
-
-  /**
-   * Starts the agent; returns a boolean indicating if Agent started successfully
-   *
-   * <p>The Agent is considered to start successfully if Instrumentation can be activated. All other
-   * pieces are considered optional.
-   */
-  @SuppressFBWarnings("AT_STALE_THREAD_WRITE_OF_PRIMITIVE")
-  public static void start(
-      final Object bootstrapInitTelemetry,
-      final Instrumentation inst,
-      final URL agentJarURL,
-      final String agentArgs) {
-    InitializationTelemetry initTelemetry = InitializationTelemetry.proxy(bootstrapInitTelemetry);
-
-    StaticEventLogger.begin("Agent");
-    StaticEventLogger.begin("Agent.start");
-
-    try {
-      ClassInjector.enableClassInjection(inst);
-    } catch (Throwable e) {
-      log.debug("Instrumentation-based class injection is not available", e);
-      setSystemPropertyDefault(
-          propertyNameToSystemPropertyName(TraceInstrumentationConfig.UNSAFE_CLASS_INJECTION),
-          "true");
-    }
-
-    createAgentClassloader(agentJarURL);
-
-    AgentTracer.maybeInstallLegacyContextManager();
-
-    if (Platform.isNativeImageBuilder()) {
-      // these default services are not used during native-image builds
-      remoteConfigEnabled = false;
-      telemetryEnabled = false;
-      flareEnabled = false;
-      // apply trace instrumentation, but skip other products at native-image build time
-      startDatadogAgent(initTelemetry, inst);
-      StaticEventLogger.end("Agent.start");
-      return;
-    }
-
-    if (agentArgs != null && !agentArgs.isEmpty()) {
-      injectAgentArgsConfig(agentArgs);
-    }
-
-    configureCiVisibility(agentJarURL);
-
-    // Halt agent start if DJM is enabled and is not successfully configure
-    if (!configureDataJobsMonitoring()) {
-      return;
-    }
-
-    if (!isSupportedAppSecArch()) {
-      log.debug(
-          "OS and architecture ({}/{}) not supported by AppSec, dd.appsec.enabled will default to false",
-          SystemProperties.get("os.name"),
-          SystemProperties.get("os.arch"));
-      setSystemPropertyDefault(AgentFeature.APPSEC.getSystemProp(), "false");
-    }
-
-    jmxFetchEnabled = isFeatureEnabled(AgentFeature.JMXFETCH);
-    profilingEnabled = isFeatureEnabled(AgentFeature.PROFILING);
-    crashTrackingEnabled = isFeatureEnabled(AgentFeature.CRASH_TRACKING);
-    usmEnabled = isFeatureEnabled(AgentFeature.USM);
-    appSecEnabled = isFeatureEnabled(AgentFeature.APPSEC);
-    appSecFullyDisabled = isFullyDisabled(AgentFeature.APPSEC);
-    iastEnabled = isFeatureEnabled(AgentFeature.IAST);
-    iastFullyDisabled = isIastFullyDisabled(appSecEnabled);
-    remoteConfigEnabled =
-        isFeatureEnabled(AgentFeature.REMOTE_CONFIG)
-            || isFeatureEnabled(AgentFeature.DEPRECATED_REMOTE_CONFIG);
-    cwsEnabled = isFeatureEnabled(AgentFeature.CWS);
-    telemetryEnabled = isFeatureEnabled(AgentFeature.TELEMETRY);
-    dynamicInstrumentationEnabled = isFeatureEnabled(AgentFeature.DYNAMIC_INSTRUMENTATION);
-    exceptionReplayEnabled = isFeatureEnabled(AgentFeature.EXCEPTION_REPLAY);
-    codeOriginEnabled = isFeatureEnabled(AgentFeature.CODE_ORIGIN);
-    agentlessLogSubmissionEnabled = isFeatureEnabled(AgentFeature.AGENTLESS_LOG_SUBMISSION);
-    appLogsCollectionEnabled = isFeatureEnabled(AgentFeature.APP_LOGS_COLLECTION);
-    llmObsEnabled = isFeatureEnabled(AgentFeature.LLMOBS);
-    featureFlaggingEnabled = isFeatureFlaggingEnabled();
-
-    // setup writers when llmobs is enabled to accomodate apm and llmobs
-    if (llmObsEnabled) {
-      // for llm obs spans, use agent proxy by default, apm spans will use agent writer
-      setSystemPropertyDefault(
-          propertyNameToSystemPropertyName(TracerConfig.WRITER_TYPE),
-          WriterConstants.MULTI_WRITER_TYPE
-              + ":"
-              + WriterConstants.DD_INTAKE_WRITER_TYPE
-              + ","
-              + WriterConstants.DD_AGENT_WRITER_TYPE);
-      if (llmObsAgentlessEnabled) {
-        // use API writer only
-        setSystemPropertyDefault(
-            propertyNameToSystemPropertyName(TracerConfig.WRITER_TYPE),
-            WriterConstants.DD_INTAKE_WRITER_TYPE);
-      }
-    }
-
-    boolean retryProfilerStart = false;
-    if (profilingEnabled) {
-      if (!isOracleJDK8()) {
-        // Profiling agent startup code is written in a way to allow `startProfilingAgent` be called
-        // multiple times
-        // If early profiling is enabled then this call will start profiling.
-        // If early profiling is disabled then later call will do this.
-        retryProfilerStart = startProfilingAgent(true, true, inst);
-      } else {
-        log.debug("Oracle JDK 8 detected. Delaying profiler initialization.");
-        // Profiling can not run early on Oracle JDK 8 because it will cause JFR initialization
-        // deadlock.
-        // Oracle JDK 8 JFR controller requires JMX so register an 'after-jmx-initialized' callback.
-        PROFILER_INIT_AFTER_JMX = () -> startProfilingAgent(false, true, inst);
-      }
-    }
-
-    if (cwsEnabled) {
-      startCwsAgent();
-    }
-
-    /*
-     * Force the task scheduler init early. The exception profiling instrumentation may get in way of the initialization
-     * when it will happen after the class transformers were added.
-     */
-    AgentTaskScheduler.initialize();
+    private static final String SIMPLE_LOGGER_SHOW_DATE_TIME_PROPERTY = "datadog.slf4j.simpleLogger.showDateTime";
+    private static final String SIMPLE_LOGGER_JSON_ENABLED_PROPERTY = "datadog.slf4j.simpleLogger.jsonEnabled";
+    private static final String SIMPLE_LOGGER_DATE_TIME_FORMAT_JSON_DEFAULT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
+    private static final String SIMPLE_LOGGER_DATE_TIME_FORMAT_PROPERTY = "datadog.slf4j.simpleLogger.dateTimeFormat";
+    private static final String SIMPLE_LOGGER_DATE_TIME_FORMAT_DEFAULT = "'[dd.trace 'yyyy-MM-dd HH:mm:ss:SSS Z']'";
+    private static final String SIMPLE_LOGGER_DEFAULT_LOG_LEVEL_PROPERTY = "datadog.slf4j.simpleLogger.defaultLogLevel";
+
+    private static final String AGENT_INSTALLER_CLASS_NAME = "datadog.trace.agent.tooling.AgentInstaller";
+
+    private static final int DEFAULT_JMX_START_DELAY = 15; // seconds
+
+    private static final long CLASSLOADER_CLEAN_FREQUENCY_SECONDS = 30;
+
+    private static final Logger log;
+
+    private enum AgentFeature {
+        TRACING(TraceInstrumentationConfig.TRACE_ENABLED, true),
+        JMXFETCH(JmxFetchConfig.JMX_FETCH_ENABLED, true),
+        STARTUP_LOGS(GeneralConfig.STARTUP_LOGS_ENABLED, DEFAULT_STARTUP_LOGS_ENABLED),
+        CRASH_TRACKING(CrashTrackingConfig.CRASH_TRACKING_ENABLED, CrashTrackingConfig.CRASH_TRACKING_ENABLED_DEFAULT),
+        PROFILING(ProfilingConfig.PROFILING_ENABLED, false),
+        APPSEC(AppSecConfig.APPSEC_ENABLED, false),
+        IAST(IastConfig.IAST_ENABLED, false),
+        REMOTE_CONFIG(RemoteConfigConfig.REMOTE_CONFIGURATION_ENABLED, true),
+        DEPRECATED_REMOTE_CONFIG(RemoteConfigConfig.REMOTE_CONFIG_ENABLED, true),
+        CWS(CwsConfig.CWS_ENABLED, false),
+        CIVISIBILITY(CiVisibilityConfig.CIVISIBILITY_ENABLED, false),
+        CIVISIBILITY_AGENTLESS(CiVisibilityConfig.CIVISIBILITY_AGENTLESS_ENABLED, false),
+        USM(UsmConfig.USM_ENABLED, false),
+        TELEMETRY(GeneralConfig.TELEMETRY_ENABLED, true),
+        DYNAMIC_INSTRUMENTATION(DebuggerConfig.DYNAMIC_INSTRUMENTATION_ENABLED, false),
+        EXCEPTION_REPLAY(DebuggerConfig.EXCEPTION_REPLAY_ENABLED, false),
+        CODE_ORIGIN(TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_ENABLED, false),
+        DATA_JOBS(GeneralConfig.DATA_JOBS_ENABLED, false),
+        AGENTLESS_LOG_SUBMISSION(GeneralConfig.AGENTLESS_LOG_SUBMISSION_ENABLED, false),
+        APP_LOGS_COLLECTION(GeneralConfig.APP_LOGS_COLLECTION_ENABLED, false),
+        LLMOBS(LlmObsConfig.LLMOBS_ENABLED, false),
+        LLMOBS_AGENTLESS(LlmObsConfig.LLMOBS_AGENTLESS_ENABLED, false);
+
+        private final String configKey;
+        private final String systemProp;
+        private final boolean enabledByDefault;
+
+        AgentFeature(final String configKey, final boolean enabledByDefault) {
+            this.configKey = configKey;
+            this.systemProp = propertyNameToSystemPropertyName(configKey);
+            this.enabledByDefault = enabledByDefault;
+        }
 
-    // We need to run the crashtracking initialization after all the config has been resolved and
-    // task scheduler initialized
-    if (crashTrackingEnabled) {
-      StaticEventLogger.begin("crashtracking");
-      startCrashTracking();
-      StaticEventLogger.end("crashtracking");
-    }
+        public String getConfigKey() {
+            return configKey;
+        }
 
-    startDatadogAgent(initTelemetry, inst);
+        public String getSystemProp() {
+            return systemProp;
+        }
 
-    final EnumSet<Library> libraries = detectLibraries(log);
+        public boolean isEnabledByDefault() {
+            return enabledByDefault;
+        }
+    }
 
-    final boolean appUsingCustomLogManager = isAppUsingCustomLogManager(libraries);
-    final boolean appUsingCustomJMXBuilder = isAppUsingCustomJMXBuilder(libraries);
+    static {
+        // We can configure logger here because datadog.trace.agent.AgentBootstrap doesn't touch it.
+        configureLogger();
+        log = LoggerFactory.getLogger(Agent.class);
+    }
+
+    private static final AtomicBoolean jmxStarting = new AtomicBoolean();
+
+    // fields must be managed under class lock
+    private static ClassLoader AGENT_CLASSLOADER = null;
+
+    private static volatile Runnable PROFILER_INIT_AFTER_JMX = null;
+    private static volatile Runnable CRASHTRACKER_INIT_AFTER_JMX = null;
+
+    private static boolean jmxFetchEnabled = true;
+    private static boolean profilingEnabled = false;
+    private static boolean crashTrackingEnabled = false;
+    private static boolean appSecEnabled;
+    private static boolean appSecFullyDisabled;
+    private static boolean remoteConfigEnabled = true;
+    private static boolean iastEnabled = false;
+    private static boolean iastFullyDisabled;
+    private static boolean cwsEnabled = false;
+    private static boolean ciVisibilityEnabled = false;
+    private static boolean llmObsEnabled = false;
+    private static boolean llmObsAgentlessEnabled = false;
+    private static boolean usmEnabled = false;
+    private static boolean telemetryEnabled = true;
+    private static boolean flareEnabled = true;
+    private static boolean dynamicInstrumentationEnabled = false;
+    private static boolean exceptionReplayEnabled = false;
+    private static boolean codeOriginEnabled = false;
+    private static boolean distributedDebuggerEnabled = false;
+    private static boolean agentlessLogSubmissionEnabled = false;
+    private static boolean appLogsCollectionEnabled = false;
+    private static boolean featureFlaggingEnabled = false;
+
+    private static void safelySetContextClassLoader(ClassLoader classLoader) {
+        try {
+            // this method call can cause a SecurityException if a security manager is installed.
+            Thread.currentThread().setContextClassLoader(classLoader);
+        } catch (final Throwable ignored) {
+        }
+    }
 
-    /*
-     * java.util.logging.LogManager maintains a final static LogManager, which is created during class initialization.
-     *
-     * JMXFetch uses jre bootstrap classes which touch this class. This means applications which require a custom log
-     * manager may not have a chance to set the global log manager if jmxfetch runs first. JMXFetch will incorrectly
-     * set the global log manager in cases where the app sets the log manager system property or when the log manager
-     * class is not on the system classpath.
-     *
-     * Our solution is to delay the initialization of jmxfetch when we detect a custom log manager being used.
+    /**
+     * Starts the agent; returns a boolean indicating if Agent started successfully
      *
-     * Once we see the LogManager class loading, it's safe to start jmxfetch because the application is already setting
-     * the global log manager and jmxfetch won't be able to touch it due to classloader locking.
-     *
-     * Likewise if a custom JMX builder is configured which is not on the system classpath then we delay starting
-     * JMXFetch until we detect the custom MBeanServerBuilder is being used. This takes precedence over the custom
-     * log manager check because any custom log manager will be installed before any custom MBeanServerBuilder.
-     */
-    if (jmxFetchEnabled || profilingEnabled) { // both features use JMX
-      int jmxStartDelay = getJmxStartDelay();
-      if (appUsingCustomJMXBuilder) {
-        log.debug("Custom JMX builder detected. Delaying JMXFetch initialization.");
-        registerMBeanServerBuilderCallback(new StartJmxCallback(jmxStartDelay));
-      } else if (appUsingCustomLogManager) {
-        log.debug("Custom logger detected. Delaying JMXFetch initialization.");
-        registerLogManagerCallback(new StartJmxCallback(jmxStartDelay));
-      } else {
-        scheduleJmxStart(jmxStartDelay);
-      }
-    }
-
-    /*
-     * Similar thing happens with DatadogTracer on (at least) zulu-8 because it uses OkHttp which indirectly loads JFR
-     * events which in turn loads LogManager. This is not a problem on newer JDKs because there JFR uses different
-     * logging facility. Likewise on IBM JDKs OkHttp may indirectly load 'IBMSASL' which in turn loads LogManager.
+     * <p>The Agent is considered to start successfully if Instrumentation can be activated. All other
+     * pieces are considered optional.
      */
-    boolean delayOkHttp = !ciVisibilityEnabled && okHttpMayIndirectlyLoadJUL();
-    boolean waitForJUL = appUsingCustomLogManager && delayOkHttp;
-    int okHttpDelayMillis;
-    if (waitForJUL) {
-      okHttpDelayMillis = 1_000;
-    } else if (delayOkHttp) {
-      okHttpDelayMillis = 100;
-    } else {
-      okHttpDelayMillis = 0;
-    }
-
-    InstallDatadogTracerCallback installDatadogTracerCallback =
-        new InstallDatadogTracerCallback(initTelemetry, inst, okHttpDelayMillis);
-    if (waitForJUL) {
-      log.debug("Custom logger detected. Delaying Datadog Tracer initialization.");
-      registerLogManagerCallback(installDatadogTracerCallback);
-    } else if (okHttpDelayMillis > 0) {
-      installDatadogTracerCallback.run(); // complete on different thread (after premain)
-    } else {
-      installDatadogTracerCallback.execute(); // complete on primordial thread in premain
-    }
-
-    /*
-     * Similar thing happens with Profiler on zulu-8 because it is using OkHttp which indirectly loads JFR events which
-     * in turn loads LogManager. This is not a problem on newer JDKs because there JFR uses different logging facility.
-     */
-    if (profilingEnabled && !isOracleJDK8()) {
-      StaticEventLogger.begin("Profiling");
-
-      if (waitForJUL) {
-        log.debug("Custom logger detected. Delaying Profiling initialization.");
-        registerLogManagerCallback(new StartProfilingAgentCallback(inst));
-      } else {
-        startProfilingAgent(false, retryProfilerStart, inst);
-        // only enable instrumentation based profilers when we know JFR is ready
-        InstrumentationBasedProfiling.enableInstrumentationBasedProfiling();
-      }
-
-      StaticEventLogger.end("Profiling");
-    }
-
-    // This task removes stale ClassLoaderValue entries where the class-loader is gone
-    // It only runs a couple of times a minute since class-loaders are rarely unloaded
-    AgentTaskScheduler.get()
-        .scheduleAtFixedRate(
-            ClassLoaderValue::removeStaleEntries,
-            CLASSLOADER_CLEAN_FREQUENCY_SECONDS,
-            CLASSLOADER_CLEAN_FREQUENCY_SECONDS,
-            TimeUnit.SECONDS);
-
-    StaticEventLogger.end("Agent.start");
-  }
-
-  private static boolean configureDataJobsMonitoring() {
-    boolean dataJobsEnabled = isFeatureEnabled(AgentFeature.DATA_JOBS);
-    if (dataJobsEnabled) {
-      log.info("Data Jobs Monitoring enabled, enabling spark integrations");
-
-      setSystemPropertyDefault(
-          propertyNameToSystemPropertyName(TracerConfig.TRACE_LONG_RUNNING_ENABLED), "true");
-      setSystemPropertyDefault(
-          propertyNameToSystemPropertyName("integration.spark.enabled"), "true");
-      setSystemPropertyDefault(
-          propertyNameToSystemPropertyName("integration.spark-executor.enabled"), "true");
-
-      if ("true".equals(ddGetProperty(propertyNameToSystemPropertyName(DATA_JOBS_ENABLED)))) {
-        setSystemPropertyDefault(
-            propertyNameToSystemPropertyName("integration.spark-openlineage.enabled"), "true");
-      }
-
-      String javaCommand = String.join(" ", JavaVirtualMachine.getCommandArguments());
-      String dataJobsCommandPattern =
-          ddGetProperty(propertyNameToSystemPropertyName(DATA_JOBS_COMMAND_PATTERN));
-      if (!isDataJobsSupported(javaCommand, dataJobsCommandPattern)) {
-        log.warn(
-            "Data Jobs Monitoring is not compatible with non-spark command {} based on command pattern {}. dd-trace-java will not be installed",
-            javaCommand,
-            dataJobsCommandPattern);
-        return false;
-      }
-    }
-    return true;
-  }
-
-  private static void injectAgentArgsConfig(String agentArgs) {
-    try {
-      final Class<?> agentArgsInjectorClass =
-          AGENT_CLASSLOADER.loadClass("datadog.trace.bootstrap.config.provider.AgentArgsInjector");
-      final Method registerCallbackMethod =
-          agentArgsInjectorClass.getMethod("injectAgentArgsConfig", String.class);
-      registerCallbackMethod.invoke(null, agentArgs);
-    } catch (final Exception ex) {
-      log.error("Error injecting agent args config {}", agentArgs, ex);
-    }
-  }
-
-  @SuppressFBWarnings("AT_STALE_THREAD_WRITE_OF_PRIMITIVE")
-  private static void configureCiVisibility(URL agentJarURL) {
-    // Retro-compatibility for the old way to configure CI Visibility
-    if ("true".equals(ddGetProperty("dd.integration.junit.enabled"))
-        || "true".equals(ddGetProperty("dd.integration.testng.enabled"))) {
-      setSystemPropertyDefault(AgentFeature.CIVISIBILITY.getSystemProp(), "true");
-    }
-
-    ciVisibilityEnabled = isFeatureEnabled(AgentFeature.CIVISIBILITY);
-    if (ciVisibilityEnabled) {
-      // if CI Visibility is enabled, all the other features are disabled by default
-      // unless the user had explicitly enabled them.
-      setSystemPropertyDefault(AgentFeature.JMXFETCH.getSystemProp(), "false");
-      setSystemPropertyDefault(AgentFeature.PROFILING.getSystemProp(), "false");
-      setSystemPropertyDefault(AgentFeature.APPSEC.getSystemProp(), "false");
-      setSystemPropertyDefault(AgentFeature.IAST.getSystemProp(), "false");
-      setSystemPropertyDefault(AgentFeature.REMOTE_CONFIG.getSystemProp(), "false");
-      setSystemPropertyDefault(AgentFeature.CWS.getSystemProp(), "false");
-
-      /*if CI Visibility is enabled, the PrioritizationType should be {@code Prioritization.ENSURE_TRACE} */
-      setSystemPropertyDefault(
-          propertyNameToSystemPropertyName(TracerConfig.PRIORITIZATION_TYPE), "ENSURE_TRACE");
-
-      try {
-        setSystemPropertyDefault(
-            propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_AGENT_JAR_URI),
-            agentJarURL.toURI().toString());
-      } catch (URISyntaxException e) {
-        throw new IllegalArgumentException(
-            "Could not create URI from agent JAR URL: " + agentJarURL, e);
-      }
-    }
-
-    // Enable automatic fetching of git tags from datadog_git.properties only if CI Visibility is
-    // not enabled
-    if (!ciVisibilityEnabled) {
-      GitInfoProvider.INSTANCE.registerGitInfoBuilder(new EmbeddedGitInfoBuilder());
-    }
-  }
-
-  public static void shutdown(final boolean sync) {
-    StaticEventLogger.end("Agent");
-    StaticEventLogger.stop();
-
-    if (profilingEnabled) {
-      shutdownProfilingAgent(sync);
-    }
-    // Before telemetry: the feature flagging writers queue drop/degradation metrics during their
-    // final flush, and only a still-running telemetry worker can drain and transmit them.
-    if (featureFlaggingEnabled) {
-      shutdownFeatureFlagging(AGENT_CLASSLOADER);
-    }
-    if (telemetryEnabled) {
-      stopTelemetry();
-    }
-    if (flareEnabled) {
-      stopFlarePoller();
-    }
-
-    if (agentlessLogSubmissionEnabled) {
-      shutdownLogsIntake();
-    }
-  }
-
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification = "Agent-internal class; Class lock does not escape to application code")
-  public static synchronized Class<?> installAgentCLI() throws Exception {
-    if (null == AGENT_CLASSLOADER) {
-      // in CLI mode we skip installation of instrumentation because we're not running as an agent
-      // we still create the agent classloader so we can install the tracer and query integrations
-      CodeSource codeSource = Agent.class.getProtectionDomain().getCodeSource();
-      if (codeSource == null || codeSource.getLocation() == null) {
-        throw new MalformedURLException("Could not get jar location from code source");
-      }
-      createAgentClassloader(codeSource.getLocation());
-    }
-    return AGENT_CLASSLOADER.loadClass("datadog.trace.agent.tooling.AgentCLI");
-  }
-
-  /** Used by AgentCLI to send sample traces from the command-line. */
-  public static void startDatadogTracer(InitializationTelemetry initTelemetry) throws Exception {
-    Class<?> scoClass =
-        AGENT_CLASSLOADER.loadClass("datadog.communication.ddagent.SharedCommunicationObjects");
-    installDatadogTracer(initTelemetry, scoClass, scoClass.getConstructor().newInstance());
-    startJmx(); // send runtime metrics along with the traces
-  }
-
-  private static void registerLogManagerCallback(final ClassLoadCallBack callback) {
-    // one minute fail-safe in case the class was unintentionally loaded during premain
-    AgentTaskScheduler.get().schedule(callback, 1, TimeUnit.MINUTES);
-    try {
-      final Class<?> agentInstallerClass = AGENT_CLASSLOADER.loadClass(AGENT_INSTALLER_CLASS_NAME);
-      final Method registerCallbackMethod =
-          agentInstallerClass.getMethod("registerClassLoadCallback", String.class, Runnable.class);
-      registerCallbackMethod.invoke(null, "java.util.logging.LogManager", callback);
-    } catch (final Exception ex) {
-      log.error("Error registering callback for {}", callback.agentThread(), ex);
-    }
-  }
-
-  private static void registerMBeanServerBuilderCallback(final ClassLoadCallBack callback) {
-    // one minute fail-safe in case the class was unintentionally loaded during premain
-    AgentTaskScheduler.get().schedule(callback, 1, TimeUnit.MINUTES);
-    try {
-      final Class<?> agentInstallerClass = AGENT_CLASSLOADER.loadClass(AGENT_INSTALLER_CLASS_NAME);
-      final Method registerCallbackMethod =
-          agentInstallerClass.getMethod("registerClassLoadCallback", String.class, Runnable.class);
-      registerCallbackMethod.invoke(null, "javax.management.MBeanServerBuilder", callback);
-    } catch (final Exception ex) {
-      log.error("Error registering callback for {}", callback.agentThread(), ex);
-    }
-  }
-
-  protected abstract static class ClassLoadCallBack implements Runnable {
-    private final AtomicBoolean starting = new AtomicBoolean();
-
-    @Override
-    public void run() {
-      if (starting.getAndSet(true)) {
-        return; // someone has already called us
-      }
-
-      /*
-       * This callback is called from within bytecode transformer. This can be a problem if callback tries
-       * to load classes being transformed. To avoid this we start a thread here that calls the callback.
-       * This seems to resolve this problem.
-       */
-      final Thread thread =
-          newAgentThread(
-              agentThread(),
-              new Runnable() {
+    @SuppressFBWarnings("AT_STALE_THREAD_WRITE_OF_PRIMITIVE")
+    public static void start(
+            final Object bootstrapInitTelemetry,
+            final Instrumentation inst,
+            final URL agentJarURL,
+            final String agentArgs) {
+        InitializationTelemetry initTelemetry = InitializationTelemetry.proxy(bootstrapInitTelemetry);
+
+        StaticEventLogger.begin("Agent");
+        StaticEventLogger.begin("Agent.start");
+
+        try {
+            ClassInjector.enableClassInjection(inst);
+        } catch (Throwable e) {
+            log.debug("Instrumentation-based class injection is not available", e);
+            setSystemPropertyDefault(
+                    propertyNameToSystemPropertyName(TraceInstrumentationConfig.UNSAFE_CLASS_INJECTION), "true");
+        }
+
+        createAgentClassloader(agentJarURL);
+
+        AgentTracer.maybeInstallLegacyContextManager();
+
+        if (Platform.isNativeImageBuilder()) {
+            // these default services are not used during native-image builds
+            remoteConfigEnabled = false;
+            telemetryEnabled = false;
+            flareEnabled = false;
+            // apply trace instrumentation, but skip other products at native-image build time
+            startDatadogAgent(initTelemetry, inst);
+            StaticEventLogger.end("Agent.start");
+            return;
+        }
+
+        if (agentArgs != null && !agentArgs.isEmpty()) {
+            injectAgentArgsConfig(agentArgs);
+        }
+
+        configureCiVisibility(agentJarURL);
+
+        // Halt agent start if DJM is enabled and is not successfully configure
+        if (!configureDataJobsMonitoring()) {
+            return;
+        }
+
+        if (!isSupportedAppSecArch()) {
+            log.debug(
+                    "OS and architecture ({}/{}) not supported by AppSec, dd.appsec.enabled will default to false",
+                    SystemProperties.get("os.name"),
+                    SystemProperties.get("os.arch"));
+            setSystemPropertyDefault(AgentFeature.APPSEC.getSystemProp(), "false");
+        }
+
+        jmxFetchEnabled = isFeatureEnabled(AgentFeature.JMXFETCH);
+        profilingEnabled = isFeatureEnabled(AgentFeature.PROFILING);
+        crashTrackingEnabled = isFeatureEnabled(AgentFeature.CRASH_TRACKING);
+        usmEnabled = isFeatureEnabled(AgentFeature.USM);
+        appSecEnabled = isFeatureEnabled(AgentFeature.APPSEC);
+        appSecFullyDisabled = isFullyDisabled(AgentFeature.APPSEC);
+        iastEnabled = isFeatureEnabled(AgentFeature.IAST);
+        iastFullyDisabled = isIastFullyDisabled(appSecEnabled);
+        remoteConfigEnabled =
+                isFeatureEnabled(AgentFeature.REMOTE_CONFIG) || isFeatureEnabled(AgentFeature.DEPRECATED_REMOTE_CONFIG);
+        cwsEnabled = isFeatureEnabled(AgentFeature.CWS);
+        telemetryEnabled = isFeatureEnabled(AgentFeature.TELEMETRY);
+        dynamicInstrumentationEnabled = isFeatureEnabled(AgentFeature.DYNAMIC_INSTRUMENTATION);
+        exceptionReplayEnabled = isFeatureEnabled(AgentFeature.EXCEPTION_REPLAY);
+        codeOriginEnabled = isFeatureEnabled(AgentFeature.CODE_ORIGIN);
+        agentlessLogSubmissionEnabled = isFeatureEnabled(AgentFeature.AGENTLESS_LOG_SUBMISSION);
+        appLogsCollectionEnabled = isFeatureEnabled(AgentFeature.APP_LOGS_COLLECTION);
+        llmObsEnabled = isFeatureEnabled(AgentFeature.LLMOBS);
+        featureFlaggingEnabled = isFeatureFlaggingEnabled();
+
+        // setup writers when llmobs is enabled to accomodate apm and llmobs
+        if (llmObsEnabled) {
+            // for llm obs spans, use agent proxy by default, apm spans will use agent writer
+            setSystemPropertyDefault(
+                    propertyNameToSystemPropertyName(TracerConfig.WRITER_TYPE),
+                    WriterConstants.MULTI_WRITER_TYPE
+                            + ":"
+                            + WriterConstants.DD_INTAKE_WRITER_TYPE
+                            + ","
+                            + WriterConstants.DD_AGENT_WRITER_TYPE);
+            if (llmObsAgentlessEnabled) {
+                // use API writer only
+                setSystemPropertyDefault(
+                        propertyNameToSystemPropertyName(TracerConfig.WRITER_TYPE),
+                        WriterConstants.DD_INTAKE_WRITER_TYPE);
+            }
+        }
+
+        boolean retryProfilerStart = false;
+        if (profilingEnabled) {
+            if (!isOracleJDK8()) {
+                // Profiling agent startup code is written in a way to allow `startProfilingAgent` be called
+                // multiple times
+                // If early profiling is enabled then this call will start profiling.
+                // If early profiling is disabled then later call will do this.
+                retryProfilerStart = startProfilingAgent(true, true, inst);
+            } else {
+                log.debug("Oracle JDK 8 detected. Delaying profiler initialization.");
+                // Profiling can not run early on Oracle JDK 8 because it will cause JFR initialization
+                // deadlock.
+                // Oracle JDK 8 JFR controller requires JMX so register an 'after-jmx-initialized' callback.
+                PROFILER_INIT_AFTER_JMX = () -> startProfilingAgent(false, true, inst);
+            }
+        }
+
+        if (cwsEnabled) {
+            startCwsAgent();
+        }
+
+        /*
+         * Force the task scheduler init early. The exception profiling instrumentation may get in way of the initialization
+         * when it will happen after the class transformers were added.
+         */
+        AgentTaskScheduler.initialize();
+
+        // We need to run the crashtracking initialization after all the config has been resolved and
+        // task scheduler initialized
+        if (crashTrackingEnabled) {
+            StaticEventLogger.begin("crashtracking");
+            startCrashTracking();
+            StaticEventLogger.end("crashtracking");
+        }
+
+        startDatadogAgent(initTelemetry, inst);
+
+        final EnumSet<Library> libraries = detectLibraries(log);
+
+        final boolean appUsingCustomLogManager = isAppUsingCustomLogManager(libraries);
+        final boolean appUsingCustomJMXBuilder = isAppUsingCustomJMXBuilder(libraries);
+
+        /*
+         * java.util.logging.LogManager maintains a final static LogManager, which is created during class initialization.
+         *
+         * JMXFetch uses jre bootstrap classes which touch this class. This means applications which require a custom log
+         * manager may not have a chance to set the global log manager if jmxfetch runs first. JMXFetch will incorrectly
+         * set the global log manager in cases where the app sets the log manager system property or when the log manager
+         * class is not on the system classpath.
+         *
+         * Our solution is to delay the initialization of jmxfetch when we detect a custom log manager being used.
+         *
+         * Once we see the LogManager class loading, it's safe to start jmxfetch because the application is already setting
+         * the global log manager and jmxfetch won't be able to touch it due to classloader locking.
+         *
+         * Likewise if a custom JMX builder is configured which is not on the system classpath then we delay starting
+         * JMXFetch until we detect the custom MBeanServerBuilder is being used. This takes precedence over the custom
+         * log manager check because any custom log manager will be installed before any custom MBeanServerBuilder.
+         */
+        if (jmxFetchEnabled || profilingEnabled) { // both features use JMX
+            int jmxStartDelay = getJmxStartDelay();
+            if (appUsingCustomJMXBuilder) {
+                log.debug("Custom JMX builder detected. Delaying JMXFetch initialization.");
+                registerMBeanServerBuilderCallback(new StartJmxCallback(jmxStartDelay));
+            } else if (appUsingCustomLogManager) {
+                log.debug("Custom logger detected. Delaying JMXFetch initialization.");
+                registerLogManagerCallback(new StartJmxCallback(jmxStartDelay));
+            } else {
+                scheduleJmxStart(jmxStartDelay);
+            }
+        }
+
+        /*
+         * Similar thing happens with DatadogTracer on (at least) zulu-8 because it uses OkHttp which indirectly loads JFR
+         * events which in turn loads LogManager. This is not a problem on newer JDKs because there JFR uses different
+         * logging facility. Likewise on IBM JDKs OkHttp may indirectly load 'IBMSASL' which in turn loads LogManager.
+         */
+        boolean delayOkHttp = !ciVisibilityEnabled && okHttpMayIndirectlyLoadJUL();
+        boolean waitForJUL = appUsingCustomLogManager && delayOkHttp;
+        int okHttpDelayMillis;
+        if (waitForJUL) {
+            okHttpDelayMillis = 1_000;
+        } else if (delayOkHttp) {
+            okHttpDelayMillis = 100;
+        } else {
+            okHttpDelayMillis = 0;
+        }
+
+        InstallDatadogTracerCallback installDatadogTracerCallback =
+                new InstallDatadogTracerCallback(initTelemetry, inst, okHttpDelayMillis);
+        if (waitForJUL) {
+            log.debug("Custom logger detected. Delaying Datadog Tracer initialization.");
+            registerLogManagerCallback(installDatadogTracerCallback);
+        } else if (okHttpDelayMillis > 0) {
+            installDatadogTracerCallback.run(); // complete on different thread (after premain)
+        } else {
+            installDatadogTracerCallback.execute(); // complete on primordial thread in premain
+        }
+
+        /*
+         * Similar thing happens with Profiler on zulu-8 because it is using OkHttp which indirectly loads JFR events which
+         * in turn loads LogManager. This is not a problem on newer JDKs because there JFR uses different logging facility.
+         */
+        if (profilingEnabled && !isOracleJDK8()) {
+            StaticEventLogger.begin("Profiling");
+
+            if (waitForJUL) {
+                log.debug("Custom logger detected. Delaying Profiling initialization.");
+                registerLogManagerCallback(new StartProfilingAgentCallback(inst));
+            } else {
+                startProfilingAgent(false, retryProfilerStart, inst);
+                // only enable instrumentation based profilers when we know JFR is ready
+                InstrumentationBasedProfiling.enableInstrumentationBasedProfiling();
+            }
+
+            StaticEventLogger.end("Profiling");
+        }
+
+        // This task removes stale ClassLoaderValue entries where the class-loader is gone
+        // It only runs a couple of times a minute since class-loaders are rarely unloaded
+        AgentTaskScheduler.get()
+                .scheduleAtFixedRate(
+                        ClassLoaderValue::removeStaleEntries,
+                        CLASSLOADER_CLEAN_FREQUENCY_SECONDS,
+                        CLASSLOADER_CLEAN_FREQUENCY_SECONDS,
+                        TimeUnit.SECONDS);
+
+        StaticEventLogger.end("Agent.start");
+    }
+
+    private static boolean configureDataJobsMonitoring() {
+        boolean dataJobsEnabled = isFeatureEnabled(AgentFeature.DATA_JOBS);
+        if (dataJobsEnabled) {
+            log.info("Data Jobs Monitoring enabled, enabling spark integrations");
+
+            setSystemPropertyDefault(propertyNameToSystemPropertyName(TracerConfig.TRACE_LONG_RUNNING_ENABLED), "true");
+            setSystemPropertyDefault(propertyNameToSystemPropertyName("integration.spark.enabled"), "true");
+            setSystemPropertyDefault(propertyNameToSystemPropertyName("integration.spark-executor.enabled"), "true");
+
+            if ("true".equals(ddGetProperty(propertyNameToSystemPropertyName(DATA_JOBS_ENABLED)))) {
+                setSystemPropertyDefault(
+                        propertyNameToSystemPropertyName("integration.spark-openlineage.enabled"), "true");
+            }
+
+            String javaCommand = String.join(" ", JavaVirtualMachine.getCommandArguments());
+            String dataJobsCommandPattern = ddGetProperty(propertyNameToSystemPropertyName(DATA_JOBS_COMMAND_PATTERN));
+            if (!isDataJobsSupported(javaCommand, dataJobsCommandPattern)) {
+                log.warn(
+                        "Data Jobs Monitoring is not compatible with non-spark command {} based on command pattern {}. dd-trace-java will not be installed",
+                        javaCommand,
+                        dataJobsCommandPattern);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static void injectAgentArgsConfig(String agentArgs) {
+        try {
+            final Class<?> agentArgsInjectorClass =
+                    AGENT_CLASSLOADER.loadClass("datadog.trace.bootstrap.config.provider.AgentArgsInjector");
+            final Method registerCallbackMethod =
+                    agentArgsInjectorClass.getMethod("injectAgentArgsConfig", String.class);
+            registerCallbackMethod.invoke(null, agentArgs);
+        } catch (final Exception ex) {
+            log.error("Error injecting agent args config {}", agentArgs, ex);
+        }
+    }
+
+    @SuppressFBWarnings("AT_STALE_THREAD_WRITE_OF_PRIMITIVE")
+    private static void configureCiVisibility(URL agentJarURL) {
+        // Retro-compatibility for the old way to configure CI Visibility
+        if ("true".equals(ddGetProperty("dd.integration.junit.enabled"))
+                || "true".equals(ddGetProperty("dd.integration.testng.enabled"))) {
+            setSystemPropertyDefault(AgentFeature.CIVISIBILITY.getSystemProp(), "true");
+        }
+
+        ciVisibilityEnabled = isFeatureEnabled(AgentFeature.CIVISIBILITY);
+        if (ciVisibilityEnabled) {
+            // if CI Visibility is enabled, all the other features are disabled by default
+            // unless the user had explicitly enabled them.
+            setSystemPropertyDefault(AgentFeature.JMXFETCH.getSystemProp(), "false");
+            setSystemPropertyDefault(AgentFeature.PROFILING.getSystemProp(), "false");
+            setSystemPropertyDefault(AgentFeature.APPSEC.getSystemProp(), "false");
+            setSystemPropertyDefault(AgentFeature.IAST.getSystemProp(), "false");
+            setSystemPropertyDefault(AgentFeature.REMOTE_CONFIG.getSystemProp(), "false");
+            setSystemPropertyDefault(AgentFeature.CWS.getSystemProp(), "false");
+
+            /*if CI Visibility is enabled, the PrioritizationType should be {@code Prioritization.ENSURE_TRACE} */
+            setSystemPropertyDefault(
+                    propertyNameToSystemPropertyName(TracerConfig.PRIORITIZATION_TYPE), "ENSURE_TRACE");
+
+            try {
+                setSystemPropertyDefault(
+                        propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_AGENT_JAR_URI),
+                        agentJarURL.toURI().toString());
+            } catch (URISyntaxException e) {
+                throw new IllegalArgumentException("Could not create URI from agent JAR URL: " + agentJarURL, e);
+            }
+        }
+
+        // Enable automatic fetching of git tags from datadog_git.properties only if CI Visibility is
+        // not enabled
+        if (!ciVisibilityEnabled) {
+            GitInfoProvider.INSTANCE.registerGitInfoBuilder(new EmbeddedGitInfoBuilder());
+        }
+    }
+
+    public static void shutdown(final boolean sync) {
+        StaticEventLogger.end("Agent");
+        StaticEventLogger.stop();
+
+        if (profilingEnabled) {
+            shutdownProfilingAgent(sync);
+        }
+        // Before telemetry: the feature flagging writers queue drop/degradation metrics during their
+        // final flush, and only a still-running telemetry worker can drain and transmit them.
+        if (featureFlaggingEnabled) {
+            shutdownFeatureFlagging(AGENT_CLASSLOADER);
+        }
+        if (telemetryEnabled) {
+            stopTelemetry();
+        }
+        if (flareEnabled) {
+            stopFlarePoller();
+        }
+
+        if (agentlessLogSubmissionEnabled) {
+            shutdownLogsIntake();
+        }
+    }
+
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Agent-internal class; Class lock does not escape to application code")
+    public static synchronized Class<?> installAgentCLI() throws Exception {
+        if (null == AGENT_CLASSLOADER) {
+            // in CLI mode we skip installation of instrumentation because we're not running as an agent
+            // we still create the agent classloader so we can install the tracer and query integrations
+            CodeSource codeSource = Agent.class.getProtectionDomain().getCodeSource();
+            if (codeSource == null || codeSource.getLocation() == null) {
+                throw new MalformedURLException("Could not get jar location from code source");
+            }
+            createAgentClassloader(codeSource.getLocation());
+        }
+        return AGENT_CLASSLOADER.loadClass("datadog.trace.agent.tooling.AgentCLI");
+    }
+
+    /** Used by AgentCLI to send sample traces from the command-line. */
+    public static void startDatadogTracer(InitializationTelemetry initTelemetry) throws Exception {
+        Class<?> scoClass = AGENT_CLASSLOADER.loadClass("datadog.communication.ddagent.SharedCommunicationObjects");
+        installDatadogTracer(initTelemetry, scoClass, scoClass.getConstructor().newInstance());
+        startJmx(); // send runtime metrics along with the traces
+    }
+
+    private static void registerLogManagerCallback(final ClassLoadCallBack callback) {
+        // one minute fail-safe in case the class was unintentionally loaded during premain
+        AgentTaskScheduler.get().schedule(callback, 1, TimeUnit.MINUTES);
+        try {
+            final Class<?> agentInstallerClass = AGENT_CLASSLOADER.loadClass(AGENT_INSTALLER_CLASS_NAME);
+            final Method registerCallbackMethod =
+                    agentInstallerClass.getMethod("registerClassLoadCallback", String.class, Runnable.class);
+            registerCallbackMethod.invoke(null, "java.util.logging.LogManager", callback);
+        } catch (final Exception ex) {
+            log.error("Error registering callback for {}", callback.agentThread(), ex);
+        }
+    }
+
+    private static void registerMBeanServerBuilderCallback(final ClassLoadCallBack callback) {
+        // one minute fail-safe in case the class was unintentionally loaded during premain
+        AgentTaskScheduler.get().schedule(callback, 1, TimeUnit.MINUTES);
+        try {
+            final Class<?> agentInstallerClass = AGENT_CLASSLOADER.loadClass(AGENT_INSTALLER_CLASS_NAME);
+            final Method registerCallbackMethod =
+                    agentInstallerClass.getMethod("registerClassLoadCallback", String.class, Runnable.class);
+            registerCallbackMethod.invoke(null, "javax.management.MBeanServerBuilder", callback);
+        } catch (final Exception ex) {
+            log.error("Error registering callback for {}", callback.agentThread(), ex);
+        }
+    }
+
+    protected abstract static class ClassLoadCallBack implements Runnable {
+        private final AtomicBoolean starting = new AtomicBoolean();
+
+        @Override
+        public void run() {
+            if (starting.getAndSet(true)) {
+                return; // someone has already called us
+            }
+
+            /*
+             * This callback is called from within bytecode transformer. This can be a problem if callback tries
+             * to load classes being transformed. To avoid this we start a thread here that calls the callback.
+             * This seems to resolve this problem.
+             */
+            final Thread thread = newAgentThread(agentThread(), new Runnable() {
                 @Override
                 public void run() {
-                  try {
-                    execute();
-                  } catch (final Exception e) {
-                    log.error("Failed to run {}", agentThread(), e);
-                  }
+                    try {
+                        execute();
+                    } catch (final Exception e) {
+                        log.error("Failed to run {}", agentThread(), e);
+                    }
                 }
-              });
-      thread.start();
-    }
-
-    public abstract AgentThread agentThread();
-
-    public abstract void execute();
-  }
-
-  protected static class StartJmxCallback extends ClassLoadCallBack {
-    private final int jmxStartDelay;
-
-    StartJmxCallback(final int jmxStartDelay) {
-      this.jmxStartDelay = jmxStartDelay;
+            });
+            thread.start();
+        }
+
+        public abstract AgentThread agentThread();
+
+        public abstract void execute();
     }
 
-    @Override
-    public AgentThread agentThread() {
-      return JMX_STARTUP;
-    }
-
-    @Override
-    public void execute() {
-      // still honour the requested delay from the point JMX becomes available
-      scheduleJmxStart(jmxStartDelay);
-    }
-  }
-
-  protected static class InstallDatadogTracerCallback extends ClassLoadCallBack {
-    private final Instrumentation instrumentation;
-    private final Object sco;
-    private final Class<?> scoClass;
-    private final int okHttpDelayMillis;
-
-    public InstallDatadogTracerCallback(
-        InitializationTelemetry initTelemetry,
-        Instrumentation instrumentation,
-        int okHttpDelayMillis) {
-      this.okHttpDelayMillis = okHttpDelayMillis;
-      this.instrumentation = instrumentation;
-      try {
-        scoClass =
-            AGENT_CLASSLOADER.loadClass("datadog.communication.ddagent.SharedCommunicationObjects");
-        sco = scoClass.getConstructor(boolean.class).newInstance(okHttpDelayMillis > 0);
-      } catch (ClassNotFoundException
-          | NoSuchMethodException
-          | InstantiationException
-          | IllegalAccessException
-          | InvocationTargetException e) {
-        throw new UndeclaredThrowableException(e);
-      }
+    protected static class StartJmxCallback extends ClassLoadCallBack {
+        private final int jmxStartDelay;
+
+        StartJmxCallback(final int jmxStartDelay) {
+            this.jmxStartDelay = jmxStartDelay;
+        }
+
+        @Override
+        public AgentThread agentThread() {
+            return JMX_STARTUP;
+        }
 
-      installDatadogMeter(initTelemetry);
-      installDatadogTracer(initTelemetry, scoClass, sco);
-      maybeInstallLogsIntake(scoClass, sco);
-      maybeStartIast(instrumentation);
+        @Override
+        public void execute() {
+            // still honour the requested delay from the point JMX becomes available
+            scheduleJmxStart(jmxStartDelay);
+        }
     }
 
-    @Override
-    public AgentThread agentThread() {
-      return TRACE_STARTUP;
+    protected static class InstallDatadogTracerCallback extends ClassLoadCallBack {
+        private final Instrumentation instrumentation;
+        private final Object sco;
+        private final Class<?> scoClass;
+        private final int okHttpDelayMillis;
+
+        public InstallDatadogTracerCallback(
+                InitializationTelemetry initTelemetry, Instrumentation instrumentation, int okHttpDelayMillis) {
+            this.okHttpDelayMillis = okHttpDelayMillis;
+            this.instrumentation = instrumentation;
+            try {
+                scoClass = AGENT_CLASSLOADER.loadClass("datadog.communication.ddagent.SharedCommunicationObjects");
+                sco = scoClass.getConstructor(boolean.class).newInstance(okHttpDelayMillis > 0);
+            } catch (ClassNotFoundException
+                    | NoSuchMethodException
+                    | InstantiationException
+                    | IllegalAccessException
+                    | InvocationTargetException e) {
+                throw new UndeclaredThrowableException(e);
+            }
+
+            installDatadogMeter(initTelemetry);
+            installDatadogTracer(initTelemetry, scoClass, sco);
+            maybeInstallLogsIntake(scoClass, sco);
+            maybeStartIast(instrumentation);
+        }
+
+        @Override
+        public AgentThread agentThread() {
+            return TRACE_STARTUP;
+        }
+
+        @Override
+        public void execute() {
+            if (okHttpDelayMillis > 0) {
+                resumeRemoteComponents();
+            }
+
+            maybeStartAppSec(scoClass, sco);
+            maybeStartScaReachability(instrumentation);
+            maybeStartCiVisibility(instrumentation, scoClass, sco);
+            maybeStartLLMObs(instrumentation, scoClass, sco);
+            // Start RC-backed products before remote config so their products and capabilities are
+            // included in the first poll.
+            maybeStartDebugger(instrumentation, scoClass, sco);
+            maybeStartFeatureFlagging(scoClass, sco);
+            maybeStartRemoteConfig(scoClass, sco);
+            maybeStartAiGuard();
+
+            if (telemetryEnabled) {
+                startTelemetry(instrumentation, scoClass, sco);
+            }
+            if (flareEnabled) {
+                startFlarePoller(scoClass, sco);
+            }
+        }
+
+        private void resumeRemoteComponents() {
+            log.debug("Resuming remote components.");
+            try {
+                // remote components were paused for custom log-manager/jmx-builder
+                // add small delay before resuming remote I/O to help stabilization
+                Thread.sleep(okHttpDelayMillis);
+                scoClass.getMethod("resume").invoke(sco);
+            } catch (InterruptedException ignore) {
+            } catch (Throwable e) {
+                log.error("Error resuming remote components", e);
+            }
+        }
     }
 
-    @Override
-    public void execute() {
-      if (okHttpDelayMillis > 0) {
-        resumeRemoteComponents();
-      }
+    protected static class StartProfilingAgentCallback extends ClassLoadCallBack {
+        private final Instrumentation inst;
+
+        protected StartProfilingAgentCallback(Instrumentation inst) {
+            this.inst = inst;
+        }
 
-      maybeStartAppSec(scoClass, sco);
-      maybeStartScaReachability(instrumentation);
-      maybeStartCiVisibility(instrumentation, scoClass, sco);
-      maybeStartLLMObs(instrumentation, scoClass, sco);
-      // Start RC-backed products before remote config so their products and capabilities are
-      // included in the first poll.
-      maybeStartDebugger(instrumentation, scoClass, sco);
-      maybeStartFeatureFlagging(scoClass, sco);
-      maybeStartRemoteConfig(scoClass, sco);
-      maybeStartAiGuard();
+        @Override
+        public AgentThread agentThread() {
+            return PROFILER_STARTUP;
+        }
 
-      if (telemetryEnabled) {
-        startTelemetry(instrumentation, scoClass, sco);
-      }
-      if (flareEnabled) {
-        startFlarePoller(scoClass, sco);
-      }
+        @Override
+        public void execute() {
+            startProfilingAgent(false, true, inst);
+            // only enable instrumentation based profilers when we know JFR is ready
+            InstrumentationBasedProfiling.enableInstrumentationBasedProfiling();
+        }
     }
 
-    private void resumeRemoteComponents() {
-      log.debug("Resuming remote components.");
-      try {
-        // remote components were paused for custom log-manager/jmx-builder
-        // add small delay before resuming remote I/O to help stabilization
-        Thread.sleep(okHttpDelayMillis);
-        scoClass.getMethod("resume").invoke(sco);
-      } catch (InterruptedException ignore) {
-      } catch (Throwable e) {
-        log.error("Error resuming remote components", e);
-      }
+    private static synchronized void createAgentClassloader(final URL agentJarURL) {
+        if (AGENT_CLASSLOADER == null) {
+            try {
+                BootstrapProxy.addBootstrapResource(agentJarURL);
+
+                // assume this is the right location of other agent-bootstrap classes
+                ClassLoader parent = Agent.class.getClassLoader();
+                if (parent == null && isJavaVersionAtLeast(9)) {
+                    // for Java9+ replace any JDK bootstrap reference with platform loader
+                    parent = getPlatformClassLoader();
+                }
+
+                AGENT_CLASSLOADER = new DatadogClassLoader(agentJarURL, parent);
+            } catch (final Throwable ex) {
+                log.error("Throwable thrown creating agent classloader", ex);
+            }
+        }
     }
-  }
 
-  protected static class StartProfilingAgentCallback extends ClassLoadCallBack {
-    private final Instrumentation inst;
-
-    protected StartProfilingAgentCallback(Instrumentation inst) {
-      this.inst = inst;
-    }
-
-    @Override
-    public AgentThread agentThread() {
-      return PROFILER_STARTUP;
-    }
-
-    @Override
-    public void execute() {
-      startProfilingAgent(false, true, inst);
-      // only enable instrumentation based profilers when we know JFR is ready
-      InstrumentationBasedProfiling.enableInstrumentationBasedProfiling();
-    }
-  }
-
-  private static synchronized void createAgentClassloader(final URL agentJarURL) {
-    if (AGENT_CLASSLOADER == null) {
-      try {
-        BootstrapProxy.addBootstrapResource(agentJarURL);
-
-        // assume this is the right location of other agent-bootstrap classes
-        ClassLoader parent = Agent.class.getClassLoader();
-        if (parent == null && isJavaVersionAtLeast(9)) {
-          // for Java9+ replace any JDK bootstrap reference with platform loader
-          parent = getPlatformClassLoader();
-        }
-
-        AGENT_CLASSLOADER = new DatadogClassLoader(agentJarURL, parent);
-      } catch (final Throwable ex) {
-        log.error("Throwable thrown creating agent classloader", ex);
-      }
-    }
-  }
-
-  private static void maybeStartRemoteConfig(Class<?> scoClass, Object sco) {
-    if (!remoteConfigEnabled) {
-      return;
-    }
-
-    StaticEventLogger.begin("Remote Config");
+    private static void maybeStartRemoteConfig(Class<?> scoClass, Object sco) {
+        if (!remoteConfigEnabled) {
+            return;
+        }
+
+        StaticEventLogger.begin("Remote Config");
+
+        try {
+            Method pollerMethod = scoClass.getMethod("configurationPoller", Config.class);
+            Object poller = pollerMethod.invoke(sco, Config.get());
+            if (poller == null) {
+                log.debug("Remote config is not enabled");
+                StaticEventLogger.end("Remote Config");
+                return;
+            }
+            Class<?> pollerCls = AGENT_CLASSLOADER.loadClass("datadog.remoteconfig.ConfigurationPoller");
+            Method startMethod = pollerCls.getMethod("start");
+            log.debug("Starting remote config poller");
+            startMethod.invoke(poller);
+        } catch (Exception e) {
+            log.error("Error starting remote config", e);
+        }
 
-    try {
-      Method pollerMethod = scoClass.getMethod("configurationPoller", Config.class);
-      Object poller = pollerMethod.invoke(sco, Config.get());
-      if (poller == null) {
-        log.debug("Remote config is not enabled");
         StaticEventLogger.end("Remote Config");
-        return;
-      }
-      Class<?> pollerCls = AGENT_CLASSLOADER.loadClass("datadog.remoteconfig.ConfigurationPoller");
-      Method startMethod = pollerCls.getMethod("start");
-      log.debug("Starting remote config poller");
-      startMethod.invoke(poller);
-    } catch (Exception e) {
-      log.error("Error starting remote config", e);
-    }
-
-    StaticEventLogger.end("Remote Config");
-  }
-
-  private static synchronized void startDatadogAgent(
-      final InitializationTelemetry initTelemetry, final Instrumentation inst) {
-    if (null != inst) {
-      StaticEventLogger.begin("BytebuddyAgent");
-
-      try {
-        final Class<?> agentInstallerClass =
-            AGENT_CLASSLOADER.loadClass(AGENT_INSTALLER_CLASS_NAME);
-        final Method agentInstallerMethod =
-            agentInstallerClass.getMethod("installBytebuddyAgent", Instrumentation.class);
-        agentInstallerMethod.invoke(null, inst);
-      } catch (final Throwable ex) {
-        log.error("Throwable thrown while installing the Datadog Agent", ex);
-        initTelemetry.onFatalError(ex);
-      } finally {
-        StaticEventLogger.end("BytebuddyAgent");
-      }
-    }
-  }
-
-  private static synchronized void installDatadogMeter(InitializationTelemetry initTelemetry) {
-    if (AGENT_CLASSLOADER == null) {
-      throw new IllegalStateException("Datadog agent should have been started already");
-    }
-
-    StaticEventLogger.begin("AgentMeter");
-
-    try {
-      // Install AgentMeter, StatsDClient and Monitoring
-      final Class<?> tracerInstallerClass =
-          AGENT_CLASSLOADER.loadClass("datadog.trace.agent.tooling.MeterInstaller");
-      final Method installMeterMethod = tracerInstallerClass.getMethod("installMeter");
-      installMeterMethod.invoke(null);
-    } catch (final FatalAgentMisconfigurationError ex) {
-      throw ex;
-    } catch (final Throwable ex) {
-      log.error("Throwable thrown while installing the Datadog meter", ex);
-      initTelemetry.onFatalError(ex);
-    }
-
-    StaticEventLogger.end("AgentMeter");
-  }
-
-  private static synchronized void installDatadogTracer(
-      InitializationTelemetry initTelemetry, Class<?> scoClass, Object sco) {
-    if (AGENT_CLASSLOADER == null) {
-      throw new IllegalStateException("Datadog agent should have been started already");
-    }
-
-    StaticEventLogger.begin("GlobalTracer");
-
-    // TracerInstaller.installGlobalTracer can be called multiple times without any problem
-    // so there is no need to have a 'datadogTracerInstalled' flag here.
-    try {
-      // install global tracer
-      final Class<?> tracerInstallerClass =
-          AGENT_CLASSLOADER.loadClass("datadog.trace.agent.tooling.TracerInstaller");
-      final Method tracerInstallerMethod =
-          tracerInstallerClass.getMethod(
-              "installGlobalTracer", scoClass, ProfilingContextIntegration.class);
-      tracerInstallerMethod.invoke(null, sco, createProfilingContextIntegration());
-    } catch (final FatalAgentMisconfigurationError ex) {
-      throw ex;
-    } catch (final Throwable ex) {
-      log.error("Throwable thrown while installing the Datadog Tracer", ex);
-
-      initTelemetry.onFatalError(ex);
-    }
-
-    StaticEventLogger.end("GlobalTracer");
-  }
-
-  private static void startCrashTracking() {
-    if (isJavaVersionAtLeast(9)) {
-      // it is safe to initialize crashtracking early
-      // since it can take 100ms+ to initialize the native library we will defer the initialization
-      // ... unless we request early start with the debug config flag
-      boolean forceEarlyStart = CrashTrackingConfig.CRASH_TRACKING_START_EARLY_DEFAULT;
-      String forceEarlyStartStr =
-          ddGetProperty("dd." + CrashTrackingConfig.CRASH_TRACKING_START_EARLY);
-      if (forceEarlyStartStr != null) {
-        forceEarlyStart = Boolean.parseBoolean(forceEarlyStartStr);
-      }
-      if (forceEarlyStart) {
-        initializeCrashTrackingDefault();
-      } else {
-        AgentTaskScheduler.get().execute(Agent::initializeCrashTrackingDefault);
-      }
-    } else {
-      // for Java 8 we are relying on JMX to give us the process PID
-      // we need to delay the crash tracking initialization until JMX is available
-      CRASHTRACKER_INIT_AFTER_JMX = Agent::initializeDelayedCrashTracking;
-    }
-  }
-
-  private static void scheduleJmxStart(final int jmxStartDelay) {
-    if (jmxStartDelay > 0) {
-      AgentTaskScheduler.get()
-          .scheduleWithJitter(new JmxStartTask(), jmxStartDelay, TimeUnit.SECONDS);
-    } else {
-      startJmx();
-    }
-  }
-
-  static final class JmxStartTask implements Runnable {
-    @Override
-    public void run() {
-      startJmx();
-    }
-  }
-
-  private static synchronized void startJmx() {
-    if (AGENT_CLASSLOADER == null) {
-      throw new IllegalStateException("Datadog agent should have been started already");
-    }
-    if (jmxStarting.getAndSet(true)) {
-      return; // another thread is already in startJmx
-    }
-    if (jmxFetchEnabled) {
-      startJmxFetch();
-    }
-    initializeJmxSystemAccessProvider(AGENT_CLASSLOADER);
-    if (crashTrackingEnabled && CRASHTRACKER_INIT_AFTER_JMX != null) {
-      try {
-        CRASHTRACKER_INIT_AFTER_JMX.run();
-      } finally {
-        CRASHTRACKER_INIT_AFTER_JMX = null;
-      }
-    }
-    if (profilingEnabled) {
-      // Both of these register JFR events through registerJfrEvents(), which force-initializes the
-      // JDK's JFR event-holder class first (see initializeJfrEventHolderClass) to avoid a deadlock.
-      registerDeadlockDetectionEvent();
-      registerSmapEntryEvent();
-      if (PROFILER_INIT_AFTER_JMX != null) {
+    }
+
+    private static synchronized void startDatadogAgent(
+            final InitializationTelemetry initTelemetry, final Instrumentation inst) {
+        if (null != inst) {
+            StaticEventLogger.begin("BytebuddyAgent");
+
+            try {
+                final Class<?> agentInstallerClass = AGENT_CLASSLOADER.loadClass(AGENT_INSTALLER_CLASS_NAME);
+                final Method agentInstallerMethod =
+                        agentInstallerClass.getMethod("installBytebuddyAgent", Instrumentation.class);
+                agentInstallerMethod.invoke(null, inst);
+            } catch (final Throwable ex) {
+                log.error("Throwable thrown while installing the Datadog Agent", ex);
+                initTelemetry.onFatalError(ex);
+            } finally {
+                StaticEventLogger.end("BytebuddyAgent");
+            }
+        }
+    }
+
+    private static synchronized void installDatadogMeter(InitializationTelemetry initTelemetry) {
+        if (AGENT_CLASSLOADER == null) {
+            throw new IllegalStateException("Datadog agent should have been started already");
+        }
+
+        StaticEventLogger.begin("AgentMeter");
+
         try {
-          /*
-          When getJmxStartDelay() is set to 0 we will attempt to initialize the JMX subsystem as soon as available.
-          But, this can cause issues with JFR as it needs some 'grace period' after JMX is ready. That's why we are
-          re-scheduling the profiler initialization code just a tad later.
-
-          If the jmx start delay is set, we are already delayed relative to the jmx init so we can just plainly
-          run the initialization code.
-          */
-          if (getJmxStartDelay() == 0) {
-            log.debug("Waiting for profiler initialization");
-            AgentTaskScheduler.get()
-                .scheduleWithJitter(PROFILER_INIT_AFTER_JMX, 500, TimeUnit.MILLISECONDS);
-          } else {
-            log.debug("Initializing profiler");
-            PROFILER_INIT_AFTER_JMX.run();
-          }
-        } finally {
-          PROFILER_INIT_AFTER_JMX = null;
-        }
-      }
-    }
-  }
-
-  private static synchronized void registerDeadlockDetectionEvent() {
-    log.debug("Initializing JMX thread deadlock detector");
-    registerJfrEvents(
-        "com.datadog.profiling.controller.openjdk.events.DeadlockEventFactory",
-        "JMX thread deadlock detection");
-  }
-
-  private static void initializeJfrEventHolderClass() {
-    initializeJfrEventHolderClass(AGENT_CLASSLOADER);
-  }
-
-  /**
-   * Force-initializes the JDK's JFR event-holder class early to avoid an ABBA deadlock between
-   * {@code jdk.jfr.internal.Utils}'s monitor and the holder class's initialization lock. See <a
-   * href="https://bugs.openjdk.org/browse/JDK-8371889">JDK-8371889</a> and the SCP-1278 thread
-   * dump.
-   *
-   * <p>The holder's {@code <clinit>} looks up the JDK's built-in event handlers through {@code
-   * jdk.jfr.internal.Utils} (taking its monitor); conversely, JFR event registration initializes
-   * the holder while holding that same monitor. The deadlock forms when one thread holds the {@code
-   * Utils} monitor and wants the holder's class-init lock, while another thread holds the
-   * class-init lock (running {@code <clinit>}) and wants the {@code Utils} monitor. In SCP-1278
-   * this was the profiler's smap-event registration (holding {@code Utils}) against a concurrent
-   * JMXFetch ByteBuddy transform that had triggered the holder {@code <clinit>}. Running the {@code
-   * <clinit>} here, on this thread, before we register our own JFR events, means the holder is
-   * already initialized by then, so the cycle cannot form.
-   *
-   * <p>Ordering matters twice over:
-   *
-   * <ul>
-   *   <li>We force {@code FlightRecorder} initialization first, which registers the JDK's built-in
-   *       events (via {@code JDKEvents.initialize()}). The holder's fields are {@code static final}
-   *       and are populated from {@code Utils} at {@code <clinit>} time; running {@code <clinit>}
-   *       before the events are registered would cache {@code null} into those fields permanently
-   *       and silently disable the built-in socket/file/exception JFR events (verified on JDK
-   *       17.0.17 and 21.0.9). This mirrors the JDK's own fix, which initializes the holder only
-   *       after {@code JDKEvents.initialize()}. The event registration below would trigger the same
-   *       {@code FlightRecorder} initialization anyway; we merely order it ahead of the holder
-   *       {@code <clinit>}. If {@code FlightRecorder} init fails, JFR is unavailable and there is
-   *       nothing to protect against, so we skip the holder init entirely.
-   *   <li>{@link Class#forName(String, boolean, ClassLoader)} with {@code initialize=true} is
-   *       required: {@link ClassLoader#loadClass(String)} would only load the class without running
-   *       {@code <clinit>}, so it would neither take the class-init lock early nor prevent the
-   *       deadlock.
-   * </ul>
-   *
-   * <p>The holder class was renamed across JDK versions, so it is selected by version (see {@link
-   * #jfrEventHolderClassName()}): {@code jdk.jfr.events.Handlers} on JDK 15-18, {@code
-   * jdk.jfr.events.EventConfigurations} on JDK 19-22. Earlier JDKs (including 11 LTS) predate the
-   * holder and JDK 23+ removed the eager-init pattern; on those this method does nothing. On
-   * patched JDKs (the JDK-8371889 fix was backported to 21.0.11) the JDK already initializes the
-   * holder safely during {@code FlightRecorder} startup, so forcing it here is a harmless no-op.
-   *
-   * @param loader class loader used to resolve the JFR classes (package-private for testing; see
-   *     JfrEventHolderInitForkedTest)
-   */
-  static void initializeJfrEventHolderClass(final ClassLoader loader) {
-    final String holderClassName = jfrEventHolderClassName();
-    if (holderClassName == null) {
-      return; // no eager-init holder on this JDK, so there is no deadlock to prevent
-    }
-    try {
-      // Register the JDK's built-in JFR events first, so the holder's <clinit> below sees non-null
-      // handlers instead of caching null.
-      Class.forName("jdk.jfr.FlightRecorder", true, loader)
-          .getMethod("getFlightRecorder")
-          .invoke(null);
-      // Force the holder's <clinit>.
-      Class.forName(holderClassName, true, loader);
-    } catch (final Throwable ignored) {
-      // JFR unavailable/disabled or initialization failed: nothing (left) to do. We catch Throwable
-      // rather than Exception because forcing initialization can surface Errors such as
-      // ExceptionInInitializerError, NoClassDefFoundError or LinkageError.
-    }
-  }
-
-  /**
-   * Returns the fully-qualified name of the JDK's JFR event-holder class for the running JVM, or
-   * {@code null} if this JDK has no such class. The class is selected by JDK version rather than by
-   * probing with {@link ClassNotFoundException} so the mapping is explicit:
-   *
-   * <ul>
-   *   <li>JDK 15-18: {@code jdk.jfr.events.Handlers}
-   *   <li>JDK 19-22: {@code jdk.jfr.events.EventConfigurations}
-   *   <li>otherwise (JDK 14 and earlier predate the holder; JDK 23+ removed the eager-init
-   *       pattern): {@code null}
-   * </ul>
-   *
-   * <p>Also returns {@code null} on non-HotSpot VMs: JDK-8371889 is a HotSpot JFR bug, and other
-   * VMs (e.g. Eclipse OpenJ9 / IBM Semeru) ship a different JFR implementation where this holder /
-   * {@code Utils} mechanism does not apply.
-   */
-  static String jfrEventHolderClassName() {
-    if (!isHotspot()) {
-      return null;
-    }
-    if (isJavaVersionAtLeast(15) && !isJavaVersionAtLeast(19)) {
-      return "jdk.jfr.events.Handlers";
-    }
-    if (isJavaVersionAtLeast(19) && !isJavaVersionAtLeast(23)) {
-      return "jdk.jfr.events.EventConfigurations";
-    }
-    return null;
-  }
-
-  private static synchronized void registerSmapEntryEvent() {
-    log.debug("Initializing smap entry scraping");
-    registerJfrEvents(
-        "com.datadog.profiling.controller.openjdk.events.SmapEntryFactory", "Smap entry scraping");
-  }
-
-  /**
-   * Registers a profiling JFR event factory's events, after force-initializing the JDK's JFR
-   * event-holder class (see {@link #initializeJfrEventHolderClass(ClassLoader)}).
-   *
-   * <p><strong>All JFR event registration during agent startup must go through this
-   * method.</strong> Registering a JFR event triggers the holder class's initialization while
-   * holding the {@code jdk.jfr.internal.Utils} monitor; unless the holder has already been fully
-   * initialized, that can deadlock (JDK-8371889). Routing every registration through here
-   * guarantees the holder is initialized first, so future event registrations cannot reintroduce
-   * the deadlock by running before it.
-   *
-   * @param factoryClassName fully-qualified name of the event factory with a static {@code
-   *     registerEvents()} method
-   * @param description human-readable name used in log messages
-   */
-  private static void registerJfrEvents(final String factoryClassName, final String description) {
-    // Enforce the ordering invariant: the holder must be initialized before any JFR event is
-    // registered. Idempotent and cheap once done, so it is safe to call before every registration.
-    initializeJfrEventHolderClass();
-    try {
-      final Class<?> factoryClass = AGENT_CLASSLOADER.loadClass(factoryClassName);
-      factoryClass.getMethod("registerEvents").invoke(null);
-    } catch (final NoClassDefFoundError
-        | ClassNotFoundException
-        | UnsupportedClassVersionError ignored) {
-      log.debug("{} not supported", description);
-    } catch (final Throwable ex) {
-      log.error("Unable to initialize {}", description, ex);
-    }
-  }
-
-  /** Enable JMX based system access provider once it is safe to touch JMX */
-  private static synchronized void initializeJmxSystemAccessProvider(
-      final ClassLoader classLoader) {
-    if (log.isDebugEnabled()) {
-      log.debug("Initializing JMX system access provider for {}", classLoader);
-    }
-    try {
-      final Class<?> tracerInstallerClass =
-          classLoader.loadClass("datadog.trace.core.util.SystemAccess");
-      final Method enableJmxMethod = tracerInstallerClass.getMethod("enableJmx");
-      enableJmxMethod.invoke(null);
-    } catch (final Throwable ex) {
-      log.error("Throwable thrown while initializing JMX system access provider", ex);
-    }
-  }
-
-  private static synchronized void startJmxFetch() {
-    final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
-    try {
-      Thread.currentThread().setContextClassLoader(AGENT_CLASSLOADER);
-      final Class<?> jmxFetchAgentClass =
-          AGENT_CLASSLOADER.loadClass("datadog.trace.agent.jmxfetch.JMXFetch");
-      final Method jmxFetchInstallerMethod =
-          jmxFetchAgentClass.getMethod("run", StatsDClientManager.class);
-      jmxFetchInstallerMethod.invoke(null, statsDClientManager());
-    } catch (final Throwable ex) {
-      log.error("Throwable thrown while starting JmxFetch", ex);
-    } finally {
-      safelySetContextClassLoader(contextLoader);
-    }
-  }
-
-  private static StatsDClientManager statsDClientManager() throws Exception {
-    final Class<?> statsdClientManagerClass =
-        AGENT_CLASSLOADER.loadClass("datadog.metrics.impl.statsd.DDAgentStatsDClientManager");
-    final Method statsDClientManagerMethod =
-        statsdClientManagerClass.getMethod("statsDClientManager");
-    return (StatsDClientManager) statsDClientManagerMethod.invoke(null);
-  }
-
-  private static void maybeStartAiGuard() {
-    if (!Config.get().isAiGuardEnabled()) {
-      return;
-    }
-    try {
-      final Class<?> aiGuardSystemClass =
-          AGENT_CLASSLOADER.loadClass("com.datadog.aiguard.AIGuardSystem");
-      final Method aiGuardInstallerMethod = aiGuardSystemClass.getMethod("start");
-      aiGuardInstallerMethod.invoke(null);
-    } catch (final Exception e) {
-      log.debug("Error initializing AI Guard", e);
-    }
-  }
-
-  private static void maybeStartAppSec(Class<?> scoClass, Object o) {
-
-    try {
-      // event tracking SDK must be available for customers even if AppSec is fully disabled
-      AppSecEventTracker.install();
-    } catch (final Exception e) {
-      log.debug("Error starting AppSec Event Tracker", e);
-    }
-
-    if (!(appSecEnabled || (remoteConfigEnabled && !appSecFullyDisabled))) {
-      return;
-    }
-
-    StaticEventLogger.begin("AppSec");
-
-    try {
-      SubscriptionService ss = AgentTracer.get().getSubscriptionService(RequestContextSlot.APPSEC);
-      startAppSec(ss, scoClass, o);
-    } catch (Exception e) {
-      log.error("Error starting AppSec System", e);
-    }
-
-    StaticEventLogger.end("AppSec");
-  }
-
-  private static void startAppSec(SubscriptionService ss, Class<?> scoClass, Object sco) {
-    try {
-      final Class<?> appSecSysClass =
-          AGENT_CLASSLOADER.loadClass("com.datadog.appsec.AppSecSystem");
-      final Method appSecInstallerMethod =
-          appSecSysClass.getMethod("start", SubscriptionService.class, scoClass);
-      appSecInstallerMethod.invoke(null, ss, sco);
-    } catch (final Throwable ex) {
-      log.warn("Not starting AppSec subsystem: {}", ex.getMessage());
-    }
-  }
-
-  private static boolean isSupportedAppSecArch() {
-    final String arch = SystemProperties.get("os.arch");
-    if (OperatingSystem.isWindows()) {
-      // TODO: Windows bindings need to be built for x86
-      return "amd64".equals(arch) || "x86_64".equals(arch);
-    } else if (OperatingSystem.isMacOs()) {
-      return "amd64".equals(arch) || "x86_64".equals(arch) || "aarch64".equals(arch);
-    } else if (OperatingSystem.isLinux()) {
-      return "amd64".equals(arch) || "x86_64".equals(arch) || "aarch64".equals(arch);
-    }
-    // Still return true in other if unexpected cases (e.g. SunOS), and we'll handle loading errors
-    // during AppSec startup.
-    return true;
-  }
-
-  private static void maybeStartScaReachability(Instrumentation instrumentation) {
-    if (!Config.get().isAppSecScaEnabled()) {
-      return;
-    }
-    if (!telemetryEnabled || !Config.get().isTelemetryDependencyServiceEnabled()) {
-      log.warn(
-          "Not starting SCA Reachability subsystem: telemetry or dependency collection disabled");
-      return;
-    }
-    StaticEventLogger.begin("ScaReachability");
-    try {
-      final Class<?> scaClass =
-          AGENT_CLASSLOADER.loadClass("com.datadog.appsec.sca.ScaReachabilitySystem");
-      final Method startMethod = scaClass.getMethod("start", Instrumentation.class);
-      startMethod.invoke(null, instrumentation);
-    } catch (final Throwable ex) {
-      log.warn("Not starting SCA Reachability subsystem: {}", ex.getMessage());
-    }
-    StaticEventLogger.end("ScaReachability");
-  }
-
-  private static void maybeStartIast(Instrumentation instrumentation) {
-    if (iastEnabled || !iastFullyDisabled) {
-
-      StaticEventLogger.begin("IAST");
-
-      try {
-        SubscriptionService ss = AgentTracer.get().getSubscriptionService(RequestContextSlot.IAST);
-        startIast(instrumentation, ss);
-      } catch (Exception e) {
-        log.error("Error starting IAST subsystem", e);
-      }
-
-      StaticEventLogger.end("IAST");
-    }
-  }
-
-  private static void startIast(Instrumentation instrumentation, SubscriptionService ss) {
-    try {
-      final Class<?> appSecSysClass = AGENT_CLASSLOADER.loadClass("com.datadog.iast.IastSystem");
-      final Method iastInstallerMethod =
-          appSecSysClass.getMethod("start", Instrumentation.class, SubscriptionService.class);
-      iastInstallerMethod.invoke(null, instrumentation, ss);
-    } catch (final Throwable e) {
-      log.warn("Not starting IAST subsystem", e);
-    }
-  }
-
-  private static void maybeStartCiVisibility(Instrumentation inst, Class<?> scoClass, Object sco) {
-    if (ciVisibilityEnabled) {
-      StaticEventLogger.begin("CI Visibility");
-
-      try {
-        final Class<?> ciVisibilitySysClass =
-            AGENT_CLASSLOADER.loadClass("datadog.trace.civisibility.CiVisibilitySystem");
-        final Method ciVisibilityInstallerMethod =
-            ciVisibilitySysClass.getMethod("start", Instrumentation.class, scoClass);
-        ciVisibilityInstallerMethod.invoke(null, inst, sco);
-      } catch (final Throwable e) {
-        log.warn("Not starting CI Visibility subsystem", e);
-      }
-
-      StaticEventLogger.end("CI Visibility");
-    }
-  }
-
-  private static void maybeStartLLMObs(Instrumentation inst, Class<?> scoClass, Object sco) {
-    if (llmObsEnabled) {
-      StaticEventLogger.begin("LLM Observability");
-
-      try {
-        final Class<?> llmObsSysClass =
-            AGENT_CLASSLOADER.loadClass("datadog.trace.llmobs.LLMObsSystem");
-        final Method llmObsInstallerMethod =
-            llmObsSysClass.getMethod("start", Instrumentation.class, scoClass);
-        llmObsInstallerMethod.invoke(null, inst, sco);
-      } catch (final Throwable e) {
-        log.warn("Not starting LLM Observability subsystem", e);
-      }
-
-      StaticEventLogger.end("LLM Observability");
-    }
-  }
-
-  private static void maybeStartFeatureFlagging(final Class<?> scoClass, final Object sco) {
-    if (featureFlaggingEnabled) {
-      StaticEventLogger.begin("Feature Flagging");
-
-      try {
-        final Class<?> ffSysClass =
-            AGENT_CLASSLOADER.loadClass("com.datadog.featureflag.FeatureFlaggingSystem");
-        final Method ffSysMethod = ffSysClass.getMethod("start", scoClass);
-        ffSysMethod.invoke(null, sco);
-      } catch (final Throwable e) {
-        log.warn("Not starting Feature Flagging subsystem", e);
-      }
-
-      StaticEventLogger.end("Feature Flagging");
-    }
-  }
-
-  static void shutdownFeatureFlagging(final ClassLoader agentClassLoader) {
-    if (agentClassLoader == null) {
-      return;
-    }
-    try {
-      final Class<?> ffSysClass =
-          agentClassLoader.loadClass("com.datadog.featureflag.FeatureFlaggingSystem");
-      final Method stopMethod = ffSysClass.getMethod("stop");
-      stopMethod.invoke(null);
-    } catch (final Throwable e) {
-      log.warn("Unable to stop Feature Flagging subsystem", e);
-    }
-  }
-
-  private static void maybeInstallLogsIntake(Class<?> scoClass, Object sco) {
-    if (agentlessLogSubmissionEnabled || appLogsCollectionEnabled) {
-      StaticEventLogger.begin("Logs Intake");
-
-      try {
-        final Class<?> logsIntakeSystemClass =
-            AGENT_CLASSLOADER.loadClass("datadog.trace.logging.intake.LogsIntakeSystem");
-        final Method logsIntakeInstallerMethod =
-            logsIntakeSystemClass.getMethod("install", scoClass, Intake.class);
-        logsIntakeInstallerMethod.invoke(
-            null, sco, agentlessLogSubmissionEnabled ? Intake.LOGS : Intake.EVENT_PLATFORM);
-      } catch (final Throwable e) {
-        log.warn("Not installing Logs Intake subsystem", e);
-      }
-
-      StaticEventLogger.end("Logs Intake");
-    }
-  }
-
-  private static void shutdownLogsIntake() {
-    if (AGENT_CLASSLOADER == null) {
-      // It wasn't started, so no need to shut it down
-      return;
-    }
-    try {
-      Thread.currentThread().setContextClassLoader(AGENT_CLASSLOADER);
-      final Class<?> logsIntakeSystemClass =
-          AGENT_CLASSLOADER.loadClass("datadog.trace.logging.intake.LogsIntakeSystem");
-      final Method shutdownMethod = logsIntakeSystemClass.getMethod("shutdown");
-      shutdownMethod.invoke(null);
-    } catch (final Throwable ex) {
-      log.error("Throwable thrown while shutting down logs intake", ex);
-    }
-  }
-
-  private static void startTelemetry(Instrumentation inst, Class<?> scoClass, Object sco) {
-    StaticEventLogger.begin("Telemetry");
-
-    try {
-      final Class<?> telemetrySystem =
-          AGENT_CLASSLOADER.loadClass("datadog.telemetry.TelemetrySystem");
-      final Method startTelemetry =
-          telemetrySystem.getMethod("startTelemetry", Instrumentation.class, scoClass);
-      startTelemetry.invoke(null, inst, sco);
-    } catch (final Throwable ex) {
-      log.warn("Unable start telemetry", ex);
-    }
-
-    StaticEventLogger.end("Telemetry");
-  }
-
-  private static void stopTelemetry() {
-    if (AGENT_CLASSLOADER == null) {
-      return;
-    }
-
-    try {
-      final Class<?> telemetrySystem =
-          AGENT_CLASSLOADER.loadClass("datadog.telemetry.TelemetrySystem");
-      final Method stopTelemetry = telemetrySystem.getMethod("stop");
-      stopTelemetry.invoke(null);
-    } catch (final Throwable ex) {
-      log.error("Error encountered while stopping telemetry", ex);
-    }
-  }
-
-  private static void startFlarePoller(Class<?> scoClass, Object sco) {
-    StaticEventLogger.begin("Flare Poller");
-    try {
-      final Class<?> tracerFlarePollerClass =
-          AGENT_CLASSLOADER.loadClass("datadog.flare.TracerFlarePoller");
-      final Method tracerFlarePollerStartMethod =
-          tracerFlarePollerClass.getMethod("start", scoClass);
-      tracerFlarePollerStartMethod.invoke(null, sco);
-    } catch (final Throwable e) {
-      log.warn("Unable start Flare Poller", e);
-    }
-    StaticEventLogger.end("Flare Poller");
-  }
-
-  private static void stopFlarePoller() {
-    if (AGENT_CLASSLOADER == null) {
-      return;
-    }
-    try {
-      final Class<?> tracerFlarePollerClass =
-          AGENT_CLASSLOADER.loadClass("datadog.flare.TracerFlarePoller");
-      final Method tracerFlarePollerStopMethod = tracerFlarePollerClass.getMethod("stop");
-      tracerFlarePollerStopMethod.invoke(null);
-    } catch (final Throwable ex) {
-      log.warn("Error encountered while stopping Flare Poller", ex);
-    }
-  }
-
-  private static void initializeDelayedCrashTracking() {
-    initializeCrashTracking(true, isCrashTrackingAutoconfigEnabled());
-  }
-
-  private static void initializeDelayedCrashTrackingOnlyJmx() {
-    initializeCrashTracking(true, false);
-  }
-
-  private static void initializeCrashTrackingDefault() {
-    initializeCrashTracking(false, isCrashTrackingAutoconfigEnabled());
-  }
-
-  private static boolean isCrashTrackingAutoconfigEnabled() {
-    String enabledVal = ddGetProperty("dd." + CrashTrackingConfig.CRASH_TRACKING_ENABLE_AUTOCONFIG);
-    boolean enabled = CrashTrackingConfig.CRASH_TRACKING_ENABLE_AUTOCONFIG_DEFAULT;
-    if (enabledVal != null) {
-      enabled = Boolean.parseBoolean(enabledVal);
-    } else {
-      // If the property is not set, then we check if profiling is enabled
-      enabled = profilingEnabled;
-    }
-    return enabled;
-  }
-
-  private static void initializeCrashTracking(boolean delayed, boolean checkNative) {
-    log.debug("Initializing crashtracking");
-    try {
-      Class<?> clz = AGENT_CLASSLOADER.loadClass("datadog.crashtracking.Initializer");
-      // first try to use the JVMAccess using the native library; unless `checkNative` is false
-      Boolean rslt =
-          checkNative && (Boolean) clz.getMethod("initialize", boolean.class).invoke(null, false);
-      if (!rslt) {
-        if (delayed) {
-          // already delayed initialization, so no need to reschedule it again
-          // just call initialize and force JMX
-          rslt = (Boolean) clz.getMethod("initialize", boolean.class).invoke(null, true);
+            // Install AgentMeter, StatsDClient and Monitoring
+            final Class<?> tracerInstallerClass =
+                    AGENT_CLASSLOADER.loadClass("datadog.trace.agent.tooling.MeterInstaller");
+            final Method installMeterMethod = tracerInstallerClass.getMethod("installMeter");
+            installMeterMethod.invoke(null);
+        } catch (final FatalAgentMisconfigurationError ex) {
+            throw ex;
+        } catch (final Throwable ex) {
+            log.error("Throwable thrown while installing the Datadog meter", ex);
+            initTelemetry.onFatalError(ex);
+        }
+
+        StaticEventLogger.end("AgentMeter");
+    }
+
+    private static synchronized void installDatadogTracer(
+            InitializationTelemetry initTelemetry, Class<?> scoClass, Object sco) {
+        if (AGENT_CLASSLOADER == null) {
+            throw new IllegalStateException("Datadog agent should have been started already");
+        }
+
+        StaticEventLogger.begin("GlobalTracer");
+
+        // TracerInstaller.installGlobalTracer can be called multiple times without any problem
+        // so there is no need to have a 'datadogTracerInstalled' flag here.
+        try {
+            // install global tracer
+            final Class<?> tracerInstallerClass =
+                    AGENT_CLASSLOADER.loadClass("datadog.trace.agent.tooling.TracerInstaller");
+            final Method tracerInstallerMethod =
+                    tracerInstallerClass.getMethod("installGlobalTracer", scoClass, ProfilingContextIntegration.class);
+            tracerInstallerMethod.invoke(null, sco, createProfilingContextIntegration());
+        } catch (final FatalAgentMisconfigurationError ex) {
+            throw ex;
+        } catch (final Throwable ex) {
+            log.error("Throwable thrown while installing the Datadog Tracer", ex);
+
+            initTelemetry.onFatalError(ex);
+        }
+
+        StaticEventLogger.end("GlobalTracer");
+    }
+
+    private static void startCrashTracking() {
+        if (isJavaVersionAtLeast(9)) {
+            // it is safe to initialize crashtracking early
+            // since it can take 100ms+ to initialize the native library we will defer the initialization
+            // ... unless we request early start with the debug config flag
+            boolean forceEarlyStart = CrashTrackingConfig.CRASH_TRACKING_START_EARLY_DEFAULT;
+            String forceEarlyStartStr = ddGetProperty("dd." + CrashTrackingConfig.CRASH_TRACKING_START_EARLY);
+            if (forceEarlyStartStr != null) {
+                forceEarlyStart = Boolean.parseBoolean(forceEarlyStartStr);
+            }
+            if (forceEarlyStart) {
+                initializeCrashTrackingDefault();
+            } else {
+                AgentTaskScheduler.get().execute(Agent::initializeCrashTrackingDefault);
+            }
+        } else {
+            // for Java 8 we are relying on JMX to give us the process PID
+            // we need to delay the crash tracking initialization until JMX is available
+            CRASHTRACKER_INIT_AFTER_JMX = Agent::initializeDelayedCrashTracking;
+        }
+    }
+
+    private static void scheduleJmxStart(final int jmxStartDelay) {
+        if (jmxStartDelay > 0) {
+            AgentTaskScheduler.get().scheduleWithJitter(new JmxStartTask(), jmxStartDelay, TimeUnit.SECONDS);
         } else {
-          // delayed initialization, so we need to reschedule it and mark as delayed but do not
-          // re-check the native library
-          CRASHTRACKER_INIT_AFTER_JMX = Agent::initializeDelayedCrashTrackingOnlyJmx;
-          rslt = null; // we will initialize it later
-        }
-      }
-      if (rslt == null) {
-        log.debug("Crashtracking initialization delayed until JMX is available");
-      } else if (rslt) {
-        log.debug("Crashtracking initialized");
-      } else {
-        log.debug(
-            SEND_TELEMETRY, "Crashtracking failed to initialize. No additional details available.");
-      }
-    } catch (Throwable t) {
-      log.debug(SEND_TELEMETRY, "Unable to initialize crashtracking");
-    }
-  }
-
-  private static void startCwsAgent() {
-    if (AGENT_CLASSLOADER.getResource("cws-tls.version") == null) {
-      log.warn("CWS support not included in this build of `dd-java-agent`");
-      return;
-    }
-    log.debug("Scheduling scope event factory registration");
-    WithGlobalTracer.registerOrExecute(
-        new WithGlobalTracer.Callback() {
-          @Override
-          public void withTracer(TracerAPI tracer) {
-            log.debug("Registering CWS scope tracker");
+            startJmx();
+        }
+    }
+
+    static final class JmxStartTask implements Runnable {
+        @Override
+        public void run() {
+            startJmx();
+        }
+    }
+
+    private static synchronized void startJmx() {
+        if (AGENT_CLASSLOADER == null) {
+            throw new IllegalStateException("Datadog agent should have been started already");
+        }
+        if (jmxStarting.getAndSet(true)) {
+            return; // another thread is already in startJmx
+        }
+        if (jmxFetchEnabled) {
+            startJmxFetch();
+        }
+        initializeJmxSystemAccessProvider(AGENT_CLASSLOADER);
+        if (crashTrackingEnabled && CRASHTRACKER_INIT_AFTER_JMX != null) {
             try {
-              ScopeListener scopeListener =
-                  (ScopeListener)
-                      AGENT_CLASSLOADER
-                          .loadClass("datadog.cws.tls.TlsScopeListener")
-                          .getDeclaredConstructor()
-                          .newInstance();
-              tracer.addScopeListener(scopeListener);
-              log.debug("Scope event factory {} has been registered", scopeListener);
-            } catch (Throwable e) {
-              if (e instanceof InvocationTargetException) {
-                e = e.getCause();
-              }
-              log.debug("CWS is not available. {}", e.getMessage());
+                CRASHTRACKER_INIT_AFTER_JMX.run();
+            } finally {
+                CRASHTRACKER_INIT_AFTER_JMX = null;
             }
-          }
-        });
-  }
-
-  /**
-   * {@see com.datadog.profiling.ddprof.DatadogProfilingIntegration} must not be modified to depend
-   * on JFR.
-   */
-  static ProfilingContextIntegration createProfilingContextIntegration() {
-    Config config = Config.get();
-    // Windows is already excluded by Config (isDatadogProfilerSafeAndConfigured), so only AWS
-    // Lambda needs to be excluded here: it has no ddprof native library support, same as
-    // startProfilingAgent().
-    if (!isAwsLambdaRuntime()) {
-      if (config.isDatadogProfilerEnabled()) {
-        // The profiler itself is running: load ddprof now, and let ProfilingAgent.run() register
-        // the process context as it always has.
-        ProfilingContextIntegration integration = loadDdprofContextIntegration(AGENT_CLASSLOADER);
-        if (integration != null) {
-          return integration;
-        }
-      } else if (!config.isProfilingEnabled() && config.isOtelThreadContextEnabled()) {
-        // No profiler, we only want the context exposed: loading ddprof pulls in the native
-        // library and touches java.nio.file, which must not happen on the primordial premain
-        // thread, so it is deferred.
-        // The explicit !isProfilingEnabled() guard (redundant with isOtelThreadContextEnabled()'s
-        // own isDatadogProfilerSafeAndConfigured() factor) keeps this branch provably unreachable
-        // whenever profiling is enabled, so the JFR-events fallback below is never skipped.
-        return deferDdprofContextIntegration(AGENT_CLASSLOADER);
-      }
-    }
-    if (config.isProfilingEnabled() && config.isProfilingTimelineEventsEnabled()) {
-      // important: note that this will not initialise JFR until onStart is called
-      try {
-        return (ProfilingContextIntegration)
-            AGENT_CLASSLOADER
-                .loadClass("com.datadog.profiling.controller.openjdk.JFREventContextIntegration")
-                .getDeclaredConstructor()
-                .newInstance();
-      } catch (Throwable t) {
-        log.debug("JFR event-based profiling context labeling not available. {}", t.getMessage());
-      }
-    }
-    return ProfilingContextIntegration.NoOp.INSTANCE;
-  }
-
-  /**
-   * Loads the ddprof-based profiling context integration on the calling thread, for when the
-   * Datadog profiler is running. Returns {@code null} when it isn't available, so the caller can
-   * fall back to another integration.
-   */
-  static ProfilingContextIntegration loadDdprofContextIntegration(final ClassLoader classLoader) {
-    try {
-      return newDdprofContextIntegration(classLoader);
-    } catch (Throwable t) {
-      log.debug("ddprof-based profiling context labeling not available. {}", t.getMessage());
-      return null;
-    }
-  }
-
-  /**
-   * Returns a placeholder integration that loads the ddprof-based one off the calling thread and
-   * registers the OTel process context alongside it. Only used when the profiler isn't running:
-   * otherwise {@code ProfilingAgent.run()} registers the process context itself.
-   */
-  static ProfilingContextIntegration deferDdprofContextIntegration(final ClassLoader classLoader) {
-    DeferredProfilingContextIntegration deferred =
-        new DeferredProfilingContextIntegration(
-            "ddprof",
-            () -> {
-              // Process context registration must not depend on the trace-context integration
-              // below: it already catches its own failures, and must still run (for CWS/eBPF)
-              // even when constructing DatadogProfilingIntegration throws.
-              registerProcessContext(classLoader);
-              return newDdprofContextIntegration(classLoader);
-            });
-    deferred.scheduleInitialization();
-    return deferred;
-  }
-
-  private static ProfilingContextIntegration newDdprofContextIntegration(
-      final ClassLoader classLoader) throws ReflectiveOperationException {
-    return (ProfilingContextIntegration)
-        classLoader
-            .loadClass("com.datadog.profiling.ddprof.DatadogProfilingIntegration")
-            .getDeclaredConstructor()
-            .newInstance();
-  }
-
-  private static void registerProcessContext(final ClassLoader classLoader) {
-    try {
-      classLoader
-          .loadClass("com.datadog.profiling.agent.ProcessContext")
-          .getMethod("register", ConfigProvider.class)
-          .invoke(null, ConfigProvider.getInstance());
-    } catch (Throwable t) {
-      log.debug("Process context registration not available. {}", t.getMessage());
-    }
-  }
-
-  private static boolean startProfilingAgent(
-      final boolean earlyStart, final boolean firstAttempt, Instrumentation inst) {
-    if (isAwsLambdaRuntime()) {
-      if (firstAttempt) {
-        log.info("Profiling not supported in AWS Lambda runtimes");
-      }
-      return false;
-    }
-
-    boolean requestRetry = false;
-
-    if (firstAttempt) {
-      StaticEventLogger.begin("ProfilingAgent");
-      final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
-      try {
-        Thread.currentThread().setContextClassLoader(AGENT_CLASSLOADER);
-        final Class<?> profilingAgentClass =
-            AGENT_CLASSLOADER.loadClass("com.datadog.profiling.agent.ProfilingAgent");
-        final Method profilingInstallerMethod =
-            profilingAgentClass.getMethod("run", Boolean.TYPE, Instrumentation.class);
-        requestRetry = (boolean) profilingInstallerMethod.invoke(null, earlyStart, inst);
-      } catch (final Throwable ex) {
-        log.error(SEND_TELEMETRY, "Throwable thrown while starting profiling agent", ex);
-      } finally {
-        safelySetContextClassLoader(contextLoader);
-      }
-      StaticEventLogger.end("ProfilingAgent");
-    }
-    if (!earlyStart) {
-      /*
-       * Install the tracer hooks only when not using 'early start'.
-       * The 'early start' is happening so early that most of the infrastructure has not been set up yet.
-       */
-      initProfilerContext();
-    }
-    return requestRetry;
-  }
-
-  private static void initProfilerContext() {
-    log.debug("Scheduling profiler context initialization");
-    WithGlobalTracer.registerOrExecute(
-        tracer -> {
-          log.debug("Initializing profiler context integration");
-          tracer.getProfilingContext().onStart();
-        });
-  }
+        }
+        if (profilingEnabled) {
+            // Both of these register JFR events through registerJfrEvents(), which force-initializes the
+            // JDK's JFR event-holder class first (see initializeJfrEventHolderClass) to avoid a deadlock.
+            registerDeadlockDetectionEvent();
+            registerSmapEntryEvent();
+            if (PROFILER_INIT_AFTER_JMX != null) {
+                try {
+                    /*
+                    When getJmxStartDelay() is set to 0 we will attempt to initialize the JMX subsystem as soon as available.
+                    But, this can cause issues with JFR as it needs some 'grace period' after JMX is ready. That's why we are
+                    re-scheduling the profiler initialization code just a tad later.
+
+                    If the jmx start delay is set, we are already delayed relative to the jmx init so we can just plainly
+                    run the initialization code.
+                    */
+                    if (getJmxStartDelay() == 0) {
+                        log.debug("Waiting for profiler initialization");
+                        AgentTaskScheduler.get()
+                                .scheduleWithJitter(PROFILER_INIT_AFTER_JMX, 500, TimeUnit.MILLISECONDS);
+                    } else {
+                        log.debug("Initializing profiler");
+                        PROFILER_INIT_AFTER_JMX.run();
+                    }
+                } finally {
+                    PROFILER_INIT_AFTER_JMX = null;
+                }
+            }
+        }
+    }
+
+    private static synchronized void registerDeadlockDetectionEvent() {
+        log.debug("Initializing JMX thread deadlock detector");
+        registerJfrEvents(
+                "com.datadog.profiling.controller.openjdk.events.DeadlockEventFactory",
+                "JMX thread deadlock detection");
+    }
+
+    private static void initializeJfrEventHolderClass() {
+        initializeJfrEventHolderClass(AGENT_CLASSLOADER);
+    }
+
+    /**
+     * Force-initializes the JDK's JFR event-holder class early to avoid an ABBA deadlock between
+     * {@code jdk.jfr.internal.Utils}'s monitor and the holder class's initialization lock. See <a
+     * href="https://bugs.openjdk.org/browse/JDK-8371889">JDK-8371889</a> and the SCP-1278 thread
+     * dump.
+     *
+     * <p>The holder's {@code <clinit>} looks up the JDK's built-in event handlers through {@code
+     * jdk.jfr.internal.Utils} (taking its monitor); conversely, JFR event registration initializes
+     * the holder while holding that same monitor. The deadlock forms when one thread holds the {@code
+     * Utils} monitor and wants the holder's class-init lock, while another thread holds the
+     * class-init lock (running {@code <clinit>}) and wants the {@code Utils} monitor. In SCP-1278
+     * this was the profiler's smap-event registration (holding {@code Utils}) against a concurrent
+     * JMXFetch ByteBuddy transform that had triggered the holder {@code <clinit>}. Running the {@code
+     * <clinit>} here, on this thread, before we register our own JFR events, means the holder is
+     * already initialized by then, so the cycle cannot form.
+     *
+     * <p>Ordering matters twice over:
+     *
+     * <ul>
+     *   <li>We force {@code FlightRecorder} initialization first, which registers the JDK's built-in
+     *       events (via {@code JDKEvents.initialize()}). The holder's fields are {@code static final}
+     *       and are populated from {@code Utils} at {@code <clinit>} time; running {@code <clinit>}
+     *       before the events are registered would cache {@code null} into those fields permanently
+     *       and silently disable the built-in socket/file/exception JFR events (verified on JDK
+     *       17.0.17 and 21.0.9). This mirrors the JDK's own fix, which initializes the holder only
+     *       after {@code JDKEvents.initialize()}. The event registration below would trigger the same
+     *       {@code FlightRecorder} initialization anyway; we merely order it ahead of the holder
+     *       {@code <clinit>}. If {@code FlightRecorder} init fails, JFR is unavailable and there is
+     *       nothing to protect against, so we skip the holder init entirely.
+     *   <li>{@link Class#forName(String, boolean, ClassLoader)} with {@code initialize=true} is
+     *       required: {@link ClassLoader#loadClass(String)} would only load the class without running
+     *       {@code <clinit>}, so it would neither take the class-init lock early nor prevent the
+     *       deadlock.
+     * </ul>
+     *
+     * <p>The holder class was renamed across JDK versions, so it is selected by version (see {@link
+     * #jfrEventHolderClassName()}): {@code jdk.jfr.events.Handlers} on JDK 15-18, {@code
+     * jdk.jfr.events.EventConfigurations} on JDK 19-22. Earlier JDKs (including 11 LTS) predate the
+     * holder and JDK 23+ removed the eager-init pattern; on those this method does nothing. On
+     * patched JDKs (the JDK-8371889 fix was backported to 21.0.11) the JDK already initializes the
+     * holder safely during {@code FlightRecorder} startup, so forcing it here is a harmless no-op.
+     *
+     * @param loader class loader used to resolve the JFR classes (package-private for testing; see
+     *     JfrEventHolderInitForkedTest)
+     */
+    static void initializeJfrEventHolderClass(final ClassLoader loader) {
+        final String holderClassName = jfrEventHolderClassName();
+        if (holderClassName == null) {
+            return; // no eager-init holder on this JDK, so there is no deadlock to prevent
+        }
+        try {
+            // Register the JDK's built-in JFR events first, so the holder's <clinit> below sees non-null
+            // handlers instead of caching null.
+            Class.forName("jdk.jfr.FlightRecorder", true, loader)
+                    .getMethod("getFlightRecorder")
+                    .invoke(null);
+            // Force the holder's <clinit>.
+            Class.forName(holderClassName, true, loader);
+        } catch (final Throwable ignored) {
+            // JFR unavailable/disabled or initialization failed: nothing (left) to do. We catch Throwable
+            // rather than Exception because forcing initialization can surface Errors such as
+            // ExceptionInInitializerError, NoClassDefFoundError or LinkageError.
+        }
+    }
+
+    /**
+     * Returns the fully-qualified name of the JDK's JFR event-holder class for the running JVM, or
+     * {@code null} if this JDK has no such class. The class is selected by JDK version rather than by
+     * probing with {@link ClassNotFoundException} so the mapping is explicit:
+     *
+     * <ul>
+     *   <li>JDK 15-18: {@code jdk.jfr.events.Handlers}
+     *   <li>JDK 19-22: {@code jdk.jfr.events.EventConfigurations}
+     *   <li>otherwise (JDK 14 and earlier predate the holder; JDK 23+ removed the eager-init
+     *       pattern): {@code null}
+     * </ul>
+     *
+     * <p>Also returns {@code null} on non-HotSpot VMs: JDK-8371889 is a HotSpot JFR bug, and other
+     * VMs (e.g. Eclipse OpenJ9 / IBM Semeru) ship a different JFR implementation where this holder /
+     * {@code Utils} mechanism does not apply.
+     */
+    static String jfrEventHolderClassName() {
+        if (!isHotspot()) {
+            return null;
+        }
+        if (isJavaVersionAtLeast(15) && !isJavaVersionAtLeast(19)) {
+            return "jdk.jfr.events.Handlers";
+        }
+        if (isJavaVersionAtLeast(19) && !isJavaVersionAtLeast(23)) {
+            return "jdk.jfr.events.EventConfigurations";
+        }
+        return null;
+    }
+
+    private static synchronized void registerSmapEntryEvent() {
+        log.debug("Initializing smap entry scraping");
+        registerJfrEvents("com.datadog.profiling.controller.openjdk.events.SmapEntryFactory", "Smap entry scraping");
+    }
 
-  private static boolean isAwsLambdaRuntime() {
-    return !EnvironmentVariables.getOrDefault("AWS_LAMBDA_FUNCTION_NAME", "").isEmpty();
-  }
+    /**
+     * Registers a profiling JFR event factory's events, after force-initializing the JDK's JFR
+     * event-holder class (see {@link #initializeJfrEventHolderClass(ClassLoader)}).
+     *
+     * <p><strong>All JFR event registration during agent startup must go through this
+     * method.</strong> Registering a JFR event triggers the holder class's initialization while
+     * holding the {@code jdk.jfr.internal.Utils} monitor; unless the holder has already been fully
+     * initialized, that can deadlock (JDK-8371889). Routing every registration through here
+     * guarantees the holder is initialized first, so future event registrations cannot reintroduce
+     * the deadlock by running before it.
+     *
+     * @param factoryClassName fully-qualified name of the event factory with a static {@code
+     *     registerEvents()} method
+     * @param description human-readable name used in log messages
+     */
+    private static void registerJfrEvents(final String factoryClassName, final String description) {
+        // Enforce the ordering invariant: the holder must be initialized before any JFR event is
+        // registered. Idempotent and cheap once done, so it is safe to call before every registration.
+        initializeJfrEventHolderClass();
+        try {
+            final Class<?> factoryClass = AGENT_CLASSLOADER.loadClass(factoryClassName);
+            factoryClass.getMethod("registerEvents").invoke(null);
+        } catch (final NoClassDefFoundError | ClassNotFoundException | UnsupportedClassVersionError ignored) {
+            log.debug("{} not supported", description);
+        } catch (final Throwable ex) {
+            log.error("Unable to initialize {}", description, ex);
+        }
+    }
+
+    /** Enable JMX based system access provider once it is safe to touch JMX */
+    private static synchronized void initializeJmxSystemAccessProvider(final ClassLoader classLoader) {
+        if (log.isDebugEnabled()) {
+            log.debug("Initializing JMX system access provider for {}", classLoader);
+        }
+        try {
+            final Class<?> tracerInstallerClass = classLoader.loadClass("datadog.trace.core.util.SystemAccess");
+            final Method enableJmxMethod = tracerInstallerClass.getMethod("enableJmx");
+            enableJmxMethod.invoke(null);
+        } catch (final Throwable ex) {
+            log.error("Throwable thrown while initializing JMX system access provider", ex);
+        }
+    }
 
-  private static void shutdownProfilingAgent(final boolean sync) {
-    if (AGENT_CLASSLOADER == null) {
-      // It wasn't started, so no need to shut it down
-      return;
-    }
-
-    final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
-    try {
-      Thread.currentThread().setContextClassLoader(AGENT_CLASSLOADER);
-      final Class<?> profilingAgentClass =
-          AGENT_CLASSLOADER.loadClass("com.datadog.profiling.agent.ProfilingAgent");
-      final Method profilingInstallerMethod =
-          profilingAgentClass.getMethod("shutdown", Boolean.TYPE);
-      profilingInstallerMethod.invoke(null, sync);
-    } catch (final Throwable ex) {
-      log.error("Throwable thrown while shutting down profiling agent", ex);
-    } finally {
-      safelySetContextClassLoader(contextLoader);
-    }
-  }
-
-  private static void maybeStartDebugger(Instrumentation inst, Class<?> scoClass, Object sco) {
-    if (isExplicitlyDisabled(DebuggerConfig.DYNAMIC_INSTRUMENTATION_ENABLED)
-        && isExplicitlyDisabled(DebuggerConfig.EXCEPTION_REPLAY_ENABLED)
-        && isExplicitlyDisabled(TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_ENABLED)
-        && isExplicitlyDisabled(DebuggerConfig.DISTRIBUTED_DEBUGGER_ENABLED)) {
-      return;
-    }
-    startDebuggerAgent(inst, scoClass, sco);
-  }
-
-  private static synchronized void startDebuggerAgent(
-      Instrumentation inst, Class<?> scoClass, Object sco) {
-    StaticEventLogger.begin("Debugger");
-
-    final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
-    try {
-      Thread.currentThread().setContextClassLoader(AGENT_CLASSLOADER);
-      final Class<?> debuggerAgentClass =
-          AGENT_CLASSLOADER.loadClass("com.datadog.debugger.agent.DebuggerAgent");
-      final Method debuggerInstallerMethod =
-          debuggerAgentClass.getMethod("run", Config.class, Instrumentation.class, scoClass);
-      debuggerInstallerMethod.invoke(null, Config.get(), inst, sco);
-    } catch (final Throwable ex) {
-      log.error("Throwable thrown while starting debugger agent", ex);
-    } finally {
-      safelySetContextClassLoader(contextLoader);
-    }
-
-    StaticEventLogger.end("Debugger");
-  }
-
-  private static void configureLogger() {
-    setSystemPropertyDefault(SIMPLE_LOGGER_SHOW_DATE_TIME_PROPERTY, "true");
-
-    String logFormatJson = ddGetProperty("dd.log.format.json");
-    if (null != logFormatJson) {
-      setSystemPropertyDefault(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY, logFormatJson);
-    } else {
-      setSystemPropertyDefault(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY, "false");
-    }
-
-    if (Boolean.parseBoolean(SystemProperties.get(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY))) {
-      setSystemPropertyDefault(
-          SIMPLE_LOGGER_DATE_TIME_FORMAT_PROPERTY, SIMPLE_LOGGER_DATE_TIME_FORMAT_JSON_DEFAULT);
-    } else {
-      setSystemPropertyDefault(
-          SIMPLE_LOGGER_DATE_TIME_FORMAT_PROPERTY, SIMPLE_LOGGER_DATE_TIME_FORMAT_DEFAULT);
-    }
-
-    String logLevel;
-    if (isDebugMode()) {
-      logLevel = "DEBUG";
-    } else {
-      logLevel = ddGetProperty("dd.trace.log.level");
-      if (null == logLevel) {
-        logLevel = ddGetProperty("dd.log.level");
-        if (null == logLevel) {
-          logLevel = EnvironmentVariables.get("OTEL_LOG_LEVEL");
-        }
-      }
-    }
-
-    if (null == logLevel && !isFeatureEnabled(AgentFeature.STARTUP_LOGS)) {
-      logLevel = "WARN";
-    }
-
-    if (null != logLevel) {
-      setSystemPropertyDefault(SIMPLE_LOGGER_DEFAULT_LOG_LEVEL_PROPERTY, logLevel);
-    }
-  }
-
-  private static void setSystemPropertyDefault(final String property, final String value) {
-    if (SystemProperties.get(property) == null && ddGetEnv(property) == null) {
-      SystemProperties.set(property, value);
-    }
-  }
-
-  private static ClassLoader getPlatformClassLoader()
-      throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-    /*
-     Must invoke ClassLoader.getPlatformClassLoader by reflection to remain
-     compatible with java 7 + 8.
-    */
-    final Method method = ClassLoader.class.getDeclaredMethod("getPlatformClassLoader");
-    return (ClassLoader) method.invoke(null);
-  }
-
-  /**
-   * Determine if we should log in debug level according to dd.trace.debug
-   *
-   * @return true if we should
-   */
-  private static boolean isDebugMode() {
-    final String tracerDebugLevelSysprop = "dd.trace.debug";
-    final String tracerDebugLevelProp = SystemProperties.get(tracerDebugLevelSysprop);
-
-    if (tracerDebugLevelProp != null) {
-      return Boolean.parseBoolean(tracerDebugLevelProp);
-    }
-
-    final String tracerDebugLevelEnv = ddGetEnv(tracerDebugLevelSysprop);
-
-    if (tracerDebugLevelEnv != null) {
-      return Boolean.parseBoolean(tracerDebugLevelEnv);
-    }
-    return false;
-  }
-
-  /**
-   * @return {@code true} if the agent feature is enabled
-   */
-  private static boolean isFeatureEnabled(AgentFeature feature) {
-    // must be kept in sync with logic from Config!
-    final String featureConfigKey = feature.getConfigKey();
-    final String featureSystemProp = feature.getSystemProp();
-    String featureEnabled = SystemProperties.get(featureSystemProp);
-    if (featureEnabled == null) {
-      featureEnabled = getStableConfig(FLEET, featureConfigKey);
-    }
-    if (featureEnabled == null) {
-      featureEnabled = ddGetEnv(featureSystemProp);
-    }
-    if (featureEnabled == null) {
-      featureEnabled = getStableConfig(LOCAL, featureConfigKey);
-    }
-
-    if (feature.isEnabledByDefault()) {
-      // true unless it's explicitly set to "false"
-      return !("false".equalsIgnoreCase(featureEnabled) || "0".equals(featureEnabled));
-    } else {
-      if (feature == AgentFeature.PROFILING) {
-        // We need this hack because profiling in SSI can receive 'auto' value in
-        // the enablement config
-        return ProfilingEnablement.of(featureEnabled).isActive();
-      }
-      // false unless it's explicitly set to "true"
-      return Boolean.parseBoolean(featureEnabled) || "1".equals(featureEnabled);
-    }
-  }
-
-  private static boolean isFeatureFlaggingEnabled() {
-    final Boolean providerEnabled =
-        featureFlaggingBooleanSetting(FeatureFlaggingConfig.FEATURE_FLAGS_ENABLED);
-    final String configurationSource =
-        featureFlaggingSetting(FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE);
-    final Boolean legacyProviderEnabled =
-        featureFlaggingBooleanSetting(FeatureFlaggingConfig.EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED);
-
-    return FeatureFlaggingConfig.resolveConfiguration(
-            providerEnabled, configurationSource, legacyProviderEnabled)
-        .isEnabled();
-  }
-
-  @SuppressFBWarnings(
-      value = "NP_BOOLEAN_RETURN_NULL",
-      justification = "A null value preserves the distinction between absent and explicitly false")
-  private static Boolean featureFlaggingBooleanSetting(final String configKey) {
-    final String value = featureFlaggingSetting(configKey);
-    if (value == null) {
-      return null;
-    }
-    return Boolean.parseBoolean(value) || "1".equals(value);
-  }
-
-  private static String featureFlaggingSetting(final String configKey) {
-    final String systemProperty = propertyNameToSystemPropertyName(configKey);
-    String value = SystemProperties.get(systemProperty);
-    if (value == null) {
-      value = getStableConfig(FLEET, configKey);
-    }
-    if (value == null) {
-      value = ddGetEnv(systemProperty);
-    }
-    if (value == null) {
-      value = getStableConfig(LOCAL, configKey);
-    }
-    return value;
-  }
-
-  /**
-   * @see datadog.trace.api.ProductActivation#fromString(String)
-   */
-  private static boolean isFullyDisabled(final AgentFeature feature) {
-    // must be kept in sync with logic from Config!
-    final String featureConfigKey = feature.getConfigKey();
-    final String featureSystemProp = feature.getSystemProp();
-    String settingValue = getNullIfEmpty(SystemProperties.get(featureSystemProp));
-    if (settingValue == null) {
-      settingValue = getNullIfEmpty(getStableConfig(FLEET, featureConfigKey));
-    }
-    if (settingValue == null) {
-      settingValue = getNullIfEmpty(ddGetEnv(featureSystemProp));
-    }
-    if (settingValue == null) {
-      settingValue = getNullIfEmpty(getStableConfig(LOCAL, featureConfigKey));
-    }
-
-    // defaults to inactive
-    return !(settingValue == null
-        || settingValue.equalsIgnoreCase("true")
-        || settingValue.equalsIgnoreCase("1")
-        || settingValue.equalsIgnoreCase("inactive"));
-  }
-
-  /** IAST will be enabled in opt-out if it's not actively disabled and AppSec is enabled */
-  private static boolean isIastFullyDisabled(final boolean isAppSecEnabled) {
-    if (isFullyDisabled(AgentFeature.IAST)) {
-      return true;
-    }
-    return !isAppSecEnabled;
-  }
-
-  private static String getNullIfEmpty(final String value) {
-    if (value == null || value.isEmpty()) {
-      return null;
-    }
-    return value;
-  }
-
-  /**
-   * @return configured JMX start delay in seconds
-   */
-  private static int getJmxStartDelay() {
-    String startDelay = ddGetProperty("dd.dogstatsd.start-delay");
-    if (startDelay == null) {
-      startDelay = ddGetProperty("dd.jmxfetch.start-delay");
-    }
-    if (startDelay != null) {
-      try {
-        return Integer.parseInt(startDelay);
-      } catch (NumberFormatException e) {
-        // fall back to default delay
-      }
-    }
-    return DEFAULT_JMX_START_DELAY;
-  }
-
-  /**
-   * Search for java or datadog-tracer sysprops which indicate that a custom log manager will be
-   * used. Also search for any app classes known to set a custom log manager.
-   *
-   * @return true if we detect a custom log manager being used.
-   */
-  private static boolean isAppUsingCustomLogManager(final EnumSet<Library> libraries) {
-    final String tracerCustomLogManSysprop = "dd.app.customlogmanager";
-    final String customLogManagerProp = SystemProperties.get(tracerCustomLogManSysprop);
-    final String customLogManagerEnv = ddGetEnv(tracerCustomLogManSysprop);
-
-    if (customLogManagerProp != null || customLogManagerEnv != null) {
-      log.debug("Prop - customlogmanager: {}", customLogManagerProp);
-      log.debug("Env - customlogmanager: {}", customLogManagerEnv);
-      // Allow setting to skip these automatic checks:
-      return Boolean.parseBoolean(customLogManagerProp)
-          || Boolean.parseBoolean(customLogManagerEnv);
-    }
-
-    if (libraries.contains(WILDFLY)) {
-      return true; // Wildfly is known to set a custom log manager after startup.
-    }
-
-    final String logManagerProp = SystemProperties.get("java.util.logging.manager");
-    if (logManagerProp != null) {
-      log.debug("Prop - logging.manager: {}", logManagerProp);
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Search for java or datadog-tracer sysprops which indicate that a custom JMX builder will be
-   * used.
-   *
-   * @return true if we detect a custom JMX builder being used.
-   */
-  private static boolean isAppUsingCustomJMXBuilder(final EnumSet<Library> libraries) {
-    final String tracerCustomJMXBuilderSysprop = "dd.app.customjmxbuilder";
-    final String customJMXBuilderProp = SystemProperties.get(tracerCustomJMXBuilderSysprop);
-    final String customJMXBuilderEnv = ddGetEnv(tracerCustomJMXBuilderSysprop);
-
-    if (customJMXBuilderProp != null || customJMXBuilderEnv != null) {
-      log.debug("Prop - customjmxbuilder: {}", customJMXBuilderProp);
-      log.debug("Env - customjmxbuilder: {}", customJMXBuilderEnv);
-      // Allow setting to skip these automatic checks:
-      return Boolean.parseBoolean(customJMXBuilderProp)
-          || Boolean.parseBoolean(customJMXBuilderEnv);
-    }
-
-    if (libraries.contains(WILDFLY)) {
-      return true; // Wildfly is known to set a custom JMX builder after startup.
-    }
-
-    final String jmxBuilderProp = SystemProperties.get("javax.management.builder.initial");
-    if (jmxBuilderProp != null) {
-      log.debug("Prop - javax.management.builder.initial: {}", jmxBuilderProp);
-      return true;
-    }
-
-    return false;
-  }
-
-  /** Looks for the "dd." system property first then the "DD_" environment variable equivalent. */
-  private static String ddGetProperty(final String sysProp) {
-    String value = SystemProperties.get(sysProp);
-    if (null == value) {
-      value = ddGetEnv(sysProp);
-    }
-    return value;
-  }
-
-  /** Looks for sysProp in the Stable Configuration input */
-  private static String getStableConfig(StableConfigSource source, final String sysProp) {
-    return source.get(sysProp);
-  }
-
-  /** Looks for the "DD_" environment variable equivalent of the given "dd." system property. */
-  private static String ddGetEnv(final String sysProp) {
-    return EnvironmentVariables.get(toEnvVar(sysProp));
-  }
-
-  private static boolean okHttpMayIndirectlyLoadJUL() {
-    if (isCustomSecurityProviderInstalled() || isIBMSASLInstalled()) {
-      return true; // custom security providers may load JUL when OkHttp accesses TLS
-    }
-    if (isJavaVersionAtLeast(9)) {
-      return false; // JDKs since 9 have reworked JFR to use a different logging facility, not JUL
-    }
-    return isJFRSupported(); // assume OkHttp will indirectly load JUL via its JFR events
-  }
-
-  private static boolean isCustomSecurityProviderInstalled() {
-    return ClassLoader.getSystemResource("META-INF/services/java.security.Provider") != null;
-  }
+    private static synchronized void startJmxFetch() {
+        final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(AGENT_CLASSLOADER);
+            final Class<?> jmxFetchAgentClass = AGENT_CLASSLOADER.loadClass("datadog.trace.agent.jmxfetch.JMXFetch");
+            final Method jmxFetchInstallerMethod = jmxFetchAgentClass.getMethod("run", StatsDClientManager.class);
+            jmxFetchInstallerMethod.invoke(null, statsDClientManager());
+        } catch (final Throwable ex) {
+            log.error("Throwable thrown while starting JmxFetch", ex);
+        } finally {
+            safelySetContextClassLoader(contextLoader);
+        }
+    }
 
-  private static boolean isIBMSASLInstalled() {
-    // need explicit check as this is installed without using the service-loader mechanism
-    return ClassLoader.getSystemResource("com/ibm/security/sasl/IBMSASL.class") != null;
-  }
-
-  private static boolean isJFRSupported() {
-    // FIXME: this is quite a hack because there maybe jfr classes on classpath somehow that have
-    // nothing to do with JDK - but this should be safe because only thing this does is to delay
-    // tracer install
-    return BootstrapProxy.INSTANCE.getResource("jdk/jfr/Recording.class") != null;
-  }
+    private static StatsDClientManager statsDClientManager() throws Exception {
+        final Class<?> statsdClientManagerClass =
+                AGENT_CLASSLOADER.loadClass("datadog.metrics.impl.statsd.DDAgentStatsDClientManager");
+        final Method statsDClientManagerMethod = statsdClientManagerClass.getMethod("statsDClientManager");
+        return (StatsDClientManager) statsDClientManagerMethod.invoke(null);
+    }
 
-  private static boolean isDataJobsSupported(String javaCommand, String dataJobsCommandPattern) {
-    if (null == javaCommand || null == dataJobsCommandPattern) {
-      // if sun.java.command somehow is not set or data jobs command pattern is not
-      // set, assume it's supported due to lack of info.
-      return true;
+    private static void maybeStartAiGuard() {
+        if (!Config.get().isAiGuardEnabled()) {
+            return;
+        }
+        try {
+            final Class<?> aiGuardSystemClass = AGENT_CLASSLOADER.loadClass("com.datadog.aiguard.AIGuardSystem");
+            final Method aiGuardInstallerMethod = aiGuardSystemClass.getMethod("start");
+            aiGuardInstallerMethod.invoke(null);
+        } catch (final Exception e) {
+            log.debug("Error initializing AI Guard", e);
+        }
     }
 
-    try {
-      return javaCommand.matches(dataJobsCommandPattern);
-    } catch (PatternSyntaxException e) {
-      log.warn(
-          "Invalid data jobs command pattern {}. The value must be a valid regex",
-          dataJobsCommandPattern);
+    private static void maybeStartAppSec(Class<?> scoClass, Object o) {
+
+        try {
+            // event tracking SDK must be available for customers even if AppSec is fully disabled
+            AppSecEventTracker.install();
+        } catch (final Exception e) {
+            log.debug("Error starting AppSec Event Tracker", e);
+        }
+
+        if (!(appSecEnabled || (remoteConfigEnabled && !appSecFullyDisabled))) {
+            return;
+        }
+
+        StaticEventLogger.begin("AppSec");
+
+        try {
+            SubscriptionService ss = AgentTracer.get().getSubscriptionService(RequestContextSlot.APPSEC);
+            startAppSec(ss, scoClass, o);
+        } catch (Exception e) {
+            log.error("Error starting AppSec System", e);
+        }
+
+        StaticEventLogger.end("AppSec");
     }
 
-    return true;
-  }
+    private static void startAppSec(SubscriptionService ss, Class<?> scoClass, Object sco) {
+        try {
+            final Class<?> appSecSysClass = AGENT_CLASSLOADER.loadClass("com.datadog.appsec.AppSecSystem");
+            final Method appSecInstallerMethod = appSecSysClass.getMethod("start", SubscriptionService.class, scoClass);
+            appSecInstallerMethod.invoke(null, ss, sco);
+        } catch (final Throwable ex) {
+            log.warn("Not starting AppSec subsystem: {}", ex.getMessage());
+        }
+    }
+
+    private static boolean isSupportedAppSecArch() {
+        final String arch = SystemProperties.get("os.arch");
+        if (OperatingSystem.isWindows()) {
+            // TODO: Windows bindings need to be built for x86
+            return "amd64".equals(arch) || "x86_64".equals(arch);
+        } else if (OperatingSystem.isMacOs()) {
+            return "amd64".equals(arch) || "x86_64".equals(arch) || "aarch64".equals(arch);
+        } else if (OperatingSystem.isLinux()) {
+            return "amd64".equals(arch) || "x86_64".equals(arch) || "aarch64".equals(arch);
+        }
+        // Still return true in other if unexpected cases (e.g. SunOS), and we'll handle loading errors
+        // during AppSec startup.
+        return true;
+    }
+
+    private static void maybeStartScaReachability(Instrumentation instrumentation) {
+        if (!Config.get().isAppSecScaEnabled()) {
+            return;
+        }
+        if (!telemetryEnabled || !Config.get().isTelemetryDependencyServiceEnabled()) {
+            log.warn("Not starting SCA Reachability subsystem: telemetry or dependency collection disabled");
+            return;
+        }
+        StaticEventLogger.begin("ScaReachability");
+        try {
+            final Class<?> scaClass = AGENT_CLASSLOADER.loadClass("com.datadog.appsec.sca.ScaReachabilitySystem");
+            final Method startMethod = scaClass.getMethod("start", Instrumentation.class);
+            startMethod.invoke(null, instrumentation);
+        } catch (final Throwable ex) {
+            log.warn("Not starting SCA Reachability subsystem: {}", ex.getMessage());
+        }
+        StaticEventLogger.end("ScaReachability");
+    }
+
+    private static void maybeStartIast(Instrumentation instrumentation) {
+        if (iastEnabled || !iastFullyDisabled) {
+
+            StaticEventLogger.begin("IAST");
+
+            try {
+                SubscriptionService ss = AgentTracer.get().getSubscriptionService(RequestContextSlot.IAST);
+                startIast(instrumentation, ss);
+            } catch (Exception e) {
+                log.error("Error starting IAST subsystem", e);
+            }
+
+            StaticEventLogger.end("IAST");
+        }
+    }
+
+    private static void startIast(Instrumentation instrumentation, SubscriptionService ss) {
+        try {
+            final Class<?> appSecSysClass = AGENT_CLASSLOADER.loadClass("com.datadog.iast.IastSystem");
+            final Method iastInstallerMethod =
+                    appSecSysClass.getMethod("start", Instrumentation.class, SubscriptionService.class);
+            iastInstallerMethod.invoke(null, instrumentation, ss);
+        } catch (final Throwable e) {
+            log.warn("Not starting IAST subsystem", e);
+        }
+    }
+
+    private static void maybeStartCiVisibility(Instrumentation inst, Class<?> scoClass, Object sco) {
+        if (ciVisibilityEnabled) {
+            StaticEventLogger.begin("CI Visibility");
+
+            try {
+                final Class<?> ciVisibilitySysClass =
+                        AGENT_CLASSLOADER.loadClass("datadog.trace.civisibility.CiVisibilitySystem");
+                final Method ciVisibilityInstallerMethod =
+                        ciVisibilitySysClass.getMethod("start", Instrumentation.class, scoClass);
+                ciVisibilityInstallerMethod.invoke(null, inst, sco);
+            } catch (final Throwable e) {
+                log.warn("Not starting CI Visibility subsystem", e);
+            }
+
+            StaticEventLogger.end("CI Visibility");
+        }
+    }
+
+    private static void maybeStartLLMObs(Instrumentation inst, Class<?> scoClass, Object sco) {
+        if (llmObsEnabled) {
+            StaticEventLogger.begin("LLM Observability");
+
+            try {
+                final Class<?> llmObsSysClass = AGENT_CLASSLOADER.loadClass("datadog.trace.llmobs.LLMObsSystem");
+                final Method llmObsInstallerMethod = llmObsSysClass.getMethod("start", Instrumentation.class, scoClass);
+                llmObsInstallerMethod.invoke(null, inst, sco);
+            } catch (final Throwable e) {
+                log.warn("Not starting LLM Observability subsystem", e);
+            }
+
+            StaticEventLogger.end("LLM Observability");
+        }
+    }
+
+    private static void maybeStartFeatureFlagging(final Class<?> scoClass, final Object sco) {
+        if (featureFlaggingEnabled) {
+            StaticEventLogger.begin("Feature Flagging");
+
+            try {
+                final Class<?> ffSysClass =
+                        AGENT_CLASSLOADER.loadClass("com.datadog.featureflag.FeatureFlaggingSystem");
+                final Method ffSysMethod = ffSysClass.getMethod("start", scoClass);
+                ffSysMethod.invoke(null, sco);
+            } catch (final Throwable e) {
+                log.warn("Not starting Feature Flagging subsystem", e);
+            }
+
+            StaticEventLogger.end("Feature Flagging");
+        }
+    }
+
+    static void shutdownFeatureFlagging(final ClassLoader agentClassLoader) {
+        if (agentClassLoader == null) {
+            return;
+        }
+        try {
+            final Class<?> ffSysClass = agentClassLoader.loadClass("com.datadog.featureflag.FeatureFlaggingSystem");
+            final Method stopMethod = ffSysClass.getMethod("stop");
+            stopMethod.invoke(null);
+        } catch (final Throwable e) {
+            log.warn("Unable to stop Feature Flagging subsystem", e);
+        }
+    }
+
+    private static void maybeInstallLogsIntake(Class<?> scoClass, Object sco) {
+        if (agentlessLogSubmissionEnabled || appLogsCollectionEnabled) {
+            StaticEventLogger.begin("Logs Intake");
+
+            try {
+                final Class<?> logsIntakeSystemClass =
+                        AGENT_CLASSLOADER.loadClass("datadog.trace.logging.intake.LogsIntakeSystem");
+                final Method logsIntakeInstallerMethod =
+                        logsIntakeSystemClass.getMethod("install", scoClass, Intake.class);
+                logsIntakeInstallerMethod.invoke(
+                        null, sco, agentlessLogSubmissionEnabled ? Intake.LOGS : Intake.EVENT_PLATFORM);
+            } catch (final Throwable e) {
+                log.warn("Not installing Logs Intake subsystem", e);
+            }
+
+            StaticEventLogger.end("Logs Intake");
+        }
+    }
+
+    private static void shutdownLogsIntake() {
+        if (AGENT_CLASSLOADER == null) {
+            // It wasn't started, so no need to shut it down
+            return;
+        }
+        try {
+            Thread.currentThread().setContextClassLoader(AGENT_CLASSLOADER);
+            final Class<?> logsIntakeSystemClass =
+                    AGENT_CLASSLOADER.loadClass("datadog.trace.logging.intake.LogsIntakeSystem");
+            final Method shutdownMethod = logsIntakeSystemClass.getMethod("shutdown");
+            shutdownMethod.invoke(null);
+        } catch (final Throwable ex) {
+            log.error("Throwable thrown while shutting down logs intake", ex);
+        }
+    }
+
+    private static void startTelemetry(Instrumentation inst, Class<?> scoClass, Object sco) {
+        StaticEventLogger.begin("Telemetry");
+
+        try {
+            final Class<?> telemetrySystem = AGENT_CLASSLOADER.loadClass("datadog.telemetry.TelemetrySystem");
+            final Method startTelemetry = telemetrySystem.getMethod("startTelemetry", Instrumentation.class, scoClass);
+            startTelemetry.invoke(null, inst, sco);
+        } catch (final Throwable ex) {
+            log.warn("Unable start telemetry", ex);
+        }
+
+        StaticEventLogger.end("Telemetry");
+    }
+
+    private static void stopTelemetry() {
+        if (AGENT_CLASSLOADER == null) {
+            return;
+        }
+
+        try {
+            final Class<?> telemetrySystem = AGENT_CLASSLOADER.loadClass("datadog.telemetry.TelemetrySystem");
+            final Method stopTelemetry = telemetrySystem.getMethod("stop");
+            stopTelemetry.invoke(null);
+        } catch (final Throwable ex) {
+            log.error("Error encountered while stopping telemetry", ex);
+        }
+    }
+
+    private static void startFlarePoller(Class<?> scoClass, Object sco) {
+        StaticEventLogger.begin("Flare Poller");
+        try {
+            final Class<?> tracerFlarePollerClass = AGENT_CLASSLOADER.loadClass("datadog.flare.TracerFlarePoller");
+            final Method tracerFlarePollerStartMethod = tracerFlarePollerClass.getMethod("start", scoClass);
+            tracerFlarePollerStartMethod.invoke(null, sco);
+        } catch (final Throwable e) {
+            log.warn("Unable start Flare Poller", e);
+        }
+        StaticEventLogger.end("Flare Poller");
+    }
+
+    private static void stopFlarePoller() {
+        if (AGENT_CLASSLOADER == null) {
+            return;
+        }
+        try {
+            final Class<?> tracerFlarePollerClass = AGENT_CLASSLOADER.loadClass("datadog.flare.TracerFlarePoller");
+            final Method tracerFlarePollerStopMethod = tracerFlarePollerClass.getMethod("stop");
+            tracerFlarePollerStopMethod.invoke(null);
+        } catch (final Throwable ex) {
+            log.warn("Error encountered while stopping Flare Poller", ex);
+        }
+    }
+
+    private static void initializeDelayedCrashTracking() {
+        initializeCrashTracking(true, isCrashTrackingAutoconfigEnabled());
+    }
+
+    private static void initializeDelayedCrashTrackingOnlyJmx() {
+        initializeCrashTracking(true, false);
+    }
+
+    private static void initializeCrashTrackingDefault() {
+        initializeCrashTracking(false, isCrashTrackingAutoconfigEnabled());
+    }
+
+    private static boolean isCrashTrackingAutoconfigEnabled() {
+        String enabledVal = ddGetProperty("dd." + CrashTrackingConfig.CRASH_TRACKING_ENABLE_AUTOCONFIG);
+        boolean enabled = CrashTrackingConfig.CRASH_TRACKING_ENABLE_AUTOCONFIG_DEFAULT;
+        if (enabledVal != null) {
+            enabled = Boolean.parseBoolean(enabledVal);
+        } else {
+            // If the property is not set, then we check if profiling is enabled
+            enabled = profilingEnabled;
+        }
+        return enabled;
+    }
+
+    private static void initializeCrashTracking(boolean delayed, boolean checkNative) {
+        log.debug("Initializing crashtracking");
+        try {
+            Class<?> clz = AGENT_CLASSLOADER.loadClass("datadog.crashtracking.Initializer");
+            // first try to use the JVMAccess using the native library; unless `checkNative` is false
+            Boolean rslt = checkNative
+                    && (Boolean) clz.getMethod("initialize", boolean.class).invoke(null, false);
+            if (!rslt) {
+                if (delayed) {
+                    // already delayed initialization, so no need to reschedule it again
+                    // just call initialize and force JMX
+                    rslt = (Boolean) clz.getMethod("initialize", boolean.class).invoke(null, true);
+                } else {
+                    // delayed initialization, so we need to reschedule it and mark as delayed but do not
+                    // re-check the native library
+                    CRASHTRACKER_INIT_AFTER_JMX = Agent::initializeDelayedCrashTrackingOnlyJmx;
+                    rslt = null; // we will initialize it later
+                }
+            }
+            if (rslt == null) {
+                log.debug("Crashtracking initialization delayed until JMX is available");
+            } else if (rslt) {
+                log.debug("Crashtracking initialized");
+            } else {
+                log.debug(SEND_TELEMETRY, "Crashtracking failed to initialize. No additional details available.");
+            }
+        } catch (Throwable t) {
+            log.debug(SEND_TELEMETRY, "Unable to initialize crashtracking");
+        }
+    }
+
+    private static void startCwsAgent() {
+        if (AGENT_CLASSLOADER.getResource("cws-tls.version") == null) {
+            log.warn("CWS support not included in this build of `dd-java-agent`");
+            return;
+        }
+        log.debug("Scheduling scope event factory registration");
+        WithGlobalTracer.registerOrExecute(new WithGlobalTracer.Callback() {
+            @Override
+            public void withTracer(TracerAPI tracer) {
+                log.debug("Registering CWS scope tracker");
+                try {
+                    ScopeListener scopeListener = (ScopeListener) AGENT_CLASSLOADER
+                            .loadClass("datadog.cws.tls.TlsScopeListener")
+                            .getDeclaredConstructor()
+                            .newInstance();
+                    tracer.addScopeListener(scopeListener);
+                    log.debug("Scope event factory {} has been registered", scopeListener);
+                } catch (Throwable e) {
+                    if (e instanceof InvocationTargetException) {
+                        e = e.getCause();
+                    }
+                    log.debug("CWS is not available. {}", e.getMessage());
+                }
+            }
+        });
+    }
+
+    /**
+     * {@see com.datadog.profiling.ddprof.DatadogProfilingIntegration} must not be modified to depend
+     * on JFR.
+     */
+    static ProfilingContextIntegration createProfilingContextIntegration() {
+        Config config = Config.get();
+        // Windows is already excluded by Config (isDatadogProfilerSafeAndConfigured), so only AWS
+        // Lambda needs to be excluded here: it has no ddprof native library support, same as
+        // startProfilingAgent().
+        if (!isAwsLambdaRuntime()) {
+            if (config.isDatadogProfilerEnabled()) {
+                // The profiler itself is running: load ddprof now, and let ProfilingAgent.run() register
+                // the process context as it always has.
+                ProfilingContextIntegration integration = loadDdprofContextIntegration(AGENT_CLASSLOADER);
+                if (integration != null) {
+                    return integration;
+                }
+            } else if (!config.isProfilingEnabled() && config.isOtelThreadContextEnabled()) {
+                // No profiler, we only want the context exposed: loading ddprof pulls in the native
+                // library and touches java.nio.file, which must not happen on the primordial premain
+                // thread, so it is deferred.
+                // The explicit !isProfilingEnabled() guard (redundant with isOtelThreadContextEnabled()'s
+                // own isDatadogProfilerSafeAndConfigured() factor) keeps this branch provably unreachable
+                // whenever profiling is enabled, so the JFR-events fallback below is never skipped.
+                return deferDdprofContextIntegration(AGENT_CLASSLOADER);
+            }
+        }
+        if (config.isProfilingEnabled() && config.isProfilingTimelineEventsEnabled()) {
+            // important: note that this will not initialise JFR until onStart is called
+            try {
+                return (ProfilingContextIntegration) AGENT_CLASSLOADER
+                        .loadClass("com.datadog.profiling.controller.openjdk.JFREventContextIntegration")
+                        .getDeclaredConstructor()
+                        .newInstance();
+            } catch (Throwable t) {
+                log.debug("JFR event-based profiling context labeling not available. {}", t.getMessage());
+            }
+        }
+        return ProfilingContextIntegration.NoOp.INSTANCE;
+    }
+
+    /**
+     * Loads the ddprof-based profiling context integration on the calling thread, for when the
+     * Datadog profiler is running. Returns {@code null} when it isn't available, so the caller can
+     * fall back to another integration.
+     */
+    static ProfilingContextIntegration loadDdprofContextIntegration(final ClassLoader classLoader) {
+        try {
+            return newDdprofContextIntegration(classLoader);
+        } catch (Throwable t) {
+            log.debug("ddprof-based profiling context labeling not available. {}", t.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * Returns a placeholder integration that loads the ddprof-based one off the calling thread and
+     * registers the OTel process context alongside it. Only used when the profiler isn't running:
+     * otherwise {@code ProfilingAgent.run()} registers the process context itself.
+     */
+    static ProfilingContextIntegration deferDdprofContextIntegration(final ClassLoader classLoader) {
+        DeferredProfilingContextIntegration deferred = new DeferredProfilingContextIntegration("ddprof", () -> {
+            // Process context registration must not depend on the trace-context integration
+            // below: it already catches its own failures, and must still run (for CWS/eBPF)
+            // even when constructing DatadogProfilingIntegration throws.
+            registerProcessContext(classLoader);
+            return newDdprofContextIntegration(classLoader);
+        });
+        deferred.scheduleInitialization();
+        return deferred;
+    }
+
+    private static ProfilingContextIntegration newDdprofContextIntegration(final ClassLoader classLoader)
+            throws ReflectiveOperationException {
+        return (ProfilingContextIntegration) classLoader
+                .loadClass("com.datadog.profiling.ddprof.DatadogProfilingIntegration")
+                .getDeclaredConstructor()
+                .newInstance();
+    }
+
+    private static void registerProcessContext(final ClassLoader classLoader) {
+        try {
+            classLoader
+                    .loadClass("com.datadog.profiling.agent.ProcessContext")
+                    .getMethod("register", ConfigProvider.class)
+                    .invoke(null, ConfigProvider.getInstance());
+        } catch (Throwable t) {
+            log.debug("Process context registration not available. {}", t.getMessage());
+        }
+    }
+
+    private static boolean startProfilingAgent(
+            final boolean earlyStart, final boolean firstAttempt, Instrumentation inst) {
+        if (isAwsLambdaRuntime()) {
+            if (firstAttempt) {
+                log.info("Profiling not supported in AWS Lambda runtimes");
+            }
+            return false;
+        }
+
+        boolean requestRetry = false;
+
+        if (firstAttempt) {
+            StaticEventLogger.begin("ProfilingAgent");
+            final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
+            try {
+                Thread.currentThread().setContextClassLoader(AGENT_CLASSLOADER);
+                final Class<?> profilingAgentClass =
+                        AGENT_CLASSLOADER.loadClass("com.datadog.profiling.agent.ProfilingAgent");
+                final Method profilingInstallerMethod =
+                        profilingAgentClass.getMethod("run", Boolean.TYPE, Instrumentation.class);
+                requestRetry = (boolean) profilingInstallerMethod.invoke(null, earlyStart, inst);
+            } catch (final Throwable ex) {
+                log.error(SEND_TELEMETRY, "Throwable thrown while starting profiling agent", ex);
+            } finally {
+                safelySetContextClassLoader(contextLoader);
+            }
+            StaticEventLogger.end("ProfilingAgent");
+        }
+        if (!earlyStart) {
+            /*
+             * Install the tracer hooks only when not using 'early start'.
+             * The 'early start' is happening so early that most of the infrastructure has not been set up yet.
+             */
+            initProfilerContext();
+        }
+        return requestRetry;
+    }
+
+    private static void initProfilerContext() {
+        log.debug("Scheduling profiler context initialization");
+        WithGlobalTracer.registerOrExecute(tracer -> {
+            log.debug("Initializing profiler context integration");
+            tracer.getProfilingContext().onStart();
+        });
+    }
+
+    private static boolean isAwsLambdaRuntime() {
+        return !EnvironmentVariables.getOrDefault("AWS_LAMBDA_FUNCTION_NAME", "")
+                .isEmpty();
+    }
+
+    private static void shutdownProfilingAgent(final boolean sync) {
+        if (AGENT_CLASSLOADER == null) {
+            // It wasn't started, so no need to shut it down
+            return;
+        }
+
+        final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(AGENT_CLASSLOADER);
+            final Class<?> profilingAgentClass =
+                    AGENT_CLASSLOADER.loadClass("com.datadog.profiling.agent.ProfilingAgent");
+            final Method profilingInstallerMethod = profilingAgentClass.getMethod("shutdown", Boolean.TYPE);
+            profilingInstallerMethod.invoke(null, sync);
+        } catch (final Throwable ex) {
+            log.error("Throwable thrown while shutting down profiling agent", ex);
+        } finally {
+            safelySetContextClassLoader(contextLoader);
+        }
+    }
+
+    private static void maybeStartDebugger(Instrumentation inst, Class<?> scoClass, Object sco) {
+        if (isExplicitlyDisabled(DebuggerConfig.DYNAMIC_INSTRUMENTATION_ENABLED)
+                && isExplicitlyDisabled(DebuggerConfig.EXCEPTION_REPLAY_ENABLED)
+                && isExplicitlyDisabled(TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_ENABLED)
+                && isExplicitlyDisabled(DebuggerConfig.DISTRIBUTED_DEBUGGER_ENABLED)) {
+            return;
+        }
+        startDebuggerAgent(inst, scoClass, sco);
+    }
+
+    private static synchronized void startDebuggerAgent(Instrumentation inst, Class<?> scoClass, Object sco) {
+        StaticEventLogger.begin("Debugger");
+
+        final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(AGENT_CLASSLOADER);
+            final Class<?> debuggerAgentClass = AGENT_CLASSLOADER.loadClass("com.datadog.debugger.agent.DebuggerAgent");
+            final Method debuggerInstallerMethod =
+                    debuggerAgentClass.getMethod("run", Config.class, Instrumentation.class, scoClass);
+            debuggerInstallerMethod.invoke(null, Config.get(), inst, sco);
+        } catch (final Throwable ex) {
+            log.error("Throwable thrown while starting debugger agent", ex);
+        } finally {
+            safelySetContextClassLoader(contextLoader);
+        }
+
+        StaticEventLogger.end("Debugger");
+    }
+
+    private static void configureLogger() {
+        setSystemPropertyDefault(SIMPLE_LOGGER_SHOW_DATE_TIME_PROPERTY, "true");
+
+        String logFormatJson = ddGetProperty("dd.log.format.json");
+        if (null != logFormatJson) {
+            setSystemPropertyDefault(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY, logFormatJson);
+        } else {
+            setSystemPropertyDefault(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY, "false");
+        }
+
+        if (Boolean.parseBoolean(SystemProperties.get(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY))) {
+            setSystemPropertyDefault(
+                    SIMPLE_LOGGER_DATE_TIME_FORMAT_PROPERTY, SIMPLE_LOGGER_DATE_TIME_FORMAT_JSON_DEFAULT);
+        } else {
+            setSystemPropertyDefault(SIMPLE_LOGGER_DATE_TIME_FORMAT_PROPERTY, SIMPLE_LOGGER_DATE_TIME_FORMAT_DEFAULT);
+        }
+
+        String logLevel;
+        if (isDebugMode()) {
+            logLevel = "DEBUG";
+        } else {
+            logLevel = ddGetProperty("dd.trace.log.level");
+            if (null == logLevel) {
+                logLevel = ddGetProperty("dd.log.level");
+                if (null == logLevel) {
+                    logLevel = EnvironmentVariables.get("OTEL_LOG_LEVEL");
+                }
+            }
+        }
+
+        if (null == logLevel && !isFeatureEnabled(AgentFeature.STARTUP_LOGS)) {
+            logLevel = "WARN";
+        }
+
+        if (null != logLevel) {
+            setSystemPropertyDefault(SIMPLE_LOGGER_DEFAULT_LOG_LEVEL_PROPERTY, logLevel);
+        }
+    }
+
+    private static void setSystemPropertyDefault(final String property, final String value) {
+        if (SystemProperties.get(property) == null && ddGetEnv(property) == null) {
+            SystemProperties.set(property, value);
+        }
+    }
+
+    private static ClassLoader getPlatformClassLoader()
+            throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+        /*
+         Must invoke ClassLoader.getPlatformClassLoader by reflection to remain
+         compatible with java 7 + 8.
+        */
+        final Method method = ClassLoader.class.getDeclaredMethod("getPlatformClassLoader");
+        return (ClassLoader) method.invoke(null);
+    }
+
+    /**
+     * Determine if we should log in debug level according to dd.trace.debug
+     *
+     * @return true if we should
+     */
+    private static boolean isDebugMode() {
+        final String tracerDebugLevelSysprop = "dd.trace.debug";
+        final String tracerDebugLevelProp = SystemProperties.get(tracerDebugLevelSysprop);
+
+        if (tracerDebugLevelProp != null) {
+            return Boolean.parseBoolean(tracerDebugLevelProp);
+        }
+
+        final String tracerDebugLevelEnv = ddGetEnv(tracerDebugLevelSysprop);
+
+        if (tracerDebugLevelEnv != null) {
+            return Boolean.parseBoolean(tracerDebugLevelEnv);
+        }
+        return false;
+    }
+
+    /**
+     * @return {@code true} if the agent feature is enabled
+     */
+    private static boolean isFeatureEnabled(AgentFeature feature) {
+        // must be kept in sync with logic from Config!
+        final String featureConfigKey = feature.getConfigKey();
+        final String featureSystemProp = feature.getSystemProp();
+        String featureEnabled = SystemProperties.get(featureSystemProp);
+        if (featureEnabled == null) {
+            featureEnabled = getStableConfig(FLEET, featureConfigKey);
+        }
+        if (featureEnabled == null) {
+            featureEnabled = ddGetEnv(featureSystemProp);
+        }
+        if (featureEnabled == null) {
+            featureEnabled = getStableConfig(LOCAL, featureConfigKey);
+        }
+
+        if (feature.isEnabledByDefault()) {
+            // true unless it's explicitly set to "false"
+            return !("false".equalsIgnoreCase(featureEnabled) || "0".equals(featureEnabled));
+        } else {
+            if (feature == AgentFeature.PROFILING) {
+                // We need this hack because profiling in SSI can receive 'auto' value in
+                // the enablement config
+                return ProfilingEnablement.of(featureEnabled).isActive();
+            }
+            // false unless it's explicitly set to "true"
+            return Boolean.parseBoolean(featureEnabled) || "1".equals(featureEnabled);
+        }
+    }
+
+    private static boolean isFeatureFlaggingEnabled() {
+        final Boolean providerEnabled = featureFlaggingBooleanSetting(FeatureFlaggingConfig.FEATURE_FLAGS_ENABLED);
+        final String configurationSource =
+                featureFlaggingSetting(FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE);
+        final Boolean legacyProviderEnabled =
+                featureFlaggingBooleanSetting(FeatureFlaggingConfig.EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED);
+
+        return FeatureFlaggingConfig.resolveConfiguration(providerEnabled, configurationSource, legacyProviderEnabled)
+                .isEnabled();
+    }
+
+    @SuppressFBWarnings(
+            value = "NP_BOOLEAN_RETURN_NULL",
+            justification = "A null value preserves the distinction between absent and explicitly false")
+    private static Boolean featureFlaggingBooleanSetting(final String configKey) {
+        final String value = featureFlaggingSetting(configKey);
+        if (value == null) {
+            return null;
+        }
+        return Boolean.parseBoolean(value) || "1".equals(value);
+    }
+
+    private static String featureFlaggingSetting(final String configKey) {
+        final String systemProperty = propertyNameToSystemPropertyName(configKey);
+        String value = SystemProperties.get(systemProperty);
+        if (value == null) {
+            value = getStableConfig(FLEET, configKey);
+        }
+        if (value == null) {
+            value = ddGetEnv(systemProperty);
+        }
+        if (value == null) {
+            value = getStableConfig(LOCAL, configKey);
+        }
+        return value;
+    }
+
+    /**
+     * @see datadog.trace.api.ProductActivation#fromString(String)
+     */
+    private static boolean isFullyDisabled(final AgentFeature feature) {
+        // must be kept in sync with logic from Config!
+        final String featureConfigKey = feature.getConfigKey();
+        final String featureSystemProp = feature.getSystemProp();
+        String settingValue = getNullIfEmpty(SystemProperties.get(featureSystemProp));
+        if (settingValue == null) {
+            settingValue = getNullIfEmpty(getStableConfig(FLEET, featureConfigKey));
+        }
+        if (settingValue == null) {
+            settingValue = getNullIfEmpty(ddGetEnv(featureSystemProp));
+        }
+        if (settingValue == null) {
+            settingValue = getNullIfEmpty(getStableConfig(LOCAL, featureConfigKey));
+        }
+
+        // defaults to inactive
+        return !(settingValue == null
+                || settingValue.equalsIgnoreCase("true")
+                || settingValue.equalsIgnoreCase("1")
+                || settingValue.equalsIgnoreCase("inactive"));
+    }
+
+    /** IAST will be enabled in opt-out if it's not actively disabled and AppSec is enabled */
+    private static boolean isIastFullyDisabled(final boolean isAppSecEnabled) {
+        if (isFullyDisabled(AgentFeature.IAST)) {
+            return true;
+        }
+        return !isAppSecEnabled;
+    }
+
+    private static String getNullIfEmpty(final String value) {
+        if (value == null || value.isEmpty()) {
+            return null;
+        }
+        return value;
+    }
+
+    /**
+     * @return configured JMX start delay in seconds
+     */
+    private static int getJmxStartDelay() {
+        String startDelay = ddGetProperty("dd.dogstatsd.start-delay");
+        if (startDelay == null) {
+            startDelay = ddGetProperty("dd.jmxfetch.start-delay");
+        }
+        if (startDelay != null) {
+            try {
+                return Integer.parseInt(startDelay);
+            } catch (NumberFormatException e) {
+                // fall back to default delay
+            }
+        }
+        return DEFAULT_JMX_START_DELAY;
+    }
+
+    /**
+     * Search for java or datadog-tracer sysprops which indicate that a custom log manager will be
+     * used. Also search for any app classes known to set a custom log manager.
+     *
+     * @return true if we detect a custom log manager being used.
+     */
+    private static boolean isAppUsingCustomLogManager(final EnumSet<Library> libraries) {
+        final String tracerCustomLogManSysprop = "dd.app.customlogmanager";
+        final String customLogManagerProp = SystemProperties.get(tracerCustomLogManSysprop);
+        final String customLogManagerEnv = ddGetEnv(tracerCustomLogManSysprop);
+
+        if (customLogManagerProp != null || customLogManagerEnv != null) {
+            log.debug("Prop - customlogmanager: {}", customLogManagerProp);
+            log.debug("Env - customlogmanager: {}", customLogManagerEnv);
+            // Allow setting to skip these automatic checks:
+            return Boolean.parseBoolean(customLogManagerProp) || Boolean.parseBoolean(customLogManagerEnv);
+        }
+
+        if (libraries.contains(WILDFLY)) {
+            return true; // Wildfly is known to set a custom log manager after startup.
+        }
+
+        final String logManagerProp = SystemProperties.get("java.util.logging.manager");
+        if (logManagerProp != null) {
+            log.debug("Prop - logging.manager: {}", logManagerProp);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Search for java or datadog-tracer sysprops which indicate that a custom JMX builder will be
+     * used.
+     *
+     * @return true if we detect a custom JMX builder being used.
+     */
+    private static boolean isAppUsingCustomJMXBuilder(final EnumSet<Library> libraries) {
+        final String tracerCustomJMXBuilderSysprop = "dd.app.customjmxbuilder";
+        final String customJMXBuilderProp = SystemProperties.get(tracerCustomJMXBuilderSysprop);
+        final String customJMXBuilderEnv = ddGetEnv(tracerCustomJMXBuilderSysprop);
+
+        if (customJMXBuilderProp != null || customJMXBuilderEnv != null) {
+            log.debug("Prop - customjmxbuilder: {}", customJMXBuilderProp);
+            log.debug("Env - customjmxbuilder: {}", customJMXBuilderEnv);
+            // Allow setting to skip these automatic checks:
+            return Boolean.parseBoolean(customJMXBuilderProp) || Boolean.parseBoolean(customJMXBuilderEnv);
+        }
+
+        if (libraries.contains(WILDFLY)) {
+            return true; // Wildfly is known to set a custom JMX builder after startup.
+        }
+
+        final String jmxBuilderProp = SystemProperties.get("javax.management.builder.initial");
+        if (jmxBuilderProp != null) {
+            log.debug("Prop - javax.management.builder.initial: {}", jmxBuilderProp);
+            return true;
+        }
+
+        return false;
+    }
+
+    /** Looks for the "dd." system property first then the "DD_" environment variable equivalent. */
+    private static String ddGetProperty(final String sysProp) {
+        String value = SystemProperties.get(sysProp);
+        if (null == value) {
+            value = ddGetEnv(sysProp);
+        }
+        return value;
+    }
+
+    /** Looks for sysProp in the Stable Configuration input */
+    private static String getStableConfig(StableConfigSource source, final String sysProp) {
+        return source.get(sysProp);
+    }
+
+    /** Looks for the "DD_" environment variable equivalent of the given "dd." system property. */
+    private static String ddGetEnv(final String sysProp) {
+        return EnvironmentVariables.get(toEnvVar(sysProp));
+    }
+
+    private static boolean okHttpMayIndirectlyLoadJUL() {
+        if (isCustomSecurityProviderInstalled() || isIBMSASLInstalled()) {
+            return true; // custom security providers may load JUL when OkHttp accesses TLS
+        }
+        if (isJavaVersionAtLeast(9)) {
+            return false; // JDKs since 9 have reworked JFR to use a different logging facility, not JUL
+        }
+        return isJFRSupported(); // assume OkHttp will indirectly load JUL via its JFR events
+    }
+
+    private static boolean isCustomSecurityProviderInstalled() {
+        return ClassLoader.getSystemResource("META-INF/services/java.security.Provider") != null;
+    }
+
+    private static boolean isIBMSASLInstalled() {
+        // need explicit check as this is installed without using the service-loader mechanism
+        return ClassLoader.getSystemResource("com/ibm/security/sasl/IBMSASL.class") != null;
+    }
+
+    private static boolean isJFRSupported() {
+        // FIXME: this is quite a hack because there maybe jfr classes on classpath somehow that have
+        // nothing to do with JDK - but this should be safe because only thing this does is to delay
+        // tracer install
+        return BootstrapProxy.INSTANCE.getResource("jdk/jfr/Recording.class") != null;
+    }
+
+    private static boolean isDataJobsSupported(String javaCommand, String dataJobsCommandPattern) {
+        if (null == javaCommand || null == dataJobsCommandPattern) {
+            // if sun.java.command somehow is not set or data jobs command pattern is not
+            // set, assume it's supported due to lack of info.
+            return true;
+        }
+
+        try {
+            return javaCommand.matches(dataJobsCommandPattern);
+        } catch (PatternSyntaxException e) {
+            log.warn("Invalid data jobs command pattern {}. The value must be a valid regex", dataJobsCommandPattern);
+        }
+
+        return true;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentClassLoading.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentClassLoading.java
index 98bfe9a4751..082982847b3 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentClassLoading.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentClassLoading.java
@@ -6,35 +6,34 @@
  * <p>Should be used in a short try..finally block around the class-loader call.
  */
 public enum AgentClassLoading {
-  /** Lightweight class-loader probing to select instrumentations. */
-  PROBING_CLASSLOADER,
-  /** Locating class resources for Byte-Buddy. */
-  LOCATING_CLASS,
-  /** Injecting helper classes into class-loaders. */
-  INJECTING_HELPERS;
+    /** Lightweight class-loader probing to select instrumentations. */
+    PROBING_CLASSLOADER,
+    /** Locating class resources for Byte-Buddy. */
+    LOCATING_CLASS,
+    /** Injecting helper classes into class-loaders. */
+    INJECTING_HELPERS;
 
-  private static final ThreadLocal<AgentClassLoading[]> REQUEST =
-      new ThreadLocal<AgentClassLoading[]>() {
+    private static final ThreadLocal<AgentClassLoading[]> REQUEST = new ThreadLocal<AgentClassLoading[]>() {
         @Override
         protected AgentClassLoading[] initialValue() {
-          return new AgentClassLoading[1];
+            return new AgentClassLoading[1];
         }
-      };
+    };
 
-  /**
-   * Gets the current agent class-loading request type; {@code null} if there's no agent request.
-   */
-  public static AgentClassLoading type() {
-    return REQUEST.get()[0];
-  }
+    /**
+     * Gets the current agent class-loading request type; {@code null} if there's no agent request.
+     */
+    public static AgentClassLoading type() {
+        return REQUEST.get()[0];
+    }
 
-  /** Records that this agent class-loading request has begun. */
-  public final void begin() {
-    REQUEST.get()[0] = this;
-  }
+    /** Records that this agent class-loading request has begun. */
+    public final void begin() {
+        REQUEST.get()[0] = this;
+    }
 
-  /** Records that this agent class-loading request has ended. */
-  public final void end() {
-    REQUEST.get()[0] = null;
-  }
+    /** Records that this agent class-loading request has ended. */
+    public final void end() {
+        REQUEST.get()[0] = null;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentJarIndex.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentJarIndex.java
index 5350933897c..9f31d9e1f44 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentJarIndex.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentJarIndex.java
@@ -26,193 +26,191 @@
  * Maintains an index to map class/resource names under nested jar prefixes (inst, metrics, etc.)
  */
 public final class AgentJarIndex {
-  private static final Logger log = LoggerFactory.getLogger(AgentJarIndex.class);
-
-  private static final String AGENT_INDEX_FILE_NAME = "dd-java-agent.index";
-
-  private final String[] prefixes;
-  private final ClassNameTrie prefixTrie;
-
-  private AgentJarIndex(String[] prefixes, ClassNameTrie prefixTrie) {
-    this.prefixes = prefixes;
-    this.prefixTrie = prefixTrie;
-  }
-
-  /** Returns the resolved entry name in the jar for the given resource. */
-  public String resourceEntryName(String name) {
-    int prefixId = prefixTrie.apply(name);
-    if (prefixId == 0) {
-      return name;
-    } else if (prefixId > 0) {
-      return prefixes[prefixId - 1] + (name.endsWith(".class") ? name + "data" : name);
-    } else {
-      return null;
+    private static final Logger log = LoggerFactory.getLogger(AgentJarIndex.class);
+
+    private static final String AGENT_INDEX_FILE_NAME = "dd-java-agent.index";
+
+    private final String[] prefixes;
+    private final ClassNameTrie prefixTrie;
+
+    private AgentJarIndex(String[] prefixes, ClassNameTrie prefixTrie) {
+        this.prefixes = prefixes;
+        this.prefixTrie = prefixTrie;
     }
-  }
-
-  /** Returns the resolved entry name in the jar for the given class. */
-  public String classEntryName(String name) {
-    int prefixId = prefixTrie.apply(name);
-    if (prefixId == 0) {
-      return name.replace('.', '/') + ".class";
-    } else if (prefixId > 0) {
-      return prefixes[prefixId - 1] + name.replace('.', '/') + ".classdata";
-    } else {
-      return null;
+
+    /** Returns the resolved entry name in the jar for the given resource. */
+    public String resourceEntryName(String name) {
+        int prefixId = prefixTrie.apply(name);
+        if (prefixId == 0) {
+            return name;
+        } else if (prefixId > 0) {
+            return prefixes[prefixId - 1] + (name.endsWith(".class") ? name + "data" : name);
+        } else {
+            return null;
+        }
     }
-  }
-
-  /** For testing purposes only. */
-  public static AgentJarIndex emptyIndex() {
-    return new AgentJarIndex(new String[0], ClassNameTrie.EMPTY_TRIE);
-  }
-
-  public static AgentJarIndex readIndex(JarFile agentJar) {
-    try {
-      ZipEntry indexEntry = agentJar.getEntry(AGENT_INDEX_FILE_NAME);
-      try (DataInputStream in =
-          new DataInputStream(new BufferedInputStream(agentJar.getInputStream(indexEntry)))) {
-        int prefixCount = in.readInt();
-        String[] prefixes = new String[prefixCount];
-        for (int i = 0; i < prefixCount; i++) {
-          prefixes[i] = in.readUTF();
+
+    /** Returns the resolved entry name in the jar for the given class. */
+    public String classEntryName(String name) {
+        int prefixId = prefixTrie.apply(name);
+        if (prefixId == 0) {
+            return name.replace('.', '/') + ".class";
+        } else if (prefixId > 0) {
+            return prefixes[prefixId - 1] + name.replace('.', '/') + ".classdata";
+        } else {
+            return null;
         }
-        return new AgentJarIndex(prefixes, ClassNameTrie.readFrom(in));
-      }
-    } catch (Throwable e) {
-      log.error("Unable to read {}", AGENT_INDEX_FILE_NAME, e);
-      return null;
     }
-  }
 
-  /**
-   * Generates an index from the contents of the 'build/resources' directory that makes up the agent
-   * jar.
-   */
-  static class IndexGenerator {
-    private static final Set<String> ignoredFileNames =
-        new HashSet<>(Arrays.asList("MANIFEST.MF", "NOTICE", "LICENSE.renamed"));
+    /** For testing purposes only. */
+    public static AgentJarIndex emptyIndex() {
+        return new AgentJarIndex(new String[0], ClassNameTrie.EMPTY_TRIE);
+    }
 
-    private final Path resourcesDir;
+    public static AgentJarIndex readIndex(JarFile agentJar) {
+        try {
+            ZipEntry indexEntry = agentJar.getEntry(AGENT_INDEX_FILE_NAME);
+            try (DataInputStream in =
+                    new DataInputStream(new BufferedInputStream(agentJar.getInputStream(indexEntry)))) {
+                int prefixCount = in.readInt();
+                String[] prefixes = new String[prefixCount];
+                for (int i = 0; i < prefixCount; i++) {
+                    prefixes[i] = in.readUTF();
+                }
+                return new AgentJarIndex(prefixes, ClassNameTrie.readFrom(in));
+            }
+        } catch (Throwable e) {
+            log.error("Unable to read {}", AGENT_INDEX_FILE_NAME, e);
+            return null;
+        }
+    }
 
-    private final List<String> prefixes = new ArrayList<>();
-    private final ClassNameTrie.Builder prefixTrie = new ClassNameTrie.Builder();
+    /**
+     * Generates an index from the contents of the 'build/resources' directory that makes up the agent
+     * jar.
+     */
+    static class IndexGenerator {
+        private static final Set<String> ignoredFileNames =
+                new HashSet<>(Arrays.asList("MANIFEST.MF", "NOTICE", "LICENSE.renamed"));
 
-    private final List<String> collectedEntryKeys = new ArrayList<>();
-    private final List<Integer> collectedPrefixIds = new ArrayList<>();
+        private final Path resourcesDir;
 
-    IndexGenerator(Path resourcesDir) {
-      this.resourcesDir = resourcesDir;
+        private final List<String> prefixes = new ArrayList<>();
+        private final ClassNameTrie.Builder prefixTrie = new ClassNameTrie.Builder();
 
-      prefixTrie.put("datadog.*", 0);
-    }
+        private final List<String> collectedEntryKeys = new ArrayList<>();
+        private final List<Integer> collectedPrefixIds = new ArrayList<>();
 
-    void buildIndex() throws IOException {
-      Set<String> seen = new HashSet<>();
-      try (Stream<Path> paths = Files.walk(resourcesDir)) {
-        paths
-            .filter(path -> Files.isRegularFile(path, LinkOption.NOFOLLOW_LINKS))
-            .map(resourcesDir::relativize)
-            .sorted()
-            .filter(entry -> entry.getNameCount() >= 2)
-            .forEach(
-                entry -> {
-                  String prefix = entry.getName(0) + "/";
-                  int prefixId = prefixIdFor(prefix);
-                  String entryKey = computeEntryKey(entry.subpath(1, entry.getNameCount()));
-                  if (null != entryKey && seen.add(prefixId + "\0" + entryKey)) {
-                    collectedEntryKeys.add(entryKey);
-                    collectedPrefixIds.add(prefixId);
-                  }
-                });
-      }
-
-      for (int i = 0; i < collectedEntryKeys.size(); i++) {
-        prefixTrie.put(collectedEntryKeys.get(i), collectedPrefixIds.get(i));
-      }
-
-      // warn if two subsections contain content under the same package prefix
-      // because we're then unable to redirect requests to the right submodule
-      for (int i = 0; i < collectedEntryKeys.size(); i++) {
-        String entryKey = collectedEntryKeys.get(i);
-        int expectedPrefixId = collectedPrefixIds.get(i);
-        int indexedPrefixId = prefixTrie.apply(entryKey);
-        if (indexedPrefixId != expectedPrefixId) {
-          log.warn(
-              "Detected duplicate content '{}' under '{}', already seen in {}. Ensure your content is under a distinct directory.",
-              entryKey,
-              getPrefix(expectedPrefixId),
-              getPrefix(indexedPrefixId));
-        }
-      }
+        IndexGenerator(Path resourcesDir) {
+            this.resourcesDir = resourcesDir;
 
-      collectedEntryKeys.clear();
-      collectedPrefixIds.clear();
-    }
+            prefixTrie.put("datadog.*", 0);
+        }
 
-    void writeIndex(Path indexFile) throws IOException {
-      try (DataOutputStream out =
-          new DataOutputStream(new BufferedOutputStream(Files.newOutputStream(indexFile)))) {
-        out.writeInt(prefixes.size());
-        for (String p : prefixes) {
-          out.writeUTF(p);
+        void buildIndex() throws IOException {
+            Set<String> seen = new HashSet<>();
+            try (Stream<Path> paths = Files.walk(resourcesDir)) {
+                paths.filter(path -> Files.isRegularFile(path, LinkOption.NOFOLLOW_LINKS))
+                        .map(resourcesDir::relativize)
+                        .sorted()
+                        .filter(entry -> entry.getNameCount() >= 2)
+                        .forEach(entry -> {
+                            String prefix = entry.getName(0) + "/";
+                            int prefixId = prefixIdFor(prefix);
+                            String entryKey = computeEntryKey(entry.subpath(1, entry.getNameCount()));
+                            if (null != entryKey && seen.add(prefixId + "\0" + entryKey)) {
+                                collectedEntryKeys.add(entryKey);
+                                collectedPrefixIds.add(prefixId);
+                            }
+                        });
+            }
+
+            for (int i = 0; i < collectedEntryKeys.size(); i++) {
+                prefixTrie.put(collectedEntryKeys.get(i), collectedPrefixIds.get(i));
+            }
+
+            // warn if two subsections contain content under the same package prefix
+            // because we're then unable to redirect requests to the right submodule
+            for (int i = 0; i < collectedEntryKeys.size(); i++) {
+                String entryKey = collectedEntryKeys.get(i);
+                int expectedPrefixId = collectedPrefixIds.get(i);
+                int indexedPrefixId = prefixTrie.apply(entryKey);
+                if (indexedPrefixId != expectedPrefixId) {
+                    log.warn(
+                            "Detected duplicate content '{}' under '{}', already seen in {}. Ensure your content is under a distinct directory.",
+                            entryKey,
+                            getPrefix(expectedPrefixId),
+                            getPrefix(indexedPrefixId));
+                }
+            }
+
+            collectedEntryKeys.clear();
+            collectedPrefixIds.clear();
         }
-        prefixTrie.writeTo(out);
-      }
-    }
 
-    private String getPrefix(int prefixId) {
-      return prefixes.get(prefixId - 1);
-    }
+        void writeIndex(Path indexFile) throws IOException {
+            try (DataOutputStream out =
+                    new DataOutputStream(new BufferedOutputStream(Files.newOutputStream(indexFile)))) {
+                out.writeInt(prefixes.size());
+                for (String p : prefixes) {
+                    out.writeUTF(p);
+                }
+                prefixTrie.writeTo(out);
+            }
+        }
 
-    private int prefixIdFor(String prefix) {
-      int prefixId = 1 + prefixes.indexOf(prefix);
-      if (prefixId < 1) {
-        prefixes.add(prefix);
-        prefixId = prefixes.size();
-      }
-      return prefixId;
-    }
+        private String getPrefix(int prefixId) {
+            return prefixes.get(prefixId - 1);
+        }
 
-    static String computeEntryKey(Path path) {
-      if (ignoredFileNames.contains(path.getFileName().toString())) {
-        return null;
-      }
-      String entryKey = path.toString();
-      if (File.separatorChar != '/') {
-        entryKey = entryKey.replace(File.separatorChar, '/');
-      }
-      if (entryKey.startsWith("datadog/trace/instrumentation/")) {
-        return "datadog.trace.instrumentation.*";
-      }
-      // use number of elements in the path to decide how 'unique' this path is
-      int nameCount = path.getNameCount();
-      if (nameCount > 1) {
-        if (entryKey.startsWith("META-INF")) { // don't count META-INF as a unique element
-          nameCount--;
+        private int prefixIdFor(String prefix) {
+            int prefixId = 1 + prefixes.indexOf(prefix);
+            if (prefixId < 1) {
+                prefixes.add(prefix);
+                prefixId = prefixes.size();
+            }
+            return prefixId;
         }
-        // paths with three or more elements, or nested paths containing '.classdata' files
-        // are considered unique enough that we can use the directory name as a wildcard key
-        if (nameCount > 2 || entryKey.endsWith(".classdata")) {
-          entryKey = entryKey.substring(0, entryKey.lastIndexOf('/') + 1) + "*";
+
+        static String computeEntryKey(Path path) {
+            if (ignoredFileNames.contains(path.getFileName().toString())) {
+                return null;
+            }
+            String entryKey = path.toString();
+            if (File.separatorChar != '/') {
+                entryKey = entryKey.replace(File.separatorChar, '/');
+            }
+            if (entryKey.startsWith("datadog/trace/instrumentation/")) {
+                return "datadog.trace.instrumentation.*";
+            }
+            // use number of elements in the path to decide how 'unique' this path is
+            int nameCount = path.getNameCount();
+            if (nameCount > 1) {
+                if (entryKey.startsWith("META-INF")) { // don't count META-INF as a unique element
+                    nameCount--;
+                }
+                // paths with three or more elements, or nested paths containing '.classdata' files
+                // are considered unique enough that we can use the directory name as a wildcard key
+                if (nameCount > 2 || entryKey.endsWith(".classdata")) {
+                    entryKey = entryKey.substring(0, entryKey.lastIndexOf('/') + 1) + "*";
+                }
+            }
+            return entryKey.replace('/', '.');
         }
-      }
-      return entryKey.replace('/', '.');
-    }
 
-    public static void main(String[] args) throws IOException {
-      if (args.length < 1) {
-        throw new IllegalArgumentException("Expected: resources-dir");
-      }
-
-      Path resourcesDir = Paths.get(args[0]).toAbsolutePath();
-      Path indexDir = resourcesDir;
-      if (args.length == 2) {
-        indexDir = Paths.get(args[1]).toAbsolutePath();
-      }
-      IndexGenerator indexGenerator = new IndexGenerator(resourcesDir);
-      indexGenerator.buildIndex();
-      indexGenerator.writeIndex(indexDir.resolve(AGENT_INDEX_FILE_NAME));
+        public static void main(String[] args) throws IOException {
+            if (args.length < 1) {
+                throw new IllegalArgumentException("Expected: resources-dir");
+            }
+
+            Path resourcesDir = Paths.get(args[0]).toAbsolutePath();
+            Path indexDir = resourcesDir;
+            if (args.length == 2) {
+                indexDir = Paths.get(args[1]).toAbsolutePath();
+            }
+            IndexGenerator indexGenerator = new IndexGenerator(resourcesDir);
+            indexGenerator.buildIndex();
+            indexGenerator.writeIndex(indexDir.resolve(AGENT_INDEX_FILE_NAME));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/BootstrapProxy.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/BootstrapProxy.java
index caf76b81064..3a0e328ad8c 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/BootstrapProxy.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/BootstrapProxy.java
@@ -9,22 +9,22 @@
  * so we can check them for resources before delegating to the real boostrap loader.
  */
 public final class BootstrapProxy extends URLClassLoader {
-  static {
-    ClassLoader.registerAsParallelCapable();
-  }
+    static {
+        ClassLoader.registerAsParallelCapable();
+    }
 
-  public static final BootstrapProxy INSTANCE = new BootstrapProxy();
+    public static final BootstrapProxy INSTANCE = new BootstrapProxy();
 
-  private BootstrapProxy() {
-    super(new URL[0], null);
-  }
+    private BootstrapProxy() {
+        super(new URL[0], null);
+    }
 
-  public static void addBootstrapResource(final URL url) {
-    INSTANCE.addURL(url);
-  }
+    public static void addBootstrapResource(final URL url) {
+        INSTANCE.addURL(url);
+    }
 
-  @Override
-  protected Class<?> findClass(final String name) throws ClassNotFoundException {
-    throw new ClassNotFoundException(name);
-  }
+    @Override
+    protected Class<?> findClass(final String name) throws ClassNotFoundException {
+        throw new ClassNotFoundException(name);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/CallDepthThreadLocalMap.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/CallDepthThreadLocalMap.java
index 958f3717ec2..4bb79427274 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/CallDepthThreadLocalMap.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/CallDepthThreadLocalMap.java
@@ -10,45 +10,44 @@
  */
 public class CallDepthThreadLocalMap {
 
-  private static final ClassValue<ThreadLocalDepth> TLS =
-      GenericClassValue.constructing(ThreadLocalDepth.class);
+    private static final ClassValue<ThreadLocalDepth> TLS = GenericClassValue.constructing(ThreadLocalDepth.class);
 
-  public static int incrementCallDepth(final Class<?> k) {
-    return TLS.get(k).get().increment();
-  }
+    public static int incrementCallDepth(final Class<?> k) {
+        return TLS.get(k).get().increment();
+    }
 
-  public static int getCallDepth(final Class<?> k) {
-    return TLS.get(k).get().depth;
-  }
+    public static int getCallDepth(final Class<?> k) {
+        return TLS.get(k).get().depth;
+    }
 
-  public static int decrementCallDepth(final Class<?> k) {
-    return TLS.get(k).get().decrement();
-  }
+    public static int decrementCallDepth(final Class<?> k) {
+        return TLS.get(k).get().decrement();
+    }
 
-  public static void reset(final Class<?> k) {
-    TLS.get(k).get().depth = 0;
-  }
+    public static void reset(final Class<?> k) {
+        TLS.get(k).get().depth = 0;
+    }
 
-  private static final class Depth {
-    private int depth;
+    private static final class Depth {
+        private int depth;
 
-    private Depth() {
-      this.depth = 0;
-    }
+        private Depth() {
+            this.depth = 0;
+        }
 
-    private int increment() {
-      return this.depth++;
-    }
+        private int increment() {
+            return this.depth++;
+        }
 
-    private int decrement() {
-      return --this.depth;
+        private int decrement() {
+            return --this.depth;
+        }
     }
-  }
 
-  public static final class ThreadLocalDepth extends ThreadLocal<Depth> {
-    @Override
-    protected Depth initialValue() {
-      return new Depth();
+    public static final class ThreadLocalDepth extends ThreadLocal<Depth> {
+        @Override
+        protected Depth initialValue() {
+            return new Depth();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/ClassHierarchyIterable.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/ClassHierarchyIterable.java
index 903ac6a11d8..518f0a9d4b4 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/ClassHierarchyIterable.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/ClassHierarchyIterable.java
@@ -26,69 +26,69 @@
  * <p>...
  */
 public class ClassHierarchyIterable implements Iterable<Class<?>> {
-  private final Class<?> baseClass;
+    private final Class<?> baseClass;
 
-  public ClassHierarchyIterable(final Class<?> baseClass) {
-    this.baseClass = baseClass;
-  }
+    public ClassHierarchyIterable(final Class<?> baseClass) {
+        this.baseClass = baseClass;
+    }
 
-  @Override
-  public Iterator<Class<?>> iterator() {
-    return new ClassIterator();
-  }
+    @Override
+    public Iterator<Class<?>> iterator() {
+        return new ClassIterator();
+    }
 
-  public class ClassIterator implements Iterator<Class<?>> {
-    private Class<?> next;
-    private final Set<Class<?>> queuedInterfaces = new HashSet<>();
-    private final Queue<Class<?>> classesToExpand = new ArrayDeque<>();
+    public class ClassIterator implements Iterator<Class<?>> {
+        private Class<?> next;
+        private final Set<Class<?>> queuedInterfaces = new HashSet<>();
+        private final Queue<Class<?>> classesToExpand = new ArrayDeque<>();
 
-    public ClassIterator() {
-      classesToExpand.add(baseClass);
-    }
+        public ClassIterator() {
+            classesToExpand.add(baseClass);
+        }
 
-    @Override
-    public boolean hasNext() {
-      calculateNextIfNecessary();
+        @Override
+        public boolean hasNext() {
+            calculateNextIfNecessary();
 
-      return next != null;
-    }
+            return next != null;
+        }
 
-    @Override
-    public Class<?> next() {
-      calculateNextIfNecessary();
+        @Override
+        public Class<?> next() {
+            calculateNextIfNecessary();
 
-      if (next == null) {
-        throw new NoSuchElementException();
-      }
+            if (next == null) {
+                throw new NoSuchElementException();
+            }
 
-      final Class<?> next = this.next;
-      this.next = null;
-      return next;
-    }
+            final Class<?> next = this.next;
+            this.next = null;
+            return next;
+        }
 
-    @Override
-    public void remove() {
-      throw new UnsupportedOperationException("remove");
-    }
+        @Override
+        public void remove() {
+            throw new UnsupportedOperationException("remove");
+        }
 
-    private void calculateNextIfNecessary() {
-      if (next == null && !classesToExpand.isEmpty()) {
-        next = classesToExpand.remove();
-        queueNewInterfaces(next.getInterfaces());
+        private void calculateNextIfNecessary() {
+            if (next == null && !classesToExpand.isEmpty()) {
+                next = classesToExpand.remove();
+                queueNewInterfaces(next.getInterfaces());
 
-        final Class<?> superClass = next.getSuperclass();
-        if (superClass != null) {
-          classesToExpand.add(next.getSuperclass());
+                final Class<?> superClass = next.getSuperclass();
+                if (superClass != null) {
+                    classesToExpand.add(next.getSuperclass());
+                }
+            }
         }
-      }
-    }
 
-    private void queueNewInterfaces(final Class[] interfaces) {
-      for (final Class clazz : interfaces) {
-        if (queuedInterfaces.add(clazz)) {
-          classesToExpand.add(clazz);
+        private void queueNewInterfaces(final Class[] interfaces) {
+            for (final Class clazz : interfaces) {
+                if (queuedInterfaces.add(clazz)) {
+                    classesToExpand.add(clazz);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Constants.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Constants.java
index 41b6e925cc8..4f18e356cc4 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Constants.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Constants.java
@@ -7,30 +7,30 @@
  */
 public final class Constants {
 
-  /**
-   * packages which will be loaded on the bootstrap classloader
-   *
-   * <p>Updates should be mirrored in
-   * datadog.trace.agent.test.BootstrapClasspathSetupListener#BOOTSTRAP_PACKAGE_PREFIXES_COPY
-   */
-  public static final String[] BOOTSTRAP_PACKAGE_PREFIXES = {
-    "datadog.slf4j",
-    "datadog.common.filesystem",
-    "datadog.context",
-    "datadog.environment",
-    "datadog.json",
-    "datadog.yaml",
-    "datadog.instrument",
-    "datadog.appsec.api",
-    "datadog.metrics.api",
-    "datadog.trace.api",
-    "datadog.trace.bootstrap",
-    "datadog.trace.config.inversion",
-    "datadog.trace.context",
-    "datadog.trace.instrumentation.api",
-    "datadog.trace.logging",
-    "datadog.trace.util",
-  };
+    /**
+     * packages which will be loaded on the bootstrap classloader
+     *
+     * <p>Updates should be mirrored in
+     * datadog.trace.agent.test.BootstrapClasspathSetupListener#BOOTSTRAP_PACKAGE_PREFIXES_COPY
+     */
+    public static final String[] BOOTSTRAP_PACKAGE_PREFIXES = {
+        "datadog.slf4j",
+        "datadog.common.filesystem",
+        "datadog.context",
+        "datadog.environment",
+        "datadog.json",
+        "datadog.yaml",
+        "datadog.instrument",
+        "datadog.appsec.api",
+        "datadog.metrics.api",
+        "datadog.trace.api",
+        "datadog.trace.bootstrap",
+        "datadog.trace.config.inversion",
+        "datadog.trace.context",
+        "datadog.trace.instrumentation.api",
+        "datadog.trace.logging",
+        "datadog.trace.util",
+    };
 
-  private Constants() {}
+    private Constants() {}
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/DatadogClassLoader.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/DatadogClassLoader.java
index aaf263901ff..c1f517b6cc8 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/DatadogClassLoader.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/DatadogClassLoader.java
@@ -19,167 +19,165 @@
 
 /** Provides access to Datadog internal classes. */
 public final class DatadogClassLoader extends SecureClassLoader {
-  static {
-    ClassLoader.registerAsParallelCapable();
-  }
-
-  private static final Logger log = LoggerFactory.getLogger(DatadogClassLoader.class);
-
-  private final Set<String> definedPackages = new HashSet<>();
-
-  private final JarFile agentJarFile;
-  private final CodeSource agentCodeSource;
-  private final String agentResourcePrefix;
-  private final AgentJarIndex agentJarIndex;
-
-  private final Object instrumentationClassLoaderLock = new Object();
-  private volatile WeakReference<InstrumentationClassLoader> instrumentationClassLoader =
-      new WeakReference<>(new InstrumentationClassLoader(this));
-
-  public DatadogClassLoader(final URL agentJarURL, final ClassLoader parent) throws Exception {
-    super(parent);
-
-    agentJarFile = new JarFile(new File(agentJarURL.toURI()), false);
-    agentCodeSource = new CodeSource(agentJarURL, (Certificate[]) null);
-    // Build the resource prefix from the agent jar URL rather than JarFile.getName().
-    // JarFile.getName() returns the OS-native path, which on Windows looks like
-    // "C:\Datadog\dd-java-agent.jar" — producing a malformed URL ("jar:file:C:\..."), so
-    // findResource() returns URLs that openStream() cannot read. See APMS-19624 / #6398.
-    agentResourcePrefix = "jar:" + agentJarURL + "!/";
-    agentJarIndex = AgentJarIndex.readIndex(agentJarFile);
-  }
-
-  /** For testing purposes only. */
-  public DatadogClassLoader() {
-    super(null);
-
-    agentCodeSource = null;
-    agentJarFile = null;
-    agentResourcePrefix = null;
-    agentJarIndex = AgentJarIndex.emptyIndex();
-  }
-
-  @Override
-  public URL getResource(final String name) {
-    URL bootstrapResource = BootstrapProxy.INSTANCE.getResource(name);
-    if (null != bootstrapResource) {
-      return bootstrapResource;
+    static {
+        ClassLoader.registerAsParallelCapable();
     }
-    return super.getResource(name);
-  }
-
-  @Override
-  protected URL findResource(String name) {
-    String entryName = agentJarIndex.resourceEntryName(name);
-    if (null != entryName) {
-      JarEntry jarEntry = agentJarFile.getJarEntry(entryName);
-      if (null != jarEntry) {
-        String location = agentResourcePrefix + entryName;
-        try {
-          return new URL(location);
-        } catch (Exception e) {
-          log.warn("Malformed location {}", location);
+
+    private static final Logger log = LoggerFactory.getLogger(DatadogClassLoader.class);
+
+    private final Set<String> definedPackages = new HashSet<>();
+
+    private final JarFile agentJarFile;
+    private final CodeSource agentCodeSource;
+    private final String agentResourcePrefix;
+    private final AgentJarIndex agentJarIndex;
+
+    private final Object instrumentationClassLoaderLock = new Object();
+    private volatile WeakReference<InstrumentationClassLoader> instrumentationClassLoader =
+            new WeakReference<>(new InstrumentationClassLoader(this));
+
+    public DatadogClassLoader(final URL agentJarURL, final ClassLoader parent) throws Exception {
+        super(parent);
+
+        agentJarFile = new JarFile(new File(agentJarURL.toURI()), false);
+        agentCodeSource = new CodeSource(agentJarURL, (Certificate[]) null);
+        // Build the resource prefix from the agent jar URL rather than JarFile.getName().
+        // JarFile.getName() returns the OS-native path, which on Windows looks like
+        // "C:\Datadog\dd-java-agent.jar" — producing a malformed URL ("jar:file:C:\..."), so
+        // findResource() returns URLs that openStream() cannot read. See APMS-19624 / #6398.
+        agentResourcePrefix = "jar:" + agentJarURL + "!/";
+        agentJarIndex = AgentJarIndex.readIndex(agentJarFile);
+    }
+
+    /** For testing purposes only. */
+    public DatadogClassLoader() {
+        super(null);
+
+        agentCodeSource = null;
+        agentJarFile = null;
+        agentResourcePrefix = null;
+        agentJarIndex = AgentJarIndex.emptyIndex();
+    }
+
+    @Override
+    public URL getResource(final String name) {
+        URL bootstrapResource = BootstrapProxy.INSTANCE.getResource(name);
+        if (null != bootstrapResource) {
+            return bootstrapResource;
+        }
+        return super.getResource(name);
+    }
+
+    @Override
+    protected URL findResource(String name) {
+        String entryName = agentJarIndex.resourceEntryName(name);
+        if (null != entryName) {
+            JarEntry jarEntry = agentJarFile.getJarEntry(entryName);
+            if (null != jarEntry) {
+                String location = agentResourcePrefix + entryName;
+                try {
+                    return new URL(location);
+                } catch (Exception e) {
+                    log.warn("Malformed location {}", location);
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
-
-  @Override
-  protected Enumeration<URL> findResources(String name) {
-    URL resource = findResource(name);
-    if (null != resource) {
-      return Collections.enumeration(Collections.singleton(resource));
+
+    @Override
+    protected Enumeration<URL> findResources(String name) {
+        URL resource = findResource(name);
+        if (null != resource) {
+            return Collections.enumeration(Collections.singleton(resource));
+        }
+        return Collections.emptyEnumeration();
     }
-    return Collections.emptyEnumeration();
-  }
-
-  @Override
-  protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-    if (name.startsWith("datadog.trace.instrumentation.")
-        && (name.endsWith("$Muzzle")
-            || name.endsWith("Instrumentation")
-            || name.endsWith("Module"))) {
-      InstrumentationClassLoader cl;
-      if (null == (cl = instrumentationClassLoader.get())) {
-        synchronized (instrumentationClassLoaderLock) {
-          if (null == (cl = instrumentationClassLoader.get())) {
-            // previous instance was unloaded, create fresh one
-            cl = new InstrumentationClassLoader(this);
-            instrumentationClassLoader = new WeakReference<>(cl);
-          }
+
+    @Override
+    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+        if (name.startsWith("datadog.trace.instrumentation.")
+                && (name.endsWith("$Muzzle") || name.endsWith("Instrumentation") || name.endsWith("Module"))) {
+            InstrumentationClassLoader cl;
+            if (null == (cl = instrumentationClassLoader.get())) {
+                synchronized (instrumentationClassLoaderLock) {
+                    if (null == (cl = instrumentationClassLoader.get())) {
+                        // previous instance was unloaded, create fresh one
+                        cl = new InstrumentationClassLoader(this);
+                        instrumentationClassLoader = new WeakReference<>(cl);
+                    }
+                }
+            }
+            return cl.loadInstrumentationClass(name, agentCodeSource);
+        } else if (name.startsWith("com.kenai.jffi")) {
+            // prefer our embedded JFFI to other versions exposed by the parent class-loader
+            return loadLocalClass(name, resolve);
+        } else {
+            return super.loadClass(name, resolve);
         }
-      }
-      return cl.loadInstrumentationClass(name, agentCodeSource);
-    } else if (name.startsWith("com.kenai.jffi")) {
-      // prefer our embedded JFFI to other versions exposed by the parent class-loader
-      return loadLocalClass(name, resolve);
-    } else {
-      return super.loadClass(name, resolve);
     }
-  }
-
-  /** Same as {@link #loadClass(String, boolean)} but it doesn't delegate to the parent. */
-  private Class<?> loadLocalClass(String name, boolean resolve) throws ClassNotFoundException {
-    synchronized (getClassLoadingLock(name)) {
-      Class<?> c = findLoadedClass(name);
-      if (null == c) {
-        c = findClass(name);
-      }
-      if (resolve) {
-        resolveClass(c);
-      }
-      return c;
+
+    /** Same as {@link #loadClass(String, boolean)} but it doesn't delegate to the parent. */
+    private Class<?> loadLocalClass(String name, boolean resolve) throws ClassNotFoundException {
+        synchronized (getClassLoadingLock(name)) {
+            Class<?> c = findLoadedClass(name);
+            if (null == c) {
+                c = findClass(name);
+            }
+            if (resolve) {
+                resolveClass(c);
+            }
+            return c;
+        }
     }
-  }
-
-  @Override
-  protected Class<?> findClass(String name) throws ClassNotFoundException {
-    byte[] buf = loadClassBytes(name);
-    return defineClass(name, buf, 0, buf.length, agentCodeSource);
-  }
-
-  byte[] loadClassBytes(String name) throws ClassNotFoundException {
-    String entryName = agentJarIndex.classEntryName(name);
-    if (null != entryName) {
-      JarEntry jarEntry = agentJarFile.getJarEntry(entryName);
-      if (null != jarEntry) {
-        byte[] buf = new byte[(int) jarEntry.getSize()];
-        try (InputStream in = agentJarFile.getInputStream(jarEntry)) {
-          int bytesRead = in.read(buf);
-          while (bytesRead < buf.length) {
-            int delta = in.read(buf, bytesRead, buf.length - bytesRead);
-            if (delta < 0) {
-              break;
+
+    @Override
+    protected Class<?> findClass(String name) throws ClassNotFoundException {
+        byte[] buf = loadClassBytes(name);
+        return defineClass(name, buf, 0, buf.length, agentCodeSource);
+    }
+
+    byte[] loadClassBytes(String name) throws ClassNotFoundException {
+        String entryName = agentJarIndex.classEntryName(name);
+        if (null != entryName) {
+            JarEntry jarEntry = agentJarFile.getJarEntry(entryName);
+            if (null != jarEntry) {
+                byte[] buf = new byte[(int) jarEntry.getSize()];
+                try (InputStream in = agentJarFile.getInputStream(jarEntry)) {
+                    int bytesRead = in.read(buf);
+                    while (bytesRead < buf.length) {
+                        int delta = in.read(buf, bytesRead, buf.length - bytesRead);
+                        if (delta < 0) {
+                            break;
+                        }
+                        bytesRead += delta;
+                    }
+                    if (bytesRead == buf.length) {
+                        return buf;
+                    } else {
+                        log.warn("Malformed class data at {}", jarEntry);
+                    }
+                } catch (IOException e) {
+                    log.warn("Problem reading class data at {}", jarEntry, e);
+                }
             }
-            bytesRead += delta;
-          }
-          if (bytesRead == buf.length) {
-            return buf;
-          } else {
-            log.warn("Malformed class data at {}", jarEntry);
-          }
-        } catch (IOException e) {
-          log.warn("Problem reading class data at {}", jarEntry, e);
         }
-      }
+        throw new ClassNotFoundException(name);
     }
-    throw new ClassNotFoundException(name);
-  }
-
-  @Override
-  protected Package getPackage(String name) {
-    synchronized (definedPackages) {
-      if (definedPackages.add(name)) {
-        return definePackage(name, null, null, null, null, null, null, null);
-      } else {
-        return super.getPackage(name);
-      }
+
+    @Override
+    protected Package getPackage(String name) {
+        synchronized (definedPackages) {
+            if (definedPackages.add(name)) {
+                return definePackage(name, null, null, null, null, null, null, null);
+            } else {
+                return super.getPackage(name);
+            }
+        }
     }
-  }
 
-  @Override
-  public String toString() {
-    return "datadog";
-  }
+    @Override
+    public String toString() {
+        return "datadog";
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/DeferredProfilingContextIntegration.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/DeferredProfilingContextIntegration.java
index db9b52d19ec..08cf71ef4a7 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/DeferredProfilingContextIntegration.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/DeferredProfilingContextIntegration.java
@@ -27,174 +27,172 @@
  * fails.
  */
 final class DeferredProfilingContextIntegration implements ProfilingContextIntegration {
-  private static final Logger log =
-      LoggerFactory.getLogger(DeferredProfilingContextIntegration.class);
-
-  /**
-   * Delay before the deferred construction runs, giving {@code main} a chance to install its own
-   * {@code java.nio.file.spi.DefaultFileSystemProvider} first; not user-tunable since losing the
-   * first second of context exposure is not observable.
-   */
-  private static final long INITIALIZATION_DELAY_MILLIS = 1_000;
-
-  private final String name;
-  private final Callable<ProfilingContextIntegration> factory;
-
-  /**
-   * Swapped to the real integration once construction succeeds; volatile since scopes may already
-   * be running when the swap happens.
-   */
-  private volatile ProfilingContextIntegration delegate = ProfilingContextIntegration.NoOp.INSTANCE;
-
-  /**
-   * Callbacks queued via {@link #whenAvailable(Runnable)} before the swap; guarded by {@code this}
-   * together with the {@link #delegate} write so none is run twice or dropped.
-   */
-  private final List<Runnable> pendingAvailabilityCallbacks = new ArrayList<>(1);
-
-  /**
-   * @param name the name reported by {@link #name()}, i.e. the name of the integration being
-   *     deferred.
-   * @param factory creates the real integration; invoked at most once, off the premain thread.
-   */
-  DeferredProfilingContextIntegration(
-      final String name, final Callable<ProfilingContextIntegration> factory) {
-    this.name = name;
-    this.factory = factory;
-  }
-
-  /**
-   * Schedules the deferred construction to run off this (premain) thread, after {@link
-   * #INITIALIZATION_DELAY_MILLIS}.
-   */
-  void scheduleInitialization() {
-    AgentTaskScheduler.get().schedule(this::initialize, INITIALIZATION_DELAY_MILLIS, MILLISECONDS);
-  }
-
-  /**
-   * Runs the deferred construction; called exactly once per instance, from {@link
-   * #scheduleInitialization()}. On failure this instance keeps behaving as {@link
-   * ProfilingContextIntegration.NoOp} forever; a background failure must never propagate.
-   */
-  void initialize() {
-    try {
-      final ProfilingContextIntegration integration = factory.call();
-      if (integration == null) {
-        return;
-      }
-      final List<Runnable> callbacks;
-      synchronized (this) {
-        delegate = integration;
-        callbacks = new ArrayList<>(pendingAvailabilityCallbacks);
-        pendingAvailabilityCallbacks.clear();
-      }
-      for (final Runnable callback : callbacks) {
+    private static final Logger log = LoggerFactory.getLogger(DeferredProfilingContextIntegration.class);
+
+    /**
+     * Delay before the deferred construction runs, giving {@code main} a chance to install its own
+     * {@code java.nio.file.spi.DefaultFileSystemProvider} first; not user-tunable since losing the
+     * first second of context exposure is not observable.
+     */
+    private static final long INITIALIZATION_DELAY_MILLIS = 1_000;
+
+    private final String name;
+    private final Callable<ProfilingContextIntegration> factory;
+
+    /**
+     * Swapped to the real integration once construction succeeds; volatile since scopes may already
+     * be running when the swap happens.
+     */
+    private volatile ProfilingContextIntegration delegate = ProfilingContextIntegration.NoOp.INSTANCE;
+
+    /**
+     * Callbacks queued via {@link #whenAvailable(Runnable)} before the swap; guarded by {@code this}
+     * together with the {@link #delegate} write so none is run twice or dropped.
+     */
+    private final List<Runnable> pendingAvailabilityCallbacks = new ArrayList<>(1);
+
+    /**
+     * @param name the name reported by {@link #name()}, i.e. the name of the integration being
+     *     deferred.
+     * @param factory creates the real integration; invoked at most once, off the premain thread.
+     */
+    DeferredProfilingContextIntegration(final String name, final Callable<ProfilingContextIntegration> factory) {
+        this.name = name;
+        this.factory = factory;
+    }
+
+    /**
+     * Schedules the deferred construction to run off this (premain) thread, after {@link
+     * #INITIALIZATION_DELAY_MILLIS}.
+     */
+    void scheduleInitialization() {
+        AgentTaskScheduler.get().schedule(this::initialize, INITIALIZATION_DELAY_MILLIS, MILLISECONDS);
+    }
+
+    /**
+     * Runs the deferred construction; called exactly once per instance, from {@link
+     * #scheduleInitialization()}. On failure this instance keeps behaving as {@link
+     * ProfilingContextIntegration.NoOp} forever; a background failure must never propagate.
+     */
+    void initialize() {
         try {
-          callback.run();
+            final ProfilingContextIntegration integration = factory.call();
+            if (integration == null) {
+                return;
+            }
+            final List<Runnable> callbacks;
+            synchronized (this) {
+                delegate = integration;
+                callbacks = new ArrayList<>(pendingAvailabilityCallbacks);
+                pendingAvailabilityCallbacks.clear();
+            }
+            for (final Runnable callback : callbacks) {
+                try {
+                    callback.run();
+                } catch (final Throwable t) {
+                    log.debug("Availability callback for {} profiling context failed.", name, t);
+                }
+            }
         } catch (final Throwable t) {
-          log.debug("Availability callback for {} profiling context failed.", name, t);
+            // toString() because failures here (UnsatisfiedLinkError etc.) often carry no message.
+            log.info("Deferred {} profiling context labeling not available. {}", name, t.toString());
         }
-      }
-    } catch (final Throwable t) {
-      // toString() because failures here (UnsatisfiedLinkError etc.) often carry no message.
-      log.info("Deferred {} profiling context labeling not available. {}", name, t.toString());
-    }
-  }
-
-  /**
-   * Runs {@code callback} once the real integration is swapped in, or immediately if it already is;
-   * never runs it if the deferred construction failed.
-   */
-  @Override
-  public void whenAvailable(final Runnable callback) {
-    // double-checked: delegate is volatile, so a post-swap caller never takes the lock
-    if (delegate == ProfilingContextIntegration.NoOp.INSTANCE) {
-      synchronized (this) {
+    }
+
+    /**
+     * Runs {@code callback} once the real integration is swapped in, or immediately if it already is;
+     * never runs it if the deferred construction failed.
+     */
+    @Override
+    public void whenAvailable(final Runnable callback) {
+        // double-checked: delegate is volatile, so a post-swap caller never takes the lock
         if (delegate == ProfilingContextIntegration.NoOp.INSTANCE) {
-          pendingAvailabilityCallbacks.add(callback);
-          return;
+            synchronized (this) {
+                if (delegate == ProfilingContextIntegration.NoOp.INSTANCE) {
+                    pendingAvailabilityCallbacks.add(callback);
+                    return;
+                }
+            }
         }
-      }
-    }
-    callback.run();
-  }
-
-  /**
-   * The name of the deferred integration, not of the current delegate: read once at tracer build
-   * time, possibly before the deferred construction completes.
-   */
-  @Override
-  public String name() {
-    return name;
-  }
-
-  @Override
-  public void onStart() {
-    delegate.onStart();
-  }
-
-  @Override
-  public void onAttach() {
-    delegate.onAttach();
-  }
-
-  @Override
-  public void onDetach() {
-    delegate.onDetach();
-  }
-
-  @Override
-  public boolean isThreadContextBindingRequired() {
-    return delegate.isThreadContextBindingRequired();
-  }
-
-  @Override
-  public void setContext(final Context context) {
-    delegate.setContext(context);
-  }
-
-  @Override
-  public Stateful newScopeState(final ProfilerContext profilerContext) {
-    return delegate.newScopeState(profilerContext);
-  }
-
-  @Override
-  public int encode(final CharSequence constant) {
-    return delegate.encode(constant);
-  }
-
-  @Override
-  public int encodeOperationName(final CharSequence constant) {
-    return delegate.encodeOperationName(constant);
-  }
-
-  @Override
-  public int encodeResourceName(final CharSequence constant) {
-    return delegate.encodeResourceName(constant);
-  }
-
-  @Override
-  public ProfilingContextAttribute createContextAttribute(final String attribute) {
-    return delegate.createContextAttribute(attribute);
-  }
-
-  @Override
-  public ProfilingScope newScope() {
-    return delegate.newScope();
-  }
-
-  @Override
-  public void onRootSpanFinished(final AgentSpan rootSpan, final EndpointTracker tracker) {
-    delegate.onRootSpanFinished(rootSpan, tracker);
-  }
-
-  @Override
-  public EndpointTracker onRootSpanStarted(final AgentSpan rootSpan) {
-    return delegate.onRootSpanStarted(rootSpan);
-  }
-
-  @Override
-  public Timing start(final TimerType type) {
-    return delegate.start(type);
-  }
+        callback.run();
+    }
+
+    /**
+     * The name of the deferred integration, not of the current delegate: read once at tracer build
+     * time, possibly before the deferred construction completes.
+     */
+    @Override
+    public String name() {
+        return name;
+    }
+
+    @Override
+    public void onStart() {
+        delegate.onStart();
+    }
+
+    @Override
+    public void onAttach() {
+        delegate.onAttach();
+    }
+
+    @Override
+    public void onDetach() {
+        delegate.onDetach();
+    }
+
+    @Override
+    public boolean isThreadContextBindingRequired() {
+        return delegate.isThreadContextBindingRequired();
+    }
+
+    @Override
+    public void setContext(final Context context) {
+        delegate.setContext(context);
+    }
+
+    @Override
+    public Stateful newScopeState(final ProfilerContext profilerContext) {
+        return delegate.newScopeState(profilerContext);
+    }
+
+    @Override
+    public int encode(final CharSequence constant) {
+        return delegate.encode(constant);
+    }
+
+    @Override
+    public int encodeOperationName(final CharSequence constant) {
+        return delegate.encodeOperationName(constant);
+    }
+
+    @Override
+    public int encodeResourceName(final CharSequence constant) {
+        return delegate.encodeResourceName(constant);
+    }
+
+    @Override
+    public ProfilingContextAttribute createContextAttribute(final String attribute) {
+        return delegate.createContextAttribute(attribute);
+    }
+
+    @Override
+    public ProfilingScope newScope() {
+        return delegate.newScope();
+    }
+
+    @Override
+    public void onRootSpanFinished(final AgentSpan rootSpan, final EndpointTracker tracker) {
+        delegate.onRootSpanFinished(rootSpan, tracker);
+    }
+
+    @Override
+    public EndpointTracker onRootSpanStarted(final AgentSpan rootSpan) {
+        return delegate.onRootSpanStarted(rootSpan);
+    }
+
+    @Override
+    public Timing start(final TimerType type) {
+        return delegate.start(type);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/ExceptionLogger.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/ExceptionLogger.java
index 7d54a515236..ae23a86c4d3 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/ExceptionLogger.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/ExceptionLogger.java
@@ -9,7 +9,7 @@
  * <p>See datadog.trace.agent.tooling.ExceptionHandlers
  */
 public final class ExceptionLogger {
-  public static final Logger LOGGER = LoggerFactory.getLogger(ExceptionLogger.class);
+    public static final Logger LOGGER = LoggerFactory.getLogger(ExceptionLogger.class);
 
-  private ExceptionLogger() {}
+    private ExceptionLogger() {}
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/FieldBackedContextAccessor.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/FieldBackedContextAccessor.java
index 5e50ceb7923..886dec14ab3 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/FieldBackedContextAccessor.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/FieldBackedContextAccessor.java
@@ -4,9 +4,9 @@
  * Accessor API for {@link ContextStore} keys that store their context in a bytecode-injected field.
  */
 public interface FieldBackedContextAccessor {
-  /** Retrieves context from the field backing the given store. */
-  Object $get$__datadogContext$(int storeId);
+    /** Retrieves context from the field backing the given store. */
+    Object $get$__datadogContext$(int storeId);
 
-  /** Stores context in the field backing the given store. */
-  void $put$__datadogContext$(int storeId, Object context);
+    /** Stores context in the field backing the given store. */
+    void $put$__datadogContext$(int storeId, Object context);
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/FieldBackedContextStore.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/FieldBackedContextStore.java
index aeafbe2f2a9..895d3c3edf7 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/FieldBackedContextStore.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/FieldBackedContextStore.java
@@ -9,114 +9,113 @@
  * fields. Delegates to a lazy {@link WeakMap} for keys that don't have a field for this store.
  */
 public final class FieldBackedContextStore implements ContextStore<Object, Object> {
-  private static final boolean MAP_PER_STORE =
-      InstrumenterConfig.get().isRuntimeContextMapPerStore();
+    private static final boolean MAP_PER_STORE = InstrumenterConfig.get().isRuntimeContextMapPerStore();
 
-  final int storeId;
+    final int storeId;
 
-  FieldBackedContextStore(final int storeId) {
-    this.storeId = storeId;
-  }
+    FieldBackedContextStore(final int storeId) {
+        this.storeId = storeId;
+    }
 
-  @Override
-  public Object get(final Object key) {
-    if (key instanceof FieldBackedContextAccessor) {
-      return ((FieldBackedContextAccessor) key).$get$__datadogContext$(storeId);
-    } else if (MAP_PER_STORE) {
-      return weakStore().get(key);
-    } else {
-      return GlobalObjectStore.get(key, storeId);
+    @Override
+    public Object get(final Object key) {
+        if (key instanceof FieldBackedContextAccessor) {
+            return ((FieldBackedContextAccessor) key).$get$__datadogContext$(storeId);
+        } else if (MAP_PER_STORE) {
+            return weakStore().get(key);
+        } else {
+            return GlobalObjectStore.get(key, storeId);
+        }
     }
-  }
 
-  @Override
-  public void put(final Object key, final Object context) {
-    if (key instanceof FieldBackedContextAccessor) {
-      ((FieldBackedContextAccessor) key).$put$__datadogContext$(storeId, context);
-    } else if (MAP_PER_STORE) {
-      weakStore().put(key, context);
-    } else {
-      GlobalObjectStore.put(key, storeId, context);
+    @Override
+    public void put(final Object key, final Object context) {
+        if (key instanceof FieldBackedContextAccessor) {
+            ((FieldBackedContextAccessor) key).$put$__datadogContext$(storeId, context);
+        } else if (MAP_PER_STORE) {
+            weakStore().put(key, context);
+        } else {
+            GlobalObjectStore.put(key, storeId, context);
+        }
     }
-  }
 
-  @Override
-  public Object getOrPut(final Object key, final Object context) {
-    if (key instanceof FieldBackedContextAccessor) {
-      final FieldBackedContextAccessor accessor = (FieldBackedContextAccessor) key;
-      Object existingContext = accessor.$get$__datadogContext$(storeId);
-      if (null == existingContext) {
-        synchronized (accessor) {
-          existingContext = accessor.$get$__datadogContext$(storeId);
-          if (null == existingContext) {
-            existingContext = context;
-            accessor.$put$__datadogContext$(storeId, existingContext);
-          }
+    @Override
+    public Object getOrPut(final Object key, final Object context) {
+        if (key instanceof FieldBackedContextAccessor) {
+            final FieldBackedContextAccessor accessor = (FieldBackedContextAccessor) key;
+            Object existingContext = accessor.$get$__datadogContext$(storeId);
+            if (null == existingContext) {
+                synchronized (accessor) {
+                    existingContext = accessor.$get$__datadogContext$(storeId);
+                    if (null == existingContext) {
+                        existingContext = context;
+                        accessor.$put$__datadogContext$(storeId, existingContext);
+                    }
+                }
+            }
+            return existingContext;
+        } else if (MAP_PER_STORE) {
+            return weakStore().getOrPut(key, context);
+        } else {
+            return GlobalObjectStore.getOrPut(key, storeId, context);
         }
-      }
-      return existingContext;
-    } else if (MAP_PER_STORE) {
-      return weakStore().getOrPut(key, context);
-    } else {
-      return GlobalObjectStore.getOrPut(key, storeId, context);
     }
-  }
 
-  @Override
-  public Object getOrCompute(Object key, Function<? super Object, Object> contextFactory) {
-    if (key instanceof FieldBackedContextAccessor) {
-      final FieldBackedContextAccessor accessor = (FieldBackedContextAccessor) key;
-      Object existingContext = accessor.$get$__datadogContext$(storeId);
-      if (null == existingContext) {
-        synchronized (accessor) {
-          existingContext = accessor.$get$__datadogContext$(storeId);
-          if (null == existingContext) {
-            existingContext = contextFactory.apply(key);
-            accessor.$put$__datadogContext$(storeId, existingContext);
-          }
+    @Override
+    public Object getOrCompute(Object key, Function<? super Object, Object> contextFactory) {
+        if (key instanceof FieldBackedContextAccessor) {
+            final FieldBackedContextAccessor accessor = (FieldBackedContextAccessor) key;
+            Object existingContext = accessor.$get$__datadogContext$(storeId);
+            if (null == existingContext) {
+                synchronized (accessor) {
+                    existingContext = accessor.$get$__datadogContext$(storeId);
+                    if (null == existingContext) {
+                        existingContext = contextFactory.apply(key);
+                        accessor.$put$__datadogContext$(storeId, existingContext);
+                    }
+                }
+            }
+            return existingContext;
+        } else if (MAP_PER_STORE) {
+            return weakStore().getOrCompute(key, contextFactory);
+        } else {
+            return GlobalObjectStore.getOrCompute(key, storeId, contextFactory);
         }
-      }
-      return existingContext;
-    } else if (MAP_PER_STORE) {
-      return weakStore().getOrCompute(key, contextFactory);
-    } else {
-      return GlobalObjectStore.getOrCompute(key, storeId, contextFactory);
     }
-  }
 
-  @Override
-  public Object remove(Object key) {
-    if (key instanceof FieldBackedContextAccessor) {
-      final FieldBackedContextAccessor accessor = (FieldBackedContextAccessor) key;
-      Object existingContext = accessor.$get$__datadogContext$(storeId);
-      if (null != existingContext) {
-        synchronized (accessor) {
-          existingContext = accessor.$get$__datadogContext$(storeId);
-          if (null != existingContext) {
-            accessor.$put$__datadogContext$(storeId, null);
-          }
+    @Override
+    public Object remove(Object key) {
+        if (key instanceof FieldBackedContextAccessor) {
+            final FieldBackedContextAccessor accessor = (FieldBackedContextAccessor) key;
+            Object existingContext = accessor.$get$__datadogContext$(storeId);
+            if (null != existingContext) {
+                synchronized (accessor) {
+                    existingContext = accessor.$get$__datadogContext$(storeId);
+                    if (null != existingContext) {
+                        accessor.$put$__datadogContext$(storeId, null);
+                    }
+                }
+            }
+            return existingContext;
+        } else if (MAP_PER_STORE) {
+            return weakStore().remove(key);
+        } else {
+            return GlobalObjectStore.remove(key, storeId);
         }
-      }
-      return existingContext;
-    } else if (MAP_PER_STORE) {
-      return weakStore().remove(key);
-    } else {
-      return GlobalObjectStore.remove(key, storeId);
     }
-  }
 
-  // only create WeakMap-based fall-back when we need it
-  private volatile WeakMapPerStore<Object, Object> weakStore;
-  private final Object synchronizationInstance = new Object();
+    // only create WeakMap-based fall-back when we need it
+    private volatile WeakMapPerStore<Object, Object> weakStore;
+    private final Object synchronizationInstance = new Object();
 
-  WeakMapPerStore<Object, Object> weakStore() {
-    if (null == weakStore) {
-      synchronized (synchronizationInstance) {
+    WeakMapPerStore<Object, Object> weakStore() {
         if (null == weakStore) {
-          weakStore = new WeakMapPerStore<>();
+            synchronized (synchronizationInstance) {
+                if (null == weakStore) {
+                    weakStore = new WeakMapPerStore<>();
+                }
+            }
         }
-      }
+        return weakStore;
     }
-    return weakStore;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/FieldBackedContextStores.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/FieldBackedContextStores.java
index 8ae3a3239c5..c830dfb77ec 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/FieldBackedContextStores.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/FieldBackedContextStores.java
@@ -9,129 +9,128 @@
 /** Allocates {@link ContextStore} ids and keeps track of allocated stores. */
 public final class FieldBackedContextStores {
 
-  private static final Logger log = LoggerFactory.getLogger(FieldBackedContextStores.class);
+    private static final Logger log = LoggerFactory.getLogger(FieldBackedContextStores.class);
 
-  // provide fast lookup for a fixed number of stores
-  public static final int FAST_STORE_ID_LIMIT = 32;
+    // provide fast lookup for a fixed number of stores
+    public static final int FAST_STORE_ID_LIMIT = 32;
 
-  // these fields will be accessed directly from field-injected instrumentation
-  public static final FieldBackedContextStore contextStore0 = new FieldBackedContextStore(0);
-  public static final FieldBackedContextStore contextStore1 = new FieldBackedContextStore(1);
-  public static final FieldBackedContextStore contextStore2 = new FieldBackedContextStore(2);
-  public static final FieldBackedContextStore contextStore3 = new FieldBackedContextStore(3);
-  public static final FieldBackedContextStore contextStore4 = new FieldBackedContextStore(4);
-  public static final FieldBackedContextStore contextStore5 = new FieldBackedContextStore(5);
-  public static final FieldBackedContextStore contextStore6 = new FieldBackedContextStore(6);
-  public static final FieldBackedContextStore contextStore7 = new FieldBackedContextStore(7);
-  public static final FieldBackedContextStore contextStore8 = new FieldBackedContextStore(8);
-  public static final FieldBackedContextStore contextStore9 = new FieldBackedContextStore(9);
-  public static final FieldBackedContextStore contextStore10 = new FieldBackedContextStore(10);
-  public static final FieldBackedContextStore contextStore11 = new FieldBackedContextStore(11);
-  public static final FieldBackedContextStore contextStore12 = new FieldBackedContextStore(12);
-  public static final FieldBackedContextStore contextStore13 = new FieldBackedContextStore(13);
-  public static final FieldBackedContextStore contextStore14 = new FieldBackedContextStore(14);
-  public static final FieldBackedContextStore contextStore15 = new FieldBackedContextStore(15);
-  public static final FieldBackedContextStore contextStore16 = new FieldBackedContextStore(16);
-  public static final FieldBackedContextStore contextStore17 = new FieldBackedContextStore(17);
-  public static final FieldBackedContextStore contextStore18 = new FieldBackedContextStore(18);
-  public static final FieldBackedContextStore contextStore19 = new FieldBackedContextStore(19);
-  public static final FieldBackedContextStore contextStore20 = new FieldBackedContextStore(20);
-  public static final FieldBackedContextStore contextStore21 = new FieldBackedContextStore(21);
-  public static final FieldBackedContextStore contextStore22 = new FieldBackedContextStore(22);
-  public static final FieldBackedContextStore contextStore23 = new FieldBackedContextStore(23);
-  public static final FieldBackedContextStore contextStore24 = new FieldBackedContextStore(24);
-  public static final FieldBackedContextStore contextStore25 = new FieldBackedContextStore(25);
-  public static final FieldBackedContextStore contextStore26 = new FieldBackedContextStore(26);
-  public static final FieldBackedContextStore contextStore27 = new FieldBackedContextStore(27);
-  public static final FieldBackedContextStore contextStore28 = new FieldBackedContextStore(28);
-  public static final FieldBackedContextStore contextStore29 = new FieldBackedContextStore(29);
-  public static final FieldBackedContextStore contextStore30 = new FieldBackedContextStore(30);
-  public static final FieldBackedContextStore contextStore31 = new FieldBackedContextStore(31);
+    // these fields will be accessed directly from field-injected instrumentation
+    public static final FieldBackedContextStore contextStore0 = new FieldBackedContextStore(0);
+    public static final FieldBackedContextStore contextStore1 = new FieldBackedContextStore(1);
+    public static final FieldBackedContextStore contextStore2 = new FieldBackedContextStore(2);
+    public static final FieldBackedContextStore contextStore3 = new FieldBackedContextStore(3);
+    public static final FieldBackedContextStore contextStore4 = new FieldBackedContextStore(4);
+    public static final FieldBackedContextStore contextStore5 = new FieldBackedContextStore(5);
+    public static final FieldBackedContextStore contextStore6 = new FieldBackedContextStore(6);
+    public static final FieldBackedContextStore contextStore7 = new FieldBackedContextStore(7);
+    public static final FieldBackedContextStore contextStore8 = new FieldBackedContextStore(8);
+    public static final FieldBackedContextStore contextStore9 = new FieldBackedContextStore(9);
+    public static final FieldBackedContextStore contextStore10 = new FieldBackedContextStore(10);
+    public static final FieldBackedContextStore contextStore11 = new FieldBackedContextStore(11);
+    public static final FieldBackedContextStore contextStore12 = new FieldBackedContextStore(12);
+    public static final FieldBackedContextStore contextStore13 = new FieldBackedContextStore(13);
+    public static final FieldBackedContextStore contextStore14 = new FieldBackedContextStore(14);
+    public static final FieldBackedContextStore contextStore15 = new FieldBackedContextStore(15);
+    public static final FieldBackedContextStore contextStore16 = new FieldBackedContextStore(16);
+    public static final FieldBackedContextStore contextStore17 = new FieldBackedContextStore(17);
+    public static final FieldBackedContextStore contextStore18 = new FieldBackedContextStore(18);
+    public static final FieldBackedContextStore contextStore19 = new FieldBackedContextStore(19);
+    public static final FieldBackedContextStore contextStore20 = new FieldBackedContextStore(20);
+    public static final FieldBackedContextStore contextStore21 = new FieldBackedContextStore(21);
+    public static final FieldBackedContextStore contextStore22 = new FieldBackedContextStore(22);
+    public static final FieldBackedContextStore contextStore23 = new FieldBackedContextStore(23);
+    public static final FieldBackedContextStore contextStore24 = new FieldBackedContextStore(24);
+    public static final FieldBackedContextStore contextStore25 = new FieldBackedContextStore(25);
+    public static final FieldBackedContextStore contextStore26 = new FieldBackedContextStore(26);
+    public static final FieldBackedContextStore contextStore27 = new FieldBackedContextStore(27);
+    public static final FieldBackedContextStore contextStore28 = new FieldBackedContextStore(28);
+    public static final FieldBackedContextStore contextStore29 = new FieldBackedContextStore(29);
+    public static final FieldBackedContextStore contextStore30 = new FieldBackedContextStore(30);
+    public static final FieldBackedContextStore contextStore31 = new FieldBackedContextStore(31);
 
-  // keep track of all allocated stores so far
-  private static volatile FieldBackedContextStore[] stores = {
-    contextStore0,
-    contextStore1,
-    contextStore2,
-    contextStore3,
-    contextStore4,
-    contextStore5,
-    contextStore6,
-    contextStore7,
-    contextStore8,
-    contextStore9,
-    contextStore10,
-    contextStore11,
-    contextStore12,
-    contextStore13,
-    contextStore14,
-    contextStore15,
-    contextStore16,
-    contextStore17,
-    contextStore18,
-    contextStore19,
-    contextStore20,
-    contextStore21,
-    contextStore22,
-    contextStore23,
-    contextStore24,
-    contextStore25,
-    contextStore26,
-    contextStore27,
-    contextStore28,
-    contextStore29,
-    contextStore30,
-    contextStore31
-  };
+    // keep track of all allocated stores so far
+    private static volatile FieldBackedContextStore[] stores = {
+        contextStore0,
+        contextStore1,
+        contextStore2,
+        contextStore3,
+        contextStore4,
+        contextStore5,
+        contextStore6,
+        contextStore7,
+        contextStore8,
+        contextStore9,
+        contextStore10,
+        contextStore11,
+        contextStore12,
+        contextStore13,
+        contextStore14,
+        contextStore15,
+        contextStore16,
+        contextStore17,
+        contextStore18,
+        contextStore19,
+        contextStore20,
+        contextStore21,
+        contextStore22,
+        contextStore23,
+        contextStore24,
+        contextStore25,
+        contextStore26,
+        contextStore27,
+        contextStore28,
+        contextStore29,
+        contextStore30,
+        contextStore31
+    };
 
-  public static FieldBackedContextStore getContextStore(final int storeId) {
-    return stores[storeId]; // createStore ensures array is big enough for allocated storeIds
-  }
+    public static FieldBackedContextStore getContextStore(final int storeId) {
+        return stores[storeId]; // createStore ensures array is big enough for allocated storeIds
+    }
 
-  private static final ConcurrentHashMap<String, FieldBackedContextStore> STORES_BY_NAME =
-      new ConcurrentHashMap<>();
+    private static final ConcurrentHashMap<String, FieldBackedContextStore> STORES_BY_NAME = new ConcurrentHashMap<>();
 
-  @SuppressFBWarnings("JLM_JSR166_UTILCONCURRENT_MONITORENTER")
-  public static int getContextStoreId(final String keyClassName, final String contextClassName) {
-    final String storeName = storeName(keyClassName, contextClassName);
-    FieldBackedContextStore existingStore = STORES_BY_NAME.get(storeName);
-    if (null == existingStore) {
-      synchronized (STORES_BY_NAME) {
-        // speculatively create the next store in the sequence and attempt to map this name to it;
-        // if another thread has mapped this name then the store will be kept for the next mapping
-        final int newStoreId = STORES_BY_NAME.size();
-        existingStore = STORES_BY_NAME.putIfAbsent(storeName, createStore(newStoreId));
+    @SuppressFBWarnings("JLM_JSR166_UTILCONCURRENT_MONITORENTER")
+    public static int getContextStoreId(final String keyClassName, final String contextClassName) {
+        final String storeName = storeName(keyClassName, contextClassName);
+        FieldBackedContextStore existingStore = STORES_BY_NAME.get(storeName);
         if (null == existingStore) {
-          log.debug(
-              "Allocated ContextStore #{} - instrumentation.target.context={}->{}",
-              newStoreId,
-              keyClassName,
-              contextClassName);
-          return newStoreId;
+            synchronized (STORES_BY_NAME) {
+                // speculatively create the next store in the sequence and attempt to map this name to it;
+                // if another thread has mapped this name then the store will be kept for the next mapping
+                final int newStoreId = STORES_BY_NAME.size();
+                existingStore = STORES_BY_NAME.putIfAbsent(storeName, createStore(newStoreId));
+                if (null == existingStore) {
+                    log.debug(
+                            "Allocated ContextStore #{} - instrumentation.target.context={}->{}",
+                            newStoreId,
+                            keyClassName,
+                            contextClassName);
+                    return newStoreId;
+                }
+            }
         }
-      }
+        return existingStore.storeId;
     }
-    return existingStore.storeId;
-  }
-
-  private static String storeName(final String keyClassName, final String contextClassName) {
-    return keyClassName + ';' + contextClassName;
-  }
 
-  // this method should only be called while holding a synchronized lock on STORES_BY_NAME
-  private static FieldBackedContextStore createStore(final int storeId) {
-    if (storeId < FAST_STORE_ID_LIMIT) {
-      return stores[storeId]; // pre-allocated
+    private static String storeName(final String keyClassName, final String contextClassName) {
+        return keyClassName + ';' + contextClassName;
     }
-    if (stores.length <= storeId) {
-      stores = Arrays.copyOf(stores, storeId + 16);
-    }
-    // check in case an earlier thread created the store but didn't end up using it
-    FieldBackedContextStore store = stores[storeId];
-    if (null == store) {
-      store = new FieldBackedContextStore(storeId);
-      stores[storeId] = store;
+
+    // this method should only be called while holding a synchronized lock on STORES_BY_NAME
+    private static FieldBackedContextStore createStore(final int storeId) {
+        if (storeId < FAST_STORE_ID_LIMIT) {
+            return stores[storeId]; // pre-allocated
+        }
+        if (stores.length <= storeId) {
+            stores = Arrays.copyOf(stores, storeId + 16);
+        }
+        // check in case an earlier thread created the store but didn't end up using it
+        FieldBackedContextStore store = stores[storeId];
+        if (null == store) {
+            store = new FieldBackedContextStore(storeId);
+            stores[storeId] = store;
+        }
+        return store;
     }
-    return store;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InitializationTelemetry.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InitializationTelemetry.java
index e55ceb4f270..239f9d448f1 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InitializationTelemetry.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InitializationTelemetry.java
@@ -12,204 +12,199 @@
  * BootstrapInitializationTelemetry, then we could remove this proxy.
  */
 public abstract class InitializationTelemetry {
-  /** Returns a proxy around a BoostrapInitializationTelemetry object */
-  public static final InitializationTelemetry proxy(Object bootstrapInitTelemetry) {
-    if (bootstrapInitTelemetry == null) {
-      return InitializationTelemetry.noOpInstance();
-    } else {
-      return new BootstrapProxy(bootstrapInitTelemetry);
+    /** Returns a proxy around a BoostrapInitializationTelemetry object */
+    public static final InitializationTelemetry proxy(Object bootstrapInitTelemetry) {
+        if (bootstrapInitTelemetry == null) {
+            return InitializationTelemetry.noOpInstance();
+        } else {
+            return new BootstrapProxy(bootstrapInitTelemetry);
+        }
+    }
+
+    /** Returns a singleton of the no op InitializationTelemetry */
+    public static final InitializationTelemetry noOpInstance() {
+        return NoOp.INSTANCE;
     }
-  }
-
-  /** Returns a singleton of the no op InitializationTelemetry */
-  public static final InitializationTelemetry noOpInstance() {
-    return NoOp.INSTANCE;
-  }
-
-  /**
-   * Indicates that an abort condition occurred during the bootstrapping process. Abort conditions
-   * are assumed to leave the bootstrapping process incomplete. {@link #markIncomplete()}
-   */
-  public abstract void onAbort(String reasonCode);
-
-  /**
-   * Indicates that an exception occurred during the bootstrapping process By default the exception
-   * is assumed to NOT have fully stopped the initialization of the tracer.
-   *
-   * <p>If this exception stops the core bootstrapping of the tracer, then {@link #markIncomplete()}
-   * should also be called.
-   */
-  public abstract void onError(Throwable t);
-
-  /**
-   * Indicates an exception that occurred during the bootstrapping process that left initialization
-   * incomplete. Equivalent to calling {@link #onError(Throwable)} and {@link #markIncomplete()}
-   */
-  public abstract void onFatalError(Throwable t);
-
-  /**
-   * Indicates that an exception conditional occurred during the bootstrapping process. By default
-   * the exceptional condition is assumed to NOT have fully stopped the initialization of the
-   * tracer.
-   *
-   * <p>If this exception stops the core bootstrapping of the tracer, then {@link #markIncomplete()}
-   * should also be called.
-   */
-  public abstract void onError(String reasonCode);
-
-  /**
-   * Marks bootstrapping of tracer as an incomplete Should only be called when a core (e.g.
-   * non-optional) component fails to initialize
-   */
-  public abstract void markIncomplete();
-
-  /** No telemetry - used for delayed initialization outside bootstrap invocation */
-  static final class NoOp extends InitializationTelemetry {
-    static final NoOp INSTANCE = new NoOp();
-
-    NoOp() {}
-
-    @Override
-    public void onAbort(String reasonCode) {}
-
-    @Override
-    public void onError(String reasonCode) {}
-
-    @Override
-    public void onError(Throwable t) {}
-
-    @Override
-    public void onFatalError(Throwable t) {}
-
-    @Override
-    public void markIncomplete() {}
-  }
-
-  /** Reflective proxy to BootstrapInitializationTelemetry */
-  static final class BootstrapProxy extends InitializationTelemetry {
-    private final Object bootstrapInitTelemetry;
-    private volatile MethodHandle bmh_onAbortString;
-    private volatile MethodHandle bmh_onErrorString;
-    private volatile MethodHandle bmh_onErrorThrowable;
-    private volatile MethodHandle bmh_onFatalErrorThrowable;
-    private volatile MethodHandle bmh_markIncomplete;
-
-    // DQH - Decided not to eager access MethodHandles, since exceptions are uncommon
-    // However, MethodHandles are cached on lookup
 
     /**
-     * @param bootstrapInitTelemetry - non-null BootstrapInitializationTelemetry
+     * Indicates that an abort condition occurred during the bootstrapping process. Abort conditions
+     * are assumed to leave the bootstrapping process incomplete. {@link #markIncomplete()}
+     */
+    public abstract void onAbort(String reasonCode);
+
+    /**
+     * Indicates that an exception occurred during the bootstrapping process By default the exception
+     * is assumed to NOT have fully stopped the initialization of the tracer.
+     *
+     * <p>If this exception stops the core bootstrapping of the tracer, then {@link #markIncomplete()}
+     * should also be called.
+     */
+    public abstract void onError(Throwable t);
+
+    /**
+     * Indicates an exception that occurred during the bootstrapping process that left initialization
+     * incomplete. Equivalent to calling {@link #onError(Throwable)} and {@link #markIncomplete()}
      */
-    BootstrapProxy(final Object bootstrapInitTelemetry) {
-      this.bootstrapInitTelemetry = bootstrapInitTelemetry;
+    public abstract void onFatalError(Throwable t);
+
+    /**
+     * Indicates that an exception conditional occurred during the bootstrapping process. By default
+     * the exceptional condition is assumed to NOT have fully stopped the initialization of the
+     * tracer.
+     *
+     * <p>If this exception stops the core bootstrapping of the tracer, then {@link #markIncomplete()}
+     * should also be called.
+     */
+    public abstract void onError(String reasonCode);
+
+    /**
+     * Marks bootstrapping of tracer as an incomplete Should only be called when a core (e.g.
+     * non-optional) component fails to initialize
+     */
+    public abstract void markIncomplete();
+
+    /** No telemetry - used for delayed initialization outside bootstrap invocation */
+    static final class NoOp extends InitializationTelemetry {
+        static final NoOp INSTANCE = new NoOp();
+
+        NoOp() {}
+
+        @Override
+        public void onAbort(String reasonCode) {}
+
+        @Override
+        public void onError(String reasonCode) {}
+
+        @Override
+        public void onError(Throwable t) {}
+
+        @Override
+        public void onFatalError(Throwable t) {}
+
+        @Override
+        public void markIncomplete() {}
     }
 
-    @Override
-    public void onAbort(String reasonCode) {
-      MethodHandle bmh_onAbortString = this.bmh_onAbortString;
-      if (bmh_onAbortString == null) {
-        bmh_onAbortString = findBoundHandle("onAbort", String.class);
-        this.bmh_onAbortString = bmh_onAbortString;
-      }
-      if (bmh_onAbortString != null) {
-        try {
-          bmh_onAbortString.invokeExact(reasonCode);
-        } catch (Throwable t) {
-          // ignore
+    /** Reflective proxy to BootstrapInitializationTelemetry */
+    static final class BootstrapProxy extends InitializationTelemetry {
+        private final Object bootstrapInitTelemetry;
+        private volatile MethodHandle bmh_onAbortString;
+        private volatile MethodHandle bmh_onErrorString;
+        private volatile MethodHandle bmh_onErrorThrowable;
+        private volatile MethodHandle bmh_onFatalErrorThrowable;
+        private volatile MethodHandle bmh_markIncomplete;
+
+        // DQH - Decided not to eager access MethodHandles, since exceptions are uncommon
+        // However, MethodHandles are cached on lookup
+
+        /**
+         * @param bootstrapInitTelemetry - non-null BootstrapInitializationTelemetry
+         */
+        BootstrapProxy(final Object bootstrapInitTelemetry) {
+            this.bootstrapInitTelemetry = bootstrapInitTelemetry;
         }
-      }
-    }
 
-    @Override
-    public void onError(String reasonCode) {
-      MethodHandle bmh_onErrorString = this.bmh_onErrorString;
-      if (bmh_onErrorString == null) {
-        bmh_onErrorString = findBoundHandle("onError", String.class);
-        this.bmh_onErrorString = bmh_onErrorString;
-      }
-      if (bmh_onErrorString != null) {
-        try {
-          bmh_onErrorString.invokeExact(reasonCode);
-        } catch (Throwable t) {
-          // ignore
+        @Override
+        public void onAbort(String reasonCode) {
+            MethodHandle bmh_onAbortString = this.bmh_onAbortString;
+            if (bmh_onAbortString == null) {
+                bmh_onAbortString = findBoundHandle("onAbort", String.class);
+                this.bmh_onAbortString = bmh_onAbortString;
+            }
+            if (bmh_onAbortString != null) {
+                try {
+                    bmh_onAbortString.invokeExact(reasonCode);
+                } catch (Throwable t) {
+                    // ignore
+                }
+            }
         }
-      }
-    }
 
-    @Override
-    public void onError(Throwable cause) {
-      MethodHandle bmh_onErrorThrowable = this.bmh_onErrorThrowable;
-      if (bmh_onErrorThrowable == null) {
-        bmh_onErrorThrowable = findBoundHandle("onError", Throwable.class);
-        this.bmh_onErrorThrowable = bmh_onErrorThrowable;
-      }
-      if (bmh_onErrorThrowable != null) {
-        try {
-          bmh_onErrorThrowable.invokeExact(cause);
-        } catch (Throwable t) {
-          // ignore
+        @Override
+        public void onError(String reasonCode) {
+            MethodHandle bmh_onErrorString = this.bmh_onErrorString;
+            if (bmh_onErrorString == null) {
+                bmh_onErrorString = findBoundHandle("onError", String.class);
+                this.bmh_onErrorString = bmh_onErrorString;
+            }
+            if (bmh_onErrorString != null) {
+                try {
+                    bmh_onErrorString.invokeExact(reasonCode);
+                } catch (Throwable t) {
+                    // ignore
+                }
+            }
         }
-      }
-    }
 
-    @Override
-    public void onFatalError(Throwable cause) {
-      MethodHandle bmh_onFatalErrorThrowable = this.bmh_onFatalErrorThrowable;
-      if (bmh_onFatalErrorThrowable == null) {
-        bmh_onFatalErrorThrowable = findBoundHandle("onFatalError", Throwable.class);
-        this.bmh_onFatalErrorThrowable = bmh_onFatalErrorThrowable;
-      }
-      if (bmh_onFatalErrorThrowable != null) {
-        try {
-          bmh_onFatalErrorThrowable.invokeExact(cause);
-        } catch (Throwable t) {
-          // ignore
+        @Override
+        public void onError(Throwable cause) {
+            MethodHandle bmh_onErrorThrowable = this.bmh_onErrorThrowable;
+            if (bmh_onErrorThrowable == null) {
+                bmh_onErrorThrowable = findBoundHandle("onError", Throwable.class);
+                this.bmh_onErrorThrowable = bmh_onErrorThrowable;
+            }
+            if (bmh_onErrorThrowable != null) {
+                try {
+                    bmh_onErrorThrowable.invokeExact(cause);
+                } catch (Throwable t) {
+                    // ignore
+                }
+            }
         }
-      }
-    }
 
-    @Override
-    public void markIncomplete() {
-      MethodHandle bmh_markIncomplete = this.bmh_markIncomplete;
-      if (bmh_markIncomplete == null) {
-        bmh_markIncomplete = findBoundHandle("markIncomplete");
-        this.bmh_markIncomplete = bmh_markIncomplete;
-      }
-      if (bmh_markIncomplete != null) {
-        try {
-          bmh_markIncomplete.invokeExact();
-        } catch (Throwable t) {
-          // ignore
+        @Override
+        public void onFatalError(Throwable cause) {
+            MethodHandle bmh_onFatalErrorThrowable = this.bmh_onFatalErrorThrowable;
+            if (bmh_onFatalErrorThrowable == null) {
+                bmh_onFatalErrorThrowable = findBoundHandle("onFatalError", Throwable.class);
+                this.bmh_onFatalErrorThrowable = bmh_onFatalErrorThrowable;
+            }
+            if (bmh_onFatalErrorThrowable != null) {
+                try {
+                    bmh_onFatalErrorThrowable.invokeExact(cause);
+                } catch (Throwable t) {
+                    // ignore
+                }
+            }
         }
-      }
-    }
 
-    private final MethodHandle findBoundHandle(String name, Class<?> paramType) {
-      try {
-        MethodHandle virtualHandle =
-            MethodHandles.publicLookup()
-                .findVirtual(
-                    bootstrapInitTelemetry.getClass(),
-                    name,
-                    MethodType.methodType(void.class, paramType));
-
-        return virtualHandle.bindTo(bootstrapInitTelemetry);
-      } catch (NoSuchMethodException | IllegalAccessException e) {
-        return null;
-      }
-    }
+        @Override
+        public void markIncomplete() {
+            MethodHandle bmh_markIncomplete = this.bmh_markIncomplete;
+            if (bmh_markIncomplete == null) {
+                bmh_markIncomplete = findBoundHandle("markIncomplete");
+                this.bmh_markIncomplete = bmh_markIncomplete;
+            }
+            if (bmh_markIncomplete != null) {
+                try {
+                    bmh_markIncomplete.invokeExact();
+                } catch (Throwable t) {
+                    // ignore
+                }
+            }
+        }
+
+        private final MethodHandle findBoundHandle(String name, Class<?> paramType) {
+            try {
+                MethodHandle virtualHandle = MethodHandles.publicLookup()
+                        .findVirtual(
+                                bootstrapInitTelemetry.getClass(), name, MethodType.methodType(void.class, paramType));
 
-    private final MethodHandle findBoundHandle(String name) {
-      try {
-        MethodHandle virtualHandle =
-            MethodHandles.publicLookup()
-                .findVirtual(
-                    bootstrapInitTelemetry.getClass(), name, MethodType.methodType(void.class));
-
-        return virtualHandle.bindTo(bootstrapInitTelemetry);
-      } catch (NoSuchMethodException | IllegalAccessException e) {
-        return null;
-      }
+                return virtualHandle.bindTo(bootstrapInitTelemetry);
+            } catch (NoSuchMethodException | IllegalAccessException e) {
+                return null;
+            }
+        }
+
+        private final MethodHandle findBoundHandle(String name) {
+            try {
+                MethodHandle virtualHandle = MethodHandles.publicLookup()
+                        .findVirtual(bootstrapInitTelemetry.getClass(), name, MethodType.methodType(void.class));
+
+                return virtualHandle.bindTo(bootstrapInitTelemetry);
+            } catch (NoSuchMethodException | IllegalAccessException e) {
+                return null;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstanceStore.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstanceStore.java
index 6f7e4f7b560..719a938572c 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstanceStore.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstanceStore.java
@@ -16,65 +16,65 @@
  */
 public final class InstanceStore<T> {
 
-  @SuppressWarnings("rawtypes")
-  private static final ClassValue<InstanceStore> classInstanceStore =
-      GenericClassValue.of(type -> new InstanceStore<>());
+    @SuppressWarnings("rawtypes")
+    private static final ClassValue<InstanceStore> classInstanceStore =
+            GenericClassValue.of(type -> new InstanceStore<>());
 
-  /**
-   * @return global store of instances with the same common type
-   */
-  @SuppressWarnings("unchecked")
-  public static <T> InstanceStore<T> of(Class<T> type) {
-    return classInstanceStore.get(type);
-  }
+    /**
+     * @return global store of instances with the same common type
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> InstanceStore<T> of(Class<T> type) {
+        return classInstanceStore.get(type);
+    }
 
-  // simple approach; instance stores don't need highly concurrent access or weak keys
-  private final Map<String, T> store = Collections.synchronizedMap(new HashMap<>());
+    // simple approach; instance stores don't need highly concurrent access or weak keys
+    private final Map<String, T> store = Collections.synchronizedMap(new HashMap<>());
 
-  private InstanceStore() {}
+    private InstanceStore() {}
 
-  /**
-   * Gets the instance of {@code T} currently associated with the given key.
-   *
-   * @param key the instance key
-   * @return the associated instance; {@code null} if there was none
-   */
-  @Nullable
-  public T get(String key) {
-    return store.get(key);
-  }
+    /**
+     * Gets the instance of {@code T} currently associated with the given key.
+     *
+     * @param key the instance key
+     * @return the associated instance; {@code null} if there was none
+     */
+    @Nullable
+    public T get(String key) {
+        return store.get(key);
+    }
 
-  /**
-   * Unconditionally associates an instance of {@code T} with the given key.
-   *
-   * @param key the instance key
-   * @param instance the instance
-   */
-  public void put(String key, T instance) {
-    store.put(key, instance);
-  }
+    /**
+     * Unconditionally associates an instance of {@code T} with the given key.
+     *
+     * @param key the instance key
+     * @param instance the instance
+     */
+    public void put(String key, T instance) {
+        store.put(key, instance);
+    }
 
-  /**
-   * If the given key is not already associated with an instance, create one using the factory and
-   * associate it. Unlike {@link java.util.Map#putIfAbsent} this always returns the final associated
-   * instance.
-   *
-   * @param key the instance key
-   * @param instanceFactory the factory to create instances
-   * @return final associated instance
-   */
-  public T getOrCreate(String key, Supplier<T> instanceFactory) {
-    return store.computeIfAbsent(key, k -> instanceFactory.get());
-  }
+    /**
+     * If the given key is not already associated with an instance, create one using the factory and
+     * associate it. Unlike {@link java.util.Map#putIfAbsent} this always returns the final associated
+     * instance.
+     *
+     * @param key the instance key
+     * @param instanceFactory the factory to create instances
+     * @return final associated instance
+     */
+    public T getOrCreate(String key, Supplier<T> instanceFactory) {
+        return store.computeIfAbsent(key, k -> instanceFactory.get());
+    }
 
-  /**
-   * Removes the instance of {@code T} currently associated with the given key.
-   *
-   * @param key the instance key
-   * @return the previously associated instance; {@code null} if there was none
-   */
-  @Nullable
-  public T remove(String key) {
-    return store.remove(key);
-  }
+    /**
+     * Removes the instance of {@code T} currently associated with the given key.
+     *
+     * @param key the instance key
+     * @return the previously associated instance; {@code null} if there was none
+     */
+    @Nullable
+    public T remove(String key) {
+        return store.remove(key);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstrumentationClassLoader.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstrumentationClassLoader.java
index 42e45030777..63e741b6d21 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstrumentationClassLoader.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstrumentationClassLoader.java
@@ -5,30 +5,29 @@
 
 /** Holds Muzzle and Instrumentation classes, so they can be unloaded separately to the agent. */
 final class InstrumentationClassLoader extends SecureClassLoader {
-  static {
-    ClassLoader.registerAsParallelCapable();
-  }
+    static {
+        ClassLoader.registerAsParallelCapable();
+    }
 
-  InstrumentationClassLoader(DatadogClassLoader parent) {
-    super(parent);
-  }
+    InstrumentationClassLoader(DatadogClassLoader parent) {
+        super(parent);
+    }
 
-  Class<?> loadInstrumentationClass(String name, CodeSource agentCodeSource)
-      throws ClassNotFoundException {
-    synchronized (getClassLoadingLock(name)) {
-      Class<?> instrumentationClass = findLoadedClass(name);
-      if (null != instrumentationClass) {
-        return instrumentationClass;
-      } else {
-        // load bytecode from dd-java-agent jar, but define the class locally
-        byte[] buf = ((DatadogClassLoader) getParent()).loadClassBytes(name);
-        return defineClass(name, buf, 0, buf.length, agentCodeSource);
-      }
+    Class<?> loadInstrumentationClass(String name, CodeSource agentCodeSource) throws ClassNotFoundException {
+        synchronized (getClassLoadingLock(name)) {
+            Class<?> instrumentationClass = findLoadedClass(name);
+            if (null != instrumentationClass) {
+                return instrumentationClass;
+            } else {
+                // load bytecode from dd-java-agent jar, but define the class locally
+                byte[] buf = ((DatadogClassLoader) getParent()).loadClassBytes(name);
+                return defineClass(name, buf, 0, buf.length, agentCodeSource);
+            }
+        }
     }
-  }
 
-  @Override
-  public String toString() {
-    return "instrumentation";
-  }
+    @Override
+    public String toString() {
+        return "instrumentation";
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstrumentationContext.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstrumentationContext.java
index 5768cff4d3f..fdaded8c08e 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstrumentationContext.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstrumentationContext.java
@@ -2,45 +2,44 @@
 
 /** Instrumentation Context API */
 public class InstrumentationContext {
-  private InstrumentationContext() {}
+    private InstrumentationContext() {}
 
-  /**
-   * Find a {@link ContextStore} instance for given key class and context class.
-   *
-   * <p>Conceptually this can be thought of as a map lookup to fetch a second level map given
-   * keyClass.
-   *
-   * <p>However, the implementation is actually provided by bytecode transformation for performance
-   * reasons.
-   *
-   * <p>This method must only be called within an Advice class.
-   *
-   * @param keyClass The key class context is attached to.
-   * @param contextClass The context class attached to the user class.
-   * @param <K> key class
-   * @param <C> context class
-   * @return The instance of context store for given arguments.
-   */
-  public static <K, C> ContextStore<K, C> get(
-      final Class<K> keyClass, final Class<C> contextClass) {
-    throw new RuntimeException(
-        "Calls to this method will be rewritten by Instrumentation Context Provider (e.g. FieldBackedProvider)."
-            + " If you get this exception, this method has not been rewritten."
-            + " Ensure instrumentation class has a contextStore method and the call to InstrumentationContext.get happens directly in an instrumentation Advice class."
-            + " See how_instrumentations_work.md for details.");
-  }
+    /**
+     * Find a {@link ContextStore} instance for given key class and context class.
+     *
+     * <p>Conceptually this can be thought of as a map lookup to fetch a second level map given
+     * keyClass.
+     *
+     * <p>However, the implementation is actually provided by bytecode transformation for performance
+     * reasons.
+     *
+     * <p>This method must only be called within an Advice class.
+     *
+     * @param keyClass The key class context is attached to.
+     * @param contextClass The context class attached to the user class.
+     * @param <K> key class
+     * @param <C> context class
+     * @return The instance of context store for given arguments.
+     */
+    public static <K, C> ContextStore<K, C> get(final Class<K> keyClass, final Class<C> contextClass) {
+        throw new RuntimeException(
+                "Calls to this method will be rewritten by Instrumentation Context Provider (e.g. FieldBackedProvider)."
+                        + " If you get this exception, this method has not been rewritten."
+                        + " Ensure instrumentation class has a contextStore method and the call to InstrumentationContext.get happens directly in an instrumentation Advice class."
+                        + " See how_instrumentations_work.md for details.");
+    }
 
-  /**
-   * Find a {@link ContextStore} instance for given key class name and context class name.
-   *
-   * @apiNote This is a fallback for when the key/context are only available as string constants at
-   *     compile time, in all other situations prefer the method that accepts class literals
-   */
-  public static <K, C> ContextStore<K, C> get(final String keyClass, final String contextClass) {
-    throw new RuntimeException(
-        "Calls to this method will be rewritten by Instrumentation Context Provider (e.g. FieldBackedProvider)."
-            + " If you get this exception, this method has not been rewritten."
-            + " Ensure instrumentation class has a contextStore method and the call to InstrumentationContext.get happens directly in an instrumentation Advice class."
-            + " See how_instrumentations_work.md for details.");
-  }
+    /**
+     * Find a {@link ContextStore} instance for given key class name and context class name.
+     *
+     * @apiNote This is a fallback for when the key/context are only available as string constants at
+     *     compile time, in all other situations prefer the method that accepts class literals
+     */
+    public static <K, C> ContextStore<K, C> get(final String keyClass, final String contextClass) {
+        throw new RuntimeException(
+                "Calls to this method will be rewritten by Instrumentation Context Provider (e.g. FieldBackedProvider)."
+                        + " If you get this exception, this method has not been rewritten."
+                        + " Ensure instrumentation class has a contextStore method and the call to InstrumentationContext.get happens directly in an instrumentation Advice class."
+                        + " See how_instrumentations_work.md for details.");
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstrumentationErrors.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstrumentationErrors.java
index b2bc1702805..58030104ecb 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstrumentationErrors.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstrumentationErrors.java
@@ -8,55 +8,55 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 public class InstrumentationErrors {
-  private static final AtomicLong COUNTER = new AtomicLong();
-
-  private static final class Detailed {
-    static final List<String> ERRORS = new CopyOnWriteArrayList<>();
-  }
-
-  private static volatile boolean detailed;
-
-  /** Record an error occurred without any detail about it. */
-  public static void recordError() {
-    COUNTER.incrementAndGet();
-  }
-
-  /** Record an error occurred, including its stack trace. */
-  public static Throwable recordError(Throwable error) {
-    COUNTER.incrementAndGet();
-    StringWriter detail = new StringWriter();
-    error.printStackTrace(new PrintWriter(detail));
-    Detailed.ERRORS.add(detail.toString());
-    detailed = true;
-    return error; // keep throwable at top of the stack
-  }
-
-  @VisibleForTesting
-  public static void resetErrors() {
-    COUNTER.set(0);
-    if (detailed) {
-      Detailed.ERRORS.clear();
-      detailed = false;
+    private static final AtomicLong COUNTER = new AtomicLong();
+
+    private static final class Detailed {
+        static final List<String> ERRORS = new CopyOnWriteArrayList<>();
+    }
+
+    private static volatile boolean detailed;
+
+    /** Record an error occurred without any detail about it. */
+    public static void recordError() {
+        COUNTER.incrementAndGet();
+    }
+
+    /** Record an error occurred, including its stack trace. */
+    public static Throwable recordError(Throwable error) {
+        COUNTER.incrementAndGet();
+        StringWriter detail = new StringWriter();
+        error.printStackTrace(new PrintWriter(detail));
+        Detailed.ERRORS.add(detail.toString());
+        detailed = true;
+        return error; // keep throwable at top of the stack
     }
-  }
-
-  /**
-   * @return {@code true} if no errors were recorded; otherwise {@code false}
-   */
-  public static boolean noErrors() {
-    return COUNTER.get() == 0;
-  }
-
-  /**
-   * @return a human-readable description of the errors recorded so far
-   */
-  public static String describeErrors() {
-    StringBuilder buf = new StringBuilder().append(COUNTER.get()).append(" instrumentation errors");
-    if (detailed) {
-      for (String error : Detailed.ERRORS) {
-        buf.append("\n---\n").append(error);
-      }
+
+    @VisibleForTesting
+    public static void resetErrors() {
+        COUNTER.set(0);
+        if (detailed) {
+            Detailed.ERRORS.clear();
+            detailed = false;
+        }
+    }
+
+    /**
+     * @return {@code true} if no errors were recorded; otherwise {@code false}
+     */
+    public static boolean noErrors() {
+        return COUNTER.get() == 0;
+    }
+
+    /**
+     * @return a human-readable description of the errors recorded so far
+     */
+    public static String describeErrors() {
+        StringBuilder buf = new StringBuilder().append(COUNTER.get()).append(" instrumentation errors");
+        if (detailed) {
+            for (String error : Detailed.ERRORS) {
+                buf.append("\n---\n").append(error);
+            }
+        }
+        return buf.toString();
     }
-    return buf.toString();
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Library.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Library.java
index 33d202f8b22..8f6804d68d0 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Library.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Library.java
@@ -6,25 +6,25 @@
 
 /** Tracks third-party libraries that may need special handling during agent startup. */
 public enum Library {
-  WILDFLY;
+    WILDFLY;
 
-  /**
-   * Best-effort detection of libraries potentially used by the application. This is called at boot
-   * so we need to be very careful how many checks happen here. Some library use may not be visible
-   * to the agent at this point.
-   */
-  public static EnumSet<Library> detectLibraries(final Logger log) {
-    final EnumSet<Library> libraries = EnumSet.noneOf(Library.class);
+    /**
+     * Best-effort detection of libraries potentially used by the application. This is called at boot
+     * so we need to be very careful how many checks happen here. Some library use may not be visible
+     * to the agent at this point.
+     */
+    public static EnumSet<Library> detectLibraries(final Logger log) {
+        final EnumSet<Library> libraries = EnumSet.noneOf(Library.class);
 
-    final String jbossHome = EnvironmentVariables.get("JBOSS_HOME");
-    if (jbossHome != null) {
-      log.debug("Env - jboss: {}", jbossHome);
-      libraries.add(WILDFLY);
-    }
+        final String jbossHome = EnvironmentVariables.get("JBOSS_HOME");
+        if (jbossHome != null) {
+            log.debug("Env - jboss: {}", jbossHome);
+            libraries.add(WILDFLY);
+        }
 
-    if (!libraries.isEmpty()) {
-      log.debug("Detected {}", libraries);
+        if (!libraries.isEmpty()) {
+            log.debug("Detected {}", libraries);
+        }
+        return libraries;
     }
-    return libraries;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/PatchLogger.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/PatchLogger.java
index eea5b4adbb7..a6edf172c7e 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/PatchLogger.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/PatchLogger.java
@@ -11,131 +11,129 @@
  * <p>Shadow rewrites will redirect those calls to this class, which will return a safe logger.
  */
 public class PatchLogger {
-  private static final PatchLogger SAFE_LOGGER = new PatchLogger("datadogSafeLogger", "bundle");
-
-  public static PatchLogger getLogger(final String name) {
-    return SAFE_LOGGER;
-  }
-
-  public static PatchLogger getLogger(final String name, final String resourceBundleName) {
-    return SAFE_LOGGER;
-  }
-
-  public static PatchLogger getAnonymousLogger() {
-    return SAFE_LOGGER;
-  }
-
-  public static PatchLogger getAnonymousLogger(final String resourceBundleName) {
-    return SAFE_LOGGER;
-  }
-
-  private PatchLogger(final String name, final String resourceBundleName) {
-    // super(name, resourceBundleName);
-  }
+    private static final PatchLogger SAFE_LOGGER = new PatchLogger("datadogSafeLogger", "bundle");
+
+    public static PatchLogger getLogger(final String name) {
+        return SAFE_LOGGER;
+    }
+
+    public static PatchLogger getLogger(final String name, final String resourceBundleName) {
+        return SAFE_LOGGER;
+    }
+
+    public static PatchLogger getAnonymousLogger() {
+        return SAFE_LOGGER;
+    }
+
+    public static PatchLogger getAnonymousLogger(final String resourceBundleName) {
+        return SAFE_LOGGER;
+    }
 
-  // providing a bunch of empty log methods
+    private PatchLogger(final String name, final String resourceBundleName) {
+        // super(name, resourceBundleName);
+    }
 
-  public void log(final LogRecord record) {}
+    // providing a bunch of empty log methods
 
-  public void log(final Level level, final String msg) {}
+    public void log(final LogRecord record) {}
 
-  public void log(final Level level, final String msg, final Object param1) {}
+    public void log(final Level level, final String msg) {}
 
-  public void log(final Level level, final String msg, final Object[] params) {}
+    public void log(final Level level, final String msg, final Object param1) {}
 
-  public void log(final Level level, final String msg, final Throwable thrown) {}
+    public void log(final Level level, final String msg, final Object[] params) {}
 
-  public void logp(
-      final Level level, final String sourceClass, final String sourceMethod, final String msg) {}
+    public void log(final Level level, final String msg, final Throwable thrown) {}
 
-  public void logp(
-      final Level level,
-      final String sourceClass,
-      final String sourceMethod,
-      final String msg,
-      final Object param1) {}
+    public void logp(final Level level, final String sourceClass, final String sourceMethod, final String msg) {}
 
-  public void logp(
-      final Level level,
-      final String sourceClass,
-      final String sourceMethod,
-      final String msg,
-      final Object[] params) {}
+    public void logp(
+            final Level level,
+            final String sourceClass,
+            final String sourceMethod,
+            final String msg,
+            final Object param1) {}
 
-  public void logp(
-      final Level level,
-      final String sourceClass,
-      final String sourceMethod,
-      final String msg,
-      final Throwable thrown) {}
+    public void logp(
+            final Level level,
+            final String sourceClass,
+            final String sourceMethod,
+            final String msg,
+            final Object[] params) {}
 
-  public void logrb(
-      final Level level,
-      final String sourceClass,
-      final String sourceMethod,
-      final String bundleName,
-      final String msg) {}
+    public void logp(
+            final Level level,
+            final String sourceClass,
+            final String sourceMethod,
+            final String msg,
+            final Throwable thrown) {}
 
-  public void logrb(
-      final Level level,
-      final String sourceClass,
-      final String sourceMethod,
-      final String bundleName,
-      final String msg,
-      final Object param1) {}
+    public void logrb(
+            final Level level,
+            final String sourceClass,
+            final String sourceMethod,
+            final String bundleName,
+            final String msg) {}
 
-  public void logrb(
-      final Level level,
-      final String sourceClass,
-      final String sourceMethod,
-      final String bundleName,
-      final String msg,
-      final Object[] params) {}
+    public void logrb(
+            final Level level,
+            final String sourceClass,
+            final String sourceMethod,
+            final String bundleName,
+            final String msg,
+            final Object param1) {}
 
-  public void logrb(
-      final Level level,
-      final String sourceClass,
-      final String sourceMethod,
-      final ResourceBundle bundle,
-      final String msg,
-      final Object... params) {}
+    public void logrb(
+            final Level level,
+            final String sourceClass,
+            final String sourceMethod,
+            final String bundleName,
+            final String msg,
+            final Object[] params) {}
 
-  public void logrb(
-      final Level level,
-      final String sourceClass,
-      final String sourceMethod,
-      final String bundleName,
-      final String msg,
-      final Throwable thrown) {}
+    public void logrb(
+            final Level level,
+            final String sourceClass,
+            final String sourceMethod,
+            final ResourceBundle bundle,
+            final String msg,
+            final Object... params) {}
 
-  public void logrb(
-      final Level level,
-      final String sourceClass,
-      final String sourceMethod,
-      final ResourceBundle bundle,
-      final String msg,
-      final Throwable thrown) {}
+    public void logrb(
+            final Level level,
+            final String sourceClass,
+            final String sourceMethod,
+            final String bundleName,
+            final String msg,
+            final Throwable thrown) {}
 
-  public void severe(final String msg) {}
-
-  public void warning(final String msg) {}
+    public void logrb(
+            final Level level,
+            final String sourceClass,
+            final String sourceMethod,
+            final ResourceBundle bundle,
+            final String msg,
+            final Throwable thrown) {}
 
-  public void info(final String msg) {}
-
-  public void config(final String msg) {}
+    public void severe(final String msg) {}
 
-  public void fine(final String msg) {}
-
-  public void finer(final String msg) {}
+    public void warning(final String msg) {}
 
-  public void finest(final String msg) {}
-
-  public void throwing(
-      final String sourceClass, final String sourceMethod, final Throwable thrown) {}
+    public void info(final String msg) {}
 
-  public void setLevel(final Level newLevel) throws SecurityException {}
-
-  public boolean isLoggable(final Level level) {
-    return false;
-  }
+    public void config(final String msg) {}
+
+    public void fine(final String msg) {}
+
+    public void finer(final String msg) {}
+
+    public void finest(final String msg) {}
+
+    public void throwing(final String sourceClass, final String sourceMethod, final Throwable thrown) {}
+
+    public void setLevel(final Level newLevel) throws SecurityException {}
+
+    public boolean isLoggable(final Level level) {
+        return false;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/WeakMap.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/WeakMap.java
index 2fedd001284..05291821c87 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/WeakMap.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/WeakMap.java
@@ -4,36 +4,36 @@
 import java.util.function.Function;
 
 public interface WeakMap<K, V> {
-  int size();
+    int size();
 
-  boolean containsKey(K target);
+    boolean containsKey(K target);
 
-  V get(K key);
+    V get(K key);
 
-  void put(K key, V value);
+    void put(K key, V value);
 
-  void putIfAbsent(K key, V value);
+    void putIfAbsent(K key, V value);
 
-  V computeIfAbsent(K key, Function<? super K, ? extends V> supplier);
+    V computeIfAbsent(K key, Function<? super K, ? extends V> supplier);
 
-  V remove(K key);
+    V remove(K key);
 
-  abstract class Supplier {
-    private static volatile Supplier SUPPLIER;
+    abstract class Supplier {
+        private static volatile Supplier SUPPLIER;
 
-    protected abstract <K, V> WeakMap<K, V> get();
+        protected abstract <K, V> WeakMap<K, V> get();
 
-    public static <K, V> WeakMap<K, V> newWeakMap() {
-      return SUPPLIER.get();
-    }
+        public static <K, V> WeakMap<K, V> newWeakMap() {
+            return SUPPLIER.get();
+        }
 
-    @SuppressFBWarnings(
-        value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-        justification = "Agent-internal holder; Class lock does not escape to application code")
-    public static synchronized void registerIfAbsent(Supplier supplier) {
-      if (null == SUPPLIER) {
-        SUPPLIER = supplier;
-      }
+        @SuppressFBWarnings(
+                value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+                justification = "Agent-internal holder; Class lock does not escape to application code")
+        public static synchronized void registerIfAbsent(Supplier supplier) {
+            if (null == SUPPLIER) {
+                SUPPLIER = supplier;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/WeakMapPerStore.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/WeakMapPerStore.java
index da184317865..fddab15d33d 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/WeakMapPerStore.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/WeakMapPerStore.java
@@ -12,80 +12,80 @@
  */
 public final class WeakMapPerStore<K, V> {
 
-  /** Injection helper that immediately delegates to the weak-map for the given context store. */
-  public static Object get(final Object key, final int storeId) {
-    return getContextStore(storeId).weakStore().get(key);
-  }
+    /** Injection helper that immediately delegates to the weak-map for the given context store. */
+    public static Object get(final Object key, final int storeId) {
+        return getContextStore(storeId).weakStore().get(key);
+    }
 
-  /** Injection helper that immediately delegates to the weak-map for the given context store. */
-  public static void put(final Object key, final int storeId, final Object context) {
-    getContextStore(storeId).weakStore().put(key, context);
-  }
+    /** Injection helper that immediately delegates to the weak-map for the given context store. */
+    public static void put(final Object key, final int storeId, final Object context) {
+        getContextStore(storeId).weakStore().put(key, context);
+    }
 
-  private static final int MAX_SIZE = 50_000;
+    private static final int MAX_SIZE = 50_000;
 
-  private final WeakMap<Object, Object> map = WeakMap.Supplier.newWeakMap();
+    private final WeakMap<Object, Object> map = WeakMap.Supplier.newWeakMap();
 
-  WeakMapPerStore() {}
+    WeakMapPerStore() {}
 
-  @SuppressWarnings("unchecked")
-  V get(final K key) {
-    return (V) map.get(key);
-  }
+    @SuppressWarnings("unchecked")
+    V get(final K key) {
+        return (V) map.get(key);
+    }
 
-  void put(final K key, final V context) {
-    if (map.size() < MAX_SIZE) {
-      map.put(key, context);
+    void put(final K key, final V context) {
+        if (map.size() < MAX_SIZE) {
+            map.put(key, context);
+        }
     }
-  }
 
-  V getOrPut(final K key, final V context) {
-    V existingContext = get(key);
-    if (null == existingContext) {
-      // This whole part with using synchronized is only because
-      // we want to avoid prematurely calling the factory if
-      // someone else is doing a getOrPut at the same time.
-      // There is still the possibility that there is a concurrent
-      // call to put that will win, but that is indistinguishable
-      // from the put happening right after the getOrPut.
-      synchronized (map) {
-        existingContext = get(key);
+    V getOrPut(final K key, final V context) {
+        V existingContext = get(key);
         if (null == existingContext) {
-          existingContext = context;
-          put(key, existingContext);
+            // This whole part with using synchronized is only because
+            // we want to avoid prematurely calling the factory if
+            // someone else is doing a getOrPut at the same time.
+            // There is still the possibility that there is a concurrent
+            // call to put that will win, but that is indistinguishable
+            // from the put happening right after the getOrPut.
+            synchronized (map) {
+                existingContext = get(key);
+                if (null == existingContext) {
+                    existingContext = context;
+                    put(key, existingContext);
+                }
+            }
         }
-      }
+        return existingContext;
     }
-    return existingContext;
-  }
 
-  V getOrCompute(K key, Function<? super K, V> contextFactory) {
-    V existingContext = get(key);
-    if (null == existingContext) {
-      // This whole part with using synchronized is only because
-      // we want to avoid prematurely calling the factory if
-      // someone else is doing a getOrCompute at the same time.
-      // There is still the possibility that there is a concurrent
-      // call to put that will win, but that is indistinguishable
-      // from the put happening right after the getOrCompute.
-      synchronized (map) {
-        existingContext = get(key);
+    V getOrCompute(K key, Function<? super K, V> contextFactory) {
+        V existingContext = get(key);
         if (null == existingContext) {
-          existingContext = contextFactory.apply(key);
-          put(key, existingContext);
+            // This whole part with using synchronized is only because
+            // we want to avoid prematurely calling the factory if
+            // someone else is doing a getOrCompute at the same time.
+            // There is still the possibility that there is a concurrent
+            // call to put that will win, but that is indistinguishable
+            // from the put happening right after the getOrCompute.
+            synchronized (map) {
+                existingContext = get(key);
+                if (null == existingContext) {
+                    existingContext = contextFactory.apply(key);
+                    put(key, existingContext);
+                }
+            }
         }
-      }
+        return existingContext;
     }
-    return existingContext;
-  }
 
-  @SuppressWarnings("unchecked")
-  V remove(final K key) {
-    return (V) map.remove(key);
-  }
+    @SuppressWarnings("unchecked")
+    V remove(final K key) {
+        return (V) map.remove(key);
+    }
 
-  @VisibleForTesting
-  int size() {
-    return map.size();
-  }
+    @VisibleForTesting
+    int size() {
+        return map.size();
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/aot/PlaceholderTraceInterceptor.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/aot/PlaceholderTraceInterceptor.java
index 5b18ea5f075..4fddf8fc13c 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/aot/PlaceholderTraceInterceptor.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/aot/PlaceholderTraceInterceptor.java
@@ -6,18 +6,17 @@
 
 /** Placeholder {@link TraceInterceptor} used to temporarily work around an AOT bug. */
 public final class PlaceholderTraceInterceptor implements TraceInterceptor {
-  public static final PlaceholderTraceInterceptor INSTANCE = new PlaceholderTraceInterceptor();
+    public static final PlaceholderTraceInterceptor INSTANCE = new PlaceholderTraceInterceptor();
 
-  private PlaceholderTraceInterceptor() {}
+    private PlaceholderTraceInterceptor() {}
 
-  @Override
-  public Collection<? extends MutableSpan> onTraceComplete(
-      Collection<? extends MutableSpan> trace) {
-    return trace; // maintain original trace
-  }
+    @Override
+    public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
+        return trace; // maintain original trace
+    }
 
-  @Override
-  public int priority() {
-    return 0;
-  }
+    @Override
+    public int priority() {
+        return 0;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/aot/TraceApiTransformer.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/aot/TraceApiTransformer.java
index 07c5984775e..267070f5586 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/aot/TraceApiTransformer.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/aot/TraceApiTransformer.java
@@ -33,124 +33,118 @@
  * <p>Note these transformations are not persisted, so in production the original code is used.
  */
 final class TraceApiTransformer implements ClassFileTransformer {
-  private static final ClassLoader SYSTEM_CLASS_LOADER = ClassLoader.getSystemClassLoader();
-
-  static final String TRACE_INTERCEPTOR = "datadog/trace/api/interceptor/TraceInterceptor";
-
-  static final String PLACEHOLDER_TRACE_INTERCEPTOR =
-      "datadog/trace/bootstrap/aot/PlaceholderTraceInterceptor";
-
-  @Override
-  public byte[] transform(
-      ClassLoader loader,
-      String className,
-      Class<?> classBeingRedefined,
-      ProtectionDomain pd,
-      byte[] bytecode) {
-
-    // workaround only needed in the system class-loader
-    if (loader == SYSTEM_CLASS_LOADER) {
-      try {
-        ClassReader cr = new ClassReader(bytecode);
-        ClassWriter cw = new ClassWriter(cr, 0);
-        AtomicBoolean modified = new AtomicBoolean();
-        cr.accept(new TraceInterceptorPatch(cw, modified), 0);
-        // only return something when we've modified the bytecode
-        if (modified.get()) {
-          return cw.toByteArray();
-        }
-      } catch (Throwable ignore) {
-        // skip this class
-      }
-    }
-    return null; // tells the JVM to keep the original bytecode
-  }
-
-  /**
-   * Patches certain references to {@code TraceInterceptor} to workaround AOT bug:
-   *
-   * <ul>
-   *   <li>removes direct calls to {@code Tracer.addTraceInterceptor()}
-   *   <li>replaces {@code TraceInterceptor} return values with placeholders
-   * </ul>
-   */
-  static final class TraceInterceptorPatch extends ClassVisitor {
-    private final AtomicBoolean modified;
-
-    TraceInterceptorPatch(ClassVisitor cv, AtomicBoolean modified) {
-      super(ASM9, cv);
-      this.modified = modified;
-    }
+    private static final ClassLoader SYSTEM_CLASS_LOADER = ClassLoader.getSystemClassLoader();
+
+    static final String TRACE_INTERCEPTOR = "datadog/trace/api/interceptor/TraceInterceptor";
+
+    static final String PLACEHOLDER_TRACE_INTERCEPTOR = "datadog/trace/bootstrap/aot/PlaceholderTraceInterceptor";
 
     @Override
-    public MethodVisitor visitMethod(
-        int access, String name, String descriptor, String signature, String[] exceptions) {
-      MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
-      if ((access & (ACC_ABSTRACT | ACC_NATIVE)) == 0) {
-        if (descriptor.endsWith(")L" + TRACE_INTERCEPTOR + ";")) {
-          mv = new ReturnPatch(mv, modified);
+    public byte[] transform(
+            ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain pd, byte[] bytecode) {
+
+        // workaround only needed in the system class-loader
+        if (loader == SYSTEM_CLASS_LOADER) {
+            try {
+                ClassReader cr = new ClassReader(bytecode);
+                ClassWriter cw = new ClassWriter(cr, 0);
+                AtomicBoolean modified = new AtomicBoolean();
+                cr.accept(new TraceInterceptorPatch(cw, modified), 0);
+                // only return something when we've modified the bytecode
+                if (modified.get()) {
+                    return cw.toByteArray();
+                }
+            } catch (Throwable ignore) {
+                // skip this class
+            }
         }
-        return new InvokePatch(mv, modified);
-      } else {
-        return mv; // no need to patch abstract/native methods
-      }
+        return null; // tells the JVM to keep the original bytecode
     }
-  }
 
-  /** Removes direct calls to {@code Tracer.addTraceInterceptor()}. */
-  static final class InvokePatch extends MethodVisitor {
-    private final AtomicBoolean modified;
+    /**
+     * Patches certain references to {@code TraceInterceptor} to workaround AOT bug:
+     *
+     * <ul>
+     *   <li>removes direct calls to {@code Tracer.addTraceInterceptor()}
+     *   <li>replaces {@code TraceInterceptor} return values with placeholders
+     * </ul>
+     */
+    static final class TraceInterceptorPatch extends ClassVisitor {
+        private final AtomicBoolean modified;
+
+        TraceInterceptorPatch(ClassVisitor cv, AtomicBoolean modified) {
+            super(ASM9, cv);
+            this.modified = modified;
+        }
 
-    InvokePatch(MethodVisitor mv, AtomicBoolean modified) {
-      super(ASM9, mv);
-      this.modified = modified;
+        @Override
+        public MethodVisitor visitMethod(
+                int access, String name, String descriptor, String signature, String[] exceptions) {
+            MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
+            if ((access & (ACC_ABSTRACT | ACC_NATIVE)) == 0) {
+                if (descriptor.endsWith(")L" + TRACE_INTERCEPTOR + ";")) {
+                    mv = new ReturnPatch(mv, modified);
+                }
+                return new InvokePatch(mv, modified);
+            } else {
+                return mv; // no need to patch abstract/native methods
+            }
+        }
     }
 
-    @Override
-    public void visitMethodInsn(
-        int opcode, String owner, String name, String descriptor, boolean isInterface) {
-      if (INVOKEINTERFACE == opcode
-          && "datadog/trace/api/Tracer".equals(owner)
-          && "addTraceInterceptor".equals(name)
-          && ("(L" + TRACE_INTERCEPTOR + ";)Z").equals(descriptor)) {
-        // discard tracer and trace interceptor argument from call stack
-        mv.visitInsn(POP2);
-        // push substitute return value (true)
-        mv.visitInsn(ICONST_1);
-        // flag that we've modified the bytecode
-        modified.set(true);
-      } else {
-        super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-      }
-    }
-  }
+    /** Removes direct calls to {@code Tracer.addTraceInterceptor()}. */
+    static final class InvokePatch extends MethodVisitor {
+        private final AtomicBoolean modified;
 
-  /** Replaces custom {@code TraceInterceptor} return values with placeholders. */
-  static final class ReturnPatch extends MethodVisitor {
-    private final AtomicBoolean modified;
+        InvokePatch(MethodVisitor mv, AtomicBoolean modified) {
+            super(ASM9, mv);
+            this.modified = modified;
+        }
 
-    ReturnPatch(MethodVisitor mv, AtomicBoolean modified) {
-      super(ASM9, mv);
-      this.modified = modified;
+        @Override
+        public void visitMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) {
+            if (INVOKEINTERFACE == opcode
+                    && "datadog/trace/api/Tracer".equals(owner)
+                    && "addTraceInterceptor".equals(name)
+                    && ("(L" + TRACE_INTERCEPTOR + ";)Z").equals(descriptor)) {
+                // discard tracer and trace interceptor argument from call stack
+                mv.visitInsn(POP2);
+                // push substitute return value (true)
+                mv.visitInsn(ICONST_1);
+                // flag that we've modified the bytecode
+                modified.set(true);
+            } else {
+                super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+            }
+        }
     }
 
-    @Override
-    public void visitInsn(int opcode) {
-      if (ARETURN == opcode) {
-        // discard old return value from call stack
-        mv.visitInsn(POP);
-        // push our placeholder interceptor instead
-        mv.visitFieldInsn(
-            GETSTATIC,
-            PLACEHOLDER_TRACE_INTERCEPTOR,
-            "INSTANCE",
-            "L" + PLACEHOLDER_TRACE_INTERCEPTOR + ";");
-        mv.visitInsn(ARETURN);
-        // flag that we've modified the bytecode
-        modified.set(true);
-      } else {
-        super.visitInsn(opcode);
-      }
+    /** Replaces custom {@code TraceInterceptor} return values with placeholders. */
+    static final class ReturnPatch extends MethodVisitor {
+        private final AtomicBoolean modified;
+
+        ReturnPatch(MethodVisitor mv, AtomicBoolean modified) {
+            super(ASM9, mv);
+            this.modified = modified;
+        }
+
+        @Override
+        public void visitInsn(int opcode) {
+            if (ARETURN == opcode) {
+                // discard old return value from call stack
+                mv.visitInsn(POP);
+                // push our placeholder interceptor instead
+                mv.visitFieldInsn(
+                        GETSTATIC,
+                        PLACEHOLDER_TRACE_INTERCEPTOR,
+                        "INSTANCE",
+                        "L" + PLACEHOLDER_TRACE_INTERCEPTOR + ";");
+                mv.visitInsn(ARETURN);
+                // flag that we've modified the bytecode
+                modified.set(true);
+            } else {
+                super.visitInsn(opcode);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/aot/TrainingAgent.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/aot/TrainingAgent.java
index 07573bf6ab6..fac0b13fffd 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/aot/TrainingAgent.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/aot/TrainingAgent.java
@@ -5,15 +5,15 @@
 
 /** Prepares the agent for Ahead-of-Time training. */
 public final class TrainingAgent {
-  public static void start(
-      final Object bootstrapInitTelemetry,
-      final Instrumentation inst,
-      final URL agentJarURL,
-      final String agentArgs) {
+    public static void start(
+            final Object bootstrapInitTelemetry,
+            final Instrumentation inst,
+            final URL agentJarURL,
+            final String agentArgs) {
 
-    // apply TraceInterceptor LinkageError workaround
-    inst.addTransformer(new TraceApiTransformer());
+        // apply TraceInterceptor LinkageError workaround
+        inst.addTransformer(new TraceApiTransformer());
 
-    // don't start services, they won't be cached as they use a custom classloader
-  }
+        // don't start services, they won't be cached as they use a custom classloader
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/appsec/sca/ScaReachabilityCallback.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/appsec/sca/ScaReachabilityCallback.java
index 966b1251ca6..124432c882c 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/appsec/sca/ScaReachabilityCallback.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/appsec/sca/ScaReachabilityCallback.java
@@ -16,67 +16,57 @@
  */
 public final class ScaReachabilityCallback {
 
-  private static final Logger log = LoggerFactory.getLogger(ScaReachabilityCallback.class);
+    private static final Logger log = LoggerFactory.getLogger(ScaReachabilityCallback.class);
 
-  /** Receives method-level reachability hits from instrumented application code. */
-  public interface Handler {
-    void onMethodHit(
-        String vulnId,
-        String artifact,
-        String version,
-        String dotClassName,
-        String methodName,
-        int line);
-  }
+    /** Receives method-level reachability hits from instrumented application code. */
+    public interface Handler {
+        void onMethodHit(
+                String vulnId, String artifact, String version, String dotClassName, String methodName, int line);
+    }
 
-  private static volatile Handler handler;
+    private static volatile Handler handler;
 
-  /** Runtime dedup: "vulnId|artifact|dotClassName|methodName" tuples already reported. */
-  private static final Set<String> reported = ConcurrentHashMap.newKeySet();
+    /** Runtime dedup: "vulnId|artifact|dotClassName|methodName" tuples already reported. */
+    private static final Set<String> reported = ConcurrentHashMap.newKeySet();
 
-  /**
-   * Called by {@code ScaReachabilitySystem} to wire up the real reporting implementation. Passing
-   * {@code null} clears both the handler and the dedup set (used in tests).
-   */
-  public static void register(Handler h) {
-    handler = h;
-    if (h == null) {
-      reported.clear();
+    /**
+     * Called by {@code ScaReachabilitySystem} to wire up the real reporting implementation. Passing
+     * {@code null} clears both the handler and the dedup set (used in tests).
+     */
+    public static void register(Handler h) {
+        handler = h;
+        if (h == null) {
+            reported.clear();
+        }
     }
-  }
 
-  /**
-   * Called from bytecode injected into the entry point of a vulnerable method. Deduplicates at
-   * runtime so the handler is called at most once per (vulnId, artifact, methodName) triple.
-   *
-   * <p>The {@code dotClassName} and {@code methodName} parameters identify the VULNERABLE SYMBOL
-   * (baked in at transform time) and are used for deduplication. The handler (registered by {@code
-   * ScaReachabilitySystem}) is responsible for capturing the callsite from the current thread stack
-   * and reporting it to telemetry - keeping this class minimal as required for bootstrap.
-   */
-  public static void onMethodHit(
-      String vulnId,
-      String artifact,
-      String version,
-      String dotClassName,
-      String methodName,
-      int line) {
-    try {
-      Handler h = handler;
-      if (h == null) {
-        return;
-      }
-      // Include version and dotClassName: version isolates hits across artifact versions loaded
-      // in separate classloaders; dotClassName distinguishes classes with the same method name.
-      String key = vulnId + "|" + artifact + "|" + version + "|" + dotClassName + "|" + methodName;
-      if (reported.add(key)) {
-        h.onMethodHit(vulnId, artifact, version, dotClassName, methodName, line);
-      }
-    } catch (Exception t) {
-      // Never propagate to application code - SCA detection is observation-only
-      log.debug("SCA Reachability: error in onMethodHit for {}#{}", dotClassName, methodName, t);
+    /**
+     * Called from bytecode injected into the entry point of a vulnerable method. Deduplicates at
+     * runtime so the handler is called at most once per (vulnId, artifact, methodName) triple.
+     *
+     * <p>The {@code dotClassName} and {@code methodName} parameters identify the VULNERABLE SYMBOL
+     * (baked in at transform time) and are used for deduplication. The handler (registered by {@code
+     * ScaReachabilitySystem}) is responsible for capturing the callsite from the current thread stack
+     * and reporting it to telemetry - keeping this class minimal as required for bootstrap.
+     */
+    public static void onMethodHit(
+            String vulnId, String artifact, String version, String dotClassName, String methodName, int line) {
+        try {
+            Handler h = handler;
+            if (h == null) {
+                return;
+            }
+            // Include version and dotClassName: version isolates hits across artifact versions loaded
+            // in separate classloaders; dotClassName distinguishes classes with the same method name.
+            String key = vulnId + "|" + artifact + "|" + version + "|" + dotClassName + "|" + methodName;
+            if (reported.add(key)) {
+                h.onMethodHit(vulnId, artifact, version, dotClassName, methodName, line);
+            }
+        } catch (Exception t) {
+            // Never propagate to application code - SCA detection is observation-only
+            log.debug("SCA Reachability: error in onMethodHit for {}#{}", dotClassName, methodName, t);
+        }
     }
-  }
 
-  private ScaReachabilityCallback() {}
+    private ScaReachabilityCallback() {}
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/benchmark/StaticEventLogger.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/benchmark/StaticEventLogger.java
index 2d73624e9f6..102223e0740 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/benchmark/StaticEventLogger.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/benchmark/StaticEventLogger.java
@@ -14,99 +14,96 @@
 
 public class StaticEventLogger {
 
-  private static final Logger log = LoggerFactory.getLogger(StaticEventLogger.class);
+    private static final Logger log = LoggerFactory.getLogger(StaticEventLogger.class);
 
-  private static final int EVENT_BEGIN = '1';
-  private static final int EVENT_END = '0';
+    private static final int EVENT_BEGIN = '1';
+    private static final int EVENT_END = '0';
 
-  private static final BufferedWriter out;
+    private static final BufferedWriter out;
 
-  static {
-    BufferedWriter writer = null;
+    static {
+        BufferedWriter writer = null;
 
-    if ("true".equalsIgnoreCase(SystemProperties.get("dd.benchmark.enabled"))) {
-      String dir = SystemProperties.get("dd.benchmark.output.dir");
-      dir = (dir != null ? dir + File.separator : "");
-      String fileName = dir + "startup_" + System.currentTimeMillis() + ".csv";
+        if ("true".equalsIgnoreCase(SystemProperties.get("dd.benchmark.enabled"))) {
+            String dir = SystemProperties.get("dd.benchmark.output.dir");
+            dir = (dir != null ? dir + File.separator : "");
+            String fileName = dir + "startup_" + System.currentTimeMillis() + ".csv";
 
-      try {
-        writer = new BufferedWriter(new FileWriter(fileName), 32768);
-        writer.write("Event,State,Timestamp");
-        writer.newLine();
-      } catch (IOException e) {
-        log.warn("Can't start Benchmark event recording", e);
-      }
-    }
-
-    out = writer;
-  }
-
-  public static void stop() {
-    if (out != null) {
-      try {
-        // Add commit
-        String commit = getAgentVersion();
-        if (commit != null && !commit.isEmpty()) {
-          out.write("# commit=");
-          out.write(commit);
-          out.newLine();
+            try {
+                writer = new BufferedWriter(new FileWriter(fileName), 32768);
+                writer.write("Event,State,Timestamp");
+                writer.newLine();
+            } catch (IOException e) {
+                log.warn("Can't start Benchmark event recording", e);
+            }
         }
 
-        // Add current timestamp
-        out.write("# time=");
-        out.write(String.valueOf(System.currentTimeMillis()));
-        out.newLine();
+        out = writer;
+    }
 
-        out.close();
-      } catch (IOException e) {
-        log.warn("Can't close Benchmark event recording file", e);
-      }
+    public static void stop() {
+        if (out != null) {
+            try {
+                // Add commit
+                String commit = getAgentVersion();
+                if (commit != null && !commit.isEmpty()) {
+                    out.write("# commit=");
+                    out.write(commit);
+                    out.newLine();
+                }
+
+                // Add current timestamp
+                out.write("# time=");
+                out.write(String.valueOf(System.currentTimeMillis()));
+                out.newLine();
+
+                out.close();
+            } catch (IOException e) {
+                log.warn("Can't close Benchmark event recording file", e);
+            }
+        }
     }
-  }
-
-  private static void writeEvent(String event, int state, long timestamp) {
-    try {
-      out.write(event);
-      out.write(',');
-      out.write(state);
-      out.write(',');
-      out.write(String.valueOf(timestamp));
-      out.newLine();
-    } catch (IOException e) {
-      log.warn("Can't write Benchmark event recording", e);
-      stop();
+
+    private static void writeEvent(String event, int state, long timestamp) {
+        try {
+            out.write(event);
+            out.write(',');
+            out.write(state);
+            out.write(',');
+            out.write(String.valueOf(timestamp));
+            out.newLine();
+        } catch (IOException e) {
+            log.warn("Can't write Benchmark event recording", e);
+            stop();
+        }
     }
-  }
 
-  public static void begin(String event) {
-    if (out == null) return;
+    public static void begin(String event) {
+        if (out == null) return;
 
-    writeEvent(event, EVENT_BEGIN, System.nanoTime());
-  }
+        writeEvent(event, EVENT_BEGIN, System.nanoTime());
+    }
 
-  public static void end(String event) {
-    if (out == null) return;
+    public static void end(String event) {
+        if (out == null) return;
 
-    writeEvent(event, EVENT_END, System.nanoTime());
-  }
+        writeEvent(event, EVENT_END, System.nanoTime());
+    }
 
-  private static String getAgentVersion() {
-    final StringBuilder sb = new StringBuilder();
-    try (final BufferedReader reader =
-        new BufferedReader(
-            new InputStreamReader(
-                Objects.requireNonNull(
-                    StaticEventLogger.class.getResourceAsStream("/dd-java-agent.version")),
+    private static String getAgentVersion() {
+        final StringBuilder sb = new StringBuilder();
+        try (final BufferedReader reader = new BufferedReader(new InputStreamReader(
+                Objects.requireNonNull(StaticEventLogger.class.getResourceAsStream("/dd-java-agent.version")),
                 StandardCharsets.UTF_8))) {
 
-      for (int c = reader.read(); c != -1; c = reader.read()) {
-        sb.append((char) c);
-      }
-    } catch (Throwable ignored) {
-      // swallow exception
-      return null;
-    }
+            for (int c = reader.read(); c != -1; c = reader.read()) {
+                sb.append((char) c);
+            }
+        } catch (Throwable ignored) {
+            // swallow exception
+            return null;
+        }
 
-    return sb.toString().trim();
-  }
+        return sb.toString().trim();
+    }
 }
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 e72a86a7098..52d7171abaf 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
@@ -20,258 +20,250 @@
 import org.slf4j.LoggerFactory;
 
 public class BlockingActionHelper {
-  private static final Logger log = LoggerFactory.getLogger(BlockingActionHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(BlockingActionHelper.class);
 
-  private static final int DEFAULT_HTTP_CODE = 403;
-  private static final int MAX_ALLOWED_TEMPLATE_SIZE = 1024 * 500; // 500 kiB
+    private static final int DEFAULT_HTTP_CODE = 403;
+    private static final int MAX_ALLOWED_TEMPLATE_SIZE = 1024 * 500; // 500 kiB
 
-  private static volatile byte[] TEMPLATE_HTML;
-  private static volatile byte[] TEMPLATE_JSON;
+    private static volatile byte[] TEMPLATE_HTML;
+    private static volatile byte[] TEMPLATE_JSON;
 
-  public static final String CONTENT_TYPE_HTML = "text/html;charset=utf-8";
-  public static final String CONTENT_TYPE_JSON = "application/json";
+    public static final String CONTENT_TYPE_HTML = "text/html;charset=utf-8";
+    public static final String CONTENT_TYPE_JSON = "application/json";
 
-  static {
-    reset(Config.get());
-  }
+    static {
+        reset(Config.get());
+    }
 
-  public enum TemplateType {
-    JSON,
-    HTML
-  }
+    public enum TemplateType {
+        JSON,
+        HTML
+    }
 
-  public static int getHttpCode(int actionHttpCode) {
-    if (actionHttpCode < 200 || actionHttpCode > 599) {
-      return DEFAULT_HTTP_CODE;
+    public static int getHttpCode(int actionHttpCode) {
+        if (actionHttpCode < 200 || actionHttpCode > 599) {
+            return DEFAULT_HTTP_CODE;
+        }
+        return actionHttpCode;
     }
-    return actionHttpCode;
-  }
 
-  enum Specificity {
-    UNSPECIFIED,
-    ASTERISK,
-    PARTIAL,
-    FULL;
+    enum Specificity {
+        UNSPECIFIED,
+        ASTERISK,
+        PARTIAL,
+        FULL;
 
-    public boolean isMoreSpecificThan(Specificity other) {
-      return ordinal() > other.ordinal();
+        public boolean isMoreSpecificThan(Specificity other) {
+            return ordinal() > other.ordinal();
+        }
     }
-  }
 
-  public static TemplateType determineTemplateType(
-      BlockingContentType blockingContentType, String acceptHeader) {
-    if (blockingContentType == BlockingContentType.HTML) {
-      return TemplateType.HTML;
-    }
-    if (blockingContentType == BlockingContentType.JSON) {
-      return TemplateType.JSON;
+    public static TemplateType determineTemplateType(BlockingContentType blockingContentType, String acceptHeader) {
+        if (blockingContentType == BlockingContentType.HTML) {
+            return TemplateType.HTML;
+        }
+        if (blockingContentType == BlockingContentType.JSON) {
+            return TemplateType.JSON;
+        }
+        if (blockingContentType == BlockingContentType.NONE) {
+            throw new IllegalArgumentException("Does not accept BlockingContentType.NONE");
+        }
+
+        float jsonPref = 0;
+        Specificity curJsonSpecificity = Specificity.UNSPECIFIED;
+        float htmlPref = 0;
+        Specificity curHtmlSpecificity = Specificity.UNSPECIFIED;
+
+        if (acceptHeader == null) {
+            // then everything is accepted. We prefer json
+            jsonPref = 1.0f;
+        } else {
+            int[] pos = new int[] {0};
+            float[] quality = new float[] {0f};
+
+            String mediaType;
+            while ((mediaType = nextMediaRange(acceptHeader, pos, quality)) != null) {
+                if (mediaType.equals("*/*")) {
+                    if (Specificity.ASTERISK.isMoreSpecificThan(curJsonSpecificity)) {
+                        jsonPref = quality[0];
+                        curJsonSpecificity = Specificity.ASTERISK;
+                    }
+                    if (Specificity.ASTERISK.isMoreSpecificThan(curHtmlSpecificity)) {
+                        htmlPref = quality[0];
+                        curHtmlSpecificity = Specificity.ASTERISK;
+                    }
+                } else if (mediaType.equals("text/*")) {
+                    if (Specificity.PARTIAL.isMoreSpecificThan(curHtmlSpecificity)) {
+                        htmlPref = quality[0];
+                        curHtmlSpecificity = Specificity.PARTIAL;
+                    }
+                } else if (mediaType.equals("text/html")) {
+                    htmlPref = quality[0];
+                    curHtmlSpecificity = Specificity.FULL;
+                } else if (mediaType.equals("application/*")) {
+                    if (Specificity.PARTIAL.isMoreSpecificThan(curJsonSpecificity)) {
+                        jsonPref = quality[0];
+                        curJsonSpecificity = Specificity.PARTIAL;
+                    }
+                } else if (mediaType.equals("application/json")) {
+                    jsonPref = quality[0];
+                    curJsonSpecificity = Specificity.FULL;
+                }
+            }
+        }
+
+        if (htmlPref > jsonPref) {
+            return TemplateType.HTML;
+        }
+        return TemplateType.JSON;
     }
-    if (blockingContentType == BlockingContentType.NONE) {
-      throw new IllegalArgumentException("Does not accept BlockingContentType.NONE");
+
+    public static byte[] getTemplate(TemplateType type) {
+        return getTemplate(type, null);
     }
 
-    float jsonPref = 0;
-    Specificity curJsonSpecificity = Specificity.UNSPECIFIED;
-    float htmlPref = 0;
-    Specificity curHtmlSpecificity = Specificity.UNSPECIFIED;
-
-    if (acceptHeader == null) {
-      // then everything is accepted. We prefer json
-      jsonPref = 1.0f;
-    } else {
-      int[] pos = new int[] {0};
-      float[] quality = new float[] {0f};
-
-      String mediaType;
-      while ((mediaType = nextMediaRange(acceptHeader, pos, quality)) != null) {
-        if (mediaType.equals("*/*")) {
-          if (Specificity.ASTERISK.isMoreSpecificThan(curJsonSpecificity)) {
-            jsonPref = quality[0];
-            curJsonSpecificity = Specificity.ASTERISK;
-          }
-          if (Specificity.ASTERISK.isMoreSpecificThan(curHtmlSpecificity)) {
-            htmlPref = quality[0];
-            curHtmlSpecificity = Specificity.ASTERISK;
-          }
-        } else if (mediaType.equals("text/*")) {
-          if (Specificity.PARTIAL.isMoreSpecificThan(curHtmlSpecificity)) {
-            htmlPref = quality[0];
-            curHtmlSpecificity = Specificity.PARTIAL;
-          }
-        } else if (mediaType.equals("text/html")) {
-          htmlPref = quality[0];
-          curHtmlSpecificity = Specificity.FULL;
-        } else if (mediaType.equals("application/*")) {
-          if (Specificity.PARTIAL.isMoreSpecificThan(curJsonSpecificity)) {
-            jsonPref = quality[0];
-            curJsonSpecificity = Specificity.PARTIAL;
-          }
-        } else if (mediaType.equals("application/json")) {
-          jsonPref = quality[0];
-          curJsonSpecificity = Specificity.FULL;
+    public static byte[] getTemplate(TemplateType type, String securityResponseId) {
+        byte[] template;
+        if (type == TemplateType.JSON) {
+            template = TEMPLATE_JSON;
+        } else if (type == TemplateType.HTML) {
+            template = TEMPLATE_HTML;
+        } else {
+            return null;
         }
-      }
-    }
 
-    if (htmlPref > jsonPref) {
-      return TemplateType.HTML;
+        // Use empty string when securityResponseId is not present
+        String replacementValue =
+                (securityResponseId == null || securityResponseId.isEmpty()) ? "" : securityResponseId;
+
+        String templateString = new String(template, StandardCharsets.UTF_8);
+        String replacedTemplate = templateString.replace("[security_response_id]", replacementValue);
+        return replacedTemplate.getBytes(StandardCharsets.UTF_8);
     }
-    return TemplateType.JSON;
-  }
-
-  public static byte[] getTemplate(TemplateType type) {
-    return getTemplate(type, null);
-  }
-
-  public static byte[] getTemplate(TemplateType type, String securityResponseId) {
-    byte[] template;
-    if (type == TemplateType.JSON) {
-      template = TEMPLATE_JSON;
-    } else if (type == TemplateType.HTML) {
-      template = TEMPLATE_HTML;
-    } else {
-      return null;
+
+    public static String getContentType(TemplateType type) {
+        if (type == TemplateType.JSON) {
+            return CONTENT_TYPE_JSON;
+        } else if (type == TemplateType.HTML) {
+            return CONTENT_TYPE_HTML;
+        }
+        return null;
     }
 
-    // Use empty string when securityResponseId is not present
-    String replacementValue =
-        (securityResponseId == null || securityResponseId.isEmpty()) ? "" : securityResponseId;
+    private static final Pattern MEDIA_TYPE_PATTERN =
+            Pattern.compile("(?x)^[\\ \\t]* ( [!\\#$%&'*+\\-.^_`|~\\da-zA-Z]+/[!\\#$%&'*+\\-.^_`|~\\da-zA-Z]+ )");
 
-    String templateString = new String(template, StandardCharsets.UTF_8);
-    String replacedTemplate = templateString.replace("[security_response_id]", replacementValue);
-    return replacedTemplate.getBytes(StandardCharsets.UTF_8);
-  }
+    private static final Pattern QUALITY_PATTERN =
+            Pattern.compile("(?x);[\\ \\t]* q=( (?:0(?:\\.\\d{0,3})?) | (?:1(?:\\.0{0,3})?) )  (?:$|,|;|[\\ \\t])");
 
-  public static String getContentType(TemplateType type) {
-    if (type == TemplateType.JSON) {
-      return CONTENT_TYPE_JSON;
-    } else if (type == TemplateType.HTML) {
-      return CONTENT_TYPE_HTML;
-    }
-    return null;
-  }
+    private static String nextMediaRange(String s, int[] pos, float[] quality) {
+        int initPos = pos[0];
 
-  private static final Pattern MEDIA_TYPE_PATTERN =
-      Pattern.compile(
-          "(?x)^[\\ \\t]* ( [!\\#$%&'*+\\-.^_`|~\\da-zA-Z]+/[!\\#$%&'*+\\-.^_`|~\\da-zA-Z]+ )");
+        if (initPos >= s.length()) {
+            return null;
+        }
 
-  private static final Pattern QUALITY_PATTERN =
-      Pattern.compile(
-          "(?x);[\\ \\t]* q=( (?:0(?:\\.\\d{0,3})?) | (?:1(?:\\.0{0,3})?) )  (?:$|,|;|[\\ \\t])");
+        int endCommaSep = s.indexOf(',', initPos);
+        if (endCommaSep == -1) {
+            endCommaSep = s.length();
+        }
+        pos[0] = endCommaSep + 1; // pos for next iter
 
-  private static String nextMediaRange(String s, int[] pos, float[] quality) {
-    int initPos = pos[0];
+        String commaSepToken = s.substring(initPos, endCommaSep);
+        Matcher mediaRangeMatcher = MEDIA_TYPE_PATTERN.matcher(commaSepToken);
+        if (!mediaRangeMatcher.find()) {
+            return null; // error / trailing comma
+        }
 
-    if (initPos >= s.length()) {
-      return null;
-    }
+        Matcher qualityMatcher = QUALITY_PATTERN.matcher(commaSepToken);
+        if (qualityMatcher.find()) {
+            quality[0] = Float.parseFloat(qualityMatcher.group(1));
+        } else {
+            quality[0] = 1.0f;
+        }
 
-    int endCommaSep = s.indexOf(',', initPos);
-    if (endCommaSep == -1) {
-      endCommaSep = s.length();
+        return mediaRangeMatcher.group(1);
     }
-    pos[0] = endCommaSep + 1; // pos for next iter
 
-    String commaSepToken = s.substring(initPos, endCommaSep);
-    Matcher mediaRangeMatcher = MEDIA_TYPE_PATTERN.matcher(commaSepToken);
-    if (!mediaRangeMatcher.find()) {
-      return null; // error / trailing comma
-    }
+    @VisibleForTesting
+    public static void reset(Config config) {
+        TEMPLATE_HTML = null;
+        TEMPLATE_JSON = null;
+
+        String appSecHttpBlockedTemplateHtml = config.getAppSecHttpBlockedTemplateHtml();
+        if (appSecHttpBlockedTemplateHtml != null) {
+            File f = new File(appSecHttpBlockedTemplateHtml);
+            if (!f.isFile()) {
+                log.warn(
+                        "File referenced in config option {} does not exist: {}", APPSEC_HTTP_BLOCKED_TEMPLATE_HTML, f);
+            } else {
+                TEMPLATE_HTML = readIntoByteArray(f);
+            }
+        }
+        if (TEMPLATE_HTML == null) {
+            TEMPLATE_HTML = readDefaultTemplate("html");
+        }
 
-    Matcher qualityMatcher = QUALITY_PATTERN.matcher(commaSepToken);
-    if (qualityMatcher.find()) {
-      quality[0] = Float.parseFloat(qualityMatcher.group(1));
-    } else {
-      quality[0] = 1.0f;
+        String appSecHttpBlockedTemplateJson = config.getAppSecHttpBlockedTemplateJson();
+        if (appSecHttpBlockedTemplateJson != null) {
+            File f = new File(appSecHttpBlockedTemplateJson);
+            if (!f.isFile()) {
+                log.warn(
+                        "File referenced in config option {} does not exist: {}", APPSEC_HTTP_BLOCKED_TEMPLATE_JSON, f);
+            } else {
+                TEMPLATE_JSON = readIntoByteArray(f);
+            }
+        }
+        if (TEMPLATE_JSON == null) {
+            TEMPLATE_JSON = readDefaultTemplate("json");
+        }
     }
 
-    return mediaRangeMatcher.group(1);
-  }
-
-  @VisibleForTesting
-  public static void reset(Config config) {
-    TEMPLATE_HTML = null;
-    TEMPLATE_JSON = null;
-
-    String appSecHttpBlockedTemplateHtml = config.getAppSecHttpBlockedTemplateHtml();
-    if (appSecHttpBlockedTemplateHtml != null) {
-      File f = new File(appSecHttpBlockedTemplateHtml);
-      if (!f.isFile()) {
-        log.warn(
-            "File referenced in config option {} does not exist: {}",
-            APPSEC_HTTP_BLOCKED_TEMPLATE_HTML,
-            f);
-      } else {
-        TEMPLATE_HTML = readIntoByteArray(f);
-      }
-    }
-    if (TEMPLATE_HTML == null) {
-      TEMPLATE_HTML = readDefaultTemplate("html");
+    private static byte[] readDefaultTemplate(String ext) {
+        try (InputStream is =
+                getSystemClassLoader().getResourceAsStream("datadog/trace/bootstrap/blocking/template." + ext)) {
+            if (is == null) {
+                log.error("Could not open default {} template", ext);
+                return new byte[] {'e', 'r', 'r', 'o', 'r'};
+            }
+
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            byte[] b = new byte[8192];
+            int read;
+            while ((read = is.read(b)) != -1) {
+                baos.write(b, 0, read);
+            }
+            return baos.toByteArray();
+        } catch (IOException e) {
+            log.error("Could not read default {} template", ext, e);
+            return new byte[] {'e', 'r', 'r', 'o', 'r'};
+        }
     }
 
-    String appSecHttpBlockedTemplateJson = config.getAppSecHttpBlockedTemplateJson();
-    if (appSecHttpBlockedTemplateJson != null) {
-      File f = new File(appSecHttpBlockedTemplateJson);
-      if (!f.isFile()) {
-        log.warn(
-            "File referenced in config option {} does not exist: {}",
-            APPSEC_HTTP_BLOCKED_TEMPLATE_JSON,
-            f);
-      } else {
-        TEMPLATE_JSON = readIntoByteArray(f);
-      }
-    }
-    if (TEMPLATE_JSON == null) {
-      TEMPLATE_JSON = readDefaultTemplate("json");
-    }
-  }
-
-  private static byte[] readDefaultTemplate(String ext) {
-    try (InputStream is =
-        getSystemClassLoader()
-            .getResourceAsStream("datadog/trace/bootstrap/blocking/template." + ext)) {
-      if (is == null) {
-        log.error("Could not open default {} template", ext);
-        return new byte[] {'e', 'r', 'r', 'o', 'r'};
-      }
-
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      byte[] b = new byte[8192];
-      int read;
-      while ((read = is.read(b)) != -1) {
-        baos.write(b, 0, read);
-      }
-      return baos.toByteArray();
-    } catch (IOException e) {
-      log.error("Could not read default {} template", ext, e);
-      return new byte[] {'e', 'r', 'r', 'o', 'r'};
-    }
-  }
-
-  private static byte[] readIntoByteArray(File f) {
-    long fileSize = f.length();
-    if (fileSize > MAX_ALLOWED_TEMPLATE_SIZE) {
-      log.warn(
-          "Template file {} cannot be larger than {} bytes, got file {} bytes long",
-          f,
-          MAX_ALLOWED_TEMPLATE_SIZE,
-          fileSize);
-      return null;
-    }
-    byte[] res = new byte[(int) fileSize];
-    try (FileInputStream fis = new FileInputStream(f)) {
-      int read = fis.read(res);
-      if (read != fileSize || fis.read() != -1) {
-        log.warn("Template file {} changed before it could be fully read", f);
-        return null;
-      }
-    } catch (FileNotFoundException e) {
-      log.warn("Template file {} could not be opened", f);
-      return null;
-    } catch (IOException e) {
-      log.warn("Error reading template file {}", f, e);
-      return null;
+    private static byte[] readIntoByteArray(File f) {
+        long fileSize = f.length();
+        if (fileSize > MAX_ALLOWED_TEMPLATE_SIZE) {
+            log.warn(
+                    "Template file {} cannot be larger than {} bytes, got file {} bytes long",
+                    f,
+                    MAX_ALLOWED_TEMPLATE_SIZE,
+                    fileSize);
+            return null;
+        }
+        byte[] res = new byte[(int) fileSize];
+        try (FileInputStream fis = new FileInputStream(f)) {
+            int read = fis.read(res);
+            if (read != fileSize || fis.read() != -1) {
+                log.warn("Template file {} changed before it could be fully read", f);
+                return null;
+            }
+        } catch (FileNotFoundException e) {
+            log.warn("Template file {} could not be opened", f);
+            return null;
+        } catch (IOException e) {
+            log.warn("Error reading template file {}", f, e);
+            return null;
+        }
+        return res;
     }
-    return res;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/blocking/BlockingExceptionHandler.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/blocking/BlockingExceptionHandler.java
index 65071a4b238..92f5d6ad889 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/blocking/BlockingExceptionHandler.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/blocking/BlockingExceptionHandler.java
@@ -4,10 +4,10 @@
 
 public class BlockingExceptionHandler {
 
-  public static Throwable rethrowIfBlockingException(final Throwable e) {
-    if (e instanceof BlockingException) {
-      throw (BlockingException) e;
+    public static Throwable rethrowIfBlockingException(final Throwable e) {
+        if (e instanceof BlockingException) {
+            throw (BlockingException) e;
+        }
+        return e;
     }
-    return e;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/ContextVisitors.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/ContextVisitors.java
index 00c2ffa693b..b59f8e7ba6c 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/ContextVisitors.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/ContextVisitors.java
@@ -4,58 +4,55 @@
 
 public final class ContextVisitors {
 
-  private static final MapContextVisitor<?> MAP_CONTEXT_VISITOR = new MapContextVisitor<>();
-  private static final EntrySetContextVisitor<?> ENTRY_SET_CONTEXT_VISITOR =
-      new EntrySetContextVisitor<>();
-
-  @SuppressWarnings("unchecked")
-  public static <T extends Map<String, ?>> AgentPropagation.ContextVisitor<T> objectValuesMap() {
-    return (AgentPropagation.ContextVisitor<T>) MAP_CONTEXT_VISITOR;
-  }
-
-  @SuppressWarnings("unchecked")
-  public static <T extends Map<String, String>>
-      AgentPropagation.ContextVisitor<T> stringValuesMap() {
-    return (AgentPropagation.ContextVisitor<T>) MAP_CONTEXT_VISITOR;
-  }
-
-  @SuppressWarnings("unchecked")
-  public static <T extends Iterable<Map.Entry<String, ?>>>
-      AgentPropagation.ContextVisitor<T> objectValuesEntrySet() {
-    return (AgentPropagation.ContextVisitor<T>) ENTRY_SET_CONTEXT_VISITOR;
-  }
-
-  @SuppressWarnings("unchecked")
-  public static <T extends Iterable<Map.Entry<String, String>>>
-      AgentPropagation.ContextVisitor<T> stringValuesEntrySet() {
-    return (AgentPropagation.ContextVisitor<T>) ENTRY_SET_CONTEXT_VISITOR;
-  }
-
-  private static final class MapContextVisitor<T extends Map<String, ?>>
-      implements AgentPropagation.ContextVisitor<T> {
-
-    @Override
-    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-      for (Map.Entry<String, ?> entry : carrier.entrySet()) {
-        if (null != entry.getValue()
-            && !classifier.accept(entry.getKey(), entry.getValue().toString())) {
-          return;
-        }
-      }
+    private static final MapContextVisitor<?> MAP_CONTEXT_VISITOR = new MapContextVisitor<>();
+    private static final EntrySetContextVisitor<?> ENTRY_SET_CONTEXT_VISITOR = new EntrySetContextVisitor<>();
+
+    @SuppressWarnings("unchecked")
+    public static <T extends Map<String, ?>> AgentPropagation.ContextVisitor<T> objectValuesMap() {
+        return (AgentPropagation.ContextVisitor<T>) MAP_CONTEXT_VISITOR;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T extends Map<String, String>> AgentPropagation.ContextVisitor<T> stringValuesMap() {
+        return (AgentPropagation.ContextVisitor<T>) MAP_CONTEXT_VISITOR;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T extends Iterable<Map.Entry<String, ?>>> AgentPropagation.ContextVisitor<T> objectValuesEntrySet() {
+        return (AgentPropagation.ContextVisitor<T>) ENTRY_SET_CONTEXT_VISITOR;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T extends Iterable<Map.Entry<String, String>>>
+            AgentPropagation.ContextVisitor<T> stringValuesEntrySet() {
+        return (AgentPropagation.ContextVisitor<T>) ENTRY_SET_CONTEXT_VISITOR;
     }
-  }
 
-  private static final class EntrySetContextVisitor<T extends Iterable<Map.Entry<String, ?>>>
-      implements AgentPropagation.ContextVisitor<T> {
+    private static final class MapContextVisitor<T extends Map<String, ?>>
+            implements AgentPropagation.ContextVisitor<T> {
+
+        @Override
+        public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+            for (Map.Entry<String, ?> entry : carrier.entrySet()) {
+                if (null != entry.getValue()
+                        && !classifier.accept(entry.getKey(), entry.getValue().toString())) {
+                    return;
+                }
+            }
+        }
+    }
 
-    @Override
-    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-      for (Map.Entry<String, ?> entry : carrier) {
-        if (null != entry.getValue()
-            && !classifier.accept(entry.getKey(), entry.getValue().toString())) {
-          return;
+    private static final class EntrySetContextVisitor<T extends Iterable<Map.Entry<String, ?>>>
+            implements AgentPropagation.ContextVisitor<T> {
+
+        @Override
+        public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+            for (Map.Entry<String, ?> entry : carrier) {
+                if (null != entry.getValue()
+                        && !classifier.accept(entry.getKey(), entry.getValue().toString())) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/Java8BytecodeBridge.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/Java8BytecodeBridge.java
index d749dd4c372..a59701822c9 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/Java8BytecodeBridge.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/Java8BytecodeBridge.java
@@ -11,47 +11,47 @@
  * were not supported prior to Java 8 and will lead to a class verification error.
  */
 public class Java8BytecodeBridge {
-  /**
-   * @see Context#root()
-   */
-  public static Context rootContext() {
-    return Context.root();
-  }
-
-  /**
-   * @see Context#current()
-   */
-  public static Context currentContext() {
-    return Context.current();
-  }
-
-  /**
-   * @see AgentSpan#current()
-   */
-  public static AgentSpan currentSpan() {
-    return AgentSpan.current();
-  }
-
-  /**
-   * @see AgentSpan#fromContext(Context)
-   */
-  public static AgentSpan spanFromContext(Context context) {
-    return AgentSpan.fromContext(context);
-  }
-
-  /**
-   * @see AgentSpan#fromScope(ContextScope)
-   */
-  public static AgentSpan spanFromScope(ContextScope scope) {
-    return AgentSpan.fromScope(scope);
-  }
-
-  /**
-   * @see Baggage#fromContext(Context)
-   */
-  public static Baggage baggageFromContext(Context context) {
-    return Baggage.fromContext(context);
-  }
-
-  private Java8BytecodeBridge() {}
+    /**
+     * @see Context#root()
+     */
+    public static Context rootContext() {
+        return Context.root();
+    }
+
+    /**
+     * @see Context#current()
+     */
+    public static Context currentContext() {
+        return Context.current();
+    }
+
+    /**
+     * @see AgentSpan#current()
+     */
+    public static AgentSpan currentSpan() {
+        return AgentSpan.current();
+    }
+
+    /**
+     * @see AgentSpan#fromContext(Context)
+     */
+    public static AgentSpan spanFromContext(Context context) {
+        return AgentSpan.fromContext(context);
+    }
+
+    /**
+     * @see AgentSpan#fromScope(ContextScope)
+     */
+    public static AgentSpan spanFromScope(ContextScope scope) {
+        return AgentSpan.fromScope(scope);
+    }
+
+    /**
+     * @see Baggage#fromContext(Context)
+     */
+    public static Baggage baggageFromContext(Context context) {
+        return Baggage.fromContext(context);
+    }
+
+    private Java8BytecodeBridge() {}
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/buffer/InjectingPipeOutputStream.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/buffer/InjectingPipeOutputStream.java
index 9d49166bd1b..2653a550dad 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/buffer/InjectingPipeOutputStream.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/buffer/InjectingPipeOutputStream.java
@@ -13,259 +13,258 @@
  */
 @NotThreadSafe
 public class InjectingPipeOutputStream extends OutputStream {
-  private final byte[] lookbehind;
-  private int pos;
-  private int count;
-  private final byte[] marker;
-  private final byte[] contentToInject;
-  private boolean filter;
-  private boolean wasDraining;
-  private int matchingPos;
-  private final Runnable onContentInjected;
-  private final int bulkWriteThreshold;
-  private final OutputStream downstream;
-  private final LongConsumer onBytesWritten;
-  private final LongConsumer onInjectionTime;
-  private long bytesWritten = 0;
+    private final byte[] lookbehind;
+    private int pos;
+    private int count;
+    private final byte[] marker;
+    private final byte[] contentToInject;
+    private boolean filter;
+    private boolean wasDraining;
+    private int matchingPos;
+    private final Runnable onContentInjected;
+    private final int bulkWriteThreshold;
+    private final OutputStream downstream;
+    private final LongConsumer onBytesWritten;
+    private final LongConsumer onInjectionTime;
+    private long bytesWritten = 0;
 
-  /**
-   * This constructor is typically used for testing where we care about the logic and not the
-   * telemetry.
-   *
-   * @param downstream the delegate output stream
-   * @param marker the marker to find in the stream. Must at least be one byte.
-   * @param contentToInject the content to inject once before the marker if found.
-   */
-  public InjectingPipeOutputStream(
-      final OutputStream downstream, final byte[] marker, final byte[] contentToInject) {
-    this(downstream, marker, contentToInject, null, null, null);
-  }
-
-  /**
-   * This constructor contains the full set of parameters.
-   *
-   * @param downstream the delegate output stream
-   * @param marker the marker to find in the stream. Must at least be one byte.
-   * @param contentToInject the content to inject once before the marker if found.
-   * @param onContentInjected callback called when and if the content is injected.
-   * @param onBytesWritten callback called when stream is closed to report total bytes written.
-   * @param onInjectionTime callback called with the time in milliseconds taken to write the
-   *     injection content.
-   */
-  public InjectingPipeOutputStream(
-      final OutputStream downstream,
-      final byte[] marker,
-      final byte[] contentToInject,
-      final Runnable onContentInjected,
-      final LongConsumer onBytesWritten,
-      final LongConsumer onInjectionTime) {
-    this.downstream = downstream;
-    this.marker = marker;
-    this.lookbehind = new byte[marker.length];
-    this.pos = 0;
-    this.count = 0;
-    this.matchingPos = 0;
-    this.wasDraining = false;
-    // should filter the stream to potentially inject into it.
-    this.filter = true;
-    this.contentToInject = contentToInject;
-    this.onContentInjected = onContentInjected;
-    this.onBytesWritten = onBytesWritten;
-    this.onInjectionTime = onInjectionTime;
-    this.bulkWriteThreshold = marker.length * 2 - 2;
-  }
-
-  @Override
-  public void write(int b) throws IOException {
-    if (!filter) {
-      if (wasDraining) {
-        // continue draining
-        drain();
-      }
-      downstream.write(b);
-      bytesWritten++;
-      return;
+    /**
+     * This constructor is typically used for testing where we care about the logic and not the
+     * telemetry.
+     *
+     * @param downstream the delegate output stream
+     * @param marker the marker to find in the stream. Must at least be one byte.
+     * @param contentToInject the content to inject once before the marker if found.
+     */
+    public InjectingPipeOutputStream(final OutputStream downstream, final byte[] marker, final byte[] contentToInject) {
+        this(downstream, marker, contentToInject, null, null, null);
     }
 
-    if (count == lookbehind.length) {
-      downstream.write(lookbehind[pos]);
-      bytesWritten++;
-    } else {
-      count++;
+    /**
+     * This constructor contains the full set of parameters.
+     *
+     * @param downstream the delegate output stream
+     * @param marker the marker to find in the stream. Must at least be one byte.
+     * @param contentToInject the content to inject once before the marker if found.
+     * @param onContentInjected callback called when and if the content is injected.
+     * @param onBytesWritten callback called when stream is closed to report total bytes written.
+     * @param onInjectionTime callback called with the time in milliseconds taken to write the
+     *     injection content.
+     */
+    public InjectingPipeOutputStream(
+            final OutputStream downstream,
+            final byte[] marker,
+            final byte[] contentToInject,
+            final Runnable onContentInjected,
+            final LongConsumer onBytesWritten,
+            final LongConsumer onInjectionTime) {
+        this.downstream = downstream;
+        this.marker = marker;
+        this.lookbehind = new byte[marker.length];
+        this.pos = 0;
+        this.count = 0;
+        this.matchingPos = 0;
+        this.wasDraining = false;
+        // should filter the stream to potentially inject into it.
+        this.filter = true;
+        this.contentToInject = contentToInject;
+        this.onContentInjected = onContentInjected;
+        this.onBytesWritten = onBytesWritten;
+        this.onInjectionTime = onInjectionTime;
+        this.bulkWriteThreshold = marker.length * 2 - 2;
     }
 
-    lookbehind[pos] = (byte) b;
-    pos = (pos + 1) % lookbehind.length;
-
-    if (marker[matchingPos++] == b) {
-      if (matchingPos == marker.length) {
-        filter = false;
-        long injectionStart = System.nanoTime();
-        downstream.write(contentToInject);
-        long injectionEnd = System.nanoTime();
-        if (onInjectionTime != null) {
-          onInjectionTime.accept((injectionEnd - injectionStart) / 1_000_000L);
+    @Override
+    public void write(int b) throws IOException {
+        if (!filter) {
+            if (wasDraining) {
+                // continue draining
+                drain();
+            }
+            downstream.write(b);
+            bytesWritten++;
+            return;
         }
-        if (onContentInjected != null) {
-          onContentInjected.run();
+
+        if (count == lookbehind.length) {
+            downstream.write(lookbehind[pos]);
+            bytesWritten++;
+        } else {
+            count++;
         }
-        drain();
-      }
-    } else {
-      matchingPos = 0;
-    }
-  }
 
-  @Override
-  public void write(byte[] array, int off, int len) throws IOException {
-    final int end = off + len;
-    if (!filter) {
-      if (wasDraining) {
-        // needs drain
-        drain();
-      }
-      downstream.write(array, off, len);
-      bytesWritten += len;
-      return;
+        lookbehind[pos] = (byte) b;
+        pos = (pos + 1) % lookbehind.length;
+
+        if (marker[matchingPos++] == b) {
+            if (matchingPos == marker.length) {
+                filter = false;
+                long injectionStart = System.nanoTime();
+                downstream.write(contentToInject);
+                long injectionEnd = System.nanoTime();
+                if (onInjectionTime != null) {
+                    onInjectionTime.accept((injectionEnd - injectionStart) / 1_000_000L);
+                }
+                if (onContentInjected != null) {
+                    onContentInjected.run();
+                }
+                drain();
+            }
+        } else {
+            matchingPos = 0;
+        }
     }
 
-    if (len > bulkWriteThreshold) {
-      // A match that started in the previous write precedes every match wholly in this array.
-      if (matchingPos > 0 && arrayCompletesPendingMatch(array, off, end)) {
-        int pendingMatchLength = marker.length - matchingPos;
-        for (int i = off; i < off + pendingMatchLength; i++) {
-          write(array[i]);
+    @Override
+    public void write(byte[] array, int off, int len) throws IOException {
+        final int end = off + len;
+        if (!filter) {
+            if (wasDraining) {
+                // needs drain
+                drain();
+            }
+            downstream.write(array, off, len);
+            bytesWritten += len;
+            return;
         }
-        write(array, off + pendingMatchLength, len - pendingMatchLength);
-        return;
-      }
 
-      // if the content is large enough, we can bulk write everything but the N trail and tail.
-      // This because the buffer can already contain some byte from a previous single write.
-      // Also we need to fill the buffer with the tail since we don't know about the next write.
-      int idx = arrayContains(array, off, end, marker);
-      if (idx >= 0) {
-        // we have a full match. just write everything
-        filter = false;
-        drain();
-        int bytesToWrite = idx - off;
-        downstream.write(array, off, bytesToWrite);
-        bytesWritten += bytesToWrite;
-        long injectionStart = System.nanoTime();
-        downstream.write(contentToInject);
-        long injectionEnd = System.nanoTime();
-        if (onInjectionTime != null) {
-          onInjectionTime.accept((injectionEnd - injectionStart) / 1_000_000L);
+        if (len > bulkWriteThreshold) {
+            // A match that started in the previous write precedes every match wholly in this array.
+            if (matchingPos > 0 && arrayCompletesPendingMatch(array, off, end)) {
+                int pendingMatchLength = marker.length - matchingPos;
+                for (int i = off; i < off + pendingMatchLength; i++) {
+                    write(array[i]);
+                }
+                write(array, off + pendingMatchLength, len - pendingMatchLength);
+                return;
+            }
+
+            // if the content is large enough, we can bulk write everything but the N trail and tail.
+            // This because the buffer can already contain some byte from a previous single write.
+            // Also we need to fill the buffer with the tail since we don't know about the next write.
+            int idx = arrayContains(array, off, end, marker);
+            if (idx >= 0) {
+                // we have a full match. just write everything
+                filter = false;
+                drain();
+                int bytesToWrite = idx - off;
+                downstream.write(array, off, bytesToWrite);
+                bytesWritten += bytesToWrite;
+                long injectionStart = System.nanoTime();
+                downstream.write(contentToInject);
+                long injectionEnd = System.nanoTime();
+                if (onInjectionTime != null) {
+                    onInjectionTime.accept((injectionEnd - injectionStart) / 1_000_000L);
+                }
+                if (onContentInjected != null) {
+                    onContentInjected.run();
+                }
+                bytesToWrite = end - idx;
+                downstream.write(array, idx, bytesToWrite);
+                bytesWritten += bytesToWrite;
+            } else {
+                // we don't have a full match. write everything in a bulk except the lookbehind buffer
+                // sequentially
+                for (int i = off; i < off + marker.length - 1; i++) {
+                    write(array[i]);
+                }
+                drain();
+                boolean wasFiltering = filter;
+
+                // will be reset if no errors after the following write
+                filter = false;
+                int bytesToWrite = len - bulkWriteThreshold;
+                downstream.write(array, off + marker.length - 1, bytesToWrite);
+                bytesWritten += bytesToWrite;
+                filter = wasFiltering;
+                for (int i = end - marker.length + 1; i < end; i++) {
+                    write(array[i]);
+                }
+            }
+        } else {
+            // use slow path because the length to write is small and within the lookbehind buffer size
+            for (int i = off; i < end; i++) {
+                write(array[i]);
+            }
         }
-        if (onContentInjected != null) {
-          onContentInjected.run();
+    }
+
+    private boolean arrayCompletesPendingMatch(byte[] array, int off, int end) {
+        int pendingMatchLength = marker.length - matchingPos;
+        if (off + pendingMatchLength > end) {
+            return false;
         }
-        bytesToWrite = end - idx;
-        downstream.write(array, idx, bytesToWrite);
-        bytesWritten += bytesToWrite;
-      } else {
-        // we don't have a full match. write everything in a bulk except the lookbehind buffer
-        // sequentially
-        for (int i = off; i < off + marker.length - 1; i++) {
-          write(array[i]);
+        for (int i = 0; i < pendingMatchLength; i++) {
+            if (array[off + i] != marker[matchingPos + i]) {
+                return false;
+            }
         }
-        drain();
-        boolean wasFiltering = filter;
+        return true;
+    }
 
-        // will be reset if no errors after the following write
-        filter = false;
-        int bytesToWrite = len - bulkWriteThreshold;
-        downstream.write(array, off + marker.length - 1, bytesToWrite);
-        bytesWritten += bytesToWrite;
-        filter = wasFiltering;
-        for (int i = end - marker.length + 1; i < end; i++) {
-          write(array[i]);
+    private int arrayContains(byte[] array, int off, int end, byte[] search) {
+        for (int i = off; i <= end - search.length; i++) {
+            if (array[i] == search[0]) {
+                boolean found = true;
+                int k = i;
+                for (int j = 1; j < search.length; j++) {
+                    k++;
+                    if (array[k] != search[j]) {
+                        found = false;
+                        break;
+                    }
+                }
+                if (found) {
+                    return i;
+                }
+            }
         }
-      }
-    } else {
-      // use slow path because the length to write is small and within the lookbehind buffer size
-      for (int i = off; i < end; i++) {
-        write(array[i]);
-      }
+        return -1;
     }
-  }
 
-  private boolean arrayCompletesPendingMatch(byte[] array, int off, int end) {
-    int pendingMatchLength = marker.length - matchingPos;
-    if (off + pendingMatchLength > end) {
-      return false;
-    }
-    for (int i = 0; i < pendingMatchLength; i++) {
-      if (array[off + i] != marker[matchingPos + i]) {
-        return false;
-      }
+    private void drain() throws IOException {
+        if (count > 0) {
+            boolean wasFiltering = filter;
+            filter = false;
+            wasDraining = true;
+            int start = (pos - count + lookbehind.length) % lookbehind.length;
+            int cnt = count;
+            for (int i = 0; i < cnt; i++) {
+                downstream.write(lookbehind[(start + i) % lookbehind.length]);
+                bytesWritten++;
+                count--;
+            }
+            filter = wasFiltering;
+            wasDraining = false;
+        }
     }
-    return true;
-  }
 
-  private int arrayContains(byte[] array, int off, int end, byte[] search) {
-    for (int i = off; i <= end - search.length; i++) {
-      if (array[i] == search[0]) {
-        boolean found = true;
-        int k = i;
-        for (int j = 1; j < search.length; j++) {
-          k++;
-          if (array[k] != search[j]) {
-            found = false;
-            break;
-          }
-        }
-        if (found) {
-          return i;
+    public void commit() throws IOException {
+        if (filter || wasDraining) {
+            drain();
         }
-      }
     }
-    return -1;
-  }
 
-  private void drain() throws IOException {
-    if (count > 0) {
-      boolean wasFiltering = filter;
-      filter = false;
-      wasDraining = true;
-      int start = (pos - count + lookbehind.length) % lookbehind.length;
-      int cnt = count;
-      for (int i = 0; i < cnt; i++) {
-        downstream.write(lookbehind[(start + i) % lookbehind.length]);
-        bytesWritten++;
-        count--;
-      }
-      filter = wasFiltering;
-      wasDraining = false;
+    @Override
+    public void flush() throws IOException {
+        downstream.flush();
     }
-  }
 
-  public void commit() throws IOException {
-    if (filter || wasDraining) {
-      drain();
+    @Override
+    public void close() throws IOException {
+        try {
+            commit();
+            // report the size of the original HTTP response before injecting via callback
+            if (onBytesWritten != null) {
+                onBytesWritten.accept(bytesWritten);
+            }
+            bytesWritten = 0;
+        } finally {
+            downstream.close();
+        }
     }
-  }
 
-  @Override
-  public void flush() throws IOException {
-    downstream.flush();
-  }
-
-  @Override
-  public void close() throws IOException {
-    try {
-      commit();
-      // report the size of the original HTTP response before injecting via callback
-      if (onBytesWritten != null) {
-        onBytesWritten.accept(bytesWritten);
-      }
-      bytesWritten = 0;
-    } finally {
-      downstream.close();
+    public void setFilter(boolean filter) {
+        this.filter = filter;
     }
-  }
-
-  public void setFilter(boolean filter) {
-    this.filter = filter;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/buffer/InjectingPipeWriter.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/buffer/InjectingPipeWriter.java
index a7439abaacf..78afae83742 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/buffer/InjectingPipeWriter.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/buffer/InjectingPipeWriter.java
@@ -13,260 +13,259 @@
  */
 @NotThreadSafe
 public class InjectingPipeWriter extends Writer {
-  private final char[] lookbehind;
-  private int pos;
-  private int count;
-  private final char[] marker;
-  private final char[] contentToInject;
-  private boolean filter;
-  private boolean wasDraining;
-  private int matchingPos;
-  private final Runnable onContentInjected;
-  private final int bulkWriteThreshold;
-  private final Writer downstream;
-  private final LongConsumer onBytesWritten;
-  private final LongConsumer onInjectionTime;
-  private long bytesWritten = 0;
+    private final char[] lookbehind;
+    private int pos;
+    private int count;
+    private final char[] marker;
+    private final char[] contentToInject;
+    private boolean filter;
+    private boolean wasDraining;
+    private int matchingPos;
+    private final Runnable onContentInjected;
+    private final int bulkWriteThreshold;
+    private final Writer downstream;
+    private final LongConsumer onBytesWritten;
+    private final LongConsumer onInjectionTime;
+    private long bytesWritten = 0;
 
-  /**
-   * This constructor is typically used for testing where we care about the logic and not the
-   * telemetry.
-   *
-   * @param downstream the delegate writer
-   * @param marker the marker to find in the stream. Must at least be one char.
-   * @param contentToInject the content to inject once before the marker if found.
-   */
-  public InjectingPipeWriter(
-      final Writer downstream, final char[] marker, final char[] contentToInject) {
-    this(downstream, marker, contentToInject, null, null, null);
-  }
-
-  /**
-   * This constructor contains the full set of parameters.
-   *
-   * @param downstream the delegate writer
-   * @param marker the marker to find in the stream. Must at least be one char.
-   * @param contentToInject the content to inject once before the marker if found.
-   * @param onContentInjected callback called when and if the content is injected.
-   * @param onBytesWritten callback called when writer is closed to report total bytes written.
-   * @param onInjectionTime callback called with the time in milliseconds taken to write the
-   *     injection content.
-   */
-  public InjectingPipeWriter(
-      final Writer downstream,
-      final char[] marker,
-      final char[] contentToInject,
-      final Runnable onContentInjected,
-      final LongConsumer onBytesWritten,
-      final LongConsumer onInjectionTime) {
-    this.downstream = downstream;
-    this.marker = marker;
-    this.lookbehind = new char[marker.length];
-    this.pos = 0;
-    this.count = 0;
-    this.matchingPos = 0;
-    this.wasDraining = false;
-    // should filter the stream to potentially inject into it.
-    this.filter = true;
-    this.contentToInject = contentToInject;
-    this.onContentInjected = onContentInjected;
-    this.onBytesWritten = onBytesWritten;
-    this.onInjectionTime = onInjectionTime;
-    this.bulkWriteThreshold = marker.length * 2 - 2;
-  }
-
-  @Override
-  public void write(int c) throws IOException {
-    if (!filter) {
-      if (wasDraining) {
-        // continue draining
-        drain();
-      }
-      downstream.write(c);
-      bytesWritten++;
-      return;
+    /**
+     * This constructor is typically used for testing where we care about the logic and not the
+     * telemetry.
+     *
+     * @param downstream the delegate writer
+     * @param marker the marker to find in the stream. Must at least be one char.
+     * @param contentToInject the content to inject once before the marker if found.
+     */
+    public InjectingPipeWriter(final Writer downstream, final char[] marker, final char[] contentToInject) {
+        this(downstream, marker, contentToInject, null, null, null);
     }
 
-    if (count == lookbehind.length) {
-      downstream.write(lookbehind[pos]);
-      bytesWritten++;
-    } else {
-      count++;
+    /**
+     * This constructor contains the full set of parameters.
+     *
+     * @param downstream the delegate writer
+     * @param marker the marker to find in the stream. Must at least be one char.
+     * @param contentToInject the content to inject once before the marker if found.
+     * @param onContentInjected callback called when and if the content is injected.
+     * @param onBytesWritten callback called when writer is closed to report total bytes written.
+     * @param onInjectionTime callback called with the time in milliseconds taken to write the
+     *     injection content.
+     */
+    public InjectingPipeWriter(
+            final Writer downstream,
+            final char[] marker,
+            final char[] contentToInject,
+            final Runnable onContentInjected,
+            final LongConsumer onBytesWritten,
+            final LongConsumer onInjectionTime) {
+        this.downstream = downstream;
+        this.marker = marker;
+        this.lookbehind = new char[marker.length];
+        this.pos = 0;
+        this.count = 0;
+        this.matchingPos = 0;
+        this.wasDraining = false;
+        // should filter the stream to potentially inject into it.
+        this.filter = true;
+        this.contentToInject = contentToInject;
+        this.onContentInjected = onContentInjected;
+        this.onBytesWritten = onBytesWritten;
+        this.onInjectionTime = onInjectionTime;
+        this.bulkWriteThreshold = marker.length * 2 - 2;
     }
 
-    lookbehind[pos] = (char) c;
-    pos = (pos + 1) % lookbehind.length;
-
-    if (marker[matchingPos++] == c) {
-      if (matchingPos == marker.length) {
-        filter = false;
-        long injectionStart = System.nanoTime();
-        downstream.write(contentToInject);
-        long injectionEnd = System.nanoTime();
-        if (onInjectionTime != null) {
-          onInjectionTime.accept((injectionEnd - injectionStart) / 1_000_000L);
+    @Override
+    public void write(int c) throws IOException {
+        if (!filter) {
+            if (wasDraining) {
+                // continue draining
+                drain();
+            }
+            downstream.write(c);
+            bytesWritten++;
+            return;
         }
-        if (onContentInjected != null) {
-          onContentInjected.run();
+
+        if (count == lookbehind.length) {
+            downstream.write(lookbehind[pos]);
+            bytesWritten++;
+        } else {
+            count++;
         }
-        drain();
-      }
-    } else {
-      matchingPos = 0;
-    }
-  }
 
-  @Override
-  public void write(char[] array, int off, int len) throws IOException {
-    final int end = off + len;
-    if (!filter) {
-      if (wasDraining) {
-        // needs drain
-        drain();
-      }
-      downstream.write(array, off, len);
-      bytesWritten += len;
-      return;
-    }
+        lookbehind[pos] = (char) c;
+        pos = (pos + 1) % lookbehind.length;
 
-    if (len > bulkWriteThreshold) {
-      // A match that started in the previous write precedes every match wholly in this array.
-      if (matchingPos > 0 && arrayCompletesPendingMatch(array, off, end)) {
-        int pendingMatchLength = marker.length - matchingPos;
-        for (int i = off; i < off + pendingMatchLength; i++) {
-          write(array[i]);
+        if (marker[matchingPos++] == c) {
+            if (matchingPos == marker.length) {
+                filter = false;
+                long injectionStart = System.nanoTime();
+                downstream.write(contentToInject);
+                long injectionEnd = System.nanoTime();
+                if (onInjectionTime != null) {
+                    onInjectionTime.accept((injectionEnd - injectionStart) / 1_000_000L);
+                }
+                if (onContentInjected != null) {
+                    onContentInjected.run();
+                }
+                drain();
+            }
+        } else {
+            matchingPos = 0;
         }
-        write(array, off + pendingMatchLength, len - pendingMatchLength);
-        return;
-      }
+    }
 
-      // if the content is large enough, we can bulk write everything but the N trail and tail.
-      // This because the buffer can already contain some byte from a previous single write.
-      // Also we need to fill the buffer with the tail since we don't know about the next write.
-      int idx = arrayContains(array, off, end, marker);
-      if (idx >= 0) {
-        // we have a full match. just write everything
-        filter = false;
-        drain();
-        int bytesToWrite = idx - off;
-        downstream.write(array, off, bytesToWrite);
-        bytesWritten += bytesToWrite;
-        long injectionStart = System.nanoTime();
-        downstream.write(contentToInject);
-        long injectionEnd = System.nanoTime();
-        if (onInjectionTime != null) {
-          onInjectionTime.accept((injectionEnd - injectionStart) / 1_000_000L);
-        }
-        if (onContentInjected != null) {
-          onContentInjected.run();
+    @Override
+    public void write(char[] array, int off, int len) throws IOException {
+        final int end = off + len;
+        if (!filter) {
+            if (wasDraining) {
+                // needs drain
+                drain();
+            }
+            downstream.write(array, off, len);
+            bytesWritten += len;
+            return;
         }
-        bytesToWrite = end - idx;
-        downstream.write(array, idx, bytesToWrite);
-        bytesWritten += bytesToWrite;
-      } else {
-        // we don't have a full match. write everything in a bulk except the lookbehind buffer
-        // sequentially
-        for (int i = off; i < off + marker.length - 1; i++) {
-          write(array[i]);
-        }
-        drain();
-        boolean wasFiltering = filter;
 
-        // will be reset if no errors after the following write
-        filter = false;
-        int bytesToWrite = len - bulkWriteThreshold;
-        downstream.write(array, off + marker.length - 1, bytesToWrite);
-        bytesWritten += bytesToWrite;
-        filter = wasFiltering;
+        if (len > bulkWriteThreshold) {
+            // A match that started in the previous write precedes every match wholly in this array.
+            if (matchingPos > 0 && arrayCompletesPendingMatch(array, off, end)) {
+                int pendingMatchLength = marker.length - matchingPos;
+                for (int i = off; i < off + pendingMatchLength; i++) {
+                    write(array[i]);
+                }
+                write(array, off + pendingMatchLength, len - pendingMatchLength);
+                return;
+            }
+
+            // if the content is large enough, we can bulk write everything but the N trail and tail.
+            // This because the buffer can already contain some byte from a previous single write.
+            // Also we need to fill the buffer with the tail since we don't know about the next write.
+            int idx = arrayContains(array, off, end, marker);
+            if (idx >= 0) {
+                // we have a full match. just write everything
+                filter = false;
+                drain();
+                int bytesToWrite = idx - off;
+                downstream.write(array, off, bytesToWrite);
+                bytesWritten += bytesToWrite;
+                long injectionStart = System.nanoTime();
+                downstream.write(contentToInject);
+                long injectionEnd = System.nanoTime();
+                if (onInjectionTime != null) {
+                    onInjectionTime.accept((injectionEnd - injectionStart) / 1_000_000L);
+                }
+                if (onContentInjected != null) {
+                    onContentInjected.run();
+                }
+                bytesToWrite = end - idx;
+                downstream.write(array, idx, bytesToWrite);
+                bytesWritten += bytesToWrite;
+            } else {
+                // we don't have a full match. write everything in a bulk except the lookbehind buffer
+                // sequentially
+                for (int i = off; i < off + marker.length - 1; i++) {
+                    write(array[i]);
+                }
+                drain();
+                boolean wasFiltering = filter;
 
-        for (int i = end - marker.length + 1; i < end; i++) {
-          write(array[i]);
+                // will be reset if no errors after the following write
+                filter = false;
+                int bytesToWrite = len - bulkWriteThreshold;
+                downstream.write(array, off + marker.length - 1, bytesToWrite);
+                bytesWritten += bytesToWrite;
+                filter = wasFiltering;
+
+                for (int i = end - marker.length + 1; i < end; i++) {
+                    write(array[i]);
+                }
+            }
+        } else {
+            // use slow path because the length to write is small and within the lookbehind buffer size
+            for (int i = off; i < end; i++) {
+                write(array[i]);
+            }
         }
-      }
-    } else {
-      // use slow path because the length to write is small and within the lookbehind buffer size
-      for (int i = off; i < end; i++) {
-        write(array[i]);
-      }
     }
-  }
 
-  private boolean arrayCompletesPendingMatch(char[] array, int off, int end) {
-    int pendingMatchLength = marker.length - matchingPos;
-    if (off + pendingMatchLength > end) {
-      return false;
-    }
-    for (int i = 0; i < pendingMatchLength; i++) {
-      if (array[off + i] != marker[matchingPos + i]) {
-        return false;
-      }
+    private boolean arrayCompletesPendingMatch(char[] array, int off, int end) {
+        int pendingMatchLength = marker.length - matchingPos;
+        if (off + pendingMatchLength > end) {
+            return false;
+        }
+        for (int i = 0; i < pendingMatchLength; i++) {
+            if (array[off + i] != marker[matchingPos + i]) {
+                return false;
+            }
+        }
+        return true;
     }
-    return true;
-  }
 
-  private int arrayContains(char[] array, int off, int end, char[] search) {
-    for (int i = off; i <= end - search.length; i++) {
-      if (array[i] == search[0]) {
-        boolean found = true;
-        int k = i;
-        for (int j = 1; j < search.length; j++) {
-          k++;
-          if (array[k] != search[j]) {
-            found = false;
-            break;
-          }
-        }
-        if (found) {
-          return i;
+    private int arrayContains(char[] array, int off, int end, char[] search) {
+        for (int i = off; i <= end - search.length; i++) {
+            if (array[i] == search[0]) {
+                boolean found = true;
+                int k = i;
+                for (int j = 1; j < search.length; j++) {
+                    k++;
+                    if (array[k] != search[j]) {
+                        found = false;
+                        break;
+                    }
+                }
+                if (found) {
+                    return i;
+                }
+            }
         }
-      }
+        return -1;
     }
-    return -1;
-  }
 
-  private void drain() throws IOException {
-    if (count > 0) {
-      boolean wasFiltering = filter;
-      filter = false;
-      wasDraining = true;
-      int start = (pos - count + lookbehind.length) % lookbehind.length;
-      int cnt = count;
-      for (int i = 0; i < cnt; i++) {
-        downstream.write(lookbehind[(start + i) % lookbehind.length]);
-        bytesWritten++;
-        count--;
-      }
-      filter = wasFiltering;
-      wasDraining = false;
+    private void drain() throws IOException {
+        if (count > 0) {
+            boolean wasFiltering = filter;
+            filter = false;
+            wasDraining = true;
+            int start = (pos - count + lookbehind.length) % lookbehind.length;
+            int cnt = count;
+            for (int i = 0; i < cnt; i++) {
+                downstream.write(lookbehind[(start + i) % lookbehind.length]);
+                bytesWritten++;
+                count--;
+            }
+            filter = wasFiltering;
+            wasDraining = false;
+        }
     }
-  }
 
-  public void commit() throws IOException {
-    if (filter || wasDraining) {
-      drain();
+    public void commit() throws IOException {
+        if (filter || wasDraining) {
+            drain();
+        }
     }
-  }
 
-  @Override
-  public void flush() throws IOException {
-    downstream.flush();
-  }
+    @Override
+    public void flush() throws IOException {
+        downstream.flush();
+    }
 
-  @Override
-  public void close() throws IOException {
-    try {
-      commit();
-    } finally {
-      downstream.close();
-      // report the size of the original HTTP response before injecting via callback
-      if (onBytesWritten != null) {
-        onBytesWritten.accept(bytesWritten);
-      }
-      bytesWritten = 0;
+    @Override
+    public void close() throws IOException {
+        try {
+            commit();
+        } finally {
+            downstream.close();
+            // report the size of the original HTTP response before injecting via callback
+            if (onBytesWritten != null) {
+                onBytesWritten.accept(bytesWritten);
+            }
+            bytesWritten = 0;
+        }
     }
-  }
 
-  public void setFilter(boolean filter) {
-    this.filter = filter;
-  }
+    public void setFilter(boolean filter) {
+        this.filter = filter;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/classloading/ClassDefining.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/classloading/ClassDefining.java
index 23ec54e1cdd..1d55ae4a382 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/classloading/ClassDefining.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/classloading/ClassDefining.java
@@ -4,23 +4,23 @@
 
 /** Provides a way for a single optional observer to be notified before a class is defined. */
 public final class ClassDefining {
-  private static final AtomicBoolean HAS_OBSERVER = new AtomicBoolean();
-  private static volatile Observer OBSERVER = (loader, bytecode, offset, length) -> {};
+    private static final AtomicBoolean HAS_OBSERVER = new AtomicBoolean();
+    private static volatile Observer OBSERVER = (loader, bytecode, offset, length) -> {};
 
-  /** Registers the given observer to get notifications about class definitions. */
-  public static void observe(Observer observer) {
-    if (HAS_OBSERVER.compareAndSet(false, true)) {
-      OBSERVER = observer; // set once in premain
+    /** Registers the given observer to get notifications about class definitions. */
+    public static void observe(Observer observer) {
+        if (HAS_OBSERVER.compareAndSet(false, true)) {
+            OBSERVER = observer; // set once in premain
+        }
     }
-  }
 
-  /** Called from advice added to j.l.ClassLoader by DefineClassInstrumentation. */
-  public static void begin(ClassLoader loader, byte[] bytecode, int offset, int length) {
-    OBSERVER.beforeDefineClass(loader, bytecode, offset, length);
-  }
+    /** Called from advice added to j.l.ClassLoader by DefineClassInstrumentation. */
+    public static void begin(ClassLoader loader, byte[] bytecode, int offset, int length) {
+        OBSERVER.beforeDefineClass(loader, bytecode, offset, length);
+    }
 
-  /** Observer of class definitions. */
-  public interface Observer {
-    void beforeDefineClass(ClassLoader loader, byte[] bytecode, int offset, int length);
-  }
+    /** Observer of class definitions. */
+    public interface Observer {
+        void beforeDefineClass(ClassLoader loader, byte[] bytecode, int offset, int length);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenter.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenter.java
index 3bf071997b1..01b4eef3378 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenter.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenter.java
@@ -16,157 +16,154 @@
 
 /** Shared database comment builder for generating trace context comments for SQL DBs and MongoDB */
 public class SharedDBCommenter {
-  private static final Logger log = LoggerFactory.getLogger(SharedDBCommenter.class);
-  private static final String UTF8 = StandardCharsets.UTF_8.toString();
-
-  private static final char EQUALS = '=';
-  private static final char COMMA = ',';
-  private static final char QUOTE = '\'';
-
-  // Injected fields. When adding a new one, be sure to update this and the methods below.
-  private static final String PARENT_SERVICE = encode("ddps");
-  private static final String DATABASE_SERVICE = encode("dddbs");
-  private static final String DD_HOSTNAME = encode("ddh");
-  private static final String DD_DB_NAME = encode("dddb");
-  private static final String DD_PEER_SERVICE = "ddprs";
-  private static final String DD_ENV = encode("dde");
-  private static final String DD_VERSION = encode("ddpv");
-  private static final String TRACEPARENT = encode("traceparent");
-  private static final String DD_SERVICE_HASH = encode("ddsh");
-
-  // Pre-built "<key>=" needles for containsTraceComment, computed once at class init. The keys
-  // are assigned via encode(...), so "KEY + =" is a runtime concat, not a compile-time constant;
-  // doing it per call allocated nine throwaway Strings on every non-matching check.
-  private static final String PARENT_SERVICE_EQ = PARENT_SERVICE + "=";
-  private static final String DATABASE_SERVICE_EQ = DATABASE_SERVICE + "=";
-  private static final String DD_HOSTNAME_EQ = DD_HOSTNAME + "=";
-  private static final String DD_DB_NAME_EQ = DD_DB_NAME + "=";
-  private static final String DD_PEER_SERVICE_EQ = DD_PEER_SERVICE + "=";
-  private static final String DD_ENV_EQ = DD_ENV + "=";
-  private static final String DD_VERSION_EQ = DD_VERSION + "=";
-  private static final String TRACEPARENT_EQ = TRACEPARENT + "=";
-  private static final String DD_SERVICE_HASH_EQ = DD_SERVICE_HASH + "=";
-
-  // Pre-encoded "key='encoded_value'" fragments for the invariant fields (the values
-  // come from Config are effectively immutable post-init in production).
-  // Note about the visibility: needs to be visible but can tolerate races (reason why it's not
-  // atomic)
-  private static volatile boolean staticPrefixComputed = false;
-  private static volatile String staticPrefix;
-
-  // Used by SQLCommenter and MongoCommentInjector to avoid duplicate comment injection. Mongo
-  // passes the already-extracted comment body; SQLCommenter uses the range overload to check it
-  // in place. Both run the same nine "<key>=" needle checks.
-  public static boolean containsTraceComment(String commentContent) {
-    return containsTraceComment(commentContent, 0, commentContent.length());
-  }
-
-  /**
-   * Range overload: true if {@code sql} contains a trace-comment needle fully within {@code [from,
-   * to)} -- checks the comment body in place, with no substring allocation of the region.
-   */
-  public static boolean containsTraceComment(String sql, int from, int to) {
-    // Zero-copy view of the comment body; reads like ordinary String.contains, no substring.
-    SubSequence comment = SubSequence.of(sql, from, to);
-    return comment.contains(PARENT_SERVICE_EQ)
-        || comment.contains(DATABASE_SERVICE_EQ)
-        || comment.contains(DD_HOSTNAME_EQ)
-        || comment.contains(DD_DB_NAME_EQ)
-        || comment.contains(DD_PEER_SERVICE_EQ)
-        || comment.contains(DD_ENV_EQ)
-        || comment.contains(DD_VERSION_EQ)
-        || comment.contains(TRACEPARENT_EQ)
-        || comment.contains(DD_SERVICE_HASH_EQ);
-  }
-
-  // Build database comment content without comment delimiters such as /* */
-  public static String buildComment(
-      String dbService, String dbType, String hostname, String dbName, String traceParent) {
-    ensureStaticPrefixComputed();
-    String service = encode(dbService);
-    String host = encode(hostname);
-    String database = encode(dbName);
-    String peerService = encode(getPeerService());
-    String parent = encode(traceParent);
-    Config config = Config.get();
-    String serviceHash =
-        config.isDbmInjectSqlBaseHash() && config.isExperimentalPropagateProcessTagsEnabled()
-            ? encode(BaseHash.getBaseHashStr())
-            : null;
-    long capacity =
-        staticPrefix.length()
-            + fieldSize(DATABASE_SERVICE, service)
-            + fieldSize(DD_HOSTNAME, host)
-            + fieldSize(DD_DB_NAME, database)
-            + fieldSize(DD_PEER_SERVICE, peerService)
-            + fieldSize(TRACEPARENT, parent)
-            + fieldSize(DD_SERVICE_HASH, serviceHash);
-    StringBuilder sb =
-        new StringBuilder((int) Math.min(capacity, Integer.MAX_VALUE)).append(staticPrefix);
-    appendEncoded(sb, DATABASE_SERVICE, service);
-    appendEncoded(sb, DD_HOSTNAME, host);
-    appendEncoded(sb, DD_DB_NAME, database);
-    appendEncoded(sb, DD_PEER_SERVICE, peerService);
-    appendEncoded(sb, TRACEPARENT, parent);
-    appendEncoded(sb, DD_SERVICE_HASH, serviceHash);
-    return sb.length() > 0 ? sb.toString() : null;
-  }
-
-  private static void ensureStaticPrefixComputed() {
-    if (staticPrefixComputed) {
-      return;
+    private static final Logger log = LoggerFactory.getLogger(SharedDBCommenter.class);
+    private static final String UTF8 = StandardCharsets.UTF_8.toString();
+
+    private static final char EQUALS = '=';
+    private static final char COMMA = ',';
+    private static final char QUOTE = '\'';
+
+    // Injected fields. When adding a new one, be sure to update this and the methods below.
+    private static final String PARENT_SERVICE = encode("ddps");
+    private static final String DATABASE_SERVICE = encode("dddbs");
+    private static final String DD_HOSTNAME = encode("ddh");
+    private static final String DD_DB_NAME = encode("dddb");
+    private static final String DD_PEER_SERVICE = "ddprs";
+    private static final String DD_ENV = encode("dde");
+    private static final String DD_VERSION = encode("ddpv");
+    private static final String TRACEPARENT = encode("traceparent");
+    private static final String DD_SERVICE_HASH = encode("ddsh");
+
+    // Pre-built "<key>=" needles for containsTraceComment, computed once at class init. The keys
+    // are assigned via encode(...), so "KEY + =" is a runtime concat, not a compile-time constant;
+    // doing it per call allocated nine throwaway Strings on every non-matching check.
+    private static final String PARENT_SERVICE_EQ = PARENT_SERVICE + "=";
+    private static final String DATABASE_SERVICE_EQ = DATABASE_SERVICE + "=";
+    private static final String DD_HOSTNAME_EQ = DD_HOSTNAME + "=";
+    private static final String DD_DB_NAME_EQ = DD_DB_NAME + "=";
+    private static final String DD_PEER_SERVICE_EQ = DD_PEER_SERVICE + "=";
+    private static final String DD_ENV_EQ = DD_ENV + "=";
+    private static final String DD_VERSION_EQ = DD_VERSION + "=";
+    private static final String TRACEPARENT_EQ = TRACEPARENT + "=";
+    private static final String DD_SERVICE_HASH_EQ = DD_SERVICE_HASH + "=";
+
+    // Pre-encoded "key='encoded_value'" fragments for the invariant fields (the values
+    // come from Config are effectively immutable post-init in production).
+    // Note about the visibility: needs to be visible but can tolerate races (reason why it's not
+    // atomic)
+    private static volatile boolean staticPrefixComputed = false;
+    private static volatile String staticPrefix;
+
+    // Used by SQLCommenter and MongoCommentInjector to avoid duplicate comment injection. Mongo
+    // passes the already-extracted comment body; SQLCommenter uses the range overload to check it
+    // in place. Both run the same nine "<key>=" needle checks.
+    public static boolean containsTraceComment(String commentContent) {
+        return containsTraceComment(commentContent, 0, commentContent.length());
     }
-    Config config = Config.get();
-    final StringBuilder sb = new StringBuilder(512); // big enough not to be resized
-
-    appendEncoded(sb, PARENT_SERVICE, encode(config.getServiceName()));
-    appendEncoded(sb, DD_ENV, encode(config.getEnv()));
-    appendEncoded(sb, DD_VERSION, encode(config.getVersion()));
-    staticPrefix = sb.toString();
-    staticPrefixComputed = true;
-  }
-
-  @VisibleForTesting
-  public static void resetStaticPrefixForTesting() {
-    staticPrefixComputed = false;
-  }
-
-  private static String getPeerService() {
-    AgentSpan span = activeSpan();
-    Object peerService = null;
-    if (span != null) {
-      // FIXME: this will never work since peer service is computed later if enabled
-      peerService = span.getTag(Tags.PEER_SERVICE);
+
+    /**
+     * Range overload: true if {@code sql} contains a trace-comment needle fully within {@code [from,
+     * to)} -- checks the comment body in place, with no substring allocation of the region.
+     */
+    public static boolean containsTraceComment(String sql, int from, int to) {
+        // Zero-copy view of the comment body; reads like ordinary String.contains, no substring.
+        SubSequence comment = SubSequence.of(sql, from, to);
+        return comment.contains(PARENT_SERVICE_EQ)
+                || comment.contains(DATABASE_SERVICE_EQ)
+                || comment.contains(DD_HOSTNAME_EQ)
+                || comment.contains(DD_DB_NAME_EQ)
+                || comment.contains(DD_PEER_SERVICE_EQ)
+                || comment.contains(DD_ENV_EQ)
+                || comment.contains(DD_VERSION_EQ)
+                || comment.contains(TRACEPARENT_EQ)
+                || comment.contains(DD_SERVICE_HASH_EQ);
+    }
+
+    // Build database comment content without comment delimiters such as /* */
+    public static String buildComment(
+            String dbService, String dbType, String hostname, String dbName, String traceParent) {
+        ensureStaticPrefixComputed();
+        String service = encode(dbService);
+        String host = encode(hostname);
+        String database = encode(dbName);
+        String peerService = encode(getPeerService());
+        String parent = encode(traceParent);
+        Config config = Config.get();
+        String serviceHash = config.isDbmInjectSqlBaseHash() && config.isExperimentalPropagateProcessTagsEnabled()
+                ? encode(BaseHash.getBaseHashStr())
+                : null;
+        long capacity = staticPrefix.length()
+                + fieldSize(DATABASE_SERVICE, service)
+                + fieldSize(DD_HOSTNAME, host)
+                + fieldSize(DD_DB_NAME, database)
+                + fieldSize(DD_PEER_SERVICE, peerService)
+                + fieldSize(TRACEPARENT, parent)
+                + fieldSize(DD_SERVICE_HASH, serviceHash);
+        StringBuilder sb = new StringBuilder((int) Math.min(capacity, Integer.MAX_VALUE)).append(staticPrefix);
+        appendEncoded(sb, DATABASE_SERVICE, service);
+        appendEncoded(sb, DD_HOSTNAME, host);
+        appendEncoded(sb, DD_DB_NAME, database);
+        appendEncoded(sb, DD_PEER_SERVICE, peerService);
+        appendEncoded(sb, TRACEPARENT, parent);
+        appendEncoded(sb, DD_SERVICE_HASH, serviceHash);
+        return sb.length() > 0 ? sb.toString() : null;
+    }
+
+    private static void ensureStaticPrefixComputed() {
+        if (staticPrefixComputed) {
+            return;
+        }
+        Config config = Config.get();
+        final StringBuilder sb = new StringBuilder(512); // big enough not to be resized
+
+        appendEncoded(sb, PARENT_SERVICE, encode(config.getServiceName()));
+        appendEncoded(sb, DD_ENV, encode(config.getEnv()));
+        appendEncoded(sb, DD_VERSION, encode(config.getVersion()));
+        staticPrefix = sb.toString();
+        staticPrefixComputed = true;
     }
-    return peerService != null ? peerService.toString() : null;
-  }
 
-  private static String encode(String val) {
-    if (val == null || val.isEmpty()) {
-      return null;
+    @VisibleForTesting
+    public static void resetStaticPrefixForTesting() {
+        staticPrefixComputed = false;
     }
-    try {
-      return URLEncoder.encode(val, UTF8);
-    } catch (UnsupportedEncodingException exe) {
-      if (log.isDebugEnabled()) {
-        log.debug("exception thrown while encoding comment key {}", val, exe);
-      }
+
+    private static String getPeerService() {
+        AgentSpan span = activeSpan();
+        Object peerService = null;
+        if (span != null) {
+            // FIXME: this will never work since peer service is computed later if enabled
+            peerService = span.getTag(Tags.PEER_SERVICE);
+        }
+        return peerService != null ? peerService.toString() : null;
     }
-    return val;
-  }
 
-  /** Includes a possible separator, equals sign and quotes for a nonempty encoded field. */
-  private static long fieldSize(String key, String value) {
-    return value == null ? 0 : (long) key.length() + value.length() + 4;
-  }
+    private static String encode(String val) {
+        if (val == null || val.isEmpty()) {
+            return null;
+        }
+        try {
+            return URLEncoder.encode(val, UTF8);
+        } catch (UnsupportedEncodingException exe) {
+            if (log.isDebugEnabled()) {
+                log.debug("exception thrown while encoding comment key {}", val, exe);
+            }
+        }
+        return val;
+    }
 
-  private static void appendEncoded(StringBuilder sb, String key, String value) {
-    if (value == null) {
-      return;
+    /** Includes a possible separator, equals sign and quotes for a nonempty encoded field. */
+    private static long fieldSize(String key, String value) {
+        return value == null ? 0 : (long) key.length() + value.length() + 4;
     }
-    if (sb.length() > 0) {
-      sb.append(COMMA);
+
+    private static void appendEncoded(StringBuilder sb, String key, String value) {
+        if (value == null) {
+            return;
+        }
+        if (sb.length() > 0) {
+            sb.append(COMMA);
+        }
+        sb.append(key).append(EQUALS).append(QUOTE).append(value).append(QUOTE);
     }
-    sb.append(key).append(EQUALS).append(QUOTE).append(value).append(QUOTE);
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/AsyncResultDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/AsyncResultDecorator.java
index 994cf8658a8..58fc7d600da 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/AsyncResultDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/AsyncResultDecorator.java
@@ -11,23 +11,23 @@
  */
 public abstract class AsyncResultDecorator extends BaseDecorator {
 
-  /**
-   * Look for asynchronous result and decorate it with span finisher. If the result is not
-   * asynchronous, it will be return unmodified and span will be finished.
-   *
-   * @param result The result to check type.
-   * @param span The related span to finish.
-   * @return An asynchronous result that will finish the span if the result is asynchronous, the
-   *     original result otherwise.
-   */
-  public Object wrapAsyncResultOrFinishSpan(
-      final Object result, final Class<?> methodReturnType, final AgentSpan span) {
-    Object applied = AsyncResultExtensions.wrapAsyncResult(result, methodReturnType, span);
-    if (applied != null) {
-      return applied;
+    /**
+     * Look for asynchronous result and decorate it with span finisher. If the result is not
+     * asynchronous, it will be return unmodified and span will be finished.
+     *
+     * @param result The result to check type.
+     * @param span The related span to finish.
+     * @return An asynchronous result that will finish the span if the result is asynchronous, the
+     *     original result otherwise.
+     */
+    public Object wrapAsyncResultOrFinishSpan(
+            final Object result, final Class<?> methodReturnType, final AgentSpan span) {
+        Object applied = AsyncResultExtensions.wrapAsyncResult(result, methodReturnType, span);
+        if (applied != null) {
+            return applied;
+        }
+        // If no extension was applied, immediately finish the span and return the original result
+        span.finish();
+        return result;
     }
-    // If no extension was applied, immediately finish the span and return the original result
-    span.finish();
-    return result;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java
index 5c6628c5d35..6e9f20e1487 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java
@@ -27,232 +27,221 @@
 
 @ParametersAreNonnullByDefault
 public abstract class BaseDecorator {
-  private static final Logger log = LoggerFactory.getLogger(BaseDecorator.class);
-
-  protected static final int UNSET_PORT = 0;
-
-  private static final QualifiedClassNameCache CLASS_NAMES =
-      new QualifiedClassNameCache(
-          new Function<Class<?>, CharSequence>() {
-            @Override
-            public String apply(Class<?> clazz) {
-              String simpleName = clazz.getSimpleName();
-              if (simpleName.isEmpty()) {
-                String name = clazz.getName();
-                int start = name.lastIndexOf('.');
-                return name.substring(start + 1);
-              }
-              return simpleName;
-            }
-          },
-          Functions.PrefixJoin.of("."));
+    private static final Logger log = LoggerFactory.getLogger(BaseDecorator.class);
+
+    protected static final int UNSET_PORT = 0;
 
-  protected final boolean traceAnalyticsEnabled;
-  protected final double traceAnalyticsSampleRate;
+    private static final QualifiedClassNameCache CLASS_NAMES = new QualifiedClassNameCache(
+            new Function<Class<?>, CharSequence>() {
+                @Override
+                public String apply(Class<?> clazz) {
+                    String simpleName = clazz.getSimpleName();
+                    if (simpleName.isEmpty()) {
+                        String name = clazz.getName();
+                        int start = name.lastIndexOf('.');
+                        return name.substring(start + 1);
+                    }
+                    return simpleName;
+                }
+            },
+            Functions.PrefixJoin.of("."));
 
-  private final TagMap.Entry traceAnalyticsEntry;
+    protected final boolean traceAnalyticsEnabled;
+    protected final double traceAnalyticsSampleRate;
 
-  // Deliberately not volatile, reading null and repeating the calculation is safe
-  private TagMap.Entry cachedComponentEntry = null;
+    private final TagMap.Entry traceAnalyticsEntry;
 
-  protected BaseDecorator() {
-    final Config config = Config.get();
-    final String[] instrumentationNames = instrumentationNames();
+    // Deliberately not volatile, reading null and repeating the calculation is safe
+    private TagMap.Entry cachedComponentEntry = null;
 
-    this.traceAnalyticsEnabled =
-        instrumentationNames.length > 0
-            && config.isTraceAnalyticsIntegrationEnabled(
-                traceAnalyticsDefault(), instrumentationNames);
+    protected BaseDecorator() {
+        final Config config = Config.get();
+        final String[] instrumentationNames = instrumentationNames();
 
-    this.traceAnalyticsSampleRate =
-        (double) config.getInstrumentationAnalyticsSampleRate(instrumentationNames);
+        this.traceAnalyticsEnabled = instrumentationNames.length > 0
+                && config.isTraceAnalyticsIntegrationEnabled(traceAnalyticsDefault(), instrumentationNames);
 
-    this.traceAnalyticsEntry =
-        this.traceAnalyticsEnabled
-            ? TagMap.Entry.create(DDTags.ANALYTICS_SAMPLE_RATE, traceAnalyticsSampleRate)
-            : null;
-  }
+        this.traceAnalyticsSampleRate = (double) config.getInstrumentationAnalyticsSampleRate(instrumentationNames);
+
+        this.traceAnalyticsEntry = this.traceAnalyticsEnabled
+                ? TagMap.Entry.create(DDTags.ANALYTICS_SAMPLE_RATE, traceAnalyticsSampleRate)
+                : null;
+    }
 
-  protected abstract String[] instrumentationNames();
+    protected abstract String[] instrumentationNames();
 
-  protected abstract CharSequence spanType();
+    protected abstract CharSequence spanType();
 
-  protected abstract CharSequence component();
+    protected abstract CharSequence component();
 
-  /** Caches the component TagMap.Entry, so it isn't recreated for every trace */
-  protected final TagMap.Entry componentEntry() {
-    // DQH = Tried calling component() in the constructor, but that had issues with static
-    // field ordering.  That was caught be an integration test, but I didn't want to risk
-    // breaking other integrations where the test is not as thorough.
+    /** Caches the component TagMap.Entry, so it isn't recreated for every trace */
+    protected final TagMap.Entry componentEntry() {
+        // DQH = Tried calling component() in the constructor, but that had issues with static
+        // field ordering.  That was caught be an integration test, but I didn't want to risk
+        // breaking other integrations where the test is not as thorough.
 
-    // This approach while more complicated doesn't have any field initialization ordering issues.
-    TagMap.Entry componentEntry = cachedComponentEntry;
-    if (componentEntry == null) {
-      cachedComponentEntry = componentEntry = TagMap.Entry.create(Tags.COMPONENT, component());
+        // This approach while more complicated doesn't have any field initialization ordering issues.
+        TagMap.Entry componentEntry = cachedComponentEntry;
+        if (componentEntry == null) {
+            cachedComponentEntry = componentEntry = TagMap.Entry.create(Tags.COMPONENT, component());
+        }
+        return componentEntry;
     }
-    return componentEntry;
-  }
-
-  protected boolean traceAnalyticsDefault() {
-    return false;
-  }
-
-  public final void afterStart(final AgentSpan span) {
-    try {
-      doAfterStart(span);
-    } catch (BlockingException e) {
-      throw e;
-    } catch (Throwable t) {
-      log.debug("Failed to decorate span after start", t);
+
+    protected boolean traceAnalyticsDefault() {
+        return false;
     }
-  }
 
-  protected void doAfterStart(final AgentSpan span) {
-    if (spanType() != null) {
-      span.setSpanType(spanType());
+    public final void afterStart(final AgentSpan span) {
+        try {
+            doAfterStart(span);
+        } catch (BlockingException e) {
+            throw e;
+        } catch (Throwable t) {
+            log.debug("Failed to decorate span after start", t);
+        }
     }
 
-    span.setTag(componentEntry());
+    protected void doAfterStart(final AgentSpan span) {
+        if (spanType() != null) {
+            span.setSpanType(spanType());
+        }
 
-    // DQH - Could retrieve the value from componentEntry and cast to avoid the virtual call,
-    // unclear which option is better here
-    final CharSequence component = component();
-    span.spanContext().setIntegrationName(component);
+        span.setTag(componentEntry());
 
-    // null handled by setMetric
-    span.setMetric(traceAnalyticsEntry);
-  }
+        // DQH - Could retrieve the value from componentEntry and cast to avoid the virtual call,
+        // unclear which option is better here
+        final CharSequence component = component();
+        span.spanContext().setIntegrationName(component);
 
-  public final void beforeFinish(@Nullable final ContextScope scope) {
-    if (scope != null) {
-      beforeFinish(scope.context());
+        // null handled by setMetric
+        span.setMetric(traceAnalyticsEntry);
     }
-  }
 
-  public final void beforeFinish(@Nullable final AgentSpan span) {
-    if (span != null) {
-      beforeFinish((Context) span);
+    public final void beforeFinish(@Nullable final ContextScope scope) {
+        if (scope != null) {
+            beforeFinish(scope.context());
+        }
     }
-  }
-
-  public final void beforeFinish(final Context context) {
-    try {
-      doBeforeFinish(context);
-    } catch (BlockingException e) {
-      throw e;
-    } catch (Throwable t) {
-      log.debug("Failed to decorate span before finish", t);
+
+    public final void beforeFinish(@Nullable final AgentSpan span) {
+        if (span != null) {
+            beforeFinish((Context) span);
+        }
     }
-  }
-
-  protected void doBeforeFinish(final Context context) {}
-
-  public final void onError(@Nullable final AgentSpan span, @Nullable final Throwable throwable) {
-    onError(span, throwable, ErrorPriorities.DEFAULT);
-  }
-
-  public final void onError(
-      @Nullable final AgentSpan span, @Nullable final Throwable throwable, byte errorPriority) {
-    if (span != null && throwable != null) {
-      try {
-        doOnError(span, throwable, errorPriority);
-      } catch (BlockingException e) {
-        throw e;
-      } catch (Throwable t) {
-        log.debug("Failed to decorate span on error", t);
-      }
+
+    public final void beforeFinish(final Context context) {
+        try {
+            doBeforeFinish(context);
+        } catch (BlockingException e) {
+            throw e;
+        } catch (Throwable t) {
+            log.debug("Failed to decorate span before finish", t);
+        }
     }
-  }
 
-  public final void onError(
-      @Nullable final ContextScope scope, @Nullable final Throwable throwable) {
-    if (scope != null) {
-      onError(AgentSpan.fromContext(scope.context()), throwable);
+    protected void doBeforeFinish(final Context context) {}
+
+    public final void onError(@Nullable final AgentSpan span, @Nullable final Throwable throwable) {
+        onError(span, throwable, ErrorPriorities.DEFAULT);
     }
-  }
-
-  protected void doOnError(final AgentSpan span, final Throwable throwable, byte errorPriority) {
-    span.addThrowable(
-        throwable instanceof ExecutionException ? throwable.getCause() : throwable, errorPriority);
-  }
-
-  public final void onPeerConnection(
-      final AgentSpan span, @Nullable final InetSocketAddress remoteConnection) {
-    if (remoteConnection != null) {
-      onPeerConnection(span, remoteConnection.getAddress(), !remoteConnection.isUnresolved());
-      setPeerPort(span, remoteConnection.getPort());
+
+    public final void onError(@Nullable final AgentSpan span, @Nullable final Throwable throwable, byte errorPriority) {
+        if (span != null && throwable != null) {
+            try {
+                doOnError(span, throwable, errorPriority);
+            } catch (BlockingException e) {
+                throw e;
+            } catch (Throwable t) {
+                log.debug("Failed to decorate span on error", t);
+            }
+        }
     }
-  }
-
-  public final void onPeerConnection(
-      final AgentSpan span, @Nullable final InetAddress remoteAddress) {
-    onPeerConnection(span, remoteAddress, true);
-  }
-
-  public final void onPeerConnection(
-      AgentSpan span, @Nullable InetAddress remoteAddress, boolean resolved) {
-    if (remoteAddress != null) {
-      String ip = remoteAddress.getHostAddress();
-      if (resolved && Config.get().isPeerHostNameEnabled()) {
-        span.setTag(Tags.PEER_HOSTNAME, hostName(remoteAddress, ip));
-      }
-      if (remoteAddress instanceof Inet4Address) {
-        span.setTag(Tags.PEER_HOST_IPV4, ip);
-      } else if (remoteAddress instanceof Inet6Address) {
-        span.setTag(Tags.PEER_HOST_IPV6, ip);
-      }
+
+    public final void onError(@Nullable final ContextScope scope, @Nullable final Throwable throwable) {
+        if (scope != null) {
+            onError(AgentSpan.fromContext(scope.context()), throwable);
+        }
     }
-  }
 
-  public void setPeerPort(AgentSpan span, String port) {
-    span.setTag(Tags.PEER_PORT, port);
-  }
+    protected void doOnError(final AgentSpan span, final Throwable throwable, byte errorPriority) {
+        span.addThrowable(throwable instanceof ExecutionException ? throwable.getCause() : throwable, errorPriority);
+    }
 
-  public void setPeerPort(AgentSpan span, int port) {
-    if (port > UNSET_PORT) {
-      span.setTag(Tags.PEER_PORT, port);
+    public final void onPeerConnection(final AgentSpan span, @Nullable final InetSocketAddress remoteConnection) {
+        if (remoteConnection != null) {
+            onPeerConnection(span, remoteConnection.getAddress(), !remoteConnection.isUnresolved());
+            setPeerPort(span, remoteConnection.getPort());
+        }
     }
-  }
-
-  /**
-   * This method is used to generate an acceptable span (operation) name based on a given method
-   * reference. Anonymous classes are named based on their parent.
-   */
-  public CharSequence spanNameForMethod(final Method method) {
-    return spanNameForMethod(method.getDeclaringClass(), method);
-  }
-
-  /**
-   * This method is used to generate an acceptable span (operation) name based on a given method
-   * reference. Anonymous classes are named based on their parent.
-   *
-   * @param method the method to get the name from, nullable
-   * @return the span name from the class and method
-   */
-  public CharSequence spanNameForMethod(final Class<?> clazz, @Nullable final Method method) {
-    if (null == method) {
-      return CLASS_NAMES.getClassName(clazz);
+
+    public final void onPeerConnection(final AgentSpan span, @Nullable final InetAddress remoteAddress) {
+        onPeerConnection(span, remoteAddress, true);
+    }
+
+    public final void onPeerConnection(AgentSpan span, @Nullable InetAddress remoteAddress, boolean resolved) {
+        if (remoteAddress != null) {
+            String ip = remoteAddress.getHostAddress();
+            if (resolved && Config.get().isPeerHostNameEnabled()) {
+                span.setTag(Tags.PEER_HOSTNAME, hostName(remoteAddress, ip));
+            }
+            if (remoteAddress instanceof Inet4Address) {
+                span.setTag(Tags.PEER_HOST_IPV4, ip);
+            } else if (remoteAddress instanceof Inet6Address) {
+                span.setTag(Tags.PEER_HOST_IPV6, ip);
+            }
+        }
+    }
+
+    public void setPeerPort(AgentSpan span, String port) {
+        span.setTag(Tags.PEER_PORT, port);
+    }
+
+    public void setPeerPort(AgentSpan span, int port) {
+        if (port > UNSET_PORT) {
+            span.setTag(Tags.PEER_PORT, port);
+        }
+    }
+
+    /**
+     * This method is used to generate an acceptable span (operation) name based on a given method
+     * reference. Anonymous classes are named based on their parent.
+     */
+    public CharSequence spanNameForMethod(final Method method) {
+        return spanNameForMethod(method.getDeclaringClass(), method);
+    }
+
+    /**
+     * This method is used to generate an acceptable span (operation) name based on a given method
+     * reference. Anonymous classes are named based on their parent.
+     *
+     * @param method the method to get the name from, nullable
+     * @return the span name from the class and method
+     */
+    public CharSequence spanNameForMethod(final Class<?> clazz, @Nullable final Method method) {
+        if (null == method) {
+            return CLASS_NAMES.getClassName(clazz);
+        }
+        return CLASS_NAMES.getQualifiedName(clazz, method.getName());
+    }
+
+    /**
+     * This method is used to generate an acceptable span (operation) name based on a given method
+     * reference. Anonymous classes are named based on their parent.
+     *
+     * @param methodName the name of the method to get the name from, nullable
+     * @return the span name from the class and method
+     */
+    public CharSequence spanNameForMethod(final Class<?> clazz, @Nullable final String methodName) {
+        return CLASS_NAMES.getQualifiedName(clazz, methodName);
+    }
+
+    /**
+     * This method is used to generate an acceptable span (operation) name based on a given class
+     * reference. Anonymous classes are named based on their parent.
+     */
+    public CharSequence className(final Class<?> clazz) {
+        String simpleName = clazz.getSimpleName();
+        return simpleName.isEmpty() ? CLASS_NAMES.getClassName(clazz) : simpleName;
     }
-    return CLASS_NAMES.getQualifiedName(clazz, method.getName());
-  }
-
-  /**
-   * This method is used to generate an acceptable span (operation) name based on a given method
-   * reference. Anonymous classes are named based on their parent.
-   *
-   * @param methodName the name of the method to get the name from, nullable
-   * @return the span name from the class and method
-   */
-  public CharSequence spanNameForMethod(final Class<?> clazz, @Nullable final String methodName) {
-    return CLASS_NAMES.getQualifiedName(clazz, methodName);
-  }
-
-  /**
-   * This method is used to generate an acceptable span (operation) name based on a given class
-   * reference. Anonymous classes are named based on their parent.
-   */
-  public CharSequence className(final Class<?> clazz) {
-    String simpleName = clazz.getSimpleName();
-    return simpleName.isEmpty() ? CLASS_NAMES.getClassName(clazz) : simpleName;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/ClientDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/ClientDecorator.java
index 9c21bca3cdc..4ab86f4e3a2 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/ClientDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/ClientDecorator.java
@@ -7,42 +7,42 @@
 
 @ParametersAreNonnullByDefault
 public abstract class ClientDecorator extends BaseDecorator {
-  // Deliberately not volatile, reading a stale null and creating an extra Entry is safe
-  private TagMap.Entry cachedSpanKindEntry = null;
-
-  protected abstract String service();
-
-  /** Caches span kind entry to reduce allocation */
-  private final TagMap.Entry spanKindEntry() {
-    // DQH - I considered moving the creation of the TagMap.Entry into a ClientDecorator
-    // constructor, but that introduces a subtle ordering requirement.
-
-    // If the spanKind method refers to a static that isn't yet initialized,
-    // then spanKind will return null when the Decorator singleton is being constructed.
-
-    // Such an ordering problem did occur with similar changes in BaseDecorator, so I've
-    // decided to be cautious here, too.
-    TagMap.Entry kindEntry = cachedSpanKindEntry;
-    if (kindEntry == null) {
-      cachedSpanKindEntry = kindEntry = TagMap.Entry.create(Tags.SPAN_KIND, spanKind());
+    // Deliberately not volatile, reading a stale null and creating an extra Entry is safe
+    private TagMap.Entry cachedSpanKindEntry = null;
+
+    protected abstract String service();
+
+    /** Caches span kind entry to reduce allocation */
+    private final TagMap.Entry spanKindEntry() {
+        // DQH - I considered moving the creation of the TagMap.Entry into a ClientDecorator
+        // constructor, but that introduces a subtle ordering requirement.
+
+        // If the spanKind method refers to a static that isn't yet initialized,
+        // then spanKind will return null when the Decorator singleton is being constructed.
+
+        // Such an ordering problem did occur with similar changes in BaseDecorator, so I've
+        // decided to be cautious here, too.
+        TagMap.Entry kindEntry = cachedSpanKindEntry;
+        if (kindEntry == null) {
+            cachedSpanKindEntry = kindEntry = TagMap.Entry.create(Tags.SPAN_KIND, spanKind());
+        }
+        return kindEntry;
     }
-    return kindEntry;
-  }
-
-  protected String spanKind() {
-    return Tags.SPAN_KIND_CLIENT;
-  }
-
-  @Override
-  protected void doAfterStart(final AgentSpan span) {
-    final String service = service();
-    if (service != null) {
-      span.setServiceName(service, component());
+
+    protected String spanKind() {
+        return Tags.SPAN_KIND_CLIENT;
     }
-    span.setTag(spanKindEntry());
 
-    // Generate metrics for all client spans.
-    span.setMeasured(true);
-    super.doAfterStart(span);
-  }
+    @Override
+    protected void doAfterStart(final AgentSpan span) {
+        final String service = service();
+        if (service != null) {
+            span.setServiceName(service, component());
+        }
+        span.setTag(spanKindEntry());
+
+        // Generate metrics for all client spans.
+        span.setMeasured(true);
+        super.doAfterStart(span);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/DBTypeProcessingDatabaseClientDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/DBTypeProcessingDatabaseClientDecorator.java
index dffb95fc8a4..1521dbbb577 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/DBTypeProcessingDatabaseClientDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/DBTypeProcessingDatabaseClientDecorator.java
@@ -4,12 +4,11 @@
 import javax.annotation.ParametersAreNonnullByDefault;
 
 @ParametersAreNonnullByDefault
-public abstract class DBTypeProcessingDatabaseClientDecorator<CONNECTION>
-    extends DatabaseClientDecorator<CONNECTION> {
+public abstract class DBTypeProcessingDatabaseClientDecorator<CONNECTION> extends DatabaseClientDecorator<CONNECTION> {
 
-  @Override
-  protected void doAfterStart(AgentSpan span) {
-    processDatabaseType(span, dbType());
-    super.doAfterStart(span);
-  }
+    @Override
+    protected void doAfterStart(AgentSpan span) {
+        processDatabaseType(span, dbType());
+        super.doAfterStart(span);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecorator.java
index 79d08f4139a..e2e8d5a38d0 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecorator.java
@@ -22,151 +22,147 @@
 import java.util.function.BiFunction;
 
 public abstract class DatabaseClientDecorator<CONNECTION> extends ClientDecorator {
-  protected static class NamingEntry {
-    private final String service;
-    private final CharSequence operation;
-
-    private final String dbType;
-
-    private NamingEntry(String rawDbType) {
-      final NamingSchema.ForDatabase schema = SpanNaming.instance().namingSchema().database();
-      this.dbType = schema.normalizedName(rawDbType);
-      this.service = schema.service(dbType);
-      this.operation = UTF8BytesString.create(schema.operation(dbType));
-    }
+    protected static class NamingEntry {
+        private final String service;
+        private final CharSequence operation;
+
+        private final String dbType;
+
+        private NamingEntry(String rawDbType) {
+            final NamingSchema.ForDatabase schema =
+                    SpanNaming.instance().namingSchema().database();
+            this.dbType = schema.normalizedName(rawDbType);
+            this.service = schema.service(dbType);
+            this.operation = UTF8BytesString.create(schema.operation(dbType));
+        }
 
-    public String getService() {
-      return service;
-    }
+        public String getService() {
+            return service;
+        }
 
-    public CharSequence getOperation() {
-      return operation;
-    }
+        public CharSequence getOperation() {
+            return operation;
+        }
 
-    public String getDbType() {
-      return dbType;
+        public String getDbType() {
+            return dbType;
+        }
     }
-  }
 
-  // The total number of entries in the cache will normally be less than 4, since
-  // most applications only have one or two DBs, and "jdbc" itself is also used as
-  // one DB_TYPE, but set the cache size to 16 to help avoid collisions.
-  private static final DDCache<String, NamingEntry> CACHE = DDCaches.newFixedSizeCache(16);
+    // The total number of entries in the cache will normally be less than 4, since
+    // most applications only have one or two DBs, and "jdbc" itself is also used as
+    // one DB_TYPE, but set the cache size to 16 to help avoid collisions.
+    private static final DDCache<String, NamingEntry> CACHE = DDCaches.newFixedSizeCache(16);
 
-  protected abstract String dbType();
+    protected abstract String dbType();
 
-  protected abstract String dbUser(CONNECTION connection);
+    protected abstract String dbUser(CONNECTION connection);
 
-  protected abstract String dbInstance(CONNECTION connection);
+    protected abstract String dbInstance(CONNECTION connection);
 
-  protected abstract CharSequence dbHostname(CONNECTION connection);
+    protected abstract CharSequence dbHostname(CONNECTION connection);
 
-  /**
-   * This should be called when the connection is being used, not when it's created.
-   *
-   * @param span
-   * @param connection
-   */
-  public void onConnection(final AgentSpan span, final CONNECTION connection) {
-    if (connection != null) {
-      span.setTag(Tags.DB_USER, dbUser(connection));
-      onInstance(span, dbInstance(connection));
-      CharSequence hostName = dbHostname(connection);
-      if (hostName != null) {
-        span.setTag(Tags.PEER_HOSTNAME, hostName);
+    /**
+     * This should be called when the connection is being used, not when it's created.
+     *
+     * @param span
+     * @param connection
+     */
+    public void onConnection(final AgentSpan span, final CONNECTION connection) {
+        if (connection != null) {
+            span.setTag(Tags.DB_USER, dbUser(connection));
+            onInstance(span, dbInstance(connection));
+            CharSequence hostName = dbHostname(connection);
+            if (hostName != null) {
+                span.setTag(Tags.PEER_HOSTNAME, hostName);
 
-        if (Config.get().isDbClientSplitByHost()) {
-          span.setServiceName(hostName.toString(), DB_CLIENT_SPLIT_BY_HOST);
+                if (Config.get().isDbClientSplitByHost()) {
+                    span.setServiceName(hostName.toString(), DB_CLIENT_SPLIT_BY_HOST);
+                }
+            }
         }
-      }
     }
-  }
-
-  protected void onInstance(final AgentSpan span, final String dbInstance) {
-    if (dbInstance != null) {
-      span.setTag(Tags.DB_INSTANCE, dbInstance);
-      String serviceName = dbClientService(dbInstance);
-      if (null != serviceName) {
-        span.setServiceName(serviceName, component());
-      }
+
+    protected void onInstance(final AgentSpan span, final String dbInstance) {
+        if (dbInstance != null) {
+            span.setTag(Tags.DB_INSTANCE, dbInstance);
+            String serviceName = dbClientService(dbInstance);
+            if (null != serviceName) {
+                span.setServiceName(serviceName, component());
+            }
+        }
     }
-  }
 
-  public String dbService(final String dbType, final String instanceName) {
-    if (instanceName != null && Config.get().isDbClientSplitByInstance()) {
-      return dbClientService(instanceName);
+    public String dbService(final String dbType, final String instanceName) {
+        if (instanceName != null && Config.get().isDbClientSplitByInstance()) {
+            return dbClientService(instanceName);
+        }
+        if (dbType == null) {
+            return null;
+        }
+        return CACHE.computeIfAbsent(dbType, NamingEntry::new).getService();
     }
-    if (dbType == null) {
-      return null;
+
+    public String dbClientService(final String instanceName) {
+        String service = null;
+        if (instanceName != null && Config.get().isDbClientSplitByInstance()) {
+            service = Config.get().isDbClientSplitByInstanceTypeSuffix() ? instanceName + "-" + dbType() : instanceName;
+        }
+        return service;
     }
-    return CACHE.computeIfAbsent(dbType, NamingEntry::new).getService();
-  }
-
-  public String dbClientService(final String instanceName) {
-    String service = null;
-    if (instanceName != null && Config.get().isDbClientSplitByInstance()) {
-      service =
-          Config.get().isDbClientSplitByInstanceTypeSuffix()
-              ? instanceName + "-" + dbType()
-              : instanceName;
+
+    public void onStatement(final AgentSpan span, final CharSequence statement) {
+        span.setResourceName(statement);
     }
-    return service;
-  }
-
-  public void onStatement(final AgentSpan span, final CharSequence statement) {
-    span.setResourceName(statement);
-  }
-
-  /**
-   * The method used to provide raw sql to prevent SQL-injection attacks SQL query should never be
-   * exposed because it may contain sensitive data.
-   */
-  public void onRawStatement(AgentSpan span, String sql) {
-    if (Config.get().isAppSecRaspEnabled() && sql != null && !sql.isEmpty()) {
-      BiFunction<RequestContext, String, Flow<Void>> sqlQueryCallback =
-          AgentTracer.get()
-              .getCallbackProvider(RequestContextSlot.APPSEC)
-              .getCallback(EVENTS.databaseSqlQuery());
-      if (sqlQueryCallback != null) {
-        RequestContext ctx = span.getRequestContext();
-        if (ctx != null) {
-          Flow<Void> flow = sqlQueryCallback.apply(ctx, sql);
-          Flow.Action action = flow.getAction();
-          if (action instanceof Flow.Action.RequestBlockingAction) {
-            BlockResponseFunction brf = ctx.getBlockResponseFunction();
-            if (brf != null) {
-              Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-              brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
+
+    /**
+     * The method used to provide raw sql to prevent SQL-injection attacks SQL query should never be
+     * exposed because it may contain sensitive data.
+     */
+    public void onRawStatement(AgentSpan span, String sql) {
+        if (Config.get().isAppSecRaspEnabled() && sql != null && !sql.isEmpty()) {
+            BiFunction<RequestContext, String, Flow<Void>> sqlQueryCallback = AgentTracer.get()
+                    .getCallbackProvider(RequestContextSlot.APPSEC)
+                    .getCallback(EVENTS.databaseSqlQuery());
+            if (sqlQueryCallback != null) {
+                RequestContext ctx = span.getRequestContext();
+                if (ctx != null) {
+                    Flow<Void> flow = sqlQueryCallback.apply(ctx, sql);
+                    Flow.Action action = flow.getAction();
+                    if (action instanceof Flow.Action.RequestBlockingAction) {
+                        BlockResponseFunction brf = ctx.getBlockResponseFunction();
+                        if (brf != null) {
+                            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                            brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
+                        }
+                        throw new BlockingException("Blocked request (for SQL query)");
+                    }
+                }
             }
-            throw new BlockingException("Blocked request (for SQL query)");
-          }
         }
-      }
     }
-  }
 
-  protected void processDatabaseType(AgentSpan span, String dbType) {
-    if (dbType == null) {
-      return;
-    }
+    protected void processDatabaseType(AgentSpan span, String dbType) {
+        if (dbType == null) {
+            return;
+        }
 
-    final NamingEntry namingEntry = CACHE.computeIfAbsent(dbType, NamingEntry::new);
-    span.setTag(DB_TYPE, namingEntry.dbType);
-    postProcessServiceAndOperationName(span, namingEntry);
-
-    if (Config.get().isAppSecRaspEnabled()) {
-      BiConsumer<RequestContext, String> connectDbCallback =
-          AgentTracer.get()
-              .getCallbackProvider(RequestContextSlot.APPSEC)
-              .getCallback(EVENTS.databaseConnection());
-      if (connectDbCallback != null) {
-        RequestContext ctx = span.getRequestContext();
-        if (ctx != null) {
-          connectDbCallback.accept(ctx, dbType);
+        final NamingEntry namingEntry = CACHE.computeIfAbsent(dbType, NamingEntry::new);
+        span.setTag(DB_TYPE, namingEntry.dbType);
+        postProcessServiceAndOperationName(span, namingEntry);
+
+        if (Config.get().isAppSecRaspEnabled()) {
+            BiConsumer<RequestContext, String> connectDbCallback = AgentTracer.get()
+                    .getCallbackProvider(RequestContextSlot.APPSEC)
+                    .getCallback(EVENTS.databaseConnection());
+            if (connectDbCallback != null) {
+                RequestContext ctx = span.getRequestContext();
+                if (ctx != null) {
+                    connectDbCallback.accept(ctx, dbType);
+                }
+            }
         }
-      }
     }
-  }
 
-  protected void postProcessServiceAndOperationName(AgentSpan span, NamingEntry namingEntry) {}
+    protected void postProcessServiceAndOperationName(AgentSpan span, NamingEntry namingEntry) {}
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecorator.java
index df159f8f2e6..8c678fb8a1b 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecorator.java
@@ -36,256 +36,254 @@
 
 public abstract class HttpClientDecorator<REQUEST, RESPONSE> extends UriBasedClientDecorator {
 
-  private static final Logger log = LoggerFactory.getLogger(HttpClientDecorator.class);
+    private static final Logger log = LoggerFactory.getLogger(HttpClientDecorator.class);
 
-  private static final String DATADOG_META_LANG_HEADER_NAME = "Datadog-Meta-Lang";
-  private static final String DD_CLIENT_LIBRARY_LANGUAGE_HEADER_NAME = "DD-Client-Library-Language";
+    private static final String DATADOG_META_LANG_HEADER_NAME = "Datadog-Meta-Lang";
+    private static final String DD_CLIENT_LIBRARY_LANGUAGE_HEADER_NAME = "DD-Client-Library-Language";
 
-  private static final BitSet CLIENT_ERROR_STATUSES = Config.get().getHttpClientErrorStatuses();
+    private static final BitSet CLIENT_ERROR_STATUSES = Config.get().getHttpClientErrorStatuses();
 
-  private static final UTF8BytesString DEFAULT_RESOURCE_NAME = UTF8BytesString.create("/");
+    private static final UTF8BytesString DEFAULT_RESOURCE_NAME = UTF8BytesString.create("/");
 
-  private static final boolean CLIENT_TAG_HEADERS = Config.get().isHttpClientTagHeaders();
+    private static final boolean CLIENT_TAG_HEADERS = Config.get().isHttpClientTagHeaders();
 
-  private static final boolean APPSEC_RASP_ENABLED = Config.get().isAppSecRaspEnabled();
+    private static final boolean APPSEC_RASP_ENABLED = Config.get().isAppSecRaspEnabled();
 
-  protected abstract String method(REQUEST request);
+    protected abstract String method(REQUEST request);
 
-  protected abstract URI url(REQUEST request) throws URISyntaxException;
+    protected abstract URI url(REQUEST request) throws URISyntaxException;
 
-  /**
-   * Returns {@code true} if the request was made by the Datadog agent itself. Such requests must
-   * not be traced to avoid self-tracing loops.
-   */
-  public boolean isAgentRequest(final REQUEST request) {
-    // Advice runs before the instrumented method's own argument validation, so a caller
-    // passing a null request must not NPE here — let the real method report that itself.
-    if (request == null) {
-      return false;
+    /**
+     * Returns {@code true} if the request was made by the Datadog agent itself. Such requests must
+     * not be traced to avoid self-tracing loops.
+     */
+    public boolean isAgentRequest(final REQUEST request) {
+        // Advice runs before the instrumented method's own argument validation, so a caller
+        // passing a null request must not NPE here — let the real method report that itself.
+        if (request == null) {
+            return false;
+        }
+        return getRequestHeader(request, DATADOG_META_LANG_HEADER_NAME) != null
+                || getRequestHeader(request, DD_CLIENT_LIBRARY_LANGUAGE_HEADER_NAME) != null;
     }
-    return getRequestHeader(request, DATADOG_META_LANG_HEADER_NAME) != null
-        || getRequestHeader(request, DD_CLIENT_LIBRARY_LANGUAGE_HEADER_NAME) != null;
-  }
 
-  protected abstract int status(RESPONSE response);
+    protected abstract int status(RESPONSE response);
 
-  protected abstract String getRequestHeader(REQUEST request, String headerName);
+    protected abstract String getRequestHeader(REQUEST request, String headerName);
 
-  protected abstract String getResponseHeader(RESPONSE response, String headerName);
+    protected abstract String getResponseHeader(RESPONSE response, String headerName);
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.HTTP_CLIENT;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.HTTP_CLIENT;
+    }
 
-  @Override
-  protected String service() {
-    return null;
-  }
+    @Override
+    protected String service() {
+        return null;
+    }
 
-  protected boolean shouldSetResourceName() {
-    return true;
-  }
+    protected boolean shouldSetResourceName() {
+        return true;
+    }
 
-  private final DataStreamsTransactionTracker.TransactionSourceReader
-      DSM_TRANSACTION_SOURCE_READER =
-          (source, headerName) -> {
+    private final DataStreamsTransactionTracker.TransactionSourceReader DSM_TRANSACTION_SOURCE_READER =
+            (source, headerName) -> {
+                try {
+                    return getRequestHeader((REQUEST) source, headerName);
+                } catch (Throwable ignored) {
+                    return null;
+                }
+            };
+
+    public final void onRequest(final AgentSpan span, final REQUEST request) {
+        try {
+            doOnRequest(span, request);
+        } catch (BlockingException e) {
+            throw e;
+        } catch (Throwable t) {
+            log.debug("Failed to decorate span on request", t);
+        }
+    }
+
+    protected void doOnRequest(final AgentSpan span, final REQUEST request) {
+        if (request != null) {
+            AgentTracer.get()
+                    .getDataStreamsMonitoring()
+                    .trackTransaction(
+                            span,
+                            DataStreamsTransactionExtractor.Type.HTTP_OUT_HEADERS,
+                            request,
+                            DSM_TRANSACTION_SOURCE_READER);
+
+            String method = method(request);
+            span.setTag(Tags.HTTP_METHOD, method);
+
+            if (CLIENT_TAG_HEADERS) {
+                for (Map.Entry<String, String> headerTag :
+                        traceConfig(span).getRequestHeaderTags().entrySet()) {
+                    String headerValue = getRequestHeader(request, headerTag.getKey());
+                    if (null != headerValue) {
+                        span.setTag(headerTag.getValue(), headerValue);
+                    }
+                }
+            }
+
+            // Copy of HttpServerDecorator url handling
             try {
-              return getRequestHeader((REQUEST) source, headerName);
-            } catch (Throwable ignored) {
-              return null;
+                final URI url = url(request);
+                if (url != null) {
+                    onURI(span, url);
+                    span.setTag(
+                            Tags.HTTP_URL,
+                            URIUtils.lazyValidURL(url.getScheme(), url.getHost(), url.getPort(), url.getPath()));
+                    if (Config.get().isHttpClientTagQueryString()) {
+                        span.setTag(DDTags.HTTP_QUERY, url.getQuery());
+                        span.setTag(DDTags.HTTP_FRAGMENT, url.getFragment());
+                    }
+                    if (shouldSetResourceName()) {
+                        HTTP_RESOURCE_DECORATOR.withClientPath(span, method, url.getPath());
+                    }
+                    // SSRF exploit prevention check
+                    onHttpClientRequest(span, url.toString());
+                } else if (shouldSetResourceName()) {
+                    span.setResourceName(DEFAULT_RESOURCE_NAME);
+                }
+            } catch (final BlockingException e) {
+                throw e;
+            } catch (final Exception e) {
+                log.debug("Error tagging url", e);
+            } finally {
+                ssrfIastCheck(request);
             }
-          };
-
-  public final void onRequest(final AgentSpan span, final REQUEST request) {
-    try {
-      doOnRequest(span, request);
-    } catch (BlockingException e) {
-      throw e;
-    } catch (Throwable t) {
-      log.debug("Failed to decorate span on request", t);
-    }
-  }
-
-  protected void doOnRequest(final AgentSpan span, final REQUEST request) {
-    if (request != null) {
-      AgentTracer.get()
-          .getDataStreamsMonitoring()
-          .trackTransaction(
-              span,
-              DataStreamsTransactionExtractor.Type.HTTP_OUT_HEADERS,
-              request,
-              DSM_TRANSACTION_SOURCE_READER);
-
-      String method = method(request);
-      span.setTag(Tags.HTTP_METHOD, method);
-
-      if (CLIENT_TAG_HEADERS) {
-        for (Map.Entry<String, String> headerTag :
-            traceConfig(span).getRequestHeaderTags().entrySet()) {
-          String headerValue = getRequestHeader(request, headerTag.getKey());
-          if (null != headerValue) {
-            span.setTag(headerTag.getValue(), headerValue);
-          }
-        }
-      }
-
-      // Copy of HttpServerDecorator url handling
-      try {
-        final URI url = url(request);
-        if (url != null) {
-          onURI(span, url);
-          span.setTag(
-              Tags.HTTP_URL,
-              URIUtils.lazyValidURL(url.getScheme(), url.getHost(), url.getPort(), url.getPath()));
-          if (Config.get().isHttpClientTagQueryString()) {
-            span.setTag(DDTags.HTTP_QUERY, url.getQuery());
-            span.setTag(DDTags.HTTP_FRAGMENT, url.getFragment());
-          }
-          if (shouldSetResourceName()) {
-            HTTP_RESOURCE_DECORATOR.withClientPath(span, method, url.getPath());
-          }
-          // SSRF exploit prevention check
-          onHttpClientRequest(span, url.toString());
-        } else if (shouldSetResourceName()) {
-          span.setResourceName(DEFAULT_RESOURCE_NAME);
         }
-      } catch (final BlockingException e) {
-        throw e;
-      } catch (final Exception e) {
-        log.debug("Error tagging url", e);
-      } finally {
-        ssrfIastCheck(request);
-      }
     }
-  }
-
-  public final void onResponse(final AgentSpan span, final RESPONSE response) {
-    try {
-      doOnResponse(span, response);
-    } catch (BlockingException e) {
-      throw e;
-    } catch (Throwable t) {
-      log.debug("Failed to decorate span on response", t);
-    }
-  }
-
-  protected void doOnResponse(final AgentSpan span, final RESPONSE response) {
-    if (response != null) {
-      final int status = status(response);
-      if (status > UNSET_STATUS) {
-        span.setHttpStatusCode(status);
-        if (CLIENT_ERROR_STATUSES.get(status)) {
-          span.setError(true);
+
+    public final void onResponse(final AgentSpan span, final RESPONSE response) {
+        try {
+            doOnResponse(span, response);
+        } catch (BlockingException e) {
+            throw e;
+        } catch (Throwable t) {
+            log.debug("Failed to decorate span on response", t);
         }
-      }
-
-      if (CLIENT_TAG_HEADERS) {
-        for (Map.Entry<String, String> headerTag :
-            traceConfig(span).getResponseHeaderTags().entrySet()) {
-          String headerValue = getResponseHeader(response, headerTag.getKey());
-          if (null != headerValue) {
-            span.setTag(headerTag.getValue(), headerValue);
-          }
+    }
+
+    protected void doOnResponse(final AgentSpan span, final RESPONSE response) {
+        if (response != null) {
+            final int status = status(response);
+            if (status > UNSET_STATUS) {
+                span.setHttpStatusCode(status);
+                if (CLIENT_ERROR_STATUSES.get(status)) {
+                    span.setError(true);
+                }
+            }
+
+            if (CLIENT_TAG_HEADERS) {
+                for (Map.Entry<String, String> headerTag :
+                        traceConfig(span).getResponseHeaderTags().entrySet()) {
+                    String headerValue = getResponseHeader(response, headerTag.getKey());
+                    if (null != headerValue) {
+                        span.setTag(headerTag.getValue(), headerValue);
+                    }
+                }
+            }
         }
-      }
     }
-  }
-
-  public String operationName() {
-    return SpanNaming.instance()
-        .namingSchema()
-        .client()
-        .operationForComponent(component().toString());
-  }
-
-  public String getSpanTagAsString(AgentSpan span, String tag) {
-    Object value = span.getTag(tag);
-    return value == null ? null : value.toString();
-  }
-
-  public long getRequestContentLength(final REQUEST request) {
-    if (request == null) {
-      return 0;
+
+    public String operationName() {
+        return SpanNaming.instance()
+                .namingSchema()
+                .client()
+                .operationForComponent(component().toString());
     }
 
-    String contentLengthStr = getRequestHeader(request, "Content-Length");
-    if (contentLengthStr != null) {
-      try {
-        return Long.parseLong(contentLengthStr);
-      } catch (NumberFormatException ignored) {
-      }
+    public String getSpanTagAsString(AgentSpan span, String tag) {
+        Object value = span.getTag(tag);
+        return value == null ? null : value.toString();
     }
 
-    return 0;
-  }
+    public long getRequestContentLength(final REQUEST request) {
+        if (request == null) {
+            return 0;
+        }
 
-  public long getResponseContentLength(final RESPONSE response) {
-    if (response == null) {
-      return 0;
-    }
+        String contentLengthStr = getRequestHeader(request, "Content-Length");
+        if (contentLengthStr != null) {
+            try {
+                return Long.parseLong(contentLengthStr);
+            } catch (NumberFormatException ignored) {
+            }
+        }
 
-    String contentLengthStr = getResponseHeader(response, "Content-Length");
-    if (contentLengthStr != null) {
-      try {
-        return Long.parseLong(contentLengthStr);
-      } catch (NumberFormatException ignored) {
-      }
+        return 0;
     }
 
-    return 0;
-  }
+    public long getResponseContentLength(final RESPONSE response) {
+        if (response == null) {
+            return 0;
+        }
 
-  protected void onHttpClientRequest(final AgentSpan span, final String url) {
-    if (!APPSEC_RASP_ENABLED) {
-      return;
-    }
-    if (url == null) {
-      return;
-    }
-    final BiFunction<RequestContext, HttpClientRequest, Flow<Void>> requestCb =
-        AgentTracer.get()
-            .getCallbackProvider(RequestContextSlot.APPSEC)
-            .getCallback(EVENTS.httpClientRequest());
+        String contentLengthStr = getResponseHeader(response, "Content-Length");
+        if (contentLengthStr != null) {
+            try {
+                return Long.parseLong(contentLengthStr);
+            } catch (NumberFormatException ignored) {
+            }
+        }
 
-    if (requestCb == null) {
-      return;
+        return 0;
     }
 
-    final RequestContext ctx = span.getRequestContext();
-    if (ctx == null) {
-      return;
-    }
+    protected void onHttpClientRequest(final AgentSpan span, final String url) {
+        if (!APPSEC_RASP_ENABLED) {
+            return;
+        }
+        if (url == null) {
+            return;
+        }
+        final BiFunction<RequestContext, HttpClientRequest, Flow<Void>> requestCb = AgentTracer.get()
+                .getCallbackProvider(RequestContextSlot.APPSEC)
+                .getCallback(EVENTS.httpClientRequest());
 
-    final long requestId = span.getSpanId();
-    Flow<Void> flow = requestCb.apply(ctx, new HttpClientRequest(requestId, url));
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction brf = ctx.getBlockResponseFunction();
-      if (brf != null) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
-      }
-      throw new BlockingException("Blocked request (for SSRF attempt)");
-    }
-  }
+        if (requestCb == null) {
+            return;
+        }
 
-  /* This method must be overriden after making the proper propagations to the client before **/
-  protected Object sourceUrl(REQUEST request) {
-    return null;
-  }
+        final RequestContext ctx = span.getRequestContext();
+        if (ctx == null) {
+            return;
+        }
 
-  private void ssrfIastCheck(final REQUEST request) {
-    final Object sourceUrl = sourceUrl(request);
-    if (sourceUrl == null) {
-      return;
+        final long requestId = span.getSpanId();
+        Flow<Void> flow = requestCb.apply(ctx, new HttpClientRequest(requestId, url));
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction brf = ctx.getBlockResponseFunction();
+            if (brf != null) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
+            }
+            throw new BlockingException("Blocked request (for SSRF attempt)");
+        }
     }
-    if (InstrumenterConfig.get().getIastActivation() != ProductActivation.FULLY_ENABLED) {
-      return;
+
+    /* This method must be overriden after making the proper propagations to the client before **/
+    protected Object sourceUrl(REQUEST request) {
+        return null;
     }
-    final SsrfModule ssrfModule = InstrumentationBridge.SSRF;
-    if (ssrfModule != null) {
-      ssrfModule.onURLConnection(sourceUrl);
+
+    private void ssrfIastCheck(final REQUEST request) {
+        final Object sourceUrl = sourceUrl(request);
+        if (sourceUrl == null) {
+            return;
+        }
+        if (InstrumenterConfig.get().getIastActivation() != ProductActivation.FULLY_ENABLED) {
+            return;
+        }
+        final SsrfModule ssrfModule = InstrumentationBridge.SSRF;
+        if (ssrfModule != null) {
+            ssrfModule.onURLConnection(sourceUrl);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java
index a962c759f92..7e5b81d36fc 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java
@@ -54,795 +54,760 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class HttpServerDecorator<REQUEST, CONNECTION, RESPONSE, REQUEST_CARRIER>
-    extends ServerDecorator {
-
-  private static final Logger log = LoggerFactory.getLogger(HttpServerDecorator.class);
-
-  public static final String DD_CONTEXT_ATTRIBUTE = "datadog.context";
-  public static final String DD_DISPATCH_SPAN_ATTRIBUTE = "datadog.span.dispatch";
-  public static final String DD_RUM_INJECTED = "datadog.rum.injected";
-  public static final String DD_FIN_DISP_LIST_SPAN_ATTRIBUTE =
-      "datadog.span.finish_dispatch_listener";
-  public static final String DD_RESPONSE_ATTRIBUTE = "datadog.response";
-  public static final String DD_IGNORE_COMMIT_ATTRIBUTE = "datadog.commit.ignore";
-
-  private static final UTF8BytesString DEFAULT_RESOURCE_NAME = UTF8BytesString.create("/");
-  protected static final UTF8BytesString NOT_FOUND_RESOURCE_NAME = UTF8BytesString.create("404");
-  protected static final boolean SHOULD_SET_404_RESOURCE_NAME =
-      Config.get().isRuleEnabled("URLAsResourceNameRule")
-          && Config.get().isRuleEnabled("Status404Rule")
-          && Config.get().isRuleEnabled("Status404Decorator");
-  private static final boolean SHOULD_SET_URL_RESOURCE_NAME =
-      Config.get().isRuleEnabled("URLAsResourceNameRule");
-
-  private static final BitSet SERVER_ERROR_STATUSES = Config.get().getHttpServerErrorStatuses();
-  private static final String DEFAULT_INSTRUMENTATION_NAME = "http-server";
-
-  private final boolean traceClientIpResolverEnabled =
-      Config.get().isTraceClientIpResolverEnabled();
-
-  private final String primaryInstrumentationName;
-
-  protected HttpServerDecorator() {
-    String[] instrumentationNames = instrumentationNames();
-    this.primaryInstrumentationName =
-        instrumentationNames != null && instrumentationNames.length > 0
-            ? instrumentationNames[0]
-            : DEFAULT_INSTRUMENTATION_NAME;
-  }
-
-  protected final String primaryInstrumentationName() {
-    return primaryInstrumentationName;
-  }
-
-  protected abstract AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter();
-
-  protected abstract AgentPropagation.ContextVisitor<RESPONSE> responseGetter();
-
-  public abstract CharSequence spanName();
-
-  protected abstract String method(REQUEST request);
-
-  protected abstract URIDataAdapter url(REQUEST request);
-
-  protected abstract String peerHostIP(CONNECTION connection);
-
-  protected abstract int peerPort(CONNECTION connection);
-
-  protected abstract int status(RESPONSE response);
-
-  protected String getRequestHeader(REQUEST request, String key) {
-    // This method was not marked as abstract in order to avoid changing all server instrumentation
-    // at once.
-    // Instead, only ones required (by DSM specifically) have it implemented.
-    // This can change in the future.
-    return null;
-  }
-
-  protected String requestedSessionId(REQUEST request) {
-    return null;
-  }
-
-  public CharSequence operationName() {
-    return SpanNaming.instance()
-        .namingSchema()
-        .server()
-        .operationForComponent(component().toString());
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.HTTP_SERVER;
-  }
-
-  @Override
-  protected boolean traceAnalyticsDefault() {
-    return Config.get().isTraceAnalyticsEnabled();
-  }
-
-  // Extract this to allow for easier testing
-  protected AgentTracer.TracerAPI tracer() {
-    return AgentTracer.get();
-  }
-
-  /**
-   * Extracts context from an upstream service.
-   *
-   * @param carrier The request carrier to get the context from.
-   * @return The extracted context, {@code Context#root()} if no valid context to extract.
-   */
-  public Context extract(REQUEST_CARRIER carrier) {
-    AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter = getter();
-    if (null == carrier || null == getter) {
-      return root();
-    }
-    return Propagators.defaultPropagator().extract(root(), carrier, getter);
-  }
-
-  /**
-   * Starts a span.
-   *
-   * @param carrier The request carrier.
-   * @param parentContext The parent context of the span to create.
-   * @return A new context bundling the span, child of the given parent context.
-   */
-  public Context startSpan(REQUEST_CARRIER carrier, @Nonnull Context parentContext) {
-    String instrumentationName = component().toString();
-    AgentSpanContext extracted = getExtractedSpanContext(parentContext);
-    // Call IG callbacks
-    extracted = callIGCallbackStart(extracted);
-    // Create gateway inferred span if needed
-    extracted = startInferredProxySpan(parentContext, extracted);
-    AgentSpan span =
-        tracer().startSpan(instrumentationName, spanName(), extracted).setMeasured(true);
-    // Register service-entry span with inferred proxy span (if present) so that premature
-    // finish calls from child spans (e.g., Spring MVC handler) are deferred until the
-    // service-entry span finishes (after the response status is known).
-    registerServiceEntrySpanInInferredProxy(parentContext, span);
-    // Reset service name inherited from inferred proxy parent: the inferred span uses the
-    // gateway domain name as service name, but the service-entry span should identify
-    // the application (configured DD_SERVICE), not the upstream gateway.
-    resetServiceNameIfUnderInferredProxy(parentContext, span);
-    // Apply RequestBlockingAction if any
-    Flow<Void> flow = callIGCallbackRequestHeaders(span, carrier);
-    if (flow.getAction() instanceof RequestBlockingAction) {
-      span.setRequestBlockingAction((RequestBlockingAction) flow.getAction());
-    }
-    // Tag Datadog scan/test markers unconditionally so the API endpoint reducer
-    // can distinguish scan/test traffic from real user traffic.
-    tagSecurityTestingHeaders(span, carrier);
-    // DSM Checkpoint
-    tracer().getDataStreamsMonitoring().setCheckpoint(span, forHttpServer());
-    return parentContext.with(span);
-  }
-
-  protected void tagSecurityTestingHeaders(AgentSpan span, REQUEST_CARRIER carrier) {
-    AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter = getter();
-    if (carrier == null || getter == null) {
-      return;
-    }
-    getter.forEachKey(carrier, new SecurityTestingHeaderTagClassifier(span));
-  }
-
-  protected AgentSpanContext startInferredProxySpan(Context context, AgentSpanContext extracted) {
-    InferredProxySpan span;
-    if (!Config.get().isInferredProxyPropagationEnabled()
-        || (span = InferredProxySpan.fromContext(context)) == null) {
-      return extracted;
-    }
-    return span.start(extracted);
-  }
-
-  private void registerServiceEntrySpanInInferredProxy(
-      Context parentContext, AgentSpan serviceEntrySpan) {
-    InferredProxySpan inferredProxy = InferredProxySpan.fromContext(parentContext);
-    if (inferredProxy != null) {
-      inferredProxy.registerServiceEntrySpan(serviceEntrySpan);
-    }
-  }
-
-  private void resetServiceNameIfUnderInferredProxy(Context parentContext, AgentSpan span) {
-    if (InferredProxySpan.fromContext(parentContext) != null) {
-      span.setServiceName(Config.get().getServiceName());
-    }
-  }
-
-  private final DataStreamsTransactionTracker.TransactionSourceReader
-      DSM_TRANSACTION_SOURCE_READER =
-          (source, headerName) -> {
+public abstract class HttpServerDecorator<REQUEST, CONNECTION, RESPONSE, REQUEST_CARRIER> extends ServerDecorator {
+
+    private static final Logger log = LoggerFactory.getLogger(HttpServerDecorator.class);
+
+    public static final String DD_CONTEXT_ATTRIBUTE = "datadog.context";
+    public static final String DD_DISPATCH_SPAN_ATTRIBUTE = "datadog.span.dispatch";
+    public static final String DD_RUM_INJECTED = "datadog.rum.injected";
+    public static final String DD_FIN_DISP_LIST_SPAN_ATTRIBUTE = "datadog.span.finish_dispatch_listener";
+    public static final String DD_RESPONSE_ATTRIBUTE = "datadog.response";
+    public static final String DD_IGNORE_COMMIT_ATTRIBUTE = "datadog.commit.ignore";
+
+    private static final UTF8BytesString DEFAULT_RESOURCE_NAME = UTF8BytesString.create("/");
+    protected static final UTF8BytesString NOT_FOUND_RESOURCE_NAME = UTF8BytesString.create("404");
+    protected static final boolean SHOULD_SET_404_RESOURCE_NAME = Config.get().isRuleEnabled("URLAsResourceNameRule")
+            && Config.get().isRuleEnabled("Status404Rule")
+            && Config.get().isRuleEnabled("Status404Decorator");
+    private static final boolean SHOULD_SET_URL_RESOURCE_NAME = Config.get().isRuleEnabled("URLAsResourceNameRule");
+
+    private static final BitSet SERVER_ERROR_STATUSES = Config.get().getHttpServerErrorStatuses();
+    private static final String DEFAULT_INSTRUMENTATION_NAME = "http-server";
+
+    private final boolean traceClientIpResolverEnabled = Config.get().isTraceClientIpResolverEnabled();
+
+    private final String primaryInstrumentationName;
+
+    protected HttpServerDecorator() {
+        String[] instrumentationNames = instrumentationNames();
+        this.primaryInstrumentationName = instrumentationNames != null && instrumentationNames.length > 0
+                ? instrumentationNames[0]
+                : DEFAULT_INSTRUMENTATION_NAME;
+    }
+
+    protected final String primaryInstrumentationName() {
+        return primaryInstrumentationName;
+    }
+
+    protected abstract AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter();
+
+    protected abstract AgentPropagation.ContextVisitor<RESPONSE> responseGetter();
+
+    public abstract CharSequence spanName();
+
+    protected abstract String method(REQUEST request);
+
+    protected abstract URIDataAdapter url(REQUEST request);
+
+    protected abstract String peerHostIP(CONNECTION connection);
+
+    protected abstract int peerPort(CONNECTION connection);
+
+    protected abstract int status(RESPONSE response);
+
+    protected String getRequestHeader(REQUEST request, String key) {
+        // This method was not marked as abstract in order to avoid changing all server instrumentation
+        // at once.
+        // Instead, only ones required (by DSM specifically) have it implemented.
+        // This can change in the future.
+        return null;
+    }
+
+    protected String requestedSessionId(REQUEST request) {
+        return null;
+    }
+
+    public CharSequence operationName() {
+        return SpanNaming.instance()
+                .namingSchema()
+                .server()
+                .operationForComponent(component().toString());
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.HTTP_SERVER;
+    }
+
+    @Override
+    protected boolean traceAnalyticsDefault() {
+        return Config.get().isTraceAnalyticsEnabled();
+    }
+
+    // Extract this to allow for easier testing
+    protected AgentTracer.TracerAPI tracer() {
+        return AgentTracer.get();
+    }
+
+    /**
+     * Extracts context from an upstream service.
+     *
+     * @param carrier The request carrier to get the context from.
+     * @return The extracted context, {@code Context#root()} if no valid context to extract.
+     */
+    public Context extract(REQUEST_CARRIER carrier) {
+        AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter = getter();
+        if (null == carrier || null == getter) {
+            return root();
+        }
+        return Propagators.defaultPropagator().extract(root(), carrier, getter);
+    }
+
+    /**
+     * Starts a span.
+     *
+     * @param carrier The request carrier.
+     * @param parentContext The parent context of the span to create.
+     * @return A new context bundling the span, child of the given parent context.
+     */
+    public Context startSpan(REQUEST_CARRIER carrier, @Nonnull Context parentContext) {
+        String instrumentationName = component().toString();
+        AgentSpanContext extracted = getExtractedSpanContext(parentContext);
+        // Call IG callbacks
+        extracted = callIGCallbackStart(extracted);
+        // Create gateway inferred span if needed
+        extracted = startInferredProxySpan(parentContext, extracted);
+        AgentSpan span =
+                tracer().startSpan(instrumentationName, spanName(), extracted).setMeasured(true);
+        // Register service-entry span with inferred proxy span (if present) so that premature
+        // finish calls from child spans (e.g., Spring MVC handler) are deferred until the
+        // service-entry span finishes (after the response status is known).
+        registerServiceEntrySpanInInferredProxy(parentContext, span);
+        // Reset service name inherited from inferred proxy parent: the inferred span uses the
+        // gateway domain name as service name, but the service-entry span should identify
+        // the application (configured DD_SERVICE), not the upstream gateway.
+        resetServiceNameIfUnderInferredProxy(parentContext, span);
+        // Apply RequestBlockingAction if any
+        Flow<Void> flow = callIGCallbackRequestHeaders(span, carrier);
+        if (flow.getAction() instanceof RequestBlockingAction) {
+            span.setRequestBlockingAction((RequestBlockingAction) flow.getAction());
+        }
+        // Tag Datadog scan/test markers unconditionally so the API endpoint reducer
+        // can distinguish scan/test traffic from real user traffic.
+        tagSecurityTestingHeaders(span, carrier);
+        // DSM Checkpoint
+        tracer().getDataStreamsMonitoring().setCheckpoint(span, forHttpServer());
+        return parentContext.with(span);
+    }
+
+    protected void tagSecurityTestingHeaders(AgentSpan span, REQUEST_CARRIER carrier) {
+        AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter = getter();
+        if (carrier == null || getter == null) {
+            return;
+        }
+        getter.forEachKey(carrier, new SecurityTestingHeaderTagClassifier(span));
+    }
+
+    protected AgentSpanContext startInferredProxySpan(Context context, AgentSpanContext extracted) {
+        InferredProxySpan span;
+        if (!Config.get().isInferredProxyPropagationEnabled()
+                || (span = InferredProxySpan.fromContext(context)) == null) {
+            return extracted;
+        }
+        return span.start(extracted);
+    }
+
+    private void registerServiceEntrySpanInInferredProxy(Context parentContext, AgentSpan serviceEntrySpan) {
+        InferredProxySpan inferredProxy = InferredProxySpan.fromContext(parentContext);
+        if (inferredProxy != null) {
+            inferredProxy.registerServiceEntrySpan(serviceEntrySpan);
+        }
+    }
+
+    private void resetServiceNameIfUnderInferredProxy(Context parentContext, AgentSpan span) {
+        if (InferredProxySpan.fromContext(parentContext) != null) {
+            span.setServiceName(Config.get().getServiceName());
+        }
+    }
+
+    private final DataStreamsTransactionTracker.TransactionSourceReader DSM_TRANSACTION_SOURCE_READER =
+            (source, headerName) -> {
+                try {
+                    return getRequestHeader((REQUEST) source, headerName);
+                } catch (Throwable ignored) {
+                    return null;
+                }
+            };
+
+    public final void onRequest(
+            final AgentSpan span, final CONNECTION connection, final REQUEST request, final Context parentContext) {
+        try {
+            doOnRequest(span, connection, request, parentContext);
+        } catch (BlockingException e) {
+            throw e;
+        } catch (Throwable t) {
+            log.debug("Failed to decorate span on request", t);
+        }
+    }
+
+    protected void doOnRequest(
+            final AgentSpan span, final CONNECTION connection, final REQUEST request, final Context parentContext) {
+        Config config = Config.get();
+
+        if (APPSEC_ACTIVE) {
+            RequestContext requestContext = span.getRequestContext();
+            if (requestContext != null) {
+                BlockResponseFunction brf = createBlockResponseFunction(request, connection);
+                if (brf != null) {
+                    requestContext.setBlockResponseFunction(brf);
+                }
+            }
+            Flow<Void> flow = callIGCallbackRequestSessionId(span, request);
+            Flow.Action action = flow.getAction();
+            if (action instanceof RequestBlockingAction) {
+                span.setRequestBlockingAction((RequestBlockingAction) flow.getAction());
+            }
+        }
+
+        AgentSpanContext.Extracted extracted = getExtractedSpanContext(parentContext);
+        // Whether to attach IP tags to all requests or not.
+        // This should be enabled if:
+        //   - DD_TRACE_CLIENT_IP_ENABLED=true, or
+        //   - DD_APPSEC_ENABLED=true (or AppSec enabled at runtime)
+        // This applies to tags:
+        //   - http.client_ip (IP resolved from proxy tags)
+        //   - network.client.ip (peer IP)
+        //   - tags with proxy header values
+        // For backwards compatibility, it does not apply to:
+        //   - peer.ipv4
+        //   - peer.ipv6
+        final boolean shouldTagIps = config.isClientIpEnabled() || traceClientIpResolverEnabled && APPSEC_ACTIVE;
+        // Whether to stash IP data for later tagging or not.
+        // AI Guard requires client IP tags on the local root span when an ai_guard span is created.
+        // Resolve the IPs eagerly but do not tag the span yet; stash them on the request context so
+        // AIGuardInternal can apply them lazily, only on requests that actually create an ai_guard
+        // span.
+        final boolean shouldStashIps = !shouldTagIps && traceClientIpResolverEnabled && config.isAiGuardEnabled();
+        // Whether to resolve client IP based on proxy headers or no.
+        final boolean shouldResolveIp = shouldTagIps || shouldStashIps;
+
+        if (extracted != null) {
+            if (shouldTagIps) {
+                String forwarded = extracted.getForwarded();
+                if (forwarded != null) {
+                    span.setTag(Tags.HTTP_FORWARDED, forwarded);
+                }
+                String forwardedProto = extracted.getXForwardedProto();
+                if (forwardedProto != null) {
+                    span.setTag(Tags.HTTP_FORWARDED_PROTO, forwardedProto);
+                }
+                String forwardedHost = extracted.getXForwardedHost();
+                if (forwardedHost != null) {
+                    span.setTag(Tags.HTTP_FORWARDED_HOST, forwardedHost);
+                }
+                String forwardedIp = extracted.getXForwardedFor();
+                if (forwardedIp != null) {
+                    span.setTag(Tags.HTTP_FORWARDED_IP, forwardedIp);
+                }
+                String forwardedPort = extracted.getXForwardedPort();
+                if (forwardedPort != null) {
+                    span.setTag(Tags.HTTP_FORWARDED_PORT, forwardedPort);
+                }
+            }
+            String userAgent = extracted.getUserAgent();
+            if (userAgent != null) {
+                span.setTag(Tags.HTTP_USER_AGENT, userAgent);
+            }
+        }
+
+        if (request != null) {
+            String method = method(request);
+            span.setTag(Tags.HTTP_METHOD, method);
+
+            // Copy of HttpClientDecorator url handling
             try {
-              return getRequestHeader((REQUEST) source, headerName);
-            } catch (Throwable ignored) {
-              return null;
+                final URIDataAdapter url = url(request);
+                if (url != null) {
+                    boolean supportsRaw = url.supportsRaw();
+                    boolean encoded = supportsRaw && config.isHttpServerRawResource();
+                    boolean valid = url.isValid();
+                    String path = encoded ? url.rawPath() : url.path();
+                    if (valid) {
+                        span.setTag(Tags.HTTP_URL, URIUtils.lazyValidURL(url.scheme(), url.host(), url.port(), path));
+                    } else if (supportsRaw) {
+                        span.setTag(Tags.HTTP_URL, URIUtils.lazyInvalidUrl(url.raw()));
+                    }
+                    if (extracted != null && extracted.getXForwardedHost() != null) {
+                        span.setTag(Tags.HTTP_HOSTNAME, extracted.getXForwardedHost());
+                    } else if (url.host() != null) {
+                        span.setTag(Tags.HTTP_HOSTNAME, url.host());
+                    }
+
+                    if (valid && config.isHttpServerTagQueryString()) {
+                        String query =
+                                supportsRaw && config.isHttpServerRawQueryString() ? url.rawQuery() : url.query();
+                        span.setTag(DDTags.HTTP_QUERY, query);
+                        span.setTag(DDTags.HTTP_FRAGMENT, url.fragment());
+                    }
+                    Flow<Void> flow = callIGCallbackURI(span, url, method);
+                    if (flow.getAction() instanceof RequestBlockingAction) {
+                        span.setRequestBlockingAction((RequestBlockingAction) flow.getAction());
+                    }
+                    if (valid && SHOULD_SET_URL_RESOURCE_NAME) {
+                        HTTP_RESOURCE_DECORATOR.withServerPath(span, method, path, encoded);
+                    }
+                } else if (SHOULD_SET_URL_RESOURCE_NAME) {
+                    span.setResourceName(DEFAULT_RESOURCE_NAME);
+                }
+            } catch (final Exception e) {
+                log.debug("Error tagging url", e);
+            }
+        }
+
+        String peerIp = null;
+        int peerPort = UNSET_PORT;
+        if (connection != null) {
+            peerIp = peerHostIP(connection);
+            peerPort = peerPort(connection);
+        }
+
+        String inferredAddressStr = null;
+        if (shouldResolveIp && extracted != null) {
+            InetAddress inferredAddress = ClientIpAddressResolver.resolve(extracted, span);
+            // the peer address should be used if:
+            // 1. the headers yield nothing, regardless of whether it is public or not
+            // 2. it is public and the headers yield a private address
+            if (peerIp != null) {
+                if (inferredAddress == null) {
+                    inferredAddress = ClientIpAddressResolver.parseIpAddress(peerIp);
+                } else if (ClientIpAddressResolver.isIpAddrPrivate(inferredAddress)) {
+                    InetAddress peerAddress = ClientIpAddressResolver.parseIpAddress(peerIp);
+                    if (!ClientIpAddressResolver.isIpAddrPrivate(peerAddress)) {
+                        inferredAddress = peerAddress;
+                    }
+                }
+            }
+            if (inferredAddress != null) {
+                inferredAddressStr = inferredAddress.getHostAddress();
+                if (shouldTagIps) {
+                    span.setTag(Tags.HTTP_CLIENT_IP, inferredAddressStr);
+                }
             }
-          };
-
-  public final void onRequest(
-      final AgentSpan span,
-      final CONNECTION connection,
-      final REQUEST request,
-      final Context parentContext) {
-    try {
-      doOnRequest(span, connection, request, parentContext);
-    } catch (BlockingException e) {
-      throw e;
-    } catch (Throwable t) {
-      log.debug("Failed to decorate span on request", t);
-    }
-  }
-
-  protected void doOnRequest(
-      final AgentSpan span,
-      final CONNECTION connection,
-      final REQUEST request,
-      final Context parentContext) {
-    Config config = Config.get();
-
-    if (APPSEC_ACTIVE) {
-      RequestContext requestContext = span.getRequestContext();
-      if (requestContext != null) {
-        BlockResponseFunction brf = createBlockResponseFunction(request, connection);
-        if (brf != null) {
-          requestContext.setBlockResponseFunction(brf);
-        }
-      }
-      Flow<Void> flow = callIGCallbackRequestSessionId(span, request);
-      Flow.Action action = flow.getAction();
-      if (action instanceof RequestBlockingAction) {
-        span.setRequestBlockingAction((RequestBlockingAction) flow.getAction());
-      }
-    }
-
-    AgentSpanContext.Extracted extracted = getExtractedSpanContext(parentContext);
-    // Whether to attach IP tags to all requests or not.
-    // This should be enabled if:
-    //   - DD_TRACE_CLIENT_IP_ENABLED=true, or
-    //   - DD_APPSEC_ENABLED=true (or AppSec enabled at runtime)
-    // This applies to tags:
-    //   - http.client_ip (IP resolved from proxy tags)
-    //   - network.client.ip (peer IP)
-    //   - tags with proxy header values
-    // For backwards compatibility, it does not apply to:
-    //   - peer.ipv4
-    //   - peer.ipv6
-    final boolean shouldTagIps =
-        config.isClientIpEnabled() || traceClientIpResolverEnabled && APPSEC_ACTIVE;
-    // Whether to stash IP data for later tagging or not.
-    // AI Guard requires client IP tags on the local root span when an ai_guard span is created.
-    // Resolve the IPs eagerly but do not tag the span yet; stash them on the request context so
-    // AIGuardInternal can apply them lazily, only on requests that actually create an ai_guard
-    // span.
-    final boolean shouldStashIps =
-        !shouldTagIps && traceClientIpResolverEnabled && config.isAiGuardEnabled();
-    // Whether to resolve client IP based on proxy headers or no.
-    final boolean shouldResolveIp = shouldTagIps || shouldStashIps;
-
-    if (extracted != null) {
-      if (shouldTagIps) {
-        String forwarded = extracted.getForwarded();
-        if (forwarded != null) {
-          span.setTag(Tags.HTTP_FORWARDED, forwarded);
-        }
-        String forwardedProto = extracted.getXForwardedProto();
-        if (forwardedProto != null) {
-          span.setTag(Tags.HTTP_FORWARDED_PROTO, forwardedProto);
-        }
-        String forwardedHost = extracted.getXForwardedHost();
-        if (forwardedHost != null) {
-          span.setTag(Tags.HTTP_FORWARDED_HOST, forwardedHost);
-        }
-        String forwardedIp = extracted.getXForwardedFor();
-        if (forwardedIp != null) {
-          span.setTag(Tags.HTTP_FORWARDED_IP, forwardedIp);
-        }
-        String forwardedPort = extracted.getXForwardedPort();
-        if (forwardedPort != null) {
-          span.setTag(Tags.HTTP_FORWARDED_PORT, forwardedPort);
-        }
-      }
-      String userAgent = extracted.getUserAgent();
-      if (userAgent != null) {
-        span.setTag(Tags.HTTP_USER_AGENT, userAgent);
-      }
-    }
-
-    if (request != null) {
-      String method = method(request);
-      span.setTag(Tags.HTTP_METHOD, method);
-
-      // Copy of HttpClientDecorator url handling
-      try {
-        final URIDataAdapter url = url(request);
-        if (url != null) {
-          boolean supportsRaw = url.supportsRaw();
-          boolean encoded = supportsRaw && config.isHttpServerRawResource();
-          boolean valid = url.isValid();
-          String path = encoded ? url.rawPath() : url.path();
-          if (valid) {
-            span.setTag(
-                Tags.HTTP_URL, URIUtils.lazyValidURL(url.scheme(), url.host(), url.port(), path));
-          } else if (supportsRaw) {
-            span.setTag(Tags.HTTP_URL, URIUtils.lazyInvalidUrl(url.raw()));
-          }
-          if (extracted != null && extracted.getXForwardedHost() != null) {
-            span.setTag(Tags.HTTP_HOSTNAME, extracted.getXForwardedHost());
-          } else if (url.host() != null) {
-            span.setTag(Tags.HTTP_HOSTNAME, url.host());
-          }
-
-          if (valid && config.isHttpServerTagQueryString()) {
-            String query =
-                supportsRaw && config.isHttpServerRawQueryString() ? url.rawQuery() : url.query();
-            span.setTag(DDTags.HTTP_QUERY, query);
-            span.setTag(DDTags.HTTP_FRAGMENT, url.fragment());
-          }
-          Flow<Void> flow = callIGCallbackURI(span, url, method);
-          if (flow.getAction() instanceof RequestBlockingAction) {
+        } else if (shouldTagIps && span.getLocalRootSpan() != span) {
+            // in this case extracted == null
+            // If there is no extracted we can't do anything but use the peer addr.
+            // Additionally, extracted == null arises on subspans for which the resolution
+            // likely already happened on the top span, so we don't need to do the resolution
+            // again. Instead, copy from the top span, should it exist
+            AgentSpan localRootSpan = span.getLocalRootSpan();
+            Object clientIp = localRootSpan.getTag(Tags.HTTP_CLIENT_IP);
+            if (clientIp != null) {
+                span.setTag(Tags.HTTP_CLIENT_IP, clientIp);
+            }
+        }
+
+        if (peerIp != null) {
+            if (peerIp.indexOf(':') > 0) {
+                span.setTag(Tags.PEER_HOST_IPV6, peerIp);
+            } else {
+                span.setTag(Tags.PEER_HOST_IPV4, peerIp);
+            }
+            if (shouldTagIps) {
+                span.setTag(Tags.NETWORK_CLIENT_IP, peerIp);
+            }
+        }
+        if (shouldStashIps && (peerIp != null || inferredAddressStr != null)) {
+            RequestContext requestContext = span.getRequestContext();
+            if (requestContext != null && requestContext.getClientIpAddressData() == null) {
+                requestContext.setClientIpAddressData(new ClientIpAddressData(peerIp, inferredAddressStr));
+            }
+        }
+        setPeerPort(span, peerPort);
+        Flow<Void> flow = callIGCallbackAddressAndPort(span, peerIp, peerPort, inferredAddressStr);
+        if (flow.getAction() instanceof RequestBlockingAction) {
             span.setRequestBlockingAction((RequestBlockingAction) flow.getAction());
-          }
-          if (valid && SHOULD_SET_URL_RESOURCE_NAME) {
-            HTTP_RESOURCE_DECORATOR.withServerPath(span, method, path, encoded);
-          }
-        } else if (SHOULD_SET_URL_RESOURCE_NAME) {
-          span.setResourceName(DEFAULT_RESOURCE_NAME);
-        }
-      } catch (final Exception e) {
-        log.debug("Error tagging url", e);
-      }
-    }
-
-    String peerIp = null;
-    int peerPort = UNSET_PORT;
-    if (connection != null) {
-      peerIp = peerHostIP(connection);
-      peerPort = peerPort(connection);
-    }
-
-    String inferredAddressStr = null;
-    if (shouldResolveIp && extracted != null) {
-      InetAddress inferredAddress = ClientIpAddressResolver.resolve(extracted, span);
-      // the peer address should be used if:
-      // 1. the headers yield nothing, regardless of whether it is public or not
-      // 2. it is public and the headers yield a private address
-      if (peerIp != null) {
-        if (inferredAddress == null) {
-          inferredAddress = ClientIpAddressResolver.parseIpAddress(peerIp);
-        } else if (ClientIpAddressResolver.isIpAddrPrivate(inferredAddress)) {
-          InetAddress peerAddress = ClientIpAddressResolver.parseIpAddress(peerIp);
-          if (!ClientIpAddressResolver.isIpAddrPrivate(peerAddress)) {
-            inferredAddress = peerAddress;
-          }
-        }
-      }
-      if (inferredAddress != null) {
-        inferredAddressStr = inferredAddress.getHostAddress();
-        if (shouldTagIps) {
-          span.setTag(Tags.HTTP_CLIENT_IP, inferredAddressStr);
-        }
-      }
-    } else if (shouldTagIps && span.getLocalRootSpan() != span) {
-      // in this case extracted == null
-      // If there is no extracted we can't do anything but use the peer addr.
-      // Additionally, extracted == null arises on subspans for which the resolution
-      // likely already happened on the top span, so we don't need to do the resolution
-      // again. Instead, copy from the top span, should it exist
-      AgentSpan localRootSpan = span.getLocalRootSpan();
-      Object clientIp = localRootSpan.getTag(Tags.HTTP_CLIENT_IP);
-      if (clientIp != null) {
-        span.setTag(Tags.HTTP_CLIENT_IP, clientIp);
-      }
-    }
-
-    if (peerIp != null) {
-      if (peerIp.indexOf(':') > 0) {
-        span.setTag(Tags.PEER_HOST_IPV6, peerIp);
-      } else {
-        span.setTag(Tags.PEER_HOST_IPV4, peerIp);
-      }
-      if (shouldTagIps) {
-        span.setTag(Tags.NETWORK_CLIENT_IP, peerIp);
-      }
-    }
-    if (shouldStashIps && (peerIp != null || inferredAddressStr != null)) {
-      RequestContext requestContext = span.getRequestContext();
-      if (requestContext != null && requestContext.getClientIpAddressData() == null) {
-        requestContext.setClientIpAddressData(new ClientIpAddressData(peerIp, inferredAddressStr));
-      }
-    }
-    setPeerPort(span, peerPort);
-    Flow<Void> flow = callIGCallbackAddressAndPort(span, peerIp, peerPort, inferredAddressStr);
-    if (flow.getAction() instanceof RequestBlockingAction) {
-      span.setRequestBlockingAction((RequestBlockingAction) flow.getAction());
-    }
-
-    AgentTracer.get()
-        .getDataStreamsMonitoring()
-        .trackTransaction(
-            span,
-            DataStreamsTransactionExtractor.Type.HTTP_IN_HEADERS,
-            request,
-            DSM_TRANSACTION_SOURCE_READER);
-  }
-
-  protected static AgentSpanContext.Extracted getExtractedSpanContext(Context parentContext) {
-    AgentSpan extractedSpan = fromContext(parentContext);
-    if (extractedSpan != null) {
-      AgentSpanContext extractedSpanContext = extractedSpan.spanContext();
-      if (extractedSpanContext instanceof AgentSpanContext.Extracted) {
-        return (AgentSpanContext.Extracted) extractedSpanContext;
-      } else {
-        log.warn("Expected AgentSpanContext.Extracted but found {}", extractedSpanContext);
-      }
-    }
-    return null;
-  }
-
-  protected BlockResponseFunction createBlockResponseFunction(
-      REQUEST request, CONNECTION connection) {
-    return null;
-  }
-
-  public final void onResponseStatus(final AgentSpan span, final int status) {
-    try {
-      doOnResponseStatus(span, status);
-    } catch (BlockingException e) {
-      throw e;
-    } catch (Throwable t) {
-      log.debug("Failed to decorate span on response status", t);
-    }
-  }
-
-  protected void doOnResponseStatus(final AgentSpan span, final int status) {
-    if (status > UNSET_STATUS) {
-      span.setHttpStatusCode(status);
-      // explicitly set here because some other decorators might already set an error without
-      // looking at the status code
-      // XXX: the logic is questionable: span.error becomes equivalent to status 5xx,
-      // even if the server chooses not to respond with 5xx to an error.
-      // Anyway, we def don't want it applied to blocked requests
-      if (!BlockingException.class.getName().equals(span.getTag("error.type"))) {
-        span.setError(SERVER_ERROR_STATUSES.get(status), ErrorPriorities.HTTP_SERVER_DECORATOR);
-      }
-    }
-
-    if (SHOULD_SET_404_RESOURCE_NAME && status == 404) {
-      span.setResourceName(NOT_FOUND_RESOURCE_NAME, ResourceNamePriorities.HTTP_404);
-    }
-  }
-
-  /**
-   * Whether AppSec should NOT be called during onResponse() for analysis of the status code and
-   * headers.
-   *
-   * <p>{@link #onResponse(AgentSpan, Object)} is usually called too late for AppSec to be able to
-   * alter the response, so for those modules where we support blocking on response this is <code>
-   * true</code> and AppSec has its own (earlier) hook point for processing the response (just
-   * before commit).
-   *
-   * @return whether AppSec analysis of the response is run separately from onResponse
-   */
-  protected boolean isAppSecOnResponseSeparate() {
-    return false;
-  }
-
-  public final void onResponse(final AgentSpan span, final RESPONSE response) {
-    try {
-      doOnResponse(span, response);
-    } catch (BlockingException e) {
-      throw e;
-    } catch (Throwable t) {
-      log.debug("Failed to decorate span on response", t);
-    }
-  }
-
-  protected void doOnResponse(final AgentSpan span, final RESPONSE response) {
-    if (response != null) {
-      final int status = status(response);
-      doOnResponseStatus(span, status);
-
-      AgentPropagation.ContextVisitor<RESPONSE> getter = responseGetter();
-      if (getter != null) {
-        ResponseHeaderTagClassifier tagger =
-            ResponseHeaderTagClassifier.create(span, traceConfig(span).getResponseHeaderTags());
-        if (tagger != null) {
-          getter.forEachKey(response, tagger);
-        }
-      }
-
-      if (!isAppSecOnResponseSeparate()) {
-        callIGCallbackResponseAndHeaders(span, response, status);
-      }
-    }
-  }
-
-  private AgentSpanContext callIGCallbackStart(@Nullable final AgentSpanContext extracted) {
-    AgentTracer.TracerAPI tracer = tracer();
-    Supplier<Flow<Object>> startedCbAppSec =
-        tracer.getCallbackProvider(RequestContextSlot.APPSEC).getCallback(EVENTS.requestStarted());
-    Supplier<Flow<Object>> startedCbIast =
-        tracer.getCallbackProvider(RequestContextSlot.IAST).getCallback(EVENTS.requestStarted());
-
-    if (startedCbAppSec == null && startedCbIast == null) {
-      return extracted;
-    }
-
-    TagContext tagContext = null;
-    if (extracted == null) {
-      tagContext = new TagContext();
-    } else if (extracted instanceof TagContext) {
-      tagContext = (TagContext) extracted;
-    }
-
-    if (tagContext != null) {
-      if (startedCbAppSec != null) {
-        tagContext.withRequestContextDataAppSec(startedCbAppSec.get().getResult());
-      }
-      if (startedCbIast != null) {
-        tagContext.withRequestContextDataIast(startedCbIast.get().getResult());
-      }
-      return tagContext;
-    }
-
-    return extracted;
-  }
-
-  @Override
-  protected void doOnError(
-      @Nonnull final AgentSpan span, @Nonnull final Throwable throwable, byte errorPriority) {
-    if (throwable != null) {
-      span.addThrowable(
-          throwable instanceof ExecutionException ? throwable.getCause() : throwable,
-          ErrorPriorities.HTTP_SERVER_DECORATOR);
-    }
-  }
-
-  private Flow<Void> callIGCallbackRequestHeaders(AgentSpan span, REQUEST_CARRIER carrier) {
-    CallbackProvider cbp = tracer().getUniversalCallbackProvider();
-    RequestContext requestContext = span.getRequestContext();
-    AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter = getter();
-    if (requestContext == null || getter == null) {
-      return Flow.ResultFlow.empty();
-    }
-    if (cbp != null) {
-      IGKeyClassifier igKeyClassifier =
-          IGKeyClassifier.create(
-              requestContext,
-              cbp.getCallback(EVENTS.requestHeader()),
-              cbp.getCallback(EVENTS.requestHeaderDone()));
-      if (null != igKeyClassifier) {
-        getter.forEachKey(carrier, igKeyClassifier);
-        return igKeyClassifier.done();
-      }
-    }
-    return Flow.ResultFlow.empty();
-  }
-
-  @SuppressWarnings("UnusedReturnValue")
-  private Flow<Void> callIGCallbackRequestSessionId(final AgentSpan span, final REQUEST request) {
-    final String sessionId = requestedSessionId(request);
-    if (sessionId == null) {
-      return Flow.ResultFlow.empty();
-    }
-    final CallbackProvider cbp = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
-    final RequestContext requestContext = span.getRequestContext();
-    if (cbp == null || requestContext == null) {
-      return Flow.ResultFlow.empty();
-    }
-    final BiFunction<RequestContext, String, Flow<Void>> addrCallback =
-        cbp.getCallback(EVENTS.requestSession());
-    if (addrCallback == null) {
-      return Flow.ResultFlow.empty();
-    }
-    return addrCallback.apply(requestContext, sessionId);
-  }
-
-  private Flow<Void> callIGCallbackResponseAndHeaders(
-      AgentSpan span, RESPONSE carrier, int status) {
-    return callIGCallbackResponseAndHeaders(span, carrier, status, responseGetter());
-  }
-
-  public <RESP> Flow<Void> callIGCallbackResponseAndHeaders(
-      AgentSpan span,
-      RESP carrier,
-      int status,
-      AgentPropagation.ContextVisitor<RESP> contextVisitor) {
-    CallbackProvider cbp = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
-    RequestContext requestContext = span.getRequestContext();
-    if (cbp == null || requestContext == null) {
-      return Flow.ResultFlow.empty();
-    }
-
-    BiFunction<RequestContext, Integer, Flow<Void>> addrCallback =
-        cbp.getCallback(EVENTS.responseStarted());
-    if (null != addrCallback) {
-      addrCallback.apply(requestContext, status);
-    }
-    if (contextVisitor == null) {
-      return Flow.ResultFlow.empty();
-    }
-    IGKeyClassifier igKeyClassifier =
-        IGKeyClassifier.create(
-            requestContext,
-            cbp.getCallback(EVENTS.responseHeader()),
-            cbp.getCallback(EVENTS.responseHeaderDone()));
-    if (null != igKeyClassifier) {
-      contextVisitor.forEachKey(carrier, igKeyClassifier);
-      return igKeyClassifier.done();
-    }
-    return Flow.ResultFlow.empty();
-  }
-
-  private Flow<Void> callIGCallbackURI(
-      @Nonnull final AgentSpan span, @Nonnull final URIDataAdapter url, final String method) {
-    // TODO:appsec there must be some better way to do this?
-    CallbackProvider cbp = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
-    RequestContext requestContext = span.getRequestContext();
-    if (requestContext == null || cbp == null) {
-      return Flow.ResultFlow.empty();
-    }
-
-    TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestMethodUriRaw());
-    if (callback != null) {
-      return callback.apply(requestContext, method, url);
-    }
-    return Flow.ResultFlow.empty();
-  }
-
-  @Override
-  protected void doBeforeFinish(@Nonnull Context context) {
-    AgentSpan span = fromContext(context);
-    if (span != null) {
-      onRequestEndForInstrumentationGateway(span);
-    }
-
-    // Close Serverless Gateway Inferred Span if any
-    finishInferredProxySpan(context);
-
-    super.doBeforeFinish(context);
-  }
-
-  protected void finishInferredProxySpan(Context context) {
-    InferredProxySpan inferredProxySpan;
-    if ((inferredProxySpan = InferredProxySpan.fromContext(context)) != null) {
-      inferredProxySpan.finish(AgentSpan.fromContext(context));
-    }
-  }
-
-  private void onRequestEndForInstrumentationGateway(@Nonnull final AgentSpan span) {
-    AgentSpan localRoot = span.getLocalRootSpan();
-
-    // Check if the local root is an inferred proxy span
-    boolean hasInferredProxyParent =
-        localRoot != span && localRoot.getTag("_dd.inferred_span") != null;
-
-    // Only proceed if this is the root span OR if we have an inferred proxy parent
-    if (localRoot != span && !hasInferredProxyParent) {
-      return;
-    }
-
-    CallbackProvider cbp = tracer().getUniversalCallbackProvider();
-    RequestContext requestContext = span.getRequestContext();
-    if (cbp != null && requestContext != null) {
-      BiFunction<RequestContext, IGSpanInfo, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestEnded());
-      if (callback != null) {
-        callback.apply(requestContext, span);
-      }
-    }
-  }
-
-  private Flow<Void> callIGCallbackAddressAndPort(
-      @Nonnull final AgentSpan span,
-      final String ip,
-      final int port,
-      final String inferredClientIp) {
-    CallbackProvider cbp = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
-    if (cbp == null || (ip == null && inferredClientIp == null && port == UNSET_PORT)) {
-      return Flow.ResultFlow.empty();
-    }
-    RequestContext ctx = span.getRequestContext();
-    if (ctx == null) {
-      return Flow.ResultFlow.empty();
-    }
-
-    if (inferredClientIp != null) {
-      BiFunction<RequestContext, String, Flow<Void>> inferredAddrCallback =
-          cbp.getCallback(EVENTS.requestInferredClientAddress());
-      if (inferredAddrCallback != null) {
-        inferredAddrCallback.apply(ctx, inferredClientIp);
-      }
-    }
-
-    if (ip != null || port != UNSET_PORT) {
-      TriFunction<RequestContext, String, Integer, Flow<Void>> addrCallback =
-          cbp.getCallback(EVENTS.requestClientSocketAddress());
-      if (addrCallback != null) {
-        return addrCallback.apply(ctx, ip != null ? ip : "0.0.0.0", port);
-      }
-    }
-    return Flow.ResultFlow.empty();
-  }
-
-  /** This passes the headers through to the InstrumentationGateway */
-  protected static final class IGKeyClassifier implements AgentPropagation.KeyClassifier {
+        }
 
-    public static IGKeyClassifier create(
-        RequestContext requestContext,
-        TriConsumer<RequestContext, String, String> headerCallback,
-        Function<RequestContext, Flow<Void>> doneCallback) {
-      if (null == requestContext || null == headerCallback) {
+        AgentTracer.get()
+                .getDataStreamsMonitoring()
+                .trackTransaction(
+                        span,
+                        DataStreamsTransactionExtractor.Type.HTTP_IN_HEADERS,
+                        request,
+                        DSM_TRANSACTION_SOURCE_READER);
+    }
+
+    protected static AgentSpanContext.Extracted getExtractedSpanContext(Context parentContext) {
+        AgentSpan extractedSpan = fromContext(parentContext);
+        if (extractedSpan != null) {
+            AgentSpanContext extractedSpanContext = extractedSpan.spanContext();
+            if (extractedSpanContext instanceof AgentSpanContext.Extracted) {
+                return (AgentSpanContext.Extracted) extractedSpanContext;
+            } else {
+                log.warn("Expected AgentSpanContext.Extracted but found {}", extractedSpanContext);
+            }
+        }
         return null;
-      }
-      return new IGKeyClassifier(requestContext, headerCallback, doneCallback);
     }
 
-    private final RequestContext requestContext;
-    private final TriConsumer<RequestContext, String, String> headerCallback;
-    private final Function<RequestContext, Flow<Void>> doneCallback;
+    protected BlockResponseFunction createBlockResponseFunction(REQUEST request, CONNECTION connection) {
+        return null;
+    }
 
-    private IGKeyClassifier(
-        RequestContext requestContext,
-        TriConsumer<RequestContext, String, String> headerCallback,
-        Function<RequestContext, Flow<Void>> doneCallback) {
-      this.requestContext = requestContext;
-      this.headerCallback = headerCallback;
-      this.doneCallback = doneCallback;
+    public final void onResponseStatus(final AgentSpan span, final int status) {
+        try {
+            doOnResponseStatus(span, status);
+        } catch (BlockingException e) {
+            throw e;
+        } catch (Throwable t) {
+            log.debug("Failed to decorate span on response status", t);
+        }
     }
 
-    @Override
-    public boolean accept(String key, String value) {
-      headerCallback.accept(requestContext, key, value);
-      return true;
+    protected void doOnResponseStatus(final AgentSpan span, final int status) {
+        if (status > UNSET_STATUS) {
+            span.setHttpStatusCode(status);
+            // explicitly set here because some other decorators might already set an error without
+            // looking at the status code
+            // XXX: the logic is questionable: span.error becomes equivalent to status 5xx,
+            // even if the server chooses not to respond with 5xx to an error.
+            // Anyway, we def don't want it applied to blocked requests
+            if (!BlockingException.class.getName().equals(span.getTag("error.type"))) {
+                span.setError(SERVER_ERROR_STATUSES.get(status), ErrorPriorities.HTTP_SERVER_DECORATOR);
+            }
+        }
+
+        if (SHOULD_SET_404_RESOURCE_NAME && status == 404) {
+            span.setResourceName(NOT_FOUND_RESOURCE_NAME, ResourceNamePriorities.HTTP_404);
+        }
     }
 
-    public Flow<Void> done() {
-      if (null != doneCallback) {
-        return doneCallback.apply(requestContext);
-      }
-      return Flow.ResultFlow.empty();
+    /**
+     * Whether AppSec should NOT be called during onResponse() for analysis of the status code and
+     * headers.
+     *
+     * <p>{@link #onResponse(AgentSpan, Object)} is usually called too late for AppSec to be able to
+     * alter the response, so for those modules where we support blocking on response this is <code>
+     * true</code> and AppSec has its own (earlier) hook point for processing the response (just
+     * before commit).
+     *
+     * @return whether AppSec analysis of the response is run separately from onResponse
+     */
+    protected boolean isAppSecOnResponseSeparate() {
+        return false;
+    }
+
+    public final void onResponse(final AgentSpan span, final RESPONSE response) {
+        try {
+            doOnResponse(span, response);
+        } catch (BlockingException e) {
+            throw e;
+        } catch (Throwable t) {
+            log.debug("Failed to decorate span on response", t);
+        }
     }
-  }
 
-  private static final class SecurityTestingHeaderTagClassifier
-      implements AgentPropagation.KeyClassifier {
-    private static final String HEADER_ENDPOINT_SCAN = "x-datadog-endpoint-scan";
-    private static final String HEADER_SECURITY_TEST = "x-datadog-security-test";
+    protected void doOnResponse(final AgentSpan span, final RESPONSE response) {
+        if (response != null) {
+            final int status = status(response);
+            doOnResponseStatus(span, status);
 
-    private final AgentSpan span;
-    private boolean endpointScanSeen;
-    private boolean securityTestSeen;
+            AgentPropagation.ContextVisitor<RESPONSE> getter = responseGetter();
+            if (getter != null) {
+                ResponseHeaderTagClassifier tagger = ResponseHeaderTagClassifier.create(
+                        span, traceConfig(span).getResponseHeaderTags());
+                if (tagger != null) {
+                    getter.forEachKey(response, tagger);
+                }
+            }
 
-    SecurityTestingHeaderTagClassifier(AgentSpan span) {
-      this.span = span;
+            if (!isAppSecOnResponseSeparate()) {
+                callIGCallbackResponseAndHeaders(span, response, status);
+            }
+        }
+    }
+
+    private AgentSpanContext callIGCallbackStart(@Nullable final AgentSpanContext extracted) {
+        AgentTracer.TracerAPI tracer = tracer();
+        Supplier<Flow<Object>> startedCbAppSec =
+                tracer.getCallbackProvider(RequestContextSlot.APPSEC).getCallback(EVENTS.requestStarted());
+        Supplier<Flow<Object>> startedCbIast =
+                tracer.getCallbackProvider(RequestContextSlot.IAST).getCallback(EVENTS.requestStarted());
+
+        if (startedCbAppSec == null && startedCbIast == null) {
+            return extracted;
+        }
+
+        TagContext tagContext = null;
+        if (extracted == null) {
+            tagContext = new TagContext();
+        } else if (extracted instanceof TagContext) {
+            tagContext = (TagContext) extracted;
+        }
+
+        if (tagContext != null) {
+            if (startedCbAppSec != null) {
+                tagContext.withRequestContextDataAppSec(startedCbAppSec.get().getResult());
+            }
+            if (startedCbIast != null) {
+                tagContext.withRequestContextDataIast(startedCbIast.get().getResult());
+            }
+            return tagContext;
+        }
+
+        return extracted;
     }
 
     @Override
-    public boolean accept(String key, String value) {
-      if (key == null || value == null) {
-        return true;
-      }
-      if (!endpointScanSeen && HEADER_ENDPOINT_SCAN.equalsIgnoreCase(key)) {
-        span.setTag(Tags.HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN, value);
-        endpointScanSeen = true;
-      } else if (!securityTestSeen && HEADER_SECURITY_TEST.equalsIgnoreCase(key)) {
-        span.setTag(Tags.HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST, value);
-        securityTestSeen = true;
-      }
-      // Stop iteration once both markers found, capping work on pathological header counts.
-      return !(endpointScanSeen && securityTestSeen);
-    }
-  }
-
-  private static final class ResponseHeaderTagClassifier implements AgentPropagation.KeyClassifier {
-    static ResponseHeaderTagClassifier create(AgentSpan span, Map<String, String> headerTags) {
-      if (span == null || headerTags == null || headerTags.isEmpty()) {
-        return null;
-      }
-      return new ResponseHeaderTagClassifier(span, headerTags);
+    protected void doOnError(@Nonnull final AgentSpan span, @Nonnull final Throwable throwable, byte errorPriority) {
+        if (throwable != null) {
+            span.addThrowable(
+                    throwable instanceof ExecutionException ? throwable.getCause() : throwable,
+                    ErrorPriorities.HTTP_SERVER_DECORATOR);
+        }
+    }
+
+    private Flow<Void> callIGCallbackRequestHeaders(AgentSpan span, REQUEST_CARRIER carrier) {
+        CallbackProvider cbp = tracer().getUniversalCallbackProvider();
+        RequestContext requestContext = span.getRequestContext();
+        AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter = getter();
+        if (requestContext == null || getter == null) {
+            return Flow.ResultFlow.empty();
+        }
+        if (cbp != null) {
+            IGKeyClassifier igKeyClassifier = IGKeyClassifier.create(
+                    requestContext,
+                    cbp.getCallback(EVENTS.requestHeader()),
+                    cbp.getCallback(EVENTS.requestHeaderDone()));
+            if (null != igKeyClassifier) {
+                getter.forEachKey(carrier, igKeyClassifier);
+                return igKeyClassifier.done();
+            }
+        }
+        return Flow.ResultFlow.empty();
+    }
+
+    @SuppressWarnings("UnusedReturnValue")
+    private Flow<Void> callIGCallbackRequestSessionId(final AgentSpan span, final REQUEST request) {
+        final String sessionId = requestedSessionId(request);
+        if (sessionId == null) {
+            return Flow.ResultFlow.empty();
+        }
+        final CallbackProvider cbp = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
+        final RequestContext requestContext = span.getRequestContext();
+        if (cbp == null || requestContext == null) {
+            return Flow.ResultFlow.empty();
+        }
+        final BiFunction<RequestContext, String, Flow<Void>> addrCallback = cbp.getCallback(EVENTS.requestSession());
+        if (addrCallback == null) {
+            return Flow.ResultFlow.empty();
+        }
+        return addrCallback.apply(requestContext, sessionId);
     }
 
-    private final AgentSpan span;
-    private final Map<String, String> headerTags;
-    private final String wildcardHeaderPrefix;
+    private Flow<Void> callIGCallbackResponseAndHeaders(AgentSpan span, RESPONSE carrier, int status) {
+        return callIGCallbackResponseAndHeaders(span, carrier, status, responseGetter());
+    }
+
+    public <RESP> Flow<Void> callIGCallbackResponseAndHeaders(
+            AgentSpan span, RESP carrier, int status, AgentPropagation.ContextVisitor<RESP> contextVisitor) {
+        CallbackProvider cbp = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
+        RequestContext requestContext = span.getRequestContext();
+        if (cbp == null || requestContext == null) {
+            return Flow.ResultFlow.empty();
+        }
+
+        BiFunction<RequestContext, Integer, Flow<Void>> addrCallback = cbp.getCallback(EVENTS.responseStarted());
+        if (null != addrCallback) {
+            addrCallback.apply(requestContext, status);
+        }
+        if (contextVisitor == null) {
+            return Flow.ResultFlow.empty();
+        }
+        IGKeyClassifier igKeyClassifier = IGKeyClassifier.create(
+                requestContext, cbp.getCallback(EVENTS.responseHeader()), cbp.getCallback(EVENTS.responseHeaderDone()));
+        if (null != igKeyClassifier) {
+            contextVisitor.forEachKey(carrier, igKeyClassifier);
+            return igKeyClassifier.done();
+        }
+        return Flow.ResultFlow.empty();
+    }
+
+    private Flow<Void> callIGCallbackURI(
+            @Nonnull final AgentSpan span, @Nonnull final URIDataAdapter url, final String method) {
+        // TODO:appsec there must be some better way to do this?
+        CallbackProvider cbp = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
+        RequestContext requestContext = span.getRequestContext();
+        if (requestContext == null || cbp == null) {
+            return Flow.ResultFlow.empty();
+        }
 
-    public ResponseHeaderTagClassifier(AgentSpan span, Map<String, String> headerTags) {
-      this.span = span;
-      this.headerTags = headerTags;
-      this.wildcardHeaderPrefix = this.headerTags.get("*");
+        TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>> callback =
+                cbp.getCallback(EVENTS.requestMethodUriRaw());
+        if (callback != null) {
+            return callback.apply(requestContext, method, url);
+        }
+        return Flow.ResultFlow.empty();
     }
 
     @Override
-    public boolean accept(String key, String value) {
-      if (wildcardHeaderPrefix != null) {
-        span.setTag((wildcardHeaderPrefix + key).toLowerCase(Locale.ROOT), value);
-      }
-      String mappedKey = headerTags.get(key.toLowerCase(Locale.ROOT));
-      if (mappedKey != null) {
-        span.setTag(mappedKey, value);
-      }
-      return true;
-    }
-  }
+    protected void doBeforeFinish(@Nonnull Context context) {
+        AgentSpan span = fromContext(context);
+        if (span != null) {
+            onRequestEndForInstrumentationGateway(span);
+        }
+
+        // Close Serverless Gateway Inferred Span if any
+        finishInferredProxySpan(context);
+
+        super.doBeforeFinish(context);
+    }
+
+    protected void finishInferredProxySpan(Context context) {
+        InferredProxySpan inferredProxySpan;
+        if ((inferredProxySpan = InferredProxySpan.fromContext(context)) != null) {
+            inferredProxySpan.finish(AgentSpan.fromContext(context));
+        }
+    }
+
+    private void onRequestEndForInstrumentationGateway(@Nonnull final AgentSpan span) {
+        AgentSpan localRoot = span.getLocalRootSpan();
+
+        // Check if the local root is an inferred proxy span
+        boolean hasInferredProxyParent = localRoot != span && localRoot.getTag("_dd.inferred_span") != null;
+
+        // Only proceed if this is the root span OR if we have an inferred proxy parent
+        if (localRoot != span && !hasInferredProxyParent) {
+            return;
+        }
+
+        CallbackProvider cbp = tracer().getUniversalCallbackProvider();
+        RequestContext requestContext = span.getRequestContext();
+        if (cbp != null && requestContext != null) {
+            BiFunction<RequestContext, IGSpanInfo, Flow<Void>> callback = cbp.getCallback(EVENTS.requestEnded());
+            if (callback != null) {
+                callback.apply(requestContext, span);
+            }
+        }
+    }
+
+    private Flow<Void> callIGCallbackAddressAndPort(
+            @Nonnull final AgentSpan span, final String ip, final int port, final String inferredClientIp) {
+        CallbackProvider cbp = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
+        if (cbp == null || (ip == null && inferredClientIp == null && port == UNSET_PORT)) {
+            return Flow.ResultFlow.empty();
+        }
+        RequestContext ctx = span.getRequestContext();
+        if (ctx == null) {
+            return Flow.ResultFlow.empty();
+        }
+
+        if (inferredClientIp != null) {
+            BiFunction<RequestContext, String, Flow<Void>> inferredAddrCallback =
+                    cbp.getCallback(EVENTS.requestInferredClientAddress());
+            if (inferredAddrCallback != null) {
+                inferredAddrCallback.apply(ctx, inferredClientIp);
+            }
+        }
+
+        if (ip != null || port != UNSET_PORT) {
+            TriFunction<RequestContext, String, Integer, Flow<Void>> addrCallback =
+                    cbp.getCallback(EVENTS.requestClientSocketAddress());
+            if (addrCallback != null) {
+                return addrCallback.apply(ctx, ip != null ? ip : "0.0.0.0", port);
+            }
+        }
+        return Flow.ResultFlow.empty();
+    }
+
+    /** This passes the headers through to the InstrumentationGateway */
+    protected static final class IGKeyClassifier implements AgentPropagation.KeyClassifier {
+
+        public static IGKeyClassifier create(
+                RequestContext requestContext,
+                TriConsumer<RequestContext, String, String> headerCallback,
+                Function<RequestContext, Flow<Void>> doneCallback) {
+            if (null == requestContext || null == headerCallback) {
+                return null;
+            }
+            return new IGKeyClassifier(requestContext, headerCallback, doneCallback);
+        }
+
+        private final RequestContext requestContext;
+        private final TriConsumer<RequestContext, String, String> headerCallback;
+        private final Function<RequestContext, Flow<Void>> doneCallback;
+
+        private IGKeyClassifier(
+                RequestContext requestContext,
+                TriConsumer<RequestContext, String, String> headerCallback,
+                Function<RequestContext, Flow<Void>> doneCallback) {
+            this.requestContext = requestContext;
+            this.headerCallback = headerCallback;
+            this.doneCallback = doneCallback;
+        }
+
+        @Override
+        public boolean accept(String key, String value) {
+            headerCallback.accept(requestContext, key, value);
+            return true;
+        }
+
+        public Flow<Void> done() {
+            if (null != doneCallback) {
+                return doneCallback.apply(requestContext);
+            }
+            return Flow.ResultFlow.empty();
+        }
+    }
+
+    private static final class SecurityTestingHeaderTagClassifier implements AgentPropagation.KeyClassifier {
+        private static final String HEADER_ENDPOINT_SCAN = "x-datadog-endpoint-scan";
+        private static final String HEADER_SECURITY_TEST = "x-datadog-security-test";
+
+        private final AgentSpan span;
+        private boolean endpointScanSeen;
+        private boolean securityTestSeen;
+
+        SecurityTestingHeaderTagClassifier(AgentSpan span) {
+            this.span = span;
+        }
+
+        @Override
+        public boolean accept(String key, String value) {
+            if (key == null || value == null) {
+                return true;
+            }
+            if (!endpointScanSeen && HEADER_ENDPOINT_SCAN.equalsIgnoreCase(key)) {
+                span.setTag(Tags.HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN, value);
+                endpointScanSeen = true;
+            } else if (!securityTestSeen && HEADER_SECURITY_TEST.equalsIgnoreCase(key)) {
+                span.setTag(Tags.HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST, value);
+                securityTestSeen = true;
+            }
+            // Stop iteration once both markers found, capping work on pathological header counts.
+            return !(endpointScanSeen && securityTestSeen);
+        }
+    }
+
+    private static final class ResponseHeaderTagClassifier implements AgentPropagation.KeyClassifier {
+        static ResponseHeaderTagClassifier create(AgentSpan span, Map<String, String> headerTags) {
+            if (span == null || headerTags == null || headerTags.isEmpty()) {
+                return null;
+            }
+            return new ResponseHeaderTagClassifier(span, headerTags);
+        }
+
+        private final AgentSpan span;
+        private final Map<String, String> headerTags;
+        private final String wildcardHeaderPrefix;
+
+        public ResponseHeaderTagClassifier(AgentSpan span, Map<String, String> headerTags) {
+            this.span = span;
+            this.headerTags = headerTags;
+            this.wildcardHeaderPrefix = this.headerTags.get("*");
+        }
+
+        @Override
+        public boolean accept(String key, String value) {
+            if (wildcardHeaderPrefix != null) {
+                span.setTag((wildcardHeaderPrefix + key).toLowerCase(Locale.ROOT), value);
+            }
+            String mappedKey = headerTags.get(key.toLowerCase(Locale.ROOT));
+            if (mappedKey != null) {
+                span.setTag(mappedKey, value);
+            }
+            return true;
+        }
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/MessagingClientDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/MessagingClientDecorator.java
index 1941dae7a2e..7c2ced1c81c 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/MessagingClientDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/MessagingClientDecorator.java
@@ -7,25 +7,24 @@
 @ParametersAreNonnullByDefault
 public abstract class MessagingClientDecorator extends ClientDecorator {
 
-  protected final boolean endToEndDurationsEnabled;
+    protected final boolean endToEndDurationsEnabled;
 
-  protected MessagingClientDecorator() {
-    final Config config = Config.get();
-    final String[] instrumentationNames = instrumentationNames();
-    this.endToEndDurationsEnabled =
-        instrumentationNames.length > 0
-            && config.isEndToEndDurationEnabled(endToEndDurationsDefault(), instrumentationNames);
-  }
+    protected MessagingClientDecorator() {
+        final Config config = Config.get();
+        final String[] instrumentationNames = instrumentationNames();
+        this.endToEndDurationsEnabled = instrumentationNames.length > 0
+                && config.isEndToEndDurationEnabled(endToEndDurationsDefault(), instrumentationNames);
+    }
 
-  protected boolean endToEndDurationsDefault() {
-    return false;
-  }
+    protected boolean endToEndDurationsDefault() {
+        return false;
+    }
 
-  @Override
-  protected void doAfterStart(final AgentSpan span) {
-    if (endToEndDurationsEnabled) {
-      span.beginEndToEnd();
+    @Override
+    protected void doAfterStart(final AgentSpan span) {
+        if (endToEndDurationsEnabled) {
+            span.beginEndToEnd();
+        }
+        super.doAfterStart(span);
     }
-    super.doAfterStart(span);
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/OrmClientDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/OrmClientDecorator.java
index 478525c3072..884f13bd6e0 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/OrmClientDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/OrmClientDecorator.java
@@ -4,14 +4,14 @@
 
 public abstract class OrmClientDecorator extends DatabaseClientDecorator {
 
-  public abstract CharSequence entityName(final Object entity);
+    public abstract CharSequence entityName(final Object entity);
 
-  public void onOperation(final AgentSpan span, final Object entity) {
-    if (entity != null) {
-      final CharSequence name = entityName(entity);
-      if (name != null) {
-        span.setResourceName(name);
-      } // else we keep any existing resource.
+    public void onOperation(final AgentSpan span, final Object entity) {
+        if (entity != null) {
+            final CharSequence name = entityName(entity);
+            if (name != null) {
+                span.setResourceName(name);
+            } // else we keep any existing resource.
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/ServerDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/ServerDecorator.java
index 7551e66474d..992899b41b6 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/ServerDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/ServerDecorator.java
@@ -8,16 +8,15 @@
 
 @ParametersAreNonnullByDefault
 public abstract class ServerDecorator extends BaseDecorator {
-  private static final TagMap.Entry SPAN_KIND_ENTRY =
-      TagMap.Entry.create(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER);
-  private static final TagMap.Entry LANG_ENTRY =
-      TagMap.Entry.create(DDTags.LANGUAGE_TAG_KEY, DDTags.LANGUAGE_TAG_VALUE);
+    private static final TagMap.Entry SPAN_KIND_ENTRY = TagMap.Entry.create(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER);
+    private static final TagMap.Entry LANG_ENTRY =
+            TagMap.Entry.create(DDTags.LANGUAGE_TAG_KEY, DDTags.LANGUAGE_TAG_VALUE);
 
-  @Override
-  protected void doAfterStart(final AgentSpan span) {
-    span.setTag(SPAN_KIND_ENTRY);
-    span.setTag(LANG_ENTRY);
+    @Override
+    protected void doAfterStart(final AgentSpan span) {
+        span.setTag(SPAN_KIND_ENTRY);
+        span.setTag(LANG_ENTRY);
 
-    super.doAfterStart(span);
-  }
+        super.doAfterStart(span);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/UriBasedClientDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/UriBasedClientDecorator.java
index 0ab130eab19..28e91f87cee 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/UriBasedClientDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/UriBasedClientDecorator.java
@@ -13,26 +13,26 @@
 import javax.annotation.Nonnull;
 
 public abstract class UriBasedClientDecorator extends ClientDecorator {
-  public void onURI(@Nonnull final AgentSpan span, @Nonnull final URI uri) {
-    String host = uri.getHost();
-    int port = uri.getPort();
-    if (null != host && !host.isEmpty()) {
-      span.setTag(Tags.PEER_HOSTNAME, host);
-      if (Config.get().isHttpClientSplitByDomain() && host.charAt(0) >= 'A') {
-        span.setServiceName(host, component());
-      }
-      if (port > 0) {
-        setPeerPort(span, port);
-      }
+    public void onURI(@Nonnull final AgentSpan span, @Nonnull final URI uri) {
+        String host = uri.getHost();
+        int port = uri.getPort();
+        if (null != host && !host.isEmpty()) {
+            span.setTag(Tags.PEER_HOSTNAME, host);
+            if (Config.get().isHttpClientSplitByDomain() && host.charAt(0) >= 'A') {
+                span.setServiceName(host, component());
+            }
+            if (port > 0) {
+                setPeerPort(span, port);
+            }
+        }
     }
-  }
 
-  public <C> void injectContext(Context context, final C request, CarrierSetter<C> setter) {
-    // Add additional default DSM context for HTTP clients if missing but DSM is enabled
-    if (DataStreamsContext.fromContext(context) == null && traceConfig().isDataStreamsEnabled()) {
-      context = context.with(DataStreamsContext.forHttpClient());
+    public <C> void injectContext(Context context, final C request, CarrierSetter<C> setter) {
+        // Add additional default DSM context for HTTP clients if missing but DSM is enabled
+        if (DataStreamsContext.fromContext(context) == null && traceConfig().isDataStreamsEnabled()) {
+            context = context.with(DataStreamsContext.forHttpClient());
+        }
+        // Inject context into carrier
+        defaultPropagator().inject(context, request, setter);
     }
-    // Inject context into carrier
-    defaultPropagator().inject(context, request, setter);
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/UrlConnectionDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/UrlConnectionDecorator.java
index a3c8be6dd5b..e180605d96d 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/UrlConnectionDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/UrlConnectionDecorator.java
@@ -16,53 +16,51 @@
 import org.slf4j.LoggerFactory;
 
 public class UrlConnectionDecorator extends UriBasedClientDecorator {
-  private static final DDCache<String, CharSequence> CACHE = DDCaches.newFixedSizeCache(16);
+    private static final DDCache<String, CharSequence> CACHE = DDCaches.newFixedSizeCache(16);
 
-  private static final Function<String, CharSequence> ADDER =
-      protocol ->
-          UTF8BytesString.create(
-              SpanNaming.instance().namingSchema().client().operationForProtocol(protocol));
+    private static final Function<String, CharSequence> ADDER = protocol ->
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().client().operationForProtocol(protocol));
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(UrlConnectionDecorator.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(UrlConnectionDecorator.class);
 
-  public static final CharSequence COMPONENT = UTF8BytesString.create("UrlConnection");
-  public static final UrlConnectionDecorator DECORATE = new UrlConnectionDecorator();
+    public static final CharSequence COMPONENT = UTF8BytesString.create("UrlConnection");
+    public static final UrlConnectionDecorator DECORATE = new UrlConnectionDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"urlconnection", "httpurlconnection"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"urlconnection", "httpurlconnection"};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.HTTP_CLIENT;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.HTTP_CLIENT;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return COMPONENT;
-  }
+    @Override
+    protected CharSequence component() {
+        return COMPONENT;
+    }
 
-  @Override
-  protected String service() {
-    return null;
-  }
+    @Override
+    protected String service() {
+        return null;
+    }
 
-  @Override
-  public void onURI(@Nonnull AgentSpan span, @Nonnull URI uri) {
-    super.onURI(span, uri);
-    span.setTag(Tags.HTTP_URL, uri.toString());
-  }
+    @Override
+    public void onURI(@Nonnull AgentSpan span, @Nonnull URI uri) {
+        super.onURI(span, uri);
+        span.setTag(Tags.HTTP_URL, uri.toString());
+    }
 
-  public void onURL(@Nonnull final AgentSpan span, @Nonnull final URL url) {
-    try {
-      onURI(span, url.toURI());
-    } catch (URISyntaxException e) {
-      LOGGER.debug("Error tagging url", e);
+    public void onURL(@Nonnull final AgentSpan span, @Nonnull final URL url) {
+        try {
+            onURI(span, url.toURI());
+        } catch (URISyntaxException e) {
+            LOGGER.debug("Error tagging url", e);
+        }
     }
-  }
 
-  public CharSequence operationName(@Nonnull final String protocol) {
-    return CACHE.computeIfAbsent(protocol, ADDER);
-  }
+    public CharSequence operationName(@Nonnull final String protocol) {
+        return CACHE.computeIfAbsent(protocol, ADDER);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/WebsocketDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/WebsocketDecorator.java
index df2f4b6ddac..ea48aa232f9 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/WebsocketDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/WebsocketDecorator.java
@@ -31,166 +31,160 @@
 import org.slf4j.LoggerFactory;
 
 public class WebsocketDecorator extends BaseDecorator {
-  private static final Logger log = LoggerFactory.getLogger(WebsocketDecorator.class);
-
-  private static final CharSequence WEBSOCKET = UTF8BytesString.create("websocket");
-  private static final String[] INSTRUMENTATION_NAMES = {WEBSOCKET.toString()};
-  private static final CharSequence WEBSOCKET_RECEIVE = UTF8BytesString.create("websocket.receive");
-  private static final CharSequence WEBSOCKET_SEND = UTF8BytesString.create("websocket.send");
-  private static final CharSequence WEBSOCKET_CLOSE = UTF8BytesString.create("websocket.close");
-
-  private static final SpanAttributes SPAN_ATTRIBUTES_RECEIVE =
-      SpanAttributes.builder().put("dd.kind", "executed_from").build();
-  private static final SpanAttributes SPAN_ATTRIBUTES_SEND =
-      SpanAttributes.builder().put("dd.kind", "resuming").build();
-
-  public static final WebsocketDecorator DECORATE = new WebsocketDecorator();
-
-  @Override
-  protected String[] instrumentationNames() {
-    return INSTRUMENTATION_NAMES;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.WEBSOCKET;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return WEBSOCKET;
-  }
-
-  @Override
-  protected void doAfterStart(@Nonnull AgentSpan span) {
-    super.doAfterStart(span);
-    span.setMeasured(true);
-  }
-
-  @Nonnull
-  public AgentSpan startInboundFrameSpan(
-      final HandlerContext.Receiver handlerContext, final Object data, boolean partialDelivery) {
-    handlerContext.recordChunkData(data, partialDelivery);
-    return onFrameStart(
-        WEBSOCKET_RECEIVE, SPAN_KIND_CONSUMER, handlerContext, SPAN_ATTRIBUTES_RECEIVE, true);
-  }
-
-  @Nonnull
-  public AgentSpan startOutboundCloseSpan(
-      final HandlerContext.Sender handlerContext, CharSequence closeReason, int closeCode) {
-    return onFrameStart(
-            WEBSOCKET_CLOSE, SPAN_KIND_PRODUCER, handlerContext, SPAN_ATTRIBUTES_SEND, false)
-        .setTag(WEBSOCKET_CLOSE_CODE, closeCode)
-        .setTag(WEBSOCKET_CLOSE_REASON, closeReason);
-  }
-
-  @Nonnull
-  public AgentSpan startInboundCloseSpan(
-      final HandlerContext.Receiver handlerContext, CharSequence closeReason, int closeCode) {
-    return onFrameStart(
-            WEBSOCKET_CLOSE, SPAN_KIND_CONSUMER, handlerContext, SPAN_ATTRIBUTES_RECEIVE, true)
-        .setTag(WEBSOCKET_CLOSE_CODE, closeCode)
-        .setTag(WEBSOCKET_CLOSE_REASON, closeReason);
-  }
-
-  @Nonnull
-  public AgentSpan startOutboundFrameSpan(
-      final HandlerContext.Sender handlerContext, final CharSequence msgType, final int msgSize) {
-    handlerContext.recordChunkData(msgType, msgSize);
-    return onFrameStart(
-        WEBSOCKET_SEND, SPAN_KIND_PRODUCER, handlerContext, SPAN_ATTRIBUTES_SEND, false);
-  }
-
-  public final void onFrameEnd(final HandlerContext handlerContext) {
-    try {
-      doOnFrameEnd(handlerContext);
-    } catch (BlockingException e) {
-      throw e;
-    } catch (Throwable t) {
-      log.debug("Failed to decorate span on frame end", t);
+    private static final Logger log = LoggerFactory.getLogger(WebsocketDecorator.class);
+
+    private static final CharSequence WEBSOCKET = UTF8BytesString.create("websocket");
+    private static final String[] INSTRUMENTATION_NAMES = {WEBSOCKET.toString()};
+    private static final CharSequence WEBSOCKET_RECEIVE = UTF8BytesString.create("websocket.receive");
+    private static final CharSequence WEBSOCKET_SEND = UTF8BytesString.create("websocket.send");
+    private static final CharSequence WEBSOCKET_CLOSE = UTF8BytesString.create("websocket.close");
+
+    private static final SpanAttributes SPAN_ATTRIBUTES_RECEIVE =
+            SpanAttributes.builder().put("dd.kind", "executed_from").build();
+    private static final SpanAttributes SPAN_ATTRIBUTES_SEND =
+            SpanAttributes.builder().put("dd.kind", "resuming").build();
+
+    public static final WebsocketDecorator DECORATE = new WebsocketDecorator();
+
+    @Override
+    protected String[] instrumentationNames() {
+        return INSTRUMENTATION_NAMES;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.WEBSOCKET;
     }
-  }
 
-  protected void doOnFrameEnd(final HandlerContext handlerContext) {
-    if (handlerContext == null) {
-      return;
+    @Override
+    protected CharSequence component() {
+        return WEBSOCKET;
     }
-    final AgentSpan wsSpan = handlerContext.getWebsocketSpan();
-    if (wsSpan == null) {
-      return;
+
+    @Override
+    protected void doAfterStart(@Nonnull AgentSpan span) {
+        super.doAfterStart(span);
+        span.setMeasured(true);
+    }
+
+    @Nonnull
+    public AgentSpan startInboundFrameSpan(
+            final HandlerContext.Receiver handlerContext, final Object data, boolean partialDelivery) {
+        handlerContext.recordChunkData(data, partialDelivery);
+        return onFrameStart(WEBSOCKET_RECEIVE, SPAN_KIND_CONSUMER, handlerContext, SPAN_ATTRIBUTES_RECEIVE, true);
     }
-    try {
-      final long startTime = handlerContext.getFirstFrameTimestamp();
-      if (startTime > 0) {
-        wsSpan.setTag(
-            WEBSOCKET_MESSAGE_RECEIVE_TIME,
-            SystemTimeSource.INSTANCE.getCurrentTimeNanos() - startTime);
-      }
-      final long chunks = handlerContext.getMsgChunks();
-      if (chunks > 0) {
-        wsSpan.setTag(WEBSOCKET_MESSAGE_FRAMES, chunks);
-        wsSpan.setTag(WEBSOCKET_MESSAGE_LENGTH, handlerContext.getMsgSize());
-        wsSpan.setTag(WEBSOCKET_MESSAGE_TYPE, handlerContext.getMessageType());
-      }
-      beforeFinish(wsSpan);
-      wsSpan.finish();
-    } finally {
-      handlerContext.reset();
+
+    @Nonnull
+    public AgentSpan startOutboundCloseSpan(
+            final HandlerContext.Sender handlerContext, CharSequence closeReason, int closeCode) {
+        return onFrameStart(WEBSOCKET_CLOSE, SPAN_KIND_PRODUCER, handlerContext, SPAN_ATTRIBUTES_SEND, false)
+                .setTag(WEBSOCKET_CLOSE_CODE, closeCode)
+                .setTag(WEBSOCKET_CLOSE_REASON, closeReason);
+    }
+
+    @Nonnull
+    public AgentSpan startInboundCloseSpan(
+            final HandlerContext.Receiver handlerContext, CharSequence closeReason, int closeCode) {
+        return onFrameStart(WEBSOCKET_CLOSE, SPAN_KIND_CONSUMER, handlerContext, SPAN_ATTRIBUTES_RECEIVE, true)
+                .setTag(WEBSOCKET_CLOSE_CODE, closeCode)
+                .setTag(WEBSOCKET_CLOSE_REASON, closeReason);
     }
-  }
-
-  private AgentSpan onFrameStart(
-      final CharSequence operationName,
-      final CharSequence spanKind,
-      final HandlerContext handlerContext,
-      final SpanAttributes linkAttributes,
-      boolean traceStarter) {
-    AgentSpan wsSpan = handlerContext.getWebsocketSpan();
-    if (wsSpan == null) {
-      final Config config = Config.get();
-      final AgentSpan handshakeSpan = handlerContext.getHandshakeSpan();
-      boolean inheritSampling = config.isWebsocketMessagesInheritSampling();
-      boolean useDedicatedTraces = config.isWebsocketMessagesSeparateTraces();
-      if (traceStarter) {
-        if (useDedicatedTraces) {
-          wsSpan = startSpan(WEBSOCKET.toString(), operationName, null);
-          if (inheritSampling) {
-            wsSpan.copyPropagationAndBaggage(handshakeSpan);
-            wsSpan.setTag(DECISION_MAKER_INHERITED, 1);
-            wsSpan.setTag(DECISION_MAKER_SERVICE, handshakeSpan.getServiceName());
-            wsSpan.setTag(DECISION_MAKER_RESOURCE, handshakeSpan.getResourceName());
-          }
-        } else {
-          wsSpan = startSpan(WEBSOCKET.toString(), operationName, handshakeSpan.spanContext());
+
+    @Nonnull
+    public AgentSpan startOutboundFrameSpan(
+            final HandlerContext.Sender handlerContext, final CharSequence msgType, final int msgSize) {
+        handlerContext.recordChunkData(msgType, msgSize);
+        return onFrameStart(WEBSOCKET_SEND, SPAN_KIND_PRODUCER, handlerContext, SPAN_ATTRIBUTES_SEND, false);
+    }
+
+    public final void onFrameEnd(final HandlerContext handlerContext) {
+        try {
+            doOnFrameEnd(handlerContext);
+        } catch (BlockingException e) {
+            throw e;
+        } catch (Throwable t) {
+            log.debug("Failed to decorate span on frame end", t);
+        }
+    }
+
+    protected void doOnFrameEnd(final HandlerContext handlerContext) {
+        if (handlerContext == null) {
+            return;
+        }
+        final AgentSpan wsSpan = handlerContext.getWebsocketSpan();
+        if (wsSpan == null) {
+            return;
+        }
+        try {
+            final long startTime = handlerContext.getFirstFrameTimestamp();
+            if (startTime > 0) {
+                wsSpan.setTag(
+                        WEBSOCKET_MESSAGE_RECEIVE_TIME, SystemTimeSource.INSTANCE.getCurrentTimeNanos() - startTime);
+            }
+            final long chunks = handlerContext.getMsgChunks();
+            if (chunks > 0) {
+                wsSpan.setTag(WEBSOCKET_MESSAGE_FRAMES, chunks);
+                wsSpan.setTag(WEBSOCKET_MESSAGE_LENGTH, handlerContext.getMsgSize());
+                wsSpan.setTag(WEBSOCKET_MESSAGE_TYPE, handlerContext.getMessageType());
+            }
+            beforeFinish(wsSpan);
+            wsSpan.finish();
+        } finally {
+            handlerContext.reset();
+        }
+    }
+
+    private AgentSpan onFrameStart(
+            final CharSequence operationName,
+            final CharSequence spanKind,
+            final HandlerContext handlerContext,
+            final SpanAttributes linkAttributes,
+            boolean traceStarter) {
+        AgentSpan wsSpan = handlerContext.getWebsocketSpan();
+        if (wsSpan == null) {
+            final Config config = Config.get();
+            final AgentSpan handshakeSpan = handlerContext.getHandshakeSpan();
+            boolean inheritSampling = config.isWebsocketMessagesInheritSampling();
+            boolean useDedicatedTraces = config.isWebsocketMessagesSeparateTraces();
+            if (traceStarter) {
+                if (useDedicatedTraces) {
+                    wsSpan = startSpan(WEBSOCKET.toString(), operationName, null);
+                    if (inheritSampling) {
+                        wsSpan.copyPropagationAndBaggage(handshakeSpan);
+                        wsSpan.setTag(DECISION_MAKER_INHERITED, 1);
+                        wsSpan.setTag(DECISION_MAKER_SERVICE, handshakeSpan.getServiceName());
+                        wsSpan.setTag(DECISION_MAKER_RESOURCE, handshakeSpan.getResourceName());
+                    }
+                } else {
+                    wsSpan = startSpan(WEBSOCKET.toString(), operationName, handshakeSpan.spanContext());
+                }
+            } else {
+                wsSpan = startSpan(WEBSOCKET.toString(), operationName);
+            }
+            handlerContext.setWebsocketSpan(wsSpan);
+            afterStart(wsSpan);
+            wsSpan.setTag(SPAN_KIND, spanKind);
+            wsSpan.setResourceName(handlerContext.getWsResourceName());
+            // carry over peer information for inferred services
+            final String handshakePeerAddress = (String) handshakeSpan.getTag(Tags.PEER_HOSTNAME);
+            if (handshakePeerAddress != null) {
+                wsSpan.setTag(Tags.PEER_HOSTNAME, handshakePeerAddress);
+            }
+            if (config.isWebsocketTagSessionId()) {
+                wsSpan.setTag(WEBSOCKET_SESSION_ID, handlerContext.getSessionId());
+            }
+            if (useDedicatedTraces || !traceStarter) {
+                // the link is not added if the user wants to have receive frames on the same trace as the
+                // handshake
+                wsSpan.addLink(SpanLink.from(
+                        inheritSampling
+                                ? handshakeSpan.spanContext()
+                                : new NotSampledSpanContext(handshakeSpan.spanContext()),
+                        SpanLink.DEFAULT_FLAGS,
+                        "",
+                        linkAttributes));
+            }
         }
-      } else {
-        wsSpan = startSpan(WEBSOCKET.toString(), operationName);
-      }
-      handlerContext.setWebsocketSpan(wsSpan);
-      afterStart(wsSpan);
-      wsSpan.setTag(SPAN_KIND, spanKind);
-      wsSpan.setResourceName(handlerContext.getWsResourceName());
-      // carry over peer information for inferred services
-      final String handshakePeerAddress = (String) handshakeSpan.getTag(Tags.PEER_HOSTNAME);
-      if (handshakePeerAddress != null) {
-        wsSpan.setTag(Tags.PEER_HOSTNAME, handshakePeerAddress);
-      }
-      if (config.isWebsocketTagSessionId()) {
-        wsSpan.setTag(WEBSOCKET_SESSION_ID, handlerContext.getSessionId());
-      }
-      if (useDedicatedTraces || !traceStarter) {
-        // the link is not added if the user wants to have receive frames on the same trace as the
-        // handshake
-        wsSpan.addLink(
-            SpanLink.from(
-                inheritSampling
-                    ? handshakeSpan.spanContext()
-                    : new NotSampledSpanContext(handshakeSpan.spanContext()),
-                SpanLink.DEFAULT_FLAGS,
-                "",
-                linkAttributes));
-      }
+        return wsSpan;
     }
-    return wsSpan;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/ClientIpAddressResolver.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/ClientIpAddressResolver.java
index 6a4535ba9ac..1f65d9de492 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/ClientIpAddressResolver.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/ClientIpAddressResolver.java
@@ -12,302 +12,299 @@
 import org.slf4j.LoggerFactory;
 
 public class ClientIpAddressResolver {
-  private static final Logger log = LoggerFactory.getLogger(ClientIpAddressResolver.class);
-
-  private static final Function<String, InetAddress> PLAIN_IP_ADDRESS_PARSER =
-      new ParsePlainIpAddress();
-  private static final Function<String, InetAddress> FORWARDED_PARSER = new ParseForwarded();
-
-  /**
-   * Infers the IP address of the client according to our specified procedure. This method doesn't
-   * throw exceptions.
-   *
-   * <p>In ideal circumstances, <code>ipAddrHeader</code> is specified so as to minimize the chances
-   * that the ip address be spoofed.
-   *
-   * @param context extracted context with http headers
-   * @return the inferred IP address, if any
-   */
-  public static InetAddress resolve(AgentSpanContext.Extracted context, MutableSpan span) {
-    try {
-      return doResolve(context, span);
-    } catch (RuntimeException rte) {
-      log.warn("Unexpected exception (bug) inferring client IP address", rte);
-      return null;
-    }
-  }
-
-  private static InetAddress doResolve(AgentSpanContext.Extracted context, MutableSpan span) {
-    if (context == null) {
-      return null;
+    private static final Logger log = LoggerFactory.getLogger(ClientIpAddressResolver.class);
+
+    private static final Function<String, InetAddress> PLAIN_IP_ADDRESS_PARSER = new ParsePlainIpAddress();
+    private static final Function<String, InetAddress> FORWARDED_PARSER = new ParseForwarded();
+
+    /**
+     * Infers the IP address of the client according to our specified procedure. This method doesn't
+     * throw exceptions.
+     *
+     * <p>In ideal circumstances, <code>ipAddrHeader</code> is specified so as to minimize the chances
+     * that the ip address be spoofed.
+     *
+     * @param context extracted context with http headers
+     * @return the inferred IP address, if any
+     */
+    public static InetAddress resolve(AgentSpanContext.Extracted context, MutableSpan span) {
+        try {
+            return doResolve(context, span);
+        } catch (RuntimeException rte) {
+            log.warn("Unexpected exception (bug) inferring client IP address", rte);
+            return null;
+        }
     }
 
-    String customIpHeader = context.getCustomIpHeader();
-    if (customIpHeader != null) {
-      InetAddress result = tryHeader(customIpHeader, FORWARDED_PARSER);
-      if (result != null) {
-        return result;
-      }
-      result = tryHeader(customIpHeader, PLAIN_IP_ADDRESS_PARSER);
-      if (result != null) {
-        return result;
-      }
-      // If custom header is defined but not resolved - return null
-      return null;
-    }
+    private static InetAddress doResolve(AgentSpanContext.Extracted context, MutableSpan span) {
+        if (context == null) {
+            return null;
+        }
 
-    // we don't have a set ip header to look exclusively at
-    // the order of the headers is the order in the RFC
+        String customIpHeader = context.getCustomIpHeader();
+        if (customIpHeader != null) {
+            InetAddress result = tryHeader(customIpHeader, FORWARDED_PARSER);
+            if (result != null) {
+                return result;
+            }
+            result = tryHeader(customIpHeader, PLAIN_IP_ADDRESS_PARSER);
+            if (result != null) {
+                return result;
+            }
+            // If custom header is defined but not resolved - return null
+            return null;
+        }
 
-    InetAddress result = null;
-    InetAddress addr = tryHeader(context.getXForwardedFor(), PLAIN_IP_ADDRESS_PARSER);
-    if (addr != null) {
-      if (!isIpAddrPrivate(addr)) {
-        return addr;
-      }
-      result = addr;
-    }
+        // we don't have a set ip header to look exclusively at
+        // the order of the headers is the order in the RFC
 
-    addr = tryHeader(context.getXRealIp(), PLAIN_IP_ADDRESS_PARSER);
-    if (addr != null) {
-      if (!isIpAddrPrivate(addr)) {
-        return addr;
-      }
-      result = coalesce(result, addr);
-    }
+        InetAddress result = null;
+        InetAddress addr = tryHeader(context.getXForwardedFor(), PLAIN_IP_ADDRESS_PARSER);
+        if (addr != null) {
+            if (!isIpAddrPrivate(addr)) {
+                return addr;
+            }
+            result = addr;
+        }
 
-    addr = tryHeader(context.getTrueClientIp(), PLAIN_IP_ADDRESS_PARSER);
-    if (addr != null) {
-      if (!isIpAddrPrivate(addr)) {
-        return addr;
-      }
-      result = coalesce(result, addr);
-    }
+        addr = tryHeader(context.getXRealIp(), PLAIN_IP_ADDRESS_PARSER);
+        if (addr != null) {
+            if (!isIpAddrPrivate(addr)) {
+                return addr;
+            }
+            result = coalesce(result, addr);
+        }
 
-    addr = tryHeader(context.getXClientIp(), PLAIN_IP_ADDRESS_PARSER);
-    if (addr != null) {
-      if (!isIpAddrPrivate(addr)) {
-        return addr;
-      }
-      result = coalesce(result, addr);
-    }
+        addr = tryHeader(context.getTrueClientIp(), PLAIN_IP_ADDRESS_PARSER);
+        if (addr != null) {
+            if (!isIpAddrPrivate(addr)) {
+                return addr;
+            }
+            result = coalesce(result, addr);
+        }
 
-    addr = tryHeader(context.getForwarded(), FORWARDED_PARSER);
-    if (addr != null) {
-      if (!isIpAddrPrivate(addr)) {
-        return addr;
-      }
-      result = coalesce(result, addr);
-    }
+        addr = tryHeader(context.getXClientIp(), PLAIN_IP_ADDRESS_PARSER);
+        if (addr != null) {
+            if (!isIpAddrPrivate(addr)) {
+                return addr;
+            }
+            result = coalesce(result, addr);
+        }
 
-    addr = tryHeader(context.getForwardedFor(), PLAIN_IP_ADDRESS_PARSER);
-    if (addr != null) {
-      if (!isIpAddrPrivate(addr)) {
-        return addr;
-      }
-      result = coalesce(result, addr);
-    }
+        addr = tryHeader(context.getForwarded(), FORWARDED_PARSER);
+        if (addr != null) {
+            if (!isIpAddrPrivate(addr)) {
+                return addr;
+            }
+            result = coalesce(result, addr);
+        }
 
-    addr = tryHeader(context.getXClusterClientIp(), PLAIN_IP_ADDRESS_PARSER);
-    if (addr != null) {
-      if (!isIpAddrPrivate(addr)) {
-        return addr;
-      }
-      result = coalesce(result, addr);
-    }
+        addr = tryHeader(context.getForwardedFor(), PLAIN_IP_ADDRESS_PARSER);
+        if (addr != null) {
+            if (!isIpAddrPrivate(addr)) {
+                return addr;
+            }
+            result = coalesce(result, addr);
+        }
 
-    addr = tryHeader(context.getFastlyClientIp(), PLAIN_IP_ADDRESS_PARSER);
-    if (addr != null) {
-      if (!isIpAddrPrivate(addr)) {
-        return addr;
-      }
-      result = coalesce(result, addr);
-    }
+        addr = tryHeader(context.getXClusterClientIp(), PLAIN_IP_ADDRESS_PARSER);
+        if (addr != null) {
+            if (!isIpAddrPrivate(addr)) {
+                return addr;
+            }
+            result = coalesce(result, addr);
+        }
 
-    addr = tryHeader(context.getCfConnectingIp(), PLAIN_IP_ADDRESS_PARSER);
-    if (addr != null) {
-      if (!isIpAddrPrivate(addr)) {
-        return addr;
-      }
-      result = coalesce(result, addr);
-    }
+        addr = tryHeader(context.getFastlyClientIp(), PLAIN_IP_ADDRESS_PARSER);
+        if (addr != null) {
+            if (!isIpAddrPrivate(addr)) {
+                return addr;
+            }
+            result = coalesce(result, addr);
+        }
 
-    addr = tryHeader(context.getCfConnectingIpv6(), PLAIN_IP_ADDRESS_PARSER);
-    if (addr != null) {
-      if (!isIpAddrPrivate(addr)) {
-        return addr;
-      }
-      result = coalesce(result, addr);
-    }
+        addr = tryHeader(context.getCfConnectingIp(), PLAIN_IP_ADDRESS_PARSER);
+        if (addr != null) {
+            if (!isIpAddrPrivate(addr)) {
+                return addr;
+            }
+            result = coalesce(result, addr);
+        }
 
-    return result;
-  }
+        addr = tryHeader(context.getCfConnectingIpv6(), PLAIN_IP_ADDRESS_PARSER);
+        if (addr != null) {
+            if (!isIpAddrPrivate(addr)) {
+                return addr;
+            }
+            result = coalesce(result, addr);
+        }
 
-  private static InetAddress preferPublic(InetAddress prevAddr, InetAddress newAddr) {
-    if (prevAddr == null || isIpAddrPrivate(prevAddr)) {
-      return newAddr;
+        return result;
     }
-    return prevAddr;
-  }
 
-  private static <T> T coalesce(T one, T two) {
-    if (one != null) {
-      return one;
+    private static InetAddress preferPublic(InetAddress prevAddr, InetAddress newAddr) {
+        if (prevAddr == null || isIpAddrPrivate(prevAddr)) {
+            return newAddr;
+        }
+        return prevAddr;
     }
-    return two;
-  }
 
-  private static InetAddress tryHeader(String headerValue, Function<String, InetAddress> parseFun) {
-    if (headerValue == null || headerValue.isEmpty()) {
-      return null;
+    private static <T> T coalesce(T one, T two) {
+        if (one != null) {
+            return one;
+        }
+        return two;
     }
 
-    return parseFun.apply(headerValue);
-  }
-
-  private static class ParsePlainIpAddress implements Function<String, InetAddress> {
-    @Override
-    public InetAddress apply(String str) {
-      InetAddress result = null;
-      InetAddress resultPrivate = null;
-      int pos = 0;
-      int end = str.length();
-      do {
-        for (; pos < end && str.charAt(pos) == ' '; pos++) {}
-        int posComma = str.indexOf(',', pos);
-        int endCur = posComma != -1 ? posComma : end;
-        InetAddress addr = parseIpAddress(str.substring(pos, endCur));
-        if (addr != null) {
-          if (isIpAddrPrivate(addr)) {
-            if (resultPrivate == null) {
-              resultPrivate = addr;
-            }
-          } else {
-            result = addr;
-          }
+    private static InetAddress tryHeader(String headerValue, Function<String, InetAddress> parseFun) {
+        if (headerValue == null || headerValue.isEmpty()) {
+            return null;
         }
-        pos = (posComma != -1 && posComma + 1 < end) ? (posComma + 1) : -1;
-      } while (result == null && pos != -1);
-      return result != null ? result : resultPrivate;
-    }
-  }
 
-  private static class ParseForwarded implements Function<String, InetAddress> {
+        return parseFun.apply(headerValue);
+    }
 
-    enum ForwardedParseState {
-      KEY,
-      BEFORE_VALUE,
-      VALUE_TOKEN,
-      VALUE_QUOTED,
-      BETWEEN,
+    private static class ParsePlainIpAddress implements Function<String, InetAddress> {
+        @Override
+        public InetAddress apply(String str) {
+            InetAddress result = null;
+            InetAddress resultPrivate = null;
+            int pos = 0;
+            int end = str.length();
+            do {
+                for (; pos < end && str.charAt(pos) == ' '; pos++) {}
+                int posComma = str.indexOf(',', pos);
+                int endCur = posComma != -1 ? posComma : end;
+                InetAddress addr = parseIpAddress(str.substring(pos, endCur));
+                if (addr != null) {
+                    if (isIpAddrPrivate(addr)) {
+                        if (resultPrivate == null) {
+                            resultPrivate = addr;
+                        }
+                    } else {
+                        result = addr;
+                    }
+                }
+                pos = (posComma != -1 && posComma + 1 < end) ? (posComma + 1) : -1;
+            } while (result == null && pos != -1);
+            return result != null ? result : resultPrivate;
+        }
     }
 
-    @Override
-    public InetAddress apply(String headerValue) {
-      InetAddress resultPrivate = null;
-      ForwardedParseState state = ForwardedParseState.BETWEEN;
-
-      // https://datatracker.ietf.org/doc/html/rfc7239#section-4
-      int pos = 0;
-      int end = headerValue.length();
-      // compiler requires that these two be initialized:
-      int start = 0;
-      boolean considerValue = false;
-      while (pos < end) {
-        char c = headerValue.charAt(pos);
-        switch (state) {
-          case BETWEEN:
-            if (c == ' ' || c == ';' || c == ',') {
-              break;
-            }
-            start = pos;
-            state = ForwardedParseState.KEY;
-            break;
-          case KEY:
-            if (c != '=') {
-              break;
-            }
+    private static class ParseForwarded implements Function<String, InetAddress> {
 
-            state = ForwardedParseState.BEFORE_VALUE;
-            if (pos - start == 3) {
-              String key = headerValue.substring(start, pos);
-              considerValue = key.equalsIgnoreCase("for");
-            } else {
-              considerValue = false;
-            }
-            break;
-          case BEFORE_VALUE:
-            if (c == '"') {
-              start = pos + 1;
-              state = ForwardedParseState.VALUE_QUOTED;
-            } else if (c == ' ' || c == ';' || c == ',') {
-              // empty value
-              state = ForwardedParseState.BETWEEN;
-            } else {
-              start = pos;
-              state = ForwardedParseState.VALUE_TOKEN;
-            }
-            break;
-          case VALUE_TOKEN:
-            {
-              int tokenEnd;
-              if (c == ' ' || c == ';' || c == ',') {
-                tokenEnd = pos;
-              } else if (pos + 1 == end) {
-                tokenEnd = end;
-              } else {
-                break;
-              }
-
-              if (considerValue) {
-                InetAddress ipAddr =
-                    parseIpAddressAndMaybePort(headerValue.substring(start, tokenEnd));
-                if (ipAddr != null) {
-                  if (isIpAddrPrivate(ipAddr)) {
-                    if (resultPrivate == null) {
-                      resultPrivate = ipAddr;
+        enum ForwardedParseState {
+            KEY,
+            BEFORE_VALUE,
+            VALUE_TOKEN,
+            VALUE_QUOTED,
+            BETWEEN,
+        }
+
+        @Override
+        public InetAddress apply(String headerValue) {
+            InetAddress resultPrivate = null;
+            ForwardedParseState state = ForwardedParseState.BETWEEN;
+
+            // https://datatracker.ietf.org/doc/html/rfc7239#section-4
+            int pos = 0;
+            int end = headerValue.length();
+            // compiler requires that these two be initialized:
+            int start = 0;
+            boolean considerValue = false;
+            while (pos < end) {
+                char c = headerValue.charAt(pos);
+                switch (state) {
+                    case BETWEEN:
+                        if (c == ' ' || c == ';' || c == ',') {
+                            break;
+                        }
+                        start = pos;
+                        state = ForwardedParseState.KEY;
+                        break;
+                    case KEY:
+                        if (c != '=') {
+                            break;
+                        }
+
+                        state = ForwardedParseState.BEFORE_VALUE;
+                        if (pos - start == 3) {
+                            String key = headerValue.substring(start, pos);
+                            considerValue = key.equalsIgnoreCase("for");
+                        } else {
+                            considerValue = false;
+                        }
+                        break;
+                    case BEFORE_VALUE:
+                        if (c == '"') {
+                            start = pos + 1;
+                            state = ForwardedParseState.VALUE_QUOTED;
+                        } else if (c == ' ' || c == ';' || c == ',') {
+                            // empty value
+                            state = ForwardedParseState.BETWEEN;
+                        } else {
+                            start = pos;
+                            state = ForwardedParseState.VALUE_TOKEN;
+                        }
+                        break;
+                    case VALUE_TOKEN: {
+                        int tokenEnd;
+                        if (c == ' ' || c == ';' || c == ',') {
+                            tokenEnd = pos;
+                        } else if (pos + 1 == end) {
+                            tokenEnd = end;
+                        } else {
+                            break;
+                        }
+
+                        if (considerValue) {
+                            InetAddress ipAddr = parseIpAddressAndMaybePort(headerValue.substring(start, tokenEnd));
+                            if (ipAddr != null) {
+                                if (isIpAddrPrivate(ipAddr)) {
+                                    if (resultPrivate == null) {
+                                        resultPrivate = ipAddr;
+                                    }
+                                } else {
+                                    return ipAddr;
+                                }
+                            }
+                        }
+                        state = ForwardedParseState.BETWEEN;
+                        break;
                     }
-                  } else {
-                    return ipAddr;
-                  }
-                }
-              }
-              state = ForwardedParseState.BETWEEN;
-              break;
-            }
-          case VALUE_QUOTED:
-            if (c == '"') {
-              if (considerValue) {
-                InetAddress ipAddr = parseIpAddressAndMaybePort(headerValue.substring(start, pos));
-                if (ipAddr != null && !isIpAddrPrivate(ipAddr)) {
-                  return ipAddr;
+                    case VALUE_QUOTED:
+                        if (c == '"') {
+                            if (considerValue) {
+                                InetAddress ipAddr = parseIpAddressAndMaybePort(headerValue.substring(start, pos));
+                                if (ipAddr != null && !isIpAddrPrivate(ipAddr)) {
+                                    return ipAddr;
+                                }
+                            }
+                            state = ForwardedParseState.BETWEEN;
+                        } else if (c == '\\') {
+                            pos++;
+                        }
+                        break;
                 }
-              }
-              state = ForwardedParseState.BETWEEN;
-            } else if (c == '\\') {
-              pos++;
+                pos++;
             }
-            break;
-        }
-        pos++;
-      }
 
-      return resultPrivate;
+            return resultPrivate;
+        }
     }
-  }
-
-  // flat array in groups of 4 + 4 bytes (base address of the range and mask)
-  private static final byte[] PRIVATE_IPV4_RANGES = {
-    (byte) 0x0A, 0, 0, 0, /**/ (byte) 0xFF, 0, 0, 0, // 10.0.0.0/8
-    (byte) 0xAC, (byte) 0x10, 0, 0, /**/ (byte) 0xFF, (byte) 0xF0, 0, 0, // 172.16.0.0/12
-    (byte) 0xC0, (byte) 0xA8, 0, 0, /**/ (byte) 0xFF, (byte) 0xFF, 0, 0, // 192.168.0.0/16
-    (byte) 0x7F, 0, 0, 0, /**/ (byte) 0xFF, 0, 0, 0, // 127.0.0.0/8
-    (byte) 0xA9, (byte) 0xFE, 0, 0, /**/ (byte) 0xFF, (byte) 0xFF, 0, 0, // 169.254.0.0/16
-  };
-  private static final int PRIVATE_IPV4_RANGES_SIZE = PRIVATE_IPV4_RANGES.length / (4 + 4);
-
-  private static final byte[] PRIVATE_IPV6_RANGES = {
-    // spotless:off
+
+    // flat array in groups of 4 + 4 bytes (base address of the range and mask)
+    private static final byte[] PRIVATE_IPV4_RANGES = {
+        (byte) 0x0A, 0, 0, 0, /**/ (byte) 0xFF, 0, 0, 0, // 10.0.0.0/8
+        (byte) 0xAC, (byte) 0x10, 0, 0, /**/ (byte) 0xFF, (byte) 0xF0, 0, 0, // 172.16.0.0/12
+        (byte) 0xC0, (byte) 0xA8, 0, 0, /**/ (byte) 0xFF, (byte) 0xFF, 0, 0, // 192.168.0.0/16
+        (byte) 0x7F, 0, 0, 0, /**/ (byte) 0xFF, 0, 0, 0, // 127.0.0.0/8
+        (byte) 0xA9, (byte) 0xFE, 0, 0, /**/ (byte) 0xFF, (byte) 0xFF, 0, 0, // 169.254.0.0/16
+    };
+    private static final int PRIVATE_IPV4_RANGES_SIZE = PRIVATE_IPV4_RANGES.length / (4 + 4);
+
+    private static final byte[] PRIVATE_IPV6_RANGES = {
+        // spotless:off
       // ::1/128
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
       (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF,
@@ -324,120 +321,120 @@ public InetAddress apply(String headerValue) {
       (byte)0xFC, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
       (byte)0xFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
       //spotless:on
-  };
-  private static final int PRIVATE_IPV6_RANGES_SIZE = PRIVATE_IPV4_RANGES.length / (16 + 16);
-
-  public static boolean isIpAddrPrivate(InetAddress ipAddr) {
-    if (ipAddr instanceof Inet4Address) {
-      byte[] addr = ipAddr.getAddress();
-      for (int i = 0; i < PRIVATE_IPV4_RANGES_SIZE; i++) {
-        if (matchesPrivateRange4(addr, i)) {
-          return true;
-        }
-      }
-    } else if (ipAddr instanceof Inet6Address) {
-      byte[] addr = ipAddr.getAddress();
-      for (int i = 0; i < PRIVATE_IPV6_RANGES_SIZE; i++) {
-        if (matchesPrivateRange6(addr, i)) {
-          return true;
+    };
+    private static final int PRIVATE_IPV6_RANGES_SIZE = PRIVATE_IPV4_RANGES.length / (16 + 16);
+
+    public static boolean isIpAddrPrivate(InetAddress ipAddr) {
+        if (ipAddr instanceof Inet4Address) {
+            byte[] addr = ipAddr.getAddress();
+            for (int i = 0; i < PRIVATE_IPV4_RANGES_SIZE; i++) {
+                if (matchesPrivateRange4(addr, i)) {
+                    return true;
+                }
+            }
+        } else if (ipAddr instanceof Inet6Address) {
+            byte[] addr = ipAddr.getAddress();
+            for (int i = 0; i < PRIVATE_IPV6_RANGES_SIZE; i++) {
+                if (matchesPrivateRange6(addr, i)) {
+                    return true;
+                }
+            }
         }
-      }
+        return false;
     }
-    return false;
-  }
-
-  private static boolean matchesPrivateRange4(byte[] addr, int n) {
-    byte[] maskedAddr = {
-      (byte) (addr[0] & PRIVATE_IPV4_RANGES[n * 8 + 4]),
-      (byte) (addr[1] & PRIVATE_IPV4_RANGES[n * 8 + 5]),
-      (byte) (addr[2] & PRIVATE_IPV4_RANGES[n * 8 + 6]),
-      (byte) (addr[3] & PRIVATE_IPV4_RANGES[n * 8 + 7]),
-    };
-
-    return maskedAddr[0] == PRIVATE_IPV4_RANGES[n * 8]
-        && maskedAddr[1] == PRIVATE_IPV4_RANGES[n * 8 + 1]
-        && maskedAddr[2] == PRIVATE_IPV4_RANGES[n * 8 + 2]
-        && maskedAddr[3] == PRIVATE_IPV4_RANGES[n * 8 + 3];
-  }
-
-  private static boolean matchesPrivateRange6(byte[] addr, int n) {
-    int base = n * 32;
-    byte[] maskedAddr = {
-      (byte) (addr[0] & PRIVATE_IPV6_RANGES[base + 16]),
-      (byte) (addr[1] & PRIVATE_IPV6_RANGES[base + 17]),
-      (byte) (addr[2] & PRIVATE_IPV6_RANGES[base + 18]),
-      (byte) (addr[3] & PRIVATE_IPV6_RANGES[base + 19]),
-      (byte) (addr[4] & PRIVATE_IPV6_RANGES[base + 20]),
-      (byte) (addr[5] & PRIVATE_IPV6_RANGES[base + 21]),
-      (byte) (addr[6] & PRIVATE_IPV6_RANGES[base + 22]),
-      (byte) (addr[7] & PRIVATE_IPV6_RANGES[base + 23]),
-      (byte) (addr[8] & PRIVATE_IPV6_RANGES[base + 24]),
-      (byte) (addr[9] & PRIVATE_IPV6_RANGES[base + 25]),
-      (byte) (addr[10] & PRIVATE_IPV6_RANGES[base + 26]),
-      (byte) (addr[11] & PRIVATE_IPV6_RANGES[base + 27]),
-      (byte) (addr[12] & PRIVATE_IPV6_RANGES[base + 28]),
-      (byte) (addr[13] & PRIVATE_IPV6_RANGES[base + 29]),
-      (byte) (addr[14] & PRIVATE_IPV6_RANGES[base + 30]),
-      (byte) (addr[15] & PRIVATE_IPV6_RANGES[base + 31]),
-    };
 
-    // Benchmarking indicates that this is better than
-    //  return ByteBuffer.wrap(maskedAddr).equals(
-    //      ByteBuffer.wrap(PRIVATE_IPV6_RANGES, base, 16));
-    // (after optimization)
-    return maskedAddr[0] == PRIVATE_IPV6_RANGES[base]
-        && maskedAddr[1] == PRIVATE_IPV6_RANGES[base + 1]
-        && maskedAddr[2] == PRIVATE_IPV6_RANGES[base + 2]
-        && maskedAddr[3] == PRIVATE_IPV6_RANGES[base + 3]
-        && maskedAddr[4] == PRIVATE_IPV6_RANGES[base + 4]
-        && maskedAddr[5] == PRIVATE_IPV6_RANGES[base + 5]
-        && maskedAddr[6] == PRIVATE_IPV6_RANGES[base + 6]
-        && maskedAddr[7] == PRIVATE_IPV6_RANGES[base + 7]
-        && maskedAddr[8] == PRIVATE_IPV6_RANGES[base + 8]
-        && maskedAddr[9] == PRIVATE_IPV6_RANGES[base + 9]
-        && maskedAddr[10] == PRIVATE_IPV6_RANGES[base + 10]
-        && maskedAddr[11] == PRIVATE_IPV6_RANGES[base + 11]
-        && maskedAddr[12] == PRIVATE_IPV6_RANGES[base + 12]
-        && maskedAddr[13] == PRIVATE_IPV6_RANGES[base + 13]
-        && maskedAddr[14] == PRIVATE_IPV6_RANGES[base + 14]
-        && maskedAddr[15] == PRIVATE_IPV6_RANGES[base + 15];
-  }
-
-  private static InetAddress parseIpAddressAndMaybePort(String str) {
-    if (str == null || str.length() == 0) {
-      return null;
+    private static boolean matchesPrivateRange4(byte[] addr, int n) {
+        byte[] maskedAddr = {
+            (byte) (addr[0] & PRIVATE_IPV4_RANGES[n * 8 + 4]),
+            (byte) (addr[1] & PRIVATE_IPV4_RANGES[n * 8 + 5]),
+            (byte) (addr[2] & PRIVATE_IPV4_RANGES[n * 8 + 6]),
+            (byte) (addr[3] & PRIVATE_IPV4_RANGES[n * 8 + 7]),
+        };
+
+        return maskedAddr[0] == PRIVATE_IPV4_RANGES[n * 8]
+                && maskedAddr[1] == PRIVATE_IPV4_RANGES[n * 8 + 1]
+                && maskedAddr[2] == PRIVATE_IPV4_RANGES[n * 8 + 2]
+                && maskedAddr[3] == PRIVATE_IPV4_RANGES[n * 8 + 3];
     }
-    if (str.charAt(0) == '[') {
-      int posClose = str.indexOf(']', 1);
-      if (posClose == -1) {
-        return null;
-      }
-      return parseIpAddress(str.substring(1, posClose));
-    }
-    int posColon = str.indexOf(':');
-    if (posColon == -1) {
-      return parseIpAddress(str);
-    } else {
-      return parseIpAddress(str.substring(0, posColon));
-    }
-  }
 
-  public static InetAddress parseIpAddress(String str) {
-    if (str.length() == 0) {
-      return null;
+    private static boolean matchesPrivateRange6(byte[] addr, int n) {
+        int base = n * 32;
+        byte[] maskedAddr = {
+            (byte) (addr[0] & PRIVATE_IPV6_RANGES[base + 16]),
+            (byte) (addr[1] & PRIVATE_IPV6_RANGES[base + 17]),
+            (byte) (addr[2] & PRIVATE_IPV6_RANGES[base + 18]),
+            (byte) (addr[3] & PRIVATE_IPV6_RANGES[base + 19]),
+            (byte) (addr[4] & PRIVATE_IPV6_RANGES[base + 20]),
+            (byte) (addr[5] & PRIVATE_IPV6_RANGES[base + 21]),
+            (byte) (addr[6] & PRIVATE_IPV6_RANGES[base + 22]),
+            (byte) (addr[7] & PRIVATE_IPV6_RANGES[base + 23]),
+            (byte) (addr[8] & PRIVATE_IPV6_RANGES[base + 24]),
+            (byte) (addr[9] & PRIVATE_IPV6_RANGES[base + 25]),
+            (byte) (addr[10] & PRIVATE_IPV6_RANGES[base + 26]),
+            (byte) (addr[11] & PRIVATE_IPV6_RANGES[base + 27]),
+            (byte) (addr[12] & PRIVATE_IPV6_RANGES[base + 28]),
+            (byte) (addr[13] & PRIVATE_IPV6_RANGES[base + 29]),
+            (byte) (addr[14] & PRIVATE_IPV6_RANGES[base + 30]),
+            (byte) (addr[15] & PRIVATE_IPV6_RANGES[base + 31]),
+        };
+
+        // Benchmarking indicates that this is better than
+        //  return ByteBuffer.wrap(maskedAddr).equals(
+        //      ByteBuffer.wrap(PRIVATE_IPV6_RANGES, base, 16));
+        // (after optimization)
+        return maskedAddr[0] == PRIVATE_IPV6_RANGES[base]
+                && maskedAddr[1] == PRIVATE_IPV6_RANGES[base + 1]
+                && maskedAddr[2] == PRIVATE_IPV6_RANGES[base + 2]
+                && maskedAddr[3] == PRIVATE_IPV6_RANGES[base + 3]
+                && maskedAddr[4] == PRIVATE_IPV6_RANGES[base + 4]
+                && maskedAddr[5] == PRIVATE_IPV6_RANGES[base + 5]
+                && maskedAddr[6] == PRIVATE_IPV6_RANGES[base + 6]
+                && maskedAddr[7] == PRIVATE_IPV6_RANGES[base + 7]
+                && maskedAddr[8] == PRIVATE_IPV6_RANGES[base + 8]
+                && maskedAddr[9] == PRIVATE_IPV6_RANGES[base + 9]
+                && maskedAddr[10] == PRIVATE_IPV6_RANGES[base + 10]
+                && maskedAddr[11] == PRIVATE_IPV6_RANGES[base + 11]
+                && maskedAddr[12] == PRIVATE_IPV6_RANGES[base + 12]
+                && maskedAddr[13] == PRIVATE_IPV6_RANGES[base + 13]
+                && maskedAddr[14] == PRIVATE_IPV6_RANGES[base + 14]
+                && maskedAddr[15] == PRIVATE_IPV6_RANGES[base + 15];
     }
-    char firstChar = str.charAt(0);
-    if (!(firstChar >= '0' && firstChar <= '9' || firstChar == ':')) {
-      return null; // probably a name instead
+
+    private static InetAddress parseIpAddressAndMaybePort(String str) {
+        if (str == null || str.length() == 0) {
+            return null;
+        }
+        if (str.charAt(0) == '[') {
+            int posClose = str.indexOf(']', 1);
+            if (posClose == -1) {
+                return null;
+            }
+            return parseIpAddress(str.substring(1, posClose));
+        }
+        int posColon = str.indexOf(':');
+        if (posColon == -1) {
+            return parseIpAddress(str);
+        } else {
+            return parseIpAddress(str.substring(0, posColon));
+        }
     }
-    try {
-      byte[] addr = IPAddressUtil.textToNumericFormatV4(str);
-      if (addr == null) {
-        addr = IPAddressUtil.textToNumericFormatV6(str);
-      }
-      return InetAddress.getByAddress(str, addr);
-    } catch (UnknownHostException e) {
-      return null; // should not happen
+
+    public static InetAddress parseIpAddress(String str) {
+        if (str.length() == 0) {
+            return null;
+        }
+        char firstChar = str.charAt(0);
+        if (!(firstChar >= '0' && firstChar <= '9' || firstChar == ':')) {
+            return null; // probably a name instead
+        }
+        try {
+            byte[] addr = IPAddressUtil.textToNumericFormatV4(str);
+            if (addr == null) {
+                addr = IPAddressUtil.textToNumericFormatV6(str);
+            }
+            return InetAddress.getByAddress(str, addr);
+        } catch (UnknownHostException e) {
+            return null; // should not happen
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/HttpResourceDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/HttpResourceDecorator.java
index 72ca66a520f..30205b96353 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/HttpResourceDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/HttpResourceDecorator.java
@@ -9,44 +9,41 @@
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 
 public class HttpResourceDecorator {
-  public static final HttpResourceDecorator HTTP_RESOURCE_DECORATOR = new HttpResourceDecorator();
+    public static final HttpResourceDecorator HTTP_RESOURCE_DECORATOR = new HttpResourceDecorator();
 
-  private static final UTF8BytesString DEFAULT_RESOURCE_NAME = UTF8BytesString.create("/");
+    private static final UTF8BytesString DEFAULT_RESOURCE_NAME = UTF8BytesString.create("/");
 
-  private final boolean shouldSetUrlResourceName =
-      Config.get().isRuleEnabled("URLAsResourceNameRule");
+    private final boolean shouldSetUrlResourceName = Config.get().isRuleEnabled("URLAsResourceNameRule");
 
-  private HttpResourceDecorator() {}
+    private HttpResourceDecorator() {}
 
-  public final void withClientPath(AgentSpan span, CharSequence method, CharSequence path) {
-    HttpResourceNames.setForClient(span, method, path, false);
-  }
-
-  public final void withServerPath(
-      AgentSpan span, CharSequence method, CharSequence path, boolean encoded) {
-    if (!shouldSetUrlResourceName) {
-      span.setResourceName(DEFAULT_RESOURCE_NAME);
-      return;
+    public final void withClientPath(AgentSpan span, CharSequence method, CharSequence path) {
+        HttpResourceNames.setForClient(span, method, path, false);
     }
 
-    HttpResourceNames.setForServer(span, method, path, encoded);
-  }
+    public final void withServerPath(AgentSpan span, CharSequence method, CharSequence path, boolean encoded) {
+        if (!shouldSetUrlResourceName) {
+            span.setResourceName(DEFAULT_RESOURCE_NAME);
+            return;
+        }
 
-  public final void withRoute(
-      final AgentSpan span, final CharSequence method, final CharSequence route) {
-    withRoute(span, method, route, false);
-  }
+        HttpResourceNames.setForServer(span, method, path, encoded);
+    }
 
-  public final void withRoute(
-      final AgentSpan span, final CharSequence method, final CharSequence route, boolean encoded) {
-    CharSequence routeTag = route;
-    if (encoded) {
-      routeTag = URIUtils.decode(route.toString());
+    public final void withRoute(final AgentSpan span, final CharSequence method, final CharSequence route) {
+        withRoute(span, method, route, false);
     }
-    span.setTag(Tags.HTTP_ROUTE, routeTag);
-    if (Config.get().isHttpServerRouteBasedNaming()) {
-      final CharSequence resourceName = HttpResourceNames.join(method, route);
-      span.setResourceName(resourceName, ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE);
+
+    public final void withRoute(
+            final AgentSpan span, final CharSequence method, final CharSequence route, boolean encoded) {
+        CharSequence routeTag = route;
+        if (encoded) {
+            routeTag = URIUtils.decode(route.toString());
+        }
+        span.setTag(Tags.HTTP_ROUTE, routeTag);
+        if (Config.get().isHttpServerRouteBasedNaming()) {
+            final CharSequence resourceName = HttpResourceNames.join(method, route);
+            span.setResourceName(resourceName, ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/utils/IPAddressUtil.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/utils/IPAddressUtil.java
index 6db6182acdf..e4429f5f1d3 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/utils/IPAddressUtil.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/utils/IPAddressUtil.java
@@ -5,259 +5,259 @@
  * sun.net.util.IPAddressUtil (in module java.base) does not export sun.net.util to unnamed module
  */
 public class IPAddressUtil {
-  private static final int INADDR4SZ = 4;
-  private static final int INADDR16SZ = 16;
-  private static final int INT16SZ = 2;
+    private static final int INADDR4SZ = 4;
+    private static final int INADDR16SZ = 16;
+    private static final int INT16SZ = 2;
 
-  /*
-   * Converts IPv4 address in its textual presentation form
-   * into its numeric binary form.
-   *
-   * @param src a String representing an IPv4 address in standard format
-   * @return a byte array representing the IPv4 numeric address
-   */
-  @SuppressWarnings("fallthrough")
-  public static byte[] textToNumericFormatV4(String src) {
-    byte[] res = new byte[INADDR4SZ];
+    /*
+     * Converts IPv4 address in its textual presentation form
+     * into its numeric binary form.
+     *
+     * @param src a String representing an IPv4 address in standard format
+     * @return a byte array representing the IPv4 numeric address
+     */
+    @SuppressWarnings("fallthrough")
+    public static byte[] textToNumericFormatV4(String src) {
+        byte[] res = new byte[INADDR4SZ];
 
-    long tmpValue = 0;
-    int currByte = 0;
-    boolean newOctet = true;
+        long tmpValue = 0;
+        int currByte = 0;
+        boolean newOctet = true;
 
-    int len = src.length();
-    if (len == 0 || len > 15) {
-      return null;
+        int len = src.length();
+        if (len == 0 || len > 15) {
+            return null;
+        }
+        /*
+         * When only one part is given, the value is stored directly in
+         * the network address without any byte rearrangement.
+         *
+         * When a two part address is supplied, the last part is
+         * interpreted as a 24-bit quantity and placed in the right
+         * most three bytes of the network address. This makes the
+         * two part address format convenient for specifying Class A
+         * network addresses as net.host.
+         *
+         * When a three part address is specified, the last part is
+         * interpreted as a 16-bit quantity and placed in the right
+         * most two bytes of the network address. This makes the
+         * three part address format convenient for specifying
+         * Class B net- work addresses as 128.net.host.
+         *
+         * When four parts are specified, each is interpreted as a
+         * byte of data and assigned, from left to right, to the
+         * four bytes of an IPv4 address.
+         *
+         * We determine and parse the leading parts, if any, as single
+         * byte values in one pass directly into the resulting byte[],
+         * then the remainder is treated as a 8-to-32-bit entity and
+         * translated into the remaining bytes in the array.
+         */
+        for (int i = 0; i < len; i++) {
+            char c = src.charAt(i);
+            if (c == '.') {
+                if (newOctet || tmpValue < 0 || tmpValue > 0xff || currByte == 3) {
+                    return null;
+                }
+                res[currByte++] = (byte) (tmpValue & 0xff);
+                tmpValue = 0;
+                newOctet = true;
+            } else {
+                int digit = Character.digit(c, 10);
+                if (digit < 0) {
+                    return null;
+                }
+                tmpValue *= 10;
+                tmpValue += digit;
+                newOctet = false;
+            }
+        }
+        if (newOctet || tmpValue < 0 || tmpValue >= (1L << ((4 - currByte) * 8))) {
+            return null;
+        }
+        switch (currByte) {
+            case 0:
+                res[0] = (byte) ((tmpValue >> 24) & 0xff);
+            case 1:
+                res[1] = (byte) ((tmpValue >> 16) & 0xff);
+            case 2:
+                res[2] = (byte) ((tmpValue >> 8) & 0xff);
+            case 3:
+                res[3] = (byte) ((tmpValue >> 0) & 0xff);
+        }
+        return res;
     }
+
     /*
-     * When only one part is given, the value is stored directly in
-     * the network address without any byte rearrangement.
-     *
-     * When a two part address is supplied, the last part is
-     * interpreted as a 24-bit quantity and placed in the right
-     * most three bytes of the network address. This makes the
-     * two part address format convenient for specifying Class A
-     * network addresses as net.host.
-     *
-     * When a three part address is specified, the last part is
-     * interpreted as a 16-bit quantity and placed in the right
-     * most two bytes of the network address. This makes the
-     * three part address format convenient for specifying
-     * Class B net- work addresses as 128.net.host.
+     * Convert IPv6 presentation level address to network order binary form.
+     * credit:
+     *  Converted from C code from Solaris 8 (inet_pton)
      *
-     * When four parts are specified, each is interpreted as a
-     * byte of data and assigned, from left to right, to the
-     * four bytes of an IPv4 address.
+     * Any component of the string following a per-cent % is ignored.
      *
-     * We determine and parse the leading parts, if any, as single
-     * byte values in one pass directly into the resulting byte[],
-     * then the remainder is treated as a 8-to-32-bit entity and
-     * translated into the remaining bytes in the array.
+     * @param src a String representing an IPv6 address in textual format
+     * @return a byte array representing the IPv6 numeric address
      */
-    for (int i = 0; i < len; i++) {
-      char c = src.charAt(i);
-      if (c == '.') {
-        if (newOctet || tmpValue < 0 || tmpValue > 0xff || currByte == 3) {
-          return null;
+    public static byte[] textToNumericFormatV6(String src) {
+        // Shortest valid string is "::", hence at least 2 chars
+        if (src.length() < 2) {
+            return null;
         }
-        res[currByte++] = (byte) (tmpValue & 0xff);
-        tmpValue = 0;
-        newOctet = true;
-      } else {
-        int digit = Character.digit(c, 10);
-        if (digit < 0) {
-          return null;
-        }
-        tmpValue *= 10;
-        tmpValue += digit;
-        newOctet = false;
-      }
-    }
-    if (newOctet || tmpValue < 0 || tmpValue >= (1L << ((4 - currByte) * 8))) {
-      return null;
-    }
-    switch (currByte) {
-      case 0:
-        res[0] = (byte) ((tmpValue >> 24) & 0xff);
-      case 1:
-        res[1] = (byte) ((tmpValue >> 16) & 0xff);
-      case 2:
-        res[2] = (byte) ((tmpValue >> 8) & 0xff);
-      case 3:
-        res[3] = (byte) ((tmpValue >> 0) & 0xff);
-    }
-    return res;
-  }
-
-  /*
-   * Convert IPv6 presentation level address to network order binary form.
-   * credit:
-   *  Converted from C code from Solaris 8 (inet_pton)
-   *
-   * Any component of the string following a per-cent % is ignored.
-   *
-   * @param src a String representing an IPv6 address in textual format
-   * @return a byte array representing the IPv6 numeric address
-   */
-  public static byte[] textToNumericFormatV6(String src) {
-    // Shortest valid string is "::", hence at least 2 chars
-    if (src.length() < 2) {
-      return null;
-    }
-
-    int colonp;
-    char ch;
-    boolean saw_xdigit;
-    int val;
-    char[] srcb = src.toCharArray();
-    byte[] dst = new byte[INADDR16SZ];
 
-    int srcb_length = srcb.length;
-    int pc = src.indexOf('%');
-    if (pc == srcb_length - 1) {
-      return null;
-    }
+        int colonp;
+        char ch;
+        boolean saw_xdigit;
+        int val;
+        char[] srcb = src.toCharArray();
+        byte[] dst = new byte[INADDR16SZ];
 
-    if (pc != -1) {
-      srcb_length = pc;
-    }
+        int srcb_length = srcb.length;
+        int pc = src.indexOf('%');
+        if (pc == srcb_length - 1) {
+            return null;
+        }
 
-    colonp = -1;
-    int i = 0, j = 0;
-    /* Leading :: requires some special handling. */
-    if (srcb[i] == ':') if (srcb[++i] != ':') return null;
-    int curtok = i;
-    saw_xdigit = false;
-    val = 0;
-    while (i < srcb_length) {
-      ch = srcb[i++];
-      int chval = Character.digit(ch, 16);
-      if (chval != -1) {
-        val <<= 4;
-        val |= chval;
-        if (val > 0xffff) return null;
-        saw_xdigit = true;
-        continue;
-      }
-      if (ch == ':') {
-        curtok = i;
-        if (!saw_xdigit) {
-          if (colonp != -1) return null;
-          colonp = j;
-          continue;
-        } else if (i == srcb_length) {
-          return null;
+        if (pc != -1) {
+            srcb_length = pc;
         }
-        if (j + INT16SZ > INADDR16SZ) return null;
-        dst[j++] = (byte) ((val >> 8) & 0xff);
-        dst[j++] = (byte) (val & 0xff);
+
+        colonp = -1;
+        int i = 0, j = 0;
+        /* Leading :: requires some special handling. */
+        if (srcb[i] == ':') if (srcb[++i] != ':') return null;
+        int curtok = i;
         saw_xdigit = false;
         val = 0;
-        continue;
-      }
-      if (ch == '.' && ((j + INADDR4SZ) <= INADDR16SZ)) {
-        String ia4 = src.substring(curtok, srcb_length);
-        /* check this IPv4 address has 3 dots, ie. A.B.C.D */
-        int dot_count = 0, index = 0;
-        while ((index = ia4.indexOf('.', index)) != -1) {
-          dot_count++;
-          index++;
+        while (i < srcb_length) {
+            ch = srcb[i++];
+            int chval = Character.digit(ch, 16);
+            if (chval != -1) {
+                val <<= 4;
+                val |= chval;
+                if (val > 0xffff) return null;
+                saw_xdigit = true;
+                continue;
+            }
+            if (ch == ':') {
+                curtok = i;
+                if (!saw_xdigit) {
+                    if (colonp != -1) return null;
+                    colonp = j;
+                    continue;
+                } else if (i == srcb_length) {
+                    return null;
+                }
+                if (j + INT16SZ > INADDR16SZ) return null;
+                dst[j++] = (byte) ((val >> 8) & 0xff);
+                dst[j++] = (byte) (val & 0xff);
+                saw_xdigit = false;
+                val = 0;
+                continue;
+            }
+            if (ch == '.' && ((j + INADDR4SZ) <= INADDR16SZ)) {
+                String ia4 = src.substring(curtok, srcb_length);
+                /* check this IPv4 address has 3 dots, ie. A.B.C.D */
+                int dot_count = 0, index = 0;
+                while ((index = ia4.indexOf('.', index)) != -1) {
+                    dot_count++;
+                    index++;
+                }
+                if (dot_count != 3) {
+                    return null;
+                }
+                byte[] v4addr = textToNumericFormatV4(ia4);
+                if (v4addr == null) {
+                    return null;
+                }
+                for (int k = 0; k < INADDR4SZ; k++) {
+                    dst[j++] = v4addr[k];
+                }
+                saw_xdigit = false;
+                break; /* '\0' was seen by inet_pton4(). */
+            }
+            return null;
         }
-        if (dot_count != 3) {
-          return null;
+        if (saw_xdigit) {
+            if (j + INT16SZ > INADDR16SZ) return null;
+            dst[j++] = (byte) ((val >> 8) & 0xff);
+            dst[j++] = (byte) (val & 0xff);
         }
-        byte[] v4addr = textToNumericFormatV4(ia4);
-        if (v4addr == null) {
-          return null;
+
+        if (colonp != -1) {
+            int n = j - colonp;
+
+            if (j == INADDR16SZ) return null;
+            for (i = 1; i <= n; i++) {
+                dst[INADDR16SZ - i] = dst[colonp + n - i];
+                dst[colonp + n - i] = 0;
+            }
+            j = INADDR16SZ;
         }
-        for (int k = 0; k < INADDR4SZ; k++) {
-          dst[j++] = v4addr[k];
+        if (j != INADDR16SZ) return null;
+        byte[] newdst = convertFromIPv4MappedAddress(dst);
+        if (newdst != null) {
+            return newdst;
+        } else {
+            return dst;
         }
-        saw_xdigit = false;
-        break; /* '\0' was seen by inet_pton4(). */
-      }
-      return null;
-    }
-    if (saw_xdigit) {
-      if (j + INT16SZ > INADDR16SZ) return null;
-      dst[j++] = (byte) ((val >> 8) & 0xff);
-      dst[j++] = (byte) (val & 0xff);
     }
 
-    if (colonp != -1) {
-      int n = j - colonp;
-
-      if (j == INADDR16SZ) return null;
-      for (i = 1; i <= n; i++) {
-        dst[INADDR16SZ - i] = dst[colonp + n - i];
-        dst[colonp + n - i] = 0;
-      }
-      j = INADDR16SZ;
-    }
-    if (j != INADDR16SZ) return null;
-    byte[] newdst = convertFromIPv4MappedAddress(dst);
-    if (newdst != null) {
-      return newdst;
-    } else {
-      return dst;
+    /**
+     * @param src a String representing an IPv4 address in textual format
+     * @return a boolean indicating whether src is an IPv4 literal address
+     */
+    public static boolean isIPv4LiteralAddress(String src) {
+        return textToNumericFormatV4(src) != null;
     }
-  }
-
-  /**
-   * @param src a String representing an IPv4 address in textual format
-   * @return a boolean indicating whether src is an IPv4 literal address
-   */
-  public static boolean isIPv4LiteralAddress(String src) {
-    return textToNumericFormatV4(src) != null;
-  }
-
-  /**
-   * @param src a String representing an IPv6 address in textual format
-   * @return a boolean indicating whether src is an IPv6 literal address
-   */
-  public static boolean isIPv6LiteralAddress(String src) {
-    return textToNumericFormatV6(src) != null;
-  }
 
-  /*
-   * Convert IPv4-Mapped address to IPv4 address. Both input and
-   * returned value are in network order binary form.
-   *
-   * @param src a String representing an IPv4-Mapped address in textual format
-   * @return a byte array representing the IPv4 numeric address
-   */
-  public static byte[] convertFromIPv4MappedAddress(byte[] addr) {
-    if (isIPv4MappedAddress(addr)) {
-      byte[] newAddr = new byte[INADDR4SZ];
-      System.arraycopy(addr, 12, newAddr, 0, INADDR4SZ);
-      return newAddr;
+    /**
+     * @param src a String representing an IPv6 address in textual format
+     * @return a boolean indicating whether src is an IPv6 literal address
+     */
+    public static boolean isIPv6LiteralAddress(String src) {
+        return textToNumericFormatV6(src) != null;
     }
-    return null;
-  }
 
-  /**
-   * Utility routine to check if the InetAddress is an IPv4 mapped IPv6 address.
-   *
-   * @return a <code>boolean</code> indicating if the InetAddress is an IPv4 mapped IPv6 address; or
-   *     false if address is IPv4 address.
-   */
-  private static boolean isIPv4MappedAddress(byte[] addr) {
-    if (addr.length < INADDR16SZ) {
-      return false;
+    /*
+     * Convert IPv4-Mapped address to IPv4 address. Both input and
+     * returned value are in network order binary form.
+     *
+     * @param src a String representing an IPv4-Mapped address in textual format
+     * @return a byte array representing the IPv4 numeric address
+     */
+    public static byte[] convertFromIPv4MappedAddress(byte[] addr) {
+        if (isIPv4MappedAddress(addr)) {
+            byte[] newAddr = new byte[INADDR4SZ];
+            System.arraycopy(addr, 12, newAddr, 0, INADDR4SZ);
+            return newAddr;
+        }
+        return null;
     }
-    if ((addr[0] == 0x00)
-        && (addr[1] == 0x00)
-        && (addr[2] == 0x00)
-        && (addr[3] == 0x00)
-        && (addr[4] == 0x00)
-        && (addr[5] == 0x00)
-        && (addr[6] == 0x00)
-        && (addr[7] == 0x00)
-        && (addr[8] == 0x00)
-        && (addr[9] == 0x00)
-        && (addr[10] == (byte) 0xff)
-        && (addr[11] == (byte) 0xff)) {
-      return true;
+
+    /**
+     * Utility routine to check if the InetAddress is an IPv4 mapped IPv6 address.
+     *
+     * @return a <code>boolean</code> indicating if the InetAddress is an IPv4 mapped IPv6 address; or
+     *     false if address is IPv4 address.
+     */
+    private static boolean isIPv4MappedAddress(byte[] addr) {
+        if (addr.length < INADDR16SZ) {
+            return false;
+        }
+        if ((addr[0] == 0x00)
+                && (addr[1] == 0x00)
+                && (addr[2] == 0x00)
+                && (addr[3] == 0x00)
+                && (addr[4] == 0x00)
+                && (addr[5] == 0x00)
+                && (addr[6] == 0x00)
+                && (addr[7] == 0x00)
+                && (addr[8] == 0x00)
+                && (addr[9] == 0x00)
+                && (addr[10] == (byte) 0xff)
+                && (addr[11] == (byte) 0xff)) {
+            return true;
+        }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HeadersInjectAdapter.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HeadersInjectAdapter.java
index fab72a63264..e10db0bef71 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HeadersInjectAdapter.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HeadersInjectAdapter.java
@@ -7,10 +7,10 @@
 @ParametersAreNonnullByDefault
 public class HeadersInjectAdapter implements CarrierSetter<HttpURLConnection> {
 
-  public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter();
+    public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter();
 
-  @Override
-  public void set(final HttpURLConnection carrier, final String key, final String value) {
-    carrier.setRequestProperty(key, value);
-  }
+    @Override
+    public void set(final HttpURLConnection carrier, final String key, final String value) {
+        carrier.setRequestProperty(key, value);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlConnectionDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlConnectionDecorator.java
index 8acf3578423..7807e845e31 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlConnectionDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlConnectionDecorator.java
@@ -8,53 +8,50 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-public class HttpUrlConnectionDecorator
-    extends HttpClientDecorator<HttpURLConnection, HttpURLConnection> {
-
-  public static final CharSequence HTTP_URL_CONNECTION =
-      UTF8BytesString.create("http-url-connection");
-
-  public static final HttpUrlConnectionDecorator DECORATE = new HttpUrlConnectionDecorator();
-
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"httpurlconnection"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return HTTP_URL_CONNECTION;
-  }
-
-  @Override
-  protected String method(final HttpURLConnection connection) {
-    return connection.getRequestMethod();
-  }
-
-  @Override
-  protected URI url(final HttpURLConnection connection) throws URISyntaxException {
-    return connection.getURL().toURI();
-  }
-
-  @Override
-  protected int status(final HttpURLConnection connection) {
-    try {
-      return connection.getResponseCode();
-    } catch (Exception ignored) {
-      return UNSET_STATUS;
+public class HttpUrlConnectionDecorator extends HttpClientDecorator<HttpURLConnection, HttpURLConnection> {
+
+    public static final CharSequence HTTP_URL_CONNECTION = UTF8BytesString.create("http-url-connection");
+
+    public static final HttpUrlConnectionDecorator DECORATE = new HttpUrlConnectionDecorator();
+
+    public static final CharSequence OPERATION_NAME = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"httpurlconnection"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return HTTP_URL_CONNECTION;
+    }
+
+    @Override
+    protected String method(final HttpURLConnection connection) {
+        return connection.getRequestMethod();
+    }
+
+    @Override
+    protected URI url(final HttpURLConnection connection) throws URISyntaxException {
+        return connection.getURL().toURI();
     }
-  }
 
-  @Override
-  protected String getRequestHeader(HttpURLConnection connection, String headerName) {
-    return connection.getRequestProperty(headerName);
-  }
+    @Override
+    protected int status(final HttpURLConnection connection) {
+        try {
+            return connection.getResponseCode();
+        } catch (Exception ignored) {
+            return UNSET_STATUS;
+        }
+    }
 
-  @Override
-  protected String getResponseHeader(HttpURLConnection connection, String headerName) {
-    return connection.getHeaderField(headerName);
-  }
+    @Override
+    protected String getRequestHeader(HttpURLConnection connection, String headerName) {
+        return connection.getRequestProperty(headerName);
+    }
+
+    @Override
+    protected String getResponseHeader(HttpURLConnection connection, String headerName) {
+        return connection.getHeaderField(headerName);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java
index 71e4f076a62..3e51c8fbeb7 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java
@@ -11,65 +11,64 @@
 import java.net.HttpURLConnection;
 
 public class HttpUrlState {
-  public static final ContextStore.Factory<HttpUrlState> FACTORY = HttpUrlState::new;
+    public static final ContextStore.Factory<HttpUrlState> FACTORY = HttpUrlState::new;
 
-  private volatile AgentSpan span = null;
-  private volatile boolean finished = false;
+    private volatile AgentSpan span = null;
+    private volatile boolean finished = false;
 
-  public AgentSpan start(final HttpURLConnection connection) {
-    span = startSpan(HTTP_URL_CONNECTION.toString(), DECORATE.operationName());
-    try (final ContextScope scope = activateSpan(span)) {
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, connection);
-      return span;
+    public AgentSpan start(final HttpURLConnection connection) {
+        span = startSpan(HTTP_URL_CONNECTION.toString(), DECORATE.operationName());
+        try (final ContextScope scope = activateSpan(span)) {
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, connection);
+            return span;
+        }
     }
-  }
 
-  public boolean hasSpan() {
-    return span != null;
-  }
+    public boolean hasSpan() {
+        return span != null;
+    }
 
-  public boolean isFinished() {
-    return finished;
-  }
+    public boolean isFinished() {
+        return finished;
+    }
 
-  public void finish() {
-    finished = true;
-  }
+    public void finish() {
+        finished = true;
+    }
 
-  public void finishSpan(
-      final HttpURLConnection connection, final int responseCode, final Throwable throwable) {
-    try (final ContextScope scope = activateSpan(span)) {
-      if (responseCode > 0) {
-        // safe to access response data as 'responseCode' is set
-        DECORATE.onResponse(span, connection);
-      } else {
-        // Ignoring the throwable if we have response code
-        // to have consistent behavior with other http clients.
-        DECORATE.onError(span, throwable);
-      }
-      DECORATE.beforeFinish(span);
-      span.finish();
-      span = null;
-      finished = true;
+    public void finishSpan(final HttpURLConnection connection, final int responseCode, final Throwable throwable) {
+        try (final ContextScope scope = activateSpan(span)) {
+            if (responseCode > 0) {
+                // safe to access response data as 'responseCode' is set
+                DECORATE.onResponse(span, connection);
+            } else {
+                // Ignoring the throwable if we have response code
+                // to have consistent behavior with other http clients.
+                DECORATE.onError(span, throwable);
+            }
+            DECORATE.beforeFinish(span);
+            span.finish();
+            span = null;
+            finished = true;
+        }
     }
-  }
 
-  public void finishSpan(final HttpURLConnection connection, final int responseCode) {
-    /*
-     * responseCode field is sometimes not populated.
-     * We can't call getResponseCode() due to some unwanted side-effects
-     * (e.g. breaks getOutputStream).
-     */
-    if (responseCode > 0) {
-      try (final ContextScope scope = activateSpan(span)) {
-        // safe to access response data as 'responseCode' is set
-        DECORATE.onResponse(span, connection);
-        DECORATE.beforeFinish(span);
-        span.finish();
-        span = null;
-        finished = true;
-      }
+    public void finishSpan(final HttpURLConnection connection, final int responseCode) {
+        /*
+         * responseCode field is sometimes not populated.
+         * We can't call getResponseCode() due to some unwanted side-effects
+         * (e.g. breaks getOutputStream).
+         */
+        if (responseCode > 0) {
+            try (final ContextScope scope = activateSpan(span)) {
+                // safe to access response data as 'responseCode' is set
+                DECORATE.onResponse(span, connection);
+                DECORATE.beforeFinish(span);
+                span.finish();
+                span = null;
+                finished = true;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/iast/NamedContext.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/iast/NamedContext.java
index 9132b703bf3..cb0e04ad82a 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/iast/NamedContext.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/iast/NamedContext.java
@@ -15,85 +15,92 @@
  */
 public abstract class NamedContext {
 
-  public abstract void taintValue(@Nullable String value);
-
-  public abstract void taintName(@Nullable String name);
-
-  public abstract void setCurrentName(@Nullable final String name);
-
-  @Nonnull
-  public static <E> NamedContext getOrCreate(
-      @Nonnull final ContextStore<E, NamedContext> store, @Nonnull final E target) {
-    NamedContext result = store.get(target);
-    if (result != null) {
-      return result;
-    }
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      final Source source = module.findSource(target);
-      if (source != null) {
-        result = new NamedContextImpl(module, source);
-      }
+    public abstract void taintValue(@Nullable String value);
+
+    public abstract void taintName(@Nullable String name);
+
+    public abstract void setCurrentName(@Nullable final String name);
+
+    @Nonnull
+    public static <E> NamedContext getOrCreate(
+            @Nonnull final ContextStore<E, NamedContext> store, @Nonnull final E target) {
+        NamedContext result = store.get(target);
+        if (result != null) {
+            return result;
+        }
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            final Source source = module.findSource(target);
+            if (source != null) {
+                result = new NamedContextImpl(module, source);
+            }
+        }
+        result = result == null ? NoOp.INSTANCE : result;
+        store.put(target, result);
+        return result;
     }
-    result = result == null ? NoOp.INSTANCE : result;
-    store.put(target, result);
-    return result;
-  }
-
-  private static class NoOp extends NamedContext {
-
-    private static final NamedContext INSTANCE = new NoOp();
-
-    @Override
-    public void taintValue(@Nullable final String value) {}
 
-    @Override
-    public void taintName(@Nullable final String name) {}
+    private static class NoOp extends NamedContext {
 
-    @Override
-    public void setCurrentName(@Nullable final String name) {}
-  }
+        private static final NamedContext INSTANCE = new NoOp();
 
-  private static class NamedContextImpl extends NamedContext {
-    @Nonnull private final PropagationModule module;
-    @Nonnull private final Source source;
-    @Nullable private String currentName;
+        @Override
+        public void taintValue(@Nullable final String value) {}
 
-    private boolean fetched;
-    @Nullable private IastContext context;
-
-    public NamedContextImpl(@Nonnull final PropagationModule module, @Nonnull final Source source) {
-      this.module = module;
-      this.source = source;
-    }
-
-    @Override
-    public void taintValue(@Nullable final String value) {
-      module.taintString(iastCtx(), value, source.getOrigin(), currentName, source.getValue());
-    }
-
-    @Override
-    @SuppressWarnings("StringEquality")
-    @SuppressFBWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ")
-    public void taintName(@Nullable final String name) {
-      // prevent tainting the same name more than once
-      if (currentName != name) {
-        currentName = name;
-        module.taintString(iastCtx(), name, source.getOrigin(), name, source.getValue());
-      }
-    }
+        @Override
+        public void taintName(@Nullable final String name) {}
 
-    @Override
-    public void setCurrentName(@Nullable final String name) {
-      currentName = name;
+        @Override
+        public void setCurrentName(@Nullable final String name) {}
     }
 
-    private IastContext iastCtx() {
-      if (!fetched) {
-        fetched = true;
-        context = IastContext.Provider.get();
-      }
-      return context;
+    private static class NamedContextImpl extends NamedContext {
+        @Nonnull
+        private final PropagationModule module;
+
+        @Nonnull
+        private final Source source;
+
+        @Nullable
+        private String currentName;
+
+        private boolean fetched;
+
+        @Nullable
+        private IastContext context;
+
+        public NamedContextImpl(@Nonnull final PropagationModule module, @Nonnull final Source source) {
+            this.module = module;
+            this.source = source;
+        }
+
+        @Override
+        public void taintValue(@Nullable final String value) {
+            module.taintString(iastCtx(), value, source.getOrigin(), currentName, source.getValue());
+        }
+
+        @Override
+        @SuppressWarnings("StringEquality")
+        @SuppressFBWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ")
+        public void taintName(@Nullable final String name) {
+            // prevent tainting the same name more than once
+            if (currentName != name) {
+                currentName = name;
+                module.taintString(iastCtx(), name, source.getOrigin(), name, source.getValue());
+            }
+        }
+
+        @Override
+        public void setCurrentName(@Nullable final String name) {
+            currentName = name;
+        }
+
+        private IastContext iastCtx() {
+            if (!fetched) {
+                fetched = true;
+                context = IastContext.Provider.get();
+            }
+            return context;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AdviceUtils.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AdviceUtils.java
index 9fe033d7632..ac77a2bf064 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AdviceUtils.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AdviceUtils.java
@@ -13,73 +13,72 @@
 /** Helper utils for Runnable/Callable instrumentation */
 public class AdviceUtils {
 
-  /**
-   * Start scope for a given task
-   *
-   * @param contextStore context storage for task's state
-   * @param task task to start scope for
-   * @param <T> task's type
-   * @return scope if scope was started, or null
-   */
-  public static <T> ContextScope startTaskScope(
-      final ContextStore<T, State> contextStore, final T task) {
-    return startTaskScope(contextStore.get(task));
-  }
+    /**
+     * Start scope for a given task
+     *
+     * @param contextStore context storage for task's state
+     * @param task task to start scope for
+     * @param <T> task's type
+     * @return scope if scope was started, or null
+     */
+    public static <T> ContextScope startTaskScope(final ContextStore<T, State> contextStore, final T task) {
+        return startTaskScope(contextStore.get(task));
+    }
 
-  @Nullable
-  public static ContextScope startTaskScope(State state) {
-    if (state != null) {
-      final ContextContinuation continuation = state.getAndResetContinuation();
-      if (continuation != null) {
-        final ContextScope scope = continuation.resume();
-        // important - stop timing after the scope has been activated so the time in the queue can
-        // be attributed to the correct context without duplicating the propagated information
-        state.stopTiming();
-        return scope;
-      }
+    @Nullable
+    public static ContextScope startTaskScope(State state) {
+        if (state != null) {
+            final ContextContinuation continuation = state.getAndResetContinuation();
+            if (continuation != null) {
+                final ContextScope scope = continuation.resume();
+                // important - stop timing after the scope has been activated so the time in the queue can
+                // be attributed to the correct context without duplicating the propagated information
+                state.stopTiming();
+                return scope;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  public static void endTaskScope(final ContextScope scope) {
-    if (null != scope) {
-      scope.close();
+    public static void endTaskScope(final ContextScope scope) {
+        if (null != scope) {
+            scope.close();
+        }
     }
-  }
 
-  public static <T> void cancelTask(ContextStore<T, State> contextStore, final T task) {
-    State state = contextStore.get(task);
-    if (null != state) {
-      state.closeContinuation();
+    public static <T> void cancelTask(ContextStore<T, State> contextStore, final T task) {
+        State state = contextStore.get(task);
+        if (null != state) {
+            state.closeContinuation();
+        }
     }
-  }
 
-  /**
-   * Determines whether the given context should be captured for async propagation. The root context
-   * is never captured; similarly a context with an invalid span is deliberately excluded from async
-   * propagation to support {@link Tracer#muteTracing()}
-   *
-   * @param context the context to check
-   * @return {@code true} if the context should be captured; otherwise {@code false}
-   */
-  public static boolean shouldCapture(Context context) {
-    if (context == Context.root()) {
-      return false;
+    /**
+     * Determines whether the given context should be captured for async propagation. The root context
+     * is never captured; similarly a context with an invalid span is deliberately excluded from async
+     * propagation to support {@link Tracer#muteTracing()}
+     *
+     * @param context the context to check
+     * @return {@code true} if the context should be captured; otherwise {@code false}
+     */
+    public static boolean shouldCapture(Context context) {
+        if (context == Context.root()) {
+            return false;
+        }
+        AgentSpan span = AgentSpan.fromContext(context);
+        // propagate contexts with no span or a valid span, when flag is on
+        return (span == null || span.isValid()) && isAsyncPropagationEnabled();
     }
-    AgentSpan span = AgentSpan.fromContext(context);
-    // propagate contexts with no span or a valid span, when flag is on
-    return (span == null || span.isValid()) && isAsyncPropagationEnabled();
-  }
 
-  public static <T> void capture(ContextStore<T, State> contextStore, T task) {
-    Context context = Context.current();
-    if (shouldCapture(context)) {
-      State state = contextStore.get(task);
-      if (null == state) {
-        state = State.FACTORY.create();
-        contextStore.put(task, state);
-      }
-      state.captureAndSetContinuation(context);
+    public static <T> void capture(ContextStore<T, State> contextStore, T task) {
+        Context context = Context.current();
+        if (shouldCapture(context)) {
+            State state = contextStore.get(task);
+            if (null == state) {
+                state = State.FACTORY.create();
+                contextStore.put(task, state);
+            }
+            state.captureAndSetContinuation(context);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtension.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtension.java
index 07d8fed551e..55947a06584 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtension.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtension.java
@@ -7,21 +7,21 @@
  * support implementations where types are available on classpath.
  */
 public interface AsyncResultExtension {
-  /**
-   * Checks whether this extensions support a result type.
-   *
-   * @param result The result type to check.
-   * @return {@code true} if the type is supported by this extension, {@code false} otherwise.
-   */
-  boolean supports(Class<?> result);
+    /**
+     * Checks whether this extensions support a result type.
+     *
+     * @param result The result type to check.
+     * @return {@code true} if the type is supported by this extension, {@code false} otherwise.
+     */
+    boolean supports(Class<?> result);
 
-  /**
-   * Applies the extension to the async result.
-   *
-   * @param result The async result.
-   * @param span The related span.
-   * @return The result object to return (can be the original result if not modified), or {@code
-   *     null} if the extension could not be applied.
-   */
-  Object apply(Object result, AgentSpan span);
+    /**
+     * Applies the extension to the async result.
+     *
+     * @param result The async result.
+     * @param span The related span.
+     * @return The result object to return (can be the original result if not modified), or {@code
+     *     null} if the extension could not be applied.
+     */
+    Object apply(Object result, AgentSpan span);
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtensions.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtensions.java
index 1127ba4455b..e3769c6e56a 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtensions.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtensions.java
@@ -13,86 +13,84 @@
 import java.util.function.BiConsumer;
 
 public final class AsyncResultExtensions {
-  private static final List<AsyncResultExtension> EXTENSIONS =
-      new CopyOnWriteArrayList<>(singletonList(new CompletableAsyncResultExtension()));
+    private static final List<AsyncResultExtension> EXTENSIONS =
+            new CopyOnWriteArrayList<>(singletonList(new CompletableAsyncResultExtension()));
 
-  private static final ClassValue<AsyncResultExtension> EXTENSION_CLASS_VALUE =
-      new ClassValue<AsyncResultExtension>() {
-        @Override
-        protected AsyncResultExtension computeValue(Class<?> type) {
-          return EXTENSIONS.stream()
-              .filter(extension -> extension.supports(type))
-              .findFirst()
-              .orElse(null);
-        }
-      };
+    private static final ClassValue<AsyncResultExtension> EXTENSION_CLASS_VALUE =
+            new ClassValue<AsyncResultExtension>() {
+                @Override
+                protected AsyncResultExtension computeValue(Class<?> type) {
+                    return EXTENSIONS.stream()
+                            .filter(extension -> extension.supports(type))
+                            .findFirst()
+                            .orElse(null);
+                }
+            };
 
-  /**
-   * Wraps a supported async result so the span is finished when the async computation completes.
-   *
-   * @return the wrapped async result, or {@code null} if the result type is unsupported or no
-   *     wrapping is applied
-   */
-  public static Object wrapAsyncResult(
-      final Object result, final Class<?> resultType, final AgentSpan span) {
-    AsyncResultExtension extension;
-    if (result != null && (extension = EXTENSION_CLASS_VALUE.get(resultType)) != null) {
-      return extension.apply(result, span);
+    /**
+     * Wraps a supported async result so the span is finished when the async computation completes.
+     *
+     * @return the wrapped async result, or {@code null} if the result type is unsupported or no
+     *     wrapping is applied
+     */
+    public static Object wrapAsyncResult(final Object result, final Class<?> resultType, final AgentSpan span) {
+        AsyncResultExtension extension;
+        if (result != null && (extension = EXTENSION_CLASS_VALUE.get(resultType)) != null) {
+            return extension.apply(result, span);
+        }
+        return null;
     }
-    return null;
-  }
 
-  /**
-   * Registers an extension to add supported async types.
-   *
-   * @param extension The extension to register.
-   */
-  public static void register(AsyncResultExtension extension) {
-    if (extension != null) {
-      if (Platform.isNativeImageBuilder()
-          && extension
-              .getClass()
-              .getClassLoader()
-              .getClass()
-              .getName()
-              .endsWith("ThrowawayClassLoader")) {
-        return; // spring-native expects this to be thrown away, not persisted
-      }
-      EXTENSIONS.add(extension);
+    /**
+     * Registers an extension to add supported async types.
+     *
+     * @param extension The extension to register.
+     */
+    public static void register(AsyncResultExtension extension) {
+        if (extension != null) {
+            if (Platform.isNativeImageBuilder()
+                    && extension
+                            .getClass()
+                            .getClassLoader()
+                            .getClass()
+                            .getName()
+                            .endsWith("ThrowawayClassLoader")) {
+                return; // spring-native expects this to be thrown away, not persisted
+            }
+            EXTENSIONS.add(extension);
+        }
     }
-  }
 
-  static final class CompletableAsyncResultExtension implements AsyncResultExtension {
-    @Override
-    public boolean supports(Class<?> result) {
-      return CompletableFuture.class.isAssignableFrom(result)
-          || CompletionStage.class.isAssignableFrom(result);
-    }
+    static final class CompletableAsyncResultExtension implements AsyncResultExtension {
+        @Override
+        public boolean supports(Class<?> result) {
+            return CompletableFuture.class.isAssignableFrom(result) || CompletionStage.class.isAssignableFrom(result);
+        }
 
-    @Override
-    public Object apply(Object result, AgentSpan span) {
-      if (result instanceof CompletableFuture<?>) {
-        CompletableFuture<?> completableFuture = (CompletableFuture<?>) result;
-        if (!completableFuture.isDone() && !completableFuture.isCancelled()) {
-          return completableFuture.whenComplete(finishSpan(span));
+        @Override
+        public Object apply(Object result, AgentSpan span) {
+            if (result instanceof CompletableFuture<?>) {
+                CompletableFuture<?> completableFuture = (CompletableFuture<?>) result;
+                if (!completableFuture.isDone() && !completableFuture.isCancelled()) {
+                    return completableFuture.whenComplete(finishSpan(span));
+                }
+            } else if (result instanceof CompletionStage<?>) {
+                CompletionStage<?> completionStage = (CompletionStage<?>) result;
+                return completionStage.whenComplete(finishSpan(span));
+            }
+            return null;
         }
-      } else if (result instanceof CompletionStage<?>) {
-        CompletionStage<?> completionStage = (CompletionStage<?>) result;
-        return completionStage.whenComplete(finishSpan(span));
-      }
-      return null;
     }
-  }
 
-  public static <T> BiConsumer<T, Throwable> finishSpan(AgentSpan span) {
-    return (o, throwable) -> {
-      if (throwable != null) {
-        span.addThrowable(
-            throwable instanceof ExecutionException || throwable instanceof CompletionException
-                ? throwable.getCause()
-                : throwable);
-      }
-      span.finish();
-    };
-  }
+    public static <T> BiConsumer<T, Throwable> finishSpan(AgentSpan span) {
+        return (o, throwable) -> {
+            if (throwable != null) {
+                span.addThrowable(
+                        throwable instanceof ExecutionException || throwable instanceof CompletionException
+                                ? throwable.getCause()
+                                : throwable);
+            }
+            span.finish();
+        };
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ComparableRunnable.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ComparableRunnable.java
index b2b279a8ce1..0a735dde10c 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ComparableRunnable.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ComparableRunnable.java
@@ -3,14 +3,14 @@
 import datadog.context.ContextContinuation;
 
 public final class ComparableRunnable<T extends Runnable & Comparable<T>> extends Wrapper<T>
-    implements Comparable<ComparableRunnable<T>> {
+        implements Comparable<ComparableRunnable<T>> {
 
-  public ComparableRunnable(T delegate, ContextContinuation continuation) {
-    super(delegate, continuation);
-  }
+    public ComparableRunnable(T delegate, ContextContinuation continuation) {
+        super(delegate, continuation);
+    }
 
-  @Override
-  public int compareTo(ComparableRunnable<T> o) {
-    return delegate.compareTo(o.delegate);
-  }
+    @Override
+    public int compareTo(ComparableRunnable<T> o) {
+        return delegate.compareTo(o.delegate);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ConcurrentState.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ConcurrentState.java
index 6767c55ac77..10fb5fd1cb6 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ConcurrentState.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ConcurrentState.java
@@ -19,105 +19,96 @@
  */
 public final class ConcurrentState {
 
-  private static final Logger log = LoggerFactory.getLogger(ConcurrentState.class);
-
-  public static ContextStore.Factory<ConcurrentState> FACTORY = ConcurrentState::new;
-
-  private volatile ContextContinuation continuation = null;
-
-  private static final AtomicReferenceFieldUpdater<ConcurrentState, ContextContinuation>
-      CONTINUATION =
-          AtomicReferenceFieldUpdater.newUpdater(
-              ConcurrentState.class, ContextContinuation.class, "continuation");
-
-  private ConcurrentState() {}
-
-  @Nullable
-  public static <K> ConcurrentState captureContinuation(
-      ContextStore<K, ConcurrentState> contextStore, K key, Context context) {
-    if (shouldCapture(context)) {
-      final ConcurrentState state = contextStore.getOrCreate(key, FACTORY);
-      if (!state.captureAndSetContinuation(context) && log.isDebugEnabled()) {
-        log.debug(
-            "continuation was already set for {} in context {}, no continuation captured.",
-            key,
-            context);
-      }
-      return state;
-    } else {
-      return null;
-    }
-  }
-
-  @Nullable
-  public static <K> ContextScope activateAndContinueContinuation(
-      ContextStore<K, ConcurrentState> contextStore, K key) {
-    final ConcurrentState state = contextStore.get(key);
-    if (state == null) {
-      return null;
-    }
-    return state.activateAndContinueContinuation();
-  }
-
-  public static <K> void closeScope(
-      ContextStore<K, ConcurrentState> contextStore,
-      K key,
-      ContextScope scope,
-      Throwable throwable) {
-    final ConcurrentState state = contextStore.get(key);
-    if (scope != null) {
-      scope.close();
-      return;
+    private static final Logger log = LoggerFactory.getLogger(ConcurrentState.class);
+
+    public static ContextStore.Factory<ConcurrentState> FACTORY = ConcurrentState::new;
+
+    private volatile ContextContinuation continuation = null;
+
+    private static final AtomicReferenceFieldUpdater<ConcurrentState, ContextContinuation> CONTINUATION =
+            AtomicReferenceFieldUpdater.newUpdater(ConcurrentState.class, ContextContinuation.class, "continuation");
+
+    private ConcurrentState() {}
+
+    @Nullable
+    public static <K> ConcurrentState captureContinuation(
+            ContextStore<K, ConcurrentState> contextStore, K key, Context context) {
+        if (shouldCapture(context)) {
+            final ConcurrentState state = contextStore.getOrCreate(key, FACTORY);
+            if (!state.captureAndSetContinuation(context) && log.isDebugEnabled()) {
+                log.debug("continuation was already set for {} in context {}, no continuation captured.", key, context);
+            }
+            return state;
+        } else {
+            return null;
+        }
     }
-    if (state == null) {
-      return;
+
+    @Nullable
+    public static <K> ContextScope activateAndContinueContinuation(
+            ContextStore<K, ConcurrentState> contextStore, K key) {
+        final ConcurrentState state = contextStore.get(key);
+        if (state == null) {
+            return null;
+        }
+        return state.activateAndContinueContinuation();
     }
-    if (throwable != null) {
-      // This might lead to the continuation being consumed early, but it's better to be safe if we
-      // threw an Exception on entry
-      state.cancelContinuation();
+
+    public static <K> void closeScope(
+            ContextStore<K, ConcurrentState> contextStore, K key, ContextScope scope, Throwable throwable) {
+        final ConcurrentState state = contextStore.get(key);
+        if (scope != null) {
+            scope.close();
+            return;
+        }
+        if (state == null) {
+            return;
+        }
+        if (throwable != null) {
+            // This might lead to the continuation being consumed early, but it's better to be safe if we
+            // threw an Exception on entry
+            state.cancelContinuation();
+        }
     }
-  }
 
-  public static <K> void cancelAndClearContinuation(
-      ContextStore<K, ConcurrentState> contextStore, K key) {
-    final ConcurrentState state = contextStore.get(key);
-    if (state == null) {
-      return;
+    public static <K> void cancelAndClearContinuation(ContextStore<K, ConcurrentState> contextStore, K key) {
+        final ConcurrentState state = contextStore.get(key);
+        if (state == null) {
+            return;
+        }
+        state.cancelAndClearContinuation();
     }
-    state.cancelAndClearContinuation();
-  }
-
-  private boolean captureAndSetContinuation(final Context context) {
-    if (CONTINUATION.compareAndSet(this, null, CLAIMED)) {
-      // lazy write is guaranteed to be seen by getAndSet
-      CONTINUATION.lazySet(this, context.capture().hold());
-      return true;
+
+    private boolean captureAndSetContinuation(final Context context) {
+        if (CONTINUATION.compareAndSet(this, null, CLAIMED)) {
+            // lazy write is guaranteed to be seen by getAndSet
+            CONTINUATION.lazySet(this, context.capture().hold());
+            return true;
+        }
+        return false;
     }
-    return false;
-  }
 
-  private ContextScope activateAndContinueContinuation() {
-    final ContextContinuation continuation = CONTINUATION.get(this);
-    if (continuation != null && continuation != CLAIMED) {
-      return continuation.resume();
+    private ContextScope activateAndContinueContinuation() {
+        final ContextContinuation continuation = CONTINUATION.get(this);
+        if (continuation != null && continuation != CLAIMED) {
+            return continuation.resume();
+        }
+        return null;
     }
-    return null;
-  }
 
-  private void cancelContinuation() {
-    final ContextContinuation continuation = CONTINUATION.get(this);
-    if (continuation != null && continuation != CLAIMED) {
-      continuation.release();
+    private void cancelContinuation() {
+        final ContextContinuation continuation = CONTINUATION.get(this);
+        if (continuation != null && continuation != CLAIMED) {
+            continuation.release();
+        }
     }
-  }
-
-  private void cancelAndClearContinuation() {
-    final ContextContinuation continuation = CONTINUATION.get(this);
-    if (continuation != null && continuation != CLAIMED) {
-      // We should never be able to reuse this state
-      CONTINUATION.compareAndSet(this, continuation, CLAIMED);
-      continuation.release();
+
+    private void cancelAndClearContinuation() {
+        final ContextContinuation continuation = CONTINUATION.get(this);
+        if (continuation != null && continuation != CLAIMED) {
+            // We should never be able to reuse this state
+            CONTINUATION.compareAndSet(this, continuation, CLAIMED);
+            continuation.release();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ContinuationClaim.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ContinuationClaim.java
index d7498489519..f4b14003755 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ContinuationClaim.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ContinuationClaim.java
@@ -6,25 +6,25 @@
 
 final class ContinuationClaim implements ContextContinuation {
 
-  public static final ContinuationClaim CLAIMED = new ContinuationClaim();
+    public static final ContinuationClaim CLAIMED = new ContinuationClaim();
 
-  @Override
-  public ContextContinuation hold() {
-    throw new IllegalStateException();
-  }
+    @Override
+    public ContextContinuation hold() {
+        throw new IllegalStateException();
+    }
 
-  @Override
-  public ContextScope resume() {
-    throw new IllegalStateException();
-  }
+    @Override
+    public ContextScope resume() {
+        throw new IllegalStateException();
+    }
 
-  @Override
-  public Context context() {
-    throw new IllegalStateException();
-  }
+    @Override
+    public Context context() {
+        throw new IllegalStateException();
+    }
 
-  @Override
-  public void release() {
-    throw new IllegalStateException();
-  }
+    @Override
+    public void release() {
+        throw new IllegalStateException();
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ExcludeFilter.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ExcludeFilter.java
index cc021a8f27c..8bb2105d370 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ExcludeFilter.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ExcludeFilter.java
@@ -16,120 +16,113 @@
  */
 public class ExcludeFilter {
 
-  public enum ExcludeType {
-    RUNNABLE,
-    FORK_JOIN_TASK,
-    RUNNABLE_FUTURE,
-    EXECUTOR;
+    public enum ExcludeType {
+        RUNNABLE,
+        FORK_JOIN_TASK,
+        RUNNABLE_FUTURE,
+        EXECUTOR;
 
-    public static ExcludeType fromFieldType(String typeName) {
-      switch (typeName) {
-        case "java.lang.Runnable":
-          return RUNNABLE;
-        case "java.util.concurrent.ForkJoinTask":
-          return FORK_JOIN_TASK;
-        case "java.util.concurrent.RunnableFuture":
-          return RUNNABLE_FUTURE;
-        case "java.util.concurrent.Executor":
-          return EXECUTOR;
-        default:
-          return null;
-      }
+        public static ExcludeType fromFieldType(String typeName) {
+            switch (typeName) {
+                case "java.lang.Runnable":
+                    return RUNNABLE;
+                case "java.util.concurrent.ForkJoinTask":
+                    return FORK_JOIN_TASK;
+                case "java.util.concurrent.RunnableFuture":
+                    return RUNNABLE_FUTURE;
+                case "java.util.concurrent.Executor":
+                    return EXECUTOR;
+                default:
+                    return null;
+            }
+        }
     }
-  }
-
-  private static final ExcludeType[] SKIP_TYPE_VALUES = ExcludeType.values();
-  private static final Map<ExcludeType, List<String>> SKIP_TYPE_PREFIXES =
-      new EnumMap<>(ExcludeType.class);
 
-  public static boolean exclude(ExcludeType type, Object instance) {
-    return SKIP.get(instance.getClass()).contains(type);
-  }
+    private static final ExcludeType[] SKIP_TYPE_VALUES = ExcludeType.values();
+    private static final Map<ExcludeType, List<String>> SKIP_TYPE_PREFIXES = new EnumMap<>(ExcludeType.class);
 
-  public static boolean exclude(ExcludeType type, String className) {
-    boolean literalMatch = excludedClassNames.get(type).contains(className);
-    if (literalMatch) {
-      return true;
+    public static boolean exclude(ExcludeType type, Object instance) {
+        return SKIP.get(instance.getClass()).contains(type);
     }
-    List<String> excludedPrefixes = SKIP_TYPE_PREFIXES.get(type);
-    if (null != excludedPrefixes) {
-      for (String prefix : excludedPrefixes) {
-        if (className.startsWith(prefix)) {
-          return true;
+
+    public static boolean exclude(ExcludeType type, String className) {
+        boolean literalMatch = excludedClassNames.get(type).contains(className);
+        if (literalMatch) {
+            return true;
         }
-      }
+        List<String> excludedPrefixes = SKIP_TYPE_PREFIXES.get(type);
+        if (null != excludedPrefixes) {
+            for (String prefix : excludedPrefixes) {
+                if (className.startsWith(prefix)) {
+                    return true;
+                }
+            }
+        }
+        return false;
     }
-    return false;
-  }
 
-  private static EnumSet<ExcludeType> exclude(Class<?> clazz) {
-    EnumSet<ExcludeType> skipTypes = EnumSet.noneOf(ExcludeType.class);
-    String name = clazz.getName();
-    for (ExcludeType type : SKIP_TYPE_VALUES) {
-      if (exclude(type, name)) {
-        skipTypes.add(type);
-      } else {
-        for (String prefix : SKIP_TYPE_PREFIXES.get(type)) {
-          if (name.startsWith(prefix)) {
-            skipTypes.add(type);
-          }
+    private static EnumSet<ExcludeType> exclude(Class<?> clazz) {
+        EnumSet<ExcludeType> skipTypes = EnumSet.noneOf(ExcludeType.class);
+        String name = clazz.getName();
+        for (ExcludeType type : SKIP_TYPE_VALUES) {
+            if (exclude(type, name)) {
+                skipTypes.add(type);
+            } else {
+                for (String prefix : SKIP_TYPE_PREFIXES.get(type)) {
+                    if (name.startsWith(prefix)) {
+                        skipTypes.add(type);
+                    }
+                }
+            }
         }
-      }
+        return skipTypes;
     }
-    return skipTypes;
-  }
 
-  private static final ClassValue<EnumSet<ExcludeType>> SKIP =
-      GenericClassValue.of(ExcludeFilter::exclude);
+    private static final ClassValue<EnumSet<ExcludeType>> SKIP = GenericClassValue.of(ExcludeFilter::exclude);
 
-  private static final EnumMap<ExcludeType, Set<String>> excludedClassNames =
-      new EnumMap<>(ExcludeType.class);
+    private static final EnumMap<ExcludeType, Set<String>> excludedClassNames = new EnumMap<>(ExcludeType.class);
 
-  static {
-    for (ExcludeType type : ExcludeType.values()) {
-      excludedClassNames.put(type, new HashSet<>());
-    }
-    for (ExcludeType type : SKIP_TYPE_VALUES) {
-      SKIP_TYPE_PREFIXES.put(type, new ArrayList<>());
+    static {
+        for (ExcludeType type : ExcludeType.values()) {
+            excludedClassNames.put(type, new HashSet<>());
+        }
+        for (ExcludeType type : SKIP_TYPE_VALUES) {
+            SKIP_TYPE_PREFIXES.put(type, new ArrayList<>());
+        }
+        // TODO generic prefix registration
+        SKIP_TYPE_PREFIXES.get(ExcludeType.RUNNABLE).add("slick.");
+        // Don't instrument the executor's own runnables. These runnables may never return until
+        // netty shuts down.
+        SKIP_TYPE_PREFIXES.get(ExcludeType.EXECUTOR).add("io.netty.util.concurrent.SingleThreadEventExecutor.");
+        // OkHttp's TaskRunner Runnable is a long-lived worker loop, not a single submitted task.
+        SKIP_TYPE_PREFIXES.get(ExcludeType.RUNNABLE).add("okhttp3.internal.concurrent.TaskRunner$");
+        // Don't wrap Runnables belonging to NioEventLoop(s) as they want to propagate CloseException
+        // outside of the event loop on close() and wrapping them in FutureTask interferes with that
+        SKIP_TYPE_PREFIXES.get(ExcludeType.RUNNABLE).add("com.aerospike.client.async.NioEventLoop");
+        // exclude various ForkJoinTasks internal to CHM
+        SKIP_TYPE_PREFIXES.get(ExcludeType.FORK_JOIN_TASK).add("java.util.concurrent.ConcurrentHashMap");
+        // Exclude Runnables in the Google code ConcurrentLinkedHashMap
+        SKIP_TYPE_PREFIXES
+                .get(ExcludeType.RUNNABLE)
+                .add("com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap");
+        SKIP_TYPE_PREFIXES
+                .get(ExcludeType.RUNNABLE)
+                .add("org.springframework.kafka.listener.KafkaMessageListenerContainer$ListenerConsumer$");
     }
-    // TODO generic prefix registration
-    SKIP_TYPE_PREFIXES.get(ExcludeType.RUNNABLE).add("slick.");
-    // Don't instrument the executor's own runnables. These runnables may never return until
-    // netty shuts down.
-    SKIP_TYPE_PREFIXES
-        .get(ExcludeType.EXECUTOR)
-        .add("io.netty.util.concurrent.SingleThreadEventExecutor.");
-    // OkHttp's TaskRunner Runnable is a long-lived worker loop, not a single submitted task.
-    SKIP_TYPE_PREFIXES.get(ExcludeType.RUNNABLE).add("okhttp3.internal.concurrent.TaskRunner$");
-    // Don't wrap Runnables belonging to NioEventLoop(s) as they want to propagate CloseException
-    // outside of the event loop on close() and wrapping them in FutureTask interferes with that
-    SKIP_TYPE_PREFIXES.get(ExcludeType.RUNNABLE).add("com.aerospike.client.async.NioEventLoop");
-    // exclude various ForkJoinTasks internal to CHM
-    SKIP_TYPE_PREFIXES
-        .get(ExcludeType.FORK_JOIN_TASK)
-        .add("java.util.concurrent.ConcurrentHashMap");
-    // Exclude Runnables in the Google code ConcurrentLinkedHashMap
-    SKIP_TYPE_PREFIXES
-        .get(ExcludeType.RUNNABLE)
-        .add("com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap");
-    SKIP_TYPE_PREFIXES
-        .get(ExcludeType.RUNNABLE)
-        .add("org.springframework.kafka.listener.KafkaMessageListenerContainer$ListenerConsumer$");
-  }
 
-  /**
-   * This should only be called during startup to initialize this based on information gathered from
-   * the loaded {@code InstrumenterModule}s.
-   *
-   * @param excludeTypes the types to exclude
-   */
-  public static void add(Map<ExcludeType, ? extends Collection<String>> excludeTypes) {
-    if (excludeTypes.isEmpty()) {
-      return;
-    }
-    for (Map.Entry<ExcludeType, ? extends Collection<String>> entry : excludeTypes.entrySet()) {
-      Set<String> currentExcluded = excludedClassNames.get(entry.getKey());
-      currentExcluded.addAll(entry.getValue());
+    /**
+     * This should only be called during startup to initialize this based on information gathered from
+     * the loaded {@code InstrumenterModule}s.
+     *
+     * @param excludeTypes the types to exclude
+     */
+    public static void add(Map<ExcludeType, ? extends Collection<String>> excludeTypes) {
+        if (excludeTypes.isEmpty()) {
+            return;
+        }
+        for (Map.Entry<ExcludeType, ? extends Collection<String>> entry : excludeTypes.entrySet()) {
+            Set<String> currentExcluded = excludedClassNames.get(entry.getKey());
+            currentExcluded.addAll(entry.getValue());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ExecutorInstrumentationUtils.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ExecutorInstrumentationUtils.java
index cb2d682aa75..2e060c90202 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ExecutorInstrumentationUtils.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ExecutorInstrumentationUtils.java
@@ -11,65 +11,61 @@
 /** Utils for concurrent instrumentations. */
 public final class ExecutorInstrumentationUtils {
 
-  private static final Logger log = LoggerFactory.getLogger(ExecutorInstrumentationUtils.class);
+    private static final Logger log = LoggerFactory.getLogger(ExecutorInstrumentationUtils.class);
 
-  /**
-   * Checks if given task should get state attached.
-   *
-   * @param task task object
-   * @param context active context
-   * @return true iff given task object should be wrapped
-   */
-  public static boolean shouldAttachStateToTask(final Object task, final Context context) {
-    if (task == null) {
-      return false;
+    /**
+     * Checks if given task should get state attached.
+     *
+     * @param task task object
+     * @param context active context
+     * @return true iff given task object should be wrapped
+     */
+    public static boolean shouldAttachStateToTask(final Object task, final Context context) {
+        if (task == null) {
+            return false;
+        }
+        if (ExcludeFilter.exclude(ExcludeType.EXECUTOR, task)) {
+            return false;
+        }
+        return shouldCapture(context);
     }
-    if (ExcludeFilter.exclude(ExcludeType.EXECUTOR, task)) {
-      return false;
-    }
-    return shouldCapture(context);
-  }
 
-  /**
-   * Create task state given current context.
-   *
-   * @param contextStore context storage
-   * @param task task instance
-   * @param context current context
-   * @param <T> task class type
-   * @return new state
-   */
-  public static <T> State setupState(
-      final ContextStore<T, State> contextStore, final T task, final Context context) {
-    final State state = contextStore.getOrCreate(task, State.FACTORY);
-    if (!state.captureAndSetContinuation(context)) {
-      log.debug(
-          "continuation was already set for {} in context {}, no continuation captured.",
-          task,
-          context);
+    /**
+     * Create task state given current context.
+     *
+     * @param contextStore context storage
+     * @param task task instance
+     * @param context current context
+     * @param <T> task class type
+     * @return new state
+     */
+    public static <T> State setupState(final ContextStore<T, State> contextStore, final T task, final Context context) {
+        final State state = contextStore.getOrCreate(task, State.FACTORY);
+        if (!state.captureAndSetContinuation(context)) {
+            log.debug("continuation was already set for {} in context {}, no continuation captured.", task, context);
+        }
+        return state;
     }
-    return state;
-  }
 
-  /**
-   * Clean up after job submission method has exited.
-   *
-   * @param state task instrumentation state
-   * @param throwable throwable that may have been thrown
-   */
-  public static void cleanUpOnMethodExit(final State state, final Throwable throwable) {
-    if (null != state && null != throwable) {
-      /*
-      Note: this may potentially close somebody else's continuation if we didn't set it
-      up in setupState because it was already present before us. This should be safe but
-      may lead to non-attributed async work in some very rare cases.
-      Alternative is to not close continuation here if we did not set it up in setupState
-      but this may potentially lead to memory leaks if callers do not properly handle
-      exceptions.
-       */
-      state.closeContinuation();
+    /**
+     * Clean up after job submission method has exited.
+     *
+     * @param state task instrumentation state
+     * @param throwable throwable that may have been thrown
+     */
+    public static void cleanUpOnMethodExit(final State state, final Throwable throwable) {
+        if (null != state && null != throwable) {
+            /*
+            Note: this may potentially close somebody else's continuation if we didn't set it
+            up in setupState because it was already present before us. This should be safe but
+            may lead to non-attributed async work in some very rare cases.
+            Alternative is to not close continuation here if we did not set it up in setupState
+            but this may potentially lead to memory leaks if callers do not properly handle
+            exceptions.
+             */
+            state.closeContinuation();
+        }
     }
-  }
 
-  private ExecutorInstrumentationUtils() {}
+    private ExecutorInstrumentationUtils() {}
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/NewTaskForPlaceholder.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/NewTaskForPlaceholder.java
index a856372b51b..c53c8180249 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/NewTaskForPlaceholder.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/NewTaskForPlaceholder.java
@@ -6,10 +6,8 @@
 
 /** Advice placeholder representing a call to {@link AbstractExecutorService#newTaskFor}. */
 public final class NewTaskForPlaceholder {
-  // arguments chosen to match the real non-static call, except the first is the executor itself
-  public static <T> RunnableFuture<T> newTaskFor(
-      final Executor executor, final Runnable task, final T value) {
-    throw new RuntimeException(
-        "Calls to this method will be rewritten by NewTaskForRewritingVisitor");
-  }
+    // arguments chosen to match the real non-static call, except the first is the executor itself
+    public static <T> RunnableFuture<T> newTaskFor(final Executor executor, final Runnable task, final T value) {
+        throw new RuntimeException("Calls to this method will be rewritten by NewTaskForRewritingVisitor");
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/QueueTimerHelper.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/QueueTimerHelper.java
index 06eb51c50a1..8841f5ec5d9 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/QueueTimerHelper.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/QueueTimerHelper.java
@@ -15,57 +15,55 @@
 
 public class QueueTimerHelper {
 
-  private static final class RateLimiterHolder {
-    // indirection to prevent needing to instantiate the class and its transitive dependencies
-    // in graal native image
-    private static final PerRecordingRateLimiter RATE_LIMITER =
-        new PerRecordingRateLimiter(
-            Duration.of(500, ChronoUnit.MILLIS),
-            10_000, // hard limit on queue events
-            Duration.ofSeconds(
-                ConfigProvider.getInstance()
-                    .getInteger(
-                        ProfilingConfig.PROFILING_UPLOAD_PERIOD,
-                        ProfilingConfig.PROFILING_UPLOAD_PERIOD_DEFAULT)));
-  }
-
-  /** Whether queue timing can safely start. */
-  public static boolean isReady() {
-    // Queue timing is unsupported in native images. JFR must initialise the TSC frequency first.
-    return !Platform.isNativeImage() && InstrumentationBasedProfiling.isJFRReady();
-  }
+    private static final class RateLimiterHolder {
+        // indirection to prevent needing to instantiate the class and its transitive dependencies
+        // in graal native image
+        private static final PerRecordingRateLimiter RATE_LIMITER = new PerRecordingRateLimiter(
+                Duration.of(500, ChronoUnit.MILLIS),
+                10_000, // hard limit on queue events
+                Duration.ofSeconds(ConfigProvider.getInstance()
+                        .getInteger(
+                                ProfilingConfig.PROFILING_UPLOAD_PERIOD,
+                                ProfilingConfig.PROFILING_UPLOAD_PERIOD_DEFAULT)));
+    }
 
-  public static <T> void startQueuingTimer(
-      ContextStore<T, State> taskContextStore,
-      Class<?> schedulerClass,
-      Class<?> queueClass,
-      int queueLength,
-      T task) {
-    State state = taskContextStore.get(task);
-    startQueuingTimer(state, schedulerClass, queueClass, queueLength, task);
-  }
+    /** Whether queue timing can safely start. */
+    public static boolean isReady() {
+        // Queue timing is unsupported in native images. JFR must initialise the TSC frequency first.
+        return !Platform.isNativeImage() && InstrumentationBasedProfiling.isJFRReady();
+    }
 
-  public static void startQueuingTimer(
-      State state, Class<?> schedulerClass, Class<?> queueClass, int queueLength, Object task) {
-    // TODO consider queue length based sampling here to reduce overhead
-    if (task != null && state != null && isReady()) {
-      QueueTiming timing =
-          (QueueTiming) AgentTracer.get().getProfilingContext().start(Timer.TimerType.QUEUEING);
-      timing.setTask(task);
-      timing.setScheduler(schedulerClass);
-      timing.setQueue(queueClass);
-      timing.setQueueLength(queueLength);
-      state.setTiming(timing);
+    public static <T> void startQueuingTimer(
+            ContextStore<T, State> taskContextStore,
+            Class<?> schedulerClass,
+            Class<?> queueClass,
+            int queueLength,
+            T task) {
+        State state = taskContextStore.get(task);
+        startQueuingTimer(state, schedulerClass, queueClass, queueLength, task);
     }
-  }
 
-  public static void stopQueuingTimer(Timing timing) {
-    if (Platform.isNativeImage()) {
-      // explicitly not supported for Graal native image
-      return;
+    public static void startQueuingTimer(
+            State state, Class<?> schedulerClass, Class<?> queueClass, int queueLength, Object task) {
+        // TODO consider queue length based sampling here to reduce overhead
+        if (task != null && state != null && isReady()) {
+            QueueTiming timing =
+                    (QueueTiming) AgentTracer.get().getProfilingContext().start(Timer.TimerType.QUEUEING);
+            timing.setTask(task);
+            timing.setScheduler(schedulerClass);
+            timing.setQueue(queueClass);
+            timing.setQueueLength(queueLength);
+            state.setTiming(timing);
+        }
     }
-    if (timing != null && timing.sample() && RateLimiterHolder.RATE_LIMITER.permit()) {
-      timing.report();
+
+    public static void stopQueuingTimer(Timing timing) {
+        if (Platform.isNativeImage()) {
+            // explicitly not supported for Graal native image
+            return;
+        }
+        if (timing != null && timing.sample() && RateLimiterHolder.RATE_LIMITER.permit()) {
+            timing.report();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/RunnableWrapper.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/RunnableWrapper.java
index 5d32250ae4c..b1443436166 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/RunnableWrapper.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/RunnableWrapper.java
@@ -13,26 +13,26 @@
  */
 public final class RunnableWrapper implements Runnable {
 
-  private final Runnable runnable;
+    private final Runnable runnable;
 
-  public RunnableWrapper(final Runnable runnable) {
-    this.runnable = runnable;
-  }
+    public RunnableWrapper(final Runnable runnable) {
+        this.runnable = runnable;
+    }
 
-  @Override
-  public void run() {
-    runnable.run();
-  }
+    @Override
+    public void run() {
+        runnable.run();
+    }
 
-  public static Runnable wrapIfNeeded(final Runnable task) {
-    if (!(task instanceof RunnableWrapper) && !ExcludeFilter.exclude(ExcludeType.RUNNABLE, task)) {
-      // We wrap only lambdas' anonymous classes and if given object has not already been wrapped.
-      // Anonymous classes have '/' in class name which is not allowed in 'normal' classes.
-      final String className = task.getClass().getName();
-      if (className.indexOf('/', className.lastIndexOf('.')) > 0) {
-        return new RunnableWrapper(task);
-      }
+    public static Runnable wrapIfNeeded(final Runnable task) {
+        if (!(task instanceof RunnableWrapper) && !ExcludeFilter.exclude(ExcludeType.RUNNABLE, task)) {
+            // We wrap only lambdas' anonymous classes and if given object has not already been wrapped.
+            // Anonymous classes have '/' in class name which is not allowed in 'normal' classes.
+            final String className = task.getClass().getName();
+            if (className.indexOf('/', className.lastIndexOf('.')) > 0) {
+                return new RunnableWrapper(task);
+            }
+        }
+        return task;
     }
-    return task;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/State.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/State.java
index 48cfe9078de..fc5c9953011 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/State.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/State.java
@@ -11,83 +11,82 @@
 
 public final class State {
 
-  public static ContextStore.Factory<State> FACTORY = State::new;
+    public static ContextStore.Factory<State> FACTORY = State::new;
 
-  private static final AtomicReferenceFieldUpdater<State, ContextContinuation> CONTINUATION =
-      AtomicReferenceFieldUpdater.newUpdater(
-          State.class, ContextContinuation.class, "continuation");
+    private static final AtomicReferenceFieldUpdater<State, ContextContinuation> CONTINUATION =
+            AtomicReferenceFieldUpdater.newUpdater(State.class, ContextContinuation.class, "continuation");
 
-  private volatile ContextContinuation continuation = null;
+    private volatile ContextContinuation continuation = null;
 
-  private static final AtomicReferenceFieldUpdater<State, Timing> TIMING =
-      AtomicReferenceFieldUpdater.newUpdater(State.class, Timing.class, "timing");
+    private static final AtomicReferenceFieldUpdater<State, Timing> TIMING =
+            AtomicReferenceFieldUpdater.newUpdater(State.class, Timing.class, "timing");
 
-  private volatile Timing timing = null;
+    private volatile Timing timing = null;
 
-  private State() {}
+    private State() {}
 
-  public boolean captureAndSetContinuation(final Context context) {
-    if (CONTINUATION.compareAndSet(this, null, CLAIMED)) {
-      // it's a real pain to do this twice, and this can actually
-      // happen systematically - WITHOUT RACES - because of broken
-      // instrumentation, e.g. SetExecuteRunnableStateAdvice
-      // "double instruments" calls to ScheduledExecutorService.submit/schedule
-      //
-      // lazy write is guaranteed to be seen by getAndSet
-      CONTINUATION.lazySet(this, context.capture());
-      return true;
+    public boolean captureAndSetContinuation(final Context context) {
+        if (CONTINUATION.compareAndSet(this, null, CLAIMED)) {
+            // it's a real pain to do this twice, and this can actually
+            // happen systematically - WITHOUT RACES - because of broken
+            // instrumentation, e.g. SetExecuteRunnableStateAdvice
+            // "double instruments" calls to ScheduledExecutorService.submit/schedule
+            //
+            // lazy write is guaranteed to be seen by getAndSet
+            CONTINUATION.lazySet(this, context.capture());
+            return true;
+        }
+        return false;
     }
-    return false;
-  }
-
-  public boolean setOrCancelContinuation(final ContextContinuation continuation) {
-    if (CONTINUATION.compareAndSet(this, null, CLAIMED)) {
-      // lazy write is guaranteed to be seen by getAndSet
-      CONTINUATION.lazySet(this, continuation);
-      return true;
-    } else {
-      continuation.release();
-      return false;
+
+    public boolean setOrCancelContinuation(final ContextContinuation continuation) {
+        if (CONTINUATION.compareAndSet(this, null, CLAIMED)) {
+            // lazy write is guaranteed to be seen by getAndSet
+            CONTINUATION.lazySet(this, continuation);
+            return true;
+        } else {
+            continuation.release();
+            return false;
+        }
+    }
+
+    public void closeContinuation() {
+        ContextContinuation continuation = getAndResetContinuation();
+        if (null != continuation) {
+            continuation.release();
+        }
     }
-  }
 
-  public void closeContinuation() {
-    ContextContinuation continuation = getAndResetContinuation();
-    if (null != continuation) {
-      continuation.release();
+    public Context getContext() {
+        ContextContinuation continuation = CONTINUATION.get(this);
+        if (null == continuation || CLAIMED == continuation) {
+            return Context.root();
+        }
+        return continuation.context();
     }
-  }
 
-  public Context getContext() {
-    ContextContinuation continuation = CONTINUATION.get(this);
-    if (null == continuation || CLAIMED == continuation) {
-      return Context.root();
+    @Nullable
+    public ContextContinuation getAndResetContinuation() {
+        ContextContinuation continuation = CONTINUATION.get(this);
+        if (null == continuation || CLAIMED == continuation) {
+            return null;
+        }
+        CONTINUATION.compareAndSet(this, continuation, null);
+        return continuation;
     }
-    return continuation.context();
-  }
-
-  @Nullable
-  public ContextContinuation getAndResetContinuation() {
-    ContextContinuation continuation = CONTINUATION.get(this);
-    if (null == continuation || CLAIMED == continuation) {
-      return null;
+
+    public void setTiming(Timing timing) {
+        TIMING.lazySet(this, timing);
     }
-    CONTINUATION.compareAndSet(this, continuation, null);
-    return continuation;
-  }
-
-  public void setTiming(Timing timing) {
-    TIMING.lazySet(this, timing);
-  }
-
-  public boolean isTimed() {
-    return TIMING.get(this) != null;
-  }
-
-  public void stopTiming() {
-    Timing timing = TIMING.getAndSet(this, null);
-    if (timing != null) {
-      QueueTimerHelper.stopQueuingTimer(timing);
+
+    public boolean isTimed() {
+        return TIMING.get(this) != null;
+    }
+
+    public void stopTiming() {
+        Timing timing = TIMING.getAndSet(this, null);
+        if (timing != null) {
+            QueueTimerHelper.stopQueuingTimer(timing);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/TPEHelper.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/TPEHelper.java
index e95a6580849..0d8bb46bc34 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/TPEHelper.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/TPEHelper.java
@@ -19,97 +19,93 @@
  * in the ThreadPoolExecutorInstrumentation.
  */
 public final class TPEHelper {
-  // If legacy is enabled, we will try to propagate via wrapping, if not we will try to propagate
-  // via storing the state in the existing field in the Runnable
-  private static final boolean useWrapping;
-  // A ThreadPoolExecutor with one of these types will newer be propagated/wrapped
-  private static final Set<String> excludedClasses;
-  // A ThreadLocal to store the Scope between beforeExecute and afterExecute if wrapping is not used
-  private static final ThreadLocal<ContextScope> threadLocalScope;
+    // If legacy is enabled, we will try to propagate via wrapping, if not we will try to propagate
+    // via storing the state in the existing field in the Runnable
+    private static final boolean useWrapping;
+    // A ThreadPoolExecutor with one of these types will newer be propagated/wrapped
+    private static final Set<String> excludedClasses;
+    // A ThreadLocal to store the Scope between beforeExecute and afterExecute if wrapping is not used
+    private static final ThreadLocal<ContextScope> threadLocalScope;
 
-  private static final ClassValue<Boolean> WRAP =
-      GenericClassValue.of(
-          input -> {
-            String className = input.getName();
-            // We should always wrap anonymous lambda classes since we can't inject fields into
-            // them, and they can never be anything more than a _pure_ Runnable. They have '/' in
-            // their class name which is not allowed in 'normal' classes.
-            return className.indexOf('/', className.lastIndexOf('.')) > 0;
-          });
+    private static final ClassValue<Boolean> WRAP = GenericClassValue.of(input -> {
+        String className = input.getName();
+        // We should always wrap anonymous lambda classes since we can't inject fields into
+        // them, and they can never be anything more than a _pure_ Runnable. They have '/' in
+        // their class name which is not allowed in 'normal' classes.
+        return className.indexOf('/', className.lastIndexOf('.')) > 0;
+    });
 
-  static {
-    InstrumenterConfig config = InstrumenterConfig.get();
-    useWrapping = config.isLegacyInstrumentationEnabled(false, "trace.thread-pool-executors");
-    excludedClasses = config.getTraceThreadPoolExecutorsExclude();
-    if (useWrapping) {
-      threadLocalScope = null;
-    } else {
-      threadLocalScope = new ThreadLocal<>();
+    static {
+        InstrumenterConfig config = InstrumenterConfig.get();
+        useWrapping = config.isLegacyInstrumentationEnabled(false, "trace.thread-pool-executors");
+        excludedClasses = config.getTraceThreadPoolExecutorsExclude();
+        if (useWrapping) {
+            threadLocalScope = null;
+        } else {
+            threadLocalScope = new ThreadLocal<>();
+        }
     }
-  }
 
-  public static boolean useWrapping(Runnable task) {
-    return useWrapping || task instanceof Wrapper || (task != null && WRAP.get(task.getClass()));
-  }
-
-  private static final ClassValue<Boolean> PROPAGATE =
-      GenericClassValue.of(input -> !excludedClasses.contains(input.getName()));
+    public static boolean useWrapping(Runnable task) {
+        return useWrapping || task instanceof Wrapper || (task != null && WRAP.get(task.getClass()));
+    }
 
-  public static boolean shouldPropagate(ThreadPoolExecutor executor) {
-    // avoid tracking threads when building native images as it confuses the scanner
-    // (we still want instrumentation applied, so tracking works in the built image)
-    return !Platform.isNativeImageBuilder()
-        && executor != null
-        && PROPAGATE.get(executor.getClass());
-  }
+    private static final ClassValue<Boolean> PROPAGATE =
+            GenericClassValue.of(input -> !excludedClasses.contains(input.getName()));
 
-  public static void capture(ContextStore<Runnable, State> contextStore, Runnable task) {
-    if (task != null && !exclude(RUNNABLE, task)) {
-      AdviceUtils.capture(contextStore, task);
+    public static boolean shouldPropagate(ThreadPoolExecutor executor) {
+        // avoid tracking threads when building native images as it confuses the scanner
+        // (we still want instrumentation applied, so tracking works in the built image)
+        return !Platform.isNativeImageBuilder() && executor != null && PROPAGATE.get(executor.getClass());
     }
-  }
 
-  public static ContextScope startScope(ContextStore<Runnable, State> contextStore, Runnable task) {
-    if (task == null || exclude(RUNNABLE, task)) {
-      return null;
+    public static void capture(ContextStore<Runnable, State> contextStore, Runnable task) {
+        if (task != null && !exclude(RUNNABLE, task)) {
+            AdviceUtils.capture(contextStore, task);
+        }
     }
-    return AdviceUtils.startTaskScope(contextStore, task);
-  }
 
-  public static void setThreadLocalScope(ContextScope scope, Runnable task) {
-    if (scope == null || task == null || exclude(RUNNABLE, task)) {
-      return;
+    public static ContextScope startScope(ContextStore<Runnable, State> contextStore, Runnable task) {
+        if (task == null || exclude(RUNNABLE, task)) {
+            return null;
+        }
+        return AdviceUtils.startTaskScope(contextStore, task);
     }
-    ContextScope current = threadLocalScope.get();
-    if (current != null) {
-      current.close();
+
+    public static void setThreadLocalScope(ContextScope scope, Runnable task) {
+        if (scope == null || task == null || exclude(RUNNABLE, task)) {
+            return;
+        }
+        ContextScope current = threadLocalScope.get();
+        if (current != null) {
+            current.close();
+        }
+        threadLocalScope.set(scope);
     }
-    threadLocalScope.set(scope);
-  }
 
-  public static ContextScope getAndClearThreadLocalScope(Runnable task) {
-    if (task == null || exclude(RUNNABLE, task)) {
-      return null;
+    public static ContextScope getAndClearThreadLocalScope(Runnable task) {
+        if (task == null || exclude(RUNNABLE, task)) {
+            return null;
+        }
+        ContextScope scope = threadLocalScope.get();
+        // Intentionally use `.set(null)` instead of `.remove()` for performance reasons.
+        // For details see: https://github.com/DataDog/dd-trace-java/pull/9856#discussion_r2527729963
+        // noinspection ThreadLocalSetWithNull
+        threadLocalScope.set(null);
+        return scope;
     }
-    ContextScope scope = threadLocalScope.get();
-    // Intentionally use `.set(null)` instead of `.remove()` for performance reasons.
-    // For details see: https://github.com/DataDog/dd-trace-java/pull/9856#discussion_r2527729963
-    // noinspection ThreadLocalSetWithNull
-    threadLocalScope.set(null);
-    return scope;
-  }
 
-  public static void endScope(ContextScope scope, Runnable task) {
-    if (task == null || exclude(RUNNABLE, task)) {
-      return;
+    public static void endScope(ContextScope scope, Runnable task) {
+        if (task == null || exclude(RUNNABLE, task)) {
+            return;
+        }
+        AdviceUtils.endTaskScope(scope);
     }
-    AdviceUtils.endTaskScope(scope);
-  }
 
-  public static void cancelTask(ContextStore<Runnable, State> contextStore, Runnable task) {
-    if (task == null || exclude(RUNNABLE, task)) {
-      return;
+    public static void cancelTask(ContextStore<Runnable, State> contextStore, Runnable task) {
+        if (task == null || exclude(RUNNABLE, task)) {
+            return;
+        }
+        AdviceUtils.cancelTask(contextStore, task);
     }
-    AdviceUtils.cancelTask(contextStore, task);
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/Wrapper.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/Wrapper.java
index 8f91a262a93..baa32c7a2c6 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/Wrapper.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/Wrapper.java
@@ -10,63 +10,60 @@
 
 public class Wrapper<T extends Runnable> implements Runnable, AutoCloseable {
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  public static <T extends Runnable> Runnable wrap(T task) {
-    if (task instanceof Wrapper
-        || task instanceof RunnableFuture
-        || task == null
-        || exclude(RUNNABLE, task)) {
-      return task;
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public static <T extends Runnable> Runnable wrap(T task) {
+        if (task instanceof Wrapper || task instanceof RunnableFuture || task == null || exclude(RUNNABLE, task)) {
+            return task;
+        }
+        ContextContinuation continuation = Context.current().capture();
+        if (continuation.context() != Context.root()) {
+            if (task instanceof Comparable) {
+                return new ComparableRunnable(task, continuation);
+            }
+            return new Wrapper<>(task, continuation);
+        }
+        // don't wrap unless there is scope to propagate
+        return task;
     }
-    ContextContinuation continuation = Context.current().capture();
-    if (continuation.context() != Context.root()) {
-      if (task instanceof Comparable) {
-        return new ComparableRunnable(task, continuation);
-      }
-      return new Wrapper<>(task, continuation);
-    }
-    // don't wrap unless there is scope to propagate
-    return task;
-  }
 
-  public static Runnable unwrap(Runnable task) {
-    return task instanceof Wrapper ? ((Wrapper<?>) task).unwrap() : task;
-  }
+    public static Runnable unwrap(Runnable task) {
+        return task instanceof Wrapper ? ((Wrapper<?>) task).unwrap() : task;
+    }
 
-  protected final T delegate;
-  private final ContextContinuation continuation;
+    protected final T delegate;
+    private final ContextContinuation continuation;
 
-  public Wrapper(T delegate, ContextContinuation continuation) {
-    this.delegate = delegate;
-    this.continuation = continuation;
-  }
+    public Wrapper(T delegate, ContextContinuation continuation) {
+        this.delegate = delegate;
+        this.continuation = continuation;
+    }
 
-  @Override
-  public void run() {
-    try (ContextScope scope = activate()) {
-      delegate.run();
+    @Override
+    public void run() {
+        try (ContextScope scope = activate()) {
+            delegate.run();
+        }
     }
-  }
 
-  public void cancel() {
-    if (null != continuation) {
-      continuation.release();
+    public void cancel() {
+        if (null != continuation) {
+            continuation.release();
+        }
     }
-  }
 
-  public T unwrap() {
-    return delegate;
-  }
+    public T unwrap() {
+        return delegate;
+    }
 
-  private ContextScope activate() {
-    return null == continuation ? null : continuation.resume();
-  }
+    private ContextScope activate() {
+        return null == continuation ? null : continuation.resume();
+    }
 
-  @Override
-  public void close() throws Exception {
-    cancel();
-    if (delegate instanceof AutoCloseable) {
-      ((AutoCloseable) delegate).close();
+    @Override
+    public void close() throws Exception {
+        cancel();
+        if (delegate instanceof AutoCloseable) {
+            ((AutoCloseable) delegate).close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/lang/VirtualThreadHelper.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/lang/VirtualThreadHelper.java
index 69aa0dc8943..9ef8bcb15e9 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/lang/VirtualThreadHelper.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/lang/VirtualThreadHelper.java
@@ -2,12 +2,12 @@
 
 /** This class is a helper for the java-lang-21.0 {@code VirtualThreadInstrumentation}. */
 public final class VirtualThreadHelper {
-  public static final String VIRTUAL_THREAD_CLASS_NAME = "java.lang.VirtualThread";
+    public static final String VIRTUAL_THREAD_CLASS_NAME = "java.lang.VirtualThread";
 
-  /**
-   * {@link VirtualThreadState} class name as string literal. This is mandatory for {@link
-   * datadog.trace.bootstrap.ContextStore} API call.
-   */
-  public static final String VIRTUAL_THREAD_STATE_CLASS_NAME =
-      "datadog.trace.bootstrap.instrumentation.java.lang.VirtualThreadState";
+    /**
+     * {@link VirtualThreadState} class name as string literal. This is mandatory for {@link
+     * datadog.trace.bootstrap.ContextStore} API call.
+     */
+    public static final String VIRTUAL_THREAD_STATE_CLASS_NAME =
+            "datadog.trace.bootstrap.instrumentation.java.lang.VirtualThreadState";
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/lang/VirtualThreadState.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/lang/VirtualThreadState.java
index 597595496ab..d5adc3b9001 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/lang/VirtualThreadState.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/lang/VirtualThreadState.java
@@ -31,78 +31,77 @@
  * context listener, so we simply swap in on mount and out on unmount.
  */
 public final class VirtualThreadState {
-  // CWS observes scope changes through listeners, so retain context swaps on mount and unmount.
-  private static final boolean USE_PER_MOUNT_CONTEXT =
-      isJavaVersion(21)
-          || !InstrumenterConfig.get().isLegacyContextManagerEnabled()
-          || Config.get().isCwsEnabled();
+    // CWS observes scope changes through listeners, so retain context swaps on mount and unmount.
+    private static final boolean USE_PER_MOUNT_CONTEXT = isJavaVersion(21)
+            || !InstrumenterConfig.get().isLegacyContextManagerEnabled()
+            || Config.get().isCwsEnabled();
 
-  /** The virtual thread's saved context (scope stack snapshot). */
-  private Context context;
+    /** The virtual thread's saved context (scope stack snapshot). */
+    private Context context;
 
-  /** Prevents the enclosing context scope from completing before the virtual thread finishes. */
-  private final ContextContinuation continuation;
+    /** Prevents the enclosing context scope from completing before the virtual thread finishes. */
+    private final ContextContinuation continuation;
 
-  /** The carrier thread's saved context, set between mount and unmount. */
-  private Context previousContext;
+    /** The carrier thread's saved context, set between mount and unmount. */
+    private Context previousContext;
 
-  public VirtualThreadState(Context context, ContextContinuation continuation) {
-    this.context = context;
-    this.continuation = continuation;
-  }
+    public VirtualThreadState(Context context, ContextContinuation continuation) {
+        this.context = context;
+        this.continuation = continuation;
+    }
 
-  /** Whether context propagation must retain the state-backed mount/unmount path. */
-  public static boolean usePerMountContext() {
-    return USE_PER_MOUNT_CONTEXT;
-  }
+    /** Whether context propagation must retain the state-backed mount/unmount path. */
+    public static boolean usePerMountContext() {
+        return USE_PER_MOUNT_CONTEXT;
+    }
 
-  /** Seeds context before the JDK invokes the virtual thread's task on JDK 22 and later. */
-  public void onRun() {
-    previousContext = context.swap();
-    context = null;
-  }
+    /** Seeds context before the JDK invokes the virtual thread's task on JDK 22 and later. */
+    public void onRun() {
+        previousContext = context.swap();
+        context = null;
+    }
 
-  /** Restores the preceding context after the virtual thread's task exits. */
-  public void afterRun() {
-    if (previousContext != null) {
-      previousContext.swap();
-      previousContext = null;
+    /** Restores the preceding context after the virtual thread's task exits. */
+    public void afterRun() {
+        if (previousContext != null) {
+            previousContext.swap();
+            previousContext = null;
+        }
     }
-  }
 
-  /** Rebinds carrier-local profiler state after the virtual thread mounts. */
-  public static void onMountWithoutStore() {
-    ProfilingContextIntegration profilingContext = AgentTracer.get().getProfilingContext();
-    if (profilingContext.isThreadContextBindingRequired()) {
-      profilingContext.setContext(Context.current());
+    /** Rebinds carrier-local profiler state after the virtual thread mounts. */
+    public static void onMountWithoutStore() {
+        ProfilingContextIntegration profilingContext = AgentTracer.get().getProfilingContext();
+        if (profilingContext.isThreadContextBindingRequired()) {
+            profilingContext.setContext(Context.current());
+        }
     }
-  }
 
-  /** Clears carrier-local profiler state before the virtual thread unmounts. */
-  public static void onUnmountWithoutStore() {
-    ProfilingContextIntegration profilingContext = AgentTracer.get().getProfilingContext();
-    if (profilingContext.isThreadContextBindingRequired()) {
-      profilingContext.setContext(Context.root());
+    /** Clears carrier-local profiler state before the virtual thread unmounts. */
+    public static void onUnmountWithoutStore() {
+        ProfilingContextIntegration profilingContext = AgentTracer.get().getProfilingContext();
+        if (profilingContext.isThreadContextBindingRequired()) {
+            profilingContext.setContext(Context.root());
+        }
     }
-  }
 
-  /** Activates the virtual thread's context after it mounts on the state-backed path. */
-  public void onMount() {
-    previousContext = context.swap();
-  }
+    /** Activates the virtual thread's context after it mounts on the state-backed path. */
+    public void onMount() {
+        previousContext = context.swap();
+    }
 
-  /** Restores the preceding context before the virtual thread unmounts. */
-  public void onUnmount() {
-    if (previousContext != null) {
-      context = previousContext.swap();
-      previousContext = null;
+    /** Restores the preceding context before the virtual thread unmounts. */
+    public void onUnmount() {
+        if (previousContext != null) {
+            context = previousContext.swap();
+            previousContext = null;
+        }
     }
-  }
 
-  /** Releases the retained continuation as virtual-thread termination begins. */
-  public void onTerminate() {
-    if (this.continuation != null) {
-      this.continuation.release();
+    /** Releases the retained continuation as virtual-thread termination begins. */
+    public void onTerminate() {
+        if (this.continuation != null) {
+            this.continuation.release();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/module/JpmsHelper.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/module/JpmsHelper.java
index 1954b51637f..9682446367a 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/module/JpmsHelper.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/module/JpmsHelper.java
@@ -13,48 +13,47 @@
 
 @NotThreadSafe
 public final class JpmsHelper {
-  private JpmsHelper() {}
+    private JpmsHelper() {}
 
-  private static final Set<String> TRIGGERS = new HashSet<>();
+    private static final Set<String> TRIGGERS = new HashSet<>();
 
-  private static final Set<String> TRIGGERS_VIEW = unmodifiableSet(TRIGGERS);
+    private static final Set<String> TRIGGERS_VIEW = unmodifiableSet(TRIGGERS);
 
-  private static final ClassValue<AtomicBoolean> HAS_FIRED =
-      GenericClassValue.constructing(AtomicBoolean.class);
+    private static final ClassValue<AtomicBoolean> HAS_FIRED = GenericClassValue.constructing(AtomicBoolean.class);
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(JpmsHelper.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JpmsHelper.class);
 
-  /**
-   * Registers trigger class names whose constructors will open their enclosing module. Must be
-   * called at agent startup before instrumentation is applied; not thread-safe.
-   */
-  public static void addTriggers(Collection<String> classes) {
-    if (classes == null) {
-      return;
+    /**
+     * Registers trigger class names whose constructors will open their enclosing module. Must be
+     * called at agent startup before instrumentation is applied; not thread-safe.
+     */
+    public static void addTriggers(Collection<String> classes) {
+        if (classes == null) {
+            return;
+        }
+        TRIGGERS.addAll(classes);
+    }
+
+    /** Returns an unmodifiable view of all registered trigger class names. */
+    public static Set<String> getAllTriggers() {
+        return TRIGGERS_VIEW;
+    }
+
+    /**
+     * Returns {@code true} and atomically marks {@code cls} as opened the first time this is called
+     * for a given class; returns {@code false} on all subsequent calls for the same class.
+     */
+    public static boolean shouldBeOpened(Class<?> cls) {
+        return HAS_FIRED.get(cls).compareAndSet(false, true);
+    }
+
+    /** Called from inlined ByteBuddy advice; logs when module opening fails. */
+    public static void logFailedToOpen(String pkg, Throwable t) {
+        LOGGER.debug("Unable to open package {} to the agent module or unnamed module", pkg, t);
+    }
+
+    /** Called from inlined ByteBuddy advice; logs when a class has no named module. */
+    public static void logNoNamedModule(Class<?> cls) {
+        LOGGER.debug("{} has no named module; skipping module open", cls);
     }
-    TRIGGERS.addAll(classes);
-  }
-
-  /** Returns an unmodifiable view of all registered trigger class names. */
-  public static Set<String> getAllTriggers() {
-    return TRIGGERS_VIEW;
-  }
-
-  /**
-   * Returns {@code true} and atomically marks {@code cls} as opened the first time this is called
-   * for a given class; returns {@code false} on all subsequent calls for the same class.
-   */
-  public static boolean shouldBeOpened(Class<?> cls) {
-    return HAS_FIRED.get(cls).compareAndSet(false, true);
-  }
-
-  /** Called from inlined ByteBuddy advice; logs when module opening fails. */
-  public static void logFailedToOpen(String pkg, Throwable t) {
-    LOGGER.debug("Unable to open package {} to the agent module or unnamed module", pkg, t);
-  }
-
-  /** Called from inlined ByteBuddy advice; logs when a class has no named module. */
-  public static void logNoNamedModule(Class<?> cls) {
-    LOGGER.debug("{} has no named module; skipping module open", cls);
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/net/HostNameResolver.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/net/HostNameResolver.java
index 6ac51e70e9c..eb8867afc01 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/net/HostNameResolver.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/net/HostNameResolver.java
@@ -7,67 +7,66 @@
 import java.net.InetAddress;
 
 public final class HostNameResolver {
-  private static final MethodHandle HOLDER_GET;
-  private static final MethodHandle HOSTNAME_GET;
+    private static final MethodHandle HOLDER_GET;
+    private static final MethodHandle HOSTNAME_GET;
 
-  private static final DDCache<String, String> HOSTNAME_CACHE = DDCaches.newFixedSizeCache(64);
+    private static final DDCache<String, String> HOSTNAME_CACHE = DDCaches.newFixedSizeCache(64);
 
-  static {
-    MethodHandle holderTmp = null, hostnameTmp = null;
-    try {
-      final ClassLoader cl = HostNameResolver.class.getClassLoader();
-      final MethodHandles methodHandles = new MethodHandles(cl);
-      // forces the JPMS opener for this class to get executed. More efficient than getLocalHost
-      InetAddress.getLoopbackAddress();
+    static {
+        MethodHandle holderTmp = null, hostnameTmp = null;
+        try {
+            final ClassLoader cl = HostNameResolver.class.getClassLoader();
+            final MethodHandles methodHandles = new MethodHandles(cl);
+            // forces the JPMS opener for this class to get executed. More efficient than getLocalHost
+            InetAddress.getLoopbackAddress();
 
-      final Class<?> holderClass =
-          Class.forName("java.net.InetAddress$InetAddressHolder", false, cl);
-      holderTmp = methodHandles.method(InetAddress.class, "holder");
-      if (holderTmp != null) {
-        hostnameTmp = methodHandles.method(holderClass, "getHostName");
-      }
-    } catch (Throwable ignored) {
-      holderTmp = null;
-    } finally {
-      if (holderTmp != null && hostnameTmp != null) {
-        HOLDER_GET = holderTmp;
-        HOSTNAME_GET = hostnameTmp;
-      } else {
-        HOLDER_GET = null;
-        HOSTNAME_GET = null;
-      }
+            final Class<?> holderClass = Class.forName("java.net.InetAddress$InetAddressHolder", false, cl);
+            holderTmp = methodHandles.method(InetAddress.class, "holder");
+            if (holderTmp != null) {
+                hostnameTmp = methodHandles.method(holderClass, "getHostName");
+            }
+        } catch (Throwable ignored) {
+            holderTmp = null;
+        } finally {
+            if (holderTmp != null && hostnameTmp != null) {
+                HOLDER_GET = holderTmp;
+                HOSTNAME_GET = hostnameTmp;
+            } else {
+                HOLDER_GET = null;
+                HOSTNAME_GET = null;
+            }
+        }
     }
-  }
 
-  private HostNameResolver() {}
+    private HostNameResolver() {}
 
-  static String getAlreadyResolvedHostName(InetAddress address) {
-    if (HOLDER_GET == null) {
-      return null;
+    static String getAlreadyResolvedHostName(InetAddress address) {
+        if (HOLDER_GET == null) {
+            return null;
+        }
+        try {
+            final Object holder = HOLDER_GET.invoke(address);
+            return (String) HOSTNAME_GET.invoke(holder);
+        } catch (final Throwable ignored) {
+        }
+        return null;
     }
-    try {
-      final Object holder = HOLDER_GET.invoke(address);
-      return (String) HOSTNAME_GET.invoke(holder);
-    } catch (final Throwable ignored) {
-    }
-    return null;
-  }
 
-  private static String fromCache(InetAddress remoteAddress, String ip) {
-    if (null != ip) {
-      return HOSTNAME_CACHE.computeIfAbsent(ip, _ip -> remoteAddress.getHostName());
+    private static String fromCache(InetAddress remoteAddress, String ip) {
+        if (null != ip) {
+            return HOSTNAME_CACHE.computeIfAbsent(ip, _ip -> remoteAddress.getHostName());
+        }
+        return remoteAddress.getHostName();
     }
-    return remoteAddress.getHostName();
-  }
 
-  public static String hostName(InetAddress address, String ip) {
-    if (address == null) {
-      return null;
-    }
-    final String alreadyResolved = getAlreadyResolvedHostName(address);
-    if (alreadyResolved != null) {
-      return alreadyResolved;
+    public static String hostName(InetAddress address, String ip) {
+        if (address == null) {
+            return null;
+        }
+        final String alreadyResolved = getAlreadyResolvedHostName(address);
+        if (alreadyResolved != null) {
+            return alreadyResolved;
+        }
+        return fromCache(address, ip);
     }
-    return fromCache(address, ip);
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java
index 17aa109ad1e..f8097afb10f 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java
@@ -4,249 +4,229 @@
 import java.util.Objects;
 
 public final class DBInfo {
-  public static final DBInfo DEFAULT = new Builder().type("database").build();
-
-  private final String type;
-  private final String subtype;
-  private final boolean fullPropagationSupport;
-  private final String url;
-  private final String user;
-  private final String instance;
-  private final String db;
-  private final String host;
-  private final Integer port;
-  private final String warehouse;
-  private final String schema;
-
-  DBInfo(
-      String type,
-      String subtype,
-      boolean fullPropagationSupport,
-      String url,
-      String user,
-      String instance,
-      String db,
-      String host,
-      Integer port,
-      String warehouse,
-      String schema) {
-    this.type = type;
-    this.subtype = subtype;
-    this.fullPropagationSupport = fullPropagationSupport;
-    this.url = url;
-    this.user = user;
-    this.instance = instance;
-    this.db = db;
-    this.host = host;
-    this.port = port;
-    this.warehouse = warehouse;
-    this.schema = schema;
-  }
-
-  public static final class Builder {
-    private String type;
-    private String subtype;
-    // most DBs do support full propagation (inserting trace ID in query comments), so we default to
-    // true. See https://docs.datadoghq.com/database_monitoring/connect_dbm_and_apm
-    private boolean fullPropagationSupport = true;
-    private String url;
-    private String user;
-    private String instance;
-    private String db;
-    private String warehouse;
-    private String schema;
-    private String host;
-    private Integer port;
-
-    Builder() {}
-
-    Builder(
-        String type,
-        String subtype,
-        boolean fullPropagationSupport,
-        String url,
-        String user,
-        String instance,
-        String db,
-        String host,
-        Integer port,
-        String warehouse,
-        String schema) {
-      this.type = type;
-      this.subtype = subtype;
-      this.fullPropagationSupport = fullPropagationSupport;
-      this.url = url;
-      this.user = user;
-      this.instance = instance;
-      this.db = db;
-      this.host = host;
-      this.port = port;
-      this.warehouse = warehouse;
-      this.schema = schema;
-    }
-
-    public Builder type(String type) {
-      this.type = type;
-      return this;
-    }
-
-    public Builder subtype(String subtype) {
-      this.subtype = subtype;
-      return this;
-    }
-
-    public Builder fullPropagationSupport(boolean fullPropagationSupport) {
-      this.fullPropagationSupport = fullPropagationSupport;
-      return this;
-    }
-
-    public Builder url(String url) {
-      this.url = url;
-      return this;
-    }
-
-    public Builder user(String user) {
-      this.user = user;
-      return this;
-    }
-
-    public Builder instance(String instance) {
-      this.instance = instance;
-      return this;
-    }
-
-    public Builder db(String db) {
-      this.db = db;
-      return this;
-    }
-
-    public Builder warehouse(String warehouse) {
-      this.warehouse = warehouse;
-      return this;
-    }
-
-    public Builder schema(String schema) {
-      this.schema = schema;
-      return this;
-    }
-
-    public Builder host(String host) {
-      this.host = host;
-      return this;
-    }
-
-    public Builder port(Integer port) {
-      this.port = port;
-      return this;
-    }
-
-    public DBInfo build() {
-      return new DBInfo(
-          type,
-          subtype,
-          fullPropagationSupport,
-          url,
-          user,
-          instance,
-          db,
-          host,
-          port,
-          warehouse,
-          schema);
-    }
-  }
-
-  public String getType() {
-    return type;
-  }
-
-  public String getSubtype() {
-    return subtype;
-  }
-
-  public boolean getFullPropagationSupport() {
-    return fullPropagationSupport;
-  }
-
-  public String getUrl() {
-    return url;
-  }
-
-  public String getUser() {
-    return user;
-  }
-
-  public String getInstance() {
-    return instance;
-  }
-
-  public String getDb() {
-    return db != null ? db : instance;
-  }
-
-  public String getHost() {
-    return host;
-  }
-
-  public Integer getPort() {
-    return port;
-  }
-
-  public String getWarehouse() {
-    return warehouse;
-  }
-
-  public String getSchema() {
-    return schema;
-  }
-
-  public Builder toBuilder() {
-    return new Builder(
-        type,
-        subtype,
-        fullPropagationSupport,
-        url,
-        user,
-        instance,
-        db,
-        host,
-        port,
-        warehouse,
-        schema);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    DBInfo dbInfo = (DBInfo) o;
-    return Objects.equals(type, dbInfo.type)
-        && Objects.equals(subtype, dbInfo.subtype)
-        && fullPropagationSupport == dbInfo.fullPropagationSupport
-        && Objects.equals(url, dbInfo.url)
-        && Objects.equals(user, dbInfo.user)
-        && Objects.equals(instance, dbInfo.instance)
-        && Objects.equals(db, dbInfo.db)
-        && Objects.equals(host, dbInfo.host)
-        && Objects.equals(port, dbInfo.port)
-        && Objects.equals(warehouse, dbInfo.warehouse)
-        && Objects.equals(schema, dbInfo.schema);
-  }
-
-  @Override
-  public int hashCode() {
-    int hash = 0;
-    hash = HashingUtils.addToHash(hash, type);
-    hash = HashingUtils.addToHash(hash, subtype);
-    hash = HashingUtils.addToHash(hash, fullPropagationSupport);
-    hash = HashingUtils.addToHash(hash, url);
-    hash = HashingUtils.addToHash(hash, user);
-    hash = HashingUtils.addToHash(hash, instance);
-    hash = HashingUtils.addToHash(hash, db);
-    hash = HashingUtils.addToHash(hash, host);
-    hash = HashingUtils.addToHash(hash, port);
-    hash = HashingUtils.addToHash(hash, warehouse);
-    hash = HashingUtils.addToHash(hash, schema);
-    return hash;
-  }
+    public static final DBInfo DEFAULT = new Builder().type("database").build();
+
+    private final String type;
+    private final String subtype;
+    private final boolean fullPropagationSupport;
+    private final String url;
+    private final String user;
+    private final String instance;
+    private final String db;
+    private final String host;
+    private final Integer port;
+    private final String warehouse;
+    private final String schema;
+
+    DBInfo(
+            String type,
+            String subtype,
+            boolean fullPropagationSupport,
+            String url,
+            String user,
+            String instance,
+            String db,
+            String host,
+            Integer port,
+            String warehouse,
+            String schema) {
+        this.type = type;
+        this.subtype = subtype;
+        this.fullPropagationSupport = fullPropagationSupport;
+        this.url = url;
+        this.user = user;
+        this.instance = instance;
+        this.db = db;
+        this.host = host;
+        this.port = port;
+        this.warehouse = warehouse;
+        this.schema = schema;
+    }
+
+    public static final class Builder {
+        private String type;
+        private String subtype;
+        // most DBs do support full propagation (inserting trace ID in query comments), so we default to
+        // true. See https://docs.datadoghq.com/database_monitoring/connect_dbm_and_apm
+        private boolean fullPropagationSupport = true;
+        private String url;
+        private String user;
+        private String instance;
+        private String db;
+        private String warehouse;
+        private String schema;
+        private String host;
+        private Integer port;
+
+        Builder() {}
+
+        Builder(
+                String type,
+                String subtype,
+                boolean fullPropagationSupport,
+                String url,
+                String user,
+                String instance,
+                String db,
+                String host,
+                Integer port,
+                String warehouse,
+                String schema) {
+            this.type = type;
+            this.subtype = subtype;
+            this.fullPropagationSupport = fullPropagationSupport;
+            this.url = url;
+            this.user = user;
+            this.instance = instance;
+            this.db = db;
+            this.host = host;
+            this.port = port;
+            this.warehouse = warehouse;
+            this.schema = schema;
+        }
+
+        public Builder type(String type) {
+            this.type = type;
+            return this;
+        }
+
+        public Builder subtype(String subtype) {
+            this.subtype = subtype;
+            return this;
+        }
+
+        public Builder fullPropagationSupport(boolean fullPropagationSupport) {
+            this.fullPropagationSupport = fullPropagationSupport;
+            return this;
+        }
+
+        public Builder url(String url) {
+            this.url = url;
+            return this;
+        }
+
+        public Builder user(String user) {
+            this.user = user;
+            return this;
+        }
+
+        public Builder instance(String instance) {
+            this.instance = instance;
+            return this;
+        }
+
+        public Builder db(String db) {
+            this.db = db;
+            return this;
+        }
+
+        public Builder warehouse(String warehouse) {
+            this.warehouse = warehouse;
+            return this;
+        }
+
+        public Builder schema(String schema) {
+            this.schema = schema;
+            return this;
+        }
+
+        public Builder host(String host) {
+            this.host = host;
+            return this;
+        }
+
+        public Builder port(Integer port) {
+            this.port = port;
+            return this;
+        }
+
+        public DBInfo build() {
+            return new DBInfo(
+                    type, subtype, fullPropagationSupport, url, user, instance, db, host, port, warehouse, schema);
+        }
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getSubtype() {
+        return subtype;
+    }
+
+    public boolean getFullPropagationSupport() {
+        return fullPropagationSupport;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public String getInstance() {
+        return instance;
+    }
+
+    public String getDb() {
+        return db != null ? db : instance;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public Integer getPort() {
+        return port;
+    }
+
+    public String getWarehouse() {
+        return warehouse;
+    }
+
+    public String getSchema() {
+        return schema;
+    }
+
+    public Builder toBuilder() {
+        return new Builder(
+                type, subtype, fullPropagationSupport, url, user, instance, db, host, port, warehouse, schema);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DBInfo dbInfo = (DBInfo) o;
+        return Objects.equals(type, dbInfo.type)
+                && Objects.equals(subtype, dbInfo.subtype)
+                && fullPropagationSupport == dbInfo.fullPropagationSupport
+                && Objects.equals(url, dbInfo.url)
+                && Objects.equals(user, dbInfo.user)
+                && Objects.equals(instance, dbInfo.instance)
+                && Objects.equals(db, dbInfo.db)
+                && Objects.equals(host, dbInfo.host)
+                && Objects.equals(port, dbInfo.port)
+                && Objects.equals(warehouse, dbInfo.warehouse)
+                && Objects.equals(schema, dbInfo.schema);
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash = HashingUtils.addToHash(hash, type);
+        hash = HashingUtils.addToHash(hash, subtype);
+        hash = HashingUtils.addToHash(hash, fullPropagationSupport);
+        hash = HashingUtils.addToHash(hash, url);
+        hash = HashingUtils.addToHash(hash, user);
+        hash = HashingUtils.addToHash(hash, instance);
+        hash = HashingUtils.addToHash(hash, db);
+        hash = HashingUtils.addToHash(hash, host);
+        hash = HashingUtils.addToHash(hash, port);
+        hash = HashingUtils.addToHash(hash, warehouse);
+        hash = HashingUtils.addToHash(hash, schema);
+        return hash;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBQueryInfo.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBQueryInfo.java
index 71744b60741..eba86d8d3a8 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBQueryInfo.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBQueryInfo.java
@@ -9,86 +9,86 @@
 
 public final class DBQueryInfo {
 
-  private static final int COMBINED_SQL_LIMIT = 2 * 1024 * 1024; // characters
+    private static final int COMBINED_SQL_LIMIT = 2 * 1024 * 1024; // characters
 
-  private static final ToIntFunction<DBQueryInfo> SQL_WEIGHER = DBQueryInfo::weight;
-  private static final DDCache<String, DBQueryInfo> CACHED_PREPARED_STATEMENTS =
-      DDCaches.newFixedSizeWeightedCache(512, SQL_WEIGHER, COMBINED_SQL_LIMIT);
-  private static final Function<String, DBQueryInfo> NORMALIZE = DBQueryInfo::new;
+    private static final ToIntFunction<DBQueryInfo> SQL_WEIGHER = DBQueryInfo::weight;
+    private static final DDCache<String, DBQueryInfo> CACHED_PREPARED_STATEMENTS =
+            DDCaches.newFixedSizeWeightedCache(512, SQL_WEIGHER, COMBINED_SQL_LIMIT);
+    private static final Function<String, DBQueryInfo> NORMALIZE = DBQueryInfo::new;
 
-  public static DBQueryInfo ofStatement(String sql) {
-    return NORMALIZE.apply(sql);
-  }
-
-  public static DBQueryInfo ofPreparedStatement(String sql) {
-    return CACHED_PREPARED_STATEMENTS.computeIfAbsent(sql, NORMALIZE);
-  }
-
-  private final UTF8BytesString operation;
-  private final UTF8BytesString sql;
-
-  public DBQueryInfo(String sql) {
-    this.sql = SQLNormalizer.normalize(sql);
-    this.operation = UTF8BytesString.create(extractOperation(this.sql));
-  }
+    public static DBQueryInfo ofStatement(String sql) {
+        return NORMALIZE.apply(sql);
+    }
 
-  public UTF8BytesString getOperation() {
-    return operation;
-  }
+    public static DBQueryInfo ofPreparedStatement(String sql) {
+        return CACHED_PREPARED_STATEMENTS.computeIfAbsent(sql, NORMALIZE);
+    }
 
-  public UTF8BytesString getSql() {
-    return sql;
-  }
+    private final UTF8BytesString operation;
+    private final UTF8BytesString sql;
 
-  int weight() {
-    return sql.length();
-  }
+    public DBQueryInfo(String sql) {
+        this.sql = SQLNormalizer.normalize(sql);
+        this.operation = UTF8BytesString.create(extractOperation(this.sql));
+    }
 
-  public static CharSequence extractOperation(CharSequence sql) {
-    if (null == sql) {
-      return null;
+    public UTF8BytesString getOperation() {
+        return operation;
     }
-    int start = 0;
-    boolean insideComment = false;
-    for (int i = 0; i < sql.length(); ++i) {
-      char c = sql.charAt(i);
-      if (c == '/' && i + 1 < sql.length() && sql.charAt(i + 1) == '*') {
-        insideComment = true;
-        i++;
-        continue;
-      }
-      if (c == '*' && i + 1 < sql.length() && sql.charAt(i + 1) == '/') {
-        insideComment = false;
-        i++;
-        continue;
-      }
-      if (!insideComment && Character.isAlphabetic(c)) {
-        start = i;
-        break;
-      }
+
+    public UTF8BytesString getSql() {
+        return sql;
     }
 
-    int firstWhitespace = -1;
-    for (int i = start; i < sql.length(); ++i) {
-      char c = sql.charAt(i);
-      if (c == '/' && i + 1 < sql.length() && sql.charAt(i + 1) == '*') {
-        insideComment = true;
-        i++;
-        continue;
-      }
-      if (c == '*' && i + 1 < sql.length() && sql.charAt(i + 1) == '/') {
-        insideComment = false;
-        i++;
-        continue;
-      }
-      if (!insideComment && Character.isWhitespace(c)) {
-        firstWhitespace = i;
-        break;
-      }
+    int weight() {
+        return sql.length();
     }
-    if (firstWhitespace > -1) {
-      return sql.subSequence(start, firstWhitespace);
+
+    public static CharSequence extractOperation(CharSequence sql) {
+        if (null == sql) {
+            return null;
+        }
+        int start = 0;
+        boolean insideComment = false;
+        for (int i = 0; i < sql.length(); ++i) {
+            char c = sql.charAt(i);
+            if (c == '/' && i + 1 < sql.length() && sql.charAt(i + 1) == '*') {
+                insideComment = true;
+                i++;
+                continue;
+            }
+            if (c == '*' && i + 1 < sql.length() && sql.charAt(i + 1) == '/') {
+                insideComment = false;
+                i++;
+                continue;
+            }
+            if (!insideComment && Character.isAlphabetic(c)) {
+                start = i;
+                break;
+            }
+        }
+
+        int firstWhitespace = -1;
+        for (int i = start; i < sql.length(); ++i) {
+            char c = sql.charAt(i);
+            if (c == '/' && i + 1 < sql.length() && sql.charAt(i + 1) == '*') {
+                insideComment = true;
+                i++;
+                continue;
+            }
+            if (c == '*' && i + 1 < sql.length() && sql.charAt(i + 1) == '/') {
+                insideComment = false;
+                i++;
+                continue;
+            }
+            if (!insideComment && Character.isWhitespace(c)) {
+                firstWhitespace = i;
+                break;
+            }
+        }
+        if (firstWhitespace > -1) {
+            return sql.subSequence(start, firstWhitespace);
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionContext.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionContext.java
index 30e43725baa..f421da5f992 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionContext.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionContext.java
@@ -2,45 +2,45 @@
 
 /** Immutable database metadata and mutable state scoped to one JDBC connection. */
 public final class JDBCConnectionContext {
-  public static final JDBCConnectionContext DEFAULT = new JDBCConnectionContext(DBInfo.DEFAULT);
-
-  private final DBInfo dbInfo;
-  private volatile String poolName;
-  private volatile String oracleServiceHash;
-  private volatile boolean oracleServiceActionUnsupported;
-
-  public JDBCConnectionContext(DBInfo dbInfo) {
-    this.dbInfo = dbInfo;
-  }
-
-  public DBInfo getDbInfo() {
-    return dbInfo;
-  }
-
-  public String getPoolName() {
-    return poolName;
-  }
-
-  public void setPoolName(String poolName) {
-    this.poolName = poolName;
-  }
-
-  /** Returns whether this connection needs the given Oracle service hash. */
-  public boolean shouldSetOracleServiceHash(String baseHash) {
-    return !oracleServiceActionUnsupported && !baseHash.equals(oracleServiceHash);
-  }
-
-  /** Returns whether the given Oracle service hash was successfully applied to this connection. */
-  public boolean isOracleServiceHashSet(String baseHash) {
-    return baseHash.equals(oracleServiceHash);
-  }
-
-  /** Records a successfully applied Oracle service hash. */
-  public void markOracleServiceHashSet(String baseHash) {
-    oracleServiceHash = baseHash;
-  }
-
-  public void markOracleServiceActionUnsupported() {
-    oracleServiceActionUnsupported = true;
-  }
+    public static final JDBCConnectionContext DEFAULT = new JDBCConnectionContext(DBInfo.DEFAULT);
+
+    private final DBInfo dbInfo;
+    private volatile String poolName;
+    private volatile String oracleServiceHash;
+    private volatile boolean oracleServiceActionUnsupported;
+
+    public JDBCConnectionContext(DBInfo dbInfo) {
+        this.dbInfo = dbInfo;
+    }
+
+    public DBInfo getDbInfo() {
+        return dbInfo;
+    }
+
+    public String getPoolName() {
+        return poolName;
+    }
+
+    public void setPoolName(String poolName) {
+        this.poolName = poolName;
+    }
+
+    /** Returns whether this connection needs the given Oracle service hash. */
+    public boolean shouldSetOracleServiceHash(String baseHash) {
+        return !oracleServiceActionUnsupported && !baseHash.equals(oracleServiceHash);
+    }
+
+    /** Returns whether the given Oracle service hash was successfully applied to this connection. */
+    public boolean isOracleServiceHashSet(String baseHash) {
+        return baseHash.equals(oracleServiceHash);
+    }
+
+    /** Records a successfully applied Oracle service hash. */
+    public void markOracleServiceHashSet(String baseHash) {
+        oracleServiceHash = baseHash;
+    }
+
+    public void markOracleServiceActionUnsupported() {
+        oracleServiceActionUnsupported = true;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParser.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParser.java
index 617b8d707ce..266826c7e4c 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParser.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParser.java
@@ -27,955 +27,963 @@
  * project to keep the Muzzle generated dependency references smaller.
  */
 public enum JDBCConnectionUrlParser {
-  GENERIC_URL_LIKE() {
-    @Override
-    DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
-      try {
-        // Attempt generic parsing
-        final URI uri = new URI(jdbcUrl);
-
-        populateStandardProperties(builder, splitQuery(uri.getQuery(), '&'));
-
-        final String rawUserInfo = uri.getRawUserInfo();
-        if (rawUserInfo != null) {
-          // rawUserInfo keeps %3A encoded, so indexOf(':') only matches the password separator
-          final int colonLoc = rawUserInfo.indexOf(':');
-          final String rawUser = colonLoc >= 0 ? rawUserInfo.substring(0, colonLoc) : rawUserInfo;
-          try {
-            builder.user(URLDecoder.decode(rawUser, "UTF-8"));
-          } catch (final UnsupportedEncodingException e) {
-            builder.user(rawUser);
-          }
-        }
-
-        String path = uri.getPath();
-
-        if (path.startsWith("/")) {
-          path = path.substring(1);
-        }
-        if (!path.isEmpty()) {
-          builder.db(path);
+    GENERIC_URL_LIKE() {
+        @Override
+        DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
+            try {
+                // Attempt generic parsing
+                final URI uri = new URI(jdbcUrl);
+
+                populateStandardProperties(builder, splitQuery(uri.getQuery(), '&'));
+
+                final String rawUserInfo = uri.getRawUserInfo();
+                if (rawUserInfo != null) {
+                    // rawUserInfo keeps %3A encoded, so indexOf(':') only matches the password separator
+                    final int colonLoc = rawUserInfo.indexOf(':');
+                    final String rawUser = colonLoc >= 0 ? rawUserInfo.substring(0, colonLoc) : rawUserInfo;
+                    try {
+                        builder.user(URLDecoder.decode(rawUser, "UTF-8"));
+                    } catch (final UnsupportedEncodingException e) {
+                        builder.user(rawUser);
+                    }
+                }
+
+                String path = uri.getPath();
+
+                if (path.startsWith("/")) {
+                    path = path.substring(1);
+                }
+                if (!path.isEmpty()) {
+                    builder.db(path);
+                }
+
+                if (uri.getHost() != null) {
+                    builder.host(uri.getHost());
+                }
+
+                if (uri.getPort() > 0) {
+                    builder.port(uri.getPort());
+                }
+
+                return builder.type(uri.getScheme());
+            } catch (final Exception e) {
+                return builder;
+            }
         }
+    },
 
-        if (uri.getHost() != null) {
-          builder.host(uri.getHost());
-        }
+    MODIFIED_URL_LIKE() {
+        @Override
+        DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
+            String serverName = "";
+            Integer port = null;
+            String instanceName = null;
+            final int hostIndex = jdbcUrl.indexOf("://");
 
-        if (uri.getPort() > 0) {
-          builder.port(uri.getPort());
-        }
+            if (hostIndex <= 0 || jdbcUrl.length() == 3 + hostIndex) {
+                return builder;
+            }
 
-        return builder.type(uri.getScheme());
-      } catch (final Exception e) {
-        return builder;
-      }
-    }
-  },
-
-  MODIFIED_URL_LIKE() {
-    @Override
-    DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
-      String serverName = "";
-      Integer port = null;
-      String instanceName = null;
-      final int hostIndex = jdbcUrl.indexOf("://");
-
-      if (hostIndex <= 0 || jdbcUrl.length() == 3 + hostIndex) {
-        return builder;
-      }
-
-      final String type = jdbcUrl.substring(0, hostIndex);
-      final String urlPart1;
-      final String urlPart2;
-      final int paramLoc;
-      char paramSeparator = ';';
-
-      if (type.equals("db2") || type.equals("as400")) {
-        if (jdbcUrl.contains("=")) {
-          paramLoc = jdbcUrl.lastIndexOf(':');
-          if (paramLoc > hostIndex + 2) {
-            urlPart1 = jdbcUrl.substring(0, paramLoc);
-            urlPart2 = jdbcUrl.substring(paramLoc + 1);
-          } else {
-            // No ':' past '://': fall back to '?' query-string params
-            final int queryLoc = jdbcUrl.indexOf('?');
-            if (queryLoc >= 0) {
-              urlPart1 = jdbcUrl.substring(0, queryLoc);
-              urlPart2 = jdbcUrl.substring(queryLoc + 1);
-              paramSeparator = '&';
+            final String type = jdbcUrl.substring(0, hostIndex);
+            final String urlPart1;
+            final String urlPart2;
+            final int paramLoc;
+            char paramSeparator = ';';
+
+            if (type.equals("db2") || type.equals("as400")) {
+                if (jdbcUrl.contains("=")) {
+                    paramLoc = jdbcUrl.lastIndexOf(':');
+                    if (paramLoc > hostIndex + 2) {
+                        urlPart1 = jdbcUrl.substring(0, paramLoc);
+                        urlPart2 = jdbcUrl.substring(paramLoc + 1);
+                    } else {
+                        // No ':' past '://': fall back to '?' query-string params
+                        final int queryLoc = jdbcUrl.indexOf('?');
+                        if (queryLoc >= 0) {
+                            urlPart1 = jdbcUrl.substring(0, queryLoc);
+                            urlPart2 = jdbcUrl.substring(queryLoc + 1);
+                            paramSeparator = '&';
+                        } else {
+                            urlPart1 = jdbcUrl;
+                            urlPart2 = null;
+                        }
+                    }
+                } else {
+                    urlPart1 = jdbcUrl;
+                    urlPart2 = null;
+                }
             } else {
-              urlPart1 = jdbcUrl;
-              urlPart2 = null;
+                paramLoc = jdbcUrl.indexOf(';');
+                urlPart1 = paramLoc >= 0 ? jdbcUrl.substring(0, paramLoc) : jdbcUrl;
+                urlPart2 = paramLoc >= 0 ? jdbcUrl.substring(paramLoc + 1) : null;
             }
-          }
-        } else {
-          urlPart1 = jdbcUrl;
-          urlPart2 = null;
-        }
-      } else {
-        paramLoc = jdbcUrl.indexOf(';');
-        urlPart1 = paramLoc >= 0 ? jdbcUrl.substring(0, paramLoc) : jdbcUrl;
-        urlPart2 = paramLoc >= 0 ? jdbcUrl.substring(paramLoc + 1) : null;
-      }
-
-      if (urlPart2 != null) {
-        final Map<String, String> props = splitQuery(urlPart2, paramSeparator);
-        populateStandardProperties(builder, props);
-        if (props.containsKey("servername")) {
-          serverName = props.get("servername");
-        }
-      }
 
-      final String urlServerName = urlPart1.substring(hostIndex + 3);
-      if (!urlServerName.isEmpty()) {
-        serverName = urlServerName;
-      }
+            if (urlPart2 != null) {
+                final Map<String, String> props = splitQuery(urlPart2, paramSeparator);
+                populateStandardProperties(builder, props);
+                if (props.containsKey("servername")) {
+                    serverName = props.get("servername");
+                }
+            }
 
-      int instanceLoc = serverName.indexOf('/');
-      if (instanceLoc > 1) {
-        instanceName = serverName.substring(instanceLoc + 1);
-        serverName = serverName.substring(0, instanceLoc);
-      }
+            final String urlServerName = urlPart1.substring(hostIndex + 3);
+            if (!urlServerName.isEmpty()) {
+                serverName = urlServerName;
+            }
+
+            int instanceLoc = serverName.indexOf('/');
+            if (instanceLoc > 1) {
+                instanceName = serverName.substring(instanceLoc + 1);
+                serverName = serverName.substring(0, instanceLoc);
+            }
 
-      final int portLoc = serverName.indexOf(':');
+            final int portLoc = serverName.indexOf(':');
 
-      if (portLoc > 1) {
-        port = Integer.parseInt(serverName.substring(portLoc + 1));
-        serverName = serverName.substring(0, portLoc);
-      }
+            if (portLoc > 1) {
+                port = Integer.parseInt(serverName.substring(portLoc + 1));
+                serverName = serverName.substring(0, portLoc);
+            }
 
-      instanceLoc = serverName.indexOf('\\');
-      if (instanceLoc > 1) {
-        instanceName = serverName.substring(instanceLoc + 1);
-        serverName = serverName.substring(0, instanceLoc);
-      }
+            instanceLoc = serverName.indexOf('\\');
+            if (instanceLoc > 1) {
+                instanceName = serverName.substring(instanceLoc + 1);
+                serverName = serverName.substring(0, instanceLoc);
+            }
 
-      if (instanceName != null) {
-        builder.instance(instanceName);
-      }
+            if (instanceName != null) {
+                builder.instance(instanceName);
+            }
 
-      if (!serverName.isEmpty()) {
-        builder.host(serverName);
-      }
+            if (!serverName.isEmpty()) {
+                builder.host(serverName);
+            }
 
-      if (port != null) {
-        builder.port(port);
-      }
+            if (port != null) {
+                builder.port(port);
+            }
 
-      return builder.type(type);
-    }
-  },
-
-  POSTGRES("postgresql", "edb") {
-    private static final String DEFAULT_HOST = "localhost";
-    private static final int DEFAULT_PORT = 5432;
-
-    @Override
-    DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
-      final DBInfo dbInfo = builder.build();
-      if (dbInfo.getHost() == null) {
-        builder.host(DEFAULT_HOST);
-      }
-      if (dbInfo.getPort() == null) {
-        builder.port(DEFAULT_PORT);
-      }
-      return GENERIC_URL_LIKE.doParse(jdbcUrl, builder);
-    }
-  },
-
-  MYSQL("mysql", "mariadb") {
-    private static final String DEFAULT_HOST = "localhost";
-    private static final int DEFAULT_PORT = 3306;
-
-    @Override
-    DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
-      final DBInfo dbInfo = builder.build();
-      if (dbInfo.getHost() == null) {
-        builder.host(DEFAULT_HOST);
-      }
-      if (dbInfo.getPort() == null) {
-        builder.port(DEFAULT_PORT);
-      }
-      final int protoLoc = jdbcUrl.indexOf("://");
-      final int typeEndLoc = dbInfo.getType().length();
-      if (protoLoc > typeEndLoc && !jdbcUrl.substring(typeEndLoc + 1, protoLoc).equals("aws")) {
-        return MARIA_SUBPROTO
-            .doParse(jdbcUrl.substring(protoLoc + 3), builder)
-            .subtype(jdbcUrl.substring(typeEndLoc + 1, protoLoc));
-      }
-      if (protoLoc > 0) {
-        return GENERIC_URL_LIKE.doParse(dbInfo.getType() + jdbcUrl.substring(protoLoc), builder);
-      }
-
-      final int hostEndLoc;
-      final int portLoc = jdbcUrl.indexOf(':', typeEndLoc + 1);
-      final int dbLoc = jdbcUrl.indexOf('/', typeEndLoc);
-      final int paramLoc = jdbcUrl.indexOf('?', dbLoc);
-
-      if (paramLoc > 0) {
-        populateStandardProperties(builder, splitQuery(jdbcUrl.substring(paramLoc + 1), '&'));
-        builder.db(jdbcUrl.substring(dbLoc + 1, paramLoc));
-      } else {
-        builder.db(jdbcUrl.substring(dbLoc + 1));
-      }
-
-      if (portLoc > 0) {
-        hostEndLoc = portLoc;
-        try {
-          builder.port(Integer.parseInt(jdbcUrl.substring(portLoc + 1, dbLoc)));
-        } catch (final NumberFormatException ignored) {
+            return builder.type(type);
         }
-      } else {
-        hostEndLoc = dbLoc;
-      }
+    },
 
-      builder.host(jdbcUrl.substring(typeEndLoc + 1, hostEndLoc));
+    POSTGRES("postgresql", "edb") {
+        private static final String DEFAULT_HOST = "localhost";
+        private static final int DEFAULT_PORT = 5432;
 
-      return builder;
-    }
-  },
-
-  MARIA_SUBPROTO() {
-    @Override
-    DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
-      if (jdbcUrl.startsWith("**internally_generated**")) {
-        // there is nothing to parse
-        builder.host(null);
-        builder.port(null);
-        return builder;
-      }
-      final int hostEndLoc;
-      final int clusterSepLoc = jdbcUrl.indexOf(',');
-      final int ipv6End =
-          !jdbcUrl.isEmpty() && jdbcUrl.charAt(0) == '[' ? jdbcUrl.indexOf(']') : -1;
-      int portLoc = jdbcUrl.indexOf(':', max(0, ipv6End));
-      portLoc = -1 < clusterSepLoc && clusterSepLoc < portLoc ? -1 : portLoc;
-      final int dbLoc = jdbcUrl.indexOf('/', max(portLoc, clusterSepLoc));
-
-      final int paramLoc = jdbcUrl.indexOf('?', dbLoc);
-
-      if (paramLoc > 0) {
-        populateStandardProperties(builder, splitQuery(jdbcUrl.substring(paramLoc + 1), '&'));
-        builder.db(jdbcUrl.substring(dbLoc + 1, paramLoc));
-      } else {
-        builder.db(jdbcUrl.substring(dbLoc + 1));
-      }
-
-      if (jdbcUrl.startsWith("address=")) {
-        return MARIA_ADDRESS.doParse(jdbcUrl, builder);
-      }
-
-      if (portLoc > 0) {
-        hostEndLoc = portLoc;
-        final int portEndLoc = clusterSepLoc > 0 ? clusterSepLoc : dbLoc;
-        try {
-          builder.port(Integer.parseInt(jdbcUrl.substring(portLoc + 1, portEndLoc)));
-        } catch (final NumberFormatException ignored) {
+        @Override
+        DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
+            final DBInfo dbInfo = builder.build();
+            if (dbInfo.getHost() == null) {
+                builder.host(DEFAULT_HOST);
+            }
+            if (dbInfo.getPort() == null) {
+                builder.port(DEFAULT_PORT);
+            }
+            return GENERIC_URL_LIKE.doParse(jdbcUrl, builder);
         }
-      } else {
-        hostEndLoc = clusterSepLoc > 0 ? clusterSepLoc : dbLoc;
-      }
-
-      if (ipv6End > 0) {
-        builder.host(jdbcUrl.substring(1, ipv6End));
-      } else {
-        builder.host(jdbcUrl.substring(0, hostEndLoc));
-      }
-      return builder;
-    }
-  },
-
-  MARIA_ADDRESS() {
-    private final Pattern HOST_REGEX = Pattern.compile("\\(\\s*host\\s*=\\s*([^ )]+)\\s*\\)");
-    private final Pattern PORT_REGEX = Pattern.compile("\\(\\s*port\\s*=\\s*([\\d]+)\\s*\\)");
-    private final Pattern USER_REGEX = Pattern.compile("\\(\\s*user\\s*=\\s*([^ )]+)\\s*\\)");
-
-    @Override
-    DBInfo.Builder doParse(String jdbcUrl, final DBInfo.Builder builder) {
-      final int addressEnd = jdbcUrl.indexOf(",address=");
-      if (addressEnd > 0) {
-        jdbcUrl = jdbcUrl.substring(0, addressEnd);
-      }
-      final Matcher hostMatcher = HOST_REGEX.matcher(jdbcUrl);
-      if (hostMatcher.find()) {
-        builder.host(hostMatcher.group(1));
-      }
-
-      final Matcher portMatcher = PORT_REGEX.matcher(jdbcUrl);
-      if (portMatcher.find()) {
-        builder.port(Integer.parseInt(portMatcher.group(1)));
-      }
-
-      final Matcher userMatcher = USER_REGEX.matcher(jdbcUrl);
-      if (userMatcher.find()) {
-        builder.user(userMatcher.group(1));
-      }
-
-      return builder;
-    }
-  },
-
-  SAP("sap") {
-    private static final String DEFAULT_HOST = "localhost";
-
-    @Override
-    DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
-      final DBInfo dbInfo = builder.build();
-      if (dbInfo.getHost() == null) {
-        builder.host(DEFAULT_HOST);
-      }
-      return GENERIC_URL_LIKE.doParse(jdbcUrl, builder);
-    }
-  },
-
-  MSSQLSERVER("microsoft", "sqlserver") {
-    private static final String DEFAULT_HOST = "localhost";
-    private static final int DEFAULT_PORT = 1433;
-
-    @Override
-    DBInfo.Builder doParse(String jdbcUrl, final DBInfo.Builder builder) {
-      if (jdbcUrl.startsWith("microsoft:")) {
-        jdbcUrl = jdbcUrl.substring("microsoft:".length());
-      }
-      if (!jdbcUrl.startsWith("sqlserver://")) {
-        return builder;
-      }
-      builder.type("sqlserver");
-      final DBInfo dbInfo = builder.build();
-      if (dbInfo.getHost() == null) {
-        builder.host(DEFAULT_HOST);
-      }
-      if (dbInfo.getPort() == null) {
-        builder.port(DEFAULT_PORT);
-      }
-      return MODIFIED_URL_LIKE.doParse(jdbcUrl, builder);
-    }
-  },
-
-  DB2("db2", "as400") {
-    private static final int DEFAULT_PORT = 50000;
-
-    @Override
-    DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
-      final DBInfo dbInfo = builder.build();
-      if (dbInfo.getPort() == null) {
-        builder.port(DEFAULT_PORT);
-      }
-      return MODIFIED_URL_LIKE.doParse(jdbcUrl, builder);
-    }
-  },
-
-  ORACLE("oracle") {
-    private static final int DEFAULT_PORT = 1521;
-
-    @Override
-    DBInfo.Builder doParse(String jdbcUrl, final DBInfo.Builder builder) {
-      final int typeEndIndex = jdbcUrl.indexOf(':', "oracle:".length());
-      final String subtype = jdbcUrl.substring("oracle:".length(), typeEndIndex);
-      jdbcUrl = jdbcUrl.substring(typeEndIndex + 1);
-
-      builder.subtype(subtype);
-      final DBInfo dbInfo = builder.build();
-      if (dbInfo.getPort() == null) {
-        builder.port(DEFAULT_PORT);
-      }
-
-      if (jdbcUrl.contains("@")) {
-        return ORACLE_AT.doParse(jdbcUrl, builder);
-      } else {
-        return ORACLE_CONNECT_INFO.doParse(jdbcUrl, builder);
-      }
-    }
-  },
-
-  ORACLE_CONNECT_INFO() {
-    @Override
-    DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
-
-      final String host;
-      final Integer port;
-      final String instance;
-
-      final int hostEnd = jdbcUrl.indexOf(':');
-      final int instanceLoc = jdbcUrl.indexOf('/');
-      if (hostEnd > 0) {
-        host = jdbcUrl.substring(0, hostEnd);
-        final int afterHostEnd = jdbcUrl.indexOf(':', hostEnd + 1);
-        if (afterHostEnd > 0) {
-          port = Integer.parseInt(jdbcUrl.substring(hostEnd + 1, afterHostEnd));
-          instance = jdbcUrl.substring(afterHostEnd + 1);
-        } else {
-          if (instanceLoc > 0) {
-            instance = jdbcUrl.substring(instanceLoc + 1);
-            port = Integer.parseInt(jdbcUrl.substring(hostEnd + 1, instanceLoc));
-          } else {
-            final String portOrInstance = jdbcUrl.substring(hostEnd + 1);
-            Integer parsedPort = null;
-            try {
-              parsedPort = Integer.parseInt(portOrInstance);
-            } catch (final NumberFormatException ignored) {
+    },
+
+    MYSQL("mysql", "mariadb") {
+        private static final String DEFAULT_HOST = "localhost";
+        private static final int DEFAULT_PORT = 3306;
+
+        @Override
+        DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
+            final DBInfo dbInfo = builder.build();
+            if (dbInfo.getHost() == null) {
+                builder.host(DEFAULT_HOST);
+            }
+            if (dbInfo.getPort() == null) {
+                builder.port(DEFAULT_PORT);
             }
-            if (parsedPort == null) {
-              port = null;
-              instance = portOrInstance;
+            final int protoLoc = jdbcUrl.indexOf("://");
+            final int typeEndLoc = dbInfo.getType().length();
+            if (protoLoc > typeEndLoc
+                    && !jdbcUrl.substring(typeEndLoc + 1, protoLoc).equals("aws")) {
+                return MARIA_SUBPROTO
+                        .doParse(jdbcUrl.substring(protoLoc + 3), builder)
+                        .subtype(jdbcUrl.substring(typeEndLoc + 1, protoLoc));
+            }
+            if (protoLoc > 0) {
+                return GENERIC_URL_LIKE.doParse(dbInfo.getType() + jdbcUrl.substring(protoLoc), builder);
+            }
+
+            final int hostEndLoc;
+            final int portLoc = jdbcUrl.indexOf(':', typeEndLoc + 1);
+            final int dbLoc = jdbcUrl.indexOf('/', typeEndLoc);
+            final int paramLoc = jdbcUrl.indexOf('?', dbLoc);
+
+            if (paramLoc > 0) {
+                populateStandardProperties(builder, splitQuery(jdbcUrl.substring(paramLoc + 1), '&'));
+                builder.db(jdbcUrl.substring(dbLoc + 1, paramLoc));
             } else {
-              port = parsedPort;
-              instance = null;
+                builder.db(jdbcUrl.substring(dbLoc + 1));
             }
-          }
-        }
-      } else {
-        if (instanceLoc > 0) {
-          host = jdbcUrl.substring(0, instanceLoc);
-          port = null;
-          instance = jdbcUrl.substring(instanceLoc + 1);
-        } else {
-          if (jdbcUrl.isEmpty()) {
+
+            if (portLoc > 0) {
+                hostEndLoc = portLoc;
+                try {
+                    builder.port(Integer.parseInt(jdbcUrl.substring(portLoc + 1, dbLoc)));
+                } catch (final NumberFormatException ignored) {
+                }
+            } else {
+                hostEndLoc = dbLoc;
+            }
+
+            builder.host(jdbcUrl.substring(typeEndLoc + 1, hostEndLoc));
+
             return builder;
-          } else {
-            host = null;
-            port = null;
-            instance = jdbcUrl;
-          }
-        }
-      }
-      if (host != null) {
-        builder.host(host);
-      }
-      if (port != null) {
-        builder.port(port);
-      }
-      return builder.instance(instance);
-    }
-  },
-
-  ORACLE_AT() {
-    @Override
-    DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
-      if (jdbcUrl.contains("@(description")) {
-        return ORACLE_AT_DESCRIPTION.doParse(jdbcUrl, builder);
-      }
-      final String user;
-
-      int atIndex = jdbcUrl.indexOf('@');
-      final String urlPart1 = jdbcUrl.substring(0, atIndex);
-      final String connectInfo = jdbcUrl.substring(atIndex + 1);
-
-      final int userInfoLoc = urlPart1.indexOf('/');
-      if (userInfoLoc > 0) {
-        user = urlPart1.substring(0, userInfoLoc);
-      } else {
-        user = null;
-      }
-
-      final int hostStart;
-      if (connectInfo.startsWith("//")) {
-        hostStart = "//".length();
-      } else if (connectInfo.startsWith("ldap://")) {
-        hostStart = "ldap://".length();
-      } else {
-        hostStart = 0;
-      }
-      if (user != null) {
-        builder.user(user);
-      }
-      return ORACLE_CONNECT_INFO.doParse(connectInfo.substring(hostStart), builder);
-    }
-  },
-
-  /**
-   * This parser can locate incorrect data if multiple addresses are defined but not everything is
-   * defined in the first block. (It would locate data from subsequent address blocks.
-   */
-  ORACLE_AT_DESCRIPTION() {
-    private final Pattern HOST_REGEX = Pattern.compile("\\(\\s*host\\s*=\\s*([^ )]+)\\s*\\)");
-    private final Pattern PORT_REGEX = Pattern.compile("\\(\\s*port\\s*=\\s*([\\d]+)\\s*\\)");
-    private final Pattern INSTANCE_REGEX =
-        Pattern.compile("\\(\\s*service_name\\s*=\\s*([^ )]+)\\s*\\)");
-
-    @Override
-    DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
-      int atIndex = jdbcUrl.indexOf('@');
-      final String urlPart1 = jdbcUrl.substring(0, atIndex);
-      final String urlPart2 = jdbcUrl.substring(atIndex + 1);
-
-      final int userInfoLoc = urlPart1.indexOf('/');
-      if (userInfoLoc > 0) {
-        builder.user(urlPart1.substring(0, userInfoLoc));
-      }
-
-      final Matcher hostMatcher = HOST_REGEX.matcher(urlPart2);
-      if (hostMatcher.find()) {
-        builder.host(hostMatcher.group(1));
-      }
-
-      final Matcher portMatcher = PORT_REGEX.matcher(urlPart2);
-      if (portMatcher.find()) {
-        builder.port(Integer.parseInt(portMatcher.group(1)));
-      }
-
-      final Matcher instanceMatcher = INSTANCE_REGEX.matcher(urlPart2);
-      if (instanceMatcher.find()) {
-        builder.instance(instanceMatcher.group(1));
-      }
-
-      return builder;
-    }
-  },
-
-  H2("h2") {
-    private static final int DEFAULT_PORT = 8082;
-
-    @Override
-    DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
-      final String instance;
-
-      final String h2Url = jdbcUrl.substring("h2:".length());
-      if (h2Url.startsWith("mem:")) {
-        builder.subtype("mem");
-        final int propLoc = h2Url.indexOf(';');
-        if (propLoc >= 0) {
-          instance = h2Url.substring("mem:".length(), propLoc);
-        } else {
-          instance = h2Url.substring("mem:".length());
-        }
-      } else if (h2Url.startsWith("file:")) {
-        builder.subtype("file");
-        final int propLoc = h2Url.indexOf(';');
-        if (propLoc >= 0) {
-          instance = h2Url.substring("file:".length(), propLoc);
-        } else {
-          instance = h2Url.substring("file:".length());
-        }
-      } else if (h2Url.startsWith("zip:")) {
-        builder.subtype("zip");
-        final int propLoc = h2Url.indexOf(';');
-        if (propLoc >= 0) {
-          instance = h2Url.substring("zip:".length(), propLoc);
-        } else {
-          instance = h2Url.substring("zip:".length());
-        }
-      } else if (h2Url.startsWith("tcp:")) {
-        final DBInfo dbInfo = builder.build();
-        if (dbInfo.getPort() == null) {
-          builder.port(DEFAULT_PORT);
-        }
-        return MODIFIED_URL_LIKE.doParse(jdbcUrl, builder).type("h2").subtype("tcp");
-      } else if (h2Url.startsWith("ssl:")) {
-        final DBInfo dbInfo = builder.build();
-        if (dbInfo.getPort() == null) {
-          builder.port(DEFAULT_PORT);
-        }
-        return MODIFIED_URL_LIKE.doParse(jdbcUrl, builder).type("h2").subtype("ssl");
-      } else {
-        builder.subtype("file");
-        final int propLoc = h2Url.indexOf(';');
-        if (propLoc >= 0) {
-          instance = h2Url.substring(0, propLoc);
-        } else {
-          instance = h2Url;
         }
-      }
-      if (!instance.isEmpty()) {
-        builder.instance(instance);
-      }
-      return builder;
-    }
-  },
-
-  HSQL("hsqldb") {
-    private static final String DEFAULT_USER = "SA";
-    private static final int DEFAULT_PORT = 9001;
-
-    @Override
-    DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
-      String instance;
-      final DBInfo dbInfo = builder.build();
-      if (dbInfo.getUser() == null) {
-        builder.user(DEFAULT_USER);
-      }
-      final String hsqlUrl = jdbcUrl.substring("hsqldb:".length());
-      if (hsqlUrl.startsWith("mem:")) {
-        builder.subtype("mem");
-        instance = hsqlUrl.substring("mem:".length());
-      } else if (hsqlUrl.startsWith("file:")) {
-        builder.subtype("file");
-        instance = hsqlUrl.substring("file:".length());
-      } else if (hsqlUrl.startsWith("res:")) {
-        builder.subtype("res");
-        instance = hsqlUrl.substring("res:".length());
-      } else if (hsqlUrl.startsWith("hsql:")) {
-        if (dbInfo.getPort() == null) {
-          builder.port(DEFAULT_PORT);
-        }
-        return MODIFIED_URL_LIKE.doParse(jdbcUrl, builder).type("hsqldb").subtype("hsql");
-      } else if (hsqlUrl.startsWith("hsqls:")) {
-        if (dbInfo.getPort() == null) {
-          builder.port(DEFAULT_PORT);
-        }
-        return MODIFIED_URL_LIKE.doParse(jdbcUrl, builder).type("hsqldb").subtype("hsqls");
-      } else if (hsqlUrl.startsWith("http:")) {
-        if (dbInfo.getPort() == null) {
-          builder.port(80);
+    },
+
+    MARIA_SUBPROTO() {
+        @Override
+        DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
+            if (jdbcUrl.startsWith("**internally_generated**")) {
+                // there is nothing to parse
+                builder.host(null);
+                builder.port(null);
+                return builder;
+            }
+            final int hostEndLoc;
+            final int clusterSepLoc = jdbcUrl.indexOf(',');
+            final int ipv6End = !jdbcUrl.isEmpty() && jdbcUrl.charAt(0) == '[' ? jdbcUrl.indexOf(']') : -1;
+            int portLoc = jdbcUrl.indexOf(':', max(0, ipv6End));
+            portLoc = -1 < clusterSepLoc && clusterSepLoc < portLoc ? -1 : portLoc;
+            final int dbLoc = jdbcUrl.indexOf('/', max(portLoc, clusterSepLoc));
+
+            final int paramLoc = jdbcUrl.indexOf('?', dbLoc);
+
+            if (paramLoc > 0) {
+                populateStandardProperties(builder, splitQuery(jdbcUrl.substring(paramLoc + 1), '&'));
+                builder.db(jdbcUrl.substring(dbLoc + 1, paramLoc));
+            } else {
+                builder.db(jdbcUrl.substring(dbLoc + 1));
+            }
+
+            if (jdbcUrl.startsWith("address=")) {
+                return MARIA_ADDRESS.doParse(jdbcUrl, builder);
+            }
+
+            if (portLoc > 0) {
+                hostEndLoc = portLoc;
+                final int portEndLoc = clusterSepLoc > 0 ? clusterSepLoc : dbLoc;
+                try {
+                    builder.port(Integer.parseInt(jdbcUrl.substring(portLoc + 1, portEndLoc)));
+                } catch (final NumberFormatException ignored) {
+                }
+            } else {
+                hostEndLoc = clusterSepLoc > 0 ? clusterSepLoc : dbLoc;
+            }
+
+            if (ipv6End > 0) {
+                builder.host(jdbcUrl.substring(1, ipv6End));
+            } else {
+                builder.host(jdbcUrl.substring(0, hostEndLoc));
+            }
+            return builder;
         }
-        return MODIFIED_URL_LIKE.doParse(jdbcUrl, builder).type("hsqldb").subtype("http");
-      } else if (hsqlUrl.startsWith("https:")) {
-        if (dbInfo.getPort() == null) {
-          builder.port(443);
+    },
+
+    MARIA_ADDRESS() {
+        private final Pattern HOST_REGEX = Pattern.compile("\\(\\s*host\\s*=\\s*([^ )]+)\\s*\\)");
+        private final Pattern PORT_REGEX = Pattern.compile("\\(\\s*port\\s*=\\s*([\\d]+)\\s*\\)");
+        private final Pattern USER_REGEX = Pattern.compile("\\(\\s*user\\s*=\\s*([^ )]+)\\s*\\)");
+
+        @Override
+        DBInfo.Builder doParse(String jdbcUrl, final DBInfo.Builder builder) {
+            final int addressEnd = jdbcUrl.indexOf(",address=");
+            if (addressEnd > 0) {
+                jdbcUrl = jdbcUrl.substring(0, addressEnd);
+            }
+            final Matcher hostMatcher = HOST_REGEX.matcher(jdbcUrl);
+            if (hostMatcher.find()) {
+                builder.host(hostMatcher.group(1));
+            }
+
+            final Matcher portMatcher = PORT_REGEX.matcher(jdbcUrl);
+            if (portMatcher.find()) {
+                builder.port(Integer.parseInt(portMatcher.group(1)));
+            }
+
+            final Matcher userMatcher = USER_REGEX.matcher(jdbcUrl);
+            if (userMatcher.find()) {
+                builder.user(userMatcher.group(1));
+            }
+
+            return builder;
         }
-        return MODIFIED_URL_LIKE.doParse(jdbcUrl, builder).type("hsqldb").subtype("https");
-      } else {
-        builder.subtype("mem");
-        instance = hsqlUrl;
-      }
-      return builder.instance(instance);
-    }
-  },
-
-  DERBY("derby") {
-    private static final String DEFAULT_USER = "APP";
-    private static final int DEFAULT_PORT = 1527;
-
-    @Override
-    DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
-      String instance = null;
-      String host = null;
-
-      final DBInfo dbInfo = builder.build();
-      if (dbInfo.getUser() == null) {
-        builder.user(DEFAULT_USER);
-      }
-
-      final String derbyUrl = jdbcUrl.substring("derby:".length());
-      int delimIndex = derbyUrl.indexOf(';');
-      final String details = delimIndex >= 0 ? derbyUrl.substring(0, delimIndex) : derbyUrl;
-      final String urlPart2 = delimIndex >= 0 ? derbyUrl.substring(delimIndex + 1) : null;
-
-      if (urlPart2 != null) {
-        populateStandardProperties(builder, splitQuery(urlPart2, ';'));
-      }
-
-      if (details.startsWith("memory:")) {
-        builder.subtype("memory");
-        final String urlInstance = details.substring("memory:".length());
-        if (!urlInstance.isEmpty()) {
-          instance = urlInstance;
+    },
+
+    SAP("sap") {
+        private static final String DEFAULT_HOST = "localhost";
+
+        @Override
+        DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
+            final DBInfo dbInfo = builder.build();
+            if (dbInfo.getHost() == null) {
+                builder.host(DEFAULT_HOST);
+            }
+            return GENERIC_URL_LIKE.doParse(jdbcUrl, builder);
         }
-      } else if (details.startsWith("directory:")) {
-        builder.subtype("directory");
-        final String urlInstance = details.substring("directory:".length());
-        if (!urlInstance.isEmpty()) {
-          instance = urlInstance;
+    },
+
+    MSSQLSERVER("microsoft", "sqlserver") {
+        private static final String DEFAULT_HOST = "localhost";
+        private static final int DEFAULT_PORT = 1433;
+
+        @Override
+        DBInfo.Builder doParse(String jdbcUrl, final DBInfo.Builder builder) {
+            if (jdbcUrl.startsWith("microsoft:")) {
+                jdbcUrl = jdbcUrl.substring("microsoft:".length());
+            }
+            if (!jdbcUrl.startsWith("sqlserver://")) {
+                return builder;
+            }
+            builder.type("sqlserver");
+            final DBInfo dbInfo = builder.build();
+            if (dbInfo.getHost() == null) {
+                builder.host(DEFAULT_HOST);
+            }
+            if (dbInfo.getPort() == null) {
+                builder.port(DEFAULT_PORT);
+            }
+            return MODIFIED_URL_LIKE.doParse(jdbcUrl, builder);
         }
-      } else if (details.startsWith("classpath:")) {
-        builder.subtype("classpath");
-        final String urlInstance = details.substring("classpath:".length());
-        if (!urlInstance.isEmpty()) {
-          instance = urlInstance;
+    },
+
+    DB2("db2", "as400") {
+        private static final int DEFAULT_PORT = 50000;
+
+        @Override
+        DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
+            final DBInfo dbInfo = builder.build();
+            if (dbInfo.getPort() == null) {
+                builder.port(DEFAULT_PORT);
+            }
+            return MODIFIED_URL_LIKE.doParse(jdbcUrl, builder);
         }
-      } else if (details.startsWith("jar:")) {
-        builder.subtype("jar");
-        final String urlInstance = details.substring("jar:".length());
-        if (!urlInstance.isEmpty()) {
-          instance = urlInstance;
+    },
+
+    ORACLE("oracle") {
+        private static final int DEFAULT_PORT = 1521;
+
+        @Override
+        DBInfo.Builder doParse(String jdbcUrl, final DBInfo.Builder builder) {
+            final int typeEndIndex = jdbcUrl.indexOf(':', "oracle:".length());
+            final String subtype = jdbcUrl.substring("oracle:".length(), typeEndIndex);
+            jdbcUrl = jdbcUrl.substring(typeEndIndex + 1);
+
+            builder.subtype(subtype);
+            final DBInfo dbInfo = builder.build();
+            if (dbInfo.getPort() == null) {
+                builder.port(DEFAULT_PORT);
+            }
+
+            if (jdbcUrl.contains("@")) {
+                return ORACLE_AT.doParse(jdbcUrl, builder);
+            } else {
+                return ORACLE_CONNECT_INFO.doParse(jdbcUrl, builder);
+            }
         }
-      } else if (details.startsWith("//")) {
-        builder.subtype("network");
-        if (dbInfo.getPort() == null) {
-          builder.port(DEFAULT_PORT);
+    },
+
+    ORACLE_CONNECT_INFO() {
+        @Override
+        DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
+
+            final String host;
+            final Integer port;
+            final String instance;
+
+            final int hostEnd = jdbcUrl.indexOf(':');
+            final int instanceLoc = jdbcUrl.indexOf('/');
+            if (hostEnd > 0) {
+                host = jdbcUrl.substring(0, hostEnd);
+                final int afterHostEnd = jdbcUrl.indexOf(':', hostEnd + 1);
+                if (afterHostEnd > 0) {
+                    port = Integer.parseInt(jdbcUrl.substring(hostEnd + 1, afterHostEnd));
+                    instance = jdbcUrl.substring(afterHostEnd + 1);
+                } else {
+                    if (instanceLoc > 0) {
+                        instance = jdbcUrl.substring(instanceLoc + 1);
+                        port = Integer.parseInt(jdbcUrl.substring(hostEnd + 1, instanceLoc));
+                    } else {
+                        final String portOrInstance = jdbcUrl.substring(hostEnd + 1);
+                        Integer parsedPort = null;
+                        try {
+                            parsedPort = Integer.parseInt(portOrInstance);
+                        } catch (final NumberFormatException ignored) {
+                        }
+                        if (parsedPort == null) {
+                            port = null;
+                            instance = portOrInstance;
+                        } else {
+                            port = parsedPort;
+                            instance = null;
+                        }
+                    }
+                }
+            } else {
+                if (instanceLoc > 0) {
+                    host = jdbcUrl.substring(0, instanceLoc);
+                    port = null;
+                    instance = jdbcUrl.substring(instanceLoc + 1);
+                } else {
+                    if (jdbcUrl.isEmpty()) {
+                        return builder;
+                    } else {
+                        host = null;
+                        port = null;
+                        instance = jdbcUrl;
+                    }
+                }
+            }
+            if (host != null) {
+                builder.host(host);
+            }
+            if (port != null) {
+                builder.port(port);
+            }
+            return builder.instance(instance);
         }
-        String url = details.substring("//".length());
-        final int instanceLoc = url.indexOf('/');
-        if (instanceLoc >= 0) {
-          instance = url.substring(instanceLoc + 1);
-          final int protoLoc = instance.indexOf(':');
-          if (protoLoc >= 0) {
-            instance = instance.substring(protoLoc + 1);
-          }
-          url = url.substring(0, instanceLoc);
+    },
+
+    ORACLE_AT() {
+        @Override
+        DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
+            if (jdbcUrl.contains("@(description")) {
+                return ORACLE_AT_DESCRIPTION.doParse(jdbcUrl, builder);
+            }
+            final String user;
+
+            int atIndex = jdbcUrl.indexOf('@');
+            final String urlPart1 = jdbcUrl.substring(0, atIndex);
+            final String connectInfo = jdbcUrl.substring(atIndex + 1);
+
+            final int userInfoLoc = urlPart1.indexOf('/');
+            if (userInfoLoc > 0) {
+                user = urlPart1.substring(0, userInfoLoc);
+            } else {
+                user = null;
+            }
+
+            final int hostStart;
+            if (connectInfo.startsWith("//")) {
+                hostStart = "//".length();
+            } else if (connectInfo.startsWith("ldap://")) {
+                hostStart = "ldap://".length();
+            } else {
+                hostStart = 0;
+            }
+            if (user != null) {
+                builder.user(user);
+            }
+            return ORACLE_CONNECT_INFO.doParse(connectInfo.substring(hostStart), builder);
+        }
+    },
+
+    /**
+     * This parser can locate incorrect data if multiple addresses are defined but not everything is
+     * defined in the first block. (It would locate data from subsequent address blocks.
+     */
+    ORACLE_AT_DESCRIPTION() {
+        private final Pattern HOST_REGEX = Pattern.compile("\\(\\s*host\\s*=\\s*([^ )]+)\\s*\\)");
+        private final Pattern PORT_REGEX = Pattern.compile("\\(\\s*port\\s*=\\s*([\\d]+)\\s*\\)");
+        private final Pattern INSTANCE_REGEX = Pattern.compile("\\(\\s*service_name\\s*=\\s*([^ )]+)\\s*\\)");
+
+        @Override
+        DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
+            int atIndex = jdbcUrl.indexOf('@');
+            final String urlPart1 = jdbcUrl.substring(0, atIndex);
+            final String urlPart2 = jdbcUrl.substring(atIndex + 1);
+
+            final int userInfoLoc = urlPart1.indexOf('/');
+            if (userInfoLoc > 0) {
+                builder.user(urlPart1.substring(0, userInfoLoc));
+            }
+
+            final Matcher hostMatcher = HOST_REGEX.matcher(urlPart2);
+            if (hostMatcher.find()) {
+                builder.host(hostMatcher.group(1));
+            }
+
+            final Matcher portMatcher = PORT_REGEX.matcher(urlPart2);
+            if (portMatcher.find()) {
+                builder.port(Integer.parseInt(portMatcher.group(1)));
+            }
+
+            final Matcher instanceMatcher = INSTANCE_REGEX.matcher(urlPart2);
+            if (instanceMatcher.find()) {
+                builder.instance(instanceMatcher.group(1));
+            }
+
+            return builder;
         }
-        final int portLoc = url.indexOf(':');
-        if (portLoc > 0) {
-          host = url.substring(0, portLoc);
-          builder.port(Integer.parseInt(url.substring(portLoc + 1)));
-        } else {
-          host = url;
+    },
+
+    H2("h2") {
+        private static final int DEFAULT_PORT = 8082;
+
+        @Override
+        DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
+            final String instance;
+
+            final String h2Url = jdbcUrl.substring("h2:".length());
+            if (h2Url.startsWith("mem:")) {
+                builder.subtype("mem");
+                final int propLoc = h2Url.indexOf(';');
+                if (propLoc >= 0) {
+                    instance = h2Url.substring("mem:".length(), propLoc);
+                } else {
+                    instance = h2Url.substring("mem:".length());
+                }
+            } else if (h2Url.startsWith("file:")) {
+                builder.subtype("file");
+                final int propLoc = h2Url.indexOf(';');
+                if (propLoc >= 0) {
+                    instance = h2Url.substring("file:".length(), propLoc);
+                } else {
+                    instance = h2Url.substring("file:".length());
+                }
+            } else if (h2Url.startsWith("zip:")) {
+                builder.subtype("zip");
+                final int propLoc = h2Url.indexOf(';');
+                if (propLoc >= 0) {
+                    instance = h2Url.substring("zip:".length(), propLoc);
+                } else {
+                    instance = h2Url.substring("zip:".length());
+                }
+            } else if (h2Url.startsWith("tcp:")) {
+                final DBInfo dbInfo = builder.build();
+                if (dbInfo.getPort() == null) {
+                    builder.port(DEFAULT_PORT);
+                }
+                return MODIFIED_URL_LIKE.doParse(jdbcUrl, builder).type("h2").subtype("tcp");
+            } else if (h2Url.startsWith("ssl:")) {
+                final DBInfo dbInfo = builder.build();
+                if (dbInfo.getPort() == null) {
+                    builder.port(DEFAULT_PORT);
+                }
+                return MODIFIED_URL_LIKE.doParse(jdbcUrl, builder).type("h2").subtype("ssl");
+            } else {
+                builder.subtype("file");
+                final int propLoc = h2Url.indexOf(';');
+                if (propLoc >= 0) {
+                    instance = h2Url.substring(0, propLoc);
+                } else {
+                    instance = h2Url;
+                }
+            }
+            if (!instance.isEmpty()) {
+                builder.instance(instance);
+            }
+            return builder;
         }
-      } else {
-        builder.subtype("directory");
-        if (!details.isEmpty()) {
-          instance = details;
+    },
+
+    HSQL("hsqldb") {
+        private static final String DEFAULT_USER = "SA";
+        private static final int DEFAULT_PORT = 9001;
+
+        @Override
+        DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
+            String instance;
+            final DBInfo dbInfo = builder.build();
+            if (dbInfo.getUser() == null) {
+                builder.user(DEFAULT_USER);
+            }
+            final String hsqlUrl = jdbcUrl.substring("hsqldb:".length());
+            if (hsqlUrl.startsWith("mem:")) {
+                builder.subtype("mem");
+                instance = hsqlUrl.substring("mem:".length());
+            } else if (hsqlUrl.startsWith("file:")) {
+                builder.subtype("file");
+                instance = hsqlUrl.substring("file:".length());
+            } else if (hsqlUrl.startsWith("res:")) {
+                builder.subtype("res");
+                instance = hsqlUrl.substring("res:".length());
+            } else if (hsqlUrl.startsWith("hsql:")) {
+                if (dbInfo.getPort() == null) {
+                    builder.port(DEFAULT_PORT);
+                }
+                return MODIFIED_URL_LIKE
+                        .doParse(jdbcUrl, builder)
+                        .type("hsqldb")
+                        .subtype("hsql");
+            } else if (hsqlUrl.startsWith("hsqls:")) {
+                if (dbInfo.getPort() == null) {
+                    builder.port(DEFAULT_PORT);
+                }
+                return MODIFIED_URL_LIKE
+                        .doParse(jdbcUrl, builder)
+                        .type("hsqldb")
+                        .subtype("hsqls");
+            } else if (hsqlUrl.startsWith("http:")) {
+                if (dbInfo.getPort() == null) {
+                    builder.port(80);
+                }
+                return MODIFIED_URL_LIKE
+                        .doParse(jdbcUrl, builder)
+                        .type("hsqldb")
+                        .subtype("http");
+            } else if (hsqlUrl.startsWith("https:")) {
+                if (dbInfo.getPort() == null) {
+                    builder.port(443);
+                }
+                return MODIFIED_URL_LIKE
+                        .doParse(jdbcUrl, builder)
+                        .type("hsqldb")
+                        .subtype("https");
+            } else {
+                builder.subtype("mem");
+                instance = hsqlUrl;
+            }
+            return builder.instance(instance);
         }
-      }
+    },
 
-      if (host != null) {
-        builder.host(host);
-      }
-      return builder.instance(instance);
-    }
-  },
+    DERBY("derby") {
+        private static final String DEFAULT_USER = "APP";
+        private static final int DEFAULT_PORT = 1527;
 
-  /** http://jtds.sourceforge.net/faq.html#urlFormat */
-  JTDS("jtds") {
-    private static final int DEFAULT_SQL_SERVER_PORT = 1433;
-    private static final int DEFAULT_SYBASE_PORT = 7100;
+        @Override
+        DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
+            String instance = null;
+            String host = null;
 
-    @Override
-    DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
-      final DBInfo dbInfo = builder.build();
+            final DBInfo dbInfo = builder.build();
+            if (dbInfo.getUser() == null) {
+                builder.user(DEFAULT_USER);
+            }
 
-      final int protoLoc = jdbcUrl.indexOf("://");
-      final int typeEndLoc = dbInfo.getType().length();
-      final String subtype = jdbcUrl.substring(typeEndLoc + 1, protoLoc);
+            final String derbyUrl = jdbcUrl.substring("derby:".length());
+            int delimIndex = derbyUrl.indexOf(';');
+            final String details = delimIndex >= 0 ? derbyUrl.substring(0, delimIndex) : derbyUrl;
+            final String urlPart2 = delimIndex >= 0 ? derbyUrl.substring(delimIndex + 1) : null;
 
-      builder.subtype(subtype);
+            if (urlPart2 != null) {
+                populateStandardProperties(builder, splitQuery(urlPart2, ';'));
+            }
 
-      if ("sqlserver".equals(subtype)) {
-        if (dbInfo.getPort() == null) {
-          builder.port(DEFAULT_SQL_SERVER_PORT);
-        }
-      } else if ("sybase".equals(subtype)) {
-        if (dbInfo.getPort() == null) {
-          builder.port(DEFAULT_SYBASE_PORT);
+            if (details.startsWith("memory:")) {
+                builder.subtype("memory");
+                final String urlInstance = details.substring("memory:".length());
+                if (!urlInstance.isEmpty()) {
+                    instance = urlInstance;
+                }
+            } else if (details.startsWith("directory:")) {
+                builder.subtype("directory");
+                final String urlInstance = details.substring("directory:".length());
+                if (!urlInstance.isEmpty()) {
+                    instance = urlInstance;
+                }
+            } else if (details.startsWith("classpath:")) {
+                builder.subtype("classpath");
+                final String urlInstance = details.substring("classpath:".length());
+                if (!urlInstance.isEmpty()) {
+                    instance = urlInstance;
+                }
+            } else if (details.startsWith("jar:")) {
+                builder.subtype("jar");
+                final String urlInstance = details.substring("jar:".length());
+                if (!urlInstance.isEmpty()) {
+                    instance = urlInstance;
+                }
+            } else if (details.startsWith("//")) {
+                builder.subtype("network");
+                if (dbInfo.getPort() == null) {
+                    builder.port(DEFAULT_PORT);
+                }
+                String url = details.substring("//".length());
+                final int instanceLoc = url.indexOf('/');
+                if (instanceLoc >= 0) {
+                    instance = url.substring(instanceLoc + 1);
+                    final int protoLoc = instance.indexOf(':');
+                    if (protoLoc >= 0) {
+                        instance = instance.substring(protoLoc + 1);
+                    }
+                    url = url.substring(0, instanceLoc);
+                }
+                final int portLoc = url.indexOf(':');
+                if (portLoc > 0) {
+                    host = url.substring(0, portLoc);
+                    builder.port(Integer.parseInt(url.substring(portLoc + 1)));
+                } else {
+                    host = url;
+                }
+            } else {
+                builder.subtype("directory");
+                if (!details.isEmpty()) {
+                    instance = details;
+                }
+            }
+
+            if (host != null) {
+                builder.host(host);
+            }
+            return builder.instance(instance);
         }
-      }
+    },
+
+    /** http://jtds.sourceforge.net/faq.html#urlFormat */
+    JTDS("jtds") {
+        private static final int DEFAULT_SQL_SERVER_PORT = 1433;
+        private static final int DEFAULT_SYBASE_PORT = 7100;
+
+        @Override
+        DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
+            final DBInfo dbInfo = builder.build();
+
+            final int protoLoc = jdbcUrl.indexOf("://");
+            final int typeEndLoc = dbInfo.getType().length();
+            final String subtype = jdbcUrl.substring(typeEndLoc + 1, protoLoc);
+
+            builder.subtype(subtype);
+
+            if ("sqlserver".equals(subtype)) {
+                if (dbInfo.getPort() == null) {
+                    builder.port(DEFAULT_SQL_SERVER_PORT);
+                }
+            } else if ("sybase".equals(subtype)) {
+                if (dbInfo.getPort() == null) {
+                    builder.port(DEFAULT_SYBASE_PORT);
+                }
+            }
+
+            final String details = jdbcUrl.substring(protoLoc + "://".length());
 
-      final String details = jdbcUrl.substring(protoLoc + "://".length());
+            final int hostEndLoc;
+            final int portLoc = details.indexOf(':', typeEndLoc + 1);
+            final int dbLoc = details.indexOf('/', typeEndLoc);
+            final int paramLoc = details.indexOf(';', dbLoc);
 
-      final int hostEndLoc;
-      final int portLoc = details.indexOf(':', typeEndLoc + 1);
-      final int dbLoc = details.indexOf('/', typeEndLoc);
-      final int paramLoc = details.indexOf(';', dbLoc);
+            if (paramLoc > 0) {
+                populateStandardProperties(builder, splitQuery(details.substring(paramLoc + 1), ';'));
+                if (dbLoc > 0) {
+                    builder.db(details.substring(dbLoc + 1, paramLoc));
+                }
+            } else {
+                if (dbLoc > 0) {
+                    builder.db(details.substring(dbLoc + 1));
+                }
+            }
 
-      if (paramLoc > 0) {
-        populateStandardProperties(builder, splitQuery(details.substring(paramLoc + 1), ';'));
-        if (dbLoc > 0) {
-          builder.db(details.substring(dbLoc + 1, paramLoc));
+            if (portLoc > 0) {
+                hostEndLoc = portLoc;
+                final int portEndLoc = dbLoc > 0 ? dbLoc : (paramLoc > 0 ? paramLoc : details.length());
+                try {
+                    builder.port(Integer.parseInt(details.substring(portLoc + 1, portEndLoc)));
+                } catch (final NumberFormatException ignored) {
+                }
+            } else if (dbLoc > 0) {
+                hostEndLoc = dbLoc;
+            } else if (paramLoc > 0) {
+                hostEndLoc = paramLoc;
+            } else {
+                hostEndLoc = details.length();
+            }
+
+            builder.host(details.substring(0, hostEndLoc));
+
+            return builder;
         }
-      } else {
-        if (dbLoc > 0) {
-          builder.db(details.substring(dbLoc + 1));
+    },
+
+    REDSHIFT("redshift") {
+        @Override
+        DBInfo.Builder doParse(String jdbcUrl, DBInfo.Builder builder) {
+            builder = GENERIC_URL_LIKE.doParse(jdbcUrl, builder);
+            final DBInfo dbInfo = builder.build();
+            if (dbInfo.getHost() != null) {
+                int firstDotLoc = dbInfo.getHost().indexOf('.');
+                if (firstDotLoc > 0) {
+                    builder.instance(dbInfo.getHost().substring(0, firstDotLoc));
+                }
+            }
+            return builder;
         }
-      }
+    },
 
-      if (portLoc > 0) {
-        hostEndLoc = portLoc;
-        final int portEndLoc = dbLoc > 0 ? dbLoc : (paramLoc > 0 ? paramLoc : details.length());
-        try {
-          builder.port(Integer.parseInt(details.substring(portLoc + 1, portEndLoc)));
-        } catch (final NumberFormatException ignored) {
+    SNOWFLAKE("snowflake") {
+        @Override
+        DBInfo.Builder doParse(String jdbcUrl, DBInfo.Builder builder) {
+            String url = jdbcUrl;
+            if (url.startsWith("jdbc:")) {
+                url = url.substring(5);
+            }
+            return GENERIC_URL_LIKE.doParse(url, builder);
+        }
+    },
+
+    IRIS("iris") {
+        @Override
+        DBInfo.Builder doParse(String jdbcUrl, DBInfo.Builder builder) {
+            String url = jdbcUrl;
+            int firstSlash = url.indexOf('/', "jdbc://iris:/".length());
+            int nextSlash = url.indexOf('/', firstSlash + 1);
+            if (nextSlash > firstSlash) {
+                // strip the options and preserve only the url like part
+                url = url.substring(0, nextSlash);
+            }
+            return GENERIC_URL_LIKE.doParse(url, builder);
+        }
+    },
+    // https://infocenter.sybase.com/help/index.jsp?topic=/com.sybase.infocenter.dc01776.1601/doc/html/san1357754914053.html
+    // Sybase TDS
+    SYBASE_TDS("sybase") {
+        @Override
+        DBInfo.Builder doParse(String jdbcUrl, DBInfo.Builder builder) {
+            if (jdbcUrl.startsWith("sybase:tds:")) {
+                // that uri is opaque so we need to adjust it in order to be parsed with the classical
+                // hierarchical way
+                return GENERIC_URL_LIKE
+                        .doParse("sybase://" + jdbcUrl.substring("sybase:tds:".length()), builder)
+                        .subtype("tds");
+            }
+            return GENERIC_URL_LIKE.doParse(jdbcUrl, builder);
         }
-      } else if (dbLoc > 0) {
-        hostEndLoc = dbLoc;
-      } else if (paramLoc > 0) {
-        hostEndLoc = paramLoc;
-      } else {
-        hostEndLoc = details.length();
-      }
+    },
+    ;
 
-      builder.host(details.substring(0, hostEndLoc));
+    private static final Map<String, JDBCConnectionUrlParser> typeParsers = new HashMap<>();
 
-      return builder;
-    }
-  },
-
-  REDSHIFT("redshift") {
-    @Override
-    DBInfo.Builder doParse(String jdbcUrl, DBInfo.Builder builder) {
-      builder = GENERIC_URL_LIKE.doParse(jdbcUrl, builder);
-      final DBInfo dbInfo = builder.build();
-      if (dbInfo.getHost() != null) {
-        int firstDotLoc = dbInfo.getHost().indexOf('.');
-        if (firstDotLoc > 0) {
-          builder.instance(dbInfo.getHost().substring(0, firstDotLoc));
+    static {
+        for (final JDBCConnectionUrlParser parser : JDBCConnectionUrlParser.values()) {
+            for (final String key : parser.typeKeys) {
+                typeParsers.put(key, parser);
+            }
         }
-      }
-      return builder;
-    }
-  },
-
-  SNOWFLAKE("snowflake") {
-    @Override
-    DBInfo.Builder doParse(String jdbcUrl, DBInfo.Builder builder) {
-      String url = jdbcUrl;
-      if (url.startsWith("jdbc:")) {
-        url = url.substring(5);
-      }
-      return GENERIC_URL_LIKE.doParse(url, builder);
     }
-  },
-
-  IRIS("iris") {
-    @Override
-    DBInfo.Builder doParse(String jdbcUrl, DBInfo.Builder builder) {
-      String url = jdbcUrl;
-      int firstSlash = url.indexOf('/', "jdbc://iris:/".length());
-      int nextSlash = url.indexOf('/', firstSlash + 1);
-      if (nextSlash > firstSlash) {
-        // strip the options and preserve only the url like part
-        url = url.substring(0, nextSlash);
-      }
-      return GENERIC_URL_LIKE.doParse(url, builder);
-    }
-  },
-  // https://infocenter.sybase.com/help/index.jsp?topic=/com.sybase.infocenter.dc01776.1601/doc/html/san1357754914053.html
-  // Sybase TDS
-  SYBASE_TDS("sybase") {
-    @Override
-    DBInfo.Builder doParse(String jdbcUrl, DBInfo.Builder builder) {
-      if (jdbcUrl.startsWith("sybase:tds:")) {
-        // that uri is opaque so we need to adjust it in order to be parsed with the classical
-        // hierarchical way
-        return GENERIC_URL_LIKE
-            .doParse("sybase://" + jdbcUrl.substring("sybase:tds:".length()), builder)
-            .subtype("tds");
-      }
-      return GENERIC_URL_LIKE.doParse(jdbcUrl, builder);
+
+    private static final DDCache<Pair<String, Properties>, DBInfo> CACHED_DB_INFO = DDCaches.newFixedSizeCache(32);
+    private static final Function<Pair<String, Properties>, DBInfo> PARSE =
+            input -> parse(input.getLeft(), input.getRight());
+
+    private final String[] typeKeys;
+
+    JDBCConnectionUrlParser(final String... typeKeys) {
+        this.typeKeys = typeKeys;
     }
-  },
-  ;
 
-  private static final Map<String, JDBCConnectionUrlParser> typeParsers = new HashMap<>();
+    abstract DBInfo.Builder doParse(String jdbcUrl, final DBInfo.Builder builder);
 
-  static {
-    for (final JDBCConnectionUrlParser parser : JDBCConnectionUrlParser.values()) {
-      for (final String key : parser.typeKeys) {
-        typeParsers.put(key, parser);
-      }
+    public static DBInfo extractDBInfo(String connectionUrl, Properties props) {
+        return CACHED_DB_INFO.computeIfAbsent(Pair.of(connectionUrl, props), PARSE);
     }
-  }
 
-  private static final DDCache<Pair<String, Properties>, DBInfo> CACHED_DB_INFO =
-      DDCaches.newFixedSizeCache(32);
-  private static final Function<Pair<String, Properties>, DBInfo> PARSE =
-      input -> parse(input.getLeft(), input.getRight());
+    public static DBInfo parse(String connectionUrl, final Properties props) {
+        if (connectionUrl == null) {
+            return DEFAULT;
+        }
+        // Make this easier and ignore case.
+        connectionUrl = connectionUrl.toLowerCase(Locale.ROOT);
 
-  private final String[] typeKeys;
+        if (!connectionUrl.startsWith("jdbc:")) {
+            return DEFAULT;
+        }
 
-  JDBCConnectionUrlParser(final String... typeKeys) {
-    this.typeKeys = typeKeys;
-  }
+        final String jdbcUrl = connectionUrl.substring("jdbc:".length());
+        final int typeLoc = jdbcUrl.indexOf(':');
 
-  abstract DBInfo.Builder doParse(String jdbcUrl, final DBInfo.Builder builder);
+        if (typeLoc < 1) {
+            // Invalid format: `jdbc:` or `jdbc::`
+            return DEFAULT;
+        }
 
-  public static DBInfo extractDBInfo(String connectionUrl, Properties props) {
-    return CACHED_DB_INFO.computeIfAbsent(Pair.of(connectionUrl, props), PARSE);
-  }
+        final String baseType = jdbcUrl.substring(0, typeLoc);
 
-  public static DBInfo parse(String connectionUrl, final Properties props) {
-    if (connectionUrl == null) {
-      return DEFAULT;
-    }
-    // Make this easier and ignore case.
-    connectionUrl = connectionUrl.toLowerCase(Locale.ROOT);
+        final DBInfo.Builder parsedProps = DEFAULT.toBuilder().type(baseType);
+        populateStandardProperties(parsedProps, props);
 
-    if (!connectionUrl.startsWith("jdbc:")) {
-      return DEFAULT;
+        try {
+            if (typeParsers.containsKey(baseType)) {
+                // Delegate to specific parser
+                return typeParsers.get(baseType).doParse(jdbcUrl, parsedProps).build();
+            }
+            return GENERIC_URL_LIKE.doParse(jdbcUrl, parsedProps).build();
+        } catch (final Exception e) {
+            ExceptionLogger.LOGGER.debug("Error parsing URL", e);
+            return parsedProps.build();
+        }
     }
 
-    final String jdbcUrl = connectionUrl.substring("jdbc:".length());
-    final int typeLoc = jdbcUrl.indexOf(':');
-
-    if (typeLoc < 1) {
-      // Invalid format: `jdbc:` or `jdbc::`
-      return DEFAULT;
+    // Source: https://stackoverflow.com/a/13592567
+    @SuppressForbidden
+    private static Map<String, String> splitQuery(final String query, final char separator) {
+        if (query == null || query.isEmpty()) {
+            return Collections.emptyMap();
+        }
+        final Map<String, String> query_pairs = new LinkedHashMap<>();
+        int start = 0;
+        for (int i = query.indexOf(separator); start != -1; i = query.indexOf(separator, i + 1)) {
+            try {
+                final String pair = i >= 0 ? query.substring(start, i) : query.substring(start);
+                final int idx = pair.indexOf('=');
+                final String key = idx > 0 ? URLDecoder.decode(pair.substring(0, idx), "UTF-8") : pair;
+                if (!query_pairs.containsKey(key)) {
+                    final String value = idx > 0 && pair.length() > idx + 1
+                            ? URLDecoder.decode(pair.substring(idx + 1), "UTF-8")
+                            : null;
+                    query_pairs.put(key, value);
+                }
+            } catch (final UnsupportedEncodingException e) {
+                // Ignore.
+            }
+            start = i == -1 ? i : i + 1;
+        }
+        return query_pairs;
     }
 
-    final String baseType = jdbcUrl.substring(0, typeLoc);
+    private static void populateStandardProperties(final DBInfo.Builder builder, final Map<?, ?> props) {
+        if (props != null && !props.isEmpty()) {
+            if (props.containsKey("user")) {
+                builder.user((String) props.get("user"));
+            }
 
-    final DBInfo.Builder parsedProps = DEFAULT.toBuilder().type(baseType);
-    populateStandardProperties(parsedProps, props);
+            if (props.containsKey("databasename")) {
+                builder.db((String) props.get("databasename"));
+            }
+            if (props.containsKey("databaseName")) {
+                builder.db((String) props.get("databaseName"));
+            }
+            if (props.containsKey("db")) {
+                builder.db((String) props.get("db"));
+            }
+            if (props.containsKey("warehouse")) {
+                builder.warehouse((String) props.get("warehouse"));
+            }
+            if (props.containsKey("schema")) {
+                builder.schema((String) props.get("schema"));
+            }
+            if (props.containsKey("servername")) {
+                builder.host((String) props.get("servername"));
+            }
+            if (props.containsKey("serverName")) {
+                builder.host((String) props.get("serverName"));
+            }
 
-    try {
-      if (typeParsers.containsKey(baseType)) {
-        // Delegate to specific parser
-        return typeParsers.get(baseType).doParse(jdbcUrl, parsedProps).build();
-      }
-      return GENERIC_URL_LIKE.doParse(jdbcUrl, parsedProps).build();
-    } catch (final Exception e) {
-      ExceptionLogger.LOGGER.debug("Error parsing URL", e);
-      return parsedProps.build();
-    }
-  }
+            if (props.containsKey("portnumber")) {
+                final String portNumber = (String) props.get("portnumber");
+                try {
+                    builder.port(Integer.parseInt(portNumber));
+                } catch (final NumberFormatException e) {
+                    ExceptionLogger.LOGGER.debug("Error parsing portnumber property: {}", portNumber, e);
+                }
+            }
+            if (props.containsKey("servicename")) {
+                // this property is used to specify the db to use for Sybase connection strings
+                builder.instance((String) props.get("servicename"));
+            }
 
-  // Source: https://stackoverflow.com/a/13592567
-  @SuppressForbidden
-  private static Map<String, String> splitQuery(final String query, final char separator) {
-    if (query == null || query.isEmpty()) {
-      return Collections.emptyMap();
-    }
-    final Map<String, String> query_pairs = new LinkedHashMap<>();
-    int start = 0;
-    for (int i = query.indexOf(separator); start != -1; i = query.indexOf(separator, i + 1)) {
-      try {
-        final String pair = i >= 0 ? query.substring(start, i) : query.substring(start);
-        final int idx = pair.indexOf('=');
-        final String key = idx > 0 ? URLDecoder.decode(pair.substring(0, idx), "UTF-8") : pair;
-        if (!query_pairs.containsKey(key)) {
-          final String value =
-              idx > 0 && pair.length() > idx + 1
-                  ? URLDecoder.decode(pair.substring(idx + 1), "UTF-8")
-                  : null;
-          query_pairs.put(key, value);
-        }
-      } catch (final UnsupportedEncodingException e) {
-        // Ignore.
-      }
-      start = i == -1 ? i : i + 1;
-    }
-    return query_pairs;
-  }
-
-  private static void populateStandardProperties(
-      final DBInfo.Builder builder, final Map<?, ?> props) {
-    if (props != null && !props.isEmpty()) {
-      if (props.containsKey("user")) {
-        builder.user((String) props.get("user"));
-      }
-
-      if (props.containsKey("databasename")) {
-        builder.db((String) props.get("databasename"));
-      }
-      if (props.containsKey("databaseName")) {
-        builder.db((String) props.get("databaseName"));
-      }
-      if (props.containsKey("db")) {
-        builder.db((String) props.get("db"));
-      }
-      if (props.containsKey("warehouse")) {
-        builder.warehouse((String) props.get("warehouse"));
-      }
-      if (props.containsKey("schema")) {
-        builder.schema((String) props.get("schema"));
-      }
-      if (props.containsKey("servername")) {
-        builder.host((String) props.get("servername"));
-      }
-      if (props.containsKey("serverName")) {
-        builder.host((String) props.get("serverName"));
-      }
-
-      if (props.containsKey("portnumber")) {
-        final String portNumber = (String) props.get("portnumber");
-        try {
-          builder.port(Integer.parseInt(portNumber));
-        } catch (final NumberFormatException e) {
-          ExceptionLogger.LOGGER.debug("Error parsing portnumber property: {}", portNumber, e);
-        }
-      }
-      if (props.containsKey("servicename")) {
-        // this property is used to specify the db to use for Sybase connection strings
-        builder.instance((String) props.get("servicename"));
-      }
-
-      if (props.containsKey("portNumber")) {
-        final String portNumber = (String) props.get("portNumber");
-        try {
-          builder.port(Integer.parseInt(portNumber));
-        } catch (final NumberFormatException e) {
-          ExceptionLogger.LOGGER.debug("Error parsing portNumber property: {}", portNumber, e);
+            if (props.containsKey("portNumber")) {
+                final String portNumber = (String) props.get("portNumber");
+                try {
+                    builder.port(Integer.parseInt(portNumber));
+                } catch (final NumberFormatException e) {
+                    ExceptionLogger.LOGGER.debug("Error parsing portNumber property: {}", portNumber, e);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jfr/InstrumentationBasedProfiling.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jfr/InstrumentationBasedProfiling.java
index 846d8e381c3..75b6726dd1f 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jfr/InstrumentationBasedProfiling.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jfr/InstrumentationBasedProfiling.java
@@ -3,16 +3,16 @@
 import datadog.trace.api.Platform;
 
 public final class InstrumentationBasedProfiling {
-  private static volatile boolean isJFRReady;
+    private static volatile boolean isJFRReady;
 
-  public static void enableInstrumentationBasedProfiling() {
-    // ignore the enablement when running in native image builder
-    if (!Platform.isNativeImageBuilder()) {
-      isJFRReady = true;
+    public static void enableInstrumentationBasedProfiling() {
+        // ignore the enablement when running in native image builder
+        if (!Platform.isNativeImageBuilder()) {
+            isJFRReady = true;
+        }
     }
-  }
 
-  public static boolean isJFRReady() {
-    return isJFRReady;
-  }
+    public static boolean isJFRReady() {
+        return isJFRReady;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/MessageBatchState.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/MessageBatchState.java
index a3361c3c90e..6f2052e89cb 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/MessageBatchState.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/MessageBatchState.java
@@ -5,23 +5,23 @@
 
 /** Holds time-in-queue related information about a batch of messages. */
 public final class MessageBatchState {
-  private static final IdGenerationStrategy ID_STRATEGY = Config.get().getIdGenerationStrategy();
+    private static final IdGenerationStrategy ID_STRATEGY = Config.get().getIdGenerationStrategy();
 
-  final long batchId;
-  final long startMillis;
-  final int commitSequence; // used to decide when to assign a new batch state
+    final long batchId;
+    final long startMillis;
+    final int commitSequence; // used to decide when to assign a new batch state
 
-  MessageBatchState(int commitSequence) {
-    this.batchId = ID_STRATEGY.generateTraceId().toLong();
-    this.startMillis = System.currentTimeMillis();
-    this.commitSequence = commitSequence;
-  }
+    MessageBatchState(int commitSequence) {
+        this.batchId = ID_STRATEGY.generateTraceId().toLong();
+        this.startMillis = System.currentTimeMillis();
+        this.commitSequence = commitSequence;
+    }
 
-  public long getBatchId() {
-    return batchId;
-  }
+    public long getBatchId() {
+        return batchId;
+    }
 
-  public long getStartMillis() {
-    return startMillis;
-  }
+    public long getStartMillis() {
+        return startMillis;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/MessageConsumerState.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/MessageConsumerState.java
index 0d24618fabf..73e48477bc5 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/MessageConsumerState.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/MessageConsumerState.java
@@ -6,74 +6,74 @@
 /** Tracks message spans when consuming messages with {@code receive}. */
 public final class MessageConsumerState {
 
-  private final SessionState sessionState;
-  private final CharSequence brokerResourceName;
-  private final String brokerServiceName;
-  private final CharSequence consumerBaseResourceName;
-  private final CharSequence consumerResourceName;
-  private final boolean propagationDisabled;
+    private final SessionState sessionState;
+    private final CharSequence brokerResourceName;
+    private final String brokerServiceName;
+    private final CharSequence consumerBaseResourceName;
+    private final CharSequence consumerResourceName;
+    private final boolean propagationDisabled;
 
-  public MessageConsumerState(
-      SessionState sessionState,
-      CharSequence brokerResourceName,
-      CharSequence consumerBaseResourceName,
-      CharSequence consumerResourceName,
-      boolean propagationDisabled) {
-    this.sessionState = sessionState;
-    this.brokerResourceName = brokerResourceName;
-    this.consumerBaseResourceName = consumerBaseResourceName;
-    this.consumerResourceName = consumerResourceName;
-    this.propagationDisabled = propagationDisabled;
+    public MessageConsumerState(
+            SessionState sessionState,
+            CharSequence brokerResourceName,
+            CharSequence consumerBaseResourceName,
+            CharSequence consumerResourceName,
+            boolean propagationDisabled) {
+        this.sessionState = sessionState;
+        this.brokerResourceName = brokerResourceName;
+        this.consumerBaseResourceName = consumerBaseResourceName;
+        this.consumerResourceName = consumerResourceName;
+        this.propagationDisabled = propagationDisabled;
 
-    if (Config.get().isMessageBrokerSplitByDestination()) {
-      // use the destination as the service name, with no prefix
-      String brokerServiceName = brokerResourceName.toString();
-      if (brokerServiceName.startsWith("Queue ") || brokerServiceName.startsWith("Topic ")) {
-        this.brokerServiceName = brokerServiceName.substring(6);
-      } else {
-        this.brokerServiceName = brokerServiceName;
-      }
-    } else {
-      this.brokerServiceName = null;
+        if (Config.get().isMessageBrokerSplitByDestination()) {
+            // use the destination as the service name, with no prefix
+            String brokerServiceName = brokerResourceName.toString();
+            if (brokerServiceName.startsWith("Queue ") || brokerServiceName.startsWith("Topic ")) {
+                this.brokerServiceName = brokerServiceName.substring(6);
+            } else {
+                this.brokerServiceName = brokerServiceName;
+            }
+        } else {
+            this.brokerServiceName = null;
+        }
     }
-  }
 
-  public SessionState getSessionState() {
-    return sessionState;
-  }
+    public SessionState getSessionState() {
+        return sessionState;
+    }
 
-  public CharSequence getBrokerResourceName() {
-    return brokerResourceName;
-  }
+    public CharSequence getBrokerResourceName() {
+        return brokerResourceName;
+    }
 
-  public String getBrokerServiceName() {
-    return brokerServiceName;
-  }
+    public String getBrokerServiceName() {
+        return brokerServiceName;
+    }
 
-  public CharSequence getConsumerBaseResourceName() {
-    return consumerBaseResourceName;
-  }
+    public CharSequence getConsumerBaseResourceName() {
+        return consumerBaseResourceName;
+    }
 
-  public CharSequence getConsumerResourceName() {
-    return consumerResourceName;
-  }
+    public CharSequence getConsumerResourceName() {
+        return consumerResourceName;
+    }
 
-  public boolean isPropagationDisabled() {
-    return propagationDisabled;
-  }
+    public boolean isPropagationDisabled() {
+        return propagationDisabled;
+    }
 
-  /** Gets the current time-in-queue span; returns {@code null} if this is a new batch. */
-  public AgentSpan getTimeInQueueSpan(long batchId) {
-    return sessionState.getTimeInQueueSpan(batchId); // tracked per-session-thread
-  }
+    /** Gets the current time-in-queue span; returns {@code null} if this is a new batch. */
+    public AgentSpan getTimeInQueueSpan(long batchId) {
+        return sessionState.getTimeInQueueSpan(batchId); // tracked per-session-thread
+    }
 
-  /** Starts tracking a new time-in-queue span. */
-  public void setTimeInQueueSpan(long batchId, AgentSpan span) {
-    sessionState.setTimeInQueueSpan(batchId, span); // tracked per-session-thread
-  }
+    /** Starts tracking a new time-in-queue span. */
+    public void setTimeInQueueSpan(long batchId, AgentSpan span) {
+        sessionState.setTimeInQueueSpan(batchId, span); // tracked per-session-thread
+    }
 
-  /** Finishes the current time-in-queue span and optionally stops tracking it. */
-  public void finishTimeInQueueSpan(boolean clear) {
-    sessionState.finishTimeInQueueSpan(clear); // tracked per-session-thread
-  }
+    /** Finishes the current time-in-queue span and optionally stops tracking it. */
+    public void finishTimeInQueueSpan(boolean clear) {
+        sessionState.finishTimeInQueueSpan(clear); // tracked per-session-thread
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/MessageProducerState.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/MessageProducerState.java
index ccd359a7322..25b33c1d8a7 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/MessageProducerState.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/MessageProducerState.java
@@ -2,31 +2,30 @@
 
 public final class MessageProducerState {
 
-  private final SessionState sessionState;
-  private final CharSequence resourceName;
-  private final boolean propagationDisabled;
+    private final SessionState sessionState;
+    private final CharSequence resourceName;
+    private final boolean propagationDisabled;
 
-  public MessageProducerState(
-      SessionState sessionState, CharSequence resourceName, boolean propagationDisabled) {
-    this.sessionState = sessionState;
-    this.resourceName = resourceName;
-    this.propagationDisabled = propagationDisabled;
-  }
+    public MessageProducerState(SessionState sessionState, CharSequence resourceName, boolean propagationDisabled) {
+        this.sessionState = sessionState;
+        this.resourceName = resourceName;
+        this.propagationDisabled = propagationDisabled;
+    }
 
-  public SessionState getSessionState() {
-    return sessionState;
-  }
+    public SessionState getSessionState() {
+        return sessionState;
+    }
 
-  public CharSequence getResourceName() {
-    return resourceName;
-  }
+    public CharSequence getResourceName() {
+        return resourceName;
+    }
 
-  public boolean isPropagationDisabled() {
-    return propagationDisabled;
-  }
+    public boolean isPropagationDisabled() {
+        return propagationDisabled;
+    }
 
-  /** Retrieves details about the current message batch being produced in this session. */
-  public MessageBatchState currentBatchState() {
-    return sessionState.currentBatchState(); // tracked per-session
-  }
+    /** Retrieves details about the current message batch being produced in this session. */
+    public MessageBatchState currentBatchState() {
+        return sessionState.currentBatchState(); // tracked per-session
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/SessionState.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/SessionState.java
index be2179818ea..437f662e6fc 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/SessionState.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/SessionState.java
@@ -22,277 +22,280 @@
  */
 public final class SessionState {
 
-  private static final AtomicReferenceFieldUpdater<SessionState, MessageBatchState> BATCH_STATE =
-      AtomicReferenceFieldUpdater.newUpdater(
-          SessionState.class, MessageBatchState.class, "batchState");
-  private static final AtomicIntegerFieldUpdater<SessionState> COMMIT_SEQUENCE =
-      AtomicIntegerFieldUpdater.newUpdater(SessionState.class, "commitSequence");
-
-  private static final AtomicIntegerFieldUpdater<SessionState> TIME_IN_QUEUE_SPAN_COUNT =
-      AtomicIntegerFieldUpdater.newUpdater(SessionState.class, "timeInQueueSpanCount");
-
-  private static final Comparator<Map.Entry<Thread, TimeInQueue>> YOUNGEST_TIME_IN_QUEUE_FIRST =
-      new Comparator<Map.Entry<Thread, TimeInQueue>>() {
-        @Override
-        public int compare(Map.Entry<Thread, TimeInQueue> o1, Map.Entry<Thread, TimeInQueue> o2) {
-          // reverse natural order to sort start time by largest first (ie. youngest)
-          return Long.compare(o2.getValue().span.getStartTime(), o1.getValue().span.getStartTime());
+    private static final AtomicReferenceFieldUpdater<SessionState, MessageBatchState> BATCH_STATE =
+            AtomicReferenceFieldUpdater.newUpdater(SessionState.class, MessageBatchState.class, "batchState");
+    private static final AtomicIntegerFieldUpdater<SessionState> COMMIT_SEQUENCE =
+            AtomicIntegerFieldUpdater.newUpdater(SessionState.class, "commitSequence");
+
+    private static final AtomicIntegerFieldUpdater<SessionState> TIME_IN_QUEUE_SPAN_COUNT =
+            AtomicIntegerFieldUpdater.newUpdater(SessionState.class, "timeInQueueSpanCount");
+
+    private static final Comparator<Map.Entry<Thread, TimeInQueue>> YOUNGEST_TIME_IN_QUEUE_FIRST =
+            new Comparator<Map.Entry<Thread, TimeInQueue>>() {
+                @Override
+                public int compare(Map.Entry<Thread, TimeInQueue> o1, Map.Entry<Thread, TimeInQueue> o2) {
+                    // reverse natural order to sort start time by largest first (ie. youngest)
+                    return Long.compare(
+                            o2.getValue().span.getStartTime(),
+                            o1.getValue().span.getStartTime());
+                }
+            };
+
+    // hard bound of captured spans, degrade to finishing spans early
+    // if transactions are very large, rather than use lots of space
+    static final int MAX_CAPTURED_SPANS = 512;
+
+    // mimic implicit message ack if oldest unacknowledged message span is too old
+    static final long UNACKNOWLEDGED_MAX_AGE =
+            TimeUnit.SECONDS.toMillis(Config.get().getJmsUnacknowledgedMaxAge());
+
+    private static final int MAX_TRACKED_THREADS = 100;
+    private static final int MIN_EVICTED_THREADS = 10;
+
+    private final int ackMode;
+
+    // producer-related session state
+    private volatile MessageBatchState batchState;
+    private volatile int commitSequence;
+
+    // consumer-related session state
+    private final Deque<AgentSpan> capturedSpans;
+    private long oldestCaptureTime = 0;
+    private final Map<Thread, TimeInQueue> timeInQueueSpans;
+    private volatile int timeInQueueSpanCount = 0;
+
+    // this field is protected by synchronization of capturedSpans, but SpotBugs miss that
+    private boolean capturingFlipped = false;
+
+    public SessionState(int ackMode, boolean timeInQueueEnabled) {
+        this.ackMode = ackMode;
+        if (isAutoAcknowledge()) {
+            this.capturedSpans = null; // unused in auto-ack
+        } else {
+            this.capturedSpans = new ArrayDeque<>();
         }
-      };
-
-  // hard bound of captured spans, degrade to finishing spans early
-  // if transactions are very large, rather than use lots of space
-  static final int MAX_CAPTURED_SPANS = 512;
-
-  // mimic implicit message ack if oldest unacknowledged message span is too old
-  static final long UNACKNOWLEDGED_MAX_AGE =
-      TimeUnit.SECONDS.toMillis(Config.get().getJmsUnacknowledgedMaxAge());
-
-  private static final int MAX_TRACKED_THREADS = 100;
-  private static final int MIN_EVICTED_THREADS = 10;
-
-  private final int ackMode;
+        if (timeInQueueEnabled) {
+            this.timeInQueueSpans = new ConcurrentHashMap<>();
+        } else {
+            this.timeInQueueSpans = Collections.emptyMap();
+        }
+    }
 
-  // producer-related session state
-  private volatile MessageBatchState batchState;
-  private volatile int commitSequence;
+    public boolean isTransactedSession() {
+        return ackMode == 0; /* Session.SESSION_TRANSACTED */
+    }
 
-  // consumer-related session state
-  private final Deque<AgentSpan> capturedSpans;
-  private long oldestCaptureTime = 0;
-  private final Map<Thread, TimeInQueue> timeInQueueSpans;
-  private volatile int timeInQueueSpanCount = 0;
+    public boolean isClientAcknowledge() {
+        return ackMode == 2; /* Session.CLIENT_ACKNOWLEDGE */
+    }
 
-  // this field is protected by synchronization of capturedSpans, but SpotBugs miss that
-  private boolean capturingFlipped = false;
+    public boolean isAutoAcknowledge() {
+        return ackMode != 0 && ackMode != 2; /* treat all other modes as Session.AUTO_ACKNOWLEDGE */
 
-  public SessionState(int ackMode, boolean timeInQueueEnabled) {
-    this.ackMode = ackMode;
-    if (isAutoAcknowledge()) {
-      this.capturedSpans = null; // unused in auto-ack
-    } else {
-      this.capturedSpans = new ArrayDeque<>();
+        // We can't be sure of the ack-pattern for non-standard vendor modes, so the safest thing
+        // to do is close+finish message spans on the next receive like we do for AUTO_ACKNOWLEDGE
     }
-    if (timeInQueueEnabled) {
-      this.timeInQueueSpans = new ConcurrentHashMap<>();
-    } else {
-      this.timeInQueueSpans = Collections.emptyMap();
+
+    /** Retrieves details about the current message batch being produced in this session. */
+    MessageBatchState currentBatchState() {
+        MessageBatchState oldBatch = batchState;
+        if (null != oldBatch && oldBatch.commitSequence == commitSequence) {
+            return oldBatch;
+        }
+        MessageBatchState newBatch = new MessageBatchState(commitSequence);
+        if (!BATCH_STATE.compareAndSet(this, oldBatch, newBatch)) {
+            newBatch = batchState;
+        }
+        return newBatch;
     }
-  }
 
-  public boolean isTransactedSession() {
-    return ackMode == 0; /* Session.SESSION_TRANSACTED */
-  }
+    // only used for testing
+    int getCapturedSpanCount() {
+        if (null == capturedSpans) {
+            return 0;
+        }
+        synchronized (capturedSpans) {
+            return capturedSpans.size();
+        }
+    }
 
-  public boolean isClientAcknowledge() {
-    return ackMode == 2; /* Session.CLIENT_ACKNOWLEDGE */
-  }
+    /** Finishes the given message span when a message from the same session is acknowledged. */
+    public void finishOnAcknowledge(AgentSpan span) {
+        captureMessageSpan(span);
+    }
 
-  public boolean isAutoAcknowledge() {
-    return ackMode != 0 && ackMode != 2; /* treat all other modes as Session.AUTO_ACKNOWLEDGE */
+    /** Finishes the given message span when the session is committed, rolled back, or closed. */
+    public void finishOnCommit(AgentSpan span) {
+        captureMessageSpan(span);
+    }
 
-    // We can't be sure of the ack-pattern for non-standard vendor modes, so the safest thing
-    // to do is close+finish message spans on the next receive like we do for AUTO_ACKNOWLEDGE
-  }
+    private void captureMessageSpan(AgentSpan span) {
+        if (null != capturedSpans) {
+            synchronized (capturedSpans) {
+                if (isClientAcknowledge() && implicitMessageAck()) {
+                    finishCapturedSpans(); // time-in-queues spans have a different clean-up mechanism
+                }
+                if (capturedSpans.size() < MAX_CAPTURED_SPANS) {
+                    // change capture direction of the deque on each commit/ack
+                    // avoids mixing new spans with the old group while still supporting LIFO
+                    if (capturingFlipped) {
+                        capturedSpans.addFirst(span);
+                    } else {
+                        capturedSpans.addLast(span);
+                    }
+                    return;
+                }
+            }
+        }
+        // unable to capture span; finish it to avoid unbounded growth
+        span.finish();
+    }
 
-  /** Retrieves details about the current message batch being produced in this session. */
-  MessageBatchState currentBatchState() {
-    MessageBatchState oldBatch = batchState;
-    if (null != oldBatch && oldBatch.commitSequence == commitSequence) {
-      return oldBatch;
+    private boolean implicitMessageAck() {
+        long now = System.currentTimeMillis();
+        if (oldestCaptureTime == 0) {
+            oldestCaptureTime = now; // will be cleared when finishCapturedSpans is called
+            return false;
+        }
+        return (now - oldestCaptureTime) > UNACKNOWLEDGED_MAX_AGE;
     }
-    MessageBatchState newBatch = new MessageBatchState(commitSequence);
-    if (!BATCH_STATE.compareAndSet(this, oldBatch, newBatch)) {
-      newBatch = batchState;
+
+    public void onAcknowledgeOrRecover() {
+        finishSessionSpans();
     }
-    return newBatch;
-  }
 
-  // only used for testing
-  int getCapturedSpanCount() {
-    if (null == capturedSpans) {
-      return 0;
+    public void onCommitOrRollback() {
+        COMMIT_SEQUENCE.incrementAndGet(this);
+        finishSessionSpans();
     }
-    synchronized (capturedSpans) {
-      return capturedSpans.size();
+
+    private void finishSessionSpans() {
+        // make sure we complete this before any subsequent commit/rollback/ack/close
+        synchronized (this) {
+            Iterator<TimeInQueue> timeInQueueIterator =
+                    timeInQueueSpans.values().iterator();
+
+            // finish any message spans captured during this session
+            if (null != capturedSpans) {
+                finishCapturedSpans();
+            }
+
+            // finish any time-in-queue parent spans for this session
+            while (timeInQueueIterator.hasNext()) {
+                maybeFinishTimeInQueueSpan(timeInQueueIterator.next());
+                timeInQueueIterator.remove();
+            }
+        }
     }
-  }
-
-  /** Finishes the given message span when a message from the same session is acknowledged. */
-  public void finishOnAcknowledge(AgentSpan span) {
-    captureMessageSpan(span);
-  }
-
-  /** Finishes the given message span when the session is committed, rolled back, or closed. */
-  public void finishOnCommit(AgentSpan span) {
-    captureMessageSpan(span);
-  }
-
-  private void captureMessageSpan(AgentSpan span) {
-    if (null != capturedSpans) {
-      synchronized (capturedSpans) {
-        if (isClientAcknowledge() && implicitMessageAck()) {
-          finishCapturedSpans(); // time-in-queues spans have a different clean-up mechanism
+
+    private void finishCapturedSpans() {
+        int spansToFinish;
+        boolean finishingFlipped;
+        synchronized (capturedSpans) {
+            spansToFinish = capturedSpans.size();
+            // if capturing was flipped for this group then we need to flip finishing to match
+            finishingFlipped = capturingFlipped;
+            // update capturing to use the other end of the deque for the next group of spans
+            capturingFlipped = !finishingFlipped;
+            oldestCaptureTime = 0;
         }
-        if (capturedSpans.size() < MAX_CAPTURED_SPANS) {
-          // change capture direction of the deque on each commit/ack
-          // avoids mixing new spans with the old group while still supporting LIFO
-          if (capturingFlipped) {
-            capturedSpans.addFirst(span);
-          } else {
-            capturedSpans.addLast(span);
-          }
-          return;
+        for (int i = 0; i < spansToFinish; ++i) {
+            AgentSpan span;
+            synchronized (capturedSpans) {
+                // finish spans in LIFO order according to how they were captured
+                // for example addFirst --> pollFirst vs. addLast --> pollLast
+                if (finishingFlipped) {
+                    span = capturedSpans.pollFirst();
+                } else {
+                    span = capturedSpans.pollLast();
+                }
+            }
+            // it won't be null, but just in case...
+            if (null != span) {
+                span.finish();
+            }
         }
-      }
     }
-    // unable to capture span; finish it to avoid unbounded growth
-    span.finish();
-  }
-
-  private boolean implicitMessageAck() {
-    long now = System.currentTimeMillis();
-    if (oldestCaptureTime == 0) {
-      oldestCaptureTime = now; // will be cleared when finishCapturedSpans is called
-      return false;
+
+    /** Finishes any pending client-ack/transacted spans. */
+    public void onClose() {
+        finishSessionSpans();
     }
-    return (now - oldestCaptureTime) > UNACKNOWLEDGED_MAX_AGE;
-  }
-
-  public void onAcknowledgeOrRecover() {
-    finishSessionSpans();
-  }
-
-  public void onCommitOrRollback() {
-    COMMIT_SEQUENCE.incrementAndGet(this);
-    finishSessionSpans();
-  }
-
-  private void finishSessionSpans() {
-    // make sure we complete this before any subsequent commit/rollback/ack/close
-    synchronized (this) {
-      Iterator<TimeInQueue> timeInQueueIterator = timeInQueueSpans.values().iterator();
-
-      // finish any message spans captured during this session
-      if (null != capturedSpans) {
-        finishCapturedSpans();
-      }
-
-      // finish any time-in-queue parent spans for this session
-      while (timeInQueueIterator.hasNext()) {
-        maybeFinishTimeInQueueSpan(timeInQueueIterator.next());
-        timeInQueueIterator.remove();
-      }
+
+    /** Gets the current time-in-queue span; returns {@code null} if this is a new batch. */
+    AgentSpan getTimeInQueueSpan(long batchId) {
+        TimeInQueue holder = timeInQueueSpans.get(Thread.currentThread());
+        if (null != holder) {
+            // maintain time-in-queue for messages in same batch or same client-ack/transacted session
+            if ((batchId > 0 && batchId == holder.batchId) || !isAutoAcknowledge()) {
+                return holder.span;
+            }
+            // finish the old time-in-queue span and remove it before we create the next one
+            finishTimeInQueueSpan(true);
+        }
+        return null;
     }
-  }
-
-  private void finishCapturedSpans() {
-    int spansToFinish;
-    boolean finishingFlipped;
-    synchronized (capturedSpans) {
-      spansToFinish = capturedSpans.size();
-      // if capturing was flipped for this group then we need to flip finishing to match
-      finishingFlipped = capturingFlipped;
-      // update capturing to use the other end of the deque for the next group of spans
-      capturingFlipped = !finishingFlipped;
-      oldestCaptureTime = 0;
+
+    /** Starts tracking a new time-in-queue span. */
+    void setTimeInQueueSpan(long batchId, AgentSpan span) {
+        if (TIME_IN_QUEUE_SPAN_COUNT.incrementAndGet(this) > MAX_TRACKED_THREADS) {
+            finishStaleTimeInQueueSpans();
+        }
+        // getTimeInQueueSpan will have already removed the time-in-queue span for the previous batch
+        timeInQueueSpans.put(Thread.currentThread(), new TimeInQueue(batchId, span));
     }
-    for (int i = 0; i < spansToFinish; ++i) {
-      AgentSpan span;
-      synchronized (capturedSpans) {
-        // finish spans in LIFO order according to how they were captured
-        // for example addFirst --> pollFirst vs. addLast --> pollLast
-        if (finishingFlipped) {
-          span = capturedSpans.pollFirst();
+
+    /** Finishes the current time-in-queue span and optionally stops tracking it. */
+    void finishTimeInQueueSpan(boolean clear) {
+        if (clear) {
+            maybeFinishTimeInQueueSpan(timeInQueueSpans.remove(Thread.currentThread()));
         } else {
-          span = capturedSpans.pollLast();
+            // finish time-in-queue span, but keep tracking it so messages in same batch can link to it
+            // (called in AUTO_ACKNOWLEDGE mode to avoid leaving time-in-queue spans open indefinitely)
+            TimeInQueue holder = timeInQueueSpans.get(Thread.currentThread());
+            if (null != holder) {
+                holder.span.finish();
+            }
         }
-      }
-      // it won't be null, but just in case...
-      if (null != span) {
-        span.finish();
-      }
-    }
-  }
-
-  /** Finishes any pending client-ack/transacted spans. */
-  public void onClose() {
-    finishSessionSpans();
-  }
-
-  /** Gets the current time-in-queue span; returns {@code null} if this is a new batch. */
-  AgentSpan getTimeInQueueSpan(long batchId) {
-    TimeInQueue holder = timeInQueueSpans.get(Thread.currentThread());
-    if (null != holder) {
-      // maintain time-in-queue for messages in same batch or same client-ack/transacted session
-      if ((batchId > 0 && batchId == holder.batchId) || !isAutoAcknowledge()) {
-        return holder.span;
-      }
-      // finish the old time-in-queue span and remove it before we create the next one
-      finishTimeInQueueSpan(true);
     }
-    return null;
-  }
 
-  /** Starts tracking a new time-in-queue span. */
-  void setTimeInQueueSpan(long batchId, AgentSpan span) {
-    if (TIME_IN_QUEUE_SPAN_COUNT.incrementAndGet(this) > MAX_TRACKED_THREADS) {
-      finishStaleTimeInQueueSpans();
-    }
-    // getTimeInQueueSpan will have already removed the time-in-queue span for the previous batch
-    timeInQueueSpans.put(Thread.currentThread(), new TimeInQueue(batchId, span));
-  }
-
-  /** Finishes the current time-in-queue span and optionally stops tracking it. */
-  void finishTimeInQueueSpan(boolean clear) {
-    if (clear) {
-      maybeFinishTimeInQueueSpan(timeInQueueSpans.remove(Thread.currentThread()));
-    } else {
-      // finish time-in-queue span, but keep tracking it so messages in same batch can link to it
-      // (called in AUTO_ACKNOWLEDGE mode to avoid leaving time-in-queue spans open indefinitely)
-      TimeInQueue holder = timeInQueueSpans.get(Thread.currentThread());
-      if (null != holder) {
-        holder.span.finish();
-      }
+    private void maybeFinishTimeInQueueSpan(TimeInQueue holder) {
+        if (null != holder) {
+            TIME_IN_QUEUE_SPAN_COUNT.decrementAndGet(this);
+            holder.span.finish();
+        }
     }
-  }
 
-  private void maybeFinishTimeInQueueSpan(TimeInQueue holder) {
-    if (null != holder) {
-      TIME_IN_QUEUE_SPAN_COUNT.decrementAndGet(this);
-      holder.span.finish();
-    }
-  }
-
-  private void finishStaleTimeInQueueSpans() {
-    Queue<Map.Entry<Thread, TimeInQueue>> oldestEntries =
-        new PriorityQueue<>(MIN_EVICTED_THREADS + 1, YOUNGEST_TIME_IN_QUEUE_FIRST);
-
-    // first evict any time-in-queue spans linked to stopped threads
-    int evictedThreads = 0;
-    Iterator<Map.Entry<Thread, TimeInQueue>> itr = timeInQueueSpans.entrySet().iterator();
-    while (itr.hasNext()) {
-      Map.Entry<Thread, TimeInQueue> entry = itr.next();
-      if (!entry.getKey().isAlive()) {
-        evictedThreads++;
-        maybeFinishTimeInQueueSpan(entry.getValue());
-        itr.remove();
-      } else if (evictedThreads < MIN_EVICTED_THREADS) {
-        // not evicted enough yet - sort spans so far from youngest (head) to oldest (tail)
-        oldestEntries.offer(entry);
-        if (oldestEntries.size() > MIN_EVICTED_THREADS) {
-          oldestEntries.poll(); // discard the youngest span to keep the oldest N spans
+    private void finishStaleTimeInQueueSpans() {
+        Queue<Map.Entry<Thread, TimeInQueue>> oldestEntries =
+                new PriorityQueue<>(MIN_EVICTED_THREADS + 1, YOUNGEST_TIME_IN_QUEUE_FIRST);
+
+        // first evict any time-in-queue spans linked to stopped threads
+        int evictedThreads = 0;
+        Iterator<Map.Entry<Thread, TimeInQueue>> itr =
+                timeInQueueSpans.entrySet().iterator();
+        while (itr.hasNext()) {
+            Map.Entry<Thread, TimeInQueue> entry = itr.next();
+            if (!entry.getKey().isAlive()) {
+                evictedThreads++;
+                maybeFinishTimeInQueueSpan(entry.getValue());
+                itr.remove();
+            } else if (evictedThreads < MIN_EVICTED_THREADS) {
+                // not evicted enough yet - sort spans so far from youngest (head) to oldest (tail)
+                oldestEntries.offer(entry);
+                if (oldestEntries.size() > MIN_EVICTED_THREADS) {
+                    oldestEntries.poll(); // discard the youngest span to keep the oldest N spans
+                }
+            }
         }
-      }
-    }
 
-    // didn't find enough stopped threads, so evict oldest N time-in-queue spans
-    if (evictedThreads < MIN_EVICTED_THREADS) {
-      for (Map.Entry<Thread, TimeInQueue> entry : oldestEntries) {
-        if (timeInQueueSpans.remove(entry.getKey(), entry.getValue())) {
-          maybeFinishTimeInQueueSpan(entry.getValue());
+        // didn't find enough stopped threads, so evict oldest N time-in-queue spans
+        if (evictedThreads < MIN_EVICTED_THREADS) {
+            for (Map.Entry<Thread, TimeInQueue> entry : oldestEntries) {
+                if (timeInQueueSpans.remove(entry.getKey(), entry.getValue())) {
+                    maybeFinishTimeInQueueSpan(entry.getValue());
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/TimeInQueue.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/TimeInQueue.java
index 6652915837e..84b4e48b5df 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/TimeInQueue.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jms/TimeInQueue.java
@@ -4,11 +4,11 @@
 
 /** Holds the synthetic time-in-queue span for a batch of messages. */
 final class TimeInQueue {
-  final long batchId;
-  final AgentSpan span;
+    final long batchId;
+    final AgentSpan span;
 
-  TimeInQueue(long batchId, AgentSpan span) {
-    this.batchId = batchId;
-    this.span = span;
-  }
+    TimeInQueue(long batchId, AgentSpan span) {
+        this.batchId = batchId;
+        this.span = span;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jmx/MBeanServerRegistry.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jmx/MBeanServerRegistry.java
index b41cd86286e..a9b7b359aaa 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jmx/MBeanServerRegistry.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jmx/MBeanServerRegistry.java
@@ -5,13 +5,13 @@
 import javax.management.MBeanServer;
 
 public class MBeanServerRegistry {
-  private static final ConcurrentMap<String, MBeanServer> serverMap = new ConcurrentHashMap<>();
+    private static final ConcurrentMap<String, MBeanServer> serverMap = new ConcurrentHashMap<>();
 
-  public static MBeanServer getServer(final String serverClass) {
-    return serverMap.get(serverClass);
-  }
+    public static MBeanServer getServer(final String serverClass) {
+        return serverMap.get(serverClass);
+    }
 
-  public static void putServer(final String serverClass, final MBeanServer server) {
-    serverMap.putIfAbsent(serverClass, server);
-  }
+    public static void putServer(final String serverClass, final MBeanServer server) {
+        serverMap.putIfAbsent(serverClass, server);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/log/LogContextScopeListener.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/log/LogContextScopeListener.java
index 36861678349..6958327b020 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/log/LogContextScopeListener.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/log/LogContextScopeListener.java
@@ -12,26 +12,26 @@
  */
 public abstract class LogContextScopeListener implements ScopeListener, WithGlobalTracer.Callback {
 
-  @Override
-  public void afterScopeActivated() {
-    if (AgentTracer.traceConfig().isLogsInjectionEnabled()) {
-      add(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
-      add(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+    @Override
+    public void afterScopeActivated() {
+        if (AgentTracer.traceConfig().isLogsInjectionEnabled()) {
+            add(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+            add(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+        }
     }
-  }
 
-  @Override
-  public void afterScopeClosed() {
-    remove(CorrelationIdentifier.getTraceIdKey());
-    remove(CorrelationIdentifier.getSpanIdKey());
-  }
+    @Override
+    public void afterScopeClosed() {
+        remove(CorrelationIdentifier.getTraceIdKey());
+        remove(CorrelationIdentifier.getSpanIdKey());
+    }
 
-  public abstract void add(String key, String value);
+    public abstract void add(String key, String value);
 
-  public abstract void remove(String key);
+    public abstract void remove(String key);
 
-  @Override
-  public void withTracer(TracerAPI tracer) {
-    tracer.addScopeListener(this);
-  }
+    @Override
+    public void withTracer(TracerAPI tracer) {
+        tracer.addScopeListener(this);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/log/UnionMap.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/log/UnionMap.java
index 2449b62dc7d..7662d51b972 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/log/UnionMap.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/log/UnionMap.java
@@ -14,141 +14,141 @@
  * Lazy deduplication occurs once: before iterating over entries/values, or when combining sizes.
  */
 public final class UnionMap<K, V> extends AbstractMap<K, V> implements Serializable {
-  private final Map<K, V> primaryMap;
-  private final Map<K, V> secondaryMap;
-  private transient Set<Map.Entry<K, V>> entrySet;
-  private transient volatile boolean deduped;
-
-  public UnionMap(Map<K, V> primaryMap, Map<K, V> secondaryMap) {
-    this.primaryMap = primaryMap;
-    this.secondaryMap = secondaryMap;
-  }
-
-  private void dedup() {
-    if (!deduped) {
-      if (primaryMap.isEmpty()) {
-        deduped = true;
-        return; // nothing to deduplicate
-      }
-      synchronized (this) {
+    private final Map<K, V> primaryMap;
+    private final Map<K, V> secondaryMap;
+    private transient Set<Map.Entry<K, V>> entrySet;
+    private transient volatile boolean deduped;
+
+    public UnionMap(Map<K, V> primaryMap, Map<K, V> secondaryMap) {
+        this.primaryMap = primaryMap;
+        this.secondaryMap = secondaryMap;
+    }
+
+    private void dedup() {
         if (!deduped) {
-          // drop keys from secondary that already exist in primary
-          Iterator<K> itr = secondaryMap.keySet().iterator();
-          while (itr.hasNext()) {
-            if (primaryMap.containsKey(itr.next())) {
-              itr.remove();
+            if (primaryMap.isEmpty()) {
+                deduped = true;
+                return; // nothing to deduplicate
+            }
+            synchronized (this) {
+                if (!deduped) {
+                    // drop keys from secondary that already exist in primary
+                    Iterator<K> itr = secondaryMap.keySet().iterator();
+                    while (itr.hasNext()) {
+                        if (primaryMap.containsKey(itr.next())) {
+                            itr.remove();
+                        }
+                    }
+                    deduped = true;
+                }
             }
-          }
-          deduped = true;
         }
-      }
     }
-  }
-
-  @Override
-  public int size() {
-    dedup();
-    return primaryMap.size() + secondaryMap.size();
-  }
-
-  @Override
-  public boolean isEmpty() {
-    return primaryMap.isEmpty() && secondaryMap.isEmpty();
-  }
-
-  @Override
-  public boolean containsKey(Object key) {
-    return primaryMap.containsKey(key) || secondaryMap.containsKey(key);
-  }
-
-  @Override
-  public boolean containsValue(Object value) {
-    if (primaryMap.containsValue(value)) {
-      return true;
-    } else {
-      dedup();
-      return secondaryMap.containsValue(value);
+
+    @Override
+    public int size() {
+        dedup();
+        return primaryMap.size() + secondaryMap.size();
     }
-  }
-
-  @Override
-  public V get(Object key) {
-    V result = primaryMap.get(key);
-    return null != result || primaryMap.containsKey(key) ? result : secondaryMap.get(key);
-  }
-
-  @Override
-  public V put(K key, V value) {
-    if (primaryMap.containsKey(key)) {
-      return primaryMap.put(key, value);
-    } else {
-      primaryMap.put(key, value);
-      return secondaryMap.remove(key);
+
+    @Override
+    public boolean isEmpty() {
+        return primaryMap.isEmpty() && secondaryMap.isEmpty();
     }
-  }
-
-  @Override
-  public V remove(Object key) {
-    if (primaryMap.containsKey(key)) {
-      secondaryMap.remove(key);
-      return primaryMap.remove(key);
-    } else {
-      return secondaryMap.remove(key);
+
+    @Override
+    public boolean containsKey(Object key) {
+        return primaryMap.containsKey(key) || secondaryMap.containsKey(key);
     }
-  }
-
-  @Override
-  public void clear() {
-    primaryMap.clear();
-    secondaryMap.clear();
-    entrySet = primaryMap.entrySet(); // optimization: secondary will now always be empty
-    deduped = true;
-  }
-
-  @Override
-  public Set<Entry<K, V>> entrySet() {
-    if (null == entrySet) {
-      entrySet =
-          new AbstractSet<Map.Entry<K, V>>() {
-            @Override
-            public int size() {
-              return UnionMap.this.size();
-            }
 
-            @Override
-            public Iterator<Map.Entry<K, V>> iterator() {
-              UnionMap.this.dedup();
+    @Override
+    public boolean containsValue(Object value) {
+        if (primaryMap.containsValue(value)) {
+            return true;
+        } else {
+            dedup();
+            return secondaryMap.containsValue(value);
+        }
+    }
 
-              return new Iterator<Map.Entry<K, V>>() {
-                private Iterator<Map.Entry<K, V>> itr = primaryMap.entrySet().iterator();
-                private volatile boolean trySecondaryNext = !secondaryMap.isEmpty();
+    @Override
+    public V get(Object key) {
+        V result = primaryMap.get(key);
+        return null != result || primaryMap.containsKey(key) ? result : secondaryMap.get(key);
+    }
 
-                @Override
-                public boolean hasNext() {
-                  return itr.hasNext() || trySecondaryNext;
-                }
+    @Override
+    public V put(K key, V value) {
+        if (primaryMap.containsKey(key)) {
+            return primaryMap.put(key, value);
+        } else {
+            primaryMap.put(key, value);
+            return secondaryMap.remove(key);
+        }
+    }
+
+    @Override
+    public V remove(Object key) {
+        if (primaryMap.containsKey(key)) {
+            secondaryMap.remove(key);
+            return primaryMap.remove(key);
+        } else {
+            return secondaryMap.remove(key);
+        }
+    }
 
+    @Override
+    public void clear() {
+        primaryMap.clear();
+        secondaryMap.clear();
+        entrySet = primaryMap.entrySet(); // optimization: secondary will now always be empty
+        deduped = true;
+    }
+
+    @Override
+    public Set<Entry<K, V>> entrySet() {
+        if (null == entrySet) {
+            entrySet = new AbstractSet<Map.Entry<K, V>>() {
                 @Override
-                public Map.Entry<K, V> next() {
-                  if (!itr.hasNext() && trySecondaryNext) {
-                    trySecondaryNext = false;
-                    itr = secondaryMap.entrySet().iterator();
-                  }
-                  return itr.next();
+                public int size() {
+                    return UnionMap.this.size();
                 }
 
                 @Override
-                public void remove() {
-                  itr.remove();
+                public Iterator<Map.Entry<K, V>> iterator() {
+                    UnionMap.this.dedup();
+
+                    return new Iterator<Map.Entry<K, V>>() {
+                        private Iterator<Map.Entry<K, V>> itr =
+                                primaryMap.entrySet().iterator();
+                        private volatile boolean trySecondaryNext = !secondaryMap.isEmpty();
+
+                        @Override
+                        public boolean hasNext() {
+                            return itr.hasNext() || trySecondaryNext;
+                        }
+
+                        @Override
+                        public Map.Entry<K, V> next() {
+                            if (!itr.hasNext() && trySecondaryNext) {
+                                trySecondaryNext = false;
+                                itr = secondaryMap.entrySet().iterator();
+                            }
+                            return itr.next();
+                        }
+
+                        @Override
+                        public void remove() {
+                            itr.remove();
+                        }
+                    };
                 }
-              };
-            }
-          };
+            };
+        }
+        return entrySet;
     }
-    return entrySet;
-  }
 
-  public Object writeReplace() {
-    return new HashMap<>(this); // serialize de-duplicated copy
-  }
+    public Object writeReplace() {
+        return new HashMap<>(this); // serialize de-duplicated copy
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/messaging/DatadogAttributeParser.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/messaging/DatadogAttributeParser.java
index 4a901f9b370..ea5398861ff 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/messaging/DatadogAttributeParser.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/messaging/DatadogAttributeParser.java
@@ -11,67 +11,66 @@
 
 /** Parses trace context from an embedded '_datadog' message attribute. */
 public final class DatadogAttributeParser {
-  private static final Logger log = LoggerFactory.getLogger(DatadogAttributeParser.class);
+    private static final Logger log = LoggerFactory.getLogger(DatadogAttributeParser.class);
 
-  private static final Base64.Decoder BASE_64 = Base64.getDecoder();
+    private static final Base64.Decoder BASE_64 = Base64.getDecoder();
 
-  /** Parses trace context properties from the given JSON and passes them to the classifier. */
-  public static void forEachProperty(AgentPropagation.KeyClassifier classifier, String json) {
-    if (null == json) {
-      return;
-    }
-    try {
-      if (acceptJsonProperty(classifier, json, "x-datadog-trace-id")) {
-        acceptJsonProperty(classifier, json, "x-datadog-parent-id");
-        acceptJsonProperty(classifier, json, "x-datadog-sampling-priority");
-      }
-      if (Config.get().isDataStreamsEnabled()) {
-        acceptJsonProperty(classifier, json, "dd-pathway-ctx-base64");
-      }
-    } catch (Exception e) {
-      log.debug("Problem extracting _datadog context", e);
+    /** Parses trace context properties from the given JSON and passes them to the classifier. */
+    public static void forEachProperty(AgentPropagation.KeyClassifier classifier, String json) {
+        if (null == json) {
+            return;
+        }
+        try {
+            if (acceptJsonProperty(classifier, json, "x-datadog-trace-id")) {
+                acceptJsonProperty(classifier, json, "x-datadog-parent-id");
+                acceptJsonProperty(classifier, json, "x-datadog-sampling-priority");
+            }
+            if (Config.get().isDataStreamsEnabled()) {
+                acceptJsonProperty(classifier, json, "dd-pathway-ctx-base64");
+            }
+        } catch (Exception e) {
+            log.debug("Problem extracting _datadog context", e);
+        }
     }
-  }
 
-  /** Parses trace context properties from the given JSON and passes them to the classifier. */
-  public static void forEachProperty(AgentPropagation.KeyClassifier classifier, ByteBuffer json) {
-    if (null == json) {
-      return;
-    }
-    try {
-      String jsonStr;
-      // peak at the first character to know if we're dealing with json or base64 (since '{' is not
-      // a valid b64 char).
-      if (json.get(0) == '{') {
-        jsonStr = UTF_8.decode(json).toString();
-      } else {
-        // TODO remove this branch once we are sure that this is never happening.
-        // passing a base64 string in a byte buffer is a nonsense, since the base64 is a less
-        // efficient representation.
-        jsonStr = UTF_8.decode(BASE_64.decode(json)).toString();
-      }
-      forEachProperty(classifier, jsonStr);
-    } catch (Exception e) {
-      log.debug("Problem decoding _datadog context", e);
+    /** Parses trace context properties from the given JSON and passes them to the classifier. */
+    public static void forEachProperty(AgentPropagation.KeyClassifier classifier, ByteBuffer json) {
+        if (null == json) {
+            return;
+        }
+        try {
+            String jsonStr;
+            // peak at the first character to know if we're dealing with json or base64 (since '{' is not
+            // a valid b64 char).
+            if (json.get(0) == '{') {
+                jsonStr = UTF_8.decode(json).toString();
+            } else {
+                // TODO remove this branch once we are sure that this is never happening.
+                // passing a base64 string in a byte buffer is a nonsense, since the base64 is a less
+                // efficient representation.
+                jsonStr = UTF_8.decode(BASE_64.decode(json)).toString();
+            }
+            forEachProperty(classifier, jsonStr);
+        } catch (Exception e) {
+            log.debug("Problem decoding _datadog context", e);
+        }
     }
-  }
 
-  // Simple parser that assumes values are JSON strings that don't contain escaped quotes
-  private static boolean acceptJsonProperty(
-      AgentPropagation.KeyClassifier classifier, String json, String key) {
-    int keyStart = json.indexOf(key);
-    if (keyStart > 0) {
-      int separator = json.indexOf(':', keyStart + key.length());
-      if (separator > 0) {
-        int valueStart = json.indexOf('"', separator + 1);
-        if (valueStart > 0) {
-          int valueEnd = json.indexOf('"', valueStart + 1);
-          if (valueEnd > 0) {
-            return classifier.accept(key, json.substring(valueStart + 1, valueEnd));
-          }
+    // Simple parser that assumes values are JSON strings that don't contain escaped quotes
+    private static boolean acceptJsonProperty(AgentPropagation.KeyClassifier classifier, String json, String key) {
+        int keyStart = json.indexOf(key);
+        if (keyStart > 0) {
+            int separator = json.indexOf(':', keyStart + key.length());
+            if (separator > 0) {
+                int valueStart = json.indexOf('"', separator + 1);
+                if (valueStart > 0) {
+                    int valueEnd = json.indexOf('"', valueStart + 1);
+                    if (valueEnd > 0) {
+                        return classifier.accept(key, json.substring(valueStart + 1, valueEnd));
+                    }
+                }
+            }
         }
-      }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/reactivestreams/HandoffContext.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/reactivestreams/HandoffContext.java
index 353c8345423..48dd41a8554 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/reactivestreams/HandoffContext.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/reactivestreams/HandoffContext.java
@@ -16,26 +16,26 @@
  */
 public final class HandoffContext {
 
-  private static final long ANY_THREAD = 0L;
+    private static final long ANY_THREAD = 0L;
 
-  private final long threadId;
-  private final Context context;
+    private final long threadId;
+    private final Context context;
 
-  private HandoffContext(final Context context, final long threadId) {
-    this.context = context;
-    this.threadId = threadId;
-  }
+    private HandoffContext(final Context context, final long threadId) {
+        this.context = context;
+        this.threadId = threadId;
+    }
 
-  public static HandoffContext anyThread(final Context context) {
-    return new HandoffContext(context, ANY_THREAD);
-  }
+    public static HandoffContext anyThread(final Context context) {
+        return new HandoffContext(context, ANY_THREAD);
+    }
 
-  public static HandoffContext threadConfined(final Context context) {
-    return new HandoffContext(context, Thread.currentThread().getId());
-  }
+    public static HandoffContext threadConfined(final Context context) {
+        return new HandoffContext(context, Thread.currentThread().getId());
+    }
 
-  /** The context, or {@code null} if this is a thread-confined deposit read on another thread. */
-  public Context contextForCurrentThread() {
-    return threadId == ANY_THREAD || threadId == Thread.currentThread().getId() ? context : null;
-  }
+    /** The context, or {@code null} if this is a thread-confined deposit read on another thread. */
+    public Context contextForCurrentThread() {
+        return threadId == ANY_THREAD || threadId == Thread.currentThread().getId() ? context : null;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextDispatcher.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextDispatcher.java
index 8e869d31604..81bba700a78 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextDispatcher.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextDispatcher.java
@@ -26,37 +26,36 @@
  * expected
  */
 public class ContextDispatcher implements Dispatcher {
-  private static final ContextDispatcher CONTEXT_DISPATCHER = new ContextDispatcher();
-  private static final NoopRemote NOOP_REMOTE = new NoopRemote();
-
-  public static Target newDispatcherTarget() {
-    return new Target(NOOP_REMOTE, CONTEXT_DISPATCHER, NOOP_REMOTE, DD_CONTEXT_CALL_ID, false);
-  }
-
-  @Override
-  public void dispatch(final Remote obj, final RemoteCall call) throws IOException {
-    final ObjectInput in = call.getInputStream();
-    final int operationId = in.readInt();
-    in.readLong(); // skip 8 bytes
-
-    if (PROPAGATOR.isOperationWithPayload(operationId)) {
-      final ContextPayload payload = ContextPayload.read(in);
-      if (payload != null) {
-        final AgentSpanContext context =
-            extractContextAndGetSpanContext(
-                payload.getContext(), ContextVisitors.stringValuesMap());
-        THREAD_LOCAL_CONTEXT.set(context);
-      }
-    }
+    private static final ContextDispatcher CONTEXT_DISPATCHER = new ContextDispatcher();
+    private static final NoopRemote NOOP_REMOTE = new NoopRemote();
 
-    // send result stream the client is expecting
-    call.getResultStream(true);
+    public static Target newDispatcherTarget() {
+        return new Target(NOOP_REMOTE, CONTEXT_DISPATCHER, NOOP_REMOTE, DD_CONTEXT_CALL_ID, false);
+    }
 
-    // release held streams to allow next call to continue
-    call.releaseInputStream();
-    call.releaseOutputStream();
-    call.done();
-  }
+    @Override
+    public void dispatch(final Remote obj, final RemoteCall call) throws IOException {
+        final ObjectInput in = call.getInputStream();
+        final int operationId = in.readInt();
+        in.readLong(); // skip 8 bytes
+
+        if (PROPAGATOR.isOperationWithPayload(operationId)) {
+            final ContextPayload payload = ContextPayload.read(in);
+            if (payload != null) {
+                final AgentSpanContext context =
+                        extractContextAndGetSpanContext(payload.getContext(), ContextVisitors.stringValuesMap());
+                THREAD_LOCAL_CONTEXT.set(context);
+            }
+        }
+
+        // send result stream the client is expecting
+        call.getResultStream(true);
+
+        // release held streams to allow next call to continue
+        call.releaseInputStream();
+        call.releaseOutputStream();
+        call.done();
+    }
 
-  public static class NoopRemote implements Remote {}
+    public static class NoopRemote implements Remote {}
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextPayload.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextPayload.java
index ef153162511..1230c31bd3f 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextPayload.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextPayload.java
@@ -16,57 +16,57 @@
 /** ContextPayload wraps context information shared between client and server */
 public class ContextPayload {
 
-  private static final Logger log = LoggerFactory.getLogger(ContextPayload.class);
-  private static final int MAX_CONTEXT_SIZE = 1000;
-  private final Map<String, String> context;
-  public static final InjectAdapter SETTER = new InjectAdapter();
+    private static final Logger log = LoggerFactory.getLogger(ContextPayload.class);
+    private static final int MAX_CONTEXT_SIZE = 1000;
+    private final Map<String, String> context;
+    public static final InjectAdapter SETTER = new InjectAdapter();
 
-  public ContextPayload() {
-    context = new HashMap<>();
-  }
-
-  public ContextPayload(final Map<String, String> context) {
-    this.context = context;
-  }
+    public ContextPayload() {
+        context = new HashMap<>();
+    }
 
-  public Map<String, String> getContext() {
-    return context;
-  }
+    public ContextPayload(final Map<String, String> context) {
+        this.context = context;
+    }
 
-  public static ContextPayload from(final AgentSpan span) {
-    final ContextPayload payload = new ContextPayload();
-    defaultPropagator().inject(span, payload, SETTER);
-    return payload;
-  }
+    public Map<String, String> getContext() {
+        return context;
+    }
 
-  public static ContextPayload read(final ObjectInput oi) throws IOException {
-    final int size = oi.readInt();
-    if (size < 0 || size > MAX_CONTEXT_SIZE) {
-      log.debug("Dropping RMI context payload: size {} exceeds maximum {}", size, MAX_CONTEXT_SIZE);
-      return null;
+    public static ContextPayload from(final AgentSpan span) {
+        final ContextPayload payload = new ContextPayload();
+        defaultPropagator().inject(span, payload, SETTER);
+        return payload;
     }
-    final Map<String, String> context = new HashMap<>(size * 2);
-    for (int i = 0; i < size; i++) {
-      final String key = oi.readUTF();
-      final String value = oi.readUTF();
-      context.put(key, value);
+
+    public static ContextPayload read(final ObjectInput oi) throws IOException {
+        final int size = oi.readInt();
+        if (size < 0 || size > MAX_CONTEXT_SIZE) {
+            log.debug("Dropping RMI context payload: size {} exceeds maximum {}", size, MAX_CONTEXT_SIZE);
+            return null;
+        }
+        final Map<String, String> context = new HashMap<>(size * 2);
+        for (int i = 0; i < size; i++) {
+            final String key = oi.readUTF();
+            final String value = oi.readUTF();
+            context.put(key, value);
+        }
+        return new ContextPayload(context);
     }
-    return new ContextPayload(context);
-  }
 
-  public void write(final ObjectOutput out) throws IOException {
-    out.writeInt(context.size());
-    for (final Map.Entry<String, String> entry : context.entrySet()) {
-      out.writeUTF(entry.getKey());
-      out.writeUTF(entry.getValue());
+    public void write(final ObjectOutput out) throws IOException {
+        out.writeInt(context.size());
+        for (final Map.Entry<String, String> entry : context.entrySet()) {
+            out.writeUTF(entry.getKey());
+            out.writeUTF(entry.getValue());
+        }
     }
-  }
 
-  @ParametersAreNonnullByDefault
-  public static class InjectAdapter implements CarrierSetter<ContextPayload> {
-    @Override
-    public void set(final ContextPayload carrier, final String key, final String value) {
-      carrier.getContext().put(key, value);
+    @ParametersAreNonnullByDefault
+    public static class InjectAdapter implements CarrierSetter<ContextPayload> {
+        @Override
+        public void set(final ContextPayload carrier, final String key, final String value) {
+            carrier.getContext().put(key, value);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextPropagator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextPropagator.java
index aa9a0f41ea9..4f88ba443a0 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextPropagator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextPropagator.java
@@ -13,103 +13,100 @@
 import sun.rmi.transport.TransportConstants;
 
 public class ContextPropagator {
-  private static final Logger log = LoggerFactory.getLogger(ContextPropagator.class);
-  // Internal RMI object ids that we don't want to trace
-  private static final ObjID ACTIVATOR_ID = new ObjID(ObjID.ACTIVATOR_ID);
-  private static final ObjID DGC_ID = new ObjID(ObjID.DGC_ID);
-  private static final ObjID REGISTRY_ID = new ObjID(ObjID.REGISTRY_ID);
-
-  // RMI object id used to identify DataDog instrumentation
-  public static final ObjID DD_CONTEXT_CALL_ID = new ObjID("Datadog.v2.context_call".hashCode());
-
-  // Operation id used for checking context propagation is possible
-  // RMI expects these operations to have negative identifier, as positive ones mean legacy
-  // precompiled Stubs would be used instead
-  private static final int CONTEXT_CHECK_CALL_OPERATION_ID = -1;
-  // Seconds step of context propagation which contains actual payload
-  private static final int CONTEXT_PAYLOAD_OPERATION_ID = -2;
-
-  public static final ContextPropagator PROPAGATOR = new ContextPropagator();
-
-  public boolean isRMIInternalObject(final ObjID id) {
-    return ACTIVATOR_ID.equals(id) || DGC_ID.equals(id) || REGISTRY_ID.equals(id);
-  }
-
-  public boolean isOperationWithPayload(final int operationId) {
-    return operationId == CONTEXT_PAYLOAD_OPERATION_ID;
-  }
-
-  public void attemptToPropagateContext(
-      final ContextStore<Connection, Boolean> knownConnections,
-      final Connection c,
-      final AgentSpan span) {
-    if (checkIfContextCanBePassed(knownConnections, c)) {
-      if (!syntheticCall(c, ContextPayload.from(span), CONTEXT_PAYLOAD_OPERATION_ID)) {
-        log.debug("Couldn't send context payload");
-      }
+    private static final Logger log = LoggerFactory.getLogger(ContextPropagator.class);
+    // Internal RMI object ids that we don't want to trace
+    private static final ObjID ACTIVATOR_ID = new ObjID(ObjID.ACTIVATOR_ID);
+    private static final ObjID DGC_ID = new ObjID(ObjID.DGC_ID);
+    private static final ObjID REGISTRY_ID = new ObjID(ObjID.REGISTRY_ID);
+
+    // RMI object id used to identify DataDog instrumentation
+    public static final ObjID DD_CONTEXT_CALL_ID = new ObjID("Datadog.v2.context_call".hashCode());
+
+    // Operation id used for checking context propagation is possible
+    // RMI expects these operations to have negative identifier, as positive ones mean legacy
+    // precompiled Stubs would be used instead
+    private static final int CONTEXT_CHECK_CALL_OPERATION_ID = -1;
+    // Seconds step of context propagation which contains actual payload
+    private static final int CONTEXT_PAYLOAD_OPERATION_ID = -2;
+
+    public static final ContextPropagator PROPAGATOR = new ContextPropagator();
+
+    public boolean isRMIInternalObject(final ObjID id) {
+        return ACTIVATOR_ID.equals(id) || DGC_ID.equals(id) || REGISTRY_ID.equals(id);
     }
-  }
 
-  private boolean checkIfContextCanBePassed(
-      final ContextStore<Connection, Boolean> knownConnections, final Connection c) {
-    final Boolean storedResult = knownConnections.get(c);
-    if (storedResult != null) {
-      return storedResult;
+    public boolean isOperationWithPayload(final int operationId) {
+        return operationId == CONTEXT_PAYLOAD_OPERATION_ID;
     }
 
-    final boolean result = syntheticCall(c, null, CONTEXT_CHECK_CALL_OPERATION_ID);
-    knownConnections.put(c, result);
-    return result;
-  }
-
-  /**
-   * @return {@code true} when no error happened during call
-   */
-  private boolean syntheticCall(
-      final Connection c, final ContextPayload payload, final int operationId) {
-    final StreamRemoteCall shareContextCall = new StreamRemoteCall(c);
-    try {
-      c.getOutputStream().write(TransportConstants.Call);
-
-      final ObjectOutput out = shareContextCall.getOutputStream();
-
-      DD_CONTEXT_CALL_ID.write(out);
-
-      // call header, part 2 (read by Dispatcher)
-      out.writeInt(operationId); // in normal call this is method number (operation index)
-      out.writeLong(operationId); // in normal RMI call this holds stub/skeleton hash
-
-      // Payload should be sent only after we make sure we're connected to instrumented server
-      //
-      // if method is not found by un-instrumented code then writing payload will cause an exception
-      // in RMI server - as the payload will be interpreted as another call
-      // but it will not be parsed correctly - closing connection
-      if (payload != null) {
-        payload.write(out);
-      }
-
-      try {
-        shareContextCall.executeCall();
-      } catch (final Exception e) {
-        final Exception ex = shareContextCall.getServerException();
-        if (ex != null) {
-          if (ex instanceof NoSuchObjectException) {
+    public void attemptToPropagateContext(
+            final ContextStore<Connection, Boolean> knownConnections, final Connection c, final AgentSpan span) {
+        if (checkIfContextCanBePassed(knownConnections, c)) {
+            if (!syntheticCall(c, ContextPayload.from(span), CONTEXT_PAYLOAD_OPERATION_ID)) {
+                log.debug("Couldn't send context payload");
+            }
+        }
+    }
+
+    private boolean checkIfContextCanBePassed(
+            final ContextStore<Connection, Boolean> knownConnections, final Connection c) {
+        final Boolean storedResult = knownConnections.get(c);
+        if (storedResult != null) {
+            return storedResult;
+        }
+
+        final boolean result = syntheticCall(c, null, CONTEXT_CHECK_CALL_OPERATION_ID);
+        knownConnections.put(c, result);
+        return result;
+    }
+
+    /**
+     * @return {@code true} when no error happened during call
+     */
+    private boolean syntheticCall(final Connection c, final ContextPayload payload, final int operationId) {
+        final StreamRemoteCall shareContextCall = new StreamRemoteCall(c);
+        try {
+            c.getOutputStream().write(TransportConstants.Call);
+
+            final ObjectOutput out = shareContextCall.getOutputStream();
+
+            DD_CONTEXT_CALL_ID.write(out);
+
+            // call header, part 2 (read by Dispatcher)
+            out.writeInt(operationId); // in normal call this is method number (operation index)
+            out.writeLong(operationId); // in normal RMI call this holds stub/skeleton hash
+
+            // Payload should be sent only after we make sure we're connected to instrumented server
+            //
+            // if method is not found by un-instrumented code then writing payload will cause an exception
+            // in RMI server - as the payload will be interpreted as another call
+            // but it will not be parsed correctly - closing connection
+            if (payload != null) {
+                payload.write(out);
+            }
+
+            try {
+                shareContextCall.executeCall();
+            } catch (final Exception e) {
+                final Exception ex = shareContextCall.getServerException();
+                if (ex != null) {
+                    if (ex instanceof NoSuchObjectException) {
+                        return false;
+                    } else {
+                        log.debug("Server error when executing synthetic call", ex);
+                    }
+                } else {
+                    log.debug("Error executing synthetic call", e);
+                }
+                return false;
+            } finally {
+                shareContextCall.done();
+            }
+
+        } catch (final IOException e) {
+            log.debug("Communication error executing synthetic call", e);
             return false;
-          } else {
-            log.debug("Server error when executing synthetic call", ex);
-          }
-        } else {
-          log.debug("Error executing synthetic call", e);
         }
-        return false;
-      } finally {
-        shareContextCall.done();
-      }
-
-    } catch (final IOException e) {
-      log.debug("Communication error executing synthetic call", e);
-      return false;
+        return true;
     }
-    return true;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/RmiClientDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/RmiClientDecorator.java
index d89ddfb80b3..d83a926ad2a 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/RmiClientDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/RmiClientDecorator.java
@@ -11,39 +11,37 @@
 import java.lang.reflect.Method;
 
 public class RmiClientDecorator extends ClientDecorator {
-  public static final CharSequence RMI_INVOKE =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().client().operationForProtocol("rmi"));
-  public static final CharSequence RMI_CLIENT = UTF8BytesString.create("rmi-client");
-  public static final RmiClientDecorator DECORATE = new RmiClientDecorator();
-
-  private static final DDCache<Method, CharSequence> METHOD_CACHE =
-      DDCaches.newFixedSizeIdentityCache(32);
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"rmi", "rmi-client"};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.RPC;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return RMI_CLIENT;
-  }
-
-  @Override
-  protected String service() {
-    return null;
-  }
-
-  public void onMethodInvocation(final AgentSpan span, final Method method) {
-    span.setResourceName(spanNameForMethod(method));
-    span.setTag(
-        Tags.RPC_SERVICE,
-        METHOD_CACHE.computeIfAbsent(method, m -> m.getDeclaringClass().getName()));
-  }
+    public static final CharSequence RMI_INVOKE =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().client().operationForProtocol("rmi"));
+    public static final CharSequence RMI_CLIENT = UTF8BytesString.create("rmi-client");
+    public static final RmiClientDecorator DECORATE = new RmiClientDecorator();
+
+    private static final DDCache<Method, CharSequence> METHOD_CACHE = DDCaches.newFixedSizeIdentityCache(32);
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"rmi", "rmi-client"};
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.RPC;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return RMI_CLIENT;
+    }
+
+    @Override
+    protected String service() {
+        return null;
+    }
+
+    public void onMethodInvocation(final AgentSpan span, final Method method) {
+        span.setResourceName(spanNameForMethod(method));
+        span.setTag(
+                Tags.RPC_SERVICE,
+                METHOD_CACHE.computeIfAbsent(method, m -> m.getDeclaringClass().getName()));
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/RmiServerDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/RmiServerDecorator.java
index eb00dcc89f4..ad39100d195 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/RmiServerDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/RmiServerDecorator.java
@@ -9,30 +9,29 @@
 
 @ParametersAreNonnullByDefault
 public class RmiServerDecorator extends ServerDecorator {
-  public static final CharSequence RMI_SERVER = UTF8BytesString.create("rmi-server");
-  public static final RmiServerDecorator DECORATE = new RmiServerDecorator();
-  public static final CharSequence RMI_REQUEST =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().server().operationForProtocol("rmi"));
+    public static final CharSequence RMI_SERVER = UTF8BytesString.create("rmi-server");
+    public static final RmiServerDecorator DECORATE = new RmiServerDecorator();
+    public static final CharSequence RMI_REQUEST =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().server().operationForProtocol("rmi"));
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"rmi", "rmi-server"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"rmi", "rmi-server"};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.RPC;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.RPC;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return RMI_SERVER;
-  }
+    @Override
+    protected CharSequence component() {
+        return RMI_SERVER;
+    }
 
-  @Override
-  protected void doAfterStart(final AgentSpan span) {
-    span.setMeasured(true);
-    super.doAfterStart(span);
-  }
+    @Override
+    protected void doAfterStart(final AgentSpan span) {
+        span.setMeasured(true);
+        super.doAfterStart(span);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ThreadLocalContext.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ThreadLocalContext.java
index 4458c6ae561..7cb2a33a25d 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ThreadLocalContext.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ThreadLocalContext.java
@@ -3,22 +3,22 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
 
 public class ThreadLocalContext {
-  public static final ThreadLocalContext THREAD_LOCAL_CONTEXT = new ThreadLocalContext();
-  private final ThreadLocal<AgentSpanContext> local;
+    public static final ThreadLocalContext THREAD_LOCAL_CONTEXT = new ThreadLocalContext();
+    private final ThreadLocal<AgentSpanContext> local;
 
-  public ThreadLocalContext() {
-    local = new ThreadLocal<>();
-  }
+    public ThreadLocalContext() {
+        local = new ThreadLocal<>();
+    }
 
-  public void set(final AgentSpanContext context) {
-    local.set(context);
-  }
+    public void set(final AgentSpanContext context) {
+        local.set(context);
+    }
 
-  public AgentSpanContext getAndResetContext() {
-    final AgentSpanContext context = local.get();
-    if (context != null) {
-      local.remove();
+    public AgentSpanContext getAndResetContext() {
+        final AgentSpanContext context = local.get();
+        if (context != null) {
+            local.remove();
+        }
+        return context;
     }
-    return context;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rum/RumControllableResponse.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rum/RumControllableResponse.java
index fe5120a5d6b..90147573a20 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rum/RumControllableResponse.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rum/RumControllableResponse.java
@@ -1,9 +1,9 @@
 package datadog.trace.bootstrap.instrumentation.rum;
 
 public interface RumControllableResponse {
-  /** Drain the held buffer. */
-  void commit();
+    /** Drain the held buffer. */
+    void commit();
 
-  /** Stops filtering the response. */
-  void stopFiltering();
+    /** Stops filtering the response. */
+    void stopFiltering();
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/shutdown/ShutdownHelper.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/shutdown/ShutdownHelper.java
index 13eda584373..164181af4ad 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/shutdown/ShutdownHelper.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/shutdown/ShutdownHelper.java
@@ -5,11 +5,11 @@
 import org.slf4j.LoggerFactory;
 
 public final class ShutdownHelper {
-  private static final Logger log = LoggerFactory.getLogger(ShutdownHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(ShutdownHelper.class);
 
-  public static void shutdownAgent() {
-    log.debug("Shutting down agent ...");
-    Agent.shutdown(true);
-    log.debug("Agent was properly shut down");
-  }
+    public static void shutdownAgent() {
+        log.debug("Shutting down agent ...");
+        Agent.shutdown(true);
+        log.debug("Agent was properly shut down");
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/sslsocket/UsmFilterInputStream.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/sslsocket/UsmFilterInputStream.java
index b8144a191e1..49a032f9ed8 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/sslsocket/UsmFilterInputStream.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/sslsocket/UsmFilterInputStream.java
@@ -12,31 +12,26 @@
 import javax.net.ssl.SSLSocket;
 
 public class UsmFilterInputStream extends FilterInputStream {
-  private final SSLSocket socket;
+    private final SSLSocket socket;
 
-  /**
-   * Creates an input stream filter built on top of the specified underlying input stream. This will
-   * send back the buffer passed to the `read` method to system-probe.
-   */
-  public UsmFilterInputStream(InputStream in, SSLSocket socket) {
-    super(in);
+    /**
+     * Creates an input stream filter built on top of the specified underlying input stream. This will
+     * send back the buffer passed to the `read` method to system-probe.
+     */
+    public UsmFilterInputStream(InputStream in, SSLSocket socket) {
+        super(in);
 
-    this.socket = socket;
-  }
+        this.socket = socket;
+    }
 
-  @Override
-  public int read(@Nonnull byte[] b, int off, int len) throws IOException {
-    int bytesRead = super.read(b, off, len);
-    boolean isIPv6 = socket.getLocalAddress() instanceof Inet6Address;
-    UsmConnection connection =
-        new UsmConnection(
-            socket.getLocalAddress(),
-            socket.getLocalPort(),
-            socket.getInetAddress(),
-            socket.getPort(),
-            isIPv6);
-    UsmMessage message = UsmMessageFactory.Supplier.getRequestMessage(connection, b, off, len);
-    UsmExtractor.Supplier.send(message);
-    return bytesRead;
-  }
+    @Override
+    public int read(@Nonnull byte[] b, int off, int len) throws IOException {
+        int bytesRead = super.read(b, off, len);
+        boolean isIPv6 = socket.getLocalAddress() instanceof Inet6Address;
+        UsmConnection connection = new UsmConnection(
+                socket.getLocalAddress(), socket.getLocalPort(), socket.getInetAddress(), socket.getPort(), isIPv6);
+        UsmMessage message = UsmMessageFactory.Supplier.getRequestMessage(connection, b, off, len);
+        UsmExtractor.Supplier.send(message);
+        return bytesRead;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/sslsocket/UsmFilterOutputStream.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/sslsocket/UsmFilterOutputStream.java
index 1f9d6453ff0..729a00bc44d 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/sslsocket/UsmFilterOutputStream.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/sslsocket/UsmFilterOutputStream.java
@@ -12,30 +12,25 @@
 import javax.net.ssl.SSLSocket;
 
 public class UsmFilterOutputStream extends FilterOutputStream {
-  private final SSLSocket socket;
+    private final SSLSocket socket;
 
-  /**
-   * Creates an output stream filter built on top of the specified underlying output stream. This
-   * will send back the buffer passed to the `write` method to system-probe.
-   */
-  public UsmFilterOutputStream(OutputStream out, SSLSocket socket) {
-    super(out);
+    /**
+     * Creates an output stream filter built on top of the specified underlying output stream. This
+     * will send back the buffer passed to the `write` method to system-probe.
+     */
+    public UsmFilterOutputStream(OutputStream out, SSLSocket socket) {
+        super(out);
 
-    this.socket = socket;
-  }
+        this.socket = socket;
+    }
 
-  @Override
-  public void write(@Nonnull byte[] b, int off, int len) throws IOException {
-    boolean isIPv6 = this.socket.getLocalAddress() instanceof Inet6Address;
-    UsmConnection connection =
-        new UsmConnection(
-            socket.getLocalAddress(),
-            socket.getLocalPort(),
-            socket.getInetAddress(),
-            socket.getPort(),
-            isIPv6);
-    UsmMessage message = UsmMessageFactory.Supplier.getRequestMessage(connection, b, off, len);
-    UsmExtractor.Supplier.send(message);
-    super.write(b, off, len);
-  }
+    @Override
+    public void write(@Nonnull byte[] b, int off, int len) throws IOException {
+        boolean isIPv6 = this.socket.getLocalAddress() instanceof Inet6Address;
+        UsmConnection connection = new UsmConnection(
+                socket.getLocalAddress(), socket.getLocalPort(), socket.getInetAddress(), socket.getPort(), isIPv6);
+        UsmMessage message = UsmMessageFactory.Supplier.getRequestMessage(connection, b, off, len);
+        UsmExtractor.Supplier.send(message);
+        super.write(b, off, len);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/usm/UsmConnection.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/usm/UsmConnection.java
index 4c956ffe210..e7fe745b7b1 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/usm/UsmConnection.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/usm/UsmConnection.java
@@ -6,38 +6,38 @@
 
 public class UsmConnection {
 
-  private static final Logger log = LoggerFactory.getLogger(UsmConnection.class);
-  private InetAddress srcIp;
-  private int srcPort;
-  private InetAddress dstIp;
-  private int dstPort;
-  private boolean isIPv6;
-
-  public UsmConnection(InetAddress src, int srcPort, InetAddress dst, int dstPort, boolean isIPv6) {
-    this.srcIp = src;
-    this.srcPort = srcPort;
-    this.dstIp = dst;
-    this.dstPort = dstPort;
-    this.isIPv6 = isIPv6;
-  }
-
-  public InetAddress getSrcIP() {
-    return srcIp;
-  }
-
-  public int getSrcPort() {
-    return srcPort;
-  }
-
-  public InetAddress getDstIP() {
-    return dstIp;
-  }
-
-  public int getDstPort() {
-    return dstPort;
-  }
-
-  public boolean isIPV6() {
-    return isIPv6;
-  }
+    private static final Logger log = LoggerFactory.getLogger(UsmConnection.class);
+    private InetAddress srcIp;
+    private int srcPort;
+    private InetAddress dstIp;
+    private int dstPort;
+    private boolean isIPv6;
+
+    public UsmConnection(InetAddress src, int srcPort, InetAddress dst, int dstPort, boolean isIPv6) {
+        this.srcIp = src;
+        this.srcPort = srcPort;
+        this.dstIp = dst;
+        this.dstPort = dstPort;
+        this.isIPv6 = isIPv6;
+    }
+
+    public InetAddress getSrcIP() {
+        return srcIp;
+    }
+
+    public int getSrcPort() {
+        return srcPort;
+    }
+
+    public InetAddress getDstIP() {
+        return dstIp;
+    }
+
+    public int getDstPort() {
+        return dstPort;
+    }
+
+    public boolean isIPV6() {
+        return isIPv6;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/usm/UsmExtractor.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/usm/UsmExtractor.java
index a7373c2e09a..71b8ce2259f 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/usm/UsmExtractor.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/usm/UsmExtractor.java
@@ -3,22 +3,22 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public interface UsmExtractor {
-  void send(UsmMessage message);
+    void send(UsmMessage message);
 
-  abstract class Supplier {
-    private static volatile UsmExtractor SUPPLIER;
+    abstract class Supplier {
+        private static volatile UsmExtractor SUPPLIER;
 
-    public static void send(UsmMessage message) {
-      SUPPLIER.send(message);
-    }
+        public static void send(UsmMessage message) {
+            SUPPLIER.send(message);
+        }
 
-    @SuppressFBWarnings(
-        value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-        justification = "Agent-internal holder; Class lock does not escape to application code")
-    public static synchronized void registerIfAbsent(UsmExtractor supplier) {
-      if (SUPPLIER == null) {
-        SUPPLIER = supplier;
-      }
+        @SuppressFBWarnings(
+                value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+                justification = "Agent-internal holder; Class lock does not escape to application code")
+        public static synchronized void registerIfAbsent(UsmExtractor supplier) {
+            if (SUPPLIER == null) {
+                SUPPLIER = supplier;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/usm/UsmMessage.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/usm/UsmMessage.java
index f81c6e4a986..631751cc88c 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/usm/UsmMessage.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/usm/UsmMessage.java
@@ -1,7 +1,7 @@
 package datadog.trace.bootstrap.instrumentation.usm;
 
 public interface UsmMessage {
-  int dataSize();
+    int dataSize();
 
-  boolean validate();
+    boolean validate();
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/usm/UsmMessageFactory.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/usm/UsmMessageFactory.java
index d580b505fb8..caa3d99fe59 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/usm/UsmMessageFactory.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/usm/UsmMessageFactory.java
@@ -3,29 +3,28 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public interface UsmMessageFactory {
-  UsmMessage getCloseMessage(UsmConnection connection);
+    UsmMessage getCloseMessage(UsmConnection connection);
 
-  UsmMessage getRequestMessage(UsmConnection connection, byte[] buffer, int bufferOffset, int len);
+    UsmMessage getRequestMessage(UsmConnection connection, byte[] buffer, int bufferOffset, int len);
 
-  abstract class Supplier {
-    private static volatile UsmMessageFactory SUPPLIER;
+    abstract class Supplier {
+        private static volatile UsmMessageFactory SUPPLIER;
 
-    public static UsmMessage getCloseMessage(UsmConnection connection) {
-      return SUPPLIER.getCloseMessage(connection);
-    }
+        public static UsmMessage getCloseMessage(UsmConnection connection) {
+            return SUPPLIER.getCloseMessage(connection);
+        }
 
-    public static UsmMessage getRequestMessage(
-        UsmConnection connection, byte[] buffer, int bufferOffset, int len) {
-      return SUPPLIER.getRequestMessage(connection, buffer, bufferOffset, len);
-    }
+        public static UsmMessage getRequestMessage(UsmConnection connection, byte[] buffer, int bufferOffset, int len) {
+            return SUPPLIER.getRequestMessage(connection, buffer, bufferOffset, len);
+        }
 
-    @SuppressFBWarnings(
-        value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-        justification = "Agent-internal holder; Class lock does not escape to application code")
-    public static synchronized void registerIfAbsent(UsmMessageFactory supplier) {
-      if (null == SUPPLIER) {
-        SUPPLIER = supplier;
-      }
+        @SuppressFBWarnings(
+                value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+                justification = "Agent-internal holder; Class lock does not escape to application code")
+        public static synchronized void registerIfAbsent(UsmMessageFactory supplier) {
+            if (null == SUPPLIER) {
+                SUPPLIER = supplier;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/websocket/HandlerContext.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/websocket/HandlerContext.java
index 39425d1102e..0e01066a722 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/websocket/HandlerContext.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/websocket/HandlerContext.java
@@ -6,129 +6,129 @@
 import org.slf4j.LoggerFactory;
 
 public abstract class HandlerContext {
-  final Logger LOGGER = LoggerFactory.getLogger(HandlerContext.class);
-
-  private final AgentSpan handshakeSpan;
-  private AgentSpan websocketSpan;
-  private final String sessionId;
-  protected long msgChunks = 0;
-  protected long msgSize = 0;
-  private final CharSequence wsResourceName;
-  protected long firstFrameTimestamp;
-
-  public HandlerContext(AgentSpan handshakeSpan, String sessionId) {
-    this.handshakeSpan = handshakeSpan;
-    this.sessionId = sessionId;
-    wsResourceName = ResourceNameExtractor.extractResourceName(handshakeSpan.getResourceName());
-  }
-
-  public AgentSpan getHandshakeSpan() {
-    return handshakeSpan;
-  }
-
-  public AgentSpan getWebsocketSpan() {
-    return websocketSpan;
-  }
-
-  public void setWebsocketSpan(AgentSpan websocketSpan) {
-    this.websocketSpan = websocketSpan;
-  }
-
-  public String getSessionId() {
-    return sessionId;
-  }
-
-  public long getMsgChunks() {
-    return msgChunks;
-  }
-
-  public long getMsgSize() {
-    return msgSize;
-  }
-
-  public CharSequence getWsResourceName() {
-    return wsResourceName;
-  }
-
-  public long getFirstFrameTimestamp() {
-    return firstFrameTimestamp;
-  }
-
-  public abstract CharSequence getMessageType();
-
-  public void reset() {
-    msgChunks = 0;
-    websocketSpan = null;
-    msgSize = 0;
-    firstFrameTimestamp = 0;
-  }
-
-  public static class Receiver extends HandlerContext {
-    private boolean msgSizeExtractorInitialized = false;
-    private HandlersExtractor.SizeCalculator msgSizeCalculator;
-
-    public Receiver(AgentSpan handshakeSpan, String sessionId) {
-      super(handshakeSpan, sessionId);
+    final Logger LOGGER = LoggerFactory.getLogger(HandlerContext.class);
+
+    private final AgentSpan handshakeSpan;
+    private AgentSpan websocketSpan;
+    private final String sessionId;
+    protected long msgChunks = 0;
+    protected long msgSize = 0;
+    private final CharSequence wsResourceName;
+    protected long firstFrameTimestamp;
+
+    public HandlerContext(AgentSpan handshakeSpan, String sessionId) {
+        this.handshakeSpan = handshakeSpan;
+        this.sessionId = sessionId;
+        wsResourceName = ResourceNameExtractor.extractResourceName(handshakeSpan.getResourceName());
     }
 
-    @Override
-    public CharSequence getMessageType() {
-      return msgSizeCalculator != null ? msgSizeCalculator.getFormat() : null;
+    public AgentSpan getHandshakeSpan() {
+        return handshakeSpan;
     }
 
-    public void recordChunkData(Object data, boolean partialDelivery) {
-      if (msgChunks++ == 0 && partialDelivery) {
-        firstFrameTimestamp = SystemTimeSource.INSTANCE.getCurrentTimeNanos();
-      }
-      if (data == null) {
-        return;
-      }
-      if (!msgSizeExtractorInitialized) {
-        msgSizeExtractorInitialized = true;
-        msgSizeCalculator = HandlersExtractor.getSizeCalculator(data);
-      }
-
-      if (msgSizeCalculator != null) {
-        try {
-          int sz = msgSizeCalculator.getLengthFunction().applyAsInt(data);
-          msgSize += sz;
-          if (partialDelivery && sz == 0) {
-            msgChunks--; // if we receive an empty frame with the fin bit don't count it as a chunk
-          }
-        } catch (Throwable t) {
-          LOGGER.debug(
-              "Unable to calculate websocket message size for data type {}",
-              data.getClass().getName(),
-              t);
-        }
-      }
+    public AgentSpan getWebsocketSpan() {
+        return websocketSpan;
+    }
+
+    public void setWebsocketSpan(AgentSpan websocketSpan) {
+        this.websocketSpan = websocketSpan;
     }
-  }
 
-  public static class Sender extends HandlerContext {
-    private CharSequence msgType;
+    public String getSessionId() {
+        return sessionId;
+    }
 
-    public Sender(AgentSpan handshakeSpan, String sessionId) {
-      super(handshakeSpan, sessionId);
+    public long getMsgChunks() {
+        return msgChunks;
     }
 
-    @Override
-    public CharSequence getMessageType() {
-      return msgType;
+    public long getMsgSize() {
+        return msgSize;
     }
 
-    @Override
+    public CharSequence getWsResourceName() {
+        return wsResourceName;
+    }
+
+    public long getFirstFrameTimestamp() {
+        return firstFrameTimestamp;
+    }
+
+    public abstract CharSequence getMessageType();
+
     public void reset() {
-      super.reset();
-      msgType = null;
+        msgChunks = 0;
+        websocketSpan = null;
+        msgSize = 0;
+        firstFrameTimestamp = 0;
     }
 
-    public void recordChunkData(CharSequence type, int size) {
-      msgChunks++;
-      if (msgType == null) {
-        msgType = type;
-      }
-      msgSize += size;
+    public static class Receiver extends HandlerContext {
+        private boolean msgSizeExtractorInitialized = false;
+        private HandlersExtractor.SizeCalculator msgSizeCalculator;
+
+        public Receiver(AgentSpan handshakeSpan, String sessionId) {
+            super(handshakeSpan, sessionId);
+        }
+
+        @Override
+        public CharSequence getMessageType() {
+            return msgSizeCalculator != null ? msgSizeCalculator.getFormat() : null;
+        }
+
+        public void recordChunkData(Object data, boolean partialDelivery) {
+            if (msgChunks++ == 0 && partialDelivery) {
+                firstFrameTimestamp = SystemTimeSource.INSTANCE.getCurrentTimeNanos();
+            }
+            if (data == null) {
+                return;
+            }
+            if (!msgSizeExtractorInitialized) {
+                msgSizeExtractorInitialized = true;
+                msgSizeCalculator = HandlersExtractor.getSizeCalculator(data);
+            }
+
+            if (msgSizeCalculator != null) {
+                try {
+                    int sz = msgSizeCalculator.getLengthFunction().applyAsInt(data);
+                    msgSize += sz;
+                    if (partialDelivery && sz == 0) {
+                        msgChunks--; // if we receive an empty frame with the fin bit don't count it as a chunk
+                    }
+                } catch (Throwable t) {
+                    LOGGER.debug(
+                            "Unable to calculate websocket message size for data type {}",
+                            data.getClass().getName(),
+                            t);
+                }
+            }
+        }
+    }
+
+    public static class Sender extends HandlerContext {
+        private CharSequence msgType;
+
+        public Sender(AgentSpan handshakeSpan, String sessionId) {
+            super(handshakeSpan, sessionId);
+        }
+
+        @Override
+        public CharSequence getMessageType() {
+            return msgType;
+        }
+
+        @Override
+        public void reset() {
+            super.reset();
+            msgType = null;
+        }
+
+        public void recordChunkData(CharSequence type, int size) {
+            msgChunks++;
+            if (msgType == null) {
+                msgType = type;
+            }
+            msgSize += size;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/websocket/HandlersExtractor.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/websocket/HandlersExtractor.java
index 9d38b66f2ac..797d383f000 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/websocket/HandlersExtractor.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/websocket/HandlersExtractor.java
@@ -8,84 +8,87 @@
 import javax.annotation.Nonnull;
 
 public class HandlersExtractor {
-  public static final CharSequence MESSAGE_TYPE_TEXT = UTF8BytesString.create("text");
-  public static final CharSequence MESSAGE_TYPE_BINARY = UTF8BytesString.create("binary");
+    public static final CharSequence MESSAGE_TYPE_TEXT = UTF8BytesString.create("text");
+    public static final CharSequence MESSAGE_TYPE_BINARY = UTF8BytesString.create("binary");
 
-  static class CharSequenceLenFunction implements ToIntFunction<CharSequence> {
-    @Override
-    public int applyAsInt(CharSequence value) {
-      return value != null ? value.length() : 0;
+    static class CharSequenceLenFunction implements ToIntFunction<CharSequence> {
+        @Override
+        public int applyAsInt(CharSequence value) {
+            return value != null ? value.length() : 0;
+        }
     }
-  }
 
-  static class ByteArrayLenFunction implements ToIntFunction<byte[]> {
-    @Override
-    public int applyAsInt(byte[] value) {
-      return value != null ? value.length : 0;
+    static class ByteArrayLenFunction implements ToIntFunction<byte[]> {
+        @Override
+        public int applyAsInt(byte[] value) {
+            return value != null ? value.length : 0;
+        }
     }
-  }
 
-  static class ByteBufferLenFunction implements ToIntFunction<ByteBuffer> {
-    @Override
-    public int applyAsInt(ByteBuffer value) {
-      return value != null ? value.remaining() : 0;
+    static class ByteBufferLenFunction implements ToIntFunction<ByteBuffer> {
+        @Override
+        public int applyAsInt(ByteBuffer value) {
+            return value != null ? value.remaining() : 0;
+        }
     }
-  }
 
-  static class NoopLenFunction implements ToIntFunction<Object> {
-    @Override
-    public int applyAsInt(Object ignored) {
-      return 0;
+    static class NoopLenFunction implements ToIntFunction<Object> {
+        @Override
+        public int applyAsInt(Object ignored) {
+            return 0;
+        }
     }
-  }
 
-  public static class SizeCalculator<T> {
-    @Nonnull private final ToIntFunction<T> lengthFunction;
-    @Nonnull private final CharSequence format;
+    public static class SizeCalculator<T> {
+        @Nonnull
+        private final ToIntFunction<T> lengthFunction;
 
-    SizeCalculator(@Nonnull ToIntFunction<T> lengthFunction, @Nonnull CharSequence format) {
-      this.lengthFunction = lengthFunction;
-      this.format = format;
-    }
+        @Nonnull
+        private final CharSequence format;
 
-    @Nonnull
-    public ToIntFunction<T> getLengthFunction() {
-      return lengthFunction;
-    }
+        SizeCalculator(@Nonnull ToIntFunction<T> lengthFunction, @Nonnull CharSequence format) {
+            this.lengthFunction = lengthFunction;
+            this.format = format;
+        }
+
+        @Nonnull
+        public ToIntFunction<T> getLengthFunction() {
+            return lengthFunction;
+        }
 
-    @Nonnull
-    public CharSequence getFormat() {
-      return format;
+        @Nonnull
+        public CharSequence getFormat() {
+            return format;
+        }
     }
-  }
 
-  public static final SizeCalculator<CharSequence> CHAR_SEQUENCE_SIZE_CALCULATOR =
-      new SizeCalculator<>(new CharSequenceLenFunction(), MESSAGE_TYPE_TEXT);
-  public static final SizeCalculator<byte[]> BYTES_SIZE_CALCULATOR =
-      new SizeCalculator<>(new ByteArrayLenFunction(), MESSAGE_TYPE_BINARY);
-  public static final SizeCalculator<ByteBuffer> BYTE_BUFFER_SIZE_CALCULATOR =
-      new SizeCalculator<>(new ByteBufferLenFunction(), MESSAGE_TYPE_BINARY);
-  public static final SizeCalculator<Object> TEXT_STREAM_SIZE_CALCULATOR =
-      new SizeCalculator<>(new NoopLenFunction(), MESSAGE_TYPE_TEXT);
-  public static final SizeCalculator<Object> BYTE_STREAM_SIZE_CALCULATOR =
-      new SizeCalculator<>(new NoopLenFunction(), MESSAGE_TYPE_BINARY);
+    public static final SizeCalculator<CharSequence> CHAR_SEQUENCE_SIZE_CALCULATOR =
+            new SizeCalculator<>(new CharSequenceLenFunction(), MESSAGE_TYPE_TEXT);
+    public static final SizeCalculator<byte[]> BYTES_SIZE_CALCULATOR =
+            new SizeCalculator<>(new ByteArrayLenFunction(), MESSAGE_TYPE_BINARY);
+    public static final SizeCalculator<ByteBuffer> BYTE_BUFFER_SIZE_CALCULATOR =
+            new SizeCalculator<>(new ByteBufferLenFunction(), MESSAGE_TYPE_BINARY);
+    public static final SizeCalculator<Object> TEXT_STREAM_SIZE_CALCULATOR =
+            new SizeCalculator<>(new NoopLenFunction(), MESSAGE_TYPE_TEXT);
+    public static final SizeCalculator<Object> BYTE_STREAM_SIZE_CALCULATOR =
+            new SizeCalculator<>(new NoopLenFunction(), MESSAGE_TYPE_BINARY);
 
-  public static SizeCalculator getSizeCalculator(Object data) {
-    // we only extract "safely" the message size from byte[], ByteBuffer and String.
-    // Other types will contain streaming data (i.e. InputStream, Reader)
-    if (data instanceof CharSequence) {
-      return CHAR_SEQUENCE_SIZE_CALCULATOR;
-    } else if (data instanceof byte[]) {
-      return BYTES_SIZE_CALCULATOR;
-    } else if (data instanceof ByteBuffer) {
-      return BYTE_BUFFER_SIZE_CALCULATOR;
-    } else if (data instanceof Reader) {
-      return TEXT_STREAM_SIZE_CALCULATOR;
-    } else if (data instanceof InputStream) {
-      return BYTE_STREAM_SIZE_CALCULATOR;
+    public static SizeCalculator getSizeCalculator(Object data) {
+        // we only extract "safely" the message size from byte[], ByteBuffer and String.
+        // Other types will contain streaming data (i.e. InputStream, Reader)
+        if (data instanceof CharSequence) {
+            return CHAR_SEQUENCE_SIZE_CALCULATOR;
+        } else if (data instanceof byte[]) {
+            return BYTES_SIZE_CALCULATOR;
+        } else if (data instanceof ByteBuffer) {
+            return BYTE_BUFFER_SIZE_CALCULATOR;
+        } else if (data instanceof Reader) {
+            return TEXT_STREAM_SIZE_CALCULATOR;
+        } else if (data instanceof InputStream) {
+            return BYTE_STREAM_SIZE_CALCULATOR;
+        }
+        return null;
     }
-    return null;
-  }
 
-  private HandlersExtractor() {}
+    private HandlersExtractor() {}
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/websocket/ResourceNameExtractor.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/websocket/ResourceNameExtractor.java
index b9fe9c179c0..b32b96f22e6 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/websocket/ResourceNameExtractor.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/websocket/ResourceNameExtractor.java
@@ -7,30 +7,29 @@
 import java.util.function.Function;
 
 public class ResourceNameExtractor {
-  private static final String SPACE = " ";
-  private static final String WEBSOCKET_SPACE = "websocket" + SPACE;
-  private static final DDCache<CharSequence, CharSequence> CACHE = DDCaches.newFixedSizeCache(128);
-  private static final Function<CharSequence, CharSequence> EXTRACTOR =
-      s -> {
+    private static final String SPACE = " ";
+    private static final String WEBSOCKET_SPACE = "websocket" + SPACE;
+    private static final DDCache<CharSequence, CharSequence> CACHE = DDCaches.newFixedSizeCache(128);
+    private static final Function<CharSequence, CharSequence> EXTRACTOR = s -> {
         if (s == null || s.length() == 0) {
-          return HttpResourceNames.DEFAULT_RESOURCE_NAME;
+            return HttpResourceNames.DEFAULT_RESOURCE_NAME;
         }
         int idx = s.toString().indexOf(SPACE);
         if (idx < 0 || idx == s.length() - 1) {
-          return s;
+            return s;
         }
         final CharSequence ret = s.subSequence(idx + 1, s.length());
         if (ret.length() == 0) {
-          return HttpResourceNames.DEFAULT_RESOURCE_NAME;
+            return HttpResourceNames.DEFAULT_RESOURCE_NAME;
         }
         return ret;
-      };
-  private static final Function<CharSequence, CharSequence> ADDER =
-      EXTRACTOR.andThen(new Functions.Prefix(WEBSOCKET_SPACE));
+    };
+    private static final Function<CharSequence, CharSequence> ADDER =
+            EXTRACTOR.andThen(new Functions.Prefix(WEBSOCKET_SPACE));
 
-  private ResourceNameExtractor() {}
+    private ResourceNameExtractor() {}
 
-  public static CharSequence extractResourceName(CharSequence handshakeResourceName) {
-    return CACHE.computeIfAbsent(handshakeResourceName, ADDER);
-  }
+    public static CharSequence extractResourceName(CharSequence handshakeResourceName) {
+        return CACHE.computeIfAbsent(handshakeResourceName, ADDER);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/api8/java/concurrent/StatusSettable.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/api8/java/concurrent/StatusSettable.java
index a7db86aec10..3d3b8015784 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/api8/java/concurrent/StatusSettable.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/api8/java/concurrent/StatusSettable.java
@@ -1,11 +1,11 @@
 package datadog.trace.bootstrap.instrumentation.api8.java.concurrent;
 
 public interface StatusSettable<C> {
-  C statusStart();
+    C statusStart();
 
-  void setSuccess(C context);
+    void setSuccess(C context);
 
-  void setError(C context, Throwable throwable);
+    void setError(C context, Throwable throwable);
 
-  void statusFinished(C context);
+    void statusFinished(C context);
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/api8/java/concurrent/StatusSettingCompletableFuture.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/api8/java/concurrent/StatusSettingCompletableFuture.java
index a8adf5c9203..1995a4ebcd7 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/api8/java/concurrent/StatusSettingCompletableFuture.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/api8/java/concurrent/StatusSettingCompletableFuture.java
@@ -3,58 +3,58 @@
 import java.util.concurrent.CompletableFuture;
 
 public class StatusSettingCompletableFuture<T, C> extends CompletableFuture<T> {
-  public static <T, C> StatusSettingCompletableFuture<T, C> wrap(StatusSettable<C> settable) {
-    return new StatusSettingCompletableFuture<>(settable);
-  }
+    public static <T, C> StatusSettingCompletableFuture<T, C> wrap(StatusSettable<C> settable) {
+        return new StatusSettingCompletableFuture<>(settable);
+    }
 
-  private final StatusSettable<C> settable;
+    private final StatusSettable<C> settable;
 
-  public StatusSettingCompletableFuture(StatusSettable settable) {
-    this.settable = settable;
-  }
+    public StatusSettingCompletableFuture(StatusSettable settable) {
+        this.settable = settable;
+    }
 
-  @Override
-  public boolean complete(T value) {
-    C context = settable.statusStart();
-    boolean success;
-    try {
-      success = super.complete(value);
-      if (success) {
-        settable.setSuccess(context);
-      }
-    } finally {
-      settable.statusFinished(context);
+    @Override
+    public boolean complete(T value) {
+        C context = settable.statusStart();
+        boolean success;
+        try {
+            success = super.complete(value);
+            if (success) {
+                settable.setSuccess(context);
+            }
+        } finally {
+            settable.statusFinished(context);
+        }
+        return success;
     }
-    return success;
-  }
 
-  @Override
-  public boolean completeExceptionally(Throwable ex) {
-    C context = settable.statusStart();
-    boolean success;
-    try {
-      success = super.completeExceptionally(ex);
-      if (success) {
-        settable.setError(context, ex);
-      }
-    } finally {
-      settable.statusFinished(context);
+    @Override
+    public boolean completeExceptionally(Throwable ex) {
+        C context = settable.statusStart();
+        boolean success;
+        try {
+            success = super.completeExceptionally(ex);
+            if (success) {
+                settable.setError(context, ex);
+            }
+        } finally {
+            settable.statusFinished(context);
+        }
+        return success;
     }
-    return success;
-  }
 
-  @Override
-  public boolean cancel(boolean mayInterruptIfRunning) {
-    C context = settable.statusStart();
-    boolean success;
-    try {
-      success = super.cancel(mayInterruptIfRunning);
-      if (success) {
-        settable.setSuccess(context);
-      }
-    } finally {
-      settable.statusFinished(context);
+    @Override
+    public boolean cancel(boolean mayInterruptIfRunning) {
+        C context = settable.statusStart();
+        boolean success;
+        try {
+            success = super.cancel(mayInterruptIfRunning);
+            if (success) {
+                settable.setSuccess(context);
+            }
+        } finally {
+            settable.statusFinished(context);
+        }
+        return success;
     }
-    return success;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/ffm/FFMNativeMethodDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/ffm/FFMNativeMethodDecorator.java
index b7ce858c031..5afb0428862 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/ffm/FFMNativeMethodDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/ffm/FFMNativeMethodDecorator.java
@@ -14,203 +14,190 @@
 import org.slf4j.LoggerFactory;
 
 public final class FFMNativeMethodDecorator extends BaseDecorator {
-  private static final Logger LOGGER = LoggerFactory.getLogger(FFMNativeMethodDecorator.class);
-  private static final CharSequence TRACE_FFM = UTF8BytesString.create("trace-ffm");
-  private static final CharSequence OPERATION_NAME = UTF8BytesString.create("trace.native");
-
-  private static final MethodHandle START_SPAN_MH =
-      safeFindStatic(
-          "startSpan",
-          MethodType.methodType(ContextScope.class, CharSequence.class, boolean.class));
-  private static final MethodHandle END_SPAN_MH =
-      safeFindStatic(
-          "endSpan",
-          MethodType.methodType(Object.class, Throwable.class, ContextScope.class, Object.class));
-
-  public static final FFMNativeMethodDecorator DECORATE = new FFMNativeMethodDecorator();
-
-  private static MethodHandle safeFindStatic(String name, MethodType methodType) {
-    try {
-      return MethodHandles.lookup().findStatic(FFMNativeMethodDecorator.class, name, methodType);
-    } catch (Throwable t) {
-      LOGGER.debug("Cannot find method {} in NativeMethodHandleWrapper", name, t);
-      return null;
+    private static final Logger LOGGER = LoggerFactory.getLogger(FFMNativeMethodDecorator.class);
+    private static final CharSequence TRACE_FFM = UTF8BytesString.create("trace-ffm");
+    private static final CharSequence OPERATION_NAME = UTF8BytesString.create("trace.native");
+
+    private static final MethodHandle START_SPAN_MH =
+            safeFindStatic("startSpan", MethodType.methodType(ContextScope.class, CharSequence.class, boolean.class));
+    private static final MethodHandle END_SPAN_MH = safeFindStatic(
+            "endSpan", MethodType.methodType(Object.class, Throwable.class, ContextScope.class, Object.class));
+
+    public static final FFMNativeMethodDecorator DECORATE = new FFMNativeMethodDecorator();
+
+    private static MethodHandle safeFindStatic(String name, MethodType methodType) {
+        try {
+            return MethodHandles.lookup().findStatic(FFMNativeMethodDecorator.class, name, methodType);
+        } catch (Throwable t) {
+            LOGGER.debug("Cannot find method {} in NativeMethodHandleWrapper", name, t);
+            return null;
+        }
     }
-  }
 
-  public static MethodHandle wrap(
-      final MethodHandle original, final String libraryName, final String methodName) {
-    if (START_SPAN_MH == null || END_SPAN_MH == null) {
-      return original;
-    }
-    try {
-      MethodType originalType = original.type();
-      boolean isVoid = originalType.returnType() == void.class;
-
-      // We need the ContextScope to be visible to the finally block.
-      // Easiest way is to artificially prepend it to the target signature.
-      // The added parameter is ignored by the original handle.
-      // originalWithScope: (ContextScope, args...) -> R
-      MethodHandle originalWithScope = MethodHandles.dropArguments(original, 0, ContextScope.class);
-
-      /*
-       * Build the cleanup handle used by MethodHandles.tryFinally.
-       *
-       * tryFinally has a strict calling convention:
-       *   - void target  -> cleanup(Throwable, ContextScope, args...)
-       *   - non-void     -> cleanup(Throwable, R, ContextScope, args...)
-       *
-       * END_SPAN_MH is (Throwable, ContextScope, Object) -> Object,
-       * so we need to reshape it to match what tryFinally expects.
-       */
-      MethodHandle cleanup;
-
-      if (isVoid) {
-        // No return value: bind `null` as the result argument.
-        MethodHandle endWithNull = MethodHandles.insertArguments(END_SPAN_MH, 2, (Object) null);
-
-        // Make it accept the original arguments even though they are unused.
-        MethodHandle endDropped =
-            MethodHandles.dropArguments(endWithNull, 2, originalType.parameterList());
-
-        // tryFinally requires void return for void targets.
-        cleanup = endDropped.asType(endDropped.type().changeReturnType(void.class));
-
-      } else {
-        /*
-         * Non-void case:
-         * tryFinally will call cleanup as:
-         *   (Throwable, returnValue, ContextScope, args...)
-         *
-         * END_SPAN_MH expects:
-         *   (Throwable, ContextScope, result)
-         *
-         * So we first permute parameters to swap returnValue and ContextScope.
-         */
-        MethodHandle endPermuted =
-            MethodHandles.permuteArguments(
-                END_SPAN_MH,
-                MethodType.methodType(
-                    Object.class, Throwable.class, Object.class, ContextScope.class),
-                0,
-                2,
-                1);
-
-        // Accept original arguments (unused) after the required ones.
-        MethodHandle endDropped =
-            MethodHandles.dropArguments(endPermuted, 3, originalType.parameterList());
-
-        // Adapt return and result parameter types to match the original signature.
-        MethodType cleanupType =
-            endDropped
-                .type()
-                .changeParameterType(1, originalType.returnType())
-                .changeReturnType(originalType.returnType());
-
-        cleanup = endDropped.asType(cleanupType);
-      }
-
-      // Wrap the original in try/finally semantics.
-      // Resulting handle:
-      //   (ContextScope, args...) -> R
-      MethodHandle withFinally = MethodHandles.tryFinally(originalWithScope, cleanup);
-
-      // Precompute span metadata so we don't redo the lookup per invocation.
-      final CharSequence resourceName = resourceNameFor(libraryName, methodName);
-      final boolean methodMeasured = isMethodMeasured(libraryName, methodName);
-
-      // Bind both arguments to startSpan.
-      // After binding: () -> ContextScope
-      MethodHandle boundStart =
-          MethodHandles.insertArguments(START_SPAN_MH, 0, resourceName, methodMeasured);
-
-      // Make it look like it takes the same arguments as the original,
-      // even though they are ignored.
-      // (args...) -> ContextScope
-      MethodHandle startCombiner =
-          MethodHandles.dropArguments(boundStart, 0, originalType.parameterList());
-
-      /*
-       * foldArguments wires it all together:
-       *
-       *   scope = startCombiner(args...)
-       *   return withFinally(scope, args...)
-       *
-       * Final shape matches the original:
-       *   (args...) -> R
-       */
-      return MethodHandles.foldArguments(withFinally, startCombiner);
-
-    } catch (Throwable t) {
-      LOGGER.debug(
-          "Cannot wrap method handle for library {} and method {}", libraryName, methodName, t);
-      return original;
+    public static MethodHandle wrap(final MethodHandle original, final String libraryName, final String methodName) {
+        if (START_SPAN_MH == null || END_SPAN_MH == null) {
+            return original;
+        }
+        try {
+            MethodType originalType = original.type();
+            boolean isVoid = originalType.returnType() == void.class;
+
+            // We need the ContextScope to be visible to the finally block.
+            // Easiest way is to artificially prepend it to the target signature.
+            // The added parameter is ignored by the original handle.
+            // originalWithScope: (ContextScope, args...) -> R
+            MethodHandle originalWithScope = MethodHandles.dropArguments(original, 0, ContextScope.class);
+
+            /*
+             * Build the cleanup handle used by MethodHandles.tryFinally.
+             *
+             * tryFinally has a strict calling convention:
+             *   - void target  -> cleanup(Throwable, ContextScope, args...)
+             *   - non-void     -> cleanup(Throwable, R, ContextScope, args...)
+             *
+             * END_SPAN_MH is (Throwable, ContextScope, Object) -> Object,
+             * so we need to reshape it to match what tryFinally expects.
+             */
+            MethodHandle cleanup;
+
+            if (isVoid) {
+                // No return value: bind `null` as the result argument.
+                MethodHandle endWithNull = MethodHandles.insertArguments(END_SPAN_MH, 2, (Object) null);
+
+                // Make it accept the original arguments even though they are unused.
+                MethodHandle endDropped = MethodHandles.dropArguments(endWithNull, 2, originalType.parameterList());
+
+                // tryFinally requires void return for void targets.
+                cleanup = endDropped.asType(endDropped.type().changeReturnType(void.class));
+
+            } else {
+                /*
+                 * Non-void case:
+                 * tryFinally will call cleanup as:
+                 *   (Throwable, returnValue, ContextScope, args...)
+                 *
+                 * END_SPAN_MH expects:
+                 *   (Throwable, ContextScope, result)
+                 *
+                 * So we first permute parameters to swap returnValue and ContextScope.
+                 */
+                MethodHandle endPermuted = MethodHandles.permuteArguments(
+                        END_SPAN_MH,
+                        MethodType.methodType(Object.class, Throwable.class, Object.class, ContextScope.class),
+                        0,
+                        2,
+                        1);
+
+                // Accept original arguments (unused) after the required ones.
+                MethodHandle endDropped = MethodHandles.dropArguments(endPermuted, 3, originalType.parameterList());
+
+                // Adapt return and result parameter types to match the original signature.
+                MethodType cleanupType = endDropped
+                        .type()
+                        .changeParameterType(1, originalType.returnType())
+                        .changeReturnType(originalType.returnType());
+
+                cleanup = endDropped.asType(cleanupType);
+            }
+
+            // Wrap the original in try/finally semantics.
+            // Resulting handle:
+            //   (ContextScope, args...) -> R
+            MethodHandle withFinally = MethodHandles.tryFinally(originalWithScope, cleanup);
+
+            // Precompute span metadata so we don't redo the lookup per invocation.
+            final CharSequence resourceName = resourceNameFor(libraryName, methodName);
+            final boolean methodMeasured = isMethodMeasured(libraryName, methodName);
+
+            // Bind both arguments to startSpan.
+            // After binding: () -> ContextScope
+            MethodHandle boundStart = MethodHandles.insertArguments(START_SPAN_MH, 0, resourceName, methodMeasured);
+
+            // Make it look like it takes the same arguments as the original,
+            // even though they are ignored.
+            // (args...) -> ContextScope
+            MethodHandle startCombiner = MethodHandles.dropArguments(boundStart, 0, originalType.parameterList());
+
+            /*
+             * foldArguments wires it all together:
+             *
+             *   scope = startCombiner(args...)
+             *   return withFinally(scope, args...)
+             *
+             * Final shape matches the original:
+             *   (args...) -> R
+             */
+            return MethodHandles.foldArguments(withFinally, startCombiner);
+
+        } catch (Throwable t) {
+            LOGGER.debug("Cannot wrap method handle for library {} and method {}", libraryName, methodName, t);
+            return original;
+        }
     }
-  }
-
-  @SuppressWarnings("unused")
-  public static ContextScope startSpan(CharSequence resourceName, boolean methodMeasured) {
-    AgentSpan span = AgentTracer.startSpan(TRACE_FFM.toString(), OPERATION_NAME);
-    DECORATE.afterStart(span);
-    span.setResourceName(resourceName);
-    if (methodMeasured) {
-      span.setMeasured(true);
+
+    @SuppressWarnings("unused")
+    public static ContextScope startSpan(CharSequence resourceName, boolean methodMeasured) {
+        AgentSpan span = AgentTracer.startSpan(TRACE_FFM.toString(), OPERATION_NAME);
+        DECORATE.afterStart(span);
+        span.setResourceName(resourceName);
+        if (methodMeasured) {
+            span.setMeasured(true);
+        }
+        return AgentTracer.activateSpan(span);
     }
-    return AgentTracer.activateSpan(span);
-  }
-
-  @SuppressWarnings("unused")
-  public static Object endSpan(Throwable t, ContextScope scope, Object result) {
-    try {
-      if (scope != null) {
-        final AgentSpan span = AgentSpan.fromContext(scope.context());
-        scope.close();
-
-        if (span != null) {
-          if (t != null) {
-            DECORATE.onError(span, t);
-            span.addThrowable(t);
-          }
-          span.finish();
+
+    @SuppressWarnings("unused")
+    public static Object endSpan(Throwable t, ContextScope scope, Object result) {
+        try {
+            if (scope != null) {
+                final AgentSpan span = AgentSpan.fromContext(scope.context());
+                scope.close();
+
+                if (span != null) {
+                    if (t != null) {
+                        DECORATE.onError(span, t);
+                        span.addThrowable(t);
+                    }
+                    span.finish();
+                }
+            }
+        } catch (Throwable ignored) {
+
         }
-      }
-    } catch (Throwable ignored) {
+        return result;
+    }
 
+    public static boolean isMethodTraced(final String library, final String method) {
+        return matches(InstrumenterConfig.get().getTraceNativeMethods().get(library), method);
     }
-    return result;
-  }
 
-  public static boolean isMethodTraced(final String library, final String method) {
-    return matches(InstrumenterConfig.get().getTraceNativeMethods().get(library), method);
-  }
+    public static boolean isMethodMeasured(final String library, final String method) {
+        return matches(InstrumenterConfig.get().getMeasureNativeMethods().get(library), method);
+    }
+
+    public static CharSequence resourceNameFor(final String library, final String method) {
+        return UTF8BytesString.create(library + "." + method);
+    }
+
+    private static boolean matches(final Set<String> allows, final String method) {
+        if (allows == null) {
+            return false;
+        }
+        return allows.contains(method) || allows.contains("*");
+    }
 
-  public static boolean isMethodMeasured(final String library, final String method) {
-    return matches(InstrumenterConfig.get().getMeasureNativeMethods().get(library), method);
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {TRACE_FFM.toString()};
+    }
 
-  public static CharSequence resourceNameFor(final String library, final String method) {
-    return UTF8BytesString.create(library + "." + method);
-  }
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
 
-  private static boolean matches(final Set<String> allows, final String method) {
-    if (allows == null) {
-      return false;
+    @Override
+    protected CharSequence component() {
+        return TRACE_FFM;
     }
-    return allows.contains(method) || allows.contains("*");
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {TRACE_FFM.toString()};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return TRACE_FFM;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/ffm/NativeLibraryHelper.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/ffm/NativeLibraryHelper.java
index 15033da489b..d8d0faf68c4 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/ffm/NativeLibraryHelper.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/ffm/NativeLibraryHelper.java
@@ -6,30 +6,28 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 public final class NativeLibraryHelper {
-  // this map is unlimited. However, the number of entries depends on the configured methods we want
-  // to trace.
-  private static final ConcurrentHashMap<Long, Pair<String, String>> SYMBOLS_MAP =
-      new ConcurrentHashMap<>();
+    // this map is unlimited. However, the number of entries depends on the configured methods we want
+    // to trace.
+    private static final ConcurrentHashMap<Long, Pair<String, String>> SYMBOLS_MAP = new ConcurrentHashMap<>();
 
-  private NativeLibraryHelper() {}
+    private NativeLibraryHelper() {}
 
-  public static void onSymbolLookup(
-      final String libraryName, final String symbol, final long address) {
-    if (libraryName != null && !libraryName.isEmpty()) {
-      if (FFMNativeMethodDecorator.isMethodTraced(libraryName, symbol)) {
-        SYMBOLS_MAP.put(address, Pair.of(libraryName, symbol));
-      }
+    public static void onSymbolLookup(final String libraryName, final String symbol, final long address) {
+        if (libraryName != null && !libraryName.isEmpty()) {
+            if (FFMNativeMethodDecorator.isMethodTraced(libraryName, symbol)) {
+                SYMBOLS_MAP.put(address, Pair.of(libraryName, symbol));
+            }
+        }
     }
-  }
 
-  public static Pair<String, String> reverseResolveLibraryAndSymbol(long address) {
-    return SYMBOLS_MAP.get(address);
-  }
+    public static Pair<String, String> reverseResolveLibraryAndSymbol(long address) {
+        return SYMBOLS_MAP.get(address);
+    }
 
-  public static String extractLibraryName(String fullPath) {
-    String libraryName = new File(fullPath).getName().toLowerCase(Locale.ROOT);
-    int dot = libraryName.lastIndexOf('.');
-    libraryName = (dot > 0) ? libraryName.substring(0, dot) : libraryName;
-    return libraryName;
-  }
+    public static String extractLibraryName(String fullPath) {
+        String libraryName = new File(fullPath).getName().toLowerCase(Locale.ROOT);
+        int dot = libraryName.lastIndexOf('.');
+        libraryName = (dot > 0) ? libraryName.substring(0, dot) : libraryName;
+        return libraryName;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/ContextualEvent.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/ContextualEvent.java
index ba0ea612163..f9cf69aaea6 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/ContextualEvent.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/ContextualEvent.java
@@ -5,15 +5,15 @@
 
 public interface ContextualEvent {
 
-  void setContext(long localRootSpanId, long spanId);
+    void setContext(long localRootSpanId, long spanId);
 
-  default void captureContext() {
-    AgentSpan activeSpan = AgentTracer.activeSpan();
-    if (activeSpan != null) {
-      long spanId = activeSpan.getSpanId();
-      AgentSpan rootSpan = activeSpan.getLocalRootSpan();
-      long localRootSpanId = rootSpan == null ? spanId : rootSpan.getSpanId();
-      setContext(localRootSpanId, spanId);
+    default void captureContext() {
+        AgentSpan activeSpan = AgentTracer.activeSpan();
+        if (activeSpan != null) {
+            long spanId = activeSpan.getSpanId();
+            AgentSpan rootSpan = activeSpan.getLocalRootSpan();
+            long localRootSpanId = rootSpan == null ? spanId : rootSpan.getSpanId();
+            setContext(localRootSpanId, spanId);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/JfrHelper.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/JfrHelper.java
index 84afe6b1482..bf2c1e18bc5 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/JfrHelper.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/JfrHelper.java
@@ -5,9 +5,9 @@
 import jdk.jfr.FlightRecorder;
 
 public final class JfrHelper {
-  public static void addPeriodicEvent(Class<? extends Event> eventClass, Runnable eventHook) {
-    if (!Platform.isNativeImageBuilder()) {
-      FlightRecorder.addPeriodicEvent(eventClass, eventHook);
+    public static void addPeriodicEvent(Class<? extends Event> eventClass, Runnable eventHook) {
+        if (!Platform.isNativeImageBuilder()) {
+            FlightRecorder.addPeriodicEvent(eventClass, eventHook);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/WindowSampler.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/WindowSampler.java
index d49dfd83ad5..f23104ef188 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/WindowSampler.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/WindowSampler.java
@@ -7,20 +7,19 @@
 
 public class WindowSampler<E extends Event> {
 
-  private final AdaptiveSampler sampler;
-  private final EventType sampleType;
+    private final AdaptiveSampler sampler;
+    private final EventType sampleType;
 
-  protected WindowSampler(
-      Duration windowDuration, int samplesPerWindow, int lookback, Class<E> eventType) {
-    sampler = new AdaptiveSampler(windowDuration, samplesPerWindow, lookback, 16, false);
-    sampleType = EventType.getEventType(eventType);
-  }
+    protected WindowSampler(Duration windowDuration, int samplesPerWindow, int lookback, Class<E> eventType) {
+        sampler = new AdaptiveSampler(windowDuration, samplesPerWindow, lookback, 16, false);
+        sampleType = EventType.getEventType(eventType);
+    }
 
-  public void start() {
-    sampler.start();
-  }
+    public void start() {
+        sampler.start();
+    }
 
-  public boolean sample() {
-    return sampleType.isEnabled() && sampler.sample();
-  }
+    public boolean sample() {
+        return sampleType.isEnabled() && sampler.sample();
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/backpressure/BackpressureProfiling.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/backpressure/BackpressureProfiling.java
index c1001014688..60ddac84071 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/backpressure/BackpressureProfiling.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/backpressure/BackpressureProfiling.java
@@ -5,32 +5,31 @@
 
 public final class BackpressureProfiling {
 
-  private static final class Holder {
-    static final BackpressureProfiling INSTANCE = new BackpressureProfiling(Config.get());
-  }
+    private static final class Holder {
+        static final BackpressureProfiling INSTANCE = new BackpressureProfiling(Config.get());
+    }
 
-  public static BackpressureProfiling getInstance() {
-    return Holder.INSTANCE;
-  }
+    public static BackpressureProfiling getInstance() {
+        return Holder.INSTANCE;
+    }
 
-  private final BackpressureSampler sampler;
+    private final BackpressureSampler sampler;
 
-  private BackpressureProfiling(final Config config) {
-    this(new BackpressureSampler(config));
-  }
+    private BackpressureProfiling(final Config config) {
+        this(new BackpressureSampler(config));
+    }
 
-  BackpressureProfiling(BackpressureSampler sampler) {
-    this.sampler = sampler;
-  }
+    BackpressureProfiling(BackpressureSampler sampler) {
+        this.sampler = sampler;
+    }
 
-  public void start() {
-    sampler.start();
-  }
+    public void start() {
+        sampler.start();
+    }
 
-  public void process(Class<?> backpressureMechanism, Object task) {
-    if (sampler.sample()) {
-      new BackpressureSampleEvent(backpressureMechanism, TaskWrapper.getUnwrappedType(task))
-          .commit();
+    public void process(Class<?> backpressureMechanism, Object task) {
+        if (sampler.sample()) {
+            new BackpressureSampleEvent(backpressureMechanism, TaskWrapper.getUnwrappedType(task)).commit();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/backpressure/BackpressureSampleEvent.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/backpressure/BackpressureSampleEvent.java
index ec3eefd28c3..112d208e0b8 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/backpressure/BackpressureSampleEvent.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/backpressure/BackpressureSampleEvent.java
@@ -12,27 +12,27 @@
 @Description("Datadog backpressure sample event.")
 @Category("Datadog")
 public class BackpressureSampleEvent extends Event implements ContextualEvent {
-  @Label("Policy")
-  private final Class<?> policy;
+    @Label("Policy")
+    private final Class<?> policy;
 
-  @Label("Task")
-  private final Class<?> task;
+    @Label("Task")
+    private final Class<?> task;
 
-  @Label("Local Root Span Id")
-  private long localRootSpanId;
+    @Label("Local Root Span Id")
+    private long localRootSpanId;
 
-  @Label("Span Id")
-  private long spanId;
+    @Label("Span Id")
+    private long spanId;
 
-  public BackpressureSampleEvent(Class<?> policy, Class<?> task) {
-    this.policy = policy;
-    this.task = task;
-    captureContext();
-  }
+    public BackpressureSampleEvent(Class<?> policy, Class<?> task) {
+        this.policy = policy;
+        this.task = task;
+        captureContext();
+    }
 
-  @Override
-  public void setContext(long localRootSpanId, long spanId) {
-    this.localRootSpanId = localRootSpanId;
-    this.spanId = spanId;
-  }
+    @Override
+    public void setContext(long localRootSpanId, long spanId) {
+        this.localRootSpanId = localRootSpanId;
+        this.spanId = spanId;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/backpressure/BackpressureSampler.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/backpressure/BackpressureSampler.java
index 279d7f86f4b..7a761344f16 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/backpressure/BackpressureSampler.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/backpressure/BackpressureSampler.java
@@ -8,26 +8,26 @@
 import java.time.temporal.ChronoUnit;
 
 final class BackpressureSampler extends WindowSampler<BackpressureSampleEvent> {
-  /*
-   * Fixed 0.5 second sampling window.
-   * Logic in AdaptiveSampler relies on sampling window being small compared to (in our case) recording duration:
-   * sampler may overshoot on one given window but should average to samplesPerWindow in the long run.
-   */
-  private static final Duration SAMPLING_WINDOW = Duration.of(500, ChronoUnit.MILLIS);
+    /*
+     * Fixed 0.5 second sampling window.
+     * Logic in AdaptiveSampler relies on sampling window being small compared to (in our case) recording duration:
+     * sampler may overshoot on one given window but should average to samplesPerWindow in the long run.
+     */
+    private static final Duration SAMPLING_WINDOW = Duration.of(500, ChronoUnit.MILLIS);
 
-  BackpressureSampler(final Config config) {
-    this(
-        SAMPLING_WINDOW,
-        getSamplesPerWindow(config),
-        samplingWindowsPerRecording(config.getProfilingUploadPeriod(), SAMPLING_WINDOW));
-  }
+    BackpressureSampler(final Config config) {
+        this(
+                SAMPLING_WINDOW,
+                getSamplesPerWindow(config),
+                samplingWindowsPerRecording(config.getProfilingUploadPeriod(), SAMPLING_WINDOW));
+    }
 
-  BackpressureSampler(Duration windowDuration, int samplesPerWindow, int lookback) {
-    super(windowDuration, samplesPerWindow, lookback, BackpressureSampleEvent.class);
-  }
+    BackpressureSampler(Duration windowDuration, int samplesPerWindow, int lookback) {
+        super(windowDuration, samplesPerWindow, lookback, BackpressureSampleEvent.class);
+    }
 
-  protected static int getSamplesPerWindow(final Config config) {
-    return config.getProfilingBackPressureSampleLimit()
-        / samplingWindowsPerRecording(config.getProfilingUploadPeriod(), SAMPLING_WINDOW);
-  }
+    protected static int getSamplesPerWindow(final Config config) {
+        return config.getProfilingBackPressureSampleLimit()
+                / samplingWindowsPerRecording(config.getProfilingUploadPeriod(), SAMPLING_WINDOW);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/AllocatorHistogram.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/AllocatorHistogram.java
index 272d0022445..0a048288328 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/AllocatorHistogram.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/AllocatorHistogram.java
@@ -10,53 +10,53 @@
 import jdk.jfr.FlightRecorder;
 
 public class AllocatorHistogram extends ClassValue<AtomicLong[]> {
-  private final List<WeakReference<Class<?>>> refs = new CopyOnWriteArrayList<>();
+    private final List<WeakReference<Class<?>>> refs = new CopyOnWriteArrayList<>();
 
-  private final EventType eventType;
-  private final Runnable eventHook;
+    private final EventType eventType;
+    private final Runnable eventHook;
 
-  AllocatorHistogram() {
-    eventType = EventType.getEventType(DirectAllocationTotalEvent.class);
-    eventHook = this::emit;
-    JfrHelper.addPeriodicEvent(DirectAllocationTotalEvent.class, eventHook);
-  }
+    AllocatorHistogram() {
+        eventType = EventType.getEventType(DirectAllocationTotalEvent.class);
+        eventHook = this::emit;
+        JfrHelper.addPeriodicEvent(DirectAllocationTotalEvent.class, eventHook);
+    }
+
+    /** Remove this instance from JFR periodic events callbacks */
+    void deregister() {
+        FlightRecorder.removePeriodicEvent(eventHook);
+    }
 
-  /** Remove this instance from JFR periodic events callbacks */
-  void deregister() {
-    FlightRecorder.removePeriodicEvent(eventHook);
-  }
+    public boolean record(Class<?> caller, DirectAllocationSource allocationSource, long allocated) {
+        if (!eventType.isEnabled()) {
+            return false;
+        }
+        long total = get(caller)[allocationSource.ordinal()].getAndAdd(allocated);
+        return total == 0;
+    }
 
-  public boolean record(Class<?> caller, DirectAllocationSource allocationSource, long allocated) {
-    if (!eventType.isEnabled()) {
-      return false;
+    @Override
+    protected AtomicLong[] computeValue(Class<?> type) {
+        refs.add(new WeakReference<>(type));
+        AtomicLong[] values = new AtomicLong[DirectAllocationSource.VALUES.length];
+        Arrays.setAll(values, i -> new AtomicLong());
+        return values;
     }
-    long total = get(caller)[allocationSource.ordinal()].getAndAdd(allocated);
-    return total == 0;
-  }
-
-  @Override
-  protected AtomicLong[] computeValue(Class<?> type) {
-    refs.add(new WeakReference<>(type));
-    AtomicLong[] values = new AtomicLong[DirectAllocationSource.VALUES.length];
-    Arrays.setAll(values, i -> new AtomicLong());
-    return values;
-  }
-
-  private void emit() {
-    for (WeakReference<Class<?>> ref : refs) {
-      Class<?> clazz = ref.get();
-      if (clazz != null) {
-        AtomicLong[] counts = get(clazz);
-        if (counts != null) {
-          String name = clazz.getName();
-          for (DirectAllocationSource source : DirectAllocationSource.VALUES) {
-            long size = counts[source.ordinal()].getAndSet(0);
-            if (size > 0) {
-              new DirectAllocationTotalEvent(name, source.name(), size).commit();
+
+    private void emit() {
+        for (WeakReference<Class<?>> ref : refs) {
+            Class<?> clazz = ref.get();
+            if (clazz != null) {
+                AtomicLong[] counts = get(clazz);
+                if (counts != null) {
+                    String name = clazz.getName();
+                    for (DirectAllocationSource source : DirectAllocationSource.VALUES) {
+                        long size = counts[source.ordinal()].getAndSet(0);
+                        if (size > 0) {
+                            new DirectAllocationTotalEvent(name, source.name(), size).commit();
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationProfiling.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationProfiling.java
index d0f4f188eb6..3dad7cc9bf8 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationProfiling.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationProfiling.java
@@ -4,43 +4,42 @@
 
 public class DirectAllocationProfiling {
 
-  private static class Holder {
-    static final DirectAllocationProfiling INSTANCE = new DirectAllocationProfiling(Config.get());
-  }
-
-  /**
-   * Get a pre-configured shared instance.
-   *
-   * @return the shared instance
-   */
-  public static DirectAllocationProfiling getInstance() {
-    return DirectAllocationProfiling.Holder.INSTANCE;
-  }
-
-  private final DirectAllocationSampler sampler;
-  private final AllocatorHistogram histogram;
-  private final StackWalker stackWalker;
-
-  DirectAllocationProfiling(DirectAllocationSampler sampler, AllocatorHistogram histogram) {
-    this.sampler = sampler;
-    this.histogram = histogram;
-    this.stackWalker = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
-  }
-
-  private DirectAllocationProfiling(Config config) {
-    this(new DirectAllocationSampler(config), new AllocatorHistogram());
-  }
-
-  public StackWalker getStackWalker() {
-    return stackWalker;
-  }
-
-  public DirectAllocationSampleEvent sample(
-      DirectAllocationSource source, Class<?> caller, long bytes) {
-    boolean firstHit = histogram.record(caller, source, bytes);
-    if (sampler.sample() || firstHit) {
-      return new DirectAllocationSampleEvent(caller.getName(), source.name(), bytes);
+    private static class Holder {
+        static final DirectAllocationProfiling INSTANCE = new DirectAllocationProfiling(Config.get());
+    }
+
+    /**
+     * Get a pre-configured shared instance.
+     *
+     * @return the shared instance
+     */
+    public static DirectAllocationProfiling getInstance() {
+        return DirectAllocationProfiling.Holder.INSTANCE;
+    }
+
+    private final DirectAllocationSampler sampler;
+    private final AllocatorHistogram histogram;
+    private final StackWalker stackWalker;
+
+    DirectAllocationProfiling(DirectAllocationSampler sampler, AllocatorHistogram histogram) {
+        this.sampler = sampler;
+        this.histogram = histogram;
+        this.stackWalker = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
+    }
+
+    private DirectAllocationProfiling(Config config) {
+        this(new DirectAllocationSampler(config), new AllocatorHistogram());
+    }
+
+    public StackWalker getStackWalker() {
+        return stackWalker;
+    }
+
+    public DirectAllocationSampleEvent sample(DirectAllocationSource source, Class<?> caller, long bytes) {
+        boolean firstHit = histogram.record(caller, source, bytes);
+        if (sampler.sample() || firstHit) {
+            return new DirectAllocationSampleEvent(caller.getName(), source.name(), bytes);
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationSampleEvent.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationSampleEvent.java
index 5811b30b598..1371a8bce7c 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationSampleEvent.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationSampleEvent.java
@@ -14,32 +14,32 @@
 @Category("Datadog")
 public class DirectAllocationSampleEvent extends Event implements ContextualEvent {
 
-  @Label("Bytes Allocated")
-  @DataAmount
-  private final long allocated;
-
-  @Label("Allocation Source")
-  private final String source;
-
-  @Label("Allocating Class")
-  private final String allocatingClass;
-
-  @Label("Local Root Span Id")
-  private long localRootSpanId;
-
-  @Label("Span Id")
-  private long spanId;
-
-  public DirectAllocationSampleEvent(String allocatingClass, String source, long allocated) {
-    this.allocatingClass = allocatingClass;
-    this.allocated = allocated;
-    this.source = source;
-    captureContext();
-  }
-
-  @Override
-  public void setContext(long localRootSpanId, long spanId) {
-    this.localRootSpanId = localRootSpanId;
-    this.spanId = spanId;
-  }
+    @Label("Bytes Allocated")
+    @DataAmount
+    private final long allocated;
+
+    @Label("Allocation Source")
+    private final String source;
+
+    @Label("Allocating Class")
+    private final String allocatingClass;
+
+    @Label("Local Root Span Id")
+    private long localRootSpanId;
+
+    @Label("Span Id")
+    private long spanId;
+
+    public DirectAllocationSampleEvent(String allocatingClass, String source, long allocated) {
+        this.allocatingClass = allocatingClass;
+        this.allocated = allocated;
+        this.source = source;
+        captureContext();
+    }
+
+    @Override
+    public void setContext(long localRootSpanId, long spanId) {
+        this.localRootSpanId = localRootSpanId;
+        this.spanId = spanId;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationSampler.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationSampler.java
index 41bfe82a84f..4459b177220 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationSampler.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationSampler.java
@@ -9,23 +9,23 @@
 
 public class DirectAllocationSampler extends WindowSampler<DirectAllocationSampleEvent> {
 
-  /*
-   * Fixed 0.5 second sampling window.
-   * Logic in AdaptiveSampler relies on sampling window being small compared to (in our case) recording duration:
-   * sampler may overshoot on one given window but should average to samplesPerWindow in the long run.
-   */
-  private static final Duration SAMPLING_WINDOW = Duration.of(500, ChronoUnit.MILLIS);
+    /*
+     * Fixed 0.5 second sampling window.
+     * Logic in AdaptiveSampler relies on sampling window being small compared to (in our case) recording duration:
+     * sampler may overshoot on one given window but should average to samplesPerWindow in the long run.
+     */
+    private static final Duration SAMPLING_WINDOW = Duration.of(500, ChronoUnit.MILLIS);
 
-  protected DirectAllocationSampler(Config conf) {
-    super(
-        SAMPLING_WINDOW,
-        getSamplesPerWindow(conf),
-        samplingWindowsPerRecording(conf.getProfilingUploadPeriod(), SAMPLING_WINDOW),
-        DirectAllocationSampleEvent.class);
-  }
+    protected DirectAllocationSampler(Config conf) {
+        super(
+                SAMPLING_WINDOW,
+                getSamplesPerWindow(conf),
+                samplingWindowsPerRecording(conf.getProfilingUploadPeriod(), SAMPLING_WINDOW),
+                DirectAllocationSampleEvent.class);
+    }
 
-  protected static int getSamplesPerWindow(final Config config) {
-    return config.getProfilingDirectAllocationSampleLimit()
-        / samplingWindowsPerRecording(config.getProfilingUploadPeriod(), SAMPLING_WINDOW);
-  }
+    protected static int getSamplesPerWindow(final Config config) {
+        return config.getProfilingDirectAllocationSampleLimit()
+                / samplingWindowsPerRecording(config.getProfilingUploadPeriod(), SAMPLING_WINDOW);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationSource.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationSource.java
index 33f9aab2459..31903e3a240 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationSource.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationSource.java
@@ -1,9 +1,9 @@
 package datadog.trace.bootstrap.instrumentation.jfr.directallocation;
 
 public enum DirectAllocationSource {
-  ALLOCATE_DIRECT,
-  MMAP,
-  JNI;
+    ALLOCATE_DIRECT,
+    MMAP,
+    JNI;
 
-  static final DirectAllocationSource[] VALUES = values();
+    static final DirectAllocationSource[] VALUES = values();
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationTotalEvent.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationTotalEvent.java
index 24b1f041c57..4acaee6b36e 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationTotalEvent.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/directallocation/DirectAllocationTotalEvent.java
@@ -19,19 +19,19 @@
 @Enabled
 public class DirectAllocationTotalEvent extends Event {
 
-  @Label("Allocating Class")
-  private final String allocatingClass;
+    @Label("Allocating Class")
+    private final String allocatingClass;
 
-  @Label("Allocation Type")
-  private final String source;
+    @Label("Allocation Type")
+    private final String source;
 
-  @Label("Allocated")
-  @DataAmount
-  private final long allocated;
+    @Label("Allocated")
+    @DataAmount
+    private final long allocated;
 
-  public DirectAllocationTotalEvent(String allocatingClass, String allocationType, long allocated) {
-    this.allocatingClass = allocatingClass;
-    this.source = allocationType;
-    this.allocated = allocated;
-  }
+    public DirectAllocationTotalEvent(String allocatingClass, String allocationType, long allocated) {
+        this.allocatingClass = allocatingClass;
+        this.source = allocationType;
+        this.allocated = allocated;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionCountEvent.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionCountEvent.java
index 39895b77396..4cfb8f53686 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionCountEvent.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionCountEvent.java
@@ -17,14 +17,14 @@
 @StackTrace(false)
 @Enabled
 public class ExceptionCountEvent extends Event {
-  @Label("Exception type")
-  private String type;
+    @Label("Exception type")
+    private String type;
 
-  @Label("Exception count")
-  private long count;
+    @Label("Exception count")
+    private long count;
 
-  public ExceptionCountEvent(String type, long count) {
-    this.type = type;
-    this.count = count;
-  }
+    public ExceptionCountEvent(String type, long count) {
+        this.type = type;
+        this.count = count;
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogram.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogram.java
index 07056ff7c4e..401ef4c573c 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogram.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogram.java
@@ -23,121 +23,120 @@
  */
 public class ExceptionHistogram {
 
-  private static final Logger log = LoggerFactory.getLogger(ExceptionHistogram.class);
-
-  static final String CLIPPED_ENTRY_TYPE_NAME = "TOO-MANY-EXCEPTIONS";
-
-  private final Map<String, AtomicLong> histogram = new ConcurrentHashMap<>();
-  private final int maxTopItems;
-  private final int maxSize;
-  private final EventType exceptionCountEventType;
-  private final Runnable eventHook;
-
-  ExceptionHistogram(final Config config) {
-    maxTopItems = config.getProfilingExceptionHistogramTopItems();
-    maxSize = config.getProfilingExceptionHistogramMaxCollectionSize();
-    exceptionCountEventType = EventType.getEventType(ExceptionCountEvent.class);
-    eventHook = this::emit;
-    JfrHelper.addPeriodicEvent(ExceptionCountEvent.class, eventHook);
-  }
-
-  /** Remove this instance from JFR periodic events callbacks */
-  void deregister() {
-    FlightRecorder.removePeriodicEvent(eventHook);
-  }
-
-  /**
-   * Record a new exception instance
-   *
-   * @param exception instance
-   * @return {@literal true} if this is the first record of the given exception type; {@literal
-   *     false} otherwise
-   */
-  public boolean record(final Throwable exception) {
-    if (exception == null) {
-      return false;
+    private static final Logger log = LoggerFactory.getLogger(ExceptionHistogram.class);
+
+    static final String CLIPPED_ENTRY_TYPE_NAME = "TOO-MANY-EXCEPTIONS";
+
+    private final Map<String, AtomicLong> histogram = new ConcurrentHashMap<>();
+    private final int maxTopItems;
+    private final int maxSize;
+    private final EventType exceptionCountEventType;
+    private final Runnable eventHook;
+
+    ExceptionHistogram(final Config config) {
+        maxTopItems = config.getProfilingExceptionHistogramTopItems();
+        maxSize = config.getProfilingExceptionHistogramMaxCollectionSize();
+        exceptionCountEventType = EventType.getEventType(ExceptionCountEvent.class);
+        eventHook = this::emit;
+        JfrHelper.addPeriodicEvent(ExceptionCountEvent.class, eventHook);
     }
-    return record(exception.getClass().getName());
-  }
 
-  private boolean record(String typeName) {
-    if (!exceptionCountEventType.isEnabled()) {
-      return false;
+    /** Remove this instance from JFR periodic events callbacks */
+    void deregister() {
+        FlightRecorder.removePeriodicEvent(eventHook);
     }
-    if (!histogram.containsKey(typeName) && histogram.size() >= maxSize) {
-      log.debug("Histogram is too big, skipping adding new entry: {}", typeName);
-      // Overwrite type name to limit total number of entries in the histogram
-      typeName = CLIPPED_ENTRY_TYPE_NAME;
-    }
-
-    long count = histogram.computeIfAbsent(typeName, k -> new AtomicLong()).getAndIncrement();
 
-    /*
-     * This is supposed to signal that a particular exception type was seen the first time in a particular time span.
-     * !ATTENTION! This will work on best-effort basis - namely all overflowing exception which are recorded
-     * as 'TOO-MANY-EXCEPTIONS' will receive only one common 'first hit'.
+    /**
+     * Record a new exception instance
+     *
+     * @param exception instance
+     * @return {@literal true} if this is the first record of the given exception type; {@literal
+     *     false} otherwise
      */
-    return count == 0;
-  }
-
-  private void emit() {
-    if (!exceptionCountEventType.isEnabled()) {
-      return;
+    public boolean record(final Throwable exception) {
+        if (exception == null) {
+            return false;
+        }
+        return record(exception.getClass().getName());
     }
 
-    doEmit();
-  }
+    private boolean record(String typeName) {
+        if (!exceptionCountEventType.isEnabled()) {
+            return false;
+        }
+        if (!histogram.containsKey(typeName) && histogram.size() >= maxSize) {
+            log.debug("Histogram is too big, skipping adding new entry: {}", typeName);
+            // Overwrite type name to limit total number of entries in the histogram
+            typeName = CLIPPED_ENTRY_TYPE_NAME;
+        }
+
+        long count = histogram.computeIfAbsent(typeName, k -> new AtomicLong()).getAndIncrement();
+
+        /*
+         * This is supposed to signal that a particular exception type was seen the first time in a particular time span.
+         * !ATTENTION! This will work on best-effort basis - namely all overflowing exception which are recorded
+         * as 'TOO-MANY-EXCEPTIONS' will receive only one common 'first hit'.
+         */
+        return count == 0;
+    }
 
-  void doEmit() {
-    Stream<Pair<String, Long>> items =
-        histogram.entrySet().stream()
-            .map(e -> Pair.of(e.getKey(), e.getValue().getAndSet(0)))
-            .filter(p -> p.getValue() != 0)
-            .sorted((l1, l2) -> Long.compare(l2.getValue(), l1.getValue()));
+    private void emit() {
+        if (!exceptionCountEventType.isEnabled()) {
+            return;
+        }
 
-    if (maxTopItems > 0) {
-      items = items.limit(maxTopItems);
+        doEmit();
     }
 
-    emitEvents(items);
+    void doEmit() {
+        Stream<Pair<String, Long>> items = histogram.entrySet().stream()
+                .map(e -> Pair.of(e.getKey(), e.getValue().getAndSet(0)))
+                .filter(p -> p.getValue() != 0)
+                .sorted((l1, l2) -> Long.compare(l2.getValue(), l1.getValue()));
 
-    // Stream is 'materialized' by `forEach` call above so we have to do clean up after that
-    // Otherwise we would keep entries for one extra iteration
-    histogram.entrySet().removeIf(e -> e.getValue().get() == 0L);
-  }
+        if (maxTopItems > 0) {
+            items = items.limit(maxTopItems);
+        }
 
-  // important that this is non-final and package private; allows concurrency tests
-  void emitEvents(Stream<Pair<String, Long>> items) {
-    items.forEach(e -> createAndCommitEvent(e.getKey(), e.getValue()));
-  }
+        emitEvents(items);
 
-  private void createAndCommitEvent(final String type, final long count) {
-    final ExceptionCountEvent event = new ExceptionCountEvent(type, count);
-    if (event.shouldCommit()) {
-      event.commit();
+        // Stream is 'materialized' by `forEach` call above so we have to do clean up after that
+        // Otherwise we would keep entries for one extra iteration
+        histogram.entrySet().removeIf(e -> e.getValue().get() == 0L);
     }
-  }
-
-  static class Pair<K, V> {
-
-    final K key;
-    final V value;
 
-    public static <K, V> Pair<K, V> of(final K key, final V value) {
-      return new Pair<>(key, value);
+    // important that this is non-final and package private; allows concurrency tests
+    void emitEvents(Stream<Pair<String, Long>> items) {
+        items.forEach(e -> createAndCommitEvent(e.getKey(), e.getValue()));
     }
 
-    public Pair(final K key, final V value) {
-      this.key = key;
-      this.value = value;
+    private void createAndCommitEvent(final String type, final long count) {
+        final ExceptionCountEvent event = new ExceptionCountEvent(type, count);
+        if (event.shouldCommit()) {
+            event.commit();
+        }
     }
 
-    public K getKey() {
-      return key;
-    }
+    static class Pair<K, V> {
+
+        final K key;
+        final V value;
+
+        public static <K, V> Pair<K, V> of(final K key, final V value) {
+            return new Pair<>(key, value);
+        }
+
+        public Pair(final K key, final V value) {
+            this.key = key;
+            this.value = value;
+        }
+
+        public K getKey() {
+            return key;
+        }
 
-    public V getValue() {
-      return value;
+        public V getValue() {
+            return value;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionProfiling.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionProfiling.java
index b8ffb6af04b..ae6b4703c53 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionProfiling.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionProfiling.java
@@ -11,111 +11,109 @@
  */
 public interface ExceptionProfiling {
 
-  void start();
+    void start();
 
-  ExceptionSampleEvent process(final Throwable t);
+    ExceptionSampleEvent process(final Throwable t);
 
-  boolean recordExceptionMessage();
+    boolean recordExceptionMessage();
 
-  /** Lazy initialization-on-demand. */
-  final class Holder {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ExceptionProfiling.class);
-    static final ExceptionProfiling INSTANCE = create();
+    /** Lazy initialization-on-demand. */
+    final class Holder {
+        private static final Logger LOGGER = LoggerFactory.getLogger(ExceptionProfiling.class);
+        static final ExceptionProfiling INSTANCE = create();
 
-    private static ExceptionProfiling create() {
-      try {
-        return new ExceptionProfilingImpl(Config.get());
-      } catch (Throwable t) {
-        LOGGER.debug("Unable to create ExceptionProfiling", t);
-        return new NoOpExceptionProfiling();
-      }
-    }
-  }
-
-  /**
-   * Support for excluding certain exception types because they are used for control flow or leak
-   * detection.
-   */
-  final class Exclusion {
-    public static void enter() {
-      CallDepthThreadLocalMap.incrementCallDepth(Exclusion.class);
-    }
-
-    public static void exit() {
-      CallDepthThreadLocalMap.decrementCallDepth(Exclusion.class);
+        private static ExceptionProfiling create() {
+            try {
+                return new ExceptionProfilingImpl(Config.get());
+            } catch (Throwable t) {
+                LOGGER.debug("Unable to create ExceptionProfiling", t);
+                return new NoOpExceptionProfiling();
+            }
+        }
     }
 
-    public static boolean isEffective() {
-      return CallDepthThreadLocalMap.getCallDepth(Exclusion.class) > 0;
-    }
-  }
-
-  /**
-   * Get a pre-configured shared instance.
-   *
-   * @return the shared instance
-   */
-  static ExceptionProfiling getInstance() {
-    return Holder.INSTANCE;
-  }
-
-  final class NoOpExceptionProfiling implements ExceptionProfiling {
-    @Override
-    public void start() {}
-
-    @Override
-    public ExceptionSampleEvent process(Throwable t) {
-      return null;
+    /**
+     * Support for excluding certain exception types because they are used for control flow or leak
+     * detection.
+     */
+    final class Exclusion {
+        public static void enter() {
+            CallDepthThreadLocalMap.incrementCallDepth(Exclusion.class);
+        }
+
+        public static void exit() {
+            CallDepthThreadLocalMap.decrementCallDepth(Exclusion.class);
+        }
+
+        public static boolean isEffective() {
+            return CallDepthThreadLocalMap.getCallDepth(Exclusion.class) > 0;
+        }
     }
 
-    @Override
-    public boolean recordExceptionMessage() {
-      return false;
+    /**
+     * Get a pre-configured shared instance.
+     *
+     * @return the shared instance
+     */
+    static ExceptionProfiling getInstance() {
+        return Holder.INSTANCE;
     }
-  }
-
-  final class ExceptionProfilingImpl implements ExceptionProfiling {
-
-    private final ExceptionHistogram histogram;
-    private final ExceptionSampler sampler;
-    private final boolean recordExceptionMessage;
 
-    ExceptionProfilingImpl(final Config config) {
-      this(
-          new ExceptionSampler(config),
-          new ExceptionHistogram(config),
-          config.isProfilingRecordExceptionMessage());
-    }
-
-    ExceptionProfilingImpl(
-        final ExceptionSampler sampler,
-        final ExceptionHistogram histogram,
-        boolean recordExceptionMessage) {
-      this.sampler = sampler;
-      this.histogram = histogram;
-      this.recordExceptionMessage = recordExceptionMessage;
-    }
-
-    @Override
-    public void start() {
-      sampler.start();
-    }
+    final class NoOpExceptionProfiling implements ExceptionProfiling {
+        @Override
+        public void start() {}
 
-    @Override
-    public ExceptionSampleEvent process(final Throwable t) {
-      // always record the exception in histogram
-      final boolean firstHit = histogram.record(t);
+        @Override
+        public ExceptionSampleEvent process(Throwable t) {
+            return null;
+        }
 
-      final boolean sampled = sampler.sample();
-      if (firstHit || sampled) {
-        return new ExceptionSampleEvent(t, sampled, firstHit);
-      }
-      return null;
+        @Override
+        public boolean recordExceptionMessage() {
+            return false;
+        }
     }
 
-    @Override
-    public boolean recordExceptionMessage() {
-      return recordExceptionMessage;
+    final class ExceptionProfilingImpl implements ExceptionProfiling {
+
+        private final ExceptionHistogram histogram;
+        private final ExceptionSampler sampler;
+        private final boolean recordExceptionMessage;
+
+        ExceptionProfilingImpl(final Config config) {
+            this(
+                    new ExceptionSampler(config),
+                    new ExceptionHistogram(config),
+                    config.isProfilingRecordExceptionMessage());
+        }
+
+        ExceptionProfilingImpl(
+                final ExceptionSampler sampler, final ExceptionHistogram histogram, boolean recordExceptionMessage) {
+            this.sampler = sampler;
+            this.histogram = histogram;
+            this.recordExceptionMessage = recordExceptionMessage;
+        }
+
+        @Override
+        public void start() {
+            sampler.start();
+        }
+
+        @Override
+        public ExceptionSampleEvent process(final Throwable t) {
+            // always record the exception in histogram
+            final boolean firstHit = histogram.record(t);
+
+            final boolean sampled = sampler.sample();
+            if (firstHit || sampled) {
+                return new ExceptionSampleEvent(t, sampled, firstHit);
+            }
+            return null;
+        }
+
+        @Override
+        public boolean recordExceptionMessage() {
+            return recordExceptionMessage;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionSampleEvent.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionSampleEvent.java
index 7dfbeaedb01..06c444debf3 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionSampleEvent.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionSampleEvent.java
@@ -12,52 +12,52 @@
 @Description("Datadog exception sample event.")
 @Category("Datadog")
 public class ExceptionSampleEvent extends Event implements ContextualEvent {
-  @Label("Exception Type")
-  private final String type;
-
-  @Label("Exception message")
-  private final String message;
-
-  @Label("Sampled")
-  private final boolean sampled;
-
-  @Label("First occurrence")
-  private final boolean firstOccurrence;
-
-  @Label("Local Root Span Id")
-  private long localRootSpanId;
-
-  @Label("Span Id")
-  private long spanId;
-
-  public ExceptionSampleEvent(Throwable e, boolean sampled, boolean firstOccurrence) {
-    /*
-     * TODO: we should have some tests for this class.
-     * Unfortunately at the moment this is not easily possible because we cannot build tests with groovy that
-     * are compiled against java11 SDK - this seems to be gradle-groovy interaction limitation.
-     * Writing these tests in java seems like would introduce more noise.
-     */
-    this.type = e.getClass().getName();
-    this.message = getMessage(e);
-    this.sampled = sampled;
-    this.firstOccurrence = firstOccurrence;
-    captureContext();
-  }
-
-  private static String getMessage(Throwable t) {
-    if (ExceptionProfiling.getInstance().recordExceptionMessage()) {
-      try {
-        return t.getMessage();
-      } catch (Throwable ignored) {
-        // apparently there might be exceptions throwing at least NPE when trying to get the message
-      }
+    @Label("Exception Type")
+    private final String type;
+
+    @Label("Exception message")
+    private final String message;
+
+    @Label("Sampled")
+    private final boolean sampled;
+
+    @Label("First occurrence")
+    private final boolean firstOccurrence;
+
+    @Label("Local Root Span Id")
+    private long localRootSpanId;
+
+    @Label("Span Id")
+    private long spanId;
+
+    public ExceptionSampleEvent(Throwable e, boolean sampled, boolean firstOccurrence) {
+        /*
+         * TODO: we should have some tests for this class.
+         * Unfortunately at the moment this is not easily possible because we cannot build tests with groovy that
+         * are compiled against java11 SDK - this seems to be gradle-groovy interaction limitation.
+         * Writing these tests in java seems like would introduce more noise.
+         */
+        this.type = e.getClass().getName();
+        this.message = getMessage(e);
+        this.sampled = sampled;
+        this.firstOccurrence = firstOccurrence;
+        captureContext();
+    }
+
+    private static String getMessage(Throwable t) {
+        if (ExceptionProfiling.getInstance().recordExceptionMessage()) {
+            try {
+                return t.getMessage();
+            } catch (Throwable ignored) {
+                // apparently there might be exceptions throwing at least NPE when trying to get the message
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void setContext(long localRootSpanId, long spanId) {
+        this.localRootSpanId = localRootSpanId;
+        this.spanId = spanId;
     }
-    return null;
-  }
-
-  @Override
-  public void setContext(long localRootSpanId, long spanId) {
-    this.localRootSpanId = localRootSpanId;
-    this.spanId = spanId;
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionSampler.java b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionSampler.java
index 2dfae36a634..995b46872d6 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionSampler.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionSampler.java
@@ -8,26 +8,26 @@
 import java.time.temporal.ChronoUnit;
 
 final class ExceptionSampler extends WindowSampler<ExceptionSampleEvent> {
-  /*
-   * Fixed 0.5 second sampling window.
-   * Logic in AdaptiveSampler relies on sampling window being small compared to (in our case) recording duration:
-   * sampler may overshoot on one given window but should average to samplesPerWindow in the long run.
-   */
-  private static final Duration SAMPLING_WINDOW = Duration.of(500, ChronoUnit.MILLIS);
+    /*
+     * Fixed 0.5 second sampling window.
+     * Logic in AdaptiveSampler relies on sampling window being small compared to (in our case) recording duration:
+     * sampler may overshoot on one given window but should average to samplesPerWindow in the long run.
+     */
+    private static final Duration SAMPLING_WINDOW = Duration.of(500, ChronoUnit.MILLIS);
 
-  ExceptionSampler(final Config config) {
-    this(
-        SAMPLING_WINDOW,
-        getSamplesPerWindow(config),
-        samplingWindowsPerRecording(config.getProfilingUploadPeriod(), SAMPLING_WINDOW));
-  }
+    ExceptionSampler(final Config config) {
+        this(
+                SAMPLING_WINDOW,
+                getSamplesPerWindow(config),
+                samplingWindowsPerRecording(config.getProfilingUploadPeriod(), SAMPLING_WINDOW));
+    }
 
-  ExceptionSampler(Duration windowDuration, int samplesPerWindow, int lookback) {
-    super(windowDuration, samplesPerWindow, lookback, ExceptionSampleEvent.class);
-  }
+    ExceptionSampler(Duration windowDuration, int samplesPerWindow, int lookback) {
+        super(windowDuration, samplesPerWindow, lookback, ExceptionSampleEvent.class);
+    }
 
-  protected static int getSamplesPerWindow(final Config config) {
-    return config.getProfilingExceptionSampleLimit()
-        / samplingWindowsPerRecording(config.getProfilingUploadPeriod(), SAMPLING_WINDOW);
-  }
+    protected static int getSamplesPerWindow(final Config config) {
+        return config.getProfilingExceptionSampleLimit()
+                / samplingWindowsPerRecording(config.getProfilingUploadPeriod(), SAMPLING_WINDOW);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/SampleJavaClass.java b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/SampleJavaClass.java
index 7897cd83037..8beaa5099f9 100644
--- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/SampleJavaClass.java
+++ b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/SampleJavaClass.java
@@ -5,10 +5,9 @@
  * anonymous class, so use a Java class instead.
  */
 public class SampleJavaClass {
-  public static Class anonymousClass =
-      new Runnable() {
+    public static Class anonymousClass = new Runnable() {
 
         @Override
         public void run() {}
-      }.getClass();
+    }.getClass();
 }
diff --git a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/AgentFeatureFlaggingLifecycleTest.java b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/AgentFeatureFlaggingLifecycleTest.java
index 75e9987c4da..56b09f0b31b 100644
--- a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/AgentFeatureFlaggingLifecycleTest.java
+++ b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/AgentFeatureFlaggingLifecycleTest.java
@@ -8,41 +8,40 @@
 
 class AgentFeatureFlaggingLifecycleTest {
 
-  @BeforeEach
-  void reset() {
-    FakeFeatureFlaggingSystem.stopCalls.set(0);
-  }
-
-  @Test
-  void shutdownInvokesFeatureFlaggingSystemStopThroughAgentClassLoader() {
-    final ClassLoader classLoader =
-        new ClassLoader(null) {
-          @Override
-          public Class<?> loadClass(final String name) throws ClassNotFoundException {
-            if ("com.datadog.featureflag.FeatureFlaggingSystem".equals(name)) {
-              return FakeFeatureFlaggingSystem.class;
+    @BeforeEach
+    void reset() {
+        FakeFeatureFlaggingSystem.stopCalls.set(0);
+    }
+
+    @Test
+    void shutdownInvokesFeatureFlaggingSystemStopThroughAgentClassLoader() {
+        final ClassLoader classLoader = new ClassLoader(null) {
+            @Override
+            public Class<?> loadClass(final String name) throws ClassNotFoundException {
+                if ("com.datadog.featureflag.FeatureFlaggingSystem".equals(name)) {
+                    return FakeFeatureFlaggingSystem.class;
+                }
+                return super.loadClass(name);
             }
-            return super.loadClass(name);
-          }
         };
 
-    Agent.shutdownFeatureFlagging(classLoader);
+        Agent.shutdownFeatureFlagging(classLoader);
 
-    assertEquals(1, FakeFeatureFlaggingSystem.stopCalls.get());
-  }
+        assertEquals(1, FakeFeatureFlaggingSystem.stopCalls.get());
+    }
 
-  @Test
-  void shutdownIsNoopBeforeAgentClassLoaderExists() {
-    Agent.shutdownFeatureFlagging(null);
+    @Test
+    void shutdownIsNoopBeforeAgentClassLoaderExists() {
+        Agent.shutdownFeatureFlagging(null);
 
-    assertEquals(0, FakeFeatureFlaggingSystem.stopCalls.get());
-  }
+        assertEquals(0, FakeFeatureFlaggingSystem.stopCalls.get());
+    }
 
-  public static final class FakeFeatureFlaggingSystem {
-    private static final AtomicInteger stopCalls = new AtomicInteger();
+    public static final class FakeFeatureFlaggingSystem {
+        private static final AtomicInteger stopCalls = new AtomicInteger();
 
-    public static void stop() {
-      stopCalls.incrementAndGet();
+        public static void stop() {
+            stopCalls.incrementAndGet();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/AgentJarIndexTest.java b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/AgentJarIndexTest.java
index 7ff3028b9cf..599b67c4f56 100644
--- a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/AgentJarIndexTest.java
+++ b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/AgentJarIndexTest.java
@@ -21,293 +21,284 @@
 
 class AgentJarIndexTest {
 
-  // --- computeEntryKey tests ---
-
-  private static String computeEntryKey(String pathStr) {
-    return AgentJarIndex.IndexGenerator.computeEntryKey(Paths.get(pathStr));
-  }
-
-  @Test
-  void computeEntryKeyReturnsNullForIgnoredFiles() {
-    assertNull(computeEntryKey("MANIFEST.MF"));
-    assertNull(computeEntryKey("NOTICE"));
-    assertNull(computeEntryKey("LICENSE.renamed"));
-  }
-
-  @Test
-  void computeEntryKeyReturnsWildcardForInstrumentationSubtree() {
-    assertEquals(
-        "datadog.trace.instrumentation.*",
-        computeEntryKey("datadog/trace/instrumentation/servlet/ServletAdvice.classdata"));
-    assertEquals(
-        "datadog.trace.instrumentation.*",
-        computeEntryKey("datadog/trace/instrumentation/SomeAdvice.classdata"));
-  }
-
-  @Test
-  void computeEntryKeyReturnsWildcardForDeepPaths() {
-    // 3+ path elements → wildcard on parent directory, regardless of file extension
-    assertEquals("com.example.*", computeEntryKey("com/example/Foo.classdata"));
-    assertEquals("com.example.*", computeEntryKey("com/example/Foo.xml"));
-    assertEquals("com.example.sub.*", computeEntryKey("com/example/sub/Foo.classdata"));
-  }
-
-  @Test
-  void computeEntryKeyReturnsFullPathForSingleElementPaths() {
-    // nameCount == 1 skips the wildcard block entirely
-    assertEquals("Foo.classdata", computeEntryKey("Foo.classdata"));
-    assertEquals("some-lib.jar", computeEntryKey("some-lib.jar"));
-  }
-
-  @Test
-  void computeEntryKeyReturnsWildcardForClassdataAtTwoLevels() {
-    // 2-level .classdata files are deep enough to use a wildcard
-    assertEquals("com.*", computeEntryKey("com/Foo.classdata"));
-  }
-
-  @Test
-  void computeEntryKeyReturnsFullPathForShallowNonClassdataFiles() {
-    // 2-level non-.classdata files keep their full dot-separated name
-    assertEquals("com.Foo.class", computeEntryKey("com/Foo.class"));
-    assertEquals("META-INF.services.Foo", computeEntryKey("META-INF/services/Foo"));
-  }
-
-  @Test
-  void computeEntryKeyDoesNotCountMetaInfAsUniqueElement() {
-    // META-INF/x/y → nameCount effectively 2 → no wildcard
-    assertEquals("META-INF.services.SomeService", computeEntryKey("META-INF/services/SomeService"));
-    // META-INF/x/y/z → nameCount effectively 3 → wildcard
-    assertEquals("META-INF.services.com.*", computeEntryKey("META-INF/services/com/SomeService"));
-  }
-
-  // --- buildIndex / writeIndex / readIndex round-trip ---
-
-  /** Creates a temp JAR containing only the index file written by the generator. */
-  private static AgentJarIndex buildAndReadIndex(Path resourcesDir, Path tempDir) throws Exception {
-    AgentJarIndex.IndexGenerator generator = new AgentJarIndex.IndexGenerator(resourcesDir);
-    generator.buildIndex();
-
-    Path indexFile = tempDir.resolve("dd-java-agent.index");
-    generator.writeIndex(indexFile);
-
-    Path jarFile = tempDir.resolve("test-agent.jar");
-    try (ZipOutputStream zip = new ZipOutputStream(Files.newOutputStream(jarFile))) {
-      zip.putNextEntry(new ZipEntry("dd-java-agent.index"));
-      Files.copy(indexFile, zip);
-      zip.closeEntry();
+    // --- computeEntryKey tests ---
+
+    private static String computeEntryKey(String pathStr) {
+        return AgentJarIndex.IndexGenerator.computeEntryKey(Paths.get(pathStr));
+    }
+
+    @Test
+    void computeEntryKeyReturnsNullForIgnoredFiles() {
+        assertNull(computeEntryKey("MANIFEST.MF"));
+        assertNull(computeEntryKey("NOTICE"));
+        assertNull(computeEntryKey("LICENSE.renamed"));
+    }
+
+    @Test
+    void computeEntryKeyReturnsWildcardForInstrumentationSubtree() {
+        assertEquals(
+                "datadog.trace.instrumentation.*",
+                computeEntryKey("datadog/trace/instrumentation/servlet/ServletAdvice.classdata"));
+        assertEquals(
+                "datadog.trace.instrumentation.*",
+                computeEntryKey("datadog/trace/instrumentation/SomeAdvice.classdata"));
+    }
+
+    @Test
+    void computeEntryKeyReturnsWildcardForDeepPaths() {
+        // 3+ path elements → wildcard on parent directory, regardless of file extension
+        assertEquals("com.example.*", computeEntryKey("com/example/Foo.classdata"));
+        assertEquals("com.example.*", computeEntryKey("com/example/Foo.xml"));
+        assertEquals("com.example.sub.*", computeEntryKey("com/example/sub/Foo.classdata"));
+    }
+
+    @Test
+    void computeEntryKeyReturnsFullPathForSingleElementPaths() {
+        // nameCount == 1 skips the wildcard block entirely
+        assertEquals("Foo.classdata", computeEntryKey("Foo.classdata"));
+        assertEquals("some-lib.jar", computeEntryKey("some-lib.jar"));
+    }
+
+    @Test
+    void computeEntryKeyReturnsWildcardForClassdataAtTwoLevels() {
+        // 2-level .classdata files are deep enough to use a wildcard
+        assertEquals("com.*", computeEntryKey("com/Foo.classdata"));
+    }
+
+    @Test
+    void computeEntryKeyReturnsFullPathForShallowNonClassdataFiles() {
+        // 2-level non-.classdata files keep their full dot-separated name
+        assertEquals("com.Foo.class", computeEntryKey("com/Foo.class"));
+        assertEquals("META-INF.services.Foo", computeEntryKey("META-INF/services/Foo"));
+    }
+
+    @Test
+    void computeEntryKeyDoesNotCountMetaInfAsUniqueElement() {
+        // META-INF/x/y → nameCount effectively 2 → no wildcard
+        assertEquals("META-INF.services.SomeService", computeEntryKey("META-INF/services/SomeService"));
+        // META-INF/x/y/z → nameCount effectively 3 → wildcard
+        assertEquals("META-INF.services.com.*", computeEntryKey("META-INF/services/com/SomeService"));
+    }
+
+    // --- buildIndex / writeIndex / readIndex round-trip ---
+
+    /** Creates a temp JAR containing only the index file written by the generator. */
+    private static AgentJarIndex buildAndReadIndex(Path resourcesDir, Path tempDir) throws Exception {
+        AgentJarIndex.IndexGenerator generator = new AgentJarIndex.IndexGenerator(resourcesDir);
+        generator.buildIndex();
+
+        Path indexFile = tempDir.resolve("dd-java-agent.index");
+        generator.writeIndex(indexFile);
+
+        Path jarFile = tempDir.resolve("test-agent.jar");
+        try (ZipOutputStream zip = new ZipOutputStream(Files.newOutputStream(jarFile))) {
+            zip.putNextEntry(new ZipEntry("dd-java-agent.index"));
+            Files.copy(indexFile, zip);
+            zip.closeEntry();
+        }
+
+        try (JarFile jar = new JarFile(jarFile.toFile())) {
+            return AgentJarIndex.readIndex(jar);
+        }
+    }
+
+    private static void createFile(Path root, String relativePath) throws IOException {
+        Path file = root.resolve(relativePath.replace('/', java.io.File.separatorChar));
+        Files.createDirectories(file.getParent());
+        Files.createFile(file);
+    }
+
+    private static Path writeIndex(Path resourcesDir, Path indexFile) throws IOException {
+        AgentJarIndex.IndexGenerator generator = new AgentJarIndex.IndexGenerator(resourcesDir);
+        generator.buildIndex();
+        generator.writeIndex(indexFile);
+        return indexFile;
+    }
+
+    private static List<String> readPrefixes(Path indexFile) throws IOException {
+        try (DataInputStream in = new DataInputStream(new BufferedInputStream(Files.newInputStream(indexFile)))) {
+            int prefixCount = in.readInt();
+            String[] prefixes = new String[prefixCount];
+            for (int i = 0; i < prefixCount; i++) {
+                prefixes[i] = in.readUTF();
+            }
+            return Arrays.asList(prefixes);
+        }
     }
 
-    try (JarFile jar = new JarFile(jarFile.toFile())) {
-      return AgentJarIndex.readIndex(jar);
+    @Test
+    void classEntryNameResolvesBootstrapClassToTopLevel(@TempDir Path tempDir) throws Exception {
+        Path resources = tempDir.resolve("resources");
+        // Only the inst/ prefix exists; datadog.* falls back to main jar (prefixId == 0)
+        createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
+
+        AgentJarIndex index = buildAndReadIndex(resources, tempDir);
+
+        assertNotNull(index);
+        assertEquals(
+                "datadog/trace/bootstrap/Bootstrap.class", index.classEntryName("datadog.trace.bootstrap.Bootstrap"));
     }
-  }
-
-  private static void createFile(Path root, String relativePath) throws IOException {
-    Path file = root.resolve(relativePath.replace('/', java.io.File.separatorChar));
-    Files.createDirectories(file.getParent());
-    Files.createFile(file);
-  }
-
-  private static Path writeIndex(Path resourcesDir, Path indexFile) throws IOException {
-    AgentJarIndex.IndexGenerator generator = new AgentJarIndex.IndexGenerator(resourcesDir);
-    generator.buildIndex();
-    generator.writeIndex(indexFile);
-    return indexFile;
-  }
-
-  private static List<String> readPrefixes(Path indexFile) throws IOException {
-    try (DataInputStream in =
-        new DataInputStream(new BufferedInputStream(Files.newInputStream(indexFile)))) {
-      int prefixCount = in.readInt();
-      String[] prefixes = new String[prefixCount];
-      for (int i = 0; i < prefixCount; i++) {
-        prefixes[i] = in.readUTF();
-      }
-      return Arrays.asList(prefixes);
+
+    @Test
+    void classEntryNameResolvesInstrumentationClassToInstPrefix(@TempDir Path tempDir) throws Exception {
+        Path resources = tempDir.resolve("resources");
+        createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
+
+        AgentJarIndex index = buildAndReadIndex(resources, tempDir);
+
+        assertNotNull(index);
+        assertEquals(
+                "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata",
+                index.classEntryName("datadog.trace.instrumentation.servlet.ServletAdvice"));
+    }
+
+    @Test
+    void classEntryNameReturnsNullForUnknownPackage(@TempDir Path tempDir) throws Exception {
+        Path resources = tempDir.resolve("resources");
+        createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
+
+        AgentJarIndex index = buildAndReadIndex(resources, tempDir);
+
+        assertNotNull(index);
+        // com.example.* is not indexed → null
+        assertNull(index.classEntryName("com.example.Unknown"));
+    }
+
+    @Test
+    void classEntryNameResolvesDeepNestedClassToCorrectPrefix(@TempDir Path tempDir) throws Exception {
+        Path resources = tempDir.resolve("resources");
+        createFile(resources, "metrics/com/datadoghq/stats/StatsClient.classdata");
+
+        AgentJarIndex index = buildAndReadIndex(resources, tempDir);
+
+        assertNotNull(index);
+        assertEquals(
+                "metrics/com/datadoghq/stats/StatsClient.classdata",
+                index.classEntryName("com.datadoghq.stats.StatsClient"));
+    }
+
+    @Test
+    void resourceEntryNamePassesThroughTopLevelResources(@TempDir Path tempDir) throws Exception {
+        Path resources = tempDir.resolve("resources");
+        createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
+
+        AgentJarIndex index = buildAndReadIndex(resources, tempDir);
+
+        assertNotNull(index);
+        String resourceName = "datadog/trace/bootstrap/Bootstrap.class";
+        assertEquals(resourceName, index.resourceEntryName(resourceName));
+    }
+
+    @Test
+    void resourceEntryNameAppendsDataSuffixForClassResource(@TempDir Path tempDir) throws Exception {
+        Path resources = tempDir.resolve("resources");
+        createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
+
+        AgentJarIndex index = buildAndReadIndex(resources, tempDir);
+
+        assertNotNull(index);
+        assertEquals(
+                "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata",
+                index.resourceEntryName("datadog/trace/instrumentation/servlet/ServletAdvice.class"));
+    }
+
+    @Test
+    void multiplePrefixesAreIndexedIndependently(@TempDir Path tempDir) throws Exception {
+        Path resources = tempDir.resolve("resources");
+        createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
+        createFile(resources, "metrics/com/datadoghq/stats/StatsClient.classdata");
+
+        AgentJarIndex index = buildAndReadIndex(resources, tempDir);
+
+        assertNotNull(index);
+        assertEquals(
+                "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata",
+                index.classEntryName("datadog.trace.instrumentation.servlet.ServletAdvice"));
+        assertEquals(
+                "metrics/com/datadoghq/stats/StatsClient.classdata",
+                index.classEntryName("com.datadoghq.stats.StatsClient"));
+    }
+
+    @Test
+    void buildIndexWritesPrefixesInSortedOrder(@TempDir Path tempDir) throws Exception {
+        Path resources = tempDir.resolve("resources");
+        createFile(resources, "metrics/com/datadoghq/stats/StatsClient.classdata");
+        createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
+        createFile(resources, "appsec/com/datadog/appsec/Event.classdata");
+
+        Path indexFile = writeIndex(resources, tempDir.resolve("dd-java-agent.index"));
+
+        assertEquals(Arrays.asList("appsec/", "inst/", "metrics/"), readPrefixes(indexFile));
+    }
+
+    @Test
+    void buildIndexIgnoresTopLevelFilesWhenCollectingPrefixes(@TempDir Path tempDir) throws Exception {
+        Path resources = tempDir.resolve("resources");
+        createFile(resources, "root-resource.properties");
+        createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
+
+        Path indexFile = writeIndex(resources, tempDir.resolve("dd-java-agent.index"));
+
+        assertEquals(Arrays.asList("inst/"), readPrefixes(indexFile));
+    }
+
+    @Test
+    void buildIndexIsIndependentOfDirectoryCreationOrder(@TempDir Path tempDir) throws Exception {
+        Path buildResources = tempDir.resolve("build-resources");
+        createFile(buildResources, "appsec/com/datadog/appsec/Event.classdata");
+        createFile(buildResources, "ci-visibility/com/datadog/ci/Visibility.classdata");
+        createFile(buildResources, "cws-tls/com/datadog/cws/Tls.classdata");
+        createFile(buildResources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
+
+        Path deployResources = tempDir.resolve("deploy-resources");
+        createFile(deployResources, "cws-tls/com/datadog/cws/Tls.classdata");
+        createFile(deployResources, "ci-visibility/com/datadog/ci/Visibility.classdata");
+        createFile(deployResources, "appsec/com/datadog/appsec/Event.classdata");
+        createFile(deployResources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
+
+        Path buildIndex = writeIndex(buildResources, tempDir.resolve("build-dd-java-agent.index"));
+        Path deployIndex = writeIndex(deployResources, tempDir.resolve("deploy-dd-java-agent.index"));
+
+        assertArrayEquals(Files.readAllBytes(buildIndex), Files.readAllBytes(deployIndex));
+    }
+
+    @Test
+    void buildIndexWithEmptyResourcesDirProducesWorkingIndex(@TempDir Path tempDir) throws Exception {
+        Path resources = tempDir.resolve("resources");
+        Files.createDirectories(resources);
+
+        AgentJarIndex index = buildAndReadIndex(resources, tempDir);
+
+        assertNotNull(index);
+        // All lookups fall through to main jar (prefixId == 0) or null
+        String name = "datadog/trace/bootstrap/Bootstrap.class";
+        assertEquals(name, index.resourceEntryName(name));
+    }
+
+    @Test
+    void resourceEntryNameReturnsNullForResourceOutsideAnyIndexedPrefix(@TempDir Path tempDir) throws Exception {
+        Path resources = tempDir.resolve("resources");
+        createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
+
+        AgentJarIndex index = buildAndReadIndex(resources, tempDir);
+
+        assertNotNull(index);
+        // com.* is not indexed → null (symmetric with classEntryNameReturnsNullForUnknownPackage)
+        assertNull(index.resourceEntryName("com/example/Foo.class"));
+    }
+
+    @Test
+    void resourceEntryNameDoesNotAppendDataSuffixForNonClassResources(@TempDir Path tempDir) throws Exception {
+        Path resources = tempDir.resolve("resources");
+        createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
+
+        AgentJarIndex index = buildAndReadIndex(resources, tempDir);
+
+        assertNotNull(index);
+        // A non-.class resource under an indexed prefix is returned with the prefix prepended
+        // but without the "data" suffix (only .class resources get "data" appended)
+        assertEquals(
+                "inst/datadog/trace/instrumentation/servlet/services",
+                index.resourceEntryName("datadog/trace/instrumentation/servlet/services"));
     }
-  }
-
-  @Test
-  void classEntryNameResolvesBootstrapClassToTopLevel(@TempDir Path tempDir) throws Exception {
-    Path resources = tempDir.resolve("resources");
-    // Only the inst/ prefix exists; datadog.* falls back to main jar (prefixId == 0)
-    createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
-
-    AgentJarIndex index = buildAndReadIndex(resources, tempDir);
-
-    assertNotNull(index);
-    assertEquals(
-        "datadog/trace/bootstrap/Bootstrap.class",
-        index.classEntryName("datadog.trace.bootstrap.Bootstrap"));
-  }
-
-  @Test
-  void classEntryNameResolvesInstrumentationClassToInstPrefix(@TempDir Path tempDir)
-      throws Exception {
-    Path resources = tempDir.resolve("resources");
-    createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
-
-    AgentJarIndex index = buildAndReadIndex(resources, tempDir);
-
-    assertNotNull(index);
-    assertEquals(
-        "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata",
-        index.classEntryName("datadog.trace.instrumentation.servlet.ServletAdvice"));
-  }
-
-  @Test
-  void classEntryNameReturnsNullForUnknownPackage(@TempDir Path tempDir) throws Exception {
-    Path resources = tempDir.resolve("resources");
-    createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
-
-    AgentJarIndex index = buildAndReadIndex(resources, tempDir);
-
-    assertNotNull(index);
-    // com.example.* is not indexed → null
-    assertNull(index.classEntryName("com.example.Unknown"));
-  }
-
-  @Test
-  void classEntryNameResolvesDeepNestedClassToCorrectPrefix(@TempDir Path tempDir)
-      throws Exception {
-    Path resources = tempDir.resolve("resources");
-    createFile(resources, "metrics/com/datadoghq/stats/StatsClient.classdata");
-
-    AgentJarIndex index = buildAndReadIndex(resources, tempDir);
-
-    assertNotNull(index);
-    assertEquals(
-        "metrics/com/datadoghq/stats/StatsClient.classdata",
-        index.classEntryName("com.datadoghq.stats.StatsClient"));
-  }
-
-  @Test
-  void resourceEntryNamePassesThroughTopLevelResources(@TempDir Path tempDir) throws Exception {
-    Path resources = tempDir.resolve("resources");
-    createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
-
-    AgentJarIndex index = buildAndReadIndex(resources, tempDir);
-
-    assertNotNull(index);
-    String resourceName = "datadog/trace/bootstrap/Bootstrap.class";
-    assertEquals(resourceName, index.resourceEntryName(resourceName));
-  }
-
-  @Test
-  void resourceEntryNameAppendsDataSuffixForClassResource(@TempDir Path tempDir) throws Exception {
-    Path resources = tempDir.resolve("resources");
-    createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
-
-    AgentJarIndex index = buildAndReadIndex(resources, tempDir);
-
-    assertNotNull(index);
-    assertEquals(
-        "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata",
-        index.resourceEntryName("datadog/trace/instrumentation/servlet/ServletAdvice.class"));
-  }
-
-  @Test
-  void multiplePrefixesAreIndexedIndependently(@TempDir Path tempDir) throws Exception {
-    Path resources = tempDir.resolve("resources");
-    createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
-    createFile(resources, "metrics/com/datadoghq/stats/StatsClient.classdata");
-
-    AgentJarIndex index = buildAndReadIndex(resources, tempDir);
-
-    assertNotNull(index);
-    assertEquals(
-        "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata",
-        index.classEntryName("datadog.trace.instrumentation.servlet.ServletAdvice"));
-    assertEquals(
-        "metrics/com/datadoghq/stats/StatsClient.classdata",
-        index.classEntryName("com.datadoghq.stats.StatsClient"));
-  }
-
-  @Test
-  void buildIndexWritesPrefixesInSortedOrder(@TempDir Path tempDir) throws Exception {
-    Path resources = tempDir.resolve("resources");
-    createFile(resources, "metrics/com/datadoghq/stats/StatsClient.classdata");
-    createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
-    createFile(resources, "appsec/com/datadog/appsec/Event.classdata");
-
-    Path indexFile = writeIndex(resources, tempDir.resolve("dd-java-agent.index"));
-
-    assertEquals(Arrays.asList("appsec/", "inst/", "metrics/"), readPrefixes(indexFile));
-  }
-
-  @Test
-  void buildIndexIgnoresTopLevelFilesWhenCollectingPrefixes(@TempDir Path tempDir)
-      throws Exception {
-    Path resources = tempDir.resolve("resources");
-    createFile(resources, "root-resource.properties");
-    createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
-
-    Path indexFile = writeIndex(resources, tempDir.resolve("dd-java-agent.index"));
-
-    assertEquals(Arrays.asList("inst/"), readPrefixes(indexFile));
-  }
-
-  @Test
-  void buildIndexIsIndependentOfDirectoryCreationOrder(@TempDir Path tempDir) throws Exception {
-    Path buildResources = tempDir.resolve("build-resources");
-    createFile(buildResources, "appsec/com/datadog/appsec/Event.classdata");
-    createFile(buildResources, "ci-visibility/com/datadog/ci/Visibility.classdata");
-    createFile(buildResources, "cws-tls/com/datadog/cws/Tls.classdata");
-    createFile(
-        buildResources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
-
-    Path deployResources = tempDir.resolve("deploy-resources");
-    createFile(deployResources, "cws-tls/com/datadog/cws/Tls.classdata");
-    createFile(deployResources, "ci-visibility/com/datadog/ci/Visibility.classdata");
-    createFile(deployResources, "appsec/com/datadog/appsec/Event.classdata");
-    createFile(
-        deployResources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
-
-    Path buildIndex = writeIndex(buildResources, tempDir.resolve("build-dd-java-agent.index"));
-    Path deployIndex = writeIndex(deployResources, tempDir.resolve("deploy-dd-java-agent.index"));
-
-    assertArrayEquals(Files.readAllBytes(buildIndex), Files.readAllBytes(deployIndex));
-  }
-
-  @Test
-  void buildIndexWithEmptyResourcesDirProducesWorkingIndex(@TempDir Path tempDir) throws Exception {
-    Path resources = tempDir.resolve("resources");
-    Files.createDirectories(resources);
-
-    AgentJarIndex index = buildAndReadIndex(resources, tempDir);
-
-    assertNotNull(index);
-    // All lookups fall through to main jar (prefixId == 0) or null
-    String name = "datadog/trace/bootstrap/Bootstrap.class";
-    assertEquals(name, index.resourceEntryName(name));
-  }
-
-  @Test
-  void resourceEntryNameReturnsNullForResourceOutsideAnyIndexedPrefix(@TempDir Path tempDir)
-      throws Exception {
-    Path resources = tempDir.resolve("resources");
-    createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
-
-    AgentJarIndex index = buildAndReadIndex(resources, tempDir);
-
-    assertNotNull(index);
-    // com.* is not indexed → null (symmetric with classEntryNameReturnsNullForUnknownPackage)
-    assertNull(index.resourceEntryName("com/example/Foo.class"));
-  }
-
-  @Test
-  void resourceEntryNameDoesNotAppendDataSuffixForNonClassResources(@TempDir Path tempDir)
-      throws Exception {
-    Path resources = tempDir.resolve("resources");
-    createFile(resources, "inst/datadog/trace/instrumentation/servlet/ServletAdvice.classdata");
-
-    AgentJarIndex index = buildAndReadIndex(resources, tempDir);
-
-    assertNotNull(index);
-    // A non-.class resource under an indexed prefix is returned with the prefix prepended
-    // but without the "data" suffix (only .class resources get "data" appended)
-    assertEquals(
-        "inst/datadog/trace/instrumentation/servlet/services",
-        index.resourceEntryName("datadog/trace/instrumentation/servlet/services"));
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/AgentLambdaProfilingContextForkedTest.java b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/AgentLambdaProfilingContextForkedTest.java
index a68a29a782f..21a4faaa2d8 100644
--- a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/AgentLambdaProfilingContextForkedTest.java
+++ b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/AgentLambdaProfilingContextForkedTest.java
@@ -24,25 +24,20 @@
 @ExtendWith(WithConfigExtension.class)
 class AgentLambdaProfilingContextForkedTest {
 
-  @Test
-  @WithConfig(key = APPSEC_ENABLED, value = "true")
-  @WithConfig(key = PROFILING_ENABLED, value = "false")
-  @WithConfig(key = PROFILING_DATADOG_PROFILER_ENABLED, value = "true")
-  @WithConfig(
-      key = "AWS_LAMBDA_FUNCTION_NAME",
-      value = "my-function",
-      env = true,
-      addPrefix = false)
-  void doesNotCreateTheDdprofIntegrationInAwsLambda() {
-    // The exclusion is only observable when the configuration would otherwise have triggered the
-    // ddprof context integration; the Datadog profiler is vetoed on some platforms and JVMs.
-    assumeTrue(
-        Config.get().isOtelThreadContextEnabled(),
-        "OTel context exposure is unavailable on this platform/JVM version");
+    @Test
+    @WithConfig(key = APPSEC_ENABLED, value = "true")
+    @WithConfig(key = PROFILING_ENABLED, value = "false")
+    @WithConfig(key = PROFILING_DATADOG_PROFILER_ENABLED, value = "true")
+    @WithConfig(key = "AWS_LAMBDA_FUNCTION_NAME", value = "my-function", env = true, addPrefix = false)
+    void doesNotCreateTheDdprofIntegrationInAwsLambda() {
+        // The exclusion is only observable when the configuration would otherwise have triggered the
+        // ddprof context integration; the Datadog profiler is vetoed on some platforms and JVMs.
+        assumeTrue(
+                Config.get().isOtelThreadContextEnabled(),
+                "OTel context exposure is unavailable on this platform/JVM version");
 
-    // AGENT_CLASSLOADER is null in this unit test, so reaching the ddprof branch at all would fail
-    // loudly rather than silently return the no-op integration.
-    assertSame(
-        ProfilingContextIntegration.NoOp.INSTANCE, Agent.createProfilingContextIntegration());
-  }
+        // AGENT_CLASSLOADER is null in this unit test, so reaching the ddprof branch at all would fail
+        // loudly rather than silently return the no-op integration.
+        assertSame(ProfilingContextIntegration.NoOp.INSTANCE, Agent.createProfilingContextIntegration());
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/DatadogClassLoaderTest.java b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/DatadogClassLoaderTest.java
index 376b035a043..b8fc445ea24 100644
--- a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/DatadogClassLoaderTest.java
+++ b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/DatadogClassLoaderTest.java
@@ -18,154 +18,145 @@
 import org.junit.jupiter.api.Timeout;
 
 class DatadogClassLoaderTest {
-  private static final URL testJarLocation =
-      toUrl(new File("src/test/resources/classloader-test-jar/testjar-jdk8"));
-  private static final URL nestedTestJarLocation =
-      toUrl(new File("src/test/resources/classloader-test-jar/jar-with-nested-classes-jdk8"));
-
-  private static URL toUrl(File file) {
-    try {
-      return file.toURI().toURL();
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+    private static final URL testJarLocation = toUrl(new File("src/test/resources/classloader-test-jar/testjar-jdk8"));
+    private static final URL nestedTestJarLocation =
+            toUrl(new File("src/test/resources/classloader-test-jar/jar-with-nested-classes-jdk8"));
+
+    private static URL toUrl(File file) {
+        try {
+            return file.toURI().toURL();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    // ClassLoader.getClassLoadingLock is protected; reach it via reflection, matching what the
+    // original Groovy test did implicitly.
+    private static Object classLoadingLock(ClassLoader cl, String name) throws Exception {
+        Method m = ClassLoader.class.getDeclaredMethod("getClassLoadingLock", String.class);
+        m.setAccessible(true);
+        return m.invoke(cl, name);
     }
-  }
-
-  // ClassLoader.getClassLoadingLock is protected; reach it via reflection, matching what the
-  // original Groovy test did implicitly.
-  private static Object classLoadingLock(ClassLoader cl, String name) throws Exception {
-    Method m = ClassLoader.class.getDeclaredMethod("getClassLoadingLock", String.class);
-    m.setAccessible(true);
-    return m.invoke(cl, name);
-  }
-
-  @Test
-  @Timeout(60)
-  void agentClassloaderDoesNotLockClassloadingAroundInstance() throws Exception {
-    // setup
-    String className1 = "some/class/Name1";
-    String className2 = "some/class/Name2";
-    DatadogClassLoader ddLoader = new DatadogClassLoader();
-    Object lock1 = classLoadingLock(ddLoader, className1);
-    Object lock2 = classLoadingLock(ddLoader, className2);
-    Phaser threadHoldLockPhase = new Phaser(2);
-    Phaser acquireLockFromMainThreadPhase = new Phaser(2);
-
-    // when
-    Thread thread1 =
-        new Thread() {
-          @Override
-          public void run() {
-            synchronized (lock1) {
-              threadHoldLockPhase.arrive();
-              acquireLockFromMainThreadPhase.arriveAndAwaitAdvance();
+
+    @Test
+    @Timeout(60)
+    void agentClassloaderDoesNotLockClassloadingAroundInstance() throws Exception {
+        // setup
+        String className1 = "some/class/Name1";
+        String className2 = "some/class/Name2";
+        DatadogClassLoader ddLoader = new DatadogClassLoader();
+        Object lock1 = classLoadingLock(ddLoader, className1);
+        Object lock2 = classLoadingLock(ddLoader, className2);
+        Phaser threadHoldLockPhase = new Phaser(2);
+        Phaser acquireLockFromMainThreadPhase = new Phaser(2);
+
+        // when
+        Thread thread1 = new Thread() {
+            @Override
+            public void run() {
+                synchronized (lock1) {
+                    threadHoldLockPhase.arrive();
+                    acquireLockFromMainThreadPhase.arriveAndAwaitAdvance();
+                }
             }
-          }
         };
-    thread1.start();
-
-    Thread thread2 =
-        new Thread() {
-          @Override
-          public void run() {
-            threadHoldLockPhase.arriveAndAwaitAdvance();
-            synchronized (lock2) {
-              acquireLockFromMainThreadPhase.arrive();
+        thread1.start();
+
+        Thread thread2 = new Thread() {
+            @Override
+            public void run() {
+                threadHoldLockPhase.arriveAndAwaitAdvance();
+                synchronized (lock2) {
+                    acquireLockFromMainThreadPhase.arrive();
+                }
             }
-          }
         };
-    thread2.start();
-    thread1.join();
-    thread2.join();
-
-    // then — reaching this point means no deadlock occurred
-  }
-
-  @Test
-  void agentClassloaderSuccessfullyLoadsClassesConcurrently() throws Exception {
-    // given
-    DatadogClassLoader ddLoader = new DatadogClassLoader(testJarLocation, null);
-
-    // when
-    ExecutorService executorService = Executors.newCachedThreadPool();
-    List<Future<Void>> futures = new ArrayList<>();
-    for (int i = 0; i < 100; i++) {
-      futures.add(
-          executorService.submit(
-              () -> {
+        thread2.start();
+        thread1.join();
+        thread2.join();
+
+        // then — reaching this point means no deadlock occurred
+    }
+
+    @Test
+    void agentClassloaderSuccessfullyLoadsClassesConcurrently() throws Exception {
+        // given
+        DatadogClassLoader ddLoader = new DatadogClassLoader(testJarLocation, null);
+
+        // when
+        ExecutorService executorService = Executors.newCachedThreadPool();
+        List<Future<Void>> futures = new ArrayList<>();
+        for (int i = 0; i < 100; i++) {
+            futures.add(executorService.submit(() -> {
                 ddLoader.loadClass("a.A");
                 return null;
-              }));
-    }
-    for (Future<Void> future : futures) {
-      try {
-        future.get();
-      } catch (Exception ex) {
-        if (ex.getCause() instanceof Throwable) {
-          throw (Exception) ex.getCause();
+            }));
         }
-        throw ex;
-      }
+        for (Future<Void> future : futures) {
+            try {
+                future.get();
+            } catch (Exception ex) {
+                if (ex.getCause() instanceof Throwable) {
+                    throw (Exception) ex.getCause();
+                }
+                throw ex;
+            }
+        }
+
+        // then — no exception thrown
     }
 
-    // then — no exception thrown
-  }
-
-  @Test
-  void loadNestedClassesAndCallGetEnclosingClass() throws Exception {
-    // given
-    DatadogClassLoader ddLoader = new DatadogClassLoader(nestedTestJarLocation, null);
-
-    // when
-    Class<?> klass = ddLoader.loadClass("p.EnclosingClass$StaticInnerClass");
-
-    // then
-    assertEquals("StaticInnerClass", klass.getSimpleName());
-
-    // when
-    Class<?> enclosing = klass.getEnclosingClass();
-
-    // then
-    assertEquals("EnclosingClass", enclosing.getSimpleName());
-  }
-
-  /**
-   * Regression test for APMS-19624 / DataDog/dd-trace-java#6398. The resource URL must be built
-   * from the agent jar URL (a properly-formed {@code file:} URL), not from {@code
-   * JarFile.getName()} (an OS-native path). On Windows the OS-native form is {@code
-   * C:\Datadog\dd-java-agent.jar}, which produces the malformed URL {@code
-   * jar:file:C:\Datadog\dd-java-agent.jar!/...} and breaks helper-class injection on Spring Boot
-   * 1.3.5 {@code LaunchedURLClassLoader}.
-   *
-   * <p>We exercise the divergence cross-platform by copying the test jar into a directory whose
-   * name contains a space: {@code URL.toString()} percent-encodes it, {@code JarFile.getName()}
-   * does not.
-   */
-  @Test
-  void findResourceUsesAgentJarUrlAsPrefix(@org.junit.jupiter.api.io.TempDir File tempDir)
-      throws Exception {
-    File spacedDir = new File(tempDir, "dir with spaces");
-    assertTrue(spacedDir.mkdirs());
-    File spacedJar = new File(spacedDir, "testjar-jdk8");
-    Files.copy(
-        new File("src/test/resources/classloader-test-jar/testjar-jdk8").toPath(),
-        spacedJar.toPath());
-
-    URL spacedJarUrl = spacedJar.toURI().toURL();
-    DatadogClassLoader ddLoader = new DatadogClassLoader(spacedJarUrl, null);
-
-    URL resource = ddLoader.findResource("a/A.class");
-    assertNotNull(resource, "findResource should locate a/A.class in the test jar");
-
-    String expectedPrefix = "jar:" + spacedJarUrl + "!/";
-    assertTrue(
-        resource.toString().startsWith(expectedPrefix),
-        () ->
-            "resource URL ("
-                + resource
-                + ") should start with the agent jar URL prefix ("
-                + expectedPrefix
-                + ") — pre-fix code derives the prefix from JarFile.getName(),"
-                + " which leaves the space unencoded and on Windows produces a malformed URL.");
-  }
+    @Test
+    void loadNestedClassesAndCallGetEnclosingClass() throws Exception {
+        // given
+        DatadogClassLoader ddLoader = new DatadogClassLoader(nestedTestJarLocation, null);
+
+        // when
+        Class<?> klass = ddLoader.loadClass("p.EnclosingClass$StaticInnerClass");
+
+        // then
+        assertEquals("StaticInnerClass", klass.getSimpleName());
+
+        // when
+        Class<?> enclosing = klass.getEnclosingClass();
+
+        // then
+        assertEquals("EnclosingClass", enclosing.getSimpleName());
+    }
+
+    /**
+     * Regression test for APMS-19624 / DataDog/dd-trace-java#6398. The resource URL must be built
+     * from the agent jar URL (a properly-formed {@code file:} URL), not from {@code
+     * JarFile.getName()} (an OS-native path). On Windows the OS-native form is {@code
+     * C:\Datadog\dd-java-agent.jar}, which produces the malformed URL {@code
+     * jar:file:C:\Datadog\dd-java-agent.jar!/...} and breaks helper-class injection on Spring Boot
+     * 1.3.5 {@code LaunchedURLClassLoader}.
+     *
+     * <p>We exercise the divergence cross-platform by copying the test jar into a directory whose
+     * name contains a space: {@code URL.toString()} percent-encodes it, {@code JarFile.getName()}
+     * does not.
+     */
+    @Test
+    void findResourceUsesAgentJarUrlAsPrefix(@org.junit.jupiter.api.io.TempDir File tempDir) throws Exception {
+        File spacedDir = new File(tempDir, "dir with spaces");
+        assertTrue(spacedDir.mkdirs());
+        File spacedJar = new File(spacedDir, "testjar-jdk8");
+        Files.copy(new File("src/test/resources/classloader-test-jar/testjar-jdk8").toPath(), spacedJar.toPath());
+
+        URL spacedJarUrl = spacedJar.toURI().toURL();
+        DatadogClassLoader ddLoader = new DatadogClassLoader(spacedJarUrl, null);
+
+        URL resource = ddLoader.findResource("a/A.class");
+        assertNotNull(resource, "findResource should locate a/A.class in the test jar");
+
+        String expectedPrefix = "jar:" + spacedJarUrl + "!/";
+        assertTrue(
+                resource.toString().startsWith(expectedPrefix),
+                () -> "resource URL ("
+                        + resource
+                        + ") should start with the agent jar URL prefix ("
+                        + expectedPrefix
+                        + ") — pre-fix code derives the prefix from JarFile.getName(),"
+                        + " which leaves the space unencoded and on Windows produces a malformed URL.");
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/DeferredProfilingContextIntegrationTest.java b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/DeferredProfilingContextIntegrationTest.java
index 671188e913d..898a6018579 100644
--- a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/DeferredProfilingContextIntegrationTest.java
+++ b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/DeferredProfilingContextIntegrationTest.java
@@ -33,290 +33,278 @@
  */
 class DeferredProfilingContextIntegrationTest {
 
-  @BeforeEach
-  void reset() {
-    FakeDatadogProfilingIntegration.constructions.set(0);
-    FakeDatadogProfilingIntegration.constructionThread.set(null);
-    FakeProcessContext.registrations.set(0);
-    FakeProcessContext.registered = new CountDownLatch(1);
-    FakeDatadogProfilingIntegration.gate = new CountDownLatch(0);
-    FakeDatadogProfilingIntegration.onAttachCalls.set(0);
-    FakeDatadogProfilingIntegration.onDetachCalls.set(0);
-    FakeDatadogProfilingIntegration.onRootSpanFinishedCalls.set(0);
-    FakeDatadogProfilingIntegration.lastBoundContext.set(null);
-  }
-
-  @Test
-  void deferredConstructionDoesNotRunOnTheCallingThread() throws Exception {
-    // hold the deferred construction so the "not done synchronously" assertions cannot race with it
-    FakeDatadogProfilingIntegration.gate = new CountDownLatch(1);
-
-    ProfilingContextIntegration integration =
-        Agent.deferDdprofContextIntegration(fakeProfilingClassLoader());
-
-    // nothing was constructed synchronously on this (premain) thread
-    assertNotNull(integration);
-    assertEquals(0, FakeDatadogProfilingIntegration.constructions.get());
-    assertEquals(0, FakeProcessContext.registrations.get());
-    assertEquals("ddprof", integration.name());
-    // ... and before the swap the wrapper behaves as a no-op
-    assertSame(Stateful.DEFAULT, integration.newScopeState(null));
-    assertSame(ProfilingScope.NO_OP, integration.newScope());
-    assertSame(Timing.NoOp.INSTANCE, integration.start(TimerType.QUEUEING));
-
-    FakeDatadogProfilingIntegration.gate.countDown();
-    assertTrue(
-        FakeProcessContext.registered.await(30, TimeUnit.SECONDS),
-        "deferred construction never ran");
-    // the deferred work happened, and it happened on another thread
-    assertEquals(1, FakeDatadogProfilingIntegration.constructions.get());
-    assertEquals(1, FakeProcessContext.registrations.get());
-    assertNotSame(Thread.currentThread(), FakeDatadogProfilingIntegration.constructionThread.get());
-    assertSame(FakeDatadogProfilingIntegration.STATE, integration.newScopeState(null));
-  }
-
-  @Test
-  void synchronousConstructionKeepsRunningOnTheCallingThread() {
-    ProfilingContextIntegration integration =
-        Agent.loadDdprofContextIntegration(fakeProfilingClassLoader());
-
-    assertTrue(integration instanceof FakeDatadogProfilingIntegration);
-    assertEquals(1, FakeDatadogProfilingIntegration.constructions.get());
-    assertSame(Thread.currentThread(), FakeDatadogProfilingIntegration.constructionThread.get());
-  }
-
-  /**
-   * {@code ProfilingAgent.run()} registers the process context on its own when profiling is
-   * enabled; registering it here too would double-register.
-   */
-  @Test
-  void synchronousConstructionLeavesTheProcessContextToTheProfilerAgent() {
-    Agent.loadDdprofContextIntegration(fakeProfilingClassLoader());
-
-    assertEquals(0, FakeProcessContext.registrations.get());
-  }
-
-  @Test
-  void delegatesToTheRealIntegrationOnceInitialized() {
-    DeferredProfilingContextIntegration deferred =
-        new DeferredProfilingContextIntegration("ddprof", FakeDatadogProfilingIntegration::new);
-
-    assertSame(Stateful.DEFAULT, deferred.newScopeState(null));
-
-    deferred.initialize();
-
-    assertSame(FakeDatadogProfilingIntegration.STATE, deferred.newScopeState(null));
-    assertEquals("ddprof", deferred.name());
-
-    // every other pass-through method must reach the swapped-in delegate too, not just
-    // newScopeState/name: each is a distinct code path in DeferredProfilingContextIntegration.
-    deferred.onAttach();
-    deferred.onDetach();
-    assertEquals(1, FakeDatadogProfilingIntegration.onAttachCalls.get());
-    assertEquals(1, FakeDatadogProfilingIntegration.onDetachCalls.get());
-    assertEquals(42, deferred.encodeOperationName("op"));
-    assertEquals(43, deferred.encodeResourceName("resource"));
-    deferred.onRootSpanFinished(null, EndpointTracker.NO_OP);
-    assertEquals(1, FakeDatadogProfilingIntegration.onRootSpanFinishedCalls.get());
-  }
-
-  /**
-   * Without explicit forwarding, virtual-thread context rebinding would silently never happen after
-   * the real integration is swapped in.
-   */
-  @Test
-  void forwardsVirtualThreadContextBindingOnceInitialized() {
-    DeferredProfilingContextIntegration deferred =
-        new DeferredProfilingContextIntegration("ddprof", FakeDatadogProfilingIntegration::new);
-
-    // before the swap the wrapper uses the interface defaults
-    assertFalse(deferred.isThreadContextBindingRequired());
-    deferred.setContext(Context.root());
-    assertNull(FakeDatadogProfilingIntegration.lastBoundContext.get());
-
-    deferred.initialize();
-
-    assertTrue(deferred.isThreadContextBindingRequired());
-    Context context = Context.root().with(ContextKey.named("test"), "value");
-    deferred.setContext(context);
-    assertSame(context, FakeDatadogProfilingIntegration.lastBoundContext.get());
-  }
-
-  @Test
-  void staysNoOpWhenTheDeferredConstructionFails() {
-    DeferredProfilingContextIntegration deferred =
-        new DeferredProfilingContextIntegration(
-            "ddprof",
-            () -> {
-              throw new UnsatisfiedLinkError("no native library here");
-            });
-
-    deferred.initialize();
-
-    assertSame(Stateful.DEFAULT, deferred.newScopeState(null));
-    assertSame(ProfilingScope.NO_OP, deferred.newScope());
-    assertSame(ProfilingContextAttribute.NoOp.INSTANCE, deferred.createContextAttribute("tag"));
-    assertSame(EndpointTracker.NO_OP, deferred.onRootSpanStarted(null));
-    assertEquals(0, deferred.encode("something"));
-    assertEquals("ddprof", deferred.name());
-  }
-
-  @Test
-  void staysNoOpWhenTheFactoryReturnsNull() {
-    DeferredProfilingContextIntegration deferred =
-        new DeferredProfilingContextIntegration("ddprof", () -> null);
-    AtomicInteger callbacks = new AtomicInteger();
-
-    deferred.whenAvailable(callbacks::incrementAndGet);
-    deferred.initialize();
-
-    assertEquals(0, callbacks.get());
-    assertSame(Stateful.DEFAULT, deferred.newScopeState(null));
-    assertSame(ProfilingScope.NO_OP, deferred.newScope());
-  }
-
-  @Test
-  void availabilityCallbacksRunOnlyOnceTheRealIntegrationIsIn() {
-    DeferredProfilingContextIntegration deferred =
-        new DeferredProfilingContextIntegration("ddprof", FakeDatadogProfilingIntegration::new);
-    AtomicInteger callbacks = new AtomicInteger();
-
-    deferred.whenAvailable(callbacks::incrementAndGet);
-    assertEquals(0, callbacks.get());
-
-    deferred.initialize();
-    assertEquals(1, callbacks.get());
-
-    // registering after the swap runs the callback straight away, without waiting for anything
-    deferred.whenAvailable(callbacks::incrementAndGet);
-    assertEquals(2, callbacks.get());
-  }
-
-  @Test
-  void availabilityCallbacksNeverRunWhenTheDeferredConstructionFails() {
-    DeferredProfilingContextIntegration deferred =
-        new DeferredProfilingContextIntegration(
-            "ddprof",
-            () -> {
-              throw new UnsatisfiedLinkError("no native library here");
-            });
-    AtomicInteger callbacks = new AtomicInteger();
-
-    deferred.whenAvailable(callbacks::incrementAndGet);
-    deferred.initialize();
-
-    assertEquals(0, callbacks.get());
-  }
-
-  private static ClassLoader fakeProfilingClassLoader() {
-    return new ClassLoader(null) {
-      @Override
-      public Class<?> loadClass(final String name) throws ClassNotFoundException {
-        if ("com.datadog.profiling.ddprof.DatadogProfilingIntegration".equals(name)) {
-          return FakeDatadogProfilingIntegration.class;
-        }
-        if ("com.datadog.profiling.agent.ProcessContext".equals(name)) {
-          return FakeProcessContext.class;
-        }
-        return super.loadClass(name);
-      }
-    };
-  }
-
-  public static final class FakeProcessContext {
-    static final AtomicInteger registrations = new AtomicInteger();
-    static volatile CountDownLatch registered = new CountDownLatch(1);
-
-    public static void register(final ConfigProvider configProvider) {
-      registrations.incrementAndGet();
-      registered.countDown();
+    @BeforeEach
+    void reset() {
+        FakeDatadogProfilingIntegration.constructions.set(0);
+        FakeDatadogProfilingIntegration.constructionThread.set(null);
+        FakeProcessContext.registrations.set(0);
+        FakeProcessContext.registered = new CountDownLatch(1);
+        FakeDatadogProfilingIntegration.gate = new CountDownLatch(0);
+        FakeDatadogProfilingIntegration.onAttachCalls.set(0);
+        FakeDatadogProfilingIntegration.onDetachCalls.set(0);
+        FakeDatadogProfilingIntegration.onRootSpanFinishedCalls.set(0);
+        FakeDatadogProfilingIntegration.lastBoundContext.set(null);
     }
-  }
 
-  public static final class FakeDatadogProfilingIntegration implements ProfilingContextIntegration {
-    static final Stateful STATE =
-        new Stateful() {
-          @Override
-          public void close() {}
+    @Test
+    void deferredConstructionDoesNotRunOnTheCallingThread() throws Exception {
+        // hold the deferred construction so the "not done synchronously" assertions cannot race with it
+        FakeDatadogProfilingIntegration.gate = new CountDownLatch(1);
+
+        ProfilingContextIntegration integration = Agent.deferDdprofContextIntegration(fakeProfilingClassLoader());
+
+        // nothing was constructed synchronously on this (premain) thread
+        assertNotNull(integration);
+        assertEquals(0, FakeDatadogProfilingIntegration.constructions.get());
+        assertEquals(0, FakeProcessContext.registrations.get());
+        assertEquals("ddprof", integration.name());
+        // ... and before the swap the wrapper behaves as a no-op
+        assertSame(Stateful.DEFAULT, integration.newScopeState(null));
+        assertSame(ProfilingScope.NO_OP, integration.newScope());
+        assertSame(Timing.NoOp.INSTANCE, integration.start(TimerType.QUEUEING));
+
+        FakeDatadogProfilingIntegration.gate.countDown();
+        assertTrue(FakeProcessContext.registered.await(30, TimeUnit.SECONDS), "deferred construction never ran");
+        // the deferred work happened, and it happened on another thread
+        assertEquals(1, FakeDatadogProfilingIntegration.constructions.get());
+        assertEquals(1, FakeProcessContext.registrations.get());
+        assertNotSame(Thread.currentThread(), FakeDatadogProfilingIntegration.constructionThread.get());
+        assertSame(FakeDatadogProfilingIntegration.STATE, integration.newScopeState(null));
+    }
 
-          @Override
-          public void activate(final Object context) {}
-        };
+    @Test
+    void synchronousConstructionKeepsRunningOnTheCallingThread() {
+        ProfilingContextIntegration integration = Agent.loadDdprofContextIntegration(fakeProfilingClassLoader());
 
-    static final AtomicInteger constructions = new AtomicInteger();
-    static final AtomicReference<Thread> constructionThread = new AtomicReference<>();
-    static volatile CountDownLatch gate = new CountDownLatch(0);
-    static final AtomicInteger onAttachCalls = new AtomicInteger();
-    static final AtomicInteger onDetachCalls = new AtomicInteger();
-    static final AtomicInteger onRootSpanFinishedCalls = new AtomicInteger();
-    static final AtomicReference<Context> lastBoundContext = new AtomicReference<>();
-
-    public FakeDatadogProfilingIntegration() {
-      try {
-        if (!gate.await(30, TimeUnit.SECONDS)) {
-          throw new IllegalStateException("construction gate was never released");
-        }
-      } catch (final InterruptedException e) {
-        Thread.currentThread().interrupt();
-        throw new IllegalStateException(e);
-      }
-      constructions.incrementAndGet();
-      constructionThread.set(Thread.currentThread());
+        assertTrue(integration instanceof FakeDatadogProfilingIntegration);
+        assertEquals(1, FakeDatadogProfilingIntegration.constructions.get());
+        assertSame(Thread.currentThread(), FakeDatadogProfilingIntegration.constructionThread.get());
     }
 
-    @Override
-    public Stateful newScopeState(final ProfilerContext profilerContext) {
-      return STATE;
-    }
+    /**
+     * {@code ProfilingAgent.run()} registers the process context on its own when profiling is
+     * enabled; registering it here too would double-register.
+     */
+    @Test
+    void synchronousConstructionLeavesTheProcessContextToTheProfilerAgent() {
+        Agent.loadDdprofContextIntegration(fakeProfilingClassLoader());
 
-    @Override
-    public String name() {
-      return "ddprof";
+        assertEquals(0, FakeProcessContext.registrations.get());
     }
 
-    @Override
-    public void onRootSpanFinished(final AgentSpan rootSpan, final EndpointTracker tracker) {
-      onRootSpanFinishedCalls.incrementAndGet();
+    @Test
+    void delegatesToTheRealIntegrationOnceInitialized() {
+        DeferredProfilingContextIntegration deferred =
+                new DeferredProfilingContextIntegration("ddprof", FakeDatadogProfilingIntegration::new);
+
+        assertSame(Stateful.DEFAULT, deferred.newScopeState(null));
+
+        deferred.initialize();
+
+        assertSame(FakeDatadogProfilingIntegration.STATE, deferred.newScopeState(null));
+        assertEquals("ddprof", deferred.name());
+
+        // every other pass-through method must reach the swapped-in delegate too, not just
+        // newScopeState/name: each is a distinct code path in DeferredProfilingContextIntegration.
+        deferred.onAttach();
+        deferred.onDetach();
+        assertEquals(1, FakeDatadogProfilingIntegration.onAttachCalls.get());
+        assertEquals(1, FakeDatadogProfilingIntegration.onDetachCalls.get());
+        assertEquals(42, deferred.encodeOperationName("op"));
+        assertEquals(43, deferred.encodeResourceName("resource"));
+        deferred.onRootSpanFinished(null, EndpointTracker.NO_OP);
+        assertEquals(1, FakeDatadogProfilingIntegration.onRootSpanFinishedCalls.get());
     }
 
-    @Override
-    public EndpointTracker onRootSpanStarted(final AgentSpan rootSpan) {
-      return EndpointTracker.NO_OP;
+    /**
+     * Without explicit forwarding, virtual-thread context rebinding would silently never happen after
+     * the real integration is swapped in.
+     */
+    @Test
+    void forwardsVirtualThreadContextBindingOnceInitialized() {
+        DeferredProfilingContextIntegration deferred =
+                new DeferredProfilingContextIntegration("ddprof", FakeDatadogProfilingIntegration::new);
+
+        // before the swap the wrapper uses the interface defaults
+        assertFalse(deferred.isThreadContextBindingRequired());
+        deferred.setContext(Context.root());
+        assertNull(FakeDatadogProfilingIntegration.lastBoundContext.get());
+
+        deferred.initialize();
+
+        assertTrue(deferred.isThreadContextBindingRequired());
+        Context context = Context.root().with(ContextKey.named("test"), "value");
+        deferred.setContext(context);
+        assertSame(context, FakeDatadogProfilingIntegration.lastBoundContext.get());
     }
 
-    @Override
-    public Timing start(final TimerType type) {
-      return Timing.NoOp.INSTANCE;
+    @Test
+    void staysNoOpWhenTheDeferredConstructionFails() {
+        DeferredProfilingContextIntegration deferred = new DeferredProfilingContextIntegration("ddprof", () -> {
+            throw new UnsatisfiedLinkError("no native library here");
+        });
+
+        deferred.initialize();
+
+        assertSame(Stateful.DEFAULT, deferred.newScopeState(null));
+        assertSame(ProfilingScope.NO_OP, deferred.newScope());
+        assertSame(ProfilingContextAttribute.NoOp.INSTANCE, deferred.createContextAttribute("tag"));
+        assertSame(EndpointTracker.NO_OP, deferred.onRootSpanStarted(null));
+        assertEquals(0, deferred.encode("something"));
+        assertEquals("ddprof", deferred.name());
     }
 
-    @Override
-    public void onAttach() {
-      onAttachCalls.incrementAndGet();
+    @Test
+    void staysNoOpWhenTheFactoryReturnsNull() {
+        DeferredProfilingContextIntegration deferred = new DeferredProfilingContextIntegration("ddprof", () -> null);
+        AtomicInteger callbacks = new AtomicInteger();
+
+        deferred.whenAvailable(callbacks::incrementAndGet);
+        deferred.initialize();
+
+        assertEquals(0, callbacks.get());
+        assertSame(Stateful.DEFAULT, deferred.newScopeState(null));
+        assertSame(ProfilingScope.NO_OP, deferred.newScope());
     }
 
-    @Override
-    public void onDetach() {
-      onDetachCalls.incrementAndGet();
+    @Test
+    void availabilityCallbacksRunOnlyOnceTheRealIntegrationIsIn() {
+        DeferredProfilingContextIntegration deferred =
+                new DeferredProfilingContextIntegration("ddprof", FakeDatadogProfilingIntegration::new);
+        AtomicInteger callbacks = new AtomicInteger();
+
+        deferred.whenAvailable(callbacks::incrementAndGet);
+        assertEquals(0, callbacks.get());
+
+        deferred.initialize();
+        assertEquals(1, callbacks.get());
+
+        // registering after the swap runs the callback straight away, without waiting for anything
+        deferred.whenAvailable(callbacks::incrementAndGet);
+        assertEquals(2, callbacks.get());
     }
 
-    @Override
-    public int encodeOperationName(final CharSequence constant) {
-      return 42;
+    @Test
+    void availabilityCallbacksNeverRunWhenTheDeferredConstructionFails() {
+        DeferredProfilingContextIntegration deferred = new DeferredProfilingContextIntegration("ddprof", () -> {
+            throw new UnsatisfiedLinkError("no native library here");
+        });
+        AtomicInteger callbacks = new AtomicInteger();
+
+        deferred.whenAvailable(callbacks::incrementAndGet);
+        deferred.initialize();
+
+        assertEquals(0, callbacks.get());
     }
 
-    @Override
-    public int encodeResourceName(final CharSequence constant) {
-      return 43;
+    private static ClassLoader fakeProfilingClassLoader() {
+        return new ClassLoader(null) {
+            @Override
+            public Class<?> loadClass(final String name) throws ClassNotFoundException {
+                if ("com.datadog.profiling.ddprof.DatadogProfilingIntegration".equals(name)) {
+                    return FakeDatadogProfilingIntegration.class;
+                }
+                if ("com.datadog.profiling.agent.ProcessContext".equals(name)) {
+                    return FakeProcessContext.class;
+                }
+                return super.loadClass(name);
+            }
+        };
     }
 
-    @Override
-    public boolean isThreadContextBindingRequired() {
-      return true;
+    public static final class FakeProcessContext {
+        static final AtomicInteger registrations = new AtomicInteger();
+        static volatile CountDownLatch registered = new CountDownLatch(1);
+
+        public static void register(final ConfigProvider configProvider) {
+            registrations.incrementAndGet();
+            registered.countDown();
+        }
     }
 
-    @Override
-    public void setContext(final Context context) {
-      lastBoundContext.set(context);
+    public static final class FakeDatadogProfilingIntegration implements ProfilingContextIntegration {
+        static final Stateful STATE = new Stateful() {
+            @Override
+            public void close() {}
+
+            @Override
+            public void activate(final Object context) {}
+        };
+
+        static final AtomicInteger constructions = new AtomicInteger();
+        static final AtomicReference<Thread> constructionThread = new AtomicReference<>();
+        static volatile CountDownLatch gate = new CountDownLatch(0);
+        static final AtomicInteger onAttachCalls = new AtomicInteger();
+        static final AtomicInteger onDetachCalls = new AtomicInteger();
+        static final AtomicInteger onRootSpanFinishedCalls = new AtomicInteger();
+        static final AtomicReference<Context> lastBoundContext = new AtomicReference<>();
+
+        public FakeDatadogProfilingIntegration() {
+            try {
+                if (!gate.await(30, TimeUnit.SECONDS)) {
+                    throw new IllegalStateException("construction gate was never released");
+                }
+            } catch (final InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new IllegalStateException(e);
+            }
+            constructions.incrementAndGet();
+            constructionThread.set(Thread.currentThread());
+        }
+
+        @Override
+        public Stateful newScopeState(final ProfilerContext profilerContext) {
+            return STATE;
+        }
+
+        @Override
+        public String name() {
+            return "ddprof";
+        }
+
+        @Override
+        public void onRootSpanFinished(final AgentSpan rootSpan, final EndpointTracker tracker) {
+            onRootSpanFinishedCalls.incrementAndGet();
+        }
+
+        @Override
+        public EndpointTracker onRootSpanStarted(final AgentSpan rootSpan) {
+            return EndpointTracker.NO_OP;
+        }
+
+        @Override
+        public Timing start(final TimerType type) {
+            return Timing.NoOp.INSTANCE;
+        }
+
+        @Override
+        public void onAttach() {
+            onAttachCalls.incrementAndGet();
+        }
+
+        @Override
+        public void onDetach() {
+            onDetachCalls.incrementAndGet();
+        }
+
+        @Override
+        public int encodeOperationName(final CharSequence constant) {
+            return 42;
+        }
+
+        @Override
+        public int encodeResourceName(final CharSequence constant) {
+            return 43;
+        }
+
+        @Override
+        public boolean isThreadContextBindingRequired() {
+            return true;
+        }
+
+        @Override
+        public void setContext(final Context context) {
+            lastBoundContext.set(context);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/JfrEventHolderInitForkedTest.java b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/JfrEventHolderInitForkedTest.java
index ebe9e8443da..d6b90cc123e 100644
--- a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/JfrEventHolderInitForkedTest.java
+++ b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/JfrEventHolderInitForkedTest.java
@@ -45,37 +45,36 @@
  */
 public class JfrEventHolderInitForkedTest {
 
-  @Test
-  public void productionInitOrderingDoesNotPoisonHandlers() throws Exception {
-    final ClassLoader loader = getClass().getClassLoader();
+    @Test
+    public void productionInitOrderingDoesNotPoisonHandlers() throws Exception {
+        final ClassLoader loader = getClass().getClassLoader();
 
-    // The holder class (if any) is selected by JDK version; skip when this JDK has none (JDK 8,
-    // 23+).
-    final String holderName = Agent.jfrEventHolderClassName();
-    assumeTrue(holderName != null, "No JFR event-holder class on this JDK; nothing to test");
+        // The holder class (if any) is selected by JDK version; skip when this JDK has none (JDK 8,
+        // 23+).
+        final String holderName = Agent.jfrEventHolderClassName();
+        assumeTrue(holderName != null, "No JFR event-holder class on this JDK; nothing to test");
 
-    // Exercise the exact production path: FlightRecorder init first, then holder <clinit>.
-    Agent.initializeJfrEventHolderClass(loader);
+        // Exercise the exact production path: FlightRecorder init first, then holder <clinit>.
+        Agent.initializeJfrEventHolderClass(loader);
 
-    // The holder is now initialized; read its static handler fields and check none are null.
-    final Class<?> holder = Class.forName(holderName, false, loader);
-    final List<String> nullFields = new ArrayList<>();
-    int handlerFields = 0;
-    for (final Field field : holder.getDeclaredFields()) {
-      if (!Modifier.isStatic(field.getModifiers()) || field.getType().isPrimitive()) {
-        continue;
-      }
-      handlerFields++;
-      field.setAccessible(true);
-      if (field.get(null) == null) {
-        nullFields.add(field.getName());
-      }
-    }
+        // The holder is now initialized; read its static handler fields and check none are null.
+        final Class<?> holder = Class.forName(holderName, false, loader);
+        final List<String> nullFields = new ArrayList<>();
+        int handlerFields = 0;
+        for (final Field field : holder.getDeclaredFields()) {
+            if (!Modifier.isStatic(field.getModifiers()) || field.getType().isPrimitive()) {
+                continue;
+            }
+            handlerFields++;
+            field.setAccessible(true);
+            if (field.get(null) == null) {
+                nullFields.add(field.getName());
+            }
+        }
 
-    assertTrue(handlerFields > 0, "expected " + holderName + " to declare handler fields");
-    assertTrue(
-        nullFields.isEmpty(),
-        "JFR handler fields were poisoned to null (holder initialized before FlightRecorder): "
-            + nullFields);
-  }
+        assertTrue(handlerFields > 0, "expected " + holderName + " to declare handler fields");
+        assertTrue(
+                nullFields.isEmpty(),
+                "JFR handler fields were poisoned to null (holder initialized before FlightRecorder): " + nullFields);
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/classloading/ClassDefiningTest.java b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/classloading/ClassDefiningTest.java
index b3941727472..653c428c931 100644
--- a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/classloading/ClassDefiningTest.java
+++ b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/classloading/ClassDefiningTest.java
@@ -12,84 +12,83 @@
 
 class ClassDefiningTest {
 
-  @BeforeEach
-  void resetStaticState() throws Exception {
-    Field hasObserver = ClassDefining.class.getDeclaredField("HAS_OBSERVER");
-    hasObserver.setAccessible(true);
-    ((AtomicBoolean) hasObserver.get(null)).set(false);
-
-    Field observer = ClassDefining.class.getDeclaredField("OBSERVER");
-    observer.setAccessible(true);
-    observer.set(null, (ClassDefining.Observer) (loader, bytecode, offset, length) -> {});
-  }
-
-  @Test
-  void beginWithNoObserverIsNoOp() {
-    assertDoesNotThrow(() -> ClassDefining.begin(null, new byte[10], 0, 10));
-  }
-
-  @Test
-  void beginCallsRegisteredObserverOnEachInvocation() {
-    AtomicInteger calls = new AtomicInteger();
-    ClassDefining.observe((loader, bytecode, offset, length) -> calls.incrementAndGet());
-
-    ClassDefining.begin(null, new byte[4], 0, 4);
-    ClassDefining.begin(null, new byte[4], 0, 4);
-
-    assertEquals(2, calls.get());
-  }
-
-  @Test
-  void observerReceivesCorrectArguments() {
-    ClassLoader loader = ClassLoader.getSystemClassLoader();
-    byte[] bytecode = {1, 2, 3, 4, 5};
-
-    ClassLoader[] capturedLoader = new ClassLoader[1];
-    byte[][] capturedBytecode = new byte[1][];
-    int[] capturedOffset = new int[1];
-    int[] capturedLength = new int[1];
-
-    ClassDefining.observe(
-        (l, b, o, len) -> {
-          capturedLoader[0] = l;
-          capturedBytecode[0] = b;
-          capturedOffset[0] = o;
-          capturedLength[0] = len;
-        });
+    @BeforeEach
+    void resetStaticState() throws Exception {
+        Field hasObserver = ClassDefining.class.getDeclaredField("HAS_OBSERVER");
+        hasObserver.setAccessible(true);
+        ((AtomicBoolean) hasObserver.get(null)).set(false);
+
+        Field observer = ClassDefining.class.getDeclaredField("OBSERVER");
+        observer.setAccessible(true);
+        observer.set(null, (ClassDefining.Observer) (loader, bytecode, offset, length) -> {});
+    }
+
+    @Test
+    void beginWithNoObserverIsNoOp() {
+        assertDoesNotThrow(() -> ClassDefining.begin(null, new byte[10], 0, 10));
+    }
+
+    @Test
+    void beginCallsRegisteredObserverOnEachInvocation() {
+        AtomicInteger calls = new AtomicInteger();
+        ClassDefining.observe((loader, bytecode, offset, length) -> calls.incrementAndGet());
+
+        ClassDefining.begin(null, new byte[4], 0, 4);
+        ClassDefining.begin(null, new byte[4], 0, 4);
 
-    ClassDefining.begin(loader, bytecode, 1, 3);
+        assertEquals(2, calls.get());
+    }
 
-    assertSame(loader, capturedLoader[0]);
-    assertSame(bytecode, capturedBytecode[0]);
-    assertEquals(1, capturedOffset[0]);
-    assertEquals(3, capturedLength[0]);
-  }
+    @Test
+    void observerReceivesCorrectArguments() {
+        ClassLoader loader = ClassLoader.getSystemClassLoader();
+        byte[] bytecode = {1, 2, 3, 4, 5};
+
+        ClassLoader[] capturedLoader = new ClassLoader[1];
+        byte[][] capturedBytecode = new byte[1][];
+        int[] capturedOffset = new int[1];
+        int[] capturedLength = new int[1];
+
+        ClassDefining.observe((l, b, o, len) -> {
+            capturedLoader[0] = l;
+            capturedBytecode[0] = b;
+            capturedOffset[0] = o;
+            capturedLength[0] = len;
+        });
 
-  @Test
-  void secondObserveCallIsIgnoredFirstObserverRemains() {
-    AtomicInteger firstCalls = new AtomicInteger();
-    AtomicInteger secondCalls = new AtomicInteger();
+        ClassDefining.begin(loader, bytecode, 1, 3);
 
-    ClassDefining.observe((loader, bytecode, offset, length) -> firstCalls.incrementAndGet());
-    ClassDefining.observe((loader, bytecode, offset, length) -> secondCalls.incrementAndGet());
+        assertSame(loader, capturedLoader[0]);
+        assertSame(bytecode, capturedBytecode[0]);
+        assertEquals(1, capturedOffset[0]);
+        assertEquals(3, capturedLength[0]);
+    }
 
-    ClassDefining.begin(null, new byte[4], 0, 4);
+    @Test
+    void secondObserveCallIsIgnoredFirstObserverRemains() {
+        AtomicInteger firstCalls = new AtomicInteger();
+        AtomicInteger secondCalls = new AtomicInteger();
 
-    assertEquals(1, firstCalls.get());
-    assertEquals(0, secondCalls.get());
-  }
+        ClassDefining.observe((loader, bytecode, offset, length) -> firstCalls.incrementAndGet());
+        ClassDefining.observe((loader, bytecode, offset, length) -> secondCalls.incrementAndGet());
 
-  @Test
-  void observeIsIdempotentWhenCalledWithSameObserverRepeatedly() {
-    AtomicInteger calls = new AtomicInteger();
-    ClassDefining.Observer observer = (l, b, o, len) -> calls.incrementAndGet();
+        ClassDefining.begin(null, new byte[4], 0, 4);
 
-    for (int i = 0; i < 5; i++) {
-      ClassDefining.observe(observer);
+        assertEquals(1, firstCalls.get());
+        assertEquals(0, secondCalls.get());
     }
 
-    ClassDefining.begin(null, new byte[1], 0, 1);
+    @Test
+    void observeIsIdempotentWhenCalledWithSameObserverRepeatedly() {
+        AtomicInteger calls = new AtomicInteger();
+        ClassDefining.Observer observer = (l, b, o, len) -> calls.incrementAndGet();
 
-    assertEquals(1, calls.get());
-  }
+        for (int i = 0; i < 5; i++) {
+            ClassDefining.observe(observer);
+        }
+
+        ClassDefining.begin(null, new byte[1], 0, 1);
+
+        assertEquals(1, calls.get());
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenterContainsTraceCommentTest.java b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenterContainsTraceCommentTest.java
index 8a1e8edcb99..fcb14588d54 100644
--- a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenterContainsTraceCommentTest.java
+++ b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenterContainsTraceCommentTest.java
@@ -13,36 +13,36 @@
  */
 class SharedDBCommenterContainsTraceCommentTest {
 
-  @Test
-  void delegate_wholeString() {
-    assertTrue(containsTraceComment("ddps='svc',dde='test'"));
-    assertFalse(containsTraceComment("just a plain comment"));
-    assertFalse(containsTraceComment(""));
-  }
+    @Test
+    void delegate_wholeString() {
+        assertTrue(containsTraceComment("ddps='svc',dde='test'"));
+        assertFalse(containsTraceComment("just a plain comment"));
+        assertFalse(containsTraceComment(""));
+    }
 
-  @Test
-  void range_needleInsideCommentBody() {
-    String sql = "SELECT 1 /*ddps='svc',dde='test'*/";
-    int from = sql.indexOf("/*") + 2;
-    int to = sql.indexOf("*/");
-    assertTrue(containsTraceComment(sql, from, to));
-  }
+    @Test
+    void range_needleInsideCommentBody() {
+        String sql = "SELECT 1 /*ddps='svc',dde='test'*/";
+        int from = sql.indexOf("/*") + 2;
+        int to = sql.indexOf("*/");
+        assertTrue(containsTraceComment(sql, from, to));
+    }
 
-  @Test
-  void range_nonDdCommentBody() {
-    String sql = "SELECT 1 /* just a customer comment */";
-    int from = sql.indexOf("/*") + 2;
-    int to = sql.indexOf("*/");
-    assertFalse(containsTraceComment(sql, from, to));
-  }
+    @Test
+    void range_nonDdCommentBody() {
+        String sql = "SELECT 1 /* just a customer comment */";
+        int from = sql.indexOf("/*") + 2;
+        int to = sql.indexOf("*/");
+        assertFalse(containsTraceComment(sql, from, to));
+    }
 
-  @Test
-  void range_ddNeedleOutsideCommentRegionNotMatched() {
-    // The DD needle sits in the statement body, not the comment region we pass -- a whole-string
-    // contains would false-positive; the range check must scope to [from, to).
-    String sql = "ddps='x' /* clean */";
-    int from = sql.indexOf("/*") + 2;
-    int to = sql.indexOf("*/");
-    assertFalse(containsTraceComment(sql, from, to));
-  }
+    @Test
+    void range_ddNeedleOutsideCommentRegionNotMatched() {
+        // The DD needle sits in the statement body, not the comment region we pass -- a whole-string
+        // contains would false-positive; the range check must scope to [from, to).
+        String sql = "ddps='x' /* clean */";
+        int from = sql.indexOf("/*") + 2;
+        int to = sql.indexOf("*/");
+        assertFalse(containsTraceComment(sql, from, to));
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecoratorNullDbTypeTest.java b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecoratorNullDbTypeTest.java
index 681ceb460a2..c9ace07d488 100644
--- a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecoratorNullDbTypeTest.java
+++ b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecoratorNullDbTypeTest.java
@@ -12,59 +12,58 @@
 
 class DatabaseClientDecoratorNullDbTypeTest {
 
-  private final AgentSpan span = mock(AgentSpan.class);
-  private final DatabaseClientDecorator<Object> decorator =
-      new DatabaseClientDecorator<Object>() {
+    private final AgentSpan span = mock(AgentSpan.class);
+    private final DatabaseClientDecorator<Object> decorator = new DatabaseClientDecorator<Object>() {
         @Override
         protected String[] instrumentationNames() {
-          return new String[] {"test"};
+            return new String[] {"test"};
         }
 
         @Override
         protected CharSequence spanType() {
-          return "test-type";
+            return "test-type";
         }
 
         @Override
         protected CharSequence component() {
-          return "test-component";
+            return "test-component";
         }
 
         @Override
         protected String service() {
-          return "test-service";
+            return "test-service";
         }
 
         @Override
         protected String dbType() {
-          return null;
+            return null;
         }
 
         @Override
         protected String dbUser(Object connection) {
-          return null;
+            return null;
         }
 
         @Override
         protected String dbInstance(Object connection) {
-          return null;
+            return null;
         }
 
         @Override
         protected CharSequence dbHostname(Object connection) {
-          return null;
+            return null;
         }
-      };
+    };
 
-  @Test
-  void processDatabaseTypeWithNullDbTypeDoesNotThrowOrTag() {
-    assertDoesNotThrow(() -> decorator.processDatabaseType(span, null));
+    @Test
+    void processDatabaseTypeWithNullDbTypeDoesNotThrowOrTag() {
+        assertDoesNotThrow(() -> decorator.processDatabaseType(span, null));
 
-    verify(span, never()).setTag(anyString(), anyString());
-  }
+        verify(span, never()).setTag(anyString(), anyString());
+    }
 
-  @Test
-  void dbServiceWithNullDbTypeReturnsNull() {
-    assertNull(decorator.dbService(null, null));
-  }
+    @Test
+    void dbServiceWithNullDbTypeReturnsNull() {
+        assertNull(decorator.dbService(null, null));
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecoratorIsAgentRequestTest.java b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecoratorIsAgentRequestTest.java
index 5d4f2c9e6ae..a54024126f0 100644
--- a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecoratorIsAgentRequestTest.java
+++ b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecoratorIsAgentRequestTest.java
@@ -8,50 +8,49 @@
 
 class HttpClientDecoratorIsAgentRequestTest {
 
-  // Regression test: advice runs before the instrumented method's own argument validation, so a
-  // caller passing a null request (e.g. HttpClient.sendAsync(null, ...)) must not NPE inside
-  // isAgentRequest -> getRequestHeader. See
-  // datadog.trace.instrumentation.httpclient.SendAsyncAdvice.
-  @Test
-  void isAgentRequestOfNullRequestReturnsFalseInsteadOfThrowing() {
-    HttpClientDecorator<Object, Object> decorator =
-        new HttpClientDecorator<Object, Object>() {
-          @Override
-          protected String[] instrumentationNames() {
-            return new String[] {"test"};
-          }
-
-          @Override
-          protected CharSequence component() {
-            return "test-component";
-          }
-
-          @Override
-          protected String method(Object request) {
-            return null;
-          }
-
-          @Override
-          protected URI url(Object request) throws URISyntaxException {
-            return null;
-          }
-
-          @Override
-          protected int status(Object response) {
-            return 0;
-          }
-
-          @Override
-          protected String getRequestHeader(Object request, String headerName) {
-            throw new NullPointerException("should not be reached for a null request");
-          }
-
-          @Override
-          protected String getResponseHeader(Object response, String headerName) {
-            return null;
-          }
+    // Regression test: advice runs before the instrumented method's own argument validation, so a
+    // caller passing a null request (e.g. HttpClient.sendAsync(null, ...)) must not NPE inside
+    // isAgentRequest -> getRequestHeader. See
+    // datadog.trace.instrumentation.httpclient.SendAsyncAdvice.
+    @Test
+    void isAgentRequestOfNullRequestReturnsFalseInsteadOfThrowing() {
+        HttpClientDecorator<Object, Object> decorator = new HttpClientDecorator<Object, Object>() {
+            @Override
+            protected String[] instrumentationNames() {
+                return new String[] {"test"};
+            }
+
+            @Override
+            protected CharSequence component() {
+                return "test-component";
+            }
+
+            @Override
+            protected String method(Object request) {
+                return null;
+            }
+
+            @Override
+            protected URI url(Object request) throws URISyntaxException {
+                return null;
+            }
+
+            @Override
+            protected int status(Object response) {
+                return 0;
+            }
+
+            @Override
+            protected String getRequestHeader(Object request, String headerName) {
+                throw new NullPointerException("should not be reached for a null request");
+            }
+
+            @Override
+            protected String getResponseHeader(Object response, String headerName) {
+                return null;
+            }
         };
 
-    assertFalse(decorator.isAgentRequest(null));
-  }
+        assertFalse(decorator.isAgentRequest(null));
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorSecurityTestingHeadersTest.java b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorSecurityTestingHeadersTest.java
index c9435f11843..f19972acded 100644
--- a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorSecurityTestingHeadersTest.java
+++ b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorSecurityTestingHeadersTest.java
@@ -34,235 +34,230 @@
 
 class HttpServerDecoratorSecurityTestingHeadersTest {
 
-  private AgentSpan span;
-  private Map<String, Object> tags;
-  private HttpServerDecorator<Map<String, String>, ?, ?, Map<String, String>> decorator;
-
-  @BeforeEach
-  void setup() {
-    tags = new HashMap<>();
-    span = mock(AgentSpan.class);
-    when(span.setTag(anyString(), anyString())).thenAnswer(this::recordTag);
-    when(span.getRequestContext()).thenReturn(mock(RequestContext.class));
-    when(span.setMeasured(true)).thenReturn(span);
-
-    decorator = newDecorator(ContextVisitors.stringValuesMap());
-  }
-
-  private Object recordTag(InvocationOnMock invocation) {
-    tags.put(invocation.getArgument(0), invocation.getArgument(1));
-    return span;
-  }
-
-  @Test
-  void tagsBothMarkersWhenPresentAndIgnoresUnrelatedHeaders() {
-    Map<String, String> headers = new LinkedHashMap<>();
-    headers.put("x-datadog-endpoint-scan", "scan-uuid-1");
-    headers.put("x-datadog-security-test", "test-uuid-2");
-    headers.put("x-other-header", "ignored");
-
-    decorator.startSpan(headers, root());
-
-    assertEquals("scan-uuid-1", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN));
-    assertEquals("test-uuid-2", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST));
-    verify(span, never()).setTag(eq("http.request.headers.x-other-header"), anyString());
-  }
-
-  @Test
-  void doesNotTagWhenHeadersAreAbsent() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put("content-type", "application/json");
-
-    decorator.startSpan(headers, root());
-
-    verify(span, never()).setTag(eq(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN), anyString());
-    verify(span, never()).setTag(eq(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST), anyString());
-  }
-
-  @Test
-  void matchesHeaderNamesCaseInsensitively() {
-    Map<String, String> headers = new LinkedHashMap<>();
-    headers.put("X-Datadog-Endpoint-Scan", "scan-uuid-3");
-    headers.put("X-DATADOG-SECURITY-TEST", "test-uuid-4");
-
-    decorator.startSpan(headers, root());
-
-    assertEquals("scan-uuid-3", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN));
-    assertEquals("test-uuid-4", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST));
-  }
-
-  @Test
-  void tagsHeadersEvenWhenValueIsEmptyString() {
-    Map<String, String> headers = new LinkedHashMap<>();
-    headers.put("x-datadog-endpoint-scan", "");
-    headers.put("x-datadog-security-test", "ok");
-
-    decorator.startSpan(headers, root());
-
-    assertEquals("", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN));
-    assertEquals("ok", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST));
-  }
-
-  @Test
-  void tagsHeadersUnconditionallyEvenWhenTraceConfigHasOtherHeaderTags() {
-    // RFC contract: tag regardless of DD_TRACE_HEADER_TAGS. Stub the trace config with an
-    // unrelated header-tag mapping; the markers must still be tagged.
-    TraceConfig traceConfig = mock(TraceConfig.class);
-    when(span.traceConfig()).thenReturn(traceConfig);
-    when(traceConfig.getRequestHeaderTags())
-        .thenReturn(Collections.singletonMap("x-other", "http.request.headers.x-other"));
-
-    Map<String, String> headers = new LinkedHashMap<>();
-    headers.put("x-datadog-endpoint-scan", "scan-uuid");
-    headers.put("x-datadog-security-test", "test-uuid");
-
-    decorator.startSpan(headers, root());
-
-    assertEquals("scan-uuid", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN));
-    assertEquals("test-uuid", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST));
-  }
-
-  @Test
-  void stopsIteratingAfterBothMarkersFound() {
-    // Custom visitor that records which keys it offered to the classifier, so we can prove
-    // the classifier short-circuits via `return false` once both markers are seen.
-    List<String> visitedKeys = new ArrayList<>();
-    AgentPropagation.ContextVisitor<Map<String, String>> trackingVisitor =
-        (carrier, classifier) -> {
-          for (Map.Entry<String, String> e : carrier.entrySet()) {
-            visitedKeys.add(e.getKey());
-            if (!classifier.accept(e.getKey(), e.getValue())) {
-              return;
+    private AgentSpan span;
+    private Map<String, Object> tags;
+    private HttpServerDecorator<Map<String, String>, ?, ?, Map<String, String>> decorator;
+
+    @BeforeEach
+    void setup() {
+        tags = new HashMap<>();
+        span = mock(AgentSpan.class);
+        when(span.setTag(anyString(), anyString())).thenAnswer(this::recordTag);
+        when(span.getRequestContext()).thenReturn(mock(RequestContext.class));
+        when(span.setMeasured(true)).thenReturn(span);
+
+        decorator = newDecorator(ContextVisitors.stringValuesMap());
+    }
+
+    private Object recordTag(InvocationOnMock invocation) {
+        tags.put(invocation.getArgument(0), invocation.getArgument(1));
+        return span;
+    }
+
+    @Test
+    void tagsBothMarkersWhenPresentAndIgnoresUnrelatedHeaders() {
+        Map<String, String> headers = new LinkedHashMap<>();
+        headers.put("x-datadog-endpoint-scan", "scan-uuid-1");
+        headers.put("x-datadog-security-test", "test-uuid-2");
+        headers.put("x-other-header", "ignored");
+
+        decorator.startSpan(headers, root());
+
+        assertEquals("scan-uuid-1", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN));
+        assertEquals("test-uuid-2", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST));
+        verify(span, never()).setTag(eq("http.request.headers.x-other-header"), anyString());
+    }
+
+    @Test
+    void doesNotTagWhenHeadersAreAbsent() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("content-type", "application/json");
+
+        decorator.startSpan(headers, root());
+
+        verify(span, never()).setTag(eq(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN), anyString());
+        verify(span, never()).setTag(eq(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST), anyString());
+    }
+
+    @Test
+    void matchesHeaderNamesCaseInsensitively() {
+        Map<String, String> headers = new LinkedHashMap<>();
+        headers.put("X-Datadog-Endpoint-Scan", "scan-uuid-3");
+        headers.put("X-DATADOG-SECURITY-TEST", "test-uuid-4");
+
+        decorator.startSpan(headers, root());
+
+        assertEquals("scan-uuid-3", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN));
+        assertEquals("test-uuid-4", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST));
+    }
+
+    @Test
+    void tagsHeadersEvenWhenValueIsEmptyString() {
+        Map<String, String> headers = new LinkedHashMap<>();
+        headers.put("x-datadog-endpoint-scan", "");
+        headers.put("x-datadog-security-test", "ok");
+
+        decorator.startSpan(headers, root());
+
+        assertEquals("", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN));
+        assertEquals("ok", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST));
+    }
+
+    @Test
+    void tagsHeadersUnconditionallyEvenWhenTraceConfigHasOtherHeaderTags() {
+        // RFC contract: tag regardless of DD_TRACE_HEADER_TAGS. Stub the trace config with an
+        // unrelated header-tag mapping; the markers must still be tagged.
+        TraceConfig traceConfig = mock(TraceConfig.class);
+        when(span.traceConfig()).thenReturn(traceConfig);
+        when(traceConfig.getRequestHeaderTags())
+                .thenReturn(Collections.singletonMap("x-other", "http.request.headers.x-other"));
+
+        Map<String, String> headers = new LinkedHashMap<>();
+        headers.put("x-datadog-endpoint-scan", "scan-uuid");
+        headers.put("x-datadog-security-test", "test-uuid");
+
+        decorator.startSpan(headers, root());
+
+        assertEquals("scan-uuid", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN));
+        assertEquals("test-uuid", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST));
+    }
+
+    @Test
+    void stopsIteratingAfterBothMarkersFound() {
+        // Custom visitor that records which keys it offered to the classifier, so we can prove
+        // the classifier short-circuits via `return false` once both markers are seen.
+        List<String> visitedKeys = new ArrayList<>();
+        AgentPropagation.ContextVisitor<Map<String, String>> trackingVisitor = (carrier, classifier) -> {
+            for (Map.Entry<String, String> e : carrier.entrySet()) {
+                visitedKeys.add(e.getKey());
+                if (!classifier.accept(e.getKey(), e.getValue())) {
+                    return;
+                }
             }
-          }
         };
-    decorator = newDecorator(trackingVisitor);
-
-    Map<String, String> headers = new LinkedHashMap<>();
-    headers.put("x-datadog-endpoint-scan", "scan-uuid");
-    headers.put("x-datadog-security-test", "test-uuid");
-    headers.put("trailing-header-after-both-markers", "should-not-be-visited");
-
-    decorator.startSpan(headers, root());
-
-    assertEquals("scan-uuid", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN));
-    assertEquals("test-uuid", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST));
-    // Once both markers have been seen the classifier returns false, so iteration must stop
-    // before the trailing header is offered.
-    assertEquals(Arrays.asList("x-datadog-endpoint-scan", "x-datadog-security-test"), visitedKeys);
-  }
-
-  @Test
-  void doesNotCrashOnNullHeaderValue() {
-    Map<String, String> headers = new LinkedHashMap<>();
-    headers.put("x-datadog-endpoint-scan", "scan-uuid");
-    headers.put("x-datadog-security-test", "test-uuid");
-
-    AgentPropagation.ContextVisitor<Map<String, String>> visitorWithNullValue =
-        (carrier, classifier) -> {
-          classifier.accept("x-datadog-endpoint-scan", null);
-          for (Map.Entry<String, String> e : carrier.entrySet()) {
-            if (!classifier.accept(e.getKey(), e.getValue())) {
-              return;
+        decorator = newDecorator(trackingVisitor);
+
+        Map<String, String> headers = new LinkedHashMap<>();
+        headers.put("x-datadog-endpoint-scan", "scan-uuid");
+        headers.put("x-datadog-security-test", "test-uuid");
+        headers.put("trailing-header-after-both-markers", "should-not-be-visited");
+
+        decorator.startSpan(headers, root());
+
+        assertEquals("scan-uuid", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN));
+        assertEquals("test-uuid", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST));
+        // Once both markers have been seen the classifier returns false, so iteration must stop
+        // before the trailing header is offered.
+        assertEquals(Arrays.asList("x-datadog-endpoint-scan", "x-datadog-security-test"), visitedKeys);
+    }
+
+    @Test
+    void doesNotCrashOnNullHeaderValue() {
+        Map<String, String> headers = new LinkedHashMap<>();
+        headers.put("x-datadog-endpoint-scan", "scan-uuid");
+        headers.put("x-datadog-security-test", "test-uuid");
+
+        AgentPropagation.ContextVisitor<Map<String, String>> visitorWithNullValue = (carrier, classifier) -> {
+            classifier.accept("x-datadog-endpoint-scan", null);
+            for (Map.Entry<String, String> e : carrier.entrySet()) {
+                if (!classifier.accept(e.getKey(), e.getValue())) {
+                    return;
+                }
             }
-          }
         };
-    decorator = newDecorator(visitorWithNullValue);
-
-    decorator.startSpan(headers, root());
-
-    // Null value is skipped; carrier still surfaces the marker with its real value next.
-    assertEquals("scan-uuid", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN));
-    assertEquals("test-uuid", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST));
-  }
-
-  @Test
-  void doesNotCrashOnNullHeaderKey() {
-    Map<String, String> headers = new LinkedHashMap<>();
-    headers.put("x-datadog-endpoint-scan", "scan-uuid");
-    headers.put("x-datadog-security-test", "test-uuid");
-
-    AgentPropagation.ContextVisitor<Map<String, String>> visitorWithNullKey =
-        (carrier, classifier) -> {
-          classifier.accept(null, "should-be-ignored");
-          for (Map.Entry<String, String> e : carrier.entrySet()) {
-            if (!classifier.accept(e.getKey(), e.getValue())) {
-              return;
+        decorator = newDecorator(visitorWithNullValue);
+
+        decorator.startSpan(headers, root());
+
+        // Null value is skipped; carrier still surfaces the marker with its real value next.
+        assertEquals("scan-uuid", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN));
+        assertEquals("test-uuid", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST));
+    }
+
+    @Test
+    void doesNotCrashOnNullHeaderKey() {
+        Map<String, String> headers = new LinkedHashMap<>();
+        headers.put("x-datadog-endpoint-scan", "scan-uuid");
+        headers.put("x-datadog-security-test", "test-uuid");
+
+        AgentPropagation.ContextVisitor<Map<String, String>> visitorWithNullKey = (carrier, classifier) -> {
+            classifier.accept(null, "should-be-ignored");
+            for (Map.Entry<String, String> e : carrier.entrySet()) {
+                if (!classifier.accept(e.getKey(), e.getValue())) {
+                    return;
+                }
             }
-          }
         };
-    decorator = newDecorator(visitorWithNullKey);
-
-    decorator.startSpan(headers, root());
-
-    assertEquals("scan-uuid", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN));
-    assertEquals("test-uuid", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST));
-  }
-
-  private HttpServerDecorator<Map<String, String>, ?, ?, Map<String, String>> newDecorator(
-      AgentPropagation.ContextVisitor<Map<String, String>> visitor) {
-    TracerAPI tracer = mock(TracerAPI.class);
-    when(tracer.startSpan(any(), any(), any())).thenReturn(span);
-    when(tracer.getDataStreamsMonitoring()).thenReturn(mock(DataStreamsMonitoring.class));
-    when(tracer.getUniversalCallbackProvider())
-        .thenReturn(AgentTracer.NOOP_TRACER.getUniversalCallbackProvider());
-    when(tracer.getCallbackProvider(any()))
-        .thenReturn(AgentTracer.NOOP_TRACER.getUniversalCallbackProvider());
-    return new HttpServerDecorator<Map<String, String>, Object, Object, Map<String, String>>() {
-      @Override
-      protected TracerAPI tracer() {
-        return tracer;
-      }
-
-      @Override
-      protected String[] instrumentationNames() {
-        return new String[] {"test"};
-      }
-
-      @Override
-      protected CharSequence component() {
-        return "test-component";
-      }
-
-      @Override
-      public CharSequence spanName() {
-        return "http-test-span";
-      }
-
-      @Override
-      protected AgentPropagation.ContextVisitor<Map<String, String>> getter() {
-        return visitor;
-      }
-
-      @Override
-      protected AgentPropagation.ContextVisitor<Object> responseGetter() {
-        return null;
-      }
-
-      @Override
-      protected String method(Map<String, String> request) {
-        return null;
-      }
-
-      @Override
-      protected URIDataAdapter url(Map<String, String> request) {
-        return null;
-      }
-
-      @Override
-      protected String peerHostIP(Object connection) {
-        return null;
-      }
-
-      @Override
-      protected int peerPort(Object connection) {
-        return 0;
-      }
-
-      @Override
-      protected int status(Object response) {
-        return 0;
-      }
-    };
-  }
+        decorator = newDecorator(visitorWithNullKey);
+
+        decorator.startSpan(headers, root());
+
+        assertEquals("scan-uuid", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN));
+        assertEquals("test-uuid", tags.get(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST));
+    }
+
+    private HttpServerDecorator<Map<String, String>, ?, ?, Map<String, String>> newDecorator(
+            AgentPropagation.ContextVisitor<Map<String, String>> visitor) {
+        TracerAPI tracer = mock(TracerAPI.class);
+        when(tracer.startSpan(any(), any(), any())).thenReturn(span);
+        when(tracer.getDataStreamsMonitoring()).thenReturn(mock(DataStreamsMonitoring.class));
+        when(tracer.getUniversalCallbackProvider()).thenReturn(AgentTracer.NOOP_TRACER.getUniversalCallbackProvider());
+        when(tracer.getCallbackProvider(any())).thenReturn(AgentTracer.NOOP_TRACER.getUniversalCallbackProvider());
+        return new HttpServerDecorator<Map<String, String>, Object, Object, Map<String, String>>() {
+            @Override
+            protected TracerAPI tracer() {
+                return tracer;
+            }
+
+            @Override
+            protected String[] instrumentationNames() {
+                return new String[] {"test"};
+            }
+
+            @Override
+            protected CharSequence component() {
+                return "test-component";
+            }
+
+            @Override
+            public CharSequence spanName() {
+                return "http-test-span";
+            }
+
+            @Override
+            protected AgentPropagation.ContextVisitor<Map<String, String>> getter() {
+                return visitor;
+            }
+
+            @Override
+            protected AgentPropagation.ContextVisitor<Object> responseGetter() {
+                return null;
+            }
+
+            @Override
+            protected String method(Map<String, String> request) {
+                return null;
+            }
+
+            @Override
+            protected URIDataAdapter url(Map<String, String> request) {
+                return null;
+            }
+
+            @Override
+            protected String peerHostIP(Object connection) {
+                return null;
+            }
+
+            @Override
+            protected int peerPort(Object connection) {
+                return 0;
+            }
+
+            @Override
+            protected int status(Object response) {
+                return 0;
+            }
+        };
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionContextTest.java b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionContextTest.java
index c5bb6d4fe44..82e2509d699 100644
--- a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionContextTest.java
+++ b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionContextTest.java
@@ -10,48 +10,48 @@
 
 class JDBCConnectionContextTest {
 
-  @Test
-  void keepsMutableStateSeparateFromDatabaseInfo() {
-    DBInfo dbInfo = new DBInfo.Builder().type("oracle").build();
-    JDBCConnectionContext first = new JDBCConnectionContext(dbInfo);
-    JDBCConnectionContext second = new JDBCConnectionContext(dbInfo);
+    @Test
+    void keepsMutableStateSeparateFromDatabaseInfo() {
+        DBInfo dbInfo = new DBInfo.Builder().type("oracle").build();
+        JDBCConnectionContext first = new JDBCConnectionContext(dbInfo);
+        JDBCConnectionContext second = new JDBCConnectionContext(dbInfo);
 
-    assertSame(dbInfo, first.getDbInfo());
-    assertSame(dbInfo, second.getDbInfo());
-    assertNull(first.getPoolName());
-    assertNull(second.getPoolName());
+        assertSame(dbInfo, first.getDbInfo());
+        assertSame(dbInfo, second.getDbInfo());
+        assertNull(first.getPoolName());
+        assertNull(second.getPoolName());
 
-    first.setPoolName("first-pool");
+        first.setPoolName("first-pool");
 
-    assertEquals("first-pool", first.getPoolName());
-    assertNull(second.getPoolName());
-  }
+        assertEquals("first-pool", first.getPoolName());
+        assertNull(second.getPoolName());
+    }
 
-  @Test
-  void tracksTheLastSuccessfullySetOracleServiceHash() {
-    JDBCConnectionContext context = oracleContext();
+    @Test
+    void tracksTheLastSuccessfullySetOracleServiceHash() {
+        JDBCConnectionContext context = oracleContext();
 
-    assertTrue(context.shouldSetOracleServiceHash("123"));
-    assertFalse(context.isOracleServiceHashSet("123"));
+        assertTrue(context.shouldSetOracleServiceHash("123"));
+        assertFalse(context.isOracleServiceHashSet("123"));
 
-    context.markOracleServiceHashSet("123");
+        context.markOracleServiceHashSet("123");
 
-    assertFalse(context.shouldSetOracleServiceHash("123"));
-    assertTrue(context.isOracleServiceHashSet("123"));
-    assertFalse(context.isOracleServiceHashSet("456"));
-    assertTrue(context.shouldSetOracleServiceHash("456"));
-  }
+        assertFalse(context.shouldSetOracleServiceHash("123"));
+        assertTrue(context.isOracleServiceHashSet("123"));
+        assertFalse(context.isOracleServiceHashSet("456"));
+        assertTrue(context.shouldSetOracleServiceHash("456"));
+    }
 
-  @Test
-  void skipsActionAfterDriverIsMarkedUnsupported() {
-    JDBCConnectionContext context = oracleContext();
+    @Test
+    void skipsActionAfterDriverIsMarkedUnsupported() {
+        JDBCConnectionContext context = oracleContext();
 
-    context.markOracleServiceActionUnsupported();
+        context.markOracleServiceActionUnsupported();
 
-    assertFalse(context.shouldSetOracleServiceHash("123"));
-  }
+        assertFalse(context.shouldSetOracleServiceHash("123"));
+    }
 
-  private static JDBCConnectionContext oracleContext() {
-    return new JDBCConnectionContext(new DBInfo.Builder().type("oracle").build());
-  }
+    private static JDBCConnectionContext oracleContext() {
+        return new JDBCConnectionContext(new DBInfo.Builder().type("oracle").build());
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParserDB2Test.java b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParserDB2Test.java
index 091c1e2b02f..58cbb596869 100644
--- a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParserDB2Test.java
+++ b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParserDB2Test.java
@@ -14,22 +14,22 @@
  */
 class JDBCConnectionUrlParserDB2Test {
 
-  @TableTest({
-    "scenario                             | url                                                        | type  | host     | instance | user    | db     ",
-    "DB2 with user param, no port         | jdbc:db2://db2.host/mydb?user=db2user                      | db2   | db2.host | mydb     | db2user | mydb   ",
-    "AS400 with user param, no port       | jdbc:as400://ashost/asdb?user=asuser                       | as400 | ashost   | asdb     | asuser  | asdb   ",
-    "DB2 with multiple params, no port    | jdbc:db2://db2.host/mydb?user=db2user&connectionTimeout=30 | db2   | db2.host | mydb     | db2user | mydb   ",
-    "DB2 with databasename param, no port | jdbc:db2://db2.host/mydb?user=db2user&databasename=otherdb | db2   | db2.host | mydb     | db2user | otherdb",
-    "DB2 with port and colon params       | jdbc:db2://db2.host:50000/mydb:user=db2user                | db2   | db2.host | mydb     | db2user | mydb   ",
-    "DB2 no params                        | jdbc:db2://db2.host/mydb                                   | db2   | db2.host | mydb     |         | mydb   "
-  })
-  void db2UrlWithEqualsAndNoPortShouldParseCorrectly(
-      String url, String type, String host, String instance, String user, String db) {
-    DBInfo info = extractDBInfo(url, null);
-    assertEquals(type, info.getType());
-    assertEquals(host, info.getHost());
-    assertEquals(instance, info.getInstance());
-    assertEquals(user, info.getUser());
-    assertEquals(db, info.getDb());
-  }
+    @TableTest({
+      "scenario                             | url                                                        | type  | host     | instance | user    | db     ",
+      "DB2 with user param, no port         | jdbc:db2://db2.host/mydb?user=db2user                      | db2   | db2.host | mydb     | db2user | mydb   ",
+      "AS400 with user param, no port       | jdbc:as400://ashost/asdb?user=asuser                       | as400 | ashost   | asdb     | asuser  | asdb   ",
+      "DB2 with multiple params, no port    | jdbc:db2://db2.host/mydb?user=db2user&connectionTimeout=30 | db2   | db2.host | mydb     | db2user | mydb   ",
+      "DB2 with databasename param, no port | jdbc:db2://db2.host/mydb?user=db2user&databasename=otherdb | db2   | db2.host | mydb     | db2user | otherdb",
+      "DB2 with port and colon params       | jdbc:db2://db2.host:50000/mydb:user=db2user                | db2   | db2.host | mydb     | db2user | mydb   ",
+      "DB2 no params                        | jdbc:db2://db2.host/mydb                                   | db2   | db2.host | mydb     |         | mydb   "
+    })
+    void db2UrlWithEqualsAndNoPortShouldParseCorrectly(
+            String url, String type, String host, String instance, String user, String db) {
+        DBInfo info = extractDBInfo(url, null);
+        assertEquals(type, info.getType());
+        assertEquals(host, info.getHost());
+        assertEquals(instance, info.getInstance());
+        assertEquals(user, info.getUser());
+        assertEquals(db, info.getDb());
+    }
 }
diff --git a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParserPasswordLeakTest.java b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParserPasswordLeakTest.java
index 2da05fd7846..2c461153c26 100644
--- a/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParserPasswordLeakTest.java
+++ b/dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParserPasswordLeakTest.java
@@ -7,17 +7,17 @@
 
 class JDBCConnectionUrlParserPasswordLeakTest {
 
-  @TableTest({
-    "scenario                                       | url                                             | type       | host     | user        ",
-    "PostgreSQL userinfo with password              | jdbc:postgresql://myuser:secret123@pg.host/mydb | postgresql | pg.host  | myuser      ",
-    "PostgreSQL userinfo without password           | jdbc:postgresql://myuser@pg.host/mydb           | postgresql | pg.host  | myuser      ",
-    "PostgreSQL userinfo with percent-encoded colon | jdbc:postgresql://tenant%3Aalice@pg.host/mydb   | postgresql | pg.host  | tenant:alice",
-    "SAP userinfo with password                     | jdbc:sap://myuser:secret@sap.host/sapdb         | sap        | sap.host | myuser      "
-  })
-  void passwordShouldNotLeakIntoUserTag(String url, String type, String host, String user) {
-    DBInfo info = extractDBInfo(url, null);
-    assertEquals(type, info.getType());
-    assertEquals(host, info.getHost());
-    assertEquals(user, info.getUser());
-  }
+    @TableTest({
+      "scenario                                       | url                                             | type       | host     | user        ",
+      "PostgreSQL userinfo with password              | jdbc:postgresql://myuser:secret123@pg.host/mydb | postgresql | pg.host  | myuser      ",
+      "PostgreSQL userinfo without password           | jdbc:postgresql://myuser@pg.host/mydb           | postgresql | pg.host  | myuser      ",
+      "PostgreSQL userinfo with percent-encoded colon | jdbc:postgresql://tenant%3Aalice@pg.host/mydb   | postgresql | pg.host  | tenant:alice",
+      "SAP userinfo with password                     | jdbc:sap://myuser:secret@sap.host/sapdb         | sap        | sap.host | myuser      "
+    })
+    void passwordShouldNotLeakIntoUserTag(String url, String type, String host, String user) {
+        DBInfo info = extractDBInfo(url, null);
+        assertEquals(type, info.getType());
+        assertEquals(host, info.getHost());
+        assertEquals(user, info.getUser());
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilitySmokeTest.java b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilitySmokeTest.java
index 859f95c917c..97abe1a724a 100644
--- a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilitySmokeTest.java
+++ b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilitySmokeTest.java
@@ -26,289 +26,269 @@
 
 public abstract class CiVisibilitySmokeTest {
 
-  public static final List<String> SMOKE_IGNORED_TAGS =
-      Collections.unmodifiableList(
-          Arrays.asList("content.meta.['_dd.integration']", "content.meta.['_dd.svc_src']"));
-
-  protected static final String AGENT_JAR =
-      System.getProperty("datadog.smoketest.agent.shadowJar.path");
-  protected static final String TEST_ENVIRONMENT_NAME = "integration-test";
-  protected static final String JAVAC_PLUGIN_VERSION =
-      Config.get().getCiVisibilityCompilerPluginVersion();
-  protected static final String JACOCO_PLUGIN_VERSION =
-      Config.get().getCiVisibilityJacocoPluginVersion();
-
-  private static final Map<String, String> DEFAULT_TRACER_CONFIG = defaultJvmArguments();
-
-  @TempDir protected Path prefsDir;
-
-  protected static String buildJavaHome() {
-    String javaHome = System.getProperty("java.home");
-    File javacPath = Paths.get(javaHome, "bin", "javac").toFile();
-    if (javacPath.exists()) {
-      return javaHome;
+    public static final List<String> SMOKE_IGNORED_TAGS = Collections.unmodifiableList(
+            Arrays.asList("content.meta.['_dd.integration']", "content.meta.['_dd.svc_src']"));
+
+    protected static final String AGENT_JAR = System.getProperty("datadog.smoketest.agent.shadowJar.path");
+    protected static final String TEST_ENVIRONMENT_NAME = "integration-test";
+    protected static final String JAVAC_PLUGIN_VERSION = Config.get().getCiVisibilityCompilerPluginVersion();
+    protected static final String JACOCO_PLUGIN_VERSION = Config.get().getCiVisibilityJacocoPluginVersion();
+
+    private static final Map<String, String> DEFAULT_TRACER_CONFIG = defaultJvmArguments();
+
+    @TempDir
+    protected Path prefsDir;
+
+    protected static String buildJavaHome() {
+        String javaHome = System.getProperty("java.home");
+        File javacPath = Paths.get(javaHome, "bin", "javac").toFile();
+        if (javacPath.exists()) {
+            return javaHome;
+        }
+        // In CI for JDK 8, java.home may point to the JRE directory (e.g., /usr/lib/jvm/8/jre).
+        // The JDK with javac is in the parent directory.
+        File parentDir = new File(javaHome).getParentFile();
+        File parentJavacPath = new File(parentDir, Paths.get("bin", "javac").toString());
+        if (parentJavacPath.exists()) {
+            return parentDir.getAbsolutePath();
+        }
+        // Fallback to java.home and let callers handle the error if javac is not found.
+        return javaHome;
     }
-    // In CI for JDK 8, java.home may point to the JRE directory (e.g., /usr/lib/jvm/8/jre).
-    // The JDK with javac is in the parent directory.
-    File parentDir = new File(javaHome).getParentFile();
-    File parentJavacPath = new File(parentDir, Paths.get("bin", "javac").toString());
-    if (parentJavacPath.exists()) {
-      return parentDir.getAbsolutePath();
+
+    protected static String javaPath() {
+        String separator = System.getProperty("file.separator");
+        return buildJavaHome() + separator + "bin" + separator + "java";
+    }
+
+    protected static String javacPath() {
+        String separator = System.getProperty("file.separator");
+        return buildJavaHome() + separator + "bin" + separator + "javac";
+    }
+
+    private static Map<String, String> defaultJvmArguments() {
+        Map<String, String> argMap = new HashMap<>();
+        argMap.put(GeneralConfig.ENV, TEST_ENVIRONMENT_NAME);
+        argMap.put(CiVisibilityConfig.CIVISIBILITY_ENABLED, "true");
+        argMap.put(CiVisibilityConfig.CIVISIBILITY_AGENTLESS_ENABLED, "true");
+        argMap.put(CiVisibilityConfig.CIVISIBILITY_CIPROVIDER_INTEGRATION_ENABLED, "false");
+        argMap.put(CiVisibilityConfig.CIVISIBILITY_GIT_UPLOAD_ENABLED, "false");
+        argMap.put(CiVisibilityConfig.CIVISIBILITY_GIT_CLIENT_ENABLED, "false");
+        argMap.put(CiVisibilityConfig.CIVISIBILITY_FLAKY_RETRY_ONLY_KNOWN_FLAKES, "true");
+        argMap.put(CiVisibilityConfig.CIVISIBILITY_COMPILER_PLUGIN_VERSION, JAVAC_PLUGIN_VERSION);
+        argMap.put(TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_ENABLED, "false");
+        return argMap;
     }
-    // Fallback to java.home and let callers handle the error if javac is not found.
-    return javaHome;
-  }
-
-  protected static String javaPath() {
-    String separator = System.getProperty("file.separator");
-    return buildJavaHome() + separator + "bin" + separator + "java";
-  }
-
-  protected static String javacPath() {
-    String separator = System.getProperty("file.separator");
-    return buildJavaHome() + separator + "bin" + separator + "javac";
-  }
-
-  private static Map<String, String> defaultJvmArguments() {
-    Map<String, String> argMap = new HashMap<>();
-    argMap.put(GeneralConfig.ENV, TEST_ENVIRONMENT_NAME);
-    argMap.put(CiVisibilityConfig.CIVISIBILITY_ENABLED, "true");
-    argMap.put(CiVisibilityConfig.CIVISIBILITY_AGENTLESS_ENABLED, "true");
-    argMap.put(CiVisibilityConfig.CIVISIBILITY_CIPROVIDER_INTEGRATION_ENABLED, "false");
-    argMap.put(CiVisibilityConfig.CIVISIBILITY_GIT_UPLOAD_ENABLED, "false");
-    argMap.put(CiVisibilityConfig.CIVISIBILITY_GIT_CLIENT_ENABLED, "false");
-    argMap.put(CiVisibilityConfig.CIVISIBILITY_FLAKY_RETRY_ONLY_KNOWN_FLAKES, "true");
-    argMap.put(CiVisibilityConfig.CIVISIBILITY_COMPILER_PLUGIN_VERSION, JAVAC_PLUGIN_VERSION);
-    argMap.put(TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_ENABLED, "false");
-    return argMap;
-  }
-
-  private static Map<String, String> buildJvmArgMap(
-      String mockBackendIntakeUrl, String serviceName, Map<String, String> additionalArgs) {
-    Map<String, String> argMap = new HashMap<>(DEFAULT_TRACER_CONFIG);
-    argMap.put(CiVisibilityConfig.CIVISIBILITY_AGENTLESS_URL, mockBackendIntakeUrl);
-    argMap.put(CiVisibilityConfig.CIVISIBILITY_INTAKE_AGENTLESS_URL, mockBackendIntakeUrl);
-    argMap.put(TracerConfig.TRACE_AGENT_URL, mockBackendIntakeUrl);
-    argMap.putAll(additionalArgs);
-
-    if (serviceName != null) {
-      argMap.put(GeneralConfig.SERVICE_NAME, serviceName);
+
+    private static Map<String, String> buildJvmArgMap(
+            String mockBackendIntakeUrl, String serviceName, Map<String, String> additionalArgs) {
+        Map<String, String> argMap = new HashMap<>(DEFAULT_TRACER_CONFIG);
+        argMap.put(CiVisibilityConfig.CIVISIBILITY_AGENTLESS_URL, mockBackendIntakeUrl);
+        argMap.put(CiVisibilityConfig.CIVISIBILITY_INTAKE_AGENTLESS_URL, mockBackendIntakeUrl);
+        argMap.put(TracerConfig.TRACE_AGENT_URL, mockBackendIntakeUrl);
+        argMap.putAll(additionalArgs);
+
+        if (serviceName != null) {
+            argMap.put(GeneralConfig.SERVICE_NAME, serviceName);
+        }
+
+        return argMap;
     }
 
-    return argMap;
-  }
+    protected List<String> buildJvmArguments(
+            String mockBackendIntakeUrl, String serviceName, Map<String, String> additionalArgs) {
+        List<String> arguments = new ArrayList<>(Arrays.asList("-Xms256m", "-Xmx512m"));
 
-  protected List<String> buildJvmArguments(
-      String mockBackendIntakeUrl, String serviceName, Map<String, String> additionalArgs) {
-    List<String> arguments = new ArrayList<>(Arrays.asList("-Xms256m", "-Xmx512m"));
+        arguments.add(preventJulPrefsFileLock());
 
-    arguments.add(preventJulPrefsFileLock());
+        Map<String, String> argMap = buildJvmArgMap(mockBackendIntakeUrl, serviceName, additionalArgs);
 
-    Map<String, String> argMap = buildJvmArgMap(mockBackendIntakeUrl, serviceName, additionalArgs);
+        // Convenience switches for local debugging. Set as JVM system properties (e.g. via
+        // `-Ddatadog.civisibility.smoketest.debug.parent=1`) rather than env vars, to keep the
+        // config-inversion-linter happy (it forbids unregistered `DD_…` env-var literals in
+        // `src/main/java`) and to avoid `System.getenv` in main sources.
+        if (System.getProperty("datadog.civisibility.smoketest.debug.parent") != null) {
+            arguments.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005");
+        }
+        if (System.getProperty("datadog.civisibility.smoketest.debug.child") != null) {
+            argMap.put(CiVisibilityConfig.CIVISIBILITY_DEBUG_PORT, "5055");
+        }
 
-    // Convenience switches for local debugging. Set as JVM system properties (e.g. via
-    // `-Ddatadog.civisibility.smoketest.debug.parent=1`) rather than env vars, to keep the
-    // config-inversion-linter happy (it forbids unregistered `DD_…` env-var literals in
-    // `src/main/java`) and to avoid `System.getenv` in main sources.
-    if (System.getProperty("datadog.civisibility.smoketest.debug.parent") != null) {
-      arguments.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005");
+        // CI-Vis smoke tests produce a lot of logs in debug mode, so it is disabled by default.
+        // Note: GitLab capacity for job logs at 32 MB and truncates the rest, which can fail the job.
+        // Enable full debug via `-Ddatadog.civisibility.smoketest.debug.enabled=true`.
+        if (System.getProperty("datadog.civisibility.smoketest.debug.enabled") != null) {
+            argMap.put(GeneralConfig.TRACE_DEBUG, "true");
+        }
+
+        String agentArgs = argMap.entrySet().stream()
+                .map(e -> propertyNameToSystemPropertyName(e.getKey()) + "=" + e.getValue())
+                .collect(Collectors.joining(","));
+        arguments.add("-javaagent:" + AGENT_JAR + "=" + agentArgs);
+
+        return arguments;
     }
-    if (System.getProperty("datadog.civisibility.smoketest.debug.child") != null) {
-      argMap.put(CiVisibilityConfig.CIVISIBILITY_DEBUG_PORT, "5055");
+
+    /**
+     * Trick to prevent jul Prefs file lock issue on forked processes, in particular in CI which runs
+     * on Linux and have competing processes trying to write to it, including the Gradle daemon.
+     *
+     * <pre>{@code
+     * Couldn't flush user prefs: java.util.prefs.BackingStoreException: Couldn't get file lock.
+     * }</pre>
+     *
+     * Note, some tests can setup arguments on spec level, so {@code prefsDir} will be {@code null}
+     * during {@code @BeforeAll}.
+     */
+    protected String preventJulPrefsFileLock() {
+        Path resolved = prefsDir != null ? prefsDir : tempUserPrefsPath();
+        return "-Djava.util.prefs.userRoot=" + resolved.toAbsolutePath();
     }
 
-    // CI-Vis smoke tests produce a lot of logs in debug mode, so it is disabled by default.
-    // Note: GitLab capacity for job logs at 32 MB and truncates the rest, which can fail the job.
-    // Enable full debug via `-Ddatadog.civisibility.smoketest.debug.enabled=true`.
-    if (System.getProperty("datadog.civisibility.smoketest.debug.enabled") != null) {
-      argMap.put(GeneralConfig.TRACE_DEBUG, "true");
+    private static Path tempUserPrefsPath() {
+        String uniqueId = System.currentTimeMillis() + "_" + System.nanoTime() + "_"
+                + Thread.currentThread().getId();
+        return Paths.get(System.getProperty("java.io.tmpdir"), "gradle-test-userPrefs", uniqueId);
     }
 
-    String agentArgs =
-        argMap.entrySet().stream()
-            .map(e -> propertyNameToSystemPropertyName(e.getKey()) + "=" + e.getValue())
-            .collect(Collectors.joining(","));
-    arguments.add("-javaagent:" + AGENT_JAR + "=" + agentArgs);
-
-    return arguments;
-  }
-
-  /**
-   * Trick to prevent jul Prefs file lock issue on forked processes, in particular in CI which runs
-   * on Linux and have competing processes trying to write to it, including the Gradle daemon.
-   *
-   * <pre>{@code
-   * Couldn't flush user prefs: java.util.prefs.BackingStoreException: Couldn't get file lock.
-   * }</pre>
-   *
-   * Note, some tests can setup arguments on spec level, so {@code prefsDir} will be {@code null}
-   * during {@code @BeforeAll}.
-   */
-  protected String preventJulPrefsFileLock() {
-    Path resolved = prefsDir != null ? prefsDir : tempUserPrefsPath();
-    return "-Djava.util.prefs.userRoot=" + resolved.toAbsolutePath();
-  }
-
-  private static Path tempUserPrefsPath() {
-    String uniqueId =
-        System.currentTimeMillis() + "_" + System.nanoTime() + "_" + Thread.currentThread().getId();
-    return Paths.get(System.getProperty("java.io.tmpdir"), "gradle-test-userPrefs", uniqueId);
-  }
-
-  protected void verifyEventsAndCoverages(
-      String projectName,
-      String toolchain,
-      String toolchainVersion,
-      List<? extends Map<?, ?>> events,
-      List<? extends Map<?, ?>> coverages) {
-    verifyEventsAndCoverages(
-        projectName, toolchain, toolchainVersion, events, coverages, Collections.emptyList());
-  }
-
-  protected void verifyEventsAndCoverages(
-      String projectName,
-      String toolchain,
-      String toolchainVersion,
-      List<? extends Map<?, ?>> events,
-      List<? extends Map<?, ?>> coverages,
-      List<String> additionalDynamicTags) {
-    Map<String, String> additionalReplacements = new HashMap<>();
-    additionalReplacements.put(
-        "content.meta.['test.toolchain']", toolchain + ":" + toolchainVersion);
-
-    if (System.getenv("GENERATE_TEST_FIXTURES") != null) {
-      String baseTemplatesPath;
-      try {
-        baseTemplatesPath =
-            CiVisibilitySmokeTest.class
-                .getClassLoader()
-                .getResource(projectName)
-                .toURI()
-                .getSchemeSpecificPart()
-                .replace("build/resources/test", "src/test/resources");
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-      List<String> dynamicPaths = new ArrayList<>(additionalReplacements.keySet());
-      dynamicPaths.addAll(additionalDynamicTags);
-      CiVisibilityTestUtils.generateTemplates(
-          baseTemplatesPath, events, coverages, dynamicPaths, SMOKE_IGNORED_TAGS);
-    } else {
-      CiVisibilityTestUtils.assertData(
-          projectName,
-          events,
-          coverages,
-          additionalReplacements,
-          SMOKE_IGNORED_TAGS,
-          additionalDynamicTags);
+    protected void verifyEventsAndCoverages(
+            String projectName,
+            String toolchain,
+            String toolchainVersion,
+            List<? extends Map<?, ?>> events,
+            List<? extends Map<?, ?>> coverages) {
+        verifyEventsAndCoverages(projectName, toolchain, toolchainVersion, events, coverages, Collections.emptyList());
     }
-  }
-
-  protected TestFQN test(String suiteName, String testName) {
-    return new TestFQN(suiteName, testName);
-  }
-
-  protected void verifyTestOrder(List<? extends Map<?, ?>> events, List<TestFQN> expectedOrder) {
-    CiVisibilityTestUtils.assertTestsOrder(events, expectedOrder);
-  }
-
-  /**
-   * This is a basic sanity check for telemetry metrics. It only checks that the reported number of
-   * events created and finished is as expected.
-   *
-   * <p>Currently the check is not performed for Gradle builds: Gradle daemon started with Gradle
-   * TestKit outlives the test, so the final telemetry flush happens after the assertions.
-   */
-  protected void verifyTelemetryMetrics(
-      List<Map<String, Object>> receivedTelemetryMetrics,
-      List<Map<String, Object>> receivedTelemetryDistributions,
-      int expectedEventsCount) {
-    int eventsCreated = 0;
-    int eventsFinished = 0;
-    for (Map<String, Object> metric : receivedTelemetryMetrics) {
-      if ("event_created".equals(metric.get("metric"))) {
-        for (Object point : (List<?>) metric.get("points")) {
-          eventsCreated += ((Number) ((List<?>) point).get(1)).intValue();
+
+    protected void verifyEventsAndCoverages(
+            String projectName,
+            String toolchain,
+            String toolchainVersion,
+            List<? extends Map<?, ?>> events,
+            List<? extends Map<?, ?>> coverages,
+            List<String> additionalDynamicTags) {
+        Map<String, String> additionalReplacements = new HashMap<>();
+        additionalReplacements.put("content.meta.['test.toolchain']", toolchain + ":" + toolchainVersion);
+
+        if (System.getenv("GENERATE_TEST_FIXTURES") != null) {
+            String baseTemplatesPath;
+            try {
+                baseTemplatesPath = CiVisibilitySmokeTest.class
+                        .getClassLoader()
+                        .getResource(projectName)
+                        .toURI()
+                        .getSchemeSpecificPart()
+                        .replace("build/resources/test", "src/test/resources");
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            List<String> dynamicPaths = new ArrayList<>(additionalReplacements.keySet());
+            dynamicPaths.addAll(additionalDynamicTags);
+            CiVisibilityTestUtils.generateTemplates(
+                    baseTemplatesPath, events, coverages, dynamicPaths, SMOKE_IGNORED_TAGS);
+        } else {
+            CiVisibilityTestUtils.assertData(
+                    projectName, events, coverages, additionalReplacements, SMOKE_IGNORED_TAGS, additionalDynamicTags);
         }
-      }
-      if ("event_finished".equals(metric.get("metric"))) {
-        for (Object point : (List<?>) metric.get("points")) {
-          eventsFinished += ((Number) ((List<?>) point).get(1)).intValue();
+    }
+
+    protected TestFQN test(String suiteName, String testName) {
+        return new TestFQN(suiteName, testName);
+    }
+
+    protected void verifyTestOrder(List<? extends Map<?, ?>> events, List<TestFQN> expectedOrder) {
+        CiVisibilityTestUtils.assertTestsOrder(events, expectedOrder);
+    }
+
+    /**
+     * This is a basic sanity check for telemetry metrics. It only checks that the reported number of
+     * events created and finished is as expected.
+     *
+     * <p>Currently the check is not performed for Gradle builds: Gradle daemon started with Gradle
+     * TestKit outlives the test, so the final telemetry flush happens after the assertions.
+     */
+    protected void verifyTelemetryMetrics(
+            List<Map<String, Object>> receivedTelemetryMetrics,
+            List<Map<String, Object>> receivedTelemetryDistributions,
+            int expectedEventsCount) {
+        int eventsCreated = 0;
+        int eventsFinished = 0;
+        for (Map<String, Object> metric : receivedTelemetryMetrics) {
+            if ("event_created".equals(metric.get("metric"))) {
+                for (Object point : (List<?>) metric.get("points")) {
+                    eventsCreated += ((Number) ((List<?>) point).get(1)).intValue();
+                }
+            }
+            if ("event_finished".equals(metric.get("metric"))) {
+                for (Object point : (List<?>) metric.get("points")) {
+                    eventsFinished += ((Number) ((List<?>) point).get(1)).intValue();
+                }
+            }
         }
-      }
+        assertEquals(expectedEventsCount, eventsCreated);
+        assertEquals(expectedEventsCount, eventsFinished);
+
+        // an even more basic smoke check for distributions: assert that we received some
+        assertFalse(receivedTelemetryDistributions.isEmpty());
     }
-    assertEquals(expectedEventsCount, eventsCreated);
-    assertEquals(expectedEventsCount, eventsFinished);
-
-    // an even more basic smoke check for distributions: assert that we received some
-    assertFalse(receivedTelemetryDistributions.isEmpty());
-  }
-
-  protected void verifyCoverageReports(
-      String projectName,
-      List<CiVisibilityTestUtils.CoverageReport> reports,
-      Map<String, String> replacements) {
-    CiVisibilityTestUtils.assertData(projectName, reports, replacements);
-  }
-
-  protected static void verifySnapshotLogs(
-      List<Map<String, Object>> receivedLogs, int expectedProbes, int expectedSnapshots) {
-    int logsPerProbe = 3; // 3 probe statuses per probe -> received, installed, emitting
-
-    assertEquals(logsPerProbe * expectedProbes + expectedSnapshots, receivedLogs.size());
-
-    List<Map<String, Object>> probeStatusLogs = new ArrayList<>();
-    List<Map<String, Object>> snapshotLogs = new ArrayList<>();
-    for (Map<String, Object> log : receivedLogs) {
-      if (log.containsKey("message")) {
-        probeStatusLogs.add(log);
-      } else {
-        snapshotLogs.add(log);
-      }
+
+    protected void verifyCoverageReports(
+            String projectName, List<CiVisibilityTestUtils.CoverageReport> reports, Map<String, String> replacements) {
+        CiVisibilityTestUtils.assertData(projectName, reports, replacements);
     }
 
-    verifyProbeStatuses(probeStatusLogs, expectedProbes);
-    verifySnapshots(snapshotLogs, expectedSnapshots);
-  }
-
-  private static void verifyProbeStatuses(List<Map<String, Object>> logs, int expectedCount) {
-    long received =
-        logs.stream()
-            .filter(log -> ((String) log.get("message")).startsWith("Received probe"))
-            .count();
-    long installed =
-        logs.stream()
-            .filter(log -> ((String) log.get("message")).startsWith("Installed probe"))
-            .count();
-    long emitting =
-        logs.stream().filter(log -> ((String) log.get("message")).endsWith("is emitting.")).count();
-    assertEquals(expectedCount, received);
-    assertEquals(expectedCount, installed);
-    assertEquals(expectedCount, emitting);
-  }
-
-  protected static void verifySnapshots(List<Map<String, Object>> logs, int expectedCount) {
-    assertEquals(expectedCount, logs.size());
-
-    List<String> requiredLogFields =
-        Arrays.asList("logger.name", "logger.method", "dd.span_id", "dd.trace_id");
-    List<String> requiredSnapshotFields =
-        Arrays.asList("captures", "exceptionId", "probe", "stack");
-
-    for (Map<String, Object> log : logs) {
-      requiredLogFields.forEach(
-          field -> assertTrue(log.containsKey(field), "log must contain field: " + field));
-
-      @SuppressWarnings("unchecked")
-      Map<String, Object> debuggerMap = (Map<String, Object>) log.get("debugger");
-      @SuppressWarnings("unchecked")
-      Map<String, Object> snapshotContent = (Map<String, Object>) debuggerMap.get("snapshot");
-
-      assertNotNull(snapshotContent, "snapshot must not be null");
-      requiredSnapshotFields.forEach(
-          field ->
-              assertTrue(
-                  snapshotContent.containsKey(field), "snapshot must contain field: " + field));
+    protected static void verifySnapshotLogs(
+            List<Map<String, Object>> receivedLogs, int expectedProbes, int expectedSnapshots) {
+        int logsPerProbe = 3; // 3 probe statuses per probe -> received, installed, emitting
+
+        assertEquals(logsPerProbe * expectedProbes + expectedSnapshots, receivedLogs.size());
+
+        List<Map<String, Object>> probeStatusLogs = new ArrayList<>();
+        List<Map<String, Object>> snapshotLogs = new ArrayList<>();
+        for (Map<String, Object> log : receivedLogs) {
+            if (log.containsKey("message")) {
+                probeStatusLogs.add(log);
+            } else {
+                snapshotLogs.add(log);
+            }
+        }
+
+        verifyProbeStatuses(probeStatusLogs, expectedProbes);
+        verifySnapshots(snapshotLogs, expectedSnapshots);
+    }
+
+    private static void verifyProbeStatuses(List<Map<String, Object>> logs, int expectedCount) {
+        long received = logs.stream()
+                .filter(log -> ((String) log.get("message")).startsWith("Received probe"))
+                .count();
+        long installed = logs.stream()
+                .filter(log -> ((String) log.get("message")).startsWith("Installed probe"))
+                .count();
+        long emitting = logs.stream()
+                .filter(log -> ((String) log.get("message")).endsWith("is emitting."))
+                .count();
+        assertEquals(expectedCount, received);
+        assertEquals(expectedCount, installed);
+        assertEquals(expectedCount, emitting);
+    }
+
+    protected static void verifySnapshots(List<Map<String, Object>> logs, int expectedCount) {
+        assertEquals(expectedCount, logs.size());
+
+        List<String> requiredLogFields = Arrays.asList("logger.name", "logger.method", "dd.span_id", "dd.trace_id");
+        List<String> requiredSnapshotFields = Arrays.asList("captures", "exceptionId", "probe", "stack");
+
+        for (Map<String, Object> log : logs) {
+            requiredLogFields.forEach(field -> assertTrue(log.containsKey(field), "log must contain field: " + field));
+
+            @SuppressWarnings("unchecked")
+            Map<String, Object> debuggerMap = (Map<String, Object>) log.get("debugger");
+            @SuppressWarnings("unchecked")
+            Map<String, Object> snapshotContent = (Map<String, Object>) debuggerMap.get("snapshot");
+
+            assertNotNull(snapshotContent, "snapshot must not be null");
+            requiredSnapshotFields.forEach(
+                    field -> assertTrue(snapshotContent.containsKey(field), "snapshot must contain field: " + field));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilityTableTestConverters.java b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilityTableTestConverters.java
index d4a1bfc567c..ad1b713e5d5 100644
--- a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilityTableTestConverters.java
+++ b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilityTableTestConverters.java
@@ -6,12 +6,12 @@
 /** Shared {@code @TableTest} converters for CiVisibility smoke tests. */
 public final class CiVisibilityTableTestConverters {
 
-  private CiVisibilityTableTestConverters() {}
+    private CiVisibilityTableTestConverters() {}
 
-  /** Parses a {@code suite:name} string into a {@link TestFQN}. */
-  @TypeConverter
-  public static TestFQN toTestFQN(String value) {
-    int colon = value.indexOf(':');
-    return new TestFQN(value.substring(0, colon), value.substring(colon + 1));
-  }
+    /** Parses a {@code suite:name} string into a {@link TestFQN}. */
+    @TypeConverter
+    public static TestFQN toTestFQN(String value) {
+        int colon = value.indexOf(':');
+        return new TestFQN(value.substring(0, colon), value.substring(colon + 1));
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilityTestUtils.java b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilityTestUtils.java
index fb9ff951a88..4238c956846 100644
--- a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilityTestUtils.java
+++ b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilityTestUtils.java
@@ -46,501 +46,474 @@
 
 public abstract class CiVisibilityTestUtils {
 
-  public static final List<DynamicPath> EVENT_DYNAMIC_PATHS =
-      Collections.unmodifiableList(
-          Arrays.asList(
-              path("content.trace_id"),
-              path("content.span_id"),
-              path("content.parent_id"),
-              path("content.test_session_id"),
-              path("content.test_module_id"),
-              path("content.test_suite_id"),
-              path("content.metrics.process_id"),
-              path("content.meta.['os.architecture']"),
-              path("content.meta.['os.platform']"),
-              path("content.meta.['os.version']"),
-              path("content.meta.['runtime.name']"),
-              path("content.meta.['runtime.vendor']"),
-              path("content.meta.['runtime.version']"),
-              path("content.meta.['ci.workspace_path']"),
-              path("content.meta.['error.message']"),
-              path("content.meta.library_version"),
-              path("content.meta.runtime-id"),
-              path("content.meta.['_dd.tracer_host']"),
-              // Different events might or might not have the same start or duration. Regardless,
-              // the values of these fields should be treated as different.
-              path("content.start", false),
-              path("content.duration", false),
-              path("content.metrics.['_dd.host.vcpu_count']", false),
-              path("content.meta.['_dd.p.tid']", false),
-              path("content.meta.['error.stack']", false)));
-
-  // ignored tags on assertion and fixture build
-  public static final List<String> IGNORED_TAGS;
-
-  static {
-    List<String> ignored =
-        Arrays.stream(LibraryCapability.values())
-            .map(c -> "content.meta.['" + c.asTag() + "']")
-            .collect(Collectors.toList());
-    ignored.add("content.meta.['_dd.integration']");
-    ignored.add("content.meta.['_dd.svc_src']");
-    IGNORED_TAGS = Collections.unmodifiableList(ignored);
-  }
-
-  public static final List<DynamicPath> COVERAGE_DYNAMIC_PATHS =
-      Collections.unmodifiableList(
-          Arrays.asList(path("test_session_id"), path("test_suite_id"), path("span_id")));
-
-  private static final Comparator<Map<?, ?>> EVENT_RESOURCE_COMPARATOR =
-      Comparator.<Map<?, ?>, String>comparing(
-              m -> {
-                Map<?, ?> content = (Map<?, ?>) m.get("content");
-                return (String) content.get("resource");
-              })
-          .thenComparing(
-              Comparator.<Map<?, ?>, String>comparing(
-                      // module and session have the same resource name in headless mode
-                      m -> (String) m.get("type"))
-                  .reversed());
-
-  /** Use this method to generate expected data templates. */
-  public static void generateTemplates(
-      String baseTemplatesPath,
-      List<? extends Map<?, ?>> events,
-      List<? extends Map<?, ?>> coverages,
-      Collection<String> additionalDynamicPaths) {
-    generateTemplates(
-        baseTemplatesPath, events, coverages, additionalDynamicPaths, Collections.emptyList());
-  }
-
-  public static void generateTemplates(
-      String baseTemplatesPath,
-      List<? extends Map<?, ?>> events,
-      List<? extends Map<?, ?>> coverages,
-      Collection<String> additionalDynamicPaths,
-      List<String> ignoredTags) {
-    List<Map<?, ?>> mutableEvents = new ArrayList<>(events);
-    if (!ignoredTags.isEmpty()) {
-      mutableEvents = removeTags(mutableEvents, ignoredTags);
+    public static final List<DynamicPath> EVENT_DYNAMIC_PATHS = Collections.unmodifiableList(Arrays.asList(
+            path("content.trace_id"),
+            path("content.span_id"),
+            path("content.parent_id"),
+            path("content.test_session_id"),
+            path("content.test_module_id"),
+            path("content.test_suite_id"),
+            path("content.metrics.process_id"),
+            path("content.meta.['os.architecture']"),
+            path("content.meta.['os.platform']"),
+            path("content.meta.['os.version']"),
+            path("content.meta.['runtime.name']"),
+            path("content.meta.['runtime.vendor']"),
+            path("content.meta.['runtime.version']"),
+            path("content.meta.['ci.workspace_path']"),
+            path("content.meta.['error.message']"),
+            path("content.meta.library_version"),
+            path("content.meta.runtime-id"),
+            path("content.meta.['_dd.tracer_host']"),
+            // Different events might or might not have the same start or duration. Regardless,
+            // the values of these fields should be treated as different.
+            path("content.start", false),
+            path("content.duration", false),
+            path("content.metrics.['_dd.host.vcpu_count']", false),
+            path("content.meta.['_dd.p.tid']", false),
+            path("content.meta.['error.stack']", false)));
+
+    // ignored tags on assertion and fixture build
+    public static final List<String> IGNORED_TAGS;
+
+    static {
+        List<String> ignored = Arrays.stream(LibraryCapability.values())
+                .map(c -> "content.meta.['" + c.asTag() + "']")
+                .collect(Collectors.toList());
+        ignored.add("content.meta.['_dd.integration']");
+        ignored.add("content.meta.['_dd.svc_src']");
+        IGNORED_TAGS = Collections.unmodifiableList(ignored);
     }
-    mutableEvents.sort(EVENT_RESOURCE_COMPARATOR);
-
-    TemplateGenerator templateGenerator = new TemplateGenerator(new LabelGenerator());
-    List<DynamicPath> compiledAdditionalReplacements = compile(additionalDynamicPaths);
-
-    try {
-      Files.createDirectories(Paths.get(baseTemplatesPath));
-      List<DynamicPath> eventPaths = new ArrayList<>(EVENT_DYNAMIC_PATHS);
-      eventPaths.addAll(compiledAdditionalReplacements);
-      Files.write(
-          Paths.get(baseTemplatesPath, "events.ftl"),
-          templateGenerator
-              .generateTemplate(mutableEvents, eventPaths)
-              .getBytes(StandardCharsets.UTF_8));
-
-      List<DynamicPath> coveragePaths = new ArrayList<>(COVERAGE_DYNAMIC_PATHS);
-      coveragePaths.addAll(compiledAdditionalReplacements);
-      Files.write(
-          Paths.get(baseTemplatesPath, "coverages.ftl"),
-          templateGenerator
-              .generateTemplate(coverages, coveragePaths)
-              .getBytes(StandardCharsets.UTF_8));
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  public static void assertData(
-      String baseTemplatesPath, List<CoverageReport> reports, Map<String, ?> replacements) {
-    try {
-      String expectedReportEvent =
-          getFreemarkerTemplate(baseTemplatesPath + "/coverage_report_event.ftl", replacements);
-      String actualReportEvent = JSON_MAPPER.writeValueAsString(reports.get(0).event);
-
-      compareJson(expectedReportEvent, actualReportEvent);
-
-      String expectedReport =
-          getFreemarkerTemplate(baseTemplatesPath + "/coverage_report.ftl", replacements);
-      String actualReport = reports.get(0).report;
-
-      if (expectedReport.contains("<?xml")) {
-        compareXml(expectedReport, actualReport);
-      } else {
-        Assertions.assertEquals(expectedReport, actualReport);
-      }
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private static void compareXml(String expectedXml, String actualXml) throws Exception {
-    DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-    dbf.setValidating(false);
-    dbf.setFeature("http://xml.org/sax/features/validation", false);
-    dbf.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false);
-    dbf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
-
-    Document expected = Convert.toDocument(Input.fromString(expectedXml).build(), dbf);
-    Document actual = Convert.toDocument(Input.fromString(actualXml).build(), dbf);
-
-    Diff diff =
-        DiffBuilder.compare(Input.fromDocument(actual))
-            .withTest(Input.fromDocument(expected))
-            .ignoreComments()
-            .ignoreWhitespace()
-            .checkForSimilar()
-            .build();
-
-    if (diff.hasDifferences()) {
-      throw new AssertionError("XML mismatch: " + diff.toString());
+
+    public static final List<DynamicPath> COVERAGE_DYNAMIC_PATHS = Collections.unmodifiableList(
+            Arrays.asList(path("test_session_id"), path("test_suite_id"), path("span_id")));
+
+    private static final Comparator<Map<?, ?>> EVENT_RESOURCE_COMPARATOR = Comparator.<Map<?, ?>, String>comparing(
+                    m -> {
+                        Map<?, ?> content = (Map<?, ?>) m.get("content");
+                        return (String) content.get("resource");
+                    })
+            .thenComparing(Comparator.<Map<?, ?>, String>comparing(
+                            // module and session have the same resource name in headless mode
+                            m -> (String) m.get("type"))
+                    .reversed());
+
+    /** Use this method to generate expected data templates. */
+    public static void generateTemplates(
+            String baseTemplatesPath,
+            List<? extends Map<?, ?>> events,
+            List<? extends Map<?, ?>> coverages,
+            Collection<String> additionalDynamicPaths) {
+        generateTemplates(baseTemplatesPath, events, coverages, additionalDynamicPaths, Collections.emptyList());
     }
-  }
-
-  public static Map<String, String> assertData(
-      String baseTemplatesPath,
-      List<? extends Map<?, ?>> events,
-      List<? extends Map<?, ?>> coverages,
-      Map<String, ?> additionalReplacements,
-      List<String> ignoredTags) {
-    return assertData(
-        baseTemplatesPath,
-        events,
-        coverages,
-        additionalReplacements,
-        ignoredTags,
-        Collections.emptyList());
-  }
-
-  public static Map<String, String> assertData(
-      String baseTemplatesPath,
-      List<? extends Map<?, ?>> events,
-      List<? extends Map<?, ?>> coverages,
-      Map<String, ?> additionalReplacements,
-      List<String> ignoredTags,
-      List<String> additionalDynamicPaths) {
-    List<Map<?, ?>> mutableEvents = new ArrayList<>(events);
-    mutableEvents.sort(EVENT_RESOURCE_COMPARATOR);
-
-    LabelGenerator labelGenerator = new LabelGenerator();
-    TemplateGenerator templateGenerator = new TemplateGenerator(labelGenerator);
-
-    List<DynamicPath> eventPaths = new ArrayList<>(EVENT_DYNAMIC_PATHS);
-    eventPaths.addAll(compile(additionalDynamicPaths));
-    templateGenerator.generateReplacementMap(mutableEvents, eventPaths);
-    Map<String, String> replacementMap =
-        templateGenerator.generateReplacementMap(coverages, COVERAGE_DYNAMIC_PATHS);
-
-    // Tolerate Groovy callers passing GString values: convert each value to String via
-    // String.valueOf before storing it in the replacement map.
-    for (Map.Entry<String, ?> e : additionalReplacements.entrySet()) {
-      replacementMap.put(
-          labelGenerator.forKey(e.getKey()), "\"" + String.valueOf(e.getValue()) + "\"");
+
+    public static void generateTemplates(
+            String baseTemplatesPath,
+            List<? extends Map<?, ?>> events,
+            List<? extends Map<?, ?>> coverages,
+            Collection<String> additionalDynamicPaths,
+            List<String> ignoredTags) {
+        List<Map<?, ?>> mutableEvents = new ArrayList<>(events);
+        if (!ignoredTags.isEmpty()) {
+            mutableEvents = removeTags(mutableEvents, ignoredTags);
+        }
+        mutableEvents.sort(EVENT_RESOURCE_COMPARATOR);
+
+        TemplateGenerator templateGenerator = new TemplateGenerator(new LabelGenerator());
+        List<DynamicPath> compiledAdditionalReplacements = compile(additionalDynamicPaths);
+
+        try {
+            Files.createDirectories(Paths.get(baseTemplatesPath));
+            List<DynamicPath> eventPaths = new ArrayList<>(EVENT_DYNAMIC_PATHS);
+            eventPaths.addAll(compiledAdditionalReplacements);
+            Files.write(
+                    Paths.get(baseTemplatesPath, "events.ftl"),
+                    templateGenerator
+                            .generateTemplate(mutableEvents, eventPaths)
+                            .getBytes(StandardCharsets.UTF_8));
+
+            List<DynamicPath> coveragePaths = new ArrayList<>(COVERAGE_DYNAMIC_PATHS);
+            coveragePaths.addAll(compiledAdditionalReplacements);
+            Files.write(
+                    Paths.get(baseTemplatesPath, "coverages.ftl"),
+                    templateGenerator.generateTemplate(coverages, coveragePaths).getBytes(StandardCharsets.UTF_8));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    // ignore provided tags
-    mutableEvents = removeTags(mutableEvents, ignoredTags);
+    public static void assertData(String baseTemplatesPath, List<CoverageReport> reports, Map<String, ?> replacements) {
+        try {
+            String expectedReportEvent =
+                    getFreemarkerTemplate(baseTemplatesPath + "/coverage_report_event.ftl", replacements);
+            String actualReportEvent = JSON_MAPPER.writeValueAsString(reports.get(0).event);
 
-    try {
-      String expectedEvents =
-          getFreemarkerTemplate(baseTemplatesPath + "/events.ftl", replacementMap, mutableEvents);
-      String actualEvents = JSON_MAPPER.writeValueAsString(mutableEvents);
+            compareJson(expectedReportEvent, actualReportEvent);
 
-      compareJson(expectedEvents, actualEvents);
+            String expectedReport = getFreemarkerTemplate(baseTemplatesPath + "/coverage_report.ftl", replacements);
+            String actualReport = reports.get(0).report;
 
-      String expectedCoverages =
-          getFreemarkerTemplate(baseTemplatesPath + "/coverages.ftl", replacementMap, coverages);
-      String actualCoverages = JSON_MAPPER.writeValueAsString(coverages);
-      compareJson(expectedCoverages, actualCoverages);
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+            if (expectedReport.contains("<?xml")) {
+                compareXml(expectedReport, actualReport);
+            } else {
+                Assertions.assertEquals(expectedReport, actualReport);
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    return replacementMap;
-  }
-
-  private static void compareJson(String expectedJson, String actualJson) {
-    Map<String, String> environment = System.getenv();
-    boolean ciRun =
-        environment.get("GITHUB_ACTION") != null || environment.get("GITLAB_CI") != null;
-    JSONCompareMode comparisonMode =
-        ciRun ? JSONCompareMode.LENIENT : JSONCompareMode.NON_EXTENSIBLE;
-
-    try {
-      JSONAssert.assertEquals(expectedJson, actualJson, comparisonMode);
-    } catch (org.json.JSONException jsonException) {
-      throw new RuntimeException(jsonException);
-    } catch (AssertionError e) {
-      if (ciRun) {
-        // When running in CI the assertion error message does not contain the actual diff,
-        // so we print the events to the console to help debug the issue.
-        System.out.println("Expected JSON: " + expectedJson);
-        System.out.println("Actual JSON: " + actualJson);
-      }
-      throw new AssertionFailedError(
-          "Expected and actual JSON mismatch", expectedJson, actualJson, e);
+    private static void compareXml(String expectedXml, String actualXml) throws Exception {
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setValidating(false);
+        dbf.setFeature("http://xml.org/sax/features/validation", false);
+        dbf.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false);
+        dbf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+
+        Document expected = Convert.toDocument(Input.fromString(expectedXml).build(), dbf);
+        Document actual = Convert.toDocument(Input.fromString(actualXml).build(), dbf);
+
+        Diff diff = DiffBuilder.compare(Input.fromDocument(actual))
+                .withTest(Input.fromDocument(expected))
+                .ignoreComments()
+                .ignoreWhitespace()
+                .checkForSimilar()
+                .build();
+
+        if (diff.hasDifferences()) {
+            throw new AssertionError("XML mismatch: " + diff.toString());
+        }
     }
-  }
 
-  public static boolean assertTestsOrder(
-      List<? extends Map<?, ?>> events, List<TestFQN> expectedOrder) {
-    List<TestFQN> identifiers = getTestIdentifiers(events);
-    if (!identifiers.equals(expectedOrder)) {
-      throw new AssertionError("Expected order: " + expectedOrder + ", but got: " + identifiers);
-    }
-    return true;
-  }
-
-  public static List<TestFQN> getTestIdentifiers(List<? extends Map<?, ?>> events) {
-    List<Map<?, ?>> sorted = new ArrayList<>(events);
-    sorted.sort(
-        Comparator.comparing(
-            it -> ((Number) ((Map<?, ?>) it.get("content")).get("start")).longValue()));
-    List<TestFQN> testIdentifiers = new ArrayList<>();
-    for (Map<?, ?> event : sorted) {
-      Map<?, ?> content = (Map<?, ?>) event.get("content");
-      Map<?, ?> meta = (Map<?, ?>) content.get("meta");
-      Object testName = meta.get("test.name");
-      if (testName != null) {
-        testIdentifiers.add(new TestFQN((String) meta.get("test.suite"), (String) testName));
-      }
-    }
-    return testIdentifiers;
-  }
-
-  public static List<Map<?, ?>> removeTags(List<? extends Map<?, ?>> events, List<String> tags) {
-    List<Map<?, ?>> filteredEvents = new ArrayList<>();
-    for (Map<?, ?> event : events) {
-      DocumentContext ctx = JsonPath.parse(event, JSON_PATH_CONFIG);
-      for (String tag : tags) {
-        ctx.delete(path(tag).path);
-      }
-      filteredEvents.add(ctx.json());
+    public static Map<String, String> assertData(
+            String baseTemplatesPath,
+            List<? extends Map<?, ?>> events,
+            List<? extends Map<?, ?>> coverages,
+            Map<String, ?> additionalReplacements,
+            List<String> ignoredTags) {
+        return assertData(
+                baseTemplatesPath, events, coverages, additionalReplacements, ignoredTags, Collections.emptyList());
     }
-    return filteredEvents;
-  }
 
-  // Sort traces in the following order: TEST -> SUITE -> MODULE -> SESSION
-  public static class SortTracesByType implements Comparator<List<DDSpan>>, Serializable {
-    private static final long serialVersionUID = 1L;
+    public static Map<String, String> assertData(
+            String baseTemplatesPath,
+            List<? extends Map<?, ?>> events,
+            List<? extends Map<?, ?>> coverages,
+            Map<String, ?> additionalReplacements,
+            List<String> ignoredTags,
+            List<String> additionalDynamicPaths) {
+        List<Map<?, ?>> mutableEvents = new ArrayList<>(events);
+        mutableEvents.sort(EVENT_RESOURCE_COMPARATOR);
+
+        LabelGenerator labelGenerator = new LabelGenerator();
+        TemplateGenerator templateGenerator = new TemplateGenerator(labelGenerator);
+
+        List<DynamicPath> eventPaths = new ArrayList<>(EVENT_DYNAMIC_PATHS);
+        eventPaths.addAll(compile(additionalDynamicPaths));
+        templateGenerator.generateReplacementMap(mutableEvents, eventPaths);
+        Map<String, String> replacementMap =
+                templateGenerator.generateReplacementMap(coverages, COVERAGE_DYNAMIC_PATHS);
+
+        // Tolerate Groovy callers passing GString values: convert each value to String via
+        // String.valueOf before storing it in the replacement map.
+        for (Map.Entry<String, ?> e : additionalReplacements.entrySet()) {
+            replacementMap.put(labelGenerator.forKey(e.getKey()), "\"" + String.valueOf(e.getValue()) + "\"");
+        }
+
+        // ignore provided tags
+        mutableEvents = removeTags(mutableEvents, ignoredTags);
+
+        try {
+            String expectedEvents =
+                    getFreemarkerTemplate(baseTemplatesPath + "/events.ftl", replacementMap, mutableEvents);
+            String actualEvents = JSON_MAPPER.writeValueAsString(mutableEvents);
+
+            compareJson(expectedEvents, actualEvents);
 
-    @Override
-    public int compare(List<DDSpan> o1, List<DDSpan> o2) {
-      return Integer.compare(rootSpanTypeToVal(o1), rootSpanTypeToVal(o2));
+            String expectedCoverages =
+                    getFreemarkerTemplate(baseTemplatesPath + "/coverages.ftl", replacementMap, coverages);
+            String actualCoverages = JSON_MAPPER.writeValueAsString(coverages);
+            compareJson(expectedCoverages, actualCoverages);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return replacementMap;
+    }
+
+    private static void compareJson(String expectedJson, String actualJson) {
+        Map<String, String> environment = System.getenv();
+        boolean ciRun = environment.get("GITHUB_ACTION") != null || environment.get("GITLAB_CI") != null;
+        JSONCompareMode comparisonMode = ciRun ? JSONCompareMode.LENIENT : JSONCompareMode.NON_EXTENSIBLE;
+
+        try {
+            JSONAssert.assertEquals(expectedJson, actualJson, comparisonMode);
+        } catch (org.json.JSONException jsonException) {
+            throw new RuntimeException(jsonException);
+        } catch (AssertionError e) {
+            if (ciRun) {
+                // When running in CI the assertion error message does not contain the actual diff,
+                // so we print the events to the console to help debug the issue.
+                System.out.println("Expected JSON: " + expectedJson);
+                System.out.println("Actual JSON: " + actualJson);
+            }
+            throw new AssertionFailedError("Expected and actual JSON mismatch", expectedJson, actualJson, e);
+        }
     }
 
-    public int rootSpanTypeToVal(List<DDSpan> trace) {
-      assert !trace.isEmpty();
-      CharSequence spanType = trace.get(0).getSpanType();
-      if (spanType == null) {
-        return 4;
-      }
-      if (DDSpanTypes.TEST.contentEquals(spanType)) {
-        return 0;
-      }
-      if (DDSpanTypes.TEST_SUITE_END.contentEquals(spanType)) {
-        return 1;
-      }
-      if (DDSpanTypes.TEST_MODULE_END.contentEquals(spanType)) {
-        return 2;
-      }
-      if (DDSpanTypes.TEST_SESSION_END.contentEquals(spanType)) {
-        return 3;
-      }
-      return 4;
+    public static boolean assertTestsOrder(List<? extends Map<?, ?>> events, List<TestFQN> expectedOrder) {
+        List<TestFQN> identifiers = getTestIdentifiers(events);
+        if (!identifiers.equals(expectedOrder)) {
+            throw new AssertionError("Expected order: " + expectedOrder + ", but got: " + identifiers);
+        }
+        return true;
     }
-  }
 
-  public static final Configuration JSON_PATH_CONFIG =
-      Configuration.builder().options(Option.SUPPRESS_EXCEPTIONS).build();
+    public static List<TestFQN> getTestIdentifiers(List<? extends Map<?, ?>> events) {
+        List<Map<?, ?>> sorted = new ArrayList<>(events);
+        sorted.sort(Comparator.comparing(it -> ((Number) ((Map<?, ?>) it.get("content")).get("start")).longValue()));
+        List<TestFQN> testIdentifiers = new ArrayList<>();
+        for (Map<?, ?> event : sorted) {
+            Map<?, ?> content = (Map<?, ?>) event.get("content");
+            Map<?, ?> meta = (Map<?, ?>) content.get("meta");
+            Object testName = meta.get("test.name");
+            if (testName != null) {
+                testIdentifiers.add(new TestFQN((String) meta.get("test.suite"), (String) testName));
+            }
+        }
+        return testIdentifiers;
+    }
 
-  public static final ObjectMapper JSON_MAPPER = createJsonMapper();
+    public static List<Map<?, ?>> removeTags(List<? extends Map<?, ?>> events, List<String> tags) {
+        List<Map<?, ?>> filteredEvents = new ArrayList<>();
+        for (Map<?, ?> event : events) {
+            DocumentContext ctx = JsonPath.parse(event, JSON_PATH_CONFIG);
+            for (String tag : tags) {
+                ctx.delete(path(tag).path);
+            }
+            filteredEvents.add(ctx.json());
+        }
+        return filteredEvents;
+    }
 
-  private static ObjectMapper createJsonMapper() {
-    ObjectMapper mapper = new ObjectMapper();
-    mapper.enable(SerializationFeature.INDENT_OUTPUT);
-    mapper.enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS);
-    return mapper;
-  }
+    // Sort traces in the following order: TEST -> SUITE -> MODULE -> SESSION
+    public static class SortTracesByType implements Comparator<List<DDSpan>>, Serializable {
+        private static final long serialVersionUID = 1L;
 
-  public static final TemplateExceptionHandler SUPPRESS_EXCEPTION_HANDLER =
-      new TemplateExceptionHandler() {
         @Override
-        public void handleTemplateException(
-            TemplateException e, Environment environment, Writer writer) throws TemplateException {
-          if (e instanceof InvalidReferenceException) {
-            try {
-              writer.write("\"<VALUE_MISSING>\"");
-            } catch (java.io.IOException ioe) {
-              throw new TemplateException(ioe, environment);
+        public int compare(List<DDSpan> o1, List<DDSpan> o2) {
+            return Integer.compare(rootSpanTypeToVal(o1), rootSpanTypeToVal(o2));
+        }
+
+        public int rootSpanTypeToVal(List<DDSpan> trace) {
+            assert !trace.isEmpty();
+            CharSequence spanType = trace.get(0).getSpanType();
+            if (spanType == null) {
+                return 4;
+            }
+            if (DDSpanTypes.TEST.contentEquals(spanType)) {
+                return 0;
             }
-          } else {
-            throw e;
-          }
+            if (DDSpanTypes.TEST_SUITE_END.contentEquals(spanType)) {
+                return 1;
+            }
+            if (DDSpanTypes.TEST_MODULE_END.contentEquals(spanType)) {
+                return 2;
+            }
+            if (DDSpanTypes.TEST_SESSION_END.contentEquals(spanType)) {
+                return 3;
+            }
+            return 4;
         }
-      };
-
-  public static final freemarker.template.Configuration FREEMARKER = createFreemarker();
-
-  private static freemarker.template.Configuration createFreemarker() {
-    freemarker.template.Configuration config =
-        new freemarker.template.Configuration(freemarker.template.Configuration.VERSION_2_3_30);
-    config.setClassLoaderForTemplateLoading(CiVisibilityTestUtils.class.getClassLoader(), "");
-    config.setDefaultEncoding("UTF-8");
-    config.setTemplateExceptionHandler(SUPPRESS_EXCEPTION_HANDLER);
-    config.setLogTemplateExceptions(false);
-    config.setWrapUncheckedExceptions(true);
-    config.setFallbackOnNullLoopVariable(false);
-    config.setNumberFormat("0.######");
-    return config;
-  }
-
-  public static String getFreemarkerTemplate(String templatePath, Map<String, ?> replacements) {
-    return getFreemarkerTemplate(templatePath, replacements, Collections.emptyList());
-  }
-
-  public static String getFreemarkerTemplate(
-      String templatePath,
-      Map<String, ?> replacements,
-      List<? extends Map<?, ?>> replacementsSource) {
-    try {
-      Template template = FREEMARKER.getTemplate(templatePath);
-      StringWriter out = new StringWriter();
-      template.process(replacements, out);
-      return out.toString();
-    } catch (Exception e) {
-      throw new RuntimeException(
-          "Could not get Freemarker template "
-              + templatePath
-              + "; replacements map: "
-              + replacements
-              + "; replacements source: "
-              + replacementsSource,
-          e);
     }
-  }
 
-  private static final class TemplateGenerator {
-    private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("\"(\\$\\{.*?\\})\"");
+    public static final Configuration JSON_PATH_CONFIG =
+            Configuration.builder().options(Option.SUPPRESS_EXCEPTIONS).build();
 
-    private final Map<String, String> uniqueValues = new HashMap<>();
-    private final Map<String, String> nonUniqueValues = new HashMap<>();
-    private final LabelGenerator label;
+    public static final ObjectMapper JSON_MAPPER = createJsonMapper();
 
-    TemplateGenerator(LabelGenerator label) {
-      this.label = label;
+    private static ObjectMapper createJsonMapper() {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.enable(SerializationFeature.INDENT_OUTPUT);
+        mapper.enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS);
+        return mapper;
     }
 
-    String generateTemplate(Collection<? extends Map<?, ?>> objects, List<DynamicPath> dynamicPaths)
-        throws Exception {
-      for (Map<?, ?> object : objects) {
-        DocumentContext ctx = JsonPath.parse(object, JSON_PATH_CONFIG);
-        for (DynamicPath dynamicPath : dynamicPaths) {
-          ctx.map(
-              dynamicPath.path,
-              (currentValue, config) -> {
-                if (dynamicPath.unique) {
-                  return uniqueValues.computeIfAbsent(
-                      String.valueOf(currentValue), k -> label.forTemplateKey(dynamicPath.rawPath));
+    public static final TemplateExceptionHandler SUPPRESS_EXCEPTION_HANDLER = new TemplateExceptionHandler() {
+        @Override
+        public void handleTemplateException(TemplateException e, Environment environment, Writer writer)
+                throws TemplateException {
+            if (e instanceof InvalidReferenceException) {
+                try {
+                    writer.write("\"<VALUE_MISSING>\"");
+                } catch (java.io.IOException ioe) {
+                    throw new TemplateException(ioe, environment);
                 }
-                return label.forTemplateKey(dynamicPath.rawPath);
-              });
+            } else {
+                throw e;
+            }
         }
-      }
-      // remove quotes around placeholders
-      return PLACEHOLDER_PATTERN.matcher(JSON_MAPPER.writeValueAsString(objects)).replaceAll("$1");
+    };
+
+    public static final freemarker.template.Configuration FREEMARKER = createFreemarker();
+
+    private static freemarker.template.Configuration createFreemarker() {
+        freemarker.template.Configuration config =
+                new freemarker.template.Configuration(freemarker.template.Configuration.VERSION_2_3_30);
+        config.setClassLoaderForTemplateLoading(CiVisibilityTestUtils.class.getClassLoader(), "");
+        config.setDefaultEncoding("UTF-8");
+        config.setTemplateExceptionHandler(SUPPRESS_EXCEPTION_HANDLER);
+        config.setLogTemplateExceptions(false);
+        config.setWrapUncheckedExceptions(true);
+        config.setFallbackOnNullLoopVariable(false);
+        config.setNumberFormat("0.######");
+        return config;
     }
 
-    Map<String, String> generateReplacementMap(
-        Collection<? extends Map<?, ?>> objects, List<DynamicPath> dynamicPaths) {
-      for (Map<?, ?> object : objects) {
-        ReadContext ctx = JsonPath.parse(object, JSON_PATH_CONFIG);
-        for (DynamicPath dynamicPath : dynamicPaths) {
-          Object value = ctx.read(dynamicPath.path);
-          if (value != null) {
-            String stringValue;
-            if (value instanceof String) {
-              stringValue = "\"" + ((String) value).replace("\"", "\\\"") + "\"";
-            } else {
-              stringValue = String.valueOf(value);
+    public static String getFreemarkerTemplate(String templatePath, Map<String, ?> replacements) {
+        return getFreemarkerTemplate(templatePath, replacements, Collections.emptyList());
+    }
+
+    public static String getFreemarkerTemplate(
+            String templatePath, Map<String, ?> replacements, List<? extends Map<?, ?>> replacementsSource) {
+        try {
+            Template template = FREEMARKER.getTemplate(templatePath);
+            StringWriter out = new StringWriter();
+            template.process(replacements, out);
+            return out.toString();
+        } catch (Exception e) {
+            throw new RuntimeException(
+                    "Could not get Freemarker template "
+                            + templatePath
+                            + "; replacements map: "
+                            + replacements
+                            + "; replacements source: "
+                            + replacementsSource,
+                    e);
+        }
+    }
+
+    private static final class TemplateGenerator {
+        private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("\"(\\$\\{.*?\\})\"");
+
+        private final Map<String, String> uniqueValues = new HashMap<>();
+        private final Map<String, String> nonUniqueValues = new HashMap<>();
+        private final LabelGenerator label;
+
+        TemplateGenerator(LabelGenerator label) {
+            this.label = label;
+        }
+
+        String generateTemplate(Collection<? extends Map<?, ?>> objects, List<DynamicPath> dynamicPaths)
+                throws Exception {
+            for (Map<?, ?> object : objects) {
+                DocumentContext ctx = JsonPath.parse(object, JSON_PATH_CONFIG);
+                for (DynamicPath dynamicPath : dynamicPaths) {
+                    ctx.map(dynamicPath.path, (currentValue, config) -> {
+                        if (dynamicPath.unique) {
+                            return uniqueValues.computeIfAbsent(
+                                    String.valueOf(currentValue), k -> label.forTemplateKey(dynamicPath.rawPath));
+                        }
+                        return label.forTemplateKey(dynamicPath.rawPath);
+                    });
+                }
             }
-            if (dynamicPath.unique) {
-              uniqueValues.computeIfAbsent(stringValue, k -> label.forKey(dynamicPath.rawPath));
-            } else {
-              nonUniqueValues.put(label.forKey(dynamicPath.rawPath), stringValue);
+            // remove quotes around placeholders
+            return PLACEHOLDER_PATTERN
+                    .matcher(JSON_MAPPER.writeValueAsString(objects))
+                    .replaceAll("$1");
+        }
+
+        Map<String, String> generateReplacementMap(
+                Collection<? extends Map<?, ?>> objects, List<DynamicPath> dynamicPaths) {
+            for (Map<?, ?> object : objects) {
+                ReadContext ctx = JsonPath.parse(object, JSON_PATH_CONFIG);
+                for (DynamicPath dynamicPath : dynamicPaths) {
+                    Object value = ctx.read(dynamicPath.path);
+                    if (value != null) {
+                        String stringValue;
+                        if (value instanceof String) {
+                            stringValue = "\"" + ((String) value).replace("\"", "\\\"") + "\"";
+                        } else {
+                            stringValue = String.valueOf(value);
+                        }
+                        if (dynamicPath.unique) {
+                            uniqueValues.computeIfAbsent(stringValue, k -> label.forKey(dynamicPath.rawPath));
+                        } else {
+                            nonUniqueValues.put(label.forKey(dynamicPath.rawPath), stringValue);
+                        }
+                    }
+                }
             }
-          }
+            Map<String, String> result = new LinkedHashMap<>(invert(uniqueValues));
+            result.putAll(nonUniqueValues);
+            return result;
         }
-      }
-      Map<String, String> result = new LinkedHashMap<>(invert(uniqueValues));
-      result.putAll(nonUniqueValues);
-      return result;
     }
-  }
 
-  private static final class LabelGenerator {
-    private static final Pattern ERASED_CHARS = Pattern.compile("[\\[\\]']");
-    private static final Pattern REPLACED_CHARS = Pattern.compile("[.-]");
+    private static final class LabelGenerator {
+        private static final Pattern ERASED_CHARS = Pattern.compile("[\\[\\]']");
+        private static final Pattern REPLACED_CHARS = Pattern.compile("[.-]");
+
+        private final Map<String, Integer> usageCounters = new HashMap<>();
 
-    private final Map<String, Integer> usageCounters = new HashMap<>();
+        String forTemplateKey(String key) {
+            return "${" + forKey(key) + "}";
+        }
 
-    String forTemplateKey(String key) {
-      return "${" + forKey(key) + "}";
+        String forKey(String key) {
+            int usages = usageCounters.merge(key, 1, Integer::sum);
+            String sanitizedKey = ERASED_CHARS.matcher(key).replaceAll("");
+            sanitizedKey = REPLACED_CHARS.matcher(sanitizedKey).replaceAll("_");
+            return sanitizedKey + (usages == 1 ? "" : "_" + usages);
+        }
     }
 
-    String forKey(String key) {
-      int usages = usageCounters.merge(key, 1, Integer::sum);
-      String sanitizedKey = ERASED_CHARS.matcher(key).replaceAll("");
-      sanitizedKey = REPLACED_CHARS.matcher(sanitizedKey).replaceAll("_");
-      return sanitizedKey + (usages == 1 ? "" : "_" + usages);
+    private static <K, V> Map<V, K> invert(Map<K, V> map) {
+        Map<V, K> inverted = new HashMap<>(map.size());
+        for (Map.Entry<K, V> e : map.entrySet()) {
+            inverted.put(e.getValue(), e.getKey());
+        }
+        return inverted;
     }
-  }
 
-  private static <K, V> Map<V, K> invert(Map<K, V> map) {
-    Map<V, K> inverted = new HashMap<>(map.size());
-    for (Map.Entry<K, V> e : map.entrySet()) {
-      inverted.put(e.getValue(), e.getKey());
+    private static List<DynamicPath> compile(Iterable<String> rawPaths) {
+        List<DynamicPath> compiledPaths = new ArrayList<>();
+        for (String rawPath : rawPaths) {
+            compiledPaths.add(path(rawPath));
+        }
+        return compiledPaths;
     }
-    return inverted;
-  }
 
-  private static List<DynamicPath> compile(Iterable<String> rawPaths) {
-    List<DynamicPath> compiledPaths = new ArrayList<>();
-    for (String rawPath : rawPaths) {
-      compiledPaths.add(path(rawPath));
+    private static DynamicPath path(String rawPath) {
+        return path(rawPath, true);
     }
-    return compiledPaths;
-  }
-
-  private static DynamicPath path(String rawPath) {
-    return path(rawPath, true);
-  }
-
-  private static DynamicPath path(String rawPath, boolean unique) {
-    return new DynamicPath(rawPath, JsonPath.compile(rawPath), unique);
-  }
-
-  public static final class DynamicPath {
-    private final String rawPath;
-    private final JsonPath path;
-    // if true, same values are replaced with same placeholders;
-    // otherwise every path gets its own placeholder, even if its value is non-unique
-    private final boolean unique;
-
-    DynamicPath(String rawPath, JsonPath path, boolean unique) {
-      this.rawPath = rawPath;
-      this.path = path;
-      this.unique = unique;
+
+    private static DynamicPath path(String rawPath, boolean unique) {
+        return new DynamicPath(rawPath, JsonPath.compile(rawPath), unique);
     }
-  }
 
-  public static final class CoverageReport {
-    public final Map<String, Object> event;
-    public final String report;
+    public static final class DynamicPath {
+        private final String rawPath;
+        private final JsonPath path;
+        // if true, same values are replaced with same placeholders;
+        // otherwise every path gets its own placeholder, even if its value is non-unique
+        private final boolean unique;
+
+        DynamicPath(String rawPath, JsonPath path, boolean unique) {
+            this.rawPath = rawPath;
+            this.path = path;
+            this.unique = unique;
+        }
+    }
+
+    public static final class CoverageReport {
+        public final Map<String, Object> event;
+        public final String report;
 
-    public CoverageReport(Map<String, Object> event, String report) {
-      this.event = event;
-      this.report = report;
+        public CoverageReport(Map<String, Object> event, String report) {
+            this.event = event;
+            this.report = report;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityCoverageServices.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityCoverageServices.java
index 205dba8ae72..c80c1f48352 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityCoverageServices.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityCoverageServices.java
@@ -24,74 +24,67 @@
  */
 public class CiVisibilityCoverageServices {
 
-  /** Services used in the parent process (build system). */
-  static class Parent {
-    final ModuleSignalRouter moduleSignalRouter;
-    final CoverageProcessor.Factory<?> coverageProcessorFactory;
+    /** Services used in the parent process (build system). */
+    static class Parent {
+        final ModuleSignalRouter moduleSignalRouter;
+        final CoverageProcessor.Factory<?> coverageProcessorFactory;
 
-    Parent(CiVisibilityServices services, CiVisibilityRepoServices repoServices) {
-      moduleSignalRouter = new ModuleSignalRouter();
+        Parent(CiVisibilityServices services, CiVisibilityRepoServices repoServices) {
+            moduleSignalRouter = new ModuleSignalRouter();
 
-      ExecutionSettings executionSettings =
-          repoServices.executionSettingsFactory.create(JvmInfo.CURRENT_JVM, null);
-      CoverageReportUploader coverageReportUploader =
-          executionSettings.isCodeCoverageReportUploadEnabled()
-              ? new CoverageReportUploader(
-                  services.ciIntake,
-                  repoServices.ciTags,
-                  services.config.getCodeCoverageFlags(),
-                  services.metricCollector)
-              : null;
+            ExecutionSettings executionSettings =
+                    repoServices.executionSettingsFactory.create(JvmInfo.CURRENT_JVM, null);
+            CoverageReportUploader coverageReportUploader = executionSettings.isCodeCoverageReportUploadEnabled()
+                    ? new CoverageReportUploader(
+                            services.ciIntake,
+                            repoServices.ciTags,
+                            services.config.getCodeCoverageFlags(),
+                            services.metricCollector)
+                    : null;
 
-      coverageProcessorFactory =
-          new JacocoCoverageProcessor.Factory(
-              services.config,
-              repoServices.repoIndexProvider,
-              coverageReportUploader,
-              repoServices.repoRoot,
-              moduleSignalRouter);
+            coverageProcessorFactory = new JacocoCoverageProcessor.Factory(
+                    services.config,
+                    repoServices.repoIndexProvider,
+                    coverageReportUploader,
+                    repoServices.repoRoot,
+                    moduleSignalRouter);
+        }
     }
-  }
 
-  /** Services used in the children processes (JVMs forked to run tests). */
-  static class Child {
-    final CoverageStore.Factory coverageStoreFactory;
-    final ChildProcessCoverageReporter coverageReporter;
+    /** Services used in the children processes (JVMs forked to run tests). */
+    static class Child {
+        final CoverageStore.Factory coverageStoreFactory;
+        final ChildProcessCoverageReporter coverageReporter;
 
-    Child(
-        CiVisibilityServices services,
-        CiVisibilityRepoServices repoServices,
-        ExecutionSettings executionSettings) {
-      coverageReporter =
-          new JacocoChildProcessCoverageReporter(CoveragePercentageBridge::getJacocoCoverageData);
+        Child(
+                CiVisibilityServices services,
+                CiVisibilityRepoServices repoServices,
+                ExecutionSettings executionSettings) {
+            coverageReporter = new JacocoChildProcessCoverageReporter(CoveragePercentageBridge::getJacocoCoverageData);
 
-      coverageStoreFactory = buildCoverageStoreFactory(services, repoServices, executionSettings);
-    }
+            coverageStoreFactory = buildCoverageStoreFactory(services, repoServices, executionSettings);
+        }
 
-    private static CoverageStore.Factory buildCoverageStoreFactory(
-        CiVisibilityServices services,
-        CiVisibilityRepoServices repoServices,
-        ExecutionSettings executionSettings) {
+        private static CoverageStore.Factory buildCoverageStoreFactory(
+                CiVisibilityServices services,
+                CiVisibilityRepoServices repoServices,
+                ExecutionSettings executionSettings) {
 
-      CoverageStore.Factory factory;
-      if (!services.config.isCiVisibilityCodeCoverageEnabled()) {
-        factory = new NoOpCoverageStore.Factory();
-      } else if (services.config.isCiVisibilityCoverageLinesEnabled()) {
-        factory =
-            new LineCoverageStore.Factory(
-                services.metricCollector, repoServices.sourcePathResolver);
-      } else {
-        factory =
-            new FileCoverageStore.Factory(
-                services.metricCollector, repoServices.sourcePathResolver);
-      }
+            CoverageStore.Factory factory;
+            if (!services.config.isCiVisibilityCodeCoverageEnabled()) {
+                factory = new NoOpCoverageStore.Factory();
+            } else if (services.config.isCiVisibilityCoverageLinesEnabled()) {
+                factory = new LineCoverageStore.Factory(services.metricCollector, repoServices.sourcePathResolver);
+            } else {
+                factory = new FileCoverageStore.Factory(services.metricCollector, repoServices.sourcePathResolver);
+            }
 
-      if (executionSettings.isItrEnabled()) {
-        Map<TestIdentifier, TestMetadata> skippableTests = executionSettings.getSkippableTests();
-        return new SkippableAwareCoverageStoreFactory(skippableTests.keySet(), factory);
-      } else {
-        return factory;
-      }
+            if (executionSettings.isItrEnabled()) {
+                Map<TestIdentifier, TestMetadata> skippableTests = executionSettings.getSkippableTests();
+                return new SkippableAwareCoverageStoreFactory(skippableTests.keySet(), factory);
+            } else {
+                return factory;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityRepoServices.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityRepoServices.java
index eada54f014c..22836942bb1 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityRepoServices.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityRepoServices.java
@@ -50,308 +50,285 @@
 /** Services that need repository root location to be instantiated. The scope is session. */
 public class CiVisibilityRepoServices {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(CiVisibilityRepoServices.class);
-
-  @Nullable final String repoRoot;
-  final String moduleName;
-  final Provider ciProvider;
-  final Map<String, String> ciTags;
-
-  final GitDataUploader gitDataUploader;
-  final RepoIndexProvider repoIndexProvider;
-  final Codeowners codeowners;
-  final SourcePathResolver sourcePathResolver;
-  final ExecutionSettingsFactory executionSettingsFactory;
-
-  CiVisibilityRepoServices(CiVisibilityServices services, Path path) {
-    CIProviderInfo ciProviderInfo = services.ciProviderInfoFactory.createCIProviderInfo(path);
-    ciProvider = ciProviderInfo.getProvider();
-    CIInfo ciInfo = ciProviderInfo.buildCIInfo();
-
-    repoRoot = getRepoRoot(ciInfo, services.gitClientFactory);
-    moduleName = getModuleName(services.config, repoRoot, path);
-
-    GitClient gitClient = services.gitClientFactory.create(repoRoot);
-    GitRepoUnshallow gitRepoUnshallow = new GitRepoUnshallow(services.config, gitClient);
-    PullRequestInfo pullRequestInfo =
-        buildPullRequestInfo(
-            services.config, services.environment, ciProviderInfo, gitClient, gitRepoUnshallow);
-
-    if (!pullRequestInfo.isEmpty()) {
-      LOGGER.info("PR detected: {}", pullRequestInfo);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CiVisibilityRepoServices.class);
+
+    @Nullable
+    final String repoRoot;
+
+    final String moduleName;
+    final Provider ciProvider;
+    final Map<String, String> ciTags;
+
+    final GitDataUploader gitDataUploader;
+    final RepoIndexProvider repoIndexProvider;
+    final Codeowners codeowners;
+    final SourcePathResolver sourcePathResolver;
+    final ExecutionSettingsFactory executionSettingsFactory;
+
+    CiVisibilityRepoServices(CiVisibilityServices services, Path path) {
+        CIProviderInfo ciProviderInfo = services.ciProviderInfoFactory.createCIProviderInfo(path);
+        ciProvider = ciProviderInfo.getProvider();
+        CIInfo ciInfo = ciProviderInfo.buildCIInfo();
+
+        repoRoot = getRepoRoot(ciInfo, services.gitClientFactory);
+        moduleName = getModuleName(services.config, repoRoot, path);
+
+        GitClient gitClient = services.gitClientFactory.create(repoRoot);
+        GitRepoUnshallow gitRepoUnshallow = new GitRepoUnshallow(services.config, gitClient);
+        PullRequestInfo pullRequestInfo = buildPullRequestInfo(
+                services.config, services.environment, ciProviderInfo, gitClient, gitRepoUnshallow);
+
+        if (!pullRequestInfo.isEmpty()) {
+            LOGGER.info("PR detected: {}", pullRequestInfo);
+        }
+
+        ciTags = new CITagsProvider().getCiTags(ciInfo, pullRequestInfo);
+
+        if (BazelMode.get().isEnabled()) {
+            // bazel rule takes care of the git data upload
+            LOGGER.info("[bazel mode] Skipping git data upload");
+            gitDataUploader = () -> CompletableFuture.completedFuture(null);
+        } else {
+            gitDataUploader = buildGitDataUploader(
+                    services.config,
+                    services.metricCollector,
+                    services.gitInfoProvider,
+                    gitClient,
+                    gitRepoUnshallow,
+                    services.backendApi,
+                    repoRoot);
+        }
+
+        repoIndexProvider = services.repoIndexProviderFactory.create(repoRoot);
+        codeowners = buildCodeowners(repoRoot);
+        sourcePathResolver = buildSourcePathResolver(repoRoot, repoIndexProvider);
+
+        if (services.processHierarchy.isChild()) {
+            executionSettingsFactory = buildExecutionSettingsFetcher(services.signalClientFactory);
+        } else {
+            executionSettingsFactory = buildExecutionSettingsFactory(
+                    services.processHierarchy,
+                    services.config,
+                    services.metricCollector,
+                    services.backendApi,
+                    gitClient,
+                    gitRepoUnshallow,
+                    gitDataUploader,
+                    pullRequestInfo,
+                    repoRoot);
+        }
     }
 
-    ciTags = new CITagsProvider().getCiTags(ciInfo, pullRequestInfo);
-
-    if (BazelMode.get().isEnabled()) {
-      // bazel rule takes care of the git data upload
-      LOGGER.info("[bazel mode] Skipping git data upload");
-      gitDataUploader = () -> CompletableFuture.completedFuture(null);
-    } else {
-      gitDataUploader =
-          buildGitDataUploader(
-              services.config,
-              services.metricCollector,
-              services.gitInfoProvider,
-              gitClient,
-              gitRepoUnshallow,
-              services.backendApi,
-              repoRoot);
+    @Nonnull
+    static PullRequestInfo buildPullRequestInfo(
+            Config config,
+            CiEnvironment environment,
+            CIProviderInfo ciProviderInfo,
+            GitClient gitClient,
+            GitRepoUnshallow gitRepoUnshallow) {
+        PullRequestInfo userInfo = buildUserPullRequestInfo(config, environment, gitClient);
+
+        if (userInfo.isComplete()) {
+            return userInfo;
+        }
+
+        // complete with CI vars if user didn't provide all information
+        PullRequestInfo ciInfo = PullRequestInfo.coalesce(userInfo, ciProviderInfo.buildPullRequestInfo());
+        String headSha = ciInfo.getHeadCommit().getSha();
+        if (Strings.isNotBlank(headSha)) {
+            // if head sha present try to populate author, committer and message info through git client
+            try {
+                CommitInfo commitInfo = gitClient.getCommitInfo(headSha, true);
+                return PullRequestInfo.coalesce(ciInfo, new PullRequestInfo(null, null, null, commitInfo, null));
+            } catch (Exception ignored) {
+            }
+        }
+        return ciInfo;
     }
 
-    repoIndexProvider = services.repoIndexProviderFactory.create(repoRoot);
-    codeowners = buildCodeowners(repoRoot);
-    sourcePathResolver = buildSourcePathResolver(repoRoot, repoIndexProvider);
-
-    if (services.processHierarchy.isChild()) {
-      executionSettingsFactory = buildExecutionSettingsFetcher(services.signalClientFactory);
-    } else {
-      executionSettingsFactory =
-          buildExecutionSettingsFactory(
-              services.processHierarchy,
-              services.config,
-              services.metricCollector,
-              services.backendApi,
-              gitClient,
-              gitRepoUnshallow,
-              gitDataUploader,
-              pullRequestInfo,
-              repoRoot);
-    }
-  }
-
-  @Nonnull
-  static PullRequestInfo buildPullRequestInfo(
-      Config config,
-      CiEnvironment environment,
-      CIProviderInfo ciProviderInfo,
-      GitClient gitClient,
-      GitRepoUnshallow gitRepoUnshallow) {
-    PullRequestInfo userInfo = buildUserPullRequestInfo(config, environment, gitClient);
-
-    if (userInfo.isComplete()) {
-      return userInfo;
+    @Nonnull
+    private static PullRequestInfo buildUserPullRequestInfo(
+            Config config, CiEnvironment environment, GitClient gitClient) {
+        PullRequestInfo userInfo = new PullRequestInfo(
+                config.getGitPullRequestBaseBranch(),
+                config.getGitPullRequestBaseBranchSha(),
+                null,
+                new CommitInfo(config.getGitCommitHeadSha()),
+                null);
+
+        if (userInfo.isComplete()) {
+            return userInfo;
+        }
+
+        // ddci specific vars
+        String targetSha = environment.get(Constants.DDCI_PULL_REQUEST_TARGET_SHA);
+        String sourceSha = environment.get(Constants.DDCI_PULL_REQUEST_SOURCE_SHA);
+        String mergeBase = null;
+
+        if (!Constants.DDCI_LEGACY_KIND.equals(environment.get(Constants.DDCI_REQUEST_KIND))) {
+            // legacy mode doesn't set a valid target sha to compute the merge base
+            try {
+                mergeBase = gitClient.getMergeBase(targetSha, sourceSha);
+            } catch (Exception ignored) {
+            }
+        }
+
+        PullRequestInfo ddCiInfo = new PullRequestInfo(
+                null, mergeBase, null, new CommitInfo(environment.get(Constants.DDCI_PULL_REQUEST_SOURCE_SHA)), null);
+
+        return PullRequestInfo.coalesce(userInfo, ddCiInfo);
     }
 
-    // complete with CI vars if user didn't provide all information
-    PullRequestInfo ciInfo =
-        PullRequestInfo.coalesce(userInfo, ciProviderInfo.buildPullRequestInfo());
-    String headSha = ciInfo.getHeadCommit().getSha();
-    if (Strings.isNotBlank(headSha)) {
-      // if head sha present try to populate author, committer and message info through git client
-      try {
-        CommitInfo commitInfo = gitClient.getCommitInfo(headSha, true);
-        return PullRequestInfo.coalesce(
-            ciInfo, new PullRequestInfo(null, null, null, commitInfo, null));
-      } catch (Exception ignored) {
-      }
-    }
-    return ciInfo;
-  }
-
-  @Nonnull
-  private static PullRequestInfo buildUserPullRequestInfo(
-      Config config, CiEnvironment environment, GitClient gitClient) {
-    PullRequestInfo userInfo =
-        new PullRequestInfo(
-            config.getGitPullRequestBaseBranch(),
-            config.getGitPullRequestBaseBranchSha(),
-            null,
-            new CommitInfo(config.getGitCommitHeadSha()),
-            null);
-
-    if (userInfo.isComplete()) {
-      return userInfo;
+    private static String getRepoRoot(CIInfo ciInfo, GitClient.Factory gitClientFactory) {
+        BazelMode bazelMode = BazelMode.get();
+        if (bazelMode.isEnabled()) {
+            String bazelRepoRoot = bazelMode.getRepoRoot();
+            if (bazelRepoRoot != null) {
+                // The on-disk repo is unreachable from a Bazel test sandbox, so the runfiles workspace
+                // dir is used as a virtual repo root for source-path resolution.
+                return bazelRepoRoot;
+            }
+        }
+
+        String ciWorkspace = ciInfo.getCiWorkspace();
+        if (Strings.isNotBlank(ciWorkspace)) {
+            return ciWorkspace;
+
+        } else {
+            try {
+                return gitClientFactory.create(".").getRepoRoot();
+
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                LOGGER.error("Interrupted while getting repo root", e);
+                return null;
+
+            } catch (Exception e) {
+                LOGGER.error("Error while getting repo root", e);
+                return null;
+            }
+        }
     }
 
-    // ddci specific vars
-    String targetSha = environment.get(Constants.DDCI_PULL_REQUEST_TARGET_SHA);
-    String sourceSha = environment.get(Constants.DDCI_PULL_REQUEST_SOURCE_SHA);
-    String mergeBase = null;
-
-    if (!Constants.DDCI_LEGACY_KIND.equals(environment.get(Constants.DDCI_REQUEST_KIND))) {
-      // legacy mode doesn't set a valid target sha to compute the merge base
-      try {
-        mergeBase = gitClient.getMergeBase(targetSha, sourceSha);
-      } catch (Exception ignored) {
-      }
+    static String getModuleName(Config config, @Nullable String repoRoot, Path path) {
+        // if parent process is instrumented, it will provide build system's module name
+        String parentModuleName = config.getCiVisibilityModuleName();
+        if (parentModuleName != null) {
+            return parentModuleName;
+        }
+        if (repoRoot != null && path.startsWith(repoRoot)) {
+            String relativePath = Paths.get(repoRoot).relativize(path).toString();
+            if (!relativePath.isEmpty()) {
+                return relativePath;
+            }
+        }
+        return config.getServiceName();
     }
 
-    PullRequestInfo ddCiInfo =
-        new PullRequestInfo(
-            null,
-            mergeBase,
-            null,
-            new CommitInfo(environment.get(Constants.DDCI_PULL_REQUEST_SOURCE_SHA)),
-            null);
-
-    return PullRequestInfo.coalesce(userInfo, ddCiInfo);
-  }
-
-  private static String getRepoRoot(CIInfo ciInfo, GitClient.Factory gitClientFactory) {
-    BazelMode bazelMode = BazelMode.get();
-    if (bazelMode.isEnabled()) {
-      String bazelRepoRoot = bazelMode.getRepoRoot();
-      if (bazelRepoRoot != null) {
-        // The on-disk repo is unreachable from a Bazel test sandbox, so the runfiles workspace
-        // dir is used as a virtual repo root for source-path resolution.
-        return bazelRepoRoot;
-      }
-    }
-
-    String ciWorkspace = ciInfo.getCiWorkspace();
-    if (Strings.isNotBlank(ciWorkspace)) {
-      return ciWorkspace;
-
-    } else {
-      try {
-        return gitClientFactory.create(".").getRepoRoot();
-
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-        LOGGER.error("Interrupted while getting repo root", e);
-        return null;
-
-      } catch (Exception e) {
-        LOGGER.error("Error while getting repo root", e);
-        return null;
-      }
+    private static ExecutionSettingsFactory buildExecutionSettingsFetcher(SignalClient.Factory signalClientFactory) {
+        return (JvmInfo jvmInfo, String moduleName) -> {
+            try (SignalClient signalClient = signalClientFactory.create()) {
+                ExecutionSettingsRequest request = new ExecutionSettingsRequest(moduleName, JvmInfo.CURRENT_JVM);
+                ExecutionSettingsResponse response = (ExecutionSettingsResponse) signalClient.send(request);
+                return response.getSettings();
+
+            } catch (Exception e) {
+                LOGGER.error("Could not get module execution settings from parent process", e);
+                return ExecutionSettings.EMPTY;
+            }
+        };
     }
-  }
 
-  static String getModuleName(Config config, @Nullable String repoRoot, Path path) {
-    // if parent process is instrumented, it will provide build system's module name
-    String parentModuleName = config.getCiVisibilityModuleName();
-    if (parentModuleName != null) {
-      return parentModuleName;
-    }
-    if (repoRoot != null && path.startsWith(repoRoot)) {
-      String relativePath = Paths.get(repoRoot).relativize(path).toString();
-      if (!relativePath.isEmpty()) {
-        return relativePath;
-      }
-    }
-    return config.getServiceName();
-  }
-
-  private static ExecutionSettingsFactory buildExecutionSettingsFetcher(
-      SignalClient.Factory signalClientFactory) {
-    return (JvmInfo jvmInfo, String moduleName) -> {
-      try (SignalClient signalClient = signalClientFactory.create()) {
-        ExecutionSettingsRequest request =
-            new ExecutionSettingsRequest(moduleName, JvmInfo.CURRENT_JVM);
-        ExecutionSettingsResponse response = (ExecutionSettingsResponse) signalClient.send(request);
-        return response.getSettings();
-
-      } catch (Exception e) {
-        LOGGER.error("Could not get module execution settings from parent process", e);
-        return ExecutionSettings.EMPTY;
-      }
-    };
-  }
-
-  private static ExecutionSettingsFactory buildExecutionSettingsFactory(
-      ProcessHierarchy processHierarchy,
-      Config config,
-      CiVisibilityMetricCollector metricCollector,
-      BackendApi backendApi,
-      GitClient gitClient,
-      GitRepoUnshallow gitRepoUnshallow,
-      GitDataUploader gitDataUploader,
-      PullRequestInfo pullRequestInfo,
-      @Nullable String repoRoot) {
-    ConfigurationApi configurationApi;
-    BazelMode bazelMode = BazelMode.get();
-    if (bazelMode.isManifestModeEnabled()) {
-      LOGGER.info("[bazel mode] Manifest mode detected. Using file-based configuration API");
-      configurationApi =
-          new FileBasedConfigurationApi(
-              toPathOrNull(bazelMode.getSettingsPath()),
-              null,
-              toPathOrNull(bazelMode.getFlakyTestsPath()),
-              toPathOrNull(bazelMode.getKnownTestsPath()),
-              toPathOrNull(bazelMode.getTestManagementPath()));
-    } else if (backendApi == null) {
-      LOGGER.warn(
-          "Remote config and skippable tests requests will be skipped since backend API client could not be created");
-      configurationApi = ConfigurationApi.NO_OP;
-    } else {
-      configurationApi = new ConfigurationApiImpl(backendApi, metricCollector);
+    private static ExecutionSettingsFactory buildExecutionSettingsFactory(
+            ProcessHierarchy processHierarchy,
+            Config config,
+            CiVisibilityMetricCollector metricCollector,
+            BackendApi backendApi,
+            GitClient gitClient,
+            GitRepoUnshallow gitRepoUnshallow,
+            GitDataUploader gitDataUploader,
+            PullRequestInfo pullRequestInfo,
+            @Nullable String repoRoot) {
+        ConfigurationApi configurationApi;
+        BazelMode bazelMode = BazelMode.get();
+        if (bazelMode.isManifestModeEnabled()) {
+            LOGGER.info("[bazel mode] Manifest mode detected. Using file-based configuration API");
+            configurationApi = new FileBasedConfigurationApi(
+                    toPathOrNull(bazelMode.getSettingsPath()),
+                    null,
+                    toPathOrNull(bazelMode.getFlakyTestsPath()),
+                    toPathOrNull(bazelMode.getKnownTestsPath()),
+                    toPathOrNull(bazelMode.getTestManagementPath()));
+        } else if (backendApi == null) {
+            LOGGER.warn(
+                    "Remote config and skippable tests requests will be skipped since backend API client could not be created");
+            configurationApi = ConfigurationApi.NO_OP;
+        } else {
+            configurationApi = new ConfigurationApiImpl(backendApi, metricCollector);
+        }
+
+        ExecutionSettingsFactoryImpl factory = new ExecutionSettingsFactoryImpl(
+                config, configurationApi, gitClient, gitRepoUnshallow, gitDataUploader, pullRequestInfo, repoRoot);
+        if (processHierarchy.isHeadless()) {
+            return factory;
+        } else {
+            return new MultiModuleExecutionSettingsFactory(config, factory);
+        }
     }
 
-    ExecutionSettingsFactoryImpl factory =
-        new ExecutionSettingsFactoryImpl(
-            config,
-            configurationApi,
-            gitClient,
-            gitRepoUnshallow,
-            gitDataUploader,
-            pullRequestInfo,
-            repoRoot);
-    if (processHierarchy.isHeadless()) {
-      return factory;
-    } else {
-      return new MultiModuleExecutionSettingsFactory(config, factory);
-    }
-  }
-
-  @Nullable
-  private static Path toPathOrNull(@Nullable String path) {
-    return path != null ? Paths.get(path) : null;
-  }
-
-  private static GitDataUploader buildGitDataUploader(
-      Config config,
-      CiVisibilityMetricCollector metricCollector,
-      GitInfoProvider gitInfoProvider,
-      GitClient gitClient,
-      GitRepoUnshallow gitRepoUnshallow,
-      BackendApi backendApi,
-      @Nullable String repoRoot) {
-    if (!config.isCiVisibilityGitUploadEnabled()) {
-      return () -> CompletableFuture.completedFuture(null);
+    @Nullable
+    private static Path toPathOrNull(@Nullable String path) {
+        return path != null ? Paths.get(path) : null;
     }
 
-    if (backendApi == null) {
-      LOGGER.warn(
-          "Git tree data upload will be skipped since backend API client could not be created");
-      return () -> CompletableFuture.completedFuture(null);
+    private static GitDataUploader buildGitDataUploader(
+            Config config,
+            CiVisibilityMetricCollector metricCollector,
+            GitInfoProvider gitInfoProvider,
+            GitClient gitClient,
+            GitRepoUnshallow gitRepoUnshallow,
+            BackendApi backendApi,
+            @Nullable String repoRoot) {
+        if (!config.isCiVisibilityGitUploadEnabled()) {
+            return () -> CompletableFuture.completedFuture(null);
+        }
+
+        if (backendApi == null) {
+            LOGGER.warn("Git tree data upload will be skipped since backend API client could not be created");
+            return () -> CompletableFuture.completedFuture(null);
+        }
+
+        if (repoRoot == null) {
+            LOGGER.warn("Git tree data upload will be skipped since Git repository path could not be determined");
+            return () -> CompletableFuture.completedFuture(null);
+        }
+
+        String remoteName = config.getCiVisibilityGitRemoteName();
+        GitDataApi gitDataApi = new GitDataApi(backendApi, metricCollector);
+        return new GitDataUploaderImpl(
+                config,
+                metricCollector,
+                gitDataApi,
+                gitClient,
+                gitRepoUnshallow,
+                gitInfoProvider,
+                repoRoot,
+                remoteName);
     }
 
-    if (repoRoot == null) {
-      LOGGER.warn(
-          "Git tree data upload will be skipped since Git repository path could not be determined");
-      return () -> CompletableFuture.completedFuture(null);
+    private static SourcePathResolver buildSourcePathResolver(
+            @Nullable String repoRoot, RepoIndexProvider indexProvider) {
+        SourcePathResolver compilerAidedResolver =
+                repoRoot != null ? new CompilerAidedSourcePathResolver(repoRoot) : NoOpSourcePathResolver.INSTANCE;
+        RepoIndexSourcePathResolver indexResolver = new RepoIndexSourcePathResolver(indexProvider);
+        return new BestEffortSourcePathResolver(compilerAidedResolver, indexResolver);
     }
 
-    String remoteName = config.getCiVisibilityGitRemoteName();
-    GitDataApi gitDataApi = new GitDataApi(backendApi, metricCollector);
-    return new GitDataUploaderImpl(
-        config,
-        metricCollector,
-        gitDataApi,
-        gitClient,
-        gitRepoUnshallow,
-        gitInfoProvider,
-        repoRoot,
-        remoteName);
-  }
-
-  private static SourcePathResolver buildSourcePathResolver(
-      @Nullable String repoRoot, RepoIndexProvider indexProvider) {
-    SourcePathResolver compilerAidedResolver =
-        repoRoot != null
-            ? new CompilerAidedSourcePathResolver(repoRoot)
-            : NoOpSourcePathResolver.INSTANCE;
-    RepoIndexSourcePathResolver indexResolver = new RepoIndexSourcePathResolver(indexProvider);
-    return new BestEffortSourcePathResolver(compilerAidedResolver, indexResolver);
-  }
-
-  private static Codeowners buildCodeowners(@Nullable String repoRoot) {
-    if (repoRoot != null) {
-      return new CodeownersProvider().build(repoRoot);
-    } else {
-      return NoCodeowners.INSTANCE;
+    private static Codeowners buildCodeowners(@Nullable String repoRoot) {
+        if (repoRoot != null) {
+            return new CodeownersProvider().build(repoRoot);
+        } else {
+            return NoCodeowners.INSTANCE;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityServices.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityServices.java
index 12dfa0709d7..4496f282e08 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityServices.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityServices.java
@@ -55,110 +55,104 @@
  */
 public class CiVisibilityServices {
 
-  private static final Logger logger = LoggerFactory.getLogger(CiVisibilityServices.class);
-
-  private static final String GIT_FOLDER_NAME = ".git";
-
-  final ProcessHierarchy processHierarchy;
-  final Config config;
-  final CiVisibilityMetricCollector metricCollector;
-  final BackendApi backendApi;
-  final BackendApi ciIntake;
-  final JvmInfoFactory jvmInfoFactory;
-  final CiEnvironment environment;
-  final CIProviderInfoFactory ciProviderInfoFactory;
-  final GitClient.Factory gitClientFactory;
-  final GitInfoProvider gitInfoProvider;
-  final LinesResolver linesResolver;
-  final RepoIndexProvider.Factory repoIndexProviderFactory;
-  @Nullable final SignalClient.Factory signalClientFactory;
-
-  CiVisibilityServices(
-      Config config,
-      CiVisibilityMetricCollector metricCollector,
-      SharedCommunicationObjects sco,
-      GitInfoProvider gitInfoProvider) {
-    this.processHierarchy = new ProcessHierarchy();
-    this.config = config;
-    this.metricCollector = metricCollector;
-    this.backendApi = new BackendApiFactory(config, sco).createBackendApi(Intake.API);
-    this.ciIntake = new BackendApiFactory(config, sco).createBackendApi(Intake.CI_INTAKE);
-    this.jvmInfoFactory = new CachingJvmInfoFactory(config, new JvmInfoFactoryImpl());
-
-    if (BazelMode.get().isPayloadFilesEnabled()) {
-      // git commands should not be executed in payload files mode
-      logger.info("[bazel mode] Payload-in-files mode detected. Disabling git commands");
-      this.gitClientFactory = r -> NoOpGitClient.INSTANCE;
-    } else {
-      this.gitClientFactory = buildGitClientFactory(config, metricCollector);
+    private static final Logger logger = LoggerFactory.getLogger(CiVisibilityServices.class);
+
+    private static final String GIT_FOLDER_NAME = ".git";
+
+    final ProcessHierarchy processHierarchy;
+    final Config config;
+    final CiVisibilityMetricCollector metricCollector;
+    final BackendApi backendApi;
+    final BackendApi ciIntake;
+    final JvmInfoFactory jvmInfoFactory;
+    final CiEnvironment environment;
+    final CIProviderInfoFactory ciProviderInfoFactory;
+    final GitClient.Factory gitClientFactory;
+    final GitInfoProvider gitInfoProvider;
+    final LinesResolver linesResolver;
+    final RepoIndexProvider.Factory repoIndexProviderFactory;
+
+    @Nullable
+    final SignalClient.Factory signalClientFactory;
+
+    CiVisibilityServices(
+            Config config,
+            CiVisibilityMetricCollector metricCollector,
+            SharedCommunicationObjects sco,
+            GitInfoProvider gitInfoProvider) {
+        this.processHierarchy = new ProcessHierarchy();
+        this.config = config;
+        this.metricCollector = metricCollector;
+        this.backendApi = new BackendApiFactory(config, sco).createBackendApi(Intake.API);
+        this.ciIntake = new BackendApiFactory(config, sco).createBackendApi(Intake.CI_INTAKE);
+        this.jvmInfoFactory = new CachingJvmInfoFactory(config, new JvmInfoFactoryImpl());
+
+        if (BazelMode.get().isPayloadFilesEnabled()) {
+            // git commands should not be executed in payload files mode
+            logger.info("[bazel mode] Payload-in-files mode detected. Disabling git commands");
+            this.gitClientFactory = r -> NoOpGitClient.INSTANCE;
+        } else {
+            this.gitClientFactory = buildGitClientFactory(config, metricCollector);
+        }
+
+        this.environment = buildCiEnvironment();
+        this.ciProviderInfoFactory = new CIProviderInfoFactory(config, environment);
+        this.linesResolver = new BestEffortLinesResolver(new CompilerAidedLinesResolver(), new ByteCodeLinesResolver());
+
+        this.gitInfoProvider = gitInfoProvider;
+        gitInfoProvider.registerGitInfoBuilder(new CIProviderGitInfoBuilder(config, environment));
+        gitInfoProvider.registerGitInfoBuilder(new CILocalGitInfoBuilder(gitClientFactory, GIT_FOLDER_NAME));
+        gitInfoProvider.registerGitInfoBuilder(new GitClientGitInfoBuilder(config, gitClientFactory));
+
+        if (processHierarchy.isChild()) {
+            InetSocketAddress signalServerAddress = processHierarchy.getSignalServerAddress();
+            this.signalClientFactory = new SignalClient.Factory(signalServerAddress, config);
+
+            RepoIndexProvider indexFetcher = new RepoIndexFetcher(signalClientFactory);
+            this.repoIndexProviderFactory = (repoRoot) -> indexFetcher;
+
+        } else {
+            this.signalClientFactory = null;
+
+            FileSystem fileSystem = FileSystems.getDefault();
+            PackageResolver packageResolver = new PackageResolverImpl(fileSystem);
+            ResourceResolver resourceResolver =
+                    new ConventionBasedResourceResolver(fileSystem, config.getCiVisibilityResourceFolderNames());
+            this.repoIndexProviderFactory =
+                    new CachingRepoIndexBuilderFactory(config, packageResolver, resourceResolver, fileSystem);
+        }
     }
 
-    this.environment = buildCiEnvironment();
-    this.ciProviderInfoFactory = new CIProviderInfoFactory(config, environment);
-    this.linesResolver =
-        new BestEffortLinesResolver(new CompilerAidedLinesResolver(), new ByteCodeLinesResolver());
-
-    this.gitInfoProvider = gitInfoProvider;
-    gitInfoProvider.registerGitInfoBuilder(new CIProviderGitInfoBuilder(config, environment));
-    gitInfoProvider.registerGitInfoBuilder(
-        new CILocalGitInfoBuilder(gitClientFactory, GIT_FOLDER_NAME));
-    gitInfoProvider.registerGitInfoBuilder(new GitClientGitInfoBuilder(config, gitClientFactory));
-
-    if (processHierarchy.isChild()) {
-      InetSocketAddress signalServerAddress = processHierarchy.getSignalServerAddress();
-      this.signalClientFactory = new SignalClient.Factory(signalServerAddress, config);
-
-      RepoIndexProvider indexFetcher = new RepoIndexFetcher(signalClientFactory);
-      this.repoIndexProviderFactory = (repoRoot) -> indexFetcher;
-
-    } else {
-      this.signalClientFactory = null;
-
-      FileSystem fileSystem = FileSystems.getDefault();
-      PackageResolver packageResolver = new PackageResolverImpl(fileSystem);
-      ResourceResolver resourceResolver =
-          new ConventionBasedResourceResolver(
-              fileSystem, config.getCiVisibilityResourceFolderNames());
-      this.repoIndexProviderFactory =
-          new CachingRepoIndexBuilderFactory(config, packageResolver, resourceResolver, fileSystem);
+    private static GitClient.Factory buildGitClientFactory(Config config, CiVisibilityMetricCollector metricCollector) {
+        if (!config.isCiVisibilityGitClientEnabled()) {
+            return r -> NoOpGitClient.INSTANCE;
+        }
+        try {
+            ShellCommandExecutor shellCommandExecutor =
+                    new ShellCommandExecutor(new File("."), config.getCiVisibilityGitCommandTimeoutMillis());
+            String gitVersion = shellCommandExecutor.executeCommand(IOUtils::readFully, "git", "version");
+            logger.debug("Detected git executable version {}", gitVersion);
+            return new ShellGitClient.Factory(config, metricCollector);
+
+        } catch (Exception e) {
+            metricCollector.add(
+                    CiVisibilityCountMetric.GIT_COMMAND_ERRORS, 1, Command.OTHER, ShellCommandExecutor.getExitCode(e));
+            logger.info("No git executable detected, some features will not be available");
+            return r -> NoOpGitClient.INSTANCE;
+        }
     }
-  }
 
-  private static GitClient.Factory buildGitClientFactory(
-      Config config, CiVisibilityMetricCollector metricCollector) {
-    if (!config.isCiVisibilityGitClientEnabled()) {
-      return r -> NoOpGitClient.INSTANCE;
+    @Nonnull
+    private static CiEnvironment buildCiEnvironment() {
+        Map<String, String> remoteEnvironment = CiEnvironmentVariables.getAll();
+        if (remoteEnvironment != null) {
+            return new CompositeCiEnvironment(new CiEnvironmentImpl(remoteEnvironment), CiEnvironmentImpl.local());
+        } else {
+            return CiEnvironmentImpl.local();
+        }
     }
-    try {
-      ShellCommandExecutor shellCommandExecutor =
-          new ShellCommandExecutor(new File("."), config.getCiVisibilityGitCommandTimeoutMillis());
-      String gitVersion = shellCommandExecutor.executeCommand(IOUtils::readFully, "git", "version");
-      logger.debug("Detected git executable version {}", gitVersion);
-      return new ShellGitClient.Factory(config, metricCollector);
-
-    } catch (Exception e) {
-      metricCollector.add(
-          CiVisibilityCountMetric.GIT_COMMAND_ERRORS,
-          1,
-          Command.OTHER,
-          ShellCommandExecutor.getExitCode(e));
-      logger.info("No git executable detected, some features will not be available");
-      return r -> NoOpGitClient.INSTANCE;
-    }
-  }
-
-  @Nonnull
-  private static CiEnvironment buildCiEnvironment() {
-    Map<String, String> remoteEnvironment = CiEnvironmentVariables.getAll();
-    if (remoteEnvironment != null) {
-      return new CompositeCiEnvironment(
-          new CiEnvironmentImpl(remoteEnvironment), CiEnvironmentImpl.local());
-    } else {
-      return CiEnvironmentImpl.local();
-    }
-  }
 
-  CiVisibilityRepoServices repoServices(Path path) {
-    return new CiVisibilityRepoServices(this, path);
-  }
+    CiVisibilityRepoServices repoServices(Path path) {
+        return new CiVisibilityRepoServices(this, path);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java
index af7f653e921..694f924cc82 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java
@@ -53,313 +53,282 @@
 
 public class CiVisibilitySystem {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(CiVisibilitySystem.class);
-
-  public static void start(Instrumentation inst, SharedCommunicationObjects sco) {
-    Config config = Config.get();
-    if (!config.isCiVisibilityEnabled()) {
-      LOGGER.debug("CI Visibility is disabled");
-      return;
+    private static final Logger LOGGER = LoggerFactory.getLogger(CiVisibilitySystem.class);
+
+    public static void start(Instrumentation inst, SharedCommunicationObjects sco) {
+        Config config = Config.get();
+        if (!config.isCiVisibilityEnabled()) {
+            LOGGER.debug("CI Visibility is disabled");
+            return;
+        }
+
+        String injectedTracerVersion = config.getCiVisibilityInjectedTracerVersion();
+        if (injectedTracerVersion != null && !injectedTracerVersion.equals(TracerVersion.TRACER_VERSION)) {
+            throw new FatalAgentMisconfigurationError(
+                    "Running JVM with tracer version "
+                            + TracerVersion.TRACER_VERSION
+                            + " however parent process attempted to inject "
+                            + injectedTracerVersion
+                            + ". Do not inject the tracer into the forked JVMs manually, or ensure the manually injected version is the same as the one injected automatically");
+        }
+
+        sco.createRemaining(config);
+
+        if (config.isCiVisibilityCompilerPluginAutoConfigurationEnabled()) {
+            inst.addTransformer(new CompilerModuleExporter(inst));
+        }
+
+        CiVisibilityMetricCollector metricCollector = config.isCiVisibilityTelemetryEnabled()
+                ? new CiVisibilityMetricCollectorImpl()
+                : NoOpMetricCollector.INSTANCE;
+        InstrumentationBridge.registerMetricCollector(metricCollector);
+
+        CiVisibilityServices services =
+                new CiVisibilityServices(config, metricCollector, sco, GitInfoProvider.INSTANCE);
+
+        InstrumentationBridge.registerBuildEventsHandlerFactory(buildEventsHandlerFactory(services));
+        CIVisibility.registerSessionFactory(manualApiSessionFactory(services));
+
+        if (services.processHierarchy.isChild() || services.processHierarchy.isHeadless()) {
+            CiVisibilityRepoServices repoServices = services.repoServices(getCurrentPath());
+
+            ExecutionSettings executionSettings =
+                    repoServices.executionSettingsFactory.create(JvmInfo.CURRENT_JVM, repoServices.moduleName);
+            if (executionSettings.isCodeCoverageEnabled()
+                    &&
+                    // lines coverage is built on top of Jacoco,
+                    // so if lines are explicitly enabled,
+                    // we rely on Jacoco instrumentation rather than on our own coverage mechanism
+                    !config.isCiVisibilityCoverageLinesEnabled()) {
+                Predicate<String> instrumentationFilter = createCoverageInstrumentationFilter(services, repoServices);
+                inst.addTransformer(new CoverageClassTransformer(instrumentationFilter));
+            }
+
+            if (executionSettings.isFailedTestReplayEnabled()) {
+                DebuggerConfigBridge.updateConfig(new DebuggerConfigUpdate(null, true, null, null));
+            }
+
+            CiVisibilityCoverageServices.Child coverageServices =
+                    new CiVisibilityCoverageServices.Child(services, repoServices, executionSettings);
+            TestEventsHandlerFactory testEventsHandlerFactory =
+                    new TestEventsHandlerFactory(services, repoServices, coverageServices, executionSettings);
+            InstrumentationBridge.registerTestEventsHandlerFactory(testEventsHandlerFactory);
+            CoveragePerTestBridge.registerCoverageStoreRegistry(coverageServices.coverageStoreFactory);
+
+            AgentTracer.TracerAPI tracerAPI = AgentTracer.get();
+            tracerAPI.addShutdownListener(testEventsHandlerFactory::shutdown);
+        } else {
+            InstrumentationBridge.registerTestEventsHandlerFactory(new NoOpTestEventsHandler.Factory());
+        }
     }
 
-    String injectedTracerVersion = config.getCiVisibilityInjectedTracerVersion();
-    if (injectedTracerVersion != null
-        && !injectedTracerVersion.equals(TracerVersion.TRACER_VERSION)) {
-      throw new FatalAgentMisconfigurationError(
-          "Running JVM with tracer version "
-              + TracerVersion.TRACER_VERSION
-              + " however parent process attempted to inject "
-              + injectedTracerVersion
-              + ". Do not inject the tracer into the forked JVMs manually, or ensure the manually injected version is the same as the one injected automatically");
+    private static Path getCurrentPath() {
+        Path currentPath = Paths.get("").toAbsolutePath();
+        try {
+            return currentPath.toRealPath();
+        } catch (Exception e) {
+            return currentPath;
+        }
     }
 
-    sco.createRemaining(config);
-
-    if (config.isCiVisibilityCompilerPluginAutoConfigurationEnabled()) {
-      inst.addTransformer(new CompilerModuleExporter(inst));
+    private static Predicate<String> createCoverageInstrumentationFilter(
+            CiVisibilityServices services, CiVisibilityRepoServices repoServices) {
+        String[] includedPackages = services.config.getCiVisibilityCodeCoverageIncludedPackages();
+        if (includedPackages.length == 0 && services.processHierarchy.isHeadless()) {
+            RepoIndex repoIndex = repoServices.repoIndexProvider.getIndex();
+            includedPackages = Config.convertJacocoExclusionFormatToPackagePrefixes(repoIndex.getRootPackages());
+        }
+        String[] excludedPackages = services.config.getCiVisibilityCodeCoverageExcludedPackages();
+        return new CoverageInstrumentationFilter(includedPackages, excludedPackages);
     }
 
-    CiVisibilityMetricCollector metricCollector =
-        config.isCiVisibilityTelemetryEnabled()
-            ? new CiVisibilityMetricCollectorImpl()
-            : NoOpMetricCollector.INSTANCE;
-    InstrumentationBridge.registerMetricCollector(metricCollector);
-
-    CiVisibilityServices services =
-        new CiVisibilityServices(config, metricCollector, sco, GitInfoProvider.INSTANCE);
-
-    InstrumentationBridge.registerBuildEventsHandlerFactory(buildEventsHandlerFactory(services));
-    CIVisibility.registerSessionFactory(manualApiSessionFactory(services));
-
-    if (services.processHierarchy.isChild() || services.processHierarchy.isHeadless()) {
-      CiVisibilityRepoServices repoServices = services.repoServices(getCurrentPath());
-
-      ExecutionSettings executionSettings =
-          repoServices.executionSettingsFactory.create(
-              JvmInfo.CURRENT_JVM, repoServices.moduleName);
-      if (executionSettings.isCodeCoverageEnabled()
-          &&
-          // lines coverage is built on top of Jacoco,
-          // so if lines are explicitly enabled,
-          // we rely on Jacoco instrumentation rather than on our own coverage mechanism
-          !config.isCiVisibilityCoverageLinesEnabled()) {
-        Predicate<String> instrumentationFilter =
-            createCoverageInstrumentationFilter(services, repoServices);
-        inst.addTransformer(new CoverageClassTransformer(instrumentationFilter));
-      }
-
-      if (executionSettings.isFailedTestReplayEnabled()) {
-        DebuggerConfigBridge.updateConfig(new DebuggerConfigUpdate(null, true, null, null));
-      }
-
-      CiVisibilityCoverageServices.Child coverageServices =
-          new CiVisibilityCoverageServices.Child(services, repoServices, executionSettings);
-      TestEventsHandlerFactory testEventsHandlerFactory =
-          new TestEventsHandlerFactory(services, repoServices, coverageServices, executionSettings);
-      InstrumentationBridge.registerTestEventsHandlerFactory(testEventsHandlerFactory);
-      CoveragePerTestBridge.registerCoverageStoreRegistry(coverageServices.coverageStoreFactory);
-
-      AgentTracer.TracerAPI tracerAPI = AgentTracer.get();
-      tracerAPI.addShutdownListener(testEventsHandlerFactory::shutdown);
-    } else {
-      InstrumentationBridge.registerTestEventsHandlerFactory(new NoOpTestEventsHandler.Factory());
+    private static BuildEventsHandler.Factory buildEventsHandlerFactory(CiVisibilityServices services) {
+        BuildSystemSession.Factory sessionFactory = buildSystemSessionFactory(services);
+        return new BuildEventsHandler.Factory() {
+            @Override
+            public <U> BuildEventsHandler<U> create() {
+                return new BuildEventsHandlerImpl<>(sessionFactory, services.jvmInfoFactory);
+            }
+        };
     }
-  }
-
-  private static Path getCurrentPath() {
-    Path currentPath = Paths.get("").toAbsolutePath();
-    try {
-      return currentPath.toRealPath();
-    } catch (Exception e) {
-      return currentPath;
+
+    private static final class TestEventsHandlerFactory implements TestEventsHandler.Factory {
+        private final CiVisibilityServices services;
+        private final CiVisibilityRepoServices repoServices;
+        private final TestFrameworkSession.Factory sessionFactory;
+
+        private final Collection<TestEventsHandler<?, ?>> handlers = new CopyOnWriteArrayList<>();
+
+        private TestEventsHandlerFactory(
+                CiVisibilityServices services,
+                CiVisibilityRepoServices repoServices,
+                CiVisibilityCoverageServices.Child coverageServices,
+                ExecutionSettings executionSettings) {
+            this.services = services;
+            this.repoServices = repoServices;
+            if (services.processHierarchy.isChild()) {
+                sessionFactory =
+                        childTestFrameworkSessionFactory(services, repoServices, coverageServices, executionSettings);
+            } else {
+                sessionFactory = headlessTestFrameworkSessionFactory(
+                        services, repoServices, coverageServices, executionSettings);
+            }
+        }
+
+        @Override
+        public <SuiteKey, TestKey> TestEventsHandler<SuiteKey, TestKey> create(
+                String component,
+                @Nullable ContextStore<SuiteKey, DDTestSuite> suiteStore,
+                @Nullable ContextStore<TestKey, DDTest> testStore,
+                Collection<LibraryCapability> capabilities) {
+            boolean eagerSessionStart = !services.processHierarchy.isHeadless();
+            TestEventsHandler<SuiteKey, TestKey> handler = new TestEventsHandlerImpl<>(
+                    services.metricCollector,
+                    () -> sessionFactory.startSession(repoServices.moduleName, component, null, capabilities),
+                    repoServices.moduleName,
+                    eagerSessionStart,
+                    suiteStore != null ? suiteStore : new StrongMapContextStore<>(),
+                    testStore != null ? testStore : new StrongMapContextStore<>());
+            handlers.add(handler);
+            return handler;
+        }
+
+        public void shutdown() {
+            for (TestEventsHandler<?, ?> handler : handlers) {
+                handler.close();
+            }
+        }
     }
-  }
-
-  private static Predicate<String> createCoverageInstrumentationFilter(
-      CiVisibilityServices services, CiVisibilityRepoServices repoServices) {
-    String[] includedPackages = services.config.getCiVisibilityCodeCoverageIncludedPackages();
-    if (includedPackages.length == 0 && services.processHierarchy.isHeadless()) {
-      RepoIndex repoIndex = repoServices.repoIndexProvider.getIndex();
-      includedPackages =
-          Config.convertJacocoExclusionFormatToPackagePrefixes(repoIndex.getRootPackages());
+
+    private static BuildSystemSession.Factory buildSystemSessionFactory(CiVisibilityServices services) {
+        return (String projectName, Path projectRoot, String startCommand, String buildSystemName, Long startTime) -> {
+            CiVisibilityRepoServices repoServices = services.repoServices(projectRoot);
+
+            // Session needs to see the most recent commit in a repo.
+            // Cache shouldn't be a problem normally,
+            // but it can get stale if we're inside a long-running Gradle daemon
+            // and repo that we're using gets updated
+            services.gitInfoProvider.invalidateCache();
+
+            repoServices.gitDataUploader.startOrObserveGitDataUpload();
+
+            String sessionName = services.config.getCiVisibilitySessionName();
+            TestDecorator testDecorator =
+                    new TestDecoratorImpl(buildSystemName, sessionName, startCommand, repoServices.ciTags);
+
+            String signalServerHost = services.config.getCiVisibilitySignalServerHost();
+            int signalServerPort = services.config.getCiVisibilitySignalServerPort();
+            SignalServer signalServer = new SignalServer(signalServerHost, signalServerPort);
+
+            CiVisibilityCoverageServices.Parent coverageServices =
+                    new CiVisibilityCoverageServices.Parent(services, repoServices);
+            return new BuildSystemSessionImpl<>(
+                    projectName,
+                    startCommand,
+                    startTime,
+                    repoServices.ciProvider,
+                    services.config,
+                    services.metricCollector,
+                    coverageServices.moduleSignalRouter,
+                    testDecorator,
+                    repoServices.sourcePathResolver,
+                    repoServices.codeowners,
+                    services.linesResolver,
+                    repoServices.executionSettingsFactory,
+                    signalServer,
+                    repoServices.repoIndexProvider,
+                    coverageServices.coverageProcessorFactory);
+        };
     }
-    String[] excludedPackages = services.config.getCiVisibilityCodeCoverageExcludedPackages();
-    return new CoverageInstrumentationFilter(includedPackages, excludedPackages);
-  }
-
-  private static BuildEventsHandler.Factory buildEventsHandlerFactory(
-      CiVisibilityServices services) {
-    BuildSystemSession.Factory sessionFactory = buildSystemSessionFactory(services);
-    return new BuildEventsHandler.Factory() {
-      @Override
-      public <U> BuildEventsHandler<U> create() {
-        return new BuildEventsHandlerImpl<>(sessionFactory, services.jvmInfoFactory);
-      }
-    };
-  }
-
-  private static final class TestEventsHandlerFactory implements TestEventsHandler.Factory {
-    private final CiVisibilityServices services;
-    private final CiVisibilityRepoServices repoServices;
-    private final TestFrameworkSession.Factory sessionFactory;
-
-    private final Collection<TestEventsHandler<?, ?>> handlers = new CopyOnWriteArrayList<>();
-
-    private TestEventsHandlerFactory(
-        CiVisibilityServices services,
-        CiVisibilityRepoServices repoServices,
-        CiVisibilityCoverageServices.Child coverageServices,
-        ExecutionSettings executionSettings) {
-      this.services = services;
-      this.repoServices = repoServices;
-      if (services.processHierarchy.isChild()) {
-        sessionFactory =
-            childTestFrameworkSessionFactory(
-                services, repoServices, coverageServices, executionSettings);
-      } else {
-        sessionFactory =
-            headlessTestFrameworkSessionFactory(
-                services, repoServices, coverageServices, executionSettings);
-      }
+
+    private static TestFrameworkSession.Factory childTestFrameworkSessionFactory(
+            CiVisibilityServices services,
+            CiVisibilityRepoServices repoServices,
+            CiVisibilityCoverageServices.Child coverageServices,
+            ExecutionSettings executionSettings) {
+        return (String projectName, String component, Long startTime, Collection<LibraryCapability> capabilities) -> {
+            String sessionName = services.config.getCiVisibilitySessionName();
+            String testCommand = services.config.getCiVisibilityTestCommand();
+            TestDecorator testDecorator =
+                    new TestDecoratorImpl(component, sessionName, testCommand, repoServices.ciTags);
+
+            ExecutionStrategy executionStrategy = new ExecutionStrategy(
+                    services.config, executionSettings, repoServices.sourcePathResolver, services.linesResolver);
+
+            // only add report upload capability for children sessions,
+            // because report upload is only supported when the build system is instrumented
+            capabilities = new ArrayList<>(capabilities);
+            capabilities.add(LibraryCapability.COV_REPORT_UPLOAD);
+
+            return new ProxyTestSession(
+                    services.processHierarchy.parentProcessModuleContext,
+                    services.config,
+                    services.metricCollector,
+                    testDecorator,
+                    repoServices.sourcePathResolver,
+                    repoServices.codeowners,
+                    services.linesResolver,
+                    coverageServices.coverageStoreFactory,
+                    coverageServices.coverageReporter,
+                    services.signalClientFactory,
+                    executionStrategy,
+                    capabilities);
+        };
     }
 
-    @Override
-    public <SuiteKey, TestKey> TestEventsHandler<SuiteKey, TestKey> create(
-        String component,
-        @Nullable ContextStore<SuiteKey, DDTestSuite> suiteStore,
-        @Nullable ContextStore<TestKey, DDTest> testStore,
-        Collection<LibraryCapability> capabilities) {
-      boolean eagerSessionStart = !services.processHierarchy.isHeadless();
-      TestEventsHandler<SuiteKey, TestKey> handler =
-          new TestEventsHandlerImpl<>(
-              services.metricCollector,
-              () ->
-                  sessionFactory.startSession(
-                      repoServices.moduleName, component, null, capabilities),
-              repoServices.moduleName,
-              eagerSessionStart,
-              suiteStore != null ? suiteStore : new StrongMapContextStore<>(),
-              testStore != null ? testStore : new StrongMapContextStore<>());
-      handlers.add(handler);
-      return handler;
+    private static TestFrameworkSession.Factory headlessTestFrameworkSessionFactory(
+            CiVisibilityServices services,
+            CiVisibilityRepoServices repoServices,
+            CiVisibilityCoverageServices.Child coverageServices,
+            ExecutionSettings executionSettings) {
+        return (String projectName, String component, Long startTime, Collection<LibraryCapability> capabilities) -> {
+            repoServices.gitDataUploader.startOrObserveGitDataUpload();
+
+            String sessionName = services.config.getCiVisibilitySessionName();
+            TestDecorator testDecorator =
+                    new TestDecoratorImpl(component, sessionName, projectName, repoServices.ciTags);
+
+            ExecutionStrategy executionStrategy = new ExecutionStrategy(
+                    services.config, executionSettings, repoServices.sourcePathResolver, services.linesResolver);
+            return new HeadlessTestSession(
+                    projectName,
+                    startTime,
+                    repoServices.ciProvider,
+                    services.config,
+                    services.metricCollector,
+                    testDecorator,
+                    repoServices.sourcePathResolver,
+                    repoServices.codeowners,
+                    services.linesResolver,
+                    coverageServices.coverageStoreFactory,
+                    executionStrategy,
+                    capabilities);
+        };
     }
 
-    public void shutdown() {
-      for (TestEventsHandler<?, ?> handler : handlers) {
-        handler.close();
-      }
+    private static CIVisibility.SessionFactory manualApiSessionFactory(CiVisibilityServices services) {
+        return (String projectName, Path projectRoot, String component, Long startTime) -> {
+            CiVisibilityRepoServices repoServices = services.repoServices(projectRoot);
+
+            String sessionName = services.config.getCiVisibilitySessionName();
+            TestDecorator testDecorator =
+                    new TestDecoratorImpl(component, sessionName, projectName, repoServices.ciTags);
+
+            ExecutionSettings executionSettings =
+                    repoServices.executionSettingsFactory.create(JvmInfo.CURRENT_JVM, null);
+            CiVisibilityCoverageServices.Child coverageServices =
+                    new CiVisibilityCoverageServices.Child(services, repoServices, executionSettings);
+            return new ManualApiTestSession(
+                    projectName,
+                    startTime,
+                    repoServices.ciProvider,
+                    services.config,
+                    services.metricCollector,
+                    testDecorator,
+                    repoServices.sourcePathResolver,
+                    repoServices.codeowners,
+                    services.linesResolver,
+                    coverageServices.coverageStoreFactory);
+        };
     }
-  }
-
-  private static BuildSystemSession.Factory buildSystemSessionFactory(
-      CiVisibilityServices services) {
-    return (String projectName,
-        Path projectRoot,
-        String startCommand,
-        String buildSystemName,
-        Long startTime) -> {
-      CiVisibilityRepoServices repoServices = services.repoServices(projectRoot);
-
-      // Session needs to see the most recent commit in a repo.
-      // Cache shouldn't be a problem normally,
-      // but it can get stale if we're inside a long-running Gradle daemon
-      // and repo that we're using gets updated
-      services.gitInfoProvider.invalidateCache();
-
-      repoServices.gitDataUploader.startOrObserveGitDataUpload();
-
-      String sessionName = services.config.getCiVisibilitySessionName();
-      TestDecorator testDecorator =
-          new TestDecoratorImpl(buildSystemName, sessionName, startCommand, repoServices.ciTags);
-
-      String signalServerHost = services.config.getCiVisibilitySignalServerHost();
-      int signalServerPort = services.config.getCiVisibilitySignalServerPort();
-      SignalServer signalServer = new SignalServer(signalServerHost, signalServerPort);
-
-      CiVisibilityCoverageServices.Parent coverageServices =
-          new CiVisibilityCoverageServices.Parent(services, repoServices);
-      return new BuildSystemSessionImpl<>(
-          projectName,
-          startCommand,
-          startTime,
-          repoServices.ciProvider,
-          services.config,
-          services.metricCollector,
-          coverageServices.moduleSignalRouter,
-          testDecorator,
-          repoServices.sourcePathResolver,
-          repoServices.codeowners,
-          services.linesResolver,
-          repoServices.executionSettingsFactory,
-          signalServer,
-          repoServices.repoIndexProvider,
-          coverageServices.coverageProcessorFactory);
-    };
-  }
-
-  private static TestFrameworkSession.Factory childTestFrameworkSessionFactory(
-      CiVisibilityServices services,
-      CiVisibilityRepoServices repoServices,
-      CiVisibilityCoverageServices.Child coverageServices,
-      ExecutionSettings executionSettings) {
-    return (String projectName,
-        String component,
-        Long startTime,
-        Collection<LibraryCapability> capabilities) -> {
-      String sessionName = services.config.getCiVisibilitySessionName();
-      String testCommand = services.config.getCiVisibilityTestCommand();
-      TestDecorator testDecorator =
-          new TestDecoratorImpl(component, sessionName, testCommand, repoServices.ciTags);
-
-      ExecutionStrategy executionStrategy =
-          new ExecutionStrategy(
-              services.config,
-              executionSettings,
-              repoServices.sourcePathResolver,
-              services.linesResolver);
-
-      // only add report upload capability for children sessions,
-      // because report upload is only supported when the build system is instrumented
-      capabilities = new ArrayList<>(capabilities);
-      capabilities.add(LibraryCapability.COV_REPORT_UPLOAD);
-
-      return new ProxyTestSession(
-          services.processHierarchy.parentProcessModuleContext,
-          services.config,
-          services.metricCollector,
-          testDecorator,
-          repoServices.sourcePathResolver,
-          repoServices.codeowners,
-          services.linesResolver,
-          coverageServices.coverageStoreFactory,
-          coverageServices.coverageReporter,
-          services.signalClientFactory,
-          executionStrategy,
-          capabilities);
-    };
-  }
-
-  private static TestFrameworkSession.Factory headlessTestFrameworkSessionFactory(
-      CiVisibilityServices services,
-      CiVisibilityRepoServices repoServices,
-      CiVisibilityCoverageServices.Child coverageServices,
-      ExecutionSettings executionSettings) {
-    return (String projectName,
-        String component,
-        Long startTime,
-        Collection<LibraryCapability> capabilities) -> {
-      repoServices.gitDataUploader.startOrObserveGitDataUpload();
-
-      String sessionName = services.config.getCiVisibilitySessionName();
-      TestDecorator testDecorator =
-          new TestDecoratorImpl(component, sessionName, projectName, repoServices.ciTags);
-
-      ExecutionStrategy executionStrategy =
-          new ExecutionStrategy(
-              services.config,
-              executionSettings,
-              repoServices.sourcePathResolver,
-              services.linesResolver);
-      return new HeadlessTestSession(
-          projectName,
-          startTime,
-          repoServices.ciProvider,
-          services.config,
-          services.metricCollector,
-          testDecorator,
-          repoServices.sourcePathResolver,
-          repoServices.codeowners,
-          services.linesResolver,
-          coverageServices.coverageStoreFactory,
-          executionStrategy,
-          capabilities);
-    };
-  }
-
-  private static CIVisibility.SessionFactory manualApiSessionFactory(
-      CiVisibilityServices services) {
-    return (String projectName, Path projectRoot, String component, Long startTime) -> {
-      CiVisibilityRepoServices repoServices = services.repoServices(projectRoot);
-
-      String sessionName = services.config.getCiVisibilitySessionName();
-      TestDecorator testDecorator =
-          new TestDecoratorImpl(component, sessionName, projectName, repoServices.ciTags);
-
-      ExecutionSettings executionSettings =
-          repoServices.executionSettingsFactory.create(JvmInfo.CURRENT_JVM, null);
-      CiVisibilityCoverageServices.Child coverageServices =
-          new CiVisibilityCoverageServices.Child(services, repoServices, executionSettings);
-      return new ManualApiTestSession(
-          projectName,
-          startTime,
-          repoServices.ciProvider,
-          services.config,
-          services.metricCollector,
-          testDecorator,
-          repoServices.sourcePathResolver,
-          repoServices.codeowners,
-          services.linesResolver,
-          coverageServices.coverageStoreFactory);
-    };
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/Constants.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/Constants.java
index 80ce365480b..da05a08d150 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/Constants.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/Constants.java
@@ -3,33 +3,33 @@
 /** Constants that are not part of the internal (or external) API. */
 public interface Constants {
 
-  /**
-   * Indicates that early flakiness detection feature was aborted in a test session because too many
-   * test cases were considered new.
-   */
-  String EFD_ABORT_REASON_FAULTY = "faulty";
+    /**
+     * Indicates that early flakiness detection feature was aborted in a test session because too many
+     * test cases were considered new.
+     */
+    String EFD_ABORT_REASON_FAULTY = "faulty";
 
-  String CI_VISIBILITY_INSTRUMENTATION_NAME = "civisibility";
+    String CI_VISIBILITY_INSTRUMENTATION_NAME = "civisibility";
 
-  /**
-   * Env var containing SHA of the feature branch HEAD commit when running in a PR. Set manually if
-   * the necessary data is not exposed by the CI provider
-   */
-  String DDCI_PULL_REQUEST_SOURCE_SHA = "DDCI_PULL_REQUEST_SOURCE_SHA";
+    /**
+     * Env var containing SHA of the feature branch HEAD commit when running in a PR. Set manually if
+     * the necessary data is not exposed by the CI provider
+     */
+    String DDCI_PULL_REQUEST_SOURCE_SHA = "DDCI_PULL_REQUEST_SOURCE_SHA";
 
-  /**
-   * Env var containing SHA of the target branch HEAD commit when running in a PR. Set manually if
-   * the necessary data is not exposed by the CI provider
-   */
-  String DDCI_PULL_REQUEST_TARGET_SHA = "DDCI_PULL_REQUEST_TARGET_SHA";
+    /**
+     * Env var containing SHA of the target branch HEAD commit when running in a PR. Set manually if
+     * the necessary data is not exposed by the CI provider
+     */
+    String DDCI_PULL_REQUEST_TARGET_SHA = "DDCI_PULL_REQUEST_TARGET_SHA";
 
-  /**
-   * Env var containing the DDCI mode used. When the legacy mode is used,
-   * DDCI_PULL_REQUEST_TARGET_SHA won't contain the expected value, but the previous base on the
-   * push event.
-   */
-  String DDCI_REQUEST_KIND = "DDCI_REQUEST_KIND";
+    /**
+     * Env var containing the DDCI mode used. When the legacy mode is used,
+     * DDCI_PULL_REQUEST_TARGET_SHA won't contain the expected value, but the previous base on the
+     * push event.
+     */
+    String DDCI_REQUEST_KIND = "DDCI_REQUEST_KIND";
 
-  // Legacy mode identifier
-  String DDCI_LEGACY_KIND = "REQUEST_KIND_LEGACY_REQUEST";
+    // Legacy mode identifier
+    String DDCI_LEGACY_KIND = "REQUEST_KIND_LEGACY_REQUEST";
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ProcessHierarchy.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ProcessHierarchy.java
index 5029bd5677b..143b872d1b9 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ProcessHierarchy.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ProcessHierarchy.java
@@ -14,106 +14,99 @@
 
 public class ProcessHierarchy {
 
-  private static final class SystemPropertiesPropagationGetter
-      implements AgentPropagation.ContextVisitor<Map<String, String>> {
-    static final AgentPropagation.ContextVisitor<Map<String, String>> INSTANCE =
-        new SystemPropertiesPropagationGetter();
-
-    private SystemPropertiesPropagationGetter() {}
-
-    @Override
-    public void forEachKey(Map<String, String> carrier, AgentPropagation.KeyClassifier classifier) {
-      for (Map.Entry<String, String> property : carrier.entrySet()) {
-        if (!classifier.accept(property.getKey(), property.getValue())) {
-          return;
+    private static final class SystemPropertiesPropagationGetter
+            implements AgentPropagation.ContextVisitor<Map<String, String>> {
+        static final AgentPropagation.ContextVisitor<Map<String, String>> INSTANCE =
+                new SystemPropertiesPropagationGetter();
+
+        private SystemPropertiesPropagationGetter() {}
+
+        @Override
+        public void forEachKey(Map<String, String> carrier, AgentPropagation.KeyClassifier classifier) {
+            for (Map.Entry<String, String> property : carrier.entrySet()) {
+                if (!classifier.accept(property.getKey(), property.getValue())) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
-
-  @Nullable public final AgentSpanContext.Extracted parentProcessModuleContext;
-
-  ProcessHierarchy() {
-    parentProcessModuleContext =
-        extractContextAndGetSpanContext(
-            SystemProperties.asStringMap(), SystemPropertiesPropagationGetter.INSTANCE);
-  }
-
-  /**
-   * Module span context is propagated from the parent process if it runs with the tracer attached.
-   * If module span context is note there, either we are in the build system, or we are in the tests
-   * JVM and the build system is not instrumented.
-   */
-  public boolean isChild() {
-    return parentProcessModuleContext != null;
-  }
-
-  /**
-   * Determines if current process runs in "headless mode", i.e. has no instrumented parent and is
-   * not one of the supported build system processes.
-   */
-  public boolean isHeadless() {
-    return !isChild() && !isParent() && !isWrapper();
-  }
-
-  private boolean isParent() {
-    return isMavenParent() || isGradleDaemon();
-  }
-
-  /**
-   * Determines if current process is a wrapper that starts the build system. In other words a
-   * process that is not a build system, and not a JVM that runs tests.
-   */
-  private boolean isWrapper() {
-    // Maven Wrapper runs in the same JVM as Maven itself,
-    // so it is not included here
-    return isGradleLauncher() || isGradleWrapper();
-  }
-
-  private boolean isMavenParent() {
-    return SystemProperties.get("maven.home") != null
-            && SystemProperties.get("classworlds.conf") != null
-        // when using Maven Wrapper
-        || ClassLoader.getSystemClassLoader()
-                .getResource("org/apache/maven/wrapper/WrapperExecutor.class")
-            != null;
-  }
-
-  private boolean isGradleDaemon() {
-    return ClassLoader.getSystemClassLoader()
-                .getResource("org/gradle/launcher/daemon/bootstrap/GradleDaemon.class")
-            != null
-        // double-check this is not a Gradle Worker
-        && SystemProperties.get("org.gradle.internal.worker.tmpdir") == null;
-  }
-
-  private boolean isGradleLauncher() {
-    ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-    return contextClassLoader.getResource("org/gradle/launcher/Main.class") != null
-        || contextClassLoader.getResource("org/gradle/launcher/GradleMain.class") != null;
-  }
-
-  private boolean isGradleWrapper() {
-    // The Gradle Wrapper bootstraps before the launcher classes are on the classpath,
-    // so at premain only the wrapper's own class is visible.
-    return Thread.currentThread()
-            .getContextClassLoader()
-            .getResource("org/gradle/wrapper/GradleWrapperMain.class")
-        != null;
-  }
-
-  @Nullable
-  public InetSocketAddress getSignalServerAddress() {
-    // System properties are used rather than Config,
-    // because system variables can be set after config was initialized
-    String host =
-        SystemProperties.get(propertyNameToSystemPropertyName(CIVISIBILITY_SIGNAL_SERVER_HOST));
-    String port =
-        SystemProperties.get(propertyNameToSystemPropertyName(CIVISIBILITY_SIGNAL_SERVER_PORT));
-    if (host != null && port != null) {
-      return new InetSocketAddress(host, Integer.parseInt(port));
-    } else {
-      return null;
+
+    @Nullable
+    public final AgentSpanContext.Extracted parentProcessModuleContext;
+
+    ProcessHierarchy() {
+        parentProcessModuleContext = extractContextAndGetSpanContext(
+                SystemProperties.asStringMap(), SystemPropertiesPropagationGetter.INSTANCE);
+    }
+
+    /**
+     * Module span context is propagated from the parent process if it runs with the tracer attached.
+     * If module span context is note there, either we are in the build system, or we are in the tests
+     * JVM and the build system is not instrumented.
+     */
+    public boolean isChild() {
+        return parentProcessModuleContext != null;
+    }
+
+    /**
+     * Determines if current process runs in "headless mode", i.e. has no instrumented parent and is
+     * not one of the supported build system processes.
+     */
+    public boolean isHeadless() {
+        return !isChild() && !isParent() && !isWrapper();
+    }
+
+    private boolean isParent() {
+        return isMavenParent() || isGradleDaemon();
+    }
+
+    /**
+     * Determines if current process is a wrapper that starts the build system. In other words a
+     * process that is not a build system, and not a JVM that runs tests.
+     */
+    private boolean isWrapper() {
+        // Maven Wrapper runs in the same JVM as Maven itself,
+        // so it is not included here
+        return isGradleLauncher() || isGradleWrapper();
+    }
+
+    private boolean isMavenParent() {
+        return SystemProperties.get("maven.home") != null && SystemProperties.get("classworlds.conf") != null
+                // when using Maven Wrapper
+                || ClassLoader.getSystemClassLoader().getResource("org/apache/maven/wrapper/WrapperExecutor.class")
+                        != null;
+    }
+
+    private boolean isGradleDaemon() {
+        return ClassLoader.getSystemClassLoader().getResource("org/gradle/launcher/daemon/bootstrap/GradleDaemon.class")
+                        != null
+                // double-check this is not a Gradle Worker
+                && SystemProperties.get("org.gradle.internal.worker.tmpdir") == null;
+    }
+
+    private boolean isGradleLauncher() {
+        ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        return contextClassLoader.getResource("org/gradle/launcher/Main.class") != null
+                || contextClassLoader.getResource("org/gradle/launcher/GradleMain.class") != null;
+    }
+
+    private boolean isGradleWrapper() {
+        // The Gradle Wrapper bootstraps before the launcher classes are on the classpath,
+        // so at premain only the wrapper's own class is visible.
+        return Thread.currentThread().getContextClassLoader().getResource("org/gradle/wrapper/GradleWrapperMain.class")
+                != null;
+    }
+
+    @Nullable
+    public InetSocketAddress getSignalServerAddress() {
+        // System properties are used rather than Config,
+        // because system variables can be set after config was initialized
+        String host = SystemProperties.get(propertyNameToSystemPropertyName(CIVISIBILITY_SIGNAL_SERVER_HOST));
+        String port = SystemProperties.get(propertyNameToSystemPropertyName(CIVISIBILITY_SIGNAL_SERVER_PORT));
+        if (host != null && port != null) {
+            return new InetSocketAddress(host, Integer.parseInt(port));
+        } else {
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AppVeyorInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AppVeyorInfo.java
index f8bc31dd090..674e17b137b 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AppVeyorInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AppVeyorInfo.java
@@ -14,135 +14,130 @@
 
 class AppVeyorInfo implements CIProviderInfo {
 
-  // https://www.appveyor.com/docs/environment-variables/
-  public static final String APPVEYOR = "APPVEYOR";
-  public static final String APPVEYOR_PROVIDER_NAME = "appveyor";
-  public static final String APPVEYOR_BUILD_ID = "APPVEYOR_BUILD_ID";
-  public static final String APPVEYOR_REPO_NAME = "APPVEYOR_REPO_NAME";
-  public static final String APPVEYOR_PIPELINE_NUMBER = "APPVEYOR_BUILD_NUMBER";
-  public static final String APPVEYOR_WORKSPACE_PATH = "APPVEYOR_BUILD_FOLDER";
-  public static final String APPVEYOR_REPO_PROVIDER = "APPVEYOR_REPO_PROVIDER";
-  public static final String APPVEYOR_REPO_COMMIT = "APPVEYOR_REPO_COMMIT";
-  public static final String APPVEYOR_REPO_BRANCH = "APPVEYOR_REPO_BRANCH";
-  public static final String APPVEYOR_REPO_TAG_NAME = "APPVEYOR_REPO_TAG_NAME";
-  public static final String APPVEYOR_REPO_COMMIT_MESSAGE_SUBJECT = "APPVEYOR_REPO_COMMIT_MESSAGE";
-  public static final String APPVEYOR_REPO_COMMIT_MESSAGE_BODY =
-      "APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED";
-  public static final String APPVEYOR_REPO_COMMIT_AUTHOR_NAME = "APPVEYOR_REPO_COMMIT_AUTHOR";
-  public static final String APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL =
-      "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL";
-  public static final String APPVEYOR_PR_HEAD_REPO_BRANCH =
-      "APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH";
-  public static final String APPVEYOR_PR_HEAD_COMMIT = "APPVEYOR_PULL_REQUEST_HEAD_COMMIT";
-  public static final String APPVEYOR_PR_NUMBER = "APPVEYOR_PULL_REQUEST_NUMBER";
-
-  private final CiEnvironment environment;
-
-  AppVeyorInfo(CiEnvironment environment) {
-    this.environment = environment;
-  }
-
-  @Override
-  public GitInfo buildCIGitInfo() {
-    final String repoProvider = environment.get(APPVEYOR_REPO_PROVIDER);
-    final String messageSubject = environment.get(APPVEYOR_REPO_COMMIT_MESSAGE_SUBJECT);
-    final String messageBody = environment.get(APPVEYOR_REPO_COMMIT_MESSAGE_BODY);
-    return new GitInfo(
-        buildGitRepositoryUrl(repoProvider, environment.get(APPVEYOR_REPO_NAME)),
-        buildGitBranch(repoProvider),
-        buildGitTag(repoProvider),
-        new CommitInfo(
-            buildGitCommit(),
-            buildGitCommitAuthor(),
-            PersonInfo.NOOP,
-            getCommitMessage(messageSubject, messageBody)));
-  }
-
-  private static String getCommitMessage(String messageSubject, String messageBody) {
-    if (messageSubject == null) {
-      return messageBody;
+    // https://www.appveyor.com/docs/environment-variables/
+    public static final String APPVEYOR = "APPVEYOR";
+    public static final String APPVEYOR_PROVIDER_NAME = "appveyor";
+    public static final String APPVEYOR_BUILD_ID = "APPVEYOR_BUILD_ID";
+    public static final String APPVEYOR_REPO_NAME = "APPVEYOR_REPO_NAME";
+    public static final String APPVEYOR_PIPELINE_NUMBER = "APPVEYOR_BUILD_NUMBER";
+    public static final String APPVEYOR_WORKSPACE_PATH = "APPVEYOR_BUILD_FOLDER";
+    public static final String APPVEYOR_REPO_PROVIDER = "APPVEYOR_REPO_PROVIDER";
+    public static final String APPVEYOR_REPO_COMMIT = "APPVEYOR_REPO_COMMIT";
+    public static final String APPVEYOR_REPO_BRANCH = "APPVEYOR_REPO_BRANCH";
+    public static final String APPVEYOR_REPO_TAG_NAME = "APPVEYOR_REPO_TAG_NAME";
+    public static final String APPVEYOR_REPO_COMMIT_MESSAGE_SUBJECT = "APPVEYOR_REPO_COMMIT_MESSAGE";
+    public static final String APPVEYOR_REPO_COMMIT_MESSAGE_BODY = "APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED";
+    public static final String APPVEYOR_REPO_COMMIT_AUTHOR_NAME = "APPVEYOR_REPO_COMMIT_AUTHOR";
+    public static final String APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL = "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL";
+    public static final String APPVEYOR_PR_HEAD_REPO_BRANCH = "APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH";
+    public static final String APPVEYOR_PR_HEAD_COMMIT = "APPVEYOR_PULL_REQUEST_HEAD_COMMIT";
+    public static final String APPVEYOR_PR_NUMBER = "APPVEYOR_PULL_REQUEST_NUMBER";
+
+    private final CiEnvironment environment;
+
+    AppVeyorInfo(CiEnvironment environment) {
+        this.environment = environment;
     }
-    if (messageBody == null) {
-      return messageSubject;
+
+    @Override
+    public GitInfo buildCIGitInfo() {
+        final String repoProvider = environment.get(APPVEYOR_REPO_PROVIDER);
+        final String messageSubject = environment.get(APPVEYOR_REPO_COMMIT_MESSAGE_SUBJECT);
+        final String messageBody = environment.get(APPVEYOR_REPO_COMMIT_MESSAGE_BODY);
+        return new GitInfo(
+                buildGitRepositoryUrl(repoProvider, environment.get(APPVEYOR_REPO_NAME)),
+                buildGitBranch(repoProvider),
+                buildGitTag(repoProvider),
+                new CommitInfo(
+                        buildGitCommit(),
+                        buildGitCommitAuthor(),
+                        PersonInfo.NOOP,
+                        getCommitMessage(messageSubject, messageBody)));
+    }
+
+    private static String getCommitMessage(String messageSubject, String messageBody) {
+        if (messageSubject == null) {
+            return messageBody;
+        }
+        if (messageBody == null) {
+            return messageSubject;
+        }
+        return String.format("%s%n%s", messageSubject, messageBody);
     }
-    return String.format("%s%n%s", messageSubject, messageBody);
-  }
-
-  @Override
-  public CIInfo buildCIInfo() {
-    final String url =
-        buildPipelineUrl(environment.get(APPVEYOR_REPO_NAME), environment.get(APPVEYOR_BUILD_ID));
-    return CIInfo.builder(environment)
-        .ciProviderName(APPVEYOR_PROVIDER_NAME)
-        .ciPipelineId(environment.get(APPVEYOR_BUILD_ID))
-        .ciPipelineName(environment.get(APPVEYOR_REPO_NAME))
-        .ciPipelineNumber(environment.get(APPVEYOR_PIPELINE_NUMBER))
-        .ciPipelineUrl(url)
-        .ciJobUrl(url)
-        .ciWorkspace(expandTilde(environment.get(APPVEYOR_WORKSPACE_PATH)))
-        .build();
-  }
-
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    // check if PR is detected
-    if (Strings.isNotBlank(environment.get(APPVEYOR_PR_HEAD_REPO_BRANCH))) {
-      return new PullRequestInfo(
-          normalizeBranch(environment.get(APPVEYOR_REPO_BRANCH)),
-          null,
-          null,
-          new CommitInfo(environment.get(APPVEYOR_PR_HEAD_COMMIT)),
-          environment.get(APPVEYOR_PR_NUMBER));
-    } else {
-      return PullRequestInfo.EMPTY;
+
+    @Override
+    public CIInfo buildCIInfo() {
+        final String url = buildPipelineUrl(environment.get(APPVEYOR_REPO_NAME), environment.get(APPVEYOR_BUILD_ID));
+        return CIInfo.builder(environment)
+                .ciProviderName(APPVEYOR_PROVIDER_NAME)
+                .ciPipelineId(environment.get(APPVEYOR_BUILD_ID))
+                .ciPipelineName(environment.get(APPVEYOR_REPO_NAME))
+                .ciPipelineNumber(environment.get(APPVEYOR_PIPELINE_NUMBER))
+                .ciPipelineUrl(url)
+                .ciJobUrl(url)
+                .ciWorkspace(expandTilde(environment.get(APPVEYOR_WORKSPACE_PATH)))
+                .build();
     }
-  }
-
-  private String buildGitBranch(final String repoProvider) {
-    if ("github".equals(repoProvider)) {
-      String branch = environment.get(APPVEYOR_PR_HEAD_REPO_BRANCH);
-      if (branch == null || branch.isEmpty()) {
-        branch = environment.get(APPVEYOR_REPO_BRANCH);
-      }
-      return normalizeBranch(branch);
+
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        // check if PR is detected
+        if (Strings.isNotBlank(environment.get(APPVEYOR_PR_HEAD_REPO_BRANCH))) {
+            return new PullRequestInfo(
+                    normalizeBranch(environment.get(APPVEYOR_REPO_BRANCH)),
+                    null,
+                    null,
+                    new CommitInfo(environment.get(APPVEYOR_PR_HEAD_COMMIT)),
+                    environment.get(APPVEYOR_PR_NUMBER));
+        } else {
+            return PullRequestInfo.EMPTY;
+        }
+    }
+
+    private String buildGitBranch(final String repoProvider) {
+        if ("github".equals(repoProvider)) {
+            String branch = environment.get(APPVEYOR_PR_HEAD_REPO_BRANCH);
+            if (branch == null || branch.isEmpty()) {
+                branch = environment.get(APPVEYOR_REPO_BRANCH);
+            }
+            return normalizeBranch(branch);
+        }
+        return null;
+    }
+
+    private String buildGitTag(final String repoProvider) {
+        if ("github".equals(repoProvider)) {
+            return normalizeTag(environment.get(APPVEYOR_REPO_TAG_NAME));
+        }
+        return null;
+    }
+
+    private String buildGitCommit() {
+        if ("github".equals(environment.get(APPVEYOR_REPO_PROVIDER))) {
+            return environment.get(APPVEYOR_REPO_COMMIT);
+        }
+        return null;
+    }
+
+    private String buildGitRepositoryUrl(final String repoProvider, final String repoName) {
+        if ("github".equals(repoProvider) && (repoName != null && !repoName.isEmpty())) {
+            return String.format("https://github.com/%s.git", repoName);
+        }
+        return null;
     }
-    return null;
-  }
 
-  private String buildGitTag(final String repoProvider) {
-    if ("github".equals(repoProvider)) {
-      return normalizeTag(environment.get(APPVEYOR_REPO_TAG_NAME));
+    private String buildPipelineUrl(final String repoName, final String buildId) {
+        return String.format("https://ci.appveyor.com/project/%s/builds/%s", repoName, buildId);
     }
-    return null;
-  }
 
-  private String buildGitCommit() {
-    if ("github".equals(environment.get(APPVEYOR_REPO_PROVIDER))) {
-      return environment.get(APPVEYOR_REPO_COMMIT);
+    private PersonInfo buildGitCommitAuthor() {
+        return new PersonInfo(
+                environment.get(APPVEYOR_REPO_COMMIT_AUTHOR_NAME), environment.get(APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL));
     }
-    return null;
-  }
 
-  private String buildGitRepositoryUrl(final String repoProvider, final String repoName) {
-    if ("github".equals(repoProvider) && (repoName != null && !repoName.isEmpty())) {
-      return String.format("https://github.com/%s.git", repoName);
+    @Override
+    public Provider getProvider() {
+        return Provider.APPVEYOR;
     }
-    return null;
-  }
-
-  private String buildPipelineUrl(final String repoName, final String buildId) {
-    return String.format("https://ci.appveyor.com/project/%s/builds/%s", repoName, buildId);
-  }
-
-  private PersonInfo buildGitCommitAuthor() {
-    return new PersonInfo(
-        environment.get(APPVEYOR_REPO_COMMIT_AUTHOR_NAME),
-        environment.get(APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL));
-  }
-
-  @Override
-  public Provider getProvider() {
-    return Provider.APPVEYOR;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AwsCodePipelineInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AwsCodePipelineInfo.java
index 25dc3496f59..93c622d9e16 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AwsCodePipelineInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AwsCodePipelineInfo.java
@@ -7,44 +7,41 @@
 
 class AwsCodePipelineInfo implements CIProviderInfo {
 
-  public static final String AWS_CODEPIPELINE = "CODEBUILD_INITIATOR";
-  public static final String AWS_CODEPIPELINE_PROVIDER_NAME = "awscodepipeline";
-  public static final String AWS_CODEPIPELINE_EXECUTION_ID = "DD_PIPELINE_EXECUTION_ID";
-  public static final String AWS_CODEPIPELINE_ACTION_EXECUTION_ID = "DD_ACTION_EXECUTION_ID";
-  public static final String AWS_CODEPIPELINE_ARN = "CODEBUILD_BUILD_ARN";
-
-  private final CiEnvironment environment;
-
-  AwsCodePipelineInfo(CiEnvironment environment) {
-    this.environment = environment;
-  }
-
-  @Override
-  public GitInfo buildCIGitInfo() {
-    return GitInfo.NOOP;
-  }
-
-  @Override
-  public CIInfo buildCIInfo() {
-    return CIInfo.builder(environment)
-        .ciProviderName(AWS_CODEPIPELINE_PROVIDER_NAME)
-        .ciPipelineId(environment.get(AWS_CODEPIPELINE_EXECUTION_ID))
-        .ciJobId(environment.get(AWS_CODEPIPELINE_ACTION_EXECUTION_ID))
-        .ciEnvVars(
-            AWS_CODEPIPELINE_EXECUTION_ID,
-            AWS_CODEPIPELINE_ACTION_EXECUTION_ID,
-            AWS_CODEPIPELINE_ARN)
-        .build();
-  }
-
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    return PullRequestInfo.EMPTY;
-  }
-
-  @Override
-  public Provider getProvider() {
-    return Provider.AWS;
-  }
+    public static final String AWS_CODEPIPELINE = "CODEBUILD_INITIATOR";
+    public static final String AWS_CODEPIPELINE_PROVIDER_NAME = "awscodepipeline";
+    public static final String AWS_CODEPIPELINE_EXECUTION_ID = "DD_PIPELINE_EXECUTION_ID";
+    public static final String AWS_CODEPIPELINE_ACTION_EXECUTION_ID = "DD_ACTION_EXECUTION_ID";
+    public static final String AWS_CODEPIPELINE_ARN = "CODEBUILD_BUILD_ARN";
+
+    private final CiEnvironment environment;
+
+    AwsCodePipelineInfo(CiEnvironment environment) {
+        this.environment = environment;
+    }
+
+    @Override
+    public GitInfo buildCIGitInfo() {
+        return GitInfo.NOOP;
+    }
+
+    @Override
+    public CIInfo buildCIInfo() {
+        return CIInfo.builder(environment)
+                .ciProviderName(AWS_CODEPIPELINE_PROVIDER_NAME)
+                .ciPipelineId(environment.get(AWS_CODEPIPELINE_EXECUTION_ID))
+                .ciJobId(environment.get(AWS_CODEPIPELINE_ACTION_EXECUTION_ID))
+                .ciEnvVars(AWS_CODEPIPELINE_EXECUTION_ID, AWS_CODEPIPELINE_ACTION_EXECUTION_ID, AWS_CODEPIPELINE_ARN)
+                .build();
+    }
+
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        return PullRequestInfo.EMPTY;
+    }
+
+    @Override
+    public Provider getProvider() {
+        return Provider.AWS;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AzurePipelinesInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AzurePipelinesInfo.java
index 11d3ebc65e3..93e534ec8bc 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AzurePipelinesInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AzurePipelinesInfo.java
@@ -15,151 +15,142 @@
 
 class AzurePipelinesInfo implements CIProviderInfo {
 
-  // https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops
-  public static final String AZURE = "TF_BUILD";
-  public static final String AZURE_PROVIDER_NAME = "azurepipelines";
-  public static final String AZURE_PIPELINE_NAME = "BUILD_DEFINITIONNAME";
-  public static final String AZURE_SYSTEM_TEAMFOUNDATIONSERVERURI =
-      "SYSTEM_TEAMFOUNDATIONSERVERURI";
-  public static final String AZURE_SYSTEM_TEAMPROJECTID = "SYSTEM_TEAMPROJECTID";
-  public static final String AZURE_SYSTEM_STAGEDISPLAYNAME = "SYSTEM_STAGEDISPLAYNAME";
-  public static final String AZURE_SYSTEM_JOBDISPLAYNAME = "SYSTEM_JOBDISPLAYNAME";
-  public static final String AZURE_BUILD_BUILDID = "BUILD_BUILDID";
-  public static final String AZURE_SYSTEM_JOBID = "SYSTEM_JOBID";
-  public static final String AZURE_SYSTEM_TASKINSTANCEID = "SYSTEM_TASKINSTANCEID";
-  public static final String AZURE_WORKSPACE_PATH = "BUILD_SOURCESDIRECTORY";
-  public static final String AZURE_SYSTEM_PULLREQUEST_SOURCEREPOSITORYURI =
-      "SYSTEM_PULLREQUEST_SOURCEREPOSITORYURI";
-  public static final String AZURE_BUILD_REPOSITORY_URI = "BUILD_REPOSITORY_URI";
-  public static final String AZURE_SYSTEM_PULLREQUEST_SOURCECOMMITID =
-      "SYSTEM_PULLREQUEST_SOURCECOMMITID";
-  public static final String AZURE_BUILD_SOURCEVERSION = "BUILD_SOURCEVERSION";
-  public static final String AZURE_SYSTEM_PULLREQUEST_SOURCEBRANCH =
-      "SYSTEM_PULLREQUEST_SOURCEBRANCH";
-  public static final String AZURE_BUILD_SOURCEBRANCH = "BUILD_SOURCEBRANCH";
-  public static final String AZURE_BUILD_SOURCEVERSION_MESSAGE = "BUILD_SOURCEVERSIONMESSAGE";
-  public static final String AZURE_BUILD_REQUESTED_FOR_ID = "BUILD_REQUESTEDFORID";
-  public static final String AZURE_BUILD_REQUESTED_FOR_EMAIL = "BUILD_REQUESTEDFOREMAIL";
-  public static final String AZURE_PR_NUMBER = "SYSTEM_PULLREQUEST_PULLREQUESTNUMBER";
-  public static final String AZURE_PR_TARGET_BRANCH = "SYSTEM_PULLREQUEST_TARGETBRANCH";
-
-  private final CiEnvironment environment;
-
-  AzurePipelinesInfo(CiEnvironment environment) {
-    this.environment = environment;
-  }
-
-  @Override
-  public GitInfo buildCIGitInfo() {
-    return new GitInfo(
-        buildGitRepositoryUrl(),
-        buildGitBranch(),
-        buildGitTag(),
-        new CommitInfo(
-            buildGitCommit(),
-            buildGitCommitAuthor(),
-            PersonInfo.NOOP,
-            environment.get(AZURE_BUILD_SOURCEVERSION_MESSAGE)));
-  }
-
-  @Override
-  public CIInfo buildCIInfo() {
-    final String uri = environment.get(AZURE_SYSTEM_TEAMFOUNDATIONSERVERURI);
-    final String project = environment.get(AZURE_SYSTEM_TEAMPROJECTID);
-    final String buildId = environment.get(AZURE_BUILD_BUILDID);
-    final String jobId = environment.get(AZURE_SYSTEM_JOBID);
-    final String taskId = environment.get(AZURE_SYSTEM_TASKINSTANCEID);
-
-    return CIInfo.builder(environment)
-        .ciProviderName(AZURE_PROVIDER_NAME)
-        .ciPipelineId(environment.get(AZURE_BUILD_BUILDID))
-        .ciPipelineName(environment.get(AZURE_PIPELINE_NAME))
-        .ciPipelineNumber(buildId)
-        .ciPipelineUrl(buildCiPipelineUrl(uri, project, buildId))
-        .ciStageName(environment.get(AZURE_SYSTEM_STAGEDISPLAYNAME))
-        .ciJobId(jobId)
-        .ciJobName(environment.get(AZURE_SYSTEM_JOBDISPLAYNAME))
-        .ciJobUrl(buildCiJobUrl(uri, project, buildId, jobId, taskId))
-        .ciWorkspace(expandTilde(environment.get(AZURE_WORKSPACE_PATH)))
-        .ciEnvVars(AZURE_SYSTEM_TEAMPROJECTID, AZURE_BUILD_BUILDID, AZURE_SYSTEM_JOBID)
-        .build();
-  }
-
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    return new PullRequestInfo(
-        normalizeBranch(environment.get(AZURE_PR_TARGET_BRANCH)),
-        null,
-        null,
-        CommitInfo.NOOP,
-        environment.get(AZURE_PR_NUMBER));
-  }
-
-  private String buildGitBranch() {
-    String gitBranchOrTag = getGitBranchOrTag();
-    if (!isTagReference(gitBranchOrTag)) {
-      return normalizeBranch(gitBranchOrTag);
-    } else {
-      return null;
+    // https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops
+    public static final String AZURE = "TF_BUILD";
+    public static final String AZURE_PROVIDER_NAME = "azurepipelines";
+    public static final String AZURE_PIPELINE_NAME = "BUILD_DEFINITIONNAME";
+    public static final String AZURE_SYSTEM_TEAMFOUNDATIONSERVERURI = "SYSTEM_TEAMFOUNDATIONSERVERURI";
+    public static final String AZURE_SYSTEM_TEAMPROJECTID = "SYSTEM_TEAMPROJECTID";
+    public static final String AZURE_SYSTEM_STAGEDISPLAYNAME = "SYSTEM_STAGEDISPLAYNAME";
+    public static final String AZURE_SYSTEM_JOBDISPLAYNAME = "SYSTEM_JOBDISPLAYNAME";
+    public static final String AZURE_BUILD_BUILDID = "BUILD_BUILDID";
+    public static final String AZURE_SYSTEM_JOBID = "SYSTEM_JOBID";
+    public static final String AZURE_SYSTEM_TASKINSTANCEID = "SYSTEM_TASKINSTANCEID";
+    public static final String AZURE_WORKSPACE_PATH = "BUILD_SOURCESDIRECTORY";
+    public static final String AZURE_SYSTEM_PULLREQUEST_SOURCEREPOSITORYURI = "SYSTEM_PULLREQUEST_SOURCEREPOSITORYURI";
+    public static final String AZURE_BUILD_REPOSITORY_URI = "BUILD_REPOSITORY_URI";
+    public static final String AZURE_SYSTEM_PULLREQUEST_SOURCECOMMITID = "SYSTEM_PULLREQUEST_SOURCECOMMITID";
+    public static final String AZURE_BUILD_SOURCEVERSION = "BUILD_SOURCEVERSION";
+    public static final String AZURE_SYSTEM_PULLREQUEST_SOURCEBRANCH = "SYSTEM_PULLREQUEST_SOURCEBRANCH";
+    public static final String AZURE_BUILD_SOURCEBRANCH = "BUILD_SOURCEBRANCH";
+    public static final String AZURE_BUILD_SOURCEVERSION_MESSAGE = "BUILD_SOURCEVERSIONMESSAGE";
+    public static final String AZURE_BUILD_REQUESTED_FOR_ID = "BUILD_REQUESTEDFORID";
+    public static final String AZURE_BUILD_REQUESTED_FOR_EMAIL = "BUILD_REQUESTEDFOREMAIL";
+    public static final String AZURE_PR_NUMBER = "SYSTEM_PULLREQUEST_PULLREQUESTNUMBER";
+    public static final String AZURE_PR_TARGET_BRANCH = "SYSTEM_PULLREQUEST_TARGETBRANCH";
+
+    private final CiEnvironment environment;
+
+    AzurePipelinesInfo(CiEnvironment environment) {
+        this.environment = environment;
     }
-  }
-
-  private String buildGitTag() {
-    String gitBranchOrTag = getGitBranchOrTag();
-    if (isTagReference(gitBranchOrTag)) {
-      return normalizeTag(gitBranchOrTag);
-    } else {
-      return null;
+
+    @Override
+    public GitInfo buildCIGitInfo() {
+        return new GitInfo(
+                buildGitRepositoryUrl(),
+                buildGitBranch(),
+                buildGitTag(),
+                new CommitInfo(
+                        buildGitCommit(),
+                        buildGitCommitAuthor(),
+                        PersonInfo.NOOP,
+                        environment.get(AZURE_BUILD_SOURCEVERSION_MESSAGE)));
+    }
+
+    @Override
+    public CIInfo buildCIInfo() {
+        final String uri = environment.get(AZURE_SYSTEM_TEAMFOUNDATIONSERVERURI);
+        final String project = environment.get(AZURE_SYSTEM_TEAMPROJECTID);
+        final String buildId = environment.get(AZURE_BUILD_BUILDID);
+        final String jobId = environment.get(AZURE_SYSTEM_JOBID);
+        final String taskId = environment.get(AZURE_SYSTEM_TASKINSTANCEID);
+
+        return CIInfo.builder(environment)
+                .ciProviderName(AZURE_PROVIDER_NAME)
+                .ciPipelineId(environment.get(AZURE_BUILD_BUILDID))
+                .ciPipelineName(environment.get(AZURE_PIPELINE_NAME))
+                .ciPipelineNumber(buildId)
+                .ciPipelineUrl(buildCiPipelineUrl(uri, project, buildId))
+                .ciStageName(environment.get(AZURE_SYSTEM_STAGEDISPLAYNAME))
+                .ciJobId(jobId)
+                .ciJobName(environment.get(AZURE_SYSTEM_JOBDISPLAYNAME))
+                .ciJobUrl(buildCiJobUrl(uri, project, buildId, jobId, taskId))
+                .ciWorkspace(expandTilde(environment.get(AZURE_WORKSPACE_PATH)))
+                .ciEnvVars(AZURE_SYSTEM_TEAMPROJECTID, AZURE_BUILD_BUILDID, AZURE_SYSTEM_JOBID)
+                .build();
+    }
+
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        return new PullRequestInfo(
+                normalizeBranch(environment.get(AZURE_PR_TARGET_BRANCH)),
+                null,
+                null,
+                CommitInfo.NOOP,
+                environment.get(AZURE_PR_NUMBER));
+    }
+
+    private String buildGitBranch() {
+        String gitBranchOrTag = getGitBranchOrTag();
+        if (!isTagReference(gitBranchOrTag)) {
+            return normalizeBranch(gitBranchOrTag);
+        } else {
+            return null;
+        }
+    }
+
+    private String buildGitTag() {
+        String gitBranchOrTag = getGitBranchOrTag();
+        if (isTagReference(gitBranchOrTag)) {
+            return normalizeTag(gitBranchOrTag);
+        } else {
+            return null;
+        }
+    }
+
+    private String getGitBranchOrTag() {
+        String gitBranchOrTag = environment.get(AZURE_SYSTEM_PULLREQUEST_SOURCEBRANCH);
+        if (gitBranchOrTag == null || gitBranchOrTag.isEmpty()) {
+            gitBranchOrTag = environment.get(AZURE_BUILD_SOURCEBRANCH);
+        }
+        return gitBranchOrTag;
+    }
+
+    private String buildGitCommit() {
+        String commit = environment.get(AZURE_SYSTEM_PULLREQUEST_SOURCECOMMITID);
+        if (commit == null || commit.isEmpty()) {
+            commit = environment.get(AZURE_BUILD_SOURCEVERSION);
+        }
+        return commit;
+    }
+
+    private String buildGitRepositoryUrl() {
+        String repoUrl = environment.get(AZURE_SYSTEM_PULLREQUEST_SOURCEREPOSITORYURI);
+        if (repoUrl == null || repoUrl.isEmpty()) {
+            repoUrl = environment.get(AZURE_BUILD_REPOSITORY_URI);
+        }
+        return filterSensitiveInfo(repoUrl);
+    }
+
+    private String buildCiJobUrl(
+            final String uri, final String project, final String buildId, final String jobId, final String taskId) {
+        return String.format(
+                "%s%s/_build/results?buildId=%s&view=logs&j=%s&t=%s", uri, project, buildId, jobId, taskId);
     }
-  }
 
-  private String getGitBranchOrTag() {
-    String gitBranchOrTag = environment.get(AZURE_SYSTEM_PULLREQUEST_SOURCEBRANCH);
-    if (gitBranchOrTag == null || gitBranchOrTag.isEmpty()) {
-      gitBranchOrTag = environment.get(AZURE_BUILD_SOURCEBRANCH);
+    private String buildCiPipelineUrl(final String uri, final String project, final String buildId) {
+        return String.format("%s%s/_build/results?buildId=%s", uri, project, buildId);
     }
-    return gitBranchOrTag;
-  }
 
-  private String buildGitCommit() {
-    String commit = environment.get(AZURE_SYSTEM_PULLREQUEST_SOURCECOMMITID);
-    if (commit == null || commit.isEmpty()) {
-      commit = environment.get(AZURE_BUILD_SOURCEVERSION);
+    private PersonInfo buildGitCommitAuthor() {
+        return new PersonInfo(
+                environment.get(AZURE_BUILD_REQUESTED_FOR_ID), environment.get(AZURE_BUILD_REQUESTED_FOR_EMAIL));
     }
-    return commit;
-  }
 
-  private String buildGitRepositoryUrl() {
-    String repoUrl = environment.get(AZURE_SYSTEM_PULLREQUEST_SOURCEREPOSITORYURI);
-    if (repoUrl == null || repoUrl.isEmpty()) {
-      repoUrl = environment.get(AZURE_BUILD_REPOSITORY_URI);
+    @Override
+    public Provider getProvider() {
+        return Provider.AZP;
     }
-    return filterSensitiveInfo(repoUrl);
-  }
-
-  private String buildCiJobUrl(
-      final String uri,
-      final String project,
-      final String buildId,
-      final String jobId,
-      final String taskId) {
-    return String.format(
-        "%s%s/_build/results?buildId=%s&view=logs&j=%s&t=%s", uri, project, buildId, jobId, taskId);
-  }
-
-  private String buildCiPipelineUrl(final String uri, final String project, final String buildId) {
-    return String.format("%s%s/_build/results?buildId=%s", uri, project, buildId);
-  }
-
-  private PersonInfo buildGitCommitAuthor() {
-    return new PersonInfo(
-        environment.get(AZURE_BUILD_REQUESTED_FOR_ID),
-        environment.get(AZURE_BUILD_REQUESTED_FOR_EMAIL));
-  }
-
-  @Override
-  public Provider getProvider() {
-    return Provider.AZP;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BazelInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BazelInfo.java
index 2a470c2df41..5fbbbd52b30 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BazelInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BazelInfo.java
@@ -13,24 +13,24 @@
  */
 class BazelInfo implements CIProviderInfo {
 
-  @Override
-  public GitInfo buildCIGitInfo() {
-    return GitInfo.NOOP;
-  }
+    @Override
+    public GitInfo buildCIGitInfo() {
+        return GitInfo.NOOP;
+    }
 
-  @Override
-  public CIInfo buildCIInfo() {
-    return CIInfo.NOOP;
-  }
+    @Override
+    public CIInfo buildCIInfo() {
+        return CIInfo.NOOP;
+    }
 
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    return PullRequestInfo.EMPTY;
-  }
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        return PullRequestInfo.EMPTY;
+    }
 
-  @Override
-  public Provider getProvider() {
-    return Provider.BAZEL;
-  }
+    @Override
+    public Provider getProvider() {
+        return Provider.BAZEL;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitBucketInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitBucketInfo.java
index 1c95c0d4bff..4edbcfe07ab 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitBucketInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitBucketInfo.java
@@ -14,92 +14,91 @@
 
 class BitBucketInfo implements CIProviderInfo {
 
-  // https://support.atlassian.com/bitbucket-cloud/docs/variables-and-secrets/
-  public static final String BITBUCKET = "BITBUCKET_BUILD_NUMBER";
-  public static final String BITBUCKET_PROVIDER_NAME = "bitbucket";
-  public static final String BITBUCKET_PIPELINE_ID = "BITBUCKET_PIPELINE_UUID";
-  public static final String BITBUCKET_REPO_FULL_NAME = "BITBUCKET_REPO_FULL_NAME";
-  public static final String BITBUCKET_BUILD_NUMBER = "BITBUCKET_BUILD_NUMBER";
-  public static final String BITBUCKET_WORKSPACE_PATH = "BITBUCKET_CLONE_DIR";
-  public static final String BITBUCKET_GIT_REPOSITORY_URL = "BITBUCKET_GIT_SSH_ORIGIN";
-  public static final String BITBUCKET_HTTPS_REPOSITORY_URL = "BITBUCKET_GIT_HTTP_ORIGIN";
-  public static final String BITBUCKET_GIT_COMMIT = "BITBUCKET_COMMIT";
-  public static final String BITBUCKET_GIT_BRANCH = "BITBUCKET_BRANCH";
-  public static final String BITBUCKET_GIT_TAG = "BITBUCKET_TAG";
-  public static final String BITBUCKET_PR_DESTINATION_BRANCH = "BITBUCKET_PR_DESTINATION_BRANCH";
-  public static final String BITBUCKET_PR_NUMBER = "BITBUCKET_PR_ID";
+    // https://support.atlassian.com/bitbucket-cloud/docs/variables-and-secrets/
+    public static final String BITBUCKET = "BITBUCKET_BUILD_NUMBER";
+    public static final String BITBUCKET_PROVIDER_NAME = "bitbucket";
+    public static final String BITBUCKET_PIPELINE_ID = "BITBUCKET_PIPELINE_UUID";
+    public static final String BITBUCKET_REPO_FULL_NAME = "BITBUCKET_REPO_FULL_NAME";
+    public static final String BITBUCKET_BUILD_NUMBER = "BITBUCKET_BUILD_NUMBER";
+    public static final String BITBUCKET_WORKSPACE_PATH = "BITBUCKET_CLONE_DIR";
+    public static final String BITBUCKET_GIT_REPOSITORY_URL = "BITBUCKET_GIT_SSH_ORIGIN";
+    public static final String BITBUCKET_HTTPS_REPOSITORY_URL = "BITBUCKET_GIT_HTTP_ORIGIN";
+    public static final String BITBUCKET_GIT_COMMIT = "BITBUCKET_COMMIT";
+    public static final String BITBUCKET_GIT_BRANCH = "BITBUCKET_BRANCH";
+    public static final String BITBUCKET_GIT_TAG = "BITBUCKET_TAG";
+    public static final String BITBUCKET_PR_DESTINATION_BRANCH = "BITBUCKET_PR_DESTINATION_BRANCH";
+    public static final String BITBUCKET_PR_NUMBER = "BITBUCKET_PR_ID";
 
-  private final CiEnvironment environment;
+    private final CiEnvironment environment;
 
-  BitBucketInfo(CiEnvironment environment) {
-    this.environment = environment;
-  }
-
-  @Override
-  public GitInfo buildCIGitInfo() {
-    return new GitInfo(
-        getRepositoryURL(),
-        normalizeBranch(environment.get(BITBUCKET_GIT_BRANCH)),
-        normalizeTag(environment.get(BITBUCKET_GIT_TAG)),
-        new CommitInfo(environment.get(BITBUCKET_GIT_COMMIT)));
-  }
+    BitBucketInfo(CiEnvironment environment) {
+        this.environment = environment;
+    }
 
-  private String getRepositoryURL() {
-    String gitRepoUrl = environment.get(BITBUCKET_GIT_REPOSITORY_URL);
-    if (Strings.isNotBlank(gitRepoUrl)) {
-      return filterSensitiveInfo(gitRepoUrl);
+    @Override
+    public GitInfo buildCIGitInfo() {
+        return new GitInfo(
+                getRepositoryURL(),
+                normalizeBranch(environment.get(BITBUCKET_GIT_BRANCH)),
+                normalizeTag(environment.get(BITBUCKET_GIT_TAG)),
+                new CommitInfo(environment.get(BITBUCKET_GIT_COMMIT)));
     }
-    String httpsRepoUrl = environment.get(BITBUCKET_HTTPS_REPOSITORY_URL);
-    if (Strings.isNotBlank(httpsRepoUrl)) {
-      return filterSensitiveInfo(httpsRepoUrl);
+
+    private String getRepositoryURL() {
+        String gitRepoUrl = environment.get(BITBUCKET_GIT_REPOSITORY_URL);
+        if (Strings.isNotBlank(gitRepoUrl)) {
+            return filterSensitiveInfo(gitRepoUrl);
+        }
+        String httpsRepoUrl = environment.get(BITBUCKET_HTTPS_REPOSITORY_URL);
+        if (Strings.isNotBlank(httpsRepoUrl)) {
+            return filterSensitiveInfo(httpsRepoUrl);
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Override
-  public CIInfo buildCIInfo() {
-    final String repo = environment.get(BITBUCKET_REPO_FULL_NAME);
-    final String number = environment.get(BITBUCKET_BUILD_NUMBER);
-    final String url = buildPipelineUrl(repo, number);
+    @Override
+    public CIInfo buildCIInfo() {
+        final String repo = environment.get(BITBUCKET_REPO_FULL_NAME);
+        final String number = environment.get(BITBUCKET_BUILD_NUMBER);
+        final String url = buildPipelineUrl(repo, number);
 
-    return CIInfo.builder(environment)
-        .ciProviderName(BITBUCKET_PROVIDER_NAME)
-        .ciPipelineId(buildPipelineId())
-        .ciPipelineName(repo)
-        .ciPipelineNumber(number)
-        .ciPipelineUrl(url)
-        .ciJobUrl(url)
-        .ciWorkspace(expandTilde(environment.get(BITBUCKET_WORKSPACE_PATH)))
-        .build();
-  }
+        return CIInfo.builder(environment)
+                .ciProviderName(BITBUCKET_PROVIDER_NAME)
+                .ciPipelineId(buildPipelineId())
+                .ciPipelineName(repo)
+                .ciPipelineNumber(number)
+                .ciPipelineUrl(url)
+                .ciJobUrl(url)
+                .ciWorkspace(expandTilde(environment.get(BITBUCKET_WORKSPACE_PATH)))
+                .build();
+    }
 
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    return new PullRequestInfo(
-        normalizeBranch(environment.get(BITBUCKET_PR_DESTINATION_BRANCH)),
-        null,
-        null,
-        CommitInfo.NOOP,
-        environment.get(BITBUCKET_PR_NUMBER));
-  }
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        return new PullRequestInfo(
+                normalizeBranch(environment.get(BITBUCKET_PR_DESTINATION_BRANCH)),
+                null,
+                null,
+                CommitInfo.NOOP,
+                environment.get(BITBUCKET_PR_NUMBER));
+    }
 
-  private String buildPipelineUrl(final String repo, final String number) {
-    return String.format(
-        "https://bitbucket.org/%s/addon/pipelines/home#!/results/%s", repo, number);
-  }
+    private String buildPipelineUrl(final String repo, final String number) {
+        return String.format("https://bitbucket.org/%s/addon/pipelines/home#!/results/%s", repo, number);
+    }
 
-  private String buildPipelineId() {
-    String id = environment.get(BITBUCKET_PIPELINE_ID);
-    if (id != null) {
-      id = Strings.replace(id, "{", "");
-      id = Strings.replace(id, "}", "");
+    private String buildPipelineId() {
+        String id = environment.get(BITBUCKET_PIPELINE_ID);
+        if (id != null) {
+            id = Strings.replace(id, "{", "");
+            id = Strings.replace(id, "}", "");
+        }
+        return id;
     }
-    return id;
-  }
 
-  @Override
-  public Provider getProvider() {
-    return Provider.BITBUCKET;
-  }
+    @Override
+    public Provider getProvider() {
+        return Provider.BITBUCKET;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitriseInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitriseInfo.java
index 204e547ee4a..e60f8fe0fed 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitriseInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitriseInfo.java
@@ -14,84 +14,83 @@
 
 class BitriseInfo implements CIProviderInfo {
 
-  // https://devcenter.bitrise.io/en/references/available-environment-variables.html
-  public static final String BITRISE = "BITRISE_BUILD_SLUG";
-  public static final String BITRISE_PROVIDER_NAME = "bitrise";
-  public static final String BITRISE_PIPELINE_ID = "BITRISE_BUILD_SLUG";
-  public static final String BITRISE_PIPELINE_NAME = "BITRISE_TRIGGERED_WORKFLOW_ID";
-  public static final String BITRISE_PIPELINE_NUMBER = "BITRISE_BUILD_NUMBER";
-  public static final String BITRISE_PIPELINE_URL = "BITRISE_BUILD_URL";
-  public static final String BITRISE_WORKSPACE_PATH = "BITRISE_SOURCE_DIR";
-  public static final String BITRISE_GIT_REPOSITORY_URL = "GIT_REPOSITORY_URL";
-  public static final String BITRISE_GIT_PR_COMMIT = "BITRISE_GIT_COMMIT";
-  public static final String BITRISE_GIT_COMMIT = "GIT_CLONE_COMMIT_HASH";
-  public static final String BITRISE_GIT_BRANCH = "BITRISE_GIT_BRANCH";
-  public static final String BITRISE_GIT_TAG = "BITRISE_GIT_TAG";
-  public static final String BITRISE_GIT_MESSAGE = "BITRISE_GIT_MESSAGE";
-  public static final String BITRISE_GIT_AUTHOR_NAME = "GIT_CLONE_COMMIT_AUTHOR_NAME";
-  public static final String BITRISE_GIT_AUTHOR_EMAIL = "GIT_CLONE_COMMIT_AUTHOR_EMAIL";
-  public static final String BITRISE_GIT_COMMITER_NAME = "GIT_CLONE_COMMIT_COMMITER_NAME";
-  public static final String BITRISE_GIT_COMMITER_EMAIL = "GIT_CLONE_COMMIT_COMMITER_EMAIL";
-  public static final String BITRISE_GIT_BRANCH_DEST = "BITRISEIO_GIT_BRANCH_DEST";
-  public static final String BITRISE_PR_NUMBER = "BITRISE_PULL_REQUEST";
+    // https://devcenter.bitrise.io/en/references/available-environment-variables.html
+    public static final String BITRISE = "BITRISE_BUILD_SLUG";
+    public static final String BITRISE_PROVIDER_NAME = "bitrise";
+    public static final String BITRISE_PIPELINE_ID = "BITRISE_BUILD_SLUG";
+    public static final String BITRISE_PIPELINE_NAME = "BITRISE_TRIGGERED_WORKFLOW_ID";
+    public static final String BITRISE_PIPELINE_NUMBER = "BITRISE_BUILD_NUMBER";
+    public static final String BITRISE_PIPELINE_URL = "BITRISE_BUILD_URL";
+    public static final String BITRISE_WORKSPACE_PATH = "BITRISE_SOURCE_DIR";
+    public static final String BITRISE_GIT_REPOSITORY_URL = "GIT_REPOSITORY_URL";
+    public static final String BITRISE_GIT_PR_COMMIT = "BITRISE_GIT_COMMIT";
+    public static final String BITRISE_GIT_COMMIT = "GIT_CLONE_COMMIT_HASH";
+    public static final String BITRISE_GIT_BRANCH = "BITRISE_GIT_BRANCH";
+    public static final String BITRISE_GIT_TAG = "BITRISE_GIT_TAG";
+    public static final String BITRISE_GIT_MESSAGE = "BITRISE_GIT_MESSAGE";
+    public static final String BITRISE_GIT_AUTHOR_NAME = "GIT_CLONE_COMMIT_AUTHOR_NAME";
+    public static final String BITRISE_GIT_AUTHOR_EMAIL = "GIT_CLONE_COMMIT_AUTHOR_EMAIL";
+    public static final String BITRISE_GIT_COMMITER_NAME = "GIT_CLONE_COMMIT_COMMITER_NAME";
+    public static final String BITRISE_GIT_COMMITER_EMAIL = "GIT_CLONE_COMMIT_COMMITER_EMAIL";
+    public static final String BITRISE_GIT_BRANCH_DEST = "BITRISEIO_GIT_BRANCH_DEST";
+    public static final String BITRISE_PR_NUMBER = "BITRISE_PULL_REQUEST";
 
-  private final CiEnvironment environment;
+    private final CiEnvironment environment;
 
-  BitriseInfo(CiEnvironment environment) {
-    this.environment = environment;
-  }
+    BitriseInfo(CiEnvironment environment) {
+        this.environment = environment;
+    }
 
-  @Override
-  public GitInfo buildCIGitInfo() {
-    return new GitInfo(
-        filterSensitiveInfo(environment.get(BITRISE_GIT_REPOSITORY_URL)),
-        normalizeBranch(environment.get(BITRISE_GIT_BRANCH)),
-        normalizeTag(environment.get(BITRISE_GIT_TAG)),
-        new CommitInfo(
-            buildGitCommit(),
-            new PersonInfo(
-                environment.get(BITRISE_GIT_AUTHOR_NAME),
-                environment.get(BITRISE_GIT_AUTHOR_EMAIL)),
-            new PersonInfo(
-                environment.get(BITRISE_GIT_COMMITER_NAME),
-                environment.get(BITRISE_GIT_COMMITER_EMAIL)),
-            environment.get(BITRISE_GIT_MESSAGE)));
-  }
+    @Override
+    public GitInfo buildCIGitInfo() {
+        return new GitInfo(
+                filterSensitiveInfo(environment.get(BITRISE_GIT_REPOSITORY_URL)),
+                normalizeBranch(environment.get(BITRISE_GIT_BRANCH)),
+                normalizeTag(environment.get(BITRISE_GIT_TAG)),
+                new CommitInfo(
+                        buildGitCommit(),
+                        new PersonInfo(
+                                environment.get(BITRISE_GIT_AUTHOR_NAME), environment.get(BITRISE_GIT_AUTHOR_EMAIL)),
+                        new PersonInfo(
+                                environment.get(BITRISE_GIT_COMMITER_NAME),
+                                environment.get(BITRISE_GIT_COMMITER_EMAIL)),
+                        environment.get(BITRISE_GIT_MESSAGE)));
+    }
 
-  @Override
-  public CIInfo buildCIInfo() {
-    return CIInfo.builder(environment)
-        .ciProviderName(BITRISE_PROVIDER_NAME)
-        .ciPipelineId(environment.get(BITRISE_PIPELINE_ID))
-        .ciPipelineName(environment.get(BITRISE_PIPELINE_NAME))
-        .ciPipelineNumber(environment.get(BITRISE_PIPELINE_NUMBER))
-        .ciPipelineUrl(environment.get(BITRISE_PIPELINE_URL))
-        .ciWorkspace(expandTilde(environment.get(BITRISE_WORKSPACE_PATH)))
-        .build();
-  }
+    @Override
+    public CIInfo buildCIInfo() {
+        return CIInfo.builder(environment)
+                .ciProviderName(BITRISE_PROVIDER_NAME)
+                .ciPipelineId(environment.get(BITRISE_PIPELINE_ID))
+                .ciPipelineName(environment.get(BITRISE_PIPELINE_NAME))
+                .ciPipelineNumber(environment.get(BITRISE_PIPELINE_NUMBER))
+                .ciPipelineUrl(environment.get(BITRISE_PIPELINE_URL))
+                .ciWorkspace(expandTilde(environment.get(BITRISE_WORKSPACE_PATH)))
+                .build();
+    }
 
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    return new PullRequestInfo(
-        normalizeBranch(environment.get(BITRISE_GIT_BRANCH_DEST)),
-        null,
-        null,
-        CommitInfo.NOOP,
-        environment.get(BITRISE_PR_NUMBER));
-  }
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        return new PullRequestInfo(
+                normalizeBranch(environment.get(BITRISE_GIT_BRANCH_DEST)),
+                null,
+                null,
+                CommitInfo.NOOP,
+                environment.get(BITRISE_PR_NUMBER));
+    }
 
-  private String buildGitCommit() {
-    final String fromCommit = environment.get(BITRISE_GIT_PR_COMMIT);
-    if (fromCommit != null && !fromCommit.isEmpty()) {
-      return fromCommit;
-    } else {
-      return environment.get(BITRISE_GIT_COMMIT);
+    private String buildGitCommit() {
+        final String fromCommit = environment.get(BITRISE_GIT_PR_COMMIT);
+        if (fromCommit != null && !fromCommit.isEmpty()) {
+            return fromCommit;
+        } else {
+            return environment.get(BITRISE_GIT_COMMIT);
+        }
     }
-  }
 
-  @Override
-  public Provider getProvider() {
-    return Provider.BITRISE;
-  }
+    @Override
+    public Provider getProvider() {
+        return Provider.BITRISE;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuddyInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuddyInfo.java
index 69554f4a300..2590f152f90 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuddyInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuddyInfo.java
@@ -13,83 +13,82 @@
 
 class BuddyInfo implements CIProviderInfo {
 
-  // https://buddy.works/docs/pipelines/environment-variables
-  public static final String BUDDY = "BUDDY";
-  public static final String BUDDY_PROVIDER_NAME = "buddy";
-  public static final String BUDDY_PIPELINE_ID = "BUDDY_PIPELINE_ID";
-  public static final String BUDDY_PIPELINE_NAME = "BUDDY_PIPELINE_NAME";
-  public static final String BUDDY_PIPELINE_EXECUTION_ID = "BUDDY_EXECUTION_ID";
-  public static final String BUDDY_PIPELINE_EXECUTION_URL = "BUDDY_EXECUTION_URL";
-  public static final String BUDDY_GIT_REPOSITORY_URL = "BUDDY_SCM_URL";
-  public static final String BUDDY_GIT_COMMIT = "BUDDY_EXECUTION_REVISION";
-  public static final String BUDDY_GIT_BRANCH = "BUDDY_EXECUTION_BRANCH";
-  public static final String BUDDY_GIT_TAG = "BUDDY_EXECUTION_TAG";
-  public static final String BUDDY_GIT_COMMIT_MESSAGE = "BUDDY_EXECUTION_REVISION_MESSAGE";
-  public static final String BUDDY_GIT_COMMIT_AUTHOR = "BUDDY_EXECUTION_REVISION_COMMITTER_NAME";
-  public static final String BUDDY_GIT_COMMIT_EMAIL = "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL";
-  public static final String BUDDY_RUN_PR_BASE_BRANCH = "BUDDY_RUN_PR_BASE_BRANCH";
-  public static final String BUDDY_RUN_PR_NUMBER = "BUDDY_RUN_PR_NO";
+    // https://buddy.works/docs/pipelines/environment-variables
+    public static final String BUDDY = "BUDDY";
+    public static final String BUDDY_PROVIDER_NAME = "buddy";
+    public static final String BUDDY_PIPELINE_ID = "BUDDY_PIPELINE_ID";
+    public static final String BUDDY_PIPELINE_NAME = "BUDDY_PIPELINE_NAME";
+    public static final String BUDDY_PIPELINE_EXECUTION_ID = "BUDDY_EXECUTION_ID";
+    public static final String BUDDY_PIPELINE_EXECUTION_URL = "BUDDY_EXECUTION_URL";
+    public static final String BUDDY_GIT_REPOSITORY_URL = "BUDDY_SCM_URL";
+    public static final String BUDDY_GIT_COMMIT = "BUDDY_EXECUTION_REVISION";
+    public static final String BUDDY_GIT_BRANCH = "BUDDY_EXECUTION_BRANCH";
+    public static final String BUDDY_GIT_TAG = "BUDDY_EXECUTION_TAG";
+    public static final String BUDDY_GIT_COMMIT_MESSAGE = "BUDDY_EXECUTION_REVISION_MESSAGE";
+    public static final String BUDDY_GIT_COMMIT_AUTHOR = "BUDDY_EXECUTION_REVISION_COMMITTER_NAME";
+    public static final String BUDDY_GIT_COMMIT_EMAIL = "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL";
+    public static final String BUDDY_RUN_PR_BASE_BRANCH = "BUDDY_RUN_PR_BASE_BRANCH";
+    public static final String BUDDY_RUN_PR_NUMBER = "BUDDY_RUN_PR_NO";
 
-  private final CiEnvironment environment;
+    private final CiEnvironment environment;
 
-  BuddyInfo(CiEnvironment environment) {
-    this.environment = environment;
-  }
-
-  @Override
-  public GitInfo buildCIGitInfo() {
-    return new GitInfo(
-        filterSensitiveInfo(environment.get(BUDDY_GIT_REPOSITORY_URL)),
-        normalizeBranch(environment.get(BUDDY_GIT_BRANCH)),
-        normalizeTag(environment.get(BUDDY_GIT_TAG)),
-        new CommitInfo(
-            environment.get(BUDDY_GIT_COMMIT),
-            PersonInfo.NOOP,
-            buildGitCommiter(),
-            environment.get(BUDDY_GIT_COMMIT_MESSAGE)));
-  }
+    BuddyInfo(CiEnvironment environment) {
+        this.environment = environment;
+    }
 
-  @Override
-  public CIInfo buildCIInfo() {
-    String pipelineNumber = environment.get(BUDDY_PIPELINE_EXECUTION_ID);
-    return CIInfo.builder(environment)
-        .ciProviderName(BUDDY_PROVIDER_NAME)
-        .ciPipelineId(getPipelineId(pipelineNumber))
-        .ciPipelineName(environment.get(BUDDY_PIPELINE_NAME))
-        .ciPipelineNumber(pipelineNumber)
-        .ciPipelineUrl(environment.get(BUDDY_PIPELINE_EXECUTION_URL))
-        .build();
-  }
+    @Override
+    public GitInfo buildCIGitInfo() {
+        return new GitInfo(
+                filterSensitiveInfo(environment.get(BUDDY_GIT_REPOSITORY_URL)),
+                normalizeBranch(environment.get(BUDDY_GIT_BRANCH)),
+                normalizeTag(environment.get(BUDDY_GIT_TAG)),
+                new CommitInfo(
+                        environment.get(BUDDY_GIT_COMMIT),
+                        PersonInfo.NOOP,
+                        buildGitCommiter(),
+                        environment.get(BUDDY_GIT_COMMIT_MESSAGE)));
+    }
 
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    return new PullRequestInfo(
-        normalizeBranch(environment.get(BUDDY_RUN_PR_BASE_BRANCH)),
-        null,
-        null,
-        CommitInfo.NOOP,
-        environment.get(BUDDY_RUN_PR_NUMBER));
-  }
+    @Override
+    public CIInfo buildCIInfo() {
+        String pipelineNumber = environment.get(BUDDY_PIPELINE_EXECUTION_ID);
+        return CIInfo.builder(environment)
+                .ciProviderName(BUDDY_PROVIDER_NAME)
+                .ciPipelineId(getPipelineId(pipelineNumber))
+                .ciPipelineName(environment.get(BUDDY_PIPELINE_NAME))
+                .ciPipelineNumber(pipelineNumber)
+                .ciPipelineUrl(environment.get(BUDDY_PIPELINE_EXECUTION_URL))
+                .build();
+    }
 
-  private String getPipelineId(String pipelineNumber) {
-    String pipelineId = environment.get(BUDDY_PIPELINE_ID);
-    if (pipelineId == null) {
-      return pipelineNumber;
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        return new PullRequestInfo(
+                normalizeBranch(environment.get(BUDDY_RUN_PR_BASE_BRANCH)),
+                null,
+                null,
+                CommitInfo.NOOP,
+                environment.get(BUDDY_RUN_PR_NUMBER));
     }
-    if (pipelineNumber == null) {
-      return pipelineId;
+
+    private String getPipelineId(String pipelineNumber) {
+        String pipelineId = environment.get(BUDDY_PIPELINE_ID);
+        if (pipelineId == null) {
+            return pipelineNumber;
+        }
+        if (pipelineNumber == null) {
+            return pipelineId;
+        }
+        return String.format("%s/%s", pipelineId, pipelineNumber);
     }
-    return String.format("%s/%s", pipelineId, pipelineNumber);
-  }
 
-  private PersonInfo buildGitCommiter() {
-    return new PersonInfo(
-        environment.get(BUDDY_GIT_COMMIT_AUTHOR), environment.get(BUDDY_GIT_COMMIT_EMAIL));
-  }
+    private PersonInfo buildGitCommiter() {
+        return new PersonInfo(environment.get(BUDDY_GIT_COMMIT_AUTHOR), environment.get(BUDDY_GIT_COMMIT_EMAIL));
+    }
 
-  @Override
-  public Provider getProvider() {
-    return Provider.BUDDYCI;
-  }
+    @Override
+    public Provider getProvider() {
+        return Provider.BUDDYCI;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuildkiteInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuildkiteInfo.java
index 935d4b9b147..a6afd4b8801 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuildkiteInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuildkiteInfo.java
@@ -19,108 +19,106 @@
 
 class BuildkiteInfo implements CIProviderInfo {
 
-  // https://buildkite.com/docs/pipelines/environment-variables
-  public static final String BUILDKITE = "BUILDKITE";
-  public static final String BUILDKITE_PROVIDER_NAME = "buildkite";
-  public static final String BUILDKITE_PIPELINE_ID = "BUILDKITE_BUILD_ID";
-  public static final String BUILDKITE_PIPELINE_SLUG = "BUILDKITE_PIPELINE_SLUG";
-  public static final String BUILDKITE_PIPELINE_DISPLAY_NAME = "BUILDKITE_PIPELINE_NAME";
-  public static final String BUILDKITE_PIPELINE_NUMBER = "BUILDKITE_BUILD_NUMBER";
-  public static final String BUILDKITE_BUILD_URL = "BUILDKITE_BUILD_URL";
-  public static final String BUILDKITE_JOB_ID = "BUILDKITE_JOB_ID";
-  public static final String BUILDKITE_WORKSPACE_PATH = "BUILDKITE_BUILD_CHECKOUT_PATH";
-  public static final String BUILDKITE_GIT_REPOSITORY_URL = "BUILDKITE_REPO";
-  public static final String BUILDKITE_GIT_COMMIT = "BUILDKITE_COMMIT";
-  public static final String BUILDKITE_GIT_BRANCH = "BUILDKITE_BRANCH";
-  public static final String BUILDKITE_GIT_TAG = "BUILDKITE_TAG";
-  public static final String BUILDKITE_GIT_MESSAGE = "BUILDKITE_MESSAGE";
-  public static final String BUILDKITE_GIT_AUTHOR_NAME = "BUILDKITE_BUILD_AUTHOR";
-  public static final String BUILDKITE_GIT_AUTHOR_EMAIL = "BUILDKITE_BUILD_AUTHOR_EMAIL";
-  public static final String BUILDKITE_AGENT_ID = "BUILDKITE_AGENT_ID";
-  private static final String BUILDKITE_CI_NODE_LABEL_PREFIX = "BUILDKITE_AGENT_META_DATA_";
-  private static final String BUILDKITE_PULL_REQUEST_NUMBER = "BUILDKITE_PULL_REQUEST";
-  private static final String BUILDKITE_PULL_REQUEST_BASE_BRANCH =
-      "BUILDKITE_PULL_REQUEST_BASE_BRANCH";
+    // https://buildkite.com/docs/pipelines/environment-variables
+    public static final String BUILDKITE = "BUILDKITE";
+    public static final String BUILDKITE_PROVIDER_NAME = "buildkite";
+    public static final String BUILDKITE_PIPELINE_ID = "BUILDKITE_BUILD_ID";
+    public static final String BUILDKITE_PIPELINE_SLUG = "BUILDKITE_PIPELINE_SLUG";
+    public static final String BUILDKITE_PIPELINE_DISPLAY_NAME = "BUILDKITE_PIPELINE_NAME";
+    public static final String BUILDKITE_PIPELINE_NUMBER = "BUILDKITE_BUILD_NUMBER";
+    public static final String BUILDKITE_BUILD_URL = "BUILDKITE_BUILD_URL";
+    public static final String BUILDKITE_JOB_ID = "BUILDKITE_JOB_ID";
+    public static final String BUILDKITE_WORKSPACE_PATH = "BUILDKITE_BUILD_CHECKOUT_PATH";
+    public static final String BUILDKITE_GIT_REPOSITORY_URL = "BUILDKITE_REPO";
+    public static final String BUILDKITE_GIT_COMMIT = "BUILDKITE_COMMIT";
+    public static final String BUILDKITE_GIT_BRANCH = "BUILDKITE_BRANCH";
+    public static final String BUILDKITE_GIT_TAG = "BUILDKITE_TAG";
+    public static final String BUILDKITE_GIT_MESSAGE = "BUILDKITE_MESSAGE";
+    public static final String BUILDKITE_GIT_AUTHOR_NAME = "BUILDKITE_BUILD_AUTHOR";
+    public static final String BUILDKITE_GIT_AUTHOR_EMAIL = "BUILDKITE_BUILD_AUTHOR_EMAIL";
+    public static final String BUILDKITE_AGENT_ID = "BUILDKITE_AGENT_ID";
+    private static final String BUILDKITE_CI_NODE_LABEL_PREFIX = "BUILDKITE_AGENT_META_DATA_";
+    private static final String BUILDKITE_PULL_REQUEST_NUMBER = "BUILDKITE_PULL_REQUEST";
+    private static final String BUILDKITE_PULL_REQUEST_BASE_BRANCH = "BUILDKITE_PULL_REQUEST_BASE_BRANCH";
 
-  private final CiEnvironment environment;
+    private final CiEnvironment environment;
 
-  BuildkiteInfo(CiEnvironment environment) {
-    this.environment = environment;
-  }
+    BuildkiteInfo(CiEnvironment environment) {
+        this.environment = environment;
+    }
 
-  @Override
-  public GitInfo buildCIGitInfo() {
-    return new GitInfo(
-        filterSensitiveInfo(environment.get(BUILDKITE_GIT_REPOSITORY_URL)),
-        normalizeBranch(environment.get(BUILDKITE_GIT_BRANCH)),
-        normalizeTag(environment.get(BUILDKITE_GIT_TAG)),
-        new CommitInfo(
-            environment.get(BUILDKITE_GIT_COMMIT),
-            buildGitCommitAuthor(),
-            PersonInfo.NOOP,
-            environment.get(BUILDKITE_GIT_MESSAGE)));
-  }
+    @Override
+    public GitInfo buildCIGitInfo() {
+        return new GitInfo(
+                filterSensitiveInfo(environment.get(BUILDKITE_GIT_REPOSITORY_URL)),
+                normalizeBranch(environment.get(BUILDKITE_GIT_BRANCH)),
+                normalizeTag(environment.get(BUILDKITE_GIT_TAG)),
+                new CommitInfo(
+                        environment.get(BUILDKITE_GIT_COMMIT),
+                        buildGitCommitAuthor(),
+                        PersonInfo.NOOP,
+                        environment.get(BUILDKITE_GIT_MESSAGE)));
+    }
 
-  @Override
-  public CIInfo buildCIInfo() {
-    final String ciPipelineUrl = environment.get(BUILDKITE_BUILD_URL);
+    @Override
+    public CIInfo buildCIInfo() {
+        final String ciPipelineUrl = environment.get(BUILDKITE_BUILD_URL);
 
-    return CIInfo.builder(environment)
-        .ciProviderName(BUILDKITE_PROVIDER_NAME)
-        .ciPipelineId(environment.get(BUILDKITE_PIPELINE_ID))
-        .ciPipelineName(environment.get(BUILDKITE_PIPELINE_SLUG))
-        .ciPipelineDisplayName(environment.get(BUILDKITE_PIPELINE_DISPLAY_NAME))
-        .ciPipelineNumber(environment.get(BUILDKITE_PIPELINE_NUMBER))
-        .ciPipelineUrl(ciPipelineUrl)
-        .ciJobId(environment.get(BUILDKITE_JOB_ID))
-        .ciJobUrl(String.format("%s#%s", ciPipelineUrl, environment.get(BUILDKITE_JOB_ID)))
-        .ciWorkspace(expandTilde(environment.get(BUILDKITE_WORKSPACE_PATH)))
-        .ciNodeName(environment.get(BUILDKITE_AGENT_ID))
-        .ciNodeLabels(buildCiNodeLabels())
-        .ciEnvVars(BUILDKITE_PIPELINE_ID, BUILDKITE_JOB_ID)
-        .build();
-  }
+        return CIInfo.builder(environment)
+                .ciProviderName(BUILDKITE_PROVIDER_NAME)
+                .ciPipelineId(environment.get(BUILDKITE_PIPELINE_ID))
+                .ciPipelineName(environment.get(BUILDKITE_PIPELINE_SLUG))
+                .ciPipelineDisplayName(environment.get(BUILDKITE_PIPELINE_DISPLAY_NAME))
+                .ciPipelineNumber(environment.get(BUILDKITE_PIPELINE_NUMBER))
+                .ciPipelineUrl(ciPipelineUrl)
+                .ciJobId(environment.get(BUILDKITE_JOB_ID))
+                .ciJobUrl(String.format("%s#%s", ciPipelineUrl, environment.get(BUILDKITE_JOB_ID)))
+                .ciWorkspace(expandTilde(environment.get(BUILDKITE_WORKSPACE_PATH)))
+                .ciNodeName(environment.get(BUILDKITE_AGENT_ID))
+                .ciNodeLabels(buildCiNodeLabels())
+                .ciEnvVars(BUILDKITE_PIPELINE_ID, BUILDKITE_JOB_ID)
+                .build();
+    }
 
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    if (isPullRequest()) {
-      return new PullRequestInfo(
-          normalizeBranch(environment.get(BUILDKITE_PULL_REQUEST_BASE_BRANCH)),
-          null,
-          null,
-          CommitInfo.NOOP,
-          environment.get(BUILDKITE_PULL_REQUEST_NUMBER));
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        if (isPullRequest()) {
+            return new PullRequestInfo(
+                    normalizeBranch(environment.get(BUILDKITE_PULL_REQUEST_BASE_BRANCH)),
+                    null,
+                    null,
+                    CommitInfo.NOOP,
+                    environment.get(BUILDKITE_PULL_REQUEST_NUMBER));
+        }
+        return PullRequestInfo.EMPTY;
     }
-    return PullRequestInfo.EMPTY;
-  }
 
-  private boolean isPullRequest() {
-    String pullRequest = environment.get(BUILDKITE_PULL_REQUEST_NUMBER);
-    return pullRequest != null && !"false".equals(pullRequest);
-  }
+    private boolean isPullRequest() {
+        String pullRequest = environment.get(BUILDKITE_PULL_REQUEST_NUMBER);
+        return pullRequest != null && !"false".equals(pullRequest);
+    }
 
-  private String buildCiNodeLabels() {
-    List<String> labels = new ArrayList<>();
-    for (Map.Entry<String, String> e : environment.get().entrySet()) {
-      String envVar = e.getKey();
-      if (envVar.startsWith(BUILDKITE_CI_NODE_LABEL_PREFIX)) {
-        String labelKey =
-            envVar.substring(BUILDKITE_CI_NODE_LABEL_PREFIX.length()).toLowerCase(Locale.ROOT);
-        String labelValue = e.getValue();
-        labels.add(labelKey + ':' + labelValue);
-      }
+    private String buildCiNodeLabels() {
+        List<String> labels = new ArrayList<>();
+        for (Map.Entry<String, String> e : environment.get().entrySet()) {
+            String envVar = e.getKey();
+            if (envVar.startsWith(BUILDKITE_CI_NODE_LABEL_PREFIX)) {
+                String labelKey = envVar.substring(BUILDKITE_CI_NODE_LABEL_PREFIX.length())
+                        .toLowerCase(Locale.ROOT);
+                String labelValue = e.getValue();
+                labels.add(labelKey + ':' + labelValue);
+            }
+        }
+        return !labels.isEmpty() ? toJson(labels) : null;
     }
-    return !labels.isEmpty() ? toJson(labels) : null;
-  }
 
-  private PersonInfo buildGitCommitAuthor() {
-    return new PersonInfo(
-        environment.get(BUILDKITE_GIT_AUTHOR_NAME), environment.get(BUILDKITE_GIT_AUTHOR_EMAIL));
-  }
+    private PersonInfo buildGitCommitAuthor() {
+        return new PersonInfo(environment.get(BUILDKITE_GIT_AUTHOR_NAME), environment.get(BUILDKITE_GIT_AUTHOR_EMAIL));
+    }
 
-  @Override
-  public Provider getProvider() {
-    return Provider.BUILDKITE;
-  }
+    @Override
+    public Provider getProvider() {
+        return Provider.BUILDKITE;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIInfo.java
index 8b898d99d78..9d60686b7e2 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIInfo.java
@@ -10,360 +10,360 @@
 import java.util.Objects;
 
 public class CIInfo {
-  public static final CIInfo NOOP = new CIInfo();
-
-  public static Builder builder(CiEnvironment environment) {
-    return new Builder(environment);
-  }
-
-  public static final class Builder {
-    private final CiEnvironment environment;
-
-    private String ciProviderName;
-    private String ciPipelineId;
-    private String ciPipelineName;
-    private String ciPipelineDisplayName;
-    private String ciStageName;
-    private String ciJobId;
-    private String ciJobName;
-    private String ciPipelineNumber;
-    private String ciPipelineUrl;
-    private String ciJobUrl;
-    private String ciWorkspace;
-    private String ciNodeName;
-    private String ciNodeLabels;
-    private Map<String, String> ciEnvVars;
-    private Map<String, String> additionalTags;
-
-    public Builder(CiEnvironment environment) {
-      this.environment = environment;
+    public static final CIInfo NOOP = new CIInfo();
+
+    public static Builder builder(CiEnvironment environment) {
+        return new Builder(environment);
+    }
+
+    public static final class Builder {
+        private final CiEnvironment environment;
+
+        private String ciProviderName;
+        private String ciPipelineId;
+        private String ciPipelineName;
+        private String ciPipelineDisplayName;
+        private String ciStageName;
+        private String ciJobId;
+        private String ciJobName;
+        private String ciPipelineNumber;
+        private String ciPipelineUrl;
+        private String ciJobUrl;
+        private String ciWorkspace;
+        private String ciNodeName;
+        private String ciNodeLabels;
+        private Map<String, String> ciEnvVars;
+        private Map<String, String> additionalTags;
+
+        public Builder(CiEnvironment environment) {
+            this.environment = environment;
+        }
+
+        public Builder ciProviderName(String ciProviderName) {
+            this.ciProviderName = ciProviderName;
+            return this;
+        }
+
+        public Builder ciPipelineId(String ciPipelineId) {
+            this.ciPipelineId = ciPipelineId;
+            return this;
+        }
+
+        public Builder ciPipelineName(String ciPipelineName) {
+            this.ciPipelineName = ciPipelineName;
+            return this;
+        }
+
+        public Builder ciPipelineDisplayName(String ciPipelineDisplayName) {
+            this.ciPipelineDisplayName = ciPipelineDisplayName;
+            return this;
+        }
+
+        public Builder ciStageName(String ciStageName) {
+            this.ciStageName = ciStageName;
+            return this;
+        }
+
+        public Builder ciJobName(String ciJobName) {
+            this.ciJobName = ciJobName;
+            return this;
+        }
+
+        public Builder ciPipelineNumber(String ciPipelineNumber) {
+            this.ciPipelineNumber = ciPipelineNumber;
+            return this;
+        }
+
+        public Builder ciPipelineUrl(String ciPipelineUrl) {
+            this.ciPipelineUrl = ciPipelineUrl;
+            return this;
+        }
+
+        public Builder ciJobId(String ciJobId) {
+            this.ciJobId = ciJobId;
+            return this;
+        }
+
+        public Builder ciJobUrl(String ciJobUrl) {
+            this.ciJobUrl = ciJobUrl;
+            return this;
+        }
+
+        public Builder ciWorkspace(String ciWorkspace) {
+            this.ciWorkspace = ciWorkspace;
+            return this;
+        }
+
+        public Builder ciNodeName(String ciNodeName) {
+            this.ciNodeName = ciNodeName;
+            return this;
+        }
+
+        public Builder ciNodeLabels(String ciNodeLabels) {
+            this.ciNodeLabels = ciNodeLabels;
+            return this;
+        }
+
+        public Builder ciEnvVars(String... ciEnvVarKeysArray) {
+            if (ciEnvVarKeysArray == null || ciEnvVarKeysArray.length == 0) {
+                return this;
+            }
+
+            ciEnvVars = new HashMap<>();
+            for (String ciEnvVarKey : ciEnvVarKeysArray) {
+                final String envVarVal = filterSensitiveInfo(environment.get(ciEnvVarKey));
+                if (envVarVal != null && !envVarVal.isEmpty()) {
+                    ciEnvVars.put(ciEnvVarKey, envVarVal);
+                }
+            }
+            return this;
+        }
+
+        public Builder additionalTags(Map<String, String> additionalTags) {
+            this.additionalTags = additionalTags;
+            return this;
+        }
+
+        public CIInfo build() {
+            return new CIInfo(
+                    ciProviderName,
+                    ciPipelineId,
+                    ciPipelineName,
+                    ciPipelineDisplayName,
+                    ciStageName,
+                    ciJobId,
+                    ciJobName,
+                    ciPipelineNumber,
+                    ciPipelineUrl,
+                    ciJobUrl,
+                    ciWorkspace,
+                    ciNodeName,
+                    ciNodeLabels,
+                    ciEnvVars,
+                    additionalTags);
+        }
     }
 
-    public Builder ciProviderName(String ciProviderName) {
-      this.ciProviderName = ciProviderName;
-      return this;
+    private final String ciProviderName;
+    private final String ciPipelineId;
+    private final String ciPipelineName;
+    private final String ciPipelineDisplayName;
+    private final String ciStageName;
+    private final String ciJobId;
+    private final String ciJobName;
+    private final String ciPipelineNumber;
+    private final String ciPipelineUrl;
+    private final String ciJobUrl;
+    private final String ciWorkspace;
+    private final String ciNodeName;
+    private final String ciNodeLabels;
+    private final Map<String, String> ciEnvVars;
+    private final Map<String, String> additionalTags;
+
+    public CIInfo() {
+        this(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
     }
 
-    public Builder ciPipelineId(String ciPipelineId) {
-      this.ciPipelineId = ciPipelineId;
-      return this;
+    public CIInfo(
+            String ciProviderName,
+            String ciPipelineId,
+            String ciPipelineName,
+            String ciPipelineDisplayName,
+            String ciStageName,
+            String ciJobId,
+            String ciJobName,
+            String ciPipelineNumber,
+            String ciPipelineUrl,
+            String ciJobUrl,
+            String ciWorkspace,
+            String ciNodeName,
+            String ciNodeLabels,
+            Map<String, String> ciEnvVars,
+            Map<String, String> additionalTags) {
+        this.ciProviderName = ciProviderName;
+        this.ciPipelineId = ciPipelineId;
+        this.ciPipelineName = ciPipelineName;
+        this.ciPipelineDisplayName = ciPipelineDisplayName;
+        this.ciStageName = ciStageName;
+        this.ciJobId = ciJobId;
+        this.ciJobName = ciJobName;
+        this.ciPipelineNumber = ciPipelineNumber;
+        this.ciPipelineUrl = ciPipelineUrl;
+        this.ciJobUrl = ciJobUrl;
+        this.ciWorkspace = sanitizeWorkspace(ciWorkspace);
+        this.ciNodeName = ciNodeName;
+        this.ciNodeLabels = ciNodeLabels;
+        this.ciEnvVars = ciEnvVars;
+        this.additionalTags = additionalTags;
     }
 
-    public Builder ciPipelineName(String ciPipelineName) {
-      this.ciPipelineName = ciPipelineName;
-      return this;
+    public String getCiProviderName() {
+        return ciProviderName;
     }
 
-    public Builder ciPipelineDisplayName(String ciPipelineDisplayName) {
-      this.ciPipelineDisplayName = ciPipelineDisplayName;
-      return this;
+    public String getCiPipelineId() {
+        return ciPipelineId;
     }
 
-    public Builder ciStageName(String ciStageName) {
-      this.ciStageName = ciStageName;
-      return this;
+    public String getCiPipelineName() {
+        return ciPipelineName;
     }
 
-    public Builder ciJobName(String ciJobName) {
-      this.ciJobName = ciJobName;
-      return this;
+    public String getCiPipelineDisplayName() {
+        return ciPipelineDisplayName;
     }
 
-    public Builder ciPipelineNumber(String ciPipelineNumber) {
-      this.ciPipelineNumber = ciPipelineNumber;
-      return this;
+    public String getCiStageName() {
+        return ciStageName;
     }
 
-    public Builder ciPipelineUrl(String ciPipelineUrl) {
-      this.ciPipelineUrl = ciPipelineUrl;
-      return this;
+    public String getCiJobId() {
+        return ciJobId;
     }
 
-    public Builder ciJobId(String ciJobId) {
-      this.ciJobId = ciJobId;
-      return this;
+    public String getCiJobName() {
+        return ciJobName;
     }
 
-    public Builder ciJobUrl(String ciJobUrl) {
-      this.ciJobUrl = ciJobUrl;
-      return this;
+    public String getCiPipelineNumber() {
+        return ciPipelineNumber;
     }
 
-    public Builder ciWorkspace(String ciWorkspace) {
-      this.ciWorkspace = ciWorkspace;
-      return this;
+    public String getCiPipelineUrl() {
+        return ciPipelineUrl;
     }
 
-    public Builder ciNodeName(String ciNodeName) {
-      this.ciNodeName = ciNodeName;
-      return this;
+    public String getCiJobUrl() {
+        return ciJobUrl;
     }
 
-    public Builder ciNodeLabels(String ciNodeLabels) {
-      this.ciNodeLabels = ciNodeLabels;
-      return this;
+    private String sanitizeWorkspace(String workspace) {
+        String realCiWorkspace = FileUtils.toRealPath(workspace);
+        return (realCiWorkspace == null
+                        || !realCiWorkspace.endsWith(File.separator)
+                        || realCiWorkspace.length() == 1) // root path "/"
+                ? realCiWorkspace
+                : (realCiWorkspace.substring(0, realCiWorkspace.length() - 1));
     }
 
-    public Builder ciEnvVars(String... ciEnvVarKeysArray) {
-      if (ciEnvVarKeysArray == null || ciEnvVarKeysArray.length == 0) {
-        return this;
-      }
+    /**
+     * @return Workspace path without the trailing separator
+     */
+    public String getCiWorkspace() {
+        return ciWorkspace;
+    }
 
-      ciEnvVars = new HashMap<>();
-      for (String ciEnvVarKey : ciEnvVarKeysArray) {
-        final String envVarVal = filterSensitiveInfo(environment.get(ciEnvVarKey));
-        if (envVarVal != null && !envVarVal.isEmpty()) {
-          ciEnvVars.put(ciEnvVarKey, envVarVal);
-        }
-      }
-      return this;
+    public String getCiNodeName() {
+        return ciNodeName;
     }
 
-    public Builder additionalTags(Map<String, String> additionalTags) {
-      this.additionalTags = additionalTags;
-      return this;
+    public String getCiNodeLabels() {
+        return ciNodeLabels;
     }
 
-    public CIInfo build() {
-      return new CIInfo(
-          ciProviderName,
-          ciPipelineId,
-          ciPipelineName,
-          ciPipelineDisplayName,
-          ciStageName,
-          ciJobId,
-          ciJobName,
-          ciPipelineNumber,
-          ciPipelineUrl,
-          ciJobUrl,
-          ciWorkspace,
-          ciNodeName,
-          ciNodeLabels,
-          ciEnvVars,
-          additionalTags);
+    public Map<String, String> getCiEnvVars() {
+        return ciEnvVars;
     }
-  }
-
-  private final String ciProviderName;
-  private final String ciPipelineId;
-  private final String ciPipelineName;
-  private final String ciPipelineDisplayName;
-  private final String ciStageName;
-  private final String ciJobId;
-  private final String ciJobName;
-  private final String ciPipelineNumber;
-  private final String ciPipelineUrl;
-  private final String ciJobUrl;
-  private final String ciWorkspace;
-  private final String ciNodeName;
-  private final String ciNodeLabels;
-  private final Map<String, String> ciEnvVars;
-  private final Map<String, String> additionalTags;
-
-  public CIInfo() {
-    this(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
-  }
-
-  public CIInfo(
-      String ciProviderName,
-      String ciPipelineId,
-      String ciPipelineName,
-      String ciPipelineDisplayName,
-      String ciStageName,
-      String ciJobId,
-      String ciJobName,
-      String ciPipelineNumber,
-      String ciPipelineUrl,
-      String ciJobUrl,
-      String ciWorkspace,
-      String ciNodeName,
-      String ciNodeLabels,
-      Map<String, String> ciEnvVars,
-      Map<String, String> additionalTags) {
-    this.ciProviderName = ciProviderName;
-    this.ciPipelineId = ciPipelineId;
-    this.ciPipelineName = ciPipelineName;
-    this.ciPipelineDisplayName = ciPipelineDisplayName;
-    this.ciStageName = ciStageName;
-    this.ciJobId = ciJobId;
-    this.ciJobName = ciJobName;
-    this.ciPipelineNumber = ciPipelineNumber;
-    this.ciPipelineUrl = ciPipelineUrl;
-    this.ciJobUrl = ciJobUrl;
-    this.ciWorkspace = sanitizeWorkspace(ciWorkspace);
-    this.ciNodeName = ciNodeName;
-    this.ciNodeLabels = ciNodeLabels;
-    this.ciEnvVars = ciEnvVars;
-    this.additionalTags = additionalTags;
-  }
-
-  public String getCiProviderName() {
-    return ciProviderName;
-  }
-
-  public String getCiPipelineId() {
-    return ciPipelineId;
-  }
-
-  public String getCiPipelineName() {
-    return ciPipelineName;
-  }
-
-  public String getCiPipelineDisplayName() {
-    return ciPipelineDisplayName;
-  }
-
-  public String getCiStageName() {
-    return ciStageName;
-  }
-
-  public String getCiJobId() {
-    return ciJobId;
-  }
-
-  public String getCiJobName() {
-    return ciJobName;
-  }
-
-  public String getCiPipelineNumber() {
-    return ciPipelineNumber;
-  }
-
-  public String getCiPipelineUrl() {
-    return ciPipelineUrl;
-  }
-
-  public String getCiJobUrl() {
-    return ciJobUrl;
-  }
-
-  private String sanitizeWorkspace(String workspace) {
-    String realCiWorkspace = FileUtils.toRealPath(workspace);
-    return (realCiWorkspace == null
-            || !realCiWorkspace.endsWith(File.separator)
-            || realCiWorkspace.length() == 1) // root path "/"
-        ? realCiWorkspace
-        : (realCiWorkspace.substring(0, realCiWorkspace.length() - 1));
-  }
-
-  /**
-   * @return Workspace path without the trailing separator
-   */
-  public String getCiWorkspace() {
-    return ciWorkspace;
-  }
-
-  public String getCiNodeName() {
-    return ciNodeName;
-  }
-
-  public String getCiNodeLabels() {
-    return ciNodeLabels;
-  }
-
-  public Map<String, String> getCiEnvVars() {
-    return ciEnvVars;
-  }
-
-  public Map<String, String> getAdditionalTags() {
-    return additionalTags;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+
+    public Map<String, String> getAdditionalTags() {
+        return additionalTags;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CIInfo ciInfo = (CIInfo) o;
+        return Objects.equals(ciProviderName, ciInfo.ciProviderName)
+                && Objects.equals(ciPipelineId, ciInfo.ciPipelineId)
+                && Objects.equals(ciPipelineName, ciInfo.ciPipelineName)
+                && Objects.equals(ciPipelineDisplayName, ciInfo.ciPipelineDisplayName)
+                && Objects.equals(ciStageName, ciInfo.ciStageName)
+                && Objects.equals(ciJobId, ciInfo.ciJobId)
+                && Objects.equals(ciJobName, ciInfo.ciJobName)
+                && Objects.equals(ciPipelineNumber, ciInfo.ciPipelineNumber)
+                && Objects.equals(ciPipelineUrl, ciInfo.ciPipelineUrl)
+                && Objects.equals(ciJobUrl, ciInfo.ciJobUrl)
+                && Objects.equals(ciWorkspace, ciInfo.ciWorkspace)
+                && Objects.equals(ciNodeName, ciInfo.ciNodeName)
+                && Objects.equals(ciNodeLabels, ciInfo.ciNodeLabels)
+                && Objects.equals(ciEnvVars, ciInfo.ciEnvVars)
+                && Objects.equals(additionalTags, ciInfo.additionalTags);
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 1;
+        hash = 31 * hash + (ciProviderName == null ? 0 : ciProviderName.hashCode());
+        hash = 31 * hash + (ciPipelineId == null ? 0 : ciPipelineId.hashCode());
+        hash = 31 * hash + (ciPipelineName == null ? 0 : ciPipelineName.hashCode());
+        hash = 31 * hash + (ciPipelineDisplayName == null ? 0 : ciPipelineDisplayName.hashCode());
+        hash = 31 * hash + (ciStageName == null ? 0 : ciStageName.hashCode());
+        hash = 31 * hash + (ciJobId == null ? 0 : ciJobId.hashCode());
+        hash = 31 * hash + (ciJobName == null ? 0 : ciJobName.hashCode());
+        hash = 31 * hash + (ciPipelineNumber == null ? 0 : ciPipelineNumber.hashCode());
+        hash = 31 * hash + (ciPipelineUrl == null ? 0 : ciPipelineUrl.hashCode());
+        hash = 31 * hash + (ciJobUrl == null ? 0 : ciJobUrl.hashCode());
+        hash = 31 * hash + (ciWorkspace == null ? 0 : ciWorkspace.hashCode());
+        hash = 31 * hash + (ciNodeName == null ? 0 : ciNodeName.hashCode());
+        hash = 31 * hash + (ciNodeLabels == null ? 0 : ciNodeLabels.hashCode());
+        hash = 31 * hash + (ciEnvVars == null ? 0 : ciEnvVars.hashCode());
+        hash = 31 * hash + (additionalTags == null ? 0 : additionalTags.hashCode());
+        return hash;
+    }
+
+    @Override
+    public String toString() {
+        return "CIInfo{"
+                + "ciProviderName='"
+                + ciProviderName
+                + '\''
+                + ", ciPipelineId='"
+                + ciPipelineId
+                + '\''
+                + ", ciPipelineName='"
+                + ciPipelineName
+                + '\''
+                + ", ciPipelineDisplayName='"
+                + ciPipelineDisplayName
+                + '\''
+                + ", ciStageName='"
+                + ciStageName
+                + '\''
+                + ", ciJobId='"
+                + ciJobId
+                + '\''
+                + ", ciJobName='"
+                + ciJobName
+                + '\''
+                + ", ciPipelineNumber='"
+                + ciPipelineNumber
+                + '\''
+                + ", ciPipelineUrl='"
+                + ciPipelineUrl
+                + '\''
+                + ", ciJobUrl='"
+                + ciJobUrl
+                + '\''
+                + ", ciWorkspace='"
+                + ciWorkspace
+                + '\''
+                + ", ciNodeName='"
+                + ciNodeName
+                + '\''
+                + ", ciNodeLabels='"
+                + ciNodeLabels
+                + '\''
+                + ", ciEnvVars='"
+                + ciEnvVars
+                + '\''
+                + ", additionalTags='"
+                + additionalTags
+                + '\''
+                + '}';
     }
-    CIInfo ciInfo = (CIInfo) o;
-    return Objects.equals(ciProviderName, ciInfo.ciProviderName)
-        && Objects.equals(ciPipelineId, ciInfo.ciPipelineId)
-        && Objects.equals(ciPipelineName, ciInfo.ciPipelineName)
-        && Objects.equals(ciPipelineDisplayName, ciInfo.ciPipelineDisplayName)
-        && Objects.equals(ciStageName, ciInfo.ciStageName)
-        && Objects.equals(ciJobId, ciInfo.ciJobId)
-        && Objects.equals(ciJobName, ciInfo.ciJobName)
-        && Objects.equals(ciPipelineNumber, ciInfo.ciPipelineNumber)
-        && Objects.equals(ciPipelineUrl, ciInfo.ciPipelineUrl)
-        && Objects.equals(ciJobUrl, ciInfo.ciJobUrl)
-        && Objects.equals(ciWorkspace, ciInfo.ciWorkspace)
-        && Objects.equals(ciNodeName, ciInfo.ciNodeName)
-        && Objects.equals(ciNodeLabels, ciInfo.ciNodeLabels)
-        && Objects.equals(ciEnvVars, ciInfo.ciEnvVars)
-        && Objects.equals(additionalTags, ciInfo.additionalTags);
-  }
-
-  @Override
-  public int hashCode() {
-    int hash = 1;
-    hash = 31 * hash + (ciProviderName == null ? 0 : ciProviderName.hashCode());
-    hash = 31 * hash + (ciPipelineId == null ? 0 : ciPipelineId.hashCode());
-    hash = 31 * hash + (ciPipelineName == null ? 0 : ciPipelineName.hashCode());
-    hash = 31 * hash + (ciPipelineDisplayName == null ? 0 : ciPipelineDisplayName.hashCode());
-    hash = 31 * hash + (ciStageName == null ? 0 : ciStageName.hashCode());
-    hash = 31 * hash + (ciJobId == null ? 0 : ciJobId.hashCode());
-    hash = 31 * hash + (ciJobName == null ? 0 : ciJobName.hashCode());
-    hash = 31 * hash + (ciPipelineNumber == null ? 0 : ciPipelineNumber.hashCode());
-    hash = 31 * hash + (ciPipelineUrl == null ? 0 : ciPipelineUrl.hashCode());
-    hash = 31 * hash + (ciJobUrl == null ? 0 : ciJobUrl.hashCode());
-    hash = 31 * hash + (ciWorkspace == null ? 0 : ciWorkspace.hashCode());
-    hash = 31 * hash + (ciNodeName == null ? 0 : ciNodeName.hashCode());
-    hash = 31 * hash + (ciNodeLabels == null ? 0 : ciNodeLabels.hashCode());
-    hash = 31 * hash + (ciEnvVars == null ? 0 : ciEnvVars.hashCode());
-    hash = 31 * hash + (additionalTags == null ? 0 : additionalTags.hashCode());
-    return hash;
-  }
-
-  @Override
-  public String toString() {
-    return "CIInfo{"
-        + "ciProviderName='"
-        + ciProviderName
-        + '\''
-        + ", ciPipelineId='"
-        + ciPipelineId
-        + '\''
-        + ", ciPipelineName='"
-        + ciPipelineName
-        + '\''
-        + ", ciPipelineDisplayName='"
-        + ciPipelineDisplayName
-        + '\''
-        + ", ciStageName='"
-        + ciStageName
-        + '\''
-        + ", ciJobId='"
-        + ciJobId
-        + '\''
-        + ", ciJobName='"
-        + ciJobName
-        + '\''
-        + ", ciPipelineNumber='"
-        + ciPipelineNumber
-        + '\''
-        + ", ciPipelineUrl='"
-        + ciPipelineUrl
-        + '\''
-        + ", ciJobUrl='"
-        + ciJobUrl
-        + '\''
-        + ", ciWorkspace='"
-        + ciWorkspace
-        + '\''
-        + ", ciNodeName='"
-        + ciNodeName
-        + '\''
-        + ", ciNodeLabels='"
-        + ciNodeLabels
-        + '\''
-        + ", ciEnvVars='"
-        + ciEnvVars
-        + '\''
-        + ", additionalTags='"
-        + additionalTags
-        + '\''
-        + '}';
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIProviderInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIProviderInfo.java
index 7e617412185..ea26a36ee71 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIProviderInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIProviderInfo.java
@@ -6,12 +6,12 @@
 
 public interface CIProviderInfo {
 
-  GitInfo buildCIGitInfo();
+    GitInfo buildCIGitInfo();
 
-  CIInfo buildCIInfo();
+    CIInfo buildCIInfo();
 
-  @Nonnull
-  PullRequestInfo buildPullRequestInfo();
+    @Nonnull
+    PullRequestInfo buildPullRequestInfo();
 
-  Provider getProvider();
+    Provider getProvider();
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIProviderInfoFactory.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIProviderInfoFactory.java
index 1726959e8a3..7a6b502faa3 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIProviderInfoFactory.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIProviderInfoFactory.java
@@ -7,67 +7,67 @@
 
 public class CIProviderInfoFactory {
 
-  private final String targetFolder;
-  private final Config config;
-  private final CiEnvironment environment;
+    private final String targetFolder;
+    private final Config config;
+    private final CiEnvironment environment;
 
-  public CIProviderInfoFactory(Config config, CiEnvironment environment) {
-    this(config, ".git", environment);
-  }
-
-  CIProviderInfoFactory(Config config, String targetFolder, CiEnvironment environment) {
-    this.targetFolder = targetFolder;
-    this.config = config;
-    this.environment = environment;
-  }
-
-  public CIProviderInfo createCIProviderInfo(Path currentPath) {
-    // bazel rule supplies CI/git data downstream
-    BazelMode bazelMode = BazelMode.get();
-    if (bazelMode.isPayloadFilesEnabled()) {
-      return new BazelInfo();
+    public CIProviderInfoFactory(Config config, CiEnvironment environment) {
+        this(config, ".git", environment);
     }
 
-    if (!config.isCiVisibilityCiProviderIntegrationEnabled()) {
-      return new UnknownCIInfo(environment, targetFolder, currentPath);
+    CIProviderInfoFactory(Config config, String targetFolder, CiEnvironment environment) {
+        this.targetFolder = targetFolder;
+        this.config = config;
+        this.environment = environment;
     }
 
-    // CI and Git information is obtained
-    // from different environment variables
-    // depending on which CI server is running the build.
-    if (environment.get(JenkinsInfo.JENKINS) != null) {
-      return new JenkinsInfo(environment);
-    } else if (environment.get(GitLabInfo.GITLAB) != null) {
-      return new GitLabInfo(environment);
-    } else if (environment.get(TravisInfo.TRAVIS) != null) {
-      return new TravisInfo(environment);
-    } else if (environment.get(CircleCIInfo.CIRCLECI) != null) {
-      return new CircleCIInfo(environment);
-    } else if (environment.get(AppVeyorInfo.APPVEYOR) != null) {
-      return new AppVeyorInfo(environment);
-    } else if (environment.get(AzurePipelinesInfo.AZURE) != null) {
-      return new AzurePipelinesInfo(environment);
-    } else if (environment.get(BitBucketInfo.BITBUCKET) != null) {
-      return new BitBucketInfo(environment);
-    } else if (environment.get(GithubActionsInfo.GHACTIONS) != null) {
-      return new GithubActionsInfo(environment);
-    } else if (environment.get(BuildkiteInfo.BUILDKITE) != null) {
-      return new BuildkiteInfo(environment);
-    } else if (environment.get(BitriseInfo.BITRISE) != null) {
-      return new BitriseInfo(environment);
-    } else if (environment.get(BuddyInfo.BUDDY) != null) {
-      return new BuddyInfo(environment);
-    } else if (environment.get(CodefreshInfo.CODEFRESH) != null) {
-      return new CodefreshInfo(environment);
-    } else if (environment.get(TeamcityInfo.TEAMCITY) != null) {
-      return new TeamcityInfo(environment);
-    } else if (environment.get(AwsCodePipelineInfo.AWS_CODEPIPELINE) != null
-        && environment.get(AwsCodePipelineInfo.AWS_CODEPIPELINE).startsWith("codepipeline")) {
-      return new AwsCodePipelineInfo(environment);
-    } else if (environment.get(DroneInfo.DRONE) != null) {
-      return new DroneInfo(environment);
-    } else {
-      return new UnknownCIInfo(environment, targetFolder, currentPath);
+    public CIProviderInfo createCIProviderInfo(Path currentPath) {
+        // bazel rule supplies CI/git data downstream
+        BazelMode bazelMode = BazelMode.get();
+        if (bazelMode.isPayloadFilesEnabled()) {
+            return new BazelInfo();
+        }
+
+        if (!config.isCiVisibilityCiProviderIntegrationEnabled()) {
+            return new UnknownCIInfo(environment, targetFolder, currentPath);
+        }
+
+        // CI and Git information is obtained
+        // from different environment variables
+        // depending on which CI server is running the build.
+        if (environment.get(JenkinsInfo.JENKINS) != null) {
+            return new JenkinsInfo(environment);
+        } else if (environment.get(GitLabInfo.GITLAB) != null) {
+            return new GitLabInfo(environment);
+        } else if (environment.get(TravisInfo.TRAVIS) != null) {
+            return new TravisInfo(environment);
+        } else if (environment.get(CircleCIInfo.CIRCLECI) != null) {
+            return new CircleCIInfo(environment);
+        } else if (environment.get(AppVeyorInfo.APPVEYOR) != null) {
+            return new AppVeyorInfo(environment);
+        } else if (environment.get(AzurePipelinesInfo.AZURE) != null) {
+            return new AzurePipelinesInfo(environment);
+        } else if (environment.get(BitBucketInfo.BITBUCKET) != null) {
+            return new BitBucketInfo(environment);
+        } else if (environment.get(GithubActionsInfo.GHACTIONS) != null) {
+            return new GithubActionsInfo(environment);
+        } else if (environment.get(BuildkiteInfo.BUILDKITE) != null) {
+            return new BuildkiteInfo(environment);
+        } else if (environment.get(BitriseInfo.BITRISE) != null) {
+            return new BitriseInfo(environment);
+        } else if (environment.get(BuddyInfo.BUDDY) != null) {
+            return new BuddyInfo(environment);
+        } else if (environment.get(CodefreshInfo.CODEFRESH) != null) {
+            return new CodefreshInfo(environment);
+        } else if (environment.get(TeamcityInfo.TEAMCITY) != null) {
+            return new TeamcityInfo(environment);
+        } else if (environment.get(AwsCodePipelineInfo.AWS_CODEPIPELINE) != null
+                && environment.get(AwsCodePipelineInfo.AWS_CODEPIPELINE).startsWith("codepipeline")) {
+            return new AwsCodePipelineInfo(environment);
+        } else if (environment.get(DroneInfo.DRONE) != null) {
+            return new DroneInfo(environment);
+        } else {
+            return new UnknownCIInfo(environment, targetFolder, currentPath);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CITagsProvider.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CITagsProvider.java
index af34741a638..293d52d5a4b 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CITagsProvider.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CITagsProvider.java
@@ -11,253 +11,261 @@
 
 public class CITagsProvider {
 
-  private final GitInfoProvider gitInfoProvider;
-
-  public CITagsProvider() {
-    this(GitInfoProvider.INSTANCE);
-  }
-
-  CITagsProvider(GitInfoProvider gitInfoProvider) {
-    this.gitInfoProvider = gitInfoProvider;
-  }
-
-  public Map<String, String> getCiTags(CIInfo ciInfo, PullRequestInfo pullRequestInfo) {
-    String repoRoot = ciInfo.getCiWorkspace();
-    GitInfo gitInfo = gitInfoProvider.getGitInfo(repoRoot);
-
-    return new CITagsBuilder()
-        .withCiProviderName(ciInfo.getCiProviderName())
-        .withCiPipelineId(ciInfo.getCiPipelineId())
-        .withCiPipelineName(ciInfo.getCiPipelineName())
-        .withCiPipelineDisplayName(ciInfo.getCiPipelineDisplayName())
-        .withCiStageName(ciInfo.getCiStageName())
-        .withCiJobName(ciInfo.getCiJobName())
-        .withCiJobId(ciInfo.getCiJobId())
-        .withCiPipelineNumber(ciInfo.getCiPipelineNumber())
-        .withCiPipelineUrl(ciInfo.getCiPipelineUrl())
-        .withCiJorUrl(ciInfo.getCiJobUrl())
-        .withCiWorkspacePath(ciInfo.getCiWorkspace())
-        .withCiNodeName(ciInfo.getCiNodeName())
-        .withCiNodeLabels(ciInfo.getCiNodeLabels())
-        .withCiEnvVars(ciInfo.getCiEnvVars())
-        .withAdditionalTags(ciInfo.getAdditionalTags())
-        .withPullRequestBaseBranch(pullRequestInfo)
-        .withPullRequestBaseBranchSha(pullRequestInfo)
-        .withPullRequestBaseBranchHeadSha(pullRequestInfo)
-        .withGitCommitHeadSha(pullRequestInfo)
-        .withGitCommitHeadAuthorName(pullRequestInfo)
-        .withGitCommitHeadAuthorEmail(pullRequestInfo)
-        .withGitCommitHeadAuthorDate(pullRequestInfo)
-        .withGitCommitHeadCommitterName(pullRequestInfo)
-        .withGitCommitHeadCommitterEmail(pullRequestInfo)
-        .withGitCommitHeadCommitterDate(pullRequestInfo)
-        .withGitCommitHeadMessage(pullRequestInfo)
-        .withPullRequestNumber(pullRequestInfo)
-        .withGitRepositoryUrl(gitInfo)
-        .withGitCommit(gitInfo)
-        .withGitBranch(gitInfo)
-        .withGitTag(gitInfo)
-        .withGitCommitAuthorName(gitInfo)
-        .withGitCommitAuthorEmail(gitInfo)
-        .withGitCommitAuthorDate(gitInfo)
-        .withGitCommitCommitterName(gitInfo)
-        .withGitCommitCommitterEmail(gitInfo)
-        .withGitCommitCommitterDate(gitInfo)
-        .withGitCommitMessage(gitInfo)
-        .build();
-  }
-
-  public static class CITagsBuilder {
-
-    private final Map<String, String> ciTags = new HashMap<>();
-
-    public CITagsBuilder withCiProviderName(final String ciProviderName) {
-      return putTagValue(Tags.CI_PROVIDER_NAME, ciProviderName);
+    private final GitInfoProvider gitInfoProvider;
+
+    public CITagsProvider() {
+        this(GitInfoProvider.INSTANCE);
+    }
+
+    CITagsProvider(GitInfoProvider gitInfoProvider) {
+        this.gitInfoProvider = gitInfoProvider;
+    }
+
+    public Map<String, String> getCiTags(CIInfo ciInfo, PullRequestInfo pullRequestInfo) {
+        String repoRoot = ciInfo.getCiWorkspace();
+        GitInfo gitInfo = gitInfoProvider.getGitInfo(repoRoot);
+
+        return new CITagsBuilder()
+                .withCiProviderName(ciInfo.getCiProviderName())
+                .withCiPipelineId(ciInfo.getCiPipelineId())
+                .withCiPipelineName(ciInfo.getCiPipelineName())
+                .withCiPipelineDisplayName(ciInfo.getCiPipelineDisplayName())
+                .withCiStageName(ciInfo.getCiStageName())
+                .withCiJobName(ciInfo.getCiJobName())
+                .withCiJobId(ciInfo.getCiJobId())
+                .withCiPipelineNumber(ciInfo.getCiPipelineNumber())
+                .withCiPipelineUrl(ciInfo.getCiPipelineUrl())
+                .withCiJorUrl(ciInfo.getCiJobUrl())
+                .withCiWorkspacePath(ciInfo.getCiWorkspace())
+                .withCiNodeName(ciInfo.getCiNodeName())
+                .withCiNodeLabels(ciInfo.getCiNodeLabels())
+                .withCiEnvVars(ciInfo.getCiEnvVars())
+                .withAdditionalTags(ciInfo.getAdditionalTags())
+                .withPullRequestBaseBranch(pullRequestInfo)
+                .withPullRequestBaseBranchSha(pullRequestInfo)
+                .withPullRequestBaseBranchHeadSha(pullRequestInfo)
+                .withGitCommitHeadSha(pullRequestInfo)
+                .withGitCommitHeadAuthorName(pullRequestInfo)
+                .withGitCommitHeadAuthorEmail(pullRequestInfo)
+                .withGitCommitHeadAuthorDate(pullRequestInfo)
+                .withGitCommitHeadCommitterName(pullRequestInfo)
+                .withGitCommitHeadCommitterEmail(pullRequestInfo)
+                .withGitCommitHeadCommitterDate(pullRequestInfo)
+                .withGitCommitHeadMessage(pullRequestInfo)
+                .withPullRequestNumber(pullRequestInfo)
+                .withGitRepositoryUrl(gitInfo)
+                .withGitCommit(gitInfo)
+                .withGitBranch(gitInfo)
+                .withGitTag(gitInfo)
+                .withGitCommitAuthorName(gitInfo)
+                .withGitCommitAuthorEmail(gitInfo)
+                .withGitCommitAuthorDate(gitInfo)
+                .withGitCommitCommitterName(gitInfo)
+                .withGitCommitCommitterEmail(gitInfo)
+                .withGitCommitCommitterDate(gitInfo)
+                .withGitCommitMessage(gitInfo)
+                .build();
+    }
+
+    public static class CITagsBuilder {
+
+        private final Map<String, String> ciTags = new HashMap<>();
+
+        public CITagsBuilder withCiProviderName(final String ciProviderName) {
+            return putTagValue(Tags.CI_PROVIDER_NAME, ciProviderName);
+        }
+
+        public CITagsBuilder withCiPipelineId(final String ciPipelineId) {
+            return putTagValue(Tags.CI_PIPELINE_ID, ciPipelineId);
+        }
+
+        public CITagsBuilder withCiPipelineName(final String ciPipelineName) {
+            return putTagValue(Tags.CI_PIPELINE_NAME, ciPipelineName);
+        }
+
+        public CITagsBuilder withCiPipelineDisplayName(final String ciPipelineDisplayName) {
+            return putTagValue(Tags.CI_PIPELINE_DISPLAY_NAME, ciPipelineDisplayName);
+        }
+
+        public CITagsBuilder withCiPipelineNumber(final String ciPipelineNumber) {
+            return putTagValue(Tags.CI_PIPELINE_NUMBER, ciPipelineNumber);
+        }
+
+        public CITagsBuilder withCiPipelineUrl(final String ciPipelineUrl) {
+            return putTagValue(Tags.CI_PIPELINE_URL, ciPipelineUrl);
+        }
+
+        public CITagsBuilder withCiStageName(final String ciStageName) {
+            return putTagValue(Tags.CI_STAGE_NAME, ciStageName);
+        }
+
+        public CITagsBuilder withCiJobId(final String ciJobId) {
+            return putTagValue(Tags.CI_JOB_ID, ciJobId);
+        }
+
+        public CITagsBuilder withCiJobName(final String ciJobName) {
+            return putTagValue(Tags.CI_JOB_NAME, ciJobName);
+        }
+
+        public CITagsBuilder withCiJorUrl(final String ciJobUrl) {
+            return putTagValue(Tags.CI_JOB_URL, ciJobUrl);
+        }
+
+        public CITagsBuilder withCiWorkspacePath(final String ciWorkspacePath) {
+            return putTagValue(Tags.CI_WORKSPACE_PATH, ciWorkspacePath);
+        }
+
+        public CITagsBuilder withCiNodeName(final String ciNodeName) {
+            return putTagValue(Tags.CI_NODE_NAME, ciNodeName);
+        }
+
+        public CITagsBuilder withCiNodeLabels(final String ciNodeLabels) {
+            return putTagValue(Tags.CI_NODE_LABELS, ciNodeLabels);
+        }
+
+        public CITagsBuilder withCiEnvVars(final Map<String, String> ciEnvVars) {
+            if (ciEnvVars == null || ciEnvVars.isEmpty()) {
+                return this;
+            }
+            return putTagValue(DDTags.CI_ENV_VARS, toJson(ciEnvVars));
+        }
+
+        public CITagsBuilder withAdditionalTags(final Map<String, String> additionalTags) {
+            if (additionalTags == null || additionalTags.isEmpty()) {
+                return this;
+            }
+            for (Map.Entry<String, String> e : additionalTags.entrySet()) {
+                putTagValue(e.getKey(), e.getValue());
+            }
+            return this;
+        }
+
+        public CITagsBuilder withPullRequestBaseBranch(final PullRequestInfo pullRequestInfo) {
+            return putTagValue(Tags.GIT_PULL_REQUEST_BASE_BRANCH, pullRequestInfo.getBaseBranch());
+        }
+
+        public CITagsBuilder withPullRequestBaseBranchSha(final PullRequestInfo pullRequestInfo) {
+            return putTagValue(Tags.GIT_PULL_REQUEST_BASE_BRANCH_SHA, pullRequestInfo.getBaseBranchSha());
+        }
+
+        public CITagsBuilder withPullRequestBaseBranchHeadSha(final PullRequestInfo pullRequestInfo) {
+            return putTagValue(Tags.GIT_PULL_REQUEST_BASE_BRANCH_HEAD_SHA, pullRequestInfo.getBaseBranchHeadSha());
+        }
+
+        public CITagsBuilder withGitCommitHeadSha(final PullRequestInfo pullRequestInfo) {
+            return putTagValue(
+                    Tags.GIT_COMMIT_HEAD_SHA, pullRequestInfo.getHeadCommit().getSha());
+        }
+
+        public CITagsBuilder withGitCommitHeadAuthorName(final PullRequestInfo pullRequestInfo) {
+            return putTagValue(
+                    Tags.GIT_COMMIT_HEAD_AUTHOR_NAME,
+                    pullRequestInfo.getHeadCommit().getAuthor().getName());
+        }
+
+        public CITagsBuilder withGitCommitHeadAuthorEmail(final PullRequestInfo pullRequestInfo) {
+            return putTagValue(
+                    Tags.GIT_COMMIT_HEAD_AUTHOR_EMAIL,
+                    pullRequestInfo.getHeadCommit().getAuthor().getEmail());
+        }
+
+        public CITagsBuilder withGitCommitHeadAuthorDate(final PullRequestInfo pullRequestInfo) {
+            return putTagValue(
+                    Tags.GIT_COMMIT_HEAD_AUTHOR_DATE,
+                    pullRequestInfo.getHeadCommit().getAuthor().getIso8601Date());
+        }
+
+        public CITagsBuilder withGitCommitHeadCommitterName(final PullRequestInfo pullRequestInfo) {
+            return putTagValue(
+                    Tags.GIT_COMMIT_HEAD_COMMITTER_NAME,
+                    pullRequestInfo.getHeadCommit().getCommitter().getName());
+        }
+
+        public CITagsBuilder withGitCommitHeadCommitterEmail(final PullRequestInfo pullRequestInfo) {
+            return putTagValue(
+                    Tags.GIT_COMMIT_HEAD_COMMITTER_EMAIL,
+                    pullRequestInfo.getHeadCommit().getCommitter().getEmail());
+        }
+
+        public CITagsBuilder withGitCommitHeadCommitterDate(final PullRequestInfo pullRequestInfo) {
+            return putTagValue(
+                    Tags.GIT_COMMIT_HEAD_COMMITTER_DATE,
+                    pullRequestInfo.getHeadCommit().getCommitter().getIso8601Date());
+        }
+
+        public CITagsBuilder withGitCommitHeadMessage(final PullRequestInfo pullRequestInfo) {
+            return putTagValue(
+                    Tags.GIT_COMMIT_HEAD_MESSAGE,
+                    pullRequestInfo.getHeadCommit().getFullMessage());
+        }
+
+        public CITagsBuilder withPullRequestNumber(final PullRequestInfo pullRequestInfo) {
+            return putTagValue(Tags.PULL_REQUEST_NUMBER, pullRequestInfo.getPullRequestNumber());
+        }
+
+        public CITagsBuilder withGitRepositoryUrl(final GitInfo gitInfo) {
+            return putTagValue(Tags.GIT_REPOSITORY_URL, gitInfo.getRepositoryURL());
+        }
+
+        public CITagsBuilder withGitCommit(final GitInfo gitInfo) {
+            return putTagValue(Tags.GIT_COMMIT_SHA, gitInfo.getCommit().getSha());
+        }
+
+        public CITagsBuilder withGitBranch(final GitInfo gitInfo) {
+            return putTagValue(Tags.GIT_BRANCH, gitInfo.getBranch());
+        }
+
+        public CITagsBuilder withGitTag(final GitInfo gitInfo) {
+            return putTagValue(Tags.GIT_TAG, gitInfo.getTag());
+        }
+
+        public CITagsBuilder withGitCommitAuthorName(final GitInfo gitInfo) {
+            return putTagValue(
+                    Tags.GIT_COMMIT_AUTHOR_NAME, gitInfo.getCommit().getAuthor().getName());
+        }
+
+        public CITagsBuilder withGitCommitAuthorEmail(final GitInfo gitInfo) {
+            return putTagValue(
+                    Tags.GIT_COMMIT_AUTHOR_EMAIL,
+                    gitInfo.getCommit().getAuthor().getEmail());
+        }
+
+        public CITagsBuilder withGitCommitAuthorDate(final GitInfo gitInfo) {
+            return putTagValue(
+                    Tags.GIT_COMMIT_AUTHOR_DATE, gitInfo.getCommit().getAuthor().getIso8601Date());
+        }
+
+        public CITagsBuilder withGitCommitCommitterName(final GitInfo gitInfo) {
+            return putTagValue(
+                    Tags.GIT_COMMIT_COMMITTER_NAME,
+                    gitInfo.getCommit().getCommitter().getName());
+        }
+
+        public CITagsBuilder withGitCommitCommitterEmail(final GitInfo gitInfo) {
+            return putTagValue(
+                    Tags.GIT_COMMIT_COMMITTER_EMAIL,
+                    gitInfo.getCommit().getCommitter().getEmail());
+        }
+
+        public CITagsBuilder withGitCommitCommitterDate(final GitInfo gitInfo) {
+            return putTagValue(
+                    Tags.GIT_COMMIT_COMMITTER_DATE,
+                    gitInfo.getCommit().getCommitter().getIso8601Date());
+        }
+
+        public CITagsBuilder withGitCommitMessage(final GitInfo gitInfo) {
+            return putTagValue(Tags.GIT_COMMIT_MESSAGE, gitInfo.getCommit().getFullMessage());
+        }
+
+        public Map<String, String> build() {
+            return ciTags;
+        }
+
+        private CITagsBuilder putTagValue(final String tagKey, final String tagValue) {
+            if (tagValue != null) {
+                ciTags.put(tagKey, tagValue);
+            }
+            return this;
+        }
     }
-
-    public CITagsBuilder withCiPipelineId(final String ciPipelineId) {
-      return putTagValue(Tags.CI_PIPELINE_ID, ciPipelineId);
-    }
-
-    public CITagsBuilder withCiPipelineName(final String ciPipelineName) {
-      return putTagValue(Tags.CI_PIPELINE_NAME, ciPipelineName);
-    }
-
-    public CITagsBuilder withCiPipelineDisplayName(final String ciPipelineDisplayName) {
-      return putTagValue(Tags.CI_PIPELINE_DISPLAY_NAME, ciPipelineDisplayName);
-    }
-
-    public CITagsBuilder withCiPipelineNumber(final String ciPipelineNumber) {
-      return putTagValue(Tags.CI_PIPELINE_NUMBER, ciPipelineNumber);
-    }
-
-    public CITagsBuilder withCiPipelineUrl(final String ciPipelineUrl) {
-      return putTagValue(Tags.CI_PIPELINE_URL, ciPipelineUrl);
-    }
-
-    public CITagsBuilder withCiStageName(final String ciStageName) {
-      return putTagValue(Tags.CI_STAGE_NAME, ciStageName);
-    }
-
-    public CITagsBuilder withCiJobId(final String ciJobId) {
-      return putTagValue(Tags.CI_JOB_ID, ciJobId);
-    }
-
-    public CITagsBuilder withCiJobName(final String ciJobName) {
-      return putTagValue(Tags.CI_JOB_NAME, ciJobName);
-    }
-
-    public CITagsBuilder withCiJorUrl(final String ciJobUrl) {
-      return putTagValue(Tags.CI_JOB_URL, ciJobUrl);
-    }
-
-    public CITagsBuilder withCiWorkspacePath(final String ciWorkspacePath) {
-      return putTagValue(Tags.CI_WORKSPACE_PATH, ciWorkspacePath);
-    }
-
-    public CITagsBuilder withCiNodeName(final String ciNodeName) {
-      return putTagValue(Tags.CI_NODE_NAME, ciNodeName);
-    }
-
-    public CITagsBuilder withCiNodeLabels(final String ciNodeLabels) {
-      return putTagValue(Tags.CI_NODE_LABELS, ciNodeLabels);
-    }
-
-    public CITagsBuilder withCiEnvVars(final Map<String, String> ciEnvVars) {
-      if (ciEnvVars == null || ciEnvVars.isEmpty()) {
-        return this;
-      }
-      return putTagValue(DDTags.CI_ENV_VARS, toJson(ciEnvVars));
-    }
-
-    public CITagsBuilder withAdditionalTags(final Map<String, String> additionalTags) {
-      if (additionalTags == null || additionalTags.isEmpty()) {
-        return this;
-      }
-      for (Map.Entry<String, String> e : additionalTags.entrySet()) {
-        putTagValue(e.getKey(), e.getValue());
-      }
-      return this;
-    }
-
-    public CITagsBuilder withPullRequestBaseBranch(final PullRequestInfo pullRequestInfo) {
-      return putTagValue(Tags.GIT_PULL_REQUEST_BASE_BRANCH, pullRequestInfo.getBaseBranch());
-    }
-
-    public CITagsBuilder withPullRequestBaseBranchSha(final PullRequestInfo pullRequestInfo) {
-      return putTagValue(Tags.GIT_PULL_REQUEST_BASE_BRANCH_SHA, pullRequestInfo.getBaseBranchSha());
-    }
-
-    public CITagsBuilder withPullRequestBaseBranchHeadSha(final PullRequestInfo pullRequestInfo) {
-      return putTagValue(
-          Tags.GIT_PULL_REQUEST_BASE_BRANCH_HEAD_SHA, pullRequestInfo.getBaseBranchHeadSha());
-    }
-
-    public CITagsBuilder withGitCommitHeadSha(final PullRequestInfo pullRequestInfo) {
-      return putTagValue(Tags.GIT_COMMIT_HEAD_SHA, pullRequestInfo.getHeadCommit().getSha());
-    }
-
-    public CITagsBuilder withGitCommitHeadAuthorName(final PullRequestInfo pullRequestInfo) {
-      return putTagValue(
-          Tags.GIT_COMMIT_HEAD_AUTHOR_NAME, pullRequestInfo.getHeadCommit().getAuthor().getName());
-    }
-
-    public CITagsBuilder withGitCommitHeadAuthorEmail(final PullRequestInfo pullRequestInfo) {
-      return putTagValue(
-          Tags.GIT_COMMIT_HEAD_AUTHOR_EMAIL,
-          pullRequestInfo.getHeadCommit().getAuthor().getEmail());
-    }
-
-    public CITagsBuilder withGitCommitHeadAuthorDate(final PullRequestInfo pullRequestInfo) {
-      return putTagValue(
-          Tags.GIT_COMMIT_HEAD_AUTHOR_DATE,
-          pullRequestInfo.getHeadCommit().getAuthor().getIso8601Date());
-    }
-
-    public CITagsBuilder withGitCommitHeadCommitterName(final PullRequestInfo pullRequestInfo) {
-      return putTagValue(
-          Tags.GIT_COMMIT_HEAD_COMMITTER_NAME,
-          pullRequestInfo.getHeadCommit().getCommitter().getName());
-    }
-
-    public CITagsBuilder withGitCommitHeadCommitterEmail(final PullRequestInfo pullRequestInfo) {
-      return putTagValue(
-          Tags.GIT_COMMIT_HEAD_COMMITTER_EMAIL,
-          pullRequestInfo.getHeadCommit().getCommitter().getEmail());
-    }
-
-    public CITagsBuilder withGitCommitHeadCommitterDate(final PullRequestInfo pullRequestInfo) {
-      return putTagValue(
-          Tags.GIT_COMMIT_HEAD_COMMITTER_DATE,
-          pullRequestInfo.getHeadCommit().getCommitter().getIso8601Date());
-    }
-
-    public CITagsBuilder withGitCommitHeadMessage(final PullRequestInfo pullRequestInfo) {
-      return putTagValue(
-          Tags.GIT_COMMIT_HEAD_MESSAGE, pullRequestInfo.getHeadCommit().getFullMessage());
-    }
-
-    public CITagsBuilder withPullRequestNumber(final PullRequestInfo pullRequestInfo) {
-      return putTagValue(Tags.PULL_REQUEST_NUMBER, pullRequestInfo.getPullRequestNumber());
-    }
-
-    public CITagsBuilder withGitRepositoryUrl(final GitInfo gitInfo) {
-      return putTagValue(Tags.GIT_REPOSITORY_URL, gitInfo.getRepositoryURL());
-    }
-
-    public CITagsBuilder withGitCommit(final GitInfo gitInfo) {
-      return putTagValue(Tags.GIT_COMMIT_SHA, gitInfo.getCommit().getSha());
-    }
-
-    public CITagsBuilder withGitBranch(final GitInfo gitInfo) {
-      return putTagValue(Tags.GIT_BRANCH, gitInfo.getBranch());
-    }
-
-    public CITagsBuilder withGitTag(final GitInfo gitInfo) {
-      return putTagValue(Tags.GIT_TAG, gitInfo.getTag());
-    }
-
-    public CITagsBuilder withGitCommitAuthorName(final GitInfo gitInfo) {
-      return putTagValue(Tags.GIT_COMMIT_AUTHOR_NAME, gitInfo.getCommit().getAuthor().getName());
-    }
-
-    public CITagsBuilder withGitCommitAuthorEmail(final GitInfo gitInfo) {
-      return putTagValue(Tags.GIT_COMMIT_AUTHOR_EMAIL, gitInfo.getCommit().getAuthor().getEmail());
-    }
-
-    public CITagsBuilder withGitCommitAuthorDate(final GitInfo gitInfo) {
-      return putTagValue(
-          Tags.GIT_COMMIT_AUTHOR_DATE, gitInfo.getCommit().getAuthor().getIso8601Date());
-    }
-
-    public CITagsBuilder withGitCommitCommitterName(final GitInfo gitInfo) {
-      return putTagValue(
-          Tags.GIT_COMMIT_COMMITTER_NAME, gitInfo.getCommit().getCommitter().getName());
-    }
-
-    public CITagsBuilder withGitCommitCommitterEmail(final GitInfo gitInfo) {
-      return putTagValue(
-          Tags.GIT_COMMIT_COMMITTER_EMAIL, gitInfo.getCommit().getCommitter().getEmail());
-    }
-
-    public CITagsBuilder withGitCommitCommitterDate(final GitInfo gitInfo) {
-      return putTagValue(
-          Tags.GIT_COMMIT_COMMITTER_DATE, gitInfo.getCommit().getCommitter().getIso8601Date());
-    }
-
-    public CITagsBuilder withGitCommitMessage(final GitInfo gitInfo) {
-      return putTagValue(Tags.GIT_COMMIT_MESSAGE, gitInfo.getCommit().getFullMessage());
-    }
-
-    public Map<String, String> build() {
-      return ciTags;
-    }
-
-    private CITagsBuilder putTagValue(final String tagKey, final String tagValue) {
-      if (tagValue != null) {
-        ciTags.put(tagKey, tagValue);
-      }
-      return this;
-    }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CircleCIInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CircleCIInfo.java
index 24010c653f0..a40105a6a44 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CircleCIInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CircleCIInfo.java
@@ -13,69 +13,68 @@
 
 class CircleCIInfo implements CIProviderInfo {
 
-  // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables
-  public static final String CIRCLECI = "CIRCLECI";
-  public static final String CIRCLECI_PROVIDER_NAME = "circleci";
-  public static final String CIRCLECI_PIPELINE_ID = "CIRCLE_WORKFLOW_ID";
-  public static final String CIRCLECI_PIPELINE_NAME = "CIRCLE_PROJECT_REPONAME";
-  public static final String CIRCLECI_BUILD_URL = "CIRCLE_BUILD_URL";
-  public static final String CIRCLECI_BUILD_NUM = "CIRCLE_BUILD_NUM";
-  public static final String CIRCLECI_WORKSPACE_PATH = "CIRCLE_WORKING_DIRECTORY";
-  public static final String CIRCLECI_GIT_REPOSITORY_URL = "CIRCLE_REPOSITORY_URL";
-  public static final String CIRCLECI_GIT_COMMIT = "CIRCLE_SHA1";
-  public static final String CIRCLECI_GIT_BRANCH = "CIRCLE_BRANCH";
-  public static final String CIRCLECI_GIT_TAG = "CIRCLE_TAG";
-  public static final String CIRCLECI_JOB_NAME = "CIRCLE_JOB";
-  public static final String CIRCLECI_PR_NUMBER = "CIRCLE_PR_NUMBER";
+    // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables
+    public static final String CIRCLECI = "CIRCLECI";
+    public static final String CIRCLECI_PROVIDER_NAME = "circleci";
+    public static final String CIRCLECI_PIPELINE_ID = "CIRCLE_WORKFLOW_ID";
+    public static final String CIRCLECI_PIPELINE_NAME = "CIRCLE_PROJECT_REPONAME";
+    public static final String CIRCLECI_BUILD_URL = "CIRCLE_BUILD_URL";
+    public static final String CIRCLECI_BUILD_NUM = "CIRCLE_BUILD_NUM";
+    public static final String CIRCLECI_WORKSPACE_PATH = "CIRCLE_WORKING_DIRECTORY";
+    public static final String CIRCLECI_GIT_REPOSITORY_URL = "CIRCLE_REPOSITORY_URL";
+    public static final String CIRCLECI_GIT_COMMIT = "CIRCLE_SHA1";
+    public static final String CIRCLECI_GIT_BRANCH = "CIRCLE_BRANCH";
+    public static final String CIRCLECI_GIT_TAG = "CIRCLE_TAG";
+    public static final String CIRCLECI_JOB_NAME = "CIRCLE_JOB";
+    public static final String CIRCLECI_PR_NUMBER = "CIRCLE_PR_NUMBER";
 
-  private final CiEnvironment environment;
+    private final CiEnvironment environment;
 
-  CircleCIInfo(CiEnvironment environment) {
-    this.environment = environment;
-  }
-
-  @Override
-  public GitInfo buildCIGitInfo() {
-    return new GitInfo(
-        filterSensitiveInfo(environment.get(CIRCLECI_GIT_REPOSITORY_URL)),
-        normalizeBranch(environment.get(CIRCLECI_GIT_BRANCH)),
-        normalizeTag(environment.get(CIRCLECI_GIT_TAG)),
-        new CommitInfo(environment.get(CIRCLECI_GIT_COMMIT)));
-  }
+    CircleCIInfo(CiEnvironment environment) {
+        this.environment = environment;
+    }
 
-  @Override
-  public CIInfo buildCIInfo() {
-    final String pipelineId = environment.get(CIRCLECI_PIPELINE_ID);
-    return CIInfo.builder(environment)
-        .ciProviderName(CIRCLECI_PROVIDER_NAME)
-        .ciPipelineId(pipelineId)
-        .ciPipelineName(environment.get(CIRCLECI_PIPELINE_NAME))
-        .ciPipelineUrl(buildPipelineUrl(pipelineId))
-        .ciJobId(environment.get(CIRCLECI_BUILD_NUM))
-        .ciJobName(environment.get(CIRCLECI_JOB_NAME))
-        .ciJobUrl(environment.get(CIRCLECI_BUILD_URL))
-        .ciWorkspace(expandTilde(environment.get(CIRCLECI_WORKSPACE_PATH)))
-        .ciEnvVars(CIRCLECI_PIPELINE_ID, CIRCLECI_BUILD_NUM)
-        .build();
-  }
+    @Override
+    public GitInfo buildCIGitInfo() {
+        return new GitInfo(
+                filterSensitiveInfo(environment.get(CIRCLECI_GIT_REPOSITORY_URL)),
+                normalizeBranch(environment.get(CIRCLECI_GIT_BRANCH)),
+                normalizeTag(environment.get(CIRCLECI_GIT_TAG)),
+                new CommitInfo(environment.get(CIRCLECI_GIT_COMMIT)));
+    }
 
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    return new PullRequestInfo(
-        null, null, null, CommitInfo.NOOP, environment.get(CIRCLECI_PR_NUMBER));
-  }
+    @Override
+    public CIInfo buildCIInfo() {
+        final String pipelineId = environment.get(CIRCLECI_PIPELINE_ID);
+        return CIInfo.builder(environment)
+                .ciProviderName(CIRCLECI_PROVIDER_NAME)
+                .ciPipelineId(pipelineId)
+                .ciPipelineName(environment.get(CIRCLECI_PIPELINE_NAME))
+                .ciPipelineUrl(buildPipelineUrl(pipelineId))
+                .ciJobId(environment.get(CIRCLECI_BUILD_NUM))
+                .ciJobName(environment.get(CIRCLECI_JOB_NAME))
+                .ciJobUrl(environment.get(CIRCLECI_BUILD_URL))
+                .ciWorkspace(expandTilde(environment.get(CIRCLECI_WORKSPACE_PATH)))
+                .ciEnvVars(CIRCLECI_PIPELINE_ID, CIRCLECI_BUILD_NUM)
+                .build();
+    }
 
-  private String buildPipelineUrl(final String pipelineId) {
-    if (pipelineId == null) {
-      return null;
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        return new PullRequestInfo(null, null, null, CommitInfo.NOOP, environment.get(CIRCLECI_PR_NUMBER));
     }
 
-    return String.format("https://app.circleci.com/pipelines/workflows/%s", pipelineId);
-  }
+    private String buildPipelineUrl(final String pipelineId) {
+        if (pipelineId == null) {
+            return null;
+        }
 
-  @Override
-  public Provider getProvider() {
-    return Provider.CIRCLECI;
-  }
+        return String.format("https://app.circleci.com/pipelines/workflows/%s", pipelineId);
+    }
+
+    @Override
+    public Provider getProvider() {
+        return Provider.CIRCLECI;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CodefreshInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CodefreshInfo.java
index 4522f70c190..ebdea6d439b 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CodefreshInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CodefreshInfo.java
@@ -13,85 +13,85 @@
 
 public class CodefreshInfo implements CIProviderInfo {
 
-  // https://codefresh.io/docs/docs/pipelines/variables/#system-variables
-  public static final String CODEFRESH = "CF_BUILD_ID";
-  public static final String CODEFRESH_PROVIDER_NAME = "codefresh";
-  public static final String CF_STEP_NAME = "CF_STEP_NAME";
-  public static final String CF_PIPELINE_NAME = "CF_PIPELINE_NAME";
-  public static final String CF_BUILD_URL = "CF_BUILD_URL";
-  private static final String CF_BRANCH = "CF_BRANCH";
-  private static final String CF_REVISION = "CF_REVISION";
-  private static final String CF_COMMIT_MESSAGE = "CF_COMMIT_MESSAGE";
-  private static final String CF_COMMIT_AUTHOR = "CF_COMMIT_AUTHOR";
-  private static final String CF_PULL_REQUEST_NUMBER = "CF_PULL_REQUEST_NUMBER";
-  private static final String CF_PULL_REQUEST_TARGET_BRANCH = "CF_PULL_REQUEST_TARGET";
+    // https://codefresh.io/docs/docs/pipelines/variables/#system-variables
+    public static final String CODEFRESH = "CF_BUILD_ID";
+    public static final String CODEFRESH_PROVIDER_NAME = "codefresh";
+    public static final String CF_STEP_NAME = "CF_STEP_NAME";
+    public static final String CF_PIPELINE_NAME = "CF_PIPELINE_NAME";
+    public static final String CF_BUILD_URL = "CF_BUILD_URL";
+    private static final String CF_BRANCH = "CF_BRANCH";
+    private static final String CF_REVISION = "CF_REVISION";
+    private static final String CF_COMMIT_MESSAGE = "CF_COMMIT_MESSAGE";
+    private static final String CF_COMMIT_AUTHOR = "CF_COMMIT_AUTHOR";
+    private static final String CF_PULL_REQUEST_NUMBER = "CF_PULL_REQUEST_NUMBER";
+    private static final String CF_PULL_REQUEST_TARGET_BRANCH = "CF_PULL_REQUEST_TARGET";
 
-  private final CiEnvironment environment;
+    private final CiEnvironment environment;
 
-  CodefreshInfo(CiEnvironment environment) {
-    this.environment = environment;
-  }
+    CodefreshInfo(CiEnvironment environment) {
+        this.environment = environment;
+    }
 
-  @Override
-  public GitInfo buildCIGitInfo() {
-    return new GitInfo(
-        null,
-        buildGitBranch(),
-        buildGitTag(),
-        new CommitInfo(
-            environment.get(CF_REVISION),
-            new PersonInfo(environment.get(CF_COMMIT_AUTHOR), null),
-            PersonInfo.NOOP,
-            environment.get(CF_COMMIT_MESSAGE)));
-  }
+    @Override
+    public GitInfo buildCIGitInfo() {
+        return new GitInfo(
+                null,
+                buildGitBranch(),
+                buildGitTag(),
+                new CommitInfo(
+                        environment.get(CF_REVISION),
+                        new PersonInfo(environment.get(CF_COMMIT_AUTHOR), null),
+                        PersonInfo.NOOP,
+                        environment.get(CF_COMMIT_MESSAGE)));
+    }
 
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    return new PullRequestInfo(
-        normalizeBranch(environment.get(CF_PULL_REQUEST_TARGET_BRANCH)),
-        null,
-        null,
-        CommitInfo.NOOP,
-        environment.get(CF_PULL_REQUEST_NUMBER));
-  }
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        return new PullRequestInfo(
+                normalizeBranch(environment.get(CF_PULL_REQUEST_TARGET_BRANCH)),
+                null,
+                null,
+                CommitInfo.NOOP,
+                environment.get(CF_PULL_REQUEST_NUMBER));
+    }
 
-  private String buildGitBranch() {
-    String gitBranchOrTag = getGitBranchOrTag();
-    if (!isTagReference(gitBranchOrTag)) {
-      return normalizeBranch(gitBranchOrTag);
-    } else {
-      return null;
+    private String buildGitBranch() {
+        String gitBranchOrTag = getGitBranchOrTag();
+        if (!isTagReference(gitBranchOrTag)) {
+            return normalizeBranch(gitBranchOrTag);
+        } else {
+            return null;
+        }
     }
-  }
 
-  private String buildGitTag() {
-    String gitBranchOrTag = getGitBranchOrTag();
-    if (isTagReference(gitBranchOrTag)) {
-      return normalizeTag(gitBranchOrTag);
-    } else {
-      return null;
+    private String buildGitTag() {
+        String gitBranchOrTag = getGitBranchOrTag();
+        if (isTagReference(gitBranchOrTag)) {
+            return normalizeTag(gitBranchOrTag);
+        } else {
+            return null;
+        }
     }
-  }
 
-  private String getGitBranchOrTag() {
-    return environment.get(CF_BRANCH);
-  }
+    private String getGitBranchOrTag() {
+        return environment.get(CF_BRANCH);
+    }
 
-  @Override
-  public CIInfo buildCIInfo() {
-    return CIInfo.builder(environment)
-        .ciProviderName(CODEFRESH_PROVIDER_NAME)
-        .ciPipelineId(environment.get(CODEFRESH))
-        .ciPipelineName(environment.get(CF_PIPELINE_NAME))
-        .ciPipelineUrl(environment.get(CF_BUILD_URL))
-        .ciJobName(environment.get(CF_STEP_NAME))
-        .ciEnvVars(CODEFRESH)
-        .build();
-  }
+    @Override
+    public CIInfo buildCIInfo() {
+        return CIInfo.builder(environment)
+                .ciProviderName(CODEFRESH_PROVIDER_NAME)
+                .ciPipelineId(environment.get(CODEFRESH))
+                .ciPipelineName(environment.get(CF_PIPELINE_NAME))
+                .ciPipelineUrl(environment.get(CF_BUILD_URL))
+                .ciJobName(environment.get(CF_STEP_NAME))
+                .ciEnvVars(CODEFRESH)
+                .build();
+    }
 
-  @Override
-  public Provider getProvider() {
-    return Provider.CODEFRESH;
-  }
+    @Override
+    public Provider getProvider() {
+        return Provider.CODEFRESH;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/DroneInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/DroneInfo.java
index 8979849fc0f..42ec0602d3a 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/DroneInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/DroneInfo.java
@@ -14,72 +14,71 @@
 
 public class DroneInfo implements CIProviderInfo {
 
-  public static final String DRONE = "DRONE";
-  public static final String DRONE_PROVIDER_NAME = "drone";
-  public static final String DRONE_BUILD_NUMBER = "DRONE_BUILD_NUMBER";
-  public static final String DRONE_BUILD_LINK = "DRONE_BUILD_LINK";
-  public static final String DRONE_STEP_NAME = "DRONE_STEP_NAME";
-  public static final String DRONE_STAGE_NAME = "DRONE_STAGE_NAME";
-  public static final String DRONE_WORKSPACE = "DRONE_WORKSPACE";
-  public static final String DRONE_GIT_HTTP_URL = "DRONE_GIT_HTTP_URL";
-  public static final String DRONE_COMMIT_SHA = "DRONE_COMMIT_SHA";
-  public static final String DRONE_BRANCH = "DRONE_BRANCH";
-  public static final String DRONE_TAG = "DRONE_TAG";
-  public static final String DRONE_COMMIT_AUTHOR_NAME = "DRONE_COMMIT_AUTHOR_NAME";
-  public static final String DRONE_COMMIT_AUTHOR_EMAIL = "DRONE_COMMIT_AUTHOR_EMAIL";
-  public static final String DRONE_COMMIT_MESSAGE = "DRONE_COMMIT_MESSAGE";
-  public static final String DRONE_PULL_REQUEST_NUMBER = "DRONE_PULL_REQUEST";
-  public static final String DRONE_PULL_REQUEST_TARGET_BRANCH = "DRONE_TARGET_BRANCH";
+    public static final String DRONE = "DRONE";
+    public static final String DRONE_PROVIDER_NAME = "drone";
+    public static final String DRONE_BUILD_NUMBER = "DRONE_BUILD_NUMBER";
+    public static final String DRONE_BUILD_LINK = "DRONE_BUILD_LINK";
+    public static final String DRONE_STEP_NAME = "DRONE_STEP_NAME";
+    public static final String DRONE_STAGE_NAME = "DRONE_STAGE_NAME";
+    public static final String DRONE_WORKSPACE = "DRONE_WORKSPACE";
+    public static final String DRONE_GIT_HTTP_URL = "DRONE_GIT_HTTP_URL";
+    public static final String DRONE_COMMIT_SHA = "DRONE_COMMIT_SHA";
+    public static final String DRONE_BRANCH = "DRONE_BRANCH";
+    public static final String DRONE_TAG = "DRONE_TAG";
+    public static final String DRONE_COMMIT_AUTHOR_NAME = "DRONE_COMMIT_AUTHOR_NAME";
+    public static final String DRONE_COMMIT_AUTHOR_EMAIL = "DRONE_COMMIT_AUTHOR_EMAIL";
+    public static final String DRONE_COMMIT_MESSAGE = "DRONE_COMMIT_MESSAGE";
+    public static final String DRONE_PULL_REQUEST_NUMBER = "DRONE_PULL_REQUEST";
+    public static final String DRONE_PULL_REQUEST_TARGET_BRANCH = "DRONE_TARGET_BRANCH";
 
-  private final CiEnvironment environment;
+    private final CiEnvironment environment;
 
-  DroneInfo(CiEnvironment environment) {
-    this.environment = environment;
-  }
+    DroneInfo(CiEnvironment environment) {
+        this.environment = environment;
+    }
 
-  @Override
-  public GitInfo buildCIGitInfo() {
-    return new GitInfo(
-        filterSensitiveInfo(environment.get(DRONE_GIT_HTTP_URL)),
-        normalizeBranch(environment.get(DRONE_BRANCH)),
-        normalizeTag(environment.get(DRONE_TAG)),
-        new CommitInfo(
-            environment.get(DRONE_COMMIT_SHA),
-            buildGitAuthor(),
-            PersonInfo.NOOP,
-            environment.get(DRONE_COMMIT_MESSAGE)));
-  }
+    @Override
+    public GitInfo buildCIGitInfo() {
+        return new GitInfo(
+                filterSensitiveInfo(environment.get(DRONE_GIT_HTTP_URL)),
+                normalizeBranch(environment.get(DRONE_BRANCH)),
+                normalizeTag(environment.get(DRONE_TAG)),
+                new CommitInfo(
+                        environment.get(DRONE_COMMIT_SHA),
+                        buildGitAuthor(),
+                        PersonInfo.NOOP,
+                        environment.get(DRONE_COMMIT_MESSAGE)));
+    }
 
-  @Override
-  public CIInfo buildCIInfo() {
-    return CIInfo.builder(environment)
-        .ciProviderName(DRONE_PROVIDER_NAME)
-        .ciPipelineNumber(environment.get(DRONE_BUILD_NUMBER))
-        .ciPipelineUrl(environment.get(DRONE_BUILD_LINK))
-        .ciJobName(environment.get(DRONE_STEP_NAME))
-        .ciStageName(environment.get(DRONE_STAGE_NAME))
-        .ciWorkspace(expandTilde(environment.get(DRONE_WORKSPACE)))
-        .build();
-  }
+    @Override
+    public CIInfo buildCIInfo() {
+        return CIInfo.builder(environment)
+                .ciProviderName(DRONE_PROVIDER_NAME)
+                .ciPipelineNumber(environment.get(DRONE_BUILD_NUMBER))
+                .ciPipelineUrl(environment.get(DRONE_BUILD_LINK))
+                .ciJobName(environment.get(DRONE_STEP_NAME))
+                .ciStageName(environment.get(DRONE_STAGE_NAME))
+                .ciWorkspace(expandTilde(environment.get(DRONE_WORKSPACE)))
+                .build();
+    }
 
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    return new PullRequestInfo(
-        normalizeBranch(environment.get(DRONE_PULL_REQUEST_TARGET_BRANCH)),
-        null,
-        null,
-        CommitInfo.NOOP,
-        environment.get(DRONE_PULL_REQUEST_NUMBER));
-  }
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        return new PullRequestInfo(
+                normalizeBranch(environment.get(DRONE_PULL_REQUEST_TARGET_BRANCH)),
+                null,
+                null,
+                CommitInfo.NOOP,
+                environment.get(DRONE_PULL_REQUEST_NUMBER));
+    }
 
-  private PersonInfo buildGitAuthor() {
-    return new PersonInfo(
-        environment.get(DRONE_COMMIT_AUTHOR_NAME), environment.get(DRONE_COMMIT_AUTHOR_EMAIL));
-  }
+    private PersonInfo buildGitAuthor() {
+        return new PersonInfo(environment.get(DRONE_COMMIT_AUTHOR_NAME), environment.get(DRONE_COMMIT_AUTHOR_EMAIL));
+    }
 
-  @Override
-  public Provider getProvider() {
-    return Provider.DRONE;
-  }
+    @Override
+    public Provider getProvider() {
+        return Provider.DRONE;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GitLabInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GitLabInfo.java
index ca77f032df0..de114baa2be 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GitLabInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GitLabInfo.java
@@ -17,99 +17,96 @@
 @SuppressForbidden
 class GitLabInfo implements CIProviderInfo {
 
-  // https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
-  public static final String GITLAB = "GITLAB_CI";
-  public static final String GITLAB_PROVIDER_NAME = "gitlab";
-  public static final String GITLAB_PROJECT_URL = "CI_PROJECT_URL";
-  public static final String GITLAB_PIPELINE_ID = "CI_PIPELINE_ID";
-  public static final String GITLAB_PIPELINE_NAME = "CI_PROJECT_PATH";
-  public static final String GITLAB_PIPELINE_NUMBER = "CI_PIPELINE_IID";
-  public static final String GITLAB_PIPELINE_URL = "CI_PIPELINE_URL";
-  public static final String GITLAB_STAGE_NAME = "CI_JOB_STAGE";
-  public static final String GITLAB_JOB_ID = "CI_JOB_ID";
-  public static final String GITLAB_JOB_NAME = "CI_JOB_NAME";
-  public static final String GITLAB_JOB_URL = "CI_JOB_URL";
-  public static final String GITLAB_WORKSPACE_PATH = "CI_PROJECT_DIR";
-  public static final String GITLAB_GIT_REPOSITORY_URL = "CI_REPOSITORY_URL";
-  public static final String GITLAB_GIT_COMMIT = "CI_COMMIT_SHA";
-  public static final String GITLAB_GIT_BRANCH = "CI_COMMIT_REF_NAME";
-  public static final String GITLAB_GIT_TAG = "CI_COMMIT_TAG";
-  public static final String GITLAB_GIT_COMMIT_MESSAGE = "CI_COMMIT_MESSAGE";
-  public static final String GITLAB_GIT_COMMIT_AUTHOR = "CI_COMMIT_AUTHOR";
-  public static final String GITLAB_GIT_COMMIT_TIMESTAMP = "CI_COMMIT_TIMESTAMP";
-  public static final String GITLAB_CI_RUNNER_ID = "CI_RUNNER_ID";
-  public static final String GITLAB_CI_RUNNER_TAGS = "CI_RUNNER_TAGS";
-  public static final String GITLAB_PULL_REQUEST_BASE_BRANCH =
-      "CI_MERGE_REQUEST_TARGET_BRANCH_NAME";
-  public static final String GITLAB_PULL_REQUEST_BASE_SHA = "CI_MERGE_REQUEST_DIFF_BASE_SHA";
-  public static final String GITLAB_PULL_REQUEST_BASE_HEAD_SHA =
-      "CI_MERGE_REQUEST_TARGET_BRANCH_SHA";
-  public static final String GITLAB_PULL_REQUEST_COMMIT_HEAD_SHA =
-      "CI_MERGE_REQUEST_SOURCE_BRANCH_SHA";
-  public static final String GITLAB_PULL_REQUEST_NUMBER = "CI_MERGE_REQUEST_IID";
+    // https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
+    public static final String GITLAB = "GITLAB_CI";
+    public static final String GITLAB_PROVIDER_NAME = "gitlab";
+    public static final String GITLAB_PROJECT_URL = "CI_PROJECT_URL";
+    public static final String GITLAB_PIPELINE_ID = "CI_PIPELINE_ID";
+    public static final String GITLAB_PIPELINE_NAME = "CI_PROJECT_PATH";
+    public static final String GITLAB_PIPELINE_NUMBER = "CI_PIPELINE_IID";
+    public static final String GITLAB_PIPELINE_URL = "CI_PIPELINE_URL";
+    public static final String GITLAB_STAGE_NAME = "CI_JOB_STAGE";
+    public static final String GITLAB_JOB_ID = "CI_JOB_ID";
+    public static final String GITLAB_JOB_NAME = "CI_JOB_NAME";
+    public static final String GITLAB_JOB_URL = "CI_JOB_URL";
+    public static final String GITLAB_WORKSPACE_PATH = "CI_PROJECT_DIR";
+    public static final String GITLAB_GIT_REPOSITORY_URL = "CI_REPOSITORY_URL";
+    public static final String GITLAB_GIT_COMMIT = "CI_COMMIT_SHA";
+    public static final String GITLAB_GIT_BRANCH = "CI_COMMIT_REF_NAME";
+    public static final String GITLAB_GIT_TAG = "CI_COMMIT_TAG";
+    public static final String GITLAB_GIT_COMMIT_MESSAGE = "CI_COMMIT_MESSAGE";
+    public static final String GITLAB_GIT_COMMIT_AUTHOR = "CI_COMMIT_AUTHOR";
+    public static final String GITLAB_GIT_COMMIT_TIMESTAMP = "CI_COMMIT_TIMESTAMP";
+    public static final String GITLAB_CI_RUNNER_ID = "CI_RUNNER_ID";
+    public static final String GITLAB_CI_RUNNER_TAGS = "CI_RUNNER_TAGS";
+    public static final String GITLAB_PULL_REQUEST_BASE_BRANCH = "CI_MERGE_REQUEST_TARGET_BRANCH_NAME";
+    public static final String GITLAB_PULL_REQUEST_BASE_SHA = "CI_MERGE_REQUEST_DIFF_BASE_SHA";
+    public static final String GITLAB_PULL_REQUEST_BASE_HEAD_SHA = "CI_MERGE_REQUEST_TARGET_BRANCH_SHA";
+    public static final String GITLAB_PULL_REQUEST_COMMIT_HEAD_SHA = "CI_MERGE_REQUEST_SOURCE_BRANCH_SHA";
+    public static final String GITLAB_PULL_REQUEST_NUMBER = "CI_MERGE_REQUEST_IID";
 
-  private final CiEnvironment environment;
+    private final CiEnvironment environment;
 
-  GitLabInfo(CiEnvironment environment) {
-    this.environment = environment;
-  }
-
-  @Override
-  public GitInfo buildCIGitInfo() {
-    return new GitInfo(
-        filterSensitiveInfo(environment.get(GITLAB_GIT_REPOSITORY_URL)),
-        normalizeBranch(environment.get(GITLAB_GIT_BRANCH)),
-        normalizeTag(environment.get(GITLAB_GIT_TAG)),
-        new CommitInfo(
-            environment.get(GITLAB_GIT_COMMIT),
-            buildGitCommitAuthor(),
-            PersonInfo.NOOP,
-            environment.get(GITLAB_GIT_COMMIT_MESSAGE)));
-  }
+    GitLabInfo(CiEnvironment environment) {
+        this.environment = environment;
+    }
 
-  @Override
-  public CIInfo buildCIInfo() {
-    return CIInfo.builder(environment)
-        .ciProviderName(GITLAB_PROVIDER_NAME)
-        .ciPipelineId(environment.get(GITLAB_PIPELINE_ID))
-        .ciPipelineName(environment.get(GITLAB_PIPELINE_NAME))
-        .ciPipelineNumber(environment.get(GITLAB_PIPELINE_NUMBER))
-        .ciPipelineUrl(environment.get(GITLAB_PIPELINE_URL))
-        .ciStageName(environment.get(GITLAB_STAGE_NAME))
-        .ciJobId(environment.get(GITLAB_JOB_ID))
-        .ciJobName(environment.get(GITLAB_JOB_NAME))
-        .ciJobUrl(environment.get(GITLAB_JOB_URL))
-        .ciWorkspace(expandTilde(environment.get(GITLAB_WORKSPACE_PATH)))
-        .ciNodeName(environment.get(GITLAB_CI_RUNNER_ID))
-        .ciNodeLabels(environment.get(GITLAB_CI_RUNNER_TAGS))
-        .ciEnvVars(GITLAB_PROJECT_URL, GITLAB_PIPELINE_ID, GITLAB_JOB_ID)
-        .build();
-  }
+    @Override
+    public GitInfo buildCIGitInfo() {
+        return new GitInfo(
+                filterSensitiveInfo(environment.get(GITLAB_GIT_REPOSITORY_URL)),
+                normalizeBranch(environment.get(GITLAB_GIT_BRANCH)),
+                normalizeTag(environment.get(GITLAB_GIT_TAG)),
+                new CommitInfo(
+                        environment.get(GITLAB_GIT_COMMIT),
+                        buildGitCommitAuthor(),
+                        PersonInfo.NOOP,
+                        environment.get(GITLAB_GIT_COMMIT_MESSAGE)));
+    }
 
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    return new PullRequestInfo(
-        normalizeBranch(environment.get(GITLAB_PULL_REQUEST_BASE_BRANCH)),
-        environment.get(GITLAB_PULL_REQUEST_BASE_SHA),
-        environment.get(GITLAB_PULL_REQUEST_BASE_HEAD_SHA),
-        new CommitInfo(environment.get(GITLAB_PULL_REQUEST_COMMIT_HEAD_SHA)),
-        environment.get(GITLAB_PULL_REQUEST_NUMBER));
-  }
+    @Override
+    public CIInfo buildCIInfo() {
+        return CIInfo.builder(environment)
+                .ciProviderName(GITLAB_PROVIDER_NAME)
+                .ciPipelineId(environment.get(GITLAB_PIPELINE_ID))
+                .ciPipelineName(environment.get(GITLAB_PIPELINE_NAME))
+                .ciPipelineNumber(environment.get(GITLAB_PIPELINE_NUMBER))
+                .ciPipelineUrl(environment.get(GITLAB_PIPELINE_URL))
+                .ciStageName(environment.get(GITLAB_STAGE_NAME))
+                .ciJobId(environment.get(GITLAB_JOB_ID))
+                .ciJobName(environment.get(GITLAB_JOB_NAME))
+                .ciJobUrl(environment.get(GITLAB_JOB_URL))
+                .ciWorkspace(expandTilde(environment.get(GITLAB_WORKSPACE_PATH)))
+                .ciNodeName(environment.get(GITLAB_CI_RUNNER_ID))
+                .ciNodeLabels(environment.get(GITLAB_CI_RUNNER_TAGS))
+                .ciEnvVars(GITLAB_PROJECT_URL, GITLAB_PIPELINE_ID, GITLAB_JOB_ID)
+                .build();
+    }
 
-  private PersonInfo buildGitCommitAuthor() {
-    final String gitAuthor = environment.get(GITLAB_GIT_COMMIT_AUTHOR);
-    if (gitAuthor == null || gitAuthor.isEmpty()) {
-      return PersonInfo.NOOP;
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        return new PullRequestInfo(
+                normalizeBranch(environment.get(GITLAB_PULL_REQUEST_BASE_BRANCH)),
+                environment.get(GITLAB_PULL_REQUEST_BASE_SHA),
+                environment.get(GITLAB_PULL_REQUEST_BASE_HEAD_SHA),
+                new CommitInfo(environment.get(GITLAB_PULL_REQUEST_COMMIT_HEAD_SHA)),
+                environment.get(GITLAB_PULL_REQUEST_NUMBER));
     }
 
-    final PersonInfo personInfo = GitUtils.splitAuthorAndEmail(gitAuthor);
-    return new PersonInfo(
-        personInfo.getName(), personInfo.getEmail(), environment.get(GITLAB_GIT_COMMIT_TIMESTAMP));
-  }
+    private PersonInfo buildGitCommitAuthor() {
+        final String gitAuthor = environment.get(GITLAB_GIT_COMMIT_AUTHOR);
+        if (gitAuthor == null || gitAuthor.isEmpty()) {
+            return PersonInfo.NOOP;
+        }
 
-  @Override
-  public Provider getProvider() {
-    return Provider.GITLAB;
-  }
+        final PersonInfo personInfo = GitUtils.splitAuthorAndEmail(gitAuthor);
+        return new PersonInfo(
+                personInfo.getName(), personInfo.getEmail(), environment.get(GITLAB_GIT_COMMIT_TIMESTAMP));
+    }
+
+    @Override
+    public Provider getProvider() {
+        return Provider.GITLAB;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GithubActionsInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GithubActionsInfo.java
index 856e280b933..80ce3be0a11 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GithubActionsInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GithubActionsInfo.java
@@ -30,286 +30,283 @@
 import org.slf4j.LoggerFactory;
 
 @SuppressFBWarnings(
-    value = "DMI_HARDCODED_ABSOLUTE_FILENAME",
-    justification =
-        "The GitHub Actions runner diagnostics directories have well-known absolute paths for Linux runners")
+        value = "DMI_HARDCODED_ABSOLUTE_FILENAME",
+        justification =
+                "The GitHub Actions runner diagnostics directories have well-known absolute paths for Linux runners")
 class GithubActionsInfo implements CIProviderInfo {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(GithubActionsInfo.class);
-
-  // https://docs.github.com/en/free-pro-team@latest/actions/reference/environment-variables#default-environment-variables
-  public static final String GHACTIONS = "GITHUB_ACTION";
-  public static final String GHACTIONS_PROVIDER_NAME = "github";
-  public static final String GHACTIONS_PIPELINE_ID = "GITHUB_RUN_ID";
-  public static final String GHACTIONS_PIPELINE_NAME = "GITHUB_WORKFLOW";
-  public static final String GHACTIONS_PIPELINE_NUMBER = "GITHUB_RUN_NUMBER";
-  public static final String GHACTIONS_PIPELINE_RETRY = "GITHUB_RUN_ATTEMPT";
-  public static final String GHACTIONS_WORKSPACE_PATH = "GITHUB_WORKSPACE";
-  public static final String GHACTIONS_REPOSITORY = "GITHUB_REPOSITORY";
-  public static final String GHACTIONS_SHA = "GITHUB_SHA";
-  public static final String GHACTIONS_HEAD_REF = "GITHUB_HEAD_REF";
-  public static final String GHACTIONS_REF = "GITHUB_REF";
-  public static final String GHACTIONS_URL = "GITHUB_SERVER_URL";
-  public static final String GHACTIONS_JOB = "GITHUB_JOB";
-  public static final String GITHUB_BASE_REF = "GITHUB_BASE_REF";
-  public static final String GITHUB_EVENT_PATH = "GITHUB_EVENT_PATH";
-  public static final String GHACTIONS_JOB_CHECK_RUN_ID = "JOB_CHECK_RUN_ID";
-
-  static final String GHA_DIAGNOSTICS_DIR = "/home/runner/actions-runner/_diag";
-  static final String GHA_DIAGNOSTICS_DIR_CACHED = "/home/runner/actions-runner/cached/_diag";
-  private static final Pattern CHECK_RUN_ID_PATTERN =
-      Pattern.compile("\"k\"\\s*:\\s*\"check_run_id\"\\s*,\\s*\"v\"\\s*:\\s*(\\d+(?:\\.\\d+)?)");
-
-  private final CiEnvironment environment;
-  private final Path diagnosticsDir;
-  private final Path diagnosticsDirCached;
-
-  GithubActionsInfo(CiEnvironment environment) {
-    this(environment, Paths.get(GHA_DIAGNOSTICS_DIR), Paths.get(GHA_DIAGNOSTICS_DIR_CACHED));
-  }
-
-  // for testing purposes
-  GithubActionsInfo(CiEnvironment environment, Path diagnosticsDir, Path diagnosticsDirCached) {
-    this.environment = environment;
-    this.diagnosticsDir = diagnosticsDir;
-    this.diagnosticsDirCached = diagnosticsDirCached;
-  }
-
-  @Override
-  public GitInfo buildCIGitInfo() {
-    return new GitInfo(
-        buildGitRepositoryUrl(
-            filterSensitiveInfo(environment.get(GHACTIONS_URL)),
-            environment.get(GHACTIONS_REPOSITORY)),
-        buildGitBranch(),
-        buildGitTag(),
-        new CommitInfo(environment.get(GHACTIONS_SHA)));
-  }
-
-  @Override
-  public CIInfo buildCIInfo() {
-    String serverUrl = filterSensitiveInfo(environment.get(GHACTIONS_URL));
-    String repository = environment.get(GHACTIONS_REPOSITORY);
-    String pipelineId = environment.get(GHACTIONS_PIPELINE_ID);
-    String commit = environment.get(GHACTIONS_SHA);
-
-    final String pipelineUrl =
-        buildPipelineUrl(
-            serverUrl, repository, pipelineId, environment.get(GHACTIONS_PIPELINE_RETRY));
-
-    // Try to get numeric job ID for better job URL
-    String numericJobId = getNumericJobId();
-    String jobId;
-    String jobUrl;
-    if (numericJobId != null) {
-      jobId = numericJobId;
-      jobUrl = buildJobUrlWithNumericId(serverUrl, repository, pipelineId, numericJobId);
-    } else {
-      jobId = environment.get(GHACTIONS_JOB);
-      jobUrl = buildJobUrl(serverUrl, repository, commit);
+    private static final Logger LOGGER = LoggerFactory.getLogger(GithubActionsInfo.class);
+
+    // https://docs.github.com/en/free-pro-team@latest/actions/reference/environment-variables#default-environment-variables
+    public static final String GHACTIONS = "GITHUB_ACTION";
+    public static final String GHACTIONS_PROVIDER_NAME = "github";
+    public static final String GHACTIONS_PIPELINE_ID = "GITHUB_RUN_ID";
+    public static final String GHACTIONS_PIPELINE_NAME = "GITHUB_WORKFLOW";
+    public static final String GHACTIONS_PIPELINE_NUMBER = "GITHUB_RUN_NUMBER";
+    public static final String GHACTIONS_PIPELINE_RETRY = "GITHUB_RUN_ATTEMPT";
+    public static final String GHACTIONS_WORKSPACE_PATH = "GITHUB_WORKSPACE";
+    public static final String GHACTIONS_REPOSITORY = "GITHUB_REPOSITORY";
+    public static final String GHACTIONS_SHA = "GITHUB_SHA";
+    public static final String GHACTIONS_HEAD_REF = "GITHUB_HEAD_REF";
+    public static final String GHACTIONS_REF = "GITHUB_REF";
+    public static final String GHACTIONS_URL = "GITHUB_SERVER_URL";
+    public static final String GHACTIONS_JOB = "GITHUB_JOB";
+    public static final String GITHUB_BASE_REF = "GITHUB_BASE_REF";
+    public static final String GITHUB_EVENT_PATH = "GITHUB_EVENT_PATH";
+    public static final String GHACTIONS_JOB_CHECK_RUN_ID = "JOB_CHECK_RUN_ID";
+
+    static final String GHA_DIAGNOSTICS_DIR = "/home/runner/actions-runner/_diag";
+    static final String GHA_DIAGNOSTICS_DIR_CACHED = "/home/runner/actions-runner/cached/_diag";
+    private static final Pattern CHECK_RUN_ID_PATTERN =
+            Pattern.compile("\"k\"\\s*:\\s*\"check_run_id\"\\s*,\\s*\"v\"\\s*:\\s*(\\d+(?:\\.\\d+)?)");
+
+    private final CiEnvironment environment;
+    private final Path diagnosticsDir;
+    private final Path diagnosticsDirCached;
+
+    GithubActionsInfo(CiEnvironment environment) {
+        this(environment, Paths.get(GHA_DIAGNOSTICS_DIR), Paths.get(GHA_DIAGNOSTICS_DIR_CACHED));
     }
 
-    CIInfo.Builder builder = CIInfo.builder(environment);
-    return builder
-        .ciProviderName(GHACTIONS_PROVIDER_NAME)
-        .ciPipelineId(pipelineId)
-        .ciPipelineName(environment.get(GHACTIONS_PIPELINE_NAME))
-        .ciPipelineNumber(environment.get(GHACTIONS_PIPELINE_NUMBER))
-        .ciPipelineUrl(pipelineUrl)
-        .ciJobId(jobId)
-        .ciJobName(environment.get(GHACTIONS_JOB))
-        .ciJobUrl(jobUrl)
-        .ciWorkspace(expandTilde(environment.get(GHACTIONS_WORKSPACE_PATH)))
-        .ciEnvVars(
-            GHACTIONS_URL, GHACTIONS_REPOSITORY, GHACTIONS_PIPELINE_ID, GHACTIONS_PIPELINE_RETRY)
-        .build();
-  }
-
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    String baseRef = environment.get(GITHUB_BASE_REF);
-    if (Strings.isBlank(baseRef)) {
-      return PullRequestInfo.EMPTY;
+    // for testing purposes
+    GithubActionsInfo(CiEnvironment environment, Path diagnosticsDir, Path diagnosticsDirCached) {
+        this.environment = environment;
+        this.diagnosticsDir = diagnosticsDir;
+        this.diagnosticsDirCached = diagnosticsDirCached;
     }
 
-    try {
-      Path eventPath = Paths.get(environment.get(GITHUB_EVENT_PATH));
-      String event = new String(Files.readAllBytes(eventPath), StandardCharsets.UTF_8);
+    @Override
+    public GitInfo buildCIGitInfo() {
+        return new GitInfo(
+                buildGitRepositoryUrl(
+                        filterSensitiveInfo(environment.get(GHACTIONS_URL)), environment.get(GHACTIONS_REPOSITORY)),
+                buildGitBranch(),
+                buildGitTag(),
+                new CommitInfo(environment.get(GHACTIONS_SHA)));
+    }
 
-      Moshi moshi = new Moshi.Builder().build();
-      JsonAdapter<Map<String, Object>> mapJsonAdapter =
-          moshi.adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
-      Map<String, Object> eventJson = mapJsonAdapter.fromJson(event);
+    @Override
+    public CIInfo buildCIInfo() {
+        String serverUrl = filterSensitiveInfo(environment.get(GHACTIONS_URL));
+        String repository = environment.get(GHACTIONS_REPOSITORY);
+        String pipelineId = environment.get(GHACTIONS_PIPELINE_ID);
+        String commit = environment.get(GHACTIONS_SHA);
+
+        final String pipelineUrl =
+                buildPipelineUrl(serverUrl, repository, pipelineId, environment.get(GHACTIONS_PIPELINE_RETRY));
+
+        // Try to get numeric job ID for better job URL
+        String numericJobId = getNumericJobId();
+        String jobId;
+        String jobUrl;
+        if (numericJobId != null) {
+            jobId = numericJobId;
+            jobUrl = buildJobUrlWithNumericId(serverUrl, repository, pipelineId, numericJobId);
+        } else {
+            jobId = environment.get(GHACTIONS_JOB);
+            jobUrl = buildJobUrl(serverUrl, repository, commit);
+        }
 
-      String baseBranchHeadSha = null;
-      String headSha = null;
-      String prNumber = null;
+        CIInfo.Builder builder = CIInfo.builder(environment);
+        return builder.ciProviderName(GHACTIONS_PROVIDER_NAME)
+                .ciPipelineId(pipelineId)
+                .ciPipelineName(environment.get(GHACTIONS_PIPELINE_NAME))
+                .ciPipelineNumber(environment.get(GHACTIONS_PIPELINE_NUMBER))
+                .ciPipelineUrl(pipelineUrl)
+                .ciJobId(jobId)
+                .ciJobName(environment.get(GHACTIONS_JOB))
+                .ciJobUrl(jobUrl)
+                .ciWorkspace(expandTilde(environment.get(GHACTIONS_WORKSPACE_PATH)))
+                .ciEnvVars(GHACTIONS_URL, GHACTIONS_REPOSITORY, GHACTIONS_PIPELINE_ID, GHACTIONS_PIPELINE_RETRY)
+                .build();
+    }
 
-      Map<String, Object> pullRequest = (Map<String, Object>) eventJson.get("pull_request");
-      if (pullRequest != null) {
-        Map<String, Object> head = (Map<String, Object>) pullRequest.get("head");
-        if (head != null) {
-          headSha = (String) head.get("sha");
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        String baseRef = environment.get(GITHUB_BASE_REF);
+        if (Strings.isBlank(baseRef)) {
+            return PullRequestInfo.EMPTY;
         }
 
-        Map<String, Object> base = (Map<String, Object>) pullRequest.get("base");
-        if (base != null) {
-          baseBranchHeadSha = (String) base.get("sha");
+        try {
+            Path eventPath = Paths.get(environment.get(GITHUB_EVENT_PATH));
+            String event = new String(Files.readAllBytes(eventPath), StandardCharsets.UTF_8);
+
+            Moshi moshi = new Moshi.Builder().build();
+            JsonAdapter<Map<String, Object>> mapJsonAdapter =
+                    moshi.adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
+            Map<String, Object> eventJson = mapJsonAdapter.fromJson(event);
+
+            String baseBranchHeadSha = null;
+            String headSha = null;
+            String prNumber = null;
+
+            Map<String, Object> pullRequest = (Map<String, Object>) eventJson.get("pull_request");
+            if (pullRequest != null) {
+                Map<String, Object> head = (Map<String, Object>) pullRequest.get("head");
+                if (head != null) {
+                    headSha = (String) head.get("sha");
+                }
+
+                Map<String, Object> base = (Map<String, Object>) pullRequest.get("base");
+                if (base != null) {
+                    baseBranchHeadSha = (String) base.get("sha");
+                }
+
+                Double number = (Double) pullRequest.get("number");
+                if (number != null) {
+                    prNumber = String.valueOf(number.intValue());
+                }
+            }
+
+            return new PullRequestInfo(baseRef, null, baseBranchHeadSha, new CommitInfo(headSha), prNumber);
+
+        } catch (Exception e) {
+            LOGGER.warn("Error while parsing GitHub event", e);
+            return new PullRequestInfo(baseRef, null, null, CommitInfo.NOOP, null);
         }
+    }
 
-        Double number = (Double) pullRequest.get("number");
-        if (number != null) {
-          prNumber = String.valueOf(number.intValue());
+    private String buildGitBranch() {
+        String gitBranchOrTag = getGitBranchOrTag();
+        if (!isTagReference(gitBranchOrTag)) {
+            return normalizeBranch(gitBranchOrTag);
+        } else {
+            return null;
         }
-      }
-
-      return new PullRequestInfo(
-          baseRef, null, baseBranchHeadSha, new CommitInfo(headSha), prNumber);
-
-    } catch (Exception e) {
-      LOGGER.warn("Error while parsing GitHub event", e);
-      return new PullRequestInfo(baseRef, null, null, CommitInfo.NOOP, null);
     }
-  }
-
-  private String buildGitBranch() {
-    String gitBranchOrTag = getGitBranchOrTag();
-    if (!isTagReference(gitBranchOrTag)) {
-      return normalizeBranch(gitBranchOrTag);
-    } else {
-      return null;
-    }
-  }
-
-  private String buildGitTag() {
-    String gitBranchOrTag = getGitBranchOrTag();
-    if (isTagReference(gitBranchOrTag)) {
-      return normalizeTag(gitBranchOrTag);
-    } else {
-      return null;
-    }
-  }
 
-  private String getGitBranchOrTag() {
-    String gitBranchOrTag = environment.get(GHACTIONS_HEAD_REF);
-    if (gitBranchOrTag == null || gitBranchOrTag.isEmpty()) {
-      gitBranchOrTag = environment.get(GHACTIONS_REF);
+    private String buildGitTag() {
+        String gitBranchOrTag = getGitBranchOrTag();
+        if (isTagReference(gitBranchOrTag)) {
+            return normalizeTag(gitBranchOrTag);
+        } else {
+            return null;
+        }
     }
-    return gitBranchOrTag;
-  }
 
-  private String buildGitRepositoryUrl(final String host, final String repo) {
-    if (repo == null || repo.isEmpty()) {
-      return null;
+    private String getGitBranchOrTag() {
+        String gitBranchOrTag = environment.get(GHACTIONS_HEAD_REF);
+        if (gitBranchOrTag == null || gitBranchOrTag.isEmpty()) {
+            gitBranchOrTag = environment.get(GHACTIONS_REF);
+        }
+        return gitBranchOrTag;
     }
 
-    return String.format("%s/%s.git", host, repo);
-  }
+    private String buildGitRepositoryUrl(final String host, final String repo) {
+        if (repo == null || repo.isEmpty()) {
+            return null;
+        }
 
-  private String buildPipelineUrl(
-      final String host, final String repo, final String pipelineId, final String retry) {
-    if (retry != null && !retry.isEmpty()) {
-      return String.format("%s/%s/actions/runs/%s/attempts/%s", host, repo, pipelineId, retry);
-    } else {
-      return String.format("%s/%s/actions/runs/%s", host, repo, pipelineId);
-    }
-  }
-
-  private String buildJobUrl(final String host, final String repo, final String commit) {
-    return String.format("%s/%s/commit/%s/checks", host, repo, commit);
-  }
-
-  private String buildJobUrlWithNumericId(
-      final String host, final String repo, final String pipelineId, final String jobId) {
-    return String.format("%s/%s/actions/runs/%s/job/%s", host, repo, pipelineId, jobId);
-  }
-
-  /**
-   * Gets the numeric job ID for GitHub Actions.
-   *
-   * <p>First checks the JOB_CHECK_RUN_ID environment variable. If not present, falls back to
-   * parsing GitHub Actions diagnostics files (Worker_*.log) in the runner's diagnostics directory.
-   *
-   * @return the numeric job ID, or null if not found
-   */
-  @Nullable
-  private String getNumericJobId() {
-    // First, check if the numeric job ID is provided via environment variable
-    String jobId = environment.get(GHACTIONS_JOB_CHECK_RUN_ID);
-    if (Strings.isNotBlank(jobId)) {
-      return jobId;
+        return String.format("%s/%s.git", host, repo);
     }
 
-    // Fall back to parsing diagnostics files
-    jobId = parseJobIdFromDirectory(diagnosticsDir);
-    if (Strings.isNotBlank(jobId)) {
-      return jobId;
+    private String buildPipelineUrl(final String host, final String repo, final String pipelineId, final String retry) {
+        if (retry != null && !retry.isEmpty()) {
+            return String.format("%s/%s/actions/runs/%s/attempts/%s", host, repo, pipelineId, retry);
+        } else {
+            return String.format("%s/%s/actions/runs/%s", host, repo, pipelineId);
+        }
     }
 
-    return parseJobIdFromDirectory(diagnosticsDirCached);
-  }
+    private String buildJobUrl(final String host, final String repo, final String commit) {
+        return String.format("%s/%s/commit/%s/checks", host, repo, commit);
+    }
 
-  @Nullable
-  private String parseJobIdFromDirectory(Path directory) {
-    if (!Files.isDirectory(directory)) {
-      return null;
+    private String buildJobUrlWithNumericId(
+            final String host, final String repo, final String pipelineId, final String jobId) {
+        return String.format("%s/%s/actions/runs/%s/job/%s", host, repo, pipelineId, jobId);
     }
 
-    try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory, "Worker_*.log")) {
-      // Find the most recent file by filename (contains timestamp like
-      // Worker_20260130-154110-utc.log)
-      Path mostRecentLog = null;
-      for (Path workerLog : stream) {
-        if (mostRecentLog == null
-            || workerLog.getFileName().toString().compareTo(mostRecentLog.getFileName().toString())
-                > 0) {
-          mostRecentLog = workerLog;
+    /**
+     * Gets the numeric job ID for GitHub Actions.
+     *
+     * <p>First checks the JOB_CHECK_RUN_ID environment variable. If not present, falls back to
+     * parsing GitHub Actions diagnostics files (Worker_*.log) in the runner's diagnostics directory.
+     *
+     * @return the numeric job ID, or null if not found
+     */
+    @Nullable
+    private String getNumericJobId() {
+        // First, check if the numeric job ID is provided via environment variable
+        String jobId = environment.get(GHACTIONS_JOB_CHECK_RUN_ID);
+        if (Strings.isNotBlank(jobId)) {
+            return jobId;
         }
-      }
 
-      if (mostRecentLog == null) {
-        return null;
-      }
+        // Fall back to parsing diagnostics files
+        jobId = parseJobIdFromDirectory(diagnosticsDir);
+        if (Strings.isNotBlank(jobId)) {
+            return jobId;
+        }
 
-      String content = new String(Files.readAllBytes(mostRecentLog), StandardCharsets.UTF_8);
-      return parseCheckRunIdFromContent(content);
-    } catch (IOException e) {
-      LOGGER.debug("Error reading diagnostics directory: {}", directory, e);
-      return null;
+        return parseJobIdFromDirectory(diagnosticsDirCached);
     }
-  }
-
-  /**
-   * Extracts the last check_run_id value from the file content.
-   *
-   * <p>The JSON structure in worker logs contains: {"k":"check_run_id","v":12345.0}
-   *
-   * <p>Uses the last match because a single worker file might contain multiple jobs' data, and the
-   * most recent job entry appears last.
-   *
-   * @param content the file content to parse
-   * @return the check_run_id as a string, or null if not found
-   */
-  @Nullable
-  String parseCheckRunIdFromContent(String content) {
-    Matcher matcher = CHECK_RUN_ID_PATTERN.matcher(content);
-    String lastMatch = null;
-    while (matcher.find()) {
-      String value = matcher.group(1);
-      // Strip decimal part if present
-      int pointIdx = value.indexOf('.');
-      if (pointIdx != -1) {
-        lastMatch = value.substring(0, pointIdx);
-      } else {
-        lastMatch = value;
-      }
+
+    @Nullable
+    private String parseJobIdFromDirectory(Path directory) {
+        if (!Files.isDirectory(directory)) {
+            return null;
+        }
+
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory, "Worker_*.log")) {
+            // Find the most recent file by filename (contains timestamp like
+            // Worker_20260130-154110-utc.log)
+            Path mostRecentLog = null;
+            for (Path workerLog : stream) {
+                if (mostRecentLog == null
+                        || workerLog
+                                        .getFileName()
+                                        .toString()
+                                        .compareTo(mostRecentLog.getFileName().toString())
+                                > 0) {
+                    mostRecentLog = workerLog;
+                }
+            }
+
+            if (mostRecentLog == null) {
+                return null;
+            }
+
+            String content = new String(Files.readAllBytes(mostRecentLog), StandardCharsets.UTF_8);
+            return parseCheckRunIdFromContent(content);
+        } catch (IOException e) {
+            LOGGER.debug("Error reading diagnostics directory: {}", directory, e);
+            return null;
+        }
     }
-    return lastMatch;
-  }
 
-  @Override
-  public Provider getProvider() {
-    return Provider.GITHUBACTIONS;
-  }
+    /**
+     * Extracts the last check_run_id value from the file content.
+     *
+     * <p>The JSON structure in worker logs contains: {"k":"check_run_id","v":12345.0}
+     *
+     * <p>Uses the last match because a single worker file might contain multiple jobs' data, and the
+     * most recent job entry appears last.
+     *
+     * @param content the file content to parse
+     * @return the check_run_id as a string, or null if not found
+     */
+    @Nullable
+    String parseCheckRunIdFromContent(String content) {
+        Matcher matcher = CHECK_RUN_ID_PATTERN.matcher(content);
+        String lastMatch = null;
+        while (matcher.find()) {
+            String value = matcher.group(1);
+            // Strip decimal part if present
+            int pointIdx = value.indexOf('.');
+            if (pointIdx != -1) {
+                lastMatch = value.substring(0, pointIdx);
+            } else {
+                lastMatch = value;
+            }
+        }
+        return lastMatch;
+    }
+
+    @Override
+    public Provider getProvider() {
+        return Provider.GITHUBACTIONS;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/JenkinsInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/JenkinsInfo.java
index eb6e859ac81..b8078f6eebb 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/JenkinsInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/JenkinsInfo.java
@@ -20,146 +20,146 @@
 @SuppressForbidden
 class JenkinsInfo implements CIProviderInfo {
 
-  // https://wiki.jenkins.io/display/JENKINS/Building+a+software+project
-  public static final String JENKINS = "JENKINS_URL";
-  public static final String JENKINS_PROVIDER_NAME = "jenkins";
-  public static final String JENKINS_PIPELINE_ID = "BUILD_TAG";
-  public static final String JENKINS_PIPELINE_NUMBER = "BUILD_NUMBER";
-  public static final String JENKINS_PIPELINE_URL = "BUILD_URL";
-  public static final String JENKINS_PIPELINE_NAME = "JOB_NAME";
-  public static final String JENKINS_JOB_URL = "JOB_URL";
-  public static final String JENKINS_WORKSPACE_PATH = "WORKSPACE";
-  public static final String JENKINS_GIT_REPOSITORY_URL = "GIT_URL";
-  public static final String JENKINS_GIT_REPOSITORY_URL_ALT = "GIT_URL_1";
-  public static final String JENKINS_GIT_COMMIT = "GIT_COMMIT";
-  public static final String JENKINS_GIT_BRANCH = "GIT_BRANCH";
-  public static final String JENKINS_DD_CUSTOM_TRACE_ID = "DD_CUSTOM_TRACE_ID";
-  public static final String JENKINS_DD_CUSTOM_PARENT_ID = "DD_CUSTOM_PARENT_ID";
-  public static final String JENKINS_NODE_NAME = "NODE_NAME";
-  public static final String JENKINS_NODE_LABELS = "NODE_LABELS";
-  public static final String JENKINS_PR_NUMBER = "CHANGE_ID";
-  public static final String JENKINS_PR_BASE_BRANCH = "CHANGE_TARGET";
-
-  private final CiEnvironment environment;
-
-  JenkinsInfo(CiEnvironment environment) {
-    this.environment = environment;
-  }
-
-  @Override
-  public GitInfo buildCIGitInfo() {
-    return new GitInfo(
-        filterSensitiveInfo(buildGitRepositoryUrl()),
-        buildGitBranch(),
-        buildGitTag(),
-        new CommitInfo(environment.get(JENKINS_GIT_COMMIT)));
-  }
-
-  @Override
-  public CIInfo buildCIInfo() {
-    final String gitBranch = buildGitBranch();
-
-    return CIInfo.builder(environment)
-        .ciProviderName(JENKINS_PROVIDER_NAME)
-        .ciPipelineId(environment.get(JENKINS_PIPELINE_ID))
-        .ciPipelineName(buildCiPipelineName(gitBranch))
-        .ciPipelineNumber(environment.get(JENKINS_PIPELINE_NUMBER))
-        .ciPipelineUrl(environment.get(JENKINS_PIPELINE_URL))
-        .ciWorkspace(expandTilde(environment.get(JENKINS_WORKSPACE_PATH)))
-        .ciNodeName(environment.get(JENKINS_NODE_NAME))
-        .ciNodeLabels(buildCiNodeLabels())
-        .ciEnvVars(JENKINS_DD_CUSTOM_TRACE_ID, JENKINS_DD_CUSTOM_PARENT_ID)
-        .build();
-  }
-
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    return new PullRequestInfo(
-        normalizeBranch(environment.get(JENKINS_PR_BASE_BRANCH)),
-        null,
-        null,
-        CommitInfo.NOOP,
-        environment.get(JENKINS_PR_NUMBER));
-  }
-
-  private String buildCiNodeLabels() {
-    String labels = environment.get(JENKINS_NODE_LABELS);
-    if (labels == null || labels.isEmpty()) {
-      return labels;
+    // https://wiki.jenkins.io/display/JENKINS/Building+a+software+project
+    public static final String JENKINS = "JENKINS_URL";
+    public static final String JENKINS_PROVIDER_NAME = "jenkins";
+    public static final String JENKINS_PIPELINE_ID = "BUILD_TAG";
+    public static final String JENKINS_PIPELINE_NUMBER = "BUILD_NUMBER";
+    public static final String JENKINS_PIPELINE_URL = "BUILD_URL";
+    public static final String JENKINS_PIPELINE_NAME = "JOB_NAME";
+    public static final String JENKINS_JOB_URL = "JOB_URL";
+    public static final String JENKINS_WORKSPACE_PATH = "WORKSPACE";
+    public static final String JENKINS_GIT_REPOSITORY_URL = "GIT_URL";
+    public static final String JENKINS_GIT_REPOSITORY_URL_ALT = "GIT_URL_1";
+    public static final String JENKINS_GIT_COMMIT = "GIT_COMMIT";
+    public static final String JENKINS_GIT_BRANCH = "GIT_BRANCH";
+    public static final String JENKINS_DD_CUSTOM_TRACE_ID = "DD_CUSTOM_TRACE_ID";
+    public static final String JENKINS_DD_CUSTOM_PARENT_ID = "DD_CUSTOM_PARENT_ID";
+    public static final String JENKINS_NODE_NAME = "NODE_NAME";
+    public static final String JENKINS_NODE_LABELS = "NODE_LABELS";
+    public static final String JENKINS_PR_NUMBER = "CHANGE_ID";
+    public static final String JENKINS_PR_BASE_BRANCH = "CHANGE_TARGET";
+
+    private final CiEnvironment environment;
+
+    JenkinsInfo(CiEnvironment environment) {
+        this.environment = environment;
     }
-    return toJson(labels.split(" "));
-  }
-
-  private String buildGitRepositoryUrl() {
-    return environment.get(JENKINS_GIT_REPOSITORY_URL) != null
-        ? environment.get(JENKINS_GIT_REPOSITORY_URL)
-        : environment.get(JENKINS_GIT_REPOSITORY_URL_ALT);
-  }
-
-  private String buildGitBranch() {
-    final String gitBranchOrTag = environment.get(JENKINS_GIT_BRANCH);
-    if (!isTagReference(gitBranchOrTag)) {
-      return normalizeBranch(gitBranchOrTag);
-    } else {
-      return null;
+
+    @Override
+    public GitInfo buildCIGitInfo() {
+        return new GitInfo(
+                filterSensitiveInfo(buildGitRepositoryUrl()),
+                buildGitBranch(),
+                buildGitTag(),
+                new CommitInfo(environment.get(JENKINS_GIT_COMMIT)));
+    }
+
+    @Override
+    public CIInfo buildCIInfo() {
+        final String gitBranch = buildGitBranch();
+
+        return CIInfo.builder(environment)
+                .ciProviderName(JENKINS_PROVIDER_NAME)
+                .ciPipelineId(environment.get(JENKINS_PIPELINE_ID))
+                .ciPipelineName(buildCiPipelineName(gitBranch))
+                .ciPipelineNumber(environment.get(JENKINS_PIPELINE_NUMBER))
+                .ciPipelineUrl(environment.get(JENKINS_PIPELINE_URL))
+                .ciWorkspace(expandTilde(environment.get(JENKINS_WORKSPACE_PATH)))
+                .ciNodeName(environment.get(JENKINS_NODE_NAME))
+                .ciNodeLabels(buildCiNodeLabels())
+                .ciEnvVars(JENKINS_DD_CUSTOM_TRACE_ID, JENKINS_DD_CUSTOM_PARENT_ID)
+                .build();
+    }
+
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        return new PullRequestInfo(
+                normalizeBranch(environment.get(JENKINS_PR_BASE_BRANCH)),
+                null,
+                null,
+                CommitInfo.NOOP,
+                environment.get(JENKINS_PR_NUMBER));
     }
-  }
-
-  private String buildGitTag() {
-    final String gitBranchOrTag = environment.get(JENKINS_GIT_BRANCH);
-    if (isTagReference(gitBranchOrTag)) {
-      return normalizeTag(gitBranchOrTag);
-    } else {
-      return null;
+
+    private String buildCiNodeLabels() {
+        String labels = environment.get(JENKINS_NODE_LABELS);
+        if (labels == null || labels.isEmpty()) {
+            return labels;
+        }
+        return toJson(labels.split(" "));
     }
-  }
 
-  private String buildCiPipelineName(final String branch) {
-    final String jobName = environment.get(JENKINS_PIPELINE_NAME);
-    return filterJenkinsJobName(jobName, branch);
-  }
+    private String buildGitRepositoryUrl() {
+        return environment.get(JENKINS_GIT_REPOSITORY_URL) != null
+                ? environment.get(JENKINS_GIT_REPOSITORY_URL)
+                : environment.get(JENKINS_GIT_REPOSITORY_URL_ALT);
+    }
 
-  private String filterJenkinsJobName(final String jobName, final String gitBranch) {
-    if (jobName == null) {
-      return null;
+    private String buildGitBranch() {
+        final String gitBranchOrTag = environment.get(JENKINS_GIT_BRANCH);
+        if (!isTagReference(gitBranchOrTag)) {
+            return normalizeBranch(gitBranchOrTag);
+        } else {
+            return null;
+        }
     }
 
-    // First, the git branch is removed from the raw jobName
-    final String jobNameNoBranch;
-    if (gitBranch != null) {
-      jobNameNoBranch = jobName.trim().replace("/" + gitBranch, "");
-    } else {
-      jobNameNoBranch = jobName;
+    private String buildGitTag() {
+        final String gitBranchOrTag = environment.get(JENKINS_GIT_BRANCH);
+        if (isTagReference(gitBranchOrTag)) {
+            return normalizeTag(gitBranchOrTag);
+        } else {
+            return null;
+        }
     }
 
-    // Once the branch has been removed, we try to extract
-    // the configurations from the job name.
-    // The configurations have the form like "key1=value1,key2=value2"
-    final Map<String, String> configurations = new HashMap<>();
-    final String[] jobNameParts = jobNameNoBranch.split("/");
-    if (jobNameParts.length > 1 && jobNameParts[1].contains("=")) {
-      final String configsStr = jobNameParts[1].toLowerCase(Locale.ROOT).trim();
-      final String[] configsKeyValue = configsStr.split(",");
-      for (final String configKeyValue : configsKeyValue) {
-        final String[] keyValue = configKeyValue.trim().split("=");
-        configurations.put(keyValue[0], keyValue[1]);
-      }
+    private String buildCiPipelineName(final String branch) {
+        final String jobName = environment.get(JENKINS_PIPELINE_NAME);
+        return filterJenkinsJobName(jobName, branch);
     }
 
-    if (configurations.isEmpty()) {
-      // If there is no configurations,
-      // the jobName is the original one without branch.
-      return jobNameNoBranch;
-    } else {
-      // If there are configurations,
-      // the jobName is the first part of the splited raw jobName.
-      return jobNameParts[0];
+    private String filterJenkinsJobName(final String jobName, final String gitBranch) {
+        if (jobName == null) {
+            return null;
+        }
+
+        // First, the git branch is removed from the raw jobName
+        final String jobNameNoBranch;
+        if (gitBranch != null) {
+            jobNameNoBranch = jobName.trim().replace("/" + gitBranch, "");
+        } else {
+            jobNameNoBranch = jobName;
+        }
+
+        // Once the branch has been removed, we try to extract
+        // the configurations from the job name.
+        // The configurations have the form like "key1=value1,key2=value2"
+        final Map<String, String> configurations = new HashMap<>();
+        final String[] jobNameParts = jobNameNoBranch.split("/");
+        if (jobNameParts.length > 1 && jobNameParts[1].contains("=")) {
+            final String configsStr = jobNameParts[1].toLowerCase(Locale.ROOT).trim();
+            final String[] configsKeyValue = configsStr.split(",");
+            for (final String configKeyValue : configsKeyValue) {
+                final String[] keyValue = configKeyValue.trim().split("=");
+                configurations.put(keyValue[0], keyValue[1]);
+            }
+        }
+
+        if (configurations.isEmpty()) {
+            // If there is no configurations,
+            // the jobName is the original one without branch.
+            return jobNameNoBranch;
+        } else {
+            // If there are configurations,
+            // the jobName is the first part of the splited raw jobName.
+            return jobNameParts[0];
+        }
     }
-  }
 
-  @Override
-  public Provider getProvider() {
-    return Provider.JENKINS;
-  }
+    @Override
+    public Provider getProvider() {
+        return Provider.JENKINS;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/PullRequestInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/PullRequestInfo.java
index a6319a014c5..ce6a6381167 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/PullRequestInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/PullRequestInfo.java
@@ -7,121 +7,122 @@
 
 public class PullRequestInfo {
 
-  public static final PullRequestInfo EMPTY =
-      new PullRequestInfo(null, null, null, CommitInfo.NOOP, null);
-
-  private final String baseBranch;
-  private final String baseBranchSha;
-  private final String baseBranchHeadSha;
-  @Nonnull private final CommitInfo headCommit;
-  private final String pullRequestNumber;
-
-  public PullRequestInfo(
-      String baseBranch,
-      String baseBranchSha,
-      String baseBranchHeadSha,
-      @Nonnull CommitInfo headCommit,
-      String pullRequestNumber) {
-    this.baseBranch = baseBranch;
-    this.baseBranchSha = baseBranchSha;
-    this.baseBranchHeadSha = baseBranchHeadSha;
-    this.headCommit = headCommit;
-    this.pullRequestNumber = pullRequestNumber;
-  }
-
-  public String getBaseBranch() {
-    return baseBranch;
-  }
-
-  public String getBaseBranchSha() {
-    return baseBranchSha;
-  }
-
-  public String getBaseBranchHeadSha() {
-    return baseBranchHeadSha;
-  }
-
-  @Nonnull
-  public CommitInfo getHeadCommit() {
-    return headCommit;
-  }
-
-  public String getPullRequestNumber() {
-    return pullRequestNumber;
-  }
-
-  public boolean isEmpty() {
-    return Strings.isBlank(baseBranch)
-        && Strings.isBlank(baseBranchSha)
-        && Strings.isBlank(baseBranchHeadSha)
-        && headCommit.isEmpty()
-        && Strings.isBlank(pullRequestNumber);
-  }
-
-  public boolean isComplete() {
-    return Strings.isNotBlank(baseBranch)
-        && Strings.isNotBlank(baseBranchSha)
-        && Strings.isNotBlank(baseBranchHeadSha)
-        && headCommit.isComplete()
-        && Strings.isNotBlank(pullRequestNumber);
-  }
-
-  /**
-   * Combine infos by completing the empty information fields in {@code first} with {@code second}'s
-   *
-   * @param first Base PR info
-   * @param second Fallback PR info
-   * @return Combined PR info
-   */
-  public static PullRequestInfo coalesce(
-      final PullRequestInfo first, final PullRequestInfo second) {
-    return new PullRequestInfo(
-        Strings.coalesce(first.baseBranch, second.baseBranch),
-        Strings.coalesce(first.baseBranchSha, second.baseBranchSha),
-        Strings.coalesce(first.baseBranchHeadSha, second.baseBranchHeadSha),
-        CommitInfo.coalesce(first.headCommit, second.headCommit),
-        Strings.coalesce(first.pullRequestNumber, second.pullRequestNumber));
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public static final PullRequestInfo EMPTY = new PullRequestInfo(null, null, null, CommitInfo.NOOP, null);
+
+    private final String baseBranch;
+    private final String baseBranchSha;
+    private final String baseBranchHeadSha;
+
+    @Nonnull
+    private final CommitInfo headCommit;
+
+    private final String pullRequestNumber;
+
+    public PullRequestInfo(
+            String baseBranch,
+            String baseBranchSha,
+            String baseBranchHeadSha,
+            @Nonnull CommitInfo headCommit,
+            String pullRequestNumber) {
+        this.baseBranch = baseBranch;
+        this.baseBranchSha = baseBranchSha;
+        this.baseBranchHeadSha = baseBranchHeadSha;
+        this.headCommit = headCommit;
+        this.pullRequestNumber = pullRequestNumber;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    public String getBaseBranch() {
+        return baseBranch;
+    }
+
+    public String getBaseBranchSha() {
+        return baseBranchSha;
+    }
+
+    public String getBaseBranchHeadSha() {
+        return baseBranchHeadSha;
+    }
+
+    @Nonnull
+    public CommitInfo getHeadCommit() {
+        return headCommit;
+    }
+
+    public String getPullRequestNumber() {
+        return pullRequestNumber;
+    }
+
+    public boolean isEmpty() {
+        return Strings.isBlank(baseBranch)
+                && Strings.isBlank(baseBranchSha)
+                && Strings.isBlank(baseBranchHeadSha)
+                && headCommit.isEmpty()
+                && Strings.isBlank(pullRequestNumber);
+    }
+
+    public boolean isComplete() {
+        return Strings.isNotBlank(baseBranch)
+                && Strings.isNotBlank(baseBranchSha)
+                && Strings.isNotBlank(baseBranchHeadSha)
+                && headCommit.isComplete()
+                && Strings.isNotBlank(pullRequestNumber);
+    }
+
+    /**
+     * Combine infos by completing the empty information fields in {@code first} with {@code second}'s
+     *
+     * @param first Base PR info
+     * @param second Fallback PR info
+     * @return Combined PR info
+     */
+    public static PullRequestInfo coalesce(final PullRequestInfo first, final PullRequestInfo second) {
+        return new PullRequestInfo(
+                Strings.coalesce(first.baseBranch, second.baseBranch),
+                Strings.coalesce(first.baseBranchSha, second.baseBranchSha),
+                Strings.coalesce(first.baseBranchHeadSha, second.baseBranchHeadSha),
+                CommitInfo.coalesce(first.headCommit, second.headCommit),
+                Strings.coalesce(first.pullRequestNumber, second.pullRequestNumber));
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        PullRequestInfo that = (PullRequestInfo) o;
+        return Objects.equals(baseBranch, that.baseBranch)
+                && Objects.equals(baseBranchSha, that.baseBranchSha)
+                && Objects.equals(baseBranchHeadSha, that.baseBranchHeadSha)
+                && Objects.equals(headCommit, that.headCommit)
+                && Objects.equals(pullRequestNumber, that.pullRequestNumber);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(baseBranch, baseBranchSha, headCommit, pullRequestNumber);
+    }
+
+    @Override
+    public String toString() {
+        return "PR{"
+                + "baseBranch='"
+                + baseBranch
+                + '\''
+                + ", baseSHA='"
+                + baseBranchSha
+                + '\''
+                + ", baseHeadSHA='"
+                + baseBranchHeadSha
+                + '\''
+                + ", headCommit='"
+                + headCommit
+                + '\''
+                + ", prNumber='"
+                + pullRequestNumber
+                + '\''
+                + '}';
     }
-    PullRequestInfo that = (PullRequestInfo) o;
-    return Objects.equals(baseBranch, that.baseBranch)
-        && Objects.equals(baseBranchSha, that.baseBranchSha)
-        && Objects.equals(baseBranchHeadSha, that.baseBranchHeadSha)
-        && Objects.equals(headCommit, that.headCommit)
-        && Objects.equals(pullRequestNumber, that.pullRequestNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(baseBranch, baseBranchSha, headCommit, pullRequestNumber);
-  }
-
-  @Override
-  public String toString() {
-    return "PR{"
-        + "baseBranch='"
-        + baseBranch
-        + '\''
-        + ", baseSHA='"
-        + baseBranchSha
-        + '\''
-        + ", baseHeadSHA='"
-        + baseBranchHeadSha
-        + '\''
-        + ", headCommit='"
-        + headCommit
-        + '\''
-        + ", prNumber='"
-        + pullRequestNumber
-        + '\''
-        + '}';
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/TeamcityInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/TeamcityInfo.java
index 969e6323bc6..7cddb9ebb9c 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/TeamcityInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/TeamcityInfo.java
@@ -9,47 +9,46 @@
 import javax.annotation.Nonnull;
 
 public class TeamcityInfo implements CIProviderInfo {
-  public static final String TEAMCITY = "TEAMCITY_VERSION";
-  public static final String TEAMCITY_PROVIDER_NAME = "teamcity";
-  private static final String TEAMCITY_BUILDCONF_NAME = "TEAMCITY_BUILDCONF_NAME";
-  private static final String BUILD_URL = "BUILD_URL";
-  private static final String TEAMCITY_PULL_REQUEST_NUMBER = "TEAMCITY_PULLREQUEST_NUMBER";
-  private static final String TEAMCITY_PULL_REQUEST_TARGET_BRANCH =
-      "TEAMCITY_PULLREQUEST_TARGET_BRANCH";
-
-  private final CiEnvironment environment;
-
-  TeamcityInfo(CiEnvironment environment) {
-    this.environment = environment;
-  }
-
-  @Override
-  public GitInfo buildCIGitInfo() {
-    return new GitInfo(null, null, null, new CommitInfo(null));
-  }
-
-  @Override
-  public CIInfo buildCIInfo() {
-    return CIInfo.builder(environment)
-        .ciProviderName(TEAMCITY_PROVIDER_NAME)
-        .ciJobName(environment.get(TEAMCITY_BUILDCONF_NAME))
-        .ciJobUrl(environment.get(BUILD_URL))
-        .build();
-  }
-
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    return new PullRequestInfo(
-        normalizeBranch(environment.get(TEAMCITY_PULL_REQUEST_TARGET_BRANCH)),
-        null,
-        null,
-        CommitInfo.NOOP,
-        environment.get(TEAMCITY_PULL_REQUEST_NUMBER));
-  }
-
-  @Override
-  public Provider getProvider() {
-    return Provider.TEAMCITY;
-  }
+    public static final String TEAMCITY = "TEAMCITY_VERSION";
+    public static final String TEAMCITY_PROVIDER_NAME = "teamcity";
+    private static final String TEAMCITY_BUILDCONF_NAME = "TEAMCITY_BUILDCONF_NAME";
+    private static final String BUILD_URL = "BUILD_URL";
+    private static final String TEAMCITY_PULL_REQUEST_NUMBER = "TEAMCITY_PULLREQUEST_NUMBER";
+    private static final String TEAMCITY_PULL_REQUEST_TARGET_BRANCH = "TEAMCITY_PULLREQUEST_TARGET_BRANCH";
+
+    private final CiEnvironment environment;
+
+    TeamcityInfo(CiEnvironment environment) {
+        this.environment = environment;
+    }
+
+    @Override
+    public GitInfo buildCIGitInfo() {
+        return new GitInfo(null, null, null, new CommitInfo(null));
+    }
+
+    @Override
+    public CIInfo buildCIInfo() {
+        return CIInfo.builder(environment)
+                .ciProviderName(TEAMCITY_PROVIDER_NAME)
+                .ciJobName(environment.get(TEAMCITY_BUILDCONF_NAME))
+                .ciJobUrl(environment.get(BUILD_URL))
+                .build();
+    }
+
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        return new PullRequestInfo(
+                normalizeBranch(environment.get(TEAMCITY_PULL_REQUEST_TARGET_BRANCH)),
+                null,
+                null,
+                CommitInfo.NOOP,
+                environment.get(TEAMCITY_PULL_REQUEST_NUMBER));
+    }
+
+    @Override
+    public Provider getProvider() {
+        return Provider.TEAMCITY;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/TravisInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/TravisInfo.java
index c5e56f5538d..10d552e79f5 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/TravisInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/TravisInfo.java
@@ -13,106 +13,106 @@
 
 class TravisInfo implements CIProviderInfo {
 
-  // https://docs.travis-ci.com/user/environment-variables/#default-environment-variables
-  public static final String TRAVIS = "TRAVIS";
-  public static final String TRAVIS_PROVIDER_NAME = "travisci";
-  public static final String TRAVIS_PIPELINE_ID = "TRAVIS_BUILD_ID";
-  public static final String TRAVIS_PIPELINE_NUMBER = "TRAVIS_BUILD_NUMBER";
-  public static final String TRAVIS_PIPELINE_URL = "TRAVIS_BUILD_WEB_URL";
-  public static final String TRAVIS_JOB_URL = "TRAVIS_JOB_WEB_URL";
-  public static final String TRAVIS_WORKSPACE_PATH = "TRAVIS_BUILD_DIR";
-  public static final String TRAVIS_REPOSITORY_SLUG = "TRAVIS_REPO_SLUG";
-  public static final String TRAVIS_PR_REPOSITORY_SLUG = "TRAVIS_PULL_REQUEST_SLUG";
-  public static final String TRAVIS_GIT_COMMIT = "TRAVIS_COMMIT";
-  public static final String TRAVIS_GIT_PR_BRANCH = "TRAVIS_PULL_REQUEST_BRANCH";
-  public static final String TRAVIS_GIT_BRANCH = "TRAVIS_BRANCH";
-  public static final String TRAVIS_GIT_TAG = "TRAVIS_TAG";
-  public static final String TRAVIS_GIT_COMMIT_MESSAGE = "TRAVIS_COMMIT_MESSAGE";
-  public static final String TRAVIS_PR_NUMBER = "TRAVIS_PULL_REQUEST";
-  public static final String TRAVIS_PR_HEAD_SHA = "TRAVIS_PULL_REQUEST_SHA";
-  public static final String TRAVIS_EVENT_TYPE = "TRAVIS_EVENT_TYPE";
+    // https://docs.travis-ci.com/user/environment-variables/#default-environment-variables
+    public static final String TRAVIS = "TRAVIS";
+    public static final String TRAVIS_PROVIDER_NAME = "travisci";
+    public static final String TRAVIS_PIPELINE_ID = "TRAVIS_BUILD_ID";
+    public static final String TRAVIS_PIPELINE_NUMBER = "TRAVIS_BUILD_NUMBER";
+    public static final String TRAVIS_PIPELINE_URL = "TRAVIS_BUILD_WEB_URL";
+    public static final String TRAVIS_JOB_URL = "TRAVIS_JOB_WEB_URL";
+    public static final String TRAVIS_WORKSPACE_PATH = "TRAVIS_BUILD_DIR";
+    public static final String TRAVIS_REPOSITORY_SLUG = "TRAVIS_REPO_SLUG";
+    public static final String TRAVIS_PR_REPOSITORY_SLUG = "TRAVIS_PULL_REQUEST_SLUG";
+    public static final String TRAVIS_GIT_COMMIT = "TRAVIS_COMMIT";
+    public static final String TRAVIS_GIT_PR_BRANCH = "TRAVIS_PULL_REQUEST_BRANCH";
+    public static final String TRAVIS_GIT_BRANCH = "TRAVIS_BRANCH";
+    public static final String TRAVIS_GIT_TAG = "TRAVIS_TAG";
+    public static final String TRAVIS_GIT_COMMIT_MESSAGE = "TRAVIS_COMMIT_MESSAGE";
+    public static final String TRAVIS_PR_NUMBER = "TRAVIS_PULL_REQUEST";
+    public static final String TRAVIS_PR_HEAD_SHA = "TRAVIS_PULL_REQUEST_SHA";
+    public static final String TRAVIS_EVENT_TYPE = "TRAVIS_EVENT_TYPE";
 
-  private final CiEnvironment environment;
+    private final CiEnvironment environment;
 
-  TravisInfo(CiEnvironment environment) {
-    this.environment = environment;
-  }
-
-  @Override
-  public GitInfo buildCIGitInfo() {
-    return new GitInfo(
-        buildGitRepositoryUrl(),
-        buildGitBranch(),
-        normalizeTag(environment.get(TRAVIS_GIT_TAG)),
-        new CommitInfo(
-            environment.get(TRAVIS_GIT_COMMIT),
-            PersonInfo.NOOP,
-            PersonInfo.NOOP,
-            environment.get(TRAVIS_GIT_COMMIT_MESSAGE)));
-  }
+    TravisInfo(CiEnvironment environment) {
+        this.environment = environment;
+    }
 
-  @Override
-  public CIInfo buildCIInfo() {
-    return CIInfo.builder(environment)
-        .ciProviderName(TRAVIS_PROVIDER_NAME)
-        .ciPipelineId(environment.get(TRAVIS_PIPELINE_ID))
-        .ciPipelineName(buildCiPipelineName())
-        .ciPipelineNumber(environment.get(TRAVIS_PIPELINE_NUMBER))
-        .ciPipelineUrl(environment.get(TRAVIS_PIPELINE_URL))
-        .ciJobUrl(environment.get(TRAVIS_JOB_URL))
-        .ciWorkspace(expandTilde(environment.get(TRAVIS_WORKSPACE_PATH)))
-        .build();
-  }
+    @Override
+    public GitInfo buildCIGitInfo() {
+        return new GitInfo(
+                buildGitRepositoryUrl(),
+                buildGitBranch(),
+                normalizeTag(environment.get(TRAVIS_GIT_TAG)),
+                new CommitInfo(
+                        environment.get(TRAVIS_GIT_COMMIT),
+                        PersonInfo.NOOP,
+                        PersonInfo.NOOP,
+                        environment.get(TRAVIS_GIT_COMMIT_MESSAGE)));
+    }
 
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    if (isPullRequest()) {
-      return new PullRequestInfo(
-          normalizeBranch(environment.get(TRAVIS_GIT_BRANCH)),
-          null,
-          null,
-          new CommitInfo(environment.get(TRAVIS_PR_HEAD_SHA)),
-          environment.get(TRAVIS_PR_NUMBER));
+    @Override
+    public CIInfo buildCIInfo() {
+        return CIInfo.builder(environment)
+                .ciProviderName(TRAVIS_PROVIDER_NAME)
+                .ciPipelineId(environment.get(TRAVIS_PIPELINE_ID))
+                .ciPipelineName(buildCiPipelineName())
+                .ciPipelineNumber(environment.get(TRAVIS_PIPELINE_NUMBER))
+                .ciPipelineUrl(environment.get(TRAVIS_PIPELINE_URL))
+                .ciJobUrl(environment.get(TRAVIS_JOB_URL))
+                .ciWorkspace(expandTilde(environment.get(TRAVIS_WORKSPACE_PATH)))
+                .build();
     }
-    return PullRequestInfo.EMPTY;
-  }
 
-  private boolean isPullRequest() {
-    return "pull_request".equals(environment.get(TRAVIS_EVENT_TYPE));
-  }
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        if (isPullRequest()) {
+            return new PullRequestInfo(
+                    normalizeBranch(environment.get(TRAVIS_GIT_BRANCH)),
+                    null,
+                    null,
+                    new CommitInfo(environment.get(TRAVIS_PR_HEAD_SHA)),
+                    environment.get(TRAVIS_PR_NUMBER));
+        }
+        return PullRequestInfo.EMPTY;
+    }
 
-  private String buildGitBranch() {
-    final String fromBranch = environment.get(TRAVIS_GIT_PR_BRANCH);
-    if (fromBranch != null && !fromBranch.isEmpty()) {
-      return normalizeBranch(fromBranch);
-    } else {
-      return normalizeBranch(environment.get(TRAVIS_GIT_BRANCH));
+    private boolean isPullRequest() {
+        return "pull_request".equals(environment.get(TRAVIS_EVENT_TYPE));
     }
-  }
 
-  private String buildGitRepositoryUrl() {
-    String repoSlug = environment.get(TRAVIS_PR_REPOSITORY_SLUG);
-    if (repoSlug == null || repoSlug.isEmpty()) {
-      repoSlug = environment.get(TRAVIS_REPOSITORY_SLUG);
+    private String buildGitBranch() {
+        final String fromBranch = environment.get(TRAVIS_GIT_PR_BRANCH);
+        if (fromBranch != null && !fromBranch.isEmpty()) {
+            return normalizeBranch(fromBranch);
+        } else {
+            return normalizeBranch(environment.get(TRAVIS_GIT_BRANCH));
+        }
     }
 
-    if (repoSlug == null || repoSlug.isEmpty()) {
-      return null;
+    private String buildGitRepositoryUrl() {
+        String repoSlug = environment.get(TRAVIS_PR_REPOSITORY_SLUG);
+        if (repoSlug == null || repoSlug.isEmpty()) {
+            repoSlug = environment.get(TRAVIS_REPOSITORY_SLUG);
+        }
+
+        if (repoSlug == null || repoSlug.isEmpty()) {
+            return null;
+        }
+        return String.format("https://github.com/%s.git", repoSlug);
     }
-    return String.format("https://github.com/%s.git", repoSlug);
-  }
 
-  private String buildCiPipelineName() {
-    String repoSlug = environment.get(TRAVIS_PR_REPOSITORY_SLUG);
-    if (repoSlug == null || repoSlug.isEmpty()) {
-      repoSlug = environment.get(TRAVIS_REPOSITORY_SLUG);
+    private String buildCiPipelineName() {
+        String repoSlug = environment.get(TRAVIS_PR_REPOSITORY_SLUG);
+        if (repoSlug == null || repoSlug.isEmpty()) {
+            repoSlug = environment.get(TRAVIS_REPOSITORY_SLUG);
+        }
+        return repoSlug;
     }
-    return repoSlug;
-  }
 
-  @Override
-  public Provider getProvider() {
-    return Provider.TRAVISCI;
-  }
+    @Override
+    public Provider getProvider() {
+        return Provider.TRAVISCI;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/UnknownCIInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/UnknownCIInfo.java
index df6ade9a13e..c4740706ad9 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/UnknownCIInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/UnknownCIInfo.java
@@ -26,57 +26,59 @@
  */
 class UnknownCIInfo implements CIProviderInfo {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(UnknownCIInfo.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(UnknownCIInfo.class);
 
-  public static final String UNKNOWN_PROVIDER_NAME = "unknown";
+    public static final String UNKNOWN_PROVIDER_NAME = "unknown";
 
-  private final CiEnvironment environment;
-  private final String targetFolder;
-  private final Path currentPath;
+    private final CiEnvironment environment;
+    private final String targetFolder;
+    private final Path currentPath;
 
-  UnknownCIInfo(CiEnvironment environment, String targetFolder, Path currentPath) {
-    this.environment = environment;
-    this.targetFolder = targetFolder;
-    this.currentPath = currentPath;
-  }
-
-  @Override
-  public GitInfo buildCIGitInfo() {
-    return GitInfo.NOOP;
-  }
-
-  @Override
-  public CIInfo buildCIInfo() {
-    Path workspace = findParentPathBackwards(getCurrentPath(), getTargetFolder(), true);
-    if (workspace == null) {
-      return CIInfo.NOOP;
+    UnknownCIInfo(CiEnvironment environment, String targetFolder, Path currentPath) {
+        this.environment = environment;
+        this.targetFolder = targetFolder;
+        this.currentPath = currentPath;
     }
 
-    try {
-      workspace = workspace.toRealPath();
-    } catch (Exception e) {
-      LOGGER.debug("Could not get real path for workspace folder {}", workspace, e);
+    @Override
+    public GitInfo buildCIGitInfo() {
+        return GitInfo.NOOP;
     }
 
-    return CIInfo.builder(environment).ciWorkspace(workspace.toAbsolutePath().toString()).build();
-  }
+    @Override
+    public CIInfo buildCIInfo() {
+        Path workspace = findParentPathBackwards(getCurrentPath(), getTargetFolder(), true);
+        if (workspace == null) {
+            return CIInfo.NOOP;
+        }
 
-  @Nonnull
-  @Override
-  public PullRequestInfo buildPullRequestInfo() {
-    return PullRequestInfo.EMPTY;
-  }
+        try {
+            workspace = workspace.toRealPath();
+        } catch (Exception e) {
+            LOGGER.debug("Could not get real path for workspace folder {}", workspace, e);
+        }
 
-  protected String getTargetFolder() {
-    return targetFolder;
-  }
+        return CIInfo.builder(environment)
+                .ciWorkspace(workspace.toAbsolutePath().toString())
+                .build();
+    }
 
-  protected Path getCurrentPath() {
-    return currentPath;
-  }
+    @Nonnull
+    @Override
+    public PullRequestInfo buildPullRequestInfo() {
+        return PullRequestInfo.EMPTY;
+    }
 
-  @Override
-  public Provider getProvider() {
-    return Provider.UNSUPPORTED;
-  }
+    protected String getTargetFolder() {
+        return targetFolder;
+    }
+
+    protected Path getCurrentPath() {
+        return currentPath;
+    }
+
+    @Override
+    public Provider getProvider() {
+        return Provider.UNSUPPORTED;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/env/CiEnvironment.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/env/CiEnvironment.java
index f649701e382..e57521f6f6d 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/env/CiEnvironment.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/env/CiEnvironment.java
@@ -4,7 +4,7 @@
 
 public interface CiEnvironment {
 
-  String get(String name);
+    String get(String name);
 
-  Map<String, String> get();
+    Map<String, String> get();
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/env/CiEnvironmentImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/env/CiEnvironmentImpl.java
index d838cc9db5e..8c033efee9c 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/env/CiEnvironmentImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/env/CiEnvironmentImpl.java
@@ -5,23 +5,23 @@
 
 public class CiEnvironmentImpl implements CiEnvironment {
 
-  private final Map<String, String> env;
+    private final Map<String, String> env;
 
-  public CiEnvironmentImpl(Map<String, String> env) {
-    this.env = env;
-  }
+    public CiEnvironmentImpl(Map<String, String> env) {
+        this.env = env;
+    }
 
-  public static CiEnvironment local() {
-    return new CiEnvironmentImpl(EnvironmentVariables.getAll());
-  }
+    public static CiEnvironment local() {
+        return new CiEnvironmentImpl(EnvironmentVariables.getAll());
+    }
 
-  @Override
-  public String get(String name) {
-    return env.get(name);
-  }
+    @Override
+    public String get(String name) {
+        return env.get(name);
+    }
 
-  @Override
-  public Map<String, String> get() {
-    return env;
-  }
+    @Override
+    public Map<String, String> get() {
+        return env;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/env/CompositeCiEnvironment.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/env/CompositeCiEnvironment.java
index 2a723606d76..2967252e8ca 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/env/CompositeCiEnvironment.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/env/CompositeCiEnvironment.java
@@ -5,31 +5,31 @@
 
 public class CompositeCiEnvironment implements CiEnvironment {
 
-  private final CiEnvironment[] delegates;
+    private final CiEnvironment[] delegates;
 
-  public CompositeCiEnvironment(CiEnvironment... delegates) {
-    this.delegates = delegates;
-  }
+    public CompositeCiEnvironment(CiEnvironment... delegates) {
+        this.delegates = delegates;
+    }
 
-  @Override
-  public String get(String name) {
-    for (CiEnvironment delegate : delegates) {
-      String value = delegate.get(name);
-      if (value != null) {
-        return value;
-      }
+    @Override
+    public String get(String name) {
+        for (CiEnvironment delegate : delegates) {
+            String value = delegate.get(name);
+            if (value != null) {
+                return value;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Override
-  public Map<String, String> get() {
-    Map<String, String> combinedEnvironment = new HashMap<>();
-    for (int i = delegates.length - 1; i >= 0; i--) {
-      // iterating over delegates in reverse order,
-      // since delegates with lower indices have higher priority
-      combinedEnvironment.putAll(delegates[i].get());
+    @Override
+    public Map<String, String> get() {
+        Map<String, String> combinedEnvironment = new HashMap<>();
+        for (int i = delegates.length - 1; i >= 0; i--) {
+            // iterating over delegates in reverse order,
+            // since delegates with lower indices have higher priority
+            combinedEnvironment.putAll(delegates[i].get());
+        }
+        return combinedEnvironment;
     }
-    return combinedEnvironment;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/Codeowners.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/Codeowners.java
index 3ac7aead31f..543bb4e4756 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/Codeowners.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/Codeowners.java
@@ -10,11 +10,11 @@
  *     file description</a>
  */
 public interface Codeowners {
-  @Nullable
-  Collection<String> getOwners(@Nonnull String path);
+    @Nullable
+    Collection<String> getOwners(@Nonnull String path);
 
-  /**
-   * @return {@code true} if {@code CODEOWNERS} file could be located and parsed
-   */
-  boolean exist();
+    /**
+     * @return {@code true} if {@code CODEOWNERS} file could be located and parsed
+     */
+    boolean exist();
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/CodeownersImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/CodeownersImpl.java
index e0513b124e6..e298a39ee89 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/CodeownersImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/CodeownersImpl.java
@@ -18,82 +18,82 @@
 
 public class CodeownersImpl implements Codeowners {
 
-  private final List<Section> sections;
+    private final List<Section> sections;
 
-  private CodeownersImpl(List<Section> sections) {
-    this.sections = sections;
-  }
-
-  /**
-   * @param path path to a file/folder relative to the repository root
-   * @return the list of teams/people who own the provided path
-   */
-  @Override
-  public @Nullable Collection<String> getOwners(@Nonnull String path) {
-    if (sections.size() == 1) {
-      Section section = sections.get(0);
-      if (section.isExcluded(path)) {
-        return new ArrayList<>();
-      }
-      Entry entry = section.findMatchingEntry(path);
-      return entry != null ? new ArrayList<>(entry.getOwners()) : null;
+    private CodeownersImpl(List<Section> sections) {
+        this.sections = sections;
     }
 
-    Set<String> owners = null;
-    for (Section section : sections) {
-      if (section.isExcluded(path)) {
-        if (owners == null) {
-          owners = new LinkedHashSet<>();
+    /**
+     * @param path path to a file/folder relative to the repository root
+     * @return the list of teams/people who own the provided path
+     */
+    @Override
+    public @Nullable Collection<String> getOwners(@Nonnull String path) {
+        if (sections.size() == 1) {
+            Section section = sections.get(0);
+            if (section.isExcluded(path)) {
+                return new ArrayList<>();
+            }
+            Entry entry = section.findMatchingEntry(path);
+            return entry != null ? new ArrayList<>(entry.getOwners()) : null;
         }
-        continue;
-      }
 
-      Entry entry = section.findMatchingEntry(path);
-      if (entry != null) {
-        if (owners == null) {
-          owners = new LinkedHashSet<>();
+        Set<String> owners = null;
+        for (Section section : sections) {
+            if (section.isExcluded(path)) {
+                if (owners == null) {
+                    owners = new LinkedHashSet<>();
+                }
+                continue;
+            }
+
+            Entry entry = section.findMatchingEntry(path);
+            if (entry != null) {
+                if (owners == null) {
+                    owners = new LinkedHashSet<>();
+                }
+                owners.addAll(entry.getOwners());
+            }
         }
-        owners.addAll(entry.getOwners());
-      }
+        return owners != null ? new ArrayList<>(owners) : null;
+    }
+
+    @Override
+    public boolean exist() {
+        return true;
     }
-    return owners != null ? new ArrayList<>(owners) : null;
-  }
 
-  @Override
-  public boolean exist() {
-    return true;
-  }
+    public static Codeowners parse(Reader r) throws IOException {
+        Section defaultSection = new Section();
+        Map<String, Section> namedSections = new LinkedHashMap<>();
+        Section currentSection = defaultSection;
 
-  public static Codeowners parse(Reader r) throws IOException {
-    Section defaultSection = new Section();
-    Map<String, Section> namedSections = new LinkedHashMap<>();
-    Section currentSection = defaultSection;
+        CharacterMatcher.Factory characterMatcherFactory = new CharacterMatcher.Factory();
+        BufferedReader br = new BufferedReader(r);
+        String line;
+        // Entries without owners inherit the current section's default owners
+        Collection<String> sectionDefaultOwners = Collections.emptyList();
+        while ((line = br.readLine()) != null) {
+            EntryBuilder entryBuilder = new EntryBuilder(characterMatcherFactory, line);
 
-    CharacterMatcher.Factory characterMatcherFactory = new CharacterMatcher.Factory();
-    BufferedReader br = new BufferedReader(r);
-    String line;
-    // Entries without owners inherit the current section's default owners
-    Collection<String> sectionDefaultOwners = Collections.emptyList();
-    while ((line = br.readLine()) != null) {
-      EntryBuilder entryBuilder = new EntryBuilder(characterMatcherFactory, line);
+            SectionHeader header = entryBuilder.parseSectionHeader();
+            if (header != null) {
+                sectionDefaultOwners = header.getDefaultOwners();
+                String key = header.getName().trim().toLowerCase(Locale.ROOT);
+                currentSection = namedSections.computeIfAbsent(key, k -> new Section());
+                continue;
+            }
 
-      SectionHeader header = entryBuilder.parseSectionHeader();
-      if (header != null) {
-        sectionDefaultOwners = header.getDefaultOwners();
-        String key = header.getName().trim().toLowerCase(Locale.ROOT);
-        currentSection = namedSections.computeIfAbsent(key, k -> new Section());
-        continue;
-      }
+            Entry entry = entryBuilder.parse(sectionDefaultOwners);
+            if (entry != null) {
+                currentSection.add(entry);
+            }
+        }
 
-      Entry entry = entryBuilder.parse(sectionDefaultOwners);
-      if (entry != null) {
-        currentSection.add(entry);
-      }
+        List<Section> sections = new ArrayList<>(namedSections.size() + 1);
+        sections.add(defaultSection);
+        sections.addAll(namedSections.values());
+        return new CodeownersImpl(sections);
     }
-
-    List<Section> sections = new ArrayList<>(namedSections.size() + 1);
-    sections.add(defaultSection);
-    sections.addAll(namedSections.values());
-    return new CodeownersImpl(sections);
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/CodeownersProvider.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/CodeownersProvider.java
index ebcd91b272a..5c55b89ba0d 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/CodeownersProvider.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/CodeownersProvider.java
@@ -11,40 +11,40 @@
 
 public class CodeownersProvider {
 
-  private static final Logger log = LoggerFactory.getLogger(CodeownersProvider.class);
-
-  static final String CODEOWNERS_FILE_NAME = "CODEOWNERS";
-
-  private final FileSystem fileSystem;
-
-  public CodeownersProvider() {
-    this(FileSystems.getDefault());
-  }
-
-  CodeownersProvider(FileSystem fileSystem) {
-    this.fileSystem = fileSystem;
-  }
-
-  public Codeowners build(String repoRoot) {
-    return find(
-        fileSystem.getPath(repoRoot, CODEOWNERS_FILE_NAME),
-        fileSystem.getPath(repoRoot, ".github", CODEOWNERS_FILE_NAME),
-        fileSystem.getPath(repoRoot, ".gitlab", CODEOWNERS_FILE_NAME),
-        fileSystem.getPath(repoRoot, "docs", CODEOWNERS_FILE_NAME));
-  }
-
-  private Codeowners find(Path... possiblePaths) {
-    for (Path path : possiblePaths) {
-      try {
-        if (Files.exists(path)) {
-          try (Reader reader = Files.newBufferedReader(path)) {
-            return CodeownersImpl.parse(reader);
-          }
+    private static final Logger log = LoggerFactory.getLogger(CodeownersProvider.class);
+
+    static final String CODEOWNERS_FILE_NAME = "CODEOWNERS";
+
+    private final FileSystem fileSystem;
+
+    public CodeownersProvider() {
+        this(FileSystems.getDefault());
+    }
+
+    CodeownersProvider(FileSystem fileSystem) {
+        this.fileSystem = fileSystem;
+    }
+
+    public Codeowners build(String repoRoot) {
+        return find(
+                fileSystem.getPath(repoRoot, CODEOWNERS_FILE_NAME),
+                fileSystem.getPath(repoRoot, ".github", CODEOWNERS_FILE_NAME),
+                fileSystem.getPath(repoRoot, ".gitlab", CODEOWNERS_FILE_NAME),
+                fileSystem.getPath(repoRoot, "docs", CODEOWNERS_FILE_NAME));
+    }
+
+    private Codeowners find(Path... possiblePaths) {
+        for (Path path : possiblePaths) {
+            try {
+                if (Files.exists(path)) {
+                    try (Reader reader = Files.newBufferedReader(path)) {
+                        return CodeownersImpl.parse(reader);
+                    }
+                }
+            } catch (IOException e) {
+                log.error("Could not read CODEOWNERS file from {}", path, e);
+            }
         }
-      } catch (IOException e) {
-        log.error("Could not read CODEOWNERS file from {}", path, e);
-      }
+        return NoCodeowners.INSTANCE;
     }
-    return NoCodeowners.INSTANCE;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/Entry.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/Entry.java
index 0d8167d60db..0812fab38d3 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/Entry.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/Entry.java
@@ -8,32 +8,31 @@
 
 public class Entry {
 
-  private final Matcher matcher;
-  private final Collection<String> owners;
-  private final boolean exclusion;
-  private final @Nullable String indexKey;
-
-  public Entry(
-      Matcher matcher, Collection<String> owners, boolean exclusion, @Nullable String indexKey) {
-    this.matcher = matcher;
-    this.owners = owners.size() > 1 ? new ArrayList<>(new LinkedHashSet<>(owners)) : owners;
-    this.exclusion = exclusion;
-    this.indexKey = indexKey;
-  }
-
-  public Matcher getMatcher() {
-    return matcher;
-  }
-
-  public Collection<String> getOwners() {
-    return owners;
-  }
-
-  public boolean isExclusion() {
-    return exclusion;
-  }
-
-  public @Nullable String getIndexKey() {
-    return indexKey;
-  }
+    private final Matcher matcher;
+    private final Collection<String> owners;
+    private final boolean exclusion;
+    private final @Nullable String indexKey;
+
+    public Entry(Matcher matcher, Collection<String> owners, boolean exclusion, @Nullable String indexKey) {
+        this.matcher = matcher;
+        this.owners = owners.size() > 1 ? new ArrayList<>(new LinkedHashSet<>(owners)) : owners;
+        this.exclusion = exclusion;
+        this.indexKey = indexKey;
+    }
+
+    public Matcher getMatcher() {
+        return matcher;
+    }
+
+    public Collection<String> getOwners() {
+        return owners;
+    }
+
+    public boolean isExclusion() {
+        return exclusion;
+    }
+
+    public @Nullable String getIndexKey() {
+        return indexKey;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/EntryBuilder.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/EntryBuilder.java
index f891f70c018..a65b3a0fed0 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/EntryBuilder.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/EntryBuilder.java
@@ -33,326 +33,326 @@
  */
 public class EntryBuilder {
 
-  private static final Logger log = LoggerFactory.getLogger(EntryBuilder.class);
-
-  private final CharacterMatcher.Factory characterMatcherFactory;
-  private final char[] c;
-  private int offset;
-
-  public EntryBuilder(CharacterMatcher.Factory characterMatcherFactory, String s) {
-    this.characterMatcherFactory = characterMatcherFactory;
-    c = s.toCharArray();
-  }
-
-  public @Nullable Entry parse() {
-    return parse(Collections.emptyList());
-  }
-
-  /**
-   * Parses the line as a CODEOWNERS entry: a path pattern optionally followed by one or more
-   * owners.
-   *
-   * @param sectionDefaultOwners default owners declared on the enclosing GitLab section header,
-   *     used when the entry declares no owners of its own. Pass an empty collection for entries
-   *     that do not belong to a section (e.g. GitHub CODEOWNERS files).
-   * @return the parsed entry, or {@code null} for blank lines, comments, section headers, or lines
-   *     that cannot be parsed.
-   */
-  public @Nullable Entry parse(Collection<String> sectionDefaultOwners) {
-    try {
-      skipWhitespace();
-
-      if (offset == c.length // empty line
-          || c[offset] == '#' // comment
-          || isSectionHeader()) { // GitLab section header (including optional '^[')
-        return null;
-      }
-
-      boolean exclusion = c[offset] == '!';
-      if (exclusion) {
-        offset++;
-      }
-
-      String indexKey = parseIndexKey();
-      Matcher matcher = parseMatcher();
-      Collection<String> owners = exclusion ? Collections.emptyList() : parseOwners();
-      if (!exclusion && owners.isEmpty()) {
-        owners = sectionDefaultOwners;
-      }
-      return new Entry(matcher, owners, exclusion, indexKey);
-
-    } catch (Exception e) {
-      log.warn("Skipping malformed CODEOWNERS entry: {}", new String(c), e);
-      return null;
-    }
-  }
-
-  /**
-   * If the line is a GitLab section header, consumes it and returns the parsed {@link
-   * SectionHeader} (its name and default owners). Returns {@code null} when the line is not a
-   * section header, leaving the cursor at the start of the pattern so the line can be parsed with
-   * {@link #parse(Collection)}.
-   *
-   * <p>Supports the GitLab header syntax {@code ^[Section name][N] @owner}: an optional leading
-   * {@code ^} (optional section), a bracketed name that may contain spaces, an optional {@code [N]}
-   * required-approvals count, and trailing default owners.
-   *
-   * @see <a href="https://docs.gitlab.com/user/project/codeowners/reference/">GitLab Code Owners
-   *     reference</a>
-   */
-  public @Nullable SectionHeader parseSectionHeader() {
-    skipWhitespace();
-    if (!isSectionHeader()) {
-      return null;
-    }
-    if (c[offset] == '^') {
-      offset++; // consume the optional-section marker
-    }
-    offset++; // consume the opening '['
-    int nameStart = offset;
-    while (offset < c.length && c[offset] != ']') {
-      offset++; // consume the section name (which may contain spaces)
-    }
-    String name = new String(c, nameStart, offset - nameStart);
-    if (offset < c.length) {
-      offset++; // consume the closing ']'
-    }
-    // skip the optional [N] required-approvals count that may immediately follow the name
-    if (offset < c.length && c[offset] == '[') {
-      while (offset < c.length && c[offset] != ']') {
-        offset++;
-      }
-      if (offset < c.length) {
-        offset++; // consume the closing ']'
-      }
-    }
-    return new SectionHeader(name, parseOwners());
-  }
+    private static final Logger log = LoggerFactory.getLogger(EntryBuilder.class);
 
-  private void skipWhitespace() {
-    while (offset < c.length && Character.isWhitespace(c[offset])) {
-      offset++;
-    }
-  }
-
-  /**
-   * Determines whether the line, starting at the current cursor (with leading whitespace already
-   * skipped), is a section header. Does not move the cursor.
-   *
-   * <p>A section header begins with {@code [} — or the GitLab optional-section marker {@code ^[} —
-   * and the section name's closing {@code ]} is followed by end-of-line, whitespace, a comment
-   * ({@code #}), or the optional {@code [N]} approvals count. Requiring that trailing context
-   * distinguishes a section header from a path pattern that merely begins with a character class
-   * such as {@code [a-z]*.txt}.
-   */
-  private boolean isSectionHeader() {
-    int i = offset;
-    if (i < c.length && c[i] == '^') {
-      i++; // optional-section marker
-    }
-    if (i >= c.length || c[i] != '[') {
-      return false;
+    private final CharacterMatcher.Factory characterMatcherFactory;
+    private final char[] c;
+    private int offset;
+
+    public EntryBuilder(CharacterMatcher.Factory characterMatcherFactory, String s) {
+        this.characterMatcherFactory = characterMatcherFactory;
+        c = s.toCharArray();
     }
-    while (i < c.length && c[i] != ']') {
-      i++; // scan to the section name's closing ']'
+
+    public @Nullable Entry parse() {
+        return parse(Collections.emptyList());
     }
-    if (i >= c.length) {
-      return false; // unterminated brackets: not a well-formed section header
+
+    /**
+     * Parses the line as a CODEOWNERS entry: a path pattern optionally followed by one or more
+     * owners.
+     *
+     * @param sectionDefaultOwners default owners declared on the enclosing GitLab section header,
+     *     used when the entry declares no owners of its own. Pass an empty collection for entries
+     *     that do not belong to a section (e.g. GitHub CODEOWNERS files).
+     * @return the parsed entry, or {@code null} for blank lines, comments, section headers, or lines
+     *     that cannot be parsed.
+     */
+    public @Nullable Entry parse(Collection<String> sectionDefaultOwners) {
+        try {
+            skipWhitespace();
+
+            if (offset == c.length // empty line
+                    || c[offset] == '#' // comment
+                    || isSectionHeader()) { // GitLab section header (including optional '^[')
+                return null;
+            }
+
+            boolean exclusion = c[offset] == '!';
+            if (exclusion) {
+                offset++;
+            }
+
+            String indexKey = parseIndexKey();
+            Matcher matcher = parseMatcher();
+            Collection<String> owners = exclusion ? Collections.emptyList() : parseOwners();
+            if (!exclusion && owners.isEmpty()) {
+                owners = sectionDefaultOwners;
+            }
+            return new Entry(matcher, owners, exclusion, indexKey);
+
+        } catch (Exception e) {
+            log.warn("Skipping malformed CODEOWNERS entry: {}", new String(c), e);
+            return null;
+        }
     }
-    i++; // move past ']'
-    return i >= c.length || Character.isWhitespace(c[i]) || c[i] == '[' || c[i] == '#';
-  }
-
-  private Matcher parseMatcher() {
-    boolean patternContainsSlashes = false;
-    if (c[offset] == '/') {
-      // opening slash gets special treatment
-      offset++;
-      patternContainsSlashes = true;
+
+    /**
+     * If the line is a GitLab section header, consumes it and returns the parsed {@link
+     * SectionHeader} (its name and default owners). Returns {@code null} when the line is not a
+     * section header, leaving the cursor at the start of the pattern so the line can be parsed with
+     * {@link #parse(Collection)}.
+     *
+     * <p>Supports the GitLab header syntax {@code ^[Section name][N] @owner}: an optional leading
+     * {@code ^} (optional section), a bracketed name that may contain spaces, an optional {@code [N]}
+     * required-approvals count, and trailing default owners.
+     *
+     * @see <a href="https://docs.gitlab.com/user/project/codeowners/reference/">GitLab Code Owners
+     *     reference</a>
+     */
+    public @Nullable SectionHeader parseSectionHeader() {
+        skipWhitespace();
+        if (!isSectionHeader()) {
+            return null;
+        }
+        if (c[offset] == '^') {
+            offset++; // consume the optional-section marker
+        }
+        offset++; // consume the opening '['
+        int nameStart = offset;
+        while (offset < c.length && c[offset] != ']') {
+            offset++; // consume the section name (which may contain spaces)
+        }
+        String name = new String(c, nameStart, offset - nameStart);
+        if (offset < c.length) {
+            offset++; // consume the closing ']'
+        }
+        // skip the optional [N] required-approvals count that may immediately follow the name
+        if (offset < c.length && c[offset] == '[') {
+            while (offset < c.length && c[offset] != ']') {
+                offset++;
+            }
+            if (offset < c.length) {
+                offset++; // consume the closing ']'
+            }
+        }
+        return new SectionHeader(name, parseOwners());
     }
 
-    Deque<Matcher> characterMatchers = new ArrayDeque<>();
-    for (; offset < c.length; offset++) {
-      if (isPatternTerminator(c[offset])) {
-        break;
+    private void skipWhitespace() {
+        while (offset < c.length && Character.isWhitespace(c[offset])) {
+            offset++;
+        }
+    }
 
-      } else if (consumeDoubleAsterisk()) {
-        characterMatchers.offerLast(DoubleAsteriskMatcher.INSTANCE);
-        patternContainsSlashes = true;
+    /**
+     * Determines whether the line, starting at the current cursor (with leading whitespace already
+     * skipped), is a section header. Does not move the cursor.
+     *
+     * <p>A section header begins with {@code [} — or the GitLab optional-section marker {@code ^[} —
+     * and the section name's closing {@code ]} is followed by end-of-line, whitespace, a comment
+     * ({@code #}), or the optional {@code [N]} approvals count. Requiring that trailing context
+     * distinguishes a section header from a path pattern that merely begins with a character class
+     * such as {@code [a-z]*.txt}.
+     */
+    private boolean isSectionHeader() {
+        int i = offset;
+        if (i < c.length && c[i] == '^') {
+            i++; // optional-section marker
+        }
+        if (i >= c.length || c[i] != '[') {
+            return false;
+        }
+        while (i < c.length && c[i] != ']') {
+            i++; // scan to the section name's closing ']'
+        }
+        if (i >= c.length) {
+            return false; // unterminated brackets: not a well-formed section header
+        }
+        i++; // move past ']'
+        return i >= c.length || Character.isWhitespace(c[i]) || c[i] == '[' || c[i] == '#';
+    }
 
-      } else if (c[offset] == '/') {
-        // closing slash gets special treatment
-        if (offset + 1 < c.length && !isPatternTerminator(c[offset + 1])) {
-          characterMatchers.offerLast(characterMatcherFactory.create('/'));
-          patternContainsSlashes = true;
+    private Matcher parseMatcher() {
+        boolean patternContainsSlashes = false;
+        if (c[offset] == '/') {
+            // opening slash gets special treatment
+            offset++;
+            patternContainsSlashes = true;
         }
 
-      } else if (c[offset] == '*') {
-        characterMatchers.offerLast(AsteriskMatcher.INSTANCE);
+        Deque<Matcher> characterMatchers = new ArrayDeque<>();
+        for (; offset < c.length; offset++) {
+            if (isPatternTerminator(c[offset])) {
+                break;
 
-      } else if (c[offset] == '?') {
-        characterMatchers.offerLast(QuestionMarkMatcher.INSTANCE);
+            } else if (consumeDoubleAsterisk()) {
+                characterMatchers.offerLast(DoubleAsteriskMatcher.INSTANCE);
+                patternContainsSlashes = true;
 
-      } else if (c[offset] == '[') {
-        characterMatchers.offerLast(parseRangeCharacterMatcher());
+            } else if (c[offset] == '/') {
+                // closing slash gets special treatment
+                if (offset + 1 < c.length && !isPatternTerminator(c[offset + 1])) {
+                    characterMatchers.offerLast(characterMatcherFactory.create('/'));
+                    patternContainsSlashes = true;
+                }
 
-      } else if (c[offset] == '\\') {
-        characterMatchers.offerLast(characterMatcherFactory.create(c[++offset]));
+            } else if (c[offset] == '*') {
+                characterMatchers.offerLast(AsteriskMatcher.INSTANCE);
 
-      } else {
-        characterMatchers.offerLast(characterMatcherFactory.create(c[offset]));
-      }
-    }
+            } else if (c[offset] == '?') {
+                characterMatchers.offerLast(QuestionMarkMatcher.INSTANCE);
 
-    if (characterMatchers.isEmpty()) {
-      throw new IllegalArgumentException("No matchers found");
-    }
+            } else if (c[offset] == '[') {
+                characterMatchers.offerLast(parseRangeCharacterMatcher());
 
-    boolean patternEndsWithSlash = c[offset - 1] == '/';
-    if (!patternEndsWithSlash) { // pattern should match the end of the string
-      if (c[offset - 1] == '*') {
-        characterMatchers.offerLast(EndOfLineMatcher.INSTANCE);
-      } else {
-        characterMatchers.offerLast(EndOfSegmentMatcher.INSTANCE);
-      }
-    }
+            } else if (c[offset] == '\\') {
+                characterMatchers.offerLast(characterMatcherFactory.create(c[++offset]));
 
-    if (!patternContainsSlashes) {
-      // pattern does not have to match the beginning of the string
-      characterMatchers.offerFirst(DoubleAsteriskMatcher.INSTANCE);
-    }
+            } else {
+                characterMatchers.offerLast(characterMatcherFactory.create(c[offset]));
+            }
+        }
 
-    return new CompositeMatcher(characterMatchers.toArray(new Matcher[0]));
-  }
+        if (characterMatchers.isEmpty()) {
+            throw new IllegalArgumentException("No matchers found");
+        }
 
-  private @Nullable String parseIndexKey() {
-    // Index by the first two fixed path segments; patterns without a safe prefix stay linear.
-    int position = offset;
-    int patternEnd = position;
-    while (patternEnd < c.length && !isPatternTerminator(c[patternEnd])) {
-      patternEnd++;
-    }
-    // Trailing-slash matchers can match beyond a segment boundary, making their prefix unsafe.
-    if (patternEnd > position && c[patternEnd - 1] == '/') {
-      return null;
-    }
-    boolean patternContainsSlashes = c[position] == '/';
-    if (patternContainsSlashes) {
-      position++;
-    }
-    int prefixStart = position;
-    int firstSeparator = -1;
-    for (; position < c.length && !isPatternTerminator(c[position]); position++) {
-      char character = c[position];
-      if (character == '*' || character == '?' || character == '[') {
-        return null;
-      }
-      if (character == '\\') {
-        return null;
-      }
-      if (character == '/') {
-        patternContainsSlashes = true;
-        if (firstSeparator >= 0) {
-          return new String(c, prefixStart, position - prefixStart);
+        boolean patternEndsWithSlash = c[offset - 1] == '/';
+        if (!patternEndsWithSlash) { // pattern should match the end of the string
+            if (c[offset - 1] == '*') {
+                characterMatchers.offerLast(EndOfLineMatcher.INSTANCE);
+            } else {
+                characterMatchers.offerLast(EndOfSegmentMatcher.INSTANCE);
+            }
         }
-        firstSeparator = position;
-      }
-    }
 
-    if (!patternContainsSlashes || firstSeparator < 0 || firstSeparator == position - 1) {
-      return null;
-    }
-    return new String(c, prefixStart, position - prefixStart);
-  }
-
-  private boolean consumeDoubleAsterisk() {
-    int position = offset;
-
-    if (c[offset] == '/') {
-      // consuming first '/'
-      position++;
-    } else if (position > 0 && c[position - 1] != '!') {
-      // pattern does not start with a '/', valid alternatives are beginning of the string or '!'
-      return false;
-    }
+        if (!patternContainsSlashes) {
+            // pattern does not have to match the beginning of the string
+            characterMatchers.offerFirst(DoubleAsteriskMatcher.INSTANCE);
+        }
 
-    if (position == c.length || c[position++] != '*') {
-      // failed to consume first '*'
-      return false;
+        return new CompositeMatcher(characterMatchers.toArray(new Matcher[0]));
     }
-    if (position == c.length || c[position++] != '*') {
-      // failed to consume second '*'
-      return false;
+
+    private @Nullable String parseIndexKey() {
+        // Index by the first two fixed path segments; patterns without a safe prefix stay linear.
+        int position = offset;
+        int patternEnd = position;
+        while (patternEnd < c.length && !isPatternTerminator(c[patternEnd])) {
+            patternEnd++;
+        }
+        // Trailing-slash matchers can match beyond a segment boundary, making their prefix unsafe.
+        if (patternEnd > position && c[patternEnd - 1] == '/') {
+            return null;
+        }
+        boolean patternContainsSlashes = c[position] == '/';
+        if (patternContainsSlashes) {
+            position++;
+        }
+        int prefixStart = position;
+        int firstSeparator = -1;
+        for (; position < c.length && !isPatternTerminator(c[position]); position++) {
+            char character = c[position];
+            if (character == '*' || character == '?' || character == '[') {
+                return null;
+            }
+            if (character == '\\') {
+                return null;
+            }
+            if (character == '/') {
+                patternContainsSlashes = true;
+                if (firstSeparator >= 0) {
+                    return new String(c, prefixStart, position - prefixStart);
+                }
+                firstSeparator = position;
+            }
+        }
+
+        if (!patternContainsSlashes || firstSeparator < 0 || firstSeparator == position - 1) {
+            return null;
+        }
+        return new String(c, prefixStart, position - prefixStart);
     }
 
-    if (position == c.length || isPatternTerminator(c[position])) {
-      // there is no last '/', releasing last character
-      offset = position - 1;
-      return true;
+    private boolean consumeDoubleAsterisk() {
+        int position = offset;
 
-    } else if (c[position] == '/') {
-      // consuming last '/'
-      offset = position;
-      return true;
+        if (c[offset] == '/') {
+            // consuming first '/'
+            position++;
+        } else if (position > 0 && c[position - 1] != '!') {
+            // pattern does not start with a '/', valid alternatives are beginning of the string or '!'
+            return false;
+        }
 
-    } else {
-      return false;
-    }
-  }
+        if (position == c.length || c[position++] != '*') {
+            // failed to consume first '*'
+            return false;
+        }
+        if (position == c.length || c[position++] != '*') {
+            // failed to consume second '*'
+            return false;
+        }
 
-  private boolean isPatternTerminator(char c) {
-    return c == '#' || Character.isWhitespace(c);
-  }
+        if (position == c.length || isPatternTerminator(c[position])) {
+            // there is no last '/', releasing last character
+            offset = position - 1;
+            return true;
 
-  private Matcher parseRangeCharacterMatcher() {
-    offset++; // consume opening '['
+        } else if (c[position] == '/') {
+            // consuming last '/'
+            offset = position;
+            return true;
 
-    Collection<RangeMatcher.Range> ranges = new ArrayList<>();
-    for (; offset < c.length; offset++) {
-      if (c[offset] == ']') {
-        if (!ranges.isEmpty()) {
-          return new RangeMatcher(ranges.toArray(new RangeMatcher.Range[0]));
         } else {
-          throw new IllegalArgumentException("Empty character range");
+            return false;
         }
+    }
 
-      } else {
-        ranges.add(parseRange());
-      }
+    private boolean isPatternTerminator(char c) {
+        return c == '#' || Character.isWhitespace(c);
     }
-    throw new IllegalArgumentException("Unterminated character range");
-  }
 
-  private RangeMatcher.Range parseRange() {
-    if (offset + 2 >= c.length) {
-      throw new IllegalArgumentException("Unterminated character range");
+    private Matcher parseRangeCharacterMatcher() {
+        offset++; // consume opening '['
+
+        Collection<RangeMatcher.Range> ranges = new ArrayList<>();
+        for (; offset < c.length; offset++) {
+            if (c[offset] == ']') {
+                if (!ranges.isEmpty()) {
+                    return new RangeMatcher(ranges.toArray(new RangeMatcher.Range[0]));
+                } else {
+                    throw new IllegalArgumentException("Empty character range");
+                }
+
+            } else {
+                ranges.add(parseRange());
+            }
+        }
+        throw new IllegalArgumentException("Unterminated character range");
     }
-    if (c[offset + 1] != '-') {
-      throw new IllegalArgumentException("Malformed character range");
+
+    private RangeMatcher.Range parseRange() {
+        if (offset + 2 >= c.length) {
+            throw new IllegalArgumentException("Unterminated character range");
+        }
+        if (c[offset + 1] != '-') {
+            throw new IllegalArgumentException("Malformed character range");
+        }
+        offset += 2;
+        return new RangeMatcher.Range(c[offset - 2], c[offset]);
     }
-    offset += 2;
-    return new RangeMatcher.Range(c[offset - 2], c[offset]);
-  }
-
-  private Collection<String> parseOwners() {
-    Collection<String> owners = new ArrayList<>();
-    for (; offset < c.length; offset++) {
-      // skip whitespace until the next token
-      while (offset < c.length && Character.isWhitespace(c[offset])) {
-        offset++;
-      }
-
-      if (offset == c.length || c[offset] == '#') {
-        break; // anything that goes after # is a comment, stop parsing
-      }
-
-      int ownerIdx = offset;
-      while (ownerIdx < c.length && !isPatternTerminator(c[ownerIdx])) {
-        ownerIdx++;
-      }
-      owners.add(new String(c, offset, ownerIdx - offset));
-      offset = ownerIdx;
+
+    private Collection<String> parseOwners() {
+        Collection<String> owners = new ArrayList<>();
+        for (; offset < c.length; offset++) {
+            // skip whitespace until the next token
+            while (offset < c.length && Character.isWhitespace(c[offset])) {
+                offset++;
+            }
+
+            if (offset == c.length || c[offset] == '#') {
+                break; // anything that goes after # is a comment, stop parsing
+            }
+
+            int ownerIdx = offset;
+            while (ownerIdx < c.length && !isPatternTerminator(c[ownerIdx])) {
+                ownerIdx++;
+            }
+            owners.add(new String(c, offset, ownerIdx - offset));
+            offset = ownerIdx;
+        }
+        return owners;
     }
-    return owners;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/EntryIndex.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/EntryIndex.java
index c7fabdc1dce..1e03e419f4a 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/EntryIndex.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/EntryIndex.java
@@ -13,93 +13,92 @@
  */
 final class EntryIndex {
 
-  private static final int MIN_INDEX_SIZE = 512;
+    private static final int MIN_INDEX_SIZE = 512;
 
-  private List<IndexedEntry> entries = new ArrayList<>();
-  private Map<String, List<IndexedEntry>> entriesByKey;
-  private List<IndexedEntry> unindexedEntries;
-  private int indexableEntryCount;
+    private List<IndexedEntry> entries = new ArrayList<>();
+    private Map<String, List<IndexedEntry>> entriesByKey;
+    private List<IndexedEntry> unindexedEntries;
+    private int indexableEntryCount;
 
-  void add(Entry entry, int order) {
-    IndexedEntry indexedEntry = new IndexedEntry(entry, order);
-    if (entriesByKey != null) {
-      index(indexedEntry);
-    } else {
-      entries.add(indexedEntry);
-      if (entry.getIndexKey() != null) {
-        indexableEntryCount++;
-      }
-      if (entries.size() >= MIN_INDEX_SIZE && indexableEntryCount * 2 >= entries.size()) {
-        entriesByKey = new HashMap<>();
-        unindexedEntries = new ArrayList<>();
-        for (IndexedEntry existingEntry : entries) {
-          index(existingEntry);
+    void add(Entry entry, int order) {
+        IndexedEntry indexedEntry = new IndexedEntry(entry, order);
+        if (entriesByKey != null) {
+            index(indexedEntry);
+        } else {
+            entries.add(indexedEntry);
+            if (entry.getIndexKey() != null) {
+                indexableEntryCount++;
+            }
+            if (entries.size() >= MIN_INDEX_SIZE && indexableEntryCount * 2 >= entries.size()) {
+                entriesByKey = new HashMap<>();
+                unindexedEntries = new ArrayList<>();
+                for (IndexedEntry existingEntry : entries) {
+                    index(existingEntry);
+                }
+                entries = Collections.emptyList();
+            }
         }
-        entries = Collections.emptyList();
-      }
     }
-  }
 
-  @Nullable
-  Entry find(String path) {
-    IndexedEntry entry = findIndexedEntry(path);
-    return entry != null ? entry.entry : null;
-  }
-
-  private @Nullable IndexedEntry findIndexedEntry(String path) {
-    if (entriesByKey == null) {
-      return findFirstMatch(entries, path);
+    @Nullable
+    Entry find(String path) {
+        IndexedEntry entry = findIndexedEntry(path);
+        return entry != null ? entry.entry : null;
     }
-    IndexedEntry unindexedMatch = findFirstMatch(unindexedEntries, path);
 
-    int firstSeparator = path.indexOf('/');
-    if (firstSeparator < 0) {
-      return unindexedMatch;
-    }
-    int secondSeparator = path.indexOf('/', firstSeparator + 1);
-    int keyEnd = secondSeparator >= 0 ? secondSeparator : path.length();
-    List<IndexedEntry> indexedEntries = entriesByKey.get(path.substring(0, keyEnd));
-    IndexedEntry indexedMatch = findFirstMatch(indexedEntries, path);
+    private @Nullable IndexedEntry findIndexedEntry(String path) {
+        if (entriesByKey == null) {
+            return findFirstMatch(entries, path);
+        }
+        IndexedEntry unindexedMatch = findFirstMatch(unindexedEntries, path);
 
-    if (unindexedMatch == null) {
-      return indexedMatch;
-    }
-    if (indexedMatch == null) {
-      return unindexedMatch;
+        int firstSeparator = path.indexOf('/');
+        if (firstSeparator < 0) {
+            return unindexedMatch;
+        }
+        int secondSeparator = path.indexOf('/', firstSeparator + 1);
+        int keyEnd = secondSeparator >= 0 ? secondSeparator : path.length();
+        List<IndexedEntry> indexedEntries = entriesByKey.get(path.substring(0, keyEnd));
+        IndexedEntry indexedMatch = findFirstMatch(indexedEntries, path);
+
+        if (unindexedMatch == null) {
+            return indexedMatch;
+        }
+        if (indexedMatch == null) {
+            return unindexedMatch;
+        }
+        return indexedMatch.order > unindexedMatch.order ? indexedMatch : unindexedMatch;
     }
-    return indexedMatch.order > unindexedMatch.order ? indexedMatch : unindexedMatch;
-  }
 
-  private void index(IndexedEntry indexedEntry) {
-    String indexKey = indexedEntry.entry.getIndexKey();
-    if (indexKey != null) {
-      entriesByKey.computeIfAbsent(indexKey, key -> new ArrayList<>()).add(indexedEntry);
-    } else {
-      unindexedEntries.add(indexedEntry);
+    private void index(IndexedEntry indexedEntry) {
+        String indexKey = indexedEntry.entry.getIndexKey();
+        if (indexKey != null) {
+            entriesByKey.computeIfAbsent(indexKey, key -> new ArrayList<>()).add(indexedEntry);
+        } else {
+            unindexedEntries.add(indexedEntry);
+        }
     }
-  }
 
-  private static @Nullable IndexedEntry findFirstMatch(
-      @Nullable List<IndexedEntry> entries, String path) {
-    if (entries != null) {
-      for (int i = entries.size() - 1; i >= 0; i--) {
-        IndexedEntry entry = entries.get(i);
-        if (entry.entry.getMatcher().consume(path, 0) >= 0) {
-          return entry;
+    private static @Nullable IndexedEntry findFirstMatch(@Nullable List<IndexedEntry> entries, String path) {
+        if (entries != null) {
+            for (int i = entries.size() - 1; i >= 0; i--) {
+                IndexedEntry entry = entries.get(i);
+                if (entry.entry.getMatcher().consume(path, 0) >= 0) {
+                    return entry;
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
 
-  private static final class IndexedEntry {
+    private static final class IndexedEntry {
 
-    private final Entry entry;
-    private final int order;
+        private final Entry entry;
+        private final int order;
 
-    private IndexedEntry(Entry entry, int order) {
-      this.entry = entry;
-      this.order = order;
+        private IndexedEntry(Entry entry, int order) {
+            this.entry = entry;
+            this.order = order;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/NoCodeowners.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/NoCodeowners.java
index e0b20a4d2ee..9698c557c40 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/NoCodeowners.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/NoCodeowners.java
@@ -6,18 +6,18 @@
 
 public class NoCodeowners implements Codeowners {
 
-  public static final Codeowners INSTANCE = new NoCodeowners();
+    public static final Codeowners INSTANCE = new NoCodeowners();
 
-  private NoCodeowners() {}
+    private NoCodeowners() {}
 
-  @Nullable
-  @Override
-  public Collection<String> getOwners(@Nonnull String path) {
-    return null;
-  }
+    @Nullable
+    @Override
+    public Collection<String> getOwners(@Nonnull String path) {
+        return null;
+    }
 
-  @Override
-  public boolean exist() {
-    return false;
-  }
+    @Override
+    public boolean exist() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/Section.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/Section.java
index 21629317c05..b8d14bf78d8 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/Section.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/Section.java
@@ -5,24 +5,24 @@
 /** Groups ownership and exclusion rules for a CODEOWNERS section while preserving rule order. */
 final class Section {
 
-  private final EntryIndex entries = new EntryIndex();
-  private final EntryIndex exclusions = new EntryIndex();
-  private int entryOrder;
+    private final EntryIndex entries = new EntryIndex();
+    private final EntryIndex exclusions = new EntryIndex();
+    private int entryOrder;
 
-  void add(Entry entry) {
-    if (entry.isExclusion()) {
-      exclusions.add(entry, entryOrder++);
-    } else {
-      entries.add(entry, entryOrder++);
+    void add(Entry entry) {
+        if (entry.isExclusion()) {
+            exclusions.add(entry, entryOrder++);
+        } else {
+            entries.add(entry, entryOrder++);
+        }
     }
-  }
 
-  boolean isExcluded(String path) {
-    return exclusions.find(path) != null;
-  }
+    boolean isExcluded(String path) {
+        return exclusions.find(path) != null;
+    }
 
-  @Nullable
-  Entry findMatchingEntry(String path) {
-    return entries.find(path);
-  }
+    @Nullable
+    Entry findMatchingEntry(String path) {
+        return entries.find(path);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/SectionHeader.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/SectionHeader.java
index 1e45b01ecc6..3177c9499e5 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/SectionHeader.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/SectionHeader.java
@@ -9,19 +9,19 @@
  */
 public class SectionHeader {
 
-  private final String name;
-  private final Collection<String> defaultOwners;
+    private final String name;
+    private final Collection<String> defaultOwners;
 
-  public SectionHeader(String name, Collection<String> defaultOwners) {
-    this.name = name;
-    this.defaultOwners = defaultOwners;
-  }
+    public SectionHeader(String name, Collection<String> defaultOwners) {
+        this.name = name;
+        this.defaultOwners = defaultOwners;
+    }
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 
-  public Collection<String> getDefaultOwners() {
-    return defaultOwners;
-  }
+    public Collection<String> getDefaultOwners() {
+        return defaultOwners;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/AsteriskMatcher.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/AsteriskMatcher.java
index 56fc1a0d782..880a8bf5a89 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/AsteriskMatcher.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/AsteriskMatcher.java
@@ -2,17 +2,17 @@
 
 public class AsteriskMatcher implements Matcher {
 
-  public static final Matcher INSTANCE = new AsteriskMatcher();
+    public static final Matcher INSTANCE = new AsteriskMatcher();
 
-  private AsteriskMatcher() {}
+    private AsteriskMatcher() {}
 
-  @Override
-  public int consume(String line, int offset) {
-    return offset < line.length() && line.charAt(offset) != '/' ? 1 : -1;
-  }
+    @Override
+    public int consume(String line, int offset) {
+        return offset < line.length() && line.charAt(offset) != '/' ? 1 : -1;
+    }
 
-  @Override
-  public boolean multi() {
-    return true;
-  }
+    @Override
+    public boolean multi() {
+        return true;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/CharacterMatcher.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/CharacterMatcher.java
index 60116701956..b10d7b93420 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/CharacterMatcher.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/CharacterMatcher.java
@@ -5,27 +5,27 @@
 
 public class CharacterMatcher implements Matcher {
 
-  private final char character;
+    private final char character;
 
-  private CharacterMatcher(char character) {
-    this.character = character;
-  }
+    private CharacterMatcher(char character) {
+        this.character = character;
+    }
 
-  @Override
-  public int consume(String line, int offset) {
-    return offset < line.length() && line.charAt(offset) == character ? 1 : -1;
-  }
+    @Override
+    public int consume(String line, int offset) {
+        return offset < line.length() && line.charAt(offset) == character ? 1 : -1;
+    }
 
-  @Override
-  public boolean multi() {
-    return false;
-  }
+    @Override
+    public boolean multi() {
+        return false;
+    }
 
-  public static final class Factory {
-    private final Map<Character, CharacterMatcher> canonical = new HashMap<>();
+    public static final class Factory {
+        private final Map<Character, CharacterMatcher> canonical = new HashMap<>();
 
-    public Matcher create(char c) {
-      return canonical.computeIfAbsent(c, CharacterMatcher::new);
+        public Matcher create(char c) {
+            return canonical.computeIfAbsent(c, CharacterMatcher::new);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/CompositeMatcher.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/CompositeMatcher.java
index 229ffc9b424..cc38a173c22 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/CompositeMatcher.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/CompositeMatcher.java
@@ -2,44 +2,44 @@
 
 public class CompositeMatcher implements Matcher {
 
-  private final Matcher[] delegates;
-
-  public CompositeMatcher(Matcher[] delegates) {
-    this.delegates = delegates;
-  }
-
-  @Override
-  public int consume(String line, int offset) {
-    return consume(line, offset, 0);
-  }
-
-  private int consume(String line, int offset, int matcherOffset) {
-    int position = offset;
-    while (matcherOffset < delegates.length) {
-      Matcher delegate = delegates[matcherOffset];
-      if (delegate.multi()) {
-        int consumed = consume(line, position, matcherOffset + 1);
-        if (consumed >= 0) {
-          return position - offset + consumed;
+    private final Matcher[] delegates;
+
+    public CompositeMatcher(Matcher[] delegates) {
+        this.delegates = delegates;
+    }
+
+    @Override
+    public int consume(String line, int offset) {
+        return consume(line, offset, 0);
+    }
+
+    private int consume(String line, int offset, int matcherOffset) {
+        int position = offset;
+        while (matcherOffset < delegates.length) {
+            Matcher delegate = delegates[matcherOffset];
+            if (delegate.multi()) {
+                int consumed = consume(line, position, matcherOffset + 1);
+                if (consumed >= 0) {
+                    return position - offset + consumed;
+                }
+            }
+
+            int consumed = delegate.consume(line, position);
+            if (consumed < 0) {
+                return consumed;
+            } else {
+                position += consumed;
+            }
+
+            if (!delegate.multi()) {
+                matcherOffset++;
+            }
         }
-      }
-
-      int consumed = delegate.consume(line, position);
-      if (consumed < 0) {
-        return consumed;
-      } else {
-        position += consumed;
-      }
-
-      if (!delegate.multi()) {
-        matcherOffset++;
-      }
+        return position - offset;
     }
-    return position - offset;
-  }
 
-  @Override
-  public boolean multi() {
-    return false;
-  }
+    @Override
+    public boolean multi() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/DoubleAsteriskMatcher.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/DoubleAsteriskMatcher.java
index dbbdada0eed..1b1fa27b503 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/DoubleAsteriskMatcher.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/DoubleAsteriskMatcher.java
@@ -2,23 +2,23 @@
 
 public class DoubleAsteriskMatcher implements Matcher {
 
-  public static final Matcher INSTANCE = new DoubleAsteriskMatcher();
+    public static final Matcher INSTANCE = new DoubleAsteriskMatcher();
 
-  private DoubleAsteriskMatcher() {}
+    private DoubleAsteriskMatcher() {}
 
-  @Override
-  public int consume(String line, int offset) {
-    if (offset == line.length()) {
-      return -1;
-    }
+    @Override
+    public int consume(String line, int offset) {
+        if (offset == line.length()) {
+            return -1;
+        }
 
-    int position = offset;
-    while (position < line.length() && line.charAt(position++) != '/') {}
-    return position - offset;
-  }
+        int position = offset;
+        while (position < line.length() && line.charAt(position++) != '/') {}
+        return position - offset;
+    }
 
-  @Override
-  public boolean multi() {
-    return true;
-  }
+    @Override
+    public boolean multi() {
+        return true;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/EndOfLineMatcher.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/EndOfLineMatcher.java
index 9d57b34eaeb..10ff11ef924 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/EndOfLineMatcher.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/EndOfLineMatcher.java
@@ -2,15 +2,15 @@
 
 public class EndOfLineMatcher implements Matcher {
 
-  public static final Matcher INSTANCE = new EndOfLineMatcher();
+    public static final Matcher INSTANCE = new EndOfLineMatcher();
 
-  @Override
-  public int consume(String line, int offset) {
-    return offset == line.length() ? 0 : -1;
-  }
+    @Override
+    public int consume(String line, int offset) {
+        return offset == line.length() ? 0 : -1;
+    }
 
-  @Override
-  public boolean multi() {
-    return false;
-  }
+    @Override
+    public boolean multi() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/EndOfSegmentMatcher.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/EndOfSegmentMatcher.java
index faf8ae05315..923251d9e34 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/EndOfSegmentMatcher.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/EndOfSegmentMatcher.java
@@ -2,15 +2,15 @@
 
 public class EndOfSegmentMatcher implements Matcher {
 
-  public static final Matcher INSTANCE = new EndOfSegmentMatcher();
+    public static final Matcher INSTANCE = new EndOfSegmentMatcher();
 
-  @Override
-  public int consume(String line, int offset) {
-    return offset == line.length() || line.charAt(offset) == '/' ? 0 : -1;
-  }
+    @Override
+    public int consume(String line, int offset) {
+        return offset == line.length() || line.charAt(offset) == '/' ? 0 : -1;
+    }
 
-  @Override
-  public boolean multi() {
-    return false;
-  }
+    @Override
+    public boolean multi() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/Matcher.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/Matcher.java
index abc1293d024..5b1addfd8eb 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/Matcher.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/Matcher.java
@@ -2,15 +2,15 @@
 
 public interface Matcher {
 
-  /**
-   * @return the number of characters matched from the line starting with the offset. Negative value
-   *     means matching failed
-   */
-  int consume(String line, int offset);
+    /**
+     * @return the number of characters matched from the line starting with the offset. Negative value
+     *     means matching failed
+     */
+    int consume(String line, int offset);
 
-  /**
-   * @return {@code true} if this matcher can be used [0..*] times. {@code false} if the matcher
-   *     should be used exactly once
-   */
-  boolean multi();
+    /**
+     * @return {@code true} if this matcher can be used [0..*] times. {@code false} if the matcher
+     *     should be used exactly once
+     */
+    boolean multi();
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/QuestionMarkMatcher.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/QuestionMarkMatcher.java
index 53412624ebd..5d80e221807 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/QuestionMarkMatcher.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/QuestionMarkMatcher.java
@@ -2,17 +2,17 @@
 
 public class QuestionMarkMatcher implements Matcher {
 
-  public static final Matcher INSTANCE = new QuestionMarkMatcher();
+    public static final Matcher INSTANCE = new QuestionMarkMatcher();
 
-  private QuestionMarkMatcher() {}
+    private QuestionMarkMatcher() {}
 
-  @Override
-  public int consume(String line, int offset) {
-    return offset < line.length() && line.charAt(offset) != '/' ? 1 : -1;
-  }
+    @Override
+    public int consume(String line, int offset) {
+        return offset < line.length() && line.charAt(offset) != '/' ? 1 : -1;
+    }
 
-  @Override
-  public boolean multi() {
-    return false;
-  }
+    @Override
+    public boolean multi() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/RangeMatcher.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/RangeMatcher.java
index a2e44bd4f19..31f6b874802 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/RangeMatcher.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/matcher/RangeMatcher.java
@@ -2,43 +2,43 @@
 
 public class RangeMatcher implements Matcher {
 
-  public static final class Range {
-    private final char from;
-    private final char to;
-
-    public Range(char from, char to) {
-      if (to < from) {
-        throw new IllegalArgumentException("Range is invalid: [" + from + "-" + to + "]");
-      }
-      this.from = from;
-      this.to = to;
-    }
+    public static final class Range {
+        private final char from;
+        private final char to;
+
+        public Range(char from, char to) {
+            if (to < from) {
+                throw new IllegalArgumentException("Range is invalid: [" + from + "-" + to + "]");
+            }
+            this.from = from;
+            this.to = to;
+        }
 
-    boolean matches(char c) {
-      return c >= from && c <= to;
+        boolean matches(char c) {
+            return c >= from && c <= to;
+        }
     }
-  }
 
-  private final Range[] ranges;
+    private final Range[] ranges;
 
-  public RangeMatcher(Range... ranges) {
-    this.ranges = ranges;
-  }
+    public RangeMatcher(Range... ranges) {
+        this.ranges = ranges;
+    }
 
-  @Override
-  public int consume(String line, int offset) {
-    if (offset < line.length()) {
-      for (Range range : ranges) {
-        if (range.matches(line.charAt(offset))) {
-          return 1;
+    @Override
+    public int consume(String line, int offset) {
+        if (offset < line.length()) {
+            for (Range range : ranges) {
+                if (range.matches(line.charAt(offset))) {
+                    return 1;
+                }
+            }
         }
-      }
+        return -1;
     }
-    return -1;
-  }
 
-  @Override
-  public boolean multi() {
-    return false;
-  }
+    @Override
+    public boolean multi() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/communication/TelemetryListener.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/communication/TelemetryListener.java
index db6b0215bfa..547290d1537 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/communication/TelemetryListener.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/communication/TelemetryListener.java
@@ -15,135 +15,133 @@
 
 public class TelemetryListener extends OkHttpUtils.CustomListener {
 
-  private static final String CONTENT_ENCODING_HEADER = "Content-Encoding";
-  private static final String GZIP_ENCODING = "gzip";
-
-  private final CiVisibilityMetricCollector metricCollector;
-  private final @Nullable CiVisibilityCountMetric requestCountMetric;
-  private final @Nullable CiVisibilityCountMetric requestErrorsMetric;
-  private final @Nullable CiVisibilityDistributionMetric requestBytesMetric;
-  private final @Nullable CiVisibilityDistributionMetric requestDurationMetric;
-  private final @Nullable CiVisibilityDistributionMetric responseBytesMetric;
-  private long callStartTimestamp;
-  private boolean responseCompressed;
-
-  private TelemetryListener(
-      CiVisibilityMetricCollector metricCollector,
-      @Nullable CiVisibilityCountMetric requestCountMetric,
-      @Nullable CiVisibilityCountMetric requestErrorsMetric,
-      @Nullable CiVisibilityDistributionMetric requestBytesMetric,
-      @Nullable CiVisibilityDistributionMetric requestDurationMetric,
-      @Nullable CiVisibilityDistributionMetric responseBytesMetric) {
-    this.metricCollector = metricCollector;
-    this.requestCountMetric = requestCountMetric;
-    this.requestErrorsMetric = requestErrorsMetric;
-    this.requestBytesMetric = requestBytesMetric;
-    this.requestDurationMetric = requestDurationMetric;
-    this.responseBytesMetric = responseBytesMetric;
-  }
-
-  public void callStart(Call call) {
-    callStartTimestamp = System.currentTimeMillis();
-    if (requestCountMetric != null) {
-      metricCollector.add(
-          requestCountMetric,
-          1,
-          GZIP_ENCODING.equalsIgnoreCase(call.request().header(CONTENT_ENCODING_HEADER))
-              ? RequestCompressed.TRUE
-              : null);
-    }
-  }
-
-  public void requestBodyEnd(Call call, long byteCount) {
-    if (requestBytesMetric != null) {
-      metricCollector.add(requestBytesMetric, (int) byteCount);
-    }
-  }
-
-  public void responseHeadersEnd(Call call, Response response) {
-    if (requestErrorsMetric != null) {
-      if (!response.isSuccessful()) {
-        int responseCode = response.code();
-        metricCollector.add(
-            requestErrorsMetric, 1, ErrorType.from(responseCode), StatusCode.from(responseCode));
-      }
-    }
-    responseCompressed = GZIP_ENCODING.equalsIgnoreCase(response.header(CONTENT_ENCODING_HEADER));
-  }
-
-  @Override
-  public void responseBodyEnd(Call call, long byteCount) {
-    if (responseBytesMetric != null) {
-      metricCollector.add(
-          responseBytesMetric,
-          (int) byteCount,
-          responseCompressed ? ResponseCompressed.TRUE : null);
-    }
-  }
+    private static final String CONTENT_ENCODING_HEADER = "Content-Encoding";
+    private static final String GZIP_ENCODING = "gzip";
 
-  public void callEnd(Call call) {
-    if (requestDurationMetric != null) {
-      int durationMillis = (int) (System.currentTimeMillis() - callStartTimestamp);
-      metricCollector.add(requestDurationMetric, durationMillis);
+    private final CiVisibilityMetricCollector metricCollector;
+    private final @Nullable CiVisibilityCountMetric requestCountMetric;
+    private final @Nullable CiVisibilityCountMetric requestErrorsMetric;
+    private final @Nullable CiVisibilityDistributionMetric requestBytesMetric;
+    private final @Nullable CiVisibilityDistributionMetric requestDurationMetric;
+    private final @Nullable CiVisibilityDistributionMetric responseBytesMetric;
+    private long callStartTimestamp;
+    private boolean responseCompressed;
+
+    private TelemetryListener(
+            CiVisibilityMetricCollector metricCollector,
+            @Nullable CiVisibilityCountMetric requestCountMetric,
+            @Nullable CiVisibilityCountMetric requestErrorsMetric,
+            @Nullable CiVisibilityDistributionMetric requestBytesMetric,
+            @Nullable CiVisibilityDistributionMetric requestDurationMetric,
+            @Nullable CiVisibilityDistributionMetric responseBytesMetric) {
+        this.metricCollector = metricCollector;
+        this.requestCountMetric = requestCountMetric;
+        this.requestErrorsMetric = requestErrorsMetric;
+        this.requestBytesMetric = requestBytesMetric;
+        this.requestDurationMetric = requestDurationMetric;
+        this.responseBytesMetric = responseBytesMetric;
     }
-  }
 
-  public void callFailed(Call call, IOException ioe) {
-    if (requestDurationMetric != null) {
-      int durationMillis = (int) (System.currentTimeMillis() - callStartTimestamp);
-      metricCollector.add(requestDurationMetric, durationMillis);
+    public void callStart(Call call) {
+        callStartTimestamp = System.currentTimeMillis();
+        if (requestCountMetric != null) {
+            metricCollector.add(
+                    requestCountMetric,
+                    1,
+                    GZIP_ENCODING.equalsIgnoreCase(call.request().header(CONTENT_ENCODING_HEADER))
+                            ? RequestCompressed.TRUE
+                            : null);
+        }
     }
 
-    if (requestErrorsMetric != null) {
-      metricCollector.add(requestErrorsMetric, 1, ErrorType.NETWORK);
+    public void requestBodyEnd(Call call, long byteCount) {
+        if (requestBytesMetric != null) {
+            metricCollector.add(requestBytesMetric, (int) byteCount);
+        }
     }
-  }
 
-  public static final class Builder {
-    private final CiVisibilityMetricCollector metricCollector;
-    private @Nullable CiVisibilityCountMetric requestCountMetric;
-    private @Nullable CiVisibilityCountMetric requestErrorsMetric;
-    private @Nullable CiVisibilityDistributionMetric requestBytesMetric;
-    private @Nullable CiVisibilityDistributionMetric requestDurationMetric;
-    private @Nullable CiVisibilityDistributionMetric responseBytesMetric;
-
-    public Builder(CiVisibilityMetricCollector metricCollector) {
-      this.metricCollector = metricCollector;
+    public void responseHeadersEnd(Call call, Response response) {
+        if (requestErrorsMetric != null) {
+            if (!response.isSuccessful()) {
+                int responseCode = response.code();
+                metricCollector.add(
+                        requestErrorsMetric, 1, ErrorType.from(responseCode), StatusCode.from(responseCode));
+            }
+        }
+        responseCompressed = GZIP_ENCODING.equalsIgnoreCase(response.header(CONTENT_ENCODING_HEADER));
     }
 
-    public Builder requestCount(@Nullable CiVisibilityCountMetric requestCountMetric) {
-      this.requestCountMetric = requestCountMetric;
-      return this;
+    @Override
+    public void responseBodyEnd(Call call, long byteCount) {
+        if (responseBytesMetric != null) {
+            metricCollector.add(
+                    responseBytesMetric, (int) byteCount, responseCompressed ? ResponseCompressed.TRUE : null);
+        }
     }
 
-    public Builder requestErrors(@Nullable CiVisibilityCountMetric requestErrorsMetric) {
-      this.requestErrorsMetric = requestErrorsMetric;
-      return this;
+    public void callEnd(Call call) {
+        if (requestDurationMetric != null) {
+            int durationMillis = (int) (System.currentTimeMillis() - callStartTimestamp);
+            metricCollector.add(requestDurationMetric, durationMillis);
+        }
     }
 
-    public Builder requestBytes(@Nullable CiVisibilityDistributionMetric requestBytesMetric) {
-      this.requestBytesMetric = requestBytesMetric;
-      return this;
-    }
-
-    public Builder requestDuration(@Nullable CiVisibilityDistributionMetric requestDurationMetric) {
-      this.requestDurationMetric = requestDurationMetric;
-      return this;
-    }
+    public void callFailed(Call call, IOException ioe) {
+        if (requestDurationMetric != null) {
+            int durationMillis = (int) (System.currentTimeMillis() - callStartTimestamp);
+            metricCollector.add(requestDurationMetric, durationMillis);
+        }
 
-    public Builder responseBytes(@Nullable CiVisibilityDistributionMetric responseBytesMetric) {
-      this.responseBytesMetric = responseBytesMetric;
-      return this;
+        if (requestErrorsMetric != null) {
+            metricCollector.add(requestErrorsMetric, 1, ErrorType.NETWORK);
+        }
     }
 
-    public OkHttpUtils.CustomListener build() {
-      return new TelemetryListener(
-          metricCollector,
-          requestCountMetric,
-          requestErrorsMetric,
-          requestBytesMetric,
-          requestDurationMetric,
-          responseBytesMetric);
+    public static final class Builder {
+        private final CiVisibilityMetricCollector metricCollector;
+        private @Nullable CiVisibilityCountMetric requestCountMetric;
+        private @Nullable CiVisibilityCountMetric requestErrorsMetric;
+        private @Nullable CiVisibilityDistributionMetric requestBytesMetric;
+        private @Nullable CiVisibilityDistributionMetric requestDurationMetric;
+        private @Nullable CiVisibilityDistributionMetric responseBytesMetric;
+
+        public Builder(CiVisibilityMetricCollector metricCollector) {
+            this.metricCollector = metricCollector;
+        }
+
+        public Builder requestCount(@Nullable CiVisibilityCountMetric requestCountMetric) {
+            this.requestCountMetric = requestCountMetric;
+            return this;
+        }
+
+        public Builder requestErrors(@Nullable CiVisibilityCountMetric requestErrorsMetric) {
+            this.requestErrorsMetric = requestErrorsMetric;
+            return this;
+        }
+
+        public Builder requestBytes(@Nullable CiVisibilityDistributionMetric requestBytesMetric) {
+            this.requestBytesMetric = requestBytesMetric;
+            return this;
+        }
+
+        public Builder requestDuration(@Nullable CiVisibilityDistributionMetric requestDurationMetric) {
+            this.requestDurationMetric = requestDurationMetric;
+            return this;
+        }
+
+        public Builder responseBytes(@Nullable CiVisibilityDistributionMetric responseBytesMetric) {
+            this.responseBytesMetric = responseBytesMetric;
+            return this;
+        }
+
+        public OkHttpUtils.CustomListener build() {
+            return new TelemetryListener(
+                    metricCollector,
+                    requestCountMetric,
+                    requestErrorsMetric,
+                    requestBytesMetric,
+                    requestDurationMetric,
+                    responseBytesMetric);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/compiler/CompilerModuleExporter.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/compiler/CompilerModuleExporter.java
index 31344f9b298..30618c3973a 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/compiler/CompilerModuleExporter.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/compiler/CompilerModuleExporter.java
@@ -21,45 +21,44 @@
  */
 public class CompilerModuleExporter implements ClassFileTransformer {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(CompilerModuleExporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CompilerModuleExporter.class);
 
-  private static final String COMPILER_PLUGIN_CLASS_PREFIX = "datadog/compiler/";
-  private static final String[] COMPILER_PACKAGES = {
-    "com.sun.tools.javac.api",
-    "com.sun.tools.javac.code",
-    "com.sun.tools.javac.comp",
-    "com.sun.tools.javac.tree",
-    "com.sun.tools.javac.util"
-  };
+    private static final String COMPILER_PLUGIN_CLASS_PREFIX = "datadog/compiler/";
+    private static final String[] COMPILER_PACKAGES = {
+        "com.sun.tools.javac.api",
+        "com.sun.tools.javac.code",
+        "com.sun.tools.javac.comp",
+        "com.sun.tools.javac.tree",
+        "com.sun.tools.javac.util"
+    };
 
-  private final Instrumentation inst;
-  private final ConcurrentHashMap<ClassLoader, Boolean> exportedClassLoaders =
-      new ConcurrentHashMap<>();
+    private final Instrumentation inst;
+    private final ConcurrentHashMap<ClassLoader, Boolean> exportedClassLoaders = new ConcurrentHashMap<>();
 
-  public CompilerModuleExporter(Instrumentation inst) {
-    this.inst = inst;
-  }
+    public CompilerModuleExporter(Instrumentation inst) {
+        this.inst = inst;
+    }
 
-  @Override
-  public byte[] transform(
-      ClassLoader loader,
-      String className,
-      Class<?> classBeingRedefined,
-      ProtectionDomain protectionDomain,
-      byte[] classfileBuffer) {
-    if (loader != null && className != null && className.startsWith(COMPILER_PLUGIN_CLASS_PREFIX)) {
-      exportedClassLoaders.computeIfAbsent(loader, this::exportJdkCompilerModule);
+    @Override
+    public byte[] transform(
+            ClassLoader loader,
+            String className,
+            Class<?> classBeingRedefined,
+            ProtectionDomain protectionDomain,
+            byte[] classfileBuffer) {
+        if (loader != null && className != null && className.startsWith(COMPILER_PLUGIN_CLASS_PREFIX)) {
+            exportedClassLoaders.computeIfAbsent(loader, this::exportJdkCompilerModule);
+        }
+        return null; // no bytecode modification
     }
-    return null; // no bytecode modification
-  }
 
-  private Boolean exportJdkCompilerModule(ClassLoader loader) {
-    try {
-      JDK9ModuleAccess.exportModuleToUnnamedModule(inst, "jdk.compiler", COMPILER_PACKAGES, loader);
-      LOGGER.debug("Exported jdk.compiler to classloader {}", loader);
-    } catch (Throwable e) {
-      LOGGER.debug("Could not export jdk.compiler packages for compiler plugin", e);
+    private Boolean exportJdkCompilerModule(ClassLoader loader) {
+        try {
+            JDK9ModuleAccess.exportModuleToUnnamedModule(inst, "jdk.compiler", COMPILER_PACKAGES, loader);
+            LOGGER.debug("Exported jdk.compiler to classloader {}", loader);
+        } catch (Throwable e) {
+            LOGGER.debug("Could not export jdk.compiler packages for compiler plugin", e);
+        }
+        return Boolean.TRUE;
     }
-    return Boolean.TRUE;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CachingJvmInfoFactory.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CachingJvmInfoFactory.java
index 1cc072c57aa..331d810765c 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CachingJvmInfoFactory.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CachingJvmInfoFactory.java
@@ -9,22 +9,22 @@
 
 public class CachingJvmInfoFactory implements JvmInfoFactory {
 
-  private final DDCache<Path, JvmInfo> cache;
-  private final JvmInfoFactoryImpl delegate;
+    private final DDCache<Path, JvmInfo> cache;
+    private final JvmInfoFactoryImpl delegate;
 
-  public CachingJvmInfoFactory(Config config, JvmInfoFactoryImpl delegate) {
-    this.delegate = delegate;
-    this.cache = DDCaches.newFixedSizeCache(config.getCiVisibilityExecutionSettingsCacheSize());
-  }
+    public CachingJvmInfoFactory(Config config, JvmInfoFactoryImpl delegate) {
+        this.delegate = delegate;
+        this.cache = DDCaches.newFixedSizeCache(config.getCiVisibilityExecutionSettingsCacheSize());
+    }
 
-  @Nonnull
-  @Override
-  public JvmInfo getJvmInfo(@Nullable Path jvmExecutablePath) {
-    // DDCache does not support null keys.
-    if (jvmExecutablePath == null) {
-      // If we cannot determine forked JVM, we assume it is the same as current one.
-      return JvmInfo.CURRENT_JVM;
+    @Nonnull
+    @Override
+    public JvmInfo getJvmInfo(@Nullable Path jvmExecutablePath) {
+        // DDCache does not support null keys.
+        if (jvmExecutablePath == null) {
+            // If we cannot determine forked JVM, we assume it is the same as current one.
+            return JvmInfo.CURRENT_JVM;
+        }
+        return cache.computeIfAbsent(jvmExecutablePath, delegate::getJvmInfo);
     }
-    return cache.computeIfAbsent(jvmExecutablePath, delegate::getJvmInfo);
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CiVisibilitySettings.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CiVisibilitySettings.java
index d7502ccec48..837e577da8a 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CiVisibilitySettings.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CiVisibilitySettings.java
@@ -8,218 +8,217 @@
 
 public class CiVisibilitySettings {
 
-  public static final CiVisibilitySettings DEFAULT =
-      new CiVisibilitySettings(
-          false,
-          false,
-          false,
-          false,
-          false,
-          false,
-          false,
-          false,
-          false,
-          EarlyFlakeDetectionSettings.DEFAULT,
-          TestManagementSettings.DEFAULT,
-          null,
-          false);
-
-  public static final CiVisibilitySettings SETTINGS_REQUEST_ERROR =
-      new CiVisibilitySettings(
-          false,
-          false,
-          false,
-          false,
-          false,
-          false,
-          false,
-          false,
-          false,
-          EarlyFlakeDetectionSettings.DEFAULT,
-          TestManagementSettings.DEFAULT,
-          null,
-          true);
-
-  private final boolean itrEnabled;
-  private final boolean codeCoverage;
-  private final boolean testsSkipping;
-  private final boolean requireGit;
-  private final boolean flakyTestRetriesEnabled;
-  private final boolean impactedTestsDetectionEnabled;
-  private final boolean knownTestsEnabled;
-  private final boolean coverageReportUploadEnabled;
-  private final boolean failedTestReplayEnabled;
-  private final EarlyFlakeDetectionSettings earlyFlakeDetectionSettings;
-  private final TestManagementSettings testManagementSettings;
-  @Nullable private final String defaultBranch;
-  private final boolean settingsRequestError;
-
-  CiVisibilitySettings(
-      boolean itrEnabled,
-      boolean codeCoverage,
-      boolean testsSkipping,
-      boolean requireGit,
-      boolean flakyTestRetriesEnabled,
-      boolean impactedTestsDetectionEnabled,
-      boolean knownTestsEnabled,
-      boolean coverageReportUploadEnabled,
-      boolean failedTestReplayEnabled,
-      EarlyFlakeDetectionSettings earlyFlakeDetectionSettings,
-      TestManagementSettings testManagementSettings,
-      @Nullable String defaultBranch,
-      boolean settingsRequestError) {
-    this.itrEnabled = itrEnabled;
-    this.codeCoverage = codeCoverage;
-    this.testsSkipping = testsSkipping;
-    this.requireGit = requireGit;
-    this.flakyTestRetriesEnabled = flakyTestRetriesEnabled;
-    this.impactedTestsDetectionEnabled = impactedTestsDetectionEnabled;
-    this.knownTestsEnabled = knownTestsEnabled;
-    this.coverageReportUploadEnabled = coverageReportUploadEnabled;
-    this.failedTestReplayEnabled = failedTestReplayEnabled;
-    this.earlyFlakeDetectionSettings = earlyFlakeDetectionSettings;
-    this.testManagementSettings = testManagementSettings;
-    this.defaultBranch = defaultBranch;
-    this.settingsRequestError = settingsRequestError;
-  }
-
-  public boolean isItrEnabled() {
-    return itrEnabled;
-  }
-
-  public boolean isCodeCoverageEnabled() {
-    return codeCoverage;
-  }
-
-  public boolean isTestsSkippingEnabled() {
-    return testsSkipping;
-  }
-
-  public boolean isGitUploadRequired() {
-    return requireGit;
-  }
-
-  public boolean isFlakyTestRetriesEnabled() {
-    return flakyTestRetriesEnabled;
-  }
-
-  public boolean isImpactedTestsDetectionEnabled() {
-    return impactedTestsDetectionEnabled;
-  }
-
-  public boolean isKnownTestsEnabled() {
-    return knownTestsEnabled;
-  }
-
-  public boolean isCoverageReportUploadEnabled() {
-    return coverageReportUploadEnabled;
-  }
-
-  public boolean isFailedTestReplayEnabled() {
-    return failedTestReplayEnabled;
-  }
-
-  public EarlyFlakeDetectionSettings getEarlyFlakeDetectionSettings() {
-    return earlyFlakeDetectionSettings;
-  }
-
-  public TestManagementSettings getTestManagementSettings() {
-    return testManagementSettings;
-  }
-
-  @Nullable
-  public String getDefaultBranch() {
-    return defaultBranch;
-  }
-
-  public boolean isSettingsRequestError() {
-    return settingsRequestError;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CiVisibilitySettings that = (CiVisibilitySettings) o;
-    return itrEnabled == that.itrEnabled
-        && codeCoverage == that.codeCoverage
-        && testsSkipping == that.testsSkipping
-        && requireGit == that.requireGit
-        && flakyTestRetriesEnabled == that.flakyTestRetriesEnabled
-        && impactedTestsDetectionEnabled == that.impactedTestsDetectionEnabled
-        && knownTestsEnabled == that.knownTestsEnabled
-        && coverageReportUploadEnabled == that.coverageReportUploadEnabled
-        && failedTestReplayEnabled == that.failedTestReplayEnabled
-        && Objects.equals(earlyFlakeDetectionSettings, that.earlyFlakeDetectionSettings)
-        && Objects.equals(testManagementSettings, that.testManagementSettings)
-        && Objects.equals(defaultBranch, that.defaultBranch)
-        && settingsRequestError == that.settingsRequestError;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(
-        itrEnabled,
-        codeCoverage,
-        testsSkipping,
-        requireGit,
-        flakyTestRetriesEnabled,
-        impactedTestsDetectionEnabled,
-        knownTestsEnabled,
-        coverageReportUploadEnabled,
-        failedTestReplayEnabled,
-        earlyFlakeDetectionSettings,
-        testManagementSettings,
-        defaultBranch,
-        settingsRequestError);
-  }
-
-  public interface Factory {
-    CiVisibilitySettings create(Path path);
-  }
-
-  public static final class JsonAdapter {
-
-    public static final JsonAdapter INSTANCE = new JsonAdapter();
-
-    @FromJson
-    public CiVisibilitySettings fromJson(Map<String, Object> json) {
-      if (json == null) {
-        return DEFAULT;
-      }
-
-      return new CiVisibilitySettings(
-          getBoolean(json, "itr_enabled", false),
-          getBoolean(json, "code_coverage", false),
-          getBoolean(json, "tests_skipping", false),
-          getBoolean(json, "require_git", false),
-          getBoolean(json, "flaky_test_retries_enabled", false),
-          getBoolean(json, "impacted_tests_enabled", false),
-          getBoolean(json, "known_tests_enabled", false),
-          getBoolean(json, "coverage_report_upload_enabled", false),
-          getBoolean(json, "di_enabled", false),
-          EarlyFlakeDetectionSettings.JsonAdapter.INSTANCE.fromJson(
-              (Map<String, Object>) json.get("early_flake_detection")),
-          TestManagementSettings.JsonAdapter.INSTANCE.fromJson(
-              (Map<String, Object>) json.get("test_management")),
-          getString(json, "default_branch", null),
-          false); // Correctly deserialized settings response is never considered as "errored"
-    }
-
-    private static boolean getBoolean(
-        Map<String, Object> json, String fieldName, boolean defaultValue) {
-      Object value = json.get(fieldName);
-      return value instanceof Boolean ? (Boolean) value : defaultValue;
-    }
-
-    private static String getString(
-        Map<String, Object> json, String fieldName, String defaultValue) {
-      Object value = json.get(fieldName);
-      return value instanceof String ? (String) value : defaultValue;
-    }
-  }
+    public static final CiVisibilitySettings DEFAULT = new CiVisibilitySettings(
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            EarlyFlakeDetectionSettings.DEFAULT,
+            TestManagementSettings.DEFAULT,
+            null,
+            false);
+
+    public static final CiVisibilitySettings SETTINGS_REQUEST_ERROR = new CiVisibilitySettings(
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            EarlyFlakeDetectionSettings.DEFAULT,
+            TestManagementSettings.DEFAULT,
+            null,
+            true);
+
+    private final boolean itrEnabled;
+    private final boolean codeCoverage;
+    private final boolean testsSkipping;
+    private final boolean requireGit;
+    private final boolean flakyTestRetriesEnabled;
+    private final boolean impactedTestsDetectionEnabled;
+    private final boolean knownTestsEnabled;
+    private final boolean coverageReportUploadEnabled;
+    private final boolean failedTestReplayEnabled;
+    private final EarlyFlakeDetectionSettings earlyFlakeDetectionSettings;
+    private final TestManagementSettings testManagementSettings;
+
+    @Nullable
+    private final String defaultBranch;
+
+    private final boolean settingsRequestError;
+
+    CiVisibilitySettings(
+            boolean itrEnabled,
+            boolean codeCoverage,
+            boolean testsSkipping,
+            boolean requireGit,
+            boolean flakyTestRetriesEnabled,
+            boolean impactedTestsDetectionEnabled,
+            boolean knownTestsEnabled,
+            boolean coverageReportUploadEnabled,
+            boolean failedTestReplayEnabled,
+            EarlyFlakeDetectionSettings earlyFlakeDetectionSettings,
+            TestManagementSettings testManagementSettings,
+            @Nullable String defaultBranch,
+            boolean settingsRequestError) {
+        this.itrEnabled = itrEnabled;
+        this.codeCoverage = codeCoverage;
+        this.testsSkipping = testsSkipping;
+        this.requireGit = requireGit;
+        this.flakyTestRetriesEnabled = flakyTestRetriesEnabled;
+        this.impactedTestsDetectionEnabled = impactedTestsDetectionEnabled;
+        this.knownTestsEnabled = knownTestsEnabled;
+        this.coverageReportUploadEnabled = coverageReportUploadEnabled;
+        this.failedTestReplayEnabled = failedTestReplayEnabled;
+        this.earlyFlakeDetectionSettings = earlyFlakeDetectionSettings;
+        this.testManagementSettings = testManagementSettings;
+        this.defaultBranch = defaultBranch;
+        this.settingsRequestError = settingsRequestError;
+    }
+
+    public boolean isItrEnabled() {
+        return itrEnabled;
+    }
+
+    public boolean isCodeCoverageEnabled() {
+        return codeCoverage;
+    }
+
+    public boolean isTestsSkippingEnabled() {
+        return testsSkipping;
+    }
+
+    public boolean isGitUploadRequired() {
+        return requireGit;
+    }
+
+    public boolean isFlakyTestRetriesEnabled() {
+        return flakyTestRetriesEnabled;
+    }
+
+    public boolean isImpactedTestsDetectionEnabled() {
+        return impactedTestsDetectionEnabled;
+    }
+
+    public boolean isKnownTestsEnabled() {
+        return knownTestsEnabled;
+    }
+
+    public boolean isCoverageReportUploadEnabled() {
+        return coverageReportUploadEnabled;
+    }
+
+    public boolean isFailedTestReplayEnabled() {
+        return failedTestReplayEnabled;
+    }
+
+    public EarlyFlakeDetectionSettings getEarlyFlakeDetectionSettings() {
+        return earlyFlakeDetectionSettings;
+    }
+
+    public TestManagementSettings getTestManagementSettings() {
+        return testManagementSettings;
+    }
+
+    @Nullable
+    public String getDefaultBranch() {
+        return defaultBranch;
+    }
+
+    public boolean isSettingsRequestError() {
+        return settingsRequestError;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CiVisibilitySettings that = (CiVisibilitySettings) o;
+        return itrEnabled == that.itrEnabled
+                && codeCoverage == that.codeCoverage
+                && testsSkipping == that.testsSkipping
+                && requireGit == that.requireGit
+                && flakyTestRetriesEnabled == that.flakyTestRetriesEnabled
+                && impactedTestsDetectionEnabled == that.impactedTestsDetectionEnabled
+                && knownTestsEnabled == that.knownTestsEnabled
+                && coverageReportUploadEnabled == that.coverageReportUploadEnabled
+                && failedTestReplayEnabled == that.failedTestReplayEnabled
+                && Objects.equals(earlyFlakeDetectionSettings, that.earlyFlakeDetectionSettings)
+                && Objects.equals(testManagementSettings, that.testManagementSettings)
+                && Objects.equals(defaultBranch, that.defaultBranch)
+                && settingsRequestError == that.settingsRequestError;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(
+                itrEnabled,
+                codeCoverage,
+                testsSkipping,
+                requireGit,
+                flakyTestRetriesEnabled,
+                impactedTestsDetectionEnabled,
+                knownTestsEnabled,
+                coverageReportUploadEnabled,
+                failedTestReplayEnabled,
+                earlyFlakeDetectionSettings,
+                testManagementSettings,
+                defaultBranch,
+                settingsRequestError);
+    }
+
+    public interface Factory {
+        CiVisibilitySettings create(Path path);
+    }
+
+    public static final class JsonAdapter {
+
+        public static final JsonAdapter INSTANCE = new JsonAdapter();
+
+        @FromJson
+        public CiVisibilitySettings fromJson(Map<String, Object> json) {
+            if (json == null) {
+                return DEFAULT;
+            }
+
+            return new CiVisibilitySettings(
+                    getBoolean(json, "itr_enabled", false),
+                    getBoolean(json, "code_coverage", false),
+                    getBoolean(json, "tests_skipping", false),
+                    getBoolean(json, "require_git", false),
+                    getBoolean(json, "flaky_test_retries_enabled", false),
+                    getBoolean(json, "impacted_tests_enabled", false),
+                    getBoolean(json, "known_tests_enabled", false),
+                    getBoolean(json, "coverage_report_upload_enabled", false),
+                    getBoolean(json, "di_enabled", false),
+                    EarlyFlakeDetectionSettings.JsonAdapter.INSTANCE.fromJson(
+                            (Map<String, Object>) json.get("early_flake_detection")),
+                    TestManagementSettings.JsonAdapter.INSTANCE.fromJson(
+                            (Map<String, Object>) json.get("test_management")),
+                    getString(json, "default_branch", null),
+                    false); // Correctly deserialized settings response is never considered as "errored"
+        }
+
+        private static boolean getBoolean(Map<String, Object> json, String fieldName, boolean defaultValue) {
+            Object value = json.get(fieldName);
+            return value instanceof Boolean ? (Boolean) value : defaultValue;
+        }
+
+        private static String getString(Map<String, Object> json, String fieldName, String defaultValue) {
+            Object value = json.get(fieldName);
+            return value instanceof String ? (String) value : defaultValue;
+        }
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApi.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApi.java
index ba174b60ffb..208733f524c 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApi.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApi.java
@@ -10,49 +10,43 @@
 
 public interface ConfigurationApi {
 
-  ConfigurationApi NO_OP =
-      new ConfigurationApi() {
+    ConfigurationApi NO_OP = new ConfigurationApi() {
         @Override
         public CiVisibilitySettings getSettings(TracerEnvironment tracerEnvironment) {
-          return CiVisibilitySettings.DEFAULT;
+            return CiVisibilitySettings.DEFAULT;
         }
 
         @Override
         public SkippableTests getSkippableTests(TracerEnvironment tracerEnvironment) {
-          return SkippableTests.EMPTY;
+            return SkippableTests.EMPTY;
         }
 
         @Override
-        public Map<String, Collection<TestFQN>> getFlakyTestsByModule(
-            TracerEnvironment tracerEnvironment) {
-          return Collections.emptyMap();
+        public Map<String, Collection<TestFQN>> getFlakyTestsByModule(TracerEnvironment tracerEnvironment) {
+            return Collections.emptyMap();
         }
 
         @Override
-        public Map<String, Collection<TestFQN>> getKnownTestsByModule(
-            TracerEnvironment tracerEnvironment) {
-          return Collections.emptyMap();
+        public Map<String, Collection<TestFQN>> getKnownTestsByModule(TracerEnvironment tracerEnvironment) {
+            return Collections.emptyMap();
         }
 
         @Override
         public Map<TestSetting, Map<String, Collection<TestFQN>>> getTestManagementTestsByModule(
-            TracerEnvironment tracerEnvironment, String commitSha, String commitMessage) {
-          return Collections.emptyMap();
+                TracerEnvironment tracerEnvironment, String commitSha, String commitMessage) {
+            return Collections.emptyMap();
         }
-      };
+    };
 
-  CiVisibilitySettings getSettings(TracerEnvironment tracerEnvironment) throws IOException;
+    CiVisibilitySettings getSettings(TracerEnvironment tracerEnvironment) throws IOException;
 
-  SkippableTests getSkippableTests(TracerEnvironment tracerEnvironment) throws IOException;
+    SkippableTests getSkippableTests(TracerEnvironment tracerEnvironment) throws IOException;
 
-  Map<String, Collection<TestFQN>> getFlakyTestsByModule(TracerEnvironment tracerEnvironment)
-      throws IOException;
+    Map<String, Collection<TestFQN>> getFlakyTestsByModule(TracerEnvironment tracerEnvironment) throws IOException;
 
-  @Nullable
-  Map<String, Collection<TestFQN>> getKnownTestsByModule(TracerEnvironment tracerEnvironment)
-      throws IOException;
+    @Nullable
+    Map<String, Collection<TestFQN>> getKnownTestsByModule(TracerEnvironment tracerEnvironment) throws IOException;
 
-  Map<TestSetting, Map<String, Collection<TestFQN>>> getTestManagementTestsByModule(
-      TracerEnvironment tracerEnvironment, String commitSha, String commitMessage)
-      throws IOException;
+    Map<TestSetting, Map<String, Collection<TestFQN>>> getTestManagementTestsByModule(
+            TracerEnvironment tracerEnvironment, String commitSha, String commitMessage) throws IOException;
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java
index 49665328c12..92c9bf9a1d6 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java
@@ -47,300 +47,264 @@
 
 public class ConfigurationApiImpl implements ConfigurationApi {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationApiImpl.class);
-
-  private static final MediaType JSON = MediaType.get("application/json");
-
-  private static final String SETTINGS_URI = "libraries/tests/services/setting";
-  private static final String SKIPPABLE_TESTS_URI = "ci/tests/skippable";
-  private static final String FLAKY_TESTS_URI = "ci/libraries/tests/flaky";
-  private static final String KNOWN_TESTS_URI = "ci/libraries/tests";
-  private static final String TEST_MANAGEMENT_TESTS_URI = "test/libraries/test-management/tests";
-
-  private final BackendApi backendApi;
-  private final CiVisibilityMetricCollector metricCollector;
-  private final Supplier<String> uuidGenerator;
-
-  private final JsonAdapter<Envelope<TracerEnvironment>> requestAdapter;
-  private final JsonAdapter<Envelope<CiVisibilitySettings>> settingsResponseAdapter;
-  private final JsonAdapter<MultiEnvelope<TestIdentifierJson>> testIdentifiersResponseAdapter;
-  private final JsonAdapter<Envelope<KnownTestsRequest>> knownTestsRequestAdapter;
-  private final JsonAdapter<Envelope<KnownTestsResponse>> testFullNamesResponseAdapter;
-  private final JsonAdapter<Envelope<TestManagementRequest>> testManagementRequestAdapter;
-  private final JsonAdapter<Envelope<TestManagementTestsResponse>>
-      testManagementTestsResponseAdapter;
-
-  public ConfigurationApiImpl(BackendApi backendApi, CiVisibilityMetricCollector metricCollector) {
-    this(backendApi, metricCollector, () -> RandomUtils.randomUUID().toString());
-  }
-
-  ConfigurationApiImpl(
-      BackendApi backendApi,
-      CiVisibilityMetricCollector metricCollector,
-      Supplier<String> uuidGenerator) {
-    this.backendApi = backendApi;
-    this.metricCollector = metricCollector;
-    this.uuidGenerator = uuidGenerator;
-
-    Moshi moshi = ConfigurationApiMoshi.create();
-    requestAdapter = moshi.adapter(envelopeOf(TracerEnvironment.class));
-    settingsResponseAdapter = moshi.adapter(envelopeOf(CiVisibilitySettings.class));
-    testIdentifiersResponseAdapter = moshi.adapter(multiEnvelopeOf(TestIdentifierJson.class));
-    knownTestsRequestAdapter = moshi.adapter(envelopeOf(KnownTestsRequest.class));
-    testFullNamesResponseAdapter = moshi.adapter(envelopeOf(KnownTestsResponse.class));
-    testManagementRequestAdapter = moshi.adapter(envelopeOf(TestManagementRequest.class));
-    testManagementTestsResponseAdapter =
-        moshi.adapter(envelopeOf(TestManagementTestsResponse.class));
-  }
-
-  private static ParameterizedType envelopeOf(Class<?> attributesType) {
-    return Types.newParameterizedType(Envelope.class, attributesType);
-  }
-
-  private static ParameterizedType multiEnvelopeOf(Class<?> attributesType) {
-    return Types.newParameterizedType(MultiEnvelope.class, attributesType);
-  }
-
-  @Override
-  public CiVisibilitySettings getSettings(TracerEnvironment tracerEnvironment) throws IOException {
-    String uuid = uuidGenerator.get();
-    Envelope<TracerEnvironment> settingsRequest =
-        new Envelope<>(
-            new Data<>(uuid, "ci_app_test_service_libraries_settings", tracerEnvironment));
-    String json = requestAdapter.toJson(settingsRequest);
-    RequestBody requestBody = RequestBody.create(JSON, json);
-
-    OkHttpUtils.CustomListener telemetryListener =
-        new TelemetryListener.Builder(metricCollector)
-            .requestCount(CiVisibilityCountMetric.GIT_REQUESTS_SETTINGS)
-            .requestErrors(CiVisibilityCountMetric.GIT_REQUESTS_SETTINGS_ERRORS)
-            .requestDuration(CiVisibilityDistributionMetric.GIT_REQUESTS_SETTINGS_MS)
-            .build();
-
-    CiVisibilitySettings settings =
-        backendApi.post(
-            SETTINGS_URI,
-            requestBody,
-            is -> settingsResponseAdapter.fromJson(Okio.buffer(Okio.source(is))).data.attributes,
-            telemetryListener,
-            false);
-
-    metricCollector.add(
-        CiVisibilityCountMetric.GIT_REQUESTS_SETTINGS_RESPONSE,
-        1,
-        settings.isItrEnabled() ? ItrEnabled.TRUE : null,
-        settings.isTestsSkippingEnabled() ? ItrSkipEnabled.TRUE : null,
-        settings.isCodeCoverageEnabled() ? CoverageEnabled.TRUE : null,
-        settings.getEarlyFlakeDetectionSettings().isEnabled()
-            ? EarlyFlakeDetectionEnabled.TRUE
-            : null,
-        settings.isFlakyTestRetriesEnabled() ? FlakyTestRetriesEnabled.TRUE : null,
-        settings.isKnownTestsEnabled() ? KnownTestsEnabled.TRUE : null,
-        settings.isImpactedTestsDetectionEnabled() ? ImpactedTestsDetectionEnabled.TRUE : null,
-        settings.getTestManagementSettings().isEnabled() ? TestManagementEnabled.TRUE : null,
-        settings.isFailedTestReplayEnabled() ? FailedTestReplayEnabled.SettingsMetric.TRUE : null,
-        settings.isGitUploadRequired() ? RequireGit.TRUE : null);
-
-    return settings;
-  }
-
-  @Override
-  public SkippableTests getSkippableTests(TracerEnvironment tracerEnvironment) throws IOException {
-    OkHttpUtils.CustomListener telemetryListener =
-        new TelemetryListener.Builder(metricCollector)
-            .requestCount(CiVisibilityCountMetric.ITR_SKIPPABLE_TESTS_REQUEST)
-            .requestErrors(CiVisibilityCountMetric.ITR_SKIPPABLE_TESTS_REQUEST_ERRORS)
-            .requestDuration(CiVisibilityDistributionMetric.ITR_SKIPPABLE_TESTS_REQUEST_MS)
-            .responseBytes(CiVisibilityDistributionMetric.ITR_SKIPPABLE_TESTS_RESPONSE_BYTES)
-            .build();
-
-    String uuid = uuidGenerator.get();
-    Envelope<TracerEnvironment> request =
-        new Envelope<>(new Data<>(uuid, "test_params", tracerEnvironment));
-    String json = requestAdapter.toJson(request);
-    RequestBody requestBody = RequestBody.create(JSON, json);
-    MultiEnvelope<TestIdentifierJson> response =
-        backendApi.post(
-            SKIPPABLE_TESTS_URI,
-            requestBody,
-            is -> testIdentifiersResponseAdapter.fromJson(Okio.buffer(Okio.source(is))),
-            telemetryListener,
-            false);
-
-    metricCollector.add(
-        CiVisibilityCountMetric.ITR_SKIPPABLE_TESTS_RESPONSE_TESTS, response.data.size());
-
-    return SkippableTests.from(response, tracerEnvironment);
-  }
-
-  @Override
-  public Map<String, Collection<TestFQN>> getFlakyTestsByModule(TracerEnvironment tracerEnvironment)
-      throws IOException {
-    OkHttpUtils.CustomListener telemetryListener =
-        new TelemetryListener.Builder(metricCollector)
-            .requestCount(CiVisibilityCountMetric.FLAKY_TESTS_REQUEST)
-            .requestErrors(CiVisibilityCountMetric.FLAKY_TESTS_REQUEST_ERRORS)
-            .requestDuration(CiVisibilityDistributionMetric.FLAKY_TESTS_REQUEST_MS)
-            .responseBytes(CiVisibilityDistributionMetric.FLAKY_TESTS_RESPONSE_BYTES)
-            .build();
-
-    String uuid = uuidGenerator.get();
-    Envelope<TracerEnvironment> request =
-        new Envelope<>(new Data<>(uuid, "flaky_test_from_libraries_params", tracerEnvironment));
-    String json = requestAdapter.toJson(request);
-    RequestBody requestBody = RequestBody.create(JSON, json);
-    Collection<Data<TestIdentifierJson>> response =
-        backendApi.post(
-            FLAKY_TESTS_URI,
-            requestBody,
-            is -> testIdentifiersResponseAdapter.fromJson(Okio.buffer(Okio.source(is))).data,
-            telemetryListener,
-            false);
-
-    LOGGER.debug("Received {} flaky tests in total", response.size());
-
-    Map<String, Collection<TestFQN>> testsByModule =
-        TestIdentifierJson.toTestFQNsByModule(response, tracerEnvironment);
-    int flakyTestsCount = testsByModule.values().stream().mapToInt(Collection::size).sum();
-    metricCollector.add(CiVisibilityDistributionMetric.FLAKY_TESTS_RESPONSE_TESTS, flakyTestsCount);
-    return testsByModule;
-  }
-
-  @Nullable
-  @Override
-  public Map<String, Collection<TestFQN>> getKnownTestsByModule(TracerEnvironment tracerEnvironment)
-      throws IOException {
-    OkHttpUtils.CustomListener telemetryListener =
-        new TelemetryListener.Builder(metricCollector)
-            .requestCount(CiVisibilityCountMetric.KNOWN_TESTS_REQUEST)
-            .requestErrors(CiVisibilityCountMetric.KNOWN_TESTS_REQUEST_ERRORS)
-            .requestDuration(CiVisibilityDistributionMetric.KNOWN_TESTS_REQUEST_MS)
-            .responseBytes(CiVisibilityDistributionMetric.KNOWN_TESTS_RESPONSE_BYTES)
-            .build();
-
-    // Aggregate tests map across all pages: module -> suite -> tests
-    Map<String, Map<String, List<String>>> aggregateTests = new HashMap<>();
-    String pageState = null;
-    int pageNumber = 0;
-
-    do {
-      pageNumber += 1;
-      LOGGER.debug(
-          "Fetching known tests page #{}{}", pageNumber, pageState != null ? " with cursor" : "");
-      String uuid = uuidGenerator.get();
-      KnownTestsRequest requestDto = new KnownTestsRequest(tracerEnvironment, pageState);
-      Envelope<KnownTestsRequest> request =
-          new Envelope<>(new Data<>(uuid, "ci_app_libraries_tests_request", requestDto));
-      String json = knownTestsRequestAdapter.toJson(request);
-      RequestBody requestBody = RequestBody.create(JSON, json);
-      KnownTestsResponse knownTests =
-          backendApi.post(
-              KNOWN_TESTS_URI,
-              requestBody,
-              is ->
-                  testFullNamesResponseAdapter.fromJson(Okio.buffer(Okio.source(is)))
-                      .data
-                      .attributes,
-              telemetryListener,
-              false);
-
-      mergeKnownTests(aggregateTests, knownTests.tests);
-
-      Integer pageSize = knownTests.getPageSize();
-      if (pageSize != null) {
-        LOGGER.debug("Received page #{} of size {} for known tests", pageNumber, pageSize);
-      } else {
-        LOGGER.debug("Received page #{} for known tests", pageNumber);
-      }
-
-      pageState = knownTests.hasNextPage() ? knownTests.getNextPageCursor() : null;
-    } while (pageState != null);
-
-    LOGGER.debug("Finished fetching known tests after {} page(s)", pageNumber);
-
-    Map<String, Collection<TestFQN>> testsByModule =
-        KnownTestsResponse.toTestFQNsByModule(aggregateTests);
-    int knownTestsCount =
-        testsByModule != null
-            ? testsByModule.values().stream().mapToInt(Collection::size).sum()
-            : 0;
-    LOGGER.debug("Received {} known tests in total", knownTestsCount);
-    metricCollector.add(CiVisibilityDistributionMetric.KNOWN_TESTS_RESPONSE_TESTS, knownTestsCount);
-    // returning null disables features that rely on known tests; this is intentional on the very
-    // first execution for a repository, when we want to seed the backend with the initial set.
-    return testsByModule;
-  }
-
-  private void mergeKnownTests(
-      Map<String, Map<String, List<String>>> aggregate,
-      Map<String, Map<String, List<String>>> page) {
-    if (page == null) {
-      return;
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationApiImpl.class);
+
+    private static final MediaType JSON = MediaType.get("application/json");
+
+    private static final String SETTINGS_URI = "libraries/tests/services/setting";
+    private static final String SKIPPABLE_TESTS_URI = "ci/tests/skippable";
+    private static final String FLAKY_TESTS_URI = "ci/libraries/tests/flaky";
+    private static final String KNOWN_TESTS_URI = "ci/libraries/tests";
+    private static final String TEST_MANAGEMENT_TESTS_URI = "test/libraries/test-management/tests";
+
+    private final BackendApi backendApi;
+    private final CiVisibilityMetricCollector metricCollector;
+    private final Supplier<String> uuidGenerator;
+
+    private final JsonAdapter<Envelope<TracerEnvironment>> requestAdapter;
+    private final JsonAdapter<Envelope<CiVisibilitySettings>> settingsResponseAdapter;
+    private final JsonAdapter<MultiEnvelope<TestIdentifierJson>> testIdentifiersResponseAdapter;
+    private final JsonAdapter<Envelope<KnownTestsRequest>> knownTestsRequestAdapter;
+    private final JsonAdapter<Envelope<KnownTestsResponse>> testFullNamesResponseAdapter;
+    private final JsonAdapter<Envelope<TestManagementRequest>> testManagementRequestAdapter;
+    private final JsonAdapter<Envelope<TestManagementTestsResponse>> testManagementTestsResponseAdapter;
+
+    public ConfigurationApiImpl(BackendApi backendApi, CiVisibilityMetricCollector metricCollector) {
+        this(backendApi, metricCollector, () -> RandomUtils.randomUUID().toString());
     }
-    for (Map.Entry<String, Map<String, List<String>>> moduleEntry : page.entrySet()) {
-      String moduleName = moduleEntry.getKey();
-      Map<String, List<String>> pageSuites = moduleEntry.getValue();
-
-      Map<String, List<String>> aggregateSuites =
-          aggregate.computeIfAbsent(moduleName, k -> new HashMap<>());
-
-      for (Map.Entry<String, List<String>> suiteEntry : pageSuites.entrySet()) {
-        String suiteName = suiteEntry.getKey();
-        List<String> pageTests = suiteEntry.getValue();
-
-        aggregateSuites.merge(
-            suiteName,
-            pageTests,
-            (existingTests, newTests) -> {
-              existingTests.addAll(newTests);
-              return existingTests;
-            });
-      }
+
+    ConfigurationApiImpl(
+            BackendApi backendApi, CiVisibilityMetricCollector metricCollector, Supplier<String> uuidGenerator) {
+        this.backendApi = backendApi;
+        this.metricCollector = metricCollector;
+        this.uuidGenerator = uuidGenerator;
+
+        Moshi moshi = ConfigurationApiMoshi.create();
+        requestAdapter = moshi.adapter(envelopeOf(TracerEnvironment.class));
+        settingsResponseAdapter = moshi.adapter(envelopeOf(CiVisibilitySettings.class));
+        testIdentifiersResponseAdapter = moshi.adapter(multiEnvelopeOf(TestIdentifierJson.class));
+        knownTestsRequestAdapter = moshi.adapter(envelopeOf(KnownTestsRequest.class));
+        testFullNamesResponseAdapter = moshi.adapter(envelopeOf(KnownTestsResponse.class));
+        testManagementRequestAdapter = moshi.adapter(envelopeOf(TestManagementRequest.class));
+        testManagementTestsResponseAdapter = moshi.adapter(envelopeOf(TestManagementTestsResponse.class));
+    }
+
+    private static ParameterizedType envelopeOf(Class<?> attributesType) {
+        return Types.newParameterizedType(Envelope.class, attributesType);
+    }
+
+    private static ParameterizedType multiEnvelopeOf(Class<?> attributesType) {
+        return Types.newParameterizedType(MultiEnvelope.class, attributesType);
+    }
+
+    @Override
+    public CiVisibilitySettings getSettings(TracerEnvironment tracerEnvironment) throws IOException {
+        String uuid = uuidGenerator.get();
+        Envelope<TracerEnvironment> settingsRequest =
+                new Envelope<>(new Data<>(uuid, "ci_app_test_service_libraries_settings", tracerEnvironment));
+        String json = requestAdapter.toJson(settingsRequest);
+        RequestBody requestBody = RequestBody.create(JSON, json);
+
+        OkHttpUtils.CustomListener telemetryListener = new TelemetryListener.Builder(metricCollector)
+                .requestCount(CiVisibilityCountMetric.GIT_REQUESTS_SETTINGS)
+                .requestErrors(CiVisibilityCountMetric.GIT_REQUESTS_SETTINGS_ERRORS)
+                .requestDuration(CiVisibilityDistributionMetric.GIT_REQUESTS_SETTINGS_MS)
+                .build();
+
+        CiVisibilitySettings settings = backendApi.post(
+                SETTINGS_URI,
+                requestBody,
+                is -> settingsResponseAdapter.fromJson(Okio.buffer(Okio.source(is))).data.attributes,
+                telemetryListener,
+                false);
+
+        metricCollector.add(
+                CiVisibilityCountMetric.GIT_REQUESTS_SETTINGS_RESPONSE,
+                1,
+                settings.isItrEnabled() ? ItrEnabled.TRUE : null,
+                settings.isTestsSkippingEnabled() ? ItrSkipEnabled.TRUE : null,
+                settings.isCodeCoverageEnabled() ? CoverageEnabled.TRUE : null,
+                settings.getEarlyFlakeDetectionSettings().isEnabled() ? EarlyFlakeDetectionEnabled.TRUE : null,
+                settings.isFlakyTestRetriesEnabled() ? FlakyTestRetriesEnabled.TRUE : null,
+                settings.isKnownTestsEnabled() ? KnownTestsEnabled.TRUE : null,
+                settings.isImpactedTestsDetectionEnabled() ? ImpactedTestsDetectionEnabled.TRUE : null,
+                settings.getTestManagementSettings().isEnabled() ? TestManagementEnabled.TRUE : null,
+                settings.isFailedTestReplayEnabled() ? FailedTestReplayEnabled.SettingsMetric.TRUE : null,
+                settings.isGitUploadRequired() ? RequireGit.TRUE : null);
+
+        return settings;
+    }
+
+    @Override
+    public SkippableTests getSkippableTests(TracerEnvironment tracerEnvironment) throws IOException {
+        OkHttpUtils.CustomListener telemetryListener = new TelemetryListener.Builder(metricCollector)
+                .requestCount(CiVisibilityCountMetric.ITR_SKIPPABLE_TESTS_REQUEST)
+                .requestErrors(CiVisibilityCountMetric.ITR_SKIPPABLE_TESTS_REQUEST_ERRORS)
+                .requestDuration(CiVisibilityDistributionMetric.ITR_SKIPPABLE_TESTS_REQUEST_MS)
+                .responseBytes(CiVisibilityDistributionMetric.ITR_SKIPPABLE_TESTS_RESPONSE_BYTES)
+                .build();
+
+        String uuid = uuidGenerator.get();
+        Envelope<TracerEnvironment> request = new Envelope<>(new Data<>(uuid, "test_params", tracerEnvironment));
+        String json = requestAdapter.toJson(request);
+        RequestBody requestBody = RequestBody.create(JSON, json);
+        MultiEnvelope<TestIdentifierJson> response = backendApi.post(
+                SKIPPABLE_TESTS_URI,
+                requestBody,
+                is -> testIdentifiersResponseAdapter.fromJson(Okio.buffer(Okio.source(is))),
+                telemetryListener,
+                false);
+
+        metricCollector.add(CiVisibilityCountMetric.ITR_SKIPPABLE_TESTS_RESPONSE_TESTS, response.data.size());
+
+        return SkippableTests.from(response, tracerEnvironment);
     }
-  }
-
-  @Override
-  public Map<TestSetting, Map<String, Collection<TestFQN>>> getTestManagementTestsByModule(
-      TracerEnvironment tracerEnvironment, String commitSha, String commitMessage)
-      throws IOException {
-    OkHttpUtils.CustomListener telemetryListener =
-        new TelemetryListener.Builder(metricCollector)
-            .requestCount(CiVisibilityCountMetric.TEST_MANAGEMENT_TESTS_REQUEST)
-            .requestErrors(CiVisibilityCountMetric.TEST_MANAGEMENT_TESTS_REQUEST_ERRORS)
-            .requestDuration(CiVisibilityDistributionMetric.TEST_MANAGEMENT_TESTS_REQUEST_MS)
-            .responseBytes(CiVisibilityDistributionMetric.TEST_MANAGEMENT_TESTS_RESPONSE_BYTES)
-            .build();
-
-    String uuid = uuidGenerator.get();
-    Envelope<TestManagementRequest> request =
-        new Envelope<>(
-            new Data<>(
+
+    @Override
+    public Map<String, Collection<TestFQN>> getFlakyTestsByModule(TracerEnvironment tracerEnvironment)
+            throws IOException {
+        OkHttpUtils.CustomListener telemetryListener = new TelemetryListener.Builder(metricCollector)
+                .requestCount(CiVisibilityCountMetric.FLAKY_TESTS_REQUEST)
+                .requestErrors(CiVisibilityCountMetric.FLAKY_TESTS_REQUEST_ERRORS)
+                .requestDuration(CiVisibilityDistributionMetric.FLAKY_TESTS_REQUEST_MS)
+                .responseBytes(CiVisibilityDistributionMetric.FLAKY_TESTS_RESPONSE_BYTES)
+                .build();
+
+        String uuid = uuidGenerator.get();
+        Envelope<TracerEnvironment> request =
+                new Envelope<>(new Data<>(uuid, "flaky_test_from_libraries_params", tracerEnvironment));
+        String json = requestAdapter.toJson(request);
+        RequestBody requestBody = RequestBody.create(JSON, json);
+        Collection<Data<TestIdentifierJson>> response = backendApi.post(
+                FLAKY_TESTS_URI,
+                requestBody,
+                is -> testIdentifiersResponseAdapter.fromJson(Okio.buffer(Okio.source(is))).data,
+                telemetryListener,
+                false);
+
+        LOGGER.debug("Received {} flaky tests in total", response.size());
+
+        Map<String, Collection<TestFQN>> testsByModule =
+                TestIdentifierJson.toTestFQNsByModule(response, tracerEnvironment);
+        int flakyTestsCount =
+                testsByModule.values().stream().mapToInt(Collection::size).sum();
+        metricCollector.add(CiVisibilityDistributionMetric.FLAKY_TESTS_RESPONSE_TESTS, flakyTestsCount);
+        return testsByModule;
+    }
+
+    @Nullable
+    @Override
+    public Map<String, Collection<TestFQN>> getKnownTestsByModule(TracerEnvironment tracerEnvironment)
+            throws IOException {
+        OkHttpUtils.CustomListener telemetryListener = new TelemetryListener.Builder(metricCollector)
+                .requestCount(CiVisibilityCountMetric.KNOWN_TESTS_REQUEST)
+                .requestErrors(CiVisibilityCountMetric.KNOWN_TESTS_REQUEST_ERRORS)
+                .requestDuration(CiVisibilityDistributionMetric.KNOWN_TESTS_REQUEST_MS)
+                .responseBytes(CiVisibilityDistributionMetric.KNOWN_TESTS_RESPONSE_BYTES)
+                .build();
+
+        // Aggregate tests map across all pages: module -> suite -> tests
+        Map<String, Map<String, List<String>>> aggregateTests = new HashMap<>();
+        String pageState = null;
+        int pageNumber = 0;
+
+        do {
+            pageNumber += 1;
+            LOGGER.debug("Fetching known tests page #{}{}", pageNumber, pageState != null ? " with cursor" : "");
+            String uuid = uuidGenerator.get();
+            KnownTestsRequest requestDto = new KnownTestsRequest(tracerEnvironment, pageState);
+            Envelope<KnownTestsRequest> request =
+                    new Envelope<>(new Data<>(uuid, "ci_app_libraries_tests_request", requestDto));
+            String json = knownTestsRequestAdapter.toJson(request);
+            RequestBody requestBody = RequestBody.create(JSON, json);
+            KnownTestsResponse knownTests = backendApi.post(
+                    KNOWN_TESTS_URI,
+                    requestBody,
+                    is -> testFullNamesResponseAdapter.fromJson(Okio.buffer(Okio.source(is))).data.attributes,
+                    telemetryListener,
+                    false);
+
+            mergeKnownTests(aggregateTests, knownTests.tests);
+
+            Integer pageSize = knownTests.getPageSize();
+            if (pageSize != null) {
+                LOGGER.debug("Received page #{} of size {} for known tests", pageNumber, pageSize);
+            } else {
+                LOGGER.debug("Received page #{} for known tests", pageNumber);
+            }
+
+            pageState = knownTests.hasNextPage() ? knownTests.getNextPageCursor() : null;
+        } while (pageState != null);
+
+        LOGGER.debug("Finished fetching known tests after {} page(s)", pageNumber);
+
+        Map<String, Collection<TestFQN>> testsByModule = KnownTestsResponse.toTestFQNsByModule(aggregateTests);
+        int knownTestsCount = testsByModule != null
+                ? testsByModule.values().stream().mapToInt(Collection::size).sum()
+                : 0;
+        LOGGER.debug("Received {} known tests in total", knownTestsCount);
+        metricCollector.add(CiVisibilityDistributionMetric.KNOWN_TESTS_RESPONSE_TESTS, knownTestsCount);
+        // returning null disables features that rely on known tests; this is intentional on the very
+        // first execution for a repository, when we want to seed the backend with the initial set.
+        return testsByModule;
+    }
+
+    private void mergeKnownTests(
+            Map<String, Map<String, List<String>>> aggregate, Map<String, Map<String, List<String>>> page) {
+        if (page == null) {
+            return;
+        }
+        for (Map.Entry<String, Map<String, List<String>>> moduleEntry : page.entrySet()) {
+            String moduleName = moduleEntry.getKey();
+            Map<String, List<String>> pageSuites = moduleEntry.getValue();
+
+            Map<String, List<String>> aggregateSuites = aggregate.computeIfAbsent(moduleName, k -> new HashMap<>());
+
+            for (Map.Entry<String, List<String>> suiteEntry : pageSuites.entrySet()) {
+                String suiteName = suiteEntry.getKey();
+                List<String> pageTests = suiteEntry.getValue();
+
+                aggregateSuites.merge(suiteName, pageTests, (existingTests, newTests) -> {
+                    existingTests.addAll(newTests);
+                    return existingTests;
+                });
+            }
+        }
+    }
+
+    @Override
+    public Map<TestSetting, Map<String, Collection<TestFQN>>> getTestManagementTestsByModule(
+            TracerEnvironment tracerEnvironment, String commitSha, String commitMessage) throws IOException {
+        OkHttpUtils.CustomListener telemetryListener = new TelemetryListener.Builder(metricCollector)
+                .requestCount(CiVisibilityCountMetric.TEST_MANAGEMENT_TESTS_REQUEST)
+                .requestErrors(CiVisibilityCountMetric.TEST_MANAGEMENT_TESTS_REQUEST_ERRORS)
+                .requestDuration(CiVisibilityDistributionMetric.TEST_MANAGEMENT_TESTS_REQUEST_MS)
+                .responseBytes(CiVisibilityDistributionMetric.TEST_MANAGEMENT_TESTS_RESPONSE_BYTES)
+                .build();
+
+        String uuid = uuidGenerator.get();
+        Envelope<TestManagementRequest> request = new Envelope<>(new Data<>(
                 uuid,
                 "ci_app_libraries_tests_request",
                 new TestManagementRequest(
-                    tracerEnvironment.getRepositoryUrl(),
-                    commitMessage,
-                    tracerEnvironment.getConfigurations().getTestBundle(),
-                    commitSha,
-                    tracerEnvironment.getBranch())));
-    String json = testManagementRequestAdapter.toJson(request);
-    RequestBody requestBody = RequestBody.create(JSON, json);
-    TestManagementTestsResponse response =
-        backendApi.post(
-            TEST_MANAGEMENT_TESTS_URI,
-            requestBody,
-            is ->
-                testManagementTestsResponseAdapter.fromJson(Okio.buffer(Okio.source(is)))
-                    .data
-                    .attributes,
-            telemetryListener,
-            false);
-
-    int testsCount = response.totalTestsCount();
-    LOGGER.debug("Received {} test management tests in total", testsCount);
-    metricCollector.add(
-        CiVisibilityDistributionMetric.TEST_MANAGEMENT_TESTS_RESPONSE_TESTS, testsCount);
-
-    return response.toTestFQNsBySetting();
-  }
+                        tracerEnvironment.getRepositoryUrl(),
+                        commitMessage,
+                        tracerEnvironment.getConfigurations().getTestBundle(),
+                        commitSha,
+                        tracerEnvironment.getBranch())));
+        String json = testManagementRequestAdapter.toJson(request);
+        RequestBody requestBody = RequestBody.create(JSON, json);
+        TestManagementTestsResponse response = backendApi.post(
+                TEST_MANAGEMENT_TESTS_URI,
+                requestBody,
+                is -> testManagementTestsResponseAdapter.fromJson(Okio.buffer(Okio.source(is))).data.attributes,
+                telemetryListener,
+                false);
+
+        int testsCount = response.totalTestsCount();
+        LOGGER.debug("Received {} test management tests in total", testsCount);
+        metricCollector.add(CiVisibilityDistributionMetric.TEST_MANAGEMENT_TESTS_RESPONSE_TESTS, testsCount);
+
+        return response.toTestFQNsBySetting();
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationErrors.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationErrors.java
index f488468f2f4..54a8d75c1f5 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationErrors.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationErrors.java
@@ -9,98 +9,95 @@
 /** Tracks which CI Visibility backend requests failed. */
 public class ConfigurationErrors {
 
-  public static final ConfigurationErrors NONE =
-      new ConfigurationErrors(false, false, false, false, false);
+    public static final ConfigurationErrors NONE = new ConfigurationErrors(false, false, false, false, false);
 
-  private static final int SETTINGS_FLAG = 1;
-  private static final int SKIPPABLE_TESTS_FLAG = 2;
-  private static final int FLAKY_TESTS_FLAG = 4;
-  private static final int KNOWN_TESTS_FLAG = 8;
-  private static final int TEST_MANAGEMENT_TESTS_FLAG = 16;
+    private static final int SETTINGS_FLAG = 1;
+    private static final int SKIPPABLE_TESTS_FLAG = 2;
+    private static final int FLAKY_TESTS_FLAG = 4;
+    private static final int KNOWN_TESTS_FLAG = 8;
+    private static final int TEST_MANAGEMENT_TESTS_FLAG = 16;
 
-  private final boolean settings;
-  private final boolean skippableTests;
-  private final boolean flakyTests;
-  private final boolean knownTests;
-  private final boolean testManagementTests;
+    private final boolean settings;
+    private final boolean skippableTests;
+    private final boolean flakyTests;
+    private final boolean knownTests;
+    private final boolean testManagementTests;
 
-  public ConfigurationErrors(
-      boolean settings,
-      boolean skippableTests,
-      boolean flakyTests,
-      boolean knownTests,
-      boolean testManagementTests) {
-    this.settings = settings;
-    this.skippableTests = skippableTests;
-    this.flakyTests = flakyTests;
-    this.knownTests = knownTests;
-    this.testManagementTests = testManagementTests;
-  }
-
-  public boolean hasAny() {
-    return settings || skippableTests || flakyTests || knownTests || testManagementTests;
-  }
-
-  public void applyTags(AgentSpan span) {
-    if (settings) {
-      span.setTag(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS, true);
-    }
-    if (skippableTests) {
-      span.setTag(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_SKIPPABLE_TESTS, true);
+    public ConfigurationErrors(
+            boolean settings,
+            boolean skippableTests,
+            boolean flakyTests,
+            boolean knownTests,
+            boolean testManagementTests) {
+        this.settings = settings;
+        this.skippableTests = skippableTests;
+        this.flakyTests = flakyTests;
+        this.knownTests = knownTests;
+        this.testManagementTests = testManagementTests;
     }
-    if (flakyTests) {
-      span.setTag(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_FLAKY_TESTS, true);
-    }
-    if (knownTests) {
-      span.setTag(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS, true);
+
+    public boolean hasAny() {
+        return settings || skippableTests || flakyTests || knownTests || testManagementTests;
     }
-    if (testManagementTests) {
-      span.setTag(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS, true);
+
+    public void applyTags(AgentSpan span) {
+        if (settings) {
+            span.setTag(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS, true);
+        }
+        if (skippableTests) {
+            span.setTag(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_SKIPPABLE_TESTS, true);
+        }
+        if (flakyTests) {
+            span.setTag(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_FLAKY_TESTS, true);
+        }
+        if (knownTests) {
+            span.setTag(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS, true);
+        }
+        if (testManagementTests) {
+            span.setTag(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS, true);
+        }
     }
-  }
 
-  public static void serialize(Serializer s, ConfigurationErrors errors) {
-    byte flags =
-        (byte)
-            ((errors.settings ? SETTINGS_FLAG : 0)
+    public static void serialize(Serializer s, ConfigurationErrors errors) {
+        byte flags = (byte) ((errors.settings ? SETTINGS_FLAG : 0)
                 | (errors.skippableTests ? SKIPPABLE_TESTS_FLAG : 0)
                 | (errors.flakyTests ? FLAKY_TESTS_FLAG : 0)
                 | (errors.knownTests ? KNOWN_TESTS_FLAG : 0)
                 | (errors.testManagementTests ? TEST_MANAGEMENT_TESTS_FLAG : 0));
-    s.write(flags);
-  }
-
-  public static ConfigurationErrors deserialize(ByteBuffer buffer) {
-    byte flags = Serializer.readByte(buffer);
-    if (flags == 0) {
-      return NONE;
+        s.write(flags);
     }
-    return new ConfigurationErrors(
-        (flags & SETTINGS_FLAG) != 0,
-        (flags & SKIPPABLE_TESTS_FLAG) != 0,
-        (flags & FLAKY_TESTS_FLAG) != 0,
-        (flags & KNOWN_TESTS_FLAG) != 0,
-        (flags & TEST_MANAGEMENT_TESTS_FLAG) != 0);
-  }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public static ConfigurationErrors deserialize(ByteBuffer buffer) {
+        byte flags = Serializer.readByte(buffer);
+        if (flags == 0) {
+            return NONE;
+        }
+        return new ConfigurationErrors(
+                (flags & SETTINGS_FLAG) != 0,
+                (flags & SKIPPABLE_TESTS_FLAG) != 0,
+                (flags & FLAKY_TESTS_FLAG) != 0,
+                (flags & KNOWN_TESTS_FLAG) != 0,
+                (flags & TEST_MANAGEMENT_TESTS_FLAG) != 0);
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ConfigurationErrors that = (ConfigurationErrors) o;
+        return settings == that.settings
+                && skippableTests == that.skippableTests
+                && flakyTests == that.flakyTests
+                && knownTests == that.knownTests
+                && testManagementTests == that.testManagementTests;
     }
-    ConfigurationErrors that = (ConfigurationErrors) o;
-    return settings == that.settings
-        && skippableTests == that.skippableTests
-        && flakyTests == that.flakyTests
-        && knownTests == that.knownTests
-        && testManagementTests == that.testManagementTests;
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(settings, skippableTests, flakyTests, knownTests, testManagementTests);
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(settings, skippableTests, flakyTests, knownTests, testManagementTests);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationsJsonAdapter.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationsJsonAdapter.java
index 81120f543b4..7dd353a1f56 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationsJsonAdapter.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationsJsonAdapter.java
@@ -7,39 +7,39 @@
 import java.util.Map;
 
 public final class ConfigurationsJsonAdapter {
-  public static final ConfigurationsJsonAdapter INSTANCE = new ConfigurationsJsonAdapter();
+    public static final ConfigurationsJsonAdapter INSTANCE = new ConfigurationsJsonAdapter();
 
-  @FromJson
-  public Configurations fromJson(Map<String, Object> json) {
-    if (json == null) {
-      return null;
+    @FromJson
+    public Configurations fromJson(Map<String, Object> json) {
+        if (json == null) {
+            return null;
+        }
+        return new Configurations(
+                (String) json.get("os.platform"),
+                (String) json.get("os.architecture"),
+                (String) json.get("os.version"),
+                (String) json.get("runtime.name"),
+                (String) json.get("runtime.version"),
+                (String) json.get("runtime.vendor"),
+                (String) json.get("runtime.architecture"),
+                (String) json.get("test.bundle"),
+                (Map<String, String>) json.get("custom"));
     }
-    return new Configurations(
-        (String) json.get("os.platform"),
-        (String) json.get("os.architecture"),
-        (String) json.get("os.version"),
-        (String) json.get("runtime.name"),
-        (String) json.get("runtime.version"),
-        (String) json.get("runtime.vendor"),
-        (String) json.get("runtime.architecture"),
-        (String) json.get("test.bundle"),
-        (Map<String, String>) json.get("custom"));
-  }
 
-  @ToJson
-  public Map<String, Object> toJson(Configurations configurations) {
-    Map<String, Object> json = new HashMap<>();
-    json.put("os.platform", configurations.getOsPlatform());
-    // os.arch and os.architecture are duplicates: different endpoints expect different names
-    json.put("os.arch", configurations.getOsArchitecture());
-    json.put("os.architecture", configurations.getOsArchitecture());
-    json.put("os.version", configurations.getOsVersion());
-    json.put("runtime.name", configurations.getRuntimeName());
-    json.put("runtime.version", configurations.getRuntimeVersion());
-    json.put("runtime.vendor", configurations.getRuntimeVendor());
-    json.put("runtime.architecture", configurations.getRuntimeArchitecture());
-    json.put("test.bundle", configurations.getTestBundle());
-    json.put("custom", configurations.getCustom());
-    return json;
-  }
+    @ToJson
+    public Map<String, Object> toJson(Configurations configurations) {
+        Map<String, Object> json = new HashMap<>();
+        json.put("os.platform", configurations.getOsPlatform());
+        // os.arch and os.architecture are duplicates: different endpoints expect different names
+        json.put("os.arch", configurations.getOsArchitecture());
+        json.put("os.architecture", configurations.getOsArchitecture());
+        json.put("os.version", configurations.getOsVersion());
+        json.put("runtime.name", configurations.getRuntimeName());
+        json.put("runtime.version", configurations.getRuntimeVersion());
+        json.put("runtime.vendor", configurations.getRuntimeVendor());
+        json.put("runtime.architecture", configurations.getRuntimeArchitecture());
+        json.put("test.bundle", configurations.getTestBundle());
+        json.put("custom", configurations.getCustom());
+        return json;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/DynamicAutoTestRetrySettings.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/DynamicAutoTestRetrySettings.java
index d04fc1f58fb..b335ada43bb 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/DynamicAutoTestRetrySettings.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/DynamicAutoTestRetrySettings.java
@@ -8,104 +8,98 @@
 
 public final class DynamicAutoTestRetrySettings {
 
-  public static final DynamicAutoTestRetrySettings DEFAULT =
-      new DynamicAutoTestRetrySettings(false, false, Collections.emptyList());
-
-  private static final long[] BUCKET_DURATIONS_MILLIS = {
-    5_000, 10_000, 30_000, 300_000, Long.MAX_VALUE
-  };
-
-  private final boolean enabled;
-  private final boolean custom;
-  private final List<ExecutionsByDuration> executionsByDuration;
-
-  private DynamicAutoTestRetrySettings(
-      boolean enabled, boolean custom, List<ExecutionsByDuration> executionsByDuration) {
-    this.enabled = enabled;
-    this.custom = custom;
-    this.executionsByDuration = Collections.unmodifiableList(new ArrayList<>(executionsByDuration));
-  }
-
-  public static DynamicAutoTestRetrySettings create(
-      boolean enabled,
-      List<Integer> customBuckets,
-      List<ExecutionsByDuration> backendRetriesByDuration) {
-    if (!enabled) {
-      return DEFAULT;
+    public static final DynamicAutoTestRetrySettings DEFAULT =
+            new DynamicAutoTestRetrySettings(false, false, Collections.emptyList());
+
+    private static final long[] BUCKET_DURATIONS_MILLIS = {5_000, 10_000, 30_000, 300_000, Long.MAX_VALUE};
+
+    private final boolean enabled;
+    private final boolean custom;
+    private final List<ExecutionsByDuration> executionsByDuration;
+
+    private DynamicAutoTestRetrySettings(
+            boolean enabled, boolean custom, List<ExecutionsByDuration> executionsByDuration) {
+        this.enabled = enabled;
+        this.custom = custom;
+        this.executionsByDuration = Collections.unmodifiableList(new ArrayList<>(executionsByDuration));
     }
-    List<ExecutionsByDuration> executionsByDuration = new ArrayList<>();
-    if (customBuckets != null) {
-      for (int i = 0; i < customBuckets.size(); i++) {
-        executionsByDuration.add(
-            new ExecutionsByDuration(BUCKET_DURATIONS_MILLIS[i], customBuckets.get(i) + 1));
-      }
-    } else {
-      for (ExecutionsByDuration retries : backendRetriesByDuration) {
-        executionsByDuration.add(
-            new ExecutionsByDuration(
-                retries.getDurationMillis(), Math.max(1, retries.getExecutions()) + 1));
-      }
+
+    public static DynamicAutoTestRetrySettings create(
+            boolean enabled, List<Integer> customBuckets, List<ExecutionsByDuration> backendRetriesByDuration) {
+        if (!enabled) {
+            return DEFAULT;
+        }
+        List<ExecutionsByDuration> executionsByDuration = new ArrayList<>();
+        if (customBuckets != null) {
+            for (int i = 0; i < customBuckets.size(); i++) {
+                executionsByDuration.add(
+                        new ExecutionsByDuration(BUCKET_DURATIONS_MILLIS[i], customBuckets.get(i) + 1));
+            }
+        } else {
+            for (ExecutionsByDuration retries : backendRetriesByDuration) {
+                executionsByDuration.add(new ExecutionsByDuration(
+                        retries.getDurationMillis(), Math.max(1, retries.getExecutions()) + 1));
+            }
+        }
+        return new DynamicAutoTestRetrySettings(true, customBuckets != null, executionsByDuration);
     }
-    return new DynamicAutoTestRetrySettings(true, customBuckets != null, executionsByDuration);
-  }
-
-  public boolean isEnabled() {
-    return enabled;
-  }
-
-  public boolean isCustom() {
-    return custom;
-  }
-
-  public int executionsForDuration(long durationMillis) {
-    for (ExecutionsByDuration executions : executionsByDuration) {
-      if (durationMillis <= executions.getDurationMillis()) {
-        return executions.getExecutions();
-      }
+
+    public boolean isEnabled() {
+        return enabled;
     }
-    return 2;
-  }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public boolean isCustom() {
+        return custom;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    public int executionsForDuration(long durationMillis) {
+        for (ExecutionsByDuration executions : executionsByDuration) {
+            if (durationMillis <= executions.getDurationMillis()) {
+                return executions.getExecutions();
+            }
+        }
+        return 2;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        DynamicAutoTestRetrySettings that = (DynamicAutoTestRetrySettings) o;
+        return enabled == that.enabled
+                && custom == that.custom
+                && Objects.equals(executionsByDuration, that.executionsByDuration);
     }
-    DynamicAutoTestRetrySettings that = (DynamicAutoTestRetrySettings) o;
-    return enabled == that.enabled
-        && custom == that.custom
-        && Objects.equals(executionsByDuration, that.executionsByDuration);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(enabled, custom, executionsByDuration);
-  }
-
-  public static final class Serializer {
-
-    private static final int ENABLED_FLAG = 1;
-    private static final int CUSTOM_FLAG = 2;
-
-    public static void serialize(
-        datadog.trace.civisibility.ipc.serialization.Serializer serializer,
-        DynamicAutoTestRetrySettings settings) {
-      byte flags =
-          (byte) ((settings.enabled ? ENABLED_FLAG : 0) | (settings.custom ? CUSTOM_FLAG : 0));
-      serializer.write(flags);
-      serializer.write(settings.executionsByDuration, ExecutionsByDuration.Serializer::serialize);
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(enabled, custom, executionsByDuration);
     }
 
-    public static DynamicAutoTestRetrySettings deserialize(ByteBuffer buffer) {
-      byte flags = datadog.trace.civisibility.ipc.serialization.Serializer.readByte(buffer);
-      List<ExecutionsByDuration> executionsByDuration =
-          datadog.trace.civisibility.ipc.serialization.Serializer.readList(
-              buffer, ExecutionsByDuration.Serializer::deserialize);
-      return new DynamicAutoTestRetrySettings(
-          (flags & ENABLED_FLAG) != 0, (flags & CUSTOM_FLAG) != 0, executionsByDuration);
+    public static final class Serializer {
+
+        private static final int ENABLED_FLAG = 1;
+        private static final int CUSTOM_FLAG = 2;
+
+        public static void serialize(
+                datadog.trace.civisibility.ipc.serialization.Serializer serializer,
+                DynamicAutoTestRetrySettings settings) {
+            byte flags = (byte) ((settings.enabled ? ENABLED_FLAG : 0) | (settings.custom ? CUSTOM_FLAG : 0));
+            serializer.write(flags);
+            serializer.write(settings.executionsByDuration, ExecutionsByDuration.Serializer::serialize);
+        }
+
+        public static DynamicAutoTestRetrySettings deserialize(ByteBuffer buffer) {
+            byte flags = datadog.trace.civisibility.ipc.serialization.Serializer.readByte(buffer);
+            List<ExecutionsByDuration> executionsByDuration =
+                    datadog.trace.civisibility.ipc.serialization.Serializer.readList(
+                            buffer, ExecutionsByDuration.Serializer::deserialize);
+            return new DynamicAutoTestRetrySettings(
+                    (flags & ENABLED_FLAG) != 0, (flags & CUSTOM_FLAG) != 0, executionsByDuration);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/EarlyFlakeDetectionSettings.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/EarlyFlakeDetectionSettings.java
index b11e0a4cb53..70762bbc2e7 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/EarlyFlakeDetectionSettings.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/EarlyFlakeDetectionSettings.java
@@ -12,131 +12,128 @@
 
 public class EarlyFlakeDetectionSettings {
 
-  public static final EarlyFlakeDetectionSettings DEFAULT =
-      new EarlyFlakeDetectionSettings(false, Collections.emptyList(), -1);
-
-  private final boolean enabled;
-  private final List<ExecutionsByDuration> executionsByDuration;
-  private final int faultySessionThreshold;
-
-  public EarlyFlakeDetectionSettings(
-      boolean enabled,
-      List<ExecutionsByDuration> executionsByDuration,
-      int faultySessionThreshold) {
-    this.enabled = enabled;
-    this.executionsByDuration = executionsByDuration;
-    this.faultySessionThreshold = faultySessionThreshold;
-  }
-
-  public boolean isEnabled() {
-    return enabled;
-  }
-
-  public int getFaultySessionThreshold() {
-    return faultySessionThreshold;
-  }
-
-  public List<ExecutionsByDuration> getExecutionsByDuration() {
-    return executionsByDuration;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public static final EarlyFlakeDetectionSettings DEFAULT =
+            new EarlyFlakeDetectionSettings(false, Collections.emptyList(), -1);
+
+    private final boolean enabled;
+    private final List<ExecutionsByDuration> executionsByDuration;
+    private final int faultySessionThreshold;
+
+    public EarlyFlakeDetectionSettings(
+            boolean enabled, List<ExecutionsByDuration> executionsByDuration, int faultySessionThreshold) {
+        this.enabled = enabled;
+        this.executionsByDuration = executionsByDuration;
+        this.faultySessionThreshold = faultySessionThreshold;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public int getFaultySessionThreshold() {
+        return faultySessionThreshold;
     }
-    EarlyFlakeDetectionSettings that = (EarlyFlakeDetectionSettings) o;
-    return enabled == that.enabled
-        && faultySessionThreshold == that.faultySessionThreshold
-        && Objects.equals(executionsByDuration, that.executionsByDuration);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(enabled, executionsByDuration, faultySessionThreshold);
-  }
-
-  public static final class Serializer {
-    public static void serialize(
-        datadog.trace.civisibility.ipc.serialization.Serializer serializer,
-        EarlyFlakeDetectionSettings settings) {
-      if (!settings.enabled) {
-        serializer.write((byte) 0);
-        return;
-      }
-      serializer.write((byte) 1);
-      serializer.write(settings.faultySessionThreshold);
-      serializer.write(settings.executionsByDuration, ExecutionsByDuration.Serializer::serialize);
+
+    public List<ExecutionsByDuration> getExecutionsByDuration() {
+        return executionsByDuration;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        EarlyFlakeDetectionSettings that = (EarlyFlakeDetectionSettings) o;
+        return enabled == that.enabled
+                && faultySessionThreshold == that.faultySessionThreshold
+                && Objects.equals(executionsByDuration, that.executionsByDuration);
     }
 
-    public static EarlyFlakeDetectionSettings deserialize(ByteBuffer buf) {
-      boolean enabled = datadog.trace.civisibility.ipc.serialization.Serializer.readByte(buf) != 0;
-      if (!enabled) {
-        return EarlyFlakeDetectionSettings.DEFAULT;
-      }
-
-      int faultySessionThreshold =
-          datadog.trace.civisibility.ipc.serialization.Serializer.readInt(buf);
-      List<ExecutionsByDuration> executionsByDuration =
-          datadog.trace.civisibility.ipc.serialization.Serializer.readList(
-              buf, ExecutionsByDuration.Serializer::deserialize);
-      return new EarlyFlakeDetectionSettings(enabled, executionsByDuration, faultySessionThreshold);
+    @Override
+    public int hashCode() {
+        return Objects.hash(enabled, executionsByDuration, faultySessionThreshold);
     }
-  }
-
-  public static final class JsonAdapter {
-    public static final JsonAdapter INSTANCE = new JsonAdapter();
-
-    @FromJson
-    public EarlyFlakeDetectionSettings fromJson(Map<String, Object> json) {
-      if (json == null) {
-        return EarlyFlakeDetectionSettings.DEFAULT;
-      }
-
-      Boolean enabled = (Boolean) json.get("enabled");
-      Double faultySessionThreshold = (Double) json.get("faulty_session_threshold");
-
-      List<ExecutionsByDuration> executionsByDuration;
-      Map<String, Double> slowTestRetries = (Map<String, Double>) json.get("slow_test_retries");
-      if (slowTestRetries != null) {
-        executionsByDuration = new ArrayList<>(slowTestRetries.size());
-        for (Map.Entry<String, Double> e : slowTestRetries.entrySet()) {
-          long durationMillis = parseDuration(e.getKey());
-          int retries = e.getValue().intValue();
-          executionsByDuration.add(new ExecutionsByDuration(durationMillis, retries));
+
+    public static final class Serializer {
+        public static void serialize(
+                datadog.trace.civisibility.ipc.serialization.Serializer serializer,
+                EarlyFlakeDetectionSettings settings) {
+            if (!settings.enabled) {
+                serializer.write((byte) 0);
+                return;
+            }
+            serializer.write((byte) 1);
+            serializer.write(settings.faultySessionThreshold);
+            serializer.write(settings.executionsByDuration, ExecutionsByDuration.Serializer::serialize);
+        }
+
+        public static EarlyFlakeDetectionSettings deserialize(ByteBuffer buf) {
+            boolean enabled = datadog.trace.civisibility.ipc.serialization.Serializer.readByte(buf) != 0;
+            if (!enabled) {
+                return EarlyFlakeDetectionSettings.DEFAULT;
+            }
+
+            int faultySessionThreshold = datadog.trace.civisibility.ipc.serialization.Serializer.readInt(buf);
+            List<ExecutionsByDuration> executionsByDuration =
+                    datadog.trace.civisibility.ipc.serialization.Serializer.readList(
+                            buf, ExecutionsByDuration.Serializer::deserialize);
+            return new EarlyFlakeDetectionSettings(enabled, executionsByDuration, faultySessionThreshold);
         }
-        executionsByDuration.sort(Comparator.comparingLong(r -> r.durationMillis));
-      } else {
-        executionsByDuration = Collections.emptyList();
-      }
-
-      return new EarlyFlakeDetectionSettings(
-          enabled != null ? enabled : false,
-          executionsByDuration,
-          faultySessionThreshold != null ? faultySessionThreshold.intValue() : -1);
     }
 
-    private static long parseDuration(String duration) {
-      char lastCharacter = duration.charAt(duration.length() - 1);
-      int numericValue = Integer.parseInt(duration.substring(0, duration.length() - 1));
-      TimeUnit timeUnit;
-      switch (lastCharacter) {
-        case 's':
-          timeUnit = TimeUnit.SECONDS;
-          break;
-        case 'm':
-          timeUnit = TimeUnit.MINUTES;
-          break;
-        case 'h':
-          timeUnit = TimeUnit.HOURS;
-          break;
-        default:
-          throw new IllegalArgumentException("Unexpected duration unit: " + lastCharacter);
-      }
-      return timeUnit.toMillis(numericValue);
+    public static final class JsonAdapter {
+        public static final JsonAdapter INSTANCE = new JsonAdapter();
+
+        @FromJson
+        public EarlyFlakeDetectionSettings fromJson(Map<String, Object> json) {
+            if (json == null) {
+                return EarlyFlakeDetectionSettings.DEFAULT;
+            }
+
+            Boolean enabled = (Boolean) json.get("enabled");
+            Double faultySessionThreshold = (Double) json.get("faulty_session_threshold");
+
+            List<ExecutionsByDuration> executionsByDuration;
+            Map<String, Double> slowTestRetries = (Map<String, Double>) json.get("slow_test_retries");
+            if (slowTestRetries != null) {
+                executionsByDuration = new ArrayList<>(slowTestRetries.size());
+                for (Map.Entry<String, Double> e : slowTestRetries.entrySet()) {
+                    long durationMillis = parseDuration(e.getKey());
+                    int retries = e.getValue().intValue();
+                    executionsByDuration.add(new ExecutionsByDuration(durationMillis, retries));
+                }
+                executionsByDuration.sort(Comparator.comparingLong(r -> r.durationMillis));
+            } else {
+                executionsByDuration = Collections.emptyList();
+            }
+
+            return new EarlyFlakeDetectionSettings(
+                    enabled != null ? enabled : false,
+                    executionsByDuration,
+                    faultySessionThreshold != null ? faultySessionThreshold.intValue() : -1);
+        }
+
+        private static long parseDuration(String duration) {
+            char lastCharacter = duration.charAt(duration.length() - 1);
+            int numericValue = Integer.parseInt(duration.substring(0, duration.length() - 1));
+            TimeUnit timeUnit;
+            switch (lastCharacter) {
+                case 's':
+                    timeUnit = TimeUnit.SECONDS;
+                    break;
+                case 'm':
+                    timeUnit = TimeUnit.MINUTES;
+                    break;
+                case 'h':
+                    timeUnit = TimeUnit.HOURS;
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unexpected duration unit: " + lastCharacter);
+            }
+            return timeUnit.toMillis(numericValue);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java
index 77fcb093289..8ff9bf51749 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java
@@ -19,460 +19,464 @@
 /** Settings and tests data received from the backend. */
 public class ExecutionSettings {
 
-  public static final ExecutionSettings EMPTY =
-      new ExecutionSettings(
-          false,
-          false,
-          false,
-          false,
-          false,
-          false,
-          false,
-          EarlyFlakeDetectionSettings.DEFAULT,
-          DynamicAutoTestRetrySettings.DEFAULT,
-          TestManagementSettings.DEFAULT,
-          null,
-          Collections.emptyMap(),
-          Collections.emptyMap(),
-          null,
-          null,
-          Collections.emptyList(),
-          Collections.emptyList(),
-          Collections.emptyList(),
-          LineDiff.EMPTY,
-          ConfigurationErrors.NONE);
-
-  public static final ExecutionSettings SETTINGS_REQUEST_ERROR =
-      new ExecutionSettings(
-          false,
-          false,
-          false,
-          false,
-          false,
-          false,
-          false,
-          EarlyFlakeDetectionSettings.DEFAULT,
-          DynamicAutoTestRetrySettings.DEFAULT,
-          TestManagementSettings.DEFAULT,
-          null,
-          Collections.emptyMap(),
-          Collections.emptyMap(),
-          null,
-          null,
-          Collections.emptyList(),
-          Collections.emptyList(),
-          Collections.emptyList(),
-          LineDiff.EMPTY,
-          new ConfigurationErrors(true, false, false, false, false));
-
-  private final boolean itrEnabled;
-  private final boolean codeCoverageEnabled;
-  private final boolean testSkippingEnabled;
-  private final boolean flakyTestRetriesEnabled;
-  private final boolean impactedTestsDetectionEnabled;
-  private final boolean codeCoverageReportUploadEnabled;
-  private final boolean failedTestReplayEnabled;
-  @Nonnull private final EarlyFlakeDetectionSettings earlyFlakeDetectionSettings;
-  @Nonnull private final DynamicAutoTestRetrySettings dynamicAutoTestRetrySettings;
-  @Nonnull private final TestManagementSettings testManagementSettings;
-  @Nullable private final String itrCorrelationId;
-  @Nonnull private final Map<TestIdentifier, TestMetadata> skippableTests;
-  @Nonnull private final Map<String, BitSet> skippableTestsCoverage;
-  @Nonnull private final Map<TestFQN, Integer> testSettings;
-  @Nonnull private final Map<TestSetting, Integer> settingsCount;
-  @Nonnull private final Diff pullRequestDiff;
-  @Nonnull private final ConfigurationErrors configurationErrors;
-
-  public ExecutionSettings(
-      boolean itrEnabled,
-      boolean codeCoverageEnabled,
-      boolean testSkippingEnabled,
-      boolean flakyTestRetriesEnabled,
-      boolean impactedTestsDetectionEnabled,
-      boolean codeCoverageReportUploadEnabled,
-      boolean failedTestReplayEnabled,
-      @Nonnull EarlyFlakeDetectionSettings earlyFlakeDetectionSettings,
-      @Nonnull DynamicAutoTestRetrySettings dynamicAutoTestRetrySettings,
-      @Nonnull TestManagementSettings testManagementSettings,
-      @Nullable String itrCorrelationId,
-      @Nonnull Map<TestIdentifier, TestMetadata> skippableTests,
-      @Nonnull Map<String, BitSet> skippableTestsCoverage,
-      @Nullable Collection<TestFQN> flakyTests,
-      @Nullable Collection<TestFQN> knownTests,
-      @Nonnull Collection<TestFQN> quarantinedTests,
-      @Nonnull Collection<TestFQN> disabledTests,
-      @Nonnull Collection<TestFQN> attemptToFixTests,
-      @Nonnull Diff pullRequestDiff,
-      @Nonnull ConfigurationErrors configurationErrors) {
-    this.itrEnabled = itrEnabled;
-    this.codeCoverageEnabled = codeCoverageEnabled;
-    this.testSkippingEnabled = testSkippingEnabled;
-    this.flakyTestRetriesEnabled = flakyTestRetriesEnabled;
-    this.impactedTestsDetectionEnabled = impactedTestsDetectionEnabled;
-    this.codeCoverageReportUploadEnabled = codeCoverageReportUploadEnabled;
-    this.failedTestReplayEnabled = failedTestReplayEnabled;
-    this.earlyFlakeDetectionSettings = earlyFlakeDetectionSettings;
-    this.dynamicAutoTestRetrySettings = dynamicAutoTestRetrySettings;
-    this.testManagementSettings = testManagementSettings;
-    this.itrCorrelationId = itrCorrelationId;
-    this.skippableTests = skippableTests;
-    this.skippableTestsCoverage = skippableTestsCoverage;
-    this.pullRequestDiff = pullRequestDiff;
-    this.configurationErrors = configurationErrors;
-
-    testSettings = new HashMap<>();
-    if (flakyTests != null) {
-      flakyTests.forEach(fqn -> addTest(fqn, TestSetting.FLAKY));
+    public static final ExecutionSettings EMPTY = new ExecutionSettings(
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            EarlyFlakeDetectionSettings.DEFAULT,
+            DynamicAutoTestRetrySettings.DEFAULT,
+            TestManagementSettings.DEFAULT,
+            null,
+            Collections.emptyMap(),
+            Collections.emptyMap(),
+            null,
+            null,
+            Collections.emptyList(),
+            Collections.emptyList(),
+            Collections.emptyList(),
+            LineDiff.EMPTY,
+            ConfigurationErrors.NONE);
+
+    public static final ExecutionSettings SETTINGS_REQUEST_ERROR = new ExecutionSettings(
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            EarlyFlakeDetectionSettings.DEFAULT,
+            DynamicAutoTestRetrySettings.DEFAULT,
+            TestManagementSettings.DEFAULT,
+            null,
+            Collections.emptyMap(),
+            Collections.emptyMap(),
+            null,
+            null,
+            Collections.emptyList(),
+            Collections.emptyList(),
+            Collections.emptyList(),
+            LineDiff.EMPTY,
+            new ConfigurationErrors(true, false, false, false, false));
+
+    private final boolean itrEnabled;
+    private final boolean codeCoverageEnabled;
+    private final boolean testSkippingEnabled;
+    private final boolean flakyTestRetriesEnabled;
+    private final boolean impactedTestsDetectionEnabled;
+    private final boolean codeCoverageReportUploadEnabled;
+    private final boolean failedTestReplayEnabled;
+
+    @Nonnull
+    private final EarlyFlakeDetectionSettings earlyFlakeDetectionSettings;
+
+    @Nonnull
+    private final DynamicAutoTestRetrySettings dynamicAutoTestRetrySettings;
+
+    @Nonnull
+    private final TestManagementSettings testManagementSettings;
+
+    @Nullable
+    private final String itrCorrelationId;
+
+    @Nonnull
+    private final Map<TestIdentifier, TestMetadata> skippableTests;
+
+    @Nonnull
+    private final Map<String, BitSet> skippableTestsCoverage;
+
+    @Nonnull
+    private final Map<TestFQN, Integer> testSettings;
+
+    @Nonnull
+    private final Map<TestSetting, Integer> settingsCount;
+
+    @Nonnull
+    private final Diff pullRequestDiff;
+
+    @Nonnull
+    private final ConfigurationErrors configurationErrors;
+
+    public ExecutionSettings(
+            boolean itrEnabled,
+            boolean codeCoverageEnabled,
+            boolean testSkippingEnabled,
+            boolean flakyTestRetriesEnabled,
+            boolean impactedTestsDetectionEnabled,
+            boolean codeCoverageReportUploadEnabled,
+            boolean failedTestReplayEnabled,
+            @Nonnull EarlyFlakeDetectionSettings earlyFlakeDetectionSettings,
+            @Nonnull DynamicAutoTestRetrySettings dynamicAutoTestRetrySettings,
+            @Nonnull TestManagementSettings testManagementSettings,
+            @Nullable String itrCorrelationId,
+            @Nonnull Map<TestIdentifier, TestMetadata> skippableTests,
+            @Nonnull Map<String, BitSet> skippableTestsCoverage,
+            @Nullable Collection<TestFQN> flakyTests,
+            @Nullable Collection<TestFQN> knownTests,
+            @Nonnull Collection<TestFQN> quarantinedTests,
+            @Nonnull Collection<TestFQN> disabledTests,
+            @Nonnull Collection<TestFQN> attemptToFixTests,
+            @Nonnull Diff pullRequestDiff,
+            @Nonnull ConfigurationErrors configurationErrors) {
+        this.itrEnabled = itrEnabled;
+        this.codeCoverageEnabled = codeCoverageEnabled;
+        this.testSkippingEnabled = testSkippingEnabled;
+        this.flakyTestRetriesEnabled = flakyTestRetriesEnabled;
+        this.impactedTestsDetectionEnabled = impactedTestsDetectionEnabled;
+        this.codeCoverageReportUploadEnabled = codeCoverageReportUploadEnabled;
+        this.failedTestReplayEnabled = failedTestReplayEnabled;
+        this.earlyFlakeDetectionSettings = earlyFlakeDetectionSettings;
+        this.dynamicAutoTestRetrySettings = dynamicAutoTestRetrySettings;
+        this.testManagementSettings = testManagementSettings;
+        this.itrCorrelationId = itrCorrelationId;
+        this.skippableTests = skippableTests;
+        this.skippableTestsCoverage = skippableTestsCoverage;
+        this.pullRequestDiff = pullRequestDiff;
+        this.configurationErrors = configurationErrors;
+
+        testSettings = new HashMap<>();
+        if (flakyTests != null) {
+            flakyTests.forEach(fqn -> addTest(fqn, TestSetting.FLAKY));
+        }
+        if (knownTests != null) {
+            knownTests.forEach(fqn -> addTest(fqn, TestSetting.KNOWN));
+        }
+        quarantinedTests.forEach(fqn -> addTest(fqn, TestSetting.QUARANTINED));
+        disabledTests.forEach(fqn -> addTest(fqn, TestSetting.DISABLED));
+        attemptToFixTests.forEach(fqn -> addTest(fqn, TestSetting.ATTEMPT_TO_FIX));
+
+        settingsCount = new EnumMap<>(TestSetting.class);
+        settingsCount.put(TestSetting.FLAKY, flakyTests != null ? flakyTests.size() : -1);
+        settingsCount.put(TestSetting.KNOWN, knownTests != null ? knownTests.size() : -1);
+        settingsCount.put(TestSetting.QUARANTINED, quarantinedTests.size());
+        settingsCount.put(TestSetting.DISABLED, disabledTests.size());
+        settingsCount.put(TestSetting.ATTEMPT_TO_FIX, attemptToFixTests.size());
     }
-    if (knownTests != null) {
-      knownTests.forEach(fqn -> addTest(fqn, TestSetting.KNOWN));
+
+    private void addTest(TestFQN test, TestSetting setting) {
+        testSettings.merge(test, setting.getFlag(), (a, b) -> a | b);
+    }
+
+    private ExecutionSettings(
+            boolean itrEnabled,
+            boolean codeCoverageEnabled,
+            boolean testSkippingEnabled,
+            boolean flakyTestRetriesEnabled,
+            boolean impactedTestsDetectionEnabled,
+            boolean codeCoverageReportUploadEnabled,
+            boolean failedTestReplayEnabled,
+            @Nonnull EarlyFlakeDetectionSettings earlyFlakeDetectionSettings,
+            @Nonnull DynamicAutoTestRetrySettings dynamicAutoTestRetrySettings,
+            @Nonnull TestManagementSettings testManagementSettings,
+            @Nullable String itrCorrelationId,
+            @Nonnull Map<TestIdentifier, TestMetadata> skippableTests,
+            @Nonnull Map<String, BitSet> skippableTestsCoverage,
+            @Nonnull Map<TestFQN, Integer> testSettings,
+            @Nonnull EnumMap<TestSetting, Integer> settingsCount,
+            @Nonnull Diff pullRequestDiff,
+            @Nonnull ConfigurationErrors configurationErrors) {
+        this.itrEnabled = itrEnabled;
+        this.codeCoverageEnabled = codeCoverageEnabled;
+        this.testSkippingEnabled = testSkippingEnabled;
+        this.flakyTestRetriesEnabled = flakyTestRetriesEnabled;
+        this.impactedTestsDetectionEnabled = impactedTestsDetectionEnabled;
+        this.codeCoverageReportUploadEnabled = codeCoverageReportUploadEnabled;
+        this.failedTestReplayEnabled = failedTestReplayEnabled;
+        this.earlyFlakeDetectionSettings = earlyFlakeDetectionSettings;
+        this.dynamicAutoTestRetrySettings = dynamicAutoTestRetrySettings;
+        this.testManagementSettings = testManagementSettings;
+        this.itrCorrelationId = itrCorrelationId;
+        this.skippableTests = skippableTests;
+        this.skippableTestsCoverage = skippableTestsCoverage;
+        this.testSettings = testSettings;
+        this.settingsCount = settingsCount;
+        this.pullRequestDiff = pullRequestDiff;
+        this.configurationErrors = configurationErrors;
+    }
+
+    /**
+     * @return {@code true} if ITR is enabled. Enabled ITR does not necessarily imply test skipping:
+     *     for an excluded branch ITR will be enabled, but not skipping.
+     */
+    public boolean isItrEnabled() {
+        return itrEnabled;
+    }
+
+    public boolean isCodeCoverageEnabled() {
+        return codeCoverageEnabled;
+    }
+
+    public boolean isTestSkippingEnabled() {
+        return testSkippingEnabled;
+    }
+
+    public boolean isFlakyTestRetriesEnabled() {
+        return flakyTestRetriesEnabled;
+    }
+
+    public boolean isImpactedTestsDetectionEnabled() {
+        return impactedTestsDetectionEnabled;
+    }
+
+    public boolean isCodeCoverageReportUploadEnabled() {
+        return codeCoverageReportUploadEnabled;
+    }
+
+    public boolean isFailedTestReplayEnabled() {
+        return failedTestReplayEnabled;
+    }
+
+    @Nonnull
+    public EarlyFlakeDetectionSettings getEarlyFlakeDetectionSettings() {
+        return earlyFlakeDetectionSettings;
+    }
+
+    @Nonnull
+    public DynamicAutoTestRetrySettings getDynamicAutoTestRetrySettings() {
+        return dynamicAutoTestRetrySettings;
+    }
+
+    @Nonnull
+    public TestManagementSettings getTestManagementSettings() {
+        return testManagementSettings;
+    }
+
+    @Nullable
+    public String getItrCorrelationId() {
+        return itrCorrelationId;
+    }
+
+    @Nonnull
+    public Map<TestIdentifier, TestMetadata> getSkippableTests() {
+        return skippableTests;
+    }
+
+    /** A bit vector of covered lines by relative source file path. */
+    @Nonnull
+    public Map<String, BitSet> getSkippableTestsCoverage() {
+        return skippableTestsCoverage;
+    }
+
+    public boolean isFlakyTestsDataAvailable() {
+        return getSettingCount(TestSetting.FLAKY) != -1;
+    }
+
+    public boolean isKnownTestsDataAvailable() {
+        return getSettingCount(TestSetting.KNOWN) != -1;
+    }
+
+    private boolean isSetting(TestFQN test, TestSetting setting) {
+        int mask = testSettings.getOrDefault(test, 0);
+        return TestSetting.isSet(mask, setting);
+    }
+
+    public boolean isFlaky(TestFQN test) {
+        return isSetting(test, TestSetting.FLAKY);
+    }
+
+    public boolean isKnown(TestFQN test) {
+        return isSetting(test, TestSetting.KNOWN);
     }
-    quarantinedTests.forEach(fqn -> addTest(fqn, TestSetting.QUARANTINED));
-    disabledTests.forEach(fqn -> addTest(fqn, TestSetting.DISABLED));
-    attemptToFixTests.forEach(fqn -> addTest(fqn, TestSetting.ATTEMPT_TO_FIX));
-
-    settingsCount = new EnumMap<>(TestSetting.class);
-    settingsCount.put(TestSetting.FLAKY, flakyTests != null ? flakyTests.size() : -1);
-    settingsCount.put(TestSetting.KNOWN, knownTests != null ? knownTests.size() : -1);
-    settingsCount.put(TestSetting.QUARANTINED, quarantinedTests.size());
-    settingsCount.put(TestSetting.DISABLED, disabledTests.size());
-    settingsCount.put(TestSetting.ATTEMPT_TO_FIX, attemptToFixTests.size());
-  }
-
-  private void addTest(TestFQN test, TestSetting setting) {
-    testSettings.merge(test, setting.getFlag(), (a, b) -> a | b);
-  }
-
-  private ExecutionSettings(
-      boolean itrEnabled,
-      boolean codeCoverageEnabled,
-      boolean testSkippingEnabled,
-      boolean flakyTestRetriesEnabled,
-      boolean impactedTestsDetectionEnabled,
-      boolean codeCoverageReportUploadEnabled,
-      boolean failedTestReplayEnabled,
-      @Nonnull EarlyFlakeDetectionSettings earlyFlakeDetectionSettings,
-      @Nonnull DynamicAutoTestRetrySettings dynamicAutoTestRetrySettings,
-      @Nonnull TestManagementSettings testManagementSettings,
-      @Nullable String itrCorrelationId,
-      @Nonnull Map<TestIdentifier, TestMetadata> skippableTests,
-      @Nonnull Map<String, BitSet> skippableTestsCoverage,
-      @Nonnull Map<TestFQN, Integer> testSettings,
-      @Nonnull EnumMap<TestSetting, Integer> settingsCount,
-      @Nonnull Diff pullRequestDiff,
-      @Nonnull ConfigurationErrors configurationErrors) {
-    this.itrEnabled = itrEnabled;
-    this.codeCoverageEnabled = codeCoverageEnabled;
-    this.testSkippingEnabled = testSkippingEnabled;
-    this.flakyTestRetriesEnabled = flakyTestRetriesEnabled;
-    this.impactedTestsDetectionEnabled = impactedTestsDetectionEnabled;
-    this.codeCoverageReportUploadEnabled = codeCoverageReportUploadEnabled;
-    this.failedTestReplayEnabled = failedTestReplayEnabled;
-    this.earlyFlakeDetectionSettings = earlyFlakeDetectionSettings;
-    this.dynamicAutoTestRetrySettings = dynamicAutoTestRetrySettings;
-    this.testManagementSettings = testManagementSettings;
-    this.itrCorrelationId = itrCorrelationId;
-    this.skippableTests = skippableTests;
-    this.skippableTestsCoverage = skippableTestsCoverage;
-    this.testSettings = testSettings;
-    this.settingsCount = settingsCount;
-    this.pullRequestDiff = pullRequestDiff;
-    this.configurationErrors = configurationErrors;
-  }
-
-  /**
-   * @return {@code true} if ITR is enabled. Enabled ITR does not necessarily imply test skipping:
-   *     for an excluded branch ITR will be enabled, but not skipping.
-   */
-  public boolean isItrEnabled() {
-    return itrEnabled;
-  }
-
-  public boolean isCodeCoverageEnabled() {
-    return codeCoverageEnabled;
-  }
-
-  public boolean isTestSkippingEnabled() {
-    return testSkippingEnabled;
-  }
-
-  public boolean isFlakyTestRetriesEnabled() {
-    return flakyTestRetriesEnabled;
-  }
-
-  public boolean isImpactedTestsDetectionEnabled() {
-    return impactedTestsDetectionEnabled;
-  }
-
-  public boolean isCodeCoverageReportUploadEnabled() {
-    return codeCoverageReportUploadEnabled;
-  }
-
-  public boolean isFailedTestReplayEnabled() {
-    return failedTestReplayEnabled;
-  }
-
-  @Nonnull
-  public EarlyFlakeDetectionSettings getEarlyFlakeDetectionSettings() {
-    return earlyFlakeDetectionSettings;
-  }
-
-  @Nonnull
-  public DynamicAutoTestRetrySettings getDynamicAutoTestRetrySettings() {
-    return dynamicAutoTestRetrySettings;
-  }
-
-  @Nonnull
-  public TestManagementSettings getTestManagementSettings() {
-    return testManagementSettings;
-  }
-
-  @Nullable
-  public String getItrCorrelationId() {
-    return itrCorrelationId;
-  }
-
-  @Nonnull
-  public Map<TestIdentifier, TestMetadata> getSkippableTests() {
-    return skippableTests;
-  }
-
-  /** A bit vector of covered lines by relative source file path. */
-  @Nonnull
-  public Map<String, BitSet> getSkippableTestsCoverage() {
-    return skippableTestsCoverage;
-  }
-
-  public boolean isFlakyTestsDataAvailable() {
-    return getSettingCount(TestSetting.FLAKY) != -1;
-  }
-
-  public boolean isKnownTestsDataAvailable() {
-    return getSettingCount(TestSetting.KNOWN) != -1;
-  }
-
-  private boolean isSetting(TestFQN test, TestSetting setting) {
-    int mask = testSettings.getOrDefault(test, 0);
-    return TestSetting.isSet(mask, setting);
-  }
-
-  public boolean isFlaky(TestFQN test) {
-    return isSetting(test, TestSetting.FLAKY);
-  }
-
-  public boolean isKnown(TestFQN test) {
-    return isSetting(test, TestSetting.KNOWN);
-  }
-
-  public boolean isQuarantined(TestFQN test) {
-    return isSetting(test, TestSetting.QUARANTINED);
-  }
-
-  public boolean isDisabled(TestFQN test) {
-    return isSetting(test, TestSetting.DISABLED);
-  }
-
-  public boolean isAttemptToFix(TestFQN test) {
-    return isSetting(test, TestSetting.ATTEMPT_TO_FIX);
-  }
-
-  /**
-   * @return number of tests with a certain setting "activated". For flaky and known test, it will
-   *     return -1 if a null value was provided to the constructor.
-   */
-  public int getSettingCount(TestSetting setting) {
-    return settingsCount.getOrDefault(setting, 0);
-  }
-
-  @Nonnull
-  public Diff getPullRequestDiff() {
-    return pullRequestDiff;
-  }
-
-  @Nonnull
-  public ConfigurationErrors getConfigurationErrors() {
-    return configurationErrors;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+
+    public boolean isQuarantined(TestFQN test) {
+        return isSetting(test, TestSetting.QUARANTINED);
+    }
+
+    public boolean isDisabled(TestFQN test) {
+        return isSetting(test, TestSetting.DISABLED);
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    public boolean isAttemptToFix(TestFQN test) {
+        return isSetting(test, TestSetting.ATTEMPT_TO_FIX);
     }
-    ExecutionSettings that = (ExecutionSettings) o;
-    return itrEnabled == that.itrEnabled
-        && codeCoverageEnabled == that.codeCoverageEnabled
-        && testSkippingEnabled == that.testSkippingEnabled
-        && flakyTestRetriesEnabled == that.flakyTestRetriesEnabled
-        && impactedTestsDetectionEnabled == that.impactedTestsDetectionEnabled
-        && codeCoverageReportUploadEnabled == that.codeCoverageReportUploadEnabled
-        && failedTestReplayEnabled == that.failedTestReplayEnabled
-        && Objects.equals(earlyFlakeDetectionSettings, that.earlyFlakeDetectionSettings)
-        && Objects.equals(dynamicAutoTestRetrySettings, that.dynamicAutoTestRetrySettings)
-        && Objects.equals(testManagementSettings, that.testManagementSettings)
-        && Objects.equals(itrCorrelationId, that.itrCorrelationId)
-        && Objects.equals(skippableTests, that.skippableTests)
-        && Objects.equals(skippableTestsCoverage, that.skippableTestsCoverage)
-        && Objects.equals(testSettings, that.testSettings)
-        && Objects.equals(settingsCount, that.settingsCount)
-        && Objects.equals(pullRequestDiff, that.pullRequestDiff)
-        && Objects.equals(configurationErrors, that.configurationErrors);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(
-        itrEnabled,
-        codeCoverageEnabled,
-        testSkippingEnabled,
-        flakyTestRetriesEnabled,
-        impactedTestsDetectionEnabled,
-        codeCoverageReportUploadEnabled,
-        failedTestReplayEnabled,
-        earlyFlakeDetectionSettings,
-        dynamicAutoTestRetrySettings,
-        testManagementSettings,
-        itrCorrelationId,
-        skippableTests,
-        skippableTestsCoverage,
-        testSettings,
-        settingsCount,
-        pullRequestDiff,
-        configurationErrors);
-  }
-
-  public static class Serializer {
-
-    private static final int ITR_ENABLED_FLAG = 1;
-    private static final int CODE_COVERAGE_ENABLED_FLAG = 2;
-    private static final int TEST_SKIPPING_ENABLED_FLAG = 4;
-    private static final int FLAKY_TEST_RETRIES_ENABLED_FLAG = 8;
-    private static final int IMPACTED_TESTS_DETECTION_ENABLED_FLAG = 16;
-    private static final int CODE_COVERAGE_REPORT_UPLOAD_ENABLED_FLAG = 32;
-    private static final int FAILED_TEST_REPLAY_ENABLED_FLAG = 64;
-
-    public static ByteBuffer serialize(ExecutionSettings settings) {
-      datadog.trace.civisibility.ipc.serialization.Serializer s =
-          new datadog.trace.civisibility.ipc.serialization.Serializer();
-
-      byte flags =
-          (byte)
-              ((settings.itrEnabled ? ITR_ENABLED_FLAG : 0)
-                  | (settings.codeCoverageEnabled ? CODE_COVERAGE_ENABLED_FLAG : 0)
-                  | (settings.testSkippingEnabled ? TEST_SKIPPING_ENABLED_FLAG : 0)
-                  | (settings.flakyTestRetriesEnabled ? FLAKY_TEST_RETRIES_ENABLED_FLAG : 0)
-                  | (settings.impactedTestsDetectionEnabled
-                      ? IMPACTED_TESTS_DETECTION_ENABLED_FLAG
-                      : 0)
-                  | (settings.codeCoverageReportUploadEnabled
-                      ? CODE_COVERAGE_REPORT_UPLOAD_ENABLED_FLAG
-                      : 0)
-                  | (settings.failedTestReplayEnabled ? FAILED_TEST_REPLAY_ENABLED_FLAG : 0));
-      s.write(flags);
-
-      ConfigurationErrors.serialize(s, settings.configurationErrors);
-
-      EarlyFlakeDetectionSettings.Serializer.serialize(s, settings.earlyFlakeDetectionSettings);
-      DynamicAutoTestRetrySettings.Serializer.serialize(s, settings.dynamicAutoTestRetrySettings);
-
-      TestManagementSettings.Serializer.serialize(s, settings.testManagementSettings);
-
-      s.write(settings.itrCorrelationId);
-      s.write(
-          settings.skippableTests,
-          TestIdentifierSerializer::serialize,
-          TestMetadataSerializer::serialize);
-
-      s.write(
-          settings.skippableTestsCoverage,
-          datadog.trace.civisibility.ipc.serialization.Serializer::write,
-          datadog.trace.civisibility.ipc.serialization.Serializer::write);
-
-      s.write(
-          settings.testSettings,
-          TestFQNSerializer::serialize,
-          datadog.trace.civisibility.ipc.serialization.Serializer::write);
-      s.write(
-          settings.settingsCount,
-          TestSetting.Serializer::serialize,
-          datadog.trace.civisibility.ipc.serialization.Serializer::write);
-
-      Diff.SERIALIZER.serialize(settings.pullRequestDiff, s);
-
-      return s.flush();
+
+    /**
+     * @return number of tests with a certain setting "activated". For flaky and known test, it will
+     *     return -1 if a null value was provided to the constructor.
+     */
+    public int getSettingCount(TestSetting setting) {
+        return settingsCount.getOrDefault(setting, 0);
+    }
+
+    @Nonnull
+    public Diff getPullRequestDiff() {
+        return pullRequestDiff;
+    }
+
+    @Nonnull
+    public ConfigurationErrors getConfigurationErrors() {
+        return configurationErrors;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ExecutionSettings that = (ExecutionSettings) o;
+        return itrEnabled == that.itrEnabled
+                && codeCoverageEnabled == that.codeCoverageEnabled
+                && testSkippingEnabled == that.testSkippingEnabled
+                && flakyTestRetriesEnabled == that.flakyTestRetriesEnabled
+                && impactedTestsDetectionEnabled == that.impactedTestsDetectionEnabled
+                && codeCoverageReportUploadEnabled == that.codeCoverageReportUploadEnabled
+                && failedTestReplayEnabled == that.failedTestReplayEnabled
+                && Objects.equals(earlyFlakeDetectionSettings, that.earlyFlakeDetectionSettings)
+                && Objects.equals(dynamicAutoTestRetrySettings, that.dynamicAutoTestRetrySettings)
+                && Objects.equals(testManagementSettings, that.testManagementSettings)
+                && Objects.equals(itrCorrelationId, that.itrCorrelationId)
+                && Objects.equals(skippableTests, that.skippableTests)
+                && Objects.equals(skippableTestsCoverage, that.skippableTestsCoverage)
+                && Objects.equals(testSettings, that.testSettings)
+                && Objects.equals(settingsCount, that.settingsCount)
+                && Objects.equals(pullRequestDiff, that.pullRequestDiff)
+                && Objects.equals(configurationErrors, that.configurationErrors);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(
+                itrEnabled,
+                codeCoverageEnabled,
+                testSkippingEnabled,
+                flakyTestRetriesEnabled,
+                impactedTestsDetectionEnabled,
+                codeCoverageReportUploadEnabled,
+                failedTestReplayEnabled,
+                earlyFlakeDetectionSettings,
+                dynamicAutoTestRetrySettings,
+                testManagementSettings,
+                itrCorrelationId,
+                skippableTests,
+                skippableTestsCoverage,
+                testSettings,
+                settingsCount,
+                pullRequestDiff,
+                configurationErrors);
     }
 
-    public static ExecutionSettings deserialize(ByteBuffer buffer) {
-      byte flags = datadog.trace.civisibility.ipc.serialization.Serializer.readByte(buffer);
-      boolean itrEnabled = (flags & ITR_ENABLED_FLAG) != 0;
-      boolean codeCoverageEnabled = (flags & CODE_COVERAGE_ENABLED_FLAG) != 0;
-      boolean testSkippingEnabled = (flags & TEST_SKIPPING_ENABLED_FLAG) != 0;
-      boolean flakyTestRetriesEnabled = (flags & FLAKY_TEST_RETRIES_ENABLED_FLAG) != 0;
-      boolean impactedTestsDetectionEnabled = (flags & IMPACTED_TESTS_DETECTION_ENABLED_FLAG) != 0;
-      boolean codeCoverageReportUploadEnabled =
-          (flags & CODE_COVERAGE_REPORT_UPLOAD_ENABLED_FLAG) != 0;
-      boolean failedTestReplayEnabled = (flags & FAILED_TEST_REPLAY_ENABLED_FLAG) != 0;
-
-      ConfigurationErrors configurationErrors = ConfigurationErrors.deserialize(buffer);
-
-      EarlyFlakeDetectionSettings earlyFlakeDetectionSettings =
-          EarlyFlakeDetectionSettings.Serializer.deserialize(buffer);
-      DynamicAutoTestRetrySettings dynamicAutoTestRetrySettings =
-          DynamicAutoTestRetrySettings.Serializer.deserialize(buffer);
-
-      TestManagementSettings testManagementSettings =
-          TestManagementSettings.Serializer.deserialize(buffer);
-
-      String itrCorrelationId =
-          datadog.trace.civisibility.ipc.serialization.Serializer.readString(buffer);
-
-      Map<TestIdentifier, TestMetadata> skippableTests =
-          datadog.trace.civisibility.ipc.serialization.Serializer.readMap(
-              buffer, TestIdentifierSerializer::deserialize, TestMetadataSerializer::deserialize);
-
-      Map<String, BitSet> skippableTestsCoverage =
-          datadog.trace.civisibility.ipc.serialization.Serializer.readMap(
-              buffer,
-              datadog.trace.civisibility.ipc.serialization.Serializer::readString,
-              datadog.trace.civisibility.ipc.serialization.Serializer::readBitSet);
-
-      Map<TestFQN, Integer> testSettings =
-          datadog.trace.civisibility.ipc.serialization.Serializer.readMap(
-              buffer,
-              TestFQNSerializer::deserialize,
-              datadog.trace.civisibility.ipc.serialization.Serializer::readInt);
-
-      EnumMap<TestSetting, Integer> settingsCount =
-          (EnumMap<TestSetting, Integer>)
-              datadog.trace.civisibility.ipc.serialization.Serializer.readMap(
-                  buffer,
-                  () -> new EnumMap<>(TestSetting.class),
-                  TestSetting.Serializer::deserialize,
-                  datadog.trace.civisibility.ipc.serialization.Serializer::readInt);
-
-      Diff diff = Diff.SERIALIZER.deserialize(buffer);
-
-      return new ExecutionSettings(
-          itrEnabled,
-          codeCoverageEnabled,
-          testSkippingEnabled,
-          flakyTestRetriesEnabled,
-          impactedTestsDetectionEnabled,
-          codeCoverageReportUploadEnabled,
-          failedTestReplayEnabled,
-          earlyFlakeDetectionSettings,
-          dynamicAutoTestRetrySettings,
-          testManagementSettings,
-          itrCorrelationId,
-          skippableTests,
-          skippableTestsCoverage,
-          testSettings,
-          settingsCount,
-          diff,
-          configurationErrors);
+    public static class Serializer {
+
+        private static final int ITR_ENABLED_FLAG = 1;
+        private static final int CODE_COVERAGE_ENABLED_FLAG = 2;
+        private static final int TEST_SKIPPING_ENABLED_FLAG = 4;
+        private static final int FLAKY_TEST_RETRIES_ENABLED_FLAG = 8;
+        private static final int IMPACTED_TESTS_DETECTION_ENABLED_FLAG = 16;
+        private static final int CODE_COVERAGE_REPORT_UPLOAD_ENABLED_FLAG = 32;
+        private static final int FAILED_TEST_REPLAY_ENABLED_FLAG = 64;
+
+        public static ByteBuffer serialize(ExecutionSettings settings) {
+            datadog.trace.civisibility.ipc.serialization.Serializer s =
+                    new datadog.trace.civisibility.ipc.serialization.Serializer();
+
+            byte flags = (byte) ((settings.itrEnabled ? ITR_ENABLED_FLAG : 0)
+                    | (settings.codeCoverageEnabled ? CODE_COVERAGE_ENABLED_FLAG : 0)
+                    | (settings.testSkippingEnabled ? TEST_SKIPPING_ENABLED_FLAG : 0)
+                    | (settings.flakyTestRetriesEnabled ? FLAKY_TEST_RETRIES_ENABLED_FLAG : 0)
+                    | (settings.impactedTestsDetectionEnabled ? IMPACTED_TESTS_DETECTION_ENABLED_FLAG : 0)
+                    | (settings.codeCoverageReportUploadEnabled ? CODE_COVERAGE_REPORT_UPLOAD_ENABLED_FLAG : 0)
+                    | (settings.failedTestReplayEnabled ? FAILED_TEST_REPLAY_ENABLED_FLAG : 0));
+            s.write(flags);
+
+            ConfigurationErrors.serialize(s, settings.configurationErrors);
+
+            EarlyFlakeDetectionSettings.Serializer.serialize(s, settings.earlyFlakeDetectionSettings);
+            DynamicAutoTestRetrySettings.Serializer.serialize(s, settings.dynamicAutoTestRetrySettings);
+
+            TestManagementSettings.Serializer.serialize(s, settings.testManagementSettings);
+
+            s.write(settings.itrCorrelationId);
+            s.write(settings.skippableTests, TestIdentifierSerializer::serialize, TestMetadataSerializer::serialize);
+
+            s.write(
+                    settings.skippableTestsCoverage,
+                    datadog.trace.civisibility.ipc.serialization.Serializer::write,
+                    datadog.trace.civisibility.ipc.serialization.Serializer::write);
+
+            s.write(
+                    settings.testSettings,
+                    TestFQNSerializer::serialize,
+                    datadog.trace.civisibility.ipc.serialization.Serializer::write);
+            s.write(
+                    settings.settingsCount,
+                    TestSetting.Serializer::serialize,
+                    datadog.trace.civisibility.ipc.serialization.Serializer::write);
+
+            Diff.SERIALIZER.serialize(settings.pullRequestDiff, s);
+
+            return s.flush();
+        }
+
+        public static ExecutionSettings deserialize(ByteBuffer buffer) {
+            byte flags = datadog.trace.civisibility.ipc.serialization.Serializer.readByte(buffer);
+            boolean itrEnabled = (flags & ITR_ENABLED_FLAG) != 0;
+            boolean codeCoverageEnabled = (flags & CODE_COVERAGE_ENABLED_FLAG) != 0;
+            boolean testSkippingEnabled = (flags & TEST_SKIPPING_ENABLED_FLAG) != 0;
+            boolean flakyTestRetriesEnabled = (flags & FLAKY_TEST_RETRIES_ENABLED_FLAG) != 0;
+            boolean impactedTestsDetectionEnabled = (flags & IMPACTED_TESTS_DETECTION_ENABLED_FLAG) != 0;
+            boolean codeCoverageReportUploadEnabled = (flags & CODE_COVERAGE_REPORT_UPLOAD_ENABLED_FLAG) != 0;
+            boolean failedTestReplayEnabled = (flags & FAILED_TEST_REPLAY_ENABLED_FLAG) != 0;
+
+            ConfigurationErrors configurationErrors = ConfigurationErrors.deserialize(buffer);
+
+            EarlyFlakeDetectionSettings earlyFlakeDetectionSettings =
+                    EarlyFlakeDetectionSettings.Serializer.deserialize(buffer);
+            DynamicAutoTestRetrySettings dynamicAutoTestRetrySettings =
+                    DynamicAutoTestRetrySettings.Serializer.deserialize(buffer);
+
+            TestManagementSettings testManagementSettings = TestManagementSettings.Serializer.deserialize(buffer);
+
+            String itrCorrelationId = datadog.trace.civisibility.ipc.serialization.Serializer.readString(buffer);
+
+            Map<TestIdentifier, TestMetadata> skippableTests =
+                    datadog.trace.civisibility.ipc.serialization.Serializer.readMap(
+                            buffer, TestIdentifierSerializer::deserialize, TestMetadataSerializer::deserialize);
+
+            Map<String, BitSet> skippableTestsCoverage =
+                    datadog.trace.civisibility.ipc.serialization.Serializer.readMap(
+                            buffer,
+                            datadog.trace.civisibility.ipc.serialization.Serializer::readString,
+                            datadog.trace.civisibility.ipc.serialization.Serializer::readBitSet);
+
+            Map<TestFQN, Integer> testSettings = datadog.trace.civisibility.ipc.serialization.Serializer.readMap(
+                    buffer,
+                    TestFQNSerializer::deserialize,
+                    datadog.trace.civisibility.ipc.serialization.Serializer::readInt);
+
+            EnumMap<TestSetting, Integer> settingsCount =
+                    (EnumMap<TestSetting, Integer>) datadog.trace.civisibility.ipc.serialization.Serializer.readMap(
+                            buffer,
+                            () -> new EnumMap<>(TestSetting.class),
+                            TestSetting.Serializer::deserialize,
+                            datadog.trace.civisibility.ipc.serialization.Serializer::readInt);
+
+            Diff diff = Diff.SERIALIZER.deserialize(buffer);
+
+            return new ExecutionSettings(
+                    itrEnabled,
+                    codeCoverageEnabled,
+                    testSkippingEnabled,
+                    flakyTestRetriesEnabled,
+                    impactedTestsDetectionEnabled,
+                    codeCoverageReportUploadEnabled,
+                    failedTestReplayEnabled,
+                    earlyFlakeDetectionSettings,
+                    dynamicAutoTestRetrySettings,
+                    testManagementSettings,
+                    itrCorrelationId,
+                    skippableTests,
+                    skippableTestsCoverage,
+                    testSettings,
+                    settingsCount,
+                    diff,
+                    configurationErrors);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactory.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactory.java
index 78cc564203d..23f90468d89 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactory.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactory.java
@@ -4,5 +4,5 @@
 import javax.annotation.Nullable;
 
 public interface ExecutionSettingsFactory {
-  ExecutionSettings create(@Nonnull JvmInfo jvmInfo, @Nullable String moduleName);
+    ExecutionSettings create(@Nonnull JvmInfo jvmInfo, @Nullable String moduleName);
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java
index 322d494b56b..7c9f37837a9 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java
@@ -37,503 +37,463 @@
 
 public class ExecutionSettingsFactoryImpl implements ExecutionSettingsFactory {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ExecutionSettingsFactoryImpl.class);
-
-  private static final String TEST_CONFIGURATION_TAG_PREFIX = "test.configuration.";
-
-  private static final ThreadFactory THREAD_FACTORY = r -> new Thread(null, r, "dd-ci-vis-config");
-
-  /**
-   * A workaround for bulk-requesting module settings. For any module that has no settings that are
-   * exclusive to it (i.e. that has no skippable/flaky/known tests), the settings will be under this
-   * key in the resulting map.
-   */
-  static final String DEFAULT_SETTINGS = "<DEFAULT>";
-
-  private final Config config;
-  private final ConfigurationApi configurationApi;
-  private final GitClient gitClient;
-  private final GitRepoUnshallow gitRepoUnshallow;
-  private final GitDataUploader gitDataUploader;
-  private final PullRequestInfo pullRequestInfo;
-  @Nullable private final String repositoryRoot;
-
-  public ExecutionSettingsFactoryImpl(
-      Config config,
-      ConfigurationApi configurationApi,
-      GitClient gitClient,
-      GitRepoUnshallow gitRepoUnshallow,
-      GitDataUploader gitDataUploader,
-      PullRequestInfo pullRequestInfo,
-      @Nullable String repositoryRoot) {
-    this.config = config;
-    this.configurationApi = configurationApi;
-    this.gitClient = gitClient;
-    this.gitRepoUnshallow = gitRepoUnshallow;
-    this.gitDataUploader = gitDataUploader;
-    this.pullRequestInfo = pullRequestInfo;
-    this.repositoryRoot = repositoryRoot;
-  }
-
-  /**
-   * @return Executions settings by module name
-   */
-  public Map<String, ExecutionSettings> create(@Nonnull JvmInfo jvmInfo) {
-    TracerEnvironment tracerEnvironment = buildTracerEnvironment(jvmInfo, null);
-    return create(tracerEnvironment);
-  }
-
-  @Override
-  public ExecutionSettings create(@Nonnull JvmInfo jvmInfo, @Nullable String moduleName) {
-    TracerEnvironment tracerEnvironment = buildTracerEnvironment(jvmInfo, moduleName);
-    Map<String, ExecutionSettings> settingsByModule = create(tracerEnvironment);
-    ExecutionSettings settings = settingsByModule.get(moduleName);
-    return settings != null ? settings : settingsByModule.get(DEFAULT_SETTINGS);
-  }
-
-  private TracerEnvironment buildTracerEnvironment(JvmInfo jvmInfo, @Nullable String moduleName) {
-    GitInfo gitInfo = GitInfoProvider.INSTANCE.getGitInfo(repositoryRoot);
-
-    TracerEnvironment.Builder builder = TracerEnvironment.builder();
-    for (Map.Entry<String, String> e : config.getGlobalTags().entrySet()) {
-      String key = e.getKey();
-      if (key.startsWith(TEST_CONFIGURATION_TAG_PREFIX)) {
-        String configurationKey = key.substring(TEST_CONFIGURATION_TAG_PREFIX.length());
-        String configurationValue = e.getValue();
-        builder.customTag(configurationKey, configurationValue);
-      }
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExecutionSettingsFactoryImpl.class);
+
+    private static final String TEST_CONFIGURATION_TAG_PREFIX = "test.configuration.";
+
+    private static final ThreadFactory THREAD_FACTORY = r -> new Thread(null, r, "dd-ci-vis-config");
+
+    /**
+     * A workaround for bulk-requesting module settings. For any module that has no settings that are
+     * exclusive to it (i.e. that has no skippable/flaky/known tests), the settings will be under this
+     * key in the resulting map.
+     */
+    static final String DEFAULT_SETTINGS = "<DEFAULT>";
+
+    private final Config config;
+    private final ConfigurationApi configurationApi;
+    private final GitClient gitClient;
+    private final GitRepoUnshallow gitRepoUnshallow;
+    private final GitDataUploader gitDataUploader;
+    private final PullRequestInfo pullRequestInfo;
+
+    @Nullable
+    private final String repositoryRoot;
+
+    public ExecutionSettingsFactoryImpl(
+            Config config,
+            ConfigurationApi configurationApi,
+            GitClient gitClient,
+            GitRepoUnshallow gitRepoUnshallow,
+            GitDataUploader gitDataUploader,
+            PullRequestInfo pullRequestInfo,
+            @Nullable String repositoryRoot) {
+        this.config = config;
+        this.configurationApi = configurationApi;
+        this.gitClient = gitClient;
+        this.gitRepoUnshallow = gitRepoUnshallow;
+        this.gitDataUploader = gitDataUploader;
+        this.pullRequestInfo = pullRequestInfo;
+        this.repositoryRoot = repositoryRoot;
     }
 
-    CiVisibilityWellKnownTags wellKnownTags = config.getCiVisibilityWellKnownTags();
-    return builder
-        .service(config.getServiceName())
-        .env(config.getEnv())
-        .repositoryUrl(gitInfo.getRepositoryURL())
-        .branch(gitInfo.getBranch())
-        .tag(gitInfo.getTag())
-        .sha(gitInfo.getCommit().getSha())
-        .commitMessage(gitInfo.getCommit().getFullMessage())
-        .osPlatform(wellKnownTags.getOsPlatform().toString())
-        .osArchitecture(wellKnownTags.getOsArch().toString())
-        .osVersion(wellKnownTags.getOsVersion().toString())
-        .runtimeName(jvmInfo.getName())
-        .runtimeVersion(jvmInfo.getVersion())
-        .runtimeVendor(jvmInfo.getVendor())
-        .testBundle(moduleName)
-        .build();
-  }
-
-  @Nonnull
-  private Map<String, ExecutionSettings> create(TracerEnvironment tracerEnvironment) {
-    CiVisibilitySettings settings = getCiVisibilitySettings(tracerEnvironment);
-    ExecutorService settingsExecutor = Executors.newCachedThreadPool(THREAD_FACTORY);
-    try {
-      return doCreate(tracerEnvironment, settings, settingsExecutor);
-
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      LOGGER.error("Interrupted while creating execution settings");
-      return Collections.singletonMap(DEFAULT_SETTINGS, ExecutionSettings.SETTINGS_REQUEST_ERROR);
-
-    } catch (ExecutionException e) {
-      LOGGER.error("Error while creating execution settings", e);
-      return Collections.singletonMap(DEFAULT_SETTINGS, ExecutionSettings.SETTINGS_REQUEST_ERROR);
-
-    } finally {
-      settingsExecutor.shutdownNow();
-    }
-  }
-
-  @Nonnull
-  private Map<String, ExecutionSettings> doCreate(
-      TracerEnvironment tracerEnvironment, CiVisibilitySettings settings, ExecutorService executor)
-      throws InterruptedException, ExecutionException {
-    if (settings.isSettingsRequestError()) {
-      return Collections.singletonMap(DEFAULT_SETTINGS, ExecutionSettings.SETTINGS_REQUEST_ERROR);
+    /**
+     * @return Executions settings by module name
+     */
+    public Map<String, ExecutionSettings> create(@Nonnull JvmInfo jvmInfo) {
+        TracerEnvironment tracerEnvironment = buildTracerEnvironment(jvmInfo, null);
+        return create(tracerEnvironment);
     }
 
-    boolean itrEnabled =
-        isFeatureEnabled(
-            settings, CiVisibilitySettings::isItrEnabled, Config::isCiVisibilityItrEnabled);
-    boolean codeCoverageEnabled =
-        isFeatureEnabled(
-            settings,
-            CiVisibilitySettings::isCodeCoverageEnabled,
-            Config::isCiVisibilityCodeCoverageEnabled);
-    boolean testSkippingEnabled =
-        isFeatureEnabled(
-            settings,
-            CiVisibilitySettings::isTestsSkippingEnabled,
-            Config::isCiVisibilityTestSkippingEnabled);
-    boolean flakyTestRetriesEnabled =
-        isFeatureEnabled(
-            settings,
-            CiVisibilitySettings::isFlakyTestRetriesEnabled,
-            Config::isCiVisibilityFlakyRetryEnabled);
-    boolean impactedTestsEnabled =
-        isFeatureEnabled(
-            settings,
-            CiVisibilitySettings::isImpactedTestsDetectionEnabled,
-            Config::isCiVisibilityImpactedTestsDetectionEnabled);
-    boolean earlyFlakeDetectionEnabled =
-        isFeatureEnabled(
-            settings,
-            s -> s.getEarlyFlakeDetectionSettings().isEnabled(),
-            Config::isCiVisibilityEarlyFlakeDetectionEnabled);
-    boolean knownTestsRequest =
-        isFeatureEnabled(
-            settings,
-            CiVisibilitySettings::isKnownTestsEnabled,
-            Config::isCiVisibilityKnownTestsRequestEnabled);
-    boolean codeCoverageReportUpload =
-        isFeatureEnabled(
-            settings,
-            CiVisibilitySettings::isCoverageReportUploadEnabled,
-            Config::isCiVisibilityCodeCoverageReportUploadEnabled);
-    boolean failedTestReplayEnabled =
-        isFeatureEnabled(
-            settings,
-            CiVisibilitySettings::isFailedTestReplayEnabled,
-            Config::isCiVisibilityFailedTestReplayEnabled);
-
-    TestManagementSettings testManagementSettings = getTestManagementSettings(settings);
-
-    LOGGER.info(
-        "CI Visibility settings ({}, {}/{}/{}):\n"
-            + "Intelligent Test Runner - {},\n"
-            + "Per-test code coverage - {},\n"
-            + "Tests skipping - {},\n"
-            + "Early flakiness detection - {},\n"
-            + "Impacted tests detection - {},\n"
-            + "Known tests marking - {},\n"
-            + "Auto test retries - {},\n"
-            + "Test Management - {},\n"
-            + "Code coverage report upload - {},\n"
-            + "Failed Test Replay - {}",
-        repositoryRoot,
-        tracerEnvironment.getConfigurations().getRuntimeName(),
-        tracerEnvironment.getConfigurations().getRuntimeVersion(),
-        tracerEnvironment.getConfigurations().getRuntimeVendor(),
-        itrEnabled,
-        codeCoverageEnabled,
-        testSkippingEnabled,
-        earlyFlakeDetectionEnabled,
-        impactedTestsEnabled,
-        knownTestsRequest,
-        flakyTestRetriesEnabled,
-        testManagementSettings.isEnabled(),
-        codeCoverageReportUpload,
-        failedTestReplayEnabled);
-
-    AtomicBoolean skippableTestsError = new AtomicBoolean();
-    AtomicBoolean flakyTestsError = new AtomicBoolean();
-    AtomicBoolean knownTestsError = new AtomicBoolean();
-    AtomicBoolean testManagementTestsError = new AtomicBoolean();
-
-    Future<SkippableTests> skippableTestsFuture =
-        executor.submit(
-            () -> getSkippableTests(tracerEnvironment, itrEnabled, skippableTestsError));
-    Future<Map<String, Collection<TestFQN>>> flakyTestsFuture =
-        executor.submit(
-            () ->
-                getFlakyTestsByModule(tracerEnvironment, flakyTestRetriesEnabled, flakyTestsError));
-    Future<Map<String, Collection<TestFQN>>> knownTestsFuture =
-        executor.submit(
-            () -> getKnownTestsByModule(tracerEnvironment, knownTestsRequest, knownTestsError));
-    Future<Map<TestSetting, Map<String, Collection<TestFQN>>>> testManagementTestsFuture =
-        executor.submit(
-            () ->
-                getTestManagementTestsByModule(
-                    tracerEnvironment,
-                    testManagementSettings.isEnabled(),
-                    testManagementTestsError));
-    Future<Diff> pullRequestDiffFuture =
-        executor.submit(
-            () -> getPullRequestDiff(impactedTestsEnabled, settings.getDefaultBranch()));
-
-    SkippableTests skippableTests = skippableTestsFuture.get();
-    Map<String, Collection<TestFQN>> flakyTestsByModule = flakyTestsFuture.get();
-    Map<String, Collection<TestFQN>> knownTestsByModule = knownTestsFuture.get();
-
-    Map<TestSetting, Map<String, Collection<TestFQN>>> testManagementTestsByModule =
-        testManagementTestsFuture.get();
-    Map<String, Collection<TestFQN>> quarantinedTestsByModule =
-        testManagementTestsByModule.getOrDefault(TestSetting.QUARANTINED, Collections.emptyMap());
-    Map<String, Collection<TestFQN>> disabledTestsByModule =
-        testManagementTestsByModule.getOrDefault(TestSetting.DISABLED, Collections.emptyMap());
-    Map<String, Collection<TestFQN>> attemptToFixTestsByModule =
-        testManagementTestsByModule.getOrDefault(
-            TestSetting.ATTEMPT_TO_FIX, Collections.emptyMap());
-
-    Diff pullRequestDiff = pullRequestDiffFuture.get();
-
-    ConfigurationErrors configurationErrors =
-        new ConfigurationErrors(
-            false,
-            skippableTestsError.get(),
-            flakyTestsError.get(),
-            knownTestsError.get(),
-            testManagementTestsError.get());
-
-    DynamicAutoTestRetrySettings dynamicAutoTestRetrySettings =
-        createDynamicAutoTestRetrySettings(config, settings, flakyTestRetriesEnabled);
-
-    Map<String, ExecutionSettings> settingsByModule = new HashMap<>();
-    Set<String> moduleNames =
-        getModuleNames(
-            skippableTests,
-            flakyTestsByModule,
-            knownTestsByModule,
-            quarantinedTestsByModule,
-            disabledTestsByModule,
-            attemptToFixTestsByModule);
-
-    for (String moduleName : moduleNames) {
-      settingsByModule.put(
-          moduleName,
-          new ExecutionSettings(
-              itrEnabled,
-              codeCoverageEnabled,
-              testSkippingEnabled,
-              flakyTestRetriesEnabled,
-              impactedTestsEnabled,
-              codeCoverageReportUpload,
-              failedTestReplayEnabled,
-              earlyFlakeDetectionEnabled
-                  ? settings.getEarlyFlakeDetectionSettings()
-                  : EarlyFlakeDetectionSettings.DEFAULT,
-              dynamicAutoTestRetrySettings,
-              testManagementSettings,
-              skippableTests.getCorrelationId(),
-              skippableTests
-                  .getIdentifiersByModule()
-                  .getOrDefault(moduleName, Collections.emptyMap()),
-              skippableTests.getCoveredLinesByRelativeSourcePath(),
-              flakyTestsByModule != null
-                  ? flakyTestsByModule.getOrDefault(moduleName, Collections.emptyList())
-                  : null,
-              knownTestsByModule != null ? knownTestsByModule.get(moduleName) : null,
-              quarantinedTestsByModule.getOrDefault(moduleName, Collections.emptyList()),
-              disabledTestsByModule.getOrDefault(moduleName, Collections.emptyList()),
-              attemptToFixTestsByModule.getOrDefault(moduleName, Collections.emptyList()),
-              pullRequestDiff,
-              configurationErrors));
-    }
-    return settingsByModule;
-  }
-
-  private CiVisibilitySettings getCiVisibilitySettings(TracerEnvironment tracerEnvironment) {
-    try {
-      CiVisibilitySettings settings = configurationApi.getSettings(tracerEnvironment);
-      if (settings.isGitUploadRequired()) {
-        LOGGER.debug("Git data upload needs to finish before remote settings can be retrieved");
-        gitDataUploader
-            .startOrObserveGitDataUpload()
-            .get(config.getCiVisibilityGitUploadTimeoutMillis(), TimeUnit.MILLISECONDS);
-
-        return configurationApi.getSettings(tracerEnvironment);
-      } else {
-        return settings;
-      }
-
-    } catch (Exception e) {
-      LOGGER.error("Error while obtaining CI Visibility settings", e);
-      return CiVisibilitySettings.SETTINGS_REQUEST_ERROR;
-    }
-  }
-
-  private static DynamicAutoTestRetrySettings createDynamicAutoTestRetrySettings(
-      Config config, CiVisibilitySettings settings, boolean flakyTestRetriesEnabled) {
-    return DynamicAutoTestRetrySettings.create(
-        config.isCiVisibilityDynamicAtrEnabled() && flakyTestRetriesEnabled,
-        config.getCiVisibilityDynamicAtrBuckets(),
-        settings.getEarlyFlakeDetectionSettings().getExecutionsByDuration());
-  }
-
-  private boolean isFeatureEnabled(
-      CiVisibilitySettings ciVisibilitySettings,
-      Function<CiVisibilitySettings, Boolean> remoteSetting,
-      Function<Config, Boolean> killSwitch) {
-    return remoteSetting.apply(ciVisibilitySettings) && killSwitch.apply(config);
-  }
-
-  @Nonnull
-  private TestManagementSettings getTestManagementSettings(CiVisibilitySettings settings) {
-    boolean testManagementEnabled =
-        isFeatureEnabled(
-            settings,
-            s -> s.getTestManagementSettings().isEnabled(),
-            Config::isCiVisibilityTestManagementEnabled);
-
-    if (!testManagementEnabled) {
-      return TestManagementSettings.DEFAULT;
+    @Override
+    public ExecutionSettings create(@Nonnull JvmInfo jvmInfo, @Nullable String moduleName) {
+        TracerEnvironment tracerEnvironment = buildTracerEnvironment(jvmInfo, moduleName);
+        Map<String, ExecutionSettings> settingsByModule = create(tracerEnvironment);
+        ExecutionSettings settings = settingsByModule.get(moduleName);
+        return settings != null ? settings : settingsByModule.get(DEFAULT_SETTINGS);
     }
 
-    Integer retries = config.getCiVisibilityTestManagementAttemptToFixRetries();
-    if (retries != null) {
-      return new TestManagementSettings(true, retries);
+    private TracerEnvironment buildTracerEnvironment(JvmInfo jvmInfo, @Nullable String moduleName) {
+        GitInfo gitInfo = GitInfoProvider.INSTANCE.getGitInfo(repositoryRoot);
+
+        TracerEnvironment.Builder builder = TracerEnvironment.builder();
+        for (Map.Entry<String, String> e : config.getGlobalTags().entrySet()) {
+            String key = e.getKey();
+            if (key.startsWith(TEST_CONFIGURATION_TAG_PREFIX)) {
+                String configurationKey = key.substring(TEST_CONFIGURATION_TAG_PREFIX.length());
+                String configurationValue = e.getValue();
+                builder.customTag(configurationKey, configurationValue);
+            }
+        }
+
+        CiVisibilityWellKnownTags wellKnownTags = config.getCiVisibilityWellKnownTags();
+        return builder.service(config.getServiceName())
+                .env(config.getEnv())
+                .repositoryUrl(gitInfo.getRepositoryURL())
+                .branch(gitInfo.getBranch())
+                .tag(gitInfo.getTag())
+                .sha(gitInfo.getCommit().getSha())
+                .commitMessage(gitInfo.getCommit().getFullMessage())
+                .osPlatform(wellKnownTags.getOsPlatform().toString())
+                .osArchitecture(wellKnownTags.getOsArch().toString())
+                .osVersion(wellKnownTags.getOsVersion().toString())
+                .runtimeName(jvmInfo.getName())
+                .runtimeVersion(jvmInfo.getVersion())
+                .runtimeVendor(jvmInfo.getVendor())
+                .testBundle(moduleName)
+                .build();
     }
 
-    return settings.getTestManagementSettings();
-  }
+    @Nonnull
+    private Map<String, ExecutionSettings> create(TracerEnvironment tracerEnvironment) {
+        CiVisibilitySettings settings = getCiVisibilitySettings(tracerEnvironment);
+        ExecutorService settingsExecutor = Executors.newCachedThreadPool(THREAD_FACTORY);
+        try {
+            return doCreate(tracerEnvironment, settings, settingsExecutor);
 
-  @Nonnull
-  private SkippableTests getSkippableTests(
-      TracerEnvironment tracerEnvironment, boolean itrEnabled, AtomicBoolean errorFlag) {
-    if (!itrEnabled || repositoryRoot == null) {
-      return SkippableTests.EMPTY;
-    }
-    try {
-      // ensure git data upload is finished before asking for tests
-      gitDataUploader
-          .startOrObserveGitDataUpload()
-          .get(config.getCiVisibilityGitUploadTimeoutMillis(), TimeUnit.MILLISECONDS);
-
-      SkippableTests skippableTests = configurationApi.getSkippableTests(tracerEnvironment);
-
-      if (LOGGER.isDebugEnabled()) {
-        int totalSkippableTests =
-            skippableTests.getIdentifiersByModule().values().stream()
-                .filter(Objects::nonNull)
-                .mapToInt(Map::size)
-                .sum();
-        LOGGER.debug(
-            "Received {} skippable tests in total for {}",
-            totalSkippableTests,
-            Paths.get(repositoryRoot));
-      }
-
-      return skippableTests;
-
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      LOGGER.error("Interrupted while waiting for git data upload", e);
-      errorFlag.set(true);
-      return SkippableTests.EMPTY;
-    } catch (Exception e) {
-      LOGGER.error("Could not obtain list of skippable tests, will proceed without skipping", e);
-      errorFlag.set(true);
-      return SkippableTests.EMPTY;
-    }
-  }
-
-  @Nullable
-  private Map<String, Collection<TestFQN>> getFlakyTestsByModule(
-      TracerEnvironment tracerEnvironment,
-      boolean flakyTestRetriesEnabled,
-      AtomicBoolean errorFlag) {
-    if (!(flakyTestRetriesEnabled && config.isCiVisibilityFlakyRetryOnlyKnownFlakes())
-        && !CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(config.getCiVisibilityTestOrder())) {
-      return null;
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            LOGGER.error("Interrupted while creating execution settings");
+            return Collections.singletonMap(DEFAULT_SETTINGS, ExecutionSettings.SETTINGS_REQUEST_ERROR);
+
+        } catch (ExecutionException e) {
+            LOGGER.error("Error while creating execution settings", e);
+            return Collections.singletonMap(DEFAULT_SETTINGS, ExecutionSettings.SETTINGS_REQUEST_ERROR);
+
+        } finally {
+            settingsExecutor.shutdownNow();
+        }
     }
-    try {
-      return configurationApi.getFlakyTestsByModule(tracerEnvironment);
-    } catch (Exception e) {
-      LOGGER.error("Could not obtain list of flaky tests", e);
-      errorFlag.set(true);
-      return null;
+
+    @Nonnull
+    private Map<String, ExecutionSettings> doCreate(
+            TracerEnvironment tracerEnvironment, CiVisibilitySettings settings, ExecutorService executor)
+            throws InterruptedException, ExecutionException {
+        if (settings.isSettingsRequestError()) {
+            return Collections.singletonMap(DEFAULT_SETTINGS, ExecutionSettings.SETTINGS_REQUEST_ERROR);
+        }
+
+        boolean itrEnabled =
+                isFeatureEnabled(settings, CiVisibilitySettings::isItrEnabled, Config::isCiVisibilityItrEnabled);
+        boolean codeCoverageEnabled = isFeatureEnabled(
+                settings, CiVisibilitySettings::isCodeCoverageEnabled, Config::isCiVisibilityCodeCoverageEnabled);
+        boolean testSkippingEnabled = isFeatureEnabled(
+                settings, CiVisibilitySettings::isTestsSkippingEnabled, Config::isCiVisibilityTestSkippingEnabled);
+        boolean flakyTestRetriesEnabled = isFeatureEnabled(
+                settings, CiVisibilitySettings::isFlakyTestRetriesEnabled, Config::isCiVisibilityFlakyRetryEnabled);
+        boolean impactedTestsEnabled = isFeatureEnabled(
+                settings,
+                CiVisibilitySettings::isImpactedTestsDetectionEnabled,
+                Config::isCiVisibilityImpactedTestsDetectionEnabled);
+        boolean earlyFlakeDetectionEnabled = isFeatureEnabled(
+                settings,
+                s -> s.getEarlyFlakeDetectionSettings().isEnabled(),
+                Config::isCiVisibilityEarlyFlakeDetectionEnabled);
+        boolean knownTestsRequest = isFeatureEnabled(
+                settings, CiVisibilitySettings::isKnownTestsEnabled, Config::isCiVisibilityKnownTestsRequestEnabled);
+        boolean codeCoverageReportUpload = isFeatureEnabled(
+                settings,
+                CiVisibilitySettings::isCoverageReportUploadEnabled,
+                Config::isCiVisibilityCodeCoverageReportUploadEnabled);
+        boolean failedTestReplayEnabled = isFeatureEnabled(
+                settings,
+                CiVisibilitySettings::isFailedTestReplayEnabled,
+                Config::isCiVisibilityFailedTestReplayEnabled);
+
+        TestManagementSettings testManagementSettings = getTestManagementSettings(settings);
+
+        LOGGER.info(
+                "CI Visibility settings ({}, {}/{}/{}):\n"
+                        + "Intelligent Test Runner - {},\n"
+                        + "Per-test code coverage - {},\n"
+                        + "Tests skipping - {},\n"
+                        + "Early flakiness detection - {},\n"
+                        + "Impacted tests detection - {},\n"
+                        + "Known tests marking - {},\n"
+                        + "Auto test retries - {},\n"
+                        + "Test Management - {},\n"
+                        + "Code coverage report upload - {},\n"
+                        + "Failed Test Replay - {}",
+                repositoryRoot,
+                tracerEnvironment.getConfigurations().getRuntimeName(),
+                tracerEnvironment.getConfigurations().getRuntimeVersion(),
+                tracerEnvironment.getConfigurations().getRuntimeVendor(),
+                itrEnabled,
+                codeCoverageEnabled,
+                testSkippingEnabled,
+                earlyFlakeDetectionEnabled,
+                impactedTestsEnabled,
+                knownTestsRequest,
+                flakyTestRetriesEnabled,
+                testManagementSettings.isEnabled(),
+                codeCoverageReportUpload,
+                failedTestReplayEnabled);
+
+        AtomicBoolean skippableTestsError = new AtomicBoolean();
+        AtomicBoolean flakyTestsError = new AtomicBoolean();
+        AtomicBoolean knownTestsError = new AtomicBoolean();
+        AtomicBoolean testManagementTestsError = new AtomicBoolean();
+
+        Future<SkippableTests> skippableTestsFuture =
+                executor.submit(() -> getSkippableTests(tracerEnvironment, itrEnabled, skippableTestsError));
+        Future<Map<String, Collection<TestFQN>>> flakyTestsFuture = executor.submit(
+                () -> getFlakyTestsByModule(tracerEnvironment, flakyTestRetriesEnabled, flakyTestsError));
+        Future<Map<String, Collection<TestFQN>>> knownTestsFuture =
+                executor.submit(() -> getKnownTestsByModule(tracerEnvironment, knownTestsRequest, knownTestsError));
+        Future<Map<TestSetting, Map<String, Collection<TestFQN>>>> testManagementTestsFuture =
+                executor.submit(() -> getTestManagementTestsByModule(
+                        tracerEnvironment, testManagementSettings.isEnabled(), testManagementTestsError));
+        Future<Diff> pullRequestDiffFuture =
+                executor.submit(() -> getPullRequestDiff(impactedTestsEnabled, settings.getDefaultBranch()));
+
+        SkippableTests skippableTests = skippableTestsFuture.get();
+        Map<String, Collection<TestFQN>> flakyTestsByModule = flakyTestsFuture.get();
+        Map<String, Collection<TestFQN>> knownTestsByModule = knownTestsFuture.get();
+
+        Map<TestSetting, Map<String, Collection<TestFQN>>> testManagementTestsByModule =
+                testManagementTestsFuture.get();
+        Map<String, Collection<TestFQN>> quarantinedTestsByModule =
+                testManagementTestsByModule.getOrDefault(TestSetting.QUARANTINED, Collections.emptyMap());
+        Map<String, Collection<TestFQN>> disabledTestsByModule =
+                testManagementTestsByModule.getOrDefault(TestSetting.DISABLED, Collections.emptyMap());
+        Map<String, Collection<TestFQN>> attemptToFixTestsByModule =
+                testManagementTestsByModule.getOrDefault(TestSetting.ATTEMPT_TO_FIX, Collections.emptyMap());
+
+        Diff pullRequestDiff = pullRequestDiffFuture.get();
+
+        ConfigurationErrors configurationErrors = new ConfigurationErrors(
+                false,
+                skippableTestsError.get(),
+                flakyTestsError.get(),
+                knownTestsError.get(),
+                testManagementTestsError.get());
+
+        DynamicAutoTestRetrySettings dynamicAutoTestRetrySettings =
+                createDynamicAutoTestRetrySettings(config, settings, flakyTestRetriesEnabled);
+
+        Map<String, ExecutionSettings> settingsByModule = new HashMap<>();
+        Set<String> moduleNames = getModuleNames(
+                skippableTests,
+                flakyTestsByModule,
+                knownTestsByModule,
+                quarantinedTestsByModule,
+                disabledTestsByModule,
+                attemptToFixTestsByModule);
+
+        for (String moduleName : moduleNames) {
+            settingsByModule.put(
+                    moduleName,
+                    new ExecutionSettings(
+                            itrEnabled,
+                            codeCoverageEnabled,
+                            testSkippingEnabled,
+                            flakyTestRetriesEnabled,
+                            impactedTestsEnabled,
+                            codeCoverageReportUpload,
+                            failedTestReplayEnabled,
+                            earlyFlakeDetectionEnabled
+                                    ? settings.getEarlyFlakeDetectionSettings()
+                                    : EarlyFlakeDetectionSettings.DEFAULT,
+                            dynamicAutoTestRetrySettings,
+                            testManagementSettings,
+                            skippableTests.getCorrelationId(),
+                            skippableTests.getIdentifiersByModule().getOrDefault(moduleName, Collections.emptyMap()),
+                            skippableTests.getCoveredLinesByRelativeSourcePath(),
+                            flakyTestsByModule != null
+                                    ? flakyTestsByModule.getOrDefault(moduleName, Collections.emptyList())
+                                    : null,
+                            knownTestsByModule != null ? knownTestsByModule.get(moduleName) : null,
+                            quarantinedTestsByModule.getOrDefault(moduleName, Collections.emptyList()),
+                            disabledTestsByModule.getOrDefault(moduleName, Collections.emptyList()),
+                            attemptToFixTestsByModule.getOrDefault(moduleName, Collections.emptyList()),
+                            pullRequestDiff,
+                            configurationErrors));
+        }
+        return settingsByModule;
     }
-  }
 
-  @Nullable
-  private Map<String, Collection<TestFQN>> getKnownTestsByModule(
-      TracerEnvironment tracerEnvironment, boolean knownTestsRequest, AtomicBoolean errorFlag) {
-    if (!knownTestsRequest) {
-      return null;
+    private CiVisibilitySettings getCiVisibilitySettings(TracerEnvironment tracerEnvironment) {
+        try {
+            CiVisibilitySettings settings = configurationApi.getSettings(tracerEnvironment);
+            if (settings.isGitUploadRequired()) {
+                LOGGER.debug("Git data upload needs to finish before remote settings can be retrieved");
+                gitDataUploader
+                        .startOrObserveGitDataUpload()
+                        .get(config.getCiVisibilityGitUploadTimeoutMillis(), TimeUnit.MILLISECONDS);
+
+                return configurationApi.getSettings(tracerEnvironment);
+            } else {
+                return settings;
+            }
+
+        } catch (Exception e) {
+            LOGGER.error("Error while obtaining CI Visibility settings", e);
+            return CiVisibilitySettings.SETTINGS_REQUEST_ERROR;
+        }
     }
-    try {
-      return configurationApi.getKnownTestsByModule(tracerEnvironment);
 
-    } catch (Exception e) {
-      LOGGER.error("Could not obtain list of known tests", e);
-      errorFlag.set(true);
-      return null;
+    private static DynamicAutoTestRetrySettings createDynamicAutoTestRetrySettings(
+            Config config, CiVisibilitySettings settings, boolean flakyTestRetriesEnabled) {
+        return DynamicAutoTestRetrySettings.create(
+                config.isCiVisibilityDynamicAtrEnabled() && flakyTestRetriesEnabled,
+                config.getCiVisibilityDynamicAtrBuckets(),
+                settings.getEarlyFlakeDetectionSettings().getExecutionsByDuration());
     }
-  }
-
-  @Nullable
-  private Map<TestSetting, Map<String, Collection<TestFQN>>> getTestManagementTestsByModule(
-      TracerEnvironment tracerEnvironment,
-      boolean testManagementTestsRequest,
-      AtomicBoolean errorFlag) {
-    if (!testManagementTestsRequest) {
-      return Collections.emptyMap();
+
+    private boolean isFeatureEnabled(
+            CiVisibilitySettings ciVisibilitySettings,
+            Function<CiVisibilitySettings, Boolean> remoteSetting,
+            Function<Config, Boolean> killSwitch) {
+        return remoteSetting.apply(ciVisibilitySettings) && killSwitch.apply(config);
     }
-    try {
-      if (Strings.isNotBlank(pullRequestInfo.getHeadCommit().getSha())
-          && Strings.isNotBlank(pullRequestInfo.getHeadCommit().getFullMessage())) {
-        return configurationApi.getTestManagementTestsByModule(
-            tracerEnvironment,
-            pullRequestInfo.getHeadCommit().getSha(),
-            pullRequestInfo.getHeadCommit().getFullMessage());
-      } else {
-        return configurationApi.getTestManagementTestsByModule(
-            tracerEnvironment, tracerEnvironment.getSha(), tracerEnvironment.getCommitMessage());
-      }
-    } catch (Exception e) {
-      LOGGER.error("Could not obtain list of test management tests", e);
-      errorFlag.set(true);
-      return Collections.emptyMap();
+
+    @Nonnull
+    private TestManagementSettings getTestManagementSettings(CiVisibilitySettings settings) {
+        boolean testManagementEnabled = isFeatureEnabled(
+                settings, s -> s.getTestManagementSettings().isEnabled(), Config::isCiVisibilityTestManagementEnabled);
+
+        if (!testManagementEnabled) {
+            return TestManagementSettings.DEFAULT;
+        }
+
+        Integer retries = config.getCiVisibilityTestManagementAttemptToFixRetries();
+        if (retries != null) {
+            return new TestManagementSettings(true, retries);
+        }
+
+        return settings.getTestManagementSettings();
     }
-  }
 
-  @Nonnull
-  private Diff getPullRequestDiff(boolean impactedTestsDetectionEnabled, String defaultBranch) {
-    if (!impactedTestsDetectionEnabled) {
-      return LineDiff.EMPTY;
+    @Nonnull
+    private SkippableTests getSkippableTests(
+            TracerEnvironment tracerEnvironment, boolean itrEnabled, AtomicBoolean errorFlag) {
+        if (!itrEnabled || repositoryRoot == null) {
+            return SkippableTests.EMPTY;
+        }
+        try {
+            // ensure git data upload is finished before asking for tests
+            gitDataUploader
+                    .startOrObserveGitDataUpload()
+                    .get(config.getCiVisibilityGitUploadTimeoutMillis(), TimeUnit.MILLISECONDS);
+
+            SkippableTests skippableTests = configurationApi.getSkippableTests(tracerEnvironment);
+
+            if (LOGGER.isDebugEnabled()) {
+                int totalSkippableTests = skippableTests.getIdentifiersByModule().values().stream()
+                        .filter(Objects::nonNull)
+                        .mapToInt(Map::size)
+                        .sum();
+                LOGGER.debug(
+                        "Received {} skippable tests in total for {}", totalSkippableTests, Paths.get(repositoryRoot));
+            }
+
+            return skippableTests;
+
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            LOGGER.error("Interrupted while waiting for git data upload", e);
+            errorFlag.set(true);
+            return SkippableTests.EMPTY;
+        } catch (Exception e) {
+            LOGGER.error("Could not obtain list of skippable tests, will proceed without skipping", e);
+            errorFlag.set(true);
+            return SkippableTests.EMPTY;
+        }
     }
 
-    try {
-      if (repositoryRoot != null) {
-        // ensure repo is not shallow before attempting to get git diff
-        gitRepoUnshallow.unshallow();
+    @Nullable
+    private Map<String, Collection<TestFQN>> getFlakyTestsByModule(
+            TracerEnvironment tracerEnvironment, boolean flakyTestRetriesEnabled, AtomicBoolean errorFlag) {
+        if (!(flakyTestRetriesEnabled && config.isCiVisibilityFlakyRetryOnlyKnownFlakes())
+                && !CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(config.getCiVisibilityTestOrder())) {
+            return null;
+        }
+        try {
+            return configurationApi.getFlakyTestsByModule(tracerEnvironment);
+        } catch (Exception e) {
+            LOGGER.error("Could not obtain list of flaky tests", e);
+            errorFlag.set(true);
+            return null;
+        }
+    }
 
-        String baseCommitSha = pullRequestInfo.getBaseBranchSha();
-        if (baseCommitSha == null && pullRequestInfo.getBaseBranchHeadSha() != null) {
-          baseCommitSha =
-              gitClient.getMergeBase(
-                  pullRequestInfo.getBaseBranchHeadSha(), pullRequestInfo.getHeadCommit().getSha());
+    @Nullable
+    private Map<String, Collection<TestFQN>> getKnownTestsByModule(
+            TracerEnvironment tracerEnvironment, boolean knownTestsRequest, AtomicBoolean errorFlag) {
+        if (!knownTestsRequest) {
+            return null;
         }
+        try {
+            return configurationApi.getKnownTestsByModule(tracerEnvironment);
 
-        if (baseCommitSha == null) {
-          baseCommitSha =
-              gitClient.getBaseCommitSha(pullRequestInfo.getBaseBranch(), defaultBranch);
+        } catch (Exception e) {
+            LOGGER.error("Could not obtain list of known tests", e);
+            errorFlag.set(true);
+            return null;
         }
+    }
 
-        Diff diff = gitClient.getGitDiff(baseCommitSha, pullRequestInfo.getHeadCommit().getSha());
-        if (diff != null) {
-          return diff;
+    @Nullable
+    private Map<TestSetting, Map<String, Collection<TestFQN>>> getTestManagementTestsByModule(
+            TracerEnvironment tracerEnvironment, boolean testManagementTestsRequest, AtomicBoolean errorFlag) {
+        if (!testManagementTestsRequest) {
+            return Collections.emptyMap();
+        }
+        try {
+            if (Strings.isNotBlank(pullRequestInfo.getHeadCommit().getSha())
+                    && Strings.isNotBlank(pullRequestInfo.getHeadCommit().getFullMessage())) {
+                return configurationApi.getTestManagementTestsByModule(
+                        tracerEnvironment,
+                        pullRequestInfo.getHeadCommit().getSha(),
+                        pullRequestInfo.getHeadCommit().getFullMessage());
+            } else {
+                return configurationApi.getTestManagementTestsByModule(
+                        tracerEnvironment, tracerEnvironment.getSha(), tracerEnvironment.getCommitMessage());
+            }
+        } catch (Exception e) {
+            LOGGER.error("Could not obtain list of test management tests", e);
+            errorFlag.set(true);
+            return Collections.emptyMap();
         }
-      }
-    } catch (InterruptedException e) {
-      LOGGER.error("Interrupted while getting git diff for PR: {}", pullRequestInfo, e);
-      Thread.currentThread().interrupt();
-    } catch (Exception e) {
-      LOGGER.error("Could not get git diff for PR: {}", pullRequestInfo, e);
     }
 
-    return LineDiff.EMPTY;
-  }
-
-  @Nonnull
-  private static Set<String> getModuleNames(
-      @Nonnull SkippableTests skippableTests,
-      @Nullable Map<String, Collection<TestFQN>> flakyTestsByModule,
-      @Nullable Map<String, Collection<TestFQN>> knownTestsByModule,
-      @Nonnull Map<String, Collection<TestFQN>> quarantinedTestsByModule,
-      @Nonnull Map<String, Collection<TestFQN>> disabledTestsByModule,
-      @Nonnull Map<String, Collection<TestFQN>> attemptToFixTestsByModule) {
-    Set<String> moduleNames = new HashSet<>(Collections.singleton(DEFAULT_SETTINGS));
-    moduleNames.addAll(skippableTests.getIdentifiersByModule().keySet());
-    if (flakyTestsByModule != null) {
-      moduleNames.addAll(flakyTestsByModule.keySet());
+    @Nonnull
+    private Diff getPullRequestDiff(boolean impactedTestsDetectionEnabled, String defaultBranch) {
+        if (!impactedTestsDetectionEnabled) {
+            return LineDiff.EMPTY;
+        }
+
+        try {
+            if (repositoryRoot != null) {
+                // ensure repo is not shallow before attempting to get git diff
+                gitRepoUnshallow.unshallow();
+
+                String baseCommitSha = pullRequestInfo.getBaseBranchSha();
+                if (baseCommitSha == null && pullRequestInfo.getBaseBranchHeadSha() != null) {
+                    baseCommitSha = gitClient.getMergeBase(
+                            pullRequestInfo.getBaseBranchHeadSha(),
+                            pullRequestInfo.getHeadCommit().getSha());
+                }
+
+                if (baseCommitSha == null) {
+                    baseCommitSha = gitClient.getBaseCommitSha(pullRequestInfo.getBaseBranch(), defaultBranch);
+                }
+
+                Diff diff = gitClient.getGitDiff(
+                        baseCommitSha, pullRequestInfo.getHeadCommit().getSha());
+                if (diff != null) {
+                    return diff;
+                }
+            }
+        } catch (InterruptedException e) {
+            LOGGER.error("Interrupted while getting git diff for PR: {}", pullRequestInfo, e);
+            Thread.currentThread().interrupt();
+        } catch (Exception e) {
+            LOGGER.error("Could not get git diff for PR: {}", pullRequestInfo, e);
+        }
+
+        return LineDiff.EMPTY;
     }
-    if (knownTestsByModule != null) {
-      moduleNames.addAll(knownTestsByModule.keySet());
+
+    @Nonnull
+    private static Set<String> getModuleNames(
+            @Nonnull SkippableTests skippableTests,
+            @Nullable Map<String, Collection<TestFQN>> flakyTestsByModule,
+            @Nullable Map<String, Collection<TestFQN>> knownTestsByModule,
+            @Nonnull Map<String, Collection<TestFQN>> quarantinedTestsByModule,
+            @Nonnull Map<String, Collection<TestFQN>> disabledTestsByModule,
+            @Nonnull Map<String, Collection<TestFQN>> attemptToFixTestsByModule) {
+        Set<String> moduleNames = new HashSet<>(Collections.singleton(DEFAULT_SETTINGS));
+        moduleNames.addAll(skippableTests.getIdentifiersByModule().keySet());
+        if (flakyTestsByModule != null) {
+            moduleNames.addAll(flakyTestsByModule.keySet());
+        }
+        if (knownTestsByModule != null) {
+            moduleNames.addAll(knownTestsByModule.keySet());
+        }
+        moduleNames.addAll(quarantinedTestsByModule.keySet());
+        moduleNames.addAll(disabledTestsByModule.keySet());
+        moduleNames.addAll(attemptToFixTestsByModule.keySet());
+        return moduleNames;
     }
-    moduleNames.addAll(quarantinedTestsByModule.keySet());
-    moduleNames.addAll(disabledTestsByModule.keySet());
-    moduleNames.addAll(attemptToFixTestsByModule.keySet());
-    return moduleNames;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionsByDuration.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionsByDuration.java
index 46c0a7ab28f..f69244dc11b 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionsByDuration.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionsByDuration.java
@@ -4,51 +4,51 @@
 import java.util.Objects;
 
 public final class ExecutionsByDuration {
-  public final long durationMillis;
-  public final int executions;
-
-  public ExecutionsByDuration(long durationMillis, int executions) {
-    this.durationMillis = durationMillis;
-    this.executions = executions;
-  }
-
-  public long getDurationMillis() {
-    return durationMillis;
-  }
-
-  public int getExecutions() {
-    return executions;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public final long durationMillis;
+    public final int executions;
+
+    public ExecutionsByDuration(long durationMillis, int executions) {
+        this.durationMillis = durationMillis;
+        this.executions = executions;
+    }
+
+    public long getDurationMillis() {
+        return durationMillis;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    public int getExecutions() {
+        return executions;
     }
-    ExecutionsByDuration that = (ExecutionsByDuration) o;
-    return durationMillis == that.durationMillis && executions == that.executions;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(durationMillis, executions);
-  }
-
-  public static class Serializer {
-    public static void serialize(
-        datadog.trace.civisibility.ipc.serialization.Serializer serializer,
-        ExecutionsByDuration executionsByDuration) {
-      serializer.write(executionsByDuration.durationMillis);
-      serializer.write(executionsByDuration.executions);
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ExecutionsByDuration that = (ExecutionsByDuration) o;
+        return durationMillis == that.durationMillis && executions == that.executions;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(durationMillis, executions);
     }
 
-    public static ExecutionsByDuration deserialize(ByteBuffer buf) {
-      return new ExecutionsByDuration(
-          datadog.trace.civisibility.ipc.serialization.Serializer.readLong(buf),
-          datadog.trace.civisibility.ipc.serialization.Serializer.readInt(buf));
+    public static class Serializer {
+        public static void serialize(
+                datadog.trace.civisibility.ipc.serialization.Serializer serializer,
+                ExecutionsByDuration executionsByDuration) {
+            serializer.write(executionsByDuration.durationMillis);
+            serializer.write(executionsByDuration.executions);
+        }
+
+        public static ExecutionsByDuration deserialize(ByteBuffer buf) {
+            return new ExecutionsByDuration(
+                    datadog.trace.civisibility.ipc.serialization.Serializer.readLong(buf),
+                    datadog.trace.civisibility.ipc.serialization.Serializer.readInt(buf));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/FileBasedConfigurationApi.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/FileBasedConfigurationApi.java
index 9e28ea35c35..844e135cfaf 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/FileBasedConfigurationApi.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/FileBasedConfigurationApi.java
@@ -30,139 +30,146 @@
  */
 public class FileBasedConfigurationApi implements ConfigurationApi {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(FileBasedConfigurationApi.class);
-
-  @Nullable private final Path settingsPath;
-  @Nullable private final Path skippableTestsPath;
-  @Nullable private final Path flakyTestsPath;
-  @Nullable private final Path knownTestsPath;
-  @Nullable private final Path testManagementPath;
-
-  private final JsonAdapter<Envelope<CiVisibilitySettings>> settingsAdapter;
-  private final JsonAdapter<Envelope<KnownTestsResponse>> knownTestsAdapter;
-  private final JsonAdapter<Envelope<TestManagementTestsResponse>> testManagementAdapter;
-  private final JsonAdapter<MultiEnvelope<TestIdentifierJson>> testIdentifiersAdapter;
-
-  public FileBasedConfigurationApi(
-      @Nullable Path settingsPath,
-      @Nullable Path skippableTestsPath,
-      @Nullable Path flakyTestsPath,
-      @Nullable Path knownTestsPath,
-      @Nullable Path testManagementPath) {
-    this.settingsPath = settingsPath;
-    this.skippableTestsPath = skippableTestsPath;
-    this.flakyTestsPath = flakyTestsPath;
-    this.knownTestsPath = knownTestsPath;
-    this.testManagementPath = testManagementPath;
-
-    Moshi moshi = ConfigurationApiMoshi.create();
-    settingsAdapter = moshi.adapter(envelopeOf(CiVisibilitySettings.class));
-    knownTestsAdapter = moshi.adapter(envelopeOf(KnownTestsResponse.class));
-    testManagementAdapter = moshi.adapter(envelopeOf(TestManagementTestsResponse.class));
-    testIdentifiersAdapter = moshi.adapter(multiEnvelopeOf(TestIdentifierJson.class));
-  }
-
-  private static ParameterizedType envelopeOf(Class<?> attributesType) {
-    return Types.newParameterizedType(Envelope.class, attributesType);
-  }
-
-  private static ParameterizedType multiEnvelopeOf(Class<?> attributesType) {
-    return Types.newParameterizedType(MultiEnvelope.class, attributesType);
-  }
-
-  @Override
-  public CiVisibilitySettings getSettings(TracerEnvironment tracerEnvironment) throws IOException {
-    if (settingsPath == null) {
-      LOGGER.debug("Settings file path not provided, returning defaults");
-      return CiVisibilitySettings.DEFAULT;
-    }
-    LOGGER.debug("Reading settings from {}", settingsPath);
-    Envelope<CiVisibilitySettings> envelope = readEnvelope(settingsPath, settingsAdapter);
-    return envelope != null && envelope.data != null && envelope.data.attributes != null
-        ? envelope.data.attributes
-        : CiVisibilitySettings.DEFAULT;
-  }
-
-  @Override
-  public SkippableTests getSkippableTests(TracerEnvironment tracerEnvironment) throws IOException {
-    if (skippableTestsPath == null) {
-      LOGGER.debug("Skippable tests file path not provided, returning empty");
-      return SkippableTests.EMPTY;
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileBasedConfigurationApi.class);
+
+    @Nullable
+    private final Path settingsPath;
+
+    @Nullable
+    private final Path skippableTestsPath;
+
+    @Nullable
+    private final Path flakyTestsPath;
+
+    @Nullable
+    private final Path knownTestsPath;
+
+    @Nullable
+    private final Path testManagementPath;
+
+    private final JsonAdapter<Envelope<CiVisibilitySettings>> settingsAdapter;
+    private final JsonAdapter<Envelope<KnownTestsResponse>> knownTestsAdapter;
+    private final JsonAdapter<Envelope<TestManagementTestsResponse>> testManagementAdapter;
+    private final JsonAdapter<MultiEnvelope<TestIdentifierJson>> testIdentifiersAdapter;
+
+    public FileBasedConfigurationApi(
+            @Nullable Path settingsPath,
+            @Nullable Path skippableTestsPath,
+            @Nullable Path flakyTestsPath,
+            @Nullable Path knownTestsPath,
+            @Nullable Path testManagementPath) {
+        this.settingsPath = settingsPath;
+        this.skippableTestsPath = skippableTestsPath;
+        this.flakyTestsPath = flakyTestsPath;
+        this.knownTestsPath = knownTestsPath;
+        this.testManagementPath = testManagementPath;
+
+        Moshi moshi = ConfigurationApiMoshi.create();
+        settingsAdapter = moshi.adapter(envelopeOf(CiVisibilitySettings.class));
+        knownTestsAdapter = moshi.adapter(envelopeOf(KnownTestsResponse.class));
+        testManagementAdapter = moshi.adapter(envelopeOf(TestManagementTestsResponse.class));
+        testIdentifiersAdapter = moshi.adapter(multiEnvelopeOf(TestIdentifierJson.class));
     }
-    LOGGER.debug("Reading skippable tests from {}", skippableTestsPath);
-    MultiEnvelope<TestIdentifierJson> envelope =
-        readEnvelope(skippableTestsPath, testIdentifiersAdapter);
-    if (envelope == null || envelope.data == null) {
-      return SkippableTests.EMPTY;
+
+    private static ParameterizedType envelopeOf(Class<?> attributesType) {
+        return Types.newParameterizedType(Envelope.class, attributesType);
     }
-    return SkippableTests.from(envelope, tracerEnvironment);
-  }
-
-  @Override
-  public Map<String, Collection<TestFQN>> getFlakyTestsByModule(TracerEnvironment tracerEnvironment)
-      throws IOException {
-    if (flakyTestsPath == null) {
-      LOGGER.debug("Flaky tests file path not provided, returning empty");
-      return Collections.emptyMap();
+
+    private static ParameterizedType multiEnvelopeOf(Class<?> attributesType) {
+        return Types.newParameterizedType(MultiEnvelope.class, attributesType);
     }
-    LOGGER.debug("Reading flaky tests from {}", flakyTestsPath);
-    MultiEnvelope<TestIdentifierJson> envelope =
-        readEnvelope(flakyTestsPath, testIdentifiersAdapter);
-    if (envelope == null || envelope.data == null) {
-      return Collections.emptyMap();
+
+    @Override
+    public CiVisibilitySettings getSettings(TracerEnvironment tracerEnvironment) throws IOException {
+        if (settingsPath == null) {
+            LOGGER.debug("Settings file path not provided, returning defaults");
+            return CiVisibilitySettings.DEFAULT;
+        }
+        LOGGER.debug("Reading settings from {}", settingsPath);
+        Envelope<CiVisibilitySettings> envelope = readEnvelope(settingsPath, settingsAdapter);
+        return envelope != null && envelope.data != null && envelope.data.attributes != null
+                ? envelope.data.attributes
+                : CiVisibilitySettings.DEFAULT;
     }
-    Map<String, Collection<TestFQN>> result =
-        TestIdentifierJson.toTestFQNsByModule(envelope.data, tracerEnvironment);
-    LOGGER.debug(
-        "Read {} flaky tests from file", result.values().stream().mapToInt(Collection::size).sum());
-    return result;
-  }
-
-  @Nullable
-  @Override
-  public Map<String, Collection<TestFQN>> getKnownTestsByModule(TracerEnvironment tracerEnvironment)
-      throws IOException {
-    if (knownTestsPath == null) {
-      LOGGER.debug("Known tests file path not provided, returning empty");
-      return Collections.emptyMap();
+
+    @Override
+    public SkippableTests getSkippableTests(TracerEnvironment tracerEnvironment) throws IOException {
+        if (skippableTestsPath == null) {
+            LOGGER.debug("Skippable tests file path not provided, returning empty");
+            return SkippableTests.EMPTY;
+        }
+        LOGGER.debug("Reading skippable tests from {}", skippableTestsPath);
+        MultiEnvelope<TestIdentifierJson> envelope = readEnvelope(skippableTestsPath, testIdentifiersAdapter);
+        if (envelope == null || envelope.data == null) {
+            return SkippableTests.EMPTY;
+        }
+        return SkippableTests.from(envelope, tracerEnvironment);
     }
-    LOGGER.debug("Reading known tests from {}", knownTestsPath);
-    Envelope<KnownTestsResponse> envelope = readEnvelope(knownTestsPath, knownTestsAdapter);
-    if (envelope == null
-        || envelope.data == null
-        || envelope.data.attributes == null
-        || envelope.data.attributes.tests == null) {
-      return Collections.emptyMap();
+
+    @Override
+    public Map<String, Collection<TestFQN>> getFlakyTestsByModule(TracerEnvironment tracerEnvironment)
+            throws IOException {
+        if (flakyTestsPath == null) {
+            LOGGER.debug("Flaky tests file path not provided, returning empty");
+            return Collections.emptyMap();
+        }
+        LOGGER.debug("Reading flaky tests from {}", flakyTestsPath);
+        MultiEnvelope<TestIdentifierJson> envelope = readEnvelope(flakyTestsPath, testIdentifiersAdapter);
+        if (envelope == null || envelope.data == null) {
+            return Collections.emptyMap();
+        }
+        Map<String, Collection<TestFQN>> result =
+                TestIdentifierJson.toTestFQNsByModule(envelope.data, tracerEnvironment);
+        LOGGER.debug(
+                "Read {} flaky tests from file",
+                result.values().stream().mapToInt(Collection::size).sum());
+        return result;
     }
-    Map<String, Collection<TestFQN>> result =
-        KnownTestsResponse.toTestFQNsByModule(envelope.data.attributes.tests);
-    LOGGER.debug(
-        "Read {} known tests from file",
-        result != null ? result.values().stream().mapToInt(Collection::size).sum() : 0);
-    return result;
-  }
-
-  @Override
-  public Map<TestSetting, Map<String, Collection<TestFQN>>> getTestManagementTestsByModule(
-      TracerEnvironment tracerEnvironment, String commitSha, String commitMessage)
-      throws IOException {
-    if (testManagementPath == null) {
-      LOGGER.debug("Test management file path not provided, returning empty");
-      return Collections.emptyMap();
+
+    @Nullable
+    @Override
+    public Map<String, Collection<TestFQN>> getKnownTestsByModule(TracerEnvironment tracerEnvironment)
+            throws IOException {
+        if (knownTestsPath == null) {
+            LOGGER.debug("Known tests file path not provided, returning empty");
+            return Collections.emptyMap();
+        }
+        LOGGER.debug("Reading known tests from {}", knownTestsPath);
+        Envelope<KnownTestsResponse> envelope = readEnvelope(knownTestsPath, knownTestsAdapter);
+        if (envelope == null
+                || envelope.data == null
+                || envelope.data.attributes == null
+                || envelope.data.attributes.tests == null) {
+            return Collections.emptyMap();
+        }
+        Map<String, Collection<TestFQN>> result = KnownTestsResponse.toTestFQNsByModule(envelope.data.attributes.tests);
+        LOGGER.debug(
+                "Read {} known tests from file",
+                result != null
+                        ? result.values().stream().mapToInt(Collection::size).sum()
+                        : 0);
+        return result;
     }
-    LOGGER.debug("Reading test management data from {}", testManagementPath);
-    Envelope<TestManagementTestsResponse> envelope =
-        readEnvelope(testManagementPath, testManagementAdapter);
-    if (envelope == null || envelope.data == null || envelope.data.attributes == null) {
-      return Collections.emptyMap();
+
+    @Override
+    public Map<TestSetting, Map<String, Collection<TestFQN>>> getTestManagementTestsByModule(
+            TracerEnvironment tracerEnvironment, String commitSha, String commitMessage) throws IOException {
+        if (testManagementPath == null) {
+            LOGGER.debug("Test management file path not provided, returning empty");
+            return Collections.emptyMap();
+        }
+        LOGGER.debug("Reading test management data from {}", testManagementPath);
+        Envelope<TestManagementTestsResponse> envelope = readEnvelope(testManagementPath, testManagementAdapter);
+        if (envelope == null || envelope.data == null || envelope.data.attributes == null) {
+            return Collections.emptyMap();
+        }
+        return envelope.data.attributes.toTestFQNsBySetting();
     }
-    return envelope.data.attributes.toTestFQNsBySetting();
-  }
 
-  @Nullable
-  private static <T> T readEnvelope(Path path, JsonAdapter<T> adapter) throws IOException {
-    try (BufferedSource source = Okio.buffer(Okio.source(path))) {
-      return adapter.fromJson(source);
+    @Nullable
+    private static <T> T readEnvelope(Path path, JsonAdapter<T> adapter) throws IOException {
+        try (BufferedSource source = Okio.buffer(Okio.source(path))) {
+            return adapter.fromJson(source);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfo.java
index 919a53df2ed..fb31107a950 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfo.java
@@ -8,82 +8,80 @@
 
 public class JvmInfo {
 
-  public static final JvmInfo CURRENT_JVM;
+    public static final JvmInfo CURRENT_JVM;
 
-  static {
-    Config config = Config.get();
-    CiVisibilityWellKnownTags wellKnownTags = config.getCiVisibilityWellKnownTags();
-    CURRENT_JVM =
-        new JvmInfo(
-            wellKnownTags.getRuntimeName().toString(),
-            wellKnownTags.getRuntimeVersion().toString(),
-            wellKnownTags.getRuntimeVendor().toString());
-  }
-
-  private final String name;
-  private final String version;
-  private final String vendor;
+    static {
+        Config config = Config.get();
+        CiVisibilityWellKnownTags wellKnownTags = config.getCiVisibilityWellKnownTags();
+        CURRENT_JVM = new JvmInfo(
+                wellKnownTags.getRuntimeName().toString(),
+                wellKnownTags.getRuntimeVersion().toString(),
+                wellKnownTags.getRuntimeVendor().toString());
+    }
 
-  public JvmInfo(String name, String version, String vendor) {
-    this.name = name;
-    this.version = version;
-    this.vendor = vendor;
-  }
+    private final String name;
+    private final String version;
+    private final String vendor;
 
-  public String getName() {
-    return name;
-  }
+    public JvmInfo(String name, String version, String vendor) {
+        this.name = name;
+        this.version = version;
+        this.vendor = vendor;
+    }
 
-  public String getVersion() {
-    return version;
-  }
+    public String getName() {
+        return name;
+    }
 
-  public String getVendor() {
-    return vendor;
-  }
+    public String getVersion() {
+        return version;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public String getVendor() {
+        return vendor;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        JvmInfo jvmInfo = (JvmInfo) o;
+        return Objects.equals(name, jvmInfo.name)
+                && Objects.equals(version, jvmInfo.version)
+                && Objects.equals(vendor, jvmInfo.vendor);
     }
-    JvmInfo jvmInfo = (JvmInfo) o;
-    return Objects.equals(name, jvmInfo.name)
-        && Objects.equals(version, jvmInfo.version)
-        && Objects.equals(vendor, jvmInfo.vendor);
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, version, vendor);
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, version, vendor);
+    }
 
-  @Override
-  public String toString() {
-    return "JvmInfo{"
-        + "name='"
-        + name
-        + '\''
-        + ", version='"
-        + version
-        + '\''
-        + ", vendor='"
-        + vendor
-        + '\''
-        + '}';
-  }
+    @Override
+    public String toString() {
+        return "JvmInfo{"
+                + "name='"
+                + name
+                + '\''
+                + ", version='"
+                + version
+                + '\''
+                + ", vendor='"
+                + vendor
+                + '\''
+                + '}';
+    }
 
-  public static void serialize(Serializer serializer, JvmInfo jvmInfo) {
-    serializer.write(jvmInfo.name);
-    serializer.write(jvmInfo.version);
-    serializer.write(jvmInfo.vendor);
-  }
+    public static void serialize(Serializer serializer, JvmInfo jvmInfo) {
+        serializer.write(jvmInfo.name);
+        serializer.write(jvmInfo.version);
+        serializer.write(jvmInfo.vendor);
+    }
 
-  public static JvmInfo deserialize(ByteBuffer buf) {
-    return new JvmInfo(
-        Serializer.readString(buf), Serializer.readString(buf), Serializer.readString(buf));
-  }
+    public static JvmInfo deserialize(ByteBuffer buf) {
+        return new JvmInfo(Serializer.readString(buf), Serializer.readString(buf), Serializer.readString(buf));
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfoFactory.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfoFactory.java
index 740ebac0f91..cbba7a2f1ec 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfoFactory.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfoFactory.java
@@ -5,6 +5,6 @@
 import javax.annotation.Nullable;
 
 public interface JvmInfoFactory {
-  @Nonnull
-  JvmInfo getJvmInfo(@Nullable Path jvmExecutablePath);
+    @Nonnull
+    JvmInfo getJvmInfo(@Nullable Path jvmExecutablePath);
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfoFactoryImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfoFactoryImpl.java
index 87fa8dde9e1..c15706713d6 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfoFactoryImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfoFactoryImpl.java
@@ -15,78 +15,74 @@
 
 public class JvmInfoFactoryImpl implements JvmInfoFactory {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(JvmInfoFactoryImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JvmInfoFactoryImpl.class);
 
-  private static final int JVM_VERSION_LAUNCH_TIMEOUT = 5_000;
+    private static final int JVM_VERSION_LAUNCH_TIMEOUT = 5_000;
 
-  @Nonnull
-  @Override
-  public JvmInfo getJvmInfo(@Nullable Path jvmExecutablePath) {
-    String currentJvm =
-        ProcessUtils.getCurrentJvmPath(); // might be home dir or full executable path
-    // if we cannot determine forked JVM,
-    // we assume it is the same as current one,
-    // which is the most common case
-    if (jvmExecutablePath == null
-        || currentJvm != null && jvmExecutablePath.startsWith(currentJvm)) {
-      return JvmInfo.CURRENT_JVM;
-    } else {
-      return doGetJvmInfo(jvmExecutablePath);
+    @Nonnull
+    @Override
+    public JvmInfo getJvmInfo(@Nullable Path jvmExecutablePath) {
+        String currentJvm = ProcessUtils.getCurrentJvmPath(); // might be home dir or full executable path
+        // if we cannot determine forked JVM,
+        // we assume it is the same as current one,
+        // which is the most common case
+        if (jvmExecutablePath == null || currentJvm != null && jvmExecutablePath.startsWith(currentJvm)) {
+            return JvmInfo.CURRENT_JVM;
+        } else {
+            return doGetJvmInfo(jvmExecutablePath);
+        }
     }
-  }
 
-  static JvmInfo doGetJvmInfo(Path jvmExecutablePath) {
-    Path jvmExecutableFolder = jvmExecutablePath.getParent();
-    ShellCommandExecutor commandExecutor =
-        new ShellCommandExecutor(jvmExecutableFolder.toFile(), JVM_VERSION_LAUNCH_TIMEOUT);
-    try {
-      return commandExecutor.executeCommandReadingError(
-          new JvmVersionOutputParser(), "./java", "-XshowSettings:properties", "-version");
+    static JvmInfo doGetJvmInfo(Path jvmExecutablePath) {
+        Path jvmExecutableFolder = jvmExecutablePath.getParent();
+        ShellCommandExecutor commandExecutor =
+                new ShellCommandExecutor(jvmExecutableFolder.toFile(), JVM_VERSION_LAUNCH_TIMEOUT);
+        try {
+            return commandExecutor.executeCommandReadingError(
+                    new JvmVersionOutputParser(), "./java", "-XshowSettings:properties", "-version");
 
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      LOGGER.warn(
-          "Interrupted while waiting for JVM runtime info for {}, assuming {}",
-          jvmExecutablePath,
-          JvmInfo.CURRENT_JVM);
-      return JvmInfo.CURRENT_JVM;
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            LOGGER.warn(
+                    "Interrupted while waiting for JVM runtime info for {}, assuming {}",
+                    jvmExecutablePath,
+                    JvmInfo.CURRENT_JVM);
+            return JvmInfo.CURRENT_JVM;
 
-    } catch (Exception e) {
-      LOGGER.warn(
-          "Could not determine JVM runtime info for {}, assuming {}",
-          jvmExecutablePath,
-          JvmInfo.CURRENT_JVM,
-          e);
-      return JvmInfo.CURRENT_JVM;
+        } catch (Exception e) {
+            LOGGER.warn(
+                    "Could not determine JVM runtime info for {}, assuming {}",
+                    jvmExecutablePath,
+                    JvmInfo.CURRENT_JVM,
+                    e);
+            return JvmInfo.CURRENT_JVM;
+        }
     }
-  }
 
-  private static final class JvmVersionOutputParser
-      implements ShellCommandExecutor.OutputParser<JvmInfo> {
-    @Override
-    public JvmInfo parse(InputStream inputStream) throws IOException {
-      String name = null;
-      String version = null;
-      String vendor = null;
+    private static final class JvmVersionOutputParser implements ShellCommandExecutor.OutputParser<JvmInfo> {
+        @Override
+        public JvmInfo parse(InputStream inputStream) throws IOException {
+            String name = null;
+            String version = null;
+            String vendor = null;
 
-      BufferedReader bis =
-          new BufferedReader(new InputStreamReader(inputStream, Charset.defaultCharset()));
-      String line;
-      while ((line = bis.readLine()) != null) {
-        if (line.contains("java.runtime.name ")) {
-          name = getPropertyValue(line);
-        } else if (line.contains("java.version ")) {
-          version = getPropertyValue(line);
-        } else if (line.contains("java.vendor ")) {
-          vendor = getPropertyValue(line);
+            BufferedReader bis = new BufferedReader(new InputStreamReader(inputStream, Charset.defaultCharset()));
+            String line;
+            while ((line = bis.readLine()) != null) {
+                if (line.contains("java.runtime.name ")) {
+                    name = getPropertyValue(line);
+                } else if (line.contains("java.version ")) {
+                    version = getPropertyValue(line);
+                } else if (line.contains("java.vendor ")) {
+                    vendor = getPropertyValue(line);
+                }
+            }
+            return new JvmInfo(name, version, vendor);
         }
-      }
-      return new JvmInfo(name, version, vendor);
-    }
 
-    private String getPropertyValue(String line) {
-      // format of the input is: "    property.name = propertyValue"
-      return line.substring(line.indexOf('=') + 2);
+        private String getPropertyValue(String line) {
+            // format of the input is: "    property.name = propertyValue"
+            return line.substring(line.indexOf('=') + 2);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/MultiModuleExecutionSettingsFactory.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/MultiModuleExecutionSettingsFactory.java
index b067c4b134f..4f9f7a5db20 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/MultiModuleExecutionSettingsFactory.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/MultiModuleExecutionSettingsFactory.java
@@ -12,21 +12,20 @@
  */
 public class MultiModuleExecutionSettingsFactory implements ExecutionSettingsFactory {
 
-  private final DDCache<JvmInfo, Map<String, ExecutionSettings>> cache;
-  private final ExecutionSettingsFactoryImpl delegate;
+    private final DDCache<JvmInfo, Map<String, ExecutionSettings>> cache;
+    private final ExecutionSettingsFactoryImpl delegate;
 
-  public MultiModuleExecutionSettingsFactory(Config config, ExecutionSettingsFactoryImpl delegate) {
-    this.delegate = delegate;
-    this.cache = DDCaches.newFixedSizeCache(config.getCiVisibilityExecutionSettingsCacheSize());
-  }
+    public MultiModuleExecutionSettingsFactory(Config config, ExecutionSettingsFactoryImpl delegate) {
+        this.delegate = delegate;
+        this.cache = DDCaches.newFixedSizeCache(config.getCiVisibilityExecutionSettingsCacheSize());
+    }
 
-  @Override
-  public ExecutionSettings create(@Nonnull JvmInfo jvmInfo, @Nullable String moduleName) {
-    Map<String, ExecutionSettings> executionSettingsByModule =
-        cache.computeIfAbsent(jvmInfo, delegate::create);
-    ExecutionSettings moduleSettings = executionSettingsByModule.get(moduleName);
-    return moduleSettings != null
-        ? moduleSettings
-        : executionSettingsByModule.get(ExecutionSettingsFactoryImpl.DEFAULT_SETTINGS);
-  }
+    @Override
+    public ExecutionSettings create(@Nonnull JvmInfo jvmInfo, @Nullable String moduleName) {
+        Map<String, ExecutionSettings> executionSettingsByModule = cache.computeIfAbsent(jvmInfo, delegate::create);
+        ExecutionSettings moduleSettings = executionSettingsByModule.get(moduleName);
+        return moduleSettings != null
+                ? moduleSettings
+                : executionSettingsByModule.get(ExecutionSettingsFactoryImpl.DEFAULT_SETTINGS);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/SkippableTests.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/SkippableTests.java
index 9e146766d6f..558f683fab8 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/SkippableTests.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/SkippableTests.java
@@ -15,60 +15,57 @@
 
 public class SkippableTests {
 
-  public static final SkippableTests EMPTY =
-      new SkippableTests(null, Collections.emptyMap(), Collections.emptyMap());
+    public static final SkippableTests EMPTY = new SkippableTests(null, Collections.emptyMap(), Collections.emptyMap());
 
-  private final String correlationId;
-  private final Map<String, Map<TestIdentifier, TestMetadata>> identifiersByModule;
-  private final Map<String, BitSet> coveredLinesByRelativeSourcePath;
+    private final String correlationId;
+    private final Map<String, Map<TestIdentifier, TestMetadata>> identifiersByModule;
+    private final Map<String, BitSet> coveredLinesByRelativeSourcePath;
 
-  public SkippableTests(
-      @Nullable String correlationId,
-      @Nonnull Map<String, Map<TestIdentifier, TestMetadata>> identifiersByModule,
-      @Nonnull Map<String, BitSet> coveredLinesByRelativeSourcePath) {
-    this.correlationId = correlationId;
-    this.identifiersByModule = identifiersByModule;
-    this.coveredLinesByRelativeSourcePath = coveredLinesByRelativeSourcePath;
-  }
-
-  @Nullable
-  public String getCorrelationId() {
-    return correlationId;
-  }
+    public SkippableTests(
+            @Nullable String correlationId,
+            @Nonnull Map<String, Map<TestIdentifier, TestMetadata>> identifiersByModule,
+            @Nonnull Map<String, BitSet> coveredLinesByRelativeSourcePath) {
+        this.correlationId = correlationId;
+        this.identifiersByModule = identifiersByModule;
+        this.coveredLinesByRelativeSourcePath = coveredLinesByRelativeSourcePath;
+    }
 
-  @Nonnull
-  public Map<String, Map<TestIdentifier, TestMetadata>> getIdentifiersByModule() {
-    return identifiersByModule;
-  }
+    @Nullable
+    public String getCorrelationId() {
+        return correlationId;
+    }
 
-  @Nonnull
-  public Map<String, BitSet> getCoveredLinesByRelativeSourcePath() {
-    return coveredLinesByRelativeSourcePath;
-  }
+    @Nonnull
+    public Map<String, Map<TestIdentifier, TestMetadata>> getIdentifiersByModule() {
+        return identifiersByModule;
+    }
 
-  /**
-   * Builds a {@code SkippableTests} from the backend response envelope (or its file-based
-   * equivalent), grouping identifiers by module and pulling correlation id and coverage from the
-   * envelope meta.
-   */
-  public static SkippableTests from(
-      MultiEnvelope<TestIdentifierJson> envelope, TracerEnvironment tracerEnvironment) {
-    Map<String, Map<TestIdentifier, TestMetadata>> identifiersByModule = new HashMap<>();
-    for (Data<TestIdentifierJson> entry : envelope.data) {
-      TestIdentifierJson identifier = entry.attributes;
-      if (identifier == null) {
-        continue;
-      }
-      identifiersByModule
-          .computeIfAbsent(identifier.resolveModuleName(tracerEnvironment), k -> new HashMap<>())
-          .put(identifier.toTestIdentifier(), identifier.toTestMetadata());
+    @Nonnull
+    public Map<String, BitSet> getCoveredLinesByRelativeSourcePath() {
+        return coveredLinesByRelativeSourcePath;
     }
 
-    String correlationId = envelope.meta != null ? envelope.meta.correlationId : null;
-    Map<String, BitSet> coverage =
-        envelope.meta != null && envelope.meta.coverage != null
-            ? envelope.meta.coverage
-            : Collections.emptyMap();
-    return new SkippableTests(correlationId, identifiersByModule, coverage);
-  }
+    /**
+     * Builds a {@code SkippableTests} from the backend response envelope (or its file-based
+     * equivalent), grouping identifiers by module and pulling correlation id and coverage from the
+     * envelope meta.
+     */
+    public static SkippableTests from(MultiEnvelope<TestIdentifierJson> envelope, TracerEnvironment tracerEnvironment) {
+        Map<String, Map<TestIdentifier, TestMetadata>> identifiersByModule = new HashMap<>();
+        for (Data<TestIdentifierJson> entry : envelope.data) {
+            TestIdentifierJson identifier = entry.attributes;
+            if (identifier == null) {
+                continue;
+            }
+            identifiersByModule
+                    .computeIfAbsent(identifier.resolveModuleName(tracerEnvironment), k -> new HashMap<>())
+                    .put(identifier.toTestIdentifier(), identifier.toTestMetadata());
+        }
+
+        String correlationId = envelope.meta != null ? envelope.meta.correlationId : null;
+        Map<String, BitSet> coverage = envelope.meta != null && envelope.meta.coverage != null
+                ? envelope.meta.coverage
+                : Collections.emptyMap();
+        return new SkippableTests(correlationId, identifiersByModule, coverage);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestFQNSerializer.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestFQNSerializer.java
index 1928facd378..2fa5e694455 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestFQNSerializer.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestFQNSerializer.java
@@ -5,15 +5,15 @@
 import java.nio.ByteBuffer;
 
 public abstract class TestFQNSerializer {
-  public static void serialize(Serializer serializer, TestFQN testFQN) {
-    serializer.write(testFQN.getSuite());
-    serializer.write(testFQN.getName());
-  }
+    public static void serialize(Serializer serializer, TestFQN testFQN) {
+        serializer.write(testFQN.getSuite());
+        serializer.write(testFQN.getName());
+    }
 
-  public static TestFQN deserialize(ByteBuffer buffer) {
-    String suiteName = Serializer.readString(buffer);
-    return new TestFQN(
-        // suite name repeats a lot; interning it to save memory
-        suiteName != null ? suiteName.intern() : null, Serializer.readString(buffer));
-  }
+    public static TestFQN deserialize(ByteBuffer buffer) {
+        String suiteName = Serializer.readString(buffer);
+        return new TestFQN(
+                // suite name repeats a lot; interning it to save memory
+                suiteName != null ? suiteName.intern() : null, Serializer.readString(buffer));
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestIdentifierSerializer.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestIdentifierSerializer.java
index df179695366..70a7e82ac5b 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestIdentifierSerializer.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestIdentifierSerializer.java
@@ -6,12 +6,12 @@
 
 public abstract class TestIdentifierSerializer {
 
-  public static void serialize(Serializer serializer, TestIdentifier testIdentifier) {
-    TestFQNSerializer.serialize(serializer, testIdentifier.toFQN());
-    serializer.write(testIdentifier.getParameters());
-  }
+    public static void serialize(Serializer serializer, TestIdentifier testIdentifier) {
+        TestFQNSerializer.serialize(serializer, testIdentifier.toFQN());
+        serializer.write(testIdentifier.getParameters());
+    }
 
-  public static TestIdentifier deserialize(ByteBuffer buffer) {
-    return new TestIdentifier(TestFQNSerializer.deserialize(buffer), Serializer.readString(buffer));
-  }
+    public static TestIdentifier deserialize(ByteBuffer buffer) {
+        return new TestIdentifier(TestFQNSerializer.deserialize(buffer), Serializer.readString(buffer));
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestManagementSettings.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestManagementSettings.java
index 6581d478e17..bf1dc8212a6 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestManagementSettings.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestManagementSettings.java
@@ -7,81 +7,79 @@
 
 public class TestManagementSettings {
 
-  public static final TestManagementSettings DEFAULT = new TestManagementSettings(false, -1);
+    public static final TestManagementSettings DEFAULT = new TestManagementSettings(false, -1);
 
-  private final boolean enabled;
-  private final int attemptToFixRetries;
+    private final boolean enabled;
+    private final int attemptToFixRetries;
 
-  public TestManagementSettings(boolean enabled, int attemptToFixRetries) {
-    this.enabled = enabled;
-    this.attemptToFixRetries = attemptToFixRetries;
-  }
-
-  public boolean isEnabled() {
-    return enabled;
-  }
-
-  public int getAttemptToFixRetries() {
-    return attemptToFixRetries;
-  }
+    public TestManagementSettings(boolean enabled, int attemptToFixRetries) {
+        this.enabled = enabled;
+        this.attemptToFixRetries = attemptToFixRetries;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public boolean isEnabled() {
+        return enabled;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    public int getAttemptToFixRetries() {
+        return attemptToFixRetries;
     }
 
-    TestManagementSettings that = (TestManagementSettings) o;
-    return enabled == that.enabled && attemptToFixRetries == that.attemptToFixRetries;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(enabled, attemptToFixRetries);
-  }
-
-  public static final class Serializer {
-    public static void serialize(
-        datadog.trace.civisibility.ipc.serialization.Serializer serializer,
-        TestManagementSettings settings) {
-      if (!settings.enabled) {
-        serializer.write((byte) 0);
-        return;
-      }
-      serializer.write((byte) 1);
-      serializer.write(settings.attemptToFixRetries);
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        TestManagementSettings that = (TestManagementSettings) o;
+        return enabled == that.enabled && attemptToFixRetries == that.attemptToFixRetries;
     }
 
-    public static TestManagementSettings deserialize(ByteBuffer buf) {
-      boolean enabled = datadog.trace.civisibility.ipc.serialization.Serializer.readByte(buf) != 0;
-      if (!enabled) {
-        return TestManagementSettings.DEFAULT;
-      }
+    @Override
+    public int hashCode() {
+        return Objects.hash(enabled, attemptToFixRetries);
+    }
 
-      int attemptToFixRetries =
-          datadog.trace.civisibility.ipc.serialization.Serializer.readInt(buf);
-      return new TestManagementSettings(enabled, attemptToFixRetries);
+    public static final class Serializer {
+        public static void serialize(
+                datadog.trace.civisibility.ipc.serialization.Serializer serializer, TestManagementSettings settings) {
+            if (!settings.enabled) {
+                serializer.write((byte) 0);
+                return;
+            }
+            serializer.write((byte) 1);
+            serializer.write(settings.attemptToFixRetries);
+        }
+
+        public static TestManagementSettings deserialize(ByteBuffer buf) {
+            boolean enabled = datadog.trace.civisibility.ipc.serialization.Serializer.readByte(buf) != 0;
+            if (!enabled) {
+                return TestManagementSettings.DEFAULT;
+            }
+
+            int attemptToFixRetries = datadog.trace.civisibility.ipc.serialization.Serializer.readInt(buf);
+            return new TestManagementSettings(enabled, attemptToFixRetries);
+        }
     }
-  }
 
-  public static final class JsonAdapter {
-    public static final JsonAdapter INSTANCE = new JsonAdapter();
+    public static final class JsonAdapter {
+        public static final JsonAdapter INSTANCE = new JsonAdapter();
 
-    @FromJson
-    public TestManagementSettings fromJson(Map<String, Object> json) {
-      if (json == null) {
-        return TestManagementSettings.DEFAULT;
-      }
+        @FromJson
+        public TestManagementSettings fromJson(Map<String, Object> json) {
+            if (json == null) {
+                return TestManagementSettings.DEFAULT;
+            }
 
-      Boolean enabled = (Boolean) json.get("enabled");
-      Double attemptToFixRetries = (Double) json.get("attempt_to_fix_retries");
+            Boolean enabled = (Boolean) json.get("enabled");
+            Double attemptToFixRetries = (Double) json.get("attempt_to_fix_retries");
 
-      return new TestManagementSettings(
-          enabled != null ? enabled : false,
-          attemptToFixRetries != null ? attemptToFixRetries.intValue() : 20);
+            return new TestManagementSettings(
+                    enabled != null ? enabled : false,
+                    attemptToFixRetries != null ? attemptToFixRetries.intValue() : 20);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestMetadataSerializer.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestMetadataSerializer.java
index 949c4aa3737..36b15faa2d0 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestMetadataSerializer.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestMetadataSerializer.java
@@ -6,11 +6,11 @@
 
 public abstract class TestMetadataSerializer {
 
-  public static void serialize(Serializer serializer, TestMetadata testMetadata) {
-    serializer.write(testMetadata.isMissingLineCodeCoverage());
-  }
+    public static void serialize(Serializer serializer, TestMetadata testMetadata) {
+        serializer.write(testMetadata.isMissingLineCodeCoverage());
+    }
 
-  public static TestMetadata deserialize(ByteBuffer buffer) {
-    return new TestMetadata(Serializer.readBoolean(buffer));
-  }
+    public static TestMetadata deserialize(ByteBuffer buffer) {
+        return new TestMetadata(Serializer.readBoolean(buffer));
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestSetting.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestSetting.java
index e70c3a834f9..b7b317d6ea4 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestSetting.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestSetting.java
@@ -3,50 +3,50 @@
 import java.nio.ByteBuffer;
 
 public enum TestSetting {
-  FLAKY(1, "flaky"),
-  KNOWN(2, "known"),
-  QUARANTINED(4, "quarantined"),
-  DISABLED(8, "disabled"),
-  ATTEMPT_TO_FIX(16, "attempt_to_fix");
-
-  private final int flag;
-  private final String name;
-
-  TestSetting(int flag, String name) {
-    this.flag = flag;
-    this.name = name;
-  }
-
-  public int getFlag() {
-    return flag;
-  }
-
-  public String asString() {
-    return name;
-  }
-
-  public static int set(int mask, TestSetting setting) {
-    return mask | setting.flag;
-  }
-
-  public static boolean isSet(int mask, TestSetting setting) {
-    return (mask & setting.flag) != 0;
-  }
-
-  public static class Serializer {
-    public static void serialize(
-        datadog.trace.civisibility.ipc.serialization.Serializer serializer, TestSetting setting) {
-      serializer.write(setting.flag);
+    FLAKY(1, "flaky"),
+    KNOWN(2, "known"),
+    QUARANTINED(4, "quarantined"),
+    DISABLED(8, "disabled"),
+    ATTEMPT_TO_FIX(16, "attempt_to_fix");
+
+    private final int flag;
+    private final String name;
+
+    TestSetting(int flag, String name) {
+        this.flag = flag;
+        this.name = name;
     }
 
-    public static TestSetting deserialize(ByteBuffer buf) {
-      int flag = datadog.trace.civisibility.ipc.serialization.Serializer.readInt(buf);
-      for (TestSetting setting : TestSetting.values()) {
-        if (setting.flag == flag) {
-          return setting;
+    public int getFlag() {
+        return flag;
+    }
+
+    public String asString() {
+        return name;
+    }
+
+    public static int set(int mask, TestSetting setting) {
+        return mask | setting.flag;
+    }
+
+    public static boolean isSet(int mask, TestSetting setting) {
+        return (mask & setting.flag) != 0;
+    }
+
+    public static class Serializer {
+        public static void serialize(
+                datadog.trace.civisibility.ipc.serialization.Serializer serializer, TestSetting setting) {
+            serializer.write(setting.flag);
+        }
+
+        public static TestSetting deserialize(ByteBuffer buf) {
+            int flag = datadog.trace.civisibility.ipc.serialization.Serializer.readInt(buf);
+            for (TestSetting setting : TestSetting.values()) {
+                if (setting.flag == flag) {
+                    return setting;
+                }
+            }
+            return null;
         }
-      }
-      return null;
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/ConfigurationApiMoshi.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/ConfigurationApiMoshi.java
index 7cc2efcb749..aee1e16adf1 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/ConfigurationApiMoshi.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/ConfigurationApiMoshi.java
@@ -14,15 +14,15 @@
  */
 public final class ConfigurationApiMoshi {
 
-  private ConfigurationApiMoshi() {}
+    private ConfigurationApiMoshi() {}
 
-  public static Moshi create() {
-    return new Moshi.Builder()
-        .add(ConfigurationsJsonAdapter.INSTANCE)
-        .add(CiVisibilitySettings.JsonAdapter.INSTANCE)
-        .add(EarlyFlakeDetectionSettings.JsonAdapter.INSTANCE)
-        .add(TestManagementSettings.JsonAdapter.INSTANCE)
-        .add(Meta.JsonAdapter.INSTANCE)
-        .build();
-  }
+    public static Moshi create() {
+        return new Moshi.Builder()
+                .add(ConfigurationsJsonAdapter.INSTANCE)
+                .add(CiVisibilitySettings.JsonAdapter.INSTANCE)
+                .add(EarlyFlakeDetectionSettings.JsonAdapter.INSTANCE)
+                .add(TestManagementSettings.JsonAdapter.INSTANCE)
+                .add(Meta.JsonAdapter.INSTANCE)
+                .build();
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/Data.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/Data.java
index 840be14aa85..34629a34f24 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/Data.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/Data.java
@@ -1,13 +1,13 @@
 package datadog.trace.civisibility.config.api.dto;
 
 public final class Data<T> {
-  public final String id;
-  public final String type;
-  public final T attributes;
+    public final String id;
+    public final String type;
+    public final T attributes;
 
-  public Data(String id, String type, T attributes) {
-    this.id = id;
-    this.type = type;
-    this.attributes = attributes;
-  }
+    public Data(String id, String type, T attributes) {
+        this.id = id;
+        this.type = type;
+        this.attributes = attributes;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/Envelope.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/Envelope.java
index 956dc61df2f..ce2db5715c9 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/Envelope.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/Envelope.java
@@ -1,9 +1,9 @@
 package datadog.trace.civisibility.config.api.dto;
 
 public final class Envelope<T> {
-  public final Data<T> data;
+    public final Data<T> data;
 
-  public Envelope(Data<T> data) {
-    this.data = data;
-  }
+    public Envelope(Data<T> data) {
+        this.data = data;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/MultiEnvelope.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/MultiEnvelope.java
index 2138be6960a..52c33a8381c 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/MultiEnvelope.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/MultiEnvelope.java
@@ -5,11 +5,13 @@
 import javax.annotation.Nullable;
 
 public final class MultiEnvelope<T> {
-  public final Collection<Data<T>> data;
-  @Nullable public final Meta meta;
+    public final Collection<Data<T>> data;
 
-  public MultiEnvelope(Collection<Data<T>> data, @Nullable Meta meta) {
-    this.data = data;
-    this.meta = meta;
-  }
+    @Nullable
+    public final Meta meta;
+
+    public MultiEnvelope(Collection<Data<T>> data, @Nullable Meta meta) {
+        this.data = data;
+        this.meta = meta;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/PageInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/PageInfo.java
index 045190cf7fb..2d2547b72f2 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/PageInfo.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/PageInfo.java
@@ -5,29 +5,29 @@
 
 public final class PageInfo {
 
-  private PageInfo() {}
+    private PageInfo() {}
 
-  public static final class Request {
-    @Json(name = "page_state")
-    @Nullable
-    public final String pageState;
+    public static final class Request {
+        @Json(name = "page_state")
+        @Nullable
+        public final String pageState;
 
-    public Request(@Nullable String pageState) {
-      this.pageState = pageState;
+        public Request(@Nullable String pageState) {
+            this.pageState = pageState;
+        }
     }
-  }
 
-  public static final class Response {
-    public final String cursor;
-    public final int size;
+    public static final class Response {
+        public final String cursor;
+        public final int size;
 
-    @Json(name = "has_next")
-    public final boolean hasNext;
+        @Json(name = "has_next")
+        public final boolean hasNext;
 
-    public Response(String cursor, int size, boolean hasNext) {
-      this.cursor = cursor;
-      this.size = size;
-      this.hasNext = hasNext;
+        public Response(String cursor, int size, boolean hasNext) {
+            this.cursor = cursor;
+            this.size = size;
+            this.hasNext = hasNext;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/request/KnownTestsRequest.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/request/KnownTestsRequest.java
index df86c7c76f9..556343dbf62 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/request/KnownTestsRequest.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/request/KnownTestsRequest.java
@@ -5,19 +5,19 @@
 import javax.annotation.Nullable;
 
 public final class KnownTestsRequest {
-  @Json(name = "repository_url")
-  public final String repositoryUrl;
+    @Json(name = "repository_url")
+    public final String repositoryUrl;
 
-  public final String service;
-  public final String env;
+    public final String service;
+    public final String env;
 
-  @Json(name = "page_info")
-  public final PageInfo.Request pageInfo;
+    @Json(name = "page_info")
+    public final PageInfo.Request pageInfo;
 
-  public KnownTestsRequest(TracerEnvironment tracerEnvironment, @Nullable String pageState) {
-    this.repositoryUrl = tracerEnvironment.getRepositoryUrl();
-    this.service = tracerEnvironment.getService();
-    this.env = tracerEnvironment.getEnv();
-    this.pageInfo = new PageInfo.Request(pageState);
-  }
+    public KnownTestsRequest(TracerEnvironment tracerEnvironment, @Nullable String pageState) {
+        this.repositoryUrl = tracerEnvironment.getRepositoryUrl();
+        this.service = tracerEnvironment.getService();
+        this.env = tracerEnvironment.getEnv();
+        this.pageInfo = new PageInfo.Request(pageState);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/request/TestManagementRequest.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/request/TestManagementRequest.java
index b6d411d66ab..f73f4176104 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/request/TestManagementRequest.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/request/TestManagementRequest.java
@@ -3,22 +3,21 @@
 import com.squareup.moshi.Json;
 
 public final class TestManagementRequest {
-  @Json(name = "repository_url")
-  public final String repositoryUrl;
+    @Json(name = "repository_url")
+    public final String repositoryUrl;
 
-  @Json(name = "commit_message")
-  public final String commitMessage;
+    @Json(name = "commit_message")
+    public final String commitMessage;
 
-  public final String module;
-  public final String sha;
-  public final String branch;
+    public final String module;
+    public final String sha;
+    public final String branch;
 
-  public TestManagementRequest(
-      String repositoryUrl, String commitMessage, String module, String sha, String branch) {
-    this.repositoryUrl = repositoryUrl;
-    this.commitMessage = commitMessage;
-    this.module = module;
-    this.sha = sha;
-    this.branch = branch;
-  }
+    public TestManagementRequest(String repositoryUrl, String commitMessage, String module, String sha, String branch) {
+        this.repositoryUrl = repositoryUrl;
+        this.commitMessage = commitMessage;
+        this.module = module;
+        this.sha = sha;
+        this.branch = branch;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/request/TracerEnvironment.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/request/TracerEnvironment.java
index b609279c909..bd2ad1a36c9 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/request/TracerEnvironment.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/request/TracerEnvironment.java
@@ -8,221 +8,221 @@
 
 public class TracerEnvironment {
 
-  private final String service;
-  private final String env;
-
-  @Json(name = "repository_url")
-  private final String repositoryUrl;
-
-  private final String branch;
-  private final String sha;
-
-  @Json(name = "commit_message")
-  private final String commitMessage;
-
-  @Json(name = "test_level")
-  private final String testLevel = "test";
-
-  private final Configurations configurations;
-
-  private TracerEnvironment(
-      String service,
-      String env,
-      String repositoryUrl,
-      String branch,
-      String sha,
-      String commitMessage,
-      Configurations configurations) {
-    this.service = service;
-    this.env = env;
-    this.repositoryUrl = repositoryUrl;
-    this.branch = branch;
-    this.sha = sha;
-    this.commitMessage = commitMessage;
-    this.configurations = configurations;
-  }
-
-  public String getSha() {
-    return sha;
-  }
-
-  public String getCommitMessage() {
-    return commitMessage;
-  }
-
-  public String getService() {
-    return service;
-  }
-
-  public String getEnv() {
-    return env;
-  }
-
-  public String getRepositoryUrl() {
-    return repositoryUrl;
-  }
-
-  public String getBranch() {
-    return branch;
-  }
-
-  public String getTestLevel() {
-    return testLevel;
-  }
-
-  public Configurations getConfigurations() {
-    return configurations;
-  }
-
-  @Override
-  public String toString() {
-    return "TracerEnvironment{"
-        + "service='"
-        + service
-        + '\''
-        + ", env='"
-        + env
-        + '\''
-        + ", repositoryUrl='"
-        + repositoryUrl
-        + '\''
-        + ", branch='"
-        + branch
-        + '\''
-        + ", sha='"
-        + sha
-        + '\''
-        + ", commitMessage='"
-        + commitMessage
-        + '\''
-        + ", testLevel='"
-        + testLevel
-        + '\''
-        + ", configurations="
-        + configurations
-        + '}';
-  }
-
-  public static Builder builder() {
-    return new Builder();
-  }
-
-  public static final class Builder {
-    private String service;
-    private String env;
-    private String repositoryUrl;
-    private String branch;
-    private String tag; // will act as fallback if no branch is provided
-    private String sha;
-    private String commitMessage;
-    private String osPlatform;
-    private String osArchitecture;
-    private String osVersion;
-    private String runtimeName;
-    private String runtimeVersion;
-    private String runtimeVendor;
-    private String runtimeArchitecture;
-    private String testBundle;
-    private final Map<String, String> customTags = new HashMap<>();
-
-    public Builder service(String service) {
-      this.service = service;
-      return this;
-    }
-
-    public Builder env(String env) {
-      this.env = env;
-      return this;
-    }
-
-    public Builder repositoryUrl(String repositoryUrl) {
-      this.repositoryUrl = repositoryUrl;
-      return this;
-    }
-
-    public Builder branch(String branch) {
-      this.branch = branch;
-      return this;
-    }
-
-    public Builder tag(String tag) {
-      this.tag = tag;
-      return this;
-    }
-
-    public Builder sha(String sha) {
-      this.sha = sha;
-      return this;
-    }
-
-    public Builder commitMessage(String commitMessage) {
-      this.commitMessage = commitMessage;
-      return this;
-    }
+    private final String service;
+    private final String env;
 
-    public Builder osPlatform(String osPlatform) {
-      this.osPlatform = osPlatform;
-      return this;
-    }
+    @Json(name = "repository_url")
+    private final String repositoryUrl;
 
-    public Builder osArchitecture(String osArchitecture) {
-      this.osArchitecture = osArchitecture;
-      return this;
-    }
+    private final String branch;
+    private final String sha;
 
-    public Builder osVersion(String osVersion) {
-      this.osVersion = osVersion;
-      return this;
-    }
+    @Json(name = "commit_message")
+    private final String commitMessage;
 
-    public Builder runtimeName(String runtimeName) {
-      this.runtimeName = runtimeName;
-      return this;
-    }
+    @Json(name = "test_level")
+    private final String testLevel = "test";
 
-    public Builder runtimeVersion(String runtimeVersion) {
-      this.runtimeVersion = runtimeVersion;
-      return this;
-    }
-
-    public Builder runtimeVendor(String runtimeVendor) {
-      this.runtimeVendor = runtimeVendor;
-      return this;
-    }
-
-    public Builder runtimeArchitecture(String runtimeArchitecture) {
-      this.runtimeArchitecture = runtimeArchitecture;
-      return this;
-    }
-
-    public Builder testBundle(String testBundle) {
-      this.testBundle = testBundle;
-      return this;
-    }
-
-    public Builder customTag(String key, String value) {
-      this.customTags.put(key, value);
-      return this;
-    }
+    private final Configurations configurations;
 
-    public TracerEnvironment build() {
-      return new TracerEnvironment(
-          service,
-          env,
-          repositoryUrl,
-          Strings.isNotBlank(branch) ? branch : tag,
-          sha,
-          commitMessage,
-          new Configurations(
-              osPlatform,
-              osArchitecture,
-              osVersion,
-              runtimeName,
-              runtimeVersion,
-              runtimeVendor,
-              runtimeArchitecture,
-              testBundle,
-              customTags));
+    private TracerEnvironment(
+            String service,
+            String env,
+            String repositoryUrl,
+            String branch,
+            String sha,
+            String commitMessage,
+            Configurations configurations) {
+        this.service = service;
+        this.env = env;
+        this.repositoryUrl = repositoryUrl;
+        this.branch = branch;
+        this.sha = sha;
+        this.commitMessage = commitMessage;
+        this.configurations = configurations;
+    }
+
+    public String getSha() {
+        return sha;
+    }
+
+    public String getCommitMessage() {
+        return commitMessage;
+    }
+
+    public String getService() {
+        return service;
+    }
+
+    public String getEnv() {
+        return env;
+    }
+
+    public String getRepositoryUrl() {
+        return repositoryUrl;
+    }
+
+    public String getBranch() {
+        return branch;
+    }
+
+    public String getTestLevel() {
+        return testLevel;
+    }
+
+    public Configurations getConfigurations() {
+        return configurations;
+    }
+
+    @Override
+    public String toString() {
+        return "TracerEnvironment{"
+                + "service='"
+                + service
+                + '\''
+                + ", env='"
+                + env
+                + '\''
+                + ", repositoryUrl='"
+                + repositoryUrl
+                + '\''
+                + ", branch='"
+                + branch
+                + '\''
+                + ", sha='"
+                + sha
+                + '\''
+                + ", commitMessage='"
+                + commitMessage
+                + '\''
+                + ", testLevel='"
+                + testLevel
+                + '\''
+                + ", configurations="
+                + configurations
+                + '}';
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static final class Builder {
+        private String service;
+        private String env;
+        private String repositoryUrl;
+        private String branch;
+        private String tag; // will act as fallback if no branch is provided
+        private String sha;
+        private String commitMessage;
+        private String osPlatform;
+        private String osArchitecture;
+        private String osVersion;
+        private String runtimeName;
+        private String runtimeVersion;
+        private String runtimeVendor;
+        private String runtimeArchitecture;
+        private String testBundle;
+        private final Map<String, String> customTags = new HashMap<>();
+
+        public Builder service(String service) {
+            this.service = service;
+            return this;
+        }
+
+        public Builder env(String env) {
+            this.env = env;
+            return this;
+        }
+
+        public Builder repositoryUrl(String repositoryUrl) {
+            this.repositoryUrl = repositoryUrl;
+            return this;
+        }
+
+        public Builder branch(String branch) {
+            this.branch = branch;
+            return this;
+        }
+
+        public Builder tag(String tag) {
+            this.tag = tag;
+            return this;
+        }
+
+        public Builder sha(String sha) {
+            this.sha = sha;
+            return this;
+        }
+
+        public Builder commitMessage(String commitMessage) {
+            this.commitMessage = commitMessage;
+            return this;
+        }
+
+        public Builder osPlatform(String osPlatform) {
+            this.osPlatform = osPlatform;
+            return this;
+        }
+
+        public Builder osArchitecture(String osArchitecture) {
+            this.osArchitecture = osArchitecture;
+            return this;
+        }
+
+        public Builder osVersion(String osVersion) {
+            this.osVersion = osVersion;
+            return this;
+        }
+
+        public Builder runtimeName(String runtimeName) {
+            this.runtimeName = runtimeName;
+            return this;
+        }
+
+        public Builder runtimeVersion(String runtimeVersion) {
+            this.runtimeVersion = runtimeVersion;
+            return this;
+        }
+
+        public Builder runtimeVendor(String runtimeVendor) {
+            this.runtimeVendor = runtimeVendor;
+            return this;
+        }
+
+        public Builder runtimeArchitecture(String runtimeArchitecture) {
+            this.runtimeArchitecture = runtimeArchitecture;
+            return this;
+        }
+
+        public Builder testBundle(String testBundle) {
+            this.testBundle = testBundle;
+            return this;
+        }
+
+        public Builder customTag(String key, String value) {
+            this.customTags.put(key, value);
+            return this;
+        }
+
+        public TracerEnvironment build() {
+            return new TracerEnvironment(
+                    service,
+                    env,
+                    repositoryUrl,
+                    Strings.isNotBlank(branch) ? branch : tag,
+                    sha,
+                    commitMessage,
+                    new Configurations(
+                            osPlatform,
+                            osArchitecture,
+                            osVersion,
+                            runtimeName,
+                            runtimeVersion,
+                            runtimeVendor,
+                            runtimeArchitecture,
+                            testBundle,
+                            customTags));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/KnownTestsResponse.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/KnownTestsResponse.java
index c6d4bdb22f4..8f3114abb02 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/KnownTestsResponse.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/KnownTestsResponse.java
@@ -11,54 +11,53 @@
 import javax.annotation.Nullable;
 
 public final class KnownTestsResponse {
-  public final Map<String, Map<String, List<String>>> tests;
+    public final Map<String, Map<String, List<String>>> tests;
 
-  @Json(name = "page_info")
-  public final PageInfo.Response pageInfo;
+    @Json(name = "page_info")
+    public final PageInfo.Response pageInfo;
 
-  public KnownTestsResponse(
-      Map<String, Map<String, List<String>>> tests, PageInfo.Response pageInfo) {
-    this.tests = tests;
-    this.pageInfo = pageInfo;
-  }
+    public KnownTestsResponse(Map<String, Map<String, List<String>>> tests, PageInfo.Response pageInfo) {
+        this.tests = tests;
+        this.pageInfo = pageInfo;
+    }
 
-  public boolean hasNextPage() {
-    return pageInfo != null && pageInfo.hasNext;
-  }
+    public boolean hasNextPage() {
+        return pageInfo != null && pageInfo.hasNext;
+    }
 
-  @Nullable
-  public Integer getPageSize() {
-    return pageInfo != null ? pageInfo.size : null;
-  }
+    @Nullable
+    public Integer getPageSize() {
+        return pageInfo != null ? pageInfo.size : null;
+    }
 
-  @Nullable
-  public String getNextPageCursor() {
-    return pageInfo != null ? pageInfo.cursor : null;
-  }
+    @Nullable
+    public String getNextPageCursor() {
+        return pageInfo != null ? pageInfo.cursor : null;
+    }
 
-  /**
-   * Flattens a {@code module -> suite -> [testName]} map into {@code module -> Set<TestFQN>}.
-   * Returns {@code null} when the input contains no tests so that callers can disable downstream
-   * features that rely on known tests being available.
-   */
-  @Nullable
-  public static Map<String, Collection<TestFQN>> toTestFQNsByModule(
-      Map<String, Map<String, List<String>>> tests) {
-    int totalTests = 0;
-    Map<String, Collection<TestFQN>> testsByModule = new HashMap<>();
-    for (Map.Entry<String, Map<String, List<String>>> moduleEntry : tests.entrySet()) {
-      String moduleName = moduleEntry.getKey();
-      for (Map.Entry<String, List<String>> suiteEntry : moduleEntry.getValue().entrySet()) {
-        String suiteName = suiteEntry.getKey();
-        List<String> testNames = suiteEntry.getValue();
-        totalTests += testNames.size();
-        for (String testName : testNames) {
-          testsByModule
-              .computeIfAbsent(moduleName, k -> new HashSet<>())
-              .add(new TestFQN(suiteName, testName));
+    /**
+     * Flattens a {@code module -> suite -> [testName]} map into {@code module -> Set<TestFQN>}.
+     * Returns {@code null} when the input contains no tests so that callers can disable downstream
+     * features that rely on known tests being available.
+     */
+    @Nullable
+    public static Map<String, Collection<TestFQN>> toTestFQNsByModule(Map<String, Map<String, List<String>>> tests) {
+        int totalTests = 0;
+        Map<String, Collection<TestFQN>> testsByModule = new HashMap<>();
+        for (Map.Entry<String, Map<String, List<String>>> moduleEntry : tests.entrySet()) {
+            String moduleName = moduleEntry.getKey();
+            for (Map.Entry<String, List<String>> suiteEntry :
+                    moduleEntry.getValue().entrySet()) {
+                String suiteName = suiteEntry.getKey();
+                List<String> testNames = suiteEntry.getValue();
+                totalTests += testNames.size();
+                for (String testName : testNames) {
+                    testsByModule
+                            .computeIfAbsent(moduleName, k -> new HashSet<>())
+                            .add(new TestFQN(suiteName, testName));
+                }
+            }
         }
-      }
+        return totalTests > 0 ? testsByModule : null;
     }
-    return totalTests > 0 ? testsByModule : null;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/Meta.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/Meta.java
index db52634ebb7..43a92ab1ebd 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/Meta.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/Meta.java
@@ -11,48 +11,50 @@
 
 public final class Meta {
 
-  @Nullable public final String correlationId;
-  @Nullable public final Map<String, BitSet> coverage;
-
-  public Meta(@Nullable String correlationId, @Nullable Map<String, BitSet> coverage) {
-    this.correlationId = correlationId;
-    this.coverage = coverage;
-  }
-
-  public static final class JsonAdapter {
-
-    public static final JsonAdapter INSTANCE = new JsonAdapter();
-
-    @SuppressWarnings("unchecked")
-    @FromJson
-    public Meta fromJson(Map<String, Object> json) {
-      if (json == null) {
-        return null;
-      }
-
-      Map<String, BitSet> coverage;
-      Map<String, String> encodedCoverage = (Map<String, String>) json.get("coverage");
-      if (encodedCoverage != null) {
-        coverage = new HashMap<>();
-        for (Map.Entry<String, String> e : encodedCoverage.entrySet()) {
-          String relativeSourceFilePath = e.getKey();
-          String normalizedPath =
-              relativeSourceFilePath.startsWith(File.separator)
-                  ? relativeSourceFilePath.substring(1)
-                  : relativeSourceFilePath;
-          byte[] decodedLines = Base64.getDecoder().decode(e.getValue());
-          coverage.put(normalizedPath, BitSet.valueOf(decodedLines));
-        }
-      } else {
-        coverage = null;
-      }
+    @Nullable
+    public final String correlationId;
+
+    @Nullable
+    public final Map<String, BitSet> coverage;
 
-      return new Meta((String) json.get("correlation_id"), coverage);
+    public Meta(@Nullable String correlationId, @Nullable Map<String, BitSet> coverage) {
+        this.correlationId = correlationId;
+        this.coverage = coverage;
     }
 
-    @ToJson
-    public Map<String, Object> toJson(Meta meta) {
-      throw new UnsupportedOperationException();
+    public static final class JsonAdapter {
+
+        public static final JsonAdapter INSTANCE = new JsonAdapter();
+
+        @SuppressWarnings("unchecked")
+        @FromJson
+        public Meta fromJson(Map<String, Object> json) {
+            if (json == null) {
+                return null;
+            }
+
+            Map<String, BitSet> coverage;
+            Map<String, String> encodedCoverage = (Map<String, String>) json.get("coverage");
+            if (encodedCoverage != null) {
+                coverage = new HashMap<>();
+                for (Map.Entry<String, String> e : encodedCoverage.entrySet()) {
+                    String relativeSourceFilePath = e.getKey();
+                    String normalizedPath = relativeSourceFilePath.startsWith(File.separator)
+                            ? relativeSourceFilePath.substring(1)
+                            : relativeSourceFilePath;
+                    byte[] decodedLines = Base64.getDecoder().decode(e.getValue());
+                    coverage.put(normalizedPath, BitSet.valueOf(decodedLines));
+                }
+            } else {
+                coverage = null;
+            }
+
+            return new Meta((String) json.get("correlation_id"), coverage);
+        }
+
+        @ToJson
+        public Map<String, Object> toJson(Meta meta) {
+            throw new UnsupportedOperationException();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/TestIdentifierJson.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/TestIdentifierJson.java
index 006deb428be..0da80ac8dd6 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/TestIdentifierJson.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/TestIdentifierJson.java
@@ -14,80 +14,78 @@
 
 public final class TestIdentifierJson {
 
-  private final String suite;
-  private final String name;
-  private final String parameters;
-  private final Configurations configurations;
+    private final String suite;
+    private final String name;
+    private final String parameters;
+    private final Configurations configurations;
 
-  @Json(name = "_is_missing_line_code_coverage")
-  private final boolean missingLineCodeCoverage;
+    @Json(name = "_is_missing_line_code_coverage")
+    private final boolean missingLineCodeCoverage;
 
-  public TestIdentifierJson(
-      String suite,
-      String name,
-      String parameters,
-      Configurations configurations,
-      boolean missingLineCodeCoverage) {
-    this.suite = suite;
-    this.name = name;
-    this.parameters = parameters;
-    this.configurations = configurations;
-    this.missingLineCodeCoverage = missingLineCodeCoverage;
-  }
+    public TestIdentifierJson(
+            String suite,
+            String name,
+            String parameters,
+            Configurations configurations,
+            boolean missingLineCodeCoverage) {
+        this.suite = suite;
+        this.name = name;
+        this.parameters = parameters;
+        this.configurations = configurations;
+        this.missingLineCodeCoverage = missingLineCodeCoverage;
+    }
 
-  public Configurations getConfigurations() {
-    return configurations;
-  }
+    public Configurations getConfigurations() {
+        return configurations;
+    }
 
-  public boolean isMissingLineCodeCoverage() {
-    return missingLineCodeCoverage;
-  }
+    public boolean isMissingLineCodeCoverage() {
+        return missingLineCodeCoverage;
+    }
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 
-  public String getParameters() {
-    return parameters;
-  }
+    public String getParameters() {
+        return parameters;
+    }
 
-  public String getSuite() {
-    return suite;
-  }
+    public String getSuite() {
+        return suite;
+    }
 
-  public TestIdentifier toTestIdentifier() {
-    return new TestIdentifier(suite, name, parameters);
-  }
+    public TestIdentifier toTestIdentifier() {
+        return new TestIdentifier(suite, name, parameters);
+    }
 
-  public TestMetadata toTestMetadata() {
-    return new TestMetadata(missingLineCodeCoverage);
-  }
+    public TestMetadata toTestMetadata() {
+        return new TestMetadata(missingLineCodeCoverage);
+    }
 
-  /**
-   * Returns the module (test bundle) this identifier belongs to, preferring its own configurations
-   * when they specify a test bundle and otherwise falling back to the request-level configurations.
-   */
-  public String resolveModuleName(TracerEnvironment tracerEnvironment) {
-    Configurations requestConf = tracerEnvironment.getConfigurations();
-    return (configurations != null && configurations.getTestBundle() != null
-            ? configurations
-            : requestConf)
-        .getTestBundle();
-  }
+    /**
+     * Returns the module (test bundle) this identifier belongs to, preferring its own configurations
+     * when they specify a test bundle and otherwise falling back to the request-level configurations.
+     */
+    public String resolveModuleName(TracerEnvironment tracerEnvironment) {
+        Configurations requestConf = tracerEnvironment.getConfigurations();
+        return (configurations != null && configurations.getTestBundle() != null ? configurations : requestConf)
+                .getTestBundle();
+    }
 
-  /** Groups the given test identifiers into a {@code module -> Set<TestFQN>} map. */
-  public static Map<String, Collection<TestFQN>> toTestFQNsByModule(
-      Collection<Data<TestIdentifierJson>> data, TracerEnvironment tracerEnvironment) {
-    Map<String, Collection<TestFQN>> testsByModule = new HashMap<>();
-    for (Data<TestIdentifierJson> entry : data) {
-      TestIdentifierJson identifier = entry.attributes;
-      if (identifier == null) {
-        continue;
-      }
-      testsByModule
-          .computeIfAbsent(identifier.resolveModuleName(tracerEnvironment), k -> new HashSet<>())
-          .add(identifier.toTestIdentifier().toFQN());
+    /** Groups the given test identifiers into a {@code module -> Set<TestFQN>} map. */
+    public static Map<String, Collection<TestFQN>> toTestFQNsByModule(
+            Collection<Data<TestIdentifierJson>> data, TracerEnvironment tracerEnvironment) {
+        Map<String, Collection<TestFQN>> testsByModule = new HashMap<>();
+        for (Data<TestIdentifierJson> entry : data) {
+            TestIdentifierJson identifier = entry.attributes;
+            if (identifier == null) {
+                continue;
+            }
+            testsByModule
+                    .computeIfAbsent(identifier.resolveModuleName(tracerEnvironment), k -> new HashSet<>())
+                    .add(identifier.toTestIdentifier().toFQN());
+        }
+        return testsByModule;
     }
-    return testsByModule;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/TestManagementTestsResponse.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/TestManagementTestsResponse.java
index 1370f9de162..b9c8e6df5a2 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/TestManagementTestsResponse.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/TestManagementTestsResponse.java
@@ -12,98 +12,98 @@
 
 public final class TestManagementTestsResponse {
 
-  @Nullable public Map<String, Suites> modules;
-
-  public Map<String, Suites> getModules() {
-    return modules != null ? modules : Collections.emptyMap();
-  }
-
-  /**
-   * Returns the contained tests grouped by {@link TestSetting} and module. The result always
-   * contains an entry for {@link TestSetting#QUARANTINED}, {@link TestSetting#DISABLED} and {@link
-   * TestSetting#ATTEMPT_TO_FIX} (the inner map may be empty for any of them).
-   */
-  public Map<TestSetting, Map<String, Collection<TestFQN>>> toTestFQNsBySetting() {
-    Map<TestSetting, Map<String, Collection<TestFQN>>> result = new EnumMap<>(TestSetting.class);
-    result.put(TestSetting.QUARANTINED, new HashMap<>());
-    result.put(TestSetting.DISABLED, new HashMap<>());
-    result.put(TestSetting.ATTEMPT_TO_FIX, new HashMap<>());
-
-    for (Map.Entry<String, Suites> moduleEntry : getModules().entrySet()) {
-      String moduleName = moduleEntry.getKey();
-      for (Map.Entry<String, Tests> suiteEntry : moduleEntry.getValue().getSuites().entrySet()) {
-        String suiteName = suiteEntry.getKey();
-        for (Map.Entry<String, Properties> testEntry :
-            suiteEntry.getValue().getTests().entrySet()) {
-          String testName = testEntry.getKey();
-          Properties properties = testEntry.getValue();
-          TestFQN fqn = new TestFQN(suiteName, testName);
-          if (properties.isQuarantined()) {
-            result
-                .get(TestSetting.QUARANTINED)
-                .computeIfAbsent(moduleName, k -> new HashSet<>())
-                .add(fqn);
-          }
-          if (properties.isDisabled()) {
-            result
-                .get(TestSetting.DISABLED)
-                .computeIfAbsent(moduleName, k -> new HashSet<>())
-                .add(fqn);
-          }
-          if (properties.isAttemptToFix()) {
-            result
-                .get(TestSetting.ATTEMPT_TO_FIX)
-                .computeIfAbsent(moduleName, k -> new HashSet<>())
-                .add(fqn);
-          }
-        }
-      }
-    }
+    @Nullable
+    public Map<String, Suites> modules;
 
-    return result;
-  }
-
-  public int totalTestsCount() {
-    int count = 0;
-    for (Suites suites : getModules().values()) {
-      for (Tests tests : suites.getSuites().values()) {
-        count += tests.getTests().size();
-      }
+    public Map<String, Suites> getModules() {
+        return modules != null ? modules : Collections.emptyMap();
     }
-    return count;
-  }
 
-  public static final class Properties {
-    @Nullable public Map<String, Boolean> properties;
+    /**
+     * Returns the contained tests grouped by {@link TestSetting} and module. The result always
+     * contains an entry for {@link TestSetting#QUARANTINED}, {@link TestSetting#DISABLED} and {@link
+     * TestSetting#ATTEMPT_TO_FIX} (the inner map may be empty for any of them).
+     */
+    public Map<TestSetting, Map<String, Collection<TestFQN>>> toTestFQNsBySetting() {
+        Map<TestSetting, Map<String, Collection<TestFQN>>> result = new EnumMap<>(TestSetting.class);
+        result.put(TestSetting.QUARANTINED, new HashMap<>());
+        result.put(TestSetting.DISABLED, new HashMap<>());
+        result.put(TestSetting.ATTEMPT_TO_FIX, new HashMap<>());
+
+        for (Map.Entry<String, Suites> moduleEntry : getModules().entrySet()) {
+            String moduleName = moduleEntry.getKey();
+            for (Map.Entry<String, Tests> suiteEntry :
+                    moduleEntry.getValue().getSuites().entrySet()) {
+                String suiteName = suiteEntry.getKey();
+                for (Map.Entry<String, Properties> testEntry :
+                        suiteEntry.getValue().getTests().entrySet()) {
+                    String testName = testEntry.getKey();
+                    Properties properties = testEntry.getValue();
+                    TestFQN fqn = new TestFQN(suiteName, testName);
+                    if (properties.isQuarantined()) {
+                        result.get(TestSetting.QUARANTINED)
+                                .computeIfAbsent(moduleName, k -> new HashSet<>())
+                                .add(fqn);
+                    }
+                    if (properties.isDisabled()) {
+                        result.get(TestSetting.DISABLED)
+                                .computeIfAbsent(moduleName, k -> new HashSet<>())
+                                .add(fqn);
+                    }
+                    if (properties.isAttemptToFix()) {
+                        result.get(TestSetting.ATTEMPT_TO_FIX)
+                                .computeIfAbsent(moduleName, k -> new HashSet<>())
+                                .add(fqn);
+                    }
+                }
+            }
+        }
 
-    public boolean isQuarantined() {
-      return properties != null
-          && properties.getOrDefault(TestSetting.QUARANTINED.asString(), false);
+        return result;
     }
 
-    public boolean isDisabled() {
-      return properties != null && properties.getOrDefault(TestSetting.DISABLED.asString(), false);
+    public int totalTestsCount() {
+        int count = 0;
+        for (Suites suites : getModules().values()) {
+            for (Tests tests : suites.getSuites().values()) {
+                count += tests.getTests().size();
+            }
+        }
+        return count;
     }
 
-    public boolean isAttemptToFix() {
-      return properties != null
-          && properties.getOrDefault(TestSetting.ATTEMPT_TO_FIX.asString(), false);
+    public static final class Properties {
+        @Nullable
+        public Map<String, Boolean> properties;
+
+        public boolean isQuarantined() {
+            return properties != null && properties.getOrDefault(TestSetting.QUARANTINED.asString(), false);
+        }
+
+        public boolean isDisabled() {
+            return properties != null && properties.getOrDefault(TestSetting.DISABLED.asString(), false);
+        }
+
+        public boolean isAttemptToFix() {
+            return properties != null && properties.getOrDefault(TestSetting.ATTEMPT_TO_FIX.asString(), false);
+        }
     }
-  }
 
-  public static final class Tests {
-    @Nullable public Map<String, Properties> tests;
+    public static final class Tests {
+        @Nullable
+        public Map<String, Properties> tests;
 
-    public Map<String, Properties> getTests() {
-      return tests != null ? tests : Collections.emptyMap();
+        public Map<String, Properties> getTests() {
+            return tests != null ? tests : Collections.emptyMap();
+        }
     }
-  }
 
-  public static final class Suites {
-    @Nullable public Map<String, Tests> suites;
+    public static final class Suites {
+        @Nullable
+        public Map<String, Tests> suites;
 
-    public Map<String, Tests> getSuites() {
-      return suites != null ? suites : Collections.emptyMap();
+        public Map<String, Tests> getSuites() {
+            return suites != null ? suites : Collections.emptyMap();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/ConcurrentCoverageStore.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/ConcurrentCoverageStore.java
index 3a68c61f40d..b39e510dc8c 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/ConcurrentCoverageStore.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/ConcurrentCoverageStore.java
@@ -13,40 +13,40 @@
 /** A store that keeps track of coverage probes allocated for multiple threads. */
 public abstract class ConcurrentCoverageStore<T extends CoverageProbes> implements CoverageStore {
 
-  private final Thread testThread;
-  private final Function<Boolean, T> probesFactory;
-  private final Map<Thread, T> probes;
-
-  private volatile TestReport report;
-
-  protected ConcurrentCoverageStore(Function<Boolean, T> probesFactory) {
-    this.probesFactory = probesFactory;
-    this.testThread = Thread.currentThread();
-    this.probes = new ConcurrentHashMap<>();
-  }
-
-  @Override
-  public CoverageProbes getProbes() {
-    return probes.computeIfAbsent(Thread.currentThread(), this::create);
-  }
-
-  private T create(Thread thread) {
-    return probesFactory.apply(thread == testThread);
-  }
-
-  @Override
-  public boolean report(DDTraceId testSessionId, Long testSuiteId, long testSpanId) {
-    report = report(testSessionId, testSuiteId, testSpanId, probes.values());
-    return report != null && report.isNotEmpty();
-  }
-
-  @Nullable
-  protected abstract TestReport report(
-      DDTraceId testSessionId, Long testSuiteId, long testSpanId, Collection<T> probes);
-
-  @Nullable
-  @Override
-  public TestReport getReport() {
-    return report;
-  }
+    private final Thread testThread;
+    private final Function<Boolean, T> probesFactory;
+    private final Map<Thread, T> probes;
+
+    private volatile TestReport report;
+
+    protected ConcurrentCoverageStore(Function<Boolean, T> probesFactory) {
+        this.probesFactory = probesFactory;
+        this.testThread = Thread.currentThread();
+        this.probes = new ConcurrentHashMap<>();
+    }
+
+    @Override
+    public CoverageProbes getProbes() {
+        return probes.computeIfAbsent(Thread.currentThread(), this::create);
+    }
+
+    private T create(Thread thread) {
+        return probesFactory.apply(thread == testThread);
+    }
+
+    @Override
+    public boolean report(DDTraceId testSessionId, Long testSuiteId, long testSpanId) {
+        report = report(testSessionId, testSuiteId, testSpanId, probes.values());
+        return report != null && report.isNotEmpty();
+    }
+
+    @Nullable
+    protected abstract TestReport report(
+            DDTraceId testSessionId, Long testSuiteId, long testSpanId, Collection<T> probes);
+
+    @Nullable
+    @Override
+    public TestReport getReport() {
+        return report;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/SkippableAwareCoverageStoreFactory.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/SkippableAwareCoverageStoreFactory.java
index be50bf82d7c..a6ff998e6f4 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/SkippableAwareCoverageStoreFactory.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/SkippableAwareCoverageStoreFactory.java
@@ -14,26 +14,26 @@
  * has.
  */
 public class SkippableAwareCoverageStoreFactory implements CoverageStore.Factory {
-  private final Collection<TestIdentifier> skippableTests;
-  private final CoverageStore.Factory delegate;
+    private final Collection<TestIdentifier> skippableTests;
+    private final CoverageStore.Factory delegate;
 
-  public SkippableAwareCoverageStoreFactory(
-      Collection<TestIdentifier> skippableTests, CoverageStore.Factory delegate) {
-    this.skippableTests = skippableTests;
-    this.delegate = delegate;
-  }
+    public SkippableAwareCoverageStoreFactory(
+            Collection<TestIdentifier> skippableTests, CoverageStore.Factory delegate) {
+        this.skippableTests = skippableTests;
+        this.delegate = delegate;
+    }
 
-  @Override
-  public CoverageStore create(@Nullable TestIdentifier testIdentifier) {
-    if (skippableTests.contains(testIdentifier)) {
-      return NoOpCoverageStore.INSTANCE;
-    } else {
-      return delegate.create(testIdentifier);
+    @Override
+    public CoverageStore create(@Nullable TestIdentifier testIdentifier) {
+        if (skippableTests.contains(testIdentifier)) {
+            return NoOpCoverageStore.INSTANCE;
+        } else {
+            return delegate.create(testIdentifier);
+        }
     }
-  }
 
-  @Override
-  public void setTotalProbeCount(String className, int totalProbeCount) {
-    delegate.setTotalProbeCount(className, totalProbeCount);
-  }
+    @Override
+    public void setTotalProbeCount(String className, int totalProbeCount) {
+        delegate.setTotalProbeCount(className, totalProbeCount);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/FileCoverageStore.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/FileCoverageStore.java
index 6de1354e7c7..68fbd216ee5 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/FileCoverageStore.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/FileCoverageStore.java
@@ -29,99 +29,97 @@
  */
 public class FileCoverageStore extends ConcurrentCoverageStore<FileProbes> {
 
-  private static final Logger log = LoggerFactory.getLogger(FileCoverageStore.class);
-
-  private final CiVisibilityMetricCollector metrics;
-  private final SourcePathResolver sourcePathResolver;
-
-  private FileCoverageStore(
-      Function<Boolean, FileProbes> probesFactory,
-      CiVisibilityMetricCollector metrics,
-      SourcePathResolver sourcePathResolver) {
-    super(probesFactory);
-    this.metrics = metrics;
-    this.sourcePathResolver = sourcePathResolver;
-  }
-
-  @Nullable
-  @Override
-  protected TestReport report(
-      DDTraceId testSessionId, Long testSuiteId, long testSpanId, Collection<FileProbes> probes) {
-    Set<Class<?>> combinedClasses = Collections.newSetFromMap(new IdentityHashMap<>());
-    Collection<String> combinedNonCodeResources = new HashSet<>();
-
-    for (FileProbes probe : probes) {
-      combinedClasses.addAll(probe.getCoveredClasses());
-      combinedNonCodeResources.addAll(probe.getNonCodeResources());
-    }
+    private static final Logger log = LoggerFactory.getLogger(FileCoverageStore.class);
 
-    if (combinedClasses.isEmpty() && combinedNonCodeResources.isEmpty()) {
-      return null;
-    }
+    private final CiVisibilityMetricCollector metrics;
+    private final SourcePathResolver sourcePathResolver;
 
-    Set<String> coveredPaths = set(combinedClasses.size() + combinedNonCodeResources.size());
-    for (Class<?> clazz : combinedClasses) {
-      Collection<String> sourcePaths = sourcePathResolver.getSourcePaths(clazz);
-      if (sourcePaths.isEmpty()) {
-        log.debug(
-            "Skipping coverage reporting for {} because source path could not be determined",
-            clazz);
-        metrics.add(CiVisibilityCountMetric.CODE_COVERAGE_ERRORS, 1, CoverageErrorType.PATH);
-        continue;
-      }
-      coveredPaths.addAll(sourcePaths);
+    private FileCoverageStore(
+            Function<Boolean, FileProbes> probesFactory,
+            CiVisibilityMetricCollector metrics,
+            SourcePathResolver sourcePathResolver) {
+        super(probesFactory);
+        this.metrics = metrics;
+        this.sourcePathResolver = sourcePathResolver;
     }
 
-    for (String nonCodeResource : combinedNonCodeResources) {
-      Collection<String> resourcePaths = sourcePathResolver.getResourcePaths(nonCodeResource);
-      if (resourcePaths.isEmpty()) {
-        log.debug(
-            "Skipping coverage reporting for {} because resource path could not be determined",
-            nonCodeResource);
-        metrics.add(CiVisibilityCountMetric.CODE_COVERAGE_ERRORS, 1, CoverageErrorType.PATH);
-        continue;
-      }
-      coveredPaths.addAll(resourcePaths);
+    @Nullable
+    @Override
+    protected TestReport report(
+            DDTraceId testSessionId, Long testSuiteId, long testSpanId, Collection<FileProbes> probes) {
+        Set<Class<?>> combinedClasses = Collections.newSetFromMap(new IdentityHashMap<>());
+        Collection<String> combinedNonCodeResources = new HashSet<>();
+
+        for (FileProbes probe : probes) {
+            combinedClasses.addAll(probe.getCoveredClasses());
+            combinedNonCodeResources.addAll(probe.getNonCodeResources());
+        }
+
+        if (combinedClasses.isEmpty() && combinedNonCodeResources.isEmpty()) {
+            return null;
+        }
+
+        Set<String> coveredPaths = set(combinedClasses.size() + combinedNonCodeResources.size());
+        for (Class<?> clazz : combinedClasses) {
+            Collection<String> sourcePaths = sourcePathResolver.getSourcePaths(clazz);
+            if (sourcePaths.isEmpty()) {
+                log.debug("Skipping coverage reporting for {} because source path could not be determined", clazz);
+                metrics.add(CiVisibilityCountMetric.CODE_COVERAGE_ERRORS, 1, CoverageErrorType.PATH);
+                continue;
+            }
+            coveredPaths.addAll(sourcePaths);
+        }
+
+        for (String nonCodeResource : combinedNonCodeResources) {
+            Collection<String> resourcePaths = sourcePathResolver.getResourcePaths(nonCodeResource);
+            if (resourcePaths.isEmpty()) {
+                log.debug(
+                        "Skipping coverage reporting for {} because resource path could not be determined",
+                        nonCodeResource);
+                metrics.add(CiVisibilityCountMetric.CODE_COVERAGE_ERRORS, 1, CoverageErrorType.PATH);
+                continue;
+            }
+            coveredPaths.addAll(resourcePaths);
+        }
+
+        List<TestReportFileEntry> fileEntries = new ArrayList<>(coveredPaths.size());
+        for (String path : coveredPaths) {
+            fileEntries.add(new TestReportFileEntry(path, null));
+        }
+
+        TestReport report = new TestReport(testSessionId, testSuiteId, testSpanId, fileEntries);
+        metrics.add(
+                CiVisibilityDistributionMetric.CODE_COVERAGE_FILES,
+                report.getTestReportFileEntries().size());
+        return report;
     }
 
-    List<TestReportFileEntry> fileEntries = new ArrayList<>(coveredPaths.size());
-    for (String path : coveredPaths) {
-      fileEntries.add(new TestReportFileEntry(path, null));
+    private static <T> Set<T> set(int size) {
+        return new HashSet<>(Math.max((int) (size / .75f) + 1, 16));
     }
 
-    TestReport report = new TestReport(testSessionId, testSuiteId, testSpanId, fileEntries);
-    metrics.add(
-        CiVisibilityDistributionMetric.CODE_COVERAGE_FILES,
-        report.getTestReportFileEntries().size());
-    return report;
-  }
-
-  private static <T> Set<T> set(int size) {
-    return new HashSet<>(Math.max((int) (size / .75f) + 1, 16));
-  }
-
-  public static final class Factory implements CoverageStore.Factory {
+    public static final class Factory implements CoverageStore.Factory {
 
-    private final CiVisibilityMetricCollector metrics;
-    private final SourcePathResolver sourcePathResolver;
+        private final CiVisibilityMetricCollector metrics;
+        private final SourcePathResolver sourcePathResolver;
 
-    public Factory(CiVisibilityMetricCollector metrics, SourcePathResolver sourcePathResolver) {
-      this.metrics = metrics;
-      this.sourcePathResolver = sourcePathResolver;
-    }
+        public Factory(CiVisibilityMetricCollector metrics, SourcePathResolver sourcePathResolver) {
+            this.metrics = metrics;
+            this.sourcePathResolver = sourcePathResolver;
+        }
 
-    @Override
-    public CoverageStore create(@Nullable TestIdentifier testIdentifier) {
-      return new FileCoverageStore(this::createProbes, metrics, sourcePathResolver);
-    }
+        @Override
+        public CoverageStore create(@Nullable TestIdentifier testIdentifier) {
+            return new FileCoverageStore(this::createProbes, metrics, sourcePathResolver);
+        }
 
-    private FileProbes createProbes(boolean isTestThread) {
-      return new FileProbes(metrics, isTestThread);
-    }
+        private FileProbes createProbes(boolean isTestThread) {
+            return new FileProbes(metrics, isTestThread);
+        }
 
-    @Override
-    public void setTotalProbeCount(String className, int totalProbeCount) {
-      // no op
+        @Override
+        public void setTotalProbeCount(String className, int totalProbeCount) {
+            // no op
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/FileProbes.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/FileProbes.java
index ac53ecda24a..fac386124e6 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/FileProbes.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/FileProbes.java
@@ -18,48 +18,48 @@
 @NotThreadSafe
 public class FileProbes implements CoverageProbes {
 
-  private final CiVisibilityMetricCollector metrics;
+    private final CiVisibilityMetricCollector metrics;
 
-  private final Map<Class<?>, Class<?>> coveredClasses;
-  private final Map<String, String> nonCodeResources;
+    private final Map<Class<?>, Class<?>> coveredClasses;
+    private final Map<String, String> nonCodeResources;
 
-  private Class<?> lastCoveredClass;
+    private Class<?> lastCoveredClass;
 
-  FileProbes(CiVisibilityMetricCollector metrics, boolean isTestThread) {
-    this.metrics = metrics;
-    coveredClasses = isTestThread ? new IdentityHashMap<>() : new ConcurrentHashMap<>();
-    nonCodeResources = isTestThread ? new HashMap<>() : new ConcurrentHashMap<>();
-  }
+    FileProbes(CiVisibilityMetricCollector metrics, boolean isTestThread) {
+        this.metrics = metrics;
+        coveredClasses = isTestThread ? new IdentityHashMap<>() : new ConcurrentHashMap<>();
+        nonCodeResources = isTestThread ? new HashMap<>() : new ConcurrentHashMap<>();
+    }
 
-  @Override
-  public void record(Class<?> clazz, long classId, int probeId) {
-    record(clazz);
-  }
+    @Override
+    public void record(Class<?> clazz, long classId, int probeId) {
+        record(clazz);
+    }
 
-  @Override
-  public void record(Class<?> clazz) {
-    try {
-      if (lastCoveredClass != clazz) {
-        // optimization to avoid map lookup when reporting same class several times in a row
-        coveredClasses.put(lastCoveredClass = clazz, clazz);
-      }
+    @Override
+    public void record(Class<?> clazz) {
+        try {
+            if (lastCoveredClass != clazz) {
+                // optimization to avoid map lookup when reporting same class several times in a row
+                coveredClasses.put(lastCoveredClass = clazz, clazz);
+            }
 
-    } catch (Exception e) {
-      metrics.add(CiVisibilityCountMetric.CODE_COVERAGE_ERRORS, 1, CoverageErrorType.RECORD);
-      throw e;
+        } catch (Exception e) {
+            metrics.add(CiVisibilityCountMetric.CODE_COVERAGE_ERRORS, 1, CoverageErrorType.RECORD);
+            throw e;
+        }
     }
-  }
 
-  @Override
-  public void recordNonCodeResource(String absolutePath) {
-    nonCodeResources.put(absolutePath, absolutePath);
-  }
+    @Override
+    public void recordNonCodeResource(String absolutePath) {
+        nonCodeResources.put(absolutePath, absolutePath);
+    }
 
-  public Collection<Class<?>> getCoveredClasses() {
-    return coveredClasses.keySet();
-  }
+    public Collection<Class<?>> getCoveredClasses() {
+        return coveredClasses.keySet();
+    }
 
-  public Collection<String> getNonCodeResources() {
-    return nonCodeResources.keySet();
-  }
+    public Collection<String> getNonCodeResources() {
+        return nonCodeResources.keySet();
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageClassTransformer.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageClassTransformer.java
index cdea3cb3167..e5a896dc427 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageClassTransformer.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageClassTransformer.java
@@ -8,39 +8,37 @@
 
 public class CoverageClassTransformer implements ClassFileTransformer {
 
-  private static final ClassLoader AGENT_CLASSLOADER =
-      CoverageClassTransformer.class.getClassLoader();
-
-  private final Predicate<String> instrumentationFilter;
-
-  public CoverageClassTransformer(Predicate<String> instrumentationFilter) {
-    this.instrumentationFilter = instrumentationFilter;
-  }
-
-  @Override
-  public byte[] transform(
-      ClassLoader loader,
-      String className,
-      Class<?> classBeingRedefined,
-      ProtectionDomain protectionDomain,
-      byte[] source) {
-    if (loader == null || loader == AGENT_CLASSLOADER) {
-      return null; // skip bootstrap and agent classes
-    }
+    private static final ClassLoader AGENT_CLASSLOADER = CoverageClassTransformer.class.getClassLoader();
 
-    if (!instrumentationFilter.test(className)) {
-      return null;
-    }
+    private final Predicate<String> instrumentationFilter;
 
-    int majorVersion = ((source[6] & 0xFF) << 8) | (source[7] & 0xFF);
-    if (majorVersion < 49) {
-      return null; // skip classes compiled by Java older than 1.5
+    public CoverageClassTransformer(Predicate<String> instrumentationFilter) {
+        this.instrumentationFilter = instrumentationFilter;
     }
 
-    ClassReader reader = new ClassReader(source);
-    ClassWriter writer = new ClassWriter(reader, 0);
-    reader.accept(
-        new CoverageClassVisitor(writer, instrumentationFilter), ClassReader.EXPAND_FRAMES);
-    return writer.toByteArray();
-  }
+    @Override
+    public byte[] transform(
+            ClassLoader loader,
+            String className,
+            Class<?> classBeingRedefined,
+            ProtectionDomain protectionDomain,
+            byte[] source) {
+        if (loader == null || loader == AGENT_CLASSLOADER) {
+            return null; // skip bootstrap and agent classes
+        }
+
+        if (!instrumentationFilter.test(className)) {
+            return null;
+        }
+
+        int majorVersion = ((source[6] & 0xFF) << 8) | (source[7] & 0xFF);
+        if (majorVersion < 49) {
+            return null; // skip classes compiled by Java older than 1.5
+        }
+
+        ClassReader reader = new ClassReader(source);
+        ClassWriter writer = new ClassWriter(reader, 0);
+        reader.accept(new CoverageClassVisitor(writer, instrumentationFilter), ClassReader.EXPAND_FRAMES);
+        return writer.toByteArray();
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageClassVisitor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageClassVisitor.java
index 2385f4467ec..6c35a289afe 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageClassVisitor.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageClassVisitor.java
@@ -7,30 +7,24 @@
 
 public class CoverageClassVisitor extends ClassVisitor {
 
-  private final Predicate<String> instrumentationFilter;
-  private String className;
+    private final Predicate<String> instrumentationFilter;
+    private String className;
 
-  protected CoverageClassVisitor(ClassVisitor cv, Predicate<String> instrumentationFilter) {
-    super(Opcodes.ASM9, cv);
-    this.instrumentationFilter = instrumentationFilter;
-  }
+    protected CoverageClassVisitor(ClassVisitor cv, Predicate<String> instrumentationFilter) {
+        super(Opcodes.ASM9, cv);
+        this.instrumentationFilter = instrumentationFilter;
+    }
 
-  @Override
-  public void visit(
-      int version,
-      int access,
-      String name,
-      String signature,
-      String superName,
-      String[] interfaces) {
-    this.className = name;
-    cv.visit(version, access, name, signature, superName, interfaces);
-  }
+    @Override
+    public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+        this.className = name;
+        cv.visit(version, access, name, signature, superName, interfaces);
+    }
 
-  @Override
-  public MethodVisitor visitMethod(
-      int access, String name, String descriptor, String signature, String[] exceptions) {
-    MethodVisitor mv = cv.visitMethod(access, name, descriptor, signature, exceptions);
-    return new CoverageMethodVisitor(mv, className, instrumentationFilter);
-  }
+    @Override
+    public MethodVisitor visitMethod(
+            int access, String name, String descriptor, String signature, String[] exceptions) {
+        MethodVisitor mv = cv.visitMethod(access, name, descriptor, signature, exceptions);
+        return new CoverageMethodVisitor(mv, className, instrumentationFilter);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageInstrumentationFilter.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageInstrumentationFilter.java
index acdfa56e765..fae81d6e76d 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageInstrumentationFilter.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageInstrumentationFilter.java
@@ -3,30 +3,30 @@
 import java.util.function.Predicate;
 
 public final class CoverageInstrumentationFilter implements Predicate<String> {
-  private final String[] includedPackages;
-  private final String[] excludedPackages;
+    private final String[] includedPackages;
+    private final String[] excludedPackages;
 
-  public CoverageInstrumentationFilter(String[] includedPackages, String[] excludedPackages) {
-    this.includedPackages = includedPackages;
-    this.excludedPackages = excludedPackages;
-  }
-
-  @Override
-  public boolean test(String className) {
-    if (!className.contains("/")) {
-      // always include classes in default package
-      return true;
+    public CoverageInstrumentationFilter(String[] includedPackages, String[] excludedPackages) {
+        this.includedPackages = includedPackages;
+        this.excludedPackages = excludedPackages;
     }
-    for (String excludedPackage : excludedPackages) {
-      if (className.startsWith(excludedPackage)) {
+
+    @Override
+    public boolean test(String className) {
+        if (!className.contains("/")) {
+            // always include classes in default package
+            return true;
+        }
+        for (String excludedPackage : excludedPackages) {
+            if (className.startsWith(excludedPackage)) {
+                return false;
+            }
+        }
+        for (String includedPackage : includedPackages) {
+            if (className.startsWith(includedPackage)) {
+                return true;
+            }
+        }
         return false;
-      }
-    }
-    for (String includedPackage : includedPackages) {
-      if (className.startsWith(includedPackage)) {
-        return true;
-      }
     }
-    return false;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageMethodVisitor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageMethodVisitor.java
index 70629c4b8b7..c64de570e7e 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageMethodVisitor.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageMethodVisitor.java
@@ -5,32 +5,31 @@
 import org.objectweb.asm.Opcodes;
 
 public class CoverageMethodVisitor extends MethodVisitor {
-  private final String className;
-  private final Predicate<String> instrumentationFilter;
+    private final String className;
+    private final Predicate<String> instrumentationFilter;
 
-  protected CoverageMethodVisitor(
-      MethodVisitor mv, String className, Predicate<String> instrumentationFilter) {
-    super(Opcodes.ASM9, mv);
-    this.className = className;
-    this.instrumentationFilter = instrumentationFilter;
-  }
+    protected CoverageMethodVisitor(MethodVisitor mv, String className, Predicate<String> instrumentationFilter) {
+        super(Opcodes.ASM9, mv);
+        this.className = className;
+        this.instrumentationFilter = instrumentationFilter;
+    }
 
-  @Override
-  public void visitCode() {
-    CoverageUtils.insertCoverageProbe(className, mv);
-  }
+    @Override
+    public void visitCode() {
+        CoverageUtils.insertCoverageProbe(className, mv);
+    }
 
-  @Override
-  public void visitMaxs(int maxStack, int maxLocals) {
-    mv.visitMaxs(maxStack + 2, maxLocals);
-  }
+    @Override
+    public void visitMaxs(int maxStack, int maxLocals) {
+        mv.visitMaxs(maxStack + 2, maxLocals);
+    }
 
-  @Override
-  public void visitFieldInsn(int opcode, String owner, String name, String descriptor) {
-    if (instrumentationFilter.test(owner)
-        && /* do not insert probe if a class accesses its own field */ !className.equals(owner)) {
-      CoverageUtils.insertCoverageProbe(owner, mv);
+    @Override
+    public void visitFieldInsn(int opcode, String owner, String name, String descriptor) {
+        if (instrumentationFilter.test(owner)
+                && /* do not insert probe if a class accesses its own field */ !className.equals(owner)) {
+            CoverageUtils.insertCoverageProbe(owner, mv);
+        }
+        mv.visitFieldInsn(opcode, owner, name, descriptor);
     }
-    mv.visitFieldInsn(opcode, owner, name, descriptor);
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageUtils.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageUtils.java
index 6d883dcb88d..3d682898646 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageUtils.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/file/instrumentation/CoverageUtils.java
@@ -6,16 +6,16 @@
 
 public class CoverageUtils {
 
-  public static void insertCoverageProbe(String className, MethodVisitor mv) {
-    String typeDescriptor = 'L' + className + ';';
-    Type type = Type.getType(typeDescriptor);
-    mv.visitLdcInsn(type);
+    public static void insertCoverageProbe(String className, MethodVisitor mv) {
+        String typeDescriptor = 'L' + className + ';';
+        Type type = Type.getType(typeDescriptor);
+        mv.visitLdcInsn(type);
 
-    mv.visitMethodInsn(
-        Opcodes.INVOKESTATIC,
-        "datadog/trace/api/civisibility/coverage/CoveragePerTestBridge",
-        "recordCoverage",
-        "(Ljava/lang/Class;)V",
-        false);
-  }
+        mv.visitMethodInsn(
+                Opcodes.INVOKESTATIC,
+                "datadog/trace/api/civisibility/coverage/CoveragePerTestBridge",
+                "recordCoverage",
+                "(Ljava/lang/Class;)V",
+                false);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/ExecutionDataAdapter.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/ExecutionDataAdapter.java
index 75c9b81fe89..10f7c9cef07 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/ExecutionDataAdapter.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/ExecutionDataAdapter.java
@@ -1,37 +1,37 @@
 package datadog.trace.civisibility.coverage.line;
 
 public class ExecutionDataAdapter {
-  private final long classId;
-  private final String className;
-  // Unbounded data structure that only exists within a single test span
-  private final boolean[] probeActivations;
+    private final long classId;
+    private final String className;
+    // Unbounded data structure that only exists within a single test span
+    private final boolean[] probeActivations;
 
-  public ExecutionDataAdapter(long classId, String className, int totalProbeCount) {
-    this.classId = classId;
-    this.className = className;
-    this.probeActivations = new boolean[totalProbeCount];
-  }
+    public ExecutionDataAdapter(long classId, String className, int totalProbeCount) {
+        this.classId = classId;
+        this.className = className;
+        this.probeActivations = new boolean[totalProbeCount];
+    }
 
-  public String getClassName() {
-    return className;
-  }
+    public String getClassName() {
+        return className;
+    }
 
-  long getClassId() {
-    return classId;
-  }
+    long getClassId() {
+        return classId;
+    }
 
-  boolean[] getProbeActivations() {
-    return probeActivations;
-  }
+    boolean[] getProbeActivations() {
+        return probeActivations;
+    }
 
-  void record(int probeId) {
-    probeActivations[probeId] = true;
-  }
+    void record(int probeId) {
+        probeActivations[probeId] = true;
+    }
 
-  ExecutionDataAdapter merge(ExecutionDataAdapter other) {
-    for (int i = 0; i < other.probeActivations.length; i++) {
-      probeActivations[i] |= other.probeActivations[i];
+    ExecutionDataAdapter merge(ExecutionDataAdapter other) {
+        for (int i = 0; i < other.probeActivations.length; i++) {
+            probeActivations[i] |= other.probeActivations[i];
+        }
+        return this;
     }
-    return this;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/LineCoverageStore.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/LineCoverageStore.java
index bde89521dd5..fa8eed52b6e 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/LineCoverageStore.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/LineCoverageStore.java
@@ -37,239 +37,239 @@
  */
 public class LineCoverageStore extends ConcurrentCoverageStore<LineProbes> {
 
-  private static final Logger log = LoggerFactory.getLogger(LineCoverageStore.class);
-
-  /**
-   * Upper bound on the approximate memory retained by the analysis cache. Coverage stays correct
-   * beyond it (analysis just isn't cached), this only guards memory for pathologically large
-   * suites. Bounding by bytes (rather than entry count) is what keeps a class with many probes,
-   * covered by many distinct probe sets, from retaining large arrays for the whole module lifetime.
-   */
-  private static final long MAX_ANALYSIS_CACHE_BYTES = 64L * 1024 * 1024;
-
-  /**
-   * Approximate fixed cost of one cache entry beyond its variable bit data: the {@link
-   * AnalysisCacheKey} and both {@link BitSet} objects (with their {@code long[]} + array headers)
-   * plus the {@code ConcurrentHashMap} node. Deliberately generous so small entries aren't
-   * undercounted and the byte bound stays a real ceiling.
-   */
-  private static final int APPROX_ENTRY_OVERHEAD_BYTES = 160;
-
-  private final CiVisibilityMetricCollector metrics;
-  private final SourcePathResolver sourcePathResolver;
-  // Module-wide cache: (class id + probe set) -> covered lines, shared across tests so a class
-  // covered identically by many tests is parsed by Jacoco's Analyzer only once.
-  private final Map<AnalysisCacheKey, BitSet> analysisCache;
-  // Approximate bytes retained by analysisCache, so the cache is bounded by size, not entry count.
-  private final AtomicLong analysisCacheBytes;
-
-  private LineCoverageStore(
-      Function<Boolean, LineProbes> probesFactory,
-      CiVisibilityMetricCollector metrics,
-      SourcePathResolver sourcePathResolver,
-      Map<AnalysisCacheKey, BitSet> analysisCache,
-      AtomicLong analysisCacheBytes) {
-    super(probesFactory);
-    this.metrics = metrics;
-    this.sourcePathResolver = sourcePathResolver;
-    this.analysisCache = analysisCache;
-    this.analysisCacheBytes = analysisCacheBytes;
-  }
-
-  @Nullable
-  @Override
-  protected TestReport report(
-      DDTraceId testSessionId, Long testSuiteId, long testSpanId, Collection<LineProbes> probes) {
-    Map<Class<?>, ExecutionDataAdapter> combinedExecutionData = new IdentityHashMap<>();
-    Collection<String> combinedNonCodeResources = new HashSet<>();
-
-    for (LineProbes probe : probes) {
-      for (Map.Entry<Class<?>, ExecutionDataAdapter> e : probe.getExecutionData().entrySet()) {
-        combinedExecutionData.merge(e.getKey(), e.getValue(), ExecutionDataAdapter::merge);
-      }
-      combinedNonCodeResources.addAll(probe.getNonCodeResources());
-    }
+    private static final Logger log = LoggerFactory.getLogger(LineCoverageStore.class);
+
+    /**
+     * Upper bound on the approximate memory retained by the analysis cache. Coverage stays correct
+     * beyond it (analysis just isn't cached), this only guards memory for pathologically large
+     * suites. Bounding by bytes (rather than entry count) is what keeps a class with many probes,
+     * covered by many distinct probe sets, from retaining large arrays for the whole module lifetime.
+     */
+    private static final long MAX_ANALYSIS_CACHE_BYTES = 64L * 1024 * 1024;
+
+    /**
+     * Approximate fixed cost of one cache entry beyond its variable bit data: the {@link
+     * AnalysisCacheKey} and both {@link BitSet} objects (with their {@code long[]} + array headers)
+     * plus the {@code ConcurrentHashMap} node. Deliberately generous so small entries aren't
+     * undercounted and the byte bound stays a real ceiling.
+     */
+    private static final int APPROX_ENTRY_OVERHEAD_BYTES = 160;
 
-    if (combinedExecutionData.isEmpty() && combinedNonCodeResources.isEmpty()) {
-      return null;
+    private final CiVisibilityMetricCollector metrics;
+    private final SourcePathResolver sourcePathResolver;
+    // Module-wide cache: (class id + probe set) -> covered lines, shared across tests so a class
+    // covered identically by many tests is parsed by Jacoco's Analyzer only once.
+    private final Map<AnalysisCacheKey, BitSet> analysisCache;
+    // Approximate bytes retained by analysisCache, so the cache is bounded by size, not entry count.
+    private final AtomicLong analysisCacheBytes;
+
+    private LineCoverageStore(
+            Function<Boolean, LineProbes> probesFactory,
+            CiVisibilityMetricCollector metrics,
+            SourcePathResolver sourcePathResolver,
+            Map<AnalysisCacheKey, BitSet> analysisCache,
+            AtomicLong analysisCacheBytes) {
+        super(probesFactory);
+        this.metrics = metrics;
+        this.sourcePathResolver = sourcePathResolver;
+        this.analysisCache = analysisCache;
+        this.analysisCacheBytes = analysisCacheBytes;
     }
 
-    Map<String, BitSet> coveredLinesBySourcePath = new HashMap<>();
-    for (Map.Entry<Class<?>, ExecutionDataAdapter> e : combinedExecutionData.entrySet()) {
-      ExecutionDataAdapter executionDataAdapter = e.getValue();
-      String className = executionDataAdapter.getClassName();
-
-      Class<?> clazz = e.getKey();
-      Collection<String> sourcePaths = sourcePathResolver.getSourcePaths(clazz);
-      if (sourcePaths.size() != 1) {
-        log.debug(
-            "Skipping coverage reporting for {} because source path could not be determined",
-            className);
-        metrics.add(CiVisibilityCountMetric.CODE_COVERAGE_ERRORS, 1, CoverageErrorType.PATH);
-        continue;
-      }
-      String sourcePath = sourcePaths.iterator().next();
-
-      BitSet coveredLines = analyzeClass(clazz, executionDataAdapter);
-      if (coveredLines != null) {
-        coveredLinesBySourcePath.computeIfAbsent(sourcePath, key -> new BitSet()).or(coveredLines);
-      }
-    }
+    @Nullable
+    @Override
+    protected TestReport report(
+            DDTraceId testSessionId, Long testSuiteId, long testSpanId, Collection<LineProbes> probes) {
+        Map<Class<?>, ExecutionDataAdapter> combinedExecutionData = new IdentityHashMap<>();
+        Collection<String> combinedNonCodeResources = new HashSet<>();
+
+        for (LineProbes probe : probes) {
+            for (Map.Entry<Class<?>, ExecutionDataAdapter> e :
+                    probe.getExecutionData().entrySet()) {
+                combinedExecutionData.merge(e.getKey(), e.getValue(), ExecutionDataAdapter::merge);
+            }
+            combinedNonCodeResources.addAll(probe.getNonCodeResources());
+        }
 
-    List<TestReportFileEntry> fileEntries = new ArrayList<>(coveredLinesBySourcePath.size());
-    for (Map.Entry<String, BitSet> e : coveredLinesBySourcePath.entrySet()) {
-      String sourcePath = e.getKey();
-      BitSet coveredLines = e.getValue();
-      fileEntries.add(new TestReportFileEntry(sourcePath, coveredLines));
-    }
+        if (combinedExecutionData.isEmpty() && combinedNonCodeResources.isEmpty()) {
+            return null;
+        }
 
-    for (String nonCodeResource : combinedNonCodeResources) {
-      Collection<String> resourcePaths = sourcePathResolver.getResourcePaths(nonCodeResource);
-      if (resourcePaths.isEmpty()) {
-        log.debug(
-            "Skipping coverage reporting for {} because resource path could not be determined",
-            nonCodeResource);
-        metrics.add(CiVisibilityCountMetric.CODE_COVERAGE_ERRORS, 1, CoverageErrorType.PATH);
-        continue;
-      }
-      for (String resourcePath : resourcePaths) {
-        fileEntries.add(new TestReportFileEntry(resourcePath, null));
-      }
-    }
+        Map<String, BitSet> coveredLinesBySourcePath = new HashMap<>();
+        for (Map.Entry<Class<?>, ExecutionDataAdapter> e : combinedExecutionData.entrySet()) {
+            ExecutionDataAdapter executionDataAdapter = e.getValue();
+            String className = executionDataAdapter.getClassName();
+
+            Class<?> clazz = e.getKey();
+            Collection<String> sourcePaths = sourcePathResolver.getSourcePaths(clazz);
+            if (sourcePaths.size() != 1) {
+                log.debug("Skipping coverage reporting for {} because source path could not be determined", className);
+                metrics.add(CiVisibilityCountMetric.CODE_COVERAGE_ERRORS, 1, CoverageErrorType.PATH);
+                continue;
+            }
+            String sourcePath = sourcePaths.iterator().next();
+
+            BitSet coveredLines = analyzeClass(clazz, executionDataAdapter);
+            if (coveredLines != null) {
+                coveredLinesBySourcePath
+                        .computeIfAbsent(sourcePath, key -> new BitSet())
+                        .or(coveredLines);
+            }
+        }
 
-    TestReport report = new TestReport(testSessionId, testSuiteId, testSpanId, fileEntries);
-    metrics.add(
-        CiVisibilityDistributionMetric.CODE_COVERAGE_FILES,
-        report.getTestReportFileEntries().size());
-    return report;
-  }
-
-  /**
-   * Resolves the covered lines for a class given a test's probe activations. Parsing the class with
-   * Jacoco's {@link Analyzer} is the dominant cost of reporting, and the result depends only on the
-   * class bytecode and the probe set, so it is memoized: the same class covered identically by
-   * different tests is parsed once.
-   *
-   * @return the covered lines, or {@code null} if the class could not be analyzed
-   */
-  @Nullable
-  private BitSet analyzeClass(Class<?> clazz, ExecutionDataAdapter executionDataAdapter) {
-    long classId = executionDataAdapter.getClassId();
-    // Snapshot the activations once and use the same snapshot for both the cache key and the
-    // analysis. The per-test array is mutable and a propagated/background thread may record a late
-    // probe while report() runs; sharing one snapshot ensures the cached covered lines always match
-    // the key's probe set, so a late activation can't poison the entry for later tests.
-    boolean[] probes = executionDataAdapter.getProbeActivations().clone();
-    AnalysisCacheKey key = new AnalysisCacheKey(classId, probes);
-    BitSet cached = analysisCache.get(key);
-    if (cached != null) {
-      return cached;
-    }
+        List<TestReportFileEntry> fileEntries = new ArrayList<>(coveredLinesBySourcePath.size());
+        for (Map.Entry<String, BitSet> e : coveredLinesBySourcePath.entrySet()) {
+            String sourcePath = e.getKey();
+            BitSet coveredLines = e.getValue();
+            fileEntries.add(new TestReportFileEntry(sourcePath, coveredLines));
+        }
 
-    try (InputStream is = Utils.getClassStream(clazz)) {
-      BitSet coveredLines = new BitSet();
-      ExecutionDataStore store = new ExecutionDataStore();
-      store.put(new ExecutionData(classId, executionDataAdapter.getClassName(), probes));
-      Analyzer analyzer = new Analyzer(store, new SourceAnalyzer(coveredLines));
-      analyzer.analyzeClass(is, null);
-
-      // Reserve the entry's weight before inserting so concurrent inserts near the limit can't
-      // collectively overshoot the bound; release the reservation if we exceed it or another thread
-      // cached the class first.
-      long entryBytes =
-          APPROX_ENTRY_OVERHEAD_BYTES + key.packedBytes() + (coveredLines.size() >>> 3);
-      if (analysisCacheBytes.addAndGet(entryBytes) <= MAX_ANALYSIS_CACHE_BYTES) {
-        if (analysisCache.putIfAbsent(key, coveredLines) != null) {
-          analysisCacheBytes.addAndGet(-entryBytes);
+        for (String nonCodeResource : combinedNonCodeResources) {
+            Collection<String> resourcePaths = sourcePathResolver.getResourcePaths(nonCodeResource);
+            if (resourcePaths.isEmpty()) {
+                log.debug(
+                        "Skipping coverage reporting for {} because resource path could not be determined",
+                        nonCodeResource);
+                metrics.add(CiVisibilityCountMetric.CODE_COVERAGE_ERRORS, 1, CoverageErrorType.PATH);
+                continue;
+            }
+            for (String resourcePath : resourcePaths) {
+                fileEntries.add(new TestReportFileEntry(resourcePath, null));
+            }
         }
-      } else {
-        analysisCacheBytes.addAndGet(-entryBytes);
-      }
-      return coveredLines;
-
-    } catch (Exception exception) {
-      log.debug(
-          "Skipping coverage reporting for {} because of error",
-          executionDataAdapter.getClassName(),
-          exception);
-      metrics.add(CiVisibilityCountMetric.CODE_COVERAGE_ERRORS, 1);
-      return null;
+
+        TestReport report = new TestReport(testSessionId, testSuiteId, testSpanId, fileEntries);
+        metrics.add(
+                CiVisibilityDistributionMetric.CODE_COVERAGE_FILES,
+                report.getTestReportFileEntries().size());
+        return report;
     }
-  }
-
-  /**
-   * Cache key identifying a class (by Jacoco class id) covered by a specific set of probes. The
-   * probe activations are bit-packed into a {@link BitSet} rather than retaining the test's full
-   * {@code boolean[]} (1 byte/element), so a cached key uses ~8x less memory. Equality is exact:
-   * two keys match iff the same class was covered by the same set of probe ids.
-   */
-  static final class AnalysisCacheKey {
-    private final long classId;
-    private final BitSet probes;
-    private final int hash;
-
-    AnalysisCacheKey(long classId, boolean[] probeActivations) {
-      this.classId = classId;
-      BitSet bits = new BitSet(probeActivations.length);
-      for (int i = 0; i < probeActivations.length; i++) {
-        if (probeActivations[i]) {
-          bits.set(i);
+
+    /**
+     * Resolves the covered lines for a class given a test's probe activations. Parsing the class with
+     * Jacoco's {@link Analyzer} is the dominant cost of reporting, and the result depends only on the
+     * class bytecode and the probe set, so it is memoized: the same class covered identically by
+     * different tests is parsed once.
+     *
+     * @return the covered lines, or {@code null} if the class could not be analyzed
+     */
+    @Nullable
+    private BitSet analyzeClass(Class<?> clazz, ExecutionDataAdapter executionDataAdapter) {
+        long classId = executionDataAdapter.getClassId();
+        // Snapshot the activations once and use the same snapshot for both the cache key and the
+        // analysis. The per-test array is mutable and a propagated/background thread may record a late
+        // probe while report() runs; sharing one snapshot ensures the cached covered lines always match
+        // the key's probe set, so a late activation can't poison the entry for later tests.
+        boolean[] probes = executionDataAdapter.getProbeActivations().clone();
+        AnalysisCacheKey key = new AnalysisCacheKey(classId, probes);
+        BitSet cached = analysisCache.get(key);
+        if (cached != null) {
+            return cached;
         }
-      }
-      this.probes = bits;
-      this.hash = 31 * Long.hashCode(classId) + bits.hashCode();
-    }
 
-    /** Bytes of the packed probe bits (the variable part of the retained key). */
-    int packedBytes() {
-      return probes.size() >>> 3;
+        try (InputStream is = Utils.getClassStream(clazz)) {
+            BitSet coveredLines = new BitSet();
+            ExecutionDataStore store = new ExecutionDataStore();
+            store.put(new ExecutionData(classId, executionDataAdapter.getClassName(), probes));
+            Analyzer analyzer = new Analyzer(store, new SourceAnalyzer(coveredLines));
+            analyzer.analyzeClass(is, null);
+
+            // Reserve the entry's weight before inserting so concurrent inserts near the limit can't
+            // collectively overshoot the bound; release the reservation if we exceed it or another thread
+            // cached the class first.
+            long entryBytes = APPROX_ENTRY_OVERHEAD_BYTES + key.packedBytes() + (coveredLines.size() >>> 3);
+            if (analysisCacheBytes.addAndGet(entryBytes) <= MAX_ANALYSIS_CACHE_BYTES) {
+                if (analysisCache.putIfAbsent(key, coveredLines) != null) {
+                    analysisCacheBytes.addAndGet(-entryBytes);
+                }
+            } else {
+                analysisCacheBytes.addAndGet(-entryBytes);
+            }
+            return coveredLines;
+
+        } catch (Exception exception) {
+            log.debug(
+                    "Skipping coverage reporting for {} because of error",
+                    executionDataAdapter.getClassName(),
+                    exception);
+            metrics.add(CiVisibilityCountMetric.CODE_COVERAGE_ERRORS, 1);
+            return null;
+        }
     }
 
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) {
-        return true;
-      }
-      if (!(o instanceof AnalysisCacheKey)) {
-        return false;
-      }
-      AnalysisCacheKey other = (AnalysisCacheKey) o;
-      return classId == other.classId && hash == other.hash && probes.equals(other.probes);
-    }
+    /**
+     * Cache key identifying a class (by Jacoco class id) covered by a specific set of probes. The
+     * probe activations are bit-packed into a {@link BitSet} rather than retaining the test's full
+     * {@code boolean[]} (1 byte/element), so a cached key uses ~8x less memory. Equality is exact:
+     * two keys match iff the same class was covered by the same set of probe ids.
+     */
+    static final class AnalysisCacheKey {
+        private final long classId;
+        private final BitSet probes;
+        private final int hash;
+
+        AnalysisCacheKey(long classId, boolean[] probeActivations) {
+            this.classId = classId;
+            BitSet bits = new BitSet(probeActivations.length);
+            for (int i = 0; i < probeActivations.length; i++) {
+                if (probeActivations[i]) {
+                    bits.set(i);
+                }
+            }
+            this.probes = bits;
+            this.hash = 31 * Long.hashCode(classId) + bits.hashCode();
+        }
 
-    @Override
-    public int hashCode() {
-      return hash;
+        /** Bytes of the packed probe bits (the variable part of the retained key). */
+        int packedBytes() {
+            return probes.size() >>> 3;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (!(o instanceof AnalysisCacheKey)) {
+                return false;
+            }
+            AnalysisCacheKey other = (AnalysisCacheKey) o;
+            return classId == other.classId && hash == other.hash && probes.equals(other.probes);
+        }
+
+        @Override
+        public int hashCode() {
+            return hash;
+        }
     }
-  }
 
-  public static final class Factory implements CoverageStore.Factory {
+    public static final class Factory implements CoverageStore.Factory {
 
-    private final Map<String, Integer> probeCounts = new ConcurrentHashMap<>();
-    private final Map<AnalysisCacheKey, BitSet> analysisCache = new ConcurrentHashMap<>();
-    private final AtomicLong analysisCacheBytes = new AtomicLong();
+        private final Map<String, Integer> probeCounts = new ConcurrentHashMap<>();
+        private final Map<AnalysisCacheKey, BitSet> analysisCache = new ConcurrentHashMap<>();
+        private final AtomicLong analysisCacheBytes = new AtomicLong();
 
-    private final CiVisibilityMetricCollector metrics;
-    private final SourcePathResolver sourcePathResolver;
+        private final CiVisibilityMetricCollector metrics;
+        private final SourcePathResolver sourcePathResolver;
 
-    public Factory(CiVisibilityMetricCollector metrics, SourcePathResolver sourcePathResolver) {
-      this.metrics = metrics;
-      this.sourcePathResolver = sourcePathResolver;
-    }
+        public Factory(CiVisibilityMetricCollector metrics, SourcePathResolver sourcePathResolver) {
+            this.metrics = metrics;
+            this.sourcePathResolver = sourcePathResolver;
+        }
 
-    @Override
-    public CoverageStore create(@Nullable TestIdentifier testIdentifier) {
-      return new LineCoverageStore(
-          this::createProbes, metrics, sourcePathResolver, analysisCache, analysisCacheBytes);
-    }
+        @Override
+        public CoverageStore create(@Nullable TestIdentifier testIdentifier) {
+            return new LineCoverageStore(
+                    this::createProbes, metrics, sourcePathResolver, analysisCache, analysisCacheBytes);
+        }
 
-    private LineProbes createProbes(boolean isTestThread) {
-      return new LineProbes(metrics, probeCounts, isTestThread);
-    }
+        private LineProbes createProbes(boolean isTestThread) {
+            return new LineProbes(metrics, probeCounts, isTestThread);
+        }
 
-    @Override
-    public void setTotalProbeCount(String className, int totalProbeCount) {
-      probeCounts.put(className.replace('/', '.'), totalProbeCount);
+        @Override
+        public void setTotalProbeCount(String className, int totalProbeCount) {
+            probeCounts.put(className.replace('/', '.'), totalProbeCount);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/LineProbes.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/LineProbes.java
index f99c78e2c29..53a23afe53a 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/LineProbes.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/LineProbes.java
@@ -18,56 +18,54 @@
 @NotThreadSafe
 public class LineProbes implements CoverageProbes {
 
-  private final CiVisibilityMetricCollector metrics;
-  private final Map<String, Integer> probeCounts;
+    private final CiVisibilityMetricCollector metrics;
+    private final Map<String, Integer> probeCounts;
 
-  private final Map<Class<?>, ExecutionDataAdapter> executionData;
-  private final Map<String, String> nonCodeResources;
+    private final Map<Class<?>, ExecutionDataAdapter> executionData;
+    private final Map<String, String> nonCodeResources;
 
-  private Class<?> lastCoveredClass;
-  private ExecutionDataAdapter lastCoveredExecutionData;
+    private Class<?> lastCoveredClass;
+    private ExecutionDataAdapter lastCoveredExecutionData;
 
-  LineProbes(
-      CiVisibilityMetricCollector metrics, Map<String, Integer> probeCounts, boolean isTestThread) {
-    this.metrics = metrics;
-    this.probeCounts = probeCounts;
-    executionData = isTestThread ? new IdentityHashMap<>() : new ConcurrentHashMap<>();
-    nonCodeResources = isTestThread ? new HashMap<>() : new ConcurrentHashMap<>();
-  }
+    LineProbes(CiVisibilityMetricCollector metrics, Map<String, Integer> probeCounts, boolean isTestThread) {
+        this.metrics = metrics;
+        this.probeCounts = probeCounts;
+        executionData = isTestThread ? new IdentityHashMap<>() : new ConcurrentHashMap<>();
+        nonCodeResources = isTestThread ? new HashMap<>() : new ConcurrentHashMap<>();
+    }
 
-  @Override
-  public void record(Class<?> clazz) {
-    throw new UnsupportedOperationException();
-  }
+    @Override
+    public void record(Class<?> clazz) {
+        throw new UnsupportedOperationException();
+    }
 
-  @Override
-  public void record(Class<?> clazz, long classId, int probeId) {
-    try {
-      if (lastCoveredClass != clazz) {
-        // optimization to avoid map lookup if activating several probes for same class in a row
-        lastCoveredExecutionData =
-            executionData.computeIfAbsent(
-                lastCoveredClass = clazz,
-                k -> new ExecutionDataAdapter(classId, k.getName(), probeCounts.get(k.getName())));
-      }
-      lastCoveredExecutionData.record(probeId);
+    @Override
+    public void record(Class<?> clazz, long classId, int probeId) {
+        try {
+            if (lastCoveredClass != clazz) {
+                // optimization to avoid map lookup if activating several probes for same class in a row
+                lastCoveredExecutionData = executionData.computeIfAbsent(
+                        lastCoveredClass = clazz,
+                        k -> new ExecutionDataAdapter(classId, k.getName(), probeCounts.get(k.getName())));
+            }
+            lastCoveredExecutionData.record(probeId);
 
-    } catch (Exception e) {
-      metrics.add(CiVisibilityCountMetric.CODE_COVERAGE_ERRORS, 1, CoverageErrorType.RECORD);
-      throw e;
+        } catch (Exception e) {
+            metrics.add(CiVisibilityCountMetric.CODE_COVERAGE_ERRORS, 1, CoverageErrorType.RECORD);
+            throw e;
+        }
     }
-  }
 
-  @Override
-  public void recordNonCodeResource(String absolutePath) {
-    nonCodeResources.put(absolutePath, absolutePath);
-  }
+    @Override
+    public void recordNonCodeResource(String absolutePath) {
+        nonCodeResources.put(absolutePath, absolutePath);
+    }
 
-  public Map<Class<?>, ExecutionDataAdapter> getExecutionData() {
-    return executionData;
-  }
+    public Map<Class<?>, ExecutionDataAdapter> getExecutionData() {
+        return executionData;
+    }
 
-  public Collection<String> getNonCodeResources() {
-    return nonCodeResources.keySet();
-  }
+    public Collection<String> getNonCodeResources() {
+        return nonCodeResources.keySet();
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/SourceAnalyzer.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/SourceAnalyzer.java
index c8c92e40c9a..fc3f07cb708 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/SourceAnalyzer.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/SourceAnalyzer.java
@@ -7,29 +7,29 @@
 
 public class SourceAnalyzer implements ICoverageVisitor {
 
-  private final BitSet coveredLines;
+    private final BitSet coveredLines;
 
-  public SourceAnalyzer(BitSet coveredLines) {
-    this.coveredLines = coveredLines;
-  }
-
-  @Override
-  public void visitCoverage(IClassCoverage coverage) {
-    if (coverage.isNoMatch()) {
-      return;
+    public SourceAnalyzer(BitSet coveredLines) {
+        this.coveredLines = coveredLines;
     }
 
-    int firstLine = coverage.getFirstLine();
-    if (firstLine == -1) {
-      return;
-    }
+    @Override
+    public void visitCoverage(IClassCoverage coverage) {
+        if (coverage.isNoMatch()) {
+            return;
+        }
+
+        int firstLine = coverage.getFirstLine();
+        if (firstLine == -1) {
+            return;
+        }
 
-    int lastLine = coverage.getLastLine();
+        int lastLine = coverage.getLastLine();
 
-    for (int line = firstLine; line <= lastLine; line++) {
-      if (coverage.getLine(line).getStatus() >= ICounter.FULLY_COVERED) {
-        coveredLines.set(line);
-      }
+        for (int line = firstLine; line <= lastLine; line++) {
+            if (coverage.getLine(line).getStatus() >= ICounter.FULLY_COVERED) {
+                coveredLines.set(line);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/CoverageProcessor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/CoverageProcessor.java
index d3cc3ecb5d0..9a015074b30 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/CoverageProcessor.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/CoverageProcessor.java
@@ -6,17 +6,17 @@
 
 /** Processes coverage reports. */
 public interface CoverageProcessor {
-  /** Processes previously collected coverage data and returns the percentage of lines covered. */
-  @Nullable
-  Long processCoverageData();
+    /** Processes previously collected coverage data and returns the percentage of lines covered. */
+    @Nullable
+    Long processCoverageData();
 
-  interface Factory<T extends CoverageProcessor> {
-    T sessionCoverage(long sessionId);
+    interface Factory<T extends CoverageProcessor> {
+        T sessionCoverage(long sessionId);
 
-    T moduleCoverage(
-        long moduleId,
-        @Nullable BuildModuleLayout moduleLayout,
-        ExecutionSettings executionSettings,
-        T sessionCoverage);
-  }
+        T moduleCoverage(
+                long moduleId,
+                @Nullable BuildModuleLayout moduleLayout,
+                ExecutionSettings executionSettings,
+                T sessionCoverage);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/CoverageReportUploader.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/CoverageReportUploader.java
index 7777a972a2a..3d58b65bc93 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/CoverageReportUploader.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/CoverageReportUploader.java
@@ -29,85 +29,83 @@
 
 public class CoverageReportUploader {
 
-  private final BackendApi backendApi;
-  private final Map<String, String> ciTags;
-  private final List<String> flags;
-  private final CiVisibilityMetricCollector metricCollector;
-  private final JsonAdapter<Map<String, Object>> eventAdapter;
-
-  public CoverageReportUploader(
-      BackendApi backendApi,
-      Map<String, String> ciTags,
-      List<String> flags,
-      CiVisibilityMetricCollector metricCollector) {
-    this.backendApi = backendApi;
-    this.ciTags = ciTags;
-    this.flags = Collections.unmodifiableList(new ArrayList<>(flags));
-    this.metricCollector = metricCollector;
-
-    Moshi moshi = new Moshi.Builder().build();
-    Type type = Types.newParameterizedType(Map.class, String.class, Object.class);
-    eventAdapter = moshi.adapter(type);
-  }
-
-  public void upload(String format, InputStream reportStream) throws IOException {
-    Map<String, Object> event = new HashMap<>(ciTags);
-    event.put("format", format);
-    event.put("type", "coverage_report");
-    if (!flags.isEmpty()) {
-      event.put("report.flags", flags);
-    }
-    String eventJson = eventAdapter.toJson(event);
-    RequestBody eventBody = jsonRequestBodyOf(eventJson.getBytes(StandardCharsets.UTF_8));
-
-    RequestBody coverageBody = new GzipMultipartRequestBody(reportStream);
-
-    MultipartBody multipartBody =
-        new MultipartBody.Builder()
-            .setType(MultipartBody.FORM)
-            .addFormDataPart("coverage", "coverage.gz", coverageBody)
-            .addFormDataPart("event", "event.json", eventBody)
-            .build();
-
-    OkHttpUtils.CustomListener telemetryListener =
-        new TelemetryListener.Builder(metricCollector)
-            .requestCount(CiVisibilityCountMetric.COVERAGE_UPLOAD_REQUEST)
-            .requestBytes(CiVisibilityDistributionMetric.COVERAGE_UPLOAD_REQUEST_BYTES)
-            .requestErrors(CiVisibilityCountMetric.COVERAGE_UPLOAD_REQUEST_ERRORS)
-            .requestDuration(CiVisibilityDistributionMetric.COVERAGE_UPLOAD_REQUEST_MS)
-            .build();
-
-    backendApi.post("cicovreprt", multipartBody, responseStream -> null, telemetryListener, false);
-  }
-
-  /** Request body that compresses a form data part */
-  private static class GzipMultipartRequestBody extends RequestBody {
-    private final InputStream stream;
-
-    private GzipMultipartRequestBody(InputStream stream) {
-      this.stream = stream;
-    }
-
-    @Override
-    public long contentLength() {
-      return -1;
+    private final BackendApi backendApi;
+    private final Map<String, String> ciTags;
+    private final List<String> flags;
+    private final CiVisibilityMetricCollector metricCollector;
+    private final JsonAdapter<Map<String, Object>> eventAdapter;
+
+    public CoverageReportUploader(
+            BackendApi backendApi,
+            Map<String, String> ciTags,
+            List<String> flags,
+            CiVisibilityMetricCollector metricCollector) {
+        this.backendApi = backendApi;
+        this.ciTags = ciTags;
+        this.flags = Collections.unmodifiableList(new ArrayList<>(flags));
+        this.metricCollector = metricCollector;
+
+        Moshi moshi = new Moshi.Builder().build();
+        Type type = Types.newParameterizedType(Map.class, String.class, Object.class);
+        eventAdapter = moshi.adapter(type);
     }
 
-    @Override
-    public MediaType contentType() {
-      return null;
+    public void upload(String format, InputStream reportStream) throws IOException {
+        Map<String, Object> event = new HashMap<>(ciTags);
+        event.put("format", format);
+        event.put("type", "coverage_report");
+        if (!flags.isEmpty()) {
+            event.put("report.flags", flags);
+        }
+        String eventJson = eventAdapter.toJson(event);
+        RequestBody eventBody = jsonRequestBodyOf(eventJson.getBytes(StandardCharsets.UTF_8));
+
+        RequestBody coverageBody = new GzipMultipartRequestBody(reportStream);
+
+        MultipartBody multipartBody = new MultipartBody.Builder()
+                .setType(MultipartBody.FORM)
+                .addFormDataPart("coverage", "coverage.gz", coverageBody)
+                .addFormDataPart("event", "event.json", eventBody)
+                .build();
+
+        OkHttpUtils.CustomListener telemetryListener = new TelemetryListener.Builder(metricCollector)
+                .requestCount(CiVisibilityCountMetric.COVERAGE_UPLOAD_REQUEST)
+                .requestBytes(CiVisibilityDistributionMetric.COVERAGE_UPLOAD_REQUEST_BYTES)
+                .requestErrors(CiVisibilityCountMetric.COVERAGE_UPLOAD_REQUEST_ERRORS)
+                .requestDuration(CiVisibilityDistributionMetric.COVERAGE_UPLOAD_REQUEST_MS)
+                .build();
+
+        backendApi.post("cicovreprt", multipartBody, responseStream -> null, telemetryListener, false);
     }
 
-    @SuppressFBWarnings("OS_OPEN_STREAM")
-    @Override
-    public void writeTo(BufferedSink sink) throws IOException {
-      GZIPOutputStream outputStream = new GZIPOutputStream(sink.outputStream());
-      byte[] buffer = new byte[8192];
-      for (int readCount; (readCount = stream.read(buffer)) != -1; ) {
-        outputStream.write(buffer, 0, readCount);
-      }
-      outputStream.finish();
-      // not closing output stream as it would close the underlying sink, which is managed by okhttp
+    /** Request body that compresses a form data part */
+    private static class GzipMultipartRequestBody extends RequestBody {
+        private final InputStream stream;
+
+        private GzipMultipartRequestBody(InputStream stream) {
+            this.stream = stream;
+        }
+
+        @Override
+        public long contentLength() {
+            return -1;
+        }
+
+        @Override
+        public MediaType contentType() {
+            return null;
+        }
+
+        @SuppressFBWarnings("OS_OPEN_STREAM")
+        @Override
+        public void writeTo(BufferedSink sink) throws IOException {
+            GZIPOutputStream outputStream = new GZIPOutputStream(sink.outputStream());
+            byte[] buffer = new byte[8192];
+            for (int readCount; (readCount = stream.read(buffer)) != -1; ) {
+                outputStream.write(buffer, 0, readCount);
+            }
+            outputStream.finish();
+            // not closing output stream as it would close the underlying sink, which is managed by okhttp
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/JacocoCoverageProcessor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/JacocoCoverageProcessor.java
index 0514dde7ab1..8d877a7f9ad 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/JacocoCoverageProcessor.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/JacocoCoverageProcessor.java
@@ -56,444 +56,447 @@
 /** Processes Jacoco coverage reports. */
 public class JacocoCoverageProcessor implements CoverageProcessor {
 
-  public static final class Factory implements CoverageProcessor.Factory<JacocoCoverageProcessor> {
+    public static final class Factory implements CoverageProcessor.Factory<JacocoCoverageProcessor> {
+        private final Config config;
+        private final RepoIndexProvider repoIndexProvider;
+        private final CoverageReportUploader coverageReportUploader;
+
+        @Nullable
+        private final String repoRoot;
+
+        private final ModuleSignalRouter moduleSignalRouter;
+
+        public Factory(
+                Config config,
+                RepoIndexProvider repoIndexProvider,
+                CoverageReportUploader coverageReportUploader,
+                @Nullable String repoRoot,
+                ModuleSignalRouter moduleSignalRouter) {
+            this.config = config;
+            this.repoIndexProvider = repoIndexProvider;
+            this.coverageReportUploader = coverageReportUploader;
+            this.repoRoot = repoRoot;
+            this.moduleSignalRouter = moduleSignalRouter;
+        }
+
+        @Override
+        public JacocoCoverageProcessor sessionCoverage(long sessionId) {
+            return new JacocoCoverageProcessor(config, repoIndexProvider, coverageReportUploader, repoRoot, sessionId);
+        }
+
+        @Override
+        public JacocoCoverageProcessor moduleCoverage(
+                long moduleId,
+                @Nullable BuildModuleLayout moduleLayout,
+                ExecutionSettings executionSettings,
+                JacocoCoverageProcessor sessionCoverage) {
+            return new JacocoCoverageProcessor(
+                    config,
+                    repoIndexProvider,
+                    null, // do not upload coverage reports for individual modules
+                    executionSettings,
+                    repoRoot,
+                    moduleId,
+                    moduleLayout,
+                    moduleSignalRouter,
+                    sessionCoverage);
+        }
+    }
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(JacocoCoverageProcessor.class);
+
+    @Nullable
+    private final JacocoCoverageProcessor parent;
+
     private final Config config;
+
     private final RepoIndexProvider repoIndexProvider;
+
+    @Nullable
     private final CoverageReportUploader coverageReportUploader;
-    @Nullable private final String repoRoot;
-    private final ModuleSignalRouter moduleSignalRouter;
-
-    public Factory(
-        Config config,
-        RepoIndexProvider repoIndexProvider,
-        CoverageReportUploader coverageReportUploader,
-        @Nullable String repoRoot,
-        ModuleSignalRouter moduleSignalRouter) {
-      this.config = config;
-      this.repoIndexProvider = repoIndexProvider;
-      this.coverageReportUploader = coverageReportUploader;
-      this.repoRoot = repoRoot;
-      this.moduleSignalRouter = moduleSignalRouter;
-    }
 
-    @Override
-    public JacocoCoverageProcessor sessionCoverage(long sessionId) {
-      return new JacocoCoverageProcessor(
-          config, repoIndexProvider, coverageReportUploader, repoRoot, sessionId);
-    }
+    @Nullable
+    private final String repoRoot;
 
-    @Override
-    public JacocoCoverageProcessor moduleCoverage(
-        long moduleId,
-        @Nullable BuildModuleLayout moduleLayout,
-        ExecutionSettings executionSettings,
-        JacocoCoverageProcessor sessionCoverage) {
-      return new JacocoCoverageProcessor(
-          config,
-          repoIndexProvider,
-          null, // do not upload coverage reports for individual modules
-          executionSettings,
-          repoRoot,
-          moduleId,
-          moduleLayout,
-          moduleSignalRouter,
-          sessionCoverage);
-    }
-  }
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(JacocoCoverageProcessor.class);
-
-  @Nullable private final JacocoCoverageProcessor parent;
-
-  private final Config config;
-
-  private final RepoIndexProvider repoIndexProvider;
-
-  @Nullable private final CoverageReportUploader coverageReportUploader;
-
-  @Nullable private final String repoRoot;
-
-  private final long eventId;
-
-  private final Object coverageDataLock = new Object();
-
-  @GuardedBy("coverageDataLock")
-  private final ExecutionDataStore coverageData = new ExecutionDataStore();
-
-  @GuardedBy("coverageDataLock")
-  private final Map<String, BitSet> backendCoverageData = new HashMap<>();
-
-  @GuardedBy("coverageDataLock")
-  private final Collection<File> outputClassesDirs = new HashSet<>();
-
-  private JacocoCoverageProcessor(
-      Config config,
-      RepoIndexProvider repoIndexProvider,
-      @Nullable CoverageReportUploader coverageReportUploader,
-      @Nullable String repoRoot,
-      long sessionId) {
-    this.parent = null;
-    this.config = config;
-    this.repoIndexProvider = repoIndexProvider;
-    this.coverageReportUploader = coverageReportUploader;
-    this.repoRoot = repoRoot;
-    this.eventId = sessionId;
-  }
-
-  private JacocoCoverageProcessor(
-      Config config,
-      RepoIndexProvider repoIndexProvider,
-      @Nullable CoverageReportUploader coverageReportUploader,
-      ExecutionSettings executionSettings,
-      @Nullable String repoRoot,
-      long moduleId,
-      @Nullable BuildModuleLayout moduleLayout,
-      ModuleSignalRouter moduleSignalRouter,
-      @Nonnull JacocoCoverageProcessor parent) {
-    this.parent = parent;
-    this.config = config;
-    this.repoIndexProvider = repoIndexProvider;
-    this.coverageReportUploader = coverageReportUploader;
-    this.repoRoot = repoRoot;
-    this.eventId = moduleId;
-
-    if (executionSettings.isTestSkippingEnabled()) {
-      // this is the data that would've been covered if we ran all the skippable tests
-      addBackendCoverageData(executionSettings.getSkippableTestsCoverage());
-    }
+    private final long eventId;
+
+    private final Object coverageDataLock = new Object();
 
-    addModuleLayout(moduleLayout);
-    moduleSignalRouter.registerModuleHandler(
-        moduleId, SignalType.MODULE_COVERAGE_DATA_JACOCO, this::addCoverageData);
-  }
+    @GuardedBy("coverageDataLock")
+    private final ExecutionDataStore coverageData = new ExecutionDataStore();
 
-  private void addModuleLayout(@Nullable BuildModuleLayout moduleLayout) {
-    if (moduleLayout == null) {
-      LOGGER.debug("Received null module layout, will not be able to calculate coverage");
-      return;
+    @GuardedBy("coverageDataLock")
+    private final Map<String, BitSet> backendCoverageData = new HashMap<>();
+
+    @GuardedBy("coverageDataLock")
+    private final Collection<File> outputClassesDirs = new HashSet<>();
+
+    private JacocoCoverageProcessor(
+            Config config,
+            RepoIndexProvider repoIndexProvider,
+            @Nullable CoverageReportUploader coverageReportUploader,
+            @Nullable String repoRoot,
+            long sessionId) {
+        this.parent = null;
+        this.config = config;
+        this.repoIndexProvider = repoIndexProvider;
+        this.coverageReportUploader = coverageReportUploader;
+        this.repoRoot = repoRoot;
+        this.eventId = sessionId;
     }
-    synchronized (coverageDataLock) {
-      for (SourceSet sourceSet : moduleLayout.getSourceSets()) {
-        if (sourceSet.getType() == SourceSet.Type.TEST) {
-          // test sources should not be considered when calculating code coverage percentage
-          continue;
+
+    private JacocoCoverageProcessor(
+            Config config,
+            RepoIndexProvider repoIndexProvider,
+            @Nullable CoverageReportUploader coverageReportUploader,
+            ExecutionSettings executionSettings,
+            @Nullable String repoRoot,
+            long moduleId,
+            @Nullable BuildModuleLayout moduleLayout,
+            ModuleSignalRouter moduleSignalRouter,
+            @Nonnull JacocoCoverageProcessor parent) {
+        this.parent = parent;
+        this.config = config;
+        this.repoIndexProvider = repoIndexProvider;
+        this.coverageReportUploader = coverageReportUploader;
+        this.repoRoot = repoRoot;
+        this.eventId = moduleId;
+
+        if (executionSettings.isTestSkippingEnabled()) {
+            // this is the data that would've been covered if we ran all the skippable tests
+            addBackendCoverageData(executionSettings.getSkippableTestsCoverage());
         }
-        this.outputClassesDirs.addAll(sourceSet.getDestinations());
-      }
-    }
-    if (parent != null) {
-      parent.addModuleLayout(moduleLayout);
-    }
-  }
-
-  /** Handles skipped tests' coverage data received from the backend */
-  private void addBackendCoverageData(@Nonnull Map<String, BitSet> skippableTestsCoverage) {
-    synchronized (coverageDataLock) {
-      for (Map.Entry<String, BitSet> e : skippableTestsCoverage.entrySet()) {
-        backendCoverageData.merge(e.getKey(), e.getValue(), JacocoCoverageProcessor::mergeBitSets);
-      }
+
+        addModuleLayout(moduleLayout);
+        moduleSignalRouter.registerModuleHandler(
+                moduleId, SignalType.MODULE_COVERAGE_DATA_JACOCO, this::addCoverageData);
     }
-    if (parent != null) {
-      parent.addBackendCoverageData(skippableTestsCoverage);
+
+    private void addModuleLayout(@Nullable BuildModuleLayout moduleLayout) {
+        if (moduleLayout == null) {
+            LOGGER.debug("Received null module layout, will not be able to calculate coverage");
+            return;
+        }
+        synchronized (coverageDataLock) {
+            for (SourceSet sourceSet : moduleLayout.getSourceSets()) {
+                if (sourceSet.getType() == SourceSet.Type.TEST) {
+                    // test sources should not be considered when calculating code coverage percentage
+                    continue;
+                }
+                this.outputClassesDirs.addAll(sourceSet.getDestinations());
+            }
+        }
+        if (parent != null) {
+            parent.addModuleLayout(moduleLayout);
+        }
     }
-  }
-
-  private static BitSet mergeBitSets(BitSet a, BitSet b) {
-    // we need to create a instance to avoid sharing objects between modules and session
-    BitSet merged = new BitSet(Math.max(a.size(), b.size()));
-    merged.or(a);
-    merged.or(b);
-    return merged;
-  }
-
-  /** Handles executed tests' coverage data received from a JVM that ran tests */
-  private SignalResponse addCoverageData(ModuleCoverageDataJacoco moduleCoverageData) {
-    byte[] rawCoverageData = moduleCoverageData.getCoverageData();
-    ExecutionDataStore parsedCoverageData = parseCoverageData(rawCoverageData);
-    if (parsedCoverageData != null) {
-      synchronized (coverageDataLock) {
-        // add received coverage data to aggregated coverage data
-        parsedCoverageData.accept(coverageData);
-      }
+
+    /** Handles skipped tests' coverage data received from the backend */
+    private void addBackendCoverageData(@Nonnull Map<String, BitSet> skippableTestsCoverage) {
+        synchronized (coverageDataLock) {
+            for (Map.Entry<String, BitSet> e : skippableTestsCoverage.entrySet()) {
+                backendCoverageData.merge(e.getKey(), e.getValue(), JacocoCoverageProcessor::mergeBitSets);
+            }
+        }
+        if (parent != null) {
+            parent.addBackendCoverageData(skippableTestsCoverage);
+        }
     }
 
-    if (parent != null) {
-      // it is important that modules and sessions each parse their own instances of
-      // ExecutionDataStore and not share them:
-      // ExecutionData instances that reside inside the store are mutable,
-      // and modifying an ExecutionData in one module is going
-      // to be visible in another module
-      // (see internal implementation of org.jacoco.core.data.ExecutionDataStore.accept)
-      parent.addCoverageData(moduleCoverageData);
+    private static BitSet mergeBitSets(BitSet a, BitSet b) {
+        // we need to create a instance to avoid sharing objects between modules and session
+        BitSet merged = new BitSet(Math.max(a.size(), b.size()));
+        merged.or(a);
+        merged.or(b);
+        return merged;
     }
 
-    return AckResponse.INSTANCE;
-  }
+    /** Handles executed tests' coverage data received from a JVM that ran tests */
+    private SignalResponse addCoverageData(ModuleCoverageDataJacoco moduleCoverageData) {
+        byte[] rawCoverageData = moduleCoverageData.getCoverageData();
+        ExecutionDataStore parsedCoverageData = parseCoverageData(rawCoverageData);
+        if (parsedCoverageData != null) {
+            synchronized (coverageDataLock) {
+                // add received coverage data to aggregated coverage data
+                parsedCoverageData.accept(coverageData);
+            }
+        }
 
-  private static ExecutionDataStore parseCoverageData(byte[] rawCoverageData) {
-    if (rawCoverageData == null) {
-      return null;
-    }
-    try {
-      SessionInfoStore sessionInfoStore = new SessionInfoStore();
-      ExecutionDataStore executionDataStore = new ExecutionDataStore();
-
-      ByteArrayInputStream input = new ByteArrayInputStream(rawCoverageData);
-      ExecutionDataReader dataReader = new ExecutionDataReader(input);
-      dataReader.setSessionInfoVisitor(sessionInfoStore);
-      dataReader.setExecutionDataVisitor(executionDataStore);
-      dataReader.read();
-
-      return executionDataStore;
-    } catch (Exception e) {
-      LOGGER.error("Error while parsing coverage data", e);
-      return null;
-    }
-  }
-
-  @Override
-  @Nullable
-  public Long processCoverageData() {
-    IBundleCoverage coverageBundle = buildCoverageBundle();
-    if (coverageBundle == null) {
-      return null;
-    }
+        if (parent != null) {
+            // it is important that modules and sessions each parse their own instances of
+            // ExecutionDataStore and not share them:
+            // ExecutionData instances that reside inside the store are mutable,
+            // and modifying an ExecutionData in one module is going
+            // to be visible in another module
+            // (see internal implementation of org.jacoco.core.data.ExecutionDataStore.accept)
+            parent.addCoverageData(moduleCoverageData);
+        }
 
-    File coverageReportFolder = getCoverageReportFolder();
-    if (coverageReportFolder != null) {
-      dumpCoverageReport(coverageBundle, coverageReportFolder);
+        return AckResponse.INSTANCE;
     }
 
-    if (backendCoverageData.isEmpty()) {
-      uploadCoverageReport(coverageBundle);
-      return getLocalCoveragePercentage(coverageBundle);
-    } else {
-      return mergeAndUploadCoverageReport(coverageBundle);
+    private static ExecutionDataStore parseCoverageData(byte[] rawCoverageData) {
+        if (rawCoverageData == null) {
+            return null;
+        }
+        try {
+            SessionInfoStore sessionInfoStore = new SessionInfoStore();
+            ExecutionDataStore executionDataStore = new ExecutionDataStore();
+
+            ByteArrayInputStream input = new ByteArrayInputStream(rawCoverageData);
+            ExecutionDataReader dataReader = new ExecutionDataReader(input);
+            dataReader.setSessionInfoVisitor(sessionInfoStore);
+            dataReader.setExecutionDataVisitor(executionDataStore);
+            dataReader.read();
+
+            return executionDataStore;
+        } catch (Exception e) {
+            LOGGER.error("Error while parsing coverage data", e);
+            return null;
+        }
     }
-  }
-
-  private IBundleCoverage buildCoverageBundle() {
-    synchronized (coverageDataLock) {
-      if (coverageData.getContents().isEmpty()) {
-        return null;
-      }
-
-      try {
-        CoverageBuilder coverageBuilder = new CoverageBuilder();
-        Analyzer analyzer = new Analyzer(coverageData, coverageBuilder);
-        for (File outputClassesDir : outputClassesDirs) {
-          if (outputClassesDir.exists()) {
-            analyzer.analyzeAll(outputClassesDir);
-          }
+
+    @Override
+    @Nullable
+    public Long processCoverageData() {
+        IBundleCoverage coverageBundle = buildCoverageBundle();
+        if (coverageBundle == null) {
+            return null;
         }
 
-        return coverageBuilder.getBundle("Module coverage data");
-      } catch (Exception e) {
-        LOGGER.error("Error while creating coverage bundle", e);
-        return null;
-      }
-    }
-  }
-
-  private File getCoverageReportFolder() {
-    String coverageReportDumpDir = config.getCiVisibilityCodeCoverageReportDumpDir();
-    if (coverageReportDumpDir != null) {
-      return Paths.get(
-              coverageReportDumpDir,
-              (parent == null ? "session" : "module") + "-" + eventId,
-              "aggregated")
-          .toAbsolutePath()
-          .toFile();
-    } else {
-      return null;
+        File coverageReportFolder = getCoverageReportFolder();
+        if (coverageReportFolder != null) {
+            dumpCoverageReport(coverageBundle, coverageReportFolder);
+        }
+
+        if (backendCoverageData.isEmpty()) {
+            uploadCoverageReport(coverageBundle);
+            return getLocalCoveragePercentage(coverageBundle);
+        } else {
+            return mergeAndUploadCoverageReport(coverageBundle);
+        }
     }
-  }
 
-  private void dumpCoverageReport(IBundleCoverage coverageBundle, File reportFolder) {
-    if (!reportFolder.exists() && !reportFolder.mkdirs()) {
-      LOGGER.debug("Skipping report generation, could not create report dir: {}", reportFolder);
-      return;
+    private IBundleCoverage buildCoverageBundle() {
+        synchronized (coverageDataLock) {
+            if (coverageData.getContents().isEmpty()) {
+                return null;
+            }
+
+            try {
+                CoverageBuilder coverageBuilder = new CoverageBuilder();
+                Analyzer analyzer = new Analyzer(coverageData, coverageBuilder);
+                for (File outputClassesDir : outputClassesDirs) {
+                    if (outputClassesDir.exists()) {
+                        analyzer.analyzeAll(outputClassesDir);
+                    }
+                }
+
+                return coverageBuilder.getBundle("Module coverage data");
+            } catch (Exception e) {
+                LOGGER.error("Error while creating coverage bundle", e);
+                return null;
+            }
+        }
     }
-    try {
-      final HTMLFormatter htmlFormatter = new HTMLFormatter();
-
-      final IReportVisitor htmlVisitor =
-          htmlFormatter.createVisitor(new FileMultiReportOutput(reportFolder));
-      htmlVisitor.visitInfo(Collections.emptyList(), Collections.emptyList());
-      htmlVisitor.visitBundle(coverageBundle, createSourceFileLocator());
-      htmlVisitor.visitEnd();
-
-      File xmlReport = new File(reportFolder, "jacoco.xml");
-      try (FileOutputStream xmlReportStream = new FileOutputStream(xmlReport)) {
-        XMLFormatter xmlFormatter = new XMLFormatter();
-        IReportVisitor xmlVisitor = xmlFormatter.createVisitor(xmlReportStream);
-        xmlVisitor.visitInfo(Collections.emptyList(), Collections.emptyList());
-        xmlVisitor.visitBundle(coverageBundle, createSourceFileLocator());
-        xmlVisitor.visitEnd();
-      }
-    } catch (Exception e) {
-      LOGGER.error("Error while creating report in {}", reportFolder, e);
+
+    private File getCoverageReportFolder() {
+        String coverageReportDumpDir = config.getCiVisibilityCodeCoverageReportDumpDir();
+        if (coverageReportDumpDir != null) {
+            return Paths.get(
+                            coverageReportDumpDir,
+                            (parent == null ? "session" : "module") + "-" + eventId,
+                            "aggregated")
+                    .toAbsolutePath()
+                    .toFile();
+        } else {
+            return null;
+        }
     }
-  }
-
-  private ISourceFileLocator createSourceFileLocator() {
-    return repoRoot != null
-        ? new RepoIndexFileLocator(repoIndexProvider.getIndex(), repoRoot)
-        : NoOpFileLocator.INSTANCE;
-  }
-
-  private static final class RepoIndexFileLocator extends InputStreamSourceFileLocator {
-    private final RepoIndex repoIndex;
-    @Nonnull private final String repoRoot;
-
-    private RepoIndexFileLocator(RepoIndex repoIndex, @Nonnull String repoRoot) {
-      super("utf-8", 4);
-      this.repoIndex = repoIndex;
-      this.repoRoot = repoRoot;
+
+    private void dumpCoverageReport(IBundleCoverage coverageBundle, File reportFolder) {
+        if (!reportFolder.exists() && !reportFolder.mkdirs()) {
+            LOGGER.debug("Skipping report generation, could not create report dir: {}", reportFolder);
+            return;
+        }
+        try {
+            final HTMLFormatter htmlFormatter = new HTMLFormatter();
+
+            final IReportVisitor htmlVisitor = htmlFormatter.createVisitor(new FileMultiReportOutput(reportFolder));
+            htmlVisitor.visitInfo(Collections.emptyList(), Collections.emptyList());
+            htmlVisitor.visitBundle(coverageBundle, createSourceFileLocator());
+            htmlVisitor.visitEnd();
+
+            File xmlReport = new File(reportFolder, "jacoco.xml");
+            try (FileOutputStream xmlReportStream = new FileOutputStream(xmlReport)) {
+                XMLFormatter xmlFormatter = new XMLFormatter();
+                IReportVisitor xmlVisitor = xmlFormatter.createVisitor(xmlReportStream);
+                xmlVisitor.visitInfo(Collections.emptyList(), Collections.emptyList());
+                xmlVisitor.visitBundle(coverageBundle, createSourceFileLocator());
+                xmlVisitor.visitEnd();
+            }
+        } catch (Exception e) {
+            LOGGER.error("Error while creating report in {}", reportFolder, e);
+        }
     }
 
-    @Override
-    protected InputStream getSourceStream(String path) throws IOException {
-      Collection<String> relativePaths = repoIndex.getSourcePaths(path);
-      if (relativePaths.size() != 1) {
-        LOGGER.debug("Could not resolve source for path {}", path);
-        return null;
-      }
-      String relativePath = relativePaths.iterator().next();
-      String absolutePath =
-          repoRoot + (!repoRoot.endsWith(File.separator) ? File.separator : "") + relativePath;
-      return new BufferedInputStream(Files.newInputStream(Paths.get(absolutePath)));
+    private ISourceFileLocator createSourceFileLocator() {
+        return repoRoot != null
+                ? new RepoIndexFileLocator(repoIndexProvider.getIndex(), repoRoot)
+                : NoOpFileLocator.INSTANCE;
     }
-  }
 
-  private static final class NoOpFileLocator implements ISourceFileLocator {
-    private static final NoOpFileLocator INSTANCE = new NoOpFileLocator();
+    private static final class RepoIndexFileLocator extends InputStreamSourceFileLocator {
+        private final RepoIndex repoIndex;
 
-    private NoOpFileLocator() {}
+        @Nonnull
+        private final String repoRoot;
 
-    @Override
-    public Reader getSourceFile(String s, String s1) {
-      return null;
-    }
+        private RepoIndexFileLocator(RepoIndex repoIndex, @Nonnull String repoRoot) {
+            super("utf-8", 4);
+            this.repoIndex = repoIndex;
+            this.repoRoot = repoRoot;
+        }
 
-    @Override
-    public int getTabWidth() {
-      return 0;
+        @Override
+        protected InputStream getSourceStream(String path) throws IOException {
+            Collection<String> relativePaths = repoIndex.getSourcePaths(path);
+            if (relativePaths.size() != 1) {
+                LOGGER.debug("Could not resolve source for path {}", path);
+                return null;
+            }
+            String relativePath = relativePaths.iterator().next();
+            String absolutePath = repoRoot + (!repoRoot.endsWith(File.separator) ? File.separator : "") + relativePath;
+            return new BufferedInputStream(Files.newInputStream(Paths.get(absolutePath)));
+        }
     }
-  }
 
-  private void uploadCoverageReport(IBundleCoverage coverageBundle) {
-    if (coverageReportUploader == null) {
-      return;
-    }
+    private static final class NoOpFileLocator implements ISourceFileLocator {
+        private static final NoOpFileLocator INSTANCE = new NoOpFileLocator();
 
-    try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-      XMLFormatter xmlFormatter = new XMLFormatter();
-      IReportVisitor xmlVisitor = xmlFormatter.createVisitor(baos);
-      xmlVisitor.visitInfo(Collections.emptyList(), Collections.emptyList());
-      xmlVisitor.visitBundle(coverageBundle, createSourceFileLocator());
-      xmlVisitor.visitEnd();
+        private NoOpFileLocator() {}
 
-      coverageReportUploader.upload("jacoco", new ByteArrayInputStream(baos.toByteArray()));
+        @Override
+        public Reader getSourceFile(String s, String s1) {
+            return null;
+        }
 
-    } catch (IOException e) {
-      LOGGER.error("Error while uploading coverage report", e);
+        @Override
+        public int getTabWidth() {
+            return 0;
+        }
     }
-  }
-
-  /**
-   * Gets coverage percentage data directly from Jacoco bundle (can only be used if ITR did not skip
-   * any tests).
-   */
-  private static long getLocalCoveragePercentage(IBundleCoverage coverageBundle) {
-    ICounter lineCounter = coverageBundle.getLineCounter();
-    int coveredLines = lineCounter.getCoveredCount();
-    int totalLines = lineCounter.getTotalCount();
-    return Math.round((100d * coveredLines) / totalLines);
-  }
-
-  private static final BitSet EMPTY_BIT_SET = new BitSet();
-
-  /**
-   * Merges coverage from Jacoco bundle with skipped tests' coverage received from the backend and
-   * uploads the merge result if applicable.
-   *
-   * @return total coverage percentage
-   */
-  private long mergeAndUploadCoverageReport(IBundleCoverage coverageBundle) {
-    RepoIndex repoIndex = repoIndexProvider.getIndex();
-
-    Map<String, LinesCoverage> mergedCoverageData = new TreeMap<>();
-
-    int totalLines = 0, coveredLines = 0;
-    for (IPackageCoverage packageCoverage : coverageBundle.getPackages()) {
-      for (ISourceFileCoverage sourceFile : packageCoverage.getSourceFiles()) {
-        String packageName = sourceFile.getPackageName();
-        String fileName = sourceFile.getName();
-        String pathRelativeToSourceRoot =
-            (Strings.isNotBlank(packageName) ? packageName + "/" : "") + fileName;
-        Collection<String> pathsRelativeToIndexRoot =
-            repoIndex.getSourcePaths(pathRelativeToSourceRoot);
-
-        if (pathsRelativeToIndexRoot.size() != 1) {
-          LOGGER.debug("Could not resolve source for path {}", pathRelativeToSourceRoot);
-          continue;
+
+    private void uploadCoverageReport(IBundleCoverage coverageBundle) {
+        if (coverageReportUploader == null) {
+            return;
         }
 
-        String pathRelativeToIndexRoot = pathsRelativeToIndexRoot.iterator().next();
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            XMLFormatter xmlFormatter = new XMLFormatter();
+            IReportVisitor xmlVisitor = xmlFormatter.createVisitor(baos);
+            xmlVisitor.visitInfo(Collections.emptyList(), Collections.emptyList());
+            xmlVisitor.visitBundle(coverageBundle, createSourceFileLocator());
+            xmlVisitor.visitEnd();
 
-        LinesCoverage linesCoverage = getLinesCoverage(sourceFile);
-        // backendCoverageData contains data for all modules in the repo,
-        // but coverageBundle bundle only has source files that are relevant for the given module,
-        // so we are not taking into account any backend coverage that is not relevant
-        linesCoverage.coveredLines.or(
-            backendCoverageData.getOrDefault(pathRelativeToIndexRoot, EMPTY_BIT_SET));
+            coverageReportUploader.upload("jacoco", new ByteArrayInputStream(baos.toByteArray()));
 
-        mergedCoverageData.put(pathRelativeToIndexRoot, linesCoverage);
+        } catch (IOException e) {
+            LOGGER.error("Error while uploading coverage report", e);
+        }
+    }
 
-        coveredLines += linesCoverage.coveredLines.cardinality();
-        totalLines += sourceFile.getLineCounter().getTotalCount();
-      }
+    /**
+     * Gets coverage percentage data directly from Jacoco bundle (can only be used if ITR did not skip
+     * any tests).
+     */
+    private static long getLocalCoveragePercentage(IBundleCoverage coverageBundle) {
+        ICounter lineCounter = coverageBundle.getLineCounter();
+        int coveredLines = lineCounter.getCoveredCount();
+        int totalLines = lineCounter.getTotalCount();
+        return Math.round((100d * coveredLines) / totalLines);
     }
 
-    uploadMergedCoverageReport(mergedCoverageData);
+    private static final BitSet EMPTY_BIT_SET = new BitSet();
+
+    /**
+     * Merges coverage from Jacoco bundle with skipped tests' coverage received from the backend and
+     * uploads the merge result if applicable.
+     *
+     * @return total coverage percentage
+     */
+    private long mergeAndUploadCoverageReport(IBundleCoverage coverageBundle) {
+        RepoIndex repoIndex = repoIndexProvider.getIndex();
+
+        Map<String, LinesCoverage> mergedCoverageData = new TreeMap<>();
+
+        int totalLines = 0, coveredLines = 0;
+        for (IPackageCoverage packageCoverage : coverageBundle.getPackages()) {
+            for (ISourceFileCoverage sourceFile : packageCoverage.getSourceFiles()) {
+                String packageName = sourceFile.getPackageName();
+                String fileName = sourceFile.getName();
+                String pathRelativeToSourceRoot = (Strings.isNotBlank(packageName) ? packageName + "/" : "") + fileName;
+                Collection<String> pathsRelativeToIndexRoot = repoIndex.getSourcePaths(pathRelativeToSourceRoot);
+
+                if (pathsRelativeToIndexRoot.size() != 1) {
+                    LOGGER.debug("Could not resolve source for path {}", pathRelativeToSourceRoot);
+                    continue;
+                }
+
+                String pathRelativeToIndexRoot =
+                        pathsRelativeToIndexRoot.iterator().next();
+
+                LinesCoverage linesCoverage = getLinesCoverage(sourceFile);
+                // backendCoverageData contains data for all modules in the repo,
+                // but coverageBundle bundle only has source files that are relevant for the given module,
+                // so we are not taking into account any backend coverage that is not relevant
+                linesCoverage.coveredLines.or(backendCoverageData.getOrDefault(pathRelativeToIndexRoot, EMPTY_BIT_SET));
+
+                mergedCoverageData.put(pathRelativeToIndexRoot, linesCoverage);
+
+                coveredLines += linesCoverage.coveredLines.cardinality();
+                totalLines += sourceFile.getLineCounter().getTotalCount();
+            }
+        }
 
-    return Math.round((100d * coveredLines) / totalLines);
-  }
+        uploadMergedCoverageReport(mergedCoverageData);
 
-  private void uploadMergedCoverageReport(Map<String, LinesCoverage> mergedCoverageData) {
-    if (coverageReportUploader == null) {
-      return;
+        return Math.round((100d * coveredLines) / totalLines);
     }
 
-    String lcovReport = LcovReportWriter.toString(mergedCoverageData);
-    try {
-      coverageReportUploader.upload(
-          "lcov", new ByteArrayInputStream(lcovReport.getBytes(StandardCharsets.UTF_8)));
-    } catch (IOException e) {
-      LOGGER.error("Error while uploading coverage report", e);
+    private void uploadMergedCoverageReport(Map<String, LinesCoverage> mergedCoverageData) {
+        if (coverageReportUploader == null) {
+            return;
+        }
+
+        String lcovReport = LcovReportWriter.toString(mergedCoverageData);
+        try {
+            coverageReportUploader.upload(
+                    "lcov", new ByteArrayInputStream(lcovReport.getBytes(StandardCharsets.UTF_8)));
+        } catch (IOException e) {
+            LOGGER.error("Error while uploading coverage report", e);
+        }
     }
-  }
 
-  private static LinesCoverage getLinesCoverage(ISourceNode coverage) {
-    LinesCoverage linesCoverage = new LinesCoverage();
+    private static LinesCoverage getLinesCoverage(ISourceNode coverage) {
+        LinesCoverage linesCoverage = new LinesCoverage();
 
-    int firstLine = coverage.getFirstLine();
-    if (firstLine == -1) {
-      return linesCoverage;
-    }
+        int firstLine = coverage.getFirstLine();
+        if (firstLine == -1) {
+            return linesCoverage;
+        }
 
-    int lastLine = coverage.getLastLine();
-    for (int lineIdx = firstLine; lineIdx <= lastLine; lineIdx++) {
-      ILine line = coverage.getLine(lineIdx);
-      if (line.getStatus() > ICounter.EMPTY) {
-        linesCoverage.executableLines.set(lineIdx);
-        if (line.getStatus() >= ICounter.FULLY_COVERED) {
-          linesCoverage.coveredLines.set(lineIdx);
+        int lastLine = coverage.getLastLine();
+        for (int lineIdx = firstLine; lineIdx <= lastLine; lineIdx++) {
+            ILine line = coverage.getLine(lineIdx);
+            if (line.getStatus() > ICounter.EMPTY) {
+                linesCoverage.executableLines.set(lineIdx);
+                if (line.getStatus() >= ICounter.FULLY_COVERED) {
+                    linesCoverage.coveredLines.set(lineIdx);
+                }
+            }
         }
-      }
-    }
 
-    return linesCoverage;
-  }
+        return linesCoverage;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/LcovReportWriter.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/LcovReportWriter.java
index b7fc48c8873..4bb2fa8d951 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/LcovReportWriter.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/LcovReportWriter.java
@@ -10,64 +10,63 @@
 import javax.annotation.Nonnull;
 
 public final class LcovReportWriter {
-  private LcovReportWriter() {}
+    private LcovReportWriter() {}
 
-  public static void write(Map<String, LinesCoverage> coverage, Writer out) throws IOException {
-    Objects.requireNonNull(coverage, "coverage");
-    Objects.requireNonNull(out, "out");
+    public static void write(Map<String, LinesCoverage> coverage, Writer out) throws IOException {
+        Objects.requireNonNull(coverage, "coverage");
+        Objects.requireNonNull(out, "out");
 
-    Map<String, LinesCoverage> sorted =
-        (coverage instanceof TreeMap) ? coverage : toTreeMap(coverage);
+        Map<String, LinesCoverage> sorted = (coverage instanceof TreeMap) ? coverage : toTreeMap(coverage);
 
-    for (Map.Entry<String, LinesCoverage> e : sorted.entrySet()) {
-      String path = e.getKey();
-      LinesCoverage lc = e.getValue();
-      if (path == null || path.isEmpty()) {
-        continue;
-      }
-      if (lc == null) {
-        lc = new LinesCoverage();
-      }
+        for (Map.Entry<String, LinesCoverage> e : sorted.entrySet()) {
+            String path = e.getKey();
+            LinesCoverage lc = e.getValue();
+            if (path == null || path.isEmpty()) {
+                continue;
+            }
+            if (lc == null) {
+                lc = new LinesCoverage();
+            }
 
-      out.write("SF:" + path + "\n");
+            out.write("SF:" + path + "\n");
 
-      int lf = 0; // lines found (instrumented)
-      int lh = 0; // lines hit (executed at least once)
+            int lf = 0; // lines found (instrumented)
+            int lh = 0; // lines hit (executed at least once)
 
-      for (int line = lc.executableLines.nextSetBit(1);
-          line >= 0;
-          line = lc.executableLines.nextSetBit(line + 1)) { // skip bit 0
-        lf++;
-        int count = lc.coveredLines.get(line) ? 1 : 0;
-        lh += count;
-        out.write("DA:" + line + "," + count + "\n");
-      }
+            for (int line = lc.executableLines.nextSetBit(1);
+                    line >= 0;
+                    line = lc.executableLines.nextSetBit(line + 1)) { // skip bit 0
+                lf++;
+                int count = lc.coveredLines.get(line) ? 1 : 0;
+                lh += count;
+                out.write("DA:" + line + "," + count + "\n");
+            }
 
-      out.write("LH:" + lh + "\n");
-      out.write("LF:" + lf + "\n");
-      out.write("end_of_record\n");
+            out.write("LH:" + lh + "\n");
+            out.write("LF:" + lf + "\n");
+            out.write("end_of_record\n");
+        }
     }
-  }
 
-  @Nonnull
-  private static TreeMap<String, LinesCoverage> toTreeMap(Map<String, LinesCoverage> coverage) {
-    TreeMap<String, LinesCoverage> treeMap = new TreeMap<>();
-    for (Map.Entry<String, LinesCoverage> e : coverage.entrySet()) {
-      if (e.getKey() == null) {
-        continue;
-      }
-      treeMap.put(e.getKey(), e.getValue());
+    @Nonnull
+    private static TreeMap<String, LinesCoverage> toTreeMap(Map<String, LinesCoverage> coverage) {
+        TreeMap<String, LinesCoverage> treeMap = new TreeMap<>();
+        for (Map.Entry<String, LinesCoverage> e : coverage.entrySet()) {
+            if (e.getKey() == null) {
+                continue;
+            }
+            treeMap.put(e.getKey(), e.getValue());
+        }
+        return treeMap;
     }
-    return treeMap;
-  }
 
-  public static String toString(Map<String, LinesCoverage> coverage) {
-    try {
-      StringWriter sw = new StringWriter();
-      write(coverage, sw);
-      return sw.toString();
-    } catch (IOException ioe) {
-      throw new UncheckedIOException(ioe);
+    public static String toString(Map<String, LinesCoverage> coverage) {
+        try {
+            StringWriter sw = new StringWriter();
+            write(coverage, sw);
+            return sw.toString();
+        } catch (IOException ioe) {
+            throw new UncheckedIOException(ioe);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/LinesCoverage.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/LinesCoverage.java
index 962467439a1..5de647a8aa6 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/LinesCoverage.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/LinesCoverage.java
@@ -3,6 +3,6 @@
 import java.util.BitSet;
 
 public final class LinesCoverage {
-  public final BitSet coveredLines = new BitSet();
-  public final BitSet executableLines = new BitSet();
+    public final BitSet coveredLines = new BitSet();
+    public final BitSet executableLines = new BitSet();
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/NoOpCoverageProcessor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/NoOpCoverageProcessor.java
index 2dd5c4db3c3..26282de9392 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/NoOpCoverageProcessor.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/NoOpCoverageProcessor.java
@@ -6,29 +6,29 @@
 
 public class NoOpCoverageProcessor implements CoverageProcessor {
 
-  private static final NoOpCoverageProcessor INSTANCE = new NoOpCoverageProcessor();
+    private static final NoOpCoverageProcessor INSTANCE = new NoOpCoverageProcessor();
 
-  private NoOpCoverageProcessor() {}
+    private NoOpCoverageProcessor() {}
 
-  @Nullable
-  @Override
-  public Long processCoverageData() {
-    return null;
-  }
-
-  public static final class Factory implements CoverageProcessor.Factory<NoOpCoverageProcessor> {
+    @Nullable
     @Override
-    public NoOpCoverageProcessor sessionCoverage(long sessionId) {
-      return INSTANCE;
+    public Long processCoverageData() {
+        return null;
     }
 
-    @Override
-    public NoOpCoverageProcessor moduleCoverage(
-        long moduleId,
-        BuildModuleLayout moduleLayout,
-        ExecutionSettings executionSettings,
-        NoOpCoverageProcessor sessionCoverage) {
-      return INSTANCE;
+    public static final class Factory implements CoverageProcessor.Factory<NoOpCoverageProcessor> {
+        @Override
+        public NoOpCoverageProcessor sessionCoverage(long sessionId) {
+            return INSTANCE;
+        }
+
+        @Override
+        public NoOpCoverageProcessor moduleCoverage(
+                long moduleId,
+                BuildModuleLayout moduleLayout,
+                ExecutionSettings executionSettings,
+                NoOpCoverageProcessor sessionCoverage) {
+            return INSTANCE;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/child/ChildProcessCoverageReporter.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/child/ChildProcessCoverageReporter.java
index f6b061813a2..c52d667817c 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/child/ChildProcessCoverageReporter.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/child/ChildProcessCoverageReporter.java
@@ -12,6 +12,6 @@
  * <p>The data sent isn't per-test coverage but coverage for the process as a whole.
  */
 public interface ChildProcessCoverageReporter {
-  @Nullable
-  ModuleSignal createCoverageSignal(DDTraceId sessionId, long moduleId);
+    @Nullable
+    ModuleSignal createCoverageSignal(DDTraceId sessionId, long moduleId);
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/child/JacocoChildProcessCoverageReporter.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/child/JacocoChildProcessCoverageReporter.java
index aba4b7b6f57..537cf5ac963 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/child/JacocoChildProcessCoverageReporter.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/child/JacocoChildProcessCoverageReporter.java
@@ -8,20 +8,20 @@
 
 public class JacocoChildProcessCoverageReporter implements ChildProcessCoverageReporter {
 
-  private final Supplier<byte[]> coverageDataSupplier;
+    private final Supplier<byte[]> coverageDataSupplier;
 
-  public JacocoChildProcessCoverageReporter(Supplier<byte[]> coverageDataSupplier) {
-    this.coverageDataSupplier = coverageDataSupplier;
-  }
+    public JacocoChildProcessCoverageReporter(Supplier<byte[]> coverageDataSupplier) {
+        this.coverageDataSupplier = coverageDataSupplier;
+    }
 
-  @Nullable
-  @Override
-  public ModuleSignal createCoverageSignal(DDTraceId sessionId, long moduleId) {
-    byte[] coverageData = coverageDataSupplier.get();
-    if (coverageData != null) {
-      return new ModuleCoverageDataJacoco(sessionId, moduleId, coverageData);
-    } else {
-      return null;
+    @Nullable
+    @Override
+    public ModuleSignal createCoverageSignal(DDTraceId sessionId, long moduleId) {
+        byte[] coverageData = coverageDataSupplier.get();
+        if (coverageData != null) {
+            return new ModuleCoverageDataJacoco(sessionId, moduleId, coverageData);
+        } else {
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecorator.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecorator.java
index 91f3c5e8101..616158f57e7 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecorator.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecorator.java
@@ -3,9 +3,9 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 
 public interface TestDecorator {
-  String TEST_TYPE = "test";
+    String TEST_TYPE = "test";
 
-  AgentSpan afterStart(final AgentSpan span);
+    AgentSpan afterStart(final AgentSpan span);
 
-  CharSequence component();
+    CharSequence component();
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecoratorImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecoratorImpl.java
index 26b278e0587..b798939379f 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecoratorImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecoratorImpl.java
@@ -10,54 +10,52 @@
 
 public class TestDecoratorImpl implements TestDecorator {
 
-  private static final UTF8BytesString CIAPP_TEST_ORIGIN = UTF8BytesString.create("ciapp-test");
-
-  private final String component;
-  private final String sessionName;
-  private final Map<String, String> ciTags;
-  private final int cpuCount;
-
-  public TestDecoratorImpl(
-      String component, String sessionName, String testCommand, Map<String, String> ciTags) {
-    this.component = component;
-    this.ciTags = ciTags;
-    if (Strings.isNotBlank(sessionName)) {
-      this.sessionName = sessionName;
-    } else {
-      String ciJobName = ciTags.get(Tags.CI_JOB_NAME);
-      this.sessionName =
-          Strings.isNotBlank(ciJobName) ? ciJobName + "-" + testCommand : testCommand;
+    private static final UTF8BytesString CIAPP_TEST_ORIGIN = UTF8BytesString.create("ciapp-test");
+
+    private final String component;
+    private final String sessionName;
+    private final Map<String, String> ciTags;
+    private final int cpuCount;
+
+    public TestDecoratorImpl(String component, String sessionName, String testCommand, Map<String, String> ciTags) {
+        this.component = component;
+        this.ciTags = ciTags;
+        if (Strings.isNotBlank(sessionName)) {
+            this.sessionName = sessionName;
+        } else {
+            String ciJobName = ciTags.get(Tags.CI_JOB_NAME);
+            this.sessionName = Strings.isNotBlank(ciJobName) ? ciJobName + "-" + testCommand : testCommand;
+        }
+        cpuCount = Runtime.getRuntime().availableProcessors();
     }
-    cpuCount = Runtime.getRuntime().availableProcessors();
-  }
-
-  protected String testType() {
-    return TEST_TYPE;
-  }
-
-  protected UTF8BytesString origin() {
-    return CIAPP_TEST_ORIGIN;
-  }
-
-  @Override
-  public CharSequence component() {
-    return component;
-  }
-
-  @Override
-  public AgentSpan afterStart(final AgentSpan span) {
-    span.setSamplingPriority(PrioritySampling.SAMPLER_KEEP);
-    span.setTag(DDTags.ORIGIN_KEY, CIAPP_TEST_ORIGIN);
-    span.setTag(DDTags.HOST_VCPU_COUNT, cpuCount);
-    span.setTag(Tags.TEST_TYPE, testType());
-    span.setTag(Tags.COMPONENT, component());
-    span.spanContext().setIntegrationName(component());
-    span.setTag(Tags.TEST_SESSION_NAME, sessionName);
-
-    for (final Map.Entry<String, String> ciTag : ciTags.entrySet()) {
-      span.setTag(ciTag.getKey(), ciTag.getValue());
+
+    protected String testType() {
+        return TEST_TYPE;
+    }
+
+    protected UTF8BytesString origin() {
+        return CIAPP_TEST_ORIGIN;
     }
 
-    return span;
-  }
+    @Override
+    public CharSequence component() {
+        return component;
+    }
+
+    @Override
+    public AgentSpan afterStart(final AgentSpan span) {
+        span.setSamplingPriority(PrioritySampling.SAMPLER_KEEP);
+        span.setTag(DDTags.ORIGIN_KEY, CIAPP_TEST_ORIGIN);
+        span.setTag(DDTags.HOST_VCPU_COUNT, cpuCount);
+        span.setTag(Tags.TEST_TYPE, testType());
+        span.setTag(Tags.COMPONENT, component());
+        span.spanContext().setIntegrationName(component());
+        span.setTag(Tags.TEST_SESSION_NAME, sessionName);
+
+        for (final Map.Entry<String, String> ciTag : ciTags.entrySet()) {
+            span.setTag(ciTag.getKey(), ciTag.getValue());
+        }
+
+        return span;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/diff/Diff.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/diff/Diff.java
index eeaedcb321f..b812799a94a 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/diff/Diff.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/diff/Diff.java
@@ -5,7 +5,7 @@
 
 public interface Diff extends SerializableType {
 
-  PolymorphicSerializer<Diff> SERIALIZER = new PolymorphicSerializer<>(LineDiff.class);
+    PolymorphicSerializer<Diff> SERIALIZER = new PolymorphicSerializer<>(LineDiff.class);
 
-  boolean contains(String relativePath, int startLine, int endLine);
+    boolean contains(String relativePath, int startLine, int endLine);
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/diff/LineDiff.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/diff/LineDiff.java
index 3d08b8be53b..4fe4c2a3aa8 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/diff/LineDiff.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/diff/LineDiff.java
@@ -10,59 +10,59 @@
 /** Diff data with per-line granularity. */
 public class LineDiff implements Diff {
 
-  public static final LineDiff EMPTY = new LineDiff(Collections.emptyMap());
+    public static final LineDiff EMPTY = new LineDiff(Collections.emptyMap());
 
-  private final Map<String, BitSet> linesByRelativePath;
+    private final Map<String, BitSet> linesByRelativePath;
 
-  public LineDiff(Map<String, BitSet> linesByRelativePath) {
-    this.linesByRelativePath = linesByRelativePath;
-  }
-
-  public Map<String, BitSet> getLinesByRelativePath() {
-    return Collections.unmodifiableMap(linesByRelativePath);
-  }
+    public LineDiff(Map<String, BitSet> linesByRelativePath) {
+        this.linesByRelativePath = linesByRelativePath;
+    }
 
-  @Override
-  public boolean contains(String relativePath, int startLine, int endLine) {
-    BitSet lines = linesByRelativePath.get(relativePath);
-    if (lines == null) {
-      return false;
+    public Map<String, BitSet> getLinesByRelativePath() {
+        return Collections.unmodifiableMap(linesByRelativePath);
     }
 
-    int changedLine = lines.nextSetBit(startLine);
-    return changedLine != -1 && changedLine <= endLine;
-  }
+    @Override
+    public boolean contains(String relativePath, int startLine, int endLine) {
+        BitSet lines = linesByRelativePath.get(relativePath);
+        if (lines == null) {
+            return false;
+        }
 
-  @Override
-  public void serialize(Serializer s) {
-    s.write(linesByRelativePath, Serializer::write, Serializer::write);
-  }
+        int changedLine = lines.nextSetBit(startLine);
+        return changedLine != -1 && changedLine <= endLine;
+    }
 
-  public static LineDiff deserialize(ByteBuffer buffer) {
-    Map<String, BitSet> linesByRelativePath =
-        Serializer.readMap(buffer, Serializer::readString, Serializer::readBitSet);
-    return new LineDiff(linesByRelativePath);
-  }
+    @Override
+    public void serialize(Serializer s) {
+        s.write(linesByRelativePath, Serializer::write, Serializer::write);
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public static LineDiff deserialize(ByteBuffer buffer) {
+        Map<String, BitSet> linesByRelativePath =
+                Serializer.readMap(buffer, Serializer::readString, Serializer::readBitSet);
+        return new LineDiff(linesByRelativePath);
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        LineDiff diff = (LineDiff) o;
+        return Objects.equals(linesByRelativePath, diff.linesByRelativePath);
     }
-    LineDiff diff = (LineDiff) o;
-    return Objects.equals(linesByRelativePath, diff.linesByRelativePath);
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hashCode(linesByRelativePath);
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(linesByRelativePath);
+    }
 
-  @Override
-  public String toString() {
-    return "LineDiff{linesByRelativePath=" + linesByRelativePath + '}';
-  }
+    @Override
+    public String toString() {
+        return "LineDiff{linesByRelativePath=" + linesByRelativePath + '}';
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestModule.java
index 9fa24c5be17..17046ab61f8 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestModule.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestModule.java
@@ -22,103 +22,101 @@
 
 public abstract class AbstractTestModule {
 
-  protected final AgentSpan span;
-  protected final String moduleName;
-  protected final Config config;
-  protected final CiVisibilityMetricCollector metricCollector;
-  protected final TestDecorator testDecorator;
-  protected final SourcePathResolver sourcePathResolver;
-  protected final Codeowners codeowners;
-  protected final LinesResolver linesResolver;
-  private final Consumer<AgentSpan> onSpanFinish;
-  protected final SpanTagsPropagator tagsPropagator;
-
-  public AbstractTestModule(
-      AgentSpanContext sessionSpanContext,
-      String moduleName,
-      @Nullable Long startTime,
-      InstrumentationType instrumentationType,
-      Config config,
-      CiVisibilityMetricCollector metricCollector,
-      TestDecorator testDecorator,
-      SourcePathResolver sourcePathResolver,
-      Codeowners codeowners,
-      LinesResolver linesResolver,
-      Consumer<AgentSpan> onSpanFinish) {
-    this.moduleName = moduleName;
-    this.config = config;
-    this.metricCollector = metricCollector;
-    this.testDecorator = testDecorator;
-    this.sourcePathResolver = sourcePathResolver;
-    this.codeowners = codeowners;
-    this.linesResolver = linesResolver;
-    this.onSpanFinish = onSpanFinish;
-
-    AgentTracer.SpanBuilder spanBuilder =
-        AgentTracer.get()
-            .buildSpan(
-                CI_VISIBILITY_INSTRUMENTATION_NAME, testDecorator.component() + ".test_module")
-            .asChildOf(sessionSpanContext);
-
-    if (startTime != null) {
-      spanBuilder = spanBuilder.withStartTimestamp(startTime);
+    protected final AgentSpan span;
+    protected final String moduleName;
+    protected final Config config;
+    protected final CiVisibilityMetricCollector metricCollector;
+    protected final TestDecorator testDecorator;
+    protected final SourcePathResolver sourcePathResolver;
+    protected final Codeowners codeowners;
+    protected final LinesResolver linesResolver;
+    private final Consumer<AgentSpan> onSpanFinish;
+    protected final SpanTagsPropagator tagsPropagator;
+
+    public AbstractTestModule(
+            AgentSpanContext sessionSpanContext,
+            String moduleName,
+            @Nullable Long startTime,
+            InstrumentationType instrumentationType,
+            Config config,
+            CiVisibilityMetricCollector metricCollector,
+            TestDecorator testDecorator,
+            SourcePathResolver sourcePathResolver,
+            Codeowners codeowners,
+            LinesResolver linesResolver,
+            Consumer<AgentSpan> onSpanFinish) {
+        this.moduleName = moduleName;
+        this.config = config;
+        this.metricCollector = metricCollector;
+        this.testDecorator = testDecorator;
+        this.sourcePathResolver = sourcePathResolver;
+        this.codeowners = codeowners;
+        this.linesResolver = linesResolver;
+        this.onSpanFinish = onSpanFinish;
+
+        AgentTracer.SpanBuilder spanBuilder = AgentTracer.get()
+                .buildSpan(CI_VISIBILITY_INSTRUMENTATION_NAME, testDecorator.component() + ".test_module")
+                .asChildOf(sessionSpanContext);
+
+        if (startTime != null) {
+            spanBuilder = spanBuilder.withStartTimestamp(startTime);
+        }
+
+        span = spanBuilder.start();
+        tagsPropagator = new SpanTagsPropagator(span);
+
+        span.setSpanType(InternalSpanTypes.TEST_MODULE_END);
+        span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_TEST_MODULE);
+
+        span.setResourceName(moduleName);
+        span.setTag(Tags.TEST_MODULE, moduleName);
+
+        span.setTag(Tags.TEST_MODULE_ID, span.getSpanId());
+        span.setTag(Tags.TEST_SESSION_ID, span.getTraceId());
+
+        // setting status to skip initially,
+        // as we do not know in advance whether the module will have any children
+        span.setTag(Tags.TEST_STATUS, TestStatus.skip);
+
+        testDecorator.afterStart(span);
+
+        metricCollector.add(CiVisibilityCountMetric.EVENT_CREATED, 1, EventType.MODULE);
+
+        if (instrumentationType == InstrumentationType.MANUAL_API) {
+            metricCollector.add(CiVisibilityCountMetric.MANUAL_API_EVENTS, 1, EventType.MODULE);
+        }
     }
 
-    span = spanBuilder.start();
-    tagsPropagator = new SpanTagsPropagator(span);
-
-    span.setSpanType(InternalSpanTypes.TEST_MODULE_END);
-    span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_TEST_MODULE);
-
-    span.setResourceName(moduleName);
-    span.setTag(Tags.TEST_MODULE, moduleName);
-
-    span.setTag(Tags.TEST_MODULE_ID, span.getSpanId());
-    span.setTag(Tags.TEST_SESSION_ID, span.getTraceId());
-
-    // setting status to skip initially,
-    // as we do not know in advance whether the module will have any children
-    span.setTag(Tags.TEST_STATUS, TestStatus.skip);
-
-    testDecorator.afterStart(span);
-
-    metricCollector.add(CiVisibilityCountMetric.EVENT_CREATED, 1, EventType.MODULE);
+    public void setTag(String key, Object value) {
+        span.setTag(key, value);
+    }
 
-    if (instrumentationType == InstrumentationType.MANUAL_API) {
-      metricCollector.add(CiVisibilityCountMetric.MANUAL_API_EVENTS, 1, EventType.MODULE);
+    public void setErrorInfo(Throwable error) {
+        span.setError(true);
+        span.addThrowable(error);
+        span.setTag(Tags.TEST_STATUS, TestStatus.fail);
     }
-  }
-
-  public void setTag(String key, Object value) {
-    span.setTag(key, value);
-  }
-
-  public void setErrorInfo(Throwable error) {
-    span.setError(true);
-    span.addThrowable(error);
-    span.setTag(Tags.TEST_STATUS, TestStatus.fail);
-  }
-
-  public void setSkipReason(String skipReason) {
-    span.setTag(Tags.TEST_STATUS, TestStatus.skip);
-    if (skipReason != null) {
-      span.setTag(Tags.TEST_SKIP_REASON, skipReason);
+
+    public void setSkipReason(String skipReason) {
+        span.setTag(Tags.TEST_STATUS, TestStatus.skip);
+        if (skipReason != null) {
+            span.setTag(Tags.TEST_SKIP_REASON, skipReason);
+        }
     }
-  }
 
-  public void end(@Nullable Long endTime) {
-    onSpanFinish.accept(span);
+    public void end(@Nullable Long endTime) {
+        onSpanFinish.accept(span);
 
-    if (endTime != null) {
-      span.finish(endTime);
-    } else {
-      span.finish();
-    }
+        if (endTime != null) {
+            span.finish(endTime);
+        } else {
+            span.finish();
+        }
 
-    metricCollector.add(
-        CiVisibilityCountMetric.EVENT_FINISHED,
-        1,
-        EventType.MODULE,
-        span.getTag(Tags.TEST_IS_ANDROID) != null ? IsAndroid.TRUE : null);
-  }
+        metricCollector.add(
+                CiVisibilityCountMetric.EVENT_FINISHED,
+                1,
+                EventType.MODULE,
+                span.getTag(Tags.TEST_IS_ANDROID) != null ? IsAndroid.TRUE : null);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestSession.java
index d5758b74be3..005f890f273 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestSession.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestSession.java
@@ -43,167 +43,157 @@
 
 public abstract class AbstractTestSession {
 
-  protected final Provider ciProvider;
-  protected final InstrumentationType instrumentationType;
-  protected final AgentSpan span;
-  protected final Config config;
-  protected final CiVisibilityMetricCollector metricCollector;
-  protected final TestDecorator testDecorator;
-  protected final SourcePathResolver sourcePathResolver;
-  protected final Codeowners codeowners;
-  protected final LinesResolver linesResolver;
-  protected final SpanTagsPropagator tagPropagator;
-
-  public AbstractTestSession(
-      String projectName,
-      @Nullable Long startTime,
-      InstrumentationType instrumentationType,
-      Provider ciProvider,
-      Config config,
-      CiVisibilityMetricCollector metricCollector,
-      TestDecorator testDecorator,
-      SourcePathResolver sourcePathResolver,
-      Codeowners codeowners,
-      LinesResolver linesResolver) {
-    this.ciProvider = ciProvider;
-    this.instrumentationType = instrumentationType;
-    this.config = config;
-    this.metricCollector = metricCollector;
-    this.testDecorator = testDecorator;
-    this.sourcePathResolver = sourcePathResolver;
-    this.codeowners = codeowners;
-    this.linesResolver = linesResolver;
-
-    // CI Test Cycle protocol requires session's trace ID and span ID to be the same
-    IdGenerationStrategy idGenerationStrategy = config.getIdGenerationStrategy();
-    DDTraceId traceId = idGenerationStrategy.generateTraceId();
-    AgentSpanContext traceContext =
-        new TagContext(
-            CIConstants.CIAPP_TEST_ORIGIN,
-            null,
-            null,
-            null,
-            PrioritySampling.UNSET,
-            null,
-            NONE,
-            traceId);
-
-    AgentTracer.SpanBuilder spanBuilder =
-        AgentTracer.get()
-            .buildSpan(
-                CI_VISIBILITY_INSTRUMENTATION_NAME, testDecorator.component() + ".test_session")
-            .asChildOf(traceContext)
-            .withSpanId(traceId.toLong());
-
-    if (startTime != null) {
-      spanBuilder = spanBuilder.withStartTimestamp(startTime);
+    protected final Provider ciProvider;
+    protected final InstrumentationType instrumentationType;
+    protected final AgentSpan span;
+    protected final Config config;
+    protected final CiVisibilityMetricCollector metricCollector;
+    protected final TestDecorator testDecorator;
+    protected final SourcePathResolver sourcePathResolver;
+    protected final Codeowners codeowners;
+    protected final LinesResolver linesResolver;
+    protected final SpanTagsPropagator tagPropagator;
+
+    public AbstractTestSession(
+            String projectName,
+            @Nullable Long startTime,
+            InstrumentationType instrumentationType,
+            Provider ciProvider,
+            Config config,
+            CiVisibilityMetricCollector metricCollector,
+            TestDecorator testDecorator,
+            SourcePathResolver sourcePathResolver,
+            Codeowners codeowners,
+            LinesResolver linesResolver) {
+        this.ciProvider = ciProvider;
+        this.instrumentationType = instrumentationType;
+        this.config = config;
+        this.metricCollector = metricCollector;
+        this.testDecorator = testDecorator;
+        this.sourcePathResolver = sourcePathResolver;
+        this.codeowners = codeowners;
+        this.linesResolver = linesResolver;
+
+        // CI Test Cycle protocol requires session's trace ID and span ID to be the same
+        IdGenerationStrategy idGenerationStrategy = config.getIdGenerationStrategy();
+        DDTraceId traceId = idGenerationStrategy.generateTraceId();
+        AgentSpanContext traceContext = new TagContext(
+                CIConstants.CIAPP_TEST_ORIGIN, null, null, null, PrioritySampling.UNSET, null, NONE, traceId);
+
+        AgentTracer.SpanBuilder spanBuilder = AgentTracer.get()
+                .buildSpan(CI_VISIBILITY_INSTRUMENTATION_NAME, testDecorator.component() + ".test_session")
+                .asChildOf(traceContext)
+                .withSpanId(traceId.toLong());
+
+        if (startTime != null) {
+            spanBuilder = spanBuilder.withStartTimestamp(startTime);
+        }
+
+        span = spanBuilder.start();
+        tagPropagator = new SpanTagsPropagator(span);
+
+        span.setSpanType(InternalSpanTypes.TEST_SESSION_END);
+        span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_TEST_SESSION);
+        span.setTag(Tags.TEST_SESSION_ID, span.getTraceId());
+
+        // setting status to skip initially,
+        // as we do not know in advance whether the session will have any children
+        span.setTag(Tags.TEST_STATUS, TestStatus.skip);
+
+        span.setResourceName(projectName);
+
+        // The backend requires all session spans to have the test command tag
+        // because it is used for session fingerprint calculation.
+        // We're setting it here to project name as a default that works
+        // reasonably well (although this is not the real command).
+        // In those cases where proper command can be determined,
+        // this tag will be overridden
+        span.setTag(Tags.TEST_COMMAND, projectName);
+
+        testDecorator.afterStart(span);
+
+        metricCollector.add(
+                CiVisibilityCountMetric.EVENT_CREATED,
+                1,
+                EventType.SESSION,
+                instrumentationType == InstrumentationType.HEADLESS ? IsHeadless.TRUE : null,
+                codeowners.exist() ? HasCodeowner.TRUE : null,
+                ciProvider == Provider.UNSUPPORTED ? IsUnsupportedCI.TRUE : null);
+
+        metricCollector.add(
+                CiVisibilityCountMetric.TEST_SESSION,
+                1,
+                ciProvider,
+                config.isCiVisibilityAutoInjected() ? AutoInjected.TRUE : null,
+                config.isAgentlessLogSubmissionEnabled() ? AgentlessLogSubmissionEnabled.TRUE : null,
+                CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(config.getCiVisibilityTestOrder())
+                        ? FailFastTestOrderEnabled.TRUE
+                        : null);
+
+        if (instrumentationType == InstrumentationType.MANUAL_API) {
+            metricCollector.add(CiVisibilityCountMetric.MANUAL_API_EVENTS, 1, EventType.SESSION);
+        }
     }
 
-    span = spanBuilder.start();
-    tagPropagator = new SpanTagsPropagator(span);
-
-    span.setSpanType(InternalSpanTypes.TEST_SESSION_END);
-    span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_TEST_SESSION);
-    span.setTag(Tags.TEST_SESSION_ID, span.getTraceId());
-
-    // setting status to skip initially,
-    // as we do not know in advance whether the session will have any children
-    span.setTag(Tags.TEST_STATUS, TestStatus.skip);
-
-    span.setResourceName(projectName);
-
-    // The backend requires all session spans to have the test command tag
-    // because it is used for session fingerprint calculation.
-    // We're setting it here to project name as a default that works
-    // reasonably well (although this is not the real command).
-    // In those cases where proper command can be determined,
-    // this tag will be overridden
-    span.setTag(Tags.TEST_COMMAND, projectName);
-
-    testDecorator.afterStart(span);
-
-    metricCollector.add(
-        CiVisibilityCountMetric.EVENT_CREATED,
-        1,
-        EventType.SESSION,
-        instrumentationType == InstrumentationType.HEADLESS ? IsHeadless.TRUE : null,
-        codeowners.exist() ? HasCodeowner.TRUE : null,
-        ciProvider == Provider.UNSUPPORTED ? IsUnsupportedCI.TRUE : null);
-
-    metricCollector.add(
-        CiVisibilityCountMetric.TEST_SESSION,
-        1,
-        ciProvider,
-        config.isCiVisibilityAutoInjected() ? AutoInjected.TRUE : null,
-        config.isAgentlessLogSubmissionEnabled() ? AgentlessLogSubmissionEnabled.TRUE : null,
-        CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(config.getCiVisibilityTestOrder())
-            ? FailFastTestOrderEnabled.TRUE
-            : null);
-
-    if (instrumentationType == InstrumentationType.MANUAL_API) {
-      metricCollector.add(CiVisibilityCountMetric.MANUAL_API_EVENTS, 1, EventType.SESSION);
+    public void setTag(String key, Object value) {
+        span.setTag(key, value);
     }
-  }
-
-  public void setTag(String key, Object value) {
-    span.setTag(key, value);
-  }
-
-  public void setErrorInfo(Throwable error) {
-    span.setError(true);
-    span.addThrowable(error);
-    span.setTag(Tags.TEST_STATUS, TestStatus.fail);
-  }
-
-  public void setSkipReason(String skipReason) {
-    span.setTag(Tags.TEST_STATUS, TestStatus.skip);
-    if (skipReason != null) {
-      span.setTag(Tags.TEST_SKIP_REASON, skipReason);
+
+    public void setErrorInfo(Throwable error) {
+        span.setError(true);
+        span.addThrowable(error);
+        span.setTag(Tags.TEST_STATUS, TestStatus.fail);
     }
-  }
 
-  public void end(@Nullable Long endTime) {
-    if (endTime != null) {
-      span.finish(endTime);
-    } else {
-      span.finish();
+    public void setSkipReason(String skipReason) {
+        span.setTag(Tags.TEST_STATUS, TestStatus.skip);
+        if (skipReason != null) {
+            span.setTag(Tags.TEST_SKIP_REASON, skipReason);
+        }
     }
 
-    metricCollector.add(CiVisibilityCountMetric.EVENT_FINISHED, 1, telemetryTags());
+    public void end(@Nullable Long endTime) {
+        if (endTime != null) {
+            span.finish(endTime);
+        } else {
+            span.finish();
+        }
 
-    // flushing written traces synchronously:
-    // as soon as build finish event is processed,
-    // the process can be killed by the CI provider
-    AgentTracer.get().flush();
-  }
+        metricCollector.add(CiVisibilityCountMetric.EVENT_FINISHED, 1, telemetryTags());
 
-  private TagValue[] telemetryTags() {
-    Collection<TagValue> telemetryTags = new ArrayList<>();
-    telemetryTags.add(EventType.SESSION);
-    if (instrumentationType == InstrumentationType.HEADLESS) {
-      telemetryTags.add(IsHeadless.TRUE);
-    }
-    if (codeowners.exist()) {
-      telemetryTags.add(HasCodeowner.TRUE);
-    }
-    if (ciProvider == Provider.UNSUPPORTED) {
-      telemetryTags.add(IsUnsupportedCI.TRUE);
+        // flushing written traces synchronously:
+        // as soon as build finish event is processed,
+        // the process can be killed by the CI provider
+        AgentTracer.get().flush();
     }
-    telemetryTags.addAll(additionalTelemetryTags());
-    return telemetryTags.toArray(new TagValue[0]);
-  }
-
-  protected Collection<TagValue> additionalTelemetryTags() {
-    Set<TagValue> tags = new HashSet<>();
-    if (Constants.EFD_ABORT_REASON_FAULTY.equals(span.getTag(Tags.TEST_EARLY_FLAKE_ABORT_REASON))) {
-      tags.add(EarlyFlakeDetectionAbortReason.FAULTY);
-    }
-    if (span.getTag(DDTags.TEST_HAS_FAILED_TEST_REPLAY) != null) {
-      tags.add(FailedTestReplayEnabled.SessionMetric.TRUE);
+
+    private TagValue[] telemetryTags() {
+        Collection<TagValue> telemetryTags = new ArrayList<>();
+        telemetryTags.add(EventType.SESSION);
+        if (instrumentationType == InstrumentationType.HEADLESS) {
+            telemetryTags.add(IsHeadless.TRUE);
+        }
+        if (codeowners.exist()) {
+            telemetryTags.add(HasCodeowner.TRUE);
+        }
+        if (ciProvider == Provider.UNSUPPORTED) {
+            telemetryTags.add(IsUnsupportedCI.TRUE);
+        }
+        telemetryTags.addAll(additionalTelemetryTags());
+        return telemetryTags.toArray(new TagValue[0]);
     }
-    if (span.getTag(Tags.TEST_IS_ANDROID) != null) {
-      tags.add(IsAndroid.TRUE);
+
+    protected Collection<TagValue> additionalTelemetryTags() {
+        Set<TagValue> tags = new HashSet<>();
+        if (Constants.EFD_ABORT_REASON_FAULTY.equals(span.getTag(Tags.TEST_EARLY_FLAKE_ABORT_REASON))) {
+            tags.add(EarlyFlakeDetectionAbortReason.FAULTY);
+        }
+        if (span.getTag(DDTags.TEST_HAS_FAILED_TEST_REPLAY) != null) {
+            tags.add(FailedTestReplayEnabled.SessionMetric.TRUE);
+        }
+        if (span.getTag(Tags.TEST_IS_ANDROID) != null) {
+            tags.add(IsAndroid.TRUE);
+        }
+        return tags;
     }
-    return tags;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/BuildSystemModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/BuildSystemModule.java
index d5e924088ba..525dca0874c 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/BuildSystemModule.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/BuildSystemModule.java
@@ -6,15 +6,15 @@
 /** Test module abstraction that is used by build system instrumentations (e.g. Maven, Gradle) */
 public interface BuildSystemModule {
 
-  void setTag(String key, Object value);
+    void setTag(String key, Object value);
 
-  void setErrorInfo(Throwable error);
+    void setErrorInfo(Throwable error);
 
-  void setSkipReason(String skipReason);
+    void setSkipReason(String skipReason);
 
-  void end(@Nullable Long endTime);
+    void end(@Nullable Long endTime);
 
-  long getId();
+    long getId();
 
-  BuildModuleSettings getSettings();
+    BuildModuleSettings getSettings();
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/BuildSystemSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/BuildSystemSession.java
index 9766b25998d..ead2470d165 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/BuildSystemSession.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/BuildSystemSession.java
@@ -12,30 +12,26 @@
 /** Test session abstraction that is used by build system instrumentations (e.g. Maven, Gradle) */
 public interface BuildSystemSession {
 
-  void setTag(String key, Object value);
+    void setTag(String key, Object value);
 
-  void setErrorInfo(Throwable error);
+    void setErrorInfo(Throwable error);
 
-  void end(@Nullable Long endTime);
+    void end(@Nullable Long endTime);
 
-  BuildSystemModule testModuleStart(
-      String moduleName,
-      @Nullable Long startTime,
-      BuildModuleLayout moduleLayout,
-      JvmInfo jvmInfo,
-      @Nullable Collection<Path> classpath,
-      @Nullable JavaAgent jacocoAgent);
+    BuildSystemModule testModuleStart(
+            String moduleName,
+            @Nullable Long startTime,
+            BuildModuleLayout moduleLayout,
+            JvmInfo jvmInfo,
+            @Nullable Collection<Path> classpath,
+            @Nullable JavaAgent jacocoAgent);
 
-  AgentSpan testTaskStart(String taskName);
+    AgentSpan testTaskStart(String taskName);
 
-  BuildSessionSettings getSettings();
+    BuildSessionSettings getSettings();
 
-  interface Factory {
-    BuildSystemSession startSession(
-        String projectName,
-        Path projectRoot,
-        String startCommand,
-        String buildSystemName,
-        Long startTime);
-  }
+    interface Factory {
+        BuildSystemSession startSession(
+                String projectName, Path projectRoot, String startCommand, String buildSystemName, Long startTime);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/InstrumentationType.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/InstrumentationType.java
index a42a8e38f40..1ffa8ddc1df 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/InstrumentationType.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/InstrumentationType.java
@@ -3,20 +3,20 @@
 import datadog.trace.api.civisibility.CIVisibility;
 
 public enum InstrumentationType {
-  /**
-   * Both build system and test frameworks are instrumented. Typically, the build system runs in a
-   * parent process, while the tests are executed in child processes.
-   */
-  BUILD,
-  /**
-   * Only test frameworks are instrumented. Build system is NOT instrumented, which means the tracer
-   * is not aware of any parent or sibling processes that may be running as part of the same build.
-   */
-  HEADLESS,
-  /**
-   * Events are created programmatically using <a
-   * href="https://docs.datadoghq.com/tests/setup/java/?tab=cloudciprovideragentless#using-manual-testing-api">CI
-   * Visibility Manual API</a> ({@link CIVisibility})
-   */
-  MANUAL_API
+    /**
+     * Both build system and test frameworks are instrumented. Typically, the build system runs in a
+     * parent process, while the tests are executed in child processes.
+     */
+    BUILD,
+    /**
+     * Only test frameworks are instrumented. Build system is NOT instrumented, which means the tracer
+     * is not aware of any parent or sibling processes that may be running as part of the same build.
+     */
+    HEADLESS,
+    /**
+     * Events are created programmatically using <a
+     * href="https://docs.datadoghq.com/tests/setup/java/?tab=cloudciprovideragentless#using-manual-testing-api">CI
+     * Visibility Manual API</a> ({@link CIVisibility})
+     */
+    MANUAL_API
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/SpanTagsPropagator.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/SpanTagsPropagator.java
index 8002b235356..5854aef94e6 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/SpanTagsPropagator.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/SpanTagsPropagator.java
@@ -15,170 +15,167 @@
 import java.util.function.Consumer;
 
 public class SpanTagsPropagator {
-  public static final Consumer<AgentSpan> NOOP_PROPAGATOR = span -> {};
-
-  private final AgentSpan parentSpan;
-  private final Object tagPropagationLock = new Object();
-
-  public SpanTagsPropagator(AgentSpan parentSpan) {
-    this.parentSpan = parentSpan;
-  }
-
-  public void propagateCiVisibilityTags(AgentSpan childSpan) {
-    mergeTestFrameworks(getFrameworks(childSpan));
-    propagateStatus(childSpan);
-  }
-
-  public void propagateStatus(AgentSpan childSpan) {
-    synchronized (tagPropagationLock) {
-      unsafePropagateStatus(childSpan);
-    }
-  }
-
-  public void mergeTestFrameworks(Collection<TestFramework> testFrameworks) {
-    synchronized (tagPropagationLock) {
-      unsafeMergeTestFrameworks(testFrameworks);
-    }
-  }
-
-  public void propagateTags(AgentSpan childSpan, TagMergeSpec<?>... specs) {
-    synchronized (tagPropagationLock) {
-      for (TagMergeSpec<?> spec : specs) {
-        unsafePropagateTag(childSpan, spec);
-      }
-    }
-  }
-
-  private void unsafeMergeTestFrameworks(Collection<TestFramework> childFrameworks) {
-    Collection<TestFramework> parentFrameworks = getFrameworks(parentSpan);
-    Collection<TestFramework> merged = merge(parentFrameworks, childFrameworks);
-    setFrameworks(merged);
-  }
-
-  static Collection<TestFramework> getFrameworks(AgentSpan span) {
-    Object nameTag = span.getTag(Tags.TEST_FRAMEWORK);
-    Object versionTag = span.getTag(Tags.TEST_FRAMEWORK_VERSION);
-    if (nameTag == null) {
-      return Collections.emptyList();
-    }
-
-    Collection<TestFramework> frameworks = new ArrayList<>();
-    if (nameTag instanceof String) {
-      frameworks.add(new TestFramework((String) nameTag, (String) versionTag));
-
-    } else if (nameTag instanceof Collection) {
-      Iterator<String> names = ((Collection<String>) nameTag).iterator();
-      Iterator<String> versions =
-          versionTag != null ? ((Collection<String>) versionTag).iterator() : null;
-      while (names.hasNext()) {
-        String version = (versions != null && versions.hasNext()) ? versions.next() : null;
-        frameworks.add(new TestFramework(names.next(), version));
-      }
-
-    } else {
-      throw new IllegalArgumentException(
-          "Unexpected tag type(s): "
-              + Tags.TEST_FRAMEWORK
-              + " ("
-              + nameTag
-              + ") "
-              + Tags.TEST_FRAMEWORK_VERSION
-              + " ("
-              + versionTag
-              + ")");
-    }
-    return frameworks;
-  }
-
-  private static Collection<TestFramework> merge(
-      Collection<TestFramework> parentFrameworks, Collection<TestFramework> childFrameworks) {
-    if (parentFrameworks.isEmpty()) {
-      return childFrameworks;
-    }
-    if (childFrameworks.isEmpty()) {
-      return parentFrameworks;
-    }
-    Collection<TestFramework> merged = new TreeSet<>();
-    merged.addAll(parentFrameworks);
-    merged.addAll(childFrameworks);
-    return merged;
-  }
-
-  private void setFrameworks(Collection<TestFramework> frameworks) {
-    if (frameworks.isEmpty()) {
-      return;
-    }
-    if (frameworks.size() == 1) {
-      TestFramework framework = frameworks.iterator().next();
-      Map<String, String> tags = new HashMap<>();
-      tags.put(Tags.TEST_FRAMEWORK, framework.getName());
-      if (framework.getVersion() != null) {
-        tags.put(Tags.TEST_FRAMEWORK_VERSION, framework.getVersion());
-      }
-      parentSpan.setAllTags(tags);
-      return;
-    }
-    Collection<String> names = new ArrayList<>(frameworks.size());
-    Collection<String> versions = new ArrayList<>(frameworks.size());
-    for (TestFramework framework : frameworks) {
-      names.add(framework.getName());
-      versions.add(framework.getVersion());
-    }
-    Map<String, Collection<String>> tags = new HashMap<>();
-    tags.put(Tags.TEST_FRAMEWORK, names);
-    tags.put(Tags.TEST_FRAMEWORK_VERSION, versions);
-    parentSpan.setAllTags(tags);
-  }
-
-  private void unsafePropagateStatus(AgentSpan childSpan) {
-    TestStatus childStatus = (TestStatus) childSpan.getTag(Tags.TEST_STATUS);
-    if (childStatus == null) {
-      return;
-    }
-
-    Boolean childFailureSuppressed = (Boolean) childSpan.getTag(Tags.TEST_FAILURE_SUPPRESSED);
-    TestStatus parentStatus = (TestStatus) parentSpan.getTag(Tags.TEST_STATUS);
-    if (childStatus == TestStatus.pass
-        || (childFailureSuppressed != null && childFailureSuppressed)) {
-      if (parentStatus == null || TestStatus.skip.equals(parentStatus)) {
-        parentSpan.setTag(Tags.TEST_STATUS, TestStatus.pass);
-      }
-    } else if (childStatus == TestStatus.fail) {
-      parentSpan.setTag(Tags.TEST_STATUS, TestStatus.fail);
-    } else if (childStatus == TestStatus.skip) {
-      if (parentStatus == null) {
-        parentSpan.setTag(Tags.TEST_STATUS, TestStatus.skip);
-      }
-    }
-  }
-
-  public static class TagMergeSpec<T> {
-    private final String tagKey;
-    private final BinaryOperator<T> mergeFunction;
-
-    TagMergeSpec(String tagKey, BinaryOperator<T> mergeFunction) {
-      this.tagKey = tagKey;
-      this.mergeFunction = mergeFunction;
-    }
-
-    public static <T> TagMergeSpec<T> of(String key, BinaryOperator<T> mergeFunction) {
-      return new TagMergeSpec<>(key, mergeFunction);
-    }
-
-    public static TagMergeSpec<Object> of(String tagKey) {
-      return new TagMergeSpec<>(tagKey, (parent, child) -> child);
-    }
-  }
-
-  private <T> void unsafePropagateTag(AgentSpan childSpan, TagMergeSpec<T> spec) {
-    T childTag = (T) childSpan.getTag(spec.tagKey);
-    if (childTag != null) {
-      T parentTag = (T) parentSpan.getTag(spec.tagKey);
-      if (parentTag == null) {
-        parentSpan.setTag(spec.tagKey, childTag);
-      } else {
-        parentSpan.setTag(spec.tagKey, spec.mergeFunction.apply(parentTag, childTag));
-      }
+    public static final Consumer<AgentSpan> NOOP_PROPAGATOR = span -> {};
+
+    private final AgentSpan parentSpan;
+    private final Object tagPropagationLock = new Object();
+
+    public SpanTagsPropagator(AgentSpan parentSpan) {
+        this.parentSpan = parentSpan;
+    }
+
+    public void propagateCiVisibilityTags(AgentSpan childSpan) {
+        mergeTestFrameworks(getFrameworks(childSpan));
+        propagateStatus(childSpan);
+    }
+
+    public void propagateStatus(AgentSpan childSpan) {
+        synchronized (tagPropagationLock) {
+            unsafePropagateStatus(childSpan);
+        }
+    }
+
+    public void mergeTestFrameworks(Collection<TestFramework> testFrameworks) {
+        synchronized (tagPropagationLock) {
+            unsafeMergeTestFrameworks(testFrameworks);
+        }
+    }
+
+    public void propagateTags(AgentSpan childSpan, TagMergeSpec<?>... specs) {
+        synchronized (tagPropagationLock) {
+            for (TagMergeSpec<?> spec : specs) {
+                unsafePropagateTag(childSpan, spec);
+            }
+        }
+    }
+
+    private void unsafeMergeTestFrameworks(Collection<TestFramework> childFrameworks) {
+        Collection<TestFramework> parentFrameworks = getFrameworks(parentSpan);
+        Collection<TestFramework> merged = merge(parentFrameworks, childFrameworks);
+        setFrameworks(merged);
+    }
+
+    static Collection<TestFramework> getFrameworks(AgentSpan span) {
+        Object nameTag = span.getTag(Tags.TEST_FRAMEWORK);
+        Object versionTag = span.getTag(Tags.TEST_FRAMEWORK_VERSION);
+        if (nameTag == null) {
+            return Collections.emptyList();
+        }
+
+        Collection<TestFramework> frameworks = new ArrayList<>();
+        if (nameTag instanceof String) {
+            frameworks.add(new TestFramework((String) nameTag, (String) versionTag));
+
+        } else if (nameTag instanceof Collection) {
+            Iterator<String> names = ((Collection<String>) nameTag).iterator();
+            Iterator<String> versions = versionTag != null ? ((Collection<String>) versionTag).iterator() : null;
+            while (names.hasNext()) {
+                String version = (versions != null && versions.hasNext()) ? versions.next() : null;
+                frameworks.add(new TestFramework(names.next(), version));
+            }
+
+        } else {
+            throw new IllegalArgumentException("Unexpected tag type(s): "
+                    + Tags.TEST_FRAMEWORK
+                    + " ("
+                    + nameTag
+                    + ") "
+                    + Tags.TEST_FRAMEWORK_VERSION
+                    + " ("
+                    + versionTag
+                    + ")");
+        }
+        return frameworks;
+    }
+
+    private static Collection<TestFramework> merge(
+            Collection<TestFramework> parentFrameworks, Collection<TestFramework> childFrameworks) {
+        if (parentFrameworks.isEmpty()) {
+            return childFrameworks;
+        }
+        if (childFrameworks.isEmpty()) {
+            return parentFrameworks;
+        }
+        Collection<TestFramework> merged = new TreeSet<>();
+        merged.addAll(parentFrameworks);
+        merged.addAll(childFrameworks);
+        return merged;
+    }
+
+    private void setFrameworks(Collection<TestFramework> frameworks) {
+        if (frameworks.isEmpty()) {
+            return;
+        }
+        if (frameworks.size() == 1) {
+            TestFramework framework = frameworks.iterator().next();
+            Map<String, String> tags = new HashMap<>();
+            tags.put(Tags.TEST_FRAMEWORK, framework.getName());
+            if (framework.getVersion() != null) {
+                tags.put(Tags.TEST_FRAMEWORK_VERSION, framework.getVersion());
+            }
+            parentSpan.setAllTags(tags);
+            return;
+        }
+        Collection<String> names = new ArrayList<>(frameworks.size());
+        Collection<String> versions = new ArrayList<>(frameworks.size());
+        for (TestFramework framework : frameworks) {
+            names.add(framework.getName());
+            versions.add(framework.getVersion());
+        }
+        Map<String, Collection<String>> tags = new HashMap<>();
+        tags.put(Tags.TEST_FRAMEWORK, names);
+        tags.put(Tags.TEST_FRAMEWORK_VERSION, versions);
+        parentSpan.setAllTags(tags);
+    }
+
+    private void unsafePropagateStatus(AgentSpan childSpan) {
+        TestStatus childStatus = (TestStatus) childSpan.getTag(Tags.TEST_STATUS);
+        if (childStatus == null) {
+            return;
+        }
+
+        Boolean childFailureSuppressed = (Boolean) childSpan.getTag(Tags.TEST_FAILURE_SUPPRESSED);
+        TestStatus parentStatus = (TestStatus) parentSpan.getTag(Tags.TEST_STATUS);
+        if (childStatus == TestStatus.pass || (childFailureSuppressed != null && childFailureSuppressed)) {
+            if (parentStatus == null || TestStatus.skip.equals(parentStatus)) {
+                parentSpan.setTag(Tags.TEST_STATUS, TestStatus.pass);
+            }
+        } else if (childStatus == TestStatus.fail) {
+            parentSpan.setTag(Tags.TEST_STATUS, TestStatus.fail);
+        } else if (childStatus == TestStatus.skip) {
+            if (parentStatus == null) {
+                parentSpan.setTag(Tags.TEST_STATUS, TestStatus.skip);
+            }
+        }
+    }
+
+    public static class TagMergeSpec<T> {
+        private final String tagKey;
+        private final BinaryOperator<T> mergeFunction;
+
+        TagMergeSpec(String tagKey, BinaryOperator<T> mergeFunction) {
+            this.tagKey = tagKey;
+            this.mergeFunction = mergeFunction;
+        }
+
+        public static <T> TagMergeSpec<T> of(String key, BinaryOperator<T> mergeFunction) {
+            return new TagMergeSpec<>(key, mergeFunction);
+        }
+
+        public static TagMergeSpec<Object> of(String tagKey) {
+            return new TagMergeSpec<>(tagKey, (parent, child) -> child);
+        }
+    }
+
+    private <T> void unsafePropagateTag(AgentSpan childSpan, TagMergeSpec<T> spec) {
+        T childTag = (T) childSpan.getTag(spec.tagKey);
+        if (childTag != null) {
+            T parentTag = (T) parentSpan.getTag(spec.tagKey);
+            if (parentTag == null) {
+                parentSpan.setTag(spec.tagKey, childTag);
+            } else {
+                parentSpan.setTag(spec.tagKey, spec.mergeFunction.apply(parentTag, childTag));
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestContextImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestContextImpl.java
index 91477cf9a5f..e021463a131 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestContextImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestContextImpl.java
@@ -6,46 +6,46 @@
 
 public class TestContextImpl implements TestContext {
 
-  private final CoverageStore coverageStore;
-  private final CopyOnWriteArrayList<Entry> entries = new CopyOnWriteArrayList<>();
-
-  public TestContextImpl(CoverageStore coverageStore) {
-    this.coverageStore = coverageStore;
-  }
-
-  @Override
-  public CoverageStore getCoverageStore() {
-    return this.coverageStore;
-  }
-
-  @Override
-  public <T> void set(Class<T> key, T value) {
-    for (Entry entry : entries) {
-      if (entry.key == key) {
-        entry.value = value;
-        return;
-      }
+    private final CoverageStore coverageStore;
+    private final CopyOnWriteArrayList<Entry> entries = new CopyOnWriteArrayList<>();
+
+    public TestContextImpl(CoverageStore coverageStore) {
+        this.coverageStore = coverageStore;
+    }
+
+    @Override
+    public CoverageStore getCoverageStore() {
+        return this.coverageStore;
     }
-    entries.addIfAbsent(new Entry(key, value));
-  }
-
-  @Override
-  public <T> T get(Class<T> key) {
-    for (Entry entry : entries) {
-      if (entry.key == key) {
-        return key.cast(entry.value);
-      }
+
+    @Override
+    public <T> void set(Class<T> key, T value) {
+        for (Entry entry : entries) {
+            if (entry.key == key) {
+                entry.value = value;
+                return;
+            }
+        }
+        entries.addIfAbsent(new Entry(key, value));
+    }
+
+    @Override
+    public <T> T get(Class<T> key) {
+        for (Entry entry : entries) {
+            if (entry.key == key) {
+                return key.cast(entry.value);
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  private static final class Entry {
-    private final Class<?> key;
-    private volatile Object value;
+    private static final class Entry {
+        private final Class<?> key;
+        private volatile Object value;
 
-    private Entry(Class<?> key, Object value) {
-      this.key = key;
-      this.value = value;
+        private Entry(Class<?> key, Object value) {
+            this.key = key;
+            this.value = value;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkModule.java
index b25f7145862..ad2135c1719 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkModule.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkModule.java
@@ -11,49 +11,48 @@
 
 /** Test module abstraction that is used by test framework instrumentations (e.g. JUnit, TestNG) */
 public interface TestFrameworkModule {
-  TestSuiteImpl testSuiteStart(
-      String testSuiteName,
-      @Nullable Class<?> testClass,
-      @Nullable Long startTime,
-      boolean parallelized,
-      TestFrameworkInstrumentation instrumentation);
-
-  /**
-   * Checks if a given test is "new" or not. A test is considered "new" if the backend has no
-   * information about it.
-   *
-   * @param test Test to be checked
-   * @return {@code true} if the test is new, {@code false} if it is an existing test <b>or if the
-   *     list of known tests is not available</b>.
-   */
-  boolean isNew(@Nonnull TestIdentifier test);
-
-  boolean isModified(@Nonnull TestSourceData testSourceData);
-
-  boolean isQuarantined(TestIdentifier test);
-
-  boolean isDisabled(TestIdentifier test);
-
-  boolean isAttemptToFix(TestIdentifier test);
-
-  /**
-   * Returns the reason for skipping a test, IF it can be skipped.
-   *
-   * @param test Test to be checked
-   * @return skip reason, or {@code null} if the test cannot be skipped
-   */
-  @Nullable
-  SkipReason skipReason(TestIdentifier test);
-
-  @Nonnull
-  TestExecutionPolicy executionPolicy(
-      TestIdentifier test, TestSourceData testSource, Collection<String> testTags);
-
-  /**
-   * Returns the priority of the test execution that can be used for ordering tests. The higher the
-   * value, the higher the priority, meaning that the test should be executed earlier.
-   */
-  int executionPriority(@Nullable TestIdentifier test, @Nonnull TestSourceData testSource);
-
-  void end(Long startTime);
+    TestSuiteImpl testSuiteStart(
+            String testSuiteName,
+            @Nullable Class<?> testClass,
+            @Nullable Long startTime,
+            boolean parallelized,
+            TestFrameworkInstrumentation instrumentation);
+
+    /**
+     * Checks if a given test is "new" or not. A test is considered "new" if the backend has no
+     * information about it.
+     *
+     * @param test Test to be checked
+     * @return {@code true} if the test is new, {@code false} if it is an existing test <b>or if the
+     *     list of known tests is not available</b>.
+     */
+    boolean isNew(@Nonnull TestIdentifier test);
+
+    boolean isModified(@Nonnull TestSourceData testSourceData);
+
+    boolean isQuarantined(TestIdentifier test);
+
+    boolean isDisabled(TestIdentifier test);
+
+    boolean isAttemptToFix(TestIdentifier test);
+
+    /**
+     * Returns the reason for skipping a test, IF it can be skipped.
+     *
+     * @param test Test to be checked
+     * @return skip reason, or {@code null} if the test cannot be skipped
+     */
+    @Nullable
+    SkipReason skipReason(TestIdentifier test);
+
+    @Nonnull
+    TestExecutionPolicy executionPolicy(TestIdentifier test, TestSourceData testSource, Collection<String> testTags);
+
+    /**
+     * Returns the priority of the test execution that can be used for ordering tests. The higher the
+     * value, the higher the priority, meaning that the test should be executed earlier.
+     */
+    int executionPriority(@Nullable TestIdentifier test, @Nonnull TestSourceData testSource);
+
+    void end(Long startTime);
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkSession.java
index c7391f945b6..576221f23ed 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkSession.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkSession.java
@@ -6,15 +6,12 @@
 
 /** Test session abstraction that is used by test framework instrumentations (e.g. JUnit, TestNG) */
 public interface TestFrameworkSession {
-  void end(Long startTime);
+    void end(Long startTime);
 
-  TestFrameworkModule testModuleStart(String moduleName, @Nullable Long startTime);
+    TestFrameworkModule testModuleStart(String moduleName, @Nullable Long startTime);
 
-  interface Factory {
-    TestFrameworkSession startSession(
-        String projectName,
-        String component,
-        Long startTime,
-        Collection<LibraryCapability> capabilities);
-  }
+    interface Factory {
+        TestFrameworkSession startSession(
+                String projectName, String component, Long startTime, Collection<LibraryCapability> capabilities);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java
index e8f4aaf9f69..66b9c5c2baf 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java
@@ -57,303 +57,298 @@
 
 public class TestImpl implements DDTest {
 
-  private static final Logger log = LoggerFactory.getLogger(TestImpl.class);
-
-  private final CiVisibilityMetricCollector metricCollector;
-  private final ExecutionResults executionResults;
-  private final TestFrameworkInstrumentation instrumentation;
-  private final AgentSpan span;
-  private final DDTraceId sessionId;
-  private final long suiteId;
-  private final Consumer<AgentSpan> onSpanFinish;
-  private final TestContext context;
-  private final TestIdentifier identifier;
-  private final long startMicros;
-
-  public TestImpl(
-      AgentSpanContext moduleSpanContext,
-      long suiteId,
-      String moduleName,
-      String testSuiteName,
-      String testName,
-      @Nullable String testParameters,
-      @Nullable String itrCorrelationId,
-      boolean testSkippingEnabled,
-      @Nullable Long startTime,
-      @Nullable Class<?> testClass,
-      @Nullable Method testMethod,
-      InstrumentationType instrumentationType,
-      TestFrameworkInstrumentation instrumentation,
-      Config config,
-      CiVisibilityMetricCollector metricCollector,
-      TestDecorator testDecorator,
-      SourcePathResolver sourcePathResolver,
-      LinesResolver linesResolver,
-      Codeowners codeowners,
-      CoverageStore.Factory coverageStoreFactory,
-      ExecutionResults executionResults,
-      @Nonnull ConfigurationErrors configurationErrors,
-      @Nonnull Collection<LibraryCapability> capabilities,
-      Consumer<AgentSpan> onSpanFinish) {
-    this.instrumentation = instrumentation;
-    this.metricCollector = metricCollector;
-    this.sessionId = moduleSpanContext.getTraceId();
-    this.suiteId = suiteId;
-    this.executionResults = executionResults;
-    this.onSpanFinish = onSpanFinish;
-
-    this.identifier = new TestIdentifier(testSuiteName, testName, testParameters);
-    CoverageStore coverageStore = coverageStoreFactory.create(identifier);
-    CoveragePerTestBridge.setThreadLocalCoverageProbes(coverageStore.getProbes());
-
-    this.context = new TestContextImpl(coverageStore);
-
-    AgentSpanContext traceContext = new TagContext(CIConstants.CIAPP_TEST_ORIGIN, null);
-    AgentTracer.SpanBuilder spanBuilder =
-        AgentTracer.get()
-            .buildSpan(CI_VISIBILITY_INSTRUMENTATION_NAME, testDecorator.component() + ".test")
-            .ignoreActiveSpan()
-            .asChildOf(traceContext)
-            .withRequestContextData(RequestContextSlot.CI_VISIBILITY, context);
-
-    if (startTime != null) {
-      startMicros = startTime;
-      spanBuilder = spanBuilder.withStartTimestamp(startTime);
-    } else {
-      startMicros = SystemTimeSource.INSTANCE.getCurrentTimeMicros();
+    private static final Logger log = LoggerFactory.getLogger(TestImpl.class);
+
+    private final CiVisibilityMetricCollector metricCollector;
+    private final ExecutionResults executionResults;
+    private final TestFrameworkInstrumentation instrumentation;
+    private final AgentSpan span;
+    private final DDTraceId sessionId;
+    private final long suiteId;
+    private final Consumer<AgentSpan> onSpanFinish;
+    private final TestContext context;
+    private final TestIdentifier identifier;
+    private final long startMicros;
+
+    public TestImpl(
+            AgentSpanContext moduleSpanContext,
+            long suiteId,
+            String moduleName,
+            String testSuiteName,
+            String testName,
+            @Nullable String testParameters,
+            @Nullable String itrCorrelationId,
+            boolean testSkippingEnabled,
+            @Nullable Long startTime,
+            @Nullable Class<?> testClass,
+            @Nullable Method testMethod,
+            InstrumentationType instrumentationType,
+            TestFrameworkInstrumentation instrumentation,
+            Config config,
+            CiVisibilityMetricCollector metricCollector,
+            TestDecorator testDecorator,
+            SourcePathResolver sourcePathResolver,
+            LinesResolver linesResolver,
+            Codeowners codeowners,
+            CoverageStore.Factory coverageStoreFactory,
+            ExecutionResults executionResults,
+            @Nonnull ConfigurationErrors configurationErrors,
+            @Nonnull Collection<LibraryCapability> capabilities,
+            Consumer<AgentSpan> onSpanFinish) {
+        this.instrumentation = instrumentation;
+        this.metricCollector = metricCollector;
+        this.sessionId = moduleSpanContext.getTraceId();
+        this.suiteId = suiteId;
+        this.executionResults = executionResults;
+        this.onSpanFinish = onSpanFinish;
+
+        this.identifier = new TestIdentifier(testSuiteName, testName, testParameters);
+        CoverageStore coverageStore = coverageStoreFactory.create(identifier);
+        CoveragePerTestBridge.setThreadLocalCoverageProbes(coverageStore.getProbes());
+
+        this.context = new TestContextImpl(coverageStore);
+
+        AgentSpanContext traceContext = new TagContext(CIConstants.CIAPP_TEST_ORIGIN, null);
+        AgentTracer.SpanBuilder spanBuilder = AgentTracer.get()
+                .buildSpan(CI_VISIBILITY_INSTRUMENTATION_NAME, testDecorator.component() + ".test")
+                .ignoreActiveSpan()
+                .asChildOf(traceContext)
+                .withRequestContextData(RequestContextSlot.CI_VISIBILITY, context);
+
+        if (startTime != null) {
+            startMicros = startTime;
+            spanBuilder = spanBuilder.withStartTimestamp(startTime);
+        } else {
+            startMicros = SystemTimeSource.INSTANCE.getCurrentTimeMicros();
+        }
+
+        span = spanBuilder.start();
+
+        activateSpanWithoutScope(span);
+
+        span.setSpanType(InternalSpanTypes.TEST);
+        span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_TEST);
+
+        span.setResourceName(testSuiteName + "." + testName);
+        span.setTag(Tags.TEST_NAME, testName);
+        span.setTag(Tags.TEST_SUITE, testSuiteName);
+        span.setTag(Tags.TEST_MODULE, moduleName);
+
+        span.setTag(Tags.TEST_SUITE_ID, suiteId);
+        span.setTag(Tags.TEST_MODULE_ID, moduleSpanContext.getSpanId());
+        span.setTag(Tags.TEST_SESSION_ID, moduleSpanContext.getTraceId());
+
+        span.setTag(Tags.TEST_STATUS, TestStatus.pass);
+
+        if (testClass != null && !testClass.getName().equals(testSuiteName)) {
+            span.setTag(Tags.TEST_SOURCE_CLASS, testClass.getName());
+        }
+
+        if (config.isCiVisibilitySourceDataEnabled()) {
+            populateSourceDataTags(span, testClass, testMethod, sourcePathResolver, linesResolver, codeowners);
+        }
+
+        if (itrCorrelationId != null) {
+            span.setTag(Tags.ITR_CORRELATION_ID, itrCorrelationId);
+        }
+
+        for (LibraryCapability capability : capabilities) {
+            span.setTag(capability.asTag(), capability.getVersion());
+        }
+
+        testDecorator.afterStart(span);
+
+        if (testSkippingEnabled) {
+            span.setTag(Tags.TEST_ITR_TESTS_SKIPPING_ENABLED, true);
+        }
+
+        configurationErrors.applyTags(span);
+
+        metricCollector.add(CiVisibilityCountMetric.EVENT_CREATED, 1, instrumentation, EventType.TEST);
+
+        if (instrumentationType == InstrumentationType.MANUAL_API) {
+            metricCollector.add(CiVisibilityCountMetric.MANUAL_API_EVENTS, 1, EventType.TEST);
+        }
     }
 
-    span = spanBuilder.start();
-
-    activateSpanWithoutScope(span);
-
-    span.setSpanType(InternalSpanTypes.TEST);
-    span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_TEST);
-
-    span.setResourceName(testSuiteName + "." + testName);
-    span.setTag(Tags.TEST_NAME, testName);
-    span.setTag(Tags.TEST_SUITE, testSuiteName);
-    span.setTag(Tags.TEST_MODULE, moduleName);
-
-    span.setTag(Tags.TEST_SUITE_ID, suiteId);
-    span.setTag(Tags.TEST_MODULE_ID, moduleSpanContext.getSpanId());
-    span.setTag(Tags.TEST_SESSION_ID, moduleSpanContext.getTraceId());
-
-    span.setTag(Tags.TEST_STATUS, TestStatus.pass);
-
-    if (testClass != null && !testClass.getName().equals(testSuiteName)) {
-      span.setTag(Tags.TEST_SOURCE_CLASS, testClass.getName());
-    }
-
-    if (config.isCiVisibilitySourceDataEnabled()) {
-      populateSourceDataTags(
-          span, testClass, testMethod, sourcePathResolver, linesResolver, codeowners);
+    private void populateSourceDataTags(
+            AgentSpan span,
+            Class<?> testClass,
+            Method testMethod,
+            SourcePathResolver sourcePathResolver,
+            LinesResolver linesResolver,
+            Codeowners codeowners) {
+        if (testClass == null) {
+            return;
+        }
+
+        Collection<String> sourcePaths = sourcePathResolver.getSourcePaths(testClass);
+        if (sourcePaths.size() != 1) {
+            log.debug("Could not populate source path for {}", testClass);
+            return;
+        }
+
+        String sourcePath = sourcePaths.iterator().next();
+        span.setTag(Tags.TEST_SOURCE_FILE, sourcePath);
+
+        if (testMethod != null) {
+            LinesResolver.Lines testMethodLines = linesResolver.getMethodLines(testMethod);
+            if (testMethodLines.isValid()) {
+                span.setTag(Tags.TEST_SOURCE_START, testMethodLines.getStartLineNumber());
+                span.setTag(Tags.TEST_SOURCE_END, testMethodLines.getEndLineNumber());
+            }
+        }
+
+        Collection<String> testCodeOwners = codeowners.getOwners(sourcePath);
+        if (testCodeOwners != null) {
+            span.setTag(Tags.TEST_CODEOWNERS, toJson(testCodeOwners));
+        }
     }
 
-    if (itrCorrelationId != null) {
-      span.setTag(Tags.ITR_CORRELATION_ID, itrCorrelationId);
+    @Nonnull
+    public TestIdentifier getIdentifier() {
+        return identifier;
     }
 
-    for (LibraryCapability capability : capabilities) {
-      span.setTag(capability.asTag(), capability.getVersion());
+    @Override
+    public void setTag(String key, Object value) {
+        span.setTag(key, value);
     }
 
-    testDecorator.afterStart(span);
-
-    if (testSkippingEnabled) {
-      span.setTag(Tags.TEST_ITR_TESTS_SKIPPING_ENABLED, true);
+    @Override
+    public void setErrorInfo(Throwable error) {
+        span.setError(true);
+        span.addThrowable(error);
+        span.setTag(Tags.TEST_STATUS, TestStatus.fail);
     }
 
-    configurationErrors.applyTags(span);
-
-    metricCollector.add(CiVisibilityCountMetric.EVENT_CREATED, 1, instrumentation, EventType.TEST);
-
-    if (instrumentationType == InstrumentationType.MANUAL_API) {
-      metricCollector.add(CiVisibilityCountMetric.MANUAL_API_EVENTS, 1, EventType.TEST);
-    }
-  }
-
-  private void populateSourceDataTags(
-      AgentSpan span,
-      Class<?> testClass,
-      Method testMethod,
-      SourcePathResolver sourcePathResolver,
-      LinesResolver linesResolver,
-      Codeowners codeowners) {
-    if (testClass == null) {
-      return;
+    @Override
+    public void setSkipReason(String skipReason) {
+        span.setTag(Tags.TEST_STATUS, TestStatus.skip);
+        if (skipReason != null) {
+            span.setTag(Tags.TEST_SKIP_REASON, skipReason);
+
+            if (skipReason.equals(SkipReason.ITR.getDescription())) {
+                span.setTag(Tags.TEST_SKIPPED_BY_ITR, true);
+                metricCollector.add(CiVisibilityCountMetric.ITR_SKIPPED, 1, EventType.TEST);
+                executionResults.incrementTestsSkippedByItr();
+            }
+        }
     }
 
-    Collection<String> sourcePaths = sourcePathResolver.getSourcePaths(testClass);
-    if (sourcePaths.size() != 1) {
-      log.debug("Could not populate source path for {}", testClass);
-      return;
+    public TestStatus getStatus() {
+        return (TestStatus) span.getTag(Tags.TEST_STATUS);
     }
 
-    String sourcePath = sourcePaths.iterator().next();
-    span.setTag(Tags.TEST_SOURCE_FILE, sourcePath);
-
-    if (testMethod != null) {
-      LinesResolver.Lines testMethodLines = linesResolver.getMethodLines(testMethod);
-      if (testMethodLines.isValid()) {
-        span.setTag(Tags.TEST_SOURCE_START, testMethodLines.getStartLineNumber());
-        span.setTag(Tags.TEST_SOURCE_END, testMethodLines.getEndLineNumber());
-      }
+    public long getDuration(@Nullable Long endMicros) {
+        if (endMicros == null) {
+            endMicros = SystemTimeSource.INSTANCE.getCurrentTimeMicros();
+        }
+        return TimeUnit.MICROSECONDS.toMillis(endMicros - startMicros);
     }
 
-    Collection<String> testCodeOwners = codeowners.getOwners(sourcePath);
-    if (testCodeOwners != null) {
-      span.setTag(Tags.TEST_CODEOWNERS, toJson(testCodeOwners));
-    }
-  }
-
-  @Nonnull
-  public TestIdentifier getIdentifier() {
-    return identifier;
-  }
-
-  @Override
-  public void setTag(String key, Object value) {
-    span.setTag(key, value);
-  }
-
-  @Override
-  public void setErrorInfo(Throwable error) {
-    span.setError(true);
-    span.addThrowable(error);
-    span.setTag(Tags.TEST_STATUS, TestStatus.fail);
-  }
-
-  @Override
-  public void setSkipReason(String skipReason) {
-    span.setTag(Tags.TEST_STATUS, TestStatus.skip);
-    if (skipReason != null) {
-      span.setTag(Tags.TEST_SKIP_REASON, skipReason);
-
-      if (skipReason.equals(SkipReason.ITR.getDescription())) {
-        span.setTag(Tags.TEST_SKIPPED_BY_ITR, true);
-        metricCollector.add(CiVisibilityCountMetric.ITR_SKIPPED, 1, EventType.TEST);
-        executionResults.incrementTestsSkippedByItr();
-      }
+    public TestContext getContext() {
+        return context;
     }
-  }
-
-  public TestStatus getStatus() {
-    return (TestStatus) span.getTag(Tags.TEST_STATUS);
-  }
-
-  public long getDuration(@Nullable Long endMicros) {
-    if (endMicros == null) {
-      endMicros = SystemTimeSource.INSTANCE.getCurrentTimeMicros();
-    }
-    return TimeUnit.MICROSECONDS.toMillis(endMicros - startMicros);
-  }
-
-  public TestContext getContext() {
-    return context;
-  }
-
-  @Override
-  public void end(@Nullable Long endTime) {
-    closeOutstandingSpans();
-
-    final AgentSpan activeSpan = AgentTracer.activeSpan();
-    if (activeSpan == null) {
-      throw new IllegalStateException(
-          "No active span present, it is possible that end() was called multiple times");
-    }
-
-    if (activeSpan != this.span) {
-      throw new IllegalStateException(
-          "Active span does not correspond to the finished test, "
-              + "it is possible that end() was called multiple times "
-              + "or an operation that was started by the test is still in progress; "
-              + "active span is: "
-              + activeSpan
-              + "; "
-              + "expected span is: "
-              + this.span);
-    }
-
-    InstrumentationTestBridge.fireBeforeTestEnd(context);
-
-    CoveragePerTestBridge.removeThreadLocalCoverageProbes();
-
-    // do not process coverage reports for skipped tests
-    if (span.getTag(Tags.TEST_STATUS) != TestStatus.skip) {
-      CoverageStore coverageStore = context.getCoverageStore();
-      boolean coveragesGathered = coverageStore.report(sessionId, suiteId, span.getSpanId());
-      if (!coveragesGathered && !TestStatus.skip.equals(span.getTag(Tags.TEST_STATUS))) {
-        // test is not skipped, but no coverages were gathered
-        metricCollector.add(CiVisibilityCountMetric.CODE_COVERAGE_IS_EMPTY, 1);
-      }
-    }
-
-    boolean debugInfoCaptured = span.getTag(Tags.ERROR_DEBUG_INFO_CAPTURED) != null;
-    if (debugInfoCaptured) {
-      executionResults.setHasFailedTestReplayTests();
-    }
-
-    AgentTracer.closeActive();
-
-    onSpanFinish.accept(span);
 
-    if (endTime != null) {
-      span.finish(endTime);
-    } else {
-      span.finish();
+    @Override
+    public void end(@Nullable Long endTime) {
+        closeOutstandingSpans();
+
+        final AgentSpan activeSpan = AgentTracer.activeSpan();
+        if (activeSpan == null) {
+            throw new IllegalStateException(
+                    "No active span present, it is possible that end() was called multiple times");
+        }
+
+        if (activeSpan != this.span) {
+            throw new IllegalStateException("Active span does not correspond to the finished test, "
+                    + "it is possible that end() was called multiple times "
+                    + "or an operation that was started by the test is still in progress; "
+                    + "active span is: "
+                    + activeSpan
+                    + "; "
+                    + "expected span is: "
+                    + this.span);
+        }
+
+        InstrumentationTestBridge.fireBeforeTestEnd(context);
+
+        CoveragePerTestBridge.removeThreadLocalCoverageProbes();
+
+        // do not process coverage reports for skipped tests
+        if (span.getTag(Tags.TEST_STATUS) != TestStatus.skip) {
+            CoverageStore coverageStore = context.getCoverageStore();
+            boolean coveragesGathered = coverageStore.report(sessionId, suiteId, span.getSpanId());
+            if (!coveragesGathered && !TestStatus.skip.equals(span.getTag(Tags.TEST_STATUS))) {
+                // test is not skipped, but no coverages were gathered
+                metricCollector.add(CiVisibilityCountMetric.CODE_COVERAGE_IS_EMPTY, 1);
+            }
+        }
+
+        boolean debugInfoCaptured = span.getTag(Tags.ERROR_DEBUG_INFO_CAPTURED) != null;
+        if (debugInfoCaptured) {
+            executionResults.setHasFailedTestReplayTests();
+        }
+
+        AgentTracer.closeActive();
+
+        onSpanFinish.accept(span);
+
+        if (endTime != null) {
+            span.finish(endTime);
+        } else {
+            span.finish();
+        }
+
+        Object retryReason = span.getTag(Tags.TEST_RETRY_REASON);
+        metricCollector.add(
+                CiVisibilityCountMetric.TEST_EVENT_FINISHED,
+                1,
+                instrumentation,
+                EventType.TEST,
+                span.getTag(Tags.TEST_IS_NEW) != null ? IsNew.TRUE : null,
+                span.getTag(Tags.TEST_IS_MODIFIED) != null ? IsModified.TRUE : null,
+                span.getTag(Tags.TEST_TEST_MANAGEMENT_IS_QUARANTINED) != null ? IsQuarantined.TRUE : null,
+                span.getTag(Tags.TEST_TEST_MANAGEMENT_IS_TEST_DISABLED) != null ? IsDisabled.TRUE : null,
+                span.getTag(Tags.TEST_TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX) != null ? IsAttemptToFix.TRUE : null,
+                span.getTag(Tags.TEST_IS_RETRY) != null ? IsRetry.TRUE : null,
+                span.getTag(Tags.TEST_HAS_FAILED_ALL_RETRIES) != null ? HasFailedAllRetries.TRUE : null,
+                retryReason instanceof TagValue ? (TagValue) retryReason : null,
+                debugInfoCaptured ? FailedTestReplayEnabled.TestMetric.TRUE : null,
+                span.getTag(Tags.TEST_IS_RUM_ACTIVE) != null ? IsRum.TRUE : null,
+                CIConstants.SELENIUM_BROWSER_DRIVER.equals(span.getTag(Tags.TEST_BROWSER_DRIVER))
+                        ? BrowserDriver.SELENIUM
+                        : null,
+                span.getTag(Tags.TEST_ANDROID_API_LEVEL) != null ? IsAndroidEmulated.TRUE : null);
     }
 
-    Object retryReason = span.getTag(Tags.TEST_RETRY_REASON);
-    metricCollector.add(
-        CiVisibilityCountMetric.TEST_EVENT_FINISHED,
-        1,
-        instrumentation,
-        EventType.TEST,
-        span.getTag(Tags.TEST_IS_NEW) != null ? IsNew.TRUE : null,
-        span.getTag(Tags.TEST_IS_MODIFIED) != null ? IsModified.TRUE : null,
-        span.getTag(Tags.TEST_TEST_MANAGEMENT_IS_QUARANTINED) != null ? IsQuarantined.TRUE : null,
-        span.getTag(Tags.TEST_TEST_MANAGEMENT_IS_TEST_DISABLED) != null ? IsDisabled.TRUE : null,
-        span.getTag(Tags.TEST_TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX) != null
-            ? IsAttemptToFix.TRUE
-            : null,
-        span.getTag(Tags.TEST_IS_RETRY) != null ? IsRetry.TRUE : null,
-        span.getTag(Tags.TEST_HAS_FAILED_ALL_RETRIES) != null ? HasFailedAllRetries.TRUE : null,
-        retryReason instanceof TagValue ? (TagValue) retryReason : null,
-        debugInfoCaptured ? FailedTestReplayEnabled.TestMetric.TRUE : null,
-        span.getTag(Tags.TEST_IS_RUM_ACTIVE) != null ? IsRum.TRUE : null,
-        CIConstants.SELENIUM_BROWSER_DRIVER.equals(span.getTag(Tags.TEST_BROWSER_DRIVER))
-            ? BrowserDriver.SELENIUM
-            : null,
-        span.getTag(Tags.TEST_ANDROID_API_LEVEL) != null ? IsAndroidEmulated.TRUE : null);
-  }
-
-  /**
-   * Tests often perform operations that involve APM instrumentations: sending an HTTP request,
-   * executing a database query, etc. APM instrumentations create spans that correspond to those
-   * operations. Ideally, the instrumentations close these spans once their corresponding operations
-   * are finished.
-   *
-   * <p>However, this is not always the case, especially with tests: developers sometimes feel like
-   * proper resources disposal, such as closing a connection, is not obligatory in tests code. Not
-   * finalizing an operation properly usually results in its span remaining open. This is something
-   * that we have no control over, since this happens in the clients' codebase.
-   *
-   * <p>This method attempts to finalize such "dangling" spans: it closes whatever is on top of the
-   * spans stack until it encounters a CI Visibility span or the stack is empty.
-   */
-  private void closeOutstandingSpans() {
-    AgentSpan activeSpan;
-    while ((activeSpan = AgentTracer.activeSpan()) != null) {
-
-      if (activeSpan == this.span || activeSpan.getTag(Tags.TEST_SESSION_ID) != null) {
-        // encountered this span or another CI Visibility span (test, suite, module, session)
-        break;
-      }
-
-      log.debug("Closing outstanding span: {}", activeSpan);
-      AgentTracer.closeActive();
-      activeSpan.finish();
+    /**
+     * Tests often perform operations that involve APM instrumentations: sending an HTTP request,
+     * executing a database query, etc. APM instrumentations create spans that correspond to those
+     * operations. Ideally, the instrumentations close these spans once their corresponding operations
+     * are finished.
+     *
+     * <p>However, this is not always the case, especially with tests: developers sometimes feel like
+     * proper resources disposal, such as closing a connection, is not obligatory in tests code. Not
+     * finalizing an operation properly usually results in its span remaining open. This is something
+     * that we have no control over, since this happens in the clients' codebase.
+     *
+     * <p>This method attempts to finalize such "dangling" spans: it closes whatever is on top of the
+     * spans stack until it encounters a CI Visibility span or the stack is empty.
+     */
+    private void closeOutstandingSpans() {
+        AgentSpan activeSpan;
+        while ((activeSpan = AgentTracer.activeSpan()) != null) {
+
+            if (activeSpan == this.span || activeSpan.getTag(Tags.TEST_SESSION_ID) != null) {
+                // encountered this span or another CI Visibility span (test, suite, module, session)
+                break;
+            }
+
+            log.debug("Closing outstanding span: {}", activeSpan);
+            AgentTracer.closeActive();
+            activeSpan.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java
index 3c4a6dc4242..b8148d7bb18 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java
@@ -34,247 +34,236 @@
 
 public class TestSuiteImpl implements DDTestSuite {
 
-  private static final Logger log = LoggerFactory.getLogger(TestSuiteImpl.class);
-
-  private final AgentSpanContext moduleSpanContext;
-  private final AgentSpan span;
-  private final String moduleName;
-  private final String testSuiteName;
-  private final String itrCorrelationId;
-  private final boolean testSkippingEnabled;
-  private final Class<?> testClass;
-  private final InstrumentationType instrumentationType;
-  private final TestFrameworkInstrumentation instrumentation;
-  private final Config config;
-  private final CiVisibilityMetricCollector metricCollector;
-  private final TestDecorator testDecorator;
-  private final SourcePathResolver sourcePathResolver;
-  private final Codeowners codeowners;
-  private final LinesResolver linesResolver;
-  private final CoverageStore.Factory coverageStoreFactory;
-  private final ExecutionResults executionResults;
-  private final boolean parallelized;
-  private final ConfigurationErrors configurationErrors;
-  private final Collection<LibraryCapability> capabilities;
-  private final Consumer<AgentSpan> onSpanFinish;
-  private final SpanTagsPropagator tagsPropagator;
-
-  public TestSuiteImpl(
-      AgentSpanContext moduleSpanContext,
-      String moduleName,
-      String testSuiteName,
-      String itrCorrelationId,
-      boolean testSkippingEnabled,
-      @Nullable Class<?> testClass,
-      @Nullable Long startTime,
-      boolean parallelized,
-      InstrumentationType instrumentationType,
-      TestFrameworkInstrumentation instrumentation,
-      Config config,
-      CiVisibilityMetricCollector metricCollector,
-      TestDecorator testDecorator,
-      SourcePathResolver sourcePathResolver,
-      Codeowners codeowners,
-      LinesResolver linesResolver,
-      CoverageStore.Factory coverageStoreFactory,
-      ExecutionResults executionResults,
-      @Nonnull ConfigurationErrors configurationErrors,
-      @Nonnull Collection<LibraryCapability> capabilities,
-      Consumer<AgentSpan> onSpanFinish) {
-    this.moduleSpanContext = moduleSpanContext;
-    this.moduleName = moduleName;
-    this.testSuiteName = testSuiteName;
-    this.itrCorrelationId = itrCorrelationId;
-    this.testSkippingEnabled = testSkippingEnabled;
-    this.parallelized = parallelized;
-    this.instrumentationType = instrumentationType;
-    this.instrumentation = instrumentation;
-    this.config = config;
-    this.metricCollector = metricCollector;
-    this.testDecorator = testDecorator;
-    this.sourcePathResolver = sourcePathResolver;
-    this.codeowners = codeowners;
-    this.linesResolver = linesResolver;
-    this.coverageStoreFactory = coverageStoreFactory;
-    this.executionResults = executionResults;
-    this.configurationErrors = configurationErrors;
-    this.capabilities = capabilities;
-    this.onSpanFinish = onSpanFinish;
-
-    AgentTracer.SpanBuilder spanBuilder =
-        AgentTracer.get()
-            .buildSpan(
-                CI_VISIBILITY_INSTRUMENTATION_NAME, testDecorator.component() + ".test_suite")
-            .asChildOf(moduleSpanContext);
-
-    if (startTime != null) {
-      spanBuilder = spanBuilder.withStartTimestamp(startTime);
+    private static final Logger log = LoggerFactory.getLogger(TestSuiteImpl.class);
+
+    private final AgentSpanContext moduleSpanContext;
+    private final AgentSpan span;
+    private final String moduleName;
+    private final String testSuiteName;
+    private final String itrCorrelationId;
+    private final boolean testSkippingEnabled;
+    private final Class<?> testClass;
+    private final InstrumentationType instrumentationType;
+    private final TestFrameworkInstrumentation instrumentation;
+    private final Config config;
+    private final CiVisibilityMetricCollector metricCollector;
+    private final TestDecorator testDecorator;
+    private final SourcePathResolver sourcePathResolver;
+    private final Codeowners codeowners;
+    private final LinesResolver linesResolver;
+    private final CoverageStore.Factory coverageStoreFactory;
+    private final ExecutionResults executionResults;
+    private final boolean parallelized;
+    private final ConfigurationErrors configurationErrors;
+    private final Collection<LibraryCapability> capabilities;
+    private final Consumer<AgentSpan> onSpanFinish;
+    private final SpanTagsPropagator tagsPropagator;
+
+    public TestSuiteImpl(
+            AgentSpanContext moduleSpanContext,
+            String moduleName,
+            String testSuiteName,
+            String itrCorrelationId,
+            boolean testSkippingEnabled,
+            @Nullable Class<?> testClass,
+            @Nullable Long startTime,
+            boolean parallelized,
+            InstrumentationType instrumentationType,
+            TestFrameworkInstrumentation instrumentation,
+            Config config,
+            CiVisibilityMetricCollector metricCollector,
+            TestDecorator testDecorator,
+            SourcePathResolver sourcePathResolver,
+            Codeowners codeowners,
+            LinesResolver linesResolver,
+            CoverageStore.Factory coverageStoreFactory,
+            ExecutionResults executionResults,
+            @Nonnull ConfigurationErrors configurationErrors,
+            @Nonnull Collection<LibraryCapability> capabilities,
+            Consumer<AgentSpan> onSpanFinish) {
+        this.moduleSpanContext = moduleSpanContext;
+        this.moduleName = moduleName;
+        this.testSuiteName = testSuiteName;
+        this.itrCorrelationId = itrCorrelationId;
+        this.testSkippingEnabled = testSkippingEnabled;
+        this.parallelized = parallelized;
+        this.instrumentationType = instrumentationType;
+        this.instrumentation = instrumentation;
+        this.config = config;
+        this.metricCollector = metricCollector;
+        this.testDecorator = testDecorator;
+        this.sourcePathResolver = sourcePathResolver;
+        this.codeowners = codeowners;
+        this.linesResolver = linesResolver;
+        this.coverageStoreFactory = coverageStoreFactory;
+        this.executionResults = executionResults;
+        this.configurationErrors = configurationErrors;
+        this.capabilities = capabilities;
+        this.onSpanFinish = onSpanFinish;
+
+        AgentTracer.SpanBuilder spanBuilder = AgentTracer.get()
+                .buildSpan(CI_VISIBILITY_INSTRUMENTATION_NAME, testDecorator.component() + ".test_suite")
+                .asChildOf(moduleSpanContext);
+
+        if (startTime != null) {
+            spanBuilder = spanBuilder.withStartTimestamp(startTime);
+        }
+
+        span = spanBuilder.start();
+        tagsPropagator = new SpanTagsPropagator(span);
+
+        span.setSpanType(InternalSpanTypes.TEST_SUITE_END);
+        span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_TEST_SUITE);
+
+        span.setResourceName(testSuiteName);
+        span.setTag(Tags.TEST_SUITE, testSuiteName);
+        span.setTag(Tags.TEST_MODULE, moduleName);
+
+        span.setTag(Tags.TEST_SUITE_ID, span.getSpanId());
+        span.setTag(Tags.TEST_MODULE_ID, moduleSpanContext.getSpanId());
+        span.setTag(Tags.TEST_SESSION_ID, moduleSpanContext.getTraceId());
+
+        // setting status to skip initially,
+        // as we do not know in advance whether the suite will have any children
+        span.setTag(Tags.TEST_STATUS, TestStatus.skip);
+
+        this.testClass = testClass;
+
+        if (config.isCiVisibilitySourceDataEnabled()) {
+            populateSourceDataTags(span, testClass, sourcePathResolver, codeowners);
+        }
+
+        testDecorator.afterStart(span);
+
+        if (testSkippingEnabled) {
+            span.setTag(Tags.TEST_ITR_TESTS_SKIPPING_ENABLED, true);
+        }
+
+        configurationErrors.applyTags(span);
+
+        if (!parallelized) {
+            activateSpanWithoutScope(span);
+        }
+
+        metricCollector.add(CiVisibilityCountMetric.EVENT_CREATED, 1, instrumentation, EventType.SUITE);
+
+        if (instrumentationType == InstrumentationType.MANUAL_API) {
+            metricCollector.add(CiVisibilityCountMetric.MANUAL_API_EVENTS, 1, EventType.SUITE);
+        }
     }
 
-    span = spanBuilder.start();
-    tagsPropagator = new SpanTagsPropagator(span);
-
-    span.setSpanType(InternalSpanTypes.TEST_SUITE_END);
-    span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_TEST_SUITE);
-
-    span.setResourceName(testSuiteName);
-    span.setTag(Tags.TEST_SUITE, testSuiteName);
-    span.setTag(Tags.TEST_MODULE, moduleName);
-
-    span.setTag(Tags.TEST_SUITE_ID, span.getSpanId());
-    span.setTag(Tags.TEST_MODULE_ID, moduleSpanContext.getSpanId());
-    span.setTag(Tags.TEST_SESSION_ID, moduleSpanContext.getTraceId());
-
-    // setting status to skip initially,
-    // as we do not know in advance whether the suite will have any children
-    span.setTag(Tags.TEST_STATUS, TestStatus.skip);
-
-    this.testClass = testClass;
-
-    if (config.isCiVisibilitySourceDataEnabled()) {
-      populateSourceDataTags(span, testClass, sourcePathResolver, codeowners);
+    private void populateSourceDataTags(
+            AgentSpan span, Class<?> testClass, SourcePathResolver sourcePathResolver, Codeowners codeowners) {
+        if (testClass == null) {
+            return;
+        }
+
+        Collection<String> sourcePaths = sourcePathResolver.getSourcePaths(testClass);
+        if (sourcePaths.size() != 1) {
+            log.debug("Could not populate source path for {}", testClass);
+            return;
+        }
+
+        String sourcePath = sourcePaths.iterator().next();
+        span.setTag(Tags.TEST_SOURCE_FILE, sourcePath);
+
+        LinesResolver.Lines testClassLines = linesResolver.getClassLines(testClass);
+        if (testClassLines.isValid()) {
+            span.setTag(Tags.TEST_SOURCE_START, testClassLines.getStartLineNumber());
+            span.setTag(Tags.TEST_SOURCE_END, testClassLines.getEndLineNumber());
+        }
+
+        Collection<String> testCodeOwners = codeowners.getOwners(sourcePath);
+        if (testCodeOwners != null) {
+            span.setTag(Tags.TEST_CODEOWNERS, toJson(testCodeOwners));
+        }
     }
 
-    testDecorator.afterStart(span);
-
-    if (testSkippingEnabled) {
-      span.setTag(Tags.TEST_ITR_TESTS_SKIPPING_ENABLED, true);
+    @Override
+    public void setTag(String key, Object value) {
+        span.setTag(key, value);
     }
 
-    configurationErrors.applyTags(span);
-
-    if (!parallelized) {
-      activateSpanWithoutScope(span);
+    @Override
+    public void setErrorInfo(Throwable error) {
+        span.setError(true);
+        span.addThrowable(error);
+        span.setTag(Tags.TEST_STATUS, TestStatus.fail);
     }
 
-    metricCollector.add(CiVisibilityCountMetric.EVENT_CREATED, 1, instrumentation, EventType.SUITE);
-
-    if (instrumentationType == InstrumentationType.MANUAL_API) {
-      metricCollector.add(CiVisibilityCountMetric.MANUAL_API_EVENTS, 1, EventType.SUITE);
+    @Override
+    public void setSkipReason(String skipReason) {
+        span.setTag(Tags.TEST_STATUS, TestStatus.skip);
+        if (skipReason != null) {
+            span.setTag(Tags.TEST_SKIP_REASON, skipReason);
+        }
     }
-  }
-
-  private void populateSourceDataTags(
-      AgentSpan span,
-      Class<?> testClass,
-      SourcePathResolver sourcePathResolver,
-      Codeowners codeowners) {
-    if (testClass == null) {
-      return;
-    }
-
-    Collection<String> sourcePaths = sourcePathResolver.getSourcePaths(testClass);
-    if (sourcePaths.size() != 1) {
-      log.debug("Could not populate source path for {}", testClass);
-      return;
-    }
-
-    String sourcePath = sourcePaths.iterator().next();
-    span.setTag(Tags.TEST_SOURCE_FILE, sourcePath);
 
-    LinesResolver.Lines testClassLines = linesResolver.getClassLines(testClass);
-    if (testClassLines.isValid()) {
-      span.setTag(Tags.TEST_SOURCE_START, testClassLines.getStartLineNumber());
-      span.setTag(Tags.TEST_SOURCE_END, testClassLines.getEndLineNumber());
+    @Override
+    public void end(@Nullable Long endTime) {
+        if (!parallelized) {
+            final AgentSpan activeSpan = AgentTracer.activeSpan();
+            if (activeSpan == null) {
+                throw new IllegalStateException(
+                        "No active span present, it is possible that end() was called multiple times");
+            }
+
+            if (activeSpan != this.span) {
+                throw new IllegalStateException("Active span does not correspond to the finished suite, "
+                        + "it is possible that end() was called multiple times "
+                        + "or an operation that was started by the suite is still in progress; "
+                        + "active span is: "
+                        + activeSpan
+                        + "; "
+                        + "expected span is: "
+                        + this.span);
+            }
+
+            AgentTracer.closeActive();
+        }
+
+        onSpanFinish.accept(span);
+
+        if (endTime != null) {
+            span.finish(endTime);
+        } else {
+            span.finish();
+        }
+
+        metricCollector.add(CiVisibilityCountMetric.EVENT_FINISHED, 1, instrumentation, EventType.SUITE);
     }
 
-    Collection<String> testCodeOwners = codeowners.getOwners(sourcePath);
-    if (testCodeOwners != null) {
-      span.setTag(Tags.TEST_CODEOWNERS, toJson(testCodeOwners));
-    }
-  }
-
-  @Override
-  public void setTag(String key, Object value) {
-    span.setTag(key, value);
-  }
-
-  @Override
-  public void setErrorInfo(Throwable error) {
-    span.setError(true);
-    span.addThrowable(error);
-    span.setTag(Tags.TEST_STATUS, TestStatus.fail);
-  }
-
-  @Override
-  public void setSkipReason(String skipReason) {
-    span.setTag(Tags.TEST_STATUS, TestStatus.skip);
-    if (skipReason != null) {
-      span.setTag(Tags.TEST_SKIP_REASON, skipReason);
-    }
-  }
-
-  @Override
-  public void end(@Nullable Long endTime) {
-    if (!parallelized) {
-      final AgentSpan activeSpan = AgentTracer.activeSpan();
-      if (activeSpan == null) {
-        throw new IllegalStateException(
-            "No active span present, it is possible that end() was called multiple times");
-      }
-
-      if (activeSpan != this.span) {
-        throw new IllegalStateException(
-            "Active span does not correspond to the finished suite, "
-                + "it is possible that end() was called multiple times "
-                + "or an operation that was started by the suite is still in progress; "
-                + "active span is: "
-                + activeSpan
-                + "; "
-                + "expected span is: "
-                + this.span);
-      }
-
-      AgentTracer.closeActive();
+    @Override
+    public TestImpl testStart(String testName, @Nullable Method testMethod, @Nullable Long startTime) {
+        return testStart(testName, null, testMethod, startTime);
     }
 
-    onSpanFinish.accept(span);
-
-    if (endTime != null) {
-      span.finish(endTime);
-    } else {
-      span.finish();
+    public TestImpl testStart(
+            String testName, @Nullable String testParameters, @Nullable Method testMethod, @Nullable Long startTime) {
+        return new TestImpl(
+                moduleSpanContext,
+                span.getSpanId(),
+                moduleName,
+                testSuiteName,
+                testName,
+                testParameters,
+                itrCorrelationId,
+                testSkippingEnabled,
+                startTime,
+                testClass,
+                testMethod,
+                instrumentationType,
+                instrumentation,
+                config,
+                metricCollector,
+                testDecorator,
+                sourcePathResolver,
+                linesResolver,
+                codeowners,
+                coverageStoreFactory,
+                executionResults,
+                configurationErrors,
+                capabilities,
+                tagsPropagator::propagateStatus);
     }
-
-    metricCollector.add(
-        CiVisibilityCountMetric.EVENT_FINISHED, 1, instrumentation, EventType.SUITE);
-  }
-
-  @Override
-  public TestImpl testStart(
-      String testName, @Nullable Method testMethod, @Nullable Long startTime) {
-    return testStart(testName, null, testMethod, startTime);
-  }
-
-  public TestImpl testStart(
-      String testName,
-      @Nullable String testParameters,
-      @Nullable Method testMethod,
-      @Nullable Long startTime) {
-    return new TestImpl(
-        moduleSpanContext,
-        span.getSpanId(),
-        moduleName,
-        testSuiteName,
-        testName,
-        testParameters,
-        itrCorrelationId,
-        testSkippingEnabled,
-        startTime,
-        testClass,
-        testMethod,
-        instrumentationType,
-        instrumentation,
-        config,
-        metricCollector,
-        testDecorator,
-        sourcePathResolver,
-        linesResolver,
-        codeowners,
-        coverageStoreFactory,
-        executionResults,
-        configurationErrors,
-        capabilities,
-        tagsPropagator::propagateStatus);
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java
index 48915cdb479..48ec25bee19 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java
@@ -45,60 +45,55 @@
 
 public class BuildSystemModuleImpl extends AbstractTestModule implements BuildSystemModule {
 
-  private final CoverageProcessor coverageProcessor;
-  private final ModuleSignalRouter moduleSignalRouter;
-  private final BuildModuleSettings settings;
-
-  private final LongAdder testsSkipped = new LongAdder();
-
-  private volatile boolean testSkippingEnabled;
-
-  public <T extends CoverageProcessor> BuildSystemModuleImpl(
-      AgentSpanContext sessionSpanContext,
-      String moduleName,
-      String startCommand,
-      @Nullable Long startTime,
-      InetSocketAddress signalServerAddress,
-      BuildModuleLayout moduleLayout,
-      @Nullable Collection<Path> classpath,
-      @Nullable JavaAgent jacocoAgent,
-      Config config,
-      CiVisibilityMetricCollector metricCollector,
-      TestDecorator testDecorator,
-      SourcePathResolver sourcePathResolver,
-      Codeowners codeowners,
-      LinesResolver linesResolver,
-      ModuleSignalRouter moduleSignalRouter,
-      CoverageProcessor.Factory<T> coverageProcessorFactory,
-      T sessionCoverageCalculator,
-      ExecutionSettings executionSettings,
-      BuildSessionSettings sessionSettings,
-      Consumer<AgentSpan> onSpanFinish) {
-    super(
-        sessionSpanContext,
-        moduleName,
-        startTime,
-        InstrumentationType.BUILD,
-        config,
-        metricCollector,
-        testDecorator,
-        sourcePathResolver,
-        codeowners,
-        linesResolver,
-        onSpanFinish);
-    this.coverageProcessor =
-        coverageProcessorFactory.moduleCoverage(
-            span.getSpanId(), moduleLayout, executionSettings, sessionCoverageCalculator);
-    this.moduleSignalRouter = moduleSignalRouter;
-
-    moduleSignalRouter.registerModuleHandler(
-        span.getSpanId(),
-        SignalType.MODULE_EXECUTION_RESULT,
-        this::onModuleExecutionResultReceived);
-
-    settings =
-        new BuildModuleSettings(
-            getPropertiesPropagatedToChildProcess(
+    private final CoverageProcessor coverageProcessor;
+    private final ModuleSignalRouter moduleSignalRouter;
+    private final BuildModuleSettings settings;
+
+    private final LongAdder testsSkipped = new LongAdder();
+
+    private volatile boolean testSkippingEnabled;
+
+    public <T extends CoverageProcessor> BuildSystemModuleImpl(
+            AgentSpanContext sessionSpanContext,
+            String moduleName,
+            String startCommand,
+            @Nullable Long startTime,
+            InetSocketAddress signalServerAddress,
+            BuildModuleLayout moduleLayout,
+            @Nullable Collection<Path> classpath,
+            @Nullable JavaAgent jacocoAgent,
+            Config config,
+            CiVisibilityMetricCollector metricCollector,
+            TestDecorator testDecorator,
+            SourcePathResolver sourcePathResolver,
+            Codeowners codeowners,
+            LinesResolver linesResolver,
+            ModuleSignalRouter moduleSignalRouter,
+            CoverageProcessor.Factory<T> coverageProcessorFactory,
+            T sessionCoverageCalculator,
+            ExecutionSettings executionSettings,
+            BuildSessionSettings sessionSettings,
+            Consumer<AgentSpan> onSpanFinish) {
+        super(
+                sessionSpanContext,
+                moduleName,
+                startTime,
+                InstrumentationType.BUILD,
+                config,
+                metricCollector,
+                testDecorator,
+                sourcePathResolver,
+                codeowners,
+                linesResolver,
+                onSpanFinish);
+        this.coverageProcessor = coverageProcessorFactory.moduleCoverage(
+                span.getSpanId(), moduleLayout, executionSettings, sessionCoverageCalculator);
+        this.moduleSignalRouter = moduleSignalRouter;
+
+        moduleSignalRouter.registerModuleHandler(
+                span.getSpanId(), SignalType.MODULE_EXECUTION_RESULT, this::onModuleExecutionResultReceived);
+
+        settings = new BuildModuleSettings(getPropertiesPropagatedToChildProcess(
                 config.getServiceName(),
                 config.isServiceNameSetByUser(),
                 moduleName,
@@ -109,215 +104,207 @@ public <T extends CoverageProcessor> BuildSystemModuleImpl(
                 executionSettings,
                 sessionSettings));
 
-    setTag(Tags.TEST_COMMAND, startCommand);
+        setTag(Tags.TEST_COMMAND, startCommand);
 
-    executionSettings.getConfigurationErrors().applyTags(span);
-  }
+        executionSettings.getConfigurationErrors().applyTags(span);
+    }
 
-  @ParametersAreNonnullByDefault
-  private static final class ChildProcessPropertiesPropagationSetter
-      implements CarrierSetter<Map<String, String>> {
-    static final CarrierSetter<Map<String, String>> INSTANCE =
-        new ChildProcessPropertiesPropagationSetter();
+    @ParametersAreNonnullByDefault
+    private static final class ChildProcessPropertiesPropagationSetter implements CarrierSetter<Map<String, String>> {
+        static final CarrierSetter<Map<String, String>> INSTANCE = new ChildProcessPropertiesPropagationSetter();
 
-    private ChildProcessPropertiesPropagationSetter() {}
+        private ChildProcessPropertiesPropagationSetter() {}
 
-    @Override
-    public void set(Map<String, String> carrier, String key, String value) {
-      carrier.put(key, value);
-    }
-  }
-
-  private Map<String, String> getPropertiesPropagatedToChildProcess(
-      String serviceName,
-      boolean userProvidedServiceName,
-      String moduleName,
-      String startCommand,
-      @Nullable Collection<Path> classpath,
-      @Nullable JavaAgent jacocoAgent,
-      InetSocketAddress signalServerAddress,
-      ExecutionSettings executionSettings,
-      BuildSessionSettings sessionSettings) {
-    Map<String, String> propagatedSystemProperties = new HashMap<>();
-    for (Map.Entry<String, String> p : SystemProperties.asStringMap().entrySet()) {
-      String propertyName = p.getKey();
-      String propertyValue = p.getValue();
-      if ((propertyName.startsWith(Config.PREFIX)
-              || propertyName.startsWith("datadog.slf4j.simpleLogger.defaultLogLevel"))
-          && propertyValue != null) {
-        propagatedSystemProperties.put(propertyName, propertyValue);
-      }
+        @Override
+        public void set(Map<String, String> carrier, String key, String value) {
+            carrier.put(key, value);
+        }
     }
 
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_ITR_ENABLED),
-        Boolean.toString(executionSettings.isItrEnabled()));
-
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_CODE_COVERAGE_ENABLED),
-        Boolean.toString(executionSettings.isCodeCoverageEnabled()));
-
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_TEST_SKIPPING_ENABLED),
-        Boolean.toString(executionSettings.isTestSkippingEnabled()));
-
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_FLAKY_RETRY_ENABLED),
-        Boolean.toString(executionSettings.isFlakyTestRetriesEnabled()));
-
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(
-            CiVisibilityConfig.CIVISIBILITY_IMPACTED_TESTS_DETECTION_ENABLED),
-        Boolean.toString(executionSettings.isImpactedTestsDetectionEnabled()));
-
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(
-            CiVisibilityConfig.CIVISIBILITY_EARLY_FLAKE_DETECTION_ENABLED),
-        Boolean.toString(executionSettings.getEarlyFlakeDetectionSettings().isEnabled()));
-
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(CiVisibilityConfig.TEST_MANAGEMENT_ENABLED),
-        Boolean.toString(executionSettings.getTestManagementSettings().isEnabled()));
-
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(CiVisibilityConfig.TEST_FAILED_TEST_REPLAY_ENABLED),
-        Boolean.toString(executionSettings.isFailedTestReplayEnabled()));
-
-    // explicitly disable build instrumentation in child processes,
-    // because some projects run "embedded" Maven/Gradle builds as part of their integration tests,
-    // and we don't want to show those as if they were regular build executions
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(
-            CiVisibilityConfig.CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED),
-        Boolean.toString(false));
-
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_INJECTED_TRACER_VERSION),
-        TracerVersion.TRACER_VERSION);
-
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(GeneralConfig.SERVICE_NAME), serviceName);
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(GeneralConfig.SERVICE_NAME_SET_BY_USER),
-        String.valueOf(userProvidedServiceName));
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_MODULE_NAME), moduleName);
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_TEST_COMMAND),
-        startCommand);
-
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_HOST),
-        signalServerAddress != null ? signalServerAddress.getHostName() : null);
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_PORT),
-        String.valueOf(signalServerAddress != null ? signalServerAddress.getPort() : 0));
-
-    List<String> coverageIncludedPackages = sessionSettings.getCoverageIncludedPackages();
-    propagatedSystemProperties.put(
-        propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_CODE_COVERAGE_INCLUDES),
-        String.join(":", coverageIncludedPackages));
-
-    if (jacocoAgent != null && !config.isCiVisibilityCoverageLinesDisabled()) {
-      // If the module is using Jacoco,
-      // per-test code coverage needs to have line-level granularity
-      // (as opposed to default file-level granularity).
-      // Line coverage data is needed to back-fill coverage for tests skipped by ITR
-      // in order to calculate accurate coverage percentage.
-      // This setting is only relevant if per-test code coverage is enabled,
-      // otherwise it has no effect.
-      propagatedSystemProperties.put(
-          propertyNameToSystemPropertyName(
-              CiVisibilityConfig.CIVISIBILITY_CODE_COVERAGE_LINES_ENABLED),
-          Boolean.toString(true));
+    private Map<String, String> getPropertiesPropagatedToChildProcess(
+            String serviceName,
+            boolean userProvidedServiceName,
+            String moduleName,
+            String startCommand,
+            @Nullable Collection<Path> classpath,
+            @Nullable JavaAgent jacocoAgent,
+            InetSocketAddress signalServerAddress,
+            ExecutionSettings executionSettings,
+            BuildSessionSettings sessionSettings) {
+        Map<String, String> propagatedSystemProperties = new HashMap<>();
+        for (Map.Entry<String, String> p : SystemProperties.asStringMap().entrySet()) {
+            String propertyName = p.getKey();
+            String propertyValue = p.getValue();
+            if ((propertyName.startsWith(Config.PREFIX)
+                            || propertyName.startsWith("datadog.slf4j.simpleLogger.defaultLogLevel"))
+                    && propertyValue != null) {
+                propagatedSystemProperties.put(propertyName, propertyValue);
+            }
+        }
+
+        propagatedSystemProperties.put(
+                propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_ITR_ENABLED),
+                Boolean.toString(executionSettings.isItrEnabled()));
+
+        propagatedSystemProperties.put(
+                propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_CODE_COVERAGE_ENABLED),
+                Boolean.toString(executionSettings.isCodeCoverageEnabled()));
+
+        propagatedSystemProperties.put(
+                propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_TEST_SKIPPING_ENABLED),
+                Boolean.toString(executionSettings.isTestSkippingEnabled()));
+
+        propagatedSystemProperties.put(
+                propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_FLAKY_RETRY_ENABLED),
+                Boolean.toString(executionSettings.isFlakyTestRetriesEnabled()));
+
+        propagatedSystemProperties.put(
+                propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_IMPACTED_TESTS_DETECTION_ENABLED),
+                Boolean.toString(executionSettings.isImpactedTestsDetectionEnabled()));
+
+        propagatedSystemProperties.put(
+                propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_EARLY_FLAKE_DETECTION_ENABLED),
+                Boolean.toString(
+                        executionSettings.getEarlyFlakeDetectionSettings().isEnabled()));
+
+        propagatedSystemProperties.put(
+                propertyNameToSystemPropertyName(CiVisibilityConfig.TEST_MANAGEMENT_ENABLED),
+                Boolean.toString(executionSettings.getTestManagementSettings().isEnabled()));
+
+        propagatedSystemProperties.put(
+                propertyNameToSystemPropertyName(CiVisibilityConfig.TEST_FAILED_TEST_REPLAY_ENABLED),
+                Boolean.toString(executionSettings.isFailedTestReplayEnabled()));
+
+        // explicitly disable build instrumentation in child processes,
+        // because some projects run "embedded" Maven/Gradle builds as part of their integration tests,
+        // and we don't want to show those as if they were regular build executions
+        propagatedSystemProperties.put(
+                propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED),
+                Boolean.toString(false));
+
+        propagatedSystemProperties.put(
+                propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_INJECTED_TRACER_VERSION),
+                TracerVersion.TRACER_VERSION);
+
+        propagatedSystemProperties.put(propertyNameToSystemPropertyName(GeneralConfig.SERVICE_NAME), serviceName);
+        propagatedSystemProperties.put(
+                propertyNameToSystemPropertyName(GeneralConfig.SERVICE_NAME_SET_BY_USER),
+                String.valueOf(userProvidedServiceName));
+        propagatedSystemProperties.put(
+                propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_MODULE_NAME), moduleName);
+        propagatedSystemProperties.put(
+                propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_TEST_COMMAND), startCommand);
+
+        propagatedSystemProperties.put(
+                propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_HOST),
+                signalServerAddress != null ? signalServerAddress.getHostName() : null);
+        propagatedSystemProperties.put(
+                propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_PORT),
+                String.valueOf(signalServerAddress != null ? signalServerAddress.getPort() : 0));
+
+        List<String> coverageIncludedPackages = sessionSettings.getCoverageIncludedPackages();
+        propagatedSystemProperties.put(
+                propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_CODE_COVERAGE_INCLUDES),
+                String.join(":", coverageIncludedPackages));
+
+        if (jacocoAgent != null && !config.isCiVisibilityCoverageLinesDisabled()) {
+            // If the module is using Jacoco,
+            // per-test code coverage needs to have line-level granularity
+            // (as opposed to default file-level granularity).
+            // Line coverage data is needed to back-fill coverage for tests skipped by ITR
+            // in order to calculate accurate coverage percentage.
+            // This setting is only relevant if per-test code coverage is enabled,
+            // otherwise it has no effect.
+            propagatedSystemProperties.put(
+                    propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_CODE_COVERAGE_LINES_ENABLED),
+                    Boolean.toString(true));
+        }
+
+        // propagate module span context to child processes
+        defaultPropagator().inject(span, propagatedSystemProperties, ChildProcessPropertiesPropagationSetter.INSTANCE);
+
+        return propagatedSystemProperties;
     }
 
-    // propagate module span context to child processes
-    defaultPropagator()
-        .inject(span, propagatedSystemProperties, ChildProcessPropertiesPropagationSetter.INSTANCE);
-
-    return propagatedSystemProperties;
-  }
-
-  @Override
-  public long getId() {
-    return span.getSpanId();
-  }
-
-  @Override
-  public BuildModuleSettings getSettings() {
-    return settings;
-  }
-
-  /**
-   * Handles module execution results received from a forked JVM.
-   *
-   * <p>Depending on the build configuration it is possible to have multiple forks created for the
-   * same module: in Gradle this is achieved with {@code maxParallelForks} or {@code forkEvery}
-   * properties of the Test task, in Maven - with {@code forkCount>} property of the Surefire
-   * plugin. The forks can execute either concurrently or sequentially.
-   *
-   * <p>Taking this into account, the method should merge execution results rather than overwrite
-   * them.
-   *
-   * <p>This method is called by the {@link
-   * datadog.trace.util.AgentThreadFactory.AgentThread#CI_SIGNAL_SERVER} thread.
-   *
-   * @param result Module execution results received from a forked JVM.
-   */
-  private SignalResponse onModuleExecutionResultReceived(ModuleExecutionResult result) {
-    if (result.isCoverageEnabled()) {
-      setTag(Tags.TEST_CODE_COVERAGE_ENABLED, true);
-    }
-    if (result.isTestSkippingEnabled()) {
-      testSkippingEnabled = true;
-    }
-    if (result.isEarlyFlakeDetectionEnabled()) {
-      setTag(Tags.TEST_EARLY_FLAKE_ENABLED, true);
-      if (result.isEarlyFlakeDetectionFaulty()) {
-        setTag(Tags.TEST_EARLY_FLAKE_ABORT_REASON, Constants.EFD_ABORT_REASON_FAULTY);
-      }
-    }
-
-    if (result.isTestManagementEnabled()) {
-      setTag(Tags.TEST_TEST_MANAGEMENT_ENABLED, true);
+    @Override
+    public long getId() {
+        return span.getSpanId();
     }
 
-    if (result.hasFailedTestReplayTests()) {
-      setTag(DDTags.TEST_HAS_FAILED_TEST_REPLAY, true);
+    @Override
+    public BuildModuleSettings getSettings() {
+        return settings;
     }
 
-    testsSkipped.add(result.getTestsSkippedTotal());
-
-    tagsPropagator.mergeTestFrameworks(result.getTestFrameworks());
-
-    return AckResponse.INSTANCE;
-  }
-
-  @Override
-  public void end(@Nullable Long endTime) {
-    if (testSkippingEnabled) {
-      setTag(Tags.TEST_ITR_TESTS_SKIPPING_ENABLED, true);
-      setTag(Tags.TEST_ITR_TESTS_SKIPPING_TYPE, "test");
-
-      long testsSkippedTotal = testsSkipped.sum();
-      setTag(Tags.TEST_ITR_TESTS_SKIPPING_COUNT, testsSkippedTotal);
-      if (testsSkippedTotal > 0) {
-        setTag(DDTags.CI_ITR_TESTS_SKIPPED, true);
-      }
+    /**
+     * Handles module execution results received from a forked JVM.
+     *
+     * <p>Depending on the build configuration it is possible to have multiple forks created for the
+     * same module: in Gradle this is achieved with {@code maxParallelForks} or {@code forkEvery}
+     * properties of the Test task, in Maven - with {@code forkCount>} property of the Surefire
+     * plugin. The forks can execute either concurrently or sequentially.
+     *
+     * <p>Taking this into account, the method should merge execution results rather than overwrite
+     * them.
+     *
+     * <p>This method is called by the {@link
+     * datadog.trace.util.AgentThreadFactory.AgentThread#CI_SIGNAL_SERVER} thread.
+     *
+     * @param result Module execution results received from a forked JVM.
+     */
+    private SignalResponse onModuleExecutionResultReceived(ModuleExecutionResult result) {
+        if (result.isCoverageEnabled()) {
+            setTag(Tags.TEST_CODE_COVERAGE_ENABLED, true);
+        }
+        if (result.isTestSkippingEnabled()) {
+            testSkippingEnabled = true;
+        }
+        if (result.isEarlyFlakeDetectionEnabled()) {
+            setTag(Tags.TEST_EARLY_FLAKE_ENABLED, true);
+            if (result.isEarlyFlakeDetectionFaulty()) {
+                setTag(Tags.TEST_EARLY_FLAKE_ABORT_REASON, Constants.EFD_ABORT_REASON_FAULTY);
+            }
+        }
+
+        if (result.isTestManagementEnabled()) {
+            setTag(Tags.TEST_TEST_MANAGEMENT_ENABLED, true);
+        }
+
+        if (result.hasFailedTestReplayTests()) {
+            setTag(DDTags.TEST_HAS_FAILED_TEST_REPLAY, true);
+        }
+
+        testsSkipped.add(result.getTestsSkippedTotal());
+
+        tagsPropagator.mergeTestFrameworks(result.getTestFrameworks());
+
+        return AckResponse.INSTANCE;
     }
 
-    Long coveragePercentage = coverageProcessor.processCoverageData();
-    if (coveragePercentage != null) {
-      setTag(Tags.TEST_CODE_COVERAGE_LINES_PERCENTAGE, coveragePercentage);
-
-      if (testSkippingEnabled) {
-        setTag(Tags.TEST_CODE_COVERAGE_BACKFILLED, true);
-      }
+    @Override
+    public void end(@Nullable Long endTime) {
+        if (testSkippingEnabled) {
+            setTag(Tags.TEST_ITR_TESTS_SKIPPING_ENABLED, true);
+            setTag(Tags.TEST_ITR_TESTS_SKIPPING_TYPE, "test");
+
+            long testsSkippedTotal = testsSkipped.sum();
+            setTag(Tags.TEST_ITR_TESTS_SKIPPING_COUNT, testsSkippedTotal);
+            if (testsSkippedTotal > 0) {
+                setTag(DDTags.CI_ITR_TESTS_SKIPPED, true);
+            }
+        }
+
+        Long coveragePercentage = coverageProcessor.processCoverageData();
+        if (coveragePercentage != null) {
+            setTag(Tags.TEST_CODE_COVERAGE_LINES_PERCENTAGE, coveragePercentage);
+
+            if (testSkippingEnabled) {
+                setTag(Tags.TEST_CODE_COVERAGE_BACKFILLED, true);
+            }
+        }
+
+        moduleSignalRouter.removeModuleHandlers(span.getSpanId());
+
+        super.end(endTime);
     }
-
-    moduleSignalRouter.removeModuleHandlers(span.getSpanId());
-
-    super.end(endTime);
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java
index ea34436fd7a..99b46be427f 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java
@@ -44,197 +44,191 @@
 import javax.annotation.Nullable;
 
 public class BuildSystemSessionImpl<T extends CoverageProcessor> extends AbstractTestSession
-    implements BuildSystemSession {
-
-  private final String startCommand;
-  private final ModuleSignalRouter moduleSignalRouter;
-  private final ExecutionSettingsFactory executionSettingsFactory;
-  private final SignalServer signalServer;
-  private final RepoIndexProvider repoIndexProvider;
-  private final CoverageProcessor.Factory<T> coverageProcessorFactory;
-  private final T coverageProcessor;
-  private final BuildSessionSettings settings;
-
-  public BuildSystemSessionImpl(
-      String projectName,
-      String startCommand,
-      @Nullable Long startTime,
-      Provider ciProvider,
-      Config config,
-      CiVisibilityMetricCollector metricCollector,
-      ModuleSignalRouter moduleSignalRouter,
-      TestDecorator testDecorator,
-      SourcePathResolver sourcePathResolver,
-      Codeowners codeowners,
-      LinesResolver linesResolver,
-      ExecutionSettingsFactory executionSettingsFactory,
-      SignalServer signalServer,
-      RepoIndexProvider repoIndexProvider,
-      CoverageProcessor.Factory<T> coverageProcessorFactory) {
-    super(
-        projectName,
-        startTime,
-        InstrumentationType.BUILD,
-        ciProvider,
-        config,
-        metricCollector,
-        testDecorator,
-        sourcePathResolver,
-        codeowners,
-        linesResolver);
-    this.startCommand = startCommand;
-    this.moduleSignalRouter = moduleSignalRouter;
-    this.executionSettingsFactory = executionSettingsFactory;
-    this.signalServer = signalServer;
-    this.repoIndexProvider = repoIndexProvider;
-    this.coverageProcessorFactory = coverageProcessorFactory;
-    this.coverageProcessor = coverageProcessorFactory.sessionCoverage(span.getSpanId());
-
-    ExecutionSettings executionSettings =
-        executionSettingsFactory.create(JvmInfo.CURRENT_JVM, null);
-    this.settings =
-        new BuildSessionSettings(
-            executionSettings.isCodeCoverageReportUploadEnabled(),
-            getCoverageIncludedPackages(config, repoIndexProvider),
-            config.getCiVisibilityCodeCoverageExcludes());
-
-    DynamicAutoTestRetrySettings dynamicAtrSettings =
-        executionSettings.getDynamicAutoTestRetrySettings();
-    if (dynamicAtrSettings.isEnabled()) {
-      metricCollector.add(
-          CiVisibilityCountMetric.DYNAMIC_ATR_RETRIES_ENABLED,
-          1,
-          dynamicAtrSettings.isCustom() ? HasCustomBuckets.TRUE : null);
+        implements BuildSystemSession {
+
+    private final String startCommand;
+    private final ModuleSignalRouter moduleSignalRouter;
+    private final ExecutionSettingsFactory executionSettingsFactory;
+    private final SignalServer signalServer;
+    private final RepoIndexProvider repoIndexProvider;
+    private final CoverageProcessor.Factory<T> coverageProcessorFactory;
+    private final T coverageProcessor;
+    private final BuildSessionSettings settings;
+
+    public BuildSystemSessionImpl(
+            String projectName,
+            String startCommand,
+            @Nullable Long startTime,
+            Provider ciProvider,
+            Config config,
+            CiVisibilityMetricCollector metricCollector,
+            ModuleSignalRouter moduleSignalRouter,
+            TestDecorator testDecorator,
+            SourcePathResolver sourcePathResolver,
+            Codeowners codeowners,
+            LinesResolver linesResolver,
+            ExecutionSettingsFactory executionSettingsFactory,
+            SignalServer signalServer,
+            RepoIndexProvider repoIndexProvider,
+            CoverageProcessor.Factory<T> coverageProcessorFactory) {
+        super(
+                projectName,
+                startTime,
+                InstrumentationType.BUILD,
+                ciProvider,
+                config,
+                metricCollector,
+                testDecorator,
+                sourcePathResolver,
+                codeowners,
+                linesResolver);
+        this.startCommand = startCommand;
+        this.moduleSignalRouter = moduleSignalRouter;
+        this.executionSettingsFactory = executionSettingsFactory;
+        this.signalServer = signalServer;
+        this.repoIndexProvider = repoIndexProvider;
+        this.coverageProcessorFactory = coverageProcessorFactory;
+        this.coverageProcessor = coverageProcessorFactory.sessionCoverage(span.getSpanId());
+
+        ExecutionSettings executionSettings = executionSettingsFactory.create(JvmInfo.CURRENT_JVM, null);
+        this.settings = new BuildSessionSettings(
+                executionSettings.isCodeCoverageReportUploadEnabled(),
+                getCoverageIncludedPackages(config, repoIndexProvider),
+                config.getCiVisibilityCodeCoverageExcludes());
+
+        DynamicAutoTestRetrySettings dynamicAtrSettings = executionSettings.getDynamicAutoTestRetrySettings();
+        if (dynamicAtrSettings.isEnabled()) {
+            metricCollector.add(
+                    CiVisibilityCountMetric.DYNAMIC_ATR_RETRIES_ENABLED,
+                    1,
+                    dynamicAtrSettings.isCustom() ? HasCustomBuckets.TRUE : null);
+        }
+
+        signalServer.registerSignalHandler(
+                SignalType.MODULE_EXECUTION_RESULT, moduleSignalRouter::onModuleSignalReceived);
+        signalServer.registerSignalHandler(
+                SignalType.MODULE_COVERAGE_DATA_JACOCO, moduleSignalRouter::onModuleSignalReceived);
+        signalServer.registerSignalHandler(SignalType.REPO_INDEX_REQUEST, this::onRepoIndexRequestReceived);
+        signalServer.registerSignalHandler(
+                SignalType.EXECUTION_SETTINGS_REQUEST, this::onExecutionSettingsRequestReceived);
+        signalServer.start();
+
+        setTag(Tags.TEST_COMMAND, startCommand);
     }
 
-    signalServer.registerSignalHandler(
-        SignalType.MODULE_EXECUTION_RESULT, moduleSignalRouter::onModuleSignalReceived);
-    signalServer.registerSignalHandler(
-        SignalType.MODULE_COVERAGE_DATA_JACOCO, moduleSignalRouter::onModuleSignalReceived);
-    signalServer.registerSignalHandler(
-        SignalType.REPO_INDEX_REQUEST, this::onRepoIndexRequestReceived);
-    signalServer.registerSignalHandler(
-        SignalType.EXECUTION_SETTINGS_REQUEST, this::onExecutionSettingsRequestReceived);
-    signalServer.start();
-
-    setTag(Tags.TEST_COMMAND, startCommand);
-  }
-
-  private static List<String> getCoverageIncludedPackages(
-      Config config, RepoIndexProvider repoIndexProvider) {
-    if (!config.isCiVisibilityCodeCoverageEnabled()) {
-      return Collections.emptyList();
+    private static List<String> getCoverageIncludedPackages(Config config, RepoIndexProvider repoIndexProvider) {
+        if (!config.isCiVisibilityCodeCoverageEnabled()) {
+            return Collections.emptyList();
+        }
+
+        List<String> includedPackages = config.getCiVisibilityCodeCoverageIncludes();
+        if (includedPackages != null && !includedPackages.isEmpty()) {
+            return new ArrayList<>(includedPackages);
+        } else {
+            RepoIndex repoIndex = repoIndexProvider.getIndex();
+            return new ArrayList<>(repoIndex.getRootPackages());
+        }
     }
 
-    List<String> includedPackages = config.getCiVisibilityCodeCoverageIncludes();
-    if (includedPackages != null && !includedPackages.isEmpty()) {
-      return new ArrayList<>(includedPackages);
-    } else {
-      RepoIndex repoIndex = repoIndexProvider.getIndex();
-      return new ArrayList<>(repoIndex.getRootPackages());
+    private SignalResponse onRepoIndexRequestReceived(RepoIndexRequest request) {
+        try {
+            RepoIndex index = repoIndexProvider.getIndex();
+            return new RepoIndexResponse(index);
+        } catch (Exception e) {
+            return new ErrorResponse("Error while building repo index: " + e.getMessage());
+        }
     }
-  }
-
-  private SignalResponse onRepoIndexRequestReceived(RepoIndexRequest request) {
-    try {
-      RepoIndex index = repoIndexProvider.getIndex();
-      return new RepoIndexResponse(index);
-    } catch (Exception e) {
-      return new ErrorResponse("Error while building repo index: " + e.getMessage());
+
+    private SignalResponse onExecutionSettingsRequestReceived(ExecutionSettingsRequest request) {
+        try {
+            JvmInfo jvmInfo = request.getJvmInfo();
+            String moduleName = request.getModuleName();
+            ExecutionSettings settings = executionSettingsFactory.create(jvmInfo, moduleName);
+            return new ExecutionSettingsResponse(settings);
+
+        } catch (Exception e) {
+            return new ErrorResponse("Error while getting module execution settings: " + e.getMessage());
+        }
     }
-  }
 
-  private SignalResponse onExecutionSettingsRequestReceived(ExecutionSettingsRequest request) {
-    try {
-      JvmInfo jvmInfo = request.getJvmInfo();
-      String moduleName = request.getModuleName();
-      ExecutionSettings settings = executionSettingsFactory.create(jvmInfo, moduleName);
-      return new ExecutionSettingsResponse(settings);
+    @Override
+    public BuildSystemModuleImpl testModuleStart(
+            String moduleName,
+            @Nullable Long startTime,
+            BuildModuleLayout moduleLayout,
+            JvmInfo jvmInfo,
+            @Nullable Collection<Path> classpath,
+            @Nullable JavaAgent jacocoAgent) {
+        ExecutionSettings executionSettings = executionSettingsFactory.create(jvmInfo, moduleName);
+        return new BuildSystemModuleImpl(
+                span.spanContext(),
+                moduleName,
+                startCommand,
+                startTime,
+                signalServer.getAddress(),
+                moduleLayout,
+                classpath,
+                jacocoAgent,
+                config,
+                metricCollector,
+                testDecorator,
+                sourcePathResolver,
+                codeowners,
+                linesResolver,
+                moduleSignalRouter,
+                coverageProcessorFactory,
+                coverageProcessor,
+                executionSettings,
+                settings,
+                this::onModuleFinish);
+    }
+
+    @Override
+    public AgentSpan testTaskStart(String taskName) {
+        return startSpan("ci_visibility", taskName, span.spanContext());
+    }
 
-    } catch (Exception e) {
-      return new ErrorResponse("Error while getting module execution settings: " + e.getMessage());
+    private void onModuleFinish(AgentSpan moduleSpan) {
+        // multiple modules can finish in parallel
+        tagPropagator.propagateCiVisibilityTags(moduleSpan);
+        tagPropagator.propagateTags(
+                moduleSpan,
+                TagMergeSpec.of(Tags.TEST_EARLY_FLAKE_ENABLED, Boolean::logicalOr),
+                TagMergeSpec.of(Tags.TEST_EARLY_FLAKE_ABORT_REASON),
+                TagMergeSpec.of(Tags.TEST_CODE_COVERAGE_ENABLED, Boolean::logicalOr),
+                TagMergeSpec.of(Tags.TEST_ITR_TESTS_SKIPPING_ENABLED, Boolean::logicalOr),
+                TagMergeSpec.of(Tags.TEST_ITR_TESTS_SKIPPING_TYPE),
+                TagMergeSpec.of(Tags.TEST_ITR_TESTS_SKIPPING_COUNT, Long::sum),
+                TagMergeSpec.of(DDTags.CI_ITR_TESTS_SKIPPED, Boolean::logicalOr),
+                TagMergeSpec.of(Tags.TEST_TEST_MANAGEMENT_ENABLED, Boolean::logicalOr),
+                TagMergeSpec.of(Tags.TEST_IS_ANDROID, Boolean::logicalOr),
+                TagMergeSpec.of(DDTags.TEST_HAS_FAILED_TEST_REPLAY, Boolean::logicalOr),
+                TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS, Boolean::logicalOr),
+                TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_SKIPPABLE_TESTS, Boolean::logicalOr),
+                TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_FLAKY_TESTS, Boolean::logicalOr),
+                TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS, Boolean::logicalOr),
+                TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS, Boolean::logicalOr));
     }
-  }
-
-  @Override
-  public BuildSystemModuleImpl testModuleStart(
-      String moduleName,
-      @Nullable Long startTime,
-      BuildModuleLayout moduleLayout,
-      JvmInfo jvmInfo,
-      @Nullable Collection<Path> classpath,
-      @Nullable JavaAgent jacocoAgent) {
-    ExecutionSettings executionSettings = executionSettingsFactory.create(jvmInfo, moduleName);
-    return new BuildSystemModuleImpl(
-        span.spanContext(),
-        moduleName,
-        startCommand,
-        startTime,
-        signalServer.getAddress(),
-        moduleLayout,
-        classpath,
-        jacocoAgent,
-        config,
-        metricCollector,
-        testDecorator,
-        sourcePathResolver,
-        codeowners,
-        linesResolver,
-        moduleSignalRouter,
-        coverageProcessorFactory,
-        coverageProcessor,
-        executionSettings,
-        settings,
-        this::onModuleFinish);
-  }
-
-  @Override
-  public AgentSpan testTaskStart(String taskName) {
-    return startSpan("ci_visibility", taskName, span.spanContext());
-  }
-
-  private void onModuleFinish(AgentSpan moduleSpan) {
-    // multiple modules can finish in parallel
-    tagPropagator.propagateCiVisibilityTags(moduleSpan);
-    tagPropagator.propagateTags(
-        moduleSpan,
-        TagMergeSpec.of(Tags.TEST_EARLY_FLAKE_ENABLED, Boolean::logicalOr),
-        TagMergeSpec.of(Tags.TEST_EARLY_FLAKE_ABORT_REASON),
-        TagMergeSpec.of(Tags.TEST_CODE_COVERAGE_ENABLED, Boolean::logicalOr),
-        TagMergeSpec.of(Tags.TEST_ITR_TESTS_SKIPPING_ENABLED, Boolean::logicalOr),
-        TagMergeSpec.of(Tags.TEST_ITR_TESTS_SKIPPING_TYPE),
-        TagMergeSpec.of(Tags.TEST_ITR_TESTS_SKIPPING_COUNT, Long::sum),
-        TagMergeSpec.of(DDTags.CI_ITR_TESTS_SKIPPED, Boolean::logicalOr),
-        TagMergeSpec.of(Tags.TEST_TEST_MANAGEMENT_ENABLED, Boolean::logicalOr),
-        TagMergeSpec.of(Tags.TEST_IS_ANDROID, Boolean::logicalOr),
-        TagMergeSpec.of(DDTags.TEST_HAS_FAILED_TEST_REPLAY, Boolean::logicalOr),
-        TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS, Boolean::logicalOr),
-        TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_SKIPPABLE_TESTS, Boolean::logicalOr),
-        TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_FLAKY_TESTS, Boolean::logicalOr),
-        TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS, Boolean::logicalOr),
-        TagMergeSpec.of(
-            DDTags.CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS, Boolean::logicalOr));
-  }
-
-  @Override
-  public BuildSessionSettings getSettings() {
-    return settings;
-  }
-
-  @Override
-  public void end(@Nullable Long endTime) {
-    signalServer.stop();
-
-    Long coveragePercentage = coverageProcessor.processCoverageData();
-    if (coveragePercentage != null) {
-      setTag(Tags.TEST_CODE_COVERAGE_LINES_PERCENTAGE, coveragePercentage);
-
-      Object testSkippingEnabled = span.getTag(Tags.TEST_ITR_TESTS_SKIPPING_ENABLED);
-      if (testSkippingEnabled != null && (Boolean) testSkippingEnabled) {
-        setTag(Tags.TEST_CODE_COVERAGE_BACKFILLED, true);
-      }
+
+    @Override
+    public BuildSessionSettings getSettings() {
+        return settings;
     }
 
-    super.end(endTime);
-  }
+    @Override
+    public void end(@Nullable Long endTime) {
+        signalServer.stop();
+
+        Long coveragePercentage = coverageProcessor.processCoverageData();
+        if (coveragePercentage != null) {
+            setTag(Tags.TEST_CODE_COVERAGE_LINES_PERCENTAGE, coveragePercentage);
+
+            Object testSkippingEnabled = span.getTag(Tags.TEST_ITR_TESTS_SKIPPING_ENABLED);
+            if (testSkippingEnabled != null && (Boolean) testSkippingEnabled) {
+                setTag(Tags.TEST_CODE_COVERAGE_BACKFILLED, true);
+            }
+        }
+
+        super.end(endTime);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ModuleSignalRouter.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ModuleSignalRouter.java
index a0c1e6ee595..314f5185d0e 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ModuleSignalRouter.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ModuleSignalRouter.java
@@ -15,44 +15,42 @@
 /** Dispatches received signals to the right handlers depending on module ID. */
 public class ModuleSignalRouter {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ModuleSignalRouter.class);
-
-  private final Map<Long, Map<SignalType, Function<Signal, SignalResponse>>> moduleHandlersById;
-
-  public ModuleSignalRouter() {
-    this.moduleHandlersById = new ConcurrentHashMap<>();
-  }
-
-  @SuppressWarnings("unchecked")
-  public <T extends Signal> void registerModuleHandler(
-      Long moduleId, SignalType signalType, Function<T, SignalResponse> handler) {
-    moduleHandlersById
-        .computeIfAbsent(moduleId, m -> new ConcurrentHashMap<>())
-        .put(signalType, (Function<Signal, SignalResponse>) handler);
-  }
-
-  public void removeModuleHandlers(Long moduleId) {
-    moduleHandlersById.remove(moduleId);
-  }
-
-  public SignalResponse onModuleSignalReceived(ModuleSignal result) {
-    long moduleId = result.getModuleId();
-    Map<SignalType, Function<Signal, SignalResponse>> handlersByType =
-        moduleHandlersById.get(moduleId);
-    if (handlersByType == null) {
-      String message =
-          String.format(
-              "Could not find signal handlers for module ID %s, test execution result will be ignored: %s",
-              moduleId, result);
-      LOGGER.warn(message);
-      return new ErrorResponse(message);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ModuleSignalRouter.class);
+
+    private final Map<Long, Map<SignalType, Function<Signal, SignalResponse>>> moduleHandlersById;
+
+    public ModuleSignalRouter() {
+        this.moduleHandlersById = new ConcurrentHashMap<>();
     }
 
-    Function<Signal, SignalResponse> moduleHandler = handlersByType.get(result.getType());
-    if (moduleHandler != null) {
-      return moduleHandler.apply(result);
+    @SuppressWarnings("unchecked")
+    public <T extends Signal> void registerModuleHandler(
+            Long moduleId, SignalType signalType, Function<T, SignalResponse> handler) {
+        moduleHandlersById
+                .computeIfAbsent(moduleId, m -> new ConcurrentHashMap<>())
+                .put(signalType, (Function<Signal, SignalResponse>) handler);
     }
 
-    return AckResponse.INSTANCE;
-  }
+    public void removeModuleHandlers(Long moduleId) {
+        moduleHandlersById.remove(moduleId);
+    }
+
+    public SignalResponse onModuleSignalReceived(ModuleSignal result) {
+        long moduleId = result.getModuleId();
+        Map<SignalType, Function<Signal, SignalResponse>> handlersByType = moduleHandlersById.get(moduleId);
+        if (handlersByType == null) {
+            String message = String.format(
+                    "Could not find signal handlers for module ID %s, test execution result will be ignored: %s",
+                    moduleId, result);
+            LOGGER.warn(message);
+            return new ErrorResponse(message);
+        }
+
+        Function<Signal, SignalResponse> moduleHandler = handlersByType.get(result.getType());
+        if (moduleHandler != null) {
+            return moduleHandler.apply(result);
+        }
+
+        return AckResponse.INSTANCE;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java
index 41107bbe923..0bc93800656 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java
@@ -45,183 +45,178 @@
  * process (build system) using the signal server
  */
 public class ProxyTestModule implements TestFrameworkModule {
-  private static final Logger log = LoggerFactory.getLogger(ProxyTestModule.class);
-
-  private final AgentSpanContext parentProcessModuleContext;
-  private final String moduleName;
-  private final ExecutionStrategy executionStrategy;
-  private final ExecutionResults executionResults;
-  private final SignalClient.Factory signalClientFactory;
-  private final ChildProcessCoverageReporter childProcessCoverageReporter;
-  private final Config config;
-  private final CiVisibilityMetricCollector metricCollector;
-  private final TestDecorator testDecorator;
-  private final SourcePathResolver sourcePathResolver;
-  private final Codeowners codeowners;
-  private final LinesResolver linesResolver;
-  private final CoverageStore.Factory coverageStoreFactory;
-  private final Collection<TestFramework> testFrameworks = ConcurrentHashMap.newKeySet();
-  private final Collection<LibraryCapability> capabilities;
-
-  public ProxyTestModule(
-      AgentSpanContext parentProcessModuleContext,
-      String moduleName,
-      ExecutionStrategy executionStrategy,
-      Config config,
-      CiVisibilityMetricCollector metricCollector,
-      TestDecorator testDecorator,
-      SourcePathResolver sourcePathResolver,
-      Codeowners codeowners,
-      LinesResolver linesResolver,
-      CoverageStore.Factory coverageStoreFactory,
-      ChildProcessCoverageReporter childProcessCoverageReporter,
-      SignalClient.Factory signalClientFactory,
-      Collection<LibraryCapability> capabilities) {
-    this.parentProcessModuleContext = parentProcessModuleContext;
-    this.moduleName = moduleName;
-    this.executionStrategy = executionStrategy;
-    this.executionResults = new ExecutionResults();
-    this.signalClientFactory = signalClientFactory;
-    this.childProcessCoverageReporter = childProcessCoverageReporter;
-    this.config = config;
-    this.metricCollector = metricCollector;
-    this.testDecorator = testDecorator;
-    this.sourcePathResolver = sourcePathResolver;
-    this.codeowners = codeowners;
-    this.linesResolver = linesResolver;
-    this.coverageStoreFactory = coverageStoreFactory;
-    this.capabilities = capabilities;
-  }
-
-  @Override
-  public boolean isNew(@Nonnull TestIdentifier test) {
-    return executionStrategy.isNew(test);
-  }
-
-  @Override
-  public boolean isModified(@Nonnull TestSourceData testSourceData) {
-    return executionStrategy.isModified(testSourceData);
-  }
-
-  @Override
-  public boolean isQuarantined(TestIdentifier test) {
-    return executionStrategy.isQuarantined(test);
-  }
-
-  @Override
-  public boolean isDisabled(TestIdentifier test) {
-    return executionStrategy.isDisabled(test);
-  }
-
-  @Override
-  public boolean isAttemptToFix(TestIdentifier test) {
-    return executionStrategy.isAttemptToFix(test);
-  }
-
-  @Nullable
-  @Override
-  public SkipReason skipReason(TestIdentifier test) {
-    return executionStrategy.skipReason(test);
-  }
-
-  @Override
-  @Nonnull
-  public TestExecutionPolicy executionPolicy(
-      TestIdentifier test, TestSourceData testSource, Collection<String> testTags) {
-    return executionStrategy.executionPolicy(test, testSource, testTags);
-  }
-
-  @Override
-  public int executionPriority(@Nullable TestIdentifier test, @Nonnull TestSourceData testSource) {
-    return executionStrategy.executionPriority(test, testSource);
-  }
-
-  @Override
-  public void end(@Nullable Long endTime) {
-    // we have no span locally,
-    // send execution result to parent process that manages the span
-    sendModuleExecutionResult();
-  }
-
-  private void sendModuleExecutionResult() {
-    DDTraceId parentProcessSessionId = parentProcessModuleContext.getTraceId();
-    long parentProcessModuleId = parentProcessModuleContext.getSpanId();
-
-    try (SignalClient signalClient = signalClientFactory.create()) {
-      ModuleSignal coverageSignal =
-          childProcessCoverageReporter.createCoverageSignal(
-              parentProcessSessionId, parentProcessModuleId);
-      if (coverageSignal != null) {
-        signalClient.send(coverageSignal);
-      }
-
-      boolean coverageEnabled = config.isCiVisibilityCodeCoverageEnabled();
-      boolean testSkippingEnabled = config.isCiVisibilityTestSkippingEnabled();
-
-      ExecutionSettings executionSettings = executionStrategy.getExecutionSettings();
-      EarlyFlakeDetectionSettings earlyFlakeDetectionSettings =
-          executionSettings.getEarlyFlakeDetectionSettings();
-      boolean earlyFlakeDetectionEnabled = earlyFlakeDetectionSettings.isEnabled();
-      boolean earlyFlakeDetectionFaulty =
-          earlyFlakeDetectionEnabled && executionStrategy.isEFDLimitReached();
-      TestManagementSettings testManagementSettings = executionSettings.getTestManagementSettings();
-      boolean testManagementEnabled = testManagementSettings.isEnabled();
-      boolean hasFailedTestReplayTests = executionResults.hasFailedTestReplayTests();
-      long testsSkippedTotal = executionResults.getTestsSkippedByItr();
-
-      signalClient.send(
-          new ModuleExecutionResult(
-              parentProcessSessionId,
-              parentProcessModuleId,
-              coverageEnabled,
-              testSkippingEnabled,
-              earlyFlakeDetectionEnabled,
-              earlyFlakeDetectionFaulty,
-              testManagementEnabled,
-              hasFailedTestReplayTests,
-              testsSkippedTotal,
-              new TreeSet<>(testFrameworks)));
-
-    } catch (Exception e) {
-      log.error("Error while reporting module execution result", e);
+    private static final Logger log = LoggerFactory.getLogger(ProxyTestModule.class);
+
+    private final AgentSpanContext parentProcessModuleContext;
+    private final String moduleName;
+    private final ExecutionStrategy executionStrategy;
+    private final ExecutionResults executionResults;
+    private final SignalClient.Factory signalClientFactory;
+    private final ChildProcessCoverageReporter childProcessCoverageReporter;
+    private final Config config;
+    private final CiVisibilityMetricCollector metricCollector;
+    private final TestDecorator testDecorator;
+    private final SourcePathResolver sourcePathResolver;
+    private final Codeowners codeowners;
+    private final LinesResolver linesResolver;
+    private final CoverageStore.Factory coverageStoreFactory;
+    private final Collection<TestFramework> testFrameworks = ConcurrentHashMap.newKeySet();
+    private final Collection<LibraryCapability> capabilities;
+
+    public ProxyTestModule(
+            AgentSpanContext parentProcessModuleContext,
+            String moduleName,
+            ExecutionStrategy executionStrategy,
+            Config config,
+            CiVisibilityMetricCollector metricCollector,
+            TestDecorator testDecorator,
+            SourcePathResolver sourcePathResolver,
+            Codeowners codeowners,
+            LinesResolver linesResolver,
+            CoverageStore.Factory coverageStoreFactory,
+            ChildProcessCoverageReporter childProcessCoverageReporter,
+            SignalClient.Factory signalClientFactory,
+            Collection<LibraryCapability> capabilities) {
+        this.parentProcessModuleContext = parentProcessModuleContext;
+        this.moduleName = moduleName;
+        this.executionStrategy = executionStrategy;
+        this.executionResults = new ExecutionResults();
+        this.signalClientFactory = signalClientFactory;
+        this.childProcessCoverageReporter = childProcessCoverageReporter;
+        this.config = config;
+        this.metricCollector = metricCollector;
+        this.testDecorator = testDecorator;
+        this.sourcePathResolver = sourcePathResolver;
+        this.codeowners = codeowners;
+        this.linesResolver = linesResolver;
+        this.coverageStoreFactory = coverageStoreFactory;
+        this.capabilities = capabilities;
+    }
+
+    @Override
+    public boolean isNew(@Nonnull TestIdentifier test) {
+        return executionStrategy.isNew(test);
+    }
+
+    @Override
+    public boolean isModified(@Nonnull TestSourceData testSourceData) {
+        return executionStrategy.isModified(testSourceData);
+    }
+
+    @Override
+    public boolean isQuarantined(TestIdentifier test) {
+        return executionStrategy.isQuarantined(test);
+    }
+
+    @Override
+    public boolean isDisabled(TestIdentifier test) {
+        return executionStrategy.isDisabled(test);
+    }
+
+    @Override
+    public boolean isAttemptToFix(TestIdentifier test) {
+        return executionStrategy.isAttemptToFix(test);
+    }
+
+    @Nullable
+    @Override
+    public SkipReason skipReason(TestIdentifier test) {
+        return executionStrategy.skipReason(test);
+    }
+
+    @Override
+    @Nonnull
+    public TestExecutionPolicy executionPolicy(
+            TestIdentifier test, TestSourceData testSource, Collection<String> testTags) {
+        return executionStrategy.executionPolicy(test, testSource, testTags);
+    }
+
+    @Override
+    public int executionPriority(@Nullable TestIdentifier test, @Nonnull TestSourceData testSource) {
+        return executionStrategy.executionPriority(test, testSource);
+    }
+
+    @Override
+    public void end(@Nullable Long endTime) {
+        // we have no span locally,
+        // send execution result to parent process that manages the span
+        sendModuleExecutionResult();
+    }
+
+    private void sendModuleExecutionResult() {
+        DDTraceId parentProcessSessionId = parentProcessModuleContext.getTraceId();
+        long parentProcessModuleId = parentProcessModuleContext.getSpanId();
+
+        try (SignalClient signalClient = signalClientFactory.create()) {
+            ModuleSignal coverageSignal =
+                    childProcessCoverageReporter.createCoverageSignal(parentProcessSessionId, parentProcessModuleId);
+            if (coverageSignal != null) {
+                signalClient.send(coverageSignal);
+            }
+
+            boolean coverageEnabled = config.isCiVisibilityCodeCoverageEnabled();
+            boolean testSkippingEnabled = config.isCiVisibilityTestSkippingEnabled();
+
+            ExecutionSettings executionSettings = executionStrategy.getExecutionSettings();
+            EarlyFlakeDetectionSettings earlyFlakeDetectionSettings =
+                    executionSettings.getEarlyFlakeDetectionSettings();
+            boolean earlyFlakeDetectionEnabled = earlyFlakeDetectionSettings.isEnabled();
+            boolean earlyFlakeDetectionFaulty = earlyFlakeDetectionEnabled && executionStrategy.isEFDLimitReached();
+            TestManagementSettings testManagementSettings = executionSettings.getTestManagementSettings();
+            boolean testManagementEnabled = testManagementSettings.isEnabled();
+            boolean hasFailedTestReplayTests = executionResults.hasFailedTestReplayTests();
+            long testsSkippedTotal = executionResults.getTestsSkippedByItr();
+
+            signalClient.send(new ModuleExecutionResult(
+                    parentProcessSessionId,
+                    parentProcessModuleId,
+                    coverageEnabled,
+                    testSkippingEnabled,
+                    earlyFlakeDetectionEnabled,
+                    earlyFlakeDetectionFaulty,
+                    testManagementEnabled,
+                    hasFailedTestReplayTests,
+                    testsSkippedTotal,
+                    new TreeSet<>(testFrameworks)));
+
+        } catch (Exception e) {
+            log.error("Error while reporting module execution result", e);
+        }
+    }
+
+    @Override
+    public TestSuiteImpl testSuiteStart(
+            String testSuiteName,
+            @Nullable Class<?> testClass,
+            @Nullable Long startTime,
+            boolean parallelized,
+            TestFrameworkInstrumentation instrumentation) {
+        return new TestSuiteImpl(
+                parentProcessModuleContext,
+                moduleName,
+                testSuiteName,
+                executionStrategy.getExecutionSettings().getItrCorrelationId(),
+                config.isCiVisibilityTestSkippingEnabled(),
+                testClass,
+                startTime,
+                parallelized,
+                InstrumentationType.BUILD,
+                instrumentation,
+                config,
+                metricCollector,
+                testDecorator,
+                sourcePathResolver,
+                codeowners,
+                linesResolver,
+                coverageStoreFactory,
+                executionResults,
+                executionStrategy.getExecutionSettings().getConfigurationErrors(),
+                capabilities,
+                this::propagateTestFrameworkData);
+    }
+
+    private void propagateTestFrameworkData(AgentSpan childSpan) {
+        testFrameworks.add(new TestFramework((String) childSpan.getTag(Tags.TEST_FRAMEWORK), (String)
+                childSpan.getTag(Tags.TEST_FRAMEWORK_VERSION)));
     }
-  }
-
-  @Override
-  public TestSuiteImpl testSuiteStart(
-      String testSuiteName,
-      @Nullable Class<?> testClass,
-      @Nullable Long startTime,
-      boolean parallelized,
-      TestFrameworkInstrumentation instrumentation) {
-    return new TestSuiteImpl(
-        parentProcessModuleContext,
-        moduleName,
-        testSuiteName,
-        executionStrategy.getExecutionSettings().getItrCorrelationId(),
-        config.isCiVisibilityTestSkippingEnabled(),
-        testClass,
-        startTime,
-        parallelized,
-        InstrumentationType.BUILD,
-        instrumentation,
-        config,
-        metricCollector,
-        testDecorator,
-        sourcePathResolver,
-        codeowners,
-        linesResolver,
-        coverageStoreFactory,
-        executionResults,
-        executionStrategy.getExecutionSettings().getConfigurationErrors(),
-        capabilities,
-        this::propagateTestFrameworkData);
-  }
-
-  private void propagateTestFrameworkData(AgentSpan childSpan) {
-    testFrameworks.add(
-        new TestFramework(
-            (String) childSpan.getTag(Tags.TEST_FRAMEWORK),
-            (String) childSpan.getTag(Tags.TEST_FRAMEWORK_VERSION)));
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java
index 69ea8126b44..a73b95e13c6 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java
@@ -26,69 +26,69 @@
  */
 public class ProxyTestSession implements TestFrameworkSession {
 
-  private final AgentSpanContext parentProcessModuleContext;
-  private final Config config;
-  private final CiVisibilityMetricCollector metricCollector;
-  private final TestDecorator testDecorator;
-  private final SourcePathResolver sourcePathResolver;
-  private final Codeowners codeowners;
-  private final LinesResolver linesResolver;
-  private final CoverageStore.Factory coverageStoreFactory;
-  private final ChildProcessCoverageReporter childProcessCoverageReporter;
-  private final SignalClient.Factory signalClientFactory;
-  private final ExecutionStrategy executionStrategy;
-  private final Collection<LibraryCapability> capabilities;
+    private final AgentSpanContext parentProcessModuleContext;
+    private final Config config;
+    private final CiVisibilityMetricCollector metricCollector;
+    private final TestDecorator testDecorator;
+    private final SourcePathResolver sourcePathResolver;
+    private final Codeowners codeowners;
+    private final LinesResolver linesResolver;
+    private final CoverageStore.Factory coverageStoreFactory;
+    private final ChildProcessCoverageReporter childProcessCoverageReporter;
+    private final SignalClient.Factory signalClientFactory;
+    private final ExecutionStrategy executionStrategy;
+    private final Collection<LibraryCapability> capabilities;
 
-  public ProxyTestSession(
-      AgentSpanContext parentProcessModuleContext,
-      Config config,
-      CiVisibilityMetricCollector metricCollector,
-      TestDecorator testDecorator,
-      SourcePathResolver sourcePathResolver,
-      Codeowners codeowners,
-      LinesResolver linesResolver,
-      CoverageStore.Factory coverageStoreFactory,
-      ChildProcessCoverageReporter childProcessCoverageReporter,
-      SignalClient.Factory signalClientFactory,
-      ExecutionStrategy executionStrategy,
-      @Nonnull Collection<LibraryCapability> capabilities) {
-    this.parentProcessModuleContext = parentProcessModuleContext;
-    this.config = config;
-    this.metricCollector = metricCollector;
-    this.testDecorator = testDecorator;
-    this.sourcePathResolver = sourcePathResolver;
-    this.codeowners = codeowners;
-    this.linesResolver = linesResolver;
-    this.coverageStoreFactory = coverageStoreFactory;
-    this.childProcessCoverageReporter = childProcessCoverageReporter;
-    this.signalClientFactory = signalClientFactory;
-    this.executionStrategy = executionStrategy;
-    this.capabilities = capabilities;
-  }
+    public ProxyTestSession(
+            AgentSpanContext parentProcessModuleContext,
+            Config config,
+            CiVisibilityMetricCollector metricCollector,
+            TestDecorator testDecorator,
+            SourcePathResolver sourcePathResolver,
+            Codeowners codeowners,
+            LinesResolver linesResolver,
+            CoverageStore.Factory coverageStoreFactory,
+            ChildProcessCoverageReporter childProcessCoverageReporter,
+            SignalClient.Factory signalClientFactory,
+            ExecutionStrategy executionStrategy,
+            @Nonnull Collection<LibraryCapability> capabilities) {
+        this.parentProcessModuleContext = parentProcessModuleContext;
+        this.config = config;
+        this.metricCollector = metricCollector;
+        this.testDecorator = testDecorator;
+        this.sourcePathResolver = sourcePathResolver;
+        this.codeowners = codeowners;
+        this.linesResolver = linesResolver;
+        this.coverageStoreFactory = coverageStoreFactory;
+        this.childProcessCoverageReporter = childProcessCoverageReporter;
+        this.signalClientFactory = signalClientFactory;
+        this.executionStrategy = executionStrategy;
+        this.capabilities = capabilities;
+    }
 
-  @Override
-  public void end(Long startTime) {
-    // flushing written traces synchronously:
-    // as soon as all tests have been executed,
-    // the process can be killed by the build system
-    AgentTracer.get().flush();
-  }
+    @Override
+    public void end(Long startTime) {
+        // flushing written traces synchronously:
+        // as soon as all tests have been executed,
+        // the process can be killed by the build system
+        AgentTracer.get().flush();
+    }
 
-  @Override
-  public TestFrameworkModule testModuleStart(String moduleName, @Nullable Long startTime) {
-    return new ProxyTestModule(
-        parentProcessModuleContext,
-        moduleName,
-        executionStrategy,
-        config,
-        metricCollector,
-        testDecorator,
-        sourcePathResolver,
-        codeowners,
-        linesResolver,
-        coverageStoreFactory,
-        childProcessCoverageReporter,
-        signalClientFactory,
-        capabilities);
-  }
+    @Override
+    public TestFrameworkModule testModuleStart(String moduleName, @Nullable Long startTime) {
+        return new ProxyTestModule(
+                parentProcessModuleContext,
+                moduleName,
+                executionStrategy,
+                config,
+                metricCollector,
+                testDecorator,
+                sourcePathResolver,
+                codeowners,
+                linesResolver,
+                coverageStoreFactory,
+                childProcessCoverageReporter,
+                signalClientFactory,
+                capabilities);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java
index f17fcd2a4c6..c3a8478b8ee 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java
@@ -41,155 +41,154 @@
  */
 public class HeadlessTestModule extends AbstractTestModule implements TestFrameworkModule {
 
-  private final CoverageStore.Factory coverageStoreFactory;
-  private final ExecutionStrategy executionStrategy;
-  private final ExecutionResults executionResults;
-  private final Collection<LibraryCapability> capabilities;
-
-  public HeadlessTestModule(
-      AgentSpanContext sessionSpanContext,
-      String moduleName,
-      @Nullable Long startTime,
-      Config config,
-      CiVisibilityMetricCollector metricCollector,
-      TestDecorator testDecorator,
-      SourcePathResolver sourcePathResolver,
-      Codeowners codeowners,
-      LinesResolver linesResolver,
-      CoverageStore.Factory coverageStoreFactory,
-      ExecutionStrategy executionStrategy,
-      Collection<LibraryCapability> capabilities,
-      Consumer<AgentSpan> onSpanFinish) {
-    super(
-        sessionSpanContext,
-        moduleName,
-        startTime,
-        InstrumentationType.HEADLESS,
-        config,
-        metricCollector,
-        testDecorator,
-        sourcePathResolver,
-        codeowners,
-        linesResolver,
-        onSpanFinish);
-    this.coverageStoreFactory = coverageStoreFactory;
-    this.executionStrategy = executionStrategy;
-    this.executionResults = new ExecutionResults();
-    this.capabilities = capabilities;
-  }
-
-  @Override
-  public boolean isNew(@Nonnull TestIdentifier test) {
-    return executionStrategy.isNew(test);
-  }
-
-  @Override
-  public boolean isModified(@Nonnull TestSourceData testSourceData) {
-    return executionStrategy.isModified(testSourceData);
-  }
-
-  @Override
-  public boolean isQuarantined(TestIdentifier test) {
-    return executionStrategy.isQuarantined(test);
-  }
-
-  @Override
-  public boolean isDisabled(TestIdentifier test) {
-    return executionStrategy.isDisabled(test);
-  }
-
-  @Override
-  public boolean isAttemptToFix(TestIdentifier test) {
-    return executionStrategy.isAttemptToFix(test);
-  }
-
-  @Nullable
-  @Override
-  public SkipReason skipReason(TestIdentifier test) {
-    return executionStrategy.skipReason(test);
-  }
-
-  @Override
-  @Nonnull
-  public TestExecutionPolicy executionPolicy(
-      TestIdentifier test, TestSourceData testSource, Collection<String> testTags) {
-    return executionStrategy.executionPolicy(test, testSource, testTags);
-  }
-
-  @Override
-  public int executionPriority(@Nullable TestIdentifier test, @Nonnull TestSourceData testSource) {
-    return executionStrategy.executionPriority(test, testSource);
-  }
-
-  @Override
-  public void end(@Nullable Long endTime) {
-    ExecutionSettings executionSettings = executionStrategy.getExecutionSettings();
-    executionSettings.getConfigurationErrors().applyTags(span);
-
-    if (executionSettings.isCodeCoverageEnabled()) {
-      setTag(Tags.TEST_CODE_COVERAGE_ENABLED, true);
+    private final CoverageStore.Factory coverageStoreFactory;
+    private final ExecutionStrategy executionStrategy;
+    private final ExecutionResults executionResults;
+    private final Collection<LibraryCapability> capabilities;
+
+    public HeadlessTestModule(
+            AgentSpanContext sessionSpanContext,
+            String moduleName,
+            @Nullable Long startTime,
+            Config config,
+            CiVisibilityMetricCollector metricCollector,
+            TestDecorator testDecorator,
+            SourcePathResolver sourcePathResolver,
+            Codeowners codeowners,
+            LinesResolver linesResolver,
+            CoverageStore.Factory coverageStoreFactory,
+            ExecutionStrategy executionStrategy,
+            Collection<LibraryCapability> capabilities,
+            Consumer<AgentSpan> onSpanFinish) {
+        super(
+                sessionSpanContext,
+                moduleName,
+                startTime,
+                InstrumentationType.HEADLESS,
+                config,
+                metricCollector,
+                testDecorator,
+                sourcePathResolver,
+                codeowners,
+                linesResolver,
+                onSpanFinish);
+        this.coverageStoreFactory = coverageStoreFactory;
+        this.executionStrategy = executionStrategy;
+        this.executionResults = new ExecutionResults();
+        this.capabilities = capabilities;
     }
 
-    if (executionSettings.isTestSkippingEnabled()) {
-      setTag(Tags.TEST_ITR_TESTS_SKIPPING_ENABLED, true);
-      setTag(Tags.TEST_ITR_TESTS_SKIPPING_TYPE, "test");
+    @Override
+    public boolean isNew(@Nonnull TestIdentifier test) {
+        return executionStrategy.isNew(test);
+    }
+
+    @Override
+    public boolean isModified(@Nonnull TestSourceData testSourceData) {
+        return executionStrategy.isModified(testSourceData);
+    }
+
+    @Override
+    public boolean isQuarantined(TestIdentifier test) {
+        return executionStrategy.isQuarantined(test);
+    }
 
-      long testsSkippedTotal = executionResults.getTestsSkippedByItr();
-      setTag(Tags.TEST_ITR_TESTS_SKIPPING_COUNT, testsSkippedTotal);
-      if (testsSkippedTotal > 0) {
-        setTag(DDTags.CI_ITR_TESTS_SKIPPED, true);
-      }
+    @Override
+    public boolean isDisabled(TestIdentifier test) {
+        return executionStrategy.isDisabled(test);
     }
 
-    EarlyFlakeDetectionSettings earlyFlakeDetectionSettings =
-        executionSettings.getEarlyFlakeDetectionSettings();
-    if (earlyFlakeDetectionSettings.isEnabled()) {
-      setTag(Tags.TEST_EARLY_FLAKE_ENABLED, true);
-      if (executionStrategy.isEFDLimitReached()) {
-        setTag(Tags.TEST_EARLY_FLAKE_ABORT_REASON, Constants.EFD_ABORT_REASON_FAULTY);
-      }
+    @Override
+    public boolean isAttemptToFix(TestIdentifier test) {
+        return executionStrategy.isAttemptToFix(test);
     }
 
-    TestManagementSettings testManagementSettings = executionSettings.getTestManagementSettings();
-    if (testManagementSettings.isEnabled()) {
-      setTag(Tags.TEST_TEST_MANAGEMENT_ENABLED, true);
+    @Nullable
+    @Override
+    public SkipReason skipReason(TestIdentifier test) {
+        return executionStrategy.skipReason(test);
     }
 
-    if (executionResults.hasFailedTestReplayTests()) {
-      setTag(DDTags.TEST_HAS_FAILED_TEST_REPLAY, true);
+    @Override
+    @Nonnull
+    public TestExecutionPolicy executionPolicy(
+            TestIdentifier test, TestSourceData testSource, Collection<String> testTags) {
+        return executionStrategy.executionPolicy(test, testSource, testTags);
     }
 
-    super.end(endTime);
-  }
-
-  @Override
-  public TestSuiteImpl testSuiteStart(
-      String testSuiteName,
-      @Nullable Class<?> testClass,
-      @Nullable Long startTime,
-      boolean parallelized,
-      TestFrameworkInstrumentation instrumentation) {
-    return new TestSuiteImpl(
-        span.spanContext(),
-        moduleName,
-        testSuiteName,
-        executionStrategy.getExecutionSettings().getItrCorrelationId(),
-        executionStrategy.getExecutionSettings().isTestSkippingEnabled(),
-        testClass,
-        startTime,
-        parallelized,
-        InstrumentationType.HEADLESS,
-        instrumentation,
-        config,
-        metricCollector,
-        testDecorator,
-        sourcePathResolver,
-        codeowners,
-        linesResolver,
-        coverageStoreFactory,
-        executionResults,
-        executionStrategy.getExecutionSettings().getConfigurationErrors(),
-        capabilities,
-        tagsPropagator::propagateCiVisibilityTags);
-  }
+    @Override
+    public int executionPriority(@Nullable TestIdentifier test, @Nonnull TestSourceData testSource) {
+        return executionStrategy.executionPriority(test, testSource);
+    }
+
+    @Override
+    public void end(@Nullable Long endTime) {
+        ExecutionSettings executionSettings = executionStrategy.getExecutionSettings();
+        executionSettings.getConfigurationErrors().applyTags(span);
+
+        if (executionSettings.isCodeCoverageEnabled()) {
+            setTag(Tags.TEST_CODE_COVERAGE_ENABLED, true);
+        }
+
+        if (executionSettings.isTestSkippingEnabled()) {
+            setTag(Tags.TEST_ITR_TESTS_SKIPPING_ENABLED, true);
+            setTag(Tags.TEST_ITR_TESTS_SKIPPING_TYPE, "test");
+
+            long testsSkippedTotal = executionResults.getTestsSkippedByItr();
+            setTag(Tags.TEST_ITR_TESTS_SKIPPING_COUNT, testsSkippedTotal);
+            if (testsSkippedTotal > 0) {
+                setTag(DDTags.CI_ITR_TESTS_SKIPPED, true);
+            }
+        }
+
+        EarlyFlakeDetectionSettings earlyFlakeDetectionSettings = executionSettings.getEarlyFlakeDetectionSettings();
+        if (earlyFlakeDetectionSettings.isEnabled()) {
+            setTag(Tags.TEST_EARLY_FLAKE_ENABLED, true);
+            if (executionStrategy.isEFDLimitReached()) {
+                setTag(Tags.TEST_EARLY_FLAKE_ABORT_REASON, Constants.EFD_ABORT_REASON_FAULTY);
+            }
+        }
+
+        TestManagementSettings testManagementSettings = executionSettings.getTestManagementSettings();
+        if (testManagementSettings.isEnabled()) {
+            setTag(Tags.TEST_TEST_MANAGEMENT_ENABLED, true);
+        }
+
+        if (executionResults.hasFailedTestReplayTests()) {
+            setTag(DDTags.TEST_HAS_FAILED_TEST_REPLAY, true);
+        }
+
+        super.end(endTime);
+    }
+
+    @Override
+    public TestSuiteImpl testSuiteStart(
+            String testSuiteName,
+            @Nullable Class<?> testClass,
+            @Nullable Long startTime,
+            boolean parallelized,
+            TestFrameworkInstrumentation instrumentation) {
+        return new TestSuiteImpl(
+                span.spanContext(),
+                moduleName,
+                testSuiteName,
+                executionStrategy.getExecutionSettings().getItrCorrelationId(),
+                executionStrategy.getExecutionSettings().isTestSkippingEnabled(),
+                testClass,
+                startTime,
+                parallelized,
+                InstrumentationType.HEADLESS,
+                instrumentation,
+                config,
+                metricCollector,
+                testDecorator,
+                sourcePathResolver,
+                codeowners,
+                linesResolver,
+                coverageStoreFactory,
+                executionResults,
+                executionStrategy.getExecutionSettings().getConfigurationErrors(),
+                capabilities,
+                tagsPropagator::propagateCiVisibilityTags);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java
index 8f42bedad0c..a6686172cea 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java
@@ -34,89 +34,88 @@
  */
 public class HeadlessTestSession extends AbstractTestSession implements TestFrameworkSession {
 
-  private final ExecutionStrategy executionStrategy;
-  private final CoverageStore.Factory coverageStoreFactory;
-  private final Collection<LibraryCapability> capabilities;
+    private final ExecutionStrategy executionStrategy;
+    private final CoverageStore.Factory coverageStoreFactory;
+    private final Collection<LibraryCapability> capabilities;
 
-  public HeadlessTestSession(
-      String projectName,
-      @Nullable Long startTime,
-      Provider ciProvider,
-      Config config,
-      CiVisibilityMetricCollector metricCollector,
-      TestDecorator testDecorator,
-      SourcePathResolver sourcePathResolver,
-      Codeowners codeowners,
-      LinesResolver linesResolver,
-      CoverageStore.Factory coverageStoreFactory,
-      ExecutionStrategy executionStrategy,
-      @Nonnull Collection<LibraryCapability> capabilities) {
-    super(
-        projectName,
-        startTime,
-        InstrumentationType.HEADLESS,
-        ciProvider,
-        config,
-        metricCollector,
-        testDecorator,
-        sourcePathResolver,
-        codeowners,
-        linesResolver);
-    this.executionStrategy = executionStrategy;
-    this.coverageStoreFactory = coverageStoreFactory;
-    this.capabilities = capabilities;
+    public HeadlessTestSession(
+            String projectName,
+            @Nullable Long startTime,
+            Provider ciProvider,
+            Config config,
+            CiVisibilityMetricCollector metricCollector,
+            TestDecorator testDecorator,
+            SourcePathResolver sourcePathResolver,
+            Codeowners codeowners,
+            LinesResolver linesResolver,
+            CoverageStore.Factory coverageStoreFactory,
+            ExecutionStrategy executionStrategy,
+            @Nonnull Collection<LibraryCapability> capabilities) {
+        super(
+                projectName,
+                startTime,
+                InstrumentationType.HEADLESS,
+                ciProvider,
+                config,
+                metricCollector,
+                testDecorator,
+                sourcePathResolver,
+                codeowners,
+                linesResolver);
+        this.executionStrategy = executionStrategy;
+        this.coverageStoreFactory = coverageStoreFactory;
+        this.capabilities = capabilities;
 
-    DynamicAutoTestRetrySettings dynamicAtrSettings =
-        executionStrategy.getExecutionSettings().getDynamicAutoTestRetrySettings();
-    if (dynamicAtrSettings.isEnabled()) {
-      metricCollector.add(
-          CiVisibilityCountMetric.DYNAMIC_ATR_RETRIES_ENABLED,
-          1,
-          dynamicAtrSettings.isCustom() ? HasCustomBuckets.TRUE : null);
+        DynamicAutoTestRetrySettings dynamicAtrSettings =
+                executionStrategy.getExecutionSettings().getDynamicAutoTestRetrySettings();
+        if (dynamicAtrSettings.isEnabled()) {
+            metricCollector.add(
+                    CiVisibilityCountMetric.DYNAMIC_ATR_RETRIES_ENABLED,
+                    1,
+                    dynamicAtrSettings.isCustom() ? HasCustomBuckets.TRUE : null);
+        }
     }
-  }
 
-  @Override
-  public HeadlessTestModule testModuleStart(String moduleName, @Nullable Long startTime) {
-    return new HeadlessTestModule(
-        span.spanContext(),
-        moduleName,
-        startTime,
-        config,
-        metricCollector,
-        testDecorator,
-        sourcePathResolver,
-        codeowners,
-        linesResolver,
-        coverageStoreFactory,
-        executionStrategy,
-        capabilities,
-        this::onModuleFinish);
-  }
+    @Override
+    public HeadlessTestModule testModuleStart(String moduleName, @Nullable Long startTime) {
+        return new HeadlessTestModule(
+                span.spanContext(),
+                moduleName,
+                startTime,
+                config,
+                metricCollector,
+                testDecorator,
+                sourcePathResolver,
+                codeowners,
+                linesResolver,
+                coverageStoreFactory,
+                executionStrategy,
+                capabilities,
+                this::onModuleFinish);
+    }
 
-  private void onModuleFinish(AgentSpan moduleSpan) {
-    tagPropagator.propagateCiVisibilityTags(moduleSpan);
-    tagPropagator.propagateTags(
-        moduleSpan,
-        TagMergeSpec.of(Tags.TEST_CODE_COVERAGE_ENABLED),
-        TagMergeSpec.of(Tags.TEST_ITR_TESTS_SKIPPING_ENABLED),
-        TagMergeSpec.of(Tags.TEST_ITR_TESTS_SKIPPING_TYPE),
-        TagMergeSpec.of(Tags.TEST_ITR_TESTS_SKIPPING_COUNT),
-        TagMergeSpec.of(Tags.TEST_EARLY_FLAKE_ENABLED),
-        TagMergeSpec.of(Tags.TEST_EARLY_FLAKE_ABORT_REASON),
-        TagMergeSpec.of(DDTags.CI_ITR_TESTS_SKIPPED),
-        TagMergeSpec.of(Tags.TEST_TEST_MANAGEMENT_ENABLED),
-        TagMergeSpec.of(DDTags.TEST_HAS_FAILED_TEST_REPLAY),
-        TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS, Boolean::logicalOr),
-        TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_SKIPPABLE_TESTS, Boolean::logicalOr),
-        TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_FLAKY_TESTS, Boolean::logicalOr),
-        TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS, Boolean::logicalOr),
-        TagMergeSpec.of(
-            DDTags.CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS, Boolean::logicalOr));
-  }
+    private void onModuleFinish(AgentSpan moduleSpan) {
+        tagPropagator.propagateCiVisibilityTags(moduleSpan);
+        tagPropagator.propagateTags(
+                moduleSpan,
+                TagMergeSpec.of(Tags.TEST_CODE_COVERAGE_ENABLED),
+                TagMergeSpec.of(Tags.TEST_ITR_TESTS_SKIPPING_ENABLED),
+                TagMergeSpec.of(Tags.TEST_ITR_TESTS_SKIPPING_TYPE),
+                TagMergeSpec.of(Tags.TEST_ITR_TESTS_SKIPPING_COUNT),
+                TagMergeSpec.of(Tags.TEST_EARLY_FLAKE_ENABLED),
+                TagMergeSpec.of(Tags.TEST_EARLY_FLAKE_ABORT_REASON),
+                TagMergeSpec.of(DDTags.CI_ITR_TESTS_SKIPPED),
+                TagMergeSpec.of(Tags.TEST_TEST_MANAGEMENT_ENABLED),
+                TagMergeSpec.of(DDTags.TEST_HAS_FAILED_TEST_REPLAY),
+                TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS, Boolean::logicalOr),
+                TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_SKIPPABLE_TESTS, Boolean::logicalOr),
+                TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_FLAKY_TESTS, Boolean::logicalOr),
+                TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS, Boolean::logicalOr),
+                TagMergeSpec.of(DDTags.CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS, Boolean::logicalOr));
+    }
 
-  @Override
-  public void end(@Nullable Long endTime) {
-    super.end(endTime);
-  }
+    @Override
+    public void end(@Nullable Long endTime) {
+        super.end(endTime);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java
index 8ca29a07079..80f463f7130 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java
@@ -27,69 +27,65 @@
  */
 public class ManualApiTestModule extends AbstractTestModule implements DDTestModule {
 
-  private final CoverageStore.Factory coverageStoreFactory;
-  private final ExecutionResults executionResults = new ExecutionResults();
+    private final CoverageStore.Factory coverageStoreFactory;
+    private final ExecutionResults executionResults = new ExecutionResults();
 
-  public ManualApiTestModule(
-      AgentSpanContext sessionSpanContext,
-      String moduleName,
-      @Nullable Long startTime,
-      Config config,
-      CiVisibilityMetricCollector metricCollector,
-      TestDecorator testDecorator,
-      SourcePathResolver sourcePathResolver,
-      Codeowners codeowners,
-      LinesResolver linesResolver,
-      CoverageStore.Factory coverageStoreFactory,
-      Consumer<AgentSpan> onSpanFinish) {
-    super(
-        sessionSpanContext,
-        moduleName,
-        startTime,
-        InstrumentationType.MANUAL_API,
-        config,
-        metricCollector,
-        testDecorator,
-        sourcePathResolver,
-        codeowners,
-        linesResolver,
-        onSpanFinish);
-    this.coverageStoreFactory = coverageStoreFactory;
-  }
+    public ManualApiTestModule(
+            AgentSpanContext sessionSpanContext,
+            String moduleName,
+            @Nullable Long startTime,
+            Config config,
+            CiVisibilityMetricCollector metricCollector,
+            TestDecorator testDecorator,
+            SourcePathResolver sourcePathResolver,
+            Codeowners codeowners,
+            LinesResolver linesResolver,
+            CoverageStore.Factory coverageStoreFactory,
+            Consumer<AgentSpan> onSpanFinish) {
+        super(
+                sessionSpanContext,
+                moduleName,
+                startTime,
+                InstrumentationType.MANUAL_API,
+                config,
+                metricCollector,
+                testDecorator,
+                sourcePathResolver,
+                codeowners,
+                linesResolver,
+                onSpanFinish);
+        this.coverageStoreFactory = coverageStoreFactory;
+    }
 
-  @Override
-  public ManualApiTestSuite testSuiteStart(
-      String testSuiteName,
-      @Nullable Class<?> testClass,
-      @Nullable Long startTime,
-      boolean parallelized) {
-    TestSuiteImpl suite =
-        new TestSuiteImpl(
-            span.spanContext(),
-            moduleName,
-            testSuiteName,
-            null,
-            false,
-            testClass,
-            startTime,
-            parallelized,
-            InstrumentationType.MANUAL_API,
-            TestFrameworkInstrumentation.OTHER, // for metric purposes, framework is OTHER
-            config,
-            metricCollector,
-            testDecorator,
-            sourcePathResolver,
-            codeowners,
-            linesResolver,
-            coverageStoreFactory,
-            executionResults,
-            ConfigurationErrors.NONE,
-            Collections.emptyList(),
-            tagsPropagator::propagateCiVisibilityTags);
+    @Override
+    public ManualApiTestSuite testSuiteStart(
+            String testSuiteName, @Nullable Class<?> testClass, @Nullable Long startTime, boolean parallelized) {
+        TestSuiteImpl suite = new TestSuiteImpl(
+                span.spanContext(),
+                moduleName,
+                testSuiteName,
+                null,
+                false,
+                testClass,
+                startTime,
+                parallelized,
+                InstrumentationType.MANUAL_API,
+                TestFrameworkInstrumentation.OTHER, // for metric purposes, framework is OTHER
+                config,
+                metricCollector,
+                testDecorator,
+                sourcePathResolver,
+                codeowners,
+                linesResolver,
+                coverageStoreFactory,
+                executionResults,
+                ConfigurationErrors.NONE,
+                Collections.emptyList(),
+                tagsPropagator::propagateCiVisibilityTags);
 
-    String frameworkName = testDecorator.component().toString();
-    suite.setTag(Tags.TEST_FRAMEWORK, frameworkName);
+        String frameworkName = testDecorator.component().toString();
+        suite.setTag(Tags.TEST_FRAMEWORK, frameworkName);
 
-    return new ManualApiTestSuite(suite, frameworkName);
-  }
+        return new ManualApiTestSuite(suite, frameworkName);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java
index 728b7d09b21..61a39b4d751 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java
@@ -19,46 +19,46 @@
  */
 public class ManualApiTestSession extends AbstractTestSession implements DDTestSession {
 
-  private final CoverageStore.Factory coverageStoreFactory;
+    private final CoverageStore.Factory coverageStoreFactory;
 
-  public ManualApiTestSession(
-      String projectName,
-      @Nullable Long startTime,
-      Provider ciProvider,
-      Config config,
-      CiVisibilityMetricCollector metricCollector,
-      TestDecorator testDecorator,
-      SourcePathResolver sourcePathResolver,
-      Codeowners codeowners,
-      LinesResolver linesResolver,
-      CoverageStore.Factory coverageStoreFactory) {
-    super(
-        projectName,
-        startTime,
-        InstrumentationType.MANUAL_API,
-        ciProvider,
-        config,
-        metricCollector,
-        testDecorator,
-        sourcePathResolver,
-        codeowners,
-        linesResolver);
-    this.coverageStoreFactory = coverageStoreFactory;
-  }
+    public ManualApiTestSession(
+            String projectName,
+            @Nullable Long startTime,
+            Provider ciProvider,
+            Config config,
+            CiVisibilityMetricCollector metricCollector,
+            TestDecorator testDecorator,
+            SourcePathResolver sourcePathResolver,
+            Codeowners codeowners,
+            LinesResolver linesResolver,
+            CoverageStore.Factory coverageStoreFactory) {
+        super(
+                projectName,
+                startTime,
+                InstrumentationType.MANUAL_API,
+                ciProvider,
+                config,
+                metricCollector,
+                testDecorator,
+                sourcePathResolver,
+                codeowners,
+                linesResolver);
+        this.coverageStoreFactory = coverageStoreFactory;
+    }
 
-  @Override
-  public ManualApiTestModule testModuleStart(String moduleName, @Nullable Long startTime) {
-    return new ManualApiTestModule(
-        span.spanContext(),
-        moduleName,
-        startTime,
-        config,
-        metricCollector,
-        testDecorator,
-        sourcePathResolver,
-        codeowners,
-        linesResolver,
-        coverageStoreFactory,
-        tagPropagator::propagateCiVisibilityTags);
-  }
+    @Override
+    public ManualApiTestModule testModuleStart(String moduleName, @Nullable Long startTime) {
+        return new ManualApiTestModule(
+                span.spanContext(),
+                moduleName,
+                startTime,
+                config,
+                metricCollector,
+                testDecorator,
+                sourcePathResolver,
+                codeowners,
+                linesResolver,
+                coverageStoreFactory,
+                tagPropagator::propagateCiVisibilityTags);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSuite.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSuite.java
index 312ce6c8cc9..339ac4fbe8f 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSuite.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSuite.java
@@ -14,38 +14,38 @@
  */
 public class ManualApiTestSuite implements DDTestSuite {
 
-  private final TestSuiteImpl delegate;
-  private final String frameworkName;
-
-  public ManualApiTestSuite(TestSuiteImpl delegate, String frameworkName) {
-    this.delegate = delegate;
-    this.frameworkName = frameworkName;
-  }
-
-  @Override
-  public void setTag(String key, Object value) {
-    delegate.setTag(key, value);
-  }
-
-  @Override
-  public void setErrorInfo(Throwable error) {
-    delegate.setErrorInfo(error);
-  }
-
-  @Override
-  public void setSkipReason(String skipReason) {
-    delegate.setSkipReason(skipReason);
-  }
-
-  @Override
-  public void end(@Nullable Long endTime) {
-    delegate.end(endTime);
-  }
-
-  @Override
-  public DDTest testStart(String testName, @Nullable Method testMethod, @Nullable Long startTime) {
-    TestImpl test = delegate.testStart(testName, testMethod, startTime);
-    test.setTag(Tags.TEST_FRAMEWORK, frameworkName);
-    return test;
-  }
+    private final TestSuiteImpl delegate;
+    private final String frameworkName;
+
+    public ManualApiTestSuite(TestSuiteImpl delegate, String frameworkName) {
+        this.delegate = delegate;
+        this.frameworkName = frameworkName;
+    }
+
+    @Override
+    public void setTag(String key, Object value) {
+        delegate.setTag(key, value);
+    }
+
+    @Override
+    public void setErrorInfo(Throwable error) {
+        delegate.setErrorInfo(error);
+    }
+
+    @Override
+    public void setSkipReason(String skipReason) {
+        delegate.setSkipReason(skipReason);
+    }
+
+    @Override
+    public void end(@Nullable Long endTime) {
+        delegate.end(endTime);
+    }
+
+    @Override
+    public DDTest testStart(String testName, @Nullable Method testMethod, @Nullable Long startTime) {
+        TestImpl test = delegate.testStart(testName, testMethod, startTime);
+        test.setTag(Tags.TEST_FRAMEWORK, frameworkName);
+        return test;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildEventsHandlerImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildEventsHandlerImpl.java
index 75ea9a4291b..58b8be18149 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildEventsHandlerImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildEventsHandlerImpl.java
@@ -21,188 +21,170 @@
 
 public class BuildEventsHandlerImpl<SessionKey> implements BuildEventsHandler<SessionKey> {
 
-  private final ConcurrentMap<SessionKey, BuildSystemSession> inProgressTestSessions =
-      new ConcurrentHashMap<>();
-
-  private final ConcurrentMap<BuildTaskDescriptor<SessionKey>, AgentSpan> inProgressBuildTasks =
-      new ConcurrentHashMap<>();
-
-  private final ConcurrentMap<BuildTaskDescriptor<SessionKey>, BuildSystemModule>
-      inProgressTestModules = new ConcurrentHashMap<>();
-
-  private final BuildSystemSession.Factory sessionFactory;
-  private final JvmInfoFactory jvmInfoFactory;
-
-  public BuildEventsHandlerImpl(
-      BuildSystemSession.Factory sessionFactory, JvmInfoFactory jvmInfoFactory) {
-    this.sessionFactory = sessionFactory;
-    this.jvmInfoFactory = jvmInfoFactory;
-  }
-
-  @Override
-  public void onTestSessionStart(
-      final SessionKey sessionKey,
-      final String projectName,
-      final Path projectRoot,
-      final String startCommand,
-      final String buildSystemName,
-      final String buildSystemVersion,
-      Map<String, Object> additionalTags) {
-    BuildSystemSession testSession =
-        sessionFactory.startSession(projectName, projectRoot, startCommand, buildSystemName, null);
-
-    if (additionalTags != null) {
-      for (Map.Entry<String, Object> e : additionalTags.entrySet()) {
-        String tag = e.getKey();
-        Object value = e.getValue();
-        testSession.setTag(tag, value);
-      }
+    private final ConcurrentMap<SessionKey, BuildSystemSession> inProgressTestSessions = new ConcurrentHashMap<>();
+
+    private final ConcurrentMap<BuildTaskDescriptor<SessionKey>, AgentSpan> inProgressBuildTasks =
+            new ConcurrentHashMap<>();
+
+    private final ConcurrentMap<BuildTaskDescriptor<SessionKey>, BuildSystemModule> inProgressTestModules =
+            new ConcurrentHashMap<>();
+
+    private final BuildSystemSession.Factory sessionFactory;
+    private final JvmInfoFactory jvmInfoFactory;
+
+    public BuildEventsHandlerImpl(BuildSystemSession.Factory sessionFactory, JvmInfoFactory jvmInfoFactory) {
+        this.sessionFactory = sessionFactory;
+        this.jvmInfoFactory = jvmInfoFactory;
+    }
+
+    @Override
+    public void onTestSessionStart(
+            final SessionKey sessionKey,
+            final String projectName,
+            final Path projectRoot,
+            final String startCommand,
+            final String buildSystemName,
+            final String buildSystemVersion,
+            Map<String, Object> additionalTags) {
+        BuildSystemSession testSession =
+                sessionFactory.startSession(projectName, projectRoot, startCommand, buildSystemName, null);
+
+        if (additionalTags != null) {
+            for (Map.Entry<String, Object> e : additionalTags.entrySet()) {
+                String tag = e.getKey();
+                Object value = e.getValue();
+                testSession.setTag(tag, value);
+            }
+        }
+
+        testSession.setTag(Tags.TEST_TOOLCHAIN, buildSystemName + ":" + buildSystemVersion);
+        inProgressTestSessions.put(sessionKey, testSession);
+    }
+
+    @Override
+    public void onTestSessionFail(final SessionKey sessionKey, final Throwable throwable) {
+        BuildSystemSession testSession = getTestSession(sessionKey);
+        testSession.setErrorInfo(throwable);
+    }
+
+    private BuildSystemSession getTestSession(SessionKey sessionKey) {
+        BuildSystemSession testSession = inProgressTestSessions.get(sessionKey);
+        if (testSession == null) {
+            throw new IllegalStateException("Could not find session span for key: " + sessionKey);
+        }
+        return testSession;
     }
 
-    testSession.setTag(Tags.TEST_TOOLCHAIN, buildSystemName + ":" + buildSystemVersion);
-    inProgressTestSessions.put(sessionKey, testSession);
-  }
+    @Override
+    public void onTestSessionFinish(final SessionKey sessionKey) {
+        BuildSystemSession testSession = inProgressTestSessions.remove(sessionKey);
+        testSession.end(null);
+    }
 
-  @Override
-  public void onTestSessionFail(final SessionKey sessionKey, final Throwable throwable) {
-    BuildSystemSession testSession = getTestSession(sessionKey);
-    testSession.setErrorInfo(throwable);
-  }
+    @Override
+    public void onBuildTaskStart(SessionKey sessionKey, String taskName, Map<String, Object> additionalTags) {
+        BuildSystemSession testSession = inProgressTestSessions.get(sessionKey);
+        if (testSession == null) {
+            throw new IllegalStateException("Could not find session span for key: " + sessionKey);
+        }
+        AgentSpan buildTask = testSession.testTaskStart(taskName);
+        for (Map.Entry<String, Object> e : additionalTags.entrySet()) {
+            buildTask.setTag(e.getKey(), e.getValue());
+        }
+        inProgressBuildTasks.put(new BuildTaskDescriptor<>(sessionKey, taskName), buildTask);
+    }
 
-  private BuildSystemSession getTestSession(SessionKey sessionKey) {
-    BuildSystemSession testSession = inProgressTestSessions.get(sessionKey);
-    if (testSession == null) {
-      throw new IllegalStateException("Could not find session span for key: " + sessionKey);
+    @Override
+    public void onBuildTaskFail(SessionKey sessionKey, String taskName, Throwable throwable) {
+        AgentSpan buildTask = inProgressBuildTasks.get(new BuildTaskDescriptor<>(sessionKey, taskName));
+        if (buildTask == null) {
+            throw new IllegalStateException(
+                    "Could not find build task span for session key " + sessionKey + " and task name " + taskName);
+        }
+        buildTask.setError(true);
+        buildTask.addThrowable(throwable);
     }
-    return testSession;
-  }
-
-  @Override
-  public void onTestSessionFinish(final SessionKey sessionKey) {
-    BuildSystemSession testSession = inProgressTestSessions.remove(sessionKey);
-    testSession.end(null);
-  }
-
-  @Override
-  public void onBuildTaskStart(
-      SessionKey sessionKey, String taskName, Map<String, Object> additionalTags) {
-    BuildSystemSession testSession = inProgressTestSessions.get(sessionKey);
-    if (testSession == null) {
-      throw new IllegalStateException("Could not find session span for key: " + sessionKey);
+
+    @Override
+    public void onBuildTaskFinish(SessionKey sessionKey, String taskName) {
+        AgentSpan buildTask = inProgressBuildTasks.get(new BuildTaskDescriptor<>(sessionKey, taskName));
+        if (buildTask == null) {
+            throw new IllegalStateException(
+                    "Could not find build task span for session key " + sessionKey + " and task name " + taskName);
+        }
+        buildTask.finish();
+    }
+
+    @Override
+    public BuildModuleSettings onTestModuleStart(
+            final SessionKey sessionKey,
+            final String moduleName,
+            BuildModuleLayout moduleLayout,
+            @Nullable Path jvmExecutable,
+            @Nullable Collection<Path> classpath,
+            @Nullable JavaAgent jacocoAgent,
+            @Nullable Map<String, Object> additionalTags) {
+
+        BuildSystemSession testSession = inProgressTestSessions.get(sessionKey);
+        JvmInfo jvmInfo = jvmInfoFactory.getJvmInfo(jvmExecutable);
+        BuildSystemModule testModule =
+                testSession.testModuleStart(moduleName, null, moduleLayout, jvmInfo, classpath, jacocoAgent);
+        testModule.setTag(Tags.TEST_STATUS, TestStatus.pass);
+
+        if (additionalTags != null) {
+            for (Map.Entry<String, Object> e : additionalTags.entrySet()) {
+                String tag = e.getKey();
+                Object value = e.getValue();
+                testModule.setTag(tag, value);
+            }
+        }
+
+        BuildTaskDescriptor<SessionKey> testModuleDescriptor = new BuildTaskDescriptor<>(sessionKey, moduleName);
+        inProgressTestModules.put(testModuleDescriptor, testModule);
+
+        return testModule.getSettings();
     }
-    AgentSpan buildTask = testSession.testTaskStart(taskName);
-    for (Map.Entry<String, Object> e : additionalTags.entrySet()) {
-      buildTask.setTag(e.getKey(), e.getValue());
+
+    @Override
+    public void onTestModuleSkip(final SessionKey sessionKey, final String moduleName, final String reason) {
+        BuildSystemModule testModule = getTestModule(sessionKey, moduleName);
+        testModule.setSkipReason(reason);
     }
-    inProgressBuildTasks.put(new BuildTaskDescriptor<>(sessionKey, taskName), buildTask);
-  }
-
-  @Override
-  public void onBuildTaskFail(SessionKey sessionKey, String taskName, Throwable throwable) {
-    AgentSpan buildTask = inProgressBuildTasks.get(new BuildTaskDescriptor<>(sessionKey, taskName));
-    if (buildTask == null) {
-      throw new IllegalStateException(
-          "Could not find build task span for session key "
-              + sessionKey
-              + " and task name "
-              + taskName);
+
+    @Override
+    public void onTestModuleFail(final SessionKey sessionKey, final String moduleName, final Throwable throwable) {
+        BuildSystemModule testModule = getTestModule(sessionKey, moduleName);
+        testModule.setErrorInfo(throwable);
     }
-    buildTask.setError(true);
-    buildTask.addThrowable(throwable);
-  }
-
-  @Override
-  public void onBuildTaskFinish(SessionKey sessionKey, String taskName) {
-    AgentSpan buildTask = inProgressBuildTasks.get(new BuildTaskDescriptor<>(sessionKey, taskName));
-    if (buildTask == null) {
-      throw new IllegalStateException(
-          "Could not find build task span for session key "
-              + sessionKey
-              + " and task name "
-              + taskName);
+
+    private BuildSystemModule getTestModule(final SessionKey sessionKey, final String moduleName) {
+        BuildTaskDescriptor<SessionKey> testModuleDescriptor = new BuildTaskDescriptor<>(sessionKey, moduleName);
+        BuildSystemModule testModule = inProgressTestModules.get(testModuleDescriptor);
+        if (testModule == null) {
+            throw new IllegalStateException(
+                    "Could not find module for session key " + sessionKey + " and module name " + moduleName);
+        }
+        return testModule;
     }
-    buildTask.finish();
-  }
-
-  @Override
-  public BuildModuleSettings onTestModuleStart(
-      final SessionKey sessionKey,
-      final String moduleName,
-      BuildModuleLayout moduleLayout,
-      @Nullable Path jvmExecutable,
-      @Nullable Collection<Path> classpath,
-      @Nullable JavaAgent jacocoAgent,
-      @Nullable Map<String, Object> additionalTags) {
-
-    BuildSystemSession testSession = inProgressTestSessions.get(sessionKey);
-    JvmInfo jvmInfo = jvmInfoFactory.getJvmInfo(jvmExecutable);
-    BuildSystemModule testModule =
-        testSession.testModuleStart(
-            moduleName, null, moduleLayout, jvmInfo, classpath, jacocoAgent);
-    testModule.setTag(Tags.TEST_STATUS, TestStatus.pass);
-
-    if (additionalTags != null) {
-      for (Map.Entry<String, Object> e : additionalTags.entrySet()) {
-        String tag = e.getKey();
-        Object value = e.getValue();
-        testModule.setTag(tag, value);
-      }
+
+    @Override
+    public void onTestModuleFinish(SessionKey sessionKey, String moduleName) {
+        BuildTaskDescriptor<SessionKey> testModuleDescriptor = new BuildTaskDescriptor<>(sessionKey, moduleName);
+        BuildSystemModule testModule = inProgressTestModules.remove(testModuleDescriptor);
+        if (testModule == null) {
+            throw new IllegalStateException(
+                    "Could not find module span for session key " + sessionKey + " and module name " + moduleName);
+        }
+        testModule.end(null);
     }
 
-    BuildTaskDescriptor<SessionKey> testModuleDescriptor =
-        new BuildTaskDescriptor<>(sessionKey, moduleName);
-    inProgressTestModules.put(testModuleDescriptor, testModule);
-
-    return testModule.getSettings();
-  }
-
-  @Override
-  public void onTestModuleSkip(
-      final SessionKey sessionKey, final String moduleName, final String reason) {
-    BuildSystemModule testModule = getTestModule(sessionKey, moduleName);
-    testModule.setSkipReason(reason);
-  }
-
-  @Override
-  public void onTestModuleFail(
-      final SessionKey sessionKey, final String moduleName, final Throwable throwable) {
-    BuildSystemModule testModule = getTestModule(sessionKey, moduleName);
-    testModule.setErrorInfo(throwable);
-  }
-
-  private BuildSystemModule getTestModule(final SessionKey sessionKey, final String moduleName) {
-    BuildTaskDescriptor<SessionKey> testModuleDescriptor =
-        new BuildTaskDescriptor<>(sessionKey, moduleName);
-    BuildSystemModule testModule = inProgressTestModules.get(testModuleDescriptor);
-    if (testModule == null) {
-      throw new IllegalStateException(
-          "Could not find module for session key " + sessionKey + " and module name " + moduleName);
+    @Override
+    public BuildSessionSettings getSessionSettings(SessionKey sessionKey) {
+        return getTestSession(sessionKey).getSettings();
     }
-    return testModule;
-  }
-
-  @Override
-  public void onTestModuleFinish(SessionKey sessionKey, String moduleName) {
-    BuildTaskDescriptor<SessionKey> testModuleDescriptor =
-        new BuildTaskDescriptor<>(sessionKey, moduleName);
-    BuildSystemModule testModule = inProgressTestModules.remove(testModuleDescriptor);
-    if (testModule == null) {
-      throw new IllegalStateException(
-          "Could not find module span for session key "
-              + sessionKey
-              + " and module name "
-              + moduleName);
+
+    @Override
+    public BuildModuleSettings getModuleSettings(SessionKey sessionKey, String moduleName) {
+        return getTestModule(sessionKey, moduleName).getSettings();
     }
-    testModule.end(null);
-  }
-
-  @Override
-  public BuildSessionSettings getSessionSettings(SessionKey sessionKey) {
-    return getTestSession(sessionKey).getSettings();
-  }
-
-  @Override
-  public BuildModuleSettings getModuleSettings(SessionKey sessionKey, String moduleName) {
-    return getTestModule(sessionKey, moduleName).getSettings();
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildTaskDescriptor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildTaskDescriptor.java
index 648a98a1f12..91afdf9b56a 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildTaskDescriptor.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildTaskDescriptor.java
@@ -4,28 +4,28 @@
 
 public class BuildTaskDescriptor<T> {
 
-  private final T sessionKey;
-  private final String taskName;
+    private final T sessionKey;
+    private final String taskName;
 
-  public BuildTaskDescriptor(T sessionKey, String taskName) {
-    this.sessionKey = sessionKey;
-    this.taskName = taskName;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public BuildTaskDescriptor(T sessionKey, String taskName) {
+        this.sessionKey = sessionKey;
+        this.taskName = taskName;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        BuildTaskDescriptor<?> that = (BuildTaskDescriptor<?>) o;
+        return sessionKey.equals(that.sessionKey) && taskName.equals(that.taskName);
     }
-    BuildTaskDescriptor<?> that = (BuildTaskDescriptor<?>) o;
-    return sessionKey.equals(that.sessionKey) && taskName.equals(that.taskName);
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(sessionKey, taskName);
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(sessionKey, taskName);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java
index cc9a88830a6..ab100a7418f 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java
@@ -16,115 +16,113 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public class NoOpTestEventsHandler<SuiteKey, TestKey>
-    implements TestEventsHandler<SuiteKey, TestKey> {
-
-  @Override
-  public void onTestSuiteStart(
-      SuiteKey descriptor,
-      String testSuiteName,
-      @Nullable String testFramework,
-      @Nullable String testFrameworkVersion,
-      @Nullable Class<?> testClass,
-      @Nullable Collection<String> categories,
-      boolean parallelized,
-      TestFrameworkInstrumentation instrumentation,
-      @Nullable Long startTime) {
-    // do nothing
-  }
-
-  @Override
-  public void onTestSuiteSkip(SuiteKey descriptor, @Nullable String reason) {
-    // do nothing
-  }
-
-  @Override
-  public void onTestSuiteFailure(SuiteKey descriptor, @Nullable Throwable throwable) {
-    // do nothing
-  }
-
-  @Override
-  public void onTestSuiteFinish(SuiteKey descriptor, @Nullable Long endTime) {
-    // do nothing
-  }
-
-  @Override
-  public void onTestStart(
-      SuiteKey suiteDescriptor,
-      TestKey descriptor,
-      String testName,
-      @Nullable String testFramework,
-      @Nullable String testFrameworkVersion,
-      @Nullable String testParameters,
-      @Nullable Collection<String> categories,
-      @Nonnull TestSourceData testSourceData,
-      @Nullable Long startTime,
-      @Nullable TestExecutionTracker testExecutionTracker) {
-    // do nothing
-  }
-
-  @Override
-  public void onTestSkip(TestKey descriptor, @Nullable String reason) {
-    // do nothing
-  }
-
-  @Override
-  public void onTestFailure(TestKey descriptor, @Nullable Throwable throwable) {
-    // do nothing
-  }
-
-  @Override
-  public void onTestFinish(
-      TestKey descriptor, @Nullable Long endTime, @Nullable TestExecutionTracker executionTracker) {
-    // do nothing
-  }
-
-  @Override
-  public void onTestIgnore(
-      SuiteKey suiteDescriptor,
-      TestKey testDescriptor,
-      String testName,
-      @Nullable String testFramework,
-      @Nullable String testFrameworkVersion,
-      @Nullable String testParameters,
-      @Nullable Collection<String> categories,
-      @Nonnull TestSourceData testSourceData,
-      @Nullable String reason,
-      @Nullable TestExecutionTracker testExecutionTracker) {
-    // do nothing
-  }
-
-  @Override
-  public SkipReason skipReason(TestIdentifier test) {
-    return null;
-  }
-
-  @Nonnull
-  @Override
-  public TestExecutionPolicy executionPolicy(
-      TestIdentifier test, TestSourceData source, Collection<String> testTags) {
-    return Regular.INSTANCE;
-  }
-
-  @Override
-  public int executionPriority(
-      @Nullable TestIdentifier test, @Nonnull TestSourceData testSourceData) {
-    return 0;
-  }
-
-  @Override
-  public void close() {
-    // do nothing
-  }
-
-  public static final class Factory implements TestEventsHandler.Factory {
+public class NoOpTestEventsHandler<SuiteKey, TestKey> implements TestEventsHandler<SuiteKey, TestKey> {
+
+    @Override
+    public void onTestSuiteStart(
+            SuiteKey descriptor,
+            String testSuiteName,
+            @Nullable String testFramework,
+            @Nullable String testFrameworkVersion,
+            @Nullable Class<?> testClass,
+            @Nullable Collection<String> categories,
+            boolean parallelized,
+            TestFrameworkInstrumentation instrumentation,
+            @Nullable Long startTime) {
+        // do nothing
+    }
+
+    @Override
+    public void onTestSuiteSkip(SuiteKey descriptor, @Nullable String reason) {
+        // do nothing
+    }
+
+    @Override
+    public void onTestSuiteFailure(SuiteKey descriptor, @Nullable Throwable throwable) {
+        // do nothing
+    }
+
     @Override
-    public <SuiteKey, TestKey> TestEventsHandler<SuiteKey, TestKey> create(
-        String component,
-        @Nullable ContextStore<SuiteKey, DDTestSuite> suiteStore,
-        @Nullable ContextStore<TestKey, DDTest> testStore,
-        Collection<LibraryCapability> capabilities) {
-      return new NoOpTestEventsHandler<>();
+    public void onTestSuiteFinish(SuiteKey descriptor, @Nullable Long endTime) {
+        // do nothing
+    }
+
+    @Override
+    public void onTestStart(
+            SuiteKey suiteDescriptor,
+            TestKey descriptor,
+            String testName,
+            @Nullable String testFramework,
+            @Nullable String testFrameworkVersion,
+            @Nullable String testParameters,
+            @Nullable Collection<String> categories,
+            @Nonnull TestSourceData testSourceData,
+            @Nullable Long startTime,
+            @Nullable TestExecutionTracker testExecutionTracker) {
+        // do nothing
+    }
+
+    @Override
+    public void onTestSkip(TestKey descriptor, @Nullable String reason) {
+        // do nothing
+    }
+
+    @Override
+    public void onTestFailure(TestKey descriptor, @Nullable Throwable throwable) {
+        // do nothing
+    }
+
+    @Override
+    public void onTestFinish(
+            TestKey descriptor, @Nullable Long endTime, @Nullable TestExecutionTracker executionTracker) {
+        // do nothing
+    }
+
+    @Override
+    public void onTestIgnore(
+            SuiteKey suiteDescriptor,
+            TestKey testDescriptor,
+            String testName,
+            @Nullable String testFramework,
+            @Nullable String testFrameworkVersion,
+            @Nullable String testParameters,
+            @Nullable Collection<String> categories,
+            @Nonnull TestSourceData testSourceData,
+            @Nullable String reason,
+            @Nullable TestExecutionTracker testExecutionTracker) {
+        // do nothing
+    }
+
+    @Override
+    public SkipReason skipReason(TestIdentifier test) {
+        return null;
+    }
+
+    @Nonnull
+    @Override
+    public TestExecutionPolicy executionPolicy(
+            TestIdentifier test, TestSourceData source, Collection<String> testTags) {
+        return Regular.INSTANCE;
+    }
+
+    @Override
+    public int executionPriority(@Nullable TestIdentifier test, @Nonnull TestSourceData testSourceData) {
+        return 0;
+    }
+
+    @Override
+    public void close() {
+        // do nothing
+    }
+
+    public static final class Factory implements TestEventsHandler.Factory {
+        @Override
+        public <SuiteKey, TestKey> TestEventsHandler<SuiteKey, TestKey> create(
+                String component,
+                @Nullable ContextStore<SuiteKey, DDTestSuite> suiteStore,
+                @Nullable ContextStore<TestKey, DDTest> testStore,
+                Collection<LibraryCapability> capabilities) {
+            return new NoOpTestEventsHandler<>();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java
index 0e237f02abb..b03bc2e33a8 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java
@@ -32,341 +32,334 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TestEventsHandlerImpl<SuiteKey, TestKey>
-    implements TestEventsHandler<SuiteKey, TestKey> {
-
-  private static final Logger log = LoggerFactory.getLogger(TestEventsHandlerImpl.class);
-
-  private final CiVisibilityMetricCollector metricCollector;
-  private final Supplier<TestFrameworkSession> testSessionSupplier;
-  private final String moduleName;
-  private final ContextStore<SuiteKey, TestSuiteImpl> inProgressTestSuites;
-  private final ContextStore<TestKey, TestImpl> inProgressTests;
-  private TestFrameworkSession testSession;
-  private volatile TestFrameworkModule testModule;
-
-  public TestEventsHandlerImpl(
-      CiVisibilityMetricCollector metricCollector,
-      Supplier<TestFrameworkSession> testSessionSupplier,
-      String moduleName,
-      boolean eagerSessionStart,
-      ContextStore<SuiteKey, DDTestSuite> suiteStore,
-      ContextStore<TestKey, DDTest> testStore) {
-    this.metricCollector = metricCollector;
-    this.testSessionSupplier = testSessionSupplier;
-    this.moduleName = moduleName;
-    this.inProgressTestSuites = (ContextStore) suiteStore;
-    this.inProgressTests = (ContextStore) testStore;
-    if (eagerSessionStart) {
-      getOrCreateTestModule();
+public class TestEventsHandlerImpl<SuiteKey, TestKey> implements TestEventsHandler<SuiteKey, TestKey> {
+
+    private static final Logger log = LoggerFactory.getLogger(TestEventsHandlerImpl.class);
+
+    private final CiVisibilityMetricCollector metricCollector;
+    private final Supplier<TestFrameworkSession> testSessionSupplier;
+    private final String moduleName;
+    private final ContextStore<SuiteKey, TestSuiteImpl> inProgressTestSuites;
+    private final ContextStore<TestKey, TestImpl> inProgressTests;
+    private TestFrameworkSession testSession;
+    private volatile TestFrameworkModule testModule;
+
+    public TestEventsHandlerImpl(
+            CiVisibilityMetricCollector metricCollector,
+            Supplier<TestFrameworkSession> testSessionSupplier,
+            String moduleName,
+            boolean eagerSessionStart,
+            ContextStore<SuiteKey, DDTestSuite> suiteStore,
+            ContextStore<TestKey, DDTest> testStore) {
+        this.metricCollector = metricCollector;
+        this.testSessionSupplier = testSessionSupplier;
+        this.moduleName = moduleName;
+        this.inProgressTestSuites = (ContextStore) suiteStore;
+        this.inProgressTests = (ContextStore) testStore;
+        if (eagerSessionStart) {
+            getOrCreateTestModule();
+        }
     }
-  }
 
-  private TestFrameworkModule getOrCreateTestModule() {
-    TestFrameworkModule current = testModule;
-    if (current == null) {
-      synchronized (this) {
-        current = testModule;
+    private TestFrameworkModule getOrCreateTestModule() {
+        TestFrameworkModule current = testModule;
         if (current == null) {
-          testSession = testSessionSupplier.get();
-          testModule = current = testSession.testModuleStart(moduleName, null);
+            synchronized (this) {
+                current = testModule;
+                if (current == null) {
+                    testSession = testSessionSupplier.get();
+                    testModule = current = testSession.testModuleStart(moduleName, null);
+                }
+            }
         }
-      }
+        return current;
     }
-    return current;
-  }
-
-  private static boolean skipTrace(final Class<?> testClass) {
-    return testClass != null && testClass.getAnnotation(DisableTestTrace.class) != null;
-  }
-
-  @Override
-  public void onTestSuiteStart(
-      final SuiteKey descriptor,
-      final String testSuiteName,
-      final @Nullable String testFramework,
-      final @Nullable String testFrameworkVersion,
-      final @Nullable Class<?> testClass,
-      final @Nullable Collection<String> categories,
-      boolean parallelized,
-      TestFrameworkInstrumentation instrumentation,
-      @Nullable Long startTime) {
-    TestFrameworkModule testModule = getOrCreateTestModule();
-    if (skipTrace(testClass)) {
-      return;
+
+    private static boolean skipTrace(final Class<?> testClass) {
+        return testClass != null && testClass.getAnnotation(DisableTestTrace.class) != null;
     }
 
-    TestSuiteImpl testSuite =
-        testModule.testSuiteStart(
-            testSuiteName, testClass, startTime, parallelized, instrumentation);
+    @Override
+    public void onTestSuiteStart(
+            final SuiteKey descriptor,
+            final String testSuiteName,
+            final @Nullable String testFramework,
+            final @Nullable String testFrameworkVersion,
+            final @Nullable Class<?> testClass,
+            final @Nullable Collection<String> categories,
+            boolean parallelized,
+            TestFrameworkInstrumentation instrumentation,
+            @Nullable Long startTime) {
+        TestFrameworkModule testModule = getOrCreateTestModule();
+        if (skipTrace(testClass)) {
+            return;
+        }
 
-    if (testFramework != null) {
-      testSuite.setTag(Tags.TEST_FRAMEWORK, testFramework);
-      if (testFrameworkVersion != null) {
-        testSuite.setTag(Tags.TEST_FRAMEWORK_VERSION, testFrameworkVersion);
-      }
-    }
-    if (categories != null && !categories.isEmpty()) {
-      testSuite.setTag(Tags.TEST_TRAITS, getTestTraits(categories));
-    }
+        TestSuiteImpl testSuite =
+                testModule.testSuiteStart(testSuiteName, testClass, startTime, parallelized, instrumentation);
 
-    inProgressTestSuites.put(descriptor, testSuite);
-  }
-
-  private String getTestTraits(Collection<String> categories) {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer.beginObject().name("category").beginArray();
-      for (String category : categories) {
-        writer.value(category);
-      }
-      writer.endArray().endObject();
-      return writer.toString();
-    }
-  }
+        if (testFramework != null) {
+            testSuite.setTag(Tags.TEST_FRAMEWORK, testFramework);
+            if (testFrameworkVersion != null) {
+                testSuite.setTag(Tags.TEST_FRAMEWORK_VERSION, testFrameworkVersion);
+            }
+        }
+        if (categories != null && !categories.isEmpty()) {
+            testSuite.setTag(Tags.TEST_TRAITS, getTestTraits(categories));
+        }
 
-  @Override
-  public void onTestSuiteFinish(SuiteKey descriptor, @Nullable Long endTime) {
-    getOrCreateTestModule();
-    if (skipTrace(descriptor.getClass())) {
-      return;
+        inProgressTestSuites.put(descriptor, testSuite);
     }
 
-    TestSuiteImpl testSuite = inProgressTestSuites.remove(descriptor);
-    testSuite.end(endTime);
-  }
-
-  @Override
-  public void onTestSuiteSkip(SuiteKey descriptor, @Nullable String reason) {
-    getOrCreateTestModule();
-    TestSuiteImpl testSuite = inProgressTestSuites.get(descriptor);
-    if (testSuite == null) {
-      log.debug("Ignoring skip event, could not find test suite {}", descriptor);
-      return;
+    private String getTestTraits(Collection<String> categories) {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginObject().name("category").beginArray();
+            for (String category : categories) {
+                writer.value(category);
+            }
+            writer.endArray().endObject();
+            return writer.toString();
+        }
     }
-    testSuite.setSkipReason(reason);
-  }
-
-  @Override
-  public void onTestSuiteFailure(SuiteKey descriptor, @Nullable Throwable throwable) {
-    getOrCreateTestModule();
-    TestSuiteImpl testSuite = inProgressTestSuites.get(descriptor);
-    if (testSuite == null) {
-      log.debug("Ignoring fail event, could not find test suite {}", descriptor);
-      return;
+
+    @Override
+    public void onTestSuiteFinish(SuiteKey descriptor, @Nullable Long endTime) {
+        getOrCreateTestModule();
+        if (skipTrace(descriptor.getClass())) {
+            return;
+        }
+
+        TestSuiteImpl testSuite = inProgressTestSuites.remove(descriptor);
+        testSuite.end(endTime);
     }
-    testSuite.setErrorInfo(throwable);
-  }
-
-  @Override
-  public void onTestStart(
-      final SuiteKey suiteDescriptor,
-      final TestKey descriptor,
-      final String testName,
-      final @Nullable String testFramework,
-      final @Nullable String testFrameworkVersion,
-      final @Nullable String testParameters,
-      final @Nullable Collection<String> categories,
-      final @Nonnull TestSourceData testSourceData,
-      final @Nullable Long startTime,
-      final @Nullable TestExecutionTracker testExecutionTracker) {
-    TestFrameworkModule testModule = getOrCreateTestModule();
-    if (skipTrace(testSourceData.getTestClass())) {
-      return;
+
+    @Override
+    public void onTestSuiteSkip(SuiteKey descriptor, @Nullable String reason) {
+        getOrCreateTestModule();
+        TestSuiteImpl testSuite = inProgressTestSuites.get(descriptor);
+        if (testSuite == null) {
+            log.debug("Ignoring skip event, could not find test suite {}", descriptor);
+            return;
+        }
+        testSuite.setSkipReason(reason);
     }
 
-    TestSuiteImpl testSuite = inProgressTestSuites.get(suiteDescriptor);
-    if (testSuite == null) {
-      throw new IllegalStateException(
-          "Could not find test suite with descriptor "
-              + suiteDescriptor
-              + "; test descriptor: "
-              + descriptor);
+    @Override
+    public void onTestSuiteFailure(SuiteKey descriptor, @Nullable Throwable throwable) {
+        getOrCreateTestModule();
+        TestSuiteImpl testSuite = inProgressTestSuites.get(descriptor);
+        if (testSuite == null) {
+            log.debug("Ignoring fail event, could not find test suite {}", descriptor);
+            return;
+        }
+        testSuite.setErrorInfo(throwable);
     }
 
-    TestImpl test =
-        testSuite.testStart(testName, testParameters, testSourceData.getTestMethod(), startTime);
+    @Override
+    public void onTestStart(
+            final SuiteKey suiteDescriptor,
+            final TestKey descriptor,
+            final String testName,
+            final @Nullable String testFramework,
+            final @Nullable String testFrameworkVersion,
+            final @Nullable String testParameters,
+            final @Nullable Collection<String> categories,
+            final @Nonnull TestSourceData testSourceData,
+            final @Nullable Long startTime,
+            final @Nullable TestExecutionTracker testExecutionTracker) {
+        TestFrameworkModule testModule = getOrCreateTestModule();
+        if (skipTrace(testSourceData.getTestClass())) {
+            return;
+        }
 
-    TestIdentifier thisTest = test.getIdentifier();
-    if (testModule.isNew(thisTest)) {
-      test.setTag(Tags.TEST_IS_NEW, true);
-    }
+        TestSuiteImpl testSuite = inProgressTestSuites.get(suiteDescriptor);
+        if (testSuite == null) {
+            throw new IllegalStateException("Could not find test suite with descriptor "
+                    + suiteDescriptor
+                    + "; test descriptor: "
+                    + descriptor);
+        }
 
-    if (testModule.isModified(testSourceData)) {
-      test.setTag(Tags.TEST_IS_MODIFIED, true);
-    }
+        TestImpl test = testSuite.testStart(testName, testParameters, testSourceData.getTestMethod(), startTime);
 
-    if (testModule.isQuarantined(thisTest)) {
-      test.setTag(Tags.TEST_TEST_MANAGEMENT_IS_QUARANTINED, true);
-    }
+        TestIdentifier thisTest = test.getIdentifier();
+        if (testModule.isNew(thisTest)) {
+            test.setTag(Tags.TEST_IS_NEW, true);
+        }
 
-    if (testModule.isDisabled(thisTest)) {
-      test.setTag(Tags.TEST_TEST_MANAGEMENT_IS_TEST_DISABLED, true);
-    }
+        if (testModule.isModified(testSourceData)) {
+            test.setTag(Tags.TEST_IS_MODIFIED, true);
+        }
 
-    if (testModule.isAttemptToFix(thisTest)) {
-      test.setTag(Tags.TEST_TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX, true);
-    }
+        if (testModule.isQuarantined(thisTest)) {
+            test.setTag(Tags.TEST_TEST_MANAGEMENT_IS_QUARANTINED, true);
+        }
 
-    if (testExecutionTracker != null) {
-      test.getContext().set(TestExecutionTracker.class, testExecutionTracker);
-    }
+        if (testModule.isDisabled(thisTest)) {
+            test.setTag(Tags.TEST_TEST_MANAGEMENT_IS_TEST_DISABLED, true);
+        }
 
-    if (testFramework != null) {
-      test.setTag(Tags.TEST_FRAMEWORK, testFramework);
-      if (testFrameworkVersion != null) {
-        test.setTag(Tags.TEST_FRAMEWORK_VERSION, testFrameworkVersion);
-      }
-    }
-    if (testParameters != null) {
-      test.setTag(Tags.TEST_PARAMETERS, testParameters);
-    }
-    if (testSourceData.getTestMethodName() != null && testSourceData.getTestMethod() != null) {
-      test.setTag(
-          Tags.TEST_SOURCE_METHOD,
-          testSourceData.getTestMethodName()
-              + Type.getMethodDescriptor(testSourceData.getTestMethod()));
-    }
-    if (categories != null && !categories.isEmpty()) {
-      test.setTag(Tags.TEST_TRAITS, getTestTraits(categories));
-
-      for (String category : categories) {
-        if (category.endsWith(CIConstants.Tags.ITR_UNSKIPPABLE_TAG)) {
-          test.setTag(Tags.TEST_ITR_UNSKIPPABLE, true);
-          metricCollector.add(CiVisibilityCountMetric.ITR_UNSKIPPABLE, 1, EventType.TEST);
-
-          if (testModule.skipReason(thisTest) == SkipReason.ITR) {
-            test.setTag(Tags.TEST_ITR_FORCED_RUN, true);
-            metricCollector.add(CiVisibilityCountMetric.ITR_FORCED_RUN, 1, EventType.TEST);
-          }
-          break;
+        if (testModule.isAttemptToFix(thisTest)) {
+            test.setTag(Tags.TEST_TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX, true);
         }
-      }
-    }
 
-    inProgressTests.put(descriptor, test);
-  }
+        if (testExecutionTracker != null) {
+            test.getContext().set(TestExecutionTracker.class, testExecutionTracker);
+        }
 
-  @Override
-  public void onTestSkip(TestKey descriptor, @Nullable String reason) {
-    getOrCreateTestModule();
-    TestImpl test = inProgressTests.get(descriptor);
-    if (test == null) {
-      log.debug("Ignoring skip event, could not find test {}}", descriptor);
-      return;
+        if (testFramework != null) {
+            test.setTag(Tags.TEST_FRAMEWORK, testFramework);
+            if (testFrameworkVersion != null) {
+                test.setTag(Tags.TEST_FRAMEWORK_VERSION, testFrameworkVersion);
+            }
+        }
+        if (testParameters != null) {
+            test.setTag(Tags.TEST_PARAMETERS, testParameters);
+        }
+        if (testSourceData.getTestMethodName() != null && testSourceData.getTestMethod() != null) {
+            test.setTag(
+                    Tags.TEST_SOURCE_METHOD,
+                    testSourceData.getTestMethodName() + Type.getMethodDescriptor(testSourceData.getTestMethod()));
+        }
+        if (categories != null && !categories.isEmpty()) {
+            test.setTag(Tags.TEST_TRAITS, getTestTraits(categories));
+
+            for (String category : categories) {
+                if (category.endsWith(CIConstants.Tags.ITR_UNSKIPPABLE_TAG)) {
+                    test.setTag(Tags.TEST_ITR_UNSKIPPABLE, true);
+                    metricCollector.add(CiVisibilityCountMetric.ITR_UNSKIPPABLE, 1, EventType.TEST);
+
+                    if (testModule.skipReason(thisTest) == SkipReason.ITR) {
+                        test.setTag(Tags.TEST_ITR_FORCED_RUN, true);
+                        metricCollector.add(CiVisibilityCountMetric.ITR_FORCED_RUN, 1, EventType.TEST);
+                    }
+                    break;
+                }
+            }
+        }
+
+        inProgressTests.put(descriptor, test);
     }
-    test.setSkipReason(reason);
-  }
-
-  @Override
-  public void onTestFailure(TestKey descriptor, @Nullable Throwable throwable) {
-    getOrCreateTestModule();
-    TestImpl test = inProgressTests.get(descriptor);
-    if (test == null) {
-      log.debug("Ignoring fail event, could not find test {}", descriptor);
-      return;
+
+    @Override
+    public void onTestSkip(TestKey descriptor, @Nullable String reason) {
+        getOrCreateTestModule();
+        TestImpl test = inProgressTests.get(descriptor);
+        if (test == null) {
+            log.debug("Ignoring skip event, could not find test {}}", descriptor);
+            return;
+        }
+        test.setSkipReason(reason);
     }
-    test.setErrorInfo(throwable);
-  }
-
-  @Override
-  public void onTestFinish(
-      TestKey descriptor,
-      @Nullable Long endTime,
-      @Nullable TestExecutionTracker testExecutionTracker) {
-    TestFrameworkModule testModule = getOrCreateTestModule();
-    TestImpl test = inProgressTests.remove(descriptor);
-    if (test == null) {
-      log.debug("Ignoring finish event, could not find test {}", descriptor);
-      return;
+
+    @Override
+    public void onTestFailure(TestKey descriptor, @Nullable Throwable throwable) {
+        getOrCreateTestModule();
+        TestImpl test = inProgressTests.get(descriptor);
+        if (test == null) {
+            log.debug("Ignoring fail event, could not find test {}", descriptor);
+            return;
+        }
+        test.setErrorInfo(throwable);
     }
 
-    TestStatus testStatus = test.getStatus() != null ? test.getStatus() : TestStatus.skip;
+    @Override
+    public void onTestFinish(
+            TestKey descriptor, @Nullable Long endTime, @Nullable TestExecutionTracker testExecutionTracker) {
+        TestFrameworkModule testModule = getOrCreateTestModule();
+        TestImpl test = inProgressTests.remove(descriptor);
+        if (test == null) {
+            log.debug("Ignoring finish event, could not find test {}", descriptor);
+            return;
+        }
 
-    if (testExecutionTracker != null) {
-      TestExecutionTracker.ExecutionOutcome outcome =
-          testExecutionTracker.registerExecution(testStatus, test.getDuration(endTime));
+        TestStatus testStatus = test.getStatus() != null ? test.getStatus() : TestStatus.skip;
+
+        if (testExecutionTracker != null) {
+            TestExecutionTracker.ExecutionOutcome outcome =
+                    testExecutionTracker.registerExecution(testStatus, test.getDuration(endTime));
+
+            RetryReason retryReason = outcome.retryReason();
+            if (retryReason != null) {
+                test.setTag(Tags.TEST_IS_RETRY, true);
+                test.setTag(Tags.TEST_RETRY_REASON, retryReason);
+            }
+
+            if (outcome.failureSuppressed()) {
+                test.setTag(Tags.TEST_FAILURE_SUPPRESSED, true);
+            }
+
+            if (outcome.lastExecution()) {
+                test.setTag(Tags.TEST_FINAL_STATUS, outcome.finalStatus());
+
+                if (retryReason != null && outcome.aggregation() == ExecutionAggregation.ONLY_FAILED) {
+                    test.setTag(Tags.TEST_HAS_FAILED_ALL_RETRIES, true);
+                }
+
+                if (testModule.isAttemptToFix(test.getIdentifier())) {
+                    test.setTag(
+                            Tags.TEST_TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
+                            outcome.aggregation() == ExecutionAggregation.ONLY_PASSED);
+                }
+            }
+        } else {
+            test.setTag(Tags.TEST_FINAL_STATUS, testStatus);
+        }
 
-      RetryReason retryReason = outcome.retryReason();
-      if (retryReason != null) {
-        test.setTag(Tags.TEST_IS_RETRY, true);
-        test.setTag(Tags.TEST_RETRY_REASON, retryReason);
-      }
+        test.end(endTime);
+    }
 
-      if (outcome.failureSuppressed()) {
-        test.setTag(Tags.TEST_FAILURE_SUPPRESSED, true);
-      }
+    @Override
+    public void onTestIgnore(
+            final SuiteKey suiteDescriptor,
+            final TestKey testDescriptor,
+            final String testName,
+            final @Nullable String testFramework,
+            final @Nullable String testFrameworkVersion,
+            final @Nullable String testParameters,
+            final @Nullable Collection<String> categories,
+            @Nonnull TestSourceData testSourceData,
+            final @Nullable String reason,
+            @Nullable TestExecutionTracker testExecutionTracker) {
+        onTestStart(
+                suiteDescriptor,
+                testDescriptor,
+                testName,
+                testFramework,
+                testFrameworkVersion,
+                testParameters,
+                categories,
+                testSourceData,
+                null,
+                testExecutionTracker);
+        onTestSkip(testDescriptor, reason);
+        onTestFinish(testDescriptor, null, testExecutionTracker);
+    }
 
-      if (outcome.lastExecution()) {
-        test.setTag(Tags.TEST_FINAL_STATUS, outcome.finalStatus());
+    @Override
+    @Nonnull
+    public TestExecutionPolicy executionPolicy(
+            TestIdentifier test, TestSourceData testSource, Collection<String> testTags) {
+        return getOrCreateTestModule().executionPolicy(test, testSource, testTags);
+    }
 
-        if (retryReason != null && outcome.aggregation() == ExecutionAggregation.ONLY_FAILED) {
-          test.setTag(Tags.TEST_HAS_FAILED_ALL_RETRIES, true);
-        }
+    @Override
+    public int executionPriority(@Nullable TestIdentifier test, @Nonnull TestSourceData testSource) {
+        return getOrCreateTestModule().executionPriority(test, testSource);
+    }
 
-        if (testModule.isAttemptToFix(test.getIdentifier())) {
-          test.setTag(
-              Tags.TEST_TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
-              outcome.aggregation() == ExecutionAggregation.ONLY_PASSED);
-        }
-      }
-    } else {
-      test.setTag(Tags.TEST_FINAL_STATUS, testStatus);
+    @Nullable
+    @Override
+    public SkipReason skipReason(TestIdentifier test) {
+        return getOrCreateTestModule().skipReason(test);
     }
 
-    test.end(endTime);
-  }
-
-  @Override
-  public void onTestIgnore(
-      final SuiteKey suiteDescriptor,
-      final TestKey testDescriptor,
-      final String testName,
-      final @Nullable String testFramework,
-      final @Nullable String testFrameworkVersion,
-      final @Nullable String testParameters,
-      final @Nullable Collection<String> categories,
-      @Nonnull TestSourceData testSourceData,
-      final @Nullable String reason,
-      @Nullable TestExecutionTracker testExecutionTracker) {
-    onTestStart(
-        suiteDescriptor,
-        testDescriptor,
-        testName,
-        testFramework,
-        testFrameworkVersion,
-        testParameters,
-        categories,
-        testSourceData,
-        null,
-        testExecutionTracker);
-    onTestSkip(testDescriptor, reason);
-    onTestFinish(testDescriptor, null, testExecutionTracker);
-  }
-
-  @Override
-  @Nonnull
-  public TestExecutionPolicy executionPolicy(
-      TestIdentifier test, TestSourceData testSource, Collection<String> testTags) {
-    return getOrCreateTestModule().executionPolicy(test, testSource, testTags);
-  }
-
-  @Override
-  public int executionPriority(@Nullable TestIdentifier test, @Nonnull TestSourceData testSource) {
-    return getOrCreateTestModule().executionPriority(test, testSource);
-  }
-
-  @Nullable
-  @Override
-  public SkipReason skipReason(TestIdentifier test) {
-    return getOrCreateTestModule().skipReason(test);
-  }
-
-  @Override
-  public void close() {
-    TestFrameworkModule current = testModule;
-    if (current != null) {
-      current.end(null);
-      testSession.end(null);
+    @Override
+    public void close() {
+        TestFrameworkModule current = testModule;
+        if (current != null) {
+            current.end(null);
+            testSession.end(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/AttemptToFix.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/AttemptToFix.java
index b57691c6fbb..866fd390f38 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/AttemptToFix.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/AttemptToFix.java
@@ -15,55 +15,55 @@
  */
 public class AttemptToFix implements TestExecutionPolicy {
 
-  private final int maxExecutions;
-  private int executions;
-  private ExecutionAggregation results;
-  private TestStatus lastStatus;
+    private final int maxExecutions;
+    private int executions;
+    private ExecutionAggregation results;
+    private TestStatus lastStatus;
 
-  public AttemptToFix(int maxExecutions) {
-    this.maxExecutions = maxExecutions;
-    this.executions = 0;
-    this.results = ExecutionAggregation.NONE;
-  }
+    public AttemptToFix(int maxExecutions) {
+        this.maxExecutions = maxExecutions;
+        this.executions = 0;
+        this.results = ExecutionAggregation.NONE;
+    }
 
-  @Override
-  public ExecutionOutcome registerExecution(TestStatus status, long durationMillis) {
-    lastStatus = status;
-    ++executions;
-    results = results.withExecution(status);
+    @Override
+    public ExecutionOutcome registerExecution(TestStatus status, long durationMillis) {
+        lastStatus = status;
+        ++executions;
+        results = results.withExecution(status);
 
-    boolean lastExecution = !retriesLeft();
-    boolean retry = executions > 1;
-    TestStatus finalStatus = null;
-    if (lastExecution) {
-      finalStatus = results == ExecutionAggregation.ONLY_PASSED ? TestStatus.pass : TestStatus.fail;
-    }
+        boolean lastExecution = !retriesLeft();
+        boolean retry = executions > 1;
+        TestStatus finalStatus = null;
+        if (lastExecution) {
+            finalStatus = results == ExecutionAggregation.ONLY_PASSED ? TestStatus.pass : TestStatus.fail;
+        }
 
-    return new ExecutionOutcomeImpl(
-        false, lastExecution, results, retry ? RetryReason.attemptToFix : null, finalStatus);
-  }
+        return new ExecutionOutcomeImpl(
+                false, lastExecution, results, retry ? RetryReason.attemptToFix : null, finalStatus);
+    }
 
-  private boolean retriesLeft() {
-    // stop retrying if the test was skipped, max executions reached,
-    // or a failure was observed (the fix didn't work)
-    return lastStatus != TestStatus.skip
-        && executions < maxExecutions
-        && results != ExecutionAggregation.ONLY_FAILED
-        && results != ExecutionAggregation.MIXED;
-  }
+    private boolean retriesLeft() {
+        // stop retrying if the test was skipped, max executions reached,
+        // or a failure was observed (the fix didn't work)
+        return lastStatus != TestStatus.skip
+                && executions < maxExecutions
+                && results != ExecutionAggregation.ONLY_FAILED
+                && results != ExecutionAggregation.MIXED;
+    }
 
-  @Override
-  public boolean applicable() {
-    return retriesLeft();
-  }
+    @Override
+    public boolean applicable() {
+        return retriesLeft();
+    }
 
-  @Override
-  public boolean suppressFailures() {
-    return false;
-  }
+    @Override
+    public boolean suppressFailures() {
+        return false;
+    }
 
-  @Override
-  public boolean failedTestReplayApplicable() {
-    return false;
-  }
+    @Override
+    public boolean failedTestReplayApplicable() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/AutoTestRetry.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/AutoTestRetry.java
index 69d89f19871..2f929837ef5 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/AutoTestRetry.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/AutoTestRetry.java
@@ -12,75 +12,75 @@
  * number of times. Stops retrying as soon as the test passes.
  */
 @SuppressFBWarnings(
-    value = {"AT_NONATOMIC_OPERATIONS_ON_SHARED_VARIABLE", "AT_STALE_THREAD_WRITE_OF_PRIMITIVE"},
-    justification =
-        "TestExecutionPolicy instances are confined to a single thread and are not meant to be thread-safe")
+        value = {"AT_NONATOMIC_OPERATIONS_ON_SHARED_VARIABLE", "AT_STALE_THREAD_WRITE_OF_PRIMITIVE"},
+        justification =
+                "TestExecutionPolicy instances are confined to a single thread and are not meant to be thread-safe")
 public class AutoTestRetry implements TestExecutionPolicy {
 
-  private int maxExecutions;
-  private final boolean suppressFailures;
-  private int executions;
-  private ExecutionAggregation results;
+    private int maxExecutions;
+    private final boolean suppressFailures;
+    private int executions;
+    private ExecutionAggregation results;
 
-  /** Total retry counter that is shared by all auto test retry policies */
-  private final AtomicInteger totalRetryCount;
+    /** Total retry counter that is shared by all auto test retry policies */
+    private final AtomicInteger totalRetryCount;
 
-  public AutoTestRetry(int maxExecutions, boolean suppressFailures, AtomicInteger totalRetryCount) {
-    this.maxExecutions = maxExecutions;
-    this.suppressFailures = suppressFailures;
-    this.totalRetryCount = totalRetryCount;
-    this.executions = 0;
-    this.results = ExecutionAggregation.NONE;
-  }
-
-  protected int maxExecutionsForDuration(long durationMillis) {
-    return maxExecutions;
-  }
-
-  @Override
-  public final ExecutionOutcome registerExecution(TestStatus status, long durationMillis) {
-    if (executions == 0) {
-      maxExecutions = maxExecutionsForDuration(durationMillis);
-    }
-    ++executions;
-    results = results.withExecution(status);
-    if (executions > 1) {
-      totalRetryCount.incrementAndGet();
+    public AutoTestRetry(int maxExecutions, boolean suppressFailures, AtomicInteger totalRetryCount) {
+        this.maxExecutions = maxExecutions;
+        this.suppressFailures = suppressFailures;
+        this.totalRetryCount = totalRetryCount;
+        this.executions = 0;
+        this.results = ExecutionAggregation.NONE;
     }
 
-    boolean lastExecution = !retriesLeft();
-    boolean retry = executions > 1; // first execution is not a retry
-    boolean failureSuppressed = status == TestStatus.fail && (!lastExecution || suppressFailures);
-    TestStatus finalStatus = null;
-    if (lastExecution) {
-      // final status is always the last status reported (or pass if a failure is suppressed)
-      finalStatus = failureSuppressed ? TestStatus.pass : status;
+    protected int maxExecutionsForDuration(long durationMillis) {
+        return maxExecutions;
     }
 
-    return new ExecutionOutcomeImpl(
-        failureSuppressed, lastExecution, results, retry ? RetryReason.atr : null, finalStatus);
-  }
+    @Override
+    public final ExecutionOutcome registerExecution(TestStatus status, long durationMillis) {
+        if (executions == 0) {
+            maxExecutions = maxExecutionsForDuration(durationMillis);
+        }
+        ++executions;
+        results = results.withExecution(status);
+        if (executions > 1) {
+            totalRetryCount.incrementAndGet();
+        }
+
+        boolean lastExecution = !retriesLeft();
+        boolean retry = executions > 1; // first execution is not a retry
+        boolean failureSuppressed = status == TestStatus.fail && (!lastExecution || suppressFailures);
+        TestStatus finalStatus = null;
+        if (lastExecution) {
+            // final status is always the last status reported (or pass if a failure is suppressed)
+            finalStatus = failureSuppressed ? TestStatus.pass : status;
+        }
+
+        return new ExecutionOutcomeImpl(
+                failureSuppressed, lastExecution, results, retry ? RetryReason.atr : null, finalStatus);
+    }
 
-  private boolean retriesLeft() {
-    return executions < maxExecutions
-        && results != ExecutionAggregation.ONLY_PASSED
-        && results != ExecutionAggregation.MIXED;
-  }
+    private boolean retriesLeft() {
+        return executions < maxExecutions
+                && results != ExecutionAggregation.ONLY_PASSED
+                && results != ExecutionAggregation.MIXED;
+    }
 
-  @Override
-  public boolean applicable() {
-    return retriesLeft();
-  }
+    @Override
+    public boolean applicable() {
+        return retriesLeft();
+    }
 
-  @Override
-  public boolean suppressFailures() {
-    // do not suppress failures for last execution (unless flag to suppress all failures is set);
-    // the +1 is because this method is called _before_ subsequent execution is registered
-    return executions + 1 < maxExecutions || suppressFailures;
-  }
+    @Override
+    public boolean suppressFailures() {
+        // do not suppress failures for last execution (unless flag to suppress all failures is set);
+        // the +1 is because this method is called _before_ subsequent execution is registered
+        return executions + 1 < maxExecutions || suppressFailures;
+    }
 
-  @Override
-  public boolean failedTestReplayApplicable() {
-    return true;
-  }
+    @Override
+    public boolean failedTestReplayApplicable() {
+        return true;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/DynamicAutoTestRetry.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/DynamicAutoTestRetry.java
index 5a2cd6fa5cf..205682f2858 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/DynamicAutoTestRetry.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/DynamicAutoTestRetry.java
@@ -9,18 +9,16 @@
  */
 public class DynamicAutoTestRetry extends AutoTestRetry {
 
-  private final DynamicAutoTestRetrySettings settings;
+    private final DynamicAutoTestRetrySettings settings;
 
-  public DynamicAutoTestRetry(
-      DynamicAutoTestRetrySettings settings,
-      boolean suppressFailures,
-      AtomicInteger totalRetryCount) {
-    super(2, suppressFailures, totalRetryCount);
-    this.settings = settings;
-  }
+    public DynamicAutoTestRetry(
+            DynamicAutoTestRetrySettings settings, boolean suppressFailures, AtomicInteger totalRetryCount) {
+        super(2, suppressFailures, totalRetryCount);
+        this.settings = settings;
+    }
 
-  @Override
-  protected int maxExecutionsForDuration(long durationMillis) {
-    return settings.executionsForDuration(durationMillis);
-  }
+    @Override
+    protected int maxExecutionsForDuration(long durationMillis) {
+        return settings.executionsForDuration(durationMillis);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/EarlyFlakeDetection.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/EarlyFlakeDetection.java
index 9e0819e0ca0..1f49f3506bf 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/EarlyFlakeDetection.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/EarlyFlakeDetection.java
@@ -14,83 +14,80 @@
  */
 public class EarlyFlakeDetection implements TestExecutionPolicy {
 
-  private final boolean suppressFailures;
-  private final List<ExecutionsByDuration> executionsByDuration;
-  private int executions;
-  private int maxExecutions;
-  private ExecutionAggregation results;
-  private TestStatus lastStatus;
+    private final boolean suppressFailures;
+    private final List<ExecutionsByDuration> executionsByDuration;
+    private int executions;
+    private int maxExecutions;
+    private ExecutionAggregation results;
+    private TestStatus lastStatus;
 
-  public EarlyFlakeDetection(
-      List<ExecutionsByDuration> executionsByDuration, boolean suppressFailures) {
-    this.suppressFailures = suppressFailures;
-    this.executionsByDuration = executionsByDuration;
-    this.executions = 0;
-    this.maxExecutions = getExecutions(0);
-    this.results = ExecutionAggregation.NONE;
-  }
+    public EarlyFlakeDetection(List<ExecutionsByDuration> executionsByDuration, boolean suppressFailures) {
+        this.suppressFailures = suppressFailures;
+        this.executionsByDuration = executionsByDuration;
+        this.executions = 0;
+        this.maxExecutions = getExecutions(0);
+        this.results = ExecutionAggregation.NONE;
+    }
 
-  @Override
-  public ExecutionOutcome registerExecution(TestStatus status, long durationMillis) {
-    lastStatus = status;
-    ++executions;
-    results = results.withExecution(status);
-    int maxExecutionsForGivenDuration = getExecutions(durationMillis);
-    maxExecutions = Math.min(maxExecutions, maxExecutionsForGivenDuration);
+    @Override
+    public ExecutionOutcome registerExecution(TestStatus status, long durationMillis) {
+        lastStatus = status;
+        ++executions;
+        results = results.withExecution(status);
+        int maxExecutionsForGivenDuration = getExecutions(durationMillis);
+        maxExecutions = Math.min(maxExecutions, maxExecutionsForGivenDuration);
 
-    boolean lastExecution = !retriesLeft();
-    boolean retry = executions > 1;
-    boolean failureSuppressed = status == TestStatus.fail && suppressFailures;
-    TestStatus finalStatus = null;
-    if (lastExecution) {
-      if (results == ExecutionAggregation.ONLY_PASSED || suppressFailures) {
-        finalStatus = TestStatus.pass;
-      } else {
-        finalStatus = TestStatus.fail;
-      }
-    }
+        boolean lastExecution = !retriesLeft();
+        boolean retry = executions > 1;
+        boolean failureSuppressed = status == TestStatus.fail && suppressFailures;
+        TestStatus finalStatus = null;
+        if (lastExecution) {
+            if (results == ExecutionAggregation.ONLY_PASSED || suppressFailures) {
+                finalStatus = TestStatus.pass;
+            } else {
+                finalStatus = TestStatus.fail;
+            }
+        }
 
-    return new ExecutionOutcomeImpl(
-        failureSuppressed, lastExecution, results, retry ? RetryReason.efd : null, finalStatus);
-  }
+        return new ExecutionOutcomeImpl(
+                failureSuppressed, lastExecution, results, retry ? RetryReason.efd : null, finalStatus);
+    }
 
-  private boolean retriesLeft() {
-    // skipped tests should not be retried and stop once flakiness is detected
-    return lastStatus != TestStatus.skip
-        && executions < maxExecutions
-        && results != ExecutionAggregation.MIXED;
-  }
+    private boolean retriesLeft() {
+        // skipped tests should not be retried and stop once flakiness is detected
+        return lastStatus != TestStatus.skip && executions < maxExecutions && results != ExecutionAggregation.MIXED;
+    }
 
-  @Override
-  public boolean applicable() {
-    return retriesLeft();
-  }
+    @Override
+    public boolean applicable() {
+        return retriesLeft();
+    }
 
-  @Override
-  public boolean suppressFailures() {
-    return suppressFailures;
-  }
+    @Override
+    public boolean suppressFailures() {
+        return suppressFailures;
+    }
 
-  @Override
-  public boolean propagateFailure() {
-    // used to bypass TestNG's RetryAnalyzer, which made the framework session status depend on
-    // result order:
-    // pass + fail -> fail (correct)
-    // fail + pass -> pass (incorrect)
-    return !suppressFailures && results == ExecutionAggregation.MIXED;
-  }
+    @Override
+    public boolean propagateFailure() {
+        // used to bypass TestNG's RetryAnalyzer, which made the framework session status depend on
+        // result order:
+        // pass + fail -> fail (correct)
+        // fail + pass -> pass (incorrect)
+        return !suppressFailures && results == ExecutionAggregation.MIXED;
+    }
 
-  private int getExecutions(long durationMillis) {
-    for (ExecutionsByDuration e : executionsByDuration) {
-      if (durationMillis <= e.getDurationMillis()) {
-        return e.getExecutions();
-      }
+    private int getExecutions(long durationMillis) {
+        for (ExecutionsByDuration e : executionsByDuration) {
+            if (durationMillis <= e.getDurationMillis()) {
+                return e.getExecutions();
+            }
+        }
+        return 0;
     }
-    return 0;
-  }
 
-  @Override
-  public boolean failedTestReplayApplicable() {
-    return false;
-  }
+    @Override
+    public boolean failedTestReplayApplicable() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/ExecutionOutcomeImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/ExecutionOutcomeImpl.java
index a599e9aab43..ad2083f8043 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/ExecutionOutcomeImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/ExecutionOutcomeImpl.java
@@ -8,49 +8,49 @@
 
 class ExecutionOutcomeImpl implements TestExecutionTracker.ExecutionOutcome {
 
-  private final boolean failureSuppressed;
-  private final boolean lastExecution;
-  private final ExecutionAggregation aggregation;
-  private final RetryReason retryReason;
-  private final TestStatus finalStatus;
-
-  ExecutionOutcomeImpl(
-      boolean failureSuppressed,
-      boolean lastExecution,
-      ExecutionAggregation aggregation,
-      RetryReason retryReason,
-      TestStatus finalStatus) {
-    this.failureSuppressed = failureSuppressed;
-    this.lastExecution = lastExecution;
-    this.aggregation = aggregation;
-    this.retryReason = retryReason;
-    this.finalStatus = finalStatus;
-  }
-
-  @Override
-  public boolean failureSuppressed() {
-    return failureSuppressed;
-  }
-
-  @Override
-  public boolean lastExecution() {
-    return lastExecution;
-  }
-
-  @Override
-  public ExecutionAggregation aggregation() {
-    return aggregation;
-  }
-
-  @Nullable
-  @Override
-  public RetryReason retryReason() {
-    return retryReason;
-  }
-
-  @Nullable
-  @Override
-  public TestStatus finalStatus() {
-    return finalStatus;
-  }
+    private final boolean failureSuppressed;
+    private final boolean lastExecution;
+    private final ExecutionAggregation aggregation;
+    private final RetryReason retryReason;
+    private final TestStatus finalStatus;
+
+    ExecutionOutcomeImpl(
+            boolean failureSuppressed,
+            boolean lastExecution,
+            ExecutionAggregation aggregation,
+            RetryReason retryReason,
+            TestStatus finalStatus) {
+        this.failureSuppressed = failureSuppressed;
+        this.lastExecution = lastExecution;
+        this.aggregation = aggregation;
+        this.retryReason = retryReason;
+        this.finalStatus = finalStatus;
+    }
+
+    @Override
+    public boolean failureSuppressed() {
+        return failureSuppressed;
+    }
+
+    @Override
+    public boolean lastExecution() {
+        return lastExecution;
+    }
+
+    @Override
+    public ExecutionAggregation aggregation() {
+        return aggregation;
+    }
+
+    @Nullable
+    @Override
+    public RetryReason retryReason() {
+        return retryReason;
+    }
+
+    @Nullable
+    @Override
+    public TestStatus finalStatus() {
+        return finalStatus;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/Quarantine.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/Quarantine.java
index f6616c8b576..0ffb78bb8c8 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/Quarantine.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/Quarantine.java
@@ -10,31 +10,31 @@
  */
 public class Quarantine implements TestExecutionPolicy {
 
-  private boolean testExecuted;
+    private boolean testExecuted;
 
-  @Override
-  public ExecutionOutcome registerExecution(TestStatus status, long durationMillis) {
-    testExecuted = true;
-    return new ExecutionOutcomeImpl(
-        status == TestStatus.fail,
-        testExecuted,
-        ExecutionAggregation.NONE.withExecution(status),
-        null,
-        status == TestStatus.fail ? TestStatus.pass : status);
-  }
+    @Override
+    public ExecutionOutcome registerExecution(TestStatus status, long durationMillis) {
+        testExecuted = true;
+        return new ExecutionOutcomeImpl(
+                status == TestStatus.fail,
+                testExecuted,
+                ExecutionAggregation.NONE.withExecution(status),
+                null,
+                status == TestStatus.fail ? TestStatus.pass : status);
+    }
 
-  @Override
-  public boolean applicable() {
-    return !testExecuted;
-  }
+    @Override
+    public boolean applicable() {
+        return !testExecuted;
+    }
 
-  @Override
-  public boolean suppressFailures() {
-    return true;
-  }
+    @Override
+    public boolean suppressFailures() {
+        return true;
+    }
 
-  @Override
-  public boolean failedTestReplayApplicable() {
-    return false;
-  }
+    @Override
+    public boolean failedTestReplayApplicable() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/Regular.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/Regular.java
index 56e2c9e2e4d..80f2f957ebe 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/Regular.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/Regular.java
@@ -7,28 +7,27 @@
 /** Regular test case execution with no alterations. */
 public class Regular implements TestExecutionPolicy {
 
-  public static final TestExecutionPolicy INSTANCE = new Regular();
-
-  private Regular() {}
-
-  @Override
-  public ExecutionOutcome registerExecution(TestStatus status, long durationMillis) {
-    return new ExecutionOutcomeImpl(
-        false, true, ExecutionAggregation.NONE.withExecution(status), null, status);
-  }
-
-  @Override
-  public boolean applicable() {
-    return false;
-  }
-
-  @Override
-  public boolean suppressFailures() {
-    return false;
-  }
-
-  @Override
-  public boolean failedTestReplayApplicable() {
-    return false;
-  }
+    public static final TestExecutionPolicy INSTANCE = new Regular();
+
+    private Regular() {}
+
+    @Override
+    public ExecutionOutcome registerExecution(TestStatus status, long durationMillis) {
+        return new ExecutionOutcomeImpl(false, true, ExecutionAggregation.NONE.withExecution(status), null, status);
+    }
+
+    @Override
+    public boolean applicable() {
+        return false;
+    }
+
+    @Override
+    public boolean suppressFailures() {
+        return false;
+    }
+
+    @Override
+    public boolean failedTestReplayApplicable() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/CILocalGitInfoBuilder.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/CILocalGitInfoBuilder.java
index 8c2a73ff31d..c0105103e41 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/CILocalGitInfoBuilder.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/CILocalGitInfoBuilder.java
@@ -15,55 +15,55 @@
 
 public class CILocalGitInfoBuilder implements GitInfoBuilder {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(CILocalGitInfoBuilder.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CILocalGitInfoBuilder.class);
 
-  private final GitClient.Factory gitClientFactory;
-  private final String gitFolderName;
+    private final GitClient.Factory gitClientFactory;
+    private final String gitFolderName;
 
-  public CILocalGitInfoBuilder(GitClient.Factory gitClientFactory, String gitFolderName) {
-    this.gitClientFactory = gitClientFactory;
-    this.gitFolderName = gitFolderName;
-  }
-
-  @Override
-  public GitInfo build(@Nullable String repositoryPath) {
-    if (repositoryPath == null) {
-      return GitInfo.NOOP;
+    public CILocalGitInfoBuilder(GitClient.Factory gitClientFactory, String gitFolderName) {
+        this.gitClientFactory = gitClientFactory;
+        this.gitFolderName = gitFolderName;
     }
 
-    Path gitPath = getGitPath(repositoryPath);
-    return new LocalFSGitInfoExtractor().headCommit(gitPath.toFile().getAbsolutePath());
-  }
+    @Override
+    public GitInfo build(@Nullable String repositoryPath) {
+        if (repositoryPath == null) {
+            return GitInfo.NOOP;
+        }
+
+        Path gitPath = getGitPath(repositoryPath);
+        return new LocalFSGitInfoExtractor().headCommit(gitPath.toFile().getAbsolutePath());
+    }
 
-  private Path getGitPath(String repositoryPath) {
-    try {
-      GitClient gitClient = gitClientFactory.create(repositoryPath);
-      String gitFolder = gitClient.getGitFolder();
-      if (Strings.isNotBlank(gitFolder)) {
-        Path gitFolderPath = Paths.get(gitFolder);
-        if (Files.exists(gitFolderPath)) {
-          return gitFolderPath;
+    private Path getGitPath(String repositoryPath) {
+        try {
+            GitClient gitClient = gitClientFactory.create(repositoryPath);
+            String gitFolder = gitClient.getGitFolder();
+            if (Strings.isNotBlank(gitFolder)) {
+                Path gitFolderPath = Paths.get(gitFolder);
+                if (Files.exists(gitFolderPath)) {
+                    return gitFolderPath;
+                }
+            }
+        } catch (Exception e) {
+            LOGGER.debug("Error while getting Git folder in {}", repositoryPath, e);
+            LOGGER.warn("Error while getting Git folder");
         }
-      }
-    } catch (Exception e) {
-      LOGGER.debug("Error while getting Git folder in {}", repositoryPath, e);
-      LOGGER.warn("Error while getting Git folder");
+        return Paths.get(repositoryPath, gitFolderName);
     }
-    return Paths.get(repositoryPath, gitFolderName);
-  }
 
-  @Override
-  public int order() {
-    return 2;
-  }
+    @Override
+    public int order() {
+        return 2;
+    }
 
-  @Override
-  public GitProviderExpected providerAsExpected() {
-    return GitProviderExpected.LOCAL_GIT;
-  }
+    @Override
+    public GitProviderExpected providerAsExpected() {
+        return GitProviderExpected.LOCAL_GIT;
+    }
 
-  @Override
-  public GitProviderDiscrepant providerAsDiscrepant() {
-    return GitProviderDiscrepant.LOCAL_GIT;
-  }
+    @Override
+    public GitProviderDiscrepant providerAsDiscrepant() {
+        return GitProviderDiscrepant.LOCAL_GIT;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/CIProviderGitInfoBuilder.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/CIProviderGitInfoBuilder.java
index cf4d60ce8cf..a177e0be143 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/CIProviderGitInfoBuilder.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/CIProviderGitInfoBuilder.java
@@ -14,34 +14,34 @@
 
 public class CIProviderGitInfoBuilder implements GitInfoBuilder {
 
-  private final Config config;
-  private final CiEnvironment environment;
-
-  public CIProviderGitInfoBuilder(Config config, CiEnvironment environment) {
-    this.config = config;
-    this.environment = environment;
-  }
-
-  @Override
-  public GitInfo build(@Nullable String repositoryPath) {
-    Path currentPath = repositoryPath != null ? Paths.get(repositoryPath) : null;
-    CIProviderInfoFactory ciProviderInfoFactory = new CIProviderInfoFactory(config, environment);
-    CIProviderInfo ciProviderInfo = ciProviderInfoFactory.createCIProviderInfo(currentPath);
-    return ciProviderInfo.buildCIGitInfo();
-  }
-
-  @Override
-  public int order() {
-    return 1;
-  }
-
-  @Override
-  public GitProviderExpected providerAsExpected() {
-    return GitProviderExpected.CI_PROVIDER;
-  }
-
-  @Override
-  public GitProviderDiscrepant providerAsDiscrepant() {
-    return GitProviderDiscrepant.CI_PROVIDER;
-  }
+    private final Config config;
+    private final CiEnvironment environment;
+
+    public CIProviderGitInfoBuilder(Config config, CiEnvironment environment) {
+        this.config = config;
+        this.environment = environment;
+    }
+
+    @Override
+    public GitInfo build(@Nullable String repositoryPath) {
+        Path currentPath = repositoryPath != null ? Paths.get(repositoryPath) : null;
+        CIProviderInfoFactory ciProviderInfoFactory = new CIProviderInfoFactory(config, environment);
+        CIProviderInfo ciProviderInfo = ciProviderInfoFactory.createCIProviderInfo(currentPath);
+        return ciProviderInfo.buildCIGitInfo();
+    }
+
+    @Override
+    public int order() {
+        return 1;
+    }
+
+    @Override
+    public GitProviderExpected providerAsExpected() {
+        return GitProviderExpected.CI_PROVIDER;
+    }
+
+    @Override
+    public GitProviderDiscrepant providerAsDiscrepant() {
+        return GitProviderDiscrepant.CI_PROVIDER;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitClientGitInfoBuilder.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitClientGitInfoBuilder.java
index a12646a8f67..c7eeda01f60 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitClientGitInfoBuilder.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitClientGitInfoBuilder.java
@@ -14,52 +14,52 @@
 
 public class GitClientGitInfoBuilder implements GitInfoBuilder {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(GitClientGitInfoBuilder.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(GitClientGitInfoBuilder.class);
 
-  private final Config config;
-  private final GitClient.Factory gitClientFactory;
+    private final Config config;
+    private final GitClient.Factory gitClientFactory;
 
-  public GitClientGitInfoBuilder(Config config, GitClient.Factory gitClientFactory) {
-    this.config = config;
-    this.gitClientFactory = gitClientFactory;
-  }
-
-  @Override
-  public GitInfo build(@Nullable String repositoryPath) {
-    if (repositoryPath == null) {
-      return GitInfo.NOOP;
+    public GitClientGitInfoBuilder(Config config, GitClient.Factory gitClientFactory) {
+        this.config = config;
+        this.gitClientFactory = gitClientFactory;
     }
 
-    GitClient gitClient = gitClientFactory.create(repositoryPath);
-    try {
-      String remoteName = config.getCiVisibilityGitRemoteName();
-      String remoteUrl = gitClient.getRemoteUrl(remoteName);
-      String branch = gitClient.getCurrentBranch();
-      List<String> tags = gitClient.getTags(GitClient.HEAD);
-      String tag = !tags.isEmpty() ? tags.iterator().next() : null;
+    @Override
+    public GitInfo build(@Nullable String repositoryPath) {
+        if (repositoryPath == null) {
+            return GitInfo.NOOP;
+        }
+
+        GitClient gitClient = gitClientFactory.create(repositoryPath);
+        try {
+            String remoteName = config.getCiVisibilityGitRemoteName();
+            String remoteUrl = gitClient.getRemoteUrl(remoteName);
+            String branch = gitClient.getCurrentBranch();
+            List<String> tags = gitClient.getTags(GitClient.HEAD);
+            String tag = !tags.isEmpty() ? tags.iterator().next() : null;
 
-      CommitInfo commitInfo = gitClient.getCommitInfo(GitClient.HEAD, false);
-      return new GitInfo(remoteUrl, branch, tag, commitInfo);
+            CommitInfo commitInfo = gitClient.getCommitInfo(GitClient.HEAD, false);
+            return new GitInfo(remoteUrl, branch, tag, commitInfo);
 
-    } catch (Exception e) {
-      LOGGER.debug("Error while getting Git data from {}", repositoryPath, e);
-      LOGGER.warn("Error while getting Git data by executing shell commands");
-      return GitInfo.NOOP;
+        } catch (Exception e) {
+            LOGGER.debug("Error while getting Git data from {}", repositoryPath, e);
+            LOGGER.warn("Error while getting Git data by executing shell commands");
+            return GitInfo.NOOP;
+        }
     }
-  }
 
-  @Override
-  public int order() {
-    return 3;
-  }
+    @Override
+    public int order() {
+        return 3;
+    }
 
-  @Override
-  public GitProviderExpected providerAsExpected() {
-    return GitProviderExpected.GIT_CLIENT;
-  }
+    @Override
+    public GitProviderExpected providerAsExpected() {
+        return GitProviderExpected.GIT_CLIENT;
+    }
 
-  @Override
-  public GitProviderDiscrepant providerAsDiscrepant() {
-    return GitProviderDiscrepant.GIT_CLIENT;
-  }
+    @Override
+    public GitProviderDiscrepant providerAsDiscrepant() {
+        return GitProviderDiscrepant.GIT_CLIENT;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitConfig.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitConfig.java
index a050163e489..1bb82861921 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitConfig.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitConfig.java
@@ -13,91 +13,90 @@
  */
 public class GitConfig {
 
-  private final Map<String, Map<String, String>> entries = new HashMap<>();
+    private final Map<String, Map<String, String>> entries = new HashMap<>();
 
-  public GitConfig(final String path) {
-    load(path);
-  }
-
-  @SuppressForbidden // split with one-char String use a fast-path without regex usage
-  private void load(final String path) {
-    if (path == null || path.isEmpty()) {
-      return;
+    public GitConfig(final String path) {
+        load(path);
     }
 
-    // Typically, a section of the .git/config file looks like:
-    // [remote "origin"]
-    //   url = https://some-host/user/repository.git
-    // 	 fetch = +refs/heads/*:refs/remotes/origin/*
+    @SuppressForbidden // split with one-char String use a fast-path without regex usage
+    private void load(final String path) {
+        if (path == null || path.isEmpty()) {
+            return;
+        }
+
+        // Typically, a section of the .git/config file looks like:
+        // [remote "origin"]
+        //   url = https://some-host/user/repository.git
+        // 	 fetch = +refs/heads/*:refs/remotes/origin/*
 
-    try (final BufferedReader br = new BufferedReader(new FileReader(path))) {
-      String line;
-      String section = null;
-      while ((line = br.readLine()) != null) {
+        try (final BufferedReader br = new BufferedReader(new FileReader(path))) {
+            String line;
+            String section = null;
+            while ((line = br.readLine()) != null) {
 
-        // Check if current line matches with the `section` regex:
-        int sectionStartIdx = line.indexOf('[');
-        if (sectionStartIdx >= 0) {
-          int sectionEndIdx = line.indexOf(']', sectionStartIdx + 1);
-          if (sectionEndIdx >= 0
-              && isWhitespace(line, 0, sectionStartIdx)
-              && isWhitespace(line, sectionEndIdx + 1, line.length())) {
-            // Section found: (E.g: remote "origin")
-            section = line.substring(sectionStartIdx + 1, sectionEndIdx);
-            continue;
-          }
-        }
+                // Check if current line matches with the `section` regex:
+                int sectionStartIdx = line.indexOf('[');
+                if (sectionStartIdx >= 0) {
+                    int sectionEndIdx = line.indexOf(']', sectionStartIdx + 1);
+                    if (sectionEndIdx >= 0
+                            && isWhitespace(line, 0, sectionStartIdx)
+                            && isWhitespace(line, sectionEndIdx + 1, line.length())) {
+                        // Section found: (E.g: remote "origin")
+                        section = line.substring(sectionStartIdx + 1, sectionEndIdx);
+                        continue;
+                    }
+                }
 
-        if (section != null) {
-          // Locate the concrete `section` in the `entries` map
-          // and update it with the found key/value.
-          // E.g: Map({`remote "origin"`: {`url`:`https://some-host/user/repository.git`}}
-          Map<String, String> sectionValues =
-              this.entries.computeIfAbsent(section, k -> new HashMap<>());
+                if (section != null) {
+                    // Locate the concrete `section` in the `entries` map
+                    // and update it with the found key/value.
+                    // E.g: Map({`remote "origin"`: {`url`:`https://some-host/user/repository.git`}}
+                    Map<String, String> sectionValues = this.entries.computeIfAbsent(section, k -> new HashMap<>());
 
-          String[] parts = line.split("=");
-          if (parts.length >= 2) {
-            // Key/value found: (E.g: key=url, value=https://some-host/user/repository.git)
-            final String key = parts[0].trim();
-            final String value = join(parts, 1, parts.length).trim();
-            sectionValues.put(key, value);
-          }
+                    String[] parts = line.split("=");
+                    if (parts.length >= 2) {
+                        // Key/value found: (E.g: key=url, value=https://some-host/user/repository.git)
+                        final String key = parts[0].trim();
+                        final String value = join(parts, 1, parts.length).trim();
+                        sectionValues.put(key, value);
+                    }
+                }
+            }
+        } catch (final IOException e) {
+            // As extract .git config information should be a best-effort approach, we don't want to
+            // bother customers with
+            // error messages at this point. If .git/config file cannot be parsed, we return the control
+            // to the invoker.
         }
-      }
-    } catch (final IOException e) {
-      // As extract .git config information should be a best-effort approach, we don't want to
-      // bother customers with
-      // error messages at this point. If .git/config file cannot be parsed, we return the control
-      // to the invoker.
     }
-  }
 
-  private String join(String[] array, int from, int to) {
-    if (to - from == 1) {
-      return array[from];
-    } else {
-      StringBuilder joined = new StringBuilder();
-      for (int i = from; i < to; i++) {
-        joined.append(array[i]);
-      }
-      return joined.toString();
+    private String join(String[] array, int from, int to) {
+        if (to - from == 1) {
+            return array[from];
+        } else {
+            StringBuilder joined = new StringBuilder();
+            for (int i = from; i < to; i++) {
+                joined.append(array[i]);
+            }
+            return joined.toString();
+        }
     }
-  }
 
-  private boolean isWhitespace(String s, int from, int to) {
-    for (int i = from; i < to; i++) {
-      if (!Character.isWhitespace(s.charAt(i))) {
-        return false;
-      }
+    private boolean isWhitespace(String s, int from, int to) {
+        for (int i = from; i < to; i++) {
+            if (!Character.isWhitespace(s.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
     }
-    return true;
-  }
 
-  public String getString(final String section, final String key) {
-    final Map<String, String> kv = entries.get(section);
-    if (kv == null) {
-      return null;
+    public String getString(final String section, final String key) {
+        final Map<String, String> kv = entries.get(section);
+        if (kv == null) {
+            return null;
+        }
+        return kv.get(key);
     }
-    return kv.get(key);
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitInfoExtractor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitInfoExtractor.java
index 4038fe0063e..2b39b6eb3b2 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitInfoExtractor.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitInfoExtractor.java
@@ -4,5 +4,5 @@
 
 public interface GitInfoExtractor {
 
-  GitInfo headCommit(final String gitFolder);
+    GitInfo headCommit(final String gitFolder);
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitObject.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitObject.java
index 16b0809591f..ee5c33b851b 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitObject.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitObject.java
@@ -4,60 +4,58 @@
 
 public final class GitObject {
 
-  public static final byte UNKNOWN_TYPE = 0;
+    public static final byte UNKNOWN_TYPE = 0;
 
-  // https://git-scm.com/docs/pack-format#_object_types
-  public static final byte COMMIT_TYPE = 1;
-  public static final byte TAG_TYPE = 4;
+    // https://git-scm.com/docs/pack-format#_object_types
+    public static final byte COMMIT_TYPE = 1;
+    public static final byte TAG_TYPE = 4;
 
-  public static final GitObject NOOP = new GitObject();
+    public static final GitObject NOOP = new GitObject();
 
-  private final byte type;
-  private final int size;
-  private final byte[] content;
+    private final byte type;
+    private final int size;
+    private final byte[] content;
 
-  public GitObject() {
-    this((byte) 0, 0, null);
-  }
+    public GitObject() {
+        this((byte) 0, 0, null);
+    }
 
-  public GitObject(final byte type, final int size, final byte[] content) {
-    this.type = type;
-    this.size = size;
-    this.content = content;
-  }
+    public GitObject(final byte type, final int size, final byte[] content) {
+        this.type = type;
+        this.size = size;
+        this.content = content;
+    }
 
-  public byte getType() {
-    return type;
-  }
+    public byte getType() {
+        return type;
+    }
 
-  public int getSize() {
-    return size;
-  }
+    public int getSize() {
+        return size;
+    }
 
-  public byte[] getContent() {
-    return content;
-  }
+    public byte[] getContent() {
+        return content;
+    }
 
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) {
-      return true;
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final GitObject gitObject = (GitObject) o;
+        return size == gitObject.size && type == gitObject.type && Arrays.equals(content, gitObject.content);
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public int hashCode() {
+        int result = 1;
+        result = 31 * result + (int) type;
+        result = 31 * result + size;
+        result = 31 * result + Arrays.hashCode(content);
+        return result;
     }
-    final GitObject gitObject = (GitObject) o;
-    return size == gitObject.size
-        && type == gitObject.type
-        && Arrays.equals(content, gitObject.content);
-  }
-
-  @Override
-  public int hashCode() {
-    int result = 1;
-    result = 31 * result + (int) type;
-    result = 31 * result + size;
-    result = 31 * result + Arrays.hashCode(content);
-    return result;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/LocalFSGitInfoExtractor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/LocalFSGitInfoExtractor.java
index 55832a06836..d342001935c 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/LocalFSGitInfoExtractor.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/LocalFSGitInfoExtractor.java
@@ -29,400 +29,389 @@
  */
 public class LocalFSGitInfoExtractor implements GitInfoExtractor {
 
-  private static final int SHA_INDEX = 1;
-
-  private static final VersionedPackGitInfoExtractor V2_PACK_GIT_INFO_EXTRACTOR =
-      new V2PackGitInfoExtractor();
-
-  /**
-   * Extracts all git information available from the HEAD
-   *
-   * @param gitFolder the git folder path as String.
-   * @return {@code GitInfo} object with all git available info from the HEAD object.
-   */
-  @Override
-  public GitInfo headCommit(final String gitFolder) {
-    try {
-      final Path gitFolderPath = Paths.get(gitFolder);
-      final String head = readFile(gitFolderPath.resolve("HEAD"));
-      final String ref = extractRef(head);
-      final String branch = extractBranch(ref);
-      final String tag = extractTag(ref);
-      final String sha = extractSha(gitFolderPath, head);
-      final String repositoryURL = extractRepositoryURL(gitFolderPath, branch);
-      final CommitInfo commitInfo = findCommit(gitFolder, sha);
-
-      return new GitInfo(repositoryURL, branch, tag, commitInfo);
-    } catch (final Exception e) {
-      return GitInfo.NOOP;
+    private static final int SHA_INDEX = 1;
+
+    private static final VersionedPackGitInfoExtractor V2_PACK_GIT_INFO_EXTRACTOR = new V2PackGitInfoExtractor();
+
+    /**
+     * Extracts all git information available from the HEAD
+     *
+     * @param gitFolder the git folder path as String.
+     * @return {@code GitInfo} object with all git available info from the HEAD object.
+     */
+    @Override
+    public GitInfo headCommit(final String gitFolder) {
+        try {
+            final Path gitFolderPath = Paths.get(gitFolder);
+            final String head = readFile(gitFolderPath.resolve("HEAD"));
+            final String ref = extractRef(head);
+            final String branch = extractBranch(ref);
+            final String tag = extractTag(ref);
+            final String sha = extractSha(gitFolderPath, head);
+            final String repositoryURL = extractRepositoryURL(gitFolderPath, branch);
+            final CommitInfo commitInfo = findCommit(gitFolder, sha);
+
+            return new GitInfo(repositoryURL, branch, tag, commitInfo);
+        } catch (final Exception e) {
+            return GitInfo.NOOP;
+        }
     }
-  }
 
-  private String extractRepositoryURL(final Path gitFolderPath, final String branch) {
-    final File configFile = gitFolderPath.resolve("config").toFile();
-    if (!configFile.exists()) {
-      return null;
+    private String extractRepositoryURL(final Path gitFolderPath, final String branch) {
+        final File configFile = gitFolderPath.resolve("config").toFile();
+        if (!configFile.exists()) {
+            return null;
+        }
+
+        final GitConfig gitConfig = new GitConfig(configFile.getAbsolutePath());
+        final String branchRemote = gitConfig.getString("branch \"" + branch + "\"", "remote");
+        String remoteUrl = gitConfig.getString("remote \"" + branchRemote + "\"", "url");
+        if (remoteUrl == null) {
+            remoteUrl = gitConfig.getString("remote \"origin\"", "url");
+        }
+        return GitUtils.filterSensitiveInfo(remoteUrl);
     }
 
-    final GitConfig gitConfig = new GitConfig(configFile.getAbsolutePath());
-    final String branchRemote = gitConfig.getString("branch \"" + branch + "\"", "remote");
-    String remoteUrl = gitConfig.getString("remote \"" + branchRemote + "\"", "url");
-    if (remoteUrl == null) {
-      remoteUrl = gitConfig.getString("remote \"origin\"", "url");
-    }
-    return GitUtils.filterSensitiveInfo(remoteUrl);
-  }
-
-  private String extractTag(final String ref) {
-    if (ref != null && ref.contains("refs/tags")) {
-      return GitUtils.normalizeTag(ref);
-    }
-    return null;
-  }
-
-  private String extractBranch(final String ref) {
-    if (ref != null && (ref.contains("origin") || ref.contains("refs/heads"))) {
-      return GitUtils.normalizeBranch(ref);
+    private String extractTag(final String ref) {
+        if (ref != null && ref.contains("refs/tags")) {
+            return GitUtils.normalizeTag(ref);
+        }
+        return null;
     }
-    return null;
-  }
 
-  private String extractRef(final String head) {
-    if (head == null || !head.contains("ref:")) {
-      return null;
+    private String extractBranch(final String ref) {
+        if (ref != null && (ref.contains("origin") || ref.contains("refs/heads"))) {
+            return GitUtils.normalizeBranch(ref);
+        }
+        return null;
     }
 
-    // The HEAD file contains a reference: e.g: ref: /refs/head/master
-    return head.substring(5); // Remove the ref: prefix
-  }
+    private String extractRef(final String head) {
+        if (head == null || !head.contains("ref:")) {
+            return null;
+        }
 
-  private CommitInfo findCommit(final String gitFolder, final String sha)
-      throws IOException, DataFormatException {
-    if (sha == null || sha.isEmpty()) {
-      return CommitInfo.NOOP;
+        // The HEAD file contains a reference: e.g: ref: /refs/head/master
+        return head.substring(5); // Remove the ref: prefix
     }
 
-    // We access to the Git object represented by the commit sha.
-    // In Git, the 2 first characters of the sha corresponds with the folder. The rest of the sha,
-    // corresponds with the file name.
-    // Commit: 44c242675ddf69b7b1f440b4a5d8d24e908d8bef -> Object:
-    // .git/objects/44/c242675ddf69b7b1f440b4a5d8d24e908d8bef
-    final String folder = sha.substring(0, 2);
-    final String filename = sha.substring(2);
-    final File gitObjectFile = Paths.get(gitFolder, "objects", folder, filename).toFile();
-
-    final GitObject gitObject;
-    if (gitObjectFile.exists()) {
-      final byte[] deflatedBytes = Files.readAllBytes(gitObjectFile.toPath());
-      gitObject = buildGitObject(deflatedBytes);
-    } else {
-      final GitPackObject gitPackObject = readPackObject(gitFolder, sha);
-      gitObject = buildGitObject(gitPackObject);
+    private CommitInfo findCommit(final String gitFolder, final String sha) throws IOException, DataFormatException {
+        if (sha == null || sha.isEmpty()) {
+            return CommitInfo.NOOP;
+        }
+
+        // We access to the Git object represented by the commit sha.
+        // In Git, the 2 first characters of the sha corresponds with the folder. The rest of the sha,
+        // corresponds with the file name.
+        // Commit: 44c242675ddf69b7b1f440b4a5d8d24e908d8bef -> Object:
+        // .git/objects/44/c242675ddf69b7b1f440b4a5d8d24e908d8bef
+        final String folder = sha.substring(0, 2);
+        final String filename = sha.substring(2);
+        final File gitObjectFile =
+                Paths.get(gitFolder, "objects", folder, filename).toFile();
+
+        final GitObject gitObject;
+        if (gitObjectFile.exists()) {
+            final byte[] deflatedBytes = Files.readAllBytes(gitObjectFile.toPath());
+            gitObject = buildGitObject(deflatedBytes);
+        } else {
+            final GitPackObject gitPackObject = readPackObject(gitFolder, sha);
+            gitObject = buildGitObject(gitPackObject);
+        }
+
+        if (gitObject == null) {
+            return CommitInfo.NOOP;
+        }
+
+        return parseCommit(gitFolder, sha, gitObject);
     }
 
-    if (gitObject == null) {
-      return CommitInfo.NOOP;
+    private GitPackObject readPackObject(final String gitFolder, final String sha) throws IOException {
+        final File packFolder = Paths.get(gitFolder, "objects", "pack").toFile();
+        final File[] idxFiles = packFolder.listFiles(new FilenameFilter() {
+            @Override
+            public boolean accept(final File dir, final String name) {
+                return name.endsWith(".idx");
+            }
+        });
+
+        if (idxFiles == null) {
+            return null;
+        }
+
+        short packVersion = 0;
+        for (final File idxFile : idxFiles) {
+            // We assume that if an IDX file has a certain version, the rest of IDXs file will be based on
+            // the same version.
+            if (packVersion == 0) {
+                packVersion = GitPackUtils.extractGitPackVersion(idxFile);
+            }
+
+            final VersionedPackGitInfoExtractor gitPackExtractor = lookupExtractor(packVersion);
+            if (gitPackExtractor == null) {
+                break;
+            }
+
+            final GitPackObject packObj = gitPackExtractor.extract(idxFile, GitPackUtils.getPackFile(idxFile), sha);
+            if (packObj.raisedError()) {
+                // If an error is raised, we don't want to continue checking the next packfiles.
+                return null;
+            }
+
+            if (packObj.getShaIndex() == GitPackObject.NOT_FOUND_SHA_INDEX) {
+                // If the commit sha has not been found in this idx file, continue with the next one.
+                continue;
+            }
+
+            return packObj;
+        }
+        return null;
     }
 
-    return parseCommit(gitFolder, sha, gitObject);
-  }
-
-  private GitPackObject readPackObject(final String gitFolder, final String sha)
-      throws IOException {
-    final File packFolder = Paths.get(gitFolder, "objects", "pack").toFile();
-    final File[] idxFiles =
-        packFolder.listFiles(
-            new FilenameFilter() {
-              @Override
-              public boolean accept(final File dir, final String name) {
-                return name.endsWith(".idx");
-              }
-            });
+    private static final Pattern SPACE_PATTERN = Pattern.compile(" ");
 
-    if (idxFiles == null) {
-      return null;
-    }
+    private CommitInfo parseCommit(final String gitFolder, final String sha, final GitObject gitObject)
+            throws IOException, DataFormatException {
+        if (gitObject.getType() == GitObject.TAG_TYPE) {
+            // If the Git object is a tag, we need to read which sha is being referenced within the tag
+            // object content.
 
-    short packVersion = 0;
-    for (final File idxFile : idxFiles) {
-      // We assume that if an IDX file has a certain version, the rest of IDXs file will be based on
-      // the same version.
-      if (packVersion == 0) {
-        packVersion = GitPackUtils.extractGitPackVersion(idxFile);
-      }
-
-      final VersionedPackGitInfoExtractor gitPackExtractor = lookupExtractor(packVersion);
-      if (gitPackExtractor == null) {
-        break;
-      }
-
-      final GitPackObject packObj =
-          gitPackExtractor.extract(idxFile, GitPackUtils.getPackFile(idxFile), sha);
-      if (packObj.raisedError()) {
-        // If an error is raised, we don't want to continue checking the next packfiles.
-        return null;
-      }
+            // The referenced object is in the first bytes until the first LF ("object $sha1\ntype ")
+            final int lf = RawParseUtils.nextLF(gitObject.getContent(), 0);
+            if (lf == -1) {
+                return CommitInfo.NOOP;
+            }
 
-      if (packObj.getShaIndex() == GitPackObject.NOT_FOUND_SHA_INDEX) {
-        // If the commit sha has not been found in this idx file, continue with the next one.
-        continue;
-      }
+            // We get the reference in the object getting the bytes until the \n character:
+            final String objectSha = new String(Arrays.copyOfRange(gitObject.getContent(), 0, lf - 1));
 
-      return packObj;
-    }
-    return null;
-  }
-
-  private static final Pattern SPACE_PATTERN = Pattern.compile(" ");
-
-  private CommitInfo parseCommit(
-      final String gitFolder, final String sha, final GitObject gitObject)
-      throws IOException, DataFormatException {
-    if (gitObject.getType() == GitObject.TAG_TYPE) {
-      // If the Git object is a tag, we need to read which sha is being referenced within the tag
-      // object content.
-
-      // The referenced object is in the first bytes until the first LF ("object $sha1\ntype ")
-      final int lf = RawParseUtils.nextLF(gitObject.getContent(), 0);
-      if (lf == -1) {
-        return CommitInfo.NOOP;
-      }
-
-      // We get the reference in the object getting the bytes until the \n character:
-      final String objectSha = new String(Arrays.copyOfRange(gitObject.getContent(), 0, lf - 1));
-
-      // Here, objectSha = "object $sha1". E.g: "object 44c242675ddf69b7b1f440b4a5d8d24e908d8bef"
-      // Split by " " and get the sha in the second position of the array
-      final String[] objectShaChunks = SPACE_PATTERN.split(objectSha);
-      if (objectShaChunks.length < 2) {
-        return CommitInfo.NOOP;
-      }
-
-      final String innerSha = objectShaChunks[SHA_INDEX];
-      return findCommit(gitFolder, innerSha);
-
-    } else if (gitObject.getType() != GitObject.COMMIT_TYPE) {
-      return CommitInfo.NOOP;
-    }
+            // Here, objectSha = "object $sha1". E.g: "object 44c242675ddf69b7b1f440b4a5d8d24e908d8bef"
+            // Split by " " and get the sha in the second position of the array
+            final String[] objectShaChunks = SPACE_PATTERN.split(objectSha);
+            if (objectShaChunks.length < 2) {
+                return CommitInfo.NOOP;
+            }
 
-    final byte[] content = gitObject.getContent();
-    final PersonInfo author = getAuthor(content);
-    final PersonInfo committer = getCommitter(content);
-    final String fullMessage = getFullMessage(content);
-
-    return new CommitInfo(sha, author, committer, fullMessage);
-  }
-
-  private GitObject buildGitObject(final byte[] compressedBytes) {
-    try {
-      final byte[] decompressed = GitUtils.inflate(compressedBytes);
-      if (decompressed == null) {
-        return GitObject.NOOP;
-      }
-
-      // The ((byte) 0) separates the metadata and the content
-      // in the decompressed git object.
-      final int separatorIndex = RawParseUtils.findByte(decompressed, (byte) 0);
-      if (separatorIndex == -1) {
-        // We cannot find the separator.
-        return GitObject.NOOP;
-      }
-
-      // Getting the metadata from 0 to separator index
-      final byte[] metadataBytes = Arrays.copyOfRange(decompressed, 0, separatorIndex);
-
-      // The metadata has the type and the size of the git object separated by the space character
-      // ((byte)32)
-      // metadata[0] contains the type (e.g. commit)
-      // metadata[1] contains the size (e.g. 261)
-      final String[] metadata = SPACE_PATTERN.split(new String(metadataBytes));
-      if (metadata.length != 2) {
-        // Unexpected metadata format.
-        return GitObject.NOOP;
-      }
-
-      // Getting the content from separator index to the end of decompressed byte array.
-      final byte[] content =
-          Arrays.copyOfRange(decompressed, separatorIndex + 1, decompressed.length);
-
-      return new GitObject(
-          typeToByte(metadata[VersionedPackGitInfoExtractor.TYPE_INDEX]),
-          Integer.parseInt(metadata[VersionedPackGitInfoExtractor.SIZE_INDEX]),
-          content);
-    } catch (final DataFormatException ex) {
-      return GitObject.NOOP;
-    }
-  }
+            final String innerSha = objectShaChunks[SHA_INDEX];
+            return findCommit(gitFolder, innerSha);
 
-  private GitObject buildGitObject(final GitPackObject gitPackObject) {
-    if (gitPackObject == null) {
-      return GitObject.NOOP;
-    }
+        } else if (gitObject.getType() != GitObject.COMMIT_TYPE) {
+            return CommitInfo.NOOP;
+        }
 
-    try {
-      final byte[] decompressed = GitUtils.inflate(gitPackObject.getDeflatedContent());
-      if (decompressed == null) {
-        return GitObject.NOOP;
-      }
+        final byte[] content = gitObject.getContent();
+        final PersonInfo author = getAuthor(content);
+        final PersonInfo committer = getCommitter(content);
+        final String fullMessage = getFullMessage(content);
 
-      return new GitObject(gitPackObject.getType(), decompressed.length, decompressed);
-    } catch (final DataFormatException ex) {
-      return GitObject.NOOP;
-    }
-  }
-
-  private static byte typeToByte(final String type) {
-    switch (type) {
-      case "commit":
-        return GitObject.COMMIT_TYPE;
-      case "tag":
-        return GitObject.TAG_TYPE;
-      default:
-        return GitObject.UNKNOWN_TYPE;
+        return new CommitInfo(sha, author, committer, fullMessage);
     }
-  }
 
-  private String extractSha(final Path gitFolder, final String head) throws IOException {
-    if (head == null) {
-      return null;
+    private GitObject buildGitObject(final byte[] compressedBytes) {
+        try {
+            final byte[] decompressed = GitUtils.inflate(compressedBytes);
+            if (decompressed == null) {
+                return GitObject.NOOP;
+            }
+
+            // The ((byte) 0) separates the metadata and the content
+            // in the decompressed git object.
+            final int separatorIndex = RawParseUtils.findByte(decompressed, (byte) 0);
+            if (separatorIndex == -1) {
+                // We cannot find the separator.
+                return GitObject.NOOP;
+            }
+
+            // Getting the metadata from 0 to separator index
+            final byte[] metadataBytes = Arrays.copyOfRange(decompressed, 0, separatorIndex);
+
+            // The metadata has the type and the size of the git object separated by the space character
+            // ((byte)32)
+            // metadata[0] contains the type (e.g. commit)
+            // metadata[1] contains the size (e.g. 261)
+            final String[] metadata = SPACE_PATTERN.split(new String(metadataBytes));
+            if (metadata.length != 2) {
+                // Unexpected metadata format.
+                return GitObject.NOOP;
+            }
+
+            // Getting the content from separator index to the end of decompressed byte array.
+            final byte[] content = Arrays.copyOfRange(decompressed, separatorIndex + 1, decompressed.length);
+
+            return new GitObject(
+                    typeToByte(metadata[VersionedPackGitInfoExtractor.TYPE_INDEX]),
+                    Integer.parseInt(metadata[VersionedPackGitInfoExtractor.SIZE_INDEX]),
+                    content);
+        } catch (final DataFormatException ex) {
+            return GitObject.NOOP;
+        }
     }
 
-    // HEAD can contain a reference (e.g.: refs/heads/master) or
-    // a SHA (e.g.: 6ba9a670e26a69ae26bafd2409ae200d152afa76)
-    if (head.contains("ref:")) {
-      final String refStr = extractRef(head);
-      if (refStr == null) {
-        return null;
-      }
-
-      // If the HEAD contains a reference, we need to access to
-      // the content of that reference which will contain the SHA.
-      final File ref = gitFolder.resolve(refStr).toFile();
-      if (!ref.exists()) {
-        return null;
-      }
-      return readFile(ref.toPath());
+    private GitObject buildGitObject(final GitPackObject gitPackObject) {
+        if (gitPackObject == null) {
+            return GitObject.NOOP;
+        }
+
+        try {
+            final byte[] decompressed = GitUtils.inflate(gitPackObject.getDeflatedContent());
+            if (decompressed == null) {
+                return GitObject.NOOP;
+            }
+
+            return new GitObject(gitPackObject.getType(), decompressed.length, decompressed);
+        } catch (final DataFormatException ex) {
+            return GitObject.NOOP;
+        }
     }
 
-    return head;
-  }
-
-  // Adapted from getAuthorIdent()
-  // https://github.com/eclipse/jgit/blob/master/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java
-  protected PersonInfo getAuthor(final byte[] buffer) {
-    // Locate the index where the author name begins.
-    final int authorNameBeginning = RawParseUtils.author(buffer, 0);
-    if (authorNameBeginning < 0) {
-      return PersonInfo.NOOP;
+    private static byte typeToByte(final String type) {
+        switch (type) {
+            case "commit":
+                return GitObject.COMMIT_TYPE;
+            case "tag":
+                return GitObject.TAG_TYPE;
+            default:
+                return GitObject.UNKNOWN_TYPE;
+        }
     }
 
-    // Starting from the author name beginning index,
-    // we parse the "person" info of the author.
-    return parsePersonInfo(buffer, authorNameBeginning);
-  }
-
-  // Adapted from getCommitterIdent()
-  // https://github.com/eclipse/jgit/blob/master/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java
-  protected PersonInfo getCommitter(final byte[] buffer) {
-    // Locate the index where the committer name begins.
-    final int nameB = RawParseUtils.committer(buffer, 0);
-    if (nameB < 0) {
-      return PersonInfo.NOOP;
+    private String extractSha(final Path gitFolder, final String head) throws IOException {
+        if (head == null) {
+            return null;
+        }
+
+        // HEAD can contain a reference (e.g.: refs/heads/master) or
+        // a SHA (e.g.: 6ba9a670e26a69ae26bafd2409ae200d152afa76)
+        if (head.contains("ref:")) {
+            final String refStr = extractRef(head);
+            if (refStr == null) {
+                return null;
+            }
+
+            // If the HEAD contains a reference, we need to access to
+            // the content of that reference which will contain the SHA.
+            final File ref = gitFolder.resolve(refStr).toFile();
+            if (!ref.exists()) {
+                return null;
+            }
+            return readFile(ref.toPath());
+        }
+
+        return head;
     }
 
-    // Starting from the committer name beginning index,
-    // we parse the "person" info of the author.
-    return parsePersonInfo(buffer, nameB);
-  }
-
-  // Adapted from getFullMessage()
-  // https://github.com/eclipse/jgit/blob/master/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java
-  protected String getFullMessage(final byte[] buffer) {
-    // Locate the index where the commit message begins.
-    final int msgB = RawParseUtils.commitMessage(buffer, 0);
-    if (msgB < 0) {
-      return null;
+    // Adapted from getAuthorIdent()
+    // https://github.com/eclipse/jgit/blob/master/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java
+    protected PersonInfo getAuthor(final byte[] buffer) {
+        // Locate the index where the author name begins.
+        final int authorNameBeginning = RawParseUtils.author(buffer, 0);
+        if (authorNameBeginning < 0) {
+            return PersonInfo.NOOP;
+        }
+
+        // Starting from the author name beginning index,
+        // we parse the "person" info of the author.
+        return parsePersonInfo(buffer, authorNameBeginning);
     }
 
-    // Starting from the commit message beginning index,
-    // we parse the "person" info of the author.
-    return RawParseUtils.decode(buffer, msgB, buffer.length);
-  }
-
-  // Adapted from parsePersonIdent()
-  // https://github.com/eclipse/jgit/blob/master/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java
-  protected PersonInfo parsePersonInfo(final byte[] raw, final int nameB) {
-    // Typically, the line which contains
-    // the person information looks like:
-    // author John Doe <john@doe.com> 1613137668 +0100
-    // committer Jane Doe <jane@doe.com> 1613137724 +0100
-
-    // First, we find the index where the email starts and ends:
-    final int emailB = RawParseUtils.nextLF(raw, nameB, '<');
-    final int emailE = RawParseUtils.nextLF(raw, emailB, '>');
-    if (emailB >= raw.length
-        || raw[emailB] == '\n'
-        || (emailE >= raw.length - 1 && raw[emailE - 1] != '>')) {
-      return null;
+    // Adapted from getCommitterIdent()
+    // https://github.com/eclipse/jgit/blob/master/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java
+    protected PersonInfo getCommitter(final byte[] buffer) {
+        // Locate the index where the committer name begins.
+        final int nameB = RawParseUtils.committer(buffer, 0);
+        if (nameB < 0) {
+            return PersonInfo.NOOP;
+        }
+
+        // Starting from the committer name beginning index,
+        // we parse the "person" info of the author.
+        return parsePersonInfo(buffer, nameB);
     }
 
-    // We need to find which is the index where the name ends,
-    // using the relative position where the email starts.
-    final int nameEnd = emailB - 2 >= nameB && raw[emailB - 2] == ' ' ? emailB - 2 : emailB - 1;
-
-    // Once we have the indexes where the name starts and ends
-    // we can extract the name.
-    final String name = RawParseUtils.decode(raw, nameB, nameEnd);
-
-    // Same approach to extract the email, using the indexes
-    // where the email starts and ends.
-    final String email = RawParseUtils.decode(raw, emailB, emailE - 1);
-
-    // Start searching from end of line, as after first name-email pair,
-    // another name-email pair may occur. We will ignore all kinds of
-    // "junk" following the first email.
-    //
-    // We've to use (emailE - 1) for the case that raw[email] is LF,
-    // otherwise we would run too far. "-2" is necessary to position
-    // before the LF in case of LF termination resp. the penultimate
-    // character if there is no trailing LF.
-    final int tzBegin =
-        RawParseUtils.lastIndexOfTrim(raw, ' ', RawParseUtils.nextLF(raw, emailE - 1) - 2) + 1;
-    if (tzBegin <= emailE) // No time/zone, still valid
-    {
-      return new PersonInfo(name, email, 0, 0);
+    // Adapted from getFullMessage()
+    // https://github.com/eclipse/jgit/blob/master/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java
+    protected String getFullMessage(final byte[] buffer) {
+        // Locate the index where the commit message begins.
+        final int msgB = RawParseUtils.commitMessage(buffer, 0);
+        if (msgB < 0) {
+            return null;
+        }
+
+        // Starting from the commit message beginning index,
+        // we parse the "person" info of the author.
+        return RawParseUtils.decode(buffer, msgB, buffer.length);
     }
 
-    final int whenBegin =
-        Math.max(emailE, RawParseUtils.lastIndexOfTrim(raw, ' ', tzBegin - 1) + 1);
-    if (whenBegin >= tzBegin - 1) // No time/zone, still valid
-    {
-      return new PersonInfo(name, email, 0, 0);
+    // Adapted from parsePersonIdent()
+    // https://github.com/eclipse/jgit/blob/master/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java
+    protected PersonInfo parsePersonInfo(final byte[] raw, final int nameB) {
+        // Typically, the line which contains
+        // the person information looks like:
+        // author John Doe <john@doe.com> 1613137668 +0100
+        // committer Jane Doe <jane@doe.com> 1613137724 +0100
+
+        // First, we find the index where the email starts and ends:
+        final int emailB = RawParseUtils.nextLF(raw, nameB, '<');
+        final int emailE = RawParseUtils.nextLF(raw, emailB, '>');
+        if (emailB >= raw.length || raw[emailB] == '\n' || (emailE >= raw.length - 1 && raw[emailE - 1] != '>')) {
+            return null;
+        }
+
+        // We need to find which is the index where the name ends,
+        // using the relative position where the email starts.
+        final int nameEnd = emailB - 2 >= nameB && raw[emailB - 2] == ' ' ? emailB - 2 : emailB - 1;
+
+        // Once we have the indexes where the name starts and ends
+        // we can extract the name.
+        final String name = RawParseUtils.decode(raw, nameB, nameEnd);
+
+        // Same approach to extract the email, using the indexes
+        // where the email starts and ends.
+        final String email = RawParseUtils.decode(raw, emailB, emailE - 1);
+
+        // Start searching from end of line, as after first name-email pair,
+        // another name-email pair may occur. We will ignore all kinds of
+        // "junk" following the first email.
+        //
+        // We've to use (emailE - 1) for the case that raw[email] is LF,
+        // otherwise we would run too far. "-2" is necessary to position
+        // before the LF in case of LF termination resp. the penultimate
+        // character if there is no trailing LF.
+        final int tzBegin = RawParseUtils.lastIndexOfTrim(raw, ' ', RawParseUtils.nextLF(raw, emailE - 1) - 2) + 1;
+        if (tzBegin <= emailE) // No time/zone, still valid
+        {
+            return new PersonInfo(name, email, 0, 0);
+        }
+
+        final int whenBegin = Math.max(emailE, RawParseUtils.lastIndexOfTrim(raw, ' ', tzBegin - 1) + 1);
+        if (whenBegin >= tzBegin - 1) // No time/zone, still valid
+        {
+            return new PersonInfo(name, email, 0, 0);
+        }
+
+        final long when = RawParseUtils.parseLongBase10(raw, whenBegin);
+        final int tz = RawParseUtils.parseTimeZoneOffset(raw, tzBegin);
+        return new PersonInfo(name, email, when * 1000L, tz);
     }
 
-    final long when = RawParseUtils.parseLongBase10(raw, whenBegin);
-    final int tz = RawParseUtils.parseTimeZoneOffset(raw, tzBegin);
-    return new PersonInfo(name, email, when * 1000L, tz);
-  }
+    private String readFile(final Path filepath) throws IOException {
+        if (filepath == null || !filepath.toFile().exists()) {
+            return null;
+        }
 
-  private String readFile(final Path filepath) throws IOException {
-    if (filepath == null || !filepath.toFile().exists()) {
-      return null;
-    }
+        final String content = new String(Files.readAllBytes(filepath));
+        if (content.endsWith("\n")) {
+            return content.substring(0, content.length() - 1);
+        }
 
-    final String content = new String(Files.readAllBytes(filepath));
-    if (content.endsWith("\n")) {
-      return content.substring(0, content.length() - 1);
+        return content;
     }
 
-    return content;
-  }
-
-  private static VersionedPackGitInfoExtractor lookupExtractor(final short packVersion) {
-    if (packVersion == V2PackGitInfoExtractor.VERSION) {
-      return V2_PACK_GIT_INFO_EXTRACTOR;
-    } else {
-      return null;
+    private static VersionedPackGitInfoExtractor lookupExtractor(final short packVersion) {
+        if (packVersion == V2PackGitInfoExtractor.VERSION) {
+            return V2_PACK_GIT_INFO_EXTRACTOR;
+        } else {
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/pack/GitPackObject.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/pack/GitPackObject.java
index 4aabe17cb18..bddf0d61c7b 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/pack/GitPackObject.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/pack/GitPackObject.java
@@ -2,37 +2,36 @@
 
 public final class GitPackObject {
 
-  public static final int NOT_FOUND_SHA_INDEX = -1;
-  public static final GitPackObject ERROR_PACK_OBJECT = new GitPackObject(0, (byte) 0, null, true);
-  public static final GitPackObject NOT_FOUND_PACK_OBJECT =
-      new GitPackObject(NOT_FOUND_SHA_INDEX, (byte) 0, null, false);
-
-  private final int shaIndex;
-  private final byte type;
-  private final byte[] deflatedContent;
-  private final boolean error;
-
-  public GitPackObject(
-      final int shaIndex, final byte type, final byte[] compressedContent, final boolean error) {
-    this.shaIndex = shaIndex;
-    this.type = type;
-    this.deflatedContent = compressedContent;
-    this.error = error;
-  }
-
-  public int getShaIndex() {
-    return shaIndex;
-  }
-
-  public byte getType() {
-    return type;
-  }
-
-  public byte[] getDeflatedContent() {
-    return deflatedContent;
-  }
-
-  public boolean raisedError() {
-    return error;
-  }
+    public static final int NOT_FOUND_SHA_INDEX = -1;
+    public static final GitPackObject ERROR_PACK_OBJECT = new GitPackObject(0, (byte) 0, null, true);
+    public static final GitPackObject NOT_FOUND_PACK_OBJECT =
+            new GitPackObject(NOT_FOUND_SHA_INDEX, (byte) 0, null, false);
+
+    private final int shaIndex;
+    private final byte type;
+    private final byte[] deflatedContent;
+    private final boolean error;
+
+    public GitPackObject(final int shaIndex, final byte type, final byte[] compressedContent, final boolean error) {
+        this.shaIndex = shaIndex;
+        this.type = type;
+        this.deflatedContent = compressedContent;
+        this.error = error;
+    }
+
+    public int getShaIndex() {
+        return shaIndex;
+    }
+
+    public byte getType() {
+        return type;
+    }
+
+    public byte[] getDeflatedContent() {
+        return deflatedContent;
+    }
+
+    public boolean raisedError() {
+        return error;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/pack/GitPackUtils.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/pack/GitPackUtils.java
index 245f8b6d516..07eed828d3f 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/pack/GitPackUtils.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/pack/GitPackUtils.java
@@ -7,63 +7,61 @@
 
 public final class GitPackUtils {
 
-  private GitPackUtils() {}
+    private GitPackUtils() {}
 
-  // Version in a .idx file v1.
-  private static final short V1_VERSION = 1;
-  // First 4 bytes in a .idx file starting from v2.
-  protected static final byte[] HEADER = new byte[] {-1, 116, 79, 99};
+    // Version in a .idx file v1.
+    private static final short V1_VERSION = 1;
+    // First 4 bytes in a .idx file starting from v2.
+    protected static final byte[] HEADER = new byte[] {-1, 116, 79, 99};
 
-  /**
-   * Extracts the packfile version reading the IDX file. Starting from v2, there are dedicated
-   * 4-bytes to stored the version.
-   *
-   * <p>If we don't find the starting header, the version is always V1
-   *
-   * @param idxFile
-   * @return
-   * @throws IOException
-   */
-  public static short extractGitPackVersion(final File idxFile) throws IOException {
-    try (final RandomAccessFile raf = new RandomAccessFile(idxFile, "r")) {
-      final byte[] header = readBytes(raf, 4);
-      if (!Arrays.equals(header, HEADER)) {
-        return V1_VERSION;
-      }
+    /**
+     * Extracts the packfile version reading the IDX file. Starting from v2, there are dedicated
+     * 4-bytes to stored the version.
+     *
+     * <p>If we don't find the starting header, the version is always V1
+     *
+     * @param idxFile
+     * @return
+     * @throws IOException
+     */
+    public static short extractGitPackVersion(final File idxFile) throws IOException {
+        try (final RandomAccessFile raf = new RandomAccessFile(idxFile, "r")) {
+            final byte[] header = readBytes(raf, 4);
+            if (!Arrays.equals(header, HEADER)) {
+                return V1_VERSION;
+            }
 
-      final int version = raf.readInt();
-      return (short) version;
+            final int version = raf.readInt();
+            return (short) version;
+        }
     }
-  }
 
-  public static byte[] readBytes(final RandomAccessFile file, final int numBytes)
-      throws IOException {
-    long remainingBytes = file.length() - file.getFilePointer();
-    final byte[] buff = new byte[Math.min(numBytes, (int) remainingBytes)];
-    file.readFully(buff);
-    return buff;
-  }
+    public static byte[] readBytes(final RandomAccessFile file, final int numBytes) throws IOException {
+        long remainingBytes = file.length() - file.getFilePointer();
+        final byte[] buff = new byte[Math.min(numBytes, (int) remainingBytes)];
+        file.readFully(buff);
+        return buff;
+    }
 
-  public static byte[] hexToByteArray(final String s) {
-    final int len = s.length();
-    final byte[] data = new byte[len / 2];
-    for (int i = 0; i < len; i += 2) {
-      data[i / 2] =
-          (byte) ((Character.digit(s.charAt(i), 16) << 4) + Character.digit(s.charAt(i + 1), 16));
+    public static byte[] hexToByteArray(final String s) {
+        final int len = s.length();
+        final byte[] data = new byte[len / 2];
+        for (int i = 0; i < len; i += 2) {
+            data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4) + Character.digit(s.charAt(i + 1), 16));
+        }
+        return data;
     }
-    return data;
-  }
 
-  /**
-   * Get the pack file based on the idx file. The idx/pack files have the same name but different
-   * extension (.idx or .pack)
-   *
-   * @param idxFile
-   * @return pack file based on the idx file
-   */
-  public static File getPackFile(final File idxFile) {
-    final int i = idxFile.getName().lastIndexOf('.');
-    final String name = idxFile.getName().substring(0, i);
-    return new File(idxFile.getParent(), name + ".pack");
-  }
+    /**
+     * Get the pack file based on the idx file. The idx/pack files have the same name but different
+     * extension (.idx or .pack)
+     *
+     * @param idxFile
+     * @return pack file based on the idx file
+     */
+    public static File getPackFile(final File idxFile) {
+        final int i = idxFile.getName().lastIndexOf('.');
+        final String name = idxFile.getName().substring(0, i);
+        return new File(idxFile.getParent(), name + ".pack");
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/pack/V2PackGitInfoExtractor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/pack/V2PackGitInfoExtractor.java
index 569de1cca93..05e05e00a45 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/pack/V2PackGitInfoExtractor.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/pack/V2PackGitInfoExtractor.java
@@ -52,243 +52,242 @@
  */
 public class V2PackGitInfoExtractor extends VersionedPackGitInfoExtractor {
 
-  public static final short VERSION = 2;
-
-  private static final int[] INVALID_TYPE_AND_SIZE = new int[] {-1, -1};
-  private static final int MAX_ALLOWED_SIZE = Character.MAX_VALUE; // 65535 or 2 bytes
-
-  @Override
-  public short getVersion() {
-    return VERSION;
-  }
-
-  /**
-   * Extracts the Git object information of a certain commit sha from the IDX and pack files.
-   *
-   * <p>If there is an error in the process, the object contains a flag called "error" set to true.
-   *
-   * @param idxFile
-   * @param packFile
-   * @param commitSha
-   * @return gitPackObject with type and deflated content.
-   */
-  @Override
-  public GitPackObject extract(final File idxFile, final File packFile, final String commitSha) {
-    try {
-      final String indexHex = commitSha.substring(0, 2);
-      final int index = Integer.parseInt(indexHex, 16);
-      final int previousIndex = index - 1;
-
-      try (final RandomAccessFile idx = new RandomAccessFile(idxFile, "r")) {
-        // Skip header and version
-        idx.seek(8);
-
-        int numObjectsPreviousIndex = 0;
-        if (previousIndex != -1) {
-          // Seek to previousIndex position.
-          idx.seek((4L * previousIndex) + idx.getFilePointer());
-          numObjectsPreviousIndex = idx.readInt();
-        }
+    public static final short VERSION = 2;
 
-        // In the fanout table, every index has its objects + the previous ones.
-        // We need to subtract the previous index objects to know the correct
-        // actual number of objects for this specific index.
-        final int numObjectsIndex = idx.readInt() - numObjectsPreviousIndex;
+    private static final int[] INVALID_TYPE_AND_SIZE = new int[] {-1, -1};
+    private static final int MAX_ALLOWED_SIZE = Character.MAX_VALUE; // 65535 or 2 bytes
 
-        // Seek to last position. The last position contains the number of all objects.
-        idx.seek((4L * (255 - (index + 1))) + idx.getFilePointer());
-        final int totalObjects = idx.readInt();
+    @Override
+    public short getVersion() {
+        return VERSION;
+    }
 
-        // Search the sha index in the second layer: the SHA listing.
-        final int shaIndex =
-            searchSha(idx, commitSha, totalObjects, numObjectsPreviousIndex, numObjectsIndex);
-        if (shaIndex == GitPackObject.NOT_FOUND_SHA_INDEX) {
-          return GitPackObject.NOT_FOUND_PACK_OBJECT;
+    /**
+     * Extracts the Git object information of a certain commit sha from the IDX and pack files.
+     *
+     * <p>If there is an error in the process, the object contains a flag called "error" set to true.
+     *
+     * @param idxFile
+     * @param packFile
+     * @param commitSha
+     * @return gitPackObject with type and deflated content.
+     */
+    @Override
+    public GitPackObject extract(final File idxFile, final File packFile, final String commitSha) {
+        try {
+            final String indexHex = commitSha.substring(0, 2);
+            final int index = Integer.parseInt(indexHex, 16);
+            final int previousIndex = index - 1;
+
+            try (final RandomAccessFile idx = new RandomAccessFile(idxFile, "r")) {
+                // Skip header and version
+                idx.seek(8);
+
+                int numObjectsPreviousIndex = 0;
+                if (previousIndex != -1) {
+                    // Seek to previousIndex position.
+                    idx.seek((4L * previousIndex) + idx.getFilePointer());
+                    numObjectsPreviousIndex = idx.readInt();
+                }
+
+                // In the fanout table, every index has its objects + the previous ones.
+                // We need to subtract the previous index objects to know the correct
+                // actual number of objects for this specific index.
+                final int numObjectsIndex = idx.readInt() - numObjectsPreviousIndex;
+
+                // Seek to last position. The last position contains the number of all objects.
+                idx.seek((4L * (255 - (index + 1))) + idx.getFilePointer());
+                final int totalObjects = idx.readInt();
+
+                // Search the sha index in the second layer: the SHA listing.
+                final int shaIndex = searchSha(idx, commitSha, totalObjects, numObjectsPreviousIndex, numObjectsIndex);
+                if (shaIndex == GitPackObject.NOT_FOUND_SHA_INDEX) {
+                    return GitPackObject.NOT_FOUND_PACK_OBJECT;
+                }
+
+                // Third layer: 4 byte CRC for each object. We skip it.
+                idx.seek((4L * totalObjects) + idx.getFilePointer());
+
+                // Search packOffset in fourth and fifth layer.
+                final long packOffset = searchOffset(idx, shaIndex, totalObjects);
+
+                // Open pack file and seek to packOffset.
+                try (final RandomAccessFile pack = new RandomAccessFile(packFile, "r")) {
+                    pack.seek(packOffset);
+
+                    // Get the type and the size of the git object.
+                    final int[] gitObjectTypeAndSize = extractGitObjectTypeAndSize(pack);
+                    if (Arrays.equals(gitObjectTypeAndSize, INVALID_TYPE_AND_SIZE)) {
+                        return GitPackObject.ERROR_PACK_OBJECT;
+                    }
+
+                    // Return the GitPackObject with the extracted information.
+                    return new GitPackObject(
+                            shaIndex,
+                            (byte) gitObjectTypeAndSize[TYPE_INDEX],
+                            readBytes(pack, gitObjectTypeAndSize[SIZE_INDEX]),
+                            false);
+                }
+            }
+
+        } catch (final Exception e) {
+            return GitPackObject.ERROR_PACK_OBJECT;
         }
+    }
 
-        // Third layer: 4 byte CRC for each object. We skip it.
-        idx.seek((4L * totalObjects) + idx.getFilePointer());
-
-        // Search packOffset in fourth and fifth layer.
-        final long packOffset = searchOffset(idx, shaIndex, totalObjects);
-
-        // Open pack file and seek to packOffset.
-        try (final RandomAccessFile pack = new RandomAccessFile(packFile, "r")) {
-          pack.seek(packOffset);
-
-          // Get the type and the size of the git object.
-          final int[] gitObjectTypeAndSize = extractGitObjectTypeAndSize(pack);
-          if (Arrays.equals(gitObjectTypeAndSize, INVALID_TYPE_AND_SIZE)) {
-            return GitPackObject.ERROR_PACK_OBJECT;
-          }
-
-          // Return the GitPackObject with the extracted information.
-          return new GitPackObject(
-              shaIndex,
-              (byte) gitObjectTypeAndSize[TYPE_INDEX],
-              readBytes(pack, gitObjectTypeAndSize[SIZE_INDEX]),
-              false);
+    /**
+     * Extracts the SHA index using the number of objects found in the fanout table.
+     *
+     * @param idx
+     * @param commitSha
+     * @param totalObjects
+     * @param numObjectsPreviousIndex
+     * @param numObjectsIndex
+     * @return sha index to be used in the offsets table.
+     * @throws IOException
+     */
+    protected int searchSha(
+            final RandomAccessFile idx,
+            final String commitSha,
+            final int totalObjects,
+            final int numObjectsPreviousIndex,
+            final int numObjectsIndex)
+            throws IOException {
+
+        // Skip all previous SHAs
+        idx.seek((20L * numObjectsPreviousIndex) + idx.getFilePointer());
+        final byte[] shaBytes = hexToByteArray(commitSha);
+
+        // Search target SHA index in the SHA listing table.
+        for (int i = 0; i < numObjectsIndex; i++) {
+            final byte[] current = readBytes(idx, 20);
+            if (Arrays.equals(shaBytes, current)) {
+                final int shaIndex = numObjectsPreviousIndex + i;
+
+                // If we find the SHA, we skip all SHA listing table.
+                idx.seek((20L * (totalObjects - (shaIndex + 1))) + idx.getFilePointer());
+                return shaIndex;
+            }
         }
-      }
 
-    } catch (final Exception e) {
-      return GitPackObject.ERROR_PACK_OBJECT;
-    }
-  }
-
-  /**
-   * Extracts the SHA index using the number of objects found in the fanout table.
-   *
-   * @param idx
-   * @param commitSha
-   * @param totalObjects
-   * @param numObjectsPreviousIndex
-   * @param numObjectsIndex
-   * @return sha index to be used in the offsets table.
-   * @throws IOException
-   */
-  protected int searchSha(
-      final RandomAccessFile idx,
-      final String commitSha,
-      final int totalObjects,
-      final int numObjectsPreviousIndex,
-      final int numObjectsIndex)
-      throws IOException {
-
-    // Skip all previous SHAs
-    idx.seek((20L * numObjectsPreviousIndex) + idx.getFilePointer());
-    final byte[] shaBytes = hexToByteArray(commitSha);
-
-    // Search target SHA index in the SHA listing table.
-    for (int i = 0; i < numObjectsIndex; i++) {
-      final byte[] current = readBytes(idx, 20);
-      if (Arrays.equals(shaBytes, current)) {
-        final int shaIndex = numObjectsPreviousIndex + i;
-
-        // If we find the SHA, we skip all SHA listing table.
-        idx.seek((20L * (totalObjects - (shaIndex + 1))) + idx.getFilePointer());
-        return shaIndex;
-      }
+        return GitPackObject.NOT_FOUND_SHA_INDEX;
     }
 
-    return GitPackObject.NOT_FOUND_SHA_INDEX;
-  }
-
-  /**
-   * Find the offset in the fourth and fifth layer of the IDX file using the sha index.
-   *
-   * @param idx
-   * @param shaIndex
-   * @param totalObjects
-   * @return
-   * @throws IOException
-   */
-  protected long searchOffset(
-      final RandomAccessFile idx, final int shaIndex, final int totalObjects) throws IOException {
-    // Fourth layer: 4 byte per object of offset in pack file
-    idx.seek((4L * shaIndex) + idx.getFilePointer());
-    int offset = idx.readInt();
-
-    // Check the first bit.
-    // If the first bit == 0, the offset is in the fourth layer.
-    // If the first bit == 1, the offset is in the fifth layer. (Only in pack files larger than 2
-    // Gb)
-    if (((offset >> 31) & 1) == 0) {
-      return offset;
-    } else {
-      // Clear first bit and look at it at the 5th layer
-      offset &= 0x7FFFFFFF;
-      // Skip complete fourth layer.
-      idx.seek(4L * (totalObjects - (shaIndex + 1)) + idx.getFilePointer());
-      // Use the offset from fourth layer, to find the actual pack file offset in the fifth layer.
-      // In this case, the offset is 8 bytes long.
-      idx.seek((8L * offset) + idx.getFilePointer());
-      return idx.readLong();
-    }
-  }
-
-  /**
-   * Returns an int array with the type and size of the git object. The type is stored in the pos 0
-   * of the array The size is stored in the pos 1 of the array.
-   *
-   * @param pack
-   * @return type and size of the git object.
-   * @throws IOException
-   */
-  protected int[] extractGitObjectTypeAndSize(final RandomAccessFile pack) throws IOException {
-    // The type and size of the git object is stored in a variable length byte array.
-    // If the read byte has the first bit == 0, it means it's the final byte to read.
-    byte sizePart;
-    byte[] sizeParts = new byte[2]; // 2 bytes size is the most common use case.
-    int idx = 0;
-    do {
-      sizePart = readBytes(pack, 1)[0];
-      sizeParts[idx++] = sizePart;
-
-      if (idx == sizeParts.length && ((sizePart >> 7) & 1) == 1) {
-        final byte[] temp = new byte[sizeParts.length + 1];
-        System.arraycopy(sizeParts, 0, temp, 0, sizeParts.length);
-        sizeParts = temp;
-      }
-
-    } while (((sizePart >> 7) & 1) == 1);
-
-    // First bit indicates if the size continues in the following byte or not.
-    // Next 3 bits are used to indicate the Git object type:
-    // https://git-scm.com/docs/pack-format#_object_types
-
-    // If type is not commit or tag, we consider it invalid.
-    final byte type = (byte) ((sizeParts[0] & 0x70) >> 4);
-    if (type != COMMIT_TYPE && type != TAG_TYPE) {
-      return INVALID_TYPE_AND_SIZE;
+    /**
+     * Find the offset in the fourth and fifth layer of the IDX file using the sha index.
+     *
+     * @param idx
+     * @param shaIndex
+     * @param totalObjects
+     * @return
+     * @throws IOException
+     */
+    protected long searchOffset(final RandomAccessFile idx, final int shaIndex, final int totalObjects)
+            throws IOException {
+        // Fourth layer: 4 byte per object of offset in pack file
+        idx.seek((4L * shaIndex) + idx.getFilePointer());
+        int offset = idx.readInt();
+
+        // Check the first bit.
+        // If the first bit == 0, the offset is in the fourth layer.
+        // If the first bit == 1, the offset is in the fifth layer. (Only in pack files larger than 2
+        // Gb)
+        if (((offset >> 31) & 1) == 0) {
+            return offset;
+        } else {
+            // Clear first bit and look at it at the 5th layer
+            offset &= 0x7FFFFFFF;
+            // Skip complete fourth layer.
+            idx.seek(4L * (totalObjects - (shaIndex + 1)) + idx.getFilePointer());
+            // Use the offset from fourth layer, to find the actual pack file offset in the fifth layer.
+            // In this case, the offset is 8 bytes long.
+            idx.seek((8L * offset) + idx.getFilePointer());
+            return idx.readLong();
+        }
     }
 
-    // We build the size combining the bits from sizeParts
-    // using bitwise operations (BigEndian).
-
-    // Example:
-    // - sizeParts = [-100, 53] => [10011100, 00110101]
-    // - size = 00000000 00000000 00000000 00000000
-
-    // Clean first bit and add bits to size using OR.
-    //    size       00000000 00000000 00000000 00000000
-    // OR sizePart.get(1) & 0x7F                00110101
-    //    size       00000000 00000000 00000000 00110101
-
-    // Move 4 bits to the left.
-    // size 00000000 00000000 00000011 01010000
-
-    // Clean four initial bits and add the result to size using OR.
-    // size            00000000 00000000 00000011 01010000
-    // OR sizePart.get(0) & 0x0F                  00001100
-    // size            00000000 00000000 00000011 01011100
-
-    // Finally, in the example:
-    // type: 001 -> commit
-    // size: 860
-
-    int size = 0;
-    for (int i = (sizeParts.length - 1); i >= 0; i--) {
-      if (i == 0) {
-        // The first part contains also the 3 bits for the type,
-        // so we move only 4 bits to the left.
-        size <<= 4;
-        size |= (sizeParts[i] & 0x0F);
-      } else {
-        // The rest of the parts don't have the 3 bits for the type,
-        // so we move 7 bits to the left.
-        size <<= 7;
-        size |= (sizeParts[i] & 0x7F);
-      }
-    }
+    /**
+     * Returns an int array with the type and size of the git object. The type is stored in the pos 0
+     * of the array The size is stored in the pos 1 of the array.
+     *
+     * @param pack
+     * @return type and size of the git object.
+     * @throws IOException
+     */
+    protected int[] extractGitObjectTypeAndSize(final RandomAccessFile pack) throws IOException {
+        // The type and size of the git object is stored in a variable length byte array.
+        // If the read byte has the first bit == 0, it means it's the final byte to read.
+        byte sizePart;
+        byte[] sizeParts = new byte[2]; // 2 bytes size is the most common use case.
+        int idx = 0;
+        do {
+            sizePart = readBytes(pack, 1)[0];
+            sizeParts[idx++] = sizePart;
+
+            if (idx == sizeParts.length && ((sizePart >> 7) & 1) == 1) {
+                final byte[] temp = new byte[sizeParts.length + 1];
+                System.arraycopy(sizeParts, 0, temp, 0, sizeParts.length);
+                sizeParts = temp;
+            }
+
+        } while (((sizePart >> 7) & 1) == 1);
+
+        // First bit indicates if the size continues in the following byte or not.
+        // Next 3 bits are used to indicate the Git object type:
+        // https://git-scm.com/docs/pack-format#_object_types
+
+        // If type is not commit or tag, we consider it invalid.
+        final byte type = (byte) ((sizeParts[0] & 0x70) >> 4);
+        if (type != COMMIT_TYPE && type != TAG_TYPE) {
+            return INVALID_TYPE_AND_SIZE;
+        }
 
-    // As the size can be any number, we need to protect ourselves
-    // to avoid reading potentially huge Git objects.
-    // We consider that 2 bytes is more than enough to store the commit message.
-    if (size > MAX_ALLOWED_SIZE) {
-      return INVALID_TYPE_AND_SIZE;
-    }
+        // We build the size combining the bits from sizeParts
+        // using bitwise operations (BigEndian).
+
+        // Example:
+        // - sizeParts = [-100, 53] => [10011100, 00110101]
+        // - size = 00000000 00000000 00000000 00000000
+
+        // Clean first bit and add bits to size using OR.
+        //    size       00000000 00000000 00000000 00000000
+        // OR sizePart.get(1) & 0x7F                00110101
+        //    size       00000000 00000000 00000000 00110101
+
+        // Move 4 bits to the left.
+        // size 00000000 00000000 00000011 01010000
+
+        // Clean four initial bits and add the result to size using OR.
+        // size            00000000 00000000 00000011 01010000
+        // OR sizePart.get(0) & 0x0F                  00001100
+        // size            00000000 00000000 00000011 01011100
+
+        // Finally, in the example:
+        // type: 001 -> commit
+        // size: 860
+
+        int size = 0;
+        for (int i = (sizeParts.length - 1); i >= 0; i--) {
+            if (i == 0) {
+                // The first part contains also the 3 bits for the type,
+                // so we move only 4 bits to the left.
+                size <<= 4;
+                size |= (sizeParts[i] & 0x0F);
+            } else {
+                // The rest of the parts don't have the 3 bits for the type,
+                // so we move 7 bits to the left.
+                size <<= 7;
+                size |= (sizeParts[i] & 0x7F);
+            }
+        }
+
+        // As the size can be any number, we need to protect ourselves
+        // to avoid reading potentially huge Git objects.
+        // We consider that 2 bytes is more than enough to store the commit message.
+        if (size > MAX_ALLOWED_SIZE) {
+            return INVALID_TYPE_AND_SIZE;
+        }
 
-    return new int[] {type, size};
-  }
+        return new int[] {type, size};
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/pack/VersionedPackGitInfoExtractor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/pack/VersionedPackGitInfoExtractor.java
index 373da58b31c..00e9c4b899a 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/pack/VersionedPackGitInfoExtractor.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/pack/VersionedPackGitInfoExtractor.java
@@ -4,11 +4,10 @@
 
 public abstract class VersionedPackGitInfoExtractor {
 
-  public static final byte TYPE_INDEX = 0;
-  public static final byte SIZE_INDEX = 1;
+    public static final byte TYPE_INDEX = 0;
+    public static final byte SIZE_INDEX = 1;
 
-  public abstract short getVersion();
+    public abstract short getVersion();
 
-  public abstract GitPackObject extract(
-      final File idxFile, final File packFile, final String commitSha);
+    public abstract GitPackObject extract(final File idxFile, final File packFile, final String commitSha);
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitClient.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitClient.java
index 140aa3999ab..2006b862964 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitClient.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitClient.java
@@ -13,61 +13,59 @@
 /** Client for fetching data and performing operations on a local Git repository. */
 public interface GitClient {
 
-  String HEAD = "HEAD";
+    String HEAD = "HEAD";
 
-  boolean isShallow() throws IOException, TimeoutException, InterruptedException;
+    boolean isShallow() throws IOException, TimeoutException, InterruptedException;
 
-  void unshallow(@Nullable String remoteCommitReference)
-      throws IOException, TimeoutException, InterruptedException;
+    void unshallow(@Nullable String remoteCommitReference) throws IOException, TimeoutException, InterruptedException;
 
-  @Nullable
-  String getGitFolder() throws IOException, TimeoutException, InterruptedException;
+    @Nullable
+    String getGitFolder() throws IOException, TimeoutException, InterruptedException;
 
-  @Nullable
-  String getRepoRoot() throws IOException, TimeoutException, InterruptedException;
+    @Nullable
+    String getRepoRoot() throws IOException, TimeoutException, InterruptedException;
 
-  @Nullable
-  String getRemoteUrl(String remoteName) throws IOException, TimeoutException, InterruptedException;
+    @Nullable
+    String getRemoteUrl(String remoteName) throws IOException, TimeoutException, InterruptedException;
 
-  @Nullable
-  String getUpstreamBranchSha() throws IOException, TimeoutException, InterruptedException;
+    @Nullable
+    String getUpstreamBranchSha() throws IOException, TimeoutException, InterruptedException;
 
-  @Nullable
-  String getCurrentBranch() throws IOException, TimeoutException, InterruptedException;
+    @Nullable
+    String getCurrentBranch() throws IOException, TimeoutException, InterruptedException;
 
-  @Nonnull
-  List<String> getTags(String commit) throws IOException, TimeoutException, InterruptedException;
+    @Nonnull
+    List<String> getTags(String commit) throws IOException, TimeoutException, InterruptedException;
 
-  @Nullable
-  String getSha(String reference) throws IOException, TimeoutException, InterruptedException;
+    @Nullable
+    String getSha(String reference) throws IOException, TimeoutException, InterruptedException;
 
-  @Nonnull
-  CommitInfo getCommitInfo(String commit, boolean fetchIfNotPresent)
-      throws IOException, TimeoutException, InterruptedException;
+    @Nonnull
+    CommitInfo getCommitInfo(String commit, boolean fetchIfNotPresent)
+            throws IOException, TimeoutException, InterruptedException;
 
-  @Nonnull
-  List<String> getLatestCommits() throws IOException, TimeoutException, InterruptedException;
+    @Nonnull
+    List<String> getLatestCommits() throws IOException, TimeoutException, InterruptedException;
 
-  @Nonnull
-  List<String> getObjects(Collection<String> commitsToSkip, Collection<String> commitsToInclude)
-      throws IOException, TimeoutException, InterruptedException;
+    @Nonnull
+    List<String> getObjects(Collection<String> commitsToSkip, Collection<String> commitsToInclude)
+            throws IOException, TimeoutException, InterruptedException;
 
-  Path createPackFiles(List<String> objectHashes)
-      throws IOException, TimeoutException, InterruptedException;
+    Path createPackFiles(List<String> objectHashes) throws IOException, TimeoutException, InterruptedException;
 
-  @Nullable
-  String getBaseCommitSha(@Nullable String baseBranch, @Nullable String defaultBranch)
-      throws IOException, TimeoutException, InterruptedException;
+    @Nullable
+    String getBaseCommitSha(@Nullable String baseBranch, @Nullable String defaultBranch)
+            throws IOException, TimeoutException, InterruptedException;
 
-  @Nullable
-  String getMergeBase(@Nullable String base, @Nullable String source)
-      throws IOException, TimeoutException, InterruptedException;
+    @Nullable
+    String getMergeBase(@Nullable String base, @Nullable String source)
+            throws IOException, TimeoutException, InterruptedException;
 
-  @Nullable
-  LineDiff getGitDiff(String baseCommit, String targetCommit)
-      throws IOException, TimeoutException, InterruptedException;
+    @Nullable
+    LineDiff getGitDiff(String baseCommit, String targetCommit)
+            throws IOException, TimeoutException, InterruptedException;
 
-  interface Factory {
-    GitClient create(@Nullable String repoRoot);
-  }
+    interface Factory {
+        GitClient create(@Nullable String repoRoot);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataApi.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataApi.java
index 9e70d1ffd34..bf93b9d2356 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataApi.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataApi.java
@@ -26,152 +26,144 @@
 /** API for making Git-data-related requests to backend */
 public class GitDataApi {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(GitDataApi.class);
-
-  private static final MediaType JSON = MediaType.get("application/json");
-  private static final MediaType OCTET_STREAM = MediaType.get("application/octet-stream");
-  private static final String SEARCH_COMMITS_URI = "git/repository/search_commits";
-  private static final String UPLOAD_PACKFILES_URI = "git/repository/packfile";
-
-  private final BackendApi backendApi;
-  private final CiVisibilityMetricCollector metricCollector;
-  private final JsonAdapter<SearchCommitsRequest> searchCommitsRequestAdapter;
-  private final JsonAdapter<SearchCommitsResponse> searchCommitsResponseAdapter;
-  private final JsonAdapter<PushedSha> pushedShaAdapter;
-
-  public GitDataApi(BackendApi backendApi, CiVisibilityMetricCollector metricCollector) {
-    this.backendApi = backendApi;
-    this.metricCollector = metricCollector;
-
-    Moshi moshi = new Moshi.Builder().build();
-    searchCommitsRequestAdapter = moshi.adapter(SearchCommitsRequest.class);
-    searchCommitsResponseAdapter = moshi.adapter(SearchCommitsResponse.class);
-    pushedShaAdapter = moshi.adapter(PushedSha.class);
-  }
-
-  /**
-   * Searches the list of commits that exist in Git DB on the server side
-   *
-   * @param gitRemoteUrl Git remote URL
-   * @param commitHashes List of commit SHAs that should be checked
-   * @return SHAs of commits that already exist on the server
-   * @throws IOException if remote request fails
-   */
-  public Collection<String> searchCommits(String gitRemoteUrl, List<String> commitHashes)
-      throws IOException {
-    List<Commit> commits = commitHashes.stream().map(Commit::new).collect(Collectors.toList());
-    SearchCommitsRequest searchCommitsRequest =
-        new SearchCommitsRequest(commits, new Meta(gitRemoteUrl));
-
-    String json = searchCommitsRequestAdapter.toJson(searchCommitsRequest);
-    RequestBody requestBody = RequestBody.create(JSON, json);
-
-    OkHttpUtils.CustomListener telemetryListener =
-        new TelemetryListener.Builder(metricCollector)
-            .requestCount(CiVisibilityCountMetric.GIT_REQUESTS_SEARCH_COMMITS)
-            .requestErrors(CiVisibilityCountMetric.GIT_REQUESTS_SEARCH_COMMITS_ERRORS)
-            .requestDuration(CiVisibilityDistributionMetric.GIT_REQUESTS_SEARCH_COMMITS_MS)
-            .build();
-
-    SearchCommitsResponse response =
-        backendApi.post(
-            SEARCH_COMMITS_URI,
-            requestBody,
-            is -> searchCommitsResponseAdapter.fromJson(Okio.buffer(Okio.source(is))),
-            telemetryListener,
-            false);
-
-    return response.data.stream().map(Commit::getId).collect(Collectors.toSet());
-  }
-
-  /**
-   * Uploads a Git pack file to Git DB on the server side
-   *
-   * @param gitRemoteUrl Git remote URL
-   * @param currentCommitHash SHA of commit with which the pack file is associated
-   * @param packFile Path to the fila that is being uploaded
-   * @throws IOException if remote request fails
-   */
-  public void uploadPackFile(String gitRemoteUrl, String currentCommitHash, Path packFile)
-      throws IOException {
-    PushedSha pushedSha = new PushedSha(new Commit(currentCommitHash), new Meta(gitRemoteUrl));
-    String pushedShaJson = pushedShaAdapter.toJson(pushedSha);
-    RequestBody pushedShaBody = RequestBody.create(JSON, pushedShaJson);
-
-    byte[] packFileContents = Files.readAllBytes(packFile);
-    RequestBody packFileBody = RequestBody.create(OCTET_STREAM, packFileContents);
-
-    String packFileName = packFile.getFileName().toString();
-    String packFileNameWithoutRandomPrefix = packFileName.substring(packFileName.indexOf('-') + 1);
-
-    RequestBody requestBody =
-        new MultipartBody.Builder()
-            .setType(MultipartBody.FORM)
-            .addFormDataPart("pushedSha", "pushedSha.json", pushedShaBody)
-            .addFormDataPart("packfile", packFileNameWithoutRandomPrefix, packFileBody)
-            .build();
-
-    OkHttpUtils.CustomListener telemetryListener =
-        new TelemetryListener.Builder(metricCollector)
-            .requestCount(CiVisibilityCountMetric.GIT_REQUESTS_OBJECTS_PACK)
-            .requestErrors(CiVisibilityCountMetric.GIT_REQUESTS_OBJECTS_PACK_ERRORS)
-            .requestDuration(CiVisibilityDistributionMetric.GIT_REQUESTS_OBJECTS_PACK_MS)
-            .requestBytes(CiVisibilityDistributionMetric.GIT_REQUESTS_OBJECTS_PACK_BYTES)
-            .build();
-
-    String response =
-        backendApi.post(
-            UPLOAD_PACKFILES_URI, requestBody, IOUtils::readFully, telemetryListener, false);
-    LOGGER.debug("Uploading pack file {} returned response {}", packFile, response);
-  }
-
-  private static final class SearchCommitsRequest {
-    final List<Commit> data;
-    final Meta meta;
-
-    private SearchCommitsRequest(List<Commit> data, Meta meta) {
-      this.data = data;
-      this.meta = meta;
+    private static final Logger LOGGER = LoggerFactory.getLogger(GitDataApi.class);
+
+    private static final MediaType JSON = MediaType.get("application/json");
+    private static final MediaType OCTET_STREAM = MediaType.get("application/octet-stream");
+    private static final String SEARCH_COMMITS_URI = "git/repository/search_commits";
+    private static final String UPLOAD_PACKFILES_URI = "git/repository/packfile";
+
+    private final BackendApi backendApi;
+    private final CiVisibilityMetricCollector metricCollector;
+    private final JsonAdapter<SearchCommitsRequest> searchCommitsRequestAdapter;
+    private final JsonAdapter<SearchCommitsResponse> searchCommitsResponseAdapter;
+    private final JsonAdapter<PushedSha> pushedShaAdapter;
+
+    public GitDataApi(BackendApi backendApi, CiVisibilityMetricCollector metricCollector) {
+        this.backendApi = backendApi;
+        this.metricCollector = metricCollector;
+
+        Moshi moshi = new Moshi.Builder().build();
+        searchCommitsRequestAdapter = moshi.adapter(SearchCommitsRequest.class);
+        searchCommitsResponseAdapter = moshi.adapter(SearchCommitsResponse.class);
+        pushedShaAdapter = moshi.adapter(PushedSha.class);
     }
-  }
 
-  private static final class SearchCommitsResponse {
-    final List<Commit> data;
+    /**
+     * Searches the list of commits that exist in Git DB on the server side
+     *
+     * @param gitRemoteUrl Git remote URL
+     * @param commitHashes List of commit SHAs that should be checked
+     * @return SHAs of commits that already exist on the server
+     * @throws IOException if remote request fails
+     */
+    public Collection<String> searchCommits(String gitRemoteUrl, List<String> commitHashes) throws IOException {
+        List<Commit> commits = commitHashes.stream().map(Commit::new).collect(Collectors.toList());
+        SearchCommitsRequest searchCommitsRequest = new SearchCommitsRequest(commits, new Meta(gitRemoteUrl));
+
+        String json = searchCommitsRequestAdapter.toJson(searchCommitsRequest);
+        RequestBody requestBody = RequestBody.create(JSON, json);
+
+        OkHttpUtils.CustomListener telemetryListener = new TelemetryListener.Builder(metricCollector)
+                .requestCount(CiVisibilityCountMetric.GIT_REQUESTS_SEARCH_COMMITS)
+                .requestErrors(CiVisibilityCountMetric.GIT_REQUESTS_SEARCH_COMMITS_ERRORS)
+                .requestDuration(CiVisibilityDistributionMetric.GIT_REQUESTS_SEARCH_COMMITS_MS)
+                .build();
+
+        SearchCommitsResponse response = backendApi.post(
+                SEARCH_COMMITS_URI,
+                requestBody,
+                is -> searchCommitsResponseAdapter.fromJson(Okio.buffer(Okio.source(is))),
+                telemetryListener,
+                false);
+
+        return response.data.stream().map(Commit::getId).collect(Collectors.toSet());
+    }
+
+    /**
+     * Uploads a Git pack file to Git DB on the server side
+     *
+     * @param gitRemoteUrl Git remote URL
+     * @param currentCommitHash SHA of commit with which the pack file is associated
+     * @param packFile Path to the fila that is being uploaded
+     * @throws IOException if remote request fails
+     */
+    public void uploadPackFile(String gitRemoteUrl, String currentCommitHash, Path packFile) throws IOException {
+        PushedSha pushedSha = new PushedSha(new Commit(currentCommitHash), new Meta(gitRemoteUrl));
+        String pushedShaJson = pushedShaAdapter.toJson(pushedSha);
+        RequestBody pushedShaBody = RequestBody.create(JSON, pushedShaJson);
+
+        byte[] packFileContents = Files.readAllBytes(packFile);
+        RequestBody packFileBody = RequestBody.create(OCTET_STREAM, packFileContents);
+
+        String packFileName = packFile.getFileName().toString();
+        String packFileNameWithoutRandomPrefix = packFileName.substring(packFileName.indexOf('-') + 1);
+
+        RequestBody requestBody = new MultipartBody.Builder()
+                .setType(MultipartBody.FORM)
+                .addFormDataPart("pushedSha", "pushedSha.json", pushedShaBody)
+                .addFormDataPart("packfile", packFileNameWithoutRandomPrefix, packFileBody)
+                .build();
+
+        OkHttpUtils.CustomListener telemetryListener = new TelemetryListener.Builder(metricCollector)
+                .requestCount(CiVisibilityCountMetric.GIT_REQUESTS_OBJECTS_PACK)
+                .requestErrors(CiVisibilityCountMetric.GIT_REQUESTS_OBJECTS_PACK_ERRORS)
+                .requestDuration(CiVisibilityDistributionMetric.GIT_REQUESTS_OBJECTS_PACK_MS)
+                .requestBytes(CiVisibilityDistributionMetric.GIT_REQUESTS_OBJECTS_PACK_BYTES)
+                .build();
+
+        String response =
+                backendApi.post(UPLOAD_PACKFILES_URI, requestBody, IOUtils::readFully, telemetryListener, false);
+        LOGGER.debug("Uploading pack file {} returned response {}", packFile, response);
+    }
 
-    private SearchCommitsResponse(List<Commit> data) {
-      this.data = data;
+    private static final class SearchCommitsRequest {
+        final List<Commit> data;
+        final Meta meta;
+
+        private SearchCommitsRequest(List<Commit> data, Meta meta) {
+            this.data = data;
+            this.meta = meta;
+        }
     }
-  }
 
-  private static final class PushedSha {
-    final Commit data;
-    final Meta meta;
+    private static final class SearchCommitsResponse {
+        final List<Commit> data;
 
-    private PushedSha(Commit data, Meta meta) {
-      this.data = data;
-      this.meta = meta;
+        private SearchCommitsResponse(List<Commit> data) {
+            this.data = data;
+        }
     }
-  }
 
-  private static final class Meta {
-    @Json(name = "repository_url")
-    final String repositoryUrl;
+    private static final class PushedSha {
+        final Commit data;
+        final Meta meta;
 
-    private Meta(String repositoryUrl) {
-      this.repositoryUrl = repositoryUrl;
+        private PushedSha(Commit data, Meta meta) {
+            this.data = data;
+            this.meta = meta;
+        }
     }
-  }
 
-  private static final class Commit {
-    final String id;
-    final String type = "commit";
+    private static final class Meta {
+        @Json(name = "repository_url")
+        final String repositoryUrl;
 
-    Commit(String id) {
-      this.id = id;
+        private Meta(String repositoryUrl) {
+            this.repositoryUrl = repositoryUrl;
+        }
     }
 
-    public String getId() {
-      return id;
+    private static final class Commit {
+        final String id;
+        final String type = "commit";
+
+        Commit(String id) {
+            this.id = id;
+        }
+
+        public String getId() {
+            return id;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploader.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploader.java
index d71c8d4eb0f..0572667a298 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploader.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploader.java
@@ -3,12 +3,12 @@
 import java.util.concurrent.Future;
 
 public interface GitDataUploader {
-  /**
-   * Starts asynchronous upload of Git data of current local Git repo to server. If the upload is
-   * already in progress, nothing happens.
-   *
-   * @return a {@code Future} instance that can be used to wait for and monitor the status of the
-   *     upload
-   */
-  Future<Void> startOrObserveGitDataUpload();
+    /**
+     * Starts asynchronous upload of Git data of current local Git repo to server. If the upload is
+     * already in progress, nothing happens.
+     *
+     * @return a {@code Future} instance that can be used to wait for and monitor the status of the
+     *     upload
+     */
+    Future<Void> startOrObserveGitDataUpload();
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploaderImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploaderImpl.java
index 5cbc46a51c9..9e2c8face86 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploaderImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploaderImpl.java
@@ -23,171 +23,159 @@
 
 public class GitDataUploaderImpl implements GitDataUploader {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(GitDataUploaderImpl.class);
-
-  private final Config config;
-  private final CiVisibilityMetricCollector metricCollector;
-  private final GitDataApi gitDataApi;
-  private final GitClient gitClient;
-  private final GitRepoUnshallow gitRepoUnshallow;
-  private final GitInfoProvider gitInfoProvider;
-  private final String repoRoot;
-  private final String remoteName;
-  private final Thread uploadFinishedShutdownHook;
-  private volatile CompletableFuture<Void> callback;
-
-  public GitDataUploaderImpl(
-      Config config,
-      CiVisibilityMetricCollector metricCollector,
-      GitDataApi gitDataApi,
-      GitClient gitClient,
-      GitRepoUnshallow gitRepoUnshallow,
-      GitInfoProvider gitInfoProvider,
-      String repoRoot,
-      String remoteName) {
-    this.config = config;
-    this.metricCollector = metricCollector;
-    this.gitDataApi = gitDataApi;
-    this.gitClient = gitClient;
-    this.gitRepoUnshallow = gitRepoUnshallow;
-    this.gitInfoProvider = gitInfoProvider;
-    this.repoRoot = repoRoot;
-    this.remoteName = remoteName;
-
-    // maven has a way of calling System.exit() when the build is done.
-    // this is a hack to make it wait until git data upload has finished
-    uploadFinishedShutdownHook =
-        AgentThreadFactory.newAgentThread(
-            AgentThreadFactory.AgentThread.CI_GIT_DATA_SHUTDOWN_HOOK,
-            this::waitForUploadToFinish,
-            false);
-  }
-
-  /**
-   * Starts Git data upload, if not started yet. Returns a {@code Future} that can be used to wait
-   * for and check the status of the upload.
-   */
-  @Override
-  public Future<Void> startOrObserveGitDataUpload() {
-    if (callback == null) {
-      synchronized (this) {
+    private static final Logger LOGGER = LoggerFactory.getLogger(GitDataUploaderImpl.class);
+
+    private final Config config;
+    private final CiVisibilityMetricCollector metricCollector;
+    private final GitDataApi gitDataApi;
+    private final GitClient gitClient;
+    private final GitRepoUnshallow gitRepoUnshallow;
+    private final GitInfoProvider gitInfoProvider;
+    private final String repoRoot;
+    private final String remoteName;
+    private final Thread uploadFinishedShutdownHook;
+    private volatile CompletableFuture<Void> callback;
+
+    public GitDataUploaderImpl(
+            Config config,
+            CiVisibilityMetricCollector metricCollector,
+            GitDataApi gitDataApi,
+            GitClient gitClient,
+            GitRepoUnshallow gitRepoUnshallow,
+            GitInfoProvider gitInfoProvider,
+            String repoRoot,
+            String remoteName) {
+        this.config = config;
+        this.metricCollector = metricCollector;
+        this.gitDataApi = gitDataApi;
+        this.gitClient = gitClient;
+        this.gitRepoUnshallow = gitRepoUnshallow;
+        this.gitInfoProvider = gitInfoProvider;
+        this.repoRoot = repoRoot;
+        this.remoteName = remoteName;
+
+        // maven has a way of calling System.exit() when the build is done.
+        // this is a hack to make it wait until git data upload has finished
+        uploadFinishedShutdownHook = AgentThreadFactory.newAgentThread(
+                AgentThreadFactory.AgentThread.CI_GIT_DATA_SHUTDOWN_HOOK, this::waitForUploadToFinish, false);
+    }
+
+    /**
+     * Starts Git data upload, if not started yet. Returns a {@code Future} that can be used to wait
+     * for and check the status of the upload.
+     */
+    @Override
+    public Future<Void> startOrObserveGitDataUpload() {
         if (callback == null) {
+            synchronized (this) {
+                if (callback == null) {
 
-          callback = new CompletableFuture<>();
-          Runtime.getRuntime().addShutdownHook(uploadFinishedShutdownHook);
+                    callback = new CompletableFuture<>();
+                    Runtime.getRuntime().addShutdownHook(uploadFinishedShutdownHook);
 
-          Thread gitDataUploadThread =
-              AgentThreadFactory.newAgentThread(
-                  AgentThreadFactory.AgentThread.CI_GIT_DATA_UPLOADER, this::uploadGitData, false);
-          gitDataUploadThread.start();
+                    Thread gitDataUploadThread = AgentThreadFactory.newAgentThread(
+                            AgentThreadFactory.AgentThread.CI_GIT_DATA_UPLOADER, this::uploadGitData, false);
+                    gitDataUploadThread.start();
+                }
+            }
         }
-      }
+        return callback;
     }
-    return callback;
-  }
-
-  private void uploadGitData() {
-    try {
-      LOGGER.debug("Starting git data upload, {}", gitClient);
-
-      if (!config.isCiVisibilityGitUnshallowDefer()) {
-        gitRepoUnshallow.unshallow();
-      }
-
-      GitInfo gitInfo = gitInfoProvider.getGitInfo(repoRoot);
-      String remoteUrl = gitInfo.getRepositoryURL();
-      List<String> latestCommits = gitClient.getLatestCommits();
-      if (latestCommits.isEmpty()) {
-        LOGGER.debug("No commits in the last month, skipping git data upload");
-        callback.complete(null);
-        return;
-      }
-
-      Collection<String> commitsToSkip = gitDataApi.searchCommits(remoteUrl, latestCommits);
-      if (commitsToSkip.size() == latestCommits.size()) {
-        LOGGER.debug(
-            "Backend already knows of the {} local commits, skipping git data upload",
-            latestCommits.size());
-        callback.complete(null);
-        return;
-      }
-
-      if (config.isCiVisibilityGitUnshallowDefer() && gitRepoUnshallow.unshallow()) {
-        latestCommits = gitClient.getLatestCommits();
-        commitsToSkip = gitDataApi.searchCommits(remoteUrl, latestCommits);
-      }
-
-      Collection<String> commitsToInclude =
-          new ArrayList<>(latestCommits.size() - commitsToSkip.size());
-      for (String commit : latestCommits) {
-        if (!commitsToSkip.contains(commit)) {
-          commitsToInclude.add(commit);
-        }
-      }
-
-      List<String> objectHashes = gitClient.getObjects(commitsToSkip, commitsToInclude);
-      if (objectHashes.isEmpty()) {
-        LOGGER.debug("No git objects to upload");
-        callback.complete(null);
-        return;
-      }
-
-      String currentCommit = latestCommits.get(0);
-
-      Path packFilesDirectory = gitClient.createPackFiles(objectHashes);
-      try {
-        List<Path> packFiles =
-            Files.list(packFilesDirectory)
-                .filter(
-                    pf -> pf.getFileName().toString().endsWith(".pack")) // skipping ".idx" files
-                .collect(Collectors.toList());
-
-        metricCollector.add(
-            CiVisibilityDistributionMetric.GIT_REQUESTS_OBJECTS_PACK_FILES, packFiles.size());
-
-        for (Path packFile : packFiles) {
-          try {
-            gitDataApi.uploadPackFile(remoteUrl, currentCommit, packFile);
-          } catch (Exception e) {
-            throw new RuntimeException("Could not upload pack file " + packFile, e);
-          }
-        }
 
-      } finally {
-        FileUtils.delete(packFilesDirectory);
-      }
-
-      LOGGER.debug("Git data upload finished");
-      callback.complete(null);
-
-    } catch (Exception e) {
-      LOGGER.error(
-          LogCollector.EXCLUDE_TELEMETRY,
-          "Failed to upload git tree data for remote {}",
-          remoteName,
-          e);
-      callback.completeExceptionally(e);
-    } finally {
-      removeShutdownHook();
+    private void uploadGitData() {
+        try {
+            LOGGER.debug("Starting git data upload, {}", gitClient);
+
+            if (!config.isCiVisibilityGitUnshallowDefer()) {
+                gitRepoUnshallow.unshallow();
+            }
+
+            GitInfo gitInfo = gitInfoProvider.getGitInfo(repoRoot);
+            String remoteUrl = gitInfo.getRepositoryURL();
+            List<String> latestCommits = gitClient.getLatestCommits();
+            if (latestCommits.isEmpty()) {
+                LOGGER.debug("No commits in the last month, skipping git data upload");
+                callback.complete(null);
+                return;
+            }
+
+            Collection<String> commitsToSkip = gitDataApi.searchCommits(remoteUrl, latestCommits);
+            if (commitsToSkip.size() == latestCommits.size()) {
+                LOGGER.debug(
+                        "Backend already knows of the {} local commits, skipping git data upload",
+                        latestCommits.size());
+                callback.complete(null);
+                return;
+            }
+
+            if (config.isCiVisibilityGitUnshallowDefer() && gitRepoUnshallow.unshallow()) {
+                latestCommits = gitClient.getLatestCommits();
+                commitsToSkip = gitDataApi.searchCommits(remoteUrl, latestCommits);
+            }
+
+            Collection<String> commitsToInclude = new ArrayList<>(latestCommits.size() - commitsToSkip.size());
+            for (String commit : latestCommits) {
+                if (!commitsToSkip.contains(commit)) {
+                    commitsToInclude.add(commit);
+                }
+            }
+
+            List<String> objectHashes = gitClient.getObjects(commitsToSkip, commitsToInclude);
+            if (objectHashes.isEmpty()) {
+                LOGGER.debug("No git objects to upload");
+                callback.complete(null);
+                return;
+            }
+
+            String currentCommit = latestCommits.get(0);
+
+            Path packFilesDirectory = gitClient.createPackFiles(objectHashes);
+            try {
+                List<Path> packFiles = Files.list(packFilesDirectory)
+                        .filter(pf -> pf.getFileName().toString().endsWith(".pack")) // skipping ".idx" files
+                        .collect(Collectors.toList());
+
+                metricCollector.add(CiVisibilityDistributionMetric.GIT_REQUESTS_OBJECTS_PACK_FILES, packFiles.size());
+
+                for (Path packFile : packFiles) {
+                    try {
+                        gitDataApi.uploadPackFile(remoteUrl, currentCommit, packFile);
+                    } catch (Exception e) {
+                        throw new RuntimeException("Could not upload pack file " + packFile, e);
+                    }
+                }
+
+            } finally {
+                FileUtils.delete(packFilesDirectory);
+            }
+
+            LOGGER.debug("Git data upload finished");
+            callback.complete(null);
+
+        } catch (Exception e) {
+            LOGGER.error(LogCollector.EXCLUDE_TELEMETRY, "Failed to upload git tree data for remote {}", remoteName, e);
+            callback.completeExceptionally(e);
+        } finally {
+            removeShutdownHook();
+        }
     }
-  }
 
-  private void removeShutdownHook() {
-    try {
-      Runtime.getRuntime().removeShutdownHook(uploadFinishedShutdownHook);
-    } catch (IllegalStateException e) {
-      // JVM is being shutdown
+    private void removeShutdownHook() {
+        try {
+            Runtime.getRuntime().removeShutdownHook(uploadFinishedShutdownHook);
+        } catch (IllegalStateException e) {
+            // JVM is being shutdown
+        }
     }
-  }
-
-  private void waitForUploadToFinish() {
-    try {
-      long uploadTimeoutMillis = config.getCiVisibilityGitUploadTimeoutMillis();
-      callback.get(uploadTimeoutMillis, TimeUnit.MILLISECONDS);
-    } catch (TimeoutException e) {
-      LOGGER.warn("Timeout while waiting for Git data upload to finish", e);
-    } catch (Exception e) {
-      LOGGER.error("Error while waiting for Git data upload to finish", e);
+
+    private void waitForUploadToFinish() {
+        try {
+            long uploadTimeoutMillis = config.getCiVisibilityGitUploadTimeoutMillis();
+            callback.get(uploadTimeoutMillis, TimeUnit.MILLISECONDS);
+        } catch (TimeoutException e) {
+            LOGGER.warn("Timeout while waiting for Git data upload to finish", e);
+        } catch (Exception e) {
+            LOGGER.error("Error while waiting for Git data upload to finish", e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDiffParser.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDiffParser.java
index e1f8aefdb73..47f44048ac5 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDiffParser.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDiffParser.java
@@ -15,50 +15,48 @@
 
 public class GitDiffParser {
 
-  private static final Pattern CHANGED_FILE_PATTERN =
-      Pattern.compile("^diff --git (?<oldfilename>.+) (?<newfilename>.+)$");
-  private static final Pattern CHANGED_LINES_PATTERN =
-      Pattern.compile("^@@ -\\d+(,\\d+)? \\+(?<startline>\\d+)(,(?<count>\\d+))? @@");
-
-  public static @Nonnull LineDiff parse(InputStream input) throws IOException {
-    Map<String, BitSet> linesByRelativePath = new HashMap<>();
-
-    BufferedReader bufferedReader =
-        new BufferedReader(new InputStreamReader(input, Charset.defaultCharset()));
-    String changedFile = null;
-    BitSet changedLines = null;
-
-    String line;
-    while ((line = bufferedReader.readLine()) != null) {
-      Matcher changedFileMatcher = CHANGED_FILE_PATTERN.matcher(line);
-      if (changedFileMatcher.matches()) {
-        if (changedFile != null) {
-          linesByRelativePath.put(changedFile, changedLines);
+    private static final Pattern CHANGED_FILE_PATTERN =
+            Pattern.compile("^diff --git (?<oldfilename>.+) (?<newfilename>.+)$");
+    private static final Pattern CHANGED_LINES_PATTERN =
+            Pattern.compile("^@@ -\\d+(,\\d+)? \\+(?<startline>\\d+)(,(?<count>\\d+))? @@");
+
+    public static @Nonnull LineDiff parse(InputStream input) throws IOException {
+        Map<String, BitSet> linesByRelativePath = new HashMap<>();
+
+        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input, Charset.defaultCharset()));
+        String changedFile = null;
+        BitSet changedLines = null;
+
+        String line;
+        while ((line = bufferedReader.readLine()) != null) {
+            Matcher changedFileMatcher = CHANGED_FILE_PATTERN.matcher(line);
+            if (changedFileMatcher.matches()) {
+                if (changedFile != null) {
+                    linesByRelativePath.put(changedFile, changedLines);
+                }
+                changedFile = changedFileMatcher.group("newfilename");
+                changedLines = new BitSet();
+
+            } else {
+                Matcher changedLinesMatcher = CHANGED_LINES_PATTERN.matcher(line);
+                while (changedLinesMatcher.find()) {
+                    int startLine = Integer.parseInt(changedLinesMatcher.group("startline"));
+                    String stringCount = changedLinesMatcher.group("count");
+                    int count = stringCount != null ? Integer.parseInt(stringCount) : 1;
+                    if (changedLines == null) {
+                        throw new IllegalStateException("Line "
+                                + line
+                                + " contains changed lines information, but no changed file info is available");
+                    }
+                    changedLines.set(startLine, startLine + count);
+                }
+            }
         }
-        changedFile = changedFileMatcher.group("newfilename");
-        changedLines = new BitSet();
 
-      } else {
-        Matcher changedLinesMatcher = CHANGED_LINES_PATTERN.matcher(line);
-        while (changedLinesMatcher.find()) {
-          int startLine = Integer.parseInt(changedLinesMatcher.group("startline"));
-          String stringCount = changedLinesMatcher.group("count");
-          int count = stringCount != null ? Integer.parseInt(stringCount) : 1;
-          if (changedLines == null) {
-            throw new IllegalStateException(
-                "Line "
-                    + line
-                    + " contains changed lines information, but no changed file info is available");
-          }
-          changedLines.set(startLine, startLine + count);
+        if (changedFile != null) {
+            linesByRelativePath.put(changedFile, changedLines);
         }
-      }
-    }
 
-    if (changedFile != null) {
-      linesByRelativePath.put(changedFile, changedLines);
+        return new LineDiff(linesByRelativePath);
     }
-
-    return new LineDiff(linesByRelativePath);
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitRepoUnshallow.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitRepoUnshallow.java
index 489e2a4d377..5073625a788 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitRepoUnshallow.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitRepoUnshallow.java
@@ -9,41 +9,40 @@
 
 public class GitRepoUnshallow {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(GitRepoUnshallow.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(GitRepoUnshallow.class);
 
-  private final Config config;
-  private final GitClient gitClient;
+    private final Config config;
+    private final GitClient gitClient;
 
-  public GitRepoUnshallow(Config config, GitClient gitClient) {
-    this.config = config;
-    this.gitClient = gitClient;
-  }
-
-  public synchronized boolean unshallow()
-      throws IOException, InterruptedException, TimeoutException {
-    if (!config.isCiVisibilityGitUnshallowEnabled() || !gitClient.isShallow()) {
-      return false;
-    }
-
-    long unshallowStart = System.currentTimeMillis();
-    try {
-      gitClient.unshallow(GitClient.HEAD);
-    } catch (ShellCommandExecutor.ShellCommandFailedException e) {
-      LOGGER.debug(
-          "Could not unshallow using HEAD - assuming HEAD points to a local commit that does not exist in the remote repo",
-          e);
+    public GitRepoUnshallow(Config config, GitClient gitClient) {
+        this.config = config;
+        this.gitClient = gitClient;
     }
 
-    try {
-      String upstreamBranch = gitClient.getUpstreamBranchSha();
-      gitClient.unshallow(upstreamBranch);
-    } catch (ShellCommandExecutor.ShellCommandFailedException e) {
-      LOGGER.debug(
-          "Could not unshallow using upstream branch - assuming currently checked out local branch does not track any remote branch",
-          e);
-      gitClient.unshallow(null);
+    public synchronized boolean unshallow() throws IOException, InterruptedException, TimeoutException {
+        if (!config.isCiVisibilityGitUnshallowEnabled() || !gitClient.isShallow()) {
+            return false;
+        }
+
+        long unshallowStart = System.currentTimeMillis();
+        try {
+            gitClient.unshallow(GitClient.HEAD);
+        } catch (ShellCommandExecutor.ShellCommandFailedException e) {
+            LOGGER.debug(
+                    "Could not unshallow using HEAD - assuming HEAD points to a local commit that does not exist in the remote repo",
+                    e);
+        }
+
+        try {
+            String upstreamBranch = gitClient.getUpstreamBranchSha();
+            gitClient.unshallow(upstreamBranch);
+        } catch (ShellCommandExecutor.ShellCommandFailedException e) {
+            LOGGER.debug(
+                    "Could not unshallow using upstream branch - assuming currently checked out local branch does not track any remote branch",
+                    e);
+            gitClient.unshallow(null);
+        }
+        LOGGER.debug("Repository unshallowing took {} ms", System.currentTimeMillis() - unshallowStart);
+        return true;
     }
-    LOGGER.debug("Repository unshallowing took {} ms", System.currentTimeMillis() - unshallowStart);
-    return true;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/NoOpGitClient.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/NoOpGitClient.java
index 0a77fb72163..a9458244fb6 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/NoOpGitClient.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/NoOpGitClient.java
@@ -11,101 +11,100 @@
 
 public class NoOpGitClient implements GitClient {
 
-  public static final GitClient INSTANCE = new NoOpGitClient();
-
-  private NoOpGitClient() {}
-
-  @Override
-  public boolean isShallow() {
-    return false;
-  }
-
-  @Override
-  public void unshallow(@Nullable String remoteCommitReference) {
-    // no op
-  }
-
-  @Nullable
-  @Override
-  public String getGitFolder() {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getRepoRoot() {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getRemoteUrl(String remoteName) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getUpstreamBranchSha() {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getCurrentBranch() {
-    return null;
-  }
-
-  @Nonnull
-  @Override
-  public List<String> getTags(String commit) {
-    return Collections.emptyList();
-  }
-
-  @Nullable
-  @Override
-  public String getSha(String reference) {
-    return null;
-  }
-
-  @Nonnull
-  @Override
-  public CommitInfo getCommitInfo(String commit, boolean fetchIfNotPresent) {
-    return CommitInfo.NOOP;
-  }
-
-  @Nonnull
-  @Override
-  public List<String> getLatestCommits() {
-    return Collections.emptyList();
-  }
-
-  @Nonnull
-  @Override
-  public List<String> getObjects(
-      Collection<String> commitsToSkip, Collection<String> commitsToInclude) {
-    return Collections.emptyList();
-  }
-
-  @Override
-  public Path createPackFiles(List<String> objectHashes) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getBaseCommitSha(@Nullable String baseBranch, @Nullable String defaultBranch) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getMergeBase(@Nullable String base, @Nullable String source) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public LineDiff getGitDiff(String baseCommit, String targetCommit) {
-    return null;
-  }
+    public static final GitClient INSTANCE = new NoOpGitClient();
+
+    private NoOpGitClient() {}
+
+    @Override
+    public boolean isShallow() {
+        return false;
+    }
+
+    @Override
+    public void unshallow(@Nullable String remoteCommitReference) {
+        // no op
+    }
+
+    @Nullable
+    @Override
+    public String getGitFolder() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getRepoRoot() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getRemoteUrl(String remoteName) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getUpstreamBranchSha() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getCurrentBranch() {
+        return null;
+    }
+
+    @Nonnull
+    @Override
+    public List<String> getTags(String commit) {
+        return Collections.emptyList();
+    }
+
+    @Nullable
+    @Override
+    public String getSha(String reference) {
+        return null;
+    }
+
+    @Nonnull
+    @Override
+    public CommitInfo getCommitInfo(String commit, boolean fetchIfNotPresent) {
+        return CommitInfo.NOOP;
+    }
+
+    @Nonnull
+    @Override
+    public List<String> getLatestCommits() {
+        return Collections.emptyList();
+    }
+
+    @Nonnull
+    @Override
+    public List<String> getObjects(Collection<String> commitsToSkip, Collection<String> commitsToInclude) {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public Path createPackFiles(List<String> objectHashes) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getBaseCommitSha(@Nullable String baseBranch, @Nullable String defaultBranch) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getMergeBase(@Nullable String base, @Nullable String source) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public LineDiff getGitDiff(String baseCommit, String targetCommit) {
+        return null;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/ShellGitClient.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/ShellGitClient.java
index 8f63a088b28..3ffdf8c844e 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/ShellGitClient.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/ShellGitClient.java
@@ -36,983 +36,902 @@
 
 public class ShellGitClient implements GitClient {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ShellGitClient.class);
-
-  private static final String DD_TEMP_DIRECTORY_PREFIX = "dd-ci-vis-";
-  private static final List<String> POSSIBLE_BASE_BRANCHES =
-      Arrays.asList("main", "master", "preprod", "prod", "dev", "development", "trunk");
-  private static final List<String> POSSIBLE_BASE_BRANCH_PREFIXES =
-      Arrays.asList("release/", "hotfix/");
-  private static final Pattern WHITESPACE_PATTERN = Pattern.compile("\\s+");
-  private static final String ORIGIN = "origin";
-  private static final Pattern COMMIT_INFO_SPLIT = Pattern.compile("\",\"");
-
-  private final CiVisibilityMetricCollector metricCollector;
-  private final String repoRoot;
-  private final String latestCommitsSince;
-  private final int latestCommitsLimit;
-  private final ShellCommandExecutor commandExecutor;
-  private final String safeDirectoryOption;
-
-  /**
-   * Creates a new git client
-   *
-   * @param metricCollector Telemetry metrics collector
-   * @param repoRoot Absolute path to Git repository root
-   * @param latestCommitsSince How far into the past the client should be looking when fetching Git
-   *     data, e.g. {@code "1 month ago"} or {@code "2 years ago"}
-   * @param latestCommitsLimit Maximum client of commits that the client should be considering when
-   *     fetching commit data
-   * @param timeoutMillis Timeout in milliseconds that is applied to executed Git commands
-   */
-  ShellGitClient(
-      CiVisibilityMetricCollector metricCollector,
-      @Nonnull String repoRoot,
-      String latestCommitsSince,
-      int latestCommitsLimit,
-      long timeoutMillis) {
-    this.metricCollector = metricCollector;
-    this.latestCommitsSince = latestCommitsSince;
-    this.latestCommitsLimit = latestCommitsLimit;
-
-    this.repoRoot = findGitRepositoryRoot(new File(repoRoot));
-    this.safeDirectoryOption = "safe.directory=" + this.repoRoot;
-    commandExecutor = new ShellCommandExecutor(new File(this.repoRoot), timeoutMillis);
-  }
-
-  /**
-   * Finds the Git repository root by traversing upward from the given directory looking for a .git
-   * directory or file (for worktrees).
-   *
-   * @param startDir The directory to start searching from
-   * @return The absolute path to the repository root, or the original path if no .git is found
-   */
-  static String findGitRepositoryRoot(File startDir) {
-    File current = startDir.getAbsoluteFile();
-    LOGGER.debug("Finding git repository root for {}", current.getPath());
-    while (current != null) {
-      File gitDir = new File(current, ".git");
-      if (gitDir.exists()) {
-        String repoRootFound = current.getPath();
-        LOGGER.debug("Git repository root found as {}", repoRootFound);
-        return repoRootFound;
-      }
-      current = current.getParentFile();
-    }
-    LOGGER.debug("No .git found for repository root, defaulting to original starting directory");
-    return startDir.getAbsolutePath();
-  }
-
-  /**
-   * Builds a git command with the {@code safe.directory} option.
-   *
-   * @param gitArgs The git command arguments (everything after "git")
-   * @return The complete command array including "git", "-c", "safe.directory=...", and the args
-   */
-  private String[] buildGitCommand(String... gitArgs) {
-    String[] command = new String[gitArgs.length + 3];
-    command[0] = "git";
-    command[1] = "-c";
-    command[2] = safeDirectoryOption;
-    System.arraycopy(gitArgs, 0, command, 3, gitArgs.length);
-    return command;
-  }
-
-  /**
-   * Checks whether the repo that the client is associated with is shallow
-   *
-   * @return {@code true} if current repo is shallow, {@code false} otherwise
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for Git command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for Git command to
-   *     finish
-   */
-  @Override
-  public boolean isShallow() throws IOException, TimeoutException, InterruptedException {
-    return executeCommand(
-        Command.CHECK_SHALLOW,
-        () -> {
-          String output =
-              commandExecutor
-                  .executeCommand(
-                      IOUtils::readFully, buildGitCommand("rev-parse", "--is-shallow-repository"))
-                  .trim();
-          return Boolean.parseBoolean(output);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ShellGitClient.class);
+
+    private static final String DD_TEMP_DIRECTORY_PREFIX = "dd-ci-vis-";
+    private static final List<String> POSSIBLE_BASE_BRANCHES =
+            Arrays.asList("main", "master", "preprod", "prod", "dev", "development", "trunk");
+    private static final List<String> POSSIBLE_BASE_BRANCH_PREFIXES = Arrays.asList("release/", "hotfix/");
+    private static final Pattern WHITESPACE_PATTERN = Pattern.compile("\\s+");
+    private static final String ORIGIN = "origin";
+    private static final Pattern COMMIT_INFO_SPLIT = Pattern.compile("\",\"");
+
+    private final CiVisibilityMetricCollector metricCollector;
+    private final String repoRoot;
+    private final String latestCommitsSince;
+    private final int latestCommitsLimit;
+    private final ShellCommandExecutor commandExecutor;
+    private final String safeDirectoryOption;
+
+    /**
+     * Creates a new git client
+     *
+     * @param metricCollector Telemetry metrics collector
+     * @param repoRoot Absolute path to Git repository root
+     * @param latestCommitsSince How far into the past the client should be looking when fetching Git
+     *     data, e.g. {@code "1 month ago"} or {@code "2 years ago"}
+     * @param latestCommitsLimit Maximum client of commits that the client should be considering when
+     *     fetching commit data
+     * @param timeoutMillis Timeout in milliseconds that is applied to executed Git commands
+     */
+    ShellGitClient(
+            CiVisibilityMetricCollector metricCollector,
+            @Nonnull String repoRoot,
+            String latestCommitsSince,
+            int latestCommitsLimit,
+            long timeoutMillis) {
+        this.metricCollector = metricCollector;
+        this.latestCommitsSince = latestCommitsSince;
+        this.latestCommitsLimit = latestCommitsLimit;
+
+        this.repoRoot = findGitRepositoryRoot(new File(repoRoot));
+        this.safeDirectoryOption = "safe.directory=" + this.repoRoot;
+        commandExecutor = new ShellCommandExecutor(new File(this.repoRoot), timeoutMillis);
+    }
+
+    /**
+     * Finds the Git repository root by traversing upward from the given directory looking for a .git
+     * directory or file (for worktrees).
+     *
+     * @param startDir The directory to start searching from
+     * @return The absolute path to the repository root, or the original path if no .git is found
+     */
+    static String findGitRepositoryRoot(File startDir) {
+        File current = startDir.getAbsoluteFile();
+        LOGGER.debug("Finding git repository root for {}", current.getPath());
+        while (current != null) {
+            File gitDir = new File(current, ".git");
+            if (gitDir.exists()) {
+                String repoRootFound = current.getPath();
+                LOGGER.debug("Git repository root found as {}", repoRootFound);
+                return repoRootFound;
+            }
+            current = current.getParentFile();
+        }
+        LOGGER.debug("No .git found for repository root, defaulting to original starting directory");
+        return startDir.getAbsolutePath();
+    }
+
+    /**
+     * Builds a git command with the {@code safe.directory} option.
+     *
+     * @param gitArgs The git command arguments (everything after "git")
+     * @return The complete command array including "git", "-c", "safe.directory=...", and the args
+     */
+    private String[] buildGitCommand(String... gitArgs) {
+        String[] command = new String[gitArgs.length + 3];
+        command[0] = "git";
+        command[1] = "-c";
+        command[2] = safeDirectoryOption;
+        System.arraycopy(gitArgs, 0, command, 3, gitArgs.length);
+        return command;
+    }
+
+    /**
+     * Checks whether the repo that the client is associated with is shallow
+     *
+     * @return {@code true} if current repo is shallow, {@code false} otherwise
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for Git command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for Git command to
+     *     finish
+     */
+    @Override
+    public boolean isShallow() throws IOException, TimeoutException, InterruptedException {
+        return executeCommand(Command.CHECK_SHALLOW, () -> {
+            String output = commandExecutor
+                    .executeCommand(IOUtils::readFully, buildGitCommand("rev-parse", "--is-shallow-repository"))
+                    .trim();
+            return Boolean.parseBoolean(output);
         });
-  }
-
-  /**
-   * Returns the SHA of the head commit of the upstream (remote tracking) branch for the currently
-   * checked-out local branch. If the local branch is not tracking any remote branches, a {@link
-   * datadog.trace.civisibility.utils.ShellCommandExecutor.ShellCommandFailedException} exception
-   * will be thrown.
-   *
-   * @return The name of the upstream branch if the current local branch is tracking any.
-   * @throws ShellCommandExecutor.ShellCommandFailedException If the Git command fails with an error
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for Git command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for Git command to
-   *     finish
-   */
-  @Nullable
-  @Override
-  public String getUpstreamBranchSha() throws IOException, TimeoutException, InterruptedException {
-    return executeCommand(
-        Command.OTHER,
-        () ->
-            commandExecutor
-                .executeCommand(IOUtils::readFully, buildGitCommand("rev-parse", "@{upstream}"))
-                .trim());
-  }
-
-  /**
-   * "Unshallows" the repo that the client is associated with by fetching missing commit data from
-   * the server.
-   *
-   * @param remoteCommitReference The commit to fetch from the remote repository, so local repo will
-   *     be updated with this commit and its ancestors. If {@code null}, everything will be fetched.
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for Git command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for Git command to
-   *     finish
-   */
-  @Override
-  public void unshallow(@Nullable String remoteCommitReference)
-      throws IOException, TimeoutException, InterruptedException {
-    executeCommand(
-        Command.UNSHALLOW,
-        () -> {
-          String remote = getRemoteName();
-
-          // refetch data from the server for the given period of time
-          if (remoteCommitReference != null && GitUtils.isValidRef(remoteCommitReference)) {
-            String commitSha = getSha(remoteCommitReference);
-            commandExecutor.executeCommand(
-                ShellCommandExecutor.OutputParser.IGNORE,
-                buildGitCommand(
-                    "fetch",
-                    "--update-shallow",
-                    "--filter=blob:none",
-                    "--recurse-submodules=no",
-                    String.format("--shallow-since='%s'", latestCommitsSince),
-                    remote,
-                    commitSha));
-          } else {
-            commandExecutor.executeCommand(
-                ShellCommandExecutor.OutputParser.IGNORE,
-                buildGitCommand(
-                    "fetch",
-                    "--update-shallow",
-                    "--filter=blob:none",
-                    "--recurse-submodules=no",
-                    String.format("--shallow-since='%s'", latestCommitsSince),
-                    remote));
-          }
-
-          return (Void) null;
+    }
+
+    /**
+     * Returns the SHA of the head commit of the upstream (remote tracking) branch for the currently
+     * checked-out local branch. If the local branch is not tracking any remote branches, a {@link
+     * datadog.trace.civisibility.utils.ShellCommandExecutor.ShellCommandFailedException} exception
+     * will be thrown.
+     *
+     * @return The name of the upstream branch if the current local branch is tracking any.
+     * @throws ShellCommandExecutor.ShellCommandFailedException If the Git command fails with an error
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for Git command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for Git command to
+     *     finish
+     */
+    @Nullable
+    @Override
+    public String getUpstreamBranchSha() throws IOException, TimeoutException, InterruptedException {
+        return executeCommand(
+                Command.OTHER,
+                () -> commandExecutor
+                        .executeCommand(IOUtils::readFully, buildGitCommand("rev-parse", "@{upstream}"))
+                        .trim());
+    }
+
+    /**
+     * "Unshallows" the repo that the client is associated with by fetching missing commit data from
+     * the server.
+     *
+     * @param remoteCommitReference The commit to fetch from the remote repository, so local repo will
+     *     be updated with this commit and its ancestors. If {@code null}, everything will be fetched.
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for Git command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for Git command to
+     *     finish
+     */
+    @Override
+    public void unshallow(@Nullable String remoteCommitReference)
+            throws IOException, TimeoutException, InterruptedException {
+        executeCommand(Command.UNSHALLOW, () -> {
+            String remote = getRemoteName();
+
+            // refetch data from the server for the given period of time
+            if (remoteCommitReference != null && GitUtils.isValidRef(remoteCommitReference)) {
+                String commitSha = getSha(remoteCommitReference);
+                commandExecutor.executeCommand(
+                        ShellCommandExecutor.OutputParser.IGNORE,
+                        buildGitCommand(
+                                "fetch",
+                                "--update-shallow",
+                                "--filter=blob:none",
+                                "--recurse-submodules=no",
+                                String.format("--shallow-since='%s'", latestCommitsSince),
+                                remote,
+                                commitSha));
+            } else {
+                commandExecutor.executeCommand(
+                        ShellCommandExecutor.OutputParser.IGNORE,
+                        buildGitCommand(
+                                "fetch",
+                                "--update-shallow",
+                                "--filter=blob:none",
+                                "--recurse-submodules=no",
+                                String.format("--shallow-since='%s'", latestCommitsSince),
+                                remote));
+            }
+
+            return (Void) null;
         });
-  }
-
-  /**
-   * Returns the absolute path of the .git directory.
-   *
-   * @return absolute path
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for Git command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for Git command to
-   *     finish
-   */
-  @Nullable
-  @Override
-  public String getGitFolder() throws IOException, TimeoutException, InterruptedException {
-    return executeCommand(
-        Command.OTHER,
-        () ->
-            commandExecutor
-                .executeCommand(
-                    IOUtils::readFully, buildGitCommand("rev-parse", "--absolute-git-dir"))
-                .trim());
-  }
-
-  /**
-   * Returns the absolute path to Git repository
-   *
-   * @return absolute path
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for Git command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for Git command to
-   *     finish
-   */
-  @Nullable
-  @Override
-  public String getRepoRoot() throws IOException, TimeoutException, InterruptedException {
-    return executeCommand(
-        Command.OTHER,
-        () ->
-            commandExecutor
-                .executeCommand(IOUtils::readFully, buildGitCommand("rev-parse", "--show-toplevel"))
-                .trim());
-  }
-
-  /**
-   * Returns URL of the remote with the given name
-   *
-   * @param remoteName Name of the remote
-   * @return URL of the given remote
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for Git command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for Git command to
-   *     finish
-   */
-  @Nullable
-  @Override
-  public String getRemoteUrl(String remoteName)
-      throws IOException, TimeoutException, InterruptedException {
-    if (!GitUtils.isValidRef(remoteName)) {
-      return null;
-    }
-    return executeCommand(
-        Command.GET_REPOSITORY,
-        () ->
-            commandExecutor
-                .executeCommand(
-                    IOUtils::readFully,
-                    buildGitCommand("config", "--get", "remote." + remoteName + ".url"))
-                .trim());
-  }
-
-  /**
-   * Returns current branch, or an empty string if HEAD is not pointing to a branch
-   *
-   * @return current branch, or an empty string if HEAD is not pointing to a branch
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for Git command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for Git command to
-   *     finish
-   */
-  @Nullable
-  @Override
-  public String getCurrentBranch() throws IOException, TimeoutException, InterruptedException {
-    return executeCommand(
-        Command.GET_BRANCH,
-        () ->
-            commandExecutor
-                .executeCommand(IOUtils::readFully, buildGitCommand("branch", "--show-current"))
-                .trim());
-  }
-
-  /**
-   * Returns list of tags that provided commit points to
-   *
-   * @param commit Commit SHA or reference (HEAD, branch name, etc) to check
-   * @return list of tags that the commit is pointing to, or empty list if there are no such tags
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for Git command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for Git command to
-   *     finish
-   */
-  @Nonnull
-  @Override
-  public List<String> getTags(String commit)
-      throws IOException, TimeoutException, InterruptedException {
-    if (GitUtils.isNotValidCommit(commit)) {
-      return Collections.emptyList();
-    }
-    return executeCommand(
-        Command.OTHER,
-        () -> {
-          try {
-            return commandExecutor.executeCommand(
-                IOUtils::readLines, buildGitCommand("describe", "--tags", "--exact-match", commit));
-          } catch (ShellCommandExecutor.ShellCommandFailedException e) {
-            // if provided commit is not tagged,
-            // command will fail because "--exact-match" is specified
+    }
+
+    /**
+     * Returns the absolute path of the .git directory.
+     *
+     * @return absolute path
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for Git command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for Git command to
+     *     finish
+     */
+    @Nullable
+    @Override
+    public String getGitFolder() throws IOException, TimeoutException, InterruptedException {
+        return executeCommand(
+                Command.OTHER,
+                () -> commandExecutor
+                        .executeCommand(IOUtils::readFully, buildGitCommand("rev-parse", "--absolute-git-dir"))
+                        .trim());
+    }
+
+    /**
+     * Returns the absolute path to Git repository
+     *
+     * @return absolute path
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for Git command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for Git command to
+     *     finish
+     */
+    @Nullable
+    @Override
+    public String getRepoRoot() throws IOException, TimeoutException, InterruptedException {
+        return executeCommand(
+                Command.OTHER,
+                () -> commandExecutor
+                        .executeCommand(IOUtils::readFully, buildGitCommand("rev-parse", "--show-toplevel"))
+                        .trim());
+    }
+
+    /**
+     * Returns URL of the remote with the given name
+     *
+     * @param remoteName Name of the remote
+     * @return URL of the given remote
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for Git command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for Git command to
+     *     finish
+     */
+    @Nullable
+    @Override
+    public String getRemoteUrl(String remoteName) throws IOException, TimeoutException, InterruptedException {
+        if (!GitUtils.isValidRef(remoteName)) {
+            return null;
+        }
+        return executeCommand(
+                Command.GET_REPOSITORY,
+                () -> commandExecutor
+                        .executeCommand(
+                                IOUtils::readFully, buildGitCommand("config", "--get", "remote." + remoteName + ".url"))
+                        .trim());
+    }
+
+    /**
+     * Returns current branch, or an empty string if HEAD is not pointing to a branch
+     *
+     * @return current branch, or an empty string if HEAD is not pointing to a branch
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for Git command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for Git command to
+     *     finish
+     */
+    @Nullable
+    @Override
+    public String getCurrentBranch() throws IOException, TimeoutException, InterruptedException {
+        return executeCommand(
+                Command.GET_BRANCH,
+                () -> commandExecutor
+                        .executeCommand(IOUtils::readFully, buildGitCommand("branch", "--show-current"))
+                        .trim());
+    }
+
+    /**
+     * Returns list of tags that provided commit points to
+     *
+     * @param commit Commit SHA or reference (HEAD, branch name, etc) to check
+     * @return list of tags that the commit is pointing to, or empty list if there are no such tags
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for Git command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for Git command to
+     *     finish
+     */
+    @Nonnull
+    @Override
+    public List<String> getTags(String commit) throws IOException, TimeoutException, InterruptedException {
+        if (GitUtils.isNotValidCommit(commit)) {
             return Collections.emptyList();
-          }
+        }
+        return executeCommand(Command.OTHER, () -> {
+            try {
+                return commandExecutor.executeCommand(
+                        IOUtils::readLines, buildGitCommand("describe", "--tags", "--exact-match", commit));
+            } catch (ShellCommandExecutor.ShellCommandFailedException e) {
+                // if provided commit is not tagged,
+                // command will fail because "--exact-match" is specified
+                return Collections.emptyList();
+            }
         });
-  }
-
-  /**
-   * Returns SHA of the provided reference
-   *
-   * @param reference Reference (HEAD, branch name, etc) to check
-   * @return full SHA of the provided reference
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for Git command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for Git command to
-   *     finish
-   */
-  @Nullable
-  @Override
-  public String getSha(String reference)
-      throws IOException, TimeoutException, InterruptedException {
-    if (GitUtils.isNotValidCommit(reference)) {
-      return null;
-    }
-    return executeCommand(
-        Command.OTHER,
-        () ->
-            commandExecutor
-                .executeCommand(IOUtils::readFully, buildGitCommand("rev-parse", reference))
-                .trim());
-  }
-
-  /** Checks whether the provided reference object is present or not. */
-  private boolean isCommitPresent(String commitReference)
-      throws IOException, TimeoutException, InterruptedException {
-    if (GitUtils.isNotValidCommit(commitReference)) {
-      return false;
-    }
-    return executeCommand(
-        Command.OTHER,
-        () -> {
-          try {
-            commandExecutor.executeCommand(
-                ShellCommandExecutor.OutputParser.IGNORE,
-                buildGitCommand("cat-file", "-e", commitReference + "^{commit}"));
-            return true;
-          } catch (ShellCommandExecutor.ShellCommandFailedException ignored) {
+    }
+
+    /**
+     * Returns SHA of the provided reference
+     *
+     * @param reference Reference (HEAD, branch name, etc) to check
+     * @return full SHA of the provided reference
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for Git command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for Git command to
+     *     finish
+     */
+    @Nullable
+    @Override
+    public String getSha(String reference) throws IOException, TimeoutException, InterruptedException {
+        if (GitUtils.isNotValidCommit(reference)) {
+            return null;
+        }
+        return executeCommand(
+                Command.OTHER,
+                () -> commandExecutor
+                        .executeCommand(IOUtils::readFully, buildGitCommand("rev-parse", reference))
+                        .trim());
+    }
+
+    /** Checks whether the provided reference object is present or not. */
+    private boolean isCommitPresent(String commitReference) throws IOException, TimeoutException, InterruptedException {
+        if (GitUtils.isNotValidCommit(commitReference)) {
             return false;
-          }
+        }
+        return executeCommand(Command.OTHER, () -> {
+            try {
+                commandExecutor.executeCommand(
+                        ShellCommandExecutor.OutputParser.IGNORE,
+                        buildGitCommand("cat-file", "-e", commitReference + "^{commit}"));
+                return true;
+            } catch (ShellCommandExecutor.ShellCommandFailedException ignored) {
+                return false;
+            }
         });
-  }
-
-  /** Fetches provided commit object from the server. */
-  private void fetchCommit(String remoteCommitReference)
-      throws IOException, TimeoutException, InterruptedException {
-    if (GitUtils.isNotValidCommit(remoteCommitReference)) {
-      return;
-    }
-    executeCommand(
-        Command.FETCH_COMMIT,
-        () -> {
-          String remote = getRemoteName();
-          commandExecutor.executeCommand(
-              ShellCommandExecutor.OutputParser.IGNORE,
-              buildGitCommand(
-                  "fetch",
-                  "--filter=blob:none",
-                  "--recurse-submodules=no",
-                  "--no-write-fetch-head",
-                  remote,
-                  remoteCommitReference));
-
-          return (Void) null;
+    }
+
+    /** Fetches provided commit object from the server. */
+    private void fetchCommit(String remoteCommitReference) throws IOException, TimeoutException, InterruptedException {
+        if (GitUtils.isNotValidCommit(remoteCommitReference)) {
+            return;
+        }
+        executeCommand(Command.FETCH_COMMIT, () -> {
+            String remote = getRemoteName();
+            commandExecutor.executeCommand(
+                    ShellCommandExecutor.OutputParser.IGNORE,
+                    buildGitCommand(
+                            "fetch",
+                            "--filter=blob:none",
+                            "--recurse-submodules=no",
+                            "--no-write-fetch-head",
+                            remote,
+                            remoteCommitReference));
+
+            return (Void) null;
         });
-  }
-
-  /**
-   * Returns commit information for the provided commit
-   *
-   * @param commit Commit SHA or reference (HEAD, branch name, etc) to check
-   * @param fetchIfNotPresent If the commit should be fetched from server if not present locally
-   * @return commit info (sha, author info, committer info, full message)
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for Git command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for Git command to
-   *     finish
-   */
-  @Nonnull
-  @Override
-  public CommitInfo getCommitInfo(String commit, boolean fetchIfNotPresent)
-      throws IOException, InterruptedException, TimeoutException {
-    if (GitUtils.isNotValidCommit(commit)) {
-      return CommitInfo.NOOP;
-    }
-    if (fetchIfNotPresent) {
-      boolean isPresent = isCommitPresent(commit);
-      if (!isPresent) {
-        fetchCommit(commit);
-      }
-    }
-    return executeCommand(
-        Command.OTHER,
-        () -> {
-          String info = "";
-          try {
-            info =
-                commandExecutor
-                    .executeCommand(
-                        IOUtils::readFully,
-                        buildGitCommand(
-                            "show",
-                            commit,
-                            "-s",
-                            "--format=%H\",\"%an\",\"%ae\",\"%aI\",\"%cn\",\"%ce\",\"%cI\",\"%B"))
-                    .trim();
-          } catch (ShellCommandExecutor.ShellCommandFailedException e) {
-            LOGGER.error("Failed to fetch commit info", e);
-            return CommitInfo.NOOP;
-          }
+    }
 
-          String[] fields = COMMIT_INFO_SPLIT.split(info);
-          if (fields.length < 8) {
-            LOGGER.error("Could not parse commit info: {}", info);
+    /**
+     * Returns commit information for the provided commit
+     *
+     * @param commit Commit SHA or reference (HEAD, branch name, etc) to check
+     * @param fetchIfNotPresent If the commit should be fetched from server if not present locally
+     * @return commit info (sha, author info, committer info, full message)
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for Git command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for Git command to
+     *     finish
+     */
+    @Nonnull
+    @Override
+    public CommitInfo getCommitInfo(String commit, boolean fetchIfNotPresent)
+            throws IOException, InterruptedException, TimeoutException {
+        if (GitUtils.isNotValidCommit(commit)) {
             return CommitInfo.NOOP;
-          }
-          return new CommitInfo(
-              fields[0],
-              new PersonInfo(fields[1], fields[2], fields[3]),
-              new PersonInfo(fields[4], fields[5], fields[6]),
-              fields[7]);
+        }
+        if (fetchIfNotPresent) {
+            boolean isPresent = isCommitPresent(commit);
+            if (!isPresent) {
+                fetchCommit(commit);
+            }
+        }
+        return executeCommand(Command.OTHER, () -> {
+            String info = "";
+            try {
+                info = commandExecutor
+                        .executeCommand(
+                                IOUtils::readFully,
+                                buildGitCommand(
+                                        "show",
+                                        commit,
+                                        "-s",
+                                        "--format=%H\",\"%an\",\"%ae\",\"%aI\",\"%cn\",\"%ce\",\"%cI\",\"%B"))
+                        .trim();
+            } catch (ShellCommandExecutor.ShellCommandFailedException e) {
+                LOGGER.error("Failed to fetch commit info", e);
+                return CommitInfo.NOOP;
+            }
+
+            String[] fields = COMMIT_INFO_SPLIT.split(info);
+            if (fields.length < 8) {
+                LOGGER.error("Could not parse commit info: {}", info);
+                return CommitInfo.NOOP;
+            }
+            return new CommitInfo(
+                    fields[0],
+                    new PersonInfo(fields[1], fields[2], fields[3]),
+                    new PersonInfo(fields[4], fields[5], fields[6]),
+                    fields[7]);
         });
-  }
-
-  /**
-   * Returns SHAs of the latest commits in the current branch. Maximum number of commits and how far
-   * into the past to look are configured when the client is created.
-   *
-   * @return SHAs of latest commits
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for Git command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for Git command to
-   *     finish
-   */
-  @Nonnull
-  @Override
-  public List<String> getLatestCommits()
-      throws IOException, TimeoutException, InterruptedException {
-    return executeCommand(
-        Command.GET_LOCAL_COMMITS,
-        () ->
-            commandExecutor.executeCommand(
-                IOUtils::readLines,
-                buildGitCommand(
-                    "log",
-                    "--format=%H",
-                    "-n",
-                    String.valueOf(latestCommitsLimit),
-                    String.format("--since='%s'", latestCommitsSince))));
-  }
-
-  /**
-   * Returns SHAs of all Git objects in the current branch. Lookup is started from HEAD commit.
-   * Maximum number of commits and how far into the past to look are configured when the client is
-   * created.
-   *
-   * @param commitsToSkip List of commits to skip
-   * @return SHAs of relevant Git objects
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for Git command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for Git command to
-   *     finish
-   */
-  @Nonnull
-  @Override
-  public List<String> getObjects(
-      Collection<String> commitsToSkip, Collection<String> commitsToInclude)
-      throws IOException, TimeoutException, InterruptedException {
-    return executeCommand(
-        Command.GET_OBJECTS,
-        () -> {
-          String[] gitArgs = new String[5 + commitsToSkip.size() + commitsToInclude.size()];
-          gitArgs[0] = "rev-list";
-          gitArgs[1] = "--objects";
-          gitArgs[2] = "--no-object-names";
-          gitArgs[3] = "--filter=blob:none";
-          gitArgs[4] = String.format("--since='%s'", latestCommitsSince);
-
-          int count = 5;
-          for (String commitToSkip : commitsToSkip) {
-            gitArgs[count++] = "^" + commitToSkip;
-          }
-          for (String commitToInclude : commitsToInclude) {
-            gitArgs[count++] = commitToInclude;
-          }
-
-          return commandExecutor.executeCommand(IOUtils::readLines, buildGitCommand(gitArgs));
+    }
+
+    /**
+     * Returns SHAs of the latest commits in the current branch. Maximum number of commits and how far
+     * into the past to look are configured when the client is created.
+     *
+     * @return SHAs of latest commits
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for Git command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for Git command to
+     *     finish
+     */
+    @Nonnull
+    @Override
+    public List<String> getLatestCommits() throws IOException, TimeoutException, InterruptedException {
+        return executeCommand(
+                Command.GET_LOCAL_COMMITS,
+                () -> commandExecutor.executeCommand(
+                        IOUtils::readLines,
+                        buildGitCommand(
+                                "log",
+                                "--format=%H",
+                                "-n",
+                                String.valueOf(latestCommitsLimit),
+                                String.format("--since='%s'", latestCommitsSince))));
+    }
+
+    /**
+     * Returns SHAs of all Git objects in the current branch. Lookup is started from HEAD commit.
+     * Maximum number of commits and how far into the past to look are configured when the client is
+     * created.
+     *
+     * @param commitsToSkip List of commits to skip
+     * @return SHAs of relevant Git objects
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for Git command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for Git command to
+     *     finish
+     */
+    @Nonnull
+    @Override
+    public List<String> getObjects(Collection<String> commitsToSkip, Collection<String> commitsToInclude)
+            throws IOException, TimeoutException, InterruptedException {
+        return executeCommand(Command.GET_OBJECTS, () -> {
+            String[] gitArgs = new String[5 + commitsToSkip.size() + commitsToInclude.size()];
+            gitArgs[0] = "rev-list";
+            gitArgs[1] = "--objects";
+            gitArgs[2] = "--no-object-names";
+            gitArgs[3] = "--filter=blob:none";
+            gitArgs[4] = String.format("--since='%s'", latestCommitsSince);
+
+            int count = 5;
+            for (String commitToSkip : commitsToSkip) {
+                gitArgs[count++] = "^" + commitToSkip;
+            }
+            for (String commitToInclude : commitsToInclude) {
+                gitArgs[count++] = commitToInclude;
+            }
+
+            return commandExecutor.executeCommand(IOUtils::readLines, buildGitCommand(gitArgs));
         });
-  }
-
-  /**
-   * Creates Git .pack files that include provided objects. The files are created in a temporary
-   * folder.
-   *
-   * @param objectHashes SHAs of objects that should be included in the pack files
-   * @return Path to temporary folder where created pack files are located
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for Git command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for Git command to
-   *     finish
-   */
-  @Override
-  public Path createPackFiles(List<String> objectHashes)
-      throws IOException, TimeoutException, InterruptedException {
-    return executeCommand(
-        Command.PACK_OBJECTS,
-        () -> {
-          byte[] input = String.join("\n", objectHashes).getBytes(Charset.defaultCharset());
-
-          Path tempDirectory = createTempDirectory();
-          String basename = Strings.random(8);
-          String path = tempDirectory.toString() + File.separator + basename;
-
-          commandExecutor.executeCommand(
-              ShellCommandExecutor.OutputParser.IGNORE,
-              input,
-              buildGitCommand("pack-objects", "--compression=9", "--max-pack-size=3m", path));
-          return tempDirectory;
+    }
+
+    /**
+     * Creates Git .pack files that include provided objects. The files are created in a temporary
+     * folder.
+     *
+     * @param objectHashes SHAs of objects that should be included in the pack files
+     * @return Path to temporary folder where created pack files are located
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for Git command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for Git command to
+     *     finish
+     */
+    @Override
+    public Path createPackFiles(List<String> objectHashes) throws IOException, TimeoutException, InterruptedException {
+        return executeCommand(Command.PACK_OBJECTS, () -> {
+            byte[] input = String.join("\n", objectHashes).getBytes(Charset.defaultCharset());
+
+            Path tempDirectory = createTempDirectory();
+            String basename = Strings.random(8);
+            String path = tempDirectory.toString() + File.separator + basename;
+
+            commandExecutor.executeCommand(
+                    ShellCommandExecutor.OutputParser.IGNORE,
+                    input,
+                    buildGitCommand("pack-objects", "--compression=9", "--max-pack-size=3m", path));
+            return tempDirectory;
         });
-  }
-
-  private Path createTempDirectory() throws IOException {
-    Path repoRootDirectory = Paths.get(repoRoot);
-    FileStore repoRootFileStore = Files.getFileStore(repoRootDirectory);
-
-    Path tempDirectory = Files.createTempDirectory(DD_TEMP_DIRECTORY_PREFIX);
-    FileStore tempDirectoryStore = Files.getFileStore(tempDirectory);
-
-    if (Objects.equals(tempDirectoryStore, repoRootFileStore)) {
-      return tempDirectory;
-    } else {
-      // default temp-file directory and repo root are located on different devices,
-      // so we have to create our temp dir inside repo root
-      // otherwise git command will fail
-      Files.delete(tempDirectory);
-      return Files.createTempDirectory(repoRootDirectory, DD_TEMP_DIRECTORY_PREFIX);
-    }
-  }
-
-  /**
-   * Returns best effort base commit SHA for the most likely base branch in a PR.
-   *
-   * @param baseBranch Base branch name (if available will skip all logic that evaluates branch
-   *     candidates)
-   * @param settingsDefaultBranch Default branch name obtained from the settings endpoint
-   * @return Base branch SHA if found or {@code null} otherwise
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for Git command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for Git command to
-   *     finish
-   */
-  @Nullable
-  @Override
-  public String getBaseCommitSha(
-      @Nullable String baseBranch, @Nullable String settingsDefaultBranch)
-      throws IOException, TimeoutException, InterruptedException {
-    if ((baseBranch != null && !GitUtils.isValidRef(baseBranch))
-        || (settingsDefaultBranch != null && !GitUtils.isValidRef(settingsDefaultBranch))) {
-      return null;
-    }
-    return executeCommand(
-        Command.BASE_COMMIT_SHA,
-        () -> {
-          String sourceBranch = getCurrentBranch();
-          if (Strings.isBlank(sourceBranch)) {
+    }
+
+    private Path createTempDirectory() throws IOException {
+        Path repoRootDirectory = Paths.get(repoRoot);
+        FileStore repoRootFileStore = Files.getFileStore(repoRootDirectory);
+
+        Path tempDirectory = Files.createTempDirectory(DD_TEMP_DIRECTORY_PREFIX);
+        FileStore tempDirectoryStore = Files.getFileStore(tempDirectory);
+
+        if (Objects.equals(tempDirectoryStore, repoRootFileStore)) {
+            return tempDirectory;
+        } else {
+            // default temp-file directory and repo root are located on different devices,
+            // so we have to create our temp dir inside repo root
+            // otherwise git command will fail
+            Files.delete(tempDirectory);
+            return Files.createTempDirectory(repoRootDirectory, DD_TEMP_DIRECTORY_PREFIX);
+        }
+    }
+
+    /**
+     * Returns best effort base commit SHA for the most likely base branch in a PR.
+     *
+     * @param baseBranch Base branch name (if available will skip all logic that evaluates branch
+     *     candidates)
+     * @param settingsDefaultBranch Default branch name obtained from the settings endpoint
+     * @return Base branch SHA if found or {@code null} otherwise
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for Git command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for Git command to
+     *     finish
+     */
+    @Nullable
+    @Override
+    public String getBaseCommitSha(@Nullable String baseBranch, @Nullable String settingsDefaultBranch)
+            throws IOException, TimeoutException, InterruptedException {
+        if ((baseBranch != null && !GitUtils.isValidRef(baseBranch))
+                || (settingsDefaultBranch != null && !GitUtils.isValidRef(settingsDefaultBranch))) {
             return null;
-          }
-          LOGGER.debug("Source branch: {}", sourceBranch);
-
-          String remoteName = getRemoteName();
-          LOGGER.debug("Remote name: {}", remoteName);
-
-          if (baseBranch != null) {
-            tryFetchingIfNotFoundLocally(baseBranch, remoteName);
-            String fullBaseBranchName =
-                remoteName + "/" + removeRemotePrefix(baseBranch, remoteName);
-            return getMergeBase(fullBaseBranchName, sourceBranch);
-          } else {
-            return guessBestBaseBranchSha(sourceBranch, remoteName, settingsDefaultBranch);
-          }
+        }
+        return executeCommand(Command.BASE_COMMIT_SHA, () -> {
+            String sourceBranch = getCurrentBranch();
+            if (Strings.isBlank(sourceBranch)) {
+                return null;
+            }
+            LOGGER.debug("Source branch: {}", sourceBranch);
+
+            String remoteName = getRemoteName();
+            LOGGER.debug("Remote name: {}", remoteName);
+
+            if (baseBranch != null) {
+                tryFetchingIfNotFoundLocally(baseBranch, remoteName);
+                String fullBaseBranchName = remoteName + "/" + removeRemotePrefix(baseBranch, remoteName);
+                return getMergeBase(fullBaseBranchName, sourceBranch);
+            } else {
+                return guessBestBaseBranchSha(sourceBranch, remoteName, settingsDefaultBranch);
+            }
         });
-  }
-
-  String getRemoteName() throws IOException, InterruptedException, TimeoutException {
-    try {
-      String remote =
-          commandExecutor
-              .executeCommand(
-                  IOUtils::readFully,
-                  buildGitCommand(
-                      "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{upstream}"))
-              .trim();
-
-      int slashIdx = remote.indexOf('/');
-      return slashIdx != -1 ? remote.substring(0, slashIdx) : remote;
-    } catch (ShellCommandExecutor.ShellCommandFailedException e) {
-      LOGGER.debug("Error getting remote from upstream, falling back to first remote", e);
-    }
-
-    // fallback to first remote if no upstream
-    try {
-      List<String> remotes =
-          commandExecutor.executeCommand(IOUtils::readLines, buildGitCommand("remote"));
-      return remotes.get(0);
-    } catch (ShellCommandExecutor.ShellCommandFailedException e) {
-      LOGGER.debug("Error getting remotes", e);
-    }
-    return ORIGIN;
-  }
-
-  @Nullable
-  String guessBestBaseBranchSha(
-      String sourceBranch, String remoteName, @Nullable String settingsDefaultBranch)
-      throws IOException, InterruptedException, TimeoutException {
-    for (String branch : POSSIBLE_BASE_BRANCHES) {
-      tryFetchingIfNotFoundLocally(branch, remoteName);
-    }
-    if (settingsDefaultBranch != null) {
-      tryFetchingIfNotFoundLocally(settingsDefaultBranch, remoteName);
-    }
-
-    List<String> candidates = getBaseBranchCandidates(settingsDefaultBranch, remoteName);
-    if (candidates.isEmpty()) {
-      LOGGER.debug("No base branch candidates found");
-      return null;
-    }
-
-    List<BaseBranchMetric> metrics = computeBranchMetrics(candidates, sourceBranch);
-    LOGGER.debug("Metrics found: {}", metrics);
-    if (metrics.isEmpty()) {
-      return null;
-    }
-
-    String defaultBranch =
-        Strings.isNotBlank(settingsDefaultBranch)
-            ? settingsDefaultBranch
-            : detectDefaultBranch(remoteName);
-
-    List<BaseBranchMetric> sortedMetrics =
-        sortBaseBranchCandidates(metrics, defaultBranch, remoteName);
-
-    for (BaseBranchMetric metric : sortedMetrics) {
-      String sha = getMergeBase(metric.branch, sourceBranch);
-      if (Strings.isNotBlank(sha)) {
-        return sha;
-      }
-    }
-
-    return null;
-  }
-
-  void tryFetchingIfNotFoundLocally(String branch, String remoteName)
-      throws IOException, InterruptedException, TimeoutException {
-    String shortBranchName = removeRemotePrefix(branch, remoteName);
-    try {
-      // check if branch exists locally as a remote ref
-      commandExecutor.executeCommand(
-          ShellCommandExecutor.OutputParser.IGNORE,
-          buildGitCommand(
-              "show-ref",
-              "--verify",
-              "--quiet",
-              "refs/remotes/" + remoteName + "/" + shortBranchName));
-      LOGGER.debug("Branch {}/{} exists locally, skipping fetch", remoteName, shortBranchName);
-      return;
-    } catch (ShellCommandExecutor.ShellCommandFailedException e) {
-      LOGGER.debug(
-          "Branch {}/{} does not exist locally, checking remote", remoteName, shortBranchName);
-    }
-
-    // check if branch exists in remote
-    String remoteHeads = null;
-    try {
-      remoteHeads =
-          commandExecutor
-              .executeCommand(
-                  IOUtils::readFully,
-                  buildGitCommand("ls-remote", "--heads", remoteName, shortBranchName))
-              .trim();
-    } catch (ShellCommandExecutor.ShellCommandFailedException ignored) {
-    }
-
-    if (Strings.isBlank(remoteHeads)) {
-      LOGGER.debug("Branch {}/{} does not exist in remote", remoteName, shortBranchName);
-      return;
-    }
-
-    // fetch latest commit for branch from remote
-    LOGGER.debug("Branch {}/{} exists in remote, fetching", remoteName, shortBranchName);
-    try {
-      commandExecutor.executeCommand(
-          ShellCommandExecutor.OutputParser.IGNORE,
-          buildGitCommand("fetch", "--depth", "1", remoteName, shortBranchName));
-    } catch (ShellCommandExecutor.ShellCommandFailedException e) {
-      LOGGER.debug("Branch {}/{} couldn't be fetched from remote", remoteName, shortBranchName, e);
-    }
-  }
-
-  List<String> getBaseBranchCandidates(@Nullable String defaultBranch, String remoteName)
-      throws IOException, InterruptedException, TimeoutException {
-    List<String> candidates = new ArrayList<>();
-    try {
-      // only consider remote branches
-      List<String> branches =
-          commandExecutor.executeCommand(
-              IOUtils::readLines,
-              buildGitCommand(
-                  "for-each-ref", "--format=%(refname:short)", "refs/remotes/" + remoteName));
-      for (String branch : branches) {
-        if (isBaseLikeBranch(branch, remoteName)
-            || branchesEquals(branch, defaultBranch, remoteName)) {
-          candidates.add(branch);
-        }
-      }
-    } catch (ShellCommandExecutor.ShellCommandFailedException e) {
-      LOGGER.debug("Error building candidate branches", e);
-    }
-
-    return candidates;
-  }
-
-  boolean branchesEquals(String branchA, String branchB, @Nonnull String remoteName) {
-    return branchA != null
-        && branchB != null
-        && removeRemotePrefix(branchA, remoteName).equals(removeRemotePrefix(branchB, remoteName));
-  }
-
-  String removeRemotePrefix(@Nonnull String branch, @Nonnull String remoteName) {
-    if (branch.startsWith(remoteName + "/")) {
-      return branch.substring(remoteName.length() + 1);
-    }
-    return branch;
-  }
-
-  boolean isBaseLikeBranch(@Nonnull String branch, @Nonnull String remoteName) {
-    String shortBranchName = removeRemotePrefix(branch, remoteName);
-    if (POSSIBLE_BASE_BRANCHES.contains(shortBranchName)) {
-      return true;
-    }
-
-    for (String prefix : POSSIBLE_BASE_BRANCH_PREFIXES) {
-      if (shortBranchName.startsWith(prefix)) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  @Nullable
-  String detectDefaultBranch(String remoteName)
-      throws IOException, InterruptedException, TimeoutException {
-    try {
-      String defaultRef =
-          commandExecutor
-              .executeCommand(
-                  IOUtils::readFully,
-                  buildGitCommand(
-                      "symbolic-ref", "--quiet", "--short", "refs/remotes/" + remoteName + "/HEAD"))
-              .trim();
-      if (Strings.isNotBlank(defaultRef)) {
-        return removeRemotePrefix(defaultRef, remoteName);
-      }
-    } catch (ShellCommandExecutor.ShellCommandFailedException ignored) {
-    }
-
-    LOGGER.debug("Could not get symbolic-ref for default branch, trying fallback");
-    List<String> fallbackBranches = Arrays.asList("main", "master");
-    for (String branch : fallbackBranches) {
-      try {
-        commandExecutor.executeCommand(
-            ShellCommandExecutor.OutputParser.IGNORE,
-            buildGitCommand(
-                "show-ref", "--verify", "--quiet", "refs/remotes/" + remoteName + "/" + branch));
-        LOGGER.debug("Found fallback default branch: {}", branch);
+    }
+
+    String getRemoteName() throws IOException, InterruptedException, TimeoutException {
+        try {
+            String remote = commandExecutor
+                    .executeCommand(
+                            IOUtils::readFully,
+                            buildGitCommand("rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{upstream}"))
+                    .trim();
+
+            int slashIdx = remote.indexOf('/');
+            return slashIdx != -1 ? remote.substring(0, slashIdx) : remote;
+        } catch (ShellCommandExecutor.ShellCommandFailedException e) {
+            LOGGER.debug("Error getting remote from upstream, falling back to first remote", e);
+        }
+
+        // fallback to first remote if no upstream
+        try {
+            List<String> remotes = commandExecutor.executeCommand(IOUtils::readLines, buildGitCommand("remote"));
+            return remotes.get(0);
+        } catch (ShellCommandExecutor.ShellCommandFailedException e) {
+            LOGGER.debug("Error getting remotes", e);
+        }
+        return ORIGIN;
+    }
+
+    @Nullable
+    String guessBestBaseBranchSha(String sourceBranch, String remoteName, @Nullable String settingsDefaultBranch)
+            throws IOException, InterruptedException, TimeoutException {
+        for (String branch : POSSIBLE_BASE_BRANCHES) {
+            tryFetchingIfNotFoundLocally(branch, remoteName);
+        }
+        if (settingsDefaultBranch != null) {
+            tryFetchingIfNotFoundLocally(settingsDefaultBranch, remoteName);
+        }
+
+        List<String> candidates = getBaseBranchCandidates(settingsDefaultBranch, remoteName);
+        if (candidates.isEmpty()) {
+            LOGGER.debug("No base branch candidates found");
+            return null;
+        }
+
+        List<BaseBranchMetric> metrics = computeBranchMetrics(candidates, sourceBranch);
+        LOGGER.debug("Metrics found: {}", metrics);
+        if (metrics.isEmpty()) {
+            return null;
+        }
+
+        String defaultBranch =
+                Strings.isNotBlank(settingsDefaultBranch) ? settingsDefaultBranch : detectDefaultBranch(remoteName);
+
+        List<BaseBranchMetric> sortedMetrics = sortBaseBranchCandidates(metrics, defaultBranch, remoteName);
+
+        for (BaseBranchMetric metric : sortedMetrics) {
+            String sha = getMergeBase(metric.branch, sourceBranch);
+            if (Strings.isNotBlank(sha)) {
+                return sha;
+            }
+        }
+
+        return null;
+    }
+
+    void tryFetchingIfNotFoundLocally(String branch, String remoteName)
+            throws IOException, InterruptedException, TimeoutException {
+        String shortBranchName = removeRemotePrefix(branch, remoteName);
+        try {
+            // check if branch exists locally as a remote ref
+            commandExecutor.executeCommand(
+                    ShellCommandExecutor.OutputParser.IGNORE,
+                    buildGitCommand(
+                            "show-ref", "--verify", "--quiet", "refs/remotes/" + remoteName + "/" + shortBranchName));
+            LOGGER.debug("Branch {}/{} exists locally, skipping fetch", remoteName, shortBranchName);
+            return;
+        } catch (ShellCommandExecutor.ShellCommandFailedException e) {
+            LOGGER.debug("Branch {}/{} does not exist locally, checking remote", remoteName, shortBranchName);
+        }
+
+        // check if branch exists in remote
+        String remoteHeads = null;
+        try {
+            remoteHeads = commandExecutor
+                    .executeCommand(
+                            IOUtils::readFully, buildGitCommand("ls-remote", "--heads", remoteName, shortBranchName))
+                    .trim();
+        } catch (ShellCommandExecutor.ShellCommandFailedException ignored) {
+        }
+
+        if (Strings.isBlank(remoteHeads)) {
+            LOGGER.debug("Branch {}/{} does not exist in remote", remoteName, shortBranchName);
+            return;
+        }
+
+        // fetch latest commit for branch from remote
+        LOGGER.debug("Branch {}/{} exists in remote, fetching", remoteName, shortBranchName);
+        try {
+            commandExecutor.executeCommand(
+                    ShellCommandExecutor.OutputParser.IGNORE,
+                    buildGitCommand("fetch", "--depth", "1", remoteName, shortBranchName));
+        } catch (ShellCommandExecutor.ShellCommandFailedException e) {
+            LOGGER.debug("Branch {}/{} couldn't be fetched from remote", remoteName, shortBranchName, e);
+        }
+    }
+
+    List<String> getBaseBranchCandidates(@Nullable String defaultBranch, String remoteName)
+            throws IOException, InterruptedException, TimeoutException {
+        List<String> candidates = new ArrayList<>();
+        try {
+            // only consider remote branches
+            List<String> branches = commandExecutor.executeCommand(
+                    IOUtils::readLines,
+                    buildGitCommand("for-each-ref", "--format=%(refname:short)", "refs/remotes/" + remoteName));
+            for (String branch : branches) {
+                if (isBaseLikeBranch(branch, remoteName) || branchesEquals(branch, defaultBranch, remoteName)) {
+                    candidates.add(branch);
+                }
+            }
+        } catch (ShellCommandExecutor.ShellCommandFailedException e) {
+            LOGGER.debug("Error building candidate branches", e);
+        }
+
+        return candidates;
+    }
+
+    boolean branchesEquals(String branchA, String branchB, @Nonnull String remoteName) {
+        return branchA != null
+                && branchB != null
+                && removeRemotePrefix(branchA, remoteName).equals(removeRemotePrefix(branchB, remoteName));
+    }
+
+    String removeRemotePrefix(@Nonnull String branch, @Nonnull String remoteName) {
+        if (branch.startsWith(remoteName + "/")) {
+            return branch.substring(remoteName.length() + 1);
+        }
         return branch;
-      } catch (ShellCommandExecutor.ShellCommandFailedException ignored) {
-      }
     }
 
-    LOGGER.debug("No fallback default branch found");
-    return null;
-  }
+    boolean isBaseLikeBranch(@Nonnull String branch, @Nonnull String remoteName) {
+        String shortBranchName = removeRemotePrefix(branch, remoteName);
+        if (POSSIBLE_BASE_BRANCHES.contains(shortBranchName)) {
+            return true;
+        }
 
-  static class BaseBranchMetric {
-    private final String branch;
-    private final int behind;
-    private final int ahead;
+        for (String prefix : POSSIBLE_BASE_BRANCH_PREFIXES) {
+            if (shortBranchName.startsWith(prefix)) {
+                return true;
+            }
+        }
 
-    BaseBranchMetric(String branch, int behind, int ahead) {
-      this.branch = branch;
-      this.behind = behind;
-      this.ahead = ahead;
+        return false;
     }
 
-    @Override
-    public boolean equals(Object o) {
-      if (!(o instanceof BaseBranchMetric)) return false;
-      BaseBranchMetric that = (BaseBranchMetric) o;
-      return behind == that.behind && ahead == that.ahead && Objects.equals(branch, that.branch);
+    @Nullable
+    String detectDefaultBranch(String remoteName) throws IOException, InterruptedException, TimeoutException {
+        try {
+            String defaultRef = commandExecutor
+                    .executeCommand(
+                            IOUtils::readFully,
+                            buildGitCommand(
+                                    "symbolic-ref", "--quiet", "--short", "refs/remotes/" + remoteName + "/HEAD"))
+                    .trim();
+            if (Strings.isNotBlank(defaultRef)) {
+                return removeRemotePrefix(defaultRef, remoteName);
+            }
+        } catch (ShellCommandExecutor.ShellCommandFailedException ignored) {
+        }
+
+        LOGGER.debug("Could not get symbolic-ref for default branch, trying fallback");
+        List<String> fallbackBranches = Arrays.asList("main", "master");
+        for (String branch : fallbackBranches) {
+            try {
+                commandExecutor.executeCommand(
+                        ShellCommandExecutor.OutputParser.IGNORE,
+                        buildGitCommand(
+                                "show-ref", "--verify", "--quiet", "refs/remotes/" + remoteName + "/" + branch));
+                LOGGER.debug("Found fallback default branch: {}", branch);
+                return branch;
+            } catch (ShellCommandExecutor.ShellCommandFailedException ignored) {
+            }
+        }
+
+        LOGGER.debug("No fallback default branch found");
+        return null;
     }
 
+    static class BaseBranchMetric {
+        private final String branch;
+        private final int behind;
+        private final int ahead;
+
+        BaseBranchMetric(String branch, int behind, int ahead) {
+            this.branch = branch;
+            this.behind = behind;
+            this.ahead = ahead;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof BaseBranchMetric)) return false;
+            BaseBranchMetric that = (BaseBranchMetric) o;
+            return behind == that.behind && ahead == that.ahead && Objects.equals(branch, that.branch);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(branch, behind, ahead);
+        }
+
+        @Override
+        public String toString() {
+            return "BaseBranchMetric{" + "branch='" + branch + '\'' + ", behind=" + behind + ", ahead=" + ahead + '}';
+        }
+    }
+
+    List<BaseBranchMetric> computeBranchMetrics(List<String> candidates, String sourceBranch)
+            throws IOException, InterruptedException, TimeoutException {
+        List<BaseBranchMetric> branchMetrics = new ArrayList<>();
+
+        for (String candidate : candidates) {
+            try {
+                String countsResult = commandExecutor
+                        .executeCommand(
+                                IOUtils::readFully,
+                                buildGitCommand(
+                                        "rev-list", "--left-right", "--count", candidate + "..." + sourceBranch))
+                        .trim();
+
+                String[] counts = WHITESPACE_PATTERN.split(countsResult);
+                int behind = Integer.parseInt(counts[0]);
+                int ahead = Integer.parseInt(counts[1]);
+                if (behind == 0 && ahead == 0) {
+                    LOGGER.debug("Branch {} is up to date", candidate);
+                } else {
+                    branchMetrics.add(new BaseBranchMetric(candidate, behind, ahead));
+                }
+            } catch (ShellCommandExecutor.ShellCommandFailedException ignored) {
+                LOGGER.debug("Could not get metrics for candidate {}", candidate);
+            }
+        }
+
+        return branchMetrics;
+    }
+
+    boolean isDefaultBranch(String branch, @Nullable String defaultBranch, String remoteName) {
+        return defaultBranch != null && branchesEquals(branch, defaultBranch, remoteName);
+    }
+
+    List<BaseBranchMetric> sortBaseBranchCandidates(
+            List<BaseBranchMetric> metrics, String defaultBranch, String remoteName) {
+        Comparator<BaseBranchMetric> comparator = Comparator.comparingInt((BaseBranchMetric b) -> b.ahead)
+                .thenComparing(b -> !isDefaultBranch(b.branch, defaultBranch, remoteName));
+
+        return metrics.stream().sorted(comparator).collect(Collectors.toList());
+    }
+
+    /**
+     * Returns the merge base between two commits or references
+     *
+     * @param base Base commit SHA or reference (HEAD, branch name, etc)
+     * @param source Source commit SHA or reference (HEAD, branch name, etc)
+     * @return Merge base between the two references
+     */
+    public String getMergeBase(@Nullable String base, @Nullable String source)
+            throws IOException, InterruptedException, TimeoutException {
+        if (GitUtils.isNotValidCommit(base) || GitUtils.isNotValidCommit(source)) {
+            return null;
+        }
+        try {
+            return commandExecutor
+                    .executeCommand(IOUtils::readFully, buildGitCommand("merge-base", base, source))
+                    .trim();
+        } catch (ShellCommandExecutor.ShellCommandFailedException e) {
+            LOGGER.debug("Error calculating common ancestor for {} and {}", base, source, e);
+        }
+        return null;
+    }
+
+    /**
+     * Returns Git diff between two commits.
+     *
+     * @param baseCommit Commit SHA or reference (HEAD, branch name, etc) of the base commit
+     * @param targetCommit Commit SHA or reference (HEAD, branch name, etc) of the target commit
+     * @return Diff between two commits
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for Git command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for Git command to
+     *     finish
+     */
+    @Nullable
     @Override
-    public int hashCode() {
-      return Objects.hash(branch, behind, ahead);
+    public LineDiff getGitDiff(String baseCommit, String targetCommit)
+            throws IOException, TimeoutException, InterruptedException {
+        if (Strings.isBlank(baseCommit) || !GitUtils.isValidCommitSha(baseCommit)) {
+            LOGGER.debug("Base commit info is not available, returning empty git diff");
+            return null;
+        } else if (Strings.isNotBlank(targetCommit) && GitUtils.isValidCommitSha(targetCommit)) {
+            return executeCommand(
+                    Command.DIFF,
+                    () -> commandExecutor.executeCommand(
+                            GitDiffParser::parse,
+                            buildGitCommand(
+                                    "diff", "-U0", "--word-diff=porcelain", "--no-prefix", baseCommit, targetCommit)));
+        } else {
+            return executeCommand(
+                    Command.DIFF,
+                    () -> commandExecutor.executeCommand(
+                            GitDiffParser::parse,
+                            buildGitCommand("diff", "-U0", "--word-diff=porcelain", "--no-prefix", baseCommit)));
+        }
     }
 
     @Override
     public String toString() {
-      return "BaseBranchMetric{"
-          + "branch='"
-          + branch
-          + '\''
-          + ", behind="
-          + behind
-          + ", ahead="
-          + ahead
-          + '}';
-    }
-  }
-
-  List<BaseBranchMetric> computeBranchMetrics(List<String> candidates, String sourceBranch)
-      throws IOException, InterruptedException, TimeoutException {
-    List<BaseBranchMetric> branchMetrics = new ArrayList<>();
-
-    for (String candidate : candidates) {
-      try {
-        String countsResult =
-            commandExecutor
-                .executeCommand(
-                    IOUtils::readFully,
-                    buildGitCommand(
-                        "rev-list", "--left-right", "--count", candidate + "..." + sourceBranch))
-                .trim();
-
-        String[] counts = WHITESPACE_PATTERN.split(countsResult);
-        int behind = Integer.parseInt(counts[0]);
-        int ahead = Integer.parseInt(counts[1]);
-        if (behind == 0 && ahead == 0) {
-          LOGGER.debug("Branch {} is up to date", candidate);
-        } else {
-          branchMetrics.add(new BaseBranchMetric(candidate, behind, ahead));
-        }
-      } catch (ShellCommandExecutor.ShellCommandFailedException ignored) {
-        LOGGER.debug("Could not get metrics for candidate {}", candidate);
-      }
-    }
-
-    return branchMetrics;
-  }
-
-  boolean isDefaultBranch(String branch, @Nullable String defaultBranch, String remoteName) {
-    return defaultBranch != null && branchesEquals(branch, defaultBranch, remoteName);
-  }
-
-  List<BaseBranchMetric> sortBaseBranchCandidates(
-      List<BaseBranchMetric> metrics, String defaultBranch, String remoteName) {
-    Comparator<BaseBranchMetric> comparator =
-        Comparator.comparingInt((BaseBranchMetric b) -> b.ahead)
-            .thenComparing(b -> !isDefaultBranch(b.branch, defaultBranch, remoteName));
-
-    return metrics.stream().sorted(comparator).collect(Collectors.toList());
-  }
-
-  /**
-   * Returns the merge base between two commits or references
-   *
-   * @param base Base commit SHA or reference (HEAD, branch name, etc)
-   * @param source Source commit SHA or reference (HEAD, branch name, etc)
-   * @return Merge base between the two references
-   */
-  public String getMergeBase(@Nullable String base, @Nullable String source)
-      throws IOException, InterruptedException, TimeoutException {
-    if (GitUtils.isNotValidCommit(base) || GitUtils.isNotValidCommit(source)) {
-      return null;
-    }
-    try {
-      return commandExecutor
-          .executeCommand(IOUtils::readFully, buildGitCommand("merge-base", base, source))
-          .trim();
-    } catch (ShellCommandExecutor.ShellCommandFailedException e) {
-      LOGGER.debug("Error calculating common ancestor for {} and {}", base, source, e);
-    }
-    return null;
-  }
-
-  /**
-   * Returns Git diff between two commits.
-   *
-   * @param baseCommit Commit SHA or reference (HEAD, branch name, etc) of the base commit
-   * @param targetCommit Commit SHA or reference (HEAD, branch name, etc) of the target commit
-   * @return Diff between two commits
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for Git command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for Git command to
-   *     finish
-   */
-  @Nullable
-  @Override
-  public LineDiff getGitDiff(String baseCommit, String targetCommit)
-      throws IOException, TimeoutException, InterruptedException {
-    if (Strings.isBlank(baseCommit) || !GitUtils.isValidCommitSha(baseCommit)) {
-      LOGGER.debug("Base commit info is not available, returning empty git diff");
-      return null;
-    } else if (Strings.isNotBlank(targetCommit) && GitUtils.isValidCommitSha(targetCommit)) {
-      return executeCommand(
-          Command.DIFF,
-          () ->
-              commandExecutor.executeCommand(
-                  GitDiffParser::parse,
-                  buildGitCommand(
-                      "diff",
-                      "-U0",
-                      "--word-diff=porcelain",
-                      "--no-prefix",
-                      baseCommit,
-                      targetCommit)));
-    } else {
-      return executeCommand(
-          Command.DIFF,
-          () ->
-              commandExecutor.executeCommand(
-                  GitDiffParser::parse,
-                  buildGitCommand(
-                      "diff", "-U0", "--word-diff=porcelain", "--no-prefix", baseCommit)));
-    }
-  }
-
-  @Override
-  public String toString() {
-    return "GitClient{" + repoRoot + "}";
-  }
-
-  private interface GitCommand<T> {
-    T execute() throws IOException, TimeoutException, InterruptedException;
-  }
-
-  private <T> T executeCommand(Command commandType, GitCommand<T> command)
-      throws IOException, TimeoutException, InterruptedException {
-    long startTime = System.currentTimeMillis();
-    try {
-      return command.execute();
-
-    } catch (IOException | TimeoutException | InterruptedException e) {
-      metricCollector.add(
-          CiVisibilityCountMetric.GIT_COMMAND_ERRORS,
-          1,
-          commandType,
-          ShellCommandExecutor.getExitCode(e));
-      throw e;
-
-    } finally {
-      metricCollector.add(CiVisibilityCountMetric.GIT_COMMAND, 1, commandType);
-      metricCollector.add(
-          CiVisibilityDistributionMetric.GIT_COMMAND_MS,
-          (int) (System.currentTimeMillis() - startTime),
-          commandType);
-    }
-  }
-
-  public static class Factory implements GitClient.Factory {
-    private final Config config;
-    private final CiVisibilityMetricCollector metricCollector;
+        return "GitClient{" + repoRoot + "}";
+    }
 
-    public Factory(Config config, CiVisibilityMetricCollector metricCollector) {
-      this.config = config;
-      this.metricCollector = metricCollector;
+    private interface GitCommand<T> {
+        T execute() throws IOException, TimeoutException, InterruptedException;
     }
 
-    @Override
-    public GitClient create(@Nullable String repoRoot) {
-      long commandTimeoutMillis = config.getCiVisibilityGitCommandTimeoutMillis();
-      if (repoRoot != null && GitUtils.isValidPath(repoRoot)) {
-        return new ShellGitClient(
-            metricCollector, repoRoot, "1 month ago", 1000, commandTimeoutMillis);
-      } else {
-        LOGGER.debug("Could not determine repository root, using no-op git client");
-        return NoOpGitClient.INSTANCE;
-      }
-    }
-  }
+    private <T> T executeCommand(Command commandType, GitCommand<T> command)
+            throws IOException, TimeoutException, InterruptedException {
+        long startTime = System.currentTimeMillis();
+        try {
+            return command.execute();
+
+        } catch (IOException | TimeoutException | InterruptedException e) {
+            metricCollector.add(
+                    CiVisibilityCountMetric.GIT_COMMAND_ERRORS, 1, commandType, ShellCommandExecutor.getExitCode(e));
+            throw e;
+
+        } finally {
+            metricCollector.add(CiVisibilityCountMetric.GIT_COMMAND, 1, commandType);
+            metricCollector.add(
+                    CiVisibilityDistributionMetric.GIT_COMMAND_MS,
+                    (int) (System.currentTimeMillis() - startTime),
+                    commandType);
+        }
+    }
+
+    public static class Factory implements GitClient.Factory {
+        private final Config config;
+        private final CiVisibilityMetricCollector metricCollector;
+
+        public Factory(Config config, CiVisibilityMetricCollector metricCollector) {
+            this.config = config;
+            this.metricCollector = metricCollector;
+        }
+
+        @Override
+        public GitClient create(@Nullable String repoRoot) {
+            long commandTimeoutMillis = config.getCiVisibilityGitCommandTimeoutMillis();
+            if (repoRoot != null && GitUtils.isValidPath(repoRoot)) {
+                return new ShellGitClient(metricCollector, repoRoot, "1 month ago", 1000, commandTimeoutMillis);
+            } else {
+                LOGGER.debug("Could not determine repository root, using no-op git client");
+                return NoOpGitClient.INSTANCE;
+            }
+        }
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/AckResponse.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/AckResponse.java
index 556052592ed..b03b3426e44 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/AckResponse.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/AckResponse.java
@@ -4,15 +4,15 @@
 
 public class AckResponse implements SignalResponse {
 
-  public static final SignalResponse INSTANCE = new AckResponse();
+    public static final SignalResponse INSTANCE = new AckResponse();
 
-  @Override
-  public SignalType getType() {
-    return SignalType.ACK;
-  }
+    @Override
+    public SignalType getType() {
+        return SignalType.ACK;
+    }
 
-  @Override
-  public ByteBuffer serialize() {
-    return ByteBuffer.allocate(0);
-  }
+    @Override
+    public ByteBuffer serialize() {
+        return ByteBuffer.allocate(0);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ChannelContext.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ChannelContext.java
index 1cbc2b382af..bacd736a5b4 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ChannelContext.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ChannelContext.java
@@ -9,99 +9,99 @@
 import java.util.function.Function;
 
 class ChannelContext {
-  private final ByteBuffer readBuffer;
-  private final Function<ByteBuffer, ByteBuffer[]> messageProcessor;
-  private final Queue<ByteBuffer> pendingResponses;
+    private final ByteBuffer readBuffer;
+    private final Function<ByteBuffer, ByteBuffer[]> messageProcessor;
+    private final Queue<ByteBuffer> pendingResponses;
 
-  private int currentMessageIdx;
-  private byte[] currentMessage;
+    private int currentMessageIdx;
+    private byte[] currentMessage;
 
-  ChannelContext(int bufferCapacity, Function<ByteBuffer, ByteBuffer[]> messageProcessor) {
-    this.readBuffer = ByteBuffer.allocate(bufferCapacity);
-    this.messageProcessor = messageProcessor;
-    this.pendingResponses = new ArrayDeque<>();
-  }
-
-  void read(ByteChannel channel) throws IOException {
-    int bytesRead;
-    while ((bytesRead = channel.read(readBuffer)) > 0) {
-      readBuffer.flip();
-      processBuffer(channel);
-    }
-    if (bytesRead == -1) {
-      channel.close();
+    ChannelContext(int bufferCapacity, Function<ByteBuffer, ByteBuffer[]> messageProcessor) {
+        this.readBuffer = ByteBuffer.allocate(bufferCapacity);
+        this.messageProcessor = messageProcessor;
+        this.pendingResponses = new ArrayDeque<>();
     }
-  }
 
-  private void processBuffer(ByteChannel channel) throws IOException {
-    while (readBuffer.remaining() > 0) {
-      if (currentMessage == null) {
-        if (readBuffer.remaining() < Integer.BYTES) {
-          break;
-        } else {
-          int length = readBuffer.getInt();
-          currentMessage = new byte[length];
+    void read(ByteChannel channel) throws IOException {
+        int bytesRead;
+        while ((bytesRead = channel.read(readBuffer)) > 0) {
+            readBuffer.flip();
+            processBuffer(channel);
         }
-      }
+        if (bytesRead == -1) {
+            channel.close();
+        }
+    }
 
-      int length = Math.min(readBuffer.remaining(), currentMessage.length - currentMessageIdx);
-      readBuffer.get(currentMessage, currentMessageIdx, length);
+    private void processBuffer(ByteChannel channel) throws IOException {
+        while (readBuffer.remaining() > 0) {
+            if (currentMessage == null) {
+                if (readBuffer.remaining() < Integer.BYTES) {
+                    break;
+                } else {
+                    int length = readBuffer.getInt();
+                    currentMessage = new byte[length];
+                }
+            }
 
-      currentMessageIdx += length;
-      if (currentMessageIdx == currentMessage.length) {
-        // processing messages is intentionally synchronous here:
-        // writeResponse is invoked after message is handled
-        // that way when the client receives ACK from the server
-        // it knows that the server has already acted on the message.
-        // this helps to avoid some race conditions
-        ByteBuffer[] response = messageProcessor.apply(ByteBuffer.wrap(currentMessage));
-        writeResponse(channel, response);
-        currentMessageIdx = 0;
-        currentMessage = null;
-      }
-    }
+            int length = Math.min(readBuffer.remaining(), currentMessage.length - currentMessageIdx);
+            readBuffer.get(currentMessage, currentMessageIdx, length);
 
-    if (readBuffer.remaining() > 0) {
-      readBuffer.compact();
-    } else {
-      readBuffer.flip();
-    }
-  }
+            currentMessageIdx += length;
+            if (currentMessageIdx == currentMessage.length) {
+                // processing messages is intentionally synchronous here:
+                // writeResponse is invoked after message is handled
+                // that way when the client receives ACK from the server
+                // it knows that the server has already acted on the message.
+                // this helps to avoid some race conditions
+                ByteBuffer[] response = messageProcessor.apply(ByteBuffer.wrap(currentMessage));
+                writeResponse(channel, response);
+                currentMessageIdx = 0;
+                currentMessage = null;
+            }
+        }
 
-  private void writeResponse(ByteChannel channel, ByteBuffer[] response) throws IOException {
-    int idx = 0;
-    for (; idx < response.length; idx++) {
-      int remaining = response[idx].remaining();
-      if (channel.write(response[idx]) != remaining) {
-        // could not write all the chunk's bytes,
-        // assuming output buffer is full
-        break;
-      }
+        if (readBuffer.remaining() > 0) {
+            readBuffer.compact();
+        } else {
+            readBuffer.flip();
+        }
     }
 
-    for (; idx < response.length; idx++) {
-      pendingResponses.add(response[idx]);
-    }
-  }
+    private void writeResponse(ByteChannel channel, ByteBuffer[] response) throws IOException {
+        int idx = 0;
+        for (; idx < response.length; idx++) {
+            int remaining = response[idx].remaining();
+            if (channel.write(response[idx]) != remaining) {
+                // could not write all the chunk's bytes,
+                // assuming output buffer is full
+                break;
+            }
+        }
 
-  public void write(WritableByteChannel channel) throws IOException {
-    if (pendingResponses.isEmpty()) {
-      return;
+        for (; idx < response.length; idx++) {
+            pendingResponses.add(response[idx]);
+        }
     }
 
-    while (!pendingResponses.isEmpty()) {
-      ByteBuffer response = pendingResponses.peek();
-      int remaining = response.remaining();
-      if (channel.write(response) != remaining) {
-        // could not write all the chunk's bytes,
-        // assuming output buffer is full
-        return;
-      }
-      pendingResponses.poll();
+    public void write(WritableByteChannel channel) throws IOException {
+        if (pendingResponses.isEmpty()) {
+            return;
+        }
+
+        while (!pendingResponses.isEmpty()) {
+            ByteBuffer response = pendingResponses.peek();
+            int remaining = response.remaining();
+            if (channel.write(response) != remaining) {
+                // could not write all the chunk's bytes,
+                // assuming output buffer is full
+                return;
+            }
+            pendingResponses.poll();
+        }
     }
-  }
 
-  boolean hasPendingResponses() {
-    return !pendingResponses.isEmpty();
-  }
+    boolean hasPendingResponses() {
+        return !pendingResponses.isEmpty();
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ErrorResponse.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ErrorResponse.java
index 73e4af57a8c..6b894406f37 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ErrorResponse.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ErrorResponse.java
@@ -5,30 +5,30 @@
 
 public class ErrorResponse implements SignalResponse {
 
-  private final String message;
-
-  public ErrorResponse(String message) {
-    this.message = message;
-  }
-
-  public String getMessage() {
-    return message;
-  }
-
-  @Override
-  public SignalType getType() {
-    return SignalType.ERROR;
-  }
-
-  @Override
-  public ByteBuffer serialize() {
-    Serializer s = new Serializer();
-    s.write(message);
-    return s.flush();
-  }
-
-  public static ErrorResponse deserialize(ByteBuffer buffer) {
-    String message = Serializer.readString(buffer);
-    return new ErrorResponse(message);
-  }
+    private final String message;
+
+    public ErrorResponse(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    @Override
+    public SignalType getType() {
+        return SignalType.ERROR;
+    }
+
+    @Override
+    public ByteBuffer serialize() {
+        Serializer s = new Serializer();
+        s.write(message);
+        return s.flush();
+    }
+
+    public static ErrorResponse deserialize(ByteBuffer buffer) {
+        String message = Serializer.readString(buffer);
+        return new ErrorResponse(message);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ExecutionSettingsRequest.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ExecutionSettingsRequest.java
index 778e0b8c341..75261fa1627 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ExecutionSettingsRequest.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ExecutionSettingsRequest.java
@@ -7,60 +7,60 @@
 
 public class ExecutionSettingsRequest implements Signal {
 
-  private final String moduleName;
-  private final JvmInfo jvmInfo;
+    private final String moduleName;
+    private final JvmInfo jvmInfo;
 
-  public ExecutionSettingsRequest(String moduleName, JvmInfo jvmInfo) {
-    this.moduleName = moduleName;
-    this.jvmInfo = jvmInfo;
-  }
-
-  @Override
-  public SignalType getType() {
-    return SignalType.EXECUTION_SETTINGS_REQUEST;
-  }
+    public ExecutionSettingsRequest(String moduleName, JvmInfo jvmInfo) {
+        this.moduleName = moduleName;
+        this.jvmInfo = jvmInfo;
+    }
 
-  public String getModuleName() {
-    return moduleName;
-  }
+    @Override
+    public SignalType getType() {
+        return SignalType.EXECUTION_SETTINGS_REQUEST;
+    }
 
-  public JvmInfo getJvmInfo() {
-    return jvmInfo;
-  }
+    public String getModuleName() {
+        return moduleName;
+    }
 
-  @Override
-  public String toString() {
-    return "ExecutionSettingsRequest{" + "moduleName=" + moduleName + ", jvmInfo=" + jvmInfo + '}';
-  }
+    public JvmInfo getJvmInfo() {
+        return jvmInfo;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    @Override
+    public String toString() {
+        return "ExecutionSettingsRequest{" + "moduleName=" + moduleName + ", jvmInfo=" + jvmInfo + '}';
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ExecutionSettingsRequest that = (ExecutionSettingsRequest) o;
+        return Objects.equals(moduleName, that.moduleName) && Objects.equals(jvmInfo, that.jvmInfo);
     }
-    ExecutionSettingsRequest that = (ExecutionSettingsRequest) o;
-    return Objects.equals(moduleName, that.moduleName) && Objects.equals(jvmInfo, that.jvmInfo);
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(moduleName, jvmInfo);
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(moduleName, jvmInfo);
+    }
 
-  @Override
-  public ByteBuffer serialize() {
-    Serializer s = new Serializer();
-    s.write(moduleName);
-    JvmInfo.serialize(s, jvmInfo);
-    return s.flush();
-  }
+    @Override
+    public ByteBuffer serialize() {
+        Serializer s = new Serializer();
+        s.write(moduleName);
+        JvmInfo.serialize(s, jvmInfo);
+        return s.flush();
+    }
 
-  public static ExecutionSettingsRequest deserialize(ByteBuffer buffer) {
-    String moduleName = Serializer.readString(buffer);
-    JvmInfo jvmInfo = JvmInfo.deserialize(buffer);
-    return new ExecutionSettingsRequest(moduleName, jvmInfo);
-  }
+    public static ExecutionSettingsRequest deserialize(ByteBuffer buffer) {
+        String moduleName = Serializer.readString(buffer);
+        JvmInfo jvmInfo = JvmInfo.deserialize(buffer);
+        return new ExecutionSettingsRequest(moduleName, jvmInfo);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ExecutionSettingsResponse.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ExecutionSettingsResponse.java
index 292e9b632fe..cc9eeb9e11d 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ExecutionSettingsResponse.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ExecutionSettingsResponse.java
@@ -6,50 +6,50 @@
 
 public class ExecutionSettingsResponse implements SignalResponse {
 
-  private final ExecutionSettings settings;
-
-  public ExecutionSettingsResponse(ExecutionSettings settings) {
-    this.settings = settings;
-  }
-
-  @Override
-  public SignalType getType() {
-    return SignalType.MODULE_SETTINGS_RESPONSE;
-  }
-
-  public ExecutionSettings getSettings() {
-    return settings;
-  }
-
-  @Override
-  public String toString() {
-    return "ExecutionSettingsResponse{" + "settings=" + settings + '}';
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ExecutionSettingsResponse that = (ExecutionSettingsResponse) o;
-    return Objects.equals(settings, that.settings);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(settings);
-  }
-
-  @Override
-  public ByteBuffer serialize() {
-    return ExecutionSettings.Serializer.serialize(settings);
-  }
-
-  public static ExecutionSettingsResponse deserialize(ByteBuffer buffer) {
-    ExecutionSettings settings = ExecutionSettings.Serializer.deserialize(buffer);
-    return new ExecutionSettingsResponse(settings);
-  }
+    private final ExecutionSettings settings;
+
+    public ExecutionSettingsResponse(ExecutionSettings settings) {
+        this.settings = settings;
+    }
+
+    @Override
+    public SignalType getType() {
+        return SignalType.MODULE_SETTINGS_RESPONSE;
+    }
+
+    public ExecutionSettings getSettings() {
+        return settings;
+    }
+
+    @Override
+    public String toString() {
+        return "ExecutionSettingsResponse{" + "settings=" + settings + '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ExecutionSettingsResponse that = (ExecutionSettingsResponse) o;
+        return Objects.equals(settings, that.settings);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(settings);
+    }
+
+    @Override
+    public ByteBuffer serialize() {
+        return ExecutionSettings.Serializer.serialize(settings);
+    }
+
+    public static ExecutionSettingsResponse deserialize(ByteBuffer buffer) {
+        ExecutionSettings settings = ExecutionSettings.Serializer.deserialize(buffer);
+        return new ExecutionSettingsResponse(settings);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleCoverageDataJacoco.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleCoverageDataJacoco.java
index 5e0da399514..d2959abfc06 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleCoverageDataJacoco.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleCoverageDataJacoco.java
@@ -9,62 +9,62 @@
 
 public class ModuleCoverageDataJacoco extends ModuleSignal {
 
-  @Nonnull private final byte[] coverageData;
+    @Nonnull
+    private final byte[] coverageData;
 
-  public ModuleCoverageDataJacoco(
-      DDTraceId sessionId, long moduleId, @Nonnull byte[] coverageData) {
-    super(sessionId, moduleId);
-    this.coverageData = coverageData;
-  }
-
-  @Nonnull
-  public byte[] getCoverageData() {
-    return coverageData;
-  }
+    public ModuleCoverageDataJacoco(DDTraceId sessionId, long moduleId, @Nonnull byte[] coverageData) {
+        super(sessionId, moduleId);
+        this.coverageData = coverageData;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    @Nonnull
+    public byte[] getCoverageData() {
+        return coverageData;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ModuleCoverageDataJacoco that = (ModuleCoverageDataJacoco) o;
+        return sessionId.toLong() == that.sessionId.toLong()
+                && sessionId.toHighOrderLong() == that.sessionId.toHighOrderLong()
+                && moduleId == that.moduleId
+                && Arrays.equals(coverageData, that.coverageData);
     }
-    ModuleCoverageDataJacoco that = (ModuleCoverageDataJacoco) o;
-    return sessionId.toLong() == that.sessionId.toLong()
-        && sessionId.toHighOrderLong() == that.sessionId.toHighOrderLong()
-        && moduleId == that.moduleId
-        && Arrays.equals(coverageData, that.coverageData);
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(sessionId, moduleId, Arrays.hashCode(coverageData));
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(sessionId, moduleId, Arrays.hashCode(coverageData));
+    }
 
-  @Override
-  public String toString() {
-    return "ModuleCoverageDataJacoco{" + "sessionId=" + sessionId + ", moduleId=" + moduleId + '}';
-  }
+    @Override
+    public String toString() {
+        return "ModuleCoverageDataJacoco{" + "sessionId=" + sessionId + ", moduleId=" + moduleId + '}';
+    }
 
-  @Override
-  public SignalType getType() {
-    return SignalType.MODULE_COVERAGE_DATA_JACOCO;
-  }
+    @Override
+    public SignalType getType() {
+        return SignalType.MODULE_COVERAGE_DATA_JACOCO;
+    }
 
-  @Override
-  public ByteBuffer serialize() {
-    Serializer s = new Serializer();
-    s.write(sessionId.toHexString());
-    s.write(moduleId);
-    s.write(coverageData);
-    return s.flush();
-  }
+    @Override
+    public ByteBuffer serialize() {
+        Serializer s = new Serializer();
+        s.write(sessionId.toHexString());
+        s.write(moduleId);
+        s.write(coverageData);
+        return s.flush();
+    }
 
-  public static ModuleCoverageDataJacoco deserialize(ByteBuffer buffer) {
-    DDTraceId sessionId = DDTraceId.fromHex(Serializer.readString(buffer));
-    long moduleId = Serializer.readLong(buffer);
-    byte[] coverageData = Serializer.readByteArray(buffer);
-    return new ModuleCoverageDataJacoco(sessionId, moduleId, coverageData);
-  }
+    public static ModuleCoverageDataJacoco deserialize(ByteBuffer buffer) {
+        DDTraceId sessionId = DDTraceId.fromHex(Serializer.readString(buffer));
+        long moduleId = Serializer.readLong(buffer);
+        byte[] coverageData = Serializer.readByteArray(buffer);
+        return new ModuleCoverageDataJacoco(sessionId, moduleId, coverageData);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleExecutionResult.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleExecutionResult.java
index 2f3508c366f..00ce0c2c07e 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleExecutionResult.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleExecutionResult.java
@@ -8,189 +8,188 @@
 
 public class ModuleExecutionResult extends ModuleSignal {
 
-  private static final int COVERAGE_ENABLED_FLAG = 1;
-  private static final int TEST_SKIPPING_ENABLED_FLAG = 2;
-  private static final int EARLY_FLAKE_DETECTION_ENABLED_FLAG = 4;
-  private static final int EARLY_FLAKE_DETECTION_FAULTY_FLAG = 8;
-  private static final int TEST_MANAGEMENT_ENABLED_FLAG = 16;
-  private static final int HAS_FAILED_TEST_REPLAY_TESTS_FLAG = 32;
-
-  private final boolean coverageEnabled;
-  private final boolean testSkippingEnabled;
-  private final boolean earlyFlakeDetectionEnabled;
-  private final boolean earlyFlakeDetectionFaulty;
-  private final boolean testManagementEnabled;
-  private final boolean hasFailedTestReplayTests;
-  private final long testsSkippedTotal;
-  private final Collection<TestFramework> testFrameworks;
-
-  public ModuleExecutionResult(
-      DDTraceId sessionId,
-      long moduleId,
-      boolean coverageEnabled,
-      boolean testSkippingEnabled,
-      boolean earlyFlakeDetectionEnabled,
-      boolean earlyFlakeDetectionFaulty,
-      boolean testManagementEnabled,
-      boolean hasFailedTestReplayTests,
-      long testsSkippedTotal,
-      Collection<TestFramework> testFrameworks) {
-    super(sessionId, moduleId);
-    this.coverageEnabled = coverageEnabled;
-    this.testSkippingEnabled = testSkippingEnabled;
-    this.earlyFlakeDetectionEnabled = earlyFlakeDetectionEnabled;
-    this.earlyFlakeDetectionFaulty = earlyFlakeDetectionFaulty;
-    this.testManagementEnabled = testManagementEnabled;
-    this.hasFailedTestReplayTests = hasFailedTestReplayTests;
-    this.testsSkippedTotal = testsSkippedTotal;
-    this.testFrameworks = testFrameworks;
-  }
-
-  public boolean isCoverageEnabled() {
-    return coverageEnabled;
-  }
-
-  public boolean isTestSkippingEnabled() {
-    return testSkippingEnabled;
-  }
-
-  public boolean isEarlyFlakeDetectionEnabled() {
-    return earlyFlakeDetectionEnabled;
-  }
-
-  public boolean isEarlyFlakeDetectionFaulty() {
-    return earlyFlakeDetectionFaulty;
-  }
-
-  public boolean isTestManagementEnabled() {
-    return testManagementEnabled;
-  }
-
-  public boolean hasFailedTestReplayTests() {
-    return hasFailedTestReplayTests;
-  }
-
-  public long getTestsSkippedTotal() {
-    return testsSkippedTotal;
-  }
-
-  public Collection<TestFramework> getTestFrameworks() {
-    return testFrameworks;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    private static final int COVERAGE_ENABLED_FLAG = 1;
+    private static final int TEST_SKIPPING_ENABLED_FLAG = 2;
+    private static final int EARLY_FLAKE_DETECTION_ENABLED_FLAG = 4;
+    private static final int EARLY_FLAKE_DETECTION_FAULTY_FLAG = 8;
+    private static final int TEST_MANAGEMENT_ENABLED_FLAG = 16;
+    private static final int HAS_FAILED_TEST_REPLAY_TESTS_FLAG = 32;
+
+    private final boolean coverageEnabled;
+    private final boolean testSkippingEnabled;
+    private final boolean earlyFlakeDetectionEnabled;
+    private final boolean earlyFlakeDetectionFaulty;
+    private final boolean testManagementEnabled;
+    private final boolean hasFailedTestReplayTests;
+    private final long testsSkippedTotal;
+    private final Collection<TestFramework> testFrameworks;
+
+    public ModuleExecutionResult(
+            DDTraceId sessionId,
+            long moduleId,
+            boolean coverageEnabled,
+            boolean testSkippingEnabled,
+            boolean earlyFlakeDetectionEnabled,
+            boolean earlyFlakeDetectionFaulty,
+            boolean testManagementEnabled,
+            boolean hasFailedTestReplayTests,
+            long testsSkippedTotal,
+            Collection<TestFramework> testFrameworks) {
+        super(sessionId, moduleId);
+        this.coverageEnabled = coverageEnabled;
+        this.testSkippingEnabled = testSkippingEnabled;
+        this.earlyFlakeDetectionEnabled = earlyFlakeDetectionEnabled;
+        this.earlyFlakeDetectionFaulty = earlyFlakeDetectionFaulty;
+        this.testManagementEnabled = testManagementEnabled;
+        this.hasFailedTestReplayTests = hasFailedTestReplayTests;
+        this.testsSkippedTotal = testsSkippedTotal;
+        this.testFrameworks = testFrameworks;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    public boolean isCoverageEnabled() {
+        return coverageEnabled;
     }
-    ModuleExecutionResult that = (ModuleExecutionResult) o;
-    return sessionId.toLong() == that.sessionId.toLong()
-        && sessionId.toHighOrderLong() == that.sessionId.toHighOrderLong()
-        && moduleId == that.moduleId
-        && coverageEnabled == that.coverageEnabled
-        && testSkippingEnabled == that.testSkippingEnabled
-        && hasFailedTestReplayTests == that.hasFailedTestReplayTests
-        && testsSkippedTotal == that.testsSkippedTotal
-        && Objects.equals(testFrameworks, that.testFrameworks);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(
-        sessionId,
-        moduleId,
-        coverageEnabled,
-        testSkippingEnabled,
-        hasFailedTestReplayTests,
-        testsSkippedTotal,
-        testFrameworks);
-  }
-
-  @Override
-  public String toString() {
-    return "ModuleExecutionResult{"
-        + "sessionId="
-        + sessionId
-        + ", moduleId="
-        + moduleId
-        + ", coverageEnabled="
-        + coverageEnabled
-        + ", hasFailedTestReplayTests="
-        + hasFailedTestReplayTests
-        + ", testSkippingEnabled="
-        + testSkippingEnabled
-        + ", itrTestsSkipped="
-        + testsSkippedTotal
-        + '}';
-  }
-
-  @Override
-  public SignalType getType() {
-    return SignalType.MODULE_EXECUTION_RESULT;
-  }
-
-  @Override
-  public ByteBuffer serialize() {
-    Serializer s = new Serializer();
-    s.write(sessionId.toHexString());
-    s.write(moduleId);
-
-    byte flags = 0;
-    if (coverageEnabled) {
-      flags |= COVERAGE_ENABLED_FLAG;
+
+    public boolean isTestSkippingEnabled() {
+        return testSkippingEnabled;
     }
-    if (testSkippingEnabled) {
-      flags |= TEST_SKIPPING_ENABLED_FLAG;
+
+    public boolean isEarlyFlakeDetectionEnabled() {
+        return earlyFlakeDetectionEnabled;
     }
-    if (earlyFlakeDetectionEnabled) {
-      flags |= EARLY_FLAKE_DETECTION_ENABLED_FLAG;
+
+    public boolean isEarlyFlakeDetectionFaulty() {
+        return earlyFlakeDetectionFaulty;
     }
-    if (earlyFlakeDetectionFaulty) {
-      flags |= EARLY_FLAKE_DETECTION_FAULTY_FLAG;
+
+    public boolean isTestManagementEnabled() {
+        return testManagementEnabled;
     }
-    if (testManagementEnabled) {
-      flags |= TEST_MANAGEMENT_ENABLED_FLAG;
+
+    public boolean hasFailedTestReplayTests() {
+        return hasFailedTestReplayTests;
     }
-    if (hasFailedTestReplayTests) {
-      flags |= HAS_FAILED_TEST_REPLAY_TESTS_FLAG;
+
+    public long getTestsSkippedTotal() {
+        return testsSkippedTotal;
+    }
+
+    public Collection<TestFramework> getTestFrameworks() {
+        return testFrameworks;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ModuleExecutionResult that = (ModuleExecutionResult) o;
+        return sessionId.toLong() == that.sessionId.toLong()
+                && sessionId.toHighOrderLong() == that.sessionId.toHighOrderLong()
+                && moduleId == that.moduleId
+                && coverageEnabled == that.coverageEnabled
+                && testSkippingEnabled == that.testSkippingEnabled
+                && hasFailedTestReplayTests == that.hasFailedTestReplayTests
+                && testsSkippedTotal == that.testsSkippedTotal
+                && Objects.equals(testFrameworks, that.testFrameworks);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(
+                sessionId,
+                moduleId,
+                coverageEnabled,
+                testSkippingEnabled,
+                hasFailedTestReplayTests,
+                testsSkippedTotal,
+                testFrameworks);
+    }
+
+    @Override
+    public String toString() {
+        return "ModuleExecutionResult{"
+                + "sessionId="
+                + sessionId
+                + ", moduleId="
+                + moduleId
+                + ", coverageEnabled="
+                + coverageEnabled
+                + ", hasFailedTestReplayTests="
+                + hasFailedTestReplayTests
+                + ", testSkippingEnabled="
+                + testSkippingEnabled
+                + ", itrTestsSkipped="
+                + testsSkippedTotal
+                + '}';
+    }
+
+    @Override
+    public SignalType getType() {
+        return SignalType.MODULE_EXECUTION_RESULT;
+    }
+
+    @Override
+    public ByteBuffer serialize() {
+        Serializer s = new Serializer();
+        s.write(sessionId.toHexString());
+        s.write(moduleId);
+
+        byte flags = 0;
+        if (coverageEnabled) {
+            flags |= COVERAGE_ENABLED_FLAG;
+        }
+        if (testSkippingEnabled) {
+            flags |= TEST_SKIPPING_ENABLED_FLAG;
+        }
+        if (earlyFlakeDetectionEnabled) {
+            flags |= EARLY_FLAKE_DETECTION_ENABLED_FLAG;
+        }
+        if (earlyFlakeDetectionFaulty) {
+            flags |= EARLY_FLAKE_DETECTION_FAULTY_FLAG;
+        }
+        if (testManagementEnabled) {
+            flags |= TEST_MANAGEMENT_ENABLED_FLAG;
+        }
+        if (hasFailedTestReplayTests) {
+            flags |= HAS_FAILED_TEST_REPLAY_TESTS_FLAG;
+        }
+        s.write(flags);
+
+        s.write(testsSkippedTotal);
+        s.write(testFrameworks, TestFramework::serialize);
+
+        return s.flush();
+    }
+
+    public static ModuleExecutionResult deserialize(ByteBuffer buffer) {
+        DDTraceId sessionId = DDTraceId.fromHex(Serializer.readString(buffer));
+        long moduleId = Serializer.readLong(buffer);
+
+        int flags = Serializer.readByte(buffer);
+        boolean coverageEnabled = (flags & COVERAGE_ENABLED_FLAG) != 0;
+        boolean testSkippingEnabled = (flags & TEST_SKIPPING_ENABLED_FLAG) != 0;
+        boolean earlyFlakeDetectionEnabled = (flags & EARLY_FLAKE_DETECTION_ENABLED_FLAG) != 0;
+        boolean earlyFlakeDetectionFaulty = (flags & EARLY_FLAKE_DETECTION_FAULTY_FLAG) != 0;
+        boolean testManagementEnabled = (flags & TEST_MANAGEMENT_ENABLED_FLAG) != 0;
+        boolean hasFailedTestReplayTests = (flags & HAS_FAILED_TEST_REPLAY_TESTS_FLAG) != 0;
+
+        long testsSkippedTotal = Serializer.readLong(buffer);
+        Collection<TestFramework> testFrameworks = Serializer.readList(buffer, TestFramework::deserialize);
+
+        return new ModuleExecutionResult(
+                sessionId,
+                moduleId,
+                coverageEnabled,
+                testSkippingEnabled,
+                earlyFlakeDetectionEnabled,
+                earlyFlakeDetectionFaulty,
+                testManagementEnabled,
+                hasFailedTestReplayTests,
+                testsSkippedTotal,
+                testFrameworks);
     }
-    s.write(flags);
-
-    s.write(testsSkippedTotal);
-    s.write(testFrameworks, TestFramework::serialize);
-
-    return s.flush();
-  }
-
-  public static ModuleExecutionResult deserialize(ByteBuffer buffer) {
-    DDTraceId sessionId = DDTraceId.fromHex(Serializer.readString(buffer));
-    long moduleId = Serializer.readLong(buffer);
-
-    int flags = Serializer.readByte(buffer);
-    boolean coverageEnabled = (flags & COVERAGE_ENABLED_FLAG) != 0;
-    boolean testSkippingEnabled = (flags & TEST_SKIPPING_ENABLED_FLAG) != 0;
-    boolean earlyFlakeDetectionEnabled = (flags & EARLY_FLAKE_DETECTION_ENABLED_FLAG) != 0;
-    boolean earlyFlakeDetectionFaulty = (flags & EARLY_FLAKE_DETECTION_FAULTY_FLAG) != 0;
-    boolean testManagementEnabled = (flags & TEST_MANAGEMENT_ENABLED_FLAG) != 0;
-    boolean hasFailedTestReplayTests = (flags & HAS_FAILED_TEST_REPLAY_TESTS_FLAG) != 0;
-
-    long testsSkippedTotal = Serializer.readLong(buffer);
-    Collection<TestFramework> testFrameworks =
-        Serializer.readList(buffer, TestFramework::deserialize);
-
-    return new ModuleExecutionResult(
-        sessionId,
-        moduleId,
-        coverageEnabled,
-        testSkippingEnabled,
-        earlyFlakeDetectionEnabled,
-        earlyFlakeDetectionFaulty,
-        testManagementEnabled,
-        hasFailedTestReplayTests,
-        testsSkippedTotal,
-        testFrameworks);
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleSignal.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleSignal.java
index 2a6fbbb330a..4fa39ba9007 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleSignal.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleSignal.java
@@ -4,19 +4,19 @@
 
 public abstract class ModuleSignal implements Signal {
 
-  protected final DDTraceId sessionId;
-  protected final long moduleId;
+    protected final DDTraceId sessionId;
+    protected final long moduleId;
 
-  protected ModuleSignal(DDTraceId sessionId, long moduleId) {
-    this.sessionId = sessionId;
-    this.moduleId = moduleId;
-  }
+    protected ModuleSignal(DDTraceId sessionId, long moduleId) {
+        this.sessionId = sessionId;
+        this.moduleId = moduleId;
+    }
 
-  public DDTraceId getSessionId() {
-    return sessionId;
-  }
+    public DDTraceId getSessionId() {
+        return sessionId;
+    }
 
-  public long getModuleId() {
-    return moduleId;
-  }
+    public long getModuleId() {
+        return moduleId;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/RepoIndexRequest.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/RepoIndexRequest.java
index 6bb05230a2c..bf63ed275ec 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/RepoIndexRequest.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/RepoIndexRequest.java
@@ -3,15 +3,15 @@
 import java.nio.ByteBuffer;
 
 public class RepoIndexRequest implements Signal {
-  public static final Signal INSTANCE = new RepoIndexRequest();
+    public static final Signal INSTANCE = new RepoIndexRequest();
 
-  @Override
-  public SignalType getType() {
-    return SignalType.REPO_INDEX_REQUEST;
-  }
+    @Override
+    public SignalType getType() {
+        return SignalType.REPO_INDEX_REQUEST;
+    }
 
-  @Override
-  public ByteBuffer serialize() {
-    return ByteBuffer.allocate(0);
-  }
+    @Override
+    public ByteBuffer serialize() {
+        return ByteBuffer.allocate(0);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/RepoIndexResponse.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/RepoIndexResponse.java
index 4ad1a3f3cd4..8bdecd57dc0 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/RepoIndexResponse.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/RepoIndexResponse.java
@@ -5,28 +5,28 @@
 
 public class RepoIndexResponse implements SignalResponse {
 
-  private final RepoIndex index;
-
-  public RepoIndexResponse(RepoIndex index) {
-    this.index = index;
-  }
-
-  public RepoIndex getIndex() {
-    return index;
-  }
-
-  @Override
-  public SignalType getType() {
-    return SignalType.REPO_INDEX_RESPONSE;
-  }
-
-  @Override
-  public ByteBuffer serialize() {
-    return index.serialize();
-  }
-
-  public static RepoIndexResponse deserialize(ByteBuffer buffer) {
-    RepoIndex repoIndex = RepoIndex.deserialize(buffer);
-    return new RepoIndexResponse(repoIndex);
-  }
+    private final RepoIndex index;
+
+    public RepoIndexResponse(RepoIndex index) {
+        this.index = index;
+    }
+
+    public RepoIndex getIndex() {
+        return index;
+    }
+
+    @Override
+    public SignalType getType() {
+        return SignalType.REPO_INDEX_RESPONSE;
+    }
+
+    @Override
+    public ByteBuffer serialize() {
+        return index.serialize();
+    }
+
+    public static RepoIndexResponse deserialize(ByteBuffer buffer) {
+        RepoIndex repoIndex = RepoIndex.deserialize(buffer);
+        return new RepoIndexResponse(repoIndex);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/Signal.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/Signal.java
index 0641674b8ea..ccaf4f70c39 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/Signal.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/Signal.java
@@ -3,7 +3,7 @@
 import java.nio.ByteBuffer;
 
 public interface Signal {
-  SignalType getType();
+    SignalType getType();
 
-  ByteBuffer serialize();
+    ByteBuffer serialize();
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalClient.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalClient.java
index d15a489e597..5ecd8b1fe2a 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalClient.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalClient.java
@@ -19,126 +19,122 @@
 
 public class SignalClient implements AutoCloseable {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(SignalClient.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SignalClient.class);
 
-  private static final int BUFFER_CAPACITY = 8192;
+    private static final int BUFFER_CAPACITY = 8192;
 
-  private static final Map<SignalType, Function<ByteBuffer, SignalResponse>> DESERIALIZERS =
-      new EnumMap<>(SignalType.class);
+    private static final Map<SignalType, Function<ByteBuffer, SignalResponse>> DESERIALIZERS =
+            new EnumMap<>(SignalType.class);
 
-  static {
-    DESERIALIZERS.put(SignalType.ERROR, ErrorResponse::deserialize);
-    DESERIALIZERS.put(SignalType.ACK, b -> AckResponse.INSTANCE);
-    DESERIALIZERS.put(SignalType.REPO_INDEX_RESPONSE, RepoIndexResponse::deserialize);
-    DESERIALIZERS.put(SignalType.MODULE_SETTINGS_RESPONSE, ExecutionSettingsResponse::deserialize);
-  }
-
-  private final SocketChannel socketChannel;
-  private final ByteBuffer buffer;
-
-  @SuppressForbidden
-  public SignalClient(InetSocketAddress serverAddress, int socketTimeoutMillis) throws IOException {
-    if (serverAddress == null) {
-      throw new IOException("Cannot open connection to signal server: no address specified");
+    static {
+        DESERIALIZERS.put(SignalType.ERROR, ErrorResponse::deserialize);
+        DESERIALIZERS.put(SignalType.ACK, b -> AckResponse.INSTANCE);
+        DESERIALIZERS.put(SignalType.REPO_INDEX_RESPONSE, RepoIndexResponse::deserialize);
+        DESERIALIZERS.put(SignalType.MODULE_SETTINGS_RESPONSE, ExecutionSettingsResponse::deserialize);
     }
 
-    socketChannel = SocketChannel.open();
-    Socket socket = socketChannel.socket();
-    socket.setSoTimeout(socketTimeoutMillis);
-    socket.connect(serverAddress, socketTimeoutMillis);
-
-    buffer = ByteBuffer.allocate(BUFFER_CAPACITY);
-  }
-
-  @Override
-  public void close() throws IOException {
-    socketChannel.close();
-  }
-
-  public SignalResponse send(Signal signal) throws IOException {
-    ByteBuffer message = signal.serialize();
-    LOGGER.debug(
-        "Sending signal of type {} and size {} bytes", signal.getType(), message.remaining());
-
-    ByteBuffer header = ByteBuffer.allocate(Integer.BYTES + 1);
-    header.putInt(message.remaining() + 1); // +1 is for signal type
-    header.put(signal.getType().getCode());
-    header.flip();
-    socketChannel.write(header);
-    socketChannel.write(message);
-    LOGGER.debug("Signal sent");
-
-    // reading is done this way to make socket channel respect timeout
-    Socket socket = socketChannel.socket();
-    InputStream inputStream = socket.getInputStream();
-    ReadableByteChannel inputChannel = Channels.newChannel(inputStream);
-
-    while (buffer.position() < Integer.BYTES) {
-      int read = inputChannel.read(buffer);
-      if (read == -1) {
-        throw new IOException("Stream closed before response length could be fully read");
-      }
-    }
+    private final SocketChannel socketChannel;
+    private final ByteBuffer buffer;
 
-    buffer.flip();
-    int payloadLength = buffer.getInt();
-    ByteBuffer payload = ByteBuffer.allocate(payloadLength);
-    payload.put(buffer);
-    buffer.flip();
-
-    while (payload.hasRemaining()) {
-      int read = inputChannel.read(payload);
-      if (read == -1) {
-        throw new IOException("Stream closed before response payload could be fully read");
-      }
-    }
+    @SuppressForbidden
+    public SignalClient(InetSocketAddress serverAddress, int socketTimeoutMillis) throws IOException {
+        if (serverAddress == null) {
+            throw new IOException("Cannot open connection to signal server: no address specified");
+        }
 
-    payload.flip();
+        socketChannel = SocketChannel.open();
+        Socket socket = socketChannel.socket();
+        socket.setSoTimeout(socketTimeoutMillis);
+        socket.connect(serverAddress, socketTimeoutMillis);
 
-    byte signalTypeCode = payload.get();
-    SignalType signalType = SignalType.fromCode(signalTypeCode);
-    if (signalType == null) {
-      throw new IOException("Unknown signal type code " + signalTypeCode);
+        buffer = ByteBuffer.allocate(BUFFER_CAPACITY);
     }
 
-    Function<ByteBuffer, SignalResponse> deserializer = DESERIALIZERS.get(signalType);
-    if (deserializer == null) {
-      throw new IOException("Could not find deserializer for signal type " + signalType);
+    @Override
+    public void close() throws IOException {
+        socketChannel.close();
     }
 
-    SignalResponse response = deserializer.apply(payload);
-    if (response instanceof ErrorResponse) {
-      throw new IOException(getErrorMessage((ErrorResponse) response));
+    public SignalResponse send(Signal signal) throws IOException {
+        ByteBuffer message = signal.serialize();
+        LOGGER.debug("Sending signal of type {} and size {} bytes", signal.getType(), message.remaining());
+
+        ByteBuffer header = ByteBuffer.allocate(Integer.BYTES + 1);
+        header.putInt(message.remaining() + 1); // +1 is for signal type
+        header.put(signal.getType().getCode());
+        header.flip();
+        socketChannel.write(header);
+        socketChannel.write(message);
+        LOGGER.debug("Signal sent");
+
+        // reading is done this way to make socket channel respect timeout
+        Socket socket = socketChannel.socket();
+        InputStream inputStream = socket.getInputStream();
+        ReadableByteChannel inputChannel = Channels.newChannel(inputStream);
+
+        while (buffer.position() < Integer.BYTES) {
+            int read = inputChannel.read(buffer);
+            if (read == -1) {
+                throw new IOException("Stream closed before response length could be fully read");
+            }
+        }
+
+        buffer.flip();
+        int payloadLength = buffer.getInt();
+        ByteBuffer payload = ByteBuffer.allocate(payloadLength);
+        payload.put(buffer);
+        buffer.flip();
+
+        while (payload.hasRemaining()) {
+            int read = inputChannel.read(payload);
+            if (read == -1) {
+                throw new IOException("Stream closed before response payload could be fully read");
+            }
+        }
+
+        payload.flip();
+
+        byte signalTypeCode = payload.get();
+        SignalType signalType = SignalType.fromCode(signalTypeCode);
+        if (signalType == null) {
+            throw new IOException("Unknown signal type code " + signalTypeCode);
+        }
+
+        Function<ByteBuffer, SignalResponse> deserializer = DESERIALIZERS.get(signalType);
+        if (deserializer == null) {
+            throw new IOException("Could not find deserializer for signal type " + signalType);
+        }
+
+        SignalResponse response = deserializer.apply(payload);
+        if (response instanceof ErrorResponse) {
+            throw new IOException(getErrorMessage((ErrorResponse) response));
+        }
+        return response;
     }
-    return response;
-  }
-
-  static String getErrorMessage(ErrorResponse response) {
-    return "Server returned an error: " + response.getMessage();
-  }
-
-  public static final class Factory {
-    private final InetSocketAddress signalServerAddress;
-    private final Config config;
 
-    public Factory(InetSocketAddress signalServerAddress, Config config) {
-      this.signalServerAddress = signalServerAddress;
-      this.config = config;
+    static String getErrorMessage(ErrorResponse response) {
+        return "Server returned an error: " + response.getMessage();
     }
 
-    @Nonnull
-    public SignalClient create() {
-      if (signalServerAddress == null) {
-        throw new IllegalArgumentException(
-            "Cannot create signal client: no signal server address configured");
-      }
-      try {
-        return new SignalClient(
-            signalServerAddress, config.getCiVisibilitySignalClientTimeoutMillis());
-      } catch (IOException e) {
-        throw new RuntimeException(
-            "Could not instantiate signal client. Address: " + signalServerAddress, e);
-      }
+    public static final class Factory {
+        private final InetSocketAddress signalServerAddress;
+        private final Config config;
+
+        public Factory(InetSocketAddress signalServerAddress, Config config) {
+            this.signalServerAddress = signalServerAddress;
+            this.config = config;
+        }
+
+        @Nonnull
+        public SignalClient create() {
+            if (signalServerAddress == null) {
+                throw new IllegalArgumentException("Cannot create signal client: no signal server address configured");
+            }
+            try {
+                return new SignalClient(signalServerAddress, config.getCiVisibilitySignalClientTimeoutMillis());
+            } catch (IOException e) {
+                throw new RuntimeException("Could not instantiate signal client. Address: " + signalServerAddress, e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalResponse.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalResponse.java
index 191259d4c81..9bfd9c701b0 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalResponse.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalResponse.java
@@ -3,7 +3,7 @@
 import java.nio.ByteBuffer;
 
 public interface SignalResponse {
-  SignalType getType();
+    SignalType getType();
 
-  ByteBuffer serialize();
+    ByteBuffer serialize();
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalServer.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalServer.java
index 8199aa7671a..f965f114fdd 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalServer.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalServer.java
@@ -22,110 +22,107 @@
  */
 public class SignalServer {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(SignalServer.class);
-  private static final int DEFAULT_BUFFER_CAPACITY = 1024;
-
-  private Selector selector;
-  private ServerSocketChannel serverSocketChannel;
-  private Thread signalServerThread;
-
-  private final int port;
-  private final String address;
-  private final Map<SignalType, Function<Signal, SignalResponse>> signalHandlers =
-      new EnumMap<>(SignalType.class);
-
-  public SignalServer() {
-    this("127.0.0.1", 0);
-  }
-
-  public SignalServer(String address, int port) {
-    this.port = port;
-    this.address = address;
-  }
-
-  public synchronized void start() {
-    if (serverSocketChannel == null) {
-      try {
-        serverSocketChannel = ServerSocketChannel.open();
-        serverSocketChannel.configureBlocking(false);
-
-        serverSocketChannel.bind(new InetSocketAddress(address, port));
-
-        selector = Selector.open();
-        serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT);
-
-      } catch (IOException e) {
-        LOGGER.error("Error while starting signal server", e);
-        return;
-      }
-
-      SignalServerRunnable signalServerRunnable =
-          new SignalServerRunnable(selector, DEFAULT_BUFFER_CAPACITY, signalHandlers);
-      signalServerThread =
-          AgentThreadFactory.newAgentThread(
-              AgentThreadFactory.AgentThread.CI_SIGNAL_SERVER, signalServerRunnable);
-      signalServerThread.start();
-    }
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(SignalServer.class);
+    private static final int DEFAULT_BUFFER_CAPACITY = 1024;
+
+    private Selector selector;
+    private ServerSocketChannel serverSocketChannel;
+    private Thread signalServerThread;
 
-  public synchronized InetSocketAddress getAddress() {
-    if (serverSocketChannel == null) {
-      throw new IllegalStateException("Server not started");
+    private final int port;
+    private final String address;
+    private final Map<SignalType, Function<Signal, SignalResponse>> signalHandlers = new EnumMap<>(SignalType.class);
+
+    public SignalServer() {
+        this("127.0.0.1", 0);
     }
 
-    SocketAddress localAddress;
-    try {
-      localAddress = serverSocketChannel.getLocalAddress();
-    } catch (IOException e) {
-      LOGGER.error("Error while getting signal server address", e);
-      return null;
+    public SignalServer(String address, int port) {
+        this.port = port;
+        this.address = address;
     }
 
-    if (localAddress instanceof InetSocketAddress) {
-      return (InetSocketAddress) localAddress;
+    public synchronized void start() {
+        if (serverSocketChannel == null) {
+            try {
+                serverSocketChannel = ServerSocketChannel.open();
+                serverSocketChannel.configureBlocking(false);
 
-    } else {
-      LOGGER.error(
-          "Got unexpected address from the signal server: {}. "
-              + "Signal server will not be started",
-          localAddress);
-      return null;
-    }
-  }
+                serverSocketChannel.bind(new InetSocketAddress(address, port));
 
-  @SuppressWarnings("unchecked")
-  public synchronized <T extends Signal> void registerSignalHandler(
-      SignalType type, Function<T, SignalResponse> handler) {
-    if (serverSocketChannel != null) {
-      throw new IllegalStateException("Cannot register a signal handler after server has started");
+                selector = Selector.open();
+                serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT);
+
+            } catch (IOException e) {
+                LOGGER.error("Error while starting signal server", e);
+                return;
+            }
+
+            SignalServerRunnable signalServerRunnable =
+                    new SignalServerRunnable(selector, DEFAULT_BUFFER_CAPACITY, signalHandlers);
+            signalServerThread = AgentThreadFactory.newAgentThread(
+                    AgentThreadFactory.AgentThread.CI_SIGNAL_SERVER, signalServerRunnable);
+            signalServerThread.start();
+        }
     }
-    signalHandlers.put(type, (Function<Signal, SignalResponse>) handler);
-  }
-
-  public synchronized void stop() {
-    if (signalServerThread != null) {
-      signalServerThread.interrupt();
-      try {
-        signalServerThread.join();
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      }
+
+    public synchronized InetSocketAddress getAddress() {
+        if (serverSocketChannel == null) {
+            throw new IllegalStateException("Server not started");
+        }
+
+        SocketAddress localAddress;
+        try {
+            localAddress = serverSocketChannel.getLocalAddress();
+        } catch (IOException e) {
+            LOGGER.error("Error while getting signal server address", e);
+            return null;
+        }
+
+        if (localAddress instanceof InetSocketAddress) {
+            return (InetSocketAddress) localAddress;
+
+        } else {
+            LOGGER.error(
+                    "Got unexpected address from the signal server: {}. " + "Signal server will not be started",
+                    localAddress);
+            return null;
+        }
     }
 
-    try {
-      if (selector != null) {
-        selector.close();
-      }
-    } catch (IOException e) {
-      LOGGER.error("Error while closing signal server selector", e);
+    @SuppressWarnings("unchecked")
+    public synchronized <T extends Signal> void registerSignalHandler(
+            SignalType type, Function<T, SignalResponse> handler) {
+        if (serverSocketChannel != null) {
+            throw new IllegalStateException("Cannot register a signal handler after server has started");
+        }
+        signalHandlers.put(type, (Function<Signal, SignalResponse>) handler);
     }
 
-    try {
-      if (serverSocketChannel != null) {
-        serverSocketChannel.close();
-      }
-    } catch (IOException e) {
-      LOGGER.error("Error while closing signal server socket channel", e);
+    public synchronized void stop() {
+        if (signalServerThread != null) {
+            signalServerThread.interrupt();
+            try {
+                signalServerThread.join();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
+
+        try {
+            if (selector != null) {
+                selector.close();
+            }
+        } catch (IOException e) {
+            LOGGER.error("Error while closing signal server selector", e);
+        }
+
+        try {
+            if (serverSocketChannel != null) {
+                serverSocketChannel.close();
+            }
+        } catch (IOException e) {
+            LOGGER.error("Error while closing signal server socket channel", e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalServerRunnable.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalServerRunnable.java
index edadd211728..33c68c98588 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalServerRunnable.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalServerRunnable.java
@@ -16,122 +16,114 @@
 
 class SignalServerRunnable implements Runnable {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(SignalServerRunnable.class);
-  private static final long SELECT_TIMEOUT = TimeUnit.SECONDS.toMillis(5);
-  private static final Map<SignalType, Function<ByteBuffer, Signal>> DESERIALIZERS =
-      new EnumMap<>(SignalType.class);
-
-  static {
-    DESERIALIZERS.put(SignalType.MODULE_EXECUTION_RESULT, ModuleExecutionResult::deserialize);
-    DESERIALIZERS.put(
-        SignalType.MODULE_COVERAGE_DATA_JACOCO, ModuleCoverageDataJacoco::deserialize);
-    DESERIALIZERS.put(SignalType.REPO_INDEX_REQUEST, b -> RepoIndexRequest.INSTANCE);
-    DESERIALIZERS.put(SignalType.EXECUTION_SETTINGS_REQUEST, ExecutionSettingsRequest::deserialize);
-  }
-
-  private final Selector selector;
-  private final int bufferCapacity;
-  private final Map<SignalType, Function<Signal, SignalResponse>> signalHandlers;
-
-  SignalServerRunnable(
-      Selector selector,
-      int bufferCapacity,
-      Map<SignalType, Function<Signal, SignalResponse>> signalHandlers) {
-    this.selector = selector;
-    this.bufferCapacity = bufferCapacity;
-    this.signalHandlers = signalHandlers;
-  }
-
-  public void run() {
-    while (!Thread.currentThread().isInterrupted()) {
-      try {
-        processSelectableKeys();
-      } catch (Exception e) {
-        LOGGER.error("Error while executing signal server polling loop", e);
-      }
+    private static final Logger LOGGER = LoggerFactory.getLogger(SignalServerRunnable.class);
+    private static final long SELECT_TIMEOUT = TimeUnit.SECONDS.toMillis(5);
+    private static final Map<SignalType, Function<ByteBuffer, Signal>> DESERIALIZERS = new EnumMap<>(SignalType.class);
+
+    static {
+        DESERIALIZERS.put(SignalType.MODULE_EXECUTION_RESULT, ModuleExecutionResult::deserialize);
+        DESERIALIZERS.put(SignalType.MODULE_COVERAGE_DATA_JACOCO, ModuleCoverageDataJacoco::deserialize);
+        DESERIALIZERS.put(SignalType.REPO_INDEX_REQUEST, b -> RepoIndexRequest.INSTANCE);
+        DESERIALIZERS.put(SignalType.EXECUTION_SETTINGS_REQUEST, ExecutionSettingsRequest::deserialize);
     }
-    LOGGER.debug("Signal server stopped");
-  }
-
-  private void processSelectableKeys() throws IOException {
-    selector.select(SELECT_TIMEOUT);
-
-    Iterator<SelectionKey> keyIterator = selector.selectedKeys().iterator();
-    while (keyIterator.hasNext()) {
-      SelectionKey key = keyIterator.next();
-      keyIterator.remove();
-
-      // validity of the key is rechecked multiple times
-      // since any of the handlers below might cancel the key
-      if (key.isValid() && key.isAcceptable()) {
-        accept(key);
-      }
-
-      if (key.isValid() && key.isReadable()) {
-        read(key);
-      }
-
-      if (key.isValid() && key.isWritable()) {
-        write(key);
-      }
+
+    private final Selector selector;
+    private final int bufferCapacity;
+    private final Map<SignalType, Function<Signal, SignalResponse>> signalHandlers;
+
+    SignalServerRunnable(
+            Selector selector, int bufferCapacity, Map<SignalType, Function<Signal, SignalResponse>> signalHandlers) {
+        this.selector = selector;
+        this.bufferCapacity = bufferCapacity;
+        this.signalHandlers = signalHandlers;
     }
-  }
-
-  private void accept(SelectionKey key) throws IOException {
-    ServerSocketChannel serverChannel = (ServerSocketChannel) key.channel();
-    SocketChannel childChannel = serverChannel.accept();
-    childChannel.configureBlocking(false);
-
-    ChannelContext context = new ChannelContext(bufferCapacity, this::onMessage);
-    childChannel.register(key.selector(), SelectionKey.OP_READ | SelectionKey.OP_WRITE, context);
-  }
-
-  private void read(SelectionKey key) throws IOException {
-    ChannelContext context = (ChannelContext) key.attachment();
-    SocketChannel childChannel = (SocketChannel) key.channel();
-    context.read(childChannel);
-  }
-
-  private void write(SelectionKey key) throws IOException {
-    ChannelContext context = (ChannelContext) key.attachment();
-    SocketChannel childChannel = (SocketChannel) key.channel();
-    context.write(childChannel);
-  }
-
-  private ByteBuffer[] onMessage(ByteBuffer message) {
-    SignalType signalType = SignalType.fromCode(message.get());
-
-    Function<ByteBuffer, Signal> deserializer = DESERIALIZERS.get(signalType);
-    if (deserializer == null) {
-      LOGGER.error("Deserializer not defined for signal type {}, skipping processing", signalType);
-      return serialize(new ErrorResponse("Deserializer not found for " + signalType));
+
+    public void run() {
+        while (!Thread.currentThread().isInterrupted()) {
+            try {
+                processSelectableKeys();
+            } catch (Exception e) {
+                LOGGER.error("Error while executing signal server polling loop", e);
+            }
+        }
+        LOGGER.debug("Signal server stopped");
     }
 
-    Signal signal = deserializer.apply(message);
-    LOGGER.debug("Received signal: {}", signal);
+    private void processSelectableKeys() throws IOException {
+        selector.select(SELECT_TIMEOUT);
+
+        Iterator<SelectionKey> keyIterator = selector.selectedKeys().iterator();
+        while (keyIterator.hasNext()) {
+            SelectionKey key = keyIterator.next();
+            keyIterator.remove();
+
+            // validity of the key is rechecked multiple times
+            // since any of the handlers below might cancel the key
+            if (key.isValid() && key.isAcceptable()) {
+                accept(key);
+            }
+
+            if (key.isValid() && key.isReadable()) {
+                read(key);
+            }
+
+            if (key.isValid() && key.isWritable()) {
+                write(key);
+            }
+        }
+    }
+
+    private void accept(SelectionKey key) throws IOException {
+        ServerSocketChannel serverChannel = (ServerSocketChannel) key.channel();
+        SocketChannel childChannel = serverChannel.accept();
+        childChannel.configureBlocking(false);
+
+        ChannelContext context = new ChannelContext(bufferCapacity, this::onMessage);
+        childChannel.register(key.selector(), SelectionKey.OP_READ | SelectionKey.OP_WRITE, context);
+    }
 
-    Function<Signal, SignalResponse> handler = signalHandlers.get(signalType);
-    if (handler == null) {
-      LOGGER.warn(
-          "No handler registered for signal type {}, skipping signal {}", signalType, signal);
-      return serialize(new ErrorResponse("No handler registered for " + signalType));
+    private void read(SelectionKey key) throws IOException {
+        ChannelContext context = (ChannelContext) key.attachment();
+        SocketChannel childChannel = (SocketChannel) key.channel();
+        context.read(childChannel);
     }
 
-    SignalResponse response = handler.apply(signal);
-    return serialize(response);
-  }
-
-  private ByteBuffer[] serialize(SignalResponse response) {
-    ByteBuffer payload = response.serialize();
-    LOGGER.debug(
-        "Serialized response of type {} and size {} bytes",
-        response.getType(),
-        payload.remaining());
-
-    ByteBuffer header = ByteBuffer.allocate(Integer.BYTES + 1);
-    header.putInt(payload.remaining() + 1);
-    header.put(response.getType().getCode());
-    header.flip();
-    return new ByteBuffer[] {header, payload};
-  }
+    private void write(SelectionKey key) throws IOException {
+        ChannelContext context = (ChannelContext) key.attachment();
+        SocketChannel childChannel = (SocketChannel) key.channel();
+        context.write(childChannel);
+    }
+
+    private ByteBuffer[] onMessage(ByteBuffer message) {
+        SignalType signalType = SignalType.fromCode(message.get());
+
+        Function<ByteBuffer, Signal> deserializer = DESERIALIZERS.get(signalType);
+        if (deserializer == null) {
+            LOGGER.error("Deserializer not defined for signal type {}, skipping processing", signalType);
+            return serialize(new ErrorResponse("Deserializer not found for " + signalType));
+        }
+
+        Signal signal = deserializer.apply(message);
+        LOGGER.debug("Received signal: {}", signal);
+
+        Function<Signal, SignalResponse> handler = signalHandlers.get(signalType);
+        if (handler == null) {
+            LOGGER.warn("No handler registered for signal type {}, skipping signal {}", signalType, signal);
+            return serialize(new ErrorResponse("No handler registered for " + signalType));
+        }
+
+        SignalResponse response = handler.apply(signal);
+        return serialize(response);
+    }
+
+    private ByteBuffer[] serialize(SignalResponse response) {
+        ByteBuffer payload = response.serialize();
+        LOGGER.debug("Serialized response of type {} and size {} bytes", response.getType(), payload.remaining());
+
+        ByteBuffer header = ByteBuffer.allocate(Integer.BYTES + 1);
+        header.putInt(payload.remaining() + 1);
+        header.put(response.getType().getCode());
+        header.flip();
+        return new ByteBuffer[] {header, payload};
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalType.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalType.java
index f7f0b2f392b..7f3ae104991 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalType.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/SignalType.java
@@ -1,33 +1,33 @@
 package datadog.trace.civisibility.ipc;
 
 public enum SignalType {
-  ACK((byte) 0),
-  ERROR((byte) 1),
-  MODULE_EXECUTION_RESULT((byte) 2),
-  REPO_INDEX_REQUEST((byte) 3),
-  REPO_INDEX_RESPONSE((byte) 4),
-  EXECUTION_SETTINGS_REQUEST((byte) 5),
-  MODULE_SETTINGS_RESPONSE((byte) 6),
-  MODULE_COVERAGE_DATA_JACOCO((byte) 7);
+    ACK((byte) 0),
+    ERROR((byte) 1),
+    MODULE_EXECUTION_RESULT((byte) 2),
+    REPO_INDEX_REQUEST((byte) 3),
+    REPO_INDEX_RESPONSE((byte) 4),
+    EXECUTION_SETTINGS_REQUEST((byte) 5),
+    MODULE_SETTINGS_RESPONSE((byte) 6),
+    MODULE_COVERAGE_DATA_JACOCO((byte) 7);
 
-  private static final SignalType[] VALUES = SignalType.values();
+    private static final SignalType[] VALUES = SignalType.values();
 
-  private final byte code;
+    private final byte code;
 
-  SignalType(byte code) {
-    this.code = code;
-  }
+    SignalType(byte code) {
+        this.code = code;
+    }
 
-  public byte getCode() {
-    return code;
-  }
+    public byte getCode() {
+        return code;
+    }
 
-  public static SignalType fromCode(byte code) {
-    for (SignalType value : VALUES) {
-      if (value.code == code) {
-        return value;
-      }
+    public static SignalType fromCode(byte code) {
+        for (SignalType value : VALUES) {
+            if (value.code == code) {
+                return value;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/TestFramework.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/TestFramework.java
index 3402c8227eb..bf640a81bd3 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/TestFramework.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/TestFramework.java
@@ -5,63 +5,63 @@
 import java.util.Objects;
 
 public final class TestFramework implements Comparable<TestFramework> {
-  private final String name;
-  private final String version;
+    private final String name;
+    private final String version;
 
-  public TestFramework(String name, String version) {
-    this.name = name;
-    this.version = version;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public String getVersion() {
-    return version;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public TestFramework(String name, String version) {
+        this.name = name;
+        this.version = version;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TestFramework that = (TestFramework) o;
-    return Objects.equals(name, that.name) && Objects.equals(version, that.version);
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, version);
-  }
+    public String getName() {
+        return name;
+    }
 
-  @Override
-  public int compareTo(TestFramework o) {
-    int nameComparison = name.compareTo(o.name);
-    if (nameComparison != 0) {
-      return nameComparison;
+    public String getVersion() {
+        return version;
     }
-    if (version == null && o.version == null) {
-      return 0;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        TestFramework that = (TestFramework) o;
+        return Objects.equals(name, that.name) && Objects.equals(version, that.version);
     }
-    if (version == null) {
-      return -1;
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, version);
     }
-    if (o.version == null) {
-      return 1;
+
+    @Override
+    public int compareTo(TestFramework o) {
+        int nameComparison = name.compareTo(o.name);
+        if (nameComparison != 0) {
+            return nameComparison;
+        }
+        if (version == null && o.version == null) {
+            return 0;
+        }
+        if (version == null) {
+            return -1;
+        }
+        if (o.version == null) {
+            return 1;
+        }
+        return version.compareTo(o.version);
     }
-    return version.compareTo(o.version);
-  }
 
-  public static void serialize(Serializer serializer, TestFramework testFramework) {
-    serializer.write(testFramework.name);
-    serializer.write(testFramework.version);
-  }
+    public static void serialize(Serializer serializer, TestFramework testFramework) {
+        serializer.write(testFramework.name);
+        serializer.write(testFramework.version);
+    }
 
-  public static TestFramework deserialize(ByteBuffer buf) {
-    return new TestFramework(Serializer.readString(buf), Serializer.readString(buf));
-  }
+    public static TestFramework deserialize(ByteBuffer buf) {
+        return new TestFramework(Serializer.readString(buf), Serializer.readString(buf));
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/serialization/PolymorphicSerializer.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/serialization/PolymorphicSerializer.java
index 25cb32ddc86..1b4bc19acd3 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/serialization/PolymorphicSerializer.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/serialization/PolymorphicSerializer.java
@@ -8,75 +8,73 @@
 import java.util.function.Function;
 
 public class PolymorphicSerializer<ParentType extends SerializableType> {
-  private final Map<Byte, Function<ByteBuffer, ? extends ParentType>> deserializers =
-      new HashMap<>();
-  private final Map<Class<? extends ParentType>, Byte> ids = new HashMap<>();
+    private final Map<Byte, Function<ByteBuffer, ? extends ParentType>> deserializers = new HashMap<>();
+    private final Map<Class<? extends ParentType>, Byte> ids = new HashMap<>();
 
-  @SafeVarargs
-  public PolymorphicSerializer(Class<? extends ParentType>... types) {
-    for (Class<? extends ParentType> type : types) {
-      register(type);
+    @SafeVarargs
+    public PolymorphicSerializer(Class<? extends ParentType>... types) {
+        for (Class<? extends ParentType> type : types) {
+            register(type);
+        }
     }
-  }
 
-  private <T extends ParentType> void register(Class<T> type) {
-    byte id = (byte) (ids.size() + 1);
-    Function<ByteBuffer, T> deserializer = findDeserializer(type);
-    deserializers.put(id, deserializer);
-    ids.put(type, id);
-  }
-
-  private <T extends ParentType> Function<ByteBuffer, T> findDeserializer(Class<T> type) {
-    for (Method method : type.getDeclaredMethods()) {
-      boolean isStatic = (method.getModifiers() & Modifier.STATIC) != 0;
-      Class<?>[] parameterTypes = method.getParameterTypes();
-      if (isStatic
-          && method.getReturnType() == type
-          && parameterTypes.length == 1
-          && parameterTypes[0] == ByteBuffer.class) {
-        return toDeserializer(method);
-      }
+    private <T extends ParentType> void register(Class<T> type) {
+        byte id = (byte) (ids.size() + 1);
+        Function<ByteBuffer, T> deserializer = findDeserializer(type);
+        deserializers.put(id, deserializer);
+        ids.put(type, id);
     }
-    throw new IllegalArgumentException(
-        "Could not find a static method that accepts ByteBuffer and returns "
-            + type.getName()
-            + "in "
-            + type.getName());
-  }
-
-  @SuppressWarnings("unchecked")
-  private <T extends ParentType> Function<ByteBuffer, T> toDeserializer(Method method) {
-    return bb -> {
-      try {
-        return (T) method.invoke(null, bb);
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    };
-  }
 
-  public void serialize(ParentType o, Serializer s) {
-    if (o == null) {
-      s.write(0);
-      return;
+    private <T extends ParentType> Function<ByteBuffer, T> findDeserializer(Class<T> type) {
+        for (Method method : type.getDeclaredMethods()) {
+            boolean isStatic = (method.getModifiers() & Modifier.STATIC) != 0;
+            Class<?>[] parameterTypes = method.getParameterTypes();
+            if (isStatic
+                    && method.getReturnType() == type
+                    && parameterTypes.length == 1
+                    && parameterTypes[0] == ByteBuffer.class) {
+                return toDeserializer(method);
+            }
+        }
+        throw new IllegalArgumentException("Could not find a static method that accepts ByteBuffer and returns "
+                + type.getName()
+                + "in "
+                + type.getName());
     }
-    Byte id = ids.get(o.getClass());
-    if (id == null) {
-      throw new IllegalArgumentException("Unknown type: " + o.getClass().getName());
+
+    @SuppressWarnings("unchecked")
+    private <T extends ParentType> Function<ByteBuffer, T> toDeserializer(Method method) {
+        return bb -> {
+            try {
+                return (T) method.invoke(null, bb);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        };
     }
-    s.write(id);
-    o.serialize(s);
-  }
 
-  public ParentType deserialize(ByteBuffer buffer) {
-    byte id = Serializer.readByte(buffer);
-    if (id == 0) {
-      return null;
+    public void serialize(ParentType o, Serializer s) {
+        if (o == null) {
+            s.write(0);
+            return;
+        }
+        Byte id = ids.get(o.getClass());
+        if (id == null) {
+            throw new IllegalArgumentException("Unknown type: " + o.getClass().getName());
+        }
+        s.write(id);
+        o.serialize(s);
     }
-    Function<ByteBuffer, ? extends ParentType> deserializer = deserializers.get(id);
-    if (deserializer == null) {
-      throw new IllegalArgumentException("Unknown type ID: " + id);
+
+    public ParentType deserialize(ByteBuffer buffer) {
+        byte id = Serializer.readByte(buffer);
+        if (id == 0) {
+            return null;
+        }
+        Function<ByteBuffer, ? extends ParentType> deserializer = deserializers.get(id);
+        if (deserializer == null) {
+            throw new IllegalArgumentException("Unknown type ID: " + id);
+        }
+        return deserializer.apply(buffer);
     }
-    return deserializer.apply(buffer);
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/serialization/SerializableType.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/serialization/SerializableType.java
index bfbb03f07cc..cc4e56e7794 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/serialization/SerializableType.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/serialization/SerializableType.java
@@ -2,5 +2,5 @@
 
 public interface SerializableType {
 
-  void serialize(Serializer s);
+    void serialize(Serializer s);
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/serialization/Serializer.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/serialization/Serializer.java
index 60feee6fd9d..4f48e365217 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/serialization/Serializer.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/serialization/Serializer.java
@@ -17,203 +17,197 @@
 
 public class Serializer {
 
-  private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-  public void write(byte b) {
-    baos.write(b);
-  }
-
-  public void write(boolean b) {
-    baos.write((byte) (b ? 1 : 0));
-  }
-
-  public void write(int i) {
-    baos.write(i >> 24);
-    baos.write(i >> 16);
-    baos.write(i >> 8);
-    baos.write(i);
-  }
-
-  public void write(long l) {
-    baos.write((int) (l >> 56));
-    baos.write((int) (l >> 48));
-    baos.write((int) (l >> 40));
-    baos.write((int) (l >> 32));
-    baos.write((int) (l >> 24));
-    baos.write((int) (l >> 16));
-    baos.write((int) (l >> 8));
-    baos.write((int) l);
-  }
-
-  public void write(String s) {
-    if (s == null) {
-      write(-1);
-      return;
-    }
-    write(s.getBytes(StandardCharsets.UTF_8));
-  }
-
-  public void write(byte[] b) {
-    if (b == null) {
-      write(-1);
-      return;
-    }
-    write(b.length);
-    baos.write(b, 0, b.length);
-  }
-
-  public void write(Collection<String> c) {
-    write(c, Serializer::write);
-  }
-
-  public <T> void write(Collection<T> c, BiConsumer<Serializer, T> elementSerializer) {
-    if (c == null) {
-      write(-1);
-      return;
-    }
-    write(c.size());
-    for (T t : c) {
-      elementSerializer.accept(this, t);
-    }
-  }
-
-  public void write(Map<String, String> m) {
-    write(m, Serializer::write, Serializer::write);
-  }
-
-  public <K, V> void write(
-      Map<K, V> m,
-      BiConsumer<Serializer, K> keySerializer,
-      BiConsumer<Serializer, V> valueSerializer) {
-    if (m == null) {
-      write(-1);
-      return;
-    }
-    write(m.size());
-    for (Map.Entry<K, V> e : m.entrySet()) {
-      keySerializer.accept(this, e.getKey());
-      valueSerializer.accept(this, e.getValue());
-    }
-  }
-
-  public void write(BitSet bitSet) {
-    if (bitSet != null) {
-      write(bitSet.toByteArray());
-    } else {
-      write((byte[]) null);
-    }
-  }
-
-  public int length() {
-    return baos.size();
-  }
-
-  public ByteBuffer flush() {
-    return ByteBuffer.wrap(baos.toByteArray());
-  }
-
-  public void flush(ByteBuffer byteBuffer) {
-    byteBuffer.put(baos.toByteArray());
-  }
-
-  public static byte readByte(ByteBuffer byteBuffer) {
-    return byteBuffer.get();
-  }
-
-  public static boolean readBoolean(ByteBuffer byteBuffer) {
-    byte b = byteBuffer.get();
-    return b == 1;
-  }
-
-  public static int readInt(ByteBuffer byteBuffer) {
-    return byteBuffer.getInt();
-  }
-
-  public static long readLong(ByteBuffer byteBuffer) {
-    return byteBuffer.getLong();
-  }
-
-  public static String readString(ByteBuffer byteBuffer) {
-    byte[] b = readByteArray(byteBuffer);
-    return b != null ? new String(b, StandardCharsets.UTF_8) : null;
-  }
-
-  public static byte[] readByteArray(ByteBuffer byteBuffer) {
-    int length = byteBuffer.getInt();
-    if (length == -1) {
-      return null;
-    }
-    byte[] b = new byte[length];
-    byteBuffer.get(b);
-    return b;
-  }
-
-  public static List<String> readStringList(ByteBuffer byteBuffer) {
-    return readList(byteBuffer, Serializer::readString);
-  }
-
-  public static <T> List<T> readList(
-      ByteBuffer byteBuffer, Function<ByteBuffer, T> elementDeserializer) {
-    int size = byteBuffer.getInt();
-    if (size == -1) {
-      return null;
-    }
-    List<T> c = new ArrayList<>(size);
-    for (int i = 0; i < size; i++) {
-      c.add(elementDeserializer.apply(byteBuffer));
-    }
-    return c;
-  }
-
-  public static <T> Set<T> readSet(
-      ByteBuffer byteBuffer, Function<ByteBuffer, T> elementDeserializer) {
-    List<T> list = readList(byteBuffer, elementDeserializer);
-    return list != null ? new HashSet<>(list) : null;
-  }
-
-  public static Map<String, String> readStringMap(ByteBuffer byteBuffer) {
-    return readMap(byteBuffer, Serializer::readString, Serializer::readString);
-  }
-
-  public static <K, V> Map<K, V> readMap(
-      ByteBuffer byteBuffer,
-      Function<ByteBuffer, K> keyDeserializer,
-      Function<ByteBuffer, V> valueDeserializer) {
-    int size = byteBuffer.getInt();
-    if (size == -1) {
-      return null;
-    }
-    Map<K, V> m = new HashMap<>(size * 4 / 3);
-    return fillMap(byteBuffer, m, keyDeserializer, valueDeserializer, size);
-  }
-
-  public static <K, V> Map<K, V> readMap(
-      ByteBuffer byteBuffer,
-      Supplier<Map<K, V>> mapSupplier,
-      Function<ByteBuffer, K> keyDeserializer,
-      Function<ByteBuffer, V> valueDeserializer) {
-    int size = byteBuffer.getInt();
-    if (size == -1) {
-      return null;
-    }
-    Map<K, V> m = mapSupplier.get();
-    return fillMap(byteBuffer, m, keyDeserializer, valueDeserializer, size);
-  }
-
-  private static <K, V> Map<K, V> fillMap(
-      ByteBuffer byteBuffer,
-      Map<K, V> m,
-      Function<ByteBuffer, K> keyDeserializer,
-      Function<ByteBuffer, V> valueDeserializer,
-      int size) {
-    for (int i = 0; i < size; i++) {
-      m.put(keyDeserializer.apply(byteBuffer), valueDeserializer.apply(byteBuffer));
-    }
-    return m;
-  }
-
-  public static BitSet readBitSet(ByteBuffer byteBuffer) {
-    byte[] bytes = readByteArray(byteBuffer);
-    return bytes != null ? BitSet.valueOf(bytes) : null;
-  }
+    private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+    public void write(byte b) {
+        baos.write(b);
+    }
+
+    public void write(boolean b) {
+        baos.write((byte) (b ? 1 : 0));
+    }
+
+    public void write(int i) {
+        baos.write(i >> 24);
+        baos.write(i >> 16);
+        baos.write(i >> 8);
+        baos.write(i);
+    }
+
+    public void write(long l) {
+        baos.write((int) (l >> 56));
+        baos.write((int) (l >> 48));
+        baos.write((int) (l >> 40));
+        baos.write((int) (l >> 32));
+        baos.write((int) (l >> 24));
+        baos.write((int) (l >> 16));
+        baos.write((int) (l >> 8));
+        baos.write((int) l);
+    }
+
+    public void write(String s) {
+        if (s == null) {
+            write(-1);
+            return;
+        }
+        write(s.getBytes(StandardCharsets.UTF_8));
+    }
+
+    public void write(byte[] b) {
+        if (b == null) {
+            write(-1);
+            return;
+        }
+        write(b.length);
+        baos.write(b, 0, b.length);
+    }
+
+    public void write(Collection<String> c) {
+        write(c, Serializer::write);
+    }
+
+    public <T> void write(Collection<T> c, BiConsumer<Serializer, T> elementSerializer) {
+        if (c == null) {
+            write(-1);
+            return;
+        }
+        write(c.size());
+        for (T t : c) {
+            elementSerializer.accept(this, t);
+        }
+    }
+
+    public void write(Map<String, String> m) {
+        write(m, Serializer::write, Serializer::write);
+    }
+
+    public <K, V> void write(
+            Map<K, V> m, BiConsumer<Serializer, K> keySerializer, BiConsumer<Serializer, V> valueSerializer) {
+        if (m == null) {
+            write(-1);
+            return;
+        }
+        write(m.size());
+        for (Map.Entry<K, V> e : m.entrySet()) {
+            keySerializer.accept(this, e.getKey());
+            valueSerializer.accept(this, e.getValue());
+        }
+    }
+
+    public void write(BitSet bitSet) {
+        if (bitSet != null) {
+            write(bitSet.toByteArray());
+        } else {
+            write((byte[]) null);
+        }
+    }
+
+    public int length() {
+        return baos.size();
+    }
+
+    public ByteBuffer flush() {
+        return ByteBuffer.wrap(baos.toByteArray());
+    }
+
+    public void flush(ByteBuffer byteBuffer) {
+        byteBuffer.put(baos.toByteArray());
+    }
+
+    public static byte readByte(ByteBuffer byteBuffer) {
+        return byteBuffer.get();
+    }
+
+    public static boolean readBoolean(ByteBuffer byteBuffer) {
+        byte b = byteBuffer.get();
+        return b == 1;
+    }
+
+    public static int readInt(ByteBuffer byteBuffer) {
+        return byteBuffer.getInt();
+    }
+
+    public static long readLong(ByteBuffer byteBuffer) {
+        return byteBuffer.getLong();
+    }
+
+    public static String readString(ByteBuffer byteBuffer) {
+        byte[] b = readByteArray(byteBuffer);
+        return b != null ? new String(b, StandardCharsets.UTF_8) : null;
+    }
+
+    public static byte[] readByteArray(ByteBuffer byteBuffer) {
+        int length = byteBuffer.getInt();
+        if (length == -1) {
+            return null;
+        }
+        byte[] b = new byte[length];
+        byteBuffer.get(b);
+        return b;
+    }
+
+    public static List<String> readStringList(ByteBuffer byteBuffer) {
+        return readList(byteBuffer, Serializer::readString);
+    }
+
+    public static <T> List<T> readList(ByteBuffer byteBuffer, Function<ByteBuffer, T> elementDeserializer) {
+        int size = byteBuffer.getInt();
+        if (size == -1) {
+            return null;
+        }
+        List<T> c = new ArrayList<>(size);
+        for (int i = 0; i < size; i++) {
+            c.add(elementDeserializer.apply(byteBuffer));
+        }
+        return c;
+    }
+
+    public static <T> Set<T> readSet(ByteBuffer byteBuffer, Function<ByteBuffer, T> elementDeserializer) {
+        List<T> list = readList(byteBuffer, elementDeserializer);
+        return list != null ? new HashSet<>(list) : null;
+    }
+
+    public static Map<String, String> readStringMap(ByteBuffer byteBuffer) {
+        return readMap(byteBuffer, Serializer::readString, Serializer::readString);
+    }
+
+    public static <K, V> Map<K, V> readMap(
+            ByteBuffer byteBuffer, Function<ByteBuffer, K> keyDeserializer, Function<ByteBuffer, V> valueDeserializer) {
+        int size = byteBuffer.getInt();
+        if (size == -1) {
+            return null;
+        }
+        Map<K, V> m = new HashMap<>(size * 4 / 3);
+        return fillMap(byteBuffer, m, keyDeserializer, valueDeserializer, size);
+    }
+
+    public static <K, V> Map<K, V> readMap(
+            ByteBuffer byteBuffer,
+            Supplier<Map<K, V>> mapSupplier,
+            Function<ByteBuffer, K> keyDeserializer,
+            Function<ByteBuffer, V> valueDeserializer) {
+        int size = byteBuffer.getInt();
+        if (size == -1) {
+            return null;
+        }
+        Map<K, V> m = mapSupplier.get();
+        return fillMap(byteBuffer, m, keyDeserializer, valueDeserializer, size);
+    }
+
+    private static <K, V> Map<K, V> fillMap(
+            ByteBuffer byteBuffer,
+            Map<K, V> m,
+            Function<ByteBuffer, K> keyDeserializer,
+            Function<ByteBuffer, V> valueDeserializer,
+            int size) {
+        for (int i = 0; i < size; i++) {
+            m.put(keyDeserializer.apply(byteBuffer), valueDeserializer.apply(byteBuffer));
+        }
+        return m;
+    }
+
+    public static BitSet readBitSet(ByteBuffer byteBuffer) {
+        byte[] bytes = readByteArray(byteBuffer);
+        return bytes != null ? BitSet.valueOf(bytes) : null;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortLinesResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortLinesResolver.java
index fe63ea3b578..351584c07f1 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortLinesResolver.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortLinesResolver.java
@@ -5,33 +5,33 @@
 
 public class BestEffortLinesResolver implements LinesResolver {
 
-  private final LinesResolver[] delegates;
+    private final LinesResolver[] delegates;
 
-  public BestEffortLinesResolver(LinesResolver... delegates) {
-    this.delegates = delegates;
-  }
+    public BestEffortLinesResolver(LinesResolver... delegates) {
+        this.delegates = delegates;
+    }
 
-  @Nonnull
-  @Override
-  public Lines getMethodLines(@Nonnull Method method) {
-    for (LinesResolver delegate : delegates) {
-      Lines lines = delegate.getMethodLines(method);
-      if (lines.isValid()) {
-        return lines;
-      }
+    @Nonnull
+    @Override
+    public Lines getMethodLines(@Nonnull Method method) {
+        for (LinesResolver delegate : delegates) {
+            Lines lines = delegate.getMethodLines(method);
+            if (lines.isValid()) {
+                return lines;
+            }
+        }
+        return Lines.EMPTY;
     }
-    return Lines.EMPTY;
-  }
 
-  @Nonnull
-  @Override
-  public Lines getClassLines(@Nonnull Class<?> clazz) {
-    for (LinesResolver delegate : delegates) {
-      Lines lines = delegate.getClassLines(clazz);
-      if (lines.isValid()) {
-        return lines;
-      }
+    @Nonnull
+    @Override
+    public Lines getClassLines(@Nonnull Class<?> clazz) {
+        for (LinesResolver delegate : delegates) {
+            Lines lines = delegate.getClassLines(clazz);
+            if (lines.isValid()) {
+                return lines;
+            }
+        }
+        return Lines.EMPTY;
     }
-    return Lines.EMPTY;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortSourcePathResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortSourcePathResolver.java
index 814104cc3a9..f33cd881c16 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortSourcePathResolver.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortSourcePathResolver.java
@@ -7,31 +7,31 @@
 
 public class BestEffortSourcePathResolver implements SourcePathResolver {
 
-  private final SourcePathResolver[] delegates;
+    private final SourcePathResolver[] delegates;
 
-  public BestEffortSourcePathResolver(SourcePathResolver... delegates) {
-    this.delegates = delegates;
-  }
+    public BestEffortSourcePathResolver(SourcePathResolver... delegates) {
+        this.delegates = delegates;
+    }
 
-  @Override
-  public Collection<String> getSourcePaths(@Nonnull Class<?> c) {
-    for (SourcePathResolver delegate : delegates) {
-      Collection<String> sourcePaths = delegate.getSourcePaths(c);
-      if (!sourcePaths.isEmpty()) {
-        return sourcePaths;
-      }
+    @Override
+    public Collection<String> getSourcePaths(@Nonnull Class<?> c) {
+        for (SourcePathResolver delegate : delegates) {
+            Collection<String> sourcePaths = delegate.getSourcePaths(c);
+            if (!sourcePaths.isEmpty()) {
+                return sourcePaths;
+            }
+        }
+        return Collections.emptyList();
     }
-    return Collections.emptyList();
-  }
 
-  @Override
-  public Collection<String> getResourcePaths(@Nullable String relativePath) {
-    for (SourcePathResolver delegate : delegates) {
-      Collection<String> resourcePath = delegate.getResourcePaths(relativePath);
-      if (!resourcePath.isEmpty()) {
-        return resourcePath;
-      }
+    @Override
+    public Collection<String> getResourcePaths(@Nullable String relativePath) {
+        for (SourcePathResolver delegate : delegates) {
+            Collection<String> resourcePath = delegate.getResourcePaths(relativePath);
+            if (!resourcePath.isEmpty()) {
+                return resourcePath;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/ByteCodeLinesResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/ByteCodeLinesResolver.java
index cb014802fe5..c5e20ceec38 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/ByteCodeLinesResolver.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/ByteCodeLinesResolver.java
@@ -18,115 +18,114 @@
 
 public class ByteCodeLinesResolver implements LinesResolver {
 
-  private static final Logger log = LoggerFactory.getLogger(ByteCodeLinesResolver.class);
-
-  private final DDCache<Class<?>, ClassMethodLines> methodLinesCache =
-      DDCaches.newFixedSizeIdentityCache(16);
-
-  @Nonnull
-  @Override
-  public Lines getMethodLines(@Nonnull Method method) {
-    try {
-      ClassMethodLines classMethodLines =
-          methodLinesCache.computeIfAbsent(method.getDeclaringClass(), ClassMethodLines::parse);
-      return classMethodLines.get(method);
-
-    } catch (Exception e) {
-      log.error("Could not determine method borders for {}", method, e);
-      return Lines.EMPTY;
-    }
-  }
-
-  @Nonnull
-  @Override
-  public Lines getClassLines(@Nonnull Class<?> clazz) {
-    return Lines.EMPTY;
-  }
+    private static final Logger log = LoggerFactory.getLogger(ByteCodeLinesResolver.class);
 
-  static final class ClassMethodLines {
-    private final Map<String, MethodLinesRecorder> recordersByMethodFingerprint = new HashMap<>();
+    private final DDCache<Class<?>, ClassMethodLines> methodLinesCache = DDCaches.newFixedSizeIdentityCache(16);
 
-    public MethodLinesRecorder createRecorder(String methodFingerprint) {
-      MethodLinesRecorder recorder = new MethodLinesRecorder();
-      recordersByMethodFingerprint.put(methodFingerprint, recorder);
-      return recorder;
+    @Nonnull
+    @Override
+    public Lines getMethodLines(@Nonnull Method method) {
+        try {
+            ClassMethodLines classMethodLines =
+                    methodLinesCache.computeIfAbsent(method.getDeclaringClass(), ClassMethodLines::parse);
+            return classMethodLines.get(method);
+
+        } catch (Exception e) {
+            log.error("Could not determine method borders for {}", method, e);
+            return Lines.EMPTY;
+        }
     }
 
-    public Lines get(Method method) {
-      String methodFingerprint = getFingerprint(method);
-      MethodLinesRecorder methodLinesRecorder = recordersByMethodFingerprint.get(methodFingerprint);
-      if (methodLinesRecorder != null) {
-        return new Lines(methodLinesRecorder.startLineNumber, methodLinesRecorder.finishLineNumber);
-      } else {
+    @Nonnull
+    @Override
+    public Lines getClassLines(@Nonnull Class<?> clazz) {
         return Lines.EMPTY;
-      }
     }
 
-    public static ClassMethodLines parse(Class<?> clazz) {
-      try {
-        ClassMethodLines classMethodLines = new ClassMethodLines();
-        try (InputStream classStream = Utils.getClassStream(clazz)) {
-          if (classStream == null) {
-            // Cached below via computeIfAbsent, as a permanent empty result for this class.
-            // That's correct for the case this guards against -- a generated/proxy class that
-            // will never have a bytecode resource -- but ClassLoader#getResourceAsStream also
-            // swallows IOException and returns null, so in principle a transient failure (I/O
-            // error, OOM while reading the class bytes) could hit this same branch and get
-            // pinned as a permanent negative. Not handling that here; flagging it for whoever
-            // next touches this if transient-failure caching turns out to matter in practice.
-            log.debug("Could not get input stream for class {}", clazz.getName());
-            return classMethodLines;
-          }
-          ClassReader classReader = new ClassReader(classStream);
-          MethodLocator methodLocator = new MethodLocator(classMethodLines);
-          classReader.accept(methodLocator, ClassReader.SKIP_FRAMES);
+    static final class ClassMethodLines {
+        private final Map<String, MethodLinesRecorder> recordersByMethodFingerprint = new HashMap<>();
+
+        public MethodLinesRecorder createRecorder(String methodFingerprint) {
+            MethodLinesRecorder recorder = new MethodLinesRecorder();
+            recordersByMethodFingerprint.put(methodFingerprint, recorder);
+            return recorder;
         }
-        return classMethodLines;
 
-      } catch (Exception e) {
-        // do not cache failure
-        throw new RuntimeException(e);
-      }
-    }
+        public Lines get(Method method) {
+            String methodFingerprint = getFingerprint(method);
+            MethodLinesRecorder methodLinesRecorder = recordersByMethodFingerprint.get(methodFingerprint);
+            if (methodLinesRecorder != null) {
+                return new Lines(methodLinesRecorder.startLineNumber, methodLinesRecorder.finishLineNumber);
+            } else {
+                return Lines.EMPTY;
+            }
+        }
 
-    public static String getFingerprint(Method method) {
-      String methodName = method.getName();
-      String methodDescriptor = Type.getMethodDescriptor(method);
-      return getFingerprint(methodName, methodDescriptor);
-    }
+        public static ClassMethodLines parse(Class<?> clazz) {
+            try {
+                ClassMethodLines classMethodLines = new ClassMethodLines();
+                try (InputStream classStream = Utils.getClassStream(clazz)) {
+                    if (classStream == null) {
+                        // Cached below via computeIfAbsent, as a permanent empty result for this class.
+                        // That's correct for the case this guards against -- a generated/proxy class that
+                        // will never have a bytecode resource -- but ClassLoader#getResourceAsStream also
+                        // swallows IOException and returns null, so in principle a transient failure (I/O
+                        // error, OOM while reading the class bytes) could hit this same branch and get
+                        // pinned as a permanent negative. Not handling that here; flagging it for whoever
+                        // next touches this if transient-failure caching turns out to matter in practice.
+                        log.debug("Could not get input stream for class {}", clazz.getName());
+                        return classMethodLines;
+                    }
+                    ClassReader classReader = new ClassReader(classStream);
+                    MethodLocator methodLocator = new MethodLocator(classMethodLines);
+                    classReader.accept(methodLocator, ClassReader.SKIP_FRAMES);
+                }
+                return classMethodLines;
+
+            } catch (Exception e) {
+                // do not cache failure
+                throw new RuntimeException(e);
+            }
+        }
 
-    public static String getFingerprint(String methodName, String methodDescriptor) {
-      return methodName + ';' + methodDescriptor;
+        public static String getFingerprint(Method method) {
+            String methodName = method.getName();
+            String methodDescriptor = Type.getMethodDescriptor(method);
+            return getFingerprint(methodName, methodDescriptor);
+        }
+
+        public static String getFingerprint(String methodName, String methodDescriptor) {
+            return methodName + ';' + methodDescriptor;
+        }
     }
-  }
 
-  private static class MethodLocator extends ClassVisitor {
-    private final ClassMethodLines classMethodLines;
+    private static class MethodLocator extends ClassVisitor {
+        private final ClassMethodLines classMethodLines;
 
-    MethodLocator(ClassMethodLines classMethodLines) {
-      super(Opcodes.ASM9);
-      this.classMethodLines = classMethodLines;
-    }
+        MethodLocator(ClassMethodLines classMethodLines) {
+            super(Opcodes.ASM9);
+            this.classMethodLines = classMethodLines;
+        }
 
-    @Override
-    public MethodVisitor visitMethod(
-        int access, String name, String descriptor, String signature, String[] exceptions) {
-      return classMethodLines.createRecorder(ClassMethodLines.getFingerprint(name, descriptor));
+        @Override
+        public MethodVisitor visitMethod(
+                int access, String name, String descriptor, String signature, String[] exceptions) {
+            return classMethodLines.createRecorder(ClassMethodLines.getFingerprint(name, descriptor));
+        }
     }
-  }
 
-  private static class MethodLinesRecorder extends MethodVisitor {
-    private int startLineNumber = Integer.MAX_VALUE;
-    private int finishLineNumber = Integer.MIN_VALUE;
+    private static class MethodLinesRecorder extends MethodVisitor {
+        private int startLineNumber = Integer.MAX_VALUE;
+        private int finishLineNumber = Integer.MIN_VALUE;
 
-    MethodLinesRecorder() {
-      super(Opcodes.ASM9);
-    }
+        MethodLinesRecorder() {
+            super(Opcodes.ASM9);
+        }
 
-    @Override
-    public void visitLineNumber(int line, Label start) {
-      startLineNumber = Math.min(startLineNumber, line);
-      finishLineNumber = Math.max(finishLineNumber, line);
+        @Override
+        public void visitLineNumber(int line, Label start) {
+            startLineNumber = Math.min(startLineNumber, line);
+            finishLineNumber = Math.max(finishLineNumber, line);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedLinesResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedLinesResolver.java
index 16f50ca982e..430106d3d19 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedLinesResolver.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedLinesResolver.java
@@ -5,31 +5,31 @@
 import javax.annotation.Nonnull;
 
 public class CompilerAidedLinesResolver implements LinesResolver {
-  @Nonnull
-  @Override
-  public Lines getMethodLines(@Nonnull Method method) {
-    int startLine = CompilerUtils.getStartLine(method);
-    if (startLine <= 0) {
-      return Lines.EMPTY;
+    @Nonnull
+    @Override
+    public Lines getMethodLines(@Nonnull Method method) {
+        int startLine = CompilerUtils.getStartLine(method);
+        if (startLine <= 0) {
+            return Lines.EMPTY;
+        }
+        int endLine = CompilerUtils.getEndLine(method);
+        if (endLine <= 0) {
+            return Lines.EMPTY;
+        }
+        return new Lines(startLine, endLine);
     }
-    int endLine = CompilerUtils.getEndLine(method);
-    if (endLine <= 0) {
-      return Lines.EMPTY;
-    }
-    return new Lines(startLine, endLine);
-  }
 
-  @Nonnull
-  @Override
-  public Lines getClassLines(@Nonnull Class<?> clazz) {
-    int startLine = CompilerUtils.getStartLine(clazz);
-    if (startLine <= 0) {
-      return Lines.EMPTY;
-    }
-    int endLine = CompilerUtils.getEndLine(clazz);
-    if (endLine <= 0) {
-      return Lines.EMPTY;
+    @Nonnull
+    @Override
+    public Lines getClassLines(@Nonnull Class<?> clazz) {
+        int startLine = CompilerUtils.getStartLine(clazz);
+        if (startLine <= 0) {
+            return Lines.EMPTY;
+        }
+        int endLine = CompilerUtils.getEndLine(clazz);
+        if (endLine <= 0) {
+            return Lines.EMPTY;
+        }
+        return new Lines(startLine, endLine);
     }
-    return new Lines(startLine, endLine);
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedSourcePathResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedSourcePathResolver.java
index 35cef73d1d6..34484778ee7 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedSourcePathResolver.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedSourcePathResolver.java
@@ -9,25 +9,25 @@
 
 public class CompilerAidedSourcePathResolver implements SourcePathResolver {
 
-  private final String repoRoot;
+    private final String repoRoot;
 
-  public CompilerAidedSourcePathResolver(String repoRoot) {
-    this.repoRoot = repoRoot.endsWith(File.separator) ? repoRoot : repoRoot + File.separator;
-  }
+    public CompilerAidedSourcePathResolver(String repoRoot) {
+        this.repoRoot = repoRoot.endsWith(File.separator) ? repoRoot : repoRoot + File.separator;
+    }
 
-  @Nonnull
-  @Override
-  public Collection<String> getSourcePaths(@Nonnull Class<?> c) {
-    String absoluteSourcePath = CompilerUtils.getSourcePath(c);
-    if (absoluteSourcePath != null && absoluteSourcePath.startsWith(repoRoot)) {
-      return Collections.singletonList(absoluteSourcePath.substring(repoRoot.length()));
-    } else {
-      return Collections.emptyList();
+    @Nonnull
+    @Override
+    public Collection<String> getSourcePaths(@Nonnull Class<?> c) {
+        String absoluteSourcePath = CompilerUtils.getSourcePath(c);
+        if (absoluteSourcePath != null && absoluteSourcePath.startsWith(repoRoot)) {
+            return Collections.singletonList(absoluteSourcePath.substring(repoRoot.length()));
+        } else {
+            return Collections.emptyList();
+        }
     }
-  }
 
-  @Override
-  public @Nullable Collection<String> getResourcePaths(String relativePath) {
-    return Collections.emptyList();
-  }
+    @Override
+    public @Nullable Collection<String> getResourcePaths(String relativePath) {
+        return Collections.emptyList();
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/LinesResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/LinesResolver.java
index 25999afc891..9498d31a830 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/LinesResolver.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/LinesResolver.java
@@ -6,50 +6,50 @@
 
 public interface LinesResolver {
 
-  @Nonnull
-  Lines getMethodLines(@Nonnull Method method);
-
-  @Nonnull
-  Lines getClassLines(@Nonnull Class<?> clazz);
-
-  final class Lines {
-    public static final Lines EMPTY = new Lines(Integer.MAX_VALUE, Integer.MIN_VALUE);
-
-    private final int startLineNumber;
-    private final int endLineNumber;
-
-    public Lines(int startLineNumber, int endLineNumber) {
-      this.startLineNumber = startLineNumber;
-      this.endLineNumber = endLineNumber;
-    }
-
-    public int getStartLineNumber() {
-      return startLineNumber;
-    }
-
-    public int getEndLineNumber() {
-      return endLineNumber;
-    }
-
-    public boolean isValid() {
-      return startLineNumber <= endLineNumber;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) {
-        return true;
-      }
-      if (o == null || getClass() != o.getClass()) {
-        return false;
-      }
-      Lines that = (Lines) o;
-      return startLineNumber == that.startLineNumber && endLineNumber == that.endLineNumber;
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(startLineNumber, endLineNumber);
+    @Nonnull
+    Lines getMethodLines(@Nonnull Method method);
+
+    @Nonnull
+    Lines getClassLines(@Nonnull Class<?> clazz);
+
+    final class Lines {
+        public static final Lines EMPTY = new Lines(Integer.MAX_VALUE, Integer.MIN_VALUE);
+
+        private final int startLineNumber;
+        private final int endLineNumber;
+
+        public Lines(int startLineNumber, int endLineNumber) {
+            this.startLineNumber = startLineNumber;
+            this.endLineNumber = endLineNumber;
+        }
+
+        public int getStartLineNumber() {
+            return startLineNumber;
+        }
+
+        public int getEndLineNumber() {
+            return endLineNumber;
+        }
+
+        public boolean isValid() {
+            return startLineNumber <= endLineNumber;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            Lines that = (Lines) o;
+            return startLineNumber == that.startLineNumber && endLineNumber == that.endLineNumber;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(startLineNumber, endLineNumber);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/NoOpSourcePathResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/NoOpSourcePathResolver.java
index fb77c9cd87f..6811760f8ae 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/NoOpSourcePathResolver.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/NoOpSourcePathResolver.java
@@ -7,15 +7,15 @@
 
 public class NoOpSourcePathResolver implements SourcePathResolver {
 
-  public static final SourcePathResolver INSTANCE = new NoOpSourcePathResolver();
+    public static final SourcePathResolver INSTANCE = new NoOpSourcePathResolver();
 
-  @Override
-  public Collection<String> getSourcePaths(@Nonnull Class<?> c) {
-    return Collections.emptyList();
-  }
+    @Override
+    public Collection<String> getSourcePaths(@Nonnull Class<?> c) {
+        return Collections.emptyList();
+    }
 
-  @Override
-  public Collection<String> getResourcePaths(@Nullable String relativePath) {
-    return Collections.emptyList();
-  }
+    @Override
+    public Collection<String> getResourcePaths(@Nullable String relativePath) {
+        return Collections.emptyList();
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/SourcePathResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/SourcePathResolver.java
index e12705ba6b5..bd5da344f48 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/SourcePathResolver.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/SourcePathResolver.java
@@ -6,16 +6,16 @@
 
 public interface SourcePathResolver {
 
-  /**
-   * @return paths to the source files corresponding to the provided class, relative to repository
-   *     root. Returns all candidate paths when multiple matches exist (e.g. duplicate trie keys in
-   *     repo index approach). Empty collection is returned if no paths could be resolved.
-   */
-  Collection<String> getSourcePaths(@Nonnull Class<?> c);
+    /**
+     * @return paths to the source files corresponding to the provided class, relative to repository
+     *     root. Returns all candidate paths when multiple matches exist (e.g. duplicate trie keys in
+     *     repo index approach). Empty collection is returned if no paths could be resolved.
+     */
+    Collection<String> getSourcePaths(@Nonnull Class<?> c);
 
-  /**
-   * @param relativePath Path to a resource in current run's repository, relative to a resource root
-   * @return Candidate paths relative to repository root
-   */
-  Collection<String> getResourcePaths(@Nullable String relativePath);
+    /**
+     * @param relativePath Path to a resource in current run's repository, relative to a resource root
+     * @return Candidate paths relative to repository root
+     */
+    Collection<String> getResourcePaths(@Nullable String relativePath);
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/Utils.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/Utils.java
index a4423f727d5..52a58d10cbd 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/Utils.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/Utils.java
@@ -13,74 +13,74 @@
 
 public abstract class Utils {
 
-  private static final Logger log = LoggerFactory.getLogger(Utils.class);
+    private static final Logger log = LoggerFactory.getLogger(Utils.class);
 
-  @Nullable
-  public static InputStream getClassStream(@Nonnull Class<?> clazz) {
-    String className = clazz.getName();
-    InputStream classStream = clazz.getResourceAsStream(toResourceName(className));
-    if (classStream != null) {
-      return classStream;
-    } else {
-      // might be auto-generated inner class (e.g. Mockito mock)
-      String topLevelClassName = stripNestedClassNames(clazz.getName());
-      return clazz.getResourceAsStream(toResourceName(topLevelClassName));
+    @Nullable
+    public static InputStream getClassStream(@Nonnull Class<?> clazz) {
+        String className = clazz.getName();
+        InputStream classStream = clazz.getResourceAsStream(toResourceName(className));
+        if (classStream != null) {
+            return classStream;
+        } else {
+            // might be auto-generated inner class (e.g. Mockito mock)
+            String topLevelClassName = stripNestedClassNames(clazz.getName());
+            return clazz.getResourceAsStream(toResourceName(topLevelClassName));
+        }
     }
-  }
 
-  @Nullable
-  public static String getFileName(@Nonnull Class<?> clazz) throws IOException {
-    try (InputStream classStream = Utils.getClassStream(clazz)) {
-      if (classStream == null) {
-        log.debug("Could not get input stream for class {}", clazz.getName());
-        return null;
-      }
+    @Nullable
+    public static String getFileName(@Nonnull Class<?> clazz) throws IOException {
+        try (InputStream classStream = Utils.getClassStream(clazz)) {
+            if (classStream == null) {
+                log.debug("Could not get input stream for class {}", clazz.getName());
+                return null;
+            }
 
-      ClassReader classReader = new ClassReader(classStream);
-      SourceFileAttributeVisitor visitor = new SourceFileAttributeVisitor();
-      classReader.accept(visitor, ClassReader.SKIP_CODE | ClassReader.SKIP_FRAMES);
-      return visitor.getSource();
+            ClassReader classReader = new ClassReader(classStream);
+            SourceFileAttributeVisitor visitor = new SourceFileAttributeVisitor();
+            classReader.accept(visitor, ClassReader.SKIP_CODE | ClassReader.SKIP_FRAMES);
+            return visitor.getSource();
+        }
     }
-  }
 
-  private static final class SourceFileAttributeVisitor extends ClassVisitor {
-    private String source;
+    private static final class SourceFileAttributeVisitor extends ClassVisitor {
+        private String source;
 
-    SourceFileAttributeVisitor() {
-      super(Opcodes.ASM9);
-    }
+        SourceFileAttributeVisitor() {
+            super(Opcodes.ASM9);
+        }
 
-    @Override
-    public void visitSource(String source, String debug) {
-      this.source = source;
-    }
+        @Override
+        public void visitSource(String source, String debug) {
+            this.source = source;
+        }
 
-    public String getSource() {
-      return source;
+        public String getSource() {
+            return source;
+        }
     }
-  }
 
-  private static String toResourceName(String className) {
-    return "/" + className.replace('.', '/') + ".class";
-  }
+    private static String toResourceName(String className) {
+        return "/" + className.replace('.', '/') + ".class";
+    }
 
-  @Nonnull
-  public static String stripNestedClassNames(@Nonnull String className) {
-    int innerClassNameIdx = className.indexOf('$');
-    if (innerClassNameIdx >= 0) {
-      return className.substring(0, innerClassNameIdx);
-    } else {
-      return className;
+    @Nonnull
+    public static String stripNestedClassNames(@Nonnull String className) {
+        int innerClassNameIdx = className.indexOf('$');
+        if (innerClassNameIdx >= 0) {
+            return className.substring(0, innerClassNameIdx);
+        } else {
+            return className;
+        }
     }
-  }
 
-  @Nonnull
-  public static String toTrieKey(@Nonnull String relativePath) {
-    return stripExtension(relativePath).replace(File.separatorChar, '.');
-  }
+    @Nonnull
+    public static String toTrieKey(@Nonnull String relativePath) {
+        return stripExtension(relativePath).replace(File.separatorChar, '.');
+    }
 
-  @Nonnull
-  public static String stripExtension(@Nonnull String fileName) {
-    return fileName.substring(0, fileName.lastIndexOf('.'));
-  }
+    @Nonnull
+    public static String stripExtension(@Nonnull String fileName) {
+        return fileName.substring(0, fileName.lastIndexOf('.'));
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/CachingRepoIndexBuilderFactory.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/CachingRepoIndexBuilderFactory.java
index 152422f6efe..a4843801fc6 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/CachingRepoIndexBuilderFactory.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/CachingRepoIndexBuilderFactory.java
@@ -8,32 +8,29 @@
 
 public class CachingRepoIndexBuilderFactory implements RepoIndexProvider.Factory {
 
-  private final DDCache<String, RepoIndexProvider> cache = DDCaches.newFixedSizeCache(8);
-  private final Config config;
-  private final PackageResolver packageResolver;
-  private final ResourceResolver resourceResolver;
-  private final FileSystem fileSystem;
+    private final DDCache<String, RepoIndexProvider> cache = DDCaches.newFixedSizeCache(8);
+    private final Config config;
+    private final PackageResolver packageResolver;
+    private final ResourceResolver resourceResolver;
+    private final FileSystem fileSystem;
 
-  public CachingRepoIndexBuilderFactory(
-      Config config,
-      PackageResolver packageResolver,
-      ResourceResolver resourceResolver,
-      FileSystem fileSystem) {
-    this.config = config;
-    this.packageResolver = packageResolver;
-    this.resourceResolver = resourceResolver;
-    this.fileSystem = fileSystem;
-  }
+    public CachingRepoIndexBuilderFactory(
+            Config config, PackageResolver packageResolver, ResourceResolver resourceResolver, FileSystem fileSystem) {
+        this.config = config;
+        this.packageResolver = packageResolver;
+        this.resourceResolver = resourceResolver;
+        this.fileSystem = fileSystem;
+    }
 
-  @Override
-  public RepoIndexProvider create(@Nullable String repoRoot) {
-    if (repoRoot == null) {
-      return () -> RepoIndex.EMPTY;
+    @Override
+    public RepoIndexProvider create(@Nullable String repoRoot) {
+        if (repoRoot == null) {
+            return () -> RepoIndex.EMPTY;
+        }
+        return cache.computeIfAbsent(repoRoot, this::doCreate);
     }
-    return cache.computeIfAbsent(repoRoot, this::doCreate);
-  }
 
-  private RepoIndexProvider doCreate(String repoRoot) {
-    return new RepoIndexBuilder(config, repoRoot, packageResolver, resourceResolver, fileSystem);
-  }
+    private RepoIndexProvider doCreate(String repoRoot) {
+        return new RepoIndexBuilder(config, repoRoot, packageResolver, resourceResolver, fileSystem);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/ConventionBasedResourceResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/ConventionBasedResourceResolver.java
index 03143db4af5..ed9f387184a 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/ConventionBasedResourceResolver.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/ConventionBasedResourceResolver.java
@@ -6,35 +6,35 @@
 
 public class ConventionBasedResourceResolver implements ResourceResolver {
 
-  private final FileSystem fileSystem;
-  private final List<String> resourceFolderNames;
+    private final FileSystem fileSystem;
+    private final List<String> resourceFolderNames;
 
-  public ConventionBasedResourceResolver(FileSystem fileSystem, List<String> resourceFolderNames) {
-    this.fileSystem = fileSystem;
-    this.resourceFolderNames = resourceFolderNames;
-  }
+    public ConventionBasedResourceResolver(FileSystem fileSystem, List<String> resourceFolderNames) {
+        this.fileSystem = fileSystem;
+        this.resourceFolderNames = resourceFolderNames;
+    }
 
-  /**
-   * Given absolute path to a resource file, returns resource root - the enclosing folder that is
-   * considered as a resource folder by the project's build system. Resource folder is a folder
-   * containing non-code resources that are copied to a target/build folder during the project's
-   * build.
-   *
-   * <p>The implementation of this method is very naive: it examines the resource's path looking for
-   * segments that match conventional resource folder names ("resources/", "java/", etc.).
-   *
-   * @param resourceFile Absolute path to a resource file
-   * @return Resource root
-   */
-  @Override
-  public Path getResourceRoot(Path resourceFile) {
-    String pathAsString = resourceFile.toString();
-    for (String resourceFolderName : resourceFolderNames) {
-      int idx = pathAsString.indexOf(resourceFolderName);
-      if (idx >= 0) {
-        return fileSystem.getPath(pathAsString.substring(0, idx + resourceFolderName.length()));
-      }
+    /**
+     * Given absolute path to a resource file, returns resource root - the enclosing folder that is
+     * considered as a resource folder by the project's build system. Resource folder is a folder
+     * containing non-code resources that are copied to a target/build folder during the project's
+     * build.
+     *
+     * <p>The implementation of this method is very naive: it examines the resource's path looking for
+     * segments that match conventional resource folder names ("resources/", "java/", etc.).
+     *
+     * @param resourceFile Absolute path to a resource file
+     * @return Resource root
+     */
+    @Override
+    public Path getResourceRoot(Path resourceFile) {
+        String pathAsString = resourceFile.toString();
+        for (String resourceFolderName : resourceFolderNames) {
+            int idx = pathAsString.indexOf(resourceFolderName);
+            if (idx >= 0) {
+                return fileSystem.getPath(pathAsString.substring(0, idx + resourceFolderName.length()));
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/LanguageDetector.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/LanguageDetector.java
index 58a9ac71364..cdb39513357 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/LanguageDetector.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/LanguageDetector.java
@@ -11,45 +11,45 @@
 
 class LanguageDetector {
 
-  private static final Logger log = LoggerFactory.getLogger(LanguageDetector.class);
-
-  @Nullable
-  public Language detect(@Nonnull Class<?> clazz) {
-    Class<?> c = clazz;
-    while (c != null) {
-      Class<?>[] interfaces = c.getInterfaces();
-      for (Class<?> anInterface : interfaces) {
-        String interfaceName = anInterface.getName();
-        if ("groovy.lang.GroovyObject".equals(interfaceName)) {
-          return Language.GROOVY;
+    private static final Logger log = LoggerFactory.getLogger(LanguageDetector.class);
+
+    @Nullable
+    public Language detect(@Nonnull Class<?> clazz) {
+        Class<?> c = clazz;
+        while (c != null) {
+            Class<?>[] interfaces = c.getInterfaces();
+            for (Class<?> anInterface : interfaces) {
+                String interfaceName = anInterface.getName();
+                if ("groovy.lang.GroovyObject".equals(interfaceName)) {
+                    return Language.GROOVY;
+                }
+            }
+
+            Annotation[] annotations = c.getAnnotations();
+            for (Annotation annotation : annotations) {
+                Class<? extends Annotation> annotationType = annotation.annotationType();
+                if ("kotlin.Metadata".equals(annotationType.getName())) {
+                    return Language.KOTLIN;
+                }
+                if ("scala.reflect.ScalaSignature".equals(annotationType.getName())) {
+                    return Language.SCALA;
+                }
+            }
+
+            c = c.getSuperclass();
         }
-      }
 
-      Annotation[] annotations = c.getAnnotations();
-      for (Annotation annotation : annotations) {
-        Class<? extends Annotation> annotationType = annotation.annotationType();
-        if ("kotlin.Metadata".equals(annotationType.getName())) {
-          return Language.KOTLIN;
+        try {
+            // try to parse the class file to see if it contains filename attribute
+            String fileName = Utils.getFileName(clazz);
+            if (fileName != null) {
+                return Language.getByFileName(fileName);
+            }
+        } catch (IOException e) {
+            log.debug("Error while trying to read filename from class {}", clazz.getName(), e);
         }
-        if ("scala.reflect.ScalaSignature".equals(annotationType.getName())) {
-          return Language.SCALA;
-        }
-      }
-
-      c = c.getSuperclass();
-    }
 
-    try {
-      // try to parse the class file to see if it contains filename attribute
-      String fileName = Utils.getFileName(clazz);
-      if (fileName != null) {
-        return Language.getByFileName(fileName);
-      }
-    } catch (IOException e) {
-      log.debug("Error while trying to read filename from class {}", clazz.getName(), e);
+        // assuming Java
+        return Language.JAVA;
     }
-
-    // assuming Java
-    return Language.JAVA;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/PackageResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/PackageResolver.java
index f8e239dfc04..46fc53c82ae 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/PackageResolver.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/PackageResolver.java
@@ -5,9 +5,9 @@
 import javax.annotation.Nullable;
 
 public interface PackageResolver {
-  /**
-   * @return the package path or <code>null</code> if the file is in the default package
-   */
-  @Nullable
-  Path getPackage(Path sourceFile) throws IOException;
+    /**
+     * @return the package path or <code>null</code> if the file is in the default package
+     */
+    @Nullable
+    Path getPackage(Path sourceFile) throws IOException;
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/PackageResolverImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/PackageResolverImpl.java
index c03203a09d8..a2fa1f9159d 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/PackageResolverImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/PackageResolverImpl.java
@@ -14,77 +14,76 @@
 
 public class PackageResolverImpl implements PackageResolver {
 
-  private static final Logger log = LoggerFactory.getLogger(PackageResolverImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(PackageResolverImpl.class);
 
-  private static final String PACKAGE_KEYWORD = "package";
-  private final FileSystem fileSystem;
+    private static final String PACKAGE_KEYWORD = "package";
+    private final FileSystem fileSystem;
 
-  public PackageResolverImpl(FileSystem fileSystem) {
-    this.fileSystem = fileSystem;
-  }
+    public PackageResolverImpl(FileSystem fileSystem) {
+        this.fileSystem = fileSystem;
+    }
 
-  /**
-   * Given a path to a source file, returns its package path.
-   *
-   * <p>The implementation of this method is rather naive: it does not actually parse the file, nor
-   * does it build an AST.
-   *
-   * <p>It simply looks for a line, that contains the <code>package</code> keyword and extracts the
-   * part that goes after it and until the nearest <code>;</code> character, then verifies that the
-   * extracted part looks plausible by checking the actual file path.
-   *
-   * @return the package path or <code>null</code> if the file is in the default package
-   */
-  @Nullable
-  @Override
-  public Path getPackage(Path sourceFile) throws IOException {
-    Language language = Language.getByFileName(sourceFile.getFileName().toString());
-    Path folder = sourceFile.getParent();
-    try (BufferedReader br = Files.newBufferedReader(sourceFile)) {
-      String line;
-      while ((line = br.readLine()) != null) {
-        int packageDeclarationStart = line.indexOf(PACKAGE_KEYWORD);
-        if (packageDeclarationStart == -1) {
-          continue;
-        }
+    /**
+     * Given a path to a source file, returns its package path.
+     *
+     * <p>The implementation of this method is rather naive: it does not actually parse the file, nor
+     * does it build an AST.
+     *
+     * <p>It simply looks for a line, that contains the <code>package</code> keyword and extracts the
+     * part that goes after it and until the nearest <code>;</code> character, then verifies that the
+     * extracted part looks plausible by checking the actual file path.
+     *
+     * @return the package path or <code>null</code> if the file is in the default package
+     */
+    @Nullable
+    @Override
+    public Path getPackage(Path sourceFile) throws IOException {
+        Language language = Language.getByFileName(sourceFile.getFileName().toString());
+        Path folder = sourceFile.getParent();
+        try (BufferedReader br = Files.newBufferedReader(sourceFile)) {
+            String line;
+            while ((line = br.readLine()) != null) {
+                int packageDeclarationStart = line.indexOf(PACKAGE_KEYWORD);
+                if (packageDeclarationStart == -1) {
+                    continue;
+                }
 
-        int charAfterPackageKeyword = packageDeclarationStart + PACKAGE_KEYWORD.length();
-        if (charAfterPackageKeyword >= line.length()
-            || !Character.isWhitespace(line.charAt(charAfterPackageKeyword))) {
-          // "package" keyword is not followed by a whitespace
-          continue;
-        }
+                int charAfterPackageKeyword = packageDeclarationStart + PACKAGE_KEYWORD.length();
+                if (charAfterPackageKeyword >= line.length()
+                        || !Character.isWhitespace(line.charAt(charAfterPackageKeyword))) {
+                    // "package" keyword is not followed by a whitespace
+                    continue;
+                }
 
-        int lineLength = line.length();
-        int packageNameStart = packageDeclarationStart + PACKAGE_KEYWORD.length();
-        while (packageNameStart < lineLength
-            && Character.isWhitespace(line.charAt(packageNameStart))) {
-          packageNameStart++;
-        }
+                int lineLength = line.length();
+                int packageNameStart = packageDeclarationStart + PACKAGE_KEYWORD.length();
+                while (packageNameStart < lineLength && Character.isWhitespace(line.charAt(packageNameStart))) {
+                    packageNameStart++;
+                }
 
-        int packageNameEnd = line.indexOf(';', packageNameStart);
-        if (packageNameEnd == -1) {
-          packageNameEnd = lineLength; // possible if this is a non-Java (e.g. Groovy, Scala) file
-        }
+                int packageNameEnd = line.indexOf(';', packageNameStart);
+                if (packageNameEnd == -1) {
+                    packageNameEnd = lineLength; // possible if this is a non-Java (e.g. Groovy, Scala) file
+                }
 
-        String packageName = line.substring(packageNameStart, packageNameEnd);
-        Path packagePath;
-        try {
-          packagePath = fileSystem.getPath(packageName.replace('.', File.separatorChar));
-        } catch (InvalidPathException e) {
-          log.debug("Invalid package {} found for source file {}", packageName, sourceFile, e);
-          continue;
-        }
+                String packageName = line.substring(packageNameStart, packageNameEnd);
+                Path packagePath;
+                try {
+                    packagePath = fileSystem.getPath(packageName.replace('.', File.separatorChar));
+                } catch (InvalidPathException e) {
+                    log.debug("Invalid package {} found for source file {}", packageName, sourceFile, e);
+                    continue;
+                }
 
-        // we only do the "sanity check" for Java, as with the other languages
-        // it is possible to have package that does not correspond to folder
-        if (language != Language.JAVA || folder.endsWith(packagePath)) {
-          return packagePath;
+                // we only do the "sanity check" for Java, as with the other languages
+                // it is possible to have package that does not correspond to folder
+                if (language != Language.JAVA || folder.endsWith(packagePath)) {
+                    return packagePath;
+                }
+            }
         }
-      }
-    }
 
-    // apparently there is no package declaration - class is located in the default package
-    return null;
-  }
+        // apparently there is no package declaration - class is located in the default package
+        return null;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/PackageTree.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/PackageTree.java
index 6fdbf4c26d8..16bb274743c 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/PackageTree.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/PackageTree.java
@@ -31,123 +31,122 @@
  */
 public class PackageTree {
 
-  private final Node root = new Node(null, "");
+    private final Node root = new Node(null, "");
 
-  private final int rootPackagesLimit;
+    private final int rootPackagesLimit;
 
-  public PackageTree(Config config) {
-    rootPackagesLimit = config.getCiVisibilityCoverageRootPackagesLimit();
-  }
+    public PackageTree(Config config) {
+        rootPackagesLimit = config.getCiVisibilityCoverageRootPackagesLimit();
+    }
 
-  void add(Path packagePath) {
-    if (packagePath.toString().isEmpty()) {
-      return;
+    void add(Path packagePath) {
+        if (packagePath.toString().isEmpty()) {
+            return;
+        }
+        root.add(packagePath.iterator());
     }
-    root.add(packagePath.iterator());
-  }
 
-  List<String> asList() {
-    truncateIfNeeded(root);
+    List<String> asList() {
+        truncateIfNeeded(root);
 
-    List<String> childrenPackages = new ArrayList<>(rootPackagesLimit);
-    for (Node child : root.children.values()) {
-      child.stringify(childrenPackages, "");
-    }
-    return childrenPackages;
-  }
-
-  private void truncateIfNeeded(Node root) {
-    Deque<List<Node>> nodesByDepth = new ArrayDeque<>();
-
-    List<Node> current = Collections.singletonList(root);
-    while (!current.isEmpty()) {
-      List<Node> next = new ArrayList<>();
-      for (Node treeNode : current) {
-        next.addAll(treeNode.children.values());
-      }
-      nodesByDepth.push(current);
-      current = next;
+        List<String> childrenPackages = new ArrayList<>(rootPackagesLimit);
+        for (Node child : root.children.values()) {
+            child.stringify(childrenPackages, "");
+        }
+        return childrenPackages;
     }
 
-    // start truncating with the deepest nodes
-    // (i.e. most specific packages names)
-    while (!nodesByDepth.isEmpty()) {
-      List<Node> nodes = nodesByDepth.pop();
-      // sorting the nodes now as leafChildren counts might have changed
-      // if their children were truncated
-      nodes.sort(Comparator.comparingInt(node -> -node.leafChildren));
-
-      for (Node node : nodes) {
-        if (root.leafChildren <= rootPackagesLimit) {
-          // stop as soon as we have truncated enough, even if it's mid-level
-          return;
-        } else {
-          node.truncate();
+    private void truncateIfNeeded(Node root) {
+        Deque<List<Node>> nodesByDepth = new ArrayDeque<>();
+
+        List<Node> current = Collections.singletonList(root);
+        while (!current.isEmpty()) {
+            List<Node> next = new ArrayList<>();
+            for (Node treeNode : current) {
+                next.addAll(treeNode.children.values());
+            }
+            nodesByDepth.push(current);
+            current = next;
+        }
+
+        // start truncating with the deepest nodes
+        // (i.e. most specific packages names)
+        while (!nodesByDepth.isEmpty()) {
+            List<Node> nodes = nodesByDepth.pop();
+            // sorting the nodes now as leafChildren counts might have changed
+            // if their children were truncated
+            nodes.sort(Comparator.comparingInt(node -> -node.leafChildren));
+
+            for (Node node : nodes) {
+                if (root.leafChildren <= rootPackagesLimit) {
+                    // stop as soon as we have truncated enough, even if it's mid-level
+                    return;
+                } else {
+                    node.truncate();
+                }
+            }
         }
-      }
-    }
-  }
-
-  private static final class Node {
-    private final Node parent;
-    private final String name;
-    private Map<String, Node> children = new HashMap<>();
-    private int leafChildren;
-    private boolean leaf;
-
-    private Node(Node parent, String name) {
-      this.parent = parent;
-      this.name = name;
     }
 
-    private int add(Iterator<Path> iterator) {
-      if (leaf) {
-        return 0;
-
-      } else if (!iterator.hasNext()) {
-        leaf = true;
-        if (leafChildren == 0) {
-          return ++leafChildren;
-        } else {
-          // what used to be a non-leaf is now a leaf,
-          // truncating children
-          int delta = 1 - leafChildren;
-          children = Collections.emptyMap();
-          leafChildren = 1;
-          return delta;
+    private static final class Node {
+        private final Node parent;
+        private final String name;
+        private Map<String, Node> children = new HashMap<>();
+        private int leafChildren;
+        private boolean leaf;
+
+        private Node(Node parent, String name) {
+            this.parent = parent;
+            this.name = name;
         }
 
-      } else {
-        Path element = iterator.next();
-        Node child =
-            children.computeIfAbsent(element.toString(), nodeName -> new Node(this, nodeName));
-        int delta = child.add(iterator);
-        leafChildren += delta;
-        return delta;
-      }
-    }
+        private int add(Iterator<Path> iterator) {
+            if (leaf) {
+                return 0;
+
+            } else if (!iterator.hasNext()) {
+                leaf = true;
+                if (leafChildren == 0) {
+                    return ++leafChildren;
+                } else {
+                    // what used to be a non-leaf is now a leaf,
+                    // truncating children
+                    int delta = 1 - leafChildren;
+                    children = Collections.emptyMap();
+                    leafChildren = 1;
+                    return delta;
+                }
+
+            } else {
+                Path element = iterator.next();
+                Node child = children.computeIfAbsent(element.toString(), nodeName -> new Node(this, nodeName));
+                int delta = child.add(iterator);
+                leafChildren += delta;
+                return delta;
+            }
+        }
 
-    private void truncate() {
-      children = Collections.emptyMap();
-      leaf = true;
+        private void truncate() {
+            children = Collections.emptyMap();
+            leaf = true;
 
-      int delta = leafChildren - 1;
-      Node current = this;
-      while (current != null) {
-        current.leafChildren -= delta;
-        current = current.parent;
-      }
-    }
+            int delta = leafChildren - 1;
+            Node current = this;
+            while (current != null) {
+                current.leafChildren -= delta;
+                current = current.parent;
+            }
+        }
 
-    private void stringify(List<String> childrenPackages, String currentPath) {
-      currentPath += name + ".";
-      if (leaf) {
-        childrenPackages.add(currentPath + "*");
-      } else {
-        for (Node child : children.values()) {
-          child.stringify(childrenPackages, currentPath);
+        private void stringify(List<String> childrenPackages, String currentPath) {
+            currentPath += name + ".";
+            if (leaf) {
+                childrenPackages.add(currentPath + "*");
+            } else {
+                for (Node child : children.values()) {
+                    child.stringify(childrenPackages, currentPath);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java
index 76a758d3af6..009bdcbe80b 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java
@@ -24,181 +24,176 @@
 
 public class RepoIndex {
 
-  static final RepoIndex EMPTY =
-      new RepoIndex(
-          ClassNameTrie.EMPTY_TRIE,
-          Collections.emptyMap(),
-          Collections.emptyList(),
-          Collections.emptyList());
-
-  private static final Logger log = LoggerFactory.getLogger(RepoIndex.class);
-
-  private final ClassNameTrie trie;
-  private final Map<String, List<String>> duplicateTrieKeys;
-  private final List<SourceRoot> sourceRoots;
-  private final List<String> rootPackages;
-
-  RepoIndex(
-      ClassNameTrie trie,
-      Map<String, List<String>> duplicateTrieKeys,
-      List<SourceRoot> sourceRoots,
-      List<String> rootPackages) {
-    this.trie = trie;
-    this.duplicateTrieKeys = duplicateTrieKeys;
-    this.sourceRoots = sourceRoots;
-    this.rootPackages = rootPackages;
-  }
-
-  public List<String> getRootPackages() {
-    return rootPackages;
-  }
-
-  public Collection<String> getSourcePaths(@Nonnull Class<?> c) {
-    String topLevelClassName = Utils.stripNestedClassNames(c.getName());
-    Collection<String> sourcePaths = doGetAllSourcePaths(topLevelClassName);
-    return !sourcePaths.isEmpty() ? sourcePaths : getFallbackSourcePaths(c);
-  }
-
-  /**
-   * Used as a fallback for non-Java classes or Java classes that are not public: in this case class
-   * name does not necessarily correspond to the source file name, so source file name needs to be
-   * retrieved from the bytecode.
-   */
-  private Collection<String> getFallbackSourcePaths(@Nonnull Class<?> c) {
-    try {
-      String fileName = Utils.getFileName(c);
-      if (fileName == null) {
-        log.debug("Could not retrieve file name for class {}", c.getName());
-        return Collections.emptyList();
-      }
-
-      String fileNameWithoutExtension = Utils.stripExtension(fileName);
-      Package classPackage = c.getPackage();
-      String packageName = classPackage != null ? classPackage.getName() : "";
-      String key = packageName + '.' + fileNameWithoutExtension;
-      return doGetAllSourcePaths(key);
-
-    } catch (IOException e) {
-      log.error("Error while trying to retrieve file name for class {}", c.getName(), e);
-      return Collections.emptyList();
+    static final RepoIndex EMPTY = new RepoIndex(
+            ClassNameTrie.EMPTY_TRIE, Collections.emptyMap(), Collections.emptyList(), Collections.emptyList());
+
+    private static final Logger log = LoggerFactory.getLogger(RepoIndex.class);
+
+    private final ClassNameTrie trie;
+    private final Map<String, List<String>> duplicateTrieKeys;
+    private final List<SourceRoot> sourceRoots;
+    private final List<String> rootPackages;
+
+    RepoIndex(
+            ClassNameTrie trie,
+            Map<String, List<String>> duplicateTrieKeys,
+            List<SourceRoot> sourceRoots,
+            List<String> rootPackages) {
+        this.trie = trie;
+        this.duplicateTrieKeys = duplicateTrieKeys;
+        this.sourceRoots = sourceRoots;
+        this.rootPackages = rootPackages;
     }
-  }
 
-  public Collection<String> getSourcePaths(@Nullable String pathRelativeToSourceRoot) {
-    if (pathRelativeToSourceRoot == null) {
-      return Collections.emptyList();
-    }
-    String key = Utils.toTrieKey(pathRelativeToSourceRoot);
-    return doGetAllSourcePaths(key);
-  }
-
-  private Collection<String> doGetAllSourcePaths(String key) {
-    if (Config.get().isCiVisibilityRepoIndexDuplicateKeyCheckEnabled()
-        && !duplicateTrieKeys.isEmpty()
-        && duplicateTrieKeys.containsKey(key)) {
-      List<String> paths = duplicateTrieKeys.get(key);
-      log.debug(
-          "Duplicate trie key {} resolved to {} candidate paths: {}", key, paths.size(), paths);
-      return paths;
+    public List<String> getRootPackages() {
+        return rootPackages;
     }
 
-    int sourceRootIdx = trie.apply(key);
-    if (sourceRootIdx < 0) {
-      log.debug("Could not find source root for {}", key);
-      return Collections.emptyList();
-    }
-    SourceRoot sourceRoot = sourceRoots.get(sourceRootIdx);
-    return Collections.singletonList(sourceRoot.resolveSourcePath(key));
-  }
-
-  public ByteBuffer serialize() {
-    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-    try (DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream)) {
-      ClassNameTrie.Builder builder = new ClassNameTrie.Builder(trie);
-      builder.writeTo(dataOutputStream);
-    } catch (IOException e) {
-      // should not happen ever, since we're writing to byte array stream
-      throw new RuntimeException("Could not serialize classname trie", e);
-    }
-    byte[] serializedTrie = byteArrayOutputStream.toByteArray();
-
-    Serializer s = new Serializer();
-    s.write(serializedTrie);
-    s.write(duplicateTrieKeys, Serializer::write, (ser, paths) -> ser.write(paths));
-    s.write(sourceRoots, SourceRoot::serialize);
-    s.write(rootPackages);
-    return s.flush();
-  }
-
-  public static RepoIndex deserialize(ByteBuffer buffer) {
-    ClassNameTrie trie;
-
-    byte[] trieBytes = Serializer.readByteArray(buffer);
-    if (trieBytes == null) {
-      trie = null;
-
-    } else {
-      ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(trieBytes);
-      try (DataInputStream dataInputStream = new DataInputStream(byteArrayInputStream)) {
-        trie = ClassNameTrie.readFrom(dataInputStream);
-      } catch (IOException e) {
-        // should not happen ever, since we're writing to byte array stream
-        throw new RuntimeException("Could not deserialize classname trie", e);
-      }
+    public Collection<String> getSourcePaths(@Nonnull Class<?> c) {
+        String topLevelClassName = Utils.stripNestedClassNames(c.getName());
+        Collection<String> sourcePaths = doGetAllSourcePaths(topLevelClassName);
+        return !sourcePaths.isEmpty() ? sourcePaths : getFallbackSourcePaths(c);
     }
 
-    Map<String, List<String>> duplicateTrieKeys =
-        Serializer.readMap(buffer, Serializer::readString, Serializer::readStringList);
-    List<SourceRoot> sourceRoots = Serializer.readList(buffer, SourceRoot::deserialize);
-    List<String> rootPackages = Serializer.readStringList(buffer);
-    return new RepoIndex(trie, duplicateTrieKeys, sourceRoots, rootPackages);
-  }
-
-  static final class SourceRoot {
-    /** Path relative to repository root. */
-    final String relativePath;
-
-    final Language language;
-
-    SourceRoot(String relativePath, Language language) {
-      this.relativePath = relativePath;
-      this.language = language;
+    /**
+     * Used as a fallback for non-Java classes or Java classes that are not public: in this case class
+     * name does not necessarily correspond to the source file name, so source file name needs to be
+     * retrieved from the bytecode.
+     */
+    private Collection<String> getFallbackSourcePaths(@Nonnull Class<?> c) {
+        try {
+            String fileName = Utils.getFileName(c);
+            if (fileName == null) {
+                log.debug("Could not retrieve file name for class {}", c.getName());
+                return Collections.emptyList();
+            }
+
+            String fileNameWithoutExtension = Utils.stripExtension(fileName);
+            Package classPackage = c.getPackage();
+            String packageName = classPackage != null ? classPackage.getName() : "";
+            String key = packageName + '.' + fileNameWithoutExtension;
+            return doGetAllSourcePaths(key);
+
+        } catch (IOException e) {
+            log.error("Error while trying to retrieve file name for class {}", c.getName(), e);
+            return Collections.emptyList();
+        }
     }
 
-    /** Resolves a trie key (dot-separated) to a full source path relative to the source root. */
-    String resolveSourcePath(String trieKey) {
-      return relativePath
-          + File.separatorChar
-          + trieKey.replace('.', File.separatorChar)
-          + language.getExtension();
+    public Collection<String> getSourcePaths(@Nullable String pathRelativeToSourceRoot) {
+        if (pathRelativeToSourceRoot == null) {
+            return Collections.emptyList();
+        }
+        String key = Utils.toTrieKey(pathRelativeToSourceRoot);
+        return doGetAllSourcePaths(key);
     }
 
-    static void serialize(Serializer s, SourceRoot sourceRoot) {
-      s.write(sourceRoot.relativePath);
-      s.write(sourceRoot.language.ordinal());
+    private Collection<String> doGetAllSourcePaths(String key) {
+        if (Config.get().isCiVisibilityRepoIndexDuplicateKeyCheckEnabled()
+                && !duplicateTrieKeys.isEmpty()
+                && duplicateTrieKeys.containsKey(key)) {
+            List<String> paths = duplicateTrieKeys.get(key);
+            log.debug("Duplicate trie key {} resolved to {} candidate paths: {}", key, paths.size(), paths);
+            return paths;
+        }
+
+        int sourceRootIdx = trie.apply(key);
+        if (sourceRootIdx < 0) {
+            log.debug("Could not find source root for {}", key);
+            return Collections.emptyList();
+        }
+        SourceRoot sourceRoot = sourceRoots.get(sourceRootIdx);
+        return Collections.singletonList(sourceRoot.resolveSourcePath(key));
     }
 
-    static SourceRoot deserialize(ByteBuffer buffer) {
-      String relativePath = Serializer.readString(buffer);
-      Language language = Language.getByOrdinal(Serializer.readInt(buffer));
-      return new SourceRoot(relativePath, language);
+    public ByteBuffer serialize() {
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        try (DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream)) {
+            ClassNameTrie.Builder builder = new ClassNameTrie.Builder(trie);
+            builder.writeTo(dataOutputStream);
+        } catch (IOException e) {
+            // should not happen ever, since we're writing to byte array stream
+            throw new RuntimeException("Could not serialize classname trie", e);
+        }
+        byte[] serializedTrie = byteArrayOutputStream.toByteArray();
+
+        Serializer s = new Serializer();
+        s.write(serializedTrie);
+        s.write(duplicateTrieKeys, Serializer::write, (ser, paths) -> ser.write(paths));
+        s.write(sourceRoots, SourceRoot::serialize);
+        s.write(rootPackages);
+        return s.flush();
     }
 
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) {
-        return true;
-      }
-      if (o == null || getClass() != o.getClass()) {
-        return false;
-      }
-      SourceRoot that = (SourceRoot) o;
-      return Objects.equals(relativePath, that.relativePath) && language == that.language;
+    public static RepoIndex deserialize(ByteBuffer buffer) {
+        ClassNameTrie trie;
+
+        byte[] trieBytes = Serializer.readByteArray(buffer);
+        if (trieBytes == null) {
+            trie = null;
+
+        } else {
+            ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(trieBytes);
+            try (DataInputStream dataInputStream = new DataInputStream(byteArrayInputStream)) {
+                trie = ClassNameTrie.readFrom(dataInputStream);
+            } catch (IOException e) {
+                // should not happen ever, since we're writing to byte array stream
+                throw new RuntimeException("Could not deserialize classname trie", e);
+            }
+        }
+
+        Map<String, List<String>> duplicateTrieKeys =
+                Serializer.readMap(buffer, Serializer::readString, Serializer::readStringList);
+        List<SourceRoot> sourceRoots = Serializer.readList(buffer, SourceRoot::deserialize);
+        List<String> rootPackages = Serializer.readStringList(buffer);
+        return new RepoIndex(trie, duplicateTrieKeys, sourceRoots, rootPackages);
     }
 
-    @Override
-    public int hashCode() {
-      return Objects.hash(relativePath, language);
+    static final class SourceRoot {
+        /** Path relative to repository root. */
+        final String relativePath;
+
+        final Language language;
+
+        SourceRoot(String relativePath, Language language) {
+            this.relativePath = relativePath;
+            this.language = language;
+        }
+
+        /** Resolves a trie key (dot-separated) to a full source path relative to the source root. */
+        String resolveSourcePath(String trieKey) {
+            return relativePath
+                    + File.separatorChar
+                    + trieKey.replace('.', File.separatorChar)
+                    + language.getExtension();
+        }
+
+        static void serialize(Serializer s, SourceRoot sourceRoot) {
+            s.write(sourceRoot.relativePath);
+            s.write(sourceRoot.language.ordinal());
+        }
+
+        static SourceRoot deserialize(ByteBuffer buffer) {
+            String relativePath = Serializer.readString(buffer);
+            Language language = Language.getByOrdinal(Serializer.readInt(buffer));
+            return new SourceRoot(relativePath, language);
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            SourceRoot that = (SourceRoot) o;
+            return Objects.equals(relativePath, that.relativePath) && language == that.language;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(relativePath, language);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexBuilder.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexBuilder.java
index 2c223c34f90..245570d2916 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexBuilder.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexBuilder.java
@@ -25,258 +25,245 @@
 
 public class RepoIndexBuilder implements RepoIndexProvider {
 
-  private static final Logger log = LoggerFactory.getLogger(RepoIndexBuilder.class);
-
-  private final Config config;
-  private final String repoRoot;
-  private final PackageResolver packageResolver;
-  private final ResourceResolver resourceResolver;
-  private final FileSystem fileSystem;
-
-  private final Object indexInitializationLock = new Object();
-  private volatile RepoIndex index;
-
-  public RepoIndexBuilder(
-      Config config,
-      @Nonnull String repoRoot,
-      PackageResolver packageResolver,
-      ResourceResolver resourceResolver,
-      FileSystem fileSystem) {
-    this.config = config;
-    this.repoRoot = repoRoot;
-    this.packageResolver = packageResolver;
-    this.resourceResolver = resourceResolver;
-    this.fileSystem = fileSystem;
-  }
-
-  @Override
-  public RepoIndex getIndex() {
-    if (index == null) {
-      synchronized (indexInitializationLock) {
+    private static final Logger log = LoggerFactory.getLogger(RepoIndexBuilder.class);
+
+    private final Config config;
+    private final String repoRoot;
+    private final PackageResolver packageResolver;
+    private final ResourceResolver resourceResolver;
+    private final FileSystem fileSystem;
+
+    private final Object indexInitializationLock = new Object();
+    private volatile RepoIndex index;
+
+    public RepoIndexBuilder(
+            Config config,
+            @Nonnull String repoRoot,
+            PackageResolver packageResolver,
+            ResourceResolver resourceResolver,
+            FileSystem fileSystem) {
+        this.config = config;
+        this.repoRoot = repoRoot;
+        this.packageResolver = packageResolver;
+        this.resourceResolver = resourceResolver;
+        this.fileSystem = fileSystem;
+    }
+
+    @Override
+    public RepoIndex getIndex() {
         if (index == null) {
-          index = doGetIndex();
+            synchronized (indexInitializationLock) {
+                if (index == null) {
+                    index = doGetIndex();
+                }
+            }
         }
-      }
-    }
-    return index;
-  }
-
-  private RepoIndex doGetIndex() {
-    log.debug("Building index of source files in {}", repoRoot);
-
-    Path repoRootPath = fileSystem.getPath(repoRoot);
-    RepoIndexingFileVisitor fileVisitor =
-        new RepoIndexingFileVisitor(config, packageResolver, resourceResolver, repoRootPath);
-
-    long startTime = System.currentTimeMillis();
-    try {
-      Files.walkFileTree(
-          repoRootPath, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, fileVisitor);
-    } catch (Exception e) {
-      log.debug("Failed to build index of {}", repoRootPath, e);
+        return index;
     }
 
-    long duration = System.currentTimeMillis() - startTime;
-    RepoIndexingStats stats = fileVisitor.indexingStats;
-    RepoIndex index = fileVisitor.getIndex();
-    log.debug(
-        "Indexing took {} ms. Files visited: {}, source files visited: {}, resource files visited: {}, source roots found: {}, root packages found: {}",
-        duration,
-        stats.filesVisited,
-        stats.sourceFilesVisited,
-        stats.resourceFilesVisited,
-        fileVisitor.sourceRoots.size(),
-        index.getRootPackages());
-    return index;
-  }
+    private RepoIndex doGetIndex() {
+        log.debug("Building index of source files in {}", repoRoot);
 
-  private static final class RepoIndexingFileVisitor implements FileVisitor<Path> {
+        Path repoRootPath = fileSystem.getPath(repoRoot);
+        RepoIndexingFileVisitor fileVisitor =
+                new RepoIndexingFileVisitor(config, packageResolver, resourceResolver, repoRootPath);
 
-    private static final Logger log = LoggerFactory.getLogger(RepoIndexingFileVisitor.class);
+        long startTime = System.currentTimeMillis();
+        try {
+            Files.walkFileTree(repoRootPath, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, fileVisitor);
+        } catch (Exception e) {
+            log.debug("Failed to build index of {}", repoRootPath, e);
+        }
 
-    private final PackageResolver packageResolver;
-    private final ResourceResolver resourceResolver;
-    private final ClassNameTrie.Builder trieBuilder;
-    private final Map<String, Integer> trieKeyToSourceRootIdx;
-    private final Map<String, List<Integer>> duplicateSourceRootIndices;
-    private final Map<RepoIndex.SourceRoot, Integer> sourceRoots;
-    private final PackageTree packageTree;
-    private final RepoIndexingStats indexingStats;
-    private final Path repoRoot;
-    private final AtomicInteger sourceRootCounter;
-    private final boolean followSymlinks;
-
-    private RepoIndexingFileVisitor(
-        Config config,
-        PackageResolver packageResolver,
-        ResourceResolver resourceResolver,
-        Path repoRoot) {
-      this.packageResolver = packageResolver;
-      this.resourceResolver = resourceResolver;
-      this.repoRoot = repoRoot;
-      trieBuilder = new ClassNameTrie.Builder();
-      trieKeyToSourceRootIdx = new HashMap<>();
-      duplicateSourceRootIndices = new HashMap<>();
-      sourceRoots = new HashMap<>();
-      packageTree = new PackageTree(config);
-      indexingStats = new RepoIndexingStats();
-      sourceRootCounter = new AtomicInteger();
-      followSymlinks = config.isCiVisibilityRepoIndexFollowSymlinks();
+        long duration = System.currentTimeMillis() - startTime;
+        RepoIndexingStats stats = fileVisitor.indexingStats;
+        RepoIndex index = fileVisitor.getIndex();
+        log.debug(
+                "Indexing took {} ms. Files visited: {}, source files visited: {}, resource files visited: {}, source roots found: {}, root packages found: {}",
+                duration,
+                stats.filesVisited,
+                stats.sourceFilesVisited,
+                stats.resourceFilesVisited,
+                fileVisitor.sourceRoots.size(),
+                index.getRootPackages());
+        return index;
     }
 
-    @Nonnull
-    @Override
-    public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
-      if (Files.isSymbolicLink(dir)) {
-        if (!followSymlinks) {
-          // Configured to skip symlinks
-          return FileVisitResult.SKIP_SUBTREE;
+    private static final class RepoIndexingFileVisitor implements FileVisitor<Path> {
+
+        private static final Logger log = LoggerFactory.getLogger(RepoIndexingFileVisitor.class);
+
+        private final PackageResolver packageResolver;
+        private final ResourceResolver resourceResolver;
+        private final ClassNameTrie.Builder trieBuilder;
+        private final Map<String, Integer> trieKeyToSourceRootIdx;
+        private final Map<String, List<Integer>> duplicateSourceRootIndices;
+        private final Map<RepoIndex.SourceRoot, Integer> sourceRoots;
+        private final PackageTree packageTree;
+        private final RepoIndexingStats indexingStats;
+        private final Path repoRoot;
+        private final AtomicInteger sourceRootCounter;
+        private final boolean followSymlinks;
+
+        private RepoIndexingFileVisitor(
+                Config config, PackageResolver packageResolver, ResourceResolver resourceResolver, Path repoRoot) {
+            this.packageResolver = packageResolver;
+            this.resourceResolver = resourceResolver;
+            this.repoRoot = repoRoot;
+            trieBuilder = new ClassNameTrie.Builder();
+            trieKeyToSourceRootIdx = new HashMap<>();
+            duplicateSourceRootIndices = new HashMap<>();
+            sourceRoots = new HashMap<>();
+            packageTree = new PackageTree(config);
+            indexingStats = new RepoIndexingStats();
+            sourceRootCounter = new AtomicInteger();
+            followSymlinks = config.isCiVisibilityRepoIndexFollowSymlinks();
         }
-        if (readSymbolicLink(dir).startsWith(repoRoot)) {
-          // The path is a symlink that points inside the repo.
-          // We'll visit the folder that it points to anyway,
-          // moreover, we don't want two different results for one file
-          // (one containing the symlink, the other - the actual folder).
-          return FileVisitResult.SKIP_SUBTREE;
+
+        @Nonnull
+        @Override
+        public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
+            if (Files.isSymbolicLink(dir)) {
+                if (!followSymlinks) {
+                    // Configured to skip symlinks
+                    return FileVisitResult.SKIP_SUBTREE;
+                }
+                if (readSymbolicLink(dir).startsWith(repoRoot)) {
+                    // The path is a symlink that points inside the repo.
+                    // We'll visit the folder that it points to anyway,
+                    // moreover, we don't want two different results for one file
+                    // (one containing the symlink, the other - the actual folder).
+                    return FileVisitResult.SKIP_SUBTREE;
+                }
+            }
+            return FileVisitResult.CONTINUE;
         }
-      }
-      return FileVisitResult.CONTINUE;
-    }
 
-    private static Path readSymbolicLink(Path path) {
-      try {
-        return Files.readSymbolicLink(path);
-      } catch (Exception e) {
-        log.debug("Could not read symbolic link {}", path, e);
-        return path;
-      }
-    }
+        private static Path readSymbolicLink(Path path) {
+            try {
+                return Files.readSymbolicLink(path);
+            } catch (Exception e) {
+                log.debug("Could not read symbolic link {}", path, e);
+                return path;
+            }
+        }
 
-    @Nonnull
-    @Override
-    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
-      indexingStats.filesVisited++;
-
-      try {
-        String fileName = file.getFileName().toString();
-        Language language = Language.getByFileName(fileName);
-        if (language == null) {
-          // unknown language/filetype, skip indexing
-          return FileVisitResult.CONTINUE;
+        @Nonnull
+        @Override
+        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
+            indexingStats.filesVisited++;
+
+            try {
+                String fileName = file.getFileName().toString();
+                Language language = Language.getByFileName(fileName);
+                if (language == null) {
+                    // unknown language/filetype, skip indexing
+                    return FileVisitResult.CONTINUE;
+                }
+
+                Path sourceRoot = language.isNonCode() ? getNonCodeSourceRoot(file) : getCodeSourceRoot(language, file);
+                if (sourceRoot != null) {
+                    String relativeSourceRoot = repoRoot.relativize(sourceRoot).toString();
+                    int sourceRootIdx = sourceRoots.computeIfAbsent(
+                            new RepoIndex.SourceRoot(relativeSourceRoot, language),
+                            sr -> sourceRootCounter.getAndIncrement());
+
+                    String relativePath = sourceRoot.relativize(file).toString();
+                    if (!relativePath.isEmpty()) {
+                        String key = Utils.toTrieKey(relativePath);
+                        trieBuilder.put(key, sourceRootIdx);
+
+                        Integer existingSourceRootIdx = trieKeyToSourceRootIdx.put(key, sourceRootIdx);
+                        if (existingSourceRootIdx != null) {
+                            log.debug("Duplicate repo index key: {}", key);
+                            duplicateSourceRootIndices
+                                    .computeIfAbsent(key, k -> {
+                                        List<Integer> indices = new ArrayList<>();
+                                        indices.add(existingSourceRootIdx); // Initialize with original source root
+                                        return indices;
+                                    })
+                                    .add(sourceRootIdx);
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                log.debug("Failed to index file {}", file, e);
+            }
+            return FileVisitResult.CONTINUE;
         }
 
-        Path sourceRoot =
-            language.isNonCode() ? getNonCodeSourceRoot(file) : getCodeSourceRoot(language, file);
-        if (sourceRoot != null) {
-          String relativeSourceRoot = repoRoot.relativize(sourceRoot).toString();
-          int sourceRootIdx =
-              sourceRoots.computeIfAbsent(
-                  new RepoIndex.SourceRoot(relativeSourceRoot, language),
-                  sr -> sourceRootCounter.getAndIncrement());
-
-          String relativePath = sourceRoot.relativize(file).toString();
-          if (!relativePath.isEmpty()) {
-            String key = Utils.toTrieKey(relativePath);
-            trieBuilder.put(key, sourceRootIdx);
-
-            Integer existingSourceRootIdx = trieKeyToSourceRootIdx.put(key, sourceRootIdx);
-            if (existingSourceRootIdx != null) {
-              log.debug("Duplicate repo index key: {}", key);
-              duplicateSourceRootIndices
-                  .computeIfAbsent(
-                      key,
-                      k -> {
-                        List<Integer> indices = new ArrayList<>();
-                        indices.add(existingSourceRootIdx); // Initialize with original source root
-                        return indices;
-                      })
-                  .add(sourceRootIdx);
+        private Path getCodeSourceRoot(Language language, Path file) throws IOException {
+            indexingStats.sourceFilesVisited++;
+            Path packagePath = packageResolver.getPackage(file);
+            if (packagePath != null) {
+                packageTree.add(packagePath);
+
+                Path folder = file.getParent();
+                if (folder.endsWith(packagePath)) {
+                    // In non-JVM languages package names do not have to correspond to folder structure,
+                    // so using package to find source root is not always possible
+                    return folder.getRoot()
+                            .resolve(folder.subpath(0, folder.getNameCount() - packagePath.getNameCount()));
+                }
+            }
+
+            if (language != Language.JAVA) {
+                // Fallback for non-JVM languages
+                return resourceResolver.getResourceRoot(file);
+            } else {
+                // For Java assuming default package
+                return file.getParent();
             }
-          }
         }
-      } catch (Exception e) {
-        log.debug("Failed to index file {}", file, e);
-      }
-      return FileVisitResult.CONTINUE;
-    }
 
-    private Path getCodeSourceRoot(Language language, Path file) throws IOException {
-      indexingStats.sourceFilesVisited++;
-      Path packagePath = packageResolver.getPackage(file);
-      if (packagePath != null) {
-        packageTree.add(packagePath);
-
-        Path folder = file.getParent();
-        if (folder.endsWith(packagePath)) {
-          // In non-JVM languages package names do not have to correspond to folder structure,
-          // so using package to find source root is not always possible
-          return folder
-              .getRoot()
-              .resolve(folder.subpath(0, folder.getNameCount() - packagePath.getNameCount()));
+        private Path getNonCodeSourceRoot(Path file) throws IOException {
+            indexingStats.resourceFilesVisited++;
+            return resourceResolver.getResourceRoot(file);
         }
-      }
-
-      if (language != Language.JAVA) {
-        // Fallback for non-JVM languages
-        return resourceResolver.getResourceRoot(file);
-      } else {
-        // For Java assuming default package
-        return file.getParent();
-      }
-    }
 
-    private Path getNonCodeSourceRoot(Path file) throws IOException {
-      indexingStats.resourceFilesVisited++;
-      return resourceResolver.getResourceRoot(file);
-    }
+        @Nonnull
+        @Override
+        public FileVisitResult visitFileFailed(Path file, IOException exc) {
+            if (exc != null) {
+                log.debug("Failed to visit file: {}", file, exc);
+            }
+            return FileVisitResult.CONTINUE;
+        }
 
-    @Nonnull
-    @Override
-    public FileVisitResult visitFileFailed(Path file, IOException exc) {
-      if (exc != null) {
-        log.debug("Failed to visit file: {}", file, exc);
-      }
-      return FileVisitResult.CONTINUE;
-    }
+        @Nonnull
+        @Override
+        public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
+            if (exc != null) {
+                log.debug("Failed to visit directory: {}", dir, exc);
+            }
+            return FileVisitResult.CONTINUE;
+        }
 
-    @Nonnull
-    @Override
-    public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
-      if (exc != null) {
-        log.debug("Failed to visit directory: {}", dir, exc);
-      }
-      return FileVisitResult.CONTINUE;
-    }
+        public RepoIndex getIndex() {
+            RepoIndex.SourceRoot[] roots = new RepoIndex.SourceRoot[sourceRoots.size()];
+            for (Map.Entry<RepoIndex.SourceRoot, Integer> e : sourceRoots.entrySet()) {
+                roots[e.getValue()] = e.getKey();
+            }
 
-    public RepoIndex getIndex() {
-      RepoIndex.SourceRoot[] roots = new RepoIndex.SourceRoot[sourceRoots.size()];
-      for (Map.Entry<RepoIndex.SourceRoot, Integer> e : sourceRoots.entrySet()) {
-        roots[e.getValue()] = e.getKey();
-      }
-
-      Map<String, List<String>> duplicateTrieKeyPaths =
-          new HashMap<>(duplicateSourceRootIndices.size() * 4 / 3);
-      for (Map.Entry<String, List<Integer>> entry : duplicateSourceRootIndices.entrySet()) {
-        String key = entry.getKey();
-        List<String> paths = new ArrayList<>(entry.getValue().size());
-        for (int idx : entry.getValue()) {
-          RepoIndex.SourceRoot sr = roots[idx];
-          paths.add(sr.resolveSourcePath(key));
+            Map<String, List<String>> duplicateTrieKeyPaths = new HashMap<>(duplicateSourceRootIndices.size() * 4 / 3);
+            for (Map.Entry<String, List<Integer>> entry : duplicateSourceRootIndices.entrySet()) {
+                String key = entry.getKey();
+                List<String> paths = new ArrayList<>(entry.getValue().size());
+                for (int idx : entry.getValue()) {
+                    RepoIndex.SourceRoot sr = roots[idx];
+                    paths.add(sr.resolveSourcePath(key));
+                }
+                duplicateTrieKeyPaths.put(key, paths);
+            }
+
+            return new RepoIndex(
+                    trieBuilder.buildTrie(), duplicateTrieKeyPaths, Arrays.asList(roots), packageTree.asList());
         }
-        duplicateTrieKeyPaths.put(key, paths);
-      }
-
-      return new RepoIndex(
-          trieBuilder.buildTrie(),
-          duplicateTrieKeyPaths,
-          Arrays.asList(roots),
-          packageTree.asList());
     }
-  }
 
-  private static final class RepoIndexingStats {
-    int filesVisited;
-    int sourceFilesVisited;
-    int resourceFilesVisited;
-  }
+    private static final class RepoIndexingStats {
+        int filesVisited;
+        int sourceFilesVisited;
+        int resourceFilesVisited;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexFetcher.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexFetcher.java
index 98bd651e4f4..0734f3176d6 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexFetcher.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexFetcher.java
@@ -8,35 +8,35 @@
 
 public class RepoIndexFetcher implements RepoIndexProvider {
 
-  private static final Logger log = LoggerFactory.getLogger(RepoIndexFetcher.class);
+    private static final Logger log = LoggerFactory.getLogger(RepoIndexFetcher.class);
 
-  private final SignalClient.Factory signalClientFactory;
-  private final Object indexInitializationLock = new Object();
-  private volatile RepoIndex index;
+    private final SignalClient.Factory signalClientFactory;
+    private final Object indexInitializationLock = new Object();
+    private volatile RepoIndex index;
 
-  public RepoIndexFetcher(SignalClient.Factory signalClientFactory) {
-    this.signalClientFactory = signalClientFactory;
-  }
+    public RepoIndexFetcher(SignalClient.Factory signalClientFactory) {
+        this.signalClientFactory = signalClientFactory;
+    }
 
-  @Override
-  public RepoIndex getIndex() {
-    if (index == null) {
-      synchronized (indexInitializationLock) {
+    @Override
+    public RepoIndex getIndex() {
         if (index == null) {
-          index = doGetIndex();
+            synchronized (indexInitializationLock) {
+                if (index == null) {
+                    index = doGetIndex();
+                }
+            }
         }
-      }
+        return index;
     }
-    return index;
-  }
 
-  private RepoIndex doGetIndex() {
-    try (SignalClient signalClient = signalClientFactory.create()) {
-      RepoIndexResponse response = (RepoIndexResponse) signalClient.send(RepoIndexRequest.INSTANCE);
-      return response.getIndex();
-    } catch (Exception e) {
-      log.error("Could not fetch repo index", e);
-      return RepoIndex.EMPTY;
+    private RepoIndex doGetIndex() {
+        try (SignalClient signalClient = signalClientFactory.create()) {
+            RepoIndexResponse response = (RepoIndexResponse) signalClient.send(RepoIndexRequest.INSTANCE);
+            return response.getIndex();
+        } catch (Exception e) {
+            log.error("Could not fetch repo index", e);
+            return RepoIndex.EMPTY;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexProvider.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexProvider.java
index 0244526b105..fc1f6d5bd42 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexProvider.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexProvider.java
@@ -3,9 +3,9 @@
 import javax.annotation.Nullable;
 
 public interface RepoIndexProvider {
-  RepoIndex getIndex();
+    RepoIndex getIndex();
 
-  interface Factory {
-    RepoIndexProvider create(@Nullable String repoRoot);
-  }
+    interface Factory {
+        RepoIndexProvider create(@Nullable String repoRoot);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexSourcePathResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexSourcePathResolver.java
index 52ae4db3109..78f4e34c49b 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexSourcePathResolver.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexSourcePathResolver.java
@@ -7,19 +7,19 @@
 
 public class RepoIndexSourcePathResolver implements SourcePathResolver {
 
-  private final RepoIndexProvider indexProvider;
+    private final RepoIndexProvider indexProvider;
 
-  public RepoIndexSourcePathResolver(RepoIndexProvider indexProvider) {
-    this.indexProvider = indexProvider;
-  }
+    public RepoIndexSourcePathResolver(RepoIndexProvider indexProvider) {
+        this.indexProvider = indexProvider;
+    }
 
-  @Override
-  public Collection<String> getSourcePaths(@Nonnull Class<?> c) {
-    return indexProvider.getIndex().getSourcePaths(c);
-  }
+    @Override
+    public Collection<String> getSourcePaths(@Nonnull Class<?> c) {
+        return indexProvider.getIndex().getSourcePaths(c);
+    }
 
-  @Override
-  public Collection<String> getResourcePaths(@Nullable String relativePath) {
-    return indexProvider.getIndex().getSourcePaths(relativePath);
-  }
+    @Override
+    public Collection<String> getResourcePaths(@Nullable String relativePath) {
+        return indexProvider.getIndex().getSourcePaths(relativePath);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/ResourceResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/ResourceResolver.java
index caf449f29a5..d36980865b9 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/ResourceResolver.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/ResourceResolver.java
@@ -5,6 +5,6 @@
 import javax.annotation.Nullable;
 
 public interface ResourceResolver {
-  @Nullable
-  Path getResourceRoot(Path resourceFile) throws IOException;
+    @Nullable
+    Path getResourceRoot(Path resourceFile) throws IOException;
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/telemetry/CiVisibilityMetricCollectorImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/telemetry/CiVisibilityMetricCollectorImpl.java
index 68902e2def8..90addcb39c2 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/telemetry/CiVisibilityMetricCollectorImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/telemetry/CiVisibilityMetricCollectorImpl.java
@@ -19,122 +19,117 @@
 
 public class CiVisibilityMetricCollectorImpl implements CiVisibilityMetricCollector {
 
-  private static final Logger log = LoggerFactory.getLogger(CiVisibilityMetricCollectorImpl.class);
-
-  private static final int COUNTER_CARD_SIZE = 64;
-
-  private final BlockingQueue<CiVisibilityMetricData> rawMetricsQueue;
-  private final BlockingQueue<DistributionSeriesPoint> rawDistributionPointsQueue;
-  private final AtomicLongArray counters;
-
-  /**
-   * Cards are used to avoid iterating over the entire {@link
-   * CiVisibilityMetricCollectorImpl#counters} array every time {@link
-   * CiVisibilityMetricCollectorImpl#prepareMetrics} is called.
-   *
-   * <p>Every card corresponds to {@link CiVisibilityMetricCollectorImpl#COUNTER_CARD_SIZE} elements
-   * of the counters array. If a card is "dirty" (set to {@code true}), it means one or more of the
-   * counters that it "covers" was modified. If it is not, then none of the corresponding counters
-   * were touched, and iterating that part of the array can be skipped.
-   */
-  private final AtomicBoolean[] counterDirtyCards;
-
-  public CiVisibilityMetricCollectorImpl() {
-    this(
-        new ArrayBlockingQueue<>(RAW_QUEUE_SIZE),
-        new ArrayBlockingQueue<>(RAW_QUEUE_SIZE),
-        CiVisibilityCountMetric.count());
-  }
-
-  CiVisibilityMetricCollectorImpl(
-      final BlockingQueue<CiVisibilityMetricData> rawMetricsQueue,
-      final BlockingQueue<DistributionSeriesPoint> rawDistributionPointsQueue,
-      final int countersTotal) {
-    this.rawMetricsQueue = rawMetricsQueue;
-    this.rawDistributionPointsQueue = rawDistributionPointsQueue;
-    this.counters = new AtomicLongArray(countersTotal);
-
-    counterDirtyCards = new AtomicBoolean[(countersTotal - 1) / COUNTER_CARD_SIZE + 1];
-    for (int i = 0; i < counterDirtyCards.length; i++) {
-      counterDirtyCards[i] = new AtomicBoolean(false);
+    private static final Logger log = LoggerFactory.getLogger(CiVisibilityMetricCollectorImpl.class);
+
+    private static final int COUNTER_CARD_SIZE = 64;
+
+    private final BlockingQueue<CiVisibilityMetricData> rawMetricsQueue;
+    private final BlockingQueue<DistributionSeriesPoint> rawDistributionPointsQueue;
+    private final AtomicLongArray counters;
+
+    /**
+     * Cards are used to avoid iterating over the entire {@link
+     * CiVisibilityMetricCollectorImpl#counters} array every time {@link
+     * CiVisibilityMetricCollectorImpl#prepareMetrics} is called.
+     *
+     * <p>Every card corresponds to {@link CiVisibilityMetricCollectorImpl#COUNTER_CARD_SIZE} elements
+     * of the counters array. If a card is "dirty" (set to {@code true}), it means one or more of the
+     * counters that it "covers" was modified. If it is not, then none of the corresponding counters
+     * were touched, and iterating that part of the array can be skipped.
+     */
+    private final AtomicBoolean[] counterDirtyCards;
+
+    public CiVisibilityMetricCollectorImpl() {
+        this(
+                new ArrayBlockingQueue<>(RAW_QUEUE_SIZE),
+                new ArrayBlockingQueue<>(RAW_QUEUE_SIZE),
+                CiVisibilityCountMetric.count());
     }
-  }
-
-  @Override
-  public void add(CiVisibilityDistributionMetric metric, int value, TagValue... tags) {
-    DistributionSeriesPoint point = metric.createDataPoint(value, tags);
-    if (!rawDistributionPointsQueue.offer(point)) {
-      log.debug(
-          "Discarding metric {}:{}:{} because the queue is full",
-          metric,
-          value,
-          Arrays.toString(tags));
-    }
-  }
-
-  @Override
-  public Collection<DistributionSeriesPoint> drainDistributionSeries() {
-    if (!this.rawDistributionPointsQueue.isEmpty()) {
-      List<DistributionSeriesPoint> drained =
-          new ArrayList<>(this.rawDistributionPointsQueue.size());
-      this.rawDistributionPointsQueue.drainTo(drained);
-      return drained;
+
+    CiVisibilityMetricCollectorImpl(
+            final BlockingQueue<CiVisibilityMetricData> rawMetricsQueue,
+            final BlockingQueue<DistributionSeriesPoint> rawDistributionPointsQueue,
+            final int countersTotal) {
+        this.rawMetricsQueue = rawMetricsQueue;
+        this.rawDistributionPointsQueue = rawDistributionPointsQueue;
+        this.counters = new AtomicLongArray(countersTotal);
+
+        counterDirtyCards = new AtomicBoolean[(countersTotal - 1) / COUNTER_CARD_SIZE + 1];
+        for (int i = 0; i < counterDirtyCards.length; i++) {
+            counterDirtyCards[i] = new AtomicBoolean(false);
+        }
     }
-    return Collections.emptyList();
-  }
-
-  @Override
-  public void add(CiVisibilityCountMetric metric, long value, TagValue... tags) {
-    int counterIdx = metric.getIndex(tags);
-    counters.getAndAdd(counterIdx, value);
-
-    int dirtyCardIdx = counterIdx / COUNTER_CARD_SIZE;
-    counterDirtyCards[dirtyCardIdx].set(true);
-  }
-
-  @Override
-  public void prepareMetrics() {
-    int metricIdx = 0;
-    CiVisibilityCountMetric[] countMetrics = CiVisibilityCountMetric.values();
-
-    for (int dirtyCardIdx = 0; dirtyCardIdx < counterDirtyCards.length; dirtyCardIdx++) {
-      boolean dirty = counterDirtyCards[dirtyCardIdx].getAndSet(false);
-      if (!dirty) {
-        // none of the counters in this card was touched
-        continue;
-      }
-
-      int beginIdx = dirtyCardIdx * COUNTER_CARD_SIZE;
-      int endIdx = Math.min(beginIdx + COUNTER_CARD_SIZE, counters.length());
-      for (int counterIdx = beginIdx; counterIdx < endIdx; counterIdx++) {
-        while (countMetrics[metricIdx].getEndIndex() <= counterIdx) {
-          metricIdx++;
+
+    @Override
+    public void add(CiVisibilityDistributionMetric metric, int value, TagValue... tags) {
+        DistributionSeriesPoint point = metric.createDataPoint(value, tags);
+        if (!rawDistributionPointsQueue.offer(point)) {
+            log.debug("Discarding metric {}:{}:{} because the queue is full", metric, value, Arrays.toString(tags));
         }
+    }
 
-        long counter = counters.getAndSet(counterIdx, 0);
-        if (counter == 0) {
-          continue;
+    @Override
+    public Collection<DistributionSeriesPoint> drainDistributionSeries() {
+        if (!this.rawDistributionPointsQueue.isEmpty()) {
+            List<DistributionSeriesPoint> drained = new ArrayList<>(this.rawDistributionPointsQueue.size());
+            this.rawDistributionPointsQueue.drainTo(drained);
+            return drained;
         }
+        return Collections.emptyList();
+    }
 
-        CiVisibilityCountMetric metric = countMetrics[metricIdx];
-        TagValue[] tagValues = metric.getTagValues(counterIdx);
-        CiVisibilityMetricData metricData = metric.createData(counter, tagValues);
-        if (!rawMetricsQueue.offer(metricData)) {
-          // re-updating the counter to avoid losing metric data
-          add(metric, counter, tagValues);
-          return;
+    @Override
+    public void add(CiVisibilityCountMetric metric, long value, TagValue... tags) {
+        int counterIdx = metric.getIndex(tags);
+        counters.getAndAdd(counterIdx, value);
+
+        int dirtyCardIdx = counterIdx / COUNTER_CARD_SIZE;
+        counterDirtyCards[dirtyCardIdx].set(true);
+    }
+
+    @Override
+    public void prepareMetrics() {
+        int metricIdx = 0;
+        CiVisibilityCountMetric[] countMetrics = CiVisibilityCountMetric.values();
+
+        for (int dirtyCardIdx = 0; dirtyCardIdx < counterDirtyCards.length; dirtyCardIdx++) {
+            boolean dirty = counterDirtyCards[dirtyCardIdx].getAndSet(false);
+            if (!dirty) {
+                // none of the counters in this card was touched
+                continue;
+            }
+
+            int beginIdx = dirtyCardIdx * COUNTER_CARD_SIZE;
+            int endIdx = Math.min(beginIdx + COUNTER_CARD_SIZE, counters.length());
+            for (int counterIdx = beginIdx; counterIdx < endIdx; counterIdx++) {
+                while (countMetrics[metricIdx].getEndIndex() <= counterIdx) {
+                    metricIdx++;
+                }
+
+                long counter = counters.getAndSet(counterIdx, 0);
+                if (counter == 0) {
+                    continue;
+                }
+
+                CiVisibilityCountMetric metric = countMetrics[metricIdx];
+                TagValue[] tagValues = metric.getTagValues(counterIdx);
+                CiVisibilityMetricData metricData = metric.createData(counter, tagValues);
+                if (!rawMetricsQueue.offer(metricData)) {
+                    // re-updating the counter to avoid losing metric data
+                    add(metric, counter, tagValues);
+                    return;
+                }
+            }
         }
-      }
     }
-  }
-
-  @Override
-  public Collection<CiVisibilityMetricData> drain() {
-    if (!this.rawMetricsQueue.isEmpty()) {
-      List<CiVisibilityMetricData> drained = new ArrayList<>(this.rawMetricsQueue.size());
-      this.rawMetricsQueue.drainTo(drained);
-      return drained;
+
+    @Override
+    public Collection<CiVisibilityMetricData> drain() {
+        if (!this.rawMetricsQueue.isEmpty()) {
+            List<CiVisibilityMetricData> drained = new ArrayList<>(this.rawMetricsQueue.size());
+            this.rawMetricsQueue.drainTo(drained);
+            return drained;
+        }
+        return Collections.emptyList();
     }
-    return Collections.emptyList();
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionResults.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionResults.java
index 3db66fb88ea..73900255085 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionResults.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionResults.java
@@ -5,22 +5,22 @@
 
 public class ExecutionResults {
 
-  private final LongAdder testsSkippedByItr = new LongAdder();
-  private final AtomicBoolean hasFailedTestReplayTests = new AtomicBoolean();
+    private final LongAdder testsSkippedByItr = new LongAdder();
+    private final AtomicBoolean hasFailedTestReplayTests = new AtomicBoolean();
 
-  public void incrementTestsSkippedByItr() {
-    testsSkippedByItr.increment();
-  }
+    public void incrementTestsSkippedByItr() {
+        testsSkippedByItr.increment();
+    }
 
-  public long getTestsSkippedByItr() {
-    return testsSkippedByItr.sum();
-  }
+    public long getTestsSkippedByItr() {
+        return testsSkippedByItr.sum();
+    }
 
-  public void setHasFailedTestReplayTests() {
-    this.hasFailedTestReplayTests.set(true);
-  }
+    public void setHasFailedTestReplayTests() {
+        this.hasFailedTestReplayTests.set(true);
+    }
 
-  public boolean hasFailedTestReplayTests() {
-    return hasFailedTestReplayTests.get();
-  }
+    public boolean hasFailedTestReplayTests() {
+        return hasFailedTestReplayTests.get();
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java
index 2f3dfe1d8af..fc67eaa75df 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java
@@ -30,229 +30,229 @@
 
 public class ExecutionStrategy {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ExecutionStrategy.class);
-
-  private final AtomicInteger earlyFlakeDetectionsUsed = new AtomicInteger(0);
-  private final AtomicInteger autoRetriesUsed = new AtomicInteger(0);
-
-  @Nonnull private final Config config;
-  @Nonnull private final ExecutionSettings executionSettings;
-  @Nonnull private final SourcePathResolver sourcePathResolver;
-  @Nonnull private final LinesResolver linesResolver;
-
-  public ExecutionStrategy(
-      @Nonnull Config config,
-      @Nonnull ExecutionSettings executionSettings,
-      @Nonnull SourcePathResolver sourcePathResolver,
-      @Nonnull LinesResolver linesResolver) {
-    this.config = config;
-    this.executionSettings = executionSettings;
-    this.sourcePathResolver = sourcePathResolver;
-    this.linesResolver = linesResolver;
-  }
-
-  @Nonnull
-  public ExecutionSettings getExecutionSettings() {
-    return executionSettings;
-  }
-
-  public boolean isNew(@Nonnull TestIdentifier test) {
-    return executionSettings.isKnownTestsDataAvailable()
-        && !executionSettings.isKnown(test.toFQN());
-  }
-
-  private boolean isFlaky(@Nonnull TestIdentifier test) {
-    return executionSettings.isFlaky(test.toFQN());
-  }
-
-  public boolean isQuarantined(TestIdentifier test) {
-    TestManagementSettings testManagementSettings = executionSettings.getTestManagementSettings();
-    if (!testManagementSettings.isEnabled()) {
-      return false;
-    }
-    return executionSettings.isQuarantined(test.toFQN());
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExecutionStrategy.class);
 
-  public boolean isDisabled(TestIdentifier test) {
-    TestManagementSettings testManagementSettings = executionSettings.getTestManagementSettings();
-    if (!testManagementSettings.isEnabled()) {
-      return false;
-    }
-    return executionSettings.isDisabled(test.toFQN());
-  }
+    private final AtomicInteger earlyFlakeDetectionsUsed = new AtomicInteger(0);
+    private final AtomicInteger autoRetriesUsed = new AtomicInteger(0);
 
-  public boolean isAttemptToFix(TestIdentifier test) {
-    TestManagementSettings testManagementSettings = executionSettings.getTestManagementSettings();
-    if (!testManagementSettings.isEnabled()) {
-      return false;
-    }
-    return executionSettings.isAttemptToFix(test.toFQN());
-  }
+    @Nonnull
+    private final Config config;
 
-  @Nullable
-  public SkipReason skipReason(TestIdentifier test) {
-    if (test == null) {
-      return null;
-    }
+    @Nonnull
+    private final ExecutionSettings executionSettings;
 
-    // test should not be skipped if it is an attempt to fix, independent of TIA or Disabled
-    if (isAttemptToFix(test)) {
-      return null;
-    }
+    @Nonnull
+    private final SourcePathResolver sourcePathResolver;
+
+    @Nonnull
+    private final LinesResolver linesResolver;
 
-    if (isDisabled(test)) {
-      return SkipReason.DISABLED;
+    public ExecutionStrategy(
+            @Nonnull Config config,
+            @Nonnull ExecutionSettings executionSettings,
+            @Nonnull SourcePathResolver sourcePathResolver,
+            @Nonnull LinesResolver linesResolver) {
+        this.config = config;
+        this.executionSettings = executionSettings;
+        this.sourcePathResolver = sourcePathResolver;
+        this.linesResolver = linesResolver;
     }
 
-    if (!executionSettings.isTestSkippingEnabled()) {
-      return null;
+    @Nonnull
+    public ExecutionSettings getExecutionSettings() {
+        return executionSettings;
     }
 
-    Map<TestIdentifier, TestMetadata> skippableTests = executionSettings.getSkippableTests();
-    TestMetadata testMetadata = skippableTests.get(test);
-    if (testMetadata == null) {
-      return null;
+    public boolean isNew(@Nonnull TestIdentifier test) {
+        return executionSettings.isKnownTestsDataAvailable() && !executionSettings.isKnown(test.toFQN());
     }
-    if (config.isCiVisibilityCoverageLinesEnabled() && testMetadata.isMissingLineCodeCoverage()) {
-      return null;
+
+    private boolean isFlaky(@Nonnull TestIdentifier test) {
+        return executionSettings.isFlaky(test.toFQN());
     }
-    return SkipReason.ITR;
-  }
-
-  @Nonnull
-  public TestExecutionPolicy executionPolicy(
-      TestIdentifier test, TestSourceData testSource, Collection<String> testTags) {
-    if (test == null) {
-      return Regular.INSTANCE;
+
+    public boolean isQuarantined(TestIdentifier test) {
+        TestManagementSettings testManagementSettings = executionSettings.getTestManagementSettings();
+        if (!testManagementSettings.isEnabled()) {
+            return false;
+        }
+        return executionSettings.isQuarantined(test.toFQN());
     }
 
-    if (isAttemptToFix(test)) {
-      return new AttemptToFix(
-          executionSettings.getTestManagementSettings().getAttemptToFixRetries());
+    public boolean isDisabled(TestIdentifier test) {
+        TestManagementSettings testManagementSettings = executionSettings.getTestManagementSettings();
+        if (!testManagementSettings.isEnabled()) {
+            return false;
+        }
+        return executionSettings.isDisabled(test.toFQN());
     }
 
-    if (isEFDApplicable(test, testSource, testTags)) {
-      // check-then-act with "earlyFlakeDetectionsUsed" is not atomic here,
-      // but we don't care if we go "a bit" over the limit, it does not have to be precise
-      earlyFlakeDetectionsUsed.incrementAndGet();
-      return new EarlyFlakeDetection(
-          executionSettings.getEarlyFlakeDetectionSettings().getExecutionsByDuration(),
-          isQuarantined(test));
+    public boolean isAttemptToFix(TestIdentifier test) {
+        TestManagementSettings testManagementSettings = executionSettings.getTestManagementSettings();
+        if (!testManagementSettings.isEnabled()) {
+            return false;
+        }
+        return executionSettings.isAttemptToFix(test.toFQN());
     }
 
-    if (isAutoRetryApplicable(test)) {
-      // check-then-act with "autoRetriesUsed" is not atomic here,
-      // but we don't care if we go "a bit" over the limit, it does not have to be precise
-      if (executionSettings.getDynamicAutoTestRetrySettings().isEnabled()) {
-        return new DynamicAutoTestRetry(
-            executionSettings.getDynamicAutoTestRetrySettings(),
-            isQuarantined(test),
-            autoRetriesUsed);
-      }
-      return new AutoTestRetry(
-          config.getCiVisibilityFlakyRetryCount(), isQuarantined(test), autoRetriesUsed);
+    @Nullable
+    public SkipReason skipReason(TestIdentifier test) {
+        if (test == null) {
+            return null;
+        }
+
+        // test should not be skipped if it is an attempt to fix, independent of TIA or Disabled
+        if (isAttemptToFix(test)) {
+            return null;
+        }
+
+        if (isDisabled(test)) {
+            return SkipReason.DISABLED;
+        }
+
+        if (!executionSettings.isTestSkippingEnabled()) {
+            return null;
+        }
+
+        Map<TestIdentifier, TestMetadata> skippableTests = executionSettings.getSkippableTests();
+        TestMetadata testMetadata = skippableTests.get(test);
+        if (testMetadata == null) {
+            return null;
+        }
+        if (config.isCiVisibilityCoverageLinesEnabled() && testMetadata.isMissingLineCodeCoverage()) {
+            return null;
+        }
+        return SkipReason.ITR;
     }
 
-    if (isQuarantined(test)) {
-      return new Quarantine();
+    @Nonnull
+    public TestExecutionPolicy executionPolicy(
+            TestIdentifier test, TestSourceData testSource, Collection<String> testTags) {
+        if (test == null) {
+            return Regular.INSTANCE;
+        }
+
+        if (isAttemptToFix(test)) {
+            return new AttemptToFix(
+                    executionSettings.getTestManagementSettings().getAttemptToFixRetries());
+        }
+
+        if (isEFDApplicable(test, testSource, testTags)) {
+            // check-then-act with "earlyFlakeDetectionsUsed" is not atomic here,
+            // but we don't care if we go "a bit" over the limit, it does not have to be precise
+            earlyFlakeDetectionsUsed.incrementAndGet();
+            return new EarlyFlakeDetection(
+                    executionSettings.getEarlyFlakeDetectionSettings().getExecutionsByDuration(), isQuarantined(test));
+        }
+
+        if (isAutoRetryApplicable(test)) {
+            // check-then-act with "autoRetriesUsed" is not atomic here,
+            // but we don't care if we go "a bit" over the limit, it does not have to be precise
+            if (executionSettings.getDynamicAutoTestRetrySettings().isEnabled()) {
+                return new DynamicAutoTestRetry(
+                        executionSettings.getDynamicAutoTestRetrySettings(), isQuarantined(test), autoRetriesUsed);
+            }
+            return new AutoTestRetry(config.getCiVisibilityFlakyRetryCount(), isQuarantined(test), autoRetriesUsed);
+        }
+
+        if (isQuarantined(test)) {
+            return new Quarantine();
+        }
+
+        return Regular.INSTANCE;
     }
 
-    return Regular.INSTANCE;
-  }
+    private boolean isAutoRetryApplicable(TestIdentifier test) {
+        if (!executionSettings.isFlakyTestRetriesEnabled()) {
+            return false;
+        }
 
-  private boolean isAutoRetryApplicable(TestIdentifier test) {
-    if (!executionSettings.isFlakyTestRetriesEnabled()) {
-      return false;
+        return (!config.isCiVisibilityFlakyRetryOnlyKnownFlakes()
+                        || !executionSettings.isFlakyTestsDataAvailable()
+                        || executionSettings.isFlaky(test.toFQN()))
+                && autoRetriesUsed.get() < config.getCiVisibilityTotalFlakyRetryCount();
     }
 
-    return (!config.isCiVisibilityFlakyRetryOnlyKnownFlakes()
-            || !executionSettings.isFlakyTestsDataAvailable()
-            || executionSettings.isFlaky(test.toFQN()))
-        && autoRetriesUsed.get() < config.getCiVisibilityTotalFlakyRetryCount();
-  }
-
-  private boolean isEFDApplicable(
-      @Nonnull TestIdentifier test, TestSourceData testSource, Collection<String> testTags) {
-    EarlyFlakeDetectionSettings efdSettings = executionSettings.getEarlyFlakeDetectionSettings();
-    return efdSettings.isEnabled()
-        && !isEFDLimitReached()
-        && (isNew(test) || isModified(testSource))
-        // endsWith matching is needed for JUnit4-based frameworks, where tags are classes
-        && testTags.stream().noneMatch(t -> t.endsWith(CIConstants.Tags.EFD_DISABLE_TAG));
-  }
-
-  public boolean isEFDLimitReached() {
-    if (!executionSettings.isKnownTestsDataAvailable()) {
-      return false;
+    private boolean isEFDApplicable(
+            @Nonnull TestIdentifier test, TestSourceData testSource, Collection<String> testTags) {
+        EarlyFlakeDetectionSettings efdSettings = executionSettings.getEarlyFlakeDetectionSettings();
+        return efdSettings.isEnabled()
+                && !isEFDLimitReached()
+                && (isNew(test) || isModified(testSource))
+                // endsWith matching is needed for JUnit4-based frameworks, where tags are classes
+                && testTags.stream().noneMatch(t -> t.endsWith(CIConstants.Tags.EFD_DISABLE_TAG));
     }
 
-    int detectionsUsed = earlyFlakeDetectionsUsed.get();
-    int totalTests = executionSettings.getSettingCount(TestSetting.KNOWN) + detectionsUsed;
-    EarlyFlakeDetectionSettings earlyFlakeDetectionSettings =
-        executionSettings.getEarlyFlakeDetectionSettings();
-    int threshold =
-        Math.max(
-            config.getCiVisibilityEarlyFlakeDetectionLowerLimit(),
-            totalTests * earlyFlakeDetectionSettings.getFaultySessionThreshold() / 100);
-
-    return detectionsUsed > threshold;
-  }
-
-  public boolean isModified(@Nonnull TestSourceData testSourceData) {
-    Class<?> testClass = testSourceData.getTestClass();
-    if (testClass == null) {
-      return false;
-    }
-    try {
-      Collection<String> sourcePaths = sourcePathResolver.getSourcePaths(testClass);
-      if (sourcePaths.size() != 1) {
-        return false;
-      }
-      String sourcePath = sourcePaths.iterator().next();
-
-      LinesResolver.Lines lines = getLines(testSourceData.getTestMethod());
-      return executionSettings
-          .getPullRequestDiff()
-          .contains(sourcePath, lines.getStartLineNumber(), lines.getEndLineNumber());
-
-    } catch (Exception e) {
-      LOGGER.debug("Could not determine if {} was modified, assuming false", testSourceData, e);
-      return false;
-    }
-  }
-
-  private LinesResolver.Lines getLines(Method testMethod) {
-    if (testMethod == null) {
-      // method for this test case could not be determined,
-      // so we fall back to lower granularity
-      // and assume that the test was modified if there were any changes in the file
-      return new LinesResolver.Lines(0, Integer.MAX_VALUE);
-    } else {
-      return linesResolver.getMethodLines(testMethod);
-    }
-  }
-
-  /**
-   * Returns the priority of the test execution that can be used for ordering tests. The higher the
-   * value, the higher the priority, meaning that the test should be executed earlier.
-   */
-  public int executionPriority(@Nullable TestIdentifier test, @Nonnull TestSourceData testSource) {
-    if (test == null) {
-      return 0;
+    public boolean isEFDLimitReached() {
+        if (!executionSettings.isKnownTestsDataAvailable()) {
+            return false;
+        }
+
+        int detectionsUsed = earlyFlakeDetectionsUsed.get();
+        int totalTests = executionSettings.getSettingCount(TestSetting.KNOWN) + detectionsUsed;
+        EarlyFlakeDetectionSettings earlyFlakeDetectionSettings = executionSettings.getEarlyFlakeDetectionSettings();
+        int threshold = Math.max(
+                config.getCiVisibilityEarlyFlakeDetectionLowerLimit(),
+                totalTests * earlyFlakeDetectionSettings.getFaultySessionThreshold() / 100);
+
+        return detectionsUsed > threshold;
     }
-    if (isNew(test)) {
-      // execute new tests first
-      return 300;
+
+    public boolean isModified(@Nonnull TestSourceData testSourceData) {
+        Class<?> testClass = testSourceData.getTestClass();
+        if (testClass == null) {
+            return false;
+        }
+        try {
+            Collection<String> sourcePaths = sourcePathResolver.getSourcePaths(testClass);
+            if (sourcePaths.size() != 1) {
+                return false;
+            }
+            String sourcePath = sourcePaths.iterator().next();
+
+            LinesResolver.Lines lines = getLines(testSourceData.getTestMethod());
+            return executionSettings
+                    .getPullRequestDiff()
+                    .contains(sourcePath, lines.getStartLineNumber(), lines.getEndLineNumber());
+
+        } catch (Exception e) {
+            LOGGER.debug("Could not determine if {} was modified, assuming false", testSourceData, e);
+            return false;
+        }
     }
-    if (isModified(testSource)) {
-      // then modified tests
-      return 200;
+
+    private LinesResolver.Lines getLines(Method testMethod) {
+        if (testMethod == null) {
+            // method for this test case could not be determined,
+            // so we fall back to lower granularity
+            // and assume that the test was modified if there were any changes in the file
+            return new LinesResolver.Lines(0, Integer.MAX_VALUE);
+        } else {
+            return linesResolver.getMethodLines(testMethod);
+        }
     }
-    if (isFlaky(test)) {
-      // then tests known to be flaky
-      return 100;
+
+    /**
+     * Returns the priority of the test execution that can be used for ordering tests. The higher the
+     * value, the higher the priority, meaning that the test should be executed earlier.
+     */
+    public int executionPriority(@Nullable TestIdentifier test, @Nonnull TestSourceData testSource) {
+        if (test == null) {
+            return 0;
+        }
+        if (isNew(test)) {
+            // execute new tests first
+            return 300;
+        }
+        if (isModified(testSource)) {
+            // then modified tests
+            return 200;
+        }
+        if (isFlaky(test)) {
+            // then tests known to be flaky
+            return 100;
+        }
+        // then the rest
+        return 0;
     }
-    // then the rest
-    return 0;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/FileUtils.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/FileUtils.java
index eb668ac8b4b..42f069121a6 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/FileUtils.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/FileUtils.java
@@ -15,81 +15,78 @@
 @SuppressForbidden
 public abstract class FileUtils {
 
-  private static final Logger log = LoggerFactory.getLogger(FileUtils.class);
+    private static final Logger log = LoggerFactory.getLogger(FileUtils.class);
 
-  private FileUtils() {}
+    private FileUtils() {}
 
-  public static void delete(Path directory) throws IOException {
-    Files.walkFileTree(
-        directory,
-        new SimpleFileVisitor<Path>() {
-          @Override
-          public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-              throws IOException {
-            Files.delete(file);
-            return FileVisitResult.CONTINUE;
-          }
+    public static void delete(Path directory) throws IOException {
+        Files.walkFileTree(directory, new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                Files.delete(file);
+                return FileVisitResult.CONTINUE;
+            }
 
-          @Override
-          public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
-            Files.delete(dir);
-            return FileVisitResult.CONTINUE;
-          }
+            @Override
+            public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                Files.delete(dir);
+                return FileVisitResult.CONTINUE;
+            }
         });
-  }
-
-  /**
-   * Search the parent path that contains the target file. If the current path does not have the
-   * target file, the method continues with the parent path. If the path is not found, it returns
-   * null.
-   *
-   * @param current
-   * @param target
-   * @return the parent path that contains the target file.
-   */
-  public static Path findParentPathBackwards(
-      final Path current, final String target, final boolean isTargetDirectory) {
-    if (current == null || target == null || target.isEmpty()) {
-      return null;
     }
 
-    final Path targetPath = current.resolve(target);
-    if (Files.exists(targetPath)) {
-      if (isTargetDirectory && Files.isDirectory(targetPath)) {
-        return current;
-      } else if (!isTargetDirectory && Files.isRegularFile(targetPath)) {
-        return current;
-      } else {
-        return findParentPathBackwards(current.getParent(), target, isTargetDirectory);
-      }
-    } else {
-      return findParentPathBackwards(current.getParent(), target, isTargetDirectory);
-    }
-  }
+    /**
+     * Search the parent path that contains the target file. If the current path does not have the
+     * target file, the method continues with the parent path. If the path is not found, it returns
+     * null.
+     *
+     * @param current
+     * @param target
+     * @return the parent path that contains the target file.
+     */
+    public static Path findParentPathBackwards(
+            final Path current, final String target, final boolean isTargetDirectory) {
+        if (current == null || target == null || target.isEmpty()) {
+            return null;
+        }
 
-  public static String expandTilde(final String path) {
-    if (path == null || !path.startsWith("~")) {
-      return path;
+        final Path targetPath = current.resolve(target);
+        if (Files.exists(targetPath)) {
+            if (isTargetDirectory && Files.isDirectory(targetPath)) {
+                return current;
+            } else if (!isTargetDirectory && Files.isRegularFile(targetPath)) {
+                return current;
+            } else {
+                return findParentPathBackwards(current.getParent(), target, isTargetDirectory);
+            }
+        } else {
+            return findParentPathBackwards(current.getParent(), target, isTargetDirectory);
+        }
     }
 
-    if (!path.equals("~") && !path.startsWith("~/")) {
-      // Home dir expansion is not supported for other user.
-      // Returning path without modifications.
-      return path;
-    }
+    public static String expandTilde(final String path) {
+        if (path == null || !path.startsWith("~")) {
+            return path;
+        }
 
-    return path.replaceFirst("^~", SystemProperties.getOrDefault("user.home", ""));
-  }
+        if (!path.equals("~") && !path.startsWith("~/")) {
+            // Home dir expansion is not supported for other user.
+            // Returning path without modifications.
+            return path;
+        }
 
-  public static String toRealPath(String path) {
-    if (path == null) {
-      return null;
+        return path.replaceFirst("^~", SystemProperties.getOrDefault("user.home", ""));
     }
-    try {
-      return Paths.get(path).toRealPath().toString();
-    } catch (Exception e) {
-      log.debug("Could not determine real path for {}", path, e);
-      return path;
+
+    public static String toRealPath(String path) {
+        if (path == null) {
+            return null;
+        }
+        try {
+            return Paths.get(path).toRealPath().toString();
+        } catch (Exception e) {
+            log.debug("Could not determine real path for {}", path, e);
+            return path;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ShellCommandExecutor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ShellCommandExecutor.java
index 92103b75fd4..23e32d55b52 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ShellCommandExecutor.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ShellCommandExecutor.java
@@ -21,231 +21,220 @@
 
 public class ShellCommandExecutor {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ShellCommandExecutor.class);
-
-  private static final int NORMAL_TERMINATION_TIMEOUT_MILLIS = 3000;
-
-  private final File executionFolder;
-  private final long timeoutMillis;
-  private final Map<String, String> environment;
-
-  public ShellCommandExecutor(File executionFolder, long timeoutMillis) {
-    this(executionFolder, timeoutMillis, Collections.emptyMap());
-  }
-
-  public ShellCommandExecutor(
-      File executionFolder, long timeoutMillis, Map<String, String> environment) {
-    this.executionFolder = executionFolder;
-    this.timeoutMillis = timeoutMillis;
-    this.environment = environment;
-  }
-
-  /**
-   * Executes given shell command and returns parsed output
-   *
-   * @param outputParser Parses that is used to process command output
-   * @param command Command to be executed
-   * @return Parsed command output
-   * @param <T> Type of parsed command output
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for command to
-   *     finish
-   */
-  public <T> T executeCommand(OutputParser<T> outputParser, String... command)
-      throws IOException, InterruptedException, TimeoutException {
-    return executeCommand(outputParser, null, false, command);
-  }
-
-  /**
-   * Executes given shell command, supplies to it provided input, and returns parsed output
-   *
-   * @param outputParser Parses that is used to process command output
-   * @param input Bytes that are written to command's input stream
-   * @param command Command to be executed
-   * @return Parsed command output
-   * @param <T> Type of parsed command output
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for command to
-   *     finish
-   */
-  public <T> T executeCommand(OutputParser<T> outputParser, byte[] input, String... command)
-      throws IOException, InterruptedException, TimeoutException {
-    return executeCommand(outputParser, input, false, command);
-  }
-
-  /**
-   * Executes given shell command and returns parsed error stream
-   *
-   * @param errorParser Parses that is used to process command's error stream
-   * @param command Command to be executed
-   * @return Parsed command output
-   * @param <T> Type of parsed command output
-   * @throws IOException If an error was encountered while writing command input or reading output
-   * @throws TimeoutException If timeout was reached while waiting for command to finish
-   * @throws InterruptedException If current thread was interrupted while waiting for command to
-   *     finish
-   */
-  public <T> T executeCommandReadingError(OutputParser<T> errorParser, String... command)
-      throws IOException, InterruptedException, TimeoutException {
-    return executeCommand(errorParser, null, true, command);
-  }
-
-  private <T> T executeCommand(
-      OutputParser<T> outputParser, byte[] input, boolean readFromError, String... command)
-      throws IOException, TimeoutException, InterruptedException {
-    Process p = null;
-
-    // mute tracing to prevent process instrumentation from creating a span for the forked process
-    try (TraceScope scope = AgentTracer.get().muteTracing()) {
-      ProcessBuilder processBuilder = new ProcessBuilder(command);
-      processBuilder.directory(executionFolder);
-
-      if (!environment.isEmpty()) {
-        processBuilder.environment().putAll(environment);
-      }
-
-      p = processBuilder.start();
-
-      StreamConsumer inputStreamConsumer = new StreamConsumer(p.getInputStream());
-      Thread inputStreamThread =
-          AgentThreadFactory.newAgentThread(
-              AgentThread.CI_SHELL_COMMAND,
-              "-input-stream-consumer-" + command[0],
-              inputStreamConsumer,
-              true);
-      inputStreamThread.start();
-
-      StreamConsumer errorStreamConsumer = new StreamConsumer(p.getErrorStream());
-      Thread errorStreamThread =
-          AgentThreadFactory.newAgentThread(
-              AgentThread.CI_SHELL_COMMAND,
-              "-error-stream-consumer-" + command[0],
-              errorStreamConsumer,
-              true);
-      errorStreamThread.start();
-
-      if (input != null) {
-        p.getOutputStream().write(input);
-        p.getOutputStream().close();
-      }
-
-      if (p.waitFor(timeoutMillis, TimeUnit.MILLISECONDS)) {
-        int exitValue = p.exitValue();
-        if (exitValue != 0) {
-          throw new ShellCommandFailedException(
-              exitValue,
-              "Command '"
-                  + String.join(" ", command)
-                  + "' failed with exit code "
-                  + exitValue
-                  + ": "
-                  + IOUtils.readFully(errorStreamConsumer.read(), Charset.defaultCharset()));
-        }
+    private static final Logger LOGGER = LoggerFactory.getLogger(ShellCommandExecutor.class);
 
-        if (outputParser != OutputParser.IGNORE) {
-          if (readFromError) {
-            errorStreamThread.join(NORMAL_TERMINATION_TIMEOUT_MILLIS);
-            return outputParser.parse(errorStreamConsumer.read());
-          } else {
-            inputStreamThread.join(NORMAL_TERMINATION_TIMEOUT_MILLIS);
-            return outputParser.parse(inputStreamConsumer.read());
-          }
-        } else {
-          return null;
-        }
+    private static final int NORMAL_TERMINATION_TIMEOUT_MILLIS = 3000;
 
-      } else {
-        terminate(p);
-        throw new TimeoutException(
-            "Timeout while waiting for '"
-                + String.join(" ", command)
-                + "'; in "
-                + executionFolder
-                + "\n StdOut: \n"
-                + IOUtils.readFully(inputStreamConsumer.read(), Charset.defaultCharset())
-                + "\n StdErr: \n "
-                + IOUtils.readFully(errorStreamConsumer.read(), Charset.defaultCharset()));
-      }
-    } catch (InterruptedException e) {
-      terminate(p);
-      throw e;
+    private final File executionFolder;
+    private final long timeoutMillis;
+    private final Map<String, String> environment;
+
+    public ShellCommandExecutor(File executionFolder, long timeoutMillis) {
+        this(executionFolder, timeoutMillis, Collections.emptyMap());
     }
-  }
 
-  private void terminate(Process p) throws InterruptedException {
-    if (p == null) {
-      return;
+    public ShellCommandExecutor(File executionFolder, long timeoutMillis, Map<String, String> environment) {
+        this.executionFolder = executionFolder;
+        this.timeoutMillis = timeoutMillis;
+        this.environment = environment;
     }
-    p.destroy();
-    try {
-      if (!p.waitFor(NORMAL_TERMINATION_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)) {
-        p.destroyForcibly();
-      }
-    } catch (InterruptedException e) {
-      p.destroyForcibly();
-      throw e;
+
+    /**
+     * Executes given shell command and returns parsed output
+     *
+     * @param outputParser Parses that is used to process command output
+     * @param command Command to be executed
+     * @return Parsed command output
+     * @param <T> Type of parsed command output
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for command to
+     *     finish
+     */
+    public <T> T executeCommand(OutputParser<T> outputParser, String... command)
+            throws IOException, InterruptedException, TimeoutException {
+        return executeCommand(outputParser, null, false, command);
     }
-  }
 
-  private static final class StreamConsumer implements Runnable {
-    private final byte[] buffer = new byte[2048];
-    private final ByteArrayOutputStream output = new ByteArrayOutputStream();
-    private final InputStream input;
+    /**
+     * Executes given shell command, supplies to it provided input, and returns parsed output
+     *
+     * @param outputParser Parses that is used to process command output
+     * @param input Bytes that are written to command's input stream
+     * @param command Command to be executed
+     * @return Parsed command output
+     * @param <T> Type of parsed command output
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for command to
+     *     finish
+     */
+    public <T> T executeCommand(OutputParser<T> outputParser, byte[] input, String... command)
+            throws IOException, InterruptedException, TimeoutException {
+        return executeCommand(outputParser, input, false, command);
+    }
 
-    private StreamConsumer(InputStream input) {
-      this.input = input;
+    /**
+     * Executes given shell command and returns parsed error stream
+     *
+     * @param errorParser Parses that is used to process command's error stream
+     * @param command Command to be executed
+     * @return Parsed command output
+     * @param <T> Type of parsed command output
+     * @throws IOException If an error was encountered while writing command input or reading output
+     * @throws TimeoutException If timeout was reached while waiting for command to finish
+     * @throws InterruptedException If current thread was interrupted while waiting for command to
+     *     finish
+     */
+    public <T> T executeCommandReadingError(OutputParser<T> errorParser, String... command)
+            throws IOException, InterruptedException, TimeoutException {
+        return executeCommand(errorParser, null, true, command);
     }
 
-    @Override
-    public void run() {
-      try {
-        int read;
-        while ((read = input.read(buffer)) != -1) {
-          output.write(buffer, 0, read);
+    private <T> T executeCommand(OutputParser<T> outputParser, byte[] input, boolean readFromError, String... command)
+            throws IOException, TimeoutException, InterruptedException {
+        Process p = null;
+
+        // mute tracing to prevent process instrumentation from creating a span for the forked process
+        try (TraceScope scope = AgentTracer.get().muteTracing()) {
+            ProcessBuilder processBuilder = new ProcessBuilder(command);
+            processBuilder.directory(executionFolder);
+
+            if (!environment.isEmpty()) {
+                processBuilder.environment().putAll(environment);
+            }
+
+            p = processBuilder.start();
+
+            StreamConsumer inputStreamConsumer = new StreamConsumer(p.getInputStream());
+            Thread inputStreamThread = AgentThreadFactory.newAgentThread(
+                    AgentThread.CI_SHELL_COMMAND, "-input-stream-consumer-" + command[0], inputStreamConsumer, true);
+            inputStreamThread.start();
+
+            StreamConsumer errorStreamConsumer = new StreamConsumer(p.getErrorStream());
+            Thread errorStreamThread = AgentThreadFactory.newAgentThread(
+                    AgentThread.CI_SHELL_COMMAND, "-error-stream-consumer-" + command[0], errorStreamConsumer, true);
+            errorStreamThread.start();
+
+            if (input != null) {
+                p.getOutputStream().write(input);
+                p.getOutputStream().close();
+            }
+
+            if (p.waitFor(timeoutMillis, TimeUnit.MILLISECONDS)) {
+                int exitValue = p.exitValue();
+                if (exitValue != 0) {
+                    throw new ShellCommandFailedException(
+                            exitValue,
+                            "Command '"
+                                    + String.join(" ", command)
+                                    + "' failed with exit code "
+                                    + exitValue
+                                    + ": "
+                                    + IOUtils.readFully(errorStreamConsumer.read(), Charset.defaultCharset()));
+                }
+
+                if (outputParser != OutputParser.IGNORE) {
+                    if (readFromError) {
+                        errorStreamThread.join(NORMAL_TERMINATION_TIMEOUT_MILLIS);
+                        return outputParser.parse(errorStreamConsumer.read());
+                    } else {
+                        inputStreamThread.join(NORMAL_TERMINATION_TIMEOUT_MILLIS);
+                        return outputParser.parse(inputStreamConsumer.read());
+                    }
+                } else {
+                    return null;
+                }
+
+            } else {
+                terminate(p);
+                throw new TimeoutException("Timeout while waiting for '"
+                        + String.join(" ", command)
+                        + "'; in "
+                        + executionFolder
+                        + "\n StdOut: \n"
+                        + IOUtils.readFully(inputStreamConsumer.read(), Charset.defaultCharset())
+                        + "\n StdErr: \n "
+                        + IOUtils.readFully(errorStreamConsumer.read(), Charset.defaultCharset()));
+            }
+        } catch (InterruptedException e) {
+            terminate(p);
+            throw e;
         }
-      } catch (Exception e) {
-        LOGGER.debug("Error while reading from process stream", e);
-      }
     }
 
-    InputStream read() {
-      return new ByteArrayInputStream(output.toByteArray());
+    private void terminate(Process p) throws InterruptedException {
+        if (p == null) {
+            return;
+        }
+        p.destroy();
+        try {
+            if (!p.waitFor(NORMAL_TERMINATION_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)) {
+                p.destroyForcibly();
+            }
+        } catch (InterruptedException e) {
+            p.destroyForcibly();
+            throw e;
+        }
     }
-  }
 
-  public interface OutputParser<T> {
-    OutputParser<Void> IGNORE = is -> null;
+    private static final class StreamConsumer implements Runnable {
+        private final byte[] buffer = new byte[2048];
+        private final ByteArrayOutputStream output = new ByteArrayOutputStream();
+        private final InputStream input;
+
+        private StreamConsumer(InputStream input) {
+            this.input = input;
+        }
+
+        @Override
+        public void run() {
+            try {
+                int read;
+                while ((read = input.read(buffer)) != -1) {
+                    output.write(buffer, 0, read);
+                }
+            } catch (Exception e) {
+                LOGGER.debug("Error while reading from process stream", e);
+            }
+        }
 
-    T parse(InputStream inputStream) throws IOException;
-  }
+        InputStream read() {
+            return new ByteArrayInputStream(output.toByteArray());
+        }
+    }
 
-  public static final class ShellCommandFailedException extends IOException {
-    private final int exitCode;
+    public interface OutputParser<T> {
+        OutputParser<Void> IGNORE = is -> null;
 
-    public ShellCommandFailedException(int exitCode, String message) {
-      super(message);
-      this.exitCode = exitCode;
+        T parse(InputStream inputStream) throws IOException;
     }
 
-    public int getExitCode() {
-      return exitCode;
+    public static final class ShellCommandFailedException extends IOException {
+        private final int exitCode;
+
+        public ShellCommandFailedException(int exitCode, String message) {
+            super(message);
+            this.exitCode = exitCode;
+        }
+
+        public int getExitCode() {
+            return exitCode;
+        }
     }
-  }
-
-  public static ExitCode getExitCode(Exception e) {
-    if (e instanceof ShellCommandFailedException) {
-      ShellCommandFailedException scfe = (ShellCommandFailedException) e;
-      return ExitCode.from(scfe.getExitCode());
-
-    } else {
-      String m = e.getMessage();
-      if (m != null && m.toLowerCase().contains("no such file or directory")) {
-        return ExitCode.EXECUTABLE_MISSING;
-      } else {
-        return ExitCode.CODE_UNKNOWN;
-      }
+
+    public static ExitCode getExitCode(Exception e) {
+        if (e instanceof ShellCommandFailedException) {
+            ShellCommandFailedException scfe = (ShellCommandFailedException) e;
+            return ExitCode.from(scfe.getExitCode());
+
+        } else {
+            String m = e.getMessage();
+            if (m != null && m.toLowerCase().contains("no such file or directory")) {
+                return ExitCode.EXECUTABLE_MISSING;
+            } else {
+                return ExitCode.CODE_UNKNOWN;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/StrongMapContextStore.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/StrongMapContextStore.java
index 4cffe0ffb36..61298ece4e2 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/StrongMapContextStore.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/StrongMapContextStore.java
@@ -7,31 +7,31 @@
 
 /** Substitute {@link ContextStore} that uses strong-references to track contexts. */
 public class StrongMapContextStore<K, C> implements ContextStore<K, C> {
-  private final ConcurrentMap<K, C> map = new ConcurrentHashMap<>();
+    private final ConcurrentMap<K, C> map = new ConcurrentHashMap<>();
 
-  @Override
-  public C get(K key) {
-    return map.get(key);
-  }
+    @Override
+    public C get(K key) {
+        return map.get(key);
+    }
 
-  @Override
-  public void put(K key, C context) {
-    map.put(key, context);
-  }
+    @Override
+    public void put(K key, C context) {
+        map.put(key, context);
+    }
 
-  @Override
-  public C getOrPut(K key, C context) {
-    C existing = map.putIfAbsent(key, context);
-    return existing != null ? existing : context;
-  }
+    @Override
+    public C getOrPut(K key, C context) {
+        C existing = map.putIfAbsent(key, context);
+        return existing != null ? existing : context;
+    }
 
-  @Override
-  public C getOrCompute(K key, Function<? super K, C> contextFactory) {
-    return map.computeIfAbsent(key, contextFactory);
-  }
+    @Override
+    public C getOrCompute(K key, Function<? super K, C> contextFactory) {
+        return map.computeIfAbsent(key, contextFactory);
+    }
 
-  @Override
-  public C remove(K key) {
-    return map.remove(key);
-  }
+    @Override
+    public C remove(K key) {
+        return map.remove(key);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/codeowners/CodeownersTest.java b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/codeowners/CodeownersTest.java
index 8aae727bc89..76583e15e73 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/codeowners/CodeownersTest.java
+++ b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/codeowners/CodeownersTest.java
@@ -22,150 +22,142 @@
 
 class CodeownersTest {
 
-  private static final String GITHUB_SAMPLE = "ci/codeowners/CODEOWNERS_sample";
-  private static final String GITLAB_SAMPLE = "ci/codeowners/CODEOWNERS_gitlab_sample";
+    private static final String GITHUB_SAMPLE = "ci/codeowners/CODEOWNERS_sample";
+    private static final String GITLAB_SAMPLE = "ci/codeowners/CODEOWNERS_gitlab_sample";
 
-  @ParameterizedTest(name = "[{0}] owners of {1} are {2}")
-  @MethodSource("testCodeownersMatchingArguments")
-  void testCodeownersMatching(String resource, String path, List<String> expectedOwners)
-      throws IOException {
-    Codeowners codeowners = parse(resource);
-    assertEquals(expectedOwners, codeowners.getOwners(path));
-    Codeowners indexedCodeowners = parseWithActivatedIndexes(resource);
-    assertEquals(expectedOwners, indexedCodeowners.getOwners(path));
-  }
-
-  @Test
-  void testIndexedAndFallbackEntriesPreservePriority() throws IOException {
-    StringBuilder content = new StringBuilder();
-    for (int i = 0; i < 510; i++) {
-      content.append("/dummy").append(i).append("/file @dummy\n");
+    @ParameterizedTest(name = "[{0}] owners of {1} are {2}")
+    @MethodSource("testCodeownersMatchingArguments")
+    void testCodeownersMatching(String resource, String path, List<String> expectedOwners) throws IOException {
+        Codeowners codeowners = parse(resource);
+        assertEquals(expectedOwners, codeowners.getOwners(path));
+        Codeowners indexedCodeowners = parseWithActivatedIndexes(resource);
+        assertEquals(expectedOwners, indexedCodeowners.getOwners(path));
     }
-    content.append("/service/target @indexed-before\n");
-    content.append("/**/target @fallback-after\n");
-    content.append("/other/* @fallback-before\n");
-    content.append("/other/target @indexed-after\n");
 
-    Codeowners codeowners = CodeownersImpl.parse(new StringReader(content.toString()));
+    @Test
+    void testIndexedAndFallbackEntriesPreservePriority() throws IOException {
+        StringBuilder content = new StringBuilder();
+        for (int i = 0; i < 510; i++) {
+            content.append("/dummy").append(i).append("/file @dummy\n");
+        }
+        content.append("/service/target @indexed-before\n");
+        content.append("/**/target @fallback-after\n");
+        content.append("/other/* @fallback-before\n");
+        content.append("/other/target @indexed-after\n");
 
-    assertEquals(singletonList("@fallback-after"), codeowners.getOwners("service/target"));
-    assertEquals(singletonList("@indexed-after"), codeowners.getOwners("other/target"));
-  }
+        Codeowners codeowners = CodeownersImpl.parse(new StringReader(content.toString()));
 
-  @Test
-  void testSingleSectionOwnersAreNormalizedAndIndependent() throws IOException {
-    Codeowners codeowners = CodeownersImpl.parse(new StringReader("* @team @team"));
+        assertEquals(singletonList("@fallback-after"), codeowners.getOwners("service/target"));
+        assertEquals(singletonList("@indexed-after"), codeowners.getOwners("other/target"));
+    }
 
-    Collection<String> owners = codeowners.getOwners("source/File.java");
-    assertEquals(singletonList("@team"), owners);
-    owners.add("@other-team");
+    @Test
+    void testSingleSectionOwnersAreNormalizedAndIndependent() throws IOException {
+        Codeowners codeowners = CodeownersImpl.parse(new StringReader("* @team @team"));
 
-    assertEquals(singletonList("@team"), codeowners.getOwners("source/File.java"));
-  }
+        Collection<String> owners = codeowners.getOwners("source/File.java");
+        assertEquals(singletonList("@team"), owners);
+        owners.add("@other-team");
 
-  static Stream<Arguments> testCodeownersMatchingArguments() {
-    List<String> globalOwners = asList("@global-owner1", "@global-owner2");
-    return Stream.of(
-        // --- GitHub baseline: behavior must remain unchanged ---
-        arguments(GITHUB_SAMPLE, "MyClass.java", globalOwners),
-        arguments(GITHUB_SAMPLE, "folder/MyClass.java", globalOwners),
-        arguments(GITHUB_SAMPLE, "script.js", singletonList("@js-owner")),
-        arguments(GITHUB_SAMPLE, "inner/folder/script.js", singletonList("@js-owner")),
-        arguments(GITHUB_SAMPLE, "scripts/script.js", asList("@doctocat", "@octocat")),
-        arguments(GITHUB_SAMPLE, "scripts/inner/script.js", asList("@doctocat", "@octocat")),
-        arguments(GITHUB_SAMPLE, "build/logs/current.log", singletonList("@doctocat")),
-        arguments(GITHUB_SAMPLE, "build/logs/inner/current.log", singletonList("@doctocat")),
-        arguments(GITHUB_SAMPLE, "build/logs-v2/current.log", singletonList("@doctocat")),
-        arguments(GITHUB_SAMPLE, "module/build/logs/current.log", globalOwners),
-        arguments(GITHUB_SAMPLE, "apps/app1.exe", singletonList("@octocat")),
-        arguments(GITHUB_SAMPLE, "apps/inner/app2.exe", singletonList("@octocat")),
-        arguments(GITHUB_SAMPLE, "module/apps/app3.exe", singletonList("@octocat")),
-        arguments(GITHUB_SAMPLE, "docs/intro.doc", singletonList("@doctocat")),
-        arguments(GITHUB_SAMPLE, "docs/important/doc.doc", singletonList("@doctocat")),
-        arguments(GITHUB_SAMPLE, "applications/application", singletonList("@appowner")),
-        arguments(GITHUB_SAMPLE, "applications/module/application", singletonList("@appowner")),
-        arguments(GITHUB_SAMPLE, "applications/github/githubApplication", emptyList()),
-        arguments(GITHUB_SAMPLE, "documentation/doc.md", singletonList("docs@example.com")),
-        arguments(GITHUB_SAMPLE, "documentation/inner/doc.md", globalOwners),
-        arguments(
-            GITHUB_SAMPLE, "documentation/inner/doc.txt", singletonList("@octo-org/octocats")),
-        // --- GitLab sections: a path's owners combine the winning match from every section,
-        // including the unnamed section (the leading "* @global-owner") ---
-        arguments(GITLAB_SAMPLE, "random/file.txt", singletonList("@global-owner")),
-        // exclusions also apply to the unnamed section
-        arguments(GITLAB_SAMPLE, "unowned.txt", emptyList()),
-        // section default owners are inherited and combined with the global owner
-        arguments(GITLAB_SAMPLE, "docs/guide.md", asList("@global-owner", "@docs-team")),
-        arguments(GITLAB_SAMPLE, "README.md", asList("@global-owner", "@docs-team")),
-        arguments(
-            GITLAB_SAMPLE,
-            "model/db/users.sql",
-            asList("@global-owner", "@database-team", "@dba-lead")),
-        // per-entry owners override the section default within that section
-        arguments(
-            GITLAB_SAMPLE,
-            "config/db/setup.sql",
-            asList("@global-owner", "@special-owner", "@config-team")),
-        // optional section (^[...]) defaults are inherited just like required ones
-        arguments(GITLAB_SAMPLE, "src/app.js", asList("@global-owner", "@frontend-team")),
-        arguments(GITLAB_SAMPLE, "src/styles.css", asList("@global-owner", "@css-owner")),
-        // a section without default owners keeps each entry's own owners
-        arguments(GITLAB_SAMPLE, "scripts/deploy.sh", asList("@global-owner", "@scripts-team")),
-        // the required-approvals count in the header is ignored for ownership
-        arguments(GITLAB_SAMPLE, "secrets/key.txt", asList("@global-owner", "@security-team")),
-        // a header immediately followed by a comment is a valid header with no default owners, so
-        // this entry does not inherit the previous section's owners (only the global owner applies)
-        arguments(GITLAB_SAMPLE, "generated/report.txt", singletonList("@global-owner")),
-        // duplicate section names (case-insensitive) are combined into one section: a path matching
-        // entries in both blocks resolves to the last matching entry's owners, not both
-        arguments(GITLAB_SAMPLE, "service/util.go", asList("@global-owner", "@backend-team-a")),
-        arguments(
-            GITLAB_SAMPLE, "service/api/handler.go", asList("@global-owner", "@backend-team-b")),
-        // exclusions suppress only their section and cannot be overridden by a later entry
-        arguments(
-            GITLAB_SAMPLE,
-            "generated-assets/output.txt",
-            asList("@global-owner", "@generated-files-team")),
-        arguments(
-            GITLAB_SAMPLE,
-            "generated-assets/excluded/output.txt",
-            asList("@global-owner", "@other-generated-files-team")),
-        arguments(
-            GITLAB_SAMPLE,
-            "generated-assets/excluded-v2/output.txt",
-            asList("@global-owner", "@other-generated-files-team")),
-        arguments(
-            GITLAB_SAMPLE,
-            "generated-assets/excluded/special.txt",
-            asList("@global-owner", "@other-generated-files-team")));
-  }
+        assertEquals(singletonList("@team"), codeowners.getOwners("source/File.java"));
+    }
 
-  private static Codeowners parse(String resource) throws IOException {
-    return CodeownersImpl.parse(new StringReader(read(resource)));
-  }
+    static Stream<Arguments> testCodeownersMatchingArguments() {
+        List<String> globalOwners = asList("@global-owner1", "@global-owner2");
+        return Stream.of(
+                // --- GitHub baseline: behavior must remain unchanged ---
+                arguments(GITHUB_SAMPLE, "MyClass.java", globalOwners),
+                arguments(GITHUB_SAMPLE, "folder/MyClass.java", globalOwners),
+                arguments(GITHUB_SAMPLE, "script.js", singletonList("@js-owner")),
+                arguments(GITHUB_SAMPLE, "inner/folder/script.js", singletonList("@js-owner")),
+                arguments(GITHUB_SAMPLE, "scripts/script.js", asList("@doctocat", "@octocat")),
+                arguments(GITHUB_SAMPLE, "scripts/inner/script.js", asList("@doctocat", "@octocat")),
+                arguments(GITHUB_SAMPLE, "build/logs/current.log", singletonList("@doctocat")),
+                arguments(GITHUB_SAMPLE, "build/logs/inner/current.log", singletonList("@doctocat")),
+                arguments(GITHUB_SAMPLE, "build/logs-v2/current.log", singletonList("@doctocat")),
+                arguments(GITHUB_SAMPLE, "module/build/logs/current.log", globalOwners),
+                arguments(GITHUB_SAMPLE, "apps/app1.exe", singletonList("@octocat")),
+                arguments(GITHUB_SAMPLE, "apps/inner/app2.exe", singletonList("@octocat")),
+                arguments(GITHUB_SAMPLE, "module/apps/app3.exe", singletonList("@octocat")),
+                arguments(GITHUB_SAMPLE, "docs/intro.doc", singletonList("@doctocat")),
+                arguments(GITHUB_SAMPLE, "docs/important/doc.doc", singletonList("@doctocat")),
+                arguments(GITHUB_SAMPLE, "applications/application", singletonList("@appowner")),
+                arguments(GITHUB_SAMPLE, "applications/module/application", singletonList("@appowner")),
+                arguments(GITHUB_SAMPLE, "applications/github/githubApplication", emptyList()),
+                arguments(GITHUB_SAMPLE, "documentation/doc.md", singletonList("docs@example.com")),
+                arguments(GITHUB_SAMPLE, "documentation/inner/doc.md", globalOwners),
+                arguments(GITHUB_SAMPLE, "documentation/inner/doc.txt", singletonList("@octo-org/octocats")),
+                // --- GitLab sections: a path's owners combine the winning match from every section,
+                // including the unnamed section (the leading "* @global-owner") ---
+                arguments(GITLAB_SAMPLE, "random/file.txt", singletonList("@global-owner")),
+                // exclusions also apply to the unnamed section
+                arguments(GITLAB_SAMPLE, "unowned.txt", emptyList()),
+                // section default owners are inherited and combined with the global owner
+                arguments(GITLAB_SAMPLE, "docs/guide.md", asList("@global-owner", "@docs-team")),
+                arguments(GITLAB_SAMPLE, "README.md", asList("@global-owner", "@docs-team")),
+                arguments(GITLAB_SAMPLE, "model/db/users.sql", asList("@global-owner", "@database-team", "@dba-lead")),
+                // per-entry owners override the section default within that section
+                arguments(
+                        GITLAB_SAMPLE,
+                        "config/db/setup.sql",
+                        asList("@global-owner", "@special-owner", "@config-team")),
+                // optional section (^[...]) defaults are inherited just like required ones
+                arguments(GITLAB_SAMPLE, "src/app.js", asList("@global-owner", "@frontend-team")),
+                arguments(GITLAB_SAMPLE, "src/styles.css", asList("@global-owner", "@css-owner")),
+                // a section without default owners keeps each entry's own owners
+                arguments(GITLAB_SAMPLE, "scripts/deploy.sh", asList("@global-owner", "@scripts-team")),
+                // the required-approvals count in the header is ignored for ownership
+                arguments(GITLAB_SAMPLE, "secrets/key.txt", asList("@global-owner", "@security-team")),
+                // a header immediately followed by a comment is a valid header with no default owners, so
+                // this entry does not inherit the previous section's owners (only the global owner applies)
+                arguments(GITLAB_SAMPLE, "generated/report.txt", singletonList("@global-owner")),
+                // duplicate section names (case-insensitive) are combined into one section: a path matching
+                // entries in both blocks resolves to the last matching entry's owners, not both
+                arguments(GITLAB_SAMPLE, "service/util.go", asList("@global-owner", "@backend-team-a")),
+                arguments(GITLAB_SAMPLE, "service/api/handler.go", asList("@global-owner", "@backend-team-b")),
+                // exclusions suppress only their section and cannot be overridden by a later entry
+                arguments(
+                        GITLAB_SAMPLE, "generated-assets/output.txt", asList("@global-owner", "@generated-files-team")),
+                arguments(
+                        GITLAB_SAMPLE,
+                        "generated-assets/excluded/output.txt",
+                        asList("@global-owner", "@other-generated-files-team")),
+                arguments(
+                        GITLAB_SAMPLE,
+                        "generated-assets/excluded-v2/output.txt",
+                        asList("@global-owner", "@other-generated-files-team")),
+                arguments(
+                        GITLAB_SAMPLE,
+                        "generated-assets/excluded/special.txt",
+                        asList("@global-owner", "@other-generated-files-team")));
+    }
 
-  private static Codeowners parseWithActivatedIndexes(String resource) throws IOException {
-    StringBuilder content = new StringBuilder(read(resource));
-    if (GITLAB_SAMPLE.equals(resource)) {
-      content.append("\n[Generated Files]\n");
+    private static Codeowners parse(String resource) throws IOException {
+        return CodeownersImpl.parse(new StringReader(read(resource)));
     }
-    for (int i = 0; i < 512; i++) {
-      content.append("/__owned").append(i).append("/file @dummy\n");
-      content.append("!/__excluded").append(i).append("/file\n");
+
+    private static Codeowners parseWithActivatedIndexes(String resource) throws IOException {
+        StringBuilder content = new StringBuilder(read(resource));
+        if (GITLAB_SAMPLE.equals(resource)) {
+            content.append("\n[Generated Files]\n");
+        }
+        for (int i = 0; i < 512; i++) {
+            content.append("/__owned").append(i).append("/file @dummy\n");
+            content.append("!/__excluded").append(i).append("/file\n");
+        }
+        return CodeownersImpl.parse(new StringReader(content.toString()));
     }
-    return CodeownersImpl.parse(new StringReader(content.toString()));
-  }
 
-  private static String read(String resource) throws IOException {
-    try (InputStream stream = CodeownersTest.class.getClassLoader().getResourceAsStream(resource);
-        Reader reader = new InputStreamReader(stream, UTF_8)) {
-      StringBuilder content = new StringBuilder();
-      char[] buffer = new char[1024];
-      int read;
-      while ((read = reader.read(buffer)) >= 0) {
-        content.append(buffer, 0, read);
-      }
-      return content.toString();
+    private static String read(String resource) throws IOException {
+        try (InputStream stream = CodeownersTest.class.getClassLoader().getResourceAsStream(resource);
+                Reader reader = new InputStreamReader(stream, UTF_8)) {
+            StringBuilder content = new StringBuilder();
+            char[] buffer = new char[1024];
+            int read;
+            while ((read = reader.read(buffer)) >= 0) {
+                content.append(buffer, 0, read);
+            }
+            return content.toString();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/codeowners/EntryBuilderTest.java b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/codeowners/EntryBuilderTest.java
index 8b44a2d5f01..dea7cf93c1e 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/codeowners/EntryBuilderTest.java
+++ b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/codeowners/EntryBuilderTest.java
@@ -20,274 +20,271 @@
 
 class EntryBuilderTest {
 
-  @ParameterizedTest(name = "entry {0} match against {2} is {3}")
-  @MethodSource("testEntryMatchArguments")
-  void testEntryMatch(String pattern, List<String> owners, String path, boolean expectedResult) {
-    CharacterMatcher.Factory matcherFactory = new CharacterMatcher.Factory();
-    Entry entry = new EntryBuilder(matcherFactory, pattern + " " + ownersToString(owners)).parse();
-    Entry exclusionEntry =
-        new EntryBuilder(matcherFactory, "!" + pattern + " " + ownersToString(owners)).parse();
+    @ParameterizedTest(name = "entry {0} match against {2} is {3}")
+    @MethodSource("testEntryMatchArguments")
+    void testEntryMatch(String pattern, List<String> owners, String path, boolean expectedResult) {
+        CharacterMatcher.Factory matcherFactory = new CharacterMatcher.Factory();
+        Entry entry = new EntryBuilder(matcherFactory, pattern + " " + ownersToString(owners)).parse();
+        Entry exclusionEntry = new EntryBuilder(matcherFactory, "!" + pattern + " " + ownersToString(owners)).parse();
 
-    boolean result = entry.getMatcher().consume(path, 0) >= 0;
-    boolean exclusionResult = exclusionEntry.getMatcher().consume(path, 0) >= 0;
+        boolean result = entry.getMatcher().consume(path, 0) >= 0;
+        boolean exclusionResult = exclusionEntry.getMatcher().consume(path, 0) >= 0;
 
-    assertEquals(owners, entry.getOwners());
-    assertFalse(entry.isExclusion());
-    assertEquals(emptyList(), exclusionEntry.getOwners());
-    assertTrue(exclusionEntry.isExclusion());
-    assertEquals(expectedResult, result);
-    assertEquals(expectedResult, exclusionResult);
-  }
+        assertEquals(owners, entry.getOwners());
+        assertFalse(entry.isExclusion());
+        assertEquals(emptyList(), exclusionEntry.getOwners());
+        assertTrue(exclusionEntry.isExclusion());
+        assertEquals(expectedResult, result);
+        assertEquals(expectedResult, exclusionResult);
+    }
 
-  static Stream<Arguments> testEntryMatchArguments() {
-    List<String> owner = singletonList("owner");
-    return Stream.of(
-        arguments("someToken", owner, "someToken", true),
-        arguments("someToken", owner, "sometoken", false),
-        arguments("someToken", owner, "anotherToken", false),
-        arguments("someToken", owner, "parent/someToken", true),
-        arguments("someToken", owner, "grandparent/parent/someToken", true),
-        arguments("/someToken", owner, "someToken", true),
-        arguments("/someToken", owner, "sometoken", false),
-        arguments("/someToken", owner, "anotherToken", false),
-        arguments("/someToken", owner, "parent/someToken", false),
-        arguments("/someToken", owner, "grandparent/parent/someToken", false),
-        arguments("someTok?n", owner, "someTokkn", true),
-        arguments("someTok?n", owner, "someTok/n", false),
-        arguments("someTok?n", owner, "parent/someTokkn", true),
-        arguments("someTok?n", owner, "grandparent/parent/someTokkn", true),
-        arguments("/someTok?n", owner, "someTokkn", true),
-        arguments("someTok*n", owner, "someTokkn", true),
-        arguments("someTok*n", owner, "someTok/n", false),
-        arguments("someTok*n", owner, "someTokkkkn", true),
-        arguments("someTok*n", owner, "someTokenToken", true),
-        arguments("someTok*n", owner, "someTokenTokkk", false),
-        arguments("s*meTok*n", owner, "someToken", true),
-        arguments("s*meTok*n", owner, "sabcdefghmeTokabcdefgn", true),
-        arguments("s*meTok*n", owner, "sabcdefghmeTokabcdefg", false),
-        arguments("someTok*n", owner, "parent/someTokkn", true),
-        arguments("someTok*n", owner, "grandparent/parent/someTokkn", true),
-        arguments("/someTok*n", owner, "someTokkn", true),
-        arguments("someTok[a-b]n", owner, "someToken", false),
-        arguments("someTok[a-z]n", owner, "someToken", true),
-        arguments("someTok[a-z]n", owner, "someTokEn", false),
-        arguments("someTok[a-z]n", owner, "someTok9n", false),
-        arguments("someTok[a-zA-Z]n", owner, "someToken", true),
-        arguments("someTok[a-zA-Z]n", owner, "someTokEn", true),
-        arguments("someTok[a-zA-Z]n", owner, "someTok9n", false),
-        arguments("someTok[a-zA-Z0-9]n", owner, "someToken", true),
-        arguments("someTok[a-zA-Z0-9]n", owner, "someTokEn", true),
-        arguments("someTok[a-zA-Z0-9]n", owner, "someTok9n", true),
-        arguments("s*meTok[a-zA-Z0-9]n", owner, "smeToken", true),
-        arguments("s*meTok[a-zA-Z0-9]n", owner, "smeTokEn", true),
-        arguments("s*meTok[a-zA-Z0-9]n", owner, "smeTok9n", true),
-        arguments("s*meTok[a-zA-Z0-9]n", owner, "sabcdmeToken", true),
-        arguments("s*meTok[a-zA-Z0-9]n", owner, "sabcdmeTokEn", true),
-        arguments("s*meTok[a-zA-Z0-9]n", owner, "sabcdmeTok9n", true),
-        arguments("someToken/", owner, "someToken", true),
-        arguments("someToken/", owner, "someToken/child", true),
-        arguments("someToken/", owner, "someToken/child/grandChild", true),
-        arguments("someToken/", owner, "parent/someToken", true),
-        arguments("someToken/", owner, "parent/someToken/child", true),
-        arguments("someToken/", owner, "parent/grandParent/someToken/child/grandChild", true),
-        arguments("/someToken/", owner, "someToken", true),
-        arguments("/someToken/", owner, "someToken/child", true),
-        arguments("/someToken/", owner, "someToken/child/grandChild", true),
-        arguments("/someToken/", owner, "parent/someToken", false),
-        arguments("/someToken/", owner, "parent/someToken/child", false),
-        arguments("/someToken/", owner, "parent/grandParent/someToken/child/grandChild", false),
-        arguments("some/token", owner, "some/token", true),
-        arguments("some/token", owner, "parent/some/token", false),
-        arguments("some/token", owner, "some/token/child", true),
-        arguments("some/token", owner, "some/tokenSuffix", false),
-        arguments("some/token/", owner, "some/token/child", true),
-        arguments("some/token/", owner, "parent/some/token/child", false),
-        arguments("some\\ Token", owner, "some Token", true),
-        arguments("\\#someToken", owner, "#someToken", true),
-        arguments("**/someToken", owner, "someToken", true),
-        arguments("**/someToken", owner, "parent/someToken", true),
-        arguments("**/someToken", owner, "grandparent/parent/someToken", true),
-        arguments("**/someToken", owner, "anotherToken", false),
-        arguments("**/some/token", owner, "some/token", true),
-        arguments("**/some/token", owner, "parent/some/token", true),
-        arguments("**/some/token", owner, "grandparent/parent/some/token", true),
-        arguments("**/some/token/", owner, "some/token", true),
-        arguments("**/some/token/", owner, "some/token/child", true),
-        arguments("**/some/token/", owner, "some/token/child/grandchild", true),
-        arguments("**/some/token/", owner, "parent/some/token/child", true),
-        arguments("**/some/token/", owner, "parent/some/different/token", false),
-        arguments("someToken/**", owner, "someToken", true),
-        arguments("someToken/**", owner, "someToken/child", true),
-        arguments("someToken/**", owner, "someToken/child/grandChild", true),
-        arguments("someToken/**", owner, "parent/someToken", false),
-        arguments("someToken/**", owner, "parent/someToken/child", false),
-        arguments("someToken/**", owner, "parent/grandParent/someToken/child/grandChild", false),
-        arguments("/someToken/**", owner, "someToken", true),
-        arguments("/someToken/**", owner, "someToken/child", true),
-        arguments("/someToken/**", owner, "someToken/child/grandChild", true),
-        arguments("/someToken/**", owner, "parent/someToken", false),
-        arguments("/someToken/**", owner, "parent/someToken/child", false),
-        arguments("/someToken/**", owner, "parent/grandParent/someToken/child/grandChild", false),
-        arguments("some/**/token", owner, "some/token", true),
-        arguments("some/**/token", owner, "some/other/token", true),
-        arguments("some/**/token", owner, "some/yet/another/token", true),
-        arguments("some/**/token", owner, "some/yet/another", false),
-        arguments("some/**/token", owner, "yet/another/token", false),
-        arguments("someToken", asList("owner", "anotherOwner"), "someToken", true),
-        arguments("*", owner, "someToken", true),
-        arguments("*", owner, "parent/someToken", true),
-        arguments("*", owner, "parent/someToken/child", true),
-        arguments("*", owner, "someFile.java", true),
-        arguments("**", owner, "someToken", true),
-        arguments("**", owner, "parent/someToken", true),
-        arguments("**", owner, "parent/someToken/child", true),
-        arguments("**", owner, "someFile.java", true),
-        arguments("*.java", owner, "someFile.java", true),
-        arguments("*.java", owner, "parent/someFile.java", true),
-        arguments("*.java", owner, "grandparent/parent/someFile.java", true),
-        arguments("*.java", owner, "someFile.js", false),
-        arguments("*.java", owner, "someFile.java17", false),
-        arguments("readme.md", owner, "readme.md", true),
-        arguments("readme.md", owner, "parent/readme.md", true),
-        arguments("readme.md", owner, "readme.md5", false),
-        arguments("some/*", owner, "some/token", true),
-        arguments("some/*", owner, "some/other/token", false),
-        arguments("some/*", owner, "parent/some/token", false),
-        arguments("some/*", owner, "parent/some/other/token", false),
-        arguments("**/test*.java", owner, "test.java", true),
-        arguments("**/test*.java", owner, "testFile.java", true),
-        arguments("**/test*.java", owner, "parent/test.java", true),
-        arguments("**/test*.java", owner, "parent/testFile.java", true),
-        arguments("**/test*.java", owner, "grandparent/parent/test.java", true),
-        arguments("**/test*.java", owner, "grandparent/parent/testFile.java", true),
-        arguments("\\#someToken", owner, "#someToken", true));
-  }
+    static Stream<Arguments> testEntryMatchArguments() {
+        List<String> owner = singletonList("owner");
+        return Stream.of(
+                arguments("someToken", owner, "someToken", true),
+                arguments("someToken", owner, "sometoken", false),
+                arguments("someToken", owner, "anotherToken", false),
+                arguments("someToken", owner, "parent/someToken", true),
+                arguments("someToken", owner, "grandparent/parent/someToken", true),
+                arguments("/someToken", owner, "someToken", true),
+                arguments("/someToken", owner, "sometoken", false),
+                arguments("/someToken", owner, "anotherToken", false),
+                arguments("/someToken", owner, "parent/someToken", false),
+                arguments("/someToken", owner, "grandparent/parent/someToken", false),
+                arguments("someTok?n", owner, "someTokkn", true),
+                arguments("someTok?n", owner, "someTok/n", false),
+                arguments("someTok?n", owner, "parent/someTokkn", true),
+                arguments("someTok?n", owner, "grandparent/parent/someTokkn", true),
+                arguments("/someTok?n", owner, "someTokkn", true),
+                arguments("someTok*n", owner, "someTokkn", true),
+                arguments("someTok*n", owner, "someTok/n", false),
+                arguments("someTok*n", owner, "someTokkkkn", true),
+                arguments("someTok*n", owner, "someTokenToken", true),
+                arguments("someTok*n", owner, "someTokenTokkk", false),
+                arguments("s*meTok*n", owner, "someToken", true),
+                arguments("s*meTok*n", owner, "sabcdefghmeTokabcdefgn", true),
+                arguments("s*meTok*n", owner, "sabcdefghmeTokabcdefg", false),
+                arguments("someTok*n", owner, "parent/someTokkn", true),
+                arguments("someTok*n", owner, "grandparent/parent/someTokkn", true),
+                arguments("/someTok*n", owner, "someTokkn", true),
+                arguments("someTok[a-b]n", owner, "someToken", false),
+                arguments("someTok[a-z]n", owner, "someToken", true),
+                arguments("someTok[a-z]n", owner, "someTokEn", false),
+                arguments("someTok[a-z]n", owner, "someTok9n", false),
+                arguments("someTok[a-zA-Z]n", owner, "someToken", true),
+                arguments("someTok[a-zA-Z]n", owner, "someTokEn", true),
+                arguments("someTok[a-zA-Z]n", owner, "someTok9n", false),
+                arguments("someTok[a-zA-Z0-9]n", owner, "someToken", true),
+                arguments("someTok[a-zA-Z0-9]n", owner, "someTokEn", true),
+                arguments("someTok[a-zA-Z0-9]n", owner, "someTok9n", true),
+                arguments("s*meTok[a-zA-Z0-9]n", owner, "smeToken", true),
+                arguments("s*meTok[a-zA-Z0-9]n", owner, "smeTokEn", true),
+                arguments("s*meTok[a-zA-Z0-9]n", owner, "smeTok9n", true),
+                arguments("s*meTok[a-zA-Z0-9]n", owner, "sabcdmeToken", true),
+                arguments("s*meTok[a-zA-Z0-9]n", owner, "sabcdmeTokEn", true),
+                arguments("s*meTok[a-zA-Z0-9]n", owner, "sabcdmeTok9n", true),
+                arguments("someToken/", owner, "someToken", true),
+                arguments("someToken/", owner, "someToken/child", true),
+                arguments("someToken/", owner, "someToken/child/grandChild", true),
+                arguments("someToken/", owner, "parent/someToken", true),
+                arguments("someToken/", owner, "parent/someToken/child", true),
+                arguments("someToken/", owner, "parent/grandParent/someToken/child/grandChild", true),
+                arguments("/someToken/", owner, "someToken", true),
+                arguments("/someToken/", owner, "someToken/child", true),
+                arguments("/someToken/", owner, "someToken/child/grandChild", true),
+                arguments("/someToken/", owner, "parent/someToken", false),
+                arguments("/someToken/", owner, "parent/someToken/child", false),
+                arguments("/someToken/", owner, "parent/grandParent/someToken/child/grandChild", false),
+                arguments("some/token", owner, "some/token", true),
+                arguments("some/token", owner, "parent/some/token", false),
+                arguments("some/token", owner, "some/token/child", true),
+                arguments("some/token", owner, "some/tokenSuffix", false),
+                arguments("some/token/", owner, "some/token/child", true),
+                arguments("some/token/", owner, "parent/some/token/child", false),
+                arguments("some\\ Token", owner, "some Token", true),
+                arguments("\\#someToken", owner, "#someToken", true),
+                arguments("**/someToken", owner, "someToken", true),
+                arguments("**/someToken", owner, "parent/someToken", true),
+                arguments("**/someToken", owner, "grandparent/parent/someToken", true),
+                arguments("**/someToken", owner, "anotherToken", false),
+                arguments("**/some/token", owner, "some/token", true),
+                arguments("**/some/token", owner, "parent/some/token", true),
+                arguments("**/some/token", owner, "grandparent/parent/some/token", true),
+                arguments("**/some/token/", owner, "some/token", true),
+                arguments("**/some/token/", owner, "some/token/child", true),
+                arguments("**/some/token/", owner, "some/token/child/grandchild", true),
+                arguments("**/some/token/", owner, "parent/some/token/child", true),
+                arguments("**/some/token/", owner, "parent/some/different/token", false),
+                arguments("someToken/**", owner, "someToken", true),
+                arguments("someToken/**", owner, "someToken/child", true),
+                arguments("someToken/**", owner, "someToken/child/grandChild", true),
+                arguments("someToken/**", owner, "parent/someToken", false),
+                arguments("someToken/**", owner, "parent/someToken/child", false),
+                arguments("someToken/**", owner, "parent/grandParent/someToken/child/grandChild", false),
+                arguments("/someToken/**", owner, "someToken", true),
+                arguments("/someToken/**", owner, "someToken/child", true),
+                arguments("/someToken/**", owner, "someToken/child/grandChild", true),
+                arguments("/someToken/**", owner, "parent/someToken", false),
+                arguments("/someToken/**", owner, "parent/someToken/child", false),
+                arguments("/someToken/**", owner, "parent/grandParent/someToken/child/grandChild", false),
+                arguments("some/**/token", owner, "some/token", true),
+                arguments("some/**/token", owner, "some/other/token", true),
+                arguments("some/**/token", owner, "some/yet/another/token", true),
+                arguments("some/**/token", owner, "some/yet/another", false),
+                arguments("some/**/token", owner, "yet/another/token", false),
+                arguments("someToken", asList("owner", "anotherOwner"), "someToken", true),
+                arguments("*", owner, "someToken", true),
+                arguments("*", owner, "parent/someToken", true),
+                arguments("*", owner, "parent/someToken/child", true),
+                arguments("*", owner, "someFile.java", true),
+                arguments("**", owner, "someToken", true),
+                arguments("**", owner, "parent/someToken", true),
+                arguments("**", owner, "parent/someToken/child", true),
+                arguments("**", owner, "someFile.java", true),
+                arguments("*.java", owner, "someFile.java", true),
+                arguments("*.java", owner, "parent/someFile.java", true),
+                arguments("*.java", owner, "grandparent/parent/someFile.java", true),
+                arguments("*.java", owner, "someFile.js", false),
+                arguments("*.java", owner, "someFile.java17", false),
+                arguments("readme.md", owner, "readme.md", true),
+                arguments("readme.md", owner, "parent/readme.md", true),
+                arguments("readme.md", owner, "readme.md5", false),
+                arguments("some/*", owner, "some/token", true),
+                arguments("some/*", owner, "some/other/token", false),
+                arguments("some/*", owner, "parent/some/token", false),
+                arguments("some/*", owner, "parent/some/other/token", false),
+                arguments("**/test*.java", owner, "test.java", true),
+                arguments("**/test*.java", owner, "testFile.java", true),
+                arguments("**/test*.java", owner, "parent/test.java", true),
+                arguments("**/test*.java", owner, "parent/testFile.java", true),
+                arguments("**/test*.java", owner, "grandparent/parent/test.java", true),
+                arguments("**/test*.java", owner, "grandparent/parent/testFile.java", true),
+                arguments("\\#someToken", owner, "#someToken", true));
+    }
 
-  private static String ownersToString(Collection<String> owners) {
-    StringBuilder result = new StringBuilder();
-    for (String owner : owners) {
-      result.append(owner).append(" "); // trailing spaces will be ignored by the matcher
+    private static String ownersToString(Collection<String> owners) {
+        StringBuilder result = new StringBuilder();
+        for (String owner : owners) {
+            result.append(owner).append(" "); // trailing spaces will be ignored by the matcher
+        }
+        return result.toString();
     }
-    return result.toString();
-  }
 
-  @ParameterizedTest(name = "invalid entry parsing: \"{0}\"")
-  @MethodSource("testInvalidEntryParsingArguments")
-  void testInvalidEntryParsing(String entry) {
-    CharacterMatcher.Factory matcherFactory = new CharacterMatcher.Factory();
-    Entry parsedEntry = new EntryBuilder(matcherFactory, entry).parse();
-    assertNull(parsedEntry);
-  }
+    @ParameterizedTest(name = "invalid entry parsing: \"{0}\"")
+    @MethodSource("testInvalidEntryParsingArguments")
+    void testInvalidEntryParsing(String entry) {
+        CharacterMatcher.Factory matcherFactory = new CharacterMatcher.Factory();
+        Entry parsedEntry = new EntryBuilder(matcherFactory, entry).parse();
+        assertNull(parsedEntry);
+    }
 
-  static Stream<Arguments> testInvalidEntryParsingArguments() {
-    return Stream.of(
-        arguments("token[z-a] owner"),
-        arguments("# comment"),
-        arguments(" # comment with a leading space"),
-        arguments("[section header]"),
-        arguments(" [section header with a leading space]"),
-        arguments(""),
-        arguments(" "),
-        arguments("^[section header]"),
-        arguments("^[section header with] @default/owner"),
-        arguments(" ^[section header with a leading space]"));
-  }
+    static Stream<Arguments> testInvalidEntryParsingArguments() {
+        return Stream.of(
+                arguments("token[z-a] owner"),
+                arguments("# comment"),
+                arguments(" # comment with a leading space"),
+                arguments("[section header]"),
+                arguments(" [section header with a leading space]"),
+                arguments(""),
+                arguments(" "),
+                arguments("^[section header]"),
+                arguments("^[section header with] @default/owner"),
+                arguments(" ^[section header with a leading space]"));
+    }
 
-  @ParameterizedTest(name = "section header \"{0}\" declares default owners {1}")
-  @MethodSource("testSectionHeaderParsingArguments")
-  void testSectionHeaderParsing(String line, List<String> expectedDefaultOwners) {
-    CharacterMatcher.Factory matcherFactory = new CharacterMatcher.Factory();
-    SectionHeader header = new EntryBuilder(matcherFactory, line).parseSectionHeader();
-    assertEquals(expectedDefaultOwners, header.getDefaultOwners());
-  }
+    @ParameterizedTest(name = "section header \"{0}\" declares default owners {1}")
+    @MethodSource("testSectionHeaderParsingArguments")
+    void testSectionHeaderParsing(String line, List<String> expectedDefaultOwners) {
+        CharacterMatcher.Factory matcherFactory = new CharacterMatcher.Factory();
+        SectionHeader header = new EntryBuilder(matcherFactory, line).parseSectionHeader();
+        assertEquals(expectedDefaultOwners, header.getDefaultOwners());
+    }
 
-  static Stream<Arguments> testSectionHeaderParsingArguments() {
-    return Stream.of(
-        // section headers without default owners
-        arguments("[Documentation]", emptyList()),
-        arguments("^[Optional]", emptyList()),
-        arguments("[Section name with spaces]", emptyList()),
-        arguments("  [Indented section]", emptyList()),
-        arguments("[Requires approvals][2]", emptyList()),
-        arguments("^[Optional with approvals][3]", emptyList()),
-        arguments("[Documentation] # only a comment", emptyList()),
-        arguments("[Generated]# comment with no leading space", emptyList()),
-        // section headers with default owners
-        arguments("[Documentation] @docs-team", singletonList("@docs-team")),
-        arguments("[Database] @database-team @dba-lead", asList("@database-team", "@dba-lead")),
-        arguments("^[Optional] @go-team", singletonList("@go-team")),
-        arguments("[Requires approvals][2] @team @lead", asList("@team", "@lead")),
-        arguments("^[Optional with approvals][2] @team", singletonList("@team")),
-        arguments("[Docs] docs@example.com", singletonList("docs@example.com")),
-        arguments("[Docs] @org/team", singletonList("@org/team")),
-        arguments("[Docs] @docs-team # trailing comment", singletonList("@docs-team")),
-        arguments("[Section] @a   @b", asList("@a", "@b")));
-  }
+    static Stream<Arguments> testSectionHeaderParsingArguments() {
+        return Stream.of(
+                // section headers without default owners
+                arguments("[Documentation]", emptyList()),
+                arguments("^[Optional]", emptyList()),
+                arguments("[Section name with spaces]", emptyList()),
+                arguments("  [Indented section]", emptyList()),
+                arguments("[Requires approvals][2]", emptyList()),
+                arguments("^[Optional with approvals][3]", emptyList()),
+                arguments("[Documentation] # only a comment", emptyList()),
+                arguments("[Generated]# comment with no leading space", emptyList()),
+                // section headers with default owners
+                arguments("[Documentation] @docs-team", singletonList("@docs-team")),
+                arguments("[Database] @database-team @dba-lead", asList("@database-team", "@dba-lead")),
+                arguments("^[Optional] @go-team", singletonList("@go-team")),
+                arguments("[Requires approvals][2] @team @lead", asList("@team", "@lead")),
+                arguments("^[Optional with approvals][2] @team", singletonList("@team")),
+                arguments("[Docs] docs@example.com", singletonList("docs@example.com")),
+                arguments("[Docs] @org/team", singletonList("@org/team")),
+                arguments("[Docs] @docs-team # trailing comment", singletonList("@docs-team")),
+                arguments("[Section] @a   @b", asList("@a", "@b")));
+    }
 
-  @ParameterizedTest(name = "section header \"{0}\" has name \"{1}\"")
-  @MethodSource("testSectionHeaderNameArguments")
-  void testSectionHeaderName(String line, String expectedName) {
-    CharacterMatcher.Factory matcherFactory = new CharacterMatcher.Factory();
-    SectionHeader header = new EntryBuilder(matcherFactory, line).parseSectionHeader();
-    assertEquals(expectedName, header.getName());
-  }
+    @ParameterizedTest(name = "section header \"{0}\" has name \"{1}\"")
+    @MethodSource("testSectionHeaderNameArguments")
+    void testSectionHeaderName(String line, String expectedName) {
+        CharacterMatcher.Factory matcherFactory = new CharacterMatcher.Factory();
+        SectionHeader header = new EntryBuilder(matcherFactory, line).parseSectionHeader();
+        assertEquals(expectedName, header.getName());
+    }
 
-  static Stream<Arguments> testSectionHeaderNameArguments() {
-    return Stream.of(
-        arguments("[Documentation]", "Documentation"),
-        arguments("[Documentation] @docs-team", "Documentation"),
-        arguments("^[Optional Frontend] @team", "Optional Frontend"),
-        arguments("[Requires approvals][2] @team", "Requires approvals"),
-        arguments("[Generated]# comment", "Generated"),
-        arguments("  [Indented]", "Indented"));
-  }
+    static Stream<Arguments> testSectionHeaderNameArguments() {
+        return Stream.of(
+                arguments("[Documentation]", "Documentation"),
+                arguments("[Documentation] @docs-team", "Documentation"),
+                arguments("^[Optional Frontend] @team", "Optional Frontend"),
+                arguments("[Requires approvals][2] @team", "Requires approvals"),
+                arguments("[Generated]# comment", "Generated"),
+                arguments("  [Indented]", "Indented"));
+    }
 
-  @ParameterizedTest(name = "\"{0}\" is not a section header")
-  @MethodSource("testNonSectionHeaderArguments")
-  void testNonSectionHeaderReturnsNull(String line) {
-    CharacterMatcher.Factory matcherFactory = new CharacterMatcher.Factory();
-    assertNull(new EntryBuilder(matcherFactory, line).parseSectionHeader());
-  }
+    @ParameterizedTest(name = "\"{0}\" is not a section header")
+    @MethodSource("testNonSectionHeaderArguments")
+    void testNonSectionHeaderReturnsNull(String line) {
+        CharacterMatcher.Factory matcherFactory = new CharacterMatcher.Factory();
+        assertNull(new EntryBuilder(matcherFactory, line).parseSectionHeader());
+    }
 
-  static Stream<Arguments> testNonSectionHeaderArguments() {
-    return Stream.of(
-        arguments("*.js @owner"),
-        arguments("/path/to/file @owner"),
-        arguments("# comment"),
-        arguments(""),
-        arguments("   "),
-        arguments("[a-z]*.txt @owner"), // character-class range, not a section header
-        arguments("[Bb]uild/ @owner"), // character-class set, not a section header
-        arguments("^caret-file @owner")); // '^' not followed by '['
-  }
+    static Stream<Arguments> testNonSectionHeaderArguments() {
+        return Stream.of(
+                arguments("*.js @owner"),
+                arguments("/path/to/file @owner"),
+                arguments("# comment"),
+                arguments(""),
+                arguments("   "),
+                arguments("[a-z]*.txt @owner"), // character-class range, not a section header
+                arguments("[Bb]uild/ @owner"), // character-class set, not a section header
+                arguments("^caret-file @owner")); // '^' not followed by '['
+    }
 
-  @Test
-  void testEntryInheritsSectionDefaultOwners() {
-    CharacterMatcher.Factory matcherFactory = new CharacterMatcher.Factory();
-    List<String> sectionDefaultOwners = singletonList("@docs-team");
+    @Test
+    void testEntryInheritsSectionDefaultOwners() {
+        CharacterMatcher.Factory matcherFactory = new CharacterMatcher.Factory();
+        List<String> sectionDefaultOwners = singletonList("@docs-team");
 
-    // an entry without its own owners inherits the section's default owners
-    Entry inherited = new EntryBuilder(matcherFactory, "docs/").parse(sectionDefaultOwners);
-    assertEquals(sectionDefaultOwners, inherited.getOwners());
+        // an entry without its own owners inherits the section's default owners
+        Entry inherited = new EntryBuilder(matcherFactory, "docs/").parse(sectionDefaultOwners);
+        assertEquals(sectionDefaultOwners, inherited.getOwners());
 
-    // an entry with its own owners overrides the section's default owners
-    Entry overridden =
-        new EntryBuilder(matcherFactory, "docs/setup.md @override").parse(sectionDefaultOwners);
-    assertEquals(singletonList("@override"), overridden.getOwners());
+        // an entry with its own owners overrides the section's default owners
+        Entry overridden = new EntryBuilder(matcherFactory, "docs/setup.md @override").parse(sectionDefaultOwners);
+        assertEquals(singletonList("@override"), overridden.getOwners());
 
-    // with no section defaults, owners stay empty (GitHub "unset ownership" semantics)
-    Entry noOwners = new EntryBuilder(matcherFactory, "generated/").parse(emptyList());
-    assertEquals(emptyList(), noOwners.getOwners());
-  }
+        // with no section defaults, owners stay empty (GitHub "unset ownership" semantics)
+        Entry noOwners = new EntryBuilder(matcherFactory, "generated/").parse(emptyList());
+        assertEquals(emptyList(), noOwners.getOwners());
+    }
 
-  @Test
-  void testExclusionDoesNotInheritSectionDefaultOwners() {
-    CharacterMatcher.Factory matcherFactory = new CharacterMatcher.Factory();
+    @Test
+    void testExclusionDoesNotInheritSectionDefaultOwners() {
+        CharacterMatcher.Factory matcherFactory = new CharacterMatcher.Factory();
 
-    Entry exclusion =
-        new EntryBuilder(matcherFactory, "!generated/").parse(singletonList("@docs-team"));
+        Entry exclusion = new EntryBuilder(matcherFactory, "!generated/").parse(singletonList("@docs-team"));
 
-    assertTrue(exclusion.isExclusion());
-    assertEquals(emptyList(), exclusion.getOwners());
-  }
+        assertTrue(exclusion.isExclusion());
+        assertEquals(emptyList(), exclusion.getOwners());
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/config/AbstractConfigurationApiContractTest.java b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/config/AbstractConfigurationApiContractTest.java
index 3066f83efbb..9099d3b00f4 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/config/AbstractConfigurationApiContractTest.java
+++ b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/config/AbstractConfigurationApiContractTest.java
@@ -36,292 +36,275 @@
  */
 abstract class AbstractConfigurationApiContractTest {
 
-  protected static final String FIXTURE_DIR = "/datadog/trace/civisibility/config/";
-
-  protected static final TracerEnvironment ENV = envWithBundle(null);
-
-  protected static TracerEnvironment envWithBundle(String testBundle) {
-    return TracerEnvironment.builder()
-        .service("foo")
-        .env("foo_env")
-        .repositoryUrl("https://github.com/DataDog/foo")
-        .branch("prod")
-        .sha("d64185e45d1722ab3a53c45be47accae")
-        .commitMessage("full commit message")
-        .testBundle(testBundle)
-        .build();
-  }
-
-  protected enum Endpoint {
-    SETTINGS,
-    SKIPPABLE_TESTS,
-    FLAKY_TESTS,
-    KNOWN_TESTS,
-    TEST_MANAGEMENT
-  }
-
-  /**
-   * Build a {@link ConfigurationApi} that responds to a call against {@code endpoint} with {@code
-   * responseBody}. The other endpoints are not exercised in the contract tests and need not be
-   * wired by the subclass.
-   */
-  protected abstract ConfigurationApi apiReturning(Endpoint endpoint, String responseBody)
-      throws IOException;
-
-  static Stream<Arguments> parsesSettingsArguments() {
-    return Stream.of(
-        arguments(
-            "all flags off, default branch unset",
-            new CiVisibilitySettings(
-                false,
-                false,
-                false,
-                false,
-                false,
-                false,
-                false,
-                false,
-                false,
-                EarlyFlakeDetectionSettings.DEFAULT,
-                TestManagementSettings.DEFAULT,
-                null,
-                false)),
-        arguments(
-            "all flags on, default branch set",
-            new CiVisibilitySettings(
-                true,
-                true,
-                true,
-                true,
-                true,
-                true,
-                true,
-                true,
-                true,
-                EarlyFlakeDetectionSettings.DEFAULT,
-                TestManagementSettings.DEFAULT,
-                "main",
-                false)),
-        arguments(
-            "mixed flags, single execution-by-duration",
-            new CiVisibilitySettings(
-                false,
-                true,
-                false,
-                true,
-                false,
-                true,
-                false,
-                false,
-                true,
-                new EarlyFlakeDetectionSettings(
-                    true, singletonList(new ExecutionsByDuration(1000, 3)), 10),
-                new TestManagementSettings(true, 10),
-                "master",
-                false)),
-        arguments(
-            "mixed flags, multiple executions-by-duration spanning the 60s boundary",
-            new CiVisibilitySettings(
-                false,
-                false,
-                true,
-                true,
-                false,
-                false,
-                true,
-                true,
-                false,
-                new EarlyFlakeDetectionSettings(
-                    true,
-                    Arrays.asList(
-                        new ExecutionsByDuration(5000, 3), new ExecutionsByDuration(120000, 2)),
-                    10),
-                new TestManagementSettings(true, 20),
-                "prod",
-                false)));
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("parsesSettingsArguments")
-  void parsesSettings(String scenario, CiVisibilitySettings expected) throws IOException {
-    Map<String, Object> data = new HashMap<>();
-    data.put("settings", expected);
-    String body = render("settings-response.ftl", data);
-
-    ConfigurationApi api = apiReturning(Endpoint.SETTINGS, body);
-
-    assertEquals(expected, api.getSettings(ENV));
-  }
-
-  static Stream<Arguments> parsesSkippableTestsArguments() {
-    Map<String, Map<TestIdentifier, TestMetadata>> twoModules = new HashMap<>();
-    Map<TestIdentifier, TestMetadata> bundleA = new HashMap<>();
-    bundleA.put(new TestIdentifier("suite-a", "name-a", "parameters-a"), new TestMetadata(true));
-    twoModules.put("testBundle-a", bundleA);
-    Map<TestIdentifier, TestMetadata> bundleB = new HashMap<>();
-    bundleB.put(new TestIdentifier("suite-b", "name-b", null), new TestMetadata(false));
-    twoModules.put("testBundle-b", bundleB);
-
-    // Tests in the "one module" fixture omit test.bundle from configurations; the parser falls
-    // back to the tracer environment's testBundle to determine module assignment.
-    Map<String, Map<TestIdentifier, TestMetadata>> oneModule = new HashMap<>();
-    Map<TestIdentifier, TestMetadata> singleBundle = new HashMap<>();
-    singleBundle.put(
-        new TestIdentifier("suite-a", "name-a", "parameters-a"), new TestMetadata(true));
-    singleBundle.put(new TestIdentifier("suite-b", "name-b", null), new TestMetadata(true));
-    oneModule.put("testBundle-a", singleBundle);
-
-    return Stream.of(
-        arguments("two modules", ENV, "skippable-response.ftl", twoModules),
-        arguments(
-            "one module",
-            envWithBundle("testBundle-a"),
-            "skippable-response-one-module.ftl",
-            oneModule));
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("parsesSkippableTestsArguments")
-  void parsesSkippableTests(
-      String scenario,
-      TracerEnvironment env,
-      String fixture,
-      Map<String, Map<TestIdentifier, TestMetadata>> expectedTests)
-      throws IOException {
-    String body = render(fixture, Collections.emptyMap());
-
-    ConfigurationApi api = apiReturning(Endpoint.SKIPPABLE_TESTS, body);
-    SkippableTests result = api.getSkippableTests(env);
-
-    assertEquals(expectedTests, result.getIdentifiersByModule());
-    assertEquals("11223344", result.getCorrelationId());
-    Map<String, BitSet> coverage = result.getCoveredLinesByRelativeSourcePath();
-    assertEquals(3, coverage.size());
-    assertEquals(
-        bits(0, 1, 2, 3, 4, 5, 6, 7, 14, 15, 24, 25, 26, 27, 28, 29, 30, 31),
-        coverage.get("src/main/java/Calculator.java"));
-    assertEquals(
-        bits(24, 25, 26, 27, 28, 29, 30, 37, 38, 39, 50, 51, 52, 53, 54, 55),
-        coverage.get("src/main/java/utils/Math.java"));
-    assertEquals(
-        bits(0, 1, 2, 3, 4, 5, 6, 7, 12, 13, 14, 15, 27, 28, 29, 30, 50, 51, 52, 53, 54, 55),
-        coverage.get("src/test/java/CalculatorTest.java"));
-  }
-
-  private static BitSet bits(int... positions) {
-    BitSet b = new BitSet();
-    for (int p : positions) {
-      b.set(p);
+    protected static final String FIXTURE_DIR = "/datadog/trace/civisibility/config/";
+
+    protected static final TracerEnvironment ENV = envWithBundle(null);
+
+    protected static TracerEnvironment envWithBundle(String testBundle) {
+        return TracerEnvironment.builder()
+                .service("foo")
+                .env("foo_env")
+                .repositoryUrl("https://github.com/DataDog/foo")
+                .branch("prod")
+                .sha("d64185e45d1722ab3a53c45be47accae")
+                .commitMessage("full commit message")
+                .testBundle(testBundle)
+                .build();
     }
-    return b;
-  }
-
-  static Stream<Arguments> parsesFlakyTestsArguments() {
-    Map<String, Collection<TestFQN>> twoModules = new HashMap<>();
-    twoModules.put("testBundle-a", new HashSet<>(singletonList(new TestFQN("suite-a", "name-a"))));
-    twoModules.put("testBundle-b", new HashSet<>(singletonList(new TestFQN("suite-b", "name-b"))));
-
-    Map<String, Collection<TestFQN>> oneModule = new HashMap<>();
-    oneModule.put("testBundle-a", new HashSet<>(singletonList(new TestFQN("suite-a", "name-a"))));
-
-    return Stream.of(
-        arguments("two modules", ENV, "flaky-response.ftl", twoModules),
-        arguments(
-            "one module",
-            envWithBundle("testBundle-a"),
-            "flaky-response-one-module.ftl",
-            oneModule));
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("parsesFlakyTestsArguments")
-  void parsesFlakyTests(
-      String scenario,
-      TracerEnvironment env,
-      String fixture,
-      Map<String, Collection<TestFQN>> expectedTests)
-      throws IOException {
-    String body = render(fixture, Collections.emptyMap());
-
-    ConfigurationApi api = apiReturning(Endpoint.FLAKY_TESTS, body);
-    Map<String, Collection<TestFQN>> result = api.getFlakyTestsByModule(env);
-
-    assertEquals(expectedTests, result);
-  }
-
-  @Test
-  void parsesKnownTests() throws IOException {
-    String body = render("known-tests-response.ftl", Collections.emptyMap());
-
-    ConfigurationApi api = apiReturning(Endpoint.KNOWN_TESTS, body);
-    Map<String, Collection<TestFQN>> result = api.getKnownTestsByModule(ENV);
-
-    assertNotNull(result);
-    assertEquals(2, result.size());
-    Collection<TestFQN> bundleA = result.get("test-bundle-a");
-    assertTrue(bundleA.contains(new TestFQN("test-suite-a", "test-name-1")));
-    assertTrue(bundleA.contains(new TestFQN("test-suite-a", "test-name-2")));
-    assertTrue(bundleA.contains(new TestFQN("test-suite-b", "another-test-name-1")));
-    assertTrue(bundleA.contains(new TestFQN("test-suite-b", "test-name-2")));
-    Collection<TestFQN> bundleN = result.get("test-bundle-N");
-    assertTrue(bundleN.contains(new TestFQN("test-suite-M", "test-name-1")));
-    assertTrue(bundleN.contains(new TestFQN("test-suite-M", "test-name-2")));
-  }
-
-  @Test
-  void parsesTestManagement() throws IOException {
-    String body = render("test-management-tests-response.ftl", Collections.emptyMap());
-
-    ConfigurationApi api = apiReturning(Endpoint.TEST_MANAGEMENT, body);
-    Map<TestSetting, Map<String, Collection<TestFQN>>> result =
-        api.getTestManagementTestsByModule(ENV, ENV.getSha(), ENV.getCommitMessage());
-
-    Map<String, Collection<TestFQN>> quarantined = new HashMap<>();
-    quarantined.put(
-        "module-a",
-        new HashSet<>(
-            Arrays.asList(new TestFQN("suite-a", "test-a"), new TestFQN("suite-b", "test-c"))));
-    quarantined.put("module-b", new HashSet<>(singletonList(new TestFQN("suite-c", "test-e"))));
-    assertEquals(quarantined, result.get(TestSetting.QUARANTINED));
-
-    Map<String, Collection<TestFQN>> disabled = new HashMap<>();
-    disabled.put("module-a", new HashSet<>(singletonList(new TestFQN("suite-a", "test-b"))));
-    disabled.put(
-        "module-b",
-        new HashSet<>(
-            Arrays.asList(new TestFQN("suite-c", "test-d"), new TestFQN("suite-c", "test-f"))));
-    assertEquals(disabled, result.get(TestSetting.DISABLED));
-
-    Map<String, Collection<TestFQN>> attemptToFix = new HashMap<>();
-    attemptToFix.put("module-a", new HashSet<>(singletonList(new TestFQN("suite-b", "test-c"))));
-    attemptToFix.put(
-        "module-b",
-        new HashSet<>(
-            Arrays.asList(new TestFQN("suite-c", "test-d"), new TestFQN("suite-c", "test-e"))));
-    assertEquals(attemptToFix, result.get(TestSetting.ATTEMPT_TO_FIX));
-  }
-
-  protected static String render(String templateName, Map<String, Object> data) throws IOException {
-    Template template = FREEMARKER.getTemplate(FIXTURE_DIR + templateName);
-    StringWriter out = new StringWriter();
-    try {
-      template.process(data, out);
-    } catch (TemplateException e) {
-      throw new IOException("Failed to render template " + templateName, e);
+
+    protected enum Endpoint {
+        SETTINGS,
+        SKIPPABLE_TESTS,
+        FLAKY_TESTS,
+        KNOWN_TESTS,
+        TEST_MANAGEMENT
+    }
+
+    /**
+     * Build a {@link ConfigurationApi} that responds to a call against {@code endpoint} with {@code
+     * responseBody}. The other endpoints are not exercised in the contract tests and need not be
+     * wired by the subclass.
+     */
+    protected abstract ConfigurationApi apiReturning(Endpoint endpoint, String responseBody) throws IOException;
+
+    static Stream<Arguments> parsesSettingsArguments() {
+        return Stream.of(
+                arguments(
+                        "all flags off, default branch unset",
+                        new CiVisibilitySettings(
+                                false,
+                                false,
+                                false,
+                                false,
+                                false,
+                                false,
+                                false,
+                                false,
+                                false,
+                                EarlyFlakeDetectionSettings.DEFAULT,
+                                TestManagementSettings.DEFAULT,
+                                null,
+                                false)),
+                arguments(
+                        "all flags on, default branch set",
+                        new CiVisibilitySettings(
+                                true,
+                                true,
+                                true,
+                                true,
+                                true,
+                                true,
+                                true,
+                                true,
+                                true,
+                                EarlyFlakeDetectionSettings.DEFAULT,
+                                TestManagementSettings.DEFAULT,
+                                "main",
+                                false)),
+                arguments(
+                        "mixed flags, single execution-by-duration",
+                        new CiVisibilitySettings(
+                                false,
+                                true,
+                                false,
+                                true,
+                                false,
+                                true,
+                                false,
+                                false,
+                                true,
+                                new EarlyFlakeDetectionSettings(
+                                        true, singletonList(new ExecutionsByDuration(1000, 3)), 10),
+                                new TestManagementSettings(true, 10),
+                                "master",
+                                false)),
+                arguments(
+                        "mixed flags, multiple executions-by-duration spanning the 60s boundary",
+                        new CiVisibilitySettings(
+                                false,
+                                false,
+                                true,
+                                true,
+                                false,
+                                false,
+                                true,
+                                true,
+                                false,
+                                new EarlyFlakeDetectionSettings(
+                                        true,
+                                        Arrays.asList(
+                                                new ExecutionsByDuration(5000, 3), new ExecutionsByDuration(120000, 2)),
+                                        10),
+                                new TestManagementSettings(true, 20),
+                                "prod",
+                                false)));
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("parsesSettingsArguments")
+    void parsesSettings(String scenario, CiVisibilitySettings expected) throws IOException {
+        Map<String, Object> data = new HashMap<>();
+        data.put("settings", expected);
+        String body = render("settings-response.ftl", data);
+
+        ConfigurationApi api = apiReturning(Endpoint.SETTINGS, body);
+
+        assertEquals(expected, api.getSettings(ENV));
+    }
+
+    static Stream<Arguments> parsesSkippableTestsArguments() {
+        Map<String, Map<TestIdentifier, TestMetadata>> twoModules = new HashMap<>();
+        Map<TestIdentifier, TestMetadata> bundleA = new HashMap<>();
+        bundleA.put(new TestIdentifier("suite-a", "name-a", "parameters-a"), new TestMetadata(true));
+        twoModules.put("testBundle-a", bundleA);
+        Map<TestIdentifier, TestMetadata> bundleB = new HashMap<>();
+        bundleB.put(new TestIdentifier("suite-b", "name-b", null), new TestMetadata(false));
+        twoModules.put("testBundle-b", bundleB);
+
+        // Tests in the "one module" fixture omit test.bundle from configurations; the parser falls
+        // back to the tracer environment's testBundle to determine module assignment.
+        Map<String, Map<TestIdentifier, TestMetadata>> oneModule = new HashMap<>();
+        Map<TestIdentifier, TestMetadata> singleBundle = new HashMap<>();
+        singleBundle.put(new TestIdentifier("suite-a", "name-a", "parameters-a"), new TestMetadata(true));
+        singleBundle.put(new TestIdentifier("suite-b", "name-b", null), new TestMetadata(true));
+        oneModule.put("testBundle-a", singleBundle);
+
+        return Stream.of(
+                arguments("two modules", ENV, "skippable-response.ftl", twoModules),
+                arguments("one module", envWithBundle("testBundle-a"), "skippable-response-one-module.ftl", oneModule));
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("parsesSkippableTestsArguments")
+    void parsesSkippableTests(
+            String scenario,
+            TracerEnvironment env,
+            String fixture,
+            Map<String, Map<TestIdentifier, TestMetadata>> expectedTests)
+            throws IOException {
+        String body = render(fixture, Collections.emptyMap());
+
+        ConfigurationApi api = apiReturning(Endpoint.SKIPPABLE_TESTS, body);
+        SkippableTests result = api.getSkippableTests(env);
+
+        assertEquals(expectedTests, result.getIdentifiersByModule());
+        assertEquals("11223344", result.getCorrelationId());
+        Map<String, BitSet> coverage = result.getCoveredLinesByRelativeSourcePath();
+        assertEquals(3, coverage.size());
+        assertEquals(
+                bits(0, 1, 2, 3, 4, 5, 6, 7, 14, 15, 24, 25, 26, 27, 28, 29, 30, 31),
+                coverage.get("src/main/java/Calculator.java"));
+        assertEquals(
+                bits(24, 25, 26, 27, 28, 29, 30, 37, 38, 39, 50, 51, 52, 53, 54, 55),
+                coverage.get("src/main/java/utils/Math.java"));
+        assertEquals(
+                bits(0, 1, 2, 3, 4, 5, 6, 7, 12, 13, 14, 15, 27, 28, 29, 30, 50, 51, 52, 53, 54, 55),
+                coverage.get("src/test/java/CalculatorTest.java"));
+    }
+
+    private static BitSet bits(int... positions) {
+        BitSet b = new BitSet();
+        for (int p : positions) {
+            b.set(p);
+        }
+        return b;
+    }
+
+    static Stream<Arguments> parsesFlakyTestsArguments() {
+        Map<String, Collection<TestFQN>> twoModules = new HashMap<>();
+        twoModules.put("testBundle-a", new HashSet<>(singletonList(new TestFQN("suite-a", "name-a"))));
+        twoModules.put("testBundle-b", new HashSet<>(singletonList(new TestFQN("suite-b", "name-b"))));
+
+        Map<String, Collection<TestFQN>> oneModule = new HashMap<>();
+        oneModule.put("testBundle-a", new HashSet<>(singletonList(new TestFQN("suite-a", "name-a"))));
+
+        return Stream.of(
+                arguments("two modules", ENV, "flaky-response.ftl", twoModules),
+                arguments("one module", envWithBundle("testBundle-a"), "flaky-response-one-module.ftl", oneModule));
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("parsesFlakyTestsArguments")
+    void parsesFlakyTests(
+            String scenario, TracerEnvironment env, String fixture, Map<String, Collection<TestFQN>> expectedTests)
+            throws IOException {
+        String body = render(fixture, Collections.emptyMap());
+
+        ConfigurationApi api = apiReturning(Endpoint.FLAKY_TESTS, body);
+        Map<String, Collection<TestFQN>> result = api.getFlakyTestsByModule(env);
+
+        assertEquals(expectedTests, result);
+    }
+
+    @Test
+    void parsesKnownTests() throws IOException {
+        String body = render("known-tests-response.ftl", Collections.emptyMap());
+
+        ConfigurationApi api = apiReturning(Endpoint.KNOWN_TESTS, body);
+        Map<String, Collection<TestFQN>> result = api.getKnownTestsByModule(ENV);
+
+        assertNotNull(result);
+        assertEquals(2, result.size());
+        Collection<TestFQN> bundleA = result.get("test-bundle-a");
+        assertTrue(bundleA.contains(new TestFQN("test-suite-a", "test-name-1")));
+        assertTrue(bundleA.contains(new TestFQN("test-suite-a", "test-name-2")));
+        assertTrue(bundleA.contains(new TestFQN("test-suite-b", "another-test-name-1")));
+        assertTrue(bundleA.contains(new TestFQN("test-suite-b", "test-name-2")));
+        Collection<TestFQN> bundleN = result.get("test-bundle-N");
+        assertTrue(bundleN.contains(new TestFQN("test-suite-M", "test-name-1")));
+        assertTrue(bundleN.contains(new TestFQN("test-suite-M", "test-name-2")));
+    }
+
+    @Test
+    void parsesTestManagement() throws IOException {
+        String body = render("test-management-tests-response.ftl", Collections.emptyMap());
+
+        ConfigurationApi api = apiReturning(Endpoint.TEST_MANAGEMENT, body);
+        Map<TestSetting, Map<String, Collection<TestFQN>>> result =
+                api.getTestManagementTestsByModule(ENV, ENV.getSha(), ENV.getCommitMessage());
+
+        Map<String, Collection<TestFQN>> quarantined = new HashMap<>();
+        quarantined.put(
+                "module-a",
+                new HashSet<>(Arrays.asList(new TestFQN("suite-a", "test-a"), new TestFQN("suite-b", "test-c"))));
+        quarantined.put("module-b", new HashSet<>(singletonList(new TestFQN("suite-c", "test-e"))));
+        assertEquals(quarantined, result.get(TestSetting.QUARANTINED));
+
+        Map<String, Collection<TestFQN>> disabled = new HashMap<>();
+        disabled.put("module-a", new HashSet<>(singletonList(new TestFQN("suite-a", "test-b"))));
+        disabled.put(
+                "module-b",
+                new HashSet<>(Arrays.asList(new TestFQN("suite-c", "test-d"), new TestFQN("suite-c", "test-f"))));
+        assertEquals(disabled, result.get(TestSetting.DISABLED));
+
+        Map<String, Collection<TestFQN>> attemptToFix = new HashMap<>();
+        attemptToFix.put("module-a", new HashSet<>(singletonList(new TestFQN("suite-b", "test-c"))));
+        attemptToFix.put(
+                "module-b",
+                new HashSet<>(Arrays.asList(new TestFQN("suite-c", "test-d"), new TestFQN("suite-c", "test-e"))));
+        assertEquals(attemptToFix, result.get(TestSetting.ATTEMPT_TO_FIX));
+    }
+
+    protected static String render(String templateName, Map<String, Object> data) throws IOException {
+        Template template = FREEMARKER.getTemplate(FIXTURE_DIR + templateName);
+        StringWriter out = new StringWriter();
+        try {
+            template.process(data, out);
+        } catch (TemplateException e) {
+            throw new IOException("Failed to render template " + templateName, e);
+        }
+        return out.toString();
+    }
+
+    private static final Configuration FREEMARKER;
+
+    static {
+        FREEMARKER = new Configuration(Configuration.VERSION_2_3_30);
+        FREEMARKER.setClassLoaderForTemplateLoading(AbstractConfigurationApiContractTest.class.getClassLoader(), "");
+        FREEMARKER.setDefaultEncoding("UTF-8");
+        FREEMARKER.setLogTemplateExceptions(false);
+        FREEMARKER.setWrapUncheckedExceptions(true);
+        FREEMARKER.setFallbackOnNullLoopVariable(false);
+        FREEMARKER.setNumberFormat("0.######");
     }
-    return out.toString();
-  }
-
-  private static final Configuration FREEMARKER;
-
-  static {
-    FREEMARKER = new Configuration(Configuration.VERSION_2_3_30);
-    FREEMARKER.setClassLoaderForTemplateLoading(
-        AbstractConfigurationApiContractTest.class.getClassLoader(), "");
-    FREEMARKER.setDefaultEncoding("UTF-8");
-    FREEMARKER.setLogTemplateExceptions(false);
-    FREEMARKER.setWrapUncheckedExceptions(true);
-    FREEMARKER.setFallbackOnNullLoopVariable(false);
-    FREEMARKER.setNumberFormat("0.######");
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/config/ConfigurationApiImplTest.java b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/config/ConfigurationApiImplTest.java
index 117e4e4e48c..2700bc1b68b 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/config/ConfigurationApiImplTest.java
+++ b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/config/ConfigurationApiImplTest.java
@@ -44,314 +44,270 @@
 
 class ConfigurationApiImplTest extends AbstractConfigurationApiContractTest {
 
-  private static final int REQUEST_TIMEOUT_MILLIS = 15_000;
+    private static final int REQUEST_TIMEOUT_MILLIS = 15_000;
 
-  private static final String REQUEST_UID = "1234";
+    private static final String REQUEST_UID = "1234";
 
-  // Backend path each endpoint listens on (relative to /api/v2/).
-  private static final Map<Endpoint, String> ENDPOINT_PATHS = new HashMap<>();
+    // Backend path each endpoint listens on (relative to /api/v2/).
+    private static final Map<Endpoint, String> ENDPOINT_PATHS = new HashMap<>();
 
-  static {
-    ENDPOINT_PATHS.put(Endpoint.SETTINGS, "/api/v2/libraries/tests/services/setting");
-    ENDPOINT_PATHS.put(Endpoint.SKIPPABLE_TESTS, "/api/v2/ci/tests/skippable");
-    ENDPOINT_PATHS.put(Endpoint.FLAKY_TESTS, "/api/v2/ci/libraries/tests/flaky");
-    ENDPOINT_PATHS.put(Endpoint.KNOWN_TESTS, "/api/v2/ci/libraries/tests");
-    ENDPOINT_PATHS.put(Endpoint.TEST_MANAGEMENT, "/api/v2/test/libraries/test-management/tests");
-  }
+    static {
+        ENDPOINT_PATHS.put(Endpoint.SETTINGS, "/api/v2/libraries/tests/services/setting");
+        ENDPOINT_PATHS.put(Endpoint.SKIPPABLE_TESTS, "/api/v2/ci/tests/skippable");
+        ENDPOINT_PATHS.put(Endpoint.FLAKY_TESTS, "/api/v2/ci/libraries/tests/flaky");
+        ENDPOINT_PATHS.put(Endpoint.KNOWN_TESTS, "/api/v2/ci/libraries/tests");
+        ENDPOINT_PATHS.put(Endpoint.TEST_MANAGEMENT, "/api/v2/test/libraries/test-management/tests");
+    }
+
+    private final List<JavaTestHttpServer> servers = new ArrayList<>();
+
+    @AfterEach
+    void closeServers() {
+        for (JavaTestHttpServer server : servers) {
+            server.close();
+        }
+        servers.clear();
+    }
+
+    @Override
+    protected ConfigurationApi apiReturning(Endpoint endpoint, String responseBody) {
+        JavaTestHttpServer server = JavaTestHttpServer.httpServer(s -> s.handlers(
+                h -> h.prefix(ENDPOINT_PATHS.get(endpoint), api -> sendResponseBody(api, responseBody.getBytes()))));
+        servers.add(server);
+        return givenConfigurationApi(server, true, true);
+    }
+
+    // A response payload that exists only to keep the round-trip happy: parse correctness for the
+    // settings endpoint is covered by AbstractConfigurationApiContractTest#parsesSettings.
+    private static final CiVisibilitySettings CANONICAL_SETTINGS_RESPONSE = new CiVisibilitySettings(
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            EarlyFlakeDetectionSettings.DEFAULT,
+            TestManagementSettings.DEFAULT,
+            null,
+            false);
+
+    static Stream<Arguments> testSettingsRequestArguments() {
+        return Stream.of(
+                arguments("agentless=false, compression=false", false, false),
+                arguments("agentless=false, compression=true", false, true),
+                arguments("agentless=true, compression=false", true, false),
+                arguments("agentless=true, compression=true", true, true));
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("testSettingsRequestArguments")
+    void testSettingsRequest(String scenario, boolean agentless, boolean compression) throws IOException {
+        TracerEnvironment tracerEnvironment = givenTracerEnvironment(null);
+
+        Map<String, Object> requestData = new HashMap<>();
+        requestData.put("uid", REQUEST_UID);
+        requestData.put("tracerEnvironment", tracerEnvironment);
+        Map<String, Object> responseData = new HashMap<>();
+        responseData.put("settings", CANONICAL_SETTINGS_RESPONSE);
+
+        JavaTestHttpServer intakeServer = givenBackendEndpoint(
+                "/api/v2/libraries/tests/services/setting",
+                "settings-request.ftl",
+                requestData,
+                "settings-response.ftl",
+                responseData);
+        ConfigurationApi configurationApi = givenConfigurationApi(intakeServer, agentless, compression);
+
+        configurationApi.getSettings(tracerEnvironment);
+    }
+
+    static Stream<Arguments> testSkippableTestsRequestArguments() {
+        return Stream.of(
+                arguments("no test bundle", null, "skippable-request.ftl"),
+                arguments("with test bundle", "testBundle-a", "skippable-request-one-module.ftl"));
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("testSkippableTestsRequestArguments")
+    void testSkippableTestsRequest(String scenario, String testBundle, String requestTemplate) throws IOException {
+        TracerEnvironment tracerEnvironment = givenTracerEnvironment(testBundle);
+
+        Map<String, Object> requestData = new HashMap<>();
+        requestData.put("uid", REQUEST_UID);
+        requestData.put("tracerEnvironment", tracerEnvironment);
+
+        JavaTestHttpServer intakeServer = givenBackendEndpoint(
+                "/api/v2/ci/tests/skippable", requestTemplate, requestData, "skippable-response.ftl", new HashMap<>());
+        ConfigurationApi configurationApi = givenConfigurationApi(intakeServer, true, true);
+
+        configurationApi.getSkippableTests(tracerEnvironment);
+    }
+
+    static Stream<Arguments> testFlakyTestsRequestArguments() {
+        return Stream.of(
+                arguments("no test bundle", null, "flaky-request.ftl"),
+                arguments("with test bundle", "testBundle-a", "flaky-request-one-module.ftl"));
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("testFlakyTestsRequestArguments")
+    void testFlakyTestsRequest(String scenario, String testBundle, String requestTemplate) throws IOException {
+        TracerEnvironment tracerEnvironment = givenTracerEnvironment(testBundle);
 
-  private final List<JavaTestHttpServer> servers = new ArrayList<>();
+        Map<String, Object> requestData = new HashMap<>();
+        requestData.put("uid", REQUEST_UID);
+        requestData.put("tracerEnvironment", tracerEnvironment);
 
-  @AfterEach
-  void closeServers() {
-    for (JavaTestHttpServer server : servers) {
-      server.close();
+        JavaTestHttpServer intakeServer = givenBackendEndpoint(
+                "/api/v2/ci/libraries/tests/flaky",
+                requestTemplate,
+                requestData,
+                "flaky-response.ftl",
+                new HashMap<>());
+        ConfigurationApi configurationApi = givenConfigurationApi(intakeServer, true, true);
+
+        configurationApi.getFlakyTestsByModule(tracerEnvironment);
+    }
+
+    @Test
+    void testKnownTestsRequestWithPagination() throws IOException {
+        TracerEnvironment tracerEnvironment = givenTracerEnvironment(null);
+        AtomicInteger requestCount = new AtomicInteger(0);
+
+        String page1 =
+                "{\"data\":{\"id\":\"page1\",\"type\":\"ci_app_libraries_tests\",\"attributes\":{\"tests\":{\"module-a\":{\"suite-a\":[\"test-1\",\"test-2\"]}},\"page_info\":{\"size\":2,\"has_next\":true,\"cursor\":\"cursor-page-2\"}}}}";
+        String page2 =
+                "{\"data\":{\"id\":\"page2\",\"type\":\"ci_app_libraries_tests\",\"attributes\":{\"tests\":{\"module-b\":{\"suite-b\":[\"test-3\",\"test-4\"]}},\"page_info\":{\"size\":2,\"has_next\":true,\"cursor\":\"cursor-page-3\"}}}}";
+        String page3 =
+                "{\"data\":{\"id\":\"page3\",\"type\":\"ci_app_libraries_tests\",\"attributes\":{\"tests\":{\"module-c\":{\"suite-c\":[\"test-5\",\"test-6\"]}},\"page_info\":{\"size\":2,\"has_next\":false}}}}";
+        List<String> responses = Arrays.asList(page1, page2, page3);
+
+        JavaTestHttpServer intakeServer =
+                JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.prefix("/api/v2/ci/libraries/tests", api -> {
+                    int current = requestCount.incrementAndGet();
+                    sendResponseBody(api, responses.get(current - 1).getBytes());
+                })));
+        servers.add(intakeServer);
+        ConfigurationApi configurationApi = givenConfigurationApi(intakeServer, true, true);
+
+        Map<String, Collection<TestFQN>> knownTests = configurationApi.getKnownTestsByModule(tracerEnvironment);
+        sortValues(knownTests);
+
+        assertEquals(3, requestCount.get());
+
+        Map<String, Collection<TestFQN>> expected = new LinkedHashMap<>();
+        expected.put("module-a", Arrays.asList(new TestFQN("suite-a", "test-1"), new TestFQN("suite-a", "test-2")));
+        expected.put("module-b", Arrays.asList(new TestFQN("suite-b", "test-3"), new TestFQN("suite-b", "test-4")));
+        expected.put("module-c", Arrays.asList(new TestFQN("suite-c", "test-5"), new TestFQN("suite-c", "test-6")));
+        assertEquals(expected, knownTests);
+    }
+
+    private ConfigurationApi givenConfigurationApi(
+            JavaTestHttpServer intakeServer, boolean agentless, boolean compression) {
+        BackendApi api = agentless
+                ? givenIntakeApi(intakeServer.getAddress(), compression)
+                : givenEvpProxy(intakeServer.getAddress(), compression);
+        return new ConfigurationApiImpl(api, NoOpMetricCollector.INSTANCE, () -> REQUEST_UID);
+    }
+
+    private JavaTestHttpServer givenBackendEndpoint(
+            String path,
+            String requestTemplate,
+            Map<String, Object> requestData,
+            String responseTemplate,
+            Map<String, Object> responseData)
+            throws IOException {
+        String expectedRequestBody = render(requestTemplate, requestData);
+        byte[] responseBody = render(responseTemplate, responseData).getBytes();
+        JavaTestHttpServer server = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.prefix(path, api -> {
+            JavaTestHttpServer.HandlerApi.ResponseApi response = api.getResponse();
+            try {
+                JSONAssert.assertEquals(
+                        expectedRequestBody, new String(api.getRequest().getBody()), JSONCompareMode.LENIENT);
+            } catch (AssertionError error) {
+                response.status(400).send(error.getMessage().getBytes());
+                return;
+            }
+            sendResponseBody(api, responseBody);
+        })));
+        servers.add(server);
+        return server;
+    }
+
+    private static void sendResponseBody(JavaTestHttpServer.HandlerApi api, byte[] body) {
+        JavaTestHttpServer.HandlerApi.ResponseApi response = api.getResponse();
+        String header = api.getRequest().getHeader("Accept-Encoding");
+        if (header != null && header.contains("gzip")) {
+            response.addHeader("Content-Encoding", "gzip");
+            body = gzip(body);
+        }
+        response.status(200).send(body);
+    }
+
+    private static byte[] gzip(byte[] payload) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (GZIPOutputStream zip = new GZIPOutputStream(baos)) {
+            IOUtils.copy(new ByteArrayInputStream(payload), zip);
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+        return baos.toByteArray();
+    }
+
+    private BackendApi givenEvpProxy(URI address, boolean responseCompression) {
+        String traceId = "a-trace-id";
+        HttpUrl proxyUrl = HttpUrl.get(address);
+        HttpRetryPolicy.Factory retryPolicyFactory = new HttpRetryPolicy.Factory(5, 100, 2.0);
+        OkHttpClient client = OkHttpUtils.buildHttpClient(proxyUrl, REQUEST_TIMEOUT_MILLIS);
+        return new EvpProxyApi(traceId, proxyUrl, "api", retryPolicyFactory, client, responseCompression);
     }
-    servers.clear();
-  }
-
-  @Override
-  protected ConfigurationApi apiReturning(Endpoint endpoint, String responseBody) {
-    JavaTestHttpServer server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.prefix(
-                            ENDPOINT_PATHS.get(endpoint),
-                            api -> sendResponseBody(api, responseBody.getBytes()))));
-    servers.add(server);
-    return givenConfigurationApi(server, true, true);
-  }
-
-  // A response payload that exists only to keep the round-trip happy: parse correctness for the
-  // settings endpoint is covered by AbstractConfigurationApiContractTest#parsesSettings.
-  private static final CiVisibilitySettings CANONICAL_SETTINGS_RESPONSE =
-      new CiVisibilitySettings(
-          false,
-          false,
-          false,
-          false,
-          false,
-          false,
-          false,
-          false,
-          false,
-          EarlyFlakeDetectionSettings.DEFAULT,
-          TestManagementSettings.DEFAULT,
-          null,
-          false);
-
-  static Stream<Arguments> testSettingsRequestArguments() {
-    return Stream.of(
-        arguments("agentless=false, compression=false", false, false),
-        arguments("agentless=false, compression=true", false, true),
-        arguments("agentless=true, compression=false", true, false),
-        arguments("agentless=true, compression=true", true, true));
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("testSettingsRequestArguments")
-  void testSettingsRequest(String scenario, boolean agentless, boolean compression)
-      throws IOException {
-    TracerEnvironment tracerEnvironment = givenTracerEnvironment(null);
-
-    Map<String, Object> requestData = new HashMap<>();
-    requestData.put("uid", REQUEST_UID);
-    requestData.put("tracerEnvironment", tracerEnvironment);
-    Map<String, Object> responseData = new HashMap<>();
-    responseData.put("settings", CANONICAL_SETTINGS_RESPONSE);
-
-    JavaTestHttpServer intakeServer =
-        givenBackendEndpoint(
-            "/api/v2/libraries/tests/services/setting",
-            "settings-request.ftl",
-            requestData,
-            "settings-response.ftl",
-            responseData);
-    ConfigurationApi configurationApi = givenConfigurationApi(intakeServer, agentless, compression);
-
-    configurationApi.getSettings(tracerEnvironment);
-  }
-
-  static Stream<Arguments> testSkippableTestsRequestArguments() {
-    return Stream.of(
-        arguments("no test bundle", null, "skippable-request.ftl"),
-        arguments("with test bundle", "testBundle-a", "skippable-request-one-module.ftl"));
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("testSkippableTestsRequestArguments")
-  void testSkippableTestsRequest(String scenario, String testBundle, String requestTemplate)
-      throws IOException {
-    TracerEnvironment tracerEnvironment = givenTracerEnvironment(testBundle);
-
-    Map<String, Object> requestData = new HashMap<>();
-    requestData.put("uid", REQUEST_UID);
-    requestData.put("tracerEnvironment", tracerEnvironment);
-
-    JavaTestHttpServer intakeServer =
-        givenBackendEndpoint(
-            "/api/v2/ci/tests/skippable",
-            requestTemplate,
-            requestData,
-            "skippable-response.ftl",
-            new HashMap<>());
-    ConfigurationApi configurationApi = givenConfigurationApi(intakeServer, true, true);
-
-    configurationApi.getSkippableTests(tracerEnvironment);
-  }
-
-  static Stream<Arguments> testFlakyTestsRequestArguments() {
-    return Stream.of(
-        arguments("no test bundle", null, "flaky-request.ftl"),
-        arguments("with test bundle", "testBundle-a", "flaky-request-one-module.ftl"));
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("testFlakyTestsRequestArguments")
-  void testFlakyTestsRequest(String scenario, String testBundle, String requestTemplate)
-      throws IOException {
-    TracerEnvironment tracerEnvironment = givenTracerEnvironment(testBundle);
-
-    Map<String, Object> requestData = new HashMap<>();
-    requestData.put("uid", REQUEST_UID);
-    requestData.put("tracerEnvironment", tracerEnvironment);
-
-    JavaTestHttpServer intakeServer =
-        givenBackendEndpoint(
-            "/api/v2/ci/libraries/tests/flaky",
-            requestTemplate,
-            requestData,
-            "flaky-response.ftl",
-            new HashMap<>());
-    ConfigurationApi configurationApi = givenConfigurationApi(intakeServer, true, true);
-
-    configurationApi.getFlakyTestsByModule(tracerEnvironment);
-  }
-
-  @Test
-  void testKnownTestsRequestWithPagination() throws IOException {
-    TracerEnvironment tracerEnvironment = givenTracerEnvironment(null);
-    AtomicInteger requestCount = new AtomicInteger(0);
-
-    String page1 =
-        "{\"data\":{\"id\":\"page1\",\"type\":\"ci_app_libraries_tests\",\"attributes\":{\"tests\":{\"module-a\":{\"suite-a\":[\"test-1\",\"test-2\"]}},\"page_info\":{\"size\":2,\"has_next\":true,\"cursor\":\"cursor-page-2\"}}}}";
-    String page2 =
-        "{\"data\":{\"id\":\"page2\",\"type\":\"ci_app_libraries_tests\",\"attributes\":{\"tests\":{\"module-b\":{\"suite-b\":[\"test-3\",\"test-4\"]}},\"page_info\":{\"size\":2,\"has_next\":true,\"cursor\":\"cursor-page-3\"}}}}";
-    String page3 =
-        "{\"data\":{\"id\":\"page3\",\"type\":\"ci_app_libraries_tests\",\"attributes\":{\"tests\":{\"module-c\":{\"suite-c\":[\"test-5\",\"test-6\"]}},\"page_info\":{\"size\":2,\"has_next\":false}}}}";
-    List<String> responses = Arrays.asList(page1, page2, page3);
-
-    JavaTestHttpServer intakeServer =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.prefix(
-                            "/api/v2/ci/libraries/tests",
-                            api -> {
-                              int current = requestCount.incrementAndGet();
-                              sendResponseBody(api, responses.get(current - 1).getBytes());
-                            })));
-    servers.add(intakeServer);
-    ConfigurationApi configurationApi = givenConfigurationApi(intakeServer, true, true);
-
-    Map<String, Collection<TestFQN>> knownTests =
-        configurationApi.getKnownTestsByModule(tracerEnvironment);
-    sortValues(knownTests);
-
-    assertEquals(3, requestCount.get());
-
-    Map<String, Collection<TestFQN>> expected = new LinkedHashMap<>();
-    expected.put(
-        "module-a",
-        Arrays.asList(new TestFQN("suite-a", "test-1"), new TestFQN("suite-a", "test-2")));
-    expected.put(
-        "module-b",
-        Arrays.asList(new TestFQN("suite-b", "test-3"), new TestFQN("suite-b", "test-4")));
-    expected.put(
-        "module-c",
-        Arrays.asList(new TestFQN("suite-c", "test-5"), new TestFQN("suite-c", "test-6")));
-    assertEquals(expected, knownTests);
-  }
-
-  private ConfigurationApi givenConfigurationApi(
-      JavaTestHttpServer intakeServer, boolean agentless, boolean compression) {
-    BackendApi api =
-        agentless
-            ? givenIntakeApi(intakeServer.getAddress(), compression)
-            : givenEvpProxy(intakeServer.getAddress(), compression);
-    return new ConfigurationApiImpl(api, NoOpMetricCollector.INSTANCE, () -> REQUEST_UID);
-  }
-
-  private JavaTestHttpServer givenBackendEndpoint(
-      String path,
-      String requestTemplate,
-      Map<String, Object> requestData,
-      String responseTemplate,
-      Map<String, Object> responseData)
-      throws IOException {
-    String expectedRequestBody = render(requestTemplate, requestData);
-    byte[] responseBody = render(responseTemplate, responseData).getBytes();
-    JavaTestHttpServer server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.prefix(
-                            path,
-                            api -> {
-                              JavaTestHttpServer.HandlerApi.ResponseApi response =
-                                  api.getResponse();
-                              try {
-                                JSONAssert.assertEquals(
-                                    expectedRequestBody,
-                                    new String(api.getRequest().getBody()),
-                                    JSONCompareMode.LENIENT);
-                              } catch (AssertionError error) {
-                                response.status(400).send(error.getMessage().getBytes());
-                                return;
-                              }
-                              sendResponseBody(api, responseBody);
-                            })));
-    servers.add(server);
-    return server;
-  }
-
-  private static void sendResponseBody(JavaTestHttpServer.HandlerApi api, byte[] body) {
-    JavaTestHttpServer.HandlerApi.ResponseApi response = api.getResponse();
-    String header = api.getRequest().getHeader("Accept-Encoding");
-    if (header != null && header.contains("gzip")) {
-      response.addHeader("Content-Encoding", "gzip");
-      body = gzip(body);
+
+    private BackendApi givenIntakeApi(URI address, boolean responseCompression) {
+        HttpUrl intakeUrl = HttpUrl.get(String.format("%s/api/%s/", address.toString(), Intake.API.getVersion()));
+
+        String apiKey = "api-key";
+        String traceId = "a-trace-id";
+
+        HttpRetryPolicy retryPolicy = mock(HttpRetryPolicy.class);
+        when(retryPolicy.shouldRetry(any(okhttp3.Response.class))).thenReturn(false);
+
+        HttpRetryPolicy.Factory retryPolicyFactory = mock(HttpRetryPolicy.Factory.class);
+        when(retryPolicyFactory.create()).thenReturn(retryPolicy);
+
+        OkHttpClient client = OkHttpUtils.buildHttpClient(intakeUrl, REQUEST_TIMEOUT_MILLIS);
+        return new IntakeApi(intakeUrl, apiKey, traceId, retryPolicyFactory, client, responseCompression);
     }
-    response.status(200).send(body);
-  }
-
-  private static byte[] gzip(byte[] payload) {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    try (GZIPOutputStream zip = new GZIPOutputStream(baos)) {
-      IOUtils.copy(new ByteArrayInputStream(payload), zip);
-    } catch (IOException e) {
-      throw new IllegalStateException(e);
+
+    private static TracerEnvironment givenTracerEnvironment(String testBundle) {
+        return TracerEnvironment.builder()
+                .service("foo")
+                .env("foo_env")
+                .repositoryUrl("https://github.com/DataDog/foo")
+                .branch("prod")
+                .sha("d64185e45d1722ab3a53c45be47accae")
+                .commitMessage("full commit message")
+                .osPlatform("linux")
+                .osArchitecture("amd64")
+                .osVersion("bionic")
+                .runtimeName("runtimeName")
+                .runtimeVersion("runtimeVersion")
+                .runtimeVendor("vendor")
+                .runtimeArchitecture("amd64")
+                .customTag("customTag", "customValue")
+                .testBundle(testBundle)
+                .build();
     }
-    return baos.toByteArray();
-  }
-
-  private BackendApi givenEvpProxy(URI address, boolean responseCompression) {
-    String traceId = "a-trace-id";
-    HttpUrl proxyUrl = HttpUrl.get(address);
-    HttpRetryPolicy.Factory retryPolicyFactory = new HttpRetryPolicy.Factory(5, 100, 2.0);
-    OkHttpClient client = OkHttpUtils.buildHttpClient(proxyUrl, REQUEST_TIMEOUT_MILLIS);
-    return new EvpProxyApi(
-        traceId, proxyUrl, "api", retryPolicyFactory, client, responseCompression);
-  }
-
-  private BackendApi givenIntakeApi(URI address, boolean responseCompression) {
-    HttpUrl intakeUrl =
-        HttpUrl.get(String.format("%s/api/%s/", address.toString(), Intake.API.getVersion()));
-
-    String apiKey = "api-key";
-    String traceId = "a-trace-id";
-
-    HttpRetryPolicy retryPolicy = mock(HttpRetryPolicy.class);
-    when(retryPolicy.shouldRetry(any(okhttp3.Response.class))).thenReturn(false);
-
-    HttpRetryPolicy.Factory retryPolicyFactory = mock(HttpRetryPolicy.Factory.class);
-    when(retryPolicyFactory.create()).thenReturn(retryPolicy);
-
-    OkHttpClient client = OkHttpUtils.buildHttpClient(intakeUrl, REQUEST_TIMEOUT_MILLIS);
-    return new IntakeApi(
-        intakeUrl, apiKey, traceId, retryPolicyFactory, client, responseCompression);
-  }
-
-  private static TracerEnvironment givenTracerEnvironment(String testBundle) {
-    return TracerEnvironment.builder()
-        .service("foo")
-        .env("foo_env")
-        .repositoryUrl("https://github.com/DataDog/foo")
-        .branch("prod")
-        .sha("d64185e45d1722ab3a53c45be47accae")
-        .commitMessage("full commit message")
-        .osPlatform("linux")
-        .osArchitecture("amd64")
-        .osVersion("bionic")
-        .runtimeName("runtimeName")
-        .runtimeVersion("runtimeVersion")
-        .runtimeVendor("vendor")
-        .runtimeArchitecture("amd64")
-        .customTag("customTag", "customValue")
-        .testBundle(testBundle)
-        .build();
-  }
-
-  private static void sortValues(Map<String, Collection<TestFQN>> tests) {
-    Comparator<TestFQN> bySuiteThenName =
-        Comparator.comparing(TestFQN::getSuite).thenComparing(TestFQN::getName);
-    for (Map.Entry<String, Collection<TestFQN>> e : tests.entrySet()) {
-      List<TestFQN> sorted = new ArrayList<>(e.getValue());
-      sorted.sort(bySuiteThenName);
-      e.setValue(sorted);
+
+    private static void sortValues(Map<String, Collection<TestFQN>> tests) {
+        Comparator<TestFQN> bySuiteThenName =
+                Comparator.comparing(TestFQN::getSuite).thenComparing(TestFQN::getName);
+        for (Map.Entry<String, Collection<TestFQN>> e : tests.entrySet()) {
+            List<TestFQN> sorted = new ArrayList<>(e.getValue());
+            sorted.sort(bySuiteThenName);
+            e.setValue(sorted);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/config/DynamicAutoTestRetrySettingsTest.java b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/config/DynamicAutoTestRetrySettingsTest.java
index 4f9606fef3a..8be6f9e8448 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/config/DynamicAutoTestRetrySettingsTest.java
+++ b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/config/DynamicAutoTestRetrySettingsTest.java
@@ -17,78 +17,72 @@
 
 class DynamicAutoTestRetrySettingsTest {
 
-  private static final List<ExecutionsByDuration> BACKEND_RETRIES =
-      Arrays.asList(
-          new ExecutionsByDuration(5_000, 10),
-          new ExecutionsByDuration(10_000, 2),
-          new ExecutionsByDuration(30_000, 3),
-          new ExecutionsByDuration(300_000, 4));
+    private static final List<ExecutionsByDuration> BACKEND_RETRIES = Arrays.asList(
+            new ExecutionsByDuration(5_000, 10),
+            new ExecutionsByDuration(10_000, 2),
+            new ExecutionsByDuration(30_000, 3),
+            new ExecutionsByDuration(300_000, 4));
 
-  @Test
-  void usesCustomBuckets() {
-    DynamicAutoTestRetrySettings settings =
-        DynamicAutoTestRetrySettings.create(true, Arrays.asList(5, 4, 3, 2, 1), BACKEND_RETRIES);
+    @Test
+    void usesCustomBuckets() {
+        DynamicAutoTestRetrySettings settings =
+                DynamicAutoTestRetrySettings.create(true, Arrays.asList(5, 4, 3, 2, 1), BACKEND_RETRIES);
 
-    assertTrue(settings.isEnabled());
-    assertTrue(settings.isCustom());
-    assertEquals(6, settings.executionsForDuration(5_000));
-    assertEquals(5, settings.executionsForDuration(5_001));
-    assertEquals(4, settings.executionsForDuration(10_001));
-    assertEquals(3, settings.executionsForDuration(30_001));
-    assertEquals(2, settings.executionsForDuration(300_001));
-  }
+        assertTrue(settings.isEnabled());
+        assertTrue(settings.isCustom());
+        assertEquals(6, settings.executionsForDuration(5_000));
+        assertEquals(5, settings.executionsForDuration(5_001));
+        assertEquals(4, settings.executionsForDuration(10_001));
+        assertEquals(3, settings.executionsForDuration(30_001));
+        assertEquals(2, settings.executionsForDuration(300_001));
+    }
 
-  @Test
-  void normalizesBackendRetriesToExecutions() {
-    DynamicAutoTestRetrySettings settings =
-        DynamicAutoTestRetrySettings.create(true, null, BACKEND_RETRIES);
+    @Test
+    void normalizesBackendRetriesToExecutions() {
+        DynamicAutoTestRetrySettings settings = DynamicAutoTestRetrySettings.create(true, null, BACKEND_RETRIES);
 
-    assertFalse(settings.isCustom());
-    assertEquals(11, settings.executionsForDuration(5_000));
-    assertEquals(3, settings.executionsForDuration(5_001));
-    assertEquals(4, settings.executionsForDuration(10_001));
-    assertEquals(5, settings.executionsForDuration(30_001));
-    assertEquals(2, settings.executionsForDuration(300_001));
-    assertEquals(10, BACKEND_RETRIES.get(0).getExecutions());
-  }
+        assertFalse(settings.isCustom());
+        assertEquals(11, settings.executionsForDuration(5_000));
+        assertEquals(3, settings.executionsForDuration(5_001));
+        assertEquals(4, settings.executionsForDuration(10_001));
+        assertEquals(5, settings.executionsForDuration(30_001));
+        assertEquals(2, settings.executionsForDuration(300_001));
+        assertEquals(10, BACKEND_RETRIES.get(0).getExecutions());
+    }
 
-  @ParameterizedTest
-  @ValueSource(ints = {-1, 0, 1})
-  void guaranteesAtLeastOneRetry(int retries) {
-    DynamicAutoTestRetrySettings settings =
-        DynamicAutoTestRetrySettings.create(
-            true, null, singletonList(new ExecutionsByDuration(5_000, retries)));
+    @ParameterizedTest
+    @ValueSource(ints = {-1, 0, 1})
+    void guaranteesAtLeastOneRetry(int retries) {
+        DynamicAutoTestRetrySettings settings = DynamicAutoTestRetrySettings.create(
+                true, null, singletonList(new ExecutionsByDuration(5_000, retries)));
 
-    assertEquals(2, settings.executionsForDuration(1_000));
-  }
+        assertEquals(2, settings.executionsForDuration(1_000));
+    }
 
-  @Test
-  void retriesOnceWithoutBackendBuckets() {
-    DynamicAutoTestRetrySettings settings =
-        DynamicAutoTestRetrySettings.create(true, null, emptyList());
+    @Test
+    void retriesOnceWithoutBackendBuckets() {
+        DynamicAutoTestRetrySettings settings = DynamicAutoTestRetrySettings.create(true, null, emptyList());
 
-    assertEquals(2, settings.executionsForDuration(1_000));
-  }
+        assertEquals(2, settings.executionsForDuration(1_000));
+    }
 
-  @Test
-  void disabledSettingsIgnoreCustomBuckets() {
-    assertSame(
-        DynamicAutoTestRetrySettings.DEFAULT,
-        DynamicAutoTestRetrySettings.create(false, Arrays.asList(5, 4, 3, 2, 1), BACKEND_RETRIES));
-  }
+    @Test
+    void disabledSettingsIgnoreCustomBuckets() {
+        assertSame(
+                DynamicAutoTestRetrySettings.DEFAULT,
+                DynamicAutoTestRetrySettings.create(false, Arrays.asList(5, 4, 3, 2, 1), BACKEND_RETRIES));
+    }
 
-  @Test
-  void serializationPreservesExecutionBudgets() {
-    DynamicAutoTestRetrySettings settings =
-        DynamicAutoTestRetrySettings.create(true, null, BACKEND_RETRIES);
-    Serializer serializer = new Serializer();
-    DynamicAutoTestRetrySettings.Serializer.serialize(serializer, settings);
-    ByteBuffer serialized = serializer.flush();
+    @Test
+    void serializationPreservesExecutionBudgets() {
+        DynamicAutoTestRetrySettings settings = DynamicAutoTestRetrySettings.create(true, null, BACKEND_RETRIES);
+        Serializer serializer = new Serializer();
+        DynamicAutoTestRetrySettings.Serializer.serialize(serializer, settings);
+        ByteBuffer serialized = serializer.flush();
 
-    DynamicAutoTestRetrySettings deserialized =
-        DynamicAutoTestRetrySettings.Serializer.deserialize(serialized);
-    assertEquals(settings, deserialized);
-    assertEquals(11, deserialized.executionsForDuration(1_000));
-    assertEquals(2, deserialized.executionsForDuration(300_001));
-  }
+        DynamicAutoTestRetrySettings deserialized = DynamicAutoTestRetrySettings.Serializer.deserialize(serialized);
+        assertEquals(settings, deserialized);
+        assertEquals(11, deserialized.executionsForDuration(1_000));
+        assertEquals(2, deserialized.executionsForDuration(300_001));
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/config/FileBasedConfigurationApiTest.java b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/config/FileBasedConfigurationApiTest.java
index 3aa3df05763..2ab77551a62 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/config/FileBasedConfigurationApiTest.java
+++ b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/config/FileBasedConfigurationApiTest.java
@@ -13,76 +13,76 @@
 
 class FileBasedConfigurationApiTest extends AbstractConfigurationApiContractTest {
 
-  @TempDir Path tmp;
+    @TempDir
+    Path tmp;
 
-  @Override
-  protected ConfigurationApi apiReturning(Endpoint endpoint, String responseBody)
-      throws IOException {
-    Path file = writeText("payload.json", responseBody);
-    switch (endpoint) {
-      case SETTINGS:
-        return new FileBasedConfigurationApi(file, null, null, null, null);
-      case SKIPPABLE_TESTS:
-        return new FileBasedConfigurationApi(null, file, null, null, null);
-      case FLAKY_TESTS:
-        return new FileBasedConfigurationApi(null, null, file, null, null);
-      case KNOWN_TESTS:
-        return new FileBasedConfigurationApi(null, null, null, file, null);
-      case TEST_MANAGEMENT:
-        return new FileBasedConfigurationApi(null, null, null, null, file);
-      default:
-        throw new IllegalArgumentException("Unsupported endpoint: " + endpoint);
+    @Override
+    protected ConfigurationApi apiReturning(Endpoint endpoint, String responseBody) throws IOException {
+        Path file = writeText("payload.json", responseBody);
+        switch (endpoint) {
+            case SETTINGS:
+                return new FileBasedConfigurationApi(file, null, null, null, null);
+            case SKIPPABLE_TESTS:
+                return new FileBasedConfigurationApi(null, file, null, null, null);
+            case FLAKY_TESTS:
+                return new FileBasedConfigurationApi(null, null, file, null, null);
+            case KNOWN_TESTS:
+                return new FileBasedConfigurationApi(null, null, null, file, null);
+            case TEST_MANAGEMENT:
+                return new FileBasedConfigurationApi(null, null, null, null, file);
+            default:
+                throw new IllegalArgumentException("Unsupported endpoint: " + endpoint);
+        }
     }
-  }
 
-  @Test
-  void returnsDefaultsWhenAllPathsAreNull() throws IOException {
-    FileBasedConfigurationApi api = new FileBasedConfigurationApi(null, null, null, null, null);
+    @Test
+    void returnsDefaultsWhenAllPathsAreNull() throws IOException {
+        FileBasedConfigurationApi api = new FileBasedConfigurationApi(null, null, null, null, null);
 
-    assertSame(CiVisibilitySettings.DEFAULT, api.getSettings(ENV));
-    assertSame(SkippableTests.EMPTY, api.getSkippableTests(ENV));
-    assertEquals(0, api.getFlakyTestsByModule(ENV).size());
-    assertEquals(0, api.getKnownTestsByModule(ENV).size());
-    assertEquals(0, api.getTestManagementTestsByModule(ENV, null, null).size());
-  }
+        assertSame(CiVisibilitySettings.DEFAULT, api.getSettings(ENV));
+        assertSame(SkippableTests.EMPTY, api.getSkippableTests(ENV));
+        assertEquals(0, api.getFlakyTestsByModule(ENV).size());
+        assertEquals(0, api.getKnownTestsByModule(ENV).size());
+        assertEquals(0, api.getTestManagementTestsByModule(ENV, null, null).size());
+    }
 
-  @Test
-  void knownTestsReturnsNullWhenResponseHasNoTests() throws IOException {
-    // Matches the backend API contract: empty-but-present known-tests payload → null
-    Path file = writeText("empty-known.json", "{\"data\":{\"attributes\":{\"tests\":{}}}}");
+    @Test
+    void knownTestsReturnsNullWhenResponseHasNoTests() throws IOException {
+        // Matches the backend API contract: empty-but-present known-tests payload → null
+        Path file = writeText("empty-known.json", "{\"data\":{\"attributes\":{\"tests\":{}}}}");
 
-    FileBasedConfigurationApi api = new FileBasedConfigurationApi(null, null, null, file, null);
+        FileBasedConfigurationApi api = new FileBasedConfigurationApi(null, null, null, file, null);
 
-    assertNull(api.getKnownTestsByModule(ENV));
-  }
+        assertNull(api.getKnownTestsByModule(ENV));
+    }
 
-  @Test
-  void propagatesIOExceptionForMissingFile() {
-    Path missing = tmp.resolve("does-not-exist.json");
-    FileBasedConfigurationApi api = new FileBasedConfigurationApi(missing, null, null, null, null);
+    @Test
+    void propagatesIOExceptionForMissingFile() {
+        Path missing = tmp.resolve("does-not-exist.json");
+        FileBasedConfigurationApi api = new FileBasedConfigurationApi(missing, null, null, null, null);
 
-    assertThrowsIO(() -> api.getSettings(ENV));
-  }
+        assertThrowsIO(() -> api.getSettings(ENV));
+    }
 
-  private Path writeText(String name, String content) throws IOException {
-    Path p = tmp.resolve(name);
-    Files.write(p, content.getBytes(StandardCharsets.UTF_8));
-    return p;
-  }
+    private Path writeText(String name, String content) throws IOException {
+        Path p = tmp.resolve(name);
+        Files.write(p, content.getBytes(StandardCharsets.UTF_8));
+        return p;
+    }
 
-  private static void assertThrowsIO(ThrowingRunnable runnable) {
-    try {
-      runnable.run();
-    } catch (IOException expected) {
-      return;
-    } catch (Throwable t) {
-      throw new AssertionError("Expected IOException but got " + t, t);
+    private static void assertThrowsIO(ThrowingRunnable runnable) {
+        try {
+            runnable.run();
+        } catch (IOException expected) {
+            return;
+        } catch (Throwable t) {
+            throw new AssertionError("Expected IOException but got " + t, t);
+        }
+        throw new AssertionError("Expected IOException but none thrown");
     }
-    throw new AssertionError("Expected IOException but none thrown");
-  }
 
-  @FunctionalInterface
-  private interface ThrowingRunnable {
-    void run() throws IOException;
-  }
+    @FunctionalInterface
+    private interface ThrowingRunnable {
+        void run() throws IOException;
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/coverage/file/FileCoverageStoreTest.java b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/coverage/file/FileCoverageStoreTest.java
index fef10b98639..0f7642e2699 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/coverage/file/FileCoverageStoreTest.java
+++ b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/coverage/file/FileCoverageStoreTest.java
@@ -18,80 +18,79 @@
 
 class FileCoverageStoreTest {
 
-  private static final class ResolvableClassA {}
-
-  private static final class DuplicateKeyClass {}
-
-  private static final class ResolvableClassC {}
-
-  @Test
-  void duplicateKeyClassReturnsAllCandidatePathsInCoverageReport() {
-    CiVisibilityMetricCollector metrics = mock(CiVisibilityMetricCollector.class);
-    SourcePathResolver sourcePathResolver = mock(SourcePathResolver.class);
-    when(sourcePathResolver.getSourcePaths(ResolvableClassA.class))
-        .thenReturn(singletonList("src/main/java/com/example/ClassA.java"));
-    when(sourcePathResolver.getSourcePaths(DuplicateKeyClass.class))
-        .thenReturn(
-            asList(
-                "src/debug/java/com/example/DuplicateKeyClass.java",
-                "src/release/java/com/example/DuplicateKeyClass.java"));
-    when(sourcePathResolver.getSourcePaths(ResolvableClassC.class))
-        .thenReturn(singletonList("src/main/java/com/example/ClassC.java"));
-
-    CoverageStore store = new FileCoverageStore.Factory(metrics, sourcePathResolver).create(null);
-    store.getProbes().record(ResolvableClassA.class);
-    store.getProbes().record(DuplicateKeyClass.class);
-    store.getProbes().record(ResolvableClassC.class);
-
-    boolean result = store.report(DDTraceId.ONE, 1L, 1L);
-
-    assertTrue(result);
-    TestReport report = store.getReport();
-    assertNotNull(report);
-    assertEquals(4, report.getTestReportFileEntries().size());
-  }
-
-  @Test
-  void coverageReportSucceedsForNonDuplicateClasses() {
-    CiVisibilityMetricCollector metrics = mock(CiVisibilityMetricCollector.class);
-    SourcePathResolver sourcePathResolver = mock(SourcePathResolver.class);
-    when(sourcePathResolver.getSourcePaths(ResolvableClassA.class))
-        .thenReturn(singletonList("src/main/java/com/example/ClassA.java"));
-    when(sourcePathResolver.getSourcePaths(ResolvableClassC.class))
-        .thenReturn(singletonList("src/main/java/com/example/ClassC.java"));
-
-    CoverageStore store = new FileCoverageStore.Factory(metrics, sourcePathResolver).create(null);
-    store.getProbes().record(ResolvableClassA.class);
-    store.getProbes().record(ResolvableClassC.class);
-
-    boolean result = store.report(DDTraceId.ONE, 1L, 1L);
-
-    assertTrue(result);
-    TestReport report = store.getReport();
-    assertNotNull(report);
-    assertEquals(2, report.getTestReportFileEntries().size());
-  }
-
-  @Test
-  void emptySourcePathsForOneClassDoesNotKillCoverageReport() {
-    CiVisibilityMetricCollector metrics = mock(CiVisibilityMetricCollector.class);
-    SourcePathResolver sourcePathResolver = mock(SourcePathResolver.class);
-    when(sourcePathResolver.getSourcePaths(ResolvableClassA.class))
-        .thenReturn(singletonList("src/main/java/com/example/ClassA.java"));
-    when(sourcePathResolver.getSourcePaths(DuplicateKeyClass.class)).thenReturn(emptyList());
-    when(sourcePathResolver.getSourcePaths(ResolvableClassC.class))
-        .thenReturn(singletonList("src/main/java/com/example/ClassC.java"));
-
-    CoverageStore store = new FileCoverageStore.Factory(metrics, sourcePathResolver).create(null);
-    store.getProbes().record(ResolvableClassA.class);
-    store.getProbes().record(DuplicateKeyClass.class);
-    store.getProbes().record(ResolvableClassC.class);
-
-    boolean result = store.report(DDTraceId.ONE, 1L, 1L);
-
-    assertTrue(result);
-    TestReport report = store.getReport();
-    assertNotNull(report);
-    assertEquals(2, report.getTestReportFileEntries().size());
-  }
+    private static final class ResolvableClassA {}
+
+    private static final class DuplicateKeyClass {}
+
+    private static final class ResolvableClassC {}
+
+    @Test
+    void duplicateKeyClassReturnsAllCandidatePathsInCoverageReport() {
+        CiVisibilityMetricCollector metrics = mock(CiVisibilityMetricCollector.class);
+        SourcePathResolver sourcePathResolver = mock(SourcePathResolver.class);
+        when(sourcePathResolver.getSourcePaths(ResolvableClassA.class))
+                .thenReturn(singletonList("src/main/java/com/example/ClassA.java"));
+        when(sourcePathResolver.getSourcePaths(DuplicateKeyClass.class))
+                .thenReturn(asList(
+                        "src/debug/java/com/example/DuplicateKeyClass.java",
+                        "src/release/java/com/example/DuplicateKeyClass.java"));
+        when(sourcePathResolver.getSourcePaths(ResolvableClassC.class))
+                .thenReturn(singletonList("src/main/java/com/example/ClassC.java"));
+
+        CoverageStore store = new FileCoverageStore.Factory(metrics, sourcePathResolver).create(null);
+        store.getProbes().record(ResolvableClassA.class);
+        store.getProbes().record(DuplicateKeyClass.class);
+        store.getProbes().record(ResolvableClassC.class);
+
+        boolean result = store.report(DDTraceId.ONE, 1L, 1L);
+
+        assertTrue(result);
+        TestReport report = store.getReport();
+        assertNotNull(report);
+        assertEquals(4, report.getTestReportFileEntries().size());
+    }
+
+    @Test
+    void coverageReportSucceedsForNonDuplicateClasses() {
+        CiVisibilityMetricCollector metrics = mock(CiVisibilityMetricCollector.class);
+        SourcePathResolver sourcePathResolver = mock(SourcePathResolver.class);
+        when(sourcePathResolver.getSourcePaths(ResolvableClassA.class))
+                .thenReturn(singletonList("src/main/java/com/example/ClassA.java"));
+        when(sourcePathResolver.getSourcePaths(ResolvableClassC.class))
+                .thenReturn(singletonList("src/main/java/com/example/ClassC.java"));
+
+        CoverageStore store = new FileCoverageStore.Factory(metrics, sourcePathResolver).create(null);
+        store.getProbes().record(ResolvableClassA.class);
+        store.getProbes().record(ResolvableClassC.class);
+
+        boolean result = store.report(DDTraceId.ONE, 1L, 1L);
+
+        assertTrue(result);
+        TestReport report = store.getReport();
+        assertNotNull(report);
+        assertEquals(2, report.getTestReportFileEntries().size());
+    }
+
+    @Test
+    void emptySourcePathsForOneClassDoesNotKillCoverageReport() {
+        CiVisibilityMetricCollector metrics = mock(CiVisibilityMetricCollector.class);
+        SourcePathResolver sourcePathResolver = mock(SourcePathResolver.class);
+        when(sourcePathResolver.getSourcePaths(ResolvableClassA.class))
+                .thenReturn(singletonList("src/main/java/com/example/ClassA.java"));
+        when(sourcePathResolver.getSourcePaths(DuplicateKeyClass.class)).thenReturn(emptyList());
+        when(sourcePathResolver.getSourcePaths(ResolvableClassC.class))
+                .thenReturn(singletonList("src/main/java/com/example/ClassC.java"));
+
+        CoverageStore store = new FileCoverageStore.Factory(metrics, sourcePathResolver).create(null);
+        store.getProbes().record(ResolvableClassA.class);
+        store.getProbes().record(DuplicateKeyClass.class);
+        store.getProbes().record(ResolvableClassC.class);
+
+        boolean result = store.report(DDTraceId.ONE, 1L, 1L);
+
+        assertTrue(result);
+        TestReport report = store.getReport();
+        assertNotNull(report);
+        assertEquals(2, report.getTestReportFileEntries().size());
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/coverage/line/LineCoverageStoreTest.java b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/coverage/line/LineCoverageStoreTest.java
index fe719cdc78d..225d4ed8c45 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/coverage/line/LineCoverageStoreTest.java
+++ b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/coverage/line/LineCoverageStoreTest.java
@@ -8,31 +8,30 @@
 
 class LineCoverageStoreTest {
 
-  @Test
-  void cacheKeyReusesAnalysisForSameClassAndProbes() {
-    AnalysisCacheKey key = new AnalysisCacheKey(1L, new boolean[] {true, false, true, false});
-    AnalysisCacheKey same = new AnalysisCacheKey(1L, new boolean[] {true, false, true, false});
-    // identical class id + probe set must collide so the analysis is reused
-    assertEquals(key, same);
-    assertEquals(key.hashCode(), same.hashCode());
-  }
+    @Test
+    void cacheKeyReusesAnalysisForSameClassAndProbes() {
+        AnalysisCacheKey key = new AnalysisCacheKey(1L, new boolean[] {true, false, true, false});
+        AnalysisCacheKey same = new AnalysisCacheKey(1L, new boolean[] {true, false, true, false});
+        // identical class id + probe set must collide so the analysis is reused
+        assertEquals(key, same);
+        assertEquals(key.hashCode(), same.hashCode());
+    }
 
-  @Test
-  void cacheKeyDistinguishesClassesAndProbeSets() {
-    AnalysisCacheKey key = new AnalysisCacheKey(1L, new boolean[] {true, false, true});
-    // a different class or a different probe set must NOT hit the same cache entry
-    assertNotEquals(key, new AnalysisCacheKey(2L, new boolean[] {true, false, true}));
-    assertNotEquals(key, new AnalysisCacheKey(1L, new boolean[] {true, true, true}));
-  }
+    @Test
+    void cacheKeyDistinguishesClassesAndProbeSets() {
+        AnalysisCacheKey key = new AnalysisCacheKey(1L, new boolean[] {true, false, true});
+        // a different class or a different probe set must NOT hit the same cache entry
+        assertNotEquals(key, new AnalysisCacheKey(2L, new boolean[] {true, false, true}));
+        assertNotEquals(key, new AnalysisCacheKey(1L, new boolean[] {true, true, true}));
+    }
 
-  @Test
-  void cacheKeyIgnoresTrailingUnsetProbes() {
-    // The key bit-packs the activated probe set; trailing probes that never fire don't change
-    // coverage, so padding differences must not create distinct entries.
-    AnalysisCacheKey shortKey = new AnalysisCacheKey(1L, new boolean[] {true, false, true});
-    AnalysisCacheKey padded =
-        new AnalysisCacheKey(1L, new boolean[] {true, false, true, false, false});
-    assertEquals(shortKey, padded);
-    assertEquals(shortKey.hashCode(), padded.hashCode());
-  }
+    @Test
+    void cacheKeyIgnoresTrailingUnsetProbes() {
+        // The key bit-packs the activated probe set; trailing probes that never fire don't change
+        // coverage, so padding differences must not create distinct entries.
+        AnalysisCacheKey shortKey = new AnalysisCacheKey(1L, new boolean[] {true, false, true});
+        AnalysisCacheKey padded = new AnalysisCacheKey(1L, new boolean[] {true, false, true, false, false});
+        assertEquals(shortKey, padded);
+        assertEquals(shortKey.hashCode(), padded.hashCode());
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/coverage/report/CoverageReportUploaderTest.java b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/coverage/report/CoverageReportUploaderTest.java
index 0a2c82c18dc..7cae57b9284 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/coverage/report/CoverageReportUploaderTest.java
+++ b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/coverage/report/CoverageReportUploaderTest.java
@@ -31,101 +31,86 @@
 
 class CoverageReportUploaderTest {
 
-  private static final int REQUEST_TIMEOUT_MILLIS = 15_000;
-
-  private static final ObjectMapper JSON_MAPPER = new ObjectMapper();
-  private static final TypeReference<Map<String, Object>> EVENT_TYPE =
-      new TypeReference<Map<String, Object>>() {};
-
-  private static final String COVERAGE_REPORT_BODY = "report-body";
-  private static final String JACOCO_FORMAT = "jacoco";
-  private static final String CI_TAG_KEY = "ci-tag-key";
-  private static final String CI_TAG_VALUE = "ci-tag-value";
-
-  @Test
-  void uploadsCoverageReportWithoutFlags() throws IOException {
-    CapturedRequest request = uploadCoverageReport(Collections.emptyList());
-
-    assertEquals(3, request.event.size());
-    assertEquals(JACOCO_FORMAT, request.event.get("format"));
-    assertEquals("coverage_report", request.event.get("type"));
-    assertEquals(CI_TAG_VALUE, request.event.get(CI_TAG_KEY));
-    assertFalse(request.event.containsKey("report.flags"));
-    assertEquals(COVERAGE_REPORT_BODY, new String(request.coverage, StandardCharsets.UTF_8));
-  }
-
-  @Test
-  void uploadsCoverageReportWithOrderedDuplicateFlags() throws IOException {
-    List<String> flags = Arrays.asList("type:unit-tests", "jvm-21", "jvm-21");
-
-    CapturedRequest request = uploadCoverageReport(flags);
-
-    assertEquals(4, request.event.size());
-    assertEquals(JACOCO_FORMAT, request.event.get("format"));
-    assertEquals("coverage_report", request.event.get("type"));
-    assertEquals(CI_TAG_VALUE, request.event.get(CI_TAG_KEY));
-    assertEquals(flags, request.event.get("report.flags"));
-    assertEquals(COVERAGE_REPORT_BODY, new String(request.coverage, StandardCharsets.UTF_8));
-  }
-
-  private static CapturedRequest uploadCoverageReport(List<String> flags) throws IOException {
-    CapturedRequest capturedRequest = new CapturedRequest();
-    try (JavaTestHttpServer server =
-        httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.prefix(
-                            "/api/v2/cicovreprt",
-                            api -> {
-                              Map<String, List<FileItem>> multipart =
-                                  MultipartRequestParser.parseRequest(
-                                      api.getRequest().getBody(),
-                                      api.getRequest().getHeader("Content-Type"));
-                              capturedRequest.event =
-                                  JSON_MAPPER.readValue(
-                                      multipart.get("event").get(0).get(), EVENT_TYPE);
-                              capturedRequest.coverage =
-                                  gunzip(multipart.get("coverage").get(0).get());
-                              api.getResponse().status(200).send();
-                            })))) {
-      BackendApi backendApi = givenIntakeApi(server.getAddress());
-      CoverageReportUploader uploader =
-          new CoverageReportUploader(
-              backendApi,
-              Collections.singletonMap(CI_TAG_KEY, CI_TAG_VALUE),
-              flags,
-              NoOpMetricCollector.INSTANCE);
-
-      uploader.upload(
-          JACOCO_FORMAT,
-          new ByteArrayInputStream(COVERAGE_REPORT_BODY.getBytes(StandardCharsets.UTF_8)));
+    private static final int REQUEST_TIMEOUT_MILLIS = 15_000;
+
+    private static final ObjectMapper JSON_MAPPER = new ObjectMapper();
+    private static final TypeReference<Map<String, Object>> EVENT_TYPE = new TypeReference<Map<String, Object>>() {};
+
+    private static final String COVERAGE_REPORT_BODY = "report-body";
+    private static final String JACOCO_FORMAT = "jacoco";
+    private static final String CI_TAG_KEY = "ci-tag-key";
+    private static final String CI_TAG_VALUE = "ci-tag-value";
+
+    @Test
+    void uploadsCoverageReportWithoutFlags() throws IOException {
+        CapturedRequest request = uploadCoverageReport(Collections.emptyList());
+
+        assertEquals(3, request.event.size());
+        assertEquals(JACOCO_FORMAT, request.event.get("format"));
+        assertEquals("coverage_report", request.event.get("type"));
+        assertEquals(CI_TAG_VALUE, request.event.get(CI_TAG_KEY));
+        assertFalse(request.event.containsKey("report.flags"));
+        assertEquals(COVERAGE_REPORT_BODY, new String(request.coverage, StandardCharsets.UTF_8));
     }
-    return capturedRequest;
-  }
-
-  private static byte[] gunzip(byte[] compressed) throws IOException {
-    try (ByteArrayInputStream input = new ByteArrayInputStream(compressed);
-        GZIPInputStream gzip = new GZIPInputStream(input);
-        ByteArrayOutputStream output = new ByteArrayOutputStream()) {
-      byte[] buffer = new byte[8192];
-      for (int readCount; (readCount = gzip.read(buffer)) != -1; ) {
-        output.write(buffer, 0, readCount);
-      }
-      return output.toByteArray();
+
+    @Test
+    void uploadsCoverageReportWithOrderedDuplicateFlags() throws IOException {
+        List<String> flags = Arrays.asList("type:unit-tests", "jvm-21", "jvm-21");
+
+        CapturedRequest request = uploadCoverageReport(flags);
+
+        assertEquals(4, request.event.size());
+        assertEquals(JACOCO_FORMAT, request.event.get("format"));
+        assertEquals("coverage_report", request.event.get("type"));
+        assertEquals(CI_TAG_VALUE, request.event.get(CI_TAG_KEY));
+        assertEquals(flags, request.event.get("report.flags"));
+        assertEquals(COVERAGE_REPORT_BODY, new String(request.coverage, StandardCharsets.UTF_8));
+    }
+
+    private static CapturedRequest uploadCoverageReport(List<String> flags) throws IOException {
+        CapturedRequest capturedRequest = new CapturedRequest();
+        try (JavaTestHttpServer server = httpServer(s -> s.handlers(h -> h.prefix("/api/v2/cicovreprt", api -> {
+            Map<String, List<FileItem>> multipart = MultipartRequestParser.parseRequest(
+                    api.getRequest().getBody(), api.getRequest().getHeader("Content-Type"));
+            capturedRequest.event =
+                    JSON_MAPPER.readValue(multipart.get("event").get(0).get(), EVENT_TYPE);
+            capturedRequest.coverage = gunzip(multipart.get("coverage").get(0).get());
+            api.getResponse().status(200).send();
+        })))) {
+            BackendApi backendApi = givenIntakeApi(server.getAddress());
+            CoverageReportUploader uploader = new CoverageReportUploader(
+                    backendApi,
+                    Collections.singletonMap(CI_TAG_KEY, CI_TAG_VALUE),
+                    flags,
+                    NoOpMetricCollector.INSTANCE);
+
+            uploader.upload(
+                    JACOCO_FORMAT, new ByteArrayInputStream(COVERAGE_REPORT_BODY.getBytes(StandardCharsets.UTF_8)));
+        }
+        return capturedRequest;
+    }
+
+    private static byte[] gunzip(byte[] compressed) throws IOException {
+        try (ByteArrayInputStream input = new ByteArrayInputStream(compressed);
+                GZIPInputStream gzip = new GZIPInputStream(input);
+                ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+            byte[] buffer = new byte[8192];
+            for (int readCount; (readCount = gzip.read(buffer)) != -1; ) {
+                output.write(buffer, 0, readCount);
+            }
+            return output.toByteArray();
+        }
+    }
+
+    private static BackendApi givenIntakeApi(URI address) {
+        HttpUrl intakeUrl = HttpUrl.get(String.format("%s/api/%s/", address, Intake.CI_INTAKE.getVersion()));
+        HttpRetryPolicy.Factory retryPolicyFactory = new HttpRetryPolicy.Factory(5, 100, 2.0);
+        OkHttpClient client = OkHttpUtils.buildHttpClient(intakeUrl, REQUEST_TIMEOUT_MILLIS);
+        return new IntakeApi(intakeUrl, "api-key", "a-trace-id", retryPolicyFactory, client, false);
+    }
+
+    private static final class CapturedRequest {
+        private Map<String, Object> event;
+        private byte[] coverage;
     }
-  }
-
-  private static BackendApi givenIntakeApi(URI address) {
-    HttpUrl intakeUrl =
-        HttpUrl.get(String.format("%s/api/%s/", address, Intake.CI_INTAKE.getVersion()));
-    HttpRetryPolicy.Factory retryPolicyFactory = new HttpRetryPolicy.Factory(5, 100, 2.0);
-    OkHttpClient client = OkHttpUtils.buildHttpClient(intakeUrl, REQUEST_TIMEOUT_MILLIS);
-    return new IntakeApi(intakeUrl, "api-key", "a-trace-id", retryPolicyFactory, client, false);
-  }
-
-  private static final class CapturedRequest {
-    private Map<String, Object> event;
-    private byte[] coverage;
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/events/TestEventsHandlerImplTest.java b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/events/TestEventsHandlerImplTest.java
index 4c20bba1d2b..63ff00ac656 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/events/TestEventsHandlerImplTest.java
+++ b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/events/TestEventsHandlerImplTest.java
@@ -21,82 +21,71 @@
 
 class TestEventsHandlerImplTest {
 
-  @Test
-  void doesNotCreateSessionWhenUnused() {
-    AtomicInteger creations = new AtomicInteger();
-    TestEventsHandlerImpl<Object, Object> handler =
-        handler(
-            () -> {
-              creations.incrementAndGet();
-              return mock(TestFrameworkSession.class);
-            });
+    @Test
+    void doesNotCreateSessionWhenUnused() {
+        AtomicInteger creations = new AtomicInteger();
+        TestEventsHandlerImpl<Object, Object> handler = handler(() -> {
+            creations.incrementAndGet();
+            return mock(TestFrameworkSession.class);
+        });
 
-    handler.close();
+        handler.close();
 
-    assertEquals(0, creations.get());
-  }
+        assertEquals(0, creations.get());
+    }
 
-  @Test
-  void createsSessionAndModuleOnceAndClosesThem() {
-    TestFrameworkSession session = mock(TestFrameworkSession.class);
-    TestFrameworkModule module = mock(TestFrameworkModule.class);
-    when(session.testModuleStart("module", null)).thenReturn(module);
-    TestIdentifier test = new TestIdentifier("suite", "test", null);
-    when(module.skipReason(test)).thenReturn(SkipReason.ITR);
-    AtomicInteger creations = new AtomicInteger();
-    TestEventsHandlerImpl<Object, Object> handler =
-        handler(
-            () -> {
-              creations.incrementAndGet();
-              return session;
-            });
+    @Test
+    void createsSessionAndModuleOnceAndClosesThem() {
+        TestFrameworkSession session = mock(TestFrameworkSession.class);
+        TestFrameworkModule module = mock(TestFrameworkModule.class);
+        when(session.testModuleStart("module", null)).thenReturn(module);
+        TestIdentifier test = new TestIdentifier("suite", "test", null);
+        when(module.skipReason(test)).thenReturn(SkipReason.ITR);
+        AtomicInteger creations = new AtomicInteger();
+        TestEventsHandlerImpl<Object, Object> handler = handler(() -> {
+            creations.incrementAndGet();
+            return session;
+        });
 
-    assertSame(SkipReason.ITR, handler.skipReason(test));
-    assertSame(SkipReason.ITR, handler.skipReason(test));
-    handler.close();
+        assertSame(SkipReason.ITR, handler.skipReason(test));
+        assertSame(SkipReason.ITR, handler.skipReason(test));
+        handler.close();
 
-    assertEquals(1, creations.get());
-    verify(session).testModuleStart("module", null);
-    verify(module).end(null);
-    verify(session).end(null);
-  }
+        assertEquals(1, creations.get());
+        verify(session).testModuleStart("module", null);
+        verify(module).end(null);
+        verify(session).end(null);
+    }
 
-  @Test
-  void createsSessionImmediatelyWhenRequested() {
-    TestFrameworkSession session = mock(TestFrameworkSession.class);
-    TestFrameworkModule module = mock(TestFrameworkModule.class);
-    when(session.testModuleStart("module", null)).thenReturn(module);
-    AtomicInteger creations = new AtomicInteger();
+    @Test
+    void createsSessionImmediatelyWhenRequested() {
+        TestFrameworkSession session = mock(TestFrameworkSession.class);
+        TestFrameworkModule module = mock(TestFrameworkModule.class);
+        when(session.testModuleStart("module", null)).thenReturn(module);
+        AtomicInteger creations = new AtomicInteger();
 
-    TestEventsHandlerImpl<Object, Object> handler =
-        handler(
-            () -> {
-              creations.incrementAndGet();
-              return session;
-            },
-            true);
+        TestEventsHandlerImpl<Object, Object> handler = handler(
+                () -> {
+                    creations.incrementAndGet();
+                    return session;
+                },
+                true);
 
-    assertEquals(1, creations.get());
-    handler.close();
-    verify(module).end(null);
-    verify(session).end(null);
-  }
+        assertEquals(1, creations.get());
+        handler.close();
+        verify(module).end(null);
+        verify(session).end(null);
+    }
 
-  private static TestEventsHandlerImpl<Object, Object> handler(
-      Supplier<TestFrameworkSession> testSessionSupplier) {
-    return handler(testSessionSupplier, false);
-  }
+    private static TestEventsHandlerImpl<Object, Object> handler(Supplier<TestFrameworkSession> testSessionSupplier) {
+        return handler(testSessionSupplier, false);
+    }
 
-  private static TestEventsHandlerImpl<Object, Object> handler(
-      Supplier<TestFrameworkSession> testSessionSupplier, boolean eagerSessionStart) {
-    ContextStore<Object, DDTestSuite> suiteStore = new StrongMapContextStore<>();
-    ContextStore<Object, DDTest> testStore = new StrongMapContextStore<>();
-    return new TestEventsHandlerImpl<>(
-        NoOpMetricCollector.INSTANCE,
-        testSessionSupplier,
-        "module",
-        eagerSessionStart,
-        suiteStore,
-        testStore);
-  }
+    private static TestEventsHandlerImpl<Object, Object> handler(
+            Supplier<TestFrameworkSession> testSessionSupplier, boolean eagerSessionStart) {
+        ContextStore<Object, DDTestSuite> suiteStore = new StrongMapContextStore<>();
+        ContextStore<Object, DDTest> testStore = new StrongMapContextStore<>();
+        return new TestEventsHandlerImpl<>(
+                NoOpMetricCollector.INSTANCE, testSessionSupplier, "module", eagerSessionStart, suiteStore, testStore);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/execution/DynamicAutoTestRetryTest.java b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/execution/DynamicAutoTestRetryTest.java
index 6bd6a01481c..b29ee283e3e 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/execution/DynamicAutoTestRetryTest.java
+++ b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/execution/DynamicAutoTestRetryTest.java
@@ -22,123 +22,119 @@
 
 class DynamicAutoTestRetryTest {
 
-  @ParameterizedTest(name = "duration={0}ms -> retries={1}")
-  @MethodSource("backendBuckets")
-  void usesBackendRetryBudgets(long durationMillis, int expectedRetries) {
-    DynamicAutoTestRetry policy = newPolicy(settings(null));
-
-    assertEquals(expectedRetries, executeUntilFinished(policy, durationMillis));
-  }
-
-  static Stream<Arguments> backendBuckets() {
-    return Stream.of(
-        arguments(1_000L, 10), arguments(6_000L, 2), arguments(31_000L, 4), arguments(301_000L, 1));
-  }
-
-  @ParameterizedTest(name = "duration={0}ms -> retries={1}")
-  @MethodSource("customBuckets")
-  void usesCustomRetryBudgets(long durationMillis, int expectedRetries) {
-    DynamicAutoTestRetry policy = newPolicy(settings(Arrays.asList(4, 1, 1, 1, 1)));
-
-    assertEquals(expectedRetries, executeUntilFinished(policy, durationMillis));
-  }
-
-  static Stream<Arguments> customBuckets() {
-    return Stream.of(
-        arguments(1_000L, 4), arguments(6_000L, 1), arguments(31_000L, 1), arguments(301_000L, 1));
-  }
-
-  @Test
-  void stopsAfterFirstPass() {
-    AtomicInteger totalRetries = new AtomicInteger();
-    DynamicAutoTestRetry policy =
-        new DynamicAutoTestRetry(settings(Arrays.asList(5, 1, 1, 1, 1)), false, totalRetries);
-
-    policy.registerExecution(TestStatus.fail, 1_000);
-    assertTrue(policy.applicable());
-
-    policy.registerExecution(TestStatus.pass, 1_000);
-    assertFalse(policy.applicable());
-    assertEquals(1, totalRetries.get());
-  }
-
-  @Test
-  void usesInitialAttemptDuration() {
-    DynamicAutoTestRetry policy = newPolicy(settings(null));
-
-    policy.registerExecution(TestStatus.fail, 1_000);
-    assertTrue(policy.applicable());
-
-    for (int retry = 1; retry <= 10; retry++) {
-      ExecutionOutcome outcome = policy.registerExecution(TestStatus.fail, 600_000);
-      assertEquals(retry < 10, policy.applicable());
-      assertEquals(retry == 10, outcome.lastExecution());
+    @ParameterizedTest(name = "duration={0}ms -> retries={1}")
+    @MethodSource("backendBuckets")
+    void usesBackendRetryBudgets(long durationMillis, int expectedRetries) {
+        DynamicAutoTestRetry policy = newPolicy(settings(null));
+
+        assertEquals(expectedRetries, executeUntilFinished(policy, durationMillis));
+    }
+
+    static Stream<Arguments> backendBuckets() {
+        return Stream.of(arguments(1_000L, 10), arguments(6_000L, 2), arguments(31_000L, 4), arguments(301_000L, 1));
+    }
+
+    @ParameterizedTest(name = "duration={0}ms -> retries={1}")
+    @MethodSource("customBuckets")
+    void usesCustomRetryBudgets(long durationMillis, int expectedRetries) {
+        DynamicAutoTestRetry policy = newPolicy(settings(Arrays.asList(4, 1, 1, 1, 1)));
+
+        assertEquals(expectedRetries, executeUntilFinished(policy, durationMillis));
+    }
+
+    static Stream<Arguments> customBuckets() {
+        return Stream.of(arguments(1_000L, 4), arguments(6_000L, 1), arguments(31_000L, 1), arguments(301_000L, 1));
     }
-  }
-
-  @ParameterizedTest
-  @ValueSource(booleans = {false, true})
-  void preservesFailureSuppression(boolean suppressFailures) {
-    AtomicInteger totalRetries = new AtomicInteger();
-    DynamicAutoTestRetry policy =
-        new DynamicAutoTestRetry(settings(null), suppressFailures, totalRetries);
-
-    assertTrue(policy.applicable());
-    assertTrue(policy.suppressFailures());
-    assertTrue(policy.failedTestReplayApplicable());
-
-    ExecutionOutcome initial = policy.registerExecution(TestStatus.fail, 600_000);
-    assertTrue(initial.failureSuppressed());
-    assertFalse(initial.lastExecution());
-    assertTrue(policy.applicable());
-    assertEquals(suppressFailures, policy.suppressFailures());
-    assertEquals(0, totalRetries.get());
-
-    ExecutionOutcome retry = policy.registerExecution(TestStatus.fail, 1_000);
-    assertTrue(retry.lastExecution());
-    assertEquals(suppressFailures, retry.failureSuppressed());
-    assertEquals(suppressFailures ? TestStatus.pass : TestStatus.fail, retry.finalStatus());
-    assertEquals(RetryReason.atr, retry.retryReason());
-    assertFalse(policy.applicable());
-    assertEquals(1, totalRetries.get());
-  }
-
-  @Test
-  void stopsAfterInitialPass() {
-    AtomicInteger totalRetries = new AtomicInteger();
-    DynamicAutoTestRetry policy = new DynamicAutoTestRetry(settings(null), false, totalRetries);
-
-    ExecutionOutcome outcome = policy.registerExecution(TestStatus.pass, 1_000);
-
-    assertTrue(outcome.lastExecution());
-    assertFalse(outcome.failureSuppressed());
-    assertEquals(TestStatus.pass, outcome.finalStatus());
-    assertFalse(policy.applicable());
-    assertEquals(0, totalRetries.get());
-  }
-
-  private static DynamicAutoTestRetry newPolicy(DynamicAutoTestRetrySettings settings) {
-    return new DynamicAutoTestRetry(settings, false, new AtomicInteger());
-  }
-
-  private static int executeUntilFinished(DynamicAutoTestRetry policy, long durationMillis) {
-    int retries = 0;
-    while (true) {
-      policy.registerExecution(TestStatus.fail, durationMillis);
-      if (!policy.applicable()) {
-        return retries;
-      }
-      retries++;
+
+    @Test
+    void stopsAfterFirstPass() {
+        AtomicInteger totalRetries = new AtomicInteger();
+        DynamicAutoTestRetry policy =
+                new DynamicAutoTestRetry(settings(Arrays.asList(5, 1, 1, 1, 1)), false, totalRetries);
+
+        policy.registerExecution(TestStatus.fail, 1_000);
+        assertTrue(policy.applicable());
+
+        policy.registerExecution(TestStatus.pass, 1_000);
+        assertFalse(policy.applicable());
+        assertEquals(1, totalRetries.get());
+    }
+
+    @Test
+    void usesInitialAttemptDuration() {
+        DynamicAutoTestRetry policy = newPolicy(settings(null));
+
+        policy.registerExecution(TestStatus.fail, 1_000);
+        assertTrue(policy.applicable());
+
+        for (int retry = 1; retry <= 10; retry++) {
+            ExecutionOutcome outcome = policy.registerExecution(TestStatus.fail, 600_000);
+            assertEquals(retry < 10, policy.applicable());
+            assertEquals(retry == 10, outcome.lastExecution());
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {false, true})
+    void preservesFailureSuppression(boolean suppressFailures) {
+        AtomicInteger totalRetries = new AtomicInteger();
+        DynamicAutoTestRetry policy = new DynamicAutoTestRetry(settings(null), suppressFailures, totalRetries);
+
+        assertTrue(policy.applicable());
+        assertTrue(policy.suppressFailures());
+        assertTrue(policy.failedTestReplayApplicable());
+
+        ExecutionOutcome initial = policy.registerExecution(TestStatus.fail, 600_000);
+        assertTrue(initial.failureSuppressed());
+        assertFalse(initial.lastExecution());
+        assertTrue(policy.applicable());
+        assertEquals(suppressFailures, policy.suppressFailures());
+        assertEquals(0, totalRetries.get());
+
+        ExecutionOutcome retry = policy.registerExecution(TestStatus.fail, 1_000);
+        assertTrue(retry.lastExecution());
+        assertEquals(suppressFailures, retry.failureSuppressed());
+        assertEquals(suppressFailures ? TestStatus.pass : TestStatus.fail, retry.finalStatus());
+        assertEquals(RetryReason.atr, retry.retryReason());
+        assertFalse(policy.applicable());
+        assertEquals(1, totalRetries.get());
+    }
+
+    @Test
+    void stopsAfterInitialPass() {
+        AtomicInteger totalRetries = new AtomicInteger();
+        DynamicAutoTestRetry policy = new DynamicAutoTestRetry(settings(null), false, totalRetries);
+
+        ExecutionOutcome outcome = policy.registerExecution(TestStatus.pass, 1_000);
+
+        assertTrue(outcome.lastExecution());
+        assertFalse(outcome.failureSuppressed());
+        assertEquals(TestStatus.pass, outcome.finalStatus());
+        assertFalse(policy.applicable());
+        assertEquals(0, totalRetries.get());
+    }
+
+    private static DynamicAutoTestRetry newPolicy(DynamicAutoTestRetrySettings settings) {
+        return new DynamicAutoTestRetry(settings, false, new AtomicInteger());
+    }
+
+    private static int executeUntilFinished(DynamicAutoTestRetry policy, long durationMillis) {
+        int retries = 0;
+        while (true) {
+            policy.registerExecution(TestStatus.fail, durationMillis);
+            if (!policy.applicable()) {
+                return retries;
+            }
+            retries++;
+        }
+    }
+
+    private static DynamicAutoTestRetrySettings settings(List<Integer> customBuckets) {
+        List<ExecutionsByDuration> backendRetries = Arrays.asList(
+                new ExecutionsByDuration(5_000, 10),
+                new ExecutionsByDuration(10_000, 2),
+                new ExecutionsByDuration(30_000, 3),
+                new ExecutionsByDuration(300_000, 4));
+        return DynamicAutoTestRetrySettings.create(true, customBuckets, backendRetries);
     }
-  }
-
-  private static DynamicAutoTestRetrySettings settings(List<Integer> customBuckets) {
-    List<ExecutionsByDuration> backendRetries =
-        Arrays.asList(
-            new ExecutionsByDuration(5_000, 10),
-            new ExecutionsByDuration(10_000, 2),
-            new ExecutionsByDuration(30_000, 3),
-            new ExecutionsByDuration(300_000, 4));
-    return DynamicAutoTestRetrySettings.create(true, customBuckets, backendRetries);
-  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/source/ByteCodeLinesResolverTest.java b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/source/ByteCodeLinesResolverTest.java
index 7fb99a60cd0..b796cbae1ed 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/source/ByteCodeLinesResolverTest.java
+++ b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/source/ByteCodeLinesResolverTest.java
@@ -13,103 +13,100 @@
 
 class ByteCodeLinesResolverTest {
 
-  @Test
-  void testMethodLinesResolution() throws NoSuchMethodException {
-    Method aTestMethod = NestedClass.class.getDeclaredMethod("aTestMethod");
-
-    ByteCodeLinesResolver linesResolver = new ByteCodeLinesResolver();
-    Lines methodLines = linesResolver.getMethodLines(aTestMethod);
-
-    assertTrue(methodLines.isValid());
-    assertTrue(methodLines.getStartLineNumber() > 0);
-    assertTrue(methodLines.getEndLineNumber() > methodLines.getStartLineNumber());
-  }
-
-  @Test
-  void testAlwaysInvalidClassLinesResolution() {
-    ByteCodeLinesResolver linesResolver = new ByteCodeLinesResolver();
-    Lines classLines = linesResolver.getClassLines(NestedClass.class);
-
-    assertFalse(classLines.isValid());
-  }
-
-  @Test
-  void testInvalidMethodLinesResolution() throws NoSuchMethodException {
-    Method abstractMethod = NestedClass.class.getDeclaredMethod("abstractMethod");
-
-    ByteCodeLinesResolver linesResolver = new ByteCodeLinesResolver();
-    Lines methodLines = linesResolver.getMethodLines(abstractMethod);
-
-    assertFalse(methodLines.isValid());
-  }
-
-  @Test
-  void testReturnsEmptyMethodLinesWhenClassCannotBeLoaded()
-      throws IOException, ClassNotFoundException, NoSuchMethodException {
-    MisbehavingClassLoader misbehavingClassLoader = new MisbehavingClassLoader();
-
-    try (InputStream stream = Utils.getClassStream(NestedClass.class)) {
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      byte[] buffer = new byte[1024];
-      int bytesRead;
-      while ((bytesRead = stream.read(buffer)) != -1) {
-        baos.write(buffer, 0, bytesRead);
-      }
-      misbehavingClassLoader.putClass(NestedClass.class.getName(), baos.toByteArray());
+    @Test
+    void testMethodLinesResolution() throws NoSuchMethodException {
+        Method aTestMethod = NestedClass.class.getDeclaredMethod("aTestMethod");
+
+        ByteCodeLinesResolver linesResolver = new ByteCodeLinesResolver();
+        Lines methodLines = linesResolver.getMethodLines(aTestMethod);
+
+        assertTrue(methodLines.isValid());
+        assertTrue(methodLines.getStartLineNumber() > 0);
+        assertTrue(methodLines.getEndLineNumber() > methodLines.getStartLineNumber());
     }
 
-    Class<?> misbehavingClass = misbehavingClassLoader.loadClass(NestedClass.class.getName());
-    Method misbehavingMethod = misbehavingClass.getDeclaredMethod("aTestMethod");
-
-    ByteCodeLinesResolver linesResolver = new ByteCodeLinesResolver();
-    Lines methodLines = linesResolver.getMethodLines(misbehavingMethod);
-
-    assertFalse(methodLines.isValid());
-  }
-
-  @Test
-  void testReturnsEmptyMethodLinesWhenClassResourceIsMissing()
-      throws IOException, ClassNotFoundException {
-    // regression test: Utils.getClassStream() returns null (rather than throwing) for
-    // classes whose bytecode resource cannot be located (e.g. certain generated/proxy classes).
-    // Calls ClassMethodLines.parse() directly rather than going through
-    // ByteCodeLinesResolver.getMethodLines() -- that outer method already catches any exception
-    // and returns Lines.EMPTY, so it would pass even without the null-stream guard under test.
-    NullResourceClassLoader nullResourceClassLoader = new NullResourceClassLoader();
-
-    try (InputStream stream = Utils.getClassStream(NestedClass.class)) {
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      byte[] buffer = new byte[1024];
-      int bytesRead;
-      while ((bytesRead = stream.read(buffer)) != -1) {
-        baos.write(buffer, 0, bytesRead);
-      }
-      nullResourceClassLoader.putClass(NestedClass.class.getName(), baos.toByteArray());
+    @Test
+    void testAlwaysInvalidClassLinesResolution() {
+        ByteCodeLinesResolver linesResolver = new ByteCodeLinesResolver();
+        Lines classLines = linesResolver.getClassLines(NestedClass.class);
+
+        assertFalse(classLines.isValid());
+    }
+
+    @Test
+    void testInvalidMethodLinesResolution() throws NoSuchMethodException {
+        Method abstractMethod = NestedClass.class.getDeclaredMethod("abstractMethod");
+
+        ByteCodeLinesResolver linesResolver = new ByteCodeLinesResolver();
+        Lines methodLines = linesResolver.getMethodLines(abstractMethod);
+
+        assertFalse(methodLines.isValid());
     }
 
-    Class<?> unresolvableClass = nullResourceClassLoader.loadClass(NestedClass.class.getName());
+    @Test
+    void testReturnsEmptyMethodLinesWhenClassCannotBeLoaded()
+            throws IOException, ClassNotFoundException, NoSuchMethodException {
+        MisbehavingClassLoader misbehavingClassLoader = new MisbehavingClassLoader();
 
-    assertDoesNotThrow(() -> ByteCodeLinesResolver.ClassMethodLines.parse(unresolvableClass));
-  }
+        try (InputStream stream = Utils.getClassStream(NestedClass.class)) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024];
+            int bytesRead;
+            while ((bytesRead = stream.read(buffer)) != -1) {
+                baos.write(buffer, 0, bytesRead);
+            }
+            misbehavingClassLoader.putClass(NestedClass.class.getName(), baos.toByteArray());
+        }
 
-  @Test
-  void testReturnsEmptyMethodLinesWhenUnknownMethodIsAttemptedToBeResolved()
-      throws NoSuchMethodException {
-    Method abstractMethod = NestedClass.class.getDeclaredMethod("abstractMethod");
-    ByteCodeLinesResolver.ClassMethodLines classMethodLines =
-        new ByteCodeLinesResolver.ClassMethodLines();
+        Class<?> misbehavingClass = misbehavingClassLoader.loadClass(NestedClass.class.getName());
+        Method misbehavingMethod = misbehavingClass.getDeclaredMethod("aTestMethod");
 
-    Lines methodLines = classMethodLines.get(abstractMethod);
+        ByteCodeLinesResolver linesResolver = new ByteCodeLinesResolver();
+        Lines methodLines = linesResolver.getMethodLines(misbehavingMethod);
 
-    assertFalse(methodLines.isValid());
-  }
+        assertFalse(methodLines.isValid());
+    }
 
-  private abstract static class NestedClass {
-    static double aTestMethod() {
-      double random = Math.random();
-      return random;
+    @Test
+    void testReturnsEmptyMethodLinesWhenClassResourceIsMissing() throws IOException, ClassNotFoundException {
+        // regression test: Utils.getClassStream() returns null (rather than throwing) for
+        // classes whose bytecode resource cannot be located (e.g. certain generated/proxy classes).
+        // Calls ClassMethodLines.parse() directly rather than going through
+        // ByteCodeLinesResolver.getMethodLines() -- that outer method already catches any exception
+        // and returns Lines.EMPTY, so it would pass even without the null-stream guard under test.
+        NullResourceClassLoader nullResourceClassLoader = new NullResourceClassLoader();
+
+        try (InputStream stream = Utils.getClassStream(NestedClass.class)) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024];
+            int bytesRead;
+            while ((bytesRead = stream.read(buffer)) != -1) {
+                baos.write(buffer, 0, bytesRead);
+            }
+            nullResourceClassLoader.putClass(NestedClass.class.getName(), baos.toByteArray());
+        }
+
+        Class<?> unresolvableClass = nullResourceClassLoader.loadClass(NestedClass.class.getName());
+
+        assertDoesNotThrow(() -> ByteCodeLinesResolver.ClassMethodLines.parse(unresolvableClass));
     }
 
-    abstract void abstractMethod();
-  }
+    @Test
+    void testReturnsEmptyMethodLinesWhenUnknownMethodIsAttemptedToBeResolved() throws NoSuchMethodException {
+        Method abstractMethod = NestedClass.class.getDeclaredMethod("abstractMethod");
+        ByteCodeLinesResolver.ClassMethodLines classMethodLines = new ByteCodeLinesResolver.ClassMethodLines();
+
+        Lines methodLines = classMethodLines.get(abstractMethod);
+
+        assertFalse(methodLines.isValid());
+    }
+
+    private abstract static class NestedClass {
+        static double aTestMethod() {
+            double random = Math.random();
+            return random;
+        }
+
+        abstract void abstractMethod();
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/source/MisbehavingClassLoader.java b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/source/MisbehavingClassLoader.java
index ef17f3f41e0..1c7b1d5a52e 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/source/MisbehavingClassLoader.java
+++ b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/source/MisbehavingClassLoader.java
@@ -14,23 +14,23 @@
  */
 final class MisbehavingClassLoader extends ClassLoader {
 
-  private final Map<String, byte[]> classes = new HashMap<>();
+    private final Map<String, byte[]> classes = new HashMap<>();
 
-  @Override
-  public InputStream getResourceAsStream(String name) {
-    throw new RuntimeException("Something went wrong");
-  }
+    @Override
+    public InputStream getResourceAsStream(String name) {
+        throw new RuntimeException("Something went wrong");
+    }
 
-  @Override
-  public Class<?> loadClass(String name) throws ClassNotFoundException {
-    byte[] bytes = classes.get(name);
-    if (bytes != null) {
-      return defineClass(name, bytes, 0, bytes.length);
+    @Override
+    public Class<?> loadClass(String name) throws ClassNotFoundException {
+        byte[] bytes = classes.get(name);
+        if (bytes != null) {
+            return defineClass(name, bytes, 0, bytes.length);
+        }
+        return super.loadClass(name);
     }
-    return super.loadClass(name);
-  }
 
-  void putClass(String name, byte[] bytes) {
-    classes.put(name, bytes);
-  }
+    void putClass(String name, byte[] bytes) {
+        classes.put(name, bytes);
+    }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/source/NullResourceClassLoader.java b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/source/NullResourceClassLoader.java
index 8b7bc588a05..92b8615bdef 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/source/NullResourceClassLoader.java
+++ b/dd-java-agent/agent-ci-visibility/src/test/java/datadog/trace/civisibility/source/NullResourceClassLoader.java
@@ -14,23 +14,23 @@
  */
 final class NullResourceClassLoader extends ClassLoader {
 
-  private final Map<String, byte[]> classes = new HashMap<>();
+    private final Map<String, byte[]> classes = new HashMap<>();
 
-  @Override
-  public InputStream getResourceAsStream(String name) {
-    return null;
-  }
+    @Override
+    public InputStream getResourceAsStream(String name) {
+        return null;
+    }
 
-  @Override
-  public Class<?> loadClass(String name) throws ClassNotFoundException {
-    byte[] bytes = classes.get(name);
-    if (bytes != null) {
-      return defineClass(name, bytes, 0, bytes.length);
+    @Override
+    public Class<?> loadClass(String name) throws ClassNotFoundException {
+        byte[] bytes = classes.get(name);
+        if (bytes != null) {
+            return defineClass(name, bytes, 0, bytes.length);
+        }
+        return super.loadClass(name);
     }
-    return super.loadClass(name);
-  }
 
-  void putClass(String name, byte[] bytes) {
-    classes.put(name, bytes);
-  }
+    void putClass(String name, byte[] bytes) {
+        classes.put(name, bytes);
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/ConfigManager.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/ConfigManager.java
index 99e6235a6b2..519f0db7962 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/ConfigManager.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/ConfigManager.java
@@ -27,266 +27,258 @@
 import org.slf4j.LoggerFactory;
 
 public class ConfigManager {
-  private static final Logger LOGGER = LoggerFactory.getLogger(ConfigManager.class);
-  private static final Pattern EQUALS_SPLITTER = Pattern.compile("=");
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConfigManager.class);
+    private static final Pattern EQUALS_SPLITTER = Pattern.compile("=");
 
-  public static class StoredConfig {
-    final String service;
-    final String env;
-    final String version;
-    final String tags;
-    final String processTags;
-    final String runtimeId;
-    final String reportUUID;
-    final boolean agentless;
-    final boolean sendToErrorTracking;
-    final boolean extendedInfoEnabled;
+    public static class StoredConfig {
+        final String service;
+        final String env;
+        final String version;
+        final String tags;
+        final String processTags;
+        final String runtimeId;
+        final String reportUUID;
+        final boolean agentless;
+        final boolean sendToErrorTracking;
+        final boolean extendedInfoEnabled;
 
-    StoredConfig(
-        String reportUUID,
-        String service,
-        String env,
-        String version,
-        String tags,
-        String processTags,
-        String runtimeId,
-        boolean agentless,
-        boolean sendToErrorTracking,
-        boolean extendedInfoEnabled) {
-      this.service = service;
-      this.env = env;
-      this.version = version;
-      this.tags = tags;
-      this.processTags = processTags;
-      this.runtimeId = runtimeId;
-      this.reportUUID = reportUUID;
-      this.agentless = agentless;
-      this.sendToErrorTracking = sendToErrorTracking;
-      this.extendedInfoEnabled = extendedInfoEnabled;
-    }
+        StoredConfig(
+                String reportUUID,
+                String service,
+                String env,
+                String version,
+                String tags,
+                String processTags,
+                String runtimeId,
+                boolean agentless,
+                boolean sendToErrorTracking,
+                boolean extendedInfoEnabled) {
+            this.service = service;
+            this.env = env;
+            this.version = version;
+            this.tags = tags;
+            this.processTags = processTags;
+            this.runtimeId = runtimeId;
+            this.reportUUID = reportUUID;
+            this.agentless = agentless;
+            this.sendToErrorTracking = sendToErrorTracking;
+            this.extendedInfoEnabled = extendedInfoEnabled;
+        }
 
-    public CrashUploaderSettings toCrashUploaderSettings() {
-      return new CrashUploaderSettings(extendedInfoEnabled);
-    }
+        public CrashUploaderSettings toCrashUploaderSettings() {
+            return new CrashUploaderSettings(extendedInfoEnabled);
+        }
 
-    public static class Builder {
-      String service;
-      String env;
-      String version;
-      String tags;
-      String processTags;
-      String runtimeId;
-      String reportUUID;
-      boolean agentless;
-      boolean sendToErrorTracking;
-      boolean extendedInfoEnabled;
+        public static class Builder {
+            String service;
+            String env;
+            String version;
+            String tags;
+            String processTags;
+            String runtimeId;
+            String reportUUID;
+            boolean agentless;
+            boolean sendToErrorTracking;
+            boolean extendedInfoEnabled;
 
-      public Builder(Config config) {
-        // get sane defaults
-        this.service = config.getServiceName();
-        this.env = config.getEnv();
-        this.version = config.getVersion();
-        this.runtimeId = config.getRuntimeId();
-        this.reportUUID = RandomUtils.randomUUID().toString();
-        this.agentless = config.isCrashTrackingAgentless();
-        this.sendToErrorTracking = config.isCrashTrackingErrorsIntakeEnabled();
-        this.extendedInfoEnabled = config.isCrashTrackingExtendedInfoEnabled();
-      }
+            public Builder(Config config) {
+                // get sane defaults
+                this.service = config.getServiceName();
+                this.env = config.getEnv();
+                this.version = config.getVersion();
+                this.runtimeId = config.getRuntimeId();
+                this.reportUUID = RandomUtils.randomUUID().toString();
+                this.agentless = config.isCrashTrackingAgentless();
+                this.sendToErrorTracking = config.isCrashTrackingErrorsIntakeEnabled();
+                this.extendedInfoEnabled = config.isCrashTrackingExtendedInfoEnabled();
+            }
 
-      public Builder service(String service) {
-        this.service = service;
-        return this;
-      }
+            public Builder service(String service) {
+                this.service = service;
+                return this;
+            }
 
-      public Builder env(String env) {
-        this.env = env;
-        return this;
-      }
+            public Builder env(String env) {
+                this.env = env;
+                return this;
+            }
 
-      public Builder version(String version) {
-        this.version = version;
-        return this;
-      }
+            public Builder version(String version) {
+                this.version = version;
+                return this;
+            }
 
-      public Builder tags(String tags) {
-        this.tags = tags;
-        return this;
-      }
+            public Builder tags(String tags) {
+                this.tags = tags;
+                return this;
+            }
 
-      public Builder processTags(String processTags) {
-        this.processTags = processTags;
-        return this;
-      }
+            public Builder processTags(String processTags) {
+                this.processTags = processTags;
+                return this;
+            }
 
-      public Builder runtimeId(String runtimeId) {
-        this.runtimeId = runtimeId;
-        return this;
-      }
+            public Builder runtimeId(String runtimeId) {
+                this.runtimeId = runtimeId;
+                return this;
+            }
 
-      public Builder sendToErrorTracking(boolean sendToErrorTracking) {
-        this.sendToErrorTracking = sendToErrorTracking;
-        return this;
-      }
+            public Builder sendToErrorTracking(boolean sendToErrorTracking) {
+                this.sendToErrorTracking = sendToErrorTracking;
+                return this;
+            }
 
-      public Builder agentless(boolean agentless) {
-        this.agentless = agentless;
-        return this;
-      }
+            public Builder agentless(boolean agentless) {
+                this.agentless = agentless;
+                return this;
+            }
 
-      public Builder extendedInfoEnabled(boolean extendedInfoEnabled) {
-        this.extendedInfoEnabled = extendedInfoEnabled;
-        return this;
-      }
+            public Builder extendedInfoEnabled(boolean extendedInfoEnabled) {
+                this.extendedInfoEnabled = extendedInfoEnabled;
+                return this;
+            }
 
-      @VisibleForTesting
-      Builder reportUUID(String reportUUID) {
-        this.reportUUID = reportUUID;
-        return this;
-      }
+            @VisibleForTesting
+            Builder reportUUID(String reportUUID) {
+                this.reportUUID = reportUUID;
+                return this;
+            }
 
-      public StoredConfig build() {
-        return new StoredConfig(
-            reportUUID,
-            service,
-            env,
-            version,
-            tags,
-            processTags,
-            runtimeId,
-            agentless,
-            sendToErrorTracking,
-            extendedInfoEnabled);
-      }
+            public StoredConfig build() {
+                return new StoredConfig(
+                        reportUUID,
+                        service,
+                        env,
+                        version,
+                        tags,
+                        processTags,
+                        runtimeId,
+                        agentless,
+                        sendToErrorTracking,
+                        extendedInfoEnabled);
+            }
+        }
     }
-  }
 
-  private ConfigManager() {}
+    private ConfigManager() {}
 
-  private static String getBaseName(File file) {
-    String filename = file.getName();
-    int dotIndex = filename.lastIndexOf('.');
-    if (dotIndex == -1) {
-      return filename;
+    private static String getBaseName(File file) {
+        String filename = file.getName();
+        int dotIndex = filename.lastIndexOf('.');
+        if (dotIndex == -1) {
+            return filename;
+        }
+        return filename.substring(0, dotIndex);
     }
-    return filename.substring(0, dotIndex);
-  }
 
-  @VisibleForTesting
-  static String getMergedTagsForSerialization(Config config) {
-    return config.getMergedCrashTrackingTags().entrySet().stream()
-        .filter(e -> e.getValue() != null)
-        .map(e -> e.getKey() + ":" + e.getValue())
-        .collect(Collectors.joining(","));
-  }
+    @VisibleForTesting
+    static String getMergedTagsForSerialization(Config config) {
+        return config.getMergedCrashTrackingTags().entrySet().stream()
+                .filter(e -> e.getValue() != null)
+                .map(e -> e.getKey() + ":" + e.getValue())
+                .collect(Collectors.joining(","));
+    }
 
-  private static void writeEntry(BufferedWriter writer, CharSequence key, CharSequence value)
-      throws IOException {
-    if (key == null || value == null) {
-      return;
+    private static void writeEntry(BufferedWriter writer, CharSequence key, CharSequence value) throws IOException {
+        if (key == null || value == null) {
+            return;
+        }
+        writer.write(key.toString());
+        writer.write('=');
+        writer.write(value.toString());
+        writer.newLine();
     }
-    writer.write(key.toString());
-    writer.write('=');
-    writer.write(value.toString());
-    writer.newLine();
-  }
 
-  public static void writeConfigToPath(File scriptFile, String... additionalEntries) {
-    String cfgFileName = getBaseName(scriptFile) + PID_PREFIX + PidHelper.getPid() + ".cfg";
-    File cfgFile = new File(scriptFile.getParentFile(), cfgFileName);
-    writeConfigToFile(Config.get(), cfgFile, additionalEntries);
-  }
+    public static void writeConfigToPath(File scriptFile, String... additionalEntries) {
+        String cfgFileName = getBaseName(scriptFile) + PID_PREFIX + PidHelper.getPid() + ".cfg";
+        File cfgFile = new File(scriptFile.getParentFile(), cfgFileName);
+        writeConfigToFile(Config.get(), cfgFile, additionalEntries);
+    }
 
-  @VisibleForTesting
-  static void writeConfigToFile(Config config, File cfgFile, String... additionalEntries) {
-    final WellKnownTags wellKnownTags = config.getWellKnownTags();
+    @VisibleForTesting
+    static void writeConfigToFile(Config config, File cfgFile, String... additionalEntries) {
+        final WellKnownTags wellKnownTags = config.getWellKnownTags();
 
-    LOGGER.debug("Writing config file: {}", cfgFile);
-    try (BufferedWriter bw =
-        new BufferedWriter(
-            new OutputStreamWriter(new FileOutputStream(cfgFile), StandardCharsets.UTF_8))) {
-      for (int i = 0; i < additionalEntries.length; i += 2) {
-        writeEntry(bw, additionalEntries[i], additionalEntries[i + 1]);
-      }
-      writeEntry(bw, "tags", getMergedTagsForSerialization(config));
-      writeEntry(bw, "service", wellKnownTags.getService());
-      writeEntry(bw, "version", wellKnownTags.getVersion());
-      writeEntry(bw, "env", wellKnownTags.getEnv());
-      writeEntry(bw, "process_tags", ProcessTags.getTagsForSerialization());
-      writeEntry(bw, "runtime_id", wellKnownTags.getRuntimeId());
-      writeEntry(bw, "java_home", SystemProperties.get("java.home"));
-      writeEntry(bw, "agentless", Boolean.toString(config.isCrashTrackingAgentless()));
-      writeEntry(bw, "upload_to_et", Boolean.toString(config.isCrashTrackingErrorsIntakeEnabled()));
-      writeEntry(
-          bw, "extended_info", Boolean.toString(config.isCrashTrackingExtendedInfoEnabled()));
+        LOGGER.debug("Writing config file: {}", cfgFile);
+        try (BufferedWriter bw =
+                new BufferedWriter(new OutputStreamWriter(new FileOutputStream(cfgFile), StandardCharsets.UTF_8))) {
+            for (int i = 0; i < additionalEntries.length; i += 2) {
+                writeEntry(bw, additionalEntries[i], additionalEntries[i + 1]);
+            }
+            writeEntry(bw, "tags", getMergedTagsForSerialization(config));
+            writeEntry(bw, "service", wellKnownTags.getService());
+            writeEntry(bw, "version", wellKnownTags.getVersion());
+            writeEntry(bw, "env", wellKnownTags.getEnv());
+            writeEntry(bw, "process_tags", ProcessTags.getTagsForSerialization());
+            writeEntry(bw, "runtime_id", wellKnownTags.getRuntimeId());
+            writeEntry(bw, "java_home", SystemProperties.get("java.home"));
+            writeEntry(bw, "agentless", Boolean.toString(config.isCrashTrackingAgentless()));
+            writeEntry(bw, "upload_to_et", Boolean.toString(config.isCrashTrackingErrorsIntakeEnabled()));
+            writeEntry(bw, "extended_info", Boolean.toString(config.isCrashTrackingExtendedInfoEnabled()));
 
-      Runtime.getRuntime()
-          .addShutdownHook(
-              new Thread(
-                  AGENT_THREAD_GROUP,
-                  () -> {
-                    LOGGER.debug("Deleting config file: {}", cfgFile);
-                    cfgFile.delete();
-                  }));
-      LOGGER.debug("Config file written: {}", cfgFile);
-    } catch (IOException e) {
-      LOGGER.warn(SEND_TELEMETRY, "Failed writing config file: {}", cfgFile);
-      cfgFile.delete(); // best-effort cleanup; failure is acceptable here
+            Runtime.getRuntime().addShutdownHook(new Thread(AGENT_THREAD_GROUP, () -> {
+                LOGGER.debug("Deleting config file: {}", cfgFile);
+                cfgFile.delete();
+            }));
+            LOGGER.debug("Config file written: {}", cfgFile);
+        } catch (IOException e) {
+            LOGGER.warn(SEND_TELEMETRY, "Failed writing config file: {}", cfgFile);
+            cfgFile.delete(); // best-effort cleanup; failure is acceptable here
+        }
     }
-  }
 
-  @Nullable
-  public static StoredConfig readConfig(Config config, File scriptFile) {
-    try (final BufferedReader reader =
-        new BufferedReader(
-            new InputStreamReader(new FileInputStream(scriptFile), StandardCharsets.UTF_8))) {
-      final StoredConfig.Builder cfgBuilder = new StoredConfig.Builder(config);
-      String line;
-      while ((line = reader.readLine()) != null) {
-        if (line.isEmpty()) {
-          continue;
-        }
-        String[] parts = EQUALS_SPLITTER.split(line, 2);
-        if (parts.length != 2) {
-          continue;
-        }
-        final String value = parts[1];
-        switch (parts[0]) {
-          case "tags":
-            cfgBuilder.tags(value);
-            break;
-          case "service":
-            cfgBuilder.service(value);
-            break;
-          case "env":
-            cfgBuilder.env(value);
-            break;
-          case "version":
-            cfgBuilder.version(value);
-            break;
-          case "process_tags":
-            cfgBuilder.processTags(value);
-            break;
-          case "runtime_id":
-            cfgBuilder.runtimeId(value);
-            break;
-          case "agentless":
-            cfgBuilder.agentless(Boolean.parseBoolean(value));
-            break;
-          case "upload_to_et":
-            cfgBuilder.sendToErrorTracking(Boolean.parseBoolean(value));
-            break;
-          case "extended_info":
-            cfgBuilder.extendedInfoEnabled(Boolean.parseBoolean(value));
-            break;
-          default:
-            // ignore
-            break;
+    @Nullable
+    public static StoredConfig readConfig(Config config, File scriptFile) {
+        try (final BufferedReader reader =
+                new BufferedReader(new InputStreamReader(new FileInputStream(scriptFile), StandardCharsets.UTF_8))) {
+            final StoredConfig.Builder cfgBuilder = new StoredConfig.Builder(config);
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (line.isEmpty()) {
+                    continue;
+                }
+                String[] parts = EQUALS_SPLITTER.split(line, 2);
+                if (parts.length != 2) {
+                    continue;
+                }
+                final String value = parts[1];
+                switch (parts[0]) {
+                    case "tags":
+                        cfgBuilder.tags(value);
+                        break;
+                    case "service":
+                        cfgBuilder.service(value);
+                        break;
+                    case "env":
+                        cfgBuilder.env(value);
+                        break;
+                    case "version":
+                        cfgBuilder.version(value);
+                        break;
+                    case "process_tags":
+                        cfgBuilder.processTags(value);
+                        break;
+                    case "runtime_id":
+                        cfgBuilder.runtimeId(value);
+                        break;
+                    case "agentless":
+                        cfgBuilder.agentless(Boolean.parseBoolean(value));
+                        break;
+                    case "upload_to_et":
+                        cfgBuilder.sendToErrorTracking(Boolean.parseBoolean(value));
+                        break;
+                    case "extended_info":
+                        cfgBuilder.extendedInfoEnabled(Boolean.parseBoolean(value));
+                        break;
+                    default:
+                        // ignore
+                        break;
+                }
+            }
+            return cfgBuilder.build();
+        } catch (Throwable t) {
+            LOGGER.error("Failed to read config file: {}", scriptFile, t);
         }
-      }
-      return cfgBuilder.build();
-    } catch (Throwable t) {
-      LOGGER.error("Failed to read config file: {}", scriptFile, t);
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashLogParser.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashLogParser.java
index 269e0d1ee6b..fe0a40fe6e5 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashLogParser.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashLogParser.java
@@ -6,45 +6,45 @@
 
 public final class CrashLogParser {
 
-  /** J9 javacore files start with section markers like "0SECTION" */
-  private static final String J9_SECTION_MARKER = "0SECTION";
-
-  /** J9 javacore TITLE section identifier */
-  private static final String J9_TITLE_MARKER = "TITLE";
-
-  /** Parse a HotSpot crash log (hs_err_pidXXX.log format). */
-  public static CrashLog fromHotspotCrashLog(String uuid, String logText) {
-    return new HotspotCrashLogParser().parse(uuid, logText);
-  }
-
-  /** Parse a J9/OpenJ9 javacore dump file. */
-  public static CrashLog fromJ9Javacore(String uuid, String javacoreContent) {
-    return new J9JavacoreParser().parse(uuid, javacoreContent);
-  }
-
-  /**
-   * Auto-detect crash log format and parse accordingly.
-   *
-   * <p>Detection is based on format-specific markers:
-   *
-   * <ul>
-   *   <li>J9 javacore: Contains "0SECTION" and "TITLE" markers
-   *   <li>HotSpot hs_err: Default fallback
-   * </ul>
-   */
-  public static CrashLog parse(String uuid, String content) {
-    if (isJ9Javacore(content)) {
-      return fromJ9Javacore(uuid, content);
+    /** J9 javacore files start with section markers like "0SECTION" */
+    private static final String J9_SECTION_MARKER = "0SECTION";
+
+    /** J9 javacore TITLE section identifier */
+    private static final String J9_TITLE_MARKER = "TITLE";
+
+    /** Parse a HotSpot crash log (hs_err_pidXXX.log format). */
+    public static CrashLog fromHotspotCrashLog(String uuid, String logText) {
+        return new HotspotCrashLogParser().parse(uuid, logText);
+    }
+
+    /** Parse a J9/OpenJ9 javacore dump file. */
+    public static CrashLog fromJ9Javacore(String uuid, String javacoreContent) {
+        return new J9JavacoreParser().parse(uuid, javacoreContent);
+    }
+
+    /**
+     * Auto-detect crash log format and parse accordingly.
+     *
+     * <p>Detection is based on format-specific markers:
+     *
+     * <ul>
+     *   <li>J9 javacore: Contains "0SECTION" and "TITLE" markers
+     *   <li>HotSpot hs_err: Default fallback
+     * </ul>
+     */
+    public static CrashLog parse(String uuid, String content) {
+        if (isJ9Javacore(content)) {
+            return fromJ9Javacore(uuid, content);
+        }
+        return new HotspotCrashLogParser().parse(uuid, content);
     }
-    return new HotspotCrashLogParser().parse(uuid, content);
-  }
 
-  /** Check if the content appears to be a J9 javacore file. */
-  static boolean isJ9Javacore(String content) {
-    if (content == null || content.isEmpty()) {
-      return false;
+    /** Check if the content appears to be a J9 javacore file. */
+    static boolean isJ9Javacore(String content) {
+        if (content == null || content.isEmpty()) {
+            return false;
+        }
+        // J9 javacores have a distinctive format with 0SECTION markers
+        return content.contains(J9_SECTION_MARKER) && content.contains(J9_TITLE_MARKER);
     }
-    // J9 javacores have a distinctive format with 0SECTION markers
-    return content.contains(J9_SECTION_MARKER) && content.contains(J9_TITLE_MARKER);
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java
index 87fc4592751..b2f5d5f38b1 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java
@@ -63,650 +63,627 @@
 /** Crash Reporter implementation */
 public final class CrashUploader {
 
-  private static final Logger log = LoggerFactory.getLogger(CrashUploader.class);
-
-  // Header names and values
-  static final String HEADER_DD_EVP_ORIGIN = "DD-EVP-ORIGIN";
-  static final String JAVA_TRACING_LIBRARY = "dd-trace-java";
-  static final String HEADER_DD_EVP_ORIGIN_VERSION = "DD-EVP-ORIGIN-VERSION";
-  static final String HEADER_DD_EVP_SUBDOMAIN = "X-Datadog-EVP-Subdomain";
-  static final String ERROR_TRACKING_INTAKE = "error-tracking-intake";
-  static final String HEADER_DD_TELEMETRY_API_VERSION = "DD-Telemetry-API-Version";
-  static final String TELEMETRY_API_VERSION = "v2";
-  static final String HEADER_DD_TELEMETRY_REQUEST_TYPE = "DD-Telemetry-Request-Type";
-  static final String TELEMETRY_REQUEST_TYPE = "logs";
-
-  private static final MediaType APPLICATION_JSON =
-      MediaType.get("application/json; charset=utf-8");
-
-  private static final class CallResult implements Callback {
-    private final String kind; // for logging
-
-    private CallResult(String kind) {
-      this.kind = kind;
-    }
+    private static final Logger log = LoggerFactory.getLogger(CrashUploader.class);
+
+    // Header names and values
+    static final String HEADER_DD_EVP_ORIGIN = "DD-EVP-ORIGIN";
+    static final String JAVA_TRACING_LIBRARY = "dd-trace-java";
+    static final String HEADER_DD_EVP_ORIGIN_VERSION = "DD-EVP-ORIGIN-VERSION";
+    static final String HEADER_DD_EVP_SUBDOMAIN = "X-Datadog-EVP-Subdomain";
+    static final String ERROR_TRACKING_INTAKE = "error-tracking-intake";
+    static final String HEADER_DD_TELEMETRY_API_VERSION = "DD-Telemetry-API-Version";
+    static final String TELEMETRY_API_VERSION = "v2";
+    static final String HEADER_DD_TELEMETRY_REQUEST_TYPE = "DD-Telemetry-Request-Type";
+    static final String TELEMETRY_REQUEST_TYPE = "logs";
+
+    private static final MediaType APPLICATION_JSON = MediaType.get("application/json; charset=utf-8");
+
+    private static final class CallResult implements Callback {
+        private final String kind; // for logging
+
+        private CallResult(String kind) {
+            this.kind = kind;
+        }
 
-    @Override
-    public void onFailure(Call call, IOException e) {
-      log.error("Failed to upload {} to {}, got exception", kind, call.request().url(), e);
-    }
+        @Override
+        public void onFailure(Call call, IOException e) {
+            log.error(
+                    "Failed to upload {} to {}, got exception",
+                    kind,
+                    call.request().url(),
+                    e);
+        }
 
-    @Override
-    public void onResponse(Call call, Response response) throws IOException {
-      if (response.isSuccessful()) {
-        log.info(
-            "Successfully uploaded the {} to {}, code = {} \"{}\"",
-            kind,
-            call.request().url(),
-            response.code(),
-            response.message());
-      } else {
-        log.error(
-            "Failed to upload {} to {}, code = {} \"{}\", body = \"{}\"",
-            kind,
-            call.request().url(),
-            response.code(),
-            response.message(),
-            response.body() != null ? response.body().string().trim() : "<null>");
-      }
-    }
-  }
-
-  private final Config config;
-  private final ConfigManager.StoredConfig storedConfig;
-  private final CrashUploaderSettings uploaderSettings;
-
-  private final HttpUrl telemetryUrl;
-  private final HttpUrl errorTrackingUrl;
-  private final OkHttpClient uploadClient;
-  private final Dispatcher dispatcher;
-  private final ExecutorService executor;
-  private final boolean agentless;
-  private final String tags;
-  private final long timeout;
-
-  public CrashUploader(@Nonnull final ConfigManager.StoredConfig storedConfig) {
-    this(Config.get(), storedConfig);
-  }
-
-  CrashUploader(
-      @Nonnull final Config config, @Nonnull final ConfigManager.StoredConfig storedConfig) {
-    this.config = config;
-    this.storedConfig = storedConfig;
-    this.uploaderSettings = storedConfig.toCrashUploaderSettings();
-    this.telemetryUrl = HttpUrl.get(config.getFinalCrashTrackingTelemetryUrl());
-    this.errorTrackingUrl = HttpUrl.get(config.getFinalCrashTrackingErrorTrackingUrl());
-    this.agentless = config.isCrashTrackingAgentless();
-    // This is the same thing OkHttp Dispatcher is doing except thread naming and daemonization
-    this.executor =
-        new ThreadPoolExecutor(
-            0,
-            4,
-            60,
-            TimeUnit.SECONDS,
-            new SynchronousQueue<>(),
-            new AgentThreadFactory(CRASHTRACKING_HTTP_DISPATCHER));
-    this.dispatcher = new Dispatcher(executor);
-
-    final StringBuilder tagsBuilder =
-        new StringBuilder(storedConfig.tags != null ? storedConfig.tags : "");
-    if (!tagsBuilder.toString().isEmpty()) {
-      tagsBuilder.append(",");
-    }
-    tagsBuilder.append("is_crash:true").append(',');
-    tagsBuilder.append(VersionInfo.LIBRARY_VERSION_TAG).append('=').append(VersionInfo.VERSION);
-    // PID can be empty if we cannot find it out from the system
-    if (!PidHelper.getPid().isEmpty()) {
-      tagsBuilder.append(",").append(DDTags.PID_TAG).append('=').append(PidHelper.getPid());
-    }
-    tags = tagsBuilder.toString();
-
-    ConfigProvider configProvider = config.configProvider();
-
-    this.timeout =
-        SECONDS.toMillis(
-            configProvider.getInteger(
-                CRASH_TRACKING_UPLOAD_TIMEOUT, CRASH_TRACKING_UPLOAD_TIMEOUT_DEFAULT));
-
-    uploadClient =
-        OkHttpUtils.buildHttpClient(
-            config,
-            dispatcher, /* dispatcher */
-            telemetryUrl, // will be overridden in each request
-            true, /* retryOnConnectionFailure */
-            4, /* maxRunningRequests */ // not having one request blocking the others
-            configProvider.getString(CRASH_TRACKING_PROXY_HOST),
-            configProvider.getInteger(CRASH_TRACKING_PROXY_PORT),
-            configProvider.getString(CRASH_TRACKING_PROXY_USERNAME),
-            configProvider.getString(CRASH_TRACKING_PROXY_PASSWORD),
-            timeout);
-  }
-
-  public void notifyCrashStarted(String error) {
-    sendPingToTelemetry(error);
-    if (storedConfig.sendToErrorTracking) {
-      sendPingToErrorTracking(error);
-    }
-  }
-
-  @VisibleForTesting
-  void sendPingToTelemetry(String error) {
-    // send a ping message to the telemetry to notify that the crash report started
-    try (Buffer buf = new Buffer();
-        JsonWriter writer = JsonWriter.of(buf)) {
-      writer.beginObject();
-      writer.name("crash_uuid").value(storedConfig.reportUUID);
-      writer.name("kind").value("Crash ping");
-      writer.name("current_schema_version").value("1.0");
-      writer
-          .name("message")
-          .value(
-              "Crashtracker crash ping: " + (error != null ? error : "crash processing started"));
-      writer.endObject();
-      handleCall(makeTelemetryRequest(makeTelemetryRequestBody(buf.readUtf8(), true)), "ping");
-    } catch (Throwable t) {
-      log.error("Failed to prepare the telemetry crash ping payload", t);
-    }
-  }
-
-  @VisibleForTesting
-  void sendPingToErrorTracking(String error) {
-    try {
-      final CrashLog ping =
-          new CrashLog(
-              storedConfig.reportUUID,
-              false,
-              ZonedDateTime.now().format(ISO_OFFSET_DATE_TIME),
-              new ErrorData(
-                  null,
-                  "Crashtracker crash ping: "
-                      + (error != null ? error : "crash processing started"),
-                  null),
-              null,
-              OSInfo.current(),
-              null,
-              null,
-              "1.0");
-      handleCall(makeErrorTrackingRequest(makeErrorTrackingRequestBody(ping, true)), "ping");
-    } catch (Throwable t) {
-      log.error("Failed to prepare the error tracking crash ping payload", t);
-    }
-  }
-
-  @SuppressForbidden
-  public void upload(@Nonnull Path file) {
-    String fileContent;
-    try {
-      fileContent = new String(Files.readAllBytes(file), Charset.defaultCharset());
-    } catch (Throwable t) {
-      log.error("Failed to collect information about the crash", t);
-      return; // cannot proceed further
+        @Override
+        public void onResponse(Call call, Response response) throws IOException {
+            if (response.isSuccessful()) {
+                log.info(
+                        "Successfully uploaded the {} to {}, code = {} \"{}\"",
+                        kind,
+                        call.request().url(),
+                        response.code(),
+                        response.message());
+            } else {
+                log.error(
+                        "Failed to upload {} to {}, code = {} \"{}\", body = \"{}\"",
+                        kind,
+                        call.request().url(),
+                        response.code(),
+                        response.message(),
+                        response.body() != null ? response.body().string().trim() : "<null>");
+            }
+        }
     }
 
-    try {
-      uploadToLogs(fileContent, System.out);
-    } catch (Throwable t) {
-      log.error("Unable to print the error crash as a log message", t);
-    }
-    try {
-      remoteUpload(fileContent, true, storedConfig.sendToErrorTracking);
-    } finally {
-      uploadClient.dispatcher().cancelAll();
-    }
-  }
-
-  @VisibleForTesting
-  void remoteUpload(
-      @Nonnull String fileContent, boolean sendToTelemetry, boolean sendToErrorTracking) {
-    final String uuid = storedConfig.reportUUID;
-    try {
-      // Auto-detect crash log format (HotSpot hs_err or J9 javacore)
-      CrashLog crashLog = CrashLogParser.parse(uuid, fileContent);
-      if (sendToTelemetry) {
-        uploadToTelemetry(crashLog);
-      }
-      if (sendToErrorTracking) {
-        uploadToErrorTracking(crashLog);
-      }
-    } catch (Throwable t) {
-      log.error("Error while before sending remotely the crash report with uuid {}", uuid, t);
-    }
-    int remaining;
-    long deadline = MILLISECONDS.toNanos(timeout) + System.nanoTime();
-    // container that crashed
-    while ((remaining = dispatcher.queuedCallsCount() + dispatcher.runningCallsCount()) > 0
-        && deadline > System.nanoTime()) {
-      try {
-        Thread.sleep(100); // good enough for this purpose even if we overflow
-      } catch (InterruptedException ie) {
-        Thread.currentThread().interrupt();
-      }
-    }
-    if (remaining > 0) {
-      dispatcher.cancelAll();
-      uploadClient.connectionPool().evictAll();
-      log.error(
-          SEND_TELEMETRY,
-          "Failed to fully send the crash report with UUID {}. Still {} calls remaining",
-          uuid,
-          remaining);
+    private final Config config;
+    private final ConfigManager.StoredConfig storedConfig;
+    private final CrashUploaderSettings uploaderSettings;
+
+    private final HttpUrl telemetryUrl;
+    private final HttpUrl errorTrackingUrl;
+    private final OkHttpClient uploadClient;
+    private final Dispatcher dispatcher;
+    private final ExecutorService executor;
+    private final boolean agentless;
+    private final String tags;
+    private final long timeout;
+
+    public CrashUploader(@Nonnull final ConfigManager.StoredConfig storedConfig) {
+        this(Config.get(), storedConfig);
     }
-  }
-
-  void uploadToLogs(@Nonnull String message, @Nonnull PrintStream out) throws IOException {
-    // print on the output, and the application/container/host log will pick it up
-    try (Buffer buf = new Buffer()) {
-      try (JsonWriter writer = JsonWriter.of(buf)) {
-        writer.beginObject();
-        writer.name("ddsource").value("crashtracker");
-        writer.name("ddtags").value(tags);
-        writer.name("hostname").value(config.getHostName());
-        writer.name("service").value(storedConfig.service);
-        writer.name("version").value(storedConfig.version);
-        writer.name("env").value(storedConfig.env);
-        writer.name("message").value(message);
-        writer.name("level").value("ERROR");
-        writer.name("error");
-        writer.beginObject();
-        writer.name("kind").value(extractErrorKind(message));
-        writer.name("message").value(extractErrorMessage(message));
-        writer.name("stack").value(extractErrorStackTrace(message, false));
-        writer.endObject();
-        writer.endObject();
-      }
-      out.println(buf.readByteString().utf8());
+
+    CrashUploader(@Nonnull final Config config, @Nonnull final ConfigManager.StoredConfig storedConfig) {
+        this.config = config;
+        this.storedConfig = storedConfig;
+        this.uploaderSettings = storedConfig.toCrashUploaderSettings();
+        this.telemetryUrl = HttpUrl.get(config.getFinalCrashTrackingTelemetryUrl());
+        this.errorTrackingUrl = HttpUrl.get(config.getFinalCrashTrackingErrorTrackingUrl());
+        this.agentless = config.isCrashTrackingAgentless();
+        // This is the same thing OkHttp Dispatcher is doing except thread naming and daemonization
+        this.executor = new ThreadPoolExecutor(
+                0,
+                4,
+                60,
+                TimeUnit.SECONDS,
+                new SynchronousQueue<>(),
+                new AgentThreadFactory(CRASHTRACKING_HTTP_DISPATCHER));
+        this.dispatcher = new Dispatcher(executor);
+
+        final StringBuilder tagsBuilder = new StringBuilder(storedConfig.tags != null ? storedConfig.tags : "");
+        if (!tagsBuilder.toString().isEmpty()) {
+            tagsBuilder.append(",");
+        }
+        tagsBuilder.append("is_crash:true").append(',');
+        tagsBuilder.append(VersionInfo.LIBRARY_VERSION_TAG).append('=').append(VersionInfo.VERSION);
+        // PID can be empty if we cannot find it out from the system
+        if (!PidHelper.getPid().isEmpty()) {
+            tagsBuilder.append(",").append(DDTags.PID_TAG).append('=').append(PidHelper.getPid());
+        }
+        tags = tagsBuilder.toString();
+
+        ConfigProvider configProvider = config.configProvider();
+
+        this.timeout = SECONDS.toMillis(
+                configProvider.getInteger(CRASH_TRACKING_UPLOAD_TIMEOUT, CRASH_TRACKING_UPLOAD_TIMEOUT_DEFAULT));
+
+        uploadClient = OkHttpUtils.buildHttpClient(
+                config,
+                dispatcher, /* dispatcher */
+                telemetryUrl, // will be overridden in each request
+                true, /* retryOnConnectionFailure */
+                4, /* maxRunningRequests */ // not having one request blocking the others
+                configProvider.getString(CRASH_TRACKING_PROXY_HOST),
+                configProvider.getInteger(CRASH_TRACKING_PROXY_PORT),
+                configProvider.getString(CRASH_TRACKING_PROXY_USERNAME),
+                configProvider.getString(CRASH_TRACKING_PROXY_PASSWORD),
+                timeout);
     }
-  }
-
-  @VisibleForTesting
-  @SuppressForbidden
-  static String extractErrorKind(String fileContent) {
-    Matcher matcher = ERROR_MESSAGE_PATTERN.matcher(fileContent);
-    if (!matcher.find()) {
-      log.error("No match found for error.kind");
-      return null;
+
+    public void notifyCrashStarted(String error) {
+        sendPingToTelemetry(error);
+        if (storedConfig.sendToErrorTracking) {
+            sendPingToErrorTracking(error);
+        }
     }
 
-    if (matcher.group().startsWith("# There is insufficient memory")) {
-      return "OutOfMemory";
+    @VisibleForTesting
+    void sendPingToTelemetry(String error) {
+        // send a ping message to the telemetry to notify that the crash report started
+        try (Buffer buf = new Buffer();
+                JsonWriter writer = JsonWriter.of(buf)) {
+            writer.beginObject();
+            writer.name("crash_uuid").value(storedConfig.reportUUID);
+            writer.name("kind").value("Crash ping");
+            writer.name("current_schema_version").value("1.0");
+            writer.name("message")
+                    .value("Crashtracker crash ping: " + (error != null ? error : "crash processing started"));
+            writer.endObject();
+            handleCall(makeTelemetryRequest(makeTelemetryRequestBody(buf.readUtf8(), true)), "ping");
+        } catch (Throwable t) {
+            log.error("Failed to prepare the telemetry crash ping payload", t);
+        }
     }
-    return "NativeCrash";
-  }
-
-  private static final Pattern ERROR_MESSAGE_PATTERN =
-      Pattern.compile(
-          String.join(
-              "",
-              "^",
-              "(",
-              "# A fatal error has been detected by the Java Runtime Environment:",
-              "|",
-              "# There is insufficient memory for the Java Runtime Environment to continue\\.",
-              ")",
-              "\\n",
-              "(",
-              ".*, pid=-?\\d+, tid=-?\\d+",
-              ")",
-              "$"),
-          Pattern.DOTALL | Pattern.MULTILINE);
-
-  @VisibleForTesting
-  @SuppressForbidden
-  static String extractErrorMessage(String fileContent) {
-    Matcher matcher = ERROR_MESSAGE_PATTERN.matcher(fileContent);
-    if (!matcher.find()) {
-      log.error("No match found for error.message");
-      return null;
+
+    @VisibleForTesting
+    void sendPingToErrorTracking(String error) {
+        try {
+            final CrashLog ping = new CrashLog(
+                    storedConfig.reportUUID,
+                    false,
+                    ZonedDateTime.now().format(ISO_OFFSET_DATE_TIME),
+                    new ErrorData(
+                            null,
+                            "Crashtracker crash ping: " + (error != null ? error : "crash processing started"),
+                            null),
+                    null,
+                    OSInfo.current(),
+                    null,
+                    null,
+                    "1.0");
+            handleCall(makeErrorTrackingRequest(makeErrorTrackingRequestBody(ping, true)), "ping");
+        } catch (Throwable t) {
+            log.error("Failed to prepare the error tracking crash ping payload", t);
+        }
     }
-    return Arrays.stream(matcher.group().split(System.lineSeparator()))
-        .filter(
-            s ->
-                !s.equals("# A fatal error has been detected by the Java Runtime Environment:")
-                    && !s.equals(
-                        "# There is insufficient memory for the Java Runtime Environment to continue."))
-        .map(s -> s.replaceFirst("^#\\s*", "").trim())
-        .collect(Collectors.joining("\n"))
-        .trim();
-  }
-
-  private String extractErrorStackTrace(String fileContent, boolean redact) {
-    Scanner scanner = new Scanner(fileContent);
-    StringBuilder stacktrace = new StringBuilder();
-    boolean foundStart = false;
-    while (scanner.hasNext()) {
-      String next = scanner.nextLine();
-      if (foundStart && next.isEmpty()) {
-        if (stacktrace.length() > 0) {
-          // remove trailing newline
-          stacktrace.setLength(stacktrace.length() - 1);
+
+    @SuppressForbidden
+    public void upload(@Nonnull Path file) {
+        String fileContent;
+        try {
+            fileContent = new String(Files.readAllBytes(file), Charset.defaultCharset());
+        } catch (Throwable t) {
+            log.error("Failed to collect information about the crash", t);
+            return; // cannot proceed further
         }
-        return stacktrace.toString();
-      }
-      if (foundStart) {
-        if (!redact || next.contains("libjvm.so") || next.contains("libjavaProfiler")) {
-          stacktrace.append(next);
-        } else {
-          stacktrace.append(next.charAt(0)).append("  [redacted frame]");
+
+        try {
+            uploadToLogs(fileContent, System.out);
+        } catch (Throwable t) {
+            log.error("Unable to print the error crash as a log message", t);
+        }
+        try {
+            remoteUpload(fileContent, true, storedConfig.sendToErrorTracking);
+        } finally {
+            uploadClient.dispatcher().cancelAll();
         }
-        stacktrace.append('\n');
-      } else {
-        foundStart = next.startsWith("Native frames:");
-      }
-    }
-    return "";
-  }
-
-  void uploadToTelemetry(@Nonnull CrashLog crashLog) {
-    try {
-      handleCall(makeTelemetryRequest(makeTelemetryRequestBody(crashLog.toJson(), false)), "crash");
-    } catch (Throwable t) {
-      log.error("Failed to make a telemetry request", t);
     }
-  }
-
-  private Call makeTelemetryRequest(@Nonnull RequestBody requestBody) throws IOException {
-    final Map<String, String> headers = new HashMap<>();
-    // Set chunked transfer
-    MediaType contentType = requestBody.contentType();
-    if (contentType != null) {
-      headers.put("Content-Type", contentType.toString());
+
+    @VisibleForTesting
+    void remoteUpload(@Nonnull String fileContent, boolean sendToTelemetry, boolean sendToErrorTracking) {
+        final String uuid = storedConfig.reportUUID;
+        try {
+            // Auto-detect crash log format (HotSpot hs_err or J9 javacore)
+            CrashLog crashLog = CrashLogParser.parse(uuid, fileContent);
+            if (sendToTelemetry) {
+                uploadToTelemetry(crashLog);
+            }
+            if (sendToErrorTracking) {
+                uploadToErrorTracking(crashLog);
+            }
+        } catch (Throwable t) {
+            log.error("Error while before sending remotely the crash report with uuid {}", uuid, t);
+        }
+        int remaining;
+        long deadline = MILLISECONDS.toNanos(timeout) + System.nanoTime();
+        // container that crashed
+        while ((remaining = dispatcher.queuedCallsCount() + dispatcher.runningCallsCount()) > 0
+                && deadline > System.nanoTime()) {
+            try {
+                Thread.sleep(100); // good enough for this purpose even if we overflow
+            } catch (InterruptedException ie) {
+                Thread.currentThread().interrupt();
+            }
+        }
+        if (remaining > 0) {
+            dispatcher.cancelAll();
+            uploadClient.connectionPool().evictAll();
+            log.error(
+                    SEND_TELEMETRY,
+                    "Failed to fully send the crash report with UUID {}. Still {} calls remaining",
+                    uuid,
+                    remaining);
+        }
     }
-    headers.put("Content-Length", Long.toString(requestBody.contentLength()));
-    headers.put("Transfer-Encoding", "chunked");
-    headers.put(HEADER_DD_EVP_ORIGIN, JAVA_TRACING_LIBRARY);
-    headers.put(HEADER_DD_EVP_ORIGIN_VERSION, VersionInfo.VERSION);
-    headers.put(HEADER_DD_TELEMETRY_API_VERSION, TELEMETRY_API_VERSION);
-    headers.put(HEADER_DD_TELEMETRY_REQUEST_TYPE, TELEMETRY_REQUEST_TYPE);
-
-    return uploadClient.newCall(
-        OkHttpUtils.prepareRequest(telemetryUrl, headers, config, agentless)
-            .post(requestBody)
-            .build());
-  }
-
-  private RequestBody makeTelemetryRequestBody(@Nonnull String payload, boolean isPing)
-      throws IOException {
-
-    try (Buffer buf = new Buffer()) {
-      try (JsonWriter writer = JsonWriter.of(buf)) {
-        writer.beginObject();
-        writer.name("api_version").value(TELEMETRY_API_VERSION);
-        writer.name("request_type").value("logs");
-        writer.name("runtime_id").value(storedConfig.runtimeId);
-        writer.name("tracer_time").value(Instant.now().getEpochSecond());
-        writer.name("seq_id").value(1);
-        writer.name("debug").value(true);
-        writer.name("origin").value("crashtracker");
-        writer.name("payload");
-        writer.beginArray();
-        writer.beginObject();
-        writer.name("message").value(payload);
-        if (isPing) {
-          writer.name("level").value("DEBUG");
-          writer.name("is_sensitive").value(false);
-          writer.name("tags").value(tagsForPing(storedConfig.reportUUID));
-        } else {
-          writer.name("level").value("ERROR");
-          writer.name("tags").value("severity:crash,is_crash:true");
-          writer.name("is_sensitive").value(true);
-          writer.name("is_crash").value(true);
+
+    void uploadToLogs(@Nonnull String message, @Nonnull PrintStream out) throws IOException {
+        // print on the output, and the application/container/host log will pick it up
+        try (Buffer buf = new Buffer()) {
+            try (JsonWriter writer = JsonWriter.of(buf)) {
+                writer.beginObject();
+                writer.name("ddsource").value("crashtracker");
+                writer.name("ddtags").value(tags);
+                writer.name("hostname").value(config.getHostName());
+                writer.name("service").value(storedConfig.service);
+                writer.name("version").value(storedConfig.version);
+                writer.name("env").value(storedConfig.env);
+                writer.name("message").value(message);
+                writer.name("level").value("ERROR");
+                writer.name("error");
+                writer.beginObject();
+                writer.name("kind").value(extractErrorKind(message));
+                writer.name("message").value(extractErrorMessage(message));
+                writer.name("stack").value(extractErrorStackTrace(message, false));
+                writer.endObject();
+                writer.endObject();
+            }
+            out.println(buf.readByteString().utf8());
         }
-        writer.endObject();
-        writer.endArray();
-        writer.name("application");
-        writer.beginObject();
-        writer.name("env").value(storedConfig.env);
-        writer.name("language_name").value("jvm");
-        writer
-            .name("language_version")
-            .value(SystemProperties.getOrDefault("java.version", "unknown"));
-        writer.name("service_name").value(storedConfig.service);
-        writer.name("service_version").value(storedConfig.version);
-        writer.name("tracer_version").value(VersionInfo.VERSION);
-        if (storedConfig.processTags != null) {
-          writer.name("process_tags").value(storedConfig.processTags);
+    }
+
+    @VisibleForTesting
+    @SuppressForbidden
+    static String extractErrorKind(String fileContent) {
+        Matcher matcher = ERROR_MESSAGE_PATTERN.matcher(fileContent);
+        if (!matcher.find()) {
+            log.error("No match found for error.kind");
+            return null;
         }
-        writer.endObject();
-        writer.name("host");
-        writer.beginObject();
-        if (ContainerInfo.get().getContainerId() != null) {
-          writer.name("container_id").value(ContainerInfo.get().getContainerId());
+
+        if (matcher.group().startsWith("# There is insufficient memory")) {
+            return "OutOfMemory";
         }
-        writer.name("hostname").value(config.getHostName());
-        writer.name("env").value(storedConfig.env);
-        writer.endObject();
-        writer.endObject();
-      }
+        return "NativeCrash";
+    }
 
-      return RequestBody.create(APPLICATION_JSON, buf.readByteString());
+    private static final Pattern ERROR_MESSAGE_PATTERN = Pattern.compile(
+            String.join(
+                    "",
+                    "^",
+                    "(",
+                    "# A fatal error has been detected by the Java Runtime Environment:",
+                    "|",
+                    "# There is insufficient memory for the Java Runtime Environment to continue\\.",
+                    ")",
+                    "\\n",
+                    "(",
+                    ".*, pid=-?\\d+, tid=-?\\d+",
+                    ")",
+                    "$"),
+            Pattern.DOTALL | Pattern.MULTILINE);
+
+    @VisibleForTesting
+    @SuppressForbidden
+    static String extractErrorMessage(String fileContent) {
+        Matcher matcher = ERROR_MESSAGE_PATTERN.matcher(fileContent);
+        if (!matcher.find()) {
+            log.error("No match found for error.message");
+            return null;
+        }
+        return Arrays.stream(matcher.group().split(System.lineSeparator()))
+                .filter(s -> !s.equals("# A fatal error has been detected by the Java Runtime Environment:")
+                        && !s.equals("# There is insufficient memory for the Java Runtime Environment to continue."))
+                .map(s -> s.replaceFirst("^#\\s*", "").trim())
+                .collect(Collectors.joining("\n"))
+                .trim();
     }
-  }
 
-  void uploadToErrorTracking(@Nonnull CrashLog crashLog) {
-    try {
-      handleCall(makeErrorTrackingRequest(makeErrorTrackingRequestBody(crashLog, false)), "crash");
-    } catch (Throwable t) {
-      log.error("Failed to make a error tracking request", t);
+    private String extractErrorStackTrace(String fileContent, boolean redact) {
+        Scanner scanner = new Scanner(fileContent);
+        StringBuilder stacktrace = new StringBuilder();
+        boolean foundStart = false;
+        while (scanner.hasNext()) {
+            String next = scanner.nextLine();
+            if (foundStart && next.isEmpty()) {
+                if (stacktrace.length() > 0) {
+                    // remove trailing newline
+                    stacktrace.setLength(stacktrace.length() - 1);
+                }
+                return stacktrace.toString();
+            }
+            if (foundStart) {
+                if (!redact || next.contains("libjvm.so") || next.contains("libjavaProfiler")) {
+                    stacktrace.append(next);
+                } else {
+                    stacktrace.append(next.charAt(0)).append("  [redacted frame]");
+                }
+                stacktrace.append('\n');
+            } else {
+                foundStart = next.startsWith("Native frames:");
+            }
+        }
+        return "";
     }
-  }
-
-  private Call makeErrorTrackingRequest(@Nonnull RequestBody requestBody) throws IOException {
-    final Map<String, String> headers = new HashMap<>();
-    // Set chunked transfer
-    MediaType contentType = requestBody.contentType();
-    if (contentType != null) {
-      headers.put("Content-Type", contentType.toString());
+
+    void uploadToTelemetry(@Nonnull CrashLog crashLog) {
+        try {
+            handleCall(makeTelemetryRequest(makeTelemetryRequestBody(crashLog.toJson(), false)), "crash");
+        } catch (Throwable t) {
+            log.error("Failed to make a telemetry request", t);
+        }
     }
-    headers.put("Content-Length", Long.toString(requestBody.contentLength()));
-    headers.put("Transfer-Encoding", "chunked");
-    headers.put(HEADER_DD_EVP_ORIGIN, JAVA_TRACING_LIBRARY);
-    headers.put(HEADER_DD_EVP_ORIGIN_VERSION, VersionInfo.VERSION);
-    if (!agentless) {
-      headers.put(HEADER_DD_EVP_SUBDOMAIN, ERROR_TRACKING_INTAKE);
+
+    private Call makeTelemetryRequest(@Nonnull RequestBody requestBody) throws IOException {
+        final Map<String, String> headers = new HashMap<>();
+        // Set chunked transfer
+        MediaType contentType = requestBody.contentType();
+        if (contentType != null) {
+            headers.put("Content-Type", contentType.toString());
+        }
+        headers.put("Content-Length", Long.toString(requestBody.contentLength()));
+        headers.put("Transfer-Encoding", "chunked");
+        headers.put(HEADER_DD_EVP_ORIGIN, JAVA_TRACING_LIBRARY);
+        headers.put(HEADER_DD_EVP_ORIGIN_VERSION, VersionInfo.VERSION);
+        headers.put(HEADER_DD_TELEMETRY_API_VERSION, TELEMETRY_API_VERSION);
+        headers.put(HEADER_DD_TELEMETRY_REQUEST_TYPE, TELEMETRY_REQUEST_TYPE);
+
+        return uploadClient.newCall(OkHttpUtils.prepareRequest(telemetryUrl, headers, config, agentless)
+                .post(requestBody)
+                .build());
     }
 
-    return uploadClient.newCall(
-        OkHttpUtils.prepareRequest(errorTrackingUrl, headers, config, agentless)
-            .post(requestBody)
-            .build());
-  }
-
-  private RequestBody makeErrorTrackingRequestBody(@Nonnull CrashLog payload, boolean isPing)
-      throws IOException {
-    try (Buffer buf = new Buffer()) {
-      try (JsonWriter writer = JsonWriter.of(buf)) {
-        writer.beginObject();
-        writer.name("timestamp").value(payload.timestamp);
-        writer.name("ddsource").value("crashtracker");
-        // tags
-        writer.name("ddtags").value(tagsForErrorTracking(payload.uuid, isPing, payload.incomplete));
-        // error payload
-        if (payload.error != null) {
-          writer.name("error");
-          writer.beginObject();
-          if (!isPing) {
-            writer.name("is_crash").value(true);
-          }
-          writer.name("type").value(payload.error.kind);
-          writer.name("message").value(payload.error.message);
-          if (uploaderSettings.isExtendedInfoEnabled() && payload.error.threadName != null) {
-            writer.name("thread_name").value(payload.error.threadName);
-          }
-          writer.name("source_type").value("Crashtracking");
-          if (payload.error.stack != null) {
-            writer.name("stack");
-            // flat write an already serialized json object
-            payload.error.stack.writeAsJson(writer);
-          }
-          writer.endObject();
+    private RequestBody makeTelemetryRequestBody(@Nonnull String payload, boolean isPing) throws IOException {
+
+        try (Buffer buf = new Buffer()) {
+            try (JsonWriter writer = JsonWriter.of(buf)) {
+                writer.beginObject();
+                writer.name("api_version").value(TELEMETRY_API_VERSION);
+                writer.name("request_type").value("logs");
+                writer.name("runtime_id").value(storedConfig.runtimeId);
+                writer.name("tracer_time").value(Instant.now().getEpochSecond());
+                writer.name("seq_id").value(1);
+                writer.name("debug").value(true);
+                writer.name("origin").value("crashtracker");
+                writer.name("payload");
+                writer.beginArray();
+                writer.beginObject();
+                writer.name("message").value(payload);
+                if (isPing) {
+                    writer.name("level").value("DEBUG");
+                    writer.name("is_sensitive").value(false);
+                    writer.name("tags").value(tagsForPing(storedConfig.reportUUID));
+                } else {
+                    writer.name("level").value("ERROR");
+                    writer.name("tags").value("severity:crash,is_crash:true");
+                    writer.name("is_sensitive").value(true);
+                    writer.name("is_crash").value(true);
+                }
+                writer.endObject();
+                writer.endArray();
+                writer.name("application");
+                writer.beginObject();
+                writer.name("env").value(storedConfig.env);
+                writer.name("language_name").value("jvm");
+                writer.name("language_version").value(SystemProperties.getOrDefault("java.version", "unknown"));
+                writer.name("service_name").value(storedConfig.service);
+                writer.name("service_version").value(storedConfig.version);
+                writer.name("tracer_version").value(VersionInfo.VERSION);
+                if (storedConfig.processTags != null) {
+                    writer.name("process_tags").value(storedConfig.processTags);
+                }
+                writer.endObject();
+                writer.name("host");
+                writer.beginObject();
+                if (ContainerInfo.get().getContainerId() != null) {
+                    writer.name("container_id").value(ContainerInfo.get().getContainerId());
+                }
+                writer.name("hostname").value(config.getHostName());
+                writer.name("env").value(storedConfig.env);
+                writer.endObject();
+                writer.endObject();
+            }
+
+            return RequestBody.create(APPLICATION_JSON, buf.readByteString());
         }
-        // signal info
-        if (payload.sigInfo != null) {
-          writer.name("sig_info");
-          writer.beginObject();
-          if (payload.sigInfo.address != null) {
-            writer.name("si_addr").value(payload.sigInfo.address);
-          }
-          if (payload.sigInfo.name != null) {
-            writer.name("si_signo_human_readable").value(payload.sigInfo.name);
-            writer.name("si_signo").value(payload.sigInfo.number);
-          }
-          if (payload.sigInfo.action != null) {
-            writer.name("si_code").value(payload.sigInfo.code);
-            writer.name("si_code_human_readable").value(payload.sigInfo.action);
-          }
-          if (payload.sigInfo.pid != null) {
-            writer.name("si_pid").value(payload.sigInfo.pid);
-          }
-          if (payload.sigInfo.uid != null) {
-            writer.name("si_uid").value(payload.sigInfo.uid);
-          }
-          writer.endObject();
+    }
+
+    void uploadToErrorTracking(@Nonnull CrashLog crashLog) {
+        try {
+            handleCall(makeErrorTrackingRequest(makeErrorTrackingRequestBody(crashLog, false)), "crash");
+        } catch (Throwable t) {
+            log.error("Failed to make a error tracking request", t);
         }
+    }
 
-        // os info
-        if (payload.osInfo != null) {
-          writer.name("os_info");
-          writer.beginObject();
-          writer.name("architecture").value(payload.osInfo.architecture);
-          writer.name("bitness").value(payload.osInfo.bitness);
-          writer.name("os_type").value(payload.osInfo.osType);
-          writer
-              .name("version")
-              .value(
-                  SystemProperties.get(
-                      "os.version")); // this has been restructured under OsInfo so taking raw here
-          writer.endObject();
+    private Call makeErrorTrackingRequest(@Nonnull RequestBody requestBody) throws IOException {
+        final Map<String, String> headers = new HashMap<>();
+        // Set chunked transfer
+        MediaType contentType = requestBody.contentType();
+        if (contentType != null) {
+            headers.put("Content-Type", contentType.toString());
         }
-        // experimental
-        if (payload.experimental != null
-            && (payload.experimental.ucontext != null
-                || payload.experimental.registerToMemoryMapping != null
-                || payload.experimental.runtimeArgs != null
-                || payload.experimental.runtimeInfo != null)) {
-          writer.name("experimental");
-          writer.beginObject();
-          if (payload.experimental.ucontext != null) {
-            writer.name("ucontext");
-            writer.beginObject();
-            for (Map.Entry<String, String> entry : payload.experimental.ucontext.entrySet()) {
-              writer.name(entry.getKey()).value(entry.getValue());
-            }
-            writer.endObject();
-          }
-          if (uploaderSettings.isExtendedInfoEnabled()
-              && payload.experimental.registerToMemoryMapping != null) {
-            writer.name("register_to_memory_mapping");
-            writer.beginObject();
-            for (Map.Entry<String, String> entry :
-                payload.experimental.registerToMemoryMapping.entrySet()) {
-              writer.name(entry.getKey()).value(entry.getValue());
-            }
-            writer.endObject();
-          }
-          if (uploaderSettings.isExtendedInfoEnabled()
-              && payload.experimental.runtimeArgs != null) {
-            writer.name("runtime_args");
-            writer.beginArray();
-            for (String arg : payload.experimental.runtimeArgs) {
-              writer.value(arg);
-            }
-            writer.endArray();
-          }
-          if (payload.experimental.runtimeInfo != null) {
-            writer.name("runtime_info");
-            writer.beginObject();
-            if (payload.experimental.runtimeInfo.jreVersion != null) {
-              writer.name("jre_version").value(payload.experimental.runtimeInfo.jreVersion);
-            }
-            if (payload.experimental.runtimeInfo.javaVm != null) {
-              writer.name("java_vm").value(payload.experimental.runtimeInfo.javaVm);
-            }
-            if (payload.experimental.runtimeInfo.vmInfo != null) {
-              writer.name("vm_info").value(payload.experimental.runtimeInfo.vmInfo);
+        headers.put("Content-Length", Long.toString(requestBody.contentLength()));
+        headers.put("Transfer-Encoding", "chunked");
+        headers.put(HEADER_DD_EVP_ORIGIN, JAVA_TRACING_LIBRARY);
+        headers.put(HEADER_DD_EVP_ORIGIN_VERSION, VersionInfo.VERSION);
+        if (!agentless) {
+            headers.put(HEADER_DD_EVP_SUBDOMAIN, ERROR_TRACKING_INTAKE);
+        }
+
+        return uploadClient.newCall(OkHttpUtils.prepareRequest(errorTrackingUrl, headers, config, agentless)
+                .post(requestBody)
+                .build());
+    }
+
+    private RequestBody makeErrorTrackingRequestBody(@Nonnull CrashLog payload, boolean isPing) throws IOException {
+        try (Buffer buf = new Buffer()) {
+            try (JsonWriter writer = JsonWriter.of(buf)) {
+                writer.beginObject();
+                writer.name("timestamp").value(payload.timestamp);
+                writer.name("ddsource").value("crashtracker");
+                // tags
+                writer.name("ddtags").value(tagsForErrorTracking(payload.uuid, isPing, payload.incomplete));
+                // error payload
+                if (payload.error != null) {
+                    writer.name("error");
+                    writer.beginObject();
+                    if (!isPing) {
+                        writer.name("is_crash").value(true);
+                    }
+                    writer.name("type").value(payload.error.kind);
+                    writer.name("message").value(payload.error.message);
+                    if (uploaderSettings.isExtendedInfoEnabled() && payload.error.threadName != null) {
+                        writer.name("thread_name").value(payload.error.threadName);
+                    }
+                    writer.name("source_type").value("Crashtracking");
+                    if (payload.error.stack != null) {
+                        writer.name("stack");
+                        // flat write an already serialized json object
+                        payload.error.stack.writeAsJson(writer);
+                    }
+                    writer.endObject();
+                }
+                // signal info
+                if (payload.sigInfo != null) {
+                    writer.name("sig_info");
+                    writer.beginObject();
+                    if (payload.sigInfo.address != null) {
+                        writer.name("si_addr").value(payload.sigInfo.address);
+                    }
+                    if (payload.sigInfo.name != null) {
+                        writer.name("si_signo_human_readable").value(payload.sigInfo.name);
+                        writer.name("si_signo").value(payload.sigInfo.number);
+                    }
+                    if (payload.sigInfo.action != null) {
+                        writer.name("si_code").value(payload.sigInfo.code);
+                        writer.name("si_code_human_readable").value(payload.sigInfo.action);
+                    }
+                    if (payload.sigInfo.pid != null) {
+                        writer.name("si_pid").value(payload.sigInfo.pid);
+                    }
+                    if (payload.sigInfo.uid != null) {
+                        writer.name("si_uid").value(payload.sigInfo.uid);
+                    }
+                    writer.endObject();
+                }
+
+                // os info
+                if (payload.osInfo != null) {
+                    writer.name("os_info");
+                    writer.beginObject();
+                    writer.name("architecture").value(payload.osInfo.architecture);
+                    writer.name("bitness").value(payload.osInfo.bitness);
+                    writer.name("os_type").value(payload.osInfo.osType);
+                    writer.name("version")
+                            .value(SystemProperties.get(
+                                    "os.version")); // this has been restructured under OsInfo so taking raw here
+                    writer.endObject();
+                }
+                // experimental
+                if (payload.experimental != null
+                        && (payload.experimental.ucontext != null
+                                || payload.experimental.registerToMemoryMapping != null
+                                || payload.experimental.runtimeArgs != null
+                                || payload.experimental.runtimeInfo != null)) {
+                    writer.name("experimental");
+                    writer.beginObject();
+                    if (payload.experimental.ucontext != null) {
+                        writer.name("ucontext");
+                        writer.beginObject();
+                        for (Map.Entry<String, String> entry : payload.experimental.ucontext.entrySet()) {
+                            writer.name(entry.getKey()).value(entry.getValue());
+                        }
+                        writer.endObject();
+                    }
+                    if (uploaderSettings.isExtendedInfoEnabled()
+                            && payload.experimental.registerToMemoryMapping != null) {
+                        writer.name("register_to_memory_mapping");
+                        writer.beginObject();
+                        for (Map.Entry<String, String> entry :
+                                payload.experimental.registerToMemoryMapping.entrySet()) {
+                            writer.name(entry.getKey()).value(entry.getValue());
+                        }
+                        writer.endObject();
+                    }
+                    if (uploaderSettings.isExtendedInfoEnabled() && payload.experimental.runtimeArgs != null) {
+                        writer.name("runtime_args");
+                        writer.beginArray();
+                        for (String arg : payload.experimental.runtimeArgs) {
+                            writer.value(arg);
+                        }
+                        writer.endArray();
+                    }
+                    if (payload.experimental.runtimeInfo != null) {
+                        writer.name("runtime_info");
+                        writer.beginObject();
+                        if (payload.experimental.runtimeInfo.jreVersion != null) {
+                            writer.name("jre_version").value(payload.experimental.runtimeInfo.jreVersion);
+                        }
+                        if (payload.experimental.runtimeInfo.javaVm != null) {
+                            writer.name("java_vm").value(payload.experimental.runtimeInfo.javaVm);
+                        }
+                        if (payload.experimental.runtimeInfo.vmInfo != null) {
+                            writer.name("vm_info").value(payload.experimental.runtimeInfo.vmInfo);
+                        }
+                        writer.endObject();
+                    }
+                    writer.endObject();
+                }
+                // files (e.g. /proc/self/maps or dynamic_libraries)
+                if (uploaderSettings.isExtendedInfoEnabled() && payload.files != null) {
+                    writer.name("files");
+                    writer.beginObject();
+                    writer.name(payload.files.name);
+                    writer.beginArray();
+                    for (String fileLine : payload.files.lines) {
+                        writer.value(fileLine);
+                    }
+                    writer.endArray();
+                    writer.endObject();
+                }
+                writer.endObject();
             }
-            writer.endObject();
-          }
-          writer.endObject();
+            return RequestBody.create(APPLICATION_JSON, buf.readByteString());
+        }
+    }
+
+    private String tagsForErrorTracking(String uuid, boolean isPing, boolean incomplete) {
+        final StringBuilder tags = new StringBuilder();
+        if (storedConfig.tags != null) {
+            // normally it does not happen
+            tags.append(storedConfig.tags);
+        } else {
+            tags.append("service:")
+                    .append(normalizeServiceName(storedConfig.service)); // ensure the service name is there
         }
-        // files (e.g. /proc/self/maps or dynamic_libraries)
-        if (uploaderSettings.isExtendedInfoEnabled() && payload.files != null) {
-          writer.name("files");
-          writer.beginObject();
-          writer.name(payload.files.name);
-          writer.beginArray();
-          for (String fileLine : payload.files.lines) {
-            writer.value(fileLine);
-          }
-          writer.endArray();
-          writer.endObject();
+        if (isPing) {
+            tags.append(",").append("is_crash_ping:true");
+        } else {
+            tags.append(",").append("is_crash:true");
+            if (incomplete) {
+                tags.append(",").append("incomplete:true");
+            }
         }
-        writer.endObject();
-      }
-      return RequestBody.create(APPLICATION_JSON, buf.readByteString());
+        tags.append(",").append("data_schema_version:1.0");
+        tags.append(",").append("language_name:jvm");
+        tags.append(",")
+                .append("language_version:")
+                .append(normalizeTagValue(SystemProperties.getOrDefault("java.version", "unknown")));
+        tags.append(",")
+                .append("runtime_version:")
+                .append(normalizeTagValue(SystemProperties.getOrDefault("java.runtime.version", "unknown")));
+        tags.append(",")
+                .append("runtime_vendor:")
+                .append(normalizeTagValue(SystemProperties.getOrDefault("java.vendor", "unknown")));
+        tags.append(",")
+                .append("runtime_name:")
+                .append(normalizeTagValue(SystemProperties.getOrDefault("java.runtime.name", "unknown")));
+        tags.append(",").append("tracer_version:").append(normalizeTagValue(VersionInfo.VERSION));
+        tags.append(",").append("uuid:").append(uuid);
+        return (tags.toString());
     }
-  }
-
-  private String tagsForErrorTracking(String uuid, boolean isPing, boolean incomplete) {
-    final StringBuilder tags = new StringBuilder();
-    if (storedConfig.tags != null) {
-      // normally it does not happen
-      tags.append(storedConfig.tags);
-    } else {
-      tags.append("service:")
-          .append(normalizeServiceName(storedConfig.service)); // ensure the service name is there
+
+    private String tagsForPing(String uuid) {
+        final StringBuilder tags = new StringBuilder("is_crash_ping:true");
+        tags.append(",").append("language_name:jvm");
+        tags.append(",").append("service:").append(normalizeServiceName(storedConfig.service));
+        tags.append(",")
+                .append("language_version:")
+                .append(normalizeTagValue(SystemProperties.getOrDefault("java.version", "unknown")));
+        tags.append(",")
+                .append("runtime_version:")
+                .append(normalizeTagValue(SystemProperties.getOrDefault("java.runtime.version", "unknown")));
+        tags.append(",")
+                .append("runtime_vendor:")
+                .append(normalizeTagValue(SystemProperties.getOrDefault("java.vendor", "unknown")));
+        tags.append(",")
+                .append("runtime_name:")
+                .append(normalizeTagValue(SystemProperties.getOrDefault("java.runtime.name", "unknown")));
+        tags.append(",").append("tracer_version:").append(normalizeTagValue(VersionInfo.VERSION));
+        tags.append(",").append("uuid:").append(uuid);
+        return (tags.toString());
     }
-    if (isPing) {
-      tags.append(",").append("is_crash_ping:true");
-    } else {
-      tags.append(",").append("is_crash:true");
-      if (incomplete) {
-        tags.append(",").append("incomplete:true");
-      }
+
+    private void handleCall(final Call call, String kind) {
+        call.enqueue(new CallResult(kind));
     }
-    tags.append(",").append("data_schema_version:1.0");
-    tags.append(",").append("language_name:jvm");
-    tags.append(",")
-        .append("language_version:")
-        .append(normalizeTagValue(SystemProperties.getOrDefault("java.version", "unknown")));
-    tags.append(",")
-        .append("runtime_version:")
-        .append(
-            normalizeTagValue(SystemProperties.getOrDefault("java.runtime.version", "unknown")));
-    tags.append(",")
-        .append("runtime_vendor:")
-        .append(normalizeTagValue(SystemProperties.getOrDefault("java.vendor", "unknown")));
-    tags.append(",")
-        .append("runtime_name:")
-        .append(normalizeTagValue(SystemProperties.getOrDefault("java.runtime.name", "unknown")));
-    tags.append(",").append("tracer_version:").append(normalizeTagValue(VersionInfo.VERSION));
-    tags.append(",").append("uuid:").append(uuid);
-    return (tags.toString());
-  }
-
-  private String tagsForPing(String uuid) {
-    final StringBuilder tags = new StringBuilder("is_crash_ping:true");
-    tags.append(",").append("language_name:jvm");
-    tags.append(",").append("service:").append(normalizeServiceName(storedConfig.service));
-    tags.append(",")
-        .append("language_version:")
-        .append(normalizeTagValue(SystemProperties.getOrDefault("java.version", "unknown")));
-    tags.append(",")
-        .append("runtime_version:")
-        .append(
-            normalizeTagValue(SystemProperties.getOrDefault("java.runtime.version", "unknown")));
-    tags.append(",")
-        .append("runtime_vendor:")
-        .append(normalizeTagValue(SystemProperties.getOrDefault("java.vendor", "unknown")));
-    tags.append(",")
-        .append("runtime_name:")
-        .append(normalizeTagValue(SystemProperties.getOrDefault("java.runtime.name", "unknown")));
-    tags.append(",").append("tracer_version:").append(normalizeTagValue(VersionInfo.VERSION));
-    tags.append(",").append("uuid:").append(uuid);
-    return (tags.toString());
-  }
-
-  private void handleCall(final Call call, String kind) {
-    call.enqueue(new CallResult(kind));
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploaderScriptInitializer.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploaderScriptInitializer.java
index efaa86c84be..9422c487561 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploaderScriptInitializer.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploaderScriptInitializer.java
@@ -26,165 +26,156 @@
 import java.nio.charset.StandardCharsets;
 
 public final class CrashUploaderScriptInitializer {
-  private static final String SETUP_FAILURE_MESSAGE = "Crash tracking will not work properly.";
+    private static final String SETUP_FAILURE_MESSAGE = "Crash tracking will not work properly.";
 
-  private CrashUploaderScriptInitializer() {}
+    private CrashUploaderScriptInitializer() {}
 
-  @VisibleForTesting
-  static boolean initialize(String onErrorVal, String onErrorFile) {
-    return initialize(onErrorVal, onErrorFile, null);
-  }
-
-  @VisibleForTesting
-  static boolean initialize(String onErrorVal, String onErrorFile, String javacorePath) {
-    if (onErrorVal == null || onErrorVal.isEmpty()) {
-      LOG.debug(
-          SEND_TELEMETRY, "'-XX:OnError' argument was not provided. Crash tracking is disabled.");
-      return false;
-    }
-    if (onErrorFile == null || onErrorFile.isEmpty()) {
-      onErrorFile = SystemProperties.get("user.dir") + "/hs_err_pid" + PidHelper.getPid() + ".log";
-      LOG.debug("No -XX:ErrorFile value, defaulting to {}", onErrorFile);
-    } else {
-      onErrorFile = Strings.replace(onErrorFile, "%p", PidHelper.getPid());
+    @VisibleForTesting
+    static boolean initialize(String onErrorVal, String onErrorFile) {
+        return initialize(onErrorVal, onErrorFile, null);
     }
 
-    String agentJar = findAgentJar();
-    if (agentJar == null) {
-      LOG.warn(SEND_TELEMETRY, "Unable to locate the agent jar. " + SETUP_FAILURE_MESSAGE);
-      return false;
-    }
+    @VisibleForTesting
+    static boolean initialize(String onErrorVal, String onErrorFile, String javacorePath) {
+        if (onErrorVal == null || onErrorVal.isEmpty()) {
+            LOG.debug(SEND_TELEMETRY, "'-XX:OnError' argument was not provided. Crash tracking is disabled.");
+            return false;
+        }
+        if (onErrorFile == null || onErrorFile.isEmpty()) {
+            onErrorFile = SystemProperties.get("user.dir") + "/hs_err_pid" + PidHelper.getPid() + ".log";
+            LOG.debug("No -XX:ErrorFile value, defaulting to {}", onErrorFile);
+        } else {
+            onErrorFile = Strings.replace(onErrorFile, "%p", PidHelper.getPid());
+        }
 
-    File scriptFile = new File(onErrorVal.replace(" %p", ""));
-    boolean isDDCrashUploader =
-        scriptFile.getName().toLowerCase(ROOT).contains("dd_crash_uploader");
-    if (isDDCrashUploader && !copyCrashUploaderScript(scriptFile, onErrorFile, agentJar)) {
-      return false;
-    }
+        String agentJar = findAgentJar();
+        if (agentJar == null) {
+            LOG.warn(SEND_TELEMETRY, "Unable to locate the agent jar. " + SETUP_FAILURE_MESSAGE);
+            return false;
+        }
 
-    if (javacorePath != null && !javacorePath.isEmpty()) {
-      writeConfigToPath(scriptFile, "agent", agentJar, "javacore_path", javacorePath);
-    } else {
-      writeConfigToPath(scriptFile, "agent", agentJar, "hs_err", onErrorFile);
-    }
-    return true;
-  }
+        File scriptFile = new File(onErrorVal.replace(" %p", ""));
+        boolean isDDCrashUploader = scriptFile.getName().toLowerCase(ROOT).contains("dd_crash_uploader");
+        if (isDDCrashUploader && !copyCrashUploaderScript(scriptFile, onErrorFile, agentJar)) {
+            return false;
+        }
 
-  private static boolean copyCrashUploaderScript(
-      File scriptFile, String onErrorFile, String agentJar) {
-    File scriptDirectory = scriptFile.getParentFile();
-    if (!scriptDirectory.exists()) {
-      if (!scriptDirectory.mkdirs()) {
-        LOG.warn(
-            SEND_TELEMETRY,
-            "Failed to create writable crash tracking script folder {}. " + SETUP_FAILURE_MESSAGE,
-            scriptDirectory);
-        return false;
-      }
-      if (!restrictDirectoryToOwnerOnly(scriptDirectory)) {
-        LOG.warn(
-            SEND_TELEMETRY,
-            "Unable to restrict crash tracking script folder {} to owner-only permissions. "
-                + SETUP_FAILURE_MESSAGE,
-            scriptDirectory);
-        return false;
-      }
-    } else {
-      if (!isSafeToRepair(scriptDirectory)) {
-        LOG.warn(
-            SEND_TELEMETRY,
-            "Untrusted crash tracking script folder {} (wrong owner or group/world-writable). "
-                + SETUP_FAILURE_MESSAGE,
-            scriptDirectory);
-        return false;
-      }
-      // owned by us but possibly left over from an older, less restrictive version: strip any
-      // stray group/world bits without touching the owner's own bits, so a directory an operator
-      // deliberately made non-writable stays non-writable
-      if (!stripGroupAndWorldBits(scriptDirectory)) {
-        LOG.warn(
-            SEND_TELEMETRY,
-            "Unable to strip group/world permissions from crash tracking script folder {}. "
-                + SETUP_FAILURE_MESSAGE,
-            scriptDirectory);
-        return false;
-      }
-    }
-    if (!scriptDirectory.canWrite()) {
-      LOG.warn(SEND_TELEMETRY, "Read only directory {}. " + SETUP_FAILURE_MESSAGE, scriptDirectory);
-      return false;
+        if (javacorePath != null && !javacorePath.isEmpty()) {
+            writeConfigToPath(scriptFile, "agent", agentJar, "javacore_path", javacorePath);
+        } else {
+            writeConfigToPath(scriptFile, "agent", agentJar, "hs_err", onErrorFile);
+        }
+        return true;
     }
-    try {
-      LOG.debug("Writing crash uploader script: {}", scriptFile);
-      writeCrashUploaderScript(getCrashUploaderTemplate(), scriptFile, agentJar, onErrorFile);
-    } catch (UntrustedScriptException e) {
-      LOG.warn(
-          SEND_TELEMETRY,
-          "Untrusted or unprotectable crash uploader script {} (wrong owner, group/world-writable,"
-              + " or unable to restrict permissions). "
-              + SETUP_FAILURE_MESSAGE,
-          scriptFile);
-      return false;
-    } catch (IOException e) {
-      LOG.warn(
-          SEND_TELEMETRY,
-          "Failed to copy crash tracking script {}. " + SETUP_FAILURE_MESSAGE,
-          scriptFile);
-      return false;
+
+    private static boolean copyCrashUploaderScript(File scriptFile, String onErrorFile, String agentJar) {
+        File scriptDirectory = scriptFile.getParentFile();
+        if (!scriptDirectory.exists()) {
+            if (!scriptDirectory.mkdirs()) {
+                LOG.warn(
+                        SEND_TELEMETRY,
+                        "Failed to create writable crash tracking script folder {}. " + SETUP_FAILURE_MESSAGE,
+                        scriptDirectory);
+                return false;
+            }
+            if (!restrictDirectoryToOwnerOnly(scriptDirectory)) {
+                LOG.warn(
+                        SEND_TELEMETRY,
+                        "Unable to restrict crash tracking script folder {} to owner-only permissions. "
+                                + SETUP_FAILURE_MESSAGE,
+                        scriptDirectory);
+                return false;
+            }
+        } else {
+            if (!isSafeToRepair(scriptDirectory)) {
+                LOG.warn(
+                        SEND_TELEMETRY,
+                        "Untrusted crash tracking script folder {} (wrong owner or group/world-writable). "
+                                + SETUP_FAILURE_MESSAGE,
+                        scriptDirectory);
+                return false;
+            }
+            // owned by us but possibly left over from an older, less restrictive version: strip any
+            // stray group/world bits without touching the owner's own bits, so a directory an operator
+            // deliberately made non-writable stays non-writable
+            if (!stripGroupAndWorldBits(scriptDirectory)) {
+                LOG.warn(
+                        SEND_TELEMETRY,
+                        "Unable to strip group/world permissions from crash tracking script folder {}. "
+                                + SETUP_FAILURE_MESSAGE,
+                        scriptDirectory);
+                return false;
+            }
+        }
+        if (!scriptDirectory.canWrite()) {
+            LOG.warn(SEND_TELEMETRY, "Read only directory {}. " + SETUP_FAILURE_MESSAGE, scriptDirectory);
+            return false;
+        }
+        try {
+            LOG.debug("Writing crash uploader script: {}", scriptFile);
+            writeCrashUploaderScript(getCrashUploaderTemplate(), scriptFile, agentJar, onErrorFile);
+        } catch (UntrustedScriptException e) {
+            LOG.warn(
+                    SEND_TELEMETRY,
+                    "Untrusted or unprotectable crash uploader script {} (wrong owner, group/world-writable,"
+                            + " or unable to restrict permissions). "
+                            + SETUP_FAILURE_MESSAGE,
+                    scriptFile);
+            return false;
+        } catch (IOException e) {
+            LOG.warn(SEND_TELEMETRY, "Failed to copy crash tracking script {}. " + SETUP_FAILURE_MESSAGE, scriptFile);
+            return false;
+        }
+        return true;
     }
-    return true;
-  }
 
-  static class UntrustedScriptException extends IOException {}
+    static class UntrustedScriptException extends IOException {}
 
-  /**
-   * Writes the crash uploader script if it does not already exist. A freshly written script is
-   * immediately restricted to owner-only permissions; a script that cannot be locked down is
-   * discarded. When the script already exists it is validated for POSIX ownership and repairable
-   * permissions before reuse: a script owned by the JVM user without group/world write bits is
-   * repaired in place by stripping stray group/world bits (e.g. left behind by an older, less
-   * restrictive version of this initializer), anything else is untrusted. Failure to trust or
-   * repair the script causes this method to throw {@link UntrustedScriptException} so the caller
-   * can return {@code false}.
-   */
-  private static void writeCrashUploaderScript(
-      InputStream template, File scriptFile, String execClass, String crashFile)
-      throws IOException {
-    if (!scriptFile.exists()) {
-      try (BufferedReader br = new BufferedReader(new InputStreamReader(template));
-          BufferedWriter bw =
-              new BufferedWriter(
-                  new OutputStreamWriter(
-                      new FileOutputStream(scriptFile), StandardCharsets.UTF_8))) {
-        String line;
-        while ((line = br.readLine()) != null) {
-          bw.write(template(line, execClass, crashFile));
-          bw.newLine();
+    /**
+     * Writes the crash uploader script if it does not already exist. A freshly written script is
+     * immediately restricted to owner-only permissions; a script that cannot be locked down is
+     * discarded. When the script already exists it is validated for POSIX ownership and repairable
+     * permissions before reuse: a script owned by the JVM user without group/world write bits is
+     * repaired in place by stripping stray group/world bits (e.g. left behind by an older, less
+     * restrictive version of this initializer), anything else is untrusted. Failure to trust or
+     * repair the script causes this method to throw {@link UntrustedScriptException} so the caller
+     * can return {@code false}.
+     */
+    private static void writeCrashUploaderScript(
+            InputStream template, File scriptFile, String execClass, String crashFile) throws IOException {
+        if (!scriptFile.exists()) {
+            try (BufferedReader br = new BufferedReader(new InputStreamReader(template));
+                    BufferedWriter bw = new BufferedWriter(
+                            new OutputStreamWriter(new FileOutputStream(scriptFile), StandardCharsets.UTF_8))) {
+                String line;
+                while ((line = br.readLine()) != null) {
+                    bw.write(template(line, execClass, crashFile));
+                    bw.newLine();
+                }
+            } catch (IOException e) {
+                // fail closed: never leave a partially written script that a later JVM start would
+                // silently reuse (it passes isSafeToRepair because it carries no group/world write bits)
+                scriptFile.delete();
+                throw e;
+            }
+            // fail closed: never leave a freshly written script we could not lock down
+            if (!restrictScriptToOwnerOnly(scriptFile)) {
+                scriptFile.delete();
+                throw new UntrustedScriptException();
+            }
+        } else {
+            if (!isSafeToRepair(scriptFile) || !stripGroupAndWorldBits(scriptFile)) {
+                throw new UntrustedScriptException();
+            }
         }
-      } catch (IOException e) {
-        // fail closed: never leave a partially written script that a later JVM start would
-        // silently reuse (it passes isSafeToRepair because it carries no group/world write bits)
-        scriptFile.delete();
-        throw e;
-      }
-      // fail closed: never leave a freshly written script we could not lock down
-      if (!restrictScriptToOwnerOnly(scriptFile)) {
-        scriptFile.delete();
-        throw new UntrustedScriptException();
-      }
-    } else {
-      if (!isSafeToRepair(scriptFile) || !stripGroupAndWorldBits(scriptFile)) {
-        throw new UntrustedScriptException();
-      }
     }
-  }
 
-  private static String template(String line, String execClass, String crashFile) {
-    line = Strings.replace(line, "!AGENT_JAR!", execClass);
-    line = Strings.replace(line, "!JAVA_HOME!", SystemProperties.get("java.home"));
-    if (crashFile != null) {
-      line = Strings.replace(line, "!JAVA_ERROR_FILE!", crashFile);
+    private static String template(String line, String execClass, String crashFile) {
+        line = Strings.replace(line, "!AGENT_JAR!", execClass);
+        line = Strings.replace(line, "!JAVA_HOME!", SystemProperties.get("java.home"));
+        if (crashFile != null) {
+            line = Strings.replace(line, "!JAVA_ERROR_FILE!", crashFile);
+        }
+        return line;
     }
-    return line;
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploaderSettings.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploaderSettings.java
index 15a79834f50..8742cbbf89b 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploaderSettings.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploaderSettings.java
@@ -2,13 +2,13 @@
 
 /** Immutable settings that control what data {@link CrashUploader} includes in uploaded reports. */
 public final class CrashUploaderSettings {
-  final boolean extendedInfoEnabled;
+    final boolean extendedInfoEnabled;
 
-  CrashUploaderSettings(boolean extendedInfoEnabled) {
-    this.extendedInfoEnabled = extendedInfoEnabled;
-  }
+    CrashUploaderSettings(boolean extendedInfoEnabled) {
+        this.extendedInfoEnabled = extendedInfoEnabled;
+    }
 
-  boolean isExtendedInfoEnabled() {
-    return extendedInfoEnabled;
-  }
+    boolean isExtendedInfoEnabled() {
+        return extendedInfoEnabled;
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/Initializer.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/Initializer.java
index f8b68e1c1a9..f280610cef8 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/Initializer.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/Initializer.java
@@ -29,547 +29,539 @@
 import org.slf4j.LoggerFactory;
 
 public final class Initializer {
-  static final Logger LOG = LoggerFactory.getLogger(Initializer.class);
-  static final String PID_PREFIX = "_pid";
+    static final Logger LOG = LoggerFactory.getLogger(Initializer.class);
+    static final String PID_PREFIX = "_pid";
 
-  private interface FlagAccess {
-    String getValue(String flagName);
+    private interface FlagAccess {
+        String getValue(String flagName);
 
-    boolean setValue(String flagName, String value);
-  }
-
-  private static final class JVMFlagAccess implements FlagAccess {
-    private final JVMAccess.Flags flags;
-
-    JVMFlagAccess(JVMAccess.Flags flags) {
-      this.flags = flags;
+        boolean setValue(String flagName, String value);
     }
 
-    @Override
-    public String getValue(String flagName) {
-      return flags.getStringFlag(flagName);
-    }
+    private static final class JVMFlagAccess implements FlagAccess {
+        private final JVMAccess.Flags flags;
 
-    @Override
-    public boolean setValue(String flagName, String value) {
-      flags.setStringFlag(flagName, value);
-      return flags.getStringFlag(flagName).equals(value);
-    }
-  }
+        JVMFlagAccess(JVMAccess.Flags flags) {
+            this.flags = flags;
+        }
 
-  private static final class JMXFlagAccess implements FlagAccess {
-    private final HotSpotDiagnosticMXBean diagBean;
+        @Override
+        public String getValue(String flagName) {
+            return flags.getStringFlag(flagName);
+        }
 
-    JMXFlagAccess(HotSpotDiagnosticMXBean diagBean) {
-      this.diagBean = diagBean;
+        @Override
+        public boolean setValue(String flagName, String value) {
+            flags.setStringFlag(flagName, value);
+            return flags.getStringFlag(flagName).equals(value);
+        }
     }
 
-    @Override
-    public String getValue(String flagName) {
-      return diagBean.getVMOption(flagName).getValue();
-    }
+    private static final class JMXFlagAccess implements FlagAccess {
+        private final HotSpotDiagnosticMXBean diagBean;
 
-    @Override
-    public boolean setValue(String flagName, String value) {
-      // cannot really set the underlying JVM flag value
-      // let's pretend everything went just fine
-      return true;
-    }
-  }
+        JMXFlagAccess(HotSpotDiagnosticMXBean diagBean) {
+            this.diagBean = diagBean;
+        }
+
+        @Override
+        public String getValue(String flagName) {
+            return diagBean.getVMOption(flagName).getValue();
+        }
 
-  public static boolean initialize(boolean forceJmx) {
-    // J9/OpenJ9 requires different initialization path
-    if (JavaVirtualMachine.isJ9()) {
-      return initializeJ9();
+        @Override
+        public boolean setValue(String flagName, String value) {
+            // cannot really set the underlying JVM flag value
+            // let's pretend everything went just fine
+            return true;
+        }
     }
 
-    try {
-      FlagAccess access = null;
-      // Native images don't support the native ddprof library, use JMX instead
-      if (forceJmx || Platform.isNativeImage()) {
-        access =
-            new JMXFlagAccess(ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class));
-      } else {
-        DdprofLibraryLoader.JVMAccessHolder jvmAccessHolder = DdprofLibraryLoader.jvmAccess();
-        Throwable reasonNotLoaded = jvmAccessHolder.getReasonNotLoaded();
-        if (reasonNotLoaded != null) {
-          LOG.debug(
-              SEND_TELEMETRY,
-              "Failed to load JVM access library: {}. Crash tracking will need to rely on user provided JVM arguments.",
-              jvmAccessHolder.getReasonNotLoaded().getMessage());
-          return false;
-        } else {
-          JVMAccess.Flags flags = jvmAccessHolder.getComponent().flags();
-          access = new JVMFlagAccess(flags);
+    public static boolean initialize(boolean forceJmx) {
+        // J9/OpenJ9 requires different initialization path
+        if (JavaVirtualMachine.isJ9()) {
+            return initializeJ9();
         }
-      }
 
-      initializeCrashUploader(access);
-      initializeOOMENotifier(access);
-      return true;
-    } catch (Throwable t) {
-      LOG.debug("Failed to initialize crash tracking: {}", t.getMessage(), t);
+        try {
+            FlagAccess access = null;
+            // Native images don't support the native ddprof library, use JMX instead
+            if (forceJmx || Platform.isNativeImage()) {
+                access = new JMXFlagAccess(ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class));
+            } else {
+                DdprofLibraryLoader.JVMAccessHolder jvmAccessHolder = DdprofLibraryLoader.jvmAccess();
+                Throwable reasonNotLoaded = jvmAccessHolder.getReasonNotLoaded();
+                if (reasonNotLoaded != null) {
+                    LOG.debug(
+                            SEND_TELEMETRY,
+                            "Failed to load JVM access library: {}. Crash tracking will need to rely on user provided JVM arguments.",
+                            jvmAccessHolder.getReasonNotLoaded().getMessage());
+                    return false;
+                } else {
+                    JVMAccess.Flags flags = jvmAccessHolder.getComponent().flags();
+                    access = new JVMFlagAccess(flags);
+                }
+            }
+
+            initializeCrashUploader(access);
+            initializeOOMENotifier(access);
+            return true;
+        } catch (Throwable t) {
+            LOG.debug("Failed to initialize crash tracking: {}", t.getMessage(), t);
+        }
+        return false;
     }
-    return false;
-  }
-
-  /**
-   * Initialize crash tracking for J9/OpenJ9 JVMs.
-   *
-   * <p>Unlike HotSpot, J9's -Xdump option cannot be modified at runtime. This method:
-   *
-   * <ol>
-   *   <li>Checks if -Xdump:tool is already configured
-   *   <li>Deploys the crash uploader script if configured
-   *   <li>Logs instructions for manual configuration if not configured
-   * </ol>
-   *
-   * @return true if -Xdump is properly configured, false otherwise
-   */
-  private static boolean initializeJ9() {
-    try {
-      // Check if -Xdump:tool is already configured via JVM arguments
-      boolean xdumpConfigured = isXdumpToolConfigured();
-      // Get custom javacore path if configured
-      String javacorePath = getJ9JavacorePath();
-      if (javacorePath == null || javacorePath.isEmpty()) {
-        // OpenJ9 defaults javacore output to the JVM working directory. Persist that location in
-        // the uploader config so the crash script does not need to guess from its own cwd.
-        javacorePath = SystemProperties.get("user.dir");
-      }
-
-      if (xdumpConfigured) {
-        LOG.debug("J9 crash tracking: -Xdump:tool already configured, crash uploads enabled");
-        // Use the path from the -Xdump:tool arg when available (allows callers to specify a known
-        // path via -Xdump:tool:events=gpf+abort,exec=<path>\ %pid), falling back to the default
-        // TempLocationManager path when the path cannot be extracted.
-        String extractedPath = extractJ9ScriptPathFromXdumpArg();
-        String scriptPath = extractedPath != null ? extractedPath : getJ9CrashUploaderScriptPath();
-        // Initialize the crash uploader script and config manager
-        CrashUploaderScriptInitializer.initialize(scriptPath, null, javacorePath);
-        // Also set up OOME notifier script
-        String oomeScript = getScript("dd_oome_notifier");
-        OOMENotifierScriptInitializer.initialize(oomeScript);
-        return true;
-      } else {
-        String scriptPath = getJ9CrashUploaderScriptPath();
-        // Log instructions for manual configuration
-        LOG.info("J9 JVM detected. To enable crash tracking, add this JVM argument at startup:");
-        LOG.info("  -Xdump:tool:events=gpf+abort,exec={}\\ %pid", scriptPath);
-        LOG.info(
-            "Crash tracking will not be active until this argument is added and JVM is restarted.");
+
+    /**
+     * Initialize crash tracking for J9/OpenJ9 JVMs.
+     *
+     * <p>Unlike HotSpot, J9's -Xdump option cannot be modified at runtime. This method:
+     *
+     * <ol>
+     *   <li>Checks if -Xdump:tool is already configured
+     *   <li>Deploys the crash uploader script if configured
+     *   <li>Logs instructions for manual configuration if not configured
+     * </ol>
+     *
+     * @return true if -Xdump is properly configured, false otherwise
+     */
+    private static boolean initializeJ9() {
+        try {
+            // Check if -Xdump:tool is already configured via JVM arguments
+            boolean xdumpConfigured = isXdumpToolConfigured();
+            // Get custom javacore path if configured
+            String javacorePath = getJ9JavacorePath();
+            if (javacorePath == null || javacorePath.isEmpty()) {
+                // OpenJ9 defaults javacore output to the JVM working directory. Persist that location in
+                // the uploader config so the crash script does not need to guess from its own cwd.
+                javacorePath = SystemProperties.get("user.dir");
+            }
+
+            if (xdumpConfigured) {
+                LOG.debug("J9 crash tracking: -Xdump:tool already configured, crash uploads enabled");
+                // Use the path from the -Xdump:tool arg when available (allows callers to specify a known
+                // path via -Xdump:tool:events=gpf+abort,exec=<path>\ %pid), falling back to the default
+                // TempLocationManager path when the path cannot be extracted.
+                String extractedPath = extractJ9ScriptPathFromXdumpArg();
+                String scriptPath = extractedPath != null ? extractedPath : getJ9CrashUploaderScriptPath();
+                // Initialize the crash uploader script and config manager
+                CrashUploaderScriptInitializer.initialize(scriptPath, null, javacorePath);
+                // Also set up OOME notifier script
+                String oomeScript = getScript("dd_oome_notifier");
+                OOMENotifierScriptInitializer.initialize(oomeScript);
+                return true;
+            } else {
+                String scriptPath = getJ9CrashUploaderScriptPath();
+                // Log instructions for manual configuration
+                LOG.info("J9 JVM detected. To enable crash tracking, add this JVM argument at startup:");
+                LOG.info("  -Xdump:tool:events=gpf+abort,exec={}\\ %pid", scriptPath);
+                LOG.info("Crash tracking will not be active until this argument is added and JVM is restarted.");
+                return false;
+            }
+        } catch (Throwable t) {
+            LOG.warn(
+                    SEND_TELEMETRY,
+                    "Unexpected exception while initializing J9 crash tracking. Crash tracking will not work.",
+                    t);
+        }
         return false;
-      }
-    } catch (Throwable t) {
-      LOG.warn(
-          SEND_TELEMETRY,
-          "Unexpected exception while initializing J9 crash tracking. Crash tracking will not work.",
-          t);
     }
-    return false;
-  }
-
-  /**
-   * Extract the crash uploader script path from the {@code -Xdump:tool} JVM argument.
-   *
-   * <p>Looks for a JVM argument of the form {@code
-   * -Xdump:tool:events=...,exec=/path/to/dd_crash_uploader.sh\ %pid} and returns the script path
-   * portion (before the {@code \ %pid} argument separator).
-   *
-   * @return the script path, or {@code null} if not found or not extractable
-   */
-  private static String extractJ9ScriptPathFromXdumpArg() {
-    List<String> vmArgs = JavaVirtualMachine.getVmOptions();
-    for (String arg : vmArgs) {
-      if (arg.startsWith("-Xdump:tool") && arg.contains("dd_crash_uploader")) {
-        int execIdx = arg.indexOf("exec=");
-        if (execIdx >= 0) {
-          String execVal = arg.substring(execIdx + 5);
-          // Separator between command and args: plain space, or "\ " (backslash + space) as
-          // suggested by the Initializer's log hint. Check plain space first since that is the
-          // form that actually works when the shell splits the exec string into tokens.
-          int spaceIdx = execVal.indexOf(' ');
-          if (spaceIdx >= 0) {
-            String candidate = execVal.substring(0, spaceIdx);
-            // Strip a trailing backslash left over from the "\ %pid" notation
-            return candidate.endsWith("\\")
-                ? candidate.substring(0, candidate.length() - 1)
-                : candidate;
-          }
-          return execVal;
+
+    /**
+     * Extract the crash uploader script path from the {@code -Xdump:tool} JVM argument.
+     *
+     * <p>Looks for a JVM argument of the form {@code
+     * -Xdump:tool:events=...,exec=/path/to/dd_crash_uploader.sh\ %pid} and returns the script path
+     * portion (before the {@code \ %pid} argument separator).
+     *
+     * @return the script path, or {@code null} if not found or not extractable
+     */
+    private static String extractJ9ScriptPathFromXdumpArg() {
+        List<String> vmArgs = JavaVirtualMachine.getVmOptions();
+        for (String arg : vmArgs) {
+            if (arg.startsWith("-Xdump:tool") && arg.contains("dd_crash_uploader")) {
+                int execIdx = arg.indexOf("exec=");
+                if (execIdx >= 0) {
+                    String execVal = arg.substring(execIdx + 5);
+                    // Separator between command and args: plain space, or "\ " (backslash + space) as
+                    // suggested by the Initializer's log hint. Check plain space first since that is the
+                    // form that actually works when the shell splits the exec string into tokens.
+                    int spaceIdx = execVal.indexOf(' ');
+                    if (spaceIdx >= 0) {
+                        String candidate = execVal.substring(0, spaceIdx);
+                        // Strip a trailing backslash left over from the "\ %pid" notation
+                        return candidate.endsWith("\\") ? candidate.substring(0, candidate.length() - 1) : candidate;
+                    }
+                    return execVal;
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
-
-  /**
-   * Get the custom javacore file path from -Xdump:java:file=... JVM argument.
-   *
-   * @return the custom javacore path, or null if not configured
-   */
-  private static String getJ9JavacorePath() {
-    List<String> vmArgs = JavaVirtualMachine.getVmOptions();
-    for (String arg : vmArgs) {
-      if (arg.startsWith("-Xdump:java:file=") || arg.startsWith("-Xdump:java+heap:file=")) {
-        int fileIdx = arg.indexOf("file=");
-        if (fileIdx >= 0) {
-          String path = arg.substring(fileIdx + 5);
-          // Handle comma-separated options: -Xdump:java:file=/path,request=exclusive
-          int commaIdx = path.indexOf(',');
-          if (commaIdx > 0) {
-            path = path.substring(0, commaIdx);
-          }
-          return path;
+
+    /**
+     * Get the custom javacore file path from -Xdump:java:file=... JVM argument.
+     *
+     * @return the custom javacore path, or null if not configured
+     */
+    private static String getJ9JavacorePath() {
+        List<String> vmArgs = JavaVirtualMachine.getVmOptions();
+        for (String arg : vmArgs) {
+            if (arg.startsWith("-Xdump:java:file=") || arg.startsWith("-Xdump:java+heap:file=")) {
+                int fileIdx = arg.indexOf("file=");
+                if (fileIdx >= 0) {
+                    String path = arg.substring(fileIdx + 5);
+                    // Handle comma-separated options: -Xdump:java:file=/path,request=exclusive
+                    int commaIdx = path.indexOf(',');
+                    if (commaIdx > 0) {
+                        path = path.substring(0, commaIdx);
+                    }
+                    return path;
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
-
-  /**
-   * Check if -Xdump:tool is configured with our crash uploader script.
-   *
-   * <p>Looks for JVM arguments matching: -Xdump:tool:events=...,exec=...dd_crash_uploader...
-   */
-  private static boolean isXdumpToolConfigured() {
-    List<String> vmArgs = JavaVirtualMachine.getVmOptions();
-    for (String arg : vmArgs) {
-      if (arg.startsWith("-Xdump:tool") && arg.contains("dd_crash_uploader")) {
-        return true;
-      }
+
+    /**
+     * Check if -Xdump:tool is configured with our crash uploader script.
+     *
+     * <p>Looks for JVM arguments matching: -Xdump:tool:events=...,exec=...dd_crash_uploader...
+     */
+    private static boolean isXdumpToolConfigured() {
+        List<String> vmArgs = JavaVirtualMachine.getVmOptions();
+        for (String arg : vmArgs) {
+            if (arg.startsWith("-Xdump:tool") && arg.contains("dd_crash_uploader")) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
-
-  /**
-   * Get the path where the crash uploader script should be deployed for J9.
-   *
-   * <p>Note: The actual script deployment is handled by {@link CrashUploaderScriptInitializer} when
-   * initialize() is called with this path.
-   *
-   * @return the full path for the crash uploader script
-   */
-  private static String getJ9CrashUploaderScriptPath() {
-    String scriptFileName = getScriptFileName("dd_crash_uploader");
-    String tempDir = TempLocationManager.getInstance().getTempDir().toString();
-    return tempDir + File.separator + scriptFileName;
-  }
-
-  static InputStream getCrashUploaderTemplate() {
-    String name = OperatingSystem.isWindows() ? "upload_crash.bat" : "upload_crash.sh";
-    return CrashUploader.class.getResourceAsStream(name);
-  }
-
-  static InputStream getOomeNotifierTemplate() {
-    String name = OperatingSystem.isWindows() ? "notify_oome.bat" : "notify_oome.sh";
-    return OOMENotifier.class.getResourceAsStream(name);
-  }
-
-  static String findAgentJar() {
-    String agentPath = null;
-    String classResourceName = CrashUploader.class.getName().replace('.', '/') + ".class";
-    URL classResource = CrashUploader.class.getClassLoader().getResource(classResourceName);
-    String selfClass = classResource == null ? "null" : classResource.toString();
-    if (selfClass.startsWith("jar:file:")) {
-      int idx = selfClass.lastIndexOf(".jar");
-      if (idx > -1) {
-        agentPath = selfClass.substring(9, idx + 4);
-      }
+
+    /**
+     * Get the path where the crash uploader script should be deployed for J9.
+     *
+     * <p>Note: The actual script deployment is handled by {@link CrashUploaderScriptInitializer} when
+     * initialize() is called with this path.
+     *
+     * @return the full path for the crash uploader script
+     */
+    private static String getJ9CrashUploaderScriptPath() {
+        String scriptFileName = getScriptFileName("dd_crash_uploader");
+        String tempDir = TempLocationManager.getInstance().getTempDir().toString();
+        return tempDir + File.separator + scriptFileName;
     }
-    // test harness env is different; use the known project structure to locate the agent jar
-    else if (selfClass.startsWith("file:")) {
-      int idx = selfClass.lastIndexOf("dd-java-agent");
-      if (idx > -1) {
-        File libsDir = new File(selfClass.substring(5, idx + 13), "build/libs");
-        File[] jars = libsDir.listFiles(f -> f.getName().toLowerCase(ROOT).endsWith(".jar"));
-        if (jars != null && jars.length > 0) {
-          Arrays.sort(jars, (a, b) -> b.getName().compareTo(a.getName()));
-          agentPath = jars[0].getAbsolutePath();
-        }
-      }
+
+    static InputStream getCrashUploaderTemplate() {
+        String name = OperatingSystem.isWindows() ? "upload_crash.bat" : "upload_crash.sh";
+        return CrashUploader.class.getResourceAsStream(name);
+    }
+
+    static InputStream getOomeNotifierTemplate() {
+        String name = OperatingSystem.isWindows() ? "notify_oome.bat" : "notify_oome.sh";
+        return OOMENotifier.class.getResourceAsStream(name);
     }
-    return agentPath;
-  }
 
-  static String pidFromSpecialFileName(String fileName) {
-    if (fileName == null || fileName.isEmpty()) {
-      return null;
+    static String findAgentJar() {
+        String agentPath = null;
+        String classResourceName = CrashUploader.class.getName().replace('.', '/') + ".class";
+        URL classResource = CrashUploader.class.getClassLoader().getResource(classResourceName);
+        String selfClass = classResource == null ? "null" : classResource.toString();
+        if (selfClass.startsWith("jar:file:")) {
+            int idx = selfClass.lastIndexOf(".jar");
+            if (idx > -1) {
+                agentPath = selfClass.substring(9, idx + 4);
+            }
+        }
+        // test harness env is different; use the known project structure to locate the agent jar
+        else if (selfClass.startsWith("file:")) {
+            int idx = selfClass.lastIndexOf("dd-java-agent");
+            if (idx > -1) {
+                File libsDir = new File(selfClass.substring(5, idx + 13), "build/libs");
+                File[] jars =
+                        libsDir.listFiles(f -> f.getName().toLowerCase(ROOT).endsWith(".jar"));
+                if (jars != null && jars.length > 0) {
+                    Arrays.sort(jars, (a, b) -> b.getName().compareTo(a.getName()));
+                    agentPath = jars[0].getAbsolutePath();
+                }
+            }
+        }
+        return agentPath;
     }
-    int index = fileName.indexOf(PID_PREFIX);
-    if (index < 0) {
-      return null; // not a process specific file
+
+    static String pidFromSpecialFileName(String fileName) {
+        if (fileName == null || fileName.isEmpty()) {
+            return null;
+        }
+        int index = fileName.indexOf(PID_PREFIX);
+        if (index < 0) {
+            return null; // not a process specific file
+        }
+        int pos = index + PID_PREFIX.length();
+        int startPos = pos;
+
+        // check if the file name contains a PID
+        if (fileName.length() <= pos) {
+            return null; // no PID in the file name
+        }
+        // extract the PID from the file name
+        // eg. pid_12345.log -> 12345
+        while (pos < fileName.length() && Character.isDigit(fileName.charAt(pos))) {
+            pos++;
+        }
+        return fileName.substring(startPos, pos);
     }
-    int pos = index + PID_PREFIX.length();
-    int startPos = pos;
 
-    // check if the file name contains a PID
-    if (fileName.length() <= pos) {
-      return null; // no PID in the file name
+    static String getScriptPathFromArg(String arg, String scriptNamePrefix) {
+        if (arg == null || arg.isEmpty()) {
+            return null;
+        }
+        int idx = arg.toLowerCase().indexOf(scriptNamePrefix);
+        if (idx < 0) {
+            // the script name is not present in the value, so we cannot extract the path
+            return null;
+        }
+        // the script name is present, so we can extract the path
+
+        char ch;
+        idx += scriptNamePrefix.length();
+        while (idx < arg.length() && (ch = arg.charAt(idx)) != ' ' && ch != ';') {
+            idx++;
+        }
+        String path = arg.substring(0, idx);
+        idx = path.lastIndexOf(';'); // the arg may contain multiple commands separated by semicolons
+        if (idx >= 0) {
+            // if there is a semicolon, we take the part after it and trim it
+            path = path.substring(idx + 1).trim();
+        }
+        return path;
     }
-    // extract the PID from the file name
-    // eg. pid_12345.log -> 12345
-    while (pos < fileName.length() && Character.isDigit(fileName.charAt(pos))) {
-      pos++;
+
+    /**
+     * If the value of `-XX:OnError` JVM argument is referring to `dd_crash_uploader.sh` or
+     * `dd_crash_uploader.bat` and the script does not exist it will be created and prefilled with
+     * code ensuring the error log upload will be triggered on JVM crash.
+     */
+    private static void initializeCrashUploader(FlagAccess flags) {
+        try {
+            String onErrorVal = flags.getValue("OnError");
+            String onErrorFile = flags.getValue("ErrorFile");
+
+            String uploadScript = getScript("dd_crash_uploader");
+            if (onErrorVal == null || onErrorVal.isEmpty()) {
+                onErrorVal = uploadScript;
+            } else if (!onErrorVal.contains("dd_crash_uploader")) {
+                // we can chain scripts so let's preserve the original value in addition to our crash
+                // uploader
+                onErrorVal = uploadScript + "; " + onErrorVal;
+            } else {
+                StringTokenizer st = new StringTokenizer(onErrorVal, ";");
+                while (st.hasMoreTokens()) {
+                    String part = st.nextToken();
+                    if (part.trim().contains("dd_crash_uploader")) {
+                        // reuse the existing script name
+                        uploadScript = part.trim().replace(" %p", "");
+                        break;
+                    }
+                }
+            }
+
+            if (CrashUploaderScriptInitializer.initialize(uploadScript, onErrorFile)) {
+                // set the JVM flag only if the script was successfully initialized
+                boolean rslt = flags.setValue("OnError", onErrorVal);
+                if (!rslt && LOG.isDebugEnabled()) {
+                    LOG.debug(
+                            SEND_TELEMETRY,
+                            "Unable to set OnError flag to {}. Crash-tracking may not work.",
+                            onErrorVal);
+                }
+            }
+        } catch (Throwable t) {
+            LOG.warn(
+                    SEND_TELEMETRY,
+                    "Unexpected exception while creating custom crash upload script. Crash tracking will not work properly.",
+                    t);
+        }
     }
-    return fileName.substring(startPos, pos);
-  }
 
-  static String getScriptPathFromArg(String arg, String scriptNamePrefix) {
-    if (arg == null || arg.isEmpty()) {
-      return null;
+    private static void initializeOOMENotifier(FlagAccess flags) {
+        try {
+            String onOutOfMemoryVal = flags.getValue("OnOutOfMemoryError");
+
+            String notifierScript = getScript("dd_oome_notifier");
+
+            if (onOutOfMemoryVal == null || onOutOfMemoryVal.isEmpty()) {
+                onOutOfMemoryVal = notifierScript;
+            } else if (!onOutOfMemoryVal.contains("dd_oome_notifier")) {
+                // we can chain scripts so let's preserve the original value in addition to our oome tracker
+                onOutOfMemoryVal = notifierScript + "; " + onOutOfMemoryVal;
+            } else {
+                StringTokenizer st = new StringTokenizer(onOutOfMemoryVal, ";");
+                while (st.hasMoreTokens()) {
+                    String part = st.nextToken();
+                    if (part.trim().contains("dd_oome_notifier")) {
+                        // reuse the existing script name
+                        notifierScript = part.trim();
+                        break;
+                    }
+                }
+            }
+
+            if (OOMENotifierScriptInitializer.initialize(notifierScript)) {
+                // set the JVM flag only if the script was successfully initialized
+                boolean rslt = flags.setValue("OnOutOfMemoryError", onOutOfMemoryVal);
+                if (!rslt && LOG.isDebugEnabled()) {
+                    LOG.debug(
+                            SEND_TELEMETRY,
+                            "Unable to set OnOutOfMemoryError flag to {}. OOME tracking may not work.",
+                            onOutOfMemoryVal);
+                }
+            }
+        } catch (Throwable t) {
+            LOG.warn(
+                    SEND_TELEMETRY,
+                    "Unexpected exception while initializing OOME notifier. OOMEs will not be tracked.",
+                    t);
+        }
     }
-    int idx = arg.toLowerCase().indexOf(scriptNamePrefix);
-    if (idx < 0) {
-      // the script name is not present in the value, so we cannot extract the path
-      return null;
+
+    private static String getScript(String scriptName) {
+        return TempLocationManager.getInstance().getTempDir().toString() + "/" + getScriptFileName(scriptName) + " %p";
     }
-    // the script name is present, so we can extract the path
 
-    char ch;
-    idx += scriptNamePrefix.length();
-    while (idx < arg.length() && (ch = arg.charAt(idx)) != ' ' && ch != ';') {
-      idx++;
+    private static String getScriptFileName(String scriptName) {
+        return scriptName + "." + (OperatingSystem.isWindows() ? "bat" : "sh");
     }
-    String path = arg.substring(0, idx);
-    idx = path.lastIndexOf(';'); // the arg may contain multiple commands separated by semicolons
-    if (idx >= 0) {
-      // if there is a semicolon, we take the part after it and trim it
-      path = path.substring(idx + 1).trim();
+
+    private static final Set<PosixFilePermission> GROUP_WORLD_BITS = EnumSet.of(
+            PosixFilePermission.GROUP_READ,
+            PosixFilePermission.GROUP_WRITE,
+            PosixFilePermission.GROUP_EXECUTE,
+            PosixFilePermission.OTHERS_READ,
+            PosixFilePermission.OTHERS_WRITE,
+            PosixFilePermission.OTHERS_EXECUTE);
+
+    private static final Set<PosixFilePermission> GROUP_WORLD_WRITE_BITS =
+            EnumSet.of(PosixFilePermission.GROUP_WRITE, PosixFilePermission.OTHERS_WRITE);
+
+    /**
+     * Returns {@code true} when {@code f} is owned by the current JVM user and has no group/world
+     * <em>write</em> bit set; on non-POSIX file systems always returns {@code true}. Stray
+     * group/world <em>read</em> or <em>execute</em> bits (e.g. the {@code 0755} a pre-upgrade version
+     * of this initializer, which did not lock down permissions, could have left behind) do not
+     * disqualify the path here: those bits are safe to tighten in place with {@link
+     * #stripGroupAndWorldBits(File)} rather than treating the path as untrusted. A group/world write
+     * bit is still treated as a sign of possible tampering and causes this method to return {@code
+     * false}.
+     */
+    static boolean isSafeToRepair(File f) {
+        return isOwnedWithoutBits(f, GROUP_WORLD_WRITE_BITS);
     }
-    return path;
-  }
-
-  /**
-   * If the value of `-XX:OnError` JVM argument is referring to `dd_crash_uploader.sh` or
-   * `dd_crash_uploader.bat` and the script does not exist it will be created and prefilled with
-   * code ensuring the error log upload will be triggered on JVM crash.
-   */
-  private static void initializeCrashUploader(FlagAccess flags) {
-    try {
-      String onErrorVal = flags.getValue("OnError");
-      String onErrorFile = flags.getValue("ErrorFile");
-
-      String uploadScript = getScript("dd_crash_uploader");
-      if (onErrorVal == null || onErrorVal.isEmpty()) {
-        onErrorVal = uploadScript;
-      } else if (!onErrorVal.contains("dd_crash_uploader")) {
-        // we can chain scripts so let's preserve the original value in addition to our crash
-        // uploader
-        onErrorVal = uploadScript + "; " + onErrorVal;
-      } else {
-        StringTokenizer st = new StringTokenizer(onErrorVal, ";");
-        while (st.hasMoreTokens()) {
-          String part = st.nextToken();
-          if (part.trim().contains("dd_crash_uploader")) {
-            // reuse the existing script name
-            uploadScript = part.trim().replace(" %p", "");
-            break;
-          }
+
+    /**
+     * Returns {@code true} when {@code f} is owned by the current JVM user and has none of {@code
+     * forbiddenBits} set. On non-POSIX file systems always returns {@code true}.
+     */
+    private static boolean isOwnedWithoutBits(File f, Set<PosixFilePermission> forbiddenBits) {
+        if (OperatingSystem.isWindows()) {
+            return true;
         }
-      }
-
-      if (CrashUploaderScriptInitializer.initialize(uploadScript, onErrorFile)) {
-        // set the JVM flag only if the script was successfully initialized
-        boolean rslt = flags.setValue("OnError", onErrorVal);
-        if (!rslt && LOG.isDebugEnabled()) {
-          LOG.debug(
-              SEND_TELEMETRY,
-              "Unable to set OnError flag to {}. Crash-tracking may not work.",
-              onErrorVal);
+        try {
+            Path path = f.toPath();
+            if (!isJvmOwner(path)) {
+                return false;
+            }
+            Set<PosixFilePermission> perms = Files.getPosixFilePermissions(path);
+            return perms.stream().noneMatch(forbiddenBits::contains);
+        } catch (IOException | IllegalStateException | UnsupportedOperationException e) {
+            LOG.debug("Unable to check ownership/permissions for {}: {}", f, e.getMessage());
+            return false;
         }
-      }
-    } catch (Throwable t) {
-      LOG.warn(
-          SEND_TELEMETRY,
-          "Unexpected exception while creating custom crash upload script. Crash tracking will not work properly.",
-          t);
     }
-  }
-
-  private static void initializeOOMENotifier(FlagAccess flags) {
-    try {
-      String onOutOfMemoryVal = flags.getValue("OnOutOfMemoryError");
-
-      String notifierScript = getScript("dd_oome_notifier");
-
-      if (onOutOfMemoryVal == null || onOutOfMemoryVal.isEmpty()) {
-        onOutOfMemoryVal = notifierScript;
-      } else if (!onOutOfMemoryVal.contains("dd_oome_notifier")) {
-        // we can chain scripts so let's preserve the original value in addition to our oome tracker
-        onOutOfMemoryVal = notifierScript + "; " + onOutOfMemoryVal;
-      } else {
-        StringTokenizer st = new StringTokenizer(onOutOfMemoryVal, ";");
-        while (st.hasMoreTokens()) {
-          String part = st.nextToken();
-          if (part.trim().contains("dd_oome_notifier")) {
-            // reuse the existing script name
-            notifierScript = part.trim();
-            break;
-          }
-        }
-      }
-
-      if (OOMENotifierScriptInitializer.initialize(notifierScript)) {
-        // set the JVM flag only if the script was successfully initialized
-        boolean rslt = flags.setValue("OnOutOfMemoryError", onOutOfMemoryVal);
-        if (!rslt && LOG.isDebugEnabled()) {
-          LOG.debug(
-              SEND_TELEMETRY,
-              "Unable to set OnOutOfMemoryError flag to {}. OOME tracking may not work.",
-              onOutOfMemoryVal);
-        }
-      }
-    } catch (Throwable t) {
-      LOG.warn(
-          SEND_TELEMETRY,
-          "Unexpected exception while initializing OOME notifier. OOMEs will not be tracked.",
-          t);
+
+    private static boolean isJvmOwner(Path path) throws IOException {
+        UserPrincipal owner = Files.getOwner(path);
+        UserPrincipal jvmUser = Files.getOwner(TempLocationManager.getInstance().getTempDir());
+        return jvmUser.equals(owner);
     }
-  }
-
-  private static String getScript(String scriptName) {
-    return TempLocationManager.getInstance().getTempDir().toString()
-        + "/"
-        + getScriptFileName(scriptName)
-        + " %p";
-  }
-
-  private static String getScriptFileName(String scriptName) {
-    return scriptName + "." + (OperatingSystem.isWindows() ? "bat" : "sh");
-  }
-
-  private static final Set<PosixFilePermission> GROUP_WORLD_BITS =
-      EnumSet.of(
-          PosixFilePermission.GROUP_READ,
-          PosixFilePermission.GROUP_WRITE,
-          PosixFilePermission.GROUP_EXECUTE,
-          PosixFilePermission.OTHERS_READ,
-          PosixFilePermission.OTHERS_WRITE,
-          PosixFilePermission.OTHERS_EXECUTE);
-
-  private static final Set<PosixFilePermission> GROUP_WORLD_WRITE_BITS =
-      EnumSet.of(PosixFilePermission.GROUP_WRITE, PosixFilePermission.OTHERS_WRITE);
-
-  /**
-   * Returns {@code true} when {@code f} is owned by the current JVM user and has no group/world
-   * <em>write</em> bit set; on non-POSIX file systems always returns {@code true}. Stray
-   * group/world <em>read</em> or <em>execute</em> bits (e.g. the {@code 0755} a pre-upgrade version
-   * of this initializer, which did not lock down permissions, could have left behind) do not
-   * disqualify the path here: those bits are safe to tighten in place with {@link
-   * #stripGroupAndWorldBits(File)} rather than treating the path as untrusted. A group/world write
-   * bit is still treated as a sign of possible tampering and causes this method to return {@code
-   * false}.
-   */
-  static boolean isSafeToRepair(File f) {
-    return isOwnedWithoutBits(f, GROUP_WORLD_WRITE_BITS);
-  }
-
-  /**
-   * Returns {@code true} when {@code f} is owned by the current JVM user and has none of {@code
-   * forbiddenBits} set. On non-POSIX file systems always returns {@code true}.
-   */
-  private static boolean isOwnedWithoutBits(File f, Set<PosixFilePermission> forbiddenBits) {
-    if (OperatingSystem.isWindows()) {
-      return true;
+
+    /**
+     * Sets read/write/execute for the owner only on a freshly created script directory (effective
+     * {@code 0700}, stripping any group/world bits left over from the process umask). Returns {@code
+     * true} when the permissions were applied; on failure the caller must treat the directory as
+     * unusable.
+     */
+    static boolean restrictDirectoryToOwnerOnly(File dir) {
+        return setOwnerOnlyPermissions(dir, true);
     }
-    try {
-      Path path = f.toPath();
-      if (!isJvmOwner(path)) {
-        return false;
-      }
-      Set<PosixFilePermission> perms = Files.getPosixFilePermissions(path);
-      return perms.stream().noneMatch(forbiddenBits::contains);
-    } catch (IOException | IllegalStateException | UnsupportedOperationException e) {
-      LOG.debug("Unable to check ownership/permissions for {}: {}", f, e.getMessage());
-      return false;
+
+    /**
+     * Sets read/execute (but not write) for the owner only on a freshly created script file. Returns
+     * {@code true} when the permissions were applied; on failure the caller must discard the file.
+     */
+    static boolean restrictScriptToOwnerOnly(File scriptFile) {
+        return setOwnerOnlyPermissions(scriptFile, false);
     }
-  }
-
-  private static boolean isJvmOwner(Path path) throws IOException {
-    UserPrincipal owner = Files.getOwner(path);
-    UserPrincipal jvmUser = Files.getOwner(TempLocationManager.getInstance().getTempDir());
-    return jvmUser.equals(owner);
-  }
-
-  /**
-   * Sets read/write/execute for the owner only on a freshly created script directory (effective
-   * {@code 0700}, stripping any group/world bits left over from the process umask). Returns {@code
-   * true} when the permissions were applied; on failure the caller must treat the directory as
-   * unusable.
-   */
-  static boolean restrictDirectoryToOwnerOnly(File dir) {
-    return setOwnerOnlyPermissions(dir, true);
-  }
-
-  /**
-   * Sets read/execute (but not write) for the owner only on a freshly created script file. Returns
-   * {@code true} when the permissions were applied; on failure the caller must discard the file.
-   */
-  static boolean restrictScriptToOwnerOnly(File scriptFile) {
-    return setOwnerOnlyPermissions(scriptFile, false);
-  }
-
-  /**
-   * Applies owner-only permissions to {@code f}: all group/world bits are cleared and the owner
-   * keeps read and execute, plus write iff {@code ownerWritable}. On POSIX file systems this is a
-   * single atomic operation whose failure makes the caller refuse the path. On file systems without
-   * POSIX permission bits (e.g. Windows) there is nothing to verify, so restriction is best-effort
-   * through the legacy API and the method returns {@code true} even on partial failure.
-   */
-  private static boolean setOwnerOnlyPermissions(File f, boolean ownerWritable) {
-    Path path = f.toPath();
-    if (path.getFileSystem().supportedFileAttributeViews().contains("posix")) {
-      try {
-        Set<PosixFilePermission> perms =
-            EnumSet.of(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_EXECUTE);
+
+    /**
+     * Applies owner-only permissions to {@code f}: all group/world bits are cleared and the owner
+     * keeps read and execute, plus write iff {@code ownerWritable}. On POSIX file systems this is a
+     * single atomic operation whose failure makes the caller refuse the path. On file systems without
+     * POSIX permission bits (e.g. Windows) there is nothing to verify, so restriction is best-effort
+     * through the legacy API and the method returns {@code true} even on partial failure.
+     */
+    private static boolean setOwnerOnlyPermissions(File f, boolean ownerWritable) {
+        Path path = f.toPath();
+        if (path.getFileSystem().supportedFileAttributeViews().contains("posix")) {
+            try {
+                Set<PosixFilePermission> perms =
+                        EnumSet.of(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_EXECUTE);
+                if (ownerWritable) {
+                    perms.add(PosixFilePermission.OWNER_WRITE);
+                }
+                Files.setPosixFilePermissions(path, perms);
+                return true;
+            } catch (IOException | IllegalStateException | UnsupportedOperationException e) {
+                LOG.debug("Unable to restrict permissions for {}: {}", f, e.getMessage());
+                return false;
+            }
+        }
+        boolean ok = f.setReadable(false, false);
+        ok &= f.setWritable(false, false);
+        ok &= f.setExecutable(false, false);
+        ok &= f.setReadable(true, true);
         if (ownerWritable) {
-          perms.add(PosixFilePermission.OWNER_WRITE);
+            ok &= f.setWritable(true, true);
+        }
+        ok &= f.setExecutable(true, true);
+        if (!ok) {
+            LOG.debug("Unable to fully restrict permissions for {} on a file system without POSIX support", f);
         }
-        Files.setPosixFilePermissions(path, perms);
         return true;
-      } catch (IOException | IllegalStateException | UnsupportedOperationException e) {
-        LOG.debug("Unable to restrict permissions for {}: {}", f, e.getMessage());
-        return false;
-      }
-    }
-    boolean ok = f.setReadable(false, false);
-    ok &= f.setWritable(false, false);
-    ok &= f.setExecutable(false, false);
-    ok &= f.setReadable(true, true);
-    if (ownerWritable) {
-      ok &= f.setWritable(true, true);
-    }
-    ok &= f.setExecutable(true, true);
-    if (!ok) {
-      LOG.debug(
-          "Unable to fully restrict permissions for {} on a file system without POSIX support", f);
     }
-    return true;
-  }
-
-  /**
-   * Removes any group/world permission bits from {@code f} while leaving the owner's own bits
-   * untouched, in a single atomic operation. Unlike {@link #restrictDirectoryToOwnerOnly(File)},
-   * this never adds a permission (e.g. owner write) that {@code f} did not already have, so a path
-   * an operator deliberately made non-writable for the owner stays non-writable after repair.
-   * Returns {@code true} when the bits were applied or nothing needed stripping; on failure the
-   * caller must treat {@code f} as unusable. On Windows this is a no-op that returns {@code true}.
-   */
-  static boolean stripGroupAndWorldBits(File f) {
-    if (OperatingSystem.isWindows()) {
-      return true;
-    }
-    try {
-      Path path = f.toPath();
-      Set<PosixFilePermission> perms = EnumSet.noneOf(PosixFilePermission.class);
-      perms.addAll(Files.getPosixFilePermissions(path));
-      perms.removeAll(GROUP_WORLD_BITS);
-      Files.setPosixFilePermissions(path, perms);
-      return true;
-    } catch (IOException | IllegalStateException | UnsupportedOperationException e) {
-      LOG.debug("Unable to strip group/world permissions for {}: {}", f, e.getMessage());
-      return false;
+
+    /**
+     * Removes any group/world permission bits from {@code f} while leaving the owner's own bits
+     * untouched, in a single atomic operation. Unlike {@link #restrictDirectoryToOwnerOnly(File)},
+     * this never adds a permission (e.g. owner write) that {@code f} did not already have, so a path
+     * an operator deliberately made non-writable for the owner stays non-writable after repair.
+     * Returns {@code true} when the bits were applied or nothing needed stripping; on failure the
+     * caller must treat {@code f} as unusable. On Windows this is a no-op that returns {@code true}.
+     */
+    static boolean stripGroupAndWorldBits(File f) {
+        if (OperatingSystem.isWindows()) {
+            return true;
+        }
+        try {
+            Path path = f.toPath();
+            Set<PosixFilePermission> perms = EnumSet.noneOf(PosixFilePermission.class);
+            perms.addAll(Files.getPosixFilePermissions(path));
+            perms.removeAll(GROUP_WORLD_BITS);
+            Files.setPosixFilePermissions(path, perms);
+            return true;
+        } catch (IOException | IllegalStateException | UnsupportedOperationException e) {
+            LOG.debug("Unable to strip group/world permissions for {}: {}", f, e.getMessage());
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/OOMENotifier.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/OOMENotifier.java
index 0013c4062dd..d1f11ceab60 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/OOMENotifier.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/OOMENotifier.java
@@ -9,22 +9,17 @@
 import org.slf4j.LoggerFactory;
 
 public final class OOMENotifier {
-  private static final Logger log = LoggerFactory.getLogger(OOMENotifier.class);
+    private static final Logger log = LoggerFactory.getLogger(OOMENotifier.class);
 
-  // This method is called via CLI so we don't need to be paranoid about the forbiddend APIs
-  @SuppressForbidden
-  public static void sendOomeEvent(String taglist) {
-    try (StatsDClient client =
-        statsDClientManager().statsDClient(null, null, null, null, null, false)) {
-      String[] tags = taglist.split(",");
-      client.recordEvent(
-          "error",
-          "java",
-          "OutOfMemoryError",
-          "Java process encountered out of memory error",
-          tags);
-      log.info("OOME event sent");
-      LockSupport.parkNanos(2_000_000_000L); // wait 2s to allow statsd client flushing the event
+    // This method is called via CLI so we don't need to be paranoid about the forbiddend APIs
+    @SuppressForbidden
+    public static void sendOomeEvent(String taglist) {
+        try (StatsDClient client = statsDClientManager().statsDClient(null, null, null, null, null, false)) {
+            String[] tags = taglist.split(",");
+            client.recordEvent(
+                    "error", "java", "OutOfMemoryError", "Java process encountered out of memory error", tags);
+            log.info("OOME event sent");
+            LockSupport.parkNanos(2_000_000_000L); // wait 2s to allow statsd client flushing the event
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/OOMENotifierScriptInitializer.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/OOMENotifierScriptInitializer.java
index dfd19809e43..6c478766e68 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/OOMENotifierScriptInitializer.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/OOMENotifierScriptInitializer.java
@@ -21,173 +21,169 @@
 import java.util.Set;
 
 public final class OOMENotifierScriptInitializer {
-  private static final String OOME_NOTIFIER_SCRIPT_PREFIX = "dd_oome_notifier.";
+    private static final String OOME_NOTIFIER_SCRIPT_PREFIX = "dd_oome_notifier.";
 
-  private OOMENotifierScriptInitializer() {}
+    private OOMENotifierScriptInitializer() {}
 
-  @VisibleForTesting
-  static boolean initialize(String onOutOfMemoryVal) {
-    if (onOutOfMemoryVal == null || onOutOfMemoryVal.isEmpty()) {
-      LOG.debug(
-          SEND_TELEMETRY,
-          "'-XX:OnOutOfMemoryError' argument was not provided. OOME tracking is disabled.");
-      return false;
-    }
-    File scriptFile = getOOMEScriptFile(onOutOfMemoryVal);
-    if (scriptFile == null) {
-      LOG.error(
-          SEND_TELEMETRY,
-          "OOME notifier script value ({}) does not follow the expected format: <path>/dd_oome_notifier.(sh|bat) %p. OOME tracking is disabled.",
-          onOutOfMemoryVal);
-      return false;
-    }
-    String agentJar = findAgentJar();
-    if (agentJar == null) {
-      LOG.warn(
-          SEND_TELEMETRY,
-          "Unable to locate the agent jar. OOME notification will not work properly.");
-      return false;
-    }
-    if (!copyOOMEscript(scriptFile)) {
-      return false;
+    @VisibleForTesting
+    static boolean initialize(String onOutOfMemoryVal) {
+        if (onOutOfMemoryVal == null || onOutOfMemoryVal.isEmpty()) {
+            LOG.debug(SEND_TELEMETRY, "'-XX:OnOutOfMemoryError' argument was not provided. OOME tracking is disabled.");
+            return false;
+        }
+        File scriptFile = getOOMEScriptFile(onOutOfMemoryVal);
+        if (scriptFile == null) {
+            LOG.error(
+                    SEND_TELEMETRY,
+                    "OOME notifier script value ({}) does not follow the expected format: <path>/dd_oome_notifier.(sh|bat) %p. OOME tracking is disabled.",
+                    onOutOfMemoryVal);
+            return false;
+        }
+        String agentJar = findAgentJar();
+        if (agentJar == null) {
+            LOG.warn(SEND_TELEMETRY, "Unable to locate the agent jar. OOME notification will not work properly.");
+            return false;
+        }
+        if (!copyOOMEscript(scriptFile)) {
+            return false;
+        }
+        writeConfigToPath(scriptFile, "agent", agentJar);
+        return true;
     }
-    writeConfigToPath(scriptFile, "agent", agentJar);
-    return true;
-  }
 
-  private static File getOOMEScriptFile(String onOutOfMemoryVal) {
-    String path = getScriptPathFromArg(onOutOfMemoryVal, OOME_NOTIFIER_SCRIPT_PREFIX);
-    return path == null ? null : new File(path);
-  }
+    private static File getOOMEScriptFile(String onOutOfMemoryVal) {
+        String path = getScriptPathFromArg(onOutOfMemoryVal, OOME_NOTIFIER_SCRIPT_PREFIX);
+        return path == null ? null : new File(path);
+    }
 
-  private static boolean copyOOMEscript(File scriptFile) {
-    File scriptDirectory = scriptFile.getParentFile();
+    private static boolean copyOOMEscript(File scriptFile) {
+        File scriptDirectory = scriptFile.getParentFile();
 
-    if (scriptDirectory.exists()) {
-      if (!isSafeToRepair(scriptDirectory)) {
-        LOG.warn(
-            SEND_TELEMETRY,
-            "Untrusted OOME script folder {} (wrong owner or group/world-writable). OOME notification will not work properly.",
-            scriptDirectory);
-        return false;
-      }
-      // owned by us but possibly left over from an older, less restrictive version: strip any
-      // stray group/world bits without touching the owner's own bits, so a directory an operator
-      // deliberately made non-writable stays non-writable
-      if (!stripGroupAndWorldBits(scriptDirectory)) {
-        LOG.warn(
-            SEND_TELEMETRY,
-            "Unable to strip group/world permissions from OOME script folder {}. OOME notification will not work properly.",
-            scriptDirectory);
-        return false;
-      }
-      // cleanup all stale process-specific generated files in the parent folder of the given OOME
-      // notifier script
-      runScriptCleanup(scriptDirectory);
-      if (!scriptDirectory.canWrite()) {
-        LOG.warn(
-            SEND_TELEMETRY,
-            "Read only directory {}. OOME notification will not work properly.",
-            scriptDirectory);
-        return false;
-      }
-    } else {
-      if (!scriptDirectory.mkdirs()) {
-        LOG.warn(
-            SEND_TELEMETRY,
-            "Failed to create writable OOME script folder {}. OOME notification will not work properly.",
-            scriptDirectory);
-        return false;
-      }
-      if (!restrictDirectoryToOwnerOnly(scriptDirectory)) {
-        LOG.warn(
-            SEND_TELEMETRY,
-            "Unable to restrict OOME script folder {} to owner-only permissions. OOME notification will not work properly.",
-            scriptDirectory);
-        return false;
-      }
-    }
+        if (scriptDirectory.exists()) {
+            if (!isSafeToRepair(scriptDirectory)) {
+                LOG.warn(
+                        SEND_TELEMETRY,
+                        "Untrusted OOME script folder {} (wrong owner or group/world-writable). OOME notification will not work properly.",
+                        scriptDirectory);
+                return false;
+            }
+            // owned by us but possibly left over from an older, less restrictive version: strip any
+            // stray group/world bits without touching the owner's own bits, so a directory an operator
+            // deliberately made non-writable stays non-writable
+            if (!stripGroupAndWorldBits(scriptDirectory)) {
+                LOG.warn(
+                        SEND_TELEMETRY,
+                        "Unable to strip group/world permissions from OOME script folder {}. OOME notification will not work properly.",
+                        scriptDirectory);
+                return false;
+            }
+            // cleanup all stale process-specific generated files in the parent folder of the given OOME
+            // notifier script
+            runScriptCleanup(scriptDirectory);
+            if (!scriptDirectory.canWrite()) {
+                LOG.warn(
+                        SEND_TELEMETRY,
+                        "Read only directory {}. OOME notification will not work properly.",
+                        scriptDirectory);
+                return false;
+            }
+        } else {
+            if (!scriptDirectory.mkdirs()) {
+                LOG.warn(
+                        SEND_TELEMETRY,
+                        "Failed to create writable OOME script folder {}. OOME notification will not work properly.",
+                        scriptDirectory);
+                return false;
+            }
+            if (!restrictDirectoryToOwnerOnly(scriptDirectory)) {
+                LOG.warn(
+                        SEND_TELEMETRY,
+                        "Unable to restrict OOME script folder {} to owner-only permissions. OOME notification will not work properly.",
+                        scriptDirectory);
+                return false;
+            }
+        }
 
-    try {
-      // do not overwrite existing
-      if (!scriptFile.exists()) {
         try {
-          copyStream(getOomeNotifierTemplate(), scriptFile);
+            // do not overwrite existing
+            if (!scriptFile.exists()) {
+                try {
+                    copyStream(getOomeNotifierTemplate(), scriptFile);
+                } catch (IOException e) {
+                    // fail closed: never leave a partially written script that a later JVM start would
+                    // silently reuse (it passes isSafeToRepair because it carries no group/world write bits)
+                    scriptFile.delete();
+                    throw e;
+                }
+                // fail closed: never leave a freshly written script we could not lock down
+                if (!restrictScriptToOwnerOnly(scriptFile)) {
+                    scriptFile.delete();
+                    throw new IOException("Unable to restrict OOME script permissions");
+                }
+            } else {
+                // owned by us but possibly left over from an older, less restrictive version: repair in
+                // place by stripping stray group/world bits, preserving the owner's own bits
+                if (!isSafeToRepair(scriptFile)) {
+                    LOG.warn(
+                            SEND_TELEMETRY,
+                            "Untrusted OOME script {} (wrong owner or group/world-writable). OOME notification will not work properly.",
+                            scriptFile);
+                    return false;
+                }
+                if (!stripGroupAndWorldBits(scriptFile)) {
+                    LOG.warn(
+                            SEND_TELEMETRY,
+                            "Unable to strip group/world permissions from OOME script {}. OOME notification will not work properly.",
+                            scriptFile);
+                    return false;
+                }
+            }
         } catch (IOException e) {
-          // fail closed: never leave a partially written script that a later JVM start would
-          // silently reuse (it passes isSafeToRepair because it carries no group/world write bits)
-          scriptFile.delete();
-          throw e;
-        }
-        // fail closed: never leave a freshly written script we could not lock down
-        if (!restrictScriptToOwnerOnly(scriptFile)) {
-          scriptFile.delete();
-          throw new IOException("Unable to restrict OOME script permissions");
-        }
-      } else {
-        // owned by us but possibly left over from an older, less restrictive version: repair in
-        // place by stripping stray group/world bits, preserving the owner's own bits
-        if (!isSafeToRepair(scriptFile)) {
-          LOG.warn(
-              SEND_TELEMETRY,
-              "Untrusted OOME script {} (wrong owner or group/world-writable). OOME notification will not work properly.",
-              scriptFile);
-          return false;
-        }
-        if (!stripGroupAndWorldBits(scriptFile)) {
-          LOG.warn(
-              SEND_TELEMETRY,
-              "Unable to strip group/world permissions from OOME script {}. OOME notification will not work properly.",
-              scriptFile);
-          return false;
+            LOG.warn(
+                    SEND_TELEMETRY,
+                    "Failed to copy OOME script {} ({}). OOME notification will not work properly.",
+                    scriptFile,
+                    e.getMessage());
+            return false;
         }
-      }
-    } catch (IOException e) {
-      LOG.warn(
-          SEND_TELEMETRY,
-          "Failed to copy OOME script {} ({}). OOME notification will not work properly.",
-          scriptFile,
-          e.getMessage());
-      return false;
+        return true;
     }
-    return true;
-  }
 
-  private static void copyStream(InputStream in, File dest) throws IOException {
-    try (InputStream src = in;
-        FileOutputStream out = new FileOutputStream(dest)) {
-      byte[] buf = new byte[4096];
-      int n;
-      while ((n = src.read(buf)) >= 0) {
-        out.write(buf, 0, n);
-      }
+    private static void copyStream(InputStream in, File dest) throws IOException {
+        try (InputStream src = in;
+                FileOutputStream out = new FileOutputStream(dest)) {
+            byte[] buf = new byte[4096];
+            int n;
+            while ((n = src.read(buf)) >= 0) {
+                out.write(buf, 0, n);
+            }
+        }
     }
-  }
 
-  private static void runScriptCleanup(File dir) {
-    if (!dir.exists()) {
-      return;
-    }
-    File[] files = dir.listFiles();
-    if (files == null) {
-      return;
-    }
-    Set<String> pidSet = null;
-    for (File file : files) {
-      if (!file.isFile()) {
-        continue;
-      }
-      String pid = pidFromSpecialFileName(file.getName());
-      if (pid != null && !pid.equals(PidHelper.getPid())) {
-        if (pidSet == null) {
-          // lazy init: forks jps to get the list of running Java PIDs
-          pidSet = PidHelper.getJavaPids();
+    private static void runScriptCleanup(File dir) {
+        if (!dir.exists()) {
+            return;
+        }
+        File[] files = dir.listFiles();
+        if (files == null) {
+            return;
         }
-        if (!pidSet.contains(pid)) {
-          LOG.debug("Cleaning process specific file {}", file);
-          file.delete();
+        Set<String> pidSet = null;
+        for (File file : files) {
+            if (!file.isFile()) {
+                continue;
+            }
+            String pid = pidFromSpecialFileName(file.getName());
+            if (pid != null && !pid.equals(PidHelper.getPid())) {
+                if (pidSet == null) {
+                    // lazy init: forks jps to get the list of running Java PIDs
+                    pidSet = PidHelper.getJavaPids();
+                }
+                if (!pidSet.contains(pid)) {
+                    LOG.debug("Cleaning process specific file {}", file);
+                    file.delete();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/BuildIdCollector.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/BuildIdCollector.java
index cc55dfe5c29..5f79f67faad 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/BuildIdCollector.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/BuildIdCollector.java
@@ -49,146 +49,143 @@
  * </ul>
  */
 public class BuildIdCollector {
-  static final Logger LOGGER = LoggerFactory.getLogger(BuildIdCollector.class);
-
-  /** Thread-safe map: accessed by both producer and consumer threads. */
-  private final Map<String, BuildInfo> libraryBuildInfo = new ConcurrentHashMap<>();
-
-  /** Tracks processed filenames. Only accessed from producer thread - no synchronization needed. */
-  private final Set<String> processed = new HashSet<>();
-
-  /** Ensures exactly one collector thread is started. */
-  private final AtomicBoolean collecting = new AtomicBoolean(false);
-
-  /** SPSC queue: one producer (crash parsing), one consumer (collector thread). */
-  private final MessagePassingQueue<Path> workQueue = Queues.spscArrayQueue(Short.MAX_VALUE);
-
-  /** Signals when collection is complete. */
-  private final CountDownLatch latch = new CountDownLatch(1);
-
-  /**
-   * Consumer thread that processes the work queue and extracts build IDs.
-   *
-   * <p><b>Threading:</b> Runs in a single background thread. Only one instance is ever created,
-   * guaranteed by the {@code collecting.compareAndSet(false, true)} check in {@link
-   * #resolveBuildId(Path)}.
-   *
-   * <p>Polls the {@code workQueue} until either:
-   *
-   * <ul>
-   *   <li>The deadline is reached, or
-   *   <li>The {@code collecting} flag is set to false (via {@link #awaitCollectionDone(int)}) and
-   *       the queue is empty
-   * </ul>
-   */
-  class Collector implements Runnable {
-    private final BuildIdExtractor extractor = BuildIdExtractor.create();
-    private final long deadline;
-
-    Collector(long timeout, TimeUnit unit) {
-      this.deadline = unit.toNanos(timeout) + System.nanoTime();
-    }
-
-    @Override
-    public void run() {
-      while (System.nanoTime() <= deadline) {
-        final Path path = workQueue.poll();
-        if (path == null) {
-          if (!collecting.get()) {
-            break;
-          }
-          LockSupport.parkNanos(MILLISECONDS.toNanos(50));
-          continue;
+    static final Logger LOGGER = LoggerFactory.getLogger(BuildIdCollector.class);
+
+    /** Thread-safe map: accessed by both producer and consumer threads. */
+    private final Map<String, BuildInfo> libraryBuildInfo = new ConcurrentHashMap<>();
+
+    /** Tracks processed filenames. Only accessed from producer thread - no synchronization needed. */
+    private final Set<String> processed = new HashSet<>();
+
+    /** Ensures exactly one collector thread is started. */
+    private final AtomicBoolean collecting = new AtomicBoolean(false);
+
+    /** SPSC queue: one producer (crash parsing), one consumer (collector thread). */
+    private final MessagePassingQueue<Path> workQueue = Queues.spscArrayQueue(Short.MAX_VALUE);
+
+    /** Signals when collection is complete. */
+    private final CountDownLatch latch = new CountDownLatch(1);
+
+    /**
+     * Consumer thread that processes the work queue and extracts build IDs.
+     *
+     * <p><b>Threading:</b> Runs in a single background thread. Only one instance is ever created,
+     * guaranteed by the {@code collecting.compareAndSet(false, true)} check in {@link
+     * #resolveBuildId(Path)}.
+     *
+     * <p>Polls the {@code workQueue} until either:
+     *
+     * <ul>
+     *   <li>The deadline is reached, or
+     *   <li>The {@code collecting} flag is set to false (via {@link #awaitCollectionDone(int)}) and
+     *       the queue is empty
+     * </ul>
+     */
+    class Collector implements Runnable {
+        private final BuildIdExtractor extractor = BuildIdExtractor.create();
+        private final long deadline;
+
+        Collector(long timeout, TimeUnit unit) {
+            this.deadline = unit.toNanos(timeout) + System.nanoTime();
         }
-        final String fileName = path.getFileName().toString();
-        LOGGER.debug("Resolving build id for {} against {}", fileName, path);
-        final String buildId = extractor.extractBuildId(path);
-        if (buildId != null) {
-          LOGGER.debug("Found build id {} for library {}", buildId, fileName);
-          libraryBuildInfo.put(
-              fileName, new BuildInfo(buildId, extractor.buildIdType(), extractor.fileType()));
+
+        @Override
+        public void run() {
+            while (System.nanoTime() <= deadline) {
+                final Path path = workQueue.poll();
+                if (path == null) {
+                    if (!collecting.get()) {
+                        break;
+                    }
+                    LockSupport.parkNanos(MILLISECONDS.toNanos(50));
+                    continue;
+                }
+                final String fileName = path.getFileName().toString();
+                LOGGER.debug("Resolving build id for {} against {}", fileName, path);
+                final String buildId = extractor.extractBuildId(path);
+                if (buildId != null) {
+                    LOGGER.debug("Found build id {} for library {}", buildId, fileName);
+                    libraryBuildInfo.put(
+                            fileName, new BuildInfo(buildId, extractor.buildIdType(), extractor.fileType()));
+                }
+            }
+            latch.countDown();
         }
-      }
-      latch.countDown();
-    }
-  }
-
-  /**
-   * Registers a library filename as needing build ID resolution.
-   *
-   * <p>Called from producer thread (crash parsing flow) before collection starts.
-   *
-   * @param filename the library filename to track
-   */
-  public void addUnprocessedLibrary(String filename) {
-    if (!collecting.get()) {
-      libraryBuildInfo.putIfAbsent(filename, EMPTY);
     }
-  }
-
-  /**
-   * Enqueues a library path for build ID extraction.
-   *
-   * <p><b>Threading:</b> This method is called exclusively from the producer thread (crash parsing
-   * flow). It starts the collector thread on first invocation and enqueues work items.
-   *
-   * <p>The {@code processed} set is only accessed here (producer thread), so no synchronization is
-   * needed for it.
-   *
-   * @param path the path to the library file
-   */
-  public void resolveBuildId(Path path) {
-    if (collecting.compareAndSet(false, true)) {
-      AgentTaskScheduler.get().execute(new Collector(5, SECONDS));
-    }
-    final String filename = path.getFileName().toString();
-    if (!processed.add(filename)) {
-      return;
+
+    /**
+     * Registers a library filename as needing build ID resolution.
+     *
+     * <p>Called from producer thread (crash parsing flow) before collection starts.
+     *
+     * @param filename the library filename to track
+     */
+    public void addUnprocessedLibrary(String filename) {
+        if (!collecting.get()) {
+            libraryBuildInfo.putIfAbsent(filename, EMPTY);
+        }
     }
-    if (libraryBuildInfo.remove(filename) == null) {
-      // the library is not present in the collected ones part of the stackframe
-      LOGGER.debug(
-          "Skipping build id resolution for {} as it was not added to unprocessed", filename);
-
-    } else if (!workQueue.offer(path)) {
-      LOGGER.warn(
-          "Could not resolve the build id for library {} because the processing queue is full",
-          path);
+
+    /**
+     * Enqueues a library path for build ID extraction.
+     *
+     * <p><b>Threading:</b> This method is called exclusively from the producer thread (crash parsing
+     * flow). It starts the collector thread on first invocation and enqueues work items.
+     *
+     * <p>The {@code processed} set is only accessed here (producer thread), so no synchronization is
+     * needed for it.
+     *
+     * @param path the path to the library file
+     */
+    public void resolveBuildId(Path path) {
+        if (collecting.compareAndSet(false, true)) {
+            AgentTaskScheduler.get().execute(new Collector(5, SECONDS));
+        }
+        final String filename = path.getFileName().toString();
+        if (!processed.add(filename)) {
+            return;
+        }
+        if (libraryBuildInfo.remove(filename) == null) {
+            // the library is not present in the collected ones part of the stackframe
+            LOGGER.debug("Skipping build id resolution for {} as it was not added to unprocessed", filename);
+
+        } else if (!workQueue.offer(path)) {
+            LOGGER.warn("Could not resolve the build id for library {} because the processing queue is full", path);
+        }
     }
-  }
-
-  /**
-   * Signals that no more work will be enqueued and waits for collection to complete.
-   *
-   * <p>Called from producer thread to stop collection and wait for the collector to finish
-   * processing the queue.
-   *
-   * @param timeoutSeconds maximum time to wait for collection to complete
-   */
-  public void awaitCollectionDone(final int timeoutSeconds) {
-    if (!collecting.compareAndSet(true, false)) {
-      return;
+
+    /**
+     * Signals that no more work will be enqueued and waits for collection to complete.
+     *
+     * <p>Called from producer thread to stop collection and wait for the collector to finish
+     * processing the queue.
+     *
+     * @param timeoutSeconds maximum time to wait for collection to complete
+     */
+    public void awaitCollectionDone(final int timeoutSeconds) {
+        if (!collecting.compareAndSet(true, false)) {
+            return;
+        }
+        try {
+            if (!latch.await(timeoutSeconds, SECONDS)) {
+                LOGGER.warn("Build id collection incomplete.");
+            }
+        } catch (InterruptedException ie) {
+            Thread.currentThread().interrupt();
+            LOGGER.warn("Interrupted while waiting for build id collection to finish");
+        }
     }
-    try {
-      if (!latch.await(timeoutSeconds, SECONDS)) {
-        LOGGER.warn("Build id collection incomplete.");
-      }
-    } catch (InterruptedException ie) {
-      Thread.currentThread().interrupt();
-      LOGGER.warn("Interrupted while waiting for build id collection to finish");
+
+    /**
+     * Retrieves the build information for a library.
+     *
+     * <p>This method can be called from any thread after collection is complete. The {@link
+     * ConcurrentHashMap} ensures thread-safe reads.
+     *
+     * @param filename the library filename
+     * @return the build information, or null if not found
+     */
+    public BuildInfo getBuildInfo(String filename) {
+        return libraryBuildInfo.get(filename);
     }
-  }
-
-  /**
-   * Retrieves the build information for a library.
-   *
-   * <p>This method can be called from any thread after collection is complete. The {@link
-   * ConcurrentHashMap} ensures thread-safe reads.
-   *
-   * @param filename the library filename
-   * @return the build information, or null if not found
-   */
-  public BuildInfo getBuildInfo(String filename) {
-    return libraryBuildInfo.get(filename);
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/BuildIdExtractor.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/BuildIdExtractor.java
index 859a62b10f9..494817d96a7 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/BuildIdExtractor.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/BuildIdExtractor.java
@@ -8,35 +8,35 @@
  * library versions for symbolization of native stack traces.
  */
 public interface BuildIdExtractor {
-  /**
-   * Extracts build ID from a binary file.
-   *
-   * @param file Path to the library file
-   * @return Build ID as hex string, or null if not found or on error
-   */
-  String extractBuildId(Path file);
+    /**
+     * Extracts build ID from a binary file.
+     *
+     * @param file Path to the library file
+     * @return Build ID as hex string, or null if not found or on error
+     */
+    String extractBuildId(Path file);
 
-  /**
-   * @return the file type this extractor operates for.
-   */
-  BuildInfo.FileType fileType();
+    /**
+     * @return the file type this extractor operates for.
+     */
+    BuildInfo.FileType fileType();
 
-  /**
-   * @return the build id type this extractor is able to provide.
-   */
-  BuildInfo.BuildIdType buildIdType();
+    /**
+     * @return the build id type this extractor is able to provide.
+     */
+    BuildInfo.BuildIdType buildIdType();
 
-  /**
-   * Factory method that returns appropriate extractor for the platform.
-   *
-   * @return Platform-specific build ID extractor
-   */
-  static BuildIdExtractor create() {
-    if (OperatingSystem.isLinux()) {
-      return new ElfBuildIdExtractor();
-    } else if (OperatingSystem.isWindows()) {
-      return new PeBuildIdExtractor();
+    /**
+     * Factory method that returns appropriate extractor for the platform.
+     *
+     * @return Platform-specific build ID extractor
+     */
+    static BuildIdExtractor create() {
+        if (OperatingSystem.isLinux()) {
+            return new ElfBuildIdExtractor();
+        } else if (OperatingSystem.isWindows()) {
+            return new PeBuildIdExtractor();
+        }
+        return new NoOpBuildIdExtractor();
     }
-    return new NoOpBuildIdExtractor();
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/BuildInfo.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/BuildInfo.java
index fe4ffd41477..0f7e6dd4994 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/BuildInfo.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/BuildInfo.java
@@ -1,25 +1,25 @@
 package datadog.crashtracking.buildid;
 
 public class BuildInfo {
-  public enum BuildIdType {
-    GNU, // for ELF
-    PDB // for DLL PE
-  }
+    public enum BuildIdType {
+        GNU, // for ELF
+        PDB // for DLL PE
+    }
 
-  public enum FileType {
-    ELF,
-    PE,
-  }
+    public enum FileType {
+        ELF,
+        PE,
+    }
 
-  static final BuildInfo EMPTY = new BuildInfo(null, null, null);
+    static final BuildInfo EMPTY = new BuildInfo(null, null, null);
 
-  public final String buildId;
-  public final BuildIdType buildIdType;
-  public final FileType fileType;
+    public final String buildId;
+    public final BuildIdType buildIdType;
+    public final FileType fileType;
 
-  public BuildInfo(final String buildId, final BuildIdType buildIdType, final FileType fileType) {
-    this.buildId = buildId;
-    this.buildIdType = buildIdType;
-    this.fileType = fileType;
-  }
+    public BuildInfo(final String buildId, final BuildIdType buildIdType, final FileType fileType) {
+        this.buildId = buildId;
+        this.buildIdType = buildIdType;
+        this.fileType = fileType;
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/ElfBuildIdExtractor.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/ElfBuildIdExtractor.java
index 3f65a326dcb..08f17717e59 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/ElfBuildIdExtractor.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/ElfBuildIdExtractor.java
@@ -15,199 +15,199 @@
  * 64-bit ELF files with little-endian and big-endian byte ordering.
  */
 public class ElfBuildIdExtractor implements BuildIdExtractor {
-  private static final Logger log = LoggerFactory.getLogger(ElfBuildIdExtractor.class);
-
-  // ELF magic: 0x7f 'E' 'L' 'F'
-  private static final byte[] ELF_MAGIC = {0x7f, 0x45, 0x4c, 0x46};
-
-  // ELF header constants
-  private static final int ELFCLASS32 = 1;
-  private static final int ELFCLASS64 = 2;
-
-  private static final int ELFDATA2LSB = 1; // Little endian
-  private static final int ELFDATA2MSB = 2; // Big endian
-
-  // Program header constants
-  private static final int PT_NOTE = 4;
-
-  // Note header constants
-  private static final int NT_GNU_BUILD_ID = 3;
-  private static final byte[] GNU_NOTE_NAME = "GNU\0".getBytes(StandardCharsets.UTF_8);
-
-  @Override
-  public String extractBuildId(Path file) {
-    try (RandomAccessFile raf = new RandomAccessFile(file.toFile(), "r")) {
-      // 1. Read and verify ELF magic (first 4 bytes)
-      byte[] magic = new byte[4];
-      if (raf.read(magic) != 4 || !Arrays.equals(magic, ELF_MAGIC)) {
-        log.debug("Not an ELF file: {}", file);
-        return null;
-      }
-
-      // 2. Determine file class (32 or 64 bit)
-      int elfClass = raf.read();
-      boolean is64Bit = (elfClass == ELFCLASS64);
-      if (elfClass != ELFCLASS32 && elfClass != ELFCLASS64) {
-        log.debug("Invalid ELF class in file: {}", file);
-        return null;
-      }
-
-      // 3. Determine endianness
-      int elfData = raf.read();
-      boolean isLittleEndian = (elfData == ELFDATA2LSB);
-      if (elfData != ELFDATA2LSB && elfData != ELFDATA2MSB) {
-        log.debug("Invalid ELF data encoding in file: {}", file);
-        return null;
-      }
-
-      // 4. Read ELF header to get program header table offset and size
-      raf.seek(is64Bit ? 32 : 28); // Offset to e_phoff
-      long phoff = is64Bit ? readLong(raf, isLittleEndian) : readInt(raf, isLittleEndian);
-
-      raf.seek(is64Bit ? 54 : 42); // Offset to e_phnum
-      int phnum = readShort(raf, isLittleEndian);
+    private static final Logger log = LoggerFactory.getLogger(ElfBuildIdExtractor.class);
+
+    // ELF magic: 0x7f 'E' 'L' 'F'
+    private static final byte[] ELF_MAGIC = {0x7f, 0x45, 0x4c, 0x46};
+
+    // ELF header constants
+    private static final int ELFCLASS32 = 1;
+    private static final int ELFCLASS64 = 2;
+
+    private static final int ELFDATA2LSB = 1; // Little endian
+    private static final int ELFDATA2MSB = 2; // Big endian
+
+    // Program header constants
+    private static final int PT_NOTE = 4;
+
+    // Note header constants
+    private static final int NT_GNU_BUILD_ID = 3;
+    private static final byte[] GNU_NOTE_NAME = "GNU\0".getBytes(StandardCharsets.UTF_8);
+
+    @Override
+    public String extractBuildId(Path file) {
+        try (RandomAccessFile raf = new RandomAccessFile(file.toFile(), "r")) {
+            // 1. Read and verify ELF magic (first 4 bytes)
+            byte[] magic = new byte[4];
+            if (raf.read(magic) != 4 || !Arrays.equals(magic, ELF_MAGIC)) {
+                log.debug("Not an ELF file: {}", file);
+                return null;
+            }
+
+            // 2. Determine file class (32 or 64 bit)
+            int elfClass = raf.read();
+            boolean is64Bit = (elfClass == ELFCLASS64);
+            if (elfClass != ELFCLASS32 && elfClass != ELFCLASS64) {
+                log.debug("Invalid ELF class in file: {}", file);
+                return null;
+            }
+
+            // 3. Determine endianness
+            int elfData = raf.read();
+            boolean isLittleEndian = (elfData == ELFDATA2LSB);
+            if (elfData != ELFDATA2LSB && elfData != ELFDATA2MSB) {
+                log.debug("Invalid ELF data encoding in file: {}", file);
+                return null;
+            }
+
+            // 4. Read ELF header to get program header table offset and size
+            raf.seek(is64Bit ? 32 : 28); // Offset to e_phoff
+            long phoff = is64Bit ? readLong(raf, isLittleEndian) : readInt(raf, isLittleEndian);
+
+            raf.seek(is64Bit ? 54 : 42); // Offset to e_phnum
+            int phnum = readShort(raf, isLittleEndian);
+
+            // 5. Iterate through program headers to find PT_NOTE segments
+            for (int i = 0; i < phnum; i++) {
+                long phEntryOffset = phoff + ((long) i * (is64Bit ? 56 : 32));
+                raf.seek(phEntryOffset);
+
+                int pType = (int) readInt(raf, isLittleEndian);
+                if (pType != PT_NOTE) {
+                    continue;
+                }
+
+                // Read PT_NOTE segment offset and size
+                long pOffset, pSize;
+                if (is64Bit) {
+                    raf.seek(phEntryOffset + 8);
+                    pOffset = readLong(raf, isLittleEndian);
+                    raf.seek(phEntryOffset + 32);
+                    pSize = readLong(raf, isLittleEndian);
+                } else {
+                    raf.seek(phEntryOffset + 4);
+                    pOffset = readInt(raf, isLittleEndian);
+                    raf.seek(phEntryOffset + 16);
+                    pSize = readInt(raf, isLittleEndian);
+                }
+
+                // 6. Parse notes in this PT_NOTE segment
+                String buildId = parseNoteSegment(raf, pOffset, pSize, isLittleEndian);
+                if (buildId != null) {
+                    return buildId;
+                }
+            }
+
+            log.debug("No build ID found in ELF file: {}", file);
+            return null;
+
+        } catch (IOException | SecurityException e) {
+            log.debug("Failed to extract ELF build ID from {}: {}", file, e.getMessage());
+            return null;
+        } catch (Throwable t) {
+            log.debug("Unexpected error extracting ELF build ID from {}: {}", file, t.getMessage());
+            return null;
+        }
+    }
 
-      // 5. Iterate through program headers to find PT_NOTE segments
-      for (int i = 0; i < phnum; i++) {
-        long phEntryOffset = phoff + ((long) i * (is64Bit ? 56 : 32));
-        raf.seek(phEntryOffset);
+    @Override
+    public BuildInfo.FileType fileType() {
+        return BuildInfo.FileType.ELF;
+    }
 
-        int pType = (int) readInt(raf, isLittleEndian);
-        if (pType != PT_NOTE) {
-          continue;
-        }
+    @Override
+    public BuildInfo.BuildIdType buildIdType() {
+        return BuildInfo.BuildIdType.GNU;
+    }
 
-        // Read PT_NOTE segment offset and size
-        long pOffset, pSize;
-        if (is64Bit) {
-          raf.seek(phEntryOffset + 8);
-          pOffset = readLong(raf, isLittleEndian);
-          raf.seek(phEntryOffset + 32);
-          pSize = readLong(raf, isLittleEndian);
-        } else {
-          raf.seek(phEntryOffset + 4);
-          pOffset = readInt(raf, isLittleEndian);
-          raf.seek(phEntryOffset + 16);
-          pSize = readInt(raf, isLittleEndian);
+    private String parseNoteSegment(RandomAccessFile raf, long offset, long size, boolean isLittleEndian)
+            throws IOException {
+        raf.seek(offset);
+        long end = offset + size;
+
+        while (raf.getFilePointer() < end) {
+            long currentPos = raf.getFilePointer();
+
+            // Ensure we don't read beyond segment
+            if (currentPos + 12 > end) {
+                break;
+            }
+
+            int namesz = (int) readInt(raf, isLittleEndian);
+            int descsz = (int) readInt(raf, isLittleEndian);
+            int type = (int) readInt(raf, isLittleEndian);
+
+            // Align to 4-byte boundary
+            int nameLen = (namesz + 3) & ~3;
+            int descLen = (descsz + 3) & ~3;
+
+            // Bounds check
+            if (currentPos + 12 + nameLen + descLen > end) {
+                break;
+            }
+
+            // Read note name
+            byte[] name = new byte[namesz];
+            if (raf.read(name) != namesz) {
+                throw new IOException("Failed to read note name");
+            }
+            int skipped = raf.skipBytes(nameLen - namesz);
+            if (skipped != nameLen - namesz) {
+                throw new IOException("Failed to skip padding after note name");
+            }
+
+            // Check if this is the GNU build ID note
+            if (type == NT_GNU_BUILD_ID && Arrays.equals(name, GNU_NOTE_NAME)) {
+                // Read build ID
+                byte[] buildIdBytes = new byte[descsz];
+                if (raf.read(buildIdBytes) != descsz) {
+                    throw new IOException("Failed to read build ID");
+                }
+
+                // Convert to hex string
+                StringBuilder hex = new StringBuilder(descsz * 2);
+                for (byte b : buildIdBytes) {
+                    hex.append(String.format("%02x", b & 0xff));
+                }
+                return hex.toString();
+            } else {
+                // Skip descriptor
+                skipped = raf.skipBytes(descLen);
+                if (skipped != descLen) {
+                    throw new IOException("Failed to skip descriptor");
+                }
+            }
         }
+        return null;
+    }
 
-        // 6. Parse notes in this PT_NOTE segment
-        String buildId = parseNoteSegment(raf, pOffset, pSize, isLittleEndian);
-        if (buildId != null) {
-          return buildId;
+    private int readShort(RandomAccessFile raf, boolean isLittleEndian) throws IOException {
+        byte[] bytes = new byte[2];
+        if (raf.read(bytes) != 2) {
+            throw new IOException("Failed to read short");
         }
-      }
-
-      log.debug("No build ID found in ELF file: {}", file);
-      return null;
-
-    } catch (IOException | SecurityException e) {
-      log.debug("Failed to extract ELF build ID from {}: {}", file, e.getMessage());
-      return null;
-    } catch (Throwable t) {
-      log.debug("Unexpected error extracting ELF build ID from {}: {}", file, t.getMessage());
-      return null;
+        ByteBuffer buf = ByteBuffer.wrap(bytes);
+        buf.order(isLittleEndian ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN);
+        return buf.getShort() & 0xFFFF;
     }
-  }
-
-  @Override
-  public BuildInfo.FileType fileType() {
-    return BuildInfo.FileType.ELF;
-  }
-
-  @Override
-  public BuildInfo.BuildIdType buildIdType() {
-    return BuildInfo.BuildIdType.GNU;
-  }
-
-  private String parseNoteSegment(
-      RandomAccessFile raf, long offset, long size, boolean isLittleEndian) throws IOException {
-    raf.seek(offset);
-    long end = offset + size;
-
-    while (raf.getFilePointer() < end) {
-      long currentPos = raf.getFilePointer();
-
-      // Ensure we don't read beyond segment
-      if (currentPos + 12 > end) {
-        break;
-      }
-
-      int namesz = (int) readInt(raf, isLittleEndian);
-      int descsz = (int) readInt(raf, isLittleEndian);
-      int type = (int) readInt(raf, isLittleEndian);
-
-      // Align to 4-byte boundary
-      int nameLen = (namesz + 3) & ~3;
-      int descLen = (descsz + 3) & ~3;
-
-      // Bounds check
-      if (currentPos + 12 + nameLen + descLen > end) {
-        break;
-      }
-
-      // Read note name
-      byte[] name = new byte[namesz];
-      if (raf.read(name) != namesz) {
-        throw new IOException("Failed to read note name");
-      }
-      int skipped = raf.skipBytes(nameLen - namesz);
-      if (skipped != nameLen - namesz) {
-        throw new IOException("Failed to skip padding after note name");
-      }
-
-      // Check if this is the GNU build ID note
-      if (type == NT_GNU_BUILD_ID && Arrays.equals(name, GNU_NOTE_NAME)) {
-        // Read build ID
-        byte[] buildIdBytes = new byte[descsz];
-        if (raf.read(buildIdBytes) != descsz) {
-          throw new IOException("Failed to read build ID");
-        }
 
-        // Convert to hex string
-        StringBuilder hex = new StringBuilder(descsz * 2);
-        for (byte b : buildIdBytes) {
-          hex.append(String.format("%02x", b & 0xff));
-        }
-        return hex.toString();
-      } else {
-        // Skip descriptor
-        skipped = raf.skipBytes(descLen);
-        if (skipped != descLen) {
-          throw new IOException("Failed to skip descriptor");
+    private long readInt(RandomAccessFile raf, boolean isLittleEndian) throws IOException {
+        byte[] bytes = new byte[4];
+        if (raf.read(bytes) != 4) {
+            throw new IOException("Failed to read int");
         }
-      }
+        ByteBuffer buf = ByteBuffer.wrap(bytes);
+        buf.order(isLittleEndian ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN);
+        return buf.getInt() & 0xFFFFFFFFL;
     }
-    return null;
-  }
 
-  private int readShort(RandomAccessFile raf, boolean isLittleEndian) throws IOException {
-    byte[] bytes = new byte[2];
-    if (raf.read(bytes) != 2) {
-      throw new IOException("Failed to read short");
-    }
-    ByteBuffer buf = ByteBuffer.wrap(bytes);
-    buf.order(isLittleEndian ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN);
-    return buf.getShort() & 0xFFFF;
-  }
-
-  private long readInt(RandomAccessFile raf, boolean isLittleEndian) throws IOException {
-    byte[] bytes = new byte[4];
-    if (raf.read(bytes) != 4) {
-      throw new IOException("Failed to read int");
-    }
-    ByteBuffer buf = ByteBuffer.wrap(bytes);
-    buf.order(isLittleEndian ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN);
-    return buf.getInt() & 0xFFFFFFFFL;
-  }
-
-  private long readLong(RandomAccessFile raf, boolean isLittleEndian) throws IOException {
-    byte[] bytes = new byte[8];
-    if (raf.read(bytes) != 8) {
-      throw new IOException("Failed to read long");
+    private long readLong(RandomAccessFile raf, boolean isLittleEndian) throws IOException {
+        byte[] bytes = new byte[8];
+        if (raf.read(bytes) != 8) {
+            throw new IOException("Failed to read long");
+        }
+        ByteBuffer buf = ByteBuffer.wrap(bytes);
+        buf.order(isLittleEndian ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN);
+        return buf.getLong();
     }
-    ByteBuffer buf = ByteBuffer.wrap(bytes);
-    buf.order(isLittleEndian ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN);
-    return buf.getLong();
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/NoOpBuildIdExtractor.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/NoOpBuildIdExtractor.java
index 71bf8e8c31f..1af7cd2667e 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/NoOpBuildIdExtractor.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/NoOpBuildIdExtractor.java
@@ -7,18 +7,18 @@
  * not available.
  */
 public class NoOpBuildIdExtractor implements BuildIdExtractor {
-  @Override
-  public String extractBuildId(Path file) {
-    return null; // No build ID on this platform
-  }
+    @Override
+    public String extractBuildId(Path file) {
+        return null; // No build ID on this platform
+    }
 
-  @Override
-  public BuildInfo.FileType fileType() {
-    return null;
-  }
+    @Override
+    public BuildInfo.FileType fileType() {
+        return null;
+    }
 
-  @Override
-  public BuildInfo.BuildIdType buildIdType() {
-    return null;
-  }
+    @Override
+    public BuildInfo.BuildIdType buildIdType() {
+        return null;
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/PeBuildIdExtractor.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/PeBuildIdExtractor.java
index 19a7afed4d5..09a234bd202 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/PeBuildIdExtractor.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/buildid/PeBuildIdExtractor.java
@@ -14,301 +14,295 @@
  * from the PDB70 CodeView debug information.
  */
 public class PeBuildIdExtractor implements BuildIdExtractor {
-  private static final Logger log = LoggerFactory.getLogger(PeBuildIdExtractor.class);
-
-  // DOS header magic: 'M' 'Z'
-  private static final byte[] MZ_MAGIC = {0x4d, 0x5a};
-
-  // PE signature: 'P' 'E' 0x00 0x00
-  private static final byte[] PE_SIGNATURE = {0x50, 0x45, 0x00, 0x00};
-
-  // PDB70 CodeView signature: 'R' 'S' 'D' 'S'
-  private static final int PDB70_SIGNATURE = 0x53445352;
-
-  // Debug directory type for CodeView
-  private static final int IMAGE_DEBUG_TYPE_CODEVIEW = 2;
-
-  // PE32 magic
-  private static final short PE32_MAGIC = 0x10b;
-
-  // PE32+ (64-bit) magic
-  private static final short PE32_PLUS_MAGIC = 0x20b;
-
-  @Override
-  public String extractBuildId(Path file) {
-    try (RandomAccessFile raf = new RandomAccessFile(file.toFile(), "r")) {
-      long size = raf.length();
-
-      // 1. Verify DOS header magic (first 2 bytes)
-      byte[] magic = new byte[2];
-      if (raf.read(magic) != 2 || !Arrays.equals(magic, MZ_MAGIC)) {
-        log.debug("Not a PE file (missing MZ magic): {}", file);
-        return null;
-      }
-
-      // 2. Read PE header offset from DOS header (at offset 0x3C)
-      raf.seek(0x3C);
-      byte[] offsetBytes = new byte[4];
-      if (raf.read(offsetBytes) != 4) {
-        log.debug("Failed to read PE header offset from: {}", file);
-        return null;
-      }
-      ByteBuffer buf = ByteBuffer.wrap(offsetBytes);
-      buf.order(ByteOrder.LITTLE_ENDIAN); // PE is always little-endian
-      long peOffset = buf.getInt() & 0xFFFFFFFFL;
-
-      // Bounds check
-      if (peOffset > size - 4) {
-        log.debug("Invalid PE header offset in file: {}", file);
-        return null;
-      }
-
-      // 3. Verify PE signature
-      raf.seek(peOffset);
-      byte[] peSig = new byte[4];
-      if (raf.read(peSig) != 4 || !Arrays.equals(peSig, PE_SIGNATURE)) {
-        log.debug("Invalid PE signature in file: {}", file);
-        return null;
-      }
-
-      // 4. Read COFF header
-      // COFF header starts right after PE signature
-      // Layout:
-      //   +0: Machine (2 bytes)
-      //   +2: NumberOfSections (2 bytes)
-      //   +4: TimeDateStamp (4 bytes)
-      //   +8: PointerToSymbolTable (4 bytes)
-      //   +12: NumberOfSymbols (4 bytes)
-      //   +16: SizeOfOptionalHeader (2 bytes)
-      //   +18: Characteristics (2 bytes)
-      long coffHeaderOffset = peOffset + 4;
-
-      if (coffHeaderOffset + 20 > size) {
-        log.debug("Invalid COFF header position in file: {}", file);
-        return null;
-      }
-
-      raf.seek(coffHeaderOffset + 16);
-      byte[] sizeBytes = new byte[2];
-      if (raf.read(sizeBytes) != 2) {
-        log.debug("Failed to read SizeOfOptionalHeader from: {}", file);
-        return null;
-      }
-      buf = ByteBuffer.wrap(sizeBytes);
-      buf.order(ByteOrder.LITTLE_ENDIAN);
-      int sizeOfOptionalHeader = buf.getShort() & 0xFFFF;
-
-      if (sizeOfOptionalHeader == 0) {
-        log.debug("No optional header in PE file: {}", file);
-        return null;
-      }
-
-      // 5. Read Optional Header to get Debug Directory RVA and size
-      // Optional header starts right after COFF header (20 bytes after PE signature)
-      long optionalHeaderOffset = coffHeaderOffset + 20;
-
-      if (optionalHeaderOffset + 2 > size) {
-        log.debug("Invalid optional header position in file: {}", file);
-        return null;
-      }
-
-      raf.seek(optionalHeaderOffset);
-      byte[] magicBytes = new byte[2];
-      if (raf.read(magicBytes) != 2) {
-        log.debug("Failed to read optional header magic from: {}", file);
-        return null;
-      }
-      buf = ByteBuffer.wrap(magicBytes);
-      buf.order(ByteOrder.LITTLE_ENDIAN);
-      short optionalMagic = buf.getShort();
-
-      boolean is64Bit = (optionalMagic == PE32_PLUS_MAGIC);
-
-      // Debug directory is in the data directories array
-      // For PE32: offset 96 from optional header start
-      // For PE32+: offset 112 from optional header start
-      long debugDirOffset = optionalHeaderOffset + (is64Bit ? 112 : 96) + (6 * 8); // 6th entry
-      // Each data directory entry is 8 bytes: RVA (4) + Size (4)
-
-      if (debugDirOffset + 8 > size) {
-        log.debug("Invalid debug directory offset in file: {}", file);
-        return null;
-      }
-
-      raf.seek(debugDirOffset);
-      byte[] debugDirData = new byte[8];
-      if (raf.read(debugDirData) != 8) {
-        log.debug("Failed to read debug directory data from: {}", file);
-        return null;
-      }
-      buf = ByteBuffer.wrap(debugDirData);
-      buf.order(ByteOrder.LITTLE_ENDIAN);
-      long debugDirRva = buf.getInt() & 0xFFFFFFFFL;
-      long debugDirSize = buf.getInt() & 0xFFFFFFFFL;
-
-      if (debugDirRva == 0 || debugDirSize == 0) {
-        log.debug("No debug directory in PE file: {}", file);
-        return null;
-      }
-
-      // 6. Convert RVA to file offset by reading section headers
-      long sectionHeadersOffset = optionalHeaderOffset + sizeOfOptionalHeader;
-      long debugDirFileOffset =
-          rvaToFileOffset(raf, sectionHeadersOffset, coffHeaderOffset, debugDirRva, size);
-
-      if (debugDirFileOffset == -1) {
-        log.debug("Failed to convert debug directory RVA to file offset: {}", file);
-        return null;
-      }
-
-      // 7. Parse debug directory entries to find CodeView entry
-      int numEntries = (int) (debugDirSize / 28); // Each debug directory entry is 28 bytes
-      for (int i = 0; i < numEntries; i++) {
-        long entryOffset = debugDirFileOffset + (i * 28);
-        if (entryOffset + 28 > size) {
-          continue;
+    private static final Logger log = LoggerFactory.getLogger(PeBuildIdExtractor.class);
+
+    // DOS header magic: 'M' 'Z'
+    private static final byte[] MZ_MAGIC = {0x4d, 0x5a};
+
+    // PE signature: 'P' 'E' 0x00 0x00
+    private static final byte[] PE_SIGNATURE = {0x50, 0x45, 0x00, 0x00};
+
+    // PDB70 CodeView signature: 'R' 'S' 'D' 'S'
+    private static final int PDB70_SIGNATURE = 0x53445352;
+
+    // Debug directory type for CodeView
+    private static final int IMAGE_DEBUG_TYPE_CODEVIEW = 2;
+
+    // PE32 magic
+    private static final short PE32_MAGIC = 0x10b;
+
+    // PE32+ (64-bit) magic
+    private static final short PE32_PLUS_MAGIC = 0x20b;
+
+    @Override
+    public String extractBuildId(Path file) {
+        try (RandomAccessFile raf = new RandomAccessFile(file.toFile(), "r")) {
+            long size = raf.length();
+
+            // 1. Verify DOS header magic (first 2 bytes)
+            byte[] magic = new byte[2];
+            if (raf.read(magic) != 2 || !Arrays.equals(magic, MZ_MAGIC)) {
+                log.debug("Not a PE file (missing MZ magic): {}", file);
+                return null;
+            }
+
+            // 2. Read PE header offset from DOS header (at offset 0x3C)
+            raf.seek(0x3C);
+            byte[] offsetBytes = new byte[4];
+            if (raf.read(offsetBytes) != 4) {
+                log.debug("Failed to read PE header offset from: {}", file);
+                return null;
+            }
+            ByteBuffer buf = ByteBuffer.wrap(offsetBytes);
+            buf.order(ByteOrder.LITTLE_ENDIAN); // PE is always little-endian
+            long peOffset = buf.getInt() & 0xFFFFFFFFL;
+
+            // Bounds check
+            if (peOffset > size - 4) {
+                log.debug("Invalid PE header offset in file: {}", file);
+                return null;
+            }
+
+            // 3. Verify PE signature
+            raf.seek(peOffset);
+            byte[] peSig = new byte[4];
+            if (raf.read(peSig) != 4 || !Arrays.equals(peSig, PE_SIGNATURE)) {
+                log.debug("Invalid PE signature in file: {}", file);
+                return null;
+            }
+
+            // 4. Read COFF header
+            // COFF header starts right after PE signature
+            // Layout:
+            //   +0: Machine (2 bytes)
+            //   +2: NumberOfSections (2 bytes)
+            //   +4: TimeDateStamp (4 bytes)
+            //   +8: PointerToSymbolTable (4 bytes)
+            //   +12: NumberOfSymbols (4 bytes)
+            //   +16: SizeOfOptionalHeader (2 bytes)
+            //   +18: Characteristics (2 bytes)
+            long coffHeaderOffset = peOffset + 4;
+
+            if (coffHeaderOffset + 20 > size) {
+                log.debug("Invalid COFF header position in file: {}", file);
+                return null;
+            }
+
+            raf.seek(coffHeaderOffset + 16);
+            byte[] sizeBytes = new byte[2];
+            if (raf.read(sizeBytes) != 2) {
+                log.debug("Failed to read SizeOfOptionalHeader from: {}", file);
+                return null;
+            }
+            buf = ByteBuffer.wrap(sizeBytes);
+            buf.order(ByteOrder.LITTLE_ENDIAN);
+            int sizeOfOptionalHeader = buf.getShort() & 0xFFFF;
+
+            if (sizeOfOptionalHeader == 0) {
+                log.debug("No optional header in PE file: {}", file);
+                return null;
+            }
+
+            // 5. Read Optional Header to get Debug Directory RVA and size
+            // Optional header starts right after COFF header (20 bytes after PE signature)
+            long optionalHeaderOffset = coffHeaderOffset + 20;
+
+            if (optionalHeaderOffset + 2 > size) {
+                log.debug("Invalid optional header position in file: {}", file);
+                return null;
+            }
+
+            raf.seek(optionalHeaderOffset);
+            byte[] magicBytes = new byte[2];
+            if (raf.read(magicBytes) != 2) {
+                log.debug("Failed to read optional header magic from: {}", file);
+                return null;
+            }
+            buf = ByteBuffer.wrap(magicBytes);
+            buf.order(ByteOrder.LITTLE_ENDIAN);
+            short optionalMagic = buf.getShort();
+
+            boolean is64Bit = (optionalMagic == PE32_PLUS_MAGIC);
+
+            // Debug directory is in the data directories array
+            // For PE32: offset 96 from optional header start
+            // For PE32+: offset 112 from optional header start
+            long debugDirOffset = optionalHeaderOffset + (is64Bit ? 112 : 96) + (6 * 8); // 6th entry
+            // Each data directory entry is 8 bytes: RVA (4) + Size (4)
+
+            if (debugDirOffset + 8 > size) {
+                log.debug("Invalid debug directory offset in file: {}", file);
+                return null;
+            }
+
+            raf.seek(debugDirOffset);
+            byte[] debugDirData = new byte[8];
+            if (raf.read(debugDirData) != 8) {
+                log.debug("Failed to read debug directory data from: {}", file);
+                return null;
+            }
+            buf = ByteBuffer.wrap(debugDirData);
+            buf.order(ByteOrder.LITTLE_ENDIAN);
+            long debugDirRva = buf.getInt() & 0xFFFFFFFFL;
+            long debugDirSize = buf.getInt() & 0xFFFFFFFFL;
+
+            if (debugDirRva == 0 || debugDirSize == 0) {
+                log.debug("No debug directory in PE file: {}", file);
+                return null;
+            }
+
+            // 6. Convert RVA to file offset by reading section headers
+            long sectionHeadersOffset = optionalHeaderOffset + sizeOfOptionalHeader;
+            long debugDirFileOffset = rvaToFileOffset(raf, sectionHeadersOffset, coffHeaderOffset, debugDirRva, size);
+
+            if (debugDirFileOffset == -1) {
+                log.debug("Failed to convert debug directory RVA to file offset: {}", file);
+                return null;
+            }
+
+            // 7. Parse debug directory entries to find CodeView entry
+            int numEntries = (int) (debugDirSize / 28); // Each debug directory entry is 28 bytes
+            for (int i = 0; i < numEntries; i++) {
+                long entryOffset = debugDirFileOffset + (i * 28);
+                if (entryOffset + 28 > size) {
+                    continue;
+                }
+
+                raf.seek(entryOffset);
+                byte[] entryData = new byte[28];
+                if (raf.read(entryData) != 28) {
+                    continue;
+                }
+
+                buf = ByteBuffer.wrap(entryData);
+                buf.order(ByteOrder.LITTLE_ENDIAN);
+
+                buf.getInt(); // Characteristics
+                buf.getInt(); // TimeDateStamp
+                buf.getShort(); // MajorVersion
+                buf.getShort(); // MinorVersion
+                int type = buf.getInt();
+                int dataSize = buf.getInt();
+                long dataRva = buf.getInt() & 0xFFFFFFFFL;
+                long dataFilePointer = buf.getInt() & 0xFFFFFFFFL;
+
+                if (type == IMAGE_DEBUG_TYPE_CODEVIEW && dataSize > 0) {
+                    // Found CodeView entry, read PDB70 structure
+                    if (dataFilePointer + dataSize > size) {
+                        log.debug("Invalid CodeView data pointer in file: {}", file);
+                        continue;
+                    }
+
+                    raf.seek(dataFilePointer);
+                    byte[] cvData = new byte[Math.min(dataSize, 24)]; // PDB70 header is 24 bytes
+                    if (raf.read(cvData) != cvData.length) {
+                        continue;
+                    }
+
+                    buf = ByteBuffer.wrap(cvData);
+                    buf.order(ByteOrder.LITTLE_ENDIAN);
+
+                    int signature = buf.getInt();
+                    if (signature != PDB70_SIGNATURE) {
+                        continue;
+                    }
+
+                    // Read GUID (16 bytes)
+                    long guidData1 = buf.getInt() & 0xFFFFFFFFL;
+                    int guidData2 = buf.getShort() & 0xFFFF;
+                    int guidData3 = buf.getShort() & 0xFFFF;
+                    byte[] guidData4 = new byte[8];
+                    buf.get(guidData4);
+
+                    // Read Age (4 bytes)
+                    long age = buf.getInt() & 0xFFFFFFFFL;
+
+                    // Format as GUID + Age in hex (like dotnet tracer)
+                    return formatBuildId(guidData1, guidData2, guidData3, guidData4, age);
+                }
+            }
+
+            log.debug("No CodeView debug information found in PE file: {}", file);
+            return null;
+
+        } catch (IOException | SecurityException e) {
+            log.debug("Failed to extract PE build ID from {}: {}", file, e.getMessage());
+            return null;
+        } catch (Throwable t) {
+            log.debug("Unexpected error extracting PE build ID from {}: {}", file, t.getMessage());
+            return null;
         }
+    }
 
-        raf.seek(entryOffset);
-        byte[] entryData = new byte[28];
-        if (raf.read(entryData) != 28) {
-          continue;
+    private long rvaToFileOffset(
+            RandomAccessFile raf, long sectionHeadersOffset, long coffHeaderOffset, long rva, long fileSize)
+            throws IOException {
+        // Read number of sections from COFF header
+        raf.seek(coffHeaderOffset + 2);
+        byte[] numSectionsBytes = new byte[2];
+        if (raf.read(numSectionsBytes) != 2) {
+            return -1;
         }
-
-        buf = ByteBuffer.wrap(entryData);
+        ByteBuffer buf = ByteBuffer.wrap(numSectionsBytes);
         buf.order(ByteOrder.LITTLE_ENDIAN);
-
-        buf.getInt(); // Characteristics
-        buf.getInt(); // TimeDateStamp
-        buf.getShort(); // MajorVersion
-        buf.getShort(); // MinorVersion
-        int type = buf.getInt();
-        int dataSize = buf.getInt();
-        long dataRva = buf.getInt() & 0xFFFFFFFFL;
-        long dataFilePointer = buf.getInt() & 0xFFFFFFFFL;
-
-        if (type == IMAGE_DEBUG_TYPE_CODEVIEW && dataSize > 0) {
-          // Found CodeView entry, read PDB70 structure
-          if (dataFilePointer + dataSize > size) {
-            log.debug("Invalid CodeView data pointer in file: {}", file);
-            continue;
-          }
-
-          raf.seek(dataFilePointer);
-          byte[] cvData = new byte[Math.min(dataSize, 24)]; // PDB70 header is 24 bytes
-          if (raf.read(cvData) != cvData.length) {
-            continue;
-          }
-
-          buf = ByteBuffer.wrap(cvData);
-          buf.order(ByteOrder.LITTLE_ENDIAN);
-
-          int signature = buf.getInt();
-          if (signature != PDB70_SIGNATURE) {
-            continue;
-          }
-
-          // Read GUID (16 bytes)
-          long guidData1 = buf.getInt() & 0xFFFFFFFFL;
-          int guidData2 = buf.getShort() & 0xFFFF;
-          int guidData3 = buf.getShort() & 0xFFFF;
-          byte[] guidData4 = new byte[8];
-          buf.get(guidData4);
-
-          // Read Age (4 bytes)
-          long age = buf.getInt() & 0xFFFFFFFFL;
-
-          // Format as GUID + Age in hex (like dotnet tracer)
-          return formatBuildId(guidData1, guidData2, guidData3, guidData4, age);
+        int numSections = buf.getShort() & 0xFFFF;
+
+        // Each section header is 40 bytes
+        for (int i = 0; i < numSections; i++) {
+            long sectionOffset = sectionHeadersOffset + (i * 40);
+            if (sectionOffset + 40 > fileSize) {
+                continue;
+            }
+
+            raf.seek(sectionOffset + 8); // Skip name (8 bytes)
+            byte[] sectionData = new byte[16];
+            if (raf.read(sectionData) != 16) {
+                continue;
+            }
+
+            buf = ByteBuffer.wrap(sectionData);
+            buf.order(ByteOrder.LITTLE_ENDIAN);
+
+            long virtualSize = buf.getInt() & 0xFFFFFFFFL;
+            long virtualAddress = buf.getInt() & 0xFFFFFFFFL;
+            @SuppressWarnings("unused")
+            long sizeOfRawData = buf.getInt() & 0xFFFFFFFFL;
+            long pointerToRawData = buf.getInt() & 0xFFFFFFFFL;
+
+            // Check if RVA falls within this section
+            if (rva >= virtualAddress && rva < virtualAddress + virtualSize) {
+                return pointerToRawData + (rva - virtualAddress);
+            }
         }
-      }
-
-      log.debug("No CodeView debug information found in PE file: {}", file);
-      return null;
 
-    } catch (IOException | SecurityException e) {
-      log.debug("Failed to extract PE build ID from {}: {}", file, e.getMessage());
-      return null;
-    } catch (Throwable t) {
-      log.debug("Unexpected error extracting PE build ID from {}: {}", file, t.getMessage());
-      return null;
+        return -1;
     }
-  }
-
-  private long rvaToFileOffset(
-      RandomAccessFile raf,
-      long sectionHeadersOffset,
-      long coffHeaderOffset,
-      long rva,
-      long fileSize)
-      throws IOException {
-    // Read number of sections from COFF header
-    raf.seek(coffHeaderOffset + 2);
-    byte[] numSectionsBytes = new byte[2];
-    if (raf.read(numSectionsBytes) != 2) {
-      return -1;
+
+    private String formatBuildId(long guidData1, int guidData2, int guidData3, byte[] guidData4, long age) {
+        // Format: GUID (uppercase, without dashes) + Age (lowercase hex)
+        return String.format(
+                "%08X%04X%04X%02X%02X%02X%02X%02X%02X%02X%02X%x",
+                guidData1,
+                guidData2,
+                guidData3,
+                guidData4[0] & 0xFF,
+                guidData4[1] & 0xFF,
+                guidData4[2] & 0xFF,
+                guidData4[3] & 0xFF,
+                guidData4[4] & 0xFF,
+                guidData4[5] & 0xFF,
+                guidData4[6] & 0xFF,
+                guidData4[7] & 0xFF,
+                age);
     }
-    ByteBuffer buf = ByteBuffer.wrap(numSectionsBytes);
-    buf.order(ByteOrder.LITTLE_ENDIAN);
-    int numSections = buf.getShort() & 0xFFFF;
-
-    // Each section header is 40 bytes
-    for (int i = 0; i < numSections; i++) {
-      long sectionOffset = sectionHeadersOffset + (i * 40);
-      if (sectionOffset + 40 > fileSize) {
-        continue;
-      }
-
-      raf.seek(sectionOffset + 8); // Skip name (8 bytes)
-      byte[] sectionData = new byte[16];
-      if (raf.read(sectionData) != 16) {
-        continue;
-      }
-
-      buf = ByteBuffer.wrap(sectionData);
-      buf.order(ByteOrder.LITTLE_ENDIAN);
-
-      long virtualSize = buf.getInt() & 0xFFFFFFFFL;
-      long virtualAddress = buf.getInt() & 0xFFFFFFFFL;
-      @SuppressWarnings("unused")
-      long sizeOfRawData = buf.getInt() & 0xFFFFFFFFL;
-      long pointerToRawData = buf.getInt() & 0xFFFFFFFFL;
-
-      // Check if RVA falls within this section
-      if (rva >= virtualAddress && rva < virtualAddress + virtualSize) {
-        return pointerToRawData + (rva - virtualAddress);
-      }
+
+    @Override
+    public BuildInfo.FileType fileType() {
+        return BuildInfo.FileType.PE;
     }
 
-    return -1;
-  }
-
-  private String formatBuildId(
-      long guidData1, int guidData2, int guidData3, byte[] guidData4, long age) {
-    // Format: GUID (uppercase, without dashes) + Age (lowercase hex)
-    return String.format(
-        "%08X%04X%04X%02X%02X%02X%02X%02X%02X%02X%02X%x",
-        guidData1,
-        guidData2,
-        guidData3,
-        guidData4[0] & 0xFF,
-        guidData4[1] & 0xFF,
-        guidData4[2] & 0xFF,
-        guidData4[3] & 0xFF,
-        guidData4[4] & 0xFF,
-        guidData4[5] & 0xFF,
-        guidData4[6] & 0xFF,
-        guidData4[7] & 0xFF,
-        age);
-  }
-
-  @Override
-  public BuildInfo.FileType fileType() {
-    return BuildInfo.FileType.PE;
-  }
-
-  @Override
-  public BuildInfo.BuildIdType buildIdType() {
-    return BuildInfo.BuildIdType.PDB;
-  }
+    @Override
+    public BuildInfo.BuildIdType buildIdType() {
+        return BuildInfo.BuildIdType.PDB;
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/CrashLog.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/CrashLog.java
index b0508d9ab45..06594556475 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/CrashLog.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/CrashLog.java
@@ -8,159 +8,148 @@
 import java.util.Objects;
 
 public final class CrashLog {
-  private static final int VERSION = 0;
-
-  public static final JsonAdapter<CrashLog> ADAPTER;
-
-  static {
-    Moshi moshi = new Moshi.Builder().add(new DynamicLibs.JsonAdapter()).build();
-    ADAPTER = moshi.adapter(CrashLog.class);
-  }
-
-  public final String uuid;
-
-  @Json(name = "data_schema_version")
-  public final String dataSchemaVersion;
-
-  public final String timestamp;
-  public final boolean incomplete;
-  public final ErrorData error;
-  public final Metadata metadata;
-
-  @Json(name = "os_info")
-  public final OSInfo osInfo;
-
-  @Json(name = "proc_info")
-  public final ProcInfo procInfo;
-
-  @Json(name = "version_id")
-  public final int version = VERSION;
-
-  @Json(name = "sig_info")
-  public final SigInfo sigInfo;
-
-  public final Experimental experimental;
-
-  /**
-   * Useful files for triage and debugging (e.g. {@code /proc/self/maps}, {@code
-   * dynamic_libraries}).
-   */
-  public final DynamicLibs files;
-
-  public CrashLog(
-      String uuid,
-      boolean incomplete,
-      String timestamp,
-      ErrorData error,
-      Metadata metadata,
-      OSInfo osInfo,
-      ProcInfo procInfo,
-      SigInfo sigInfo,
-      String dataSchemaVersion) {
-    this(
-        uuid,
-        incomplete,
-        timestamp,
-        error,
-        metadata,
-        osInfo,
-        procInfo,
-        sigInfo,
-        dataSchemaVersion,
-        null,
-        null);
-  }
-
-  public CrashLog(
-      String uuid,
-      boolean incomplete,
-      String timestamp,
-      ErrorData error,
-      Metadata metadata,
-      OSInfo osInfo,
-      ProcInfo procInfo,
-      SigInfo sigInfo,
-      String dataSchemaVersion,
-      Experimental experimental,
-      DynamicLibs files) {
-    this.uuid = uuid != null ? uuid : RandomUtils.randomUUID().toString();
-    this.incomplete = incomplete;
-    this.timestamp = timestamp;
-    this.error = error;
-    this.metadata = metadata;
-    this.osInfo = osInfo;
-    this.procInfo = procInfo;
-    this.sigInfo = sigInfo;
-    this.dataSchemaVersion = dataSchemaVersion;
-    this.experimental = experimental;
-    this.files = files;
-  }
-
-  public String toJson() {
-    return ADAPTER.toJson(this);
-  }
-
-  public static CrashLog fromJson(String json) throws IOException {
-    return ADAPTER.fromJson(json);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    private static final int VERSION = 0;
+
+    public static final JsonAdapter<CrashLog> ADAPTER;
+
+    static {
+        Moshi moshi = new Moshi.Builder().add(new DynamicLibs.JsonAdapter()).build();
+        ADAPTER = moshi.adapter(CrashLog.class);
+    }
+
+    public final String uuid;
+
+    @Json(name = "data_schema_version")
+    public final String dataSchemaVersion;
+
+    public final String timestamp;
+    public final boolean incomplete;
+    public final ErrorData error;
+    public final Metadata metadata;
+
+    @Json(name = "os_info")
+    public final OSInfo osInfo;
+
+    @Json(name = "proc_info")
+    public final ProcInfo procInfo;
+
+    @Json(name = "version_id")
+    public final int version = VERSION;
+
+    @Json(name = "sig_info")
+    public final SigInfo sigInfo;
+
+    public final Experimental experimental;
+
+    /**
+     * Useful files for triage and debugging (e.g. {@code /proc/self/maps}, {@code
+     * dynamic_libraries}).
+     */
+    public final DynamicLibs files;
+
+    public CrashLog(
+            String uuid,
+            boolean incomplete,
+            String timestamp,
+            ErrorData error,
+            Metadata metadata,
+            OSInfo osInfo,
+            ProcInfo procInfo,
+            SigInfo sigInfo,
+            String dataSchemaVersion) {
+        this(uuid, incomplete, timestamp, error, metadata, osInfo, procInfo, sigInfo, dataSchemaVersion, null, null);
+    }
+
+    public CrashLog(
+            String uuid,
+            boolean incomplete,
+            String timestamp,
+            ErrorData error,
+            Metadata metadata,
+            OSInfo osInfo,
+            ProcInfo procInfo,
+            SigInfo sigInfo,
+            String dataSchemaVersion,
+            Experimental experimental,
+            DynamicLibs files) {
+        this.uuid = uuid != null ? uuid : RandomUtils.randomUUID().toString();
+        this.incomplete = incomplete;
+        this.timestamp = timestamp;
+        this.error = error;
+        this.metadata = metadata;
+        this.osInfo = osInfo;
+        this.procInfo = procInfo;
+        this.sigInfo = sigInfo;
+        this.dataSchemaVersion = dataSchemaVersion;
+        this.experimental = experimental;
+        this.files = files;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    public String toJson() {
+        return ADAPTER.toJson(this);
     }
-    CrashLog crashLog = (CrashLog) o;
-    return incomplete == crashLog.incomplete
-        && Objects.equals(uuid, crashLog.uuid)
-        && Objects.equals(timestamp, crashLog.timestamp)
-        && Objects.equals(error, crashLog.error)
-        && Objects.equals(metadata, crashLog.metadata)
-        && Objects.equals(osInfo, crashLog.osInfo)
-        && Objects.equals(procInfo, crashLog.procInfo)
-        && Objects.equals(sigInfo, crashLog.sigInfo)
-        && Objects.equals(dataSchemaVersion, crashLog.dataSchemaVersion)
-        && Objects.equals(experimental, crashLog.experimental)
-        && Objects.equals(files, crashLog.files);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(
-        uuid,
-        timestamp,
-        incomplete,
-        error,
-        metadata,
-        osInfo,
-        procInfo,
-        sigInfo,
-        version,
-        dataSchemaVersion,
-        experimental,
-        files);
-  }
-
-  public boolean equalsForTest(Object o) {
-    // for tests, we need to ignore OSInfo and Metadata part
-    if (this == o) {
-      return true;
+
+    public static CrashLog fromJson(String json) throws IOException {
+        return ADAPTER.fromJson(json);
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CrashLog crashLog = (CrashLog) o;
+        return incomplete == crashLog.incomplete
+                && Objects.equals(uuid, crashLog.uuid)
+                && Objects.equals(timestamp, crashLog.timestamp)
+                && Objects.equals(error, crashLog.error)
+                && Objects.equals(metadata, crashLog.metadata)
+                && Objects.equals(osInfo, crashLog.osInfo)
+                && Objects.equals(procInfo, crashLog.procInfo)
+                && Objects.equals(sigInfo, crashLog.sigInfo)
+                && Objects.equals(dataSchemaVersion, crashLog.dataSchemaVersion)
+                && Objects.equals(experimental, crashLog.experimental)
+                && Objects.equals(files, crashLog.files);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(
+                uuid,
+                timestamp,
+                incomplete,
+                error,
+                metadata,
+                osInfo,
+                procInfo,
+                sigInfo,
+                version,
+                dataSchemaVersion,
+                experimental,
+                files);
+    }
+
+    public boolean equalsForTest(Object o) {
+        // for tests, we need to ignore OSInfo and Metadata part
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CrashLog crashLog = (CrashLog) o;
+        return incomplete == crashLog.incomplete
+                && version == crashLog.version
+                && Objects.equals(uuid, crashLog.uuid)
+                && Objects.equals(timestamp, crashLog.timestamp)
+                && Objects.equals(error, crashLog.error)
+                && Objects.equals(procInfo, crashLog.procInfo)
+                && Objects.equals(sigInfo, crashLog.sigInfo)
+                && Objects.equals(dataSchemaVersion, crashLog.dataSchemaVersion)
+                && Objects.equals(experimental, crashLog.experimental)
+                && Objects.equals(files, crashLog.files);
     }
-    CrashLog crashLog = (CrashLog) o;
-    return incomplete == crashLog.incomplete
-        && version == crashLog.version
-        && Objects.equals(uuid, crashLog.uuid)
-        && Objects.equals(timestamp, crashLog.timestamp)
-        && Objects.equals(error, crashLog.error)
-        && Objects.equals(procInfo, crashLog.procInfo)
-        && Objects.equals(sigInfo, crashLog.sigInfo)
-        && Objects.equals(dataSchemaVersion, crashLog.dataSchemaVersion)
-        && Objects.equals(experimental, crashLog.experimental)
-        && Objects.equals(files, crashLog.files);
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/DynamicLibs.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/DynamicLibs.java
index 05807513f8d..75b26717eaf 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/DynamicLibs.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/DynamicLibs.java
@@ -7,24 +7,24 @@
 import java.util.Map;
 
 public class DynamicLibs {
-  public final String name;
-  public final List<String> lines;
+    public final String name;
+    public final List<String> lines;
 
-  public DynamicLibs(String name, List<String> lines) {
-    this.name = name;
-    this.lines = lines;
-  }
-
-  public static class JsonAdapter {
-    @ToJson
-    Map<String, List<String>> toJson(DynamicLibs dynamicLibs) {
-      return Collections.singletonMap(dynamicLibs.name, dynamicLibs.lines);
+    public DynamicLibs(String name, List<String> lines) {
+        this.name = name;
+        this.lines = lines;
     }
 
-    @FromJson
-    DynamicLibs fromJson(Map<String, List<String>> map) {
-      Map.Entry<String, List<String>> entry = map.entrySet().iterator().next();
-      return new DynamicLibs(entry.getKey(), entry.getValue());
+    public static class JsonAdapter {
+        @ToJson
+        Map<String, List<String>> toJson(DynamicLibs dynamicLibs) {
+            return Collections.singletonMap(dynamicLibs.name, dynamicLibs.lines);
+        }
+
+        @FromJson
+        DynamicLibs fromJson(Map<String, List<String>> map) {
+            Map.Entry<String, List<String>> entry = map.entrySet().iterator().next();
+            return new DynamicLibs(entry.getKey(), entry.getValue());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/ErrorData.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/ErrorData.java
index 55984a47fee..4e20e195742 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/ErrorData.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/ErrorData.java
@@ -4,50 +4,50 @@
 import java.util.Objects;
 
 public final class ErrorData {
-  @Json(name = "is_crash")
-  public final boolean isCrash = true;
+    @Json(name = "is_crash")
+    public final boolean isCrash = true;
 
-  public final String kind;
-  public final String message;
+    public final String kind;
+    public final String message;
 
-  @Json(name = "thread_name")
-  public final String threadName;
+    @Json(name = "thread_name")
+    public final String threadName;
 
-  @Json(name = "source_type")
-  public final String sourceType = "Crashtracking";
+    @Json(name = "source_type")
+    public final String sourceType = "Crashtracking";
 
-  public final StackTrace stack;
+    public final StackTrace stack;
 
-  public ErrorData(String kind, String message, StackTrace stack) {
-    this(kind, message, null, stack);
-  }
+    public ErrorData(String kind, String message, StackTrace stack) {
+        this(kind, message, null, stack);
+    }
 
-  public ErrorData(String kind, String message, String threadName, StackTrace stack) {
-    this.kind = kind;
-    this.message = message;
-    this.threadName = threadName;
-    this.stack = stack;
-  }
+    public ErrorData(String kind, String message, String threadName, StackTrace stack) {
+        this.kind = kind;
+        this.message = message;
+        this.threadName = threadName;
+        this.stack = stack;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ErrorData errorData = (ErrorData) o;
+        return isCrash == errorData.isCrash
+                && Objects.equals(kind, errorData.kind)
+                && Objects.equals(message, errorData.message)
+                && Objects.equals(threadName, errorData.threadName)
+                && Objects.equals(sourceType, errorData.sourceType)
+                && Objects.equals(stack, errorData.stack);
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(isCrash, kind, message, threadName, sourceType, stack);
     }
-    ErrorData errorData = (ErrorData) o;
-    return isCrash == errorData.isCrash
-        && Objects.equals(kind, errorData.kind)
-        && Objects.equals(message, errorData.message)
-        && Objects.equals(threadName, errorData.threadName)
-        && Objects.equals(sourceType, errorData.sourceType)
-        && Objects.equals(stack, errorData.stack);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(isCrash, kind, message, threadName, sourceType, stack);
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/Experimental.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/Experimental.java
index 449bdd93156..55951deef78 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/Experimental.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/Experimental.java
@@ -6,55 +6,53 @@
 import java.util.Objects;
 
 public final class Experimental {
-  public final Map<String, String> ucontext;
-
-  @Json(name = "register_to_memory_mapping")
-  public final Map<String, String> registerToMemoryMapping;
-
-  @Json(name = "runtime_args")
-  public final List<String> runtimeArgs;
-
-  @Json(name = "runtime_info")
-  public final RuntimeInfo runtimeInfo;
-
-  public Experimental(Map<String, String> ucontext) {
-    this(ucontext, null, null, null);
-  }
-
-  public Experimental(Map<String, String> ucontext, List<String> runtimeArgs) {
-    this(ucontext, null, runtimeArgs, null);
-  }
-
-  public Experimental(
-      Map<String, String> ucontext,
-      Map<String, String> registerToMemoryMapping,
-      List<String> runtimeArgs) {
-    this(ucontext, registerToMemoryMapping, runtimeArgs, null);
-  }
-
-  public Experimental(
-      Map<String, String> ucontext,
-      Map<String, String> registerToMemoryMapping,
-      List<String> runtimeArgs,
-      RuntimeInfo runtimeInfo) {
-    this.ucontext = ucontext;
-    this.registerToMemoryMapping = registerToMemoryMapping;
-    this.runtimeArgs = runtimeArgs;
-    this.runtimeInfo = runtimeInfo;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (!(o instanceof Experimental)) return false;
-    Experimental that = (Experimental) o;
-    return Objects.equals(ucontext, that.ucontext)
-        && Objects.equals(registerToMemoryMapping, that.registerToMemoryMapping)
-        && Objects.equals(runtimeArgs, that.runtimeArgs)
-        && Objects.equals(runtimeInfo, that.runtimeInfo);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(ucontext, registerToMemoryMapping, runtimeArgs, runtimeInfo);
-  }
+    public final Map<String, String> ucontext;
+
+    @Json(name = "register_to_memory_mapping")
+    public final Map<String, String> registerToMemoryMapping;
+
+    @Json(name = "runtime_args")
+    public final List<String> runtimeArgs;
+
+    @Json(name = "runtime_info")
+    public final RuntimeInfo runtimeInfo;
+
+    public Experimental(Map<String, String> ucontext) {
+        this(ucontext, null, null, null);
+    }
+
+    public Experimental(Map<String, String> ucontext, List<String> runtimeArgs) {
+        this(ucontext, null, runtimeArgs, null);
+    }
+
+    public Experimental(
+            Map<String, String> ucontext, Map<String, String> registerToMemoryMapping, List<String> runtimeArgs) {
+        this(ucontext, registerToMemoryMapping, runtimeArgs, null);
+    }
+
+    public Experimental(
+            Map<String, String> ucontext,
+            Map<String, String> registerToMemoryMapping,
+            List<String> runtimeArgs,
+            RuntimeInfo runtimeInfo) {
+        this.ucontext = ucontext;
+        this.registerToMemoryMapping = registerToMemoryMapping;
+        this.runtimeArgs = runtimeArgs;
+        this.runtimeInfo = runtimeInfo;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof Experimental)) return false;
+        Experimental that = (Experimental) o;
+        return Objects.equals(ucontext, that.ucontext)
+                && Objects.equals(registerToMemoryMapping, that.registerToMemoryMapping)
+                && Objects.equals(runtimeArgs, that.runtimeArgs)
+                && Objects.equals(runtimeInfo, that.runtimeInfo);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(ucontext, registerToMemoryMapping, runtimeArgs, runtimeInfo);
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/Metadata.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/Metadata.java
index a1f5e98626e..f11c498ae7f 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/Metadata.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/Metadata.java
@@ -5,39 +5,39 @@
 import java.util.Objects;
 
 public final class Metadata {
-  @Json(name = "library_name")
-  public final String libraryName;
+    @Json(name = "library_name")
+    public final String libraryName;
 
-  @Json(name = "library_version")
-  public final String libraryVersion;
+    @Json(name = "library_version")
+    public final String libraryVersion;
 
-  public final String family;
-  public final String[] tags;
+    public final String family;
+    public final String[] tags;
 
-  public Metadata(String libraryName, String libraryVersion, String family, String[] tags) {
-    this.libraryName = libraryName;
-    this.libraryVersion = libraryVersion;
-    this.family = family;
-    this.tags = tags;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public Metadata(String libraryName, String libraryVersion, String family, String[] tags) {
+        this.libraryName = libraryName;
+        this.libraryVersion = libraryVersion;
+        this.family = family;
+        this.tags = tags;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Metadata metadata = (Metadata) o;
+        return Objects.equals(libraryName, metadata.libraryName)
+                && Objects.equals(libraryVersion, metadata.libraryVersion)
+                && Objects.equals(family, metadata.family)
+                && Arrays.equals(tags, metadata.tags);
     }
-    Metadata metadata = (Metadata) o;
-    return Objects.equals(libraryName, metadata.libraryName)
-        && Objects.equals(libraryVersion, metadata.libraryVersion)
-        && Objects.equals(family, metadata.family)
-        && Arrays.equals(tags, metadata.tags);
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(libraryName, libraryVersion, family, Arrays.hashCode(tags));
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(libraryName, libraryVersion, family, Arrays.hashCode(tags));
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/OSInfo.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/OSInfo.java
index 9a666270dc2..ab9d568aa1a 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/OSInfo.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/OSInfo.java
@@ -5,49 +5,48 @@
 import java.util.Objects;
 
 public final class OSInfo {
-  public final String architecture;
-  public final String bitness;
+    public final String architecture;
+    public final String bitness;
 
-  @Json(name = "os_type")
-  public final String osType;
+    @Json(name = "os_type")
+    public final String osType;
 
-  public final String version;
+    public final String version;
 
-  public OSInfo(String architecture, String bitness, String osType, String version) {
-    this.architecture = architecture;
-    this.bitness = bitness;
-    this.osType = osType;
-    this.version = version;
-  }
+    public OSInfo(String architecture, String bitness, String osType, String version) {
+        this.architecture = architecture;
+        this.bitness = bitness;
+        this.osType = osType;
+        this.version = version;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        OSInfo osInfo = (OSInfo) o;
+        return Objects.equals(architecture, osInfo.architecture)
+                && Objects.equals(bitness, osInfo.bitness)
+                && Objects.equals(osType, osInfo.osType)
+                && Objects.equals(version, osInfo.version);
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(architecture, bitness, osType, version);
     }
-    OSInfo osInfo = (OSInfo) o;
-    return Objects.equals(architecture, osInfo.architecture)
-        && Objects.equals(bitness, osInfo.bitness)
-        && Objects.equals(osType, osInfo.osType)
-        && Objects.equals(version, osInfo.version);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(architecture, bitness, osType, version);
-  }
-
-  public static OSInfo current() {
-    String rawBitness = SystemProperties.get("sun.arch.data.model");
-    String bitness = rawBitness != null ? rawBitness + "-bit" : null;
-    String osName = SystemProperties.get("os.name");
-    if (osName != null && osName.startsWith("Mac OS")) {
-      osName = "Mac OS";
+
+    public static OSInfo current() {
+        String rawBitness = SystemProperties.get("sun.arch.data.model");
+        String bitness = rawBitness != null ? rawBitness + "-bit" : null;
+        String osName = SystemProperties.get("os.name");
+        if (osName != null && osName.startsWith("Mac OS")) {
+            osName = "Mac OS";
+        }
+        return new OSInfo(SystemProperties.get("os.arch"), bitness, osName, SystemProperties.get("os.version"));
     }
-    return new OSInfo(
-        SystemProperties.get("os.arch"), bitness, osName, SystemProperties.get("os.version"));
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/ProcInfo.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/ProcInfo.java
index 22b5b822f17..862ee38769a 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/ProcInfo.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/ProcInfo.java
@@ -1,26 +1,26 @@
 package datadog.crashtracking.dto;
 
 public final class ProcInfo {
-  public final int pid;
+    public final int pid;
 
-  public ProcInfo(int pid) {
-    this.pid = pid;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public ProcInfo(int pid) {
+        this.pid = pid;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ProcInfo procInfo = (ProcInfo) o;
+        return pid == procInfo.pid;
     }
-    ProcInfo procInfo = (ProcInfo) o;
-    return pid == procInfo.pid;
-  }
 
-  @Override
-  public int hashCode() {
-    return pid;
-  }
+    @Override
+    public int hashCode() {
+        return pid;
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/RuntimeInfo.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/RuntimeInfo.java
index b103960158c..ccdd0cda17b 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/RuntimeInfo.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/RuntimeInfo.java
@@ -9,37 +9,37 @@
  * binaries in use.
  */
 public final class RuntimeInfo {
-  @Json(name = "jre_version")
-  public final String jreVersion;
+    @Json(name = "jre_version")
+    public final String jreVersion;
 
-  @Json(name = "java_vm")
-  public final String javaVm;
+    @Json(name = "java_vm")
+    public final String javaVm;
 
-  @Json(name = "vm_info")
-  public final String vmInfo;
+    @Json(name = "vm_info")
+    public final String vmInfo;
 
-  public RuntimeInfo(String jreVersion, String javaVm, String vmInfo) {
-    this.jreVersion = jreVersion;
-    this.javaVm = javaVm;
-    this.vmInfo = vmInfo;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public RuntimeInfo(String jreVersion, String javaVm, String vmInfo) {
+        this.jreVersion = jreVersion;
+        this.javaVm = javaVm;
+        this.vmInfo = vmInfo;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        RuntimeInfo that = (RuntimeInfo) o;
+        return Objects.equals(jreVersion, that.jreVersion)
+                && Objects.equals(javaVm, that.javaVm)
+                && Objects.equals(vmInfo, that.vmInfo);
     }
-    RuntimeInfo that = (RuntimeInfo) o;
-    return Objects.equals(jreVersion, that.jreVersion)
-        && Objects.equals(javaVm, that.javaVm)
-        && Objects.equals(vmInfo, that.vmInfo);
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(jreVersion, javaVm, vmInfo);
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(jreVersion, javaVm, vmInfo);
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/SigInfo.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/SigInfo.java
index dcb0ebb2265..2a646ab9ed9 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/SigInfo.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/SigInfo.java
@@ -4,59 +4,52 @@
 import java.util.Objects;
 
 public class SigInfo {
-  @Json(name = "si_signo")
-  public final Integer number;
-
-  @Json(name = "si_code")
-  public final Integer code;
-
-  @Json(name = "si_signo_human_readable")
-  public final String name;
-
-  @Json(name = "si_code_human_readable")
-  public final String action;
-
-  @Json(name = "si_addr")
-  public final String address;
-
-  @Json(name = "si_pid")
-  public final Integer pid;
-
-  @Json(name = "si_uid")
-  public final Integer uid;
-
-  public SigInfo(
-      Integer number,
-      String name,
-      Integer code,
-      String action,
-      String address,
-      Integer pid,
-      Integer uid) {
-    this.number = number;
-    this.name = name;
-    this.address = address;
-    this.code = code;
-    this.action = action;
-    this.pid = pid;
-    this.uid = uid;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (!(o instanceof SigInfo)) return false;
-    SigInfo sigInfo = (SigInfo) o;
-    return Objects.equals(number, sigInfo.number)
-        && Objects.equals(name, sigInfo.name)
-        && Objects.equals(address, sigInfo.address)
-        && Objects.equals(code, sigInfo.code)
-        && Objects.equals(action, sigInfo.action)
-        && Objects.equals(pid, sigInfo.pid)
-        && Objects.equals(uid, sigInfo.uid);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(number, name, address, code, action, pid, uid);
-  }
+    @Json(name = "si_signo")
+    public final Integer number;
+
+    @Json(name = "si_code")
+    public final Integer code;
+
+    @Json(name = "si_signo_human_readable")
+    public final String name;
+
+    @Json(name = "si_code_human_readable")
+    public final String action;
+
+    @Json(name = "si_addr")
+    public final String address;
+
+    @Json(name = "si_pid")
+    public final Integer pid;
+
+    @Json(name = "si_uid")
+    public final Integer uid;
+
+    public SigInfo(Integer number, String name, Integer code, String action, String address, Integer pid, Integer uid) {
+        this.number = number;
+        this.name = name;
+        this.address = address;
+        this.code = code;
+        this.action = action;
+        this.pid = pid;
+        this.uid = uid;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof SigInfo)) return false;
+        SigInfo sigInfo = (SigInfo) o;
+        return Objects.equals(number, sigInfo.number)
+                && Objects.equals(name, sigInfo.name)
+                && Objects.equals(address, sigInfo.address)
+                && Objects.equals(code, sigInfo.code)
+                && Objects.equals(action, sigInfo.action)
+                && Objects.equals(pid, sigInfo.pid)
+                && Objects.equals(uid, sigInfo.uid);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(number, name, address, code, action, pid, uid);
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackFrame.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackFrame.java
index a8bcdf69889..44fdddab275 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackFrame.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackFrame.java
@@ -6,87 +6,78 @@
 
 public final class StackFrame {
 
-  public final String path;
-  public final Integer line;
-  public final String function;
+    public final String path;
+    public final Integer line;
+    public final String function;
 
-  @Json(name = "type")
-  public final String frameType;
+    @Json(name = "type")
+    public final String frameType;
 
-  @Json(name = "build_id")
-  public final String buildId;
+    @Json(name = "build_id")
+    public final String buildId;
 
-  @Json(name = "build_id_type")
-  public final BuildInfo.BuildIdType buildIdType;
+    @Json(name = "build_id_type")
+    public final BuildInfo.BuildIdType buildIdType;
 
-  @Json(name = "file_type")
-  public final BuildInfo.FileType fileType;
+    @Json(name = "file_type")
+    public final BuildInfo.FileType fileType;
 
-  @Json(name = "ip")
-  public final String ip;
+    @Json(name = "ip")
+    public final String ip;
 
-  @Json(name = "symbol_address")
-  public final String symbolAddress;
+    @Json(name = "symbol_address")
+    public final String symbolAddress;
 
-  @Json(name = "relative_address")
-  public String relativeAddress;
+    @Json(name = "relative_address")
+    public String relativeAddress;
 
-  public StackFrame(
-      String path,
-      Integer line,
-      String function,
-      String frameType,
-      String buildId,
-      BuildInfo.BuildIdType buildIdType,
-      BuildInfo.FileType fileType,
-      String ip,
-      String symbolAddress,
-      String relativeAddress) {
-    this.path = path;
-    this.line = line;
-    this.function = function;
-    this.frameType = frameType;
-    this.buildId = buildId;
-    this.buildIdType = buildIdType;
-    this.fileType = fileType;
-    this.ip = ip;
-    this.symbolAddress = symbolAddress;
-    this.relativeAddress = relativeAddress;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public StackFrame(
+            String path,
+            Integer line,
+            String function,
+            String frameType,
+            String buildId,
+            BuildInfo.BuildIdType buildIdType,
+            BuildInfo.FileType fileType,
+            String ip,
+            String symbolAddress,
+            String relativeAddress) {
+        this.path = path;
+        this.line = line;
+        this.function = function;
+        this.frameType = frameType;
+        this.buildId = buildId;
+        this.buildIdType = buildIdType;
+        this.fileType = fileType;
+        this.ip = ip;
+        this.symbolAddress = symbolAddress;
+        this.relativeAddress = relativeAddress;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        StackFrame that = (StackFrame) o;
+        return Objects.equals(path, that.path)
+                && Objects.equals(line, that.line)
+                && Objects.equals(function, that.function)
+                && Objects.equals(frameType, that.frameType)
+                && Objects.equals(buildId, that.buildId)
+                && buildIdType == that.buildIdType
+                && fileType == that.fileType
+                && Objects.equals(ip, that.ip)
+                && Objects.equals(symbolAddress, that.symbolAddress)
+                && Objects.equals(relativeAddress, that.relativeAddress);
     }
-    StackFrame that = (StackFrame) o;
-    return Objects.equals(path, that.path)
-        && Objects.equals(line, that.line)
-        && Objects.equals(function, that.function)
-        && Objects.equals(frameType, that.frameType)
-        && Objects.equals(buildId, that.buildId)
-        && buildIdType == that.buildIdType
-        && fileType == that.fileType
-        && Objects.equals(ip, that.ip)
-        && Objects.equals(symbolAddress, that.symbolAddress)
-        && Objects.equals(relativeAddress, that.relativeAddress);
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(
-        path,
-        line,
-        function,
-        frameType,
-        buildId,
-        buildIdType,
-        fileType,
-        ip,
-        symbolAddress,
-        relativeAddress);
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(
+                path, line, function, frameType, buildId, buildIdType, fileType, ip, symbolAddress, relativeAddress);
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackTrace.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackTrace.java
index 9467e01fcba..2b946620b7a 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackTrace.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackTrace.java
@@ -8,35 +8,35 @@
 import java.util.Objects;
 
 public final class StackTrace {
-  private static final JsonAdapter<StackTrace> ADAPTER =
-      new Moshi.Builder().build().adapter(StackTrace.class);
-  private static final String FORMAT = "CrashTrackerV1";
+    private static final JsonAdapter<StackTrace> ADAPTER =
+            new Moshi.Builder().build().adapter(StackTrace.class);
+    private static final String FORMAT = "CrashTrackerV1";
 
-  public final String format = FORMAT;
-  public final StackFrame[] frames;
+    public final String format = FORMAT;
+    public final StackFrame[] frames;
 
-  public StackTrace(StackFrame[] frames) {
-    this.frames = frames;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public StackTrace(StackFrame[] frames) {
+        this.frames = frames;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        StackTrace that = (StackTrace) o;
+        return Objects.equals(format, that.format) && Objects.deepEquals(frames, that.frames);
     }
-    StackTrace that = (StackTrace) o;
-    return Objects.equals(format, that.format) && Objects.deepEquals(frames, that.frames);
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(format, Arrays.hashCode(frames));
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(format, Arrays.hashCode(frames));
+    }
 
-  public void writeAsJson(final JsonWriter writer) throws IOException {
-    ADAPTER.toJson(writer, this);
-  }
+    public void writeAsJson(final JsonWriter writer) throws IOException {
+        ADAPTER.toJson(writer, this);
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/HotspotCrashLogParser.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/HotspotCrashLogParser.java
index f4cc8e6874f..595b02ea185 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/HotspotCrashLogParser.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/HotspotCrashLogParser.java
@@ -44,693 +44,682 @@
  * resulting {@link datadog.crashtracking.dto.CrashLog} will be marked {@code incomplete}.
  */
 public final class HotspotCrashLogParser {
-  private static final String HOTSPOT_JVM_ARGS_PREFIX = "jvm_args:";
-  private static final String JRE_VERSION_PREFIX = "# JRE version: ";
-  private static final String JAVA_VM_PREFIX = "# Java VM: ";
-  private static final String VM_INFO_PREFIX = "vm_info: ";
-  private static final DateTimeFormatter ZONED_DATE_TIME_FORMATTER =
-      DateTimeFormatter.ofPattern("EEE MMM ppd HH:mm:ss yyyy zzz", Locale.getDefault());
-  private static final DateTimeFormatter OFFSET_DATE_TIME_FORMATTER =
-      DateTimeFormatter.ofPattern("EEE MMM ppd HH:mm:ss yyyy X", Locale.getDefault());
-  private static final String OOM_MARKER = "OutOfMemory encountered: ";
-
-  // all lowercased
-  private static final String[] KNOWN_LIBRARY_NAMES = {"libjavaprofiler", "libddwaf", "libsqreen"};
-
-  private final BuildIdCollector buildIdCollector;
-
-  enum State {
-    NEW,
-    HEADER,
-    MESSAGE,
-    SUMMARY,
-    THREAD,
-    STACKTRACE,
-    REGISTER_TO_MEMORY_MAPPING,
-    REGISTERS,
-    PROCESS,
-    VM_ARGUMENTS,
-    DYNAMIC_LIBRARIES,
-    SYSTEM,
-    DONE
-  }
-
-  private State state = State.NEW;
-
-  public HotspotCrashLogParser() {
-    this.buildIdCollector = new BuildIdCollector();
-  }
-
-  private static final Pattern PLUS_SPLITTER = Pattern.compile("\\+");
-  private static final Pattern SPACE_SPLITTER = Pattern.compile("\\s+");
-  private static final Pattern NEWLINE_SPLITTER = Pattern.compile("\n");
-  // Groups: 1=si_signo, 2=signal name, 3=si_code, 4=si_code name,
-  //         5=si_addr (null for SI_USER), 6=si_pid (null for si_addr), 7=si_uid (null for si_addr)
-  private static final Pattern SIGINFO_PARSER =
-      Pattern.compile(
-          "siginfo:\\s+si_signo:\\s+(\\d+)\\s+\\((\\w+)\\),\\s+si_code:\\s+(\\d+)\\s+\\(([^)]+)\\),\\s+"
-              + "(?:si_addr:\\s+(0x[0-9a-fA-F]+)|si_pid:\\s+(\\d+),\\s+si_uid:\\s+(\\d+))");
-  private static final Pattern DYNAMIC_LIBS_PATH_PARSER =
-      Pattern.compile("^(?:0x)?[0-9a-fA-F]+(?:-[0-9a-fA-F]+)?\\s+(?:[^\\s/\\[]+\\s+)*(.*)$");
-  // Matches register entries like:
-  // * RAX=0x..., R8 =0x..., TRAPNO=0x... (x86-64)
-  // * R0=0x..., R30=0x... (Linux aarch64)
-  // * x0=0x..., fp=0x..., lr=0x..., sp=0x..., pc=0x... (macOS aarch64)
-  // Note that register formatting varies by platform, the JVM crash handler can emit one or four
-  // per line.
-  private static final Pattern REGISTER_ENTRY_PARSER =
-      Pattern.compile("([A-Za-z][A-Za-z0-9]*)\\s*=\\s*(0x[0-9a-fA-F]+)");
-  private static final Pattern REGISTER_TO_MEMORY_MAPPING_PARSER =
-      Pattern.compile("^\\s*([A-Za-z][A-Za-z0-9]*)\\s*=");
-  // Used for the REGISTERS-state exit condition only: the register name must start the line
-  // (after optional whitespace). This prevents lines like "Top of Stack: (sp=0x...)" and
-  // "Instructions: (pc=0x...)" from being mistaken for register entries by REGISTER_ENTRY_PARSER's
-  // find(), which would otherwise match the lowercase "sp"/"pc" tokens embedded in those lines.
-  private static final Pattern REGISTER_LINE_START =
-      Pattern.compile("^\\s*[A-Za-z][A-Za-z0-9]*\\s*=\\s*0x");
-  private static final Pattern SUBSECTION_TITLE = Pattern.compile("^\\s*[A-Za-z][\\w ]*:.+$");
-  private static final Pattern COMPILED_JAVA_ADDRESS_PARSER =
-      Pattern.compile("@\\s+(0x[0-9a-fA-F]+)\\s+\\[(0x[0-9a-fA-F]+)\\+(0x[0-9a-fA-F]+)\\]");
-
-  // HotSpot crash logs encode the execution kind in the first column of each frame line.
-  // Source references:
-  // JDK 8:
-  // https://github.com/openjdk/jdk8u/blob/73c9c6bcd062196cbebc4d9f22b13d2e20a14f98/hotspot/src/share/vm/runtime/frame.cpp#L710-L724
-  // JDK 11:
-  // https://github.com/openjdk/jdk11u/blob/970d6cf491a55fd6ab98ec3f449c13a58633078a/src/hotspot/share/runtime/frame.cpp#L647-L662
-  // JDK 25:
-  // https://github.com/openjdk/jdk25u/blob/2fe611a2a3386d097f636c15bd4d396a82dc695e/src/hotspot/share/runtime/frame.cpp#L652-L666
-  // Mainline:
-  // https://github.com/openjdk/jdk/blob/53c864a881d2183d3664a6a5a56480bd99fffe45/src/hotspot/share/runtime/frame.cpp#L647-L661
-  // Note: the marker set changes across JDK lines. In particular, "A" appears in some HotSpot
-  // versions but not all, so this mapping is best-effort rather than a stable cross-version enum.
-  private static String hotspotFrameType(char marker) {
-    switch (marker) {
-      case 'J':
-        return "compiled";
-      case 'A': // exists in JDK 11
-        return "aot_compiled";
-      case 'j':
-        return "interpreted";
-      case 'V':
-        return "vm";
-      case 'v':
-        return "stub";
-      case 'C':
-        return "native";
-      default:
-        return null;
+    private static final String HOTSPOT_JVM_ARGS_PREFIX = "jvm_args:";
+    private static final String JRE_VERSION_PREFIX = "# JRE version: ";
+    private static final String JAVA_VM_PREFIX = "# Java VM: ";
+    private static final String VM_INFO_PREFIX = "vm_info: ";
+    private static final DateTimeFormatter ZONED_DATE_TIME_FORMATTER =
+            DateTimeFormatter.ofPattern("EEE MMM ppd HH:mm:ss yyyy zzz", Locale.getDefault());
+    private static final DateTimeFormatter OFFSET_DATE_TIME_FORMATTER =
+            DateTimeFormatter.ofPattern("EEE MMM ppd HH:mm:ss yyyy X", Locale.getDefault());
+    private static final String OOM_MARKER = "OutOfMemory encountered: ";
+
+    // all lowercased
+    private static final String[] KNOWN_LIBRARY_NAMES = {"libjavaprofiler", "libddwaf", "libsqreen"};
+
+    private final BuildIdCollector buildIdCollector;
+
+    enum State {
+        NEW,
+        HEADER,
+        MESSAGE,
+        SUMMARY,
+        THREAD,
+        STACKTRACE,
+        REGISTER_TO_MEMORY_MAPPING,
+        REGISTERS,
+        PROCESS,
+        VM_ARGUMENTS,
+        DYNAMIC_LIBRARIES,
+        SYSTEM,
+        DONE
     }
-  }
 
-  private StackFrame parseLine(String line) {
-    if (line == null || line.isEmpty()) {
-      return null;
+    private State state = State.NEW;
+
+    public HotspotCrashLogParser() {
+        this.buildIdCollector = new BuildIdCollector();
     }
 
-    String functionName = null;
-    Integer functionLine = null;
-    String filename = null;
-    String ip = null;
-    String relAddress = null;
-    String symbolAddress = null;
-    char firstChar = line.charAt(0);
-    String frameType = hotspotFrameType(firstChar);
-    if (line.length() > 1 && !Character.isSpaceChar(line.charAt(1))) {
-      // We can find entries like this in between the frames
-      // Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)
-      return null;
+    private static final Pattern PLUS_SPLITTER = Pattern.compile("\\+");
+    private static final Pattern SPACE_SPLITTER = Pattern.compile("\\s+");
+    private static final Pattern NEWLINE_SPLITTER = Pattern.compile("\n");
+    // Groups: 1=si_signo, 2=signal name, 3=si_code, 4=si_code name,
+    //         5=si_addr (null for SI_USER), 6=si_pid (null for si_addr), 7=si_uid (null for si_addr)
+    private static final Pattern SIGINFO_PARSER = Pattern.compile(
+            "siginfo:\\s+si_signo:\\s+(\\d+)\\s+\\((\\w+)\\),\\s+si_code:\\s+(\\d+)\\s+\\(([^)]+)\\),\\s+"
+                    + "(?:si_addr:\\s+(0x[0-9a-fA-F]+)|si_pid:\\s+(\\d+),\\s+si_uid:\\s+(\\d+))");
+    private static final Pattern DYNAMIC_LIBS_PATH_PARSER =
+            Pattern.compile("^(?:0x)?[0-9a-fA-F]+(?:-[0-9a-fA-F]+)?\\s+(?:[^\\s/\\[]+\\s+)*(.*)$");
+    // Matches register entries like:
+    // * RAX=0x..., R8 =0x..., TRAPNO=0x... (x86-64)
+    // * R0=0x..., R30=0x... (Linux aarch64)
+    // * x0=0x..., fp=0x..., lr=0x..., sp=0x..., pc=0x... (macOS aarch64)
+    // Note that register formatting varies by platform, the JVM crash handler can emit one or four
+    // per line.
+    private static final Pattern REGISTER_ENTRY_PARSER =
+            Pattern.compile("([A-Za-z][A-Za-z0-9]*)\\s*=\\s*(0x[0-9a-fA-F]+)");
+    private static final Pattern REGISTER_TO_MEMORY_MAPPING_PARSER =
+            Pattern.compile("^\\s*([A-Za-z][A-Za-z0-9]*)\\s*=");
+    // Used for the REGISTERS-state exit condition only: the register name must start the line
+    // (after optional whitespace). This prevents lines like "Top of Stack: (sp=0x...)" and
+    // "Instructions: (pc=0x...)" from being mistaken for register entries by REGISTER_ENTRY_PARSER's
+    // find(), which would otherwise match the lowercase "sp"/"pc" tokens embedded in those lines.
+    private static final Pattern REGISTER_LINE_START = Pattern.compile("^\\s*[A-Za-z][A-Za-z0-9]*\\s*=\\s*0x");
+    private static final Pattern SUBSECTION_TITLE = Pattern.compile("^\\s*[A-Za-z][\\w ]*:.+$");
+    private static final Pattern COMPILED_JAVA_ADDRESS_PARSER =
+            Pattern.compile("@\\s+(0x[0-9a-fA-F]+)\\s+\\[(0x[0-9a-fA-F]+)\\+(0x[0-9a-fA-F]+)\\]");
+
+    // HotSpot crash logs encode the execution kind in the first column of each frame line.
+    // Source references:
+    // JDK 8:
+    // https://github.com/openjdk/jdk8u/blob/73c9c6bcd062196cbebc4d9f22b13d2e20a14f98/hotspot/src/share/vm/runtime/frame.cpp#L710-L724
+    // JDK 11:
+    // https://github.com/openjdk/jdk11u/blob/970d6cf491a55fd6ab98ec3f449c13a58633078a/src/hotspot/share/runtime/frame.cpp#L647-L662
+    // JDK 25:
+    // https://github.com/openjdk/jdk25u/blob/2fe611a2a3386d097f636c15bd4d396a82dc695e/src/hotspot/share/runtime/frame.cpp#L652-L666
+    // Mainline:
+    // https://github.com/openjdk/jdk/blob/53c864a881d2183d3664a6a5a56480bd99fffe45/src/hotspot/share/runtime/frame.cpp#L647-L661
+    // Note: the marker set changes across JDK lines. In particular, "A" appears in some HotSpot
+    // versions but not all, so this mapping is best-effort rather than a stable cross-version enum.
+    private static String hotspotFrameType(char marker) {
+        switch (marker) {
+            case 'J':
+                return "compiled";
+            case 'A': // exists in JDK 11
+                return "aot_compiled";
+            case 'j':
+                return "interpreted";
+            case 'V':
+                return "vm";
+            case 'v':
+                return "stub";
+            case 'C':
+                return "native";
+            default:
+                return null;
+        }
     }
-    switch (firstChar) {
-      case 'J':
-      case 'A':
-        {
-          // spotless:off
+
+    private StackFrame parseLine(String line) {
+        if (line == null || line.isEmpty()) {
+            return null;
+        }
+
+        String functionName = null;
+        Integer functionLine = null;
+        String filename = null;
+        String ip = null;
+        String relAddress = null;
+        String symbolAddress = null;
+        char firstChar = line.charAt(0);
+        String frameType = hotspotFrameType(firstChar);
+        if (line.length() > 1 && !Character.isSpaceChar(line.charAt(1))) {
+            // We can find entries like this in between the frames
+            // Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)
+            return null;
+        }
+        switch (firstChar) {
+            case 'J':
+            case 'A': {
+                // spotless:off
           // J 36572 c2 datadog.trace.util.AgentTaskScheduler$PeriodicTask.run()V (25 bytes) @ 0x00007f2fd0198488 [0x00007f2fd0198420+0x0000000000000068]
           // J 3896 c2 java.nio.ByteBuffer.allocate(I)Ljava/nio/ByteBuffer; java.base@21.0.1 (20 bytes) @ 0x0000000112ad51e8 [0x0000000112ad4fc0+0x0000000000000228]
           // J 302  java.util.zip.ZipFile.getEntry(J[BZ)J (0 bytes) @ 0x00007fa287303dce [0x00007fa287303d00+0xce]
           // spotless:on
-          String[] parts = SPACE_SPLITTER.split(line);
-          int bytesToken = -1;
-          for (int i = 0; i < parts.length - 1; i++) {
-            if (parts[i].startsWith("(") && "bytes)".equals(parts[i + 1])) {
-              bytesToken = i;
-              break;
+                String[] parts = SPACE_SPLITTER.split(line);
+                int bytesToken = -1;
+                for (int i = 0; i < parts.length - 1; i++) {
+                    if (parts[i].startsWith("(") && "bytes)".equals(parts[i + 1])) {
+                        bytesToken = i;
+                        break;
+                    }
+                }
+                if (bytesToken > 1) {
+                    String candidate = parts[bytesToken - 1];
+                    // Newer JVMs insert a module token before "(NN bytes)".
+                    if (candidate.contains("@")) {
+                        candidate = parts[bytesToken - 2];
+                    }
+                    if (!candidate.startsWith("(")) {
+                        functionName = candidate;
+                    }
+                } else if (parts.length > 3 && !parts[3].startsWith("(")) {
+                    functionName = parts[3];
+                }
+
+                Matcher matcher = COMPILED_JAVA_ADDRESS_PARSER.matcher(line);
+                if (matcher.find()) {
+                    ip = matcher.group(1);
+                    symbolAddress = matcher.group(2);
+                    relAddress = matcher.group(3);
+                }
+                break;
             }
-          }
-          if (bytesToken > 1) {
-            String candidate = parts[bytesToken - 1];
-            // Newer JVMs insert a module token before "(NN bytes)".
-            if (candidate.contains("@")) {
-              candidate = parts[bytesToken - 2];
+            case 'j': {
+                // j  one.profiler.AsyncProfiler.stop()V+1
+                String[] parts = PLUS_SPLITTER.split(line, 2);
+                if (parts.length > 0 && parts[0].length() > 3) {
+                    functionName = parts[0].substring(3);
+                    if (parts.length > 1) {
+                        try {
+                            functionLine = Integer.parseInt(parts[1]);
+                        } catch (NumberFormatException ignored) {
+                        }
+                    }
+                }
+                break;
             }
-            if (!candidate.startsWith("(")) {
-              functionName = candidate;
+            case 'C':
+            case 'V': {
+                // V  [libjvm.so+0x8fc20a]  thread_entry(JavaThread*, JavaThread*)+0x8a
+                // C  [libpthread.so.0+0x13d60]
+                int libstart = line.indexOf('[');
+                if (libstart > 0) {
+                    int libend = line.indexOf(']', libstart + 1);
+                    if (libend > 0) {
+                        String libAndRelAddress = line.substring(libstart + 1, libend);
+                        String[] parts = PLUS_SPLITTER.split(libAndRelAddress, 2);
+                        filename = parts[0];
+                        if (parts.length > 1) {
+                            relAddress = parts[1];
+                        }
+
+                        // Extract function name if present (after the bracket)
+                        // Keep the relative address offset as part of the function name
+                        if (libend + 3 < line.length() && !line.endsWith("]")) {
+                            functionName = line.substring(libend + 3).trim();
+                        }
+                    }
+                }
+                break;
             }
-          } else if (parts.length > 3 && !parts[3].startsWith("(")) {
-            functionName = parts[3];
-          }
-
-          Matcher matcher = COMPILED_JAVA_ADDRESS_PARSER.matcher(line);
-          if (matcher.find()) {
-            ip = matcher.group(1);
-            symbolAddress = matcher.group(2);
-            relAddress = matcher.group(3);
-          }
-          break;
-        }
-      case 'j':
-        {
-          // j  one.profiler.AsyncProfiler.stop()V+1
-          String[] parts = PLUS_SPLITTER.split(line, 2);
-          if (parts.length > 0 && parts[0].length() > 3) {
-            functionName = parts[0].substring(3);
-            if (parts.length > 1) {
-              try {
-                functionLine = Integer.parseInt(parts[1]);
-              } catch (NumberFormatException ignored) {
-              }
+            case 'v': {
+                // v  ~StubRoutines::call_stub
+                // v  ~RuntimeStub::_new_array_Java 0x00000001124cb638
+                if (line.length() > 3) {
+                    String remaining = line.substring(3).trim();
+                    // Check for address at the end (0x...)
+                    int lastSpace = remaining.lastIndexOf(' ');
+                    if (lastSpace > 0 && lastSpace + 1 < remaining.length()) {
+                        String possibleAddress = remaining.substring(lastSpace + 1);
+                        if (possibleAddress.startsWith("0x")) {
+                            relAddress = possibleAddress;
+                            remaining = remaining.substring(0, lastSpace).trim();
+                        }
+                    }
+                    // Keep the relative address offset as part of the function name
+                    functionName = remaining;
+                }
+                break;
             }
-          }
-          break;
+            default:
+                // do nothing
+                break;
         }
-      case 'C':
-      case 'V':
-        {
-          // V  [libjvm.so+0x8fc20a]  thread_entry(JavaThread*, JavaThread*)+0x8a
-          // C  [libpthread.so.0+0x13d60]
-          int libstart = line.indexOf('[');
-          if (libstart > 0) {
-            int libend = line.indexOf(']', libstart + 1);
-            if (libend > 0) {
-              String libAndRelAddress = line.substring(libstart + 1, libend);
-              String[] parts = PLUS_SPLITTER.split(libAndRelAddress, 2);
-              filename = parts[0];
-              if (parts.length > 1) {
-                relAddress = parts[1];
-              }
-
-              // Extract function name if present (after the bracket)
-              // Keep the relative address offset as part of the function name
-              if (libend + 3 < line.length() && !line.endsWith("]")) {
-                functionName = line.substring(libend + 3).trim();
-              }
-            }
-          }
-          break;
+        if (filename != null && !filename.isEmpty()) {
+            buildIdCollector.addUnprocessedLibrary(filename);
         }
-      case 'v':
-        {
-          // v  ~StubRoutines::call_stub
-          // v  ~RuntimeStub::_new_array_Java 0x00000001124cb638
-          if (line.length() > 3) {
-            String remaining = line.substring(3).trim();
-            // Check for address at the end (0x...)
-            int lastSpace = remaining.lastIndexOf(' ');
-            if (lastSpace > 0 && lastSpace + 1 < remaining.length()) {
-              String possibleAddress = remaining.substring(lastSpace + 1);
-              if (possibleAddress.startsWith("0x")) {
-                relAddress = possibleAddress;
-                remaining = remaining.substring(0, lastSpace).trim();
-              }
-            }
-            // Keep the relative address offset as part of the function name
-            functionName = remaining;
-          }
-          break;
+
+        if (functionName != null || filename != null) {
+            return new StackFrame(
+                    filename,
+                    functionLine,
+                    stripCompilerAnnotations(functionName),
+                    frameType,
+                    null,
+                    null,
+                    null,
+                    ip,
+                    symbolAddress,
+                    relAddress);
         }
-      default:
-        // do nothing
-        break;
-    }
-    if (filename != null && !filename.isEmpty()) {
-      buildIdCollector.addUnprocessedLibrary(filename);
+        return null;
     }
 
-    if (functionName != null || filename != null) {
-      return new StackFrame(
-          filename,
-          functionLine,
-          stripCompilerAnnotations(functionName),
-          frameType,
-          null,
-          null,
-          null,
-          ip,
-          symbolAddress,
-          relAddress);
+    private static String stripCompilerAnnotations(String functionName) {
+        if (functionName == null) {
+            return null;
+        }
+        // Strip compiler annotations like [clone .isra.531], [clone .constprop.0], etc.
+        int bracketIdx = functionName.lastIndexOf(" [");
+        if (bracketIdx > 0 && functionName.endsWith("]")) {
+            return functionName.substring(0, bracketIdx);
+        }
+        return functionName;
     }
-    return null;
-  }
 
-  private static String stripCompilerAnnotations(String functionName) {
-    if (functionName == null) {
-      return null;
-    }
-    // Strip compiler annotations like [clone .isra.531], [clone .constprop.0], etc.
-    int bracketIdx = functionName.lastIndexOf(" [");
-    if (bracketIdx > 0 && functionName.endsWith("]")) {
-      return functionName.substring(0, bracketIdx);
-    }
-    return functionName;
-  }
-
-  private static String knownLibraryPrefix(String filename) {
-    final String lowerCased = filename.toLowerCase(Locale.ROOT);
-    for (String prefix : KNOWN_LIBRARY_NAMES) {
-      if (lowerCased.startsWith(prefix)) {
-        return prefix;
-      }
+    private static String knownLibraryPrefix(String filename) {
+        final String lowerCased = filename.toLowerCase(Locale.ROOT);
+        for (String prefix : KNOWN_LIBRARY_NAMES) {
+            if (lowerCased.startsWith(prefix)) {
+                return prefix;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  private static String normalizeFilename(String filename) {
-    if (filename == null) {
-      return null;
-    }
-    final String prefix = knownLibraryPrefix(filename);
-    if (prefix == null) {
-      return filename;
-    }
+    private static String normalizeFilename(String filename) {
+        if (filename == null) {
+            return null;
+        }
+        final String prefix = knownLibraryPrefix(filename);
+        if (prefix == null) {
+            return filename;
+        }
 
-    final int prefixLen = prefix.length();
-    final int end = filename.indexOf('.', prefixLen);
-    if (end < prefixLen) {
-      return filename;
+        final int prefixLen = prefix.length();
+        final int end = filename.indexOf('.', prefixLen);
+        if (end < prefixLen) {
+            return filename;
+        }
+        return filename.substring(0, prefixLen) + filename.substring(end);
     }
-    return filename.substring(0, prefixLen) + filename.substring(end);
-  }
 
-  static String parseCurrentThreadName(String line) {
-    if (line == null || !line.startsWith("Current thread ")) {
-      return null;
-    }
-    final int separator = line.indexOf(':');
-    if (separator < 0) {
-      return null;
-    }
+    static String parseCurrentThreadName(String line) {
+        if (line == null || !line.startsWith("Current thread ")) {
+            return null;
+        }
+        final int separator = line.indexOf(':');
+        if (separator < 0) {
+            return null;
+        }
 
-    String threadDescriptor = line.substring(separator + 1).trim();
-    final int metadataStart = threadDescriptor.indexOf('[');
-    if (metadataStart >= 0) {
-      threadDescriptor = threadDescriptor.substring(0, metadataStart).trim();
-    }
-    if (threadDescriptor.isEmpty()) {
-      return null;
+        String threadDescriptor = line.substring(separator + 1).trim();
+        final int metadataStart = threadDescriptor.indexOf('[');
+        if (metadataStart >= 0) {
+            threadDescriptor = threadDescriptor.substring(0, metadataStart).trim();
+        }
+        if (threadDescriptor.isEmpty()) {
+            return null;
+        }
+        return threadDescriptor;
     }
-    return threadDescriptor;
-  }
 
-  private static List<String> parseHotspotJvmArgs(String line) {
-    if (line == null || !line.startsWith(HOTSPOT_JVM_ARGS_PREFIX)) {
-      return null;
+    private static List<String> parseHotspotJvmArgs(String line) {
+        if (line == null || !line.startsWith(HOTSPOT_JVM_ARGS_PREFIX)) {
+            return null;
+        }
+        return RuntimeArgs.parseVmArgs(line.substring(HOTSPOT_JVM_ARGS_PREFIX.length()));
     }
-    return RuntimeArgs.parseVmArgs(line.substring(HOTSPOT_JVM_ARGS_PREFIX.length()));
-  }
-
-  public CrashLog parse(String uuid, String crashLog) {
-    SigInfo sigInfo = null;
-    String pid = null;
-    String threadName = null;
-    List<StackFrame> frames = new ArrayList<>();
-    String datetime = null;
-    String datetimeRaw = null;
-    boolean incomplete = false;
-    String oomMessage = null;
-    Map<String, String> registers = new LinkedHashMap<>();
-    Map<String, String> registerToMemoryMapping = new LinkedHashMap<>();
-    String currentRegisterToMemoryMapping = "";
-    List<String> runtimeArgs = null;
-    List<String> dynamicLibraryLines = null;
-    String dynamicLibraryKey = null;
-    boolean previousLineBlank = false;
-    State nextThreadSectionState = null;
-    String jreVersion = null;
-    String javaVm = null;
-    String vmInfo = null;
-
-    String[] lines = NEWLINE_SPLITTER.split(crashLog);
-    outer:
-    for (String line : lines) {
-      switch (state) {
-        case NEW:
-          if (line.startsWith(
-              "# A fatal error has been detected by the Java Runtime Environment:")) {
-            state = State.MESSAGE; // jump directly to MESSAGE state
-          }
-          break;
-        case MESSAGE:
-          if (line.toLowerCase().contains("core dump")) {
-            // break out of the message block
-            state = State.HEADER;
-          } else if (oomMessage == null
-              && (sigInfo == null || "INVALID".equals(sigInfo.name))
-              && !"#".equals(line)) {
-            // note: some jvm might use INVALID to represent a OOM crash too.
-            final int oomIdx = line.indexOf(OOM_MARKER);
-            if (oomIdx > 0) {
-              oomMessage = line.substring(oomIdx + OOM_MARKER.length());
-            } else {
-              int pidIdx = line.indexOf("pid=");
-              if (pidIdx > -1) {
-                int endIdx = line.indexOf(',', pidIdx);
-                pid = line.substring(pidIdx + 4, endIdx);
-              }
-            }
-          }
-          if (jreVersion == null && line.startsWith(JRE_VERSION_PREFIX)) {
-            jreVersion = line.substring(JRE_VERSION_PREFIX.length()).trim();
-          } else if (javaVm == null && line.startsWith(JAVA_VM_PREFIX)) {
-            javaVm = line.substring(JAVA_VM_PREFIX.length()).trim();
-          }
-          break;
-        case HEADER:
-          if (line.contains("S U M M A R Y")) {
-            state = State.SUMMARY;
-          } else if (line.contains("T H R E A D")) {
-            state = State.THREAD;
-          }
-          break;
-        case SUMMARY:
-          if (line.contains("T H R E A D")) {
-            state = State.THREAD;
-          } else if (line.contains("Time: ")) {
-            int idx = line.lastIndexOf(" elapsed time: ");
-            datetime = dateTimeToISO(idx > -1 ? line.substring(6, idx) : line.substring(6));
-          }
-          break;
-        case THREAD:
-          if (threadName == null) {
-            threadName = parseCurrentThreadName(line);
-          }
-          // Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
-          if (line.startsWith("Native frames: ")) {
-            state = State.STACKTRACE;
-          }
-          break;
-        case STACKTRACE:
-          nextThreadSectionState = nextThreadSectionState(line, previousLineBlank);
-          if (nextThreadSectionState != null) {
-            state = nextThreadSectionState;
-          } else if (line.startsWith("siginfo:")) {
-            // spotless:off
+
+    public CrashLog parse(String uuid, String crashLog) {
+        SigInfo sigInfo = null;
+        String pid = null;
+        String threadName = null;
+        List<StackFrame> frames = new ArrayList<>();
+        String datetime = null;
+        String datetimeRaw = null;
+        boolean incomplete = false;
+        String oomMessage = null;
+        Map<String, String> registers = new LinkedHashMap<>();
+        Map<String, String> registerToMemoryMapping = new LinkedHashMap<>();
+        String currentRegisterToMemoryMapping = "";
+        List<String> runtimeArgs = null;
+        List<String> dynamicLibraryLines = null;
+        String dynamicLibraryKey = null;
+        boolean previousLineBlank = false;
+        State nextThreadSectionState = null;
+        String jreVersion = null;
+        String javaVm = null;
+        String vmInfo = null;
+
+        String[] lines = NEWLINE_SPLITTER.split(crashLog);
+        outer:
+        for (String line : lines) {
+            switch (state) {
+                case NEW:
+                    if (line.startsWith("# A fatal error has been detected by the Java Runtime Environment:")) {
+                        state = State.MESSAGE; // jump directly to MESSAGE state
+                    }
+                    break;
+                case MESSAGE:
+                    if (line.toLowerCase().contains("core dump")) {
+                        // break out of the message block
+                        state = State.HEADER;
+                    } else if (oomMessage == null
+                            && (sigInfo == null || "INVALID".equals(sigInfo.name))
+                            && !"#".equals(line)) {
+                        // note: some jvm might use INVALID to represent a OOM crash too.
+                        final int oomIdx = line.indexOf(OOM_MARKER);
+                        if (oomIdx > 0) {
+                            oomMessage = line.substring(oomIdx + OOM_MARKER.length());
+                        } else {
+                            int pidIdx = line.indexOf("pid=");
+                            if (pidIdx > -1) {
+                                int endIdx = line.indexOf(',', pidIdx);
+                                pid = line.substring(pidIdx + 4, endIdx);
+                            }
+                        }
+                    }
+                    if (jreVersion == null && line.startsWith(JRE_VERSION_PREFIX)) {
+                        jreVersion = line.substring(JRE_VERSION_PREFIX.length()).trim();
+                    } else if (javaVm == null && line.startsWith(JAVA_VM_PREFIX)) {
+                        javaVm = line.substring(JAVA_VM_PREFIX.length()).trim();
+                    }
+                    break;
+                case HEADER:
+                    if (line.contains("S U M M A R Y")) {
+                        state = State.SUMMARY;
+                    } else if (line.contains("T H R E A D")) {
+                        state = State.THREAD;
+                    }
+                    break;
+                case SUMMARY:
+                    if (line.contains("T H R E A D")) {
+                        state = State.THREAD;
+                    } else if (line.contains("Time: ")) {
+                        int idx = line.lastIndexOf(" elapsed time: ");
+                        datetime = dateTimeToISO(idx > -1 ? line.substring(6, idx) : line.substring(6));
+                    }
+                    break;
+                case THREAD:
+                    if (threadName == null) {
+                        threadName = parseCurrentThreadName(line);
+                    }
+                    // Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+                    if (line.startsWith("Native frames: ")) {
+                        state = State.STACKTRACE;
+                    }
+                    break;
+                case STACKTRACE:
+                    nextThreadSectionState = nextThreadSectionState(line, previousLineBlank);
+                    if (nextThreadSectionState != null) {
+                        state = nextThreadSectionState;
+                    } else if (line.startsWith("siginfo:")) {
+                        // spotless:off
             // siginfo: si_signo: 11 (SIGSEGV), si_code: 1 (SEGV_MAPERR), si_addr: 0x70
             // siginfo: si_signo: 11 (SIGSEGV), si_code: 0 (SI_USER), si_pid: 554848, si_uid: 1000
             // spotless:on
-            final Matcher siginfoMatcher = SIGINFO_PARSER.matcher(line);
-            if (siginfoMatcher.matches()) {
-              Integer number = safelyParseInt(siginfoMatcher.group(1));
-              String name = siginfoMatcher.group(2);
-              Integer siCode = safelyParseInt(siginfoMatcher.group(3));
-              String sigAction = siginfoMatcher.group(4);
-              String address = siginfoMatcher.group(5);
-              Integer siPid = safelyParseInt(siginfoMatcher.group(6));
-              Integer siUid = safelyParseInt(siginfoMatcher.group(7));
-              sigInfo = new SigInfo(number, name, siCode, sigAction, address, siPid, siUid);
-            }
-          } else {
-            // Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
-            final StackFrame frame = parseLine(line);
-            if (frame != null) {
-              frames.add(frame);
-            }
-          }
-          break;
-        case REGISTER_TO_MEMORY_MAPPING:
-          nextThreadSectionState = nextThreadSectionState(line, previousLineBlank);
-          if (nextThreadSectionState != null) {
-            currentRegisterToMemoryMapping = "";
-            state = nextThreadSectionState;
-          } else if (line.startsWith("siginfo:")) {
-            // siginfo marks the end of the register-to-memory mapping section;
-            // stop appending continuations to the last register's value
-            currentRegisterToMemoryMapping = "";
-          } else if (!line.isEmpty()) {
-            final Matcher m = REGISTER_TO_MEMORY_MAPPING_PARSER.matcher(line);
-            if (m.lookingAt()) {
-              currentRegisterToMemoryMapping = m.group(1);
-              registerToMemoryMapping.put(currentRegisterToMemoryMapping, line.substring(m.end()));
-            } else if (!currentRegisterToMemoryMapping.isEmpty()) {
-              registerToMemoryMapping.computeIfPresent(
-                  currentRegisterToMemoryMapping, (key, value) -> value + "\n" + line);
+                        final Matcher siginfoMatcher = SIGINFO_PARSER.matcher(line);
+                        if (siginfoMatcher.matches()) {
+                            Integer number = safelyParseInt(siginfoMatcher.group(1));
+                            String name = siginfoMatcher.group(2);
+                            Integer siCode = safelyParseInt(siginfoMatcher.group(3));
+                            String sigAction = siginfoMatcher.group(4);
+                            String address = siginfoMatcher.group(5);
+                            Integer siPid = safelyParseInt(siginfoMatcher.group(6));
+                            Integer siUid = safelyParseInt(siginfoMatcher.group(7));
+                            sigInfo = new SigInfo(number, name, siCode, sigAction, address, siPid, siUid);
+                        }
+                    } else {
+                        // Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+                        final StackFrame frame = parseLine(line);
+                        if (frame != null) {
+                            frames.add(frame);
+                        }
+                    }
+                    break;
+                case REGISTER_TO_MEMORY_MAPPING:
+                    nextThreadSectionState = nextThreadSectionState(line, previousLineBlank);
+                    if (nextThreadSectionState != null) {
+                        currentRegisterToMemoryMapping = "";
+                        state = nextThreadSectionState;
+                    } else if (line.startsWith("siginfo:")) {
+                        // siginfo marks the end of the register-to-memory mapping section;
+                        // stop appending continuations to the last register's value
+                        currentRegisterToMemoryMapping = "";
+                    } else if (!line.isEmpty()) {
+                        final Matcher m = REGISTER_TO_MEMORY_MAPPING_PARSER.matcher(line);
+                        if (m.lookingAt()) {
+                            currentRegisterToMemoryMapping = m.group(1);
+                            registerToMemoryMapping.put(currentRegisterToMemoryMapping, line.substring(m.end()));
+                        } else if (!currentRegisterToMemoryMapping.isEmpty()) {
+                            registerToMemoryMapping.computeIfPresent(
+                                    currentRegisterToMemoryMapping, (key, value) -> value + "\n" + line);
+                        }
+                    }
+                    break;
+                case REGISTERS:
+                    nextThreadSectionState = nextThreadSectionState(line, previousLineBlank);
+                    if (nextThreadSectionState != null) {
+                        state = nextThreadSectionState;
+                    } else if (!line.isEmpty()
+                            && !REGISTER_LINE_START.matcher(line).find()) {
+                        // non-empty line that does not start with a register entry signals end of section
+                        state = State.STACKTRACE;
+                    } else {
+                        final Matcher m = REGISTER_ENTRY_PARSER.matcher(line);
+                        while (m.find()) {
+                            registers.put(m.group(1), m.group(2));
+                        }
+                    }
+                    break;
+                case PROCESS:
+                    if (runtimeArgs == null && line.startsWith("VM Arguments:")) {
+                        state = State.VM_ARGUMENTS;
+                    } else if (line.startsWith("Dynamic libraries:")) {
+                        state = State.DYNAMIC_LIBRARIES;
+                    } else if (line.contains("S Y S T E M")) {
+                        state = State.SYSTEM;
+                    } else if (vmInfo == null && line.startsWith(VM_INFO_PREFIX)) {
+                        vmInfo = line.substring(VM_INFO_PREFIX.length()).trim();
+                    } else if (line.equals("END.")) {
+                        state = State.DONE;
+                    }
+                    break;
+                case VM_ARGUMENTS:
+                    if (line.isEmpty()) {
+                        state = State.PROCESS;
+                    } else if (runtimeArgs == null && line.startsWith(HOTSPOT_JVM_ARGS_PREFIX)) {
+                        runtimeArgs = parseHotspotJvmArgs(line);
+                    }
+                    break;
+                case DYNAMIC_LIBRARIES:
+                    if (line.isEmpty()) {
+                        state = State.PROCESS;
+                    } else {
+                        if (dynamicLibraryKey == null) {
+                            dynamicLibraryKey = detectDynamicLibrariesKey(line);
+                            dynamicLibraryLines = new ArrayList<>();
+                        }
+                        final Matcher matcher = DYNAMIC_LIBS_PATH_PARSER.matcher(line);
+                        if (matcher.matches()) {
+                            final String pathString = matcher.group(1);
+                            if (pathString != null && !pathString.isEmpty()) {
+                                dynamicLibraryLines.add(line);
+                                try {
+                                    final Path path = Paths.get(pathString);
+                                    buildIdCollector.resolveBuildId(path);
+                                } catch (InvalidPathException ignored) {
+                                }
+                            }
+                        }
+                    }
+                    break;
+                case SYSTEM:
+                    if (line.equals("END.")) {
+                        state = State.DONE;
+                    } else if (datetime == null && datetimeRaw == null && line.startsWith("time: ")) {
+                        // JDK 8 fallback: no SUMMARY section, time is split across two lines here
+                        datetimeRaw = line.substring(6).trim();
+                    } else if (datetime == null && datetimeRaw != null && line.startsWith("timezone: ")) {
+                        datetime = dateTimeToISO(
+                                datetimeRaw + " " + line.substring(10).trim());
+                    } else if (vmInfo == null && line.startsWith(VM_INFO_PREFIX)) {
+                        vmInfo = line.substring(VM_INFO_PREFIX.length()).trim();
+                    }
+                    break;
+                case DONE:
+                    // skip
+                    buildIdCollector.awaitCollectionDone(5);
+                    break outer;
+                default:
+                    // unexpected parser state; bail out
+                    break outer;
             }
-          }
-          break;
-        case REGISTERS:
-          nextThreadSectionState = nextThreadSectionState(line, previousLineBlank);
-          if (nextThreadSectionState != null) {
-            state = nextThreadSectionState;
-          } else if (!line.isEmpty() && !REGISTER_LINE_START.matcher(line).find()) {
-            // non-empty line that does not start with a register entry signals end of section
-            state = State.STACKTRACE;
-          } else {
-            final Matcher m = REGISTER_ENTRY_PARSER.matcher(line);
-            while (m.find()) {
-              registers.put(m.group(1), m.group(2));
-            }
-          }
-          break;
-        case PROCESS:
-          if (runtimeArgs == null && line.startsWith("VM Arguments:")) {
-            state = State.VM_ARGUMENTS;
-          } else if (line.startsWith("Dynamic libraries:")) {
-            state = State.DYNAMIC_LIBRARIES;
-          } else if (line.contains("S Y S T E M")) {
-            state = State.SYSTEM;
-          } else if (vmInfo == null && line.startsWith(VM_INFO_PREFIX)) {
-            vmInfo = line.substring(VM_INFO_PREFIX.length()).trim();
-          } else if (line.equals("END.")) {
-            state = State.DONE;
-          }
-          break;
-        case VM_ARGUMENTS:
-          if (line.isEmpty()) {
-            state = State.PROCESS;
-          } else if (runtimeArgs == null && line.startsWith(HOTSPOT_JVM_ARGS_PREFIX)) {
-            runtimeArgs = parseHotspotJvmArgs(line);
-          }
-          break;
-        case DYNAMIC_LIBRARIES:
-          if (line.isEmpty()) {
-            state = State.PROCESS;
-          } else {
-            if (dynamicLibraryKey == null) {
-              dynamicLibraryKey = detectDynamicLibrariesKey(line);
-              dynamicLibraryLines = new ArrayList<>();
+            previousLineBlank = line.isEmpty();
+        }
+
+        // PROCESS and SYSTEM sections are late enough that all critical data is captured
+        if (state != State.DONE && state != State.PROCESS && state != State.SYSTEM) {
+            // incomplete crash log
+            incomplete = true;
+        }
+        final String kind;
+        final String message;
+        if (oomMessage != null) {
+            kind = "OutOfMemory";
+            message = oomMessage;
+        } else if (sigInfo != null && sigInfo.name != null) {
+            kind = sigInfo.name;
+            message = "Process terminated by signal " + kind;
+        } else {
+            kind = "InternalError";
+            message = "Process terminated by Internal error";
+        }
+
+        final List<StackFrame> enrichedFrames = new ArrayList<>(frames.size());
+
+        for (StackFrame frame : frames) {
+            // enrich with the build id if collected (best effort)
+            if (frame.path == null) {
+                enrichedFrames.add(frame);
+                continue;
             }
-            final Matcher matcher = DYNAMIC_LIBS_PATH_PARSER.matcher(line);
-            if (matcher.matches()) {
-              final String pathString = matcher.group(1);
-              if (pathString != null && !pathString.isEmpty()) {
-                dynamicLibraryLines.add(line);
-                try {
-                  final Path path = Paths.get(pathString);
-                  buildIdCollector.resolveBuildId(path);
-                } catch (InvalidPathException ignored) {
-                }
-              }
+            final BuildInfo buildInfo = buildIdCollector.getBuildInfo(frame.path);
+            if (buildInfo != null) {
+                enrichedFrames.add(new StackFrame(
+                        normalizeFilename(frame.path),
+                        frame.line,
+                        frame.function,
+                        frame.frameType,
+                        buildInfo.buildId,
+                        buildInfo.buildIdType,
+                        buildInfo.fileType,
+                        frame.ip,
+                        frame.symbolAddress,
+                        frame.relativeAddress));
+            } else {
+                enrichedFrames.add(new StackFrame(
+                        normalizeFilename(frame.path),
+                        frame.line,
+                        frame.function,
+                        frame.frameType,
+                        null,
+                        null,
+                        null,
+                        frame.ip,
+                        frame.symbolAddress,
+                        frame.relativeAddress));
             }
-          }
-          break;
-        case SYSTEM:
-          if (line.equals("END.")) {
-            state = State.DONE;
-          } else if (datetime == null && datetimeRaw == null && line.startsWith("time: ")) {
-            // JDK 8 fallback: no SUMMARY section, time is split across two lines here
-            datetimeRaw = line.substring(6).trim();
-          } else if (datetime == null && datetimeRaw != null && line.startsWith("timezone: ")) {
-            datetime = dateTimeToISO(datetimeRaw + " " + line.substring(10).trim());
-          } else if (vmInfo == null && line.startsWith(VM_INFO_PREFIX)) {
-            vmInfo = line.substring(VM_INFO_PREFIX.length()).trim();
-          }
-          break;
-        case DONE:
-          // skip
-          buildIdCollector.awaitCollectionDone(5);
-          break outer;
-        default:
-          // unexpected parser state; bail out
-          break outer;
-      }
-      previousLineBlank = line.isEmpty();
-    }
+        }
 
-    // PROCESS and SYSTEM sections are late enough that all critical data is captured
-    if (state != State.DONE && state != State.PROCESS && state != State.SYSTEM) {
-      // incomplete crash log
-      incomplete = true;
-    }
-    final String kind;
-    final String message;
-    if (oomMessage != null) {
-      kind = "OutOfMemory";
-      message = oomMessage;
-    } else if (sigInfo != null && sigInfo.name != null) {
-      kind = sigInfo.name;
-      message = "Process terminated by signal " + kind;
-    } else {
-      kind = "InternalError";
-      message = "Process terminated by Internal error";
+        ErrorData error =
+                new ErrorData(kind, message, threadName, new StackTrace(enrichedFrames.toArray(new StackFrame[0])));
+        // We can not really extract the full metadata and os info from the crash log
+        // This code assumes the parser is run on the same machine as the crash happened
+        Metadata metadata = new Metadata("dd-trace-java", VersionInfo.VERSION, "java", null);
+        Integer parsedPid = safelyParseInt(pid);
+        ProcInfo procInfo = parsedPid != null ? new ProcInfo(parsedPid) : null;
+        Map<String, String> resolvedMapping = null;
+        if (!registerToMemoryMapping.isEmpty()) {
+            registerToMemoryMapping.replaceAll((k, v) -> RedactUtils.redactRegisterToMemoryMapping(v));
+            resolvedMapping = registerToMemoryMapping;
+        }
+        RuntimeInfo runtimeInfo = (jreVersion != null || javaVm != null || vmInfo != null)
+                ? new RuntimeInfo(jreVersion, javaVm, vmInfo)
+                : null;
+        Experimental experimental = !registers.isEmpty()
+                        || resolvedMapping != null
+                        || (runtimeArgs != null && !runtimeArgs.isEmpty())
+                        || runtimeInfo != null
+                ? new Experimental(registers, resolvedMapping, runtimeArgs, runtimeInfo)
+                : null;
+        DynamicLibs files = (dynamicLibraryLines != null && !dynamicLibraryLines.isEmpty())
+                ? new DynamicLibs(dynamicLibraryKey, dynamicLibraryLines)
+                : null;
+        return new CrashLog(
+                uuid,
+                incomplete,
+                datetime,
+                error,
+                metadata,
+                OSInfo.current(),
+                procInfo,
+                sigInfo,
+                "1.0",
+                experimental,
+                files);
     }
 
-    final List<StackFrame> enrichedFrames = new ArrayList<>(frames.size());
-
-    for (StackFrame frame : frames) {
-      // enrich with the build id if collected (best effort)
-      if (frame.path == null) {
-        enrichedFrames.add(frame);
-        continue;
-      }
-      final BuildInfo buildInfo = buildIdCollector.getBuildInfo(frame.path);
-      if (buildInfo != null) {
-        enrichedFrames.add(
-            new StackFrame(
-                normalizeFilename(frame.path),
-                frame.line,
-                frame.function,
-                frame.frameType,
-                buildInfo.buildId,
-                buildInfo.buildIdType,
-                buildInfo.fileType,
-                frame.ip,
-                frame.symbolAddress,
-                frame.relativeAddress));
-      } else {
-        enrichedFrames.add(
-            new StackFrame(
-                normalizeFilename(frame.path),
-                frame.line,
-                frame.function,
-                frame.frameType,
-                null,
-                null,
-                null,
-                frame.ip,
-                frame.symbolAddress,
-                frame.relativeAddress));
-      }
+    static String dateTimeToISO(String datetime) {
+        try {
+            return ZonedDateTime.parse(datetime, ZONED_DATE_TIME_FORMATTER).format(ISO_OFFSET_DATE_TIME);
+        } catch (DateTimeParseException ignored) {
+            try {
+                return OffsetDateTime.parse(datetime, OFFSET_DATE_TIME_FORMATTER)
+                        .format(ISO_OFFSET_DATE_TIME);
+            } catch (DateTimeParseException e3) {
+                // Failed to parse date time
+                return null;
+            }
+        }
     }
 
-    ErrorData error =
-        new ErrorData(
-            kind, message, threadName, new StackTrace(enrichedFrames.toArray(new StackFrame[0])));
-    // We can not really extract the full metadata and os info from the crash log
-    // This code assumes the parser is run on the same machine as the crash happened
-    Metadata metadata = new Metadata("dd-trace-java", VersionInfo.VERSION, "java", null);
-    Integer parsedPid = safelyParseInt(pid);
-    ProcInfo procInfo = parsedPid != null ? new ProcInfo(parsedPid) : null;
-    Map<String, String> resolvedMapping = null;
-    if (!registerToMemoryMapping.isEmpty()) {
-      registerToMemoryMapping.replaceAll((k, v) -> RedactUtils.redactRegisterToMemoryMapping(v));
-      resolvedMapping = registerToMemoryMapping;
-    }
-    RuntimeInfo runtimeInfo =
-        (jreVersion != null || javaVm != null || vmInfo != null)
-            ? new RuntimeInfo(jreVersion, javaVm, vmInfo)
-            : null;
-    Experimental experimental =
-        !registers.isEmpty()
-                || resolvedMapping != null
-                || (runtimeArgs != null && !runtimeArgs.isEmpty())
-                || runtimeInfo != null
-            ? new Experimental(registers, resolvedMapping, runtimeArgs, runtimeInfo)
-            : null;
-    DynamicLibs files =
-        (dynamicLibraryLines != null && !dynamicLibraryLines.isEmpty())
-            ? new DynamicLibs(dynamicLibraryKey, dynamicLibraryLines)
-            : null;
-    return new CrashLog(
-        uuid,
-        incomplete,
-        datetime,
-        error,
-        metadata,
-        OSInfo.current(),
-        procInfo,
-        sigInfo,
-        "1.0",
-        experimental,
-        files);
-  }
-
-  static String dateTimeToISO(String datetime) {
-    try {
-      return ZonedDateTime.parse(datetime, ZONED_DATE_TIME_FORMATTER).format(ISO_OFFSET_DATE_TIME);
-    } catch (DateTimeParseException ignored) {
-      try {
-        return OffsetDateTime.parse(datetime, OFFSET_DATE_TIME_FORMATTER)
-            .format(ISO_OFFSET_DATE_TIME);
-      } catch (DateTimeParseException e3) {
-        // Failed to parse date time
+    private static State nextThreadSectionState(String line, boolean previousLineBlank) {
+        if (line.startsWith("Register to memory mapping:")) {
+            return State.REGISTER_TO_MEMORY_MAPPING;
+        }
+        if (line.startsWith("Registers:")) {
+            return State.REGISTERS;
+        }
+        if (line.startsWith("siginfo:")) {
+            // siginfo is handled directly in the STACKTRACE case; returning null here does not change the
+            // parser state
+            return null;
+        }
+        if (line.contains("P R O C E S S")) {
+            return State.PROCESS;
+        }
+        if (previousLineBlank && SUBSECTION_TITLE.matcher(line).matches()) {
+            return State.STACKTRACE;
+        }
         return null;
-      }
     }
-  }
 
-  private static State nextThreadSectionState(String line, boolean previousLineBlank) {
-    if (line.startsWith("Register to memory mapping:")) {
-      return State.REGISTER_TO_MEMORY_MAPPING;
-    }
-    if (line.startsWith("Registers:")) {
-      return State.REGISTERS;
-    }
-    if (line.startsWith("siginfo:")) {
-      // siginfo is handled directly in the STACKTRACE case; returning null here does not change the
-      // parser state
-      return null;
-    }
-    if (line.contains("P R O C E S S")) {
-      return State.PROCESS;
-    }
-    if (previousLineBlank && SUBSECTION_TITLE.matcher(line).matches()) {
-      return State.STACKTRACE;
+    /**
+     * Detects whether the Dynamic libraries section comes from Linux {@code /proc/self/maps} (address
+     * range format {@code addr-addr perms ...}) or from the BSD/macOS dyld callback (format {@code
+     * 0xaddr\tpath}). Returns the appropriate map key.
+     */
+    // The "Dynamic libraries:" section is written by os::print_dll_info(), whose implementation
+    // differs by platform:
+    //
+    // Linux
+    // -----
+    // This reads `/proc/{tid}/maps` verbatim via _print_ascii_file(), producing the usual
+    // `/proc/self/maps` format:
+    //
+    //   "addr-addr perms offset dev:inode [path]"
+    //
+    // Mainline:
+    // https://github.com/openjdk/jdk/blob/783f8f1adc4ea3ef7fd4c5ca5473aad76dfc7ed1/src/hotspot/os/linux/os_linux.cpp#L2086-L2099
+    //
+    // BSD/macOS
+    // ---------
+    // This relies on `_dyld_image_count()`/`_dyld_get_image_name()` (on macOS) or
+    // `dlinfo(RTLD_DI_LINKMAP)` (on FreeBSD/OpenBSD) via a callback, producing a simpler format:
+    //
+    //   "0xaddr\tpath"
+    //
+    // which lacks much of the information found in Linux's `/proc/self/maps`.
+    // Mainline:
+    // https://github.com/openjdk/jdk/blob/783f8f1adc4ea3ef7fd4c5ca5473aad76dfc7ed1/src/hotspot/os/bsd/os_bsd.cpp#L1382-L1387
+    static String detectDynamicLibrariesKey(String firstLine) {
+        int dash = firstLine.indexOf('-');
+        int space = firstLine.indexOf(' ');
+        return (dash > 0 && space > 0 && dash < space) ? "/proc/self/maps" : "dynamic_libraries";
     }
-    return null;
-  }
-
-  /**
-   * Detects whether the Dynamic libraries section comes from Linux {@code /proc/self/maps} (address
-   * range format {@code addr-addr perms ...}) or from the BSD/macOS dyld callback (format {@code
-   * 0xaddr\tpath}). Returns the appropriate map key.
-   */
-  // The "Dynamic libraries:" section is written by os::print_dll_info(), whose implementation
-  // differs by platform:
-  //
-  // Linux
-  // -----
-  // This reads `/proc/{tid}/maps` verbatim via _print_ascii_file(), producing the usual
-  // `/proc/self/maps` format:
-  //
-  //   "addr-addr perms offset dev:inode [path]"
-  //
-  // Mainline:
-  // https://github.com/openjdk/jdk/blob/783f8f1adc4ea3ef7fd4c5ca5473aad76dfc7ed1/src/hotspot/os/linux/os_linux.cpp#L2086-L2099
-  //
-  // BSD/macOS
-  // ---------
-  // This relies on `_dyld_image_count()`/`_dyld_get_image_name()` (on macOS) or
-  // `dlinfo(RTLD_DI_LINKMAP)` (on FreeBSD/OpenBSD) via a callback, producing a simpler format:
-  //
-  //   "0xaddr\tpath"
-  //
-  // which lacks much of the information found in Linux's `/proc/self/maps`.
-  // Mainline:
-  // https://github.com/openjdk/jdk/blob/783f8f1adc4ea3ef7fd4c5ca5473aad76dfc7ed1/src/hotspot/os/bsd/os_bsd.cpp#L1382-L1387
-  static String detectDynamicLibrariesKey(String firstLine) {
-    int dash = firstLine.indexOf('-');
-    int space = firstLine.indexOf(' ');
-    return (dash > 0 && space > 0 && dash < space) ? "/proc/self/maps" : "dynamic_libraries";
-  }
-
-  static Integer safelyParseInt(String value) {
-    if (value == null) {
-      return null;
-    }
-    try {
-      return Integer.parseInt(value);
-    } catch (NumberFormatException e) {
-      return null;
+
+    static Integer safelyParseInt(String value) {
+        if (value == null) {
+            return null;
+        }
+        try {
+            return Integer.parseInt(value);
+        } catch (NumberFormatException e) {
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/J9JavacoreParser.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/J9JavacoreParser.java
index cb5dc5ed8f5..7aa228df0bf 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/J9JavacoreParser.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/J9JavacoreParser.java
@@ -46,473 +46,460 @@
  * </ul>
  */
 public final class J9JavacoreParser {
-  private static final String J9_USER_ARG_PREFIX = "2CIUSERARG";
-  private static final String J9_JAVA_VERSION_PREFIX = "1CIJAVAVERSION ";
-  private static final String J9_VM_VERSION_PREFIX = "1CIVMVERSION";
-
-  private final BuildIdCollector buildIdCollector;
-
-  public J9JavacoreParser() {
-    this.buildIdCollector = new BuildIdCollector();
-  }
-
-  private static final String OOM_MARKER = "OutOfMemory";
-
-  // J9 event types mapped to signal names and numbers
-  private static final String EVENT_GPF = "gpf";
-  private static final String EVENT_ABORT = "abort";
-  private static final String EVENT_SYSTHROW = "systhrow";
-
-  // Section markers
-  private static final String SECTION_MARKER = "0SECTION";
-  private static final String SECTION_TITLE = "TITLE";
-  private static final String SECTION_GPINFO = "GPINFO";
-  private static final String SECTION_ENVINFO = "ENVINFO";
-  private static final String SECTION_THREADS = "THREADS";
-
-  // Tag patterns
-  private static final Pattern NEWLINE_SPLITTER = Pattern.compile("\\n");
-  private static final Pattern SIG_INFO_PATTERN =
-      Pattern.compile("1TISIGINFO\\s+Dump Event \"(\\w+)\"(?:\\s+\\((\\w+)\\))?.*");
-  private static final Pattern DATETIME_PATTERN =
-      Pattern.compile(
-          "1TIDATETIME\\s+Date:\\s+(\\d{4}/\\d{2}/\\d{2})\\s+at\\s+(\\d{2}:\\d{2}:\\d{2})(?::(\\d{3}))?.*");
-  private static final Pattern PID_PATTERN =
-      Pattern.compile("1CIPROCESSID\\s+Process ID:\\s+(\\d+).*");
-  private static final Pattern CURRENT_THREAD_PATTERN =
-      Pattern.compile("1XMCURTHDINFO\\s+Current thread.*");
-  private static final Pattern THREAD_INFO_PATTERN =
-      Pattern.compile("3XMTHREADINFO\\s+\"(.+?)\".*");
-  private static final Pattern JAVA_STACK_PATTERN = Pattern.compile("4XESTACKTRACE\\s+at\\s+(.+)");
-  private static final Pattern NATIVE_STACK_PATTERN = Pattern.compile("4XENATIVESTACK\\s+(.+)");
-  private static final Pattern EXCEPTION_DETAIL_PATTERN =
-      Pattern.compile("1TISIGINFO.*[Dd]etail\\s+\"(.+?)\".*");
-  // Matches register entries in J9 GPINFO section, e.g.:
-  // 2XHREGISTER      RDI: 0000000000000001  (x86-64)
-  // 2XHREGISTER      R29: 0000FFFF990CDB50  (aarch64)
-  private static final Pattern REGISTER_ENTRY_PARSER =
-      Pattern.compile("([A-Za-z][A-Za-z0-9]*)\\s*:\\s*([0-9a-fA-F]+)");
-  // Date time formatter for J9 format: YYYY/MM/DD at HH:MM:SS
-  private static final DateTimeFormatter J9_DATETIME_FORMATTER =
-      DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss", Locale.ROOT);
-
-  enum Section {
-    NONE,
-    TITLE,
-    GPINFO,
-    ENVINFO,
-    THREADS,
-    OTHER
-  }
-
-  public CrashLog parse(String uuid, String javacoreContent) {
-    // Parser state - kept as local variables to ensure thread safety and reusability
-    Section currentSection = Section.NONE;
-    boolean inCurrentThread = false;
-    boolean collectingStack = false;
-    String eventType = null;
-    String eventCode = null;
-    String exceptionDetail = null;
-    String pid = null;
-    String datetime = null;
-    String currentThreadName = null;
-    List<StackFrame> frames = new ArrayList<>();
-    boolean incomplete = false;
-    boolean foundThreadSection = false;
-
-    Map<String, String> registers = null;
-    RuntimeArgs j9UserArgs = new RuntimeArgs();
-    String j9JavaVersion = null;
-    String j9VmVersion = null;
-
-    String[] lines = NEWLINE_SPLITTER.split(javacoreContent);
-
-    for (String line : lines) {
-      // Full command line is available under 1CICMDLINE, but it's harder to parse properly,
-      // than adding them from 2CIUSERARGS
-      if (line.startsWith(J9_USER_ARG_PREFIX)) {
-        j9UserArgs.addArg(line.substring(J9_USER_ARG_PREFIX.length()).trim());
-      }
-
-      // Track section changes
-      if (line.startsWith(SECTION_MARKER)) {
-        currentSection = detectSection(line);
-        if (currentSection == Section.THREADS) {
-          foundThreadSection = true;
-          inCurrentThread = false;
-          collectingStack = false;
-        }
-        continue;
-      }
-
-      switch (currentSection) {
-        case TITLE:
-          // Extract event type (gpf, abort, systhrow)
-          Matcher sigMatcher = SIG_INFO_PATTERN.matcher(line);
-          if (sigMatcher.matches()) {
-            eventType = sigMatcher.group(1);
-            eventCode = sigMatcher.group(2);
-          }
-
-          // Extract exception detail for systhrow events
-          Matcher detailMatcher = EXCEPTION_DETAIL_PATTERN.matcher(line);
-          if (detailMatcher.matches()) {
-            exceptionDetail = detailMatcher.group(1);
-          }
-
-          // Extract timestamp
-          Matcher dtMatcher = DATETIME_PATTERN.matcher(line);
-          if (dtMatcher.matches()) {
-            datetime = parseDateTime(dtMatcher.group(1), dtMatcher.group(2));
-          }
-          break;
-
-        case GPINFO:
-          if (line.startsWith("1XHREGISTERS")) {
-            registers = new LinkedHashMap<>();
-          } else if (registers != null && line.startsWith("2XHREGISTER")) {
-            final Matcher m = REGISTER_ENTRY_PARSER.matcher(line);
-            while (m.find()) {
-              registers.put(m.group(1), "0x" + m.group(2));
+    private static final String J9_USER_ARG_PREFIX = "2CIUSERARG";
+    private static final String J9_JAVA_VERSION_PREFIX = "1CIJAVAVERSION ";
+    private static final String J9_VM_VERSION_PREFIX = "1CIVMVERSION";
+
+    private final BuildIdCollector buildIdCollector;
+
+    public J9JavacoreParser() {
+        this.buildIdCollector = new BuildIdCollector();
+    }
+
+    private static final String OOM_MARKER = "OutOfMemory";
+
+    // J9 event types mapped to signal names and numbers
+    private static final String EVENT_GPF = "gpf";
+    private static final String EVENT_ABORT = "abort";
+    private static final String EVENT_SYSTHROW = "systhrow";
+
+    // Section markers
+    private static final String SECTION_MARKER = "0SECTION";
+    private static final String SECTION_TITLE = "TITLE";
+    private static final String SECTION_GPINFO = "GPINFO";
+    private static final String SECTION_ENVINFO = "ENVINFO";
+    private static final String SECTION_THREADS = "THREADS";
+
+    // Tag patterns
+    private static final Pattern NEWLINE_SPLITTER = Pattern.compile("\\n");
+    private static final Pattern SIG_INFO_PATTERN =
+            Pattern.compile("1TISIGINFO\\s+Dump Event \"(\\w+)\"(?:\\s+\\((\\w+)\\))?.*");
+    private static final Pattern DATETIME_PATTERN = Pattern.compile(
+            "1TIDATETIME\\s+Date:\\s+(\\d{4}/\\d{2}/\\d{2})\\s+at\\s+(\\d{2}:\\d{2}:\\d{2})(?::(\\d{3}))?.*");
+    private static final Pattern PID_PATTERN = Pattern.compile("1CIPROCESSID\\s+Process ID:\\s+(\\d+).*");
+    private static final Pattern CURRENT_THREAD_PATTERN = Pattern.compile("1XMCURTHDINFO\\s+Current thread.*");
+    private static final Pattern THREAD_INFO_PATTERN = Pattern.compile("3XMTHREADINFO\\s+\"(.+?)\".*");
+    private static final Pattern JAVA_STACK_PATTERN = Pattern.compile("4XESTACKTRACE\\s+at\\s+(.+)");
+    private static final Pattern NATIVE_STACK_PATTERN = Pattern.compile("4XENATIVESTACK\\s+(.+)");
+    private static final Pattern EXCEPTION_DETAIL_PATTERN = Pattern.compile("1TISIGINFO.*[Dd]etail\\s+\"(.+?)\".*");
+    // Matches register entries in J9 GPINFO section, e.g.:
+    // 2XHREGISTER      RDI: 0000000000000001  (x86-64)
+    // 2XHREGISTER      R29: 0000FFFF990CDB50  (aarch64)
+    private static final Pattern REGISTER_ENTRY_PARSER =
+            Pattern.compile("([A-Za-z][A-Za-z0-9]*)\\s*:\\s*([0-9a-fA-F]+)");
+    // Date time formatter for J9 format: YYYY/MM/DD at HH:MM:SS
+    private static final DateTimeFormatter J9_DATETIME_FORMATTER =
+            DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss", Locale.ROOT);
+
+    enum Section {
+        NONE,
+        TITLE,
+        GPINFO,
+        ENVINFO,
+        THREADS,
+        OTHER
+    }
+
+    public CrashLog parse(String uuid, String javacoreContent) {
+        // Parser state - kept as local variables to ensure thread safety and reusability
+        Section currentSection = Section.NONE;
+        boolean inCurrentThread = false;
+        boolean collectingStack = false;
+        String eventType = null;
+        String eventCode = null;
+        String exceptionDetail = null;
+        String pid = null;
+        String datetime = null;
+        String currentThreadName = null;
+        List<StackFrame> frames = new ArrayList<>();
+        boolean incomplete = false;
+        boolean foundThreadSection = false;
+
+        Map<String, String> registers = null;
+        RuntimeArgs j9UserArgs = new RuntimeArgs();
+        String j9JavaVersion = null;
+        String j9VmVersion = null;
+
+        String[] lines = NEWLINE_SPLITTER.split(javacoreContent);
+
+        for (String line : lines) {
+            // Full command line is available under 1CICMDLINE, but it's harder to parse properly,
+            // than adding them from 2CIUSERARGS
+            if (line.startsWith(J9_USER_ARG_PREFIX)) {
+                j9UserArgs.addArg(line.substring(J9_USER_ARG_PREFIX.length()).trim());
             }
-          }
-          break;
-
-        case ENVINFO:
-          // Extract process ID
-          Matcher pidMatcher = PID_PATTERN.matcher(line);
-          if (pidMatcher.matches()) {
-            pid = pidMatcher.group(1);
-          }
-          if (j9JavaVersion == null && line.startsWith(J9_JAVA_VERSION_PREFIX)) {
-            j9JavaVersion = line.substring(J9_JAVA_VERSION_PREFIX.length()).trim();
-          } else if (j9VmVersion == null && line.startsWith(J9_VM_VERSION_PREFIX)) {
-            j9VmVersion = line.substring(J9_VM_VERSION_PREFIX.length()).trim();
-          }
-          break;
-
-        case THREADS:
-          // Look for current thread marker
-          if (CURRENT_THREAD_PATTERN.matcher(line).matches()) {
-            inCurrentThread = true;
-            continue;
-          }
-
-          // If in current thread section, look for thread info start
-          if (inCurrentThread && line.startsWith("3XMTHREADINFO")) {
-            Matcher threadMatcher = THREAD_INFO_PATTERN.matcher(line);
-            if (threadMatcher.matches()) {
-              currentThreadName = threadMatcher.group(1);
-              collectingStack = true;
+
+            // Track section changes
+            if (line.startsWith(SECTION_MARKER)) {
+                currentSection = detectSection(line);
+                if (currentSection == Section.THREADS) {
+                    foundThreadSection = true;
+                    inCurrentThread = false;
+                    collectingStack = false;
+                }
+                continue;
             }
-            continue;
-          }
-
-          // Collect stack frames for current thread
-          if (collectingStack) {
-            // Java stack frame
-            Matcher javaStackMatcher = JAVA_STACK_PATTERN.matcher(line);
-            if (javaStackMatcher.matches()) {
-              StackFrame frame = parseJavaStackFrame(javaStackMatcher.group(1));
-              if (frame != null) {
-                frames.add(frame);
-              }
-              continue;
+
+            switch (currentSection) {
+                case TITLE:
+                    // Extract event type (gpf, abort, systhrow)
+                    Matcher sigMatcher = SIG_INFO_PATTERN.matcher(line);
+                    if (sigMatcher.matches()) {
+                        eventType = sigMatcher.group(1);
+                        eventCode = sigMatcher.group(2);
+                    }
+
+                    // Extract exception detail for systhrow events
+                    Matcher detailMatcher = EXCEPTION_DETAIL_PATTERN.matcher(line);
+                    if (detailMatcher.matches()) {
+                        exceptionDetail = detailMatcher.group(1);
+                    }
+
+                    // Extract timestamp
+                    Matcher dtMatcher = DATETIME_PATTERN.matcher(line);
+                    if (dtMatcher.matches()) {
+                        datetime = parseDateTime(dtMatcher.group(1), dtMatcher.group(2));
+                    }
+                    break;
+
+                case GPINFO:
+                    if (line.startsWith("1XHREGISTERS")) {
+                        registers = new LinkedHashMap<>();
+                    } else if (registers != null && line.startsWith("2XHREGISTER")) {
+                        final Matcher m = REGISTER_ENTRY_PARSER.matcher(line);
+                        while (m.find()) {
+                            registers.put(m.group(1), "0x" + m.group(2));
+                        }
+                    }
+                    break;
+
+                case ENVINFO:
+                    // Extract process ID
+                    Matcher pidMatcher = PID_PATTERN.matcher(line);
+                    if (pidMatcher.matches()) {
+                        pid = pidMatcher.group(1);
+                    }
+                    if (j9JavaVersion == null && line.startsWith(J9_JAVA_VERSION_PREFIX)) {
+                        j9JavaVersion =
+                                line.substring(J9_JAVA_VERSION_PREFIX.length()).trim();
+                    } else if (j9VmVersion == null && line.startsWith(J9_VM_VERSION_PREFIX)) {
+                        j9VmVersion =
+                                line.substring(J9_VM_VERSION_PREFIX.length()).trim();
+                    }
+                    break;
+
+                case THREADS:
+                    // Look for current thread marker
+                    if (CURRENT_THREAD_PATTERN.matcher(line).matches()) {
+                        inCurrentThread = true;
+                        continue;
+                    }
+
+                    // If in current thread section, look for thread info start
+                    if (inCurrentThread && line.startsWith("3XMTHREADINFO")) {
+                        Matcher threadMatcher = THREAD_INFO_PATTERN.matcher(line);
+                        if (threadMatcher.matches()) {
+                            currentThreadName = threadMatcher.group(1);
+                            collectingStack = true;
+                        }
+                        continue;
+                    }
+
+                    // Collect stack frames for current thread
+                    if (collectingStack) {
+                        // Java stack frame
+                        Matcher javaStackMatcher = JAVA_STACK_PATTERN.matcher(line);
+                        if (javaStackMatcher.matches()) {
+                            StackFrame frame = parseJavaStackFrame(javaStackMatcher.group(1));
+                            if (frame != null) {
+                                frames.add(frame);
+                            }
+                            continue;
+                        }
+
+                        // Native stack frame
+                        Matcher nativeStackMatcher = NATIVE_STACK_PATTERN.matcher(line);
+                        if (nativeStackMatcher.matches()) {
+                            StackFrame frame = parseNativeStackFrame(nativeStackMatcher.group(1));
+                            if (frame != null) {
+                                frames.add(frame);
+                            }
+                            continue;
+                        }
+
+                        // End of stack trace - blank line or new section
+                        if (line.isEmpty() || line.startsWith("NULL") || line.startsWith("0SECTION")) {
+                            collectingStack = false;
+                            inCurrentThread = false;
+                        }
+                    }
+                    break;
+
+                default:
+                    break;
             }
+        }
+
+        // Check for incomplete parse
+        if (!foundThreadSection || (eventType == null && exceptionDetail == null)) {
+            incomplete = true;
+        }
+
+        // Wait for build ID collection to complete
+        buildIdCollector.awaitCollectionDone(5);
+
+        // Build signal info from event type
+        SigInfo sigInfo = buildSigInfo(eventType, eventCode);
+
+        // Determine error kind and message
+        String kind;
+        String message;
+        if (isOOMEvent(eventType, exceptionDetail)) {
+            kind = "OutOfMemory";
+            message = exceptionDetail != null ? exceptionDetail : "OutOfMemoryError";
+        } else if (eventType != null) {
+            kind = sigInfo != null && sigInfo.name != null ? sigInfo.name : eventType.toUpperCase(Locale.ROOT);
+            message = "Process terminated by signal " + kind;
+        } else {
+            kind = "InternalError";
+            message = "Process terminated by Internal error";
+        }
 
-            // Native stack frame
-            Matcher nativeStackMatcher = NATIVE_STACK_PATTERN.matcher(line);
-            if (nativeStackMatcher.matches()) {
-              StackFrame frame = parseNativeStackFrame(nativeStackMatcher.group(1));
-              if (frame != null) {
-                frames.add(frame);
-              }
-              continue;
+        // Enrich frames with build IDs (best effort)
+        final List<StackFrame> enrichedFrames = new ArrayList<>(frames.size());
+        for (StackFrame frame : frames) {
+            if (frame.path == null) {
+                enrichedFrames.add(frame);
+                continue;
             }
 
-            // End of stack trace - blank line or new section
-            if (line.isEmpty() || line.startsWith("NULL") || line.startsWith("0SECTION")) {
-              collectingStack = false;
-              inCurrentThread = false;
+            // Try to resolve build ID for this library
+            final BuildInfo buildInfo = buildIdCollector.getBuildInfo(frame.path);
+            if (buildInfo != null) {
+                enrichedFrames.add(new StackFrame(
+                        frame.path,
+                        frame.line,
+                        frame.function,
+                        frame.frameType,
+                        buildInfo.buildId,
+                        buildInfo.buildIdType,
+                        buildInfo.fileType,
+                        frame.ip,
+                        frame.symbolAddress,
+                        frame.relativeAddress));
+            } else {
+                enrichedFrames.add(frame);
             }
-          }
-          break;
+        }
 
-        default:
-          break;
-      }
+        ErrorData error = new ErrorData(
+                kind, message, currentThreadName, new StackTrace(enrichedFrames.toArray(new StackFrame[0])));
+        Metadata metadata = new Metadata("dd-trace-java", VersionInfo.VERSION, "java", null);
+        Integer parsedPid = safelyParseInt(pid);
+        ProcInfo procInfo = parsedPid != null ? new ProcInfo(parsedPid) : null;
+        List<String> runtimeArgs = j9UserArgs.build();
+        RuntimeInfo runtimeInfo = (j9JavaVersion != null || j9VmVersion != null)
+                ? new RuntimeInfo(j9JavaVersion, null, j9VmVersion)
+                : null;
+        Experimental experimental = (registers != null && !registers.isEmpty())
+                        || (runtimeArgs != null && !runtimeArgs.isEmpty())
+                        || runtimeInfo != null
+                ? new Experimental(registers, null, runtimeArgs, runtimeInfo)
+                : null;
+
+        return new CrashLog(
+                uuid,
+                incomplete,
+                datetime,
+                error,
+                metadata,
+                OSInfo.current(),
+                procInfo,
+                sigInfo,
+                "1.0",
+                experimental,
+                null);
     }
 
-    // Check for incomplete parse
-    if (!foundThreadSection || (eventType == null && exceptionDetail == null)) {
-      incomplete = true;
+    private static Integer safelyParseInt(String value) {
+        if (value == null) {
+            return null;
+        }
+        try {
+            return Integer.parseInt(value);
+        } catch (NumberFormatException e) {
+            return null;
+        }
     }
 
-    // Wait for build ID collection to complete
-    buildIdCollector.awaitCollectionDone(5);
-
-    // Build signal info from event type
-    SigInfo sigInfo = buildSigInfo(eventType, eventCode);
-
-    // Determine error kind and message
-    String kind;
-    String message;
-    if (isOOMEvent(eventType, exceptionDetail)) {
-      kind = "OutOfMemory";
-      message = exceptionDetail != null ? exceptionDetail : "OutOfMemoryError";
-    } else if (eventType != null) {
-      kind =
-          sigInfo != null && sigInfo.name != null
-              ? sigInfo.name
-              : eventType.toUpperCase(Locale.ROOT);
-      message = "Process terminated by signal " + kind;
-    } else {
-      kind = "InternalError";
-      message = "Process terminated by Internal error";
+    private static Section detectSection(String line) {
+        if (line.contains(SECTION_TITLE)) {
+            return Section.TITLE;
+        } else if (line.contains(SECTION_GPINFO)) {
+            return Section.GPINFO;
+        } else if (line.contains(SECTION_ENVINFO)) {
+            return Section.ENVINFO;
+        } else if (line.contains(SECTION_THREADS)) {
+            return Section.THREADS;
+        } else {
+            return Section.OTHER;
+        }
     }
 
-    // Enrich frames with build IDs (best effort)
-    final List<StackFrame> enrichedFrames = new ArrayList<>(frames.size());
-    for (StackFrame frame : frames) {
-      if (frame.path == null) {
-        enrichedFrames.add(frame);
-        continue;
-      }
-
-      // Try to resolve build ID for this library
-      final BuildInfo buildInfo = buildIdCollector.getBuildInfo(frame.path);
-      if (buildInfo != null) {
-        enrichedFrames.add(
-            new StackFrame(
-                frame.path,
-                frame.line,
-                frame.function,
-                frame.frameType,
-                buildInfo.buildId,
-                buildInfo.buildIdType,
-                buildInfo.fileType,
-                frame.ip,
-                frame.symbolAddress,
-                frame.relativeAddress));
-      } else {
-        enrichedFrames.add(frame);
-      }
+    private boolean isOOMEvent(String eventType, String exceptionDetail) {
+        if (EVENT_SYSTHROW.equals(eventType) && exceptionDetail != null) {
+            return exceptionDetail.contains(OOM_MARKER);
+        }
+        return false;
     }
 
-    ErrorData error =
-        new ErrorData(
-            kind,
-            message,
-            currentThreadName,
-            new StackTrace(enrichedFrames.toArray(new StackFrame[0])));
-    Metadata metadata = new Metadata("dd-trace-java", VersionInfo.VERSION, "java", null);
-    Integer parsedPid = safelyParseInt(pid);
-    ProcInfo procInfo = parsedPid != null ? new ProcInfo(parsedPid) : null;
-    List<String> runtimeArgs = j9UserArgs.build();
-    RuntimeInfo runtimeInfo =
-        (j9JavaVersion != null || j9VmVersion != null)
-            ? new RuntimeInfo(j9JavaVersion, null, j9VmVersion)
-            : null;
-    Experimental experimental =
-        (registers != null && !registers.isEmpty())
-                || (runtimeArgs != null && !runtimeArgs.isEmpty())
-                || runtimeInfo != null
-            ? new Experimental(registers, null, runtimeArgs, runtimeInfo)
-            : null;
-
-    return new CrashLog(
-        uuid,
-        incomplete,
-        datetime,
-        error,
-        metadata,
-        OSInfo.current(),
-        procInfo,
-        sigInfo,
-        "1.0",
-        experimental,
-        null);
-  }
-
-  private static Integer safelyParseInt(String value) {
-    if (value == null) {
-      return null;
-    }
-    try {
-      return Integer.parseInt(value);
-    } catch (NumberFormatException e) {
-      return null;
-    }
-  }
-
-  private static Section detectSection(String line) {
-    if (line.contains(SECTION_TITLE)) {
-      return Section.TITLE;
-    } else if (line.contains(SECTION_GPINFO)) {
-      return Section.GPINFO;
-    } else if (line.contains(SECTION_ENVINFO)) {
-      return Section.ENVINFO;
-    } else if (line.contains(SECTION_THREADS)) {
-      return Section.THREADS;
-    } else {
-      return Section.OTHER;
-    }
-  }
+    private SigInfo buildSigInfo(String eventType, String eventCode) {
+        if (eventType == null) {
+            return null;
+        }
 
-  private boolean isOOMEvent(String eventType, String exceptionDetail) {
-    if (EVENT_SYSTHROW.equals(eventType) && exceptionDetail != null) {
-      return exceptionDetail.contains(OOM_MARKER);
-    }
-    return false;
-  }
+        String signalName;
+        int signalNumber;
+
+        switch (eventType.toLowerCase(Locale.ROOT)) {
+            case EVENT_GPF:
+                signalName = "SIGSEGV";
+                signalNumber = 11;
+                break;
+            case EVENT_ABORT:
+                signalName = "SIGABRT";
+                signalNumber = 6;
+                break;
+            case EVENT_SYSTHROW:
+                signalName = "EXCEPTION";
+                signalNumber = 0;
+                break;
+            default:
+                signalName = eventType.toUpperCase(Locale.ROOT);
+                signalNumber = parseEventCode(eventCode);
+        }
 
-  private SigInfo buildSigInfo(String eventType, String eventCode) {
-    if (eventType == null) {
-      return null;
+        return new SigInfo(signalNumber, signalName, null, null, null, null, null);
     }
 
-    String signalName;
-    int signalNumber;
-
-    switch (eventType.toLowerCase(Locale.ROOT)) {
-      case EVENT_GPF:
-        signalName = "SIGSEGV";
-        signalNumber = 11;
-        break;
-      case EVENT_ABORT:
-        signalName = "SIGABRT";
-        signalNumber = 6;
-        break;
-      case EVENT_SYSTHROW:
-        signalName = "EXCEPTION";
-        signalNumber = 0;
-        break;
-      default:
-        signalName = eventType.toUpperCase(Locale.ROOT);
-        signalNumber = parseEventCode(eventCode);
+    private int parseEventCode(String eventCode) {
+        if (eventCode == null) {
+            return 0;
+        }
+        try {
+            return Integer.decode(eventCode);
+        } catch (NumberFormatException e) {
+            return 0;
+        }
     }
 
-    return new SigInfo(signalNumber, signalName, null, null, null, null, null);
-  }
-
-  private int parseEventCode(String eventCode) {
-    if (eventCode == null) {
-      return 0;
-    }
-    try {
-      return Integer.decode(eventCode);
-    } catch (NumberFormatException e) {
-      return 0;
-    }
-  }
-
-  /**
-   * Parse J9 Java stack frame format: package/Class.method(Source.java:line) or
-   * package/Class.method(Native Method)
-   */
-  private StackFrame parseJavaStackFrame(String frameText) {
-    String function = frameText.trim();
-    String file = null;
-    Integer line = null;
-
-    // Extract source file and line: method(File.java:123)
-    int parenStart = function.lastIndexOf('(');
-    int parenEnd = function.lastIndexOf(')');
-    String frameType = "java";
-    if (parenStart > 0 && parenEnd > parenStart) {
-      String sourceInfo = function.substring(parenStart + 1, parenEnd);
-      function = function.substring(0, parenStart);
-
-      if ("Native Method".equals(sourceInfo)) {
-        frameType = "native";
-      } else {
-        int colonIdx = sourceInfo.lastIndexOf(':');
-        if (colonIdx > 0) {
-          file = sourceInfo.substring(0, colonIdx);
-          try {
-            line = Integer.parseInt(sourceInfo.substring(colonIdx + 1));
-          } catch (NumberFormatException ignored) {
-            // Keep line as null
-          }
-        } else {
-          file = sourceInfo;
+    /**
+     * Parse J9 Java stack frame format: package/Class.method(Source.java:line) or
+     * package/Class.method(Native Method)
+     */
+    private StackFrame parseJavaStackFrame(String frameText) {
+        String function = frameText.trim();
+        String file = null;
+        Integer line = null;
+
+        // Extract source file and line: method(File.java:123)
+        int parenStart = function.lastIndexOf('(');
+        int parenEnd = function.lastIndexOf(')');
+        String frameType = "java";
+        if (parenStart > 0 && parenEnd > parenStart) {
+            String sourceInfo = function.substring(parenStart + 1, parenEnd);
+            function = function.substring(0, parenStart);
+
+            if ("Native Method".equals(sourceInfo)) {
+                frameType = "native";
+            } else {
+                int colonIdx = sourceInfo.lastIndexOf(':');
+                if (colonIdx > 0) {
+                    file = sourceInfo.substring(0, colonIdx);
+                    try {
+                        line = Integer.parseInt(sourceInfo.substring(colonIdx + 1));
+                    } catch (NumberFormatException ignored) {
+                        // Keep line as null
+                    }
+                } else {
+                    file = sourceInfo;
+                }
+            }
         }
-      }
-    }
 
-    return new StackFrame(file, line, function, frameType, null, null, null, null, null, null);
-  }
-
-  /**
-   * Parse J9 native stack frame format: (0xADDRESS [library+offset]) or functionName+offset
-   * (address [library+offset])
-   */
-  private StackFrame parseNativeStackFrame(String frameText) {
-    String text = frameText.trim();
-    String function = null;
-    String file = null;
-    String relAddress = null;
-
-    // Try to extract library from [lib+offset] pattern
-    int bracketStart = text.indexOf('[');
-    int bracketEnd = text.indexOf(']', bracketStart + 1);
-    if (bracketStart >= 0 && bracketEnd > bracketStart) {
-      String libInfo = text.substring(bracketStart + 1, bracketEnd);
-      int plusIdx = libInfo.indexOf('+');
-      if (plusIdx > 0) {
-        file = libInfo.substring(0, plusIdx);
-        relAddress = libInfo.substring(plusIdx + 1);
-      } else {
-        file = libInfo;
-      }
+        return new StackFrame(file, line, function, frameType, null, null, null, null, null, null);
     }
 
-    // Try to extract function name (before the first parenthesis or bracket)
-    int funcEnd = text.indexOf('(');
-    if (funcEnd < 0) {
-      funcEnd = bracketStart >= 0 ? bracketStart : text.length();
-    }
-    if (funcEnd > 0) {
-      String funcPart = text.substring(0, funcEnd).trim();
-      // Remove trailing +offset if present
-      int plusIdx = funcPart.lastIndexOf('+');
-      if (plusIdx > 0) {
-        function = funcPart.substring(0, plusIdx).trim();
-      } else if (!funcPart.isEmpty() && !funcPart.startsWith("0x")) {
-        function = funcPart;
-      }
-    }
+    /**
+     * Parse J9 native stack frame format: (0xADDRESS [library+offset]) or functionName+offset
+     * (address [library+offset])
+     */
+    private StackFrame parseNativeStackFrame(String frameText) {
+        String text = frameText.trim();
+        String function = null;
+        String file = null;
+        String relAddress = null;
+
+        // Try to extract library from [lib+offset] pattern
+        int bracketStart = text.indexOf('[');
+        int bracketEnd = text.indexOf(']', bracketStart + 1);
+        if (bracketStart >= 0 && bracketEnd > bracketStart) {
+            String libInfo = text.substring(bracketStart + 1, bracketEnd);
+            int plusIdx = libInfo.indexOf('+');
+            if (plusIdx > 0) {
+                file = libInfo.substring(0, plusIdx);
+                relAddress = libInfo.substring(plusIdx + 1);
+            } else {
+                file = libInfo;
+            }
+        }
 
-    // If we couldn't extract a function name, use the whole text
-    if (function == null || function.isEmpty()) {
-      function = text;
-    }
+        // Try to extract function name (before the first parenthesis or bracket)
+        int funcEnd = text.indexOf('(');
+        if (funcEnd < 0) {
+            funcEnd = bracketStart >= 0 ? bracketStart : text.length();
+        }
+        if (funcEnd > 0) {
+            String funcPart = text.substring(0, funcEnd).trim();
+            // Remove trailing +offset if present
+            int plusIdx = funcPart.lastIndexOf('+');
+            if (plusIdx > 0) {
+                function = funcPart.substring(0, plusIdx).trim();
+            } else if (!funcPart.isEmpty() && !funcPart.startsWith("0x")) {
+                function = funcPart;
+            }
+        }
 
-    // Collect library for build ID resolution
-    if (file != null && !file.isEmpty()) {
-      buildIdCollector.addUnprocessedLibrary(file);
+        // If we couldn't extract a function name, use the whole text
+        if (function == null || function.isEmpty()) {
+            function = text;
+        }
 
-      // If the library name looks like a path, also try to resolve its build ID directly
-      if (file.contains("/")) {
-        try {
-          buildIdCollector.resolveBuildId(Paths.get(file));
-        } catch (InvalidPathException ignored) {
-          // Not a valid path, skip
+        // Collect library for build ID resolution
+        if (file != null && !file.isEmpty()) {
+            buildIdCollector.addUnprocessedLibrary(file);
+
+            // If the library name looks like a path, also try to resolve its build ID directly
+            if (file.contains("/")) {
+                try {
+                    buildIdCollector.resolveBuildId(Paths.get(file));
+                } catch (InvalidPathException ignored) {
+                    // Not a valid path, skip
+                }
+            }
         }
-      }
+
+        return new StackFrame(file, null, function, "native", null, null, null, null, null, relAddress);
     }
 
-    return new StackFrame(file, null, function, "native", null, null, null, null, null, relAddress);
-  }
-
-  private String parseDateTime(String datePart, String timePart) {
-    try {
-      String combined = datePart + " " + timePart;
-      LocalDateTime localDateTime = LocalDateTime.parse(combined, J9_DATETIME_FORMATTER);
-      ZonedDateTime zonedDateTime = localDateTime.atZone(ZoneId.systemDefault());
-      return zonedDateTime.format(ISO_OFFSET_DATE_TIME);
-    } catch (DateTimeParseException e) {
-      return null;
+    private String parseDateTime(String datePart, String timePart) {
+        try {
+            String combined = datePart + " " + timePart;
+            LocalDateTime localDateTime = LocalDateTime.parse(combined, J9_DATETIME_FORMATTER);
+            ZonedDateTime zonedDateTime = localDateTime.atZone(ZoneId.systemDefault());
+            return zonedDateTime.format(ISO_OFFSET_DATE_TIME);
+        } catch (DateTimeParseException e) {
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/RedactUtils.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/RedactUtils.java
index 6665d0f412d..7ca6b1df1e1 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/RedactUtils.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/RedactUtils.java
@@ -12,306 +12,296 @@
  */
 public final class RedactUtils {
 
-  static final String REDACTED = "redacted";
-  static final String REDACTED_CLASS = "Redacted";
-  private static final String REDACTED_STRING = "REDACTED";
-
-  private static final String[] KNOWN_PACKAGES_PREFIXES = {
-    // Java SE / JDK internals
-    "java/",
-    "jdk/",
-    "sun/",
-    "javax/",
-    // Jakarta EE (successor to javax)
-    "jakarta/",
-    // Oracle/Sun vendor packages
-    "com/sun/",
-    "com/oracle/",
-    // Datadog top-level and internal shorthand
-    "datadog/",
-    "com/dd/",
-  };
-
-  // " - string: "value"" in String oop dumps
-  private static final Pattern STRING_CONTENT = Pattern.compile("(\\s*- string: )\"[^\"]*\"");
-
-  // Type descriptors like Lcom/company/Type;
-  private static final Pattern TYPE_DESCRIPTOR = Pattern.compile("L([A-Za-z$_][A-Za-z0-9$_/]*);");
-
-  // klass references: - klass: 'com/company/Class'
-  private static final Pattern KLASS_REF = Pattern.compile("(klass: ')([^']+)'");
-
-  // 'in 'class'' clause in {method} descriptor entries
-  private static final Pattern METHOD_IN_CLASS = Pattern.compile("( in ')([^']+)'");
-
-  // Object-reference field values in oop dumps: a 'com/company/Class'{0x...}
-  private static final Pattern OBJ_FIELD_REF = Pattern.compile("(a ')([A-Za-z$_][A-Za-z0-9$_/]*)'");
-
-  // Class name in nmethod compiled-method output (JDK 11+):
-  //   "Compiled method (c2) ... com.company.Foo::methodName (N bytes)"   (PRODUCT — dots)
-  //   "Compiled method (c2) ... com/company/Foo::methodName (N bytes)"   (debug  — slashes)
-  private static final Pattern NMETHOD_CLASS =
-      Pattern.compile("([A-Za-z$_][A-Za-z0-9$_]*(?:[./][A-Za-z$_][A-Za-z0-9$_]*)+)::");
-
-  // Library path in two formats produced by os::print_location():
-  //   <offset 0x...> in /path/to/lib.so at 0x...       (no dladdr symbol)
-  //   symbol+offset in /path/to/lib.so at 0x...         (dladdr resolved a symbol name)
-  private static final Pattern LIBRARY_PATH =
-      Pattern.compile("((?:<[^>]+>|\\S+\\+\\S+)\\s+in\\s+)(/\\S+)");
-
-  // Dotted class name followed by an OOP reference: "com.company.Type"{0x...}
-  // This specifically identifies the inline string value of a java.lang.Class 'name' field
-  private static final Pattern DOTTED_CLASS_OOP_REF =
-      Pattern.compile(
-          "\"([A-Za-z$_][A-Za-z0-9$_]*(?:\\.[A-Za-z$_][A-Za-z0-9$_]*)*)\"(\\{0x[0-9a-fA-F]+\\})");
-
-  // is an oop: com.company.Class
-  private static final Pattern IS_AN_OOP =
-      Pattern.compile("(is an oop: )([A-Za-z$_][A-Za-z0-9$_]*(?:\\.[A-Za-z$_][A-Za-z0-9$_]*)*)");
-
-  // Hex-dump bytes in "points into unknown readable memory:" lines.
-  // Two formats produced by os::print_location():
-  //   "memory: 0x<addr> | ff ff ff ff ..."  (Linux/macOS amd64 — address + pipe + bytes)
-  //   "memory: ff ff ff ff ..."              (Linux aarch64    — bytes only)
-  // The address (when present) is kept; only the raw bytes are redacted.
-  private static final Pattern READABLE_MEMORY_HEX_DUMP =
-      Pattern.compile(
-          "(points into unknown readable memory: (?:0x[0-9a-fA-F]+ \\| )?)([0-9a-fA-F]{2}(?: [0-9a-fA-F]{2})*)");
-
-  private RedactUtils() {}
-
-  /**
-   * Main entry point: redact sensitive data from a register-to-memory mapping value (possibly
-   * multiline).
-   */
-  @SuppressForbidden // split on single-character uses a fast path without regex
-  public static String redactRegisterToMemoryMapping(String value) {
-    if (value == null || value.isEmpty()) return value;
-    String[] lines = value.split("\n", -1);
-    // java.lang.Class oop dumps: String fields hold class names, not arbitrary data.
-    // All other oop types: String fields are application data and must be fully redacted.
-    boolean isClassOop = isJavaLangClassOop(lines[0]);
-    StringBuilder sb = new StringBuilder();
-    for (int i = 0; i < lines.length; i++) {
-      if (i > 0) sb.append('\n');
-      sb.append(redactLine(lines[i], isClassOop));
+    static final String REDACTED = "redacted";
+    static final String REDACTED_CLASS = "Redacted";
+    private static final String REDACTED_STRING = "REDACTED";
+
+    private static final String[] KNOWN_PACKAGES_PREFIXES = {
+        // Java SE / JDK internals
+        "java/",
+        "jdk/",
+        "sun/",
+        "javax/",
+        // Jakarta EE (successor to javax)
+        "jakarta/",
+        // Oracle/Sun vendor packages
+        "com/sun/",
+        "com/oracle/",
+        // Datadog top-level and internal shorthand
+        "datadog/",
+        "com/dd/",
+    };
+
+    // " - string: "value"" in String oop dumps
+    private static final Pattern STRING_CONTENT = Pattern.compile("(\\s*- string: )\"[^\"]*\"");
+
+    // Type descriptors like Lcom/company/Type;
+    private static final Pattern TYPE_DESCRIPTOR = Pattern.compile("L([A-Za-z$_][A-Za-z0-9$_/]*);");
+
+    // klass references: - klass: 'com/company/Class'
+    private static final Pattern KLASS_REF = Pattern.compile("(klass: ')([^']+)'");
+
+    // 'in 'class'' clause in {method} descriptor entries
+    private static final Pattern METHOD_IN_CLASS = Pattern.compile("( in ')([^']+)'");
+
+    // Object-reference field values in oop dumps: a 'com/company/Class'{0x...}
+    private static final Pattern OBJ_FIELD_REF = Pattern.compile("(a ')([A-Za-z$_][A-Za-z0-9$_/]*)'");
+
+    // Class name in nmethod compiled-method output (JDK 11+):
+    //   "Compiled method (c2) ... com.company.Foo::methodName (N bytes)"   (PRODUCT — dots)
+    //   "Compiled method (c2) ... com/company/Foo::methodName (N bytes)"   (debug  — slashes)
+    private static final Pattern NMETHOD_CLASS =
+            Pattern.compile("([A-Za-z$_][A-Za-z0-9$_]*(?:[./][A-Za-z$_][A-Za-z0-9$_]*)+)::");
+
+    // Library path in two formats produced by os::print_location():
+    //   <offset 0x...> in /path/to/lib.so at 0x...       (no dladdr symbol)
+    //   symbol+offset in /path/to/lib.so at 0x...         (dladdr resolved a symbol name)
+    private static final Pattern LIBRARY_PATH = Pattern.compile("((?:<[^>]+>|\\S+\\+\\S+)\\s+in\\s+)(/\\S+)");
+
+    // Dotted class name followed by an OOP reference: "com.company.Type"{0x...}
+    // This specifically identifies the inline string value of a java.lang.Class 'name' field
+    private static final Pattern DOTTED_CLASS_OOP_REF =
+            Pattern.compile("\"([A-Za-z$_][A-Za-z0-9$_]*(?:\\.[A-Za-z$_][A-Za-z0-9$_]*)*)\"(\\{0x[0-9a-fA-F]+\\})");
+
+    // is an oop: com.company.Class
+    private static final Pattern IS_AN_OOP =
+            Pattern.compile("(is an oop: )([A-Za-z$_][A-Za-z0-9$_]*(?:\\.[A-Za-z$_][A-Za-z0-9$_]*)*)");
+
+    // Hex-dump bytes in "points into unknown readable memory:" lines.
+    // Two formats produced by os::print_location():
+    //   "memory: 0x<addr> | ff ff ff ff ..."  (Linux/macOS amd64 — address + pipe + bytes)
+    //   "memory: ff ff ff ff ..."              (Linux aarch64    — bytes only)
+    // The address (when present) is kept; only the raw bytes are redacted.
+    private static final Pattern READABLE_MEMORY_HEX_DUMP = Pattern.compile(
+            "(points into unknown readable memory: (?:0x[0-9a-fA-F]+ \\| )?)([0-9a-fA-F]{2}(?: [0-9a-fA-F]{2})*)");
+
+    private RedactUtils() {}
+
+    /**
+     * Main entry point: redact sensitive data from a register-to-memory mapping value (possibly
+     * multiline).
+     */
+    @SuppressForbidden // split on single-character uses a fast path without regex
+    public static String redactRegisterToMemoryMapping(String value) {
+        if (value == null || value.isEmpty()) return value;
+        String[] lines = value.split("\n", -1);
+        // java.lang.Class oop dumps: String fields hold class names, not arbitrary data.
+        // All other oop types: String fields are application data and must be fully redacted.
+        boolean isClassOop = isJavaLangClassOop(lines[0]);
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < lines.length; i++) {
+            if (i > 0) sb.append('\n');
+            sb.append(redactLine(lines[i], isClassOop));
+        }
+        return sb.toString();
     }
-    return sb.toString();
-  }
-
-  /**
-   * Returns true if the first line of a register-to-memory mapping value indicates a {@code
-   * java.lang.Class} oop (not a subclass or other type).
-   */
-  private static boolean isJavaLangClassOop(String firstLine) {
-    int idx = firstLine.indexOf("is an oop: java.lang.Class");
-    if (idx < 0) return false;
-    // Ensure the class name ends here — not a prefix of e.g. java.lang.ClassLoader
-    int end = idx + "is an oop: java.lang.Class".length();
-    return end >= firstLine.length() || firstLine.charAt(end) == ' ';
-  }
-
-  private static String redactLine(String line, boolean isClassOop) {
-    line = redactStringTypeValue(line);
-    line = redactTypeDescriptors(line);
-    line = redactKlassReference(line);
-    line = redactMethodClass(line);
-    line = redactObjFieldRef(line);
-    line = redactNmethodClass(line);
-    line = redactLibraryPath(line);
-    line = redactStringOopRef(line, isClassOop);
-    line = redactOopClassName(line);
-    line = redactReadableMemoryHexDump(line);
-    return line;
-  }
-
-  /**
-   * Redacts {@code "value"\{0x...\}} OOP references in oop dump field lines. When {@code
-   * isClassOop} is true (inside a {@code java.lang.Class} oop dump) the value is treated as a class
-   * name and redacted to {@code "redacted.Redacted"} unless it belongs to a known package.
-   * Otherwise — any other oop type — the value is always fully redacted to {@code "REDACTED"} since
-   * it may be arbitrary application data.
-   */
-  private static String redactStringOopRef(String line, boolean isClassOop) {
-    return replaceAll(
-        DOTTED_CLASS_OOP_REF,
-        line,
-        m ->
-            isClassOop
-                ? "\"" + redactDottedClassName(m.group(1)) + "\"" + m.group(2)
-                : "\"" + REDACTED_STRING + "\"" + m.group(2));
-  }
-
-  /**
-   * Redacts string content in String oop dump lines: <code> - string: "Some string"</code> to
-   * <code> - string: "REDACTED"</code>
-   */
-  static String redactStringTypeValue(String line) {
-    return STRING_CONTENT.matcher(line).replaceAll("$1\"" + REDACTED_STRING + "\"");
-  }
-
-  /**
-   * Redacts the package of type descriptors in a line: <code>Lcom/company/Type;</code> to <code>
-   * Lredacted/Redacted;</code>
-   */
-  static String redactTypeDescriptors(String line) {
-    return replaceAll(TYPE_DESCRIPTOR, line, m -> "L" + redactJvmClassName(m.group(1)) + ";");
-  }
-
-  /**
-   * Redacts klass references in a line: <code>klass: 'com/company/Class'</code> to <code>
-   * klass: 'redacted/Redacted'</code>
-   */
-  static String redactKlassReference(String line) {
-    return replaceAll(KLASS_REF, line, m -> m.group(1) + redactJvmClassName(m.group(2)) + "'");
-  }
-
-  /**
-   * Redacts the class in a method descriptor's {@code in 'class'} clause: <code>
-   * in 'com/company/Class'</code> to <code>in 'redacted/Redacted'</code>
-   */
-  static String redactMethodClass(String line) {
-    return replaceAll(
-        METHOD_IN_CLASS, line, m -> m.group(1) + redactJvmClassName(m.group(2)) + "'");
-  }
-
-  /**
-   * Redacts all but the parent directory and filename from a library path. Handles both <code>
-   * &lt;offset 0x...&gt; in /path/to/dir/lib.so</code> and <code>symbol+0 in
-   * /path/to/dir/lib.so</code> to <code>... in /redacted/dir/lib.so</code>
-   */
-  static String redactLibraryPath(String line) {
-    return replaceAll(LIBRARY_PATH, line, m -> m.group(1) + redactPath(m.group(2)));
-  }
-
-  /**
-   * Redacts the class name in oop dump object-reference field values: <code>a
-   * 'com/company/Class'</code> to <code>a 'redacted/Redacted'</code>.
-   */
-  static String redactObjFieldRef(String line) {
-    return replaceAll(OBJ_FIELD_REF, line, m -> m.group(1) + redactJvmClassName(m.group(2)) + "'");
-  }
-
-  /**
-   * Redacts the class name in nmethod {@code Compiled method} output (JDK 11+): <code>
-   * com.company.Foo::methodName</code> to <code>redacted.Redacted::methodName</code>. Handles both
-   * dot-separated (PRODUCT build) and slash-separated (debug build) class names.
-   */
-  static String redactNmethodClass(String line) {
-    return replaceAll(
-        NMETHOD_CLASS,
-        line,
-        m -> {
-          String cls = m.group(1);
-          String redacted =
-              cls.indexOf('/') >= 0 ? redactJvmClassName(cls) : redactDottedClassName(cls);
-          return redacted + "::";
+
+    /**
+     * Returns true if the first line of a register-to-memory mapping value indicates a {@code
+     * java.lang.Class} oop (not a subclass or other type).
+     */
+    private static boolean isJavaLangClassOop(String firstLine) {
+        int idx = firstLine.indexOf("is an oop: java.lang.Class");
+        if (idx < 0) return false;
+        // Ensure the class name ends here — not a prefix of e.g. java.lang.ClassLoader
+        int end = idx + "is an oop: java.lang.Class".length();
+        return end >= firstLine.length() || firstLine.charAt(end) == ' ';
+    }
+
+    private static String redactLine(String line, boolean isClassOop) {
+        line = redactStringTypeValue(line);
+        line = redactTypeDescriptors(line);
+        line = redactKlassReference(line);
+        line = redactMethodClass(line);
+        line = redactObjFieldRef(line);
+        line = redactNmethodClass(line);
+        line = redactLibraryPath(line);
+        line = redactStringOopRef(line, isClassOop);
+        line = redactOopClassName(line);
+        line = redactReadableMemoryHexDump(line);
+        return line;
+    }
+
+    /**
+     * Redacts {@code "value"\{0x...\}} OOP references in oop dump field lines. When {@code
+     * isClassOop} is true (inside a {@code java.lang.Class} oop dump) the value is treated as a class
+     * name and redacted to {@code "redacted.Redacted"} unless it belongs to a known package.
+     * Otherwise — any other oop type — the value is always fully redacted to {@code "REDACTED"} since
+     * it may be arbitrary application data.
+     */
+    private static String redactStringOopRef(String line, boolean isClassOop) {
+        return replaceAll(
+                DOTTED_CLASS_OOP_REF,
+                line,
+                m -> isClassOop
+                        ? "\"" + redactDottedClassName(m.group(1)) + "\"" + m.group(2)
+                        : "\"" + REDACTED_STRING + "\"" + m.group(2));
+    }
+
+    /**
+     * Redacts string content in String oop dump lines: <code> - string: "Some string"</code> to
+     * <code> - string: "REDACTED"</code>
+     */
+    static String redactStringTypeValue(String line) {
+        return STRING_CONTENT.matcher(line).replaceAll("$1\"" + REDACTED_STRING + "\"");
+    }
+
+    /**
+     * Redacts the package of type descriptors in a line: <code>Lcom/company/Type;</code> to <code>
+     * Lredacted/Redacted;</code>
+     */
+    static String redactTypeDescriptors(String line) {
+        return replaceAll(TYPE_DESCRIPTOR, line, m -> "L" + redactJvmClassName(m.group(1)) + ";");
+    }
+
+    /**
+     * Redacts klass references in a line: <code>klass: 'com/company/Class'</code> to <code>
+     * klass: 'redacted/Redacted'</code>
+     */
+    static String redactKlassReference(String line) {
+        return replaceAll(KLASS_REF, line, m -> m.group(1) + redactJvmClassName(m.group(2)) + "'");
+    }
+
+    /**
+     * Redacts the class in a method descriptor's {@code in 'class'} clause: <code>
+     * in 'com/company/Class'</code> to <code>in 'redacted/Redacted'</code>
+     */
+    static String redactMethodClass(String line) {
+        return replaceAll(METHOD_IN_CLASS, line, m -> m.group(1) + redactJvmClassName(m.group(2)) + "'");
+    }
+
+    /**
+     * Redacts all but the parent directory and filename from a library path. Handles both <code>
+     * &lt;offset 0x...&gt; in /path/to/dir/lib.so</code> and <code>symbol+0 in
+     * /path/to/dir/lib.so</code> to <code>... in /redacted/dir/lib.so</code>
+     */
+    static String redactLibraryPath(String line) {
+        return replaceAll(LIBRARY_PATH, line, m -> m.group(1) + redactPath(m.group(2)));
+    }
+
+    /**
+     * Redacts the class name in oop dump object-reference field values: <code>a
+     * 'com/company/Class'</code> to <code>a 'redacted/Redacted'</code>.
+     */
+    static String redactObjFieldRef(String line) {
+        return replaceAll(OBJ_FIELD_REF, line, m -> m.group(1) + redactJvmClassName(m.group(2)) + "'");
+    }
+
+    /**
+     * Redacts the class name in nmethod {@code Compiled method} output (JDK 11+): <code>
+     * com.company.Foo::methodName</code> to <code>redacted.Redacted::methodName</code>. Handles both
+     * dot-separated (PRODUCT build) and slash-separated (debug build) class names.
+     */
+    static String redactNmethodClass(String line) {
+        return replaceAll(NMETHOD_CLASS, line, m -> {
+            String cls = m.group(1);
+            String redacted = cls.indexOf('/') >= 0 ? redactJvmClassName(cls) : redactDottedClassName(cls);
+            return redacted + "::";
         });
-  }
-
-  /**
-   * Redacts any {@code "value"\{0x...\}} OOP reference to {@code "REDACTED"\{0x...\}}. This is the
-   * safe default for lines that are not part of a {@code java.lang.Class} oop dump, where the
-   * String value may be arbitrary application data. For class-name-aware redaction (inside a {@code
-   * java.lang.Class} oop) use {@link #redactRegisterToMemoryMapping} which detects the oop type
-   * automatically.
-   */
-  @VisibleForTesting
-  static String redactDottedClassOopRef(String line) {
-    return redactStringOopRef(line, false);
-  }
-
-  /**
-   * Redacts the class name in {@code is an oop: ClassName}: <code>is an oop: com.company.Class
-   * </code> to <code>is an oop: redacted.Redacted</code>
-   */
-  static String redactOopClassName(String line) {
-    return replaceAll(IS_AN_OOP, line, m -> m.group(1) + redactDottedClassName(m.group(2)));
-  }
-
-  /**
-   * Redacts hex-dump bytes in <code>points into unknown readable memory:</code> lines, keeping the
-   * optional leading address. Handles two formats:
-   *
-   * <ul>
-   *   <li><code>memory: 0x&lt;addr&gt; | ff ff ff ff</code> to <code>memory: 0x&lt;addr&gt; |
-   *       REDACTED</code>
-   *   <li><code>memory: ff ff ff ff</code> to <code>memory: REDACTED</code>
-   * </ul>
-   */
-  static String redactReadableMemoryHexDump(String line) {
-    return replaceAll(READABLE_MEMORY_HEX_DUMP, line, m -> m.group(1) + REDACTED_STRING);
-  }
-
-  /**
-   * Redacts a slash-separated JVM class name, unless it belongs to a known package. Unknown classes
-   * are fully redacted: <code>com/company/SomeType</code> to <code>redacted/Redacted</code>; <code>
-   * java/lang/String</code> unchanged.
-   */
-  static String redactJvmClassName(String className) {
-    if (isKnownJvmPackage(className)) {
-      return className;
     }
-    return redactClassName('/', className);
-  }
-
-  /**
-   * Redacts a dot-separated class name, unless it belongs to a known package. Unknown classes are
-   * fully redacted: <code>com.company.SomeType</code> to <code>redacted.Redacted</code>; <code>
-   * java.lang.String</code> unchanged.
-   */
-  static String redactDottedClassName(String className) {
-    if (isKnownJvmPackage(className.replace('.', '/'))) {
-      return className;
+
+    /**
+     * Redacts any {@code "value"\{0x...\}} OOP reference to {@code "REDACTED"\{0x...\}}. This is the
+     * safe default for lines that are not part of a {@code java.lang.Class} oop dump, where the
+     * String value may be arbitrary application data. For class-name-aware redaction (inside a {@code
+     * java.lang.Class} oop) use {@link #redactRegisterToMemoryMapping} which detects the oop type
+     * automatically.
+     */
+    @VisibleForTesting
+    static String redactDottedClassOopRef(String line) {
+        return redactStringOopRef(line, false);
     }
-    return redactClassName('.', className);
-  }
-
-  private static String redactClassName(char sep, String className) {
-    int lastSep = className.lastIndexOf(sep);
-    if (lastSep < 0) return className; // no package — nothing to redact
-    return REDACTED + sep + REDACTED_CLASS;
-  }
-
-  /**
-   * Redacts all but the parent directory and filename from a library path, collapsing all
-   * intermediate segments to a single {@code redacted}. <code>/path/to/dir/lib.so</code> to <code>
-   * /redacted/dir/lib.so</code>
-   */
-  static String redactPath(String path) {
-    int last = path.lastIndexOf('/');
-    if (last <= 0) return path; // /file or empty — nothing to redact
-    int secondLast = path.lastIndexOf('/', last - 1);
-    if (secondLast <= 0) return path; // /dir/file — nothing to redact
-    // Collapse everything before the second-last slash to a single /redacted
-    return "/" + REDACTED + path.substring(secondLast);
-  }
-
-  private static boolean isKnownJvmPackage(String slashClassName) {
-    for (String prefix : KNOWN_PACKAGES_PREFIXES) {
-      if (slashClassName.startsWith(prefix)) {
-        return true;
-      }
+
+    /**
+     * Redacts the class name in {@code is an oop: ClassName}: <code>is an oop: com.company.Class
+     * </code> to <code>is an oop: redacted.Redacted</code>
+     */
+    static String redactOopClassName(String line) {
+        return replaceAll(IS_AN_OOP, line, m -> m.group(1) + redactDottedClassName(m.group(2)));
     }
-    // Match *.datadog* — packages whose second segment starts with "datadog"
-    // e.g. com/datadog/..., org/datadog/..., com/datadoghq/...
-    int slash = slashClassName.indexOf('/');
-    return slash > 0 && slashClassName.startsWith("datadog", slash + 1);
-  }
-
-  private static String replaceAll(
-      Pattern pattern, String input, Function<Matcher, String> replacement) {
-    Matcher m = pattern.matcher(input);
-    if (!m.find()) {
-      return input;
+
+    /**
+     * Redacts hex-dump bytes in <code>points into unknown readable memory:</code> lines, keeping the
+     * optional leading address. Handles two formats:
+     *
+     * <ul>
+     *   <li><code>memory: 0x&lt;addr&gt; | ff ff ff ff</code> to <code>memory: 0x&lt;addr&gt; |
+     *       REDACTED</code>
+     *   <li><code>memory: ff ff ff ff</code> to <code>memory: REDACTED</code>
+     * </ul>
+     */
+    static String redactReadableMemoryHexDump(String line) {
+        return replaceAll(READABLE_MEMORY_HEX_DUMP, line, m -> m.group(1) + REDACTED_STRING);
+    }
+
+    /**
+     * Redacts a slash-separated JVM class name, unless it belongs to a known package. Unknown classes
+     * are fully redacted: <code>com/company/SomeType</code> to <code>redacted/Redacted</code>; <code>
+     * java/lang/String</code> unchanged.
+     */
+    static String redactJvmClassName(String className) {
+        if (isKnownJvmPackage(className)) {
+            return className;
+        }
+        return redactClassName('/', className);
+    }
+
+    /**
+     * Redacts a dot-separated class name, unless it belongs to a known package. Unknown classes are
+     * fully redacted: <code>com.company.SomeType</code> to <code>redacted.Redacted</code>; <code>
+     * java.lang.String</code> unchanged.
+     */
+    static String redactDottedClassName(String className) {
+        if (isKnownJvmPackage(className.replace('.', '/'))) {
+            return className;
+        }
+        return redactClassName('.', className);
+    }
+
+    private static String redactClassName(char sep, String className) {
+        int lastSep = className.lastIndexOf(sep);
+        if (lastSep < 0) return className; // no package — nothing to redact
+        return REDACTED + sep + REDACTED_CLASS;
+    }
+
+    /**
+     * Redacts all but the parent directory and filename from a library path, collapsing all
+     * intermediate segments to a single {@code redacted}. <code>/path/to/dir/lib.so</code> to <code>
+     * /redacted/dir/lib.so</code>
+     */
+    static String redactPath(String path) {
+        int last = path.lastIndexOf('/');
+        if (last <= 0) return path; // /file or empty — nothing to redact
+        int secondLast = path.lastIndexOf('/', last - 1);
+        if (secondLast <= 0) return path; // /dir/file — nothing to redact
+        // Collapse everything before the second-last slash to a single /redacted
+        return "/" + REDACTED + path.substring(secondLast);
+    }
+
+    private static boolean isKnownJvmPackage(String slashClassName) {
+        for (String prefix : KNOWN_PACKAGES_PREFIXES) {
+            if (slashClassName.startsWith(prefix)) {
+                return true;
+            }
+        }
+        // Match *.datadog* — packages whose second segment starts with "datadog"
+        // e.g. com/datadog/..., org/datadog/..., com/datadoghq/...
+        int slash = slashClassName.indexOf('/');
+        return slash > 0 && slashClassName.startsWith("datadog", slash + 1);
+    }
+
+    private static String replaceAll(Pattern pattern, String input, Function<Matcher, String> replacement) {
+        Matcher m = pattern.matcher(input);
+        if (!m.find()) {
+            return input;
+        }
+        StringBuilder sb = new StringBuilder();
+        int lastEnd = 0;
+        do {
+            sb.append(input, lastEnd, m.start());
+            sb.append(replacement.apply(m));
+            lastEnd = m.end();
+        } while (m.find());
+        return sb.append(input, lastEnd, input.length()).toString();
     }
-    StringBuilder sb = new StringBuilder();
-    int lastEnd = 0;
-    do {
-      sb.append(input, lastEnd, m.start());
-      sb.append(replacement.apply(m));
-      lastEnd = m.end();
-    } while (m.find());
-    return sb.append(input, lastEnd, input.length()).toString();
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/RuntimeArgs.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/RuntimeArgs.java
index 8a422f5166f..0a7f4015454 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/RuntimeArgs.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/RuntimeArgs.java
@@ -19,217 +19,215 @@
  * module/native-access options.
  */
 final class RuntimeArgs {
-  // Aligned with JDK JEP-8372760 (JFR In-Process Data Redaction) default filter list.
-  private static final String[] SECRET_PROPERTY_KEYWORDS = {
-    "auth", "password", "passwd", "pwd", "passphrase", "secret", "token", "key", "credential"
-  };
-  private static final String[] MODULE_OPTIONS = {
-    "--add-modules",
-    "--add-exports",
-    "--add-opens",
-    "--add-reads",
-    "--patch-module",
-    "--limit-modules",
-    "--module-path",
-    "--upgrade-module-path",
-    "--enable-native-access",
-    "--illegal-native-access",
-    "--sun-misc-unsafe-memory-access"
-  };
-
-  private final List<String> args = new ArrayList<>();
-
-  /** Returns a filtered args list from the raw JVM-arguments. */
-  static List<String> parseVmArgs(String raw) {
-    return filterArgs(joinArgumentTokens(splitArgs(raw)));
-  }
-
-  void addArg(String arg) {
-    if (arg != null && !arg.isEmpty()) {
-      args.add(arg);
+    // Aligned with JDK JEP-8372760 (JFR In-Process Data Redaction) default filter list.
+    private static final String[] SECRET_PROPERTY_KEYWORDS = {
+        "auth", "password", "passwd", "pwd", "passphrase", "secret", "token", "key", "credential"
+    };
+    private static final String[] MODULE_OPTIONS = {
+        "--add-modules",
+        "--add-exports",
+        "--add-opens",
+        "--add-reads",
+        "--patch-module",
+        "--limit-modules",
+        "--module-path",
+        "--upgrade-module-path",
+        "--enable-native-access",
+        "--illegal-native-access",
+        "--sun-misc-unsafe-memory-access"
+    };
+
+    private final List<String> args = new ArrayList<>();
+
+    /** Returns a filtered args list from the raw JVM-arguments. */
+    static List<String> parseVmArgs(String raw) {
+        return filterArgs(joinArgumentTokens(splitArgs(raw)));
     }
-  }
 
-  List<String> build() {
-    return filterArgs(args);
-  }
-
-  private static List<String> filterArgs(List<String> args) {
-    if (args.isEmpty()) {
-      return Collections.emptyList();
-    }
-    List<String> filtered = new ArrayList<>();
-    for (String arg : args) {
-      if (arg == null || arg.isEmpty()) {
-        continue;
-      }
-      if (isAllowedSystemProperty(arg)) {
-        filtered.add(arg);
-      } else if (arg.startsWith("-javaagent:") || arg.startsWith("-agentlib:")) {
-        // Redact options after '=' — only the jar path / library name is sent
-        int eq = arg.indexOf('=', arg.indexOf(':') + 1);
-        filtered.add(eq >= 0 ? arg.substring(0, eq) + "=REDACTED" : arg);
-      } else if (arg.startsWith("-X") || isModuleOrNativeAccessOption(arg)) {
-        filtered.add(arg);
-      }
-    }
-    return filtered;
-  }
-
-  private static boolean isModuleOrNativeAccessOption(String arg) {
-    for (String option : MODULE_OPTIONS) {
-      if (arg.equals(option) || arg.startsWith(option + "=") || arg.startsWith(option + " ")) {
-        return true;
-      }
+    void addArg(String arg) {
+        if (arg != null && !arg.isEmpty()) {
+            args.add(arg);
+        }
     }
-    return false;
-  }
 
-  private static boolean isAllowedSystemProperty(String arg) {
-    if (hasSecretLikePropertyName(arg)) {
-      return false;
+    List<String> build() {
+        return filterArgs(args);
     }
-    if (arg.startsWith("-Djdk.") || arg.startsWith("-Dosgi.")) {
-      return true;
-    }
-    // J9 lists them as vm args.
-    if (arg.startsWith("-Djava.class.path=") || arg.startsWith("-Dsun.java.command=")) {
-      return false;
+
+    private static List<String> filterArgs(List<String> args) {
+        if (args.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<String> filtered = new ArrayList<>();
+        for (String arg : args) {
+            if (arg == null || arg.isEmpty()) {
+                continue;
+            }
+            if (isAllowedSystemProperty(arg)) {
+                filtered.add(arg);
+            } else if (arg.startsWith("-javaagent:") || arg.startsWith("-agentlib:")) {
+                // Redact options after '=' — only the jar path / library name is sent
+                int eq = arg.indexOf('=', arg.indexOf(':') + 1);
+                filtered.add(eq >= 0 ? arg.substring(0, eq) + "=REDACTED" : arg);
+            } else if (arg.startsWith("-X") || isModuleOrNativeAccessOption(arg)) {
+                filtered.add(arg);
+            }
+        }
+        return filtered;
     }
-    return arg.startsWith("-Djava.") || arg.startsWith("-Dsun.");
-  }
 
-  private static boolean hasSecretLikePropertyName(String arg) {
-    if (!arg.startsWith("-D")) {
-      return false;
+    private static boolean isModuleOrNativeAccessOption(String arg) {
+        for (String option : MODULE_OPTIONS) {
+            if (arg.equals(option) || arg.startsWith(option + "=") || arg.startsWith(option + " ")) {
+                return true;
+            }
+        }
+        return false;
     }
-    int separator = arg.indexOf('=');
-    String propertyName = separator >= 0 ? arg.substring(2, separator) : arg.substring(2);
-    String normalizedPropertyName = propertyName.toLowerCase();
-    for (String keyword : SECRET_PROPERTY_KEYWORDS) {
-      if (normalizedPropertyName.contains(keyword)) {
-        return true;
-      }
+
+    private static boolean isAllowedSystemProperty(String arg) {
+        if (hasSecretLikePropertyName(arg)) {
+            return false;
+        }
+        if (arg.startsWith("-Djdk.") || arg.startsWith("-Dosgi.")) {
+            return true;
+        }
+        // J9 lists them as vm args.
+        if (arg.startsWith("-Djava.class.path=") || arg.startsWith("-Dsun.java.command=")) {
+            return false;
+        }
+        return arg.startsWith("-Djava.") || arg.startsWith("-Dsun.");
     }
-    return false;
-  }
 
-  private static List<String> splitArgs(String raw) {
-    if (raw == null || raw.isEmpty()) {
-      return Collections.emptyList();
+    private static boolean hasSecretLikePropertyName(String arg) {
+        if (!arg.startsWith("-D")) {
+            return false;
+        }
+        int separator = arg.indexOf('=');
+        String propertyName = separator >= 0 ? arg.substring(2, separator) : arg.substring(2);
+        String normalizedPropertyName = propertyName.toLowerCase();
+        for (String keyword : SECRET_PROPERTY_KEYWORDS) {
+            if (normalizedPropertyName.contains(keyword)) {
+                return true;
+            }
+        }
+        return false;
     }
-    List<String> tokens = new ArrayList<>();
-    StringBuilder current = new StringBuilder(raw.length());
-    boolean inSingleQuote = false;
-    boolean inDoubleQuote = false;
-    boolean escaped = false;
-
-    for (int i = 0; i < raw.length(); i++) {
-      char c = raw.charAt(i);
-      // Keep the escaped character verbatim and clear the escape state.
-      if (escaped) {
-        current.append(c);
-        escaped = false;
-        continue;
-      }
-      // Backslashes escape the next character unless we are inside single quotes.
-      if (c == '\\' && !inSingleQuote) {
-        escaped = true;
-        continue;
-      }
-      // Single quotes only toggle quoting when not already inside double quotes.
-      if (c == '\'' && !inDoubleQuote) {
-        inSingleQuote = !inSingleQuote;
-        continue;
-      }
-      // Double quotes only toggle quoting when not already inside single quotes.
-      if (c == '"' && !inSingleQuote) {
-        inDoubleQuote = !inDoubleQuote;
-        continue;
-      }
-      // Outside of quotes, whitespace terminates the current token.
-      if (Character.isWhitespace(c) && !inSingleQuote && !inDoubleQuote) {
+
+    private static List<String> splitArgs(String raw) {
+        if (raw == null || raw.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<String> tokens = new ArrayList<>();
+        StringBuilder current = new StringBuilder(raw.length());
+        boolean inSingleQuote = false;
+        boolean inDoubleQuote = false;
+        boolean escaped = false;
+
+        for (int i = 0; i < raw.length(); i++) {
+            char c = raw.charAt(i);
+            // Keep the escaped character verbatim and clear the escape state.
+            if (escaped) {
+                current.append(c);
+                escaped = false;
+                continue;
+            }
+            // Backslashes escape the next character unless we are inside single quotes.
+            if (c == '\\' && !inSingleQuote) {
+                escaped = true;
+                continue;
+            }
+            // Single quotes only toggle quoting when not already inside double quotes.
+            if (c == '\'' && !inDoubleQuote) {
+                inSingleQuote = !inSingleQuote;
+                continue;
+            }
+            // Double quotes only toggle quoting when not already inside single quotes.
+            if (c == '"' && !inSingleQuote) {
+                inDoubleQuote = !inDoubleQuote;
+                continue;
+            }
+            // Outside of quotes, whitespace terminates the current token.
+            if (Character.isWhitespace(c) && !inSingleQuote && !inDoubleQuote) {
+                if (current.length() > 0) {
+                    tokens.add(current.toString());
+                    current.setLength(0);
+                }
+                continue;
+            }
+            current.append(c);
+        }
         if (current.length() > 0) {
-          tokens.add(current.toString());
-          current.setLength(0);
+            tokens.add(current.toString());
         }
-        continue;
-      }
-      current.append(c);
-    }
-    if (current.length() > 0) {
-      tokens.add(current.toString());
+        return tokens;
     }
-    return tokens;
-  }
-
-  /**
-   * Joins shell-like tokens into argument-shaped units.
-   *
-   * <p>This pass reconstructs options that span multiple tokens, such as module options whose value
-   * is separated by whitespace and {@code -XX:OnError=} style options that carry shell fragments
-   * over multiple tokens.
-   */
-  private static List<String> joinArgumentTokens(List<String> tokens) {
-    if (tokens.isEmpty()) {
-      return Collections.emptyList();
+
+    /**
+     * Joins shell-like tokens into argument-shaped units.
+     *
+     * <p>This pass reconstructs options that span multiple tokens, such as module options whose value
+     * is separated by whitespace and {@code -XX:OnError=} style options that carry shell fragments
+     * over multiple tokens.
+     */
+    private static List<String> joinArgumentTokens(List<String> tokens) {
+        if (tokens.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<String> joinedArgs = new ArrayList<>();
+        boolean canContinuePreviousArg = false;
+        StringBuilder argBuilder = new StringBuilder();
+        for (int i = 0; i < tokens.size(); i++) {
+            String token = tokens.get(i);
+            if (token.isEmpty()) {
+                continue;
+            }
+            if (!token.startsWith("-")) {
+                if (canContinuePreviousArg
+                        && !joinedArgs.isEmpty()
+                        && isContinuationToken(token)
+                        && acceptsContinuation(joinedArgs.get(joinedArgs.size() - 1))) {
+                    int last = joinedArgs.size() - 1;
+                    argBuilder.setLength(0);
+                    argBuilder.append(joinedArgs.get(last)).append(' ').append(token);
+                    joinedArgs.set(last, argBuilder.toString());
+                    continue;
+                }
+                canContinuePreviousArg = false;
+                continue;
+            }
+
+            argBuilder.setLength(0);
+            argBuilder.append(token);
+            if (requiresSeparateValue(token) && i + 1 < tokens.size()) {
+                argBuilder.append(' ').append(tokens.get(++i));
+            }
+            while (i + 1 < tokens.size()
+                    && isContinuationToken(tokens.get(i + 1))
+                    && acceptsContinuation(argBuilder.toString())) {
+                argBuilder.append(' ').append(tokens.get(++i));
+            }
+            String arg = argBuilder.toString();
+            joinedArgs.add(arg);
+            canContinuePreviousArg = acceptsContinuation(arg);
+        }
+        return joinedArgs;
     }
-    List<String> joinedArgs = new ArrayList<>();
-    boolean canContinuePreviousArg = false;
-    StringBuilder argBuilder = new StringBuilder();
-    for (int i = 0; i < tokens.size(); i++) {
-      String token = tokens.get(i);
-      if (token.isEmpty()) {
-        continue;
-      }
-      if (!token.startsWith("-")) {
-        if (canContinuePreviousArg
-            && !joinedArgs.isEmpty()
-            && isContinuationToken(token)
-            && acceptsContinuation(joinedArgs.get(joinedArgs.size() - 1))) {
-          int last = joinedArgs.size() - 1;
-          argBuilder.setLength(0);
-          argBuilder.append(joinedArgs.get(last)).append(' ').append(token);
-          joinedArgs.set(last, argBuilder.toString());
-          continue;
+
+    private static boolean requiresSeparateValue(String token) {
+        for (String option : MODULE_OPTIONS) {
+            if (token.equals(option)) {
+                return true;
+            }
         }
-        canContinuePreviousArg = false;
-        continue;
-      }
-
-      argBuilder.setLength(0);
-      argBuilder.append(token);
-      if (requiresSeparateValue(token) && i + 1 < tokens.size()) {
-        argBuilder.append(' ').append(tokens.get(++i));
-      }
-      while (i + 1 < tokens.size()
-          && isContinuationToken(tokens.get(i + 1))
-          && acceptsContinuation(argBuilder.toString())) {
-        argBuilder.append(' ').append(tokens.get(++i));
-      }
-      String arg = argBuilder.toString();
-      joinedArgs.add(arg);
-      canContinuePreviousArg = acceptsContinuation(arg);
+        return false;
     }
-    return joinedArgs;
-  }
-
-  private static boolean requiresSeparateValue(String token) {
-    for (String option : MODULE_OPTIONS) {
-      if (token.equals(option)) {
-        return true;
-      }
+
+    private static boolean acceptsContinuation(String arg) {
+        return arg.startsWith("-XX:OnError=") || arg.startsWith("-XX:OnOutOfMemoryError=") || arg.startsWith("-Xdump:");
+    }
+
+    private static boolean isContinuationToken(String token) {
+        return !token.isEmpty() && !token.startsWith("-");
     }
-    return false;
-  }
-
-  private static boolean acceptsContinuation(String arg) {
-    return arg.startsWith("-XX:OnError=")
-        || arg.startsWith("-XX:OnOutOfMemoryError=")
-        || arg.startsWith("-Xdump:");
-  }
-
-  private static boolean isContinuationToken(String token) {
-    return !token.isEmpty() && !token.startsWith("-");
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/ConfigManagerTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/ConfigManagerTest.java
index a850cb9fc43..9edaef3fc75 100644
--- a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/ConfigManagerTest.java
+++ b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/ConfigManagerTest.java
@@ -17,46 +17,43 @@
 import org.junit.jupiter.api.Test;
 
 public class ConfigManagerTest {
-  @Test
-  public void testConfigWriteAndRead() throws IOException {
-    Config config = mock(Config.class);
-    when(config.getWellKnownTags())
-        .thenReturn(new WellKnownTags("1234", "", "env", "service", "version", ""));
-    when(config.isCrashTrackingAgentless()).thenReturn(false);
-    when(config.isCrashTrackingErrorsIntakeEnabled()).thenReturn(true);
-    when(config.isCrashTrackingExtendedInfoEnabled()).thenReturn(true);
-    when(config.getMergedCrashTrackingTags()).thenReturn(Collections.singletonMap("key", "value"));
-    File tmpFile = File.createTempFile("ConfigManagerTest", null);
-    tmpFile.deleteOnExit();
-    ConfigManager.writeConfigToFile(config, tmpFile);
-    ConfigManager.StoredConfig deserialized = ConfigManager.readConfig(Config.get(), tmpFile);
-    Assertions.assertNotNull(deserialized);
-    assertEquals("service", deserialized.service);
-    assertEquals("version", deserialized.version);
-    assertEquals("env", deserialized.env);
-    assertEquals("key:value", deserialized.tags);
-    assertEquals("1234", deserialized.runtimeId);
-    assertEquals(
-        Objects.requireNonNull(ProcessTags.getTagsForSerialization()).toString(),
-        deserialized.processTags);
-    assertFalse(deserialized.agentless);
-    assertTrue(deserialized.sendToErrorTracking);
-    assertTrue(deserialized.extendedInfoEnabled);
-  }
+    @Test
+    public void testConfigWriteAndRead() throws IOException {
+        Config config = mock(Config.class);
+        when(config.getWellKnownTags()).thenReturn(new WellKnownTags("1234", "", "env", "service", "version", ""));
+        when(config.isCrashTrackingAgentless()).thenReturn(false);
+        when(config.isCrashTrackingErrorsIntakeEnabled()).thenReturn(true);
+        when(config.isCrashTrackingExtendedInfoEnabled()).thenReturn(true);
+        when(config.getMergedCrashTrackingTags()).thenReturn(Collections.singletonMap("key", "value"));
+        File tmpFile = File.createTempFile("ConfigManagerTest", null);
+        tmpFile.deleteOnExit();
+        ConfigManager.writeConfigToFile(config, tmpFile);
+        ConfigManager.StoredConfig deserialized = ConfigManager.readConfig(Config.get(), tmpFile);
+        Assertions.assertNotNull(deserialized);
+        assertEquals("service", deserialized.service);
+        assertEquals("version", deserialized.version);
+        assertEquals("env", deserialized.env);
+        assertEquals("key:value", deserialized.tags);
+        assertEquals("1234", deserialized.runtimeId);
+        assertEquals(
+                Objects.requireNonNull(ProcessTags.getTagsForSerialization()).toString(), deserialized.processTags);
+        assertFalse(deserialized.agentless);
+        assertTrue(deserialized.sendToErrorTracking);
+        assertTrue(deserialized.extendedInfoEnabled);
+    }
 
-  @Test
-  public void testStoredConfigDefaults() {
-    Config config = mock(Config.class);
-    when(config.getServiceName()).thenReturn("service");
-    when(config.getVersion()).thenReturn("version");
-    when(config.getEnv()).thenReturn("env");
-    ConfigManager.StoredConfig storedConfig =
-        new ConfigManager.StoredConfig.Builder(config).build();
-    assertEquals("service", storedConfig.service);
-    assertEquals("version", storedConfig.version);
-    assertEquals("env", storedConfig.env);
-    assertFalse(storedConfig.agentless);
-    assertFalse(storedConfig.sendToErrorTracking);
-    assertFalse(storedConfig.extendedInfoEnabled);
-  }
+    @Test
+    public void testStoredConfigDefaults() {
+        Config config = mock(Config.class);
+        when(config.getServiceName()).thenReturn("service");
+        when(config.getVersion()).thenReturn("version");
+        when(config.getEnv()).thenReturn("env");
+        ConfigManager.StoredConfig storedConfig = new ConfigManager.StoredConfig.Builder(config).build();
+        assertEquals("service", storedConfig.service);
+        assertEquals("version", storedConfig.version);
+        assertEquals("env", storedConfig.env);
+        assertFalse(storedConfig.agentless);
+        assertFalse(storedConfig.sendToErrorTracking);
+        assertFalse(storedConfig.extendedInfoEnabled);
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/CrashUploaderTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/CrashUploaderTest.java
index 1ecec69a34e..c39d95aba21 100644
--- a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/CrashUploaderTest.java
+++ b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/CrashUploaderTest.java
@@ -49,574 +49,567 @@
 
 public class CrashUploaderTest {
 
-  private static final String API_KEY_VALUE = "testkey";
-  private static final String URL_PATH = "/lalala";
-  private static final String CRASH = "this is a crash file";
-  private static final String ENV = "crash-env";
-  private static final String HOSTNAME = "crash-hostname";
-  private static final String SERVICE = "crash-service";
-  private static final String VERSION = "crash-version";
-  private static final String SAMPLE_UUID = "a4194cd6-8cb3-45fd-9bd9-3af83e0a3ad3";
-
-  // TODO: Add a test to verify overall request timeout rather than IO timeout
-  private final Duration REQUEST_TIMEOUT = Duration.ofSeconds(10);
-
-  private Config config = spy(Config.get());
-
-  private final MockWebServer server = new MockWebServer();
-  private HttpUrl url;
-
-  private CrashUploader uploader;
-
-  @BeforeEach
-  public void setup() throws IOException {
-    server.start();
-    System.out.println("Setting up test: " + server.getPort());
-    url = server.url(URL_PATH);
-
-    when(config.getEnv()).thenReturn(ENV);
-    when(config.getHostName()).thenReturn(HOSTNAME);
-    when(config.getServiceName()).thenReturn(SERVICE);
-    when(config.getVersion()).thenReturn(VERSION);
-    when(config.getFinalCrashTrackingTelemetryUrl()).thenReturn(server.url(URL_PATH).toString());
-    when(config.getFinalCrashTrackingErrorTrackingUrl())
-        .thenReturn(server.url(URL_PATH).toString());
-    when(config.isCrashTrackingAgentless()).thenReturn(false);
-    when(config.getApiKey()).thenReturn(null);
-  }
-
-  @Test
-  public void testLogsHappyPath() throws Exception {
-    // Given
-    ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config).build();
-    // When
-    uploader = new CrashUploader(config, crashConfig);
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    uploader.uploadToLogs(CRASH, new PrintStream(out));
-
-    // Then
-    final ObjectMapper mapper = new ObjectMapper();
-    final JsonNode event = mapper.readTree(out.toString(StandardCharsets.UTF_8.name()));
-
-    assertEquals("crashtracker", event.get("ddsource").asText());
-    assertEquals(HOSTNAME, event.get("hostname").asText());
-    assertEquals(SERVICE, event.get("service").asText());
-    assertEquals(CRASH, event.get("message").asText());
-    assertEquals("ERROR", event.get("level").asText());
-    assertTrue(event.get("ddtags").asText().contains("is_crash:true"));
-  }
-
-  @Test
-  public void testExtractStackTraceFromRealCrashFile() throws IOException {
-    ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config).build();
-    uploader = new CrashUploader(config, crashConfig);
-    String msg = readFileAsString("sample-crash-redacted.txt");
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    uploader.uploadToLogs(msg, new PrintStream(out));
-
-    // Then
-    final ObjectMapper mapper = new ObjectMapper();
-    final JsonNode event = mapper.readTree(out.toString(StandardCharsets.UTF_8.name()));
-
-    assertEquals("crashtracker", event.get("ddsource").asText());
-    assertEquals(HOSTNAME, event.get("hostname").asText());
-    assertEquals(SERVICE, event.get("service").asText());
-    assertEquals(msg, event.get("message").asText());
-    assertEquals(
-        readFileAsString("sample-stacktrace.txt"), event.get("error").get("stack").asText());
-    assertEquals("ERROR", event.get("level").asText());
-    assertTrue(event.get("ddtags").asText().contains("is_crash:true"));
-  }
-
-  private String readFileAsString(String resource) throws IOException {
-    try (InputStream stream = getClass().getClassLoader().getResourceAsStream(resource)) {
-      return new BufferedReader(
-              new InputStreamReader(Objects.requireNonNull(stream), StandardCharsets.UTF_8))
-          .lines()
-          .collect(Collectors.joining("\n"));
+    private static final String API_KEY_VALUE = "testkey";
+    private static final String URL_PATH = "/lalala";
+    private static final String CRASH = "this is a crash file";
+    private static final String ENV = "crash-env";
+    private static final String HOSTNAME = "crash-hostname";
+    private static final String SERVICE = "crash-service";
+    private static final String VERSION = "crash-version";
+    private static final String SAMPLE_UUID = "a4194cd6-8cb3-45fd-9bd9-3af83e0a3ad3";
+
+    // TODO: Add a test to verify overall request timeout rather than IO timeout
+    private final Duration REQUEST_TIMEOUT = Duration.ofSeconds(10);
+
+    private Config config = spy(Config.get());
+
+    private final MockWebServer server = new MockWebServer();
+    private HttpUrl url;
+
+    private CrashUploader uploader;
+
+    @BeforeEach
+    public void setup() throws IOException {
+        server.start();
+        System.out.println("Setting up test: " + server.getPort());
+        url = server.url(URL_PATH);
+
+        when(config.getEnv()).thenReturn(ENV);
+        when(config.getHostName()).thenReturn(HOSTNAME);
+        when(config.getServiceName()).thenReturn(SERVICE);
+        when(config.getVersion()).thenReturn(VERSION);
+        when(config.getFinalCrashTrackingTelemetryUrl())
+                .thenReturn(server.url(URL_PATH).toString());
+        when(config.getFinalCrashTrackingErrorTrackingUrl())
+                .thenReturn(server.url(URL_PATH).toString());
+        when(config.isCrashTrackingAgentless()).thenReturn(false);
+        when(config.getApiKey()).thenReturn(null);
     }
-  }
-
-  private Path getResourcePath(String resourceName) throws Exception {
-    return Paths.get(getClass().getClassLoader().getResource(resourceName).toURI());
-  }
-
-  @Test
-  public void testTelemetryCrashPing() throws Exception {
-    // Given
-    final String expected = readFileAsString("golden/telemetry/sample-ping-for-telemetry.json");
-    ConfigManager.StoredConfig crashConfig =
-        new ConfigManager.StoredConfig.Builder(config)
-            .reportUUID(SAMPLE_UUID)
-            .processTags("a:b")
-            .runtimeId("1234")
-            .build();
-    // When
-    uploader = new CrashUploader(config, crashConfig);
-    server.enqueue(new MockResponse().setResponseCode(200));
-    uploader.sendPingToTelemetry(null);
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-
-    // Then
-    assertEquals(url, recordedRequest.getRequestUrl());
-    final ObjectMapper mapper = new ObjectMapper();
-    final JsonNode event = mapper.readTree(recordedRequest.getBody().readUtf8());
-
-    // header
-    assertCommonHeader(event);
-
-    // payload:
-    assertEquals("DEBUG", event.get("payload").get(0).get("level").asText());
-
-    assertFalse(event.get("payload").get(0).get("is_sensitive").asBoolean());
-    String tags = event.get("payload").get(0).get("tags").asText();
-    assertNotNull(tags);
-    assertTrue(tags.contains("is_crash_ping:true"));
-    assertTrue(tags.contains(TraceUtils.normalizeTag("service:" + crashConfig.service)));
-    assertTrue(tags.contains("uuid:" + crashConfig.reportUUID));
-    assertTrue(tags.contains(TraceUtils.normalizeTag("tracer_version:" + VersionInfo.VERSION)));
-    assertTrue(tags.contains("language_name:jvm"));
-    assertTrue(tags.contains("runtime_version:"));
-    assertTrue(tags.contains("runtime_vendor:"));
-    assertTrue(tags.contains("runtime_name:"));
-    assertEquals(
-        mapper.readTree(expected),
-        mapper.readTree(event.get("payload").get(0).get("message").asText()));
-    assertCommonPayload(event);
-  }
-
-  @Test
-  public void testErrorTrackingCrashPing() throws Exception {
-    // Given
-    final ObjectMapper mapper = new ObjectMapper();
-    final Map<String, ?> expected =
-        mapper.readValue(readFileAsString("golden/errortracking/sample-ping.json"), Map.class);
-    // remove ddtags and osinfo if present from the expected (they will be checked apart)
-    expected.remove("ddtags");
-    expected.remove("os_info");
-    expected.remove("timestamp");
-    ConfigManager.StoredConfig crashConfig =
-        new ConfigManager.StoredConfig.Builder(config)
-            .reportUUID(SAMPLE_UUID)
-            .processTags("a:b")
-            .runtimeId("1234")
-            .tags(ConfigManager.getMergedTagsForSerialization(Config.get())) // take the real ones
-            .build();
-    // When
-    uploader = new CrashUploader(config, crashConfig);
-    server.enqueue(new MockResponse().setResponseCode(200));
-
-    uploader.sendPingToErrorTracking(null);
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-
-    // Then
-    assertEquals(url, recordedRequest.getRequestUrl());
-    final String requestBody = recordedRequest.getBody().readUtf8();
-    final Map<String, ?> extracted = mapper.readValue(requestBody, Map.class);
-
-    assertNotNull(extracted.remove("timestamp"));
-
-    // assert osInfo
-    final Map<String, ?> osInfo = (Map<String, ?>) extracted.remove("os_info");
-
-    assertNotNull(osInfo);
-    assertNotNull(osInfo.get("architecture"));
-    assertNotNull(osInfo.get("version"));
-    assertNotNull(osInfo.get("os_type"));
-    assertTrue(((String) osInfo.get("bitness")).matches("\\d+-bit")); // e.g. "64-bit"
-
-    // assert ddtags
-    String ddtags = (String) extracted.remove("ddtags");
-    assertNotNull(ddtags);
-    assertTrue(ddtags.contains(crashConfig.tags)); // includes the tags
-    assertTrue(ddtags.contains("service:")); // has the service
-    assertTrue(ddtags.contains("uuid:" + crashConfig.reportUUID));
-    assertTrue(ddtags.contains("is_crash_ping:true"));
-    assertTrue(ddtags.contains("runtime_version:"));
-    assertTrue(ddtags.contains("runtime_vendor:"));
-    assertTrue(ddtags.contains("runtime_name:"));
-
-    // assert platform independent equality
-    assertEquals(
-        expected,
-        extracted,
-        () -> {
-          try {
-            return "Expected: "
-                + mapper.writeValueAsString(expected)
-                + "\nbut got: "
-                + mapper.writeValueAsString(extracted);
-          } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-          }
+
+    @Test
+    public void testLogsHappyPath() throws Exception {
+        // Given
+        ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config).build();
+        // When
+        uploader = new CrashUploader(config, crashConfig);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        uploader.uploadToLogs(CRASH, new PrintStream(out));
+
+        // Then
+        final ObjectMapper mapper = new ObjectMapper();
+        final JsonNode event = mapper.readTree(out.toString(StandardCharsets.UTF_8.name()));
+
+        assertEquals("crashtracker", event.get("ddsource").asText());
+        assertEquals(HOSTNAME, event.get("hostname").asText());
+        assertEquals(SERVICE, event.get("service").asText());
+        assertEquals(CRASH, event.get("message").asText());
+        assertEquals("ERROR", event.get("level").asText());
+        assertTrue(event.get("ddtags").asText().contains("is_crash:true"));
+    }
+
+    @Test
+    public void testExtractStackTraceFromRealCrashFile() throws IOException {
+        ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config).build();
+        uploader = new CrashUploader(config, crashConfig);
+        String msg = readFileAsString("sample-crash-redacted.txt");
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        uploader.uploadToLogs(msg, new PrintStream(out));
+
+        // Then
+        final ObjectMapper mapper = new ObjectMapper();
+        final JsonNode event = mapper.readTree(out.toString(StandardCharsets.UTF_8.name()));
+
+        assertEquals("crashtracker", event.get("ddsource").asText());
+        assertEquals(HOSTNAME, event.get("hostname").asText());
+        assertEquals(SERVICE, event.get("service").asText());
+        assertEquals(msg, event.get("message").asText());
+        assertEquals(
+                readFileAsString("sample-stacktrace.txt"),
+                event.get("error").get("stack").asText());
+        assertEquals("ERROR", event.get("level").asText());
+        assertTrue(event.get("ddtags").asText().contains("is_crash:true"));
+    }
+
+    private String readFileAsString(String resource) throws IOException {
+        try (InputStream stream = getClass().getClassLoader().getResourceAsStream(resource)) {
+            return new BufferedReader(new InputStreamReader(Objects.requireNonNull(stream), StandardCharsets.UTF_8))
+                    .lines()
+                    .collect(Collectors.joining("\n"));
+        }
+    }
+
+    private Path getResourcePath(String resourceName) throws Exception {
+        return Paths.get(getClass().getClassLoader().getResource(resourceName).toURI());
+    }
+
+    @Test
+    public void testTelemetryCrashPing() throws Exception {
+        // Given
+        final String expected = readFileAsString("golden/telemetry/sample-ping-for-telemetry.json");
+        ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config)
+                .reportUUID(SAMPLE_UUID)
+                .processTags("a:b")
+                .runtimeId("1234")
+                .build();
+        // When
+        uploader = new CrashUploader(config, crashConfig);
+        server.enqueue(new MockResponse().setResponseCode(200));
+        uploader.sendPingToTelemetry(null);
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+
+        // Then
+        assertEquals(url, recordedRequest.getRequestUrl());
+        final ObjectMapper mapper = new ObjectMapper();
+        final JsonNode event = mapper.readTree(recordedRequest.getBody().readUtf8());
+
+        // header
+        assertCommonHeader(event);
+
+        // payload:
+        assertEquals("DEBUG", event.get("payload").get(0).get("level").asText());
+
+        assertFalse(event.get("payload").get(0).get("is_sensitive").asBoolean());
+        String tags = event.get("payload").get(0).get("tags").asText();
+        assertNotNull(tags);
+        assertTrue(tags.contains("is_crash_ping:true"));
+        assertTrue(tags.contains(TraceUtils.normalizeTag("service:" + crashConfig.service)));
+        assertTrue(tags.contains("uuid:" + crashConfig.reportUUID));
+        assertTrue(tags.contains(TraceUtils.normalizeTag("tracer_version:" + VersionInfo.VERSION)));
+        assertTrue(tags.contains("language_name:jvm"));
+        assertTrue(tags.contains("runtime_version:"));
+        assertTrue(tags.contains("runtime_vendor:"));
+        assertTrue(tags.contains("runtime_name:"));
+        assertEquals(
+                mapper.readTree(expected),
+                mapper.readTree(event.get("payload").get(0).get("message").asText()));
+        assertCommonPayload(event);
+    }
+
+    @Test
+    public void testErrorTrackingCrashPing() throws Exception {
+        // Given
+        final ObjectMapper mapper = new ObjectMapper();
+        final Map<String, ?> expected =
+                mapper.readValue(readFileAsString("golden/errortracking/sample-ping.json"), Map.class);
+        // remove ddtags and osinfo if present from the expected (they will be checked apart)
+        expected.remove("ddtags");
+        expected.remove("os_info");
+        expected.remove("timestamp");
+        ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config)
+                .reportUUID(SAMPLE_UUID)
+                .processTags("a:b")
+                .runtimeId("1234")
+                .tags(ConfigManager.getMergedTagsForSerialization(Config.get())) // take the real ones
+                .build();
+        // When
+        uploader = new CrashUploader(config, crashConfig);
+        server.enqueue(new MockResponse().setResponseCode(200));
+
+        uploader.sendPingToErrorTracking(null);
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+
+        // Then
+        assertEquals(url, recordedRequest.getRequestUrl());
+        final String requestBody = recordedRequest.getBody().readUtf8();
+        final Map<String, ?> extracted = mapper.readValue(requestBody, Map.class);
+
+        assertNotNull(extracted.remove("timestamp"));
+
+        // assert osInfo
+        final Map<String, ?> osInfo = (Map<String, ?>) extracted.remove("os_info");
+
+        assertNotNull(osInfo);
+        assertNotNull(osInfo.get("architecture"));
+        assertNotNull(osInfo.get("version"));
+        assertNotNull(osInfo.get("os_type"));
+        assertTrue(((String) osInfo.get("bitness")).matches("\\d+-bit")); // e.g. "64-bit"
+
+        // assert ddtags
+        String ddtags = (String) extracted.remove("ddtags");
+        assertNotNull(ddtags);
+        assertTrue(ddtags.contains(crashConfig.tags)); // includes the tags
+        assertTrue(ddtags.contains("service:")); // has the service
+        assertTrue(ddtags.contains("uuid:" + crashConfig.reportUUID));
+        assertTrue(ddtags.contains("is_crash_ping:true"));
+        assertTrue(ddtags.contains("runtime_version:"));
+        assertTrue(ddtags.contains("runtime_vendor:"));
+        assertTrue(ddtags.contains("runtime_name:"));
+
+        // assert platform independent equality
+        assertEquals(expected, extracted, () -> {
+            try {
+                return "Expected: "
+                        + mapper.writeValueAsString(expected)
+                        + "\nbut got: "
+                        + mapper.writeValueAsString(extracted);
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
         });
-  }
-
-  @ParameterizedTest
-  @ValueSource(
-      strings = {
-        "sample-crash-for-telemetry.json",
-        "sample-crash-for-telemetry-2.json",
-        "sample-crash-for-telemetry-3.json",
-        "sample_oom.json"
-      })
-  public void testTelemetryHappyPath(String log) throws Exception {
-    // Given
-    CrashLog expected = CrashLog.fromJson(readFileAsString("golden/telemetry/" + log));
-    final String inputLog = log.replace(".json", ".txt");
-    ConfigManager.StoredConfig crashConfig =
-        new ConfigManager.StoredConfig.Builder(config)
-            .reportUUID(SAMPLE_UUID)
-            .processTags("a:b")
-            .runtimeId("1234")
-            .build();
-    // When
-    uploader = new CrashUploader(config, crashConfig);
-    server.enqueue(new MockResponse().setResponseCode(200));
-    uploader.remoteUpload(readFileAsString(inputLog), true, false);
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-
-    // Then
-    assertEquals(url, recordedRequest.getRequestUrl());
-
-    final ObjectMapper mapper = new ObjectMapper();
-    final JsonNode event = mapper.readTree(recordedRequest.getBody().readUtf8());
-
-    // header
-    assertCommonHeader(event);
-
-    // payload:
-    assertEquals("ERROR", event.get("payload").get(0).get("level").asText());
-
-    assertTrue(event.get("payload").get(0).get("is_sensitive").asBoolean());
-    assertTrue(event.get("payload").get(0).get("is_crash").asBoolean());
-    String message = event.get("payload").get(0).get("message").asText();
-    CrashLog extracted = CrashLog.fromJson(message);
-
-    assertThatJson(extracted.toJson())
-        .whenIgnoringPaths("os_info", "metadata", "experimental")
-        .isEqualTo(expected.toJson());
-    assertEquals("severity:crash,is_crash:true", event.get("payload").get(0).get("tags").asText());
-    assertCommonPayload(event);
-  }
-
-  @ParameterizedTest
-  @ValueSource(
-      strings = {
-        "sample-crash-for-telemetry.json",
-        "sample-crash-for-telemetry-2.json",
-        "sample-crash-for-telemetry-3.json",
-        "sample_oom.json"
-      })
-  public void testErrorTrackingHappyPath(String log) throws Exception {
-    // Given
-    final ObjectMapper mapper = new ObjectMapper();
-    final Map<String, ?> expected =
-        mapper.readValue(readFileAsString("golden/errortracking/" + log), Map.class);
-    // remove ddtags and osinfo if present from the expected (they will be checked apart)
-    expected.remove("ddtags");
-    expected.remove("os_info");
-    final String inputLog = log.replace(".json", ".txt");
-    ConfigManager.StoredConfig crashConfig =
-        new ConfigManager.StoredConfig.Builder(config)
-            .reportUUID(SAMPLE_UUID)
-            .processTags("a:b")
-            .runtimeId("1234")
-            .tags(ConfigManager.getMergedTagsForSerialization(Config.get())) // take the real ones
-            .extendedInfoEnabled(true)
-            .build();
-    // When
-    uploader = new CrashUploader(config, crashConfig);
-    server.enqueue(new MockResponse().setResponseCode(200));
-    uploader.remoteUpload(readFileAsString(inputLog), false, true);
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-
-    // Then
-    assertEquals(url, recordedRequest.getRequestUrl());
-    final String requestBody = recordedRequest.getBody().readUtf8();
-    final Map<String, ?> extracted = mapper.readValue(requestBody, Map.class);
-
-    // assert osInfo
-    final Map<String, ?> osInfo = (Map<String, ?>) extracted.remove("os_info");
-
-    assertNotNull(osInfo);
-    assertNotNull(osInfo.get("architecture"));
-    assertNotNull(osInfo.get("version"));
-    assertNotNull(osInfo.get("os_type"));
-    assertTrue(((String) osInfo.get("bitness")).matches("\\d+-bit")); // e.g. "64-bit"
-
-    // assert ddtags
-    String ddtags = (String) extracted.remove("ddtags");
-    assertNotNull(ddtags);
-    assertTrue(ddtags.contains(crashConfig.tags)); // includes the tags
-    assertTrue(ddtags.contains("service:")); // has the service
-    assertTrue(ddtags.contains("uuid:" + crashConfig.reportUUID));
-    assertTrue(ddtags.contains("is_crash:true"));
-    assertTrue(ddtags.contains("runtime_version:"));
-    assertTrue(ddtags.contains("runtime_vendor:"));
-    assertTrue(ddtags.contains("runtime_name:"));
-
-    // assert platform independent equality
-    assertThatJson(mapper.writeValueAsString(extracted))
-        .whenIgnoringPaths("experimental")
-        .isEqualTo(mapper.writeValueAsString(expected));
-  }
-
-  @Test
-  public void testErrorTrackingExcludesExtendedInfoByDefault() throws Exception {
-    // extendedInfoEnabled defaults to false — files, thread_name and runtime_args must not appear
-    ConfigManager.StoredConfig crashConfig =
-        new ConfigManager.StoredConfig.Builder(config)
-            .reportUUID(SAMPLE_UUID)
-            .tags(ConfigManager.getMergedTagsForSerialization(Config.get()))
-            .build();
-
-    uploader = new CrashUploader(config, crashConfig);
-    server.enqueue(new MockResponse().setResponseCode(200));
-    uploader.remoteUpload(readFileAsString("sample-crash-for-telemetry.txt"), false, true);
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    final ObjectMapper mapper = new ObjectMapper();
-    final JsonNode event = mapper.readTree(recordedRequest.getBody().readUtf8());
-
-    assertNull(event.get("files"));
-    assertNull(event.at("/error/thread_name").textValue());
-    assertTrue(event.at("/experimental/runtime_args").isMissingNode());
-  }
-
-  @Test
-  public void testErrorTrackingSerializesRuntimeArgs() throws Exception {
-    ConfigManager.StoredConfig crashConfig =
-        new ConfigManager.StoredConfig.Builder(config)
-            .reportUUID(SAMPLE_UUID)
-            .processTags("a:b")
-            .runtimeId("1234")
-            .tags(ConfigManager.getMergedTagsForSerialization(Config.get()))
-            .extendedInfoEnabled(true)
-            .build();
-
-    uploader = new CrashUploader(config, crashConfig);
-    server.enqueue(new MockResponse().setResponseCode(200));
-    uploader.remoteUpload(readFileAsString("sample-crash-macos-aarch64.txt"), false, true);
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    final ObjectMapper mapper = new ObjectMapper();
-    final JsonNode event = mapper.readTree(recordedRequest.getBody().readUtf8());
-
-    final JsonNode runtimeArgs = event.at("/experimental/runtime_args");
-    assertTrue(runtimeArgs.isArray());
-    boolean found = false;
-    for (JsonNode runtimeArg : runtimeArgs) {
-      if ("--enable-native-access=ALL-UNNAMED".equals(runtimeArg.asText())) {
-        found = true;
-        break;
-      }
     }
-    assertTrue(found);
-  }
-
-  @Test
-  public void testErrorTrackingSerializesRegisterToMemoryMapping() throws Exception {
-    ConfigManager.StoredConfig crashConfig =
-        new ConfigManager.StoredConfig.Builder(config)
-            .reportUUID(SAMPLE_UUID)
-            .processTags("a:b")
-            .runtimeId("1234")
-            .tags(ConfigManager.getMergedTagsForSerialization(Config.get()))
-            .extendedInfoEnabled(true)
-            .build();
-
-    uploader = new CrashUploader(config, crashConfig);
-    server.enqueue(new MockResponse().setResponseCode(200));
-    uploader.remoteUpload(readFileAsString("sample-crash.txt"), false, true);
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    final ObjectMapper mapper = new ObjectMapper();
-    final JsonNode event = mapper.readTree(recordedRequest.getBody().readUtf8());
-
-    final JsonNode mapping = event.at("/experimental/register_to_memory_mapping");
-    assertThat(mapping.isObject()).isTrue();
-    assertThat(mapping.get("RSP").asText())
-        .isEqualTo("0x00007f35e6253190 is pointing into the stack for thread: 0x00007f36cd96cc80");
-    assertThat(mapping.get("RDI").asText()).isEqualTo("0x0 is NULL");
-  }
-
-  @Test
-  public void testErrorTrackingOmitsRegisterToMemoryMappingByDefault() throws Exception {
-    // registerMappingEnabled defaults to false — the mapping must not appear in the payload
-    ConfigManager.StoredConfig crashConfig =
-        new ConfigManager.StoredConfig.Builder(config)
-            .reportUUID(SAMPLE_UUID)
-            .processTags("a:b")
-            .runtimeId("1234")
-            .tags(ConfigManager.getMergedTagsForSerialization(Config.get()))
-            .build();
-
-    uploader = new CrashUploader(config, crashConfig);
-    server.enqueue(new MockResponse().setResponseCode(200));
-    uploader.remoteUpload(readFileAsString("sample-crash.txt"), false, true);
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    final ObjectMapper mapper = new ObjectMapper();
-    final JsonNode event = mapper.readTree(recordedRequest.getBody().readUtf8());
-
-    JsonNode experimental = event.at("/experimental");
-    // experimental must either be absent or, if present, contain at least one field (no empty {})
-    assertThat(experimental.isMissingNode() || (experimental.isObject() && experimental.size() > 0))
-        .isTrue();
-    assertThat(event.at("/experimental/register_to_memory_mapping").isMissingNode()).isTrue();
-  }
-
-  private void assertCommonHeader(JsonNode event) {
-    assertEquals(TELEMETRY_API_VERSION, event.get("api_version").asText());
-    assertEquals("logs", event.get("request_type").asText());
-    assertEquals("crashtracker", event.get("origin").asText());
-    assertEquals("1234", event.get("runtime_id").asText());
-  }
-
-  private void assertCommonPayload(JsonNode event) {
-    // application:
-    assertEquals(ENV, event.get("application").get("env").asText());
-    assertEquals("jvm", event.get("application").get("language_name").asText());
-    assertEquals(
-        SystemProperties.getOrDefault("java.version", "unknown"),
-        event.get("application").get("language_version").asText());
-    assertEquals(SERVICE, event.get("application").get("service_name").asText());
-    assertEquals(VERSION, event.get("application").get("service_version").asText());
-    assertEquals(VersionInfo.VERSION, event.get("application").get("tracer_version").asText());
-    assertEquals("a:b", event.get("application").get("process_tags").asText());
-    // host
-    assertEquals(HOSTNAME, event.get("host").get("hostname").asText());
-    assertEquals(ENV, event.get("host").get("env").asText());
-  }
-
-  @Test
-  public void testTelemetryUnrecognizedFile() throws Exception {
-    // Given
-    ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config).build();
-    // When
-    uploader = new CrashUploader(config, crashConfig);
-    server.enqueue(new MockResponse().setResponseCode(200));
-    uploader.upload(getResourcePath("no-crash.txt"));
-    assertNotNull(server.takeRequest(5, TimeUnit.SECONDS)); // still sending incomplete report
-  }
-
-  @ParameterizedTest
-  @ValueSource(booleans = {true, false})
-  public void testAgentlessRequest(boolean telemetryOrErrorTracking) throws Exception {
-    when(config.getApiKey()).thenReturn(API_KEY_VALUE);
-    when(config.isCrashTrackingAgentless()).thenReturn(true);
-    ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config).build();
-
-    uploader = new CrashUploader(config, crashConfig);
-    server.enqueue(new MockResponse().setResponseCode(200));
-    uploader.remoteUpload(
-        readFileAsString("sample-crash.txt"), telemetryOrErrorTracking, !telemetryOrErrorTracking);
-
-    RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    // common
-    assertNotNull(recordedRequest);
-    assertEquals(API_KEY_VALUE, recordedRequest.getHeader("DD-API-KEY"));
-    if (telemetryOrErrorTracking) {
-      // telemetry
-      assertEquals(
-          TELEMETRY_API_VERSION, recordedRequest.getHeader(HEADER_DD_TELEMETRY_API_VERSION));
-    } else {
-      assertNull(recordedRequest.getHeader(HEADER_DD_EVP_SUBDOMAIN));
+
+    @ParameterizedTest
+    @ValueSource(
+            strings = {
+                "sample-crash-for-telemetry.json",
+                "sample-crash-for-telemetry-2.json",
+                "sample-crash-for-telemetry-3.json",
+                "sample_oom.json"
+            })
+    public void testTelemetryHappyPath(String log) throws Exception {
+        // Given
+        CrashLog expected = CrashLog.fromJson(readFileAsString("golden/telemetry/" + log));
+        final String inputLog = log.replace(".json", ".txt");
+        ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config)
+                .reportUUID(SAMPLE_UUID)
+                .processTags("a:b")
+                .runtimeId("1234")
+                .build();
+        // When
+        uploader = new CrashUploader(config, crashConfig);
+        server.enqueue(new MockResponse().setResponseCode(200));
+        uploader.remoteUpload(readFileAsString(inputLog), true, false);
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+
+        // Then
+        assertEquals(url, recordedRequest.getRequestUrl());
+
+        final ObjectMapper mapper = new ObjectMapper();
+        final JsonNode event = mapper.readTree(recordedRequest.getBody().readUtf8());
+
+        // header
+        assertCommonHeader(event);
+
+        // payload:
+        assertEquals("ERROR", event.get("payload").get(0).get("level").asText());
+
+        assertTrue(event.get("payload").get(0).get("is_sensitive").asBoolean());
+        assertTrue(event.get("payload").get(0).get("is_crash").asBoolean());
+        String message = event.get("payload").get(0).get("message").asText();
+        CrashLog extracted = CrashLog.fromJson(message);
+
+        assertThatJson(extracted.toJson())
+                .whenIgnoringPaths("os_info", "metadata", "experimental")
+                .isEqualTo(expected.toJson());
+        assertEquals(
+                "severity:crash,is_crash:true",
+                event.get("payload").get(0).get("tags").asText());
+        assertCommonPayload(event);
+    }
+
+    @ParameterizedTest
+    @ValueSource(
+            strings = {
+                "sample-crash-for-telemetry.json",
+                "sample-crash-for-telemetry-2.json",
+                "sample-crash-for-telemetry-3.json",
+                "sample_oom.json"
+            })
+    public void testErrorTrackingHappyPath(String log) throws Exception {
+        // Given
+        final ObjectMapper mapper = new ObjectMapper();
+        final Map<String, ?> expected = mapper.readValue(readFileAsString("golden/errortracking/" + log), Map.class);
+        // remove ddtags and osinfo if present from the expected (they will be checked apart)
+        expected.remove("ddtags");
+        expected.remove("os_info");
+        final String inputLog = log.replace(".json", ".txt");
+        ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config)
+                .reportUUID(SAMPLE_UUID)
+                .processTags("a:b")
+                .runtimeId("1234")
+                .tags(ConfigManager.getMergedTagsForSerialization(Config.get())) // take the real ones
+                .extendedInfoEnabled(true)
+                .build();
+        // When
+        uploader = new CrashUploader(config, crashConfig);
+        server.enqueue(new MockResponse().setResponseCode(200));
+        uploader.remoteUpload(readFileAsString(inputLog), false, true);
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+
+        // Then
+        assertEquals(url, recordedRequest.getRequestUrl());
+        final String requestBody = recordedRequest.getBody().readUtf8();
+        final Map<String, ?> extracted = mapper.readValue(requestBody, Map.class);
+
+        // assert osInfo
+        final Map<String, ?> osInfo = (Map<String, ?>) extracted.remove("os_info");
+
+        assertNotNull(osInfo);
+        assertNotNull(osInfo.get("architecture"));
+        assertNotNull(osInfo.get("version"));
+        assertNotNull(osInfo.get("os_type"));
+        assertTrue(((String) osInfo.get("bitness")).matches("\\d+-bit")); // e.g. "64-bit"
+
+        // assert ddtags
+        String ddtags = (String) extracted.remove("ddtags");
+        assertNotNull(ddtags);
+        assertTrue(ddtags.contains(crashConfig.tags)); // includes the tags
+        assertTrue(ddtags.contains("service:")); // has the service
+        assertTrue(ddtags.contains("uuid:" + crashConfig.reportUUID));
+        assertTrue(ddtags.contains("is_crash:true"));
+        assertTrue(ddtags.contains("runtime_version:"));
+        assertTrue(ddtags.contains("runtime_vendor:"));
+        assertTrue(ddtags.contains("runtime_name:"));
+
+        // assert platform independent equality
+        assertThatJson(mapper.writeValueAsString(extracted))
+                .whenIgnoringPaths("experimental")
+                .isEqualTo(mapper.writeValueAsString(expected));
+    }
+
+    @Test
+    public void testErrorTrackingExcludesExtendedInfoByDefault() throws Exception {
+        // extendedInfoEnabled defaults to false — files, thread_name and runtime_args must not appear
+        ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config)
+                .reportUUID(SAMPLE_UUID)
+                .tags(ConfigManager.getMergedTagsForSerialization(Config.get()))
+                .build();
+
+        uploader = new CrashUploader(config, crashConfig);
+        server.enqueue(new MockResponse().setResponseCode(200));
+        uploader.remoteUpload(readFileAsString("sample-crash-for-telemetry.txt"), false, true);
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        final ObjectMapper mapper = new ObjectMapper();
+        final JsonNode event = mapper.readTree(recordedRequest.getBody().readUtf8());
+
+        assertNull(event.get("files"));
+        assertNull(event.at("/error/thread_name").textValue());
+        assertTrue(event.at("/experimental/runtime_args").isMissingNode());
     }
-  }
-
-  @Test
-  public void test404() throws Exception {
-    // test added to get the coverage checks to pass since we log conditionally in this case
-    when(config.getApiKey()).thenReturn(null);
-    ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config).build();
-
-    uploader = new CrashUploader(config, crashConfig);
-    server.enqueue(new MockResponse().setResponseCode(404));
-    uploader.upload(getResourcePath("sample-crash.txt"));
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    assertNotNull(recordedRequest);
-    assertNull(recordedRequest.getHeader("DD-API-KEY"));
-    // it would be nice if the test asserted the log line was written out, but it's not essential
-  }
-
-  @Test
-  public void testParallelSendResilience() throws Exception {
-    try (MockWebServer errorTrackingServer = new MockWebServer()) {
-      errorTrackingServer.start();
-      // Given
-      when(config.getFinalCrashTrackingErrorTrackingUrl())
-          .thenReturn(errorTrackingServer.url(URL_PATH).toString());
-      final CrashUploader uploader =
-          new CrashUploader(config, new ConfigManager.StoredConfig.Builder(config).build());
-
-      // When
-      server.enqueue(new MockResponse().setResponseCode(200));
-      // simulate a timeout from error tracking
-      errorTrackingServer.enqueue(
-          new MockResponse().setHeadersDelay(4, TimeUnit.SECONDS).setResponseCode(200));
-      long start = System.nanoTime();
-      uploader.remoteUpload(readFileAsString("sample-crash.txt"), true, true);
-      long elapsed = System.nanoTime() - start;
-
-      // Then
-      // assert both backends have been contacted
-      assertNotNull(server.takeRequest(1, TimeUnit.SECONDS));
-      assertNotNull(errorTrackingServer.takeRequest(1, TimeUnit.SECONDS));
-      // assert that we waited
-      assertTrue(TimeUnit.NANOSECONDS.toMillis(elapsed) > 2000);
+
+    @Test
+    public void testErrorTrackingSerializesRuntimeArgs() throws Exception {
+        ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config)
+                .reportUUID(SAMPLE_UUID)
+                .processTags("a:b")
+                .runtimeId("1234")
+                .tags(ConfigManager.getMergedTagsForSerialization(Config.get()))
+                .extendedInfoEnabled(true)
+                .build();
+
+        uploader = new CrashUploader(config, crashConfig);
+        server.enqueue(new MockResponse().setResponseCode(200));
+        uploader.remoteUpload(readFileAsString("sample-crash-macos-aarch64.txt"), false, true);
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        final ObjectMapper mapper = new ObjectMapper();
+        final JsonNode event = mapper.readTree(recordedRequest.getBody().readUtf8());
+
+        final JsonNode runtimeArgs = event.at("/experimental/runtime_args");
+        assertTrue(runtimeArgs.isArray());
+        boolean found = false;
+        for (JsonNode runtimeArg : runtimeArgs) {
+            if ("--enable-native-access=ALL-UNNAMED".equals(runtimeArg.asText())) {
+                found = true;
+                break;
+            }
+        }
+        assertTrue(found);
+    }
+
+    @Test
+    public void testErrorTrackingSerializesRegisterToMemoryMapping() throws Exception {
+        ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config)
+                .reportUUID(SAMPLE_UUID)
+                .processTags("a:b")
+                .runtimeId("1234")
+                .tags(ConfigManager.getMergedTagsForSerialization(Config.get()))
+                .extendedInfoEnabled(true)
+                .build();
+
+        uploader = new CrashUploader(config, crashConfig);
+        server.enqueue(new MockResponse().setResponseCode(200));
+        uploader.remoteUpload(readFileAsString("sample-crash.txt"), false, true);
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        final ObjectMapper mapper = new ObjectMapper();
+        final JsonNode event = mapper.readTree(recordedRequest.getBody().readUtf8());
+
+        final JsonNode mapping = event.at("/experimental/register_to_memory_mapping");
+        assertThat(mapping.isObject()).isTrue();
+        assertThat(mapping.get("RSP").asText())
+                .isEqualTo("0x00007f35e6253190 is pointing into the stack for thread: 0x00007f36cd96cc80");
+        assertThat(mapping.get("RDI").asText()).isEqualTo("0x0 is NULL");
+    }
+
+    @Test
+    public void testErrorTrackingOmitsRegisterToMemoryMappingByDefault() throws Exception {
+        // registerMappingEnabled defaults to false — the mapping must not appear in the payload
+        ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config)
+                .reportUUID(SAMPLE_UUID)
+                .processTags("a:b")
+                .runtimeId("1234")
+                .tags(ConfigManager.getMergedTagsForSerialization(Config.get()))
+                .build();
+
+        uploader = new CrashUploader(config, crashConfig);
+        server.enqueue(new MockResponse().setResponseCode(200));
+        uploader.remoteUpload(readFileAsString("sample-crash.txt"), false, true);
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        final ObjectMapper mapper = new ObjectMapper();
+        final JsonNode event = mapper.readTree(recordedRequest.getBody().readUtf8());
+
+        JsonNode experimental = event.at("/experimental");
+        // experimental must either be absent or, if present, contain at least one field (no empty {})
+        assertThat(experimental.isMissingNode() || (experimental.isObject() && experimental.size() > 0))
+                .isTrue();
+        assertThat(event.at("/experimental/register_to_memory_mapping").isMissingNode())
+                .isTrue();
+    }
+
+    private void assertCommonHeader(JsonNode event) {
+        assertEquals(TELEMETRY_API_VERSION, event.get("api_version").asText());
+        assertEquals("logs", event.get("request_type").asText());
+        assertEquals("crashtracker", event.get("origin").asText());
+        assertEquals("1234", event.get("runtime_id").asText());
+    }
+
+    private void assertCommonPayload(JsonNode event) {
+        // application:
+        assertEquals(ENV, event.get("application").get("env").asText());
+        assertEquals("jvm", event.get("application").get("language_name").asText());
+        assertEquals(
+                SystemProperties.getOrDefault("java.version", "unknown"),
+                event.get("application").get("language_version").asText());
+        assertEquals(SERVICE, event.get("application").get("service_name").asText());
+        assertEquals(VERSION, event.get("application").get("service_version").asText());
+        assertEquals(
+                VersionInfo.VERSION,
+                event.get("application").get("tracer_version").asText());
+        assertEquals("a:b", event.get("application").get("process_tags").asText());
+        // host
+        assertEquals(HOSTNAME, event.get("host").get("hostname").asText());
+        assertEquals(ENV, event.get("host").get("env").asText());
+    }
+
+    @Test
+    public void testTelemetryUnrecognizedFile() throws Exception {
+        // Given
+        ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config).build();
+        // When
+        uploader = new CrashUploader(config, crashConfig);
+        server.enqueue(new MockResponse().setResponseCode(200));
+        uploader.upload(getResourcePath("no-crash.txt"));
+        assertNotNull(server.takeRequest(5, TimeUnit.SECONDS)); // still sending incomplete report
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void testAgentlessRequest(boolean telemetryOrErrorTracking) throws Exception {
+        when(config.getApiKey()).thenReturn(API_KEY_VALUE);
+        when(config.isCrashTrackingAgentless()).thenReturn(true);
+        ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config).build();
+
+        uploader = new CrashUploader(config, crashConfig);
+        server.enqueue(new MockResponse().setResponseCode(200));
+        uploader.remoteUpload(
+                readFileAsString("sample-crash.txt"), telemetryOrErrorTracking, !telemetryOrErrorTracking);
+
+        RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        // common
+        assertNotNull(recordedRequest);
+        assertEquals(API_KEY_VALUE, recordedRequest.getHeader("DD-API-KEY"));
+        if (telemetryOrErrorTracking) {
+            // telemetry
+            assertEquals(TELEMETRY_API_VERSION, recordedRequest.getHeader(HEADER_DD_TELEMETRY_API_VERSION));
+        } else {
+            assertNull(recordedRequest.getHeader(HEADER_DD_EVP_SUBDOMAIN));
+        }
+    }
+
+    @Test
+    public void test404() throws Exception {
+        // test added to get the coverage checks to pass since we log conditionally in this case
+        when(config.getApiKey()).thenReturn(null);
+        ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config).build();
+
+        uploader = new CrashUploader(config, crashConfig);
+        server.enqueue(new MockResponse().setResponseCode(404));
+        uploader.upload(getResourcePath("sample-crash.txt"));
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        assertNotNull(recordedRequest);
+        assertNull(recordedRequest.getHeader("DD-API-KEY"));
+        // it would be nice if the test asserted the log line was written out, but it's not essential
+    }
+
+    @Test
+    public void testParallelSendResilience() throws Exception {
+        try (MockWebServer errorTrackingServer = new MockWebServer()) {
+            errorTrackingServer.start();
+            // Given
+            when(config.getFinalCrashTrackingErrorTrackingUrl())
+                    .thenReturn(errorTrackingServer.url(URL_PATH).toString());
+            final CrashUploader uploader =
+                    new CrashUploader(config, new ConfigManager.StoredConfig.Builder(config).build());
+
+            // When
+            server.enqueue(new MockResponse().setResponseCode(200));
+            // simulate a timeout from error tracking
+            errorTrackingServer.enqueue(
+                    new MockResponse().setHeadersDelay(4, TimeUnit.SECONDS).setResponseCode(200));
+            long start = System.nanoTime();
+            uploader.remoteUpload(readFileAsString("sample-crash.txt"), true, true);
+            long elapsed = System.nanoTime() - start;
+
+            // Then
+            // assert both backends have been contacted
+            assertNotNull(server.takeRequest(1, TimeUnit.SECONDS));
+            assertNotNull(errorTrackingServer.takeRequest(1, TimeUnit.SECONDS));
+            // assert that we waited
+            assertTrue(TimeUnit.NANOSECONDS.toMillis(elapsed) > 2000);
+        }
+    }
+
+    @Test
+    public void test404Agentless() throws Exception {
+        // test added to get the coverage checks to pass since we log conditionally in this case
+        when(config.getApiKey()).thenReturn(API_KEY_VALUE);
+        when(config.isCrashTrackingAgentless()).thenReturn(true);
+        ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config).build();
+
+        uploader = new CrashUploader(config, crashConfig);
+        server.enqueue(new MockResponse().setResponseCode(404));
+        uploader.upload(getResourcePath("sample-crash.txt"));
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        assertNotNull(recordedRequest);
+        assertEquals(API_KEY_VALUE, recordedRequest.getHeader("DD-API-KEY"));
+        // it would be nice if the test asserted the log line was written out, but it's not essential
+    }
+
+    @ParameterizedTest
+    @MethodSource("extractionArgs")
+    void extractInfo(String content, String kind, String msg) throws Exception {
+        assertEquals(kind, CrashUploader.extractErrorKind(content));
+        assertEquals(msg, CrashUploader.extractErrorMessage(content));
+    }
+
+    private static Stream<Arguments> extractionArgs() {
+        return Stream.of(
+                Arguments.of(
+                        "# A fatal error has been detected by the Java Runtime Environment:\n"
+                                + "# SIGSEGV (0xb) at pc=0x00007f696f2022b5, pid=2080369, tid=2082522\n"
+                                + "# \nOther stuff\n",
+                        "NativeCrash",
+                        "SIGSEGV (0xb) at pc=0x00007f696f2022b5, pid=2080369, tid=2082522"),
+                Arguments.of(
+                        "# There is insufficient memory for the Java Runtime Environment to continue.\n"
+                                + "# SIGSEGV (0xb) at pc=0x00007f696f2022b5, pid=2080369, tid=2082522\n"
+                                + "# \nOther stuff\n",
+                        "OutOfMemory",
+                        "SIGSEGV (0xb) at pc=0x00007f696f2022b5, pid=2080369, tid=2082522"),
+                Arguments.of(
+                        "# Completely unknown error:\n"
+                                + "# BOOM (0xb) at pc=0x00007f696f2022b5, pid=2080369, tid=2082522\n"
+                                + "# \nOther stuff\n",
+                        null,
+                        null));
     }
-  }
-
-  @Test
-  public void test404Agentless() throws Exception {
-    // test added to get the coverage checks to pass since we log conditionally in this case
-    when(config.getApiKey()).thenReturn(API_KEY_VALUE);
-    when(config.isCrashTrackingAgentless()).thenReturn(true);
-    ConfigManager.StoredConfig crashConfig = new ConfigManager.StoredConfig.Builder(config).build();
-
-    uploader = new CrashUploader(config, crashConfig);
-    server.enqueue(new MockResponse().setResponseCode(404));
-    uploader.upload(getResourcePath("sample-crash.txt"));
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    assertNotNull(recordedRequest);
-    assertEquals(API_KEY_VALUE, recordedRequest.getHeader("DD-API-KEY"));
-    // it would be nice if the test asserted the log line was written out, but it's not essential
-  }
-
-  @ParameterizedTest
-  @MethodSource("extractionArgs")
-  void extractInfo(String content, String kind, String msg) throws Exception {
-    assertEquals(kind, CrashUploader.extractErrorKind(content));
-    assertEquals(msg, CrashUploader.extractErrorMessage(content));
-  }
-
-  private static Stream<Arguments> extractionArgs() {
-    return Stream.of(
-        Arguments.of(
-            "# A fatal error has been detected by the Java Runtime Environment:\n"
-                + "# SIGSEGV (0xb) at pc=0x00007f696f2022b5, pid=2080369, tid=2082522\n"
-                + "# \nOther stuff\n",
-            "NativeCrash",
-            "SIGSEGV (0xb) at pc=0x00007f696f2022b5, pid=2080369, tid=2082522"),
-        Arguments.of(
-            "# There is insufficient memory for the Java Runtime Environment to continue.\n"
-                + "# SIGSEGV (0xb) at pc=0x00007f696f2022b5, pid=2080369, tid=2082522\n"
-                + "# \nOther stuff\n",
-            "OutOfMemory",
-            "SIGSEGV (0xb) at pc=0x00007f696f2022b5, pid=2080369, tid=2082522"),
-        Arguments.of(
-            "# Completely unknown error:\n"
-                + "# BOOM (0xb) at pc=0x00007f696f2022b5, pid=2080369, tid=2082522\n"
-                + "# \nOther stuff\n",
-            null,
-            null));
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/InitializerTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/InitializerTest.java
index 0345bcddf03..560bd784f7d 100644
--- a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/InitializerTest.java
+++ b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/InitializerTest.java
@@ -9,43 +9,41 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 public class InitializerTest {
-  @ParameterizedTest
-  @ValueSource(strings = {"summary_pid12345.log", "image_pid1_2345.txt"})
-  void testPidFromSpecialFileName(String fileName) {
-    String pid = Initializer.pidFromSpecialFileName(fileName);
-    assertTrue(pid.matches("\\d+"), "PID should be a number");
-    assertFalse(pid.isEmpty(), "PID should not be empty");
-  }
+    @ParameterizedTest
+    @ValueSource(strings = {"summary_pid12345.log", "image_pid1_2345.txt"})
+    void testPidFromSpecialFileName(String fileName) {
+        String pid = Initializer.pidFromSpecialFileName(fileName);
+        assertTrue(pid.matches("\\d+"), "PID should be a number");
+        assertFalse(pid.isEmpty(), "PID should not be empty");
+    }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"pit_12345.log", "pid12345.log", "summary_pid_12345.log", ""})
-  void testInvalidPidFromSpecialFileName(String fileName) {
-    String pid = Initializer.pidFromSpecialFileName(fileName);
-    assertTrue(pid == null || pid.isEmpty(), "PID should be empty for invalid file names");
-  }
+    @ParameterizedTest
+    @ValueSource(strings = {"pit_12345.log", "pid12345.log", "summary_pid_12345.log", ""})
+    void testInvalidPidFromSpecialFileName(String fileName) {
+        String pid = Initializer.pidFromSpecialFileName(fileName);
+        assertTrue(pid == null || pid.isEmpty(), "PID should be empty for invalid file names");
+    }
 
-  @ParameterizedTest
-  @ValueSource(
-      strings = {
-        "dd_oome_notifier.sh",
-        "dd_oome_notifier.sh %p",
-        "/tmp/dd_oome_notifier.sh",
-        "on_oome.sh; /tmp/dd_oome_notifier.sh %p",
-        "/tmp/dd_oome_notifier.sh %p;/tmp/another_script.sh",
-        "/tmp/ddprof_root/pid_1/dd_oome_notifier.sh %p"
-      })
-  void testValidOomeNotifierScript(String script) {
-    String expectedPath = Initializer.getScriptPathFromArg(script, "dd_oome_notifier.sh");
-    assertNotNull(expectedPath, "Script path should not be null");
-    assertTrue(
-        expectedPath.endsWith("dd_oome_notifier.sh"),
-        "Script path should end with dd_oome_notifier.sh");
-  }
+    @ParameterizedTest
+    @ValueSource(
+            strings = {
+                "dd_oome_notifier.sh",
+                "dd_oome_notifier.sh %p",
+                "/tmp/dd_oome_notifier.sh",
+                "on_oome.sh; /tmp/dd_oome_notifier.sh %p",
+                "/tmp/dd_oome_notifier.sh %p;/tmp/another_script.sh",
+                "/tmp/ddprof_root/pid_1/dd_oome_notifier.sh %p"
+            })
+    void testValidOomeNotifierScript(String script) {
+        String expectedPath = Initializer.getScriptPathFromArg(script, "dd_oome_notifier.sh");
+        assertNotNull(expectedPath, "Script path should not be null");
+        assertTrue(expectedPath.endsWith("dd_oome_notifier.sh"), "Script path should end with dd_oome_notifier.sh");
+    }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"", "dd_oome_notifie.sh %p", "on_oome.sh"})
-  void testInvalidOomeNotifierScript(String script) {
-    String expectedPath = Initializer.getScriptPathFromArg(script, "dd_oome_notifier.sh");
-    assertNull(expectedPath, "Script path should be null for invalid scripts");
-  }
+    @ParameterizedTest
+    @ValueSource(strings = {"", "dd_oome_notifie.sh %p", "on_oome.sh"})
+    void testInvalidOomeNotifierScript(String script) {
+        String expectedPath = Initializer.getScriptPathFromArg(script, "dd_oome_notifier.sh");
+        assertNull(expectedPath, "Script path should be null for invalid scripts");
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/ScriptInitializerSecurityTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/ScriptInitializerSecurityTest.java
index c17d0416e08..2690d422002 100644
--- a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/ScriptInitializerSecurityTest.java
+++ b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/ScriptInitializerSecurityTest.java
@@ -27,315 +27,297 @@
  */
 public class ScriptInitializerSecurityTest {
 
-  private Path tempDir;
-
-  @BeforeEach
-  void setup() throws IOException {
-    requirePosix();
-    tempDir = Files.createTempDirectory("dd-security-test-");
-  }
-
-  private static void requirePosix() {
-    assumeTrue(
-        FileSystems.getDefault().supportedFileAttributeViews().contains("posix"),
-        "Skipping POSIX-only security tests on non-POSIX file system");
-  }
-
-  @AfterEach
-  void teardown() throws IOException {
-    if (tempDir == null || !Files.exists(tempDir)) {
-      return;
+    private Path tempDir;
+
+    @BeforeEach
+    void setup() throws IOException {
+        requirePosix();
+        tempDir = Files.createTempDirectory("dd-security-test-");
+    }
+
+    private static void requirePosix() {
+        assumeTrue(
+                FileSystems.getDefault().supportedFileAttributeViews().contains("posix"),
+                "Skipping POSIX-only security tests on non-POSIX file system");
     }
-    try (Stream<Path> stream = Files.walk(tempDir)) {
-      stream
-          .sorted(Comparator.reverseOrder())
-          .map(Path::toFile)
-          .forEach(
-              f -> {
+
+    @AfterEach
+    void teardown() throws IOException {
+        if (tempDir == null || !Files.exists(tempDir)) {
+            return;
+        }
+        try (Stream<Path> stream = Files.walk(tempDir)) {
+            stream.sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(f -> {
                 // Restore write permission before delete to handle read-only test artefacts
                 f.setWritable(true, false);
                 f.delete();
-              });
+            });
+        }
+    }
+
+    @Test
+    void crashUploaderFreshDirIsOwnerRestricted() throws Exception {
+        Path scriptFile = tempDir.resolve("dd_crash_uploader.sh");
+        CrashUploaderScriptInitializer.initialize(scriptFile.toString(), "/tmp/hs_err.log");
+
+        assertTrue(Files.exists(scriptFile), "Script should have been created");
+        assertNoGroupWorldWriteBit(scriptFile);
+        assertNoGroupWorldWriteBit(tempDir);
+    }
+
+    @Test
+    void crashUploaderRepairsPreviouslyGeneratedScriptFile() throws Exception {
+        // Simulate a script file left behind by a pre-upgrade version of the initializer that did not
+        // clear group/world bits: owned by us and executable, but group/world readable (0555).
+        Path scriptFile = tempDir.resolve("dd_crash_uploader.sh");
+        Files.createFile(scriptFile);
+        Files.setPosixFilePermissions(scriptFile, PosixFilePermissions.fromString("r-xr-xr-x"));
+
+        assertTrue(
+                CrashUploaderScriptInitializer.initialize(scriptFile.toString(), "/tmp/hs_err.log"),
+                "Initializer should repair the stale script file instead of refusing it");
+
+        // Repair strips the group/world bits while preserving the owner's own bits
+        assertPermissions(scriptFile, EnumSet.of(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_EXECUTE));
+
+        // The repaired file must pass validation on the next JVM start as well
+        assertTrue(CrashUploaderScriptInitializer.initialize(scriptFile.toString(), "/tmp/hs_err.log"));
+    }
+
+    @Test
+    void oomeNotifierRepairsPreviouslyGeneratedScriptFile() throws Exception {
+        Path scriptFile = tempDir.resolve("dd_oome_notifier.sh");
+        Files.createFile(scriptFile);
+        Files.setPosixFilePermissions(scriptFile, PosixFilePermissions.fromString("r-xr-xr-x"));
+
+        assertTrue(
+                OOMENotifierScriptInitializer.initialize(scriptFile + " %p"),
+                "Initializer should repair the stale script file instead of refusing it");
+
+        assertPermissions(scriptFile, EnumSet.of(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_EXECUTE));
+
+        // The repaired file must pass validation on the next JVM start as well
+        assertTrue(OOMENotifierScriptInitializer.initialize(scriptFile + " %p"));
+    }
+
+    @Test
+    void crashUploaderHijackedScriptIsRefused() throws Exception {
+        Path scriptFile = tempDir.resolve("dd_crash_uploader.sh");
+        // Plant an attacker-writable script
+        Files.createFile(scriptFile);
+        Files.setPosixFilePermissions(scriptFile, PosixFilePermissions.fromString("rwxrwxrwx"));
+
+        long sizeBefore = Files.size(scriptFile);
+
+        // Initializer must not proceed to write config (it returns false internally)
+        assertDoesNotThrow(() -> CrashUploaderScriptInitializer.initialize(scriptFile.toString(), "/tmp/hs_err.log"));
+
+        // The config file must NOT have been written (init refused)
+        String cfgName = scriptFile.getFileName().toString().replace(".sh", "") + "_pid*.cfg";
+        boolean configWritten =
+                Files.list(tempDir).anyMatch(p -> p.getFileName().toString().endsWith(".cfg"));
+        assertFalse(configWritten, "Config must not be written when the script is hijacked");
+
+        // The script content must remain unchanged (empty file planted by attacker)
+        long sizeAfter = Files.size(scriptFile);
+        assertTrue(
+                sizeAfter == sizeBefore, "Hijacked script must not be overwritten by the initializer (size changed)");
+    }
+
+    @Test
+    void crashUploaderHijackedDirectoryIsRefused() throws Exception {
+        // Create the script dir with world-writable perms to simulate hijack
+        Path scriptDir = tempDir.resolve("hijacked_crash_dir");
+        Files.createDirectories(scriptDir);
+        Files.setPosixFilePermissions(scriptDir, PosixFilePermissions.fromString("rwxrwxrwx"));
+
+        Path scriptFile = scriptDir.resolve("dd_crash_uploader.sh");
+        assertDoesNotThrow(() -> CrashUploaderScriptInitializer.initialize(scriptFile.toString(), "/tmp/hs_err.log"));
+
+        // Script must not have been written into the untrusted dir
+        assertFalse(Files.exists(scriptFile), "Script must not be written into a hijacked directory");
+    }
+
+    @Test
+    void crashUploaderRepairsPreviouslyGeneratedDirectory() throws Exception {
+        // Simulate a directory left behind by a pre-upgrade version of the initializer that did not
+        // lock down permissions: owned by us, but group/world readable+executable (0755) with no
+        // write bits set for group/other.
+        Path scriptDir = tempDir.resolve("legacy_crash_dir");
+        Files.createDirectories(scriptDir);
+        Files.setPosixFilePermissions(scriptDir, PosixFilePermissions.fromString("rwxr-xr-x"));
+
+        Path scriptFile = scriptDir.resolve("dd_crash_uploader.sh");
+        CrashUploaderScriptInitializer.initialize(scriptFile.toString(), "/tmp/hs_err.log");
+
+        assertTrue(Files.exists(scriptFile), "Script should have been created in the repaired dir");
+        assertPermissions(
+                scriptDir,
+                EnumSet.of(
+                        PosixFilePermission.OWNER_READ,
+                        PosixFilePermission.OWNER_WRITE,
+                        PosixFilePermission.OWNER_EXECUTE));
+    }
+
+    @Test
+    void oomeNotifierRepairsPreviouslyGeneratedDirectory() throws Exception {
+        Path scriptDir = tempDir.resolve("legacy_oome_dir");
+        Files.createDirectories(scriptDir);
+        Files.setPosixFilePermissions(scriptDir, PosixFilePermissions.fromString("rwxr-xr-x"));
+
+        Path scriptFile = scriptDir.resolve("dd_oome_notifier.sh");
+        OOMENotifierScriptInitializer.initialize(scriptFile + " %p");
+
+        assertTrue(Files.exists(scriptFile), "Script should have been created in the repaired dir");
+        assertPermissions(
+                scriptDir,
+                EnumSet.of(
+                        PosixFilePermission.OWNER_READ,
+                        PosixFilePermission.OWNER_WRITE,
+                        PosixFilePermission.OWNER_EXECUTE));
     }
-  }
-
-  @Test
-  void crashUploaderFreshDirIsOwnerRestricted() throws Exception {
-    Path scriptFile = tempDir.resolve("dd_crash_uploader.sh");
-    CrashUploaderScriptInitializer.initialize(scriptFile.toString(), "/tmp/hs_err.log");
-
-    assertTrue(Files.exists(scriptFile), "Script should have been created");
-    assertNoGroupWorldWriteBit(scriptFile);
-    assertNoGroupWorldWriteBit(tempDir);
-  }
-
-  @Test
-  void crashUploaderRepairsPreviouslyGeneratedScriptFile() throws Exception {
-    // Simulate a script file left behind by a pre-upgrade version of the initializer that did not
-    // clear group/world bits: owned by us and executable, but group/world readable (0555).
-    Path scriptFile = tempDir.resolve("dd_crash_uploader.sh");
-    Files.createFile(scriptFile);
-    Files.setPosixFilePermissions(scriptFile, PosixFilePermissions.fromString("r-xr-xr-x"));
-
-    assertTrue(
-        CrashUploaderScriptInitializer.initialize(scriptFile.toString(), "/tmp/hs_err.log"),
-        "Initializer should repair the stale script file instead of refusing it");
-
-    // Repair strips the group/world bits while preserving the owner's own bits
-    assertPermissions(
-        scriptFile, EnumSet.of(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_EXECUTE));
-
-    // The repaired file must pass validation on the next JVM start as well
-    assertTrue(CrashUploaderScriptInitializer.initialize(scriptFile.toString(), "/tmp/hs_err.log"));
-  }
-
-  @Test
-  void oomeNotifierRepairsPreviouslyGeneratedScriptFile() throws Exception {
-    Path scriptFile = tempDir.resolve("dd_oome_notifier.sh");
-    Files.createFile(scriptFile);
-    Files.setPosixFilePermissions(scriptFile, PosixFilePermissions.fromString("r-xr-xr-x"));
-
-    assertTrue(
-        OOMENotifierScriptInitializer.initialize(scriptFile + " %p"),
-        "Initializer should repair the stale script file instead of refusing it");
-
-    assertPermissions(
-        scriptFile, EnumSet.of(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_EXECUTE));
-
-    // The repaired file must pass validation on the next JVM start as well
-    assertTrue(OOMENotifierScriptInitializer.initialize(scriptFile + " %p"));
-  }
-
-  @Test
-  void crashUploaderHijackedScriptIsRefused() throws Exception {
-    Path scriptFile = tempDir.resolve("dd_crash_uploader.sh");
-    // Plant an attacker-writable script
-    Files.createFile(scriptFile);
-    Files.setPosixFilePermissions(scriptFile, PosixFilePermissions.fromString("rwxrwxrwx"));
-
-    long sizeBefore = Files.size(scriptFile);
-
-    // Initializer must not proceed to write config (it returns false internally)
-    assertDoesNotThrow(
-        () -> CrashUploaderScriptInitializer.initialize(scriptFile.toString(), "/tmp/hs_err.log"));
-
-    // The config file must NOT have been written (init refused)
-    String cfgName = scriptFile.getFileName().toString().replace(".sh", "") + "_pid*.cfg";
-    boolean configWritten =
-        Files.list(tempDir).anyMatch(p -> p.getFileName().toString().endsWith(".cfg"));
-    assertFalse(configWritten, "Config must not be written when the script is hijacked");
-
-    // The script content must remain unchanged (empty file planted by attacker)
-    long sizeAfter = Files.size(scriptFile);
-    assertTrue(
-        sizeAfter == sizeBefore,
-        "Hijacked script must not be overwritten by the initializer (size changed)");
-  }
-
-  @Test
-  void crashUploaderHijackedDirectoryIsRefused() throws Exception {
-    // Create the script dir with world-writable perms to simulate hijack
-    Path scriptDir = tempDir.resolve("hijacked_crash_dir");
-    Files.createDirectories(scriptDir);
-    Files.setPosixFilePermissions(scriptDir, PosixFilePermissions.fromString("rwxrwxrwx"));
-
-    Path scriptFile = scriptDir.resolve("dd_crash_uploader.sh");
-    assertDoesNotThrow(
-        () -> CrashUploaderScriptInitializer.initialize(scriptFile.toString(), "/tmp/hs_err.log"));
-
-    // Script must not have been written into the untrusted dir
-    assertFalse(Files.exists(scriptFile), "Script must not be written into a hijacked directory");
-  }
-
-  @Test
-  void crashUploaderRepairsPreviouslyGeneratedDirectory() throws Exception {
-    // Simulate a directory left behind by a pre-upgrade version of the initializer that did not
-    // lock down permissions: owned by us, but group/world readable+executable (0755) with no
-    // write bits set for group/other.
-    Path scriptDir = tempDir.resolve("legacy_crash_dir");
-    Files.createDirectories(scriptDir);
-    Files.setPosixFilePermissions(scriptDir, PosixFilePermissions.fromString("rwxr-xr-x"));
-
-    Path scriptFile = scriptDir.resolve("dd_crash_uploader.sh");
-    CrashUploaderScriptInitializer.initialize(scriptFile.toString(), "/tmp/hs_err.log");
-
-    assertTrue(Files.exists(scriptFile), "Script should have been created in the repaired dir");
-    assertPermissions(
-        scriptDir,
-        EnumSet.of(
-            PosixFilePermission.OWNER_READ,
-            PosixFilePermission.OWNER_WRITE,
-            PosixFilePermission.OWNER_EXECUTE));
-  }
-
-  @Test
-  void oomeNotifierRepairsPreviouslyGeneratedDirectory() throws Exception {
-    Path scriptDir = tempDir.resolve("legacy_oome_dir");
-    Files.createDirectories(scriptDir);
-    Files.setPosixFilePermissions(scriptDir, PosixFilePermissions.fromString("rwxr-xr-x"));
-
-    Path scriptFile = scriptDir.resolve("dd_oome_notifier.sh");
-    OOMENotifierScriptInitializer.initialize(scriptFile + " %p");
-
-    assertTrue(Files.exists(scriptFile), "Script should have been created in the repaired dir");
-    assertPermissions(
-        scriptDir,
-        EnumSet.of(
-            PosixFilePermission.OWNER_READ,
-            PosixFilePermission.OWNER_WRITE,
-            PosixFilePermission.OWNER_EXECUTE));
-  }
-
-  @Test
-  void crashUploaderFreshDirHasExactlyOwnerPermissions() throws Exception {
-    // Place the script under a child directory that does not exist yet, so the initializer
-    // must go through its mkdirs()/permission-reset branch rather than the existing-directory
-    // (already owner-only) branch that tempDir itself would take.
-    Path scriptFile = tempDir.resolve("fresh-crash-dir").resolve("dd_crash_uploader.sh");
-    CrashUploaderScriptInitializer.initialize(scriptFile.toString(), "/tmp/hs_err.log");
-
-    // The directory is created by mkdirs() (subject to the process umask) before the
-    // owner-only bits are applied, so any stray group/other bits left over from that
-    // umask must have been cleared, not just overlaid with the owner bits.
-    assertPermissions(
-        scriptFile.getParent(),
-        EnumSet.of(
-            PosixFilePermission.OWNER_READ,
-            PosixFilePermission.OWNER_WRITE,
-            PosixFilePermission.OWNER_EXECUTE));
-  }
-
-  @Test
-  void oomeNotifierFreshDirHasExactlyOwnerPermissions() throws Exception {
-    // Place the script under a child directory that does not exist yet, so the initializer
-    // must go through its mkdirs()/permission-reset branch rather than the existing-directory
-    // (already owner-only) branch that tempDir itself would take.
-    Path scriptFile = tempDir.resolve("fresh-oome-dir").resolve("dd_oome_notifier.sh");
-    OOMENotifierScriptInitializer.initialize(scriptFile + " %p");
-
-    assertPermissions(
-        scriptFile.getParent(),
-        EnumSet.of(
-            PosixFilePermission.OWNER_READ,
-            PosixFilePermission.OWNER_WRITE,
-            PosixFilePermission.OWNER_EXECUTE));
-  }
-
-  @Test
-  void crashUploaderScriptFileHasNoGroupOrWorldReadBit() throws Exception {
-    Path scriptFile = tempDir.resolve("dd_crash_uploader.sh");
-    CrashUploaderScriptInitializer.initialize(scriptFile.toString(), "/tmp/hs_err.log");
-
-    // The script is created with FileOutputStream, so its initial mode is subject to the
-    // process umask (e.g. 0644 under a typical 0022 umask). The owner-only restriction must strip
-    // any inherited group/other bits, not just overlay owner bits on top of them, otherwise a
-    // later JVM start refuses the script as untrusted.
-    assertPermissions(
-        scriptFile, EnumSet.of(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_EXECUTE));
-  }
-
-  @Test
-  void oomeNotifierScriptFileIsNotOwnerWritable() throws Exception {
-    Path scriptFile = tempDir.resolve("dd_oome_notifier.sh");
-    OOMENotifierScriptInitializer.initialize(scriptFile + " %p");
-
-    // The write bit is deliberately not restored after the clear/set-owner-only sequence,
-    // so the copied script must end up read+execute only, even for the owner.
-    assertPermissions(
-        scriptFile, EnumSet.of(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_EXECUTE));
-  }
-
-  @Test
-  void oomeNotifierFreshDirIsOwnerRestricted() throws Exception {
-    Path scriptFile = tempDir.resolve("dd_oome_notifier.sh");
-    OOMENotifierScriptInitializer.initialize(scriptFile + " %p");
-
-    assertTrue(Files.exists(scriptFile), "OOME notifier script should have been created");
-    assertNoGroupWorldWriteBit(scriptFile);
-    assertNoGroupWorldWriteBit(tempDir);
-  }
-
-  @Test
-  void oomeNotifierHijackedScriptIsRefused() throws Exception {
-    Path scriptFile = tempDir.resolve("dd_oome_notifier.sh");
-    // Plant an attacker-writable script
-    Files.createFile(scriptFile);
-    Files.setPosixFilePermissions(scriptFile, PosixFilePermissions.fromString("rwxrwxrwx"));
-
-    long sizeBefore = Files.size(scriptFile);
-
-    assertDoesNotThrow(() -> OOMENotifierScriptInitializer.initialize(scriptFile + " %p"));
-
-    // Config must not be written when initializer refuses
-    boolean configWritten =
-        Files.list(tempDir).anyMatch(p -> p.getFileName().toString().endsWith(".cfg"));
-    assertFalse(configWritten, "Config must not be written when the OOME script is hijacked");
-
-    // Script content must be unchanged
-    long sizeAfter = Files.size(scriptFile);
-    assertTrue(
-        sizeAfter == sizeBefore, "Hijacked OOME script must not be overwritten by the initializer");
-  }
-
-  @Test
-  void oomeNotifierHijackedDirectoryIsRefused() throws Exception {
-    Path scriptDir = tempDir.resolve("hijacked_oome_dir");
-    Files.createDirectories(scriptDir);
-    Files.setPosixFilePermissions(scriptDir, PosixFilePermissions.fromString("rwxrwxrwx"));
-
-    Path scriptFile = scriptDir.resolve("dd_oome_notifier.sh");
-    assertDoesNotThrow(() -> OOMENotifierScriptInitializer.initialize(scriptFile + " %p"));
-
-    assertFalse(Files.exists(scriptFile), "Script must not be written into a hijacked directory");
-  }
-
-  @Test
-  void cleanPosixTreeEndToEndInitProducesScriptsAndConfigs() throws Exception {
-    Path crashScript = tempDir.resolve("dd_crash_uploader.sh");
-    Path oomeScript = tempDir.resolve("dd_oome_notifier.sh");
-
-    // Initialise crash uploader
-    assertDoesNotThrow(
-        () -> CrashUploaderScriptInitializer.initialize(crashScript.toString(), "/tmp/hs_err.log"));
-
-    // Initialise OOME notifier
-    assertDoesNotThrow(() -> OOMENotifierScriptInitializer.initialize(oomeScript + " %p"));
-
-    // Both scripts must exist and be non-empty
-    assertTrue(Files.exists(crashScript), "dd_crash_uploader.sh must exist");
-    assertTrue(Files.size(crashScript) > 0, "dd_crash_uploader.sh must be non-empty");
-    assertTrue(Files.exists(oomeScript), "dd_oome_notifier.sh must exist");
-    assertTrue(Files.size(oomeScript) > 0, "dd_oome_notifier.sh must be non-empty");
-
-    // At least one .cfg file must have been written (crash uploader config)
-    boolean crashCfgWritten =
-        Files.list(tempDir).anyMatch(p -> p.getFileName().toString().endsWith(".cfg"));
-    assertTrue(crashCfgWritten, "Crash uploader .cfg file must be written in the clean flow");
-  }
-
-  private static void assertPermissions(Path path, Set<PosixFilePermission> expected)
-      throws IOException {
-    Set<PosixFilePermission> actual = Files.getPosixFilePermissions(path);
-    assertEquals(
-        actual,
-        expected,
-        "Expected permissions "
-            + PosixFilePermissions.toString(expected)
-            + " but found "
-            + PosixFilePermissions.toString(actual)
-            + " on "
-            + path);
-  }
-
-  private static void assertNoGroupWorldWriteBit(Path path) throws IOException {
-    Set<PosixFilePermission> perms = Files.getPosixFilePermissions(path);
-    for (PosixFilePermission bit :
-        new PosixFilePermission[] {
-          PosixFilePermission.GROUP_WRITE, PosixFilePermission.OTHERS_WRITE
-        }) {
-      assertFalse(
-          perms.contains(bit),
-          "Expected no group/world write bit but found " + bit + " on " + path);
+
+    @Test
+    void crashUploaderFreshDirHasExactlyOwnerPermissions() throws Exception {
+        // Place the script under a child directory that does not exist yet, so the initializer
+        // must go through its mkdirs()/permission-reset branch rather than the existing-directory
+        // (already owner-only) branch that tempDir itself would take.
+        Path scriptFile = tempDir.resolve("fresh-crash-dir").resolve("dd_crash_uploader.sh");
+        CrashUploaderScriptInitializer.initialize(scriptFile.toString(), "/tmp/hs_err.log");
+
+        // The directory is created by mkdirs() (subject to the process umask) before the
+        // owner-only bits are applied, so any stray group/other bits left over from that
+        // umask must have been cleared, not just overlaid with the owner bits.
+        assertPermissions(
+                scriptFile.getParent(),
+                EnumSet.of(
+                        PosixFilePermission.OWNER_READ,
+                        PosixFilePermission.OWNER_WRITE,
+                        PosixFilePermission.OWNER_EXECUTE));
+    }
+
+    @Test
+    void oomeNotifierFreshDirHasExactlyOwnerPermissions() throws Exception {
+        // Place the script under a child directory that does not exist yet, so the initializer
+        // must go through its mkdirs()/permission-reset branch rather than the existing-directory
+        // (already owner-only) branch that tempDir itself would take.
+        Path scriptFile = tempDir.resolve("fresh-oome-dir").resolve("dd_oome_notifier.sh");
+        OOMENotifierScriptInitializer.initialize(scriptFile + " %p");
+
+        assertPermissions(
+                scriptFile.getParent(),
+                EnumSet.of(
+                        PosixFilePermission.OWNER_READ,
+                        PosixFilePermission.OWNER_WRITE,
+                        PosixFilePermission.OWNER_EXECUTE));
+    }
+
+    @Test
+    void crashUploaderScriptFileHasNoGroupOrWorldReadBit() throws Exception {
+        Path scriptFile = tempDir.resolve("dd_crash_uploader.sh");
+        CrashUploaderScriptInitializer.initialize(scriptFile.toString(), "/tmp/hs_err.log");
+
+        // The script is created with FileOutputStream, so its initial mode is subject to the
+        // process umask (e.g. 0644 under a typical 0022 umask). The owner-only restriction must strip
+        // any inherited group/other bits, not just overlay owner bits on top of them, otherwise a
+        // later JVM start refuses the script as untrusted.
+        assertPermissions(scriptFile, EnumSet.of(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_EXECUTE));
+    }
+
+    @Test
+    void oomeNotifierScriptFileIsNotOwnerWritable() throws Exception {
+        Path scriptFile = tempDir.resolve("dd_oome_notifier.sh");
+        OOMENotifierScriptInitializer.initialize(scriptFile + " %p");
+
+        // The write bit is deliberately not restored after the clear/set-owner-only sequence,
+        // so the copied script must end up read+execute only, even for the owner.
+        assertPermissions(scriptFile, EnumSet.of(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_EXECUTE));
+    }
+
+    @Test
+    void oomeNotifierFreshDirIsOwnerRestricted() throws Exception {
+        Path scriptFile = tempDir.resolve("dd_oome_notifier.sh");
+        OOMENotifierScriptInitializer.initialize(scriptFile + " %p");
+
+        assertTrue(Files.exists(scriptFile), "OOME notifier script should have been created");
+        assertNoGroupWorldWriteBit(scriptFile);
+        assertNoGroupWorldWriteBit(tempDir);
+    }
+
+    @Test
+    void oomeNotifierHijackedScriptIsRefused() throws Exception {
+        Path scriptFile = tempDir.resolve("dd_oome_notifier.sh");
+        // Plant an attacker-writable script
+        Files.createFile(scriptFile);
+        Files.setPosixFilePermissions(scriptFile, PosixFilePermissions.fromString("rwxrwxrwx"));
+
+        long sizeBefore = Files.size(scriptFile);
+
+        assertDoesNotThrow(() -> OOMENotifierScriptInitializer.initialize(scriptFile + " %p"));
+
+        // Config must not be written when initializer refuses
+        boolean configWritten =
+                Files.list(tempDir).anyMatch(p -> p.getFileName().toString().endsWith(".cfg"));
+        assertFalse(configWritten, "Config must not be written when the OOME script is hijacked");
+
+        // Script content must be unchanged
+        long sizeAfter = Files.size(scriptFile);
+        assertTrue(sizeAfter == sizeBefore, "Hijacked OOME script must not be overwritten by the initializer");
+    }
+
+    @Test
+    void oomeNotifierHijackedDirectoryIsRefused() throws Exception {
+        Path scriptDir = tempDir.resolve("hijacked_oome_dir");
+        Files.createDirectories(scriptDir);
+        Files.setPosixFilePermissions(scriptDir, PosixFilePermissions.fromString("rwxrwxrwx"));
+
+        Path scriptFile = scriptDir.resolve("dd_oome_notifier.sh");
+        assertDoesNotThrow(() -> OOMENotifierScriptInitializer.initialize(scriptFile + " %p"));
+
+        assertFalse(Files.exists(scriptFile), "Script must not be written into a hijacked directory");
+    }
+
+    @Test
+    void cleanPosixTreeEndToEndInitProducesScriptsAndConfigs() throws Exception {
+        Path crashScript = tempDir.resolve("dd_crash_uploader.sh");
+        Path oomeScript = tempDir.resolve("dd_oome_notifier.sh");
+
+        // Initialise crash uploader
+        assertDoesNotThrow(() -> CrashUploaderScriptInitializer.initialize(crashScript.toString(), "/tmp/hs_err.log"));
+
+        // Initialise OOME notifier
+        assertDoesNotThrow(() -> OOMENotifierScriptInitializer.initialize(oomeScript + " %p"));
+
+        // Both scripts must exist and be non-empty
+        assertTrue(Files.exists(crashScript), "dd_crash_uploader.sh must exist");
+        assertTrue(Files.size(crashScript) > 0, "dd_crash_uploader.sh must be non-empty");
+        assertTrue(Files.exists(oomeScript), "dd_oome_notifier.sh must exist");
+        assertTrue(Files.size(oomeScript) > 0, "dd_oome_notifier.sh must be non-empty");
+
+        // At least one .cfg file must have been written (crash uploader config)
+        boolean crashCfgWritten =
+                Files.list(tempDir).anyMatch(p -> p.getFileName().toString().endsWith(".cfg"));
+        assertTrue(crashCfgWritten, "Crash uploader .cfg file must be written in the clean flow");
+    }
+
+    private static void assertPermissions(Path path, Set<PosixFilePermission> expected) throws IOException {
+        Set<PosixFilePermission> actual = Files.getPosixFilePermissions(path);
+        assertEquals(
+                actual,
+                expected,
+                "Expected permissions "
+                        + PosixFilePermissions.toString(expected)
+                        + " but found "
+                        + PosixFilePermissions.toString(actual)
+                        + " on "
+                        + path);
+    }
+
+    private static void assertNoGroupWorldWriteBit(Path path) throws IOException {
+        Set<PosixFilePermission> perms = Files.getPosixFilePermissions(path);
+        for (PosixFilePermission bit :
+                new PosixFilePermission[] {PosixFilePermission.GROUP_WRITE, PosixFilePermission.OTHERS_WRITE}) {
+            assertFalse(perms.contains(bit), "Expected no group/world write bit but found " + bit + " on " + path);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/ScriptInitializerTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/ScriptInitializerTest.java
index 53cf66f72a1..c2704edcb9b 100644
--- a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/ScriptInitializerTest.java
+++ b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/ScriptInitializerTest.java
@@ -22,144 +22,136 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 public class ScriptInitializerTest {
-  private Path tempDir;
+    private Path tempDir;
 
-  @BeforeEach
-  void setup() throws Exception {
-    tempDir = Files.createTempDirectory("dd-test-");
-  }
+    @BeforeEach
+    void setup() throws Exception {
+        tempDir = Files.createTempDirectory("dd-test-");
+    }
 
-  @AfterEach
-  void teardown() throws Exception {
-    try (Stream<Path> fileStream = Files.walk(tempDir)) {
-      fileStream.sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete);
+    @AfterEach
+    void teardown() throws Exception {
+        try (Stream<Path> fileStream = Files.walk(tempDir)) {
+            fileStream.sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete);
+        }
+        Files.deleteIfExists(tempDir);
     }
-    Files.deleteIfExists(tempDir);
-  }
-
-  @Test
-  void testCrashUploaderSanity() {
-    assertDoesNotThrow(() -> CrashUploaderScriptInitializer.initialize(null, null));
-    assertDoesNotThrow(
-        () ->
-            CrashUploaderScriptInitializer.initialize(
+
+    @Test
+    void testCrashUploaderSanity() {
+        assertDoesNotThrow(() -> CrashUploaderScriptInitializer.initialize(null, null));
+        assertDoesNotThrow(() -> CrashUploaderScriptInitializer.initialize(
                 tempDir.resolve("dummy.sh").toString(), null));
-    assertDoesNotThrow(() -> CrashUploaderScriptInitializer.initialize(null, "hs_err.log"));
-  }
-
-  @Test
-  void testOomeNotifierSanity() {
-    assertDoesNotThrow(() -> OOMENotifierScriptInitializer.initialize(null));
-    assertDoesNotThrow(
-        () -> OOMENotifierScriptInitializer.initialize(tempDir.resolve("dummy.sh").toString()));
-  }
-
-  @ParameterizedTest
-  @MethodSource("crashTrackingScripts")
-  void testCrashUploaderInitializationSuccess(String target, String pidArg)
-      throws IOException, InterruptedException {
-    Path file = tempDir.resolve(target);
-    String hsErrFile = "/tmp/hs_err.log";
-    CrashUploaderScriptInitializer.initialize(file + pidArg, hsErrFile);
-    assertTrue(Files.exists(file), "File " + file + " should have been created");
-    List<String> lines = Files.readAllLines(file);
-    assertFalse(lines.isEmpty(), "File " + file + " is expected to be non-empty");
-    // sanity check to see if no placeholders are left
-    Pattern placeholder = Pattern.compile("![A-Z_]+!");
-    assertFalse(lines.stream().anyMatch(l -> placeholder.matcher(l).find()));
-    // sanity to check the crash log file was properly replaced in the script
-    assertTrue(lines.stream().anyMatch(l -> l.contains(hsErrFile)));
-    // sanity to check the java home was properly captured
-    assertTrue(lines.stream().anyMatch(l -> l.contains("java_home")));
-  }
-
-  @Test
-  void testCrashUploaderInitializationExisting() throws IOException {
-    Path file = tempDir.resolve("dd_crash_uploader.sh");
-    Files.createFile(file);
-    CrashUploaderScriptInitializer.initialize(file.toString(), "/tmp/hs_err%p.log");
-    assertTrue(Files.exists(file), "File " + file + " should not have been removed");
-    assertTrue(
-        Files.readAllLines(file).isEmpty(),
-        "File " + file + " content should not have been modified");
-  }
-
-  private static Stream<Arguments> crashTrackingScripts() {
-    return Stream.of(
-        Arguments.of("dd_crash_uploader.sh", ""),
-        Arguments.of("dd_crash_uploader.bat", ""),
-        Arguments.of("dd_CrAsH_uploader.sh", " %p"),
-        Arguments.of("dd_crash_uploader.bat", " %p"));
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"dd_oome_notifier.sh", "dd_oome_notifier.bat"})
-  void testOomeNotifierInitializationSuccess(String target) throws IOException {
-    Path file = tempDir.resolve(target);
-    OOMENotifierScriptInitializer.initialize(file + " %p");
-    assertTrue(Files.exists(file), "File " + file + " should have been created");
-    List<String> lines = Files.readAllLines(file);
-    assertFalse(lines.isEmpty(), "File " + file + " is expected to be non-empty");
-    // sanity to check the placeholder was properly replaced
-    assertTrue(lines.stream().anyMatch(l -> !l.contains("!TAGS!")));
-    // sanity to check the java home was properly captured
-    assertTrue(lines.stream().anyMatch(l -> l.contains("java_home")));
-  }
-
-  @Test
-  void testCrashUploaderNoInitialization() {
-    // the initializer needs a particular script name to kick-in
-    Path file = tempDir.resolve("some_other_script.sh");
-    String hsErrFile = "/tmp/hs_err.log";
-    CrashUploaderScriptInitializer.initialize(file.toString(), hsErrFile);
-    assertFalse(Files.exists(file), "File " + file + " should not have been created");
-  }
-
-  @Test
-  void testOomeNotifierNoInitialization() {
-    // the initializer needs a particular script name to kick-in
-    Path file = tempDir.resolve("some_other_script.sh");
-    OOMENotifierScriptInitializer.initialize(file.toString());
-    assertFalse(Files.exists(file), "File " + file + " should not have been created");
-  }
-
-  @Test
-  void testOomeNotifierInitializationExisting() throws IOException {
-    Path file = tempDir.resolve("dd_oome_notifier.sh");
-    Files.createFile(file);
-    OOMENotifierScriptInitializer.initialize(file.toString());
-    assertTrue(Files.exists(file), "File " + file + " should not have been removed");
-    assertTrue(
-        Files.readAllLines(file).isEmpty(),
-        "File " + file + " content should not have been modified");
-  }
-
-  @Test
-  void testCrashUploaderNoErrFileSpec() throws IOException {
-    Path file = tempDir.resolve("dd_crash_uploader.sh");
-    CrashUploaderScriptInitializer.initialize(file.toString(), "");
-    assertTrue(Files.exists(file), "File " + file + " should have been created");
-    // sanity to check the crash log file was properly replaced in the script
-    List<String> lines = Files.readAllLines(file);
-    assertFalse(lines.isEmpty(), "File " + file + " is expected to be non-empty");
-    // sanity to check the crash log file was properly replaced in the script
-    assertTrue(lines.stream().anyMatch(l -> l.contains("hs_err")));
-  }
-
-  @Test
-  void testCrashUploaderInvalidFolder() throws IOException {
-    Files.setPosixFilePermissions(tempDir, PosixFilePermissions.fromString("r-x------"));
-    Path file = tempDir.resolve("dd_crash_uploader.sh");
-    assertDoesNotThrow(
-        () -> CrashUploaderScriptInitializer.initialize(file.toString(), "/tmp/hs_err.log"));
-    assertFalse(Files.exists(file), "File " + file + " should not have been created");
-  }
-
-  @Test
-  void testOomeInitializeInvalidFolder() throws IOException {
-    Files.setPosixFilePermissions(tempDir, PosixFilePermissions.fromString("r-x------"));
-    Path file = tempDir.resolve("dd_oome_notifier.sh");
-    assertDoesNotThrow(() -> OOMENotifierScriptInitializer.initialize(file + " %p"));
-    assertFalse(Files.exists(file), "File " + file + " should not have been created");
-  }
+        assertDoesNotThrow(() -> CrashUploaderScriptInitializer.initialize(null, "hs_err.log"));
+    }
+
+    @Test
+    void testOomeNotifierSanity() {
+        assertDoesNotThrow(() -> OOMENotifierScriptInitializer.initialize(null));
+        assertDoesNotThrow(() -> OOMENotifierScriptInitializer.initialize(
+                tempDir.resolve("dummy.sh").toString()));
+    }
+
+    @ParameterizedTest
+    @MethodSource("crashTrackingScripts")
+    void testCrashUploaderInitializationSuccess(String target, String pidArg) throws IOException, InterruptedException {
+        Path file = tempDir.resolve(target);
+        String hsErrFile = "/tmp/hs_err.log";
+        CrashUploaderScriptInitializer.initialize(file + pidArg, hsErrFile);
+        assertTrue(Files.exists(file), "File " + file + " should have been created");
+        List<String> lines = Files.readAllLines(file);
+        assertFalse(lines.isEmpty(), "File " + file + " is expected to be non-empty");
+        // sanity check to see if no placeholders are left
+        Pattern placeholder = Pattern.compile("![A-Z_]+!");
+        assertFalse(lines.stream().anyMatch(l -> placeholder.matcher(l).find()));
+        // sanity to check the crash log file was properly replaced in the script
+        assertTrue(lines.stream().anyMatch(l -> l.contains(hsErrFile)));
+        // sanity to check the java home was properly captured
+        assertTrue(lines.stream().anyMatch(l -> l.contains("java_home")));
+    }
+
+    @Test
+    void testCrashUploaderInitializationExisting() throws IOException {
+        Path file = tempDir.resolve("dd_crash_uploader.sh");
+        Files.createFile(file);
+        CrashUploaderScriptInitializer.initialize(file.toString(), "/tmp/hs_err%p.log");
+        assertTrue(Files.exists(file), "File " + file + " should not have been removed");
+        assertTrue(Files.readAllLines(file).isEmpty(), "File " + file + " content should not have been modified");
+    }
+
+    private static Stream<Arguments> crashTrackingScripts() {
+        return Stream.of(
+                Arguments.of("dd_crash_uploader.sh", ""),
+                Arguments.of("dd_crash_uploader.bat", ""),
+                Arguments.of("dd_CrAsH_uploader.sh", " %p"),
+                Arguments.of("dd_crash_uploader.bat", " %p"));
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"dd_oome_notifier.sh", "dd_oome_notifier.bat"})
+    void testOomeNotifierInitializationSuccess(String target) throws IOException {
+        Path file = tempDir.resolve(target);
+        OOMENotifierScriptInitializer.initialize(file + " %p");
+        assertTrue(Files.exists(file), "File " + file + " should have been created");
+        List<String> lines = Files.readAllLines(file);
+        assertFalse(lines.isEmpty(), "File " + file + " is expected to be non-empty");
+        // sanity to check the placeholder was properly replaced
+        assertTrue(lines.stream().anyMatch(l -> !l.contains("!TAGS!")));
+        // sanity to check the java home was properly captured
+        assertTrue(lines.stream().anyMatch(l -> l.contains("java_home")));
+    }
+
+    @Test
+    void testCrashUploaderNoInitialization() {
+        // the initializer needs a particular script name to kick-in
+        Path file = tempDir.resolve("some_other_script.sh");
+        String hsErrFile = "/tmp/hs_err.log";
+        CrashUploaderScriptInitializer.initialize(file.toString(), hsErrFile);
+        assertFalse(Files.exists(file), "File " + file + " should not have been created");
+    }
+
+    @Test
+    void testOomeNotifierNoInitialization() {
+        // the initializer needs a particular script name to kick-in
+        Path file = tempDir.resolve("some_other_script.sh");
+        OOMENotifierScriptInitializer.initialize(file.toString());
+        assertFalse(Files.exists(file), "File " + file + " should not have been created");
+    }
+
+    @Test
+    void testOomeNotifierInitializationExisting() throws IOException {
+        Path file = tempDir.resolve("dd_oome_notifier.sh");
+        Files.createFile(file);
+        OOMENotifierScriptInitializer.initialize(file.toString());
+        assertTrue(Files.exists(file), "File " + file + " should not have been removed");
+        assertTrue(Files.readAllLines(file).isEmpty(), "File " + file + " content should not have been modified");
+    }
+
+    @Test
+    void testCrashUploaderNoErrFileSpec() throws IOException {
+        Path file = tempDir.resolve("dd_crash_uploader.sh");
+        CrashUploaderScriptInitializer.initialize(file.toString(), "");
+        assertTrue(Files.exists(file), "File " + file + " should have been created");
+        // sanity to check the crash log file was properly replaced in the script
+        List<String> lines = Files.readAllLines(file);
+        assertFalse(lines.isEmpty(), "File " + file + " is expected to be non-empty");
+        // sanity to check the crash log file was properly replaced in the script
+        assertTrue(lines.stream().anyMatch(l -> l.contains("hs_err")));
+    }
+
+    @Test
+    void testCrashUploaderInvalidFolder() throws IOException {
+        Files.setPosixFilePermissions(tempDir, PosixFilePermissions.fromString("r-x------"));
+        Path file = tempDir.resolve("dd_crash_uploader.sh");
+        assertDoesNotThrow(() -> CrashUploaderScriptInitializer.initialize(file.toString(), "/tmp/hs_err.log"));
+        assertFalse(Files.exists(file), "File " + file + " should not have been created");
+    }
+
+    @Test
+    void testOomeInitializeInvalidFolder() throws IOException {
+        Files.setPosixFilePermissions(tempDir, PosixFilePermissions.fromString("r-x------"));
+        Path file = tempDir.resolve("dd_oome_notifier.sh");
+        assertDoesNotThrow(() -> OOMENotifierScriptInitializer.initialize(file + " %p"));
+        assertFalse(Files.exists(file), "File " + file + " should not have been created");
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdCollectorTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdCollectorTest.java
index a145d09997b..d64d44d0481 100644
--- a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdCollectorTest.java
+++ b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdCollectorTest.java
@@ -11,78 +11,79 @@
 
 public class BuildIdCollectorTest {
 
-  @TempDir Path tempDir;
+    @TempDir
+    Path tempDir;
 
-  @Test
-  void testAwaitCollectionDoneWithinTimeout() throws IOException {
-    BuildIdCollector collector = new BuildIdCollector();
+    @Test
+    void testAwaitCollectionDoneWithinTimeout() throws IOException {
+        BuildIdCollector collector = new BuildIdCollector();
 
-    // Add a library to process
-    String filename = "test-library.so";
-    collector.addUnprocessedLibrary(filename);
+        // Add a library to process
+        String filename = "test-library.so";
+        collector.addUnprocessedLibrary(filename);
 
-    // Create a simple test file
-    Path testFile = tempDir.resolve(filename);
-    Files.write(testFile, new byte[] {0x7F, 'E', 'L', 'F'}); // ELF magic bytes
+        // Create a simple test file
+        Path testFile = tempDir.resolve(filename);
+        Files.write(testFile, new byte[] {0x7F, 'E', 'L', 'F'}); // ELF magic bytes
 
-    // Start collection
-    collector.resolveBuildId(testFile);
+        // Start collection
+        collector.resolveBuildId(testFile);
 
-    // Should complete within timeout
-    long startTime = System.currentTimeMillis();
-    collector.awaitCollectionDone(5);
-    long elapsedTime = System.currentTimeMillis() - startTime;
+        // Should complete within timeout
+        long startTime = System.currentTimeMillis();
+        collector.awaitCollectionDone(5);
+        long elapsedTime = System.currentTimeMillis() - startTime;
 
-    // Verify it completed quickly (well under 5 seconds)
-    assertTrue(elapsedTime < 5000, "Collection should complete quickly");
-  }
+        // Verify it completed quickly (well under 5 seconds)
+        assertTrue(elapsedTime < 5000, "Collection should complete quickly");
+    }
 
-  @Test
-  void testAwaitCollectionDoneWithoutStartingCollection() {
-    BuildIdCollector collector = new BuildIdCollector();
+    @Test
+    void testAwaitCollectionDoneWithoutStartingCollection() {
+        BuildIdCollector collector = new BuildIdCollector();
 
-    // awaitCollectionDone without starting collection should return immediately
-    long startTime = System.currentTimeMillis();
-    collector.awaitCollectionDone(5);
-    long elapsedTime = System.currentTimeMillis() - startTime;
+        // awaitCollectionDone without starting collection should return immediately
+        long startTime = System.currentTimeMillis();
+        collector.awaitCollectionDone(5);
+        long elapsedTime = System.currentTimeMillis() - startTime;
 
-    assertTrue(elapsedTime < 100, "Should return immediately when not collecting");
-  }
+        assertTrue(elapsedTime < 100, "Should return immediately when not collecting");
+    }
 
-  @Test
-  void testResolveBuildIdSkipsUnprocessedLibraries() throws IOException {
-    BuildIdCollector collector = new BuildIdCollector();
+    @Test
+    void testResolveBuildIdSkipsUnprocessedLibraries() throws IOException {
+        BuildIdCollector collector = new BuildIdCollector();
 
-    String filename = "not-added.so";
-    Path testFile = tempDir.resolve(filename);
-    Files.write(testFile, new byte[] {0x7F, 'E', 'L', 'F'});
+        String filename = "not-added.so";
+        Path testFile = tempDir.resolve(filename);
+        Files.write(testFile, new byte[] {0x7F, 'E', 'L', 'F'});
 
-    // Resolve without adding first
-    collector.resolveBuildId(testFile);
-    collector.awaitCollectionDone(1);
+        // Resolve without adding first
+        collector.resolveBuildId(testFile);
+        collector.awaitCollectionDone(1);
 
-    // Should not be in the map since it wasn't added
-    BuildInfo info = collector.getBuildInfo(filename);
-    assertNull(info, "Library should not be processed if not added first");
-  }
+        // Should not be in the map since it wasn't added
+        BuildInfo info = collector.getBuildInfo(filename);
+        assertNull(info, "Library should not be processed if not added first");
+    }
 
-  @Test
-  void testMultipleAwaitCollectionDoneCalls() throws IOException {
-    BuildIdCollector collector = new BuildIdCollector();
+    @Test
+    void testMultipleAwaitCollectionDoneCalls() throws IOException {
+        BuildIdCollector collector = new BuildIdCollector();
 
-    String filename = "test.so";
-    collector.addUnprocessedLibrary(filename);
-    Path testFile = tempDir.resolve(filename);
-    Files.write(testFile, new byte[] {0x7F, 'E', 'L', 'F'});
+        String filename = "test.so";
+        collector.addUnprocessedLibrary(filename);
+        Path testFile = tempDir.resolve(filename);
+        Files.write(testFile, new byte[] {0x7F, 'E', 'L', 'F'});
 
-    collector.resolveBuildId(testFile);
-    collector.awaitCollectionDone(5);
+        collector.resolveBuildId(testFile);
+        collector.awaitCollectionDone(5);
 
-    // Second call should return immediately since collection is already done
-    long startTime = System.currentTimeMillis();
-    collector.awaitCollectionDone(5);
-    long elapsedTime = System.currentTimeMillis() - startTime;
+        // Second call should return immediately since collection is already done
+        long startTime = System.currentTimeMillis();
+        collector.awaitCollectionDone(5);
+        long elapsedTime = System.currentTimeMillis() - startTime;
 
-    assertTrue(elapsedTime < 100, "Second await should return immediately");
-  }
+        assertTrue(elapsedTime < 100, "Second await should return immediately");
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdExtractorIntegrationTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdExtractorIntegrationTest.java
index 27a34360b0a..d8f4b2072a3 100644
--- a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdExtractorIntegrationTest.java
+++ b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdExtractorIntegrationTest.java
@@ -14,46 +14,45 @@
  * test resources. Fixtures cover ELF64/ELF32, little/big-endian, and PE32/PE32+ formats.
  */
 public class BuildIdExtractorIntegrationTest {
-  private static final Logger logger =
-      LoggerFactory.getLogger(BuildIdExtractorIntegrationTest.class);
-
-  @TableTest({
-    "scenario            | resource                | expectedBuildId                         ",
-    "ELF64 little-endian | buildid/elf/elf64-le.so | 0123456789abcdef0123456789abcdefdeadbeef",
-    "ELF32 little-endian | buildid/elf/elf32-le.so | deadbeefcafebabe123456789abcdef0        ",
-    "ELF64 big-endian    | buildid/elf/elf64-be.so | ff00112233445566778899aabbccddeeff000102"
-  })
-  void testElfBuildIdExtraction(String resource, String expectedBuildId) throws Exception {
-    Path file = Paths.get(getClass().getClassLoader().getResource(resource).toURI());
-
-    ElfBuildIdExtractor extractor = new ElfBuildIdExtractor();
-    String buildId = extractor.extractBuildId(file);
-
-    logger.info("Found build ID: {} for {}", buildId, resource);
-
-    assertNotNull(buildId, "Build ID should be found for " + resource);
-    assertEquals(expectedBuildId, buildId, "Build ID mismatch for " + resource);
-    assertEquals(BuildInfo.FileType.ELF, extractor.fileType());
-    assertEquals(BuildInfo.BuildIdType.GNU, extractor.buildIdType());
-  }
-
-  @TableTest({
-    "scenario                                         | resource                             | expectedBuildId                   ",
-    "PE32+ single debug entry                         | buildid/pe/pe32plus-single-entry.dll | 12345678ABCDEF0123456789ABCDEF011 ",
-    "PE32 single debug entry                          | buildid/pe/pe32-single-entry.dll     | DEADBEEF12345678DEADBEEF123456782 ",
-    "PE32+ multiple debug entries, CodeView is second | buildid/pe/pe32plus-multi-entry.dll  | CAFEBABEBEEFDEADCAFEBABEBEEFDEADff"
-  })
-  void testPeBuildIdExtraction(String resource, String expectedBuildId) throws Exception {
-    Path file = Paths.get(getClass().getClassLoader().getResource(resource).toURI());
-
-    PeBuildIdExtractor extractor = new PeBuildIdExtractor();
-    String buildId = extractor.extractBuildId(file);
-
-    logger.info("Found build ID: {} for {}", buildId, resource);
-
-    assertNotNull(buildId, "Build ID should be found for " + resource);
-    assertEquals(expectedBuildId, buildId, "Build ID mismatch for " + resource);
-    assertEquals(BuildInfo.FileType.PE, extractor.fileType());
-    assertEquals(BuildInfo.BuildIdType.PDB, extractor.buildIdType());
-  }
+    private static final Logger logger = LoggerFactory.getLogger(BuildIdExtractorIntegrationTest.class);
+
+    @TableTest({
+      "scenario            | resource                | expectedBuildId                         ",
+      "ELF64 little-endian | buildid/elf/elf64-le.so | 0123456789abcdef0123456789abcdefdeadbeef",
+      "ELF32 little-endian | buildid/elf/elf32-le.so | deadbeefcafebabe123456789abcdef0        ",
+      "ELF64 big-endian    | buildid/elf/elf64-be.so | ff00112233445566778899aabbccddeeff000102"
+    })
+    void testElfBuildIdExtraction(String resource, String expectedBuildId) throws Exception {
+        Path file = Paths.get(getClass().getClassLoader().getResource(resource).toURI());
+
+        ElfBuildIdExtractor extractor = new ElfBuildIdExtractor();
+        String buildId = extractor.extractBuildId(file);
+
+        logger.info("Found build ID: {} for {}", buildId, resource);
+
+        assertNotNull(buildId, "Build ID should be found for " + resource);
+        assertEquals(expectedBuildId, buildId, "Build ID mismatch for " + resource);
+        assertEquals(BuildInfo.FileType.ELF, extractor.fileType());
+        assertEquals(BuildInfo.BuildIdType.GNU, extractor.buildIdType());
+    }
+
+    @TableTest({
+      "scenario                                         | resource                             | expectedBuildId                   ",
+      "PE32+ single debug entry                         | buildid/pe/pe32plus-single-entry.dll | 12345678ABCDEF0123456789ABCDEF011 ",
+      "PE32 single debug entry                          | buildid/pe/pe32-single-entry.dll     | DEADBEEF12345678DEADBEEF123456782 ",
+      "PE32+ multiple debug entries, CodeView is second | buildid/pe/pe32plus-multi-entry.dll  | CAFEBABEBEEFDEADCAFEBABEBEEFDEADff"
+    })
+    void testPeBuildIdExtraction(String resource, String expectedBuildId) throws Exception {
+        Path file = Paths.get(getClass().getClassLoader().getResource(resource).toURI());
+
+        PeBuildIdExtractor extractor = new PeBuildIdExtractor();
+        String buildId = extractor.extractBuildId(file);
+
+        logger.info("Found build ID: {} for {}", buildId, resource);
+
+        assertNotNull(buildId, "Build ID should be found for " + resource);
+        assertEquals(expectedBuildId, buildId, "Build ID mismatch for " + resource);
+        assertEquals(BuildInfo.FileType.PE, extractor.fileType());
+        assertEquals(BuildInfo.BuildIdType.PDB, extractor.buildIdType());
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/HotspotCrashLogParserTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/HotspotCrashLogParserTest.java
index 28bcda39e7f..f4a7213b3f6 100644
--- a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/HotspotCrashLogParserTest.java
+++ b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/HotspotCrashLogParserTest.java
@@ -21,369 +21,335 @@
 import org.tabletest.junit.TableTest;
 
 public class HotspotCrashLogParserTest {
-  @TableTest({
-    "scenario         | logDateTime                     | expectedISODateTime      ",
-    "2-digit offset   | Tue Oct 17 20:25:14 2023 +08    | 2023-10-17T20:25:14+08:00",
-    "UTC zone         | Fri Sep 20 13:19:06 2024 UTC    | 2024-09-20T13:19:06Z     ",
-    "single-digit day | Tue Oct  1 05:05:47 2024 +00:00 | 2024-10-01T05:05:47Z     ",
-    "CEST zone        | Tue Oct  1 14:37:58 2024 CEST   | 2024-10-01T14:37:58+02:00"
-  })
-  public void testDateTimeParser(String logDateTime, String expectedISODateTime) {
-    assertEquals(expectedISODateTime, HotspotCrashLogParser.dateTimeToISO(logDateTime));
-  }
-
-  @Test
-  public void testIncompleteParsing() throws Exception {
-    // Given
-    final String uuid = UUID.randomUUID().toString();
-
-    // When
-    final CrashLog crashLog =
-        new HotspotCrashLogParser().parse(uuid, readFileAsString("incomplete-crash.txt"));
-
-    // Then
-    assertNotNull(crashLog);
-    assertEquals(uuid, crashLog.uuid);
-    assertTrue(crashLog.incomplete);
-    assertNotNull(crashLog.error);
-    assertNotNull(crashLog.error.stack);
-    assertNotNull(crashLog.error.stack.frames);
-    assertEquals(0, crashLog.error.stack.frames.length);
-    assertEquals("InternalError", crashLog.error.kind);
-    assertEquals("Process terminated by Internal error", crashLog.error.message);
-  }
-
-  /** macOS aarch64 uses lowercase register names: x0-x28, fp, lr, sp, pc, cpsr */
-  @Test
-  public void testRegisterParsingMacosAarch64() throws Exception {
-    CrashLog crashLog =
-        new HotspotCrashLogParser()
-            .parse(
-                UUID.randomUUID().toString(), readFileAsString("sample-crash-macos-aarch64.txt"));
-
-    assertNotNull(crashLog.experimental, "experimental field should be populated");
-    assertNotNull(crashLog.experimental.ucontext, "ucontext should be populated");
-    assertEquals("0x0000000000000c55", crashLog.experimental.ucontext.get("x0"));
-    assertEquals("0x0000000000000000", crashLog.experimental.ucontext.get("x2"));
-    assertEquals("0x000000016feee210", crashLog.experimental.ucontext.get("fp"));
-    assertEquals("0x0000000116d0c970", crashLog.experimental.ucontext.get("lr"));
-    assertEquals("0x000000016feee0f0", crashLog.experimental.ucontext.get("sp"));
-    assertEquals("0x000000010f8ac794", crashLog.experimental.ucontext.get("pc"));
-    assertEquals("0x0000000060001000", crashLog.experimental.ucontext.get("cpsr"));
-
-    // "Top of Stack: (sp=0x...)" contains "=" — verify the parser stops at it and doesn't
-    // absorb its hex-dump content into the last register mapping entry (sp).
-    assertThat(crashLog.experimental.registerToMemoryMapping)
-        .extractingByKey("sp", STRING)
-        .doesNotContain("Top of Stack:");
-
-    assertNotNull(crashLog.experimental.runtimeArgs);
-    assertTrue(crashLog.experimental.runtimeArgs.contains("--enable-native-access=ALL-UNNAMED"));
-    assertTrue(crashLog.experimental.runtimeArgs.contains("--add-modules=ALL-DEFAULT"));
-    assertFalse(
-        crashLog.experimental.runtimeArgs.stream()
-            .anyMatch(arg -> arg.contains("SourceLauncher") || arg.endsWith("CrashTest.java")));
-  }
-
-  /**
-   * Verifies the register-to-memory mapping section for the macOS aarch64 sample: representative
-   * values, library path redaction, and that "Top of Stack:" / "Instructions:" subsections are not
-   * absorbed into register values.
-   */
-  @Test
-  public void testRegisterToMemoryMappingMacosAarch64() throws Exception {
-    CrashLog crashLog =
-        new HotspotCrashLogParser()
-            .parse(
-                UUID.randomUUID().toString(), readFileAsString("sample-crash-macos-aarch64.txt"));
-
-    Map<String, String> mapping = crashLog.experimental.registerToMemoryMapping;
-
-    // Representative single-line entries
-    assertThat(mapping)
-        .containsEntry("x0", "0x0000000000000c55 is an unknown value")
-        .containsEntry("x2", "0x0 is null")
-        .containsEntry("x28", "0x0000000100a153f0 is a thread");
-
-    // Library path (symbol+offset format) — intermediate segments collapsed to a single /redacted
-    assertThat(mapping)
-        .extractingByKey("x16", STRING)
-        .isEqualTo(
-            "0x0000000182d709d0: pthread_jit_write_protect_np+0 in /redacted/system/libsystem_pthread.dylib at 0x0000000182d69000");
-    assertThat(mapping)
-        .extractingByKey("x21", STRING)
-        .isEqualTo(
-            "0x0000000106c1ccc0: _ZN19TemplateInterpreter13_active_tableE+0 in /redacted/server/libjvm.dylib at 0x0000000105efc000");
-
-    // macOS aarch64 uses address+pipe format — address kept, bytes redacted
-    assertThat(mapping)
-        .extractingByKey("x17", STRING)
-        .isEqualTo(
-            "0x0000000100a17cb0 points into unknown readable memory: 0x00000000ffffffff | REDACTED");
-
-    // "Top of Stack: (sp=0x...)" and "Instructions: (pc=0x...)" must not leak into register values
-    assertThat(mapping).doesNotContainKey("Top of Stack");
-    assertThat(mapping)
-        .allSatisfy((k, v) -> assertThat(v).doesNotContain("Top of Stack:", "Instructions:"));
-
-    // sp is the last register before "Top of Stack:" — its value must be clean
-    assertThat(mapping)
-        .extractingByKey("sp", STRING)
-        .isEqualTo("0x000000016feee0f0 is pointing into the stack for thread: 0x0000000100a153f0");
-  }
-
-  /** Linux aarch64 uses uppercase register names: R0-R30 */
-  @Test
-  public void testRegisterParsingLinuxAarch64() throws Exception {
-    CrashLog crashLog =
-        new HotspotCrashLogParser()
-            .parse(
-                UUID.randomUUID().toString(), readFileAsString("sample-crash-linux-aarch64.txt"));
-
-    assertNotNull(crashLog.experimental, "experimental field should be populated");
-    assertNotNull(crashLog.experimental.ucontext, "ucontext should be populated");
-    assertEquals("0x0000000000000000", crashLog.experimental.ucontext.get("R0"));
-    assertEquals("0x0000000000000001", crashLog.experimental.ucontext.get("R1"));
-    assertEquals("0x0000ffff9efa168c", crashLog.experimental.ucontext.get("R30"));
-    assertEquals(31, crashLog.experimental.ucontext.size(), "R0-R30 = 31 registers");
-  }
-
-  @Test
-  public void testRegisterToMemoryMapping() throws Exception {
-    CrashLog crashLog =
-        new HotspotCrashLogParser()
-            .parse(UUID.randomUUID().toString(), readFileAsString("sample-crash.txt"));
-
-    assertThat(crashLog.experimental).isNotNull();
-    assertThat(crashLog.experimental.registerToMemoryMapping)
-        .isNotNull()
-        .containsEntry(
-            "RAX",
-            "0x00007f36ccfbf170 points into unknown readable memory: 0x00007f3600000758 | REDACTED")
-        .containsEntry(
-            "RSP", "0x00007f35e6253190 is pointing into the stack for thread: 0x00007f36cd96cc80")
-        .containsEntry("RDI", "0x0 is NULL")
-        .containsEntry(
-            "R11",
-            "{method} {0x00007f3744198b70} 'resize' '()[Ljava/util/HashMap$Node;' in 'java/util/HashMap'")
-        // unknown packages are fully redacted to redacted/Redacted
-        .containsEntry(
-            "RSI",
-            "{method} {0x00007f3639c2ff00} 'saveJob' '(Lredacted/Redacted;ILjava/lang/String;)V' in 'redacted/Redacted'");
-  }
-
-  @Test
-  public void testRegisterToMultilineMemoryMapping() throws Exception {
-    CrashLog crashLog =
-        new HotspotCrashLogParser()
-            .parse(
-                UUID.randomUUID().toString(), readFileAsString("sample-crash-linux-aarch64.txt"));
-
-    assertThat(crashLog.experimental).isNotNull();
-    assertThat(crashLog.experimental.registerToMemoryMapping).isNotNull().containsKey("R10");
-    assertThat(crashLog.experimental.registerToMemoryMapping)
-        .extractingByKey("R10", STRING)
-        .startsWith("0x00000007ffe85850 is an oop: java.lang.Class ")
-        .contains("\n{0x00000007ffe85850} - klass: 'java/lang/Class'")
-        .contains("\n - ---- fields (total size 25 words):")
-        .contains(
-            "\n - private transient 'name' 'Ljava/lang/String;' @44  \"jdk.internal.misc.Unsafe\"");
-
-    // Linux aarch64 uses bytes-only format (no address prefix before hex dump)
-    assertThat(crashLog.experimental.registerToMemoryMapping)
-        .extractingByKey("R9", STRING)
-        .isEqualTo("0x0000ffff9f686ca4 points into unknown readable memory: REDACTED");
-  }
-
-  @Test
-  public void testRuntimeArgsFilteringFromHotspotJvmArgs() throws Exception {
-    final CrashLog crashLog =
-        new HotspotCrashLogParser()
-            .parse(
-                UUID.randomUUID().toString(), readFileAsString("sample-crash-for-telemetry.txt"));
-
-    assertNotNull(crashLog.experimental);
-    assertNotNull(crashLog.experimental.runtimeArgs);
-    assertTrue(
-        crashLog.experimental.runtimeArgs.contains(
-            "-javaagent:/opt/REDACT_THIS/datadog-apm-agent/dd-java-agent.jar"));
-    assertFalse(crashLog.experimental.runtimeArgs.contains("-Ddd.profiling.enabled=true"));
-    assertFalse(crashLog.experimental.runtimeArgs.contains("-Ddd.service=REDACT_THIS"));
-    assertTrue(
-        crashLog.experimental.runtimeArgs.stream().anyMatch(arg -> arg.startsWith("--add-opens=")));
-    assertFalse(
-        crashLog.experimental.runtimeArgs.stream()
-            .anyMatch(arg -> arg.startsWith("-Djavax.xml.ws.spi.Provider=")));
-    assertTrue(
-        crashLog.experimental.runtimeArgs.stream()
-            .anyMatch(arg -> arg.startsWith("-Djava.util.logging.config.file=")));
-  }
-
-  @TableTest({
-    "scenario      | filename                        ",
-    "RHEL amd64    | sample-crash-for-telemetry.txt  ",
-    "Ubuntu amd64  | sample-crash-for-telemetry-2.txt",
-    "macOS aarch64 | sample_oom.txt                  ",
-    "macOS JDK 8   | sample-crash-for-telemetry-3.txt"
-  })
-  public void testOsInfoFromSystemProperties(String filename) throws Exception {
-    final CrashLog crashLog =
-        new HotspotCrashLogParser().parse(UUID.randomUUID().toString(), readFileAsString(filename));
-    assertNotNull(crashLog.osInfo);
-  }
-
-  @Test
-  public void testFrameTypesFromHotspotStack() throws Exception {
-    final CrashLog crashLog =
-        new HotspotCrashLogParser()
-            .parse(
-                UUID.randomUUID().toString(), readFileAsString("sample-crash-for-telemetry.txt"));
-
-    assertEquals("vm", crashLog.error.stack.frames[0].frameType);
-    assertEquals("native", crashLog.error.stack.frames[3].frameType);
-    assertEquals("stub", crashLog.error.stack.frames[15].frameType);
-    assertEquals("compiled", crashLog.error.stack.frames[16].frameType);
-    assertEquals("compiled", crashLog.error.stack.frames[17].frameType);
-    assertEquals("interpreted", crashLog.error.stack.frames[66].frameType);
-  }
-
-  @Test
-  public void testParsesJdk8CompiledFramesWithoutCompilerLevel() throws Exception {
-    final CrashLog crashLog =
-        new HotspotCrashLogParser()
-            .parse(
-                UUID.randomUUID().toString(),
-                readFileAsString("sample-crash-jdk8-zip-getentry.txt"));
-
-    assertEquals(10, crashLog.error.stack.frames.length);
-    // native frames
-    assertEquals("newEntry+0x68", crashLog.error.stack.frames[0].function);
-    assertEquals("native", crashLog.error.stack.frames[0].frameType);
-    assertEquals("ZIP_GetEntry2+0xec", crashLog.error.stack.frames[1].function);
-    assertEquals(
-        "Java_java_util_zip_ZipFile_getEntry+0xa8", crashLog.error.stack.frames[2].function);
-    assertEquals("native", crashLog.error.stack.frames[2].frameType);
-    assertEquals("java.util.zip.ZipFile.getEntry(J[BZ)J", crashLog.error.stack.frames[3].function);
-    assertEquals("compiled", crashLog.error.stack.frames[3].frameType);
-    assertEquals("0x00000001091a1f54", crashLog.error.stack.frames[3].ip);
-    assertEquals("0x00000001091a1ec0", crashLog.error.stack.frames[3].symbolAddress);
-    assertEquals("0x94", crashLog.error.stack.frames[3].relativeAddress);
-
-    // Java frames
-    assertEquals("java.util.zip.ZipFile.getEntry(J[BZ)J", crashLog.error.stack.frames[4].function);
-    assertEquals("compiled", crashLog.error.stack.frames[4].frameType);
-    assertEquals("0x00000001091a1f58", crashLog.error.stack.frames[4].ip);
-    assertEquals("0x00000001091a1ec0", crashLog.error.stack.frames[4].symbolAddress);
-    assertEquals("0x98", crashLog.error.stack.frames[4].relativeAddress);
-    assertEquals(
-        "java.util.zip.ZipFile.getEntry(Ljava/lang/String;)Ljava/util/zip/ZipEntry;",
-        crashLog.error.stack.frames[5].function);
-    assertEquals("compiled", crashLog.error.stack.frames[5].frameType);
-    assertEquals(
-        "ZipFileMmapCrashRepro.lambda$main$0(ILjava/util/concurrent/CountDownLatch;Ljava/util/concurrent/atomic/AtomicBoolean;[Ljava/lang/String;Ljava/util/zip/ZipFile;)V",
-        crashLog.error.stack.frames[6].function);
-    assertEquals("interpreted", crashLog.error.stack.frames[6].frameType);
-    assertEquals("ZipFileMmapCrashRepro$$Lambda$1.run()V", crashLog.error.stack.frames[7].function);
-    assertEquals("interpreted", crashLog.error.stack.frames[7].frameType);
-    assertEquals("java.lang.Thread.run()V", crashLog.error.stack.frames[8].function);
-    assertEquals("interpreted", crashLog.error.stack.frames[8].frameType);
-    assertEquals("~StubRoutines::call_stub", crashLog.error.stack.frames[9].function);
-    assertEquals("stub", crashLog.error.stack.frames[9].frameType);
-  }
-
-  /**
-   * Regression test: a {@code siginfo:} line appearing inside the {@code Register to memory
-   * mapping:} section must not be appended as a continuation of the last register's value.
-   */
-  @Test
-  public void testSiginfoLineNotAppendedToRegisterMapping() {
-    // Minimal crash log fragment that drives the parser into REGISTER_TO_MEMORY_MAPPING state,
-    // then encounters a siginfo: line (returned null by nextThreadSectionState — intentional, not
-    // a state transition), then continues with another register entry.
-    String log =
-        "# A fatal error has been detected by the Java Runtime Environment:\n"
-            + "# A core dump file may have been created\n"
-            + "T H R E A D\n"
-            + "Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)\n"
-            + "Register to memory mapping:\n"
-            + "\n"
-            + "RSP =0x00007f35e6253190 is pointing into the stack for thread: 0x00007f36cd96cc80\n"
-            + "siginfo: si_signo: 11 (SIGSEGV), si_code: 1 (SEGV_MAPERR), si_addr: 0x0000000000000070\n"
-            + "RDI =0x0 is NULL\n";
-
-    CrashLog crashLog = new HotspotCrashLogParser().parse(UUID.randomUUID().toString(), log);
-
-    assertThat(crashLog.experimental).isNotNull();
-    Map<String, String> mapping = crashLog.experimental.registerToMemoryMapping;
-    assertThat(mapping).isNotNull();
-    assertThat(mapping.get("RSP"))
-        .isEqualTo("0x00007f35e6253190 is pointing into the stack for thread: 0x00007f36cd96cc80");
-    assertThat(mapping.get("RSP")).doesNotContain("siginfo:");
-    assertThat(mapping.get("RDI")).isEqualTo("0x0 is NULL");
-  }
-
-  @TableTest({
-    "scenario                 | line                                                                                                                   | expected                          ",
-    "quoted java thread       | Current thread (0x0000000caff48000):  JavaThread \"zip-reader-0\" daemon [_thread_in_native, id=18947, stack(0x1,0x2)] | JavaThread \"zip-reader-0\" daemon",
-    "quoted vm thread         | Current thread (0x00007ffff044d000):  VMThread \"VM Thread\" [stack: 0x1,0x2] [id=24738]                               | VMThread \"VM Thread\"            ",
-    "unquoted redacted thread | Current thread (0x00007f36cd96cc80):  JavaThread REDACT_THIS daemon [_thread_in_vm, id=2169438, stack(0x1,0x2)]        | JavaThread REDACT_THIS daemon     ",
-    "gc thread                | Current thread (0x00007f5108060000):  GCTaskThread [stack: 0x00007f510c0d5000,0x00007f510c1d5000] [id=205546]          | GCTaskThread                      ",
-    "concurrent gc thread     | Current thread (0x00007fd41d508800):  ConcurrentGCThread [stack: 0x00007fd3a5cfd000,0x00007fd3a5dfe000] [id=9965]      | ConcurrentGCThread                ",
-    "native thread marker     | Current thread is native thread                                                                                        | null                              "
-  })
-  public void testParseCurrentThreadName(String line, String expected) {
-    assertEquals(
-        "null".equals(expected) ? null : expected,
-        HotspotCrashLogParser.parseCurrentThreadName(line));
-  }
-
-  @TableTest({
-    "scenario    | filename                         | expectedJreVersion                                                                                | expectedVmInfo                                                                                                                                                                                           ",
-    "Zulu 17     | sample-crash-for-telemetry.txt   | OpenJDK Runtime Environment Zulu17.42+20-SA (17.0.7+7) (build 17.0.7+7-LTS)                       | OpenJDK 64-Bit Server VM (17.0.7+7-LTS) for linux-amd64 JRE (17.0.7+7-LTS) (Zulu17.42+20-SA), built on Apr 11 2023 11:39:51 by \"zulu_re\" with gcc 8.3.0                                                ",
-    "Temurin 22  | sample-crash-for-telemetry-2.txt | OpenJDK Runtime Environment Temurin-22.0.1+8 (22.0.1+8) (build 22.0.1+8)                          | OpenJDK 64-Bit Server VM (22.0.1+8) for linux-amd64 JRE (22.0.1+8), built on 2024-04-16T00:00:00Z by \"admin\" with gcc 11.3.0                                                                           ",
-    "Zulu 8      | sample-crash-for-telemetry-3.txt | OpenJDK Runtime Environment (Zulu 8.70.0.23-CA-macos-aarch64) (8.0_372-b07) (build 1.8.0_372-b07) | OpenJDK 64-Bit Server VM (25.372-b07) for bsd-aarch64 JRE (Zulu 8.70.0.23-CA-macos-aarch64) (1.8.0_372-b07), built on Apr 18 2023 01:36:20 by \"zulu_re\" with gcc Apple LLVM 12.0.0 (clang-1200.0.32.28)",
-    "Corretto 21 | sample-crash-linux-aarch64.txt   | OpenJDK Runtime Environment Corretto-21.0.7.6.1 (21.0.7+6) (build 21.0.7+6-LTS)                   | OpenJDK 64-Bit Server VM (21.0.7+6-LTS) for linux-aarch64-musl JRE (21.0.7+6-LTS), built on 2025-04-09T23:34:45Z by \"jenkins\" with gcc 12.2.1 20220924                                                 ",
-    "OpenJDK 25  | sample-crash-macos-aarch64.txt   | OpenJDK Runtime Environment (25.0.2+10) (build 25.0.2+10-69)                                      | OpenJDK 64-Bit Server VM (25.0.2+10-69) for bsd-aarch64 JRE (25.0.2+10-69), built on 2025-12-18T11:36:35Z with clang Apple LLVM 15.0.0 (clang-1500.3.9.4)                                                "
-  })
-  public void testRuntimeInfoParsing(
-      String filename, String expectedJreVersion, String expectedVmInfo) throws Exception {
-    CrashLog crashLog =
-        new HotspotCrashLogParser().parse(UUID.randomUUID().toString(), readFileAsString(filename));
-
-    assertNotNull(crashLog.experimental, "experimental should be populated");
-    assertNotNull(crashLog.experimental.runtimeInfo, "runtimeInfo should be populated");
-    assertNotNull(crashLog.experimental.runtimeInfo.jreVersion, "jreVersion should be populated");
-    assertNotNull(crashLog.experimental.runtimeInfo.javaVm, "javaVm should be populated");
-    assertNotNull(crashLog.experimental.runtimeInfo.vmInfo, "vmInfo should be populated");
-    assertEquals(expectedJreVersion, crashLog.experimental.runtimeInfo.jreVersion);
-    assertEquals(expectedVmInfo, crashLog.experimental.runtimeInfo.vmInfo);
-  }
-
-  @Test
-  public void testNoSignalProducesInternalError() throws Exception {
-    // A crash log that reaches the PROCESS section but has no siginfo line
-    String crashLog =
-        "# A fatal error has been detected by the Java Runtime Environment:\n"
-            + "#\n"
-            + "# Core dump will be written.\n"
-            + "---------------  T H R E A D  ---------------\n"
-            + "Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)\n"
-            + "---------------  P R O C E S S  ---------------\n";
-
-    CrashLog result = new HotspotCrashLogParser().parse(UUID.randomUUID().toString(), crashLog);
-
-    assertNotNull(result);
-    assertFalse(result.incomplete);
-    assertEquals("InternalError", result.error.kind);
-    assertEquals("Process terminated by Internal error", result.error.message);
-  }
-
-  private String readFileAsString(String resource) throws IOException {
-    try (InputStream stream = getClass().getClassLoader().getResourceAsStream(resource)) {
-      return new BufferedReader(
-              new InputStreamReader(Objects.requireNonNull(stream), StandardCharsets.UTF_8))
-          .lines()
-          .collect(Collectors.joining("\n"));
+    @TableTest({
+      "scenario         | logDateTime                     | expectedISODateTime      ",
+      "2-digit offset   | Tue Oct 17 20:25:14 2023 +08    | 2023-10-17T20:25:14+08:00",
+      "UTC zone         | Fri Sep 20 13:19:06 2024 UTC    | 2024-09-20T13:19:06Z     ",
+      "single-digit day | Tue Oct  1 05:05:47 2024 +00:00 | 2024-10-01T05:05:47Z     ",
+      "CEST zone        | Tue Oct  1 14:37:58 2024 CEST   | 2024-10-01T14:37:58+02:00"
+    })
+    public void testDateTimeParser(String logDateTime, String expectedISODateTime) {
+        assertEquals(expectedISODateTime, HotspotCrashLogParser.dateTimeToISO(logDateTime));
+    }
+
+    @Test
+    public void testIncompleteParsing() throws Exception {
+        // Given
+        final String uuid = UUID.randomUUID().toString();
+
+        // When
+        final CrashLog crashLog = new HotspotCrashLogParser().parse(uuid, readFileAsString("incomplete-crash.txt"));
+
+        // Then
+        assertNotNull(crashLog);
+        assertEquals(uuid, crashLog.uuid);
+        assertTrue(crashLog.incomplete);
+        assertNotNull(crashLog.error);
+        assertNotNull(crashLog.error.stack);
+        assertNotNull(crashLog.error.stack.frames);
+        assertEquals(0, crashLog.error.stack.frames.length);
+        assertEquals("InternalError", crashLog.error.kind);
+        assertEquals("Process terminated by Internal error", crashLog.error.message);
+    }
+
+    /** macOS aarch64 uses lowercase register names: x0-x28, fp, lr, sp, pc, cpsr */
+    @Test
+    public void testRegisterParsingMacosAarch64() throws Exception {
+        CrashLog crashLog = new HotspotCrashLogParser()
+                .parse(UUID.randomUUID().toString(), readFileAsString("sample-crash-macos-aarch64.txt"));
+
+        assertNotNull(crashLog.experimental, "experimental field should be populated");
+        assertNotNull(crashLog.experimental.ucontext, "ucontext should be populated");
+        assertEquals("0x0000000000000c55", crashLog.experimental.ucontext.get("x0"));
+        assertEquals("0x0000000000000000", crashLog.experimental.ucontext.get("x2"));
+        assertEquals("0x000000016feee210", crashLog.experimental.ucontext.get("fp"));
+        assertEquals("0x0000000116d0c970", crashLog.experimental.ucontext.get("lr"));
+        assertEquals("0x000000016feee0f0", crashLog.experimental.ucontext.get("sp"));
+        assertEquals("0x000000010f8ac794", crashLog.experimental.ucontext.get("pc"));
+        assertEquals("0x0000000060001000", crashLog.experimental.ucontext.get("cpsr"));
+
+        // "Top of Stack: (sp=0x...)" contains "=" — verify the parser stops at it and doesn't
+        // absorb its hex-dump content into the last register mapping entry (sp).
+        assertThat(crashLog.experimental.registerToMemoryMapping)
+                .extractingByKey("sp", STRING)
+                .doesNotContain("Top of Stack:");
+
+        assertNotNull(crashLog.experimental.runtimeArgs);
+        assertTrue(crashLog.experimental.runtimeArgs.contains("--enable-native-access=ALL-UNNAMED"));
+        assertTrue(crashLog.experimental.runtimeArgs.contains("--add-modules=ALL-DEFAULT"));
+        assertFalse(crashLog.experimental.runtimeArgs.stream()
+                .anyMatch(arg -> arg.contains("SourceLauncher") || arg.endsWith("CrashTest.java")));
+    }
+
+    /**
+     * Verifies the register-to-memory mapping section for the macOS aarch64 sample: representative
+     * values, library path redaction, and that "Top of Stack:" / "Instructions:" subsections are not
+     * absorbed into register values.
+     */
+    @Test
+    public void testRegisterToMemoryMappingMacosAarch64() throws Exception {
+        CrashLog crashLog = new HotspotCrashLogParser()
+                .parse(UUID.randomUUID().toString(), readFileAsString("sample-crash-macos-aarch64.txt"));
+
+        Map<String, String> mapping = crashLog.experimental.registerToMemoryMapping;
+
+        // Representative single-line entries
+        assertThat(mapping)
+                .containsEntry("x0", "0x0000000000000c55 is an unknown value")
+                .containsEntry("x2", "0x0 is null")
+                .containsEntry("x28", "0x0000000100a153f0 is a thread");
+
+        // Library path (symbol+offset format) — intermediate segments collapsed to a single /redacted
+        assertThat(mapping)
+                .extractingByKey("x16", STRING)
+                .isEqualTo(
+                        "0x0000000182d709d0: pthread_jit_write_protect_np+0 in /redacted/system/libsystem_pthread.dylib at 0x0000000182d69000");
+        assertThat(mapping)
+                .extractingByKey("x21", STRING)
+                .isEqualTo(
+                        "0x0000000106c1ccc0: _ZN19TemplateInterpreter13_active_tableE+0 in /redacted/server/libjvm.dylib at 0x0000000105efc000");
+
+        // macOS aarch64 uses address+pipe format — address kept, bytes redacted
+        assertThat(mapping)
+                .extractingByKey("x17", STRING)
+                .isEqualTo("0x0000000100a17cb0 points into unknown readable memory: 0x00000000ffffffff | REDACTED");
+
+        // "Top of Stack: (sp=0x...)" and "Instructions: (pc=0x...)" must not leak into register values
+        assertThat(mapping).doesNotContainKey("Top of Stack");
+        assertThat(mapping).allSatisfy((k, v) -> assertThat(v).doesNotContain("Top of Stack:", "Instructions:"));
+
+        // sp is the last register before "Top of Stack:" — its value must be clean
+        assertThat(mapping)
+                .extractingByKey("sp", STRING)
+                .isEqualTo("0x000000016feee0f0 is pointing into the stack for thread: 0x0000000100a153f0");
+    }
+
+    /** Linux aarch64 uses uppercase register names: R0-R30 */
+    @Test
+    public void testRegisterParsingLinuxAarch64() throws Exception {
+        CrashLog crashLog = new HotspotCrashLogParser()
+                .parse(UUID.randomUUID().toString(), readFileAsString("sample-crash-linux-aarch64.txt"));
+
+        assertNotNull(crashLog.experimental, "experimental field should be populated");
+        assertNotNull(crashLog.experimental.ucontext, "ucontext should be populated");
+        assertEquals("0x0000000000000000", crashLog.experimental.ucontext.get("R0"));
+        assertEquals("0x0000000000000001", crashLog.experimental.ucontext.get("R1"));
+        assertEquals("0x0000ffff9efa168c", crashLog.experimental.ucontext.get("R30"));
+        assertEquals(31, crashLog.experimental.ucontext.size(), "R0-R30 = 31 registers");
+    }
+
+    @Test
+    public void testRegisterToMemoryMapping() throws Exception {
+        CrashLog crashLog =
+                new HotspotCrashLogParser().parse(UUID.randomUUID().toString(), readFileAsString("sample-crash.txt"));
+
+        assertThat(crashLog.experimental).isNotNull();
+        assertThat(crashLog.experimental.registerToMemoryMapping)
+                .isNotNull()
+                .containsEntry(
+                        "RAX", "0x00007f36ccfbf170 points into unknown readable memory: 0x00007f3600000758 | REDACTED")
+                .containsEntry("RSP", "0x00007f35e6253190 is pointing into the stack for thread: 0x00007f36cd96cc80")
+                .containsEntry("RDI", "0x0 is NULL")
+                .containsEntry(
+                        "R11",
+                        "{method} {0x00007f3744198b70} 'resize' '()[Ljava/util/HashMap$Node;' in 'java/util/HashMap'")
+                // unknown packages are fully redacted to redacted/Redacted
+                .containsEntry(
+                        "RSI",
+                        "{method} {0x00007f3639c2ff00} 'saveJob' '(Lredacted/Redacted;ILjava/lang/String;)V' in 'redacted/Redacted'");
+    }
+
+    @Test
+    public void testRegisterToMultilineMemoryMapping() throws Exception {
+        CrashLog crashLog = new HotspotCrashLogParser()
+                .parse(UUID.randomUUID().toString(), readFileAsString("sample-crash-linux-aarch64.txt"));
+
+        assertThat(crashLog.experimental).isNotNull();
+        assertThat(crashLog.experimental.registerToMemoryMapping).isNotNull().containsKey("R10");
+        assertThat(crashLog.experimental.registerToMemoryMapping)
+                .extractingByKey("R10", STRING)
+                .startsWith("0x00000007ffe85850 is an oop: java.lang.Class ")
+                .contains("\n{0x00000007ffe85850} - klass: 'java/lang/Class'")
+                .contains("\n - ---- fields (total size 25 words):")
+                .contains("\n - private transient 'name' 'Ljava/lang/String;' @44  \"jdk.internal.misc.Unsafe\"");
+
+        // Linux aarch64 uses bytes-only format (no address prefix before hex dump)
+        assertThat(crashLog.experimental.registerToMemoryMapping)
+                .extractingByKey("R9", STRING)
+                .isEqualTo("0x0000ffff9f686ca4 points into unknown readable memory: REDACTED");
+    }
+
+    @Test
+    public void testRuntimeArgsFilteringFromHotspotJvmArgs() throws Exception {
+        final CrashLog crashLog = new HotspotCrashLogParser()
+                .parse(UUID.randomUUID().toString(), readFileAsString("sample-crash-for-telemetry.txt"));
+
+        assertNotNull(crashLog.experimental);
+        assertNotNull(crashLog.experimental.runtimeArgs);
+        assertTrue(crashLog.experimental.runtimeArgs.contains(
+                "-javaagent:/opt/REDACT_THIS/datadog-apm-agent/dd-java-agent.jar"));
+        assertFalse(crashLog.experimental.runtimeArgs.contains("-Ddd.profiling.enabled=true"));
+        assertFalse(crashLog.experimental.runtimeArgs.contains("-Ddd.service=REDACT_THIS"));
+        assertTrue(crashLog.experimental.runtimeArgs.stream().anyMatch(arg -> arg.startsWith("--add-opens=")));
+        assertFalse(crashLog.experimental.runtimeArgs.stream()
+                .anyMatch(arg -> arg.startsWith("-Djavax.xml.ws.spi.Provider=")));
+        assertTrue(crashLog.experimental.runtimeArgs.stream()
+                .anyMatch(arg -> arg.startsWith("-Djava.util.logging.config.file=")));
+    }
+
+    @TableTest({
+      "scenario      | filename                        ",
+      "RHEL amd64    | sample-crash-for-telemetry.txt  ",
+      "Ubuntu amd64  | sample-crash-for-telemetry-2.txt",
+      "macOS aarch64 | sample_oom.txt                  ",
+      "macOS JDK 8   | sample-crash-for-telemetry-3.txt"
+    })
+    public void testOsInfoFromSystemProperties(String filename) throws Exception {
+        final CrashLog crashLog =
+                new HotspotCrashLogParser().parse(UUID.randomUUID().toString(), readFileAsString(filename));
+        assertNotNull(crashLog.osInfo);
+    }
+
+    @Test
+    public void testFrameTypesFromHotspotStack() throws Exception {
+        final CrashLog crashLog = new HotspotCrashLogParser()
+                .parse(UUID.randomUUID().toString(), readFileAsString("sample-crash-for-telemetry.txt"));
+
+        assertEquals("vm", crashLog.error.stack.frames[0].frameType);
+        assertEquals("native", crashLog.error.stack.frames[3].frameType);
+        assertEquals("stub", crashLog.error.stack.frames[15].frameType);
+        assertEquals("compiled", crashLog.error.stack.frames[16].frameType);
+        assertEquals("compiled", crashLog.error.stack.frames[17].frameType);
+        assertEquals("interpreted", crashLog.error.stack.frames[66].frameType);
+    }
+
+    @Test
+    public void testParsesJdk8CompiledFramesWithoutCompilerLevel() throws Exception {
+        final CrashLog crashLog = new HotspotCrashLogParser()
+                .parse(UUID.randomUUID().toString(), readFileAsString("sample-crash-jdk8-zip-getentry.txt"));
+
+        assertEquals(10, crashLog.error.stack.frames.length);
+        // native frames
+        assertEquals("newEntry+0x68", crashLog.error.stack.frames[0].function);
+        assertEquals("native", crashLog.error.stack.frames[0].frameType);
+        assertEquals("ZIP_GetEntry2+0xec", crashLog.error.stack.frames[1].function);
+        assertEquals("Java_java_util_zip_ZipFile_getEntry+0xa8", crashLog.error.stack.frames[2].function);
+        assertEquals("native", crashLog.error.stack.frames[2].frameType);
+        assertEquals("java.util.zip.ZipFile.getEntry(J[BZ)J", crashLog.error.stack.frames[3].function);
+        assertEquals("compiled", crashLog.error.stack.frames[3].frameType);
+        assertEquals("0x00000001091a1f54", crashLog.error.stack.frames[3].ip);
+        assertEquals("0x00000001091a1ec0", crashLog.error.stack.frames[3].symbolAddress);
+        assertEquals("0x94", crashLog.error.stack.frames[3].relativeAddress);
+
+        // Java frames
+        assertEquals("java.util.zip.ZipFile.getEntry(J[BZ)J", crashLog.error.stack.frames[4].function);
+        assertEquals("compiled", crashLog.error.stack.frames[4].frameType);
+        assertEquals("0x00000001091a1f58", crashLog.error.stack.frames[4].ip);
+        assertEquals("0x00000001091a1ec0", crashLog.error.stack.frames[4].symbolAddress);
+        assertEquals("0x98", crashLog.error.stack.frames[4].relativeAddress);
+        assertEquals(
+                "java.util.zip.ZipFile.getEntry(Ljava/lang/String;)Ljava/util/zip/ZipEntry;",
+                crashLog.error.stack.frames[5].function);
+        assertEquals("compiled", crashLog.error.stack.frames[5].frameType);
+        assertEquals(
+                "ZipFileMmapCrashRepro.lambda$main$0(ILjava/util/concurrent/CountDownLatch;Ljava/util/concurrent/atomic/AtomicBoolean;[Ljava/lang/String;Ljava/util/zip/ZipFile;)V",
+                crashLog.error.stack.frames[6].function);
+        assertEquals("interpreted", crashLog.error.stack.frames[6].frameType);
+        assertEquals("ZipFileMmapCrashRepro$$Lambda$1.run()V", crashLog.error.stack.frames[7].function);
+        assertEquals("interpreted", crashLog.error.stack.frames[7].frameType);
+        assertEquals("java.lang.Thread.run()V", crashLog.error.stack.frames[8].function);
+        assertEquals("interpreted", crashLog.error.stack.frames[8].frameType);
+        assertEquals("~StubRoutines::call_stub", crashLog.error.stack.frames[9].function);
+        assertEquals("stub", crashLog.error.stack.frames[9].frameType);
+    }
+
+    /**
+     * Regression test: a {@code siginfo:} line appearing inside the {@code Register to memory
+     * mapping:} section must not be appended as a continuation of the last register's value.
+     */
+    @Test
+    public void testSiginfoLineNotAppendedToRegisterMapping() {
+        // Minimal crash log fragment that drives the parser into REGISTER_TO_MEMORY_MAPPING state,
+        // then encounters a siginfo: line (returned null by nextThreadSectionState — intentional, not
+        // a state transition), then continues with another register entry.
+        String log = "# A fatal error has been detected by the Java Runtime Environment:\n"
+                + "# A core dump file may have been created\n"
+                + "T H R E A D\n"
+                + "Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)\n"
+                + "Register to memory mapping:\n"
+                + "\n"
+                + "RSP =0x00007f35e6253190 is pointing into the stack for thread: 0x00007f36cd96cc80\n"
+                + "siginfo: si_signo: 11 (SIGSEGV), si_code: 1 (SEGV_MAPERR), si_addr: 0x0000000000000070\n"
+                + "RDI =0x0 is NULL\n";
+
+        CrashLog crashLog = new HotspotCrashLogParser().parse(UUID.randomUUID().toString(), log);
+
+        assertThat(crashLog.experimental).isNotNull();
+        Map<String, String> mapping = crashLog.experimental.registerToMemoryMapping;
+        assertThat(mapping).isNotNull();
+        assertThat(mapping.get("RSP"))
+                .isEqualTo("0x00007f35e6253190 is pointing into the stack for thread: 0x00007f36cd96cc80");
+        assertThat(mapping.get("RSP")).doesNotContain("siginfo:");
+        assertThat(mapping.get("RDI")).isEqualTo("0x0 is NULL");
+    }
+
+    @TableTest({
+      "scenario                 | line                                                                                                                   | expected                          ",
+      "quoted java thread       | Current thread (0x0000000caff48000):  JavaThread \"zip-reader-0\" daemon [_thread_in_native, id=18947, stack(0x1,0x2)] | JavaThread \"zip-reader-0\" daemon",
+      "quoted vm thread         | Current thread (0x00007ffff044d000):  VMThread \"VM Thread\" [stack: 0x1,0x2] [id=24738]                               | VMThread \"VM Thread\"            ",
+      "unquoted redacted thread | Current thread (0x00007f36cd96cc80):  JavaThread REDACT_THIS daemon [_thread_in_vm, id=2169438, stack(0x1,0x2)]        | JavaThread REDACT_THIS daemon     ",
+      "gc thread                | Current thread (0x00007f5108060000):  GCTaskThread [stack: 0x00007f510c0d5000,0x00007f510c1d5000] [id=205546]          | GCTaskThread                      ",
+      "concurrent gc thread     | Current thread (0x00007fd41d508800):  ConcurrentGCThread [stack: 0x00007fd3a5cfd000,0x00007fd3a5dfe000] [id=9965]      | ConcurrentGCThread                ",
+      "native thread marker     | Current thread is native thread                                                                                        | null                              "
+    })
+    public void testParseCurrentThreadName(String line, String expected) {
+        assertEquals("null".equals(expected) ? null : expected, HotspotCrashLogParser.parseCurrentThreadName(line));
+    }
+
+    @TableTest({
+      "scenario    | filename                         | expectedJreVersion                                                                                | expectedVmInfo                                                                                                                                                                                           ",
+      "Zulu 17     | sample-crash-for-telemetry.txt   | OpenJDK Runtime Environment Zulu17.42+20-SA (17.0.7+7) (build 17.0.7+7-LTS)                       | OpenJDK 64-Bit Server VM (17.0.7+7-LTS) for linux-amd64 JRE (17.0.7+7-LTS) (Zulu17.42+20-SA), built on Apr 11 2023 11:39:51 by \"zulu_re\" with gcc 8.3.0                                                ",
+      "Temurin 22  | sample-crash-for-telemetry-2.txt | OpenJDK Runtime Environment Temurin-22.0.1+8 (22.0.1+8) (build 22.0.1+8)                          | OpenJDK 64-Bit Server VM (22.0.1+8) for linux-amd64 JRE (22.0.1+8), built on 2024-04-16T00:00:00Z by \"admin\" with gcc 11.3.0                                                                           ",
+      "Zulu 8      | sample-crash-for-telemetry-3.txt | OpenJDK Runtime Environment (Zulu 8.70.0.23-CA-macos-aarch64) (8.0_372-b07) (build 1.8.0_372-b07) | OpenJDK 64-Bit Server VM (25.372-b07) for bsd-aarch64 JRE (Zulu 8.70.0.23-CA-macos-aarch64) (1.8.0_372-b07), built on Apr 18 2023 01:36:20 by \"zulu_re\" with gcc Apple LLVM 12.0.0 (clang-1200.0.32.28)",
+      "Corretto 21 | sample-crash-linux-aarch64.txt   | OpenJDK Runtime Environment Corretto-21.0.7.6.1 (21.0.7+6) (build 21.0.7+6-LTS)                   | OpenJDK 64-Bit Server VM (21.0.7+6-LTS) for linux-aarch64-musl JRE (21.0.7+6-LTS), built on 2025-04-09T23:34:45Z by \"jenkins\" with gcc 12.2.1 20220924                                                 ",
+      "OpenJDK 25  | sample-crash-macos-aarch64.txt   | OpenJDK Runtime Environment (25.0.2+10) (build 25.0.2+10-69)                                      | OpenJDK 64-Bit Server VM (25.0.2+10-69) for bsd-aarch64 JRE (25.0.2+10-69), built on 2025-12-18T11:36:35Z with clang Apple LLVM 15.0.0 (clang-1500.3.9.4)                                                "
+    })
+    public void testRuntimeInfoParsing(String filename, String expectedJreVersion, String expectedVmInfo)
+            throws Exception {
+        CrashLog crashLog = new HotspotCrashLogParser().parse(UUID.randomUUID().toString(), readFileAsString(filename));
+
+        assertNotNull(crashLog.experimental, "experimental should be populated");
+        assertNotNull(crashLog.experimental.runtimeInfo, "runtimeInfo should be populated");
+        assertNotNull(crashLog.experimental.runtimeInfo.jreVersion, "jreVersion should be populated");
+        assertNotNull(crashLog.experimental.runtimeInfo.javaVm, "javaVm should be populated");
+        assertNotNull(crashLog.experimental.runtimeInfo.vmInfo, "vmInfo should be populated");
+        assertEquals(expectedJreVersion, crashLog.experimental.runtimeInfo.jreVersion);
+        assertEquals(expectedVmInfo, crashLog.experimental.runtimeInfo.vmInfo);
+    }
+
+    @Test
+    public void testNoSignalProducesInternalError() throws Exception {
+        // A crash log that reaches the PROCESS section but has no siginfo line
+        String crashLog = "# A fatal error has been detected by the Java Runtime Environment:\n"
+                + "#\n"
+                + "# Core dump will be written.\n"
+                + "---------------  T H R E A D  ---------------\n"
+                + "Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)\n"
+                + "---------------  P R O C E S S  ---------------\n";
+
+        CrashLog result = new HotspotCrashLogParser().parse(UUID.randomUUID().toString(), crashLog);
+
+        assertNotNull(result);
+        assertFalse(result.incomplete);
+        assertEquals("InternalError", result.error.kind);
+        assertEquals("Process terminated by Internal error", result.error.message);
+    }
+
+    private String readFileAsString(String resource) throws IOException {
+        try (InputStream stream = getClass().getClassLoader().getResourceAsStream(resource)) {
+            return new BufferedReader(new InputStreamReader(Objects.requireNonNull(stream), StandardCharsets.UTF_8))
+                    .lines()
+                    .collect(Collectors.joining("\n"));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/J9JavacoreParserTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/J9JavacoreParserTest.java
index bfa122b0f2e..59e9618154c 100644
--- a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/J9JavacoreParserTest.java
+++ b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/J9JavacoreParserTest.java
@@ -21,238 +21,231 @@
 
 public class J9JavacoreParserTest {
 
-  @Test
-  public void testParseGpfCrash() throws Exception {
-    // Given
-    final String uuid = UUID.randomUUID().toString();
-    String javacoreContent = readFileAsString("sample-j9-javacore-gpf.txt");
-
-    // When
-    final CrashLog crashLog = new J9JavacoreParser().parse(uuid, javacoreContent);
-
-    // Then
-    assertNotNull(crashLog);
-    assertEquals(uuid, crashLog.uuid);
-    assertFalse(crashLog.incomplete);
-    assertEquals("1.0", crashLog.dataSchemaVersion);
-
-    // Signal info
-    assertNotNull(crashLog.sigInfo);
-    assertEquals("SIGSEGV", crashLog.sigInfo.name);
-    assertEquals(11, crashLog.sigInfo.number);
-
-    // Process info
-    assertNotNull(crashLog.procInfo);
-    assertEquals(12345, crashLog.procInfo.pid);
-
-    // Error info
-    assertNotNull(crashLog.error);
-    assertEquals("SIGSEGV", crashLog.error.kind);
-    assertEquals("Process terminated by signal SIGSEGV", crashLog.error.message);
-    assertEquals("main", crashLog.error.threadName);
-
-    // Stack trace
-    assertNotNull(crashLog.error.stack);
-    assertNotNull(crashLog.error.stack.frames);
-    assertTrue(crashLog.error.stack.frames.length > 0);
-
-    // Check first Java frame
-    assertEquals("com/example/NativeLibrary.crash", crashLog.error.stack.frames[0].function);
-    assertNull(crashLog.error.stack.frames[0].path);
-    assertEquals("native", crashLog.error.stack.frames[0].frameType);
-
-    // Check second Java frame with source info
-    assertEquals("com/example/CrashingApp.triggerCrash", crashLog.error.stack.frames[1].function);
-    assertEquals("CrashingApp.java", crashLog.error.stack.frames[1].path);
-    assertEquals("java", crashLog.error.stack.frames[1].frameType);
-    assertEquals(Integer.valueOf(42), crashLog.error.stack.frames[1].line);
-
-    // Check native frames are present
-    assertTrue(crashLog.error.stack.frames.length >= 4); // 3 java + native frames
-
-    assertNotNull(crashLog.osInfo);
-  }
-
-  @TableTest({
-    "scenario            | resource                          | pcRegister | spRegister",
-    "IBM J9 8 (amd64)    | sample-ibmj9-8-javacore-gpf.txt   | RIP        | RSP       ",
-    "OpenJ9 11 (aarch64) | sample-openj9-11-javacore-gpf.txt | PC         | SP        "
-  })
-  public void testParseRealGpfCrash(String resource, String pcRegister, String spRegister)
-      throws Exception {
-    final CrashLog crashLog =
-        new J9JavacoreParser().parse(UUID.randomUUID().toString(), readFileAsString(resource));
-
-    assertFalse(crashLog.incomplete);
-    assertEquals("SIGSEGV", crashLog.sigInfo.name);
-    assertEquals(11, crashLog.sigInfo.number);
-
-    assertNotNull(crashLog.experimental);
-    assertFalse(crashLog.experimental.ucontext.isEmpty());
-    assertTrue(crashLog.experimental.ucontext.containsKey(pcRegister));
-    assertTrue(crashLog.experimental.ucontext.containsKey(spRegister));
-    assertNotNull(crashLog.experimental.runtimeArgs);
-    assertTrue(
-        crashLog.experimental.runtimeArgs.stream().anyMatch(arg -> arg.startsWith("-Xdump:java:")));
-  }
-
-  @Test
-  public void testParseOomCrash() throws Exception {
-    // Given
-    final String uuid = UUID.randomUUID().toString();
-    String javacoreContent = readFileAsString("sample-j9-javacore-oom.txt");
-
-    // When
-    final CrashLog crashLog = new J9JavacoreParser().parse(uuid, javacoreContent);
-
-    // Then
-    assertNotNull(crashLog);
-    assertEquals(uuid, crashLog.uuid);
-    assertFalse(crashLog.incomplete);
-
-    // Error should be OutOfMemory type
-    assertNotNull(crashLog.error);
-    assertEquals("OutOfMemory", crashLog.error.kind);
-    assertTrue(crashLog.error.message.contains("OutOfMemory"));
-    assertEquals("worker-thread-1", crashLog.error.threadName);
-
-    // Process info
-    assertNotNull(crashLog.procInfo);
-    assertEquals(54321, crashLog.procInfo.pid);
-
-    // Stack trace should show the allocation path
-    assertNotNull(crashLog.error.stack);
-    assertNotNull(crashLog.error.stack.frames);
-    assertTrue(crashLog.error.stack.frames.length > 0);
-
-    // Check that ArrayList.grow is in the stack (where OOM typically occurs)
-    boolean foundGrow = false;
-    for (StackFrame frame : crashLog.error.stack.frames) {
-      if (frame.function != null && frame.function.contains("ArrayList.grow")) {
-        foundGrow = true;
-        break;
-      }
+    @Test
+    public void testParseGpfCrash() throws Exception {
+        // Given
+        final String uuid = UUID.randomUUID().toString();
+        String javacoreContent = readFileAsString("sample-j9-javacore-gpf.txt");
+
+        // When
+        final CrashLog crashLog = new J9JavacoreParser().parse(uuid, javacoreContent);
+
+        // Then
+        assertNotNull(crashLog);
+        assertEquals(uuid, crashLog.uuid);
+        assertFalse(crashLog.incomplete);
+        assertEquals("1.0", crashLog.dataSchemaVersion);
+
+        // Signal info
+        assertNotNull(crashLog.sigInfo);
+        assertEquals("SIGSEGV", crashLog.sigInfo.name);
+        assertEquals(11, crashLog.sigInfo.number);
+
+        // Process info
+        assertNotNull(crashLog.procInfo);
+        assertEquals(12345, crashLog.procInfo.pid);
+
+        // Error info
+        assertNotNull(crashLog.error);
+        assertEquals("SIGSEGV", crashLog.error.kind);
+        assertEquals("Process terminated by signal SIGSEGV", crashLog.error.message);
+        assertEquals("main", crashLog.error.threadName);
+
+        // Stack trace
+        assertNotNull(crashLog.error.stack);
+        assertNotNull(crashLog.error.stack.frames);
+        assertTrue(crashLog.error.stack.frames.length > 0);
+
+        // Check first Java frame
+        assertEquals("com/example/NativeLibrary.crash", crashLog.error.stack.frames[0].function);
+        assertNull(crashLog.error.stack.frames[0].path);
+        assertEquals("native", crashLog.error.stack.frames[0].frameType);
+
+        // Check second Java frame with source info
+        assertEquals("com/example/CrashingApp.triggerCrash", crashLog.error.stack.frames[1].function);
+        assertEquals("CrashingApp.java", crashLog.error.stack.frames[1].path);
+        assertEquals("java", crashLog.error.stack.frames[1].frameType);
+        assertEquals(Integer.valueOf(42), crashLog.error.stack.frames[1].line);
+
+        // Check native frames are present
+        assertTrue(crashLog.error.stack.frames.length >= 4); // 3 java + native frames
+
+        assertNotNull(crashLog.osInfo);
     }
-    assertTrue(foundGrow, "Expected ArrayList.grow in stack trace");
-
-    assertNotNull(crashLog.osInfo);
-  }
-
-  @Test
-  public void testParseIncompleteJavacore() throws Exception {
-    // Given
-    final String uuid = UUID.randomUUID().toString();
-    // An incomplete javacore that's missing the THREADS section
-    String incompleteJavacore =
-        "0SECTION       TITLE subcomponent dump routine\n"
-            + "NULL           ===============================\n"
-            + "1TICHARSET     UTF-8\n"
-            + "1TISIGINFO     Dump Event \"gpf\" (00002000) received\n"
-            + "1TIDATETIME    Date: 2024/08/25 at 15:55:09:123\n";
-
-    // When
-    final CrashLog crashLog = new J9JavacoreParser().parse(uuid, incompleteJavacore);
-
-    // Then
-    assertNotNull(crashLog);
-    assertTrue(crashLog.incomplete);
-    assertEquals(0, crashLog.error.stack.frames.length);
-  }
-
-  @Test
-  public void testAbortCrash() throws Exception {
-    // Given - a javacore for an abort event
-    final String uuid = UUID.randomUUID().toString();
-    String javacoreContent =
-        "0SECTION       TITLE subcomponent dump routine\n"
-            + "NULL           ===============================\n"
-            + "1TICHARSET     UTF-8\n"
-            + "1TISIGINFO     Dump Event \"abort\" (00000020) received\n"
-            + "1TIDATETIME    Date: 2024/10/01 at 08:30:00:000\n"
-            + "NULL           ------------------------------------------------------------------------\n"
-            + "0SECTION       ENVINFO subcomponent dump routine\n"
-            + "NULL           =================================\n"
-            + "1CIPROCESSID   Process ID: 99999\n"
-            + "NULL           ------------------------------------------------------------------------\n"
-            + "0SECTION       THREADS subcomponent dump routine\n"
-            + "NULL           =================================\n"
-            + "1XMCURTHDINFO  Current thread: \"abort-thread\" (J9VMThread:0x00000001)\n"
-            + "NULL\n"
-            + "3XMTHREADINFO      \"abort-thread\" J9VMThread:0x00000001, state:R, prio=5\n"
-            + "3XMTHREADINFO3           Java callstack:\n"
-            + "4XESTACKTRACE                at java/lang/Runtime.exit(Runtime.java:123)\n"
-            + "NULL\n";
-
-    // When
-    final CrashLog crashLog = new J9JavacoreParser().parse(uuid, javacoreContent);
-
-    // Then
-    assertNotNull(crashLog);
-    assertNotNull(crashLog.sigInfo);
-    assertEquals("SIGABRT", crashLog.sigInfo.name);
-    assertEquals(6, crashLog.sigInfo.number);
-    assertEquals(99999, crashLog.procInfo.pid);
-    assertEquals("abort-thread", crashLog.error.threadName);
-  }
-
-  @Test
-  public void testDateTimeParsing() throws Exception {
-    // Given
-    final String uuid = UUID.randomUUID().toString();
-    String javacoreContent = readFileAsString("sample-j9-javacore-gpf.txt");
-
-    // When
-    final CrashLog crashLog = new J9JavacoreParser().parse(uuid, javacoreContent);
-
-    // Then - timestamp should be in ISO format
-    assertNotNull(crashLog.timestamp);
-    // Should be ISO-8601 format with offset
-    assertTrue(
-        crashLog.timestamp.matches("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}.*"),
-        "Expected ISO-8601 format, got: " + crashLog.timestamp);
-  }
-
-  @TableTest({
-    "scenario        | filename                          | expectedJreVersion                                                              ",
-    "OpenJ9 11 GPF   | sample-j9-javacore-gpf.txt        | JRE 11.0.12 Linux amd64-64                                                      ",
-    "OpenJ9 17 OOM   | sample-j9-javacore-oom.txt        | JRE 17.0.6 Linux amd64-64                                                       ",
-    "OpenJ9 11 aarch | sample-openj9-11-javacore-gpf.txt | JRE 11 Linux aarch64-64 (build 11.0.28+6)                                       ",
-    "IBM J9 8        | sample-ibmj9-8-javacore-gpf.txt   | JRE 1.8.0 Linux amd64-64 (build 8.0.8.51 - pxa6480sr8fp51-20250819_01(SR8 FP51))"
-  })
-  public void testRuntimeInfoParsing(String filename, String expectedJreVersion) throws Exception {
-    CrashLog crashLog =
-        new J9JavacoreParser().parse(UUID.randomUUID().toString(), readFileAsString(filename));
-
-    assertNotNull(crashLog.experimental, "experimental should be populated");
-    assertNotNull(crashLog.experimental.runtimeInfo, "runtimeInfo should be populated");
-    assertNotNull(crashLog.experimental.runtimeInfo.jreVersion, "jreVersion should be populated");
-    assertEquals(expectedJreVersion, crashLog.experimental.runtimeInfo.jreVersion);
-  }
-
-  @Test
-  public void testNoSignalProducesInternalError() throws Exception {
-    // A javacore with a THREADS section but no 1TISIGINFO line
-    String javacoreContent =
-        "0SECTION       TITLE subcomponent dump routine\n"
-            + "NULL           ===============================\n"
-            + "1TICHARSET     UTF-8\n"
-            + "NULL           ------------------------------------------------------------------------\n"
-            + "0SECTION       THREADS subcomponent dump routine\n"
-            + "NULL           =================================\n";
-
-    CrashLog result = new J9JavacoreParser().parse(UUID.randomUUID().toString(), javacoreContent);
-
-    assertNotNull(result);
-    assertEquals("InternalError", result.error.kind);
-    assertEquals("Process terminated by Internal error", result.error.message);
-  }
-
-  private String readFileAsString(String resource) throws IOException {
-    try (InputStream stream = getClass().getClassLoader().getResourceAsStream(resource)) {
-      return new BufferedReader(
-              new InputStreamReader(Objects.requireNonNull(stream), StandardCharsets.UTF_8))
-          .lines()
-          .collect(Collectors.joining("\n"));
+
+    @TableTest({
+      "scenario            | resource                          | pcRegister | spRegister",
+      "IBM J9 8 (amd64)    | sample-ibmj9-8-javacore-gpf.txt   | RIP        | RSP       ",
+      "OpenJ9 11 (aarch64) | sample-openj9-11-javacore-gpf.txt | PC         | SP        "
+    })
+    public void testParseRealGpfCrash(String resource, String pcRegister, String spRegister) throws Exception {
+        final CrashLog crashLog =
+                new J9JavacoreParser().parse(UUID.randomUUID().toString(), readFileAsString(resource));
+
+        assertFalse(crashLog.incomplete);
+        assertEquals("SIGSEGV", crashLog.sigInfo.name);
+        assertEquals(11, crashLog.sigInfo.number);
+
+        assertNotNull(crashLog.experimental);
+        assertFalse(crashLog.experimental.ucontext.isEmpty());
+        assertTrue(crashLog.experimental.ucontext.containsKey(pcRegister));
+        assertTrue(crashLog.experimental.ucontext.containsKey(spRegister));
+        assertNotNull(crashLog.experimental.runtimeArgs);
+        assertTrue(crashLog.experimental.runtimeArgs.stream().anyMatch(arg -> arg.startsWith("-Xdump:java:")));
+    }
+
+    @Test
+    public void testParseOomCrash() throws Exception {
+        // Given
+        final String uuid = UUID.randomUUID().toString();
+        String javacoreContent = readFileAsString("sample-j9-javacore-oom.txt");
+
+        // When
+        final CrashLog crashLog = new J9JavacoreParser().parse(uuid, javacoreContent);
+
+        // Then
+        assertNotNull(crashLog);
+        assertEquals(uuid, crashLog.uuid);
+        assertFalse(crashLog.incomplete);
+
+        // Error should be OutOfMemory type
+        assertNotNull(crashLog.error);
+        assertEquals("OutOfMemory", crashLog.error.kind);
+        assertTrue(crashLog.error.message.contains("OutOfMemory"));
+        assertEquals("worker-thread-1", crashLog.error.threadName);
+
+        // Process info
+        assertNotNull(crashLog.procInfo);
+        assertEquals(54321, crashLog.procInfo.pid);
+
+        // Stack trace should show the allocation path
+        assertNotNull(crashLog.error.stack);
+        assertNotNull(crashLog.error.stack.frames);
+        assertTrue(crashLog.error.stack.frames.length > 0);
+
+        // Check that ArrayList.grow is in the stack (where OOM typically occurs)
+        boolean foundGrow = false;
+        for (StackFrame frame : crashLog.error.stack.frames) {
+            if (frame.function != null && frame.function.contains("ArrayList.grow")) {
+                foundGrow = true;
+                break;
+            }
+        }
+        assertTrue(foundGrow, "Expected ArrayList.grow in stack trace");
+
+        assertNotNull(crashLog.osInfo);
+    }
+
+    @Test
+    public void testParseIncompleteJavacore() throws Exception {
+        // Given
+        final String uuid = UUID.randomUUID().toString();
+        // An incomplete javacore that's missing the THREADS section
+        String incompleteJavacore = "0SECTION       TITLE subcomponent dump routine\n"
+                + "NULL           ===============================\n"
+                + "1TICHARSET     UTF-8\n"
+                + "1TISIGINFO     Dump Event \"gpf\" (00002000) received\n"
+                + "1TIDATETIME    Date: 2024/08/25 at 15:55:09:123\n";
+
+        // When
+        final CrashLog crashLog = new J9JavacoreParser().parse(uuid, incompleteJavacore);
+
+        // Then
+        assertNotNull(crashLog);
+        assertTrue(crashLog.incomplete);
+        assertEquals(0, crashLog.error.stack.frames.length);
+    }
+
+    @Test
+    public void testAbortCrash() throws Exception {
+        // Given - a javacore for an abort event
+        final String uuid = UUID.randomUUID().toString();
+        String javacoreContent = "0SECTION       TITLE subcomponent dump routine\n"
+                + "NULL           ===============================\n"
+                + "1TICHARSET     UTF-8\n"
+                + "1TISIGINFO     Dump Event \"abort\" (00000020) received\n"
+                + "1TIDATETIME    Date: 2024/10/01 at 08:30:00:000\n"
+                + "NULL           ------------------------------------------------------------------------\n"
+                + "0SECTION       ENVINFO subcomponent dump routine\n"
+                + "NULL           =================================\n"
+                + "1CIPROCESSID   Process ID: 99999\n"
+                + "NULL           ------------------------------------------------------------------------\n"
+                + "0SECTION       THREADS subcomponent dump routine\n"
+                + "NULL           =================================\n"
+                + "1XMCURTHDINFO  Current thread: \"abort-thread\" (J9VMThread:0x00000001)\n"
+                + "NULL\n"
+                + "3XMTHREADINFO      \"abort-thread\" J9VMThread:0x00000001, state:R, prio=5\n"
+                + "3XMTHREADINFO3           Java callstack:\n"
+                + "4XESTACKTRACE                at java/lang/Runtime.exit(Runtime.java:123)\n"
+                + "NULL\n";
+
+        // When
+        final CrashLog crashLog = new J9JavacoreParser().parse(uuid, javacoreContent);
+
+        // Then
+        assertNotNull(crashLog);
+        assertNotNull(crashLog.sigInfo);
+        assertEquals("SIGABRT", crashLog.sigInfo.name);
+        assertEquals(6, crashLog.sigInfo.number);
+        assertEquals(99999, crashLog.procInfo.pid);
+        assertEquals("abort-thread", crashLog.error.threadName);
+    }
+
+    @Test
+    public void testDateTimeParsing() throws Exception {
+        // Given
+        final String uuid = UUID.randomUUID().toString();
+        String javacoreContent = readFileAsString("sample-j9-javacore-gpf.txt");
+
+        // When
+        final CrashLog crashLog = new J9JavacoreParser().parse(uuid, javacoreContent);
+
+        // Then - timestamp should be in ISO format
+        assertNotNull(crashLog.timestamp);
+        // Should be ISO-8601 format with offset
+        assertTrue(
+                crashLog.timestamp.matches("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}.*"),
+                "Expected ISO-8601 format, got: " + crashLog.timestamp);
+    }
+
+    @TableTest({
+      "scenario        | filename                          | expectedJreVersion                                                              ",
+      "OpenJ9 11 GPF   | sample-j9-javacore-gpf.txt        | JRE 11.0.12 Linux amd64-64                                                      ",
+      "OpenJ9 17 OOM   | sample-j9-javacore-oom.txt        | JRE 17.0.6 Linux amd64-64                                                       ",
+      "OpenJ9 11 aarch | sample-openj9-11-javacore-gpf.txt | JRE 11 Linux aarch64-64 (build 11.0.28+6)                                       ",
+      "IBM J9 8        | sample-ibmj9-8-javacore-gpf.txt   | JRE 1.8.0 Linux amd64-64 (build 8.0.8.51 - pxa6480sr8fp51-20250819_01(SR8 FP51))"
+    })
+    public void testRuntimeInfoParsing(String filename, String expectedJreVersion) throws Exception {
+        CrashLog crashLog = new J9JavacoreParser().parse(UUID.randomUUID().toString(), readFileAsString(filename));
+
+        assertNotNull(crashLog.experimental, "experimental should be populated");
+        assertNotNull(crashLog.experimental.runtimeInfo, "runtimeInfo should be populated");
+        assertNotNull(crashLog.experimental.runtimeInfo.jreVersion, "jreVersion should be populated");
+        assertEquals(expectedJreVersion, crashLog.experimental.runtimeInfo.jreVersion);
+    }
+
+    @Test
+    public void testNoSignalProducesInternalError() throws Exception {
+        // A javacore with a THREADS section but no 1TISIGINFO line
+        String javacoreContent = "0SECTION       TITLE subcomponent dump routine\n"
+                + "NULL           ===============================\n"
+                + "1TICHARSET     UTF-8\n"
+                + "NULL           ------------------------------------------------------------------------\n"
+                + "0SECTION       THREADS subcomponent dump routine\n"
+                + "NULL           =================================\n";
+
+        CrashLog result = new J9JavacoreParser().parse(UUID.randomUUID().toString(), javacoreContent);
+
+        assertNotNull(result);
+        assertEquals("InternalError", result.error.kind);
+        assertEquals("Process terminated by Internal error", result.error.message);
+    }
+
+    private String readFileAsString(String resource) throws IOException {
+        try (InputStream stream = getClass().getClassLoader().getResourceAsStream(resource)) {
+            return new BufferedReader(new InputStreamReader(Objects.requireNonNull(stream), StandardCharsets.UTF_8))
+                    .lines()
+                    .collect(Collectors.joining("\n"));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/RedactUtilsTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/RedactUtilsTest.java
index 2bcc61aa168..9f72fbb5ea3 100644
--- a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/RedactUtilsTest.java
+++ b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/RedactUtilsTest.java
@@ -7,383 +7,358 @@
 
 public class RedactUtilsTest {
 
-  @TableTest({
-    "scenario             | input                            | expected                        ",
-    "unknown package      | com/company/SomeType             | redacted/Redacted               ",
-    "three-level package  | com/company/pkg/SomeType         | redacted/Redacted               ",
-    "java prefix          | java/lang/String                 | java/lang/String                ",
-    "jdk prefix           | jdk/internal/misc/Unsafe         | jdk/internal/misc/Unsafe        ",
-    "sun prefix           | sun/reflect/Reflection           | sun/reflect/Reflection          ",
-    "javax prefix         | javax/net/ssl/SSLSocket          | javax/net/ssl/SSLSocket         ",
-    "jakarta prefix       | jakarta/servlet/http/HttpServlet | jakarta/servlet/http/HttpServlet",
-    "com/sun prefix       | com/sun/proxy/ProxyBuilder       | com/sun/proxy/ProxyBuilder      ",
-    "com/oracle prefix    | com/oracle/jrockit/SomeClass     | com/oracle/jrockit/SomeClass    ",
-    "datadog prefix       | datadog/trace/api/Tracer         | datadog/trace/api/Tracer        ",
-    "com/datadog prefix   | com/datadog/agent/SomeClass      | com/datadog/agent/SomeClass     ",
-    "com/datadoghq prefix | com/datadoghq/profiler/Profiler  | com/datadoghq/profiler/Profiler ",
-    "org/datadog prefix   | org/datadog/jmxfetch/App         | org/datadog/jmxfetch/App        ",
-    "com/dd prefix        | com/dd/logs/LogService           | com/dd/logs/LogService          ",
-    "no package           | SomeType                         | SomeType                        ",
-    "inner class          | com/company/Outer$Inner          | redacted/Redacted               "
-  })
-  void testRedactJvmClassName(String input, String expected) {
-    assertThat(RedactUtils.redactJvmClassName(input)).isEqualTo(expected);
-  }
-
-  @TableTest({
-    "scenario             | input                            | expected                        ",
-    "unknown package      | com.company.SomeType             | redacted.Redacted               ",
-    "three-level package  | com.company.pkg.SomeType         | redacted.Redacted               ",
-    "java prefix          | java.lang.String                 | java.lang.String                ",
-    "jdk prefix           | jdk.internal.misc.Unsafe         | jdk.internal.misc.Unsafe        ",
-    "sun prefix           | sun.reflect.Reflection           | sun.reflect.Reflection          ",
-    "jakarta prefix       | jakarta.servlet.http.HttpServlet | jakarta.servlet.http.HttpServlet",
-    "com.oracle prefix    | com.oracle.jrockit.SomeClass     | com.oracle.jrockit.SomeClass    ",
-    "datadog prefix       | datadog.trace.api.Tracer         | datadog.trace.api.Tracer        ",
-    "com.datadog prefix   | com.datadog.agent.SomeClass      | com.datadog.agent.SomeClass     ",
-    "com.datadoghq prefix | com.datadoghq.profiler.Profiler  | com.datadoghq.profiler.Profiler ",
-    "org.datadog prefix   | org.datadog.jmxfetch.App         | org.datadog.jmxfetch.App        ",
-    "com.dd prefix        | com.dd.logs.LogService           | com.dd.logs.LogService          ",
-    "no package           | SomeType                         | SomeType                        ",
-    "inner class          | com.company.Outer$Inner          | redacted.Redacted               "
-  })
-  void testRedactDottedClassName(String input, String expected) {
-    assertThat(RedactUtils.redactDottedClassName(input)).isEqualTo(expected);
-  }
-
-  @TableTest({
-    "scenario       | input                                     | expected                       ",
-    "four segments  | /path/to/dir/lib.so                       | /redacted/dir/lib.so           ",
-    "two segments   | /dir/lib.so                               | /dir/lib.so                    ",
-    "three segments | /one/dir/lib.so                           | /redacted/dir/lib.so           ",
-    "five segments  | /usr/lib/jvm/corretto-21/libjvm.so        | /redacted/corretto-21/libjvm.so",
-    "six segments   | /usr/lib/jvm/corretto-21/server/libjvm.so | /redacted/server/libjvm.so     "
-  })
-  void testRedactPath(String input, String expected) {
-    assertThat(RedactUtils.redactPath(input)).isEqualTo(expected);
-  }
-
-  @Test
-  void testRedactStringContent_redactsValue() {
-    assertThat(RedactUtils.redactStringTypeValue(" - string: \"SourceFile\""))
-        .isEqualTo(" - string: \"REDACTED\"");
-  }
-
-  @Test
-  void testRedactStringContent_redactsSensitiveValue() {
-    assertThat(
-            RedactUtils.redactStringTypeValue(
-                " - string: \"jdbc:postgresql://host/db?password=s3cr3t\""))
-        .isEqualTo(" - string: \"REDACTED\"");
-  }
-
-  @Test
-  void testRedactStringContent_leavesUnrelatedLinesUnchanged() {
-    assertThat(RedactUtils.redactStringTypeValue(" - klass: 'java/lang/Class'"))
-        .isEqualTo(" - klass: 'java/lang/Class'");
-  }
-
-  @Test
-  void testRedactTypeDescriptors_redactsUnknownPackage() {
-    assertThat(RedactUtils.redactTypeDescriptors("'(Lcom/company/Type;ILjava/lang/String;)V'"))
-        .isEqualTo("'(Lredacted/Redacted;ILjava/lang/String;)V'");
-  }
-
-  @Test
-  void testRedactTypeDescriptors_keepsKnownPackages() {
-    assertThat(RedactUtils.redactTypeDescriptors("'(Ljava/util/List;Ljdk/internal/misc/Unsafe;)V'"))
-        .isEqualTo("'(Ljava/util/List;Ljdk/internal/misc/Unsafe;)V'");
-  }
-
-  @Test
-  void testRedactKlassReference_redactsUnknownPackage() {
-    assertThat(RedactUtils.redactKlassReference("{0x...} - klass: 'com/company/MyClass'"))
-        .isEqualTo("{0x...} - klass: 'redacted/Redacted'");
-  }
-
-  @Test
-  void testRedactKlassReference_keepsKnownPackage() {
-    assertThat(RedactUtils.redactKlassReference("{0x...} - klass: 'java/lang/Class'"))
-        .isEqualTo("{0x...} - klass: 'java/lang/Class'");
-  }
-
-  @Test
-  void testRedactMethodClass_redactsUnknownPackage() {
-    assertThat(
-            RedactUtils.redactMethodClass(
-                "{method} {0x...} 'doWork' '(I)V' in 'com/company/Worker'"))
-        .isEqualTo("{method} {0x...} 'doWork' '(I)V' in 'redacted/Redacted'");
-  }
-
-  @Test
-  void testRedactMethodClass_keepsKnownPackage() {
-    assertThat(
-            RedactUtils.redactMethodClass(
-                "{method} {0x...} 'getLong' '(J)J' in 'jdk/internal/misc/Unsafe'"))
-        .isEqualTo("{method} {0x...} 'getLong' '(J)J' in 'jdk/internal/misc/Unsafe'");
-  }
-
-  @Test
-  void testRedactLibraryPath_offsetFormat() {
-    assertThat(
-            RedactUtils.redactLibraryPath(
-                "0x0000ffff9efa1650: <offset 0x0000000000e01650> in /opt/company/lib/server/app.so at 0x0000ffff9e1a0000"))
-        .isEqualTo(
-            "0x0000ffff9efa1650: <offset 0x0000000000e01650> in /redacted/server/app.so at 0x0000ffff9e1a0000");
-  }
-
-  @Test
-  void testRedactLibraryPath_symbolOffsetFormat() {
-    // macOS/Linux: dladdr resolved a C++ mangled symbol — "symbol+offset in /path at 0x..."
-    assertThat(
-            RedactUtils.redactLibraryPath(
-                "0x0000000106c1ccc0: _ZN19TemplateInterpreter13_active_tableE+0 in /Users/USER/.local/share/mise/installs/java/25.0.2/lib/server/libjvm.dylib at 0x0000000105efc000"))
-        .isEqualTo(
-            "0x0000000106c1ccc0: _ZN19TemplateInterpreter13_active_tableE+0 in /redacted/server/libjvm.dylib at 0x0000000105efc000");
-  }
-
-  @Test
-  void testRedactLibraryPath_cSymbolFormat() {
-    // macOS: C symbol "symbol+0 in /usr/lib/system/lib.dylib at 0x..."
-    assertThat(
-            RedactUtils.redactLibraryPath(
-                "0x0000000182d709d0: pthread_jit_write_protect_np+0 in /usr/lib/system/libsystem_pthread.dylib at 0x0000000182d69000"))
-        .isEqualTo(
-            "0x0000000182d709d0: pthread_jit_write_protect_np+0 in /redacted/system/libsystem_pthread.dylib at 0x0000000182d69000");
-  }
-
-  @Test
-  void testRedactLibraryPath_doesNotMatchInterpreterCodelet() {
-    // "code_begin+1776 in an Interpreter codelet" — "an" doesn't start with "/" so no match
-    assertThat(
-            RedactUtils.redactLibraryPath(
-                "0x0000000116d0c970 is at code_begin+1776 in an Interpreter codelet"))
-        .isEqualTo("0x0000000116d0c970 is at code_begin+1776 in an Interpreter codelet");
-  }
-
-  @Test
-  void testRedactLibraryPath_leavesUnrelatedLinesUnchanged() {
-    assertThat(RedactUtils.redactLibraryPath("0x00007f37a16e2590 is an unknown value"))
-        .isEqualTo("0x00007f37a16e2590 is an unknown value");
-  }
-
-  @Test
-  void testRedactDottedClassOopRef_redactsAnyStringOopRef() {
-    // Without oop-type context, all "value"{0x...} OOP refs are treated as arbitrary application
-    // data and fully redacted — even if the value looks like a class name
-    assertThat(
-            RedactUtils.redactDottedClassOopRef(
-                " - private transient 'name' 'Ljava/lang/String;' @44  \"com.company.SomeType\"{0x00000007142f7200} (0xe285ee40)"))
-        .isEqualTo(
-            " - private transient 'name' 'Ljava/lang/String;' @44  \"REDACTED\"{0x00000007142f7200} (0xe285ee40)");
-    // Dotted names with known packages are also fully redacted — any string can be a secret
-    assertThat(
-            RedactUtils.redactDottedClassOopRef(
-                " - private transient 'name' 'Ljava/lang/String;' @44  \"jdk.internal.misc.Unsafe\"{0x00000007142f7200} (0xe285ee40)"))
-        .isEqualTo(
-            " - private transient 'name' 'Ljava/lang/String;' @44  \"REDACTED\"{0x00000007142f7200} (0xe285ee40)");
-    // Plain single-word strings (no dots) are also redacted
-    assertThat(
-            RedactUtils.redactDottedClassOopRef(
-                " - final 'value' 'Ljava/lang/String;' @40  \"SourceFile\"{0x00000007ffe7a6a0} (0xfffcf4d4)"))
-        .isEqualTo(
-            " - final 'value' 'Ljava/lang/String;' @40  \"REDACTED\"{0x00000007ffe7a6a0} (0xfffcf4d4)");
-  }
-
-  @Test
-  void testRedactOopClassName_redactsUnknownPackage() {
-    assertThat(
-            RedactUtils.redactOopClassName("0x00000007ffe85850 is an oop: com.company.UserData "))
-        .isEqualTo("0x00000007ffe85850 is an oop: redacted.Redacted ");
-  }
-
-  @Test
-  void testRedactOopClassName_keepsKnownPackage() {
-    assertThat(RedactUtils.redactOopClassName("0x00000007ffe85850 is an oop: java.lang.Class "))
-        .isEqualTo("0x00000007ffe85850 is an oop: java.lang.Class ");
-  }
-
-  @Test
-  void testRedactRegisterToMemoryMapping_methodDescriptor() {
-    String value =
-        "{method} {0x00007f3639c2ff00} 'saveJob' '(Lcom/company/Job;ILjava/lang/String;)V' in 'com/company/JobService'";
-    assertThat(RedactUtils.redactRegisterToMemoryMapping(value))
-        .isEqualTo(
-            "{method} {0x00007f3639c2ff00} 'saveJob' '(Lredacted/Redacted;ILjava/lang/String;)V' in 'redacted/Redacted'");
-  }
-
-  @Test
-  void testRedactRegisterToMemoryMapping_multilineOopDump() {
-    // Non-java.lang.Class oop: ALL "value"{0x...} OOP refs are fully redacted to "REDACTED"
-    // regardless of their shape — any string value may be a secret.
-    String value =
-        "0x00000007142f8848 is an oop: com.company.SymbolEntry \n"
-            + "{0x00000007142f8848} - klass: 'com/company/SymbolEntry'\n"
-            + " - ---- fields (total size 9 words):\n"
-            + " - final 'tag' 'Ljava/lang/String;' @12  \"SourceFile\"{0x00000007ffe7a6a0} (0xfffcf4d4)\n"
-            + " - final 'value' 'Ljava/lang/String;' @16  \"com.company.Config\"{0x00000007aabbccdd} (0x12345678)\n"
-            + " - final 'hint' 'Ljava/lang/String;' @20  \"java.vendor.url.bug\"{0x00000007aabbccee} (0x12345679)\n"
-            + " - final 'owner' 'Ljava/lang/String;' @24  null (0x00000000)\n"
-            + " - string: \"some sensitive value\"";
-    assertThat(RedactUtils.redactRegisterToMemoryMapping(value))
-        .isEqualTo(
-            "0x00000007142f8848 is an oop: redacted.Redacted \n"
-                + "{0x00000007142f8848} - klass: 'redacted/Redacted'\n"
+    @TableTest({
+      "scenario             | input                            | expected                        ",
+      "unknown package      | com/company/SomeType             | redacted/Redacted               ",
+      "three-level package  | com/company/pkg/SomeType         | redacted/Redacted               ",
+      "java prefix          | java/lang/String                 | java/lang/String                ",
+      "jdk prefix           | jdk/internal/misc/Unsafe         | jdk/internal/misc/Unsafe        ",
+      "sun prefix           | sun/reflect/Reflection           | sun/reflect/Reflection          ",
+      "javax prefix         | javax/net/ssl/SSLSocket          | javax/net/ssl/SSLSocket         ",
+      "jakarta prefix       | jakarta/servlet/http/HttpServlet | jakarta/servlet/http/HttpServlet",
+      "com/sun prefix       | com/sun/proxy/ProxyBuilder       | com/sun/proxy/ProxyBuilder      ",
+      "com/oracle prefix    | com/oracle/jrockit/SomeClass     | com/oracle/jrockit/SomeClass    ",
+      "datadog prefix       | datadog/trace/api/Tracer         | datadog/trace/api/Tracer        ",
+      "com/datadog prefix   | com/datadog/agent/SomeClass      | com/datadog/agent/SomeClass     ",
+      "com/datadoghq prefix | com/datadoghq/profiler/Profiler  | com/datadoghq/profiler/Profiler ",
+      "org/datadog prefix   | org/datadog/jmxfetch/App         | org/datadog/jmxfetch/App        ",
+      "com/dd prefix        | com/dd/logs/LogService           | com/dd/logs/LogService          ",
+      "no package           | SomeType                         | SomeType                        ",
+      "inner class          | com/company/Outer$Inner          | redacted/Redacted               "
+    })
+    void testRedactJvmClassName(String input, String expected) {
+        assertThat(RedactUtils.redactJvmClassName(input)).isEqualTo(expected);
+    }
+
+    @TableTest({
+      "scenario             | input                            | expected                        ",
+      "unknown package      | com.company.SomeType             | redacted.Redacted               ",
+      "three-level package  | com.company.pkg.SomeType         | redacted.Redacted               ",
+      "java prefix          | java.lang.String                 | java.lang.String                ",
+      "jdk prefix           | jdk.internal.misc.Unsafe         | jdk.internal.misc.Unsafe        ",
+      "sun prefix           | sun.reflect.Reflection           | sun.reflect.Reflection          ",
+      "jakarta prefix       | jakarta.servlet.http.HttpServlet | jakarta.servlet.http.HttpServlet",
+      "com.oracle prefix    | com.oracle.jrockit.SomeClass     | com.oracle.jrockit.SomeClass    ",
+      "datadog prefix       | datadog.trace.api.Tracer         | datadog.trace.api.Tracer        ",
+      "com.datadog prefix   | com.datadog.agent.SomeClass      | com.datadog.agent.SomeClass     ",
+      "com.datadoghq prefix | com.datadoghq.profiler.Profiler  | com.datadoghq.profiler.Profiler ",
+      "org.datadog prefix   | org.datadog.jmxfetch.App         | org.datadog.jmxfetch.App        ",
+      "com.dd prefix        | com.dd.logs.LogService           | com.dd.logs.LogService          ",
+      "no package           | SomeType                         | SomeType                        ",
+      "inner class          | com.company.Outer$Inner          | redacted.Redacted               "
+    })
+    void testRedactDottedClassName(String input, String expected) {
+        assertThat(RedactUtils.redactDottedClassName(input)).isEqualTo(expected);
+    }
+
+    @TableTest({
+      "scenario       | input                                     | expected                       ",
+      "four segments  | /path/to/dir/lib.so                       | /redacted/dir/lib.so           ",
+      "two segments   | /dir/lib.so                               | /dir/lib.so                    ",
+      "three segments | /one/dir/lib.so                           | /redacted/dir/lib.so           ",
+      "five segments  | /usr/lib/jvm/corretto-21/libjvm.so        | /redacted/corretto-21/libjvm.so",
+      "six segments   | /usr/lib/jvm/corretto-21/server/libjvm.so | /redacted/server/libjvm.so     "
+    })
+    void testRedactPath(String input, String expected) {
+        assertThat(RedactUtils.redactPath(input)).isEqualTo(expected);
+    }
+
+    @Test
+    void testRedactStringContent_redactsValue() {
+        assertThat(RedactUtils.redactStringTypeValue(" - string: \"SourceFile\""))
+                .isEqualTo(" - string: \"REDACTED\"");
+    }
+
+    @Test
+    void testRedactStringContent_redactsSensitiveValue() {
+        assertThat(RedactUtils.redactStringTypeValue(" - string: \"jdbc:postgresql://host/db?password=s3cr3t\""))
+                .isEqualTo(" - string: \"REDACTED\"");
+    }
+
+    @Test
+    void testRedactStringContent_leavesUnrelatedLinesUnchanged() {
+        assertThat(RedactUtils.redactStringTypeValue(" - klass: 'java/lang/Class'"))
+                .isEqualTo(" - klass: 'java/lang/Class'");
+    }
+
+    @Test
+    void testRedactTypeDescriptors_redactsUnknownPackage() {
+        assertThat(RedactUtils.redactTypeDescriptors("'(Lcom/company/Type;ILjava/lang/String;)V'"))
+                .isEqualTo("'(Lredacted/Redacted;ILjava/lang/String;)V'");
+    }
+
+    @Test
+    void testRedactTypeDescriptors_keepsKnownPackages() {
+        assertThat(RedactUtils.redactTypeDescriptors("'(Ljava/util/List;Ljdk/internal/misc/Unsafe;)V'"))
+                .isEqualTo("'(Ljava/util/List;Ljdk/internal/misc/Unsafe;)V'");
+    }
+
+    @Test
+    void testRedactKlassReference_redactsUnknownPackage() {
+        assertThat(RedactUtils.redactKlassReference("{0x...} - klass: 'com/company/MyClass'"))
+                .isEqualTo("{0x...} - klass: 'redacted/Redacted'");
+    }
+
+    @Test
+    void testRedactKlassReference_keepsKnownPackage() {
+        assertThat(RedactUtils.redactKlassReference("{0x...} - klass: 'java/lang/Class'"))
+                .isEqualTo("{0x...} - klass: 'java/lang/Class'");
+    }
+
+    @Test
+    void testRedactMethodClass_redactsUnknownPackage() {
+        assertThat(RedactUtils.redactMethodClass("{method} {0x...} 'doWork' '(I)V' in 'com/company/Worker'"))
+                .isEqualTo("{method} {0x...} 'doWork' '(I)V' in 'redacted/Redacted'");
+    }
+
+    @Test
+    void testRedactMethodClass_keepsKnownPackage() {
+        assertThat(RedactUtils.redactMethodClass("{method} {0x...} 'getLong' '(J)J' in 'jdk/internal/misc/Unsafe'"))
+                .isEqualTo("{method} {0x...} 'getLong' '(J)J' in 'jdk/internal/misc/Unsafe'");
+    }
+
+    @Test
+    void testRedactLibraryPath_offsetFormat() {
+        assertThat(
+                        RedactUtils.redactLibraryPath(
+                                "0x0000ffff9efa1650: <offset 0x0000000000e01650> in /opt/company/lib/server/app.so at 0x0000ffff9e1a0000"))
+                .isEqualTo(
+                        "0x0000ffff9efa1650: <offset 0x0000000000e01650> in /redacted/server/app.so at 0x0000ffff9e1a0000");
+    }
+
+    @Test
+    void testRedactLibraryPath_symbolOffsetFormat() {
+        // macOS/Linux: dladdr resolved a C++ mangled symbol — "symbol+offset in /path at 0x..."
+        assertThat(
+                        RedactUtils.redactLibraryPath(
+                                "0x0000000106c1ccc0: _ZN19TemplateInterpreter13_active_tableE+0 in /Users/USER/.local/share/mise/installs/java/25.0.2/lib/server/libjvm.dylib at 0x0000000105efc000"))
+                .isEqualTo(
+                        "0x0000000106c1ccc0: _ZN19TemplateInterpreter13_active_tableE+0 in /redacted/server/libjvm.dylib at 0x0000000105efc000");
+    }
+
+    @Test
+    void testRedactLibraryPath_cSymbolFormat() {
+        // macOS: C symbol "symbol+0 in /usr/lib/system/lib.dylib at 0x..."
+        assertThat(
+                        RedactUtils.redactLibraryPath(
+                                "0x0000000182d709d0: pthread_jit_write_protect_np+0 in /usr/lib/system/libsystem_pthread.dylib at 0x0000000182d69000"))
+                .isEqualTo(
+                        "0x0000000182d709d0: pthread_jit_write_protect_np+0 in /redacted/system/libsystem_pthread.dylib at 0x0000000182d69000");
+    }
+
+    @Test
+    void testRedactLibraryPath_doesNotMatchInterpreterCodelet() {
+        // "code_begin+1776 in an Interpreter codelet" — "an" doesn't start with "/" so no match
+        assertThat(RedactUtils.redactLibraryPath("0x0000000116d0c970 is at code_begin+1776 in an Interpreter codelet"))
+                .isEqualTo("0x0000000116d0c970 is at code_begin+1776 in an Interpreter codelet");
+    }
+
+    @Test
+    void testRedactLibraryPath_leavesUnrelatedLinesUnchanged() {
+        assertThat(RedactUtils.redactLibraryPath("0x00007f37a16e2590 is an unknown value"))
+                .isEqualTo("0x00007f37a16e2590 is an unknown value");
+    }
+
+    @Test
+    void testRedactDottedClassOopRef_redactsAnyStringOopRef() {
+        // Without oop-type context, all "value"{0x...} OOP refs are treated as arbitrary application
+        // data and fully redacted — even if the value looks like a class name
+        assertThat(
+                        RedactUtils.redactDottedClassOopRef(
+                                " - private transient 'name' 'Ljava/lang/String;' @44  \"com.company.SomeType\"{0x00000007142f7200} (0xe285ee40)"))
+                .isEqualTo(
+                        " - private transient 'name' 'Ljava/lang/String;' @44  \"REDACTED\"{0x00000007142f7200} (0xe285ee40)");
+        // Dotted names with known packages are also fully redacted — any string can be a secret
+        assertThat(
+                        RedactUtils.redactDottedClassOopRef(
+                                " - private transient 'name' 'Ljava/lang/String;' @44  \"jdk.internal.misc.Unsafe\"{0x00000007142f7200} (0xe285ee40)"))
+                .isEqualTo(
+                        " - private transient 'name' 'Ljava/lang/String;' @44  \"REDACTED\"{0x00000007142f7200} (0xe285ee40)");
+        // Plain single-word strings (no dots) are also redacted
+        assertThat(RedactUtils.redactDottedClassOopRef(
+                        " - final 'value' 'Ljava/lang/String;' @40  \"SourceFile\"{0x00000007ffe7a6a0} (0xfffcf4d4)"))
+                .isEqualTo(" - final 'value' 'Ljava/lang/String;' @40  \"REDACTED\"{0x00000007ffe7a6a0} (0xfffcf4d4)");
+    }
+
+    @Test
+    void testRedactOopClassName_redactsUnknownPackage() {
+        assertThat(RedactUtils.redactOopClassName("0x00000007ffe85850 is an oop: com.company.UserData "))
+                .isEqualTo("0x00000007ffe85850 is an oop: redacted.Redacted ");
+    }
+
+    @Test
+    void testRedactOopClassName_keepsKnownPackage() {
+        assertThat(RedactUtils.redactOopClassName("0x00000007ffe85850 is an oop: java.lang.Class "))
+                .isEqualTo("0x00000007ffe85850 is an oop: java.lang.Class ");
+    }
+
+    @Test
+    void testRedactRegisterToMemoryMapping_methodDescriptor() {
+        String value =
+                "{method} {0x00007f3639c2ff00} 'saveJob' '(Lcom/company/Job;ILjava/lang/String;)V' in 'com/company/JobService'";
+        assertThat(RedactUtils.redactRegisterToMemoryMapping(value))
+                .isEqualTo(
+                        "{method} {0x00007f3639c2ff00} 'saveJob' '(Lredacted/Redacted;ILjava/lang/String;)V' in 'redacted/Redacted'");
+    }
+
+    @Test
+    void testRedactRegisterToMemoryMapping_multilineOopDump() {
+        // Non-java.lang.Class oop: ALL "value"{0x...} OOP refs are fully redacted to "REDACTED"
+        // regardless of their shape — any string value may be a secret.
+        String value = "0x00000007142f8848 is an oop: com.company.SymbolEntry \n"
+                + "{0x00000007142f8848} - klass: 'com/company/SymbolEntry'\n"
                 + " - ---- fields (total size 9 words):\n"
-                + " - final 'tag' 'Ljava/lang/String;' @12  \"REDACTED\"{0x00000007ffe7a6a0} (0xfffcf4d4)\n"
-                + " - final 'value' 'Ljava/lang/String;' @16  \"REDACTED\"{0x00000007aabbccdd} (0x12345678)\n"
-                + " - final 'hint' 'Ljava/lang/String;' @20  \"REDACTED\"{0x00000007aabbccee} (0x12345679)\n"
+                + " - final 'tag' 'Ljava/lang/String;' @12  \"SourceFile\"{0x00000007ffe7a6a0} (0xfffcf4d4)\n"
+                + " - final 'value' 'Ljava/lang/String;' @16  \"com.company.Config\"{0x00000007aabbccdd} (0x12345678)\n"
+                + " - final 'hint' 'Ljava/lang/String;' @20  \"java.vendor.url.bug\"{0x00000007aabbccee} (0x12345679)\n"
                 + " - final 'owner' 'Ljava/lang/String;' @24  null (0x00000000)\n"
-                + " - string: \"REDACTED\"");
-  }
-
-  @Test
-  void testRedactRegisterToMemoryMapping_javaLangClassOopRedactsUnknownClasses() {
-    // java.lang.Class oop: String OOP refs in field values are treated as class names.
-    // Unknown-package classes are redacted to redacted.Redacted; known packages are preserved.
-    String value =
-        "0x00000007ffe85850 is an oop: java.lang.Class \n"
-            + "{0x00000007ffe85850} - klass: 'java/lang/Class'\n"
-            + " - ---- fields (total size 25 words):\n"
-            + " - private transient 'name' 'Ljava/lang/String;' @44  \"com.company.Config\"{0x00000007aabbccdd} (0x12345678)\n"
-            + " - private transient 'name' 'Ljava/lang/String;' @44  \"jdk.internal.misc.Unsafe\"{0x00000007142f7200} (0xe285ee40)";
-    assertThat(RedactUtils.redactRegisterToMemoryMapping(value))
-        .isEqualTo(
-            "0x00000007ffe85850 is an oop: java.lang.Class \n"
+                + " - string: \"some sensitive value\"";
+        assertThat(RedactUtils.redactRegisterToMemoryMapping(value))
+                .isEqualTo("0x00000007142f8848 is an oop: redacted.Redacted \n"
+                        + "{0x00000007142f8848} - klass: 'redacted/Redacted'\n"
+                        + " - ---- fields (total size 9 words):\n"
+                        + " - final 'tag' 'Ljava/lang/String;' @12  \"REDACTED\"{0x00000007ffe7a6a0} (0xfffcf4d4)\n"
+                        + " - final 'value' 'Ljava/lang/String;' @16  \"REDACTED\"{0x00000007aabbccdd} (0x12345678)\n"
+                        + " - final 'hint' 'Ljava/lang/String;' @20  \"REDACTED\"{0x00000007aabbccee} (0x12345679)\n"
+                        + " - final 'owner' 'Ljava/lang/String;' @24  null (0x00000000)\n"
+                        + " - string: \"REDACTED\"");
+    }
+
+    @Test
+    void testRedactRegisterToMemoryMapping_javaLangClassOopRedactsUnknownClasses() {
+        // java.lang.Class oop: String OOP refs in field values are treated as class names.
+        // Unknown-package classes are redacted to redacted.Redacted; known packages are preserved.
+        String value = "0x00000007ffe85850 is an oop: java.lang.Class \n"
                 + "{0x00000007ffe85850} - klass: 'java/lang/Class'\n"
                 + " - ---- fields (total size 25 words):\n"
-                + " - private transient 'name' 'Ljava/lang/String;' @44  \"redacted.Redacted\"{0x00000007aabbccdd} (0x12345678)\n"
-                + " - private transient 'name' 'Ljava/lang/String;' @44  \"jdk.internal.misc.Unsafe\"{0x00000007142f7200} (0xe285ee40)");
-  }
-
-  @Test
-  void testRedactRegisterToMemoryMapping_libraryPath() {
-    assertThat(
-            RedactUtils.redactRegisterToMemoryMapping(
-                "0x0000ffff9efa1650: <offset 0x0000000000e01650> in /usr/lib/jvm/corretto-21/server/libjvm.so at 0x0000ffff9e1a0000"))
-        .isEqualTo(
-            "0x0000ffff9efa1650: <offset 0x0000000000e01650> in /redacted/server/libjvm.so at 0x0000ffff9e1a0000");
-  }
-
-  @Test
-  void testRedactRegisterToMemoryMapping_safeValuesUnchanged() {
-    assertThat(
-            RedactUtils.redactRegisterToMemoryMapping(
-                "0x00007f35e6253190 is pointing into the stack for thread: 0x00007f36cd96cc80"))
-        .isEqualTo("0x00007f35e6253190 is pointing into the stack for thread: 0x00007f36cd96cc80");
-    assertThat(RedactUtils.redactRegisterToMemoryMapping("0x0 is NULL")).isEqualTo("0x0 is NULL");
-    assertThat(RedactUtils.redactRegisterToMemoryMapping("0x000000008fd66048 is an unknown value"))
-        .isEqualTo("0x000000008fd66048 is an unknown value");
-  }
-
-  @Test
-  void testRedactReadableMemoryHexDump_withAddressAndPipe() {
-    // Linux/macOS amd64: address + " | " + bytes — keep address, redact bytes
-    assertThat(
-            RedactUtils.redactReadableMemoryHexDump(
-                "0x0000000100a17cb0 points into unknown readable memory: 0x00000000ffffffff | ff ff ff ff 00 00 00 00"))
-        .isEqualTo(
-            "0x0000000100a17cb0 points into unknown readable memory: 0x00000000ffffffff | REDACTED");
-  }
-
-  @Test
-  void testRedactReadableMemoryHexDump_withoutAddress() {
-    // Linux aarch64: bytes only — redact everything after the colon
-    assertThat(
-            RedactUtils.redactReadableMemoryHexDump(
-                "0x0000ffff9f686ca4 points into unknown readable memory: 06 00 00 00"))
-        .isEqualTo("0x0000ffff9f686ca4 points into unknown readable memory: REDACTED");
-  }
-
-  @Test
-  void testRedactReadableMemoryHexDump_leavesUnrelatedLinesUnchanged() {
-    assertThat(RedactUtils.redactReadableMemoryHexDump("0x00007f37a16e2590 is an unknown value"))
-        .isEqualTo("0x00007f37a16e2590 is an unknown value");
-  }
-
-  @Test
-  void testRedactObjFieldRef_redactsUnknownPackage() {
-    assertThat(
-            RedactUtils.redactObjFieldRef(
-                " - 'owner' 'Lcom/company/Owner;' @12  a 'com/company/Owner'{0x00007f3700001234} (0x12345678)"))
-        .isEqualTo(
-            " - 'owner' 'Lcom/company/Owner;' @12  a 'redacted/Redacted'{0x00007f3700001234} (0x12345678)");
-  }
-
-  @Test
-  void testRedactObjFieldRef_keepsKnownPackage() {
-    assertThat(
-            RedactUtils.redactObjFieldRef(
-                " - 'loader' 'Ljava/lang/ClassLoader;' @12  a 'java/lang/ClassLoader'{0x00007f3700001234} (0x12345678)"))
-        .isEqualTo(
-            " - 'loader' 'Ljava/lang/ClassLoader;' @12  a 'java/lang/ClassLoader'{0x00007f3700001234} (0x12345678)");
-  }
-
-  @Test
-  void testRedactObjFieldRef_leavesUnrelatedLinesUnchanged() {
-    assertThat(RedactUtils.redactObjFieldRef("0x00007f37a16e2590 is an unknown value"))
-        .isEqualTo("0x00007f37a16e2590 is an unknown value");
-  }
-
-  @Test
-  void testRedactNmethodClass_dottedUnknownPackage() {
-    assertThat(
-            RedactUtils.redactNmethodClass(
-                "Compiled method (c2) 3068 4       com.company.Foo::methodName (456 bytes)"))
-        .isEqualTo("Compiled method (c2) 3068 4       redacted.Redacted::methodName (456 bytes)");
-  }
-
-  @Test
-  void testRedactNmethodClass_dottedKnownPackage() {
-    assertThat(
-            RedactUtils.redactNmethodClass(
-                "Compiled method (c2) 3068 4       java.util.HashMap::resize (456 bytes)"))
-        .isEqualTo("Compiled method (c2) 3068 4       java.util.HashMap::resize (456 bytes)");
-  }
-
-  @Test
-  void testRedactNmethodClass_slashUnknownPackage() {
-    assertThat(RedactUtils.redactNmethodClass("com/company/Foo::methodName"))
-        .isEqualTo("redacted/Redacted::methodName");
-  }
-
-  @Test
-  void testRedactNmethodClass_slashKnownPackage() {
-    assertThat(RedactUtils.redactNmethodClass("java/util/HashMap::resize"))
-        .isEqualTo("java/util/HashMap::resize");
-  }
-
-  @Test
-  void testRedactNmethodClass_leavesUnrelatedLinesUnchanged() {
-    assertThat(RedactUtils.redactNmethodClass("0x00007f37a16e2590 is an unknown value"))
-        .isEqualTo("0x00007f37a16e2590 is an unknown value");
-  }
-
-  @Test
-  void testRedactRegisterToMemoryMapping_objFieldRef() {
-    // Non-java.lang.Class oop with object-reference field: a 'ClassName' is redacted
-    String value =
-        "0x00000007142f8848 is an oop: com.company.Holder \n"
-            + "{0x00000007142f8848} - klass: 'com/company/Holder'\n"
-            + " - ---- fields (total size 3 words):\n"
-            + " - 'ref' 'Ljava/lang/Object;' @12  a 'com/company/Inner'{0x00007f1200003456} (0xabcdef01)";
-    assertThat(RedactUtils.redactRegisterToMemoryMapping(value))
-        .isEqualTo(
-            "0x00000007142f8848 is an oop: redacted.Redacted \n"
-                + "{0x00000007142f8848} - klass: 'redacted/Redacted'\n"
+                + " - private transient 'name' 'Ljava/lang/String;' @44  \"com.company.Config\"{0x00000007aabbccdd} (0x12345678)\n"
+                + " - private transient 'name' 'Ljava/lang/String;' @44  \"jdk.internal.misc.Unsafe\"{0x00000007142f7200} (0xe285ee40)";
+        assertThat(RedactUtils.redactRegisterToMemoryMapping(value))
+                .isEqualTo(
+                        "0x00000007ffe85850 is an oop: java.lang.Class \n"
+                                + "{0x00000007ffe85850} - klass: 'java/lang/Class'\n"
+                                + " - ---- fields (total size 25 words):\n"
+                                + " - private transient 'name' 'Ljava/lang/String;' @44  \"redacted.Redacted\"{0x00000007aabbccdd} (0x12345678)\n"
+                                + " - private transient 'name' 'Ljava/lang/String;' @44  \"jdk.internal.misc.Unsafe\"{0x00000007142f7200} (0xe285ee40)");
+    }
+
+    @Test
+    void testRedactRegisterToMemoryMapping_libraryPath() {
+        assertThat(
+                        RedactUtils.redactRegisterToMemoryMapping(
+                                "0x0000ffff9efa1650: <offset 0x0000000000e01650> in /usr/lib/jvm/corretto-21/server/libjvm.so at 0x0000ffff9e1a0000"))
+                .isEqualTo(
+                        "0x0000ffff9efa1650: <offset 0x0000000000e01650> in /redacted/server/libjvm.so at 0x0000ffff9e1a0000");
+    }
+
+    @Test
+    void testRedactRegisterToMemoryMapping_safeValuesUnchanged() {
+        assertThat(RedactUtils.redactRegisterToMemoryMapping(
+                        "0x00007f35e6253190 is pointing into the stack for thread: 0x00007f36cd96cc80"))
+                .isEqualTo("0x00007f35e6253190 is pointing into the stack for thread: 0x00007f36cd96cc80");
+        assertThat(RedactUtils.redactRegisterToMemoryMapping("0x0 is NULL")).isEqualTo("0x0 is NULL");
+        assertThat(RedactUtils.redactRegisterToMemoryMapping("0x000000008fd66048 is an unknown value"))
+                .isEqualTo("0x000000008fd66048 is an unknown value");
+    }
+
+    @Test
+    void testRedactReadableMemoryHexDump_withAddressAndPipe() {
+        // Linux/macOS amd64: address + " | " + bytes — keep address, redact bytes
+        assertThat(
+                        RedactUtils.redactReadableMemoryHexDump(
+                                "0x0000000100a17cb0 points into unknown readable memory: 0x00000000ffffffff | ff ff ff ff 00 00 00 00"))
+                .isEqualTo("0x0000000100a17cb0 points into unknown readable memory: 0x00000000ffffffff | REDACTED");
+    }
+
+    @Test
+    void testRedactReadableMemoryHexDump_withoutAddress() {
+        // Linux aarch64: bytes only — redact everything after the colon
+        assertThat(RedactUtils.redactReadableMemoryHexDump(
+                        "0x0000ffff9f686ca4 points into unknown readable memory: 06 00 00 00"))
+                .isEqualTo("0x0000ffff9f686ca4 points into unknown readable memory: REDACTED");
+    }
+
+    @Test
+    void testRedactReadableMemoryHexDump_leavesUnrelatedLinesUnchanged() {
+        assertThat(RedactUtils.redactReadableMemoryHexDump("0x00007f37a16e2590 is an unknown value"))
+                .isEqualTo("0x00007f37a16e2590 is an unknown value");
+    }
+
+    @Test
+    void testRedactObjFieldRef_redactsUnknownPackage() {
+        assertThat(RedactUtils.redactObjFieldRef(
+                        " - 'owner' 'Lcom/company/Owner;' @12  a 'com/company/Owner'{0x00007f3700001234} (0x12345678)"))
+                .isEqualTo(
+                        " - 'owner' 'Lcom/company/Owner;' @12  a 'redacted/Redacted'{0x00007f3700001234} (0x12345678)");
+    }
+
+    @Test
+    void testRedactObjFieldRef_keepsKnownPackage() {
+        assertThat(
+                        RedactUtils.redactObjFieldRef(
+                                " - 'loader' 'Ljava/lang/ClassLoader;' @12  a 'java/lang/ClassLoader'{0x00007f3700001234} (0x12345678)"))
+                .isEqualTo(
+                        " - 'loader' 'Ljava/lang/ClassLoader;' @12  a 'java/lang/ClassLoader'{0x00007f3700001234} (0x12345678)");
+    }
+
+    @Test
+    void testRedactObjFieldRef_leavesUnrelatedLinesUnchanged() {
+        assertThat(RedactUtils.redactObjFieldRef("0x00007f37a16e2590 is an unknown value"))
+                .isEqualTo("0x00007f37a16e2590 is an unknown value");
+    }
+
+    @Test
+    void testRedactNmethodClass_dottedUnknownPackage() {
+        assertThat(RedactUtils.redactNmethodClass(
+                        "Compiled method (c2) 3068 4       com.company.Foo::methodName (456 bytes)"))
+                .isEqualTo("Compiled method (c2) 3068 4       redacted.Redacted::methodName (456 bytes)");
+    }
+
+    @Test
+    void testRedactNmethodClass_dottedKnownPackage() {
+        assertThat(RedactUtils.redactNmethodClass(
+                        "Compiled method (c2) 3068 4       java.util.HashMap::resize (456 bytes)"))
+                .isEqualTo("Compiled method (c2) 3068 4       java.util.HashMap::resize (456 bytes)");
+    }
+
+    @Test
+    void testRedactNmethodClass_slashUnknownPackage() {
+        assertThat(RedactUtils.redactNmethodClass("com/company/Foo::methodName"))
+                .isEqualTo("redacted/Redacted::methodName");
+    }
+
+    @Test
+    void testRedactNmethodClass_slashKnownPackage() {
+        assertThat(RedactUtils.redactNmethodClass("java/util/HashMap::resize")).isEqualTo("java/util/HashMap::resize");
+    }
+
+    @Test
+    void testRedactNmethodClass_leavesUnrelatedLinesUnchanged() {
+        assertThat(RedactUtils.redactNmethodClass("0x00007f37a16e2590 is an unknown value"))
+                .isEqualTo("0x00007f37a16e2590 is an unknown value");
+    }
+
+    @Test
+    void testRedactRegisterToMemoryMapping_objFieldRef() {
+        // Non-java.lang.Class oop with object-reference field: a 'ClassName' is redacted
+        String value = "0x00000007142f8848 is an oop: com.company.Holder \n"
+                + "{0x00000007142f8848} - klass: 'com/company/Holder'\n"
                 + " - ---- fields (total size 3 words):\n"
-                + " - 'ref' 'Ljava/lang/Object;' @12  a 'redacted/Redacted'{0x00007f1200003456} (0xabcdef01)");
-  }
-
-  @Test
-  void testRedactRegisterToMemoryMapping_nmethodCompiledMethod() {
-    // nmethod entry (JDK 11+): "Compiled method" line class name is redacted
-    String value =
-        "0x00007f36cd2b1600 is at entry_point+13512 in (nmethod*) 0x00007f36cd2b1510\n"
-            + "Compiled method (c2) 3068 4       com.company.Foo::processRequest (456 bytes)";
-    assertThat(RedactUtils.redactRegisterToMemoryMapping(value))
-        .isEqualTo(
-            "0x00007f36cd2b1600 is at entry_point+13512 in (nmethod*) 0x00007f36cd2b1510\n"
-                + "Compiled method (c2) 3068 4       redacted.Redacted::processRequest (456 bytes)");
-  }
+                + " - 'ref' 'Ljava/lang/Object;' @12  a 'com/company/Inner'{0x00007f1200003456} (0xabcdef01)";
+        assertThat(RedactUtils.redactRegisterToMemoryMapping(value))
+                .isEqualTo("0x00000007142f8848 is an oop: redacted.Redacted \n"
+                        + "{0x00000007142f8848} - klass: 'redacted/Redacted'\n"
+                        + " - ---- fields (total size 3 words):\n"
+                        + " - 'ref' 'Ljava/lang/Object;' @12  a 'redacted/Redacted'{0x00007f1200003456} (0xabcdef01)");
+    }
+
+    @Test
+    void testRedactRegisterToMemoryMapping_nmethodCompiledMethod() {
+        // nmethod entry (JDK 11+): "Compiled method" line class name is redacted
+        String value = "0x00007f36cd2b1600 is at entry_point+13512 in (nmethod*) 0x00007f36cd2b1510\n"
+                + "Compiled method (c2) 3068 4       com.company.Foo::processRequest (456 bytes)";
+        assertThat(RedactUtils.redactRegisterToMemoryMapping(value))
+                .isEqualTo("0x00007f36cd2b1600 is at entry_point+13512 in (nmethod*) 0x00007f36cd2b1510\n"
+                        + "Compiled method (c2) 3068 4       redacted.Redacted::processRequest (456 bytes)");
+    }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/RuntimeArgsTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/RuntimeArgsTest.java
index c7dfffff70d..6ce98f585bc 100644
--- a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/RuntimeArgsTest.java
+++ b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/RuntimeArgsTest.java
@@ -13,128 +13,124 @@
 import org.tabletest.junit.TableTest;
 
 public class RuntimeArgsTest {
-  private static final String HOTSPOT_JVM_ARGS_PREFIX = "jvm_args:";
-  private static final String J9_USER_ARG_PREFIX = "2CIUSERARG";
+    private static final String HOTSPOT_JVM_ARGS_PREFIX = "jvm_args:";
+    private static final String J9_USER_ARG_PREFIX = "2CIUSERARG";
 
-  @TableTest({
-    "scenario                            | resource                           | isIncluded | vmArg                                                                                        ",
-    "telemetry fixture logging property  | sample-crash-for-telemetry.txt     | true       | -Djava.util.logging.config.file=/opt/REDACT_THIS/REDACT_THIS/etc/java.util.logging.properties",
-    "telemetry fixture dd property       | sample-crash-for-telemetry.txt     | false      | -Ddd.profiling.enabled=true                                                                  ",
-    "telemetry fixture excluded property | sample-crash-for-telemetry.txt     | false      | -Dkaraf.startRemoteShell=REDACT_THIS                                                         ",
-    "telemetry fixture ws provider       | sample-crash-for-telemetry.txt     | false      | -Djavax.xml.ws.spi.Provider=com.sun.xml.ws.spi.ProviderImpl                                  ",
-    "telemetry with OnError              | sample-crash-for-telemetry-2.txt   | true       | -XX:OnError=/tmp/dd_crash_uploader.sh %p                                                     ",
-    "telemetry jdk8                      | sample-crash-for-telemetry-3.txt   | false      | -Ddd.trace.enabled=false                                                                     ",
-    "linux aarch64                       | sample-crash-linux-aarch64.txt     | true       | --add-modules=ALL-DEFAULT                                                                    ",
-    "macos aarch64                       | sample-crash-macos-aarch64.txt     | true       | --enable-native-access=ALL-UNNAMED                                                           ",
-    "jdk8 zip                            | sample-crash-jdk8-zip-getentry.txt | true       | -Dsun.zip.disableMemoryMapping=false                                                         "
-  })
-  public void testParseVmArgsHotspotArgs(String resource, boolean isIncluded, String vmArg)
-      throws Exception {
-    List<String> runtimeArgs = RuntimeArgs.parseVmArgs(extractHotspotJvmArgs(resource));
+    @TableTest({
+      "scenario                            | resource                           | isIncluded | vmArg                                                                                        ",
+      "telemetry fixture logging property  | sample-crash-for-telemetry.txt     | true       | -Djava.util.logging.config.file=/opt/REDACT_THIS/REDACT_THIS/etc/java.util.logging.properties",
+      "telemetry fixture dd property       | sample-crash-for-telemetry.txt     | false      | -Ddd.profiling.enabled=true                                                                  ",
+      "telemetry fixture excluded property | sample-crash-for-telemetry.txt     | false      | -Dkaraf.startRemoteShell=REDACT_THIS                                                         ",
+      "telemetry fixture ws provider       | sample-crash-for-telemetry.txt     | false      | -Djavax.xml.ws.spi.Provider=com.sun.xml.ws.spi.ProviderImpl                                  ",
+      "telemetry with OnError              | sample-crash-for-telemetry-2.txt   | true       | -XX:OnError=/tmp/dd_crash_uploader.sh %p                                                     ",
+      "telemetry jdk8                      | sample-crash-for-telemetry-3.txt   | false      | -Ddd.trace.enabled=false                                                                     ",
+      "linux aarch64                       | sample-crash-linux-aarch64.txt     | true       | --add-modules=ALL-DEFAULT                                                                    ",
+      "macos aarch64                       | sample-crash-macos-aarch64.txt     | true       | --enable-native-access=ALL-UNNAMED                                                           ",
+      "jdk8 zip                            | sample-crash-jdk8-zip-getentry.txt | true       | -Dsun.zip.disableMemoryMapping=false                                                         "
+    })
+    public void testParseVmArgsHotspotArgs(String resource, boolean isIncluded, String vmArg) throws Exception {
+        List<String> runtimeArgs = RuntimeArgs.parseVmArgs(extractHotspotJvmArgs(resource));
 
-    assertThat(runtimeArgs).isNotNull().isNotEmpty();
-    if (isIncluded) {
-      assertThat(runtimeArgs).as("Expected included arg in %s", resource).contains(vmArg);
-    } else {
-      assertThat(runtimeArgs)
-          .as("Expected excluded arg to be absent in %s", resource)
-          .doesNotContain(vmArg);
+        assertThat(runtimeArgs).isNotNull().isNotEmpty();
+        if (isIncluded) {
+            assertThat(runtimeArgs).as("Expected included arg in %s", resource).contains(vmArg);
+        } else {
+            assertThat(runtimeArgs)
+                    .as("Expected excluded arg to be absent in %s", resource)
+                    .doesNotContain(vmArg);
+        }
     }
-  }
 
-  @TableTest({
-    "scenario                   | raw                                                   | expectedIncluded                                 ",
-    "quoted onerror unix        | -XX:OnError=\"gcore %p;gdb -p %p\"                    | -XX:OnError=gcore %p;gdb -p %p                   ",
-    "quoted onerror windows     | -XX:OnError=\"userdump.exe %p\"                       | -XX:OnError=userdump.exe %p                      ",
-    "quoted module path         | --module-path \"/opt/app-modules:/opt/other-modules\" | --module-path /opt/app-modules:/opt/other-modules",
-    "javaagent without options  | -javaagent:/opt/dd-java-agent.jar                     | -javaagent:/opt/dd-java-agent.jar                ",
-    "javaagent options redacted | -javaagent:/opt/dd-java-agent.jar=apikey=deadbeef     | -javaagent:/opt/dd-java-agent.jar=REDACTED       ",
-    "agentlib without options   | -agentlib:jdwp                                        | -agentlib:jdwp                                   ",
-    "agentlib options redacted  | -agentlib:jdwp=transport=dt_socket,server=y           | -agentlib:jdwp=REDACTED                          "
-  })
-  public void testParseVmArgsHandlesArgNormalization(String raw, String expectedIncluded) {
-    List<String> runtimeArgs = RuntimeArgs.parseVmArgs(raw);
+    @TableTest({
+      "scenario                   | raw                                                   | expectedIncluded                                 ",
+      "quoted onerror unix        | -XX:OnError=\"gcore %p;gdb -p %p\"                    | -XX:OnError=gcore %p;gdb -p %p                   ",
+      "quoted onerror windows     | -XX:OnError=\"userdump.exe %p\"                       | -XX:OnError=userdump.exe %p                      ",
+      "quoted module path         | --module-path \"/opt/app-modules:/opt/other-modules\" | --module-path /opt/app-modules:/opt/other-modules",
+      "javaagent without options  | -javaagent:/opt/dd-java-agent.jar                     | -javaagent:/opt/dd-java-agent.jar                ",
+      "javaagent options redacted | -javaagent:/opt/dd-java-agent.jar=apikey=deadbeef     | -javaagent:/opt/dd-java-agent.jar=REDACTED       ",
+      "agentlib without options   | -agentlib:jdwp                                        | -agentlib:jdwp                                   ",
+      "agentlib options redacted  | -agentlib:jdwp=transport=dt_socket,server=y           | -agentlib:jdwp=REDACTED                          "
+    })
+    public void testParseVmArgsHandlesArgNormalization(String raw, String expectedIncluded) {
+        List<String> runtimeArgs = RuntimeArgs.parseVmArgs(raw);
 
-    assertThat(runtimeArgs).isNotNull().contains(expectedIncluded);
-  }
+        assertThat(runtimeArgs).isNotNull().contains(expectedIncluded);
+    }
 
-  @TableTest({
-    "scenario                     | raw                                                | isIncluded | vmArg                                             ",
-    "jaas login config excluded   | -Djava.security.auth.login.config=/etc/jaas.conf   | false      | -Djava.security.auth.login.config=/etc/jaas.conf  ",
-    "java socks password excluded | -Djava.net.socks.password=hunter2                  | false      | -Djava.net.socks.password=hunter2                 ",
-    "dd service excluded          | -Ddd.service=myapp                                 | false      | -Ddd.service=myapp                                ",
-    "dd trace enabled excluded    | -Ddd.trace.enabled=true                            | false      | -Ddd.trace.enabled=true                           ",
-    "dd pwd excluded              | -Ddd.db.pwd=hunter2                                | false      | -Ddd.db.pwd=hunter2                               ",
-    "dd passphrase excluded       | -Ddd.ssl.passphrase=topsecret                      | false      | -Ddd.ssl.passphrase=topsecret                     ",
-    "dd api key excluded          | -Ddd.api-key=deadbeef                              | false      | -Ddd.api-key=deadbeef                             ",
-    "dd app key excluded          | -Ddd.app-key=deadbeef                              | false      | -Ddd.app-key=deadbeef                             ",
-    "dd application key excluded  | -Ddd.application-key=deadbeef                      | false      | -Ddd.application-key=deadbeef                     ",
-    "java logging kept            | -Djava.util.logging.config.file=/opt/logging.props | true       | -Djava.util.logging.config.file=/opt/logging.props",
-    "osgi install kept            | -Dosgi.install.area=/opt/app                       | true       | -Dosgi.install.area=/opt/app                      "
-  })
-  public void testParseVmArgsExcludesSecretLikeSystemProperties(
-      String raw, boolean isIncluded, String vmArg) {
-    List<String> runtimeArgs = RuntimeArgs.parseVmArgs(raw);
+    @TableTest({
+      "scenario                     | raw                                                | isIncluded | vmArg                                             ",
+      "jaas login config excluded   | -Djava.security.auth.login.config=/etc/jaas.conf   | false      | -Djava.security.auth.login.config=/etc/jaas.conf  ",
+      "java socks password excluded | -Djava.net.socks.password=hunter2                  | false      | -Djava.net.socks.password=hunter2                 ",
+      "dd service excluded          | -Ddd.service=myapp                                 | false      | -Ddd.service=myapp                                ",
+      "dd trace enabled excluded    | -Ddd.trace.enabled=true                            | false      | -Ddd.trace.enabled=true                           ",
+      "dd pwd excluded              | -Ddd.db.pwd=hunter2                                | false      | -Ddd.db.pwd=hunter2                               ",
+      "dd passphrase excluded       | -Ddd.ssl.passphrase=topsecret                      | false      | -Ddd.ssl.passphrase=topsecret                     ",
+      "dd api key excluded          | -Ddd.api-key=deadbeef                              | false      | -Ddd.api-key=deadbeef                             ",
+      "dd app key excluded          | -Ddd.app-key=deadbeef                              | false      | -Ddd.app-key=deadbeef                             ",
+      "dd application key excluded  | -Ddd.application-key=deadbeef                      | false      | -Ddd.application-key=deadbeef                     ",
+      "java logging kept            | -Djava.util.logging.config.file=/opt/logging.props | true       | -Djava.util.logging.config.file=/opt/logging.props",
+      "osgi install kept            | -Dosgi.install.area=/opt/app                       | true       | -Dosgi.install.area=/opt/app                      "
+    })
+    public void testParseVmArgsExcludesSecretLikeSystemProperties(String raw, boolean isIncluded, String vmArg) {
+        List<String> runtimeArgs = RuntimeArgs.parseVmArgs(raw);
 
-    assertThat(runtimeArgs).isNotNull();
-    if (isIncluded) {
-      assertThat(runtimeArgs).contains(vmArg);
-    } else {
-      assertThat(runtimeArgs).doesNotContain(vmArg);
+        assertThat(runtimeArgs).isNotNull();
+        if (isIncluded) {
+            assertThat(runtimeArgs).contains(vmArg);
+        } else {
+            assertThat(runtimeArgs).doesNotContain(vmArg);
+        }
     }
-  }
 
-  @TableTest({
-    "scenario                    | resource                                | isIncluded | vmArg                                                                                                                                      ",
-    "truncated ibmj9 optionsfile | redacted-truncated-ibmj9-8-javacore.txt | true       | -Xoptionsfile=/opt/REDACTED/java/8.0/jre/lib/ppc64/compressedrefs/options.default                                                          ",
-    "truncated ibmj9 dd arg      | redacted-truncated-ibmj9-8-javacore.txt | false      | -Ddd.service=REDACTED                                                                                                                      ",
-    "truncated ibmj9 osgi arg    | redacted-truncated-ibmj9-8-javacore.txt | true       | -Dosgi.install.area=/opt/REDACTED                                                                                                          ",
-    "truncated ibmj9 status arg  | redacted-truncated-ibmj9-8-javacore.txt | false      | -Dwas.status.socket=REDACTED                                                                                                               ",
-    "truncated ibmj9 xtq arg     | redacted-truncated-ibmj9-8-javacore.txt | false      | -Dcom.ibm.xtq.processor.overrideSecureProcessing=true                                                                                      ",
-    "truncated ibmj9 command arg | redacted-truncated-ibmj9-8-javacore.txt | false      | -Dsun.java.command=com.ibm.wsspi.bootstrap.WSPreLauncher -nosplash -application com.ibm.ws.bootstrap.WSLauncher com.ibm.ws.runtime.WsServer"
-  })
-  public void testBuildFromJ9UserArgs(String resource, boolean isIncluded, String vmArg)
-      throws Exception {
-    RuntimeArgs runtimeArgsBuilder = new RuntimeArgs();
-    for (String arg : extractJ9UserArgs(resource)) {
-      runtimeArgsBuilder.addArg(arg);
-    }
-    List<String> runtimeArgs = runtimeArgsBuilder.build();
+    @TableTest({
+      "scenario                    | resource                                | isIncluded | vmArg                                                                                                                                      ",
+      "truncated ibmj9 optionsfile | redacted-truncated-ibmj9-8-javacore.txt | true       | -Xoptionsfile=/opt/REDACTED/java/8.0/jre/lib/ppc64/compressedrefs/options.default                                                          ",
+      "truncated ibmj9 dd arg      | redacted-truncated-ibmj9-8-javacore.txt | false      | -Ddd.service=REDACTED                                                                                                                      ",
+      "truncated ibmj9 osgi arg    | redacted-truncated-ibmj9-8-javacore.txt | true       | -Dosgi.install.area=/opt/REDACTED                                                                                                          ",
+      "truncated ibmj9 status arg  | redacted-truncated-ibmj9-8-javacore.txt | false      | -Dwas.status.socket=REDACTED                                                                                                               ",
+      "truncated ibmj9 xtq arg     | redacted-truncated-ibmj9-8-javacore.txt | false      | -Dcom.ibm.xtq.processor.overrideSecureProcessing=true                                                                                      ",
+      "truncated ibmj9 command arg | redacted-truncated-ibmj9-8-javacore.txt | false      | -Dsun.java.command=com.ibm.wsspi.bootstrap.WSPreLauncher -nosplash -application com.ibm.ws.bootstrap.WSLauncher com.ibm.ws.runtime.WsServer"
+    })
+    public void testBuildFromJ9UserArgs(String resource, boolean isIncluded, String vmArg) throws Exception {
+        RuntimeArgs runtimeArgsBuilder = new RuntimeArgs();
+        for (String arg : extractJ9UserArgs(resource)) {
+            runtimeArgsBuilder.addArg(arg);
+        }
+        List<String> runtimeArgs = runtimeArgsBuilder.build();
 
-    assertThat(runtimeArgs).isNotNull();
-    if (isIncluded) {
-      assertThat(runtimeArgs)
-          .as("Expected included arg fragment in %s", resource)
-          .anyMatch(arg -> arg.contains(vmArg));
-    } else {
-      assertThat(runtimeArgs)
-          .as("Expected excluded arg to be absent in %s", resource)
-          .doesNotContain(vmArg);
+        assertThat(runtimeArgs).isNotNull();
+        if (isIncluded) {
+            assertThat(runtimeArgs)
+                    .as("Expected included arg fragment in %s", resource)
+                    .anyMatch(arg -> arg.contains(vmArg));
+        } else {
+            assertThat(runtimeArgs)
+                    .as("Expected excluded arg to be absent in %s", resource)
+                    .doesNotContain(vmArg);
+        }
     }
-  }
 
-  private String extractHotspotJvmArgs(String resource) throws IOException {
-    for (String line : readFileAsString(resource).split("\n")) {
-      if (line.startsWith(HOTSPOT_JVM_ARGS_PREFIX)) {
-        return line.substring(HOTSPOT_JVM_ARGS_PREFIX.length()).trim();
-      }
+    private String extractHotspotJvmArgs(String resource) throws IOException {
+        for (String line : readFileAsString(resource).split("\n")) {
+            if (line.startsWith(HOTSPOT_JVM_ARGS_PREFIX)) {
+                return line.substring(HOTSPOT_JVM_ARGS_PREFIX.length()).trim();
+            }
+        }
+        throw new IllegalArgumentException("Missing jvm_args line in " + resource);
     }
-    throw new IllegalArgumentException("Missing jvm_args line in " + resource);
-  }
 
-  private List<String> extractJ9UserArgs(String resource) throws IOException {
-    return java.util.Arrays.stream(readFileAsString(resource).split("\n"))
-        .filter(line -> line.startsWith(J9_USER_ARG_PREFIX))
-        .map(line -> line.substring(J9_USER_ARG_PREFIX.length()).trim())
-        .collect(Collectors.toList());
-  }
+    private List<String> extractJ9UserArgs(String resource) throws IOException {
+        return java.util.Arrays.stream(readFileAsString(resource).split("\n"))
+                .filter(line -> line.startsWith(J9_USER_ARG_PREFIX))
+                .map(line -> line.substring(J9_USER_ARG_PREFIX.length()).trim())
+                .collect(Collectors.toList());
+    }
 
-  private String readFileAsString(String resource) throws IOException {
-    try (InputStream stream = getClass().getClassLoader().getResourceAsStream(resource)) {
-      return new BufferedReader(
-              new InputStreamReader(Objects.requireNonNull(stream), StandardCharsets.UTF_8))
-          .lines()
-          .collect(Collectors.joining("\n"));
+    private String readFileAsString(String resource) throws IOException {
+        try (InputStream stream = getClass().getClassLoader().getResourceAsStream(resource)) {
+            return new BufferedReader(new InputStreamReader(Objects.requireNonNull(stream), StandardCharsets.UTF_8))
+                    .lines()
+                    .collect(Collectors.joining("\n"));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java
index f758b39fdcb..0cf00a0eef8 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java
@@ -21,723 +21,708 @@
 
 /** Stores different kind of data (arguments, locals, fields, exception) for a specific location */
 public class CapturedContext implements ValueReferenceResolver {
-  public static final CapturedContext EMPTY_CONTEXT = new CapturedContext(null);
-  public static final CapturedContext EMPTY_CAPTURING_CONTEXT =
-      new CapturedContext(ProbeImplementation.UNKNOWN);
-  private final transient Map<String, CapturedValue> extensions = new HashMap<>();
-
-  private Map<String, CapturedValue> arguments;
-  private Map<String, CapturedValue> locals;
-  private CapturedThrowable throwable;
-  private Map<String, CapturedValue> staticFields;
-  private Limits limits = Limits.DEFAULT;
-  private String thisClassName;
-  private long duration;
-  private final Map<String, Status> statusByProbeId = new LinkedHashMap<>();
-  private Map<String, CapturedValue> captureExpressions;
-
-  public CapturedContext() {}
-
-  public CapturedContext(
-      CapturedValue[] arguments,
-      CapturedValue[] locals,
-      CapturedValue returnValue,
-      CapturedThrowable throwable) {
-    addArguments(arguments);
-    addLocals(locals);
-    addReturn(returnValue);
-    this.throwable = throwable;
-  }
-
-  private CapturedContext(CapturedContext other, Map<String, CapturedValue> extensions) {
-    this.arguments = other.arguments;
-    this.locals = other.getLocals();
-    this.throwable = other.throwable;
-    this.staticFields = other.staticFields;
-    this.limits = other.limits;
-    this.thisClassName = other.thisClassName;
-    this.duration = other.duration;
-    this.captureExpressions = other.captureExpressions;
-    this.extensions.putAll(other.extensions);
-    this.extensions.putAll(extensions);
-  }
-
-  // used for EMPTY_CONTEXT
-  private CapturedContext(ProbeImplementation probeImplementation) {
-    if (probeImplementation != null) {
-      this.statusByProbeId.put(
-          probeImplementation.getProbeId().getEncodedId(), probeImplementation.createStatus());
-    }
-  }
-
-  public long getDuration() {
-    return duration;
-  }
-
-  // Called by CapturedContext instrumentation
-  public boolean isCapturing() {
-    boolean result = false;
-    for (Status status : statusByProbeId.values()) {
-      result |= status.isCapturing();
-    }
-    result = result && DebuggerContext.checkAndSetInProbe();
-    return result;
-  }
-
-  @Override
-  public CapturedValue lookup(String name) {
-    if (name == null || name.isEmpty()) {
-      throw new IllegalArgumentException("empty name for lookup operation");
-    }
-    CapturedValue target;
-    if (name.startsWith(ValueReferences.SYNTHETIC_PREFIX)) {
-      String rawName = name.substring(ValueReferences.SYNTHETIC_PREFIX.length());
-      target = tryRetrieveSynthetic(rawName);
-      checkUndefined(target, rawName, "Cannot find synthetic var: ");
-    } else {
-      target = tryRetrieve(name);
-      checkUndefined(target, name, "Cannot find symbol: ");
-    }
-    return target;
-  }
-
-  private void checkUndefined(CapturedValue target, String name, String msg) {
-    if (target == CapturedValue.UNDEFINED || target.notCapturedReason != null) {
-      String errorMsg = msg + name;
-      throw new RuntimeException(errorMsg);
-    }
-  }
-
-  @Override
-  public CapturedValue getMember(Object target, String memberName) {
-    if (target == Values.UNDEFINED_OBJECT) {
-      return CapturedValue.UNDEFINED;
-    }
-    if (Redaction.isRedactedKeyword(memberName)) {
-      return CapturedValue.redacted(memberName, null);
-    }
-    CapturedValue result;
-    if (target instanceof CapturedValue) {
-      Map<String, CapturedValue> fields = ((CapturedValue) target).fields;
-      if (fields.containsKey(memberName)) {
-        result = fields.get(memberName);
-      } else {
-        CapturedValue capturedTarget = ((CapturedValue) target);
-        Object targetedValue = capturedTarget.getValue();
-        if (targetedValue != null) {
-          // resolve to a CapturedValue instance
-          result =
-              ReflectiveFieldValueResolver.getFieldAsCapturedValue(
-                  targetedValue.getClass(), targetedValue, memberName);
-        } else {
-          result = CapturedValue.UNDEFINED;
-        }
-      }
-    } else {
-      Map<String, Function<Object, CapturedValue>> specialTypeAccess =
-          WellKnownClasses.getSpecialTypeAccess(target);
-      if (specialTypeAccess != null) {
-        Function<Object, CapturedValue> specialFieldAccess = specialTypeAccess.get(memberName);
-        if (specialFieldAccess != null) {
-          CapturedValue specialField = specialFieldAccess.apply(target);
-          if (specialField != null && specialField.getName().equals(memberName)) {
-            return specialField;
-          }
-        }
-      }
-      result =
-          ReflectiveFieldValueResolver.getFieldAsCapturedValue(
-              target.getClass(), target, memberName);
-    }
-    checkUndefined(result, memberName, "Cannot dereference field: ");
-    return result;
-  }
-
-  private CapturedValue tryRetrieveSynthetic(String name) {
-    if (extensions == null || extensions.isEmpty()) {
-      return CapturedValue.UNDEFINED;
-    }
-    return extensions.getOrDefault(name, CapturedValue.UNDEFINED);
-  }
-
-  private CapturedValue tryRetrieve(String name) {
-    CapturedValue result = null;
-    if (arguments != null && !arguments.isEmpty()) {
-      result = arguments.get(name);
-    }
-    if (result != null) {
-      return result;
-    }
-    if (locals != null && !locals.isEmpty()) {
-      result = locals.get(name);
-    }
-    if (result != null) {
-      return result;
-    }
-    if (staticFields != null && !staticFields.isEmpty()) {
-      result = staticFields.get(name);
-    }
-    CapturedValue thisValue;
-    if (arguments != null && (thisValue = arguments.get("this")) != null) {
-      result = getMember(thisValue, name);
-      if (result != CapturedValue.UNDEFINED) {
-        return result;
-      }
+    public static final CapturedContext EMPTY_CONTEXT = new CapturedContext(null);
+    public static final CapturedContext EMPTY_CAPTURING_CONTEXT = new CapturedContext(ProbeImplementation.UNKNOWN);
+    private final transient Map<String, CapturedValue> extensions = new HashMap<>();
+
+    private Map<String, CapturedValue> arguments;
+    private Map<String, CapturedValue> locals;
+    private CapturedThrowable throwable;
+    private Map<String, CapturedValue> staticFields;
+    private Limits limits = Limits.DEFAULT;
+    private String thisClassName;
+    private long duration;
+    private final Map<String, Status> statusByProbeId = new LinkedHashMap<>();
+    private Map<String, CapturedValue> captureExpressions;
+
+    public CapturedContext() {}
+
+    public CapturedContext(
+            CapturedValue[] arguments, CapturedValue[] locals, CapturedValue returnValue, CapturedThrowable throwable) {
+        addArguments(arguments);
+        addLocals(locals);
+        addReturn(returnValue);
+        this.throwable = throwable;
+    }
+
+    private CapturedContext(CapturedContext other, Map<String, CapturedValue> extensions) {
+        this.arguments = other.arguments;
+        this.locals = other.getLocals();
+        this.throwable = other.throwable;
+        this.staticFields = other.staticFields;
+        this.limits = other.limits;
+        this.thisClassName = other.thisClassName;
+        this.duration = other.duration;
+        this.captureExpressions = other.captureExpressions;
+        this.extensions.putAll(other.extensions);
+        this.extensions.putAll(extensions);
+    }
+
+    // used for EMPTY_CONTEXT
+    private CapturedContext(ProbeImplementation probeImplementation) {
+        if (probeImplementation != null) {
+            this.statusByProbeId.put(
+                    probeImplementation.getProbeId().getEncodedId(), probeImplementation.createStatus());
+        }
     }
-    return result != null ? result : CapturedValue.UNDEFINED;
-  }
 
-  public CapturedContext copyWithoutCaptureExpressions() {
-    CapturedContext newContext = new CapturedContext(this, Collections.emptyMap());
-    if (newContext.captureExpressions != null) {
-      newContext.captureExpressions = null;
+    public long getDuration() {
+        return duration;
     }
-    return newContext;
-  }
-
-  @Override
-  public ValueReferenceResolver withExtensions(Map<String, CapturedValue> extensions) {
-    return new CapturedContext(this, extensions);
-  }
-
-  @Override
-  public void addExtension(String name, CapturedValue value) {
-    extensions.put(name, value);
-  }
-
-  @Override
-  public void removeExtension(String name) {
-    extensions.remove(name);
-  }
 
-  public void addArguments(CapturedValue[] values) {
-    if (values == null) {
-      return;
-    }
-    for (CapturedValue value : values) {
-      putInArguments(value.name, value);
+    // Called by CapturedContext instrumentation
+    public boolean isCapturing() {
+        boolean result = false;
+        for (Status status : statusByProbeId.values()) {
+            result |= status.isCapturing();
+        }
+        result = result && DebuggerContext.checkAndSetInProbe();
+        return result;
     }
-  }
-
-  public void addLocals(CapturedValue[] values) {
-    if (values == null) {
-      return;
-    }
-    for (CapturedValue value : values) {
-      putInLocals(value.name, value);
-    }
-  }
-
-  public void addReturn(CapturedValue retValue) {
-    if (retValue == null) {
-      return;
-    }
-    // special local name for the return value
-    putInLocals(ValueReferences.RETURN_REF, retValue);
-    extensions.put(ValueReferences.RETURN_EXTENSION_NAME, retValue);
-  }
-
-  public void addThrowable(Throwable t) {
-    addThrowable(new CapturedThrowable(t));
-    // special local name for throwable
-    CapturedValue capturedException = CapturedValue.of(t.getClass().getTypeName(), t);
-    putInLocals(ValueReferences.EXCEPTION_REF, capturedException);
-    extensions.put(ValueReferences.EXCEPTION_EXTENSION_NAME, capturedException);
-  }
-
-  public void addThrowable(CapturedThrowable capturedThrowable) {
-    this.throwable = capturedThrowable;
-  }
-
-  public void addStaticFields(CapturedValue[] values) {
-    if (values == null) {
-      return;
-    }
-    for (CapturedValue value : values) {
-      putInStaticFields(value.name, value);
-    }
-  }
-
-  public void setLimits(
-      int maxReferenceDepth, int maxCollectionSize, int maxLength, int maxFieldCount) {
-    this.limits = new Limits(maxReferenceDepth, maxCollectionSize, maxLength, maxFieldCount);
-  }
-
-  public Map<String, CapturedValue> getArguments() {
-    return arguments;
-  }
-
-  public Map<String, CapturedValue> getLocals() {
-    return locals;
-  }
-
-  public CapturedThrowable getCapturedThrowable() {
-    return throwable;
-  }
-
-  public Map<String, CapturedValue> getStaticFields() {
-    return staticFields;
-  }
-
-  public Map<String, CapturedValue> getCaptureExpressions() {
-    return captureExpressions;
-  }
-
-  public Limits getLimits() {
-    return limits;
-  }
-
-  public String getThisClassName() {
-    return thisClassName;
-  }
-
-  /**
-   * 'Freeze' the context. The contained arguments, locals and fields are converted from their Java
-   * instance representation into the corresponding string value.
-   */
-  public void freeze(TimeoutChecker timeoutChecker) {
-    if (captureExpressions != null) {
-      // freeze only capture expressions
-      captureExpressions.values().forEach(capturedValue -> capturedValue.freeze(timeoutChecker));
-      return;
-    }
-    if (arguments != null) {
-      arguments.values().forEach(capturedValue -> capturedValue.freeze(timeoutChecker));
-    }
-    if (locals != null) {
-      locals.values().forEach(capturedValue -> capturedValue.freeze(timeoutChecker));
-    }
-    if (staticFields != null) {
-      staticFields.values().forEach(capturedValue -> capturedValue.freeze(timeoutChecker));
-    }
-  }
-
-  public Status evaluate(
-      ProbeImplementation probeImplementation,
-      String thisClassName,
-      long startTimestamp,
-      MethodLocation methodLocation,
-      boolean singleProbe) {
-    Status status =
-        statusByProbeId.computeIfAbsent(
-            probeImplementation.getProbeId().getEncodedId(),
-            key -> probeImplementation.createStatus());
-    if (methodLocation == MethodLocation.EXIT && startTimestamp > 0) {
-      duration = System.nanoTime() - startTimestamp;
-      addExtension(
-          ValueReferences.DURATION_EXTENSION_NAME,
-          CapturedValue.of(duration / 1_000_000.0)); // convert to ms
-    }
-    this.thisClassName = thisClassName;
-    boolean shouldEvaluate =
-        MethodLocation.isSame(methodLocation, probeImplementation.getEvaluateAt());
-    if (shouldEvaluate) {
-      probeImplementation.evaluate(this, status, methodLocation, singleProbe);
-    }
-    return status;
-  }
-
-  public Status getStatus(String encodedProbeId) {
-    Status result = statusByProbeId.get(encodedProbeId);
-    if (result == null) {
-      result = statusByProbeId.get(ProbeImplementation.UNKNOWN.getProbeId().getEncodedId());
-      if (result == null) {
-        return Status.EMPTY_STATUS;
-      }
-    }
-    return result;
-  }
-
-  public Status getStatus(int probeIndex) {
-    ProbeImplementation probeImplementation = DebuggerContext.resolveProbe(probeIndex);
-    if (probeImplementation != null) {
-      return getStatus(probeImplementation.getProbeId().getEncodedId());
-    }
-    Status result = statusByProbeId.get(ProbeImplementation.UNKNOWN.getProbeId().getEncodedId());
-    if (result == null) {
-      return Status.EMPTY_STATUS;
-    }
-    return result;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    CapturedContext context = (CapturedContext) o;
-    return Objects.equals(arguments, context.arguments)
-        && Objects.equals(locals, context.locals)
-        && Objects.equals(staticFields, context.staticFields)
-        && Objects.equals(throwable, context.throwable);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arguments, locals, throwable, staticFields);
-  }
-
-  @Override
-  public String toString() {
-    return "CapturedContext{"
-        + "arguments="
-        + arguments
-        + ", locals="
-        + locals
-        + ", throwable="
-        + throwable
-        + ", staticFields="
-        + staticFields
-        + '}';
-  }
-
-  private void putInLocals(String name, CapturedValue value) {
-    if (locals == null) {
-      locals = new HashMap<>();
-    }
-    locals.put(name, value);
-  }
-
-  private void putInArguments(String name, CapturedValue value) {
-    if (arguments == null) {
-      arguments = new HashMap<>();
-    }
-    arguments.put(name, value);
-  }
-
-  private void putInStaticFields(String name, CapturedValue value) {
-    if (staticFields == null) {
-      staticFields = new HashMap<>();
-    }
-    staticFields.put(name, value);
-  }
-
-  public void addCaptureExpression(CapturedValue value) {
-    if (captureExpressions == null) {
-      captureExpressions = new HashMap<>();
-    }
-    captureExpressions.put(value.name, value);
-  }
-
-  public static class Status {
-    public static final Status EMPTY_STATUS = new Status(ProbeImplementation.UNKNOWN);
-    public static final Status EMPTY_CAPTURING_STATUS =
-        new Status(ProbeImplementation.UNKNOWN) {
-          @Override
-          public boolean isCapturing() {
-            return true;
-          }
-        };
-    private final List<EvaluationError> errors = new ArrayList<>();
-    protected final ProbeImplementation probeImplementation;
 
-    public Status(ProbeImplementation probeImplementation) {
-      this.probeImplementation = probeImplementation;
+    @Override
+    public CapturedValue lookup(String name) {
+        if (name == null || name.isEmpty()) {
+            throw new IllegalArgumentException("empty name for lookup operation");
+        }
+        CapturedValue target;
+        if (name.startsWith(ValueReferences.SYNTHETIC_PREFIX)) {
+            String rawName = name.substring(ValueReferences.SYNTHETIC_PREFIX.length());
+            target = tryRetrieveSynthetic(rawName);
+            checkUndefined(target, rawName, "Cannot find synthetic var: ");
+        } else {
+            target = tryRetrieve(name);
+            checkUndefined(target, name, "Cannot find symbol: ");
+        }
+        return target;
     }
 
-    public List<EvaluationError> getErrors() {
-      return errors;
+    private void checkUndefined(CapturedValue target, String name, String msg) {
+        if (target == CapturedValue.UNDEFINED || target.notCapturedReason != null) {
+            String errorMsg = msg + name;
+            throw new RuntimeException(errorMsg);
+        }
     }
 
-    public void addError(EvaluationError evaluationError) {
-      errors.add(evaluationError);
+    @Override
+    public CapturedValue getMember(Object target, String memberName) {
+        if (target == Values.UNDEFINED_OBJECT) {
+            return CapturedValue.UNDEFINED;
+        }
+        if (Redaction.isRedactedKeyword(memberName)) {
+            return CapturedValue.redacted(memberName, null);
+        }
+        CapturedValue result;
+        if (target instanceof CapturedValue) {
+            Map<String, CapturedValue> fields = ((CapturedValue) target).fields;
+            if (fields.containsKey(memberName)) {
+                result = fields.get(memberName);
+            } else {
+                CapturedValue capturedTarget = ((CapturedValue) target);
+                Object targetedValue = capturedTarget.getValue();
+                if (targetedValue != null) {
+                    // resolve to a CapturedValue instance
+                    result = ReflectiveFieldValueResolver.getFieldAsCapturedValue(
+                            targetedValue.getClass(), targetedValue, memberName);
+                } else {
+                    result = CapturedValue.UNDEFINED;
+                }
+            }
+        } else {
+            Map<String, Function<Object, CapturedValue>> specialTypeAccess =
+                    WellKnownClasses.getSpecialTypeAccess(target);
+            if (specialTypeAccess != null) {
+                Function<Object, CapturedValue> specialFieldAccess = specialTypeAccess.get(memberName);
+                if (specialFieldAccess != null) {
+                    CapturedValue specialField = specialFieldAccess.apply(target);
+                    if (specialField != null && specialField.getName().equals(memberName)) {
+                        return specialField;
+                    }
+                }
+            }
+            result = ReflectiveFieldValueResolver.getFieldAsCapturedValue(target.getClass(), target, memberName);
+        }
+        checkUndefined(result, memberName, "Cannot dereference field: ");
+        return result;
     }
 
-    public boolean shouldFreezeContext() {
-      return false;
+    private CapturedValue tryRetrieveSynthetic(String name) {
+        if (extensions == null || extensions.isEmpty()) {
+            return CapturedValue.UNDEFINED;
+        }
+        return extensions.getOrDefault(name, CapturedValue.UNDEFINED);
     }
 
-    public boolean isCapturing() {
-      return false;
+    private CapturedValue tryRetrieve(String name) {
+        CapturedValue result = null;
+        if (arguments != null && !arguments.isEmpty()) {
+            result = arguments.get(name);
+        }
+        if (result != null) {
+            return result;
+        }
+        if (locals != null && !locals.isEmpty()) {
+            result = locals.get(name);
+        }
+        if (result != null) {
+            return result;
+        }
+        if (staticFields != null && !staticFields.isEmpty()) {
+            result = staticFields.get(name);
+        }
+        CapturedValue thisValue;
+        if (arguments != null && (thisValue = arguments.get("this")) != null) {
+            result = getMember(thisValue, name);
+            if (result != CapturedValue.UNDEFINED) {
+                return result;
+            }
+        }
+        return result != null ? result : CapturedValue.UNDEFINED;
     }
-  }
 
-  /** Stores a captured value */
-  public static class CapturedValue {
-    public static final CapturedValue UNDEFINED = CapturedValue.of(Values.UNDEFINED_OBJECT);
-
-    private String name;
-    private final String declaredType;
-    private final String type;
-    private Object value;
-    private String strValue;
-    private final Map<String, CapturedValue> fields;
-    private final Limits limits;
-    private TimeoutChecker timeoutChecker;
-    private final String notCapturedReason;
+    public CapturedContext copyWithoutCaptureExpressions() {
+        CapturedContext newContext = new CapturedContext(this, Collections.emptyMap());
+        if (newContext.captureExpressions != null) {
+            newContext.captureExpressions = null;
+        }
+        return newContext;
+    }
 
-    private CapturedValue(
-        String name,
-        String declaredType,
-        Object value,
-        Limits limits,
-        Map<String, CapturedValue> fields,
-        String notCapturedReason) {
-      this.name = name;
-      this.declaredType = declaredType;
-      this.type =
-          value != null && !isPrimitive(declaredType)
-              ? value.getClass().getTypeName()
-              : declaredType;
-      this.value = value;
-      this.fields = fields == null ? Collections.emptyMap() : fields;
-      this.limits = limits;
-      this.notCapturedReason = notCapturedReason;
+    @Override
+    public ValueReferenceResolver withExtensions(Map<String, CapturedValue> extensions) {
+        return new CapturedContext(this, extensions);
     }
 
-    public boolean isResolved() {
-      return true;
+    @Override
+    public void addExtension(String name, CapturedValue value) {
+        extensions.put(name, value);
     }
 
-    public String getName() {
-      return name;
+    @Override
+    public void removeExtension(String name) {
+        extensions.remove(name);
     }
 
-    public String getDeclaredType() {
-      return declaredType;
+    public void addArguments(CapturedValue[] values) {
+        if (values == null) {
+            return;
+        }
+        for (CapturedValue value : values) {
+            putInArguments(value.name, value);
+        }
     }
 
-    public String getType() {
-      return type;
+    public void addLocals(CapturedValue[] values) {
+        if (values == null) {
+            return;
+        }
+        for (CapturedValue value : values) {
+            putInLocals(value.name, value);
+        }
     }
 
-    public Object getValue() {
-      return value;
+    public void addReturn(CapturedValue retValue) {
+        if (retValue == null) {
+            return;
+        }
+        // special local name for the return value
+        putInLocals(ValueReferences.RETURN_REF, retValue);
+        extensions.put(ValueReferences.RETURN_EXTENSION_NAME, retValue);
     }
 
-    public String getStrValue() {
-      return strValue;
+    public void addThrowable(Throwable t) {
+        addThrowable(new CapturedThrowable(t));
+        // special local name for throwable
+        CapturedValue capturedException = CapturedValue.of(t.getClass().getTypeName(), t);
+        putInLocals(ValueReferences.EXCEPTION_REF, capturedException);
+        extensions.put(ValueReferences.EXCEPTION_EXTENSION_NAME, capturedException);
     }
 
-    public Map<String, CapturedValue> getFields() {
-      return fields;
+    public void addThrowable(CapturedThrowable capturedThrowable) {
+        this.throwable = capturedThrowable;
     }
 
-    public Limits getLimits() {
-      return limits;
+    public void addStaticFields(CapturedValue[] values) {
+        if (values == null) {
+            return;
+        }
+        for (CapturedValue value : values) {
+            putInStaticFields(value.name, value);
+        }
     }
 
-    public String getNotCapturedReason() {
-      return notCapturedReason;
+    public void setLimits(int maxReferenceDepth, int maxCollectionSize, int maxLength, int maxFieldCount) {
+        this.limits = new Limits(maxReferenceDepth, maxCollectionSize, maxLength, maxFieldCount);
     }
 
-    public void setName(String name) {
-      this.name = name;
+    public Map<String, CapturedValue> getArguments() {
+        return arguments;
     }
 
-    public static CapturedValue of(Object value) {
-      return of(null, value);
+    public Map<String, CapturedValue> getLocals() {
+        return locals;
     }
 
-    public static CapturedValue of(String declaredType, Object value) {
-      return build(null, declaredType, value, Limits.DEFAULT, null);
+    public CapturedThrowable getCapturedThrowable() {
+        return throwable;
     }
 
-    public static CapturedValue of(String name, String declaredType, Object value) {
-      return build(name, declaredType, value, Limits.DEFAULT, null);
+    public Map<String, CapturedValue> getStaticFields() {
+        return staticFields;
     }
 
-    public static CapturedValue of(
-        String name,
-        String declaredType,
-        Object value,
-        int maxReferenceDepth,
-        int maxCollectionSize,
-        int maxLength,
-        int maxFieldCount) {
-      return build(
-          name,
-          declaredType,
-          value,
-          new Limits(maxReferenceDepth, maxCollectionSize, maxLength, maxFieldCount),
-          null);
+    public Map<String, CapturedValue> getCaptureExpressions() {
+        return captureExpressions;
     }
 
-    public static CapturedValue redacted(String name, String type) {
-      return build(name, type, REDACTED_VALUE, Limits.DEFAULT, null);
+    public Limits getLimits() {
+        return limits;
     }
 
-    public static CapturedValue notCapturedReason(String name, String type, String reason) {
-      return build(name, type, null, Limits.DEFAULT, reason);
+    public String getThisClassName() {
+        return thisClassName;
     }
 
-    public static CapturedValue raw(String type, Object value, String notCapturedReason) {
-      return new CapturedValue(
-          null, type, value, Limits.DEFAULT, Collections.emptyMap(), notCapturedReason);
+    /**
+     * 'Freeze' the context. The contained arguments, locals and fields are converted from their Java
+     * instance representation into the corresponding string value.
+     */
+    public void freeze(TimeoutChecker timeoutChecker) {
+        if (captureExpressions != null) {
+            // freeze only capture expressions
+            captureExpressions.values().forEach(capturedValue -> capturedValue.freeze(timeoutChecker));
+            return;
+        }
+        if (arguments != null) {
+            arguments.values().forEach(capturedValue -> capturedValue.freeze(timeoutChecker));
+        }
+        if (locals != null) {
+            locals.values().forEach(capturedValue -> capturedValue.freeze(timeoutChecker));
+        }
+        if (staticFields != null) {
+            staticFields.values().forEach(capturedValue -> capturedValue.freeze(timeoutChecker));
+        }
     }
 
-    public static CapturedValue raw(
-        String name,
-        String type,
-        Object value,
-        Limits limits,
-        Map<String, CapturedValue> fields,
-        String notCapturedReason) {
-      return new CapturedValue(name, type, value, limits, fields, notCapturedReason);
+    public Status evaluate(
+            ProbeImplementation probeImplementation,
+            String thisClassName,
+            long startTimestamp,
+            MethodLocation methodLocation,
+            boolean singleProbe) {
+        Status status = statusByProbeId.computeIfAbsent(
+                probeImplementation.getProbeId().getEncodedId(), key -> probeImplementation.createStatus());
+        if (methodLocation == MethodLocation.EXIT && startTimestamp > 0) {
+            duration = System.nanoTime() - startTimestamp;
+            addExtension(
+                    ValueReferences.DURATION_EXTENSION_NAME, CapturedValue.of(duration / 1_000_000.0)); // convert to ms
+        }
+        this.thisClassName = thisClassName;
+        boolean shouldEvaluate = MethodLocation.isSame(methodLocation, probeImplementation.getEvaluateAt());
+        if (shouldEvaluate) {
+            probeImplementation.evaluate(this, status, methodLocation, singleProbe);
+        }
+        return status;
     }
 
-    private static CapturedValue build(
-        String name, String declaredType, Object value, Limits limits, String notCapturedReason) {
-      CapturedValue val =
-          new CapturedValue(
-              name, declaredType, value, limits, Collections.emptyMap(), notCapturedReason);
-      return val;
+    public Status getStatus(String encodedProbeId) {
+        Status result = statusByProbeId.get(encodedProbeId);
+        if (result == null) {
+            result =
+                    statusByProbeId.get(ProbeImplementation.UNKNOWN.getProbeId().getEncodedId());
+            if (result == null) {
+                return Status.EMPTY_STATUS;
+            }
+        }
+        return result;
     }
 
-    public void freeze(TimeoutChecker timeoutChecker) {
-      if (this.strValue != null) {
-        // already frozen
-        return;
-      }
-      this.timeoutChecker = timeoutChecker;
-      this.strValue = DebuggerContext.serializeValue(this);
-      if (this.strValue != null) {
-        // if serialization has happened, release the value object
-        this.value = null;
-      }
-    }
-
-    private static boolean isPrimitive(String type) {
-      if (type == null) {
-        return false;
-      }
-      switch (type) {
-        case "byte":
-        case "short":
-        case "char":
-        case "int":
-        case "long":
-        case "boolean":
-        case "float":
-        case "double":
-          return true;
-      }
-      return false;
+    public Status getStatus(int probeIndex) {
+        ProbeImplementation probeImplementation = DebuggerContext.resolveProbe(probeIndex);
+        if (probeImplementation != null) {
+            return getStatus(probeImplementation.getProbeId().getEncodedId());
+        }
+        Status result =
+                statusByProbeId.get(ProbeImplementation.UNKNOWN.getProbeId().getEncodedId());
+        if (result == null) {
+            return Status.EMPTY_STATUS;
+        }
+        return result;
     }
 
     @Override
     public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      CapturedValue that = (CapturedValue) o;
-      return Objects.equals(name, that.name)
-          && Objects.equals(declaredType, that.declaredType)
-          && Objects.equals(value, that.value)
-          && Objects.equals(fields, that.fields)
-          && Objects.equals(notCapturedReason, that.notCapturedReason);
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        CapturedContext context = (CapturedContext) o;
+        return Objects.equals(arguments, context.arguments)
+                && Objects.equals(locals, context.locals)
+                && Objects.equals(staticFields, context.staticFields)
+                && Objects.equals(throwable, context.throwable);
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(name, declaredType, value, fields, notCapturedReason);
+        return Objects.hash(arguments, locals, throwable, staticFields);
     }
 
     @Override
     public String toString() {
-      return "CapturedValue{"
-          + "name='"
-          + name
-          + '\''
-          + ", type='"
-          + declaredType
-          + '\''
-          + ", value='"
-          + value
-          + '\''
-          + ", fields="
-          + fields
-          + ", notCapturedReason='"
-          + notCapturedReason
-          + '\''
-          + '}';
-    }
-
-    public TimeoutChecker getTimeoutChecker() {
-      return timeoutChecker;
-    }
-  }
-
-  /** Stores an captured exception */
-  public static class CapturedThrowable {
-    private final String type;
-    private final String message;
-    private final transient WeakReference<Throwable> throwable;
-
-    /*
-     * Need to exclude stacktrace from equals/hashCode computation.
-     * It is making equal-based testing very difficult and in fact it is not really necessary.
-     */
-    private final List<CapturedStackFrame> stacktrace;
-
-    public CapturedThrowable(Throwable throwable) {
-      this(
-          throwable.getClass().getTypeName(),
-          throwable.getLocalizedMessage(),
-          captureFrames(throwable.getStackTrace()),
-          throwable);
+        return "CapturedContext{"
+                + "arguments="
+                + arguments
+                + ", locals="
+                + locals
+                + ", throwable="
+                + throwable
+                + ", staticFields="
+                + staticFields
+                + '}';
+    }
+
+    private void putInLocals(String name, CapturedValue value) {
+        if (locals == null) {
+            locals = new HashMap<>();
+        }
+        locals.put(name, value);
     }
 
-    public CapturedThrowable(
-        String type, String message, List<CapturedStackFrame> stacktrace, Throwable t) {
-      this.type = type;
-      this.message = message;
-      this.stacktrace = new ArrayList<>(stacktrace);
-      this.throwable = new WeakReference<>(t);
+    private void putInArguments(String name, CapturedValue value) {
+        if (arguments == null) {
+            arguments = new HashMap<>();
+        }
+        arguments.put(name, value);
     }
 
-    public String getType() {
-      return type;
+    private void putInStaticFields(String name, CapturedValue value) {
+        if (staticFields == null) {
+            staticFields = new HashMap<>();
+        }
+        staticFields.put(name, value);
     }
 
-    public String getMessage() {
-      return message;
+    public void addCaptureExpression(CapturedValue value) {
+        if (captureExpressions == null) {
+            captureExpressions = new HashMap<>();
+        }
+        captureExpressions.put(value.name, value);
     }
 
-    public List<CapturedStackFrame> getStacktrace() {
-      return stacktrace;
-    }
+    public static class Status {
+        public static final Status EMPTY_STATUS = new Status(ProbeImplementation.UNKNOWN);
+        public static final Status EMPTY_CAPTURING_STATUS = new Status(ProbeImplementation.UNKNOWN) {
+            @Override
+            public boolean isCapturing() {
+                return true;
+            }
+        };
+        private final List<EvaluationError> errors = new ArrayList<>();
+        protected final ProbeImplementation probeImplementation;
 
-    public Throwable getThrowable() {
-      return throwable.get();
-    }
+        public Status(ProbeImplementation probeImplementation) {
+            this.probeImplementation = probeImplementation;
+        }
 
-    private static List<CapturedStackFrame> captureFrames(StackTraceElement[] stackTrace) {
-      if (stackTrace == null) {
-        return Collections.emptyList();
-      }
-      List<CapturedStackFrame> capturedFrames = new ArrayList<>(stackTrace.length);
-      for (StackTraceElement element : stackTrace) {
-        capturedFrames.add(CapturedStackFrame.from(element));
-      }
-      return capturedFrames;
-    }
+        public List<EvaluationError> getErrors() {
+            return errors;
+        }
 
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      CapturedThrowable that = (CapturedThrowable) o;
-      return Objects.equals(type, that.type)
-          && Objects.equals(message, that.message)
-          && Objects.equals(stacktrace, that.stacktrace);
+        public void addError(EvaluationError evaluationError) {
+            errors.add(evaluationError);
+        }
+
+        public boolean shouldFreezeContext() {
+            return false;
+        }
+
+        public boolean isCapturing() {
+            return false;
+        }
     }
 
-    @Override
-    public int hashCode() {
-      return Objects.hash(type, message, stacktrace);
+    /** Stores a captured value */
+    public static class CapturedValue {
+        public static final CapturedValue UNDEFINED = CapturedValue.of(Values.UNDEFINED_OBJECT);
+
+        private String name;
+        private final String declaredType;
+        private final String type;
+        private Object value;
+        private String strValue;
+        private final Map<String, CapturedValue> fields;
+        private final Limits limits;
+        private TimeoutChecker timeoutChecker;
+        private final String notCapturedReason;
+
+        private CapturedValue(
+                String name,
+                String declaredType,
+                Object value,
+                Limits limits,
+                Map<String, CapturedValue> fields,
+                String notCapturedReason) {
+            this.name = name;
+            this.declaredType = declaredType;
+            this.type = value != null && !isPrimitive(declaredType)
+                    ? value.getClass().getTypeName()
+                    : declaredType;
+            this.value = value;
+            this.fields = fields == null ? Collections.emptyMap() : fields;
+            this.limits = limits;
+            this.notCapturedReason = notCapturedReason;
+        }
+
+        public boolean isResolved() {
+            return true;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getDeclaredType() {
+            return declaredType;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public String getStrValue() {
+            return strValue;
+        }
+
+        public Map<String, CapturedValue> getFields() {
+            return fields;
+        }
+
+        public Limits getLimits() {
+            return limits;
+        }
+
+        public String getNotCapturedReason() {
+            return notCapturedReason;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public static CapturedValue of(Object value) {
+            return of(null, value);
+        }
+
+        public static CapturedValue of(String declaredType, Object value) {
+            return build(null, declaredType, value, Limits.DEFAULT, null);
+        }
+
+        public static CapturedValue of(String name, String declaredType, Object value) {
+            return build(name, declaredType, value, Limits.DEFAULT, null);
+        }
+
+        public static CapturedValue of(
+                String name,
+                String declaredType,
+                Object value,
+                int maxReferenceDepth,
+                int maxCollectionSize,
+                int maxLength,
+                int maxFieldCount) {
+            return build(
+                    name,
+                    declaredType,
+                    value,
+                    new Limits(maxReferenceDepth, maxCollectionSize, maxLength, maxFieldCount),
+                    null);
+        }
+
+        public static CapturedValue redacted(String name, String type) {
+            return build(name, type, REDACTED_VALUE, Limits.DEFAULT, null);
+        }
+
+        public static CapturedValue notCapturedReason(String name, String type, String reason) {
+            return build(name, type, null, Limits.DEFAULT, reason);
+        }
+
+        public static CapturedValue raw(String type, Object value, String notCapturedReason) {
+            return new CapturedValue(null, type, value, Limits.DEFAULT, Collections.emptyMap(), notCapturedReason);
+        }
+
+        public static CapturedValue raw(
+                String name,
+                String type,
+                Object value,
+                Limits limits,
+                Map<String, CapturedValue> fields,
+                String notCapturedReason) {
+            return new CapturedValue(name, type, value, limits, fields, notCapturedReason);
+        }
+
+        private static CapturedValue build(
+                String name, String declaredType, Object value, Limits limits, String notCapturedReason) {
+            CapturedValue val =
+                    new CapturedValue(name, declaredType, value, limits, Collections.emptyMap(), notCapturedReason);
+            return val;
+        }
+
+        public void freeze(TimeoutChecker timeoutChecker) {
+            if (this.strValue != null) {
+                // already frozen
+                return;
+            }
+            this.timeoutChecker = timeoutChecker;
+            this.strValue = DebuggerContext.serializeValue(this);
+            if (this.strValue != null) {
+                // if serialization has happened, release the value object
+                this.value = null;
+            }
+        }
+
+        private static boolean isPrimitive(String type) {
+            if (type == null) {
+                return false;
+            }
+            switch (type) {
+                case "byte":
+                case "short":
+                case "char":
+                case "int":
+                case "long":
+                case "boolean":
+                case "float":
+                case "double":
+                    return true;
+            }
+            return false;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            CapturedValue that = (CapturedValue) o;
+            return Objects.equals(name, that.name)
+                    && Objects.equals(declaredType, that.declaredType)
+                    && Objects.equals(value, that.value)
+                    && Objects.equals(fields, that.fields)
+                    && Objects.equals(notCapturedReason, that.notCapturedReason);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(name, declaredType, value, fields, notCapturedReason);
+        }
+
+        @Override
+        public String toString() {
+            return "CapturedValue{"
+                    + "name='"
+                    + name
+                    + '\''
+                    + ", type='"
+                    + declaredType
+                    + '\''
+                    + ", value='"
+                    + value
+                    + '\''
+                    + ", fields="
+                    + fields
+                    + ", notCapturedReason='"
+                    + notCapturedReason
+                    + '\''
+                    + '}';
+        }
+
+        public TimeoutChecker getTimeoutChecker() {
+            return timeoutChecker;
+        }
     }
 
-    @Override
-    public String toString() {
-      return "CapturedThrowable{"
-          + "type='"
-          + type
-          + '\''
-          + ", message='"
-          + message
-          + '\''
-          + ", stacktrace="
-          + stacktrace
-          + '}';
-    }
-  }
+    /** Stores an captured exception */
+    public static class CapturedThrowable {
+        private final String type;
+        private final String message;
+        private final transient WeakReference<Throwable> throwable;
+
+        /*
+         * Need to exclude stacktrace from equals/hashCode computation.
+         * It is making equal-based testing very difficult and in fact it is not really necessary.
+         */
+        private final List<CapturedStackFrame> stacktrace;
+
+        public CapturedThrowable(Throwable throwable) {
+            this(
+                    throwable.getClass().getTypeName(),
+                    throwable.getLocalizedMessage(),
+                    captureFrames(throwable.getStackTrace()),
+                    throwable);
+        }
+
+        public CapturedThrowable(String type, String message, List<CapturedStackFrame> stacktrace, Throwable t) {
+            this.type = type;
+            this.message = message;
+            this.stacktrace = new ArrayList<>(stacktrace);
+            this.throwable = new WeakReference<>(t);
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public List<CapturedStackFrame> getStacktrace() {
+            return stacktrace;
+        }
+
+        public Throwable getThrowable() {
+            return throwable.get();
+        }
+
+        private static List<CapturedStackFrame> captureFrames(StackTraceElement[] stackTrace) {
+            if (stackTrace == null) {
+                return Collections.emptyList();
+            }
+            List<CapturedStackFrame> capturedFrames = new ArrayList<>(stackTrace.length);
+            for (StackTraceElement element : stackTrace) {
+                capturedFrames.add(CapturedStackFrame.from(element));
+            }
+            return capturedFrames;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            CapturedThrowable that = (CapturedThrowable) o;
+            return Objects.equals(type, that.type)
+                    && Objects.equals(message, that.message)
+                    && Objects.equals(stacktrace, that.stacktrace);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(type, message, stacktrace);
+        }
+
+        @Override
+        public String toString() {
+            return "CapturedThrowable{"
+                    + "type='"
+                    + type
+                    + '\''
+                    + ", message='"
+                    + message
+                    + '\''
+                    + ", stacktrace="
+                    + stacktrace
+                    + '}';
+        }
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContextProbe.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContextProbe.java
index d9e7f34b066..f2717fff7a8 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContextProbe.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContextProbe.java
@@ -1,9 +1,9 @@
 package datadog.trace.bootstrap.debugger;
 
 public interface CapturedContextProbe {
-  boolean isCaptureSnapshot();
+    boolean isCaptureSnapshot();
 
-  boolean hasCondition();
+    boolean hasCondition();
 
-  boolean isReadyToCapture();
+    boolean isReadyToCapture();
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedStackFrame.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedStackFrame.java
index df2ca17a1df..3291cd35ce1 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedStackFrame.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedStackFrame.java
@@ -2,67 +2,66 @@
 
 /** Stores information of a stacktrace's frame */
 public class CapturedStackFrame {
-  private final String fileName;
-  private final String function;
-  private final int lineNumber;
+    private final String fileName;
+    private final String function;
+    private final int lineNumber;
 
-  public CapturedStackFrame(String fileName, String function, int lineNumber) {
-    this.fileName = fileName;
-    this.function = function;
-    this.lineNumber = lineNumber;
-  }
+    public CapturedStackFrame(String fileName, String function, int lineNumber) {
+        this.fileName = fileName;
+        this.function = function;
+        this.lineNumber = lineNumber;
+    }
 
-  public CapturedStackFrame(String function, int lineNumber) {
-    this(null, function, lineNumber);
-  }
+    public CapturedStackFrame(String function, int lineNumber) {
+        this(null, function, lineNumber);
+    }
 
-  public static CapturedStackFrame from(StackTraceElement element) {
-    return new CapturedStackFrame(
-        element.getFileName(), getFunction(element), element.getLineNumber());
-  }
+    public static CapturedStackFrame from(StackTraceElement element) {
+        return new CapturedStackFrame(element.getFileName(), getFunction(element), element.getLineNumber());
+    }
 
-  private static String getFunction(StackTraceElement element) {
-    return element.getClassName() + "." + element.getMethodName();
-  }
+    private static String getFunction(StackTraceElement element) {
+        return element.getClassName() + "." + element.getMethodName();
+    }
 
-  public String getFileName() {
-    return fileName;
-  }
+    public String getFileName() {
+        return fileName;
+    }
 
-  public String getFunction() {
-    return function;
-  }
+    public String getFunction() {
+        return function;
+    }
 
-  public int getLineNumber() {
-    return lineNumber;
-  }
+    public int getLineNumber() {
+        return lineNumber;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    CapturedStackFrame that = (CapturedStackFrame) o;
-    return lineNumber == that.lineNumber
-        && java.util.Objects.equals(fileName, that.fileName)
-        && java.util.Objects.equals(function, that.function);
-  }
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        CapturedStackFrame that = (CapturedStackFrame) o;
+        return lineNumber == that.lineNumber
+                && java.util.Objects.equals(fileName, that.fileName)
+                && java.util.Objects.equals(function, that.function);
+    }
 
-  @Override
-  public int hashCode() {
-    return java.util.Objects.hash(fileName, function, lineNumber);
-  }
+    @Override
+    public int hashCode() {
+        return java.util.Objects.hash(fileName, function, lineNumber);
+    }
 
-  @Override
-  public String toString() {
-    return "CapturedStackFrame{"
-        + "fileName='"
-        + fileName
-        + '\''
-        + ", function='"
-        + function
-        + '\''
-        + ", lineNumber="
-        + lineNumber
-        + '}';
-  }
+    @Override
+    public String toString() {
+        return "CapturedStackFrame{"
+                + "fileName='"
+                + fileName
+                + '\''
+                + ", function='"
+                + function
+                + '\''
+                + ", lineNumber="
+                + lineNumber
+                + '}';
+    }
 }
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 cb2c204a7e8..675403163c5 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
@@ -18,511 +18,490 @@
  * accessible from instrumented code
  */
 public class DebuggerContext {
-  private static final Logger LOGGER = LoggerFactory.getLogger(DebuggerContext.class);
-  private static final ThreadLocal<Boolean> IN_PROBE = ThreadLocal.withInitial(() -> Boolean.FALSE);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DebuggerContext.class);
+    private static final ThreadLocal<Boolean> IN_PROBE = ThreadLocal.withInitial(() -> Boolean.FALSE);
 
-  public interface ProbeResolver {
-    ProbeImplementation resolve(int probeIndex);
-  }
+    public interface ProbeResolver {
+        ProbeImplementation resolve(int probeIndex);
+    }
+
+    public interface ClassFilter {
+        boolean isDenied(String fullyQualifiedClassName);
+    }
+
+    public interface ClassNameFilter {
+        boolean isExcluded(String className);
+    }
+
+    public enum MetricKind {
+        COUNT,
+        GAUGE,
+        HISTOGRAM,
+        DISTRIBUTION
+    }
+
+    public interface MetricForwarder {
+        void count(String encodedProbeId, String name, long delta, String[] tags);
+
+        void gauge(String encodedProbeId, String name, long value, String[] tags);
+
+        void gauge(String encodedProbeId, String name, double value, String[] tags);
+
+        void histogram(String encodedProbeId, String name, long value, String[] tags);
+
+        void histogram(String encodedProbeId, String name, double value, String[] tags);
+
+        void distribution(String encodedProbeId, String name, long value, String[] tags);
 
-  public interface ClassFilter {
-    boolean isDenied(String fullyQualifiedClassName);
-  }
+        void distribution(String encodedProbeId, String name, double value, String[] tags);
+    }
 
-  public interface ClassNameFilter {
-    boolean isExcluded(String className);
-  }
+    public interface Tracer {
+        DebuggerSpan createSpan(String encodedProbeId, String resourceName, String[] tags);
+    }
 
-  public enum MetricKind {
-    COUNT,
-    GAUGE,
-    HISTOGRAM,
-    DISTRIBUTION
-  }
+    public interface ValueSerializer {
+        String serializeValue(CapturedContext.CapturedValue value);
+    }
 
-  public interface MetricForwarder {
-    void count(String encodedProbeId, String name, long delta, String[] tags);
-
-    void gauge(String encodedProbeId, String name, long value, String[] tags);
-
-    void gauge(String encodedProbeId, String name, double value, String[] tags);
-
-    void histogram(String encodedProbeId, String name, long value, String[] tags);
-
-    void histogram(String encodedProbeId, String name, double value, String[] tags);
-
-    void distribution(String encodedProbeId, String name, long value, String[] tags);
-
-    void distribution(String encodedProbeId, String name, double value, String[] tags);
-  }
-
-  public interface Tracer {
-    DebuggerSpan createSpan(String encodedProbeId, String resourceName, String[] tags);
-  }
-
-  public interface ValueSerializer {
-    String serializeValue(CapturedContext.CapturedValue value);
-  }
-
-  public interface ExceptionDebugger {
-    void handleException(Throwable t, AgentSpan span);
-  }
-
-  public interface CodeOriginRecorder {
-    String captureCodeOrigin(boolean entry);
-
-    String captureCodeOrigin(String typeName, String methodName, String descriptor, boolean entry);
-  }
-
-  private static volatile ProbeResolver probeResolver;
-  private static volatile ClassFilter classFilter;
-  private static volatile ClassNameFilter classNameFilter;
-  private static volatile MetricForwarder metricForwarder;
-  private static volatile Tracer tracer;
-  private static volatile ValueSerializer valueSerializer;
-  private static volatile ExceptionDebugger exceptionDebugger;
-  private static volatile CodeOriginRecorder codeOriginRecorder;
-
-  public static void initProbeResolver(ProbeResolver probeResolver) {
-    DebuggerContext.probeResolver = probeResolver;
-  }
-
-  public static void initMetricForwarder(MetricForwarder metricForwarder) {
-    DebuggerContext.metricForwarder = metricForwarder;
-  }
-
-  public static void initTracer(Tracer tracer) {
-    DebuggerContext.tracer = tracer;
-  }
-
-  public static void initClassFilter(ClassFilter classFilter) {
-    DebuggerContext.classFilter = classFilter;
-  }
-
-  public static void initClassNameFilter(ClassNameFilter classNameFilter) {
-    DebuggerContext.classNameFilter = classNameFilter;
-  }
-
-  public static void initValueSerializer(ValueSerializer valueSerializer) {
-    DebuggerContext.valueSerializer = valueSerializer;
-  }
-
-  public static void initExceptionDebugger(ExceptionDebugger exceptionDebugger) {
-    DebuggerContext.exceptionDebugger = exceptionDebugger;
-  }
-
-  public static void initCodeOrigin(CodeOriginRecorder codeOriginRecorder) {
-    DebuggerContext.codeOriginRecorder = codeOriginRecorder;
-  }
-
-  /** Returns the probe details based on the probe idx provided. */
-  public static ProbeImplementation resolveProbe(int probeIndex) {
-    ProbeResolver resolver = probeResolver;
-    if (resolver == null) {
-      return null;
-    }
-    return resolver.resolve(probeIndex);
-  }
-
-  /**
-   * Indicates if the fully-qualified-class-name is denied to be instrumented Returns true if no
-   * implementation is available
-   */
-  public static boolean isDenied(String fullyQualifiedClassName) {
-    ClassFilter filter = classFilter;
-    if (filter == null) {
-      LOGGER.warn("no class filter => all classes are denied");
-      return true;
-    }
-    return filter.isDenied(fullyQualifiedClassName);
-  }
-
-  /** Increments or updates the specified metric No-op if no implementation is available */
-  public static void metric(
-      String probeId, MetricKind kind, String name, long value, String[] tags) {
-    try {
-      MetricForwarder forwarder = metricForwarder;
-      if (forwarder == null) {
-        return;
-      }
-      switch (kind) {
-        case COUNT:
-          forwarder.count(probeId, name, value, tags);
-          break;
-        case GAUGE:
-          forwarder.gauge(probeId, name, value, tags);
-          break;
-        case HISTOGRAM:
-          forwarder.histogram(probeId, name, value, tags);
-          break;
-        case DISTRIBUTION:
-          forwarder.distribution(probeId, name, value, tags);
-          break;
-        default:
-          throw new IllegalArgumentException("Unsupported metric kind: " + kind);
-      }
-    } catch (Exception ex) {
-      LOGGER.debug("Error in metric method: ", ex);
-    }
-  }
-
-  /** Updates the specified metric No-op if no implementation is available */
-  public static void metric(
-      String probeId, MetricKind kind, String name, double value, String[] tags) {
-    try {
-      MetricForwarder forwarder = metricForwarder;
-      if (forwarder == null) {
-        return;
-      }
-      switch (kind) {
-        case GAUGE:
-          forwarder.gauge(probeId, name, value, tags);
-          break;
-        case HISTOGRAM:
-          forwarder.histogram(probeId, name, value, tags);
-          break;
-        case DISTRIBUTION:
-          forwarder.distribution(probeId, name, value, tags);
-          break;
-        default:
-          throw new IllegalArgumentException("Unsupported metric kind: " + kind);
-      }
-    } catch (Exception ex) {
-      LOGGER.debug("Error in metric method: ", ex);
-    }
-  }
-
-  /** Serializes the specified value as string Returns null if no implementation is available */
-  public static String serializeValue(CapturedContext.CapturedValue value) {
-    ValueSerializer serializer = valueSerializer;
-    if (serializer == null) {
-      LOGGER.warn("Cannot serialize value, no serializer set");
-      return null;
-    }
-    return serializer.serializeValue(value);
-  }
-
-  /** Creates a span, returns null if no implementation available */
-  public static DebuggerSpan createSpan(String probeId, String operationName, String[] tags) {
-    try {
-      Tracer localTracer = tracer;
-      if (localTracer == null) {
-        return DebuggerSpan.NOOP_SPAN;
-      }
-      return localTracer.createSpan(probeId, operationName, tags);
-    } catch (Exception ex) {
-      LOGGER.debug("Error in createSpan: ", ex);
-      return DebuggerSpan.NOOP_SPAN;
-    }
-  }
-
-  /**
-   * tests whether the provided probe Ids are ready for capturing data it allows to skip capture
-   * part if no condition and sampling is returns false
-   *
-   * @return true if can proceed to capture data
-   */
-  public static boolean isReadyToCapture(Class<?> callingClass, int... probeIndices) {
-    try {
-      return checkAndSetInProbe();
-    } catch (Exception ex) {
-      LOGGER.debug("Error in isReadyToCapture: ", ex);
-      return false;
-    }
-  }
-
-  public static boolean isReadyToCapture(Class<?> callingClass, int probeIndex) {
-    try {
-      ProbeImplementation probeImplementation = resolveProbe(probeIndex);
-      if (probeImplementation == null) {
-        return false;
-      }
-      if (((CapturedContextProbe) probeImplementation).isReadyToCapture()) {
-        return checkAndSetInProbe();
-      }
-      return false;
-    } catch (Exception ex) {
-      LOGGER.debug("Error in isReadyToCapture: ", ex);
-      return false;
-    }
-  }
-
-  public static void disableInProbe() {
-    IN_PROBE.set(Boolean.FALSE);
-  }
-
-  public static boolean isInProbe() {
-    return IN_PROBE.get();
-  }
-
-  public static boolean checkAndSetInProbe() {
-    if (IN_PROBE.get()) {
-      LOGGER.debug("Instrumentation is reentered, skip it.");
-      return false;
-    }
-    IN_PROBE.set(Boolean.TRUE);
-    return true;
-  }
-
-  /**
-   * resolve probe details based on probe ids and evaluate the captured context regarding summary &
-   * conditions. This is for method probes.
-   */
-  public static void evalContext(
-      CapturedContext context,
-      Class<?> callingClass,
-      long startTimestamp,
-      MethodLocation methodLocation,
-      int... probeIndices) {
-    try {
-      boolean needFreeze = false;
-      for (int probeIndex : probeIndices) {
-        ProbeImplementation probeImplementation = resolveProbe(probeIndex);
-        if (probeImplementation == null) {
-          continue;
+    public interface ExceptionDebugger {
+        void handleException(Throwable t, AgentSpan span);
+    }
+
+    public interface CodeOriginRecorder {
+        String captureCodeOrigin(boolean entry);
+
+        String captureCodeOrigin(String typeName, String methodName, String descriptor, boolean entry);
+    }
+
+    private static volatile ProbeResolver probeResolver;
+    private static volatile ClassFilter classFilter;
+    private static volatile ClassNameFilter classNameFilter;
+    private static volatile MetricForwarder metricForwarder;
+    private static volatile Tracer tracer;
+    private static volatile ValueSerializer valueSerializer;
+    private static volatile ExceptionDebugger exceptionDebugger;
+    private static volatile CodeOriginRecorder codeOriginRecorder;
+
+    public static void initProbeResolver(ProbeResolver probeResolver) {
+        DebuggerContext.probeResolver = probeResolver;
+    }
+
+    public static void initMetricForwarder(MetricForwarder metricForwarder) {
+        DebuggerContext.metricForwarder = metricForwarder;
+    }
+
+    public static void initTracer(Tracer tracer) {
+        DebuggerContext.tracer = tracer;
+    }
+
+    public static void initClassFilter(ClassFilter classFilter) {
+        DebuggerContext.classFilter = classFilter;
+    }
+
+    public static void initClassNameFilter(ClassNameFilter classNameFilter) {
+        DebuggerContext.classNameFilter = classNameFilter;
+    }
+
+    public static void initValueSerializer(ValueSerializer valueSerializer) {
+        DebuggerContext.valueSerializer = valueSerializer;
+    }
+
+    public static void initExceptionDebugger(ExceptionDebugger exceptionDebugger) {
+        DebuggerContext.exceptionDebugger = exceptionDebugger;
+    }
+
+    public static void initCodeOrigin(CodeOriginRecorder codeOriginRecorder) {
+        DebuggerContext.codeOriginRecorder = codeOriginRecorder;
+    }
+
+    /** Returns the probe details based on the probe idx provided. */
+    public static ProbeImplementation resolveProbe(int probeIndex) {
+        ProbeResolver resolver = probeResolver;
+        if (resolver == null) {
+            return null;
         }
-        CapturedContext.Status status =
-            context.evaluate(
-                probeImplementation,
-                callingClass.getTypeName(),
-                startTimestamp,
-                methodLocation,
-                false);
-        needFreeze |= status.shouldFreezeContext();
-      }
-      // only freeze the context when we have at lest one snapshot probe, and we should send
-      // snapshot
-      if (needFreeze) {
-        Duration timeout =
-            Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout());
-        context.freeze(TimeoutChecker.create(Config.get(), timeout));
-      }
-    } catch (Exception ex) {
-      LOGGER.debug("Error in evalContext: ", ex);
-    }
-  }
-
-  /**
-   * Optimized version of {@link DebuggerContext#evalContext(CapturedContext, Class, long,
-   * MethodLocation, int...)} for single probe
-   */
-  public static void evalContext(
-      CapturedContext context,
-      Class<?> callingClass,
-      long startTimestamp,
-      MethodLocation methodLocation,
-      int probeIndex) {
-    try {
-      ProbeImplementation probeImplementation = resolveProbe(probeIndex);
-      if (probeImplementation == null) {
-        return;
-      }
-      CapturedContext.Status status =
-          context.evaluate(
-              probeImplementation,
-              callingClass.getTypeName(),
-              startTimestamp,
-              methodLocation,
-              true);
-      boolean needFreeze = status.shouldFreezeContext();
-      // only freeze the context when we have at lest one snapshot probe, and we should send
-      // snapshot
-      if (needFreeze) {
-        Duration timeout =
-            Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout());
-        context.freeze(TimeoutChecker.create(Config.get(), timeout));
-      }
-    } catch (Exception ex) {
-      LOGGER.debug("Error in evalContext: ", ex);
-    }
-  }
-
-  /**
-   * resolve probe details based on probe indices, evaluate the captured context regarding summary &
-   * conditions and commit snapshot to send it if needed. This is for line probes.
-   */
-  public static void evalContextAndCommit(
-      CapturedContext context, Class<?> callingClass, int line, int... probeIndices) {
-    try {
-      List<ProbeImplementation> probeImplementations = new ArrayList<>();
-      for (int probeIndex : probeIndices) {
-        ProbeImplementation probeImplementation = resolveProbe(probeIndex);
-        if (probeImplementation == null) {
-          continue;
+        return resolver.resolve(probeIndex);
+    }
+
+    /**
+     * Indicates if the fully-qualified-class-name is denied to be instrumented Returns true if no
+     * implementation is available
+     */
+    public static boolean isDenied(String fullyQualifiedClassName) {
+        ClassFilter filter = classFilter;
+        if (filter == null) {
+            LOGGER.warn("no class filter => all classes are denied");
+            return true;
         }
-        context.evaluate(
-            probeImplementation, callingClass.getTypeName(), -1, MethodLocation.DEFAULT, false);
-        probeImplementations.add(probeImplementation);
-      }
-      for (ProbeImplementation probeImplementation : probeImplementations) {
-        probeImplementation.commit(context, line);
-      }
-    } catch (Exception ex) {
-      LOGGER.debug("Error in evalContextAndCommit: ", ex);
-    }
-  }
-
-  /**
-   * Optimized version of {@link DebuggerContext#evalContextAndCommit(CapturedContext, Class, int,
-   * int...)} for single probe
-   */
-  public static void evalContextAndCommit(
-      CapturedContext context, Class<?> callingClass, int line, int probeIndex) {
-    // Cannot call the multi probe version here, because it will add a new level for stacktrace
-    // recording
-    try {
-      ProbeImplementation probeImplementation = resolveProbe(probeIndex);
-      if (probeImplementation == null) {
-        return;
-      }
-      context.evaluate(
-          probeImplementation, callingClass.getTypeName(), -1, MethodLocation.DEFAULT, true);
-      probeImplementation.commit(context, line);
-    } catch (Exception ex) {
-      LOGGER.debug("Error in evalContextAndCommit: ", ex);
-    }
-  }
-
-  public static void codeOrigin(int probeIndex) {
-    try {
-      ProbeImplementation probe = probeResolver.resolve(probeIndex);
-      if (probe != null) {
-        probe.commit(
-            CapturedContext.EMPTY_CONTEXT, CapturedContext.EMPTY_CONTEXT, Collections.emptyList());
-      }
-    } catch (Exception e) {
-      LOGGER.debug("Error in codeOrigin: ", e);
-    }
-  }
-
-  /**
-   * Commit snapshot based on entry/exit contexts and eventually caught exceptions for given probe
-   * Ids This is for method probes
-   */
-  public static void commit(
-      CapturedContext entryContext,
-      CapturedContext exitContext,
-      List<CapturedContext.CapturedThrowable> caughtExceptions,
-      int... probeIndices) {
-    try {
-      if (entryContext == CapturedContext.EMPTY_CONTEXT
-          && exitContext == CapturedContext.EMPTY_CONTEXT) {
-        // rate limited
-        return;
-      }
-      for (int probeIndex : probeIndices) {
-        CapturedContext.Status entryStatus = entryContext.getStatus(probeIndex);
-        CapturedContext.Status exitStatus = exitContext.getStatus(probeIndex);
-        ProbeImplementation probeImplementation;
-        if (entryStatus.probeImplementation != ProbeImplementation.UNKNOWN
-            && (entryStatus.probeImplementation.getEvaluateAt() == MethodLocation.ENTRY
-                || entryStatus.probeImplementation.getEvaluateAt() == MethodLocation.DEFAULT)) {
-          probeImplementation = entryStatus.probeImplementation;
-        } else if (exitStatus.probeImplementation.getEvaluateAt() == MethodLocation.EXIT) {
-          probeImplementation = exitStatus.probeImplementation;
-        } else {
-          throw new IllegalStateException("no probe details for " + probeIndex);
+        return filter.isDenied(fullyQualifiedClassName);
+    }
+
+    /** Increments or updates the specified metric No-op if no implementation is available */
+    public static void metric(String probeId, MetricKind kind, String name, long value, String[] tags) {
+        try {
+            MetricForwarder forwarder = metricForwarder;
+            if (forwarder == null) {
+                return;
+            }
+            switch (kind) {
+                case COUNT:
+                    forwarder.count(probeId, name, value, tags);
+                    break;
+                case GAUGE:
+                    forwarder.gauge(probeId, name, value, tags);
+                    break;
+                case HISTOGRAM:
+                    forwarder.histogram(probeId, name, value, tags);
+                    break;
+                case DISTRIBUTION:
+                    forwarder.distribution(probeId, name, value, tags);
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unsupported metric kind: " + kind);
+            }
+        } catch (Exception ex) {
+            LOGGER.debug("Error in metric method: ", ex);
+        }
+    }
+
+    /** Updates the specified metric No-op if no implementation is available */
+    public static void metric(String probeId, MetricKind kind, String name, double value, String[] tags) {
+        try {
+            MetricForwarder forwarder = metricForwarder;
+            if (forwarder == null) {
+                return;
+            }
+            switch (kind) {
+                case GAUGE:
+                    forwarder.gauge(probeId, name, value, tags);
+                    break;
+                case HISTOGRAM:
+                    forwarder.histogram(probeId, name, value, tags);
+                    break;
+                case DISTRIBUTION:
+                    forwarder.distribution(probeId, name, value, tags);
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unsupported metric kind: " + kind);
+            }
+        } catch (Exception ex) {
+            LOGGER.debug("Error in metric method: ", ex);
+        }
+    }
+
+    /** Serializes the specified value as string Returns null if no implementation is available */
+    public static String serializeValue(CapturedContext.CapturedValue value) {
+        ValueSerializer serializer = valueSerializer;
+        if (serializer == null) {
+            LOGGER.warn("Cannot serialize value, no serializer set");
+            return null;
+        }
+        return serializer.serializeValue(value);
+    }
+
+    /** Creates a span, returns null if no implementation available */
+    public static DebuggerSpan createSpan(String probeId, String operationName, String[] tags) {
+        try {
+            Tracer localTracer = tracer;
+            if (localTracer == null) {
+                return DebuggerSpan.NOOP_SPAN;
+            }
+            return localTracer.createSpan(probeId, operationName, tags);
+        } catch (Exception ex) {
+            LOGGER.debug("Error in createSpan: ", ex);
+            return DebuggerSpan.NOOP_SPAN;
         }
-        probeImplementation.commit(entryContext, exitContext, caughtExceptions);
-      }
-    } catch (Exception ex) {
-      LOGGER.debug("Error in commit: ", ex);
-    }
-  }
-
-  /**
-   * Optimized version of {@link DebuggerContext#commit(CapturedContext, CapturedContext, List,
-   * int...)} for single probe
-   */
-  public static void commit(
-      CapturedContext entryContext,
-      CapturedContext exitContext,
-      List<CapturedContext.CapturedThrowable> caughtExceptions,
-      int probeIndex) {
-    // Cannot call the multi probe version here, because it will add a new level for stacktrace
-    // recording
-    try {
-      if (entryContext == CapturedContext.EMPTY_CONTEXT
-          && exitContext == CapturedContext.EMPTY_CONTEXT) {
-        // rate limited
-        return;
-      }
-      CapturedContext.Status entryStatus = entryContext.getStatus(probeIndex);
-      CapturedContext.Status exitStatus = exitContext.getStatus(probeIndex);
-      ProbeImplementation probeImplementation;
-      if (entryStatus.probeImplementation != ProbeImplementation.UNKNOWN
-          && (entryStatus.probeImplementation.getEvaluateAt() == MethodLocation.ENTRY
-              || entryStatus.probeImplementation.getEvaluateAt() == MethodLocation.DEFAULT)) {
-        probeImplementation = entryStatus.probeImplementation;
-      } else if (exitStatus.probeImplementation.getEvaluateAt() == MethodLocation.EXIT) {
-        probeImplementation = exitStatus.probeImplementation;
-      } else {
-        throw new IllegalStateException("no probe details for " + probeIndex);
-      }
-      probeImplementation.commit(entryContext, exitContext, caughtExceptions);
-    } catch (Exception ex) {
-      LOGGER.debug("Error in commit: ", ex);
-    }
-  }
-
-  public static void marker() {}
-
-  public static void captureCodeOrigin(boolean entry) {
-    try {
-      CodeOriginRecorder recorder = codeOriginRecorder;
-      if (recorder != null) {
-        recorder.captureCodeOrigin(entry);
-      }
-    } catch (Exception ex) {
-      LOGGER.debug("Error in captureCodeOrigin: ", ex);
-    }
-  }
-
-  public static void captureCodeOrigin(
-      String typeName, String methodName, String descriptor, boolean entry) {
-    try {
-      CodeOriginRecorder recorder = codeOriginRecorder;
-      if (recorder != null) {
-        recorder.captureCodeOrigin(typeName, methodName, descriptor, entry);
-      }
-    } catch (Exception ex) {
-      LOGGER.debug("Error in captureCodeOrigin: ", ex);
-    }
-  }
-
-  public static void captureCodeOrigin(Method method, boolean entry) {
-    try {
-      CodeOriginRecorder recorder = codeOriginRecorder;
-      if (recorder != null) {
-        recorder.captureCodeOrigin(
-            method.getDeclaringClass().getName(),
-            method.getName(),
-            Type.getMethodDescriptor(method),
-            entry);
-      }
-    } catch (Exception ex) {
-      LOGGER.debug("Error in captureCodeOrigin: ", ex);
-    }
-  }
-
-  public static void handleException(Throwable t, AgentSpan span) {
-    try {
-      ExceptionDebugger exDebugger = exceptionDebugger;
-      if (exDebugger == null) {
-        return;
-      }
-      exDebugger.handleException(t, span);
-    } catch (Exception ex) {
-      LOGGER.debug("Error in handleException: ", ex);
-    }
-  }
-
-  public static boolean isClassNameExcluded(String className) {
-    try {
-      return classNameFilter != null && classNameFilter.isExcluded(className);
-    } catch (Exception ex) {
-      LOGGER.debug("Error in isClassNameExcluded: ", ex);
-      return false;
-    }
-  }
+    }
+
+    /**
+     * tests whether the provided probe Ids are ready for capturing data it allows to skip capture
+     * part if no condition and sampling is returns false
+     *
+     * @return true if can proceed to capture data
+     */
+    public static boolean isReadyToCapture(Class<?> callingClass, int... probeIndices) {
+        try {
+            return checkAndSetInProbe();
+        } catch (Exception ex) {
+            LOGGER.debug("Error in isReadyToCapture: ", ex);
+            return false;
+        }
+    }
+
+    public static boolean isReadyToCapture(Class<?> callingClass, int probeIndex) {
+        try {
+            ProbeImplementation probeImplementation = resolveProbe(probeIndex);
+            if (probeImplementation == null) {
+                return false;
+            }
+            if (((CapturedContextProbe) probeImplementation).isReadyToCapture()) {
+                return checkAndSetInProbe();
+            }
+            return false;
+        } catch (Exception ex) {
+            LOGGER.debug("Error in isReadyToCapture: ", ex);
+            return false;
+        }
+    }
+
+    public static void disableInProbe() {
+        IN_PROBE.set(Boolean.FALSE);
+    }
+
+    public static boolean isInProbe() {
+        return IN_PROBE.get();
+    }
+
+    public static boolean checkAndSetInProbe() {
+        if (IN_PROBE.get()) {
+            LOGGER.debug("Instrumentation is reentered, skip it.");
+            return false;
+        }
+        IN_PROBE.set(Boolean.TRUE);
+        return true;
+    }
+
+    /**
+     * resolve probe details based on probe ids and evaluate the captured context regarding summary &
+     * conditions. This is for method probes.
+     */
+    public static void evalContext(
+            CapturedContext context,
+            Class<?> callingClass,
+            long startTimestamp,
+            MethodLocation methodLocation,
+            int... probeIndices) {
+        try {
+            boolean needFreeze = false;
+            for (int probeIndex : probeIndices) {
+                ProbeImplementation probeImplementation = resolveProbe(probeIndex);
+                if (probeImplementation == null) {
+                    continue;
+                }
+                CapturedContext.Status status = context.evaluate(
+                        probeImplementation, callingClass.getTypeName(), startTimestamp, methodLocation, false);
+                needFreeze |= status.shouldFreezeContext();
+            }
+            // only freeze the context when we have at lest one snapshot probe, and we should send
+            // snapshot
+            if (needFreeze) {
+                Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout());
+                context.freeze(TimeoutChecker.create(Config.get(), timeout));
+            }
+        } catch (Exception ex) {
+            LOGGER.debug("Error in evalContext: ", ex);
+        }
+    }
+
+    /**
+     * Optimized version of {@link DebuggerContext#evalContext(CapturedContext, Class, long,
+     * MethodLocation, int...)} for single probe
+     */
+    public static void evalContext(
+            CapturedContext context,
+            Class<?> callingClass,
+            long startTimestamp,
+            MethodLocation methodLocation,
+            int probeIndex) {
+        try {
+            ProbeImplementation probeImplementation = resolveProbe(probeIndex);
+            if (probeImplementation == null) {
+                return;
+            }
+            CapturedContext.Status status = context.evaluate(
+                    probeImplementation, callingClass.getTypeName(), startTimestamp, methodLocation, true);
+            boolean needFreeze = status.shouldFreezeContext();
+            // only freeze the context when we have at lest one snapshot probe, and we should send
+            // snapshot
+            if (needFreeze) {
+                Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout());
+                context.freeze(TimeoutChecker.create(Config.get(), timeout));
+            }
+        } catch (Exception ex) {
+            LOGGER.debug("Error in evalContext: ", ex);
+        }
+    }
+
+    /**
+     * resolve probe details based on probe indices, evaluate the captured context regarding summary &
+     * conditions and commit snapshot to send it if needed. This is for line probes.
+     */
+    public static void evalContextAndCommit(
+            CapturedContext context, Class<?> callingClass, int line, int... probeIndices) {
+        try {
+            List<ProbeImplementation> probeImplementations = new ArrayList<>();
+            for (int probeIndex : probeIndices) {
+                ProbeImplementation probeImplementation = resolveProbe(probeIndex);
+                if (probeImplementation == null) {
+                    continue;
+                }
+                context.evaluate(probeImplementation, callingClass.getTypeName(), -1, MethodLocation.DEFAULT, false);
+                probeImplementations.add(probeImplementation);
+            }
+            for (ProbeImplementation probeImplementation : probeImplementations) {
+                probeImplementation.commit(context, line);
+            }
+        } catch (Exception ex) {
+            LOGGER.debug("Error in evalContextAndCommit: ", ex);
+        }
+    }
+
+    /**
+     * Optimized version of {@link DebuggerContext#evalContextAndCommit(CapturedContext, Class, int,
+     * int...)} for single probe
+     */
+    public static void evalContextAndCommit(CapturedContext context, Class<?> callingClass, int line, int probeIndex) {
+        // Cannot call the multi probe version here, because it will add a new level for stacktrace
+        // recording
+        try {
+            ProbeImplementation probeImplementation = resolveProbe(probeIndex);
+            if (probeImplementation == null) {
+                return;
+            }
+            context.evaluate(probeImplementation, callingClass.getTypeName(), -1, MethodLocation.DEFAULT, true);
+            probeImplementation.commit(context, line);
+        } catch (Exception ex) {
+            LOGGER.debug("Error in evalContextAndCommit: ", ex);
+        }
+    }
+
+    public static void codeOrigin(int probeIndex) {
+        try {
+            ProbeImplementation probe = probeResolver.resolve(probeIndex);
+            if (probe != null) {
+                probe.commit(CapturedContext.EMPTY_CONTEXT, CapturedContext.EMPTY_CONTEXT, Collections.emptyList());
+            }
+        } catch (Exception e) {
+            LOGGER.debug("Error in codeOrigin: ", e);
+        }
+    }
+
+    /**
+     * Commit snapshot based on entry/exit contexts and eventually caught exceptions for given probe
+     * Ids This is for method probes
+     */
+    public static void commit(
+            CapturedContext entryContext,
+            CapturedContext exitContext,
+            List<CapturedContext.CapturedThrowable> caughtExceptions,
+            int... probeIndices) {
+        try {
+            if (entryContext == CapturedContext.EMPTY_CONTEXT && exitContext == CapturedContext.EMPTY_CONTEXT) {
+                // rate limited
+                return;
+            }
+            for (int probeIndex : probeIndices) {
+                CapturedContext.Status entryStatus = entryContext.getStatus(probeIndex);
+                CapturedContext.Status exitStatus = exitContext.getStatus(probeIndex);
+                ProbeImplementation probeImplementation;
+                if (entryStatus.probeImplementation != ProbeImplementation.UNKNOWN
+                        && (entryStatus.probeImplementation.getEvaluateAt() == MethodLocation.ENTRY
+                                || entryStatus.probeImplementation.getEvaluateAt() == MethodLocation.DEFAULT)) {
+                    probeImplementation = entryStatus.probeImplementation;
+                } else if (exitStatus.probeImplementation.getEvaluateAt() == MethodLocation.EXIT) {
+                    probeImplementation = exitStatus.probeImplementation;
+                } else {
+                    throw new IllegalStateException("no probe details for " + probeIndex);
+                }
+                probeImplementation.commit(entryContext, exitContext, caughtExceptions);
+            }
+        } catch (Exception ex) {
+            LOGGER.debug("Error in commit: ", ex);
+        }
+    }
+
+    /**
+     * Optimized version of {@link DebuggerContext#commit(CapturedContext, CapturedContext, List,
+     * int...)} for single probe
+     */
+    public static void commit(
+            CapturedContext entryContext,
+            CapturedContext exitContext,
+            List<CapturedContext.CapturedThrowable> caughtExceptions,
+            int probeIndex) {
+        // Cannot call the multi probe version here, because it will add a new level for stacktrace
+        // recording
+        try {
+            if (entryContext == CapturedContext.EMPTY_CONTEXT && exitContext == CapturedContext.EMPTY_CONTEXT) {
+                // rate limited
+                return;
+            }
+            CapturedContext.Status entryStatus = entryContext.getStatus(probeIndex);
+            CapturedContext.Status exitStatus = exitContext.getStatus(probeIndex);
+            ProbeImplementation probeImplementation;
+            if (entryStatus.probeImplementation != ProbeImplementation.UNKNOWN
+                    && (entryStatus.probeImplementation.getEvaluateAt() == MethodLocation.ENTRY
+                            || entryStatus.probeImplementation.getEvaluateAt() == MethodLocation.DEFAULT)) {
+                probeImplementation = entryStatus.probeImplementation;
+            } else if (exitStatus.probeImplementation.getEvaluateAt() == MethodLocation.EXIT) {
+                probeImplementation = exitStatus.probeImplementation;
+            } else {
+                throw new IllegalStateException("no probe details for " + probeIndex);
+            }
+            probeImplementation.commit(entryContext, exitContext, caughtExceptions);
+        } catch (Exception ex) {
+            LOGGER.debug("Error in commit: ", ex);
+        }
+    }
+
+    public static void marker() {}
+
+    public static void captureCodeOrigin(boolean entry) {
+        try {
+            CodeOriginRecorder recorder = codeOriginRecorder;
+            if (recorder != null) {
+                recorder.captureCodeOrigin(entry);
+            }
+        } catch (Exception ex) {
+            LOGGER.debug("Error in captureCodeOrigin: ", ex);
+        }
+    }
+
+    public static void captureCodeOrigin(String typeName, String methodName, String descriptor, boolean entry) {
+        try {
+            CodeOriginRecorder recorder = codeOriginRecorder;
+            if (recorder != null) {
+                recorder.captureCodeOrigin(typeName, methodName, descriptor, entry);
+            }
+        } catch (Exception ex) {
+            LOGGER.debug("Error in captureCodeOrigin: ", ex);
+        }
+    }
+
+    public static void captureCodeOrigin(Method method, boolean entry) {
+        try {
+            CodeOriginRecorder recorder = codeOriginRecorder;
+            if (recorder != null) {
+                recorder.captureCodeOrigin(
+                        method.getDeclaringClass().getName(),
+                        method.getName(),
+                        Type.getMethodDescriptor(method),
+                        entry);
+            }
+        } catch (Exception ex) {
+            LOGGER.debug("Error in captureCodeOrigin: ", ex);
+        }
+    }
+
+    public static void handleException(Throwable t, AgentSpan span) {
+        try {
+            ExceptionDebugger exDebugger = exceptionDebugger;
+            if (exDebugger == null) {
+                return;
+            }
+            exDebugger.handleException(t, span);
+        } catch (Exception ex) {
+            LOGGER.debug("Error in handleException: ", ex);
+        }
+    }
+
+    public static boolean isClassNameExcluded(String className) {
+        try {
+            return classNameFilter != null && classNameFilter.isExcluded(className);
+        } catch (Exception ex) {
+            LOGGER.debug("Error in isClassNameExcluded: ", ex);
+            return false;
+        }
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerSpan.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerSpan.java
index f41913ec8de..f4bdd80bfa9 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerSpan.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerSpan.java
@@ -1,18 +1,18 @@
 package datadog.trace.bootstrap.debugger;
 
 public interface DebuggerSpan {
-  void finish();
+    void finish();
 
-  void setError(Throwable t);
+    void setError(Throwable t);
 
-  DebuggerSpan NOOP_SPAN = new NoopSpan();
+    DebuggerSpan NOOP_SPAN = new NoopSpan();
 
-  class NoopSpan implements DebuggerSpan {
+    class NoopSpan implements DebuggerSpan {
 
-    @Override
-    public void finish() {}
+        @Override
+        public void finish() {}
 
-    @Override
-    public void setError(Throwable t) {}
-  }
+        @Override
+        public void setError(Throwable t) {}
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/EvaluationError.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/EvaluationError.java
index 5307e5fe780..dd9b2498354 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/EvaluationError.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/EvaluationError.java
@@ -2,19 +2,19 @@
 
 /** Store evaluation errors from expressions (probe conditions, log template, metric values, ...) */
 public class EvaluationError {
-  private final String expr;
-  private final String message;
+    private final String expr;
+    private final String message;
 
-  public EvaluationError(String expr, String message) {
-    this.expr = expr;
-    this.message = message;
-  }
+    public EvaluationError(String expr, String message) {
+        this.expr = expr;
+        this.message = message;
+    }
 
-  public String getExpr() {
-    return expr;
-  }
+    public String getExpr() {
+        return expr;
+    }
 
-  public String getMessage() {
-    return message;
-  }
+    public String getMessage() {
+        return message;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/Limits.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/Limits.java
index 989bc91d01a..1fba407f564 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/Limits.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/Limits.java
@@ -2,48 +2,44 @@
 
 /** Stores data extraction limits and provide defaults */
 public class Limits {
-  public static final int DEFAULT_REFERENCE_DEPTH = 3;
-  public static final int DEFAULT_COLLECTION_SIZE = 100;
-  public static final int DEFAULT_LENGTH = 255;
-  public static final int DEFAULT_FIELD_COUNT = 20;
-
-  public final int maxReferenceDepth;
-  public final int maxCollectionSize;
-  public final int maxLength;
-  public final int maxFieldCount;
-
-  public static final Limits DEFAULT =
-      new Limits(
-          DEFAULT_REFERENCE_DEPTH, DEFAULT_COLLECTION_SIZE, DEFAULT_LENGTH, DEFAULT_FIELD_COUNT);
-
-  public Limits(int maxReferenceDepth, int maxCollectionSize, int maxLength, int maxFieldCount) {
-    this.maxReferenceDepth = maxReferenceDepth;
-    this.maxCollectionSize = maxCollectionSize;
-    this.maxLength = maxLength;
-    this.maxFieldCount = maxFieldCount;
-  }
-
-  public int getMaxReferenceDepth() {
-    return maxReferenceDepth;
-  }
-
-  public int getMaxCollectionSize() {
-    return maxCollectionSize;
-  }
-
-  public int getMaxLength() {
-    return maxLength;
-  }
-
-  public int getMaxFieldCount() {
-    return maxFieldCount;
-  }
-
-  public static Limits decDepthLimits(Limits current) {
-    return new Limits(
-        current.maxReferenceDepth - 1,
-        current.maxCollectionSize,
-        current.maxLength,
-        current.maxFieldCount);
-  }
+    public static final int DEFAULT_REFERENCE_DEPTH = 3;
+    public static final int DEFAULT_COLLECTION_SIZE = 100;
+    public static final int DEFAULT_LENGTH = 255;
+    public static final int DEFAULT_FIELD_COUNT = 20;
+
+    public final int maxReferenceDepth;
+    public final int maxCollectionSize;
+    public final int maxLength;
+    public final int maxFieldCount;
+
+    public static final Limits DEFAULT =
+            new Limits(DEFAULT_REFERENCE_DEPTH, DEFAULT_COLLECTION_SIZE, DEFAULT_LENGTH, DEFAULT_FIELD_COUNT);
+
+    public Limits(int maxReferenceDepth, int maxCollectionSize, int maxLength, int maxFieldCount) {
+        this.maxReferenceDepth = maxReferenceDepth;
+        this.maxCollectionSize = maxCollectionSize;
+        this.maxLength = maxLength;
+        this.maxFieldCount = maxFieldCount;
+    }
+
+    public int getMaxReferenceDepth() {
+        return maxReferenceDepth;
+    }
+
+    public int getMaxCollectionSize() {
+        return maxCollectionSize;
+    }
+
+    public int getMaxLength() {
+        return maxLength;
+    }
+
+    public int getMaxFieldCount() {
+        return maxFieldCount;
+    }
+
+    public static Limits decDepthLimits(Limits current) {
+        return new Limits(
+                current.maxReferenceDepth - 1, current.maxCollectionSize, current.maxLength, current.maxFieldCount);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/MethodLocation.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/MethodLocation.java
index 7bceadf702d..3b505823373 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/MethodLocation.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/MethodLocation.java
@@ -1,19 +1,19 @@
 package datadog.trace.bootstrap.debugger;
 
 public enum MethodLocation {
-  DEFAULT,
-  ENTRY,
-  EXIT;
+    DEFAULT,
+    ENTRY,
+    EXIT;
 
-  public static boolean isSame(MethodLocation methodLocation, MethodLocation evaluateAt) {
-    if (methodLocation == MethodLocation.DEFAULT) {
-      // line probe, no evaluation of probe's evaluateAt
-      // MethodLocation.DEFAULT is used for line probe when evaluating the context
-      return true;
+    public static boolean isSame(MethodLocation methodLocation, MethodLocation evaluateAt) {
+        if (methodLocation == MethodLocation.DEFAULT) {
+            // line probe, no evaluation of probe's evaluateAt
+            // MethodLocation.DEFAULT is used for line probe when evaluating the context
+            return true;
+        }
+        if (methodLocation == MethodLocation.ENTRY) {
+            return evaluateAt == MethodLocation.DEFAULT || evaluateAt == MethodLocation.ENTRY;
+        }
+        return methodLocation == evaluateAt;
     }
-    if (methodLocation == MethodLocation.ENTRY) {
-      return evaluateAt == MethodLocation.DEFAULT || evaluateAt == MethodLocation.ENTRY;
-    }
-    return methodLocation == evaluateAt;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeId.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeId.java
index efdd02bc523..bade676767a 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeId.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeId.java
@@ -3,73 +3,72 @@
 import datadog.trace.util.RandomUtils;
 
 public class ProbeId {
-  private static final String ID_SEPARATOR = ":";
+    private static final String ID_SEPARATOR = ":";
 
-  private final String id;
-  private final int version;
-  private final String encoded; // store as string uuid:version
+    private final String id;
+    private final int version;
+    private final String encoded; // store as string uuid:version
 
-  // decode a probe id from a string with format uuid:version
-  public static ProbeId from(String encodedId) {
-    int idx = encodedId.indexOf(ID_SEPARATOR);
-    if (idx == -1) {
-      throw new IllegalArgumentException("Invalid probe id: " + encodedId);
+    // decode a probe id from a string with format uuid:version
+    public static ProbeId from(String encodedId) {
+        int idx = encodedId.indexOf(ID_SEPARATOR);
+        if (idx == -1) {
+            throw new IllegalArgumentException("Invalid probe id: " + encodedId);
+        }
+        return new ProbeId(encodedId.substring(0, idx), Integer.parseInt(encodedId.substring(idx + 1)), encodedId);
     }
-    return new ProbeId(
-        encodedId.substring(0, idx), Integer.parseInt(encodedId.substring(idx + 1)), encodedId);
-  }
 
-  public ProbeId(String id, int version) {
-    this.id = id;
-    this.version = version;
-    this.encoded = id + ID_SEPARATOR + version;
-  }
+    public ProbeId(String id, int version) {
+        this.id = id;
+        this.version = version;
+        this.encoded = id + ID_SEPARATOR + version;
+    }
 
-  private ProbeId(String id, int version, String encoded) {
-    this.id = id;
-    this.version = version;
-    this.encoded = encoded;
-  }
+    private ProbeId(String id, int version, String encoded) {
+        this.id = id;
+        this.version = version;
+        this.encoded = encoded;
+    }
 
-  public static ProbeId newId() {
-    return new ProbeId(RandomUtils.randomUUID().toString(), 0);
-  }
+    public static ProbeId newId() {
+        return new ProbeId(RandomUtils.randomUUID().toString(), 0);
+    }
 
-  public String getId() {
-    return id;
-  }
+    public String getId() {
+        return id;
+    }
 
-  public int getVersion() {
-    return version;
-  }
+    public int getVersion() {
+        return version;
+    }
 
-  /**
-   * @return the encoded id as a string with format uuid:version
-   */
-  public String getEncodedId() {
-    return encoded;
-  }
+    /**
+     * @return the encoded id as a string with format uuid:version
+     */
+    public String getEncodedId() {
+        return encoded;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
 
-    ProbeId probeId = (ProbeId) o;
+        ProbeId probeId = (ProbeId) o;
 
-    if (version != probeId.version) return false;
-    return id.equals(probeId.id);
-  }
+        if (version != probeId.version) return false;
+        return id.equals(probeId.id);
+    }
 
-  @Override
-  public int hashCode() {
-    int result = id.hashCode();
-    result = 31 * result + version;
-    return result;
-  }
+    @Override
+    public int hashCode() {
+        int result = id.hashCode();
+        result = 31 * result + version;
+        return result;
+    }
 
-  @Override
-  public String toString() {
-    return "ProbeId{" + "id='" + id + '\'' + ", version=" + version + '}';
-  }
+    @Override
+    public String toString() {
+        return "ProbeId{" + "id='" + id + '\'' + ", version=" + version + '}';
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeImplementation.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeImplementation.java
index 819efe45da9..a6559f913fb 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeImplementation.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeImplementation.java
@@ -5,108 +5,104 @@
 
 /** Probe information associated with a snapshot */
 public interface ProbeImplementation {
-  ProbeImplementation UNKNOWN =
-      new NoopProbeImplementation(new ProbeId("UNKNOWN", 0), ProbeLocation.UNKNOWN);
-
-  String getId();
-
-  ProbeId getProbeId();
-
-  ProbeLocation getLocation();
-
-  String getStrTags();
-
-  void evaluate(
-      CapturedContext context,
-      CapturedContext.Status status,
-      MethodLocation methodLocation,
-      boolean singleProbe);
-
-  void commit(
-      CapturedContext entryContext,
-      CapturedContext exitContext,
-      List<CapturedContext.CapturedThrowable> caughtExceptions);
-
-  void commit(CapturedContext lineContext, int line);
-
-  MethodLocation getEvaluateAt();
-
-  CapturedContext.Status createStatus();
-
-  class NoopProbeImplementation implements ProbeImplementation {
-    private final ProbeId id;
-    private final int version;
-    private final ProbeLocation location;
-    private final MethodLocation evaluateAt;
-    private final boolean captureSnapshot;
-    private final DebuggerScript<Boolean> script;
-    private final String tags;
-
-    public NoopProbeImplementation(ProbeId id, ProbeLocation location) {
-      this(id, 0, location, MethodLocation.DEFAULT, true, null, null);
-    }
-
-    public NoopProbeImplementation(
-        ProbeId id,
-        int version,
-        ProbeLocation location,
-        MethodLocation evaluateAt,
-        boolean captureSnapshot,
-        DebuggerScript<Boolean> script,
-        String tags) {
-      this.id = id;
-      this.version = version;
-      this.location = location;
-      this.evaluateAt = evaluateAt;
-      this.captureSnapshot = captureSnapshot;
-      this.script = script;
-      this.tags = tags;
-    }
-
-    @Override
-    public String getId() {
-      return id.getId();
-    }
-
-    @Override
-    public ProbeId getProbeId() {
-      return id;
-    }
-
-    @Override
-    public ProbeLocation getLocation() {
-      return location;
-    }
-
-    @Override
-    public String getStrTags() {
-      return null;
-    }
-
-    @Override
-    public void evaluate(
-        CapturedContext context,
-        CapturedContext.Status status,
-        MethodLocation methodLocation,
-        boolean singleProbe) {}
-
-    @Override
-    public void commit(
-        CapturedContext entryContext,
-        CapturedContext exitContext,
-        List<CapturedContext.CapturedThrowable> caughtExceptions) {}
-
-    @Override
-    public void commit(CapturedContext lineContext, int line) {}
-
-    @Override
-    public MethodLocation getEvaluateAt() {
-      return evaluateAt;
-    }
-
-    @Override
-    public CapturedContext.Status createStatus() {
-      return CapturedContext.Status.EMPTY_CAPTURING_STATUS;
+    ProbeImplementation UNKNOWN = new NoopProbeImplementation(new ProbeId("UNKNOWN", 0), ProbeLocation.UNKNOWN);
+
+    String getId();
+
+    ProbeId getProbeId();
+
+    ProbeLocation getLocation();
+
+    String getStrTags();
+
+    void evaluate(
+            CapturedContext context, CapturedContext.Status status, MethodLocation methodLocation, boolean singleProbe);
+
+    void commit(
+            CapturedContext entryContext,
+            CapturedContext exitContext,
+            List<CapturedContext.CapturedThrowable> caughtExceptions);
+
+    void commit(CapturedContext lineContext, int line);
+
+    MethodLocation getEvaluateAt();
+
+    CapturedContext.Status createStatus();
+
+    class NoopProbeImplementation implements ProbeImplementation {
+        private final ProbeId id;
+        private final int version;
+        private final ProbeLocation location;
+        private final MethodLocation evaluateAt;
+        private final boolean captureSnapshot;
+        private final DebuggerScript<Boolean> script;
+        private final String tags;
+
+        public NoopProbeImplementation(ProbeId id, ProbeLocation location) {
+            this(id, 0, location, MethodLocation.DEFAULT, true, null, null);
+        }
+
+        public NoopProbeImplementation(
+                ProbeId id,
+                int version,
+                ProbeLocation location,
+                MethodLocation evaluateAt,
+                boolean captureSnapshot,
+                DebuggerScript<Boolean> script,
+                String tags) {
+            this.id = id;
+            this.version = version;
+            this.location = location;
+            this.evaluateAt = evaluateAt;
+            this.captureSnapshot = captureSnapshot;
+            this.script = script;
+            this.tags = tags;
+        }
+
+        @Override
+        public String getId() {
+            return id.getId();
+        }
+
+        @Override
+        public ProbeId getProbeId() {
+            return id;
+        }
+
+        @Override
+        public ProbeLocation getLocation() {
+            return location;
+        }
+
+        @Override
+        public String getStrTags() {
+            return null;
+        }
+
+        @Override
+        public void evaluate(
+                CapturedContext context,
+                CapturedContext.Status status,
+                MethodLocation methodLocation,
+                boolean singleProbe) {}
+
+        @Override
+        public void commit(
+                CapturedContext entryContext,
+                CapturedContext exitContext,
+                List<CapturedContext.CapturedThrowable> caughtExceptions) {}
+
+        @Override
+        public void commit(CapturedContext lineContext, int line) {}
+
+        @Override
+        public MethodLocation getEvaluateAt() {
+            return evaluateAt;
+        }
+
+        @Override
+        public CapturedContext.Status createStatus() {
+            return CapturedContext.Status.EMPTY_CAPTURING_STATUS;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeLocation.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeLocation.java
index 92117b86b3a..1aeed205511 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeLocation.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeLocation.java
@@ -6,67 +6,67 @@
 
 /** Probe location information used in ProbeDetails class */
 public class ProbeLocation {
-  public static final ProbeLocation UNKNOWN =
-      new ProbeLocation("UNKNOWN", "UNKNOWN", "UNKNOWN", Collections.emptyList());
+    public static final ProbeLocation UNKNOWN =
+            new ProbeLocation("UNKNOWN", "UNKNOWN", "UNKNOWN", Collections.emptyList());
 
-  private final String type; // class
-  private final String method;
-  private final String file;
-  private final List<String> lines;
+    private final String type; // class
+    private final String method;
+    private final String file;
+    private final List<String> lines;
 
-  public ProbeLocation(String type, String method, String file, List<String> lines) {
-    this.type = type;
-    this.method = method;
-    this.file = file;
-    this.lines = lines;
-  }
+    public ProbeLocation(String type, String method, String file, List<String> lines) {
+        this.type = type;
+        this.method = method;
+        this.file = file;
+        this.lines = lines;
+    }
 
-  public String getType() {
-    return type;
-  }
+    public String getType() {
+        return type;
+    }
 
-  public String getMethod() {
-    return method;
-  }
+    public String getMethod() {
+        return method;
+    }
 
-  public String getFile() {
-    return file;
-  }
+    public String getFile() {
+        return file;
+    }
 
-  public List<String> getLines() {
-    return lines;
-  }
+    public List<String> getLines() {
+        return lines;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    ProbeLocation that = (ProbeLocation) o;
-    return Objects.equals(type, that.type)
-        && Objects.equals(method, that.method)
-        && Objects.equals(file, that.file)
-        && Objects.equals(lines, that.lines);
-  }
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ProbeLocation that = (ProbeLocation) o;
+        return Objects.equals(type, that.type)
+                && Objects.equals(method, that.method)
+                && Objects.equals(file, that.file)
+                && Objects.equals(lines, that.lines);
+    }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(type, method, file, lines);
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(type, method, file, lines);
+    }
 
-  @Override
-  public String toString() {
-    return "ProbeLocation{"
-        + "type='"
-        + type
-        + '\''
-        + ", method='"
-        + method
-        + '\''
-        + ", file='"
-        + file
-        + '\''
-        + ", lines="
-        + lines
-        + '}';
-  }
+    @Override
+    public String toString() {
+        return "ProbeLocation{"
+                + "type='"
+                + type
+                + '\''
+                + ", method='"
+                + method
+                + '\''
+                + ", file='"
+                + file
+                + '\''
+                + ", lines="
+                + lines
+                + '}';
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeRateLimiter.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeRateLimiter.java
index fc991a5315b..86a3a07a40c 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeRateLimiter.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeRateLimiter.java
@@ -11,70 +11,69 @@
 
 /** Rate limiter for sending snapshot to backend Use a global rate limiter and one per probe */
 public class ProbeRateLimiter {
-  private static final Logger LOGGER = LoggerFactory.getLogger(ProbeRateLimiter.class);
-  public static final double DEFAULT_SNAPSHOT_RATE = 1.0;
-  public static final double DEFAULT_LOG_RATE = 5000.0;
-  private static final Duration ONE_SECOND_WINDOW = Duration.of(1, ChronoUnit.SECONDS);
-  private static final Duration TEN_SECONDS_WINDOW = Duration.of(10, ChronoUnit.SECONDS);
-  private static final double DEFAULT_GLOBAL_SNAPSHOT_RATE = DEFAULT_SNAPSHOT_RATE * 100;
-  private static final double DEFAULT_GLOBAL_LOG_RATE = 5000.0;
-  private static Sampler GLOBAL_SNAPSHOT_SAMPLER =
-      defaultCreateSampler(DEFAULT_GLOBAL_SNAPSHOT_RATE);
-  private static Sampler GLOBAL_LOG_SAMPLER = defaultCreateSampler(DEFAULT_GLOBAL_LOG_RATE);
-  private static DoubleFunction<Sampler> samplerSupplier = ProbeRateLimiter::defaultCreateSampler;
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProbeRateLimiter.class);
+    public static final double DEFAULT_SNAPSHOT_RATE = 1.0;
+    public static final double DEFAULT_LOG_RATE = 5000.0;
+    private static final Duration ONE_SECOND_WINDOW = Duration.of(1, ChronoUnit.SECONDS);
+    private static final Duration TEN_SECONDS_WINDOW = Duration.of(10, ChronoUnit.SECONDS);
+    private static final double DEFAULT_GLOBAL_SNAPSHOT_RATE = DEFAULT_SNAPSHOT_RATE * 100;
+    private static final double DEFAULT_GLOBAL_LOG_RATE = 5000.0;
+    private static Sampler GLOBAL_SNAPSHOT_SAMPLER = defaultCreateSampler(DEFAULT_GLOBAL_SNAPSHOT_RATE);
+    private static Sampler GLOBAL_LOG_SAMPLER = defaultCreateSampler(DEFAULT_GLOBAL_LOG_RATE);
+    private static DoubleFunction<Sampler> samplerSupplier = ProbeRateLimiter::defaultCreateSampler;
 
-  public static boolean tryProbe(Sampler sampler, boolean useGlobalLowRate) {
-    Sampler globalSampler = useGlobalLowRate ? GLOBAL_SNAPSHOT_SAMPLER : GLOBAL_LOG_SAMPLER;
-    if (globalSampler.sample()) {
-      return sampler.sample();
+    public static boolean tryProbe(Sampler sampler, boolean useGlobalLowRate) {
+        Sampler globalSampler = useGlobalLowRate ? GLOBAL_SNAPSHOT_SAMPLER : GLOBAL_LOG_SAMPLER;
+        if (globalSampler.sample()) {
+            return sampler.sample();
+        }
+        return false;
     }
-    return false;
-  }
 
-  private static RateLimitInfo getDefaultRateLimitInfo(String probeId) {
-    LOGGER.debug("Setting sampling with default snapshot rate for probeId={}", probeId);
-    return new RateLimitInfo(samplerSupplier.apply(DEFAULT_SNAPSHOT_RATE), true);
-  }
-
-  public static Sampler createSampler(double rate) {
-    return samplerSupplier.apply(rate);
-  }
+    private static RateLimitInfo getDefaultRateLimitInfo(String probeId) {
+        LOGGER.debug("Setting sampling with default snapshot rate for probeId={}", probeId);
+        return new RateLimitInfo(samplerSupplier.apply(DEFAULT_SNAPSHOT_RATE), true);
+    }
 
-  public static void setGlobalSnapshotRate(double rate) {
-    GLOBAL_SNAPSHOT_SAMPLER = samplerSupplier.apply(rate);
-  }
+    public static Sampler createSampler(double rate) {
+        return samplerSupplier.apply(rate);
+    }
 
-  public static void setGlobalLogRate(double rate) {
-    GLOBAL_LOG_SAMPLER = samplerSupplier.apply(rate);
-  }
+    public static void setGlobalSnapshotRate(double rate) {
+        GLOBAL_SNAPSHOT_SAMPLER = samplerSupplier.apply(rate);
+    }
 
-  public static void resetGlobalRate() {
-    setGlobalSnapshotRate(DEFAULT_GLOBAL_LOG_RATE);
-  }
+    public static void setGlobalLogRate(double rate) {
+        GLOBAL_LOG_SAMPLER = samplerSupplier.apply(rate);
+    }
 
-  public static void setSamplerSupplier(DoubleFunction<Sampler> samplerSupplier) {
-    ProbeRateLimiter.samplerSupplier =
-        samplerSupplier != null ? samplerSupplier : ProbeRateLimiter::defaultCreateSampler;
-  }
+    public static void resetGlobalRate() {
+        setGlobalSnapshotRate(DEFAULT_GLOBAL_LOG_RATE);
+    }
 
-  private static Sampler defaultCreateSampler(double rate) {
-    if (rate < 0) {
-      return new ConstantSampler(true);
+    public static void setSamplerSupplier(DoubleFunction<Sampler> samplerSupplier) {
+        ProbeRateLimiter.samplerSupplier =
+                samplerSupplier != null ? samplerSupplier : ProbeRateLimiter::defaultCreateSampler;
     }
-    if (rate < 1) {
-      int intRate = (int) Math.round(rate * 10);
-      return new AdaptiveSampler(TEN_SECONDS_WINDOW, intRate, 180, 16, true);
+
+    private static Sampler defaultCreateSampler(double rate) {
+        if (rate < 0) {
+            return new ConstantSampler(true);
+        }
+        if (rate < 1) {
+            int intRate = (int) Math.round(rate * 10);
+            return new AdaptiveSampler(TEN_SECONDS_WINDOW, intRate, 180, 16, true);
+        }
+        return new AdaptiveSampler(ONE_SECOND_WINDOW, (int) Math.round(rate), 180, 16, true);
     }
-    return new AdaptiveSampler(ONE_SECOND_WINDOW, (int) Math.round(rate), 180, 16, true);
-  }
 
-  private static class RateLimitInfo {
-    final Sampler sampler;
-    final boolean isCaptureSnapshot;
+    private static class RateLimitInfo {
+        final Sampler sampler;
+        final boolean isCaptureSnapshot;
 
-    public RateLimitInfo(Sampler sampler, boolean isCaptureSnapshot) {
-      this.sampler = sampler;
-      this.isCaptureSnapshot = isCaptureSnapshot;
+        public RateLimitInfo(Sampler sampler, boolean isCaptureSnapshot) {
+            this.sampler = sampler;
+            this.isCaptureSnapshot = isCaptureSnapshot;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/DebuggerScript.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/DebuggerScript.java
index b248b440ba4..852c5445fdc 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/DebuggerScript.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/DebuggerScript.java
@@ -8,5 +8,5 @@
  * Because it must be reachable from the instrumented code it must be placed in bootstrap.
  */
 public interface DebuggerScript<R> {
-  R execute(ValueReferenceResolver valueRefResolver, TimeoutChecker timeoutChecker);
+    R execute(ValueReferenceResolver valueRefResolver, TimeoutChecker timeoutChecker);
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ReflectiveFieldValueResolver.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ReflectiveFieldValueResolver.java
index c5c6f5dcc29..443bc3054f9 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ReflectiveFieldValueResolver.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ReflectiveFieldValueResolver.java
@@ -15,265 +15,252 @@
 /** A helper class to resolve a reference path using reflection. */
 @SuppressForbidden // Class#forName(String)
 public class ReflectiveFieldValueResolver {
-  private static final Logger LOGGER = LoggerFactory.getLogger(ReflectiveFieldValueResolver.class);
-  // This is a workaround for the fact that Field.trySetAccessible is not available in Java 8
-  private static final MethodHandle TRY_SET_ACCESSIBLE;
-
-  static {
-    MethodHandle methodHandle = null;
-    try {
-      MethodHandles.Lookup lookup = MethodHandles.lookup();
-      methodHandle = lookup.findVirtual(Field.class, "trySetAccessible", methodType(boolean.class));
-    } catch (Exception e) {
-      LOGGER.debug(EXCLUDE_TELEMETRY, "Looking up trySetAccessible failed: ", e);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ReflectiveFieldValueResolver.class);
+    // This is a workaround for the fact that Field.trySetAccessible is not available in Java 8
+    private static final MethodHandle TRY_SET_ACCESSIBLE;
+
+    static {
+        MethodHandle methodHandle = null;
+        try {
+            MethodHandles.Lookup lookup = MethodHandles.lookup();
+            methodHandle = lookup.findVirtual(Field.class, "trySetAccessible", methodType(boolean.class));
+        } catch (Exception e) {
+            LOGGER.debug(EXCLUDE_TELEMETRY, "Looking up trySetAccessible failed: ", e);
+        }
+        TRY_SET_ACCESSIBLE = methodHandle;
+    }
+
+    // We cannot create a Field instance from scratch to be used as special constant,
+    // so need to reflectively access itself
+    private static final Field INACCESSIBLE_FIELD;
+
+    static {
+        Field field = null;
+        try {
+            field = ReflectiveFieldValueResolver.class.getDeclaredField("INACCESSIBLE_FIELD");
+        } catch (Exception e) {
+            LOGGER.debug(EXCLUDE_TELEMETRY, "INACCESSIBLE_FIELD failed: ", e);
+        }
+        INACCESSIBLE_FIELD = field;
+    }
+
+    private static final Class<?> MODULE_CLASS;
+    private static final MethodHandle GET_MODULE;
+
+    static {
+        MethodHandle methodHandle = null;
+        Class<?> moduleClass = null;
+        try {
+            moduleClass = Class.forName("java.lang.Module");
+            MethodHandles.Lookup lookup = MethodHandles.lookup();
+            methodHandle = lookup.findVirtual(Class.class, "getModule", methodType(moduleClass));
+        } catch (Exception e) {
+            LOGGER.debug(EXCLUDE_TELEMETRY, "Looking up getModule failed: ", e);
+        }
+        GET_MODULE = methodHandle;
+        MODULE_CLASS = moduleClass;
     }
-    TRY_SET_ACCESSIBLE = methodHandle;
-  }
-
-  // We cannot create a Field instance from scratch to be used as special constant,
-  // so need to reflectively access itself
-  private static final Field INACCESSIBLE_FIELD;
-
-  static {
-    Field field = null;
-    try {
-      field = ReflectiveFieldValueResolver.class.getDeclaredField("INACCESSIBLE_FIELD");
-    } catch (Exception e) {
-      LOGGER.debug(EXCLUDE_TELEMETRY, "INACCESSIBLE_FIELD failed: ", e);
+
+    public static Object resolve(Object target, Class<?> targetType, String fldName) {
+        Field fld = safeGetField(targetType, fldName);
+        if (fld == null) {
+            return Values.UNDEFINED_OBJECT;
+        }
+        if (fld == INACCESSIBLE_FIELD) {
+            return Values.UNDEFINED_OBJECT;
+        }
+        try {
+            return Modifier.isStatic(fld.getModifiers()) ? fld.get(null) : fld.get(target);
+        } catch (IllegalAccessException | IllegalArgumentException ignored) {
+            return Values.UNDEFINED_OBJECT;
+        }
+    }
+
+    public static Object getFieldValue(Object target, String fieldName)
+            throws NoSuchFieldException, IllegalAccessException {
+        return getField(target, fieldName).get(target);
     }
-    INACCESSIBLE_FIELD = field;
-  }
-
-  private static final Class<?> MODULE_CLASS;
-  private static final MethodHandle GET_MODULE;
-
-  static {
-    MethodHandle methodHandle = null;
-    Class<?> moduleClass = null;
-    try {
-      moduleClass = Class.forName("java.lang.Module");
-      MethodHandles.Lookup lookup = MethodHandles.lookup();
-      methodHandle = lookup.findVirtual(Class.class, "getModule", methodType(moduleClass));
-    } catch (Exception e) {
-      LOGGER.debug(EXCLUDE_TELEMETRY, "Looking up getModule failed: ", e);
+
+    public static CapturedContext.CapturedValue getFieldAsCapturedValue(Object target, String fieldName) {
+        if (target == null) {
+            return CapturedContext.CapturedValue.of(fieldName, Object.class.getTypeName(), null);
+        }
+        return getFieldAsCapturedValue(target.getClass(), target, fieldName);
     }
-    GET_MODULE = methodHandle;
-    MODULE_CLASS = moduleClass;
-  }
-
-  public static Object resolve(Object target, Class<?> targetType, String fldName) {
-    Field fld = safeGetField(targetType, fldName);
-    if (fld == null) {
-      return Values.UNDEFINED_OBJECT;
+
+    public static CapturedContext.CapturedValue getFieldAsCapturedValue(
+            Class<?> clazz, Object target, String fieldName) {
+        Field field;
+        try {
+            FieldResult fieldResult = getField(clazz, fieldName);
+            field = fieldResult.field;
+            if (field == null) {
+                return CapturedContext.CapturedValue.notCapturedReason(
+                        fieldName, Object.class.getTypeName(), fieldResult.msg);
+            }
+        } catch (Exception ex) {
+            return CapturedContext.CapturedValue.notCapturedReason(
+                    fieldName, Object.class.getTypeName(), ex.toString());
+        }
+        String declaredFieldType = Object.class.getTypeName();
+        try {
+            declaredFieldType = field.getType().getTypeName();
+            Object fieldValue = field.get(target);
+            return CapturedContext.CapturedValue.of(fieldName, declaredFieldType, fieldValue);
+        } catch (Exception ex) {
+            return CapturedContext.CapturedValue.notCapturedReason(fieldName, declaredFieldType, ex.toString());
+        }
     }
-    if (fld == INACCESSIBLE_FIELD) {
-      return Values.UNDEFINED_OBJECT;
+
+    public static Object getFieldValue(Class<?> targetClass, String fieldName) throws IllegalAccessException {
+        return safeGetField(targetClass, fieldName).get(null);
     }
-    try {
-      return Modifier.isStatic(fld.getModifiers()) ? fld.get(null) : fld.get(target);
-    } catch (IllegalAccessException | IllegalArgumentException ignored) {
-      return Values.UNDEFINED_OBJECT;
+
+    public static long getFieldValueAsLong(Object target, String fieldName)
+            throws NoSuchFieldException, IllegalAccessException {
+        return getField(target, fieldName).getLong(target);
     }
-  }
 
-  public static Object getFieldValue(Object target, String fieldName)
-      throws NoSuchFieldException, IllegalAccessException {
-    return getField(target, fieldName).get(target);
-  }
+    public static long getFieldValueAsLong(Class<?> targetClass, String fieldName) throws IllegalAccessException {
+        return safeGetField(targetClass, fieldName).getLong(null);
+    }
 
-  public static CapturedContext.CapturedValue getFieldAsCapturedValue(
-      Object target, String fieldName) {
-    if (target == null) {
-      return CapturedContext.CapturedValue.of(fieldName, Object.class.getTypeName(), null);
+    public static int getFieldValueAsInt(Object target, String fieldName)
+            throws NoSuchFieldException, IllegalAccessException {
+        return getField(target, fieldName).getInt(target);
     }
-    return getFieldAsCapturedValue(target.getClass(), target, fieldName);
-  }
-
-  public static CapturedContext.CapturedValue getFieldAsCapturedValue(
-      Class<?> clazz, Object target, String fieldName) {
-    Field field;
-    try {
-      FieldResult fieldResult = getField(clazz, fieldName);
-      field = fieldResult.field;
-      if (field == null) {
-        return CapturedContext.CapturedValue.notCapturedReason(
-            fieldName, Object.class.getTypeName(), fieldResult.msg);
-      }
-    } catch (Exception ex) {
-      return CapturedContext.CapturedValue.notCapturedReason(
-          fieldName, Object.class.getTypeName(), ex.toString());
+
+    public static int getFieldValueAsInt(Class<?> targetClass, String fieldName) throws IllegalAccessException {
+        return safeGetField(targetClass, fieldName).getInt(null);
     }
-    String declaredFieldType = Object.class.getTypeName();
-    try {
-      declaredFieldType = field.getType().getTypeName();
-      Object fieldValue = field.get(target);
-      return CapturedContext.CapturedValue.of(fieldName, declaredFieldType, fieldValue);
-    } catch (Exception ex) {
-      return CapturedContext.CapturedValue.notCapturedReason(
-          fieldName, declaredFieldType, ex.toString());
+
+    public static double getFieldValueAsDouble(Object target, String fieldName)
+            throws NoSuchFieldException, IllegalAccessException {
+        return getField(target, fieldName).getDouble(target);
     }
-  }
-
-  public static Object getFieldValue(Class<?> targetClass, String fieldName)
-      throws IllegalAccessException {
-    return safeGetField(targetClass, fieldName).get(null);
-  }
-
-  public static long getFieldValueAsLong(Object target, String fieldName)
-      throws NoSuchFieldException, IllegalAccessException {
-    return getField(target, fieldName).getLong(target);
-  }
-
-  public static long getFieldValueAsLong(Class<?> targetClass, String fieldName)
-      throws IllegalAccessException {
-    return safeGetField(targetClass, fieldName).getLong(null);
-  }
-
-  public static int getFieldValueAsInt(Object target, String fieldName)
-      throws NoSuchFieldException, IllegalAccessException {
-    return getField(target, fieldName).getInt(target);
-  }
-
-  public static int getFieldValueAsInt(Class<?> targetClass, String fieldName)
-      throws IllegalAccessException {
-    return safeGetField(targetClass, fieldName).getInt(null);
-  }
-
-  public static double getFieldValueAsDouble(Object target, String fieldName)
-      throws NoSuchFieldException, IllegalAccessException {
-    return getField(target, fieldName).getDouble(target);
-  }
-
-  public static double getFieldValueAsDouble(Class<?> targetClass, String fieldName)
-      throws IllegalAccessException {
-    return safeGetField(targetClass, fieldName).getDouble(null);
-  }
-
-  public static float getFieldValueAsFloat(Object target, String fieldName)
-      throws NoSuchFieldException, IllegalAccessException {
-    return getField(target, fieldName).getFloat(target);
-  }
-
-  public static float getFieldValueAsFloat(Class<?> targetClass, String fieldName)
-      throws IllegalAccessException {
-    return safeGetField(targetClass, fieldName).getFloat(null);
-  }
-
-  public static float getFieldValueAsShort(Object target, String fieldName)
-      throws NoSuchFieldException, IllegalAccessException {
-    return getField(target, fieldName).getShort(target);
-  }
-
-  public static float getFieldValueAsShort(Class<?> targetClass, String fieldName)
-      throws IllegalAccessException {
-    return safeGetField(targetClass, fieldName).getShort(null);
-  }
-
-  public static char getFieldValueAsChar(Object target, String fieldName)
-      throws NoSuchFieldException, IllegalAccessException {
-    return getField(target, fieldName).getChar(target);
-  }
-
-  public static char getFieldValueAsChar(Class<?> targetClass, String fieldName)
-      throws IllegalAccessException {
-    return safeGetField(targetClass, fieldName).getChar(null);
-  }
-
-  public static byte getFieldValueAsByte(Object target, String fieldName)
-      throws NoSuchFieldException, IllegalAccessException {
-    return getField(target, fieldName).getByte(target);
-  }
-
-  public static byte getFieldValueAsByte(Class<?> targetClass, String fieldName)
-      throws IllegalAccessException {
-    return safeGetField(targetClass, fieldName).getByte(null);
-  }
-
-  public static boolean getFieldValueAsBoolean(Object target, String fieldName)
-      throws NoSuchFieldException, IllegalAccessException {
-    return getField(target, fieldName).getBoolean(target);
-  }
-
-  public static boolean getFieldValueAsBoolean(Class<?> targetClass, String fieldName)
-      throws IllegalAccessException {
-    return safeGetField(targetClass, fieldName).getBoolean(null);
-  }
-
-  private static Field getField(Object target, String name) throws NoSuchFieldException {
-    if (target == null) {
-      throw new NullPointerException();
+
+    public static double getFieldValueAsDouble(Class<?> targetClass, String fieldName) throws IllegalAccessException {
+        return safeGetField(targetClass, fieldName).getDouble(null);
     }
-    Field field = safeGetField(target.getClass(), name);
-    if (field == null) {
-      throw new NoSuchFieldException(name);
+
+    public static float getFieldValueAsFloat(Object target, String fieldName)
+            throws NoSuchFieldException, IllegalAccessException {
+        return getField(target, fieldName).getFloat(target);
     }
-    return field;
-  }
-
-  private static Field safeGetField(Class<?> container, String name) {
-    try {
-      return getField(container, name).field;
-    } catch (SecurityException ignored) {
-      return null;
-    } catch (Exception e) {
-      // The only other exception allowed here is InaccessibleObjectException but since we compile
-      // against JDK 8 we can not use that type in the exception handler
-      return null;
+
+    public static float getFieldValueAsFloat(Class<?> targetClass, String fieldName) throws IllegalAccessException {
+        return safeGetField(targetClass, fieldName).getFloat(null);
     }
-  }
 
-  private static class FieldResult {
-    final Field field;
-    final String msg;
+    public static float getFieldValueAsShort(Object target, String fieldName)
+            throws NoSuchFieldException, IllegalAccessException {
+        return getField(target, fieldName).getShort(target);
+    }
 
-    public FieldResult(Field field, String msg) {
-      this.field = field;
-      this.msg = msg;
+    public static float getFieldValueAsShort(Class<?> targetClass, String fieldName) throws IllegalAccessException {
+        return safeGetField(targetClass, fieldName).getShort(null);
     }
-  }
-
-  private static FieldResult getField(Class<?> container, String name) {
-    while (container != null) {
-      Field[] declaredFields = container.getDeclaredFields();
-      for (int i = 0; i < declaredFields.length; i++) {
-        Field declaredField = declaredFields[i];
-        if (declaredField.getName().equals(name)) {
-          if (trySetAccessible(declaredField)) {
-            declaredField.setAccessible(true);
-          } else {
-            return new FieldResult(null, buildInaccessibleMsg(declaredField));
-          }
-          return new FieldResult(declaredField, null);
+
+    public static char getFieldValueAsChar(Object target, String fieldName)
+            throws NoSuchFieldException, IllegalAccessException {
+        return getField(target, fieldName).getChar(target);
+    }
+
+    public static char getFieldValueAsChar(Class<?> targetClass, String fieldName) throws IllegalAccessException {
+        return safeGetField(targetClass, fieldName).getChar(null);
+    }
+
+    public static byte getFieldValueAsByte(Object target, String fieldName)
+            throws NoSuchFieldException, IllegalAccessException {
+        return getField(target, fieldName).getByte(target);
+    }
+
+    public static byte getFieldValueAsByte(Class<?> targetClass, String fieldName) throws IllegalAccessException {
+        return safeGetField(targetClass, fieldName).getByte(null);
+    }
+
+    public static boolean getFieldValueAsBoolean(Object target, String fieldName)
+            throws NoSuchFieldException, IllegalAccessException {
+        return getField(target, fieldName).getBoolean(target);
+    }
+
+    public static boolean getFieldValueAsBoolean(Class<?> targetClass, String fieldName) throws IllegalAccessException {
+        return safeGetField(targetClass, fieldName).getBoolean(null);
+    }
+
+    private static Field getField(Object target, String name) throws NoSuchFieldException {
+        if (target == null) {
+            throw new NullPointerException();
+        }
+        Field field = safeGetField(target.getClass(), name);
+        if (field == null) {
+            throw new NoSuchFieldException(name);
         }
-      }
-      container = container.getSuperclass();
+        return field;
     }
-    return new FieldResult(null, "Field not found");
-  }
 
-  public static boolean trySetAccessible(Field field) {
-    if (TRY_SET_ACCESSIBLE == null) {
-      return true;
+    private static Field safeGetField(Class<?> container, String name) {
+        try {
+            return getField(container, name).field;
+        } catch (SecurityException ignored) {
+            return null;
+        } catch (Exception e) {
+            // The only other exception allowed here is InaccessibleObjectException but since we compile
+            // against JDK 8 we can not use that type in the exception handler
+            return null;
+        }
     }
-    try {
-      return (boolean) TRY_SET_ACCESSIBLE.invokeExact(field);
-    } catch (Throwable e) {
-      LOGGER.debug("trySetAccessible call failed: ", e);
-      return true;
+
+    private static class FieldResult {
+        final Field field;
+        final String msg;
+
+        public FieldResult(Field field, String msg) {
+            this.field = field;
+            this.msg = msg;
+        }
+    }
+
+    private static FieldResult getField(Class<?> container, String name) {
+        while (container != null) {
+            Field[] declaredFields = container.getDeclaredFields();
+            for (int i = 0; i < declaredFields.length; i++) {
+                Field declaredField = declaredFields[i];
+                if (declaredField.getName().equals(name)) {
+                    if (trySetAccessible(declaredField)) {
+                        declaredField.setAccessible(true);
+                    } else {
+                        return new FieldResult(null, buildInaccessibleMsg(declaredField));
+                    }
+                    return new FieldResult(declaredField, null);
+                }
+            }
+            container = container.getSuperclass();
+        }
+        return new FieldResult(null, "Field not found");
     }
-  }
-
-  public static String buildInaccessibleMsg(Field field) {
-    if (MODULE_CLASS != null && GET_MODULE != null) {
-      try {
-        Object module = GET_MODULE.invoke(field.getDeclaringClass());
-        return "Field is not accessible: "
-            + module
-            + " does not opens/exports to the current module";
-      } catch (Throwable ex) {
-        LOGGER.debug("buildInaccessibleMsg failed: ", ex);
-      }
+
+    public static boolean trySetAccessible(Field field) {
+        if (TRY_SET_ACCESSIBLE == null) {
+            return true;
+        }
+        try {
+            return (boolean) TRY_SET_ACCESSIBLE.invokeExact(field);
+        } catch (Throwable e) {
+            LOGGER.debug("trySetAccessible call failed: ", e);
+            return true;
+        }
+    }
+
+    public static String buildInaccessibleMsg(Field field) {
+        if (MODULE_CLASS != null && GET_MODULE != null) {
+            try {
+                Object module = GET_MODULE.invoke(field.getDeclaringClass());
+                return "Field is not accessible: " + module + " does not opens/exports to the current module";
+            } catch (Throwable ex) {
+                LOGGER.debug("buildInaccessibleMsg failed: ", ex);
+            }
+        }
+        return "Field is not accessible";
     }
-    return "Field is not accessible";
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ValueReferenceResolver.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ValueReferenceResolver.java
index 79fb630392a..6027693c34d 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ValueReferenceResolver.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ValueReferenceResolver.java
@@ -5,15 +5,15 @@
 
 /** Debugger EL specific value reference resolver. */
 public interface ValueReferenceResolver {
-  CapturedValue lookup(String name);
+    CapturedValue lookup(String name);
 
-  CapturedValue getMember(Object target, String name);
+    CapturedValue getMember(Object target, String name);
 
-  default void addExtension(String name, CapturedValue value) {}
+    default void addExtension(String name, CapturedValue value) {}
 
-  default void removeExtension(String name) {}
+    default void removeExtension(String name) {}
 
-  default ValueReferenceResolver withExtensions(Map<String, CapturedValue> extensions) {
-    return this;
-  }
+    default ValueReferenceResolver withExtensions(Map<String, CapturedValue> extensions) {
+        return this;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ValueReferences.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ValueReferences.java
index c64844e5e83..cefd05cd9ab 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ValueReferences.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ValueReferences.java
@@ -7,23 +7,23 @@
  */
 public final class ValueReferences {
 
-  public static String SYNTHETIC_PREFIX = "@";
-  public static String THIS = "this";
+    public static String SYNTHETIC_PREFIX = "@";
+    public static String THIS = "this";
 
-  public static String DURATION_EXTENSION_NAME = "duration";
-  public static String RETURN_EXTENSION_NAME = "return";
-  public static String ITERATOR_EXTENSION_NAME = "it";
-  public static String EXCEPTION_EXTENSION_NAME = "exception";
-  public static String KEY_EXTENSION_NAME = "key";
-  public static String VALUE_EXTENSION_NAME = "value";
-  public static String DURATION_REF = SYNTHETIC_PREFIX + DURATION_EXTENSION_NAME;
-  public static String RETURN_REF = SYNTHETIC_PREFIX + RETURN_EXTENSION_NAME;
-  public static String ITERATOR_REF = SYNTHETIC_PREFIX + ITERATOR_EXTENSION_NAME;
-  public static String EXCEPTION_REF = SYNTHETIC_PREFIX + EXCEPTION_EXTENSION_NAME;
-  public static String KEY_REF = SYNTHETIC_PREFIX + KEY_EXTENSION_NAME;
-  public static String VALUE_REF = SYNTHETIC_PREFIX + VALUE_EXTENSION_NAME;
+    public static String DURATION_EXTENSION_NAME = "duration";
+    public static String RETURN_EXTENSION_NAME = "return";
+    public static String ITERATOR_EXTENSION_NAME = "it";
+    public static String EXCEPTION_EXTENSION_NAME = "exception";
+    public static String KEY_EXTENSION_NAME = "key";
+    public static String VALUE_EXTENSION_NAME = "value";
+    public static String DURATION_REF = SYNTHETIC_PREFIX + DURATION_EXTENSION_NAME;
+    public static String RETURN_REF = SYNTHETIC_PREFIX + RETURN_EXTENSION_NAME;
+    public static String ITERATOR_REF = SYNTHETIC_PREFIX + ITERATOR_EXTENSION_NAME;
+    public static String EXCEPTION_REF = SYNTHETIC_PREFIX + EXCEPTION_EXTENSION_NAME;
+    public static String KEY_REF = SYNTHETIC_PREFIX + KEY_EXTENSION_NAME;
+    public static String VALUE_REF = SYNTHETIC_PREFIX + VALUE_EXTENSION_NAME;
 
-  public static String synthetic(String name) {
-    return SYNTHETIC_PREFIX + name;
-  }
+    public static String synthetic(String name) {
+        return SYNTHETIC_PREFIX + name;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/Values.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/Values.java
index 8562e899a2c..21e175a3f27 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/Values.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/Values.java
@@ -1,28 +1,25 @@
 package datadog.trace.bootstrap.debugger.el;
 
 public final class Values {
-  /** A generic undefined value object */
-  public static final Object UNDEFINED_OBJECT =
-      new Object() {
+    /** A generic undefined value object */
+    public static final Object UNDEFINED_OBJECT = new Object() {
         @Override
         public String toString() {
-          return "UNDEFINED";
+            return "UNDEFINED";
         }
-      };
+    };
 
-  public static final Object NULL_OBJECT =
-      new Object() {
+    public static final Object NULL_OBJECT = new Object() {
         @Override
         public String toString() {
-          return "NULL";
+            return "NULL";
         }
-      };
+    };
 
-  public static final Object THIS_OBJECT =
-      new Object() {
+    public static final Object THIS_OBJECT = new Object() {
         @Override
         public String toString() {
-          return "this";
+            return "this";
         }
-      };
+    };
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/CpuTimeoutChecker.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/CpuTimeoutChecker.java
index 42d082ee675..7a45ab72e0d 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/CpuTimeoutChecker.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/CpuTimeoutChecker.java
@@ -5,22 +5,22 @@
 import java.time.Duration;
 
 public class CpuTimeoutChecker implements TimeoutChecker {
-  private final Duration timeOut;
-  private final ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
-  private final long startCpuTime;
+    private final Duration timeOut;
+    private final ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+    private final long startCpuTime;
 
-  public CpuTimeoutChecker(Duration timeout) {
-    this.timeOut = timeout;
-    startCpuTime = threadMXBean.getCurrentThreadCpuTime();
-  }
+    public CpuTimeoutChecker(Duration timeout) {
+        this.timeOut = timeout;
+        startCpuTime = threadMXBean.getCurrentThreadCpuTime();
+    }
 
-  @Override
-  public boolean isTimedOut() {
-    return threadMXBean.getCurrentThreadCpuTime() - startCpuTime >= timeOut.toNanos();
-  }
+    @Override
+    public boolean isTimedOut() {
+        return threadMXBean.getCurrentThreadCpuTime() - startCpuTime >= timeOut.toNanos();
+    }
 
-  @Override
-  public Duration getTimeOut() {
-    return timeOut;
-  }
+    @Override
+    public Duration getTimeOut() {
+        return timeOut;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java
index d67886afd05..eeb88ff4f70 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java
@@ -11,214 +11,212 @@
 import java.util.regex.Pattern;
 
 public class Redaction {
-  // Need to be a unique instance (new String) for reference equality (==) and
-  // avoid internalization (intern) by the JVM because it's a string constant
-  public static final String REDACTED_VALUE = new String("redacted".toCharArray());
+    // Need to be a unique instance (new String) for reference equality (==) and
+    // avoid internalization (intern) by the JVM because it's a string constant
+    public static final String REDACTED_VALUE = new String("redacted".toCharArray());
 
-  private static final Pattern COMMA_PATTERN = Pattern.compile(",");
-  private static final List<String> PREDEFINED_KEYWORDS =
-      Arrays.asList(
-          "2fa",
-          "accesstoken",
-          "aiohttpsession",
-          "apikey",
-          "appkey",
-          "apisecret",
-          "apisignature",
-          "applicationkey",
-          "auth",
-          "authorization",
-          "authtoken",
-          "ccnumber",
-          "certificatepin",
-          "cipher",
-          "clientid",
-          "clientsecret",
-          "connectionstring",
-          "connectsid",
-          "cookie",
-          "credentials",
-          "creditcard",
-          "csrf",
-          "csrftoken",
-          "cvv",
-          "databaseurl",
-          "dburl",
-          "encryptionkey",
-          "encryptionkeyid",
-          "geolocation",
-          "gpgkey",
-          "ipaddress",
-          "jti",
-          "jwt",
-          "licensekey",
-          "masterkey",
-          "mysqlpwd",
-          "nonce",
-          "oauth",
-          "oauthtoken",
-          "otp",
-          "passhash",
-          "passwd",
-          "password",
-          "passwordb",
-          "pemfile",
-          "pgpkey",
-          "phpsessid",
-          "pin",
-          "pincode",
-          "pkcs8",
-          "privatekey",
-          "publickey",
-          "pwd",
-          "recaptchakey",
-          "refreshtoken",
-          "routingnumber",
-          "salt",
-          "secret",
-          "secretkey",
-          "secrettoken",
-          "securityanswer",
-          "securitycode",
-          "securityquestion",
-          "serviceaccountcredentials",
-          "session",
-          "sessionid",
-          "sessionkey",
-          "setcookie",
-          "signature",
-          "signaturekey",
-          "sshkey",
-          "ssn",
-          "symfony",
-          "token",
-          "transactionid",
-          "twiliotoken",
-          "usersession",
-          "voterid",
-          "xapikey",
-          "xauthtoken",
-          "xcsrftoken",
-          "xforwardedfor",
-          "xrealip",
-          "xsrf",
-          "xsrftoken");
-  private static final Set<String> KEYWORDS = ConcurrentHashMap.newKeySet();
-  private static ClassNameTrie typeTrie = ClassNameTrie.EMPTY_TRIE;
-  private static List<String> redactedClasses;
-  private static List<String> redactedPackages;
+    private static final Pattern COMMA_PATTERN = Pattern.compile(",");
+    private static final List<String> PREDEFINED_KEYWORDS = Arrays.asList(
+            "2fa",
+            "accesstoken",
+            "aiohttpsession",
+            "apikey",
+            "appkey",
+            "apisecret",
+            "apisignature",
+            "applicationkey",
+            "auth",
+            "authorization",
+            "authtoken",
+            "ccnumber",
+            "certificatepin",
+            "cipher",
+            "clientid",
+            "clientsecret",
+            "connectionstring",
+            "connectsid",
+            "cookie",
+            "credentials",
+            "creditcard",
+            "csrf",
+            "csrftoken",
+            "cvv",
+            "databaseurl",
+            "dburl",
+            "encryptionkey",
+            "encryptionkeyid",
+            "geolocation",
+            "gpgkey",
+            "ipaddress",
+            "jti",
+            "jwt",
+            "licensekey",
+            "masterkey",
+            "mysqlpwd",
+            "nonce",
+            "oauth",
+            "oauthtoken",
+            "otp",
+            "passhash",
+            "passwd",
+            "password",
+            "passwordb",
+            "pemfile",
+            "pgpkey",
+            "phpsessid",
+            "pin",
+            "pincode",
+            "pkcs8",
+            "privatekey",
+            "publickey",
+            "pwd",
+            "recaptchakey",
+            "refreshtoken",
+            "routingnumber",
+            "salt",
+            "secret",
+            "secretkey",
+            "secrettoken",
+            "securityanswer",
+            "securitycode",
+            "securityquestion",
+            "serviceaccountcredentials",
+            "session",
+            "sessionid",
+            "sessionkey",
+            "setcookie",
+            "signature",
+            "signaturekey",
+            "sshkey",
+            "ssn",
+            "symfony",
+            "token",
+            "transactionid",
+            "twiliotoken",
+            "usersession",
+            "voterid",
+            "xapikey",
+            "xauthtoken",
+            "xcsrftoken",
+            "xforwardedfor",
+            "xrealip",
+            "xsrf",
+            "xsrftoken");
+    private static final Set<String> KEYWORDS = ConcurrentHashMap.newKeySet();
+    private static ClassNameTrie typeTrie = ClassNameTrie.EMPTY_TRIE;
+    private static List<String> redactedClasses;
+    private static List<String> redactedPackages;
 
-  static {
-    initKeywords();
-  }
-
-  static void initKeywords() {
-    /*
-     * based on sentry list: https://github.com/getsentry/sentry-python/blob/fefb454287b771ac31db4e30fa459d9be2f977b8/sentry_sdk/scrubber.py#L17-L58
-     */
-    KEYWORDS.addAll(PREDEFINED_KEYWORDS);
-    // Exclude user defined keywords
-    for (String keyword : Config.get().getDynamicInstrumentationRedactionExcludedIdentifiers()) {
-      KEYWORDS.remove(normalize(keyword));
+    static {
+        initKeywords();
     }
-  }
 
-  public static void addUserDefinedKeywords(Config config) {
-    String redactedIdentifiers = config.getDynamicInstrumentationRedactedIdentifiers();
-    if (redactedIdentifiers == null) {
-      return;
-    }
-    String[] identifiers = COMMA_PATTERN.split(redactedIdentifiers);
-    for (String identifier : identifiers) {
-      KEYWORDS.add(normalize(identifier));
+    static void initKeywords() {
+        /*
+         * based on sentry list: https://github.com/getsentry/sentry-python/blob/fefb454287b771ac31db4e30fa459d9be2f977b8/sentry_sdk/scrubber.py#L17-L58
+         */
+        KEYWORDS.addAll(PREDEFINED_KEYWORDS);
+        // Exclude user defined keywords
+        for (String keyword : Config.get().getDynamicInstrumentationRedactionExcludedIdentifiers()) {
+            KEYWORDS.remove(normalize(keyword));
+        }
     }
-  }
 
-  public static void addUserDefinedTypes(Config config) {
-    String redactedTypes = config.getDynamicInstrumentationRedactedTypes();
-    if (redactedTypes == null) {
-      return;
+    public static void addUserDefinedKeywords(Config config) {
+        String redactedIdentifiers = config.getDynamicInstrumentationRedactedIdentifiers();
+        if (redactedIdentifiers == null) {
+            return;
+        }
+        String[] identifiers = COMMA_PATTERN.split(redactedIdentifiers);
+        for (String identifier : identifiers) {
+            KEYWORDS.add(normalize(identifier));
+        }
     }
-    List<String> packages = null;
-    List<String> classes = null;
-    ClassNameTrie.Builder builder = new ClassNameTrie.Builder();
-    String[] types = COMMA_PATTERN.split(redactedTypes);
-    for (String type : types) {
-      builder.put(type, 1);
-      if (type.endsWith("*")) {
-        if (packages == null) {
-          packages = new ArrayList<>();
+
+    public static void addUserDefinedTypes(Config config) {
+        String redactedTypes = config.getDynamicInstrumentationRedactedTypes();
+        if (redactedTypes == null) {
+            return;
         }
-        type =
-            type.endsWith(".*")
-                ? type.substring(0, type.length() - 2)
-                : type.substring(0, type.length() - 1);
-        packages.add(type);
-      } else {
-        if (classes == null) {
-          classes = new ArrayList<>();
+        List<String> packages = null;
+        List<String> classes = null;
+        ClassNameTrie.Builder builder = new ClassNameTrie.Builder();
+        String[] types = COMMA_PATTERN.split(redactedTypes);
+        for (String type : types) {
+            builder.put(type, 1);
+            if (type.endsWith("*")) {
+                if (packages == null) {
+                    packages = new ArrayList<>();
+                }
+                type = type.endsWith(".*")
+                        ? type.substring(0, type.length() - 2)
+                        : type.substring(0, type.length() - 1);
+                packages.add(type);
+            } else {
+                if (classes == null) {
+                    classes = new ArrayList<>();
+                }
+                classes.add(type);
+            }
         }
-        classes.add(type);
-      }
+        typeTrie = builder.buildTrie();
+        redactedPackages = packages;
+        redactedClasses = classes;
     }
-    typeTrie = builder.buildTrie();
-    redactedPackages = packages;
-    redactedClasses = classes;
-  }
 
-  public static boolean isRedactedKeyword(String name) {
-    if (name == null) {
-      return false;
+    public static boolean isRedactedKeyword(String name) {
+        if (name == null) {
+            return false;
+        }
+        name = normalize(name);
+        return KEYWORDS.contains(name);
     }
-    name = normalize(name);
-    return KEYWORDS.contains(name);
-  }
 
-  public static boolean isRedactedType(String className) {
-    if (className == null) {
-      return false;
+    public static boolean isRedactedType(String className) {
+        if (className == null) {
+            return false;
+        }
+        return typeTrie.apply(className) > 0;
     }
-    return typeTrie.apply(className) > 0;
-  }
 
-  public static List<String> getRedactedPackages() {
-    return redactedPackages != null ? redactedPackages : Collections.emptyList();
-  }
+    public static List<String> getRedactedPackages() {
+        return redactedPackages != null ? redactedPackages : Collections.emptyList();
+    }
 
-  public static List<String> getRedactedClasses() {
-    return redactedClasses != null ? redactedClasses : Collections.emptyList();
-  }
+    public static List<String> getRedactedClasses() {
+        return redactedClasses != null ? redactedClasses : Collections.emptyList();
+    }
 
-  public static void clearUserDefinedTypes() {
-    typeTrie = ClassNameTrie.EMPTY_TRIE;
-  }
+    public static void clearUserDefinedTypes() {
+        typeTrie = ClassNameTrie.EMPTY_TRIE;
+    }
 
-  public static void resetUserDefinedKeywords() {
-    KEYWORDS.clear();
-    KEYWORDS.addAll(PREDEFINED_KEYWORDS);
-  }
+    public static void resetUserDefinedKeywords() {
+        KEYWORDS.clear();
+        KEYWORDS.addAll(PREDEFINED_KEYWORDS);
+    }
 
-  private static String normalize(String name) {
-    StringBuilder sb = null;
-    for (int i = 0; i < name.length(); i++) {
-      char c = name.charAt(i);
-      boolean isUpper = Character.isUpperCase(c);
-      boolean isRemovable = isRemovableChar(c);
-      if (isUpper || isRemovable || sb != null) {
-        if (sb == null) {
-          sb = new StringBuilder(name.substring(0, i));
-        }
-        if (isUpper) {
-          sb.append(Character.toLowerCase(c));
-        } else if (!isRemovable) {
-          sb.append(c);
+    private static String normalize(String name) {
+        StringBuilder sb = null;
+        for (int i = 0; i < name.length(); i++) {
+            char c = name.charAt(i);
+            boolean isUpper = Character.isUpperCase(c);
+            boolean isRemovable = isRemovableChar(c);
+            if (isUpper || isRemovable || sb != null) {
+                if (sb == null) {
+                    sb = new StringBuilder(name.substring(0, i));
+                }
+                if (isUpper) {
+                    sb.append(Character.toLowerCase(c));
+                } else if (!isRemovable) {
+                    sb.append(c);
+                }
+            }
         }
-      }
+        return sb != null ? sb.toString() : name;
     }
-    return sb != null ? sb.toString() : name;
-  }
 
-  private static boolean isRemovableChar(char c) {
-    return c == '_' || c == '-' || c == '$' || c == '@';
-  }
+    private static boolean isRemovableChar(char c) {
+        return c == '_' || c == '-' || c == '$' || c == '@';
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/TimeoutChecker.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/TimeoutChecker.java
index a49bb9d3208..7001cd9e6d6 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/TimeoutChecker.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/TimeoutChecker.java
@@ -5,17 +5,17 @@
 
 public interface TimeoutChecker {
 
-  String CPU = "CPU";
-  String WALL = "WALL";
+    String CPU = "CPU";
+    String WALL = "WALL";
 
-  boolean isTimedOut();
+    boolean isTimedOut();
 
-  Duration getTimeOut();
+    Duration getTimeOut();
 
-  static TimeoutChecker create(Config config, Duration timeout) {
-    if (config.getDynamicInstrumentationTimeoutCheckerMode().equals(CPU)) {
-      return new CpuTimeoutChecker(timeout);
+    static TimeoutChecker create(Config config, Duration timeout) {
+        if (config.getDynamicInstrumentationTimeoutCheckerMode().equals(CPU)) {
+            return new CpuTimeoutChecker(timeout);
+        }
+        return new WallTimeoutChecker(timeout);
     }
-    return new WallTimeoutChecker(timeout);
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WallTimeoutChecker.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WallTimeoutChecker.java
index 1bc72b69c45..d74db79fca9 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WallTimeoutChecker.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WallTimeoutChecker.java
@@ -4,34 +4,34 @@
 
 public class WallTimeoutChecker implements TimeoutChecker {
 
-  private final long start;
-  private final Duration timeOut;
-
-  public WallTimeoutChecker(Duration timeOut) {
-    this.start = System.currentTimeMillis();
-    this.timeOut = timeOut;
-  }
-
-  public WallTimeoutChecker(long start, Duration timeOut) {
-    this.start = start;
-    this.timeOut = timeOut;
-  }
-
-  public boolean isTimedOut(long currentTimeMillis) {
-    return (currentTimeMillis - start) > timeOut.toMillis();
-  }
-
-  @Override
-  public boolean isTimedOut() {
-    return isTimedOut(System.currentTimeMillis());
-  }
-
-  public long getStart() {
-    return start;
-  }
-
-  @Override
-  public Duration getTimeOut() {
-    return timeOut;
-  }
+    private final long start;
+    private final Duration timeOut;
+
+    public WallTimeoutChecker(Duration timeOut) {
+        this.start = System.currentTimeMillis();
+        this.timeOut = timeOut;
+    }
+
+    public WallTimeoutChecker(long start, Duration timeOut) {
+        this.start = start;
+        this.timeOut = timeOut;
+    }
+
+    public boolean isTimedOut(long currentTimeMillis) {
+        return (currentTimeMillis - start) > timeOut.toMillis();
+    }
+
+    @Override
+    public boolean isTimedOut() {
+        return isTimedOut(System.currentTimeMillis());
+    }
+
+    public long getStart() {
+        return start;
+    }
+
+    @Override
+    public Duration getTimeOut() {
+        return timeOut;
+    }
 }
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 3d9b68977b0..76a88a710be 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
@@ -28,471 +28,441 @@
 import org.slf4j.LoggerFactory;
 
 public class WellKnownClasses {
-  private static final Logger LOGGER = LoggerFactory.getLogger(WellKnownClasses.class);
-
-  /** Set of class names which have a toString side effect free and class final */
-  private static final Map<String, Function<Object, String>> TO_STRING_FINAL_SAFE_CLASSES =
-      new HashMap<>();
-
-  static {
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Class", WellKnownClasses::classToString);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.String", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Boolean", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Integer", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Long", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Double", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Character", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Byte", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Float", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Short", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.math.BigDecimal", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.math.BigInteger", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.time.Duration", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.time.Instant", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.time.LocalTime", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.time.LocalDate", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.time.LocalDateTime", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.util.UUID", String::valueOf);
-    TO_STRING_FINAL_SAFE_CLASSES.put("java.net.URI", String::valueOf);
-  }
-
-  private static final Map<String, Function<Object, String>> SAFE_TO_STRING_FUNCTIONS =
-      new HashMap<>();
-
-  static {
-    SAFE_TO_STRING_FUNCTIONS.putAll(TO_STRING_FINAL_SAFE_CLASSES);
-    SAFE_TO_STRING_FUNCTIONS.put("java.util.concurrent.atomic.AtomicBoolean", String::valueOf);
-    SAFE_TO_STRING_FUNCTIONS.put("java.util.concurrent.atomic.AtomicInteger", String::valueOf);
-    SAFE_TO_STRING_FUNCTIONS.put("java.util.concurrent.atomic.AtomicLong", String::valueOf);
-    SAFE_TO_STRING_FUNCTIONS.put("java.io.File", String::valueOf);
-    // implementations of java.io.file.Path interfaces
-    SAFE_TO_STRING_FUNCTIONS.put("sun.nio.fs.UnixPath", String::valueOf);
-    SAFE_TO_STRING_FUNCTIONS.put("sun.nio.fs.WindowsPath", String::valueOf);
-    SAFE_TO_STRING_FUNCTIONS.put("java.util.Date", WellKnownClasses::dateToString);
-  }
-
-  private static final Map<String, ToLongFunction<Object>> LONG_FUNCTIONS = new HashMap<>();
-
-  static {
-    LONG_FUNCTIONS.put("java.util.Date", WellKnownClasses::dateToLongValue);
-  }
-
-  private static final Set<String> EQUALS_SAFE_CLASSES = new HashSet<>();
-
-  static {
-    EQUALS_SAFE_CLASSES.add("java.lang.Class");
-    EQUALS_SAFE_CLASSES.add("java.lang.String");
-    EQUALS_SAFE_CLASSES.add("java.lang.Boolean");
-    EQUALS_SAFE_CLASSES.add("java.lang.Integer");
-    EQUALS_SAFE_CLASSES.add("java.lang.Long");
-    EQUALS_SAFE_CLASSES.add("java.lang.Double");
-    EQUALS_SAFE_CLASSES.add("java.lang.Character");
-    EQUALS_SAFE_CLASSES.add("java.lang.Byte");
-    EQUALS_SAFE_CLASSES.add("java.lang.Float");
-    EQUALS_SAFE_CLASSES.add("java.lang.Short");
-    EQUALS_SAFE_CLASSES.add("java.math.BigDecimal");
-    EQUALS_SAFE_CLASSES.add("java.math.BigInteger");
-    EQUALS_SAFE_CLASSES.add("java.time.Duration");
-    EQUALS_SAFE_CLASSES.add("java.time.Instant");
-    EQUALS_SAFE_CLASSES.add("java.time.LocalTime");
-    EQUALS_SAFE_CLASSES.add("java.time.LocalDate");
-    EQUALS_SAFE_CLASSES.add("java.time.LocalDateTime");
-    EQUALS_SAFE_CLASSES.add("java.util.UUID");
-    EQUALS_SAFE_CLASSES.add("java.net.URI");
-    EQUALS_SAFE_CLASSES.add("java.io.File");
-    EQUALS_SAFE_CLASSES.add("sun.nio.fs.UnixPath");
-    EQUALS_SAFE_CLASSES.add("sun.nio.fs.WindowsPath");
-  }
-
-  private static final Set<String> STRING_PRIMITIVES =
-      new HashSet<>(
-          Arrays.asList(
-              "java.lang.Class",
-              "java.lang.String",
-              "java.time.Duration",
-              "java.time.Instant",
-              "java.time.LocalTime",
-              "java.time.LocalDate",
-              "java.time.LocalDateTime",
-              "java.util.UUID",
-              "java.net.URI",
-              "java.io.File",
-              "sun.nio.fs.UnixPath",
-              "sun.nio.fs.WindowsPath"));
-
-  private static final Set<String> LONG_PRIMITIVES = new HashSet<>(Arrays.asList("java.util.Date"));
-
-  private static final Map<Class<?>, Map<String, Function<Object, CapturedContext.CapturedValue>>>
-      SPECIAL_TYPE_ACCESS = new HashMap<>();
-
-  private static final Map<String, Function<Object, CapturedContext.CapturedValue>>
-      STACKTRACEELEMENT_SPECIAL_FIELDS = new HashMap<>();
-
-  private static Method getModuleNameMethod;
-
-  static {
-    STACKTRACEELEMENT_SPECIAL_FIELDS.put("declaringClass", StackTraceElementFields::declaringClass);
-    STACKTRACEELEMENT_SPECIAL_FIELDS.put("methodName", StackTraceElementFields::methodName);
-    STACKTRACEELEMENT_SPECIAL_FIELDS.put("fileName", StackTraceElementFields::fileName);
-    STACKTRACEELEMENT_SPECIAL_FIELDS.put("lineNumber", StackTraceElementFields::lineNumber);
-    STACKTRACEELEMENT_SPECIAL_FIELDS.put("moduleName", StackTraceElementFields::moduleName);
-    try {
-      getModuleNameMethod = StackTraceElement.class.getMethod("getModuleName");
-    } catch (NoSuchMethodException e) {
-      getModuleNameMethod = null;
+    private static final Logger LOGGER = LoggerFactory.getLogger(WellKnownClasses.class);
+
+    /** Set of class names which have a toString side effect free and class final */
+    private static final Map<String, Function<Object, String>> TO_STRING_FINAL_SAFE_CLASSES = new HashMap<>();
+
+    static {
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Class", WellKnownClasses::classToString);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.String", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Boolean", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Integer", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Long", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Double", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Character", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Byte", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Float", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.lang.Short", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.math.BigDecimal", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.math.BigInteger", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.time.Duration", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.time.Instant", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.time.LocalTime", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.time.LocalDate", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.time.LocalDateTime", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.util.UUID", String::valueOf);
+        TO_STRING_FINAL_SAFE_CLASSES.put("java.net.URI", String::valueOf);
     }
-  }
-
-  private static final Map<String, Function<Object, CapturedContext.CapturedValue>>
-      OPTIONAL_SPECIAL_FIELDS = new HashMap<>();
-  private static final Map<String, Function<Object, CapturedContext.CapturedValue>>
-      OPTIONALINT_SPECIAL_FIELDS = new HashMap<>();
-  private static final Map<String, Function<Object, CapturedContext.CapturedValue>>
-      OPTIONALDOUBLE_SPECIAL_FIELDS = new HashMap<>();
-  private static final Map<String, Function<Object, CapturedContext.CapturedValue>>
-      OPTIONALLONG_SPECIAL_FIELDS = new HashMap<>();
-  private static final Map<String, Function<Object, CapturedContext.CapturedValue>>
-      COMPLETABLEFUTURE_SPECIAL_FIELDS = new HashMap<>();
-
-  static {
-    OPTIONAL_SPECIAL_FIELDS.put("value", OptionalFields::value);
-    OPTIONALINT_SPECIAL_FIELDS.put("value", OptionalFields::valueInt);
-    OPTIONALDOUBLE_SPECIAL_FIELDS.put("value", OptionalFields::valueDouble);
-    OPTIONALLONG_SPECIAL_FIELDS.put("value", OptionalFields::valueLong);
-    if (JavaVirtualMachine.isJavaVersionAtLeast(19)) {
-      // Future::resultNow method is available since JDK 19
-      COMPLETABLEFUTURE_SPECIAL_FIELDS.put("result", CompletableFutureFields::result);
+
+    private static final Map<String, Function<Object, String>> SAFE_TO_STRING_FUNCTIONS = new HashMap<>();
+
+    static {
+        SAFE_TO_STRING_FUNCTIONS.putAll(TO_STRING_FINAL_SAFE_CLASSES);
+        SAFE_TO_STRING_FUNCTIONS.put("java.util.concurrent.atomic.AtomicBoolean", String::valueOf);
+        SAFE_TO_STRING_FUNCTIONS.put("java.util.concurrent.atomic.AtomicInteger", String::valueOf);
+        SAFE_TO_STRING_FUNCTIONS.put("java.util.concurrent.atomic.AtomicLong", String::valueOf);
+        SAFE_TO_STRING_FUNCTIONS.put("java.io.File", String::valueOf);
+        // implementations of java.io.file.Path interfaces
+        SAFE_TO_STRING_FUNCTIONS.put("sun.nio.fs.UnixPath", String::valueOf);
+        SAFE_TO_STRING_FUNCTIONS.put("sun.nio.fs.WindowsPath", String::valueOf);
+        SAFE_TO_STRING_FUNCTIONS.put("java.util.Date", WellKnownClasses::dateToString);
+    }
+
+    private static final Map<String, ToLongFunction<Object>> LONG_FUNCTIONS = new HashMap<>();
+
+    static {
+        LONG_FUNCTIONS.put("java.util.Date", WellKnownClasses::dateToLongValue);
     }
-  }
-
-  static {
-    SPECIAL_TYPE_ACCESS.put(StackTraceElement.class, STACKTRACEELEMENT_SPECIAL_FIELDS);
-    SPECIAL_TYPE_ACCESS.put(Optional.class, OPTIONAL_SPECIAL_FIELDS);
-    SPECIAL_TYPE_ACCESS.put(OptionalInt.class, OPTIONALINT_SPECIAL_FIELDS);
-    SPECIAL_TYPE_ACCESS.put(OptionalDouble.class, OPTIONALDOUBLE_SPECIAL_FIELDS);
-    SPECIAL_TYPE_ACCESS.put(OptionalLong.class, OPTIONALLONG_SPECIAL_FIELDS);
-    if (JavaVirtualMachine.isJavaVersionAtLeast(19)) {
-      // Future::resultNow method is available since JDK 19
-      SPECIAL_TYPE_ACCESS.put(CompletableFuture.class, COMPLETABLEFUTURE_SPECIAL_FIELDS);
+
+    private static final Set<String> EQUALS_SAFE_CLASSES = new HashSet<>();
+
+    static {
+        EQUALS_SAFE_CLASSES.add("java.lang.Class");
+        EQUALS_SAFE_CLASSES.add("java.lang.String");
+        EQUALS_SAFE_CLASSES.add("java.lang.Boolean");
+        EQUALS_SAFE_CLASSES.add("java.lang.Integer");
+        EQUALS_SAFE_CLASSES.add("java.lang.Long");
+        EQUALS_SAFE_CLASSES.add("java.lang.Double");
+        EQUALS_SAFE_CLASSES.add("java.lang.Character");
+        EQUALS_SAFE_CLASSES.add("java.lang.Byte");
+        EQUALS_SAFE_CLASSES.add("java.lang.Float");
+        EQUALS_SAFE_CLASSES.add("java.lang.Short");
+        EQUALS_SAFE_CLASSES.add("java.math.BigDecimal");
+        EQUALS_SAFE_CLASSES.add("java.math.BigInteger");
+        EQUALS_SAFE_CLASSES.add("java.time.Duration");
+        EQUALS_SAFE_CLASSES.add("java.time.Instant");
+        EQUALS_SAFE_CLASSES.add("java.time.LocalTime");
+        EQUALS_SAFE_CLASSES.add("java.time.LocalDate");
+        EQUALS_SAFE_CLASSES.add("java.time.LocalDateTime");
+        EQUALS_SAFE_CLASSES.add("java.util.UUID");
+        EQUALS_SAFE_CLASSES.add("java.net.URI");
+        EQUALS_SAFE_CLASSES.add("java.io.File");
+        EQUALS_SAFE_CLASSES.add("sun.nio.fs.UnixPath");
+        EQUALS_SAFE_CLASSES.add("sun.nio.fs.WindowsPath");
     }
-  }
-
-  private static final Map<String, Function<Object, CapturedContext.CapturedValue>>
-      THROWABLE_SPECIAL_FIELDS = new HashMap<>();
-
-  static {
-    THROWABLE_SPECIAL_FIELDS.put("detailMessage", ThrowableFields::detailMessage);
-    THROWABLE_SPECIAL_FIELDS.put("suppressedExceptions", ThrowableFields::suppressedExceptions);
-    THROWABLE_SPECIAL_FIELDS.put("stackTrace", ThrowableFields::stackTrace);
-    THROWABLE_SPECIAL_FIELDS.put("cause", ThrowableFields::cause);
-  }
-
-  private static final List<String> SAFE_COLLECTION_PACKAGES =
-      Arrays.asList(
-          "java.", // JDK base module
-          "com.google.protobuf.", // Google ProtoBuf
-          "com.google.common.collect.", // Google Guava
-          "it.unimi.dsi.fastutil.", // fastutil
-          "org.agrona.collections." // Agrona
-          );
-
-  private static final Set<String> UNSAFE_COLLECTION_CLASSES =
-      new HashSet<>(
-          Arrays.asList(
-              // Collection with synchronized methods can lead to deadlock
-              "java.util.Stack",
-              "java.util.Vector",
-              "java.util.Collections$SynchronizedSet",
-              "java.util.Collections$SynchronizedCollection",
-              "java.util.Collections$SynchronizedSortedSet",
-              "java.util.Collections$SynchronizedNavigableSet",
-              "java.util.Collections$SynchronizedList",
-              "java.util.Collections$SynchronizedRandomAccessList"));
-
-  private static final Set<String> UNSAFE_MAP_CLASSES =
-      new HashSet<>(
-          Arrays.asList(
-              // Maps with synchronized methods can lead to deadlock
-              "java.util.Hashtable",
-              "java.util.Properties",
-              "java.util.Collections$SynchronizedMap",
-              "java.util.Collections$SynchronizedSortedMap",
-              "java.util.Collections$SynchronizedNavigableMap"));
-
-  private static final List<String> SAFE_MAP_PACKAGES =
-      Arrays.asList(
-          "java.", // JDK base module
-          "com.google.protobuf.", // Google ProtoBuf
-          "com.google.common.collect.", // Google Guava
-          "it.unimi.dsi.fastutil.", // fastutil
-          "org.agrona.collections." // Agrona
-          );
-
-  /**
-   * @return true if type is a final class and toString implementation is well known and side effect
-   *     free
-   */
-  public static boolean isToStringFinalSafe(String type) {
-    return TO_STRING_FINAL_SAFE_CLASSES.containsKey(type);
-  }
-
-  /**
-   * @return true if type is a class with a toString implementation is well known and side effect
-   *     free, but input type name should be a dynamic/concrete type and not a declared type. some
-   *     classes are not final and could be overridden toString
-   */
-  public static boolean isToStringSafe(String concreteType) {
-    return SAFE_TO_STRING_FUNCTIONS.containsKey(concreteType);
-  }
-
-  /**
-   * @return true if collection implementation is safe to call (only in-memory and lock free)
-   */
-  public static boolean isSafe(Collection<?> collection) {
-    return isSafe(
-        collection.getClass().getTypeName(), SAFE_COLLECTION_PACKAGES, UNSAFE_COLLECTION_CLASSES);
-  }
-
-  /**
-   * @return true if map implementation is safe to call (only in-memory and lock free)
-   */
-  public static boolean isSafe(Map<?, ?> map) {
-    return isSafe(map.getClass().getTypeName(), SAFE_MAP_PACKAGES, UNSAFE_MAP_CLASSES);
-  }
-
-  private static boolean isSafe(
-      String className, List<String> safePackages, Set<String> unsafeClasses) {
-    if (unsafeClasses.contains(className)) {
-      return false;
+
+    private static final Set<String> STRING_PRIMITIVES = new HashSet<>(Arrays.asList(
+            "java.lang.Class",
+            "java.lang.String",
+            "java.time.Duration",
+            "java.time.Instant",
+            "java.time.LocalTime",
+            "java.time.LocalDate",
+            "java.time.LocalDateTime",
+            "java.util.UUID",
+            "java.net.URI",
+            "java.io.File",
+            "sun.nio.fs.UnixPath",
+            "sun.nio.fs.WindowsPath"));
+
+    private static final Set<String> LONG_PRIMITIVES = new HashSet<>(Arrays.asList("java.util.Date"));
+
+    private static final Map<Class<?>, Map<String, Function<Object, CapturedContext.CapturedValue>>>
+            SPECIAL_TYPE_ACCESS = new HashMap<>();
+
+    private static final Map<String, Function<Object, CapturedContext.CapturedValue>> STACKTRACEELEMENT_SPECIAL_FIELDS =
+            new HashMap<>();
+
+    private static Method getModuleNameMethod;
+
+    static {
+        STACKTRACEELEMENT_SPECIAL_FIELDS.put("declaringClass", StackTraceElementFields::declaringClass);
+        STACKTRACEELEMENT_SPECIAL_FIELDS.put("methodName", StackTraceElementFields::methodName);
+        STACKTRACEELEMENT_SPECIAL_FIELDS.put("fileName", StackTraceElementFields::fileName);
+        STACKTRACEELEMENT_SPECIAL_FIELDS.put("lineNumber", StackTraceElementFields::lineNumber);
+        STACKTRACEELEMENT_SPECIAL_FIELDS.put("moduleName", StackTraceElementFields::moduleName);
+        try {
+            getModuleNameMethod = StackTraceElement.class.getMethod("getModuleName");
+        } catch (NoSuchMethodException e) {
+            getModuleNameMethod = null;
+        }
     }
-    for (String safePackage : safePackages) {
-      if (className.startsWith(safePackage)) {
-        return true;
-      }
+
+    private static final Map<String, Function<Object, CapturedContext.CapturedValue>> OPTIONAL_SPECIAL_FIELDS =
+            new HashMap<>();
+    private static final Map<String, Function<Object, CapturedContext.CapturedValue>> OPTIONALINT_SPECIAL_FIELDS =
+            new HashMap<>();
+    private static final Map<String, Function<Object, CapturedContext.CapturedValue>> OPTIONALDOUBLE_SPECIAL_FIELDS =
+            new HashMap<>();
+    private static final Map<String, Function<Object, CapturedContext.CapturedValue>> OPTIONALLONG_SPECIAL_FIELDS =
+            new HashMap<>();
+    private static final Map<String, Function<Object, CapturedContext.CapturedValue>> COMPLETABLEFUTURE_SPECIAL_FIELDS =
+            new HashMap<>();
+
+    static {
+        OPTIONAL_SPECIAL_FIELDS.put("value", OptionalFields::value);
+        OPTIONALINT_SPECIAL_FIELDS.put("value", OptionalFields::valueInt);
+        OPTIONALDOUBLE_SPECIAL_FIELDS.put("value", OptionalFields::valueDouble);
+        OPTIONALLONG_SPECIAL_FIELDS.put("value", OptionalFields::valueLong);
+        if (JavaVirtualMachine.isJavaVersionAtLeast(19)) {
+            // Future::resultNow method is available since JDK 19
+            COMPLETABLEFUTURE_SPECIAL_FIELDS.put("result", CompletableFutureFields::result);
+        }
     }
-    return false;
-  }
-
-  /**
-   * indicates if type is considered as a string primitive and can be compared to a string literal
-   * with Expression Language
-   */
-  public static boolean isStringPrimitive(String type) {
-    return STRING_PRIMITIVES.contains(type);
-  }
-
-  /**
-   * indicates if type is considered as a int/long primitive and can be compared to another long
-   * value or literal with Expression Language
-   */
-  public static boolean isLongPrimitive(String type) {
-    return LONG_PRIMITIVES.contains(type);
-  }
-
-  /**
-   * @return a map of fields with function to access special field of a type, or null if type is not
-   *     supported. This is used to avoid using reflection to access fields on well known types
-   */
-  public static Map<String, Function<Object, CapturedContext.CapturedValue>> getSpecialTypeAccess(
-      Object value) {
-    if (value == null) {
-      return null;
+
+    static {
+        SPECIAL_TYPE_ACCESS.put(StackTraceElement.class, STACKTRACEELEMENT_SPECIAL_FIELDS);
+        SPECIAL_TYPE_ACCESS.put(Optional.class, OPTIONAL_SPECIAL_FIELDS);
+        SPECIAL_TYPE_ACCESS.put(OptionalInt.class, OPTIONALINT_SPECIAL_FIELDS);
+        SPECIAL_TYPE_ACCESS.put(OptionalDouble.class, OPTIONALDOUBLE_SPECIAL_FIELDS);
+        SPECIAL_TYPE_ACCESS.put(OptionalLong.class, OPTIONALLONG_SPECIAL_FIELDS);
+        if (JavaVirtualMachine.isJavaVersionAtLeast(19)) {
+            // Future::resultNow method is available since JDK 19
+            SPECIAL_TYPE_ACCESS.put(CompletableFuture.class, COMPLETABLEFUTURE_SPECIAL_FIELDS);
+        }
     }
-    Map<String, Function<Object, CapturedContext.CapturedValue>> specialTypeAccess =
-        SPECIAL_TYPE_ACCESS.get(value.getClass());
-    if (specialTypeAccess != null) {
-      return specialTypeAccess;
+
+    private static final Map<String, Function<Object, CapturedContext.CapturedValue>> THROWABLE_SPECIAL_FIELDS =
+            new HashMap<>();
+
+    static {
+        THROWABLE_SPECIAL_FIELDS.put("detailMessage", ThrowableFields::detailMessage);
+        THROWABLE_SPECIAL_FIELDS.put("suppressedExceptions", ThrowableFields::suppressedExceptions);
+        THROWABLE_SPECIAL_FIELDS.put("stackTrace", ThrowableFields::stackTrace);
+        THROWABLE_SPECIAL_FIELDS.put("cause", ThrowableFields::cause);
     }
-    if (value instanceof Throwable) {
-      return THROWABLE_SPECIAL_FIELDS;
+
+    private static final List<String> SAFE_COLLECTION_PACKAGES = Arrays.asList(
+            "java.", // JDK base module
+            "com.google.protobuf.", // Google ProtoBuf
+            "com.google.common.collect.", // Google Guava
+            "it.unimi.dsi.fastutil.", // fastutil
+            "org.agrona.collections." // Agrona
+            );
+
+    private static final Set<String> UNSAFE_COLLECTION_CLASSES = new HashSet<>(Arrays.asList(
+            // Collection with synchronized methods can lead to deadlock
+            "java.util.Stack",
+            "java.util.Vector",
+            "java.util.Collections$SynchronizedSet",
+            "java.util.Collections$SynchronizedCollection",
+            "java.util.Collections$SynchronizedSortedSet",
+            "java.util.Collections$SynchronizedNavigableSet",
+            "java.util.Collections$SynchronizedList",
+            "java.util.Collections$SynchronizedRandomAccessList"));
+
+    private static final Set<String> UNSAFE_MAP_CLASSES = new HashSet<>(Arrays.asList(
+            // Maps with synchronized methods can lead to deadlock
+            "java.util.Hashtable",
+            "java.util.Properties",
+            "java.util.Collections$SynchronizedMap",
+            "java.util.Collections$SynchronizedSortedMap",
+            "java.util.Collections$SynchronizedNavigableMap"));
+
+    private static final List<String> SAFE_MAP_PACKAGES = Arrays.asList(
+            "java.", // JDK base module
+            "com.google.protobuf.", // Google ProtoBuf
+            "com.google.common.collect.", // Google Guava
+            "it.unimi.dsi.fastutil.", // fastutil
+            "org.agrona.collections." // Agrona
+            );
+
+    /**
+     * @return true if type is a final class and toString implementation is well known and side effect
+     *     free
+     */
+    public static boolean isToStringFinalSafe(String type) {
+        return TO_STRING_FINAL_SAFE_CLASSES.containsKey(type);
     }
-    return null;
-  }
-
-  /**
-   * @param type the type name of the object to generate a string representation for. Must be a
-   *     concrete type, not a declared type. see {@link #isToStringSafe(String)}
-   * @return a function to generate a string representation of a type where the default toString
-   *     method is not suitable
-   */
-  public static Function<Object, String> getSafeToString(String type) {
-    return SAFE_TO_STRING_FUNCTIONS.get(type);
-  }
-
-  private static String classToString(Object o) {
-    return ((Class<?>) o).getTypeName();
-  }
-
-  private static String dateToString(Object o) {
-    return Long.toString(((Date) o).getTime());
-  }
-
-  private static long dateToLongValue(Object o) {
-    return ((Date) o).getTime();
-  }
-
-  public static boolean isEqualsSafe(Class<?> clazz) {
-    return clazz.isPrimitive()
-        || clazz.isEnum()
-        || EQUALS_SAFE_CLASSES.contains(clazz.getTypeName());
-  }
-
-  public static ToLongFunction<Object> getLongPrimitiveValueFunction(String typeName) {
-    return LONG_FUNCTIONS.get(typeName);
-  }
-
-  private static class ThrowableFields {
-    public static final String BECAUSE_OVERRIDDEN =
-        "Special access method not safe to be called because overridden";
-
-    public static CapturedContext.CapturedValue detailMessage(Object o) {
-      return captureIfNotOverridden(
-          (Throwable) o,
-          "detailMessage",
-          "getMessage",
-          String.class,
-          Throwable.class,
-          Throwable::getMessage);
+
+    /**
+     * @return true if type is a class with a toString implementation is well known and side effect
+     *     free, but input type name should be a dynamic/concrete type and not a declared type. some
+     *     classes are not final and could be overridden toString
+     */
+    public static boolean isToStringSafe(String concreteType) {
+        return SAFE_TO_STRING_FUNCTIONS.containsKey(concreteType);
     }
 
-    public static CapturedContext.CapturedValue suppressedExceptions(Object o) {
-      return CapturedContext.CapturedValue.of(
-          "suppressedExceptions", String.class.getTypeName(), ((Throwable) o).getSuppressed());
+    /**
+     * @return true if collection implementation is safe to call (only in-memory and lock free)
+     */
+    public static boolean isSafe(Collection<?> collection) {
+        return isSafe(collection.getClass().getTypeName(), SAFE_COLLECTION_PACKAGES, UNSAFE_COLLECTION_CLASSES);
     }
 
-    public static CapturedContext.CapturedValue stackTrace(Object o) {
-      return captureIfNotOverridden(
-          (Throwable) o,
-          "stackTrace",
-          "getStackTrace",
-          StackTraceElement[].class,
-          Throwable.class,
-          Throwable::getStackTrace);
+    /**
+     * @return true if map implementation is safe to call (only in-memory and lock free)
+     */
+    public static boolean isSafe(Map<?, ?> map) {
+        return isSafe(map.getClass().getTypeName(), SAFE_MAP_PACKAGES, UNSAFE_MAP_CLASSES);
     }
 
-    public static CapturedContext.CapturedValue cause(Object o) {
-      return captureIfNotOverridden(
-          (Throwable) o,
-          "cause",
-          "getCause",
-          Throwable.class,
-          Throwable.class,
-          Throwable::getCause);
+    private static boolean isSafe(String className, List<String> safePackages, Set<String> unsafeClasses) {
+        if (unsafeClasses.contains(className)) {
+            return false;
+        }
+        for (String safePackage : safePackages) {
+            if (className.startsWith(safePackage)) {
+                return true;
+            }
+        }
+        return false;
     }
 
-    private static <T, R> CapturedContext.CapturedValue captureIfNotOverridden(
-        T obj,
-        String fieldName,
-        String methodName,
-        Class<R> fieldType,
-        Class<T> orginalDeclaringClass,
-        Function<T, R> supplier) {
-      if (isOverridden(obj, methodName, orginalDeclaringClass)) {
-        return CapturedContext.CapturedValue.notCapturedReason(
-            fieldName, fieldType.getTypeName(), BECAUSE_OVERRIDDEN);
-      }
-      return CapturedContext.CapturedValue.of(
-          fieldName, fieldType.getTypeName(), supplier.apply(obj));
+    /**
+     * indicates if type is considered as a string primitive and can be compared to a string literal
+     * with Expression Language
+     */
+    public static boolean isStringPrimitive(String type) {
+        return STRING_PRIMITIVES.contains(type);
     }
 
-    private static boolean isOverridden(
-        Object value, String methodName, Class<?> originalDeclaringClass) {
-      Class<?> declaringClass = null;
-      try {
-        declaringClass = value.getClass().getMethod(methodName).getDeclaringClass();
-      } catch (NoSuchMethodException e) {
-        LOGGER.debug("Failed to get declaring class for Throwable::getMessage", e);
-      }
-      return declaringClass != originalDeclaringClass;
+    /**
+     * indicates if type is considered as a int/long primitive and can be compared to another long
+     * value or literal with Expression Language
+     */
+    public static boolean isLongPrimitive(String type) {
+        return LONG_PRIMITIVES.contains(type);
     }
-  }
 
-  private static class StackTraceElementFields {
-    public static CapturedContext.CapturedValue declaringClass(Object o) {
-      return CapturedContext.CapturedValue.of(
-          "declaringClass", String.class.getTypeName(), ((StackTraceElement) o).getClassName());
+    /**
+     * @return a map of fields with function to access special field of a type, or null if type is not
+     *     supported. This is used to avoid using reflection to access fields on well known types
+     */
+    public static Map<String, Function<Object, CapturedContext.CapturedValue>> getSpecialTypeAccess(Object value) {
+        if (value == null) {
+            return null;
+        }
+        Map<String, Function<Object, CapturedContext.CapturedValue>> specialTypeAccess =
+                SPECIAL_TYPE_ACCESS.get(value.getClass());
+        if (specialTypeAccess != null) {
+            return specialTypeAccess;
+        }
+        if (value instanceof Throwable) {
+            return THROWABLE_SPECIAL_FIELDS;
+        }
+        return null;
     }
 
-    public static CapturedContext.CapturedValue methodName(Object o) {
-      return CapturedContext.CapturedValue.of(
-          "methodName", String.class.getTypeName(), ((StackTraceElement) o).getMethodName());
+    /**
+     * @param type the type name of the object to generate a string representation for. Must be a
+     *     concrete type, not a declared type. see {@link #isToStringSafe(String)}
+     * @return a function to generate a string representation of a type where the default toString
+     *     method is not suitable
+     */
+    public static Function<Object, String> getSafeToString(String type) {
+        return SAFE_TO_STRING_FUNCTIONS.get(type);
     }
 
-    public static CapturedContext.CapturedValue fileName(Object o) {
-      return CapturedContext.CapturedValue.of(
-          "fileName", String.class.getTypeName(), ((StackTraceElement) o).getFileName());
+    private static String classToString(Object o) {
+        return ((Class<?>) o).getTypeName();
     }
 
-    public static CapturedContext.CapturedValue lineNumber(Object o) {
-      return CapturedContext.CapturedValue.of(
-          "lineNumber", String.class.getTypeName(), ((StackTraceElement) o).getLineNumber());
+    private static String dateToString(Object o) {
+        return Long.toString(((Date) o).getTime());
     }
 
-    public static CapturedContext.CapturedValue moduleName(Object o) {
-      StackTraceElement stackTraceElement = (StackTraceElement) o;
-      Object value = null;
-      if (getModuleNameMethod != null) {
-        try {
-          value = getModuleNameMethod.invoke(stackTraceElement);
-        } catch (InvocationTargetException | IllegalAccessException e) {
-          throw new RuntimeException(e);
-        }
-      }
-      return CapturedContext.CapturedValue.of("moduleName", String.class.getTypeName(), value);
+    private static long dateToLongValue(Object o) {
+        return ((Date) o).getTime();
     }
-  }
 
-  private static class OptionalFields {
-    public static CapturedContext.CapturedValue value(Object o) {
-      return CapturedContext.CapturedValue.of(
-          "value", Object.class.getTypeName(), ((Optional<?>) o).orElse(null));
+    public static boolean isEqualsSafe(Class<?> clazz) {
+        return clazz.isPrimitive() || clazz.isEnum() || EQUALS_SAFE_CLASSES.contains(clazz.getTypeName());
     }
 
-    public static CapturedContext.CapturedValue valueInt(Object o) {
-      return CapturedContext.CapturedValue.of(
-          "value", Integer.TYPE.getTypeName(), ((OptionalInt) o).orElse(0));
+    public static ToLongFunction<Object> getLongPrimitiveValueFunction(String typeName) {
+        return LONG_FUNCTIONS.get(typeName);
     }
 
-    public static CapturedContext.CapturedValue valueDouble(Object o) {
-      return CapturedContext.CapturedValue.of(
-          "value", Double.TYPE.getTypeName(), ((OptionalDouble) o).orElse(0.0));
+    private static class ThrowableFields {
+        public static final String BECAUSE_OVERRIDDEN =
+                "Special access method not safe to be called because overridden";
+
+        public static CapturedContext.CapturedValue detailMessage(Object o) {
+            return captureIfNotOverridden(
+                    (Throwable) o, "detailMessage", "getMessage", String.class, Throwable.class, Throwable::getMessage);
+        }
+
+        public static CapturedContext.CapturedValue suppressedExceptions(Object o) {
+            return CapturedContext.CapturedValue.of(
+                    "suppressedExceptions", String.class.getTypeName(), ((Throwable) o).getSuppressed());
+        }
+
+        public static CapturedContext.CapturedValue stackTrace(Object o) {
+            return captureIfNotOverridden(
+                    (Throwable) o,
+                    "stackTrace",
+                    "getStackTrace",
+                    StackTraceElement[].class,
+                    Throwable.class,
+                    Throwable::getStackTrace);
+        }
+
+        public static CapturedContext.CapturedValue cause(Object o) {
+            return captureIfNotOverridden(
+                    (Throwable) o, "cause", "getCause", Throwable.class, Throwable.class, Throwable::getCause);
+        }
+
+        private static <T, R> CapturedContext.CapturedValue captureIfNotOverridden(
+                T obj,
+                String fieldName,
+                String methodName,
+                Class<R> fieldType,
+                Class<T> orginalDeclaringClass,
+                Function<T, R> supplier) {
+            if (isOverridden(obj, methodName, orginalDeclaringClass)) {
+                return CapturedContext.CapturedValue.notCapturedReason(
+                        fieldName, fieldType.getTypeName(), BECAUSE_OVERRIDDEN);
+            }
+            return CapturedContext.CapturedValue.of(fieldName, fieldType.getTypeName(), supplier.apply(obj));
+        }
+
+        private static boolean isOverridden(Object value, String methodName, Class<?> originalDeclaringClass) {
+            Class<?> declaringClass = null;
+            try {
+                declaringClass = value.getClass().getMethod(methodName).getDeclaringClass();
+            } catch (NoSuchMethodException e) {
+                LOGGER.debug("Failed to get declaring class for Throwable::getMessage", e);
+            }
+            return declaringClass != originalDeclaringClass;
+        }
     }
 
-    public static CapturedContext.CapturedValue valueLong(Object o) {
-      return CapturedContext.CapturedValue.of(
-          "value", Long.TYPE.getTypeName(), ((OptionalLong) o).orElse(0L));
+    private static class StackTraceElementFields {
+        public static CapturedContext.CapturedValue declaringClass(Object o) {
+            return CapturedContext.CapturedValue.of(
+                    "declaringClass", String.class.getTypeName(), ((StackTraceElement) o).getClassName());
+        }
+
+        public static CapturedContext.CapturedValue methodName(Object o) {
+            return CapturedContext.CapturedValue.of(
+                    "methodName", String.class.getTypeName(), ((StackTraceElement) o).getMethodName());
+        }
+
+        public static CapturedContext.CapturedValue fileName(Object o) {
+            return CapturedContext.CapturedValue.of(
+                    "fileName", String.class.getTypeName(), ((StackTraceElement) o).getFileName());
+        }
+
+        public static CapturedContext.CapturedValue lineNumber(Object o) {
+            return CapturedContext.CapturedValue.of(
+                    "lineNumber", String.class.getTypeName(), ((StackTraceElement) o).getLineNumber());
+        }
+
+        public static CapturedContext.CapturedValue moduleName(Object o) {
+            StackTraceElement stackTraceElement = (StackTraceElement) o;
+            Object value = null;
+            if (getModuleNameMethod != null) {
+                try {
+                    value = getModuleNameMethod.invoke(stackTraceElement);
+                } catch (InvocationTargetException | IllegalAccessException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+            return CapturedContext.CapturedValue.of("moduleName", String.class.getTypeName(), value);
+        }
     }
-  }
 
-  private static class CompletableFutureFields {
-    private static final MethodHandle RESULT_NOW;
+    private static class OptionalFields {
+        public static CapturedContext.CapturedValue value(Object o) {
+            return CapturedContext.CapturedValue.of(
+                    "value", Object.class.getTypeName(), ((Optional<?>) o).orElse(null));
+        }
+
+        public static CapturedContext.CapturedValue valueInt(Object o) {
+            return CapturedContext.CapturedValue.of("value", Integer.TYPE.getTypeName(), ((OptionalInt) o).orElse(0));
+        }
 
-    static {
-      MethodHandle methodHandle = null;
-      try {
-        MethodHandles.Lookup lookup = MethodHandles.lookup();
-        methodHandle =
-            lookup.findVirtual(CompletableFuture.class, "resultNow", methodType(Object.class));
-      } catch (Exception e) {
-        LOGGER.debug(EXCLUDE_TELEMETRY, "Looking up CompletableFuture::resultNow failed: ", e);
-      }
-      RESULT_NOW = methodHandle;
+        public static CapturedContext.CapturedValue valueDouble(Object o) {
+            return CapturedContext.CapturedValue.of(
+                    "value", Double.TYPE.getTypeName(), ((OptionalDouble) o).orElse(0.0));
+        }
+
+        public static CapturedContext.CapturedValue valueLong(Object o) {
+            return CapturedContext.CapturedValue.of("value", Long.TYPE.getTypeName(), ((OptionalLong) o).orElse(0L));
+        }
     }
 
-    public static CapturedContext.CapturedValue result(Object o) {
-      if (RESULT_NOW == null) {
-        throw new UnsupportedOperationException("CompletableFuture::resultNow not available");
-      }
-      try {
-        CompletableFuture<?> future = (CompletableFuture<?>) o;
-        // need to check with isDone() to avoid getting exception if null.
-        // Known benign rare race condition result != null => result == null
-        // between isDone() and resultNow()
-        Object result = future.isDone() ? RESULT_NOW.invokeExact((future)) : null;
-        return CapturedContext.CapturedValue.of("result", Object.class.getTypeName(), result);
-      } catch (Throwable t) {
-        throw new RuntimeException(t);
-      }
+    private static class CompletableFutureFields {
+        private static final MethodHandle RESULT_NOW;
+
+        static {
+            MethodHandle methodHandle = null;
+            try {
+                MethodHandles.Lookup lookup = MethodHandles.lookup();
+                methodHandle = lookup.findVirtual(CompletableFuture.class, "resultNow", methodType(Object.class));
+            } catch (Exception e) {
+                LOGGER.debug(EXCLUDE_TELEMETRY, "Looking up CompletableFuture::resultNow failed: ", e);
+            }
+            RESULT_NOW = methodHandle;
+        }
+
+        public static CapturedContext.CapturedValue result(Object o) {
+            if (RESULT_NOW == null) {
+                throw new UnsupportedOperationException("CompletableFuture::resultNow not available");
+            }
+            try {
+                CompletableFuture<?> future = (CompletableFuture<?>) o;
+                // need to check with isDone() to avoid getting exception if null.
+                // Known benign rare race condition result != null => result == null
+                // between isDone() and resultNow()
+                Object result = future.isDone() ? RESULT_NOW.invokeExact((future)) : null;
+                return CapturedContext.CapturedValue.of("result", Object.class.getTypeName(), result);
+            } catch (Throwable t) {
+                throw new RuntimeException(t);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/DebuggerContextTest.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/DebuggerContextTest.java
index 0292ccf6657..6ce65e8c257 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/DebuggerContextTest.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/DebuggerContextTest.java
@@ -8,92 +8,84 @@
 
 public class DebuggerContextTest {
 
-  @Test
-  public void metric() {
-    MockMetricForwarder metricForwarder = new MockMetricForwarder();
-    DebuggerContext.initMetricForwarder(metricForwarder);
-
-    final String COUNT_METRIC_NAME = "countMetric";
-    DebuggerContext.metric("probeId", DebuggerContext.MetricKind.COUNT, COUNT_METRIC_NAME, 1, null);
-    assertEquals(1, metricForwarder.counters.get(COUNT_METRIC_NAME));
-
-    final String GAUGE_METRIC_NAME = "gaugeMetric";
-    DebuggerContext.metric(
-        "probeId", DebuggerContext.MetricKind.GAUGE, GAUGE_METRIC_NAME, 42, null);
-    assertEquals(42, metricForwarder.gauges.get(GAUGE_METRIC_NAME));
-
-    final String DOUBLE_GAUGE_METRIC_NAME = "doubleGaugeMetric";
-    DebuggerContext.metric(
-        "probeId", DebuggerContext.MetricKind.GAUGE, DOUBLE_GAUGE_METRIC_NAME, 3.14, null);
-    assertEquals(3.14, metricForwarder.doubleGauges.get(DOUBLE_GAUGE_METRIC_NAME));
-
-    final String HISTOGRAM_METRIC_NAME = "histogramMetric";
-    DebuggerContext.metric(
-        "probeId", DebuggerContext.MetricKind.HISTOGRAM, HISTOGRAM_METRIC_NAME, 42, null);
-    assertEquals(42, metricForwarder.histograms.get(HISTOGRAM_METRIC_NAME));
-
-    final String DOUBLE_HISTOGRAM_METRIC_NAME = "doubleHistogramMetric";
-    DebuggerContext.metric(
-        "probeId", DebuggerContext.MetricKind.HISTOGRAM, DOUBLE_HISTOGRAM_METRIC_NAME, 3.14, null);
-    assertEquals(3.14, metricForwarder.doubleHistograms.get(DOUBLE_HISTOGRAM_METRIC_NAME));
-
-    final String DISTRIBUTION_METRIC_NAME = "distributionMetric";
-    DebuggerContext.metric(
-        "probeId", DebuggerContext.MetricKind.DISTRIBUTION, DISTRIBUTION_METRIC_NAME, 42, null);
-    assertEquals(42, metricForwarder.distributions.get(DISTRIBUTION_METRIC_NAME));
-
-    final String DOUBLE_DISTRIBUTION_METRIC_NAME = "doubleDistributionMetric";
-    DebuggerContext.metric(
-        "probeId",
-        DebuggerContext.MetricKind.DISTRIBUTION,
-        DOUBLE_DISTRIBUTION_METRIC_NAME,
-        3.14,
-        null);
-    assertEquals(3.14, metricForwarder.doubleDistributions.get(DOUBLE_DISTRIBUTION_METRIC_NAME));
-  }
-
-  static class MockMetricForwarder implements DebuggerContext.MetricForwarder {
-    Map<String, Long> counters = new HashMap<>();
-    Map<String, Long> gauges = new HashMap<>();
-    Map<String, Double> doubleGauges = new HashMap<>();
-    Map<String, Long> histograms = new HashMap<>();
-    Map<String, Double> doubleHistograms = new HashMap<>();
-    Map<String, Long> distributions = new HashMap<>();
-    Map<String, Double> doubleDistributions = new HashMap<>();
-
-    @Override
-    public void count(String encodedProbeId, String name, long delta, String[] tags) {
-      counters.compute(name, (key, value) -> value != null ? value + delta : delta);
+    @Test
+    public void metric() {
+        MockMetricForwarder metricForwarder = new MockMetricForwarder();
+        DebuggerContext.initMetricForwarder(metricForwarder);
+
+        final String COUNT_METRIC_NAME = "countMetric";
+        DebuggerContext.metric("probeId", DebuggerContext.MetricKind.COUNT, COUNT_METRIC_NAME, 1, null);
+        assertEquals(1, metricForwarder.counters.get(COUNT_METRIC_NAME));
+
+        final String GAUGE_METRIC_NAME = "gaugeMetric";
+        DebuggerContext.metric("probeId", DebuggerContext.MetricKind.GAUGE, GAUGE_METRIC_NAME, 42, null);
+        assertEquals(42, metricForwarder.gauges.get(GAUGE_METRIC_NAME));
+
+        final String DOUBLE_GAUGE_METRIC_NAME = "doubleGaugeMetric";
+        DebuggerContext.metric("probeId", DebuggerContext.MetricKind.GAUGE, DOUBLE_GAUGE_METRIC_NAME, 3.14, null);
+        assertEquals(3.14, metricForwarder.doubleGauges.get(DOUBLE_GAUGE_METRIC_NAME));
+
+        final String HISTOGRAM_METRIC_NAME = "histogramMetric";
+        DebuggerContext.metric("probeId", DebuggerContext.MetricKind.HISTOGRAM, HISTOGRAM_METRIC_NAME, 42, null);
+        assertEquals(42, metricForwarder.histograms.get(HISTOGRAM_METRIC_NAME));
+
+        final String DOUBLE_HISTOGRAM_METRIC_NAME = "doubleHistogramMetric";
+        DebuggerContext.metric(
+                "probeId", DebuggerContext.MetricKind.HISTOGRAM, DOUBLE_HISTOGRAM_METRIC_NAME, 3.14, null);
+        assertEquals(3.14, metricForwarder.doubleHistograms.get(DOUBLE_HISTOGRAM_METRIC_NAME));
+
+        final String DISTRIBUTION_METRIC_NAME = "distributionMetric";
+        DebuggerContext.metric("probeId", DebuggerContext.MetricKind.DISTRIBUTION, DISTRIBUTION_METRIC_NAME, 42, null);
+        assertEquals(42, metricForwarder.distributions.get(DISTRIBUTION_METRIC_NAME));
+
+        final String DOUBLE_DISTRIBUTION_METRIC_NAME = "doubleDistributionMetric";
+        DebuggerContext.metric(
+                "probeId", DebuggerContext.MetricKind.DISTRIBUTION, DOUBLE_DISTRIBUTION_METRIC_NAME, 3.14, null);
+        assertEquals(3.14, metricForwarder.doubleDistributions.get(DOUBLE_DISTRIBUTION_METRIC_NAME));
     }
 
-    @Override
-    public void gauge(String encodedProbeId, String name, long value, String[] tags) {
-      gauges.put(name, value);
+    static class MockMetricForwarder implements DebuggerContext.MetricForwarder {
+        Map<String, Long> counters = new HashMap<>();
+        Map<String, Long> gauges = new HashMap<>();
+        Map<String, Double> doubleGauges = new HashMap<>();
+        Map<String, Long> histograms = new HashMap<>();
+        Map<String, Double> doubleHistograms = new HashMap<>();
+        Map<String, Long> distributions = new HashMap<>();
+        Map<String, Double> doubleDistributions = new HashMap<>();
+
+        @Override
+        public void count(String encodedProbeId, String name, long delta, String[] tags) {
+            counters.compute(name, (key, value) -> value != null ? value + delta : delta);
+        }
+
+        @Override
+        public void gauge(String encodedProbeId, String name, long value, String[] tags) {
+            gauges.put(name, value);
+        }
+
+        @Override
+        public void gauge(String encodedProbeId, String name, double value, String[] tags) {
+            doubleGauges.put(name, value);
+        }
+
+        @Override
+        public void histogram(String encodedProbeId, String name, long value, String[] tags) {
+            histograms.put(name, value);
+        }
+
+        @Override
+        public void histogram(String encodedProbeId, String name, double value, String[] tags) {
+            doubleHistograms.put(name, value);
+        }
+
+        @Override
+        public void distribution(String encodedProbeId, String name, long value, String[] tags) {
+            distributions.put(name, value);
+        }
+
+        @Override
+        public void distribution(String encodedProbeId, String name, double value, String[] tags) {
+            doubleDistributions.put(name, value);
+        }
     }
-
-    @Override
-    public void gauge(String encodedProbeId, String name, double value, String[] tags) {
-      doubleGauges.put(name, value);
-    }
-
-    @Override
-    public void histogram(String encodedProbeId, String name, long value, String[] tags) {
-      histograms.put(name, value);
-    }
-
-    @Override
-    public void histogram(String encodedProbeId, String name, double value, String[] tags) {
-      doubleHistograms.put(name, value);
-    }
-
-    @Override
-    public void distribution(String encodedProbeId, String name, long value, String[] tags) {
-      distributions.put(name, value);
-    }
-
-    @Override
-    public void distribution(String encodedProbeId, String name, double value, String[] tags) {
-      doubleDistributions.put(name, value);
-    }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/el/ReflectiveFieldValueResolverTest.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/el/ReflectiveFieldValueResolverTest.java
index 0b0f2661b18..9a8d0b66a9f 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/el/ReflectiveFieldValueResolverTest.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/el/ReflectiveFieldValueResolverTest.java
@@ -13,52 +13,50 @@
 
 class ReflectiveFieldValueResolverTest {
 
-  @Test
-  void testGetFieldAsCapturedValue() {
-    assertNull(getFieldAsCapturedValue(null, "fieldName").getValue());
-    C c = new C();
-    assertEquals(3, getFieldAsCapturedValue(c, "c1").getValue());
-    assertEquals(1, getFieldAsCapturedValue(c, "a1").getValue());
-    assertEquals("2", getFieldAsCapturedValue(c, "a2").getValue());
-    assertNull(getFieldAsCapturedValue(c, "notExist").getValue());
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_17)
-  void testGetFieldAsCapturedValueInaccessible() {
-    CapturedContext.CapturedValue elementData =
-        getFieldAsCapturedValue(new ArrayList<>(), "elementData");
-    assertEquals(
-        "Field is not accessible: module java.base does not opens/exports to the current module",
-        elementData.getNotCapturedReason());
-  }
-
-  @Test
-  void testResolve() {
-    assertEquals(1, resolve(new A(), A.class, "a1"));
-    assertEquals("2", resolve(new A(), A.class, "a2"));
-    assertEquals(3, resolve(new C(), C.class, "c1"));
-    assertEquals(1, resolve(new C(), C.class, "a1"));
-    assertEquals(4, resolve(new C(), C.class, "c2"));
-    assertEquals(Values.UNDEFINED_OBJECT, resolve(new C(), C.class, "unknown"));
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_17)
-  void testResolveInaccessible() {
-    assertEquals(
-        Values.UNDEFINED_OBJECT, resolve(new ArrayList<>(), ArrayList.class, "elementData"));
-  }
-
-  static class A {
-    private int a1 = 1;
-    private String a2 = "2";
-  }
-
-  static class B extends A {}
-
-  static class C extends A {
-    private int c1 = 3;
-    private static int c2 = 4;
-  }
+    @Test
+    void testGetFieldAsCapturedValue() {
+        assertNull(getFieldAsCapturedValue(null, "fieldName").getValue());
+        C c = new C();
+        assertEquals(3, getFieldAsCapturedValue(c, "c1").getValue());
+        assertEquals(1, getFieldAsCapturedValue(c, "a1").getValue());
+        assertEquals("2", getFieldAsCapturedValue(c, "a2").getValue());
+        assertNull(getFieldAsCapturedValue(c, "notExist").getValue());
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_17)
+    void testGetFieldAsCapturedValueInaccessible() {
+        CapturedContext.CapturedValue elementData = getFieldAsCapturedValue(new ArrayList<>(), "elementData");
+        assertEquals(
+                "Field is not accessible: module java.base does not opens/exports to the current module",
+                elementData.getNotCapturedReason());
+    }
+
+    @Test
+    void testResolve() {
+        assertEquals(1, resolve(new A(), A.class, "a1"));
+        assertEquals("2", resolve(new A(), A.class, "a2"));
+        assertEquals(3, resolve(new C(), C.class, "c1"));
+        assertEquals(1, resolve(new C(), C.class, "a1"));
+        assertEquals(4, resolve(new C(), C.class, "c2"));
+        assertEquals(Values.UNDEFINED_OBJECT, resolve(new C(), C.class, "unknown"));
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_17)
+    void testResolveInaccessible() {
+        assertEquals(Values.UNDEFINED_OBJECT, resolve(new ArrayList<>(), ArrayList.class, "elementData"));
+    }
+
+    static class A {
+        private int a1 = 1;
+        private String a2 = "2";
+    }
+
+    static class B extends A {}
+
+    static class C extends A {
+        private int c1 = 3;
+        private static int c2 = 4;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/RedactionTest.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/RedactionTest.java
index 7b3a7650d13..fce03986a32 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/RedactionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/RedactionTest.java
@@ -12,72 +12,70 @@
 
 class RedactionTest {
 
-  @Test
-  public void basic() {
-    assertFalse(Redaction.isRedactedKeyword(null));
-    assertFalse(Redaction.isRedactedKeyword(""));
-    assertFalse(Redaction.isRedactedKeyword("foobar"));
-    assertFalse(Redaction.isRedactedKeyword("@-_$"));
-    assertTrue(Redaction.isRedactedKeyword("password"));
-    assertTrue(Redaction.isRedactedKeyword("PassWord"));
-    assertTrue(Redaction.isRedactedKeyword("pass-word"));
-    assertTrue(Redaction.isRedactedKeyword("_Pass-Word_"));
-    assertTrue(Redaction.isRedactedKeyword("$pass_worD"));
-    assertTrue(Redaction.isRedactedKeyword("@passWord@"));
-  }
+    @Test
+    public void basic() {
+        assertFalse(Redaction.isRedactedKeyword(null));
+        assertFalse(Redaction.isRedactedKeyword(""));
+        assertFalse(Redaction.isRedactedKeyword("foobar"));
+        assertFalse(Redaction.isRedactedKeyword("@-_$"));
+        assertTrue(Redaction.isRedactedKeyword("password"));
+        assertTrue(Redaction.isRedactedKeyword("PassWord"));
+        assertTrue(Redaction.isRedactedKeyword("pass-word"));
+        assertTrue(Redaction.isRedactedKeyword("_Pass-Word_"));
+        assertTrue(Redaction.isRedactedKeyword("$pass_worD"));
+        assertTrue(Redaction.isRedactedKeyword("@passWord@"));
+    }
 
-  @Test
-  public void userDefinedKeywords() {
-    Config config = Config.get();
-    setFieldInConfig(config, "dynamicInstrumentationRedactedIdentifiers", "_MotDePasse,$Passwort");
-    try {
-      Redaction.addUserDefinedKeywords(config);
-      assertTrue(Redaction.isRedactedKeyword("mot-de-passe"));
-      assertTrue(Redaction.isRedactedKeyword("Passwort"));
-    } finally {
-      Redaction.resetUserDefinedKeywords();
+    @Test
+    public void userDefinedKeywords() {
+        Config config = Config.get();
+        setFieldInConfig(config, "dynamicInstrumentationRedactedIdentifiers", "_MotDePasse,$Passwort");
+        try {
+            Redaction.addUserDefinedKeywords(config);
+            assertTrue(Redaction.isRedactedKeyword("mot-de-passe"));
+            assertTrue(Redaction.isRedactedKeyword("Passwort"));
+        } finally {
+            Redaction.resetUserDefinedKeywords();
+        }
     }
-  }
 
-  @Test
-  public void userDefinedTypes() {
-    Config config = Config.get();
-    setFieldInConfig(
-        config, "dynamicInstrumentationRedactedTypes", "java.security.Security,javax.security.*");
-    try {
-      Redaction.addUserDefinedTypes(Config.get());
-      assertTrue(Redaction.isRedactedType("java.security.Security"));
-      assertTrue(Redaction.isRedactedType("javax.security.SecurityContext"));
-    } finally {
-      Redaction.clearUserDefinedTypes();
+    @Test
+    public void userDefinedTypes() {
+        Config config = Config.get();
+        setFieldInConfig(config, "dynamicInstrumentationRedactedTypes", "java.security.Security,javax.security.*");
+        try {
+            Redaction.addUserDefinedTypes(Config.get());
+            assertTrue(Redaction.isRedactedType("java.security.Security"));
+            assertTrue(Redaction.isRedactedType("javax.security.SecurityContext"));
+        } finally {
+            Redaction.clearUserDefinedTypes();
+        }
     }
-  }
 
-  @Test
-  public void exclusions() {
-    Config config = Config.get();
-    setFieldInConfig(
-        config,
-        "dynamicInstrumentationRedactionExcludedIdentifiers",
-        new HashSet<>(Arrays.asList("password", "_2FA")));
-    Redaction.initKeywords();
-    try {
-      assertFalse(Redaction.isRedactedKeyword("password"));
-      assertFalse(Redaction.isRedactedKeyword("_2fa"));
-    } finally {
-      setFieldInConfig(
-          config, "dynamicInstrumentationRedactionExcludedIdentifiers", Collections.emptySet());
-      Redaction.initKeywords();
+    @Test
+    public void exclusions() {
+        Config config = Config.get();
+        setFieldInConfig(
+                config,
+                "dynamicInstrumentationRedactionExcludedIdentifiers",
+                new HashSet<>(Arrays.asList("password", "_2FA")));
+        Redaction.initKeywords();
+        try {
+            assertFalse(Redaction.isRedactedKeyword("password"));
+            assertFalse(Redaction.isRedactedKeyword("_2fa"));
+        } finally {
+            setFieldInConfig(config, "dynamicInstrumentationRedactionExcludedIdentifiers", Collections.emptySet());
+            Redaction.initKeywords();
+        }
     }
-  }
 
-  private static void setFieldInConfig(Config config, String fieldName, Object value) {
-    try {
-      Field field = config.getClass().getDeclaredField(fieldName);
-      field.setAccessible(true);
-      field.set(config, value); // TODO: JEP 500 - avoid mutating final fields
-    } catch (Throwable e) {
-      e.printStackTrace();
+    private static void setFieldInConfig(Config config, String fieldName, Object value) {
+        try {
+            Field field = config.getClass().getDeclaredField(fieldName);
+            field.setAccessible(true);
+            field.set(config, value); // TODO: JEP 500 - avoid mutating final fields
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/TimeoutCheckerTest.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/TimeoutCheckerTest.java
index c3d23678da6..3fcfe1c08a3 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/TimeoutCheckerTest.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/TimeoutCheckerTest.java
@@ -13,43 +13,42 @@
 import org.junit.jupiter.api.Test;
 
 public class TimeoutCheckerTest {
-  @Test
-  public void wallTimedOut() {
-    long start = System.currentTimeMillis();
-    Duration timeout = Duration.ofMillis(100);
-    // assume that start & timestamp captured in instance below are very close
-    WallTimeoutChecker timeoutChecker = new WallTimeoutChecker(timeout);
-    assertFalse(timeoutChecker.isTimedOut(start + 1));
-    assertTrue(timeoutChecker.isTimedOut(start + timeout.toMillis() * 2));
-    timeoutChecker = new WallTimeoutChecker(start, timeout);
-    assertFalse(timeoutChecker.isTimedOut(start + 1));
-    assertTrue(timeoutChecker.isTimedOut(start + timeout.toMillis() * 2));
-  }
+    @Test
+    public void wallTimedOut() {
+        long start = System.currentTimeMillis();
+        Duration timeout = Duration.ofMillis(100);
+        // assume that start & timestamp captured in instance below are very close
+        WallTimeoutChecker timeoutChecker = new WallTimeoutChecker(timeout);
+        assertFalse(timeoutChecker.isTimedOut(start + 1));
+        assertTrue(timeoutChecker.isTimedOut(start + timeout.toMillis() * 2));
+        timeoutChecker = new WallTimeoutChecker(start, timeout);
+        assertFalse(timeoutChecker.isTimedOut(start + 1));
+        assertTrue(timeoutChecker.isTimedOut(start + timeout.toMillis() * 2));
+    }
 
-  @Test
-  public void cpuTimedOut() {
-    CpuTimeoutChecker cpuTimeoutChecker = new CpuTimeoutChecker(Duration.ofMillis(1));
-    LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(10)); // not consume cpu
-    assertFalse(cpuTimeoutChecker.isTimedOut());
-    burnCpu(5_000_000);
-    assertTrue(cpuTimeoutChecker.isTimedOut());
-  }
+    @Test
+    public void cpuTimedOut() {
+        CpuTimeoutChecker cpuTimeoutChecker = new CpuTimeoutChecker(Duration.ofMillis(1));
+        LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(10)); // not consume cpu
+        assertFalse(cpuTimeoutChecker.isTimedOut());
+        burnCpu(5_000_000);
+        assertTrue(cpuTimeoutChecker.isTimedOut());
+    }
 
-  static volatile int counter;
+    static volatile int counter;
 
-  private static void burnCpu(int iterations) {
-    for (int i = 0; i < iterations; i++) {
-      counter++;
+    private static void burnCpu(int iterations) {
+        for (int i = 0; i < iterations; i++) {
+            counter++;
+        }
     }
-  }
 
-  @Test
-  public void configTimeout() {
-    Config config = mock(Config.class);
-    when(config.getDynamicInstrumentationTimeoutCheckerMode()).thenReturn(TimeoutChecker.CPU);
-    assertInstanceOf(CpuTimeoutChecker.class, TimeoutChecker.create(config, Duration.ofMillis(50)));
-    when(config.getDynamicInstrumentationTimeoutCheckerMode()).thenReturn(TimeoutChecker.WALL);
-    assertInstanceOf(
-        WallTimeoutChecker.class, TimeoutChecker.create(config, Duration.ofMillis(50)));
-  }
+    @Test
+    public void configTimeout() {
+        Config config = mock(Config.class);
+        when(config.getDynamicInstrumentationTimeoutCheckerMode()).thenReturn(TimeoutChecker.CPU);
+        assertInstanceOf(CpuTimeoutChecker.class, TimeoutChecker.create(config, Duration.ofMillis(50)));
+        when(config.getDynamicInstrumentationTimeoutCheckerMode()).thenReturn(TimeoutChecker.WALL);
+        assertInstanceOf(WallTimeoutChecker.class, TimeoutChecker.create(config, Duration.ofMillis(50)));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/WellKnownClassesTest.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/WellKnownClassesTest.java
index aef6b32a83f..77491a13574 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/WellKnownClassesTest.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/WellKnownClassesTest.java
@@ -19,30 +19,30 @@
 
 class WellKnownClassesTest {
 
-  @Test
-  public void synchronizedWrappersAreNotSafe() {
-    assertFalse(WellKnownClasses.isSafe(new Vector<>()));
-    assertFalse(WellKnownClasses.isSafe(new Stack<>()));
-    assertFalse(WellKnownClasses.isSafe(new Hashtable<>()));
-    assertFalse(WellKnownClasses.isSafe(new Properties()));
-    assertFalse(WellKnownClasses.isSafe(Collections.synchronizedCollection(new ArrayList<>())));
-    assertFalse(WellKnownClasses.isSafe(Collections.synchronizedList(new ArrayList<>())));
-    assertFalse(WellKnownClasses.isSafe(Collections.synchronizedList(new LinkedList<>())));
-    assertFalse(WellKnownClasses.isSafe(Collections.synchronizedSet(new HashSet<>())));
-    assertFalse(WellKnownClasses.isSafe(Collections.synchronizedSortedSet(new TreeSet<>())));
-    assertFalse(WellKnownClasses.isSafe(Collections.synchronizedNavigableSet(new TreeSet<>())));
-    assertFalse(WellKnownClasses.isSafe(Collections.synchronizedMap(new HashMap<>())));
-    assertFalse(WellKnownClasses.isSafe(Collections.synchronizedSortedMap(new TreeMap<>())));
-    assertFalse(WellKnownClasses.isSafe(Collections.synchronizedNavigableMap(new TreeMap<>())));
-  }
+    @Test
+    public void synchronizedWrappersAreNotSafe() {
+        assertFalse(WellKnownClasses.isSafe(new Vector<>()));
+        assertFalse(WellKnownClasses.isSafe(new Stack<>()));
+        assertFalse(WellKnownClasses.isSafe(new Hashtable<>()));
+        assertFalse(WellKnownClasses.isSafe(new Properties()));
+        assertFalse(WellKnownClasses.isSafe(Collections.synchronizedCollection(new ArrayList<>())));
+        assertFalse(WellKnownClasses.isSafe(Collections.synchronizedList(new ArrayList<>())));
+        assertFalse(WellKnownClasses.isSafe(Collections.synchronizedList(new LinkedList<>())));
+        assertFalse(WellKnownClasses.isSafe(Collections.synchronizedSet(new HashSet<>())));
+        assertFalse(WellKnownClasses.isSafe(Collections.synchronizedSortedSet(new TreeSet<>())));
+        assertFalse(WellKnownClasses.isSafe(Collections.synchronizedNavigableSet(new TreeSet<>())));
+        assertFalse(WellKnownClasses.isSafe(Collections.synchronizedMap(new HashMap<>())));
+        assertFalse(WellKnownClasses.isSafe(Collections.synchronizedSortedMap(new TreeMap<>())));
+        assertFalse(WellKnownClasses.isSafe(Collections.synchronizedNavigableMap(new TreeMap<>())));
+    }
 
-  @Test
-  public void plainCollectionsAreSafe() {
-    assertTrue(WellKnownClasses.isSafe(new ArrayList<>()));
-    assertTrue(WellKnownClasses.isSafe(new HashSet<>()));
-    assertTrue(WellKnownClasses.isSafe(new HashMap<>()));
-    assertTrue(WellKnownClasses.isSafe(new ConcurrentHashMap<>()));
-    assertTrue(WellKnownClasses.isSafe(Collections.emptyList()));
-    assertTrue(WellKnownClasses.isSafe(Collections.unmodifiableMap(new HashMap<>())));
-  }
+    @Test
+    public void plainCollectionsAreSafe() {
+        assertTrue(WellKnownClasses.isSafe(new ArrayList<>()));
+        assertTrue(WellKnownClasses.isSafe(new HashSet<>()));
+        assertTrue(WellKnownClasses.isSafe(new HashMap<>()));
+        assertTrue(WellKnownClasses.isSafe(new ConcurrentHashMap<>()));
+        assertTrue(WellKnownClasses.isSafe(Collections.emptyList()));
+        assertTrue(WellKnownClasses.isSafe(Collections.unmodifiableMap(new HashMap<>())));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/BooleanValueExpressionAdapter.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/BooleanValueExpressionAdapter.java
index e7986715e24..e044ba53503 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/BooleanValueExpressionAdapter.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/BooleanValueExpressionAdapter.java
@@ -6,24 +6,23 @@
 
 public class BooleanValueExpressionAdapter implements ValueExpression<BooleanValue> {
 
-  private final BooleanExpression booleanExpression;
+    private final BooleanExpression booleanExpression;
 
-  public BooleanValueExpressionAdapter(BooleanExpression booleanExpression) {
-    this.booleanExpression = booleanExpression;
-  }
+    public BooleanValueExpressionAdapter(BooleanExpression booleanExpression) {
+        this.booleanExpression = booleanExpression;
+    }
 
-  @Override
-  public BooleanValue evaluate(EvalContext evalContext) {
-    Boolean result = booleanExpression.evaluate(evalContext);
-    if (result == null) {
-      throw new EvaluationException(
-          "Boolean expression returning null", PrettyPrintVisitor.print(this));
+    @Override
+    public BooleanValue evaluate(EvalContext evalContext) {
+        Boolean result = booleanExpression.evaluate(evalContext);
+        if (result == null) {
+            throw new EvaluationException("Boolean expression returning null", PrettyPrintVisitor.print(this));
+        }
+        return new BooleanValue(result, ValueType.OBJECT);
     }
-    return new BooleanValue(result, ValueType.OBJECT);
-  }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(booleanExpression);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(booleanExpression);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/DSL.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/DSL.java
index a66d8f1b1c5..d6e5822f7be 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/DSL.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/DSL.java
@@ -42,181 +42,176 @@
  * debugger EL expression tree.
  */
 public class DSL {
-  private DSL() {}
+    private DSL() {}
+
+    public static final BooleanExpression TRUE = BooleanExpression.TRUE;
+    public static final BooleanExpression FALSE = BooleanExpression.FALSE;
+
+    public static BooleanExpression and(BooleanExpression... expressions) {
+        if (expressions.length == 0) {
+            return FALSE;
+        }
+        BooleanExpression expression = expressions[0];
+        for (int i = 1; i < expressions.length; i++) {
+            expression = and(expression, expressions[i]);
+        }
+        return expression;
+    }
+
+    public static BooleanExpression and(BooleanExpression left, BooleanExpression right) {
+        return new BinaryExpression(left, right, BinaryOperator.AND);
+    }
+
+    public static BooleanExpression or(BooleanExpression... expressions) {
+        if (expressions.length == 0) {
+            return FALSE;
+        }
+        BooleanExpression expression = expressions[0];
+        for (int i = 1; i < expressions.length; i++) {
+            expression = or(expression, expressions[i]);
+        }
+        return expression;
+    }
+
+    public static BooleanExpression or(BooleanExpression left, BooleanExpression right) {
+        return new BinaryExpression(left, right, BinaryOperator.OR);
+    }
+
+    public static BooleanExpression gt(ValueExpression<?> left, ValueExpression<?> right) {
+        return new ComparisonExpression(left, right, ComparisonOperator.GT);
+    }
 
-  public static final BooleanExpression TRUE = BooleanExpression.TRUE;
-  public static final BooleanExpression FALSE = BooleanExpression.FALSE;
+    public static BooleanExpression ge(ValueExpression<?> left, ValueExpression<?> right) {
+        return new ComparisonExpression(left, right, ComparisonOperator.GE);
+    }
 
-  public static BooleanExpression and(BooleanExpression... expressions) {
-    if (expressions.length == 0) {
-      return FALSE;
+    public static BooleanExpression lt(ValueExpression<?> left, ValueExpression<?> right) {
+        return new ComparisonExpression(left, right, ComparisonOperator.LT);
     }
-    BooleanExpression expression = expressions[0];
-    for (int i = 1; i < expressions.length; i++) {
-      expression = and(expression, expressions[i]);
+
+    public static BooleanExpression le(ValueExpression<?> left, ValueExpression<?> right) {
+        return new ComparisonExpression(left, right, ComparisonOperator.LE);
     }
-    return expression;
-  }
 
-  public static BooleanExpression and(BooleanExpression left, BooleanExpression right) {
-    return new BinaryExpression(left, right, BinaryOperator.AND);
-  }
+    public static BooleanExpression eq(ValueExpression<?> left, ValueExpression<?> right) {
+        return new ComparisonExpression(left, right, ComparisonOperator.EQ);
+    }
 
-  public static BooleanExpression or(BooleanExpression... expressions) {
-    if (expressions.length == 0) {
-      return FALSE;
+    public static BooleanExpression instanceOf(ValueExpression<?> left, ValueExpression<?> right) {
+        return new ComparisonExpression(left, right, ComparisonOperator.INSTANCEOF);
     }
-    BooleanExpression expression = expressions[0];
-    for (int i = 1; i < expressions.length; i++) {
-      expression = or(expression, expressions[i]);
+
+    public static BooleanExpression not(BooleanExpression expression) {
+        return new NotExpression(expression);
+    }
+
+    public static IfExpression doif(BooleanExpression test, Expression<?> expression) {
+        return new IfExpression(test, expression);
+    }
+
+    public static IfElseExpression doif(
+            BooleanExpression test, Expression<?> thenExpression, Expression<?> elseExpression) {
+        return new IfElseExpression(test, thenExpression, elseExpression);
+    }
+
+    public static ValueRefExpression ref(String path) {
+        return new ValueRefExpression(path);
+    }
+
+    public static GetMemberExpression getMember(ValueExpression<?> target, String name) {
+        return new GetMemberExpression(target, name);
+    }
+
+    public static IndexExpression index(ValueExpression<?> target, ValueExpression<?> key) {
+        return new IndexExpression(target, key);
     }
-    return expression;
-  }
 
-  public static BooleanExpression or(BooleanExpression left, BooleanExpression right) {
-    return new BinaryExpression(left, right, BinaryOperator.OR);
-  }
+    public static Literal<Boolean> value(boolean value) {
+        return new BooleanValue(value, ValueType.BOOLEAN);
+    }
 
-  public static BooleanExpression gt(ValueExpression<?> left, ValueExpression<?> right) {
-    return new ComparisonExpression(left, right, ComparisonOperator.GT);
-  }
+    public static Literal<Number> value(Number value) {
+        return new NumericValue(value, ValueType.OBJECT);
+    }
 
-  public static BooleanExpression ge(ValueExpression<?> left, ValueExpression<?> right) {
-    return new ComparisonExpression(left, right, ComparisonOperator.GE);
-  }
+    public static Literal<String> value(String value) {
+        return new StringValue(value);
+    }
 
-  public static BooleanExpression lt(ValueExpression<?> left, ValueExpression<?> right) {
-    return new ComparisonExpression(left, right, ComparisonOperator.LT);
-  }
+    public static ListValue value(Collection<?> value) {
+        return new ListValue(value);
+    }
 
-  public static BooleanExpression le(ValueExpression<?> left, ValueExpression<?> right) {
-    return new ComparisonExpression(left, right, ComparisonOperator.LE);
-  }
+    public static SetValue value(Set<?> value) {
+        return new SetValue(value);
+    }
 
-  public static BooleanExpression eq(ValueExpression<?> left, ValueExpression<?> right) {
-    return new ComparisonExpression(left, right, ComparisonOperator.EQ);
-  }
+    public static NullValue nullValue() {
+        return NullValue.INSTANCE;
+    }
 
-  public static BooleanExpression instanceOf(ValueExpression<?> left, ValueExpression<?> right) {
-    return new ComparisonExpression(left, right, ComparisonOperator.INSTANCEOF);
-  }
+    public static MapValue value(Map<?, ?> value) {
+        return new MapValue(value);
+    }
 
-  public static BooleanExpression not(BooleanExpression expression) {
-    return new NotExpression(expression);
-  }
+    public static ValueExpression<?> value(Object value) {
+        if (value != null) {
+            if (value.getClass().isArray()) {
+                return new ListValue(value);
+            }
+        }
+        return new ObjectValue(value);
+    }
 
-  public static IfExpression doif(BooleanExpression test, Expression<?> expression) {
-    return new IfExpression(test, expression);
-  }
+    public static IsEmptyExpression isEmpty(ValueExpression<?> valueExpression) {
+        return new IsEmptyExpression(valueExpression);
+    }
 
-  public static IfElseExpression doif(
-      BooleanExpression test, Expression<?> thenExpression, Expression<?> elseExpression) {
-    return new IfElseExpression(test, thenExpression, elseExpression);
-  }
+    public static HasAnyExpression any(ValueExpression<?> valueExpression, BooleanExpression filter) {
+        return new HasAnyExpression(valueExpression, filter);
+    }
 
-  public static ValueRefExpression ref(String path) {
-    return new ValueRefExpression(path);
-  }
+    public static HasAllExpression all(ValueExpression<?> valueExpression, BooleanExpression filter) {
+        return new HasAllExpression(valueExpression, filter);
+    }
 
-  public static GetMemberExpression getMember(ValueExpression<?> target, String name) {
-    return new GetMemberExpression(target, name);
-  }
+    public static FilterCollectionExpression filter(ValueExpression<?> valueExpression, BooleanExpression filter) {
+        return new FilterCollectionExpression(valueExpression, filter);
+    }
 
-  public static IndexExpression index(ValueExpression<?> target, ValueExpression<?> key) {
-    return new IndexExpression(target, key);
-  }
+    public static LenExpression len(ValueExpression<?> valueExpression) {
+        return new LenExpression(valueExpression);
+    }
 
-  public static Literal<Boolean> value(boolean value) {
-    return new BooleanValue(value, ValueType.BOOLEAN);
-  }
+    public static SubStringExpression subString(ValueExpression<?> valueExpression, int startIndex, int endIndex) {
+        return new SubStringExpression(valueExpression, startIndex, endIndex);
+    }
 
-  public static Literal<Number> value(Number value) {
-    return new NumericValue(value, ValueType.OBJECT);
-  }
+    public static StringPredicateExpression startsWith(ValueExpression<?> valueExpression, StringValue str) {
+        return new StartsWithExpression(valueExpression, str);
+    }
 
-  public static Literal<String> value(String value) {
-    return new StringValue(value);
-  }
+    public static StringPredicateExpression endsWith(ValueExpression<?> valueExpression, StringValue str) {
+        return new EndsWithExpression(valueExpression, str);
+    }
 
-  public static ListValue value(Collection<?> value) {
-    return new ListValue(value);
-  }
+    public static ContainsExpression contains(ValueExpression<?> target, ValueExpression<?> value) {
+        return new ContainsExpression(target, value);
+    }
 
-  public static SetValue value(Set<?> value) {
-    return new SetValue(value);
-  }
+    public static StringPredicateExpression matches(ValueExpression<?> valueExpression, StringValue str) {
+        return new MatchesExpression(valueExpression, str);
+    }
 
-  public static NullValue nullValue() {
-    return NullValue.INSTANCE;
-  }
+    public static WhenExpression when(BooleanExpression expression) {
+        return new WhenExpression(expression);
+    }
 
-  public static MapValue value(Map<?, ?> value) {
-    return new MapValue(value);
-  }
+    public static BooleanValueExpressionAdapter bool(BooleanExpression expression) {
+        return new BooleanValueExpressionAdapter(expression);
+    }
 
-  public static ValueExpression<?> value(Object value) {
-    if (value != null) {
-      if (value.getClass().isArray()) {
-        return new ListValue(value);
-      }
-    }
-    return new ObjectValue(value);
-  }
-
-  public static IsEmptyExpression isEmpty(ValueExpression<?> valueExpression) {
-    return new IsEmptyExpression(valueExpression);
-  }
-
-  public static HasAnyExpression any(ValueExpression<?> valueExpression, BooleanExpression filter) {
-    return new HasAnyExpression(valueExpression, filter);
-  }
-
-  public static HasAllExpression all(ValueExpression<?> valueExpression, BooleanExpression filter) {
-    return new HasAllExpression(valueExpression, filter);
-  }
-
-  public static FilterCollectionExpression filter(
-      ValueExpression<?> valueExpression, BooleanExpression filter) {
-    return new FilterCollectionExpression(valueExpression, filter);
-  }
-
-  public static LenExpression len(ValueExpression<?> valueExpression) {
-    return new LenExpression(valueExpression);
-  }
-
-  public static SubStringExpression subString(
-      ValueExpression<?> valueExpression, int startIndex, int endIndex) {
-    return new SubStringExpression(valueExpression, startIndex, endIndex);
-  }
-
-  public static StringPredicateExpression startsWith(
-      ValueExpression<?> valueExpression, StringValue str) {
-    return new StartsWithExpression(valueExpression, str);
-  }
-
-  public static StringPredicateExpression endsWith(
-      ValueExpression<?> valueExpression, StringValue str) {
-    return new EndsWithExpression(valueExpression, str);
-  }
-
-  public static ContainsExpression contains(ValueExpression<?> target, ValueExpression<?> value) {
-    return new ContainsExpression(target, value);
-  }
-
-  public static StringPredicateExpression matches(
-      ValueExpression<?> valueExpression, StringValue str) {
-    return new MatchesExpression(valueExpression, str);
-  }
-
-  public static WhenExpression when(BooleanExpression expression) {
-    return new WhenExpression(expression);
-  }
-
-  public static BooleanValueExpressionAdapter bool(BooleanExpression expression) {
-    return new BooleanValueExpressionAdapter(expression);
-  }
-
-  public static IsDefinedExpression isDefined(ValueExpression<?> valueExpression) {
-    return new IsDefinedExpression(valueExpression);
-  }
+    public static IsDefinedExpression isDefined(ValueExpression<?> valueExpression) {
+        return new IsDefinedExpression(valueExpression);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/EvalContext.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/EvalContext.java
index bd0ece583f2..f9962dcab08 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/EvalContext.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/EvalContext.java
@@ -4,20 +4,19 @@
 import datadog.trace.bootstrap.debugger.util.TimeoutChecker;
 
 public class EvalContext {
-  private final ValueReferenceResolver valueRefResolver;
-  private final TimeoutChecker timeoutChecker;
+    private final ValueReferenceResolver valueRefResolver;
+    private final TimeoutChecker timeoutChecker;
 
-  public EvalContext(
-      final ValueReferenceResolver valueRefResolver, final TimeoutChecker timeoutChecker) {
-    this.valueRefResolver = valueRefResolver;
-    this.timeoutChecker = timeoutChecker;
-  }
+    public EvalContext(final ValueReferenceResolver valueRefResolver, final TimeoutChecker timeoutChecker) {
+        this.valueRefResolver = valueRefResolver;
+        this.timeoutChecker = timeoutChecker;
+    }
 
-  public ValueReferenceResolver getValueRefResolver() {
-    return valueRefResolver;
-  }
+    public ValueReferenceResolver getValueRefResolver() {
+        return valueRefResolver;
+    }
 
-  public TimeoutChecker getTimeoutChecker() {
-    return timeoutChecker;
-  }
+    public TimeoutChecker getTimeoutChecker() {
+        return timeoutChecker;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/EvaluationException.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/EvaluationException.java
index 06b09b8e25f..ca91420ebce 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/EvaluationException.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/EvaluationException.java
@@ -3,37 +3,36 @@
 import java.util.Objects;
 
 public class EvaluationException extends RuntimeException {
-  private final String expr;
-
-  public EvaluationException(String message, String expr) {
-    super(message);
-    this.expr = expr;
-  }
-
-  public EvaluationException(String message, String expr, Throwable cause) {
-    super(message, cause);
-    this.expr = expr;
-  }
-
-  public String getExpr() {
-    return expr;
-  }
-
-  @Override
-  public final boolean equals(Object o) {
-    if (!(o instanceof EvaluationException)) {
-      return false;
+    private final String expr;
+
+    public EvaluationException(String message, String expr) {
+        super(message);
+        this.expr = expr;
+    }
+
+    public EvaluationException(String message, String expr, Throwable cause) {
+        super(message, cause);
+        this.expr = expr;
+    }
+
+    public String getExpr() {
+        return expr;
     }
 
-    EvaluationException that = (EvaluationException) o;
-    return Objects.equals(getExpr(), that.getExpr())
-        && Objects.equals(getMessage(), that.getMessage());
-  }
-
-  @Override
-  public int hashCode() {
-    int result = Objects.hashCode(getExpr());
-    result = 31 * result + Objects.hashCode(getMessage());
-    return result;
-  }
+    @Override
+    public final boolean equals(Object o) {
+        if (!(o instanceof EvaluationException)) {
+            return false;
+        }
+
+        EvaluationException that = (EvaluationException) o;
+        return Objects.equals(getExpr(), that.getExpr()) && Objects.equals(getMessage(), that.getMessage());
+    }
+
+    @Override
+    public int hashCode() {
+        int result = Objects.hashCode(getExpr());
+        result = 31 * result + Objects.hashCode(getMessage());
+        return result;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/EvaluationTimeOutException.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/EvaluationTimeOutException.java
index 5de93d44552..a860e8e14ad 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/EvaluationTimeOutException.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/EvaluationTimeOutException.java
@@ -1,7 +1,7 @@
 package com.datadog.debugger.el;
 
 public class EvaluationTimeOutException extends EvaluationException {
-  public EvaluationTimeOutException(String message, String expr) {
-    super(message, expr);
-  }
+    public EvaluationTimeOutException(String message, String expr) {
+        super(message, expr);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Expression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Expression.java
index d9b7b2e766f..ae90ea9cf56 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Expression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Expression.java
@@ -3,9 +3,9 @@
 /** Represents any evaluable expression */
 @FunctionalInterface
 public interface Expression<ReturnType> {
-  ReturnType evaluate(EvalContext evalContext);
+    ReturnType evaluate(EvalContext evalContext);
 
-  default <R> R accept(Visitor<R> visitor) {
-    return null;
-  }
+    default <R> R accept(Visitor<R> visitor) {
+        return null;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/InvalidValueException.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/InvalidValueException.java
index 6ba59fffebd..72ac162f525 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/InvalidValueException.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/InvalidValueException.java
@@ -1,20 +1,20 @@
 package com.datadog.debugger.el;
 
 public class InvalidValueException extends RuntimeException {
-  public InvalidValueException(String message) {
-    super(message);
-  }
+    public InvalidValueException(String message) {
+        super(message);
+    }
 
-  public InvalidValueException(String message, Throwable cause) {
-    super(message, cause);
-  }
+    public InvalidValueException(String message, Throwable cause) {
+        super(message, cause);
+    }
 
-  public InvalidValueException(Throwable cause) {
-    super(cause);
-  }
+    public InvalidValueException(Throwable cause) {
+        super(cause);
+    }
 
-  public InvalidValueException(
-      String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-    super(message, cause, enableSuppression, writableStackTrace);
-  }
+    public InvalidValueException(
+            String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/JsonToExpressionConverter.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/JsonToExpressionConverter.java
index b9cad5b1ed7..5afe2f12fee 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/JsonToExpressionConverter.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/JsonToExpressionConverter.java
@@ -22,431 +22,393 @@
 /** Converts json representation to object model */
 public class JsonToExpressionConverter {
 
-  private static final Set<String> PREDICATE_FUNCTIONS =
-      new HashSet<>(
-          Arrays.asList(
-              "not",
-              "==",
-              "eq",
-              "!=",
-              "neq",
-              "ne",
-              ">=",
-              "ge",
-              ">",
-              "gt",
-              "<=",
-              "le",
-              "<",
-              "lt",
-              "or",
-              "and",
-              "hasAny",
-              "any",
-              "hasAll",
-              "all",
-              "isEmpty",
-              "startsWith",
-              "endsWith",
-              "contains",
-              "matches",
-              "instanceof",
-              "isDefined"));
+    private static final Set<String> PREDICATE_FUNCTIONS = new HashSet<>(Arrays.asList(
+            "not",
+            "==",
+            "eq",
+            "!=",
+            "neq",
+            "ne",
+            ">=",
+            "ge",
+            ">",
+            "gt",
+            "<=",
+            "le",
+            "<",
+            "lt",
+            "or",
+            "and",
+            "hasAny",
+            "any",
+            "hasAll",
+            "all",
+            "isEmpty",
+            "startsWith",
+            "endsWith",
+            "contains",
+            "matches",
+            "instanceof",
+            "isDefined"));
 
-  @FunctionalInterface
-  interface BinaryPredicateExpressionFunction<T extends Expression> {
-    BooleanExpression apply(T left, T right);
-  }
-
-  @FunctionalInterface
-  interface CompositePredicateExpressionFunction<T extends Expression> {
-    BooleanExpression apply(T... values);
-  }
-
-  public static BooleanExpression createPredicate(JsonReader reader) throws IOException {
-    reader.beginObject();
-    String predicateType = reader.nextName();
-    BooleanExpression expr = internalCreatePredicate(reader, predicateType);
-    reader.endObject();
-    return expr;
-  }
-
-  private static BooleanExpression internalCreatePredicate(JsonReader reader, String predicateType)
-      throws IOException {
-    switch (predicateType) {
-      case "not":
-        {
-          JsonReader.Token token = reader.peek();
-          if (token == BEGIN_ARRAY || token == STRING || token == NUMBER) {
-            throw new UnsupportedOperationException(
-                "Operation 'not' expects a predicate as its argument");
-          }
-          return DSL.not(createPredicate(reader));
-        }
-      case "==":
-      case "eq":
-        {
-          JsonReader.Token token = reader.peek();
-          if (token != BEGIN_ARRAY) {
-            throw new UnsupportedOperationException(
-                "Operation 'eq' expects the arguments to be defined as array");
-          }
-          reader.beginArray();
-          BooleanExpression expr = createBinaryValuePredicate(reader, DSL::eq);
-          reader.endArray();
-          return expr;
-        }
-      case "!=":
-      case "neq":
-      case "ne":
-        {
-          JsonReader.Token token = reader.peek();
-          if (token != BEGIN_ARRAY) {
-            throw new UnsupportedOperationException(
-                "Operation 'ne' expects the arguments to be defined as array");
-          }
-          reader.beginArray();
-          BooleanExpression expr = DSL.not(createBinaryValuePredicate(reader, DSL::eq));
-          reader.endArray();
-          return expr;
-        }
-      case ">=":
-      case "ge":
-        {
-          JsonReader.Token token = reader.peek();
-          if (token != BEGIN_ARRAY) {
-            throw new UnsupportedOperationException(
-                "Operation 'ge' expects the arguments to be defined as array");
-          }
-          reader.beginArray();
-          BooleanExpression expr = createBinaryValuePredicate(reader, DSL::ge);
-          reader.endArray();
-          return expr;
-        }
-      case ">":
-      case "gt":
-        {
-          JsonReader.Token token = reader.peek();
-          if (token != BEGIN_ARRAY) {
-            throw new UnsupportedOperationException(
-                "Operation 'gt' expects the arguments to be defined as array");
-          }
-          reader.beginArray();
-          BooleanExpression expr = createBinaryValuePredicate(reader, DSL::gt);
-          reader.endArray();
-          return expr;
-        }
-      case "<=":
-      case "le":
-        {
-          JsonReader.Token token = reader.peek();
-          if (token != BEGIN_ARRAY) {
-            throw new UnsupportedOperationException(
-                "Operation 'le' expects the arguments to be defined as array");
-          }
-          reader.beginArray();
-          BooleanExpression expr = createBinaryValuePredicate(reader, DSL::le);
-          reader.endArray();
-          return expr;
-        }
-      case "<":
-      case "lt":
-        {
-          JsonReader.Token token = reader.peek();
-          if (token != BEGIN_ARRAY) {
-            throw new UnsupportedOperationException(
-                "Operation 'lt' expects the arguments to be defined as array");
-          }
-          reader.beginArray();
-          BooleanExpression expr = createBinaryValuePredicate(reader, DSL::lt);
-          reader.endArray();
-          return expr;
-        }
-      case "instanceof":
-        {
-          JsonReader.Token token = reader.peek();
-          if (token != BEGIN_ARRAY) {
-            throw new UnsupportedOperationException(
-                "Operation 'instanceof' expects the arguments to be defined as array");
-          }
-          reader.beginArray();
-          BooleanExpression expr = createBinaryValuePredicate(reader, DSL::instanceOf);
-          reader.endArray();
-          return expr;
-        }
-      case "or":
-        {
-          JsonReader.Token token = reader.peek();
-          if (token != BEGIN_ARRAY) {
-            throw new UnsupportedOperationException(
-                "Operation 'or' expects the arguments to be defined as array");
-          }
-          reader.beginArray();
-          BooleanExpression expr = createCompositeLogicalPredicate(reader, DSL::or);
-          reader.endArray();
-          return expr;
-        }
-      case "and":
-        {
-          JsonReader.Token token = reader.peek();
-          if (token != BEGIN_ARRAY) {
-            throw new UnsupportedOperationException(
-                "Operation 'and' expects the arguments to be defined as array");
-          }
-          reader.beginArray();
-          BooleanExpression expr = createCompositeLogicalPredicate(reader, DSL::and);
-          reader.endArray();
-          return expr;
-        }
-      case "hasAny":
-      case "any":
-        {
-          JsonReader.Token token = reader.peek();
-          if (token != BEGIN_ARRAY) {
-            throw new UnsupportedOperationException(
-                "Operation 'hasAny' expects the arguments to be defined as array");
-          }
-          reader.beginArray();
-          BooleanExpression expr = createHasAnyPredicate(reader);
-          reader.endArray();
-          return expr;
-        }
-      case "hasAll":
-      case "all":
-        {
-          JsonReader.Token token = reader.peek();
-          if (token != BEGIN_ARRAY) {
-            throw new UnsupportedOperationException(
-                "Operation 'hasAll' expects the arguments to be defined as array");
-          }
-          reader.beginArray();
-          BooleanExpression expr = createHasAllPredicate(reader);
-          reader.endArray();
-          return expr;
-        }
-      case "isEmpty":
-        {
-          JsonReader.Token token = reader.peek();
-          if (token == BEGIN_ARRAY) {
-            throw new UnsupportedOperationException(
-                "Operation 'isEmpty' expects exactly one value argument");
-          }
-          return DSL.isEmpty(asValueExpression(reader));
-        }
-      case "isDefined":
-        {
-          JsonReader.Token token = reader.peek();
-          if (token == BEGIN_ARRAY) {
-            throw new UnsupportedOperationException(
-                "Operation 'isUndefined' expects exactly one value argument");
-          }
-          return DSL.isDefined(asValueExpression(reader));
-        }
-      case "startsWith":
-        {
-          return createStringPredicateExpression(reader, DSL::startsWith);
-        }
-      case "endsWith":
-        {
-          return createStringPredicateExpression(reader, DSL::endsWith);
-        }
-      case "contains":
-        {
-          JsonReader.Token token = reader.peek();
-          if (token != BEGIN_ARRAY) {
-            throw new UnsupportedOperationException(
-                "Operation 'contains' expects the arguments to be defined as array");
-          }
-          reader.beginArray();
-          ContainsExpression expr =
-              DSL.contains(asValueExpression(reader), asValueExpression(reader));
-          reader.endArray();
-          return expr;
-        }
-      case "matches":
-        {
-          return createStringPredicateExpression(reader, DSL::matches);
-        }
-      default:
-        throw new UnsupportedOperationException("Unsupported operation '" + predicateType + "'");
+    @FunctionalInterface
+    interface BinaryPredicateExpressionFunction<T extends Expression> {
+        BooleanExpression apply(T left, T right);
     }
-  }
-
-  public static BooleanExpression createHasAnyPredicate(JsonReader reader) throws IOException {
-    return DSL.any(asValueExpression(reader), createPredicate(reader));
-  }
-
-  public static BooleanExpression createHasAllPredicate(JsonReader reader) throws IOException {
-    return DSL.all(asValueExpression(reader), createPredicate(reader));
-  }
-
-  public static ValueExpression<?> createCollectionFilter(JsonReader reader) throws IOException {
-    return DSL.filter(asValueExpression(reader), createPredicate(reader));
-  }
 
-  public static BooleanExpression createBinaryValuePredicate(
-      JsonReader reader, BinaryPredicateExpressionFunction<ValueExpression<?>> function)
-      throws IOException {
-    return function.apply(asValueExpression(reader), asValueExpression(reader));
-  }
-
-  public static BooleanExpression createBinaryLogicalPredicate(
-      JsonReader reader, BinaryPredicateExpressionFunction<BooleanExpression> function)
-      throws IOException {
-    return function.apply(createPredicate(reader), createPredicate(reader));
-  }
+    @FunctionalInterface
+    interface CompositePredicateExpressionFunction<T extends Expression> {
+        BooleanExpression apply(T... values);
+    }
 
-  public static BooleanExpression createCompositeLogicalPredicate(
-      JsonReader reader, CompositePredicateExpressionFunction<BooleanExpression> function)
-      throws IOException {
-    List<BooleanExpression> expressions = new ArrayList<>(2);
-    while (reader.hasNext() && reader.peek() != END_ARRAY) {
-      expressions.add(createPredicate(reader));
+    public static BooleanExpression createPredicate(JsonReader reader) throws IOException {
+        reader.beginObject();
+        String predicateType = reader.nextName();
+        BooleanExpression expr = internalCreatePredicate(reader, predicateType);
+        reader.endObject();
+        return expr;
     }
-    return function.apply(expressions.toArray(new BooleanExpression[0]));
-  }
 
-  public static ValueExpression<?> asValueExpression(JsonReader reader) throws IOException {
-    JsonReader.Token currentToken = reader.peek();
-    switch (currentToken) {
-      case NUMBER:
-        {
-          // Moshi always consider numbers as decimal. need to parse it as string and detect if dot
-          // is present
-          // or not to determine ints/longs vs doubles
-          String numberStrValue = reader.nextString();
-          if (numberStrValue.indexOf('.') > 0) {
-            return DSL.value(Double.parseDouble(numberStrValue));
-          }
-          long longValue = Long.parseLong(numberStrValue);
-          // checks if the parsed number fits into integer range
-          if (longValue <= Integer.MAX_VALUE && longValue >= Integer.MIN_VALUE) {
-            return DSL.value((int) longValue);
-          }
-          return DSL.value(longValue);
-        }
-      case STRING:
-        {
-          String textValue = reader.nextString();
-          return DSL.value(textValue);
-        }
-      case BEGIN_OBJECT:
-        {
-          reader.beginObject();
-          try {
-            String fieldName = reader.nextName();
-            if (PREDICATE_FUNCTIONS.contains(fieldName)) {
-              return DSL.bool(internalCreatePredicate(reader, fieldName));
+    private static BooleanExpression internalCreatePredicate(JsonReader reader, String predicateType)
+            throws IOException {
+        switch (predicateType) {
+            case "not": {
+                JsonReader.Token token = reader.peek();
+                if (token == BEGIN_ARRAY || token == STRING || token == NUMBER) {
+                    throw new UnsupportedOperationException("Operation 'not' expects a predicate as its argument");
+                }
+                return DSL.not(createPredicate(reader));
             }
-            switch (fieldName) {
-              case "ref":
-                {
-                  JsonReader.Token token = reader.peek();
-                  if (token != STRING) {
+            case "==":
+            case "eq": {
+                JsonReader.Token token = reader.peek();
+                if (token != BEGIN_ARRAY) {
                     throw new UnsupportedOperationException(
-                        "Operation 'ref' expect exactly one textual argument");
-                  }
-                  return DSL.ref(reader.nextString());
+                            "Operation 'eq' expects the arguments to be defined as array");
                 }
-              case "getmember":
-                {
-                  JsonReader.Token token = reader.peek();
-                  if (token == BEGIN_ARRAY) {
-                    reader.beginArray();
-                    ValueExpression<?> target = asValueExpression(reader);
-                    String name = reader.nextString();
-                    reader.endArray();
-                    return DSL.getMember(target, name);
-                  }
-                  throw new UnsupportedOperationException(
-                      "Operation 'getmember' expects the arguments to be defined as array");
+                reader.beginArray();
+                BooleanExpression expr = createBinaryValuePredicate(reader, DSL::eq);
+                reader.endArray();
+                return expr;
+            }
+            case "!=":
+            case "neq":
+            case "ne": {
+                JsonReader.Token token = reader.peek();
+                if (token != BEGIN_ARRAY) {
+                    throw new UnsupportedOperationException(
+                            "Operation 'ne' expects the arguments to be defined as array");
                 }
-              case "index":
-                {
-                  JsonReader.Token token = reader.peek();
-                  if (token == BEGIN_ARRAY) {
-                    reader.beginArray();
-                    ValueExpression<?> target = asValueExpression(reader);
-                    ValueExpression<?> key = asValueExpression(reader);
-                    reader.endArray();
-                    return DSL.index(target, key);
-                  }
-                  throw new UnsupportedOperationException(
-                      "Operation 'index' expects the arguments to be defined as array");
+                reader.beginArray();
+                BooleanExpression expr = DSL.not(createBinaryValuePredicate(reader, DSL::eq));
+                reader.endArray();
+                return expr;
+            }
+            case ">=":
+            case "ge": {
+                JsonReader.Token token = reader.peek();
+                if (token != BEGIN_ARRAY) {
+                    throw new UnsupportedOperationException(
+                            "Operation 'ge' expects the arguments to be defined as array");
                 }
-              case "filter":
-                {
-                  JsonReader.Token token = reader.peek();
-                  if (token == BEGIN_ARRAY) {
-                    reader.beginArray();
-                    ValueExpression<?> filter = createCollectionFilter(reader);
-                    reader.endArray();
-                    return filter;
-                  }
-                  throw new UnsupportedOperationException(
-                      "Operation 'filter' expects the arguments to be defined as array");
+                reader.beginArray();
+                BooleanExpression expr = createBinaryValuePredicate(reader, DSL::ge);
+                reader.endArray();
+                return expr;
+            }
+            case ">":
+            case "gt": {
+                JsonReader.Token token = reader.peek();
+                if (token != BEGIN_ARRAY) {
+                    throw new UnsupportedOperationException(
+                            "Operation 'gt' expects the arguments to be defined as array");
                 }
-              case "len":
-              case "count":
-                {
-                  JsonReader.Token token = reader.peek();
-                  if (token == BEGIN_ARRAY || token == NUMBER) {
+                reader.beginArray();
+                BooleanExpression expr = createBinaryValuePredicate(reader, DSL::gt);
+                reader.endArray();
+                return expr;
+            }
+            case "<=":
+            case "le": {
+                JsonReader.Token token = reader.peek();
+                if (token != BEGIN_ARRAY) {
                     throw new UnsupportedOperationException(
-                        "Operation 'len' expect exactly one textual or object argument");
-                  }
-                  return DSL.len(asValueExpression(reader));
+                            "Operation 'le' expects the arguments to be defined as array");
                 }
-              case "substring":
-                {
-                  JsonReader.Token token = reader.peek();
-                  if (token == BEGIN_ARRAY) {
-                    reader.beginArray();
-                    ValueExpression<?> target = asValueExpression(reader);
-                    int startIndex = reader.nextInt();
-                    int endIndex = reader.nextInt();
-                    reader.endArray();
-                    return DSL.subString(target, startIndex, endIndex);
-                  }
-                  throw new UnsupportedOperationException(
-                      "Operation 'substring' expects the arguments to be defined as array");
+                reader.beginArray();
+                BooleanExpression expr = createBinaryValuePredicate(reader, DSL::le);
+                reader.endArray();
+                return expr;
+            }
+            case "<":
+            case "lt": {
+                JsonReader.Token token = reader.peek();
+                if (token != BEGIN_ARRAY) {
+                    throw new UnsupportedOperationException(
+                            "Operation 'lt' expects the arguments to be defined as array");
+                }
+                reader.beginArray();
+                BooleanExpression expr = createBinaryValuePredicate(reader, DSL::lt);
+                reader.endArray();
+                return expr;
+            }
+            case "instanceof": {
+                JsonReader.Token token = reader.peek();
+                if (token != BEGIN_ARRAY) {
+                    throw new UnsupportedOperationException(
+                            "Operation 'instanceof' expects the arguments to be defined as array");
+                }
+                reader.beginArray();
+                BooleanExpression expr = createBinaryValuePredicate(reader, DSL::instanceOf);
+                reader.endArray();
+                return expr;
+            }
+            case "or": {
+                JsonReader.Token token = reader.peek();
+                if (token != BEGIN_ARRAY) {
+                    throw new UnsupportedOperationException(
+                            "Operation 'or' expects the arguments to be defined as array");
+                }
+                reader.beginArray();
+                BooleanExpression expr = createCompositeLogicalPredicate(reader, DSL::or);
+                reader.endArray();
+                return expr;
+            }
+            case "and": {
+                JsonReader.Token token = reader.peek();
+                if (token != BEGIN_ARRAY) {
+                    throw new UnsupportedOperationException(
+                            "Operation 'and' expects the arguments to be defined as array");
+                }
+                reader.beginArray();
+                BooleanExpression expr = createCompositeLogicalPredicate(reader, DSL::and);
+                reader.endArray();
+                return expr;
+            }
+            case "hasAny":
+            case "any": {
+                JsonReader.Token token = reader.peek();
+                if (token != BEGIN_ARRAY) {
+                    throw new UnsupportedOperationException(
+                            "Operation 'hasAny' expects the arguments to be defined as array");
+                }
+                reader.beginArray();
+                BooleanExpression expr = createHasAnyPredicate(reader);
+                reader.endArray();
+                return expr;
+            }
+            case "hasAll":
+            case "all": {
+                JsonReader.Token token = reader.peek();
+                if (token != BEGIN_ARRAY) {
+                    throw new UnsupportedOperationException(
+                            "Operation 'hasAll' expects the arguments to be defined as array");
+                }
+                reader.beginArray();
+                BooleanExpression expr = createHasAllPredicate(reader);
+                reader.endArray();
+                return expr;
+            }
+            case "isEmpty": {
+                JsonReader.Token token = reader.peek();
+                if (token == BEGIN_ARRAY) {
+                    throw new UnsupportedOperationException("Operation 'isEmpty' expects exactly one value argument");
+                }
+                return DSL.isEmpty(asValueExpression(reader));
+            }
+            case "isDefined": {
+                JsonReader.Token token = reader.peek();
+                if (token == BEGIN_ARRAY) {
+                    throw new UnsupportedOperationException(
+                            "Operation 'isUndefined' expects exactly one value argument");
+                }
+                return DSL.isDefined(asValueExpression(reader));
+            }
+            case "startsWith": {
+                return createStringPredicateExpression(reader, DSL::startsWith);
+            }
+            case "endsWith": {
+                return createStringPredicateExpression(reader, DSL::endsWith);
+            }
+            case "contains": {
+                JsonReader.Token token = reader.peek();
+                if (token != BEGIN_ARRAY) {
+                    throw new UnsupportedOperationException(
+                            "Operation 'contains' expects the arguments to be defined as array");
                 }
-              default:
-                throw new UnsupportedOperationException("Invalid value definition: " + fieldName);
+                reader.beginArray();
+                ContainsExpression expr = DSL.contains(asValueExpression(reader), asValueExpression(reader));
+                reader.endArray();
+                return expr;
             }
-          } finally {
-            reader.endObject();
-          }
+            case "matches": {
+                return createStringPredicateExpression(reader, DSL::matches);
+            }
+            default:
+                throw new UnsupportedOperationException("Unsupported operation '" + predicateType + "'");
         }
-      case NULL:
-        {
-          reader.nextNull();
-          return DSL.nullValue();
+    }
+
+    public static BooleanExpression createHasAnyPredicate(JsonReader reader) throws IOException {
+        return DSL.any(asValueExpression(reader), createPredicate(reader));
+    }
+
+    public static BooleanExpression createHasAllPredicate(JsonReader reader) throws IOException {
+        return DSL.all(asValueExpression(reader), createPredicate(reader));
+    }
+
+    public static ValueExpression<?> createCollectionFilter(JsonReader reader) throws IOException {
+        return DSL.filter(asValueExpression(reader), createPredicate(reader));
+    }
+
+    public static BooleanExpression createBinaryValuePredicate(
+            JsonReader reader, BinaryPredicateExpressionFunction<ValueExpression<?>> function) throws IOException {
+        return function.apply(asValueExpression(reader), asValueExpression(reader));
+    }
+
+    public static BooleanExpression createBinaryLogicalPredicate(
+            JsonReader reader, BinaryPredicateExpressionFunction<BooleanExpression> function) throws IOException {
+        return function.apply(createPredicate(reader), createPredicate(reader));
+    }
+
+    public static BooleanExpression createCompositeLogicalPredicate(
+            JsonReader reader, CompositePredicateExpressionFunction<BooleanExpression> function) throws IOException {
+        List<BooleanExpression> expressions = new ArrayList<>(2);
+        while (reader.hasNext() && reader.peek() != END_ARRAY) {
+            expressions.add(createPredicate(reader));
         }
-      case BOOLEAN:
-        {
-          boolean boolValue = reader.nextBoolean();
-          return DSL.value(boolValue);
+        return function.apply(expressions.toArray(new BooleanExpression[0]));
+    }
+
+    public static ValueExpression<?> asValueExpression(JsonReader reader) throws IOException {
+        JsonReader.Token currentToken = reader.peek();
+        switch (currentToken) {
+            case NUMBER: {
+                // Moshi always consider numbers as decimal. need to parse it as string and detect if dot
+                // is present
+                // or not to determine ints/longs vs doubles
+                String numberStrValue = reader.nextString();
+                if (numberStrValue.indexOf('.') > 0) {
+                    return DSL.value(Double.parseDouble(numberStrValue));
+                }
+                long longValue = Long.parseLong(numberStrValue);
+                // checks if the parsed number fits into integer range
+                if (longValue <= Integer.MAX_VALUE && longValue >= Integer.MIN_VALUE) {
+                    return DSL.value((int) longValue);
+                }
+                return DSL.value(longValue);
+            }
+            case STRING: {
+                String textValue = reader.nextString();
+                return DSL.value(textValue);
+            }
+            case BEGIN_OBJECT: {
+                reader.beginObject();
+                try {
+                    String fieldName = reader.nextName();
+                    if (PREDICATE_FUNCTIONS.contains(fieldName)) {
+                        return DSL.bool(internalCreatePredicate(reader, fieldName));
+                    }
+                    switch (fieldName) {
+                        case "ref": {
+                            JsonReader.Token token = reader.peek();
+                            if (token != STRING) {
+                                throw new UnsupportedOperationException(
+                                        "Operation 'ref' expect exactly one textual argument");
+                            }
+                            return DSL.ref(reader.nextString());
+                        }
+                        case "getmember": {
+                            JsonReader.Token token = reader.peek();
+                            if (token == BEGIN_ARRAY) {
+                                reader.beginArray();
+                                ValueExpression<?> target = asValueExpression(reader);
+                                String name = reader.nextString();
+                                reader.endArray();
+                                return DSL.getMember(target, name);
+                            }
+                            throw new UnsupportedOperationException(
+                                    "Operation 'getmember' expects the arguments to be defined as array");
+                        }
+                        case "index": {
+                            JsonReader.Token token = reader.peek();
+                            if (token == BEGIN_ARRAY) {
+                                reader.beginArray();
+                                ValueExpression<?> target = asValueExpression(reader);
+                                ValueExpression<?> key = asValueExpression(reader);
+                                reader.endArray();
+                                return DSL.index(target, key);
+                            }
+                            throw new UnsupportedOperationException(
+                                    "Operation 'index' expects the arguments to be defined as array");
+                        }
+                        case "filter": {
+                            JsonReader.Token token = reader.peek();
+                            if (token == BEGIN_ARRAY) {
+                                reader.beginArray();
+                                ValueExpression<?> filter = createCollectionFilter(reader);
+                                reader.endArray();
+                                return filter;
+                            }
+                            throw new UnsupportedOperationException(
+                                    "Operation 'filter' expects the arguments to be defined as array");
+                        }
+                        case "len":
+                        case "count": {
+                            JsonReader.Token token = reader.peek();
+                            if (token == BEGIN_ARRAY || token == NUMBER) {
+                                throw new UnsupportedOperationException(
+                                        "Operation 'len' expect exactly one textual or object argument");
+                            }
+                            return DSL.len(asValueExpression(reader));
+                        }
+                        case "substring": {
+                            JsonReader.Token token = reader.peek();
+                            if (token == BEGIN_ARRAY) {
+                                reader.beginArray();
+                                ValueExpression<?> target = asValueExpression(reader);
+                                int startIndex = reader.nextInt();
+                                int endIndex = reader.nextInt();
+                                reader.endArray();
+                                return DSL.subString(target, startIndex, endIndex);
+                            }
+                            throw new UnsupportedOperationException(
+                                    "Operation 'substring' expects the arguments to be defined as array");
+                        }
+                        default:
+                            throw new UnsupportedOperationException("Invalid value definition: " + fieldName);
+                    }
+                } finally {
+                    reader.endObject();
+                }
+            }
+            case NULL: {
+                reader.nextNull();
+                return DSL.nullValue();
+            }
+            case BOOLEAN: {
+                boolean boolValue = reader.nextBoolean();
+                return DSL.value(boolValue);
+            }
+            default:
+                throw new UnsupportedOperationException(
+                        "Invalid value definition, not supported token: " + currentToken);
         }
-      default:
-        throw new UnsupportedOperationException(
-            "Invalid value definition, not supported token: " + currentToken);
     }
-  }
 
-  private static StringPredicateExpression createStringPredicateExpression(
-      JsonReader reader,
-      BiFunction<ValueExpression<?>, StringValue, StringPredicateExpression> predicateFunc)
-      throws IOException {
-    JsonReader.Token token = reader.peek();
-    if (token != BEGIN_ARRAY) {
-      throw new UnsupportedOperationException(
-          "Operation 'startsWith' expects the arguments to be defined as array");
+    private static StringPredicateExpression createStringPredicateExpression(
+            JsonReader reader, BiFunction<ValueExpression<?>, StringValue, StringPredicateExpression> predicateFunc)
+            throws IOException {
+        JsonReader.Token token = reader.peek();
+        if (token != BEGIN_ARRAY) {
+            throw new UnsupportedOperationException(
+                    "Operation 'startsWith' expects the arguments to be defined as array");
+        }
+        reader.beginArray();
+        ValueExpression<?> source = asValueExpression(reader);
+        StringValue str = new StringValue(reader.nextString());
+        StringPredicateExpression expr = predicateFunc.apply(source, str);
+        reader.endArray();
+        return expr;
     }
-    reader.beginArray();
-    ValueExpression<?> source = asValueExpression(reader);
-    StringValue str = new StringValue(reader.nextString());
-    StringPredicateExpression expr = predicateFunc.apply(source, str);
-    reader.endArray();
-    return expr;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Literal.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Literal.java
index cfc3b9971d9..be13f03058b 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Literal.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Literal.java
@@ -5,51 +5,50 @@
 import java.util.Objects;
 
 /** Represents any literal/constant in expression language */
-public class Literal<ConstantType>
-    implements Value<ConstantType>, ValueExpression<Value<ConstantType>> {
-  protected final ConstantType value;
-  protected final ValueType type;
-
-  protected Literal(ConstantType value, ValueType type) {
-    this.value = value;
-    this.type = type;
-  }
-
-  @Override
-  public boolean isNull() {
-    return value == null || value == Values.NULL_OBJECT || value == Value.nullValue();
-  }
-
-  @Override
-  public boolean isUndefined() {
-    return value != null && (value == Values.UNDEFINED_OBJECT || value == Value.undefinedValue());
-  }
-
-  @Override
-  public Value<ConstantType> evaluate(EvalContext evalContext) {
-    return this;
-  }
-
-  @Override
-  public ConstantType getValue() {
-    return value;
-  }
-
-  @Override
-  public ValueType getType() {
-    return type;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    Literal<?> literal = (Literal<?>) o;
-    return Objects.equals(value, literal.value);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(value);
-  }
+public class Literal<ConstantType> implements Value<ConstantType>, ValueExpression<Value<ConstantType>> {
+    protected final ConstantType value;
+    protected final ValueType type;
+
+    protected Literal(ConstantType value, ValueType type) {
+        this.value = value;
+        this.type = type;
+    }
+
+    @Override
+    public boolean isNull() {
+        return value == null || value == Values.NULL_OBJECT || value == Value.nullValue();
+    }
+
+    @Override
+    public boolean isUndefined() {
+        return value != null && (value == Values.UNDEFINED_OBJECT || value == Value.undefinedValue());
+    }
+
+    @Override
+    public Value<ConstantType> evaluate(EvalContext evalContext) {
+        return this;
+    }
+
+    @Override
+    public ConstantType getValue() {
+        return value;
+    }
+
+    @Override
+    public ValueType getType() {
+        return type;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Literal<?> literal = (Literal<?>) o;
+        return Objects.equals(value, literal.value);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(value);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/PrettyPrintVisitor.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/PrettyPrintVisitor.java
index f0295f66de3..cb6796ed95a 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/PrettyPrintVisitor.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/PrettyPrintVisitor.java
@@ -39,253 +39,245 @@
 
 public class PrettyPrintVisitor implements Visitor<String> {
 
-  public static String print(Expression<?> expr) {
-    return expr.accept(new PrettyPrintVisitor());
-  }
-
-  @Override
-  public String visit(BinaryExpression binaryExpression) {
-    return nullSafeAccept(binaryExpression.getLeft())
-        + " "
-        + binaryExpression.getOperator().accept(this)
-        + " "
-        + nullSafeAccept(binaryExpression.getRight());
-  }
-
-  @Override
-  public String visit(BinaryOperator operator) {
-    return operator.getSymbol();
-  }
-
-  @Override
-  public String visit(ComparisonExpression comparisonExpression) {
-    return nullSafeAccept(comparisonExpression.getLeft())
-        + " "
-        + comparisonExpression.getOperator().accept(this)
-        + " "
-        + nullSafeAccept(comparisonExpression.getRight());
-  }
-
-  @Override
-  public String visit(ComparisonOperator operator) {
-    return operator.getSymbol();
-  }
-
-  @Override
-  public String visit(ContainsExpression containsExpression) {
-    return "contains("
-        + nullSafeAccept(containsExpression.getTarget())
-        + ", "
-        + nullSafeAccept(containsExpression.getValue())
-        + ")";
-  }
-
-  @Override
-  public String visit(EndsWithExpression endsWithExpression) {
-    return stringPredicateExpression(endsWithExpression);
-  }
-
-  @Override
-  public String visit(FilterCollectionExpression filterCollectionExpression) {
-    return "filter("
-        + nullSafeAccept(filterCollectionExpression.getSource())
-        + ", {"
-        + nullSafeAccept(filterCollectionExpression.getFilterExpression())
-        + "})";
-  }
-
-  @Override
-  public String visit(HasAllExpression hasAllExpression) {
-    return "all("
-        + nullSafeAccept(hasAllExpression.getValueExpression())
-        + ", {"
-        + nullSafeAccept(hasAllExpression.getFilterPredicateExpression())
-        + "})";
-  }
-
-  @Override
-  public String visit(HasAnyExpression hasAnyExpression) {
-    return "any("
-        + nullSafeAccept(hasAnyExpression.getValueExpression())
-        + ", {"
-        + nullSafeAccept(hasAnyExpression.getFilterPredicateExpression())
-        + "})";
-  }
-
-  @Override
-  public String visit(IfElseExpression ifElseExpression) {
-    return "if "
-        + nullSafeAccept(ifElseExpression.getTest())
-        + " then "
-        + nullSafeAccept(ifElseExpression.getThenExpression())
-        + " else "
-        + nullSafeAccept(ifElseExpression.getElseExpression());
-  }
-
-  @Override
-  public String visit(IfExpression ifExpression) {
-    return "if "
-        + nullSafeAccept(ifExpression.getTest())
-        + " then "
-        + nullSafeAccept(ifExpression.getExpression());
-  }
-
-  @Override
-  public String visit(IsEmptyExpression isEmptyExpression) {
-    return "isEmpty(" + nullSafeAccept(isEmptyExpression.getValueExpression()) + ")";
-  }
-
-  @Override
-  public String visit(IsDefinedExpression isDefinedExpression) {
-    return "isDefined(" + nullSafeAccept(isDefinedExpression.getValueExpression()) + ")";
-  }
-
-  @Override
-  public String visit(LenExpression lenExpression) {
-    return "len(" + nullSafeAccept(lenExpression.getSource()) + ")";
-  }
-
-  @Override
-  public String visit(MatchesExpression matchesExpression) {
-    return stringPredicateExpression(matchesExpression);
-  }
-
-  @Override
-  public String visit(NotExpression notExpression) {
-    return "not(" + nullSafeAccept(notExpression.getPredicate()) + ")";
-  }
-
-  @Override
-  public String visit(StartsWithExpression startsWithExpression) {
-    return stringPredicateExpression(startsWithExpression);
-  }
-
-  @Override
-  public String visit(SubStringExpression subStringExpression) {
-    return "substring("
-        + nullSafeAccept(subStringExpression.getSource())
-        + ", "
-        + subStringExpression.getStartIndex()
-        + ", "
-        + subStringExpression.getEndIndex()
-        + ")";
-  }
-
-  @Override
-  public String visit(ValueRefExpression valueRefExpression) {
-    return valueRefExpression.getSymbolName();
-  }
-
-  @Override
-  public String visit(GetMemberExpression getMemberExpression) {
-    return nullSafeAccept(getMemberExpression.getTarget())
-        + "."
-        + getMemberExpression.getMemberName();
-  }
-
-  @Override
-  public String visit(IndexExpression indexExpression) {
-    return nullSafeAccept(indexExpression.getTarget())
-        + "["
-        + nullSafeAccept(indexExpression.getKey())
-        + "]";
-  }
-
-  @Override
-  public String visit(WhenExpression whenExpression) {
-    return "when(" + nullSafeAccept(whenExpression.getExpression()) + ")";
-  }
-
-  @Override
-  public String visit(BooleanExpression booleanExpression) {
-    return booleanExpression.toString();
-  }
-
-  @Override
-  public String visit(StringValue stringValue) {
-    return "\"" + stringValue.value + "\"";
-  }
-
-  @Override
-  public String visit(ObjectValue objectValue) {
-    Object value = objectValue.value;
-    if (value == null || value == Values.NULL_OBJECT) {
-      return "null";
-    }
-    if (value == Values.UNDEFINED_OBJECT) {
-      return value.toString();
-    }
-    if (value == Values.THIS_OBJECT) {
-      return "this";
-    }
-    return value.getClass().getTypeName();
-  }
-
-  @Override
-  public String visit(NumericValue numericValue) {
-    Number value = numericValue.value;
-    if (value != null) {
-      if (value instanceof Double || value instanceof Float) {
-        return String.valueOf(value.doubleValue());
-      }
-      return value.toString();
-    }
-    return "null";
-  }
-
-  @Override
-  public String visit(BooleanValue booleanValue) {
-    if (booleanValue.value == null) {
-      return "null";
-    }
-    return String.valueOf(booleanValue.value.booleanValue());
-  }
-
-  @Override
-  public String visit(NullValue nullValue) {
-    return "null";
-  }
-
-  @Override
-  public String visit(ListValue listValue) {
-    if (listValue.getArrayHolder() != null) {
-      return listValue.getArrayType().getTypeName() + "[]";
-    }
-    if (listValue.getListHolder() instanceof List) {
-      return "List";
-    }
-    if (listValue.getListHolder() instanceof Set) {
-      return "Set";
-    }
-    return "null";
-  }
-
-  @Override
-  public String visit(MapValue mapValue) {
-    if (mapValue.getMapHolder() instanceof Map) {
-      return "Map";
-    }
-    return "null";
-  }
-
-  @Override
-  public String visit(SetValue setValue) {
-    if (setValue.getSetHolder() instanceof Set) {
-      return "Set";
-    }
-    return "null";
-  }
-
-  private String stringPredicateExpression(StringPredicateExpression stringPredicateExpression) {
-    return stringPredicateExpression.getName()
-        + "("
-        + nullSafeAccept(stringPredicateExpression.getSourceString())
-        + ", "
-        + nullSafeAccept(stringPredicateExpression.getStr())
-        + ")";
-  }
-
-  private String nullSafeAccept(Expression<?> expr) {
-    return expr != null ? expr.accept(this) : "null";
-  }
+    public static String print(Expression<?> expr) {
+        return expr.accept(new PrettyPrintVisitor());
+    }
+
+    @Override
+    public String visit(BinaryExpression binaryExpression) {
+        return nullSafeAccept(binaryExpression.getLeft())
+                + " "
+                + binaryExpression.getOperator().accept(this)
+                + " "
+                + nullSafeAccept(binaryExpression.getRight());
+    }
+
+    @Override
+    public String visit(BinaryOperator operator) {
+        return operator.getSymbol();
+    }
+
+    @Override
+    public String visit(ComparisonExpression comparisonExpression) {
+        return nullSafeAccept(comparisonExpression.getLeft())
+                + " "
+                + comparisonExpression.getOperator().accept(this)
+                + " "
+                + nullSafeAccept(comparisonExpression.getRight());
+    }
+
+    @Override
+    public String visit(ComparisonOperator operator) {
+        return operator.getSymbol();
+    }
+
+    @Override
+    public String visit(ContainsExpression containsExpression) {
+        return "contains("
+                + nullSafeAccept(containsExpression.getTarget())
+                + ", "
+                + nullSafeAccept(containsExpression.getValue())
+                + ")";
+    }
+
+    @Override
+    public String visit(EndsWithExpression endsWithExpression) {
+        return stringPredicateExpression(endsWithExpression);
+    }
+
+    @Override
+    public String visit(FilterCollectionExpression filterCollectionExpression) {
+        return "filter("
+                + nullSafeAccept(filterCollectionExpression.getSource())
+                + ", {"
+                + nullSafeAccept(filterCollectionExpression.getFilterExpression())
+                + "})";
+    }
+
+    @Override
+    public String visit(HasAllExpression hasAllExpression) {
+        return "all("
+                + nullSafeAccept(hasAllExpression.getValueExpression())
+                + ", {"
+                + nullSafeAccept(hasAllExpression.getFilterPredicateExpression())
+                + "})";
+    }
+
+    @Override
+    public String visit(HasAnyExpression hasAnyExpression) {
+        return "any("
+                + nullSafeAccept(hasAnyExpression.getValueExpression())
+                + ", {"
+                + nullSafeAccept(hasAnyExpression.getFilterPredicateExpression())
+                + "})";
+    }
+
+    @Override
+    public String visit(IfElseExpression ifElseExpression) {
+        return "if "
+                + nullSafeAccept(ifElseExpression.getTest())
+                + " then "
+                + nullSafeAccept(ifElseExpression.getThenExpression())
+                + " else "
+                + nullSafeAccept(ifElseExpression.getElseExpression());
+    }
+
+    @Override
+    public String visit(IfExpression ifExpression) {
+        return "if " + nullSafeAccept(ifExpression.getTest()) + " then " + nullSafeAccept(ifExpression.getExpression());
+    }
+
+    @Override
+    public String visit(IsEmptyExpression isEmptyExpression) {
+        return "isEmpty(" + nullSafeAccept(isEmptyExpression.getValueExpression()) + ")";
+    }
+
+    @Override
+    public String visit(IsDefinedExpression isDefinedExpression) {
+        return "isDefined(" + nullSafeAccept(isDefinedExpression.getValueExpression()) + ")";
+    }
+
+    @Override
+    public String visit(LenExpression lenExpression) {
+        return "len(" + nullSafeAccept(lenExpression.getSource()) + ")";
+    }
+
+    @Override
+    public String visit(MatchesExpression matchesExpression) {
+        return stringPredicateExpression(matchesExpression);
+    }
+
+    @Override
+    public String visit(NotExpression notExpression) {
+        return "not(" + nullSafeAccept(notExpression.getPredicate()) + ")";
+    }
+
+    @Override
+    public String visit(StartsWithExpression startsWithExpression) {
+        return stringPredicateExpression(startsWithExpression);
+    }
+
+    @Override
+    public String visit(SubStringExpression subStringExpression) {
+        return "substring("
+                + nullSafeAccept(subStringExpression.getSource())
+                + ", "
+                + subStringExpression.getStartIndex()
+                + ", "
+                + subStringExpression.getEndIndex()
+                + ")";
+    }
+
+    @Override
+    public String visit(ValueRefExpression valueRefExpression) {
+        return valueRefExpression.getSymbolName();
+    }
+
+    @Override
+    public String visit(GetMemberExpression getMemberExpression) {
+        return nullSafeAccept(getMemberExpression.getTarget()) + "." + getMemberExpression.getMemberName();
+    }
+
+    @Override
+    public String visit(IndexExpression indexExpression) {
+        return nullSafeAccept(indexExpression.getTarget()) + "[" + nullSafeAccept(indexExpression.getKey()) + "]";
+    }
+
+    @Override
+    public String visit(WhenExpression whenExpression) {
+        return "when(" + nullSafeAccept(whenExpression.getExpression()) + ")";
+    }
+
+    @Override
+    public String visit(BooleanExpression booleanExpression) {
+        return booleanExpression.toString();
+    }
+
+    @Override
+    public String visit(StringValue stringValue) {
+        return "\"" + stringValue.value + "\"";
+    }
+
+    @Override
+    public String visit(ObjectValue objectValue) {
+        Object value = objectValue.value;
+        if (value == null || value == Values.NULL_OBJECT) {
+            return "null";
+        }
+        if (value == Values.UNDEFINED_OBJECT) {
+            return value.toString();
+        }
+        if (value == Values.THIS_OBJECT) {
+            return "this";
+        }
+        return value.getClass().getTypeName();
+    }
+
+    @Override
+    public String visit(NumericValue numericValue) {
+        Number value = numericValue.value;
+        if (value != null) {
+            if (value instanceof Double || value instanceof Float) {
+                return String.valueOf(value.doubleValue());
+            }
+            return value.toString();
+        }
+        return "null";
+    }
+
+    @Override
+    public String visit(BooleanValue booleanValue) {
+        if (booleanValue.value == null) {
+            return "null";
+        }
+        return String.valueOf(booleanValue.value.booleanValue());
+    }
+
+    @Override
+    public String visit(NullValue nullValue) {
+        return "null";
+    }
+
+    @Override
+    public String visit(ListValue listValue) {
+        if (listValue.getArrayHolder() != null) {
+            return listValue.getArrayType().getTypeName() + "[]";
+        }
+        if (listValue.getListHolder() instanceof List) {
+            return "List";
+        }
+        if (listValue.getListHolder() instanceof Set) {
+            return "Set";
+        }
+        return "null";
+    }
+
+    @Override
+    public String visit(MapValue mapValue) {
+        if (mapValue.getMapHolder() instanceof Map) {
+            return "Map";
+        }
+        return "null";
+    }
+
+    @Override
+    public String visit(SetValue setValue) {
+        if (setValue.getSetHolder() instanceof Set) {
+            return "Set";
+        }
+        return "null";
+    }
+
+    private String stringPredicateExpression(StringPredicateExpression stringPredicateExpression) {
+        return stringPredicateExpression.getName()
+                + "("
+                + nullSafeAccept(stringPredicateExpression.getSourceString())
+                + ", "
+                + nullSafeAccept(stringPredicateExpression.getStr())
+                + ")";
+    }
+
+    private String nullSafeAccept(Expression<?> expr) {
+        return expr != null ? expr.accept(this) : "null";
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ProbeCondition.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ProbeCondition.java
index 7ca052c2cab..00f38617d29 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ProbeCondition.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ProbeCondition.java
@@ -15,103 +15,103 @@
 
 /** Implements expression language for probe condition */
 public final class ProbeCondition implements DebuggerScript<Boolean> {
-  public static final ProbeCondition NONE = new ProbeCondition(null, "");
+    public static final ProbeCondition NONE = new ProbeCondition(null, "");
 
-  private final String dslExpression;
-  private final WhenExpression when;
-  private final ThenExpression then;
+    private final String dslExpression;
+    private final WhenExpression when;
+    private final ThenExpression then;
 
-  public ProbeCondition(WhenExpression when, String dslExpression) {
-    this.when = when;
-    this.dslExpression = dslExpression;
-    this.then = new ThenExpression();
-  }
+    public ProbeCondition(WhenExpression when, String dslExpression) {
+        this.when = when;
+        this.dslExpression = dslExpression;
+        this.then = new ThenExpression();
+    }
 
-  public String getDslExpression() {
-    return dslExpression;
-  }
+    public String getDslExpression() {
+        return dslExpression;
+    }
 
-  public WhenExpression getWhen() {
-    return when;
-  }
+    public WhenExpression getWhen() {
+        return when;
+    }
+
+    public static class ProbeConditionJsonAdapter extends JsonAdapter<ProbeCondition> {
+        @Override
+        public ProbeCondition fromJson(JsonReader reader) throws IOException {
+            if (reader.peek() == JsonReader.Token.NULL) {
+                reader.nextNull();
+                return null;
+            }
+            reader.beginObject();
+            ProbeCondition probeCondition = load(reader);
+            reader.endObject();
+            return probeCondition;
+        }
+
+        @Override
+        public void toJson(@Nonnull JsonWriter jsonWriter, ProbeCondition value) throws IOException {
+            if (value == null) {
+                jsonWriter.nullValue();
+                return;
+            }
+            jsonWriter.beginObject();
+            jsonWriter.name("dsl");
+            jsonWriter.value(value.dslExpression);
+            jsonWriter.endObject();
+        }
+    }
 
-  public static class ProbeConditionJsonAdapter extends JsonAdapter<ProbeCondition> {
     @Override
-    public ProbeCondition fromJson(JsonReader reader) throws IOException {
-      if (reader.peek() == JsonReader.Token.NULL) {
-        reader.nextNull();
-        return null;
-      }
-      reader.beginObject();
-      ProbeCondition probeCondition = load(reader);
-      reader.endObject();
-      return probeCondition;
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        ProbeCondition that = (ProbeCondition) o;
+
+        return getDslExpression().equals(that.getDslExpression());
     }
 
     @Override
-    public void toJson(@Nonnull JsonWriter jsonWriter, ProbeCondition value) throws IOException {
-      if (value == null) {
-        jsonWriter.nullValue();
-        return;
-      }
-      jsonWriter.beginObject();
-      jsonWriter.name("dsl");
-      jsonWriter.value(value.dslExpression);
-      jsonWriter.endObject();
+    public int hashCode() {
+        return getDslExpression().hashCode();
     }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    ProbeCondition that = (ProbeCondition) o;
-
-    return getDslExpression().equals(that.getDslExpression());
-  }
-
-  @Override
-  public int hashCode() {
-    return getDslExpression().hashCode();
-  }
-
-  @Override
-  public String toString() {
-    return "ProbeCondition{" + "dslExpression='" + dslExpression + '\'' + '}';
-  }
-
-  public static ProbeCondition load(JsonReader reader) throws IOException {
-    // reader is expected to be inside "when"
-    String dsl = null;
-    WhenExpression expression = null;
-    while (reader.hasNext() && reader.peek() == JsonReader.Token.NAME) {
-      String fieldName = reader.nextName();
-      if ("dsl".equals(fieldName)) {
-        dsl = reader.nextString();
-      } else if ("json".equals(fieldName)) {
-        expression = DSL.when(createPredicate(reader));
-      } else {
-        reader.skipValue();
-      }
+
+    @Override
+    public String toString() {
+        return "ProbeCondition{" + "dslExpression='" + dslExpression + '\'' + '}';
     }
-    // check dsl and condition for null
-    return new ProbeCondition(expression, dsl);
-  }
-
-  @Override
-  public Boolean execute(ValueReferenceResolver valueRefResolver, TimeoutChecker timeoutChecker) {
-    if (when == null) {
-      return true;
+
+    public static ProbeCondition load(JsonReader reader) throws IOException {
+        // reader is expected to be inside "when"
+        String dsl = null;
+        WhenExpression expression = null;
+        while (reader.hasNext() && reader.peek() == JsonReader.Token.NAME) {
+            String fieldName = reader.nextName();
+            if ("dsl".equals(fieldName)) {
+                dsl = reader.nextString();
+            } else if ("json".equals(fieldName)) {
+                expression = DSL.when(createPredicate(reader));
+            } else {
+                reader.skipValue();
+            }
+        }
+        // check dsl and condition for null
+        return new ProbeCondition(expression, dsl);
     }
-    if (when.evaluate(new EvalContext(valueRefResolver, timeoutChecker))) {
-      then.evaluate(new EvalContext(valueRefResolver, timeoutChecker));
-      return true;
+
+    @Override
+    public Boolean execute(ValueReferenceResolver valueRefResolver, TimeoutChecker timeoutChecker) {
+        if (when == null) {
+            return true;
+        }
+        if (when.evaluate(new EvalContext(valueRefResolver, timeoutChecker))) {
+            then.evaluate(new EvalContext(valueRefResolver, timeoutChecker));
+            return true;
+        }
+        return false;
     }
-    return false;
-  }
 
-  public void accept(Visitor visitor) {
-    when.accept(visitor);
-  }
+    public void accept(Visitor visitor) {
+        when.accept(visitor);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/RedactedException.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/RedactedException.java
index a2ec6cdb02d..51cf2dec6d3 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/RedactedException.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/RedactedException.java
@@ -1,7 +1,7 @@
 package com.datadog.debugger.el;
 
 public class RedactedException extends EvaluationException {
-  public RedactedException(String message, String expr) {
-    super(message, expr);
-  }
+    public RedactedException(String message, String expr) {
+        super(message, expr);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Value.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Value.java
index dced7f4ac9e..5e4c711651e 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Value.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Value.java
@@ -20,103 +20,102 @@
 
 /** Represents any value of the expression language */
 public interface Value<T> {
-  /** A generic undefined value */
-  static Value<?> undefinedValue() {
-    return UndefinedValue.INSTANCE;
-  }
-
-  static Value<?> nullValue() {
-    return NullValue.INSTANCE;
-  }
-
-  static Value<?> thisValue() {
-    return ObjectValue.THIS;
-  }
-
-  @SuppressWarnings("unchecked")
-  static <T> Value<T> undefined() {
-    return (Value<T>) undefinedValue();
-  }
+    /** A generic undefined value */
+    static Value<?> undefinedValue() {
+        return UndefinedValue.INSTANCE;
+    }
 
-  T getValue();
+    static Value<?> nullValue() {
+        return NullValue.INSTANCE;
+    }
 
-  default ValueType getType() {
-    return ValueType.OBJECT;
-  }
+    static Value<?> thisValue() {
+        return ObjectValue.THIS;
+    }
 
-  default boolean isUndefined() {
-    return false;
-  }
+    @SuppressWarnings("unchecked")
+    static <T> Value<T> undefined() {
+        return (Value<T>) undefinedValue();
+    }
 
-  default boolean isNull() {
-    return false;
-  }
+    T getValue();
 
-  static Value<?> of(Object value, ValueType type) {
-    if (value == null || value == Values.NULL_OBJECT || value == nullValue()) {
-      return nullValue();
+    default ValueType getType() {
+        return ValueType.OBJECT;
     }
-    if (value == Values.UNDEFINED_OBJECT || value == undefinedValue()) {
-      return undefinedValue();
-    }
-    if (value == Values.THIS_OBJECT) {
-      return thisValue();
-    }
-    String typeName = value.getClass().getTypeName();
-    if (WellKnownClasses.isStringPrimitive(typeName)) {
-      Function<Object, String> toString = WellKnownClasses.getSafeToString(typeName);
-      if (toString == null) {
-        throw new UnsupportedOperationException("Cannot convert value from type: " + typeName);
-      }
-      value = toString.apply(value);
+
+    default boolean isUndefined() {
+        return false;
     }
-    if (WellKnownClasses.isLongPrimitive(typeName)) {
-      ToLongFunction<Object> longPrimitiveValueFunction =
-          WellKnownClasses.getLongPrimitiveValueFunction(typeName);
-      value = longPrimitiveValueFunction.applyAsLong(value);
+
+    default boolean isNull() {
+        return false;
     }
-    if (value instanceof Boolean) {
-      return new BooleanValue((Boolean) value, type);
-    } else if (value instanceof Character) {
-      return new StringValue(value.toString());
-    } else if (value instanceof Number) {
-      return new NumericValue((Number) value, type);
-    } else if (value instanceof String) {
-      return new StringValue((String) value);
-    } else if (value instanceof List) {
-      return new ListValue(value);
-    } else if (value.getClass().isArray()) {
-      return new ListValue(value);
-    } else if (value instanceof Map) {
-      return new MapValue(value);
-    } else if (value instanceof Set) {
-      return new SetValue(value);
-    } else if (value instanceof Value) {
-      return (Value<?>) value;
-    } else {
-      return new ObjectValue(value);
+
+    static Value<?> of(Object value, ValueType type) {
+        if (value == null || value == Values.NULL_OBJECT || value == nullValue()) {
+            return nullValue();
+        }
+        if (value == Values.UNDEFINED_OBJECT || value == undefinedValue()) {
+            return undefinedValue();
+        }
+        if (value == Values.THIS_OBJECT) {
+            return thisValue();
+        }
+        String typeName = value.getClass().getTypeName();
+        if (WellKnownClasses.isStringPrimitive(typeName)) {
+            Function<Object, String> toString = WellKnownClasses.getSafeToString(typeName);
+            if (toString == null) {
+                throw new UnsupportedOperationException("Cannot convert value from type: " + typeName);
+            }
+            value = toString.apply(value);
+        }
+        if (WellKnownClasses.isLongPrimitive(typeName)) {
+            ToLongFunction<Object> longPrimitiveValueFunction =
+                    WellKnownClasses.getLongPrimitiveValueFunction(typeName);
+            value = longPrimitiveValueFunction.applyAsLong(value);
+        }
+        if (value instanceof Boolean) {
+            return new BooleanValue((Boolean) value, type);
+        } else if (value instanceof Character) {
+            return new StringValue(value.toString());
+        } else if (value instanceof Number) {
+            return new NumericValue((Number) value, type);
+        } else if (value instanceof String) {
+            return new StringValue((String) value);
+        } else if (value instanceof List) {
+            return new ListValue(value);
+        } else if (value.getClass().isArray()) {
+            return new ListValue(value);
+        } else if (value instanceof Map) {
+            return new MapValue(value);
+        } else if (value instanceof Set) {
+            return new SetValue(value);
+        } else if (value instanceof Value) {
+            return (Value<?>) value;
+        } else {
+            return new ObjectValue(value);
+        }
     }
-  }
 
-  static CapturedContext.CapturedValue toCapturedSnapshot(String name, Value<?> value) {
-    return CapturedContext.CapturedValue.of(
-        name, ValueType.toString(value.getType()), value.getValue());
-  }
+    static CapturedContext.CapturedValue toCapturedSnapshot(String name, Value<?> value) {
+        return CapturedContext.CapturedValue.of(name, ValueType.toString(value.getType()), value.getValue());
+    }
 
-  static CapturedContext.CapturedValue toCapturedSnapshot(
-      String name,
-      Value<?> value,
-      int maxReferenceDepth,
-      int maxCollectionSize,
-      int maxCount,
-      int maxFieldCount) {
-    return CapturedContext.CapturedValue.of(
-        name,
-        ValueType.toString(value.getType()),
-        value.getValue(),
-        maxReferenceDepth,
-        maxCollectionSize,
-        maxCount,
-        maxFieldCount);
-  }
+    static CapturedContext.CapturedValue toCapturedSnapshot(
+            String name,
+            Value<?> value,
+            int maxReferenceDepth,
+            int maxCollectionSize,
+            int maxCount,
+            int maxFieldCount) {
+        return CapturedContext.CapturedValue.of(
+                name,
+                ValueType.toString(value.getType()),
+                value.getValue(),
+                maxReferenceDepth,
+                maxCollectionSize,
+                maxCount,
+                maxFieldCount);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ValueScript.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ValueScript.java
index c446e0b12e5..c319f783277 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ValueScript.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ValueScript.java
@@ -45,357 +45,355 @@
 
 /** Implements expression language for capturing values for metric probes */
 public class ValueScript implements DebuggerScript<Value<?>> {
-  private static final Pattern PERIOD_PATTERN = Pattern.compile("\\.");
-  private static final Pattern INDEX_PATTERN = Pattern.compile("(.+)\\[([^]]+)]");
-  private final ValueExpression<?> expr;
-  private final String dsl;
-
-  public ValueScript(ValueExpression<?> expr, String dsl) {
-    this.expr = expr;
-    this.dsl = dsl;
-  }
-
-  public String getDsl() {
-    return dsl;
-  }
-
-  public ValueExpression<?> getExpr() {
-    return expr;
-  }
-
-  @Override
-  public Value<?> execute(ValueReferenceResolver valueRefResolver, TimeoutChecker timeoutChecker) {
-    return expr.evaluate(new EvalContext(valueRefResolver, timeoutChecker));
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    ValueScript that = (ValueScript) o;
-    return Objects.equals(expr, that.expr) && Objects.equals(dsl, that.dsl);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(expr, dsl);
-  }
-
-  @Override
-  public String toString() {
-    return "ValueScript{dsl='" + dsl + '\'' + '}';
-  }
-
-  public static ValueExpression<?> parseRefPath(String refPath) {
-    String[] parts = PERIOD_PATTERN.split(refPath);
-    String head;
-    int startIdx = 1;
-    head = parts[0];
-    ValueExpression<?> current;
-    Matcher matcher = INDEX_PATTERN.matcher(head);
-    if (matcher.matches()) {
-      String key = matcher.group(2);
-      ValueExpression<?> keyExpr;
-      if (key.matches("[0-9]+")) {
-        keyExpr = DSL.value(Integer.parseInt(key));
-      } else if (key.matches("[\"'].*[\"']")) {
-        keyExpr = DSL.value(key.substring(1, key.length() - 1));
-      } else {
-        keyExpr = parseRefPath(key);
-      }
-      current = DSL.index(DSL.ref(matcher.group(1)), keyExpr);
-    } else {
-      current = DSL.ref(head);
+    private static final Pattern PERIOD_PATTERN = Pattern.compile("\\.");
+    private static final Pattern INDEX_PATTERN = Pattern.compile("(.+)\\[([^]]+)]");
+    private final ValueExpression<?> expr;
+    private final String dsl;
+
+    public ValueScript(ValueExpression<?> expr, String dsl) {
+        this.expr = expr;
+        this.dsl = dsl;
     }
-    for (int i = startIdx; i < parts.length; i++) {
-      current = DSL.getMember(current, parts[i]);
+
+    public String getDsl() {
+        return dsl;
+    }
+
+    public ValueExpression<?> getExpr() {
+        return expr;
     }
-    return current;
-  }
 
-  public static class ValueScriptAdapter extends JsonAdapter<ValueScript> {
     @Override
-    public ValueScript fromJson(JsonReader jsonReader) throws IOException {
-      if (jsonReader.peek() == JsonReader.Token.BEGIN_OBJECT) {
-        jsonReader.beginObject();
-        ValueExpression<?> valueExpression = null;
-        String dsl = null;
-        while (jsonReader.hasNext()) {
-          String fieldName = jsonReader.nextName();
-          switch (fieldName) {
-            case "json":
-              {
-                valueExpression = JsonToExpressionConverter.asValueExpression(jsonReader);
-                break;
-              }
-            case "dsl":
-              {
-                dsl = jsonReader.nextString();
-                break;
-              }
-            default:
-              throw new IOException("Invalid field: " + fieldName);
-          }
-        }
-        jsonReader.endObject();
-        return new ValueScript(valueExpression, dsl);
-      } else {
-        throw new IOException("Invalid ValueScript format");
-      }
+    public Value<?> execute(ValueReferenceResolver valueRefResolver, TimeoutChecker timeoutChecker) {
+        return expr.evaluate(new EvalContext(valueRefResolver, timeoutChecker));
     }
 
     @Override
-    public void toJson(JsonWriter jsonWriter, ValueScript value) throws IOException {
-      if (value == null) {
-        jsonWriter.nullValue();
-        return;
-      }
-      jsonWriter.beginObject();
-      jsonWriter.name("dsl");
-      jsonWriter.value(value.dsl);
-      jsonWriter.name("json");
-      ToJsonVisitor toJsonVisitor = new ToJsonVisitor(jsonWriter);
-      value.expr.accept(toJsonVisitor);
-      jsonWriter.endObject();
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ValueScript that = (ValueScript) o;
+        return Objects.equals(expr, that.expr) && Objects.equals(dsl, that.dsl);
     }
 
-    private static class ToJsonVisitor implements Visitor<Void> {
-      private final JsonWriter jsonWriter;
-
-      public ToJsonVisitor(JsonWriter jsonWriter) {
-        this.jsonWriter = jsonWriter;
-      }
-
-      @Override
-      public Void visit(BinaryExpression binaryExpression) {
-        throw new UnsupportedOperationException("BinaryExpression is not supported");
-      }
-
-      @Override
-      public Void visit(BinaryOperator operator) {
-        throw new UnsupportedOperationException("BinaryOperator is not supported");
-      }
-
-      @Override
-      public Void visit(ComparisonExpression comparisonExpression) {
-        try {
-          jsonWriter.beginObject();
-          comparisonExpression.getOperator().accept(this);
-          jsonWriter.beginArray();
-          comparisonExpression.getLeft().accept(this);
-          comparisonExpression.getRight().accept(this);
-          jsonWriter.endArray();
-          jsonWriter.endObject();
-        } catch (IOException e) {
-          throw new RuntimeException(e);
-        }
-        return null;
-      }
-
-      @Override
-      public Void visit(ComparisonOperator operator) {
-        try {
-          jsonWriter.name(operator.name().toLowerCase());
-        } catch (IOException e) {
-          throw new RuntimeException(e);
-        }
-        return null;
-      }
-
-      @Override
-      public Void visit(ContainsExpression containsExpression) {
-        throw new UnsupportedOperationException("ContainsExpression is not supported");
-      }
-
-      @Override
-      public Void visit(EndsWithExpression endsWithExpression) {
-        throw new UnsupportedOperationException("EndsWithExpression is not supported");
-      }
-
-      @Override
-      public Void visit(FilterCollectionExpression filterCollectionExpression) {
-        try {
-          jsonWriter.beginObject();
-          jsonWriter.name("filter");
-          jsonWriter.beginArray();
-          filterCollectionExpression.getSource().accept(this);
-          filterCollectionExpression.getFilterExpression().accept(this);
-          jsonWriter.endArray();
-          jsonWriter.endObject();
-        } catch (IOException e) {
-          throw new RuntimeException(e);
-        }
-        return null;
-      }
-
-      @Override
-      public Void visit(HasAllExpression hasAllExpression) {
-        throw new UnsupportedOperationException("HasAllExpression is not supported");
-      }
-
-      @Override
-      public Void visit(HasAnyExpression hasAnyExpression) {
-        throw new UnsupportedOperationException("HasAnyExpression is not supported");
-      }
-
-      @Override
-      public Void visit(IfElseExpression ifElseExpression) {
-        throw new UnsupportedOperationException("IfElseExpression is not supported");
-      }
-
-      @Override
-      public Void visit(IfExpression ifExpression) {
-        throw new UnsupportedOperationException("IfExpression is not supported");
-      }
-
-      @Override
-      public Void visit(IsEmptyExpression isEmptyExpression) {
-        throw new UnsupportedOperationException("IsEmptyExpression is not supported");
-      }
-
-      @Override
-      public Void visit(IsDefinedExpression isDefinedExpression) {
-        throw new UnsupportedOperationException("IsDefinedExpression is not supported");
-      }
-
-      @Override
-      public Void visit(LenExpression lenExpression) {
-        try {
-          jsonWriter.beginObject();
-          jsonWriter.name("count");
-          lenExpression.getSource().accept(this);
-          jsonWriter.endObject();
-        } catch (IOException e) {
-          throw new RuntimeException(e);
-        }
-        return null;
-      }
-
-      @Override
-      public Void visit(MatchesExpression matchesExpression) {
-        throw new UnsupportedOperationException("MatchesExpression is not supported");
-      }
-
-      @Override
-      public Void visit(NotExpression notExpression) {
-        throw new UnsupportedOperationException("NotExpression is not supported");
-      }
-
-      @Override
-      public Void visit(StartsWithExpression startsWithExpression) {
-        throw new UnsupportedOperationException("StartsWithExpression is not supported");
-      }
-
-      @Override
-      public Void visit(SubStringExpression subStringExpression) {
-        throw new UnsupportedOperationException("SubStringExpression is not supported");
-      }
-
-      @Override
-      public Void visit(ValueRefExpression valueRefExpression) {
-        try {
-          jsonWriter.beginObject();
-          jsonWriter.name("ref");
-          jsonWriter.value(valueRefExpression.getSymbolName());
-          jsonWriter.endObject();
-        } catch (IOException e) {
-          throw new RuntimeException(e);
+    @Override
+    public int hashCode() {
+        return Objects.hash(expr, dsl);
+    }
+
+    @Override
+    public String toString() {
+        return "ValueScript{dsl='" + dsl + '\'' + '}';
+    }
+
+    public static ValueExpression<?> parseRefPath(String refPath) {
+        String[] parts = PERIOD_PATTERN.split(refPath);
+        String head;
+        int startIdx = 1;
+        head = parts[0];
+        ValueExpression<?> current;
+        Matcher matcher = INDEX_PATTERN.matcher(head);
+        if (matcher.matches()) {
+            String key = matcher.group(2);
+            ValueExpression<?> keyExpr;
+            if (key.matches("[0-9]+")) {
+                keyExpr = DSL.value(Integer.parseInt(key));
+            } else if (key.matches("[\"'].*[\"']")) {
+                keyExpr = DSL.value(key.substring(1, key.length() - 1));
+            } else {
+                keyExpr = parseRefPath(key);
+            }
+            current = DSL.index(DSL.ref(matcher.group(1)), keyExpr);
+        } else {
+            current = DSL.ref(head);
         }
-        return null;
-      }
-
-      @Override
-      public Void visit(GetMemberExpression getMemberExpression) {
-        try {
-          jsonWriter.beginObject();
-          jsonWriter.name("getmember");
-          jsonWriter.beginArray();
-          getMemberExpression.getTarget().accept(this);
-          jsonWriter.value(getMemberExpression.getMemberName());
-          jsonWriter.endArray();
-          jsonWriter.endObject();
-        } catch (IOException e) {
-          throw new RuntimeException(e);
+        for (int i = startIdx; i < parts.length; i++) {
+            current = DSL.getMember(current, parts[i]);
         }
-        return null;
-      }
-
-      @Override
-      public Void visit(IndexExpression indexExpression) {
-        try {
-          jsonWriter.beginObject();
-          jsonWriter.name("index");
-          jsonWriter.beginArray();
-          indexExpression.getTarget().accept(this);
-          indexExpression.getKey().accept(this);
-          jsonWriter.endArray();
-          jsonWriter.endObject();
-        } catch (IOException e) {
-          throw new RuntimeException(e);
+        return current;
+    }
+
+    public static class ValueScriptAdapter extends JsonAdapter<ValueScript> {
+        @Override
+        public ValueScript fromJson(JsonReader jsonReader) throws IOException {
+            if (jsonReader.peek() == JsonReader.Token.BEGIN_OBJECT) {
+                jsonReader.beginObject();
+                ValueExpression<?> valueExpression = null;
+                String dsl = null;
+                while (jsonReader.hasNext()) {
+                    String fieldName = jsonReader.nextName();
+                    switch (fieldName) {
+                        case "json": {
+                            valueExpression = JsonToExpressionConverter.asValueExpression(jsonReader);
+                            break;
+                        }
+                        case "dsl": {
+                            dsl = jsonReader.nextString();
+                            break;
+                        }
+                        default:
+                            throw new IOException("Invalid field: " + fieldName);
+                    }
+                }
+                jsonReader.endObject();
+                return new ValueScript(valueExpression, dsl);
+            } else {
+                throw new IOException("Invalid ValueScript format");
+            }
         }
-        return null;
-      }
-
-      @Override
-      public Void visit(WhenExpression whenExpression) {
-        throw new UnsupportedOperationException("WhenExpression is not supported");
-      }
-
-      @Override
-      public Void visit(BooleanExpression booleanExpression) {
-        throw new UnsupportedOperationException("BooleanExpression is not supported");
-      }
-
-      @Override
-      public Void visit(ObjectValue objectValue) {
-        throw new UnsupportedOperationException("ObjectValue is not supported");
-      }
-
-      @Override
-      public Void visit(StringValue stringValue) {
-        try {
-          jsonWriter.value(stringValue.getValue());
-        } catch (IOException e) {
-          throw new RuntimeException(e);
+
+        @Override
+        public void toJson(JsonWriter jsonWriter, ValueScript value) throws IOException {
+            if (value == null) {
+                jsonWriter.nullValue();
+                return;
+            }
+            jsonWriter.beginObject();
+            jsonWriter.name("dsl");
+            jsonWriter.value(value.dsl);
+            jsonWriter.name("json");
+            ToJsonVisitor toJsonVisitor = new ToJsonVisitor(jsonWriter);
+            value.expr.accept(toJsonVisitor);
+            jsonWriter.endObject();
         }
-        return null;
-      }
-
-      @Override
-      public Void visit(NumericValue numericValue) {
-        try {
-          // TODO handle double
-          jsonWriter.value(numericValue.getValue().longValue());
-        } catch (IOException e) {
-          throw new RuntimeException(e);
+
+        private static class ToJsonVisitor implements Visitor<Void> {
+            private final JsonWriter jsonWriter;
+
+            public ToJsonVisitor(JsonWriter jsonWriter) {
+                this.jsonWriter = jsonWriter;
+            }
+
+            @Override
+            public Void visit(BinaryExpression binaryExpression) {
+                throw new UnsupportedOperationException("BinaryExpression is not supported");
+            }
+
+            @Override
+            public Void visit(BinaryOperator operator) {
+                throw new UnsupportedOperationException("BinaryOperator is not supported");
+            }
+
+            @Override
+            public Void visit(ComparisonExpression comparisonExpression) {
+                try {
+                    jsonWriter.beginObject();
+                    comparisonExpression.getOperator().accept(this);
+                    jsonWriter.beginArray();
+                    comparisonExpression.getLeft().accept(this);
+                    comparisonExpression.getRight().accept(this);
+                    jsonWriter.endArray();
+                    jsonWriter.endObject();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+                return null;
+            }
+
+            @Override
+            public Void visit(ComparisonOperator operator) {
+                try {
+                    jsonWriter.name(operator.name().toLowerCase());
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+                return null;
+            }
+
+            @Override
+            public Void visit(ContainsExpression containsExpression) {
+                throw new UnsupportedOperationException("ContainsExpression is not supported");
+            }
+
+            @Override
+            public Void visit(EndsWithExpression endsWithExpression) {
+                throw new UnsupportedOperationException("EndsWithExpression is not supported");
+            }
+
+            @Override
+            public Void visit(FilterCollectionExpression filterCollectionExpression) {
+                try {
+                    jsonWriter.beginObject();
+                    jsonWriter.name("filter");
+                    jsonWriter.beginArray();
+                    filterCollectionExpression.getSource().accept(this);
+                    filterCollectionExpression.getFilterExpression().accept(this);
+                    jsonWriter.endArray();
+                    jsonWriter.endObject();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+                return null;
+            }
+
+            @Override
+            public Void visit(HasAllExpression hasAllExpression) {
+                throw new UnsupportedOperationException("HasAllExpression is not supported");
+            }
+
+            @Override
+            public Void visit(HasAnyExpression hasAnyExpression) {
+                throw new UnsupportedOperationException("HasAnyExpression is not supported");
+            }
+
+            @Override
+            public Void visit(IfElseExpression ifElseExpression) {
+                throw new UnsupportedOperationException("IfElseExpression is not supported");
+            }
+
+            @Override
+            public Void visit(IfExpression ifExpression) {
+                throw new UnsupportedOperationException("IfExpression is not supported");
+            }
+
+            @Override
+            public Void visit(IsEmptyExpression isEmptyExpression) {
+                throw new UnsupportedOperationException("IsEmptyExpression is not supported");
+            }
+
+            @Override
+            public Void visit(IsDefinedExpression isDefinedExpression) {
+                throw new UnsupportedOperationException("IsDefinedExpression is not supported");
+            }
+
+            @Override
+            public Void visit(LenExpression lenExpression) {
+                try {
+                    jsonWriter.beginObject();
+                    jsonWriter.name("count");
+                    lenExpression.getSource().accept(this);
+                    jsonWriter.endObject();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+                return null;
+            }
+
+            @Override
+            public Void visit(MatchesExpression matchesExpression) {
+                throw new UnsupportedOperationException("MatchesExpression is not supported");
+            }
+
+            @Override
+            public Void visit(NotExpression notExpression) {
+                throw new UnsupportedOperationException("NotExpression is not supported");
+            }
+
+            @Override
+            public Void visit(StartsWithExpression startsWithExpression) {
+                throw new UnsupportedOperationException("StartsWithExpression is not supported");
+            }
+
+            @Override
+            public Void visit(SubStringExpression subStringExpression) {
+                throw new UnsupportedOperationException("SubStringExpression is not supported");
+            }
+
+            @Override
+            public Void visit(ValueRefExpression valueRefExpression) {
+                try {
+                    jsonWriter.beginObject();
+                    jsonWriter.name("ref");
+                    jsonWriter.value(valueRefExpression.getSymbolName());
+                    jsonWriter.endObject();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+                return null;
+            }
+
+            @Override
+            public Void visit(GetMemberExpression getMemberExpression) {
+                try {
+                    jsonWriter.beginObject();
+                    jsonWriter.name("getmember");
+                    jsonWriter.beginArray();
+                    getMemberExpression.getTarget().accept(this);
+                    jsonWriter.value(getMemberExpression.getMemberName());
+                    jsonWriter.endArray();
+                    jsonWriter.endObject();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+                return null;
+            }
+
+            @Override
+            public Void visit(IndexExpression indexExpression) {
+                try {
+                    jsonWriter.beginObject();
+                    jsonWriter.name("index");
+                    jsonWriter.beginArray();
+                    indexExpression.getTarget().accept(this);
+                    indexExpression.getKey().accept(this);
+                    jsonWriter.endArray();
+                    jsonWriter.endObject();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+                return null;
+            }
+
+            @Override
+            public Void visit(WhenExpression whenExpression) {
+                throw new UnsupportedOperationException("WhenExpression is not supported");
+            }
+
+            @Override
+            public Void visit(BooleanExpression booleanExpression) {
+                throw new UnsupportedOperationException("BooleanExpression is not supported");
+            }
+
+            @Override
+            public Void visit(ObjectValue objectValue) {
+                throw new UnsupportedOperationException("ObjectValue is not supported");
+            }
+
+            @Override
+            public Void visit(StringValue stringValue) {
+                try {
+                    jsonWriter.value(stringValue.getValue());
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+                return null;
+            }
+
+            @Override
+            public Void visit(NumericValue numericValue) {
+                try {
+                    // TODO handle double
+                    jsonWriter.value(numericValue.getValue().longValue());
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+                return null;
+            }
+
+            @Override
+            public Void visit(BooleanValue booleanValue) {
+                throw new UnsupportedOperationException("BooleanValue is not supported");
+            }
+
+            @Override
+            public Void visit(NullValue nullValue) {
+                throw new UnsupportedOperationException("NullValue is not supported");
+            }
+
+            @Override
+            public Void visit(ListValue listValue) {
+                throw new UnsupportedOperationException("ListValue is not supported");
+            }
+
+            @Override
+            public Void visit(MapValue mapValue) {
+                throw new UnsupportedOperationException("MapValue is not supported");
+            }
+
+            @Override
+            public Void visit(SetValue setValue) {
+                throw new UnsupportedOperationException("SetValue is not supported");
+            }
         }
-        return null;
-      }
-
-      @Override
-      public Void visit(BooleanValue booleanValue) {
-        throw new UnsupportedOperationException("BooleanValue is not supported");
-      }
-
-      @Override
-      public Void visit(NullValue nullValue) {
-        throw new UnsupportedOperationException("NullValue is not supported");
-      }
-
-      @Override
-      public Void visit(ListValue listValue) {
-        throw new UnsupportedOperationException("ListValue is not supported");
-      }
-
-      @Override
-      public Void visit(MapValue mapValue) {
-        throw new UnsupportedOperationException("MapValue is not supported");
-      }
-
-      @Override
-      public Void visit(SetValue setValue) {
-        throw new UnsupportedOperationException("SetValue is not supported");
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ValueType.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ValueType.java
index 7066cbfb58f..58895ce54f7 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ValueType.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ValueType.java
@@ -1,52 +1,52 @@
 package com.datadog.debugger.el;
 
 public enum ValueType {
-  OBJECT,
-  BOOLEAN,
-  INT,
-  LONG,
-  DOUBLE,
-  BYTE,
-  SHORT,
-  CHAR,
-  FLOAT;
+    OBJECT,
+    BOOLEAN,
+    INT,
+    LONG,
+    DOUBLE,
+    BYTE,
+    SHORT,
+    CHAR,
+    FLOAT;
 
-  public static String toString(ValueType type) {
-    switch (type) {
-      case BOOLEAN:
-      case INT:
-      case LONG:
-      case DOUBLE:
-      case BYTE:
-      case SHORT:
-      case CHAR:
-      case FLOAT:
-        return type.name().toLowerCase();
-      default:
-        return Object.class.getTypeName();
+    public static String toString(ValueType type) {
+        switch (type) {
+            case BOOLEAN:
+            case INT:
+            case LONG:
+            case DOUBLE:
+            case BYTE:
+            case SHORT:
+            case CHAR:
+            case FLOAT:
+                return type.name().toLowerCase();
+            default:
+                return Object.class.getTypeName();
+        }
     }
-  }
 
-  public static ValueType of(String type) {
-    switch (type) {
-      case "boolean":
-        return BOOLEAN;
-      case "int":
-        return INT;
-      case "long":
-        return LONG;
-      case "double":
-        return DOUBLE;
-      case "byte":
-        return BYTE;
-      case "short":
-        return SHORT;
-      case "char":
-        return CHAR;
-      case "float":
-        return FLOAT;
-      default:
-        return OBJECT;
+    public static ValueType of(String type) {
+        switch (type) {
+            case "boolean":
+                return BOOLEAN;
+            case "int":
+                return INT;
+            case "long":
+                return LONG;
+            case "double":
+                return DOUBLE;
+            case "byte":
+                return BYTE;
+            case "short":
+                return SHORT;
+            case "char":
+                return CHAR;
+            case "float":
+                return FLOAT;
+            default:
+                return OBJECT;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Visitor.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Visitor.java
index 12d96499905..2be28e49ea8 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Visitor.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Visitor.java
@@ -33,65 +33,65 @@
 import com.datadog.debugger.el.values.StringValue;
 
 public interface Visitor<R> {
-  R visit(BinaryExpression binaryExpression);
+    R visit(BinaryExpression binaryExpression);
 
-  R visit(BinaryOperator operator);
+    R visit(BinaryOperator operator);
 
-  R visit(ComparisonExpression comparisonExpression);
+    R visit(ComparisonExpression comparisonExpression);
 
-  R visit(ComparisonOperator operator);
+    R visit(ComparisonOperator operator);
 
-  R visit(ContainsExpression containsExpression);
+    R visit(ContainsExpression containsExpression);
 
-  R visit(EndsWithExpression endsWithExpression);
+    R visit(EndsWithExpression endsWithExpression);
 
-  R visit(FilterCollectionExpression filterCollectionExpression);
+    R visit(FilterCollectionExpression filterCollectionExpression);
 
-  R visit(HasAllExpression hasAllExpression);
+    R visit(HasAllExpression hasAllExpression);
 
-  R visit(HasAnyExpression hasAnyExpression);
+    R visit(HasAnyExpression hasAnyExpression);
 
-  R visit(IfElseExpression ifElseExpression);
+    R visit(IfElseExpression ifElseExpression);
 
-  R visit(IfExpression ifExpression);
+    R visit(IfExpression ifExpression);
 
-  R visit(IsEmptyExpression isEmptyExpression);
+    R visit(IsEmptyExpression isEmptyExpression);
 
-  R visit(IsDefinedExpression isDefinedExpression);
+    R visit(IsDefinedExpression isDefinedExpression);
 
-  R visit(LenExpression lenExpression);
+    R visit(LenExpression lenExpression);
 
-  R visit(MatchesExpression matchesExpression);
+    R visit(MatchesExpression matchesExpression);
 
-  R visit(NotExpression notExpression);
+    R visit(NotExpression notExpression);
 
-  R visit(StartsWithExpression startsWithExpression);
+    R visit(StartsWithExpression startsWithExpression);
 
-  R visit(SubStringExpression subStringExpression);
+    R visit(SubStringExpression subStringExpression);
 
-  R visit(ValueRefExpression valueRefExpression);
+    R visit(ValueRefExpression valueRefExpression);
 
-  R visit(GetMemberExpression getMemberExpression);
+    R visit(GetMemberExpression getMemberExpression);
 
-  R visit(IndexExpression indexExpression);
+    R visit(IndexExpression indexExpression);
 
-  R visit(WhenExpression whenExpression);
+    R visit(WhenExpression whenExpression);
 
-  R visit(BooleanExpression booleanExpression);
+    R visit(BooleanExpression booleanExpression);
 
-  R visit(ObjectValue objectValue);
+    R visit(ObjectValue objectValue);
 
-  R visit(StringValue stringValue);
+    R visit(StringValue stringValue);
 
-  R visit(NumericValue numericValue);
+    R visit(NumericValue numericValue);
 
-  R visit(BooleanValue booleanValue);
+    R visit(BooleanValue booleanValue);
 
-  R visit(NullValue nullValue);
+    R visit(NullValue nullValue);
 
-  R visit(ListValue listValue);
+    R visit(ListValue listValue);
 
-  R visit(MapValue mapValue);
+    R visit(MapValue mapValue);
 
-  R visit(SetValue setValue);
+    R visit(SetValue setValue);
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryExpression.java
index 3c955d21b74..5f959d9bdf7 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryExpression.java
@@ -8,48 +8,40 @@
  * BinaryOperator operator}.
  */
 public final class BinaryExpression implements BooleanExpression {
-  protected final BooleanExpression left;
-  protected final BooleanExpression right;
-  private final BinaryOperator operator;
-
-  public BinaryExpression(
-      BooleanExpression left, BooleanExpression right, BinaryOperator operator) {
-    this.left = left == null ? BooleanExpression.FALSE : left;
-    this.right = right == null ? BooleanExpression.FALSE : right;
-    this.operator = operator;
-  }
-
-  @Override
-  public Boolean evaluate(EvalContext evalContext) {
-    return operator.apply(left, right, evalContext);
-  }
-
-  @Override
-  public String toString() {
-    return "BinaryExpression{"
-        + "left="
-        + left
-        + ", right="
-        + right
-        + ", operator="
-        + operator
-        + '}';
-  }
-
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
-
-  public BooleanExpression getLeft() {
-    return left;
-  }
-
-  public BooleanExpression getRight() {
-    return right;
-  }
-
-  public BinaryOperator getOperator() {
-    return operator;
-  }
+    protected final BooleanExpression left;
+    protected final BooleanExpression right;
+    private final BinaryOperator operator;
+
+    public BinaryExpression(BooleanExpression left, BooleanExpression right, BinaryOperator operator) {
+        this.left = left == null ? BooleanExpression.FALSE : left;
+        this.right = right == null ? BooleanExpression.FALSE : right;
+        this.operator = operator;
+    }
+
+    @Override
+    public Boolean evaluate(EvalContext evalContext) {
+        return operator.apply(left, right, evalContext);
+    }
+
+    @Override
+    public String toString() {
+        return "BinaryExpression{" + "left=" + left + ", right=" + right + ", operator=" + operator + '}';
+    }
+
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
+
+    public BooleanExpression getLeft() {
+        return left;
+    }
+
+    public BooleanExpression getRight() {
+        return right;
+    }
+
+    public BinaryOperator getOperator() {
+        return operator;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryOperator.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryOperator.java
index 3a1a7391d17..5f2f7189003 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryOperator.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryOperator.java
@@ -4,33 +4,32 @@
 import com.datadog.debugger.el.Visitor;
 
 public enum BinaryOperator {
-  AND("&&") {
-    @Override
-    public Boolean apply(BooleanExpression left, BooleanExpression right, EvalContext evalContext) {
-      return left.evaluate(evalContext) && right.evaluate(evalContext);
-    }
-  },
-  OR("||") {
-    @Override
-    public Boolean apply(BooleanExpression left, BooleanExpression right, EvalContext evalContext) {
-      return left.evaluate(evalContext) || right.evaluate(evalContext);
-    }
-  };
+    AND("&&") {
+        @Override
+        public Boolean apply(BooleanExpression left, BooleanExpression right, EvalContext evalContext) {
+            return left.evaluate(evalContext) && right.evaluate(evalContext);
+        }
+    },
+    OR("||") {
+        @Override
+        public Boolean apply(BooleanExpression left, BooleanExpression right, EvalContext evalContext) {
+            return left.evaluate(evalContext) || right.evaluate(evalContext);
+        }
+    };
 
-  private final String symbol;
+    private final String symbol;
 
-  BinaryOperator(String symbol) {
-    this.symbol = symbol;
-  }
+    BinaryOperator(String symbol) {
+        this.symbol = symbol;
+    }
 
-  public abstract Boolean apply(
-      BooleanExpression left, BooleanExpression right, EvalContext evalContext);
+    public abstract Boolean apply(BooleanExpression left, BooleanExpression right, EvalContext evalContext);
 
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 
-  public String getSymbol() {
-    return symbol;
-  }
+    public String getSymbol() {
+        return symbol;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BooleanExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BooleanExpression.java
index 2f98571f03b..1f8dc936b87 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BooleanExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BooleanExpression.java
@@ -6,38 +6,36 @@
 
 /** A generic interface for expressions resolving to {@linkplain Boolean} */
 public interface BooleanExpression extends Expression<Boolean> {
-  BooleanExpression TRUE =
-      new BooleanExpression() {
+    BooleanExpression TRUE = new BooleanExpression() {
         @Override
         public Boolean evaluate(EvalContext evalContext) {
-          return Boolean.TRUE;
+            return Boolean.TRUE;
         }
 
         @Override
         public String toString() {
-          return "true";
+            return "true";
         }
 
         @Override
         public <R> R accept(Visitor<R> visitor) {
-          return visitor.visit(this);
+            return visitor.visit(this);
         }
-      };
-  BooleanExpression FALSE =
-      new BooleanExpression() {
+    };
+    BooleanExpression FALSE = new BooleanExpression() {
         @Override
         public Boolean evaluate(EvalContext evalContext) {
-          return Boolean.FALSE;
+            return Boolean.FALSE;
         }
 
         @Override
         public String toString() {
-          return "false";
+            return "false";
         }
 
         @Override
         public <R> R accept(Visitor<R> visitor) {
-          return visitor.visit(this);
+            return visitor.visit(this);
         }
-      };
+    };
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/CollectionExpressionHelper.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/CollectionExpressionHelper.java
index 540008c6ea1..9e3869aa029 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/CollectionExpressionHelper.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/CollectionExpressionHelper.java
@@ -15,48 +15,45 @@
 import java.util.Set;
 
 public class CollectionExpressionHelper {
-  public static void checkSupportedMap(MapValue map, Expression<?> expression) {
-    Map<?, ?> mapHolder = (Map<?, ?>) map.getMapHolder();
-    if (!WellKnownClasses.isSafe(mapHolder)) {
-      throw new EvaluationException(
-          "Unsupported Map class: " + mapHolder.getClass().getTypeName(), print(expression));
+    public static void checkSupportedMap(MapValue map, Expression<?> expression) {
+        Map<?, ?> mapHolder = (Map<?, ?>) map.getMapHolder();
+        if (!WellKnownClasses.isSafe(mapHolder)) {
+            throw new EvaluationException(
+                    "Unsupported Map class: " + mapHolder.getClass().getTypeName(), print(expression));
+        }
     }
-  }
 
-  public static void checkSupportedList(ListValue collection, Expression<?> expression) {
-    Object holder = collection.getValue();
-    if (holder instanceof List) {
-      if (!WellKnownClasses.isSafe((List<?>) holder)) {
-        throw new EvaluationException(
-            "Unsupported List class: " + holder.getClass().getTypeName(), print(expression));
-      }
+    public static void checkSupportedList(ListValue collection, Expression<?> expression) {
+        Object holder = collection.getValue();
+        if (holder instanceof List) {
+            if (!WellKnownClasses.isSafe((List<?>) holder)) {
+                throw new EvaluationException(
+                        "Unsupported List class: " + holder.getClass().getTypeName(), print(expression));
+            }
+        }
     }
-  }
 
-  public static Value<?> evaluateTargetCollection(
-      ValueExpression<?> collectionTarget, Expression<?> expression, EvalContext evalContext) {
-    if (collectionTarget == null) {
-      throw new EvaluationException(
-          "Cannot evaluate the expression for null value", print(expression));
+    public static Value<?> evaluateTargetCollection(
+            ValueExpression<?> collectionTarget, Expression<?> expression, EvalContext evalContext) {
+        if (collectionTarget == null) {
+            throw new EvaluationException("Cannot evaluate the expression for null value", print(expression));
+        }
+        Value<?> value = collectionTarget.evaluate(evalContext);
+        if (value.isUndefined()) {
+            throw new EvaluationException("Cannot evaluate the expression for undefined value", print(expression));
+        }
+        if (value.isNull()) {
+            throw new EvaluationException("Cannot evaluate the expression for null value", print(expression));
+        }
+        return value;
     }
-    Value<?> value = collectionTarget.evaluate(evalContext);
-    if (value.isUndefined()) {
-      throw new EvaluationException(
-          "Cannot evaluate the expression for undefined value", print(expression));
-    }
-    if (value.isNull()) {
-      throw new EvaluationException(
-          "Cannot evaluate the expression for null value", print(expression));
-    }
-    return value;
-  }
 
-  public static Set<?> checkSupportedSet(SetValue set, Expression<?> expression) {
-    Set<?> setHolder = (Set<?>) set.getSetHolder();
-    if (!WellKnownClasses.isSafe(setHolder)) {
-      throw new EvaluationException(
-          "Unsupported Set class: " + setHolder.getClass().getTypeName(), print(expression));
+    public static Set<?> checkSupportedSet(SetValue set, Expression<?> expression) {
+        Set<?> setHolder = (Set<?>) set.getSetHolder();
+        if (!WellKnownClasses.isSafe(setHolder)) {
+            throw new EvaluationException(
+                    "Unsupported Set class: " + setHolder.getClass().getTypeName(), print(expression));
+        }
+        return setHolder;
     }
-    return setHolder;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ComparisonExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ComparisonExpression.java
index e14c47a67be..5b2df70e0d1 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ComparisonExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ComparisonExpression.java
@@ -14,52 +14,51 @@
  * ComparisonOperator operator}.
  */
 public class ComparisonExpression implements BooleanExpression {
-  private final ValueExpression<?> left;
-  private final ValueExpression<?> right;
-  private final ComparisonOperator operator;
+    private final ValueExpression<?> left;
+    private final ValueExpression<?> right;
+    private final ComparisonOperator operator;
 
-  public ComparisonExpression(
-      ValueExpression<?> left, ValueExpression<?> right, ComparisonOperator operator) {
-    this.left = left == null ? ValueExpression.NULL : left;
-    this.right = right == null ? ValueRefExpression.NULL : right;
-    this.operator = operator;
-  }
-
-  @Override
-  public Boolean evaluate(EvalContext evalContext) {
-    Value<?> leftValue = left.evaluate(evalContext);
-    if (leftValue.isUndefined()) {
-      return Boolean.FALSE;
-    }
-    Value<?> rightValue = right.evaluate(evalContext);
-    if (rightValue.isUndefined()) {
-      return Boolean.FALSE;
+    public ComparisonExpression(ValueExpression<?> left, ValueExpression<?> right, ComparisonOperator operator) {
+        this.left = left == null ? ValueExpression.NULL : left;
+        this.right = right == null ? ValueRefExpression.NULL : right;
+        this.operator = operator;
     }
-    try {
-      boolean result = operator.apply(leftValue, rightValue);
-      checkTimeout(evalContext.getTimeoutChecker(), this);
-      return result;
-    } catch (EvaluationTimeOutException e) {
-      throw new EvaluationTimeOutException(e.getMessage(), PrettyPrintVisitor.print(this));
-    } catch (EvaluationException e) {
-      throw new EvaluationException(e.getMessage(), PrettyPrintVisitor.print(this));
+
+    @Override
+    public Boolean evaluate(EvalContext evalContext) {
+        Value<?> leftValue = left.evaluate(evalContext);
+        if (leftValue.isUndefined()) {
+            return Boolean.FALSE;
+        }
+        Value<?> rightValue = right.evaluate(evalContext);
+        if (rightValue.isUndefined()) {
+            return Boolean.FALSE;
+        }
+        try {
+            boolean result = operator.apply(leftValue, rightValue);
+            checkTimeout(evalContext.getTimeoutChecker(), this);
+            return result;
+        } catch (EvaluationTimeOutException e) {
+            throw new EvaluationTimeOutException(e.getMessage(), PrettyPrintVisitor.print(this));
+        } catch (EvaluationException e) {
+            throw new EvaluationException(e.getMessage(), PrettyPrintVisitor.print(this));
+        }
     }
-  }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 
-  public ValueExpression<?> getLeft() {
-    return left;
-  }
+    public ValueExpression<?> getLeft() {
+        return left;
+    }
 
-  public ValueExpression<?> getRight() {
-    return right;
-  }
+    public ValueExpression<?> getRight() {
+        return right;
+    }
 
-  public ComparisonOperator getOperator() {
-    return operator;
-  }
+    public ComparisonOperator getOperator() {
+        return operator;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ComparisonOperator.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ComparisonOperator.java
index 8bc524c20d7..38de80c32b5 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ComparisonOperator.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ComparisonOperator.java
@@ -10,185 +10,182 @@
 import java.util.Objects;
 
 public enum ComparisonOperator {
-  EQ("==") {
-    @Override
-    public Boolean apply(Value<?> left, Value<?> right) {
-      if (left instanceof NumericValue && right instanceof NumericValue) {
-        Number leftNumber = ((NumericValue) left).getWidenValue();
-        Number rightNumber = ((NumericValue) right).getWidenValue();
-        if (isNan(leftNumber, rightNumber)) {
-          return Boolean.FALSE;
+    EQ("==") {
+        @Override
+        public Boolean apply(Value<?> left, Value<?> right) {
+            if (left instanceof NumericValue && right instanceof NumericValue) {
+                Number leftNumber = ((NumericValue) left).getWidenValue();
+                Number rightNumber = ((NumericValue) right).getWidenValue();
+                if (isNan(leftNumber, rightNumber)) {
+                    return Boolean.FALSE;
+                }
+                return compare(leftNumber, rightNumber) == 0;
+            }
+            if (left.getValue() instanceof Enum || right.getValue() instanceof Enum) {
+                return applyEqualityForEnum(left, right);
+            }
+            if (left.getValue().getClass() == right.getValue().getClass()) {
+                return Objects.equals(left.getValue(), right.getValue());
+            }
+            return Boolean.FALSE;
         }
-        return compare(leftNumber, rightNumber) == 0;
-      }
-      if (left.getValue() instanceof Enum || right.getValue() instanceof Enum) {
-        return applyEqualityForEnum(left, right);
-      }
-      if (left.getValue().getClass() == right.getValue().getClass()) {
-        return Objects.equals(left.getValue(), right.getValue());
-      }
-      return Boolean.FALSE;
-    }
 
-    private Boolean applyEqualityForEnum(Value<?> left, Value<?> right) {
-      if (left.getValue() instanceof Enum && right instanceof StringValue) {
-        return doApplyEqualityForEnum(left, right);
-      }
-      if (left instanceof StringValue && right.getValue() instanceof Enum) {
-        return doApplyEqualityForEnum(right, left);
-      }
-      throw new EvaluationException(
-          "Equality operator is not supported for the given types: "
-              + left.getValue().getClass().getName()
-              + " and "
-              + right.getValue().getClass().getName(),
-          null);
-    }
+        private Boolean applyEqualityForEnum(Value<?> left, Value<?> right) {
+            if (left.getValue() instanceof Enum && right instanceof StringValue) {
+                return doApplyEqualityForEnum(left, right);
+            }
+            if (left instanceof StringValue && right.getValue() instanceof Enum) {
+                return doApplyEqualityForEnum(right, left);
+            }
+            throw new EvaluationException(
+                    "Equality operator is not supported for the given types: "
+                            + left.getValue().getClass().getName()
+                            + " and "
+                            + right.getValue().getClass().getName(),
+                    null);
+        }
 
-    private Boolean doApplyEqualityForEnum(Value<?> enumExpr, Value<?> enumValueExpr) {
-      Enum<?> enumValue = (Enum<?>) enumExpr.getValue();
-      String enumValueStr = (String) enumValueExpr.getValue();
-      Class<? extends Enum> enumClass = enumValue.getClass();
-      Enum[] enumConstants = enumClass.getEnumConstants();
-      for (Enum<?> enumConstant : enumConstants) {
-        // Check if string constant as value expression matches for enum constant
-        // the endsWith allow to match either:
-        // - the full enum constant name (com.datadog.debugger.MyEnum.ONE)
-        // - the simple name with enum class name (MyEnum.ONE)
-        // - the simple name (ONE)
-        // The second check against enumValue is to ensure the instance filtered based on the
-        // name is still correct because the name can partially match (CLOSE in OPENCLOSE)
-        // with an enum defined like (OPEN, CLOSE, OPENCLOSE)
-        if (enumValueStr.endsWith(enumConstant.name())) {
-          if (enumValue.equals(enumConstant)) {
-            return Boolean.TRUE;
-          }
+        private Boolean doApplyEqualityForEnum(Value<?> enumExpr, Value<?> enumValueExpr) {
+            Enum<?> enumValue = (Enum<?>) enumExpr.getValue();
+            String enumValueStr = (String) enumValueExpr.getValue();
+            Class<? extends Enum> enumClass = enumValue.getClass();
+            Enum[] enumConstants = enumClass.getEnumConstants();
+            for (Enum<?> enumConstant : enumConstants) {
+                // Check if string constant as value expression matches for enum constant
+                // the endsWith allow to match either:
+                // - the full enum constant name (com.datadog.debugger.MyEnum.ONE)
+                // - the simple name with enum class name (MyEnum.ONE)
+                // - the simple name (ONE)
+                // The second check against enumValue is to ensure the instance filtered based on the
+                // name is still correct because the name can partially match (CLOSE in OPENCLOSE)
+                // with an enum defined like (OPEN, CLOSE, OPENCLOSE)
+                if (enumValueStr.endsWith(enumConstant.name())) {
+                    if (enumValue.equals(enumConstant)) {
+                        return Boolean.TRUE;
+                    }
+                }
+            }
+            return Boolean.FALSE;
         }
-      }
-      return Boolean.FALSE;
-    }
-  },
-  GE(">=") {
-    @Override
-    public Boolean apply(Value<?> left, Value<?> right) {
-      Integer result = compare(left, right);
-      if (result == null) {
-        return Boolean.FALSE;
-      }
-      return result >= 0;
-    }
-  },
-  GT(">") {
-    @Override
-    public Boolean apply(Value<?> left, Value<?> right) {
-      Integer result = compare(left, right);
-      if (result == null) {
-        return Boolean.FALSE;
-      }
-      return result > 0;
-    }
-  },
-  LE("<=") {
-    @Override
-    public Boolean apply(Value<?> left, Value<?> right) {
-      Integer result = compare(left, right);
-      if (result == null) {
-        return Boolean.FALSE;
-      }
-      return result <= 0;
-    }
-  },
-  LT("<") {
-    @Override
-    public Boolean apply(Value<?> left, Value<?> right) {
-      Integer result = compare(left, right);
-      if (result == null) {
-        return Boolean.FALSE;
-      }
-      return result < 0;
-    }
-  },
-  INSTANCEOF("instanceof") {
-    @Override
-    public Boolean apply(Value<?> left, Value<?> right) {
-      if (right.getValue() instanceof String) {
-        String typeStr = (String) right.getValue();
-        Class<?> clazz;
-        try {
-          clazz = Class.forName(typeStr, false, left.getValue().getClass().getClassLoader());
-        } catch (ClassNotFoundException e) {
-          throw new EvaluationException("Class not found: " + typeStr, null);
+    },
+    GE(">=") {
+        @Override
+        public Boolean apply(Value<?> left, Value<?> right) {
+            Integer result = compare(left, right);
+            if (result == null) {
+                return Boolean.FALSE;
+            }
+            return result >= 0;
         }
-        return clazz.isInstance(left.getValue());
-      }
-      throw new EvaluationException(
-          "Right operand of instanceof operator must be a string literal", null);
-    }
-  };
+    },
+    GT(">") {
+        @Override
+        public Boolean apply(Value<?> left, Value<?> right) {
+            Integer result = compare(left, right);
+            if (result == null) {
+                return Boolean.FALSE;
+            }
+            return result > 0;
+        }
+    },
+    LE("<=") {
+        @Override
+        public Boolean apply(Value<?> left, Value<?> right) {
+            Integer result = compare(left, right);
+            if (result == null) {
+                return Boolean.FALSE;
+            }
+            return result <= 0;
+        }
+    },
+    LT("<") {
+        @Override
+        public Boolean apply(Value<?> left, Value<?> right) {
+            Integer result = compare(left, right);
+            if (result == null) {
+                return Boolean.FALSE;
+            }
+            return result < 0;
+        }
+    },
+    INSTANCEOF("instanceof") {
+        @Override
+        public Boolean apply(Value<?> left, Value<?> right) {
+            if (right.getValue() instanceof String) {
+                String typeStr = (String) right.getValue();
+                Class<?> clazz;
+                try {
+                    clazz = Class.forName(
+                            typeStr, false, left.getValue().getClass().getClassLoader());
+                } catch (ClassNotFoundException e) {
+                    throw new EvaluationException("Class not found: " + typeStr, null);
+                }
+                return clazz.isInstance(left.getValue());
+            }
+            throw new EvaluationException("Right operand of instanceof operator must be a string literal", null);
+        }
+    };
 
-  private final String symbol;
+    private final String symbol;
 
-  ComparisonOperator(String symbol) {
-    this.symbol = symbol;
-  }
+    ComparisonOperator(String symbol) {
+        this.symbol = symbol;
+    }
 
-  public abstract Boolean apply(Value<?> left, Value<?> right);
+    public abstract Boolean apply(Value<?> left, Value<?> right);
 
-  public String getSymbol() {
-    return symbol;
-  }
+    public String getSymbol() {
+        return symbol;
+    }
 
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 
-  protected static boolean isNan(Number... numbers) {
-    boolean result = false;
-    for (Number number : numbers) {
-      result |= number instanceof Double && Double.isNaN(number.doubleValue());
+    protected static boolean isNan(Number... numbers) {
+        boolean result = false;
+        for (Number number : numbers) {
+            result |= number instanceof Double && Double.isNaN(number.doubleValue());
+        }
+        return result;
     }
-    return result;
-  }
 
-  protected static Integer compare(Value<?> left, Value<?> right) {
-    if (left instanceof NumericValue && right instanceof NumericValue) {
-      Number leftNumber = ((NumericValue) left).getWidenValue();
-      Number rightNumber = ((NumericValue) right).getWidenValue();
-      if (isNan(leftNumber, rightNumber)) {
+    protected static Integer compare(Value<?> left, Value<?> right) {
+        if (left instanceof NumericValue && right instanceof NumericValue) {
+            Number leftNumber = ((NumericValue) left).getWidenValue();
+            Number rightNumber = ((NumericValue) right).getWidenValue();
+            if (isNan(leftNumber, rightNumber)) {
+                return null;
+            }
+            return compare(leftNumber, rightNumber);
+        }
+        if (left instanceof StringValue && right instanceof StringValue) {
+            return ((StringValue) left).getValue().compareTo(((StringValue) right).getValue());
+        }
         return null;
-      }
-      return compare(leftNumber, rightNumber);
-    }
-    if (left instanceof StringValue && right instanceof StringValue) {
-      return ((StringValue) left).getValue().compareTo(((StringValue) right).getValue());
     }
-    return null;
-  }
 
-  protected static int compare(Number left, Number right) {
-    if (isSpecial(left) || isSpecial(right)) {
-      return Double.compare(left.doubleValue(), right.doubleValue());
-    } else {
-      return toBigDecimal(left).compareTo(toBigDecimal(right));
+    protected static int compare(Number left, Number right) {
+        if (isSpecial(left) || isSpecial(right)) {
+            return Double.compare(left.doubleValue(), right.doubleValue());
+        } else {
+            return toBigDecimal(left).compareTo(toBigDecimal(right));
+        }
     }
-  }
 
-  private static boolean isSpecial(Number x) {
-    boolean specialDouble = x instanceof Double && Double.isInfinite((Double) x);
-    boolean specialFloat = x instanceof Float && Float.isInfinite((Float) x);
-    return specialDouble || specialFloat;
-  }
+    private static boolean isSpecial(Number x) {
+        boolean specialDouble = x instanceof Double && Double.isInfinite((Double) x);
+        boolean specialFloat = x instanceof Float && Float.isInfinite((Float) x);
+        return specialDouble || specialFloat;
+    }
 
-  private static BigDecimal toBigDecimal(Number number) throws NumberFormatException {
-    if (number instanceof BigDecimal) return (BigDecimal) number;
-    if (number instanceof BigInteger) return new BigDecimal((BigInteger) number);
-    if (number instanceof Byte
-        || number instanceof Short
-        || number instanceof Integer
-        || number instanceof Long) return BigDecimal.valueOf(number.longValue());
-    if (number instanceof Float || number instanceof Double)
-      return BigDecimal.valueOf(number.doubleValue());
+    private static BigDecimal toBigDecimal(Number number) throws NumberFormatException {
+        if (number instanceof BigDecimal) return (BigDecimal) number;
+        if (number instanceof BigInteger) return new BigDecimal((BigInteger) number);
+        if (number instanceof Byte || number instanceof Short || number instanceof Integer || number instanceof Long)
+            return BigDecimal.valueOf(number.longValue());
+        if (number instanceof Float || number instanceof Double) return BigDecimal.valueOf(number.doubleValue());
 
-    return new BigDecimal(number.toString());
-  }
+        return new BigDecimal(number.toString());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ContainsExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ContainsExpression.java
index bde8654b551..9181469266f 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ContainsExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ContainsExpression.java
@@ -11,64 +11,64 @@
 import com.datadog.debugger.el.values.CollectionValue;
 
 public class ContainsExpression implements BooleanExpression {
-  private final ValueExpression<?> target;
-  private final ValueExpression<?> value;
+    private final ValueExpression<?> target;
+    private final ValueExpression<?> value;
 
-  public ContainsExpression(ValueExpression<?> target, ValueExpression<?> value) {
-    this.target = target != null ? target : ValueExpression.NULL;
-    this.value = value != null ? value : ValueExpression.NULL;
-  }
-
-  @Override
-  public Boolean evaluate(EvalContext evalContext) {
-    Value<?> targetValue = target.evaluate(evalContext);
-    if (targetValue.isUndefined()) {
-      throw new EvaluationException(
-          "Cannot evaluate the expression for undefined value", PrettyPrintVisitor.print(this));
-    }
-    if (targetValue.isNull()) {
-      throw new EvaluationException(
-          "Cannot evaluate the expression for null value", PrettyPrintVisitor.print(this));
-    }
-    Value<?> val = value.evaluate(evalContext);
-    if (val.isUndefined()) {
-      return false;
-    }
-    boolean result;
-    if (targetValue.getValue() instanceof String) {
-      String targetStr = (String) targetValue.getValue();
-      if (val.getValue() instanceof String) {
-        String valStr = (String) val.getValue();
-        checkStringLength(valStr, this);
-        result = targetStr.contains(valStr);
-        checkTimeout(evalContext.getTimeoutChecker(), this);
-        return result;
-      }
-      throw new EvaluationException(
-          "Cannot evaluate the expression for non-string value", PrettyPrintVisitor.print(this));
+    public ContainsExpression(ValueExpression<?> target, ValueExpression<?> value) {
+        this.target = target != null ? target : ValueExpression.NULL;
+        this.value = value != null ? value : ValueExpression.NULL;
     }
-    if (targetValue instanceof CollectionValue) {
-      try {
-        result = ((CollectionValue<?>) targetValue).contains(val);
-        checkTimeout(evalContext.getTimeoutChecker(), this);
-        return result;
-      } catch (RuntimeException ex) {
-        throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this));
-      }
+
+    @Override
+    public Boolean evaluate(EvalContext evalContext) {
+        Value<?> targetValue = target.evaluate(evalContext);
+        if (targetValue.isUndefined()) {
+            throw new EvaluationException(
+                    "Cannot evaluate the expression for undefined value", PrettyPrintVisitor.print(this));
+        }
+        if (targetValue.isNull()) {
+            throw new EvaluationException(
+                    "Cannot evaluate the expression for null value", PrettyPrintVisitor.print(this));
+        }
+        Value<?> val = value.evaluate(evalContext);
+        if (val.isUndefined()) {
+            return false;
+        }
+        boolean result;
+        if (targetValue.getValue() instanceof String) {
+            String targetStr = (String) targetValue.getValue();
+            if (val.getValue() instanceof String) {
+                String valStr = (String) val.getValue();
+                checkStringLength(valStr, this);
+                result = targetStr.contains(valStr);
+                checkTimeout(evalContext.getTimeoutChecker(), this);
+                return result;
+            }
+            throw new EvaluationException(
+                    "Cannot evaluate the expression for non-string value", PrettyPrintVisitor.print(this));
+        }
+        if (targetValue instanceof CollectionValue) {
+            try {
+                result = ((CollectionValue<?>) targetValue).contains(val);
+                checkTimeout(evalContext.getTimeoutChecker(), this);
+                return result;
+            } catch (RuntimeException ex) {
+                throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this));
+            }
+        }
+        return Boolean.FALSE;
     }
-    return Boolean.FALSE;
-  }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 
-  public ValueExpression<?> getTarget() {
-    return target;
-  }
+    public ValueExpression<?> getTarget() {
+        return target;
+    }
 
-  public ValueExpression<?> getValue() {
-    return value;
-  }
+    public ValueExpression<?> getValue() {
+        return value;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/EndsWithExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/EndsWithExpression.java
index 7886261786a..09a9cb940a5 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/EndsWithExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/EndsWithExpression.java
@@ -4,12 +4,12 @@
 import com.datadog.debugger.el.values.StringValue;
 
 public class EndsWithExpression extends StringPredicateExpression {
-  public EndsWithExpression(ValueExpression<?> sourceString, StringValue str) {
-    super(sourceString, str, String::endsWith, "endsWith");
-  }
+    public EndsWithExpression(ValueExpression<?> sourceString, StringValue str) {
+        super(sourceString, str, String::endsWith, "endsWith");
+    }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ExpressionHelper.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ExpressionHelper.java
index f7df3cf61e2..74632855342 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ExpressionHelper.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ExpressionHelper.java
@@ -9,47 +9,46 @@
 import java.util.Collection;
 
 public class ExpressionHelper {
-  public static final int MAX_COLLECTION_ITEMS = 1_000_000;
-  public static final int MAX_ARRAY_ITEMS = 1_000_000;
-  public static final int MAX_STRING_LENGTH = 100_000_000;
+    public static final int MAX_COLLECTION_ITEMS = 1_000_000;
+    public static final int MAX_ARRAY_ITEMS = 1_000_000;
+    public static final int MAX_STRING_LENGTH = 100_000_000;
 
-  public static void throwRedactedException(Expression<?> expr) {
-    String strExpr = PrettyPrintVisitor.print(expr);
-    throw new RedactedException(
-        "Could not evaluate the expression because '" + strExpr + "' was redacted", strExpr);
-  }
-
-  public static void checkTimeout(TimeoutChecker checker, Expression<?> expr) {
-    if (checker.isTimedOut()) {
-      throw new EvaluationTimeOutException(
-          "timeout (" + checker.getTimeOut().toMillis() + "ms)", PrettyPrintVisitor.print(expr));
+    public static void throwRedactedException(Expression<?> expr) {
+        String strExpr = PrettyPrintVisitor.print(expr);
+        throw new RedactedException(
+                "Could not evaluate the expression because '" + strExpr + "' was redacted", strExpr);
     }
-  }
 
-  public static void checkStringLength(String val, Expression<?> expr) {
-    if (val == null) {
-      return;
-    }
-    if (val.length() > MAX_STRING_LENGTH) {
-      throw new EvaluationException(
-          "string too large (>" + MAX_STRING_LENGTH + ")", PrettyPrintVisitor.print(expr));
+    public static void checkTimeout(TimeoutChecker checker, Expression<?> expr) {
+        if (checker.isTimedOut()) {
+            throw new EvaluationTimeOutException(
+                    "timeout (" + checker.getTimeOut().toMillis() + "ms)", PrettyPrintVisitor.print(expr));
+        }
     }
-  }
 
-  public static void checkCollectionSize(Collection<?> collection, Expression<?> expr) {
-    if (collection == null) {
-      return;
+    public static void checkStringLength(String val, Expression<?> expr) {
+        if (val == null) {
+            return;
+        }
+        if (val.length() > MAX_STRING_LENGTH) {
+            throw new EvaluationException(
+                    "string too large (>" + MAX_STRING_LENGTH + ")", PrettyPrintVisitor.print(expr));
+        }
     }
-    if (collection.size() > MAX_COLLECTION_ITEMS) {
-      throw new EvaluationException(
-          "Collection too large (>" + MAX_COLLECTION_ITEMS + ")", PrettyPrintVisitor.print(expr));
+
+    public static void checkCollectionSize(Collection<?> collection, Expression<?> expr) {
+        if (collection == null) {
+            return;
+        }
+        if (collection.size() > MAX_COLLECTION_ITEMS) {
+            throw new EvaluationException(
+                    "Collection too large (>" + MAX_COLLECTION_ITEMS + ")", PrettyPrintVisitor.print(expr));
+        }
     }
-  }
 
-  public static void checkArrayLength(int arrayLength, Expression<?> expr) {
-    if (arrayLength > MAX_ARRAY_ITEMS) {
-      throw new EvaluationException(
-          "Array too large (>" + MAX_ARRAY_ITEMS + ")", PrettyPrintVisitor.print(expr));
+    public static void checkArrayLength(int arrayLength, Expression<?> expr) {
+        if (arrayLength > MAX_ARRAY_ITEMS) {
+            throw new EvaluationException("Array too large (>" + MAX_ARRAY_ITEMS + ")", PrettyPrintVisitor.print(expr));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/FilterCollectionExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/FilterCollectionExpression.java
index cd4c8ef1c89..a78994b3a94 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/FilterCollectionExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/FilterCollectionExpression.java
@@ -32,96 +32,93 @@
  * BooleanExpression} filter.
  */
 public final class FilterCollectionExpression implements ValueExpression<CollectionValue<?>> {
-  private static final Logger log = LoggerFactory.getLogger(FilterCollectionExpression.class);
+    private static final Logger log = LoggerFactory.getLogger(FilterCollectionExpression.class);
 
-  private final ValueExpression<?> source;
-  private final BooleanExpression filterExpression;
+    private final ValueExpression<?> source;
+    private final BooleanExpression filterExpression;
 
-  public FilterCollectionExpression(ValueExpression<?> source, BooleanExpression filterExpression) {
-    this.source = source;
-    this.filterExpression = filterExpression;
-  }
+    public FilterCollectionExpression(ValueExpression<?> source, BooleanExpression filterExpression) {
+        this.source = source;
+        this.filterExpression = filterExpression;
+    }
 
-  @Override
-  public CollectionValue<?> evaluate(EvalContext evalContext) {
-    Value<?> collectionValue = evaluateTargetCollection(source, filterExpression, evalContext);
-    ValueReferenceResolver valueRefResolver = evalContext.getValueRefResolver();
-    if (collectionValue instanceof ListValue) {
-      ListValue materialized = (ListValue) collectionValue;
-      checkSupportedList(materialized, this);
-      Collection<Object> filtered = new ArrayList<>();
-      int len = materialized.count();
-      try {
-        for (int i = 0; i < len; i++) {
-          Object value = materialized.get(i).getValue();
-          valueRefResolver.addExtension(
-              ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(value));
-          if (filterExpression.evaluate(evalContext)) {
-            filtered.add(value);
-          }
-          checkTimeout(evalContext.getTimeoutChecker(), this);
-        }
-      } finally {
-        valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
-      }
-      return new ListValue(filtered);
-    } else if (collectionValue instanceof MapValue) {
-      MapValue materialized = (MapValue) collectionValue;
-      checkSupportedMap(materialized, this);
-      Map<Object, Object> filtered = new HashMap<>();
-      try {
-        for (Value<?> key : materialized.getKeys()) {
-          Value<?> value = key.isUndefined() ? Value.undefinedValue() : materialized.get(key);
-          valueRefResolver.addExtension(ValueReferences.KEY_EXTENSION_NAME, CapturedValue.of(key));
-          valueRefResolver.addExtension(
-              ValueReferences.VALUE_EXTENSION_NAME, CapturedValue.of(value));
-          valueRefResolver.addExtension(
-              ValueReferences.ITERATOR_EXTENSION_NAME,
-              CapturedValue.of(new MapValue.Entry(key, value)));
-          if (filterExpression.evaluate(evalContext)) {
-            filtered.put(key.getValue(), value.getValue());
-          }
-          checkTimeout(evalContext.getTimeoutChecker(), this);
-        }
-      } finally {
-        valueRefResolver.removeExtension(ValueReferences.KEY_EXTENSION_NAME);
-        valueRefResolver.removeExtension(ValueReferences.VALUE_EXTENSION_NAME);
-        valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
-      }
-      return new MapValue(filtered);
-    } else if (collectionValue instanceof SetValue) {
-      SetValue materialized = (SetValue) collectionValue;
-      Collection<Object> filtered = new HashSet<>();
-      Set<?> setHolder = checkSupportedSet(materialized, this);
-      try {
-        for (Object value : setHolder) {
-          valueRefResolver.addExtension(
-              ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(value));
-          if (filterExpression.evaluate(evalContext)) {
-            filtered.add(value);
-          }
-          checkTimeout(evalContext.getTimeoutChecker(), this);
+    @Override
+    public CollectionValue<?> evaluate(EvalContext evalContext) {
+        Value<?> collectionValue = evaluateTargetCollection(source, filterExpression, evalContext);
+        ValueReferenceResolver valueRefResolver = evalContext.getValueRefResolver();
+        if (collectionValue instanceof ListValue) {
+            ListValue materialized = (ListValue) collectionValue;
+            checkSupportedList(materialized, this);
+            Collection<Object> filtered = new ArrayList<>();
+            int len = materialized.count();
+            try {
+                for (int i = 0; i < len; i++) {
+                    Object value = materialized.get(i).getValue();
+                    valueRefResolver.addExtension(ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(value));
+                    if (filterExpression.evaluate(evalContext)) {
+                        filtered.add(value);
+                    }
+                    checkTimeout(evalContext.getTimeoutChecker(), this);
+                }
+            } finally {
+                valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
+            }
+            return new ListValue(filtered);
+        } else if (collectionValue instanceof MapValue) {
+            MapValue materialized = (MapValue) collectionValue;
+            checkSupportedMap(materialized, this);
+            Map<Object, Object> filtered = new HashMap<>();
+            try {
+                for (Value<?> key : materialized.getKeys()) {
+                    Value<?> value = key.isUndefined() ? Value.undefinedValue() : materialized.get(key);
+                    valueRefResolver.addExtension(ValueReferences.KEY_EXTENSION_NAME, CapturedValue.of(key));
+                    valueRefResolver.addExtension(ValueReferences.VALUE_EXTENSION_NAME, CapturedValue.of(value));
+                    valueRefResolver.addExtension(
+                            ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(new MapValue.Entry(key, value)));
+                    if (filterExpression.evaluate(evalContext)) {
+                        filtered.put(key.getValue(), value.getValue());
+                    }
+                    checkTimeout(evalContext.getTimeoutChecker(), this);
+                }
+            } finally {
+                valueRefResolver.removeExtension(ValueReferences.KEY_EXTENSION_NAME);
+                valueRefResolver.removeExtension(ValueReferences.VALUE_EXTENSION_NAME);
+                valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
+            }
+            return new MapValue(filtered);
+        } else if (collectionValue instanceof SetValue) {
+            SetValue materialized = (SetValue) collectionValue;
+            Collection<Object> filtered = new HashSet<>();
+            Set<?> setHolder = checkSupportedSet(materialized, this);
+            try {
+                for (Object value : setHolder) {
+                    valueRefResolver.addExtension(ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(value));
+                    if (filterExpression.evaluate(evalContext)) {
+                        filtered.add(value);
+                    }
+                    checkTimeout(evalContext.getTimeoutChecker(), this);
+                }
+            } finally {
+                valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
+            }
+            return new SetValue(filtered);
         }
-      } finally {
-        valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
-      }
-      return new SetValue(filtered);
+        throw new EvaluationException(
+                "Unsupported collection type: "
+                        + collectionValue.getValue().getClass().getTypeName(),
+                print(this));
     }
-    throw new EvaluationException(
-        "Unsupported collection type: " + collectionValue.getValue().getClass().getTypeName(),
-        print(this));
-  }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 
-  public ValueExpression<?> getSource() {
-    return source;
-  }
+    public ValueExpression<?> getSource() {
+        return source;
+    }
 
-  public BooleanExpression getFilterExpression() {
-    return filterExpression;
-  }
+    public BooleanExpression getFilterExpression() {
+        return filterExpression;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/GetMemberExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/GetMemberExpression.java
index bfcfe6ee826..215d7f2d862 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/GetMemberExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/GetMemberExpression.java
@@ -14,70 +14,70 @@
 import java.util.Objects;
 
 public class GetMemberExpression implements ValueExpression<Value<?>> {
-  private final ValueExpression<?> target;
-  private final String memberName;
+    private final ValueExpression<?> target;
+    private final String memberName;
 
-  public GetMemberExpression(ValueExpression<?> target, String memberName) {
-    this.target = target;
-    this.memberName = memberName;
-  }
-
-  @Override
-  public Value<?> evaluate(EvalContext evalContext) {
-    Value<?> targetValue = target.evaluate(evalContext);
-    if (targetValue == Value.undefined()) {
-      return targetValue;
-    }
-    CapturedContext.CapturedValue member;
-    try {
-      member = evalContext.getValueRefResolver().getMember(targetValue.getValue(), memberName);
-    } catch (RuntimeException ex) {
-      throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this), ex);
-    }
-    Object memberValue = null;
-    if (member != null) {
-      memberValue = member.getValue();
+    public GetMemberExpression(ValueExpression<?> target, String memberName) {
+        this.target = target;
+        this.memberName = memberName;
     }
-    if (memberValue != null
-        && (memberValue == Redaction.REDACTED_VALUE
-            || Redaction.isRedactedType(memberValue.getClass().getTypeName()))) {
-      ExpressionHelper.throwRedactedException(this);
+
+    @Override
+    public Value<?> evaluate(EvalContext evalContext) {
+        Value<?> targetValue = target.evaluate(evalContext);
+        if (targetValue == Value.undefined()) {
+            return targetValue;
+        }
+        CapturedContext.CapturedValue member;
+        try {
+            member = evalContext.getValueRefResolver().getMember(targetValue.getValue(), memberName);
+        } catch (RuntimeException ex) {
+            throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this), ex);
+        }
+        Object memberValue = null;
+        if (member != null) {
+            memberValue = member.getValue();
+        }
+        if (memberValue != null
+                && (memberValue == Redaction.REDACTED_VALUE
+                        || Redaction.isRedactedType(memberValue.getClass().getTypeName()))) {
+            ExpressionHelper.throwRedactedException(this);
+        }
+        checkTimeout(evalContext.getTimeoutChecker(), this);
+        return Value.of(member.getValue(), ValueType.of(member.getType()));
     }
-    checkTimeout(evalContext.getTimeoutChecker(), this);
-    return Value.of(member.getValue(), ValueType.of(member.getType()));
-  }
 
-  @Generated
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    GetMemberExpression that = (GetMemberExpression) o;
-    return Objects.equals(target, that.target) && Objects.equals(memberName, that.memberName);
-  }
+    @Generated
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        GetMemberExpression that = (GetMemberExpression) o;
+        return Objects.equals(target, that.target) && Objects.equals(memberName, that.memberName);
+    }
 
-  @Generated
-  @Override
-  public int hashCode() {
-    return Objects.hash(target, memberName);
-  }
+    @Generated
+    @Override
+    public int hashCode() {
+        return Objects.hash(target, memberName);
+    }
 
-  @Generated
-  @Override
-  public String toString() {
-    return "GetMemberExpression{" + "target=" + target + ", memberName='" + memberName + '\'' + '}';
-  }
+    @Generated
+    @Override
+    public String toString() {
+        return "GetMemberExpression{" + "target=" + target + ", memberName='" + memberName + '\'' + '}';
+    }
 
-  public ValueExpression<?> getTarget() {
-    return target;
-  }
+    public ValueExpression<?> getTarget() {
+        return target;
+    }
 
-  public String getMemberName() {
-    return memberName;
-  }
+    public String getMemberName() {
+        return memberName;
+    }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAllExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAllExpression.java
index 90bba2f6165..496c9e0a5e5 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAllExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAllExpression.java
@@ -27,91 +27,88 @@
  * using the filter.
  */
 public final class HasAllExpression extends MatchingExpression {
-  public HasAllExpression(ValueExpression<?> valueExpression, BooleanExpression filterExpression) {
-    super(valueExpression, filterExpression);
-  }
+    public HasAllExpression(ValueExpression<?> valueExpression, BooleanExpression filterExpression) {
+        super(valueExpression, filterExpression);
+    }
 
-  @Override
-  public Boolean evaluate(EvalContext evalContext) {
-    Value<?> value = evaluateTargetCollection(valueExpression, this, evalContext);
-    ValueReferenceResolver valueRefResolver = evalContext.getValueRefResolver();
-    if (value instanceof ListValue) {
-      ListValue collection = (ListValue) value;
-      checkSupportedList(collection, this);
-      if (collection.isEmpty()) {
-        // always return TRUE for empty values (cf vacuous truth, see also Stream::allMatch)
-        return Boolean.TRUE;
-      }
-      int len = collection.count();
-      try {
-        for (int i = 0; i < len; i++) {
-          valueRefResolver.addExtension(
-              ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(collection.get(i)));
-          if (!filterPredicateExpression.evaluate(evalContext)) {
-            return Boolean.FALSE;
-          }
-          checkTimeout(evalContext.getTimeoutChecker(), this);
+    @Override
+    public Boolean evaluate(EvalContext evalContext) {
+        Value<?> value = evaluateTargetCollection(valueExpression, this, evalContext);
+        ValueReferenceResolver valueRefResolver = evalContext.getValueRefResolver();
+        if (value instanceof ListValue) {
+            ListValue collection = (ListValue) value;
+            checkSupportedList(collection, this);
+            if (collection.isEmpty()) {
+                // always return TRUE for empty values (cf vacuous truth, see also Stream::allMatch)
+                return Boolean.TRUE;
+            }
+            int len = collection.count();
+            try {
+                for (int i = 0; i < len; i++) {
+                    valueRefResolver.addExtension(
+                            ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(collection.get(i)));
+                    if (!filterPredicateExpression.evaluate(evalContext)) {
+                        return Boolean.FALSE;
+                    }
+                    checkTimeout(evalContext.getTimeoutChecker(), this);
+                }
+                return Boolean.TRUE;
+            } finally {
+                valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
+            }
         }
-        return Boolean.TRUE;
-      } finally {
-        valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
-      }
-    }
-    if (value instanceof MapValue) {
-      MapValue map = (MapValue) value;
-      checkSupportedMap(map, this);
-      if (map.isEmpty()) {
-        // always return TRUE for empty values (cf vacuous truth, see also Stream::allMatch)
-        return Boolean.TRUE;
-      }
-      try {
-        for (Value<?> key : map.getKeys()) {
-          Value<?> val = key.isUndefined() ? Value.undefinedValue() : map.get(key);
-          valueRefResolver.addExtension(ValueReferences.KEY_EXTENSION_NAME, CapturedValue.of(key));
-          valueRefResolver.addExtension(
-              ValueReferences.VALUE_EXTENSION_NAME, CapturedValue.of(val));
-          valueRefResolver.addExtension(
-              ValueReferences.ITERATOR_EXTENSION_NAME,
-              CapturedValue.of(new MapValue.Entry(key, val)));
-          if (!filterPredicateExpression.evaluate(evalContext)) {
-            return Boolean.FALSE;
-          }
-          checkTimeout(evalContext.getTimeoutChecker(), this);
+        if (value instanceof MapValue) {
+            MapValue map = (MapValue) value;
+            checkSupportedMap(map, this);
+            if (map.isEmpty()) {
+                // always return TRUE for empty values (cf vacuous truth, see also Stream::allMatch)
+                return Boolean.TRUE;
+            }
+            try {
+                for (Value<?> key : map.getKeys()) {
+                    Value<?> val = key.isUndefined() ? Value.undefinedValue() : map.get(key);
+                    valueRefResolver.addExtension(ValueReferences.KEY_EXTENSION_NAME, CapturedValue.of(key));
+                    valueRefResolver.addExtension(ValueReferences.VALUE_EXTENSION_NAME, CapturedValue.of(val));
+                    valueRefResolver.addExtension(
+                            ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(new MapValue.Entry(key, val)));
+                    if (!filterPredicateExpression.evaluate(evalContext)) {
+                        return Boolean.FALSE;
+                    }
+                    checkTimeout(evalContext.getTimeoutChecker(), this);
+                }
+                return Boolean.TRUE;
+            } finally {
+                valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
+                valueRefResolver.removeExtension(ValueReferences.KEY_EXTENSION_NAME);
+                valueRefResolver.removeExtension(ValueReferences.VALUE_EXTENSION_NAME);
+            }
         }
-        return Boolean.TRUE;
-      } finally {
-        valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
-        valueRefResolver.removeExtension(ValueReferences.KEY_EXTENSION_NAME);
-        valueRefResolver.removeExtension(ValueReferences.VALUE_EXTENSION_NAME);
-      }
-    }
-    if (value instanceof SetValue) {
-      SetValue set = (SetValue) value;
-      Set<?> setHolder = checkSupportedSet(set, this);
-      if (set.isEmpty()) {
-        // always return TRUE for empty values (cf vacuous truth, see also Stream::allMatch)
-        return Boolean.TRUE;
-      }
-      try {
-        for (Object val : setHolder) {
-          valueRefResolver.addExtension(
-              ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(val));
-          if (!filterPredicateExpression.evaluate(evalContext)) {
-            return Boolean.FALSE;
-          }
-          checkTimeout(evalContext.getTimeoutChecker(), this);
+        if (value instanceof SetValue) {
+            SetValue set = (SetValue) value;
+            Set<?> setHolder = checkSupportedSet(set, this);
+            if (set.isEmpty()) {
+                // always return TRUE for empty values (cf vacuous truth, see also Stream::allMatch)
+                return Boolean.TRUE;
+            }
+            try {
+                for (Object val : setHolder) {
+                    valueRefResolver.addExtension(ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(val));
+                    if (!filterPredicateExpression.evaluate(evalContext)) {
+                        return Boolean.FALSE;
+                    }
+                    checkTimeout(evalContext.getTimeoutChecker(), this);
+                }
+                return Boolean.TRUE;
+            } finally {
+                valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
+            }
         }
-        return Boolean.TRUE;
-      } finally {
-        valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
-      }
+        throw new EvaluationException(
+                "Unsupported collection class: " + value.getValue().getClass().getTypeName(), print(this));
     }
-    throw new EvaluationException(
-        "Unsupported collection class: " + value.getValue().getClass().getTypeName(), print(this));
-  }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAnyExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAnyExpression.java
index 7de0e110dfa..01e2d243318 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAnyExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAnyExpression.java
@@ -27,97 +27,93 @@
  * using the filter.
  */
 public final class HasAnyExpression extends MatchingExpression {
-  public HasAnyExpression(
-      ValueExpression<?> valueExpression, BooleanExpression filterPredicateExpression) {
-    super(valueExpression, filterPredicateExpression);
-  }
+    public HasAnyExpression(ValueExpression<?> valueExpression, BooleanExpression filterPredicateExpression) {
+        super(valueExpression, filterPredicateExpression);
+    }
 
-  @Override
-  public Boolean evaluate(EvalContext evalContext) {
-    Value<?> value = evaluateTargetCollection(valueExpression, this, evalContext);
-    ValueReferenceResolver valueRefResolver = evalContext.getValueRefResolver();
-    if (value instanceof ListValue) {
-      ListValue collection = (ListValue) value;
-      checkSupportedList(collection, this);
-      if (collection.isEmpty()) {
-        // always return FALSE for empty collection
-        return Boolean.FALSE;
-      }
-      try {
-        int len = collection.count();
-        for (int i = 0; i < len; i++) {
-          valueRefResolver.addExtension(
-              ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(collection.get(i)));
-          if (filterPredicateExpression.evaluate(evalContext)) {
-            return Boolean.TRUE;
-          }
-          checkTimeout(evalContext.getTimeoutChecker(), this);
-        }
-        return Boolean.FALSE;
+    @Override
+    public Boolean evaluate(EvalContext evalContext) {
+        Value<?> value = evaluateTargetCollection(valueExpression, this, evalContext);
+        ValueReferenceResolver valueRefResolver = evalContext.getValueRefResolver();
+        if (value instanceof ListValue) {
+            ListValue collection = (ListValue) value;
+            checkSupportedList(collection, this);
+            if (collection.isEmpty()) {
+                // always return FALSE for empty collection
+                return Boolean.FALSE;
+            }
+            try {
+                int len = collection.count();
+                for (int i = 0; i < len; i++) {
+                    valueRefResolver.addExtension(
+                            ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(collection.get(i)));
+                    if (filterPredicateExpression.evaluate(evalContext)) {
+                        return Boolean.TRUE;
+                    }
+                    checkTimeout(evalContext.getTimeoutChecker(), this);
+                }
+                return Boolean.FALSE;
 
-      } catch (IllegalArgumentException | UnsupportedOperationException ex) {
-        throw new EvaluationException(ex.getMessage(), print(this));
-      } finally {
-        valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
-      }
-    }
-    if (value instanceof MapValue) {
-      MapValue map = (MapValue) value;
-      checkSupportedMap(map, this);
-      try {
-        if (map.isEmpty()) {
-          return Boolean.FALSE;
+            } catch (IllegalArgumentException | UnsupportedOperationException ex) {
+                throw new EvaluationException(ex.getMessage(), print(this));
+            } finally {
+                valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
+            }
         }
-        for (Value<?> key : map.getKeys()) {
-          Value<?> val = key.isUndefined() ? Value.undefinedValue() : map.get(key);
-          valueRefResolver.addExtension(ValueReferences.KEY_EXTENSION_NAME, CapturedValue.of(key));
-          valueRefResolver.addExtension(
-              ValueReferences.VALUE_EXTENSION_NAME, CapturedValue.of(val));
-          valueRefResolver.addExtension(
-              ValueReferences.ITERATOR_EXTENSION_NAME,
-              CapturedValue.of(new MapValue.Entry(key, val)));
-          if (filterPredicateExpression.evaluate(evalContext)) {
-            return Boolean.TRUE;
-          }
-          checkTimeout(evalContext.getTimeoutChecker(), this);
+        if (value instanceof MapValue) {
+            MapValue map = (MapValue) value;
+            checkSupportedMap(map, this);
+            try {
+                if (map.isEmpty()) {
+                    return Boolean.FALSE;
+                }
+                for (Value<?> key : map.getKeys()) {
+                    Value<?> val = key.isUndefined() ? Value.undefinedValue() : map.get(key);
+                    valueRefResolver.addExtension(ValueReferences.KEY_EXTENSION_NAME, CapturedValue.of(key));
+                    valueRefResolver.addExtension(ValueReferences.VALUE_EXTENSION_NAME, CapturedValue.of(val));
+                    valueRefResolver.addExtension(
+                            ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(new MapValue.Entry(key, val)));
+                    if (filterPredicateExpression.evaluate(evalContext)) {
+                        return Boolean.TRUE;
+                    }
+                    checkTimeout(evalContext.getTimeoutChecker(), this);
+                }
+                return Boolean.FALSE;
+            } catch (IllegalArgumentException | UnsupportedOperationException ex) {
+                throw new EvaluationException(ex.getMessage(), print(this));
+            } finally {
+                valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
+                valueRefResolver.removeExtension(ValueReferences.KEY_EXTENSION_NAME);
+                valueRefResolver.removeExtension(ValueReferences.VALUE_EXTENSION_NAME);
+            }
         }
-        return Boolean.FALSE;
-      } catch (IllegalArgumentException | UnsupportedOperationException ex) {
-        throw new EvaluationException(ex.getMessage(), print(this));
-      } finally {
-        valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
-        valueRefResolver.removeExtension(ValueReferences.KEY_EXTENSION_NAME);
-        valueRefResolver.removeExtension(ValueReferences.VALUE_EXTENSION_NAME);
-      }
-    }
-    if (value instanceof SetValue) {
-      SetValue set = (SetValue) value;
-      Set<?> setHolder = checkSupportedSet(set, this);
-      try {
-        if (set.isEmpty()) {
-          return Boolean.FALSE;
-        }
-        for (Object val : setHolder) {
-          valueRefResolver.addExtension(
-              ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(val));
-          if (filterPredicateExpression.evaluate(evalContext)) {
-            return Boolean.TRUE;
-          }
-          checkTimeout(evalContext.getTimeoutChecker(), this);
+        if (value instanceof SetValue) {
+            SetValue set = (SetValue) value;
+            Set<?> setHolder = checkSupportedSet(set, this);
+            try {
+                if (set.isEmpty()) {
+                    return Boolean.FALSE;
+                }
+                for (Object val : setHolder) {
+                    valueRefResolver.addExtension(ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(val));
+                    if (filterPredicateExpression.evaluate(evalContext)) {
+                        return Boolean.TRUE;
+                    }
+                    checkTimeout(evalContext.getTimeoutChecker(), this);
+                }
+                return Boolean.FALSE;
+            } catch (IllegalArgumentException | UnsupportedOperationException ex) {
+                throw new EvaluationException(ex.getMessage(), print(this));
+            } finally {
+                valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
+            }
         }
-        return Boolean.FALSE;
-      } catch (IllegalArgumentException | UnsupportedOperationException ex) {
-        throw new EvaluationException(ex.getMessage(), print(this));
-      } finally {
-        valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
-      }
+        throw new EvaluationException(
+                "Unsupported collection class: " + value.getValue().getClass().getTypeName(), print(this));
     }
-    throw new EvaluationException(
-        "Unsupported collection class: " + value.getValue().getClass().getTypeName(), print(this));
-  }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IfElseExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IfElseExpression.java
index 1914b3a9a47..40933ce2ac4 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IfElseExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IfElseExpression.java
@@ -8,42 +8,41 @@
 
 /** TODO: Primordial support for 'debugger watches' support */
 public final class IfElseExpression implements Expression<Void> {
-  private final BooleanExpression test;
-  private final Expression<?> thenExpression;
-  private final Expression<?> elseExpression;
-
-  public IfElseExpression(
-      BooleanExpression test, Expression<?> thenExpression, Expression<?> elseExpression) {
-    this.test = test == null ? BooleanExpression.FALSE : test;
-    this.thenExpression = thenExpression == null ? ValueExpression.NULL : thenExpression;
-    this.elseExpression = elseExpression == null ? ValueExpression.NULL : elseExpression;
-  }
-
-  @Override
-  public Void evaluate(EvalContext evalContext) {
-    if (test.evaluate(evalContext)) {
-      thenExpression.evaluate(evalContext);
-    } else {
-      elseExpression.evaluate(evalContext);
+    private final BooleanExpression test;
+    private final Expression<?> thenExpression;
+    private final Expression<?> elseExpression;
+
+    public IfElseExpression(BooleanExpression test, Expression<?> thenExpression, Expression<?> elseExpression) {
+        this.test = test == null ? BooleanExpression.FALSE : test;
+        this.thenExpression = thenExpression == null ? ValueExpression.NULL : thenExpression;
+        this.elseExpression = elseExpression == null ? ValueExpression.NULL : elseExpression;
+    }
+
+    @Override
+    public Void evaluate(EvalContext evalContext) {
+        if (test.evaluate(evalContext)) {
+            thenExpression.evaluate(evalContext);
+        } else {
+            elseExpression.evaluate(evalContext);
+        }
+        checkTimeout(evalContext.getTimeoutChecker(), this);
+        return null;
+    }
+
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
+
+    public BooleanExpression getTest() {
+        return test;
+    }
+
+    public Expression<?> getThenExpression() {
+        return thenExpression;
+    }
+
+    public Expression<?> getElseExpression() {
+        return elseExpression;
     }
-    checkTimeout(evalContext.getTimeoutChecker(), this);
-    return null;
-  }
-
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
-
-  public BooleanExpression getTest() {
-    return test;
-  }
-
-  public Expression<?> getThenExpression() {
-    return thenExpression;
-  }
-
-  public Expression<?> getElseExpression() {
-    return elseExpression;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IfExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IfExpression.java
index cce1e53aedd..d0199b10d80 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IfExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IfExpression.java
@@ -8,33 +8,33 @@
 
 /** TODO: Primordial support for 'debugger watches' support */
 public final class IfExpression implements Expression<Void> {
-  private final BooleanExpression test;
-  private final Expression<?> expression;
-
-  public IfExpression(BooleanExpression test, Expression<?> expression) {
-    this.test = test == null ? BooleanExpression.FALSE : test;
-    this.expression = expression == null ? ValueExpression.NULL : expression;
-  }
-
-  @Override
-  public Void evaluate(EvalContext evalContext) {
-    if (test.evaluate(evalContext)) {
-      expression.evaluate(evalContext);
+    private final BooleanExpression test;
+    private final Expression<?> expression;
+
+    public IfExpression(BooleanExpression test, Expression<?> expression) {
+        this.test = test == null ? BooleanExpression.FALSE : test;
+        this.expression = expression == null ? ValueExpression.NULL : expression;
+    }
+
+    @Override
+    public Void evaluate(EvalContext evalContext) {
+        if (test.evaluate(evalContext)) {
+            expression.evaluate(evalContext);
+        }
+        checkTimeout(evalContext.getTimeoutChecker(), this);
+        return null;
+    }
+
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
+
+    public BooleanExpression getTest() {
+        return test;
+    }
+
+    public Expression<?> getExpression() {
+        return expression;
     }
-    checkTimeout(evalContext.getTimeoutChecker(), this);
-    return null;
-  }
-
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
-
-  public BooleanExpression getTest() {
-    return test;
-  }
-
-  public Expression<?> getExpression() {
-    return expression;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IndexExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IndexExpression.java
index 8c718eb282d..13b5ac9274b 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IndexExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IndexExpression.java
@@ -15,70 +15,70 @@
 
 public class IndexExpression implements ValueExpression<Value<?>> {
 
-  private final ValueExpression<?> target;
-  private final ValueExpression<?> key;
+    private final ValueExpression<?> target;
+    private final ValueExpression<?> key;
 
-  public IndexExpression(ValueExpression<?> target, ValueExpression<?> key) {
-    this.target = target;
-    this.key = key;
-  }
-
-  @Override
-  public Value<?> evaluate(EvalContext evalContext) {
-    Value<?> targetValue = target.evaluate(evalContext);
-    if (targetValue.isUndefined()) {
-      throw new EvaluationException(
-          "Cannot evaluate the expression for undefined value", PrettyPrintVisitor.print(this));
-    }
-    if (targetValue.isNull()) {
-      throw new EvaluationException(
-          "Cannot evaluate the expression for null value", PrettyPrintVisitor.print(this));
-    }
-    Value<?> result = Value.undefinedValue();
-    Value<?> keyValue = key.evaluate(evalContext);
-    if (keyValue == Value.undefined()) {
-      return result;
+    public IndexExpression(ValueExpression<?> target, ValueExpression<?> key) {
+        this.target = target;
+        this.key = key;
     }
-    try {
-      if (targetValue instanceof MapValue) {
-        Object objKey = keyValue.getValue();
-        if (objKey instanceof String && Redaction.isRedactedKeyword((String) objKey)) {
-          ExpressionHelper.throwRedactedException(this);
-        } else {
-          MapValue mapValue = (MapValue) targetValue;
-          checkSupportedMap(mapValue, this);
-          result = mapValue.get(objKey);
+
+    @Override
+    public Value<?> evaluate(EvalContext evalContext) {
+        Value<?> targetValue = target.evaluate(evalContext);
+        if (targetValue.isUndefined()) {
+            throw new EvaluationException(
+                    "Cannot evaluate the expression for undefined value", PrettyPrintVisitor.print(this));
         }
-      } else if (targetValue instanceof ListValue) {
-        ListValue listValue = (ListValue) targetValue;
-        checkSupportedList(listValue, this);
-        result = listValue.get(keyValue.getValue());
-      } else {
-        throw new EvaluationException(
-            "Cannot evaluate the expression for unsupported type: "
-                + targetValue.getClass().getTypeName(),
-            PrettyPrintVisitor.print(this));
-      }
-    } catch (IllegalArgumentException | UnsupportedOperationException ex) {
-      throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this), ex);
-    }
-    Object obj = result.getValue();
-    if (obj != null && Redaction.isRedactedType(obj.getClass().getTypeName())) {
-      ExpressionHelper.throwRedactedException(this);
+        if (targetValue.isNull()) {
+            throw new EvaluationException(
+                    "Cannot evaluate the expression for null value", PrettyPrintVisitor.print(this));
+        }
+        Value<?> result = Value.undefinedValue();
+        Value<?> keyValue = key.evaluate(evalContext);
+        if (keyValue == Value.undefined()) {
+            return result;
+        }
+        try {
+            if (targetValue instanceof MapValue) {
+                Object objKey = keyValue.getValue();
+                if (objKey instanceof String && Redaction.isRedactedKeyword((String) objKey)) {
+                    ExpressionHelper.throwRedactedException(this);
+                } else {
+                    MapValue mapValue = (MapValue) targetValue;
+                    checkSupportedMap(mapValue, this);
+                    result = mapValue.get(objKey);
+                }
+            } else if (targetValue instanceof ListValue) {
+                ListValue listValue = (ListValue) targetValue;
+                checkSupportedList(listValue, this);
+                result = listValue.get(keyValue.getValue());
+            } else {
+                throw new EvaluationException(
+                        "Cannot evaluate the expression for unsupported type: "
+                                + targetValue.getClass().getTypeName(),
+                        PrettyPrintVisitor.print(this));
+            }
+        } catch (IllegalArgumentException | UnsupportedOperationException ex) {
+            throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this), ex);
+        }
+        Object obj = result.getValue();
+        if (obj != null && Redaction.isRedactedType(obj.getClass().getTypeName())) {
+            ExpressionHelper.throwRedactedException(this);
+        }
+        checkTimeout(evalContext.getTimeoutChecker(), this);
+        return Value.of(result.getValue(), result.getType());
     }
-    checkTimeout(evalContext.getTimeoutChecker(), this);
-    return Value.of(result.getValue(), result.getType());
-  }
 
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 
-  public ValueExpression<?> getTarget() {
-    return target;
-  }
+    public ValueExpression<?> getTarget() {
+        return target;
+    }
 
-  public ValueExpression<?> getKey() {
-    return key;
-  }
+    public ValueExpression<?> getKey() {
+        return key;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsDefinedExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsDefinedExpression.java
index 24ac98be2d8..2d0bf9f8e77 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsDefinedExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsDefinedExpression.java
@@ -10,35 +10,35 @@
 
 /** Check whether a {@linkplain Value} was resolved correctly or symbol exists.<br> */
 public class IsDefinedExpression implements BooleanExpression {
-  private final ValueExpression<?> valueExpression;
+    private final ValueExpression<?> valueExpression;
 
-  public IsDefinedExpression(ValueExpression<?> valueExpression) {
-    this.valueExpression = valueExpression;
-  }
-
-  @Override
-  public Boolean evaluate(EvalContext evalContext) {
-    if (valueExpression == null) {
-      return Boolean.FALSE;
+    public IsDefinedExpression(ValueExpression<?> valueExpression) {
+        this.valueExpression = valueExpression;
     }
-    try {
-      Value<?> value = valueExpression.evaluate(evalContext);
-      return value.isUndefined() ? Boolean.FALSE : Boolean.TRUE;
-    } catch (EvaluationTimeOutException ex) {
-      throw ex;
-    } catch (EvaluationException ex) {
-      return Boolean.FALSE;
-    } finally {
-      checkTimeout(evalContext.getTimeoutChecker(), this);
+
+    @Override
+    public Boolean evaluate(EvalContext evalContext) {
+        if (valueExpression == null) {
+            return Boolean.FALSE;
+        }
+        try {
+            Value<?> value = valueExpression.evaluate(evalContext);
+            return value.isUndefined() ? Boolean.FALSE : Boolean.TRUE;
+        } catch (EvaluationTimeOutException ex) {
+            throw ex;
+        } catch (EvaluationException ex) {
+            return Boolean.FALSE;
+        } finally {
+            checkTimeout(evalContext.getTimeoutChecker(), this);
+        }
     }
-  }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 
-  public ValueExpression<?> getValueExpression() {
-    return valueExpression;
-  }
+    public ValueExpression<?> getValueExpression() {
+        return valueExpression;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsEmptyExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsEmptyExpression.java
index 1c4b43eef51..d5b7dee8a9d 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsEmptyExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsEmptyExpression.java
@@ -15,39 +15,39 @@
  * The result will be {@literal true} for empty string or collection, {@literal false} otherwise.
  */
 public final class IsEmptyExpression implements BooleanExpression {
-  private final ValueExpression<?> valueExpression;
+    private final ValueExpression<?> valueExpression;
 
-  public IsEmptyExpression(ValueExpression<?> valueExpression) {
-    this.valueExpression = valueExpression == null ? ValueExpression.NULL : valueExpression;
-  }
-
-  @Override
-  public Boolean evaluate(EvalContext evalContext) {
-    Value<?> value = valueExpression.evaluate(evalContext);
-    if (value.isUndefined()) {
-      throw new EvaluationException(
-          "Cannot evaluate the expression for undefined value", PrettyPrintVisitor.print(this));
-    }
-    if (value.isNull()) {
-      throw new EvaluationException(
-          "Cannot evaluate the expression for null value", PrettyPrintVisitor.print(this));
+    public IsEmptyExpression(ValueExpression<?> valueExpression) {
+        this.valueExpression = valueExpression == null ? ValueExpression.NULL : valueExpression;
     }
-    boolean result = false;
-    if (value instanceof CollectionValue) {
-      result = ((CollectionValue<?>) value).isEmpty();
-    } else if (value instanceof StringValue) {
-      result = ((StringValue) value).isEmpty();
+
+    @Override
+    public Boolean evaluate(EvalContext evalContext) {
+        Value<?> value = valueExpression.evaluate(evalContext);
+        if (value.isUndefined()) {
+            throw new EvaluationException(
+                    "Cannot evaluate the expression for undefined value", PrettyPrintVisitor.print(this));
+        }
+        if (value.isNull()) {
+            throw new EvaluationException(
+                    "Cannot evaluate the expression for null value", PrettyPrintVisitor.print(this));
+        }
+        boolean result = false;
+        if (value instanceof CollectionValue) {
+            result = ((CollectionValue<?>) value).isEmpty();
+        } else if (value instanceof StringValue) {
+            result = ((StringValue) value).isEmpty();
+        }
+        checkTimeout(evalContext.getTimeoutChecker(), this);
+        return result;
     }
-    checkTimeout(evalContext.getTimeoutChecker(), this);
-    return result;
-  }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 
-  public ValueExpression<?> getValueExpression() {
-    return valueExpression;
-  }
+    public ValueExpression<?> getValueExpression() {
+        return valueExpression;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/LenExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/LenExpression.java
index 3033d693cf1..cc66e97aff3 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/LenExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/LenExpression.java
@@ -21,44 +21,44 @@
  * be 0.
  */
 public final class LenExpression implements ValueExpression<Value<? extends Number>> {
-  private static final Logger log = LoggerFactory.getLogger(LenExpression.class);
+    private static final Logger log = LoggerFactory.getLogger(LenExpression.class);
 
-  private ValueExpression<?> source;
+    private ValueExpression<?> source;
 
-  public LenExpression(ValueExpression<?> source) {
-    this.source = source;
-  }
+    public LenExpression(ValueExpression<?> source) {
+        this.source = source;
+    }
 
-  @Override
-  public Value<Number> evaluate(EvalContext evalContext) {
-    Value<?> materialized = source == null ? Value.nullValue() : source.evaluate(evalContext);
-    Value<Number> result = Value.undefined();
-    try {
-      if (materialized.isNull()) {
-        throw new RuntimeException("Cannot evaluate the expression for null value");
-      } else if (materialized.isUndefined()) {
-        throw new RuntimeException("Cannot evaluate the expression for undefined value");
-      } else if (materialized instanceof StringValue) {
-        result = (NumericValue) Value.of(((StringValue) materialized).length(), ValueType.INT);
-      } else if (materialized instanceof CollectionValue) {
-        result = (NumericValue) Value.of(((CollectionValue) materialized).count(), ValueType.INT);
-      } else {
-        throw new RuntimeException(
-            "Cannot evaluate the expression for " + materialized.getClass().getTypeName());
-      }
-    } catch (RuntimeException ex) {
-      throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this));
+    @Override
+    public Value<Number> evaluate(EvalContext evalContext) {
+        Value<?> materialized = source == null ? Value.nullValue() : source.evaluate(evalContext);
+        Value<Number> result = Value.undefined();
+        try {
+            if (materialized.isNull()) {
+                throw new RuntimeException("Cannot evaluate the expression for null value");
+            } else if (materialized.isUndefined()) {
+                throw new RuntimeException("Cannot evaluate the expression for undefined value");
+            } else if (materialized instanceof StringValue) {
+                result = (NumericValue) Value.of(((StringValue) materialized).length(), ValueType.INT);
+            } else if (materialized instanceof CollectionValue) {
+                result = (NumericValue) Value.of(((CollectionValue) materialized).count(), ValueType.INT);
+            } else {
+                throw new RuntimeException("Cannot evaluate the expression for "
+                        + materialized.getClass().getTypeName());
+            }
+        } catch (RuntimeException ex) {
+            throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this));
+        }
+        checkTimeout(evalContext.getTimeoutChecker(), this);
+        return result;
     }
-    checkTimeout(evalContext.getTimeoutChecker(), this);
-    return result;
-  }
 
-  public ValueExpression<?> getSource() {
-    return source;
-  }
+    public ValueExpression<?> getSource() {
+        return source;
+    }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/MatchesExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/MatchesExpression.java
index aab2b2762f4..e540e17a6cb 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/MatchesExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/MatchesExpression.java
@@ -4,12 +4,12 @@
 import com.datadog.debugger.el.values.StringValue;
 
 public class MatchesExpression extends StringPredicateExpression {
-  public MatchesExpression(ValueExpression<?> sourceString, StringValue str) {
-    super(sourceString, str, String::matches, "matches");
-  }
+    public MatchesExpression(ValueExpression<?> sourceString, StringValue str) {
+        super(sourceString, str, String::matches, "matches");
+    }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/MatchingExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/MatchingExpression.java
index 9c0138617c4..57a05c771a4 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/MatchingExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/MatchingExpression.java
@@ -2,21 +2,20 @@
 
 /** Abstract super class for expressions performing matching of a value against a predicate. */
 abstract class MatchingExpression implements BooleanExpression {
-  protected final ValueExpression<?> valueExpression;
-  protected final BooleanExpression filterPredicateExpression;
+    protected final ValueExpression<?> valueExpression;
+    protected final BooleanExpression filterPredicateExpression;
 
-  public MatchingExpression(
-      ValueExpression<?> valueExpression, BooleanExpression filterPredicateExpression) {
-    this.valueExpression = valueExpression;
-    this.filterPredicateExpression =
-        filterPredicateExpression == null ? BooleanExpression.TRUE : filterPredicateExpression;
-  }
+    public MatchingExpression(ValueExpression<?> valueExpression, BooleanExpression filterPredicateExpression) {
+        this.valueExpression = valueExpression;
+        this.filterPredicateExpression =
+                filterPredicateExpression == null ? BooleanExpression.TRUE : filterPredicateExpression;
+    }
 
-  public ValueExpression<?> getValueExpression() {
-    return valueExpression;
-  }
+    public ValueExpression<?> getValueExpression() {
+        return valueExpression;
+    }
 
-  public BooleanExpression getFilterPredicateExpression() {
-    return filterPredicateExpression;
-  }
+    public BooleanExpression getFilterPredicateExpression() {
+        return filterPredicateExpression;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/NotExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/NotExpression.java
index 5cf8fad7607..337cddb96cc 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/NotExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/NotExpression.java
@@ -7,25 +7,25 @@
 
 /** Will negate the resolved {@linkplain BooleanExpression} */
 public final class NotExpression implements BooleanExpression {
-  private final BooleanExpression predicate;
+    private final BooleanExpression predicate;
 
-  public NotExpression(BooleanExpression predicate) {
-    this.predicate = predicate == null ? (BooleanExpression.FALSE) : predicate;
-  }
+    public NotExpression(BooleanExpression predicate) {
+        this.predicate = predicate == null ? (BooleanExpression.FALSE) : predicate;
+    }
 
-  @Override
-  public Boolean evaluate(EvalContext evalContext) {
-    boolean result = !predicate.evaluate(evalContext);
-    checkTimeout(evalContext.getTimeoutChecker(), this);
-    return result;
-  }
+    @Override
+    public Boolean evaluate(EvalContext evalContext) {
+        boolean result = !predicate.evaluate(evalContext);
+        checkTimeout(evalContext.getTimeoutChecker(), this);
+        return result;
+    }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 
-  public BooleanExpression getPredicate() {
-    return predicate;
-  }
+    public BooleanExpression getPredicate() {
+        return predicate;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/StartsWithExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/StartsWithExpression.java
index 4327b3cba44..343114d6e3a 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/StartsWithExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/StartsWithExpression.java
@@ -4,12 +4,12 @@
 import com.datadog.debugger.el.values.StringValue;
 
 public class StartsWithExpression extends StringPredicateExpression {
-  public StartsWithExpression(ValueExpression<?> sourceString, StringValue str) {
-    super(sourceString, str, String::startsWith, "startsWith");
-  }
+    public StartsWithExpression(ValueExpression<?> sourceString, StringValue str) {
+        super(sourceString, str, String::startsWith, "startsWith");
+    }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/StringPredicateExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/StringPredicateExpression.java
index efb1a4f3269..a2ab2d6a9e3 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/StringPredicateExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/StringPredicateExpression.java
@@ -8,56 +8,52 @@
 import java.util.function.BiPredicate;
 
 public class StringPredicateExpression implements BooleanExpression {
-  private final ValueExpression<?> sourceString;
-  private final StringValue str;
-  private final BiPredicate<String, String> predicate;
-  private final String name;
-
-  public StringPredicateExpression(
-      ValueExpression<?> sourceString,
-      StringValue str,
-      BiPredicate<String, String> predicate,
-      String name) {
-    this.sourceString = sourceString;
-    this.str = str;
-    this.predicate = predicate;
-    this.name = name;
-  }
-
-  @Override
-  public Boolean evaluate(EvalContext evalContext) {
-    Value<?> sourceValue =
-        sourceString != null ? sourceString.evaluate(evalContext) : Value.nullValue();
-    if (sourceValue.isUndefined()) {
-      throw new EvaluationException(
-          "Cannot evaluate the expression for undefined value", PrettyPrintVisitor.print(this));
+    private final ValueExpression<?> sourceString;
+    private final StringValue str;
+    private final BiPredicate<String, String> predicate;
+    private final String name;
+
+    public StringPredicateExpression(
+            ValueExpression<?> sourceString, StringValue str, BiPredicate<String, String> predicate, String name) {
+        this.sourceString = sourceString;
+        this.str = str;
+        this.predicate = predicate;
+        this.name = name;
     }
-    if (sourceValue.isNull()) {
-      throw new EvaluationException(
-          "Cannot evaluate the expression for null value", PrettyPrintVisitor.print(this));
-    }
-    if (sourceValue.getValue() instanceof String) {
-      String sourceStr = (String) sourceValue.getValue();
-      boolean result = predicate.test(sourceStr, str.getValue());
-      ExpressionHelper.checkTimeout(evalContext.getTimeoutChecker(), this);
-      return result;
+
+    @Override
+    public Boolean evaluate(EvalContext evalContext) {
+        Value<?> sourceValue = sourceString != null ? sourceString.evaluate(evalContext) : Value.nullValue();
+        if (sourceValue.isUndefined()) {
+            throw new EvaluationException(
+                    "Cannot evaluate the expression for undefined value", PrettyPrintVisitor.print(this));
+        }
+        if (sourceValue.isNull()) {
+            throw new EvaluationException(
+                    "Cannot evaluate the expression for null value", PrettyPrintVisitor.print(this));
+        }
+        if (sourceValue.getValue() instanceof String) {
+            String sourceStr = (String) sourceValue.getValue();
+            boolean result = predicate.test(sourceStr, str.getValue());
+            ExpressionHelper.checkTimeout(evalContext.getTimeoutChecker(), this);
+            return result;
+        }
+        return Boolean.FALSE;
     }
-    return Boolean.FALSE;
-  }
 
-  public ValueExpression<?> getSourceString() {
-    return sourceString;
-  }
+    public ValueExpression<?> getSourceString() {
+        return sourceString;
+    }
 
-  public StringValue getStr() {
-    return str;
-  }
+    public StringValue getStr() {
+        return str;
+    }
 
-  public BiPredicate<String, String> getPredicate() {
-    return predicate;
-  }
+    public BiPredicate<String, String> getPredicate() {
+        return predicate;
+    }
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/SubStringExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/SubStringExpression.java
index 40e7d258e33..8e1700c0198 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/SubStringExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/SubStringExpression.java
@@ -10,58 +10,58 @@
 import com.datadog.debugger.el.Visitor;
 
 public class SubStringExpression implements ValueExpression<Value<String>> {
-  private final ValueExpression<?> source;
-  private final int startIndex;
-  private final int endIndex;
+    private final ValueExpression<?> source;
+    private final int startIndex;
+    private final int endIndex;
 
-  public SubStringExpression(ValueExpression<?> source, int startIndex, int endIndex) {
-    this.source = source;
-    this.startIndex = startIndex;
-    this.endIndex = endIndex;
-  }
-
-  @Override
-  public Value<String> evaluate(EvalContext evalContext) {
-    Value<?> sourceValue = source != null ? source.evaluate(evalContext) : Value.nullValue();
-    if (sourceValue.isUndefined()) {
-      throw new EvaluationException(
-          "Cannot evaluate the expression for undefined value", PrettyPrintVisitor.print(this));
-    }
-    if (sourceValue.isNull()) {
-      throw new EvaluationException(
-          "Cannot evaluate the expression for null value", PrettyPrintVisitor.print(this));
+    public SubStringExpression(ValueExpression<?> source, int startIndex, int endIndex) {
+        this.source = source;
+        this.startIndex = startIndex;
+        this.endIndex = endIndex;
     }
-    if (sourceValue.getValue() instanceof String) {
-      String sourceStr = (String) sourceValue.getValue();
-      Value<String> result = internalEvaluate(sourceStr);
-      checkTimeout(evalContext.getTimeoutChecker(), this);
-      return result;
+
+    @Override
+    public Value<String> evaluate(EvalContext evalContext) {
+        Value<?> sourceValue = source != null ? source.evaluate(evalContext) : Value.nullValue();
+        if (sourceValue.isUndefined()) {
+            throw new EvaluationException(
+                    "Cannot evaluate the expression for undefined value", PrettyPrintVisitor.print(this));
+        }
+        if (sourceValue.isNull()) {
+            throw new EvaluationException(
+                    "Cannot evaluate the expression for null value", PrettyPrintVisitor.print(this));
+        }
+        if (sourceValue.getValue() instanceof String) {
+            String sourceStr = (String) sourceValue.getValue();
+            Value<String> result = internalEvaluate(sourceStr);
+            checkTimeout(evalContext.getTimeoutChecker(), this);
+            return result;
+        }
+        return Value.undefined();
     }
-    return Value.undefined();
-  }
 
-  private Value<String> internalEvaluate(String sourceStr) {
-    try {
-      return (Value<String>) Value.of(sourceStr.substring(startIndex, endIndex), ValueType.OBJECT);
-    } catch (StringIndexOutOfBoundsException ex) {
-      throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this), ex);
+    private Value<String> internalEvaluate(String sourceStr) {
+        try {
+            return (Value<String>) Value.of(sourceStr.substring(startIndex, endIndex), ValueType.OBJECT);
+        } catch (StringIndexOutOfBoundsException ex) {
+            throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this), ex);
+        }
     }
-  }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 
-  public ValueExpression<?> getSource() {
-    return source;
-  }
+    public ValueExpression<?> getSource() {
+        return source;
+    }
 
-  public int getStartIndex() {
-    return startIndex;
-  }
+    public int getStartIndex() {
+        return startIndex;
+    }
 
-  public int getEndIndex() {
-    return endIndex;
-  }
+    public int getEndIndex() {
+        return endIndex;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ThenExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ThenExpression.java
index e75b02fc701..5c81e25eb9b 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ThenExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ThenExpression.java
@@ -5,10 +5,10 @@
 
 /** TODO: Primordial support for 'debugger watches' support */
 public final class ThenExpression implements ValueExpression<Value<Void>> {
-  @Override
-  public Value<Void> evaluate(EvalContext evalContext) {
-    // TODO: This can be used to implement 'add watch' functionality where the script can amend the
-    // collected snapshot
-    return null;
-  }
+    @Override
+    public Value<Void> evaluate(EvalContext evalContext) {
+        // TODO: This can be used to implement 'add watch' functionality where the script can amend the
+        // collected snapshot
+        return null;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueExpression.java
index 5c43935555c..01c8cc9ae82 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueExpression.java
@@ -10,29 +10,27 @@
  * @param <T>
  */
 public interface ValueExpression<T extends Value<?>> extends Expression<T> {
-  ValueExpression<?> NULL =
-      new ValueExpression<Value<?>>() {
+    ValueExpression<?> NULL = new ValueExpression<Value<?>>() {
         @Override
         public Value<?> evaluate(EvalContext evalContext) {
-          return Value.nullValue();
+            return Value.nullValue();
         }
 
         @Override
         public String toString() {
-          return Value.nullValue().toString();
+            return Value.nullValue().toString();
         }
-      };
+    };
 
-  ValueExpression<?> UNDEFINED =
-      new ValueExpression<Value<?>>() {
+    ValueExpression<?> UNDEFINED = new ValueExpression<Value<?>>() {
         @Override
         public Value<?> evaluate(EvalContext evalContext) {
-          return Value.undefinedValue();
+            return Value.undefinedValue();
         }
 
         @Override
         public String toString() {
-          return Value.undefinedValue().toString();
+            return Value.undefinedValue().toString();
         }
-      };
+    };
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueRefExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueRefExpression.java
index 1b14838e167..c299ba7caed 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueRefExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueRefExpression.java
@@ -17,58 +17,58 @@
 
 /** An expression taking a reference path and resolving to {@linkplain Value} */
 public final class ValueRefExpression implements ValueExpression<Value<?>> {
-  private final String symbolName;
+    private final String symbolName;
 
-  public ValueRefExpression(String symbolName) {
-    this.symbolName = symbolName;
-  }
-
-  @Override
-  public Value<?> evaluate(EvalContext evalContext) {
-    CapturedContext.CapturedValue symbol;
-    try {
-      symbol = evalContext.getValueRefResolver().lookup(symbolName);
-    } catch (RuntimeException ex) {
-      throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this));
+    public ValueRefExpression(String symbolName) {
+        this.symbolName = symbolName;
     }
-    if (symbol != null) {
-      String typeName = symbol.getType();
-      if (symbol.getValue() == REDACTED_VALUE || (Redaction.isRedactedType(typeName))) {
-        throwRedactedException(this);
-      }
-      checkTimeout(evalContext.getTimeoutChecker(), this);
-      return Value.of(symbol.getValue(), ValueType.of(symbol.getType()));
+
+    @Override
+    public Value<?> evaluate(EvalContext evalContext) {
+        CapturedContext.CapturedValue symbol;
+        try {
+            symbol = evalContext.getValueRefResolver().lookup(symbolName);
+        } catch (RuntimeException ex) {
+            throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this));
+        }
+        if (symbol != null) {
+            String typeName = symbol.getType();
+            if (symbol.getValue() == REDACTED_VALUE || (Redaction.isRedactedType(typeName))) {
+                throwRedactedException(this);
+            }
+            checkTimeout(evalContext.getTimeoutChecker(), this);
+            return Value.of(symbol.getValue(), ValueType.of(symbol.getType()));
+        }
+        return Value.nullValue();
     }
-    return Value.nullValue();
-  }
 
-  @Generated
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    ValueRefExpression that = (ValueRefExpression) o;
-    return Objects.equals(symbolName, that.symbolName);
-  }
+    @Generated
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ValueRefExpression that = (ValueRefExpression) o;
+        return Objects.equals(symbolName, that.symbolName);
+    }
 
-  @Generated
-  @Override
-  public int hashCode() {
-    return Objects.hash(symbolName);
-  }
+    @Generated
+    @Override
+    public int hashCode() {
+        return Objects.hash(symbolName);
+    }
 
-  @Generated
-  @Override
-  public String toString() {
-    return "ValueRefExpression{" + "symbolName='" + symbolName + '\'' + '}';
-  }
+    @Generated
+    @Override
+    public String toString() {
+        return "ValueRefExpression{" + "symbolName='" + symbolName + '\'' + '}';
+    }
 
-  public String getSymbolName() {
-    return symbolName;
-  }
+    public String getSymbolName() {
+        return symbolName;
+    }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/WhenExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/WhenExpression.java
index 60f0b3cfb77..41d7ca825d6 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/WhenExpression.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/WhenExpression.java
@@ -5,23 +5,23 @@
 
 /** The entry-point expression for the debugger EL */
 public final class WhenExpression implements BooleanExpression {
-  private final BooleanExpression expression;
+    private final BooleanExpression expression;
 
-  public WhenExpression(BooleanExpression expression) {
-    this.expression = expression;
-  }
+    public WhenExpression(BooleanExpression expression) {
+        this.expression = expression;
+    }
 
-  @Override
-  public Boolean evaluate(EvalContext evalContext) {
-    return expression.evaluate(evalContext);
-  }
+    @Override
+    public Boolean evaluate(EvalContext evalContext) {
+        return expression.evaluate(evalContext);
+    }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 
-  public BooleanExpression getExpression() {
-    return expression;
-  }
+    public BooleanExpression getExpression() {
+        return expression;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/BooleanValue.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/BooleanValue.java
index 28d852dbabc..f94d6fdc0cd 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/BooleanValue.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/BooleanValue.java
@@ -6,20 +6,20 @@
 
 /** Constant boolean value */
 public final class BooleanValue extends Literal<Boolean> {
-  public static final BooleanValue TRUE = new BooleanValue(true, ValueType.BOOLEAN);
-  public static final BooleanValue FALSE = new BooleanValue(false, ValueType.BOOLEAN);
+    public static final BooleanValue TRUE = new BooleanValue(true, ValueType.BOOLEAN);
+    public static final BooleanValue FALSE = new BooleanValue(false, ValueType.BOOLEAN);
 
-  public BooleanValue(Boolean value, ValueType type) {
-    super(value, type);
-  }
+    public BooleanValue(Boolean value, ValueType type) {
+        super(value, type);
+    }
 
-  @Override
-  public String toString() {
-    return "BooleanLiteral{" + "value=" + value + '}';
-  }
+    @Override
+    public String toString() {
+        return "BooleanLiteral{" + "value=" + value + '}';
+    }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/CollectionValue.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/CollectionValue.java
index 55115224b3d..8f03e842a95 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/CollectionValue.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/CollectionValue.java
@@ -10,97 +10,95 @@
  * @param <T>
  */
 public interface CollectionValue<T> extends Value<T> {
-  CollectionValue<?> UNDEFINED =
-      new CollectionValue<Object>() {
+    CollectionValue<?> UNDEFINED = new CollectionValue<Object>() {
         @Override
         public boolean isEmpty() {
-          return true;
+            return true;
         }
 
         @Override
         public int count() {
-          return 0;
+            return 0;
         }
 
         @Override
         public Value<?> get(Object key) {
-          return Value.undefinedValue();
+            return Value.undefinedValue();
         }
 
         @Override
         public Object getValue() {
-          return Values.UNDEFINED_OBJECT;
+            return Values.UNDEFINED_OBJECT;
         }
 
         @Override
         public ValueType getType() {
-          return ValueType.OBJECT;
+            return ValueType.OBJECT;
         }
 
         @Override
         public boolean isUndefined() {
-          return true;
+            return true;
         }
 
         @Override
         public boolean isNull() {
-          return false;
+            return false;
         }
 
         @Override
         public boolean contains(Value<?> val) {
-          return false;
+            return false;
         }
-      };
+    };
 
-  CollectionValue<?> NULL =
-      new CollectionValue<Object>() {
+    CollectionValue<?> NULL = new CollectionValue<Object>() {
         @Override
         public boolean isEmpty() {
-          return true;
+            return true;
         }
 
         @Override
         public int count() {
-          return -1;
+            return -1;
         }
 
         @Override
         public Value<?> get(Object key) {
-          return Value.nullValue();
+            return Value.nullValue();
         }
 
         @Override
         public Object getValue() {
-          return Value.nullValue();
+            return Value.nullValue();
         }
 
         @Override
         public ValueType getType() {
-          return ValueType.OBJECT;
+            return ValueType.OBJECT;
         }
 
         @Override
         public boolean isUndefined() {
-          return false;
+            return false;
         }
 
         @Override
         public boolean isNull() {
-          return true;
+            return true;
         }
 
         @Override
         public boolean contains(Value<?> val) {
-          return false;
+            return false;
         }
-      };
+    };
 
-  boolean isEmpty();
+    boolean isEmpty();
 
-  int count();
+    int count();
 
-  Value<?> get(Object key);
+    Value<?> get(Object key);
 
-  boolean contains(Value<?> val);
+    boolean contains(Value<?> val);
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/ListValue.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/ListValue.java
index 3dc7e578d66..977b206b740 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/ListValue.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/ListValue.java
@@ -21,268 +21,268 @@
  * Allows wrapping of arrays as well as {@linkplain List} or {@link Set} instances.
  */
 public class ListValue implements CollectionValue<Object>, ValueExpression<ListValue> {
-  private final Object listHolder;
-  private final Object arrayHolder;
-  private final Class<?> arrayType;
+    private final Object listHolder;
+    private final Object arrayHolder;
+    private final Class<?> arrayType;
 
-  public ListValue(Object object) {
-    if (object == null || object == Values.NULL_OBJECT || object == Value.nullValue()) {
-      listHolder = Value.nullValue();
-      arrayHolder = null;
-      arrayType = null;
-    } else if (object == Values.UNDEFINED_OBJECT || object == Value.undefinedValue()) {
-      listHolder = Value.undefinedValue();
-      arrayHolder = null;
-      arrayType = null;
-    } else if (object instanceof Collection) {
-      listHolder = object;
-      arrayHolder = null;
-      arrayType = null;
-    } else if (object.getClass().isArray()) {
-      listHolder = null;
-      arrayHolder = object;
-      arrayType = object.getClass().getComponentType();
-    } else {
-      listHolder = Value.undefinedValue();
-      arrayHolder = null;
-      arrayType = null;
+    public ListValue(Object object) {
+        if (object == null || object == Values.NULL_OBJECT || object == Value.nullValue()) {
+            listHolder = Value.nullValue();
+            arrayHolder = null;
+            arrayType = null;
+        } else if (object == Values.UNDEFINED_OBJECT || object == Value.undefinedValue()) {
+            listHolder = Value.undefinedValue();
+            arrayHolder = null;
+            arrayType = null;
+        } else if (object instanceof Collection) {
+            listHolder = object;
+            arrayHolder = null;
+            arrayType = null;
+        } else if (object.getClass().isArray()) {
+            listHolder = null;
+            arrayHolder = object;
+            arrayType = object.getClass().getComponentType();
+        } else {
+            listHolder = Value.undefinedValue();
+            arrayHolder = null;
+            arrayType = null;
+        }
     }
-  }
-
-  public boolean isNull() {
-    return (listHolder == null || (listHolder instanceof Value && ((Value<?>) listHolder).isNull()))
-        && arrayHolder == null;
-  }
 
-  public boolean isUndefined() {
-    return listHolder instanceof Value && ((Value<?>) listHolder).isUndefined();
-  }
-
-  public boolean isEmpty() {
-    if (listHolder instanceof Collection) {
-      if (WellKnownClasses.isSafe((Collection<?>) listHolder)) {
-        return ((Collection<?>) listHolder).isEmpty();
-      }
-      throw new UnsupportedOperationException(
-          "Unsupported Collection class: " + listHolder.getClass().getTypeName());
-    } else if (listHolder instanceof Value) {
-      Value<?> val = (Value<?>) listHolder;
-      return val.isNull() || val.isUndefined();
-    }
-    if (arrayHolder != null) {
-      return count() == 0;
+    public boolean isNull() {
+        return (listHolder == null || (listHolder instanceof Value && ((Value<?>) listHolder).isNull()))
+                && arrayHolder == null;
     }
-    return true;
-  }
 
-  public int count() {
-    if (listHolder instanceof Collection) {
-      if (WellKnownClasses.isSafe((Collection<?>) listHolder)) {
-        return ((Collection<?>) listHolder).size();
-      } else {
-        throw new UnsupportedOperationException(
-            "Unsupported Collection class: " + listHolder.getClass().getTypeName());
-      }
-    } else if (listHolder == Value.nullValue()) {
-      return 0;
-    } else if (arrayHolder != null) {
-      return Array.getLength(arrayHolder);
+    public boolean isUndefined() {
+        return listHolder instanceof Value && ((Value<?>) listHolder).isUndefined();
     }
-    return -1;
-  }
 
-  public Value<?> get(Object key) {
-    if (key instanceof Integer) {
-      return get((int) key);
-    }
-    if (key instanceof Long) {
-      return get(((Long) key).intValue());
+    public boolean isEmpty() {
+        if (listHolder instanceof Collection) {
+            if (WellKnownClasses.isSafe((Collection<?>) listHolder)) {
+                return ((Collection<?>) listHolder).isEmpty();
+            }
+            throw new UnsupportedOperationException(
+                    "Unsupported Collection class: " + listHolder.getClass().getTypeName());
+        } else if (listHolder instanceof Value) {
+            Value<?> val = (Value<?>) listHolder;
+            return val.isNull() || val.isUndefined();
+        }
+        if (arrayHolder != null) {
+            return count() == 0;
+        }
+        return true;
     }
-    return Value.undefinedValue();
-  }
 
-  public Value<?> get(int index) {
-    int len = count();
-    if (index < 0 || index >= len) {
-      throw new IllegalArgumentException("index[" + index + "] out of bounds: [0-" + len + "]");
-    }
-    if (listHolder instanceof List) {
-      return Value.of(((List<?>) listHolder).get(index), ValueType.OBJECT);
-    } else if (listHolder instanceof Set) {
-      throw new UnsupportedOperationException("Cannot access Set by index");
-    } else if (listHolder instanceof Value) {
-      return (Value<?>) listHolder;
-    } else if (arrayHolder != null) {
-      if (arrayType.isPrimitive()) {
-        if (arrayType == byte.class) {
-          return Value.of(Array.getByte(arrayHolder, index), ValueType.BYTE);
-        } else if (arrayType == char.class) {
-          return Value.of(Array.getChar(arrayHolder, index), ValueType.CHAR);
-        } else if (arrayType == short.class) {
-          return Value.of(Array.getShort(arrayHolder, index), ValueType.SHORT);
-        } else if (arrayType == int.class) {
-          return Value.of(Array.getInt(arrayHolder, index), ValueType.INT);
-        } else if (arrayType == long.class) {
-          return Value.of(Array.getLong(arrayHolder, index), ValueType.LONG);
-        } else if (arrayType == float.class) {
-          return Value.of(Array.getFloat(arrayHolder, index), ValueType.FLOAT);
-        } else if (arrayType == double.class) {
-          return Value.of(Array.getDouble(arrayHolder, index), ValueType.DOUBLE);
-        } else if (arrayType == boolean.class) {
-          return Value.of(Array.getBoolean(arrayHolder, index), ValueType.BOOLEAN);
+    public int count() {
+        if (listHolder instanceof Collection) {
+            if (WellKnownClasses.isSafe((Collection<?>) listHolder)) {
+                return ((Collection<?>) listHolder).size();
+            } else {
+                throw new UnsupportedOperationException(
+                        "Unsupported Collection class: " + listHolder.getClass().getTypeName());
+            }
+        } else if (listHolder == Value.nullValue()) {
+            return 0;
+        } else if (arrayHolder != null) {
+            return Array.getLength(arrayHolder);
         }
-      } else {
-        return Value.of(Array.get(arrayHolder, index), ValueType.OBJECT);
-      }
+        return -1;
     }
-    return Value.undefinedValue();
-  }
 
-  @Override
-  public boolean contains(Value<?> val) {
-    if (listHolder instanceof Collection) {
-      Collection<?> collection = (Collection<?>) listHolder;
-      if (WellKnownClasses.isSafe(collection)) {
-        checkCollectionSize(collection, this);
-        return collection.contains(val.isNull() ? null : val.getValue());
-      }
-      throw new UnsupportedOperationException(
-          "Unsupported Collection class: " + listHolder.getClass().getTypeName());
+    public Value<?> get(Object key) {
+        if (key instanceof Integer) {
+            return get((int) key);
+        }
+        if (key instanceof Long) {
+            return get(((Long) key).intValue());
+        }
+        return Value.undefinedValue();
     }
-    if (arrayHolder != null) {
-      int count = Array.getLength(arrayHolder);
-      checkArrayLength(count, this);
-      if (arrayType.isPrimitive()) {
-        if (val.getValue() == null || val.isNull()) {
-          throw new IllegalArgumentException("Cannot compare null with primitive array");
+
+    public Value<?> get(int index) {
+        int len = count();
+        if (index < 0 || index >= len) {
+            throw new IllegalArgumentException("index[" + index + "] out of bounds: [0-" + len + "]");
         }
-        if (arrayType == byte.class) {
-          byte byteValue = (Byte) val.getValue();
-          for (int i = 0; i < count; i++) {
-            if (Array.getByte(arrayHolder, i) == byteValue) {
-              return true;
-            }
-          }
-        } else if (arrayType == char.class) {
-          String strValue = (String) val.getValue();
-          if (strValue.isEmpty()) {
-            return false;
-          }
-          char charValue = strValue.charAt(0);
-          for (int i = 0; i < count; i++) {
-            if (Array.getChar(arrayHolder, i) == charValue) {
-              return true;
-            }
-          }
-        } else if (arrayType == short.class) {
-          int shortValue = ((Number) val.getValue()).intValue();
-          for (int i = 0; i < count; i++) {
-            if (Array.getShort(arrayHolder, i) == shortValue) {
-              return true;
-            }
-          }
-        } else if (arrayType == int.class) {
-          int intValue = ((Number) val.getValue()).intValue();
-          for (int i = 0; i < count; i++) {
-            if (Array.getInt(arrayHolder, i) == intValue) {
-              return true;
+        if (listHolder instanceof List) {
+            return Value.of(((List<?>) listHolder).get(index), ValueType.OBJECT);
+        } else if (listHolder instanceof Set) {
+            throw new UnsupportedOperationException("Cannot access Set by index");
+        } else if (listHolder instanceof Value) {
+            return (Value<?>) listHolder;
+        } else if (arrayHolder != null) {
+            if (arrayType.isPrimitive()) {
+                if (arrayType == byte.class) {
+                    return Value.of(Array.getByte(arrayHolder, index), ValueType.BYTE);
+                } else if (arrayType == char.class) {
+                    return Value.of(Array.getChar(arrayHolder, index), ValueType.CHAR);
+                } else if (arrayType == short.class) {
+                    return Value.of(Array.getShort(arrayHolder, index), ValueType.SHORT);
+                } else if (arrayType == int.class) {
+                    return Value.of(Array.getInt(arrayHolder, index), ValueType.INT);
+                } else if (arrayType == long.class) {
+                    return Value.of(Array.getLong(arrayHolder, index), ValueType.LONG);
+                } else if (arrayType == float.class) {
+                    return Value.of(Array.getFloat(arrayHolder, index), ValueType.FLOAT);
+                } else if (arrayType == double.class) {
+                    return Value.of(Array.getDouble(arrayHolder, index), ValueType.DOUBLE);
+                } else if (arrayType == boolean.class) {
+                    return Value.of(Array.getBoolean(arrayHolder, index), ValueType.BOOLEAN);
+                }
+            } else {
+                return Value.of(Array.get(arrayHolder, index), ValueType.OBJECT);
             }
-          }
-        } else if (arrayType == long.class) {
-          long longValue = ((Number) val.getValue()).longValue();
-          for (int i = 0; i < count; i++) {
-            if (Array.getLong(arrayHolder, i) == longValue) {
-              return true;
+        }
+        return Value.undefinedValue();
+    }
+
+    @Override
+    public boolean contains(Value<?> val) {
+        if (listHolder instanceof Collection) {
+            Collection<?> collection = (Collection<?>) listHolder;
+            if (WellKnownClasses.isSafe(collection)) {
+                checkCollectionSize(collection, this);
+                return collection.contains(val.isNull() ? null : val.getValue());
             }
-          }
-        } else if (arrayType == float.class) {
-          float floatValue = (Float) val.getValue();
-          for (int i = 0; i < count; i++) {
-            if (Array.getFloat(arrayHolder, i) == floatValue) {
-              return true;
+            throw new UnsupportedOperationException(
+                    "Unsupported Collection class: " + listHolder.getClass().getTypeName());
+        }
+        if (arrayHolder != null) {
+            int count = Array.getLength(arrayHolder);
+            checkArrayLength(count, this);
+            if (arrayType.isPrimitive()) {
+                if (val.getValue() == null || val.isNull()) {
+                    throw new IllegalArgumentException("Cannot compare null with primitive array");
+                }
+                if (arrayType == byte.class) {
+                    byte byteValue = (Byte) val.getValue();
+                    for (int i = 0; i < count; i++) {
+                        if (Array.getByte(arrayHolder, i) == byteValue) {
+                            return true;
+                        }
+                    }
+                } else if (arrayType == char.class) {
+                    String strValue = (String) val.getValue();
+                    if (strValue.isEmpty()) {
+                        return false;
+                    }
+                    char charValue = strValue.charAt(0);
+                    for (int i = 0; i < count; i++) {
+                        if (Array.getChar(arrayHolder, i) == charValue) {
+                            return true;
+                        }
+                    }
+                } else if (arrayType == short.class) {
+                    int shortValue = ((Number) val.getValue()).intValue();
+                    for (int i = 0; i < count; i++) {
+                        if (Array.getShort(arrayHolder, i) == shortValue) {
+                            return true;
+                        }
+                    }
+                } else if (arrayType == int.class) {
+                    int intValue = ((Number) val.getValue()).intValue();
+                    for (int i = 0; i < count; i++) {
+                        if (Array.getInt(arrayHolder, i) == intValue) {
+                            return true;
+                        }
+                    }
+                } else if (arrayType == long.class) {
+                    long longValue = ((Number) val.getValue()).longValue();
+                    for (int i = 0; i < count; i++) {
+                        if (Array.getLong(arrayHolder, i) == longValue) {
+                            return true;
+                        }
+                    }
+                } else if (arrayType == float.class) {
+                    float floatValue = (Float) val.getValue();
+                    for (int i = 0; i < count; i++) {
+                        if (Array.getFloat(arrayHolder, i) == floatValue) {
+                            return true;
+                        }
+                    }
+                } else if (arrayType == double.class) {
+                    double doubleValue = (Double) val.getValue();
+                    for (int i = 0; i < count; i++) {
+                        if (Array.getDouble(arrayHolder, i) == doubleValue) {
+                            return true;
+                        }
+                    }
+                } else if (arrayType == boolean.class) {
+                    boolean booleanValue = (Boolean) val.getValue();
+                    for (int i = 0; i < count; i++) {
+                        if (Array.getBoolean(arrayHolder, i) == booleanValue) {
+                            return true;
+                        }
+                    }
+                }
+                return false;
             }
-          }
-        } else if (arrayType == double.class) {
-          double doubleValue = (Double) val.getValue();
-          for (int i = 0; i < count; i++) {
-            if (Array.getDouble(arrayHolder, i) == doubleValue) {
-              return true;
+            Object objValue = val.getValue();
+            if (objValue == null || val.isNull()) {
+                for (int i = 0; i < count; i++) {
+                    if (Array.get(arrayHolder, i) == null) {
+                        return true;
+                    }
+                }
+                return false;
             }
-          }
-        } else if (arrayType == boolean.class) {
-          boolean booleanValue = (Boolean) val.getValue();
-          for (int i = 0; i < count; i++) {
-            if (Array.getBoolean(arrayHolder, i) == booleanValue) {
-              return true;
+            if (WellKnownClasses.isEqualsSafe(objValue.getClass())) {
+                for (int i = 0; i < count; i++) {
+                    if (objValue.equals(Array.get(arrayHolder, i))) {
+                        return true;
+                    }
+                }
             }
-          }
+            throw new UnsupportedOperationException(
+                    "Unsupported value class: " + objValue.getClass().getTypeName());
         }
         return false;
-      }
-      Object objValue = val.getValue();
-      if (objValue == null || val.isNull()) {
-        for (int i = 0; i < count; i++) {
-          if (Array.get(arrayHolder, i) == null) {
-            return true;
-          }
-        }
-        return false;
-      }
-      if (WellKnownClasses.isEqualsSafe(objValue.getClass())) {
-        for (int i = 0; i < count; i++) {
-          if (objValue.equals(Array.get(arrayHolder, i))) {
-            return true;
-          }
-        }
-      }
-      throw new UnsupportedOperationException(
-          "Unsupported value class: " + objValue.getClass().getTypeName());
     }
-    return false;
-  }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    ListValue listValue = (ListValue) o;
-    return Objects.equals(listHolder, listValue.listHolder)
-        && Objects.equals(arrayHolder, listValue.arrayHolder)
-        && Objects.equals(arrayType, listValue.arrayType);
-  }
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ListValue listValue = (ListValue) o;
+        return Objects.equals(listHolder, listValue.listHolder)
+                && Objects.equals(arrayHolder, listValue.arrayHolder)
+                && Objects.equals(arrayType, listValue.arrayType);
+    }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(listHolder, arrayHolder, arrayType);
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(listHolder, arrayHolder, arrayType);
+    }
 
-  @Override
-  public Object getValue() {
-    if (arrayHolder != null) {
-      return arrayHolder;
+    @Override
+    public Object getValue() {
+        if (arrayHolder != null) {
+            return arrayHolder;
+        }
+        return listHolder;
     }
-    return listHolder;
-  }
 
-  @Override
-  public ListValue evaluate(EvalContext evalContext) {
-    return this;
-  }
+    @Override
+    public ListValue evaluate(EvalContext evalContext) {
+        return this;
+    }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 
-  public Object getListHolder() {
-    return listHolder;
-  }
+    public Object getListHolder() {
+        return listHolder;
+    }
 
-  public Object getArrayHolder() {
-    return arrayHolder;
-  }
+    public Object getArrayHolder() {
+        return arrayHolder;
+    }
 
-  public Class<?> getArrayType() {
-    return arrayType;
-  }
+    public Class<?> getArrayType() {
+        return arrayType;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/MapValue.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/MapValue.java
index 05778531c82..8db464073c2 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/MapValue.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/MapValue.java
@@ -19,141 +19,141 @@
  * Allows wrapping of {@linkplain Map} instances.
  */
 public final class MapValue implements CollectionValue<Object>, ValueExpression<MapValue> {
-  private static final Logger log = LoggerFactory.getLogger(MapValue.class);
+    private static final Logger log = LoggerFactory.getLogger(MapValue.class);
 
-  public static final class Entry {
-    final Value<?> key;
-    final Value<?> value;
+    public static final class Entry {
+        final Value<?> key;
+        final Value<?> value;
 
-    public Entry(Value<?> key, Value<?> value) {
-      this.key = key;
-      this.value = value;
+        public Entry(Value<?> key, Value<?> value) {
+            this.key = key;
+            this.value = value;
+        }
     }
-  }
 
-  private final Object mapHolder;
+    private final Object mapHolder;
 
-  public MapValue(Object object) {
-    if (object instanceof Map) {
-      mapHolder = object;
-    } else if (object == null || object == Values.NULL_OBJECT) {
-      mapHolder = Value.nullValue();
-    } else {
-      mapHolder = Value.undefinedValue();
+    public MapValue(Object object) {
+        if (object instanceof Map) {
+            mapHolder = object;
+        } else if (object == null || object == Values.NULL_OBJECT) {
+            mapHolder = Value.nullValue();
+        } else {
+            mapHolder = Value.undefinedValue();
+        }
     }
-  }
-
-  public boolean isEmpty() {
-    if (mapHolder instanceof Map) {
-      if (WellKnownClasses.isSafe((Map<?, ?>) mapHolder)) {
-        return ((Map<?, ?>) mapHolder).isEmpty();
-      }
-      throw new UnsupportedOperationException(
-          "Unsupported Map class: " + mapHolder.getClass().getTypeName());
-    } else if (mapHolder instanceof Value) {
-      Value<?> val = (Value<?>) mapHolder;
-      return val.isNull() || val.isUndefined();
+
+    public boolean isEmpty() {
+        if (mapHolder instanceof Map) {
+            if (WellKnownClasses.isSafe((Map<?, ?>) mapHolder)) {
+                return ((Map<?, ?>) mapHolder).isEmpty();
+            }
+            throw new UnsupportedOperationException(
+                    "Unsupported Map class: " + mapHolder.getClass().getTypeName());
+        } else if (mapHolder instanceof Value) {
+            Value<?> val = (Value<?>) mapHolder;
+            return val.isNull() || val.isUndefined();
+        }
+        return true;
     }
-    return true;
-  }
-
-  public int count() {
-    if (mapHolder instanceof Map) {
-      if (WellKnownClasses.isSafe((Map<?, ?>) mapHolder)) {
-        return ((Map<?, ?>) mapHolder).size();
-      }
-      throw new UnsupportedOperationException(
-          "Unsupported Map class: " + mapHolder.getClass().getTypeName());
-    } else if (mapHolder == Value.nullValue()) {
-      return 0;
+
+    public int count() {
+        if (mapHolder instanceof Map) {
+            if (WellKnownClasses.isSafe((Map<?, ?>) mapHolder)) {
+                return ((Map<?, ?>) mapHolder).size();
+            }
+            throw new UnsupportedOperationException(
+                    "Unsupported Map class: " + mapHolder.getClass().getTypeName());
+        } else if (mapHolder == Value.nullValue()) {
+            return 0;
+        }
+        return -1;
     }
-    return -1;
-  }
-
-  public Set<Value<?>> getKeys() {
-    if (mapHolder instanceof Map) {
-      if (WellKnownClasses.isSafe((Map<?, ?>) mapHolder)) {
-        Map<?, ?> map = (Map<?, ?>) mapHolder;
-        return map.keySet().stream()
-            .map(obj -> Value.of(obj, ValueType.OBJECT))
-            .collect(Collectors.toSet());
-      }
-      throw new UnsupportedOperationException(
-          "Unsupported Map class: " + mapHolder.getClass().getTypeName());
+
+    public Set<Value<?>> getKeys() {
+        if (mapHolder instanceof Map) {
+            if (WellKnownClasses.isSafe((Map<?, ?>) mapHolder)) {
+                Map<?, ?> map = (Map<?, ?>) mapHolder;
+                return map.keySet().stream()
+                        .map(obj -> Value.of(obj, ValueType.OBJECT))
+                        .collect(Collectors.toSet());
+            }
+            throw new UnsupportedOperationException(
+                    "Unsupported Map class: " + mapHolder.getClass().getTypeName());
+        }
+        log.warn("{} is not a map", mapHolder);
+        return Collections.singleton(Value.undefinedValue());
     }
-    log.warn("{} is not a map", mapHolder);
-    return Collections.singleton(Value.undefinedValue());
-  }
 
-  public Value<?> get(Object key) {
-    if (key == Value.undefinedValue() || key == Values.UNDEFINED_OBJECT) {
-      return Value.undefinedValue();
+    public Value<?> get(Object key) {
+        if (key == Value.undefinedValue() || key == Values.UNDEFINED_OBJECT) {
+            return Value.undefinedValue();
+        }
+        if (key == null || key == Value.nullValue() || key == Values.NULL_OBJECT) {
+            return Value.nullValue();
+        }
+
+        if (mapHolder instanceof Map) {
+            if (WellKnownClasses.isSafe((Map<?, ?>) mapHolder)) {
+                Map<?, ?> map = (Map<?, ?>) mapHolder;
+                key = key instanceof Value ? ((Value<?>) key).getValue() : key;
+                Object value = map.get(key);
+                return value != null ? Value.of(value, ValueType.OBJECT) : Value.nullValue();
+            }
+            throw new UnsupportedOperationException(
+                    "Unsupported Map class: " + mapHolder.getClass().getTypeName());
+        }
+        // the result will be either Value.nullValue() or Value.undefinedValue() depending on the holder
+        // value
+        return (Value<?>) mapHolder;
     }
-    if (key == null || key == Value.nullValue() || key == Values.NULL_OBJECT) {
-      return Value.nullValue();
+
+    @Override
+    public boolean contains(Value<?> val) {
+        if (mapHolder instanceof Map) {
+            if (WellKnownClasses.isSafe((Map<?, ?>) mapHolder)) {
+                Map<?, ?> map = (Map<?, ?>) mapHolder;
+                if (val == null || val.isNull()) {
+                    return map.containsKey(null);
+                }
+                if (WellKnownClasses.isEqualsSafe(val.getValue().getClass())) {
+                    return map.containsKey(val.getValue());
+                }
+                throw new UnsupportedOperationException(
+                        "Unsupported key class: " + val.getValue().getClass().getTypeName());
+            }
+            throw new UnsupportedOperationException(
+                    "Unsupported Map class: " + mapHolder.getClass().getTypeName());
+        }
+        return false;
     }
 
-    if (mapHolder instanceof Map) {
-      if (WellKnownClasses.isSafe((Map<?, ?>) mapHolder)) {
-        Map<?, ?> map = (Map<?, ?>) mapHolder;
-        key = key instanceof Value ? ((Value<?>) key).getValue() : key;
-        Object value = map.get(key);
-        return value != null ? Value.of(value, ValueType.OBJECT) : Value.nullValue();
-      }
-      throw new UnsupportedOperationException(
-          "Unsupported Map class: " + mapHolder.getClass().getTypeName());
+    @Override
+    public boolean isNull() {
+        return mapHolder == null || (mapHolder instanceof Value && ((Value<?>) mapHolder).isNull());
     }
-    // the result will be either Value.nullValue() or Value.undefinedValue() depending on the holder
-    // value
-    return (Value<?>) mapHolder;
-  }
-
-  @Override
-  public boolean contains(Value<?> val) {
-    if (mapHolder instanceof Map) {
-      if (WellKnownClasses.isSafe((Map<?, ?>) mapHolder)) {
-        Map<?, ?> map = (Map<?, ?>) mapHolder;
-        if (val == null || val.isNull()) {
-          return map.containsKey(null);
-        }
-        if (WellKnownClasses.isEqualsSafe(val.getValue().getClass())) {
-          return map.containsKey(val.getValue());
-        }
-        throw new UnsupportedOperationException(
-            "Unsupported key class: " + val.getValue().getClass().getTypeName());
-      }
-      throw new UnsupportedOperationException(
-          "Unsupported Map class: " + mapHolder.getClass().getTypeName());
+
+    @Override
+    public boolean isUndefined() {
+        return mapHolder instanceof Value && ((Value<?>) mapHolder).isUndefined();
+    }
+
+    @Override
+    public Object getValue() {
+        return mapHolder;
+    }
+
+    @Override
+    public MapValue evaluate(EvalContext evalContext) {
+        return this;
+    }
+
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
+
+    public Object getMapHolder() {
+        return mapHolder;
     }
-    return false;
-  }
-
-  @Override
-  public boolean isNull() {
-    return mapHolder == null || (mapHolder instanceof Value && ((Value<?>) mapHolder).isNull());
-  }
-
-  @Override
-  public boolean isUndefined() {
-    return mapHolder instanceof Value && ((Value<?>) mapHolder).isUndefined();
-  }
-
-  @Override
-  public Object getValue() {
-    return mapHolder;
-  }
-
-  @Override
-  public MapValue evaluate(EvalContext evalContext) {
-    return this;
-  }
-
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
-
-  public Object getMapHolder() {
-    return mapHolder;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/NullValue.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/NullValue.java
index 3db3ba5c5e7..c7925f58c03 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/NullValue.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/NullValue.java
@@ -8,34 +8,34 @@
 
 /** A value represention {@literal null} */
 public final class NullValue extends Literal<Object> {
-  public static final NullValue INSTANCE = new NullValue();
-
-  private NullValue() {
-    super(Values.NULL_OBJECT, ValueType.OBJECT);
-  }
-
-  @SuppressWarnings("unchecked")
-  public static <T> Value<T> instance() {
-    return (Value<T>) INSTANCE;
-  }
-
-  @Override
-  public boolean isUndefined() {
-    return false;
-  }
-
-  @Override
-  public boolean isNull() {
-    return true;
-  }
-
-  @Override
-  public String toString() {
-    return "null";
-  }
-
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    public static final NullValue INSTANCE = new NullValue();
+
+    private NullValue() {
+        super(Values.NULL_OBJECT, ValueType.OBJECT);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> Value<T> instance() {
+        return (Value<T>) INSTANCE;
+    }
+
+    @Override
+    public boolean isUndefined() {
+        return false;
+    }
+
+    @Override
+    public boolean isNull() {
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "null";
+    }
+
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/NumericValue.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/NumericValue.java
index 9ff3f2d4ac6..8978a42c72d 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/NumericValue.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/NumericValue.java
@@ -6,31 +6,31 @@
 
 /** A numeric {@linkplain com.datadog.debugger.el.Value} */
 public final class NumericValue extends Literal<Number> {
-  public NumericValue(Number value, ValueType type) {
-    super(value, type);
-  }
-
-  private static Number widen(Number value) {
-    if (value instanceof Integer || value instanceof Byte || value instanceof Short) {
-      return value.longValue();
+    public NumericValue(Number value, ValueType type) {
+        super(value, type);
     }
-    if (value instanceof Float) {
-      return value.doubleValue();
+
+    private static Number widen(Number value) {
+        if (value instanceof Integer || value instanceof Byte || value instanceof Short) {
+            return value.longValue();
+        }
+        if (value instanceof Float) {
+            return value.doubleValue();
+        }
+        return value;
     }
-    return value;
-  }
 
-  public Number getWidenValue() {
-    return widen(getValue());
-  }
+    public Number getWidenValue() {
+        return widen(getValue());
+    }
 
-  @Override
-  public String toString() {
-    return "NumericLiteral{" + "value=" + value + '}';
-  }
+    @Override
+    public String toString() {
+        return "NumericLiteral{" + "value=" + value + '}';
+    }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/ObjectValue.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/ObjectValue.java
index 21d67ab9415..ceca3e127d0 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/ObjectValue.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/ObjectValue.java
@@ -10,19 +10,19 @@
  * other value types: boolean, string, number, collection, null, undefined
  */
 public final class ObjectValue extends Literal<Object> {
-  public static final ObjectValue THIS = new ObjectValue(Values.THIS_OBJECT);
+    public static final ObjectValue THIS = new ObjectValue(Values.THIS_OBJECT);
 
-  public ObjectValue(Object value) {
-    super(value == null ? Values.NULL_OBJECT : value, ValueType.OBJECT);
-  }
+    public ObjectValue(Object value) {
+        super(value == null ? Values.NULL_OBJECT : value, ValueType.OBJECT);
+    }
 
-  @Override
-  public String toString() {
-    return "ObjectLiteral{" + "value=" + value + '}';
-  }
+    @Override
+    public String toString() {
+        return "ObjectLiteral{" + "value=" + value + '}';
+    }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/SetValue.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/SetValue.java
index 9654c1b99c8..c5ef46c3f55 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/SetValue.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/SetValue.java
@@ -12,115 +12,115 @@
 
 public class SetValue implements CollectionValue<Object>, ValueExpression<SetValue> {
 
-  private final Object setHolder;
+    private final Object setHolder;
 
-  public SetValue(Object object) {
-    if (object instanceof Set) {
-      setHolder = object;
-    } else if (object == null || object == Values.NULL_OBJECT) {
-      setHolder = Value.nullValue();
-    } else {
-      setHolder = Value.undefinedValue();
+    public SetValue(Object object) {
+        if (object instanceof Set) {
+            setHolder = object;
+        } else if (object == null || object == Values.NULL_OBJECT) {
+            setHolder = Value.nullValue();
+        } else {
+            setHolder = Value.undefinedValue();
+        }
     }
-  }
-
-  @Override
-  public SetValue evaluate(EvalContext evalContext) {
-    return this;
-  }
 
-  @Override
-  public Object getValue() {
-    return setHolder;
-  }
-
-  @Override
-  public boolean isEmpty() {
-    if (setHolder instanceof Set) {
-      if (WellKnownClasses.isSafe((Collection<?>) setHolder)) {
-        return ((Set<?>) setHolder).isEmpty();
-      }
-      throw new UnsupportedOperationException(
-          "Unsupported Set class: " + setHolder.getClass().getTypeName());
-    } else if (setHolder instanceof Value) {
-      Value<?> val = (Value<?>) setHolder;
-      return val.isNull() || val.isUndefined();
+    @Override
+    public SetValue evaluate(EvalContext evalContext) {
+        return this;
     }
-    return true;
-  }
 
-  @Override
-  public int count() {
-    if (setHolder instanceof Set) {
-      if (WellKnownClasses.isSafe((Collection<?>) setHolder)) {
-        return ((Set<?>) setHolder).size();
-      }
-      throw new UnsupportedOperationException(
-          "Unsupported Set class: " + setHolder.getClass().getTypeName());
-    } else if (setHolder == Value.nullValue()) {
-      return 0;
+    @Override
+    public Object getValue() {
+        return setHolder;
     }
-    return -1;
-  }
 
-  @Override
-  public Value<?> get(Object key) {
-    if (key == Value.undefinedValue() || key == Values.UNDEFINED_OBJECT) {
-      return Value.undefinedValue();
-    }
-    if (key == null || key == Value.nullValue() || key == Values.NULL_OBJECT) {
-      return Value.nullValue();
+    @Override
+    public boolean isEmpty() {
+        if (setHolder instanceof Set) {
+            if (WellKnownClasses.isSafe((Collection<?>) setHolder)) {
+                return ((Set<?>) setHolder).isEmpty();
+            }
+            throw new UnsupportedOperationException(
+                    "Unsupported Set class: " + setHolder.getClass().getTypeName());
+        } else if (setHolder instanceof Value) {
+            Value<?> val = (Value<?>) setHolder;
+            return val.isNull() || val.isUndefined();
+        }
+        return true;
     }
 
-    if (setHolder instanceof Set) {
-      if (WellKnownClasses.isSafe((Collection<?>) setHolder)) {
-        Set<?> set = (Set<?>) setHolder;
-        key = key instanceof Value ? ((Value<?>) key).getValue() : key;
-        return Value.of(set.contains(key), ValueType.BOOLEAN);
-      }
-      throw new UnsupportedOperationException(
-          "Unsupported Set class: " + setHolder.getClass().getTypeName());
+    @Override
+    public int count() {
+        if (setHolder instanceof Set) {
+            if (WellKnownClasses.isSafe((Collection<?>) setHolder)) {
+                return ((Set<?>) setHolder).size();
+            }
+            throw new UnsupportedOperationException(
+                    "Unsupported Set class: " + setHolder.getClass().getTypeName());
+        } else if (setHolder == Value.nullValue()) {
+            return 0;
+        }
+        return -1;
     }
-    // the result will be either Value.nullValue() or Value.undefinedValue() depending on the holder
-    // value
-    return (Value<?>) setHolder;
-  }
 
-  @Override
-  public boolean contains(Value<?> val) {
-    if (setHolder instanceof Set) {
-      if (WellKnownClasses.isSafe((Collection<?>) setHolder)) {
-        if (val == null || val.isNull()) {
-          return ((Set<?>) setHolder).contains(null);
+    @Override
+    public Value<?> get(Object key) {
+        if (key == Value.undefinedValue() || key == Values.UNDEFINED_OBJECT) {
+            return Value.undefinedValue();
         }
-        if (WellKnownClasses.isEqualsSafe(val.getValue().getClass())) {
-          return ((Set<?>) setHolder).contains(val.getValue());
+        if (key == null || key == Value.nullValue() || key == Values.NULL_OBJECT) {
+            return Value.nullValue();
+        }
+
+        if (setHolder instanceof Set) {
+            if (WellKnownClasses.isSafe((Collection<?>) setHolder)) {
+                Set<?> set = (Set<?>) setHolder;
+                key = key instanceof Value ? ((Value<?>) key).getValue() : key;
+                return Value.of(set.contains(key), ValueType.BOOLEAN);
+            }
+            throw new UnsupportedOperationException(
+                    "Unsupported Set class: " + setHolder.getClass().getTypeName());
         }
-        throw new UnsupportedOperationException(
-            "Unsupported value class: " + val.getValue().getClass().getTypeName());
-      }
-      throw new UnsupportedOperationException(
-          "Unsupported Set class: " + setHolder.getClass().getTypeName());
+        // the result will be either Value.nullValue() or Value.undefinedValue() depending on the holder
+        // value
+        return (Value<?>) setHolder;
     }
-    return false;
-  }
 
-  @Override
-  public boolean isNull() {
-    return setHolder == null || (setHolder instanceof Value && ((Value<?>) setHolder).isNull());
-  }
+    @Override
+    public boolean contains(Value<?> val) {
+        if (setHolder instanceof Set) {
+            if (WellKnownClasses.isSafe((Collection<?>) setHolder)) {
+                if (val == null || val.isNull()) {
+                    return ((Set<?>) setHolder).contains(null);
+                }
+                if (WellKnownClasses.isEqualsSafe(val.getValue().getClass())) {
+                    return ((Set<?>) setHolder).contains(val.getValue());
+                }
+                throw new UnsupportedOperationException(
+                        "Unsupported value class: " + val.getValue().getClass().getTypeName());
+            }
+            throw new UnsupportedOperationException(
+                    "Unsupported Set class: " + setHolder.getClass().getTypeName());
+        }
+        return false;
+    }
 
-  @Override
-  public boolean isUndefined() {
-    return setHolder instanceof Value && ((Value<?>) setHolder).isUndefined();
-  }
+    @Override
+    public boolean isNull() {
+        return setHolder == null || (setHolder instanceof Value && ((Value<?>) setHolder).isNull());
+    }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public boolean isUndefined() {
+        return setHolder instanceof Value && ((Value<?>) setHolder).isUndefined();
+    }
 
-  public Object getSetHolder() {
-    return setHolder;
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
+
+    public Object getSetHolder() {
+        return setHolder;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/StringValue.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/StringValue.java
index b19db79bc85..8b6507a1616 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/StringValue.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/StringValue.java
@@ -6,30 +6,30 @@
 
 /** A string {@linkplain com.datadog.debugger.el.Value} */
 public final class StringValue extends Literal<String> {
-  public StringValue(String value) {
-    super(value, ValueType.OBJECT);
-  }
+    public StringValue(String value) {
+        super(value, ValueType.OBJECT);
+    }
 
-  public boolean isEmpty() {
-    return value != null && value.isEmpty();
-  }
+    public boolean isEmpty() {
+        return value != null && value.isEmpty();
+    }
 
-  public int length() {
-    return isNull() ? -1 : value.length();
-  }
+    public int length() {
+        return isNull() ? -1 : value.length();
+    }
 
-  @Override
-  public boolean isUndefined() {
-    return false;
-  }
+    @Override
+    public boolean isUndefined() {
+        return false;
+    }
 
-  @Override
-  public String toString() {
-    return "StringLiteral{" + "value=" + value + '}';
-  }
+    @Override
+    public String toString() {
+        return "StringLiteral{" + "value=" + value + '}';
+    }
 
-  @Override
-  public <R> R accept(Visitor<R> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <R> R accept(Visitor<R> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/UndefinedValue.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/UndefinedValue.java
index 51291fba2fc..e03197b6822 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/UndefinedValue.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/UndefinedValue.java
@@ -13,29 +13,29 @@
  * computation.
  */
 public final class UndefinedValue extends Literal<Object> {
-  public static final UndefinedValue INSTANCE = new UndefinedValue();
+    public static final UndefinedValue INSTANCE = new UndefinedValue();
 
-  private UndefinedValue() {
-    super(Values.UNDEFINED_OBJECT, ValueType.OBJECT);
-  }
+    private UndefinedValue() {
+        super(Values.UNDEFINED_OBJECT, ValueType.OBJECT);
+    }
 
-  @SuppressWarnings("unchecked")
-  public static <T> Value<T> instance() {
-    return (Value<T>) INSTANCE;
-  }
+    @SuppressWarnings("unchecked")
+    public static <T> Value<T> instance() {
+        return (Value<T>) INSTANCE;
+    }
 
-  @Override
-  public boolean isUndefined() {
-    return true;
-  }
+    @Override
+    public boolean isUndefined() {
+        return true;
+    }
 
-  @Override
-  public boolean isNull() {
-    return false;
-  }
+    @Override
+    public boolean isNull() {
+        return false;
+    }
 
-  @Override
-  public String toString() {
-    return "UNDEFINED";
-  }
+    @Override
+    public String toString() {
+        return "UNDEFINED";
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/BooleanValueExpressionAdapterTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/BooleanValueExpressionAdapterTest.java
index d5e1a1df6e6..24141f69dcc 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/BooleanValueExpressionAdapterTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/BooleanValueExpressionAdapterTest.java
@@ -12,36 +12,36 @@
 
 class BooleanValueExpressionAdapterTest {
 
-  @Test
-  public void testLiteral() {
-    {
-      BooleanValueExpressionAdapter booleanValueExpressionAdapter =
-          new BooleanValueExpressionAdapter(BooleanExpression.TRUE);
-      BooleanValue resultValue = booleanValueExpressionAdapter.evaluate(null);
-      assertTrue(resultValue.getValue());
+    @Test
+    public void testLiteral() {
+        {
+            BooleanValueExpressionAdapter booleanValueExpressionAdapter =
+                    new BooleanValueExpressionAdapter(BooleanExpression.TRUE);
+            BooleanValue resultValue = booleanValueExpressionAdapter.evaluate(null);
+            assertTrue(resultValue.getValue());
+        }
+        {
+            BooleanValueExpressionAdapter booleanValueExpressionAdapter =
+                    new BooleanValueExpressionAdapter(BooleanExpression.FALSE);
+            BooleanValue resultValue = booleanValueExpressionAdapter.evaluate(null);
+            assertFalse(resultValue.getValue());
+        }
     }
-    {
-      BooleanValueExpressionAdapter booleanValueExpressionAdapter =
-          new BooleanValueExpressionAdapter(BooleanExpression.FALSE);
-      BooleanValue resultValue = booleanValueExpressionAdapter.evaluate(null);
-      assertFalse(resultValue.getValue());
-    }
-  }
 
-  @Test
-  public void testExpression() {
-    BooleanValueExpressionAdapter booleanValueExpressionAdapter =
-        new BooleanValueExpressionAdapter(DSL.eq(DSL.value(1), DSL.value(1)));
-    BooleanValue resultValue = booleanValueExpressionAdapter.evaluate(createEvalContext(this));
-    assertTrue(resultValue.getValue());
-  }
+    @Test
+    public void testExpression() {
+        BooleanValueExpressionAdapter booleanValueExpressionAdapter =
+                new BooleanValueExpressionAdapter(DSL.eq(DSL.value(1), DSL.value(1)));
+        BooleanValue resultValue = booleanValueExpressionAdapter.evaluate(createEvalContext(this));
+        assertTrue(resultValue.getValue());
+    }
 
-  @Test
-  public void testNull() {
-    BooleanValueExpressionAdapter booleanValueExpressionAdapter =
-        new BooleanValueExpressionAdapter(evalContext -> null);
-    EvaluationException ex =
-        assertThrows(EvaluationException.class, () -> booleanValueExpressionAdapter.evaluate(null));
-    assertEquals("Boolean expression returning null", ex.getMessage());
-  }
+    @Test
+    public void testNull() {
+        BooleanValueExpressionAdapter booleanValueExpressionAdapter =
+                new BooleanValueExpressionAdapter(evalContext -> null);
+        EvaluationException ex =
+                assertThrows(EvaluationException.class, () -> booleanValueExpressionAdapter.evaluate(null));
+        assertEquals("Boolean expression returning null", ex.getMessage());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/EvalContextHelper.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/EvalContextHelper.java
index e082987ed6d..9ae251ce9bc 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/EvalContextHelper.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/EvalContextHelper.java
@@ -10,57 +10,51 @@
 
 public class EvalContextHelper {
 
-  public static final Duration TEST_TIMEOUT = Duration.ofMillis(1000);
+    public static final Duration TEST_TIMEOUT = Duration.ofMillis(1000);
 
-  public static EvalContext createEvalContext(Object instance) {
-    // create a higher timeout for test to avoid flakiness
-    return new EvalContext(
-        createResolver(instance), TimeoutChecker.create(Config.get(), TEST_TIMEOUT));
-  }
-
-  // specify lower timeout to test timeout checker
-  public static EvalContext createEvalContext(Object instance, Duration timeout) {
-    return new EvalContext(createResolver(instance), TimeoutChecker.create(Config.get(), timeout));
-  }
+    public static EvalContext createEvalContext(Object instance) {
+        // create a higher timeout for test to avoid flakiness
+        return new EvalContext(createResolver(instance), TimeoutChecker.create(Config.get(), TEST_TIMEOUT));
+    }
 
-  public static ValueReferenceResolver createResolver(Object instance) {
-    CapturedContext.CapturedValue thisValue =
-        CapturedContext.CapturedValue.of("this", instance.getClass().getTypeName(), instance);
-    return new CapturedContext(new CapturedContext.CapturedValue[] {thisValue}, null, null, null);
-  }
+    // specify lower timeout to test timeout checker
+    public static EvalContext createEvalContext(Object instance, Duration timeout) {
+        return new EvalContext(createResolver(instance), TimeoutChecker.create(Config.get(), timeout));
+    }
 
-  public static ValueReferenceResolver createResolver(
-      Map<String, Object> args, Map<String, Object> locals) {
-    CapturedContext.CapturedValue[] argValues = null;
-    if (args != null) {
-      argValues = new CapturedContext.CapturedValue[args.size()];
-      fillValues(args, argValues);
+    public static ValueReferenceResolver createResolver(Object instance) {
+        CapturedContext.CapturedValue thisValue =
+                CapturedContext.CapturedValue.of("this", instance.getClass().getTypeName(), instance);
+        return new CapturedContext(new CapturedContext.CapturedValue[] {thisValue}, null, null, null);
     }
-    CapturedContext.CapturedValue[] localValues = null;
-    if (locals != null) {
-      localValues = new CapturedContext.CapturedValue[locals.size()];
-      fillValues(locals, localValues);
+
+    public static ValueReferenceResolver createResolver(Map<String, Object> args, Map<String, Object> locals) {
+        CapturedContext.CapturedValue[] argValues = null;
+        if (args != null) {
+            argValues = new CapturedContext.CapturedValue[args.size()];
+            fillValues(args, argValues);
+        }
+        CapturedContext.CapturedValue[] localValues = null;
+        if (locals != null) {
+            localValues = new CapturedContext.CapturedValue[locals.size()];
+            fillValues(locals, localValues);
+        }
+        return new CapturedContext(argValues, localValues, null, null);
     }
-    return new CapturedContext(argValues, localValues, null, null);
-  }
 
-  private static void fillValues(
-      Map<String, Object> fields, CapturedContext.CapturedValue[] fieldValues) {
-    int index = 0;
-    for (Map.Entry<String, Object> entry : fields.entrySet()) {
-      Object value = entry.getValue();
-      if (Redaction.isRedactedKeyword(entry.getKey())) {
-        fieldValues[index++] =
-            CapturedContext.CapturedValue.redacted(
-                entry.getKey(),
-                value != null ? value.getClass().getTypeName() : Object.class.getTypeName());
-      } else {
-        fieldValues[index++] =
-            CapturedContext.CapturedValue.of(
-                entry.getKey(),
-                value != null ? value.getClass().getTypeName() : Object.class.getTypeName(),
-                value);
-      }
+    private static void fillValues(Map<String, Object> fields, CapturedContext.CapturedValue[] fieldValues) {
+        int index = 0;
+        for (Map.Entry<String, Object> entry : fields.entrySet()) {
+            Object value = entry.getValue();
+            if (Redaction.isRedactedKeyword(entry.getKey())) {
+                fieldValues[index++] = CapturedContext.CapturedValue.redacted(
+                        entry.getKey(), value != null ? value.getClass().getTypeName() : Object.class.getTypeName());
+            } else {
+                fieldValues[index++] = CapturedContext.CapturedValue.of(
+                        entry.getKey(),
+                        value != null ? value.getClass().getTypeName() : Object.class.getTypeName(),
+                        value);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ExpressionTest.java
index fe37b2e9a75..949b5efd0a5 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ExpressionTest.java
@@ -33,60 +33,55 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 class ExpressionTest {
-  @ParameterizedTest
-  @MethodSource("literalExpressions")
-  void testLiteralExpressions(Literal<?> literal, Object expectedValue) {
-    Value<?> value1 = literal.evaluate(null);
-    Value<?> value2 = literal.evaluate(new EvalContext(new CapturedContext(), null));
+    @ParameterizedTest
+    @MethodSource("literalExpressions")
+    void testLiteralExpressions(Literal<?> literal, Object expectedValue) {
+        Value<?> value1 = literal.evaluate(null);
+        Value<?> value2 = literal.evaluate(new EvalContext(new CapturedContext(), null));
 
-    assertNotNull(value1);
-    assertNotNull(value2);
-    assertEquals(value1, value2);
+        assertNotNull(value1);
+        assertNotNull(value2);
+        assertEquals(value1, value2);
 
-    assertEquals(expectedValue, value1.getValue());
-    assertEquals(expectedValue, value2.getValue());
-  }
+        assertEquals(expectedValue, value1.getValue());
+        assertEquals(expectedValue, value2.getValue());
+    }
 
-  private static Stream<Arguments> literalExpressions() {
-    return Stream.of(
-        Arguments.of(new BooleanValue(true, ValueType.BOOLEAN), true),
-        Arguments.of(new NumericValue(15.8d, ValueType.DOUBLE), 15.8d),
-        Arguments.of(new StringValue("Hello world"), "Hello world"));
-  }
+    private static Stream<Arguments> literalExpressions() {
+        return Stream.of(
+                Arguments.of(new BooleanValue(true, ValueType.BOOLEAN), true),
+                Arguments.of(new NumericValue(15.8d, ValueType.DOUBLE), 15.8d),
+                Arguments.of(new StringValue("Hello world"), "Hello world"));
+    }
 
-  @Test
-  void testPredicateExpression() {
-    StringValue string = new StringValue("Hello World");
-    StringValue emptyString = new StringValue("");
+    @Test
+    void testPredicateExpression() {
+        StringValue string = new StringValue("Hello World");
+        StringValue emptyString = new StringValue("");
 
-    EvalContext evalContext = createEvalContext(this);
-    IsEmptyExpression isEmpty1 = new IsEmptyExpression(string);
-    IsEmptyExpression isEmpty2 = new IsEmptyExpression(emptyString);
+        EvalContext evalContext = createEvalContext(this);
+        IsEmptyExpression isEmpty1 = new IsEmptyExpression(string);
+        IsEmptyExpression isEmpty2 = new IsEmptyExpression(emptyString);
 
-    assertFalse(isEmpty1.evaluate(evalContext));
-    assertTrue(isEmpty2.evaluate(evalContext));
+        assertFalse(isEmpty1.evaluate(evalContext));
+        assertTrue(isEmpty2.evaluate(evalContext));
 
-    assertTrue(not(isEmpty1).evaluate(evalContext));
-    assertTrue(or(isEmpty1, isEmpty2).evaluate(evalContext));
-    assertFalse(and(isEmpty1, isEmpty2).evaluate(evalContext));
-  }
+        assertTrue(not(isEmpty1).evaluate(evalContext));
+        assertTrue(or(isEmpty1, isEmpty2).evaluate(evalContext));
+        assertFalse(and(isEmpty1, isEmpty2).evaluate(evalContext));
+    }
 
-  @Test
-  void testPrettyPrint() {
-    assertEquals("\"foo\" == \"bar\"", print(eq(value("foo"), value("bar"))));
-    assertEquals("1 == 1", print(eq(value(1), value(1))));
-    assertEquals("1 > 1", print(gt(value(1), value(1))));
-    assertEquals("1 >= 1", print(ge(value(1), value(1))));
-    assertEquals("1 < 1", print(lt(value(1), value(1))));
-    assertEquals("1 <= 1", print(le(value(1), value(1))));
-    assertEquals(
-        "when(this.strField == \"foo\" && @duration > 0)",
-        print(
-            when(
-                and(
-                    eq(getMember(ref("this"), "strField"), value("foo")),
-                    gt(ref("@duration"), value(0))))));
-    assertEquals(
-        "len(list[idx].map)", print(len(getMember(index(ref("list"), ref("idx")), "map"))));
-  }
+    @Test
+    void testPrettyPrint() {
+        assertEquals("\"foo\" == \"bar\"", print(eq(value("foo"), value("bar"))));
+        assertEquals("1 == 1", print(eq(value(1), value(1))));
+        assertEquals("1 > 1", print(gt(value(1), value(1))));
+        assertEquals("1 >= 1", print(ge(value(1), value(1))));
+        assertEquals("1 < 1", print(lt(value(1), value(1))));
+        assertEquals("1 <= 1", print(le(value(1), value(1))));
+        assertEquals(
+                "when(this.strField == \"foo\" && @duration > 0)",
+                print(when(and(eq(getMember(ref("this"), "strField"), value("foo")), gt(ref("@duration"), value(0))))));
+        assertEquals("len(list[idx].map)", print(len(getMember(index(ref("list"), ref("idx")), "map"))));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ProbeConditionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ProbeConditionTest.java
index 50ba2590b2a..0bd041c5a93 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ProbeConditionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ProbeConditionTest.java
@@ -36,350 +36,335 @@
 import org.junit.jupiter.api.Test;
 
 public class ProbeConditionTest {
-  private static final Duration TEST_TIMEOUT = Duration.ofMillis(500);
-  // used in testExecuteCondition
-  private int field = 10;
-
-  @BeforeAll
-  static void beforeAll() {
-    // Warming up here for first call, to avoid reaching timeout when evaluating
-    Redaction.isRedactedKeyword("strList");
-    ReflectiveFieldValueResolver.getFieldAsCapturedValue(
-        ProbeConditionTest.class, new ProbeConditionTest(), "field");
-  }
-
-  @Test
-  void testExecuteCondition() throws Exception {
-    ProbeCondition probeCondition = loadFromResource("/test_conditional_01.json");
-    class Obj1 {
-      Collection<String> tags = Arrays.asList("hello", "world", "ko");
-      private int field = 10;
-      List<String> field2 = new ArrayList<>();
+    private static final Duration TEST_TIMEOUT = Duration.ofMillis(500);
+    // used in testExecuteCondition
+    private int field = 10;
+
+    @BeforeAll
+    static void beforeAll() {
+        // Warming up here for first call, to avoid reaching timeout when evaluating
+        Redaction.isRedactedKeyword("strList");
+        ReflectiveFieldValueResolver.getFieldAsCapturedValue(
+                ProbeConditionTest.class, new ProbeConditionTest(), "field");
     }
-    ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj1());
 
-    assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
+    @Test
+    void testExecuteCondition() throws Exception {
+        ProbeCondition probeCondition = loadFromResource("/test_conditional_01.json");
+        class Obj1 {
+            Collection<String> tags = Arrays.asList("hello", "world", "ko");
+            private int field = 10;
+            List<String> field2 = new ArrayList<>();
+        }
+        ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj1());
+
+        assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
 
-    class Obj2 {
-      Collection<String> tags = Arrays.asList("hey", "world", "ko");
-      private int field = 10;
-      List<String> field2 = new ArrayList<>();
+        class Obj2 {
+            Collection<String> tags = Arrays.asList("hey", "world", "ko");
+            private int field = 10;
+            List<String> field2 = new ArrayList<>();
+        }
+        ValueReferenceResolver ctx2 = EvalContextHelper.createResolver(new Obj2());
+        assertFalse(probeCondition.execute(ctx2, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
     }
-    ValueReferenceResolver ctx2 = EvalContextHelper.createResolver(new Obj2());
-    assertFalse(probeCondition.execute(ctx2, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
-  }
-
-  @Test
-  void testGetMember() throws Exception {
-    ProbeCondition probeCondition = loadFromResource("/test_conditional_04.json");
-    class Obj {
-      Container container = new Container("hello");
+
+    @Test
+    void testGetMember() throws Exception {
+        ProbeCondition probeCondition = loadFromResource("/test_conditional_04.json");
+        class Obj {
+            Container container = new Container("hello");
+        }
+        ValueReferenceResolver ctx = EvalContextHelper.createResolver(
+                singletonMap("this", new Obj()), singletonMap("container", new Container("world")));
+
+        assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
+        class Obj2 {
+            Container obj = new Container("hello");
+        }
+        ValueReferenceResolver ctx2 = EvalContextHelper.createResolver(
+                singletonMap("this", new Obj2()), singletonMap("container", new Container("world")));
+        RuntimeException runtimeException = assertThrows(
+                RuntimeException.class,
+                () -> probeCondition.execute(ctx2, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
+        assertEquals("Cannot dereference field: container", runtimeException.getMessage());
     }
-    ValueReferenceResolver ctx =
-        EvalContextHelper.createResolver(
-            singletonMap("this", new Obj()), singletonMap("container", new Container("world")));
 
-    assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
-    class Obj2 {
-      Container obj = new Container("hello");
+    @Test
+    void testComparisonOperators() throws Exception {
+        ProbeCondition probeCondition = loadFromResource("/test_conditional_05.json");
+        class Obj {
+            int intField1 = 42;
+            String strField = "foo";
+        }
+        ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj());
+        assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
+    }
+
+    @Test
+    void testNullLiteral() throws Exception {
+        ProbeCondition probeCondition = loadFromResource("/test_conditional_06.json");
+        class Obj {
+            Object objField = new Object();
+        }
+        ValueReferenceResolver ctx =
+                EvalContextHelper.createResolver(singletonMap("this", new Obj()), singletonMap("nullField", null));
+        assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
     }
-    ValueReferenceResolver ctx2 =
-        EvalContextHelper.createResolver(
-            singletonMap("this", new Obj2()), singletonMap("container", new Container("world")));
-    RuntimeException runtimeException =
-        assertThrows(
-            RuntimeException.class,
-            () -> probeCondition.execute(ctx2, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
-    assertEquals("Cannot dereference field: container", runtimeException.getMessage());
-  }
-
-  @Test
-  void testComparisonOperators() throws Exception {
-    ProbeCondition probeCondition = loadFromResource("/test_conditional_05.json");
-    class Obj {
-      int intField1 = 42;
-      String strField = "foo";
+
+    @Test
+    void testIndex() throws Exception {
+        ProbeCondition probeCondition = loadFromResource("/test_conditional_07.json");
+        Map<String, String> strMap = new HashMap<>();
+        class Obj {
+            int[] intArray = new int[] {1, 1, 1};
+            String[] strArray = new String[] {"foo", "bar"};
+            Map<String, String> strMap = new HashMap<>();
+
+            {
+                strMap.put("foo", "bar");
+                strMap.put("bar", "foobar");
+            }
+
+            int idx = 1;
+        }
+        ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj());
+        assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
     }
-    ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj());
-    assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
-  }
-
-  @Test
-  void testNullLiteral() throws Exception {
-    ProbeCondition probeCondition = loadFromResource("/test_conditional_06.json");
-    class Obj {
-      Object objField = new Object();
+
+    @Test
+    void testStringOperation() throws Exception {
+        ProbeCondition probeCondition = loadFromResource("/test_conditional_08.json");
+        class Obj {
+            String strField = "foobar";
+        }
+        ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj());
+        assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
     }
-    ValueReferenceResolver ctx =
-        EvalContextHelper.createResolver(
-            singletonMap("this", new Obj()), singletonMap("nullField", null));
-    assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
-  }
-
-  @Test
-  void testIndex() throws Exception {
-    ProbeCondition probeCondition = loadFromResource("/test_conditional_07.json");
-    Map<String, String> strMap = new HashMap<>();
-    class Obj {
-      int[] intArray = new int[] {1, 1, 1};
-      String[] strArray = new String[] {"foo", "bar"};
-      Map<String, String> strMap = new HashMap<>();
-
-      {
-        strMap.put("foo", "bar");
-        strMap.put("bar", "foobar");
-      }
-
-      int idx = 1;
+
+    @Test
+    void testJsonAdapter() throws IOException {
+        Moshi moshi = new Moshi.Builder()
+                .add(ProbeCondition.class, new ProbeCondition.ProbeConditionJsonAdapter())
+                .build();
+        JsonAdapter<ProbeCondition> jsonAdapter = moshi.adapter(ProbeCondition.class);
+        assertNull(jsonAdapter.fromJson("null"));
+        assertEquals(jsonAdapter.toJson(null), "null");
+        assertEquals("{\"dsl\":\"\"}", jsonAdapter.toJson(ProbeCondition.NONE));
     }
-    ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj());
-    assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
-  }
-
-  @Test
-  void testStringOperation() throws Exception {
-    ProbeCondition probeCondition = loadFromResource("/test_conditional_08.json");
-    class Obj {
-      String strField = "foobar";
+
+    @Test
+    void testJsonParsing() throws IOException {
+        ProbeCondition probeCondition = loadFromResource("/test_conditional_02.json");
+        class Obj {
+            Collection<String> vets = Arrays.asList("vet1", "vet2", "vet3");
+        }
+        ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj());
+
+        // the condition checks if length of vets > 2
+        assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
     }
-    ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj());
-    assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
-  }
-
-  @Test
-  void testJsonAdapter() throws IOException {
-    Moshi moshi =
-        new Moshi.Builder()
-            .add(ProbeCondition.class, new ProbeCondition.ProbeConditionJsonAdapter())
-            .build();
-    JsonAdapter<ProbeCondition> jsonAdapter = moshi.adapter(ProbeCondition.class);
-    assertNull(jsonAdapter.fromJson("null"));
-    assertEquals(jsonAdapter.toJson(null), "null");
-    assertEquals("{\"dsl\":\"\"}", jsonAdapter.toJson(ProbeCondition.NONE));
-  }
-
-  @Test
-  void testJsonParsing() throws IOException {
-    ProbeCondition probeCondition = loadFromResource("/test_conditional_02.json");
-    class Obj {
-      Collection<String> vets = Arrays.asList("vet1", "vet2", "vet3");
+
+    @Test
+    void testEquals() throws IOException {
+        ProbeCondition probeCondition1 = loadFromResource("/test_conditional_01.json");
+        ProbeCondition probeCondition2 = loadFromResource("/test_conditional_01.json");
+
+        assertEquals(probeCondition1, probeCondition1);
+        assertEquals(probeCondition1, probeCondition2);
+        assertNotEquals(probeCondition1, ProbeCondition.NONE);
+        assertNotEquals(probeCondition1, null);
     }
-    ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj());
-
-    // the condition checks if length of vets > 2
-    assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
-  }
-
-  @Test
-  void testEquals() throws IOException {
-    ProbeCondition probeCondition1 = loadFromResource("/test_conditional_01.json");
-    ProbeCondition probeCondition2 = loadFromResource("/test_conditional_01.json");
-
-    assertEquals(probeCondition1, probeCondition1);
-    assertEquals(probeCondition1, probeCondition2);
-    assertNotEquals(probeCondition1, ProbeCondition.NONE);
-    assertNotEquals(probeCondition1, null);
-  }
-
-  @Test
-  void testHashCode() throws IOException {
-    ProbeCondition probeCondition1 = loadFromResource("/test_conditional_01.json");
-    ProbeCondition probeCondition2 = loadFromResource("/test_conditional_01.json");
-
-    Map<ProbeCondition, Boolean> map = new HashMap<>();
-    map.put(probeCondition1, true);
-
-    assertTrue(map.get(probeCondition2));
-    assertNull(map.get(ProbeCondition.NONE));
-  }
-
-  @Test
-  void testIncorrectSyntax() {
-    UnsupportedOperationException ex =
-        assertThrows(
-            UnsupportedOperationException.class,
-            () -> loadFromResource("/test_conditional_03_error.json"));
-    assertEquals("Unsupported operation 'gte'", ex.getMessage());
-  }
-
-  @Test
-  void redaction() throws IOException {
-    ProbeCondition probeCondition = loadFromResource("/test_conditional_09.json");
-    Map<String, Object> args = new HashMap<>();
-    args.put("password", "secret123");
-    ValueReferenceResolver ctx = EvalContextHelper.createResolver(args, null);
-    EvaluationException evaluationException =
-        assertThrows(
-            EvaluationException.class,
-            () -> probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
-    assertEquals(
-        "Could not evaluate the expression because 'password' was redacted",
-        evaluationException.getMessage());
-  }
-
-  @Test
-  void primitives() throws IOException {
-    ProbeCondition probeCondition = loadFromResource("/test_conditional_10.json");
-    Map<String, Object> args = new HashMap<>();
-    args.put("uuid", UUID.fromString("a3cbe9e7-edd3-4bef-8e5b-59bfcb04cf91"));
-    args.put("duration", Duration.ofSeconds(42));
-    args.put("clazz", "foo".getClass());
-    args.put("now", new Date(1700000000000L)); // 2023-11-14T00:00:00Z
-    ValueReferenceResolver ctx = EvalContextHelper.createResolver(args, null);
-    assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
-  }
-
-  @Test
-  void testBooleanOperation() throws Exception {
-    ProbeCondition probeCondition = loadFromResource("/test_conditional_11.json");
-    class Obj {
-      String strField = "foobar";
-      String emptyStr = "";
-      List<String> emptyList = new ArrayList<>();
-      Map<String, String> emptyMap = new HashMap<>();
-      Set<String> emptySet = new HashSet<>();
-      Object[] emptyArray = new Object[0];
+
+    @Test
+    void testHashCode() throws IOException {
+        ProbeCondition probeCondition1 = loadFromResource("/test_conditional_01.json");
+        ProbeCondition probeCondition2 = loadFromResource("/test_conditional_01.json");
+
+        Map<ProbeCondition, Boolean> map = new HashMap<>();
+        map.put(probeCondition1, true);
+
+        assertTrue(map.get(probeCondition2));
+        assertNull(map.get(ProbeCondition.NONE));
     }
-    ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj());
-    assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
-  }
-
-  @Test
-  void testLiterals() throws Exception {
-    ProbeCondition probeCondition = loadFromResource("/test_conditional_13.json");
-    class Obj {
-      boolean boolVal = true;
-      int intVal = 1;
-      long longVal = 1L;
-      double doubleVal = 1.0;
-      String strVal = "foo";
-      Object objVal = null;
-      char charVal = 'a';
+
+    @Test
+    void testIncorrectSyntax() {
+        UnsupportedOperationException ex = assertThrows(
+                UnsupportedOperationException.class, () -> loadFromResource("/test_conditional_03_error.json"));
+        assertEquals("Unsupported operation 'gte'", ex.getMessage());
     }
-    ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj());
-    assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
-  }
-
-  @Test
-  void testTimeoutAndLenCount() throws Exception {
-    ProbeCondition probeCondition = loadFromResource("/test_conditional_14.json");
-    class Obj {
-      int[] intArray = new int[] {1, 1, 1};
-      String[] strArray = new String[] {"foo", "bar"};
-      List<String> largeList = new ArrayList<>();
-
-      {
-        for (int i = 0; i < 1_000; i++) {
-          largeList.add("foobar" + i);
+
+    @Test
+    void redaction() throws IOException {
+        ProbeCondition probeCondition = loadFromResource("/test_conditional_09.json");
+        Map<String, Object> args = new HashMap<>();
+        args.put("password", "secret123");
+        ValueReferenceResolver ctx = EvalContextHelper.createResolver(args, null);
+        EvaluationException evaluationException = assertThrows(
+                EvaluationException.class,
+                () -> probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
+        assertEquals(
+                "Could not evaluate the expression because 'password' was redacted", evaluationException.getMessage());
+    }
+
+    @Test
+    void primitives() throws IOException {
+        ProbeCondition probeCondition = loadFromResource("/test_conditional_10.json");
+        Map<String, Object> args = new HashMap<>();
+        args.put("uuid", UUID.fromString("a3cbe9e7-edd3-4bef-8e5b-59bfcb04cf91"));
+        args.put("duration", Duration.ofSeconds(42));
+        args.put("clazz", "foo".getClass());
+        args.put("now", new Date(1700000000000L)); // 2023-11-14T00:00:00Z
+        ValueReferenceResolver ctx = EvalContextHelper.createResolver(args, null);
+        assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
+    }
+
+    @Test
+    void testBooleanOperation() throws Exception {
+        ProbeCondition probeCondition = loadFromResource("/test_conditional_11.json");
+        class Obj {
+            String strField = "foobar";
+            String emptyStr = "";
+            List<String> emptyList = new ArrayList<>();
+            Map<String, String> emptyMap = new HashMap<>();
+            Set<String> emptySet = new HashSet<>();
+            Object[] emptyArray = new Object[0];
         }
-      }
+        ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj());
+        assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
+    }
 
-      Map<String, String> strMap = new HashMap<>();
+    @Test
+    void testLiterals() throws Exception {
+        ProbeCondition probeCondition = loadFromResource("/test_conditional_13.json");
+        class Obj {
+            boolean boolVal = true;
+            int intVal = 1;
+            long longVal = 1L;
+            double doubleVal = 1.0;
+            String strVal = "foo";
+            Object objVal = null;
+            char charVal = 'a';
+        }
+        ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj());
+        assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
+    }
 
-      {
-        strMap.put("foo", "bar");
-        strMap.put("bar", "foobar");
-      }
+    @Test
+    void testTimeoutAndLenCount() throws Exception {
+        ProbeCondition probeCondition = loadFromResource("/test_conditional_14.json");
+        class Obj {
+            int[] intArray = new int[] {1, 1, 1};
+            String[] strArray = new String[] {"foo", "bar"};
+            List<String> largeList = new ArrayList<>();
 
-      Set<String> strSet = new HashSet<>();
+            {
+                for (int i = 0; i < 1_000; i++) {
+                    largeList.add("foobar" + i);
+                }
+            }
 
-      {
-        strSet.add("foo");
-      }
+            Map<String, String> strMap = new HashMap<>();
 
-      List<String> strList = new ArrayList<>();
+            {
+                strMap.put("foo", "bar");
+                strMap.put("bar", "foobar");
+            }
 
-      {
-        strList.add("foo");
-      }
-    }
-    Obj obj = new Obj();
-    ValueReferenceResolver ctx = EvalContextHelper.createResolver(obj);
-    // first call is longer so ideal to test timeout
-    EvaluationException evaluationException =
-        assertThrows(
-            EvaluationException.class,
-            () ->
-                probeCondition.execute(
-                    ctx, TimeoutChecker.create(Config.get(), Duration.ofMillis(1))));
-    assertEquals("timeout (1ms)", evaluationException.getMessage());
-    // test good execution
-    assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
-  }
-
-  @Test
-  public void nullExpressions() {
-    class Obj {
-      Object field = null;
+            Set<String> strSet = new HashSet<>();
+
+            {
+                strSet.add("foo");
+            }
+
+            List<String> strList = new ArrayList<>();
+
+            {
+                strList.add("foo");
+            }
+        }
+        Obj obj = new Obj();
+        ValueReferenceResolver ctx = EvalContextHelper.createResolver(obj);
+        // first call is longer so ideal to test timeout
+        EvaluationException evaluationException = assertThrows(
+                EvaluationException.class,
+                () -> probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), Duration.ofMillis(1))));
+        assertEquals("timeout (1ms)", evaluationException.getMessage());
+        // test good execution
+        assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
     }
-    List<String> lines = loadLinesFromResource("/null_expressions.txt");
-    for (String line : lines) {
-      ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj());
-      EvaluationException ex =
-          assertThrows(
-              EvaluationException.class,
-              () -> load(line).execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
-      assertEquals("Cannot evaluate the expression for null value", ex.getMessage(), line);
+
+    @Test
+    public void nullExpressions() {
+        class Obj {
+            Object field = null;
+        }
+        List<String> lines = loadLinesFromResource("/null_expressions.txt");
+        for (String line : lines) {
+            ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj());
+            EvaluationException ex = assertThrows(
+                    EvaluationException.class,
+                    () -> load(line).execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
+            assertEquals("Cannot evaluate the expression for null value", ex.getMessage(), line);
+        }
     }
-  }
-
-  @Test
-  public void containsExpressions() {
-    class Obj {
-      String str = "hello";
-      String[] arrayStr = new String[] {"foo", "hello", "bar"};
-      Map<String, String> mapStr = new HashMap<>();
-
-      {
-        mapStr.put("foo", "bar");
-        mapStr.put("hello", "bar");
-      }
+
+    @Test
+    public void containsExpressions() {
+        class Obj {
+            String str = "hello";
+            String[] arrayStr = new String[] {"foo", "hello", "bar"};
+            Map<String, String> mapStr = new HashMap<>();
+
+            {
+                mapStr.put("foo", "bar");
+                mapStr.put("hello", "bar");
+            }
+        }
+        List<String> lines = loadLinesFromResource("/contains_expressions.txt");
+        for (String line : lines) {
+            ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj());
+            assertTrue(load(line).execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
+        }
     }
-    List<String> lines = loadLinesFromResource("/contains_expressions.txt");
-    for (String line : lines) {
-      ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj());
-      assertTrue(load(line).execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT)));
+
+    @Test
+    public void timeoutExpressions() {}
+
+    private static ProbeCondition loadFromResource(String resourcePath) throws IOException {
+        InputStream input = ProbeConditionTest.class.getResourceAsStream(resourcePath);
+        Moshi moshi = new Moshi.Builder()
+                .add(ProbeCondition.class, new ProbeCondition.ProbeConditionJsonAdapter())
+                .build();
+        return moshi.adapter(ProbeCondition.class).fromJson(Okio.buffer(Okio.source(input)));
     }
-  }
-
-  @Test
-  public void timeoutExpressions() {}
-
-  private static ProbeCondition loadFromResource(String resourcePath) throws IOException {
-    InputStream input = ProbeConditionTest.class.getResourceAsStream(resourcePath);
-    Moshi moshi =
-        new Moshi.Builder()
-            .add(ProbeCondition.class, new ProbeCondition.ProbeConditionJsonAdapter())
-            .build();
-    return moshi.adapter(ProbeCondition.class).fromJson(Okio.buffer(Okio.source(input)));
-  }
-
-  private static List<String> loadLinesFromResource(String resourcePath) {
-    try (InputStream input = ProbeConditionTest.class.getResourceAsStream(resourcePath)) {
-      BufferedReader reader = new BufferedReader(new InputStreamReader(input));
-      return reader.lines().collect(Collectors.toList());
-    } catch (IOException e) {
-      throw new RuntimeException("Failed to load resource: " + resourcePath, e);
+
+    private static List<String> loadLinesFromResource(String resourcePath) {
+        try (InputStream input = ProbeConditionTest.class.getResourceAsStream(resourcePath)) {
+            BufferedReader reader = new BufferedReader(new InputStreamReader(input));
+            return reader.lines().collect(Collectors.toList());
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to load resource: " + resourcePath, e);
+        }
     }
-  }
-
-  private static ProbeCondition load(String json) {
-    try {
-      Moshi moshi =
-          new Moshi.Builder()
-              .add(ProbeCondition.class, new ProbeCondition.ProbeConditionJsonAdapter())
-              .build();
-      return moshi.adapter(ProbeCondition.class).fromJson(json);
-    } catch (IOException e) {
-      throw new RuntimeException("Failed to load json: " + json, e);
+
+    private static ProbeCondition load(String json) {
+        try {
+            Moshi moshi = new Moshi.Builder()
+                    .add(ProbeCondition.class, new ProbeCondition.ProbeConditionJsonAdapter())
+                    .build();
+            return moshi.adapter(ProbeCondition.class).fromJson(json);
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to load json: " + json, e);
+        }
     }
-  }
 
-  static class Container {
-    String msg;
+    static class Container {
+        String msg;
 
-    public Container(String msg) {
-      this.msg = msg;
+        public Container(String msg) {
+            this.msg = msg;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/TestHelper.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/TestHelper.java
index adeed751308..672ea947792 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/TestHelper.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/TestHelper.java
@@ -4,13 +4,13 @@
 import java.lang.reflect.Field;
 
 public class TestHelper {
-  public static void setFieldInConfig(Config config, String fieldName, Object value) {
-    try {
-      Field field = config.getClass().getDeclaredField(fieldName);
-      field.setAccessible(true);
-      field.set(config, value); // TODO: JEP 500 - avoid mutating final fields
-    } catch (Throwable e) {
-      e.printStackTrace();
+    public static void setFieldInConfig(Config config, String fieldName, Object value) {
+        try {
+            Field field = config.getClass().getDeclaredField(fieldName);
+            field.setAccessible(true);
+            field.set(config, value); // TODO: JEP 500 - avoid mutating final fields
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ValueScriptTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ValueScriptTest.java
index fccf05ffeb7..f8b21a148f0 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ValueScriptTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ValueScriptTest.java
@@ -21,125 +21,123 @@
 import org.junit.jupiter.api.Test;
 
 public class ValueScriptTest {
-  private static final Duration TEST_TIMEOUT = Duration.ofMinutes(500);
+    private static final Duration TEST_TIMEOUT = Duration.ofMinutes(500);
 
-  static class Obj {
-    String str = "hello";
-    int i = 10;
-    List<String> list = Arrays.asList("a", "b", "c");
-    List<String> largeList = new ArrayList<>();
-    long l = 100_000_000_000L;
-    float f = 2.5F;
-    double d = 3.14D;
-    char c = 'a';
+    static class Obj {
+        String str = "hello";
+        int i = 10;
+        List<String> list = Arrays.asList("a", "b", "c");
+        List<String> largeList = new ArrayList<>();
+        long l = 100_000_000_000L;
+        float f = 2.5F;
+        double d = 3.14D;
+        char c = 'a';
 
-    {
-      for (int i = 0; i < 5_000; i++) {
-        largeList.add("hello" + i);
-      }
+        {
+            for (int i = 0; i < 5_000; i++) {
+                largeList.add("hello" + i);
+            }
+        }
     }
-  }
 
-  @Test
-  public void predicates() {
-    ValueScript valueScript = loadFromResource("/test_value_expr_01.json");
-    // first call is longer so ideal to test timeout
-    EvaluationException evaluationException =
-        assertThrows(
-            EvaluationException.class,
-            () ->
-                valueScript.execute(
-                    createResolver(new Obj()),
-                    TimeoutChecker.create(Config.get(), Duration.ofMillis(1))));
-    assertEquals("timeout (1ms)", evaluationException.getMessage());
-    // test good execution
-    assertEquals(
-        Boolean.TRUE,
-        valueScript
-            .execute(createResolver(new Obj()), TimeoutChecker.create(Config.get(), TEST_TIMEOUT))
-            .getValue());
-  }
+    @Test
+    public void predicates() {
+        ValueScript valueScript = loadFromResource("/test_value_expr_01.json");
+        // first call is longer so ideal to test timeout
+        EvaluationException evaluationException = assertThrows(
+                EvaluationException.class,
+                () -> valueScript.execute(
+                        createResolver(new Obj()), TimeoutChecker.create(Config.get(), Duration.ofMillis(1))));
+        assertEquals("timeout (1ms)", evaluationException.getMessage());
+        // test good execution
+        assertEquals(
+                Boolean.TRUE,
+                valueScript
+                        .execute(createResolver(new Obj()), TimeoutChecker.create(Config.get(), TEST_TIMEOUT))
+                        .getValue());
+    }
 
-  @Test
-  public void topLevelPredicates() {
-    List<String> lines = loadLinesFromResource("/test_one_liner_value_expr_01.txt");
-    for (String line : lines) {
-      ValueScript valueScript = load(line);
-      assertEquals(
-          Boolean.TRUE,
-          valueScript
-              .execute(createResolver(new Obj()), TimeoutChecker.create(Config.get(), TEST_TIMEOUT))
-              .getValue(),
-          line);
+    @Test
+    public void topLevelPredicates() {
+        List<String> lines = loadLinesFromResource("/test_one_liner_value_expr_01.txt");
+        for (String line : lines) {
+            ValueScript valueScript = load(line);
+            assertEquals(
+                    Boolean.TRUE,
+                    valueScript
+                            .execute(createResolver(new Obj()), TimeoutChecker.create(Config.get(), TEST_TIMEOUT))
+                            .getValue(),
+                    line);
+        }
     }
-  }
 
-  @Test
-  public void topLevelPrimitives() {
-    Object[] expectedValues =
-        new Object[] {
-          "hello",
-          "hello",
-          10,
-          100_000_000_000L,
-          2.5F,
-          3.14D,
-          "a",
-          "b",
-          5,
-          3,
-          "el",
-          Values.NULL_OBJECT,
-          Boolean.TRUE,
-          Boolean.FALSE,
-          42,
-          Integer.MAX_VALUE,
-          -42,
-          Integer.MIN_VALUE,
-          17315993717L,
-          -17315993717L,
-          3.14
+    @Test
+    public void topLevelPrimitives() {
+        Object[] expectedValues = new Object[] {
+            "hello",
+            "hello",
+            10,
+            100_000_000_000L,
+            2.5F,
+            3.14D,
+            "a",
+            "b",
+            5,
+            3,
+            "el",
+            Values.NULL_OBJECT,
+            Boolean.TRUE,
+            Boolean.FALSE,
+            42,
+            Integer.MAX_VALUE,
+            -42,
+            Integer.MIN_VALUE,
+            17315993717L,
+            -17315993717L,
+            3.14
         };
-    List<String> lines = loadLinesFromResource("/test_one_liner_value_expr_02.txt");
-    int i = 0;
-    for (String line : lines) {
-      ValueScript valueScript = load(line);
-      assertEquals(
-          expectedValues[i],
-          valueScript
-              .execute(createResolver(new Obj()), TimeoutChecker.create(Config.get(), TEST_TIMEOUT))
-              .getValue(),
-          line);
-      i++;
+        List<String> lines = loadLinesFromResource("/test_one_liner_value_expr_02.txt");
+        int i = 0;
+        for (String line : lines) {
+            ValueScript valueScript = load(line);
+            assertEquals(
+                    expectedValues[i],
+                    valueScript
+                            .execute(createResolver(new Obj()), TimeoutChecker.create(Config.get(), TEST_TIMEOUT))
+                            .getValue(),
+                    line);
+            i++;
+        }
     }
-  }
 
-  private static List<String> loadLinesFromResource(String resourcePath) {
-    try (InputStream input = ProbeConditionTest.class.getResourceAsStream(resourcePath)) {
-      BufferedReader reader = new BufferedReader(new InputStreamReader(input));
-      return reader.lines().collect(Collectors.toList());
-    } catch (IOException e) {
-      throw new RuntimeException("Failed to load resource: " + resourcePath, e);
+    private static List<String> loadLinesFromResource(String resourcePath) {
+        try (InputStream input = ProbeConditionTest.class.getResourceAsStream(resourcePath)) {
+            BufferedReader reader = new BufferedReader(new InputStreamReader(input));
+            return reader.lines().collect(Collectors.toList());
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to load resource: " + resourcePath, e);
+        }
     }
-  }
 
-  private static ValueScript loadFromResource(String resourcePath) {
-    try (InputStream input = ProbeConditionTest.class.getResourceAsStream(resourcePath)) {
-      Moshi moshi =
-          new Moshi.Builder().add(ValueScript.class, new ValueScript.ValueScriptAdapter()).build();
-      return moshi.adapter(ValueScript.class).fromJson(Okio.buffer(Okio.source(input)));
-    } catch (IOException e) {
-      throw new RuntimeException("Failed to load resource: " + resourcePath, e);
+    private static ValueScript loadFromResource(String resourcePath) {
+        try (InputStream input = ProbeConditionTest.class.getResourceAsStream(resourcePath)) {
+            Moshi moshi = new Moshi.Builder()
+                    .add(ValueScript.class, new ValueScript.ValueScriptAdapter())
+                    .build();
+            return moshi.adapter(ValueScript.class).fromJson(Okio.buffer(Okio.source(input)));
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to load resource: " + resourcePath, e);
+        }
     }
-  }
 
-  private static ValueScript load(String json) {
-    try {
-      Moshi moshi =
-          new Moshi.Builder().add(ValueScript.class, new ValueScript.ValueScriptAdapter()).build();
-      return moshi.adapter(ValueScript.class).fromJson(json);
-    } catch (IOException e) {
-      throw new RuntimeException("Failed to load json: " + json, e);
+    private static ValueScript load(String json) {
+        try {
+            Moshi moshi = new Moshi.Builder()
+                    .add(ValueScript.class, new ValueScript.ValueScriptAdapter())
+                    .build();
+            return moshi.adapter(ValueScript.class).fromJson(json);
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to load json: " + json, e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/BinaryExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/BinaryExpressionTest.java
index ef6de51409f..8673cd6622c 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/BinaryExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/BinaryExpressionTest.java
@@ -11,43 +11,35 @@
 import org.junit.jupiter.api.Test;
 
 class BinaryExpressionTest {
-  EvalContext evalContext = createEvalContext(this);
+    EvalContext evalContext = createEvalContext(this);
 
-  @Test
-  void testLeftNull() {
-    BinaryExpression expression =
-        new BinaryExpression(null, BooleanExpression.TRUE, BinaryOperator.AND);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("false && true", print(expression));
-  }
+    @Test
+    void testLeftNull() {
+        BinaryExpression expression = new BinaryExpression(null, BooleanExpression.TRUE, BinaryOperator.AND);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("false && true", print(expression));
+    }
 
-  @Test
-  void testRightNull() {
-    BinaryExpression expression =
-        new BinaryExpression(BooleanExpression.TRUE, null, BinaryOperator.AND);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("true && false", print(expression));
-  }
+    @Test
+    void testRightNull() {
+        BinaryExpression expression = new BinaryExpression(BooleanExpression.TRUE, null, BinaryOperator.AND);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("true && false", print(expression));
+    }
 
-  @Test
-  void testShortCircuitAnd() {
-    BinaryExpression expression =
-        new BinaryExpression(
-            BooleanExpression.FALSE,
-            valueRefResolver -> Assertions.fail("should not reach"),
-            BinaryOperator.AND);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("false && null", print(expression));
-  }
+    @Test
+    void testShortCircuitAnd() {
+        BinaryExpression expression = new BinaryExpression(
+                BooleanExpression.FALSE, valueRefResolver -> Assertions.fail("should not reach"), BinaryOperator.AND);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("false && null", print(expression));
+    }
 
-  @Test
-  void testShortCircuitOr() {
-    BinaryExpression expression =
-        new BinaryExpression(
-            BooleanExpression.TRUE,
-            valueRefResolver -> Assertions.fail("should not reach"),
-            BinaryOperator.OR);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("true || null", print(expression));
-  }
+    @Test
+    void testShortCircuitOr() {
+        BinaryExpression expression = new BinaryExpression(
+                BooleanExpression.TRUE, valueRefResolver -> Assertions.fail("should not reach"), BinaryOperator.OR);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("true || null", print(expression));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ComparisonExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ComparisonExpressionTest.java
index b0c4de7680c..4d8f5744734 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ComparisonExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ComparisonExpressionTest.java
@@ -37,315 +37,287 @@
 
 class ComparisonExpressionTest {
 
-  @ParameterizedTest(name = "[{index}] {4}")
-  @MethodSource("expressions")
-  void evaluateOperator(
-      ValueExpression<?> left,
-      ValueExpression<?> right,
-      ComparisonOperator operator,
-      boolean expected,
-      String prettyPrint) {
-    ComparisonExpression expression = new ComparisonExpression(left, right, operator);
-    assertEquals(expected, expression.evaluate(createEvalContext(NoopResolver.INSTANCE)));
-    assertEquals(prettyPrint, print(expression));
-  }
+    @ParameterizedTest(name = "[{index}] {4}")
+    @MethodSource("expressions")
+    void evaluateOperator(
+            ValueExpression<?> left,
+            ValueExpression<?> right,
+            ComparisonOperator operator,
+            boolean expected,
+            String prettyPrint) {
+        ComparisonExpression expression = new ComparisonExpression(left, right, operator);
+        assertEquals(expected, expression.evaluate(createEvalContext(NoopResolver.INSTANCE)));
+        assertEquals(prettyPrint, print(expression));
+    }
 
-  private static Stream<Arguments> expressions() {
-    return Stream.of(
-        Arguments.of(new NumericValue(1, INT), new NumericValue(1, INT), EQ, true, "1 == 1"),
-        Arguments.of(new NumericValue(1L, LONG), new NumericValue(1L, LONG), EQ, true, "1 == 1"),
-        Arguments.of(
-            new NumericValue(1.0F, FLOAT), new NumericValue(1.0F, FLOAT), EQ, true, "1.0 == 1.0"),
-        Arguments.of(
-            new NumericValue(1.0, DOUBLE), new NumericValue(1.0, DOUBLE), EQ, true, "1.0 == 1.0"),
-        Arguments.of(new NumericValue(1, INT), new NumericValue(1.0, DOUBLE), EQ, true, "1 == 1.0"),
-        Arguments.of(new NumericValue(1, INT), new NumericValue(2, INT), EQ, false, "1 == 2"),
-        Arguments.of(
-            new NumericValue(1, INT), new NumericValue(2.0, DOUBLE), EQ, false, "1 == 2.0"),
-        Arguments.of(new StringValue("foo"), new NumericValue(2, INT), EQ, false, "\"foo\" == 2"),
-        Arguments.of(new NumericValue(1, INT), new StringValue("foo"), EQ, false, "1 == \"foo\""),
-        Arguments.of(ValueExpression.NULL, new NumericValue(2, INT), EQ, false, "null == 2"),
-        Arguments.of(
-            new NumericValue(Double.NaN, DOUBLE),
-            new NumericValue(Double.NaN, DOUBLE),
-            EQ,
-            false,
-            "NaN == NaN"),
-        Arguments.of(new NumericValue(1, INT), new NumericValue(1, INT), GT, false, "1 > 1"),
-        Arguments.of(new NumericValue(1, INT), new NumericValue(2, INT), GT, false, "1 > 2"),
-        Arguments.of(
-            new NumericValue(1.0, DOUBLE), new NumericValue(1.1, DOUBLE), GT, false, "1.0 > 1.1"),
-        Arguments.of(new NumericValue(2, INT), new NumericValue(1, INT), GT, true, "2 > 1"),
-        Arguments.of(
-            new NumericValue(1.1, DOUBLE), new NumericValue(1.0, DOUBLE), GT, true, "1.1 > 1.0"),
-        Arguments.of(new NumericValue(1.1, DOUBLE), new NumericValue(1, INT), GT, true, "1.1 > 1"),
-        Arguments.of(new NumericValue(1, INT), new NumericValue(0.9, DOUBLE), GT, true, "1 > 0.9"),
-        Arguments.of(ValueExpression.NULL, new NumericValue(2, INT), GT, false, "null > 2"),
-        Arguments.of(new NumericValue(2, INT), ValueExpression.NULL, GT, false, "2 > null"),
-        Arguments.of(
-            new NumericValue(Double.NaN, DOUBLE),
-            new NumericValue(Double.NaN, DOUBLE),
-            GT,
-            false,
-            "NaN > NaN"),
-        Arguments.of(
-            new NumericValue(BigDecimal.valueOf(2), OBJECT),
-            new NumericValue(BigDecimal.valueOf(1), OBJECT),
-            GT,
-            true,
-            "2 > 1"),
-        Arguments.of(new NumericValue(1, INT), new NumericValue(2, INT), GE, false, "1 >= 2"),
-        Arguments.of(
-            new NumericValue(1.0, DOUBLE), new NumericValue(1.1, DOUBLE), GE, false, "1.0 >= 1.1"),
-        Arguments.of(new NumericValue(2, INT), new NumericValue(1, INT), GE, true, "2 >= 1"),
-        Arguments.of(
-            new NumericValue(1.1, DOUBLE), new NumericValue(1.0, DOUBLE), GE, true, "1.1 >= 1.0"),
-        Arguments.of(new NumericValue(1.1, DOUBLE), new NumericValue(1, INT), GE, true, "1.1 >= 1"),
-        Arguments.of(new NumericValue(1, INT), new NumericValue(0.9, DOUBLE), GE, true, "1 >= 0.9"),
-        Arguments.of(ValueExpression.NULL, new NumericValue(2, INT), GE, false, "null >= 2"),
-        Arguments.of(
-            new NumericValue(Double.NaN, DOUBLE),
-            new NumericValue(Double.NaN, DOUBLE),
-            GE,
-            false,
-            "NaN >= NaN"),
-        Arguments.of(
-            new NumericValue(BigDecimal.valueOf(2), OBJECT),
-            new NumericValue(BigDecimal.valueOf(1), OBJECT),
-            GE,
-            true,
-            "2 >= 1"),
-        Arguments.of(new NumericValue(1, INT), new NumericValue(1, INT), LT, false, "1 < 1"),
-        Arguments.of(new NumericValue(1, INT), new NumericValue(2, INT), LT, true, "1 < 2"),
-        Arguments.of(new NumericValue(2, INT), new NumericValue(1, INT), LT, false, "2 < 1"),
-        Arguments.of(
-            new NumericValue(1.1, DOUBLE), new NumericValue(1.0, DOUBLE), LT, false, "1.1 < 1.0"),
-        Arguments.of(
-            new NumericValue(1.0, DOUBLE), new NumericValue(1.1, DOUBLE), LT, true, "1.0 < 1.1"),
-        Arguments.of(new NumericValue(1, INT), new NumericValue(1.1, DOUBLE), LT, true, "1 < 1.1"),
-        Arguments.of(new NumericValue(0.9, DOUBLE), new NumericValue(1, INT), LT, true, "0.9 < 1"),
-        Arguments.of(ValueExpression.NULL, new NumericValue(2, INT), LT, false, "null < 2"),
-        Arguments.of(
-            new NumericValue(Double.NaN, DOUBLE),
-            new NumericValue(Double.NaN, DOUBLE),
-            LT,
-            false,
-            "NaN < NaN"),
-        Arguments.of(
-            new NumericValue(BigDecimal.valueOf(1), OBJECT),
-            new NumericValue(BigDecimal.valueOf(2), OBJECT),
-            LT,
-            true,
-            "1 < 2"),
-        Arguments.of(new NumericValue(1, INT), new NumericValue(1, INT), LE, true, "1 <= 1"),
-        Arguments.of(new NumericValue(1, INT), new NumericValue(2, INT), LE, true, "1 <= 2"),
-        Arguments.of(new NumericValue(2, INT), new NumericValue(1, INT), LE, false, "2 <= 1"),
-        Arguments.of(
-            new NumericValue(1.1, DOUBLE), new NumericValue(1.0, DOUBLE), LE, false, "1.1 <= 1.0"),
-        Arguments.of(
-            new NumericValue(1.0, DOUBLE), new NumericValue(1.1, DOUBLE), LE, true, "1.0 <= 1.1"),
-        Arguments.of(new NumericValue(1, INT), new NumericValue(1.1, DOUBLE), LE, true, "1 <= 1.1"),
-        Arguments.of(new NumericValue(0.9, DOUBLE), new NumericValue(1, INT), LE, true, "0.9 <= 1"),
-        Arguments.of(ValueExpression.NULL, new NumericValue(2, INT), LE, false, "null <= 2"),
-        Arguments.of(
-            new NumericValue(Double.NaN, DOUBLE),
-            new NumericValue(Double.NaN, DOUBLE),
-            LE,
-            false,
-            "NaN <= NaN"),
-        Arguments.of(
-            new NumericValue(BigDecimal.valueOf(1), OBJECT),
-            new NumericValue(BigDecimal.valueOf(2), OBJECT),
-            LE,
-            true,
-            "1 <= 2"),
-        Arguments.of(
-            new StringValue("foo"),
-            new StringValue("java.lang.String"),
-            INSTANCEOF,
-            true,
-            "\"foo\" instanceof \"java.lang.String\""),
-        Arguments.of(
-            new StringValue("foo"),
-            new StringValue("java.lang.Object"),
-            INSTANCEOF,
-            true,
-            "\"foo\" instanceof \"java.lang.Object\""),
-        Arguments.of(
-            new ObjectValue(new Random()),
-            new StringValue("java.util.Random"),
-            INSTANCEOF,
-            true,
-            "java.util.Random instanceof \"java.util.Random\""),
-        Arguments.of(
-            new ObjectValue(new ArrayList<>()),
-            new StringValue("java.util.List"),
-            INSTANCEOF,
-            true,
-            "java.util.ArrayList instanceof \"java.util.List\""),
-        Arguments.of(
-            new ObjectValue(new ArrayList<>()),
-            new StringValue("java.util.Map"),
-            INSTANCEOF,
-            false,
-            "java.util.ArrayList instanceof \"java.util.Map\""),
-        Arguments.of(
-            ValueExpression.NULL,
-            new StringValue("java.lang.String"),
-            INSTANCEOF,
-            false,
-            "null instanceof \"java.lang.String\""),
-        Arguments.of(
-            new NumericValue(1, INT),
-            new StringValue("java.lang.Integer"),
-            INSTANCEOF,
-            true,
-            "1 instanceof \"java.lang.Integer\""),
-        Arguments.of(
-            new NumericValue(1.0, DOUBLE),
-            new StringValue("java.lang.Double"),
-            INSTANCEOF,
-            true,
-            "1.0 instanceof \"java.lang.Double\""),
-        Arguments.of(
-            new ObjectValue(StandardOpenOption.READ),
-            new StringValue("READ"),
-            EQ,
-            true,
-            "java.nio.file.StandardOpenOption == \"READ\""),
-        Arguments.of(
-            new ObjectValue(StandardOpenOption.READ),
-            new StringValue("StandardOpenOption.READ"),
-            EQ,
-            true,
-            "java.nio.file.StandardOpenOption == \"StandardOpenOption.READ\""),
-        Arguments.of(
-            new ObjectValue(StandardOpenOption.READ),
-            new StringValue("java.nio.file.StandardOpenOption.READ"),
-            EQ,
-            true,
-            "java.nio.file.StandardOpenOption == \"java.nio.file.StandardOpenOption.READ\""),
-        Arguments.of(
-            new ObjectValue(StandardOpenOption.CREATE),
-            new StringValue("READ"),
-            EQ,
-            false,
-            "java.nio.file.StandardOpenOption == \"READ\""),
-        Arguments.of(
-            new StringValue("READ"),
-            new ObjectValue(StandardOpenOption.READ),
-            EQ,
-            true,
-            "\"READ\" == java.nio.file.StandardOpenOption"));
-  }
+    private static Stream<Arguments> expressions() {
+        return Stream.of(
+                Arguments.of(new NumericValue(1, INT), new NumericValue(1, INT), EQ, true, "1 == 1"),
+                Arguments.of(new NumericValue(1L, LONG), new NumericValue(1L, LONG), EQ, true, "1 == 1"),
+                Arguments.of(new NumericValue(1.0F, FLOAT), new NumericValue(1.0F, FLOAT), EQ, true, "1.0 == 1.0"),
+                Arguments.of(new NumericValue(1.0, DOUBLE), new NumericValue(1.0, DOUBLE), EQ, true, "1.0 == 1.0"),
+                Arguments.of(new NumericValue(1, INT), new NumericValue(1.0, DOUBLE), EQ, true, "1 == 1.0"),
+                Arguments.of(new NumericValue(1, INT), new NumericValue(2, INT), EQ, false, "1 == 2"),
+                Arguments.of(new NumericValue(1, INT), new NumericValue(2.0, DOUBLE), EQ, false, "1 == 2.0"),
+                Arguments.of(new StringValue("foo"), new NumericValue(2, INT), EQ, false, "\"foo\" == 2"),
+                Arguments.of(new NumericValue(1, INT), new StringValue("foo"), EQ, false, "1 == \"foo\""),
+                Arguments.of(ValueExpression.NULL, new NumericValue(2, INT), EQ, false, "null == 2"),
+                Arguments.of(
+                        new NumericValue(Double.NaN, DOUBLE),
+                        new NumericValue(Double.NaN, DOUBLE),
+                        EQ,
+                        false,
+                        "NaN == NaN"),
+                Arguments.of(new NumericValue(1, INT), new NumericValue(1, INT), GT, false, "1 > 1"),
+                Arguments.of(new NumericValue(1, INT), new NumericValue(2, INT), GT, false, "1 > 2"),
+                Arguments.of(new NumericValue(1.0, DOUBLE), new NumericValue(1.1, DOUBLE), GT, false, "1.0 > 1.1"),
+                Arguments.of(new NumericValue(2, INT), new NumericValue(1, INT), GT, true, "2 > 1"),
+                Arguments.of(new NumericValue(1.1, DOUBLE), new NumericValue(1.0, DOUBLE), GT, true, "1.1 > 1.0"),
+                Arguments.of(new NumericValue(1.1, DOUBLE), new NumericValue(1, INT), GT, true, "1.1 > 1"),
+                Arguments.of(new NumericValue(1, INT), new NumericValue(0.9, DOUBLE), GT, true, "1 > 0.9"),
+                Arguments.of(ValueExpression.NULL, new NumericValue(2, INT), GT, false, "null > 2"),
+                Arguments.of(new NumericValue(2, INT), ValueExpression.NULL, GT, false, "2 > null"),
+                Arguments.of(
+                        new NumericValue(Double.NaN, DOUBLE),
+                        new NumericValue(Double.NaN, DOUBLE),
+                        GT,
+                        false,
+                        "NaN > NaN"),
+                Arguments.of(
+                        new NumericValue(BigDecimal.valueOf(2), OBJECT),
+                        new NumericValue(BigDecimal.valueOf(1), OBJECT),
+                        GT,
+                        true,
+                        "2 > 1"),
+                Arguments.of(new NumericValue(1, INT), new NumericValue(2, INT), GE, false, "1 >= 2"),
+                Arguments.of(new NumericValue(1.0, DOUBLE), new NumericValue(1.1, DOUBLE), GE, false, "1.0 >= 1.1"),
+                Arguments.of(new NumericValue(2, INT), new NumericValue(1, INT), GE, true, "2 >= 1"),
+                Arguments.of(new NumericValue(1.1, DOUBLE), new NumericValue(1.0, DOUBLE), GE, true, "1.1 >= 1.0"),
+                Arguments.of(new NumericValue(1.1, DOUBLE), new NumericValue(1, INT), GE, true, "1.1 >= 1"),
+                Arguments.of(new NumericValue(1, INT), new NumericValue(0.9, DOUBLE), GE, true, "1 >= 0.9"),
+                Arguments.of(ValueExpression.NULL, new NumericValue(2, INT), GE, false, "null >= 2"),
+                Arguments.of(
+                        new NumericValue(Double.NaN, DOUBLE),
+                        new NumericValue(Double.NaN, DOUBLE),
+                        GE,
+                        false,
+                        "NaN >= NaN"),
+                Arguments.of(
+                        new NumericValue(BigDecimal.valueOf(2), OBJECT),
+                        new NumericValue(BigDecimal.valueOf(1), OBJECT),
+                        GE,
+                        true,
+                        "2 >= 1"),
+                Arguments.of(new NumericValue(1, INT), new NumericValue(1, INT), LT, false, "1 < 1"),
+                Arguments.of(new NumericValue(1, INT), new NumericValue(2, INT), LT, true, "1 < 2"),
+                Arguments.of(new NumericValue(2, INT), new NumericValue(1, INT), LT, false, "2 < 1"),
+                Arguments.of(new NumericValue(1.1, DOUBLE), new NumericValue(1.0, DOUBLE), LT, false, "1.1 < 1.0"),
+                Arguments.of(new NumericValue(1.0, DOUBLE), new NumericValue(1.1, DOUBLE), LT, true, "1.0 < 1.1"),
+                Arguments.of(new NumericValue(1, INT), new NumericValue(1.1, DOUBLE), LT, true, "1 < 1.1"),
+                Arguments.of(new NumericValue(0.9, DOUBLE), new NumericValue(1, INT), LT, true, "0.9 < 1"),
+                Arguments.of(ValueExpression.NULL, new NumericValue(2, INT), LT, false, "null < 2"),
+                Arguments.of(
+                        new NumericValue(Double.NaN, DOUBLE),
+                        new NumericValue(Double.NaN, DOUBLE),
+                        LT,
+                        false,
+                        "NaN < NaN"),
+                Arguments.of(
+                        new NumericValue(BigDecimal.valueOf(1), OBJECT),
+                        new NumericValue(BigDecimal.valueOf(2), OBJECT),
+                        LT,
+                        true,
+                        "1 < 2"),
+                Arguments.of(new NumericValue(1, INT), new NumericValue(1, INT), LE, true, "1 <= 1"),
+                Arguments.of(new NumericValue(1, INT), new NumericValue(2, INT), LE, true, "1 <= 2"),
+                Arguments.of(new NumericValue(2, INT), new NumericValue(1, INT), LE, false, "2 <= 1"),
+                Arguments.of(new NumericValue(1.1, DOUBLE), new NumericValue(1.0, DOUBLE), LE, false, "1.1 <= 1.0"),
+                Arguments.of(new NumericValue(1.0, DOUBLE), new NumericValue(1.1, DOUBLE), LE, true, "1.0 <= 1.1"),
+                Arguments.of(new NumericValue(1, INT), new NumericValue(1.1, DOUBLE), LE, true, "1 <= 1.1"),
+                Arguments.of(new NumericValue(0.9, DOUBLE), new NumericValue(1, INT), LE, true, "0.9 <= 1"),
+                Arguments.of(ValueExpression.NULL, new NumericValue(2, INT), LE, false, "null <= 2"),
+                Arguments.of(
+                        new NumericValue(Double.NaN, DOUBLE),
+                        new NumericValue(Double.NaN, DOUBLE),
+                        LE,
+                        false,
+                        "NaN <= NaN"),
+                Arguments.of(
+                        new NumericValue(BigDecimal.valueOf(1), OBJECT),
+                        new NumericValue(BigDecimal.valueOf(2), OBJECT),
+                        LE,
+                        true,
+                        "1 <= 2"),
+                Arguments.of(
+                        new StringValue("foo"),
+                        new StringValue("java.lang.String"),
+                        INSTANCEOF,
+                        true,
+                        "\"foo\" instanceof \"java.lang.String\""),
+                Arguments.of(
+                        new StringValue("foo"),
+                        new StringValue("java.lang.Object"),
+                        INSTANCEOF,
+                        true,
+                        "\"foo\" instanceof \"java.lang.Object\""),
+                Arguments.of(
+                        new ObjectValue(new Random()),
+                        new StringValue("java.util.Random"),
+                        INSTANCEOF,
+                        true,
+                        "java.util.Random instanceof \"java.util.Random\""),
+                Arguments.of(
+                        new ObjectValue(new ArrayList<>()),
+                        new StringValue("java.util.List"),
+                        INSTANCEOF,
+                        true,
+                        "java.util.ArrayList instanceof \"java.util.List\""),
+                Arguments.of(
+                        new ObjectValue(new ArrayList<>()),
+                        new StringValue("java.util.Map"),
+                        INSTANCEOF,
+                        false,
+                        "java.util.ArrayList instanceof \"java.util.Map\""),
+                Arguments.of(
+                        ValueExpression.NULL,
+                        new StringValue("java.lang.String"),
+                        INSTANCEOF,
+                        false,
+                        "null instanceof \"java.lang.String\""),
+                Arguments.of(
+                        new NumericValue(1, INT),
+                        new StringValue("java.lang.Integer"),
+                        INSTANCEOF,
+                        true,
+                        "1 instanceof \"java.lang.Integer\""),
+                Arguments.of(
+                        new NumericValue(1.0, DOUBLE),
+                        new StringValue("java.lang.Double"),
+                        INSTANCEOF,
+                        true,
+                        "1.0 instanceof \"java.lang.Double\""),
+                Arguments.of(
+                        new ObjectValue(StandardOpenOption.READ),
+                        new StringValue("READ"),
+                        EQ,
+                        true,
+                        "java.nio.file.StandardOpenOption == \"READ\""),
+                Arguments.of(
+                        new ObjectValue(StandardOpenOption.READ),
+                        new StringValue("StandardOpenOption.READ"),
+                        EQ,
+                        true,
+                        "java.nio.file.StandardOpenOption == \"StandardOpenOption.READ\""),
+                Arguments.of(
+                        new ObjectValue(StandardOpenOption.READ),
+                        new StringValue("java.nio.file.StandardOpenOption.READ"),
+                        EQ,
+                        true,
+                        "java.nio.file.StandardOpenOption == \"java.nio.file.StandardOpenOption.READ\""),
+                Arguments.of(
+                        new ObjectValue(StandardOpenOption.CREATE),
+                        new StringValue("READ"),
+                        EQ,
+                        false,
+                        "java.nio.file.StandardOpenOption == \"READ\""),
+                Arguments.of(
+                        new StringValue("READ"),
+                        new ObjectValue(StandardOpenOption.READ),
+                        EQ,
+                        true,
+                        "\"READ\" == java.nio.file.StandardOpenOption"));
+    }
 
-  @ParameterizedTest
-  @MethodSource("expressionStrs")
-  void evaluateOperatorStrings(
-      ValueExpression<?> left,
-      ValueExpression<?> right,
-      ComparisonOperator operator,
-      boolean expected,
-      String prettyPrint) {
-    ComparisonExpression expression = new ComparisonExpression(left, right, operator);
-    assertEquals(expected, expression.evaluate(createEvalContext(NoopResolver.INSTANCE)));
-    assertEquals(prettyPrint, print(expression));
-  }
+    @ParameterizedTest
+    @MethodSource("expressionStrs")
+    void evaluateOperatorStrings(
+            ValueExpression<?> left,
+            ValueExpression<?> right,
+            ComparisonOperator operator,
+            boolean expected,
+            String prettyPrint) {
+        ComparisonExpression expression = new ComparisonExpression(left, right, operator);
+        assertEquals(expected, expression.evaluate(createEvalContext(NoopResolver.INSTANCE)));
+        assertEquals(prettyPrint, print(expression));
+    }
 
-  private static Stream<Arguments> expressionStrs() {
-    return Stream.of(
-        Arguments.of(
-            new StringValue("foo"), new StringValue("foo"), EQ, true, "\"foo\" == \"foo\""),
-        Arguments.of(
-            new StringValue("foo"), new StringValue("bar"), EQ, false, "\"foo\" == \"bar\""),
-        Arguments.of(new StringValue("foo"), new StringValue("bar"), GT, true, "\"foo\" > \"bar\""),
-        Arguments.of(
-            new StringValue("bar"), new StringValue("foo"), GT, false, "\"bar\" > \"foo\""),
-        Arguments.of(
-            new StringValue("foo"), new StringValue("bar"), GE, true, "\"foo\" >= \"bar\""),
-        Arguments.of(
-            new StringValue("bar"), new StringValue("foo"), GE, false, "\"bar\" >= \"foo\""),
-        Arguments.of(new StringValue("bar"), new StringValue("foo"), LT, true, "\"bar\" < \"foo\""),
-        Arguments.of(
-            new StringValue("foo"), new StringValue("bar"), LT, false, "\"foo\" < \"bar\""),
-        Arguments.of(
-            new StringValue("bar"), new StringValue("foo"), LE, true, "\"bar\" <= \"foo\""),
-        Arguments.of(
-            new StringValue("foo"), new StringValue("bar"), LE, false, "\"foo\" <= \"bar\""));
-  }
+    private static Stream<Arguments> expressionStrs() {
+        return Stream.of(
+                Arguments.of(new StringValue("foo"), new StringValue("foo"), EQ, true, "\"foo\" == \"foo\""),
+                Arguments.of(new StringValue("foo"), new StringValue("bar"), EQ, false, "\"foo\" == \"bar\""),
+                Arguments.of(new StringValue("foo"), new StringValue("bar"), GT, true, "\"foo\" > \"bar\""),
+                Arguments.of(new StringValue("bar"), new StringValue("foo"), GT, false, "\"bar\" > \"foo\""),
+                Arguments.of(new StringValue("foo"), new StringValue("bar"), GE, true, "\"foo\" >= \"bar\""),
+                Arguments.of(new StringValue("bar"), new StringValue("foo"), GE, false, "\"bar\" >= \"foo\""),
+                Arguments.of(new StringValue("bar"), new StringValue("foo"), LT, true, "\"bar\" < \"foo\""),
+                Arguments.of(new StringValue("foo"), new StringValue("bar"), LT, false, "\"foo\" < \"bar\""),
+                Arguments.of(new StringValue("bar"), new StringValue("foo"), LE, true, "\"bar\" <= \"foo\""),
+                Arguments.of(new StringValue("foo"), new StringValue("bar"), LE, false, "\"foo\" <= \"bar\""));
+    }
 
-  @Test
-  void evaluateSecondUndefined() {
-    ComparisonExpression expression =
-        new ComparisonExpression(new NumericValue(1, INT), ValueExpression.UNDEFINED, EQ);
-    assertFalse(expression.evaluate(new EvalContext(NoopResolver.INSTANCE, null)));
-  }
+    @Test
+    void evaluateSecondUndefined() {
+        ComparisonExpression expression =
+                new ComparisonExpression(new NumericValue(1, INT), ValueExpression.UNDEFINED, EQ);
+        assertFalse(expression.evaluate(new EvalContext(NoopResolver.INSTANCE, null)));
+    }
 
-  @Test
-  void evaluateBothUndefined() {
-    ComparisonExpression expression =
-        new ComparisonExpression(ValueExpression.UNDEFINED, ValueExpression.UNDEFINED, EQ);
-    assertFalse(expression.evaluate(new EvalContext(NoopResolver.INSTANCE, null)));
-  }
+    @Test
+    void evaluateBothUndefined() {
+        ComparisonExpression expression =
+                new ComparisonExpression(ValueExpression.UNDEFINED, ValueExpression.UNDEFINED, EQ);
+        assertFalse(expression.evaluate(new EvalContext(NoopResolver.INSTANCE, null)));
+    }
 
-  @Test
-  void evaluateFirstNull() {
-    ComparisonExpression expression =
-        new ComparisonExpression(ValueExpression.NULL, new NumericValue(2, INT), EQ);
-    assertFalse(expression.evaluate(createEvalContext(NoopResolver.INSTANCE)));
-  }
+    @Test
+    void evaluateFirstNull() {
+        ComparisonExpression expression = new ComparisonExpression(ValueExpression.NULL, new NumericValue(2, INT), EQ);
+        assertFalse(expression.evaluate(createEvalContext(NoopResolver.INSTANCE)));
+    }
 
-  @Test
-  void evaluateSecondNull() {
-    ComparisonExpression expression =
-        new ComparisonExpression(new NumericValue(1, INT), ValueExpression.NULL, EQ);
-    assertFalse(expression.evaluate(createEvalContext(NoopResolver.INSTANCE)));
-  }
+    @Test
+    void evaluateSecondNull() {
+        ComparisonExpression expression = new ComparisonExpression(new NumericValue(1, INT), ValueExpression.NULL, EQ);
+        assertFalse(expression.evaluate(createEvalContext(NoopResolver.INSTANCE)));
+    }
 
-  @Test
-  void evaluateBothNull() {
-    ComparisonExpression expression =
-        new ComparisonExpression(ValueExpression.NULL, ValueExpression.NULL, EQ);
-    assertTrue(expression.evaluate(createEvalContext(NoopResolver.INSTANCE)));
-  }
+    @Test
+    void evaluateBothNull() {
+        ComparisonExpression expression = new ComparisonExpression(ValueExpression.NULL, ValueExpression.NULL, EQ);
+        assertTrue(expression.evaluate(createEvalContext(NoopResolver.INSTANCE)));
+    }
 
-  @Test
-  void invalidInstanceofOperand() {
-    ComparisonExpression expression =
-        new ComparisonExpression(new StringValue("foo"), new NumericValue(1, INT), INSTANCEOF);
-    EvaluationException evaluationException =
-        assertThrows(
-            EvaluationException.class,
-            () -> expression.evaluate(createEvalContext(NoopResolver.INSTANCE)));
-    assertEquals(
-        "Right operand of instanceof operator must be a string literal",
-        evaluationException.getMessage());
-    assertEquals("\"foo\" instanceof 1", evaluationException.getExpr());
-  }
+    @Test
+    void invalidInstanceofOperand() {
+        ComparisonExpression expression =
+                new ComparisonExpression(new StringValue("foo"), new NumericValue(1, INT), INSTANCEOF);
+        EvaluationException evaluationException = assertThrows(
+                EvaluationException.class, () -> expression.evaluate(createEvalContext(NoopResolver.INSTANCE)));
+        assertEquals("Right operand of instanceof operator must be a string literal", evaluationException.getMessage());
+        assertEquals("\"foo\" instanceof 1", evaluationException.getExpr());
+    }
 
-  @Test
-  void invalidInstanceofClassName() {
-    ComparisonExpression expression =
-        new ComparisonExpression(new StringValue("foo"), new StringValue("String"), INSTANCEOF);
-    EvaluationException evaluationException =
-        assertThrows(
-            EvaluationException.class,
-            () -> expression.evaluate(createEvalContext(NoopResolver.INSTANCE)));
-    assertEquals("Class not found: String", evaluationException.getMessage());
-    assertEquals("\"foo\" instanceof \"String\"", evaluationException.getExpr());
-  }
+    @Test
+    void invalidInstanceofClassName() {
+        ComparisonExpression expression =
+                new ComparisonExpression(new StringValue("foo"), new StringValue("String"), INSTANCEOF);
+        EvaluationException evaluationException = assertThrows(
+                EvaluationException.class, () -> expression.evaluate(createEvalContext(NoopResolver.INSTANCE)));
+        assertEquals("Class not found: String", evaluationException.getMessage());
+        assertEquals("\"foo\" instanceof \"String\"", evaluationException.getExpr());
+    }
 
-  private static class NoopResolver implements ValueReferenceResolver {
-    static ValueReferenceResolver INSTANCE = new NoopResolver();
+    private static class NoopResolver implements ValueReferenceResolver {
+        static ValueReferenceResolver INSTANCE = new NoopResolver();
 
-    @Override
-    public CapturedContext.CapturedValue lookup(String name) {
-      return CapturedContext.CapturedValue.UNDEFINED;
-    }
+        @Override
+        public CapturedContext.CapturedValue lookup(String name) {
+            return CapturedContext.CapturedValue.UNDEFINED;
+        }
 
-    @Override
-    public CapturedContext.CapturedValue getMember(Object target, String name) {
-      return CapturedContext.CapturedValue.UNDEFINED;
+        @Override
+        public CapturedContext.CapturedValue getMember(Object target, String name) {
+            return CapturedContext.CapturedValue.UNDEFINED;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ContainsExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ContainsExpressionTest.java
index 3c5d0d239d8..3c7ea067fcf 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ContainsExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ContainsExpressionTest.java
@@ -24,180 +24,176 @@
 import org.junit.jupiter.api.Test;
 
 class ContainsExpressionTest {
-  private final EvalContext evalContext = createEvalContext(this);
+    private final EvalContext evalContext = createEvalContext(this);
 
-  private List<String> list = Arrays.asList("foo", "bar", "baz");
-  private List<String> listWithNull = Arrays.asList("foo", null, "baz");
-  private List<Integer> largeList = new ArrayList<>();
+    private List<String> list = Arrays.asList("foo", "bar", "baz");
+    private List<String> listWithNull = Arrays.asList("foo", null, "baz");
+    private List<Integer> largeList = new ArrayList<>();
 
-  {
-    for (int i = 0; i < 1_000_001; i++) {
-      largeList.add(i);
+    {
+        for (int i = 0; i < 1_000_001; i++) {
+            largeList.add(i);
+        }
     }
-  }
 
-  private List<String> slowList = new ArrayList<>();
+    private List<String> slowList = new ArrayList<>();
 
-  {
-    for (int i = 0; i < 10_000; i++) {
-      slowList.add(String.valueOf(i));
+    {
+        for (int i = 0; i < 10_000; i++) {
+            slowList.add(String.valueOf(i));
+        }
     }
-  }
-
-  private String[] arrayStr = new String[] {"foo", "bar", "baz"};
-  private String[] arrayStrWithNull = new String[] {"foo", null, "bar"};
-  private int[] arrayInt = new int[] {1, 2, 3};
-  private char[] arrayChar = new char[] {'a', 'b', 'c'};
-  private long[] arrayLong = new long[] {1, 2, 3};
-  private double[] arrayDouble = new double[] {1, 2, 3};
-  private Map<String, String> mapStr = new HashMap<>();
-
-  {
-    mapStr.put("foo", "bar");
-    mapStr.put("bar", "baz");
-  }
-
-  private Map<String, String> mapStrWithNull = new HashMap<>();
-
-  {
-    mapStrWithNull.put("foo", "bar");
-    mapStrWithNull.put(null, "baz");
-  }
-
-  private Set<String> setStr = new HashSet<>();
-
-  {
-    setStr.add("foo");
-    setStr.add("bar");
-  }
-
-  private Set<String> setStrWithNull = new HashSet<>();
-
-  {
-    setStrWithNull.add("foo");
-    setStrWithNull.add(null);
-  }
-
-  @Test
-  void nullExpression() {
-    ContainsExpression expression = new ContainsExpression(null, null);
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("contains(null, null)", print(expression));
-  }
-
-  @Test
-  void undefinedExpression() {
-    ContainsExpression expression =
-        new ContainsExpression(DSL.value(Values.UNDEFINED_OBJECT), new StringValue(null));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("contains(UNDEFINED, \"null\")", print(expression));
-  }
-
-  @Test
-  void stringExpression() {
-    ContainsExpression expression =
-        new ContainsExpression(DSL.value("abcd"), new StringValue("bc"));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("contains(\"abcd\", \"bc\")", print(expression));
-
-    expression = new ContainsExpression(DSL.value("abc"), new StringValue("dc"));
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("contains(\"abc\", \"dc\")", print(expression));
-
-    ContainsExpression nullValExpression = new ContainsExpression(DSL.value("abcd"), null);
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> nullValExpression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for non-string value", exception.getMessage());
-    assertEquals("contains(\"abcd\", null)", print(nullValExpression));
-  }
-
-  @Test
-  void listExpression() {
-    ContainsExpression expression = new ContainsExpression(DSL.ref("list"), DSL.value("bar"));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("contains(list, \"bar\")", print(expression));
-
-    expression = new ContainsExpression(DSL.ref("listWithNull"), null);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("contains(listWithNull, null)", print(expression));
-
-    ContainsExpression largeExpression = new ContainsExpression(DSL.ref("largeList"), DSL.value(1));
-    EvaluationException evaluationException =
-        assertThrows(EvaluationException.class, () -> largeExpression.evaluate(evalContext));
-    assertEquals("Collection too large (>1000000)", evaluationException.getMessage());
-
-    ContainsExpression slowListExpression =
-        new ContainsExpression(DSL.ref("slowList"), DSL.value(new SlowObject()));
-    assertThrows(
-        EvaluationException.class,
-        () -> slowListExpression.evaluate(createEvalContext(this, Duration.ofMillis(1))));
-  }
-
-  @Test
-  void arrayExpression() {
-    ContainsExpression expression = new ContainsExpression(DSL.ref("arrayStr"), DSL.value("bar"));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("contains(arrayStr, \"bar\")", print(expression));
-
-    expression = new ContainsExpression(DSL.ref("arrayInt"), DSL.value(2));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("contains(arrayInt, 2)", print(expression));
-
-    expression = new ContainsExpression(DSL.ref("arrayChar"), DSL.value("b"));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("contains(arrayChar, \"b\")", print(expression));
-
-    expression = new ContainsExpression(DSL.ref("arrayLong"), DSL.value(2));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("contains(arrayLong, 2)", print(expression));
-
-    expression = new ContainsExpression(DSL.ref("arrayDouble"), DSL.value(2.0));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("contains(arrayDouble, 2.0)", print(expression));
-
-    expression = new ContainsExpression(DSL.ref("arrayStrWithNull"), null);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("contains(arrayStrWithNull, null)", print(expression));
-
-    ContainsExpression primitiveNullExpression = new ContainsExpression(DSL.ref("arrayInt"), null);
-    EvaluationException exception =
+
+    private String[] arrayStr = new String[] {"foo", "bar", "baz"};
+    private String[] arrayStrWithNull = new String[] {"foo", null, "bar"};
+    private int[] arrayInt = new int[] {1, 2, 3};
+    private char[] arrayChar = new char[] {'a', 'b', 'c'};
+    private long[] arrayLong = new long[] {1, 2, 3};
+    private double[] arrayDouble = new double[] {1, 2, 3};
+    private Map<String, String> mapStr = new HashMap<>();
+
+    {
+        mapStr.put("foo", "bar");
+        mapStr.put("bar", "baz");
+    }
+
+    private Map<String, String> mapStrWithNull = new HashMap<>();
+
+    {
+        mapStrWithNull.put("foo", "bar");
+        mapStrWithNull.put(null, "baz");
+    }
+
+    private Set<String> setStr = new HashSet<>();
+
+    {
+        setStr.add("foo");
+        setStr.add("bar");
+    }
+
+    private Set<String> setStrWithNull = new HashSet<>();
+
+    {
+        setStrWithNull.add("foo");
+        setStrWithNull.add(null);
+    }
+
+    @Test
+    void nullExpression() {
+        ContainsExpression expression = new ContainsExpression(null, null);
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("contains(null, null)", print(expression));
+    }
+
+    @Test
+    void undefinedExpression() {
+        ContainsExpression expression =
+                new ContainsExpression(DSL.value(Values.UNDEFINED_OBJECT), new StringValue(null));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("contains(UNDEFINED, \"null\")", print(expression));
+    }
+
+    @Test
+    void stringExpression() {
+        ContainsExpression expression = new ContainsExpression(DSL.value("abcd"), new StringValue("bc"));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("contains(\"abcd\", \"bc\")", print(expression));
+
+        expression = new ContainsExpression(DSL.value("abc"), new StringValue("dc"));
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("contains(\"abc\", \"dc\")", print(expression));
+
+        ContainsExpression nullValExpression = new ContainsExpression(DSL.value("abcd"), null);
+        EvaluationException exception =
+                assertThrows(EvaluationException.class, () -> nullValExpression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for non-string value", exception.getMessage());
+        assertEquals("contains(\"abcd\", null)", print(nullValExpression));
+    }
+
+    @Test
+    void listExpression() {
+        ContainsExpression expression = new ContainsExpression(DSL.ref("list"), DSL.value("bar"));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("contains(list, \"bar\")", print(expression));
+
+        expression = new ContainsExpression(DSL.ref("listWithNull"), null);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("contains(listWithNull, null)", print(expression));
+
+        ContainsExpression largeExpression = new ContainsExpression(DSL.ref("largeList"), DSL.value(1));
+        EvaluationException evaluationException =
+                assertThrows(EvaluationException.class, () -> largeExpression.evaluate(evalContext));
+        assertEquals("Collection too large (>1000000)", evaluationException.getMessage());
+
+        ContainsExpression slowListExpression =
+                new ContainsExpression(DSL.ref("slowList"), DSL.value(new SlowObject()));
         assertThrows(
-            EvaluationException.class, () -> primitiveNullExpression.evaluate(evalContext));
-    assertEquals("Cannot compare null with primitive array", exception.getMessage());
-    assertEquals("contains(arrayInt, null)", print(primitiveNullExpression));
-  }
-
-  @Test
-  void mapExpression() {
-    ContainsExpression expression = new ContainsExpression(DSL.ref("mapStr"), DSL.value("bar"));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("contains(mapStr, \"bar\")", print(expression));
-
-    expression = new ContainsExpression(DSL.ref("mapStrWithNull"), null);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("contains(mapStrWithNull, null)", print(expression));
-  }
-
-  @Test
-  void setExpression() {
-    ContainsExpression expression = new ContainsExpression(DSL.ref("setStr"), DSL.value("bar"));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("contains(setStr, \"bar\")", print(expression));
-
-    expression = new ContainsExpression(DSL.ref("setStrWithNull"), null);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("contains(setStrWithNull, null)", print(expression));
-  }
-
-  static class SlowObject {
-    @Override
-    public boolean equals(Object obj) {
-      LockSupport.parkNanos(1000);
-      return super.equals(obj);
+                EvaluationException.class,
+                () -> slowListExpression.evaluate(createEvalContext(this, Duration.ofMillis(1))));
+    }
+
+    @Test
+    void arrayExpression() {
+        ContainsExpression expression = new ContainsExpression(DSL.ref("arrayStr"), DSL.value("bar"));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("contains(arrayStr, \"bar\")", print(expression));
+
+        expression = new ContainsExpression(DSL.ref("arrayInt"), DSL.value(2));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("contains(arrayInt, 2)", print(expression));
+
+        expression = new ContainsExpression(DSL.ref("arrayChar"), DSL.value("b"));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("contains(arrayChar, \"b\")", print(expression));
+
+        expression = new ContainsExpression(DSL.ref("arrayLong"), DSL.value(2));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("contains(arrayLong, 2)", print(expression));
+
+        expression = new ContainsExpression(DSL.ref("arrayDouble"), DSL.value(2.0));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("contains(arrayDouble, 2.0)", print(expression));
+
+        expression = new ContainsExpression(DSL.ref("arrayStrWithNull"), null);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("contains(arrayStrWithNull, null)", print(expression));
+
+        ContainsExpression primitiveNullExpression = new ContainsExpression(DSL.ref("arrayInt"), null);
+        EvaluationException exception =
+                assertThrows(EvaluationException.class, () -> primitiveNullExpression.evaluate(evalContext));
+        assertEquals("Cannot compare null with primitive array", exception.getMessage());
+        assertEquals("contains(arrayInt, null)", print(primitiveNullExpression));
+    }
+
+    @Test
+    void mapExpression() {
+        ContainsExpression expression = new ContainsExpression(DSL.ref("mapStr"), DSL.value("bar"));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("contains(mapStr, \"bar\")", print(expression));
+
+        expression = new ContainsExpression(DSL.ref("mapStrWithNull"), null);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("contains(mapStrWithNull, null)", print(expression));
+    }
+
+    @Test
+    void setExpression() {
+        ContainsExpression expression = new ContainsExpression(DSL.ref("setStr"), DSL.value("bar"));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("contains(setStr, \"bar\")", print(expression));
+
+        expression = new ContainsExpression(DSL.ref("setStrWithNull"), null);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("contains(setStrWithNull, null)", print(expression));
+    }
+
+    static class SlowObject {
+        @Override
+        public boolean equals(Object obj) {
+            LockSupport.parkNanos(1000);
+            return super.equals(obj);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/EndsWithExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/EndsWithExpressionTest.java
index 1ac730564a7..93c9ee94485 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/EndsWithExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/EndsWithExpressionTest.java
@@ -16,44 +16,42 @@
 import org.junit.jupiter.api.Test;
 
 class EndsWithExpressionTest {
-  private final EvalContext evalContext = createEvalContext(this);
-  // used to ref lookup
-  URI uri = URI.create("https://www.datadoghq.com");
-
-  @Test
-  void nullExpression() {
-    EndsWithExpression expression = new EndsWithExpression(null, null);
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("endsWith(null, null)", print(expression));
-  }
-
-  @Test
-  void undefinedExpression() {
-    EndsWithExpression expression =
-        new EndsWithExpression(DSL.value(Values.UNDEFINED_OBJECT), new StringValue(null));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("endsWith(UNDEFINED, \"null\")", print(expression));
-  }
-
-  @Test
-  void stringExpression() {
-    EndsWithExpression expression = new EndsWithExpression(DSL.value("abc"), new StringValue("bc"));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("endsWith(\"abc\", \"bc\")", print(expression));
-
-    expression = new EndsWithExpression(DSL.value("abc"), new StringValue("ab"));
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("endsWith(\"abc\", \"ab\")", print(expression));
-  }
-
-  @Test
-  void stringPrimitives() {
-    EndsWithExpression expression = new EndsWithExpression(DSL.ref("uri"), new StringValue(".com"));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("endsWith(uri, \".com\")", print(expression));
-  }
+    private final EvalContext evalContext = createEvalContext(this);
+    // used to ref lookup
+    URI uri = URI.create("https://www.datadoghq.com");
+
+    @Test
+    void nullExpression() {
+        EndsWithExpression expression = new EndsWithExpression(null, null);
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("endsWith(null, null)", print(expression));
+    }
+
+    @Test
+    void undefinedExpression() {
+        EndsWithExpression expression =
+                new EndsWithExpression(DSL.value(Values.UNDEFINED_OBJECT), new StringValue(null));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("endsWith(UNDEFINED, \"null\")", print(expression));
+    }
+
+    @Test
+    void stringExpression() {
+        EndsWithExpression expression = new EndsWithExpression(DSL.value("abc"), new StringValue("bc"));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("endsWith(\"abc\", \"bc\")", print(expression));
+
+        expression = new EndsWithExpression(DSL.value("abc"), new StringValue("ab"));
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("endsWith(\"abc\", \"ab\")", print(expression));
+    }
+
+    @Test
+    void stringPrimitives() {
+        EndsWithExpression expression = new EndsWithExpression(DSL.ref("uri"), new StringValue(".com"));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("endsWith(uri, \".com\")", print(expression));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/FilterCollectionExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/FilterCollectionExpressionTest.java
index a2f25c1b306..b83d24357ce 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/FilterCollectionExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/FilterCollectionExpressionTest.java
@@ -34,322 +34,305 @@
 
 class FilterCollectionExpressionTest {
 
-  private final EvalContext evalContext = createEvalContext(this);
-
-  @Test
-  void testMatchingList() {
-    ListValue collection = new ListValue(new int[] {1, 2, 3});
-
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
-    CollectionValue<?> filtered = expression.evaluate(evalContext);
-    assertNotEquals(collection, filtered);
-    assertEquals(1, filtered.count());
-    assertFalse(filtered.isEmpty());
-    assertFalse(filtered.isNull());
-    assertFalse(filtered.isUndefined());
-    assertEquals("filter(int[], {@it < 2})", print(expression));
-  }
-
-  @Test
-  void testEmptyList() {
-    ListValue collection = new ListValue(new int[0]);
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
-    CollectionValue<?> filtered = expression.evaluate(evalContext);
-    assertNotEquals(collection, filtered);
-    assertTrue(filtered.isEmpty());
-    assertFalse(filtered.isNull());
-    assertFalse(filtered.isUndefined());
-    assertEquals("filter(int[], {@it < 2})", print(expression));
-  }
-
-  @Test
-  void testNullList() {
-    ListValue collection = new ListValue(null);
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("filter(null, {@it < 2})", print(expression));
-  }
-
-  @Test
-  void testNullObjectList() {
-    ListValue collection = new ListValue(Values.NULL_OBJECT);
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("filter(null, {@it < 2})", print(expression));
-  }
-
-  @Test
-  void testUndefinedList() {
-    ListValue collection = new ListValue(Values.UNDEFINED_OBJECT);
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("filter(null, {@it < 2})", print(expression));
-  }
-
-  @Test
-  void testLargeList() {
-    List<Integer> largeList = new ArrayList<>();
-    for (int i = 0; i < 1_000_000; i++) {
-      largeList.add(i);
+    private final EvalContext evalContext = createEvalContext(this);
+
+    @Test
+    void testMatchingList() {
+        ListValue collection = new ListValue(new int[] {1, 2, 3});
+
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
+        CollectionValue<?> filtered = expression.evaluate(evalContext);
+        assertNotEquals(collection, filtered);
+        assertEquals(1, filtered.count());
+        assertFalse(filtered.isEmpty());
+        assertFalse(filtered.isNull());
+        assertFalse(filtered.isUndefined());
+        assertEquals("filter(int[], {@it < 2})", print(expression));
     }
-    ListValue collection = new ListValue(largeList);
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(0)));
-    EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
-    assertEquals("timeout (1ms)", exception.getMessage());
-    assertEquals("filter(List, {@it < 0})", print(expression));
-  }
-
-  @Test
-  void testMatchingMap() {
-    Map<String, Integer> map = new HashMap<>();
-    map.put("a", 1);
-    map.put("b", 2);
-    map.put("c", 3);
-    MapValue collection = new MapValue(map);
-
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(
-            collection, eq(getMember(ref(ValueReferences.ITERATOR_REF), "key"), value("b")));
-    CollectionValue<?> filtered = expression.evaluate(evalContext);
-    assertNotEquals(collection, filtered);
-    assertEquals(1, filtered.count());
-    assertFalse(filtered.isEmpty());
-    assertFalse(filtered.isNull());
-    assertFalse(filtered.isUndefined());
-
-    expression =
-        new FilterCollectionExpression(
-            collection, lt(getMember(ref(ValueReferences.ITERATOR_REF), "value"), value(2)));
-    filtered = expression.evaluate(evalContext);
-    assertNotEquals(collection, filtered);
-    assertEquals(1, filtered.count());
-    assertFalse(filtered.isEmpty());
-    assertFalse(filtered.isNull());
-    assertFalse(filtered.isUndefined());
-    assertEquals("filter(Map, {@it.value < 2})", print(expression));
-  }
-
-  @Test
-  void testEmptyMap() {
-    MapValue collection = new MapValue(Collections.emptyMap());
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
-    CollectionValue<?> filtered = expression.evaluate(evalContext);
-    assertNotEquals(collection, filtered);
-    assertTrue(filtered.isEmpty());
-    assertFalse(filtered.isNull());
-    assertFalse(filtered.isUndefined());
-    assertEquals("filter(Map, {@it < 2})", print(expression));
-  }
-
-  @Test
-  void testNullMap() {
-    MapValue collection = new MapValue(null);
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("filter(null, {@it < 2})", print(expression));
-  }
-
-  @Test
-  void testNullObjectMap() {
-    MapValue collection = new MapValue(Values.NULL_OBJECT);
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("filter(null, {@it < 2})", print(expression));
-  }
-
-  @Test
-  void testUndefinedMap() {
-    MapValue collection = new MapValue(Values.UNDEFINED_OBJECT);
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("filter(null, {@it < 2})", print(expression));
-  }
-
-  @Test
-  void keyValueMap() {
-    Map<String, Integer> map = new HashMap<>();
-    map.put("a", 1);
-    map.put("b", 2);
-    map.put("c", 3);
-    MapValue collection = new MapValue(map);
-
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, eq(ref(ValueReferences.KEY_REF), value("b")));
-    CollectionValue<?> filtered = expression.evaluate(evalContext);
-    assertNotEquals(collection, filtered);
-    assertEquals(1, filtered.count());
-    assertEquals("filter(Map, {@key == \"b\"})", print(expression));
-
-    expression =
-        new FilterCollectionExpression(collection, eq(ref(ValueReferences.VALUE_REF), value(2)));
-    filtered = expression.evaluate(evalContext);
-    assertNotEquals(collection, filtered);
-    assertEquals(1, filtered.count());
-    assertEquals("filter(Map, {@value == 2})", print(expression));
-  }
-
-  @Test
-  void testLargeMap() {
-    Map<Integer, Integer> map = new HashMap<>();
-    for (int i = 0; i <= 1_000_000; i++) {
-      map.put(i, i);
+
+    @Test
+    void testEmptyList() {
+        ListValue collection = new ListValue(new int[0]);
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
+        CollectionValue<?> filtered = expression.evaluate(evalContext);
+        assertNotEquals(collection, filtered);
+        assertTrue(filtered.isEmpty());
+        assertFalse(filtered.isNull());
+        assertFalse(filtered.isUndefined());
+        assertEquals("filter(int[], {@it < 2})", print(expression));
+    }
+
+    @Test
+    void testNullList() {
+        ListValue collection = new ListValue(null);
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("filter(null, {@it < 2})", print(expression));
+    }
+
+    @Test
+    void testNullObjectList() {
+        ListValue collection = new ListValue(Values.NULL_OBJECT);
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("filter(null, {@it < 2})", print(expression));
+    }
+
+    @Test
+    void testUndefinedList() {
+        ListValue collection = new ListValue(Values.UNDEFINED_OBJECT);
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("filter(null, {@it < 2})", print(expression));
+    }
+
+    @Test
+    void testLargeList() {
+        List<Integer> largeList = new ArrayList<>();
+        for (int i = 0; i < 1_000_000; i++) {
+            largeList.add(i);
+        }
+        ListValue collection = new ListValue(largeList);
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(0)));
+        EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
+        EvaluationException exception =
+                assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
+        assertEquals("timeout (1ms)", exception.getMessage());
+        assertEquals("filter(List, {@it < 0})", print(expression));
+    }
+
+    @Test
+    void testMatchingMap() {
+        Map<String, Integer> map = new HashMap<>();
+        map.put("a", 1);
+        map.put("b", 2);
+        map.put("c", 3);
+        MapValue collection = new MapValue(map);
+
+        FilterCollectionExpression expression = new FilterCollectionExpression(
+                collection, eq(getMember(ref(ValueReferences.ITERATOR_REF), "key"), value("b")));
+        CollectionValue<?> filtered = expression.evaluate(evalContext);
+        assertNotEquals(collection, filtered);
+        assertEquals(1, filtered.count());
+        assertFalse(filtered.isEmpty());
+        assertFalse(filtered.isNull());
+        assertFalse(filtered.isUndefined());
+
+        expression = new FilterCollectionExpression(
+                collection, lt(getMember(ref(ValueReferences.ITERATOR_REF), "value"), value(2)));
+        filtered = expression.evaluate(evalContext);
+        assertNotEquals(collection, filtered);
+        assertEquals(1, filtered.count());
+        assertFalse(filtered.isEmpty());
+        assertFalse(filtered.isNull());
+        assertFalse(filtered.isUndefined());
+        assertEquals("filter(Map, {@it.value < 2})", print(expression));
     }
-    MapValue collection = new MapValue(map);
-
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(0)));
-    EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
-    assertEquals("timeout (1ms)", exception.getMessage());
-    assertEquals("filter(Map, {@it < 0})", print(expression));
-  }
-
-  @Test
-  void testMatchingSet() {
-    SetValue collection = new SetValue(new HashSet<>(Arrays.asList(1, 2, 3)));
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
-    CollectionValue<?> filtered = expression.evaluate(evalContext);
-    assertNotEquals(collection, filtered);
-    assertEquals(1, filtered.count());
-    assertFalse(filtered.isEmpty());
-    assertFalse(filtered.isNull());
-    assertFalse(filtered.isUndefined());
-    assertEquals("filter(Set, {@it < 2})", print(expression));
-  }
-
-  @Test
-  void testEmptySet() {
-    SetValue collection = new SetValue(new HashSet<>());
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
-    CollectionValue<?> filtered = expression.evaluate(evalContext);
-    assertNotEquals(collection, filtered);
-    assertTrue(filtered.isEmpty());
-    assertFalse(filtered.isNull());
-    assertFalse(filtered.isUndefined());
-    assertEquals("filter(Set, {@it < 2})", print(expression));
-  }
-
-  @Test
-  void testNullSet() {
-    SetValue collection = new SetValue(null);
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("filter(null, {@it < 2})", print(expression));
-  }
-
-  @Test
-  void testNullObjectSet() {
-    ListValue collection = new ListValue(Values.NULL_OBJECT);
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("filter(null, {@it < 2})", print(expression));
-  }
-
-  @Test
-  void testUndefinedSet() {
-    ListValue collection = new ListValue(Values.UNDEFINED_OBJECT);
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("filter(null, {@it < 2})", print(expression));
-  }
-
-  @Test
-  void testLargeSet() {
-    Set<Integer> set = new HashSet<>();
-    for (int i = 0; i <= 1_000_000; i++) {
-      set.add(i);
+
+    @Test
+    void testEmptyMap() {
+        MapValue collection = new MapValue(Collections.emptyMap());
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
+        CollectionValue<?> filtered = expression.evaluate(evalContext);
+        assertNotEquals(collection, filtered);
+        assertTrue(filtered.isEmpty());
+        assertFalse(filtered.isNull());
+        assertFalse(filtered.isUndefined());
+        assertEquals("filter(Map, {@it < 2})", print(expression));
+    }
+
+    @Test
+    void testNullMap() {
+        MapValue collection = new MapValue(null);
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("filter(null, {@it < 2})", print(expression));
+    }
+
+    @Test
+    void testNullObjectMap() {
+        MapValue collection = new MapValue(Values.NULL_OBJECT);
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("filter(null, {@it < 2})", print(expression));
+    }
+
+    @Test
+    void testUndefinedMap() {
+        MapValue collection = new MapValue(Values.UNDEFINED_OBJECT);
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("filter(null, {@it < 2})", print(expression));
+    }
+
+    @Test
+    void keyValueMap() {
+        Map<String, Integer> map = new HashMap<>();
+        map.put("a", 1);
+        map.put("b", 2);
+        map.put("c", 3);
+        MapValue collection = new MapValue(map);
+
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, eq(ref(ValueReferences.KEY_REF), value("b")));
+        CollectionValue<?> filtered = expression.evaluate(evalContext);
+        assertNotEquals(collection, filtered);
+        assertEquals(1, filtered.count());
+        assertEquals("filter(Map, {@key == \"b\"})", print(expression));
+
+        expression = new FilterCollectionExpression(collection, eq(ref(ValueReferences.VALUE_REF), value(2)));
+        filtered = expression.evaluate(evalContext);
+        assertNotEquals(collection, filtered);
+        assertEquals(1, filtered.count());
+        assertEquals("filter(Map, {@value == 2})", print(expression));
+    }
+
+    @Test
+    void testLargeMap() {
+        Map<Integer, Integer> map = new HashMap<>();
+        for (int i = 0; i <= 1_000_000; i++) {
+            map.put(i, i);
+        }
+        MapValue collection = new MapValue(map);
+
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(0)));
+        EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
+        EvaluationException exception =
+                assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
+        assertEquals("timeout (1ms)", exception.getMessage());
+        assertEquals("filter(Map, {@it < 0})", print(expression));
     }
-    SetValue collection = new SetValue(set);
-
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(0)));
-    EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
-    assertEquals("timeout (1ms)", exception.getMessage());
-    assertEquals("filter(Set, {@it < 0})", print(expression));
-  }
-
-  @Test
-  void testUnsupportedList() {
-    ListValue collection = new ListValue(new CustomList());
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(
-            collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo")));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals(
-        "Unsupported List class: com.datadog.debugger.el.expressions.FilterCollectionExpressionTest$CustomList",
-        exception.getMessage());
-    assertEquals("filter(List, {@it == \"foo\"})", print(expression));
-  }
-
-  @Test
-  void testUnsupportedMap() {
-    MapValue collection = new MapValue(new CustomMap());
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(collection, eq(ref(ValueReferences.VALUE_REF), value(2)));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals(
-        "Unsupported Map class: com.datadog.debugger.el.expressions.FilterCollectionExpressionTest$CustomMap",
-        exception.getMessage());
-    assertEquals("filter(Map, {@value == 2})", print(expression));
-  }
-
-  @Test
-  void testUnsupportedSet() {
-    SetValue collection = new SetValue(new CustomSet());
-    FilterCollectionExpression expression =
-        new FilterCollectionExpression(
-            collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo")));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals(
-        "Unsupported Set class: com.datadog.debugger.el.expressions.FilterCollectionExpressionTest$CustomSet",
-        exception.getMessage());
-    assertEquals("filter(Set, {@it == \"foo\"})", print(expression));
-  }
-
-  static class CustomList extends java.util.ArrayList<String> {}
-
-  static class CustomMap extends HashMap<String, Integer> {}
-
-  static class CustomSet extends java.util.HashSet<String> {}
+
+    @Test
+    void testMatchingSet() {
+        SetValue collection = new SetValue(new HashSet<>(Arrays.asList(1, 2, 3)));
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
+        CollectionValue<?> filtered = expression.evaluate(evalContext);
+        assertNotEquals(collection, filtered);
+        assertEquals(1, filtered.count());
+        assertFalse(filtered.isEmpty());
+        assertFalse(filtered.isNull());
+        assertFalse(filtered.isUndefined());
+        assertEquals("filter(Set, {@it < 2})", print(expression));
+    }
+
+    @Test
+    void testEmptySet() {
+        SetValue collection = new SetValue(new HashSet<>());
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
+        CollectionValue<?> filtered = expression.evaluate(evalContext);
+        assertNotEquals(collection, filtered);
+        assertTrue(filtered.isEmpty());
+        assertFalse(filtered.isNull());
+        assertFalse(filtered.isUndefined());
+        assertEquals("filter(Set, {@it < 2})", print(expression));
+    }
+
+    @Test
+    void testNullSet() {
+        SetValue collection = new SetValue(null);
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("filter(null, {@it < 2})", print(expression));
+    }
+
+    @Test
+    void testNullObjectSet() {
+        ListValue collection = new ListValue(Values.NULL_OBJECT);
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("filter(null, {@it < 2})", print(expression));
+    }
+
+    @Test
+    void testUndefinedSet() {
+        ListValue collection = new ListValue(Values.UNDEFINED_OBJECT);
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2)));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("filter(null, {@it < 2})", print(expression));
+    }
+
+    @Test
+    void testLargeSet() {
+        Set<Integer> set = new HashSet<>();
+        for (int i = 0; i <= 1_000_000; i++) {
+            set.add(i);
+        }
+        SetValue collection = new SetValue(set);
+
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(0)));
+        EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
+        EvaluationException exception =
+                assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
+        assertEquals("timeout (1ms)", exception.getMessage());
+        assertEquals("filter(Set, {@it < 0})", print(expression));
+    }
+
+    @Test
+    void testUnsupportedList() {
+        ListValue collection = new ListValue(new CustomList());
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo")));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals(
+                "Unsupported List class: com.datadog.debugger.el.expressions.FilterCollectionExpressionTest$CustomList",
+                exception.getMessage());
+        assertEquals("filter(List, {@it == \"foo\"})", print(expression));
+    }
+
+    @Test
+    void testUnsupportedMap() {
+        MapValue collection = new MapValue(new CustomMap());
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, eq(ref(ValueReferences.VALUE_REF), value(2)));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals(
+                "Unsupported Map class: com.datadog.debugger.el.expressions.FilterCollectionExpressionTest$CustomMap",
+                exception.getMessage());
+        assertEquals("filter(Map, {@value == 2})", print(expression));
+    }
+
+    @Test
+    void testUnsupportedSet() {
+        SetValue collection = new SetValue(new CustomSet());
+        FilterCollectionExpression expression =
+                new FilterCollectionExpression(collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo")));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals(
+                "Unsupported Set class: com.datadog.debugger.el.expressions.FilterCollectionExpressionTest$CustomSet",
+                exception.getMessage());
+        assertEquals("filter(Set, {@it == \"foo\"})", print(expression));
+    }
+
+    static class CustomList extends java.util.ArrayList<String> {}
+
+    static class CustomMap extends HashMap<String, Integer> {}
+
+    static class CustomSet extends java.util.HashSet<String> {}
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/GetMemberExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/GetMemberExpressionTest.java
index 6d2263b67da..01aaf5c827c 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/GetMemberExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/GetMemberExpressionTest.java
@@ -16,110 +16,108 @@
 import org.junit.jupiter.api.Test;
 
 class GetMemberExpressionTest {
-  @Test
-  void getMemberLevel1() {
-    GetMemberExpression expr = new GetMemberExpression(new ValueRefExpression("ref"), "b");
-    ObjectWithRefAndValue parent = new ObjectWithRefAndValue(null, "hello");
-    ExObjectWithRefAndValue instance = new ExObjectWithRefAndValue(parent, "world");
-    Value<?> val = expr.evaluate(createEvalContext(instance));
-    assertNotNull(val);
-    assertFalse(val.isUndefined());
-    assertEquals(parent.getB(), val.getValue());
-    assertEquals("ref.b", print(expr));
-  }
+    @Test
+    void getMemberLevel1() {
+        GetMemberExpression expr = new GetMemberExpression(new ValueRefExpression("ref"), "b");
+        ObjectWithRefAndValue parent = new ObjectWithRefAndValue(null, "hello");
+        ExObjectWithRefAndValue instance = new ExObjectWithRefAndValue(parent, "world");
+        Value<?> val = expr.evaluate(createEvalContext(instance));
+        assertNotNull(val);
+        assertFalse(val.isUndefined());
+        assertEquals(parent.getB(), val.getValue());
+        assertEquals("ref.b", print(expr));
+    }
 
-  @Test
-  void getMemberLevel2() {
-    // ref.ref.b
-    GetMemberExpression expr =
-        new GetMemberExpression(new GetMemberExpression(new ValueRefExpression("ref"), "ref"), "b");
-    ObjectWithRefAndValue root = new ObjectWithRefAndValue(null, "hello");
-    ObjectWithRefAndValue parent = new ObjectWithRefAndValue(root, "");
-    ExObjectWithRefAndValue instance = new ExObjectWithRefAndValue(parent, "world");
-    Value<?> val = expr.evaluate(createEvalContext(instance));
-    assertNotNull(val);
-    assertFalse(val.isUndefined());
-    assertEquals(root.getB(), val.getValue());
-    assertEquals("ref.ref.b", print(expr));
-  }
+    @Test
+    void getMemberLevel2() {
+        // ref.ref.b
+        GetMemberExpression expr =
+                new GetMemberExpression(new GetMemberExpression(new ValueRefExpression("ref"), "ref"), "b");
+        ObjectWithRefAndValue root = new ObjectWithRefAndValue(null, "hello");
+        ObjectWithRefAndValue parent = new ObjectWithRefAndValue(root, "");
+        ExObjectWithRefAndValue instance = new ExObjectWithRefAndValue(parent, "world");
+        Value<?> val = expr.evaluate(createEvalContext(instance));
+        assertNotNull(val);
+        assertFalse(val.isUndefined());
+        assertEquals(root.getB(), val.getValue());
+        assertEquals("ref.ref.b", print(expr));
+    }
 
-  @Test
-  void getMemberUndefined() {
-    GetMemberExpression expr = new GetMemberExpression(ValueExpression.UNDEFINED, "size");
-    assertEquals(Value.undefined(), expr.evaluate(createEvalContext(this)));
-  }
+    @Test
+    void getMemberUndefined() {
+        GetMemberExpression expr = new GetMemberExpression(ValueExpression.UNDEFINED, "size");
+        assertEquals(Value.undefined(), expr.evaluate(createEvalContext(this)));
+    }
 
-  class StoreSecret {
-    String password;
-    String str;
+    class StoreSecret {
+        String password;
+        String str;
 
-    public StoreSecret(String password) {
-      this.password = password;
-      this.str = password;
+        public StoreSecret(String password) {
+            this.password = password;
+            this.str = password;
+        }
     }
-  }
 
-  class Holder {
-    StoreSecret store;
+    class Holder {
+        StoreSecret store;
 
-    public Holder(StoreSecret secret) {
-      this.store = secret;
+        public Holder(StoreSecret secret) {
+            this.store = secret;
+        }
     }
-  }
 
-  @Test
-  void redacted() {
-    GetMemberExpression expr = new GetMemberExpression(new ValueRefExpression("store"), "password");
-    Holder instance = new Holder(new StoreSecret("secret123"));
-    RedactedException redactedException =
-        assertThrows(RedactedException.class, () -> expr.evaluate(createEvalContext(instance)));
-    assertEquals(
-        "Could not evaluate the expression because 'store.password' was redacted",
-        redactedException.getMessage());
-  }
-
-  @Test
-  void redactedType() {
-    Config config = Config.get();
-    setFieldInConfig(
-        config,
-        "dynamicInstrumentationRedactedTypes",
-        "com.datadog.debugger.el.expressions.GetMemberExpressionTest*");
-    try {
-      Redaction.addUserDefinedTypes(Config.get());
-      GetMemberExpression expr = new GetMemberExpression(new ValueRefExpression("store"), "str");
-      Holder instance = new Holder(new StoreSecret("secret123"));
-      RedactedException redactedException =
-          assertThrows(RedactedException.class, () -> expr.evaluate(createEvalContext(instance)));
-      assertEquals(
-          "Could not evaluate the expression because 'store' was redacted",
-          redactedException.getMessage());
-    } finally {
-      Redaction.clearUserDefinedTypes();
+    @Test
+    void redacted() {
+        GetMemberExpression expr = new GetMemberExpression(new ValueRefExpression("store"), "password");
+        Holder instance = new Holder(new StoreSecret("secret123"));
+        RedactedException redactedException =
+                assertThrows(RedactedException.class, () -> expr.evaluate(createEvalContext(instance)));
+        assertEquals(
+                "Could not evaluate the expression because 'store.password' was redacted",
+                redactedException.getMessage());
     }
-  }
 
-  @Test
-  void stringPrimitive() {
-    class StrPrimitive {
-      UUID uuid = UUID.fromString("123e4567-e89b-12d3-a456-426655440000");
-      Class<?> clazz = String.class;
+    @Test
+    void redactedType() {
+        Config config = Config.get();
+        setFieldInConfig(
+                config,
+                "dynamicInstrumentationRedactedTypes",
+                "com.datadog.debugger.el.expressions.GetMemberExpressionTest*");
+        try {
+            Redaction.addUserDefinedTypes(Config.get());
+            GetMemberExpression expr = new GetMemberExpression(new ValueRefExpression("store"), "str");
+            Holder instance = new Holder(new StoreSecret("secret123"));
+            RedactedException redactedException =
+                    assertThrows(RedactedException.class, () -> expr.evaluate(createEvalContext(instance)));
+            assertEquals(
+                    "Could not evaluate the expression because 'store' was redacted", redactedException.getMessage());
+        } finally {
+            Redaction.clearUserDefinedTypes();
+        }
     }
-    class Holder {
-      StrPrimitive strPrimitive = new StrPrimitive();
+
+    @Test
+    void stringPrimitive() {
+        class StrPrimitive {
+            UUID uuid = UUID.fromString("123e4567-e89b-12d3-a456-426655440000");
+            Class<?> clazz = String.class;
+        }
+        class Holder {
+            StrPrimitive strPrimitive = new StrPrimitive();
+        }
+        GetMemberExpression expr = new GetMemberExpression(new ValueRefExpression("strPrimitive"), "uuid");
+        Value<?> val = expr.evaluate(createEvalContext(new Holder()));
+        assertNotNull(val);
+        assertFalse(val.isUndefined());
+        assertEquals("123e4567-e89b-12d3-a456-426655440000", val.getValue());
+        assertEquals("strPrimitive.uuid", print(expr));
+        expr = new GetMemberExpression(new ValueRefExpression("strPrimitive"), "clazz");
+        val = expr.evaluate(createEvalContext(new Holder()));
+        assertNotNull(val);
+        assertFalse(val.isUndefined());
+        assertEquals("java.lang.String", val.getValue());
+        assertEquals("strPrimitive.clazz", print(expr));
     }
-    GetMemberExpression expr =
-        new GetMemberExpression(new ValueRefExpression("strPrimitive"), "uuid");
-    Value<?> val = expr.evaluate(createEvalContext(new Holder()));
-    assertNotNull(val);
-    assertFalse(val.isUndefined());
-    assertEquals("123e4567-e89b-12d3-a456-426655440000", val.getValue());
-    assertEquals("strPrimitive.uuid", print(expr));
-    expr = new GetMemberExpression(new ValueRefExpression("strPrimitive"), "clazz");
-    val = expr.evaluate(createEvalContext(new Holder()));
-    assertNotNull(val);
-    assertFalse(val.isUndefined());
-    assertEquals("java.lang.String", val.getValue());
-    assertEquals("strPrimitive.clazz", print(expr));
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/HasAllExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/HasAllExpressionTest.java
index 20e01b6c9b4..f8ae772c6e7 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/HasAllExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/HasAllExpressionTest.java
@@ -36,311 +36,293 @@
 import org.junit.jupiter.api.Test;
 
 class HasAllExpressionTest {
-  private final int testField = 10;
-
-  EvalContext evalContext = createEvalContext(this);
-
-  @Test
-  void testNullPredicate() {
-    HasAllExpression nullExpression = new HasAllExpression(null, null);
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("all(null, {true})", print(nullExpression));
-    HasAllExpression undefinedExpression =
-        new HasAllExpression(value(Values.UNDEFINED_OBJECT), null);
-    exception =
-        assertThrows(EvaluationException.class, () -> undefinedExpression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("all(UNDEFINED, {true})", print(undefinedExpression));
-    HasAllExpression expression = new HasAllExpression(value(new Object[] {this}), null);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("all(java.lang.Object[], {true})", print(expression));
-    expression = new HasAllExpression(value(Collections.singletonList(this)), null);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("all(List, {true})", print(expression));
-    expression = new HasAllExpression(value(Collections.singletonMap(this, this)), null);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("all(Map, {true})", print(expression));
-  }
-
-  @Test
-  void testNullHasAll() {
-    HasAllExpression nullExpression1 = all(null, TRUE);
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> nullExpression1.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("all(null, {true})", print(nullExpression1));
-
-    HasAllExpression nullExpression2 = all(null, FALSE);
-    exception =
-        assertThrows(EvaluationException.class, () -> nullExpression2.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("all(null, {false})", print(nullExpression2));
-
-    HasAllExpression nullExpression3 = all(null, eq(ref("testField"), value(10)));
-    exception =
-        assertThrows(EvaluationException.class, () -> nullExpression3.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("all(null, {testField == 10})", print(nullExpression3));
-  }
-
-  @Test
-  void testUndefinedHasAll() {
-    HasAllExpression undefinedExpression = all(value(Values.UNDEFINED_OBJECT), TRUE);
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> undefinedExpression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("all(UNDEFINED, {true})", print(undefinedExpression));
-
-    HasAllExpression nullExpression = all(null, FALSE);
-    exception = assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("all(null, {false})", print(nullExpression));
-
-    HasAllExpression expression =
-        all(value(Values.UNDEFINED_OBJECT), eq(ref("testField"), value(10)));
-    exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("all(UNDEFINED, {testField == 10})", print(expression));
-  }
-
-  @Test
-  void testArrayHasAll() {
-    ValueExpression<?> targetExpression = value(new Object[] {this, "hello"});
-
-    HasAllExpression expression = all(targetExpression, TRUE);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("all(java.lang.Object[], {true})", print(expression));
-
-    expression = all(targetExpression, FALSE);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("all(java.lang.Object[], {false})", print(expression));
-
-    GetMemberExpression fldRef = getMember(ref(ValueReferences.ITERATOR_REF), "testField");
-    ValueRefExpression itRef = ref(ValueReferences.ITERATOR_REF);
-
-    RuntimeException runtimeException =
-        assertThrows(
-            RuntimeException.class,
-            () -> all(targetExpression, eq(fldRef, value(10))).evaluate(evalContext));
-    assertEquals("Cannot dereference field: testField", runtimeException.getMessage());
-
-    expression = all(targetExpression, eq(itRef, value("hello")));
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("all(java.lang.Object[], {@it == \"hello\"})", print(expression));
-
-    expression = all(targetExpression, not(isEmpty(itRef)));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("all(java.lang.Object[], {not(isEmpty(@it))})", print(expression));
-  }
-
-  @Test
-  void testListHasAll() {
-    ValueExpression<?> targetExpression = value(Arrays.asList(this, "hello"));
-
-    HasAllExpression expression = all(targetExpression, TRUE);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("all(List, {true})", print(expression));
-
-    expression = all(targetExpression, FALSE);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("all(List, {false})", print(expression));
-
-    ValueRefExpression fldRef = ref(ValueReferences.ITERATOR_REF + "testField");
-    ValueRefExpression itRef = ref(ValueReferences.ITERATOR_REF);
-
-    RuntimeException runtimeException =
-        assertThrows(
-            RuntimeException.class,
-            () -> all(targetExpression, eq(fldRef, value(10))).evaluate(evalContext));
-    assertEquals("Cannot find synthetic var: ittestField", runtimeException.getMessage());
-
-    expression = all(targetExpression, eq(itRef, value("hello")));
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("all(List, {@it == \"hello\"})", print(expression));
-
-    expression = all(targetExpression, not(isEmpty(itRef)));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("all(List, {not(isEmpty(@it))})", print(expression));
-  }
-
-  @Test
-  void testLargeListHasAll() {
-    List<Integer> largeList = new ArrayList<>();
-    for (int i = 0; i < 1_000_000; i++) {
-      largeList.add(i);
+    private final int testField = 10;
+
+    EvalContext evalContext = createEvalContext(this);
+
+    @Test
+    void testNullPredicate() {
+        HasAllExpression nullExpression = new HasAllExpression(null, null);
+        EvaluationException exception =
+                assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("all(null, {true})", print(nullExpression));
+        HasAllExpression undefinedExpression = new HasAllExpression(value(Values.UNDEFINED_OBJECT), null);
+        exception = assertThrows(EvaluationException.class, () -> undefinedExpression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("all(UNDEFINED, {true})", print(undefinedExpression));
+        HasAllExpression expression = new HasAllExpression(value(new Object[] {this}), null);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("all(java.lang.Object[], {true})", print(expression));
+        expression = new HasAllExpression(value(Collections.singletonList(this)), null);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("all(List, {true})", print(expression));
+        expression = new HasAllExpression(value(Collections.singletonMap(this, this)), null);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("all(Map, {true})", print(expression));
     }
-    ValueExpression<?> targetExpression = value(largeList);
-
-    HasAllExpression expression = all(targetExpression, TRUE);
-    EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
-    EvaluationException evaluationException =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
-    assertEquals("timeout (1ms)", evaluationException.getMessage());
-    assertEquals("all(List, {true})", print(expression));
-  }
-
-  @Test
-  void testMapHasAll() {
-    Map<String, String> valueMap = new HashMap<>();
-    valueMap.put("a", "a");
-    valueMap.put("b", "a");
-
-    ValueExpression<?> targetExpression = value(valueMap);
-
-    HasAllExpression expression = all(targetExpression, TRUE);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("all(Map, {true})", print(expression));
-
-    expression = all(targetExpression, FALSE);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("all(Map, {false})", print(expression));
-
-    expression =
-        all(targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "key"), value("a")));
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("all(Map, {@it.key == \"a\"})", print(expression));
-
-    expression =
-        all(
-            targetExpression,
-            eq(getMember(ref(ValueReferences.ITERATOR_REF), "value"), value("a")));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("all(Map, {@it.value == \"a\"})", print(expression));
-  }
-
-  @Test
-  void testLargeMapHasAll() {
-    Map<Integer, Integer> largeMap = new HashMap<>();
-    for (int i = 0; i < 1_000_000; i++) {
-      largeMap.put(i, i);
+
+    @Test
+    void testNullHasAll() {
+        HasAllExpression nullExpression1 = all(null, TRUE);
+        EvaluationException exception =
+                assertThrows(EvaluationException.class, () -> nullExpression1.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("all(null, {true})", print(nullExpression1));
+
+        HasAllExpression nullExpression2 = all(null, FALSE);
+        exception = assertThrows(EvaluationException.class, () -> nullExpression2.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("all(null, {false})", print(nullExpression2));
+
+        HasAllExpression nullExpression3 = all(null, eq(ref("testField"), value(10)));
+        exception = assertThrows(EvaluationException.class, () -> nullExpression3.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("all(null, {testField == 10})", print(nullExpression3));
+    }
+
+    @Test
+    void testUndefinedHasAll() {
+        HasAllExpression undefinedExpression = all(value(Values.UNDEFINED_OBJECT), TRUE);
+        EvaluationException exception =
+                assertThrows(EvaluationException.class, () -> undefinedExpression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("all(UNDEFINED, {true})", print(undefinedExpression));
+
+        HasAllExpression nullExpression = all(null, FALSE);
+        exception = assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("all(null, {false})", print(nullExpression));
+
+        HasAllExpression expression = all(value(Values.UNDEFINED_OBJECT), eq(ref("testField"), value(10)));
+        exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("all(UNDEFINED, {testField == 10})", print(expression));
+    }
+
+    @Test
+    void testArrayHasAll() {
+        ValueExpression<?> targetExpression = value(new Object[] {this, "hello"});
+
+        HasAllExpression expression = all(targetExpression, TRUE);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("all(java.lang.Object[], {true})", print(expression));
+
+        expression = all(targetExpression, FALSE);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("all(java.lang.Object[], {false})", print(expression));
+
+        GetMemberExpression fldRef = getMember(ref(ValueReferences.ITERATOR_REF), "testField");
+        ValueRefExpression itRef = ref(ValueReferences.ITERATOR_REF);
+
+        RuntimeException runtimeException = assertThrows(
+                RuntimeException.class,
+                () -> all(targetExpression, eq(fldRef, value(10))).evaluate(evalContext));
+        assertEquals("Cannot dereference field: testField", runtimeException.getMessage());
+
+        expression = all(targetExpression, eq(itRef, value("hello")));
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("all(java.lang.Object[], {@it == \"hello\"})", print(expression));
+
+        expression = all(targetExpression, not(isEmpty(itRef)));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("all(java.lang.Object[], {not(isEmpty(@it))})", print(expression));
+    }
+
+    @Test
+    void testListHasAll() {
+        ValueExpression<?> targetExpression = value(Arrays.asList(this, "hello"));
+
+        HasAllExpression expression = all(targetExpression, TRUE);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("all(List, {true})", print(expression));
+
+        expression = all(targetExpression, FALSE);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("all(List, {false})", print(expression));
+
+        ValueRefExpression fldRef = ref(ValueReferences.ITERATOR_REF + "testField");
+        ValueRefExpression itRef = ref(ValueReferences.ITERATOR_REF);
+
+        RuntimeException runtimeException = assertThrows(
+                RuntimeException.class,
+                () -> all(targetExpression, eq(fldRef, value(10))).evaluate(evalContext));
+        assertEquals("Cannot find synthetic var: ittestField", runtimeException.getMessage());
+
+        expression = all(targetExpression, eq(itRef, value("hello")));
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("all(List, {@it == \"hello\"})", print(expression));
+
+        expression = all(targetExpression, not(isEmpty(itRef)));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("all(List, {not(isEmpty(@it))})", print(expression));
+    }
+
+    @Test
+    void testLargeListHasAll() {
+        List<Integer> largeList = new ArrayList<>();
+        for (int i = 0; i < 1_000_000; i++) {
+            largeList.add(i);
+        }
+        ValueExpression<?> targetExpression = value(largeList);
+
+        HasAllExpression expression = all(targetExpression, TRUE);
+        EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
+        EvaluationException evaluationException =
+                assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
+        assertEquals("timeout (1ms)", evaluationException.getMessage());
+        assertEquals("all(List, {true})", print(expression));
+    }
+
+    @Test
+    void testMapHasAll() {
+        Map<String, String> valueMap = new HashMap<>();
+        valueMap.put("a", "a");
+        valueMap.put("b", "a");
+
+        ValueExpression<?> targetExpression = value(valueMap);
+
+        HasAllExpression expression = all(targetExpression, TRUE);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("all(Map, {true})", print(expression));
+
+        expression = all(targetExpression, FALSE);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("all(Map, {false})", print(expression));
+
+        expression = all(targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "key"), value("a")));
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("all(Map, {@it.key == \"a\"})", print(expression));
+
+        expression = all(targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "value"), value("a")));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("all(Map, {@it.value == \"a\"})", print(expression));
+    }
+
+    @Test
+    void testLargeMapHasAll() {
+        Map<Integer, Integer> largeMap = new HashMap<>();
+        for (int i = 0; i < 1_000_000; i++) {
+            largeMap.put(i, i);
+        }
+        ValueExpression<?> targetExpression = value(largeMap);
+
+        HasAllExpression expression = all(targetExpression, TRUE);
+        EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
+        EvaluationException evaluationException =
+                assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
+        assertEquals("timeout (1ms)", evaluationException.getMessage());
+        assertEquals("all(Map, {true})", print(expression));
+    }
+
+    @Test
+    void testSetHasAll() {
+        Set<String> valueSet = new HashSet<>();
+        valueSet.add("foo");
+        valueSet.add("bar");
+
+        ValueExpression<?> targetExpression = value(valueSet);
+
+        HasAllExpression expression = all(targetExpression, TRUE);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("all(Set, {true})", print(expression));
+
+        expression = all(targetExpression, FALSE);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("all(Set, {false})", print(expression));
+
+        expression = all(targetExpression, eq(ref(ValueReferences.ITERATOR_REF), value("key")));
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("all(Set, {@it == \"key\"})", print(expression));
+
+        expression = all(
+                targetExpression,
+                or(
+                        eq(ref(ValueReferences.ITERATOR_REF), value("foo")),
+                        eq(ref(ValueReferences.ITERATOR_REF), value("bar"))));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("all(Set, {@it == \"foo\" || @it == \"bar\"})", print(expression));
     }
-    ValueExpression<?> targetExpression = value(largeMap);
-
-    HasAllExpression expression = all(targetExpression, TRUE);
-    EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
-    EvaluationException evaluationException =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
-    assertEquals("timeout (1ms)", evaluationException.getMessage());
-    assertEquals("all(Map, {true})", print(expression));
-  }
-
-  @Test
-  void testSetHasAll() {
-    Set<String> valueSet = new HashSet<>();
-    valueSet.add("foo");
-    valueSet.add("bar");
-
-    ValueExpression<?> targetExpression = value(valueSet);
-
-    HasAllExpression expression = all(targetExpression, TRUE);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("all(Set, {true})", print(expression));
-
-    expression = all(targetExpression, FALSE);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("all(Set, {false})", print(expression));
-
-    expression = all(targetExpression, eq(ref(ValueReferences.ITERATOR_REF), value("key")));
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("all(Set, {@it == \"key\"})", print(expression));
-
-    expression =
-        all(
-            targetExpression,
-            or(
-                eq(ref(ValueReferences.ITERATOR_REF), value("foo")),
-                eq(ref(ValueReferences.ITERATOR_REF), value("bar"))));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("all(Set, {@it == \"foo\" || @it == \"bar\"})", print(expression));
-  }
-
-  @Test
-  void testLargeSetHasAll() {
-    Set<Integer> largeSet = new HashSet<>();
-    for (int i = 0; i < 1_000_000; i++) {
-      largeSet.add(i);
+
+    @Test
+    void testLargeSetHasAll() {
+        Set<Integer> largeSet = new HashSet<>();
+        for (int i = 0; i < 1_000_000; i++) {
+            largeSet.add(i);
+        }
+        ValueExpression<?> targetExpression = value(largeSet);
+
+        HasAllExpression expression = all(targetExpression, TRUE);
+        EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
+        EvaluationException evaluationException =
+                assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
+        assertEquals("timeout (1ms)", evaluationException.getMessage());
+        assertEquals("all(Set, {true})", print(expression));
+    }
+
+    @Test
+    void emptiness() {
+        HasAllExpression expression = all(value(new String[] {}), TRUE);
+        assertTrue(expression.evaluate(evalContext));
+        expression = all(value(Collections.emptyList()), TRUE);
+        assertTrue(expression.evaluate(evalContext));
+        expression = all(value(Collections.emptyMap()), TRUE);
+        assertTrue(expression.evaluate(evalContext));
+        expression = all(value(Collections.emptySet()), TRUE);
+        assertTrue(expression.evaluate(evalContext));
     }
-    ValueExpression<?> targetExpression = value(largeSet);
-
-    HasAllExpression expression = all(targetExpression, TRUE);
-    EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
-    EvaluationException evaluationException =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
-    assertEquals("timeout (1ms)", evaluationException.getMessage());
-    assertEquals("all(Set, {true})", print(expression));
-  }
-
-  @Test
-  void emptiness() {
-    HasAllExpression expression = all(value(new String[] {}), TRUE);
-    assertTrue(expression.evaluate(evalContext));
-    expression = all(value(Collections.emptyList()), TRUE);
-    assertTrue(expression.evaluate(evalContext));
-    expression = all(value(Collections.emptyMap()), TRUE);
-    assertTrue(expression.evaluate(evalContext));
-    expression = all(value(Collections.emptySet()), TRUE);
-    assertTrue(expression.evaluate(evalContext));
-  }
-
-  @Test
-  void keyValueMap() {
-    Map<String, String> valueMap = new HashMap<>();
-    valueMap.put("a", "a");
-    valueMap.put("b", "a");
-    ValueExpression<?> targetExpression = value(valueMap);
-    HasAllExpression expression =
-        all(targetExpression, eq(ref(ValueReferences.KEY_REF), value("a")));
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("all(Map, {@key == \"a\"})", print(expression));
-
-    expression = all(targetExpression, eq(ref(ValueReferences.VALUE_REF), value("a")));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("all(Map, {@value == \"a\"})", print(expression));
-  }
-
-  @Test
-  void testUnsupportedList() {
-    ListValue collection = new ListValue(new CustomList());
-    HasAllExpression expression =
-        all(collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo")));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals(
-        "Unsupported List class: com.datadog.debugger.el.expressions.HasAllExpressionTest$CustomList",
-        exception.getMessage());
-    assertEquals("all(List, {@it == \"foo\"})", print(expression));
-  }
-
-  @Test
-  void testUnsupportedMap() {
-    MapValue collection = new MapValue(new CustomMap());
-    HasAllExpression expression = all(collection, eq(ref(ValueReferences.VALUE_REF), value("foo")));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals(
-        "Unsupported Map class: com.datadog.debugger.el.expressions.HasAllExpressionTest$CustomMap",
-        exception.getMessage());
-    assertEquals("all(Map, {@value == \"foo\"})", print(expression));
-  }
-
-  @Test
-  void testUnsupportedSet() {
-    SetValue collection = new SetValue(new CustomSet());
-    HasAllExpression expression =
-        all(collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo")));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals(
-        "Unsupported Set class: com.datadog.debugger.el.expressions.HasAllExpressionTest$CustomSet",
-        exception.getMessage());
-    assertEquals("all(Set, {@it == \"foo\"})", print(expression));
-  }
-
-  static class CustomList extends java.util.ArrayList<String> {}
-
-  static class CustomMap extends HashMap<String, Integer> {}
-
-  static class CustomSet extends java.util.HashSet<String> {}
+
+    @Test
+    void keyValueMap() {
+        Map<String, String> valueMap = new HashMap<>();
+        valueMap.put("a", "a");
+        valueMap.put("b", "a");
+        ValueExpression<?> targetExpression = value(valueMap);
+        HasAllExpression expression = all(targetExpression, eq(ref(ValueReferences.KEY_REF), value("a")));
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("all(Map, {@key == \"a\"})", print(expression));
+
+        expression = all(targetExpression, eq(ref(ValueReferences.VALUE_REF), value("a")));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("all(Map, {@value == \"a\"})", print(expression));
+    }
+
+    @Test
+    void testUnsupportedList() {
+        ListValue collection = new ListValue(new CustomList());
+        HasAllExpression expression = all(collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo")));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals(
+                "Unsupported List class: com.datadog.debugger.el.expressions.HasAllExpressionTest$CustomList",
+                exception.getMessage());
+        assertEquals("all(List, {@it == \"foo\"})", print(expression));
+    }
+
+    @Test
+    void testUnsupportedMap() {
+        MapValue collection = new MapValue(new CustomMap());
+        HasAllExpression expression = all(collection, eq(ref(ValueReferences.VALUE_REF), value("foo")));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals(
+                "Unsupported Map class: com.datadog.debugger.el.expressions.HasAllExpressionTest$CustomMap",
+                exception.getMessage());
+        assertEquals("all(Map, {@value == \"foo\"})", print(expression));
+    }
+
+    @Test
+    void testUnsupportedSet() {
+        SetValue collection = new SetValue(new CustomSet());
+        HasAllExpression expression = all(collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo")));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals(
+                "Unsupported Set class: com.datadog.debugger.el.expressions.HasAllExpressionTest$CustomSet",
+                exception.getMessage());
+        assertEquals("all(Set, {@it == \"foo\"})", print(expression));
+    }
+
+    static class CustomList extends java.util.ArrayList<String> {}
+
+    static class CustomMap extends HashMap<String, Integer> {}
+
+    static class CustomSet extends java.util.HashSet<String> {}
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/HasAnyExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/HasAnyExpressionTest.java
index 116c5eb90df..94b60ee3147 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/HasAnyExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/HasAnyExpressionTest.java
@@ -33,310 +33,284 @@
 import org.junit.jupiter.api.Test;
 
 class HasAnyExpressionTest {
-  private final int testField = 10;
-  EvalContext evalContext = createEvalContext(this);
-
-  @Test
-  void testNullPredicate() {
-    HasAnyExpression nullExpression = new HasAnyExpression(null, null);
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("any(null, {true})", print(nullExpression));
-    HasAnyExpression undefinedExpression =
-        new HasAnyExpression(value(Values.UNDEFINED_OBJECT), null);
-    exception =
-        assertThrows(EvaluationException.class, () -> undefinedExpression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("any(UNDEFINED, {true})", print(undefinedExpression));
-    HasAnyExpression expression = new HasAnyExpression(value(new Object[] {this}), null);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("any(java.lang.Object[], {true})", print(expression));
-    expression = new HasAnyExpression(value(Collections.singletonList(this)), null);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("any(List, {true})", print(expression));
-    expression = new HasAnyExpression(value(Collections.singletonMap(this, this)), null);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("any(Map, {true})", print(expression));
-  }
-
-  @Test
-  void testNullHasAny() {
-    HasAnyExpression nullExpression1 = any(null, BooleanExpression.TRUE);
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> nullExpression1.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("any(null, {true})", print(nullExpression1));
-
-    HasAnyExpression nullExpression2 = any(null, BooleanExpression.FALSE);
-    exception =
-        assertThrows(EvaluationException.class, () -> nullExpression2.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("any(null, {false})", print(nullExpression2));
-
-    HasAnyExpression nullExpression3 = any(null, eq(ref("testField"), value(10)));
-    exception =
-        assertThrows(EvaluationException.class, () -> nullExpression3.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("any(null, {testField == 10})", print(nullExpression3));
-  }
-
-  @Test
-  void testUndefinedHasAny() {
-    HasAnyExpression undefinedExpression = any(value(Values.UNDEFINED_OBJECT), TRUE);
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> undefinedExpression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("any(UNDEFINED, {true})", print(undefinedExpression));
-
-    HasAnyExpression nullExpression = any(null, FALSE);
-    exception = assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("any(null, {false})", print(nullExpression));
-
-    HasAnyExpression undefinedExpression2 =
-        any(value(Values.UNDEFINED_OBJECT), eq(ref("testField"), value(10)));
-    exception =
-        assertThrows(EvaluationException.class, () -> undefinedExpression2.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("any(UNDEFINED, {testField == 10})", print(undefinedExpression2));
-  }
-
-  @Test
-  void testArrayHasAny() {
-    ValueExpression<?> targetExpression = value(new Object[] {this, "hello"});
-
-    HasAnyExpression expression = any(targetExpression, TRUE);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("any(java.lang.Object[], {true})", print(expression));
-
-    expression = any(targetExpression, FALSE);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("any(java.lang.Object[], {false})", print(expression));
-
-    expression =
-        any(
-            targetExpression,
-            eq(getMember(ref(ValueReferences.ITERATOR_REF), "testField"), value(10)));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("any(java.lang.Object[], {@it.testField == 10})", print(expression));
-
-    expression = any(targetExpression, eq(ref(ValueReferences.ITERATOR_REF), value("hello")));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("any(java.lang.Object[], {@it == \"hello\"})", print(expression));
-  }
-
-  @Test
-  void testListHasAny() {
-    ValueExpression<?> targetExpression = value(Arrays.asList(this, "hello"));
-
-    HasAnyExpression expression = any(targetExpression, TRUE);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("any(List, {true})", print(expression));
-
-    expression = any(targetExpression, FALSE);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("any(List, {false})", print(expression));
-
-    expression =
-        any(
-            targetExpression,
-            eq(getMember(ref(ValueReferences.ITERATOR_REF), "testField"), value(10)));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("any(List, {@it.testField == 10})", print(expression));
-
-    expression = any(targetExpression, eq(ref(ValueReferences.ITERATOR_REF), value("hello")));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("any(List, {@it == \"hello\"})", print(expression));
-  }
-
-  @Test
-  void testLargeListHasAny() {
-    List<Integer> largeList = new ArrayList<>();
-    for (int i = 0; i < 1_000_000; i++) {
-      largeList.add(i);
+    private final int testField = 10;
+    EvalContext evalContext = createEvalContext(this);
+
+    @Test
+    void testNullPredicate() {
+        HasAnyExpression nullExpression = new HasAnyExpression(null, null);
+        EvaluationException exception =
+                assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("any(null, {true})", print(nullExpression));
+        HasAnyExpression undefinedExpression = new HasAnyExpression(value(Values.UNDEFINED_OBJECT), null);
+        exception = assertThrows(EvaluationException.class, () -> undefinedExpression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("any(UNDEFINED, {true})", print(undefinedExpression));
+        HasAnyExpression expression = new HasAnyExpression(value(new Object[] {this}), null);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("any(java.lang.Object[], {true})", print(expression));
+        expression = new HasAnyExpression(value(Collections.singletonList(this)), null);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("any(List, {true})", print(expression));
+        expression = new HasAnyExpression(value(Collections.singletonMap(this, this)), null);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("any(Map, {true})", print(expression));
     }
-    ValueExpression<?> targetExpression = value(largeList);
-
-    HasAnyExpression expression = any(targetExpression, FALSE);
-    EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
-    EvaluationException evaluationException =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
-    assertEquals("timeout (1ms)", evaluationException.getMessage());
-    assertEquals("any(List, {false})", print(expression));
-  }
-
-  @Test
-  void testMapHasAny() {
-    Map<String, String> valueMap = new HashMap<>();
-    valueMap.put("a", "a");
-    valueMap.put("b", null);
-
-    ValueExpression<?> targetExpression = value(valueMap);
-
-    HasAnyExpression expression = any(targetExpression, TRUE);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("any(Map, {true})", print(expression));
-
-    expression = any(targetExpression, FALSE);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("any(Map, {false})", print(expression));
-
-    expression =
-        any(targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "key"), value("b")));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("any(Map, {@it.key == \"b\"})", print(expression));
-
-    expression =
-        any(
-            targetExpression,
-            eq(getMember(ref(ValueReferences.ITERATOR_REF), "value"), value("a")));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("any(Map, {@it.value == \"a\"})", print(expression));
-
-    expression =
-        any(targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "key"), value("c")));
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("any(Map, {@it.key == \"c\"})", print(expression));
-
-    expression =
-        any(
-            targetExpression,
-            eq(getMember(ref(ValueReferences.ITERATOR_REF), "value"), value("c")));
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("any(Map, {@it.value == \"c\"})", print(expression));
-  }
-
-  @Test
-  void testLargeMapHasAny() {
-    Map<Integer, Integer> largeMap = new HashMap<>();
-    for (int i = 0; i < 1_000_000; i++) {
-      largeMap.put(i, i);
+
+    @Test
+    void testNullHasAny() {
+        HasAnyExpression nullExpression1 = any(null, BooleanExpression.TRUE);
+        EvaluationException exception =
+                assertThrows(EvaluationException.class, () -> nullExpression1.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("any(null, {true})", print(nullExpression1));
+
+        HasAnyExpression nullExpression2 = any(null, BooleanExpression.FALSE);
+        exception = assertThrows(EvaluationException.class, () -> nullExpression2.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("any(null, {false})", print(nullExpression2));
+
+        HasAnyExpression nullExpression3 = any(null, eq(ref("testField"), value(10)));
+        exception = assertThrows(EvaluationException.class, () -> nullExpression3.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("any(null, {testField == 10})", print(nullExpression3));
+    }
+
+    @Test
+    void testUndefinedHasAny() {
+        HasAnyExpression undefinedExpression = any(value(Values.UNDEFINED_OBJECT), TRUE);
+        EvaluationException exception =
+                assertThrows(EvaluationException.class, () -> undefinedExpression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("any(UNDEFINED, {true})", print(undefinedExpression));
+
+        HasAnyExpression nullExpression = any(null, FALSE);
+        exception = assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("any(null, {false})", print(nullExpression));
+
+        HasAnyExpression undefinedExpression2 = any(value(Values.UNDEFINED_OBJECT), eq(ref("testField"), value(10)));
+        exception = assertThrows(EvaluationException.class, () -> undefinedExpression2.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("any(UNDEFINED, {testField == 10})", print(undefinedExpression2));
+    }
+
+    @Test
+    void testArrayHasAny() {
+        ValueExpression<?> targetExpression = value(new Object[] {this, "hello"});
+
+        HasAnyExpression expression = any(targetExpression, TRUE);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("any(java.lang.Object[], {true})", print(expression));
+
+        expression = any(targetExpression, FALSE);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("any(java.lang.Object[], {false})", print(expression));
+
+        expression = any(targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "testField"), value(10)));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("any(java.lang.Object[], {@it.testField == 10})", print(expression));
+
+        expression = any(targetExpression, eq(ref(ValueReferences.ITERATOR_REF), value("hello")));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("any(java.lang.Object[], {@it == \"hello\"})", print(expression));
+    }
+
+    @Test
+    void testListHasAny() {
+        ValueExpression<?> targetExpression = value(Arrays.asList(this, "hello"));
+
+        HasAnyExpression expression = any(targetExpression, TRUE);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("any(List, {true})", print(expression));
+
+        expression = any(targetExpression, FALSE);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("any(List, {false})", print(expression));
+
+        expression = any(targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "testField"), value(10)));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("any(List, {@it.testField == 10})", print(expression));
+
+        expression = any(targetExpression, eq(ref(ValueReferences.ITERATOR_REF), value("hello")));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("any(List, {@it == \"hello\"})", print(expression));
+    }
+
+    @Test
+    void testLargeListHasAny() {
+        List<Integer> largeList = new ArrayList<>();
+        for (int i = 0; i < 1_000_000; i++) {
+            largeList.add(i);
+        }
+        ValueExpression<?> targetExpression = value(largeList);
+
+        HasAnyExpression expression = any(targetExpression, FALSE);
+        EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
+        EvaluationException evaluationException =
+                assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
+        assertEquals("timeout (1ms)", evaluationException.getMessage());
+        assertEquals("any(List, {false})", print(expression));
+    }
+
+    @Test
+    void testMapHasAny() {
+        Map<String, String> valueMap = new HashMap<>();
+        valueMap.put("a", "a");
+        valueMap.put("b", null);
+
+        ValueExpression<?> targetExpression = value(valueMap);
+
+        HasAnyExpression expression = any(targetExpression, TRUE);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("any(Map, {true})", print(expression));
+
+        expression = any(targetExpression, FALSE);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("any(Map, {false})", print(expression));
+
+        expression = any(targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "key"), value("b")));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("any(Map, {@it.key == \"b\"})", print(expression));
+
+        expression = any(targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "value"), value("a")));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("any(Map, {@it.value == \"a\"})", print(expression));
+
+        expression = any(targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "key"), value("c")));
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("any(Map, {@it.key == \"c\"})", print(expression));
+
+        expression = any(targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "value"), value("c")));
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("any(Map, {@it.value == \"c\"})", print(expression));
+    }
+
+    @Test
+    void testLargeMapHasAny() {
+        Map<Integer, Integer> largeMap = new HashMap<>();
+        for (int i = 0; i < 1_000_000; i++) {
+            largeMap.put(i, i);
+        }
+        ValueExpression<?> targetExpression = value(largeMap);
+
+        HasAnyExpression expression = any(targetExpression, FALSE);
+        EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
+        EvaluationException evaluationException =
+                assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
+        assertEquals("timeout (1ms)", evaluationException.getMessage());
+        assertEquals("any(Map, {false})", print(expression));
+    }
+
+    @Test
+    void testSetHasAny() {
+        Set<String> valueSet = new HashSet<>();
+        valueSet.add("foo");
+        valueSet.add("bar");
+
+        ValueExpression<?> targetExpression = value(valueSet);
+        HasAnyExpression expression = any(targetExpression, TRUE);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("any(Set, {true})", print(expression));
+
+        targetExpression = value(valueSet);
+        expression = any(targetExpression, FALSE);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("any(Set, {false})", print(expression));
+
+        expression = any(targetExpression, eq(ref(ValueReferences.ITERATOR_REF), value("foo")));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("any(Set, {@it == \"foo\"})", print(expression));
+
+        expression = any(targetExpression, eq(ref(ValueReferences.ITERATOR_REF), value("key")));
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("any(Set, {@it == \"key\"})", print(expression));
+    }
+
+    @Test
+    void testLargeSetHasAny() {
+        Set<Integer> largeSet = new HashSet<>();
+        for (int i = 0; i < 1_000_000; i++) {
+            largeSet.add(i);
+        }
+        ValueExpression<?> targetExpression = value(largeSet);
+
+        HasAnyExpression expression = any(targetExpression, FALSE);
+        EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
+        EvaluationException evaluationException =
+                assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
+        assertEquals("timeout (1ms)", evaluationException.getMessage());
+        assertEquals("any(Set, {false})", print(expression));
+    }
+
+    @Test
+    void emptiness() {
+        HasAnyExpression expression = any(value(Collections.emptyList()), TRUE);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("any(List, {true})", print(expression));
+
+        expression = any(value(Collections.emptyMap()), TRUE);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("any(Map, {true})", print(expression));
+
+        expression = any(value(Collections.emptySet()), TRUE);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("any(Set, {true})", print(expression));
     }
-    ValueExpression<?> targetExpression = value(largeMap);
-
-    HasAnyExpression expression = any(targetExpression, FALSE);
-    EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
-    EvaluationException evaluationException =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
-    assertEquals("timeout (1ms)", evaluationException.getMessage());
-    assertEquals("any(Map, {false})", print(expression));
-  }
-
-  @Test
-  void testSetHasAny() {
-    Set<String> valueSet = new HashSet<>();
-    valueSet.add("foo");
-    valueSet.add("bar");
-
-    ValueExpression<?> targetExpression = value(valueSet);
-    HasAnyExpression expression = any(targetExpression, TRUE);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("any(Set, {true})", print(expression));
-
-    targetExpression = value(valueSet);
-    expression = any(targetExpression, FALSE);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("any(Set, {false})", print(expression));
-
-    expression = any(targetExpression, eq(ref(ValueReferences.ITERATOR_REF), value("foo")));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("any(Set, {@it == \"foo\"})", print(expression));
-
-    expression = any(targetExpression, eq(ref(ValueReferences.ITERATOR_REF), value("key")));
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("any(Set, {@it == \"key\"})", print(expression));
-  }
-
-  @Test
-  void testLargeSetHasAny() {
-    Set<Integer> largeSet = new HashSet<>();
-    for (int i = 0; i < 1_000_000; i++) {
-      largeSet.add(i);
+
+    @Test
+    void keyValueMap() {
+        Map<String, String> valueMap = new HashMap<>();
+        valueMap.put("a", "a");
+        valueMap.put("b", null);
+
+        ValueExpression<?> targetExpression = value(valueMap);
+        HasAnyExpression expression = any(targetExpression, eq(ref(ValueReferences.KEY_REF), value("b")));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("any(Map, {@key == \"b\"})", print(expression));
+
+        expression = any(targetExpression, eq(ref(ValueReferences.VALUE_REF), value("a")));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("any(Map, {@value == \"a\"})", print(expression));
+    }
+
+    @Test
+    void testUnsupportedList() {
+        ListValue collection = new ListValue(new CustomList());
+        HasAnyExpression expression = any(collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo")));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals(
+                "Unsupported List class: com.datadog.debugger.el.expressions.HasAnyExpressionTest$CustomList",
+                exception.getMessage());
+        assertEquals("any(List, {@it == \"foo\"})", print(expression));
+    }
+
+    @Test
+    void testUnsupportedMap() {
+        MapValue collection = new MapValue(new CustomMap());
+        HasAnyExpression expression = any(collection, eq(ref(ValueReferences.VALUE_REF), value("foo")));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals(
+                "Unsupported Map class: com.datadog.debugger.el.expressions.HasAnyExpressionTest$CustomMap",
+                exception.getMessage());
+        assertEquals("any(Map, {@value == \"foo\"})", print(expression));
+    }
+
+    @Test
+    void testUnsupportedSet() {
+        SetValue collection = new SetValue(new CustomSet());
+        HasAnyExpression expression = any(collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo")));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals(
+                "Unsupported Set class: com.datadog.debugger.el.expressions.HasAnyExpressionTest$CustomSet",
+                exception.getMessage());
+        assertEquals("any(Set, {@it == \"foo\"})", print(expression));
     }
-    ValueExpression<?> targetExpression = value(largeSet);
-
-    HasAnyExpression expression = any(targetExpression, FALSE);
-    EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1));
-    EvaluationException evaluationException =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext));
-    assertEquals("timeout (1ms)", evaluationException.getMessage());
-    assertEquals("any(Set, {false})", print(expression));
-  }
-
-  @Test
-  void emptiness() {
-    HasAnyExpression expression = any(value(Collections.emptyList()), TRUE);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("any(List, {true})", print(expression));
-
-    expression = any(value(Collections.emptyMap()), TRUE);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("any(Map, {true})", print(expression));
-
-    expression = any(value(Collections.emptySet()), TRUE);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("any(Set, {true})", print(expression));
-  }
-
-  @Test
-  void keyValueMap() {
-    Map<String, String> valueMap = new HashMap<>();
-    valueMap.put("a", "a");
-    valueMap.put("b", null);
-
-    ValueExpression<?> targetExpression = value(valueMap);
-    HasAnyExpression expression =
-        any(targetExpression, eq(ref(ValueReferences.KEY_REF), value("b")));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("any(Map, {@key == \"b\"})", print(expression));
-
-    expression = any(targetExpression, eq(ref(ValueReferences.VALUE_REF), value("a")));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("any(Map, {@value == \"a\"})", print(expression));
-  }
-
-  @Test
-  void testUnsupportedList() {
-    ListValue collection = new ListValue(new CustomList());
-    HasAnyExpression expression =
-        any(collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo")));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals(
-        "Unsupported List class: com.datadog.debugger.el.expressions.HasAnyExpressionTest$CustomList",
-        exception.getMessage());
-    assertEquals("any(List, {@it == \"foo\"})", print(expression));
-  }
-
-  @Test
-  void testUnsupportedMap() {
-    MapValue collection = new MapValue(new CustomMap());
-    HasAnyExpression expression = any(collection, eq(ref(ValueReferences.VALUE_REF), value("foo")));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals(
-        "Unsupported Map class: com.datadog.debugger.el.expressions.HasAnyExpressionTest$CustomMap",
-        exception.getMessage());
-    assertEquals("any(Map, {@value == \"foo\"})", print(expression));
-  }
-
-  @Test
-  void testUnsupportedSet() {
-    SetValue collection = new SetValue(new CustomSet());
-    HasAnyExpression expression =
-        any(collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo")));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals(
-        "Unsupported Set class: com.datadog.debugger.el.expressions.HasAnyExpressionTest$CustomSet",
-        exception.getMessage());
-    assertEquals("any(Set, {@it == \"foo\"})", print(expression));
-  }
-
-  static class CustomList extends java.util.ArrayList<String> {}
-
-  static class CustomMap extends HashMap<String, Integer> {}
-
-  static class CustomSet extends java.util.HashSet<String> {}
+
+    static class CustomList extends java.util.ArrayList<String> {}
+
+    static class CustomMap extends HashMap<String, Integer> {}
+
+    static class CustomSet extends java.util.HashSet<String> {}
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IfElseExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IfElseExpressionTest.java
index 3b546487d44..25e10bbabfb 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IfElseExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IfElseExpressionTest.java
@@ -11,72 +11,66 @@
 import org.junit.jupiter.api.Test;
 
 class IfElseExpressionTest {
-  private boolean guardFlag = false;
-  private EvalContext evalContext = createEvalContext(this);
+    private boolean guardFlag = false;
+    private EvalContext evalContext = createEvalContext(this);
 
-  @Test
-  void testIfTrue() {
-    boolean[] executed = new boolean[] {false, false};
-    BooleanExpression test = BooleanExpression.TRUE;
-    Expression<Void> thenExpression =
-        context -> {
-          executed[0] = true;
-          return null;
+    @Test
+    void testIfTrue() {
+        boolean[] executed = new boolean[] {false, false};
+        BooleanExpression test = BooleanExpression.TRUE;
+        Expression<Void> thenExpression = context -> {
+            executed[0] = true;
+            return null;
         };
-    Expression<Void> elseExpression =
-        context -> {
-          executed[1] = true;
-          return null;
+        Expression<Void> elseExpression = context -> {
+            executed[1] = true;
+            return null;
         };
-    IfElseExpression expression = DSL.doif(test, thenExpression, elseExpression);
-    expression.evaluate(evalContext);
-    assertTrue(executed[0]);
-    assertFalse(executed[1]);
-  }
+        IfElseExpression expression = DSL.doif(test, thenExpression, elseExpression);
+        expression.evaluate(evalContext);
+        assertTrue(executed[0]);
+        assertFalse(executed[1]);
+    }
 
-  @Test
-  void testIfFalse() {
-    boolean[] executed = new boolean[] {false, false};
-    BooleanExpression test = BooleanExpression.FALSE;
-    Expression<Void> thenExpression =
-        context -> {
-          executed[0] = true;
-          return null;
+    @Test
+    void testIfFalse() {
+        boolean[] executed = new boolean[] {false, false};
+        BooleanExpression test = BooleanExpression.FALSE;
+        Expression<Void> thenExpression = context -> {
+            executed[0] = true;
+            return null;
         };
-    Expression<Void> elseExpression =
-        context -> {
-          executed[1] = true;
-          return null;
+        Expression<Void> elseExpression = context -> {
+            executed[1] = true;
+            return null;
         };
-    DSL.doif(test, thenExpression, elseExpression).evaluate(evalContext);
-    assertFalse(executed[0]);
-    assertTrue(executed[1]);
-  }
+        DSL.doif(test, thenExpression, elseExpression).evaluate(evalContext);
+        assertFalse(executed[0]);
+        assertTrue(executed[1]);
+    }
 
-  @Test
-  void testFromContext() {
-    boolean[] executed = new boolean[] {false, false};
-    BooleanExpression test = DSL.eq(DSL.ref("guardFlag"), BooleanValue.TRUE);
-    Expression<Void> thenExpression =
-        context -> {
-          executed[0] = true;
-          return null;
+    @Test
+    void testFromContext() {
+        boolean[] executed = new boolean[] {false, false};
+        BooleanExpression test = DSL.eq(DSL.ref("guardFlag"), BooleanValue.TRUE);
+        Expression<Void> thenExpression = context -> {
+            executed[0] = true;
+            return null;
         };
-    Expression<Void> elseExpression =
-        context -> {
-          executed[1] = true;
-          return null;
+        Expression<Void> elseExpression = context -> {
+            executed[1] = true;
+            return null;
         };
-    guardFlag = false;
-    DSL.doif(test, thenExpression, elseExpression).evaluate(evalContext);
-    assertFalse(executed[0]);
-    assertTrue(executed[1]);
+        guardFlag = false;
+        DSL.doif(test, thenExpression, elseExpression).evaluate(evalContext);
+        assertFalse(executed[0]);
+        assertTrue(executed[1]);
 
-    executed[1] = false;
+        executed[1] = false;
 
-    guardFlag = true;
-    DSL.doif(test, thenExpression, elseExpression).evaluate(evalContext);
-    assertTrue(executed[0]);
-    assertFalse(executed[1]);
-  }
+        guardFlag = true;
+        DSL.doif(test, thenExpression, elseExpression).evaluate(evalContext);
+        assertTrue(executed[0]);
+        assertFalse(executed[1]);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IfExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IfExpressionTest.java
index 67ed34b2054..0bc049ef24d 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IfExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IfExpressionTest.java
@@ -11,51 +11,48 @@
 import org.junit.jupiter.api.Test;
 
 class IfExpressionTest {
-  private boolean guardFlag = false;
-
-  private EvalContext evalContext = createEvalContext(this);
-
-  @Test
-  void testIfTrue() {
-    boolean[] executed = new boolean[] {false};
-    BooleanExpression test = BooleanExpression.TRUE;
-    Expression<Void> expression =
-        context -> {
-          executed[0] = true;
-          return null;
+    private boolean guardFlag = false;
+
+    private EvalContext evalContext = createEvalContext(this);
+
+    @Test
+    void testIfTrue() {
+        boolean[] executed = new boolean[] {false};
+        BooleanExpression test = BooleanExpression.TRUE;
+        Expression<Void> expression = context -> {
+            executed[0] = true;
+            return null;
         };
-    DSL.doif(test, expression).evaluate(evalContext);
-    assertTrue(executed[0]);
-  }
-
-  @Test
-  void testIfFalse() {
-    boolean[] executed = new boolean[] {false};
-    BooleanExpression test = BooleanExpression.FALSE;
-    Expression<Void> expression =
-        context -> {
-          executed[0] = true;
-          return null;
+        DSL.doif(test, expression).evaluate(evalContext);
+        assertTrue(executed[0]);
+    }
+
+    @Test
+    void testIfFalse() {
+        boolean[] executed = new boolean[] {false};
+        BooleanExpression test = BooleanExpression.FALSE;
+        Expression<Void> expression = context -> {
+            executed[0] = true;
+            return null;
         };
-    DSL.doif(test, expression).evaluate(evalContext);
-    assertFalse(executed[0]);
-  }
-
-  @Test
-  void testFromContext() {
-    boolean[] executed = new boolean[] {false};
-    BooleanExpression test = DSL.eq(DSL.ref("guardFlag"), BooleanValue.TRUE);
-    Expression<Void> expression =
-        context -> {
-          executed[0] = true;
-          return null;
+        DSL.doif(test, expression).evaluate(evalContext);
+        assertFalse(executed[0]);
+    }
+
+    @Test
+    void testFromContext() {
+        boolean[] executed = new boolean[] {false};
+        BooleanExpression test = DSL.eq(DSL.ref("guardFlag"), BooleanValue.TRUE);
+        Expression<Void> expression = context -> {
+            executed[0] = true;
+            return null;
         };
-    guardFlag = false;
-    DSL.doif(test, expression).evaluate(evalContext);
-    assertFalse(executed[0]);
-
-    guardFlag = true;
-    DSL.doif(test, expression).evaluate(evalContext);
-    assertTrue(executed[0]);
-  }
+        guardFlag = false;
+        DSL.doif(test, expression).evaluate(evalContext);
+        assertFalse(executed[0]);
+
+        guardFlag = true;
+        DSL.doif(test, expression).evaluate(evalContext);
+        assertTrue(executed[0]);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IndexExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IndexExpressionTest.java
index 455979a644d..3c4fbbfb039 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IndexExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IndexExpressionTest.java
@@ -31,186 +31,174 @@
 
 class IndexExpressionTest {
 
-  static final String UUID_1 = "123e4567-e89b-12d3-a456-426655440000";
-  static final String UUID_2 = "123e4567-e89b-12d3-a456-426655440001";
-  String[] strArray = new String[] {"foo", "bar", "baz"};
-  UUID[] uuidArray = new UUID[] {UUID.fromString(UUID_1), UUID.fromString(UUID_2)};
-  Object[] secretArray = new Object[] {new StoreSecret("secret123")};
-  List<String> strList = new ArrayList<>(Arrays.asList(strArray));
-  List<UUID> uuidList = new ArrayList<>(Arrays.asList(uuidArray));
-  List<Object> secretList = new ArrayList<>(Arrays.asList(secretArray));
-  Map<String, String> strMap = new HashMap<>();
-  Map<String, UUID> uuidMap = new HashMap<>();
-  Map<String, Object> secretMap = new HashMap<>();
-  String str = "password";
-
-  {
-    strMap.put("foo", "bar");
-    uuidMap.put("foo", UUID.fromString(UUID_1));
-    secretMap.put("foo", new StoreSecret("secret123"));
-  }
-
-  EvalContext evalContext = createEvalContext(this);
-
-  @Test
-  void testArray() {
-    IndexExpression expr =
-        new IndexExpression(new ValueRefExpression("strArray"), new NumericValue(1, ValueType.INT));
-    Value<?> val = expr.evaluate(evalContext);
-    assertNotNull(val);
-    assertFalse(val.isUndefined());
-    assertEquals("bar", val.getValue());
-    assertEquals("strArray[1]", print(expr));
-  }
-
-  @Test
-  void testList() {
-    IndexExpression expr =
-        new IndexExpression(new ValueRefExpression("strList"), new NumericValue(1, ValueType.INT));
-    Value<?> val = expr.evaluate(evalContext);
-    assertNotNull(val);
-    assertFalse(val.isUndefined());
-    assertEquals("bar", val.getValue());
-    assertEquals("strList[1]", print(expr));
-  }
-
-  @Test
-  void testMap() {
-    IndexExpression expr =
-        new IndexExpression(new ValueRefExpression("strMap"), new StringValue("foo"));
-    Value<?> val = expr.evaluate(evalContext);
-    assertNotNull(val);
-    assertFalse(val.isUndefined());
-    assertEquals("bar", val.getValue());
-    assertEquals("strMap[\"foo\"]", print(expr));
-  }
-
-  @Test
-  void testUnsupportedSet() {
-    IndexExpression expr =
-        new IndexExpression(new SetValue(new HashSet<>()), new StringValue("foo"));
-    EvaluationException evaluationException =
-        assertThrows(EvaluationException.class, () -> expr.evaluate(evalContext));
-    assertEquals(
-        "Cannot evaluate the expression for unsupported type: com.datadog.debugger.el.values.SetValue",
-        evaluationException.getMessage());
-  }
-
-  @Test
-  void testUnsupportedList() {
-    IndexExpression expr =
-        new IndexExpression(
-            new ListValue(new ArrayList<String>() {}), new NumericValue(0, ValueType.INT));
-    EvaluationException evaluationException =
-        assertThrows(EvaluationException.class, () -> expr.evaluate(evalContext));
-    assertEquals(
-        "Unsupported List class: com.datadog.debugger.el.expressions.IndexExpressionTest$1",
-        evaluationException.getMessage());
-  }
-
-  @Test
-  void testOutOfBoundsList() {
-    IndexExpression expr =
-        new IndexExpression(
-            new ListValue(new ArrayList<String>()), new NumericValue(42, ValueType.INT));
-    EvaluationException evaluationException =
-        assertThrows(EvaluationException.class, () -> expr.evaluate(evalContext));
-    assertEquals("index[42] out of bounds: [0-0]", evaluationException.getMessage());
-  }
-
-  @Test
-  void testUnsupportedMap() {
-    IndexExpression expr =
-        new IndexExpression(new MapValue(new HashMap<String, String>() {}), new StringValue("foo"));
-    EvaluationException evaluationException =
-        assertThrows(EvaluationException.class, () -> expr.evaluate(evalContext));
-    assertEquals(
-        "Unsupported Map class: com.datadog.debugger.el.expressions.IndexExpressionTest$2",
-        evaluationException.getMessage());
-  }
-
-  @Test
-  void undefined() {
-    IndexExpression expr =
-        new IndexExpression(ValueExpression.UNDEFINED, new NumericValue(1, ValueType.INT));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expr.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-  }
-
-  @Test
-  void redacted() {
-    IndexExpression expr1 =
-        new IndexExpression(new ValueRefExpression("strMap"), new StringValue("password"));
-    RedactedException redactedException =
-        assertThrows(RedactedException.class, () -> expr1.evaluate(evalContext).getValue());
-    assertEquals(
-        "Could not evaluate the expression because 'strMap[\"password\"]' was redacted",
-        redactedException.getMessage());
-    IndexExpression expr2 =
-        new IndexExpression(new ValueRefExpression("strMap"), new ValueRefExpression("str"));
-    redactedException =
-        assertThrows(RedactedException.class, () -> expr2.evaluate(evalContext).getValue());
-    assertEquals(
-        "Could not evaluate the expression because 'strMap[str]' was redacted",
-        redactedException.getMessage());
-  }
-
-  @Test
-  void redactedType() {
-    Config config = Config.get();
-    setFieldInConfig(
-        config,
-        "dynamicInstrumentationRedactedTypes",
-        "com.datadog.debugger.el.expressions.IndexExpressionTest*");
-    try {
-      Redaction.addUserDefinedTypes(Config.get());
-      IndexExpression exprArray =
-          new IndexExpression(
-              new ValueRefExpression("secretArray"), new NumericValue(0, ValueType.INT));
-      RedactedException redactedException =
-          assertThrows(RedactedException.class, () -> exprArray.evaluate(evalContext).getValue());
-      assertEquals(
-          "Could not evaluate the expression because 'secretArray[0]' was redacted",
-          redactedException.getMessage());
-      IndexExpression exprList =
-          new IndexExpression(
-              new ValueRefExpression("secretList"), new NumericValue(0, ValueType.INT));
-      redactedException =
-          assertThrows(RedactedException.class, () -> exprList.evaluate(evalContext).getValue());
-      assertEquals(
-          "Could not evaluate the expression because 'secretList[0]' was redacted",
-          redactedException.getMessage());
-      IndexExpression exprMap =
-          new IndexExpression(new ValueRefExpression("secretMap"), new StringValue("foo"));
-      redactedException =
-          assertThrows(RedactedException.class, () -> exprMap.evaluate(evalContext).getValue());
-      assertEquals(
-          "Could not evaluate the expression because 'secretMap[\"foo\"]' was redacted",
-          redactedException.getMessage());
-    } finally {
-      Redaction.clearUserDefinedTypes();
+    static final String UUID_1 = "123e4567-e89b-12d3-a456-426655440000";
+    static final String UUID_2 = "123e4567-e89b-12d3-a456-426655440001";
+    String[] strArray = new String[] {"foo", "bar", "baz"};
+    UUID[] uuidArray = new UUID[] {UUID.fromString(UUID_1), UUID.fromString(UUID_2)};
+    Object[] secretArray = new Object[] {new StoreSecret("secret123")};
+    List<String> strList = new ArrayList<>(Arrays.asList(strArray));
+    List<UUID> uuidList = new ArrayList<>(Arrays.asList(uuidArray));
+    List<Object> secretList = new ArrayList<>(Arrays.asList(secretArray));
+    Map<String, String> strMap = new HashMap<>();
+    Map<String, UUID> uuidMap = new HashMap<>();
+    Map<String, Object> secretMap = new HashMap<>();
+    String str = "password";
+
+    {
+        strMap.put("foo", "bar");
+        uuidMap.put("foo", UUID.fromString(UUID_1));
+        secretMap.put("foo", new StoreSecret("secret123"));
     }
-  }
-
-  @Test
-  void stringPrimitives() {
-    IndexExpression expr =
-        new IndexExpression(
-            new ValueRefExpression("uuidArray"), new NumericValue(1, ValueType.INT));
-    assertEquals(UUID_2, expr.evaluate(evalContext).getValue());
-    expr =
-        new IndexExpression(new ValueRefExpression("uuidList"), new NumericValue(1, ValueType.INT));
-    assertEquals(UUID_2, expr.evaluate(evalContext).getValue());
-    expr = new IndexExpression(new ValueRefExpression("uuidMap"), new StringValue("foo"));
-    assertEquals(UUID_1, expr.evaluate(evalContext).getValue());
-  }
-
-  private static class StoreSecret {
-    String password;
-
-    public StoreSecret(String password) {
-      this.password = password;
+
+    EvalContext evalContext = createEvalContext(this);
+
+    @Test
+    void testArray() {
+        IndexExpression expr =
+                new IndexExpression(new ValueRefExpression("strArray"), new NumericValue(1, ValueType.INT));
+        Value<?> val = expr.evaluate(evalContext);
+        assertNotNull(val);
+        assertFalse(val.isUndefined());
+        assertEquals("bar", val.getValue());
+        assertEquals("strArray[1]", print(expr));
+    }
+
+    @Test
+    void testList() {
+        IndexExpression expr =
+                new IndexExpression(new ValueRefExpression("strList"), new NumericValue(1, ValueType.INT));
+        Value<?> val = expr.evaluate(evalContext);
+        assertNotNull(val);
+        assertFalse(val.isUndefined());
+        assertEquals("bar", val.getValue());
+        assertEquals("strList[1]", print(expr));
+    }
+
+    @Test
+    void testMap() {
+        IndexExpression expr = new IndexExpression(new ValueRefExpression("strMap"), new StringValue("foo"));
+        Value<?> val = expr.evaluate(evalContext);
+        assertNotNull(val);
+        assertFalse(val.isUndefined());
+        assertEquals("bar", val.getValue());
+        assertEquals("strMap[\"foo\"]", print(expr));
+    }
+
+    @Test
+    void testUnsupportedSet() {
+        IndexExpression expr = new IndexExpression(new SetValue(new HashSet<>()), new StringValue("foo"));
+        EvaluationException evaluationException =
+                assertThrows(EvaluationException.class, () -> expr.evaluate(evalContext));
+        assertEquals(
+                "Cannot evaluate the expression for unsupported type: com.datadog.debugger.el.values.SetValue",
+                evaluationException.getMessage());
+    }
+
+    @Test
+    void testUnsupportedList() {
+        IndexExpression expr =
+                new IndexExpression(new ListValue(new ArrayList<String>() {}), new NumericValue(0, ValueType.INT));
+        EvaluationException evaluationException =
+                assertThrows(EvaluationException.class, () -> expr.evaluate(evalContext));
+        assertEquals(
+                "Unsupported List class: com.datadog.debugger.el.expressions.IndexExpressionTest$1",
+                evaluationException.getMessage());
+    }
+
+    @Test
+    void testOutOfBoundsList() {
+        IndexExpression expr =
+                new IndexExpression(new ListValue(new ArrayList<String>()), new NumericValue(42, ValueType.INT));
+        EvaluationException evaluationException =
+                assertThrows(EvaluationException.class, () -> expr.evaluate(evalContext));
+        assertEquals("index[42] out of bounds: [0-0]", evaluationException.getMessage());
+    }
+
+    @Test
+    void testUnsupportedMap() {
+        IndexExpression expr =
+                new IndexExpression(new MapValue(new HashMap<String, String>() {}), new StringValue("foo"));
+        EvaluationException evaluationException =
+                assertThrows(EvaluationException.class, () -> expr.evaluate(evalContext));
+        assertEquals(
+                "Unsupported Map class: com.datadog.debugger.el.expressions.IndexExpressionTest$2",
+                evaluationException.getMessage());
+    }
+
+    @Test
+    void undefined() {
+        IndexExpression expr = new IndexExpression(ValueExpression.UNDEFINED, new NumericValue(1, ValueType.INT));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expr.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+    }
+
+    @Test
+    void redacted() {
+        IndexExpression expr1 = new IndexExpression(new ValueRefExpression("strMap"), new StringValue("password"));
+        RedactedException redactedException = assertThrows(
+                RedactedException.class, () -> expr1.evaluate(evalContext).getValue());
+        assertEquals(
+                "Could not evaluate the expression because 'strMap[\"password\"]' was redacted",
+                redactedException.getMessage());
+        IndexExpression expr2 = new IndexExpression(new ValueRefExpression("strMap"), new ValueRefExpression("str"));
+        redactedException = assertThrows(
+                RedactedException.class, () -> expr2.evaluate(evalContext).getValue());
+        assertEquals(
+                "Could not evaluate the expression because 'strMap[str]' was redacted", redactedException.getMessage());
+    }
+
+    @Test
+    void redactedType() {
+        Config config = Config.get();
+        setFieldInConfig(
+                config,
+                "dynamicInstrumentationRedactedTypes",
+                "com.datadog.debugger.el.expressions.IndexExpressionTest*");
+        try {
+            Redaction.addUserDefinedTypes(Config.get());
+            IndexExpression exprArray =
+                    new IndexExpression(new ValueRefExpression("secretArray"), new NumericValue(0, ValueType.INT));
+            RedactedException redactedException = assertThrows(
+                    RedactedException.class,
+                    () -> exprArray.evaluate(evalContext).getValue());
+            assertEquals(
+                    "Could not evaluate the expression because 'secretArray[0]' was redacted",
+                    redactedException.getMessage());
+            IndexExpression exprList =
+                    new IndexExpression(new ValueRefExpression("secretList"), new NumericValue(0, ValueType.INT));
+            redactedException = assertThrows(
+                    RedactedException.class,
+                    () -> exprList.evaluate(evalContext).getValue());
+            assertEquals(
+                    "Could not evaluate the expression because 'secretList[0]' was redacted",
+                    redactedException.getMessage());
+            IndexExpression exprMap = new IndexExpression(new ValueRefExpression("secretMap"), new StringValue("foo"));
+            redactedException = assertThrows(
+                    RedactedException.class, () -> exprMap.evaluate(evalContext).getValue());
+            assertEquals(
+                    "Could not evaluate the expression because 'secretMap[\"foo\"]' was redacted",
+                    redactedException.getMessage());
+        } finally {
+            Redaction.clearUserDefinedTypes();
+        }
+    }
+
+    @Test
+    void stringPrimitives() {
+        IndexExpression expr =
+                new IndexExpression(new ValueRefExpression("uuidArray"), new NumericValue(1, ValueType.INT));
+        assertEquals(UUID_2, expr.evaluate(evalContext).getValue());
+        expr = new IndexExpression(new ValueRefExpression("uuidList"), new NumericValue(1, ValueType.INT));
+        assertEquals(UUID_2, expr.evaluate(evalContext).getValue());
+        expr = new IndexExpression(new ValueRefExpression("uuidMap"), new StringValue("foo"));
+        assertEquals(UUID_1, expr.evaluate(evalContext).getValue());
+    }
+
+    private static class StoreSecret {
+        String password;
+
+        public StoreSecret(String password) {
+            this.password = password;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsDefinedExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsDefinedExpressionTest.java
index 53f672cd724..dac7bbdbf1f 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsDefinedExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsDefinedExpressionTest.java
@@ -21,123 +21,123 @@
 import org.junit.jupiter.api.Test;
 
 class IsDefinedExpressionTest {
-  private final EvalContext evalContext = createEvalContext(this);
-
-  @Test
-  void testNullValue() {
-    IsDefinedExpression expression = new IsDefinedExpression(null);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("isDefined(null)", print(expression));
-    expression = new IsDefinedExpression(DSL.value(Values.NULL_OBJECT));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("isDefined(null)", print(expression));
-    expression = new IsDefinedExpression(DSL.value(Value.nullValue()));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("isDefined(com.datadog.debugger.el.values.NullValue)", print(expression));
-  }
-
-  @Test
-  void testUndefinedValue() {
-    IsDefinedExpression expression = new IsDefinedExpression(DSL.value(Values.UNDEFINED_OBJECT));
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("isDefined(UNDEFINED)", print(expression));
-    expression = new IsDefinedExpression(DSL.ref("undefinedvar"));
-    assertFalse(expression.evaluate(evalContext));
-  }
-
-  @Test
-  void testNumericLiteral() {
-    NumericValue zero = new NumericValue(0, ValueType.INT);
-    NumericValue one = new NumericValue(1, ValueType.INT);
-    NumericValue none = new NumericValue(null, ValueType.OBJECT);
-
-    IsDefinedExpression expression = new IsDefinedExpression(zero);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("isDefined(0)", print(expression));
-    expression = new IsDefinedExpression(one);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("isDefined(1)", print(expression));
-    expression = new IsDefinedExpression(none);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("isDefined(null)", print(expression));
-  }
-
-  @Test
-  void testBooleanLiteral() {
-    BooleanValue yes = BooleanValue.TRUE;
-    BooleanValue no = BooleanValue.FALSE;
-    BooleanValue none = new BooleanValue(null, ValueType.OBJECT);
-
-    IsDefinedExpression expression = new IsDefinedExpression(yes);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("isDefined(true)", print(expression));
-    expression = new IsDefinedExpression(no);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("isDefined(false)", print(expression));
-    expression = new IsDefinedExpression(none);
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("isDefined(null)", print(expression));
-  }
-
-  @Test
-  void testStringLiteral() {
-    StringValue string = new StringValue("Hello World");
-    StringValue emptyString = new StringValue("");
-    StringValue nullString = new StringValue(null);
-
-    IsDefinedExpression isDefined1 = new IsDefinedExpression(string);
-    IsDefinedExpression isDefined2 = new IsDefinedExpression(emptyString);
-    IsDefinedExpression isDefined3 = new IsDefinedExpression(nullString);
-
-    assertTrue(isDefined1.evaluate(evalContext));
-    assertEquals("isDefined(\"Hello World\")", print(isDefined1));
-    assertTrue(isDefined2.evaluate(evalContext));
-    assertEquals("isDefined(\"\")", print(isDefined2));
-    assertTrue(isDefined3.evaluate(evalContext));
-    assertEquals("isDefined(\"null\")", print(isDefined3));
-  }
-
-  @Test
-  void testListValue() {
-    ListValue list = new ListValue(Arrays.asList("a", "b"));
-    ListValue emptyList = new ListValue(Collections.emptyList());
-    ListValue nullList = new ListValue(null);
-    ListValue undefinedList = new ListValue(Values.UNDEFINED_OBJECT);
-
-    IsDefinedExpression isDefined1 = new IsDefinedExpression(list);
-    IsDefinedExpression isDefined2 = new IsDefinedExpression(emptyList);
-    IsDefinedExpression isDefined3 = new IsDefinedExpression(nullList);
-    IsDefinedExpression isDefined4 = new IsDefinedExpression(undefinedList);
-
-    assertTrue(isDefined1.evaluate(evalContext));
-    assertEquals("isDefined(List)", print(isDefined1));
-    assertTrue(isDefined2.evaluate(evalContext));
-    assertEquals("isDefined(List)", print(isDefined2));
-    assertTrue(isDefined3.evaluate(evalContext));
-    assertEquals("isDefined(null)", print(isDefined3));
-    assertFalse(isDefined4.evaluate(evalContext));
-    assertEquals("isDefined(null)", print(isDefined4));
-  }
-
-  @Test
-  void testMapValue() {
-    MapValue map = new MapValue(Collections.singletonMap("a", "b"));
-    MapValue emptyMap = new MapValue(Collections.emptyMap());
-    MapValue nullMao = new MapValue(null);
-    MapValue undefinedMap = new MapValue(Values.UNDEFINED_OBJECT);
-
-    IsDefinedExpression isDefined1 = new IsDefinedExpression(map);
-    IsDefinedExpression isDefined2 = new IsDefinedExpression(emptyMap);
-    IsDefinedExpression isDefined3 = new IsDefinedExpression(nullMao);
-    IsDefinedExpression isDefined4 = new IsDefinedExpression(undefinedMap);
-
-    assertTrue(isDefined1.evaluate(evalContext));
-    assertEquals("isDefined(Map)", print(isDefined1));
-    assertTrue(isDefined2.evaluate(evalContext));
-    assertEquals("isDefined(Map)", print(isDefined2));
-    assertTrue(isDefined3.evaluate(evalContext));
-    assertEquals("isDefined(null)", print(isDefined3));
-    assertFalse(isDefined4.evaluate(evalContext));
-    assertEquals("isDefined(null)", print(isDefined4));
-  }
+    private final EvalContext evalContext = createEvalContext(this);
+
+    @Test
+    void testNullValue() {
+        IsDefinedExpression expression = new IsDefinedExpression(null);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("isDefined(null)", print(expression));
+        expression = new IsDefinedExpression(DSL.value(Values.NULL_OBJECT));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("isDefined(null)", print(expression));
+        expression = new IsDefinedExpression(DSL.value(Value.nullValue()));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("isDefined(com.datadog.debugger.el.values.NullValue)", print(expression));
+    }
+
+    @Test
+    void testUndefinedValue() {
+        IsDefinedExpression expression = new IsDefinedExpression(DSL.value(Values.UNDEFINED_OBJECT));
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("isDefined(UNDEFINED)", print(expression));
+        expression = new IsDefinedExpression(DSL.ref("undefinedvar"));
+        assertFalse(expression.evaluate(evalContext));
+    }
+
+    @Test
+    void testNumericLiteral() {
+        NumericValue zero = new NumericValue(0, ValueType.INT);
+        NumericValue one = new NumericValue(1, ValueType.INT);
+        NumericValue none = new NumericValue(null, ValueType.OBJECT);
+
+        IsDefinedExpression expression = new IsDefinedExpression(zero);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("isDefined(0)", print(expression));
+        expression = new IsDefinedExpression(one);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("isDefined(1)", print(expression));
+        expression = new IsDefinedExpression(none);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("isDefined(null)", print(expression));
+    }
+
+    @Test
+    void testBooleanLiteral() {
+        BooleanValue yes = BooleanValue.TRUE;
+        BooleanValue no = BooleanValue.FALSE;
+        BooleanValue none = new BooleanValue(null, ValueType.OBJECT);
+
+        IsDefinedExpression expression = new IsDefinedExpression(yes);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("isDefined(true)", print(expression));
+        expression = new IsDefinedExpression(no);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("isDefined(false)", print(expression));
+        expression = new IsDefinedExpression(none);
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("isDefined(null)", print(expression));
+    }
+
+    @Test
+    void testStringLiteral() {
+        StringValue string = new StringValue("Hello World");
+        StringValue emptyString = new StringValue("");
+        StringValue nullString = new StringValue(null);
+
+        IsDefinedExpression isDefined1 = new IsDefinedExpression(string);
+        IsDefinedExpression isDefined2 = new IsDefinedExpression(emptyString);
+        IsDefinedExpression isDefined3 = new IsDefinedExpression(nullString);
+
+        assertTrue(isDefined1.evaluate(evalContext));
+        assertEquals("isDefined(\"Hello World\")", print(isDefined1));
+        assertTrue(isDefined2.evaluate(evalContext));
+        assertEquals("isDefined(\"\")", print(isDefined2));
+        assertTrue(isDefined3.evaluate(evalContext));
+        assertEquals("isDefined(\"null\")", print(isDefined3));
+    }
+
+    @Test
+    void testListValue() {
+        ListValue list = new ListValue(Arrays.asList("a", "b"));
+        ListValue emptyList = new ListValue(Collections.emptyList());
+        ListValue nullList = new ListValue(null);
+        ListValue undefinedList = new ListValue(Values.UNDEFINED_OBJECT);
+
+        IsDefinedExpression isDefined1 = new IsDefinedExpression(list);
+        IsDefinedExpression isDefined2 = new IsDefinedExpression(emptyList);
+        IsDefinedExpression isDefined3 = new IsDefinedExpression(nullList);
+        IsDefinedExpression isDefined4 = new IsDefinedExpression(undefinedList);
+
+        assertTrue(isDefined1.evaluate(evalContext));
+        assertEquals("isDefined(List)", print(isDefined1));
+        assertTrue(isDefined2.evaluate(evalContext));
+        assertEquals("isDefined(List)", print(isDefined2));
+        assertTrue(isDefined3.evaluate(evalContext));
+        assertEquals("isDefined(null)", print(isDefined3));
+        assertFalse(isDefined4.evaluate(evalContext));
+        assertEquals("isDefined(null)", print(isDefined4));
+    }
+
+    @Test
+    void testMapValue() {
+        MapValue map = new MapValue(Collections.singletonMap("a", "b"));
+        MapValue emptyMap = new MapValue(Collections.emptyMap());
+        MapValue nullMao = new MapValue(null);
+        MapValue undefinedMap = new MapValue(Values.UNDEFINED_OBJECT);
+
+        IsDefinedExpression isDefined1 = new IsDefinedExpression(map);
+        IsDefinedExpression isDefined2 = new IsDefinedExpression(emptyMap);
+        IsDefinedExpression isDefined3 = new IsDefinedExpression(nullMao);
+        IsDefinedExpression isDefined4 = new IsDefinedExpression(undefinedMap);
+
+        assertTrue(isDefined1.evaluate(evalContext));
+        assertEquals("isDefined(Map)", print(isDefined1));
+        assertTrue(isDefined2.evaluate(evalContext));
+        assertEquals("isDefined(Map)", print(isDefined2));
+        assertTrue(isDefined3.evaluate(evalContext));
+        assertEquals("isDefined(null)", print(isDefined3));
+        assertFalse(isDefined4.evaluate(evalContext));
+        assertEquals("isDefined(null)", print(isDefined4));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsEmptyExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsEmptyExpressionTest.java
index 5e55197deb0..6c6238d2e62 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsEmptyExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsEmptyExpressionTest.java
@@ -26,163 +26,156 @@
 import org.junit.jupiter.api.Test;
 
 class IsEmptyExpressionTest {
-  EvalContext evalContext = createEvalContext(this);
-
-  @Test
-  void testNullValue() {
-    IsEmptyExpression expression1 = new IsEmptyExpression(null);
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression1.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("isEmpty(null)", print(expression1));
-    IsEmptyExpression expression2 = new IsEmptyExpression(DSL.value(Values.NULL_OBJECT));
-    exception = assertThrows(EvaluationException.class, () -> expression2.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("isEmpty(null)", print(expression2));
-    IsEmptyExpression expression3 = new IsEmptyExpression(DSL.value(Value.nullValue()));
-    exception = assertThrows(EvaluationException.class, () -> expression3.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("isEmpty(com.datadog.debugger.el.values.NullValue)", print(expression3));
-  }
-
-  @Test
-  void testUndefinedValue() {
-    IsEmptyExpression expression = new IsEmptyExpression(DSL.value(Values.UNDEFINED_OBJECT));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("isEmpty(UNDEFINED)", print(expression));
-  }
-
-  @Test
-  void testNumericLiteral() {
-    NumericValue zero = new NumericValue(0, ValueType.INT);
-    NumericValue one = new NumericValue(1, ValueType.INT);
-    NumericValue none = new NumericValue(null, ValueType.OBJECT);
-
-    IsEmptyExpression expression = new IsEmptyExpression(zero);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("isEmpty(0)", print(expression));
-    expression = new IsEmptyExpression(one);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("isEmpty(1)", print(expression));
-    IsEmptyExpression nullExpression = new IsEmptyExpression(none);
-    assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext));
-    assertEquals("isEmpty(null)", print(nullExpression));
-  }
-
-  @Test
-  void testBooleanLiteral() {
-    BooleanValue yes = BooleanValue.TRUE;
-    BooleanValue no = BooleanValue.FALSE;
-    BooleanValue none = new BooleanValue(null, ValueType.OBJECT);
-
-    IsEmptyExpression expression = new IsEmptyExpression(yes);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("isEmpty(true)", print(expression));
-    expression = new IsEmptyExpression(no);
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("isEmpty(false)", print(expression));
-    IsEmptyExpression nullExpression = new IsEmptyExpression(none);
-    EvaluationException exception =
+    EvalContext evalContext = createEvalContext(this);
+
+    @Test
+    void testNullValue() {
+        IsEmptyExpression expression1 = new IsEmptyExpression(null);
+        EvaluationException exception =
+                assertThrows(EvaluationException.class, () -> expression1.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("isEmpty(null)", print(expression1));
+        IsEmptyExpression expression2 = new IsEmptyExpression(DSL.value(Values.NULL_OBJECT));
+        exception = assertThrows(EvaluationException.class, () -> expression2.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("isEmpty(null)", print(expression2));
+        IsEmptyExpression expression3 = new IsEmptyExpression(DSL.value(Value.nullValue()));
+        exception = assertThrows(EvaluationException.class, () -> expression3.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("isEmpty(com.datadog.debugger.el.values.NullValue)", print(expression3));
+    }
+
+    @Test
+    void testUndefinedValue() {
+        IsEmptyExpression expression = new IsEmptyExpression(DSL.value(Values.UNDEFINED_OBJECT));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("isEmpty(UNDEFINED)", print(expression));
+    }
+
+    @Test
+    void testNumericLiteral() {
+        NumericValue zero = new NumericValue(0, ValueType.INT);
+        NumericValue one = new NumericValue(1, ValueType.INT);
+        NumericValue none = new NumericValue(null, ValueType.OBJECT);
+
+        IsEmptyExpression expression = new IsEmptyExpression(zero);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("isEmpty(0)", print(expression));
+        expression = new IsEmptyExpression(one);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("isEmpty(1)", print(expression));
+        IsEmptyExpression nullExpression = new IsEmptyExpression(none);
         assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("isEmpty(null)", print(nullExpression));
-  }
-
-  @Test
-  void testStringLiteral() {
-    StringValue string = new StringValue("Hello World");
-    StringValue emptyString = new StringValue("");
-    StringValue nullString = new StringValue(null);
-
-    IsEmptyExpression isEmpty1 = new IsEmptyExpression(string);
-    IsEmptyExpression isEmpty2 = new IsEmptyExpression(emptyString);
-    IsEmptyExpression isEmpty3 = new IsEmptyExpression(nullString);
-
-    assertFalse(isEmpty1.evaluate(evalContext));
-    assertEquals("isEmpty(\"Hello World\")", print(isEmpty1));
-    assertTrue(isEmpty2.evaluate(evalContext));
-    assertEquals("isEmpty(\"\")", print(isEmpty2));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> isEmpty3.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("isEmpty(\"null\")", print(isEmpty3));
-  }
-
-  @Test
-  void testCollectionLiteral() {
-    ListValue list = new ListValue(Arrays.asList("a", "b"));
-    ListValue emptyList = new ListValue(Collections.emptyList());
-    ListValue nullList = new ListValue(null);
-    ListValue undefinedList = new ListValue(Values.UNDEFINED_OBJECT);
-    ListValue set = new ListValue(new HashSet<>(Arrays.asList("a", "b")));
-    ListValue emptySet = new ListValue(Collections.emptySet());
-
-    IsEmptyExpression isEmpty1 = new IsEmptyExpression(list);
-    IsEmptyExpression isEmpty2 = new IsEmptyExpression(emptyList);
-    IsEmptyExpression isEmpty3 = new IsEmptyExpression(nullList);
-    IsEmptyExpression isEmpty4 = new IsEmptyExpression(undefinedList);
-    IsEmptyExpression isEmpty5 = new IsEmptyExpression(set);
-    IsEmptyExpression isEmpty6 = new IsEmptyExpression(emptySet);
-
-    assertFalse(isEmpty1.evaluate(evalContext));
-    assertEquals("isEmpty(List)", print(isEmpty1));
-    assertTrue(isEmpty2.evaluate(evalContext));
-    assertEquals("isEmpty(List)", print(isEmpty2));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> isEmpty3.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("isEmpty(null)", print(isEmpty3));
-    exception = assertThrows(EvaluationException.class, () -> isEmpty4.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("isEmpty(null)", print(isEmpty4));
-    assertFalse(isEmpty5.evaluate(evalContext));
-    assertEquals("isEmpty(Set)", print(isEmpty5));
-    assertTrue(isEmpty6.evaluate(evalContext));
-    assertEquals("isEmpty(Set)", print(isEmpty6));
-  }
-
-  @Test
-  void testSynchronizedCollection() {
-    // calling isEmpty() on those wrappers takes the wrapper mutex and can deadlock the application
-    IsEmptyExpression syncList =
-        new IsEmptyExpression(new ListValue(Collections.synchronizedList(new ArrayList<>())));
-    UnsupportedOperationException exception =
-        assertThrows(UnsupportedOperationException.class, () -> syncList.evaluate(evalContext));
-    assertEquals(
-        "Unsupported Collection class: java.util.Collections$SynchronizedRandomAccessList",
-        exception.getMessage());
-    IsEmptyExpression syncMap =
-        new IsEmptyExpression(new MapValue(Collections.synchronizedMap(new HashMap<>())));
-    exception =
-        assertThrows(UnsupportedOperationException.class, () -> syncMap.evaluate(evalContext));
-    assertEquals(
-        "Unsupported Map class: java.util.Collections$SynchronizedMap", exception.getMessage());
-  }
-
-  @Test
-  void testMapValue() {
-    MapValue map = new MapValue(Collections.singletonMap("a", "b"));
-    MapValue emptyMap = new MapValue(Collections.emptyMap());
-    MapValue nullMao = new MapValue(null);
-    MapValue undefinedMap = new MapValue(Values.UNDEFINED_OBJECT);
-
-    IsEmptyExpression isEmpty1 = new IsEmptyExpression(map);
-    IsEmptyExpression isEmpty2 = new IsEmptyExpression(emptyMap);
-    IsEmptyExpression isEmpty3 = new IsEmptyExpression(nullMao);
-    IsEmptyExpression isEmpty4 = new IsEmptyExpression(undefinedMap);
-
-    assertFalse(isEmpty1.evaluate(evalContext));
-    assertEquals("isEmpty(Map)", print(isEmpty1));
-    assertTrue(isEmpty2.evaluate(evalContext));
-    assertEquals("isEmpty(Map)", print(isEmpty2));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> isEmpty3.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("isEmpty(null)", print(isEmpty3));
-    exception = assertThrows(EvaluationException.class, () -> isEmpty4.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("isEmpty(null)", print(isEmpty4));
-  }
+        assertEquals("isEmpty(null)", print(nullExpression));
+    }
+
+    @Test
+    void testBooleanLiteral() {
+        BooleanValue yes = BooleanValue.TRUE;
+        BooleanValue no = BooleanValue.FALSE;
+        BooleanValue none = new BooleanValue(null, ValueType.OBJECT);
+
+        IsEmptyExpression expression = new IsEmptyExpression(yes);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("isEmpty(true)", print(expression));
+        expression = new IsEmptyExpression(no);
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("isEmpty(false)", print(expression));
+        IsEmptyExpression nullExpression = new IsEmptyExpression(none);
+        EvaluationException exception =
+                assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("isEmpty(null)", print(nullExpression));
+    }
+
+    @Test
+    void testStringLiteral() {
+        StringValue string = new StringValue("Hello World");
+        StringValue emptyString = new StringValue("");
+        StringValue nullString = new StringValue(null);
+
+        IsEmptyExpression isEmpty1 = new IsEmptyExpression(string);
+        IsEmptyExpression isEmpty2 = new IsEmptyExpression(emptyString);
+        IsEmptyExpression isEmpty3 = new IsEmptyExpression(nullString);
+
+        assertFalse(isEmpty1.evaluate(evalContext));
+        assertEquals("isEmpty(\"Hello World\")", print(isEmpty1));
+        assertTrue(isEmpty2.evaluate(evalContext));
+        assertEquals("isEmpty(\"\")", print(isEmpty2));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> isEmpty3.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("isEmpty(\"null\")", print(isEmpty3));
+    }
+
+    @Test
+    void testCollectionLiteral() {
+        ListValue list = new ListValue(Arrays.asList("a", "b"));
+        ListValue emptyList = new ListValue(Collections.emptyList());
+        ListValue nullList = new ListValue(null);
+        ListValue undefinedList = new ListValue(Values.UNDEFINED_OBJECT);
+        ListValue set = new ListValue(new HashSet<>(Arrays.asList("a", "b")));
+        ListValue emptySet = new ListValue(Collections.emptySet());
+
+        IsEmptyExpression isEmpty1 = new IsEmptyExpression(list);
+        IsEmptyExpression isEmpty2 = new IsEmptyExpression(emptyList);
+        IsEmptyExpression isEmpty3 = new IsEmptyExpression(nullList);
+        IsEmptyExpression isEmpty4 = new IsEmptyExpression(undefinedList);
+        IsEmptyExpression isEmpty5 = new IsEmptyExpression(set);
+        IsEmptyExpression isEmpty6 = new IsEmptyExpression(emptySet);
+
+        assertFalse(isEmpty1.evaluate(evalContext));
+        assertEquals("isEmpty(List)", print(isEmpty1));
+        assertTrue(isEmpty2.evaluate(evalContext));
+        assertEquals("isEmpty(List)", print(isEmpty2));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> isEmpty3.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("isEmpty(null)", print(isEmpty3));
+        exception = assertThrows(EvaluationException.class, () -> isEmpty4.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("isEmpty(null)", print(isEmpty4));
+        assertFalse(isEmpty5.evaluate(evalContext));
+        assertEquals("isEmpty(Set)", print(isEmpty5));
+        assertTrue(isEmpty6.evaluate(evalContext));
+        assertEquals("isEmpty(Set)", print(isEmpty6));
+    }
+
+    @Test
+    void testSynchronizedCollection() {
+        // calling isEmpty() on those wrappers takes the wrapper mutex and can deadlock the application
+        IsEmptyExpression syncList =
+                new IsEmptyExpression(new ListValue(Collections.synchronizedList(new ArrayList<>())));
+        UnsupportedOperationException exception =
+                assertThrows(UnsupportedOperationException.class, () -> syncList.evaluate(evalContext));
+        assertEquals(
+                "Unsupported Collection class: java.util.Collections$SynchronizedRandomAccessList",
+                exception.getMessage());
+        IsEmptyExpression syncMap = new IsEmptyExpression(new MapValue(Collections.synchronizedMap(new HashMap<>())));
+        exception = assertThrows(UnsupportedOperationException.class, () -> syncMap.evaluate(evalContext));
+        assertEquals("Unsupported Map class: java.util.Collections$SynchronizedMap", exception.getMessage());
+    }
+
+    @Test
+    void testMapValue() {
+        MapValue map = new MapValue(Collections.singletonMap("a", "b"));
+        MapValue emptyMap = new MapValue(Collections.emptyMap());
+        MapValue nullMao = new MapValue(null);
+        MapValue undefinedMap = new MapValue(Values.UNDEFINED_OBJECT);
+
+        IsEmptyExpression isEmpty1 = new IsEmptyExpression(map);
+        IsEmptyExpression isEmpty2 = new IsEmptyExpression(emptyMap);
+        IsEmptyExpression isEmpty3 = new IsEmptyExpression(nullMao);
+        IsEmptyExpression isEmpty4 = new IsEmptyExpression(undefinedMap);
+
+        assertFalse(isEmpty1.evaluate(evalContext));
+        assertEquals("isEmpty(Map)", print(isEmpty1));
+        assertTrue(isEmpty2.evaluate(evalContext));
+        assertEquals("isEmpty(Map)", print(isEmpty2));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> isEmpty3.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("isEmpty(null)", print(isEmpty3));
+        exception = assertThrows(EvaluationException.class, () -> isEmpty4.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("isEmpty(null)", print(isEmpty4));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/LenExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/LenExpressionTest.java
index 7567be2b3e3..550299e6753 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/LenExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/LenExpressionTest.java
@@ -15,47 +15,49 @@
 import org.junit.jupiter.api.Test;
 
 class LenExpressionTest {
-  private final EvalContext evalContext = createEvalContext(this);
-
-  @Test
-  void nullExpression() {
-    LenExpression expression = new LenExpression(null);
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext).getValue());
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("len(null)", print(expression));
-  }
-
-  @Test
-  void undefinedExpression() {
-    LenExpression expression = new LenExpression(DSL.value(Values.UNDEFINED_OBJECT));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext).getValue());
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("len(UNDEFINED)", print(expression));
-  }
-
-  @Test
-  void stringExpression() {
-    LenExpression expression = new LenExpression(DSL.value("a"));
-    assertEquals(1, expression.evaluate(evalContext).getValue());
-    assertEquals("len(\"a\")", print(expression));
-  }
-
-  @Test
-  void collectionExpression() {
-    LenExpression expression = new LenExpression(DSL.value(Arrays.asList("a", "b")));
-    assertEquals(2, expression.evaluate(evalContext).getValue());
-    assertEquals("len(List)", print(expression));
-    expression = new LenExpression(DSL.value(new HashSet<>(Arrays.asList("a", "b"))));
-    assertEquals(2, expression.evaluate(evalContext).getValue());
-    assertEquals("len(Set)", print(expression));
-  }
-
-  @Test
-  void mapExpression() {
-    LenExpression expression = new LenExpression(DSL.value(Collections.singletonMap("a", "b")));
-    assertEquals(1, expression.evaluate(evalContext).getValue());
-    assertEquals("len(Map)", print(expression));
-  }
+    private final EvalContext evalContext = createEvalContext(this);
+
+    @Test
+    void nullExpression() {
+        LenExpression expression = new LenExpression(null);
+        EvaluationException exception = assertThrows(
+                EvaluationException.class,
+                () -> expression.evaluate(evalContext).getValue());
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("len(null)", print(expression));
+    }
+
+    @Test
+    void undefinedExpression() {
+        LenExpression expression = new LenExpression(DSL.value(Values.UNDEFINED_OBJECT));
+        EvaluationException exception = assertThrows(
+                EvaluationException.class,
+                () -> expression.evaluate(evalContext).getValue());
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("len(UNDEFINED)", print(expression));
+    }
+
+    @Test
+    void stringExpression() {
+        LenExpression expression = new LenExpression(DSL.value("a"));
+        assertEquals(1, expression.evaluate(evalContext).getValue());
+        assertEquals("len(\"a\")", print(expression));
+    }
+
+    @Test
+    void collectionExpression() {
+        LenExpression expression = new LenExpression(DSL.value(Arrays.asList("a", "b")));
+        assertEquals(2, expression.evaluate(evalContext).getValue());
+        assertEquals("len(List)", print(expression));
+        expression = new LenExpression(DSL.value(new HashSet<>(Arrays.asList("a", "b"))));
+        assertEquals(2, expression.evaluate(evalContext).getValue());
+        assertEquals("len(Set)", print(expression));
+    }
+
+    @Test
+    void mapExpression() {
+        LenExpression expression = new LenExpression(DSL.value(Collections.singletonMap("a", "b")));
+        assertEquals(1, expression.evaluate(evalContext).getValue());
+        assertEquals("len(Map)", print(expression));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/MatchesExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/MatchesExpressionTest.java
index c7899fbd330..ef55ccf956b 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/MatchesExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/MatchesExpressionTest.java
@@ -16,51 +16,48 @@
 import org.junit.jupiter.api.Test;
 
 class MatchesExpressionTest {
-  private final EvalContext evalContext = createEvalContext(this);
-  // used to ref lookup
-  URI uri = URI.create("https://www.datadoghq.com");
-
-  @Test
-  void nullExpression() {
-    MatchesExpression expression = new MatchesExpression(null, null);
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("matches(null, null)", print(expression));
-  }
-
-  @Test
-  void undefinedExpression() {
-    MatchesExpression expression =
-        new MatchesExpression(DSL.value(Values.UNDEFINED_OBJECT), new StringValue(null));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("matches(UNDEFINED, \"null\")", print(expression));
-  }
-
-  @Test
-  void stringExpression() {
-    MatchesExpression expression = new MatchesExpression(DSL.value("abc"), new StringValue("abc"));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("matches(\"abc\", \"abc\")", print(expression));
-    expression = new MatchesExpression(DSL.value("abc"), new StringValue("^ab.*"));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("matches(\"abc\", \"^ab.*\")", print(expression));
-
-    expression = new MatchesExpression(DSL.value("abc"), new StringValue("bc"));
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("matches(\"abc\", \"bc\")", print(expression));
-    expression = new MatchesExpression(DSL.value("abc"), new StringValue("[def]+"));
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("matches(\"abc\", \"[def]+\")", print(expression));
-  }
-
-  @Test
-  void stringPrimitives() {
-    MatchesExpression expression =
-        new MatchesExpression(DSL.ref("uri"), new StringValue("^https?://w{3}\\.datadoghq\\.com$"));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("matches(uri, \"^https?://w{3}\\.datadoghq\\.com$\")", print(expression));
-  }
+    private final EvalContext evalContext = createEvalContext(this);
+    // used to ref lookup
+    URI uri = URI.create("https://www.datadoghq.com");
+
+    @Test
+    void nullExpression() {
+        MatchesExpression expression = new MatchesExpression(null, null);
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("matches(null, null)", print(expression));
+    }
+
+    @Test
+    void undefinedExpression() {
+        MatchesExpression expression = new MatchesExpression(DSL.value(Values.UNDEFINED_OBJECT), new StringValue(null));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("matches(UNDEFINED, \"null\")", print(expression));
+    }
+
+    @Test
+    void stringExpression() {
+        MatchesExpression expression = new MatchesExpression(DSL.value("abc"), new StringValue("abc"));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("matches(\"abc\", \"abc\")", print(expression));
+        expression = new MatchesExpression(DSL.value("abc"), new StringValue("^ab.*"));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("matches(\"abc\", \"^ab.*\")", print(expression));
+
+        expression = new MatchesExpression(DSL.value("abc"), new StringValue("bc"));
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("matches(\"abc\", \"bc\")", print(expression));
+        expression = new MatchesExpression(DSL.value("abc"), new StringValue("[def]+"));
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("matches(\"abc\", \"[def]+\")", print(expression));
+    }
+
+    @Test
+    void stringPrimitives() {
+        MatchesExpression expression =
+                new MatchesExpression(DSL.ref("uri"), new StringValue("^https?://w{3}\\.datadoghq\\.com$"));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("matches(uri, \"^https?://w{3}\\.datadoghq\\.com$\")", print(expression));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/NotExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/NotExpressionTest.java
index a71d12d5112..47499c19fbd 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/NotExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/NotExpressionTest.java
@@ -10,18 +10,18 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 class NotExpressionTest {
-  @ParameterizedTest
-  @MethodSource("expressions")
-  void testNullPredicate(BooleanExpression expression, boolean expected, String prettyPrint) {
-    NotExpression expr = new NotExpression(expression);
-    assertEquals(expected, expr.evaluate(createEvalContext(this)));
-    assertEquals(prettyPrint, print(expr));
-  }
+    @ParameterizedTest
+    @MethodSource("expressions")
+    void testNullPredicate(BooleanExpression expression, boolean expected, String prettyPrint) {
+        NotExpression expr = new NotExpression(expression);
+        assertEquals(expected, expr.evaluate(createEvalContext(this)));
+        assertEquals(prettyPrint, print(expr));
+    }
 
-  private static Stream<Arguments> expressions() {
-    return Stream.of(
-        Arguments.of(null, true, "not(false)"),
-        Arguments.of(BooleanExpression.TRUE, false, "not(true)"),
-        Arguments.of(BooleanExpression.FALSE, true, "not(false)"));
-  }
+    private static Stream<Arguments> expressions() {
+        return Stream.of(
+                Arguments.of(null, true, "not(false)"),
+                Arguments.of(BooleanExpression.TRUE, false, "not(true)"),
+                Arguments.of(BooleanExpression.FALSE, true, "not(false)"));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ObjectWithRefAndValue.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ObjectWithRefAndValue.java
index 0e2bae8a1df..61ef175d897 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ObjectWithRefAndValue.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ObjectWithRefAndValue.java
@@ -1,25 +1,25 @@
 package com.datadog.debugger.el.expressions;
 
 class ObjectWithRefAndValue {
-  private ObjectWithRefAndValue ref;
-  private String b;
+    private ObjectWithRefAndValue ref;
+    private String b;
 
-  public ObjectWithRefAndValue(ObjectWithRefAndValue ref, String b) {
-    this.ref = ref;
-    this.b = b;
-  }
+    public ObjectWithRefAndValue(ObjectWithRefAndValue ref, String b) {
+        this.ref = ref;
+        this.b = b;
+    }
 
-  public ObjectWithRefAndValue getRef() {
-    return ref;
-  }
+    public ObjectWithRefAndValue getRef() {
+        return ref;
+    }
 
-  public String getB() {
-    return b;
-  }
+    public String getB() {
+        return b;
+    }
 }
 
 class ExObjectWithRefAndValue extends ObjectWithRefAndValue {
-  public ExObjectWithRefAndValue(ObjectWithRefAndValue ref, String b) {
-    super(ref, b);
-  }
+    public ExObjectWithRefAndValue(ObjectWithRefAndValue ref, String b) {
+        super(ref, b);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/StartsWithExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/StartsWithExpressionTest.java
index e84bba4730d..5dd4ad764c0 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/StartsWithExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/StartsWithExpressionTest.java
@@ -16,46 +16,42 @@
 import org.junit.jupiter.api.Test;
 
 class StartsWithExpressionTest {
-  private final EvalContext evalContext = createEvalContext(this);
-  // used to ref lookup
-  URI uri = URI.create("https://www.datadoghq.com");
-
-  @Test
-  void nullExpression() {
-    StartsWithExpression expression = new StartsWithExpression(null, null);
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
-    assertEquals("startsWith(null, null)", print(expression));
-  }
-
-  @Test
-  void undefinedExpression() {
-    StartsWithExpression expression =
-        new StartsWithExpression(DSL.value(Values.UNDEFINED_OBJECT), new StringValue(null));
-    EvaluationException exception =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
-    assertEquals("startsWith(UNDEFINED, \"null\")", print(expression));
-  }
-
-  @Test
-  void stringExpression() {
-    StartsWithExpression expression =
-        new StartsWithExpression(DSL.value("abc"), new StringValue("ab"));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("startsWith(\"abc\", \"ab\")", print(expression));
-
-    expression = new StartsWithExpression(DSL.value("abc"), new StringValue("bc"));
-    assertFalse(expression.evaluate(evalContext));
-    assertEquals("startsWith(\"abc\", \"bc\")", print(expression));
-  }
-
-  @Test
-  void stringPrimitives() {
-    StartsWithExpression expression =
-        new StartsWithExpression(DSL.ref("uri"), new StringValue("https"));
-    assertTrue(expression.evaluate(evalContext));
-    assertEquals("startsWith(uri, \"https\")", print(expression));
-  }
+    private final EvalContext evalContext = createEvalContext(this);
+    // used to ref lookup
+    URI uri = URI.create("https://www.datadoghq.com");
+
+    @Test
+    void nullExpression() {
+        StartsWithExpression expression = new StartsWithExpression(null, null);
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for null value", exception.getMessage());
+        assertEquals("startsWith(null, null)", print(expression));
+    }
+
+    @Test
+    void undefinedExpression() {
+        StartsWithExpression expression =
+                new StartsWithExpression(DSL.value(Values.UNDEFINED_OBJECT), new StringValue(null));
+        EvaluationException exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage());
+        assertEquals("startsWith(UNDEFINED, \"null\")", print(expression));
+    }
+
+    @Test
+    void stringExpression() {
+        StartsWithExpression expression = new StartsWithExpression(DSL.value("abc"), new StringValue("ab"));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("startsWith(\"abc\", \"ab\")", print(expression));
+
+        expression = new StartsWithExpression(DSL.value("abc"), new StringValue("bc"));
+        assertFalse(expression.evaluate(evalContext));
+        assertEquals("startsWith(\"abc\", \"bc\")", print(expression));
+    }
+
+    @Test
+    void stringPrimitives() {
+        StartsWithExpression expression = new StartsWithExpression(DSL.ref("uri"), new StringValue("https"));
+        assertTrue(expression.evaluate(evalContext));
+        assertEquals("startsWith(uri, \"https\")", print(expression));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/SubStringExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/SubStringExpressionTest.java
index 3e2479cdd42..3b743f1c646 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/SubStringExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/SubStringExpressionTest.java
@@ -13,51 +13,49 @@
 import org.junit.jupiter.api.Test;
 
 public class SubStringExpressionTest {
-  private final EvalContext evalContext = createEvalContext(this);
-  // used to ref lookup
-  URI uri = URI.create("https://www.datadoghq.com");
-  Object nullValue = null;
-
-  @Test
-  void nullExpression() {
-    SubStringExpression expression1 = new SubStringExpression(null, 0, 0);
-    EvaluationException evaluationException =
-        assertThrows(EvaluationException.class, () -> expression1.evaluate(evalContext));
-    assertEquals("substring(null, 0, 0)", evaluationException.getExpr());
-    SubStringExpression expression2 = new SubStringExpression(DSL.ref("nullValue"), 0, 0);
-    evaluationException =
-        assertThrows(EvaluationException.class, () -> expression2.evaluate(evalContext));
-    assertEquals("substring(nullValue, 0, 0)", evaluationException.getExpr());
-  }
-
-  @Test
-  void undefinedExpression() {
-    SubStringExpression expression =
-        new SubStringExpression(DSL.value(Values.UNDEFINED_OBJECT), 0, 0);
-    EvaluationException evaluationException =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("substring(UNDEFINED, 0, 0)", evaluationException.getExpr());
-  }
-
-  @Test
-  void stringExpression() {
-    SubStringExpression expression = new SubStringExpression(DSL.value("abc"), 0, 1);
-    assertEquals("a", expression.evaluate(evalContext).getValue());
-    assertEquals("substring(\"abc\", 0, 1)", print(expression));
-  }
-
-  @Test
-  void stringOutOfBoundsExpression() {
-    SubStringExpression expression = new SubStringExpression(DSL.value("abc"), 0, 10);
-    EvaluationException evaluationException =
-        assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
-    assertEquals("substring(\"abc\", 0, 10)", evaluationException.getExpr());
-  }
-
-  @Test
-  void stringPrimitives() {
-    SubStringExpression expression = new SubStringExpression(DSL.ref("uri"), 0, 5);
-    assertEquals("https", expression.evaluate(evalContext).getValue());
-    assertEquals("substring(uri, 0, 5)", print(expression));
-  }
+    private final EvalContext evalContext = createEvalContext(this);
+    // used to ref lookup
+    URI uri = URI.create("https://www.datadoghq.com");
+    Object nullValue = null;
+
+    @Test
+    void nullExpression() {
+        SubStringExpression expression1 = new SubStringExpression(null, 0, 0);
+        EvaluationException evaluationException =
+                assertThrows(EvaluationException.class, () -> expression1.evaluate(evalContext));
+        assertEquals("substring(null, 0, 0)", evaluationException.getExpr());
+        SubStringExpression expression2 = new SubStringExpression(DSL.ref("nullValue"), 0, 0);
+        evaluationException = assertThrows(EvaluationException.class, () -> expression2.evaluate(evalContext));
+        assertEquals("substring(nullValue, 0, 0)", evaluationException.getExpr());
+    }
+
+    @Test
+    void undefinedExpression() {
+        SubStringExpression expression = new SubStringExpression(DSL.value(Values.UNDEFINED_OBJECT), 0, 0);
+        EvaluationException evaluationException =
+                assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("substring(UNDEFINED, 0, 0)", evaluationException.getExpr());
+    }
+
+    @Test
+    void stringExpression() {
+        SubStringExpression expression = new SubStringExpression(DSL.value("abc"), 0, 1);
+        assertEquals("a", expression.evaluate(evalContext).getValue());
+        assertEquals("substring(\"abc\", 0, 1)", print(expression));
+    }
+
+    @Test
+    void stringOutOfBoundsExpression() {
+        SubStringExpression expression = new SubStringExpression(DSL.value("abc"), 0, 10);
+        EvaluationException evaluationException =
+                assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext));
+        assertEquals("substring(\"abc\", 0, 10)", evaluationException.getExpr());
+    }
+
+    @Test
+    void stringPrimitives() {
+        SubStringExpression expression = new SubStringExpression(DSL.ref("uri"), 0, 5);
+        assertEquals("https", expression.evaluate(evalContext).getValue());
+        assertEquals("substring(uri, 0, 5)", print(expression));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ValueRefExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ValueRefExpressionTest.java
index 7642eaef882..7452f10a698 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ValueRefExpressionTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ValueRefExpressionTest.java
@@ -30,149 +30,141 @@
 
 class ValueRefExpressionTest {
 
-  @Test
-  void testRef() {
-    ValueRefExpression valueRef = new ValueRefExpression("b");
-    ExObjectWithRefAndValue instance = new ExObjectWithRefAndValue(null, "hello");
-    Value<?> val = valueRef.evaluate(createEvalContext(instance));
-    assertNotNull(val);
-    assertFalse(val.isUndefined());
-    assertEquals(instance.getB(), val.getValue());
-    assertEquals("b", print(valueRef));
-  }
-
-  @Test
-  void testPredicatedRef() {
-    ValueRefExpression valueRef = new ValueRefExpression("b");
-    ValueRefExpression invalidValueRef = new ValueRefExpression("x");
-
-    IsEmptyExpression isEmpty = new IsEmptyExpression(valueRef);
-    IsEmptyExpression isEmptyInvalid = new IsEmptyExpression(invalidValueRef);
-
-    ExObjectWithRefAndValue instance = new ExObjectWithRefAndValue(null, "hello");
-    EvalContext evalContext = createEvalContext(instance);
-
-    assertFalse(isEmpty.evaluate(evalContext));
-    assertEquals("isEmpty(b)", print(isEmpty));
-
-    RuntimeException runtimeException =
-        assertThrows(RuntimeException.class, () -> isEmptyInvalid.evaluate(evalContext));
-    assertEquals("Cannot dereference field: x", runtimeException.getMessage());
-    runtimeException =
-        assertThrows(
-            RuntimeException.class, () -> and(isEmptyInvalid, isEmpty).evaluate(evalContext));
-    assertEquals("Cannot dereference field: x", runtimeException.getMessage());
-    runtimeException =
-        assertThrows(
-            RuntimeException.class, () -> or(isEmptyInvalid, isEmpty).evaluate(evalContext));
-    assertEquals("Cannot dereference field: x", runtimeException.getMessage());
-    assertEquals("isEmpty(x)", print(isEmptyInvalid));
-  }
-
-  @Test
-  void contextRef() {
-    class Obj {
-      long limit = 511L;
-      String msg = "Hello there";
-      int i = 6;
+    @Test
+    void testRef() {
+        ValueRefExpression valueRef = new ValueRefExpression("b");
+        ExObjectWithRefAndValue instance = new ExObjectWithRefAndValue(null, "hello");
+        Value<?> val = valueRef.evaluate(createEvalContext(instance));
+        assertNotNull(val);
+        assertFalse(val.isUndefined());
+        assertEquals(instance.getB(), val.getValue());
+        assertEquals("b", print(valueRef));
     }
 
-    long duration = TimeUnit.NANOSECONDS.convert(680, TimeUnit.MILLISECONDS);
-    boolean returnVal = true;
-    Throwable exception = new RuntimeException("oops");
-    Map<String, CapturedValue> exts = new HashMap<>();
-    exts.put(ValueReferences.RETURN_EXTENSION_NAME, CapturedValue.of(returnVal));
-    exts.put(ValueReferences.DURATION_EXTENSION_NAME, CapturedValue.of(duration));
-    exts.put(ValueReferences.EXCEPTION_EXTENSION_NAME, CapturedValue.of(exception));
-    EvalContext evalContext =
-        new EvalContext(
-            createResolver(new Obj()).withExtensions(exts),
-            TimeoutChecker.create(Config.get(), TEST_TIMEOUT));
-
-    ValueRefExpression expression = DSL.ref(ValueReferences.DURATION_REF);
-    assertEquals(duration, expression.evaluate(evalContext).getValue());
-    assertEquals("@duration", print(expression));
-    expression = DSL.ref(ValueReferences.RETURN_REF);
-    assertEquals(returnVal, expression.evaluate(evalContext).getValue());
-    assertEquals("@return", print(expression));
-    expression = DSL.ref(ValueReferences.EXCEPTION_REF);
-    assertEquals(exception, expression.evaluate(evalContext).getValue());
-    assertEquals("@exception", print(expression));
-    expression = DSL.ref("limit");
-    assertEquals(511L, expression.evaluate(evalContext).getValue());
-    assertEquals("limit", print(expression));
-    expression = DSL.ref("msg");
-    assertEquals("Hello there", expression.evaluate(evalContext).getValue());
-    assertEquals("msg", print(expression));
-    expression = DSL.ref("i");
-    assertEquals(6, expression.evaluate(evalContext).getValue()); // int value is widened to long
-    assertEquals("i", print(expression));
-    ValueRefExpression invalidExpression = ref(ValueReferences.synthetic("invalid"));
-    RuntimeException runtimeException =
-        assertThrows(
-            RuntimeException.class, () -> invalidExpression.evaluate(evalContext).getValue());
-    assertEquals("Cannot find synthetic var: invalid", runtimeException.getMessage());
-    assertEquals("@invalid", print(invalidExpression));
-  }
-
-  class StoreSecret {
-    String password;
-
-    public StoreSecret(String password) {
-      this.password = password;
+    @Test
+    void testPredicatedRef() {
+        ValueRefExpression valueRef = new ValueRefExpression("b");
+        ValueRefExpression invalidValueRef = new ValueRefExpression("x");
+
+        IsEmptyExpression isEmpty = new IsEmptyExpression(valueRef);
+        IsEmptyExpression isEmptyInvalid = new IsEmptyExpression(invalidValueRef);
+
+        ExObjectWithRefAndValue instance = new ExObjectWithRefAndValue(null, "hello");
+        EvalContext evalContext = createEvalContext(instance);
+
+        assertFalse(isEmpty.evaluate(evalContext));
+        assertEquals("isEmpty(b)", print(isEmpty));
+
+        RuntimeException runtimeException =
+                assertThrows(RuntimeException.class, () -> isEmptyInvalid.evaluate(evalContext));
+        assertEquals("Cannot dereference field: x", runtimeException.getMessage());
+        runtimeException = assertThrows(
+                RuntimeException.class, () -> and(isEmptyInvalid, isEmpty).evaluate(evalContext));
+        assertEquals("Cannot dereference field: x", runtimeException.getMessage());
+        runtimeException = assertThrows(
+                RuntimeException.class, () -> or(isEmptyInvalid, isEmpty).evaluate(evalContext));
+        assertEquals("Cannot dereference field: x", runtimeException.getMessage());
+        assertEquals("isEmpty(x)", print(isEmptyInvalid));
     }
-  }
-
-  @Test
-  public void redacted() {
-    ValueRefExpression valueRef = new ValueRefExpression("password");
-    StoreSecret instance = new StoreSecret("secret123");
-    RedactedException redactedException =
-        assertThrows(RedactedException.class, () -> valueRef.evaluate(createEvalContext(instance)));
-    assertEquals(
-        "Could not evaluate the expression because 'password' was redacted",
-        redactedException.getMessage());
-  }
-
-  @Test
-  public void redactedType() {
-    Config config = Config.get();
-    setFieldInConfig(
-        config, "dynamicInstrumentationRedactedTypes", "com.datadog.debugger.el.expressions.*");
-    try {
-      Redaction.addUserDefinedTypes(Config.get());
-      ValueRefExpression valueRef = new ValueRefExpression("store");
-      class Holder {
-        StoreSecret store = new StoreSecret("secret123");
-      }
-      RedactedException redactedException =
-          assertThrows(
-              RedactedException.class, () -> valueRef.evaluate(createEvalContext(new Holder())));
-      assertEquals(
-          "Could not evaluate the expression because 'store' was redacted",
-          redactedException.getMessage());
-    } finally {
-      Redaction.clearUserDefinedTypes();
+
+    @Test
+    void contextRef() {
+        class Obj {
+            long limit = 511L;
+            String msg = "Hello there";
+            int i = 6;
+        }
+
+        long duration = TimeUnit.NANOSECONDS.convert(680, TimeUnit.MILLISECONDS);
+        boolean returnVal = true;
+        Throwable exception = new RuntimeException("oops");
+        Map<String, CapturedValue> exts = new HashMap<>();
+        exts.put(ValueReferences.RETURN_EXTENSION_NAME, CapturedValue.of(returnVal));
+        exts.put(ValueReferences.DURATION_EXTENSION_NAME, CapturedValue.of(duration));
+        exts.put(ValueReferences.EXCEPTION_EXTENSION_NAME, CapturedValue.of(exception));
+        EvalContext evalContext = new EvalContext(
+                createResolver(new Obj()).withExtensions(exts), TimeoutChecker.create(Config.get(), TEST_TIMEOUT));
+
+        ValueRefExpression expression = DSL.ref(ValueReferences.DURATION_REF);
+        assertEquals(duration, expression.evaluate(evalContext).getValue());
+        assertEquals("@duration", print(expression));
+        expression = DSL.ref(ValueReferences.RETURN_REF);
+        assertEquals(returnVal, expression.evaluate(evalContext).getValue());
+        assertEquals("@return", print(expression));
+        expression = DSL.ref(ValueReferences.EXCEPTION_REF);
+        assertEquals(exception, expression.evaluate(evalContext).getValue());
+        assertEquals("@exception", print(expression));
+        expression = DSL.ref("limit");
+        assertEquals(511L, expression.evaluate(evalContext).getValue());
+        assertEquals("limit", print(expression));
+        expression = DSL.ref("msg");
+        assertEquals("Hello there", expression.evaluate(evalContext).getValue());
+        assertEquals("msg", print(expression));
+        expression = DSL.ref("i");
+        assertEquals(6, expression.evaluate(evalContext).getValue()); // int value is widened to long
+        assertEquals("i", print(expression));
+        ValueRefExpression invalidExpression = ref(ValueReferences.synthetic("invalid"));
+        RuntimeException runtimeException = assertThrows(
+                RuntimeException.class,
+                () -> invalidExpression.evaluate(evalContext).getValue());
+        assertEquals("Cannot find synthetic var: invalid", runtimeException.getMessage());
+        assertEquals("@invalid", print(invalidExpression));
+    }
+
+    class StoreSecret {
+        String password;
+
+        public StoreSecret(String password) {
+            this.password = password;
+        }
+    }
+
+    @Test
+    public void redacted() {
+        ValueRefExpression valueRef = new ValueRefExpression("password");
+        StoreSecret instance = new StoreSecret("secret123");
+        RedactedException redactedException =
+                assertThrows(RedactedException.class, () -> valueRef.evaluate(createEvalContext(instance)));
+        assertEquals(
+                "Could not evaluate the expression because 'password' was redacted", redactedException.getMessage());
+    }
+
+    @Test
+    public void redactedType() {
+        Config config = Config.get();
+        setFieldInConfig(config, "dynamicInstrumentationRedactedTypes", "com.datadog.debugger.el.expressions.*");
+        try {
+            Redaction.addUserDefinedTypes(Config.get());
+            ValueRefExpression valueRef = new ValueRefExpression("store");
+            class Holder {
+                StoreSecret store = new StoreSecret("secret123");
+            }
+            RedactedException redactedException =
+                    assertThrows(RedactedException.class, () -> valueRef.evaluate(createEvalContext(new Holder())));
+            assertEquals(
+                    "Could not evaluate the expression because 'store' was redacted", redactedException.getMessage());
+        } finally {
+            Redaction.clearUserDefinedTypes();
+        }
     }
-  }
 
-  @Test
-  public void stringPrimitive() {
-    class StrPrimitive {
-      UUID uuid = UUID.fromString("123e4567-e89b-12d3-a456-426655440000");
-      Class<?> clazz = String.class;
+    @Test
+    public void stringPrimitive() {
+        class StrPrimitive {
+            UUID uuid = UUID.fromString("123e4567-e89b-12d3-a456-426655440000");
+            Class<?> clazz = String.class;
+        }
+        ValueRefExpression valueRef = new ValueRefExpression("uuid");
+        Value<?> val = valueRef.evaluate(createEvalContext(new StrPrimitive()));
+        assertNotNull(val);
+        assertFalse(val.isUndefined());
+        assertEquals("123e4567-e89b-12d3-a456-426655440000", val.getValue());
+        assertEquals("uuid", print(valueRef));
+        valueRef = new ValueRefExpression("clazz");
+        val = valueRef.evaluate(createEvalContext(new StrPrimitive()));
+        assertNotNull(val);
+        assertFalse(val.isUndefined());
+        assertEquals("java.lang.String", val.getValue());
+        assertEquals("clazz", print(valueRef));
     }
-    ValueRefExpression valueRef = new ValueRefExpression("uuid");
-    Value<?> val = valueRef.evaluate(createEvalContext(new StrPrimitive()));
-    assertNotNull(val);
-    assertFalse(val.isUndefined());
-    assertEquals("123e4567-e89b-12d3-a456-426655440000", val.getValue());
-    assertEquals("uuid", print(valueRef));
-    valueRef = new ValueRefExpression("clazz");
-    val = valueRef.evaluate(createEvalContext(new StrPrimitive()));
-    assertNotNull(val);
-    assertFalse(val.isUndefined());
-    assertEquals("java.lang.String", val.getValue());
-    assertEquals("clazz", print(valueRef));
-  }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/BooleanValueTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/BooleanValueTest.java
index cf9e0cdb823..e0076c04eab 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/BooleanValueTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/BooleanValueTest.java
@@ -12,22 +12,22 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 class BooleanValueTest {
-  @Test
-  void testNullLiteral() {
-    BooleanValue instance = new BooleanValue(null, ValueType.OBJECT);
-    assertTrue(instance.isNull());
-    assertFalse(instance.isUndefined());
-    assertNull(instance.getValue());
-    assertEquals("null", print(instance));
-  }
+    @Test
+    void testNullLiteral() {
+        BooleanValue instance = new BooleanValue(null, ValueType.OBJECT);
+        assertTrue(instance.isNull());
+        assertFalse(instance.isUndefined());
+        assertNull(instance.getValue());
+        assertEquals("null", print(instance));
+    }
 
-  @ParameterizedTest
-  @ValueSource(booleans = {true, false})
-  void testNonNullLiteral(boolean expected) {
-    BooleanValue instance = new BooleanValue(expected, ValueType.BOOLEAN);
-    assertFalse(instance.isNull());
-    assertFalse(instance.isUndefined());
-    assertEquals(expected, instance.getValue());
-    assertEquals(String.valueOf(expected), print(instance));
-  }
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void testNonNullLiteral(boolean expected) {
+        BooleanValue instance = new BooleanValue(expected, ValueType.BOOLEAN);
+        assertFalse(instance.isNull());
+        assertFalse(instance.isUndefined());
+        assertEquals(expected, instance.getValue());
+        assertEquals(String.valueOf(expected), print(instance));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/ListLiteralTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/ListLiteralTest.java
index e533f122879..3234d398c16 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/ListLiteralTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/ListLiteralTest.java
@@ -10,32 +10,32 @@
 import org.junit.jupiter.api.Test;
 
 class ListLiteralTest {
-  @Test
-  void testNullLiteral() {
-    checkNullLiteral(null);
-    checkNullLiteral(Values.NULL_OBJECT);
-    checkNullLiteral(Value.nullValue());
-  }
+    @Test
+    void testNullLiteral() {
+        checkNullLiteral(null);
+        checkNullLiteral(Values.NULL_OBJECT);
+        checkNullLiteral(Value.nullValue());
+    }
 
-  @Test
-  void testUndefinedLiteral() {
-    checkUndefinedLiteral(Values.UNDEFINED_OBJECT);
-    checkUndefinedLiteral(Value.undefinedValue());
-  }
+    @Test
+    void testUndefinedLiteral() {
+        checkUndefinedLiteral(Values.UNDEFINED_OBJECT);
+        checkUndefinedLiteral(Value.undefinedValue());
+    }
 
-  private void checkNullLiteral(Object nullValue) {
-    ListValue literal = new ListValue(nullValue);
-    assertTrue(literal.isNull());
-    assertTrue(literal.isEmpty());
-    assertFalse(literal.isUndefined());
-    assertEquals(String.valueOf((Object) null), print(literal));
-  }
+    private void checkNullLiteral(Object nullValue) {
+        ListValue literal = new ListValue(nullValue);
+        assertTrue(literal.isNull());
+        assertTrue(literal.isEmpty());
+        assertFalse(literal.isUndefined());
+        assertEquals(String.valueOf((Object) null), print(literal));
+    }
 
-  private void checkUndefinedLiteral(Object undefinedValue) {
-    ListValue literal = new ListValue(undefinedValue);
-    assertFalse(literal.isNull());
-    assertTrue(literal.isEmpty());
-    assertTrue(literal.isUndefined());
-    assertEquals(String.valueOf((Object) null), print(literal));
-  }
+    private void checkUndefinedLiteral(Object undefinedValue) {
+        ListValue literal = new ListValue(undefinedValue);
+        assertFalse(literal.isNull());
+        assertTrue(literal.isEmpty());
+        assertTrue(literal.isUndefined());
+        assertEquals(String.valueOf((Object) null), print(literal));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/ListValueTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/ListValueTest.java
index 27bfa5edff8..578b6e56574 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/ListValueTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/ListValueTest.java
@@ -14,89 +14,89 @@
 import org.junit.jupiter.api.Test;
 
 class ListValueTest {
-  @Test
-  void testFromList() {
-    List<String> stringList = Arrays.asList("one", "two", "three", null);
+    @Test
+    void testFromList() {
+        List<String> stringList = Arrays.asList("one", "two", "three", null);
 
-    ListValue listValue = new ListValue(stringList);
-    assertFalse(listValue.isEmpty());
+        ListValue listValue = new ListValue(stringList);
+        assertFalse(listValue.isEmpty());
 
-    for (int i = 0; i < stringList.size(); i++) {
-      Object expected = stringList.get(i);
+        for (int i = 0; i < stringList.size(); i++) {
+            Object expected = stringList.get(i);
 
-      Value<?> v = listValue.get(i);
-      assertNotNull(v);
-      if (expected != null) {
-        assertEquals(expected, v.getValue());
-      } else {
-        assertEquals(Value.nullValue(), v);
-      }
+            Value<?> v = listValue.get(i);
+            assertNotNull(v);
+            if (expected != null) {
+                assertEquals(expected, v.getValue());
+            } else {
+                assertEquals(Value.nullValue(), v);
+            }
+        }
+        assertThrows(IllegalArgumentException.class, () -> listValue.get(-1));
+        assertThrows(IllegalArgumentException.class, () -> listValue.get(stringList.size()));
+        assertEquals("List", print(listValue));
     }
-    assertThrows(IllegalArgumentException.class, () -> listValue.get(-1));
-    assertThrows(IllegalArgumentException.class, () -> listValue.get(stringList.size()));
-    assertEquals("List", print(listValue));
-  }
 
-  @Test
-  void testFromUndefinedList() {
-    ListValue listValue = new ListValue("a");
-    assertTrue(listValue.isEmpty());
+    @Test
+    void testFromUndefinedList() {
+        ListValue listValue = new ListValue("a");
+        assertTrue(listValue.isEmpty());
 
-    assertThrows(IllegalArgumentException.class, () -> listValue.get(-1));
-    assertEquals("null", print(listValue));
-  }
+        assertThrows(IllegalArgumentException.class, () -> listValue.get(-1));
+        assertEquals("null", print(listValue));
+    }
 
-  @Test
-  void testFromArray() {
-    Object[] array = new Object[] {1, 2, 3, null};
+    @Test
+    void testFromArray() {
+        Object[] array = new Object[] {1, 2, 3, null};
 
-    ListValue listValue = new ListValue(array);
-    assertFalse(listValue.isEmpty());
+        ListValue listValue = new ListValue(array);
+        assertFalse(listValue.isEmpty());
 
-    for (int i = 0; i < array.length; i++) {
-      Object expected = array[i];
-      Value<?> v = listValue.get(i);
-      assertNotNull(v);
-      if (expected != null) {
-        assertEquals(array[i], v.getValue());
-      } else {
-        assertEquals(Value.nullValue(), v);
-      }
+        for (int i = 0; i < array.length; i++) {
+            Object expected = array[i];
+            Value<?> v = listValue.get(i);
+            assertNotNull(v);
+            if (expected != null) {
+                assertEquals(array[i], v.getValue());
+            } else {
+                assertEquals(Value.nullValue(), v);
+            }
+        }
+        assertThrows(IllegalArgumentException.class, () -> listValue.get(-1));
+        assertThrows(IllegalArgumentException.class, () -> listValue.get(array.length));
+        assertEquals("java.lang.Object[]", print(listValue));
     }
-    assertThrows(IllegalArgumentException.class, () -> listValue.get(-1));
-    assertThrows(IllegalArgumentException.class, () -> listValue.get(array.length));
-    assertEquals("java.lang.Object[]", print(listValue));
-  }
 
-  @Test
-  void testFromArrayOfArrays() {
-    int[][] intArray = new int[][] {{1, 2, 3}, {2, 3, 4}};
+    @Test
+    void testFromArrayOfArrays() {
+        int[][] intArray = new int[][] {{1, 2, 3}, {2, 3, 4}};
 
-    ListValue listValue = new ListValue(intArray);
-    assertFalse(listValue.isEmpty());
+        ListValue listValue = new ListValue(intArray);
+        assertFalse(listValue.isEmpty());
 
-    for (int i = 0; i < intArray.length; i++) {
-      assertNotNull(listValue.get(i));
-      Value<?> v = listValue.get(i);
-      assertNotNull(v);
-      ListValue collection = (ListValue) v;
-      for (int j = 0; j < collection.count(); j++) {
-        Value<?> v1 = collection.get(j);
-        assertEquals(intArray[i][j], v1.getValue()); // int is automatically widened to long
-      }
+        for (int i = 0; i < intArray.length; i++) {
+            assertNotNull(listValue.get(i));
+            Value<?> v = listValue.get(i);
+            assertNotNull(v);
+            ListValue collection = (ListValue) v;
+            for (int j = 0; j < collection.count(); j++) {
+                Value<?> v1 = collection.get(j);
+                assertEquals(intArray[i][j], v1.getValue()); // int is automatically widened to long
+            }
+        }
+        assertThrows(IllegalArgumentException.class, () -> listValue.get(-1));
+        assertThrows(IllegalArgumentException.class, () -> listValue.get(intArray.length));
+        assertEquals("int[][]", print(listValue));
     }
-    assertThrows(IllegalArgumentException.class, () -> listValue.get(-1));
-    assertThrows(IllegalArgumentException.class, () -> listValue.get(intArray.length));
-    assertEquals("int[][]", print(listValue));
-  }
 
-  @Test
-  void nullList() {
-    ListValue listValue = new ListValue(null);
-    assertTrue(listValue.isEmpty());
-    assertTrue(listValue.isNull());
-    listValue = new ListValue(Values.NULL_OBJECT);
-    assertTrue(listValue.isEmpty());
-    assertTrue(listValue.isNull());
-  }
+    @Test
+    void nullList() {
+        ListValue listValue = new ListValue(null);
+        assertTrue(listValue.isEmpty());
+        assertTrue(listValue.isNull());
+        listValue = new ListValue(Values.NULL_OBJECT);
+        assertTrue(listValue.isEmpty());
+        assertTrue(listValue.isNull());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/MapValueEmptyTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/MapValueEmptyTest.java
index 880c1986e65..33597428be7 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/MapValueEmptyTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/MapValueEmptyTest.java
@@ -11,36 +11,36 @@
 import org.junit.jupiter.api.Test;
 
 class MapValueEmptyTest {
-  private MapValue instance;
-
-  @BeforeEach
-  void setup() throws Exception {
-    instance = new MapValue(Collections.emptyMap());
-  }
-
-  @Test
-  void prettyPrint() {
-    assertEquals("Map", print(instance));
-  }
-
-  @Test
-  void isEmpty() {
-    assertTrue(instance.isEmpty());
-  }
-
-  @Test
-  void count() {
-    assertEquals(0, instance.count());
-  }
-
-  @Test
-  void get() {
-    assertEquals(Value.nullValue(), instance.get("a"));
-    assertEquals(Value.nullValue(), instance.get("b"));
-    assertEquals(Value.undefinedValue(), instance.get(Values.UNDEFINED_OBJECT));
-    assertEquals(Value.undefinedValue(), instance.get(Value.undefinedValue()));
-    assertEquals(Value.nullValue(), instance.get(Values.NULL_OBJECT));
-    assertEquals(Value.nullValue(), instance.get(Value.nullValue()));
-    assertEquals(Value.nullValue(), instance.get(null));
-  }
+    private MapValue instance;
+
+    @BeforeEach
+    void setup() throws Exception {
+        instance = new MapValue(Collections.emptyMap());
+    }
+
+    @Test
+    void prettyPrint() {
+        assertEquals("Map", print(instance));
+    }
+
+    @Test
+    void isEmpty() {
+        assertTrue(instance.isEmpty());
+    }
+
+    @Test
+    void count() {
+        assertEquals(0, instance.count());
+    }
+
+    @Test
+    void get() {
+        assertEquals(Value.nullValue(), instance.get("a"));
+        assertEquals(Value.nullValue(), instance.get("b"));
+        assertEquals(Value.undefinedValue(), instance.get(Values.UNDEFINED_OBJECT));
+        assertEquals(Value.undefinedValue(), instance.get(Value.undefinedValue()));
+        assertEquals(Value.nullValue(), instance.get(Values.NULL_OBJECT));
+        assertEquals(Value.nullValue(), instance.get(Value.nullValue()));
+        assertEquals(Value.nullValue(), instance.get(null));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/MapValueNullTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/MapValueNullTest.java
index f10c02e4cbc..a92cb76d071 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/MapValueNullTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/MapValueNullTest.java
@@ -9,31 +9,31 @@
 import org.junit.jupiter.api.Test;
 
 class MapValueNullTest {
-  private MapValue instance;
-
-  @BeforeEach
-  void setup() throws Exception {
-    instance = new MapValue(null);
-  }
-
-  @Test
-  void prettyPrint() {
-    assertEquals("null", print(instance));
-  }
-
-  @Test
-  void isEmpty() {
-    assertTrue(instance.isEmpty());
-  }
-
-  @Test
-  void count() {
-    assertEquals(0, instance.count());
-  }
-
-  @Test
-  void get() {
-    assertEquals(Value.nullValue(), instance.get(0));
-    assertEquals(Value.nullValue(), instance.get(10));
-  }
+    private MapValue instance;
+
+    @BeforeEach
+    void setup() throws Exception {
+        instance = new MapValue(null);
+    }
+
+    @Test
+    void prettyPrint() {
+        assertEquals("null", print(instance));
+    }
+
+    @Test
+    void isEmpty() {
+        assertTrue(instance.isEmpty());
+    }
+
+    @Test
+    void count() {
+        assertEquals(0, instance.count());
+    }
+
+    @Test
+    void get() {
+        assertEquals(Value.nullValue(), instance.get(0));
+        assertEquals(Value.nullValue(), instance.get(10));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/MapValueTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/MapValueTest.java
index ba9c472373c..906401c907e 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/MapValueTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/MapValueTest.java
@@ -14,63 +14,63 @@
 import org.junit.jupiter.api.Test;
 
 class MapValueTest {
-  private MapValue instance;
+    private MapValue instance;
 
-  @BeforeEach
-  void setup() throws Exception {
-    Map<String, String> map = new HashMap<>();
-    map.put("a", "a");
-    map.put("b", null);
-    instance = new MapValue(map);
-  }
+    @BeforeEach
+    void setup() throws Exception {
+        Map<String, String> map = new HashMap<>();
+        map.put("a", "a");
+        map.put("b", null);
+        instance = new MapValue(map);
+    }
 
-  @Test
-  void prettyPrint() {
-    assertEquals("Map", print(instance));
-  }
+    @Test
+    void prettyPrint() {
+        assertEquals("Map", print(instance));
+    }
 
-  @Test
-  void isEmpty() {
-    assertFalse(instance.isEmpty());
-  }
+    @Test
+    void isEmpty() {
+        assertFalse(instance.isEmpty());
+    }
 
-  @Test
-  void count() {
-    assertEquals(2, instance.count());
-  }
+    @Test
+    void count() {
+        assertEquals(2, instance.count());
+    }
 
-  @Test
-  void get() {
-    assertEquals(Value.of("a", ValueType.OBJECT), instance.get("a"));
-    assertEquals(Value.of("a", ValueType.OBJECT), instance.get(Value.of("a", ValueType.OBJECT)));
-    assertEquals(Value.nullValue(), instance.get("b"));
-    assertEquals(Value.nullValue(), instance.get(Value.of("b", ValueType.OBJECT)));
-    assertEquals(Value.nullValue(), instance.get("c"));
-    assertEquals(Value.nullValue(), instance.get(Value.of("c", ValueType.OBJECT)));
-    assertEquals(Value.undefinedValue(), instance.get(Values.UNDEFINED_OBJECT));
-    assertEquals(Value.undefinedValue(), instance.get(Value.undefinedValue()));
-  }
+    @Test
+    void get() {
+        assertEquals(Value.of("a", ValueType.OBJECT), instance.get("a"));
+        assertEquals(Value.of("a", ValueType.OBJECT), instance.get(Value.of("a", ValueType.OBJECT)));
+        assertEquals(Value.nullValue(), instance.get("b"));
+        assertEquals(Value.nullValue(), instance.get(Value.of("b", ValueType.OBJECT)));
+        assertEquals(Value.nullValue(), instance.get("c"));
+        assertEquals(Value.nullValue(), instance.get(Value.of("c", ValueType.OBJECT)));
+        assertEquals(Value.undefinedValue(), instance.get(Values.UNDEFINED_OBJECT));
+        assertEquals(Value.undefinedValue(), instance.get(Value.undefinedValue()));
+    }
 
-  @Test
-  void intMap() {
-    Map<Integer, Integer> map = new HashMap<>();
-    map.put(1, 1);
-    map.put(2, 2);
-    instance = new MapValue(map);
-    assertEquals(2, instance.count());
-    assertEquals(Value.of(1, ValueType.INT), instance.get(1));
-    assertEquals(Value.of(2, ValueType.INT), instance.get(2));
-    Value<?> key = Value.of(1, ValueType.INT);
-    assertEquals(Value.of(1, ValueType.INT), instance.get(key));
-  }
+    @Test
+    void intMap() {
+        Map<Integer, Integer> map = new HashMap<>();
+        map.put(1, 1);
+        map.put(2, 2);
+        instance = new MapValue(map);
+        assertEquals(2, instance.count());
+        assertEquals(Value.of(1, ValueType.INT), instance.get(1));
+        assertEquals(Value.of(2, ValueType.INT), instance.get(2));
+        Value<?> key = Value.of(1, ValueType.INT);
+        assertEquals(Value.of(1, ValueType.INT), instance.get(key));
+    }
 
-  @Test
-  void nullMap() {
-    MapValue mapValue = new MapValue(null);
-    assertTrue(mapValue.isEmpty());
-    assertTrue(mapValue.isNull());
-    mapValue = new MapValue(Values.NULL_OBJECT);
-    assertTrue(mapValue.isEmpty());
-    assertTrue(mapValue.isNull());
-  }
+    @Test
+    void nullMap() {
+        MapValue mapValue = new MapValue(null);
+        assertTrue(mapValue.isEmpty());
+        assertTrue(mapValue.isNull());
+        mapValue = new MapValue(Values.NULL_OBJECT);
+        assertTrue(mapValue.isEmpty());
+        assertTrue(mapValue.isNull());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/MapValueUndefinedTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/MapValueUndefinedTest.java
index ace51c4c10a..8c2c2db9c2d 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/MapValueUndefinedTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/MapValueUndefinedTest.java
@@ -9,31 +9,31 @@
 import org.junit.jupiter.api.Test;
 
 class MapValueUndefinedTest {
-  private MapValue instance;
-
-  @BeforeEach
-  void setup() throws Exception {
-    instance = new MapValue("a");
-  }
-
-  @Test
-  void prettyPrint() {
-    assertEquals("null", print(instance));
-  }
-
-  @Test
-  void isEmpty() {
-    assertTrue(instance.isEmpty());
-  }
-
-  @Test
-  void count() {
-    assertEquals(-1, instance.count());
-  }
-
-  @Test
-  void get() {
-    assertEquals(Value.undefinedValue(), instance.get(0));
-    assertEquals(Value.undefinedValue(), instance.get(10));
-  }
+    private MapValue instance;
+
+    @BeforeEach
+    void setup() throws Exception {
+        instance = new MapValue("a");
+    }
+
+    @Test
+    void prettyPrint() {
+        assertEquals("null", print(instance));
+    }
+
+    @Test
+    void isEmpty() {
+        assertTrue(instance.isEmpty());
+    }
+
+    @Test
+    void count() {
+        assertEquals(-1, instance.count());
+    }
+
+    @Test
+    void get() {
+        assertEquals(Value.undefinedValue(), instance.get(0));
+        assertEquals(Value.undefinedValue(), instance.get(10));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/NumericValueTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/NumericValueTest.java
index d2a3befc6ec..c05e990b461 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/NumericValueTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/NumericValueTest.java
@@ -12,92 +12,92 @@
 import org.junit.jupiter.api.Test;
 
 class NumericValueTest {
-  @Test
-  void testNullLiteral() {
-    NumericValue instance = new NumericValue(null, ValueType.OBJECT);
-    assertTrue(instance.isNull());
-    assertFalse(instance.isUndefined());
-    assertNull(instance.getValue());
-    assertEquals("null", print(instance));
-  }
+    @Test
+    void testNullLiteral() {
+        NumericValue instance = new NumericValue(null, ValueType.OBJECT);
+        assertTrue(instance.isNull());
+        assertFalse(instance.isUndefined());
+        assertNull(instance.getValue());
+        assertEquals("null", print(instance));
+    }
 
-  @Test
-  void testByteLiteral() {
-    byte expected = 1;
-    NumericValue instance = new NumericValue(expected, ValueType.BYTE);
-    assertFalse(instance.isNull());
-    assertFalse(instance.isUndefined());
-    assertEquals(expected, instance.getValue());
-    assertEquals("1", print(instance));
-  }
+    @Test
+    void testByteLiteral() {
+        byte expected = 1;
+        NumericValue instance = new NumericValue(expected, ValueType.BYTE);
+        assertFalse(instance.isNull());
+        assertFalse(instance.isUndefined());
+        assertEquals(expected, instance.getValue());
+        assertEquals("1", print(instance));
+    }
 
-  @Test
-  void testShortLiteral() {
-    short expected = 1;
-    NumericValue instance = new NumericValue(expected, ValueType.SHORT);
-    assertFalse(instance.isNull());
-    assertFalse(instance.isUndefined());
-    assertEquals(expected, instance.getValue());
-    assertEquals("1", print(instance));
-  }
+    @Test
+    void testShortLiteral() {
+        short expected = 1;
+        NumericValue instance = new NumericValue(expected, ValueType.SHORT);
+        assertFalse(instance.isNull());
+        assertFalse(instance.isUndefined());
+        assertEquals(expected, instance.getValue());
+        assertEquals("1", print(instance));
+    }
 
-  @Test
-  void testIntLiteral() {
-    int expected = 1;
-    NumericValue instance = new NumericValue(expected, ValueType.INT);
-    assertFalse(instance.isNull());
-    assertFalse(instance.isUndefined());
-    assertEquals(expected, instance.getValue());
-    assertEquals("1", print(instance));
-  }
+    @Test
+    void testIntLiteral() {
+        int expected = 1;
+        NumericValue instance = new NumericValue(expected, ValueType.INT);
+        assertFalse(instance.isNull());
+        assertFalse(instance.isUndefined());
+        assertEquals(expected, instance.getValue());
+        assertEquals("1", print(instance));
+    }
 
-  @Test
-  void testLongLiteral() {
-    long expected = 1;
-    NumericValue instance = new NumericValue(expected, ValueType.LONG);
-    assertFalse(instance.isNull());
-    assertFalse(instance.isUndefined());
-    assertEquals(expected, instance.getValue());
-    assertEquals("1", print(instance));
-  }
+    @Test
+    void testLongLiteral() {
+        long expected = 1;
+        NumericValue instance = new NumericValue(expected, ValueType.LONG);
+        assertFalse(instance.isNull());
+        assertFalse(instance.isUndefined());
+        assertEquals(expected, instance.getValue());
+        assertEquals("1", print(instance));
+    }
 
-  @Test
-  void testFloatLiteral() {
-    float expected = 1.0f;
-    NumericValue instance = new NumericValue(expected, ValueType.FLOAT);
-    assertFalse(instance.isNull());
-    assertFalse(instance.isUndefined());
-    assertEquals(expected, instance.getValue());
-    assertEquals("1.0", print(instance));
-  }
+    @Test
+    void testFloatLiteral() {
+        float expected = 1.0f;
+        NumericValue instance = new NumericValue(expected, ValueType.FLOAT);
+        assertFalse(instance.isNull());
+        assertFalse(instance.isUndefined());
+        assertEquals(expected, instance.getValue());
+        assertEquals("1.0", print(instance));
+    }
 
-  @Test
-  void testDoubleLiteral() {
-    double expected = 1.0;
-    NumericValue instance = new NumericValue(expected, ValueType.DOUBLE);
-    assertFalse(instance.isNull());
-    assertFalse(instance.isUndefined());
-    assertEquals(expected, instance.getValue());
-    assertEquals("1.0", print(instance));
-  }
+    @Test
+    void testDoubleLiteral() {
+        double expected = 1.0;
+        NumericValue instance = new NumericValue(expected, ValueType.DOUBLE);
+        assertFalse(instance.isNull());
+        assertFalse(instance.isUndefined());
+        assertEquals(expected, instance.getValue());
+        assertEquals("1.0", print(instance));
+    }
 
-  @Test
-  void testBigDecimalLiteral() {
-    BigDecimal expected = new BigDecimal("1.0");
-    NumericValue instance = new NumericValue(expected, ValueType.OBJECT);
-    assertFalse(instance.isNull());
-    assertFalse(instance.isUndefined());
-    assertEquals(expected, instance.getValue());
-    assertEquals("1.0", print(instance));
-  }
+    @Test
+    void testBigDecimalLiteral() {
+        BigDecimal expected = new BigDecimal("1.0");
+        NumericValue instance = new NumericValue(expected, ValueType.OBJECT);
+        assertFalse(instance.isNull());
+        assertFalse(instance.isUndefined());
+        assertEquals(expected, instance.getValue());
+        assertEquals("1.0", print(instance));
+    }
 
-  @Test
-  void testBigIntegerLiteral() {
-    BigInteger expected = new BigInteger("1234567890");
-    NumericValue instance = new NumericValue(expected, ValueType.OBJECT);
-    assertFalse(instance.isNull());
-    assertFalse(instance.isUndefined());
-    assertEquals(expected, instance.getValue());
-    assertEquals("1234567890", print(instance));
-  }
+    @Test
+    void testBigIntegerLiteral() {
+        BigInteger expected = new BigInteger("1234567890");
+        NumericValue instance = new NumericValue(expected, ValueType.OBJECT);
+        assertFalse(instance.isNull());
+        assertFalse(instance.isUndefined());
+        assertEquals(expected, instance.getValue());
+        assertEquals("1234567890", print(instance));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/ObjectValueTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/ObjectValueTest.java
index 522e3017914..a4261448591 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/ObjectValueTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/ObjectValueTest.java
@@ -9,38 +9,38 @@
 import org.junit.jupiter.api.Test;
 
 class ObjectValueTest {
-  @Test
-  void testNullLiteral() {
-    ObjectValue instance = new ObjectValue(null);
-    assertTrue(instance.isNull());
-    assertFalse(instance.isUndefined());
-    assertEquals(Values.NULL_OBJECT, instance.getValue());
-    assertEquals("null", print(instance));
+    @Test
+    void testNullLiteral() {
+        ObjectValue instance = new ObjectValue(null);
+        assertTrue(instance.isNull());
+        assertFalse(instance.isUndefined());
+        assertEquals(Values.NULL_OBJECT, instance.getValue());
+        assertEquals("null", print(instance));
 
-    instance = new ObjectValue(Values.NULL_OBJECT);
-    assertTrue(instance.isNull());
-    assertFalse(instance.isUndefined());
-    assertEquals(Values.NULL_OBJECT, instance.getValue());
-    assertEquals("null", print(instance));
-  }
+        instance = new ObjectValue(Values.NULL_OBJECT);
+        assertTrue(instance.isNull());
+        assertFalse(instance.isUndefined());
+        assertEquals(Values.NULL_OBJECT, instance.getValue());
+        assertEquals("null", print(instance));
+    }
 
-  @Test
-  void testNonNullLiteral() {
-    Object expected = new Object();
-    ObjectValue instance = new ObjectValue(expected);
-    assertFalse(instance.isNull());
-    assertFalse(instance.isUndefined());
-    assertEquals(expected, instance.getValue());
-    assertEquals("java.lang.Object", print(instance));
-  }
+    @Test
+    void testNonNullLiteral() {
+        Object expected = new Object();
+        ObjectValue instance = new ObjectValue(expected);
+        assertFalse(instance.isNull());
+        assertFalse(instance.isUndefined());
+        assertEquals(expected, instance.getValue());
+        assertEquals("java.lang.Object", print(instance));
+    }
 
-  @Test
-  void testUndefinedLiteral() {
-    Object expected = Values.UNDEFINED_OBJECT;
-    ObjectValue instance = new ObjectValue(expected);
-    assertFalse(instance.isNull());
-    assertTrue(instance.isUndefined());
-    assertEquals(expected, instance.getValue());
-    assertEquals("UNDEFINED", print(instance));
-  }
+    @Test
+    void testUndefinedLiteral() {
+        Object expected = Values.UNDEFINED_OBJECT;
+        ObjectValue instance = new ObjectValue(expected);
+        assertFalse(instance.isNull());
+        assertTrue(instance.isUndefined());
+        assertEquals(expected, instance.getValue());
+        assertEquals("UNDEFINED", print(instance));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/SetValueEmptyTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/SetValueEmptyTest.java
index e4d35ddcab6..a500417f5cb 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/SetValueEmptyTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/SetValueEmptyTest.java
@@ -11,36 +11,36 @@
 import org.junit.jupiter.api.Test;
 
 public class SetValueEmptyTest {
-  private SetValue instance;
-
-  @BeforeEach
-  void setup() throws Exception {
-    instance = new SetValue(Collections.emptySet());
-  }
-
-  @Test
-  void prettyPrint() {
-    assertEquals("Set", print(instance));
-  }
-
-  @Test
-  void isEmpty() {
-    assertTrue(instance.isEmpty());
-  }
-
-  @Test
-  void count() {
-    assertEquals(0, instance.count());
-  }
-
-  @Test
-  void get() {
-    assertEquals(BooleanValue.FALSE, instance.get("a"));
-    assertEquals(BooleanValue.FALSE, instance.get("b"));
-    assertEquals(Value.undefinedValue(), instance.get(Values.UNDEFINED_OBJECT));
-    assertEquals(Value.undefinedValue(), instance.get(Value.undefinedValue()));
-    assertEquals(Value.nullValue(), instance.get(Values.NULL_OBJECT));
-    assertEquals(Value.nullValue(), instance.get(Value.nullValue()));
-    assertEquals(Value.nullValue(), instance.get(null));
-  }
+    private SetValue instance;
+
+    @BeforeEach
+    void setup() throws Exception {
+        instance = new SetValue(Collections.emptySet());
+    }
+
+    @Test
+    void prettyPrint() {
+        assertEquals("Set", print(instance));
+    }
+
+    @Test
+    void isEmpty() {
+        assertTrue(instance.isEmpty());
+    }
+
+    @Test
+    void count() {
+        assertEquals(0, instance.count());
+    }
+
+    @Test
+    void get() {
+        assertEquals(BooleanValue.FALSE, instance.get("a"));
+        assertEquals(BooleanValue.FALSE, instance.get("b"));
+        assertEquals(Value.undefinedValue(), instance.get(Values.UNDEFINED_OBJECT));
+        assertEquals(Value.undefinedValue(), instance.get(Value.undefinedValue()));
+        assertEquals(Value.nullValue(), instance.get(Values.NULL_OBJECT));
+        assertEquals(Value.nullValue(), instance.get(Value.nullValue()));
+        assertEquals(Value.nullValue(), instance.get(null));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/SetValueNullTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/SetValueNullTest.java
index ecd20066ba6..d55a8d88e7e 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/SetValueNullTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/SetValueNullTest.java
@@ -9,31 +9,31 @@
 import org.junit.jupiter.api.Test;
 
 public class SetValueNullTest {
-  private SetValue instance;
-
-  @BeforeEach
-  void setup() throws Exception {
-    instance = new SetValue(null);
-  }
-
-  @Test
-  void prettyPrint() {
-    assertEquals("null", print(instance));
-  }
-
-  @Test
-  void isEmpty() {
-    assertTrue(instance.isEmpty());
-  }
-
-  @Test
-  void count() {
-    assertEquals(0, instance.count());
-  }
-
-  @Test
-  void get() {
-    assertEquals(Value.nullValue(), instance.get(0));
-    assertEquals(Value.nullValue(), instance.get(10));
-  }
+    private SetValue instance;
+
+    @BeforeEach
+    void setup() throws Exception {
+        instance = new SetValue(null);
+    }
+
+    @Test
+    void prettyPrint() {
+        assertEquals("null", print(instance));
+    }
+
+    @Test
+    void isEmpty() {
+        assertTrue(instance.isEmpty());
+    }
+
+    @Test
+    void count() {
+        assertEquals(0, instance.count());
+    }
+
+    @Test
+    void get() {
+        assertEquals(Value.nullValue(), instance.get(0));
+        assertEquals(Value.nullValue(), instance.get(10));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/SetValueTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/SetValueTest.java
index 5df91be3e08..36fda35f8b8 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/SetValueTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/SetValueTest.java
@@ -14,52 +14,50 @@
 import org.junit.jupiter.api.Test;
 
 class SetValueTest {
-  private SetValue instance;
-
-  @BeforeEach
-  void setup() throws Exception {
-    Set<String> set = new HashSet<>();
-    set.add("foo");
-    set.add("bar");
-    instance = new SetValue(set);
-  }
-
-  @Test
-  void prettyPrint() {
-    assertEquals("Set", print(instance));
-  }
-
-  @Test
-  void isEmpty() {
-    assertFalse(instance.isEmpty());
-  }
-
-  @Test
-  void count() {
-    assertEquals(2, instance.count());
-  }
-
-  @Test
-  void get() {
-    assertEquals(Value.of(true, ValueType.BOOLEAN), instance.get("foo"));
-    assertEquals(BooleanValue.TRUE, instance.get("foo"));
-    assertEquals(
-        Value.of(true, ValueType.BOOLEAN), instance.get(Value.of("foo", ValueType.OBJECT)));
-    assertEquals(Value.of(false, ValueType.BOOLEAN), instance.get("oof"));
-    assertEquals(BooleanValue.FALSE, instance.get("oof"));
-    assertEquals(
-        Value.of(false, ValueType.BOOLEAN), instance.get(Value.of("oof", ValueType.OBJECT)));
-    assertEquals(Value.undefinedValue(), instance.get(Values.UNDEFINED_OBJECT));
-    assertEquals(Value.undefinedValue(), instance.get(Value.undefinedValue()));
-  }
-
-  @Test
-  void nullSet() {
-    SetValue setValue = new SetValue(null);
-    assertTrue(setValue.isEmpty());
-    assertTrue(setValue.isNull());
-    setValue = new SetValue(Values.NULL_OBJECT);
-    assertTrue(setValue.isEmpty());
-    assertTrue(setValue.isNull());
-  }
+    private SetValue instance;
+
+    @BeforeEach
+    void setup() throws Exception {
+        Set<String> set = new HashSet<>();
+        set.add("foo");
+        set.add("bar");
+        instance = new SetValue(set);
+    }
+
+    @Test
+    void prettyPrint() {
+        assertEquals("Set", print(instance));
+    }
+
+    @Test
+    void isEmpty() {
+        assertFalse(instance.isEmpty());
+    }
+
+    @Test
+    void count() {
+        assertEquals(2, instance.count());
+    }
+
+    @Test
+    void get() {
+        assertEquals(Value.of(true, ValueType.BOOLEAN), instance.get("foo"));
+        assertEquals(BooleanValue.TRUE, instance.get("foo"));
+        assertEquals(Value.of(true, ValueType.BOOLEAN), instance.get(Value.of("foo", ValueType.OBJECT)));
+        assertEquals(Value.of(false, ValueType.BOOLEAN), instance.get("oof"));
+        assertEquals(BooleanValue.FALSE, instance.get("oof"));
+        assertEquals(Value.of(false, ValueType.BOOLEAN), instance.get(Value.of("oof", ValueType.OBJECT)));
+        assertEquals(Value.undefinedValue(), instance.get(Values.UNDEFINED_OBJECT));
+        assertEquals(Value.undefinedValue(), instance.get(Value.undefinedValue()));
+    }
+
+    @Test
+    void nullSet() {
+        SetValue setValue = new SetValue(null);
+        assertTrue(setValue.isEmpty());
+        assertTrue(setValue.isNull());
+        setValue = new SetValue(Values.NULL_OBJECT);
+        assertTrue(setValue.isEmpty());
+        assertTrue(setValue.isNull());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/StringValueTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/StringValueTest.java
index 0d561b3779c..472c9e9b4b9 100644
--- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/StringValueTest.java
+++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/values/StringValueTest.java
@@ -11,26 +11,26 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 class StringValueTest {
-  @Test
-  void testNullLiteral() {
-    StringValue instance = new StringValue(null);
-    assertTrue(instance.isNull());
-    assertFalse(instance.isUndefined());
-    assertFalse(instance.isEmpty());
-    assertNull(instance.getValue());
-    assertEquals(-1, instance.length());
-    assertEquals("\"null\"", print(instance));
-  }
+    @Test
+    void testNullLiteral() {
+        StringValue instance = new StringValue(null);
+        assertTrue(instance.isNull());
+        assertFalse(instance.isUndefined());
+        assertFalse(instance.isEmpty());
+        assertNull(instance.getValue());
+        assertEquals(-1, instance.length());
+        assertEquals("\"null\"", print(instance));
+    }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"", "hello"})
-  void testNonNullLiteral(String expected) {
-    StringValue instance = new StringValue(expected);
-    assertFalse(instance.isNull());
-    assertFalse(instance.isUndefined());
-    assertEquals(expected.isEmpty(), instance.isEmpty());
-    assertEquals(expected, instance.getValue());
-    assertEquals(expected.length(), instance.length());
-    assertEquals("\"" + expected + "\"", print(instance));
-  }
+    @ParameterizedTest
+    @ValueSource(strings = {"", "hello"})
+    void testNonNullLiteral(String expected) {
+        StringValue instance = new StringValue(expected);
+        assertFalse(instance.isNull());
+        assertFalse(instance.isUndefined());
+        assertEquals(expected.isEmpty(), instance.isEmpty());
+        assertEquals(expected, instance.getValue());
+        assertEquals(expected.length(), instance.length());
+        assertEquals("\"" + expected + "\"", print(instance));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/AllowListHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/AllowListHelper.java
index 2a9a9e3bb11..8c068204e75 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/AllowListHelper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/AllowListHelper.java
@@ -7,46 +7,46 @@
 
 /** Helper class for handling allowed classes and packages for instrumentation */
 public class AllowListHelper {
-  private static final Logger log = LoggerFactory.getLogger(AllowListHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(AllowListHelper.class);
 
-  private final boolean allowAll;
-  private ClassNameTrie packagePrefixTrie;
-  private HashSet<String> classes;
+    private final boolean allowAll;
+    private ClassNameTrie packagePrefixTrie;
+    private HashSet<String> classes;
 
-  public AllowListHelper(Configuration.FilterList allowList) {
-    this.allowAll =
-        allowList == null
-            || allowList.getClasses().isEmpty() && allowList.getPackagePrefixes().isEmpty();
-    if (allowList != null) {
-      ClassNameTrie.Builder builder = new ClassNameTrie.Builder();
-      allowList.getPackagePrefixes().stream().forEach(s -> builder.put(s + "*", 1));
-      this.packagePrefixTrie = builder.buildTrie();
-      this.classes = new HashSet<>(allowList.getClasses());
+    public AllowListHelper(Configuration.FilterList allowList) {
+        this.allowAll = allowList == null
+                || allowList.getClasses().isEmpty()
+                        && allowList.getPackagePrefixes().isEmpty();
+        if (allowList != null) {
+            ClassNameTrie.Builder builder = new ClassNameTrie.Builder();
+            allowList.getPackagePrefixes().stream().forEach(s -> builder.put(s + "*", 1));
+            this.packagePrefixTrie = builder.buildTrie();
+            this.classes = new HashSet<>(allowList.getClasses());
+        }
+        if (allowAll) {
+            log.debug("AllowList: allow all");
+        } else {
+            log.debug(
+                    "AllowList - package prefixes: {}, classes: {}",
+                    allowList.getPackagePrefixes(),
+                    allowList.getClasses());
+        }
     }
-    if (allowAll) {
-      log.debug("AllowList: allow all");
-    } else {
-      log.debug(
-          "AllowList - package prefixes: {}, classes: {}",
-          allowList.getPackagePrefixes(),
-          allowList.getClasses());
-    }
-  }
 
-  public boolean isAllowed(String typeName) {
-    if (allowAll) {
-      return true;
-    }
-    if (packagePrefixTrie.apply(typeName) > 0) {
-      return true;
+    public boolean isAllowed(String typeName) {
+        if (allowAll) {
+            return true;
+        }
+        if (packagePrefixTrie.apply(typeName) > 0) {
+            return true;
+        }
+        if (classes.contains(typeName)) {
+            return true;
+        }
+        return false;
     }
-    if (classes.contains(typeName)) {
-      return true;
-    }
-    return false;
-  }
 
-  public boolean isAllowAll() {
-    return allowAll;
-  }
+    public boolean isAllowAll() {
+        return allowAll;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ClassesToRetransformFinder.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ClassesToRetransformFinder.java
index d91a159a914..892e9453332 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ClassesToRetransformFinder.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ClassesToRetransformFinder.java
@@ -20,104 +20,100 @@
 import org.slf4j.LoggerFactory;
 
 public class ClassesToRetransformFinder {
-  private static final Logger LOGGER = LoggerFactory.getLogger(ClassesToRetransformFinder.class);
-  private static final Pattern COMMA_PATTERN = Pattern.compile(",");
+    private static final Logger LOGGER = LoggerFactory.getLogger(ClassesToRetransformFinder.class);
+    private static final Pattern COMMA_PATTERN = Pattern.compile(",");
 
-  private final ConcurrentMap<String, String> classNamesBySourceFile = new ConcurrentHashMap<>();
+    private final ConcurrentMap<String, String> classNamesBySourceFile = new ConcurrentHashMap<>();
 
-  public void register(String sourceFile, String className) {
-    // store only the class name that are different from SourceFile name
-    // (Inner or non-public Top-Level classes)
-    classNamesBySourceFile.compute(
-        sourceFile,
-        (key, classNames) -> {
-          if (classNames == null) {
-            return className;
-          }
-          return classNames + "," + className;
+    public void register(String sourceFile, String className) {
+        // store only the class name that are different from SourceFile name
+        // (Inner or non-public Top-Level classes)
+        classNamesBySourceFile.compute(sourceFile, (key, classNames) -> {
+            if (classNames == null) {
+                return className;
+            }
+            return classNames + "," + className;
         });
-  }
-
-  public List<Class<?>> getAllLoadedChangedClasses(
-      Class<?>[] allLoadedClasses, ConfigurationComparer comparer) {
-    List<Class<?>> classesToBeTransformed = new ArrayList<>();
-    Trie changedClasses = getAllChangedClasses(comparer);
-    for (Class<?> clazz : allLoadedClasses) {
-      if (clazz == null) {
-        // clazz could be null in the array returned by Instrumentation::getAllLoadedClasses
-        // probably because class unloading
-        continue;
-      }
-      if (lookupClass(changedClasses, clazz)) {
-        classesToBeTransformed.add(clazz);
-      }
     }
-    return classesToBeTransformed;
-  }
-
-  public boolean hasChangedClasses(ConfigurationComparer comparer) {
-    return !getAllChangedClasses(comparer).isEmpty();
-  }
 
-  Trie getAllChangedClasses(ConfigurationComparer comparer) {
-    List<ProbeDefinition> changedDefinitions =
-        Stream.concat(
-                comparer.getRemovedDefinitions().stream(), comparer.getAddedDefinitions().stream())
-            .collect(Collectors.toList());
-    Trie changedClasses = new Trie();
-    for (ProbeDefinition definition : changedDefinitions) {
-      InstrumentationResult instrumentationResult =
-          comparer.getInstrumentationResults().get(definition.getProbeId().getEncodedId());
-      String key = instrumentationResult != null ? instrumentationResult.getTypeName() : null;
-      if (key == null || key.equals("")) {
-        key = definition.getWhere().getTypeName();
-        if (key == null || key.equals("")) {
-          key = definition.getWhere().getSourceFile();
-          if (key == null || key.equals("")) {
-            continue;
-          }
-          processAdditionalClasses(key, changedClasses);
-          key = removeExtension(key);
-          key = normalizeFilePath(key);
+    public List<Class<?>> getAllLoadedChangedClasses(Class<?>[] allLoadedClasses, ConfigurationComparer comparer) {
+        List<Class<?>> classesToBeTransformed = new ArrayList<>();
+        Trie changedClasses = getAllChangedClasses(comparer);
+        for (Class<?> clazz : allLoadedClasses) {
+            if (clazz == null) {
+                // clazz could be null in the array returned by Instrumentation::getAllLoadedClasses
+                // probably because class unloading
+                continue;
+            }
+            if (lookupClass(changedClasses, clazz)) {
+                classesToBeTransformed.add(clazz);
+            }
         }
-      } else {
-        key = normalizeFilePath(key);
-      }
-      LOGGER.debug("instrumented class changed: {} for probe id: {}", key, definition.getId());
-      changedClasses.insert(reverseStr(key));
+        return classesToBeTransformed;
     }
-    for (String typeName : comparer.getChangedBlockedTypes()) {
-      LOGGER.debug("blocked class found: {}", typeName);
-      changedClasses.insert(reverseStr(typeName));
+
+    public boolean hasChangedClasses(ConfigurationComparer comparer) {
+        return !getAllChangedClasses(comparer).isEmpty();
     }
-    return changedClasses;
-  }
 
-  private void processAdditionalClasses(String sourceFile, Trie changedClasses) {
-    sourceFile = stripPackagePath(sourceFile);
-    String classNames = classNamesBySourceFile.get(sourceFile);
-    if (classNames == null) {
-      return;
+    Trie getAllChangedClasses(ConfigurationComparer comparer) {
+        List<ProbeDefinition> changedDefinitions = Stream.concat(
+                        comparer.getRemovedDefinitions().stream(), comparer.getAddedDefinitions().stream())
+                .collect(Collectors.toList());
+        Trie changedClasses = new Trie();
+        for (ProbeDefinition definition : changedDefinitions) {
+            InstrumentationResult instrumentationResult = comparer.getInstrumentationResults()
+                    .get(definition.getProbeId().getEncodedId());
+            String key = instrumentationResult != null ? instrumentationResult.getTypeName() : null;
+            if (key == null || key.equals("")) {
+                key = definition.getWhere().getTypeName();
+                if (key == null || key.equals("")) {
+                    key = definition.getWhere().getSourceFile();
+                    if (key == null || key.equals("")) {
+                        continue;
+                    }
+                    processAdditionalClasses(key, changedClasses);
+                    key = removeExtension(key);
+                    key = normalizeFilePath(key);
+                }
+            } else {
+                key = normalizeFilePath(key);
+            }
+            LOGGER.debug("instrumented class changed: {} for probe id: {}", key, definition.getId());
+            changedClasses.insert(reverseStr(key));
+        }
+        for (String typeName : comparer.getChangedBlockedTypes()) {
+            LOGGER.debug("blocked class found: {}", typeName);
+            changedClasses.insert(reverseStr(typeName));
+        }
+        return changedClasses;
     }
-    List<String> additionalClasses = Arrays.asList(COMMA_PATTERN.split(classNames));
-    for (String additionalClass : additionalClasses) {
-      additionalClass = normalizeFilePath(additionalClass);
-      changedClasses.insert(reverseStr(additionalClass));
+
+    private void processAdditionalClasses(String sourceFile, Trie changedClasses) {
+        sourceFile = stripPackagePath(sourceFile);
+        String classNames = classNamesBySourceFile.get(sourceFile);
+        if (classNames == null) {
+            return;
+        }
+        List<String> additionalClasses = Arrays.asList(COMMA_PATTERN.split(classNames));
+        for (String additionalClass : additionalClasses) {
+            additionalClass = normalizeFilePath(additionalClass);
+            changedClasses.insert(reverseStr(additionalClass));
+        }
     }
-  }
 
-  private static boolean lookupClass(Trie changedClasses, Class<?> clazz) {
-    String reversedTypeName = reverseStr(clazz.getTypeName());
-    // try first with FQN (java.lang.String)
-    if (changedClasses.containsPrefix(reversedTypeName)) {
-      return true;
+    private static boolean lookupClass(Trie changedClasses, Class<?> clazz) {
+        String reversedTypeName = reverseStr(clazz.getTypeName());
+        // try first with FQN (java.lang.String)
+        if (changedClasses.containsPrefix(reversedTypeName)) {
+            return true;
+        }
+        // fallback to matching on SimpleName (String)
+        String simpleName = extractSimpleName(clazz);
+        return changedClasses.contains(reverseStr(simpleName));
     }
-    // fallback to matching on SimpleName (String)
-    String simpleName = extractSimpleName(clazz);
-    return changedClasses.contains(reverseStr(simpleName));
-  }
 
-  ConcurrentMap<String, String> getClassNamesBySourceFile() {
-    return classNamesBySourceFile;
-  }
+    ConcurrentMap<String, String> getClassNamesBySourceFile() {
+        return classNamesBySourceFile;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/Configuration.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/Configuration.java
index d0676ef35d6..949934c46e8 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/Configuration.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/Configuration.java
@@ -20,250 +20,249 @@
  */
 public class Configuration {
 
-  /** Stores classes & packages filtering (allow or deny lists) */
-  public static class FilterList {
-    private final List<String> packagePrefixes;
-    private final List<String> classes;
-
-    public FilterList(List<String> packagePrefixes, List<String> classes) {
-      this.packagePrefixes = packagePrefixes;
-      this.classes = classes;
+    /** Stores classes & packages filtering (allow or deny lists) */
+    public static class FilterList {
+        private final List<String> packagePrefixes;
+        private final List<String> classes;
+
+        public FilterList(List<String> packagePrefixes, List<String> classes) {
+            this.packagePrefixes = packagePrefixes;
+            this.classes = classes;
+        }
+
+        public List<String> getPackagePrefixes() {
+            return packagePrefixes;
+        }
+
+        public List<String> getClasses() {
+            return classes;
+        }
+
+        @Generated
+        @Override
+        public String toString() {
+            return "FilterList{" + "packagePrefixes=" + packagePrefixes + ", classes=" + classes + '}';
+        }
+
+        @Generated
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            FilterList allowList = (FilterList) o;
+            return Objects.equals(packagePrefixes, allowList.packagePrefixes)
+                    && Objects.equals(classes, allowList.classes);
+        }
+
+        @Generated
+        @Override
+        public int hashCode() {
+            return Objects.hash(packagePrefixes, classes);
+        }
     }
 
-    public List<String> getPackagePrefixes() {
-      return packagePrefixes;
+    @Json(name = "id")
+    private final String service;
+
+    private transient List<ProbeDefinition> probes = new ArrayList<>();
+    private Collection<MetricProbe> metricProbes = new ArrayList<>();
+    private Collection<LogProbe> logProbes = new ArrayList<>();
+    private Collection<SpanProbe> spanProbes = new ArrayList<>();
+    private Collection<TriggerProbe> triggerProbes = new ArrayList<>();
+    private Collection<SpanDecorationProbe> spanDecorationProbes = new ArrayList<>();
+    private final FilterList allowList;
+    private final FilterList denyList;
+    private final LogProbe.Sampling sampling;
+
+    public Configuration(String serviceName, List<? extends ProbeDefinition> probes) {
+        this(serviceName, probes, null, null, null);
     }
 
-    public List<String> getClasses() {
-      return classes;
+    public Configuration(
+            String serviceName,
+            List<? extends ProbeDefinition> probes,
+            FilterList allowList,
+            FilterList denyList,
+            LogProbe.Sampling sampling) {
+        this.service = serviceName;
+        this.allowList = allowList;
+        this.denyList = denyList;
+        this.sampling = sampling;
+        probes.forEach(this::add);
     }
 
-    @Generated
-    @Override
-    public String toString() {
-      return "FilterList{" + "packagePrefixes=" + packagePrefixes + ", classes=" + classes + '}';
+    private void add(ProbeDefinition p) {
+        if (p instanceof LogProbe) {
+            logProbes.add((LogProbe) p);
+        } else if (p instanceof MetricProbe) {
+            metricProbes.add((MetricProbe) p);
+        } else if (p instanceof SpanProbe) {
+            spanProbes.add((SpanProbe) p);
+        } else if (p instanceof SpanDecorationProbe) {
+            spanDecorationProbes.add((SpanDecorationProbe) p);
+        } else if (p instanceof TriggerProbe) {
+            triggerProbes.add((TriggerProbe) p);
+        } else {
+            probes.add(p);
+        }
     }
 
-    @Generated
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      FilterList allowList = (FilterList) o;
-      return Objects.equals(packagePrefixes, allowList.packagePrefixes)
-          && Objects.equals(classes, allowList.classes);
+    public String getService() {
+        return service;
     }
 
-    @Generated
-    @Override
-    public int hashCode() {
-      return Objects.hash(packagePrefixes, classes);
-    }
-  }
-
-  @Json(name = "id")
-  private final String service;
-
-  private transient List<ProbeDefinition> probes = new ArrayList<>();
-  private Collection<MetricProbe> metricProbes = new ArrayList<>();
-  private Collection<LogProbe> logProbes = new ArrayList<>();
-  private Collection<SpanProbe> spanProbes = new ArrayList<>();
-  private Collection<TriggerProbe> triggerProbes = new ArrayList<>();
-  private Collection<SpanDecorationProbe> spanDecorationProbes = new ArrayList<>();
-  private final FilterList allowList;
-  private final FilterList denyList;
-  private final LogProbe.Sampling sampling;
-
-  public Configuration(String serviceName, List<? extends ProbeDefinition> probes) {
-    this(serviceName, probes, null, null, null);
-  }
-
-  public Configuration(
-      String serviceName,
-      List<? extends ProbeDefinition> probes,
-      FilterList allowList,
-      FilterList denyList,
-      LogProbe.Sampling sampling) {
-    this.service = serviceName;
-    this.allowList = allowList;
-    this.denyList = denyList;
-    this.sampling = sampling;
-    probes.forEach(this::add);
-  }
-
-  private void add(ProbeDefinition p) {
-    if (p instanceof LogProbe) {
-      logProbes.add((LogProbe) p);
-    } else if (p instanceof MetricProbe) {
-      metricProbes.add((MetricProbe) p);
-    } else if (p instanceof SpanProbe) {
-      spanProbes.add((SpanProbe) p);
-    } else if (p instanceof SpanDecorationProbe) {
-      spanDecorationProbes.add((SpanDecorationProbe) p);
-    } else if (p instanceof TriggerProbe) {
-      triggerProbes.add((TriggerProbe) p);
-    } else {
-      probes.add(p);
-    }
-  }
-
-  public String getService() {
-    return service;
-  }
-
-  public Collection<MetricProbe> getMetricProbes() {
-    return metricProbes;
-  }
-
-  public Collection<LogProbe> getLogProbes() {
-    return logProbes;
-  }
-
-  public Collection<SpanProbe> getSpanProbes() {
-    return spanProbes;
-  }
-
-  public Collection<TriggerProbe> getTriggerProbes() {
-    return triggerProbes;
-  }
-
-  public Collection<SpanDecorationProbe> getSpanDecorationProbes() {
-    return spanDecorationProbes;
-  }
-
-  public FilterList getAllowList() {
-    return allowList;
-  }
-
-  public FilterList getDenyList() {
-    return denyList;
-  }
-
-  public LogProbe.Sampling getSampling() {
-    return sampling;
-  }
-
-  public List<ProbeDefinition> getDefinitions() {
-    return Stream.of(
-            triggerProbes, metricProbes, logProbes, spanProbes, spanDecorationProbes, probes)
-        .filter(Objects::nonNull)
-        .flatMap(Collection::stream)
-        .collect(Collectors.toList());
-  }
-
-  @Generated
-  @Override
-  public String toString() {
-    return "DebuggerConfiguration{"
-        + "service="
-        + service
-        + ", probes="
-        + getDefinitions()
-        + ", allowList="
-        + allowList
-        + ", denyList="
-        + denyList
-        + ", sampling="
-        + sampling
-        + '}';
-  }
-
-  @Generated
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public Collection<MetricProbe> getMetricProbes() {
+        return metricProbes;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Configuration that = (Configuration) o;
-    return Objects.equals(service, that.service)
-        && Objects.equals(probes, that.probes)
-        && Objects.equals(allowList, that.allowList)
-        && Objects.equals(denyList, that.denyList)
-        && Objects.equals(sampling, that.sampling);
-  }
-
-  @Generated
-  @Override
-  public int hashCode() {
-    return Objects.hash(service, probes, allowList, denyList, sampling);
-  }
-
-  public static Configuration.Builder builder() {
-    return new Configuration.Builder();
-  }
 
-  public static class Builder {
-    private String service = null;
+    public Collection<LogProbe> getLogProbes() {
+        return logProbes;
+    }
 
-    private final List<ProbeDefinition> probes = new ArrayList<>();
+    public Collection<SpanProbe> getSpanProbes() {
+        return spanProbes;
+    }
 
-    private FilterList allowList = null;
+    public Collection<TriggerProbe> getTriggerProbes() {
+        return triggerProbes;
+    }
 
-    private FilterList denyList = null;
+    public Collection<SpanDecorationProbe> getSpanDecorationProbes() {
+        return spanDecorationProbes;
+    }
 
-    private LogProbe.Sampling sampling = null;
+    public FilterList getAllowList() {
+        return allowList;
+    }
 
-    public Configuration.Builder setService(String service) {
-      this.service = service;
-      return this;
+    public FilterList getDenyList() {
+        return denyList;
     }
 
-    public Configuration.Builder add(Collection<? extends ProbeDefinition> definitions) {
-      if (definitions == null) {
-        return this;
-      }
-      probes.addAll(definitions);
-      return this;
+    public LogProbe.Sampling getSampling() {
+        return sampling;
     }
 
-    public Configuration.Builder add(ProbeDefinition... probes) {
-      for (ProbeDefinition probe : probes) {
-        this.probes.add(probe);
-      }
-      return this;
+    public List<ProbeDefinition> getDefinitions() {
+        return Stream.of(triggerProbes, metricProbes, logProbes, spanProbes, spanDecorationProbes, probes)
+                .filter(Objects::nonNull)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList());
     }
 
-    public Configuration.Builder add(LogProbe.Sampling newSampling) {
-      if (newSampling != null) {
-        sampling = newSampling;
-      }
-      return this;
+    @Generated
+    @Override
+    public String toString() {
+        return "DebuggerConfiguration{"
+                + "service="
+                + service
+                + ", probes="
+                + getDefinitions()
+                + ", allowList="
+                + allowList
+                + ", denyList="
+                + denyList
+                + ", sampling="
+                + sampling
+                + '}';
     }
 
-    public Configuration.Builder addAllowList(FilterList newAllowList) {
-      if (newAllowList == null) {
-        return this;
-      }
-      if (allowList == null) {
-        allowList = new FilterList(new ArrayList<>(), new ArrayList<>());
-      }
-      allowList.getClasses().addAll(newAllowList.getClasses());
-      allowList.getPackagePrefixes().addAll(newAllowList.getPackagePrefixes());
-      return this;
+    @Generated
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Configuration that = (Configuration) o;
+        return Objects.equals(service, that.service)
+                && Objects.equals(probes, that.probes)
+                && Objects.equals(allowList, that.allowList)
+                && Objects.equals(denyList, that.denyList)
+                && Objects.equals(sampling, that.sampling);
     }
 
-    public Configuration.Builder addDenyList(FilterList newDenyList) {
-      if (newDenyList == null) {
-        return this;
-      }
-      if (denyList == null) {
-        denyList = new FilterList(new ArrayList<>(), new ArrayList<>());
-      }
-      denyList.getClasses().addAll(newDenyList.getClasses());
-      denyList.getPackagePrefixes().addAll(newDenyList.getPackagePrefixes());
-      return this;
+    @Generated
+    @Override
+    public int hashCode() {
+        return Objects.hash(service, probes, allowList, denyList, sampling);
     }
 
-    public Configuration.Builder setSampling(LogProbe.Sampling sampling) {
-      this.sampling = sampling;
-      return this;
+    public static Configuration.Builder builder() {
+        return new Configuration.Builder();
     }
 
-    public Configuration build() {
-      return new Configuration(service, probes, allowList, denyList, sampling);
+    public static class Builder {
+        private String service = null;
+
+        private final List<ProbeDefinition> probes = new ArrayList<>();
+
+        private FilterList allowList = null;
+
+        private FilterList denyList = null;
+
+        private LogProbe.Sampling sampling = null;
+
+        public Configuration.Builder setService(String service) {
+            this.service = service;
+            return this;
+        }
+
+        public Configuration.Builder add(Collection<? extends ProbeDefinition> definitions) {
+            if (definitions == null) {
+                return this;
+            }
+            probes.addAll(definitions);
+            return this;
+        }
+
+        public Configuration.Builder add(ProbeDefinition... probes) {
+            for (ProbeDefinition probe : probes) {
+                this.probes.add(probe);
+            }
+            return this;
+        }
+
+        public Configuration.Builder add(LogProbe.Sampling newSampling) {
+            if (newSampling != null) {
+                sampling = newSampling;
+            }
+            return this;
+        }
+
+        public Configuration.Builder addAllowList(FilterList newAllowList) {
+            if (newAllowList == null) {
+                return this;
+            }
+            if (allowList == null) {
+                allowList = new FilterList(new ArrayList<>(), new ArrayList<>());
+            }
+            allowList.getClasses().addAll(newAllowList.getClasses());
+            allowList.getPackagePrefixes().addAll(newAllowList.getPackagePrefixes());
+            return this;
+        }
+
+        public Configuration.Builder addDenyList(FilterList newDenyList) {
+            if (newDenyList == null) {
+                return this;
+            }
+            if (denyList == null) {
+                denyList = new FilterList(new ArrayList<>(), new ArrayList<>());
+            }
+            denyList.getClasses().addAll(newDenyList.getClasses());
+            denyList.getPackagePrefixes().addAll(newDenyList.getPackagePrefixes());
+            return this;
+        }
+
+        public Configuration.Builder setSampling(LogProbe.Sampling sampling) {
+            this.sampling = sampling;
+            return this;
+        }
+
+        public Configuration build() {
+            return new Configuration(service, probes, allowList, denyList, sampling);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationAcceptor.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationAcceptor.java
index e2b2c6601fe..134484c6b96 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationAcceptor.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationAcceptor.java
@@ -4,14 +4,14 @@
 import java.util.Collection;
 
 public interface ConfigurationAcceptor {
-  enum Source {
-    REMOTE_CONFIG,
-    LOCAL_FILE,
-    CODE_ORIGIN,
-    EXCEPTION
-  }
+    enum Source {
+        REMOTE_CONFIG,
+        LOCAL_FILE,
+        CODE_ORIGIN,
+        EXCEPTION
+    }
 
-  void accept(Source source, Collection<? extends ProbeDefinition> definitions);
+    void accept(Source source, Collection<? extends ProbeDefinition> definitions);
 
-  void handleException(String configId, Exception ex);
+    void handleException(String configId, Exception ex);
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationComparer.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationComparer.java
index c3f8749f2de..4e01c53fae3 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationComparer.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationComparer.java
@@ -19,135 +19,126 @@
  * of classes that need to be changed according to new definitions
  */
 public class ConfigurationComparer {
-  private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationComparer.class);
-
-  private final Configuration originalConfiguration;
-  private final Configuration incomingConfiguration;
-
-  private final List<ProbeDefinition> addedDefinitions;
-  private final List<ProbeDefinition> removedDefinitions;
-  private final boolean filteredListChanged;
-  private final Map<String, InstrumentationResult> instrumentationResults;
-  private final List<String> changedBlockedTypes;
-
-  public ConfigurationComparer(
-      Configuration originalConfiguration,
-      Configuration incomingConfiguration,
-      Map<String, InstrumentationResult> instrumentationResults) {
-    this.originalConfiguration = originalConfiguration;
-    this.incomingConfiguration = incomingConfiguration;
-    this.instrumentationResults = instrumentationResults;
-
-    Set<ProbeDefinition> originalDefinitions =
-        this.originalConfiguration != null
-            ? new HashSet<>(this.originalConfiguration.getDefinitions())
-            : new HashSet<>();
-    Set<ProbeDefinition> incomingDefinitions =
-        new HashSet<>(this.incomingConfiguration.getDefinitions());
-
-    addedDefinitions =
-        incomingDefinitions.stream()
-            .filter(it -> !originalDefinitions.contains(it))
-            .collect(Collectors.toList());
-
-    removedDefinitions =
-        originalDefinitions.stream()
-            .filter(it -> !incomingDefinitions.contains(it))
-            .collect(Collectors.toList());
-
-    filteredListChanged =
-        !Objects.equals(
-                originalConfiguration != null ? originalConfiguration.getAllowList() : null,
-                incomingConfiguration.getAllowList())
-            || !Objects.equals(
-                originalConfiguration != null ? originalConfiguration.getDenyList() : null,
-                incomingConfiguration.getDenyList());
-
-    if (filteredListChanged) {
-      changedBlockedTypes = findChangesInBlockedTypes();
-    } else {
-      changedBlockedTypes = Collections.emptyList();
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationComparer.class);
+
+    private final Configuration originalConfiguration;
+    private final Configuration incomingConfiguration;
+
+    private final List<ProbeDefinition> addedDefinitions;
+    private final List<ProbeDefinition> removedDefinitions;
+    private final boolean filteredListChanged;
+    private final Map<String, InstrumentationResult> instrumentationResults;
+    private final List<String> changedBlockedTypes;
+
+    public ConfigurationComparer(
+            Configuration originalConfiguration,
+            Configuration incomingConfiguration,
+            Map<String, InstrumentationResult> instrumentationResults) {
+        this.originalConfiguration = originalConfiguration;
+        this.incomingConfiguration = incomingConfiguration;
+        this.instrumentationResults = instrumentationResults;
+
+        Set<ProbeDefinition> originalDefinitions = this.originalConfiguration != null
+                ? new HashSet<>(this.originalConfiguration.getDefinitions())
+                : new HashSet<>();
+        Set<ProbeDefinition> incomingDefinitions = new HashSet<>(this.incomingConfiguration.getDefinitions());
+
+        addedDefinitions = incomingDefinitions.stream()
+                .filter(it -> !originalDefinitions.contains(it))
+                .collect(Collectors.toList());
+
+        removedDefinitions = originalDefinitions.stream()
+                .filter(it -> !incomingDefinitions.contains(it))
+                .collect(Collectors.toList());
+
+        filteredListChanged = !Objects.equals(
+                        originalConfiguration != null ? originalConfiguration.getAllowList() : null,
+                        incomingConfiguration.getAllowList())
+                || !Objects.equals(
+                        originalConfiguration != null ? originalConfiguration.getDenyList() : null,
+                        incomingConfiguration.getDenyList());
+
+        if (filteredListChanged) {
+            changedBlockedTypes = findChangesInBlockedTypes();
+        } else {
+            changedBlockedTypes = Collections.emptyList();
+        }
     }
-  }
-
-  public Collection<ProbeDefinition> getAddedDefinitions() {
-    return addedDefinitions;
-  }
-
-  public Collection<ProbeDefinition> getRemovedDefinitions() {
-    return removedDefinitions;
-  }
-
-  public Map<String, InstrumentationResult> getInstrumentationResults() {
-    return instrumentationResults;
-  }
-
-  public List<String> getChangedBlockedTypes() {
-    return changedBlockedTypes;
-  }
-
-  public boolean hasProbeRelatedChanges() {
-    return !addedDefinitions.isEmpty() || !removedDefinitions.isEmpty() || filteredListChanged;
-  }
-
-  public boolean hasRateLimitRelatedChanged() {
-    return originalConfiguration != null
-        && originalConfiguration.getSampling() != incomingConfiguration.getSampling();
-  }
-
-  List<String> findChangesInBlockedTypes() {
-    AllowListHelper originalAllowListHelper =
-        new AllowListHelper(originalConfiguration.getAllowList());
-    DenyListHelper originalDenyListHelper = new DenyListHelper(originalConfiguration.getDenyList());
-
-    AllowListHelper incomingAllowListHelper =
-        new AllowListHelper(incomingConfiguration.getAllowList());
-    DenyListHelper incomingDenyListHelper = new DenyListHelper(incomingConfiguration.getDenyList());
-
-    List<String> changedTypes = new ArrayList<>();
-
-    for (InstrumentationResult result : instrumentationResults.values()) {
-      boolean originalAllowed = true;
-      boolean incomingAllowed = true;
-      String typeName = result.getTypeName();
-
-      if (originalDenyListHelper.isDenied(typeName)) {
-        LOGGER.debug("type {} was denied", typeName);
-        originalAllowed = false;
-      } else if (!originalAllowListHelper.isAllowAll()
-          && !originalAllowListHelper.isAllowed(typeName)) {
-        LOGGER.debug("type {} was not allowed", typeName);
-        originalAllowed = false;
-      }
-
-      if (incomingDenyListHelper.isDenied(typeName)) {
-        LOGGER.debug("type {} will be denied", typeName);
-        incomingAllowed = false;
-      } else if (!incomingAllowListHelper.isAllowAll()
-          && !incomingAllowListHelper.isAllowed(typeName)) {
-        LOGGER.debug("type {} will not be allowed", typeName);
-        incomingAllowed = false;
-      }
-
-      if (incomingAllowed != originalAllowed) {
-        changedTypes.add(typeName);
-      }
+
+    public Collection<ProbeDefinition> getAddedDefinitions() {
+        return addedDefinitions;
+    }
+
+    public Collection<ProbeDefinition> getRemovedDefinitions() {
+        return removedDefinitions;
+    }
+
+    public Map<String, InstrumentationResult> getInstrumentationResults() {
+        return instrumentationResults;
+    }
+
+    public List<String> getChangedBlockedTypes() {
+        return changedBlockedTypes;
     }
 
-    return changedTypes;
-  }
-
-  @Override
-  public String toString() {
-    return "ConfigurationComparer{"
-        + "addedDefinitions="
-        + addedDefinitions.size()
-        + ", removedDefinitions="
-        + removedDefinitions.size()
-        + ", filteredListChanged="
-        + filteredListChanged
-        + ", changedBlockedTypes="
-        + changedBlockedTypes.size()
-        + '}';
-  }
+    public boolean hasProbeRelatedChanges() {
+        return !addedDefinitions.isEmpty() || !removedDefinitions.isEmpty() || filteredListChanged;
+    }
+
+    public boolean hasRateLimitRelatedChanged() {
+        return originalConfiguration != null
+                && originalConfiguration.getSampling() != incomingConfiguration.getSampling();
+    }
+
+    List<String> findChangesInBlockedTypes() {
+        AllowListHelper originalAllowListHelper = new AllowListHelper(originalConfiguration.getAllowList());
+        DenyListHelper originalDenyListHelper = new DenyListHelper(originalConfiguration.getDenyList());
+
+        AllowListHelper incomingAllowListHelper = new AllowListHelper(incomingConfiguration.getAllowList());
+        DenyListHelper incomingDenyListHelper = new DenyListHelper(incomingConfiguration.getDenyList());
+
+        List<String> changedTypes = new ArrayList<>();
+
+        for (InstrumentationResult result : instrumentationResults.values()) {
+            boolean originalAllowed = true;
+            boolean incomingAllowed = true;
+            String typeName = result.getTypeName();
+
+            if (originalDenyListHelper.isDenied(typeName)) {
+                LOGGER.debug("type {} was denied", typeName);
+                originalAllowed = false;
+            } else if (!originalAllowListHelper.isAllowAll() && !originalAllowListHelper.isAllowed(typeName)) {
+                LOGGER.debug("type {} was not allowed", typeName);
+                originalAllowed = false;
+            }
+
+            if (incomingDenyListHelper.isDenied(typeName)) {
+                LOGGER.debug("type {} will be denied", typeName);
+                incomingAllowed = false;
+            } else if (!incomingAllowListHelper.isAllowAll() && !incomingAllowListHelper.isAllowed(typeName)) {
+                LOGGER.debug("type {} will not be allowed", typeName);
+                incomingAllowed = false;
+            }
+
+            if (incomingAllowed != originalAllowed) {
+                changedTypes.add(typeName);
+            }
+        }
+
+        return changedTypes;
+    }
+
+    @Override
+    public String toString() {
+        return "ConfigurationComparer{"
+                + "addedDefinitions="
+                + addedDefinitions.size()
+                + ", removedDefinitions="
+                + removedDefinitions.size()
+                + ", filteredListChanged="
+                + filteredListChanged
+                + ", changedBlockedTypes="
+                + changedBlockedTypes.size()
+                + '}';
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationFileLoader.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationFileLoader.java
index 9cc7f5f5421..a3c60dcb159 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationFileLoader.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationFileLoader.java
@@ -24,81 +24,80 @@
 import org.slf4j.LoggerFactory;
 
 public class ConfigurationFileLoader {
-  private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationFileLoader.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationFileLoader.class);
 
-  public static Configuration from(Path probeFilePath, long maxPayloadSize) {
-    LOGGER.debug("try to load from file...");
-    try (InputStream inputStream =
-        new SizeCheckedInputStream(new FileInputStream(probeFilePath.toFile()), maxPayloadSize)) {
-      byte[] buffer = new byte[4096];
-      ByteArrayOutputStream outputStream = new ByteArrayOutputStream(4096);
-      int bytesRead;
-      do {
-        bytesRead = inputStream.read(buffer);
-        if (bytesRead > -1) {
-          outputStream.write(buffer, 0, bytesRead);
+    public static Configuration from(Path probeFilePath, long maxPayloadSize) {
+        LOGGER.debug("try to load from file...");
+        try (InputStream inputStream =
+                new SizeCheckedInputStream(new FileInputStream(probeFilePath.toFile()), maxPayloadSize)) {
+            byte[] buffer = new byte[4096];
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream(4096);
+            int bytesRead;
+            do {
+                bytesRead = inputStream.read(buffer);
+                if (bytesRead > -1) {
+                    outputStream.write(buffer, 0, bytesRead);
+                }
+            } while (bytesRead > -1);
+            byte[] configContent = outputStream.toByteArray();
+            JsonAdapter<List<ProbeDefinition>> adapter = new ProbeFileAdapter();
+            List<ProbeDefinition> probeDefinitions =
+                    adapter.fromJson(JsonReader.of(Okio.buffer(Okio.source(new ByteArrayInputStream(configContent)))));
+            return new Configuration(null, probeDefinitions);
+        } catch (IOException ex) {
+            LOGGER.error("Unable to load config file {}: {}", probeFilePath, ex);
+            return null;
         }
-      } while (bytesRead > -1);
-      byte[] configContent = outputStream.toByteArray();
-      JsonAdapter<List<ProbeDefinition>> adapter = new ProbeFileAdapter();
-      List<ProbeDefinition> probeDefinitions =
-          adapter.fromJson(
-              JsonReader.of(Okio.buffer(Okio.source(new ByteArrayInputStream(configContent)))));
-      return new Configuration(null, probeDefinitions);
-    } catch (IOException ex) {
-      LOGGER.error("Unable to load config file {}: {}", probeFilePath, ex);
-      return null;
     }
-  }
 
-  private static class ProbeFileAdapter extends JsonAdapter<List<ProbeDefinition>> {
+    private static class ProbeFileAdapter extends JsonAdapter<List<ProbeDefinition>> {
 
-    @Override
-    public List<ProbeDefinition> fromJson(JsonReader reader) throws IOException {
-      List<ProbeDefinition> probeDefinitions = new ArrayList<>();
-      reader.beginArray();
-      while (reader.hasNext()) {
-        if (reader.peek() == JsonReader.Token.END_ARRAY) {
-          reader.endArray();
-          break;
-        }
-        JsonReader jsonPeekReader = reader.peekJson();
-        jsonPeekReader.beginObject();
-        while (jsonPeekReader.hasNext()) {
-          if (jsonPeekReader.selectName(JsonReader.Options.of("type")) == 0) {
-            String type = jsonPeekReader.nextString();
-            switch (type) {
-              case "LOG_PROBE":
-                probeDefinitions.add(deserializeLogProbe(reader));
-                break;
-              case "METRIC_PROBE":
-                probeDefinitions.add(deserializeMetricProbe(reader));
-                break;
-              case "SPAN_PROBE":
-                probeDefinitions.add(deserializeSpanProbe(reader));
-                break;
-              case "SPAN_DECORATION_PROBE":
-                probeDefinitions.add(deserializeSpanDecorationProbe(reader));
-                break;
-              case "TRIGGER_PROBE":
-                probeDefinitions.add(deserializeTriggerProbe(reader));
-                break;
-              default:
-                throw new RuntimeException("Unknown type: " + type);
+        @Override
+        public List<ProbeDefinition> fromJson(JsonReader reader) throws IOException {
+            List<ProbeDefinition> probeDefinitions = new ArrayList<>();
+            reader.beginArray();
+            while (reader.hasNext()) {
+                if (reader.peek() == JsonReader.Token.END_ARRAY) {
+                    reader.endArray();
+                    break;
+                }
+                JsonReader jsonPeekReader = reader.peekJson();
+                jsonPeekReader.beginObject();
+                while (jsonPeekReader.hasNext()) {
+                    if (jsonPeekReader.selectName(JsonReader.Options.of("type")) == 0) {
+                        String type = jsonPeekReader.nextString();
+                        switch (type) {
+                            case "LOG_PROBE":
+                                probeDefinitions.add(deserializeLogProbe(reader));
+                                break;
+                            case "METRIC_PROBE":
+                                probeDefinitions.add(deserializeMetricProbe(reader));
+                                break;
+                            case "SPAN_PROBE":
+                                probeDefinitions.add(deserializeSpanProbe(reader));
+                                break;
+                            case "SPAN_DECORATION_PROBE":
+                                probeDefinitions.add(deserializeSpanDecorationProbe(reader));
+                                break;
+                            case "TRIGGER_PROBE":
+                                probeDefinitions.add(deserializeTriggerProbe(reader));
+                                break;
+                            default:
+                                throw new RuntimeException("Unknown type: " + type);
+                        }
+                        break;
+                    } else {
+                        jsonPeekReader.skipName();
+                        jsonPeekReader.skipValue();
+                    }
+                }
             }
-            break;
-          } else {
-            jsonPeekReader.skipName();
-            jsonPeekReader.skipValue();
-          }
+            return probeDefinitions;
         }
-      }
-      return probeDefinitions;
-    }
 
-    @Override
-    public void toJson(JsonWriter writer, List<ProbeDefinition> value) throws IOException {
-      // Implement the logic to write the list of ProbeDefinition to JSON
+        @Override
+        public void toJson(JsonWriter writer, List<ProbeDefinition> value) throws IOException {
+            // Implement the logic to write the list of ProbeDefinition to JSON
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java
index 2911ad9d4c1..cbc32306813 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java
@@ -53,420 +53,403 @@
  * re-transformation of required classes
  */
 public class ConfigurationUpdater implements DebuggerContext.ProbeResolver, ConfigurationAcceptor {
-  private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationUpdater.class);
-  private static final int MINUTES_BETWEEN_ERROR_LOG = 5;
-  private static final boolean JAVA_AT_LEAST_17_0_20 =
-      JavaVirtualMachine.isJavaVersionAtLeast(17, 0, 20);
-  private static final boolean JAVA_AT_LEAST_16 = JavaVirtualMachine.isJavaVersionAtLeast(16);
-  private static final boolean JAVA_AT_LEAST_25_0_4 =
-      JavaVirtualMachine.isJavaVersionAtLeast(25, 0, 4);
-  private static final Method GET_RECORD_COMPONENTS_METHOD;
-  private static final Method GET_ANNOTATED_TYPES_METHOD;
-
-  static {
-    Method getRecordComponentsMethod = null;
-    Method getAnnotatedTypesMethod = null;
-    if (JAVA_AT_LEAST_16) {
-      try {
-        Class<?> recordClass = Class.forName("java.lang.Record", true, null);
-        getRecordComponentsMethod = recordClass.getClass().getDeclaredMethod("getRecordComponents");
-        Class<?> recordComponentClass =
-            Class.forName("java.lang.reflect.RecordComponent", true, null);
-        getAnnotatedTypesMethod = recordComponentClass.getDeclaredMethod("getAnnotatedType");
-      } catch (Exception e) {
-        LOGGER.debug("Exception initializing reflection constants", e);
-      }
-    }
-    GET_RECORD_COMPONENTS_METHOD = getRecordComponentsMethod;
-    GET_ANNOTATED_TYPES_METHOD = getAnnotatedTypesMethod;
-  }
-
-  public interface TransformerSupplier {
-    DebuggerTransformer supply(
-        Config tracerConfig,
-        Configuration configuration,
-        DebuggerTransformer.InstrumentationListener listener,
-        ProbeMetadata probeMetadata,
-        DebuggerSink debuggerSink);
-  }
-
-  private final Instrumentation instrumentation;
-  private final TransformerSupplier transformerSupplier;
-  private final Lock configurationLock = new ReentrantLock();
-  private final EnumMap<Source, Collection<? extends ProbeDefinition>> definitionSources =
-      new EnumMap<>(Source.class);
-  private volatile Configuration currentConfiguration;
-  private DebuggerTransformer currentTransformer;
-  private final ProbeMetadata probeMetadata = new ProbeMetadata();
-  private final Config config;
-  private final DebuggerSink sink;
-  private final ClassesToRetransformFinder finder;
-  private final String serviceName;
-  private final Map<String, InstrumentationResult> instrumentationResults =
-      new ConcurrentHashMap<>();
-  private final RatelimitedLogger ratelimitedLogger =
-      new RatelimitedLogger(LOGGER, MINUTES_BETWEEN_ERROR_LOG, TimeUnit.MINUTES);
-
-  public ConfigurationUpdater(
-      Instrumentation instrumentation,
-      TransformerSupplier transformerSupplier,
-      Config config,
-      DebuggerSink sink,
-      ClassesToRetransformFinder finder) {
-    this.instrumentation = instrumentation;
-    this.transformerSupplier = transformerSupplier;
-    this.serviceName = TagsHelper.sanitize(config.getServiceName());
-    this.config = config;
-    this.sink = sink;
-    this.finder = finder;
-  }
-
-  // /!\ Can be called by different threads and concurrently /!\
-  // Should throw a runtime exception if there is a problem. The message of
-  // the exception will be reported in the next request to the conf service
-  @Override
-  public void accept(Source source, Collection<? extends ProbeDefinition> definitions) {
-    configurationLock.lock();
-    try {
-      LOGGER.debug("Received new definitions from {}", source);
-      Configuration newConfiguration;
-      definitionSources.put(source, definitions);
-      newConfiguration = createConfiguration(definitionSources);
-      applyNewConfiguration(newConfiguration);
-    } catch (RuntimeException e) {
-      ExceptionHelper.logException(LOGGER, e, "Error during accepting new debugger configuration:");
-      throw e;
-    } finally {
-      configurationLock.unlock();
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationUpdater.class);
+    private static final int MINUTES_BETWEEN_ERROR_LOG = 5;
+    private static final boolean JAVA_AT_LEAST_17_0_20 = JavaVirtualMachine.isJavaVersionAtLeast(17, 0, 20);
+    private static final boolean JAVA_AT_LEAST_16 = JavaVirtualMachine.isJavaVersionAtLeast(16);
+    private static final boolean JAVA_AT_LEAST_25_0_4 = JavaVirtualMachine.isJavaVersionAtLeast(25, 0, 4);
+    private static final Method GET_RECORD_COMPONENTS_METHOD;
+    private static final Method GET_ANNOTATED_TYPES_METHOD;
+
+    static {
+        Method getRecordComponentsMethod = null;
+        Method getAnnotatedTypesMethod = null;
+        if (JAVA_AT_LEAST_16) {
+            try {
+                Class<?> recordClass = Class.forName("java.lang.Record", true, null);
+                getRecordComponentsMethod = recordClass.getClass().getDeclaredMethod("getRecordComponents");
+                Class<?> recordComponentClass = Class.forName("java.lang.reflect.RecordComponent", true, null);
+                getAnnotatedTypesMethod = recordComponentClass.getDeclaredMethod("getAnnotatedType");
+            } catch (Exception e) {
+                LOGGER.debug("Exception initializing reflection constants", e);
+            }
+        }
+        GET_RECORD_COMPONENTS_METHOD = getRecordComponentsMethod;
+        GET_ANNOTATED_TYPES_METHOD = getAnnotatedTypesMethod;
     }
-  }
 
-  @Override
-  public void handleException(String configId, Exception ex) {
-    if (configId == null) {
-      return;
+    public interface TransformerSupplier {
+        DebuggerTransformer supply(
+                Config tracerConfig,
+                Configuration configuration,
+                DebuggerTransformer.InstrumentationListener listener,
+                ProbeMetadata probeMetadata,
+                DebuggerSink debuggerSink);
     }
-    ProbeId probeId;
-    if (configId.startsWith(LOG_PROBE_PREFIX)) {
-      probeId = extractPrefix(LOG_PROBE_PREFIX, configId);
-    } else if (configId.startsWith(METRIC_PROBE_PREFIX)) {
-      probeId = extractPrefix(METRIC_PROBE_PREFIX, configId);
-    } else if (configId.startsWith(SPAN_PROBE_PREFIX)) {
-      probeId = extractPrefix(SPAN_PROBE_PREFIX, configId);
-    } else if (configId.startsWith(SPAN_DECORATION_PROBE_PREFIX)) {
-      probeId = extractPrefix(SPAN_DECORATION_PROBE_PREFIX, configId);
-    } else {
-      probeId = new ProbeId(configId, 0);
+
+    private final Instrumentation instrumentation;
+    private final TransformerSupplier transformerSupplier;
+    private final Lock configurationLock = new ReentrantLock();
+    private final EnumMap<Source, Collection<? extends ProbeDefinition>> definitionSources =
+            new EnumMap<>(Source.class);
+    private volatile Configuration currentConfiguration;
+    private DebuggerTransformer currentTransformer;
+    private final ProbeMetadata probeMetadata = new ProbeMetadata();
+    private final Config config;
+    private final DebuggerSink sink;
+    private final ClassesToRetransformFinder finder;
+    private final String serviceName;
+    private final Map<String, InstrumentationResult> instrumentationResults = new ConcurrentHashMap<>();
+    private final RatelimitedLogger ratelimitedLogger =
+            new RatelimitedLogger(LOGGER, MINUTES_BETWEEN_ERROR_LOG, TimeUnit.MINUTES);
+
+    public ConfigurationUpdater(
+            Instrumentation instrumentation,
+            TransformerSupplier transformerSupplier,
+            Config config,
+            DebuggerSink sink,
+            ClassesToRetransformFinder finder) {
+        this.instrumentation = instrumentation;
+        this.transformerSupplier = transformerSupplier;
+        this.serviceName = TagsHelper.sanitize(config.getServiceName());
+        this.config = config;
+        this.sink = sink;
+        this.finder = finder;
     }
-    LOGGER.warn("Error handling probe configuration: {}", configId, ex);
-    sink.getProbeStatusSink().addError(probeId, ex);
-  }
-
-  ProbeMetadata getProbeMetadata() {
-    return probeMetadata;
-  }
-
-  private ProbeId extractPrefix(String prefix, String configId) {
-    return new ProbeId(configId.substring(prefix.length()), 0);
-  }
-
-  private void applyNewConfiguration(Configuration newConfiguration) {
-    Configuration originalConfiguration = currentConfiguration;
-    ConfigurationComparer changes =
-        new ConfigurationComparer(originalConfiguration, newConfiguration, instrumentationResults);
-    if (changes.hasRateLimitRelatedChanged()) {
-      // apply rate limit config first to avoid racing with execution/instrumentation
-      // of probes requiring samplers
-      applyRateLimiter(newConfiguration.getSampling());
+
+    // /!\ Can be called by different threads and concurrently /!\
+    // Should throw a runtime exception if there is a problem. The message of
+    // the exception will be reported in the next request to the conf service
+    @Override
+    public void accept(Source source, Collection<? extends ProbeDefinition> definitions) {
+        configurationLock.lock();
+        try {
+            LOGGER.debug("Received new definitions from {}", source);
+            Configuration newConfiguration;
+            definitionSources.put(source, definitions);
+            newConfiguration = createConfiguration(definitionSources);
+            applyNewConfiguration(newConfiguration);
+        } catch (RuntimeException e) {
+            ExceptionHelper.logException(LOGGER, e, "Error during accepting new debugger configuration:");
+            throw e;
+        } finally {
+            configurationLock.unlock();
+        }
     }
-    currentConfiguration = newConfiguration;
-    if (changes.hasProbeRelatedChanges()) {
-      LOGGER.debug("Applying new probe configuration, changes: {}", changes);
-      handleProbesChanges(changes, newConfiguration);
+
+    @Override
+    public void handleException(String configId, Exception ex) {
+        if (configId == null) {
+            return;
+        }
+        ProbeId probeId;
+        if (configId.startsWith(LOG_PROBE_PREFIX)) {
+            probeId = extractPrefix(LOG_PROBE_PREFIX, configId);
+        } else if (configId.startsWith(METRIC_PROBE_PREFIX)) {
+            probeId = extractPrefix(METRIC_PROBE_PREFIX, configId);
+        } else if (configId.startsWith(SPAN_PROBE_PREFIX)) {
+            probeId = extractPrefix(SPAN_PROBE_PREFIX, configId);
+        } else if (configId.startsWith(SPAN_DECORATION_PROBE_PREFIX)) {
+            probeId = extractPrefix(SPAN_DECORATION_PROBE_PREFIX, configId);
+        } else {
+            probeId = new ProbeId(configId, 0);
+        }
+        LOGGER.warn("Error handling probe configuration: {}", configId, ex);
+        sink.getProbeStatusSink().addError(probeId, ex);
     }
-  }
 
-  private Configuration createConfiguration(
-      EnumMap<Source, Collection<? extends ProbeDefinition>> sources) {
-    Configuration.Builder builder = Configuration.builder();
-    for (Collection<? extends ProbeDefinition> definitions : sources.values()) {
-      builder.add(definitions);
+    ProbeMetadata getProbeMetadata() {
+        return probeMetadata;
     }
-    return builder.build();
-  }
-
-  private <E extends ProbeDefinition> Collection<E> filterProbes(
-      Supplier<Collection<E>> probeSupplier, int maxAllowedProbes) {
-    Collection<E> probes = probeSupplier.get();
-    if (probes == null) {
-      return Collections.emptyList();
+
+    private ProbeId extractPrefix(String prefix, String configId) {
+        return new ProbeId(configId.substring(prefix.length()), 0);
     }
-    return probes.stream().limit(maxAllowedProbes).collect(Collectors.toList());
-  }
-
-  private void handleProbesChanges(ConfigurationComparer changes, Configuration newConfiguration) {
-    removeCurrentTransformer();
-    updateProbeMetadata(changes);
-    installNewDefinitions(newConfiguration);
-    reportReceived(changes);
-    if (!finder.hasChangedClasses(changes)) {
-      return;
+
+    private void applyNewConfiguration(Configuration newConfiguration) {
+        Configuration originalConfiguration = currentConfiguration;
+        ConfigurationComparer changes =
+                new ConfigurationComparer(originalConfiguration, newConfiguration, instrumentationResults);
+        if (changes.hasRateLimitRelatedChanged()) {
+            // apply rate limit config first to avoid racing with execution/instrumentation
+            // of probes requiring samplers
+            applyRateLimiter(newConfiguration.getSampling());
+        }
+        currentConfiguration = newConfiguration;
+        if (changes.hasProbeRelatedChanges()) {
+            LOGGER.debug("Applying new probe configuration, changes: {}", changes);
+            handleProbesChanges(changes, newConfiguration);
+        }
     }
-    List<Class<?>> changedClasses =
-        finder.getAllLoadedChangedClasses(instrumentation.getAllLoadedClasses(), changes);
-    changedClasses =
-        JDKVersionSpecificHelper.detectMethodParameters(
-            errorMsg -> reportError(changes, errorMsg), instrumentation, changedClasses);
-    changedClasses =
-        JDKVersionSpecificHelper.detectRecordWithTypeAnnotation(
-            errorMsg -> reportError(changes, errorMsg), changedClasses);
-    retransformClasses(changedClasses);
-    // ensures that we have at least re-transformed 1 class
-    if (changedClasses.size() > 0) {
-      LOGGER.debug("Re-transformation done");
+
+    private Configuration createConfiguration(EnumMap<Source, Collection<? extends ProbeDefinition>> sources) {
+        Configuration.Builder builder = Configuration.builder();
+        for (Collection<? extends ProbeDefinition> definitions : sources.values()) {
+            builder.add(definitions);
+        }
+        return builder.build();
     }
-  }
-
-  private void reportReceived(ConfigurationComparer changes) {
-    for (ProbeDefinition def : changes.getAddedDefinitions()) {
-      if (def instanceof ExceptionProbe) {
-        // do not report received for exception probes
-        continue;
-      }
-      sink.addReceived(def.getProbeId());
+
+    private <E extends ProbeDefinition> Collection<E> filterProbes(
+            Supplier<Collection<E>> probeSupplier, int maxAllowedProbes) {
+        Collection<E> probes = probeSupplier.get();
+        if (probes == null) {
+            return Collections.emptyList();
+        }
+        return probes.stream().limit(maxAllowedProbes).collect(Collectors.toList());
     }
-    for (ProbeDefinition def : changes.getRemovedDefinitions()) {
-      sink.removeDiagnostics(def.getProbeId());
+
+    private void handleProbesChanges(ConfigurationComparer changes, Configuration newConfiguration) {
+        removeCurrentTransformer();
+        updateProbeMetadata(changes);
+        installNewDefinitions(newConfiguration);
+        reportReceived(changes);
+        if (!finder.hasChangedClasses(changes)) {
+            return;
+        }
+        List<Class<?>> changedClasses =
+                finder.getAllLoadedChangedClasses(instrumentation.getAllLoadedClasses(), changes);
+        changedClasses = JDKVersionSpecificHelper.detectMethodParameters(
+                errorMsg -> reportError(changes, errorMsg), instrumentation, changedClasses);
+        changedClasses = JDKVersionSpecificHelper.detectRecordWithTypeAnnotation(
+                errorMsg -> reportError(changes, errorMsg), changedClasses);
+        retransformClasses(changedClasses);
+        // ensures that we have at least re-transformed 1 class
+        if (changedClasses.size() > 0) {
+            LOGGER.debug("Re-transformation done");
+        }
     }
-  }
-
-  private void reportError(ConfigurationComparer changes, String errorMsg) {
-    for (ProbeDefinition def : changes.getAddedDefinitions()) {
-      if (def instanceof ExceptionProbe) {
-        // do not report received for exception probes
-        continue;
-      }
-      sink.addError(def.getProbeId(), errorMsg);
+
+    private void reportReceived(ConfigurationComparer changes) {
+        for (ProbeDefinition def : changes.getAddedDefinitions()) {
+            if (def instanceof ExceptionProbe) {
+                // do not report received for exception probes
+                continue;
+            }
+            sink.addReceived(def.getProbeId());
+        }
+        for (ProbeDefinition def : changes.getRemovedDefinitions()) {
+            sink.removeDiagnostics(def.getProbeId());
+        }
     }
-  }
 
-  private void installNewDefinitions(Configuration newConfiguration) {
-    DebuggerContext.initClassFilter(new DenyListHelper(newConfiguration.getDenyList()));
-    if (newConfiguration.getDefinitions().isEmpty()) {
-      return;
+    private void reportError(ConfigurationComparer changes, String errorMsg) {
+        for (ProbeDefinition def : changes.getAddedDefinitions()) {
+            if (def instanceof ExceptionProbe) {
+                // do not report received for exception probes
+                continue;
+            }
+            sink.addError(def.getProbeId(), errorMsg);
+        }
     }
-    // install new probe definitions
-    DebuggerTransformer newTransformer =
-        transformerSupplier.supply(
-            config, newConfiguration, this::recordInstrumentationProgress, probeMetadata, sink);
-    instrumentation.addTransformer(newTransformer, true);
-    currentTransformer = newTransformer;
-    LOGGER.debug("New transformer installed with probes: {}", newConfiguration.getDefinitions());
-  }
-
-  private void recordInstrumentationProgress(
-      ProbeDefinition definition, InstrumentationResult instrumentationResult) {
-    if (instrumentationResult.isError()) {
-      return;
+
+    private void installNewDefinitions(Configuration newConfiguration) {
+        DebuggerContext.initClassFilter(new DenyListHelper(newConfiguration.getDenyList()));
+        if (newConfiguration.getDefinitions().isEmpty()) {
+            return;
+        }
+        // install new probe definitions
+        DebuggerTransformer newTransformer = transformerSupplier.supply(
+                config, newConfiguration, this::recordInstrumentationProgress, probeMetadata, sink);
+        instrumentation.addTransformer(newTransformer, true);
+        currentTransformer = newTransformer;
+        LOGGER.debug("New transformer installed with probes: {}", newConfiguration.getDefinitions());
     }
-    instrumentationResults.put(definition.getProbeId().getEncodedId(), instrumentationResult);
-  }
-
-  private void retransformClasses(List<Class<?>> classesToBeTransformed) {
-    int classCount = classesToBeTransformed.size();
-    if (classCount <= 10) {
-      retransformIndividualClasses(classesToBeTransformed);
-    } else if (classCount <= 1000) {
-      retransformClassesAtOnce(classesToBeTransformed);
-    } else {
-      throw new IllegalStateException("Too many classes to retransform: " + classCount);
+
+    private void recordInstrumentationProgress(
+            ProbeDefinition definition, InstrumentationResult instrumentationResult) {
+        if (instrumentationResult.isError()) {
+            return;
+        }
+        instrumentationResults.put(definition.getProbeId().getEncodedId(), instrumentationResult);
     }
-  }
-
-  private void retransformClassesAtOnce(List<Class<?>> classesToBeTransformed) {
-    LOGGER.debug("Re-transforming classes: {}", classesToBeTransformed);
-    try {
-      instrumentation.retransformClasses(classesToBeTransformed.toArray(new Class[0]));
-    } catch (Exception ex) {
-      ExceptionHelper.logException(LOGGER, ex, "Re-transform error:");
-    } catch (Throwable ex) {
-      ExceptionHelper.logException(LOGGER, ex, "Re-transform throwable:");
+
+    private void retransformClasses(List<Class<?>> classesToBeTransformed) {
+        int classCount = classesToBeTransformed.size();
+        if (classCount <= 10) {
+            retransformIndividualClasses(classesToBeTransformed);
+        } else if (classCount <= 1000) {
+            retransformClassesAtOnce(classesToBeTransformed);
+        } else {
+            throw new IllegalStateException("Too many classes to retransform: " + classCount);
+        }
     }
-  }
-
-  private void retransformIndividualClasses(List<Class<?>> classesToBeTransformed) {
-    for (Class<?> clazz : classesToBeTransformed) {
-      try {
-        LOGGER.debug("Re-transforming class: {}", clazz.getTypeName());
-        instrumentation.retransformClasses(clazz);
-      } catch (Exception ex) {
-        ExceptionHelper.logException(LOGGER, ex, "Re-transform error:");
-      } catch (Throwable ex) {
-        ExceptionHelper.logException(LOGGER, ex, "Re-transform throwable:");
-      }
+
+    private void retransformClassesAtOnce(List<Class<?>> classesToBeTransformed) {
+        LOGGER.debug("Re-transforming classes: {}", classesToBeTransformed);
+        try {
+            instrumentation.retransformClasses(classesToBeTransformed.toArray(new Class[0]));
+        } catch (Exception ex) {
+            ExceptionHelper.logException(LOGGER, ex, "Re-transform error:");
+        } catch (Throwable ex) {
+            ExceptionHelper.logException(LOGGER, ex, "Re-transform throwable:");
+        }
     }
-  }
 
-  private void updateProbeMetadata(ConfigurationComparer changes) {
-    for (ProbeDefinition definition : changes.getRemovedDefinitions()) {
-      probeMetadata.removeProbe(definition.getProbeId().getEncodedId());
+    private void retransformIndividualClasses(List<Class<?>> classesToBeTransformed) {
+        for (Class<?> clazz : classesToBeTransformed) {
+            try {
+                LOGGER.debug("Re-transforming class: {}", clazz.getTypeName());
+                instrumentation.retransformClasses(clazz);
+            } catch (Exception ex) {
+                ExceptionHelper.logException(LOGGER, ex, "Re-transform error:");
+            } catch (Throwable ex) {
+                ExceptionHelper.logException(LOGGER, ex, "Re-transform throwable:");
+            }
+        }
     }
-  }
-
-  // /!\ This is called potentially by multiple threads from the instrumented code /!\
-  @Override
-  public ProbeImplementation resolve(int probeIndex) {
-    return probeMetadata.getProbe(probeIndex);
-  }
-
-  private static void applyRateLimiter(LogProbe.Sampling globalSampling) {
-    // set global sampling
-    if (globalSampling != null) {
-      ProbeRateLimiter.setGlobalSnapshotRate(globalSampling.getSnapshotsPerSecond());
+
+    private void updateProbeMetadata(ConfigurationComparer changes) {
+        for (ProbeDefinition definition : changes.getRemovedDefinitions()) {
+            probeMetadata.removeProbe(definition.getProbeId().getEncodedId());
+        }
     }
-  }
 
-  private void removeCurrentTransformer() {
-    if (currentTransformer == null) {
-      return;
+    // /!\ This is called potentially by multiple threads from the instrumented code /!\
+    @Override
+    public ProbeImplementation resolve(int probeIndex) {
+        return probeMetadata.getProbe(probeIndex);
     }
-    instrumentation.removeTransformer(currentTransformer);
-    currentTransformer = null;
-  }
-
-  @VisibleForTesting
-  Map<String, ProbeDefinition> getAppliedDefinitions() {
-    if (currentTransformer == null) {
-      return Collections.emptyMap();
+
+    private static void applyRateLimiter(LogProbe.Sampling globalSampling) {
+        // set global sampling
+        if (globalSampling != null) {
+            ProbeRateLimiter.setGlobalSnapshotRate(globalSampling.getSnapshotsPerSecond());
+        }
     }
-    return currentConfiguration.getDefinitions().stream()
-        .collect(
-            Collectors.toMap(
-                probeDefinition -> probeDefinition.getProbeId().getEncodedId(),
-                Function.identity()));
-  }
-
-  Map<String, InstrumentationResult> getInstrumentationResults() {
-    return instrumentationResults;
-  }
-
-  private static class JDKVersionSpecificHelper {
-
-    public static List<Class<?>> detectRecordWithTypeAnnotation(
-        Consumer<String> reportError, List<Class<?>> changedClasses) {
-      if (!JAVA_AT_LEAST_16 || JAVA_AT_LEAST_25_0_4) {
-        // records introduced in JDK 16 (final version)
-        // JDK-8376185 fixed since JDK 25.0.4
-        return changedClasses;
-      }
-      List<Class<?>> result = new ArrayList<>();
-      for (Class<?> changedClass : changedClasses) {
-        boolean addClass = true;
-        try {
-          if (changedClass.getSuperclass() != null
-              && changedClass.getSuperclass().getTypeName().equals("java.lang.Record")
-              && Modifier.isFinal(changedClass.getModifiers())) {
-            if (hasTypeAnnotationOnRecordComponent(changedClass)) {
-              LOGGER.debug(
-                  "Record with type annotation detected, instrumentation not supported for {}",
-                  changedClass.getTypeName());
-              reportError.accept(
-                  "Record with type annotation detected, instrumentation not supported for "
-                      + changedClass.getTypeName());
-              addClass = false;
-            }
-          }
-        } catch (Exception e) {
-          LOGGER.debug("Exception detecting record with type annotation", e);
+
+    private void removeCurrentTransformer() {
+        if (currentTransformer == null) {
+            return;
         }
-        if (addClass) {
-          result.add(changedClass);
+        instrumentation.removeTransformer(currentTransformer);
+        currentTransformer = null;
+    }
+
+    @VisibleForTesting
+    Map<String, ProbeDefinition> getAppliedDefinitions() {
+        if (currentTransformer == null) {
+            return Collections.emptyMap();
         }
-      }
-      return result;
+        return currentConfiguration.getDefinitions().stream()
+                .collect(Collectors.toMap(
+                        probeDefinition -> probeDefinition.getProbeId().getEncodedId(), Function.identity()));
+    }
+
+    Map<String, InstrumentationResult> getInstrumentationResults() {
+        return instrumentationResults;
     }
 
-    private static boolean hasTypeAnnotationOnRecordComponent(Class<?> recordClass) {
-      if (GET_RECORD_COMPONENTS_METHOD == null || GET_ANNOTATED_TYPES_METHOD == null) {
-        return false;
-      }
-      try {
-        Object recordComponentsArray = GET_RECORD_COMPONENTS_METHOD.invoke(recordClass);
-        int len = Array.getLength(recordComponentsArray);
-        for (int i = 0; i < len; i++) {
-          Object recordComponent = Array.get(recordComponentsArray, i);
-          AnnotatedType annotatedType =
-              (AnnotatedType) GET_ANNOTATED_TYPES_METHOD.invoke(recordComponent);
-          for (Annotation annotation : annotatedType.getAnnotations()) {
-            Target annotationTarget = annotation.annotationType().getAnnotation(Target.class);
-            if (annotationTarget != null
-                && Arrays.stream(annotationTarget.value())
-                    .anyMatch(it -> it == ElementType.TYPE_USE)) {
-              return true;
+    private static class JDKVersionSpecificHelper {
+
+        public static List<Class<?>> detectRecordWithTypeAnnotation(
+                Consumer<String> reportError, List<Class<?>> changedClasses) {
+            if (!JAVA_AT_LEAST_16 || JAVA_AT_LEAST_25_0_4) {
+                // records introduced in JDK 16 (final version)
+                // JDK-8376185 fixed since JDK 25.0.4
+                return changedClasses;
+            }
+            List<Class<?>> result = new ArrayList<>();
+            for (Class<?> changedClass : changedClasses) {
+                boolean addClass = true;
+                try {
+                    if (changedClass.getSuperclass() != null
+                            && changedClass.getSuperclass().getTypeName().equals("java.lang.Record")
+                            && Modifier.isFinal(changedClass.getModifiers())) {
+                        if (hasTypeAnnotationOnRecordComponent(changedClass)) {
+                            LOGGER.debug(
+                                    "Record with type annotation detected, instrumentation not supported for {}",
+                                    changedClass.getTypeName());
+                            reportError.accept(
+                                    "Record with type annotation detected, instrumentation not supported for "
+                                            + changedClass.getTypeName());
+                            addClass = false;
+                        }
+                    }
+                } catch (Exception e) {
+                    LOGGER.debug("Exception detecting record with type annotation", e);
+                }
+                if (addClass) {
+                    result.add(changedClass);
+                }
             }
-          }
+            return result;
         }
-        return false;
-      } catch (Exception ex) {
-        return false;
-      }
-    }
 
-    /*
-     * Because of this bug (https://bugs.openjdk.org/browse/JDK-8240908), classes compiled with
-     * method parameters (javac -parameters) strip this attribute once retransformed
-     * Spring 6/Spring boot 3 rely exclusively on this attribute and may throw an exception
-     * if no attribute found.
-     */
-    public static List<Class<?>> detectMethodParameters(
-        Consumer<String> reportError,
-        Instrumentation instrumentation,
-        List<Class<?>> changedClasses) {
-      if (JAVA_AT_LEAST_17_0_20) {
-        // bug is fixed since JDK 19 and 17.0.20, no need to perform detection
-        return changedClasses;
-      }
-      List<Class<?>> result = new ArrayList<>();
-      for (Class<?> changedClass : changedClasses) {
-        boolean addClass = true;
-        try {
-          Method[] declaredMethods = changedClass.getDeclaredMethods();
-          // capping scanning of methods to 100 to avoid generated class with thousand of methods
-          // assuming that in those first 100 methods there is at least one with at least one
-          // parameter
-          for (int methodIdx = 0;
-              methodIdx < declaredMethods.length && methodIdx < 100;
-              methodIdx++) {
-            Method method = declaredMethods[methodIdx];
-            Parameter[] parameters = method.getParameters();
-            if (parameters.length == 0) {
-              continue;
+        private static boolean hasTypeAnnotationOnRecordComponent(Class<?> recordClass) {
+            if (GET_RECORD_COMPONENTS_METHOD == null || GET_ANNOTATED_TYPES_METHOD == null) {
+                return false;
             }
-            if (parameters[0].isNamePresent()) {
-              if (!SpringHelper.isSpringUsingOnlyMethodParameters(instrumentation)) {
-                return changedClasses;
-              }
-              LOGGER.debug(
-                  "Detecting method parameter: method={} param={}, Skipping retransforming this class",
-                  method.getName(),
-                  parameters[0].getName());
-              // skip the class: compiled with -parameters
-              reportError.accept(
-                  "Method Parameters detected, instrumentation not supported for "
-                      + changedClass.getTypeName());
-              addClass = false;
+            try {
+                Object recordComponentsArray = GET_RECORD_COMPONENTS_METHOD.invoke(recordClass);
+                int len = Array.getLength(recordComponentsArray);
+                for (int i = 0; i < len; i++) {
+                    Object recordComponent = Array.get(recordComponentsArray, i);
+                    AnnotatedType annotatedType = (AnnotatedType) GET_ANNOTATED_TYPES_METHOD.invoke(recordComponent);
+                    for (Annotation annotation : annotatedType.getAnnotations()) {
+                        Target annotationTarget = annotation.annotationType().getAnnotation(Target.class);
+                        if (annotationTarget != null
+                                && Arrays.stream(annotationTarget.value()).anyMatch(it -> it == ElementType.TYPE_USE)) {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            } catch (Exception ex) {
+                return false;
             }
-            // we found at leat a method with one parameter if name is not present we can stop there
-            break;
-          }
-        } catch (Exception e) {
-          LOGGER.debug("Exception scanning method parameters", e);
         }
-        if (addClass) {
-          result.add(changedClass);
+
+        /*
+         * Because of this bug (https://bugs.openjdk.org/browse/JDK-8240908), classes compiled with
+         * method parameters (javac -parameters) strip this attribute once retransformed
+         * Spring 6/Spring boot 3 rely exclusively on this attribute and may throw an exception
+         * if no attribute found.
+         */
+        public static List<Class<?>> detectMethodParameters(
+                Consumer<String> reportError, Instrumentation instrumentation, List<Class<?>> changedClasses) {
+            if (JAVA_AT_LEAST_17_0_20) {
+                // bug is fixed since JDK 19 and 17.0.20, no need to perform detection
+                return changedClasses;
+            }
+            List<Class<?>> result = new ArrayList<>();
+            for (Class<?> changedClass : changedClasses) {
+                boolean addClass = true;
+                try {
+                    Method[] declaredMethods = changedClass.getDeclaredMethods();
+                    // capping scanning of methods to 100 to avoid generated class with thousand of methods
+                    // assuming that in those first 100 methods there is at least one with at least one
+                    // parameter
+                    for (int methodIdx = 0; methodIdx < declaredMethods.length && methodIdx < 100; methodIdx++) {
+                        Method method = declaredMethods[methodIdx];
+                        Parameter[] parameters = method.getParameters();
+                        if (parameters.length == 0) {
+                            continue;
+                        }
+                        if (parameters[0].isNamePresent()) {
+                            if (!SpringHelper.isSpringUsingOnlyMethodParameters(instrumentation)) {
+                                return changedClasses;
+                            }
+                            LOGGER.debug(
+                                    "Detecting method parameter: method={} param={}, Skipping retransforming this class",
+                                    method.getName(),
+                                    parameters[0].getName());
+                            // skip the class: compiled with -parameters
+                            reportError.accept("Method Parameters detected, instrumentation not supported for "
+                                    + changedClass.getTypeName());
+                            addClass = false;
+                        }
+                        // we found at leat a method with one parameter if name is not present we can stop there
+                        break;
+                    }
+                } catch (Exception e) {
+                    LOGGER.debug("Exception scanning method parameters", e);
+                }
+                if (addClass) {
+                    result.add(changedClass);
+                }
+            }
+            return result;
         }
-      }
-      return result;
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java
index f0a2bf33505..e2669a08820 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java
@@ -58,574 +58,544 @@
 
 /** Debugger agent implementation */
 public class DebuggerAgent {
-  private static final Logger LOGGER = LoggerFactory.getLogger(DebuggerAgent.class);
-  private static Instrumentation instrumentation;
-  private static SharedCommunicationObjects sharedCommunicationObjects;
-  private static ConfigurationPoller configurationPoller;
-  private static DebuggerSink sink;
-  private static String agentVersion;
-  private static JsonSnapshotSerializer snapshotSerializer;
-  private static volatile ClassNameFilter classNameFilter;
-  private static volatile SymDBEnablement symDBEnablement;
-  private static volatile ConfigurationUpdater configurationUpdater;
-  private static volatile AbstractExceptionDebugger exceptionDebugger;
-  private static final AtomicBoolean commonInitDone = new AtomicBoolean();
-  static final AtomicBoolean dynamicInstrumentationEnabled = new AtomicBoolean();
-  static final AtomicBoolean exceptionReplayEnabled = new AtomicBoolean();
-  static final AtomicBoolean codeOriginEnabled = new AtomicBoolean();
-  static final AtomicBoolean distributedDebuggerEnabled = new AtomicBoolean();
-  static final AtomicBoolean symDBEnabled = new AtomicBoolean();
-  private static ClassesToRetransformFinder classesToRetransformFinder;
-
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification = "Agent-internal class; Class object does not escape to application code")
-  public static synchronized void run(
-      Config config, Instrumentation inst, SharedCommunicationObjects sco) {
-    instrumentation = inst;
-    sharedCommunicationObjects = sco;
-    classesToRetransformFinder = new ClassesToRetransformFinder();
-    setupSourceFileTracking(instrumentation, classesToRetransformFinder);
-    // set config updater after setup is done, as some deferred updates might be immediately called
-    DebuggerConfigBridge.setUpdater(new DefaultDebuggerConfigUpdater(config));
-    if (config.isDebuggerCodeOriginEnabled()) {
-      startCodeOriginForSpans(config);
-    }
-    if (config.isDebuggerExceptionEnabled()) {
-      startExceptionReplay(config);
-    }
-    if (config.isDynamicInstrumentationEnabled()) {
-      startDynamicInstrumentation(config);
-      if (!Config.isExplicitlyDisabled(TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_ENABLED)) {
-        startCodeOriginForSpans(config);
-      }
-      if (!Config.isExplicitlyDisabled(DebuggerConfig.SYMBOL_DATABASE_ENABLED)) {
-        startSymbolDatabase(config);
-      }
-      if (config.getDynamicInstrumentationInstrumentTheWorld() != null) {
-        setupInstrumentTheWorldTransformer(config, instrumentation, sink);
-      }
-    }
-    if (config.isSymbolDatabaseEnabled()) {
-      startSymbolDatabase(config);
-    }
-    try {
-      /*
-      Note: shutdown hooks are tricky because JVM holds reference for them forever preventing
-      GC for anything that is reachable from it.
-       */
-      Runtime.getRuntime().addShutdownHook(new ShutdownHook(configurationPoller, sink));
-    } catch (final IllegalStateException ex) {
-      // The JVM is already shutting down.
-    }
-    TracerFlare.addReporter(DebuggerAgent::addReportToFlare);
-  }
-
-  private static boolean commonInit(Config config) {
-    if (!commonInitDone.compareAndSet(false, true)) {
-      return true;
-    }
-    try {
-      configurationPoller = sharedCommunicationObjects.configurationPoller(config);
-      Redaction.addUserDefinedKeywords(config);
-      Redaction.addUserDefinedTypes(config);
-      DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery =
-          sharedCommunicationObjects.featuresDiscovery(config);
-      // force to discover because commonInit can be retried if previously failed
-      ddAgentFeaturesDiscovery.discover();
-      agentVersion = ddAgentFeaturesDiscovery.getVersion();
-      String diagnosticEndpoint = getDiagnosticEndpoint(config, ddAgentFeaturesDiscovery);
-      ProbeStatusSink probeStatusSink =
-          new ProbeStatusSink(
-              config, diagnosticEndpoint, ddAgentFeaturesDiscovery.supportsDebuggerDiagnostics());
-      DebuggerSink debuggerSink =
-          createDebuggerSink(config, ddAgentFeaturesDiscovery, probeStatusSink);
-      debuggerSink.start();
-      configurationUpdater =
-          new ConfigurationUpdater(
-              instrumentation,
-              DebuggerAgent::createTransformer,
-              config,
-              debuggerSink,
-              classesToRetransformFinder);
-      sink = debuggerSink;
-      DebuggerContext.initProbeResolver(configurationUpdater);
-      DebuggerContext.initMetricForwarder(new StatsdMetricForwarder(config, probeStatusSink));
-      DebuggerContext.initClassFilter(new DenyListHelper(null)); // default hard coded deny list
-      snapshotSerializer = new JsonSnapshotSerializer();
-      DebuggerContext.initValueSerializer(snapshotSerializer);
-      DebuggerContext.initTracer(new DebuggerTracer(debuggerSink.getProbeStatusSink()));
-      return true;
-    } catch (Exception ex) {
-      LOGGER.debug("Failed to init common component for debugger agent", ex);
-      // reset commonInitDone to be able to retry commonInit next time
-      commonInitDone.set(false);
-      return false;
-    }
-  }
-
-  private static void initClassNameFilter() {
-    if (classNameFilter == null) {
-      classNameFilter = new ClassNameFiltering(Config.get());
-    }
-  }
-
-  public static void startDynamicInstrumentation(Config config) {
-    if (!dynamicInstrumentationEnabled.compareAndSet(false, true)) {
-      return;
-    }
-    LOGGER.info("Starting Dynamic Instrumentation");
-    if (!commonInit(config)) {
-      dynamicInstrumentationEnabled.set(false);
-      return;
-    }
-    String probeFileLocation = config.getDynamicInstrumentationProbeFile();
-    if (probeFileLocation != null) {
-      Path probeFilePath = Paths.get(probeFileLocation);
-      Configuration configuration =
-          ConfigurationFileLoader.from(
-              probeFilePath, config.getDynamicInstrumentationMaxPayloadSize());
-      if (configuration != null) {
-        LOGGER.debug("Probe definitions loaded from file {}", probeFilePath);
-        configurationUpdater.accept(
-            ConfigurationAcceptor.Source.LOCAL_FILE, configuration.getDefinitions());
-      }
-      return;
-    }
-    if (configurationPoller != null) {
-      subscribeLiveDebugging(configurationUpdater);
-    } else {
-      LOGGER.debug("No configuration poller available from SharedCommunicationObjects");
-    }
-    LOGGER.info("Started Dynamic Instrumentation");
-  }
-
-  public static void stopDynamicInstrumentation() {
-    if (!dynamicInstrumentationEnabled.compareAndSet(true, false)) {
-      return;
-    }
-    LOGGER.info("Stopping Dynamic Instrumentation");
-    unsubscribeConfigurationPoller();
-    if (configurationUpdater != null) {
-      // uninstall all probes by providing empty configuration
-      configurationUpdater.accept(REMOTE_CONFIG, Collections.emptyList());
-    }
-    if (symDBEnablement != null) {
-      symDBEnablement.stopSymbolExtraction();
-      symDBEnablement = null;
-    }
-  }
-
-  private static void subscribeLiveDebugging(ConfigurationUpdater configurationUpdater) {
-    LOGGER.debug("Subscribing to Live Debugging...");
-    configurationPoller.addListener(
-        Product.LIVE_DEBUGGING, new DebuggerProductChangesListener(configurationUpdater));
-  }
-
-  public static void startSymbolDatabase(Config config) {
-    if (!symDBEnabled.compareAndSet(false, true)) {
-      return;
-    }
-    LOGGER.debug("Starting Symbol Database");
-    if (!commonInit(config)) {
-      symDBEnabled.set(false);
-      return;
-    }
-    initClassNameFilter();
-    List<ScopeFilter> scopeFilters =
-        Arrays.asList(new AvroFilter(), new ProtoFilter(), new WireFilter());
-    SymbolAggregator symbolAggregator =
-        new SymbolAggregator(
-            classNameFilter,
-            scopeFilters,
-            sink.getSymbolSink(),
-            config.getSymbolDatabaseFlushThreshold());
-    symbolAggregator.start();
-    symDBEnablement =
-        new SymDBEnablement(instrumentation, config, symbolAggregator, classNameFilter);
-    if (config.isSymbolDatabaseForceUpload()) {
-      symDBEnablement.startSymbolExtraction();
-    }
-    subscribeSymDB(symDBEnablement);
-    LOGGER.debug("Started Symbol Database");
-  }
-
-  private static void subscribeSymDB(SymDBEnablement symDBEnablement) {
-    LOGGER.debug("Subscribing to Symbol DB...");
-    if (configurationPoller != null) {
-      configurationPoller.addListener(Product.LIVE_DEBUGGING_SYMBOL_DB, symDBEnablement);
-    } else {
-      LOGGER.debug("No configuration poller available from SharedCommunicationObjects");
-    }
-  }
-
-  public static void stopSymbolDatabase() {
-    if (!symDBEnabled.compareAndSet(true, false)) {
-      return;
-    }
-    LOGGER.info("Stopping Symbol Database");
-    if (configurationPoller != null) {
-      configurationPoller.removeListeners(Product.LIVE_DEBUGGING_SYMBOL_DB);
-    }
-    SymDBEnablement localSymDBEnablement = symDBEnablement;
-    if (localSymDBEnablement != null) {
-      localSymDBEnablement.stopSymbolExtraction();
-      symDBEnablement = null;
-    }
-  }
-
-  public static void startExceptionReplay(Config config) {
-    if (!exceptionReplayEnabled.compareAndSet(false, true)) {
-      return;
-    }
-    LOGGER.info("Starting Exception Replay");
-    if (!commonInit(config)) {
-      exceptionReplayEnabled.set(false);
-      return;
-    }
-    initClassNameFilter();
-    if (config.isCiVisibilityEnabled()) {
-      exceptionDebugger =
-          new FailedTestReplayExceptionDebugger(configurationUpdater, classNameFilter, config);
-    } else {
-      exceptionDebugger =
-          new DefaultExceptionDebugger(configurationUpdater, classNameFilter, config);
-    }
-    DebuggerContext.initExceptionDebugger(exceptionDebugger);
-    LOGGER.info("Started Exception Replay");
-  }
-
-  public static void stopExceptionReplay() {
-    if (!exceptionReplayEnabled.compareAndSet(true, false)) {
-      return;
-    }
-    LOGGER.info("Stopping Exception Replay");
-    if (configurationUpdater != null) {
-      // uninstall all exception probes by providing empty configuration
-      configurationUpdater.accept(EXCEPTION, Collections.emptyList());
-    }
-    exceptionDebugger = null;
-    DebuggerContext.initExceptionDebugger(null);
-  }
-
-  public static void startCodeOriginForSpans(Config config) {
-    if (!codeOriginEnabled.compareAndSet(false, true)) {
-      return;
-    }
-    LOGGER.debug("Starting Code Origin for spans");
-    if (!commonInit(config)) {
-      codeOriginEnabled.set(false);
-      return;
-    }
-    initClassNameFilter();
-    DebuggerContext.initClassNameFilter(classNameFilter);
-    DebuggerContext.initCodeOrigin(new DefaultCodeOriginRecorder(config, configurationUpdater));
-    LOGGER.debug("Started Code Origin for spans");
-  }
-
-  public static void stopCodeOriginForSpans() {
-    if (!codeOriginEnabled.compareAndSet(true, false)) {
-      return;
-    }
-    LOGGER.debug("Stopping Code Origin for spans");
-    if (configurationUpdater != null) {
-      // uninstall all code origin probes by providing empty configuration
-      configurationUpdater.accept(CODE_ORIGIN, Collections.emptyList());
-    }
-    DebuggerContext.initCodeOrigin(null);
-  }
-
-  public static void startDistributedDebugger(Config config) {
-    if (!distributedDebuggerEnabled.compareAndSet(false, true)) {
-      return;
-    }
-    LOGGER.info("Starting Distributed Debugger");
-  }
-
-  public static void stopDistributedDebugger() {
-    if (!distributedDebuggerEnabled.compareAndSet(true, false)) {
-      return;
-    }
-    LOGGER.info("Sopping Distributed Debugger");
-  }
-
-  private static DebuggerSink createDebuggerSink(
-      Config config,
-      DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery,
-      ProbeStatusSink probeStatusSink) {
-    String tags = getDefaultTagsMergedWithGlobalTags(config);
-    BatchUploader lowRateUploader =
-        new BatchUploader(
-            "Snapshots",
-            config,
-            getSnapshotEndpoint(config, ddAgentFeaturesDiscovery),
-            SnapshotSink.RETRY_POLICY);
-    BatchUploader highRateUploader =
-        new BatchUploader(
-            "Logs",
-            config,
-            getLogEndpoint(config, ddAgentFeaturesDiscovery),
-            SnapshotSink.RETRY_POLICY);
-    SnapshotSink snapshotSink = new SnapshotSink(config, tags, lowRateUploader, highRateUploader);
-    SymbolSink symbolSink = new SymbolSink(config);
-    return new DebuggerSink(
-        config, tags, DebuggerMetricCollector.get(), probeStatusSink, snapshotSink, symbolSink);
-  }
-
-  public static String getDefaultTagsMergedWithGlobalTags(Config config) {
-    String gitSha = null;
-    String gitUrl = null;
-    try {
-      GitInfo gitInfo = GitInfoProvider.INSTANCE.getGitInfo();
-      gitSha = gitInfo.getCommit().getSha();
-      gitUrl = gitInfo.getRepositoryURL();
-    } catch (Exception e) {
-      LOGGER.error("Failed to retrieve git info: ", e);
-    }
-    String debuggerTags =
-        TagsHelper.concatTags(
-            "env:" + config.getEnv(),
-            "version:" + config.getVersion(),
-            "debugger_version:" + DDTraceCoreInfo.VERSION,
-            "agent_version:" + DebuggerAgent.getAgentVersion(),
-            "host_name:" + config.getHostName(),
-            gitSha != null ? Tags.GIT_COMMIT_SHA + ":" + gitSha : null,
-            gitUrl != null ? Tags.GIT_REPOSITORY_URL + ":" + gitUrl : null);
-    if (config.getGlobalTags().isEmpty()) {
-      return debuggerTags;
-    }
-    String globalTags =
-        config.getGlobalTags().entrySet().stream()
-            .map(e -> e.getKey() + ":" + e.getValue())
-            .collect(Collectors.joining(","));
-    return debuggerTags + "," + globalTags;
-  }
-
-  private static String getLogEndpoint(
-      Config config, DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery) {
-    if (ddAgentFeaturesDiscovery.supportsDebugger()) {
-      return ddAgentFeaturesDiscovery
-          .buildUrl(ddAgentFeaturesDiscovery.getDebuggerLogEndpoint())
-          .toString();
-    }
-    return config.getFinalDebuggerSnapshotUrl();
-  }
-
-  private static String getSnapshotEndpoint(
-      Config config, DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery) {
-    if (ddAgentFeaturesDiscovery.supportsDebugger()) {
-      String debuggerSnapshotEndpoint = ddAgentFeaturesDiscovery.getDebuggerSnapshotEndpoint();
-      if (debuggerSnapshotEndpoint == null) {
-        throw new IllegalArgumentException("Cannot find snapshot endpoint on datadog agent");
-      }
-      return ddAgentFeaturesDiscovery.buildUrl(debuggerSnapshotEndpoint).toString();
-    }
-    return config.getFinalDebuggerSnapshotUrl();
-  }
-
-  private static String getDiagnosticEndpoint(
-      Config config, DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery) {
-    if (ddAgentFeaturesDiscovery.supportsDebuggerDiagnostics()) {
-      return ddAgentFeaturesDiscovery
-          .buildUrl(DDAgentFeaturesDiscovery.DEBUGGER_DIAGNOSTICS_ENDPOINT)
-          .toString();
-    }
-    return config.getFinalDebuggerSnapshotUrl();
-  }
-
-  private static void setupSourceFileTracking(
-      Instrumentation instrumentation, ClassesToRetransformFinder finder) {
-    if (!Config.get().isDebuggerSourceFileTrackingEnabled()) {
-      LOGGER.debug("Source file tracking is disabled");
-      return;
-    }
-    SourceFileTrackingTransformer sourceFileTrackingTransformer;
-    if (Config.get().isDebuggerSynchronousSourceFileTrackingEnabled()) {
-      class SynchronousSourceFileTrackingTransformer extends SourceFileTrackingTransformer {
-        public SynchronousSourceFileTrackingTransformer(ClassesToRetransformFinder finder) {
-          super(finder);
-          this.classNameFilter = new ClassNameFiltering(Config.get());
+    private static final Logger LOGGER = LoggerFactory.getLogger(DebuggerAgent.class);
+    private static Instrumentation instrumentation;
+    private static SharedCommunicationObjects sharedCommunicationObjects;
+    private static ConfigurationPoller configurationPoller;
+    private static DebuggerSink sink;
+    private static String agentVersion;
+    private static JsonSnapshotSerializer snapshotSerializer;
+    private static volatile ClassNameFilter classNameFilter;
+    private static volatile SymDBEnablement symDBEnablement;
+    private static volatile ConfigurationUpdater configurationUpdater;
+    private static volatile AbstractExceptionDebugger exceptionDebugger;
+    private static final AtomicBoolean commonInitDone = new AtomicBoolean();
+    static final AtomicBoolean dynamicInstrumentationEnabled = new AtomicBoolean();
+    static final AtomicBoolean exceptionReplayEnabled = new AtomicBoolean();
+    static final AtomicBoolean codeOriginEnabled = new AtomicBoolean();
+    static final AtomicBoolean distributedDebuggerEnabled = new AtomicBoolean();
+    static final AtomicBoolean symDBEnabled = new AtomicBoolean();
+    private static ClassesToRetransformFinder classesToRetransformFinder;
+
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Agent-internal class; Class object does not escape to application code")
+    public static synchronized void run(Config config, Instrumentation inst, SharedCommunicationObjects sco) {
+        instrumentation = inst;
+        sharedCommunicationObjects = sco;
+        classesToRetransformFinder = new ClassesToRetransformFinder();
+        setupSourceFileTracking(instrumentation, classesToRetransformFinder);
+        // set config updater after setup is done, as some deferred updates might be immediately called
+        DebuggerConfigBridge.setUpdater(new DefaultDebuggerConfigUpdater(config));
+        if (config.isDebuggerCodeOriginEnabled()) {
+            startCodeOriginForSpans(config);
         }
+        if (config.isDebuggerExceptionEnabled()) {
+            startExceptionReplay(config);
+        }
+        if (config.isDynamicInstrumentationEnabled()) {
+            startDynamicInstrumentation(config);
+            if (!Config.isExplicitlyDisabled(TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_ENABLED)) {
+                startCodeOriginForSpans(config);
+            }
+            if (!Config.isExplicitlyDisabled(DebuggerConfig.SYMBOL_DATABASE_ENABLED)) {
+                startSymbolDatabase(config);
+            }
+            if (config.getDynamicInstrumentationInstrumentTheWorld() != null) {
+                setupInstrumentTheWorldTransformer(config, instrumentation, sink);
+            }
+        }
+        if (config.isSymbolDatabaseEnabled()) {
+            startSymbolDatabase(config);
+        }
+        try {
+            /*
+            Note: shutdown hooks are tricky because JVM holds reference for them forever preventing
+            GC for anything that is reachable from it.
+             */
+            Runtime.getRuntime().addShutdownHook(new ShutdownHook(configurationPoller, sink));
+        } catch (final IllegalStateException ex) {
+            // The JVM is already shutting down.
+        }
+        TracerFlare.addReporter(DebuggerAgent::addReportToFlare);
+    }
 
-        @Override
-        public byte[] transform(
-            ClassLoader loader,
-            String className,
-            Class<?> classBeingRedefined,
-            ProtectionDomain protectionDomain,
-            byte[] classfileBuffer) {
-          registerSourceFile(className, classfileBuffer);
-          return null;
-        }
-      }
-      sourceFileTrackingTransformer = new SynchronousSourceFileTrackingTransformer(finder);
-    } else {
-      sourceFileTrackingTransformer = new SourceFileTrackingTransformer(finder);
-    }
-    sourceFileTrackingTransformer.start();
-    instrumentation.addTransformer(sourceFileTrackingTransformer);
-  }
-
-  private static void unsubscribeConfigurationPoller() {
-    if (configurationPoller != null) {
-      configurationPoller.removeListeners(Product.LIVE_DEBUGGING);
-      configurationPoller.removeListeners(Product.LIVE_DEBUGGING_SYMBOL_DB);
-    }
-  }
-
-  static ClassFileTransformer setupInstrumentTheWorldTransformer(
-      Config config, Instrumentation instrumentation, DebuggerSink debuggerSink) {
-    LOGGER.info("install Instrument-The-World transformer");
-    DebuggerTransformer transformer =
-        createTransformer(
-            config, Configuration.builder().build(), null, new ProbeMetadata(), debuggerSink);
-    DebuggerContext.initProbeResolver(transformer::instrumentTheWorldResolver);
-    instrumentation.addTransformer(transformer);
-    return transformer;
-  }
-
-  public static String getAgentVersion() {
-    return agentVersion;
-  }
-
-  public static DebuggerSink getSink() {
-    return sink;
-  }
-
-  static Instrumentation getInstrumentation() {
-    return instrumentation;
-  }
-
-  private static DebuggerTransformer createTransformer(
-      Config config,
-      Configuration configuration,
-      DebuggerTransformer.InstrumentationListener listener,
-      ProbeMetadata probeMetadata,
-      DebuggerSink debuggerSink) {
-    return new DebuggerTransformer(config, configuration, listener, probeMetadata, debuggerSink);
-  }
-
-  static void stop() {
-    if (configurationPoller != null) {
-      configurationPoller.stop();
-    }
-    if (sink != null) {
-      sink.stop();
-    }
-  }
-
-  // Used only for tests
-  static void initSink(DebuggerSink sink) {
-    DebuggerAgent.sink = sink;
-  }
-
-  // Used only for tests
-  static void initSnapshotSerializer(JsonSnapshotSerializer snapshotSerializer) {
-    DebuggerAgent.snapshotSerializer = snapshotSerializer;
-  }
-
-  public static JsonSnapshotSerializer getSnapshotSerializer() {
-    return DebuggerAgent.snapshotSerializer;
-  }
-
-  // only used for tests
-  static void reset() {
-    instrumentation = null;
-    sharedCommunicationObjects = null;
-    configurationPoller = null;
-    sink = null;
-    agentVersion = null;
-    snapshotSerializer = null;
-    classNameFilter = null;
-    symDBEnablement = null;
-    configurationUpdater = null;
-    exceptionDebugger = null;
-    commonInitDone.set(false);
-    dynamicInstrumentationEnabled.set(false);
-    exceptionReplayEnabled.set(false);
-    codeOriginEnabled.set(false);
-    distributedDebuggerEnabled.set(false);
-    classesToRetransformFinder = null;
-  }
-
-  private static class ShutdownHook extends Thread {
-
-    private final WeakReference<ConfigurationPoller> pollerRef;
-    private final WeakReference<DebuggerSink> sinkRef;
-
-    private ShutdownHook(ConfigurationPoller poller, DebuggerSink debuggerSink) {
-      super(AGENT_THREAD_GROUP, "dd-debugger-shutdown-hook");
-      pollerRef = new WeakReference<>(poller);
-      sinkRef = new WeakReference<>(debuggerSink);
-    }
-
-    @Override
-    public void run() {
-      final ConfigurationPoller poller = pollerRef.get();
-      if (poller != null) {
+    private static boolean commonInit(Config config) {
+        if (!commonInitDone.compareAndSet(false, true)) {
+            return true;
+        }
         try {
-          poller.stop();
+            configurationPoller = sharedCommunicationObjects.configurationPoller(config);
+            Redaction.addUserDefinedKeywords(config);
+            Redaction.addUserDefinedTypes(config);
+            DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery = sharedCommunicationObjects.featuresDiscovery(config);
+            // force to discover because commonInit can be retried if previously failed
+            ddAgentFeaturesDiscovery.discover();
+            agentVersion = ddAgentFeaturesDiscovery.getVersion();
+            String diagnosticEndpoint = getDiagnosticEndpoint(config, ddAgentFeaturesDiscovery);
+            ProbeStatusSink probeStatusSink = new ProbeStatusSink(
+                    config, diagnosticEndpoint, ddAgentFeaturesDiscovery.supportsDebuggerDiagnostics());
+            DebuggerSink debuggerSink = createDebuggerSink(config, ddAgentFeaturesDiscovery, probeStatusSink);
+            debuggerSink.start();
+            configurationUpdater = new ConfigurationUpdater(
+                    instrumentation,
+                    DebuggerAgent::createTransformer,
+                    config,
+                    debuggerSink,
+                    classesToRetransformFinder);
+            sink = debuggerSink;
+            DebuggerContext.initProbeResolver(configurationUpdater);
+            DebuggerContext.initMetricForwarder(new StatsdMetricForwarder(config, probeStatusSink));
+            DebuggerContext.initClassFilter(new DenyListHelper(null)); // default hard coded deny list
+            snapshotSerializer = new JsonSnapshotSerializer();
+            DebuggerContext.initValueSerializer(snapshotSerializer);
+            DebuggerContext.initTracer(new DebuggerTracer(debuggerSink.getProbeStatusSink()));
+            return true;
         } catch (Exception ex) {
-          LOGGER.warn("failed to shutdown ProbesPoller: ", ex);
+            LOGGER.debug("Failed to init common component for debugger agent", ex);
+            // reset commonInitDone to be able to retry commonInit next time
+            commonInitDone.set(false);
+            return false;
+        }
+    }
+
+    private static void initClassNameFilter() {
+        if (classNameFilter == null) {
+            classNameFilter = new ClassNameFiltering(Config.get());
+        }
+    }
+
+    public static void startDynamicInstrumentation(Config config) {
+        if (!dynamicInstrumentationEnabled.compareAndSet(false, true)) {
+            return;
+        }
+        LOGGER.info("Starting Dynamic Instrumentation");
+        if (!commonInit(config)) {
+            dynamicInstrumentationEnabled.set(false);
+            return;
+        }
+        String probeFileLocation = config.getDynamicInstrumentationProbeFile();
+        if (probeFileLocation != null) {
+            Path probeFilePath = Paths.get(probeFileLocation);
+            Configuration configuration =
+                    ConfigurationFileLoader.from(probeFilePath, config.getDynamicInstrumentationMaxPayloadSize());
+            if (configuration != null) {
+                LOGGER.debug("Probe definitions loaded from file {}", probeFilePath);
+                configurationUpdater.accept(ConfigurationAcceptor.Source.LOCAL_FILE, configuration.getDefinitions());
+            }
+            return;
+        }
+        if (configurationPoller != null) {
+            subscribeLiveDebugging(configurationUpdater);
+        } else {
+            LOGGER.debug("No configuration poller available from SharedCommunicationObjects");
+        }
+        LOGGER.info("Started Dynamic Instrumentation");
+    }
+
+    public static void stopDynamicInstrumentation() {
+        if (!dynamicInstrumentationEnabled.compareAndSet(true, false)) {
+            return;
+        }
+        LOGGER.info("Stopping Dynamic Instrumentation");
+        unsubscribeConfigurationPoller();
+        if (configurationUpdater != null) {
+            // uninstall all probes by providing empty configuration
+            configurationUpdater.accept(REMOTE_CONFIG, Collections.emptyList());
+        }
+        if (symDBEnablement != null) {
+            symDBEnablement.stopSymbolExtraction();
+            symDBEnablement = null;
+        }
+    }
+
+    private static void subscribeLiveDebugging(ConfigurationUpdater configurationUpdater) {
+        LOGGER.debug("Subscribing to Live Debugging...");
+        configurationPoller.addListener(
+                Product.LIVE_DEBUGGING, new DebuggerProductChangesListener(configurationUpdater));
+    }
+
+    public static void startSymbolDatabase(Config config) {
+        if (!symDBEnabled.compareAndSet(false, true)) {
+            return;
+        }
+        LOGGER.debug("Starting Symbol Database");
+        if (!commonInit(config)) {
+            symDBEnabled.set(false);
+            return;
+        }
+        initClassNameFilter();
+        List<ScopeFilter> scopeFilters = Arrays.asList(new AvroFilter(), new ProtoFilter(), new WireFilter());
+        SymbolAggregator symbolAggregator = new SymbolAggregator(
+                classNameFilter, scopeFilters, sink.getSymbolSink(), config.getSymbolDatabaseFlushThreshold());
+        symbolAggregator.start();
+        symDBEnablement = new SymDBEnablement(instrumentation, config, symbolAggregator, classNameFilter);
+        if (config.isSymbolDatabaseForceUpload()) {
+            symDBEnablement.startSymbolExtraction();
+        }
+        subscribeSymDB(symDBEnablement);
+        LOGGER.debug("Started Symbol Database");
+    }
+
+    private static void subscribeSymDB(SymDBEnablement symDBEnablement) {
+        LOGGER.debug("Subscribing to Symbol DB...");
+        if (configurationPoller != null) {
+            configurationPoller.addListener(Product.LIVE_DEBUGGING_SYMBOL_DB, symDBEnablement);
+        } else {
+            LOGGER.debug("No configuration poller available from SharedCommunicationObjects");
+        }
+    }
+
+    public static void stopSymbolDatabase() {
+        if (!symDBEnabled.compareAndSet(true, false)) {
+            return;
+        }
+        LOGGER.info("Stopping Symbol Database");
+        if (configurationPoller != null) {
+            configurationPoller.removeListeners(Product.LIVE_DEBUGGING_SYMBOL_DB);
+        }
+        SymDBEnablement localSymDBEnablement = symDBEnablement;
+        if (localSymDBEnablement != null) {
+            localSymDBEnablement.stopSymbolExtraction();
+            symDBEnablement = null;
+        }
+    }
+
+    public static void startExceptionReplay(Config config) {
+        if (!exceptionReplayEnabled.compareAndSet(false, true)) {
+            return;
+        }
+        LOGGER.info("Starting Exception Replay");
+        if (!commonInit(config)) {
+            exceptionReplayEnabled.set(false);
+            return;
+        }
+        initClassNameFilter();
+        if (config.isCiVisibilityEnabled()) {
+            exceptionDebugger = new FailedTestReplayExceptionDebugger(configurationUpdater, classNameFilter, config);
+        } else {
+            exceptionDebugger = new DefaultExceptionDebugger(configurationUpdater, classNameFilter, config);
+        }
+        DebuggerContext.initExceptionDebugger(exceptionDebugger);
+        LOGGER.info("Started Exception Replay");
+    }
+
+    public static void stopExceptionReplay() {
+        if (!exceptionReplayEnabled.compareAndSet(true, false)) {
+            return;
+        }
+        LOGGER.info("Stopping Exception Replay");
+        if (configurationUpdater != null) {
+            // uninstall all exception probes by providing empty configuration
+            configurationUpdater.accept(EXCEPTION, Collections.emptyList());
+        }
+        exceptionDebugger = null;
+        DebuggerContext.initExceptionDebugger(null);
+    }
+
+    public static void startCodeOriginForSpans(Config config) {
+        if (!codeOriginEnabled.compareAndSet(false, true)) {
+            return;
+        }
+        LOGGER.debug("Starting Code Origin for spans");
+        if (!commonInit(config)) {
+            codeOriginEnabled.set(false);
+            return;
+        }
+        initClassNameFilter();
+        DebuggerContext.initClassNameFilter(classNameFilter);
+        DebuggerContext.initCodeOrigin(new DefaultCodeOriginRecorder(config, configurationUpdater));
+        LOGGER.debug("Started Code Origin for spans");
+    }
+
+    public static void stopCodeOriginForSpans() {
+        if (!codeOriginEnabled.compareAndSet(true, false)) {
+            return;
+        }
+        LOGGER.debug("Stopping Code Origin for spans");
+        if (configurationUpdater != null) {
+            // uninstall all code origin probes by providing empty configuration
+            configurationUpdater.accept(CODE_ORIGIN, Collections.emptyList());
+        }
+        DebuggerContext.initCodeOrigin(null);
+    }
+
+    public static void startDistributedDebugger(Config config) {
+        if (!distributedDebuggerEnabled.compareAndSet(false, true)) {
+            return;
+        }
+        LOGGER.info("Starting Distributed Debugger");
+    }
+
+    public static void stopDistributedDebugger() {
+        if (!distributedDebuggerEnabled.compareAndSet(true, false)) {
+            return;
         }
-      }
+        LOGGER.info("Sopping Distributed Debugger");
+    }
+
+    private static DebuggerSink createDebuggerSink(
+            Config config, DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery, ProbeStatusSink probeStatusSink) {
+        String tags = getDefaultTagsMergedWithGlobalTags(config);
+        BatchUploader lowRateUploader = new BatchUploader(
+                "Snapshots", config, getSnapshotEndpoint(config, ddAgentFeaturesDiscovery), SnapshotSink.RETRY_POLICY);
+        BatchUploader highRateUploader = new BatchUploader(
+                "Logs", config, getLogEndpoint(config, ddAgentFeaturesDiscovery), SnapshotSink.RETRY_POLICY);
+        SnapshotSink snapshotSink = new SnapshotSink(config, tags, lowRateUploader, highRateUploader);
+        SymbolSink symbolSink = new SymbolSink(config);
+        return new DebuggerSink(config, tags, DebuggerMetricCollector.get(), probeStatusSink, snapshotSink, symbolSink);
+    }
 
-      final DebuggerSink sink = sinkRef.get();
-      if (sink != null) {
+    public static String getDefaultTagsMergedWithGlobalTags(Config config) {
+        String gitSha = null;
+        String gitUrl = null;
         try {
-          sink.stop();
-        } catch (Exception ex) {
-          LOGGER.warn("Failed to shutdown SnapshotUploader", ex);
-        }
-      }
-    }
-  }
-
-  private static void addReportToFlare(ZipOutputStream zip) throws IOException {
-    String snapshotUrl = null;
-    String diagnosticUrl = null;
-    String symbolDbUrl = null;
-    String probeStatuses = null;
-    String symbolDBStats = null;
-    if (sink != null) {
-      snapshotUrl = sink.getSnapshotSink().getUrl().toString();
-      diagnosticUrl = sink.getProbeStatusSink().getUrl().toString();
-      symbolDbUrl = sink.getSymbolSink().getUrl().toString();
-      probeStatuses = sink.getProbeStatusSink().getProbeStatuses().toString();
-      symbolDBStats = sink.getSymbolSink().getStats().toString();
-    }
-    String probeDefinitions = null;
-    String instrumentedProbes = null;
-    if (configurationUpdater != null) {
-      probeDefinitions = configurationUpdater.getAppliedDefinitions().toString();
-      instrumentedProbes = configurationUpdater.getInstrumentationResults().toString();
-    }
-    String exceptionFingerprints = null;
-    if (exceptionDebugger != null) {
-      exceptionFingerprints =
-          exceptionDebugger.getExceptionProbeManager().getFingerprints().toString();
-    }
-    String content =
-        String.join(
-            System.lineSeparator(),
-            "Snapshot url: ",
-            snapshotUrl,
-            "Diagnostic url: ",
-            diagnosticUrl,
-            "SymbolDB url: ",
-            symbolDbUrl,
-            "Probe definitions:",
-            probeDefinitions,
-            "Instrumented probes:",
-            instrumentedProbes,
-            "Probe statuses:",
-            probeStatuses,
-            "SymbolDB stats:",
-            symbolDBStats,
-            "Exception Fingerprints:",
-            exceptionFingerprints,
-            "SourceFile tracking entries:",
-            String.valueOf(classesToRetransformFinder.getClassNamesBySourceFile().size()));
-    TracerFlare.addText(zip, "dynamic_instrumentation.txt", content);
-  }
+            GitInfo gitInfo = GitInfoProvider.INSTANCE.getGitInfo();
+            gitSha = gitInfo.getCommit().getSha();
+            gitUrl = gitInfo.getRepositoryURL();
+        } catch (Exception e) {
+            LOGGER.error("Failed to retrieve git info: ", e);
+        }
+        String debuggerTags = TagsHelper.concatTags(
+                "env:" + config.getEnv(),
+                "version:" + config.getVersion(),
+                "debugger_version:" + DDTraceCoreInfo.VERSION,
+                "agent_version:" + DebuggerAgent.getAgentVersion(),
+                "host_name:" + config.getHostName(),
+                gitSha != null ? Tags.GIT_COMMIT_SHA + ":" + gitSha : null,
+                gitUrl != null ? Tags.GIT_REPOSITORY_URL + ":" + gitUrl : null);
+        if (config.getGlobalTags().isEmpty()) {
+            return debuggerTags;
+        }
+        String globalTags = config.getGlobalTags().entrySet().stream()
+                .map(e -> e.getKey() + ":" + e.getValue())
+                .collect(Collectors.joining(","));
+        return debuggerTags + "," + globalTags;
+    }
+
+    private static String getLogEndpoint(Config config, DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery) {
+        if (ddAgentFeaturesDiscovery.supportsDebugger()) {
+            return ddAgentFeaturesDiscovery
+                    .buildUrl(ddAgentFeaturesDiscovery.getDebuggerLogEndpoint())
+                    .toString();
+        }
+        return config.getFinalDebuggerSnapshotUrl();
+    }
+
+    private static String getSnapshotEndpoint(Config config, DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery) {
+        if (ddAgentFeaturesDiscovery.supportsDebugger()) {
+            String debuggerSnapshotEndpoint = ddAgentFeaturesDiscovery.getDebuggerSnapshotEndpoint();
+            if (debuggerSnapshotEndpoint == null) {
+                throw new IllegalArgumentException("Cannot find snapshot endpoint on datadog agent");
+            }
+            return ddAgentFeaturesDiscovery.buildUrl(debuggerSnapshotEndpoint).toString();
+        }
+        return config.getFinalDebuggerSnapshotUrl();
+    }
+
+    private static String getDiagnosticEndpoint(Config config, DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery) {
+        if (ddAgentFeaturesDiscovery.supportsDebuggerDiagnostics()) {
+            return ddAgentFeaturesDiscovery
+                    .buildUrl(DDAgentFeaturesDiscovery.DEBUGGER_DIAGNOSTICS_ENDPOINT)
+                    .toString();
+        }
+        return config.getFinalDebuggerSnapshotUrl();
+    }
+
+    private static void setupSourceFileTracking(Instrumentation instrumentation, ClassesToRetransformFinder finder) {
+        if (!Config.get().isDebuggerSourceFileTrackingEnabled()) {
+            LOGGER.debug("Source file tracking is disabled");
+            return;
+        }
+        SourceFileTrackingTransformer sourceFileTrackingTransformer;
+        if (Config.get().isDebuggerSynchronousSourceFileTrackingEnabled()) {
+            class SynchronousSourceFileTrackingTransformer extends SourceFileTrackingTransformer {
+                public SynchronousSourceFileTrackingTransformer(ClassesToRetransformFinder finder) {
+                    super(finder);
+                    this.classNameFilter = new ClassNameFiltering(Config.get());
+                }
+
+                @Override
+                public byte[] transform(
+                        ClassLoader loader,
+                        String className,
+                        Class<?> classBeingRedefined,
+                        ProtectionDomain protectionDomain,
+                        byte[] classfileBuffer) {
+                    registerSourceFile(className, classfileBuffer);
+                    return null;
+                }
+            }
+            sourceFileTrackingTransformer = new SynchronousSourceFileTrackingTransformer(finder);
+        } else {
+            sourceFileTrackingTransformer = new SourceFileTrackingTransformer(finder);
+        }
+        sourceFileTrackingTransformer.start();
+        instrumentation.addTransformer(sourceFileTrackingTransformer);
+    }
+
+    private static void unsubscribeConfigurationPoller() {
+        if (configurationPoller != null) {
+            configurationPoller.removeListeners(Product.LIVE_DEBUGGING);
+            configurationPoller.removeListeners(Product.LIVE_DEBUGGING_SYMBOL_DB);
+        }
+    }
+
+    static ClassFileTransformer setupInstrumentTheWorldTransformer(
+            Config config, Instrumentation instrumentation, DebuggerSink debuggerSink) {
+        LOGGER.info("install Instrument-The-World transformer");
+        DebuggerTransformer transformer =
+                createTransformer(config, Configuration.builder().build(), null, new ProbeMetadata(), debuggerSink);
+        DebuggerContext.initProbeResolver(transformer::instrumentTheWorldResolver);
+        instrumentation.addTransformer(transformer);
+        return transformer;
+    }
+
+    public static String getAgentVersion() {
+        return agentVersion;
+    }
+
+    public static DebuggerSink getSink() {
+        return sink;
+    }
+
+    static Instrumentation getInstrumentation() {
+        return instrumentation;
+    }
+
+    private static DebuggerTransformer createTransformer(
+            Config config,
+            Configuration configuration,
+            DebuggerTransformer.InstrumentationListener listener,
+            ProbeMetadata probeMetadata,
+            DebuggerSink debuggerSink) {
+        return new DebuggerTransformer(config, configuration, listener, probeMetadata, debuggerSink);
+    }
+
+    static void stop() {
+        if (configurationPoller != null) {
+            configurationPoller.stop();
+        }
+        if (sink != null) {
+            sink.stop();
+        }
+    }
+
+    // Used only for tests
+    static void initSink(DebuggerSink sink) {
+        DebuggerAgent.sink = sink;
+    }
+
+    // Used only for tests
+    static void initSnapshotSerializer(JsonSnapshotSerializer snapshotSerializer) {
+        DebuggerAgent.snapshotSerializer = snapshotSerializer;
+    }
+
+    public static JsonSnapshotSerializer getSnapshotSerializer() {
+        return DebuggerAgent.snapshotSerializer;
+    }
+
+    // only used for tests
+    static void reset() {
+        instrumentation = null;
+        sharedCommunicationObjects = null;
+        configurationPoller = null;
+        sink = null;
+        agentVersion = null;
+        snapshotSerializer = null;
+        classNameFilter = null;
+        symDBEnablement = null;
+        configurationUpdater = null;
+        exceptionDebugger = null;
+        commonInitDone.set(false);
+        dynamicInstrumentationEnabled.set(false);
+        exceptionReplayEnabled.set(false);
+        codeOriginEnabled.set(false);
+        distributedDebuggerEnabled.set(false);
+        classesToRetransformFinder = null;
+    }
+
+    private static class ShutdownHook extends Thread {
+
+        private final WeakReference<ConfigurationPoller> pollerRef;
+        private final WeakReference<DebuggerSink> sinkRef;
+
+        private ShutdownHook(ConfigurationPoller poller, DebuggerSink debuggerSink) {
+            super(AGENT_THREAD_GROUP, "dd-debugger-shutdown-hook");
+            pollerRef = new WeakReference<>(poller);
+            sinkRef = new WeakReference<>(debuggerSink);
+        }
+
+        @Override
+        public void run() {
+            final ConfigurationPoller poller = pollerRef.get();
+            if (poller != null) {
+                try {
+                    poller.stop();
+                } catch (Exception ex) {
+                    LOGGER.warn("failed to shutdown ProbesPoller: ", ex);
+                }
+            }
+
+            final DebuggerSink sink = sinkRef.get();
+            if (sink != null) {
+                try {
+                    sink.stop();
+                } catch (Exception ex) {
+                    LOGGER.warn("Failed to shutdown SnapshotUploader", ex);
+                }
+            }
+        }
+    }
+
+    private static void addReportToFlare(ZipOutputStream zip) throws IOException {
+        String snapshotUrl = null;
+        String diagnosticUrl = null;
+        String symbolDbUrl = null;
+        String probeStatuses = null;
+        String symbolDBStats = null;
+        if (sink != null) {
+            snapshotUrl = sink.getSnapshotSink().getUrl().toString();
+            diagnosticUrl = sink.getProbeStatusSink().getUrl().toString();
+            symbolDbUrl = sink.getSymbolSink().getUrl().toString();
+            probeStatuses = sink.getProbeStatusSink().getProbeStatuses().toString();
+            symbolDBStats = sink.getSymbolSink().getStats().toString();
+        }
+        String probeDefinitions = null;
+        String instrumentedProbes = null;
+        if (configurationUpdater != null) {
+            probeDefinitions = configurationUpdater.getAppliedDefinitions().toString();
+            instrumentedProbes =
+                    configurationUpdater.getInstrumentationResults().toString();
+        }
+        String exceptionFingerprints = null;
+        if (exceptionDebugger != null) {
+            exceptionFingerprints = exceptionDebugger
+                    .getExceptionProbeManager()
+                    .getFingerprints()
+                    .toString();
+        }
+        String content = String.join(
+                System.lineSeparator(),
+                "Snapshot url: ",
+                snapshotUrl,
+                "Diagnostic url: ",
+                diagnosticUrl,
+                "SymbolDB url: ",
+                symbolDbUrl,
+                "Probe definitions:",
+                probeDefinitions,
+                "Instrumented probes:",
+                instrumentedProbes,
+                "Probe statuses:",
+                probeStatuses,
+                "SymbolDB stats:",
+                symbolDBStats,
+                "Exception Fingerprints:",
+                exceptionFingerprints,
+                "SourceFile tracking entries:",
+                String.valueOf(
+                        classesToRetransformFinder.getClassNamesBySourceFile().size()));
+        TracerFlare.addText(zip, "dynamic_instrumentation.txt", content);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerFeatures.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerFeatures.java
index d41a87bf1ad..2a4ec013e26 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerFeatures.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerFeatures.java
@@ -1,5 +1,5 @@
 package com.datadog.debugger.agent;
 
 public class DebuggerFeatures {
-  public boolean enabled;
+    public boolean enabled;
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerFeaturesDeserializer.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerFeaturesDeserializer.java
index aef4b7bb039..a45d0850903 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerFeaturesDeserializer.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerFeaturesDeserializer.java
@@ -8,20 +8,20 @@
 import okio.Okio;
 
 public class DebuggerFeaturesDeserializer implements ConfigurationDeserializer<DebuggerFeatures> {
-  public static final DebuggerFeaturesDeserializer INSTANCE = new DebuggerFeaturesDeserializer();
+    public static final DebuggerFeaturesDeserializer INSTANCE = new DebuggerFeaturesDeserializer();
 
-  private static final JsonAdapter<DebuggerFeatures> ADAPTER =
-      MoshiHelper.createMoshiConfig().adapter(DebuggerFeatures.class);
+    private static final JsonAdapter<DebuggerFeatures> ADAPTER =
+            MoshiHelper.createMoshiConfig().adapter(DebuggerFeatures.class);
 
-  private DebuggerFeaturesDeserializer() {}
+    private DebuggerFeaturesDeserializer() {}
 
-  @Override
-  public DebuggerFeatures deserialize(byte[] content) throws IOException {
-    return ADAPTER.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
-  }
+    @Override
+    public DebuggerFeatures deserialize(byte[] content) throws IOException {
+        return ADAPTER.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
+    }
 
-  /* for testing */
-  public String serialize(DebuggerFeatures features) {
-    return ADAPTER.toJson(features);
-  }
+    /* for testing */
+    public String serialize(DebuggerFeatures features) {
+        return ADAPTER.toJson(features);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerProductChangesListener.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerProductChangesListener.java
index 5dbfb4f1994..c4c69ad2913 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerProductChangesListener.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerProductChangesListener.java
@@ -26,63 +26,60 @@
 import org.slf4j.LoggerFactory;
 
 public class DebuggerProductChangesListener implements ProductListener {
-  public static final String LOG_PROBE_PREFIX = "logProbe_";
-  public static final String METRIC_PROBE_PREFIX = "metricProbe_";
-  public static final String SPAN_PROBE_PREFIX = "spanProbe_";
-  public static final String TRIGGER_PROBE_PREFIX = "triggerProbe_";
-  public static final String SPAN_DECORATION_PROBE_PREFIX = "spanDecorationProbe_";
-  private static final Logger LOGGER =
-      LoggerFactory.getLogger(DebuggerProductChangesListener.class);
+    public static final String LOG_PROBE_PREFIX = "logProbe_";
+    public static final String METRIC_PROBE_PREFIX = "metricProbe_";
+    public static final String SPAN_PROBE_PREFIX = "spanProbe_";
+    public static final String TRIGGER_PROBE_PREFIX = "triggerProbe_";
+    public static final String SPAN_DECORATION_PROBE_PREFIX = "spanDecorationProbe_";
+    private static final Logger LOGGER = LoggerFactory.getLogger(DebuggerProductChangesListener.class);
 
-  private static final Predicate<String> IS_UUID =
-      Pattern.compile(
-              "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$")
-          .asPredicate();
+    private static final Predicate<String> IS_UUID = Pattern.compile(
+                    "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$")
+            .asPredicate();
 
-  private final ConfigurationAcceptor configurationAcceptor;
-  private final Map<String, ProbeDefinition> probeByConfigId = new HashMap<>();
+    private final ConfigurationAcceptor configurationAcceptor;
+    private final Map<String, ProbeDefinition> probeByConfigId = new HashMap<>();
 
-  DebuggerProductChangesListener(ConfigurationAcceptor configurationAcceptor) {
-    this.configurationAcceptor = configurationAcceptor;
-  }
+    DebuggerProductChangesListener(ConfigurationAcceptor configurationAcceptor) {
+        this.configurationAcceptor = configurationAcceptor;
+    }
 
-  @Override
-  public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollingRateHinter)
-      throws IOException {
-    String configId = configKey.getConfigId();
-    try {
-      if (configId.startsWith(METRIC_PROBE_PREFIX)) {
-        MetricProbe metricProbe = deserializeMetricProbe(content);
-        probeByConfigId.put(configId, metricProbe);
-      } else if (configId.startsWith(LOG_PROBE_PREFIX)) {
-        LogProbe logProbe = deserializeLogProbe(content);
-        probeByConfigId.put(configId, logProbe);
-      } else if (configId.startsWith(SPAN_PROBE_PREFIX)) {
-        SpanProbe spanProbe = deserializeSpanProbe(content);
-        probeByConfigId.put(configId, spanProbe);
-      } else if (configId.startsWith(TRIGGER_PROBE_PREFIX)) {
-        TriggerProbe triggerProbe = deserializeTriggerProbe(content);
-        probeByConfigId.put(configId, triggerProbe);
-      } else if (configId.startsWith(SPAN_DECORATION_PROBE_PREFIX)) {
-        SpanDecorationProbe spanDecorationProbe = deserializeSpanDecorationProbe(content);
-        probeByConfigId.put(configId, spanDecorationProbe);
-      } else {
-        LOGGER.debug("Unsupported configuration id: {}, ignoring configuration", configId);
-      }
-    } catch (Exception ex) {
-      configurationAcceptor.handleException(configId, ex);
-      throw new IOException(ex);
+    @Override
+    public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollingRateHinter) throws IOException {
+        String configId = configKey.getConfigId();
+        try {
+            if (configId.startsWith(METRIC_PROBE_PREFIX)) {
+                MetricProbe metricProbe = deserializeMetricProbe(content);
+                probeByConfigId.put(configId, metricProbe);
+            } else if (configId.startsWith(LOG_PROBE_PREFIX)) {
+                LogProbe logProbe = deserializeLogProbe(content);
+                probeByConfigId.put(configId, logProbe);
+            } else if (configId.startsWith(SPAN_PROBE_PREFIX)) {
+                SpanProbe spanProbe = deserializeSpanProbe(content);
+                probeByConfigId.put(configId, spanProbe);
+            } else if (configId.startsWith(TRIGGER_PROBE_PREFIX)) {
+                TriggerProbe triggerProbe = deserializeTriggerProbe(content);
+                probeByConfigId.put(configId, triggerProbe);
+            } else if (configId.startsWith(SPAN_DECORATION_PROBE_PREFIX)) {
+                SpanDecorationProbe spanDecorationProbe = deserializeSpanDecorationProbe(content);
+                probeByConfigId.put(configId, spanDecorationProbe);
+            } else {
+                LOGGER.debug("Unsupported configuration id: {}, ignoring configuration", configId);
+            }
+        } catch (Exception ex) {
+            configurationAcceptor.handleException(configId, ex);
+            throw new IOException(ex);
+        }
     }
-  }
 
-  @Override
-  public void remove(ConfigKey configKey, PollingRateHinter pollingRateHinter) throws IOException {
-    probeByConfigId.remove(configKey.getConfigId());
-  }
+    @Override
+    public void remove(ConfigKey configKey, PollingRateHinter pollingRateHinter) throws IOException {
+        probeByConfigId.remove(configKey.getConfigId());
+    }
 
-  @Override
-  public void commit(PollingRateHinter pollingRateHinter) {
-    // create a snapshot of the actual probes stored into probeByConfigId map
-    configurationAcceptor.accept(REMOTE_CONFIG, new ArrayList<>(probeByConfigId.values()));
-  }
+    @Override
+    public void commit(PollingRateHinter pollingRateHinter) {
+        // create a snapshot of the actual probes stored into probeByConfigId map
+        configurationAcceptor.accept(REMOTE_CONFIG, new ArrayList<>(probeByConfigId.values()));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTracer.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTracer.java
index 23b49fe57cc..15623b2d04a 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTracer.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTracer.java
@@ -10,66 +10,65 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 
 public class DebuggerTracer implements DebuggerContext.Tracer {
-  public static final String OPERATION_NAME = "dd.dynamic.span";
+    public static final String OPERATION_NAME = "dd.dynamic.span";
 
-  private final ProbeStatusSink probeStatusSink;
+    private final ProbeStatusSink probeStatusSink;
 
-  public DebuggerTracer(ProbeStatusSink probeStatusSink) {
-    this.probeStatusSink = probeStatusSink;
-  }
-
-  @Override
-  public DebuggerSpan createSpan(String encodedProbeId, String resourceName, String[] tags) {
-    AgentTracer.TracerAPI tracerAPI = AgentTracer.get();
-    if (tracerAPI == null || tracerAPI == NOOP_TRACER) {
-      return DebuggerSpan.NOOP_SPAN;
+    public DebuggerTracer(ProbeStatusSink probeStatusSink) {
+        this.probeStatusSink = probeStatusSink;
     }
-    AgentSpan dynamicSpan =
-        tracerAPI
-            .buildSpan("dynamic-instrumentation", OPERATION_NAME)
-            .withResourceName(resourceName)
-            .start();
-    if (tags != null) {
-      for (String tag : tags) {
-        int idx = tag.indexOf(':');
-        if (idx == -1) {
-          continue;
+
+    @Override
+    public DebuggerSpan createSpan(String encodedProbeId, String resourceName, String[] tags) {
+        AgentTracer.TracerAPI tracerAPI = AgentTracer.get();
+        if (tracerAPI == null || tracerAPI == NOOP_TRACER) {
+            return DebuggerSpan.NOOP_SPAN;
         }
-        dynamicSpan.setTag(tag.substring(0, idx), tag.substring(idx + 1));
-      }
+        AgentSpan dynamicSpan = tracerAPI
+                .buildSpan("dynamic-instrumentation", OPERATION_NAME)
+                .withResourceName(resourceName)
+                .start();
+        if (tags != null) {
+            for (String tag : tags) {
+                int idx = tag.indexOf(':');
+                if (idx == -1) {
+                    continue;
+                }
+                dynamicSpan.setTag(tag.substring(0, idx), tag.substring(idx + 1));
+            }
+        }
+        ContextScope scope = tracerAPI.activateManualSpan(dynamicSpan);
+        return new DebuggerSpanImpl(dynamicSpan, scope, probeStatusSink, encodedProbeId);
     }
-    ContextScope scope = tracerAPI.activateManualSpan(dynamicSpan);
-    return new DebuggerSpanImpl(dynamicSpan, scope, probeStatusSink, encodedProbeId);
-  }
 
-  static class DebuggerSpanImpl implements DebuggerSpan {
-    final AgentSpan underlyingSpan;
-    final ContextScope currentScope;
-    final ProbeStatusSink probeStatusSink;
-    final String encodedProbeId;
+    static class DebuggerSpanImpl implements DebuggerSpan {
+        final AgentSpan underlyingSpan;
+        final ContextScope currentScope;
+        final ProbeStatusSink probeStatusSink;
+        final String encodedProbeId;
 
-    public DebuggerSpanImpl(
-        AgentSpan underlyingSpan,
-        ContextScope currentScope,
-        ProbeStatusSink probeStatusSink,
-        String encodedProbeId) {
-      this.underlyingSpan = underlyingSpan;
-      this.currentScope = currentScope;
-      this.probeStatusSink = probeStatusSink;
-      this.encodedProbeId = encodedProbeId;
-    }
+        public DebuggerSpanImpl(
+                AgentSpan underlyingSpan,
+                ContextScope currentScope,
+                ProbeStatusSink probeStatusSink,
+                String encodedProbeId) {
+            this.underlyingSpan = underlyingSpan;
+            this.currentScope = currentScope;
+            this.probeStatusSink = probeStatusSink;
+            this.encodedProbeId = encodedProbeId;
+        }
 
-    @Override
-    public void finish() {
-      currentScope.close();
-      underlyingSpan.finish();
-      probeStatusSink.addEmitting(encodedProbeId);
-    }
+        @Override
+        public void finish() {
+            currentScope.close();
+            underlyingSpan.finish();
+            probeStatusSink.addEmitting(encodedProbeId);
+        }
 
-    @Override
-    public void setError(Throwable t) {
-      underlyingSpan.setError(true);
-      underlyingSpan.addThrowable(t);
+        @Override
+        public void setError(Throwable t) {
+            underlyingSpan.setError(true);
+            underlyingSpan.addThrowable(t);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java
index 8b6b2aea7a1..5b41675b172 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java
@@ -83,1007 +83,960 @@
  * debugger configuration
  */
 public class DebuggerTransformer implements ClassFileTransformer {
-  private static final Logger LOGGER = LoggerFactory.getLogger(DebuggerTransformer.class);
-  private static final String CANNOT_FIND_METHOD = "Cannot find method %s::%s%s";
-  private static final String INSTRUMENTATION_FAILS = "Instrumentation failed for %s: %s";
-  private static final Pattern COMMA_PATTERN = Pattern.compile(",");
-  private static final List<Class<?>> PROBE_ORDER =
-      Arrays.asList(
-          TriggerProbe.class,
-          MetricProbe.class,
-          LogProbe.class,
-          SpanDecorationProbe.class,
-          SpanProbe.class);
-  private static final String JAVA_IO_TMPDIR = "java.io.tmpdir";
-  private static final boolean JAVA_AT_LEAST_25_0_4 =
-      JavaVirtualMachine.isJavaVersionAtLeast(25, 0, 4);
-  private static final boolean JAVA_AT_LEAST_17_0_20 =
-      JavaVirtualMachine.isJavaVersionAtLeast(17, 0, 20);
-  public static Path DUMP_PATH = Paths.get(SystemProperties.get(JAVA_IO_TMPDIR), "debugger");
+    private static final Logger LOGGER = LoggerFactory.getLogger(DebuggerTransformer.class);
+    private static final String CANNOT_FIND_METHOD = "Cannot find method %s::%s%s";
+    private static final String INSTRUMENTATION_FAILS = "Instrumentation failed for %s: %s";
+    private static final Pattern COMMA_PATTERN = Pattern.compile(",");
+    private static final List<Class<?>> PROBE_ORDER = Arrays.asList(
+            TriggerProbe.class, MetricProbe.class, LogProbe.class, SpanDecorationProbe.class, SpanProbe.class);
+    private static final String JAVA_IO_TMPDIR = "java.io.tmpdir";
+    private static final boolean JAVA_AT_LEAST_25_0_4 = JavaVirtualMachine.isJavaVersionAtLeast(25, 0, 4);
+    private static final boolean JAVA_AT_LEAST_17_0_20 = JavaVirtualMachine.isJavaVersionAtLeast(17, 0, 20);
+    public static Path DUMP_PATH = Paths.get(SystemProperties.get(JAVA_IO_TMPDIR), "debugger");
 
-  private final Config config;
-  private final TransformerDefinitionMatcher definitionMatcher;
-  private final AllowListHelper allowListHelper;
-  private final DenyListHelper denyListHelper;
-  private final InstrumentationListener listener;
-  private final ProbeMetadata probeMetadata;
-  private final DebuggerSink debuggerSink;
-  private final boolean instrumentTheWorld;
-  private final Set<String> excludeClasses;
-  private final Set<String> excludeMethods;
-  private final Trie excludeTrie;
-  private final Set<String> includeClasses;
-  private final Set<String> includeMethods;
-  private final Trie includeTrie;
-  private final BiConsumer<MethodInfo, List<ProbeDefinition>> probeCreator;
+    private final Config config;
+    private final TransformerDefinitionMatcher definitionMatcher;
+    private final AllowListHelper allowListHelper;
+    private final DenyListHelper denyListHelper;
+    private final InstrumentationListener listener;
+    private final ProbeMetadata probeMetadata;
+    private final DebuggerSink debuggerSink;
+    private final boolean instrumentTheWorld;
+    private final Set<String> excludeClasses;
+    private final Set<String> excludeMethods;
+    private final Trie excludeTrie;
+    private final Set<String> includeClasses;
+    private final Set<String> includeMethods;
+    private final Trie includeTrie;
+    private final BiConsumer<MethodInfo, List<ProbeDefinition>> probeCreator;
 
-  public interface InstrumentationListener {
-    void instrumentationResult(ProbeDefinition definition, InstrumentationResult result);
-  }
-
-  public DebuggerTransformer(
-      Config config,
-      Configuration configuration,
-      InstrumentationListener listener,
-      ProbeMetadata probeMetadata,
-      DebuggerSink debuggerSink) {
-    this.config = config;
-    this.definitionMatcher = new TransformerDefinitionMatcher(configuration);
-    this.allowListHelper = new AllowListHelper(configuration.getAllowList());
-    this.denyListHelper = new DenyListHelper(configuration.getDenyList());
-    this.listener = listener;
-    this.probeMetadata = probeMetadata;
-    this.debuggerSink = debuggerSink;
-    String itwType = config.getDynamicInstrumentationInstrumentTheWorld();
-    this.instrumentTheWorld = itwType != null;
-    if (this.instrumentTheWorld) {
-      excludeTrie = new Trie();
-      excludeClasses = new HashSet<>();
-      excludeMethods = new HashSet<>();
-      includeTrie = new Trie();
-      includeClasses = new HashSet<>();
-      includeMethods = new HashSet<>();
-      processITWFiles(
-          config.getDynamicInstrumentationExcludeFiles(),
-          excludeTrie,
-          excludeClasses,
-          excludeMethods);
-      processITWFiles(
-          config.getDynamicInstrumentationIncludeFiles(),
-          includeTrie,
-          includeClasses,
-          includeMethods);
-      if (itwType.equals("method")) {
-        probeCreator = this::createMethodProbe;
-      } else if (itwType.equals("line")) {
-        probeCreator = this::createLineProbes;
-      } else {
-        LOGGER.warn(
-            "Invalid value for 'dd.debugger.instrument-the-world' property: {}. "
-                + "Valid values are 'method' or 'line'.",
-            itwType);
-        probeCreator = null;
-      }
-    } else {
-      excludeTrie = null;
-      excludeClasses = null;
-      excludeMethods = null;
-      includeTrie = null;
-      includeClasses = null;
-      includeMethods = null;
-      probeCreator = null;
+    public interface InstrumentationListener {
+        void instrumentationResult(ProbeDefinition definition, InstrumentationResult result);
     }
-    if (isDebuggerInternalClass(null)) {
-      // Force DebuggerInternalPAckages to be loaded before calling it into the transform method
-      // avoid LinkageError for duplicated class definition
-      throw new IllegalArgumentException("DebuggerInternalClass should be loaded");
+
+    public DebuggerTransformer(
+            Config config,
+            Configuration configuration,
+            InstrumentationListener listener,
+            ProbeMetadata probeMetadata,
+            DebuggerSink debuggerSink) {
+        this.config = config;
+        this.definitionMatcher = new TransformerDefinitionMatcher(configuration);
+        this.allowListHelper = new AllowListHelper(configuration.getAllowList());
+        this.denyListHelper = new DenyListHelper(configuration.getDenyList());
+        this.listener = listener;
+        this.probeMetadata = probeMetadata;
+        this.debuggerSink = debuggerSink;
+        String itwType = config.getDynamicInstrumentationInstrumentTheWorld();
+        this.instrumentTheWorld = itwType != null;
+        if (this.instrumentTheWorld) {
+            excludeTrie = new Trie();
+            excludeClasses = new HashSet<>();
+            excludeMethods = new HashSet<>();
+            includeTrie = new Trie();
+            includeClasses = new HashSet<>();
+            includeMethods = new HashSet<>();
+            processITWFiles(
+                    config.getDynamicInstrumentationExcludeFiles(), excludeTrie, excludeClasses, excludeMethods);
+            processITWFiles(
+                    config.getDynamicInstrumentationIncludeFiles(), includeTrie, includeClasses, includeMethods);
+            if (itwType.equals("method")) {
+                probeCreator = this::createMethodProbe;
+            } else if (itwType.equals("line")) {
+                probeCreator = this::createLineProbes;
+            } else {
+                LOGGER.warn(
+                        "Invalid value for 'dd.debugger.instrument-the-world' property: {}. "
+                                + "Valid values are 'method' or 'line'.",
+                        itwType);
+                probeCreator = null;
+            }
+        } else {
+            excludeTrie = null;
+            excludeClasses = null;
+            excludeMethods = null;
+            includeTrie = null;
+            includeClasses = null;
+            includeMethods = null;
+            probeCreator = null;
+        }
+        if (isDebuggerInternalClass(null)) {
+            // Force DebuggerInternalPAckages to be loaded before calling it into the transform method
+            // avoid LinkageError for duplicated class definition
+            throw new IllegalArgumentException("DebuggerInternalClass should be loaded");
+        }
     }
-  }
 
-  // Used only for tests
-  public DebuggerTransformer(
-      Config config, ProbeMetadata probeMetadata, Configuration configuration) {
-    this(
-        config,
-        configuration,
-        null,
-        probeMetadata,
-        new DebuggerSink(
-            config,
-            "",
-            DebuggerMetricCollector.get(),
-            new ProbeStatusSink(config, config.getFinalDebuggerSnapshotUrl(), false),
-            new SnapshotSink(
+    // Used only for tests
+    public DebuggerTransformer(Config config, ProbeMetadata probeMetadata, Configuration configuration) {
+        this(
                 config,
-                "",
-                new BatchUploader(
-                    "Snapshots",
-                    config,
-                    config.getFinalDebuggerSnapshotUrl(),
-                    SnapshotSink.RETRY_POLICY),
-                new BatchUploader(
-                    "Logs",
-                    config,
-                    config.getFinalDebuggerSnapshotUrl(),
-                    SnapshotSink.RETRY_POLICY)),
-            new SymbolSink(config)));
-  }
-
-  private void processITWFiles(
-      String commaSeparatedFileNames, Trie prefixes, Set<String> classes, Set<String> methods) {
-    if (commaSeparatedFileNames == null) {
-      return;
+                configuration,
+                null,
+                probeMetadata,
+                new DebuggerSink(
+                        config,
+                        "",
+                        DebuggerMetricCollector.get(),
+                        new ProbeStatusSink(config, config.getFinalDebuggerSnapshotUrl(), false),
+                        new SnapshotSink(
+                                config,
+                                "",
+                                new BatchUploader(
+                                        "Snapshots",
+                                        config,
+                                        config.getFinalDebuggerSnapshotUrl(),
+                                        SnapshotSink.RETRY_POLICY),
+                                new BatchUploader(
+                                        "Logs",
+                                        config,
+                                        config.getFinalDebuggerSnapshotUrl(),
+                                        SnapshotSink.RETRY_POLICY)),
+                        new SymbolSink(config)));
     }
-    String[] fileNames = COMMA_PATTERN.split(commaSeparatedFileNames);
-    for (String fileName : fileNames) {
-      Path excludePath = Paths.get(fileName);
-      if (!Files.exists(excludePath)) {
-        LOGGER.warn("Cannot find exclude file: {}", excludePath);
-        continue;
-      }
-      try {
-        Files.lines(excludePath)
-            .forEach(
-                line -> {
-                  if (line.startsWith("#")) {
-                    return;
-                  }
-                  if (line.endsWith("*")) {
-                    prefixes.insert(line.substring(0, line.length() - 1));
-                    return;
-                  }
-                  if (line.contains("::")) {
-                    methods.add(line);
-                    return;
-                  }
-                  classes.add(line);
+
+    private void processITWFiles(
+            String commaSeparatedFileNames, Trie prefixes, Set<String> classes, Set<String> methods) {
+        if (commaSeparatedFileNames == null) {
+            return;
+        }
+        String[] fileNames = COMMA_PATTERN.split(commaSeparatedFileNames);
+        for (String fileName : fileNames) {
+            Path excludePath = Paths.get(fileName);
+            if (!Files.exists(excludePath)) {
+                LOGGER.warn("Cannot find exclude file: {}", excludePath);
+                continue;
+            }
+            try {
+                Files.lines(excludePath).forEach(line -> {
+                    if (line.startsWith("#")) {
+                        return;
+                    }
+                    if (line.endsWith("*")) {
+                        prefixes.insert(line.substring(0, line.length() - 1));
+                        return;
+                    }
+                    if (line.contains("::")) {
+                        methods.add(line);
+                        return;
+                    }
+                    classes.add(line);
                 });
-      } catch (IOException ex) {
-        LOGGER.warn("Error reading exclude file '{}' for Instrument-The-World: ", fileName, ex);
-      }
+            } catch (IOException ex) {
+                LOGGER.warn("Error reading exclude file '{}' for Instrument-The-World: ", fileName, ex);
+            }
+        }
     }
-  }
 
-  @Override
-  public byte[] transform(
-      ClassLoader loader,
-      String classFilePath,
-      Class<?> classBeingRedefined,
-      ProtectionDomain protectionDomain,
-      byte[] classfileBuffer) {
-    if (instrumentTheWorld) {
-      return transformTheWorld(loader, classFilePath, protectionDomain, classfileBuffer);
-    }
-    if (skipInstrumentation(classFilePath)) {
-      return null;
-    }
-    List<ProbeDefinition> definitions = Collections.emptyList();
-    String fullyQualifiedClassName = classFilePath.replace('/', '.');
-    try {
-      definitions =
-          definitionMatcher.match(
-              classBeingRedefined, classFilePath, fullyQualifiedClassName, classfileBuffer);
-      if (definitions.isEmpty()) {
-        return null;
-      }
-      LOGGER.debug("Matching definitions for class[{}]: {}", fullyQualifiedClassName, definitions);
-      if (!instrumentationIsAllowed(fullyQualifiedClassName, definitions)) {
-        return null;
-      }
-      ClassNode classNode = parseClassFile(classFilePath, classfileBuffer);
-      if (!checkMethodParameters(classNode, definitions, fullyQualifiedClassName)) {
-        return null;
-      }
-      if (!checkRecordTypeAnnotation(classNode, definitions, fullyQualifiedClassName)) {
+    @Override
+    public byte[] transform(
+            ClassLoader loader,
+            String classFilePath,
+            Class<?> classBeingRedefined,
+            ProtectionDomain protectionDomain,
+            byte[] classfileBuffer) {
+        if (instrumentTheWorld) {
+            return transformTheWorld(loader, classFilePath, protectionDomain, classfileBuffer);
+        }
+        if (skipInstrumentation(classFilePath)) {
+            return null;
+        }
+        List<ProbeDefinition> definitions = Collections.emptyList();
+        String fullyQualifiedClassName = classFilePath.replace('/', '.');
+        try {
+            definitions = definitionMatcher.match(
+                    classBeingRedefined, classFilePath, fullyQualifiedClassName, classfileBuffer);
+            if (definitions.isEmpty()) {
+                return null;
+            }
+            LOGGER.debug("Matching definitions for class[{}]: {}", fullyQualifiedClassName, definitions);
+            if (!instrumentationIsAllowed(fullyQualifiedClassName, definitions)) {
+                return null;
+            }
+            ClassNode classNode = parseClassFile(classFilePath, classfileBuffer);
+            if (!checkMethodParameters(classNode, definitions, fullyQualifiedClassName)) {
+                return null;
+            }
+            if (!checkRecordTypeAnnotation(classNode, definitions, fullyQualifiedClassName)) {
+                return null;
+            }
+            boolean transformed = performInstrumentation(loader, fullyQualifiedClassName, definitions, classNode);
+            if (transformed) {
+                return writeClassFile(definitions, loader, classFilePath, classNode);
+            }
+            // We are logging this because in case of SourceFile definition and multiple top-level
+            // classes, type may match, but there is one classfile per top-level class so source file
+            // will match, but not the classfile.
+            // e.g. Main.java contains Main & TopLevel class, line numbers are in TopLevel class
+            LOGGER.debug("type {} matched but no transformation for definitions: {}", classFilePath, definitions);
+        } catch (Throwable ex) {
+            LOGGER.warn("Cannot transform: ", ex);
+            reportInstrumentationFails(definitions, fullyQualifiedClassName, ex.toString());
+        }
         return null;
-      }
-      boolean transformed =
-          performInstrumentation(loader, fullyQualifiedClassName, definitions, classNode);
-      if (transformed) {
-        return writeClassFile(definitions, loader, classFilePath, classNode);
-      }
-      // We are logging this because in case of SourceFile definition and multiple top-level
-      // classes, type may match, but there is one classfile per top-level class so source file
-      // will match, but not the classfile.
-      // e.g. Main.java contains Main & TopLevel class, line numbers are in TopLevel class
-      LOGGER.debug(
-          "type {} matched but no transformation for definitions: {}", classFilePath, definitions);
-    } catch (Throwable ex) {
-      LOGGER.warn("Cannot transform: ", ex);
-      reportInstrumentationFails(definitions, fullyQualifiedClassName, ex.toString());
     }
-    return null;
-  }
 
-  /*
-   * Because of this bug (https://bugs.openjdk.org/browse/JDK-8240908), classes compiled with
-   * method parameters (javac -parameters) strip this attribute once retransformed
-   * Spring 6/Spring boot 3 rely exclusively on this attribute and may throw an exception
-   * if no attribute found.
-   * Note: Even if the attribute is preserved when transforming at load time, the fact that we have
-   * instrumented the class, we will retransform for removing the instrumentation and then the
-   * attribute is stripped. That's why we are preventing it even at load time.
-   */
-  private boolean checkMethodParameters(
-      ClassNode classNode, List<ProbeDefinition> definitions, String fullyQualifiedClassName) {
-    if (JAVA_AT_LEAST_17_0_20) {
-      // bug is fixed since JDK 19 and 17.0.20, no need to perform check
-      return true;
-    }
-    boolean isRecord = ASMHelper.isRecord(classNode);
-    // capping scanning of methods to 100 to avoid generated class with thousand of methods
-    // assuming that in those first 100 methods there is at least one with at least one parameter
-    for (int methodIdx = 0; methodIdx < classNode.methods.size() && methodIdx < 100; methodIdx++) {
-      MethodNode methodNode = classNode.methods.get(methodIdx);
-      int argumentCount = Type.getArgumentCount(methodNode.desc);
-      if (argumentCount == 0) {
-        continue;
-      }
-      if (isRecord && methodNode.name.equals("<init>")) {
-        // skip record constructors, cannot rely on them because of the canonical one
-        // use the equals method for this
-        continue;
-      }
-      if (methodNode.parameters != null
-          && !methodNode.parameters.isEmpty()
-          && SpringHelper.isSpringUsingOnlyMethodParameters(DebuggerAgent.getInstrumentation())) {
-        reportInstrumentationFails(
-            definitions,
-            fullyQualifiedClassName,
-            "Method Parameters attribute detected, instrumentation not supported");
-        return false;
-      } else {
-        // we found at leat a method with one parameter if name is not present we can stop there
-        break;
-      }
+    /*
+     * Because of this bug (https://bugs.openjdk.org/browse/JDK-8240908), classes compiled with
+     * method parameters (javac -parameters) strip this attribute once retransformed
+     * Spring 6/Spring boot 3 rely exclusively on this attribute and may throw an exception
+     * if no attribute found.
+     * Note: Even if the attribute is preserved when transforming at load time, the fact that we have
+     * instrumented the class, we will retransform for removing the instrumentation and then the
+     * attribute is stripped. That's why we are preventing it even at load time.
+     */
+    private boolean checkMethodParameters(
+            ClassNode classNode, List<ProbeDefinition> definitions, String fullyQualifiedClassName) {
+        if (JAVA_AT_LEAST_17_0_20) {
+            // bug is fixed since JDK 19 and 17.0.20, no need to perform check
+            return true;
+        }
+        boolean isRecord = ASMHelper.isRecord(classNode);
+        // capping scanning of methods to 100 to avoid generated class with thousand of methods
+        // assuming that in those first 100 methods there is at least one with at least one parameter
+        for (int methodIdx = 0; methodIdx < classNode.methods.size() && methodIdx < 100; methodIdx++) {
+            MethodNode methodNode = classNode.methods.get(methodIdx);
+            int argumentCount = Type.getArgumentCount(methodNode.desc);
+            if (argumentCount == 0) {
+                continue;
+            }
+            if (isRecord && methodNode.name.equals("<init>")) {
+                // skip record constructors, cannot rely on them because of the canonical one
+                // use the equals method for this
+                continue;
+            }
+            if (methodNode.parameters != null
+                    && !methodNode.parameters.isEmpty()
+                    && SpringHelper.isSpringUsingOnlyMethodParameters(DebuggerAgent.getInstrumentation())) {
+                reportInstrumentationFails(
+                        definitions,
+                        fullyQualifiedClassName,
+                        "Method Parameters attribute detected, instrumentation not supported");
+                return false;
+            } else {
+                // we found at leat a method with one parameter if name is not present we can stop there
+                break;
+            }
+        }
+        return true;
     }
-    return true;
-  }
 
-  /*
-   * Because of this bug (https://bugs.openjdk.org/browse/JDK-8376185), when a record using a type
-   * annotation is retransformed, the internal JVM representation of this record is corrupted
-   * and lead to exception in best cases but in JVM crashes in worst cases.
-   * Note: the bug happens only at retransform time and not instrumenting at load time. But the
-   * fact we have already instrumented the record at load time, will prevent us to remove the
-   * instrumentation because it needs a retransformation and will lead to corruption of the record
-   */
-  private boolean checkRecordTypeAnnotation(
-      ClassNode classNode, List<ProbeDefinition> definitions, String fullyQualifiedClassName) {
-    if (JAVA_AT_LEAST_25_0_4) {
-      return true;
-    }
-    if (!ASMHelper.isRecord(classNode)) {
-      return true;
-    }
-    if (classNode.fields == null || classNode.fields.isEmpty()) {
-      return true;
-    }
-    for (FieldNode field : classNode.fields) {
-      if ((field.visibleTypeAnnotations != null && !field.visibleTypeAnnotations.isEmpty())
-          || (field.invisibleTypeAnnotations != null
-              && !field.invisibleTypeAnnotations.isEmpty())) {
-        reportInstrumentationFails(
-            definitions,
-            fullyQualifiedClassName,
-            "Instrumentation of a record with type annotation is not supported");
-        return false;
-      }
+    /*
+     * Because of this bug (https://bugs.openjdk.org/browse/JDK-8376185), when a record using a type
+     * annotation is retransformed, the internal JVM representation of this record is corrupted
+     * and lead to exception in best cases but in JVM crashes in worst cases.
+     * Note: the bug happens only at retransform time and not instrumenting at load time. But the
+     * fact we have already instrumented the record at load time, will prevent us to remove the
+     * instrumentation because it needs a retransformation and will lead to corruption of the record
+     */
+    private boolean checkRecordTypeAnnotation(
+            ClassNode classNode, List<ProbeDefinition> definitions, String fullyQualifiedClassName) {
+        if (JAVA_AT_LEAST_25_0_4) {
+            return true;
+        }
+        if (!ASMHelper.isRecord(classNode)) {
+            return true;
+        }
+        if (classNode.fields == null || classNode.fields.isEmpty()) {
+            return true;
+        }
+        for (FieldNode field : classNode.fields) {
+            if ((field.visibleTypeAnnotations != null && !field.visibleTypeAnnotations.isEmpty())
+                    || (field.invisibleTypeAnnotations != null && !field.invisibleTypeAnnotations.isEmpty())) {
+                reportInstrumentationFails(
+                        definitions,
+                        fullyQualifiedClassName,
+                        "Instrumentation of a record with type annotation is not supported");
+                return false;
+            }
+        }
+        // no type annotation for components, not a problem
+        return true;
     }
-    // no type annotation for components, not a problem
-    return true;
-  }
 
-  private boolean skipInstrumentation(String classFilePath) {
-    if (definitionMatcher.isEmpty()) {
-      LOGGER.debug("No debugger definitions present.");
-      return true;
-    }
-    if (classFilePath == null) {
-      // in case of anonymous classes
-      return true;
+    private boolean skipInstrumentation(String classFilePath) {
+        if (definitionMatcher.isEmpty()) {
+            LOGGER.debug("No debugger definitions present.");
+            return true;
+        }
+        if (classFilePath == null) {
+            // in case of anonymous classes
+            return true;
+        }
+        // skip classes/packages that are part of debugger agent to avoid
+        // LinkageError: attempted duplicate class definition
+        // while retransforming a class used by instrumentation
+        return isDebuggerInternalClass(classFilePath);
     }
-    // skip classes/packages that are part of debugger agent to avoid
-    // LinkageError: attempted duplicate class definition
-    // while retransforming a class used by instrumentation
-    return isDebuggerInternalClass(classFilePath);
-  }
 
-  private byte[] transformTheWorld(
-      ClassLoader loader,
-      String classFilePath,
-      ProtectionDomain protectionDomain,
-      byte[] classfileBuffer) {
-    try {
-      if (classFilePath == null) { // in case of anonymous classes
-        return null;
-      }
-      if (loader == null) {
-        // Skipping bootstrap classloader
-        return null;
-      }
-      if (isExcludedFromTransformation(classFilePath)) {
-        return null;
-      }
-      if (!isIncludedForTransformation(classFilePath)) {
-        return null;
-      }
-      URL location = null;
-      if (protectionDomain != null) {
-        CodeSource codeSource = protectionDomain.getCodeSource();
-        if (codeSource != null) {
-          location = codeSource.getLocation();
+    private byte[] transformTheWorld(
+            ClassLoader loader, String classFilePath, ProtectionDomain protectionDomain, byte[] classfileBuffer) {
+        try {
+            if (classFilePath == null) { // in case of anonymous classes
+                return null;
+            }
+            if (loader == null) {
+                // Skipping bootstrap classloader
+                return null;
+            }
+            if (isExcludedFromTransformation(classFilePath)) {
+                return null;
+            }
+            if (!isIncludedForTransformation(classFilePath)) {
+                return null;
+            }
+            URL location = null;
+            if (protectionDomain != null) {
+                CodeSource codeSource = protectionDomain.getCodeSource();
+                if (codeSource != null) {
+                    location = codeSource.getLocation();
+                }
+            }
+            LOGGER.debug(
+                    "Parsing class '{}' {}B loaded from loader='{}' location={}",
+                    classFilePath,
+                    classfileBuffer.length,
+                    loader,
+                    location);
+            ClassNode classNode = parseClassFile(classFilePath, classfileBuffer);
+            if (isClassLoaderRelated(classNode)) {
+                // Skip ClassLoader classes
+                LOGGER.debug("Skipping ClassLoader class: {}", classFilePath);
+                excludeClasses.add(classFilePath);
+                return null;
+            }
+            List<ProbeDefinition> probes = new ArrayList<>();
+            Set<String> methodNames = new HashSet<>();
+            ClassFileLines classFileLines = new ClassFileLines(classNode);
+            for (MethodNode methodNode : classNode.methods) {
+                if (isMethodIncludedForTransformation(methodNode, classNode, methodNames)) {
+                    MethodInfo methodInfo = new MethodInfo(loader, classNode, methodNode, classFileLines);
+                    probeCreator.accept(methodInfo, probes);
+                }
+            }
+            boolean transformed = performInstrumentation(loader, classFilePath, probes, classNode);
+            if (transformed) {
+                return writeClassFile(probes, loader, classFilePath, classNode);
+            } else {
+                LOGGER.debug("Class not transformed: {}", classFilePath);
+            }
+        } catch (Throwable ex) {
+            LOGGER.warn("Cannot transform: ", ex);
+            writeToInstrumentationLog(classFilePath);
         }
-      }
-      LOGGER.debug(
-          "Parsing class '{}' {}B loaded from loader='{}' location={}",
-          classFilePath,
-          classfileBuffer.length,
-          loader,
-          location);
-      ClassNode classNode = parseClassFile(classFilePath, classfileBuffer);
-      if (isClassLoaderRelated(classNode)) {
-        // Skip ClassLoader classes
-        LOGGER.debug("Skipping ClassLoader class: {}", classFilePath);
-        excludeClasses.add(classFilePath);
         return null;
-      }
-      List<ProbeDefinition> probes = new ArrayList<>();
-      Set<String> methodNames = new HashSet<>();
-      ClassFileLines classFileLines = new ClassFileLines(classNode);
-      for (MethodNode methodNode : classNode.methods) {
-        if (isMethodIncludedForTransformation(methodNode, classNode, methodNames)) {
-          MethodInfo methodInfo = new MethodInfo(loader, classNode, methodNode, classFileLines);
-          probeCreator.accept(methodInfo, probes);
-        }
-      }
-      boolean transformed = performInstrumentation(loader, classFilePath, probes, classNode);
-      if (transformed) {
-        return writeClassFile(probes, loader, classFilePath, classNode);
-      } else {
-        LOGGER.debug("Class not transformed: {}", classFilePath);
-      }
-    } catch (Throwable ex) {
-      LOGGER.warn("Cannot transform: ", ex);
-      writeToInstrumentationLog(classFilePath);
     }
-    return null;
-  }
 
-  private boolean isMethodIncludedForTransformation(
-      MethodNode methodNode, ClassNode classNode, Set<String> methodNames) {
-    if (methodNode.name.equals("<clinit>")) {
-      // skip static class initializer
-      return false;
-    }
-    String fqnMethod = classNode.name + "::" + methodNode.name;
-    if (excludeMethods.contains(fqnMethod)) {
-      LOGGER.debug("Skipping method: {}", fqnMethod);
-      return false;
+    private boolean isMethodIncludedForTransformation(
+            MethodNode methodNode, ClassNode classNode, Set<String> methodNames) {
+        if (methodNode.name.equals("<clinit>")) {
+            // skip static class initializer
+            return false;
+        }
+        String fqnMethod = classNode.name + "::" + methodNode.name;
+        if (excludeMethods.contains(fqnMethod)) {
+            LOGGER.debug("Skipping method: {}", fqnMethod);
+            return false;
+        }
+        return methodNames.add(methodNode.name);
     }
-    return methodNames.add(methodNode.name);
-  }
-
-  private void createMethodProbe(MethodInfo methodInfo, List<ProbeDefinition> probes) {
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(RandomUtils.randomUUID().toString(), 0)
-            .where(methodInfo.getClassNode().name, methodInfo.getMethodNode().name)
-            .captureSnapshot(false)
-            .build();
-    probe.initSamplers();
-    probes.add(probe);
-  }
 
-  private void createLineProbes(MethodInfo methodInfo, List<ProbeDefinition> probes) {
-    if (methodInfo.getMethodName().equals("<init>")) {
-      // skip constructor for now to avoid dealing with code before super calls
-      return;
+    private void createMethodProbe(MethodInfo methodInfo, List<ProbeDefinition> probes) {
+        LogProbe probe = LogProbe.builder()
+                .probeId(RandomUtils.randomUUID().toString(), 0)
+                .where(methodInfo.getClassNode().name, methodInfo.getMethodNode().name)
+                .captureSnapshot(false)
+                .build();
+        probe.initSamplers();
+        probes.add(probe);
     }
-    if ((methodInfo.getMethodNode().access & Opcodes.ACC_SYNTHETIC) != 0) {
-      // skip synthetic methods
-      return;
-    }
-    List<Integer> lineNumbers = getLineNumbers(methodInfo.getMethodNode());
-    for (Integer lineNumber : lineNumbers) {
-      LogProbe probe =
-          LogProbe.builder()
-              .probeId(RandomUtils.randomUUID().toString(), 0)
-              .where(methodInfo.getSourceFileName(), lineNumber)
-              .captureSnapshot(false)
-              .build();
-      probes.add(probe);
-    }
-  }
 
-  private boolean isClassLoaderRelated(ClassNode classNode) {
-    return classNode.superName.equals("java/lang/ClassLoader")
-        || classNode.superName.equals("java/net/URLClassLoader")
-        || excludeClasses.contains(classNode.superName);
-  }
-
-  private synchronized void writeToInstrumentationLog(String classFilePath) {
-    try (FileWriter writer = new FileWriter("/tmp/debugger/instrumentation.log", true)) {
-      writer.write(classFilePath);
-      writer.write("\n");
-    } catch (Exception ex) {
-      LOGGER.warn("Cannot write to instrumentation.log", ex);
+    private void createLineProbes(MethodInfo methodInfo, List<ProbeDefinition> probes) {
+        if (methodInfo.getMethodName().equals("<init>")) {
+            // skip constructor for now to avoid dealing with code before super calls
+            return;
+        }
+        if ((methodInfo.getMethodNode().access & Opcodes.ACC_SYNTHETIC) != 0) {
+            // skip synthetic methods
+            return;
+        }
+        List<Integer> lineNumbers = getLineNumbers(methodInfo.getMethodNode());
+        for (Integer lineNumber : lineNumbers) {
+            LogProbe probe = LogProbe.builder()
+                    .probeId(RandomUtils.randomUUID().toString(), 0)
+                    .where(methodInfo.getSourceFileName(), lineNumber)
+                    .captureSnapshot(false)
+                    .build();
+            probes.add(probe);
+        }
     }
-  }
-
-  public ProbeImplementation instrumentTheWorldResolver(int probeIndex) {
-    return probeMetadata.getProbe(probeIndex);
-  }
 
-  private boolean isExcludedFromTransformation(String classFilePath) {
-    if (classFilePath.startsWith("com/datadog/debugger/")
-        || classFilePath.startsWith("com/timgroup/statsd/")) {
-      // Skipping classes that are used to capture and send snapshots
-      return true;
-    }
-    if (excludeClasses.contains(classFilePath)) {
-      return true;
-    }
-    if (excludeTrie.hasMatchingPrefix(classFilePath)) {
-      return true;
+    private boolean isClassLoaderRelated(ClassNode classNode) {
+        return classNode.superName.equals("java/lang/ClassLoader")
+                || classNode.superName.equals("java/net/URLClassLoader")
+                || excludeClasses.contains(classNode.superName);
     }
-    return false;
-  }
 
-  private boolean isIncludedForTransformation(String classFilePath) {
-    if (includeClasses.contains(classFilePath)) {
-      return true;
-    }
-    if (includeTrie.hasMatchingPrefix(classFilePath)) {
-      return true;
+    private synchronized void writeToInstrumentationLog(String classFilePath) {
+        try (FileWriter writer = new FileWriter("/tmp/debugger/instrumentation.log", true)) {
+            writer.write(classFilePath);
+            writer.write("\n");
+        } catch (Exception ex) {
+            LOGGER.warn("Cannot write to instrumentation.log", ex);
+        }
     }
-    return false;
-  }
 
-  private boolean instrumentationIsAllowed(
-      String fullyQualifiedClassName, List<ProbeDefinition> definitions) {
-    if (denyListHelper.isDenied(fullyQualifiedClassName)) {
-      LOGGER.debug("Instrumentation denied for {}", fullyQualifiedClassName);
-      InstrumentationResult result =
-          InstrumentationResult.Factory.blocked(
-              fullyQualifiedClassName,
-              definitions,
-              new DiagnosticMessage(
-                  DiagnosticMessage.Kind.WARN,
-                  "Instrumentation denied for " + fullyQualifiedClassName));
-      notifyBlockedDefinitions(definitions, result);
-      return false;
+    public ProbeImplementation instrumentTheWorldResolver(int probeIndex) {
+        return probeMetadata.getProbe(probeIndex);
     }
-    if (!allowListHelper.isAllowAll() && !allowListHelper.isAllowed(fullyQualifiedClassName)) {
-      LOGGER.debug("Instrumentation not allowed for {}", fullyQualifiedClassName);
-      InstrumentationResult result =
-          InstrumentationResult.Factory.blocked(
-              fullyQualifiedClassName,
-              definitions,
-              new DiagnosticMessage(
-                  DiagnosticMessage.Kind.WARN,
-                  "Instrumentation not allowed for " + fullyQualifiedClassName));
-      notifyBlockedDefinitions(definitions, result);
-      return false;
-    }
-    return true;
-  }
-
-  private ClassNode parseClassFile(String classFilePath, byte[] classfileBuffer) {
-    ClassReader reader = new ClassReader(classfileBuffer);
-    dumpOriginalClassFile(classFilePath, classfileBuffer);
-    ClassNode classNode = new ClassNode();
-    reader.accept(classNode, ClassReader.SKIP_FRAMES);
-    return classNode;
-  }
 
-  private byte[] writeClassFile(
-      List<ProbeDefinition> definitions,
-      ClassLoader loader,
-      String classFilePath,
-      ClassNode classNode) {
-    if ((classNode.version & 0xFF) < Opcodes.V1_8) {
-      // Class file version must be at least 1.8 (52)
-      classNode.version = Opcodes.V1_8;
+    private boolean isExcludedFromTransformation(String classFilePath) {
+        if (classFilePath.startsWith("com/datadog/debugger/") || classFilePath.startsWith("com/timgroup/statsd/")) {
+            // Skipping classes that are used to capture and send snapshots
+            return true;
+        }
+        if (excludeClasses.contains(classFilePath)) {
+            return true;
+        }
+        if (excludeTrie.hasMatchingPrefix(classFilePath)) {
+            return true;
+        }
+        return false;
     }
-    ClassWriter writer = new SafeClassWriter(loader);
-    ClassVisitor visitor = new JsrInliningClassVisitor(writer);
-    LOGGER.debug("Generating bytecode for class: {}", Strings.getClassName(classFilePath));
-    try {
-      classNode.accept(visitor);
-    } catch (Throwable t) {
-      LOGGER.error("Cannot write classfile for class: {} Exception: ", classFilePath, t);
-      reportInstrumentationFails(definitions, Strings.getClassName(classFilePath), t.toString());
-      return null;
+
+    private boolean isIncludedForTransformation(String classFilePath) {
+        if (includeClasses.contains(classFilePath)) {
+            return true;
+        }
+        if (includeTrie.hasMatchingPrefix(classFilePath)) {
+            return true;
+        }
+        return false;
     }
-    byte[] data = writer.toByteArray();
-    dumpInstrumentedClassFile(classFilePath, data);
-    verifyByteCode(classFilePath, data);
-    return data;
-  }
 
-  private void verifyByteCode(String classFilePath, byte[] classFile) {
-    if (!config.isDynamicInstrumentationVerifyByteCode()) {
-      return;
+    private boolean instrumentationIsAllowed(String fullyQualifiedClassName, List<ProbeDefinition> definitions) {
+        if (denyListHelper.isDenied(fullyQualifiedClassName)) {
+            LOGGER.debug("Instrumentation denied for {}", fullyQualifiedClassName);
+            InstrumentationResult result = InstrumentationResult.Factory.blocked(
+                    fullyQualifiedClassName,
+                    definitions,
+                    new DiagnosticMessage(
+                            DiagnosticMessage.Kind.WARN, "Instrumentation denied for " + fullyQualifiedClassName));
+            notifyBlockedDefinitions(definitions, result);
+            return false;
+        }
+        if (!allowListHelper.isAllowAll() && !allowListHelper.isAllowed(fullyQualifiedClassName)) {
+            LOGGER.debug("Instrumentation not allowed for {}", fullyQualifiedClassName);
+            InstrumentationResult result = InstrumentationResult.Factory.blocked(
+                    fullyQualifiedClassName,
+                    definitions,
+                    new DiagnosticMessage(
+                            DiagnosticMessage.Kind.WARN, "Instrumentation not allowed for " + fullyQualifiedClassName));
+            notifyBlockedDefinitions(definitions, result);
+            return false;
+        }
+        return true;
     }
-    StringWriter stringWriter = new StringWriter();
-    PrintWriter printWriter = new PrintWriter(stringWriter);
-    ClassReader classReader = new ClassReader(classFile);
-    ClassNode classNode = new ClassNode();
-    classReader.accept(
-        new CheckClassAdapter(Opcodes.ASM9, classNode, false) {}, ClassReader.SKIP_DEBUG);
-    List<MethodNode> methods = classNode.methods;
-    for (MethodNode method : methods) {
-      BasicVerifier verifier = new BasicVerifier();
-      Analyzer<BasicValue> analyzer = new Analyzer<>(verifier);
-      try {
-        analyzer.analyze(classNode.name, method);
-      } catch (AnalyzerException e) {
-        printWriter.printf(
-            "Error analyzing method '%s.%s%s':%n", classNode.name, method.name, method.desc);
-        e.printStackTrace(printWriter);
-      }
+
+    private ClassNode parseClassFile(String classFilePath, byte[] classfileBuffer) {
+        ClassReader reader = new ClassReader(classfileBuffer);
+        dumpOriginalClassFile(classFilePath, classfileBuffer);
+        ClassNode classNode = new ClassNode();
+        reader.accept(classNode, ClassReader.SKIP_FRAMES);
+        return classNode;
     }
-    printWriter.flush();
-    String result = stringWriter.toString();
-    if (!result.isEmpty()) {
-      LOGGER.warn("Verification of instrumented class {} failed", classFilePath);
-      LOGGER.debug("Verify result: {}", stringWriter);
-      throw new RuntimeException("Generated bytecode is invalid for " + classFilePath);
+
+    private byte[] writeClassFile(
+            List<ProbeDefinition> definitions, ClassLoader loader, String classFilePath, ClassNode classNode) {
+        if ((classNode.version & 0xFF) < Opcodes.V1_8) {
+            // Class file version must be at least 1.8 (52)
+            classNode.version = Opcodes.V1_8;
+        }
+        ClassWriter writer = new SafeClassWriter(loader);
+        ClassVisitor visitor = new JsrInliningClassVisitor(writer);
+        LOGGER.debug("Generating bytecode for class: {}", Strings.getClassName(classFilePath));
+        try {
+            classNode.accept(visitor);
+        } catch (Throwable t) {
+            LOGGER.error("Cannot write classfile for class: {} Exception: ", classFilePath, t);
+            reportInstrumentationFails(definitions, Strings.getClassName(classFilePath), t.toString());
+            return null;
+        }
+        byte[] data = writer.toByteArray();
+        dumpInstrumentedClassFile(classFilePath, data);
+        verifyByteCode(classFilePath, data);
+        return data;
     }
-  }
 
-  private boolean performInstrumentation(
-      ClassLoader loader,
-      String fullyQualifiedClassName,
-      List<ProbeDefinition> definitions,
-      ClassNode classNode) {
-    boolean transformed = false;
-    ClassFileLines classFileLines = new ClassFileLines(classNode);
-    Set<ProbeDefinition> remainingDefinitions = new HashSet<>(definitions);
-    for (MethodNode methodNode : classNode.methods) {
-      List<ProbeDefinition> matchingDefs = new ArrayList<>();
-      for (ProbeDefinition definition : definitions) {
-        Where.MethodMatching methodMatching =
-            definition.getWhere().isMethodMatching(methodNode, classFileLines);
-        if (remainingDefinitions.contains(definition)) {
-          if (methodMatching == Where.MethodMatching.MATCH) {
-            // method matches, add into collection of definitions to instrument
-            matchingDefs.add(definition);
-          }
-          if (methodMatching == Where.MethodMatching.MATCH
-              || methodMatching == Where.MethodMatching.SKIP)
-            // match or need to skip instrumentation (because bridge) remove from remaining
-            // definitions to avoid reporting error
-            remainingDefinitions.remove(definition);
+    private void verifyByteCode(String classFilePath, byte[] classFile) {
+        if (!config.isDynamicInstrumentationVerifyByteCode()) {
+            return;
+        }
+        StringWriter stringWriter = new StringWriter();
+        PrintWriter printWriter = new PrintWriter(stringWriter);
+        ClassReader classReader = new ClassReader(classFile);
+        ClassNode classNode = new ClassNode();
+        classReader.accept(new CheckClassAdapter(Opcodes.ASM9, classNode, false) {}, ClassReader.SKIP_DEBUG);
+        List<MethodNode> methods = classNode.methods;
+        for (MethodNode method : methods) {
+            BasicVerifier verifier = new BasicVerifier();
+            Analyzer<BasicValue> analyzer = new Analyzer<>(verifier);
+            try {
+                analyzer.analyze(classNode.name, method);
+            } catch (AnalyzerException e) {
+                printWriter.printf("Error analyzing method '%s.%s%s':%n", classNode.name, method.name, method.desc);
+                e.printStackTrace(printWriter);
+            }
+        }
+        printWriter.flush();
+        String result = stringWriter.toString();
+        if (!result.isEmpty()) {
+            LOGGER.warn("Verification of instrumented class {} failed", classFilePath);
+            LOGGER.debug("Verify result: {}", stringWriter);
+            throw new RuntimeException("Generated bytecode is invalid for " + classFilePath);
         }
-      }
-      if (matchingDefs.isEmpty()) {
-        continue;
-      }
-      if (LOGGER.isDebugEnabled()) {
-        List<String> probeIds = matchingDefs.stream().map(ProbeDefinition::getId).collect(toList());
-        LOGGER.debug(
-            "Instrumenting method: {}.{}{} for probe ids: {}",
-            fullyQualifiedClassName,
-            methodNode.name,
-            methodNode.desc,
-            probeIds);
-      }
-      MethodInfo methodInfo = new MethodInfo(loader, classNode, methodNode, classFileLines);
-      InstrumentationResult result = applyInstrumentation(methodInfo, matchingDefs);
-      transformed |= result.isInstalled();
-      handleInstrumentationResult(matchingDefs, result);
     }
-    for (ProbeDefinition definition : remainingDefinitions) {
-      reportLocationNotFound(definition, classNode.name, definition.getWhere().getMethodName());
+
+    private boolean performInstrumentation(
+            ClassLoader loader,
+            String fullyQualifiedClassName,
+            List<ProbeDefinition> definitions,
+            ClassNode classNode) {
+        boolean transformed = false;
+        ClassFileLines classFileLines = new ClassFileLines(classNode);
+        Set<ProbeDefinition> remainingDefinitions = new HashSet<>(definitions);
+        for (MethodNode methodNode : classNode.methods) {
+            List<ProbeDefinition> matchingDefs = new ArrayList<>();
+            for (ProbeDefinition definition : definitions) {
+                Where.MethodMatching methodMatching =
+                        definition.getWhere().isMethodMatching(methodNode, classFileLines);
+                if (remainingDefinitions.contains(definition)) {
+                    if (methodMatching == Where.MethodMatching.MATCH) {
+                        // method matches, add into collection of definitions to instrument
+                        matchingDefs.add(definition);
+                    }
+                    if (methodMatching == Where.MethodMatching.MATCH || methodMatching == Where.MethodMatching.SKIP)
+                        // match or need to skip instrumentation (because bridge) remove from remaining
+                        // definitions to avoid reporting error
+                        remainingDefinitions.remove(definition);
+                }
+            }
+            if (matchingDefs.isEmpty()) {
+                continue;
+            }
+            if (LOGGER.isDebugEnabled()) {
+                List<String> probeIds =
+                        matchingDefs.stream().map(ProbeDefinition::getId).collect(toList());
+                LOGGER.debug(
+                        "Instrumenting method: {}.{}{} for probe ids: {}",
+                        fullyQualifiedClassName,
+                        methodNode.name,
+                        methodNode.desc,
+                        probeIds);
+            }
+            MethodInfo methodInfo = new MethodInfo(loader, classNode, methodNode, classFileLines);
+            InstrumentationResult result = applyInstrumentation(methodInfo, matchingDefs);
+            transformed |= result.isInstalled();
+            handleInstrumentationResult(matchingDefs, result);
+        }
+        for (ProbeDefinition definition : remainingDefinitions) {
+            reportLocationNotFound(
+                    definition, classNode.name, definition.getWhere().getMethodName());
+        }
+        return transformed;
     }
-    return transformed;
-  }
 
-  private void handleInstrumentationResult(
-      List<ProbeDefinition> definitions, InstrumentationResult result) {
-    for (ProbeDefinition definition : definitions) {
-      if (listener != null) {
-        listener.instrumentationResult(definition, result);
-      }
-      if (definition instanceof ExceptionProbe) {
-        // do not report diagnostics for exception probes
-        continue;
-      }
-      List<DiagnosticMessage> diagnosticMessages =
-          result.getDiagnostics().get(definition.getProbeId());
-      if (!result.getDiagnostics().isEmpty()) {
-        addDiagnostics(definition, diagnosticMessages);
-      }
-      if (result.isInstalled()) {
-        debuggerSink.addInstalled(definition.getProbeId());
-      } else if (result.isBlocked()) {
-        debuggerSink.addBlocked(definition.getProbeId());
-      }
+    private void handleInstrumentationResult(List<ProbeDefinition> definitions, InstrumentationResult result) {
+        for (ProbeDefinition definition : definitions) {
+            if (listener != null) {
+                listener.instrumentationResult(definition, result);
+            }
+            if (definition instanceof ExceptionProbe) {
+                // do not report diagnostics for exception probes
+                continue;
+            }
+            List<DiagnosticMessage> diagnosticMessages = result.getDiagnostics().get(definition.getProbeId());
+            if (!result.getDiagnostics().isEmpty()) {
+                addDiagnostics(definition, diagnosticMessages);
+            }
+            if (result.isInstalled()) {
+                debuggerSink.addInstalled(definition.getProbeId());
+            } else if (result.isBlocked()) {
+                debuggerSink.addBlocked(definition.getProbeId());
+            }
+        }
     }
-  }
 
-  private void reportLocationNotFound(
-      ProbeDefinition definition, String className, String methodName) {
-    if (methodName != null) {
-      String signature = definition.getWhere().getSignature();
-      signature = signature == null ? "" : signature;
-      String msg = String.format(CANNOT_FIND_METHOD, className, methodName, signature);
-      reportErrorForAllProbes(singletonList(definition), msg);
-      return;
+    private void reportLocationNotFound(ProbeDefinition definition, String className, String methodName) {
+        if (methodName != null) {
+            String signature = definition.getWhere().getSignature();
+            signature = signature == null ? "" : signature;
+            String msg = String.format(CANNOT_FIND_METHOD, className, methodName, signature);
+            reportErrorForAllProbes(singletonList(definition), msg);
+            return;
+        }
+        // This is a line probe, so we don't report line not found because the line may be found later
+        // on a separate class files because probe was set on an inner/top-level class
     }
-    // This is a line probe, so we don't report line not found because the line may be found later
-    // on a separate class files because probe was set on an inner/top-level class
-  }
 
-  private void reportInstrumentationFails(
-      List<ProbeDefinition> definitions, String className, String errorMsg) {
-    String msg = String.format(INSTRUMENTATION_FAILS, className, errorMsg);
-    reportErrorForAllProbes(definitions, msg);
-  }
+    private void reportInstrumentationFails(List<ProbeDefinition> definitions, String className, String errorMsg) {
+        String msg = String.format(INSTRUMENTATION_FAILS, className, errorMsg);
+        reportErrorForAllProbes(definitions, msg);
+    }
 
-  private void reportErrorForAllProbes(List<ProbeDefinition> definitions, String msg) {
-    DiagnosticMessage diagnosticMessage = new DiagnosticMessage(DiagnosticMessage.Kind.ERROR, msg);
-    for (ProbeDefinition definition : definitions) {
-      addDiagnostics(definition, singletonList(diagnosticMessage));
+    private void reportErrorForAllProbes(List<ProbeDefinition> definitions, String msg) {
+        DiagnosticMessage diagnosticMessage = new DiagnosticMessage(DiagnosticMessage.Kind.ERROR, msg);
+        for (ProbeDefinition definition : definitions) {
+            addDiagnostics(definition, singletonList(diagnosticMessage));
+        }
     }
-  }
 
-  private void addDiagnostics(
-      ProbeDefinition definition, List<DiagnosticMessage> diagnosticMessages) {
-    debuggerSink.addDiagnostics(definition.getProbeId(), diagnosticMessages);
-    LOGGER.debug("Diagnostic messages for definition[{}]: {}", definition, diagnosticMessages);
-  }
+    private void addDiagnostics(ProbeDefinition definition, List<DiagnosticMessage> diagnosticMessages) {
+        debuggerSink.addDiagnostics(definition.getProbeId(), diagnosticMessages);
+        LOGGER.debug("Diagnostic messages for definition[{}]: {}", definition, diagnosticMessages);
+    }
 
-  private void notifyBlockedDefinitions(
-      List<ProbeDefinition> definitions, InstrumentationResult result) {
-    if (listener != null) {
-      for (ProbeDefinition definition : definitions) {
-        listener.instrumentationResult(definition, result);
-      }
+    private void notifyBlockedDefinitions(List<ProbeDefinition> definitions, InstrumentationResult result) {
+        if (listener != null) {
+            for (ProbeDefinition definition : definitions) {
+                listener.instrumentationResult(definition, result);
+            }
+        }
     }
-  }
 
-  private InstrumentationResult applyInstrumentation(
-      MethodInfo methodInfo, List<ProbeDefinition> definitions) {
-    Map<ProbeId, List<DiagnosticMessage>> diagnostics = new HashMap<>();
-    definitions.forEach(
-        probeDefinition -> {
-          probeDefinition.buildLocation(methodInfo);
-          diagnostics.put(probeDefinition.getProbeId(), new ArrayList<>());
+    private InstrumentationResult applyInstrumentation(MethodInfo methodInfo, List<ProbeDefinition> definitions) {
+        Map<ProbeId, List<DiagnosticMessage>> diagnostics = new HashMap<>();
+        definitions.forEach(probeDefinition -> {
+            probeDefinition.buildLocation(methodInfo);
+            diagnostics.put(probeDefinition.getProbeId(), new ArrayList<>());
         });
-    InstrumentationResult.Status status = preCheckInstrumentation(diagnostics, methodInfo);
-    if (status != InstrumentationResult.Status.ERROR) {
-      try {
-        List<ToInstrumentInfo> toInstruments =
-            filterAndSortDefinitions(definitions, methodInfo.getClassFileLines());
-        for (ToInstrumentInfo toInstrumentInfo : toInstruments) {
-          ProbeDefinition definition = toInstrumentInfo.definition;
-          List<DiagnosticMessage> probeDiagnostics = diagnostics.get(definition.getProbeId());
-          status =
-              definition.instrument(methodInfo, probeDiagnostics, toInstrumentInfo.probeIndices);
+        InstrumentationResult.Status status = preCheckInstrumentation(diagnostics, methodInfo);
+        if (status != InstrumentationResult.Status.ERROR) {
+            try {
+                List<ToInstrumentInfo> toInstruments =
+                        filterAndSortDefinitions(definitions, methodInfo.getClassFileLines());
+                for (ToInstrumentInfo toInstrumentInfo : toInstruments) {
+                    ProbeDefinition definition = toInstrumentInfo.definition;
+                    List<DiagnosticMessage> probeDiagnostics = diagnostics.get(definition.getProbeId());
+                    status = definition.instrument(methodInfo, probeDiagnostics, toInstrumentInfo.probeIndices);
+                }
+            } catch (Throwable t) {
+                LOGGER.warn("Exception during instrumentation: ", t);
+                status = InstrumentationResult.Status.ERROR;
+                addDiagnosticForAllProbes(new DiagnosticMessage(DiagnosticMessage.Kind.ERROR, t), diagnostics);
+            }
         }
-      } catch (Throwable t) {
-        LOGGER.warn("Exception during instrumentation: ", t);
-        status = InstrumentationResult.Status.ERROR;
-        addDiagnosticForAllProbes(
-            new DiagnosticMessage(DiagnosticMessage.Kind.ERROR, t), diagnostics);
-      }
+        return new InstrumentationResult(status, diagnostics, methodInfo);
     }
-    return new InstrumentationResult(status, diagnostics, methodInfo);
-  }
 
-  static class ToInstrumentInfo {
-    final ProbeDefinition definition;
-    final List<Integer> probeIndices;
+    static class ToInstrumentInfo {
+        final ProbeDefinition definition;
+        final List<Integer> probeIndices;
 
-    ToInstrumentInfo(ProbeDefinition definition, List<Integer> probeIndices) {
-      this.definition = definition;
-      this.probeIndices = probeIndices;
+        ToInstrumentInfo(ProbeDefinition definition, List<Integer> probeIndices) {
+            this.definition = definition;
+            this.probeIndices = probeIndices;
+        }
     }
-  }
 
-  private static boolean isCapturedContextProbe(ProbeDefinition definition) {
-    return definition instanceof LogProbe
-        || definition instanceof SpanDecorationProbe
-        || definition instanceof TriggerProbe;
-  }
+    private static boolean isCapturedContextProbe(ProbeDefinition definition) {
+        return definition instanceof LogProbe
+                || definition instanceof SpanDecorationProbe
+                || definition instanceof TriggerProbe;
+    }
 
-  private List<ToInstrumentInfo> filterAndSortDefinitions(
-      List<ProbeDefinition> definitions, ClassFileLines classFileLines) {
-    List<ToInstrumentInfo> toInstrument = new ArrayList<>();
-    List<ProbeDefinition> capturedContextProbes = new ArrayList<>();
-    Map<Where, List<ProbeDefinition>> capturedContextLineProbes = new HashMap<>();
-    boolean addedExceptionProbe = false;
-    for (ProbeDefinition definition : definitions) {
-      // Log and span decoration probe shared the same instrumentor: CaptureContextInstrumentor
-      // and therefore need to be instrumented once
-      // note: exception probes are log probes and are handled the same way
-      if (!config.isDistributedDebuggerEnabled() && definition instanceof TriggerProbe) {
-        LOGGER.debug(
-            "The distributed debugger feature is disabled. Trigger probes will not be installed.");
-      } else if (isCapturedContextProbe(definition)) {
-        if (definition.isLineProbe()) {
-          capturedContextLineProbes
-              .computeIfAbsent(definition.getWhere(), key -> new ArrayList<>())
-              .add(definition);
-        } else {
-          if (definition instanceof ExceptionProbe) {
-            if (addedExceptionProbe) {
-              continue;
+    private List<ToInstrumentInfo> filterAndSortDefinitions(
+            List<ProbeDefinition> definitions, ClassFileLines classFileLines) {
+        List<ToInstrumentInfo> toInstrument = new ArrayList<>();
+        List<ProbeDefinition> capturedContextProbes = new ArrayList<>();
+        Map<Where, List<ProbeDefinition>> capturedContextLineProbes = new HashMap<>();
+        boolean addedExceptionProbe = false;
+        for (ProbeDefinition definition : definitions) {
+            // Log and span decoration probe shared the same instrumentor: CaptureContextInstrumentor
+            // and therefore need to be instrumented once
+            // note: exception probes are log probes and are handled the same way
+            if (!config.isDistributedDebuggerEnabled() && definition instanceof TriggerProbe) {
+                LOGGER.debug("The distributed debugger feature is disabled. Trigger probes will not be installed.");
+            } else if (isCapturedContextProbe(definition)) {
+                if (definition.isLineProbe()) {
+                    capturedContextLineProbes
+                            .computeIfAbsent(definition.getWhere(), key -> new ArrayList<>())
+                            .add(definition);
+                } else {
+                    if (definition instanceof ExceptionProbe) {
+                        if (addedExceptionProbe) {
+                            continue;
+                        }
+                        // only add one exception probe to the list of probes to instrument
+                        // to have only one instance (1 probeId) of exception probe to handle all exceptions
+                        addedExceptionProbe = true;
+                    }
+                    capturedContextProbes.add(definition);
+                }
+            } else {
+                int idx = probeMetadata.addProbe(definition);
+                toInstrument.add(new ToInstrumentInfo(definition, singletonList(idx)));
             }
-            // only add one exception probe to the list of probes to instrument
-            // to have only one instance (1 probeId) of exception probe to handle all exceptions
-            addedExceptionProbe = true;
-          }
-          capturedContextProbes.add(definition);
         }
-      } else {
-        int idx = probeMetadata.addProbe(definition);
-        toInstrument.add(new ToInstrumentInfo(definition, singletonList(idx)));
-      }
-    }
-    processCapturedContextLineProbes(capturedContextLineProbes, probeMetadata, toInstrument);
-    processCapturedContextMethodProbes(
-        classFileLines, capturedContextProbes, probeMetadata, toInstrument);
-    // ordering: metric < log < span decoration < span
-    toInstrument.sort(
-        (info1, info2) -> {
-          int idx1 = PROBE_ORDER.indexOf(info1.definition.getClass());
-          int idx2 = PROBE_ORDER.indexOf(info2.definition.getClass());
-          return Integer.compare(idx1, idx2);
+        processCapturedContextLineProbes(capturedContextLineProbes, probeMetadata, toInstrument);
+        processCapturedContextMethodProbes(classFileLines, capturedContextProbes, probeMetadata, toInstrument);
+        // ordering: metric < log < span decoration < span
+        toInstrument.sort((info1, info2) -> {
+            int idx1 = PROBE_ORDER.indexOf(info1.definition.getClass());
+            int idx2 = PROBE_ORDER.indexOf(info2.definition.getClass());
+            return Integer.compare(idx1, idx2);
         });
-    return toInstrument;
-  }
-
-  private static void processCapturedContextMethodProbes(
-      ClassFileLines classFileLines,
-      List<ProbeDefinition> capturedContextProbes,
-      ProbeMetadata probeMetadata,
-      List<ToInstrumentInfo> toInstrument) {
-    if (capturedContextProbes.isEmpty()) {
-      return;
+        return toInstrument;
     }
-    List<Integer> probeIndices = new ArrayList<>();
-    for (ProbeDefinition definition : capturedContextProbes) {
-      probeIndices.add(probeMetadata.addProbe(definition));
+
+    private static void processCapturedContextMethodProbes(
+            ClassFileLines classFileLines,
+            List<ProbeDefinition> capturedContextProbes,
+            ProbeMetadata probeMetadata,
+            List<ToInstrumentInfo> toInstrument) {
+        if (capturedContextProbes.isEmpty()) {
+            return;
+        }
+        List<Integer> probeIndices = new ArrayList<>();
+        for (ProbeDefinition definition : capturedContextProbes) {
+            probeIndices.add(probeMetadata.addProbe(definition));
+        }
+        ProbeDefinition referenceDefinition = selectReferenceDefinition(capturedContextProbes, classFileLines);
+        toInstrument.add(new ToInstrumentInfo(referenceDefinition, probeIndices));
     }
-    ProbeDefinition referenceDefinition =
-        selectReferenceDefinition(capturedContextProbes, classFileLines);
-    toInstrument.add(new ToInstrumentInfo(referenceDefinition, probeIndices));
-  }
 
-  private static void processCapturedContextLineProbes(
-      Map<Where, List<ProbeDefinition>> lineProbes,
-      ProbeMetadata probeMetadata,
-      List<ToInstrumentInfo> toInstrument) {
-    for (Map.Entry<Where, List<ProbeDefinition>> entry : lineProbes.entrySet()) {
-      if (entry.getValue().isEmpty()) {
-        continue;
-      }
-      List<Integer> probeIndices = new ArrayList<>();
-      for (ProbeDefinition definition : entry.getValue()) {
-        probeIndices.add(probeMetadata.addProbe(definition));
-      }
-      toInstrument.add(new ToInstrumentInfo(entry.getValue().get(0), probeIndices));
+    private static void processCapturedContextLineProbes(
+            Map<Where, List<ProbeDefinition>> lineProbes,
+            ProbeMetadata probeMetadata,
+            List<ToInstrumentInfo> toInstrument) {
+        for (Map.Entry<Where, List<ProbeDefinition>> entry : lineProbes.entrySet()) {
+            if (entry.getValue().isEmpty()) {
+                continue;
+            }
+            List<Integer> probeIndices = new ArrayList<>();
+            for (ProbeDefinition definition : entry.getValue()) {
+                probeIndices.add(probeMetadata.addProbe(definition));
+            }
+            toInstrument.add(new ToInstrumentInfo(entry.getValue().get(0), probeIndices));
+        }
     }
-  }
 
-  // Log & Span Decoration probes share the same instrumentor so only one definition should be
-  // used to generate the instrumentation. This method generate a synthetic definition that
-  // match the type of the probe to instrument: if at least one probe is LogProbe then we are
-  // creating a LogProbe definition. The synthetic definition contains the union of all the capture,
-  // snapshot and evaluateAt parameters.
-  private static ProbeDefinition selectReferenceDefinition(
-      List<ProbeDefinition> capturedContextProbes, ClassFileLines classFileLines) {
-    boolean hasLogProbe = false;
-    boolean hasOnlyExceptionProbe =
-        capturedContextProbes.stream().allMatch(def -> def instanceof ExceptionProbe);
-    MethodLocation evaluateAt = MethodLocation.EXIT;
-    LogProbe.Capture capture = null;
-    boolean captureSnapshot = false;
-    ProbeCondition probeCondition = null;
-    Where where = capturedContextProbes.get(0).getWhere();
-    ProbeId probeId = capturedContextProbes.get(0).getProbeId();
-    for (ProbeDefinition definition : capturedContextProbes) {
-      if (definition instanceof LogProbe) {
-        if (definition instanceof ForceMethodInstrumentation) {
-          where = Where.convertLineToMethod(definition.getWhere(), classFileLines);
+    // Log & Span Decoration probes share the same instrumentor so only one definition should be
+    // used to generate the instrumentation. This method generate a synthetic definition that
+    // match the type of the probe to instrument: if at least one probe is LogProbe then we are
+    // creating a LogProbe definition. The synthetic definition contains the union of all the capture,
+    // snapshot and evaluateAt parameters.
+    private static ProbeDefinition selectReferenceDefinition(
+            List<ProbeDefinition> capturedContextProbes, ClassFileLines classFileLines) {
+        boolean hasLogProbe = false;
+        boolean hasOnlyExceptionProbe = capturedContextProbes.stream().allMatch(def -> def instanceof ExceptionProbe);
+        MethodLocation evaluateAt = MethodLocation.EXIT;
+        LogProbe.Capture capture = null;
+        boolean captureSnapshot = false;
+        ProbeCondition probeCondition = null;
+        Where where = capturedContextProbes.get(0).getWhere();
+        ProbeId probeId = capturedContextProbes.get(0).getProbeId();
+        for (ProbeDefinition definition : capturedContextProbes) {
+            if (definition instanceof LogProbe) {
+                if (definition instanceof ForceMethodInstrumentation) {
+                    where = Where.convertLineToMethod(definition.getWhere(), classFileLines);
+                }
+                hasLogProbe = true;
+                LogProbe logProbe = (LogProbe) definition;
+                captureSnapshot = captureSnapshot | logProbe.isCaptureSnapshot();
+                capture = mergeCapture(capture, logProbe.getCapture());
+                if (probeCondition == null) {
+                    probeCondition = logProbe.getProbeCondition();
+                }
+            }
+            if (definition.getEvaluateAt() == MethodLocation.ENTRY
+                    || definition.getEvaluateAt() == MethodLocation.DEFAULT) {
+                evaluateAt = definition.getEvaluateAt();
+            }
         }
-        hasLogProbe = true;
-        LogProbe logProbe = (LogProbe) definition;
-        captureSnapshot = captureSnapshot | logProbe.isCaptureSnapshot();
-        capture = mergeCapture(capture, logProbe.getCapture());
-        if (probeCondition == null) {
-          probeCondition = logProbe.getProbeCondition();
+        if (hasOnlyExceptionProbe) {
+            // only exception probes return the first one
+            return capturedContextProbes.get(0);
         }
-      }
-      if (definition.getEvaluateAt() == MethodLocation.ENTRY
-          || definition.getEvaluateAt() == MethodLocation.DEFAULT) {
-        evaluateAt = definition.getEvaluateAt();
-      }
-    }
-    if (hasOnlyExceptionProbe) {
-      // only exception probes return the first one
-      return capturedContextProbes.get(0);
-    }
-    if (hasLogProbe) {
-      return LogProbe.builder()
-          .probeId(probeId)
-          .when(probeCondition)
-          .where(where)
-          .evaluateAt(evaluateAt)
-          .capture(capture)
-          .captureSnapshot(captureSnapshot)
-          .build();
+        if (hasLogProbe) {
+            return LogProbe.builder()
+                    .probeId(probeId)
+                    .when(probeCondition)
+                    .where(where)
+                    .evaluateAt(evaluateAt)
+                    .capture(capture)
+                    .captureSnapshot(captureSnapshot)
+                    .build();
+        }
+        return SpanDecorationProbe.builder()
+                .probeId(probeId)
+                .where(where)
+                .evaluateAt(evaluateAt)
+                .build();
     }
-    return SpanDecorationProbe.builder()
-        .probeId(probeId)
-        .where(where)
-        .evaluateAt(evaluateAt)
-        .build();
-  }
 
-  private static LogProbe.Capture mergeCapture(
-      LogProbe.Capture current, LogProbe.Capture newCapture) {
-    if (current == null) {
-      return newCapture;
-    }
-    if (newCapture == null) {
-      return current;
+    private static LogProbe.Capture mergeCapture(LogProbe.Capture current, LogProbe.Capture newCapture) {
+        if (current == null) {
+            return newCapture;
+        }
+        if (newCapture == null) {
+            return current;
+        }
+        return new LogProbe.Capture(
+                Math.max(current.getMaxReferenceDepth(), newCapture.getMaxReferenceDepth()),
+                Math.max(current.getMaxCollectionSize(), newCapture.getMaxCollectionSize()),
+                Math.max(current.getMaxLength(), newCapture.getMaxLength()),
+                Math.max(current.getMaxFieldCount(), newCapture.getMaxFieldCount()));
     }
-    return new LogProbe.Capture(
-        Math.max(current.getMaxReferenceDepth(), newCapture.getMaxReferenceDepth()),
-        Math.max(current.getMaxCollectionSize(), newCapture.getMaxCollectionSize()),
-        Math.max(current.getMaxLength(), newCapture.getMaxLength()),
-        Math.max(current.getMaxFieldCount(), newCapture.getMaxFieldCount()));
-  }
 
-  private InstrumentationResult.Status preCheckInstrumentation(
-      Map<ProbeId, List<DiagnosticMessage>> diagnostics, MethodInfo methodInfo) {
-    if ((methodInfo.getMethodNode().access & (Opcodes.ACC_NATIVE | Opcodes.ACC_ABSTRACT)) != 0) {
-      if (!instrumentTheWorld) {
-        addDiagnosticForAllProbes(
-            new DiagnosticMessage(
-                DiagnosticMessage.Kind.ERROR, "Cannot instrument an abstract or native method"),
-            diagnostics);
-      }
-      return InstrumentationResult.Status.ERROR;
-    }
-    ClassLoader classLoader = methodInfo.getClassLoader();
-    if (classLoader != null
-        && classLoader.getClass().getTypeName().equals("sun.reflect.DelegatingClassLoader")) {
-      // This classloader is used when using reflection. This is a special classloader known
-      // by the JVM with special behavior. it cannot load other classes inside it (e.i. no
-      // delegation to parent classloader).
-      // Trying to instrument a method from this classloader result in an Exception/Error:
-      // java.lang.NoClassDefFoundError: sun/reflect/GeneratedMethodAccessor<n>
-      // Caused by: java.lang.ClassNotFoundException: sun.reflect.GeneratedMethodAccessor<n>
-      // source:
-      // https://github.com/openjdk/jdk/blob/1581e3faa06358f192799b3a89718028c7f6a24b/src/hotspot/share/classfile/javaClasses.cpp#L4392-L4412
-      if (!instrumentTheWorld) {
-        addDiagnosticForAllProbes(
-            new DiagnosticMessage(
-                DiagnosticMessage.Kind.ERROR, "Cannot instrument class in DelegatingClassLoader"),
-            diagnostics);
-      }
-      return InstrumentationResult.Status.ERROR;
+    private InstrumentationResult.Status preCheckInstrumentation(
+            Map<ProbeId, List<DiagnosticMessage>> diagnostics, MethodInfo methodInfo) {
+        if ((methodInfo.getMethodNode().access & (Opcodes.ACC_NATIVE | Opcodes.ACC_ABSTRACT)) != 0) {
+            if (!instrumentTheWorld) {
+                addDiagnosticForAllProbes(
+                        new DiagnosticMessage(
+                                DiagnosticMessage.Kind.ERROR, "Cannot instrument an abstract or native method"),
+                        diagnostics);
+            }
+            return InstrumentationResult.Status.ERROR;
+        }
+        ClassLoader classLoader = methodInfo.getClassLoader();
+        if (classLoader != null && classLoader.getClass().getTypeName().equals("sun.reflect.DelegatingClassLoader")) {
+            // This classloader is used when using reflection. This is a special classloader known
+            // by the JVM with special behavior. it cannot load other classes inside it (e.i. no
+            // delegation to parent classloader).
+            // Trying to instrument a method from this classloader result in an Exception/Error:
+            // java.lang.NoClassDefFoundError: sun/reflect/GeneratedMethodAccessor<n>
+            // Caused by: java.lang.ClassNotFoundException: sun.reflect.GeneratedMethodAccessor<n>
+            // source:
+            // https://github.com/openjdk/jdk/blob/1581e3faa06358f192799b3a89718028c7f6a24b/src/hotspot/share/classfile/javaClasses.cpp#L4392-L4412
+            if (!instrumentTheWorld) {
+                addDiagnosticForAllProbes(
+                        new DiagnosticMessage(
+                                DiagnosticMessage.Kind.ERROR, "Cannot instrument class in DelegatingClassLoader"),
+                        diagnostics);
+            }
+            return InstrumentationResult.Status.ERROR;
+        }
+        return InstrumentationResult.Status.INSTALLED;
     }
-    return InstrumentationResult.Status.INSTALLED;
-  }
 
-  private static void addDiagnosticForAllProbes(
-      DiagnosticMessage diagnosticMessage, Map<ProbeId, List<DiagnosticMessage>> diagnostics) {
-    diagnostics.forEach((probeId, diagnosticMessages) -> diagnosticMessages.add(diagnosticMessage));
-  }
-
-  private void dumpInstrumentedClassFile(String className, byte[] data) {
-    if (config.isDynamicInstrumentationClassFileDumpEnabled()) {
-      LOGGER.debug("Generated bytecode len: {}", data.length);
-      Path classFilePath = dumpClassFile(className, data);
-      if (classFilePath != null) {
-        LOGGER.debug("Instrumented class saved as: {}", classFilePath);
-      }
+    private static void addDiagnosticForAllProbes(
+            DiagnosticMessage diagnosticMessage, Map<ProbeId, List<DiagnosticMessage>> diagnostics) {
+        diagnostics.forEach((probeId, diagnosticMessages) -> diagnosticMessages.add(diagnosticMessage));
     }
-  }
 
-  private void dumpOriginalClassFile(String className, byte[] classfileBuffer) {
-    if (config.isDynamicInstrumentationClassFileDumpEnabled()) {
-      Path classFilePath = dumpClassFile(className + "_orig", classfileBuffer);
-      if (classFilePath != null) {
-        LOGGER.debug("Original class saved as: {}", classFilePath);
-      }
+    private void dumpInstrumentedClassFile(String className, byte[] data) {
+        if (config.isDynamicInstrumentationClassFileDumpEnabled()) {
+            LOGGER.debug("Generated bytecode len: {}", data.length);
+            Path classFilePath = dumpClassFile(className, data);
+            if (classFilePath != null) {
+                LOGGER.debug("Instrumented class saved as: {}", classFilePath);
+            }
+        }
     }
-  }
 
-  private static Path dumpClassFile(String className, byte[] classfileBuffer) {
-    try {
-      Path classFilePath = DUMP_PATH.resolve(className + ".class");
-      Files.createDirectories(classFilePath.getParent());
-      Files.write(classFilePath, classfileBuffer, StandardOpenOption.CREATE);
-      return classFilePath;
-    } catch (IOException e) {
-      LOGGER.error("", e);
-      return null;
+    private void dumpOriginalClassFile(String className, byte[] classfileBuffer) {
+        if (config.isDynamicInstrumentationClassFileDumpEnabled()) {
+            Path classFilePath = dumpClassFile(className + "_orig", classfileBuffer);
+            if (classFilePath != null) {
+                LOGGER.debug("Original class saved as: {}", classFilePath);
+            }
+        }
     }
-  }
 
-  /**
-   * A {@link org.objectweb.asm.ClassVisitor} that uses {@link
-   * org.objectweb.asm.commons.JSRInlinerAdapter} to remove JSR instructions and inlines the
-   * referenced subroutines. This allows pre-Java 6 classes with finally blocks to be successfully
-   * transformed. Without this an IllegalArgumentException for "JSR/RET are not supported with
-   * computeFrames option" would be thrown when writing the transformed class.
-   */
-  static class JsrInliningClassVisitor extends ClassVisitor {
-    protected JsrInliningClassVisitor(ClassVisitor parent) {
-      super(Opcodes.ASM9, parent);
+    private static Path dumpClassFile(String className, byte[] classfileBuffer) {
+        try {
+            Path classFilePath = DUMP_PATH.resolve(className + ".class");
+            Files.createDirectories(classFilePath.getParent());
+            Files.write(classFilePath, classfileBuffer, StandardOpenOption.CREATE);
+            return classFilePath;
+        } catch (IOException e) {
+            LOGGER.error("", e);
+            return null;
+        }
     }
 
-    @Override
-    public MethodVisitor visitMethod(
-        int access, String name, String descriptor, String signature, String[] exceptions) {
-      MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
-      return new JSRInlinerAdapter(mv, access, name, descriptor, signature, exceptions);
+    /**
+     * A {@link org.objectweb.asm.ClassVisitor} that uses {@link
+     * org.objectweb.asm.commons.JSRInlinerAdapter} to remove JSR instructions and inlines the
+     * referenced subroutines. This allows pre-Java 6 classes with finally blocks to be successfully
+     * transformed. Without this an IllegalArgumentException for "JSR/RET are not supported with
+     * computeFrames option" would be thrown when writing the transformed class.
+     */
+    static class JsrInliningClassVisitor extends ClassVisitor {
+        protected JsrInliningClassVisitor(ClassVisitor parent) {
+            super(Opcodes.ASM9, parent);
+        }
+
+        @Override
+        public MethodVisitor visitMethod(
+                int access, String name, String descriptor, String signature, String[] exceptions) {
+            MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
+            return new JSRInlinerAdapter(mv, access, name, descriptor, signature, exceptions);
+        }
     }
-  }
 
-  static class SafeClassWriter extends ClassWriter {
-    private final ClassLoader classLoader;
+    static class SafeClassWriter extends ClassWriter {
+        private final ClassLoader classLoader;
 
-    public SafeClassWriter(ClassLoader classLoader) {
-      super(ClassWriter.COMPUTE_FRAMES);
-      this.classLoader = classLoader;
-    }
+        public SafeClassWriter(ClassLoader classLoader) {
+            super(ClassWriter.COMPUTE_FRAMES);
+            this.classLoader = classLoader;
+        }
 
-    @Override
-    protected String getCommonSuperClass(String type1, String type2) {
-      // We cannot use ASM's getCommonSuperClass because it tries to load super class with
-      // ClassLoader which in some circumstances can lead to
-      // java.lang.LinkageError: loader (instance of  sun/misc/Launcher$AppClassLoader): attempted
-      // duplicate class definition for name: "okhttp3/RealCall"
-      // for more info see:
-      // https://stackoverflow.com/questions/69563714/linkageerror-attempted-duplicate-class-definition-when-dynamically-instrument
-      TypePool tpTargetClassLoader =
-          new TypePool.Default.WithLazyResolution(
-              TypePool.CacheProvider.Simple.withObjectType(),
-              AgentStrategies.locationStrategy().classFileLocator(classLoader, null),
-              TypePool.Default.ReaderMode.FAST);
-      // Introduced the java agent DataDog classloader for resolving types introduced by other
-      // Datadog instrumentation (Tracing, AppSec, Profiling, ...)
-      // Here we assume that the current class is loaded in DataDog classloader
-      TypePool tpDatadogClassLoader =
-          new TypePool.Default.WithLazyResolution(
-              TypePool.CacheProvider.Simple.withObjectType(),
-              AgentStrategies.locationStrategy()
-                  .classFileLocator(getClass().getClassLoader(), null),
-              TypePool.Default.ReaderMode.FAST,
-              tpTargetClassLoader);
+        @Override
+        protected String getCommonSuperClass(String type1, String type2) {
+            // We cannot use ASM's getCommonSuperClass because it tries to load super class with
+            // ClassLoader which in some circumstances can lead to
+            // java.lang.LinkageError: loader (instance of  sun/misc/Launcher$AppClassLoader): attempted
+            // duplicate class definition for name: "okhttp3/RealCall"
+            // for more info see:
+            // https://stackoverflow.com/questions/69563714/linkageerror-attempted-duplicate-class-definition-when-dynamically-instrument
+            TypePool tpTargetClassLoader = new TypePool.Default.WithLazyResolution(
+                    TypePool.CacheProvider.Simple.withObjectType(),
+                    AgentStrategies.locationStrategy().classFileLocator(classLoader, null),
+                    TypePool.Default.ReaderMode.FAST);
+            // Introduced the java agent DataDog classloader for resolving types introduced by other
+            // Datadog instrumentation (Tracing, AppSec, Profiling, ...)
+            // Here we assume that the current class is loaded in DataDog classloader
+            TypePool tpDatadogClassLoader = new TypePool.Default.WithLazyResolution(
+                    TypePool.CacheProvider.Simple.withObjectType(),
+                    AgentStrategies.locationStrategy()
+                            .classFileLocator(getClass().getClassLoader(), null),
+                    TypePool.Default.ReaderMode.FAST,
+                    tpTargetClassLoader);
 
-      try {
-        TypeDescription td1 = tpDatadogClassLoader.describe(type1.replace('/', '.')).resolve();
-        TypeDescription td2 = tpDatadogClassLoader.describe(type2.replace('/', '.')).resolve();
-        TypeDescription common;
-        if (td1.isAssignableFrom(td2)) {
-          common = td1;
-        } else if (td2.isAssignableFrom(td1)) {
-          common = td2;
-        } else {
-          if (td1.isInterface() || td2.isInterface()) {
-            common = tpDatadogClassLoader.describe("java.lang.Object").resolve();
-          } else {
-            common = td1;
-            do {
-              common = common.getSuperClass().asErasure();
-            } while (!common.isAssignableFrom(td2));
-          }
+            try {
+                TypeDescription td1 =
+                        tpDatadogClassLoader.describe(type1.replace('/', '.')).resolve();
+                TypeDescription td2 =
+                        tpDatadogClassLoader.describe(type2.replace('/', '.')).resolve();
+                TypeDescription common;
+                if (td1.isAssignableFrom(td2)) {
+                    common = td1;
+                } else if (td2.isAssignableFrom(td1)) {
+                    common = td2;
+                } else {
+                    if (td1.isInterface() || td2.isInterface()) {
+                        common = tpDatadogClassLoader
+                                .describe("java.lang.Object")
+                                .resolve();
+                    } else {
+                        common = td1;
+                        do {
+                            common = common.getSuperClass().asErasure();
+                        } while (!common.isAssignableFrom(td2));
+                    }
+                }
+                return common.getInternalName();
+            } catch (Exception ex) {
+                LOGGER.debug("getCommonSuperClass failed: ", ex);
+                return tpDatadogClassLoader
+                        .describe("java.lang.Object")
+                        .resolve()
+                        .getInternalName();
+            }
         }
-        return common.getInternalName();
-      } catch (Exception ex) {
-        LOGGER.debug("getCommonSuperClass failed: ", ex);
-        return tpDatadogClassLoader.describe("java.lang.Object").resolve().getInternalName();
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DefaultDebuggerConfigUpdater.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DefaultDebuggerConfigUpdater.java
index 125da8e6042..3e6c04d910f 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DefaultDebuggerConfigUpdater.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DefaultDebuggerConfigUpdater.java
@@ -14,83 +14,79 @@
 
 class DefaultDebuggerConfigUpdater implements DebuggerConfigUpdater {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(DefaultDebuggerConfigUpdater.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultDebuggerConfigUpdater.class);
 
-  private final Config config;
+    private final Config config;
 
-  public DefaultDebuggerConfigUpdater(Config config) {
-    this.config = config;
-  }
-
-  @Override
-  public void updateConfig(DebuggerConfigUpdate update) {
-    startOrStopFeature(
-        config,
-        DebuggerConfig.DYNAMIC_INSTRUMENTATION_ENABLED,
-        update.getDynamicInstrumentationEnabled(),
-        DebuggerAgent::startDynamicInstrumentation,
-        DebuggerAgent::stopDynamicInstrumentation);
-    if (JavaVirtualMachine.isJavaVersionAtLeast(11)) {
-      // Cannot remotely enable Exception Replay for JDK < 11 (JVM 8 bug)
-      startOrStopFeature(
-          config,
-          DebuggerConfig.EXCEPTION_REPLAY_ENABLED,
-          update.getExceptionReplayEnabled(),
-          DebuggerAgent::startExceptionReplay,
-          DebuggerAgent::stopExceptionReplay);
-    } else {
-      LOGGER.debug("Cannot start Exception Replay on JDK version < 11");
+    public DefaultDebuggerConfigUpdater(Config config) {
+        this.config = config;
     }
-    startOrStopFeature(
-        config,
-        TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_ENABLED,
-        update.getCodeOriginEnabled(),
-        DebuggerAgent::startCodeOriginForSpans,
-        DebuggerAgent::stopCodeOriginForSpans);
-    startOrStopFeature(
-        config,
-        DebuggerConfig.DISTRIBUTED_DEBUGGER_ENABLED,
-        update.getDistributedDebuggerEnabled(),
-        DebuggerAgent::startDistributedDebugger,
-        DebuggerAgent::stopDistributedDebugger);
-  }
 
-  @Override
-  public boolean isDynamicInstrumentationEnabled() {
-    return DebuggerAgent.dynamicInstrumentationEnabled.get();
-  }
+    @Override
+    public void updateConfig(DebuggerConfigUpdate update) {
+        startOrStopFeature(
+                config,
+                DebuggerConfig.DYNAMIC_INSTRUMENTATION_ENABLED,
+                update.getDynamicInstrumentationEnabled(),
+                DebuggerAgent::startDynamicInstrumentation,
+                DebuggerAgent::stopDynamicInstrumentation);
+        if (JavaVirtualMachine.isJavaVersionAtLeast(11)) {
+            // Cannot remotely enable Exception Replay for JDK < 11 (JVM 8 bug)
+            startOrStopFeature(
+                    config,
+                    DebuggerConfig.EXCEPTION_REPLAY_ENABLED,
+                    update.getExceptionReplayEnabled(),
+                    DebuggerAgent::startExceptionReplay,
+                    DebuggerAgent::stopExceptionReplay);
+        } else {
+            LOGGER.debug("Cannot start Exception Replay on JDK version < 11");
+        }
+        startOrStopFeature(
+                config,
+                TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_ENABLED,
+                update.getCodeOriginEnabled(),
+                DebuggerAgent::startCodeOriginForSpans,
+                DebuggerAgent::stopCodeOriginForSpans);
+        startOrStopFeature(
+                config,
+                DebuggerConfig.DISTRIBUTED_DEBUGGER_ENABLED,
+                update.getDistributedDebuggerEnabled(),
+                DebuggerAgent::startDistributedDebugger,
+                DebuggerAgent::stopDistributedDebugger);
+    }
 
-  @Override
-  public boolean isExceptionReplayEnabled() {
-    return DebuggerAgent.exceptionReplayEnabled.get();
-  }
+    @Override
+    public boolean isDynamicInstrumentationEnabled() {
+        return DebuggerAgent.dynamicInstrumentationEnabled.get();
+    }
 
-  @Override
-  public boolean isCodeOriginEnabled() {
-    return DebuggerAgent.codeOriginEnabled.get();
-  }
+    @Override
+    public boolean isExceptionReplayEnabled() {
+        return DebuggerAgent.exceptionReplayEnabled.get();
+    }
 
-  @Override
-  public boolean isDistributedDebuggerEnabled() {
-    return DebuggerAgent.distributedDebuggerEnabled.get();
-  }
+    @Override
+    public boolean isCodeOriginEnabled() {
+        return DebuggerAgent.codeOriginEnabled.get();
+    }
 
-  private static void startOrStopFeature(
-      Config config,
-      String booleanKey,
-      Boolean currentStatus,
-      Consumer<Config> start,
-      Runnable stop) {
-    if (isExplicitlyDisabled(booleanKey)) {
-      LOGGER.debug("Feature {} is explicitly disabled", booleanKey);
-      return;
+    @Override
+    public boolean isDistributedDebuggerEnabled() {
+        return DebuggerAgent.distributedDebuggerEnabled.get();
     }
-    if (currentStatus != null) {
-      if (currentStatus) {
-        start.accept(config);
-      } else {
-        stop.run();
-      }
+
+    private static void startOrStopFeature(
+            Config config, String booleanKey, Boolean currentStatus, Consumer<Config> start, Runnable stop) {
+        if (isExplicitlyDisabled(booleanKey)) {
+            LOGGER.debug("Feature {} is explicitly disabled", booleanKey);
+            return;
+        }
+        if (currentStatus != null) {
+            if (currentStatus) {
+                start.accept(config);
+            } else {
+                stop.run();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DenyListHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DenyListHelper.java
index c55e2bb30df..7bb96d6d83b 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DenyListHelper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DenyListHelper.java
@@ -11,43 +11,42 @@
 /** Helper class for handling denied classes and packages for instrumentation */
 public class DenyListHelper implements DebuggerContext.ClassFilter {
 
-  private static final Collection<String> DENIED_PACKAGES =
-      Arrays.asList("java.security", "javax.security", "sun.security");
-  private static final Collection<String> DENIED_CLASSES =
-      Arrays.asList("java.lang.Object", "java.lang.String");
+    private static final Collection<String> DENIED_PACKAGES =
+            Arrays.asList("java.security", "javax.security", "sun.security");
+    private static final Collection<String> DENIED_CLASSES = Arrays.asList("java.lang.Object", "java.lang.String");
 
-  private ClassNameTrie packagePrefixTrie;
-  private HashSet<String> classes;
+    private ClassNameTrie packagePrefixTrie;
+    private HashSet<String> classes;
 
-  public DenyListHelper(Configuration.FilterList denyList) {
-    Collection<String> packages = new ArrayList<>(DENIED_PACKAGES);
-    Collection<String> classes = new ArrayList<>(DENIED_CLASSES);
-    packages.addAll(Redaction.getRedactedPackages());
-    classes.addAll(Redaction.getRedactedClasses());
-    if (denyList != null) {
-      packages.addAll(denyList.getPackagePrefixes());
-      classes.addAll(denyList.getClasses());
+    public DenyListHelper(Configuration.FilterList denyList) {
+        Collection<String> packages = new ArrayList<>(DENIED_PACKAGES);
+        Collection<String> classes = new ArrayList<>(DENIED_CLASSES);
+        packages.addAll(Redaction.getRedactedPackages());
+        classes.addAll(Redaction.getRedactedClasses());
+        if (denyList != null) {
+            packages.addAll(denyList.getPackagePrefixes());
+            classes.addAll(denyList.getClasses());
+        }
+        ClassNameTrie.Builder builder = new ClassNameTrie.Builder();
+        packages.stream().forEach(s -> builder.put(s + "*", 1));
+        this.packagePrefixTrie = builder.buildTrie();
+        this.classes = new HashSet<>(classes);
     }
-    ClassNameTrie.Builder builder = new ClassNameTrie.Builder();
-    packages.stream().forEach(s -> builder.put(s + "*", 1));
-    this.packagePrefixTrie = builder.buildTrie();
-    this.classes = new HashSet<>(classes);
-  }
 
-  @Override
-  public boolean isDenied(String fullyQualifiedClassName) {
-    if (fullyQualifiedClassName == null) {
-      return false;
+    @Override
+    public boolean isDenied(String fullyQualifiedClassName) {
+        if (fullyQualifiedClassName == null) {
+            return false;
+        }
+        int idx = fullyQualifiedClassName.lastIndexOf('.');
+        if (idx == -1) {
+            // not a fully qualified name or no package
+            return false;
+        }
+        String packageName = fullyQualifiedClassName.substring(0, idx);
+        if (packagePrefixTrie.apply(packageName) > 0) {
+            return true;
+        }
+        return classes.contains(fullyQualifiedClassName);
     }
-    int idx = fullyQualifiedClassName.lastIndexOf('.');
-    if (idx == -1) {
-      // not a fully qualified name or no package
-      return false;
-    }
-    String packageName = fullyQualifiedClassName.substring(0, idx);
-    if (packagePrefixTrie.apply(packageName) > 0) {
-      return true;
-    }
-    return classes.contains(fullyQualifiedClassName);
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/JsonSnapshotSerializer.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/JsonSnapshotSerializer.java
index 4acfef797f9..0c422cc02b6 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/JsonSnapshotSerializer.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/JsonSnapshotSerializer.java
@@ -13,160 +13,159 @@
 
 /** Serializes snapshots in Json using Moshi */
 public class JsonSnapshotSerializer implements DebuggerContext.ValueSerializer {
-  private static final JsonAdapter<IntakeRequest> ADAPTER =
-      MoshiHelper.createMoshiSnapshot(
-              Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout()))
-          .adapter(IntakeRequest.class);
-  private static final JsonAdapter<CapturedContext.CapturedValue> VALUE_ADAPTER =
-      new MoshiSnapshotHelper.CapturedValueAdapter();
-
-  public String serializeSnapshot(String serviceName, Snapshot snapshot) {
-    IntakeRequest request = new IntakeRequest(serviceName, new DebuggerIntakeRequestData(snapshot));
-    handleCorrelationFields(snapshot, request);
-    handleDuration(snapshot, request);
-    handlerLogger(snapshot, request);
-    return ADAPTER.toJson(request);
-  }
-
-  @Override
-  public String serializeValue(CapturedContext.CapturedValue value) {
-    return VALUE_ADAPTER.toJson(value);
-  }
-
-  private void handlerLogger(Snapshot snapshot, IntakeRequest request) {
-    request.loggerName = snapshot.getProbe().getLocation().getType();
-    request.loggerMethod = snapshot.getProbe().getLocation().getMethod();
-    request.loggerVersion = snapshot.getVersion();
-    request.loggerThreadId = snapshot.getThread().getId();
-    request.loggerThreadName = snapshot.getThread().getName();
-  }
-
-  private void handleDuration(Snapshot snapshot, IntakeRequest request) {
-    request.duration = snapshot.getDuration();
-  }
-
-  private void handleCorrelationFields(Snapshot snapshot, IntakeRequest request) {
-    request.traceId = snapshot.getTraceId();
-    request.spanId = snapshot.getSpanId();
-  }
-
-  public static class IntakeRequest {
-    private final String service;
-    private final DebuggerIntakeRequestData debugger;
-    private final String ddsource = "dd_debugger";
-    private final String message;
-    private final String type = "snapshot";
-
-    private final String ddtags;
-
-    @Json(name = "process_tags")
-    private final String processTags;
-
-    @Json(name = "dd.trace_id")
-    private String traceId;
-
-    @Json(name = "dd.span_id")
-    private String spanId;
-
-    private long duration;
-
-    private long timestamp;
-
-    @Json(name = "logger.name")
-    private String loggerName;
-
-    @Json(name = "logger.method")
-    private String loggerMethod;
-
-    @Json(name = "logger.version")
-    private int loggerVersion;
-
-    @Json(name = "logger.thread_id")
-    private long loggerThreadId;
-
-    @Json(name = "logger.thread_name")
-    private String loggerThreadName;
-
-    public IntakeRequest(String service, DebuggerIntakeRequestData debugger) {
-      this.service = service;
-      this.debugger = debugger;
-      this.message = debugger.snapshot.getMessage();
-      this.ddtags = debugger.snapshot.getProbe().getStrTags();
-      this.timestamp = debugger.snapshot.getTimestamp();
-      final CharSequence pt = ProcessTags.getTagsForSerialization();
-      this.processTags = pt != null ? pt.toString() : null;
-    }
+    private static final JsonAdapter<IntakeRequest> ADAPTER = MoshiHelper.createMoshiSnapshot(
+                    Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout()))
+            .adapter(IntakeRequest.class);
+    private static final JsonAdapter<CapturedContext.CapturedValue> VALUE_ADAPTER =
+            new MoshiSnapshotHelper.CapturedValueAdapter();
 
-    public String getService() {
-      return service;
+    public String serializeSnapshot(String serviceName, Snapshot snapshot) {
+        IntakeRequest request = new IntakeRequest(serviceName, new DebuggerIntakeRequestData(snapshot));
+        handleCorrelationFields(snapshot, request);
+        handleDuration(snapshot, request);
+        handlerLogger(snapshot, request);
+        return ADAPTER.toJson(request);
     }
 
-    public DebuggerIntakeRequestData getDebugger() {
-      return debugger;
+    @Override
+    public String serializeValue(CapturedContext.CapturedValue value) {
+        return VALUE_ADAPTER.toJson(value);
     }
 
-    public String getDdsource() {
-      return ddsource;
+    private void handlerLogger(Snapshot snapshot, IntakeRequest request) {
+        request.loggerName = snapshot.getProbe().getLocation().getType();
+        request.loggerMethod = snapshot.getProbe().getLocation().getMethod();
+        request.loggerVersion = snapshot.getVersion();
+        request.loggerThreadId = snapshot.getThread().getId();
+        request.loggerThreadName = snapshot.getThread().getName();
     }
 
-    public String getMessage() {
-      return message;
+    private void handleDuration(Snapshot snapshot, IntakeRequest request) {
+        request.duration = snapshot.getDuration();
     }
 
-    public String getTraceId() {
-      return traceId;
+    private void handleCorrelationFields(Snapshot snapshot, IntakeRequest request) {
+        request.traceId = snapshot.getTraceId();
+        request.spanId = snapshot.getSpanId();
     }
 
-    public String getSpanId() {
-      return spanId;
-    }
+    public static class IntakeRequest {
+        private final String service;
+        private final DebuggerIntakeRequestData debugger;
+        private final String ddsource = "dd_debugger";
+        private final String message;
+        private final String type = "snapshot";
 
-    public long getTimestamp() {
-      return timestamp;
-    }
+        private final String ddtags;
 
-    public String getLoggerName() {
-      return loggerName;
-    }
+        @Json(name = "process_tags")
+        private final String processTags;
 
-    public String getLoggerMethod() {
-      return loggerMethod;
-    }
+        @Json(name = "dd.trace_id")
+        private String traceId;
 
-    public int getLoggerVersion() {
-      return loggerVersion;
-    }
+        @Json(name = "dd.span_id")
+        private String spanId;
 
-    public long getLoggerThreadId() {
-      return loggerThreadId;
-    }
+        private long duration;
 
-    public String getLoggerThreadName() {
-      return loggerThreadName;
-    }
+        private long timestamp;
 
-    public String getProcessTags() {
-      return processTags;
-    }
+        @Json(name = "logger.name")
+        private String loggerName;
 
-    public String getType() {
-      return type;
-    }
-  }
+        @Json(name = "logger.method")
+        private String loggerMethod;
 
-  public static class DebuggerIntakeRequestData {
-    private final Snapshot snapshot;
+        @Json(name = "logger.version")
+        private int loggerVersion;
 
-    public DebuggerIntakeRequestData(Snapshot snapshot) {
-      this.snapshot = snapshot;
-    }
+        @Json(name = "logger.thread_id")
+        private long loggerThreadId;
+
+        @Json(name = "logger.thread_name")
+        private String loggerThreadName;
+
+        public IntakeRequest(String service, DebuggerIntakeRequestData debugger) {
+            this.service = service;
+            this.debugger = debugger;
+            this.message = debugger.snapshot.getMessage();
+            this.ddtags = debugger.snapshot.getProbe().getStrTags();
+            this.timestamp = debugger.snapshot.getTimestamp();
+            final CharSequence pt = ProcessTags.getTagsForSerialization();
+            this.processTags = pt != null ? pt.toString() : null;
+        }
+
+        public String getService() {
+            return service;
+        }
+
+        public DebuggerIntakeRequestData getDebugger() {
+            return debugger;
+        }
 
-    public Snapshot getSnapshot() {
-      return snapshot;
+        public String getDdsource() {
+            return ddsource;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public String getTraceId() {
+            return traceId;
+        }
+
+        public String getSpanId() {
+            return spanId;
+        }
+
+        public long getTimestamp() {
+            return timestamp;
+        }
+
+        public String getLoggerName() {
+            return loggerName;
+        }
+
+        public String getLoggerMethod() {
+            return loggerMethod;
+        }
+
+        public int getLoggerVersion() {
+            return loggerVersion;
+        }
+
+        public long getLoggerThreadId() {
+            return loggerThreadId;
+        }
+
+        public String getLoggerThreadName() {
+            return loggerThreadName;
+        }
+
+        public String getProcessTags() {
+            return processTags;
+        }
+
+        public String getType() {
+            return type;
+        }
     }
 
-    public String getRuntimeId() {
-      return Config.get().getRuntimeId();
+    public static class DebuggerIntakeRequestData {
+        private final Snapshot snapshot;
+
+        public DebuggerIntakeRequestData(Snapshot snapshot) {
+            this.snapshot = snapshot;
+        }
+
+        public Snapshot getSnapshot() {
+            return snapshot;
+        }
+
+        public String getRuntimeId() {
+            return Config.get().getRuntimeId();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ProbeMetadata.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ProbeMetadata.java
index f46cd3c8030..e5dd519dbad 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ProbeMetadata.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ProbeMetadata.java
@@ -6,65 +6,64 @@
 import org.slf4j.LoggerFactory;
 
 public class ProbeMetadata {
-  private static final Logger LOGGER = LoggerFactory.getLogger(ProbeMetadata.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProbeMetadata.class);
 
-  private int size;
-  private Object lock = new Object();
-  private volatile AtomicReferenceArray<ProbeImplementation> probeImplementations =
-      new AtomicReferenceArray<>(64);
+    private int size;
+    private Object lock = new Object();
+    private volatile AtomicReferenceArray<ProbeImplementation> probeImplementations = new AtomicReferenceArray<>(64);
 
-  public int addProbe(ProbeImplementation probeImplementation) {
-    synchronized (lock) {
-      int len = probeImplementations.length();
-      if (size >= len) {
-        AtomicReferenceArray<ProbeImplementation> newArray = new AtomicReferenceArray<>(len * 2);
-        for (int i = 0; i < len; i++) {
-          newArray.set(i, probeImplementations.get(i));
+    public int addProbe(ProbeImplementation probeImplementation) {
+        synchronized (lock) {
+            int len = probeImplementations.length();
+            if (size >= len) {
+                AtomicReferenceArray<ProbeImplementation> newArray = new AtomicReferenceArray<>(len * 2);
+                for (int i = 0; i < len; i++) {
+                    newArray.set(i, probeImplementations.get(i));
+                }
+                probeImplementations = newArray;
+            }
+            int idx = 0;
+            while (probeImplementations.get(idx) != null) {
+                idx++;
+            }
+            probeImplementations.set(idx, probeImplementation);
+            LOGGER.debug(
+                    "Assigned probeId={} to ProbeMetadata Idx={}",
+                    probeImplementation.getProbeId().getEncodedId(),
+                    idx);
+            size++;
+            return idx;
         }
-        probeImplementations = newArray;
-      }
-      int idx = 0;
-      while (probeImplementations.get(idx) != null) {
-        idx++;
-      }
-      probeImplementations.set(idx, probeImplementation);
-      LOGGER.debug(
-          "Assigned probeId={} to ProbeMetadata Idx={}",
-          probeImplementation.getProbeId().getEncodedId(),
-          idx);
-      size++;
-      return idx;
     }
-  }
 
-  public void removeProbe(int idx) {
-    synchronized (lock) {
-      probeImplementations.set(idx, null);
-      size--;
+    public void removeProbe(int idx) {
+        synchronized (lock) {
+            probeImplementations.set(idx, null);
+            size--;
+        }
     }
-  }
 
-  public void removeProbe(String encodedProbeId) {
-    synchronized (lock) {
-      for (int i = 0; i < probeImplementations.length(); i++) {
-        ProbeImplementation probeImplementation = probeImplementations.get(i);
-        if (probeImplementation != null
-            && probeImplementation.getProbeId().getEncodedId().equals(encodedProbeId)) {
-          probeImplementations.set(i, null);
-          size--;
-          return;
+    public void removeProbe(String encodedProbeId) {
+        synchronized (lock) {
+            for (int i = 0; i < probeImplementations.length(); i++) {
+                ProbeImplementation probeImplementation = probeImplementations.get(i);
+                if (probeImplementation != null
+                        && probeImplementation.getProbeId().getEncodedId().equals(encodedProbeId)) {
+                    probeImplementations.set(i, null);
+                    size--;
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 
-  public ProbeImplementation getProbe(int idx) {
-    return probeImplementations.get(idx);
-  }
+    public ProbeImplementation getProbe(int idx) {
+        return probeImplementations.get(idx);
+    }
 
-  public int size() {
-    synchronized (lock) {
-      return size;
+    public int size() {
+        synchronized (lock) {
+            return size;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ProbeStatus.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ProbeStatus.java
index 667c4a21564..3007f12beb5 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ProbeStatus.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ProbeStatus.java
@@ -22,342 +22,341 @@
 
 /** Stores status information of probes for a service */
 public class ProbeStatus {
-  @Json(name = "ddsource")
-  private final String ddSource = "dd_debugger";
-
-  private final String type = "diagnostic";
-
-  private final String service;
-  private final String message;
-  private final long timestamp;
-
-  @Json(name = "debugger")
-  private final Diagnostics diagnostics;
-
-  public ProbeStatus(String service, String message, Diagnostics diagnostics) {
-    this(service, message, diagnostics, System.currentTimeMillis());
-  }
-
-  public ProbeStatus(String service, String message, Diagnostics diagnostics, long timestamp) {
-    this.service = service;
-    this.message = message;
-    this.diagnostics = diagnostics;
-    this.timestamp = timestamp;
-  }
-
-  public ProbeStatus withNewTimestamp(Instant now) {
-    return new ProbeStatus(service, message, diagnostics, now.toEpochMilli());
-  }
-
-  public String getDdSource() {
-    return ddSource;
-  }
-
-  public String getType() {
-    return type;
-  }
-
-  public String getService() {
-    return service;
-  }
-
-  public String getMessage() {
-    return message;
-  }
-
-  public long getTimestamp() {
-    return timestamp;
-  }
-
-  public Diagnostics getDiagnostics() {
-    return diagnostics;
-  }
-
-  @Generated
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    ProbeStatus that = (ProbeStatus) o;
-    return Objects.equals(ddSource, that.ddSource)
-        && Objects.equals(service, that.service)
-        && Objects.equals(message, that.message)
-        && Objects.equals(diagnostics, that.diagnostics);
-  }
-
-  @Generated
-  @Override
-  public int hashCode() {
-    return Objects.hash(ddSource, service, message, diagnostics);
-  }
-
-  @Generated
-  @Override
-  public String toString() {
-    return "ProbeDiagnosticMessage{"
-        + "ddSource='"
-        + ddSource
-        + '\''
-        + ", service='"
-        + service
-        + '\''
-        + ", timestamp='"
-        + Instant.ofEpochMilli(timestamp)
-        + '\''
-        + ", message='"
-        + message
-        + '\''
-        + ", debugger="
-        + diagnostics
-        + '}';
-  }
-
-  /** Stores status information for a probe */
-  public static class Diagnostics {
-
-    private final String probeId;
-
-    private final int probeVersion;
-
-    private final String runtimeId;
-    private final Status status;
-
-    private final ProbeException exception;
-
-    public Diagnostics(String probeId, String runtimeId, Status status, ProbeException exception) {
-      ProbeId id = ProbeId.from(probeId);
-      this.probeId = id.getId();
-      this.probeVersion = id.getVersion();
-      this.runtimeId = runtimeId;
-      this.status = status;
-      this.exception = exception;
-    }
+    @Json(name = "ddsource")
+    private final String ddSource = "dd_debugger";
 
-    public Diagnostics(ProbeId probeId, String runtimeId, Status status, ProbeException exception) {
-      this.probeId = probeId != null ? probeId.getId() : null;
-      this.probeVersion = probeId != null ? probeId.getVersion() : 0;
-      this.runtimeId = runtimeId;
-      this.status = status;
-      this.exception = exception;
-    }
+    private final String type = "diagnostic";
 
-    public ProbeId getProbeId() {
-      return new ProbeId(probeId, probeVersion);
-    }
+    private final String service;
+    private final String message;
+    private final long timestamp;
 
-    public Status getStatus() {
-      return status;
-    }
+    @Json(name = "debugger")
+    private final Diagnostics diagnostics;
 
-    public ProbeException getException() {
-      return exception;
+    public ProbeStatus(String service, String message, Diagnostics diagnostics) {
+        this(service, message, diagnostics, System.currentTimeMillis());
     }
 
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      Diagnostics that = (Diagnostics) o;
-      return probeVersion == that.probeVersion
-          && Objects.equals(probeId, that.probeId)
-          && Objects.equals(runtimeId, that.runtimeId)
-          && status == that.status
-          && Objects.equals(exception, that.exception);
+    public ProbeStatus(String service, String message, Diagnostics diagnostics, long timestamp) {
+        this.service = service;
+        this.message = message;
+        this.diagnostics = diagnostics;
+        this.timestamp = timestamp;
     }
 
-    @Override
-    public int hashCode() {
-      return Objects.hash(probeId, probeVersion, runtimeId, status, exception);
+    public ProbeStatus withNewTimestamp(Instant now) {
+        return new ProbeStatus(service, message, diagnostics, now.toEpochMilli());
     }
 
-    @Override
-    public String toString() {
-      return "Diagnostics{"
-          + "probeId='"
-          + probeId
-          + '\''
-          + ", probeVersion="
-          + probeVersion
-          + ", runtimeId='"
-          + runtimeId
-          + '\''
-          + ", status="
-          + status
-          + ", exception="
-          + exception
-          + '}';
+    public String getDdSource() {
+        return ddSource;
     }
-  }
 
-  /** Stores error information of a probe instrumentation */
-  public static class ProbeException {
-    private final String type;
-    private final String message;
-    private final List<CapturedStackFrame> stacktrace;
-
-    public ProbeException(String type, String message, List<CapturedStackFrame> stacktrace) {
-      this.type = type;
-      this.message = message;
-      this.stacktrace = stacktrace;
+    public String getType() {
+        return type;
     }
 
-    public String getType() {
-      return type;
+    public String getService() {
+        return service;
     }
 
     public String getMessage() {
-      return message;
+        return message;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
     }
 
-    public List<CapturedStackFrame> getStacktrace() {
-      return stacktrace;
+    public Diagnostics getDiagnostics() {
+        return diagnostics;
     }
 
     @Generated
     @Override
     public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      ProbeException that = (ProbeException) o;
-      return type.equals(that.type)
-          && Objects.equals(message, that.message)
-          && Objects.equals(stacktrace, that.stacktrace);
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ProbeStatus that = (ProbeStatus) o;
+        return Objects.equals(ddSource, that.ddSource)
+                && Objects.equals(service, that.service)
+                && Objects.equals(message, that.message)
+                && Objects.equals(diagnostics, that.diagnostics);
     }
 
     @Generated
     @Override
     public int hashCode() {
-      return Objects.hash(type, message, stacktrace);
+        return Objects.hash(ddSource, service, message, diagnostics);
     }
 
     @Generated
     @Override
     public String toString() {
-      return "ProbeException{"
-          + "type='"
-          + type
-          + '\''
-          + ", message='"
-          + message
-          + '\''
-          + ", stacktrace="
-          + stacktrace
-          + '}';
+        return "ProbeDiagnosticMessage{"
+                + "ddSource='"
+                + ddSource
+                + '\''
+                + ", service='"
+                + service
+                + '\''
+                + ", timestamp='"
+                + Instant.ofEpochMilli(timestamp)
+                + '\''
+                + ", message='"
+                + message
+                + '\''
+                + ", debugger="
+                + diagnostics
+                + '}';
     }
-  }
-
-  /** Defined the different statuses of a probe */
-  public enum Status {
-    RECEIVED,
-    INSTALLED,
-    EMITTING,
-    BLOCKED,
-    ERROR
-  }
 
-  public static class Builder {
-
-    private final String serviceName;
-
-    private final String runtimeId;
-
-    public Builder(Config config) {
-      this.serviceName = TagsHelper.sanitize(config.getServiceName());
-      this.runtimeId = config.getRuntimeId();
-    }
-
-    public ProbeStatus receivedMessage(ProbeId probeId) {
-      return new ProbeStatus(
-          this.serviceName,
-          "Received probe " + probeId + ".",
-          new Diagnostics(probeId, runtimeId, Status.RECEIVED, null));
+    /** Stores status information for a probe */
+    public static class Diagnostics {
+
+        private final String probeId;
+
+        private final int probeVersion;
+
+        private final String runtimeId;
+        private final Status status;
+
+        private final ProbeException exception;
+
+        public Diagnostics(String probeId, String runtimeId, Status status, ProbeException exception) {
+            ProbeId id = ProbeId.from(probeId);
+            this.probeId = id.getId();
+            this.probeVersion = id.getVersion();
+            this.runtimeId = runtimeId;
+            this.status = status;
+            this.exception = exception;
+        }
+
+        public Diagnostics(ProbeId probeId, String runtimeId, Status status, ProbeException exception) {
+            this.probeId = probeId != null ? probeId.getId() : null;
+            this.probeVersion = probeId != null ? probeId.getVersion() : 0;
+            this.runtimeId = runtimeId;
+            this.status = status;
+            this.exception = exception;
+        }
+
+        public ProbeId getProbeId() {
+            return new ProbeId(probeId, probeVersion);
+        }
+
+        public Status getStatus() {
+            return status;
+        }
+
+        public ProbeException getException() {
+            return exception;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Diagnostics that = (Diagnostics) o;
+            return probeVersion == that.probeVersion
+                    && Objects.equals(probeId, that.probeId)
+                    && Objects.equals(runtimeId, that.runtimeId)
+                    && status == that.status
+                    && Objects.equals(exception, that.exception);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(probeId, probeVersion, runtimeId, status, exception);
+        }
+
+        @Override
+        public String toString() {
+            return "Diagnostics{"
+                    + "probeId='"
+                    + probeId
+                    + '\''
+                    + ", probeVersion="
+                    + probeVersion
+                    + ", runtimeId='"
+                    + runtimeId
+                    + '\''
+                    + ", status="
+                    + status
+                    + ", exception="
+                    + exception
+                    + '}';
+        }
     }
 
-    public ProbeStatus installedMessage(ProbeId probeId) {
-      return new ProbeStatus(
-          this.serviceName,
-          "Installed probe " + probeId + ".",
-          new Diagnostics(probeId, runtimeId, Status.INSTALLED, null));
+    /** Stores error information of a probe instrumentation */
+    public static class ProbeException {
+        private final String type;
+        private final String message;
+        private final List<CapturedStackFrame> stacktrace;
+
+        public ProbeException(String type, String message, List<CapturedStackFrame> stacktrace) {
+            this.type = type;
+            this.message = message;
+            this.stacktrace = stacktrace;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public List<CapturedStackFrame> getStacktrace() {
+            return stacktrace;
+        }
+
+        @Generated
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            ProbeException that = (ProbeException) o;
+            return type.equals(that.type)
+                    && Objects.equals(message, that.message)
+                    && Objects.equals(stacktrace, that.stacktrace);
+        }
+
+        @Generated
+        @Override
+        public int hashCode() {
+            return Objects.hash(type, message, stacktrace);
+        }
+
+        @Generated
+        @Override
+        public String toString() {
+            return "ProbeException{"
+                    + "type='"
+                    + type
+                    + '\''
+                    + ", message='"
+                    + message
+                    + '\''
+                    + ", stacktrace="
+                    + stacktrace
+                    + '}';
+        }
     }
 
-    public ProbeStatus emittingMessage(String probeId) {
-      return new ProbeStatus(
-          this.serviceName,
-          "Probe " + probeId + " is emitting.",
-          new Diagnostics(probeId, runtimeId, Status.EMITTING, null));
+    /** Defined the different statuses of a probe */
+    public enum Status {
+        RECEIVED,
+        INSTALLED,
+        EMITTING,
+        BLOCKED,
+        ERROR
     }
 
-    public ProbeStatus blockedMessage(ProbeId probeId) {
-      return new ProbeStatus(
-          this.serviceName,
-          "Blocked probe " + probeId + ".",
-          new Diagnostics(probeId, runtimeId, Status.BLOCKED, null));
+    public static class Builder {
+
+        private final String serviceName;
+
+        private final String runtimeId;
+
+        public Builder(Config config) {
+            this.serviceName = TagsHelper.sanitize(config.getServiceName());
+            this.runtimeId = config.getRuntimeId();
+        }
+
+        public ProbeStatus receivedMessage(ProbeId probeId) {
+            return new ProbeStatus(
+                    this.serviceName,
+                    "Received probe " + probeId + ".",
+                    new Diagnostics(probeId, runtimeId, Status.RECEIVED, null));
+        }
+
+        public ProbeStatus installedMessage(ProbeId probeId) {
+            return new ProbeStatus(
+                    this.serviceName,
+                    "Installed probe " + probeId + ".",
+                    new Diagnostics(probeId, runtimeId, Status.INSTALLED, null));
+        }
+
+        public ProbeStatus emittingMessage(String probeId) {
+            return new ProbeStatus(
+                    this.serviceName,
+                    "Probe " + probeId + " is emitting.",
+                    new Diagnostics(probeId, runtimeId, Status.EMITTING, null));
+        }
+
+        public ProbeStatus blockedMessage(ProbeId probeId) {
+            return new ProbeStatus(
+                    this.serviceName,
+                    "Blocked probe " + probeId + ".",
+                    new Diagnostics(probeId, runtimeId, Status.BLOCKED, null));
+        }
+
+        public ProbeStatus errorMessage(ProbeId probeId, Throwable ex) {
+            return new ProbeStatus(
+                    this.serviceName,
+                    "Error installing probe " + probeId + ".",
+                    new Diagnostics(
+                            probeId,
+                            runtimeId,
+                            Status.ERROR,
+                            new ProbeException(
+                                    ex.getClass().getTypeName(),
+                                    ex.getMessage(),
+                                    Arrays.stream(ex.getStackTrace())
+                                            .map(CapturedStackFrame::from)
+                                            .collect(Collectors.toList()))));
+        }
+
+        public ProbeStatus errorMessage(ProbeId probeId, String message) {
+            return new ProbeStatus(
+                    this.serviceName,
+                    "Error installing probe " + probeId + ".",
+                    new Diagnostics(
+                            probeId,
+                            runtimeId,
+                            Status.ERROR,
+                            new ProbeException("NO_TYPE", message, Collections.emptyList())));
+        }
     }
 
-    public ProbeStatus errorMessage(ProbeId probeId, Throwable ex) {
-      return new ProbeStatus(
-          this.serviceName,
-          "Error installing probe " + probeId + ".",
-          new Diagnostics(
-              probeId,
-              runtimeId,
-              Status.ERROR,
-              new ProbeException(
-                  ex.getClass().getTypeName(),
-                  ex.getMessage(),
-                  Arrays.stream(ex.getStackTrace())
-                      .map(CapturedStackFrame::from)
-                      .collect(Collectors.toList()))));
+    public static class DiagnosticsFactory implements JsonAdapter.Factory {
+        @Override
+        public JsonAdapter<?> create(Type type, Set<? extends Annotation> set, Moshi moshi) {
+            if (type.getTypeName().equals(Diagnostics.class.getTypeName())) {
+                JsonAdapter<Diagnostics> delegate = moshi.nextAdapter(this, type, set);
+                return new DiagnosticsWrapperAdapter(delegate);
+            }
+            return null;
+        }
     }
 
-    public ProbeStatus errorMessage(ProbeId probeId, String message) {
-      return new ProbeStatus(
-          this.serviceName,
-          "Error installing probe " + probeId + ".",
-          new Diagnostics(
-              probeId,
-              runtimeId,
-              Status.ERROR,
-              new ProbeException("NO_TYPE", message, Collections.emptyList())));
-    }
-  }
-
-  public static class DiagnosticsFactory implements JsonAdapter.Factory {
-    @Override
-    public JsonAdapter<?> create(Type type, Set<? extends Annotation> set, Moshi moshi) {
-      if (type.getTypeName().equals(Diagnostics.class.getTypeName())) {
-        JsonAdapter<Diagnostics> delegate = moshi.nextAdapter(this, type, set);
-        return new DiagnosticsWrapperAdapter(delegate);
-      }
-      return null;
-    }
-  }
-
-  /** Handles Json (de)serialization of Diagnostics */
-  static class DiagnosticsWrapperAdapter extends JsonAdapter<Diagnostics> {
-    private final JsonAdapter<Diagnostics> delegate;
-
-    public DiagnosticsWrapperAdapter(JsonAdapter<Diagnostics> delegate) {
-      this.delegate = delegate;
-    }
-
-    @Override
-    public Diagnostics fromJson(JsonReader jsonReader) throws IOException {
-      Diagnostics diagnostics = null;
-      jsonReader.beginObject();
-      jsonReader.skipName();
-      diagnostics = delegate.fromJson(jsonReader);
-      jsonReader.endObject();
-      return diagnostics;
-    }
-
-    @Override
-    public void toJson(JsonWriter jsonWriter, ProbeStatus.Diagnostics diagnostics)
-        throws IOException {
-      jsonWriter.beginObject();
-      jsonWriter.name("diagnostics");
-      delegate.toJson(jsonWriter, diagnostics);
-      jsonWriter.endObject();
+    /** Handles Json (de)serialization of Diagnostics */
+    static class DiagnosticsWrapperAdapter extends JsonAdapter<Diagnostics> {
+        private final JsonAdapter<Diagnostics> delegate;
+
+        public DiagnosticsWrapperAdapter(JsonAdapter<Diagnostics> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public Diagnostics fromJson(JsonReader jsonReader) throws IOException {
+            Diagnostics diagnostics = null;
+            jsonReader.beginObject();
+            jsonReader.skipName();
+            diagnostics = delegate.fromJson(jsonReader);
+            jsonReader.endObject();
+            return diagnostics;
+        }
+
+        @Override
+        public void toJson(JsonWriter jsonWriter, ProbeStatus.Diagnostics diagnostics) throws IOException {
+            jsonWriter.beginObject();
+            jsonWriter.name("diagnostics");
+            delegate.toJson(jsonWriter, diagnostics);
+            jsonWriter.endObject();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/SourceFileTrackingTransformer.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/SourceFileTrackingTransformer.java
index 8d6a924c0f2..4c967cc6a4a 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/SourceFileTrackingTransformer.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/SourceFileTrackingTransformer.java
@@ -24,117 +24,117 @@
  * trigger {@link java.lang.instrument.Instrumentation#retransformClasses(Class[])} on them
  */
 public class SourceFileTrackingTransformer implements ClassFileTransformer {
-  private static final Logger LOGGER = LoggerFactory.getLogger(SourceFileTrackingTransformer.class);
-  static final int MAX_QUEUE_SIZE = 16 * 1024;
+    private static final Logger LOGGER = LoggerFactory.getLogger(SourceFileTrackingTransformer.class);
+    static final int MAX_QUEUE_SIZE = 16 * 1024;
 
-  private final ClassesToRetransformFinder finder;
-  private final Queue<SourceFileItem> queue = new ConcurrentLinkedQueue<>();
-  private final AgentTaskScheduler scheduler = AgentTaskScheduler.get();
-  private final AtomicInteger queueSize = new AtomicInteger(0);
-  private AgentTaskScheduler.Scheduled<Runnable> scheduled;
-  // this field MUST only be used in flush() calling thread
-  protected ClassNameFiltering classNameFilter;
+    private final ClassesToRetransformFinder finder;
+    private final Queue<SourceFileItem> queue = new ConcurrentLinkedQueue<>();
+    private final AgentTaskScheduler scheduler = AgentTaskScheduler.get();
+    private final AtomicInteger queueSize = new AtomicInteger(0);
+    private AgentTaskScheduler.Scheduled<Runnable> scheduled;
+    // this field MUST only be used in flush() calling thread
+    protected ClassNameFiltering classNameFilter;
 
-  public SourceFileTrackingTransformer(ClassesToRetransformFinder finder) {
-    this.finder = finder;
-  }
-
-  public void start() {
-    scheduled = scheduler.scheduleAtFixedRate(this::flush, 0, 1, TimeUnit.SECONDS);
-  }
-
-  public void stop() {
-    if (scheduled != null) {
-      scheduled.cancel();
+    public SourceFileTrackingTransformer(ClassesToRetransformFinder finder) {
+        this.finder = finder;
     }
-  }
 
-  void flush() {
-    if (classNameFilter == null) {
-      // init class name filter once here to parse the config in background thread and avoid
-      // startup latency on main thread. The field classNameFilter MUST only be used in this thread
-      classNameFilter = new ClassNameFiltering(Config.get());
+    public void start() {
+        scheduled = scheduler.scheduleAtFixedRate(this::flush, 0, 1, TimeUnit.SECONDS);
     }
-    if (queue.isEmpty()) {
-      return;
-    }
-    int itemCount = 0;
-    long start = System.nanoTime();
-    SourceFileItem item;
-    while ((item = queue.poll()) != null) {
-      queueSize.decrementAndGet();
-      registerSourceFile(item.className, item.classfileBuffer);
-      itemCount++;
+
+    public void stop() {
+        if (scheduled != null) {
+            scheduled.cancel();
+        }
     }
-    LOGGER.debug(
-        "flushing {} source file items in {}ms, totalentries: {}",
-        itemCount,
-        (System.nanoTime() - start) / 1_000_000,
-        finder.getClassNamesBySourceFile().size());
-  }
 
-  int getQueueSize() {
-    return queueSize.get();
-  }
+    void flush() {
+        if (classNameFilter == null) {
+            // init class name filter once here to parse the config in background thread and avoid
+            // startup latency on main thread. The field classNameFilter MUST only be used in this thread
+            classNameFilter = new ClassNameFiltering(Config.get());
+        }
+        if (queue.isEmpty()) {
+            return;
+        }
+        int itemCount = 0;
+        long start = System.nanoTime();
+        SourceFileItem item;
+        while ((item = queue.poll()) != null) {
+            queueSize.decrementAndGet();
+            registerSourceFile(item.className, item.classfileBuffer);
+            itemCount++;
+        }
+        LOGGER.debug(
+                "flushing {} source file items in {}ms, totalentries: {}",
+                itemCount,
+                (System.nanoTime() - start) / 1_000_000,
+                finder.getClassNamesBySourceFile().size());
+    }
 
-  @Override
-  public byte[] transform(
-      ClassLoader loader,
-      String className,
-      Class<?> classBeingRedefined,
-      ProtectionDomain protectionDomain,
-      byte[] classfileBuffer)
-      throws IllegalClassFormatException {
-    if (className == null) {
-      return null;
+    int getQueueSize() {
+        return queueSize.get();
     }
-    if (queueSize.get() >= MAX_QUEUE_SIZE) {
-      LOGGER.debug("SourceFile Tracking queue full, dropping class: {}", className);
-      return null;
+
+    @Override
+    public byte[] transform(
+            ClassLoader loader,
+            String className,
+            Class<?> classBeingRedefined,
+            ProtectionDomain protectionDomain,
+            byte[] classfileBuffer)
+            throws IllegalClassFormatException {
+        if (className == null) {
+            return null;
+        }
+        if (queueSize.get() >= MAX_QUEUE_SIZE) {
+            LOGGER.debug("SourceFile Tracking queue full, dropping class: {}", className);
+            return null;
+        }
+        queue.add(new SourceFileItem(className, classfileBuffer));
+        queueSize.incrementAndGet();
+        return null;
     }
-    queue.add(new SourceFileItem(className, classfileBuffer));
-    queueSize.incrementAndGet();
-    return null;
-  }
 
-  protected void registerSourceFile(String className, byte[] classfileBuffer) {
-    try {
-      String javaClassName = Strings.getClassName(className);
-      if (classNameFilter.isExcluded(javaClassName)) {
-        return;
-      }
-      String sourceFile = ClassFileHelper.extractSourceFile(classfileBuffer);
-      if (sourceFile == null) {
-        return;
-      }
-      if (!isExtensionAllowed(sourceFile)) {
-        return;
-      }
-      String simpleClassName = stripPackagePath(className);
-      String simpleSourceFile = removeExtension(sourceFile);
-      if (simpleClassName.equals(simpleSourceFile)) {
-        return;
-      }
-      finder.register(sourceFile, className);
-    } catch (Exception e) {
-      LOGGER.debug("Error registering source file {}: {}", className, e);
+    protected void registerSourceFile(String className, byte[] classfileBuffer) {
+        try {
+            String javaClassName = Strings.getClassName(className);
+            if (classNameFilter.isExcluded(javaClassName)) {
+                return;
+            }
+            String sourceFile = ClassFileHelper.extractSourceFile(classfileBuffer);
+            if (sourceFile == null) {
+                return;
+            }
+            if (!isExtensionAllowed(sourceFile)) {
+                return;
+            }
+            String simpleClassName = stripPackagePath(className);
+            String simpleSourceFile = removeExtension(sourceFile);
+            if (simpleClassName.equals(simpleSourceFile)) {
+                return;
+            }
+            finder.register(sourceFile, className);
+        } catch (Exception e) {
+            LOGGER.debug("Error registering source file {}: {}", className, e);
+        }
     }
-  }
 
-  private boolean isExtensionAllowed(String sourceFile) {
-    return sourceFile.endsWith(".java")
-        || sourceFile.endsWith(".kt")
-        || sourceFile.endsWith(".scala")
-        || sourceFile.endsWith(".groovy");
-  }
+    private boolean isExtensionAllowed(String sourceFile) {
+        return sourceFile.endsWith(".java")
+                || sourceFile.endsWith(".kt")
+                || sourceFile.endsWith(".scala")
+                || sourceFile.endsWith(".groovy");
+    }
 
-  private static class SourceFileItem {
-    final String className;
-    final byte[] classfileBuffer;
+    private static class SourceFileItem {
+        final String className;
+        final byte[] classfileBuffer;
 
-    public SourceFileItem(String className, byte[] classfileBuffer) {
-      this.className = className;
-      this.classfileBuffer = classfileBuffer;
+        public SourceFileItem(String className, byte[] classfileBuffer) {
+            this.className = className;
+            this.classfileBuffer = classfileBuffer;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StatsdMetricForwarder.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StatsdMetricForwarder.java
index 11eb2b0554c..8036aeb73dd 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StatsdMetricForwarder.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StatsdMetricForwarder.java
@@ -10,74 +10,72 @@
 import org.slf4j.LoggerFactory;
 
 /** Implements forwarding metric probe emitted metrics to a DogStatsD endpoint */
-public class StatsdMetricForwarder
-    implements DebuggerContext.MetricForwarder, StatsDClientErrorHandler {
-  private static final Logger LOGGER = LoggerFactory.getLogger(StatsdMetricForwarder.class);
-  private static final String METRICPROBE_PREFIX = "dynamic.instrumentation.metric.probe";
+public class StatsdMetricForwarder implements DebuggerContext.MetricForwarder, StatsDClientErrorHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(StatsdMetricForwarder.class);
+    private static final String METRICPROBE_PREFIX = "dynamic.instrumentation.metric.probe";
 
-  private final StatsDClient statsd;
-  private final ProbeStatusSink probeStatusSink;
+    private final StatsDClient statsd;
+    private final ProbeStatusSink probeStatusSink;
 
-  public StatsdMetricForwarder(Config config, ProbeStatusSink probeStatusSink) {
-    statsd =
-        DDAgentStatsDClientManager.statsDClientManager()
-            .statsDClient(
-                config.getJmxFetchStatsdHost(),
-                config.getJmxFetchStatsdPort(),
-                config.getDogStatsDNamedPipe(),
-                METRICPROBE_PREFIX,
-                new String[0]);
-    this.probeStatusSink = probeStatusSink;
-  }
+    public StatsdMetricForwarder(Config config, ProbeStatusSink probeStatusSink) {
+        statsd = DDAgentStatsDClientManager.statsDClientManager()
+                .statsDClient(
+                        config.getJmxFetchStatsdHost(),
+                        config.getJmxFetchStatsdPort(),
+                        config.getDogStatsDNamedPipe(),
+                        METRICPROBE_PREFIX,
+                        new String[0]);
+        this.probeStatusSink = probeStatusSink;
+    }
 
-  @Override
-  public void count(String encodedProbeId, String name, long delta, String[] tags) {
-    statsd.count(name, delta, tags);
-    sendEmittingStatus(encodedProbeId);
-  }
+    @Override
+    public void count(String encodedProbeId, String name, long delta, String[] tags) {
+        statsd.count(name, delta, tags);
+        sendEmittingStatus(encodedProbeId);
+    }
 
-  @Override
-  public void gauge(String encodedProbeId, String name, long value, String[] tags) {
-    statsd.gauge(name, value, tags);
-    sendEmittingStatus(encodedProbeId);
-  }
+    @Override
+    public void gauge(String encodedProbeId, String name, long value, String[] tags) {
+        statsd.gauge(name, value, tags);
+        sendEmittingStatus(encodedProbeId);
+    }
 
-  @Override
-  public void gauge(String encodedProbeId, String name, double value, String[] tags) {
-    statsd.gauge(name, value, tags);
-    sendEmittingStatus(encodedProbeId);
-  }
+    @Override
+    public void gauge(String encodedProbeId, String name, double value, String[] tags) {
+        statsd.gauge(name, value, tags);
+        sendEmittingStatus(encodedProbeId);
+    }
 
-  @Override
-  public void histogram(String encodedProbeId, String name, long value, String[] tags) {
-    statsd.histogram(name, value, tags);
-    sendEmittingStatus(encodedProbeId);
-  }
+    @Override
+    public void histogram(String encodedProbeId, String name, long value, String[] tags) {
+        statsd.histogram(name, value, tags);
+        sendEmittingStatus(encodedProbeId);
+    }
 
-  @Override
-  public void histogram(String encodedProbeId, String name, double value, String[] tags) {
-    statsd.histogram(name, value, tags);
-    sendEmittingStatus(encodedProbeId);
-  }
+    @Override
+    public void histogram(String encodedProbeId, String name, double value, String[] tags) {
+        statsd.histogram(name, value, tags);
+        sendEmittingStatus(encodedProbeId);
+    }
 
-  @Override
-  public void distribution(String encodedProbeId, String name, long value, String[] tags) {
-    statsd.distribution(name, value, tags);
-    sendEmittingStatus(encodedProbeId);
-  }
+    @Override
+    public void distribution(String encodedProbeId, String name, long value, String[] tags) {
+        statsd.distribution(name, value, tags);
+        sendEmittingStatus(encodedProbeId);
+    }
 
-  @Override
-  public void distribution(String encodedProbeId, String name, double value, String[] tags) {
-    statsd.distribution(name, value, tags);
-    sendEmittingStatus(encodedProbeId);
-  }
+    @Override
+    public void distribution(String encodedProbeId, String name, double value, String[] tags) {
+        statsd.distribution(name, value, tags);
+        sendEmittingStatus(encodedProbeId);
+    }
 
-  @Override
-  public void handle(Exception exception) {
-    LOGGER.warn("Error when sending metrics: ", exception);
-  }
+    @Override
+    public void handle(Exception exception) {
+        LOGGER.warn("Error when sending metrics: ", exception);
+    }
 
-  private void sendEmittingStatus(String encodedProbeId) {
-    probeStatusSink.addEmitting(encodedProbeId);
-  }
+    private void sendEmittingStatus(String encodedProbeId) {
+        probeStatusSink.addEmitting(encodedProbeId);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java
index cb06f95958e..151430ada1f 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java
@@ -19,66 +19,64 @@
 import org.slf4j.LoggerFactory;
 
 public class StringTemplateBuilder {
-  private static final Logger LOGGER = LoggerFactory.getLogger(StringTemplateBuilder.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StringTemplateBuilder.class);
 
-  /**
-   * Serialization limits for log messages. Most values are lower than snapshot because you can
-   * directly reference values that are in your interest with Expression Language:
-   * obj.field.deepfield or array[1001]
-   */
-  private final List<LogProbe.Segment> segments;
+    /**
+     * Serialization limits for log messages. Most values are lower than snapshot because you can
+     * directly reference values that are in your interest with Expression Language:
+     * obj.field.deepfield or array[1001]
+     */
+    private final List<LogProbe.Segment> segments;
 
-  private final Limits limits;
-  private final Duration timeout;
+    private final Limits limits;
+    private final Duration timeout;
 
-  public StringTemplateBuilder(List<LogProbe.Segment> segments, Limits limits, Duration timeout) {
-    this.segments = segments;
-    this.limits = limits;
-    this.timeout = timeout;
-  }
-
-  public String evaluate(CapturedContext context, LogProbe.LogStatus status) {
-    if (segments == null) {
-      return null;
+    public StringTemplateBuilder(List<LogProbe.Segment> segments, Limits limits, Duration timeout) {
+        this.segments = segments;
+        this.limits = limits;
+        this.timeout = timeout;
     }
-    StringBuilder sb = new StringBuilder();
-    // Only one timeout for all expressions
-    TimeoutChecker timeoutChecker = TimeoutChecker.create(Config.get(), timeout);
-    for (LogProbe.Segment segment : segments) {
-      ValueScript parsedExr = segment.getParsedExpr();
-      if (segment.getStr() != null) {
-        sb.append(segment.getStr());
-      } else {
-        if (parsedExr != null) {
-          try {
-            Value<?> result = parsedExr.execute(context, timeoutChecker);
-            if (result.isUndefined()) {
-              sb.append(result.getValue());
-            } else if (result.isNull()) {
-              sb.append("null");
+
+    public String evaluate(CapturedContext context, LogProbe.LogStatus status) {
+        if (segments == null) {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        // Only one timeout for all expressions
+        TimeoutChecker timeoutChecker = TimeoutChecker.create(Config.get(), timeout);
+        for (LogProbe.Segment segment : segments) {
+            ValueScript parsedExr = segment.getParsedExpr();
+            if (segment.getStr() != null) {
+                sb.append(segment.getStr());
             } else {
-              serializeValue(
-                  sb, segment.getParsedExpr().getDsl(), result.getValue(), status, limits);
+                if (parsedExr != null) {
+                    try {
+                        Value<?> result = parsedExr.execute(context, timeoutChecker);
+                        if (result.isUndefined()) {
+                            sb.append(result.getValue());
+                        } else if (result.isNull()) {
+                            sb.append("null");
+                        } else {
+                            serializeValue(sb, segment.getParsedExpr().getDsl(), result.getValue(), status, limits);
+                        }
+                    } catch (EvaluationException ex) {
+                        handleException(status, ex, ex.getExpr(), sb);
+                    } catch (Exception ex) {
+                        // catch all for unexpected exceptions
+                        handleException(status, ex, segment.getExpr(), sb);
+                    }
+                    if (!status.getErrors().isEmpty()) {
+                        status.setLogTemplateErrors(true);
+                    }
+                }
             }
-          } catch (EvaluationException ex) {
-            handleException(status, ex, ex.getExpr(), sb);
-          } catch (Exception ex) {
-            // catch all for unexpected exceptions
-            handleException(status, ex, segment.getExpr(), sb);
-          }
-          if (!status.getErrors().isEmpty()) {
-            status.setLogTemplateErrors(true);
-          }
         }
-      }
+        return sb.toString();
     }
-    return sb.toString();
-  }
 
-  private static void handleException(
-      LogProbe.LogStatus status, Exception ex, String expr, StringBuilder sb) {
-    status.addError(new EvaluationError(expr, ex.getMessage()));
-    String msg = ex instanceof RedactedException ? Redaction.REDACTED_VALUE : ex.getMessage();
-    sb.append('{').append(msg).append('}');
-  }
+    private static void handleException(LogProbe.LogStatus status, Exception ex, String expr, StringBuilder sb) {
+        status.addError(new EvaluationError(expr, ex.getMessage()));
+        String msg = ex instanceof RedactedException ? Redaction.REDACTED_VALUE : ex.getMessage();
+        sb.append('{').append(msg).append('}');
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ThirdPartyLibraries.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ThirdPartyLibraries.java
index 94460055129..b14ee4a760e 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ThirdPartyLibraries.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ThirdPartyLibraries.java
@@ -18,89 +18,83 @@
 
 public class ThirdPartyLibraries {
 
-  public static final ThirdPartyLibraries INSTANCE = new ThirdPartyLibraries();
-  public static final char[] ALPHABET = "abcdefghijklmnopqrstuvwxyz".toCharArray();
-  private static final Logger LOGGER = LoggerFactory.getLogger(ThirdPartyLibraries.class);
-  private static final JsonAdapter<InternalConfig> ADAPTER =
-      new Moshi.Builder().build().adapter(InternalConfig.class);
-  private static final String FILE_NAME = "/third_party_libraries.json";
-  private static final Set<String> DEFAULT_SHADING_IDENTIFIERS =
-      new HashSet<>(
-          Arrays.asList(
-              "shaded",
-              "thirdparty",
-              "dependencies",
-              "relocated",
-              "bundled",
-              "embedded",
-              "vendor",
-              "repackaged",
-              "shadow",
-              "shim",
-              "wrapper"));
+    public static final ThirdPartyLibraries INSTANCE = new ThirdPartyLibraries();
+    public static final char[] ALPHABET = "abcdefghijklmnopqrstuvwxyz".toCharArray();
+    private static final Logger LOGGER = LoggerFactory.getLogger(ThirdPartyLibraries.class);
+    private static final JsonAdapter<InternalConfig> ADAPTER =
+            new Moshi.Builder().build().adapter(InternalConfig.class);
+    private static final String FILE_NAME = "/third_party_libraries.json";
+    private static final Set<String> DEFAULT_SHADING_IDENTIFIERS = new HashSet<>(Arrays.asList(
+            "shaded",
+            "thirdparty",
+            "dependencies",
+            "relocated",
+            "bundled",
+            "embedded",
+            "vendor",
+            "repackaged",
+            "shadow",
+            "shim",
+            "wrapper"));
 
-  private ThirdPartyLibraries() {}
+    private ThirdPartyLibraries() {}
 
-  public Set<String> getThirdPartyLibraries(Config config) {
-    try (InputStream inputStream = this.getClass().getResourceAsStream(FILE_NAME)) {
-      InternalConfig defaults = readConfig(inputStream);
-      Set<String> excludes =
-          config.getThirdPartyIncludes().stream()
-              .filter(s -> !s.isEmpty())
-              .collect(Collectors.toSet());
-      excludes.addAll(defaults.getPrefixes());
-      return excludes;
-    } catch (Exception e) {
-      LOGGER.error("Failed reading {}. Treating all classes as third party.", FILE_NAME, e);
-      return getExcludeAll();
+    public Set<String> getThirdPartyLibraries(Config config) {
+        try (InputStream inputStream = this.getClass().getResourceAsStream(FILE_NAME)) {
+            InternalConfig defaults = readConfig(inputStream);
+            Set<String> excludes = config.getThirdPartyIncludes().stream()
+                    .filter(s -> !s.isEmpty())
+                    .collect(Collectors.toSet());
+            excludes.addAll(defaults.getPrefixes());
+            return excludes;
+        } catch (Exception e) {
+            LOGGER.error("Failed reading {}. Treating all classes as third party.", FILE_NAME, e);
+            return getExcludeAll();
+        }
     }
-  }
 
-  public Set<String> getThirdPartyExcludes(Config config) {
-    return config.getThirdPartyExcludes().stream()
-        .filter(s -> !s.isEmpty())
-        .collect(Collectors.toSet());
-  }
+    public Set<String> getThirdPartyExcludes(Config config) {
+        return config.getThirdPartyExcludes().stream().filter(s -> !s.isEmpty()).collect(Collectors.toSet());
+    }
 
-  public Set<String> getShadingIdentifiers(Config config) {
-    Stream<String> configStream =
-        config.getThirdPartyShadingIdentifiers().stream().filter(s -> !s.isEmpty());
-    return Stream.concat(configStream, DEFAULT_SHADING_IDENTIFIERS.stream())
-        .collect(Collectors.toSet());
-  }
+    public Set<String> getShadingIdentifiers(Config config) {
+        Stream<String> configStream =
+                config.getThirdPartyShadingIdentifiers().stream().filter(s -> !s.isEmpty());
+        return Stream.concat(configStream, DEFAULT_SHADING_IDENTIFIERS.stream()).collect(Collectors.toSet());
+    }
 
-  // Add a*, b*, c*, ..., z* to the exclude trie in ClassNameFiltering. Simply adding * does not
-  // work.
-  private static Set<String> getExcludeAll() {
-    Set<String> excludeAllPrefixes = new HashSet<>();
-    for (char c : ALPHABET) {
-      excludeAllPrefixes.add(String.valueOf(c));
+    // Add a*, b*, c*, ..., z* to the exclude trie in ClassNameFiltering. Simply adding * does not
+    // work.
+    private static Set<String> getExcludeAll() {
+        Set<String> excludeAllPrefixes = new HashSet<>();
+        for (char c : ALPHABET) {
+            excludeAllPrefixes.add(String.valueOf(c));
+        }
+        return excludeAllPrefixes;
     }
-    return excludeAllPrefixes;
-  }
 
-  private static InternalConfig readConfig(InputStream inputStream) throws IOException {
-    try (InputStreamReader isr = new InputStreamReader(inputStream);
-        BufferedReader reader = new BufferedReader(isr)) {
-      return ADAPTER.fromJson(reader.lines().collect(Collectors.joining(System.lineSeparator())));
+    private static InternalConfig readConfig(InputStream inputStream) throws IOException {
+        try (InputStreamReader isr = new InputStreamReader(inputStream);
+                BufferedReader reader = new BufferedReader(isr)) {
+            return ADAPTER.fromJson(reader.lines().collect(Collectors.joining(System.lineSeparator())));
+        }
     }
-  }
 
-  private static class InternalConfig {
-    private String version;
-    private List<String> prefixes;
+    private static class InternalConfig {
+        private String version;
+        private List<String> prefixes;
 
-    public InternalConfig(String version, List<String> prefixes) {
-      this.version = version;
-      this.prefixes = prefixes;
-    }
+        public InternalConfig(String version, List<String> prefixes) {
+            this.version = version;
+            this.prefixes = prefixes;
+        }
 
-    public String getVersion() {
-      return version;
-    }
+        public String getVersion() {
+            return version;
+        }
 
-    public List<String> getPrefixes() {
-      return prefixes;
+        public List<String> getPrefixes() {
+            return prefixes;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/TransformerDefinitionMatcher.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/TransformerDefinitionMatcher.java
index 64158a27c28..f50454e4d25 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/TransformerDefinitionMatcher.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/TransformerDefinitionMatcher.java
@@ -16,151 +16,139 @@
 
 /** Handles class matching logic for probe definition */
 public class TransformerDefinitionMatcher {
-  private static final Logger LOG = LoggerFactory.getLogger(TransformerDefinitionMatcher.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TransformerDefinitionMatcher.class);
 
-  private final Map<String, List<ProbeDefinition>> definitionsByClass;
-  private final Map<String, List<ProbeDefinition>> definitionsBySimpleFileNames = new HashMap<>();
-  private final Map<String, List<ProbeDefinition>> definitionsByQualifiedFileNames =
-      new HashMap<>();
-  private final Trie definitionFileNames;
+    private final Map<String, List<ProbeDefinition>> definitionsByClass;
+    private final Map<String, List<ProbeDefinition>> definitionsBySimpleFileNames = new HashMap<>();
+    private final Map<String, List<ProbeDefinition>> definitionsByQualifiedFileNames = new HashMap<>();
+    private final Trie definitionFileNames;
 
-  public TransformerDefinitionMatcher(Configuration configuration) {
-    this.definitionsByClass = buildDefinitionsMap(configuration.getDefinitions());
-    populateDefinitionFileNamesMap(configuration.getDefinitions());
-    this.definitionFileNames = buildDefinitionFileNamesTrie(definitionsByQualifiedFileNames);
-  }
+    public TransformerDefinitionMatcher(Configuration configuration) {
+        this.definitionsByClass = buildDefinitionsMap(configuration.getDefinitions());
+        populateDefinitionFileNamesMap(configuration.getDefinitions());
+        this.definitionFileNames = buildDefinitionFileNamesTrie(definitionsByQualifiedFileNames);
+    }
 
-  private Map<String, List<ProbeDefinition>> buildDefinitionsMap(
-      Collection<ProbeDefinition> definitions) {
-    Map<String, List<ProbeDefinition>> map = new HashMap<>();
-    for (ProbeDefinition definition : definitions) {
-      String className = definition.getWhere().getTypeName();
-      if (className == null || className.equals("")) {
-        className = definition.getWhere().getSourceFile();
-        if (className == null || className.equals("")) {
-          LOG.warn("Debugger definition {} cannot be prepared for matching", definition.getId());
-          continue;
-        }
-        if (className.endsWith(".groovy")) {
-          // special case for groovy because script does not have a proper source file name
-          // so we are relying solely on filename without extension to match
-          className = className.substring(0, className.length() - ".groovy".length());
+    private Map<String, List<ProbeDefinition>> buildDefinitionsMap(Collection<ProbeDefinition> definitions) {
+        Map<String, List<ProbeDefinition>> map = new HashMap<>();
+        for (ProbeDefinition definition : definitions) {
+            String className = definition.getWhere().getTypeName();
+            if (className == null || className.equals("")) {
+                className = definition.getWhere().getSourceFile();
+                if (className == null || className.equals("")) {
+                    LOG.warn("Debugger definition {} cannot be prepared for matching", definition.getId());
+                    continue;
+                }
+                if (className.endsWith(".groovy")) {
+                    // special case for groovy because script does not have a proper source file name
+                    // so we are relying solely on filename without extension to match
+                    className = className.substring(0, className.length() - ".groovy".length());
+                }
+            }
+            List<ProbeDefinition> definitionByClass = map.computeIfAbsent(className, key -> new ArrayList<>());
+            definitionByClass.add(definition);
         }
-      }
-      List<ProbeDefinition> definitionByClass =
-          map.computeIfAbsent(className, key -> new ArrayList<>());
-      definitionByClass.add(definition);
+        return map;
     }
-    return map;
-  }
 
-  private void populateDefinitionFileNamesMap(Collection<ProbeDefinition> definitions) {
-    for (ProbeDefinition definition : definitions) {
-      String fileName = definition.getWhere().getSourceFile();
-      if (fileName == null) {
-        continue;
-      }
-      fileName = normalizeWindowsToUnixPath(fileName);
-      fileName = fileName.toLowerCase(Locale.ROOT);
-      Map<String, List<ProbeDefinition>> targetMap =
-          fileName.indexOf('/') != -1
-              ? definitionsByQualifiedFileNames
-              : definitionsBySimpleFileNames;
-      targetMap.computeIfAbsent("/" + fileName, key -> new ArrayList<>()).add(definition);
+    private void populateDefinitionFileNamesMap(Collection<ProbeDefinition> definitions) {
+        for (ProbeDefinition definition : definitions) {
+            String fileName = definition.getWhere().getSourceFile();
+            if (fileName == null) {
+                continue;
+            }
+            fileName = normalizeWindowsToUnixPath(fileName);
+            fileName = fileName.toLowerCase(Locale.ROOT);
+            Map<String, List<ProbeDefinition>> targetMap =
+                    fileName.indexOf('/') != -1 ? definitionsByQualifiedFileNames : definitionsBySimpleFileNames;
+            targetMap.computeIfAbsent("/" + fileName, key -> new ArrayList<>()).add(definition);
+        }
     }
-  }
 
-  private static String normalizeWindowsToUnixPath(String fileName) {
-    return fileName.replace('\\', '/');
-  }
-
-  private Trie buildDefinitionFileNamesTrie(
-      Map<String, List<ProbeDefinition>> definitionsByFileNames) {
-    Trie resultTrie = new Trie();
-    // Build a prefix trie by reversing filenames in probe definitions
-    for (Map.Entry<String, List<ProbeDefinition>> entry : definitionsByFileNames.entrySet()) {
-      String sourceFile = entry.getKey();
-      resultTrie.insert(reverseStr(sourceFile));
+    private static String normalizeWindowsToUnixPath(String fileName) {
+        return fileName.replace('\\', '/');
     }
-    return resultTrie;
-  }
-
-  public boolean isEmpty() {
-    return definitionsByClass.isEmpty();
-  }
 
-  public List<ProbeDefinition> match(
-      Class<?> classBeingRedefined, String classFilePath, String typeName, byte[] classfileBuffer) {
-    List<ProbeDefinition> byTypeDefinitions =
-        matchProbeDefinitionsByType(classBeingRedefined, typeName);
-    List<ProbeDefinition> results = new ArrayList<>(byTypeDefinitions);
-    List<ProbeDefinition> bySourceFileDefinitions =
-        matchProbeDefinitionsBySourceFile(classFilePath, classfileBuffer);
-    results.addAll(bySourceFileDefinitions);
-    return results;
-  }
-
-  private List<ProbeDefinition> matchProbeDefinitionsByType(
-      Class<?> classBeingRedefined, String typeName) {
-    List<ProbeDefinition> byTypeDefinitions = new ArrayList<>();
-    // try matching on FQN (java.lang.String)
-    List<ProbeDefinition> definitions = definitionsByClass.get(typeName);
-    if (definitions != null) {
-      byTypeDefinitions.addAll(definitions);
-    }
-    // fallback to matching on SimpleName (String)
-    String simpleClassName =
-        classBeingRedefined != null
-            ? classBeingRedefined.getSimpleName()
-            : typeName.substring(typeName.lastIndexOf('.') + 1); // strip the package name
-    if (typeName.equals(simpleClassName)) {
-      return byTypeDefinitions;
-    }
-    definitions = definitionsByClass.get(simpleClassName);
-    if (definitions != null) {
-      byTypeDefinitions.addAll(definitions);
+    private Trie buildDefinitionFileNamesTrie(Map<String, List<ProbeDefinition>> definitionsByFileNames) {
+        Trie resultTrie = new Trie();
+        // Build a prefix trie by reversing filenames in probe definitions
+        for (Map.Entry<String, List<ProbeDefinition>> entry : definitionsByFileNames.entrySet()) {
+            String sourceFile = entry.getKey();
+            resultTrie.insert(reverseStr(sourceFile));
+        }
+        return resultTrie;
     }
-    return byTypeDefinitions;
-  }
 
-  private List<ProbeDefinition> matchProbeDefinitionsBySourceFile(
-      String className, byte[] classfileBuffer) {
-    // try to match filename, need to retrieve the source filename from classfile
-    String reversedClassName = reverseStr(className);
-    int idx = reversedClassName.indexOf('/');
-    boolean hasPackageName = idx > -1;
-    String reversedPackageName = reversedClassName.substring(idx + 1);
-    // Retrieve the actual source file name
-    String sourceFileName = ClassFileHelper.extractSourceFile(classfileBuffer);
-    if (sourceFileName == null) {
-      return Collections.emptyList();
+    public boolean isEmpty() {
+        return definitionsByClass.isEmpty();
     }
-    String reversedSourceFileName = reverseStr("/" + sourceFileName);
-    StringBuilder sb = new StringBuilder(reversedSourceFileName);
-    if (hasPackageName) {
-      sb.append(reversedPackageName);
+
+    public List<ProbeDefinition> match(
+            Class<?> classBeingRedefined, String classFilePath, String typeName, byte[] classfileBuffer) {
+        List<ProbeDefinition> byTypeDefinitions = matchProbeDefinitionsByType(classBeingRedefined, typeName);
+        List<ProbeDefinition> results = new ArrayList<>(byTypeDefinitions);
+        List<ProbeDefinition> bySourceFileDefinitions =
+                matchProbeDefinitionsBySourceFile(classFilePath, classfileBuffer);
+        results.addAll(bySourceFileDefinitions);
+        return results;
     }
-    String reversedFileName = sb.toString();
-    reversedFileName = reversedFileName.toLowerCase(Locale.ROOT);
-    List<ProbeDefinition> bySourceFileDefinitions = new ArrayList<>();
-    // try match qualified filenames
-    Collection<String> matchingFileNames =
-        definitionFileNames.getStringsStartingWith(reversedFileName);
-    if (!matchingFileNames.isEmpty()) {
-      for (String matchingFileName : matchingFileNames) {
-        List<ProbeDefinition> definitions =
-            definitionsByQualifiedFileNames.get(reverseStr(matchingFileName));
+
+    private List<ProbeDefinition> matchProbeDefinitionsByType(Class<?> classBeingRedefined, String typeName) {
+        List<ProbeDefinition> byTypeDefinitions = new ArrayList<>();
+        // try matching on FQN (java.lang.String)
+        List<ProbeDefinition> definitions = definitionsByClass.get(typeName);
         if (definitions != null) {
-          bySourceFileDefinitions.addAll(definitions);
+            byTypeDefinitions.addAll(definitions);
+        }
+        // fallback to matching on SimpleName (String)
+        String simpleClassName = classBeingRedefined != null
+                ? classBeingRedefined.getSimpleName()
+                : typeName.substring(typeName.lastIndexOf('.') + 1); // strip the package name
+        if (typeName.equals(simpleClassName)) {
+            return byTypeDefinitions;
         }
-      }
+        definitions = definitionsByClass.get(simpleClassName);
+        if (definitions != null) {
+            byTypeDefinitions.addAll(definitions);
+        }
+        return byTypeDefinitions;
     }
-    // try match simple filenames
-    sourceFileName = sourceFileName.toLowerCase(Locale.ROOT);
-    List<ProbeDefinition> definitions = definitionsBySimpleFileNames.get("/" + sourceFileName);
-    if (definitions != null) {
-      bySourceFileDefinitions.addAll(definitions);
+
+    private List<ProbeDefinition> matchProbeDefinitionsBySourceFile(String className, byte[] classfileBuffer) {
+        // try to match filename, need to retrieve the source filename from classfile
+        String reversedClassName = reverseStr(className);
+        int idx = reversedClassName.indexOf('/');
+        boolean hasPackageName = idx > -1;
+        String reversedPackageName = reversedClassName.substring(idx + 1);
+        // Retrieve the actual source file name
+        String sourceFileName = ClassFileHelper.extractSourceFile(classfileBuffer);
+        if (sourceFileName == null) {
+            return Collections.emptyList();
+        }
+        String reversedSourceFileName = reverseStr("/" + sourceFileName);
+        StringBuilder sb = new StringBuilder(reversedSourceFileName);
+        if (hasPackageName) {
+            sb.append(reversedPackageName);
+        }
+        String reversedFileName = sb.toString();
+        reversedFileName = reversedFileName.toLowerCase(Locale.ROOT);
+        List<ProbeDefinition> bySourceFileDefinitions = new ArrayList<>();
+        // try match qualified filenames
+        Collection<String> matchingFileNames = definitionFileNames.getStringsStartingWith(reversedFileName);
+        if (!matchingFileNames.isEmpty()) {
+            for (String matchingFileName : matchingFileNames) {
+                List<ProbeDefinition> definitions = definitionsByQualifiedFileNames.get(reverseStr(matchingFileName));
+                if (definitions != null) {
+                    bySourceFileDefinitions.addAll(definitions);
+                }
+            }
+        }
+        // try match simple filenames
+        sourceFileName = sourceFileName.toLowerCase(Locale.ROOT);
+        List<ProbeDefinition> definitions = definitionsBySimpleFileNames.get("/" + sourceFileName);
+        if (definitions != null) {
+            bySourceFileDefinitions.addAll(definitions);
+        }
+        return bySourceFileDefinitions;
     }
-    return bySourceFileDefinitions;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/Trie.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/Trie.java
index 3ba2737c156..ba58ac9749c 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/Trie.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/Trie.java
@@ -19,145 +19,145 @@
  * prefixes inside the trie (usage 2.)
  */
 public class Trie {
-  private TrieNode root;
+    private TrieNode root;
 
-  public Trie() {
-    root = new TrieNode((char) 0);
-  }
+    public Trie() {
+        root = new TrieNode((char) 0);
+    }
 
-  public Trie(Collection<String> collection) {
-    this();
-    for (String str : collection) {
-      insert(str);
+    public Trie(Collection<String> collection) {
+        this();
+        for (String str : collection) {
+            insert(str);
+        }
     }
-  }
-
-  public void insert(String str) {
-    Map<Character, TrieNode> children = root.children;
-    for (int i = 0; i < str.length(); i++) {
-      char c = str.charAt(i);
-      TrieNode node;
-      if (children.containsKey(c)) {
-        node = children.get(c);
-      } else {
-        node = new TrieNode(c);
-        children.put(c, node);
-      }
-      children = node.children;
-      node.isLeaf = i == str.length() - 1;
-      if (node.isLeaf) {
-        node.str = str;
-      }
+
+    public void insert(String str) {
+        Map<Character, TrieNode> children = root.children;
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            TrieNode node;
+            if (children.containsKey(c)) {
+                node = children.get(c);
+            } else {
+                node = new TrieNode(c);
+                children.put(c, node);
+            }
+            children = node.children;
+            node.isLeaf = i == str.length() - 1;
+            if (node.isLeaf) {
+                node.str = str;
+            }
+        }
     }
-  }
-
-  /**
-   * @return if the string is in the trie.
-   */
-  public boolean contains(String str) {
-    TrieNode t = searchNode(str, false);
-    return t != null && t.isLeaf;
-  }
-
-  /**
-   * @return if there is any word in the trie that starts with the given prefix
-   */
-  public boolean containsPrefix(String prefix) {
-    return searchNode(prefix, false) != null;
-  }
-
-  /**
-   * @return true if str matches one of the prefixes stored into the trie
-   */
-  public boolean hasMatchingPrefix(String str) {
-    return searchNode(str, true) != null;
-  }
-
-  /**
-   * @return true is there is no string inserted into the Trie, otherwise false
-   */
-  public boolean isEmpty() {
-    return root.children.isEmpty();
-  }
-
-  /**
-   * @param prefix prefix to search into the trie
-   * @return the string if unique that matches the given prefix, otherwise null
-   */
-  public String getStringStartingWith(String prefix) {
-    TrieNode node = searchNode(prefix, false);
-    if (node == null) {
-      return null;
+
+    /**
+     * @return if the string is in the trie.
+     */
+    public boolean contains(String str) {
+        TrieNode t = searchNode(str, false);
+        return t != null && t.isLeaf;
     }
-    // while there is a unique path to the leaf, move forward
-    while (!node.isLeaf && node.children.size() == 1) {
-      node = node.children.values().iterator().next();
+
+    /**
+     * @return if there is any word in the trie that starts with the given prefix
+     */
+    public boolean containsPrefix(String prefix) {
+        return searchNode(prefix, false) != null;
     }
-    return node.str;
-  }
-
-  /**
-   * @param prefix prefix to search into the trie
-   * @return all the strings that match the given prefix
-   */
-  public Collection<String> getStringsStartingWith(String prefix) {
-    TrieNode node = searchNode(prefix, false);
-    if (node == null) {
-      return Collections.emptyList();
+
+    /**
+     * @return true if str matches one of the prefixes stored into the trie
+     */
+    public boolean hasMatchingPrefix(String str) {
+        return searchNode(str, true) != null;
     }
-    List<String> result = new ArrayList<>();
-    traverse(node, result);
-    return result;
-  }
-
-  private void traverse(TrieNode currentNode, List<String> result) {
-    if (currentNode.str != null) {
-      result.add(currentNode.str);
+
+    /**
+     * @return true is there is no string inserted into the Trie, otherwise false
+     */
+    public boolean isEmpty() {
+        return root.children.isEmpty();
     }
-    for (TrieNode nextNode : currentNode.children.values()) {
-      traverse(nextNode, result);
+
+    /**
+     * @param prefix prefix to search into the trie
+     * @return the string if unique that matches the given prefix, otherwise null
+     */
+    public String getStringStartingWith(String prefix) {
+        TrieNode node = searchNode(prefix, false);
+        if (node == null) {
+            return null;
+        }
+        // while there is a unique path to the leaf, move forward
+        while (!node.isLeaf && node.children.size() == 1) {
+            node = node.children.values().iterator().next();
+        }
+        return node.str;
     }
-  }
-
-  /**
-   * @param str String to search into the trie
-   * @param prefixMode indicates String in the trie are prefixed and when reaching the leaf node we
-   *     return it
-   * @return last node that matches the whole given string or any prefix if prefixMode is true
-   */
-  private TrieNode searchNode(String str, boolean prefixMode) {
-    Map<Character, TrieNode> children = root.children;
-    TrieNode node = null;
-    for (int i = 0; i < str.length(); i++) {
-      char c = str.charAt(i);
-      if (children.containsKey(c)) {
-        node = children.get(c);
-        children = node.children;
-        if (prefixMode && node.isLeaf) {
-          return node;
+
+    /**
+     * @param prefix prefix to search into the trie
+     * @return all the strings that match the given prefix
+     */
+    public Collection<String> getStringsStartingWith(String prefix) {
+        TrieNode node = searchNode(prefix, false);
+        if (node == null) {
+            return Collections.emptyList();
+        }
+        List<String> result = new ArrayList<>();
+        traverse(node, result);
+        return result;
+    }
+
+    private void traverse(TrieNode currentNode, List<String> result) {
+        if (currentNode.str != null) {
+            result.add(currentNode.str);
+        }
+        for (TrieNode nextNode : currentNode.children.values()) {
+            traverse(nextNode, result);
         }
-      } else {
-        return null;
-      }
     }
-    return node;
-  }
 
-  public static String reverseStr(String str) {
-    if (str == null) {
-      return null;
+    /**
+     * @param str String to search into the trie
+     * @param prefixMode indicates String in the trie are prefixed and when reaching the leaf node we
+     *     return it
+     * @return last node that matches the whole given string or any prefix if prefixMode is true
+     */
+    private TrieNode searchNode(String str, boolean prefixMode) {
+        Map<Character, TrieNode> children = root.children;
+        TrieNode node = null;
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            if (children.containsKey(c)) {
+                node = children.get(c);
+                children = node.children;
+                if (prefixMode && node.isLeaf) {
+                    return node;
+                }
+            } else {
+                return null;
+            }
+        }
+        return node;
     }
-    return new StringBuilder(str).reverse().toString();
-  }
 
-  private static class TrieNode {
-    final char c;
-    final Map<Character, TrieNode> children = new HashMap<>();
-    boolean isLeaf;
-    String str;
+    public static String reverseStr(String str) {
+        if (str == null) {
+            return null;
+        }
+        return new StringBuilder(str).reverse().toString();
+    }
 
-    public TrieNode(char c) {
-      this.c = c;
+    private static class TrieNode {
+        final char c;
+        final Map<Character, TrieNode> children = new HashMap<>();
+        boolean isLeaf;
+        String str;
+
+        public TrieNode(char c) {
+            this.c = c;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/TypeNameHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/TypeNameHelper.java
index 7bc13cdaff1..a38430617dc 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/TypeNameHelper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/TypeNameHelper.java
@@ -3,33 +3,33 @@
 /** Helper class for matching class name */
 public class TypeNameHelper {
 
-  public static String extractSimpleName(Class<?> clazz) {
-    String typeName;
-    try {
-      typeName = clazz.getSimpleName();
-    } catch (Throwable ex) {
-      // if class is from DataDog Classloader can have issues getting simple name
-      typeName = "";
+    public static String extractSimpleName(Class<?> clazz) {
+        String typeName;
+        try {
+            typeName = clazz.getSimpleName();
+        } catch (Throwable ex) {
+            // if class is from DataDog Classloader can have issues getting simple name
+            typeName = "";
+        }
+        if (typeName.equals("")) {
+            // fallback to parsing getName()
+            typeName = extractSimpleNameFromName(clazz.getName());
+        }
+        return typeName;
     }
-    if (typeName.equals("")) {
-      // fallback to parsing getName()
-      typeName = extractSimpleNameFromName(clazz.getName());
-    }
-    return typeName;
-  }
 
-  static String extractSimpleNameFromName(String className) {
-    int idx = className.lastIndexOf('$');
-    String typeName;
-    if (idx != -1) {
-      typeName = className.substring(idx + 1); // strip the package & enclosing name
-      if (typeName.length() > 0 && Character.isDigit(typeName.charAt(0))) {
-        // this is anonymous class let's keep the enclosing name
-        typeName = className.substring(className.lastIndexOf('.') + 1); // strip the package name
-      }
-    } else {
-      typeName = className.substring(className.lastIndexOf('.') + 1); // strip the package name
+    static String extractSimpleNameFromName(String className) {
+        int idx = className.lastIndexOf('$');
+        String typeName;
+        if (idx != -1) {
+            typeName = className.substring(idx + 1); // strip the package & enclosing name
+            if (typeName.length() > 0 && Character.isDigit(typeName.charAt(0))) {
+                // this is anonymous class let's keep the enclosing name
+                typeName = className.substring(className.lastIndexOf('.') + 1); // strip the package name
+            }
+        } else {
+            typeName = className.substring(className.lastIndexOf('.') + 1); // strip the package name
+        }
+        return typeName;
     }
-    return typeName;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java
index 1cfd654d295..cf9e3946d22 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java
@@ -33,143 +33,134 @@
 import org.slf4j.LoggerFactory;
 
 public class DefaultCodeOriginRecorder implements CodeOriginRecorder {
-  private static final Logger LOG = LoggerFactory.getLogger(DefaultCodeOriginRecorder.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DefaultCodeOriginRecorder.class);
 
-  private final ConfigurationUpdater configurationUpdater;
+    private final ConfigurationUpdater configurationUpdater;
 
-  private final Map<String, CodeOriginProbe> probesByFingerprint = new ConcurrentHashMap<>();
+    private final Map<String, CodeOriginProbe> probesByFingerprint = new ConcurrentHashMap<>();
 
-  private final Map<String, CodeOriginProbe> probes = new ConcurrentHashMap<>();
-  private final Map<String, LogProbe> logProbes = new ConcurrentHashMap<>();
+    private final Map<String, CodeOriginProbe> probes = new ConcurrentHashMap<>();
+    private final Map<String, LogProbe> logProbes = new ConcurrentHashMap<>();
 
-  private final int maxUserFrames;
+    private final int maxUserFrames;
 
-  private AgentTaskScheduler scheduler;
+    private AgentTaskScheduler scheduler;
 
-  public DefaultCodeOriginRecorder(Config config, ConfigurationUpdater configurationUpdater) {
-    this(config, configurationUpdater, AgentTaskScheduler.get());
-  }
+    public DefaultCodeOriginRecorder(Config config, ConfigurationUpdater configurationUpdater) {
+        this(config, configurationUpdater, AgentTaskScheduler.get());
+    }
 
-  public DefaultCodeOriginRecorder(
-      Config config, ConfigurationUpdater configurationUpdater, AgentTaskScheduler scheduler) {
-    this.configurationUpdater = configurationUpdater;
-    maxUserFrames = config.getDebuggerCodeOriginMaxUserFrames();
-    this.scheduler = scheduler;
-  }
+    public DefaultCodeOriginRecorder(
+            Config config, ConfigurationUpdater configurationUpdater, AgentTaskScheduler scheduler) {
+        this.configurationUpdater = configurationUpdater;
+        maxUserFrames = config.getDebuggerCodeOriginMaxUserFrames();
+        this.scheduler = scheduler;
+    }
 
-  @Override
-  public String captureCodeOrigin(boolean entry) {
-    if (!entry) {
-      LOG.debug("Not capturing code origin for exit");
-      return null;
+    @Override
+    public String captureCodeOrigin(boolean entry) {
+        if (!entry) {
+            LOG.debug("Not capturing code origin for exit");
+            return null;
+        }
+        StackTraceElement element = findPlaceInStack();
+        String fingerprint = Fingerprinter.fingerprint(element);
+        CodeOriginProbe probe = probesByFingerprint.get(fingerprint);
+        if (probe == null) {
+            Where where = Where.of(
+                    element.getClassName(), element.getMethodName(), null, String.valueOf(element.getLineNumber()));
+            probe = createProbe(fingerprint, entry, where);
+        }
+        return probe.getId();
     }
-    StackTraceElement element = findPlaceInStack();
-    String fingerprint = Fingerprinter.fingerprint(element);
-    CodeOriginProbe probe = probesByFingerprint.get(fingerprint);
-    if (probe == null) {
-      Where where =
-          Where.of(
-              element.getClassName(),
-              element.getMethodName(),
-              null,
-              String.valueOf(element.getLineNumber()));
-      probe = createProbe(fingerprint, entry, where);
+
+    @Override
+    public String captureCodeOrigin(String typeName, String methodName, String descriptor, boolean entry) {
+        String fingerprint = typeName + "." + methodName + descriptor;
+        CodeOriginProbe probe = probesByFingerprint.get(fingerprint);
+        if (probe == null) {
+            String signature = Types.descriptorToSignature(descriptor);
+            probe = createProbe(fingerprint, entry, Where.of(typeName, methodName, signature));
+            LOG.debug("Creating probe for method {}", fingerprint);
+        }
+        return probe.getId();
     }
-    return probe.getId();
-  }
-
-  @Override
-  public String captureCodeOrigin(
-      String typeName, String methodName, String descriptor, boolean entry) {
-    String fingerprint = typeName + "." + methodName + descriptor;
-    CodeOriginProbe probe = probesByFingerprint.get(fingerprint);
-    if (probe == null) {
-      String signature = Types.descriptorToSignature(descriptor);
-      probe = createProbe(fingerprint, entry, Where.of(typeName, methodName, signature));
-      LOG.debug("Creating probe for method {}", fingerprint);
+
+    public void registerLogProbe(CodeOriginProbe probe) {
+        logProbes.computeIfAbsent(
+                probe.getId(),
+                key -> new Builder()
+                        .language(probe.getLanguage())
+                        .probeId(ProbeId.newId())
+                        .where(probe.getWhere())
+                        .evaluateAt(probe.getEvaluateAt())
+                        .captureSnapshot(true)
+                        .tags("session_id:*")
+                        .snapshotProcessor(new CodeOriginSnapshotConsumer(probe.entrySpanProbe()))
+                        .build());
     }
-    return probe.getId();
-  }
-
-  public void registerLogProbe(CodeOriginProbe probe) {
-    logProbes.computeIfAbsent(
-        probe.getId(),
-        key ->
-            new Builder()
-                .language(probe.getLanguage())
-                .probeId(ProbeId.newId())
-                .where(probe.getWhere())
-                .evaluateAt(probe.getEvaluateAt())
-                .captureSnapshot(true)
-                .tags("session_id:*")
-                .snapshotProcessor(new CodeOriginSnapshotConsumer(probe.entrySpanProbe()))
-                .build());
-  }
-
-  private CodeOriginProbe createProbe(String fingerPrint, boolean entry, Where where) {
-    CodeOriginProbe probe = new CodeOriginProbe(ProbeId.newId(), entry, where);
-    CodeOriginProbe existing;
-    if ((existing = probesByFingerprint.putIfAbsent(fingerPrint, probe)) != null) {
-      // concurrent calls, considered the probe already installed
-      return existing;
+
+    private CodeOriginProbe createProbe(String fingerPrint, boolean entry, Where where) {
+        CodeOriginProbe probe = new CodeOriginProbe(ProbeId.newId(), entry, where);
+        CodeOriginProbe existing;
+        if ((existing = probesByFingerprint.putIfAbsent(fingerPrint, probe)) != null) {
+            // concurrent calls, considered the probe already installed
+            return existing;
+        }
+        LOG.debug("Creating probe for location {}", where);
+        CodeOriginProbe installed = probes.putIfAbsent(probe.getId(), probe);
+
+        // i think this check is unnecessary at this point time but leaving for now to be safe
+        if (installed == null) {
+            if (Config.get().isDistributedDebuggerEnabled()) {
+                registerLogProbe(probe);
+            }
+            installProbes();
+        }
+        // committing here manually so that first run probe encounters decorate the span until the
+        // instrumentation gets installed
+        AgentSpan span = AgentTracer.activeSpan();
+        if (span != null) {
+            probe.commit(CapturedContext.EMPTY_CONTEXT, CapturedContext.EMPTY_CONTEXT, Collections.emptyList());
+        }
+        return probe;
     }
-    LOG.debug("Creating probe for location {}", where);
-    CodeOriginProbe installed = probes.putIfAbsent(probe.getId(), probe);
-
-    // i think this check is unnecessary at this point time but leaving for now to be safe
-    if (installed == null) {
-      if (Config.get().isDistributedDebuggerEnabled()) {
-        registerLogProbe(probe);
-      }
-      installProbes();
+
+    private StackTraceElement findPlaceInStack() {
+        return StackWalkerFactory.INSTANCE.walk(
+                stream -> stream.filter(element -> !DebuggerContext.isClassNameExcluded(element.getClassName()))
+                        .findFirst()
+                        .orElse(null));
+    }
+
+    public void installProbes() {
+        scheduler.execute(() -> configurationUpdater.accept(CODE_ORIGIN, getProbes()));
     }
-    // committing here manually so that first run probe encounters decorate the span until the
-    // instrumentation gets installed
-    AgentSpan span = AgentTracer.activeSpan();
-    if (span != null) {
-      probe.commit(
-          CapturedContext.EMPTY_CONTEXT, CapturedContext.EMPTY_CONTEXT, Collections.emptyList());
+
+    public CodeOriginProbe getProbe(String probeId) {
+        return probes.get(probeId);
     }
-    return probe;
-  }
-
-  private StackTraceElement findPlaceInStack() {
-    return StackWalkerFactory.INSTANCE.walk(
-        stream ->
-            stream
-                .filter(element -> !DebuggerContext.isClassNameExcluded(element.getClassName()))
-                .findFirst()
-                .orElse(null));
-  }
-
-  public void installProbes() {
-    scheduler.execute(() -> configurationUpdater.accept(CODE_ORIGIN, getProbes()));
-  }
-
-  public CodeOriginProbe getProbe(String probeId) {
-    return probes.get(probeId);
-  }
-
-  public List<ProbeDefinition> getProbes() {
-    return Stream.of(probes.values(), logProbes.values())
-        .flatMap(Collection::stream)
-        .collect(Collectors.toList());
-  }
-
-  private static class CodeOriginSnapshotConsumer implements Consumer<Snapshot> {
-    private final boolean entrySpanProbe;
-
-    public CodeOriginSnapshotConsumer(boolean entrySpanProbe) {
-      this.entrySpanProbe = entrySpanProbe;
+
+    public List<ProbeDefinition> getProbes() {
+        return Stream.of(probes.values(), logProbes.values())
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList());
     }
 
-    @Override
-    public void accept(Snapshot snapshot) {
-      AgentSpan span = AgentTracer.get().activeSpan();
-      span.setTag(DD_CODE_ORIGIN_FRAME_SNAPSHOT_ID, snapshot.getId());
-      if (entrySpanProbe) {
-        span.getLocalRootSpan().setTag(DD_CODE_ORIGIN_FRAME_SNAPSHOT_ID, snapshot.getId());
-      }
+    private static class CodeOriginSnapshotConsumer implements Consumer<Snapshot> {
+        private final boolean entrySpanProbe;
+
+        public CodeOriginSnapshotConsumer(boolean entrySpanProbe) {
+            this.entrySpanProbe = entrySpanProbe;
+        }
+
+        @Override
+        public void accept(Snapshot snapshot) {
+            AgentSpan span = AgentTracer.get().activeSpan();
+            span.setTag(DD_CODE_ORIGIN_FRAME_SNAPSHOT_ID, snapshot.getId());
+            if (entrySpanProbe) {
+                span.getLocalRootSpan().setTag(DD_CODE_ORIGIN_FRAME_SNAPSHOT_ID, snapshot.getId());
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/AbstractExceptionDebugger.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/AbstractExceptionDebugger.java
index e92f65ef223..a0e26cb349a 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/AbstractExceptionDebugger.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/AbstractExceptionDebugger.java
@@ -23,213 +23,200 @@
  * ExceptionProbeManager} to instrument the exception stacktrace and send snapshots.
  */
 public abstract class AbstractExceptionDebugger implements DebuggerContext.ExceptionDebugger {
-  private static final Logger LOGGER = LoggerFactory.getLogger(AbstractExceptionDebugger.class);
-  public static final String DD_DEBUG_ERROR_PREFIX = "_dd.debug.error.";
-  public static final String DD_DEBUG_ERROR_EXCEPTION_ID = DD_DEBUG_ERROR_PREFIX + "exception_id";
-  public static final String DD_DEBUG_ERROR_EXCEPTION_HASH =
-      DD_DEBUG_ERROR_PREFIX + "exception_hash";
-  public static final String SNAPSHOT_ID_TAG_FMT = DD_DEBUG_ERROR_PREFIX + "%d.snapshot_id";
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractExceptionDebugger.class);
+    public static final String DD_DEBUG_ERROR_PREFIX = "_dd.debug.error.";
+    public static final String DD_DEBUG_ERROR_EXCEPTION_ID = DD_DEBUG_ERROR_PREFIX + "exception_id";
+    public static final String DD_DEBUG_ERROR_EXCEPTION_HASH = DD_DEBUG_ERROR_PREFIX + "exception_hash";
+    public static final String SNAPSHOT_ID_TAG_FMT = DD_DEBUG_ERROR_PREFIX + "%d.snapshot_id";
 
-  private final ExceptionProbeManager exceptionProbeManager;
-  private final ConfigurationUpdater configurationUpdater;
-  private final DebuggerContext.ClassNameFilter classNameFiltering;
-  private final int maxCapturedFrames;
-  private final boolean applyConfigAsync;
+    private final ExceptionProbeManager exceptionProbeManager;
+    private final ConfigurationUpdater configurationUpdater;
+    private final DebuggerContext.ClassNameFilter classNameFiltering;
+    private final int maxCapturedFrames;
+    private final boolean applyConfigAsync;
 
-  AbstractExceptionDebugger(
-      ExceptionProbeManager exceptionProbeManager,
-      ConfigurationUpdater configurationUpdater,
-      DebuggerContext.ClassNameFilter classNameFiltering,
-      int maxCapturedFrames,
-      boolean applyConfigAsync) {
-    this.exceptionProbeManager = exceptionProbeManager;
-    this.configurationUpdater = configurationUpdater;
-    this.classNameFiltering = classNameFiltering;
-    this.maxCapturedFrames = maxCapturedFrames;
-    this.applyConfigAsync = applyConfigAsync;
-  }
+    AbstractExceptionDebugger(
+            ExceptionProbeManager exceptionProbeManager,
+            ConfigurationUpdater configurationUpdater,
+            DebuggerContext.ClassNameFilter classNameFiltering,
+            int maxCapturedFrames,
+            boolean applyConfigAsync) {
+        this.exceptionProbeManager = exceptionProbeManager;
+        this.configurationUpdater = configurationUpdater;
+        this.classNameFiltering = classNameFiltering;
+        this.maxCapturedFrames = maxCapturedFrames;
+        this.applyConfigAsync = applyConfigAsync;
+    }
 
-  protected abstract boolean shouldHandleException(Throwable t, AgentSpan span);
+    protected abstract boolean shouldHandleException(Throwable t, AgentSpan span);
 
-  @Override
-  public void handleException(Throwable t, AgentSpan span) {
-    if (!shouldHandleException(t, span)) {
-      if (LOGGER.isDebugEnabled()) {
-        LOGGER.debug("Skip handling exception: {}", t.getClass().getTypeName());
-      }
-      return;
-    }
-    String fingerprint = Fingerprinter.fingerprint(t, classNameFiltering);
-    if (fingerprint == null) {
-      LOGGER.debug("Unable to fingerprint exception", t);
-      return;
-    }
-    Deque<Throwable> chainedExceptions = new ArrayDeque<>();
-    Throwable innerMostException = ExceptionHelper.getInnerMostThrowable(t, chainedExceptions);
-    if (innerMostException == null) {
-      LOGGER.debug("Unable to find root cause of exception");
-      return;
-    }
-    List<Throwable> chainedExceptionsList = new ArrayList<>(chainedExceptions);
-    if (exceptionProbeManager.isAlreadyInstrumented(fingerprint)) {
-      ExceptionProbeManager.ThrowableState state =
-          exceptionProbeManager.getStateByThrowable(innerMostException);
-      if (state == null) {
-        LOGGER.debug(
-            "Unable to find state for throwable: {}", innerMostException.getClass().getTypeName());
-        return;
-      }
-      processSnapshotsAndSetTags(
-          t,
-          innerMostException,
-          span,
-          state,
-          chainedExceptionsList,
-          fingerprint,
-          maxCapturedFrames);
-      exceptionProbeManager.updateLastCapture(fingerprint);
-    } else {
-      // climb up the exception chain to find the first exception that has instrumented frames
-      Throwable throwable;
-      int chainedExceptionIdx = 0;
-      while ((throwable = chainedExceptions.pollFirst()) != null) {
-        StackTraceElement[] stackTrace = throwable.getStackTrace();
-        if (stackTrace == null || stackTrace.length == 0) {
-          continue;
+    @Override
+    public void handleException(Throwable t, AgentSpan span) {
+        if (!shouldHandleException(t, span)) {
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug("Skip handling exception: {}", t.getClass().getTypeName());
+            }
+            return;
+        }
+        String fingerprint = Fingerprinter.fingerprint(t, classNameFiltering);
+        if (fingerprint == null) {
+            LOGGER.debug("Unable to fingerprint exception", t);
+            return;
+        }
+        Deque<Throwable> chainedExceptions = new ArrayDeque<>();
+        Throwable innerMostException = ExceptionHelper.getInnerMostThrowable(t, chainedExceptions);
+        if (innerMostException == null) {
+            LOGGER.debug("Unable to find root cause of exception");
+            return;
         }
-        ExceptionProbeManager.CreationResult creationResult =
-            exceptionProbeManager.createProbesForException(stackTrace, chainedExceptionIdx);
-        if (creationResult.probesCreated > 0) {
-          if (!applyConfigAsync) {
-            applyExceptionConfiguration(fingerprint);
-          } else {
-            AgentTaskScheduler.get().execute(() -> applyExceptionConfiguration(fingerprint));
-          }
-          break;
+        List<Throwable> chainedExceptionsList = new ArrayList<>(chainedExceptions);
+        if (exceptionProbeManager.isAlreadyInstrumented(fingerprint)) {
+            ExceptionProbeManager.ThrowableState state = exceptionProbeManager.getStateByThrowable(innerMostException);
+            if (state == null) {
+                LOGGER.debug(
+                        "Unable to find state for throwable: {}",
+                        innerMostException.getClass().getTypeName());
+                return;
+            }
+            processSnapshotsAndSetTags(
+                    t, innerMostException, span, state, chainedExceptionsList, fingerprint, maxCapturedFrames);
+            exceptionProbeManager.updateLastCapture(fingerprint);
         } else {
-          if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug(
-                "No probe created, nativeFrames={}, thirdPartyFrames={} for exception: {}",
-                creationResult.nativeFrames,
-                creationResult.thirdPartyFrames,
-                ExceptionHelper.foldExceptionStackTrace(throwable));
-          }
+            // climb up the exception chain to find the first exception that has instrumented frames
+            Throwable throwable;
+            int chainedExceptionIdx = 0;
+            while ((throwable = chainedExceptions.pollFirst()) != null) {
+                StackTraceElement[] stackTrace = throwable.getStackTrace();
+                if (stackTrace == null || stackTrace.length == 0) {
+                    continue;
+                }
+                ExceptionProbeManager.CreationResult creationResult =
+                        exceptionProbeManager.createProbesForException(stackTrace, chainedExceptionIdx);
+                if (creationResult.probesCreated > 0) {
+                    if (!applyConfigAsync) {
+                        applyExceptionConfiguration(fingerprint);
+                    } else {
+                        AgentTaskScheduler.get().execute(() -> applyExceptionConfiguration(fingerprint));
+                    }
+                    break;
+                } else {
+                    if (LOGGER.isDebugEnabled()) {
+                        LOGGER.debug(
+                                "No probe created, nativeFrames={}, thirdPartyFrames={} for exception: {}",
+                                creationResult.nativeFrames,
+                                creationResult.thirdPartyFrames,
+                                ExceptionHelper.foldExceptionStackTrace(throwable));
+                    }
+                }
+                chainedExceptionIdx++;
+            }
         }
-        chainedExceptionIdx++;
-      }
     }
-  }
 
-  private void applyExceptionConfiguration(String fingerprint) {
-    configurationUpdater.accept(EXCEPTION, exceptionProbeManager.getProbes());
-    exceptionProbeManager.addFingerprint(fingerprint);
-    LOGGER.debug("Exception Fingerprint {} added", fingerprint);
-  }
+    private void applyExceptionConfiguration(String fingerprint) {
+        configurationUpdater.accept(EXCEPTION, exceptionProbeManager.getProbes());
+        exceptionProbeManager.addFingerprint(fingerprint);
+        LOGGER.debug("Exception Fingerprint {} added", fingerprint);
+    }
 
-  protected void addStackFrameTags(
-      AgentSpan span, Snapshot snapshot, int frameIndex, StackTraceElement stackFrame) {
-    String tagName = String.format(SNAPSHOT_ID_TAG_FMT, frameIndex);
-    span.setTag(tagName, snapshot.getId());
-    LOGGER.debug("add tag to span[{}]: {}: {}", span.getSpanId(), tagName, snapshot.getId());
-  }
+    protected void addStackFrameTags(AgentSpan span, Snapshot snapshot, int frameIndex, StackTraceElement stackFrame) {
+        String tagName = String.format(SNAPSHOT_ID_TAG_FMT, frameIndex);
+        span.setTag(tagName, snapshot.getId());
+        LOGGER.debug("add tag to span[{}]: {}: {}", span.getSpanId(), tagName, snapshot.getId());
+    }
 
-  private void processSnapshotsAndSetTags(
-      Throwable t,
-      Throwable innerMostException,
-      AgentSpan span,
-      ExceptionProbeManager.ThrowableState state,
-      List<Throwable> chainedExceptions,
-      String fingerprint,
-      int maxCapturedFrames) {
-    if (span.getTag(DD_DEBUG_ERROR_EXCEPTION_ID) != null) {
-      LOGGER.debug("Clear previous frame tags");
-      // already set for this span, clear the frame tags
-      span.getTags()
-          .forEach(
-              (k, v) -> {
+    private void processSnapshotsAndSetTags(
+            Throwable t,
+            Throwable innerMostException,
+            AgentSpan span,
+            ExceptionProbeManager.ThrowableState state,
+            List<Throwable> chainedExceptions,
+            String fingerprint,
+            int maxCapturedFrames) {
+        if (span.getTag(DD_DEBUG_ERROR_EXCEPTION_ID) != null) {
+            LOGGER.debug("Clear previous frame tags");
+            // already set for this span, clear the frame tags
+            span.getTags().forEach((k, v) -> {
                 if (k.startsWith(DD_DEBUG_ERROR_PREFIX)) {
-                  span.setTag(k, (String) null);
+                    span.setTag(k, (String) null);
                 }
-              });
-    }
-    boolean snapshotAssigned = false;
-    List<Snapshot> snapshots = state.getSnapshots();
-    int maxSnapshotSize = Math.min(snapshots.size(), maxCapturedFrames);
-    for (int i = 0; i < maxSnapshotSize; i++) {
-      Snapshot snapshot = snapshots.get(i);
-      int chainedExceptionIdx = snapshot.getChainedExceptionIdx();
-      if (chainedExceptionIdx >= chainedExceptions.size()) {
-        LOGGER.debug(
-            "Chained exception for snapshot={} is out of bounds: {}/{}",
-            snapshot.getId(),
-            chainedExceptionIdx,
-            chainedExceptions.size());
-        continue;
-      }
-      Throwable currentEx = chainedExceptions.get(snapshot.getChainedExceptionIdx());
-      int[] mapping = createThrowableMapping(currentEx, t);
-      StackTraceElement[] innerTrace = currentEx.getStackTrace();
-      int currentIdx = innerTrace.length - snapshot.getStack().size();
-      if (currentIdx < 0) {
-        // This means the innerTrace was truncated by the underlying environment.
-        // This is known to happen in AWS Lambda, but may also happen elsewhere.
-        currentIdx = i;
-      }
-      if (!sanityCheckSnapshotAssignment(snapshot, innerTrace, currentIdx)) {
-        continue;
-      }
-      int frameIndex = mapping[currentIdx];
-      if (frameIndex == -1) {
-        continue;
-      }
+            });
+        }
+        boolean snapshotAssigned = false;
+        List<Snapshot> snapshots = state.getSnapshots();
+        int maxSnapshotSize = Math.min(snapshots.size(), maxCapturedFrames);
+        for (int i = 0; i < maxSnapshotSize; i++) {
+            Snapshot snapshot = snapshots.get(i);
+            int chainedExceptionIdx = snapshot.getChainedExceptionIdx();
+            if (chainedExceptionIdx >= chainedExceptions.size()) {
+                LOGGER.debug(
+                        "Chained exception for snapshot={} is out of bounds: {}/{}",
+                        snapshot.getId(),
+                        chainedExceptionIdx,
+                        chainedExceptions.size());
+                continue;
+            }
+            Throwable currentEx = chainedExceptions.get(snapshot.getChainedExceptionIdx());
+            int[] mapping = createThrowableMapping(currentEx, t);
+            StackTraceElement[] innerTrace = currentEx.getStackTrace();
+            int currentIdx = innerTrace.length - snapshot.getStack().size();
+            if (currentIdx < 0) {
+                // This means the innerTrace was truncated by the underlying environment.
+                // This is known to happen in AWS Lambda, but may also happen elsewhere.
+                currentIdx = i;
+            }
+            if (!sanityCheckSnapshotAssignment(snapshot, innerTrace, currentIdx)) {
+                continue;
+            }
+            int frameIndex = mapping[currentIdx];
+            if (frameIndex == -1) {
+                continue;
+            }
 
-      addStackFrameTags(span, snapshot, frameIndex, innerTrace[currentIdx]);
+            addStackFrameTags(span, snapshot, frameIndex, innerTrace[currentIdx]);
 
-      if (!state.isSnapshotSent()) {
-        DebuggerAgent.getSink().addSnapshot(snapshot);
-      }
-      snapshotAssigned = true;
-    }
-    if (snapshotAssigned) {
-      state.markAsSnapshotSent();
-      span.setTag(DD_DEBUG_ERROR_EXCEPTION_ID, state.getExceptionId());
-      LOGGER.debug(
-          "add tag to span[{}]: {}: {}",
-          span.getSpanId(),
-          DD_DEBUG_ERROR_EXCEPTION_ID,
-          state.getExceptionId());
-      span.setTag(Tags.ERROR_DEBUG_INFO_CAPTURED, true);
-      span.setTag(DD_DEBUG_ERROR_EXCEPTION_HASH, fingerprint);
-      // Remove ThrowableState to avoid growing indefinitely for singleton exception instances
-      // like ones generated for FastThrow optimization (OmitStackTraceInFastThrow)
-      exceptionProbeManager.removeThrowableState(innerMostException);
+            if (!state.isSnapshotSent()) {
+                DebuggerAgent.getSink().addSnapshot(snapshot);
+            }
+            snapshotAssigned = true;
+        }
+        if (snapshotAssigned) {
+            state.markAsSnapshotSent();
+            span.setTag(DD_DEBUG_ERROR_EXCEPTION_ID, state.getExceptionId());
+            LOGGER.debug(
+                    "add tag to span[{}]: {}: {}",
+                    span.getSpanId(),
+                    DD_DEBUG_ERROR_EXCEPTION_ID,
+                    state.getExceptionId());
+            span.setTag(Tags.ERROR_DEBUG_INFO_CAPTURED, true);
+            span.setTag(DD_DEBUG_ERROR_EXCEPTION_HASH, fingerprint);
+            // Remove ThrowableState to avoid growing indefinitely for singleton exception instances
+            // like ones generated for FastThrow optimization (OmitStackTraceInFastThrow)
+            exceptionProbeManager.removeThrowableState(innerMostException);
+        }
     }
-  }
 
-  private static boolean sanityCheckSnapshotAssignment(
-      Snapshot snapshot, StackTraceElement[] innerTrace, int currentIdx) {
-    String className = snapshot.getProbe().getLocation().getType();
-    String methodName = snapshot.getProbe().getLocation().getMethod();
-    if (innerTrace.length == 0) {
-      LOGGER.debug("innerTrace is empty");
-      return false;
-    }
-    if (currentIdx < 0 || currentIdx >= innerTrace.length) {
-      LOGGER.warn(
-          "currentIdx={} out of bounds of innerTrace array length={}",
-          currentIdx,
-          innerTrace.length);
-      return false;
-    }
-    if (!className.equals(innerTrace[currentIdx].getClassName())
-        || !methodName.equals(innerTrace[currentIdx].getMethodName())) {
-      LOGGER.warn("issue when assigning snapshot to frame: {} {}", className, methodName);
-      return false;
+    private static boolean sanityCheckSnapshotAssignment(
+            Snapshot snapshot, StackTraceElement[] innerTrace, int currentIdx) {
+        String className = snapshot.getProbe().getLocation().getType();
+        String methodName = snapshot.getProbe().getLocation().getMethod();
+        if (innerTrace.length == 0) {
+            LOGGER.debug("innerTrace is empty");
+            return false;
+        }
+        if (currentIdx < 0 || currentIdx >= innerTrace.length) {
+            LOGGER.warn("currentIdx={} out of bounds of innerTrace array length={}", currentIdx, innerTrace.length);
+            return false;
+        }
+        if (!className.equals(innerTrace[currentIdx].getClassName())
+                || !methodName.equals(innerTrace[currentIdx].getMethodName())) {
+            LOGGER.warn("issue when assigning snapshot to frame: {} {}", className, methodName);
+            return false;
+        }
+        return true;
     }
-    return true;
-  }
 
-  public ExceptionProbeManager getExceptionProbeManager() {
-    return exceptionProbeManager;
-  }
+    public ExceptionProbeManager getExceptionProbeManager() {
+        return exceptionProbeManager;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/DefaultExceptionDebugger.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/DefaultExceptionDebugger.java
index 601fca62d52..10b155abfb1 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/DefaultExceptionDebugger.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/DefaultExceptionDebugger.java
@@ -12,52 +12,45 @@
 
 /** Default implementation of {@link DebuggerContext.ExceptionDebugger} for Exception Replay. */
 public class DefaultExceptionDebugger extends AbstractExceptionDebugger {
-  private static final Logger LOGGER = LoggerFactory.getLogger(DefaultExceptionDebugger.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultExceptionDebugger.class);
 
-  private final CircuitBreaker circuitBreaker;
+    private final CircuitBreaker circuitBreaker;
 
-  public DefaultExceptionDebugger(
-      ConfigurationUpdater configurationUpdater,
-      ClassNameFilter classNameFiltering,
-      Config config) {
-    this(
-        new ExceptionProbeManager(
-            classNameFiltering, Duration.ofSeconds(config.getDebuggerExceptionCaptureInterval())),
-        configurationUpdater,
-        classNameFiltering,
-        config.getDebuggerMaxExceptionPerSecond(),
-        config.getDebuggerExceptionMaxCapturedFrames(),
-        true);
-  }
-
-  DefaultExceptionDebugger(
-      ExceptionProbeManager exceptionProbeManager,
-      ConfigurationUpdater configurationUpdater,
-      DebuggerContext.ClassNameFilter classNameFiltering,
-      int maxExceptionPerSecond,
-      int maxCapturedFrames,
-      boolean applyConfigAsync) {
-    super(
-        exceptionProbeManager,
-        configurationUpdater,
-        classNameFiltering,
-        maxCapturedFrames,
-        applyConfigAsync);
+    public DefaultExceptionDebugger(
+            ConfigurationUpdater configurationUpdater, ClassNameFilter classNameFiltering, Config config) {
+        this(
+                new ExceptionProbeManager(
+                        classNameFiltering, Duration.ofSeconds(config.getDebuggerExceptionCaptureInterval())),
+                configurationUpdater,
+                classNameFiltering,
+                config.getDebuggerMaxExceptionPerSecond(),
+                config.getDebuggerExceptionMaxCapturedFrames(),
+                true);
+    }
 
-    this.circuitBreaker = new CircuitBreaker(maxExceptionPerSecond, Duration.ofSeconds(1));
-  }
+    DefaultExceptionDebugger(
+            ExceptionProbeManager exceptionProbeManager,
+            ConfigurationUpdater configurationUpdater,
+            DebuggerContext.ClassNameFilter classNameFiltering,
+            int maxExceptionPerSecond,
+            int maxCapturedFrames,
+            boolean applyConfigAsync) {
+        super(exceptionProbeManager, configurationUpdater, classNameFiltering, maxCapturedFrames, applyConfigAsync);
 
-  @Override
-  protected boolean shouldHandleException(Throwable t, AgentSpan span) {
-    if (t instanceof Error) {
-      return false;
+        this.circuitBreaker = new CircuitBreaker(maxExceptionPerSecond, Duration.ofSeconds(1));
     }
-    // do not handle exception with no stacktrace. cannot capture anything for it.
-    // includes also FastThrow ones
-    StackTraceElement[] stackTrace = t.getStackTrace();
-    if (stackTrace == null || stackTrace.length == 0) {
-      return false;
+
+    @Override
+    protected boolean shouldHandleException(Throwable t, AgentSpan span) {
+        if (t instanceof Error) {
+            return false;
+        }
+        // do not handle exception with no stacktrace. cannot capture anything for it.
+        // includes also FastThrow ones
+        StackTraceElement[] stackTrace = t.getStackTrace();
+        if (stackTrace == null || stackTrace.length == 0) {
+            return false;
+        }
+        return circuitBreaker.trip();
     }
-    return circuitBreaker.trip();
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/ExceptionProbeManager.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/ExceptionProbeManager.java
index 45d2b97b7dc..b1304816503 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/ExceptionProbeManager.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/ExceptionProbeManager.java
@@ -24,197 +24,193 @@
 
 /** Manages the probes used for instrumentation of exception stacktraces. */
 public class ExceptionProbeManager {
-  private static final Logger LOGGER = LoggerFactory.getLogger(ExceptionProbeManager.class);
-
-  private final Map<String, Instant> fingerprints = new ConcurrentHashMap<>();
-  private final Map<String, ExceptionProbe> probes = new ConcurrentHashMap<>();
-  private final ClassNameFilter classNameFiltering;
-  // FIXME: if this becomes a bottleneck, find a way to make it concurrent weak identity hashmap
-  private final Map<Throwable, ThrowableState> snapshotsByThrowable =
-      Collections.synchronizedMap(new WeakIdentityHashMap<>());
-  private final long captureIntervalS;
-  private final Clock clock;
-  private final int maxCapturedFrames;
-
-  public ExceptionProbeManager(ClassNameFilter classNameFiltering, Duration captureInterval) {
-    this(
-        classNameFiltering,
-        captureInterval,
-        Clock.systemUTC(),
-        Config.get().getDebuggerExceptionMaxCapturedFrames());
-  }
-
-  ExceptionProbeManager(ClassNameFilter classNameFiltering) {
-    this(
-        classNameFiltering,
-        Duration.ofHours(1),
-        Clock.systemUTC(),
-        Config.get().getDebuggerExceptionMaxCapturedFrames());
-  }
-
-  ExceptionProbeManager(
-      ClassNameFilter classNameFiltering,
-      Duration captureInterval,
-      Clock clock,
-      int maxCapturedFrames) {
-    this.classNameFiltering = classNameFiltering;
-    this.captureIntervalS = captureInterval.getSeconds();
-    this.clock = clock;
-    this.maxCapturedFrames = maxCapturedFrames;
-  }
-
-  public ClassNameFilter getClassNameFilter() {
-    return classNameFiltering;
-  }
-
-  public void removeThrowableState(Throwable t) {
-    snapshotsByThrowable.remove(t);
-  }
-
-  static class CreationResult {
-    final int probesCreated;
-    final int thirdPartyFrames;
-    final int nativeFrames;
-
-    public CreationResult(int probesCreated, int thirdPartyFrames, int nativeFrames) {
-      this.probesCreated = probesCreated;
-      this.thirdPartyFrames = thirdPartyFrames;
-      this.nativeFrames = nativeFrames;
-    }
-  }
-
-  public CreationResult createProbesForException(
-      StackTraceElement[] stackTraceElements, int chainedExceptionIdx) {
-    int instrumentedFrames = 0;
-    int nativeFrames = 0;
-    int thirdPartyFrames = 0;
-    for (StackTraceElement stackTraceElement : stackTraceElements) {
-      if (instrumentedFrames >= maxCapturedFrames) {
-        break;
-      }
-      if (stackTraceElement.isNativeMethod() || stackTraceElement.getLineNumber() < 0) {
-        // Skip native methods and lines without line numbers
-        nativeFrames++;
-        continue;
-      }
-      if (classNameFiltering.isExcluded(stackTraceElement.getClassName())) {
-        thirdPartyFrames++;
-        continue;
-      }
-      Where where =
-          Where.of(
-              stackTraceElement.getClassName(),
-              stackTraceElement.getMethodName(),
-              null,
-              String.valueOf(stackTraceElement.getLineNumber()));
-      ExceptionProbe probe = createMethodProbe(this, where, chainedExceptionIdx);
-      probes.putIfAbsent(probe.getId(), probe);
-      instrumentedFrames++;
-    }
-    return new CreationResult(instrumentedFrames, thirdPartyFrames, nativeFrames);
-  }
-
-  void addFingerprint(String fingerprint) {
-    fingerprints.put(fingerprint, Instant.MIN);
-  }
-
-  private static ExceptionProbe createMethodProbe(
-      ExceptionProbeManager exceptionProbeManager, Where where, int chainedExceptionIdx) {
-    String probeId = RandomUtils.randomUUID().toString();
-    return new ExceptionProbe(
-        new ProbeId(probeId, 0), where, null, null, exceptionProbeManager, chainedExceptionIdx);
-  }
-
-  public boolean isAlreadyInstrumented(String fingerprint) {
-    return fingerprints.containsKey(fingerprint);
-  }
-
-  public Collection<ExceptionProbe> getProbes() {
-    return probes.values();
-  }
-
-  public Map<String, Instant> getFingerprints() {
-    return fingerprints;
-  }
-
-  public boolean shouldCaptureException(String fingerprint) {
-    return shouldCaptureException(fingerprint, clock);
-  }
-
-  boolean shouldCaptureException(String fingerprint, Clock clock) {
-    Instant lastCapture = fingerprints.get(fingerprint);
-    if (lastCapture == null) {
-      return false;
-    }
-    return ChronoUnit.SECONDS.between(lastCapture, Instant.now(clock)) >= captureIntervalS;
-  }
-
-  public void addSnapshot(Snapshot snapshot) {
-    Throwable throwable = snapshot.getCaptures().getReturn().getCapturedThrowable().getThrowable();
-    if (throwable == null) {
-      LOGGER.debug("Snapshot has no throwable: {}", snapshot.getId());
-      return;
-    }
-    throwable = ExceptionHelper.getInnerMostThrowable(throwable);
-    if (throwable == null) {
-      throwable = snapshot.getCaptures().getReturn().getCapturedThrowable().getThrowable();
-      LOGGER.debug("Unable to find root cause of exception: {}", String.valueOf(throwable));
-      return;
-    }
-    ThrowableState state =
-        snapshotsByThrowable.computeIfAbsent(
-            throwable, key -> new ThrowableState(RandomUtils.randomUUID().toString()));
-    snapshot.setExceptionId(state.getExceptionId());
-    state.addSnapshot(snapshot);
-  }
-
-  public ThrowableState getStateByThrowable(Throwable throwable) {
-    return snapshotsByThrowable.get(throwable);
-  }
-
-  public void updateLastCapture(String fingerprint) {
-    updateLastCapture(fingerprint, clock);
-  }
-
-  void updateLastCapture(String fingerprint, Clock clock) {
-    fingerprints.put(fingerprint, Instant.now(clock));
-  }
-
-  boolean hasExceptionStateTracked() {
-    return !snapshotsByThrowable.isEmpty();
-  }
-
-  public static class ThrowableState {
-    private final String exceptionId;
-    private final List<Snapshot> snapshots = new CopyOnWriteArrayList<>();
-    private boolean snapshotSent;
-
-    private ThrowableState(String exceptionId) {
-      this.exceptionId = exceptionId;
-    }
-
-    public String getExceptionId() {
-      return exceptionId;
-    }
-
-    public List<Snapshot> getSnapshots() {
-      return snapshots;
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExceptionProbeManager.class);
+
+    private final Map<String, Instant> fingerprints = new ConcurrentHashMap<>();
+    private final Map<String, ExceptionProbe> probes = new ConcurrentHashMap<>();
+    private final ClassNameFilter classNameFiltering;
+    // FIXME: if this becomes a bottleneck, find a way to make it concurrent weak identity hashmap
+    private final Map<Throwable, ThrowableState> snapshotsByThrowable =
+            Collections.synchronizedMap(new WeakIdentityHashMap<>());
+    private final long captureIntervalS;
+    private final Clock clock;
+    private final int maxCapturedFrames;
+
+    public ExceptionProbeManager(ClassNameFilter classNameFiltering, Duration captureInterval) {
+        this(
+                classNameFiltering,
+                captureInterval,
+                Clock.systemUTC(),
+                Config.get().getDebuggerExceptionMaxCapturedFrames());
+    }
+
+    ExceptionProbeManager(ClassNameFilter classNameFiltering) {
+        this(
+                classNameFiltering,
+                Duration.ofHours(1),
+                Clock.systemUTC(),
+                Config.get().getDebuggerExceptionMaxCapturedFrames());
+    }
+
+    ExceptionProbeManager(
+            ClassNameFilter classNameFiltering, Duration captureInterval, Clock clock, int maxCapturedFrames) {
+        this.classNameFiltering = classNameFiltering;
+        this.captureIntervalS = captureInterval.getSeconds();
+        this.clock = clock;
+        this.maxCapturedFrames = maxCapturedFrames;
+    }
+
+    public ClassNameFilter getClassNameFilter() {
+        return classNameFiltering;
+    }
+
+    public void removeThrowableState(Throwable t) {
+        snapshotsByThrowable.remove(t);
+    }
+
+    static class CreationResult {
+        final int probesCreated;
+        final int thirdPartyFrames;
+        final int nativeFrames;
+
+        public CreationResult(int probesCreated, int thirdPartyFrames, int nativeFrames) {
+            this.probesCreated = probesCreated;
+            this.thirdPartyFrames = thirdPartyFrames;
+            this.nativeFrames = nativeFrames;
+        }
+    }
+
+    public CreationResult createProbesForException(StackTraceElement[] stackTraceElements, int chainedExceptionIdx) {
+        int instrumentedFrames = 0;
+        int nativeFrames = 0;
+        int thirdPartyFrames = 0;
+        for (StackTraceElement stackTraceElement : stackTraceElements) {
+            if (instrumentedFrames >= maxCapturedFrames) {
+                break;
+            }
+            if (stackTraceElement.isNativeMethod() || stackTraceElement.getLineNumber() < 0) {
+                // Skip native methods and lines without line numbers
+                nativeFrames++;
+                continue;
+            }
+            if (classNameFiltering.isExcluded(stackTraceElement.getClassName())) {
+                thirdPartyFrames++;
+                continue;
+            }
+            Where where = Where.of(
+                    stackTraceElement.getClassName(),
+                    stackTraceElement.getMethodName(),
+                    null,
+                    String.valueOf(stackTraceElement.getLineNumber()));
+            ExceptionProbe probe = createMethodProbe(this, where, chainedExceptionIdx);
+            probes.putIfAbsent(probe.getId(), probe);
+            instrumentedFrames++;
+        }
+        return new CreationResult(instrumentedFrames, thirdPartyFrames, nativeFrames);
+    }
+
+    void addFingerprint(String fingerprint) {
+        fingerprints.put(fingerprint, Instant.MIN);
+    }
+
+    private static ExceptionProbe createMethodProbe(
+            ExceptionProbeManager exceptionProbeManager, Where where, int chainedExceptionIdx) {
+        String probeId = RandomUtils.randomUUID().toString();
+        return new ExceptionProbe(
+                new ProbeId(probeId, 0), where, null, null, exceptionProbeManager, chainedExceptionIdx);
+    }
+
+    public boolean isAlreadyInstrumented(String fingerprint) {
+        return fingerprints.containsKey(fingerprint);
+    }
+
+    public Collection<ExceptionProbe> getProbes() {
+        return probes.values();
+    }
+
+    public Map<String, Instant> getFingerprints() {
+        return fingerprints;
+    }
+
+    public boolean shouldCaptureException(String fingerprint) {
+        return shouldCaptureException(fingerprint, clock);
+    }
+
+    boolean shouldCaptureException(String fingerprint, Clock clock) {
+        Instant lastCapture = fingerprints.get(fingerprint);
+        if (lastCapture == null) {
+            return false;
+        }
+        return ChronoUnit.SECONDS.between(lastCapture, Instant.now(clock)) >= captureIntervalS;
     }
 
     public void addSnapshot(Snapshot snapshot) {
-      if (snapshots.size() > 256) {
-        LOGGER.debug("Too many (256) snapshots for exceptionId={}, dropping snapshot", exceptionId);
-        return;
-      }
-      snapshots.add(snapshot);
+        Throwable throwable =
+                snapshot.getCaptures().getReturn().getCapturedThrowable().getThrowable();
+        if (throwable == null) {
+            LOGGER.debug("Snapshot has no throwable: {}", snapshot.getId());
+            return;
+        }
+        throwable = ExceptionHelper.getInnerMostThrowable(throwable);
+        if (throwable == null) {
+            throwable =
+                    snapshot.getCaptures().getReturn().getCapturedThrowable().getThrowable();
+            LOGGER.debug("Unable to find root cause of exception: {}", String.valueOf(throwable));
+            return;
+        }
+        ThrowableState state = snapshotsByThrowable.computeIfAbsent(
+                throwable, key -> new ThrowableState(RandomUtils.randomUUID().toString()));
+        snapshot.setExceptionId(state.getExceptionId());
+        state.addSnapshot(snapshot);
+    }
+
+    public ThrowableState getStateByThrowable(Throwable throwable) {
+        return snapshotsByThrowable.get(throwable);
+    }
+
+    public void updateLastCapture(String fingerprint) {
+        updateLastCapture(fingerprint, clock);
+    }
+
+    void updateLastCapture(String fingerprint, Clock clock) {
+        fingerprints.put(fingerprint, Instant.now(clock));
     }
 
-    public boolean isSnapshotSent() {
-      return snapshotSent;
+    boolean hasExceptionStateTracked() {
+        return !snapshotsByThrowable.isEmpty();
     }
 
-    public void markAsSnapshotSent() {
-      snapshotSent = true;
+    public static class ThrowableState {
+        private final String exceptionId;
+        private final List<Snapshot> snapshots = new CopyOnWriteArrayList<>();
+        private boolean snapshotSent;
+
+        private ThrowableState(String exceptionId) {
+            this.exceptionId = exceptionId;
+        }
+
+        public String getExceptionId() {
+            return exceptionId;
+        }
+
+        public List<Snapshot> getSnapshots() {
+            return snapshots;
+        }
+
+        public void addSnapshot(Snapshot snapshot) {
+            if (snapshots.size() > 256) {
+                LOGGER.debug("Too many (256) snapshots for exceptionId={}, dropping snapshot", exceptionId);
+                return;
+            }
+            snapshots.add(snapshot);
+        }
+
+        public boolean isSnapshotSent() {
+            return snapshotSent;
+        }
+
+        public void markAsSnapshotSent() {
+            snapshotSent = true;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/FailedTestReplayExceptionDebugger.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/FailedTestReplayExceptionDebugger.java
index b6e05940acf..ca8678674c9 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/FailedTestReplayExceptionDebugger.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/FailedTestReplayExceptionDebugger.java
@@ -16,50 +16,48 @@
  * Implementation of {@link DebuggerContext.ExceptionDebugger} for CiVisibility's Failed Test Replay
  */
 public class FailedTestReplayExceptionDebugger extends AbstractExceptionDebugger {
-  private static final Logger LOGGER =
-      LoggerFactory.getLogger(FailedTestReplayExceptionDebugger.class);
-
-  public static final String TEST_DEBUG_ERROR_FILE_TAG_FMT = DD_DEBUG_ERROR_PREFIX + "%d.file";
-  public static final String TEST_DEBUG_ERROR_LINE_TAG_FMT = DD_DEBUG_ERROR_PREFIX + "%d.line";
-
-  public FailedTestReplayExceptionDebugger(
-      ConfigurationUpdater configurationUpdater,
-      DebuggerContext.ClassNameFilter classNameFiltering,
-      Config config) {
-    super(
-        new ExceptionProbeManager(classNameFiltering, Duration.ofSeconds(0)),
-        configurationUpdater,
-        classNameFiltering,
-        config.getDebuggerExceptionMaxCapturedFrames(),
-        false);
-  }
-
-  @Override
-  protected boolean shouldHandleException(Throwable t, AgentSpan span) {
-    TestContext testContext = InstrumentationTestBridge.getCurrentTestContext();
-    if (testContext == null) {
-      return false;
+    private static final Logger LOGGER = LoggerFactory.getLogger(FailedTestReplayExceptionDebugger.class);
+
+    public static final String TEST_DEBUG_ERROR_FILE_TAG_FMT = DD_DEBUG_ERROR_PREFIX + "%d.file";
+    public static final String TEST_DEBUG_ERROR_LINE_TAG_FMT = DD_DEBUG_ERROR_PREFIX + "%d.line";
+
+    public FailedTestReplayExceptionDebugger(
+            ConfigurationUpdater configurationUpdater,
+            DebuggerContext.ClassNameFilter classNameFiltering,
+            Config config) {
+        super(
+                new ExceptionProbeManager(classNameFiltering, Duration.ofSeconds(0)),
+                configurationUpdater,
+                classNameFiltering,
+                config.getDebuggerExceptionMaxCapturedFrames(),
+                false);
     }
-    TestExecutionTracker executionTracker = testContext.get(TestExecutionTracker.class);
-    return executionTracker != null && executionTracker.failedTestReplayApplicable();
-  }
 
-  @Override
-  protected void addStackFrameTags(
-      AgentSpan span, Snapshot snapshot, int frameIndex, StackTraceElement stackFrame) {
-    super.addStackFrameTags(span, snapshot, frameIndex, stackFrame);
-
-    String fileTag = String.format(TEST_DEBUG_ERROR_FILE_TAG_FMT, frameIndex);
-    String lineTag = String.format(TEST_DEBUG_ERROR_LINE_TAG_FMT, frameIndex);
-    span.setTag(fileTag, stackFrame.getFileName());
-    span.setTag(lineTag, stackFrame.getLineNumber());
+    @Override
+    protected boolean shouldHandleException(Throwable t, AgentSpan span) {
+        TestContext testContext = InstrumentationTestBridge.getCurrentTestContext();
+        if (testContext == null) {
+            return false;
+        }
+        TestExecutionTracker executionTracker = testContext.get(TestExecutionTracker.class);
+        return executionTracker != null && executionTracker.failedTestReplayApplicable();
+    }
 
-    LOGGER.debug(
-        "add ftr debug tags to span[{}]: {}={}, {}={}",
-        span.getSpanId(),
-        fileTag,
-        stackFrame.getFileName(),
-        lineTag,
-        stackFrame.getLineNumber());
-  }
+    @Override
+    protected void addStackFrameTags(AgentSpan span, Snapshot snapshot, int frameIndex, StackTraceElement stackFrame) {
+        super.addStackFrameTags(span, snapshot, frameIndex, stackFrame);
+
+        String fileTag = String.format(TEST_DEBUG_ERROR_FILE_TAG_FMT, frameIndex);
+        String lineTag = String.format(TEST_DEBUG_ERROR_LINE_TAG_FMT, frameIndex);
+        span.setTag(fileTag, stackFrame.getFileName());
+        span.setTag(lineTag, stackFrame.getLineNumber());
+
+        LOGGER.debug(
+                "add ftr debug tags to span[{}]: {}={}, {}={}",
+                span.getSpanId(),
+                fileTag,
+                stackFrame.getFileName(),
+                lineTag,
+                stackFrame.getLineNumber());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/Fingerprinter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/Fingerprinter.java
index 215e4f71de9..d89d0d9407c 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/Fingerprinter.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/Fingerprinter.java
@@ -11,59 +11,59 @@
 
 /** Computes a fingerprint of an exception based on its stacktrace and exception type. */
 public class Fingerprinter {
-  private static final Logger LOGGER = LoggerFactory.getLogger(Fingerprinter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Fingerprinter.class);
 
-  // compute fingerprint of the Throwable based on the stacktrace and exception type
-  public static String fingerprint(Throwable t, ClassNameFilter classNameFiltering) {
-    t = getInnerMostThrowable(t);
-    if (t == null) {
-      LOGGER.debug("Unable to find root cause of exception");
-      return null;
-    }
-    Class<? extends Throwable> clazz = t.getClass();
-    MessageDigest digest;
-    try {
-      // need to create a new instance each time to make it thread safe
-      // Regarding performance, see the results of micro-benchmarks at the end of the file
-      digest = MessageDigest.getInstance("SHA-256");
-    } catch (NoSuchAlgorithmException e) {
-      LOGGER.debug("Unable to find digest algorithm SHA-256", e);
-      return null;
-    }
-    String typeName = clazz.getTypeName();
-    digest.update(typeName.getBytes(StandardCharsets.UTF_8));
-    StackTraceElement[] stackTrace = t.getStackTrace();
-    if (stackTrace != null) {
-      for (StackTraceElement stackTraceElement : stackTrace) {
-        String className = stackTraceElement.getClassName();
-        if (classNameFiltering.isExcluded(className)) {
-          continue;
+    // compute fingerprint of the Throwable based on the stacktrace and exception type
+    public static String fingerprint(Throwable t, ClassNameFilter classNameFiltering) {
+        t = getInnerMostThrowable(t);
+        if (t == null) {
+            LOGGER.debug("Unable to find root cause of exception");
+            return null;
+        }
+        Class<? extends Throwable> clazz = t.getClass();
+        MessageDigest digest;
+        try {
+            // need to create a new instance each time to make it thread safe
+            // Regarding performance, see the results of micro-benchmarks at the end of the file
+            digest = MessageDigest.getInstance("SHA-256");
+        } catch (NoSuchAlgorithmException e) {
+            LOGGER.debug("Unable to find digest algorithm SHA-256", e);
+            return null;
         }
-        digest.update(stackTraceElement.toString().getBytes(StandardCharsets.UTF_8));
-      }
+        String typeName = clazz.getTypeName();
+        digest.update(typeName.getBytes(StandardCharsets.UTF_8));
+        StackTraceElement[] stackTrace = t.getStackTrace();
+        if (stackTrace != null) {
+            for (StackTraceElement stackTraceElement : stackTrace) {
+                String className = stackTraceElement.getClassName();
+                if (classNameFiltering.isExcluded(className)) {
+                    continue;
+                }
+                digest.update(stackTraceElement.toString().getBytes(StandardCharsets.UTF_8));
+            }
+        }
+        return bytesToHex(digest.digest());
     }
-    return bytesToHex(digest.digest());
-  }
 
-  public static String fingerprint(StackTraceElement element) {
-    try {
-      MessageDigest digest = MessageDigest.getInstance("SHA-256");
-      digest.update(element.toString().getBytes(StandardCharsets.UTF_8));
-      return bytesToHex(digest.digest());
-    } catch (NoSuchAlgorithmException e) {
-      LOGGER.debug("Unable to find digest algorithm SHA-256", e);
-      return null;
+    public static String fingerprint(StackTraceElement element) {
+        try {
+            MessageDigest digest = MessageDigest.getInstance("SHA-256");
+            digest.update(element.toString().getBytes(StandardCharsets.UTF_8));
+            return bytesToHex(digest.digest());
+        } catch (NoSuchAlgorithmException e) {
+            LOGGER.debug("Unable to find digest algorithm SHA-256", e);
+            return null;
+        }
     }
-  }
 
-  // convert byte[] to hex string
-  private static String bytesToHex(byte[] bytes) {
-    StringBuilder result = new StringBuilder(bytes.length * 2);
-    for (byte b : bytes) {
-      result.append(Integer.toHexString((b & 0xff)));
+    // convert byte[] to hex string
+    private static String bytesToHex(byte[] bytes) {
+        StringBuilder result = new StringBuilder(bytes.length * 2);
+        for (byte b : bytes) {
+            result.append(Integer.toHexString((b & 0xff)));
+        }
+        return result.toString();
     }
-    return result.toString();
-  }
 }
 
 /*
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/ASMHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/ASMHelper.java
index 973fd61d773..c814a3245eb 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/ASMHelper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/ASMHelper.java
@@ -53,516 +53,489 @@
 
 /** Helper class for bytecode generation */
 public class ASMHelper {
-  private static final Logger LOGGER = LoggerFactory.getLogger(ASMHelper.class);
-
-  public static final Type INT_TYPE = new Type(org.objectweb.asm.Type.INT_TYPE);
-  public static final Type OBJECT_TYPE = new Type(Types.OBJECT_TYPE);
-  public static final Type STRING_TYPE = new Type(Types.STRING_TYPE);
-  public static final Type LONG_TYPE = new Type(org.objectweb.asm.Type.LONG_TYPE);
-
-  public static void dumpMethod(ClassNode classNode, String method, String suffix) {
-    String content = extractMethod(classNode, method);
-    File output;
-    int count = 0;
-    do {
-      output = new File(format("build/%s-%d-%s.txt", method, count++, suffix));
-    } while (output.exists());
-    output.getParentFile().mkdirs();
-    try (PrintWriter writer = new PrintWriter(output)) {
-      writer.println(content);
-      String absolutePath = output.getAbsolutePath();
-      absolutePath = absolutePath.substring(0, absolutePath.lastIndexOf('.'));
-      absolutePath += ".class";
-      ClassWriter classWriter = new ClassWriter(0);
-      classNode.accept(classWriter);
-      try (FileOutputStream stream = new FileOutputStream(absolutePath)) {
-        stream.write(classWriter.toByteArray());
-      }
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @SuppressForbidden
-  static String extractMethod(ClassNode classNode, String method) {
-    StringJoiner joiner = new StringJoiner("\n");
-    joiner.add("Class: " + classNode.name);
-    StringWriter writer = new StringWriter();
-    classNode.accept(new TraceClassVisitor(null, new Textifier(), new PrintWriter(writer)));
-    List<String> strings = Arrays.asList(writer.toString().split("\n"));
-    for (int i = 0; i < strings.size(); i++) {
-      if (strings.get(i).matches(format(".*(private|public).* %s\\(.*", method))) {
-        while (!strings.get(i).equals(""))
-          joiner.add(String.format("[%3d] %s", i, strings.get(i++)));
-      }
-    }
-    return joiner.toString();
-  }
-
-  public static void invokeInterface(
-      InsnList insnList,
-      org.objectweb.asm.Type owner,
-      String name,
-      org.objectweb.asm.Type returnType,
-      org.objectweb.asm.Type... argTypes) {
-    // expected stack: [this, arg_type_1 ... arg_type_N]
-    insnList.add(
-        new MethodInsnNode(
-            Opcodes.INVOKEINTERFACE,
-            owner.getInternalName(),
-            name,
-            getMethodDescriptor(returnType, argTypes),
-            true));
-    // stack: [ret_type]
-  }
-
-  public static void invokeVirtual(
-      InsnList insnList,
-      org.objectweb.asm.Type owner,
-      String name,
-      org.objectweb.asm.Type returnType,
-      org.objectweb.asm.Type... argTypes) {
-    // expected stack: [this, arg_type_1 ... arg_type_N]
-    insnList.add(
-        new MethodInsnNode(
-            Opcodes.INVOKEVIRTUAL,
-            owner.getInternalName(),
-            name,
-            getMethodDescriptor(returnType, argTypes),
-            false));
-    // stack: [ret_type]
-  }
-
-  public static boolean isStaticField(FieldNode fieldNode) {
-    return (fieldNode.access & Opcodes.ACC_STATIC) != 0;
-  }
-
-  public static boolean isStaticField(Field field) {
-    return Modifier.isStatic(field.getModifiers());
-  }
-
-  public static boolean isFinalField(FieldNode fieldNode) {
-    return (fieldNode.access & Opcodes.ACC_FINAL) != 0;
-  }
-
-  public static boolean isFinalField(Field field) {
-    return Modifier.isFinal(field.getModifiers());
-  }
-
-  public static boolean isRecord(ClassNode classNode) {
-    return (classNode.access & Opcodes.ACC_RECORD) != 0;
-  }
-
-  public static void invokeStatic(
-      InsnList insnList,
-      org.objectweb.asm.Type owner,
-      String name,
-      org.objectweb.asm.Type returnType,
-      org.objectweb.asm.Type... argTypes) {
-    // expected stack: [arg_type_1 ... arg_type_N]
-    insnList.add(
-        new MethodInsnNode(
-            Opcodes.INVOKESTATIC,
-            owner.getInternalName(),
-            name,
-            getMethodDescriptor(returnType, argTypes),
-            false)); // stack: [ret_type]
-  }
-
-  public static void ldc(InsnList insnList, int val) {
-    insnList.add(new LdcInsnNode(val));
-  }
-
-  public static void ldc(InsnList insnList, long val) {
-    insnList.add(new LdcInsnNode(val));
-  }
-
-  public static void ldc(InsnList insnList, Object val) {
-    insnList.add(val == null ? new InsnNode(Opcodes.ACONST_NULL) : new LdcInsnNode(val));
-  }
-
-  public static void getStatic(InsnList insnList, org.objectweb.asm.Type owner, String fieldName) {
-    insnList.add(
-        new FieldInsnNode(
-            Opcodes.GETSTATIC, owner.getInternalName(), fieldName, owner.getDescriptor()));
-  }
-
-  public static void getStatic(
-      InsnList insnList,
-      org.objectweb.asm.Type owner,
-      String fieldName,
-      org.objectweb.asm.Type fieldType) {
-    insnList.add(
-        new FieldInsnNode(
-            Opcodes.GETSTATIC, owner.getInternalName(), fieldName, fieldType.getDescriptor()));
-  }
-
-  public static Type decodeSignature(String signature) {
-    SignatureReader sigReader = new SignatureReader(signature);
-    FieldSignatureVisitor fieldSignatureVisitor = new FieldSignatureVisitor();
-    sigReader.acceptType(fieldSignatureVisitor);
-    org.objectweb.asm.Type mainType = getObjectType(fieldSignatureVisitor.getMainClassName());
-    List<Type> genericTypes =
-        fieldSignatureVisitor.genericTypes.stream()
-            .map(org.objectweb.asm.Type::getObjectType)
-            .map(Type::new)
-            .collect(Collectors.toList());
-    return new Type(mainType, genericTypes);
-  }
-
-  /**
-   * Makes sure that the class we want to load is not the one that we are currently transforming
-   * otherwise it will lead into a LinkageError
-   *
-   * @param className class name to load in '.' format (com.foo.bar.Class$InnerClass)
-   * @param currentClassTransformed in '.' format (com.foo.bar.Class$InnerClass)
-   * @param classLoader use for loading the class
-   * @return the loaded class
-   */
-  public static Class<?> ensureSafeClassLoad(
-      String className, String currentClassTransformed, ClassLoader classLoader) {
-    if (currentClassTransformed == null) {
-      // This is required to make sure we are not loading the class being transformed during
-      // transformation as it will generate a LinkageError with
-      // "attempted duplicate class definition"
-      throw new IllegalArgumentException(
-          "Cannot ensure loading class: "
-              + className
-              + " safely as current class being transformed is not provided (null)");
-    }
-    if (className.equals(currentClassTransformed)) {
-      throw new IllegalArgumentException(
-          "Cannot load class " + className + " as this is the class being currently transformed");
-    }
-    try {
-      return Class.forName(className, true, classLoader);
-    } catch (Throwable t) {
-      throw new RuntimeException("Cannot load class " + className, t);
-    }
-  }
-
-  public static void emitReflectiveCall(
-      InsnList insnList, Type fieldType, org.objectweb.asm.Type targetType) {
-    int sort = fieldType.getMainType().getSort();
-    String methodName = getReflectiveMethodName(sort);
-    // stack: [target_object, string]
-    org.objectweb.asm.Type returnType =
-        sort == org.objectweb.asm.Type.OBJECT || sort == org.objectweb.asm.Type.ARRAY
-            ? Types.OBJECT_TYPE
-            : fieldType.getMainType();
-    invokeStatic(
-        insnList,
-        REFLECTIVE_FIELD_VALUE_RESOLVER_TYPE,
-        methodName,
-        returnType,
-        targetType,
-        Types.STRING_TYPE);
-    // stack: [field_value]
-  }
-
-  private static String getReflectiveMethodName(int sort) {
-    switch (sort) {
-      case org.objectweb.asm.Type.LONG:
-        return "getFieldValueAsLong";
-      case org.objectweb.asm.Type.INT:
-        return "getFieldValueAsInt";
-      case org.objectweb.asm.Type.DOUBLE:
-        return "getFieldValueAsDouble";
-      case org.objectweb.asm.Type.FLOAT:
-        return "getFieldValueAsFloat";
-      case org.objectweb.asm.Type.SHORT:
-        return "getFieldValueAsShort";
-      case org.objectweb.asm.Type.CHAR:
-        return "getFieldValueAsChar";
-      case org.objectweb.asm.Type.BYTE:
-        return "getFieldValueAsByte";
-      case org.objectweb.asm.Type.BOOLEAN:
-        return "getFieldValueAsBoolean";
-      case org.objectweb.asm.Type.OBJECT:
-      case org.objectweb.asm.Type.ARRAY:
-        return "getFieldValue";
-      default:
-        throw new IllegalArgumentException("Unsupported type sort:" + sort);
-    }
-  }
-
-  public static List<LocalVariableNode> sortLocalVariables(List<LocalVariableNode> localVariables) {
-    List<LocalVariableNode> sortedLocalVars = new ArrayList<>(localVariables);
-    sortedLocalVars.sort(Comparator.comparingInt(o -> o.index));
-    return sortedLocalVars;
-  }
-
-  public static LocalVariableNode[] createLocalVarNodes(List<LocalVariableNode> sortedLocalVars) {
-    LocalVariableNode maxVarNode = sortedLocalVars.get(sortedLocalVars.size() - 1);
-    int maxIndex = maxVarNode.index;
-    org.objectweb.asm.Type localType = org.objectweb.asm.Type.getType(maxVarNode.desc);
-    LocalVariableNode[] localVars = new LocalVariableNode[maxIndex + localType.getSize()];
-    for (LocalVariableNode localVariableNode : sortedLocalVars) {
-      localVars[localVariableNode.index] = localVariableNode;
-    }
-    return localVars;
-  }
-
-  public static void adjustLocalVarsBasedOnArgs(
-      boolean isStatic,
-      LocalVariableNode[] localVars,
-      org.objectweb.asm.Type[] argTypes,
-      List<LocalVariableNode> sortedLocalVars) {
-    // assume that first local variables matches method arguments
-    // as stated into the JVM spec:
-    // https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-2.html#jvms-2.6.1
-    // so we reassigned local var in arg slots if they are empty
-    if (argTypes.length < localVars.length) {
-      List<LocalVariableNode> uniqueSortedLocalVars = dedupLocalVars(sortedLocalVars);
-      int slot = isStatic ? 0 : 1;
-      int localVarTableIdx = slot;
-      for (org.objectweb.asm.Type t : argTypes) {
-        if (slot >= localVars.length) {
-          break;
+    private static final Logger LOGGER = LoggerFactory.getLogger(ASMHelper.class);
+
+    public static final Type INT_TYPE = new Type(org.objectweb.asm.Type.INT_TYPE);
+    public static final Type OBJECT_TYPE = new Type(Types.OBJECT_TYPE);
+    public static final Type STRING_TYPE = new Type(Types.STRING_TYPE);
+    public static final Type LONG_TYPE = new Type(org.objectweb.asm.Type.LONG_TYPE);
+
+    public static void dumpMethod(ClassNode classNode, String method, String suffix) {
+        String content = extractMethod(classNode, method);
+        File output;
+        int count = 0;
+        do {
+            output = new File(format("build/%s-%d-%s.txt", method, count++, suffix));
+        } while (output.exists());
+        output.getParentFile().mkdirs();
+        try (PrintWriter writer = new PrintWriter(output)) {
+            writer.println(content);
+            String absolutePath = output.getAbsolutePath();
+            absolutePath = absolutePath.substring(0, absolutePath.lastIndexOf('.'));
+            absolutePath += ".class";
+            ClassWriter classWriter = new ClassWriter(0);
+            classNode.accept(classWriter);
+            try (FileOutputStream stream = new FileOutputStream(absolutePath)) {
+                stream.write(classWriter.toByteArray());
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
         }
-        if (localVars[slot] == null && localVarTableIdx < uniqueSortedLocalVars.size()) {
-          localVars[slot] = uniqueSortedLocalVars.get(localVarTableIdx);
+    }
+
+    @SuppressForbidden
+    static String extractMethod(ClassNode classNode, String method) {
+        StringJoiner joiner = new StringJoiner("\n");
+        joiner.add("Class: " + classNode.name);
+        StringWriter writer = new StringWriter();
+        classNode.accept(new TraceClassVisitor(null, new Textifier(), new PrintWriter(writer)));
+        List<String> strings = Arrays.asList(writer.toString().split("\n"));
+        for (int i = 0; i < strings.size(); i++) {
+            if (strings.get(i).matches(format(".*(private|public).* %s\\(.*", method))) {
+                while (!strings.get(i).equals("")) joiner.add(String.format("[%3d] %s", i, strings.get(i++)));
+            }
         }
-        slot += t.getSize();
-        localVarTableIdx++;
-      }
-    }
-  }
-
-  private static List<LocalVariableNode> dedupLocalVars(List<LocalVariableNode> sortedLocalVars) {
-    List<LocalVariableNode> uniqueSortedLocalVars = new ArrayList<>();
-    int maxIndex = sortedLocalVars.get(sortedLocalVars.size() - 1).index;
-    boolean[] usedIndexes = new boolean[maxIndex + 1];
-    for (LocalVariableNode localVariableNode : sortedLocalVars) {
-      if (!usedIndexes[localVariableNode.index]) {
-        uniqueSortedLocalVars.add(localVariableNode);
-        usedIndexes[localVariableNode.index] = true;
-      }
-    }
-    return uniqueSortedLocalVars;
-  }
-
-  public static void newInstance(InsnList insnList, org.objectweb.asm.Type type) {
-    insnList.add(new TypeInsnNode(Opcodes.NEW, type.getInternalName()));
-  }
-
-  public static void invokeConstructor(
-      InsnList insnList, org.objectweb.asm.Type owner, org.objectweb.asm.Type... argTypes) {
-    // expected stack: [instance, arg_type_1 ... arg_type_N]
-    insnList.add(
-        new MethodInsnNode(
-            Opcodes.INVOKESPECIAL,
-            owner.getInternalName(),
-            Types.CONSTRUCTOR,
-            org.objectweb.asm.Type.getMethodDescriptor(org.objectweb.asm.Type.VOID_TYPE, argTypes),
-            false));
-    // stack: []
-  }
-
-  /** Checks if the given variable is in scope at the given location */
-  public static boolean isInScope(
-      MethodNode methodNode, LocalVariableNode variableNode, AbstractInsnNode location) {
-    AbstractInsnNode startScope =
-        variableNode.start != null ? variableNode.start : methodNode.instructions.getFirst();
-    AbstractInsnNode endScope =
-        variableNode.end != null ? variableNode.end : methodNode.instructions.getLast();
-    AbstractInsnNode insn = startScope;
-    while (insn != null && insn != endScope) {
-      if (insn == location) {
-        return true;
-      }
-      insn = insn.getNext();
-    }
-    return false;
-  }
-
-  public static boolean isStoreCompatibleType(
-      org.objectweb.asm.Type previousType, org.objectweb.asm.Type currentType) {
-    if (previousType == null || currentType == null) {
-      return false;
-    }
-    if (previousType.getSort() == currentType.getSort()) {
-      return true;
-    }
-    int previousSort = widenIntType(previousType.getSort());
-    int currentSort = widenIntType(currentType.getSort());
-    return previousSort == currentSort;
-  }
-
-  public static String toString(AbstractInsnNode node) {
-    String opcode = node.getOpcode() >= 0 ? Printer.OPCODES[node.getOpcode()] : node.toString();
-    if (node instanceof LineNumberNode) {
-      return String.format("LineNumber: %s", ((LineNumberNode) node).line);
-    } else if (node instanceof MethodInsnNode) {
-      MethodInsnNode method = (MethodInsnNode) node;
-      return String.format("%s: [%s] %s", opcode, method.name, method.desc);
-    } else {
-      return opcode;
-    }
-  }
-
-  private static int widenIntType(int sort) {
-    switch (sort) {
-      case org.objectweb.asm.Type.BOOLEAN:
-      case org.objectweb.asm.Type.BYTE:
-      case org.objectweb.asm.Type.CHAR:
-      case org.objectweb.asm.Type.SHORT:
-        return org.objectweb.asm.Type.INT;
-    }
-    return sort;
-  }
-
-  public static String extractSuperClass(ClassNode classNode) {
-    if (classNode.superName == null) {
-      return Object.class.getTypeName();
-    }
-    return Strings.getClassName(classNode.superName);
-  }
-
-  public static boolean isStore(int opcode) {
-    return opcode >= Opcodes.ISTORE && opcode <= Opcodes.ASTORE;
-  }
-
-  public static List<Integer> getLineNumbers(MethodNode methodNode) {
-    List<Integer> lines = new ArrayList<>();
-    if (methodNode == null) {
-      return lines;
-    }
-    AbstractInsnNode current = methodNode.instructions.getFirst();
-    while (current != null) {
-      if (current.getType() == AbstractInsnNode.LINE) {
-        LineNumberNode lineNode = (LineNumberNode) current;
-        lines.add(lineNode.line);
-      }
-      current = current.getNext();
-    }
-    return lines;
-  }
-
-  /**
-   * Returns a map for all instructions what is the current frame with value on the stacks Helps to
-   * know at exit points of a method what remains on the stack
-   */
-  protected static Map<AbstractInsnNode, Frame<BasicValue>> computeFrames(
-      String owner, MethodNode methodNode) {
-    // Initial guess used for methodNode.maxStack when retrying computeFrames() below; small
-    // enough to be cheap, large enough to cover the vast majority of probe-generated methods on
-    // the first attempt.
-    final int INITIAL_MAX_STACK_GUESS = 16;
-    // Probes already applied to this method may have inserted bytecode that requires more
-    // stack than originally declared, without updating methodNode.maxStack (only maxLocals is
-    // tracked, see newVar()). The ASM analyzer sizes its Frame objects from the declared
-    // maxStack (each Frame costs maxLocals+maxStack slots), so a stale/too-small value makes
-    // the analysis fail with "Insufficient maximum stack size" even though the class itself is
-    // valid. Rather than guessing an upper bound from the instruction count (which blows up
-    // Frame memory quadratically for large methods), retry with a growing maxStack only when
-    // the Analyzer itself reports it as insufficient - this converges to close to the actual
-    // stack depth the method needs. The real maxStack is recomputed again from scratch by the
-    // ClassWriter's COMPUTE_FRAMES pass when the class is finally written.
-    Map<AbstractInsnNode, Frame<BasicValue>> frames = new IdentityHashMap<>();
-    int attemptMaxStack = Math.max(methodNode.maxStack, INITIAL_MAX_STACK_GUESS);
-    int hardLimitMaxStack = methodNode.instructions.size() * 2;
-    while (true) {
-      methodNode.maxStack = attemptMaxStack;
-      try {
-        Frame<BasicValue>[] frameArray =
-            new Analyzer<>(new BasicInterpreter()).analyze(owner, methodNode);
-        AbstractInsnNode current = methodNode.instructions.getFirst();
-        int idx = 0;
-        while (current != null) {
-          frames.put(current, frameArray[idx++]);
-          current = current.getNext();
+        return joiner.toString();
+    }
+
+    public static void invokeInterface(
+            InsnList insnList,
+            org.objectweb.asm.Type owner,
+            String name,
+            org.objectweb.asm.Type returnType,
+            org.objectweb.asm.Type... argTypes) {
+        // expected stack: [this, arg_type_1 ... arg_type_N]
+        insnList.add(new MethodInsnNode(
+                Opcodes.INVOKEINTERFACE,
+                owner.getInternalName(),
+                name,
+                getMethodDescriptor(returnType, argTypes),
+                true));
+        // stack: [ret_type]
+    }
+
+    public static void invokeVirtual(
+            InsnList insnList,
+            org.objectweb.asm.Type owner,
+            String name,
+            org.objectweb.asm.Type returnType,
+            org.objectweb.asm.Type... argTypes) {
+        // expected stack: [this, arg_type_1 ... arg_type_N]
+        insnList.add(new MethodInsnNode(
+                Opcodes.INVOKEVIRTUAL,
+                owner.getInternalName(),
+                name,
+                getMethodDescriptor(returnType, argTypes),
+                false));
+        // stack: [ret_type]
+    }
+
+    public static boolean isStaticField(FieldNode fieldNode) {
+        return (fieldNode.access & Opcodes.ACC_STATIC) != 0;
+    }
+
+    public static boolean isStaticField(Field field) {
+        return Modifier.isStatic(field.getModifiers());
+    }
+
+    public static boolean isFinalField(FieldNode fieldNode) {
+        return (fieldNode.access & Opcodes.ACC_FINAL) != 0;
+    }
+
+    public static boolean isFinalField(Field field) {
+        return Modifier.isFinal(field.getModifiers());
+    }
+
+    public static boolean isRecord(ClassNode classNode) {
+        return (classNode.access & Opcodes.ACC_RECORD) != 0;
+    }
+
+    public static void invokeStatic(
+            InsnList insnList,
+            org.objectweb.asm.Type owner,
+            String name,
+            org.objectweb.asm.Type returnType,
+            org.objectweb.asm.Type... argTypes) {
+        // expected stack: [arg_type_1 ... arg_type_N]
+        insnList.add(new MethodInsnNode(
+                Opcodes.INVOKESTATIC,
+                owner.getInternalName(),
+                name,
+                getMethodDescriptor(returnType, argTypes),
+                false)); // stack: [ret_type]
+    }
+
+    public static void ldc(InsnList insnList, int val) {
+        insnList.add(new LdcInsnNode(val));
+    }
+
+    public static void ldc(InsnList insnList, long val) {
+        insnList.add(new LdcInsnNode(val));
+    }
+
+    public static void ldc(InsnList insnList, Object val) {
+        insnList.add(val == null ? new InsnNode(Opcodes.ACONST_NULL) : new LdcInsnNode(val));
+    }
+
+    public static void getStatic(InsnList insnList, org.objectweb.asm.Type owner, String fieldName) {
+        insnList.add(new FieldInsnNode(Opcodes.GETSTATIC, owner.getInternalName(), fieldName, owner.getDescriptor()));
+    }
+
+    public static void getStatic(
+            InsnList insnList, org.objectweb.asm.Type owner, String fieldName, org.objectweb.asm.Type fieldType) {
+        insnList.add(
+                new FieldInsnNode(Opcodes.GETSTATIC, owner.getInternalName(), fieldName, fieldType.getDescriptor()));
+    }
+
+    public static Type decodeSignature(String signature) {
+        SignatureReader sigReader = new SignatureReader(signature);
+        FieldSignatureVisitor fieldSignatureVisitor = new FieldSignatureVisitor();
+        sigReader.acceptType(fieldSignatureVisitor);
+        org.objectweb.asm.Type mainType = getObjectType(fieldSignatureVisitor.getMainClassName());
+        List<Type> genericTypes = fieldSignatureVisitor.genericTypes.stream()
+                .map(org.objectweb.asm.Type::getObjectType)
+                .map(Type::new)
+                .collect(Collectors.toList());
+        return new Type(mainType, genericTypes);
+    }
+
+    /**
+     * Makes sure that the class we want to load is not the one that we are currently transforming
+     * otherwise it will lead into a LinkageError
+     *
+     * @param className class name to load in '.' format (com.foo.bar.Class$InnerClass)
+     * @param currentClassTransformed in '.' format (com.foo.bar.Class$InnerClass)
+     * @param classLoader use for loading the class
+     * @return the loaded class
+     */
+    public static Class<?> ensureSafeClassLoad(
+            String className, String currentClassTransformed, ClassLoader classLoader) {
+        if (currentClassTransformed == null) {
+            // This is required to make sure we are not loading the class being transformed during
+            // transformation as it will generate a LinkageError with
+            // "attempted duplicate class definition"
+            throw new IllegalArgumentException("Cannot ensure loading class: "
+                    + className
+                    + " safely as current class being transformed is not provided (null)");
+        }
+        if (className.equals(currentClassTransformed)) {
+            throw new IllegalArgumentException(
+                    "Cannot load class " + className + " as this is the class being currently transformed");
         }
-        break;
-      } catch (AnalyzerException ex) {
-        if (isInsufficientMaxStack(ex) && attemptMaxStack < hardLimitMaxStack) {
-          attemptMaxStack *= 2;
-          continue;
+        try {
+            return Class.forName(className, true, classLoader);
+        } catch (Throwable t) {
+            throw new RuntimeException("Cannot load class " + className, t);
         }
-        LOGGER.debug(
-            "Failed to analyze method[{}::{}{}] instructions",
-            owner,
-            methodNode.name,
-            methodNode.desc,
-            ex);
-        // when running tests, fails if an exception is thrown during analysis
-        // Gradle is running tests with assertions enbabled
-        assert false;
-        break;
-      }
     }
-    return frames;
-  }
 
-  private static boolean isInsufficientMaxStack(AnalyzerException ex) {
-    return ex.getMessage() != null && ex.getMessage().contains("Insufficient maximum stack size");
-  }
+    public static void emitReflectiveCall(InsnList insnList, Type fieldType, org.objectweb.asm.Type targetType) {
+        int sort = fieldType.getMainType().getSort();
+        String methodName = getReflectiveMethodName(sort);
+        // stack: [target_object, string]
+        org.objectweb.asm.Type returnType =
+                sort == org.objectweb.asm.Type.OBJECT || sort == org.objectweb.asm.Type.ARRAY
+                        ? Types.OBJECT_TYPE
+                        : fieldType.getMainType();
+        invokeStatic(
+                insnList, REFLECTIVE_FIELD_VALUE_RESOLVER_TYPE, methodName, returnType, targetType, Types.STRING_TYPE);
+        // stack: [field_value]
+    }
 
-  /** Wraps ASM's {@link org.objectweb.asm.Type} with associated generic types */
-  public static class Type {
-    private final org.objectweb.asm.Type mainType;
-    private final List<Type> genericTypes;
+    private static String getReflectiveMethodName(int sort) {
+        switch (sort) {
+            case org.objectweb.asm.Type.LONG:
+                return "getFieldValueAsLong";
+            case org.objectweb.asm.Type.INT:
+                return "getFieldValueAsInt";
+            case org.objectweb.asm.Type.DOUBLE:
+                return "getFieldValueAsDouble";
+            case org.objectweb.asm.Type.FLOAT:
+                return "getFieldValueAsFloat";
+            case org.objectweb.asm.Type.SHORT:
+                return "getFieldValueAsShort";
+            case org.objectweb.asm.Type.CHAR:
+                return "getFieldValueAsChar";
+            case org.objectweb.asm.Type.BYTE:
+                return "getFieldValueAsByte";
+            case org.objectweb.asm.Type.BOOLEAN:
+                return "getFieldValueAsBoolean";
+            case org.objectweb.asm.Type.OBJECT:
+            case org.objectweb.asm.Type.ARRAY:
+                return "getFieldValue";
+            default:
+                throw new IllegalArgumentException("Unsupported type sort:" + sort);
+        }
+    }
 
-    public Type(org.objectweb.asm.Type mainType) {
-      this.mainType = mainType;
-      this.genericTypes = Collections.emptyList();
+    public static List<LocalVariableNode> sortLocalVariables(List<LocalVariableNode> localVariables) {
+        List<LocalVariableNode> sortedLocalVars = new ArrayList<>(localVariables);
+        sortedLocalVars.sort(Comparator.comparingInt(o -> o.index));
+        return sortedLocalVars;
     }
 
-    public Type(org.objectweb.asm.Type mainType, List<Type> genericTypes) {
-      this.mainType = mainType;
-      this.genericTypes = genericTypes;
+    public static LocalVariableNode[] createLocalVarNodes(List<LocalVariableNode> sortedLocalVars) {
+        LocalVariableNode maxVarNode = sortedLocalVars.get(sortedLocalVars.size() - 1);
+        int maxIndex = maxVarNode.index;
+        org.objectweb.asm.Type localType = org.objectweb.asm.Type.getType(maxVarNode.desc);
+        LocalVariableNode[] localVars = new LocalVariableNode[maxIndex + localType.getSize()];
+        for (LocalVariableNode localVariableNode : sortedLocalVars) {
+            localVars[localVariableNode.index] = localVariableNode;
+        }
+        return localVars;
     }
 
-    public org.objectweb.asm.Type getMainType() {
-      return mainType;
+    public static void adjustLocalVarsBasedOnArgs(
+            boolean isStatic,
+            LocalVariableNode[] localVars,
+            org.objectweb.asm.Type[] argTypes,
+            List<LocalVariableNode> sortedLocalVars) {
+        // assume that first local variables matches method arguments
+        // as stated into the JVM spec:
+        // https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-2.html#jvms-2.6.1
+        // so we reassigned local var in arg slots if they are empty
+        if (argTypes.length < localVars.length) {
+            List<LocalVariableNode> uniqueSortedLocalVars = dedupLocalVars(sortedLocalVars);
+            int slot = isStatic ? 0 : 1;
+            int localVarTableIdx = slot;
+            for (org.objectweb.asm.Type t : argTypes) {
+                if (slot >= localVars.length) {
+                    break;
+                }
+                if (localVars[slot] == null && localVarTableIdx < uniqueSortedLocalVars.size()) {
+                    localVars[slot] = uniqueSortedLocalVars.get(localVarTableIdx);
+                }
+                slot += t.getSize();
+                localVarTableIdx++;
+            }
+        }
     }
 
-    public List<Type> getGenericTypes() {
-      return genericTypes;
+    private static List<LocalVariableNode> dedupLocalVars(List<LocalVariableNode> sortedLocalVars) {
+        List<LocalVariableNode> uniqueSortedLocalVars = new ArrayList<>();
+        int maxIndex = sortedLocalVars.get(sortedLocalVars.size() - 1).index;
+        boolean[] usedIndexes = new boolean[maxIndex + 1];
+        for (LocalVariableNode localVariableNode : sortedLocalVars) {
+            if (!usedIndexes[localVariableNode.index]) {
+                uniqueSortedLocalVars.add(localVariableNode);
+                usedIndexes[localVariableNode.index] = true;
+            }
+        }
+        return uniqueSortedLocalVars;
     }
 
-    @Generated
-    @Override
-    public String toString() {
-      return "Type{" + "mainType=" + mainType + ", genericTypes=" + genericTypes + '}';
+    public static void newInstance(InsnList insnList, org.objectweb.asm.Type type) {
+        insnList.add(new TypeInsnNode(Opcodes.NEW, type.getInternalName()));
     }
-  }
 
-  private static class FieldSignatureVisitor extends SignatureVisitor {
-    private String mainClassName;
-    private boolean genericType;
-    private List<String> genericTypes = new ArrayList<>();
+    public static void invokeConstructor(
+            InsnList insnList, org.objectweb.asm.Type owner, org.objectweb.asm.Type... argTypes) {
+        // expected stack: [instance, arg_type_1 ... arg_type_N]
+        insnList.add(new MethodInsnNode(
+                Opcodes.INVOKESPECIAL,
+                owner.getInternalName(),
+                Types.CONSTRUCTOR,
+                org.objectweb.asm.Type.getMethodDescriptor(org.objectweb.asm.Type.VOID_TYPE, argTypes),
+                false));
+        // stack: []
+    }
 
-    public FieldSignatureVisitor() {
-      super(Opcodes.ASM9);
+    /** Checks if the given variable is in scope at the given location */
+    public static boolean isInScope(MethodNode methodNode, LocalVariableNode variableNode, AbstractInsnNode location) {
+        AbstractInsnNode startScope =
+                variableNode.start != null ? variableNode.start : methodNode.instructions.getFirst();
+        AbstractInsnNode endScope = variableNode.end != null ? variableNode.end : methodNode.instructions.getLast();
+        AbstractInsnNode insn = startScope;
+        while (insn != null && insn != endScope) {
+            if (insn == location) {
+                return true;
+            }
+            insn = insn.getNext();
+        }
+        return false;
     }
 
-    @Override
-    public SignatureVisitor visitTypeArgument(char wildcard) {
-      genericType = true;
-      return super.visitTypeArgument(wildcard);
+    public static boolean isStoreCompatibleType(
+            org.objectweb.asm.Type previousType, org.objectweb.asm.Type currentType) {
+        if (previousType == null || currentType == null) {
+            return false;
+        }
+        if (previousType.getSort() == currentType.getSort()) {
+            return true;
+        }
+        int previousSort = widenIntType(previousType.getSort());
+        int currentSort = widenIntType(currentType.getSort());
+        return previousSort == currentSort;
     }
 
-    @Override
-    public void visitClassType(String name) {
-      if (genericType) {
-        genericTypes.add(name);
-      } else {
-        mainClassName = name;
-      }
+    public static String toString(AbstractInsnNode node) {
+        String opcode = node.getOpcode() >= 0 ? Printer.OPCODES[node.getOpcode()] : node.toString();
+        if (node instanceof LineNumberNode) {
+            return String.format("LineNumber: %s", ((LineNumberNode) node).line);
+        } else if (node instanceof MethodInsnNode) {
+            MethodInsnNode method = (MethodInsnNode) node;
+            return String.format("%s: [%s] %s", opcode, method.name, method.desc);
+        } else {
+            return opcode;
+        }
     }
 
-    @Override
-    public void visitEnd() {
-      super.visitEnd();
+    private static int widenIntType(int sort) {
+        switch (sort) {
+            case org.objectweb.asm.Type.BOOLEAN:
+            case org.objectweb.asm.Type.BYTE:
+            case org.objectweb.asm.Type.CHAR:
+            case org.objectweb.asm.Type.SHORT:
+                return org.objectweb.asm.Type.INT;
+        }
+        return sort;
     }
 
-    public String getMainClassName() {
-      return mainClassName;
+    public static String extractSuperClass(ClassNode classNode) {
+        if (classNode.superName == null) {
+            return Object.class.getTypeName();
+        }
+        return Strings.getClassName(classNode.superName);
+    }
+
+    public static boolean isStore(int opcode) {
+        return opcode >= Opcodes.ISTORE && opcode <= Opcodes.ASTORE;
+    }
+
+    public static List<Integer> getLineNumbers(MethodNode methodNode) {
+        List<Integer> lines = new ArrayList<>();
+        if (methodNode == null) {
+            return lines;
+        }
+        AbstractInsnNode current = methodNode.instructions.getFirst();
+        while (current != null) {
+            if (current.getType() == AbstractInsnNode.LINE) {
+                LineNumberNode lineNode = (LineNumberNode) current;
+                lines.add(lineNode.line);
+            }
+            current = current.getNext();
+        }
+        return lines;
+    }
+
+    /**
+     * Returns a map for all instructions what is the current frame with value on the stacks Helps to
+     * know at exit points of a method what remains on the stack
+     */
+    protected static Map<AbstractInsnNode, Frame<BasicValue>> computeFrames(String owner, MethodNode methodNode) {
+        // Initial guess used for methodNode.maxStack when retrying computeFrames() below; small
+        // enough to be cheap, large enough to cover the vast majority of probe-generated methods on
+        // the first attempt.
+        final int INITIAL_MAX_STACK_GUESS = 16;
+        // Probes already applied to this method may have inserted bytecode that requires more
+        // stack than originally declared, without updating methodNode.maxStack (only maxLocals is
+        // tracked, see newVar()). The ASM analyzer sizes its Frame objects from the declared
+        // maxStack (each Frame costs maxLocals+maxStack slots), so a stale/too-small value makes
+        // the analysis fail with "Insufficient maximum stack size" even though the class itself is
+        // valid. Rather than guessing an upper bound from the instruction count (which blows up
+        // Frame memory quadratically for large methods), retry with a growing maxStack only when
+        // the Analyzer itself reports it as insufficient - this converges to close to the actual
+        // stack depth the method needs. The real maxStack is recomputed again from scratch by the
+        // ClassWriter's COMPUTE_FRAMES pass when the class is finally written.
+        Map<AbstractInsnNode, Frame<BasicValue>> frames = new IdentityHashMap<>();
+        int attemptMaxStack = Math.max(methodNode.maxStack, INITIAL_MAX_STACK_GUESS);
+        int hardLimitMaxStack = methodNode.instructions.size() * 2;
+        while (true) {
+            methodNode.maxStack = attemptMaxStack;
+            try {
+                Frame<BasicValue>[] frameArray = new Analyzer<>(new BasicInterpreter()).analyze(owner, methodNode);
+                AbstractInsnNode current = methodNode.instructions.getFirst();
+                int idx = 0;
+                while (current != null) {
+                    frames.put(current, frameArray[idx++]);
+                    current = current.getNext();
+                }
+                break;
+            } catch (AnalyzerException ex) {
+                if (isInsufficientMaxStack(ex) && attemptMaxStack < hardLimitMaxStack) {
+                    attemptMaxStack *= 2;
+                    continue;
+                }
+                LOGGER.debug(
+                        "Failed to analyze method[{}::{}{}] instructions", owner, methodNode.name, methodNode.desc, ex);
+                // when running tests, fails if an exception is thrown during analysis
+                // Gradle is running tests with assertions enbabled
+                assert false;
+                break;
+            }
+        }
+        return frames;
+    }
+
+    private static boolean isInsufficientMaxStack(AnalyzerException ex) {
+        return ex.getMessage() != null && ex.getMessage().contains("Insufficient maximum stack size");
+    }
+
+    /** Wraps ASM's {@link org.objectweb.asm.Type} with associated generic types */
+    public static class Type {
+        private final org.objectweb.asm.Type mainType;
+        private final List<Type> genericTypes;
+
+        public Type(org.objectweb.asm.Type mainType) {
+            this.mainType = mainType;
+            this.genericTypes = Collections.emptyList();
+        }
+
+        public Type(org.objectweb.asm.Type mainType, List<Type> genericTypes) {
+            this.mainType = mainType;
+            this.genericTypes = genericTypes;
+        }
+
+        public org.objectweb.asm.Type getMainType() {
+            return mainType;
+        }
+
+        public List<Type> getGenericTypes() {
+            return genericTypes;
+        }
+
+        @Generated
+        @Override
+        public String toString() {
+            return "Type{" + "mainType=" + mainType + ", genericTypes=" + genericTypes + '}';
+        }
     }
 
-    public List<String> getGenericTypes() {
-      return genericTypes;
+    private static class FieldSignatureVisitor extends SignatureVisitor {
+        private String mainClassName;
+        private boolean genericType;
+        private List<String> genericTypes = new ArrayList<>();
+
+        public FieldSignatureVisitor() {
+            super(Opcodes.ASM9);
+        }
+
+        @Override
+        public SignatureVisitor visitTypeArgument(char wildcard) {
+            genericType = true;
+            return super.visitTypeArgument(wildcard);
+        }
+
+        @Override
+        public void visitClassType(String name) {
+            if (genericType) {
+                genericTypes.add(name);
+            } else {
+                mainClassName = name;
+            }
+        }
+
+        @Override
+        public void visitEnd() {
+            super.visitEnd();
+        }
+
+        public String getMainClassName() {
+            return mainClassName;
+        }
+
+        public List<String> getGenericTypes() {
+            return genericTypes;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/ByteCodeHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/ByteCodeHelper.java
index f37e6979a58..0cbc347572a 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/ByteCodeHelper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/ByteCodeHelper.java
@@ -21,351 +21,355 @@
 /** Helper class for bytecode analysis */
 public class ByteCodeHelper {
 
-  /**
-   * @return positive integer for number of slots that are pushed onto the stack and negative
-   *     integer for slot consumed from the stack see
-   *     https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-6.html#jvms-6.5 for reference
-   */
-  public static int adjustStackUsage(AbstractInsnNode currentInsn) {
-    switch (currentInsn.getType()) {
-      case AbstractInsnNode.INSN:
-        return adjustStackUsageInsn((InsnNode) currentInsn);
-      case AbstractInsnNode.INT_INSN:
-        return adjustStackUsageIntInsn((IntInsnNode) currentInsn);
-      case AbstractInsnNode.VAR_INSN:
-        return adjustStackUsageVarInsn((VarInsnNode) currentInsn);
-      case AbstractInsnNode.TYPE_INSN:
-        return adjustStackUsageTypeInsn((TypeInsnNode) currentInsn);
-      case AbstractInsnNode.FIELD_INSN:
-        return adjustStackUsageFieldInsn((FieldInsnNode) currentInsn);
-      case AbstractInsnNode.METHOD_INSN:
-        return adjustStackUsageMethodInsn((MethodInsnNode) currentInsn);
-      case AbstractInsnNode.INVOKE_DYNAMIC_INSN:
-        return adjustStackUsageInvokeDynamicInsn((InvokeDynamicInsnNode) currentInsn);
-      case AbstractInsnNode.JUMP_INSN:
-        return adjustStackUsageJumpInsn((JumpInsnNode) currentInsn);
-      case AbstractInsnNode.LDC_INSN:
-        return adjustStackUsageLdcInsn((LdcInsnNode) currentInsn);
-      case AbstractInsnNode.IINC_INSN:
-        return adjustStackUsageIincInsn((IincInsnNode) currentInsn);
-      case AbstractInsnNode.TABLESWITCH_INSN:
-        return adjustStackUsageTableSwitchInsn((TableSwitchInsnNode) currentInsn);
-      case AbstractInsnNode.LOOKUPSWITCH_INSN:
-        return adjustStackUsageLookupSwitchInsn((LookupSwitchInsnNode) currentInsn);
-      case AbstractInsnNode.MULTIANEWARRAY_INSN:
-        return adjustStackUsageMultiANewArrayInsn((MultiANewArrayInsnNode) currentInsn);
+    /**
+     * @return positive integer for number of slots that are pushed onto the stack and negative
+     *     integer for slot consumed from the stack see
+     *     https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-6.html#jvms-6.5 for reference
+     */
+    public static int adjustStackUsage(AbstractInsnNode currentInsn) {
+        switch (currentInsn.getType()) {
+            case AbstractInsnNode.INSN:
+                return adjustStackUsageInsn((InsnNode) currentInsn);
+            case AbstractInsnNode.INT_INSN:
+                return adjustStackUsageIntInsn((IntInsnNode) currentInsn);
+            case AbstractInsnNode.VAR_INSN:
+                return adjustStackUsageVarInsn((VarInsnNode) currentInsn);
+            case AbstractInsnNode.TYPE_INSN:
+                return adjustStackUsageTypeInsn((TypeInsnNode) currentInsn);
+            case AbstractInsnNode.FIELD_INSN:
+                return adjustStackUsageFieldInsn((FieldInsnNode) currentInsn);
+            case AbstractInsnNode.METHOD_INSN:
+                return adjustStackUsageMethodInsn((MethodInsnNode) currentInsn);
+            case AbstractInsnNode.INVOKE_DYNAMIC_INSN:
+                return adjustStackUsageInvokeDynamicInsn((InvokeDynamicInsnNode) currentInsn);
+            case AbstractInsnNode.JUMP_INSN:
+                return adjustStackUsageJumpInsn((JumpInsnNode) currentInsn);
+            case AbstractInsnNode.LDC_INSN:
+                return adjustStackUsageLdcInsn((LdcInsnNode) currentInsn);
+            case AbstractInsnNode.IINC_INSN:
+                return adjustStackUsageIincInsn((IincInsnNode) currentInsn);
+            case AbstractInsnNode.TABLESWITCH_INSN:
+                return adjustStackUsageTableSwitchInsn((TableSwitchInsnNode) currentInsn);
+            case AbstractInsnNode.LOOKUPSWITCH_INSN:
+                return adjustStackUsageLookupSwitchInsn((LookupSwitchInsnNode) currentInsn);
+            case AbstractInsnNode.MULTIANEWARRAY_INSN:
+                return adjustStackUsageMultiANewArrayInsn((MultiANewArrayInsnNode) currentInsn);
+        }
+        return 0;
     }
-    return 0;
-  }
 
-  private static int adjustStackUsageInsn(InsnNode currentInsn) {
-    switch (currentInsn.getOpcode()) {
-      case Opcodes.ACONST_NULL:
-      case Opcodes.ICONST_M1:
-      case Opcodes.ICONST_0:
-      case Opcodes.ICONST_1:
-      case Opcodes.ICONST_2:
-      case Opcodes.ICONST_3:
-      case Opcodes.ICONST_4:
-      case Opcodes.ICONST_5:
-      case Opcodes.FCONST_0:
-      case Opcodes.FCONST_1:
-      case Opcodes.FCONST_2:
-        return 1;
-      case Opcodes.LCONST_0:
-      case Opcodes.LCONST_1:
-      case Opcodes.DCONST_0:
-      case Opcodes.DCONST_1:
-        return 2;
-      case Opcodes.IALOAD:
-      case Opcodes.FALOAD:
-      case Opcodes.AALOAD:
-      case Opcodes.BALOAD:
-      case Opcodes.CALOAD:
-      case Opcodes.SALOAD:
-        // consume array ref and index from the stack
-        // push value onto the stack
-        return -2 + 1;
-      case Opcodes.IASTORE:
-      case Opcodes.FASTORE:
-      case Opcodes.AASTORE:
-      case Opcodes.BASTORE:
-      case Opcodes.CASTORE:
-      case Opcodes.SASTORE:
-        // consume array ref, index and value from the stack
-        return -3;
-      case Opcodes.LASTORE:
-      case Opcodes.DASTORE:
-        // consume array ref, index and long value from the stack
-        return -4;
-      case Opcodes.POP:
-      case Opcodes.IRETURN:
-      case Opcodes.FRETURN:
-      case Opcodes.ARETURN:
-      case Opcodes.MONITORENTER:
-      case Opcodes.MONITOREXIT:
-        // consumes 1 slot from the stack
-        return -1;
-      case Opcodes.POP2:
-      case Opcodes.LRETURN:
-      case Opcodes.DRETURN:
-        // consumes 2 slots from the stack
-        return -2;
-      case Opcodes.DUP:
-      case Opcodes.DUP_X1:
-      case Opcodes.DUP_X2:
-        // push 1 slot onto the stack
-        return 1;
-      case Opcodes.DUP2:
-      case Opcodes.DUP2_X1:
-      case Opcodes.DUP2_X2:
-        // push 2 slots onto the stack
-        return 2;
-      case Opcodes.SWAP:
-      case Opcodes.INEG:
-      case Opcodes.FNEG:
-      case Opcodes.I2F:
-      case Opcodes.F2I:
-      case Opcodes.I2B:
-      case Opcodes.I2C:
-      case Opcodes.I2S:
-        // consume 1 slot from the stack
-        // push 1 slot to the stack
-        return -1 + 1;
-      case Opcodes.LNEG:
-      case Opcodes.DNEG:
-      case Opcodes.L2D:
-      case Opcodes.D2L:
-        // consume 2 slots from the stack
-        // push 2 slots to the stack
-        return -2 + 2;
-      case Opcodes.NOP:
-      case Opcodes.RETURN:
-      case Opcodes.ARRAYLENGTH:
-      case Opcodes.ATHROW:
-        // no change
+    private static int adjustStackUsageInsn(InsnNode currentInsn) {
+        switch (currentInsn.getOpcode()) {
+            case Opcodes.ACONST_NULL:
+            case Opcodes.ICONST_M1:
+            case Opcodes.ICONST_0:
+            case Opcodes.ICONST_1:
+            case Opcodes.ICONST_2:
+            case Opcodes.ICONST_3:
+            case Opcodes.ICONST_4:
+            case Opcodes.ICONST_5:
+            case Opcodes.FCONST_0:
+            case Opcodes.FCONST_1:
+            case Opcodes.FCONST_2:
+                return 1;
+            case Opcodes.LCONST_0:
+            case Opcodes.LCONST_1:
+            case Opcodes.DCONST_0:
+            case Opcodes.DCONST_1:
+                return 2;
+            case Opcodes.IALOAD:
+            case Opcodes.FALOAD:
+            case Opcodes.AALOAD:
+            case Opcodes.BALOAD:
+            case Opcodes.CALOAD:
+            case Opcodes.SALOAD:
+                // consume array ref and index from the stack
+                // push value onto the stack
+                return -2 + 1;
+            case Opcodes.IASTORE:
+            case Opcodes.FASTORE:
+            case Opcodes.AASTORE:
+            case Opcodes.BASTORE:
+            case Opcodes.CASTORE:
+            case Opcodes.SASTORE:
+                // consume array ref, index and value from the stack
+                return -3;
+            case Opcodes.LASTORE:
+            case Opcodes.DASTORE:
+                // consume array ref, index and long value from the stack
+                return -4;
+            case Opcodes.POP:
+            case Opcodes.IRETURN:
+            case Opcodes.FRETURN:
+            case Opcodes.ARETURN:
+            case Opcodes.MONITORENTER:
+            case Opcodes.MONITOREXIT:
+                // consumes 1 slot from the stack
+                return -1;
+            case Opcodes.POP2:
+            case Opcodes.LRETURN:
+            case Opcodes.DRETURN:
+                // consumes 2 slots from the stack
+                return -2;
+            case Opcodes.DUP:
+            case Opcodes.DUP_X1:
+            case Opcodes.DUP_X2:
+                // push 1 slot onto the stack
+                return 1;
+            case Opcodes.DUP2:
+            case Opcodes.DUP2_X1:
+            case Opcodes.DUP2_X2:
+                // push 2 slots onto the stack
+                return 2;
+            case Opcodes.SWAP:
+            case Opcodes.INEG:
+            case Opcodes.FNEG:
+            case Opcodes.I2F:
+            case Opcodes.F2I:
+            case Opcodes.I2B:
+            case Opcodes.I2C:
+            case Opcodes.I2S:
+                // consume 1 slot from the stack
+                // push 1 slot to the stack
+                return -1 + 1;
+            case Opcodes.LNEG:
+            case Opcodes.DNEG:
+            case Opcodes.L2D:
+            case Opcodes.D2L:
+                // consume 2 slots from the stack
+                // push 2 slots to the stack
+                return -2 + 2;
+            case Opcodes.NOP:
+            case Opcodes.RETURN:
+            case Opcodes.ARRAYLENGTH:
+            case Opcodes.ATHROW:
+                // no change
+                return 0;
+            case Opcodes.IADD:
+            case Opcodes.FADD:
+            case Opcodes.ISUB:
+            case Opcodes.FSUB:
+            case Opcodes.IMUL:
+            case Opcodes.FMUL:
+            case Opcodes.IDIV:
+            case Opcodes.FDIV:
+            case Opcodes.IREM:
+            case Opcodes.FREM:
+            case Opcodes.ISHL:
+            case Opcodes.ISHR:
+            case Opcodes.IUSHR:
+            case Opcodes.IAND:
+            case Opcodes.IOR:
+            case Opcodes.IXOR:
+            case Opcodes.FCMPL:
+            case Opcodes.FCMPG:
+                // consume 2 slots from the stack
+                // push the result onto the stack
+                return -2 + 1;
+            case Opcodes.LADD:
+            case Opcodes.DADD:
+            case Opcodes.LSUB:
+            case Opcodes.DSUB:
+            case Opcodes.LMUL:
+            case Opcodes.DMUL:
+            case Opcodes.LDIV:
+            case Opcodes.DDIV:
+            case Opcodes.LREM:
+            case Opcodes.DREM:
+            case Opcodes.LAND:
+            case Opcodes.LOR:
+            case Opcodes.LXOR:
+                // consume 2x 2 slots from the stack
+                // push the result onto the stack
+                return -4 + 2;
+            case Opcodes.LSHL:
+            case Opcodes.LSHR:
+            case Opcodes.LUSHR:
+                // consume 2(long)+1(int) slots from the stack
+                // push the result onto the stack
+                return -3 + 2;
+            case Opcodes.I2L:
+            case Opcodes.I2D:
+            case Opcodes.F2L:
+            case Opcodes.F2D:
+                // consume 1 slot from the stack
+                // push 2 slots (long) onto the stack
+                return -1 + 2;
+            case Opcodes.L2I:
+            case Opcodes.L2F:
+            case Opcodes.D2I:
+            case Opcodes.D2F:
+                // consume 2 slots (long) from the stack
+                // push 1 slot onto the stack
+                return -2 + 1;
+            case Opcodes.LCMP:
+            case Opcodes.DCMPL:
+            case Opcodes.DCMPG:
+                // consume 2x 2 slots from the stack
+                // push the 1 slot result onto the stack
+                return -4 + 1;
+        }
         return 0;
-      case Opcodes.IADD:
-      case Opcodes.FADD:
-      case Opcodes.ISUB:
-      case Opcodes.FSUB:
-      case Opcodes.IMUL:
-      case Opcodes.FMUL:
-      case Opcodes.IDIV:
-      case Opcodes.FDIV:
-      case Opcodes.IREM:
-      case Opcodes.FREM:
-      case Opcodes.ISHL:
-      case Opcodes.ISHR:
-      case Opcodes.IUSHR:
-      case Opcodes.IAND:
-      case Opcodes.IOR:
-      case Opcodes.IXOR:
-      case Opcodes.FCMPL:
-      case Opcodes.FCMPG:
-        // consume 2 slots from the stack
-        // push the result onto the stack
-        return -2 + 1;
-      case Opcodes.LADD:
-      case Opcodes.DADD:
-      case Opcodes.LSUB:
-      case Opcodes.DSUB:
-      case Opcodes.LMUL:
-      case Opcodes.DMUL:
-      case Opcodes.LDIV:
-      case Opcodes.DDIV:
-      case Opcodes.LREM:
-      case Opcodes.DREM:
-      case Opcodes.LAND:
-      case Opcodes.LOR:
-      case Opcodes.LXOR:
-        // consume 2x 2 slots from the stack
-        // push the result onto the stack
-        return -4 + 2;
-      case Opcodes.LSHL:
-      case Opcodes.LSHR:
-      case Opcodes.LUSHR:
-        // consume 2(long)+1(int) slots from the stack
-        // push the result onto the stack
-        return -3 + 2;
-      case Opcodes.I2L:
-      case Opcodes.I2D:
-      case Opcodes.F2L:
-      case Opcodes.F2D:
-        // consume 1 slot from the stack
-        // push 2 slots (long) onto the stack
-        return -1 + 2;
-      case Opcodes.L2I:
-      case Opcodes.L2F:
-      case Opcodes.D2I:
-      case Opcodes.D2F:
-        // consume 2 slots (long) from the stack
-        // push 1 slot onto the stack
-        return -2 + 1;
-      case Opcodes.LCMP:
-      case Opcodes.DCMPL:
-      case Opcodes.DCMPG:
-        // consume 2x 2 slots from the stack
-        // push the 1 slot result onto the stack
-        return -4 + 1;
     }
-    return 0;
-  }
 
-  private static int adjustStackUsageIntInsn(IntInsnNode currentInsn) {
-    switch (currentInsn.getOpcode()) {
-      case Opcodes.BIPUSH:
-      case Opcodes.SIPUSH:
-        return 1;
-      case Opcodes.NEWARRAY:
-        // consumes count from the stack
-        // pushes a new instance on the stack
-        return -1 + 1;
+    private static int adjustStackUsageIntInsn(IntInsnNode currentInsn) {
+        switch (currentInsn.getOpcode()) {
+            case Opcodes.BIPUSH:
+            case Opcodes.SIPUSH:
+                return 1;
+            case Opcodes.NEWARRAY:
+                // consumes count from the stack
+                // pushes a new instance on the stack
+                return -1 + 1;
+        }
+        return 0;
     }
-    return 0;
-  }
 
-  private static int adjustStackUsageVarInsn(VarInsnNode currentInsn) {
-    switch (currentInsn.getOpcode()) {
-      case Opcodes.ILOAD:
-      case Opcodes.FLOAD:
-      case Opcodes.ALOAD:
-        return 1;
-      case Opcodes.LLOAD:
-      case Opcodes.DLOAD:
-        return 2;
-      case Opcodes.ISTORE:
-      case Opcodes.FSTORE:
-      case Opcodes.ASTORE:
-        return -1;
-      case Opcodes.LSTORE:
-      case Opcodes.DSTORE:
-        return -2;
-      case Opcodes.RET:
+    private static int adjustStackUsageVarInsn(VarInsnNode currentInsn) {
+        switch (currentInsn.getOpcode()) {
+            case Opcodes.ILOAD:
+            case Opcodes.FLOAD:
+            case Opcodes.ALOAD:
+                return 1;
+            case Opcodes.LLOAD:
+            case Opcodes.DLOAD:
+                return 2;
+            case Opcodes.ISTORE:
+            case Opcodes.FSTORE:
+            case Opcodes.ASTORE:
+                return -1;
+            case Opcodes.LSTORE:
+            case Opcodes.DSTORE:
+                return -2;
+            case Opcodes.RET:
+        }
+        return 0;
     }
-    return 0;
-  }
 
-  private static int adjustStackUsageTypeInsn(TypeInsnNode currentInsn) {
-    switch (currentInsn.getOpcode()) {
-      case Opcodes.NEW:
-        return 1;
-      case Opcodes.ANEWARRAY:
-        // consumes count from the stack
-        // pushes a new instance on the stack
-        return -1 + 1;
-      case Opcodes.CHECKCAST:
-        // no change on the stack
+    private static int adjustStackUsageTypeInsn(TypeInsnNode currentInsn) {
+        switch (currentInsn.getOpcode()) {
+            case Opcodes.NEW:
+                return 1;
+            case Opcodes.ANEWARRAY:
+                // consumes count from the stack
+                // pushes a new instance on the stack
+                return -1 + 1;
+            case Opcodes.CHECKCAST:
+                // no change on the stack
+                return 0;
+            case Opcodes.INSTANCEOF:
+                // consumes object reference from the stack
+                // pushes result onto the stack
+                return -1 + 1;
+        }
         return 0;
-      case Opcodes.INSTANCEOF:
-        // consumes object reference from the stack
-        // pushes result onto the stack
-        return -1 + 1;
     }
-    return 0;
-  }
 
-  private static int adjustStackUsageFieldInsn(FieldInsnNode currentInsn) {
-    Type type = Type.getType(((FieldInsnNode) currentInsn).desc);
-    switch (currentInsn.getOpcode()) {
-      case Opcodes.GETFIELD:
-        return type.getSize() - 1; // consume instance field
-      case Opcodes.PUTFIELD:
-        return -type.getSize() - 1; // consume instance field
-      case Opcodes.GETSTATIC:
-        return type.getSize();
-      case Opcodes.PUTSTATIC:
-        return -type.getSize();
+    private static int adjustStackUsageFieldInsn(FieldInsnNode currentInsn) {
+        Type type = Type.getType(((FieldInsnNode) currentInsn).desc);
+        switch (currentInsn.getOpcode()) {
+            case Opcodes.GETFIELD:
+                return type.getSize() - 1; // consume instance field
+            case Opcodes.PUTFIELD:
+                return -type.getSize() - 1; // consume instance field
+            case Opcodes.GETSTATIC:
+                return type.getSize();
+            case Opcodes.PUTSTATIC:
+                return -type.getSize();
+        }
+        return 0;
     }
-    return 0;
-  }
 
-  private static int adjustStackUsageMethodInsn(MethodInsnNode currentInsn) {
-    Type methodType = Type.getType(currentInsn.desc);
-    int argumentSize = Arrays.stream(methodType.getArgumentTypes()).mapToInt(Type::getSize).sum();
-    int returnSize = methodType.getReturnType().getSize();
-    switch (currentInsn.getOpcode()) {
-      case Opcodes.INVOKESTATIC:
-        // consumes arguments
-        // push return value
-        return -argumentSize + returnSize;
-      case Opcodes.INVOKESPECIAL:
-      case Opcodes.INVOKEVIRTUAL:
-      case Opcodes.INVOKEINTERFACE:
-        // consume this
+    private static int adjustStackUsageMethodInsn(MethodInsnNode currentInsn) {
+        Type methodType = Type.getType(currentInsn.desc);
+        int argumentSize = Arrays.stream(methodType.getArgumentTypes())
+                .mapToInt(Type::getSize)
+                .sum();
+        int returnSize = methodType.getReturnType().getSize();
+        switch (currentInsn.getOpcode()) {
+            case Opcodes.INVOKESTATIC:
+                // consumes arguments
+                // push return value
+                return -argumentSize + returnSize;
+            case Opcodes.INVOKESPECIAL:
+            case Opcodes.INVOKEVIRTUAL:
+            case Opcodes.INVOKEINTERFACE:
+                // consume this
+                // consume arguments
+                // push return value
+                return -1 - argumentSize + returnSize;
+        }
+        return 0;
+    }
+
+    private static int adjustStackUsageInvokeDynamicInsn(InvokeDynamicInsnNode currentInsn) {
+        Type methodType = Type.getType(currentInsn.desc);
+        int argumentSize = Arrays.stream(methodType.getArgumentTypes())
+                .mapToInt(Type::getSize)
+                .sum();
+        int returnSize = methodType.getReturnType().getSize();
         // consume arguments
         // push return value
-        return -1 - argumentSize + returnSize;
+        return -argumentSize + returnSize;
     }
-    return 0;
-  }
 
-  private static int adjustStackUsageInvokeDynamicInsn(InvokeDynamicInsnNode currentInsn) {
-    Type methodType = Type.getType(currentInsn.desc);
-    int argumentSize = Arrays.stream(methodType.getArgumentTypes()).mapToInt(Type::getSize).sum();
-    int returnSize = methodType.getReturnType().getSize();
-    // consume arguments
-    // push return value
-    return -argumentSize + returnSize;
-  }
+    private static int adjustStackUsageJumpInsn(JumpInsnNode currentInsn) {
+        switch (currentInsn.getOpcode()) {
+            case Opcodes.IFEQ:
+            case Opcodes.IFNE:
+            case Opcodes.IFLT:
+            case Opcodes.IFGE:
+            case Opcodes.IFGT:
+            case Opcodes.IFLE:
+            case Opcodes.IFNULL:
+            case Opcodes.IFNONNULL:
+                // consume value from the stack
+                return -1;
+            case Opcodes.IF_ICMPEQ:
+            case Opcodes.IF_ICMPNE:
+            case Opcodes.IF_ICMPLT:
+            case Opcodes.IF_ICMPGE:
+            case Opcodes.IF_ICMPGT:
+            case Opcodes.IF_ICMPLE:
+            case Opcodes.IF_ACMPEQ:
+            case Opcodes.IF_ACMPNE:
+                // consume 2 values from the stack
+                return -2;
+            case Opcodes.JSR:
+                return 1;
+            case Opcodes.GOTO:
+            // no change
+        }
+        return 0;
+    }
 
-  private static int adjustStackUsageJumpInsn(JumpInsnNode currentInsn) {
-    switch (currentInsn.getOpcode()) {
-      case Opcodes.IFEQ:
-      case Opcodes.IFNE:
-      case Opcodes.IFLT:
-      case Opcodes.IFGE:
-      case Opcodes.IFGT:
-      case Opcodes.IFLE:
-      case Opcodes.IFNULL:
-      case Opcodes.IFNONNULL:
-        // consume value from the stack
-        return -1;
-      case Opcodes.IF_ICMPEQ:
-      case Opcodes.IF_ICMPNE:
-      case Opcodes.IF_ICMPLT:
-      case Opcodes.IF_ICMPGE:
-      case Opcodes.IF_ICMPGT:
-      case Opcodes.IF_ICMPLE:
-      case Opcodes.IF_ACMPEQ:
-      case Opcodes.IF_ACMPNE:
-        // consume 2 values from the stack
-        return -2;
-      case Opcodes.JSR:
+    private static int adjustStackUsageLdcInsn(LdcInsnNode currentInsn) {
+        // LDC, LDC_W, LDC2_W
+        Object cst = currentInsn.cst;
+        if (cst instanceof Long || cst instanceof Double) {
+            return 2;
+        }
         return 1;
-      case Opcodes.GOTO:
-        // no change
     }
-    return 0;
-  }
 
-  private static int adjustStackUsageLdcInsn(LdcInsnNode currentInsn) {
-    // LDC, LDC_W, LDC2_W
-    Object cst = currentInsn.cst;
-    if (cst instanceof Long || cst instanceof Double) {
-      return 2;
+    private static int adjustStackUsageIincInsn(IincInsnNode currentInsn) {
+        // no change
+        return 0;
     }
-    return 1;
-  }
-
-  private static int adjustStackUsageIincInsn(IincInsnNode currentInsn) {
-    // no change
-    return 0;
-  }
 
-  private static int adjustStackUsageTableSwitchInsn(TableSwitchInsnNode currentInsn) {
-    // consumes 1 slot from the stack (index)
-    return -1;
-  }
+    private static int adjustStackUsageTableSwitchInsn(TableSwitchInsnNode currentInsn) {
+        // consumes 1 slot from the stack (index)
+        return -1;
+    }
 
-  private static int adjustStackUsageLookupSwitchInsn(LookupSwitchInsnNode currentInsn) {
-    // consumes 1 slot from the stack (key)
-    return -1;
-  }
+    private static int adjustStackUsageLookupSwitchInsn(LookupSwitchInsnNode currentInsn) {
+        // consumes 1 slot from the stack (key)
+        return -1;
+    }
 
-  private static int adjustStackUsageMultiANewArrayInsn(MultiANewArrayInsnNode currentInsn) {
-    // pushes one instance on the stack (arrayref)
-    // consumes dims item from the stack
-    return 1 - currentInsn.dims;
-  }
+    private static int adjustStackUsageMultiANewArrayInsn(MultiANewArrayInsnNode currentInsn) {
+        // pushes one instance on the stack (arrayref)
+        // consumes dims item from the stack
+        return 1 - currentInsn.dims;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/CapturedContextInstrumenter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/CapturedContextInstrumenter.java
index 9acb02fe19e..2243598c302 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/CapturedContextInstrumenter.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/CapturedContextInstrumenter.java
@@ -66,942 +66,914 @@
 import org.slf4j.LoggerFactory;
 
 public class CapturedContextInstrumenter extends Instrumenter {
-  private static final Logger LOGGER = LoggerFactory.getLogger(CapturedContextInstrumenter.class);
-  private final boolean captureSnapshot;
-  private final boolean captureEntry;
-  private final Limits limits;
-  protected final LabelNode contextInitLabel = new LabelNode();
-  private int entryContextVar = -1;
-  private int exitContextVar = -1;
-  private int timestampStartVar = -1;
-  private int throwableListVar = -1;
-  protected Collection<LocalVariableNode> hoistedLocalVars = Collections.emptyList();
-
-  public CapturedContextInstrumenter(
-      ProbeDefinition definition,
-      MethodInfo methodInfo,
-      List<DiagnosticMessage> diagnostics,
-      List<Integer> probeIndices,
-      boolean captureSnapshot,
-      boolean captureEntry,
-      Limits limits) {
-    super(definition, methodInfo, diagnostics, probeIndices);
-    this.captureSnapshot = captureSnapshot;
-    this.captureEntry = captureEntry;
-    this.limits = limits;
-  }
-
-  @Override
-  public InstrumentationResult.Status instrument() {
-    if (definition.isLineProbe()) {
-      if (!addLineCaptures(classFileLines)) {
-        return InstrumentationResult.Status.ERROR;
-      }
-      installFinallyBlocks();
-      return InstrumentationResult.Status.INSTALLED;
-    }
-    Map<AbstractInsnNode, Frame<BasicValue>> frames = computeFrames(classNode.name, methodNode);
-    instrumentMethodEnter();
-    instrumentTryCatchHandlers();
-    processInstructions(frames);
-    addFinallyHandler(contextInitLabel, returnHandlerLabel);
-    installFinallyBlocks();
-    return InstrumentationResult.Status.INSTALLED;
-  }
-
-  private boolean addLineCaptures(ClassFileLines classFileLines) {
-    Where.SourceLine[] targetLines = definition.getWhere().getSourceLines();
-    if (targetLines == null) {
-      reportError("Missing line(s) in probe definition.");
-      return false;
-    }
-    if (classFileLines.isEmpty()) {
-      reportError("Missing line debug information.");
-      return false;
-    }
-    for (Where.SourceLine sourceLine : targetLines) {
-      int from = sourceLine.getFrom();
-      int till = sourceLine.getTill();
-
-      boolean isSingleLine = from == till;
-      if (isSingleLine) {
-        List<MethodNode> methods = classFileLines.getMethodsByLine(from);
-        if (methods.size() == 1 && "<init>".equals(methods.get(0).name)) {
-          if (from == classFileLines.getMethodStart(methodNode)) {
-            reportError("Cannot instrument the first line of a constructor");
+    private static final Logger LOGGER = LoggerFactory.getLogger(CapturedContextInstrumenter.class);
+    private final boolean captureSnapshot;
+    private final boolean captureEntry;
+    private final Limits limits;
+    protected final LabelNode contextInitLabel = new LabelNode();
+    private int entryContextVar = -1;
+    private int exitContextVar = -1;
+    private int timestampStartVar = -1;
+    private int throwableListVar = -1;
+    protected Collection<LocalVariableNode> hoistedLocalVars = Collections.emptyList();
+
+    public CapturedContextInstrumenter(
+            ProbeDefinition definition,
+            MethodInfo methodInfo,
+            List<DiagnosticMessage> diagnostics,
+            List<Integer> probeIndices,
+            boolean captureSnapshot,
+            boolean captureEntry,
+            Limits limits) {
+        super(definition, methodInfo, diagnostics, probeIndices);
+        this.captureSnapshot = captureSnapshot;
+        this.captureEntry = captureEntry;
+        this.limits = limits;
+    }
+
+    @Override
+    public InstrumentationResult.Status instrument() {
+        if (definition.isLineProbe()) {
+            if (!addLineCaptures(classFileLines)) {
+                return InstrumentationResult.Status.ERROR;
+            }
+            installFinallyBlocks();
+            return InstrumentationResult.Status.INSTALLED;
+        }
+        Map<AbstractInsnNode, Frame<BasicValue>> frames = computeFrames(classNode.name, methodNode);
+        instrumentMethodEnter();
+        instrumentTryCatchHandlers();
+        processInstructions(frames);
+        addFinallyHandler(contextInitLabel, returnHandlerLabel);
+        installFinallyBlocks();
+        return InstrumentationResult.Status.INSTALLED;
+    }
+
+    private boolean addLineCaptures(ClassFileLines classFileLines) {
+        Where.SourceLine[] targetLines = definition.getWhere().getSourceLines();
+        if (targetLines == null) {
+            reportError("Missing line(s) in probe definition.");
+            return false;
+        }
+        if (classFileLines.isEmpty()) {
+            reportError("Missing line debug information.");
             return false;
-          }
-        }
-      }
-      LabelNode beforeLabel = classFileLines.getLineLabel(from);
-      // single line N capture translates to line range (N, N+1)
-      LabelNode afterLabel = classFileLines.getLineLabel(till + (isSingleLine ? 1 : 0));
-      if (beforeLabel == null && afterLabel == null) {
-        reportError("No line info for " + (isSingleLine ? "line " : "range ") + sourceLine + ".");
-      }
-      if (beforeLabel != null) {
+        }
+        for (Where.SourceLine sourceLine : targetLines) {
+            int from = sourceLine.getFrom();
+            int till = sourceLine.getTill();
+
+            boolean isSingleLine = from == till;
+            if (isSingleLine) {
+                List<MethodNode> methods = classFileLines.getMethodsByLine(from);
+                if (methods.size() == 1 && "<init>".equals(methods.get(0).name)) {
+                    if (from == classFileLines.getMethodStart(methodNode)) {
+                        reportError("Cannot instrument the first line of a constructor");
+                        return false;
+                    }
+                }
+            }
+            LabelNode beforeLabel = classFileLines.getLineLabel(from);
+            // single line N capture translates to line range (N, N+1)
+            LabelNode afterLabel = classFileLines.getLineLabel(till + (isSingleLine ? 1 : 0));
+            if (beforeLabel == null && afterLabel == null) {
+                reportError("No line info for " + (isSingleLine ? "line " : "range ") + sourceLine + ".");
+            }
+            if (beforeLabel != null) {
+                InsnList insnList = new InsnList();
+                if (isSingleLine) {
+                    TryCatchBlockNode catchHandler = findCatchHandler(beforeLabel);
+                    if (catchHandler != null && !isExceptionLocalDeclared(catchHandler, methodNode)) {
+                        // empty catch block does not declare exception local variable - we add it
+                        int idx = addExceptionLocal(catchHandler, methodNode);
+                        // store exception in the new local variable
+                        // stack [exception]
+                        insnList.add(new InsnNode(Opcodes.DUP));
+                        // stack [exception, exception]
+                        insnList.add(new VarInsnNode(Opcodes.ASTORE, idx));
+                        // stack [exception]
+                    }
+                }
+                addIsReadyToCaptureCall(insnList);
+                // stack [boolean]
+                LabelNode targetNode = new LabelNode();
+                insnList.add(new JumpInsnNode(Opcodes.IFEQ, targetNode));
+                LabelNode inProbeStartLabel = new LabelNode();
+                insnList.add(inProbeStartLabel);
+                // stack []
+                addEvalContextAndCommitCall(sourceLine, insnList, beforeLabel);
+                // stack []
+                invokeStatic(insnList, DEBUGGER_CONTEXT_TYPE, "disableInProbe", VOID_TYPE);
+                LabelNode inProbeEndLabel = new LabelNode();
+                insnList.add(inProbeEndLabel);
+                createInProbeFinallyHandler(inProbeStartLabel, inProbeEndLabel);
+                insnList.add(targetNode);
+                methodNode.instructions.insertBefore(beforeLabel.getNext(), insnList);
+            }
+            if (afterLabel != null && !isSingleLine) {
+                InsnList insnList = collectCapturedContext(Snapshot.Kind.AFTER, afterLabel);
+                methodNode.instructions.insert(afterLabel, insnList);
+            }
+        }
+        return true;
+    }
+
+    protected void addEvalContextAndCommitCall(Where.SourceLine sourceLine, InsnList insnList, LabelNode beforeLabel) {
+        insnList.add(collectCapturedContext(Snapshot.Kind.BEFORE, beforeLabel));
+        // stack [capturedcontext]
+        ldc(insnList, Type.getObjectType(classNode.name));
+        // stack [capturedcontext, class]
+        ldc(insnList, sourceLine.getFrom());
+        // stack [capturedcontext, class, int]
+        pushProbeIndices(insnList);
+        // stack [capturedcontext, class, int, array]
+        invokeStatic(
+                insnList,
+                DEBUGGER_CONTEXT_TYPE,
+                "evalContextAndCommit",
+                VOID_TYPE,
+                CAPTURED_CONTEXT_TYPE,
+                CLASS_TYPE,
+                INT_TYPE,
+                INT_ARRAY_TYPE);
+        // stack []
+    }
+
+    private int addExceptionLocal(TryCatchBlockNode catchHandler, MethodNode methodNode) {
+        AbstractInsnNode current = catchHandler.handler;
+        while (current != null
+                && (current.getType() == AbstractInsnNode.LABEL || current.getType() == AbstractInsnNode.LINE)) {
+            current = current.getNext();
+        }
+        if (current == null) {
+            reportWarning("Cannot add exception local variable to catch block - no instructions.");
+            return -1;
+        }
+        if (current.getOpcode() != Opcodes.ASTORE) {
+            reportWarning("Cannot add exception local variable to catch block - no store instruction.");
+            return -1;
+        }
+        int exceptionLocalIdx = ((VarInsnNode) current).var;
+        Set<String> localNames = methodNode.localVariables.stream()
+                .map(localVariableNode -> localVariableNode.name)
+                .collect(Collectors.toSet());
+        // find next label assume this is the end of the handler
+        while (current != null && current.getType() != AbstractInsnNode.LABEL) {
+            current = current.getNext();
+        }
+        if (current == null) {
+            reportWarning("Cannot add exception local variable to catch block - no end of handler.");
+            return -1;
+        }
+        LabelNode end = (LabelNode) current;
+        for (int i = 0; i < 100; i++) {
+            String exceptionLocalName = "ex" + i;
+            if (!localNames.contains(exceptionLocalName)) {
+                methodNode.localVariables.add(new LocalVariableNode(
+                        exceptionLocalName,
+                        "L" + catchHandler.type + ";",
+                        null,
+                        catchHandler.handler,
+                        end,
+                        exceptionLocalIdx));
+                return exceptionLocalIdx;
+            }
+        }
+        return -1;
+    }
+
+    private TryCatchBlockNode findCatchHandler(LabelNode targetLine) {
+        for (TryCatchBlockNode tryCatchBlockNode : methodNode.tryCatchBlocks) {
+            if (tryCatchBlockNode.handler == targetLine) {
+                return tryCatchBlockNode;
+            }
+        }
+        return null;
+    }
+
+    private boolean isExceptionLocalDeclared(TryCatchBlockNode catchHandler, MethodNode methodNode) {
+        if (methodNode.localVariables == null || methodNode.localVariables.isEmpty()) {
+            return false;
+        }
+        String catchDesc = catchHandler.type != null ? "L" + catchHandler.type + ";" : "Ljava/lang/Throwable;";
+        for (LocalVariableNode local : methodNode.localVariables) {
+            if (catchDesc.equals(local.desc)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    protected InsnList getBeforeReturnInsnList(AbstractInsnNode node, Map<AbstractInsnNode, Frame<BasicValue>> frames) {
         InsnList insnList = new InsnList();
-        if (isSingleLine) {
-          TryCatchBlockNode catchHandler = findCatchHandler(beforeLabel);
-          if (catchHandler != null && !isExceptionLocalDeclared(catchHandler, methodNode)) {
-            // empty catch block does not declare exception local variable - we add it
-            int idx = addExceptionLocal(catchHandler, methodNode);
-            // store exception in the new local variable
-            // stack [exception]
-            insnList.add(new InsnNode(Opcodes.DUP));
-            // stack [exception, exception]
-            insnList.add(new VarInsnNode(Opcodes.ASTORE, idx));
-            // stack [exception]
-          }
+        // stack [ret_value]
+        insnList.add(new VarInsnNode(Opcodes.ALOAD, entryContextVar));
+        // stack [ret_value, capturedcontext]
+        LabelNode targetNode = new LabelNode();
+        LabelNode gotoNode = new LabelNode();
+        invokeVirtual(insnList, CAPTURED_CONTEXT_TYPE, "isCapturing", BOOLEAN_TYPE);
+        // stack [ret_value, boolean]
+        insnList.add(new JumpInsnNode(Opcodes.IFEQ, targetNode));
+        // stack [ret_value]
+        addEvalContextCall(insnList, Snapshot.Kind.RETURN, node, timestampStartVar, "EXIT");
+        // stack [ret_value]
+        invokeStatic(insnList, DEBUGGER_CONTEXT_TYPE, "disableInProbe", VOID_TYPE);
+        insnList.add(new JumpInsnNode(Opcodes.GOTO, gotoNode));
+        insnList.add(targetNode);
+        getStatic(insnList, CAPTURED_CONTEXT_TYPE, "EMPTY_CONTEXT");
+        // stack [ret_value, capturedcontext]
+        insnList.add(new VarInsnNode(Opcodes.ASTORE, exitContextVar));
+        // stack [ret_value]
+        insnList.add(gotoNode);
+        return insnList;
+    }
+
+    @Override
+    protected InsnList getReturnHandlerInsnList() {
+        return commit();
+    }
+
+    private InsnList commit() {
+        InsnList insnList = new InsnList();
+        // stack []
+        if (entryContextVar != -1) {
+            getContext(insnList, entryContextVar);
+        } else {
+            getStatic(insnList, CAPTURED_CONTEXT_TYPE, "EMPTY_CAPTURING_CONTEXT");
+        }
+        // stack [capturedcontext]
+        getContext(insnList, exitContextVar);
+        // stack [capturedcontext, capturedcontext]
+        if (throwableListVar != -1) {
+            insnList.add(new VarInsnNode(Opcodes.ALOAD, throwableListVar));
+        } else {
+            insnList.add(new InsnNode(Opcodes.ACONST_NULL));
+        }
+        // stack [capturedcontext, capturedcontext, list]
+        addCommitCall(insnList);
+        // stack []
+        return insnList;
+    }
+
+    protected void addCommitCall(InsnList insnList) {
+        // stack [capturedcontext, capturedcontext, list]
+        pushProbeIndices(insnList);
+        // stack [capturedcontext, capturedcontext, list, array]
+        invokeStatic(
+                insnList,
+                DEBUGGER_CONTEXT_TYPE,
+                "commit",
+                VOID_TYPE,
+                CAPTURED_CONTEXT_TYPE,
+                CAPTURED_CONTEXT_TYPE,
+                getType(List.class),
+                INT_ARRAY_TYPE);
+        // stack []
+    }
+
+    protected void addFinallyHandler(LabelNode startLabel, LabelNode endLabel) {
+        // stack: [exception]
+        if (methodNode.tryCatchBlocks == null) {
+            methodNode.tryCatchBlocks = new ArrayList<>();
+        }
+        LabelNode handlerLabel = new LabelNode();
+        InsnList handler = new InsnList();
+        handler.add(handlerLabel);
+        // stack [exception]
+        LabelNode targetNode = null;
+        if (entryContextVar != -1) {
+            handler.add(new VarInsnNode(Opcodes.ALOAD, entryContextVar));
+            // stack [exception, capturedcontext]
+            targetNode = new LabelNode();
+            invokeVirtual(handler, CAPTURED_CONTEXT_TYPE, "isCapturing", BOOLEAN_TYPE);
+            // stack [exception, boolean]
+            handler.add(new JumpInsnNode(Opcodes.IFEQ, targetNode));
+        }
+        if (exitContextVar == -1) {
+            exitContextVar = newVar(CAPTURED_CONTEXT_TYPE);
+        }
+        // stack [exception]
+        addEvalContextCall(handler, Snapshot.Kind.UNHANDLED_EXCEPTION, endLabel, timestampStartVar, "EXIT");
+        // stack [exception]
+        invokeStatic(handler, DEBUGGER_CONTEXT_TYPE, "disableInProbe", VOID_TYPE);
+        // stack [exception]
+        handler.add(commit());
+        if (targetNode != null) {
+            handler.add(targetNode);
+        }
+        // stack [exception]
+        handler.add(new InsnNode(Opcodes.ATHROW));
+        // stack: []
+        methodNode.instructions.add(handler);
+        finallyBlocks.add(new FinallyBlock(startLabel, endLabel, handlerLabel));
+    }
+
+    protected void addEvalContextCall(
+            InsnList insnList,
+            Snapshot.Kind snapshotKind,
+            AbstractInsnNode endLabel,
+            int timestampVar,
+            String methodLocation) {
+        // stack []
+        insnList.add(collectCapturedContext(snapshotKind, endLabel));
+        // stack: [capturedcontext]
+        ldc(insnList, Type.getObjectType(classNode.name));
+        // stack [capturedcontext, class]
+        if (timestampVar != -1) {
+            insnList.add(new VarInsnNode(Opcodes.LLOAD, timestampVar));
+        } else {
+            ldc(insnList, -1L);
+        }
+        // stack [capturedcontext, class, long]
+        getStatic(insnList, METHOD_LOCATION_TYPE, methodLocation);
+        // stack [capturedcontext, class, long, methodlocation]
+        pushProbeIndices(insnList);
+        // stack [capturedcontext, class, long, methodlocation, array]
+        invokeStatic(
+                insnList,
+                DEBUGGER_CONTEXT_TYPE,
+                "evalContext",
+                VOID_TYPE,
+                CAPTURED_CONTEXT_TYPE,
+                CLASS_TYPE,
+                LONG_TYPE,
+                METHOD_LOCATION_TYPE,
+                INT_ARRAY_TYPE);
+        // stack []
+    }
+
+    private void instrumentMethodEnter() {
+        InsnList insnList = new InsnList();
+        entryContextVar = declareContextVar(insnList);
+        exitContextVar = declareContextVar(insnList);
+        timestampStartVar = declareTimestampVar(insnList);
+        if (methodNode.tryCatchBlocks.size() > 0) {
+            throwableListVar = declareThrowableList(insnList);
+        }
+        hoistedLocalVars = initAndHoistLocalVars(methodNode);
+        insnList.add(contextInitLabel);
+        if (definition instanceof SpanDecorationProbe && definition.getEvaluateAt() == MethodLocation.EXIT) {
+            // if evaluation is at exit for a span decoration probe, skip collecting data at enter
+            methodNode.instructions.insert(methodEnterLabel, insnList);
+            return;
         }
         addIsReadyToCaptureCall(insnList);
-        // stack [boolean]
         LabelNode targetNode = new LabelNode();
+        LabelNode gotoNode = new LabelNode();
         insnList.add(new JumpInsnNode(Opcodes.IFEQ, targetNode));
-        LabelNode inProbeStartLabel = new LabelNode();
-        insnList.add(inProbeStartLabel);
+        if (captureEntry) {
+            LabelNode inProbeStartLabel = new LabelNode();
+            insnList.add(inProbeStartLabel);
+            // stack []
+            addEvalContextCall(insnList, Snapshot.Kind.ENTER, null, -1, "ENTRY");
+            // stack []
+            invokeStatic(insnList, DEBUGGER_CONTEXT_TYPE, "disableInProbe", VOID_TYPE);
+            LabelNode inProbeEndLabel = new LabelNode();
+            insnList.add(inProbeEndLabel);
+            createInProbeFinallyHandler(inProbeStartLabel, inProbeEndLabel);
+        } else {
+            invokeStatic(insnList, DEBUGGER_CONTEXT_TYPE, "disableInProbe", VOID_TYPE);
+        }
         // stack []
-        addEvalContextAndCommitCall(sourceLine, insnList, beforeLabel);
+        insnList.add(new JumpInsnNode(Opcodes.GOTO, gotoNode));
+        insnList.add(targetNode);
+        getStatic(insnList, CAPTURED_CONTEXT_TYPE, "EMPTY_CONTEXT");
+        // stack [capturedcontext]
+        insnList.add(new VarInsnNode(Opcodes.ASTORE, entryContextVar));
         // stack []
-        invokeStatic(insnList, DEBUGGER_CONTEXT_TYPE, "disableInProbe", VOID_TYPE);
-        LabelNode inProbeEndLabel = new LabelNode();
-        insnList.add(inProbeEndLabel);
-        createInProbeFinallyHandler(inProbeStartLabel, inProbeEndLabel);
+        insnList.add(gotoNode);
+        methodNode.instructions.insert(methodEnterLabel, insnList);
+    }
+
+    protected void addIsReadyToCaptureCall(InsnList insnList) {
+        ldc(insnList, Type.getObjectType(classNode.name));
+        // stack [class]
+        pushProbeIndices(insnList);
+        // stack [class, array]
+        invokeStatic(
+                insnList, DEBUGGER_CONTEXT_TYPE, "isReadyToCapture", Type.BOOLEAN_TYPE, CLASS_TYPE, INT_ARRAY_TYPE);
+        // stack [boolean]
+    }
+
+    // Initialize and hoist local variables to the top of the method
+    // if there is name/slot conflict, do nothing for the conflicting local variable
+    protected Collection<LocalVariableNode> initAndHoistLocalVars(MethodNode methodNode) {
+        int hoistingLevel = Config.get().getDynamicInstrumentationLocalVarHoistingLevel();
+        if (hoistingLevel == 0 || language != JvmLanguage.JAVA) {
+            // for now, only hoist local vars for Java
+            return Collections.emptyList();
+        }
+        if (methodNode.localVariables == null || methodNode.localVariables.isEmpty()) {
+            return Collections.emptyList();
+        }
+        LOGGER.debug("Hoisting local variables level={} for method: {}", hoistingLevel, methodNode.name);
+        return LocalVarHoisting.processMethod(methodNode, hoistingLevel);
+    }
+
+    private void createInProbeFinallyHandler(LabelNode inProbeStartLabel, LabelNode inProbeEndLabel) {
+        LabelNode handlerLabel = new LabelNode();
+        InsnList handler = new InsnList();
+        handler.add(handlerLabel);
+        // stack [exception]
+        invokeStatic(handler, DEBUGGER_CONTEXT_TYPE, "disableInProbe", VOID_TYPE);
+        // stack [exception]
+        handler.add(new InsnNode(Opcodes.ATHROW));
+        methodNode.instructions.add(handler);
+        finallyBlocks.add(new FinallyBlock(inProbeStartLabel, inProbeEndLabel, handlerLabel));
+    }
+
+    private void pushProbeIndices(InsnList insnList) {
+        ldc(insnList, probeIndices.size()); // array size
+        // stack [int]
+        insnList.add(new IntInsnNode(Opcodes.NEWARRAY, Opcodes.T_INT));
+        // stack [array]
+        for (int i = 0; i < probeIndices.size(); i++) {
+            insnList.add(new InsnNode(Opcodes.DUP));
+            // stack [array, array]
+            ldc(insnList, i); // index
+            // stack [array, array, int]
+            ldc(insnList, probeIndices.get(i).intValue());
+            // stack [array, array, int, int]
+            insnList.add(new InsnNode(Opcodes.IASTORE));
+            // stack [array]
+        }
+    }
+
+    private void instrumentTryCatchHandlers() {
+        if (!captureSnapshot) {
+            // do not instrument try/catch for log probe
+            return;
+        }
+        for (TryCatchBlockNode tryCatchBlockNode : methodNode.tryCatchBlocks) {
+            // stack [throwable]
+            InsnList insnList = new InsnList();
+            insnList.add(new InsnNode(Opcodes.DUP));
+            // stack [throwable, throwable]
+            newInstance(insnList, CAPTURE_THROWABLE_TYPE);
+            // stack [throwable, throwable, capturedthrowable]
+            insnList.add(new InsnNode(Opcodes.DUP_X1));
+            // stack [throwable, capturedthrowable, throwable, capturedthrowable]
+            insnList.add(new InsnNode(Opcodes.SWAP));
+            // stack [throwable, capturedthrowable, capturedthrowable, throwable]
+            invokeConstructor(insnList, CAPTURE_THROWABLE_TYPE, THROWABLE_TYPE);
+            // stack [throwable, capturedthrowable]
+            addToThrowableList(insnList);
+            // stack [throwable]
+            methodNode.instructions.insert(tryCatchBlockNode.handler, insnList);
+        }
+    }
+
+    private void addToThrowableList(InsnList insnList) {
+        // stack [capturedthrowable]
+        insnList.add(new VarInsnNode(Opcodes.ALOAD, throwableListVar));
+        // stack [capturedthrowable, list]
+        insnList.add(new InsnNode(Opcodes.DUP));
+        // stack [capturedthrowable, list, list]
+        LabelNode targetNode = new LabelNode();
+        insnList.add(new JumpInsnNode(Opcodes.IFNONNULL, targetNode));
+        insnList.add(new InsnNode(Opcodes.POP));
+        // stack [capturedthrowable]
+        newInstance(insnList, getType(ArrayList.class));
+        // stack [capturedthrowable, list]
+        insnList.add(new InsnNode(Opcodes.DUP));
+        // stack [capturedthrowable, list, list]
+        insnList.add(new InsnNode(Opcodes.DUP));
+        // stack [capturedthrowable, list, list, list]
+        invokeConstructor(insnList, getType(ArrayList.class));
+        // stack [capturedthrowable, list, list]
+        insnList.add(new VarInsnNode(Opcodes.ASTORE, throwableListVar));
+        // stack [capturedthrowable, list]
         insnList.add(targetNode);
-        methodNode.instructions.insertBefore(beforeLabel.getNext(), insnList);
-      }
-      if (afterLabel != null && !isSingleLine) {
-        InsnList insnList = collectCapturedContext(Snapshot.Kind.AFTER, afterLabel);
-        methodNode.instructions.insert(afterLabel, insnList);
-      }
-    }
-    return true;
-  }
-
-  protected void addEvalContextAndCommitCall(
-      Where.SourceLine sourceLine, InsnList insnList, LabelNode beforeLabel) {
-    insnList.add(collectCapturedContext(Snapshot.Kind.BEFORE, beforeLabel));
-    // stack [capturedcontext]
-    ldc(insnList, Type.getObjectType(classNode.name));
-    // stack [capturedcontext, class]
-    ldc(insnList, sourceLine.getFrom());
-    // stack [capturedcontext, class, int]
-    pushProbeIndices(insnList);
-    // stack [capturedcontext, class, int, array]
-    invokeStatic(
-        insnList,
-        DEBUGGER_CONTEXT_TYPE,
-        "evalContextAndCommit",
-        VOID_TYPE,
-        CAPTURED_CONTEXT_TYPE,
-        CLASS_TYPE,
-        INT_TYPE,
-        INT_ARRAY_TYPE);
-    // stack []
-  }
-
-  private int addExceptionLocal(TryCatchBlockNode catchHandler, MethodNode methodNode) {
-    AbstractInsnNode current = catchHandler.handler;
-    while (current != null
-        && (current.getType() == AbstractInsnNode.LABEL
-            || current.getType() == AbstractInsnNode.LINE)) {
-      current = current.getNext();
-    }
-    if (current == null) {
-      reportWarning("Cannot add exception local variable to catch block - no instructions.");
-      return -1;
-    }
-    if (current.getOpcode() != Opcodes.ASTORE) {
-      reportWarning("Cannot add exception local variable to catch block - no store instruction.");
-      return -1;
-    }
-    int exceptionLocalIdx = ((VarInsnNode) current).var;
-    Set<String> localNames =
-        methodNode.localVariables.stream()
-            .map(localVariableNode -> localVariableNode.name)
-            .collect(Collectors.toSet());
-    // find next label assume this is the end of the handler
-    while (current != null && current.getType() != AbstractInsnNode.LABEL) {
-      current = current.getNext();
-    }
-    if (current == null) {
-      reportWarning("Cannot add exception local variable to catch block - no end of handler.");
-      return -1;
-    }
-    LabelNode end = (LabelNode) current;
-    for (int i = 0; i < 100; i++) {
-      String exceptionLocalName = "ex" + i;
-      if (!localNames.contains(exceptionLocalName)) {
-        methodNode.localVariables.add(
-            new LocalVariableNode(
-                exceptionLocalName,
-                "L" + catchHandler.type + ";",
-                null,
-                catchHandler.handler,
-                end,
-                exceptionLocalIdx));
-        return exceptionLocalIdx;
-      }
-    }
-    return -1;
-  }
-
-  private TryCatchBlockNode findCatchHandler(LabelNode targetLine) {
-    for (TryCatchBlockNode tryCatchBlockNode : methodNode.tryCatchBlocks) {
-      if (tryCatchBlockNode.handler == targetLine) {
-        return tryCatchBlockNode;
-      }
-    }
-    return null;
-  }
-
-  private boolean isExceptionLocalDeclared(TryCatchBlockNode catchHandler, MethodNode methodNode) {
-    if (methodNode.localVariables == null || methodNode.localVariables.isEmpty()) {
-      return false;
-    }
-    String catchDesc =
-        catchHandler.type != null ? "L" + catchHandler.type + ";" : "Ljava/lang/Throwable;";
-    for (LocalVariableNode local : methodNode.localVariables) {
-      if (catchDesc.equals(local.desc)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  @Override
-  protected InsnList getBeforeReturnInsnList(
-      AbstractInsnNode node, Map<AbstractInsnNode, Frame<BasicValue>> frames) {
-    InsnList insnList = new InsnList();
-    // stack [ret_value]
-    insnList.add(new VarInsnNode(Opcodes.ALOAD, entryContextVar));
-    // stack [ret_value, capturedcontext]
-    LabelNode targetNode = new LabelNode();
-    LabelNode gotoNode = new LabelNode();
-    invokeVirtual(insnList, CAPTURED_CONTEXT_TYPE, "isCapturing", BOOLEAN_TYPE);
-    // stack [ret_value, boolean]
-    insnList.add(new JumpInsnNode(Opcodes.IFEQ, targetNode));
-    // stack [ret_value]
-    addEvalContextCall(insnList, Snapshot.Kind.RETURN, node, timestampStartVar, "EXIT");
-    // stack [ret_value]
-    invokeStatic(insnList, DEBUGGER_CONTEXT_TYPE, "disableInProbe", VOID_TYPE);
-    insnList.add(new JumpInsnNode(Opcodes.GOTO, gotoNode));
-    insnList.add(targetNode);
-    getStatic(insnList, CAPTURED_CONTEXT_TYPE, "EMPTY_CONTEXT");
-    // stack [ret_value, capturedcontext]
-    insnList.add(new VarInsnNode(Opcodes.ASTORE, exitContextVar));
-    // stack [ret_value]
-    insnList.add(gotoNode);
-    return insnList;
-  }
-
-  @Override
-  protected InsnList getReturnHandlerInsnList() {
-    return commit();
-  }
-
-  private InsnList commit() {
-    InsnList insnList = new InsnList();
-    // stack []
-    if (entryContextVar != -1) {
-      getContext(insnList, entryContextVar);
-    } else {
-      getStatic(insnList, CAPTURED_CONTEXT_TYPE, "EMPTY_CAPTURING_CONTEXT");
-    }
-    // stack [capturedcontext]
-    getContext(insnList, exitContextVar);
-    // stack [capturedcontext, capturedcontext]
-    if (throwableListVar != -1) {
-      insnList.add(new VarInsnNode(Opcodes.ALOAD, throwableListVar));
-    } else {
-      insnList.add(new InsnNode(Opcodes.ACONST_NULL));
-    }
-    // stack [capturedcontext, capturedcontext, list]
-    addCommitCall(insnList);
-    // stack []
-    return insnList;
-  }
-
-  protected void addCommitCall(InsnList insnList) {
-    // stack [capturedcontext, capturedcontext, list]
-    pushProbeIndices(insnList);
-    // stack [capturedcontext, capturedcontext, list, array]
-    invokeStatic(
-        insnList,
-        DEBUGGER_CONTEXT_TYPE,
-        "commit",
-        VOID_TYPE,
-        CAPTURED_CONTEXT_TYPE,
-        CAPTURED_CONTEXT_TYPE,
-        getType(List.class),
-        INT_ARRAY_TYPE);
-    // stack []
-  }
-
-  protected void addFinallyHandler(LabelNode startLabel, LabelNode endLabel) {
-    // stack: [exception]
-    if (methodNode.tryCatchBlocks == null) {
-      methodNode.tryCatchBlocks = new ArrayList<>();
-    }
-    LabelNode handlerLabel = new LabelNode();
-    InsnList handler = new InsnList();
-    handler.add(handlerLabel);
-    // stack [exception]
-    LabelNode targetNode = null;
-    if (entryContextVar != -1) {
-      handler.add(new VarInsnNode(Opcodes.ALOAD, entryContextVar));
-      // stack [exception, capturedcontext]
-      targetNode = new LabelNode();
-      invokeVirtual(handler, CAPTURED_CONTEXT_TYPE, "isCapturing", BOOLEAN_TYPE);
-      // stack [exception, boolean]
-      handler.add(new JumpInsnNode(Opcodes.IFEQ, targetNode));
-    }
-    if (exitContextVar == -1) {
-      exitContextVar = newVar(CAPTURED_CONTEXT_TYPE);
-    }
-    // stack [exception]
-    addEvalContextCall(
-        handler, Snapshot.Kind.UNHANDLED_EXCEPTION, endLabel, timestampStartVar, "EXIT");
-    // stack [exception]
-    invokeStatic(handler, DEBUGGER_CONTEXT_TYPE, "disableInProbe", VOID_TYPE);
-    // stack [exception]
-    handler.add(commit());
-    if (targetNode != null) {
-      handler.add(targetNode);
-    }
-    // stack [exception]
-    handler.add(new InsnNode(Opcodes.ATHROW));
-    // stack: []
-    methodNode.instructions.add(handler);
-    finallyBlocks.add(new FinallyBlock(startLabel, endLabel, handlerLabel));
-  }
-
-  protected void addEvalContextCall(
-      InsnList insnList,
-      Snapshot.Kind snapshotKind,
-      AbstractInsnNode endLabel,
-      int timestampVar,
-      String methodLocation) {
-    // stack []
-    insnList.add(collectCapturedContext(snapshotKind, endLabel));
-    // stack: [capturedcontext]
-    ldc(insnList, Type.getObjectType(classNode.name));
-    // stack [capturedcontext, class]
-    if (timestampVar != -1) {
-      insnList.add(new VarInsnNode(Opcodes.LLOAD, timestampVar));
-    } else {
-      ldc(insnList, -1L);
-    }
-    // stack [capturedcontext, class, long]
-    getStatic(insnList, METHOD_LOCATION_TYPE, methodLocation);
-    // stack [capturedcontext, class, long, methodlocation]
-    pushProbeIndices(insnList);
-    // stack [capturedcontext, class, long, methodlocation, array]
-    invokeStatic(
-        insnList,
-        DEBUGGER_CONTEXT_TYPE,
-        "evalContext",
-        VOID_TYPE,
-        CAPTURED_CONTEXT_TYPE,
-        CLASS_TYPE,
-        LONG_TYPE,
-        METHOD_LOCATION_TYPE,
-        INT_ARRAY_TYPE);
-    // stack []
-  }
-
-  private void instrumentMethodEnter() {
-    InsnList insnList = new InsnList();
-    entryContextVar = declareContextVar(insnList);
-    exitContextVar = declareContextVar(insnList);
-    timestampStartVar = declareTimestampVar(insnList);
-    if (methodNode.tryCatchBlocks.size() > 0) {
-      throwableListVar = declareThrowableList(insnList);
-    }
-    hoistedLocalVars = initAndHoistLocalVars(methodNode);
-    insnList.add(contextInitLabel);
-    if (definition instanceof SpanDecorationProbe
-        && definition.getEvaluateAt() == MethodLocation.EXIT) {
-      // if evaluation is at exit for a span decoration probe, skip collecting data at enter
-      methodNode.instructions.insert(methodEnterLabel, insnList);
-      return;
-    }
-    addIsReadyToCaptureCall(insnList);
-    LabelNode targetNode = new LabelNode();
-    LabelNode gotoNode = new LabelNode();
-    insnList.add(new JumpInsnNode(Opcodes.IFEQ, targetNode));
-    if (captureEntry) {
-      LabelNode inProbeStartLabel = new LabelNode();
-      insnList.add(inProbeStartLabel);
-      // stack []
-      addEvalContextCall(insnList, Snapshot.Kind.ENTER, null, -1, "ENTRY");
-      // stack []
-      invokeStatic(insnList, DEBUGGER_CONTEXT_TYPE, "disableInProbe", VOID_TYPE);
-      LabelNode inProbeEndLabel = new LabelNode();
-      insnList.add(inProbeEndLabel);
-      createInProbeFinallyHandler(inProbeStartLabel, inProbeEndLabel);
-    } else {
-      invokeStatic(insnList, DEBUGGER_CONTEXT_TYPE, "disableInProbe", VOID_TYPE);
-    }
-    // stack []
-    insnList.add(new JumpInsnNode(Opcodes.GOTO, gotoNode));
-    insnList.add(targetNode);
-    getStatic(insnList, CAPTURED_CONTEXT_TYPE, "EMPTY_CONTEXT");
-    // stack [capturedcontext]
-    insnList.add(new VarInsnNode(Opcodes.ASTORE, entryContextVar));
-    // stack []
-    insnList.add(gotoNode);
-    methodNode.instructions.insert(methodEnterLabel, insnList);
-  }
-
-  protected void addIsReadyToCaptureCall(InsnList insnList) {
-    ldc(insnList, Type.getObjectType(classNode.name));
-    // stack [class]
-    pushProbeIndices(insnList);
-    // stack [class, array]
-    invokeStatic(
-        insnList,
-        DEBUGGER_CONTEXT_TYPE,
-        "isReadyToCapture",
-        Type.BOOLEAN_TYPE,
-        CLASS_TYPE,
-        INT_ARRAY_TYPE);
-    // stack [boolean]
-  }
-
-  // Initialize and hoist local variables to the top of the method
-  // if there is name/slot conflict, do nothing for the conflicting local variable
-  protected Collection<LocalVariableNode> initAndHoistLocalVars(MethodNode methodNode) {
-    int hoistingLevel = Config.get().getDynamicInstrumentationLocalVarHoistingLevel();
-    if (hoistingLevel == 0 || language != JvmLanguage.JAVA) {
-      // for now, only hoist local vars for Java
-      return Collections.emptyList();
-    }
-    if (methodNode.localVariables == null || methodNode.localVariables.isEmpty()) {
-      return Collections.emptyList();
-    }
-    LOGGER.debug(
-        "Hoisting local variables level={} for method: {}", hoistingLevel, methodNode.name);
-    return LocalVarHoisting.processMethod(methodNode, hoistingLevel);
-  }
-
-  private void createInProbeFinallyHandler(LabelNode inProbeStartLabel, LabelNode inProbeEndLabel) {
-    LabelNode handlerLabel = new LabelNode();
-    InsnList handler = new InsnList();
-    handler.add(handlerLabel);
-    // stack [exception]
-    invokeStatic(handler, DEBUGGER_CONTEXT_TYPE, "disableInProbe", VOID_TYPE);
-    // stack [exception]
-    handler.add(new InsnNode(Opcodes.ATHROW));
-    methodNode.instructions.add(handler);
-    finallyBlocks.add(new FinallyBlock(inProbeStartLabel, inProbeEndLabel, handlerLabel));
-  }
-
-  private void pushProbeIndices(InsnList insnList) {
-    ldc(insnList, probeIndices.size()); // array size
-    // stack [int]
-    insnList.add(new IntInsnNode(Opcodes.NEWARRAY, Opcodes.T_INT));
-    // stack [array]
-    for (int i = 0; i < probeIndices.size(); i++) {
-      insnList.add(new InsnNode(Opcodes.DUP));
-      // stack [array, array]
-      ldc(insnList, i); // index
-      // stack [array, array, int]
-      ldc(insnList, probeIndices.get(i).intValue());
-      // stack [array, array, int, int]
-      insnList.add(new InsnNode(Opcodes.IASTORE));
-      // stack [array]
-    }
-  }
-
-  private void instrumentTryCatchHandlers() {
-    if (!captureSnapshot) {
-      // do not instrument try/catch for log probe
-      return;
-    }
-    for (TryCatchBlockNode tryCatchBlockNode : methodNode.tryCatchBlocks) {
-      // stack [throwable]
-      InsnList insnList = new InsnList();
-      insnList.add(new InsnNode(Opcodes.DUP));
-      // stack [throwable, throwable]
-      newInstance(insnList, CAPTURE_THROWABLE_TYPE);
-      // stack [throwable, throwable, capturedthrowable]
-      insnList.add(new InsnNode(Opcodes.DUP_X1));
-      // stack [throwable, capturedthrowable, throwable, capturedthrowable]
-      insnList.add(new InsnNode(Opcodes.SWAP));
-      // stack [throwable, capturedthrowable, capturedthrowable, throwable]
-      invokeConstructor(insnList, CAPTURE_THROWABLE_TYPE, THROWABLE_TYPE);
-      // stack [throwable, capturedthrowable]
-      addToThrowableList(insnList);
-      // stack [throwable]
-      methodNode.instructions.insert(tryCatchBlockNode.handler, insnList);
-    }
-  }
-
-  private void addToThrowableList(InsnList insnList) {
-    // stack [capturedthrowable]
-    insnList.add(new VarInsnNode(Opcodes.ALOAD, throwableListVar));
-    // stack [capturedthrowable, list]
-    insnList.add(new InsnNode(Opcodes.DUP));
-    // stack [capturedthrowable, list, list]
-    LabelNode targetNode = new LabelNode();
-    insnList.add(new JumpInsnNode(Opcodes.IFNONNULL, targetNode));
-    insnList.add(new InsnNode(Opcodes.POP));
-    // stack [capturedthrowable]
-    newInstance(insnList, getType(ArrayList.class));
-    // stack [capturedthrowable, list]
-    insnList.add(new InsnNode(Opcodes.DUP));
-    // stack [capturedthrowable, list, list]
-    insnList.add(new InsnNode(Opcodes.DUP));
-    // stack [capturedthrowable, list, list, list]
-    invokeConstructor(insnList, getType(ArrayList.class));
-    // stack [capturedthrowable, list, list]
-    insnList.add(new VarInsnNode(Opcodes.ASTORE, throwableListVar));
-    // stack [capturedthrowable, list]
-    insnList.add(targetNode);
-    // stack [capturedthrowable, list]
-    insnList.add(new InsnNode(Opcodes.SWAP));
-    // stack [list, capturedthrowable]
-    invokeVirtual(insnList, getType(ArrayList.class), "add", BOOLEAN_TYPE, OBJECT_TYPE);
-    // stack [boolean]
-    insnList.add(new InsnNode(Opcodes.POP));
-    // stack []
-  }
-
-  protected InsnList collectCapturedContext(Snapshot.Kind kind, AbstractInsnNode location) {
-    InsnList insnList = new InsnList();
-    if (kind == Snapshot.Kind.ENTER) {
-      createContext(insnList, entryContextVar);
-    } else if (kind == Snapshot.Kind.RETURN) {
-      createContext(insnList, exitContextVar);
-    } else if (kind == Snapshot.Kind.BEFORE) {
-      createContext(insnList, -1);
-    } else if (kind == Snapshot.Kind.UNHANDLED_EXCEPTION) {
-      createContext(insnList, exitContextVar);
-    } else {
-      throw new IllegalArgumentException("kind not supported " + kind);
-    }
-    // stack: [capturedcontext]
-    collectArguments(insnList, kind);
-    // stack: [capturedcontext]
-    collectStaticFields(insnList);
-    // stack: [capturedcontext]
-    /*
-     * It makes no sense collecting local variables for exceptions - the ones contributing to the exception
-     * are most likely to be outside of the scope in the exception handler block and there is no way to figure
-     * out the originating location just from bytecode.
-     *
-     * However, it is very useful, in particular for Exception Debugging (Replay) to collect local variables.
-     * Thus, we are hoisting the local variable scope by initializing them at the beginning of the method
-     * with the method initLocalVars. It allows us to collect local variables at any point.
-     */
-    collectLocalVariables(location, insnList);
-    // stack: [capturedcontext]
-    if (kind == Snapshot.Kind.RETURN) {
-      collectReturnValue(location, insnList);
-      // stack: [capturedcontext]
-    } else if (kind == Snapshot.Kind.UNHANDLED_EXCEPTION) {
-      collectExceptionValue(location, insnList);
-      // stack: [capturedcontext]
-    }
-    return insnList;
-  }
-
-  private void collectArguments(InsnList insnList, Snapshot.Kind kind) {
-    // expected stack top: [capturedcontext]
-    Type[] argTypes = Type.getArgumentTypes(methodNode.desc);
-    if (argTypes.length == 0 && isStatic) {
-      // bail out if no args
-      return;
-    }
-    insnList.add(new InsnNode(Opcodes.DUP));
-    // stack: [capturedcontext, capturedcontext]
-    ldc(insnList, argTypes.length + (isStatic ? 0 : 1));
-    // stack: [capturedcontext, capturedcontext, int]
-    insnList.add(new TypeInsnNode(Opcodes.ANEWARRAY, CAPTURED_VALUE.getInternalName()));
-    // stack: [capturedcontext, capturedcontext, array]
-    if (!isStatic) {
-      captureThis(insnList);
-      // stack: [capturedcontext, capturedcontext, array]
-    }
-    int counter = isStatic ? 0 : 1;
-    int slot = isStatic ? 0 : 1;
-    for (Type argType : argTypes) {
-      String currentArgName = null;
-      if (slot < localVarsBySlotArray.length) {
-        LocalVariableNode localVarNode = localVarsBySlotArray[slot];
-        currentArgName = localVarNode != null ? localVarNode.name : null;
-      }
-      if (currentArgName == null) {
-        // if argument names are not resolved correctly let's assign p+arg_index
-        currentArgName = "p" + (counter - (isStatic ? 0 : 1));
-      }
-      insnList.add(new InsnNode(Opcodes.DUP));
-      // stack: [capturedcontext, capturedcontext, array, array]
-      ldc(insnList, counter++);
-      // stack: [capturedcontext, capturedcontext, array, array, int]
-      ldc(insnList, currentArgName);
-      // stack: [capturedcontext, capturedcontext, array, array, int, string]
-      ldc(insnList, argType.getClassName());
-      // stack: [capturedcontext, capturedcontext, array, array, int, string, type_name]
-      if (Redaction.isRedactedKeyword(currentArgName)) {
-        addCapturedValueRedacted(insnList);
-      } else {
-        insnList.add(new VarInsnNode(argType.getOpcode(Opcodes.ILOAD), slot));
-        // stack: [capturedcontext, capturedcontext, array, array, int, string, type_name, arg]
-        tryBox(argType, insnList);
-        // stack: [capturedcontext, capturedcontext, array, array, int, string, type_name, object]
-        addCapturedValueOf(insnList, limits);
-      }
-      // stack: [capturedcontext, capturedcontext, array, array, int, captured_value]
-      insnList.add(new InsnNode(Opcodes.AASTORE));
-      // stack: [capturedcontext, capturedcontext, array]
-      slot += argType.getSize();
-    }
-    invokeVirtual(
-        insnList,
-        CAPTURED_CONTEXT_TYPE,
-        "addArguments",
-        Type.VOID_TYPE,
-        Types.asArray(CAPTURED_VALUE, 1));
-    // stack: [capturedcontext]
-  }
-
-  private void captureThis(InsnList insnList) {
-    insnList.add(new InsnNode(Opcodes.DUP));
-    // stack: [capturedcontext, capturedcontext, array, array]
-    ldc(insnList, 0);
-    // stack: [capturedcontext, capturedcontext, array, array, int]
-    ldc(insnList, "this");
-    // stack: [capturedcontext, capturedcontext, array, array, int, string]
-    ldc(insnList, Type.getObjectType(classNode.name).getInternalName());
-    // stack: [capturedcontext, capturedcontext, array, array, int, string, type_name]
-    insnList.add(new VarInsnNode(Opcodes.ALOAD, 0));
-    // stack: [capturedcontext, capturedcontext, array, array, int, string, type_name, this]
-    // no need to test redaction, 'this' is never redacted
-    addCapturedValueOf(insnList, limits);
-    // stack: [capturedcontext, capturedcontext, array, array, int, field_value]
-    insnList.add(new InsnNode(Opcodes.AASTORE));
-    // stack: [capturedcontext, capturedcontext, array]
-  }
-
-  private void tryBox(Type type, InsnList insnList) {
-    // expected stack top is the value to be boxed
-    if (Types.isPrimitive(type)) {
-      Type targetType = Types.getBoxingTargetType(type);
-      invokeStatic(insnList, targetType, "valueOf", targetType, type);
-    }
-  }
-
-  private void collectLocalVariables(AbstractInsnNode location, InsnList insnList) {
-    // expected stack top: [capturedcontext]
-    if (location == null) {
-      // method capture, local variables are not initialized - bail out
-      return;
-    }
-
-    if (methodNode.localVariables == null || methodNode.localVariables.isEmpty()) {
-      if (Config.get().getDynamicInstrumentationInstrumentTheWorld() == null) {
-        reportWarning("Missing local variable debug info");
-      }
-      // no local variables info - bail out
-      return;
-    }
-    Collection<LocalVariableNode> localVarNodes;
-    if (definition.isLineProbe() || hoistedLocalVars.isEmpty()) {
-      localVarNodes = methodNode.localVariables;
-    } else {
-      localVarNodes = hoistedLocalVars;
-    }
-    List<LocalVariableNode> applicableVars = new ArrayList<>();
-    boolean isLineProbe = definition.isLineProbe();
-    for (LocalVariableNode variableNode : localVarNodes) {
-      int idx = variableNode.index - localVarBaseOffset;
-      if (idx >= argOffset) {
-        // var is local not arg
-        if (isLineProbe || hoistedLocalVars.isEmpty()) {
-          if (ASMHelper.isInScope(methodNode, variableNode, location)) {
-            applicableVars.add(variableNode);
-          }
+        // stack [capturedthrowable, list]
+        insnList.add(new InsnNode(Opcodes.SWAP));
+        // stack [list, capturedthrowable]
+        invokeVirtual(insnList, getType(ArrayList.class), "add", BOOLEAN_TYPE, OBJECT_TYPE);
+        // stack [boolean]
+        insnList.add(new InsnNode(Opcodes.POP));
+        // stack []
+    }
+
+    protected InsnList collectCapturedContext(Snapshot.Kind kind, AbstractInsnNode location) {
+        InsnList insnList = new InsnList();
+        if (kind == Snapshot.Kind.ENTER) {
+            createContext(insnList, entryContextVar);
+        } else if (kind == Snapshot.Kind.RETURN) {
+            createContext(insnList, exitContextVar);
+        } else if (kind == Snapshot.Kind.BEFORE) {
+            createContext(insnList, -1);
+        } else if (kind == Snapshot.Kind.UNHANDLED_EXCEPTION) {
+            createContext(insnList, exitContextVar);
         } else {
-          applicableVars.add(variableNode);
-        }
-      }
-    }
-    if (applicableVars.isEmpty()) {
-      // no applicable local variables - bail out
-      return;
-    }
-    insnList.add(new InsnNode(Opcodes.DUP));
-    // stack: [capturedcontext, capturedcontext]
-    ldc(insnList, applicableVars.size());
-    // stack: [capturedcontext, capturedcontext, int]
-    insnList.add(new TypeInsnNode(Opcodes.ANEWARRAY, CAPTURED_VALUE.getInternalName()));
-    // stack: [capturedcontext, capturedcontext, array]
-    int idx = 0;
-    for (LocalVariableNode variableNode : applicableVars) {
-      insnList.add(new InsnNode(Opcodes.DUP));
-      // stack: [capturedcontext, capturedcontext, array, array]
-      ldc(insnList, idx++);
-      // stack: [capturedcontext, capturedcontext, array, array, int]
-      ldc(insnList, variableNode.name);
-      // stack: [capturedcontext, capturedcontext, array, array, int, name]
-      Type varType = Type.getType(variableNode.desc);
-      ldc(insnList, Type.getType(variableNode.desc).getClassName());
-      // stack: [capturedcontext, capturedcontext, array, array, int, name, type_name]
-      if (Redaction.isRedactedKeyword(variableNode.name)) {
-        addCapturedValueRedacted(insnList);
-      } else {
-        insnList.add(new VarInsnNode(varType.getOpcode(Opcodes.ILOAD), variableNode.index));
-        // stack: [capturedcontext, capturedcontext, array, array, int, name, type_name, value]
-        tryBox(varType, insnList);
-        // stack: [capturedcontext, capturedcontext, array, array, int, name, type_name, object]
+            throw new IllegalArgumentException("kind not supported " + kind);
+        }
+        // stack: [capturedcontext]
+        collectArguments(insnList, kind);
+        // stack: [capturedcontext]
+        collectStaticFields(insnList);
+        // stack: [capturedcontext]
+        /*
+         * It makes no sense collecting local variables for exceptions - the ones contributing to the exception
+         * are most likely to be outside of the scope in the exception handler block and there is no way to figure
+         * out the originating location just from bytecode.
+         *
+         * However, it is very useful, in particular for Exception Debugging (Replay) to collect local variables.
+         * Thus, we are hoisting the local variable scope by initializing them at the beginning of the method
+         * with the method initLocalVars. It allows us to collect local variables at any point.
+         */
+        collectLocalVariables(location, insnList);
+        // stack: [capturedcontext]
+        if (kind == Snapshot.Kind.RETURN) {
+            collectReturnValue(location, insnList);
+            // stack: [capturedcontext]
+        } else if (kind == Snapshot.Kind.UNHANDLED_EXCEPTION) {
+            collectExceptionValue(location, insnList);
+            // stack: [capturedcontext]
+        }
+        return insnList;
+    }
+
+    private void collectArguments(InsnList insnList, Snapshot.Kind kind) {
+        // expected stack top: [capturedcontext]
+        Type[] argTypes = Type.getArgumentTypes(methodNode.desc);
+        if (argTypes.length == 0 && isStatic) {
+            // bail out if no args
+            return;
+        }
+        insnList.add(new InsnNode(Opcodes.DUP));
+        // stack: [capturedcontext, capturedcontext]
+        ldc(insnList, argTypes.length + (isStatic ? 0 : 1));
+        // stack: [capturedcontext, capturedcontext, int]
+        insnList.add(new TypeInsnNode(Opcodes.ANEWARRAY, CAPTURED_VALUE.getInternalName()));
+        // stack: [capturedcontext, capturedcontext, array]
+        if (!isStatic) {
+            captureThis(insnList);
+            // stack: [capturedcontext, capturedcontext, array]
+        }
+        int counter = isStatic ? 0 : 1;
+        int slot = isStatic ? 0 : 1;
+        for (Type argType : argTypes) {
+            String currentArgName = null;
+            if (slot < localVarsBySlotArray.length) {
+                LocalVariableNode localVarNode = localVarsBySlotArray[slot];
+                currentArgName = localVarNode != null ? localVarNode.name : null;
+            }
+            if (currentArgName == null) {
+                // if argument names are not resolved correctly let's assign p+arg_index
+                currentArgName = "p" + (counter - (isStatic ? 0 : 1));
+            }
+            insnList.add(new InsnNode(Opcodes.DUP));
+            // stack: [capturedcontext, capturedcontext, array, array]
+            ldc(insnList, counter++);
+            // stack: [capturedcontext, capturedcontext, array, array, int]
+            ldc(insnList, currentArgName);
+            // stack: [capturedcontext, capturedcontext, array, array, int, string]
+            ldc(insnList, argType.getClassName());
+            // stack: [capturedcontext, capturedcontext, array, array, int, string, type_name]
+            if (Redaction.isRedactedKeyword(currentArgName)) {
+                addCapturedValueRedacted(insnList);
+            } else {
+                insnList.add(new VarInsnNode(argType.getOpcode(Opcodes.ILOAD), slot));
+                // stack: [capturedcontext, capturedcontext, array, array, int, string, type_name, arg]
+                tryBox(argType, insnList);
+                // stack: [capturedcontext, capturedcontext, array, array, int, string, type_name, object]
+                addCapturedValueOf(insnList, limits);
+            }
+            // stack: [capturedcontext, capturedcontext, array, array, int, captured_value]
+            insnList.add(new InsnNode(Opcodes.AASTORE));
+            // stack: [capturedcontext, capturedcontext, array]
+            slot += argType.getSize();
+        }
+        invokeVirtual(
+                insnList, CAPTURED_CONTEXT_TYPE, "addArguments", Type.VOID_TYPE, Types.asArray(CAPTURED_VALUE, 1));
+        // stack: [capturedcontext]
+    }
+
+    private void captureThis(InsnList insnList) {
+        insnList.add(new InsnNode(Opcodes.DUP));
+        // stack: [capturedcontext, capturedcontext, array, array]
+        ldc(insnList, 0);
+        // stack: [capturedcontext, capturedcontext, array, array, int]
+        ldc(insnList, "this");
+        // stack: [capturedcontext, capturedcontext, array, array, int, string]
+        ldc(insnList, Type.getObjectType(classNode.name).getInternalName());
+        // stack: [capturedcontext, capturedcontext, array, array, int, string, type_name]
+        insnList.add(new VarInsnNode(Opcodes.ALOAD, 0));
+        // stack: [capturedcontext, capturedcontext, array, array, int, string, type_name, this]
+        // no need to test redaction, 'this' is never redacted
         addCapturedValueOf(insnList, limits);
-      }
-      // stack: [capturedcontext, capturedcontext, array, array, int, captured_value]
-      insnList.add(new InsnNode(Opcodes.AASTORE));
-      // stack: [capturedcontext, capturedcontext, array]
-    }
-    invokeVirtual(
-        insnList,
-        CAPTURED_CONTEXT_TYPE,
-        "addLocals",
-        Type.VOID_TYPE,
-        Types.asArray(CAPTURED_VALUE, 1));
-    // stack: [capturedcontext]
-  }
-
-  private void collectReturnValue(AbstractInsnNode location, InsnList insnList) {
-    if (location == null) {
-      // no location provided - bail out
-      return;
-    }
-    if (location.getOpcode() != Opcodes.IRETURN
-        && location.getOpcode() != Opcodes.LRETURN
-        && location.getOpcode() != Opcodes.FRETURN
-        && location.getOpcode() != Opcodes.DRETURN
-        && location.getOpcode() != Opcodes.ARETURN) {
-      // no return value - bail out
-      return;
-    }
-    // expected stack top is [ret_value, capturedcontext]
-    int captureVar = newVar(CAPTURED_CONTEXT_TYPE);
-    insnList.add(new VarInsnNode(Opcodes.ASTORE, captureVar));
-    // stack: [ret_value]
-    Type returnType = Type.getReturnType(methodNode.desc);
-    int retVar = newVar(returnType);
-    if (returnType.getSize() == 2) {
-      insnList.add(new InsnNode(Opcodes.DUP2));
-    } else {
-      insnList.add(new InsnNode(Opcodes.DUP));
-    } // stack: [ret_value, ret_value]
-    insnList.add(new VarInsnNode(returnType.getOpcode(Opcodes.ISTORE), retVar));
-    // stack: [ret_value]
-    insnList.add(new VarInsnNode(Opcodes.ALOAD, captureVar));
-    // stack: [ret_value, capturedcontext]
-    insnList.add(new InsnNode(Opcodes.DUP));
-    // stack: [ret_value,  capturedcontext, capturedcontext]
-    ldc(insnList, null);
-    // stack: [ret_value, capturedcontext, capturedcontext, null]
-    ldc(insnList, returnType.getClassName());
-    // stack: [ret_value, capturedcontext, capturedcontext, null, type_name]
-    insnList.add(new VarInsnNode(returnType.getOpcode(Opcodes.ILOAD), retVar));
-    // stack: [ret_value, capturedcontext, capturedcontext, null, type_name, ret_value]
-    tryBox(returnType, insnList);
-    // stack: [ret_value, capturedcontext, capturedcontext, null, type_name, ret_value]
-    // no name, no redaction
-    addCapturedValueOf(insnList, limits);
-    // stack: [ret_value, capturedcontext, capturedcontext, capturedvalue]
-    invokeVirtual(insnList, CAPTURED_CONTEXT_TYPE, "addReturn", Type.VOID_TYPE, CAPTURED_VALUE);
-    // stack: [ret_value, capturedcontext]
-  }
-
-  private void collectExceptionValue(AbstractInsnNode location, InsnList insnList) {
-    if (location == null) {
-      // bail out
-      return;
-    }
-    // expected stack: [throwable, capturedcontext]
-    int captureVar = newVar(CAPTURED_CONTEXT_TYPE);
-    int throwableVar = newVar(THROWABLE_TYPE);
-    insnList.add(new VarInsnNode(Opcodes.ASTORE, captureVar));
-    // stack: [throwable]
-    insnList.add(new InsnNode(Opcodes.DUP));
-    // stack: [throwable, throwable]
-    insnList.add(new VarInsnNode(Opcodes.ASTORE, throwableVar));
-    // stack: [throwable]
-    insnList.add(new VarInsnNode(Opcodes.ALOAD, captureVar));
-    // stack: [throwable, capturedcontext]
-    insnList.add(new InsnNode(Opcodes.DUP));
-    // stack: [throwable, capturedcontext, capturedcontext]
-    insnList.add(new VarInsnNode(Opcodes.ALOAD, throwableVar));
-    // stack: [throwable, capturedcontext, capturedcontext, throwable]
-    invokeVirtual(insnList, CAPTURED_CONTEXT_TYPE, "addThrowable", Type.VOID_TYPE, THROWABLE_TYPE);
-    // stack: [throwable, capturedcontext]
-  }
-
-  private void collectStaticFields(InsnList insnList) {
-    List<FieldNode> fieldsToCapture = extractStaticFields(classNode, limits);
-    if (fieldsToCapture.isEmpty()) {
-      // bail out if no fields
-      return;
-    }
-    insnList.add(new InsnNode(Opcodes.DUP));
-    // stack: [capturedcontext, capturedcontext]
-    ldc(insnList, fieldsToCapture.size());
-    // stack: [capturedcontext, capturedcontext, int]
-    insnList.add(new TypeInsnNode(Opcodes.ANEWARRAY, CAPTURED_VALUE.getInternalName()));
-    // stack: [capturedcontext, capturedcontext, array]
-    int counter = 0;
-    for (FieldNode fieldNode : fieldsToCapture) {
-      insnList.add(new InsnNode(Opcodes.DUP));
-      // stack: [capturedcontext, capturedcontext, array, array]
-      ldc(insnList, counter++);
-      // stack: [capturedcontext, capturedcontext, array, array, int]
-      if (!isAccessible(fieldNode)) {
-        ldc(insnList, Type.getObjectType(classNode.name));
-        ldc(insnList, null);
-        ldc(insnList, fieldNode.name);
-        // stack: [capturedcontext, capturedcontext, array, array, int, null, string]
-        invokeStatic(
-            insnList,
-            REFLECTIVE_FIELD_VALUE_RESOLVER_TYPE,
-            "getFieldAsCapturedValue",
-            CAPTURED_VALUE,
-            CLASS_TYPE,
-            OBJECT_TYPE,
-            STRING_TYPE);
+        // stack: [capturedcontext, capturedcontext, array, array, int, field_value]
         insnList.add(new InsnNode(Opcodes.AASTORE));
         // stack: [capturedcontext, capturedcontext, array]
-        continue;
-      }
-      ldc(insnList, fieldNode.name);
-      // stack: [capturedcontext, capturedcontext, array, array, int, string]
-      Type fieldType = Type.getType(fieldNode.desc);
-      ldc(insnList, fieldType.getClassName());
-      // stack: [capturedcontext, capturedcontext, array, array, int, string, type_name]
-      if (Redaction.isRedactedKeyword(fieldNode.name)) {
-        addCapturedValueRedacted(insnList);
-      } else {
-        insnList.add(
-            new FieldInsnNode(Opcodes.GETSTATIC, classNode.name, fieldNode.name, fieldNode.desc));
-        // stack: [capturedcontext, capturedcontext, array, array, int, string, type_name,
-        // field_value]
-        tryBox(fieldType, insnList);
-        // stack: [capturedcontext, capturedcontext, array, array, int, string, type_name, object]
+    }
+
+    private void tryBox(Type type, InsnList insnList) {
+        // expected stack top is the value to be boxed
+        if (Types.isPrimitive(type)) {
+            Type targetType = Types.getBoxingTargetType(type);
+            invokeStatic(insnList, targetType, "valueOf", targetType, type);
+        }
+    }
+
+    private void collectLocalVariables(AbstractInsnNode location, InsnList insnList) {
+        // expected stack top: [capturedcontext]
+        if (location == null) {
+            // method capture, local variables are not initialized - bail out
+            return;
+        }
+
+        if (methodNode.localVariables == null || methodNode.localVariables.isEmpty()) {
+            if (Config.get().getDynamicInstrumentationInstrumentTheWorld() == null) {
+                reportWarning("Missing local variable debug info");
+            }
+            // no local variables info - bail out
+            return;
+        }
+        Collection<LocalVariableNode> localVarNodes;
+        if (definition.isLineProbe() || hoistedLocalVars.isEmpty()) {
+            localVarNodes = methodNode.localVariables;
+        } else {
+            localVarNodes = hoistedLocalVars;
+        }
+        List<LocalVariableNode> applicableVars = new ArrayList<>();
+        boolean isLineProbe = definition.isLineProbe();
+        for (LocalVariableNode variableNode : localVarNodes) {
+            int idx = variableNode.index - localVarBaseOffset;
+            if (idx >= argOffset) {
+                // var is local not arg
+                if (isLineProbe || hoistedLocalVars.isEmpty()) {
+                    if (ASMHelper.isInScope(methodNode, variableNode, location)) {
+                        applicableVars.add(variableNode);
+                    }
+                } else {
+                    applicableVars.add(variableNode);
+                }
+            }
+        }
+        if (applicableVars.isEmpty()) {
+            // no applicable local variables - bail out
+            return;
+        }
+        insnList.add(new InsnNode(Opcodes.DUP));
+        // stack: [capturedcontext, capturedcontext]
+        ldc(insnList, applicableVars.size());
+        // stack: [capturedcontext, capturedcontext, int]
+        insnList.add(new TypeInsnNode(Opcodes.ANEWARRAY, CAPTURED_VALUE.getInternalName()));
+        // stack: [capturedcontext, capturedcontext, array]
+        int idx = 0;
+        for (LocalVariableNode variableNode : applicableVars) {
+            insnList.add(new InsnNode(Opcodes.DUP));
+            // stack: [capturedcontext, capturedcontext, array, array]
+            ldc(insnList, idx++);
+            // stack: [capturedcontext, capturedcontext, array, array, int]
+            ldc(insnList, variableNode.name);
+            // stack: [capturedcontext, capturedcontext, array, array, int, name]
+            Type varType = Type.getType(variableNode.desc);
+            ldc(insnList, Type.getType(variableNode.desc).getClassName());
+            // stack: [capturedcontext, capturedcontext, array, array, int, name, type_name]
+            if (Redaction.isRedactedKeyword(variableNode.name)) {
+                addCapturedValueRedacted(insnList);
+            } else {
+                insnList.add(new VarInsnNode(varType.getOpcode(Opcodes.ILOAD), variableNode.index));
+                // stack: [capturedcontext, capturedcontext, array, array, int, name, type_name, value]
+                tryBox(varType, insnList);
+                // stack: [capturedcontext, capturedcontext, array, array, int, name, type_name, object]
+                addCapturedValueOf(insnList, limits);
+            }
+            // stack: [capturedcontext, capturedcontext, array, array, int, captured_value]
+            insnList.add(new InsnNode(Opcodes.AASTORE));
+            // stack: [capturedcontext, capturedcontext, array]
+        }
+        invokeVirtual(insnList, CAPTURED_CONTEXT_TYPE, "addLocals", Type.VOID_TYPE, Types.asArray(CAPTURED_VALUE, 1));
+        // stack: [capturedcontext]
+    }
+
+    private void collectReturnValue(AbstractInsnNode location, InsnList insnList) {
+        if (location == null) {
+            // no location provided - bail out
+            return;
+        }
+        if (location.getOpcode() != Opcodes.IRETURN
+                && location.getOpcode() != Opcodes.LRETURN
+                && location.getOpcode() != Opcodes.FRETURN
+                && location.getOpcode() != Opcodes.DRETURN
+                && location.getOpcode() != Opcodes.ARETURN) {
+            // no return value - bail out
+            return;
+        }
+        // expected stack top is [ret_value, capturedcontext]
+        int captureVar = newVar(CAPTURED_CONTEXT_TYPE);
+        insnList.add(new VarInsnNode(Opcodes.ASTORE, captureVar));
+        // stack: [ret_value]
+        Type returnType = Type.getReturnType(methodNode.desc);
+        int retVar = newVar(returnType);
+        if (returnType.getSize() == 2) {
+            insnList.add(new InsnNode(Opcodes.DUP2));
+        } else {
+            insnList.add(new InsnNode(Opcodes.DUP));
+        } // stack: [ret_value, ret_value]
+        insnList.add(new VarInsnNode(returnType.getOpcode(Opcodes.ISTORE), retVar));
+        // stack: [ret_value]
+        insnList.add(new VarInsnNode(Opcodes.ALOAD, captureVar));
+        // stack: [ret_value, capturedcontext]
+        insnList.add(new InsnNode(Opcodes.DUP));
+        // stack: [ret_value,  capturedcontext, capturedcontext]
+        ldc(insnList, null);
+        // stack: [ret_value, capturedcontext, capturedcontext, null]
+        ldc(insnList, returnType.getClassName());
+        // stack: [ret_value, capturedcontext, capturedcontext, null, type_name]
+        insnList.add(new VarInsnNode(returnType.getOpcode(Opcodes.ILOAD), retVar));
+        // stack: [ret_value, capturedcontext, capturedcontext, null, type_name, ret_value]
+        tryBox(returnType, insnList);
+        // stack: [ret_value, capturedcontext, capturedcontext, null, type_name, ret_value]
+        // no name, no redaction
         addCapturedValueOf(insnList, limits);
-      }
-      // stack: [capturedcontext, capturedcontext, array, array, int, captured_value]
-      insnList.add(new InsnNode(Opcodes.AASTORE));
-      // stack: [capturedcontext, capturedcontext, array]
-    }
-    invokeVirtual(
-        insnList,
-        CAPTURED_CONTEXT_TYPE,
-        "addStaticFields",
-        Type.VOID_TYPE,
-        Types.asArray(CAPTURED_VALUE, 1));
-    // stack: [capturedcontext]
-  }
-
-  private static boolean isAccessible(FieldNode fieldNode) {
-    Object value = fieldNode.value;
-    if (value instanceof Field) {
-      return ((Field) value).isAccessible();
-    }
-    return true;
-  }
-
-  private static List<FieldNode> extractStaticFields(ClassNode classNode, Limits limits) {
-    int fieldCount = 0;
-    List<FieldNode> results = new ArrayList<>();
-    for (FieldNode fieldNode : classNode.fields) {
-      if (isStaticField(fieldNode) && !isFinalField(fieldNode)) {
-        results.add(fieldNode);
-        fieldCount++;
-        if (fieldCount > limits.maxFieldCount) {
-          return results;
-        }
-      }
-    }
-    // Collecting inherited static fields is problematic because it some cases can lead to
-    // LinkageError: attempted duplicate class definition
-    // as we force to load a class to get the static fields in a different order than the JVM
-    // for example, when a probe is located in method overridden in enum element
-    return results;
-  }
-
-  private int declareContextVar(InsnList insnList) {
-    int var = newVar(CAPTURED_CONTEXT_TYPE);
-    getStatic(insnList, CAPTURED_CONTEXT_TYPE, "EMPTY_CAPTURING_CONTEXT");
-    insnList.add(new VarInsnNode(Opcodes.ASTORE, var));
-    return var;
-  }
-
-  private int declareTimestampVar(InsnList insnList) {
-    int var = newVar(LONG_TYPE);
-    invokeStatic(insnList, Type.getType(System.class), "nanoTime", LONG_TYPE);
-    insnList.add(new VarInsnNode(Opcodes.LSTORE, var));
-    return var;
-  }
-
-  private int declareThrowableList(InsnList insnList) {
-    int var = newVar(getType(ArrayList.class));
-    insnList.add(new InsnNode(Opcodes.ACONST_NULL));
-    insnList.add(new VarInsnNode(Opcodes.ASTORE, var));
-    return var;
-  }
-
-  private void createContext(InsnList insnList, int contextVar) {
-    newInstance(insnList, CAPTURED_CONTEXT_TYPE);
-    // stack: [capturedcontext]
-    insnList.add(new InsnNode(Opcodes.DUP));
-    // stack: [capturedcontext, capturedcontext]
-    invokeConstructor(insnList, CAPTURED_CONTEXT_TYPE);
-    // stack: [capturedcontext]
-    if (contextVar > -1) {
-      insnList.add(new InsnNode(Opcodes.DUP));
-      // stack: [capturedcontext, capturedcontext]
-      insnList.add(new VarInsnNode(Opcodes.ASTORE, contextVar));
-      // stack: [capturedcontext]
-    }
-  }
-
-  private void getContext(InsnList insnList, int contextVar) {
-    insnList.add(new VarInsnNode(Opcodes.ALOAD, contextVar));
-  }
-
-  private void addCapturedValueOf(InsnList insnList, Limits limits) {
-    if (limits == null) {
-      ldc(insnList, Limits.DEFAULT_REFERENCE_DEPTH);
-      ldc(insnList, Limits.DEFAULT_COLLECTION_SIZE);
-      ldc(insnList, Limits.DEFAULT_LENGTH);
-      ldc(insnList, Limits.DEFAULT_FIELD_COUNT);
-    } else {
-      ldc(insnList, limits.getMaxReferenceDepth());
-      ldc(insnList, limits.getMaxCollectionSize());
-      ldc(insnList, limits.getMaxLength());
-      ldc(insnList, limits.getMaxFieldCount());
-    }
-    // expected stack: [name, type_name, value, int, int, int, int]
-    invokeStatic(
-        insnList,
-        CAPTURED_VALUE,
-        "of",
-        CAPTURED_VALUE,
-        STRING_TYPE,
-        STRING_TYPE,
-        OBJECT_TYPE,
-        INT_TYPE,
-        INT_TYPE,
-        INT_TYPE,
-        INT_TYPE);
-    // stack: [captured_value]
-  }
-
-  private void addCapturedValueRedacted(InsnList insnList) {
-    // expected stack: [name, type_name]
-    invokeStatic(insnList, CAPTURED_VALUE, "redacted", CAPTURED_VALUE, STRING_TYPE, STRING_TYPE);
-    // stack: [captured_value]
-  }
+        // stack: [ret_value, capturedcontext, capturedcontext, capturedvalue]
+        invokeVirtual(insnList, CAPTURED_CONTEXT_TYPE, "addReturn", Type.VOID_TYPE, CAPTURED_VALUE);
+        // stack: [ret_value, capturedcontext]
+    }
+
+    private void collectExceptionValue(AbstractInsnNode location, InsnList insnList) {
+        if (location == null) {
+            // bail out
+            return;
+        }
+        // expected stack: [throwable, capturedcontext]
+        int captureVar = newVar(CAPTURED_CONTEXT_TYPE);
+        int throwableVar = newVar(THROWABLE_TYPE);
+        insnList.add(new VarInsnNode(Opcodes.ASTORE, captureVar));
+        // stack: [throwable]
+        insnList.add(new InsnNode(Opcodes.DUP));
+        // stack: [throwable, throwable]
+        insnList.add(new VarInsnNode(Opcodes.ASTORE, throwableVar));
+        // stack: [throwable]
+        insnList.add(new VarInsnNode(Opcodes.ALOAD, captureVar));
+        // stack: [throwable, capturedcontext]
+        insnList.add(new InsnNode(Opcodes.DUP));
+        // stack: [throwable, capturedcontext, capturedcontext]
+        insnList.add(new VarInsnNode(Opcodes.ALOAD, throwableVar));
+        // stack: [throwable, capturedcontext, capturedcontext, throwable]
+        invokeVirtual(insnList, CAPTURED_CONTEXT_TYPE, "addThrowable", Type.VOID_TYPE, THROWABLE_TYPE);
+        // stack: [throwable, capturedcontext]
+    }
+
+    private void collectStaticFields(InsnList insnList) {
+        List<FieldNode> fieldsToCapture = extractStaticFields(classNode, limits);
+        if (fieldsToCapture.isEmpty()) {
+            // bail out if no fields
+            return;
+        }
+        insnList.add(new InsnNode(Opcodes.DUP));
+        // stack: [capturedcontext, capturedcontext]
+        ldc(insnList, fieldsToCapture.size());
+        // stack: [capturedcontext, capturedcontext, int]
+        insnList.add(new TypeInsnNode(Opcodes.ANEWARRAY, CAPTURED_VALUE.getInternalName()));
+        // stack: [capturedcontext, capturedcontext, array]
+        int counter = 0;
+        for (FieldNode fieldNode : fieldsToCapture) {
+            insnList.add(new InsnNode(Opcodes.DUP));
+            // stack: [capturedcontext, capturedcontext, array, array]
+            ldc(insnList, counter++);
+            // stack: [capturedcontext, capturedcontext, array, array, int]
+            if (!isAccessible(fieldNode)) {
+                ldc(insnList, Type.getObjectType(classNode.name));
+                ldc(insnList, null);
+                ldc(insnList, fieldNode.name);
+                // stack: [capturedcontext, capturedcontext, array, array, int, null, string]
+                invokeStatic(
+                        insnList,
+                        REFLECTIVE_FIELD_VALUE_RESOLVER_TYPE,
+                        "getFieldAsCapturedValue",
+                        CAPTURED_VALUE,
+                        CLASS_TYPE,
+                        OBJECT_TYPE,
+                        STRING_TYPE);
+                insnList.add(new InsnNode(Opcodes.AASTORE));
+                // stack: [capturedcontext, capturedcontext, array]
+                continue;
+            }
+            ldc(insnList, fieldNode.name);
+            // stack: [capturedcontext, capturedcontext, array, array, int, string]
+            Type fieldType = Type.getType(fieldNode.desc);
+            ldc(insnList, fieldType.getClassName());
+            // stack: [capturedcontext, capturedcontext, array, array, int, string, type_name]
+            if (Redaction.isRedactedKeyword(fieldNode.name)) {
+                addCapturedValueRedacted(insnList);
+            } else {
+                insnList.add(new FieldInsnNode(Opcodes.GETSTATIC, classNode.name, fieldNode.name, fieldNode.desc));
+                // stack: [capturedcontext, capturedcontext, array, array, int, string, type_name,
+                // field_value]
+                tryBox(fieldType, insnList);
+                // stack: [capturedcontext, capturedcontext, array, array, int, string, type_name, object]
+                addCapturedValueOf(insnList, limits);
+            }
+            // stack: [capturedcontext, capturedcontext, array, array, int, captured_value]
+            insnList.add(new InsnNode(Opcodes.AASTORE));
+            // stack: [capturedcontext, capturedcontext, array]
+        }
+        invokeVirtual(
+                insnList, CAPTURED_CONTEXT_TYPE, "addStaticFields", Type.VOID_TYPE, Types.asArray(CAPTURED_VALUE, 1));
+        // stack: [capturedcontext]
+    }
+
+    private static boolean isAccessible(FieldNode fieldNode) {
+        Object value = fieldNode.value;
+        if (value instanceof Field) {
+            return ((Field) value).isAccessible();
+        }
+        return true;
+    }
+
+    private static List<FieldNode> extractStaticFields(ClassNode classNode, Limits limits) {
+        int fieldCount = 0;
+        List<FieldNode> results = new ArrayList<>();
+        for (FieldNode fieldNode : classNode.fields) {
+            if (isStaticField(fieldNode) && !isFinalField(fieldNode)) {
+                results.add(fieldNode);
+                fieldCount++;
+                if (fieldCount > limits.maxFieldCount) {
+                    return results;
+                }
+            }
+        }
+        // Collecting inherited static fields is problematic because it some cases can lead to
+        // LinkageError: attempted duplicate class definition
+        // as we force to load a class to get the static fields in a different order than the JVM
+        // for example, when a probe is located in method overridden in enum element
+        return results;
+    }
+
+    private int declareContextVar(InsnList insnList) {
+        int var = newVar(CAPTURED_CONTEXT_TYPE);
+        getStatic(insnList, CAPTURED_CONTEXT_TYPE, "EMPTY_CAPTURING_CONTEXT");
+        insnList.add(new VarInsnNode(Opcodes.ASTORE, var));
+        return var;
+    }
+
+    private int declareTimestampVar(InsnList insnList) {
+        int var = newVar(LONG_TYPE);
+        invokeStatic(insnList, Type.getType(System.class), "nanoTime", LONG_TYPE);
+        insnList.add(new VarInsnNode(Opcodes.LSTORE, var));
+        return var;
+    }
+
+    private int declareThrowableList(InsnList insnList) {
+        int var = newVar(getType(ArrayList.class));
+        insnList.add(new InsnNode(Opcodes.ACONST_NULL));
+        insnList.add(new VarInsnNode(Opcodes.ASTORE, var));
+        return var;
+    }
+
+    private void createContext(InsnList insnList, int contextVar) {
+        newInstance(insnList, CAPTURED_CONTEXT_TYPE);
+        // stack: [capturedcontext]
+        insnList.add(new InsnNode(Opcodes.DUP));
+        // stack: [capturedcontext, capturedcontext]
+        invokeConstructor(insnList, CAPTURED_CONTEXT_TYPE);
+        // stack: [capturedcontext]
+        if (contextVar > -1) {
+            insnList.add(new InsnNode(Opcodes.DUP));
+            // stack: [capturedcontext, capturedcontext]
+            insnList.add(new VarInsnNode(Opcodes.ASTORE, contextVar));
+            // stack: [capturedcontext]
+        }
+    }
+
+    private void getContext(InsnList insnList, int contextVar) {
+        insnList.add(new VarInsnNode(Opcodes.ALOAD, contextVar));
+    }
+
+    private void addCapturedValueOf(InsnList insnList, Limits limits) {
+        if (limits == null) {
+            ldc(insnList, Limits.DEFAULT_REFERENCE_DEPTH);
+            ldc(insnList, Limits.DEFAULT_COLLECTION_SIZE);
+            ldc(insnList, Limits.DEFAULT_LENGTH);
+            ldc(insnList, Limits.DEFAULT_FIELD_COUNT);
+        } else {
+            ldc(insnList, limits.getMaxReferenceDepth());
+            ldc(insnList, limits.getMaxCollectionSize());
+            ldc(insnList, limits.getMaxLength());
+            ldc(insnList, limits.getMaxFieldCount());
+        }
+        // expected stack: [name, type_name, value, int, int, int, int]
+        invokeStatic(
+                insnList,
+                CAPTURED_VALUE,
+                "of",
+                CAPTURED_VALUE,
+                STRING_TYPE,
+                STRING_TYPE,
+                OBJECT_TYPE,
+                INT_TYPE,
+                INT_TYPE,
+                INT_TYPE,
+                INT_TYPE);
+        // stack: [captured_value]
+    }
+
+    private void addCapturedValueRedacted(InsnList insnList) {
+        // expected stack: [name, type_name]
+        invokeStatic(insnList, CAPTURED_VALUE, "redacted", CAPTURED_VALUE, STRING_TYPE, STRING_TYPE);
+        // stack: [captured_value]
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/CodeOriginInstrumenter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/CodeOriginInstrumenter.java
index e22397cd8ed..c6f598b3723 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/CodeOriginInstrumenter.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/CodeOriginInstrumenter.java
@@ -22,82 +22,82 @@
 import org.slf4j.LoggerFactory;
 
 public class CodeOriginInstrumenter extends Instrumenter {
-  private static final String CAPTURE;
-  private static final String MARKER;
-  private static final Logger LOGGER = LoggerFactory.getLogger(CodeOriginInstrumenter.class);
+    private static final String CAPTURE;
+    private static final String MARKER;
+    private static final Logger LOGGER = LoggerFactory.getLogger(CodeOriginInstrumenter.class);
 
-  static {
-    String className = DebuggerContext.class.getName().replace('.', '/');
-    CAPTURE = format("%s#%s", className, "captureCodeOrigin");
-    MARKER = format("%s#%s", className, "marker");
-  }
+    static {
+        String className = DebuggerContext.class.getName().replace('.', '/');
+        CAPTURE = format("%s#%s", className, "captureCodeOrigin");
+        MARKER = format("%s#%s", className, "marker");
+    }
 
-  public CodeOriginInstrumenter(
-      ProbeDefinition definition, MethodInfo methodInfo, List<Integer> probeIndices) {
-    super(definition, methodInfo, null, probeIndices);
-  }
+    public CodeOriginInstrumenter(ProbeDefinition definition, MethodInfo methodInfo, List<Integer> probeIndices) {
+        super(definition, methodInfo, null, probeIndices);
+    }
 
-  @Override
-  public Status instrument() {
-    AbstractInsnNode insertionPoint = stripSetup();
-    methodNode.instructions.insert(
-        insertionPoint != null ? insertionPoint : findInsertionPoint(), codeOriginCall());
+    @Override
+    public Status instrument() {
+        AbstractInsnNode insertionPoint = stripSetup();
+        methodNode.instructions.insert(
+                insertionPoint != null ? insertionPoint : findInsertionPoint(), codeOriginCall());
 
-    return Status.INSTALLED;
-  }
+        return Status.INSTALLED;
+    }
 
-  private static String buildDescription(AbstractInsnNode node) {
-    if (!(node instanceof MethodInsnNode)) return "";
-    MethodInsnNode method = (MethodInsnNode) node;
-    return format("%s#%s", method.owner, method.name);
-  }
+    private static String buildDescription(AbstractInsnNode node) {
+        if (!(node instanceof MethodInsnNode)) return "";
+        MethodInsnNode method = (MethodInsnNode) node;
+        return format("%s#%s", method.owner, method.name);
+    }
 
-  private InsnList codeOriginCall() {
-    InsnList insnList = new InsnList();
-    ldc(insnList, probeIndices.get(0));
-    invokeStatic(insnList, DEBUGGER_CONTEXT_TYPE, "codeOrigin", Type.VOID_TYPE, Type.INT_TYPE);
-    return insnList;
-  }
+    private InsnList codeOriginCall() {
+        InsnList insnList = new InsnList();
+        ldc(insnList, probeIndices.get(0));
+        invokeStatic(insnList, DEBUGGER_CONTEXT_TYPE, "codeOrigin", Type.VOID_TYPE, Type.INT_TYPE);
+        return insnList;
+    }
 
-  private AbstractInsnNode stripSetup() {
-    try {
-      ListIterator<AbstractInsnNode> iterator = methodNode.instructions.iterator();
-      AbstractInsnNode insertionPoint = null;
-      InsnList list = new InsnList();
-      while (iterator.hasNext()) {
-        AbstractInsnNode next = iterator.next();
-        if (buildDescription(next).equals(MARKER)) {
-          insertionPoint = next.getPrevious();
-          while (iterator.hasNext() && !buildDescription(next = iterator.next()).equals(CAPTURE)) {
-            if (next instanceof LineNumberNode || next instanceof LabelNode) {
-              list.add(next);
-            }
-          }
+    private AbstractInsnNode stripSetup() {
+        try {
+            ListIterator<AbstractInsnNode> iterator = methodNode.instructions.iterator();
+            AbstractInsnNode insertionPoint = null;
+            InsnList list = new InsnList();
+            while (iterator.hasNext()) {
+                AbstractInsnNode next = iterator.next();
+                if (buildDescription(next).equals(MARKER)) {
+                    insertionPoint = next.getPrevious();
+                    while (iterator.hasNext()
+                            && !buildDescription(next = iterator.next()).equals(CAPTURE)) {
+                        if (next instanceof LineNumberNode || next instanceof LabelNode) {
+                            list.add(next);
+                        }
+                    }
 
-          if (!iterator.hasNext()) {
+                    if (!iterator.hasNext()) {
+                        return null;
+                    }
+                } else {
+                    list.add(next);
+                }
+            }
+            methodNode.instructions = list;
+            return insertionPoint;
+        } catch (Exception e) {
+            LOGGER.debug("Error in captureCodeOrigin: ", e);
             return null;
-          }
-        } else {
-          list.add(next);
         }
-      }
-      methodNode.instructions = list;
-      return insertionPoint;
-    } catch (Exception e) {
-      LOGGER.debug("Error in captureCodeOrigin: ", e);
-      return null;
     }
-  }
 
-  private AbstractInsnNode findInsertionPoint() {
-    CodeOriginProbe probe = (CodeOriginProbe) definition;
-    List<String> lines = probe.getLocation().getLines();
-    if (!probe.entrySpanProbe() && lines != null && !lines.isEmpty()) {
-      LabelNode lineLabel = classFileLines.getLineLabel(parseInt(lines.get(0)));
-      if (lineLabel != null) {
-        return lineLabel.getNext();
-      }
+    private AbstractInsnNode findInsertionPoint() {
+        CodeOriginProbe probe = (CodeOriginProbe) definition;
+        List<String> lines = probe.getLocation().getLines();
+        if (!probe.entrySpanProbe() && lines != null && !lines.isEmpty()) {
+            LabelNode lineLabel = classFileLines.getLineLabel(parseInt(lines.get(0)));
+            if (lineLabel != null) {
+                return lineLabel.getNext();
+            }
+        }
+        return methodEnterLabel;
     }
-    return methodEnterLabel;
-  }
 }
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 ec22df6b8bb..b883a771f0f 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
@@ -6,79 +6,79 @@
 
 /** Stores status information of a probe and instrumentation result */
 public final class DiagnosticMessage {
-  public enum Kind {
-    INFO,
-    WARN,
-    ERROR
-  }
+    public enum Kind {
+        INFO,
+        WARN,
+        ERROR
+    }
 
-  private final long timestamp;
-  private final Kind kind;
-  private final String message;
-  private final Throwable throwable;
+    private final long timestamp;
+    private final Kind kind;
+    private final String message;
+    private final Throwable throwable;
 
-  public DiagnosticMessage(Kind kind, String message) {
-    this(Instant.now().toEpochMilli(), kind, message, null);
-  }
+    public DiagnosticMessage(Kind kind, String message) {
+        this(Instant.now().toEpochMilli(), kind, message, null);
+    }
 
-  public DiagnosticMessage(Kind kind, Throwable throwable) {
-    this(Instant.now().toEpochMilli(), kind, null, throwable);
-  }
+    public DiagnosticMessage(Kind kind, Throwable throwable) {
+        this(Instant.now().toEpochMilli(), kind, null, throwable);
+    }
 
-  public DiagnosticMessage(long timestamp, Kind kind, String message, Throwable throwable) {
-    this.timestamp = timestamp;
-    this.kind = kind;
-    this.message = message;
-    this.throwable = throwable;
-  }
+    public DiagnosticMessage(long timestamp, Kind kind, String message, Throwable throwable) {
+        this.timestamp = timestamp;
+        this.kind = kind;
+        this.message = message;
+        this.throwable = throwable;
+    }
 
-  public Kind getKind() {
-    return kind;
-  }
+    public Kind getKind() {
+        return kind;
+    }
 
-  public String getMessage() {
-    return message;
-  }
+    public String getMessage() {
+        return message;
+    }
 
-  public long getTimestamp() {
-    return timestamp;
-  }
+    public long getTimestamp() {
+        return timestamp;
+    }
 
-  public Throwable getThrowable() {
-    return throwable;
-  }
+    public Throwable getThrowable() {
+        return throwable;
+    }
 
-  @Generated
-  @Override
-  public String toString() {
-    return "DiagnosticMessage{"
-        + "timestamp="
-        + timestamp
-        + ", kind="
-        + kind
-        + ", message='"
-        + message
-        + "', throwable='"
-        + throwable
-        + '\''
-        + '}';
-  }
+    @Generated
+    @Override
+    public String toString() {
+        return "DiagnosticMessage{"
+                + "timestamp="
+                + timestamp
+                + ", kind="
+                + kind
+                + ", message='"
+                + message
+                + "', throwable='"
+                + throwable
+                + '\''
+                + '}';
+    }
 
-  @Generated
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    DiagnosticMessage that = (DiagnosticMessage) o;
-    return timestamp == that.timestamp
-        && kind == that.kind
-        && throwable == that.throwable
-        && Objects.equals(message, that.message);
-  }
+    @Generated
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DiagnosticMessage that = (DiagnosticMessage) o;
+        return timestamp == that.timestamp
+                && kind == that.kind
+                && throwable == that.throwable
+                && Objects.equals(message, that.message);
+    }
 
-  @Generated
-  @Override
-  public int hashCode() {
-    return Objects.hash(timestamp, kind, message, throwable);
-  }
+    @Generated
+    @Override
+    public int hashCode() {
+        return Objects.hash(timestamp, kind, message, throwable);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/ExceptionInstrumenter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/ExceptionInstrumenter.java
index c0c57a7f170..957b39d157c 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/ExceptionInstrumenter.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/ExceptionInstrumenter.java
@@ -11,36 +11,34 @@
 
 public class ExceptionInstrumenter extends CapturedContextInstrumenter {
 
-  public ExceptionInstrumenter(
-      ProbeDefinition definition,
-      MethodInfo methodInfo,
-      List<DiagnosticMessage> diagnostics,
-      List<Integer> probeIndices) {
-    super(definition, methodInfo, diagnostics, probeIndices, true, false, Limits.DEFAULT);
-  }
+    public ExceptionInstrumenter(
+            ProbeDefinition definition,
+            MethodInfo methodInfo,
+            List<DiagnosticMessage> diagnostics,
+            List<Integer> probeIndices) {
+        super(definition, methodInfo, diagnostics, probeIndices, true, false, Limits.DEFAULT);
+    }
 
-  @Override
-  public InstrumentationResult.Status instrument() {
-    // hoisting is required because exception instrumentation is wrapping the whole method body in
-    // a try/catch that create a subscobe and even level method local vars are not accessible
-    // in the catch clause for capture
-    hoistedLocalVars = initAndHoistLocalVars(methodNode);
-    Map<AbstractInsnNode, Frame<BasicValue>> frames =
-        ASMHelper.computeFrames(classNode.name, methodNode);
-    processInstructions(frames); // fill returnHandlerLabel
-    addFinallyHandler(methodEnterLabel, returnHandlerLabel);
-    installFinallyBlocks();
-    return InstrumentationResult.Status.INSTALLED;
-  }
+    @Override
+    public InstrumentationResult.Status instrument() {
+        // hoisting is required because exception instrumentation is wrapping the whole method body in
+        // a try/catch that create a subscobe and even level method local vars are not accessible
+        // in the catch clause for capture
+        hoistedLocalVars = initAndHoistLocalVars(methodNode);
+        Map<AbstractInsnNode, Frame<BasicValue>> frames = ASMHelper.computeFrames(classNode.name, methodNode);
+        processInstructions(frames); // fill returnHandlerLabel
+        addFinallyHandler(methodEnterLabel, returnHandlerLabel);
+        installFinallyBlocks();
+        return InstrumentationResult.Status.INSTALLED;
+    }
 
-  @Override
-  protected InsnList getBeforeReturnInsnList(
-      AbstractInsnNode node, Map<AbstractInsnNode, Frame<BasicValue>> frames) {
-    return null;
-  }
+    @Override
+    protected InsnList getBeforeReturnInsnList(AbstractInsnNode node, Map<AbstractInsnNode, Frame<BasicValue>> frames) {
+        return null;
+    }
 
-  @Override
-  protected InsnList getReturnHandlerInsnList() {
-    return new InsnList();
-  }
+    @Override
+    protected InsnList getReturnHandlerInsnList() {
+        return new InsnList();
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/InstrumentationResult.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/InstrumentationResult.java
index 45b0161984a..a0baf1ee928 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/InstrumentationResult.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/InstrumentationResult.java
@@ -10,107 +10,106 @@
 
 /** Stores status instrumentation results */
 public class InstrumentationResult {
-  public enum Status {
-    INSTALLED,
-    BLOCKED,
-    ERROR
-  }
-
-  private final Status status;
-  private final Map<ProbeId, List<DiagnosticMessage>> diagnostics;
-  private final String sourceFileName;
-  private final String typeName;
-  private final String methodName;
-  private final int methodStart;
-  private final String signature;
-
-  public static class Factory {
-    public static InstrumentationResult blocked(String className) {
-      return new InstrumentationResult(Status.BLOCKED, className, null);
+    public enum Status {
+        INSTALLED,
+        BLOCKED,
+        ERROR
     }
 
-    public static InstrumentationResult blocked(
-        String className, List<ProbeDefinition> definitions, DiagnosticMessage... messages) {
-      Map<ProbeId, List<DiagnosticMessage>> diagnostics = new HashMap<>();
-      definitions.forEach(
-          probeDefinition ->
-              diagnostics.put(probeDefinition.getProbeId(), Arrays.asList(messages)));
-      return new InstrumentationResult(Status.BLOCKED, diagnostics, null, className, null);
+    private final Status status;
+    private final Map<ProbeId, List<DiagnosticMessage>> diagnostics;
+    private final String sourceFileName;
+    private final String typeName;
+    private final String methodName;
+    private final int methodStart;
+    private final String signature;
+
+    public static class Factory {
+        public static InstrumentationResult blocked(String className) {
+            return new InstrumentationResult(Status.BLOCKED, className, null);
+        }
+
+        public static InstrumentationResult blocked(
+                String className, List<ProbeDefinition> definitions, DiagnosticMessage... messages) {
+            Map<ProbeId, List<DiagnosticMessage>> diagnostics = new HashMap<>();
+            definitions.forEach(
+                    probeDefinition -> diagnostics.put(probeDefinition.getProbeId(), Arrays.asList(messages)));
+            return new InstrumentationResult(Status.BLOCKED, diagnostics, null, className, null);
+        }
+    }
+
+    public InstrumentationResult(
+            Status status, Map<ProbeId, List<DiagnosticMessage>> diagnostics, MethodInfo methodInfo) {
+        this.status = status;
+        this.diagnostics = diagnostics;
+        this.sourceFileName = methodInfo.getSourceFileName();
+        this.typeName = methodInfo.getTypeName();
+        this.methodName = methodInfo.getMethodName();
+        this.methodStart = methodInfo.getMethodStart();
+        this.signature = methodInfo.getSignature();
+    }
+
+    public InstrumentationResult(Status status, String className, String methodName) {
+        this(status, null, className, className, methodName);
+    }
+
+    public InstrumentationResult(
+            Status status,
+            Map<ProbeId, List<DiagnosticMessage>> diagnostics,
+            String sourceFileName,
+            String className,
+            String methodName) {
+        this.status = status;
+        this.diagnostics = diagnostics;
+        this.sourceFileName = sourceFileName;
+        this.typeName = className;
+        this.methodName = methodName;
+        this.methodStart = -1;
+        this.signature = null;
+    }
+
+    public boolean isError() {
+        return status == Status.ERROR;
+    }
+
+    public boolean isBlocked() {
+        return status == Status.BLOCKED;
+    }
+
+    public boolean isInstalled() {
+        return status == Status.INSTALLED;
+    }
+
+    public Map<ProbeId, List<DiagnosticMessage>> getDiagnostics() {
+        return diagnostics;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public String getMethodName() {
+        return methodName;
+    }
+
+    public int getMethodStart() {
+        return methodStart;
+    }
+
+    public String getSourceFileName() {
+        return sourceFileName;
+    }
+
+    public String getMethodSignature() {
+        return signature;
+    }
+
+    @Generated
+    @Override
+    public String toString() {
+        return String.format(
+                "InstrumentationResult{typeName='%s', methodName='%s', methodStart=%d, signature='%s',"
+                        + " sourceFileName='%s', status=%s. diagnostics=%s}",
+                typeName, methodName, methodStart, signature, sourceFileName, status, diagnostics);
     }
-  }
-
-  public InstrumentationResult(
-      Status status, Map<ProbeId, List<DiagnosticMessage>> diagnostics, MethodInfo methodInfo) {
-    this.status = status;
-    this.diagnostics = diagnostics;
-    this.sourceFileName = methodInfo.getSourceFileName();
-    this.typeName = methodInfo.getTypeName();
-    this.methodName = methodInfo.getMethodName();
-    this.methodStart = methodInfo.getMethodStart();
-    this.signature = methodInfo.getSignature();
-  }
-
-  public InstrumentationResult(Status status, String className, String methodName) {
-    this(status, null, className, className, methodName);
-  }
-
-  public InstrumentationResult(
-      Status status,
-      Map<ProbeId, List<DiagnosticMessage>> diagnostics,
-      String sourceFileName,
-      String className,
-      String methodName) {
-    this.status = status;
-    this.diagnostics = diagnostics;
-    this.sourceFileName = sourceFileName;
-    this.typeName = className;
-    this.methodName = methodName;
-    this.methodStart = -1;
-    this.signature = null;
-  }
-
-  public boolean isError() {
-    return status == Status.ERROR;
-  }
-
-  public boolean isBlocked() {
-    return status == Status.BLOCKED;
-  }
-
-  public boolean isInstalled() {
-    return status == Status.INSTALLED;
-  }
-
-  public Map<ProbeId, List<DiagnosticMessage>> getDiagnostics() {
-    return diagnostics;
-  }
-
-  public String getTypeName() {
-    return typeName;
-  }
-
-  public String getMethodName() {
-    return methodName;
-  }
-
-  public int getMethodStart() {
-    return methodStart;
-  }
-
-  public String getSourceFileName() {
-    return sourceFileName;
-  }
-
-  public String getMethodSignature() {
-    return signature;
-  }
-
-  @Generated
-  @Override
-  public String toString() {
-    return String.format(
-        "InstrumentationResult{typeName='%s', methodName='%s', methodStart=%d, signature='%s',"
-            + " sourceFileName='%s', status=%s. diagnostics=%s}",
-        typeName, methodName, methodStart, signature, sourceFileName, status, diagnostics);
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/Instrumenter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/Instrumenter.java
index 52ad80d8d69..17aae886b72 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/Instrumenter.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/Instrumenter.java
@@ -33,285 +33,281 @@
 
 /** Common class for generating instrumentation */
 public abstract class Instrumenter {
-  protected static final String CONSTRUCTOR_NAME = "<init>";
-  protected static final String PROBEID_TAG_NAME = "debugger.probeid";
+    protected static final String CONSTRUCTOR_NAME = "<init>";
+    protected static final String PROBEID_TAG_NAME = "debugger.probeid";
 
-  protected final ProbeDefinition definition;
-  protected final ClassLoader classLoader;
-  protected final ClassNode classNode;
-  protected final MethodNode methodNode;
-  protected final ClassFileLines classFileLines;
-  protected final List<DiagnosticMessage> diagnostics;
-  protected final List<Integer> probeIndices;
-  protected final boolean isStatic;
-  protected final LabelNode methodEnterLabel;
-  protected int localVarBaseOffset;
-  protected int argOffset;
-  protected final LocalVariableNode[] localVarsBySlotArray;
-  protected final JvmLanguage language;
-  protected LabelNode returnHandlerLabel;
-  protected final List<CapturedContextInstrumenter.FinallyBlock> finallyBlocks = new ArrayList<>();
+    protected final ProbeDefinition definition;
+    protected final ClassLoader classLoader;
+    protected final ClassNode classNode;
+    protected final MethodNode methodNode;
+    protected final ClassFileLines classFileLines;
+    protected final List<DiagnosticMessage> diagnostics;
+    protected final List<Integer> probeIndices;
+    protected final boolean isStatic;
+    protected final LabelNode methodEnterLabel;
+    protected int localVarBaseOffset;
+    protected int argOffset;
+    protected final LocalVariableNode[] localVarsBySlotArray;
+    protected final JvmLanguage language;
+    protected LabelNode returnHandlerLabel;
+    protected final List<CapturedContextInstrumenter.FinallyBlock> finallyBlocks = new ArrayList<>();
 
-  public Instrumenter(
-      ProbeDefinition definition,
-      MethodInfo methodInfo,
-      List<DiagnosticMessage> diagnostics,
-      List<Integer> probeIndices) {
-    this.definition = definition;
-    this.classLoader = methodInfo.getClassLoader();
-    this.classNode = methodInfo.getClassNode();
-    this.methodNode = methodInfo.getMethodNode();
-    this.classFileLines = methodInfo.getClassFileLines();
-    this.diagnostics = diagnostics;
-    this.probeIndices = probeIndices;
-    isStatic = (methodNode.access & Opcodes.ACC_STATIC) != 0;
-    methodEnterLabel = insertMethodEnterLabel();
-    argOffset = isStatic ? 0 : 1;
-    Type[] argTypes = Type.getArgumentTypes(methodNode.desc);
-    for (Type t : argTypes) {
-      argOffset += t.getSize();
+    public Instrumenter(
+            ProbeDefinition definition,
+            MethodInfo methodInfo,
+            List<DiagnosticMessage> diagnostics,
+            List<Integer> probeIndices) {
+        this.definition = definition;
+        this.classLoader = methodInfo.getClassLoader();
+        this.classNode = methodInfo.getClassNode();
+        this.methodNode = methodInfo.getMethodNode();
+        this.classFileLines = methodInfo.getClassFileLines();
+        this.diagnostics = diagnostics;
+        this.probeIndices = probeIndices;
+        isStatic = (methodNode.access & Opcodes.ACC_STATIC) != 0;
+        methodEnterLabel = insertMethodEnterLabel();
+        argOffset = isStatic ? 0 : 1;
+        Type[] argTypes = Type.getArgumentTypes(methodNode.desc);
+        for (Type t : argTypes) {
+            argOffset += t.getSize();
+        }
+        localVarsBySlotArray = extractLocalVariables(argTypes);
+        this.language = JvmLanguage.of(classNode.sourceFile);
     }
-    localVarsBySlotArray = extractLocalVariables(argTypes);
-    this.language = JvmLanguage.of(classNode.sourceFile);
-  }
 
-  public abstract InstrumentationResult.Status instrument();
+    public abstract InstrumentationResult.Status instrument();
 
-  private LocalVariableNode[] extractLocalVariables(Type[] argTypes) {
-    if (methodNode.localVariables == null || methodNode.localVariables.isEmpty()) {
-      return new LocalVariableNode[0];
+    private LocalVariableNode[] extractLocalVariables(Type[] argTypes) {
+        if (methodNode.localVariables == null || methodNode.localVariables.isEmpty()) {
+            return new LocalVariableNode[0];
+        }
+        List<LocalVariableNode> sortedLocalVars = sortLocalVariables(methodNode.localVariables);
+        LocalVariableNode[] localVars = createLocalVarNodes(sortedLocalVars);
+        adjustLocalVarsBasedOnArgs(isStatic, localVars, argTypes, sortedLocalVars);
+        localVarBaseOffset = sortedLocalVars.get(0).index;
+        return localVars;
     }
-    List<LocalVariableNode> sortedLocalVars = sortLocalVariables(methodNode.localVariables);
-    LocalVariableNode[] localVars = createLocalVarNodes(sortedLocalVars);
-    adjustLocalVarsBasedOnArgs(isStatic, localVars, argTypes, sortedLocalVars);
-    localVarBaseOffset = sortedLocalVars.get(0).index;
-    return localVars;
-  }
 
-  private String[] extractArgumentNames(Type[] argTypes) {
-    String[] argumentNames = new String[argOffset];
-    if (methodNode.localVariables != null && !methodNode.localVariables.isEmpty()) {
-      localVarBaseOffset =
-          methodNode.localVariables.stream().mapToInt(v -> v.index).min().orElse(0);
-      for (LocalVariableNode localVariableNode : methodNode.localVariables) {
-        int idx = localVariableNode.index - localVarBaseOffset;
-        if (idx < argOffset) {
-          argumentNames[idx] = localVariableNode.name;
+    private String[] extractArgumentNames(Type[] argTypes) {
+        String[] argumentNames = new String[argOffset];
+        if (methodNode.localVariables != null && !methodNode.localVariables.isEmpty()) {
+            localVarBaseOffset = methodNode.localVariables.stream()
+                    .mapToInt(v -> v.index)
+                    .min()
+                    .orElse(0);
+            for (LocalVariableNode localVariableNode : methodNode.localVariables) {
+                int idx = localVariableNode.index - localVarBaseOffset;
+                if (idx < argOffset) {
+                    argumentNames[idx] = localVariableNode.name;
+                }
+            }
+        } else {
+            int slot = isStatic ? 0 : 1;
+            int index = 0;
+            for (Type t : argTypes) {
+                argumentNames[slot] = "p" + (index++);
+                slot += t.getSize();
+            }
         }
-      }
-    } else {
-      int slot = isStatic ? 0 : 1;
-      int index = 0;
-      for (Type t : argTypes) {
-        argumentNames[slot] = "p" + (index++);
-        slot += t.getSize();
-      }
+        return argumentNames;
     }
-    return argumentNames;
-  }
 
-  private LabelNode insertMethodEnterLabel() {
-    // insert a label just at the beginning of the method
-    // (but after invoke to super() or this() for constructor)
-    // used to anchor the insertion of declaration of snapshot var
-    LabelNode methodEnterLabel = new LabelNode();
-    if (methodNode.name.equals(CONSTRUCTOR_NAME)) {
-      AbstractInsnNode first = methodNode.instructions.getFirst();
-      first = findFirstInsnForConstructor(first);
-      methodNode.instructions.insert(first, methodEnterLabel);
-    } else {
-      methodNode.instructions.insert(methodEnterLabel);
+    private LabelNode insertMethodEnterLabel() {
+        // insert a label just at the beginning of the method
+        // (but after invoke to super() or this() for constructor)
+        // used to anchor the insertion of declaration of snapshot var
+        LabelNode methodEnterLabel = new LabelNode();
+        if (methodNode.name.equals(CONSTRUCTOR_NAME)) {
+            AbstractInsnNode first = methodNode.instructions.getFirst();
+            first = findFirstInsnForConstructor(first);
+            methodNode.instructions.insert(first, methodEnterLabel);
+        } else {
+            methodNode.instructions.insert(methodEnterLabel);
+        }
+        return methodEnterLabel;
     }
-    return methodEnterLabel;
-  }
 
-  private AbstractInsnNode findFirstInsnForConstructor(AbstractInsnNode first) {
-    // Skip call to super() or this() for constructors
-    AbstractInsnNode lastInvokeSpecial = first;
-    int stackCount = 0;
-    while (first != null) {
-      stackCount += ByteCodeHelper.adjustStackUsage(first);
-      if (first.getType() == AbstractInsnNode.JUMP_INSN) {
-        // always jump to a destination
-        first = ((JumpInsnNode) first).label;
-        continue;
-      }
-      if (stackCount == 0 && first.getOpcode() == Opcodes.INVOKESPECIAL) {
-        MethodInsnNode methodInsnNode = (MethodInsnNode) first;
-        if (methodInsnNode.owner.equals(classNode.superName)) { // super() case
-          return first;
-        }
-        if (methodInsnNode.owner.equals(classNode.name)
-            && (!methodInsnNode.desc.equals(methodNode.desc))) {
-          // first call to another constructor of the same class => this(...) case
-          return first;
+    private AbstractInsnNode findFirstInsnForConstructor(AbstractInsnNode first) {
+        // Skip call to super() or this() for constructors
+        AbstractInsnNode lastInvokeSpecial = first;
+        int stackCount = 0;
+        while (first != null) {
+            stackCount += ByteCodeHelper.adjustStackUsage(first);
+            if (first.getType() == AbstractInsnNode.JUMP_INSN) {
+                // always jump to a destination
+                first = ((JumpInsnNode) first).label;
+                continue;
+            }
+            if (stackCount == 0 && first.getOpcode() == Opcodes.INVOKESPECIAL) {
+                MethodInsnNode methodInsnNode = (MethodInsnNode) first;
+                if (methodInsnNode.owner.equals(classNode.superName)) { // super() case
+                    return first;
+                }
+                if (methodInsnNode.owner.equals(classNode.name) && (!methodInsnNode.desc.equals(methodNode.desc))) {
+                    // first call to another constructor of the same class => this(...) case
+                    return first;
+                }
+            }
+            first = first.getNext();
         }
-      }
-      first = first.getNext();
+        return lastInvokeSpecial;
     }
-    return lastInvokeSpecial;
-  }
 
-  protected void processInstructions(Map<AbstractInsnNode, Frame<BasicValue>> frames) {
-    AbstractInsnNode node = methodNode.instructions.getFirst();
-    LabelNode sentinelNode = new LabelNode();
-    methodNode.instructions.add(sentinelNode);
-    while (node != null && !node.equals(sentinelNode)) {
-      if (node.getType() != AbstractInsnNode.LINE) {
-        node = processInstruction(node, frames);
-      }
-      node = node.getNext();
-    }
-    methodNode.instructions.remove(sentinelNode);
-    if (returnHandlerLabel == null) {
-      // if no return found, fallback to use the last instruction as last resort
-      returnHandlerLabel = new LabelNode();
-      methodNode.instructions.insert(methodNode.instructions.getLast(), returnHandlerLabel);
+    protected void processInstructions(Map<AbstractInsnNode, Frame<BasicValue>> frames) {
+        AbstractInsnNode node = methodNode.instructions.getFirst();
+        LabelNode sentinelNode = new LabelNode();
+        methodNode.instructions.add(sentinelNode);
+        while (node != null && !node.equals(sentinelNode)) {
+            if (node.getType() != AbstractInsnNode.LINE) {
+                node = processInstruction(node, frames);
+            }
+            node = node.getNext();
+        }
+        methodNode.instructions.remove(sentinelNode);
+        if (returnHandlerLabel == null) {
+            // if no return found, fallback to use the last instruction as last resort
+            returnHandlerLabel = new LabelNode();
+            methodNode.instructions.insert(methodNode.instructions.getLast(), returnHandlerLabel);
+        }
     }
-  }
 
-  // returns the extra values sitting *below* `valuesToKeep` values already
-  // accounted for at the top of the stack (e.g. the return value), as POP/POP2 insns
-  protected InsnList stackCleanupInsnList(
-      AbstractInsnNode node, int valuesToKeep, Map<AbstractInsnNode, Frame<BasicValue>> frames) {
-    InsnList result = new InsnList();
-    Frame<BasicValue> frame = frames.get(node);
-    if (frame == null) {
-      return result;
-    }
-    for (int i = frame.getStackSize() - valuesToKeep - 1; i >= 0; i--) {
-      BasicValue value = frame.getStack(i);
-      result.add(new InsnNode(value.getSize() == 2 ? Opcodes.POP2 : Opcodes.POP));
+    // returns the extra values sitting *below* `valuesToKeep` values already
+    // accounted for at the top of the stack (e.g. the return value), as POP/POP2 insns
+    protected InsnList stackCleanupInsnList(
+            AbstractInsnNode node, int valuesToKeep, Map<AbstractInsnNode, Frame<BasicValue>> frames) {
+        InsnList result = new InsnList();
+        Frame<BasicValue> frame = frames.get(node);
+        if (frame == null) {
+            return result;
+        }
+        for (int i = frame.getStackSize() - valuesToKeep - 1; i >= 0; i--) {
+            BasicValue value = frame.getStack(i);
+            result.add(new InsnNode(value.getSize() == 2 ? Opcodes.POP2 : Opcodes.POP));
+        }
+        return result;
     }
-    return result;
-  }
 
-  protected AbstractInsnNode processInstruction(
-      AbstractInsnNode node, Map<AbstractInsnNode, Frame<BasicValue>> frames) {
-    switch (node.getOpcode()) {
-      case Opcodes.RET:
-      case Opcodes.RETURN:
-      case Opcodes.IRETURN:
-      case Opcodes.FRETURN:
-      case Opcodes.LRETURN:
-      case Opcodes.DRETURN:
-      case Opcodes.ARETURN:
-        {
-          // stack [ret_value]
-          InsnList beforeReturnInsnList = getBeforeReturnInsnList(node, frames);
-          if (beforeReturnInsnList != null) {
-            methodNode.instructions.insertBefore(node, beforeReturnInsnList);
-          }
-          AbstractInsnNode prev = node.getPrevious();
-          methodNode.instructions.remove(node);
-          methodNode.instructions.insert(
-              prev, new JumpInsnNode(Opcodes.GOTO, getReturnHandler(node)));
-          return prev;
+    protected AbstractInsnNode processInstruction(
+            AbstractInsnNode node, Map<AbstractInsnNode, Frame<BasicValue>> frames) {
+        switch (node.getOpcode()) {
+            case Opcodes.RET:
+            case Opcodes.RETURN:
+            case Opcodes.IRETURN:
+            case Opcodes.FRETURN:
+            case Opcodes.LRETURN:
+            case Opcodes.DRETURN:
+            case Opcodes.ARETURN: {
+                // stack [ret_value]
+                InsnList beforeReturnInsnList = getBeforeReturnInsnList(node, frames);
+                if (beforeReturnInsnList != null) {
+                    methodNode.instructions.insertBefore(node, beforeReturnInsnList);
+                }
+                AbstractInsnNode prev = node.getPrevious();
+                methodNode.instructions.remove(node);
+                methodNode.instructions.insert(prev, new JumpInsnNode(Opcodes.GOTO, getReturnHandler(node)));
+                return prev;
+            }
         }
+        return node;
     }
-    return node;
-  }
 
-  protected InsnList getBeforeReturnInsnList(
-      AbstractInsnNode node, Map<AbstractInsnNode, Frame<BasicValue>> frames) {
-    return null;
-  }
-
-  protected LabelNode getReturnHandler(AbstractInsnNode exitNode) {
-    // exit node must have been removed from the original instruction list
-    if (exitNode.getNext() != null || exitNode.getPrevious() != null) {
-      throw new IllegalArgumentException("exitNode is not removed from original instruction list");
+    protected InsnList getBeforeReturnInsnList(AbstractInsnNode node, Map<AbstractInsnNode, Frame<BasicValue>> frames) {
+        return null;
     }
-    // Create the returnHandlerLabel every time because the stack state could be different
-    // for each return (suspend method in Kotlin)
-    returnHandlerLabel = new LabelNode();
-    methodNode.instructions.add(returnHandlerLabel);
-    // stack top is return value (if any)
-    InsnList handler = getReturnHandlerInsnList();
-    handler.add(exitNode); // stack: []
-    methodNode.instructions.add(handler);
-    return returnHandlerLabel;
-  }
-
-  protected InsnList getReturnHandlerInsnList() {
-    return new InsnList();
-  }
 
-  protected void pushTags(InsnList insnList, ProbeDefinition.Tag[] tags) {
-    if (tags == null || tags.length == 0) {
-      insnList.add(new InsnNode(Opcodes.ACONST_NULL));
-      return;
+    protected LabelNode getReturnHandler(AbstractInsnNode exitNode) {
+        // exit node must have been removed from the original instruction list
+        if (exitNode.getNext() != null || exitNode.getPrevious() != null) {
+            throw new IllegalArgumentException("exitNode is not removed from original instruction list");
+        }
+        // Create the returnHandlerLabel every time because the stack state could be different
+        // for each return (suspend method in Kotlin)
+        returnHandlerLabel = new LabelNode();
+        methodNode.instructions.add(returnHandlerLabel);
+        // stack top is return value (if any)
+        InsnList handler = getReturnHandlerInsnList();
+        handler.add(exitNode); // stack: []
+        methodNode.instructions.add(handler);
+        return returnHandlerLabel;
     }
-    ldc(insnList, tags.length); // stack: [int]
-    insnList.add(
-        new TypeInsnNode(Opcodes.ANEWARRAY, STRING_TYPE.getInternalName())); // stack: [array]
-    int counter = 0;
-    for (ProbeDefinition.Tag tag : tags) {
-      insnList.add(new InsnNode(Opcodes.DUP)); // stack: [array, array]
-      ldc(insnList, counter++); // stack: [array, array, int]
-      ldc(insnList, tag.toString()); // stack: [array, array, int, string]
-      insnList.add(new InsnNode(Opcodes.AASTORE)); // stack: [array]
+
+    protected InsnList getReturnHandlerInsnList() {
+        return new InsnList();
     }
-  }
 
-  protected int newVar(Type type) {
-    return newVar(type.getSize());
-  }
+    protected void pushTags(InsnList insnList, ProbeDefinition.Tag[] tags) {
+        if (tags == null || tags.length == 0) {
+            insnList.add(new InsnNode(Opcodes.ACONST_NULL));
+            return;
+        }
+        ldc(insnList, tags.length); // stack: [int]
+        insnList.add(new TypeInsnNode(Opcodes.ANEWARRAY, STRING_TYPE.getInternalName())); // stack: [array]
+        int counter = 0;
+        for (ProbeDefinition.Tag tag : tags) {
+            insnList.add(new InsnNode(Opcodes.DUP)); // stack: [array, array]
+            ldc(insnList, counter++); // stack: [array, array, int]
+            ldc(insnList, tag.toString()); // stack: [array, array, int, string]
+            insnList.add(new InsnNode(Opcodes.AASTORE)); // stack: [array]
+        }
+    }
 
-  protected int newVar(int size) {
-    int varId = methodNode.maxLocals;
-    methodNode.maxLocals += size;
-    return varId;
-  }
+    protected int newVar(Type type) {
+        return newVar(type.getSize());
+    }
 
-  protected void reportError(String message) {
-    diagnostics.add(new DiagnosticMessage(Kind.ERROR, message));
-  }
+    protected int newVar(int size) {
+        int varId = methodNode.maxLocals;
+        methodNode.maxLocals += size;
+        return varId;
+    }
 
-  protected void reportWarning(String message) {
-    diagnostics.add(new DiagnosticMessage(Kind.WARN, message));
-  }
+    protected void reportError(String message) {
+        diagnostics.add(new DiagnosticMessage(Kind.ERROR, message));
+    }
 
-  protected ProbeDefinition.Tag[] addProbeIdWithTags(String probeId, ProbeDefinition.Tag[] tags) {
-    if (tags == null) {
-      return new ProbeDefinition.Tag[] {new ProbeDefinition.Tag(PROBEID_TAG_NAME, probeId)};
+    protected void reportWarning(String message) {
+        diagnostics.add(new DiagnosticMessage(Kind.WARN, message));
     }
-    ProbeDefinition.Tag[] newTags = Arrays.copyOf(tags, tags.length + 1);
-    newTags[newTags.length - 1] = new ProbeDefinition.Tag(PROBEID_TAG_NAME, probeId);
-    return newTags;
-  }
 
-  protected InsnList clone(InsnList insnList) {
-    InsnList result = new InsnList();
-    Map<LabelNode, LabelNode> labels = new HashMap<>();
-    for (AbstractInsnNode node : insnList) {
-      if (node instanceof LabelNode) {
-        labels.put((LabelNode) node, new LabelNode());
-      }
+    protected ProbeDefinition.Tag[] addProbeIdWithTags(String probeId, ProbeDefinition.Tag[] tags) {
+        if (tags == null) {
+            return new ProbeDefinition.Tag[] {new ProbeDefinition.Tag(PROBEID_TAG_NAME, probeId)};
+        }
+        ProbeDefinition.Tag[] newTags = Arrays.copyOf(tags, tags.length + 1);
+        newTags[newTags.length - 1] = new ProbeDefinition.Tag(PROBEID_TAG_NAME, probeId);
+        return newTags;
     }
-    for (AbstractInsnNode node : insnList) {
-      result.add(node.clone(labels));
+
+    protected InsnList clone(InsnList insnList) {
+        InsnList result = new InsnList();
+        Map<LabelNode, LabelNode> labels = new HashMap<>();
+        for (AbstractInsnNode node : insnList) {
+            if (node instanceof LabelNode) {
+                labels.put((LabelNode) node, new LabelNode());
+            }
+        }
+        for (AbstractInsnNode node : insnList) {
+            result.add(node.clone(labels));
+        }
+        return result;
     }
-    return result;
-  }
 
-  protected void installFinallyBlocks() {
-    for (FinallyBlock finallyBlock : finallyBlocks) {
-      methodNode.tryCatchBlocks.add(
-          new TryCatchBlockNode(
-              finallyBlock.startLabel, finallyBlock.endLabel, finallyBlock.handlerLabel, null));
+    protected void installFinallyBlocks() {
+        for (FinallyBlock finallyBlock : finallyBlocks) {
+            methodNode.tryCatchBlocks.add(new TryCatchBlockNode(
+                    finallyBlock.startLabel, finallyBlock.endLabel, finallyBlock.handlerLabel, null));
+        }
     }
-  }
 
-  protected static class FinallyBlock {
-    final LabelNode startLabel;
-    final LabelNode endLabel;
-    final LabelNode handlerLabel;
+    protected static class FinallyBlock {
+        final LabelNode startLabel;
+        final LabelNode endLabel;
+        final LabelNode handlerLabel;
 
-    public FinallyBlock(LabelNode startLabel, LabelNode endLabel, LabelNode handlerLabel) {
-      this.startLabel = startLabel;
-      this.endLabel = endLabel;
-      this.handlerLabel = handlerLabel;
+        public FinallyBlock(LabelNode startLabel, LabelNode endLabel, LabelNode handlerLabel) {
+            this.startLabel = startLabel;
+            this.endLabel = endLabel;
+            this.handlerLabel = handlerLabel;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/LocalVarHoisting.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/LocalVarHoisting.java
index d4701ad14fb..200f0ef2adc 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/LocalVarHoisting.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/LocalVarHoisting.java
@@ -20,294 +20,292 @@
 import org.slf4j.LoggerFactory;
 
 public class LocalVarHoisting {
-  private static final Logger LOGGER = LoggerFactory.getLogger(LocalVarHoisting.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LocalVarHoisting.class);
 
-  /**
-   * Hoisting strategy interface to define how local variables should be hoisted. Implementations
-   * can provide different hoisting strategies, such as safe or aggressive hoisting.
-   */
-  private interface HoistingStrategy {
-    void hoist(
-        MethodNode method,
-        LocalVariableNode varNode,
-        Set<Integer> forbiddenSlots,
-        Map<Integer, Integer> countBySlot,
-        Map<String, Integer> countByName,
-        SlotInfo slotInfo,
-        LabelNode methodEnterLabel,
-        LabelNode methodEndLabel,
-        Collection<LocalVariableNode> hoisted);
-  }
-
-  public static Collection<LocalVariableNode> processMethod(MethodNode method, int hoistingLevel) {
-    Map<Integer, SlotInfo> slots = new HashMap<>();
-    Set<Integer> forbiddenSlots = new HashSet<>();
-    scanInstructions(method.instructions, slots, forbiddenSlots);
-    Map<Integer, Integer> countBySlot = new HashMap<>();
-    Map<String, Integer> countByName = new HashMap<>();
-    scanLocalVariableTable(method.localVariables, countBySlot, countByName);
-    LabelNode methodEnterLabel = new LabelNode();
-    method.instructions.insert(methodEnterLabel);
-    LabelNode methodEndLabel = new LabelNode();
-    method.instructions.add(methodEndLabel);
-    Collection<LocalVariableNode> hoisted = new ArrayList<>();
-    HoistingStrategy hoistingStrategy = getHoistingStrategy(hoistingLevel);
-    for (LocalVariableNode varNode : method.localVariables) {
-      if (isParameter(method, varNode.index)) {
-        // Skip parameters, they are not hoistable
-        // LOGGER.debug("Variable: {} at index: {} is a parameter and cannot be hoisted.",
-        // varNode.name, varNode.index);
-        continue;
-      }
-      SlotInfo slotInfo = slots.get(varNode.index);
-      if (slotInfo == null) {
-        // If the slot is not defined, we can skip it
-        LOGGER.debug("Variable: {} at index: {} has no slot info.", varNode.name, varNode.index);
-        continue;
-      }
-      hoistingStrategy.hoist(
-          method,
-          varNode,
-          forbiddenSlots,
-          countBySlot,
-          countByName,
-          slotInfo,
-          methodEnterLabel,
-          methodEndLabel,
-          hoisted);
+    /**
+     * Hoisting strategy interface to define how local variables should be hoisted. Implementations
+     * can provide different hoisting strategies, such as safe or aggressive hoisting.
+     */
+    private interface HoistingStrategy {
+        void hoist(
+                MethodNode method,
+                LocalVariableNode varNode,
+                Set<Integer> forbiddenSlots,
+                Map<Integer, Integer> countBySlot,
+                Map<String, Integer> countByName,
+                SlotInfo slotInfo,
+                LabelNode methodEnterLabel,
+                LabelNode methodEndLabel,
+                Collection<LocalVariableNode> hoisted);
     }
-    return hoisted;
-  }
 
-  private static HoistingStrategy getHoistingStrategy(int hoistingLevel) {
-    switch (hoistingLevel) {
-      case 0:
-        // No hoisting, return a no-op strategy
-        return LocalVarHoisting::noopHoisting;
-      case 1:
-        return LocalVarHoisting::safeHoisting;
-      case 2:
-        return LocalVarHoisting::aggressiveHoisting;
-      default:
-        LOGGER.warn("Unknown hoisting level: {}", hoistingLevel);
-        return LocalVarHoisting::noopHoisting;
+    public static Collection<LocalVariableNode> processMethod(MethodNode method, int hoistingLevel) {
+        Map<Integer, SlotInfo> slots = new HashMap<>();
+        Set<Integer> forbiddenSlots = new HashSet<>();
+        scanInstructions(method.instructions, slots, forbiddenSlots);
+        Map<Integer, Integer> countBySlot = new HashMap<>();
+        Map<String, Integer> countByName = new HashMap<>();
+        scanLocalVariableTable(method.localVariables, countBySlot, countByName);
+        LabelNode methodEnterLabel = new LabelNode();
+        method.instructions.insert(methodEnterLabel);
+        LabelNode methodEndLabel = new LabelNode();
+        method.instructions.add(methodEndLabel);
+        Collection<LocalVariableNode> hoisted = new ArrayList<>();
+        HoistingStrategy hoistingStrategy = getHoistingStrategy(hoistingLevel);
+        for (LocalVariableNode varNode : method.localVariables) {
+            if (isParameter(method, varNode.index)) {
+                // Skip parameters, they are not hoistable
+                // LOGGER.debug("Variable: {} at index: {} is a parameter and cannot be hoisted.",
+                // varNode.name, varNode.index);
+                continue;
+            }
+            SlotInfo slotInfo = slots.get(varNode.index);
+            if (slotInfo == null) {
+                // If the slot is not defined, we can skip it
+                LOGGER.debug("Variable: {} at index: {} has no slot info.", varNode.name, varNode.index);
+                continue;
+            }
+            hoistingStrategy.hoist(
+                    method,
+                    varNode,
+                    forbiddenSlots,
+                    countBySlot,
+                    countByName,
+                    slotInfo,
+                    methodEnterLabel,
+                    methodEndLabel,
+                    hoisted);
+        }
+        return hoisted;
     }
-  }
-
-  private static void noopHoisting(
-      MethodNode method,
-      LocalVariableNode varNode,
-      Set<Integer> forbiddenSlots,
-      Map<Integer, Integer> countBySlot,
-      Map<String, Integer> countByName,
-      SlotInfo slotInfo,
-      LabelNode methodEnterLabel,
-      LabelNode methodEndLabel,
-      Collection<LocalVariableNode> hoisted) {}
 
-  private static void safeHoisting(
-      MethodNode method,
-      LocalVariableNode varNode,
-      Set<Integer> forbiddenSlots,
-      Map<Integer, Integer> countBySlot,
-      Map<String, Integer> countByName,
-      SlotInfo slotInfo,
-      LabelNode methodEnterLabel,
-      LabelNode methodEndLabel,
-      Collection<LocalVariableNode> hoisted) {
-    if (forbiddenSlots.contains(varNode.index)) {
-      // If the slot is forbidden, we can skip it
-      LOGGER.debug(
-          "Variable: {} at index: {} is in a forbidden slot.", varNode.name, varNode.index);
-      return;
-    }
-    int countSlot = countBySlot.get(varNode.index);
-    int countName = countByName.get(varNode.name);
-    boolean isOnlyOneType = slotInfo.isOnlyOneType();
-    boolean isSingleSlotType = slotInfo.isSingleSlotType();
-    if (countSlot == 1 && countName == 1 && isOnlyOneType && isSingleSlotType) {
-      // one local variable for this slot defined only for one type => safely hoistable
-      LOGGER.debug("Variable: {} at index: {} is safely hoistable.", varNode.name, varNode.index);
-      extendRange(varNode, methodEnterLabel, methodEndLabel);
-      InsnList init = new InsnList();
-      addStore0Insn(init, varNode, Type.getType(varNode.desc));
-      method.instructions.insert(methodEnterLabel, init);
-      hoisted.add(varNode);
-    } else {
-      // not safely hoistable, we can still try aggressive hoisting
-      LOGGER.debug(
-          "Variable: {} at index: {} is not safely hoistable, resons: "
-              + "countSlot={}, countName={}, isOnlyOneType={}, isSingleSlotType={}",
-          varNode.name,
-          varNode.index,
-          countSlot,
-          countName,
-          isOnlyOneType,
-          isSingleSlotType);
+    private static HoistingStrategy getHoistingStrategy(int hoistingLevel) {
+        switch (hoistingLevel) {
+            case 0:
+                // No hoisting, return a no-op strategy
+                return LocalVarHoisting::noopHoisting;
+            case 1:
+                return LocalVarHoisting::safeHoisting;
+            case 2:
+                return LocalVarHoisting::aggressiveHoisting;
+            default:
+                LOGGER.warn("Unknown hoisting level: {}", hoistingLevel);
+                return LocalVarHoisting::noopHoisting;
+        }
     }
-  }
 
-  private static void aggressiveHoisting(
-      MethodNode method,
-      LocalVariableNode varNode,
-      Set<Integer> forbiddenSlots,
-      Map<Integer, Integer> countBySlot,
-      Map<String, Integer> countByName,
-      SlotInfo slotInfo,
-      LabelNode methodEnterLabel,
-      LabelNode methodEndLabel,
-      Collection<LocalVariableNode> hoisted) {
-    throw new RuntimeException("Aggressive hoisting not implemented yet.");
-  }
+    private static void noopHoisting(
+            MethodNode method,
+            LocalVariableNode varNode,
+            Set<Integer> forbiddenSlots,
+            Map<Integer, Integer> countBySlot,
+            Map<String, Integer> countByName,
+            SlotInfo slotInfo,
+            LabelNode methodEnterLabel,
+            LabelNode methodEndLabel,
+            Collection<LocalVariableNode> hoisted) {}
 
-  private static boolean isParameter(MethodNode method, int slot) {
-    return slot < getParameterSlotCount(method);
-  }
+    private static void safeHoisting(
+            MethodNode method,
+            LocalVariableNode varNode,
+            Set<Integer> forbiddenSlots,
+            Map<Integer, Integer> countBySlot,
+            Map<String, Integer> countByName,
+            SlotInfo slotInfo,
+            LabelNode methodEnterLabel,
+            LabelNode methodEndLabel,
+            Collection<LocalVariableNode> hoisted) {
+        if (forbiddenSlots.contains(varNode.index)) {
+            // If the slot is forbidden, we can skip it
+            LOGGER.debug("Variable: {} at index: {} is in a forbidden slot.", varNode.name, varNode.index);
+            return;
+        }
+        int countSlot = countBySlot.get(varNode.index);
+        int countName = countByName.get(varNode.name);
+        boolean isOnlyOneType = slotInfo.isOnlyOneType();
+        boolean isSingleSlotType = slotInfo.isSingleSlotType();
+        if (countSlot == 1 && countName == 1 && isOnlyOneType && isSingleSlotType) {
+            // one local variable for this slot defined only for one type => safely hoistable
+            LOGGER.debug("Variable: {} at index: {} is safely hoistable.", varNode.name, varNode.index);
+            extendRange(varNode, methodEnterLabel, methodEndLabel);
+            InsnList init = new InsnList();
+            addStore0Insn(init, varNode, Type.getType(varNode.desc));
+            method.instructions.insert(methodEnterLabel, init);
+            hoisted.add(varNode);
+        } else {
+            // not safely hoistable, we can still try aggressive hoisting
+            LOGGER.debug(
+                    "Variable: {} at index: {} is not safely hoistable, resons: "
+                            + "countSlot={}, countName={}, isOnlyOneType={}, isSingleSlotType={}",
+                    varNode.name,
+                    varNode.index,
+                    countSlot,
+                    countName,
+                    isOnlyOneType,
+                    isSingleSlotType);
+        }
+    }
 
-  private static int getParameterSlotCount(MethodNode method) {
-    Type[] argTypes = Type.getArgumentTypes(method.desc);
-    int count = 0;
-    if ((method.access & Opcodes.ACC_STATIC) == 0) {
-      count = 1; // 'this' parameter
+    private static void aggressiveHoisting(
+            MethodNode method,
+            LocalVariableNode varNode,
+            Set<Integer> forbiddenSlots,
+            Map<Integer, Integer> countBySlot,
+            Map<String, Integer> countByName,
+            SlotInfo slotInfo,
+            LabelNode methodEnterLabel,
+            LabelNode methodEndLabel,
+            Collection<LocalVariableNode> hoisted) {
+        throw new RuntimeException("Aggressive hoisting not implemented yet.");
     }
-    for (Type type : argTypes) {
-      count += type.getSize();
+
+    private static boolean isParameter(MethodNode method, int slot) {
+        return slot < getParameterSlotCount(method);
     }
-    return count;
-  }
 
-  private static void addStore0Insn(
-      InsnList insnList, LocalVariableNode localVar, Type localVarType) {
-    switch (localVarType.getSort()) {
-      case Type.BOOLEAN:
-      case Type.CHAR:
-      case Type.BYTE:
-      case Type.SHORT:
-      case Type.INT:
-        insnList.add(new InsnNode(Opcodes.ICONST_0));
-        break;
-      case Type.LONG:
-        insnList.add(new InsnNode(Opcodes.LCONST_0));
-        break;
-      case Type.FLOAT:
-        insnList.add(new InsnNode(Opcodes.FCONST_0));
-        break;
-      case Type.DOUBLE:
-        insnList.add(new InsnNode(Opcodes.DCONST_0));
-        break;
-      default:
-        insnList.add(new InsnNode(Opcodes.ACONST_NULL));
-        break;
+    private static int getParameterSlotCount(MethodNode method) {
+        Type[] argTypes = Type.getArgumentTypes(method.desc);
+        int count = 0;
+        if ((method.access & Opcodes.ACC_STATIC) == 0) {
+            count = 1; // 'this' parameter
+        }
+        for (Type type : argTypes) {
+            count += type.getSize();
+        }
+        return count;
     }
-    insnList.add(new VarInsnNode(localVarType.getOpcode(Opcodes.ISTORE), localVar.index));
-  }
 
-  private static void extendRange(LocalVariableNode varNode, LabelNode first, LabelNode last) {
-    varNode.start = first; // Set the start of the variable to the first instruction
-    varNode.end = last; // Set the end of the variable to the last instruction
-  }
+    private static void addStore0Insn(InsnList insnList, LocalVariableNode localVar, Type localVarType) {
+        switch (localVarType.getSort()) {
+            case Type.BOOLEAN:
+            case Type.CHAR:
+            case Type.BYTE:
+            case Type.SHORT:
+            case Type.INT:
+                insnList.add(new InsnNode(Opcodes.ICONST_0));
+                break;
+            case Type.LONG:
+                insnList.add(new InsnNode(Opcodes.LCONST_0));
+                break;
+            case Type.FLOAT:
+                insnList.add(new InsnNode(Opcodes.FCONST_0));
+                break;
+            case Type.DOUBLE:
+                insnList.add(new InsnNode(Opcodes.DCONST_0));
+                break;
+            default:
+                insnList.add(new InsnNode(Opcodes.ACONST_NULL));
+                break;
+        }
+        insnList.add(new VarInsnNode(localVarType.getOpcode(Opcodes.ISTORE), localVar.index));
+    }
 
-  private static void scanLocalVariableTable(
-      List<LocalVariableNode> localVariables,
-      Map<Integer, Integer> countBySlot,
-      Map<String, Integer> countByName) {
-    if (localVariables == null) {
-      return; // No local variables to process
+    private static void extendRange(LocalVariableNode varNode, LabelNode first, LabelNode last) {
+        varNode.start = first; // Set the start of the variable to the first instruction
+        varNode.end = last; // Set the end of the variable to the last instruction
     }
-    for (LocalVariableNode varNode : localVariables) {
-      int slot = varNode.index;
-      countBySlot.compute(slot, (k, v) -> (v == null) ? 1 : v + 1);
-      countByName.compute(varNode.name, (k, v) -> (v == null) ? 1 : v + 1);
+
+    private static void scanLocalVariableTable(
+            List<LocalVariableNode> localVariables,
+            Map<Integer, Integer> countBySlot,
+            Map<String, Integer> countByName) {
+        if (localVariables == null) {
+            return; // No local variables to process
+        }
+        for (LocalVariableNode varNode : localVariables) {
+            int slot = varNode.index;
+            countBySlot.compute(slot, (k, v) -> (v == null) ? 1 : v + 1);
+            countByName.compute(varNode.name, (k, v) -> (v == null) ? 1 : v + 1);
+        }
     }
-  }
 
-  private static void scanInstructions(
-      InsnList instructions, Map<Integer, SlotInfo> slots, Set<Integer> forbiddenSlots) {
-    for (int i = 0; i < instructions.size(); i++) {
-      AbstractInsnNode insn = instructions.get(i);
-      if (insn instanceof VarInsnNode) {
-        VarInsnNode varInsn = (VarInsnNode) insn;
-        int slot = varInsn.var;
-        SlotInfo slotInfo = slots.computeIfAbsent(slot, k -> new SlotInfo(slot));
-        if (isStoreOperation(varInsn.getOpcode())) {
-          // define var
-          int opCode = varInsn.getOpcode();
-          slotInfo.addDefinition(i, opCode);
-          if (opCode == Opcodes.LSTORE || opCode == Opcodes.DSTORE) {
-            // Long and Double occupy two slots, so we need to skip the next slot
-            // to avoid double counting
-            if (forbiddenSlots != null) {
-              forbiddenSlots.add(slot + 1);
+    private static void scanInstructions(
+            InsnList instructions, Map<Integer, SlotInfo> slots, Set<Integer> forbiddenSlots) {
+        for (int i = 0; i < instructions.size(); i++) {
+            AbstractInsnNode insn = instructions.get(i);
+            if (insn instanceof VarInsnNode) {
+                VarInsnNode varInsn = (VarInsnNode) insn;
+                int slot = varInsn.var;
+                SlotInfo slotInfo = slots.computeIfAbsent(slot, k -> new SlotInfo(slot));
+                if (isStoreOperation(varInsn.getOpcode())) {
+                    // define var
+                    int opCode = varInsn.getOpcode();
+                    slotInfo.addDefinition(i, opCode);
+                    if (opCode == Opcodes.LSTORE || opCode == Opcodes.DSTORE) {
+                        // Long and Double occupy two slots, so we need to skip the next slot
+                        // to avoid double counting
+                        if (forbiddenSlots != null) {
+                            forbiddenSlots.add(slot + 1);
+                        }
+                    }
+                }
+                if (isLoadOperation(varInsn.getOpcode())) {
+                    // use var
+                    slotInfo.addUse(i, varInsn.getOpcode());
+                    // assume forbidden slots are already fill with definitions
+                }
             }
-          }
-        }
-        if (isLoadOperation(varInsn.getOpcode())) {
-          // use var
-          slotInfo.addUse(i, varInsn.getOpcode());
-          // assume forbidden slots are already fill with definitions
         }
-      }
     }
-  }
 
-  private static boolean isLoadOperation(int opcode) {
-    return opcode >= Opcodes.ILOAD && opcode <= Opcodes.ALOAD;
-  }
+    private static boolean isLoadOperation(int opcode) {
+        return opcode >= Opcodes.ILOAD && opcode <= Opcodes.ALOAD;
+    }
 
-  private static boolean isStoreOperation(int opcode) {
-    return opcode >= Opcodes.ISTORE && opcode <= Opcodes.ASTORE;
-  }
+    private static boolean isStoreOperation(int opcode) {
+        return opcode >= Opcodes.ISTORE && opcode <= Opcodes.ASTORE;
+    }
 
-  private static class SlotInfo {
-    final int slot;
-    final List<Definition> definitions = new ArrayList<>();
-    final List<Use> uses = new ArrayList<>();
+    private static class SlotInfo {
+        final int slot;
+        final List<Definition> definitions = new ArrayList<>();
+        final List<Use> uses = new ArrayList<>();
 
-    SlotInfo(int slot) {
-      this.slot = slot;
-    }
+        SlotInfo(int slot) {
+            this.slot = slot;
+        }
 
-    void addDefinition(int index, int type) {
-      definitions.add(new Definition(index, type));
-    }
+        void addDefinition(int index, int type) {
+            definitions.add(new Definition(index, type));
+        }
 
-    void addUse(int index, int type) {
-      uses.add(new Use(index, type));
-    }
+        void addUse(int index, int type) {
+            uses.add(new Use(index, type));
+        }
 
-    public int getDefinitionCount() {
-      return definitions.size();
-    }
+        public int getDefinitionCount() {
+            return definitions.size();
+        }
 
-    public boolean isOnlyOneType() {
-      return definitions.stream().map(d -> d.type).distinct().count() == 1;
-    }
+        public boolean isOnlyOneType() {
+            return definitions.stream().map(d -> d.type).distinct().count() == 1;
+        }
 
-    public boolean isSingleSlotType() {
-      return definitions.stream()
-          .map(d -> d.type)
-          .distinct()
-          .allMatch(type -> type != Opcodes.DSTORE && type != Opcodes.LSTORE);
+        public boolean isSingleSlotType() {
+            return definitions.stream()
+                    .map(d -> d.type)
+                    .distinct()
+                    .allMatch(type -> type != Opcodes.DSTORE && type != Opcodes.LSTORE);
+        }
     }
-  }
 
-  private static class Definition {
-    final int index; // ASM instruction index
-    final int type; // type of the variable based on OpCode (e.g., ISORE, ASTORe, etc.)
+    private static class Definition {
+        final int index; // ASM instruction index
+        final int type; // type of the variable based on OpCode (e.g., ISORE, ASTORe, etc.)
 
-    Definition(int index, int type) {
-      this.index = index;
-      this.type = type;
+        Definition(int index, int type) {
+            this.index = index;
+            this.type = type;
+        }
     }
-  }
 
-  private static class Use {
-    final int index; // ASM instruction index
-    final int type; // type of the variable based on OpCode (e.g., ILOAD, ALOAD, etc.)
+    private static class Use {
+        final int index; // ASM instruction index
+        final int type; // type of the variable based on OpCode (e.g., ILOAD, ALOAD, etc.)
 
-    Use(int index, int type) {
-      this.index = index;
-      this.type = type;
+        Use(int index, int type) {
+            this.index = index;
+            this.type = type;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MethodInfo.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MethodInfo.java
index d58ad0251e0..ed3e72f7366 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MethodInfo.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MethodInfo.java
@@ -7,61 +7,57 @@
 
 /** Data class to store all information related to a method (class, classloader, lines) */
 public class MethodInfo {
-  private final ClassLoader classLoader;
-  private final ClassNode classNode;
-  private final MethodNode methodNode;
-  private final ClassFileLines classFileLines;
-
-  public MethodInfo(
-      ClassLoader classLoader,
-      ClassNode classNode,
-      MethodNode methodNode,
-      ClassFileLines classFileLines) {
-    this.classLoader = classLoader;
-    this.classNode = classNode;
-    this.methodNode = methodNode;
-    this.classFileLines = classFileLines;
-  }
-
-  public ClassLoader getClassLoader() {
-    return classLoader;
-  }
-
-  public ClassNode getClassNode() {
-    return classNode;
-  }
-
-  public String getMethodName() {
-    return methodNode.name;
-  }
-
-  public MethodNode getMethodNode() {
-    return methodNode;
-  }
-
-  public ClassFileLines getClassFileLines() {
-    return classFileLines;
-  }
-
-  public int getMethodStart() {
-    return classFileLines != null ? classFileLines.getMethodStart(methodNode) : -1;
-  }
-
-  public String getSignature() {
-    return methodNode.desc != null ? Types.descriptorToSignature(methodNode.desc) : null;
-  }
-
-  public String getSourceFileName() {
-    return classNode.sourceFile;
-  }
-
-  public String getTypeName() {
-    return Strings.getClassName(classNode.name);
-  }
-
-  @Override
-  public String toString() {
-    return String.format(
-        "MethodInfo{classNode=%s, methodNode=%s}", classNode.name, methodNode.desc);
-  }
+    private final ClassLoader classLoader;
+    private final ClassNode classNode;
+    private final MethodNode methodNode;
+    private final ClassFileLines classFileLines;
+
+    public MethodInfo(
+            ClassLoader classLoader, ClassNode classNode, MethodNode methodNode, ClassFileLines classFileLines) {
+        this.classLoader = classLoader;
+        this.classNode = classNode;
+        this.methodNode = methodNode;
+        this.classFileLines = classFileLines;
+    }
+
+    public ClassLoader getClassLoader() {
+        return classLoader;
+    }
+
+    public ClassNode getClassNode() {
+        return classNode;
+    }
+
+    public String getMethodName() {
+        return methodNode.name;
+    }
+
+    public MethodNode getMethodNode() {
+        return methodNode;
+    }
+
+    public ClassFileLines getClassFileLines() {
+        return classFileLines;
+    }
+
+    public int getMethodStart() {
+        return classFileLines != null ? classFileLines.getMethodStart(methodNode) : -1;
+    }
+
+    public String getSignature() {
+        return methodNode.desc != null ? Types.descriptorToSignature(methodNode.desc) : null;
+    }
+
+    public String getSourceFileName() {
+        return classNode.sourceFile;
+    }
+
+    public String getTypeName() {
+        return Strings.getClassName(classNode.name);
+    }
+
+    @Override
+    public String toString() {
+        return String.format("MethodInfo{classNode=%s, methodNode=%s}", classNode.name, methodNode.desc);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MetricInstrumenter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MetricInstrumenter.java
index 58d2d0e2e9f..aad6637effe 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MetricInstrumenter.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MetricInstrumenter.java
@@ -91,813 +91,790 @@
 
 /** Handles generating instrumentation for metric probes */
 public class MetricInstrumenter extends Instrumenter {
-  private static final Logger LOGGER = LoggerFactory.getLogger(MetricInstrumenter.class);
-  private static final InsnList EMPTY_INSN_LIST = new InsnList();
-
-  private final MetricProbe metricProbe;
-  private int durationStartVar = -1;
-  private LabelNode durationStartLabel;
-  private InstrumentationResult.Status status = InstrumentationResult.Status.INSTALLED;
-
-  public MetricInstrumenter(
-      MetricProbe metricProbe,
-      MethodInfo methodInfo,
-      List<DiagnosticMessage> diagnostics,
-      List<Integer> probeIndices) {
-    super(metricProbe, methodInfo, diagnostics, probeIndices);
-    this.metricProbe = metricProbe;
-  }
-
-  @Override
-  public InstrumentationResult.Status instrument() {
-    if (definition.isLineProbe()) {
-      return addLineMetric(classFileLines);
+    private static final Logger LOGGER = LoggerFactory.getLogger(MetricInstrumenter.class);
+    private static final InsnList EMPTY_INSN_LIST = new InsnList();
+
+    private final MetricProbe metricProbe;
+    private int durationStartVar = -1;
+    private LabelNode durationStartLabel;
+    private InstrumentationResult.Status status = InstrumentationResult.Status.INSTALLED;
+
+    public MetricInstrumenter(
+            MetricProbe metricProbe,
+            MethodInfo methodInfo,
+            List<DiagnosticMessage> diagnostics,
+            List<Integer> probeIndices) {
+        super(metricProbe, methodInfo, diagnostics, probeIndices);
+        this.metricProbe = metricProbe;
     }
-    switch (definition.getEvaluateAt()) {
-      case ENTRY:
-      case DEFAULT:
-        {
-          InsnList insnList = wrapTryCatch(callMetric(metricProbe, null));
-          methodNode.instructions.insert(methodEnterLabel, insnList);
-          break;
-        }
-      case EXIT:
-        {
-          Map<AbstractInsnNode, Frame<BasicValue>> frames =
-              ASMHelper.computeFrames(classNode.name, methodNode);
-          processInstructions(frames);
-          addFinallyHandler(returnHandlerLabel);
-          installFinallyBlocks();
-          break;
-        }
-      default:
-        throw new IllegalArgumentException(
-            "Invalid evaluateAt attribute: " + definition.getEvaluateAt());
+
+    @Override
+    public InstrumentationResult.Status instrument() {
+        if (definition.isLineProbe()) {
+            return addLineMetric(classFileLines);
+        }
+        switch (definition.getEvaluateAt()) {
+            case ENTRY:
+            case DEFAULT: {
+                InsnList insnList = wrapTryCatch(callMetric(metricProbe, null));
+                methodNode.instructions.insert(methodEnterLabel, insnList);
+                break;
+            }
+            case EXIT: {
+                Map<AbstractInsnNode, Frame<BasicValue>> frames = ASMHelper.computeFrames(classNode.name, methodNode);
+                processInstructions(frames);
+                addFinallyHandler(returnHandlerLabel);
+                installFinallyBlocks();
+                break;
+            }
+            default:
+                throw new IllegalArgumentException("Invalid evaluateAt attribute: " + definition.getEvaluateAt());
+        }
+        return status;
     }
-    return status;
-  }
-
-  @Override
-  protected void reportError(String message) {
-    super.reportError(message);
-    status = InstrumentationResult.Status.ERROR;
-  }
-
-  private void addFinallyHandler(LabelNode endLabel) {
-    // only for @duration case
-    if (durationStartVar == -1) {
-      return;
+
+    @Override
+    protected void reportError(String message) {
+        super.reportError(message);
+        status = InstrumentationResult.Status.ERROR;
     }
-    InsnList insnList = callMetric(metricProbe, null);
-    createFinallyHandler(durationStartLabel, endLabel, wrapTryCatch(insnList));
-  }
 
-  private InsnList wrapTryCatch(InsnList insnList) {
-    if (insnList == null || insnList == EMPTY_INSN_LIST) {
-      return EMPTY_INSN_LIST;
+    private void addFinallyHandler(LabelNode endLabel) {
+        // only for @duration case
+        if (durationStartVar == -1) {
+            return;
+        }
+        InsnList insnList = callMetric(metricProbe, null);
+        createFinallyHandler(durationStartLabel, endLabel, wrapTryCatch(insnList));
     }
-    LabelNode startLabel = new LabelNode();
-    insnList.insert(startLabel);
-    LabelNode endLabel = new LabelNode();
-    insnList.add(endLabel);
-    InsnList handler = new InsnList();
-    LabelNode handlerLabel = new LabelNode();
-    handler.add(handlerLabel);
-    // stack [exception]
-    handler.add(new InsnNode(Opcodes.POP));
-    // stack []
-    handler.add(new JumpInsnNode(Opcodes.GOTO, endLabel));
-    methodNode.instructions.add(handler);
-    methodNode.tryCatchBlocks.add(
-        new TryCatchBlockNode(
-            startLabel, endLabel, handlerLabel, Type.getInternalName(Exception.class)));
-    return insnList;
-  }
-
-  @Override
-  protected InsnList getBeforeReturnInsnList(
-      AbstractInsnNode node, Map<AbstractInsnNode, Frame<BasicValue>> frames) {
-    int size = 1;
-    int storeOpCode = 0;
-    int loadOpCode = 0;
-    Type returnType = null;
-    switch (node.getOpcode()) {
-      case Opcodes.RET:
-      case Opcodes.RETURN:
-        InsnList insnList = wrapTryCatch(callMetric(metricProbe, node));
-        insnList.insert(stackCleanupInsnList(node, 0, frames)); // void return: nothing to keep
+
+    private InsnList wrapTryCatch(InsnList insnList) {
+        if (insnList == null || insnList == EMPTY_INSN_LIST) {
+            return EMPTY_INSN_LIST;
+        }
+        LabelNode startLabel = new LabelNode();
+        insnList.insert(startLabel);
+        LabelNode endLabel = new LabelNode();
+        insnList.add(endLabel);
+        InsnList handler = new InsnList();
+        LabelNode handlerLabel = new LabelNode();
+        handler.add(handlerLabel);
+        // stack [exception]
+        handler.add(new InsnNode(Opcodes.POP));
+        // stack []
+        handler.add(new JumpInsnNode(Opcodes.GOTO, endLabel));
+        methodNode.instructions.add(handler);
+        methodNode.tryCatchBlocks.add(
+                new TryCatchBlockNode(startLabel, endLabel, handlerLabel, Type.getInternalName(Exception.class)));
         return insnList;
-      case Opcodes.LRETURN:
-        storeOpCode = Opcodes.LSTORE;
-        loadOpCode = Opcodes.LLOAD;
-        size = 2;
-        returnType = Type.LONG_TYPE;
-        break;
-      case Opcodes.DRETURN:
-        storeOpCode = Opcodes.DSTORE;
-        loadOpCode = Opcodes.DLOAD;
-        size = 2;
-        returnType = Type.DOUBLE_TYPE;
-        break;
-      case Opcodes.IRETURN:
-        storeOpCode = Opcodes.ISTORE;
-        loadOpCode = Opcodes.ILOAD;
-        returnType = Type.INT_TYPE;
-        break;
-      case Opcodes.FRETURN:
-        storeOpCode = Opcodes.FSTORE;
-        loadOpCode = Opcodes.FLOAD;
-        returnType = Type.FLOAT_TYPE;
-        break;
-      case Opcodes.ARETURN:
-        storeOpCode = Opcodes.ASTORE;
-        loadOpCode = Opcodes.ALOAD;
-        returnType = Type.getReturnType(this.methodNode.desc);
-        break;
-      default:
-        throw new UnsupportedOperationException("Unsupported opcode: " + node.getOpcode());
-    }
-    int tmpIdx = newVar(size);
-    InsnList insnList =
-        wrapTryCatch(
-            callMetric(metricProbe, node, new ReturnContext(tmpIdx, loadOpCode, returnType)));
-    // store return value from the stack to local before wrapped call
-    InsnList prefixInsns = new InsnList();
-    prefixInsns.add(new VarInsnNode(storeOpCode, tmpIdx));
-    prefixInsns.add(stackCleanupInsnList(node, 1, frames)); // keep 1 value (the one we just stored)
-    insnList.insert(prefixInsns);
-    // restore return value to the stack after wrapped call
-    insnList.add(new VarInsnNode(loadOpCode, tmpIdx));
-    return insnList;
-  }
-
-  private void createFinallyHandler(LabelNode startLabel, LabelNode endLabel, InsnList insnList) {
-    LabelNode handlerLabel = new LabelNode();
-    InsnList handler = new InsnList();
-    handler.add(handlerLabel);
-    // declare a local var to store the current Throwable of the 'finally' block
-    int throwableTmpVar = newVar(Type.getType(Throwable.class));
-    // stack [exception]
-    handler.add(new VarInsnNode(Opcodes.ASTORE, throwableTmpVar));
-    // stack []
-    handler.add(insnList);
-    // stack []
-    // restore the current Throwable to the stack
-    handler.add(new VarInsnNode(Opcodes.ALOAD, throwableTmpVar));
-    // stack [exception]
-    handler.add(new InsnNode(Opcodes.ATHROW));
-    methodNode.instructions.add(handler);
-    finallyBlocks.add(new FinallyBlock(startLabel, endLabel, handlerLabel));
-  }
-
-  private InsnList callCount(
-      MetricProbe metricProbe, AbstractInsnNode targetLocation, ReturnContext returnContext) {
-    if (metricProbe.getValue() == null) {
-      InsnList insnList = new InsnList();
-      ldc(insnList, metricProbe.getProbeId().getEncodedId());
-      // stack [ProbeId]
-      getStatic(insnList, METRICKIND_TYPE, metricProbe.getKind().name());
-      // stack [string, MetricKind]
-      insnList.add(new LdcInsnNode(metricProbe.getMetricName()));
-      // stack [string, MetricKind, string]
-      // consider the metric as an increment counter one
-      ldc(insnList, 1L);
-      // stack [string, MetricKind, string, long]
-      pushTags(insnList, addProbeIdWithTags(metricProbe.getId(), metricProbe.getTags()));
-      // stack [string, MetricKind, string, long, array]
-      invokeStatic(
-          insnList,
-          DEBUGGER_CONTEXT_TYPE,
-          "metric",
-          Type.VOID_TYPE,
-          STRING_TYPE,
-          METRICKIND_TYPE,
-          STRING_TYPE,
-          Type.LONG_TYPE,
-          Types.asArray(STRING_TYPE, 1));
-      // stack []
-      return insnList;
-    }
-    return internalCallMetric(metricProbe, targetLocation, returnContext);
-  }
-
-  private InsnList internalCallMetric(
-      MetricProbe metricProbe, AbstractInsnNode targetLocation, ReturnContext returnContext) {
-    InsnList insnList = new InsnList();
-    InsnList nullBranch = new InsnList();
-    VisitorResult result;
-    Type resultType;
-    try {
-      result =
-          metricProbe
-              .getValue()
-              .getExpr()
-              .accept(new MetricValueVisitor(this, nullBranch, targetLocation, returnContext));
-    } catch (InvalidValueException | UnsupportedOperationException ex) {
-      reportError(ex.getMessage());
-      return EMPTY_INSN_LIST;
-    }
-    resultType = result.type.getMainType();
-    MetricProbe.MetricKind kind = metricProbe.getKind();
-    if (!kind.isCompatible(resultType)) {
-      String expectedTypes =
-          kind.getSupportedTypes().stream()
-              .map(Type::getClassName)
-              .collect(Collectors.joining(","));
-      reportError(
-          String.format(
-              "Incompatible type for expression: %s with expected types: [%s]",
-              resultType.getClassName(), expectedTypes));
-      return EMPTY_INSN_LIST;
     }
-    resultType = convertIfRequired(resultType, result.insnList);
-    ldc(insnList, metricProbe.getProbeId().getEncodedId());
-    // stack [string]
-    getStatic(insnList, METRICKIND_TYPE, metricProbe.getKind().name());
-    // stack [string, MetricKind]
-    insnList.add(new LdcInsnNode(metricProbe.getMetricName()));
-    // stack [string, MetricKind, string]
-    insnList.add(result.insnList);
-    // stack [string, MetricKind, string, long|double]
-    pushTags(insnList, addProbeIdWithTags(metricProbe.getId(), metricProbe.getTags()));
-    // stack [string, MetricKind, string, long|double, array]
-    invokeStatic(
-        insnList,
-        DEBUGGER_CONTEXT_TYPE,
-        "metric",
-        Type.VOID_TYPE,
-        STRING_TYPE,
-        METRICKIND_TYPE,
-        STRING_TYPE,
-        resultType,
-        Types.asArray(STRING_TYPE, 1));
-    // stack []
-    insnList.add(nullBranch);
-    return insnList;
-  }
-
-  private Type convertIfRequired(Type currentType, InsnList insnList) {
-    switch (currentType.getSort()) {
-      case Type.BYTE:
-      case Type.SHORT:
-      case Type.CHAR:
-      case Type.INT:
-      case Type.BOOLEAN:
-        insnList.add(new InsnNode(Opcodes.I2L));
-        return Type.LONG_TYPE;
-      case Type.FLOAT:
-        insnList.add(new InsnNode(Opcodes.F2D));
-        return Type.DOUBLE_TYPE;
-      default:
-        return currentType;
+
+    @Override
+    protected InsnList getBeforeReturnInsnList(AbstractInsnNode node, Map<AbstractInsnNode, Frame<BasicValue>> frames) {
+        int size = 1;
+        int storeOpCode = 0;
+        int loadOpCode = 0;
+        Type returnType = null;
+        switch (node.getOpcode()) {
+            case Opcodes.RET:
+            case Opcodes.RETURN:
+                InsnList insnList = wrapTryCatch(callMetric(metricProbe, node));
+                insnList.insert(stackCleanupInsnList(node, 0, frames)); // void return: nothing to keep
+                return insnList;
+            case Opcodes.LRETURN:
+                storeOpCode = Opcodes.LSTORE;
+                loadOpCode = Opcodes.LLOAD;
+                size = 2;
+                returnType = Type.LONG_TYPE;
+                break;
+            case Opcodes.DRETURN:
+                storeOpCode = Opcodes.DSTORE;
+                loadOpCode = Opcodes.DLOAD;
+                size = 2;
+                returnType = Type.DOUBLE_TYPE;
+                break;
+            case Opcodes.IRETURN:
+                storeOpCode = Opcodes.ISTORE;
+                loadOpCode = Opcodes.ILOAD;
+                returnType = Type.INT_TYPE;
+                break;
+            case Opcodes.FRETURN:
+                storeOpCode = Opcodes.FSTORE;
+                loadOpCode = Opcodes.FLOAD;
+                returnType = Type.FLOAT_TYPE;
+                break;
+            case Opcodes.ARETURN:
+                storeOpCode = Opcodes.ASTORE;
+                loadOpCode = Opcodes.ALOAD;
+                returnType = Type.getReturnType(this.methodNode.desc);
+                break;
+            default:
+                throw new UnsupportedOperationException("Unsupported opcode: " + node.getOpcode());
+        }
+        int tmpIdx = newVar(size);
+        InsnList insnList =
+                wrapTryCatch(callMetric(metricProbe, node, new ReturnContext(tmpIdx, loadOpCode, returnType)));
+        // store return value from the stack to local before wrapped call
+        InsnList prefixInsns = new InsnList();
+        prefixInsns.add(new VarInsnNode(storeOpCode, tmpIdx));
+        prefixInsns.add(stackCleanupInsnList(node, 1, frames)); // keep 1 value (the one we just stored)
+        insnList.insert(prefixInsns);
+        // restore return value to the stack after wrapped call
+        insnList.add(new VarInsnNode(loadOpCode, tmpIdx));
+        return insnList;
     }
-  }
-
-  private InsnList callMetric(MetricProbe metricProbe, AbstractInsnNode targetLocation) {
-    return callMetric(metricProbe, targetLocation, null);
-  }
-
-  private InsnList callMetric(
-      MetricProbe metricProbe, AbstractInsnNode targetLocation, ReturnContext returnContext) {
-    switch (metricProbe.getKind()) {
-      case COUNT:
-        return callCount(metricProbe, targetLocation, returnContext);
-      case GAUGE:
-      case HISTOGRAM:
-      case DISTRIBUTION:
+
+    private void createFinallyHandler(LabelNode startLabel, LabelNode endLabel, InsnList insnList) {
+        LabelNode handlerLabel = new LabelNode();
+        InsnList handler = new InsnList();
+        handler.add(handlerLabel);
+        // declare a local var to store the current Throwable of the 'finally' block
+        int throwableTmpVar = newVar(Type.getType(Throwable.class));
+        // stack [exception]
+        handler.add(new VarInsnNode(Opcodes.ASTORE, throwableTmpVar));
+        // stack []
+        handler.add(insnList);
+        // stack []
+        // restore the current Throwable to the stack
+        handler.add(new VarInsnNode(Opcodes.ALOAD, throwableTmpVar));
+        // stack [exception]
+        handler.add(new InsnNode(Opcodes.ATHROW));
+        methodNode.instructions.add(handler);
+        finallyBlocks.add(new FinallyBlock(startLabel, endLabel, handlerLabel));
+    }
+
+    private InsnList callCount(MetricProbe metricProbe, AbstractInsnNode targetLocation, ReturnContext returnContext) {
         if (metricProbe.getValue() == null) {
-          return EMPTY_INSN_LIST;
+            InsnList insnList = new InsnList();
+            ldc(insnList, metricProbe.getProbeId().getEncodedId());
+            // stack [ProbeId]
+            getStatic(insnList, METRICKIND_TYPE, metricProbe.getKind().name());
+            // stack [string, MetricKind]
+            insnList.add(new LdcInsnNode(metricProbe.getMetricName()));
+            // stack [string, MetricKind, string]
+            // consider the metric as an increment counter one
+            ldc(insnList, 1L);
+            // stack [string, MetricKind, string, long]
+            pushTags(insnList, addProbeIdWithTags(metricProbe.getId(), metricProbe.getTags()));
+            // stack [string, MetricKind, string, long, array]
+            invokeStatic(
+                    insnList,
+                    DEBUGGER_CONTEXT_TYPE,
+                    "metric",
+                    Type.VOID_TYPE,
+                    STRING_TYPE,
+                    METRICKIND_TYPE,
+                    STRING_TYPE,
+                    Type.LONG_TYPE,
+                    Types.asArray(STRING_TYPE, 1));
+            // stack []
+            return insnList;
         }
         return internalCallMetric(metricProbe, targetLocation, returnContext);
-      default:
-        reportError(String.format("Unknown metric kind: %s", metricProbe.getKind()));
     }
-    return null;
-  }
-
-  private InstrumentationResult.Status addLineMetric(ClassFileLines classFileLines) {
-    Where.SourceLine[] targetLines = metricProbe.getWhere().getSourceLines();
-    if (targetLines == null) {
-      reportError("Missing line(s) in probe definition.");
-      return InstrumentationResult.Status.ERROR;
-    }
-    if (classFileLines.isEmpty()) {
-      reportError("Missing line debug information.");
-      return InstrumentationResult.Status.ERROR;
-    }
-    for (Where.SourceLine sourceLine : targetLines) {
-      int from = sourceLine.getFrom();
-      int till = sourceLine.getTill();
-      LabelNode beforeLabel = classFileLines.getLineLabel(from);
-      // single line N capture translates to line range (N, N+1)
-      LabelNode afterLabel =
-          classFileLines.getLineLabel(till + (sourceLine.isSingleLine() ? 1 : 0));
-      if (beforeLabel == null && afterLabel == null) {
-        reportError(
-            "No line info for " + (sourceLine.isSingleLine() ? "line " : "range ") + sourceLine);
-      }
-      if (beforeLabel != null) {
-        InsnList insnList = wrapTryCatch(callMetric(metricProbe, beforeLabel));
-        methodNode.instructions.insertBefore(beforeLabel.getNext(), insnList);
-      }
-      if (afterLabel != null && !sourceLine.isSingleLine()) {
-        InsnList insnList = wrapTryCatch(callMetric(metricProbe, afterLabel));
-        methodNode.instructions.insert(afterLabel, insnList);
-      }
-    }
-    return InstrumentationResult.Status.INSTALLED;
-  }
 
-  private static class VisitorResult {
-    final ASMHelper.Type type;
-    final InsnList insnList;
-
-    public VisitorResult(ASMHelper.Type type, InsnList insnList) {
-      this.type = type;
-      this.insnList = insnList;
-    }
-  }
-
-  private class MetricValueVisitor implements Visitor<VisitorResult> {
-    private final MetricInstrumenter instrumentor;
-    private final InsnList nullBranch;
-    private final AbstractInsnNode targetLocation;
-    private final ReturnContext returnContext;
-
-    public MetricValueVisitor(
-        MetricInstrumenter instrumentor,
-        InsnList nullBranch,
-        AbstractInsnNode targetLocation,
-        ReturnContext returnContext) {
-      this.instrumentor = instrumentor;
-      this.nullBranch = nullBranch;
-      this.targetLocation = targetLocation;
-      this.returnContext = returnContext;
+    private InsnList internalCallMetric(
+            MetricProbe metricProbe, AbstractInsnNode targetLocation, ReturnContext returnContext) {
+        InsnList insnList = new InsnList();
+        InsnList nullBranch = new InsnList();
+        VisitorResult result;
+        Type resultType;
+        try {
+            result = metricProbe
+                    .getValue()
+                    .getExpr()
+                    .accept(new MetricValueVisitor(this, nullBranch, targetLocation, returnContext));
+        } catch (InvalidValueException | UnsupportedOperationException ex) {
+            reportError(ex.getMessage());
+            return EMPTY_INSN_LIST;
+        }
+        resultType = result.type.getMainType();
+        MetricProbe.MetricKind kind = metricProbe.getKind();
+        if (!kind.isCompatible(resultType)) {
+            String expectedTypes =
+                    kind.getSupportedTypes().stream().map(Type::getClassName).collect(Collectors.joining(","));
+            reportError(String.format(
+                    "Incompatible type for expression: %s with expected types: [%s]",
+                    resultType.getClassName(), expectedTypes));
+            return EMPTY_INSN_LIST;
+        }
+        resultType = convertIfRequired(resultType, result.insnList);
+        ldc(insnList, metricProbe.getProbeId().getEncodedId());
+        // stack [string]
+        getStatic(insnList, METRICKIND_TYPE, metricProbe.getKind().name());
+        // stack [string, MetricKind]
+        insnList.add(new LdcInsnNode(metricProbe.getMetricName()));
+        // stack [string, MetricKind, string]
+        insnList.add(result.insnList);
+        // stack [string, MetricKind, string, long|double]
+        pushTags(insnList, addProbeIdWithTags(metricProbe.getId(), metricProbe.getTags()));
+        // stack [string, MetricKind, string, long|double, array]
+        invokeStatic(
+                insnList,
+                DEBUGGER_CONTEXT_TYPE,
+                "metric",
+                Type.VOID_TYPE,
+                STRING_TYPE,
+                METRICKIND_TYPE,
+                STRING_TYPE,
+                resultType,
+                Types.asArray(STRING_TYPE, 1));
+        // stack []
+        insnList.add(nullBranch);
+        return insnList;
     }
 
-    @Override
-    public VisitorResult visit(BinaryExpression binaryExpression) {
-      throw new UnsupportedOperationException();
+    private Type convertIfRequired(Type currentType, InsnList insnList) {
+        switch (currentType.getSort()) {
+            case Type.BYTE:
+            case Type.SHORT:
+            case Type.CHAR:
+            case Type.INT:
+            case Type.BOOLEAN:
+                insnList.add(new InsnNode(Opcodes.I2L));
+                return Type.LONG_TYPE;
+            case Type.FLOAT:
+                insnList.add(new InsnNode(Opcodes.F2D));
+                return Type.DOUBLE_TYPE;
+            default:
+                return currentType;
+        }
     }
 
-    @Override
-    public VisitorResult visit(BinaryOperator operator) {
-      throw new UnsupportedOperationException();
+    private InsnList callMetric(MetricProbe metricProbe, AbstractInsnNode targetLocation) {
+        return callMetric(metricProbe, targetLocation, null);
     }
 
-    @Override
-    public VisitorResult visit(ComparisonExpression comparisonExpression) {
-      throw new UnsupportedOperationException();
+    private InsnList callMetric(MetricProbe metricProbe, AbstractInsnNode targetLocation, ReturnContext returnContext) {
+        switch (metricProbe.getKind()) {
+            case COUNT:
+                return callCount(metricProbe, targetLocation, returnContext);
+            case GAUGE:
+            case HISTOGRAM:
+            case DISTRIBUTION:
+                if (metricProbe.getValue() == null) {
+                    return EMPTY_INSN_LIST;
+                }
+                return internalCallMetric(metricProbe, targetLocation, returnContext);
+            default:
+                reportError(String.format("Unknown metric kind: %s", metricProbe.getKind()));
+        }
+        return null;
     }
 
-    @Override
-    public VisitorResult visit(ComparisonOperator operator) {
-      throw new UnsupportedOperationException();
+    private InstrumentationResult.Status addLineMetric(ClassFileLines classFileLines) {
+        Where.SourceLine[] targetLines = metricProbe.getWhere().getSourceLines();
+        if (targetLines == null) {
+            reportError("Missing line(s) in probe definition.");
+            return InstrumentationResult.Status.ERROR;
+        }
+        if (classFileLines.isEmpty()) {
+            reportError("Missing line debug information.");
+            return InstrumentationResult.Status.ERROR;
+        }
+        for (Where.SourceLine sourceLine : targetLines) {
+            int from = sourceLine.getFrom();
+            int till = sourceLine.getTill();
+            LabelNode beforeLabel = classFileLines.getLineLabel(from);
+            // single line N capture translates to line range (N, N+1)
+            LabelNode afterLabel = classFileLines.getLineLabel(till + (sourceLine.isSingleLine() ? 1 : 0));
+            if (beforeLabel == null && afterLabel == null) {
+                reportError("No line info for " + (sourceLine.isSingleLine() ? "line " : "range ") + sourceLine);
+            }
+            if (beforeLabel != null) {
+                InsnList insnList = wrapTryCatch(callMetric(metricProbe, beforeLabel));
+                methodNode.instructions.insertBefore(beforeLabel.getNext(), insnList);
+            }
+            if (afterLabel != null && !sourceLine.isSingleLine()) {
+                InsnList insnList = wrapTryCatch(callMetric(metricProbe, afterLabel));
+                methodNode.instructions.insert(afterLabel, insnList);
+            }
+        }
+        return InstrumentationResult.Status.INSTALLED;
     }
 
-    @Override
-    public VisitorResult visit(ContainsExpression containsExpression) {
-      throw new UnsupportedOperationException();
-    }
+    private static class VisitorResult {
+        final ASMHelper.Type type;
+        final InsnList insnList;
 
-    @Override
-    public VisitorResult visit(EndsWithExpression endsWithExpression) {
-      throw new UnsupportedOperationException();
+        public VisitorResult(ASMHelper.Type type, InsnList insnList) {
+            this.type = type;
+            this.insnList = insnList;
+        }
     }
 
-    @Override
-    public VisitorResult visit(FilterCollectionExpression filterCollectionExpression) {
-      throw new UnsupportedOperationException();
-    }
+    private class MetricValueVisitor implements Visitor<VisitorResult> {
+        private final MetricInstrumenter instrumentor;
+        private final InsnList nullBranch;
+        private final AbstractInsnNode targetLocation;
+        private final ReturnContext returnContext;
+
+        public MetricValueVisitor(
+                MetricInstrumenter instrumentor,
+                InsnList nullBranch,
+                AbstractInsnNode targetLocation,
+                ReturnContext returnContext) {
+            this.instrumentor = instrumentor;
+            this.nullBranch = nullBranch;
+            this.targetLocation = targetLocation;
+            this.returnContext = returnContext;
+        }
 
-    @Override
-    public VisitorResult visit(HasAllExpression hasAllExpression) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(BinaryExpression binaryExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(HasAnyExpression hasAnyExpression) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(BinaryOperator operator) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(IfElseExpression ifElseExpression) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(ComparisonExpression comparisonExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(IfExpression ifExpression) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(ComparisonOperator operator) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(IsEmptyExpression isEmptyExpression) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(ContainsExpression containsExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(IsDefinedExpression isDefinedExpression) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(EndsWithExpression endsWithExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(LenExpression lenExpression) {
-      VisitorResult visitorResult = lenExpression.getSource().accept(this);
-      Type type = visitorResult.type.getMainType();
-      if (type.equals(STRING_TYPE)) {
-        invokeVirtual(visitorResult.insnList, type, "length", Type.INT_TYPE);
-        return new VisitorResult(ASMHelper.INT_TYPE, visitorResult.insnList);
-      }
-      if (type.getSort() == Type.ARRAY) {
-        visitorResult.insnList.add(new InsnNode(Opcodes.ARRAYLENGTH));
-        return new VisitorResult(ASMHelper.INT_TYPE, visitorResult.insnList);
-      }
-      if (type.equals(COLLECTION_TYPE)
-          || type.equals(LIST_TYPE)
-          || type.equals(MAP_TYPE)
-          || type.equals(SET_TYPE)) {
-        invokeInterface(visitorResult.insnList, type, "size", Type.INT_TYPE);
-        return new VisitorResult(ASMHelper.INT_TYPE, visitorResult.insnList);
-      }
-      if (type.equals(ARRAYLIST_TYPE)
-          || type.equals(LINKEDLIST_TYPE)
-          || type.equals(HASHMAP_TYPE)
-          || type.equals(LINKEDHASHMAP_TYPE)
-          || type.equals(HASHSET_TYPE)) {
-        invokeVirtual(visitorResult.insnList, type, "size", Type.INT_TYPE);
-        return new VisitorResult(ASMHelper.INT_TYPE, visitorResult.insnList);
-      }
-      throw new InvalidValueException("Unsupported type for len operation: " + type.getClassName());
-    }
+        @Override
+        public VisitorResult visit(FilterCollectionExpression filterCollectionExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(MatchesExpression matchesExpression) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(HasAllExpression hasAllExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(NotExpression notExpression) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(HasAnyExpression hasAnyExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(StartsWithExpression startsWithExpression) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(IfElseExpression ifElseExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(SubStringExpression subStringExpression) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(IfExpression ifExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(ValueRefExpression valueRefExpression) {
-      String name = valueRefExpression.getSymbolName();
-      InsnList insnList = new InsnList();
-      ASMHelper.Type currentType;
-      if (name.equals(ValueReferences.THIS)) {
-        currentType = new ASMHelper.Type(Type.getObjectType(instrumentor.classNode.name));
-        insnList.add(new VarInsnNode(Opcodes.ALOAD, 0));
-        // stack [this]
-      } else {
-        if (name.startsWith(ValueReferences.SYNTHETIC_PREFIX)) {
-          currentType = tryRetrieveSynthetic(name, insnList);
-        } else {
-          currentType = tryRetrieve(name, insnList);
-        }
-        if (currentType == null) {
-          throw new InvalidValueException("Cannot resolve symbol " + name);
-        }
-        // stack [arg|local|field]
-      }
-      return new VisitorResult(currentType, insnList);
-    }
+        @Override
+        public VisitorResult visit(IsEmptyExpression isEmptyExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(GetMemberExpression getMemberExpression) {
-      VisitorResult result = getMemberExpression.getTarget().accept(this);
-      String name = getMemberExpression.getMemberName();
-      ASMHelper.Type type =
-          tryRetrieveField(result.type.getMainType(), name, result.insnList, false);
-      if (type == null) {
-        throw new InvalidValueException("Cannot resolve symbol " + name);
-      }
-      // stack [field]
-      return new VisitorResult(type, result.insnList);
-    }
+        @Override
+        public VisitorResult visit(IsDefinedExpression isDefinedExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(IndexExpression indexExpression) {
-      InsnList insnList = new InsnList();
-      VisitorResult targetResult = indexExpression.getTarget().accept(this);
-      // stack [target_object]
-      insnList.add(targetResult.insnList);
-      VisitorResult keyResult = indexExpression.getKey().accept(this);
-      // stack [target_object, key_object]
-      insnList.add(keyResult.insnList);
-      Type targetType = targetResult.type.getMainType();
-      if (targetType.equals(MAP_TYPE)) {
-        invokeInterface(insnList, targetType, "get", OBJECT_TYPE, OBJECT_TYPE);
-        // stack [result_object]
-        return buildResultWithElementType(targetResult.type, insnList);
-      }
-      if (targetType.equals(HASHMAP_TYPE)) {
-        invokeVirtual(insnList, targetType, "get", OBJECT_TYPE, OBJECT_TYPE);
-        // stack [result_object]
-        return buildResultWithElementType(targetResult.type, insnList);
-      }
-      // for now on, we expect to be either an int or a long for accessing lists or arrays
-      if (keyResult.type.getMainType().equals(Type.LONG_TYPE)
-          || keyResult.type.getMainType().equals(Type.INT_TYPE)) {
-        if (keyResult.type.getMainType().equals(Type.LONG_TYPE)) {
-          insnList.add(new InsnNode(Opcodes.L2I));
-        }
-        if (targetType.getSort() == Type.ARRAY) {
-          insnList.add(new InsnNode(targetType.getElementType().getOpcode(Opcodes.IALOAD)));
-          return new VisitorResult(new ASMHelper.Type(targetType.getElementType()), insnList);
-        }
-        if (targetType.equals(LIST_TYPE)) {
-          invokeInterface(insnList, targetType, "get", OBJECT_TYPE, Type.INT_TYPE);
-          return buildResultWithElementType(targetResult.type, insnList);
-        }
-        if (targetType.equals(ARRAYLIST_TYPE) || targetType.equals(LINKEDLIST_TYPE)) {
-          invokeVirtual(insnList, targetType, "get", OBJECT_TYPE, Type.INT_TYPE);
-          return buildResultWithElementType(targetResult.type, insnList);
-        }
-      } else {
-        throw new UnsupportedOperationException(
-            "Incompatible type for key: " + keyResult.type + ", expected int or long");
-      }
-      throw new UnsupportedOperationException(targetResult.type.toString());
-    }
+        @Override
+        public VisitorResult visit(LenExpression lenExpression) {
+            VisitorResult visitorResult = lenExpression.getSource().accept(this);
+            Type type = visitorResult.type.getMainType();
+            if (type.equals(STRING_TYPE)) {
+                invokeVirtual(visitorResult.insnList, type, "length", Type.INT_TYPE);
+                return new VisitorResult(ASMHelper.INT_TYPE, visitorResult.insnList);
+            }
+            if (type.getSort() == Type.ARRAY) {
+                visitorResult.insnList.add(new InsnNode(Opcodes.ARRAYLENGTH));
+                return new VisitorResult(ASMHelper.INT_TYPE, visitorResult.insnList);
+            }
+            if (type.equals(COLLECTION_TYPE)
+                    || type.equals(LIST_TYPE)
+                    || type.equals(MAP_TYPE)
+                    || type.equals(SET_TYPE)) {
+                invokeInterface(visitorResult.insnList, type, "size", Type.INT_TYPE);
+                return new VisitorResult(ASMHelper.INT_TYPE, visitorResult.insnList);
+            }
+            if (type.equals(ARRAYLIST_TYPE)
+                    || type.equals(LINKEDLIST_TYPE)
+                    || type.equals(HASHMAP_TYPE)
+                    || type.equals(LINKEDHASHMAP_TYPE)
+                    || type.equals(HASHSET_TYPE)) {
+                invokeVirtual(visitorResult.insnList, type, "size", Type.INT_TYPE);
+                return new VisitorResult(ASMHelper.INT_TYPE, visitorResult.insnList);
+            }
+            throw new InvalidValueException("Unsupported type for len operation: " + type.getClassName());
+        }
 
-    private VisitorResult buildResultWithElementType(ASMHelper.Type targetType, InsnList insnList) {
-      // assume the first generic type of targetResult is the type of elements
-      ASMHelper.Type elementType =
-          targetType.getGenericTypes().isEmpty()
-              ? ASMHelper.OBJECT_TYPE
-              : targetType.getGenericTypes().get(0);
-      insnList.add(
-          new TypeInsnNode(Opcodes.CHECKCAST, elementType.getMainType().getInternalName()));
-      return new VisitorResult(elementType, insnList);
-    }
+        @Override
+        public VisitorResult visit(MatchesExpression matchesExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(WhenExpression whenExpression) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(NotExpression notExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(BooleanExpression booleanExpression) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(StartsWithExpression startsWithExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(ObjectValue objectValue) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(SubStringExpression subStringExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(StringValue stringValue) {
-      InsnList insnList = new InsnList();
-      ldc(insnList, stringValue.getValue());
-      return new VisitorResult(ASMHelper.STRING_TYPE, insnList);
-    }
+        @Override
+        public VisitorResult visit(ValueRefExpression valueRefExpression) {
+            String name = valueRefExpression.getSymbolName();
+            InsnList insnList = new InsnList();
+            ASMHelper.Type currentType;
+            if (name.equals(ValueReferences.THIS)) {
+                currentType = new ASMHelper.Type(Type.getObjectType(instrumentor.classNode.name));
+                insnList.add(new VarInsnNode(Opcodes.ALOAD, 0));
+                // stack [this]
+            } else {
+                if (name.startsWith(ValueReferences.SYNTHETIC_PREFIX)) {
+                    currentType = tryRetrieveSynthetic(name, insnList);
+                } else {
+                    currentType = tryRetrieve(name, insnList);
+                }
+                if (currentType == null) {
+                    throw new InvalidValueException("Cannot resolve symbol " + name);
+                }
+                // stack [arg|local|field]
+            }
+            return new VisitorResult(currentType, insnList);
+        }
 
-    @Override
-    public VisitorResult visit(NumericValue numericValue) {
-      Number number = numericValue.getWidenValue();
-      InsnList insnList = new InsnList();
-      if (number instanceof Long) {
-        ldc(insnList, number.longValue());
-        return new VisitorResult(ASMHelper.LONG_TYPE, insnList);
-      }
-      throw new InvalidValueException(
-          "Unsupported constant value: " + number + " type: " + number.getClass().getTypeName());
-    }
+        @Override
+        public VisitorResult visit(GetMemberExpression getMemberExpression) {
+            VisitorResult result = getMemberExpression.getTarget().accept(this);
+            String name = getMemberExpression.getMemberName();
+            ASMHelper.Type type = tryRetrieveField(result.type.getMainType(), name, result.insnList, false);
+            if (type == null) {
+                throw new InvalidValueException("Cannot resolve symbol " + name);
+            }
+            // stack [field]
+            return new VisitorResult(type, result.insnList);
+        }
 
-    @Override
-    public VisitorResult visit(BooleanValue booleanValue) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(IndexExpression indexExpression) {
+            InsnList insnList = new InsnList();
+            VisitorResult targetResult = indexExpression.getTarget().accept(this);
+            // stack [target_object]
+            insnList.add(targetResult.insnList);
+            VisitorResult keyResult = indexExpression.getKey().accept(this);
+            // stack [target_object, key_object]
+            insnList.add(keyResult.insnList);
+            Type targetType = targetResult.type.getMainType();
+            if (targetType.equals(MAP_TYPE)) {
+                invokeInterface(insnList, targetType, "get", OBJECT_TYPE, OBJECT_TYPE);
+                // stack [result_object]
+                return buildResultWithElementType(targetResult.type, insnList);
+            }
+            if (targetType.equals(HASHMAP_TYPE)) {
+                invokeVirtual(insnList, targetType, "get", OBJECT_TYPE, OBJECT_TYPE);
+                // stack [result_object]
+                return buildResultWithElementType(targetResult.type, insnList);
+            }
+            // for now on, we expect to be either an int or a long for accessing lists or arrays
+            if (keyResult.type.getMainType().equals(Type.LONG_TYPE)
+                    || keyResult.type.getMainType().equals(Type.INT_TYPE)) {
+                if (keyResult.type.getMainType().equals(Type.LONG_TYPE)) {
+                    insnList.add(new InsnNode(Opcodes.L2I));
+                }
+                if (targetType.getSort() == Type.ARRAY) {
+                    insnList.add(new InsnNode(targetType.getElementType().getOpcode(Opcodes.IALOAD)));
+                    return new VisitorResult(new ASMHelper.Type(targetType.getElementType()), insnList);
+                }
+                if (targetType.equals(LIST_TYPE)) {
+                    invokeInterface(insnList, targetType, "get", OBJECT_TYPE, Type.INT_TYPE);
+                    return buildResultWithElementType(targetResult.type, insnList);
+                }
+                if (targetType.equals(ARRAYLIST_TYPE) || targetType.equals(LINKEDLIST_TYPE)) {
+                    invokeVirtual(insnList, targetType, "get", OBJECT_TYPE, Type.INT_TYPE);
+                    return buildResultWithElementType(targetResult.type, insnList);
+                }
+            } else {
+                throw new UnsupportedOperationException(
+                        "Incompatible type for key: " + keyResult.type + ", expected int or long");
+            }
+            throw new UnsupportedOperationException(targetResult.type.toString());
+        }
 
-    @Override
-    public VisitorResult visit(NullValue nullValue) {
-      InsnList instList = new InsnList();
-      instList.add(new InsnNode(Opcodes.ACONST_NULL));
-      return new VisitorResult(ASMHelper.OBJECT_TYPE, instList);
-    }
+        private VisitorResult buildResultWithElementType(ASMHelper.Type targetType, InsnList insnList) {
+            // assume the first generic type of targetResult is the type of elements
+            ASMHelper.Type elementType = targetType.getGenericTypes().isEmpty()
+                    ? ASMHelper.OBJECT_TYPE
+                    : targetType.getGenericTypes().get(0);
+            insnList.add(new TypeInsnNode(
+                    Opcodes.CHECKCAST, elementType.getMainType().getInternalName()));
+            return new VisitorResult(elementType, insnList);
+        }
 
-    @Override
-    public VisitorResult visit(ListValue listValue) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(WhenExpression whenExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(MapValue mapValue) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(BooleanExpression booleanExpression) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public VisitorResult visit(SetValue setValue) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public VisitorResult visit(ObjectValue objectValue) {
+            throw new UnsupportedOperationException();
+        }
 
-    private ASMHelper.Type tryRetrieve(String name, InsnList insnList) {
-      ASMHelper.Type result = tryRetrieveArgument(name, insnList);
-      if (result != null) {
-        return result;
-      }
-      result = tryRetrieveLocalVar(name, insnList);
-      if (result != null) {
-        return result;
-      }
-      return tryRetrieveField(
-          Type.getObjectType(instrumentor.classNode.name), name, insnList, true);
-    }
+        @Override
+        public VisitorResult visit(StringValue stringValue) {
+            InsnList insnList = new InsnList();
+            ldc(insnList, stringValue.getValue());
+            return new VisitorResult(ASMHelper.STRING_TYPE, insnList);
+        }
 
-    private ASMHelper.Type tryRetrieveArgument(String head, InsnList insnList) {
-      Type[] argTypes = Type.getArgumentTypes(instrumentor.methodNode.desc);
-      if (argTypes.length == 0) {
-        // bail out if no args
-        return null;
-      }
-      int counter = 0;
-      int slot = instrumentor.isStatic ? 0 : 1;
-      for (Type argType : argTypes) {
-        String currentArgName = null;
-        if (instrumentor.localVarsBySlotArray.length > 0) {
-          LocalVariableNode localVarNode = instrumentor.localVarsBySlotArray[slot];
-          currentArgName = localVarNode != null ? localVarNode.name : null;
-        }
-        if (currentArgName == null) {
-          // if argument names are not resolved correctly let's assign p+arg_index
-          currentArgName = "p" + counter;
-        }
-        if (currentArgName.equals(head)) {
-          VarInsnNode varInsnNode = new VarInsnNode(argType.getOpcode(Opcodes.ILOAD), slot);
-          insnList.add(varInsnNode);
-          // stack [arg]
-          return new ASMHelper.Type(argType);
-        }
-        slot += argType.getSize();
-      }
-      return null;
-    }
+        @Override
+        public VisitorResult visit(NumericValue numericValue) {
+            Number number = numericValue.getWidenValue();
+            InsnList insnList = new InsnList();
+            if (number instanceof Long) {
+                ldc(insnList, number.longValue());
+                return new VisitorResult(ASMHelper.LONG_TYPE, insnList);
+            }
+            throw new InvalidValueException("Unsupported constant value: " + number + " type: "
+                    + number.getClass().getTypeName());
+        }
 
-    private ASMHelper.Type tryRetrieveLocalVar(String head, InsnList insnList) {
-      for (LocalVariableNode varNode : instrumentor.methodNode.localVariables) {
-        if (varNode.name.equals(head)) {
-          if (isInScope(instrumentor.methodNode, varNode, targetLocation)) {
-            Type varType = Type.getType(varNode.desc);
-            VarInsnNode varInsnNode =
-                new VarInsnNode(varType.getOpcode(Opcodes.ILOAD), varNode.index);
-            insnList.add(varInsnNode);
-            // stack [local]
-            return new ASMHelper.Type(varType);
-          }
-        }
-      }
-      return null;
-    }
+        @Override
+        public VisitorResult visit(BooleanValue booleanValue) {
+            throw new UnsupportedOperationException();
+        }
 
-    private ASMHelper.Type tryRetrieveField(
-        Type currentType, String fieldName, InsnList insnList, boolean useThisField) {
-      Class<?> clazz;
-      ASMHelper.Type returnType = null;
-      try {
-        String className;
-        String fieldDesc = null;
-        boolean isAccessible = true;
-        if (currentType.getInternalName().equals(instrumentor.classNode.name)) { // this
-          className = instrumentor.classNode.name;
-          List<FieldNode> fieldList =
-              instrumentor.isStatic
-                  ? new ArrayList<>()
-                  : new ArrayList<>(instrumentor.classNode.fields);
-          for (FieldNode fieldNode : fieldList) {
-            if (fieldNode.name.equals(fieldName)) {
-              if (isStaticField(fieldNode)) {
-                continue; // or break?
-              }
-              fieldDesc = fieldNode.desc;
-              if (fieldNode.signature != null) {
-                returnType = decodeSignature(fieldNode.signature);
-              } else {
-                returnType = new ASMHelper.Type(Type.getType(fieldNode.desc));
-              }
-              if (useThisField) {
-                insnList.add(new VarInsnNode(Opcodes.ALOAD, 0));
-                // stack [this]
-              }
-              break;
+        @Override
+        public VisitorResult visit(NullValue nullValue) {
+            InsnList instList = new InsnList();
+            instList.add(new InsnNode(Opcodes.ACONST_NULL));
+            return new VisitorResult(ASMHelper.OBJECT_TYPE, instList);
+        }
+
+        @Override
+        public VisitorResult visit(ListValue listValue) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public VisitorResult visit(MapValue mapValue) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public VisitorResult visit(SetValue setValue) {
+            throw new UnsupportedOperationException();
+        }
+
+        private ASMHelper.Type tryRetrieve(String name, InsnList insnList) {
+            ASMHelper.Type result = tryRetrieveArgument(name, insnList);
+            if (result != null) {
+                return result;
             }
-          }
-        } else {
-          className = currentType.getClassName();
-          clazz =
-              ensureSafeClassLoad(
-                  className, getClassName(instrumentor.classNode.name), instrumentor.classLoader);
-          Field declaredField = clazz.getDeclaredField(fieldName); // no parent fields!
-          isAccessible = declaredField.isAccessible();
-          fieldDesc = Type.getDescriptor(declaredField.getType());
-          returnType = new ASMHelper.Type(Type.getType(declaredField.getType()));
-        }
-        if (fieldDesc == null) {
-          return null;
-        }
-        // stack [target_object]
-        insnList.add(new InsnNode(Opcodes.DUP));
-        // stack [target_object, target_object]
-        LabelNode nullNode = new LabelNode();
-        insnList.add(new JumpInsnNode(Opcodes.IFNULL, nullNode));
-        if (isAccessible) {
-          // stack [target_object]
-          insnList.add(new FieldInsnNode(Opcodes.GETFIELD, className, fieldName, fieldDesc));
-          // stack: [field_value]
-        } else {
-          ldc(insnList, fieldName);
-          // stack: [target_object, string]
-          emitReflectiveCall(insnList, returnType, OBJECT_TYPE);
-          int sort = returnType.getMainType().getSort();
-          if (sort == org.objectweb.asm.Type.OBJECT || sort == org.objectweb.asm.Type.ARRAY) {
-            insnList.add(
-                new TypeInsnNode(Opcodes.CHECKCAST, returnType.getMainType().getInternalName()));
-          }
-        }
-        // build null branch which will be added later after the call to emit metric
-        LabelNode gotoNode = new LabelNode();
-        nullBranch.add(new JumpInsnNode(Opcodes.GOTO, gotoNode));
-        nullBranch.add(nullNode);
-        nullBranch.add(new InsnNode(Opcodes.POP)); // target_object
-        nullBranch.add(new InsnNode(Opcodes.POP)); // metric name
-        nullBranch.add(new InsnNode(Opcodes.POP)); // metric kind
-        nullBranch.add(new InsnNode(Opcodes.POP)); // probeId
-        nullBranch.add(gotoNode);
-      } catch (Exception e) {
-        String message = "Cannot resolve field " + fieldName;
-        LOGGER.debug(message, e);
-        throw new InvalidValueException(message);
-      }
-      return returnType;
-    }
+            result = tryRetrieveLocalVar(name, insnList);
+            if (result != null) {
+                return result;
+            }
+            return tryRetrieveField(Type.getObjectType(instrumentor.classNode.name), name, insnList, true);
+        }
 
-    private ASMHelper.Type tryRetrieveSynthetic(String name, InsnList insnList) {
-      if (name.equals(ValueReferences.RETURN_REF)) {
-        if (instrumentor.metricProbe.getEvaluateAt() != MethodLocation.EXIT) {
-          return null;
-        }
-        if (returnContext == null) {
-          return null;
-        }
-        VarInsnNode varInsnNode =
-            new VarInsnNode(returnContext.opLoad, returnContext.returnLocalVarIdx);
-        insnList.add(varInsnNode);
-        // stack [return_value]
-        return new ASMHelper.Type(returnContext.type);
-      }
-      if (name.equals(ValueReferences.DURATION_REF)) {
-        if (instrumentor.metricProbe.getEvaluateAt() != MethodLocation.EXIT) {
-          return null;
-        }
-        // call System.nanoTime at the beginning of the method
-        if (durationStartVar == -1) {
-          durationStartVar = instrumentor.newVar(LONG_TYPE);
-          InsnList nanoTimeList = new InsnList();
-          invokeStatic(nanoTimeList, Type.getType(System.class), "nanoTime", LONG_TYPE);
-          nanoTimeList.add(new VarInsnNode(Opcodes.LSTORE, durationStartVar));
-          durationStartLabel = new LabelNode();
-          nanoTimeList.add(durationStartLabel);
-          instrumentor.methodNode.instructions.insert(instrumentor.methodEnterLabel, nanoTimeList);
-        }
-        // diff nanoTime before calling metric
-        invokeStatic(insnList, Type.getType(System.class), "nanoTime", LONG_TYPE);
-        // stack [long]
-        insnList.add(new VarInsnNode(Opcodes.LLOAD, durationStartVar));
-        // stack [long, long]
-        insnList.add(new InsnNode(Opcodes.LSUB));
-        // stack [long]
-        insnList.add(new InsnNode(Opcodes.L2D));
-        // stack [double]
-        insnList.add(new LdcInsnNode(1_000_000D));
-        // stack [double, double]
-        insnList.add(new InsnNode(Opcodes.DDIV));
-        // stack [double]
-        return new ASMHelper.Type(DOUBLE_TYPE);
-      }
-      return null;
+        private ASMHelper.Type tryRetrieveArgument(String head, InsnList insnList) {
+            Type[] argTypes = Type.getArgumentTypes(instrumentor.methodNode.desc);
+            if (argTypes.length == 0) {
+                // bail out if no args
+                return null;
+            }
+            int counter = 0;
+            int slot = instrumentor.isStatic ? 0 : 1;
+            for (Type argType : argTypes) {
+                String currentArgName = null;
+                if (instrumentor.localVarsBySlotArray.length > 0) {
+                    LocalVariableNode localVarNode = instrumentor.localVarsBySlotArray[slot];
+                    currentArgName = localVarNode != null ? localVarNode.name : null;
+                }
+                if (currentArgName == null) {
+                    // if argument names are not resolved correctly let's assign p+arg_index
+                    currentArgName = "p" + counter;
+                }
+                if (currentArgName.equals(head)) {
+                    VarInsnNode varInsnNode = new VarInsnNode(argType.getOpcode(Opcodes.ILOAD), slot);
+                    insnList.add(varInsnNode);
+                    // stack [arg]
+                    return new ASMHelper.Type(argType);
+                }
+                slot += argType.getSize();
+            }
+            return null;
+        }
+
+        private ASMHelper.Type tryRetrieveLocalVar(String head, InsnList insnList) {
+            for (LocalVariableNode varNode : instrumentor.methodNode.localVariables) {
+                if (varNode.name.equals(head)) {
+                    if (isInScope(instrumentor.methodNode, varNode, targetLocation)) {
+                        Type varType = Type.getType(varNode.desc);
+                        VarInsnNode varInsnNode = new VarInsnNode(varType.getOpcode(Opcodes.ILOAD), varNode.index);
+                        insnList.add(varInsnNode);
+                        // stack [local]
+                        return new ASMHelper.Type(varType);
+                    }
+                }
+            }
+            return null;
+        }
+
+        private ASMHelper.Type tryRetrieveField(
+                Type currentType, String fieldName, InsnList insnList, boolean useThisField) {
+            Class<?> clazz;
+            ASMHelper.Type returnType = null;
+            try {
+                String className;
+                String fieldDesc = null;
+                boolean isAccessible = true;
+                if (currentType.getInternalName().equals(instrumentor.classNode.name)) { // this
+                    className = instrumentor.classNode.name;
+                    List<FieldNode> fieldList =
+                            instrumentor.isStatic ? new ArrayList<>() : new ArrayList<>(instrumentor.classNode.fields);
+                    for (FieldNode fieldNode : fieldList) {
+                        if (fieldNode.name.equals(fieldName)) {
+                            if (isStaticField(fieldNode)) {
+                                continue; // or break?
+                            }
+                            fieldDesc = fieldNode.desc;
+                            if (fieldNode.signature != null) {
+                                returnType = decodeSignature(fieldNode.signature);
+                            } else {
+                                returnType = new ASMHelper.Type(Type.getType(fieldNode.desc));
+                            }
+                            if (useThisField) {
+                                insnList.add(new VarInsnNode(Opcodes.ALOAD, 0));
+                                // stack [this]
+                            }
+                            break;
+                        }
+                    }
+                } else {
+                    className = currentType.getClassName();
+                    clazz = ensureSafeClassLoad(
+                            className, getClassName(instrumentor.classNode.name), instrumentor.classLoader);
+                    Field declaredField = clazz.getDeclaredField(fieldName); // no parent fields!
+                    isAccessible = declaredField.isAccessible();
+                    fieldDesc = Type.getDescriptor(declaredField.getType());
+                    returnType = new ASMHelper.Type(Type.getType(declaredField.getType()));
+                }
+                if (fieldDesc == null) {
+                    return null;
+                }
+                // stack [target_object]
+                insnList.add(new InsnNode(Opcodes.DUP));
+                // stack [target_object, target_object]
+                LabelNode nullNode = new LabelNode();
+                insnList.add(new JumpInsnNode(Opcodes.IFNULL, nullNode));
+                if (isAccessible) {
+                    // stack [target_object]
+                    insnList.add(new FieldInsnNode(Opcodes.GETFIELD, className, fieldName, fieldDesc));
+                    // stack: [field_value]
+                } else {
+                    ldc(insnList, fieldName);
+                    // stack: [target_object, string]
+                    emitReflectiveCall(insnList, returnType, OBJECT_TYPE);
+                    int sort = returnType.getMainType().getSort();
+                    if (sort == org.objectweb.asm.Type.OBJECT || sort == org.objectweb.asm.Type.ARRAY) {
+                        insnList.add(new TypeInsnNode(
+                                Opcodes.CHECKCAST, returnType.getMainType().getInternalName()));
+                    }
+                }
+                // build null branch which will be added later after the call to emit metric
+                LabelNode gotoNode = new LabelNode();
+                nullBranch.add(new JumpInsnNode(Opcodes.GOTO, gotoNode));
+                nullBranch.add(nullNode);
+                nullBranch.add(new InsnNode(Opcodes.POP)); // target_object
+                nullBranch.add(new InsnNode(Opcodes.POP)); // metric name
+                nullBranch.add(new InsnNode(Opcodes.POP)); // metric kind
+                nullBranch.add(new InsnNode(Opcodes.POP)); // probeId
+                nullBranch.add(gotoNode);
+            } catch (Exception e) {
+                String message = "Cannot resolve field " + fieldName;
+                LOGGER.debug(message, e);
+                throw new InvalidValueException(message);
+            }
+            return returnType;
+        }
+
+        private ASMHelper.Type tryRetrieveSynthetic(String name, InsnList insnList) {
+            if (name.equals(ValueReferences.RETURN_REF)) {
+                if (instrumentor.metricProbe.getEvaluateAt() != MethodLocation.EXIT) {
+                    return null;
+                }
+                if (returnContext == null) {
+                    return null;
+                }
+                VarInsnNode varInsnNode = new VarInsnNode(returnContext.opLoad, returnContext.returnLocalVarIdx);
+                insnList.add(varInsnNode);
+                // stack [return_value]
+                return new ASMHelper.Type(returnContext.type);
+            }
+            if (name.equals(ValueReferences.DURATION_REF)) {
+                if (instrumentor.metricProbe.getEvaluateAt() != MethodLocation.EXIT) {
+                    return null;
+                }
+                // call System.nanoTime at the beginning of the method
+                if (durationStartVar == -1) {
+                    durationStartVar = instrumentor.newVar(LONG_TYPE);
+                    InsnList nanoTimeList = new InsnList();
+                    invokeStatic(nanoTimeList, Type.getType(System.class), "nanoTime", LONG_TYPE);
+                    nanoTimeList.add(new VarInsnNode(Opcodes.LSTORE, durationStartVar));
+                    durationStartLabel = new LabelNode();
+                    nanoTimeList.add(durationStartLabel);
+                    instrumentor.methodNode.instructions.insert(instrumentor.methodEnterLabel, nanoTimeList);
+                }
+                // diff nanoTime before calling metric
+                invokeStatic(insnList, Type.getType(System.class), "nanoTime", LONG_TYPE);
+                // stack [long]
+                insnList.add(new VarInsnNode(Opcodes.LLOAD, durationStartVar));
+                // stack [long, long]
+                insnList.add(new InsnNode(Opcodes.LSUB));
+                // stack [long]
+                insnList.add(new InsnNode(Opcodes.L2D));
+                // stack [double]
+                insnList.add(new LdcInsnNode(1_000_000D));
+                // stack [double, double]
+                insnList.add(new InsnNode(Opcodes.DDIV));
+                // stack [double]
+                return new ASMHelper.Type(DOUBLE_TYPE);
+            }
+            return null;
+        }
     }
-  }
 
-  private static class ReturnContext {
-    private final int returnLocalVarIdx;
-    private final int opLoad;
-    private final Type type;
+    private static class ReturnContext {
+        private final int returnLocalVarIdx;
+        private final int opLoad;
+        private final Type type;
 
-    public ReturnContext(int returnLocalVarIdx, int opLoad, Type type) {
-      this.returnLocalVarIdx = returnLocalVarIdx;
-      this.opLoad = opLoad;
-      this.type = type;
+        public ReturnContext(int returnLocalVarIdx, int opLoad, Type type) {
+            this.returnLocalVarIdx = returnLocalVarIdx;
+            this.opLoad = opLoad;
+            this.type = type;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MultiCapturedContextInstrumenter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MultiCapturedContextInstrumenter.java
index 71ec436e812..22b26b318b5 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MultiCapturedContextInstrumenter.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MultiCapturedContextInstrumenter.java
@@ -5,14 +5,14 @@
 import java.util.List;
 
 public class MultiCapturedContextInstrumenter extends CapturedContextInstrumenter {
-  public MultiCapturedContextInstrumenter(
-      ProbeDefinition definition,
-      MethodInfo methodInfo,
-      List<DiagnosticMessage> diagnostics,
-      List<Integer> probeIndices,
-      boolean captureSnapshot,
-      boolean captureEntry,
-      Limits limits) {
-    super(definition, methodInfo, diagnostics, probeIndices, captureSnapshot, captureEntry, limits);
-  }
+    public MultiCapturedContextInstrumenter(
+            ProbeDefinition definition,
+            MethodInfo methodInfo,
+            List<DiagnosticMessage> diagnostics,
+            List<Integer> probeIndices,
+            boolean captureSnapshot,
+            boolean captureEntry,
+            Limits limits) {
+        super(definition, methodInfo, diagnostics, probeIndices, captureSnapshot, captureEntry, limits);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/SingleCapturedContextInstrumenter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/SingleCapturedContextInstrumenter.java
index 7194e1ffce0..6a42c7b08dc 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/SingleCapturedContextInstrumenter.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/SingleCapturedContextInstrumenter.java
@@ -28,114 +28,106 @@
 
 /** Specialized version of {@link CapturedContextInstrumenter} for single probe */
 public class SingleCapturedContextInstrumenter extends CapturedContextInstrumenter {
-  private static final Logger LOGGER =
-      LoggerFactory.getLogger(SingleCapturedContextInstrumenter.class);
-  private final boolean captureSnapshot;
-  private final boolean captureEntry;
-  private final Limits limits;
+    private static final Logger LOGGER = LoggerFactory.getLogger(SingleCapturedContextInstrumenter.class);
+    private final boolean captureSnapshot;
+    private final boolean captureEntry;
+    private final Limits limits;
 
-  public SingleCapturedContextInstrumenter(
-      ProbeDefinition definition,
-      MethodInfo methodInfo,
-      List<DiagnosticMessage> diagnostics,
-      List<Integer> probeIndices,
-      boolean captureSnapshot,
-      boolean captureEntry,
-      Limits limits) {
-    super(definition, methodInfo, diagnostics, probeIndices, captureSnapshot, captureEntry, limits);
-    this.captureSnapshot = captureSnapshot;
-    this.captureEntry = captureEntry;
-    this.limits = limits;
-  }
+    public SingleCapturedContextInstrumenter(
+            ProbeDefinition definition,
+            MethodInfo methodInfo,
+            List<DiagnosticMessage> diagnostics,
+            List<Integer> probeIndices,
+            boolean captureSnapshot,
+            boolean captureEntry,
+            Limits limits) {
+        super(definition, methodInfo, diagnostics, probeIndices, captureSnapshot, captureEntry, limits);
+        this.captureSnapshot = captureSnapshot;
+        this.captureEntry = captureEntry;
+        this.limits = limits;
+    }
 
-  @Override
-  protected void addIsReadyToCaptureCall(InsnList insnList) {
-    ldc(insnList, Type.getObjectType(classNode.name));
-    // stack [class]
-    ldc(insnList, probeIndices.get(0));
-    // stack [class, int]
-    invokeStatic(
-        insnList,
-        DEBUGGER_CONTEXT_TYPE,
-        "isReadyToCapture",
-        Type.BOOLEAN_TYPE,
-        CLASS_TYPE,
-        Type.INT_TYPE);
-    // stack [boolean]
-  }
+    @Override
+    protected void addIsReadyToCaptureCall(InsnList insnList) {
+        ldc(insnList, Type.getObjectType(classNode.name));
+        // stack [class]
+        ldc(insnList, probeIndices.get(0));
+        // stack [class, int]
+        invokeStatic(insnList, DEBUGGER_CONTEXT_TYPE, "isReadyToCapture", Type.BOOLEAN_TYPE, CLASS_TYPE, Type.INT_TYPE);
+        // stack [boolean]
+    }
 
-  @Override
-  protected void addEvalContextCall(
-      InsnList insnList,
-      Snapshot.Kind snapshotKind,
-      AbstractInsnNode endLabel,
-      int timestampVar,
-      String methodLocation) {
-    // stack []
-    insnList.add(collectCapturedContext(snapshotKind, endLabel));
-    // stack: [capturedcontext]
-    ldc(insnList, Type.getObjectType(classNode.name));
-    // stack [capturedcontext, class]
-    if (timestampVar != -1) {
-      insnList.add(new VarInsnNode(Opcodes.LLOAD, timestampVar));
-    } else {
-      ldc(insnList, -1L);
+    @Override
+    protected void addEvalContextCall(
+            InsnList insnList,
+            Snapshot.Kind snapshotKind,
+            AbstractInsnNode endLabel,
+            int timestampVar,
+            String methodLocation) {
+        // stack []
+        insnList.add(collectCapturedContext(snapshotKind, endLabel));
+        // stack: [capturedcontext]
+        ldc(insnList, Type.getObjectType(classNode.name));
+        // stack [capturedcontext, class]
+        if (timestampVar != -1) {
+            insnList.add(new VarInsnNode(Opcodes.LLOAD, timestampVar));
+        } else {
+            ldc(insnList, -1L);
+        }
+        // stack [capturedcontext, class, long]
+        getStatic(insnList, METHOD_LOCATION_TYPE, methodLocation);
+        // stack [capturedcontext, class, long, methodlocation]
+        ldc(insnList, probeIndices.get(0));
+        // stack [capturedcontext, class, long, methodlocation, int]
+        invokeStatic(
+                insnList,
+                DEBUGGER_CONTEXT_TYPE,
+                "evalContext",
+                VOID_TYPE,
+                CAPTURED_CONTEXT_TYPE,
+                CLASS_TYPE,
+                LONG_TYPE,
+                METHOD_LOCATION_TYPE,
+                Type.INT_TYPE);
+        // stack []
     }
-    // stack [capturedcontext, class, long]
-    getStatic(insnList, METHOD_LOCATION_TYPE, methodLocation);
-    // stack [capturedcontext, class, long, methodlocation]
-    ldc(insnList, probeIndices.get(0));
-    // stack [capturedcontext, class, long, methodlocation, int]
-    invokeStatic(
-        insnList,
-        DEBUGGER_CONTEXT_TYPE,
-        "evalContext",
-        VOID_TYPE,
-        CAPTURED_CONTEXT_TYPE,
-        CLASS_TYPE,
-        LONG_TYPE,
-        METHOD_LOCATION_TYPE,
-        Type.INT_TYPE);
-    // stack []
-  }
 
-  @Override
-  protected void addEvalContextAndCommitCall(
-      Where.SourceLine sourceLine, InsnList insnList, LabelNode beforeLabel) {
-    insnList.add(collectCapturedContext(Snapshot.Kind.BEFORE, beforeLabel));
-    // stack [capturedcontext]
-    ldc(insnList, Type.getObjectType(classNode.name));
-    // stack [capturedcontext, class]
-    ldc(insnList, sourceLine.getFrom());
-    // stack [capturedcontext, class, int]
-    ldc(insnList, probeIndices.get(0));
-    // stack [capturedcontext, class, int, int]
-    invokeStatic(
-        insnList,
-        DEBUGGER_CONTEXT_TYPE,
-        "evalContextAndCommit",
-        VOID_TYPE,
-        CAPTURED_CONTEXT_TYPE,
-        CLASS_TYPE,
-        INT_TYPE,
-        INT_TYPE);
-    // stack []
-  }
+    @Override
+    protected void addEvalContextAndCommitCall(Where.SourceLine sourceLine, InsnList insnList, LabelNode beforeLabel) {
+        insnList.add(collectCapturedContext(Snapshot.Kind.BEFORE, beforeLabel));
+        // stack [capturedcontext]
+        ldc(insnList, Type.getObjectType(classNode.name));
+        // stack [capturedcontext, class]
+        ldc(insnList, sourceLine.getFrom());
+        // stack [capturedcontext, class, int]
+        ldc(insnList, probeIndices.get(0));
+        // stack [capturedcontext, class, int, int]
+        invokeStatic(
+                insnList,
+                DEBUGGER_CONTEXT_TYPE,
+                "evalContextAndCommit",
+                VOID_TYPE,
+                CAPTURED_CONTEXT_TYPE,
+                CLASS_TYPE,
+                INT_TYPE,
+                INT_TYPE);
+        // stack []
+    }
 
-  @Override
-  protected void addCommitCall(InsnList insnList) {
-    // stack [capturedcontext, capturedcontext, list]
-    ldc(insnList, probeIndices.get(0));
-    // stack [capturedcontext, capturedcontext, list, int]
-    invokeStatic(
-        insnList,
-        DEBUGGER_CONTEXT_TYPE,
-        "commit",
-        VOID_TYPE,
-        CAPTURED_CONTEXT_TYPE,
-        CAPTURED_CONTEXT_TYPE,
-        getType(List.class),
-        INT_TYPE);
-    // stack []
-  }
+    @Override
+    protected void addCommitCall(InsnList insnList) {
+        // stack [capturedcontext, capturedcontext, list]
+        ldc(insnList, probeIndices.get(0));
+        // stack [capturedcontext, capturedcontext, list, int]
+        invokeStatic(
+                insnList,
+                DEBUGGER_CONTEXT_TYPE,
+                "commit",
+                VOID_TYPE,
+                CAPTURED_CONTEXT_TYPE,
+                CAPTURED_CONTEXT_TYPE,
+                getType(List.class),
+                INT_TYPE);
+        // stack []
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/SpanInstrumenter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/SpanInstrumenter.java
index 24fef60ffad..f4ef328968c 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/SpanInstrumenter.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/SpanInstrumenter.java
@@ -26,142 +26,138 @@
 import org.objectweb.asm.tree.analysis.Frame;
 
 public class SpanInstrumenter extends Instrumenter {
-  private int spanVar;
+    private int spanVar;
 
-  public SpanInstrumenter(
-      SpanProbe spanProbe,
-      MethodInfo methodInfo,
-      List<DiagnosticMessage> diagnostics,
-      List<Integer> probeIndices) {
-    super(spanProbe, methodInfo, diagnostics, probeIndices);
-  }
-
-  @Override
-  public InstrumentationResult.Status instrument() {
-    if (definition.isLineProbe()) {
-      return addRangeSpan(classFileLines);
+    public SpanInstrumenter(
+            SpanProbe spanProbe,
+            MethodInfo methodInfo,
+            List<DiagnosticMessage> diagnostics,
+            List<Integer> probeIndices) {
+        super(spanProbe, methodInfo, diagnostics, probeIndices);
     }
-    spanVar = newVar(DEBUGGER_SPAN_TYPE);
-    Map<AbstractInsnNode, Frame<BasicValue>> frames =
-        ASMHelper.computeFrames(classNode.name, methodNode);
-    processInstructions(frames);
-    LabelNode initSpanLabel = new LabelNode();
-    InsnList insnList = createSpan(initSpanLabel);
-    LabelNode endLabel = new LabelNode();
-    methodNode.instructions.insert(methodNode.instructions.getLast(), endLabel);
-    LabelNode handlerLabel = new LabelNode();
-    InsnList handler = createCatchHandler(handlerLabel);
-    methodNode.instructions.add(handler);
-    methodNode.tryCatchBlocks.add(
-        new TryCatchBlockNode(initSpanLabel, endLabel, handlerLabel, null));
-    methodNode.instructions.insert(methodEnterLabel, insnList);
-    return InstrumentationResult.Status.INSTALLED;
-  }
-
-  private InsnList createCatchHandler(LabelNode handlerLabel) {
-    InsnList handler = new InsnList();
-    handler.add(handlerLabel);
-    // stack [exception]
-    handler.add(new InsnNode(Opcodes.DUP));
-    // stack [exception, exception]
-    handler.add(new VarInsnNode(Opcodes.ALOAD, spanVar));
-    // stack [exception, exception, span]
-    handler.add(new InsnNode(Opcodes.SWAP));
-    // stack [exception, span, exception]
-    invokeInterface(handler, DEBUGGER_SPAN_TYPE, "setError", Type.VOID_TYPE, THROWABLE_TYPE);
-    // stack [exception]
-    debuggerSpanFinish(handler);
-    handler.add(new InsnNode(Opcodes.ATHROW));
-    return handler;
-  }
 
-  private InsnList createSpan(LabelNode initSpanLabel) {
-    InsnList insnList = new InsnList();
-    ldc(insnList, definition.getProbeId().getEncodedId());
-    // stack: [string]
-    ldc(insnList, buildResourceName());
-    // stack: [string, string]
-    pushTags(insnList, addProbeIdWithTags(definition.getId(), definition.getTags()));
-    // stack: [string, string, tags]
-    invokeStatic(
-        insnList,
-        DEBUGGER_CONTEXT_TYPE,
-        "createSpan",
-        DEBUGGER_SPAN_TYPE,
-        STRING_TYPE,
-        STRING_TYPE,
-        Types.asArray(STRING_TYPE, 1)); // tags
-    // stack: [span]
-    insnList.add(new VarInsnNode(Opcodes.ASTORE, spanVar));
-    // stack: []
-    insnList.add(initSpanLabel);
-    return insnList;
-  }
+    @Override
+    public InstrumentationResult.Status instrument() {
+        if (definition.isLineProbe()) {
+            return addRangeSpan(classFileLines);
+        }
+        spanVar = newVar(DEBUGGER_SPAN_TYPE);
+        Map<AbstractInsnNode, Frame<BasicValue>> frames = ASMHelper.computeFrames(classNode.name, methodNode);
+        processInstructions(frames);
+        LabelNode initSpanLabel = new LabelNode();
+        InsnList insnList = createSpan(initSpanLabel);
+        LabelNode endLabel = new LabelNode();
+        methodNode.instructions.insert(methodNode.instructions.getLast(), endLabel);
+        LabelNode handlerLabel = new LabelNode();
+        InsnList handler = createCatchHandler(handlerLabel);
+        methodNode.instructions.add(handler);
+        methodNode.tryCatchBlocks.add(new TryCatchBlockNode(initSpanLabel, endLabel, handlerLabel, null));
+        methodNode.instructions.insert(methodEnterLabel, insnList);
+        return InstrumentationResult.Status.INSTALLED;
+    }
 
-  private InstrumentationResult.Status addRangeSpan(ClassFileLines classFileLines) {
-    Where.SourceLine[] targetLines = definition.getWhere().getSourceLines();
-    if (targetLines == null || targetLines.length == 0) {
-      reportError("Missing line(s) in probe definition.");
-      return InstrumentationResult.Status.ERROR;
+    private InsnList createCatchHandler(LabelNode handlerLabel) {
+        InsnList handler = new InsnList();
+        handler.add(handlerLabel);
+        // stack [exception]
+        handler.add(new InsnNode(Opcodes.DUP));
+        // stack [exception, exception]
+        handler.add(new VarInsnNode(Opcodes.ALOAD, spanVar));
+        // stack [exception, exception, span]
+        handler.add(new InsnNode(Opcodes.SWAP));
+        // stack [exception, span, exception]
+        invokeInterface(handler, DEBUGGER_SPAN_TYPE, "setError", Type.VOID_TYPE, THROWABLE_TYPE);
+        // stack [exception]
+        debuggerSpanFinish(handler);
+        handler.add(new InsnNode(Opcodes.ATHROW));
+        return handler;
     }
-    if (classFileLines.isEmpty()) {
-      reportError("Missing line debug information.");
-      return InstrumentationResult.Status.ERROR;
+
+    private InsnList createSpan(LabelNode initSpanLabel) {
+        InsnList insnList = new InsnList();
+        ldc(insnList, definition.getProbeId().getEncodedId());
+        // stack: [string]
+        ldc(insnList, buildResourceName());
+        // stack: [string, string]
+        pushTags(insnList, addProbeIdWithTags(definition.getId(), definition.getTags()));
+        // stack: [string, string, tags]
+        invokeStatic(
+                insnList,
+                DEBUGGER_CONTEXT_TYPE,
+                "createSpan",
+                DEBUGGER_SPAN_TYPE,
+                STRING_TYPE,
+                STRING_TYPE,
+                Types.asArray(STRING_TYPE, 1)); // tags
+        // stack: [span]
+        insnList.add(new VarInsnNode(Opcodes.ASTORE, spanVar));
+        // stack: []
+        insnList.add(initSpanLabel);
+        return insnList;
     }
-    for (Where.SourceLine sourceLine : targetLines) {
-      int from = sourceLine.getFrom();
-      int till = sourceLine.getTill();
-      if (from == till) {
-        reportError("Single line span is not supported, you need to provide a range.");
-        return InstrumentationResult.Status.ERROR;
-      }
-      LabelNode beforeLabel = classFileLines.getLineLabel(from);
-      LabelNode afterLabel = classFileLines.getLineLabel(till);
-      if (beforeLabel == null || afterLabel == null) {
-        reportError(
-            "No line info for " + (sourceLine.isSingleLine() ? "line " : "range ") + sourceLine);
-        return InstrumentationResult.Status.ERROR;
-      }
-      spanVar = newVar(DEBUGGER_SPAN_TYPE);
-      LabelNode initSpanLabel = new LabelNode();
-      InsnList createSpaninsnList = createSpan(initSpanLabel);
-      methodNode.instructions.insertBefore(beforeLabel.getNext(), createSpaninsnList);
-      LabelNode handlerLabel = new LabelNode();
-      InsnList handler = createCatchHandler(handlerLabel);
-      methodNode.instructions.add(handler);
-      methodNode.tryCatchBlocks.add(
-          new TryCatchBlockNode(initSpanLabel, afterLabel, handlerLabel, null));
-      InsnList finishSpanInsnList = new InsnList();
-      debuggerSpanFinish(finishSpanInsnList);
-      methodNode.instructions.insert(afterLabel, finishSpanInsnList);
+
+    private InstrumentationResult.Status addRangeSpan(ClassFileLines classFileLines) {
+        Where.SourceLine[] targetLines = definition.getWhere().getSourceLines();
+        if (targetLines == null || targetLines.length == 0) {
+            reportError("Missing line(s) in probe definition.");
+            return InstrumentationResult.Status.ERROR;
+        }
+        if (classFileLines.isEmpty()) {
+            reportError("Missing line debug information.");
+            return InstrumentationResult.Status.ERROR;
+        }
+        for (Where.SourceLine sourceLine : targetLines) {
+            int from = sourceLine.getFrom();
+            int till = sourceLine.getTill();
+            if (from == till) {
+                reportError("Single line span is not supported, you need to provide a range.");
+                return InstrumentationResult.Status.ERROR;
+            }
+            LabelNode beforeLabel = classFileLines.getLineLabel(from);
+            LabelNode afterLabel = classFileLines.getLineLabel(till);
+            if (beforeLabel == null || afterLabel == null) {
+                reportError("No line info for " + (sourceLine.isSingleLine() ? "line " : "range ") + sourceLine);
+                return InstrumentationResult.Status.ERROR;
+            }
+            spanVar = newVar(DEBUGGER_SPAN_TYPE);
+            LabelNode initSpanLabel = new LabelNode();
+            InsnList createSpaninsnList = createSpan(initSpanLabel);
+            methodNode.instructions.insertBefore(beforeLabel.getNext(), createSpaninsnList);
+            LabelNode handlerLabel = new LabelNode();
+            InsnList handler = createCatchHandler(handlerLabel);
+            methodNode.instructions.add(handler);
+            methodNode.tryCatchBlocks.add(new TryCatchBlockNode(initSpanLabel, afterLabel, handlerLabel, null));
+            InsnList finishSpanInsnList = new InsnList();
+            debuggerSpanFinish(finishSpanInsnList);
+            methodNode.instructions.insert(afterLabel, finishSpanInsnList);
+        }
+        return InstrumentationResult.Status.INSTALLED;
     }
-    return InstrumentationResult.Status.INSTALLED;
-  }
 
-  @Override
-  protected InsnList getReturnHandlerInsnList() {
-    InsnList insnList = new InsnList();
-    debuggerSpanFinish(insnList);
-    return insnList;
-  }
+    @Override
+    protected InsnList getReturnHandlerInsnList() {
+        InsnList insnList = new InsnList();
+        debuggerSpanFinish(insnList);
+        return insnList;
+    }
 
-  private void debuggerSpanFinish(InsnList insnList) {
-    insnList.add(new VarInsnNode(Opcodes.ALOAD, spanVar));
-    invokeInterface(insnList, DEBUGGER_SPAN_TYPE, "finish", Type.VOID_TYPE);
-  }
+    private void debuggerSpanFinish(InsnList insnList) {
+        insnList.add(new VarInsnNode(Opcodes.ALOAD, spanVar));
+        invokeInterface(insnList, DEBUGGER_SPAN_TYPE, "finish", Type.VOID_TYPE);
+    }
 
-  private String buildResourceName() {
-    String resourceName = stripPackagePath(classNode.name) + "." + methodNode.name;
-    if (definition.isLineProbe()) {
-      Where.SourceLine[] targetLines = definition.getWhere().getSourceLines();
-      if (targetLines == null || targetLines.length == 0) {
-        return resourceName;
-      }
-      if (classFileLines.isEmpty()) {
+    private String buildResourceName() {
+        String resourceName = stripPackagePath(classNode.name) + "." + methodNode.name;
+        if (definition.isLineProbe()) {
+            Where.SourceLine[] targetLines = definition.getWhere().getSourceLines();
+            if (targetLines == null || targetLines.length == 0) {
+                return resourceName;
+            }
+            if (classFileLines.isEmpty()) {
+                return resourceName;
+            }
+            return resourceName + ":L" + targetLines[0];
+        }
         return resourceName;
-      }
-      return resourceName + ":L" + targetLines[0];
     }
-    return resourceName;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/Types.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/Types.java
index c9f42e4d4b9..4cb86971f94 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/Types.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/Types.java
@@ -40,339 +40,323 @@
 
 /** ASM type constants used by code generating instrumentation */
 public final class Types {
-  private static final Map<String, String> PRIMITIVE_TYPES = new HashMap<>();
-  private static final Map<Type, Type> BOXING_TARGET_TYPES = new HashMap<>();
-
-  // common Type constants
-  public static final Type STRING_TYPE = Type.getType(String.class);
-  public static final Type OBJECT_ARRAY_TYPE = Type.getType(Object[].class);
-  public static final Type INT_ARRAY_TYPE = Type.getType(int[].class);
-  public static final Type STRING_ARRAY_TYPE = Type.getType(String[].class);
-  public static final Type OBJECT_TYPE = Type.getType(Object.class);
-  public static final Type COLLECTION_TYPE = Type.getType(Collection.class);
-  public static final Type MAP_TYPE = Type.getType(Map.class);
-  public static final Type HASHMAP_TYPE = Type.getType(HashMap.class);
-  public static final Type LINKEDHASHMAP_TYPE = Type.getType(LinkedHashMap.class);
-  public static final Type ARRAYLIST_TYPE = Type.getType(ArrayList.class);
-  public static final Type LINKEDLIST_TYPE = Type.getType(LinkedList.class);
-  public static final Type LIST_TYPE = Type.getType(List.class);
-  public static final Type HASHSET_TYPE = Type.getType(HashSet.class);
-  public static final Type SET_TYPE = Type.getType(Set.class);
-  public static final Type CAPTURED_VALUE = Type.getType(CapturedContext.CapturedValue.class);
-  public static final Type CAPTURED_CONTEXT_TYPE = Type.getType(CapturedContext.class);
-  public static final Type CAPTURE_THROWABLE_TYPE =
-      Type.getType(CapturedContext.CapturedThrowable.class);
-  public static final Type THROWABLE_TYPE = Type.getType(Throwable.class);
-  public static final Type DEBUGGER_CONTEXT_TYPE = Type.getType(DebuggerContext.class);
-  public static final Type METHOD_LOCATION_TYPE = Type.getType(MethodLocation.class);
-  public static final Type CLASS_TYPE = Type.getType(Class.class);
-  public static final Type DEBUGGER_SPAN_TYPE = Type.getType(DebuggerSpan.class);
-  public static final Type REFLECTIVE_FIELD_VALUE_RESOLVER_TYPE =
-      Type.getType(ReflectiveFieldValueResolver.class);
-  public static final Type METRICKIND_TYPE = Type.getType(DebuggerContext.MetricKind.class);
-  public static final Type PROBE_ID_TYPE = Type.getType(ProbeId.class);
-
-  // special initialization methods
-  public static final String CONSTRUCTOR = "<init>";
-  public static final String CLASS_INIT = "<clinit>";
-
-  static {
-    PRIMITIVE_TYPES.put("byte", Type.BYTE_TYPE.getInternalName());
-    PRIMITIVE_TYPES.put("char", Type.CHAR_TYPE.getInternalName());
-    PRIMITIVE_TYPES.put("short", Type.SHORT_TYPE.getInternalName());
-    PRIMITIVE_TYPES.put("int", Type.INT_TYPE.getInternalName());
-    PRIMITIVE_TYPES.put("long", Type.LONG_TYPE.getInternalName());
-    PRIMITIVE_TYPES.put("float", Type.FLOAT_TYPE.getInternalName());
-    PRIMITIVE_TYPES.put("double", Type.DOUBLE_TYPE.getInternalName());
-    PRIMITIVE_TYPES.put("boolean", Type.BOOLEAN_TYPE.getInternalName());
-    PRIMITIVE_TYPES.put("void", Type.VOID_TYPE.getInternalName());
-
-    BOXING_TARGET_TYPES.put(Type.BYTE_TYPE, Type.getType(Byte.class));
-    BOXING_TARGET_TYPES.put(Type.CHAR_TYPE, Type.getType(Character.class));
-    BOXING_TARGET_TYPES.put(Type.SHORT_TYPE, Type.getType(Short.class));
-    BOXING_TARGET_TYPES.put(Type.INT_TYPE, Type.getType(Integer.class));
-    BOXING_TARGET_TYPES.put(Type.LONG_TYPE, Type.getType(Long.class));
-    BOXING_TARGET_TYPES.put(Type.FLOAT_TYPE, Type.getType(Float.class));
-    BOXING_TARGET_TYPES.put(Type.DOUBLE_TYPE, Type.getType(Double.class));
-    BOXING_TARGET_TYPES.put(Type.BOOLEAN_TYPE, Type.getType(Boolean.class));
-  }
-
-  public static boolean isPrimitive(Type type) {
-    return type.getSort() != Type.ARRAY && type.getSort() != Type.OBJECT;
-  }
-
-  public static Type getBoxingTargetType(Type type) {
-    return BOXING_TARGET_TYPES.get(type);
-  }
-
-  public static boolean isArray(Type type) {
-    return type.getSort() == Type.ARRAY;
-  }
-
-  public static Type fromClassName(String className) {
-    StringBuilder internal = new StringBuilder();
-    int arrayMarker = className.indexOf("[]");
-    if (arrayMarker == -1) {
-      return Type.getType(getDescriptor(className));
+    private static final Map<String, String> PRIMITIVE_TYPES = new HashMap<>();
+    private static final Map<Type, Type> BOXING_TARGET_TYPES = new HashMap<>();
+
+    // common Type constants
+    public static final Type STRING_TYPE = Type.getType(String.class);
+    public static final Type OBJECT_ARRAY_TYPE = Type.getType(Object[].class);
+    public static final Type INT_ARRAY_TYPE = Type.getType(int[].class);
+    public static final Type STRING_ARRAY_TYPE = Type.getType(String[].class);
+    public static final Type OBJECT_TYPE = Type.getType(Object.class);
+    public static final Type COLLECTION_TYPE = Type.getType(Collection.class);
+    public static final Type MAP_TYPE = Type.getType(Map.class);
+    public static final Type HASHMAP_TYPE = Type.getType(HashMap.class);
+    public static final Type LINKEDHASHMAP_TYPE = Type.getType(LinkedHashMap.class);
+    public static final Type ARRAYLIST_TYPE = Type.getType(ArrayList.class);
+    public static final Type LINKEDLIST_TYPE = Type.getType(LinkedList.class);
+    public static final Type LIST_TYPE = Type.getType(List.class);
+    public static final Type HASHSET_TYPE = Type.getType(HashSet.class);
+    public static final Type SET_TYPE = Type.getType(Set.class);
+    public static final Type CAPTURED_VALUE = Type.getType(CapturedContext.CapturedValue.class);
+    public static final Type CAPTURED_CONTEXT_TYPE = Type.getType(CapturedContext.class);
+    public static final Type CAPTURE_THROWABLE_TYPE = Type.getType(CapturedContext.CapturedThrowable.class);
+    public static final Type THROWABLE_TYPE = Type.getType(Throwable.class);
+    public static final Type DEBUGGER_CONTEXT_TYPE = Type.getType(DebuggerContext.class);
+    public static final Type METHOD_LOCATION_TYPE = Type.getType(MethodLocation.class);
+    public static final Type CLASS_TYPE = Type.getType(Class.class);
+    public static final Type DEBUGGER_SPAN_TYPE = Type.getType(DebuggerSpan.class);
+    public static final Type REFLECTIVE_FIELD_VALUE_RESOLVER_TYPE = Type.getType(ReflectiveFieldValueResolver.class);
+    public static final Type METRICKIND_TYPE = Type.getType(DebuggerContext.MetricKind.class);
+    public static final Type PROBE_ID_TYPE = Type.getType(ProbeId.class);
+
+    // special initialization methods
+    public static final String CONSTRUCTOR = "<init>";
+    public static final String CLASS_INIT = "<clinit>";
+
+    static {
+        PRIMITIVE_TYPES.put("byte", Type.BYTE_TYPE.getInternalName());
+        PRIMITIVE_TYPES.put("char", Type.CHAR_TYPE.getInternalName());
+        PRIMITIVE_TYPES.put("short", Type.SHORT_TYPE.getInternalName());
+        PRIMITIVE_TYPES.put("int", Type.INT_TYPE.getInternalName());
+        PRIMITIVE_TYPES.put("long", Type.LONG_TYPE.getInternalName());
+        PRIMITIVE_TYPES.put("float", Type.FLOAT_TYPE.getInternalName());
+        PRIMITIVE_TYPES.put("double", Type.DOUBLE_TYPE.getInternalName());
+        PRIMITIVE_TYPES.put("boolean", Type.BOOLEAN_TYPE.getInternalName());
+        PRIMITIVE_TYPES.put("void", Type.VOID_TYPE.getInternalName());
+
+        BOXING_TARGET_TYPES.put(Type.BYTE_TYPE, Type.getType(Byte.class));
+        BOXING_TARGET_TYPES.put(Type.CHAR_TYPE, Type.getType(Character.class));
+        BOXING_TARGET_TYPES.put(Type.SHORT_TYPE, Type.getType(Short.class));
+        BOXING_TARGET_TYPES.put(Type.INT_TYPE, Type.getType(Integer.class));
+        BOXING_TARGET_TYPES.put(Type.LONG_TYPE, Type.getType(Long.class));
+        BOXING_TARGET_TYPES.put(Type.FLOAT_TYPE, Type.getType(Float.class));
+        BOXING_TARGET_TYPES.put(Type.DOUBLE_TYPE, Type.getType(Double.class));
+        BOXING_TARGET_TYPES.put(Type.BOOLEAN_TYPE, Type.getType(Boolean.class));
     }
-    if (arrayMarker == 0) {
-      return null;
+
+    public static boolean isPrimitive(Type type) {
+        return type.getSort() != Type.ARRAY && type.getSort() != Type.OBJECT;
     }
-    int dimensions = (className.length() - arrayMarker) / 2;
-    for (int i = 0; i < dimensions; i++) {
-      internal.append('[');
+
+    public static Type getBoxingTargetType(Type type) {
+        return BOXING_TARGET_TYPES.get(type);
     }
-    internal.append(getDescriptor(className.substring(0, arrayMarker)));
-    return Type.getType(internal.toString());
-  }
-
-  /**
-   * Turn the provided type into an array with the given number of dimensions
-   *
-   * @param element the array element type
-   * @param dimensions the number of dimensions
-   * @return a {@linkplain Type} instance representing an array of the given type
-   */
-  public static Type asArray(Type element, int dimensions) {
-    if (isArray(element)) {
-      return element;
+
+    public static boolean isArray(Type type) {
+        return type.getSort() == Type.ARRAY;
     }
-    if (dimensions == 0) {
-      return element;
+
+    public static Type fromClassName(String className) {
+        StringBuilder internal = new StringBuilder();
+        int arrayMarker = className.indexOf("[]");
+        if (arrayMarker == -1) {
+            return Type.getType(getDescriptor(className));
+        }
+        if (arrayMarker == 0) {
+            return null;
+        }
+        int dimensions = (className.length() - arrayMarker) / 2;
+        for (int i = 0; i < dimensions; i++) {
+            internal.append('[');
+        }
+        internal.append(getDescriptor(className.substring(0, arrayMarker)));
+        return Type.getType(internal.toString());
     }
-    StringBuilder newDesc = new StringBuilder();
-    for (int i = 0; i < dimensions; i++) {
-      newDesc.append('[');
+
+    /**
+     * Turn the provided type into an array with the given number of dimensions
+     *
+     * @param element the array element type
+     * @param dimensions the number of dimensions
+     * @return a {@linkplain Type} instance representing an array of the given type
+     */
+    public static Type asArray(Type element, int dimensions) {
+        if (isArray(element)) {
+            return element;
+        }
+        if (dimensions == 0) {
+            return element;
+        }
+        StringBuilder newDesc = new StringBuilder();
+        for (int i = 0; i < dimensions; i++) {
+            newDesc.append('[');
+        }
+        newDesc.append(element.getDescriptor());
+        return Type.getType(newDesc.toString());
     }
-    newDesc.append(element.getDescriptor());
-    return Type.getType(newDesc.toString());
-  }
-
-  private static String getDescriptor(String className) {
-    String t = PRIMITIVE_TYPES.get(className);
-    if (t != null) {
-      return t;
+
+    private static String getDescriptor(String className) {
+        String t = PRIMITIVE_TYPES.get(className);
+        if (t != null) {
+            return t;
+        }
+        return "L" + className.replace('.', '/') + ";";
     }
-    return "L" + className.replace('.', '/') + ";";
-  }
 
-  public static Type getArrayType(int arrayOpcode) {
-    switch (arrayOpcode) {
-      case IALOAD:
-      case IASTORE:
-        return Type.getType("[I");
+    public static Type getArrayType(int arrayOpcode) {
+        switch (arrayOpcode) {
+            case IALOAD:
+            case IASTORE:
+                return Type.getType("[I");
 
-      case BALOAD:
-      case BASTORE:
-        return Type.getType("[B");
+            case BALOAD:
+            case BASTORE:
+                return Type.getType("[B");
 
-      case AALOAD:
-      case AASTORE:
-        return OBJECT_ARRAY_TYPE;
+            case AALOAD:
+            case AASTORE:
+                return OBJECT_ARRAY_TYPE;
 
-      case CALOAD:
-      case CASTORE:
-        return Type.getType("[C");
+            case CALOAD:
+            case CASTORE:
+                return Type.getType("[C");
 
-      case FALOAD:
-      case FASTORE:
-        return Type.getType("[F");
+            case FALOAD:
+            case FASTORE:
+                return Type.getType("[F");
 
-      case SALOAD:
-      case SASTORE:
-        return Type.getType("[S");
+            case SALOAD:
+            case SASTORE:
+                return Type.getType("[S");
 
-      case LALOAD:
-      case LASTORE:
-        return Type.getType("[J");
+            case LALOAD:
+            case LASTORE:
+                return Type.getType("[J");
 
-      case DALOAD:
-      case DASTORE:
-        return Type.getType("[D");
+            case DALOAD:
+            case DASTORE:
+                return Type.getType("[D");
 
-      default:
-        throw new RuntimeException("invalid array opcode");
+            default:
+                throw new RuntimeException("invalid array opcode");
+        }
     }
-  }
 
-  public static Type getElementType(int arrayOpcode) {
-    switch (arrayOpcode) {
-      case IALOAD:
-      case IASTORE:
-        return Type.INT_TYPE;
+    public static Type getElementType(int arrayOpcode) {
+        switch (arrayOpcode) {
+            case IALOAD:
+            case IASTORE:
+                return Type.INT_TYPE;
 
-      case BALOAD:
-      case BASTORE:
-        return Type.BYTE_TYPE;
+            case BALOAD:
+            case BASTORE:
+                return Type.BYTE_TYPE;
 
-      case AALOAD:
-      case AASTORE:
-        return OBJECT_TYPE;
+            case AALOAD:
+            case AASTORE:
+                return OBJECT_TYPE;
 
-      case CALOAD:
-      case CASTORE:
-        return Type.CHAR_TYPE;
+            case CALOAD:
+            case CASTORE:
+                return Type.CHAR_TYPE;
 
-      case FALOAD:
-      case FASTORE:
-        return Type.FLOAT_TYPE;
+            case FALOAD:
+            case FASTORE:
+                return Type.FLOAT_TYPE;
 
-      case SALOAD:
-      case SASTORE:
-        return Type.SHORT_TYPE;
+            case SALOAD:
+            case SASTORE:
+                return Type.SHORT_TYPE;
 
-      case LALOAD:
-      case LASTORE:
-        return Type.LONG_TYPE;
+            case LALOAD:
+            case LASTORE:
+                return Type.LONG_TYPE;
 
-      case DALOAD:
-      case DASTORE:
-        return Type.DOUBLE_TYPE;
+            case DALOAD:
+            case DASTORE:
+                return Type.DOUBLE_TYPE;
 
-      default:
-        throw new RuntimeException("invalid array opcode");
+            default:
+                throw new RuntimeException("invalid array opcode");
+        }
     }
-  }
 
-  public static Type getFrameItemType(Object frameItem) {
-    if (frameItem instanceof Integer) {
-      if (Opcodes.TOP.equals(frameItem)) {
+    public static Type getFrameItemType(Object frameItem) {
+        if (frameItem instanceof Integer) {
+            if (Opcodes.TOP.equals(frameItem)) {
+                return null;
+            }
+            int frameItemKind = (int) frameItem;
+            switch (frameItemKind) {
+                case Opcodes.T_BYTE: {
+                    return Type.BYTE_TYPE;
+                }
+                case Opcodes.T_BOOLEAN: {
+                    return Type.BOOLEAN_TYPE;
+                }
+                case Opcodes.T_CHAR: {
+                    return Type.CHAR_TYPE;
+                }
+                case Opcodes.T_DOUBLE: {
+                    return Type.DOUBLE_TYPE;
+                }
+                case Opcodes.T_FLOAT: {
+                    return Type.FLOAT_TYPE;
+                }
+                case Opcodes.T_INT: {
+                    return Type.INT_TYPE;
+                }
+                case Opcodes.T_LONG: {
+                    return Type.LONG_TYPE;
+                }
+                case Opcodes.T_SHORT: {
+                    return Type.SHORT_TYPE;
+                }
+            }
+        } else if (frameItem instanceof String) {
+            return Type.getType((String) frameItem);
+        }
         return null;
-      }
-      int frameItemKind = (int) frameItem;
-      switch (frameItemKind) {
-        case Opcodes.T_BYTE:
-          {
-            return Type.BYTE_TYPE;
-          }
-        case Opcodes.T_BOOLEAN:
-          {
-            return Type.BOOLEAN_TYPE;
-          }
-        case Opcodes.T_CHAR:
-          {
-            return Type.CHAR_TYPE;
-          }
-        case Opcodes.T_DOUBLE:
-          {
-            return Type.DOUBLE_TYPE;
-          }
-        case Opcodes.T_FLOAT:
-          {
-            return Type.FLOAT_TYPE;
-          }
-        case Opcodes.T_INT:
-          {
-            return Type.INT_TYPE;
-          }
-        case Opcodes.T_LONG:
-          {
-            return Type.LONG_TYPE;
-          }
-        case Opcodes.T_SHORT:
-          {
-            return Type.SHORT_TYPE;
-          }
-      }
-    } else if (frameItem instanceof String) {
-      return Type.getType((String) frameItem);
-    }
-    return null;
-  }
-
-  /**
-   * Convert a Java-ish method signature in form of '&lt;return type&gt; (<&lt;rg_type_1&gt;, ...,
-   * &lt;arg_type_n&gt;)' into the method descriptor recoginzed by JVM.
-   *
-   * @param javaSignature the java method signature
-   * @return the JVM method descriptor
-   */
-  public static String descriptorFromSignature(String javaSignature) {
-    int leftParen = javaSignature.indexOf('(');
-    int rightParen = javaSignature.indexOf(')');
-    if (leftParen == -1 || rightParen == -1) {
-      throw new IllegalArgumentException(
-          String.format(
-              "Illegal java signature, missing matching parenthesis: '%s'. Must be of form '<return type> (<arg_type_1>, ..., <arg_type_n>)'",
-              javaSignature));
     }
 
-    StringBuilder buf = new StringBuilder();
-    String descriptor;
-
-    buf.append('(');
-    String args = javaSignature.substring(leftParen + 1, rightParen).trim();
-    StringTokenizer st = new StringTokenizer(args, ",");
-    if (!st.hasMoreTokens() && !args.isEmpty()) {
-      throw new IllegalArgumentException(
-          String.format(
-              "Illegal java signature, invalid argument format: '%s'. Must be of form '<return type> (<arg_type_1>, ..., <arg_type_n>)'",
-              javaSignature));
-    }
-    while (st.hasMoreTokens()) {
-      String arg = st.nextToken().trim();
-      if (arg.length() == 0) {
-        throw new IllegalArgumentException(
-            String.format(
-                "Illegal java signature, empty argument: '%s'. Must be of form '<return type> (<arg_type_1>, ..., <arg_type_n>)'",
-                javaSignature));
-      }
-      descriptor = PRIMITIVE_TYPES.get(arg);
-      if (descriptor == null) {
-        descriptor = objectOrArrayDesc(arg);
-      }
-      buf.append(descriptor);
-    }
-    buf.append(')');
-
-    String returnType = javaSignature.substring(0, leftParen).trim();
-    if (returnType.length() == 0) {
-      throw new IllegalArgumentException(
-          String.format(
-              "Illegal java signature: '%s'. Must be of form '<return type> (<arg_type_1>, ..., <arg_type_n>)'",
-              javaSignature));
+    /**
+     * Convert a Java-ish method signature in form of '&lt;return type&gt; (<&lt;rg_type_1&gt;, ...,
+     * &lt;arg_type_n&gt;)' into the method descriptor recoginzed by JVM.
+     *
+     * @param javaSignature the java method signature
+     * @return the JVM method descriptor
+     */
+    public static String descriptorFromSignature(String javaSignature) {
+        int leftParen = javaSignature.indexOf('(');
+        int rightParen = javaSignature.indexOf(')');
+        if (leftParen == -1 || rightParen == -1) {
+            throw new IllegalArgumentException(String.format(
+                    "Illegal java signature, missing matching parenthesis: '%s'. Must be of form '<return type> (<arg_type_1>, ..., <arg_type_n>)'",
+                    javaSignature));
+        }
+
+        StringBuilder buf = new StringBuilder();
+        String descriptor;
+
+        buf.append('(');
+        String args = javaSignature.substring(leftParen + 1, rightParen).trim();
+        StringTokenizer st = new StringTokenizer(args, ",");
+        if (!st.hasMoreTokens() && !args.isEmpty()) {
+            throw new IllegalArgumentException(String.format(
+                    "Illegal java signature, invalid argument format: '%s'. Must be of form '<return type> (<arg_type_1>, ..., <arg_type_n>)'",
+                    javaSignature));
+        }
+        while (st.hasMoreTokens()) {
+            String arg = st.nextToken().trim();
+            if (arg.length() == 0) {
+                throw new IllegalArgumentException(String.format(
+                        "Illegal java signature, empty argument: '%s'. Must be of form '<return type> (<arg_type_1>, ..., <arg_type_n>)'",
+                        javaSignature));
+            }
+            descriptor = PRIMITIVE_TYPES.get(arg);
+            if (descriptor == null) {
+                descriptor = objectOrArrayDesc(arg);
+            }
+            buf.append(descriptor);
+        }
+        buf.append(')');
+
+        String returnType = javaSignature.substring(0, leftParen).trim();
+        if (returnType.length() == 0) {
+            throw new IllegalArgumentException(String.format(
+                    "Illegal java signature: '%s'. Must be of form '<return type> (<arg_type_1>, ..., <arg_type_n>)'",
+                    javaSignature));
+        }
+        descriptor = PRIMITIVE_TYPES.get(returnType);
+        if (descriptor == null) {
+            descriptor = objectOrArrayDesc(returnType);
+        }
+        buf.append(descriptor);
+        return buf.toString();
     }
-    descriptor = PRIMITIVE_TYPES.get(returnType);
-    if (descriptor == null) {
-      descriptor = objectOrArrayDesc(returnType);
-    }
-    buf.append(descriptor);
-    return buf.toString();
-  }
-
-  public static String descriptorToSignature(String desc) {
-    Type[] argumentTypes = Type.getArgumentTypes(desc);
-    return Arrays.stream(argumentTypes)
-        .map(Type::getClassName)
-        .collect(Collectors.joining(", ", "(", ")"));
-  }
-
-  /**
-   * Turn a type specified in Java syntax (eg. {@literal int}, {@literal java.lang.String} or
-   * {@literal java.lang.String[]}) into the corresponding JVM type descriptor.
-   *
-   * @param javaType the type in Java syntax
-   * @return the JVM type descriptor
-   */
-  public static String objectOrArrayDesc(String javaType) {
-    StringBuilder buf = new StringBuilder();
-    int index = 0;
-    while ((index = javaType.indexOf("[]", index) + 1) > 0) {
-      buf.append('[');
+
+    public static String descriptorToSignature(String desc) {
+        Type[] argumentTypes = Type.getArgumentTypes(desc);
+        return Arrays.stream(argumentTypes).map(Type::getClassName).collect(Collectors.joining(", ", "(", ")"));
     }
-    String t = javaType.substring(0, javaType.length() - buf.length() * 2);
-    String desc = PRIMITIVE_TYPES.get(t);
-    if (desc != null) {
-      buf.append(desc);
-    } else {
-      buf.append('L');
-      if (t.indexOf('.') < 0) {
-        buf.append(t);
-      } else {
-        buf.append(t.replace('.', '/'));
-      }
-      buf.append(';');
+
+    /**
+     * Turn a type specified in Java syntax (eg. {@literal int}, {@literal java.lang.String} or
+     * {@literal java.lang.String[]}) into the corresponding JVM type descriptor.
+     *
+     * @param javaType the type in Java syntax
+     * @return the JVM type descriptor
+     */
+    public static String objectOrArrayDesc(String javaType) {
+        StringBuilder buf = new StringBuilder();
+        int index = 0;
+        while ((index = javaType.indexOf("[]", index) + 1) > 0) {
+            buf.append('[');
+        }
+        String t = javaType.substring(0, javaType.length() - buf.length() * 2);
+        String desc = PRIMITIVE_TYPES.get(t);
+        if (desc != null) {
+            buf.append(desc);
+        } else {
+            buf.append('L');
+            if (t.indexOf('.') < 0) {
+                buf.append(t);
+            } else {
+                buf.append(t.replace('.', '/'));
+            }
+            buf.append(';');
+        }
+        return buf.toString();
     }
-    return buf.toString();
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java
index c8d6e4a49e2..51dabaabed9 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java
@@ -28,104 +28,100 @@
 import org.slf4j.LoggerFactory;
 
 public class CodeOriginProbe extends ProbeDefinition {
-  private static final Logger LOGGER = LoggerFactory.getLogger(CodeOriginProbe.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CodeOriginProbe.class);
 
-  private final boolean entrySpanProbe;
-  private String signature;
+    private final boolean entrySpanProbe;
+    private String signature;
 
-  public CodeOriginProbe(ProbeId probeId, boolean entry, Where where) {
-    super(LANGUAGE, probeId, (Tag[]) null, where, MethodLocation.ENTRY);
-    this.entrySpanProbe = entry;
-  }
-
-  @Override
-  public Status instrument(
-      MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices) {
-    return new CodeOriginInstrumenter(this, methodInfo, probeIndices).instrument();
-  }
-
-  @Override
-  public void commit(
-      CapturedContext entryContext,
-      CapturedContext exitContext,
-      List<CapturedThrowable> caughtExceptions) {
-    AgentSpan span = AgentTracer.activeSpan();
-    if (span == null) {
-      LOGGER.debug("Could not find the span for probeId {}", id);
-      return;
+    public CodeOriginProbe(ProbeId probeId, boolean entry, Where where) {
+        super(LANGUAGE, probeId, (Tag[]) null, where, MethodLocation.ENTRY);
+        this.entrySpanProbe = entry;
     }
-    List<AgentSpan> agentSpans =
-        entrySpanProbe ? asList(span, span.getLocalRootSpan()) : singletonList(span);
 
-    if (location == null) {
-      LOGGER.debug("Code origin probe {} has no location", id);
-      return;
+    @Override
+    public Status instrument(MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices) {
+        return new CodeOriginInstrumenter(this, methodInfo, probeIndices).instrument();
     }
-    for (AgentSpan s : agentSpans) {
-      if (s.getTag(DD_CODE_ORIGIN_TYPE) == null) {
-        s.setTag(DD_CODE_ORIGIN_TYPE, entrySpanProbe ? "entry" : "exit");
-        s.setTag(DD_CODE_ORIGIN_FRAME_FILE, location.getFile());
-        s.setTag(DD_CODE_ORIGIN_FRAME_METHOD, location.getMethod());
-        s.setTag(DD_CODE_ORIGIN_FRAME_LINE, location.getLines().get(0));
-        s.setTag(DD_CODE_ORIGIN_FRAME_TYPE, location.getType());
-        s.setTag(DD_CODE_ORIGIN_FRAME_SIGNATURE, signature);
-      }
+
+    @Override
+    public void commit(
+            CapturedContext entryContext, CapturedContext exitContext, List<CapturedThrowable> caughtExceptions) {
+        AgentSpan span = AgentTracer.activeSpan();
+        if (span == null) {
+            LOGGER.debug("Could not find the span for probeId {}", id);
+            return;
+        }
+        List<AgentSpan> agentSpans = entrySpanProbe ? asList(span, span.getLocalRootSpan()) : singletonList(span);
+
+        if (location == null) {
+            LOGGER.debug("Code origin probe {} has no location", id);
+            return;
+        }
+        for (AgentSpan s : agentSpans) {
+            if (s.getTag(DD_CODE_ORIGIN_TYPE) == null) {
+                s.setTag(DD_CODE_ORIGIN_TYPE, entrySpanProbe ? "entry" : "exit");
+                s.setTag(DD_CODE_ORIGIN_FRAME_FILE, location.getFile());
+                s.setTag(DD_CODE_ORIGIN_FRAME_METHOD, location.getMethod());
+                s.setTag(DD_CODE_ORIGIN_FRAME_LINE, location.getLines().get(0));
+                s.setTag(DD_CODE_ORIGIN_FRAME_TYPE, location.getType());
+                s.setTag(DD_CODE_ORIGIN_FRAME_SIGNATURE, signature);
+            }
+        }
     }
-  }
 
-  public boolean entrySpanProbe() {
-    return entrySpanProbe;
-  }
+    public boolean entrySpanProbe() {
+        return entrySpanProbe;
+    }
 
-  @Override
-  public void buildLocation(MethodInfo methodInfo) {
-    String type = where.getTypeName();
-    String method = where.getMethodName();
-    List<String> lines = where.getLines() != null ? asList(where.getLines()) : null;
+    @Override
+    public void buildLocation(MethodInfo methodInfo) {
+        String type = where.getTypeName();
+        String method = where.getMethodName();
+        List<String> lines = where.getLines() != null ? asList(where.getLines()) : null;
 
-    String file = where.getSourceFile();
+        String file = where.getSourceFile();
 
-    if (methodInfo != null) {
-      type = methodInfo.getTypeName();
-      method = methodInfo.getMethodName();
-      if (entrySpanProbe || where.getLines() == null) {
-        lines = singletonList(String.valueOf(methodInfo.getMethodStart()));
-      }
-      if (file == null) {
-        file = methodInfo.getSourceFileName();
-      }
-      signature = methodInfo.getSignature();
+        if (methodInfo != null) {
+            type = methodInfo.getTypeName();
+            method = methodInfo.getMethodName();
+            if (entrySpanProbe || where.getLines() == null) {
+                lines = singletonList(String.valueOf(methodInfo.getMethodStart()));
+            }
+            if (file == null) {
+                file = methodInfo.getSourceFileName();
+            }
+            signature = methodInfo.getSignature();
+        }
+        this.location = new ProbeLocation(type, method, file, lines);
     }
-    this.location = new ProbeLocation(type, method, file, lines);
-  }
 
-  @Generated
-  @Override
-  public boolean equals(Object o) {
-    if (o == null || getClass() != o.getClass()) return false;
-    CodeOriginProbe that = (CodeOriginProbe) o;
-    return Objects.equals(language, that.language)
-        && Objects.equals(id, that.id)
-        && version == that.version
-        && Arrays.equals(tags, that.tags)
-        && Objects.equals(tagMap, that.tagMap)
-        && Objects.equals(where, that.where)
-        && Objects.equals(evaluateAt, that.evaluateAt)
-        && entrySpanProbe == that.entrySpanProbe;
-  }
+    @Generated
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        CodeOriginProbe that = (CodeOriginProbe) o;
+        return Objects.equals(language, that.language)
+                && Objects.equals(id, that.id)
+                && version == that.version
+                && Arrays.equals(tags, that.tags)
+                && Objects.equals(tagMap, that.tagMap)
+                && Objects.equals(where, that.where)
+                && Objects.equals(evaluateAt, that.evaluateAt)
+                && entrySpanProbe == that.entrySpanProbe;
+    }
 
-  @Generated
-  @Override
-  public int hashCode() {
-    int result = Objects.hash(language, id, version, tagMap, where, evaluateAt, entrySpanProbe);
-    result = 31 * result + Arrays.hashCode(tags);
-    return result;
-  }
+    @Generated
+    @Override
+    public int hashCode() {
+        int result = Objects.hash(language, id, version, tagMap, where, evaluateAt, entrySpanProbe);
+        result = 31 * result + Arrays.hashCode(tags);
+        return result;
+    }
 
-  @Override
-  public String toString() {
-    return String.format(
-        "CodeOriginProbe{probeId=%s, entrySpanProbe=%s, signature=%s, where=%s, location=%s}",
-        getProbeId(), entrySpanProbe, signature, where, location);
-  }
+    @Override
+    public String toString() {
+        return String.format(
+                "CodeOriginProbe{probeId=%s, entrySpanProbe=%s, signature=%s, where=%s, location=%s}",
+                getProbeId(), entrySpanProbe, signature, where, location);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/DebugSessionStatus.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/DebugSessionStatus.java
index 4497a1f8d58..9dc03319225 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/DebugSessionStatus.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/DebugSessionStatus.java
@@ -1,24 +1,24 @@
 package com.datadog.debugger.probe;
 
 public enum DebugSessionStatus {
-  NONE {
-    @Override
+    NONE {
+        @Override
+        public boolean isDefined() {
+            return false;
+        }
+    },
+    ACTIVE,
+    DISABLED;
+
     public boolean isDefined() {
-      return false;
+        return true;
     }
-  },
-  ACTIVE,
-  DISABLED;
-
-  public boolean isDefined() {
-    return true;
-  }
 
-  public boolean isDisabled() {
-    return this == DISABLED;
-  }
+    public boolean isDisabled() {
+        return this == DISABLED;
+    }
 
-  public boolean isActive() {
-    return this == ACTIVE;
-  }
+    public boolean isActive() {
+        return this == ACTIVE;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ExceptionProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ExceptionProbe.java
index b14073de0be..04585dc1ff3 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ExceptionProbe.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ExceptionProbe.java
@@ -25,181 +25,179 @@
 import org.slf4j.LoggerFactory;
 
 public class ExceptionProbe extends LogProbe implements ForceMethodInstrumentation {
-  private static final Logger LOGGER = LoggerFactory.getLogger(ExceptionProbe.class);
-  private final transient ExceptionProbeManager exceptionProbeManager;
-  private final transient int chainedExceptionIdx;
-
-  public ExceptionProbe(
-      ProbeId probeId,
-      Where where,
-      Capture capture,
-      Sampling sampling,
-      ExceptionProbeManager exceptionProbeManager,
-      int chainedExceptionIdx) {
-    super(
-        LANGUAGE,
-        probeId,
-        null,
-        where,
-        MethodLocation.EXIT,
-        null,
-        null,
-        true,
-        // forcing a useless condition to be instrumented with captureEntry=false
-        new ProbeCondition(DSL.when(DSL.TRUE), "true"),
-        capture,
-        sampling,
-        null,
-        Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout()));
-    this.exceptionProbeManager = exceptionProbeManager;
-    this.chainedExceptionIdx = chainedExceptionIdx;
-    initSamplers();
-  }
-
-  @Override
-  public InstrumentationResult.Status instrument(
-      MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices) {
-    return new ExceptionInstrumenter(this, methodInfo, diagnostics, probeIndices).instrument();
-  }
-
-  @Override
-  public boolean isLineProbe() {
-    // Exception probe are always method probe even if there is a line number
-    return false;
-  }
-
-  @Override
-  protected boolean useCoordinatedSampling() {
-    // exception probes have their own independent exception sampling flow and must not share a
-    // trace-wide sampling decision with ordinary snapshot probes on the same local root span.
-    return false;
-  }
-
-  @Override
-  public CapturedContext.Status createStatus() {
-    return new ExceptionProbeStatus(this);
-  }
-
-  @Override
-  public void evaluate(
-      CapturedContext context,
-      CapturedContext.Status status,
-      MethodLocation methodLocation,
-      boolean singleProbe) {
-    ExceptionProbeStatus exceptionStatus;
-    if (status instanceof ExceptionProbeStatus) {
-      exceptionStatus = (ExceptionProbeStatus) status;
-      exceptionStatus.setCapture(false);
-    } else {
-      throw new IllegalStateException("Invalid status: " + status.getClass());
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExceptionProbe.class);
+    private final transient ExceptionProbeManager exceptionProbeManager;
+    private final transient int chainedExceptionIdx;
+
+    public ExceptionProbe(
+            ProbeId probeId,
+            Where where,
+            Capture capture,
+            Sampling sampling,
+            ExceptionProbeManager exceptionProbeManager,
+            int chainedExceptionIdx) {
+        super(
+                LANGUAGE,
+                probeId,
+                null,
+                where,
+                MethodLocation.EXIT,
+                null,
+                null,
+                true,
+                // forcing a useless condition to be instrumented with captureEntry=false
+                new ProbeCondition(DSL.when(DSL.TRUE), "true"),
+                capture,
+                sampling,
+                null,
+                Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout()));
+        this.exceptionProbeManager = exceptionProbeManager;
+        this.chainedExceptionIdx = chainedExceptionIdx;
+        initSamplers();
     }
-    if (methodLocation != MethodLocation.EXIT) {
-      return;
-    }
-    if (context.getCapturedThrowable() == null) {
-      return;
+
+    @Override
+    public InstrumentationResult.Status instrument(
+            MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices) {
+        return new ExceptionInstrumenter(this, methodInfo, diagnostics, probeIndices).instrument();
     }
-    Throwable throwable = context.getCapturedThrowable().getThrowable();
-    if (throwable == null) {
-      LOGGER.debug("Throwable cleared by GC");
-      return;
+
+    @Override
+    public boolean isLineProbe() {
+        // Exception probe are always method probe even if there is a line number
+        return false;
     }
-    Throwable innerMostThrowable = getInnerMostThrowable(throwable);
-    if (innerMostThrowable == null) {
-      LOGGER.debug("Cannot get inner most throwable (cycle?)");
-      return;
+
+    @Override
+    protected boolean useCoordinatedSampling() {
+        // exception probes have their own independent exception sampling flow and must not share a
+        // trace-wide sampling decision with ordinary snapshot probes on the same local root span.
+        return false;
     }
-    if (innerMostThrowable.getStackTrace().length == 0) {
-      LOGGER.debug("Exception with no stacktrace, FastThrow?");
-      return;
+
+    @Override
+    public CapturedContext.Status createStatus() {
+        return new ExceptionProbeStatus(this);
     }
-    String fingerprint =
-        Fingerprinter.fingerprint(innerMostThrowable, exceptionProbeManager.getClassNameFilter());
-    if (fingerprint == null) {
-      // Fingerprinter.fingerprint already logged why in debug
-      return;
+
+    @Override
+    public void evaluate(
+            CapturedContext context,
+            CapturedContext.Status status,
+            MethodLocation methodLocation,
+            boolean singleProbe) {
+        ExceptionProbeStatus exceptionStatus;
+        if (status instanceof ExceptionProbeStatus) {
+            exceptionStatus = (ExceptionProbeStatus) status;
+            exceptionStatus.setCapture(false);
+        } else {
+            throw new IllegalStateException("Invalid status: " + status.getClass());
+        }
+        if (methodLocation != MethodLocation.EXIT) {
+            return;
+        }
+        if (context.getCapturedThrowable() == null) {
+            return;
+        }
+        Throwable throwable = context.getCapturedThrowable().getThrowable();
+        if (throwable == null) {
+            LOGGER.debug("Throwable cleared by GC");
+            return;
+        }
+        Throwable innerMostThrowable = getInnerMostThrowable(throwable);
+        if (innerMostThrowable == null) {
+            LOGGER.debug("Cannot get inner most throwable (cycle?)");
+            return;
+        }
+        if (innerMostThrowable.getStackTrace().length == 0) {
+            LOGGER.debug("Exception with no stacktrace, FastThrow?");
+            return;
+        }
+        String fingerprint = Fingerprinter.fingerprint(innerMostThrowable, exceptionProbeManager.getClassNameFilter());
+        if (fingerprint == null) {
+            // Fingerprinter.fingerprint already logged why in debug
+            return;
+        }
+        if (exceptionProbeManager.shouldCaptureException(fingerprint)) {
+            LOGGER.debug("Capturing exception matching fingerprint: {}", fingerprint);
+            // capture only on uncaught exception matching the fingerprint
+            ExceptionProbeManager.ThrowableState state = exceptionProbeManager.getStateByThrowable(innerMostThrowable);
+            if (state != null) {
+                // Already unwinding the exception
+                if (state.getSnapshots().isEmpty()) {
+                    // skip snapshot because no snapshot from previous stack level
+                    return;
+                }
+                // Force for coordinated sampling
+                exceptionStatus.setForceSampling(true);
+            }
+            exceptionStatus.setCapture(true);
+            super.evaluate(context, status, methodLocation, singleProbe);
+        }
     }
-    if (exceptionProbeManager.shouldCaptureException(fingerprint)) {
-      LOGGER.debug("Capturing exception matching fingerprint: {}", fingerprint);
-      // capture only on uncaught exception matching the fingerprint
-      ExceptionProbeManager.ThrowableState state =
-          exceptionProbeManager.getStateByThrowable(innerMostThrowable);
-      if (state != null) {
-        // Already unwinding the exception
-        if (state.getSnapshots().isEmpty()) {
-          // skip snapshot because no snapshot from previous stack level
-          return;
+
+    @Override
+    public void commit(
+            CapturedContext entryContext,
+            CapturedContext exitContext,
+            List<CapturedContext.CapturedThrowable> caughtExceptions) {
+        Snapshot snapshot = createSnapshot();
+        boolean shouldCommit = fillSnapshot(entryContext, exitContext, caughtExceptions, snapshot);
+        if (shouldCommit) {
+            /*
+             * Record stack trace having the caller of this method as 'top' frame.
+             * For this it is necessary to discard:
+             * - Thread.currentThread().getStackTrace()
+             * - Snapshot.recordStackTrace()
+             * - ExceptionProbe.commit()
+             * - DebuggerContext.commit()
+             */
+            snapshot.recordStackTrace(4);
+            // clear any strong ref to the exception before adding the snapshot to avoid leaking snapshots
+            // inside the stateByThrowable map
+            clearExceptionRefs(snapshot);
+            // add snapshot for later to wait for triggering point (ExceptionDebugger::handleException)
+            snapshot.setChainedExceptionIdx(chainedExceptionIdx);
+            exceptionProbeManager.addSnapshot(snapshot);
+            LOGGER.debug(
+                    "committing exception probe id={}, snapshot id={}, exception id={}",
+                    id,
+                    snapshot.getId(),
+                    snapshot.getExceptionId());
         }
-        // Force for coordinated sampling
-        exceptionStatus.setForceSampling(true);
-      }
-      exceptionStatus.setCapture(true);
-      super.evaluate(context, status, methodLocation, singleProbe);
     }
-  }
-
-  @Override
-  public void commit(
-      CapturedContext entryContext,
-      CapturedContext exitContext,
-      List<CapturedContext.CapturedThrowable> caughtExceptions) {
-    Snapshot snapshot = createSnapshot();
-    boolean shouldCommit = fillSnapshot(entryContext, exitContext, caughtExceptions, snapshot);
-    if (shouldCommit) {
-      /*
-       * Record stack trace having the caller of this method as 'top' frame.
-       * For this it is necessary to discard:
-       * - Thread.currentThread().getStackTrace()
-       * - Snapshot.recordStackTrace()
-       * - ExceptionProbe.commit()
-       * - DebuggerContext.commit()
-       */
-      snapshot.recordStackTrace(4);
-      // clear any strong ref to the exception before adding the snapshot to avoid leaking snapshots
-      // inside the stateByThrowable map
-      clearExceptionRefs(snapshot);
-      // add snapshot for later to wait for triggering point (ExceptionDebugger::handleException)
-      snapshot.setChainedExceptionIdx(chainedExceptionIdx);
-      exceptionProbeManager.addSnapshot(snapshot);
-      LOGGER.debug(
-          "committing exception probe id={}, snapshot id={}, exception id={}",
-          id,
-          snapshot.getId(),
-          snapshot.getExceptionId());
+
+    private void clearExceptionRefs(Snapshot snapshot) {
+        snapshot.getCaptures().getReturn().getLocals().remove(ValueReferences.EXCEPTION_REF);
+        snapshot.getCaptures().getReturn().removeExtension(ValueReferences.EXCEPTION_EXTENSION_NAME);
     }
-  }
-
-  private void clearExceptionRefs(Snapshot snapshot) {
-    snapshot.getCaptures().getReturn().getLocals().remove(ValueReferences.EXCEPTION_REF);
-    snapshot.getCaptures().getReturn().removeExtension(ValueReferences.EXCEPTION_EXTENSION_NAME);
-  }
-
-  @Override
-  public void buildLocation(MethodInfo methodInfo) {
-    String type = where.getTypeName();
-    String method = where.getMethodName();
-    if (methodInfo != null) {
-      type = methodInfo.getTypeName();
-      method = methodInfo.getMethodName();
+
+    @Override
+    public void buildLocation(MethodInfo methodInfo) {
+        String type = where.getTypeName();
+        String method = where.getMethodName();
+        if (methodInfo != null) {
+            type = methodInfo.getTypeName();
+            method = methodInfo.getMethodName();
+        }
+        // drop line number for exception probe
+        this.location = new ProbeLocation(type, method, where.getSourceFile(), emptyList());
     }
-    // drop line number for exception probe
-    this.location = new ProbeLocation(type, method, where.getSourceFile(), emptyList());
-  }
 
-  public static class ExceptionProbeStatus extends LogStatus {
-    private boolean capture = true; // default to true for status entry when mixed with log probe
+    public static class ExceptionProbeStatus extends LogStatus {
+        private boolean capture = true; // default to true for status entry when mixed with log probe
 
-    public ExceptionProbeStatus(ProbeImplementation probeImplementation) {
-      super(probeImplementation);
-    }
+        public ExceptionProbeStatus(ProbeImplementation probeImplementation) {
+            super(probeImplementation);
+        }
 
-    public void setCapture(boolean capture) {
-      this.capture = capture;
-    }
+        public void setCapture(boolean capture) {
+            this.capture = capture;
+        }
 
-    @Override
-    public boolean shouldSend() {
-      return super.shouldSend() && capture;
+        @Override
+        public boolean shouldSend() {
+            return super.shouldSend() && capture;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java
index 16025bb7e1f..c6e34a1a44f 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java
@@ -65,1275 +65,1239 @@
 
 /** Stores definition of a log probe */
 public class LogProbe extends ProbeDefinition implements Sampled, CapturedContextProbe {
-  private static final Logger LOGGER = LoggerFactory.getLogger(LogProbe.class);
-  private static final Limits LIMITS = new Limits(1, 3, 8192, 5);
-  private static final int LOG_MSG_LIMIT = 8192;
-  private static final ContextKey<CoordinatedSamplingState> SAMPLING_KEY =
-      ContextKey.named("debugger_sampling");
-  public static final int CAPTURING_PROBE_BUDGET = 10;
-  public static final int NON_CAPTURING_PROBE_BUDGET = 1000;
-
-  /** Stores part of a templated message either a str or an expression */
-  public static class Segment {
-    private final String str;
-    private final ValueScript parsedExpr;
-
-    public Segment(String str) {
-      this.str = str;
-      this.parsedExpr = null;
-    }
+    private static final Logger LOGGER = LoggerFactory.getLogger(LogProbe.class);
+    private static final Limits LIMITS = new Limits(1, 3, 8192, 5);
+    private static final int LOG_MSG_LIMIT = 8192;
+    private static final ContextKey<CoordinatedSamplingState> SAMPLING_KEY = ContextKey.named("debugger_sampling");
+    public static final int CAPTURING_PROBE_BUDGET = 10;
+    public static final int NON_CAPTURING_PROBE_BUDGET = 1000;
+
+    /** Stores part of a templated message either a str or an expression */
+    public static class Segment {
+        private final String str;
+        private final ValueScript parsedExpr;
+
+        public Segment(String str) {
+            this.str = str;
+            this.parsedExpr = null;
+        }
 
-    public Segment(ValueScript valueScript) {
-      this.str = null;
-      this.parsedExpr = valueScript;
-    }
+        public Segment(ValueScript valueScript) {
+            this.str = null;
+            this.parsedExpr = valueScript;
+        }
 
-    public String getStr() {
-      return str;
-    }
+        public String getStr() {
+            return str;
+        }
 
-    public String getExpr() {
-      return parsedExpr != null ? parsedExpr.getDsl() : null;
-    }
+        public String getExpr() {
+            return parsedExpr != null ? parsedExpr.getDsl() : null;
+        }
 
-    public ValueScript getParsedExpr() {
-      return parsedExpr;
-    }
+        public ValueScript getParsedExpr() {
+            return parsedExpr;
+        }
 
-    @Generated
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      Segment segment = (Segment) o;
-      return Objects.equals(str, segment.str) && Objects.equals(parsedExpr, segment.parsedExpr);
-    }
+        @Generated
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Segment segment = (Segment) o;
+            return Objects.equals(str, segment.str) && Objects.equals(parsedExpr, segment.parsedExpr);
+        }
 
-    @Generated
-    @Override
-    public int hashCode() {
-      return Objects.hash(str, parsedExpr);
-    }
+        @Generated
+        @Override
+        public int hashCode() {
+            return Objects.hash(str, parsedExpr);
+        }
 
-    @Generated
-    @Override
-    public String toString() {
-      return "Segment{" + "str='" + str + '\'' + ", parsedExr=" + parsedExpr + '}';
-    }
+        @Generated
+        @Override
+        public String toString() {
+            return "Segment{" + "str='" + str + '\'' + ", parsedExr=" + parsedExpr + '}';
+        }
 
-    public static class SegmentJsonAdapter extends JsonAdapter<Segment> {
-      private final ValueScript.ValueScriptAdapter valueScriptAdapter =
-          new ValueScript.ValueScriptAdapter();
-
-      @Override
-      public Segment fromJson(JsonReader reader) throws IOException {
-        if (reader.peek() != JsonReader.Token.BEGIN_OBJECT) {
-          throw new IOException("Invalid Segment format, expect Json object");
-        }
-        JsonReader peekReader = reader.peekJson();
-        peekReader.beginObject();
-        Segment segment;
-        String fieldName = peekReader.nextName();
-        if ("str".equals(fieldName)) {
-          reader.beginObject();
-          reader.nextName(); // consume str
-          segment = new Segment(reader.nextString());
-          reader.endObject();
-        } else {
-          segment = new Segment(valueScriptAdapter.fromJson(reader));
-        }
-        return segment;
-      }
-
-      @Override
-      public void toJson(JsonWriter writer, Segment value) throws IOException {
-        if (value == null) {
-          writer.nullValue();
-          return;
-        }
-        if (value.str != null) {
-          writer.beginObject();
-          writer.name("str");
-          writer.value(value.str);
-          writer.endObject();
-        } else {
-          valueScriptAdapter.toJson(writer, value.parsedExpr);
+        public static class SegmentJsonAdapter extends JsonAdapter<Segment> {
+            private final ValueScript.ValueScriptAdapter valueScriptAdapter = new ValueScript.ValueScriptAdapter();
+
+            @Override
+            public Segment fromJson(JsonReader reader) throws IOException {
+                if (reader.peek() != JsonReader.Token.BEGIN_OBJECT) {
+                    throw new IOException("Invalid Segment format, expect Json object");
+                }
+                JsonReader peekReader = reader.peekJson();
+                peekReader.beginObject();
+                Segment segment;
+                String fieldName = peekReader.nextName();
+                if ("str".equals(fieldName)) {
+                    reader.beginObject();
+                    reader.nextName(); // consume str
+                    segment = new Segment(reader.nextString());
+                    reader.endObject();
+                } else {
+                    segment = new Segment(valueScriptAdapter.fromJson(reader));
+                }
+                return segment;
+            }
+
+            @Override
+            public void toJson(JsonWriter writer, Segment value) throws IOException {
+                if (value == null) {
+                    writer.nullValue();
+                    return;
+                }
+                if (value.str != null) {
+                    writer.beginObject();
+                    writer.name("str");
+                    writer.value(value.str);
+                    writer.endObject();
+                } else {
+                    valueScriptAdapter.toJson(writer, value.parsedExpr);
+                }
+            }
         }
-      }
     }
-  }
 
-  /** Stores capture limits */
-  public static class Capture {
-    private int maxReferenceDepth = Limits.DEFAULT_REFERENCE_DEPTH;
-    private int maxCollectionSize = Limits.DEFAULT_COLLECTION_SIZE;
-    private int maxLength = Limits.DEFAULT_LENGTH;
-    private int maxFieldCount = Limits.DEFAULT_FIELD_COUNT;
+    /** Stores capture limits */
+    public static class Capture {
+        private int maxReferenceDepth = Limits.DEFAULT_REFERENCE_DEPTH;
+        private int maxCollectionSize = Limits.DEFAULT_COLLECTION_SIZE;
+        private int maxLength = Limits.DEFAULT_LENGTH;
+        private int maxFieldCount = Limits.DEFAULT_FIELD_COUNT;
 
-    private Capture() {
-      // for Moshi to assign default values
-    }
+        private Capture() {
+            // for Moshi to assign default values
+        }
 
-    public Capture(int maxReferenceDepth, int maxCollectionSize, int maxLength, int maxFieldCount) {
-      this.maxReferenceDepth = maxReferenceDepth;
-      this.maxCollectionSize = maxCollectionSize;
-      this.maxLength = maxLength;
-      this.maxFieldCount = maxFieldCount;
-    }
+        public Capture(int maxReferenceDepth, int maxCollectionSize, int maxLength, int maxFieldCount) {
+            this.maxReferenceDepth = maxReferenceDepth;
+            this.maxCollectionSize = maxCollectionSize;
+            this.maxLength = maxLength;
+            this.maxFieldCount = maxFieldCount;
+        }
 
-    public int getMaxReferenceDepth() {
-      return maxReferenceDepth;
-    }
+        public int getMaxReferenceDepth() {
+            return maxReferenceDepth;
+        }
 
-    public int getMaxCollectionSize() {
-      return maxCollectionSize;
-    }
+        public int getMaxCollectionSize() {
+            return maxCollectionSize;
+        }
 
-    public int getMaxLength() {
-      return maxLength;
-    }
+        public int getMaxLength() {
+            return maxLength;
+        }
 
-    public int getMaxFieldCount() {
-      return maxFieldCount;
-    }
+        public int getMaxFieldCount() {
+            return maxFieldCount;
+        }
 
-    @Generated
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      Capture capture = (Capture) o;
-      return maxReferenceDepth == capture.maxReferenceDepth
-          && maxCollectionSize == capture.maxCollectionSize
-          && maxLength == capture.maxLength
-          && maxFieldCount == capture.maxFieldCount;
-    }
+        @Generated
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Capture capture = (Capture) o;
+            return maxReferenceDepth == capture.maxReferenceDepth
+                    && maxCollectionSize == capture.maxCollectionSize
+                    && maxLength == capture.maxLength
+                    && maxFieldCount == capture.maxFieldCount;
+        }
 
-    @Generated
-    @Override
-    public int hashCode() {
-      return Objects.hash(maxReferenceDepth, maxCollectionSize, maxLength, maxFieldCount);
-    }
+        @Generated
+        @Override
+        public int hashCode() {
+            return Objects.hash(maxReferenceDepth, maxCollectionSize, maxLength, maxFieldCount);
+        }
 
-    @Generated
-    @Override
-    public String toString() {
-      return "Capture{"
-          + "maxReferenceDepth="
-          + maxReferenceDepth
-          + ", maxCollectionSize="
-          + maxCollectionSize
-          + ", maxLength="
-          + maxLength
-          + ", maxFieldCount="
-          + maxFieldCount
-          + '}';
-    }
+        @Generated
+        @Override
+        public String toString() {
+            return "Capture{"
+                    + "maxReferenceDepth="
+                    + maxReferenceDepth
+                    + ", maxCollectionSize="
+                    + maxCollectionSize
+                    + ", maxLength="
+                    + maxLength
+                    + ", maxFieldCount="
+                    + maxFieldCount
+                    + '}';
+        }
 
-    public static Limits toLimits(Capture capture) {
-      if (capture == null) {
-        return Limits.DEFAULT;
-      }
-      return new Limits(
-          capture.maxReferenceDepth,
-          capture.maxCollectionSize,
-          capture.maxLength,
-          capture.maxFieldCount);
+        public static Limits toLimits(Capture capture) {
+            if (capture == null) {
+                return Limits.DEFAULT;
+            }
+            return new Limits(
+                    capture.maxReferenceDepth, capture.maxCollectionSize, capture.maxLength, capture.maxFieldCount);
+        }
     }
-  }
 
-  /** Stores sampling configuration */
-  public static class Sampling extends com.datadog.debugger.probe.Sampling {
-    private double snapshotsPerSecond;
+    /** Stores sampling configuration */
+    public static class Sampling extends com.datadog.debugger.probe.Sampling {
+        private double snapshotsPerSecond;
 
-    public Sampling(double snapshotsPerSecond) {
-      this.snapshotsPerSecond = snapshotsPerSecond;
-    }
+        public Sampling(double snapshotsPerSecond) {
+            this.snapshotsPerSecond = snapshotsPerSecond;
+        }
 
-    public double getSnapshotsPerSecond() {
-      return snapshotsPerSecond;
-    }
+        public double getSnapshotsPerSecond() {
+            return snapshotsPerSecond;
+        }
 
-    @Override
-    public double getEventsPerSecond() {
-      return snapshotsPerSecond;
-    }
+        @Override
+        public double getEventsPerSecond() {
+            return snapshotsPerSecond;
+        }
 
-    @Generated
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      Sampling sampling = (Sampling) o;
-      return Double.compare(sampling.snapshotsPerSecond, snapshotsPerSecond) == 0;
-    }
+        @Generated
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Sampling sampling = (Sampling) o;
+            return Double.compare(sampling.snapshotsPerSecond, snapshotsPerSecond) == 0;
+        }
 
-    @Generated
-    @Override
-    public int hashCode() {
-      return Objects.hash(snapshotsPerSecond);
-    }
+        @Generated
+        @Override
+        public int hashCode() {
+            return Objects.hash(snapshotsPerSecond);
+        }
 
-    @Generated
-    @Override
-    public String toString() {
-      return "Sampling{" + "snapshotsPerSecond=" + snapshotsPerSecond + '}';
+        @Generated
+        @Override
+        public String toString() {
+            return "Sampling{" + "snapshotsPerSecond=" + snapshotsPerSecond + '}';
+        }
     }
-  }
 
-  public static class CaptureExpression {
-    private final String name;
-    private final ValueScript expr;
-    private final Capture capture;
+    public static class CaptureExpression {
+        private final String name;
+        private final ValueScript expr;
+        private final Capture capture;
 
-    public CaptureExpression(String name, ValueScript expr, Capture capture) {
-      this.name = name;
-      this.expr = expr;
-      this.capture = capture;
-    }
+        public CaptureExpression(String name, ValueScript expr, Capture capture) {
+            this.name = name;
+            this.expr = expr;
+            this.capture = capture;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public ValueScript getExpr() {
+            return expr;
+        }
+
+        public Capture getCapture() {
+            return capture;
+        }
 
-    public String getName() {
-      return name;
+        @Generated
+        @Override
+        public String toString() {
+            return "CaptureExpression{" + "name='" + name + '\'' + ", expr=" + expr + ", capture=" + capture + '}';
+        }
     }
 
-    public ValueScript getExpr() {
-      return expr;
+    private final String template;
+    private final List<Segment> segments;
+    private final boolean captureSnapshot;
+    private final List<CaptureExpression> captureExpressions;
+
+    @Json(name = "when")
+    private final ProbeCondition probeCondition;
+
+    private final Capture capture;
+    private final Sampling sampling;
+    private transient Consumer<Snapshot> snapshotProcessor;
+    protected transient Map<DDTraceId, AtomicInteger> budget = Collections.synchronizedMap(new WeakIdentityHashMap<>());
+    protected transient Sampler sampler;
+    protected transient Sampler errorSampler;
+    protected final transient Duration evalTimeout;
+
+    // no-arg constructor is required by Moshi to avoid creating instance with unsafe and by-passing
+    // constructors, including field initializers.
+    public LogProbe() {
+        this(
+                LANGUAGE,
+                null,
+                Tag.fromStrings(null),
+                null,
+                MethodLocation.DEFAULT,
+                null,
+                null,
+                false,
+                null,
+                null,
+                null,
+                null,
+                Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout()));
+    }
+
+    public LogProbe(
+            String language,
+            ProbeId probeId,
+            String[] tagStrs,
+            Where where,
+            MethodLocation evaluateAt,
+            String template,
+            List<Segment> segments,
+            boolean captureSnapshot,
+            ProbeCondition probeCondition,
+            Capture capture,
+            Sampling sampling,
+            List<CaptureExpression> captureExpressions,
+            Duration evalTimeout) {
+        this(
+                language,
+                probeId,
+                Tag.fromStrings(tagStrs),
+                where,
+                evaluateAt,
+                template,
+                segments,
+                captureSnapshot,
+                probeCondition,
+                capture,
+                sampling,
+                captureExpressions,
+                evalTimeout);
+    }
+
+    private LogProbe(
+            String language,
+            ProbeId probeId,
+            Tag[] tags,
+            Where where,
+            MethodLocation evaluateAt,
+            String template,
+            List<Segment> segments,
+            boolean captureSnapshot,
+            ProbeCondition probeCondition,
+            Capture capture,
+            Sampling sampling,
+            List<CaptureExpression> captureExpressions,
+            Duration evalTimeout) {
+        super(language, probeId, tags, where, evaluateAt);
+        this.template = template;
+        this.segments = segments;
+        this.captureSnapshot = captureSnapshot;
+        this.probeCondition = probeCondition;
+        this.capture = capture;
+        this.sampling = sampling;
+        this.captureExpressions = captureExpressions;
+        this.evalTimeout = evalTimeout;
+    }
+
+    public LogProbe(LogProbe.Builder builder) {
+        this(
+                builder.language,
+                builder.probeId,
+                builder.tagStrs,
+                builder.where,
+                builder.evaluateAt,
+                builder.template,
+                builder.segments,
+                builder.captureSnapshot,
+                builder.probeCondition,
+                builder.capture,
+                builder.sampling,
+                builder.captureExpressions,
+                builder.evalTimeout);
+        this.snapshotProcessor = builder.snapshotProcessor;
+        initSamplers();
+    }
+
+    public LogProbe copy() {
+        return new LogProbe(
+                language,
+                new ProbeId(id, version),
+                tags,
+                where,
+                evaluateAt,
+                template,
+                segments,
+                captureSnapshot,
+                probeCondition,
+                capture,
+                sampling,
+                captureExpressions,
+                evalTimeout);
+    }
+
+    public String getTemplate() {
+        return template;
+    }
+
+    public List<Segment> getSegments() {
+        return segments;
+    }
+
+    public boolean isCaptureSnapshot() {
+        return captureSnapshot;
+    }
+
+    public ProbeCondition getProbeCondition() {
+        return probeCondition;
     }
 
     public Capture getCapture() {
-      return capture;
+        return capture;
     }
 
-    @Generated
-    @Override
-    public String toString() {
-      return "CaptureExpression{"
-          + "name='"
-          + name
-          + '\''
-          + ", expr="
-          + expr
-          + ", capture="
-          + capture
-          + '}';
-    }
-  }
-
-  private final String template;
-  private final List<Segment> segments;
-  private final boolean captureSnapshot;
-  private final List<CaptureExpression> captureExpressions;
-
-  @Json(name = "when")
-  private final ProbeCondition probeCondition;
-
-  private final Capture capture;
-  private final Sampling sampling;
-  private transient Consumer<Snapshot> snapshotProcessor;
-  protected transient Map<DDTraceId, AtomicInteger> budget =
-      Collections.synchronizedMap(new WeakIdentityHashMap<>());
-  protected transient Sampler sampler;
-  protected transient Sampler errorSampler;
-  protected final transient Duration evalTimeout;
-
-  // no-arg constructor is required by Moshi to avoid creating instance with unsafe and by-passing
-  // constructors, including field initializers.
-  public LogProbe() {
-    this(
-        LANGUAGE,
-        null,
-        Tag.fromStrings(null),
-        null,
-        MethodLocation.DEFAULT,
-        null,
-        null,
-        false,
-        null,
-        null,
-        null,
-        null,
-        Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout()));
-  }
-
-  public LogProbe(
-      String language,
-      ProbeId probeId,
-      String[] tagStrs,
-      Where where,
-      MethodLocation evaluateAt,
-      String template,
-      List<Segment> segments,
-      boolean captureSnapshot,
-      ProbeCondition probeCondition,
-      Capture capture,
-      Sampling sampling,
-      List<CaptureExpression> captureExpressions,
-      Duration evalTimeout) {
-    this(
-        language,
-        probeId,
-        Tag.fromStrings(tagStrs),
-        where,
-        evaluateAt,
-        template,
-        segments,
-        captureSnapshot,
-        probeCondition,
-        capture,
-        sampling,
-        captureExpressions,
-        evalTimeout);
-  }
-
-  private LogProbe(
-      String language,
-      ProbeId probeId,
-      Tag[] tags,
-      Where where,
-      MethodLocation evaluateAt,
-      String template,
-      List<Segment> segments,
-      boolean captureSnapshot,
-      ProbeCondition probeCondition,
-      Capture capture,
-      Sampling sampling,
-      List<CaptureExpression> captureExpressions,
-      Duration evalTimeout) {
-    super(language, probeId, tags, where, evaluateAt);
-    this.template = template;
-    this.segments = segments;
-    this.captureSnapshot = captureSnapshot;
-    this.probeCondition = probeCondition;
-    this.capture = capture;
-    this.sampling = sampling;
-    this.captureExpressions = captureExpressions;
-    this.evalTimeout = evalTimeout;
-  }
-
-  public LogProbe(LogProbe.Builder builder) {
-    this(
-        builder.language,
-        builder.probeId,
-        builder.tagStrs,
-        builder.where,
-        builder.evaluateAt,
-        builder.template,
-        builder.segments,
-        builder.captureSnapshot,
-        builder.probeCondition,
-        builder.capture,
-        builder.sampling,
-        builder.captureExpressions,
-        builder.evalTimeout);
-    this.snapshotProcessor = builder.snapshotProcessor;
-    initSamplers();
-  }
-
-  public LogProbe copy() {
-    return new LogProbe(
-        language,
-        new ProbeId(id, version),
-        tags,
-        where,
-        evaluateAt,
-        template,
-        segments,
-        captureSnapshot,
-        probeCondition,
-        capture,
-        sampling,
-        captureExpressions,
-        evalTimeout);
-  }
-
-  public String getTemplate() {
-    return template;
-  }
-
-  public List<Segment> getSegments() {
-    return segments;
-  }
-
-  public boolean isCaptureSnapshot() {
-    return captureSnapshot;
-  }
-
-  public ProbeCondition getProbeCondition() {
-    return probeCondition;
-  }
-
-  public Capture getCapture() {
-    return capture;
-  }
-
-  public Sampling getSampling() {
-    return sampling;
-  }
-
-  public void initSamplers() {
-    double rate =
-        sampling != null
-            ? sampling.getEventsPerSecond()
-            : (isFullSnapshot()
-                ? ProbeRateLimiter.DEFAULT_SNAPSHOT_RATE
-                : ProbeRateLimiter.DEFAULT_LOG_RATE);
-    sampler = ProbeRateLimiter.createSampler(rate);
-    errorSampler = ProbeRateLimiter.createSampler(1.0); // errors are always sampled at 1/s rate
-  }
-
-  public List<CaptureExpression> getCaptureExpressions() {
-    return captureExpressions;
-  }
-
-  @Override
-  public InstrumentationResult.Status instrument(
-      MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices) {
-    // only capture entry values if explicitly not at Exit. By default, we are using evaluateAt=EXIT
-    boolean captureEntry = getEvaluateAt() != MethodLocation.EXIT;
-    if (probeIndices.size() == 1) {
-      // special case for single probe
-      return new SingleCapturedContextInstrumenter(
-              this,
-              methodInfo,
-              diagnostics,
-              probeIndices,
-              isCaptureSnapshot(),
-              captureEntry,
-              toLimits(getCapture()))
-          .instrument();
-    }
-    // fallbacks to multi probes handling
-    return new MultiCapturedContextInstrumenter(
-            this,
-            methodInfo,
-            diagnostics,
-            probeIndices,
-            isCaptureSnapshot(),
-            captureEntry,
-            toLimits(getCapture()))
-        .instrument();
-  }
-
-  @Override
-  public boolean isReadyToCapture() {
-    if (!hasCondition()) {
-      // we are sampling here to avoid creating CapturedContext when the sampling result is negative
-      boolean sampled = trySample(sampler);
-      if (!sampled) {
-        DebuggerAgent.getSink().skipSnapshot(id, RATE_LIMIT);
-      }
-      return sampled;
+    public Sampling getSampling() {
+        return sampling;
     }
-    return true;
-  }
-
-  @Override
-  public void evaluate(
-      CapturedContext context,
-      CapturedContext.Status status,
-      MethodLocation methodLocation,
-      boolean singleProbe) {
-    if (!(status instanceof LogStatus)) {
-      throw new IllegalStateException("Invalid status: " + status.getClass());
-    }
-    LogStatus logStatus = (LogStatus) status;
-    if (!hasCondition()) {
-      if (singleProbe) {
-        // sampling was already done in isReadyToCapture so we assume that if we are executing the
-        // current method it means the status should be sampled
-        if (!logStatus.getDebugSessionStatus().isDisabled()) {
-          logStatus.setSampled(true);
-        }
-      } else {
-        // sample when no condition associated
-        sample(logStatus, methodLocation);
-      }
-    }
-    logStatus.setCondition(evaluateCondition(context, logStatus));
-    CapturedContext.CapturedThrowable throwable = context.getCapturedThrowable();
-    if (logStatus.hasConditionErrors() && throwable != null) {
-      logStatus.addError(
-          new EvaluationError(
-              "uncaught exception", throwable.getType() + ": " + throwable.getMessage()));
-    }
-    if (hasCondition() && (logStatus.getCondition() || logStatus.hasConditionErrors())) {
-      // sample if probe has condition and condition is true or has error
-      sample(logStatus, methodLocation);
-    }
-    processMsgTemplate(context, logStatus);
-    processCaptureExpressions(context, logStatus);
-  }
 
-  private void processMsgTemplate(CapturedContext context, LogStatus logStatus) {
-    if (!logStatus.isSampled() || !logStatus.getCondition()) {
-      return;
+    public void initSamplers() {
+        double rate = sampling != null
+                ? sampling.getEventsPerSecond()
+                : (isFullSnapshot() ? ProbeRateLimiter.DEFAULT_SNAPSHOT_RATE : ProbeRateLimiter.DEFAULT_LOG_RATE);
+        sampler = ProbeRateLimiter.createSampler(rate);
+        errorSampler = ProbeRateLimiter.createSampler(1.0); // errors are always sampled at 1/s rate
     }
-    StringTemplateBuilder logMessageBuilder =
-        new StringTemplateBuilder(segments, LIMITS, evalTimeout);
-    String msg = logMessageBuilder.evaluate(context, logStatus);
-    if (msg != null && msg.length() > LOG_MSG_LIMIT) {
-      StringBuilder sb = new StringBuilder(LOG_MSG_LIMIT + 3);
-      sb.append(msg, 0, LOG_MSG_LIMIT);
-      sb.append("...");
-      msg = sb.toString();
-    }
-    logStatus.setMessage(msg);
-  }
 
-  private void sample(LogStatus logStatus, MethodLocation methodLocation) {
-    if (logStatus.isForceSampling()) {
-      return;
-    }
-    // sample only once and when we need to evaluate
-    if (!MethodLocation.isSame(methodLocation, evaluateAt)) {
-      return;
-    }
-    DebugSessionStatus debugSessionStatus = logStatus.getDebugSessionStatus();
-    if (debugSessionStatus.isDisabled()) {
-      return;
-    }
-    boolean sampled;
-    if (debugSessionStatus.isActive()) {
-      // LogStatus.shouldSend() emits unconditionally when the debug session is ACTIVE, so this
-      // probe must not record a coordinated decision that shouldSend() would ignore anyway.
-      // Instead, make sure the shared trace-level state lets the other full-snapshot probes on
-      // this trace emit too, rather than leaving/recording a DROP that would suppress them.
-      sampled = true;
-      if (isFullSnapshot() && useCoordinatedSampling()) {
-        forceCoordinatedEmit();
-      }
-    } else {
-      // if condition has error and no capture Snapshot, the error is reported using errorSampler
-      // at 1/s rate instead of the log template one
-      Sampler localSampler =
-          logStatus.hasConditionErrors && !isFullSnapshot() ? errorSampler : sampler;
-      sampled = trySample(localSampler);
+    public List<CaptureExpression> getCaptureExpressions() {
+        return captureExpressions;
     }
-    logStatus.setSampled(sampled);
-    if (!sampled) {
-      DebuggerAgent.getSink().skipSnapshot(id, RATE_LIMIT);
-    }
-  }
 
-  private boolean evaluateCondition(CapturedContext capture, LogStatus status) {
-    if (probeCondition == null) {
-      return true;
-    }
-    try {
-      Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout());
-      TimeoutChecker timeoutChecker = TimeoutChecker.create(Config.get(), timeout);
-      if (!probeCondition.execute(capture, timeoutChecker)) {
-        return false;
-      }
-    } catch (EvaluationTimeOutException ex) {
-      DebuggerAgent.getSink()
-          .skipSnapshot(id, DebuggerMetricCollector.SkippedReason.EVALUATION_TIME_OUT);
-      status.addError(new EvaluationError(ex.getExpr(), ex.getMessage()));
-      status.setConditionErrors(true);
-      return false;
-    } catch (EvaluationException ex) {
-      status.addError(new EvaluationError(ex.getExpr(), ex.getMessage()));
-      status.setConditionErrors(true);
-      return false;
-    } catch (Exception ex) {
-      // catch all for unexpected exceptions
-      status.addError(new EvaluationError(probeCondition.getDslExpression(), ex.getMessage()));
-      status.setConditionErrors(true);
-      return false;
-    }
-    return true;
-  }
-
-  @Override
-  public void commit(
-      CapturedContext entryContext,
-      CapturedContext exitContext,
-      List<CapturedContext.CapturedThrowable> caughtExceptions) {
-    Snapshot snapshot = createSnapshot();
-    boolean shouldCommit = fillSnapshot(entryContext, exitContext, caughtExceptions, snapshot);
-    DebuggerSink sink = DebuggerAgent.getSink();
-    if (shouldCommit) {
-      incrementBudget();
-      if (inBudget()) {
-        commitSnapshot(snapshot, sink);
-        if (snapshotProcessor != null) {
-          snapshotProcessor.accept(snapshot);
-        }
-      }
-    }
-  }
-
-  /**
-   * Holds the once-per-trace coordinated sampling decision shared by all full-snapshot probes on a
-   * given local root span, so that either all of them emit or none of them do.
-   */
-  static class CoordinatedSamplingState {
-    /** Outcome of the first probe's sampling decision for the trace, cached on the root span. */
-    enum Status {
-      /** The trace was not sampled; every probe sharing this state must not emit. */
-      DROP,
-      /** The trace was sampled; probes sharing this state may emit, once each. */
-      EMIT
+    @Override
+    public InstrumentationResult.Status instrument(
+            MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices) {
+        // only capture entry values if explicitly not at Exit. By default, we are using evaluateAt=EXIT
+        boolean captureEntry = getEvaluateAt() != MethodLocation.EXIT;
+        if (probeIndices.size() == 1) {
+            // special case for single probe
+            return new SingleCapturedContextInstrumenter(
+                            this,
+                            methodInfo,
+                            diagnostics,
+                            probeIndices,
+                            isCaptureSnapshot(),
+                            captureEntry,
+                            toLimits(getCapture()))
+                    .instrument();
+        }
+        // fallbacks to multi probes handling
+        return new MultiCapturedContextInstrumenter(
+                        this,
+                        methodInfo,
+                        diagnostics,
+                        probeIndices,
+                        isCaptureSnapshot(),
+                        captureEntry,
+                        toLimits(getCapture()))
+                .instrument();
     }
 
-    private final Set<String> emittedProbeIds;
-    private final Status status;
-
-    CoordinatedSamplingState(Status status) {
-      this.status = status;
-      if (status == EMIT) {
-        emittedProbeIds = ConcurrentHashMap.newKeySet();
-      } else {
-        emittedProbeIds = Collections.emptySet();
-      }
+    @Override
+    public boolean isReadyToCapture() {
+        if (!hasCondition()) {
+            // we are sampling here to avoid creating CapturedContext when the sampling result is negative
+            boolean sampled = trySample(sampler);
+            if (!sampled) {
+                DebuggerAgent.getSink().skipSnapshot(id, RATE_LIMIT);
+            }
+            return sampled;
+        }
+        return true;
     }
 
-    boolean tryEmit(String probeEncodedId) {
-      return status == EMIT && emittedProbeIds.add(probeEncodedId);
-    }
-  }
-
-  /**
-   * Whether this probe shares the trace-wide {@link CoordinatedSamplingState} with other
-   * full-snapshot probes on the same local root span, so they all emit together or not at all.
-   * Probes with their own independent sampling flow (e.g. {@link ExceptionProbe}) must not
-   * participate, or their unrelated decision would leak into (and be leaked into by) ordinary
-   * snapshot probes sharing the same trace.
-   */
-  protected boolean useCoordinatedSampling() {
-    return true;
-  }
-
-  private boolean trySample(Sampler sampler) {
-    if (!isFullSnapshot()) {
-      return ProbeRateLimiter.tryProbe(sampler, false);
-    }
-    if (!useCoordinatedSampling()) {
-      return ProbeRateLimiter.tryProbe(sampler, true);
+    @Override
+    public void evaluate(
+            CapturedContext context,
+            CapturedContext.Status status,
+            MethodLocation methodLocation,
+            boolean singleProbe) {
+        if (!(status instanceof LogStatus)) {
+            throw new IllegalStateException("Invalid status: " + status.getClass());
+        }
+        LogStatus logStatus = (LogStatus) status;
+        if (!hasCondition()) {
+            if (singleProbe) {
+                // sampling was already done in isReadyToCapture so we assume that if we are executing the
+                // current method it means the status should be sampled
+                if (!logStatus.getDebugSessionStatus().isDisabled()) {
+                    logStatus.setSampled(true);
+                }
+            } else {
+                // sample when no condition associated
+                sample(logStatus, methodLocation);
+            }
+        }
+        logStatus.setCondition(evaluateCondition(context, logStatus));
+        CapturedContext.CapturedThrowable throwable = context.getCapturedThrowable();
+        if (logStatus.hasConditionErrors() && throwable != null) {
+            logStatus.addError(
+                    new EvaluationError("uncaught exception", throwable.getType() + ": " + throwable.getMessage()));
+        }
+        if (hasCondition() && (logStatus.getCondition() || logStatus.hasConditionErrors())) {
+            // sample if probe has condition and condition is true or has error
+            sample(logStatus, methodLocation);
+        }
+        processMsgTemplate(context, logStatus);
+        processCaptureExpressions(context, logStatus);
     }
 
-    AgentSpan localRootSpan = getActiveLocalRootSpan();
-    if (localRootSpan == null) {
-      return ProbeRateLimiter.tryProbe(sampler, true);
+    private void processMsgTemplate(CapturedContext context, LogStatus logStatus) {
+        if (!logStatus.isSampled() || !logStatus.getCondition()) {
+            return;
+        }
+        StringTemplateBuilder logMessageBuilder = new StringTemplateBuilder(segments, LIMITS, evalTimeout);
+        String msg = logMessageBuilder.evaluate(context, logStatus);
+        if (msg != null && msg.length() > LOG_MSG_LIMIT) {
+            StringBuilder sb = new StringBuilder(LOG_MSG_LIMIT + 3);
+            sb.append(msg, 0, LOG_MSG_LIMIT);
+            sb.append("...");
+            msg = sb.toString();
+        }
+        logStatus.setMessage(msg);
     }
 
-    CoordinatedSamplingState state = Context.from(localRootSpan).get(SAMPLING_KEY);
-    if (state == null) {
-      synchronized (localRootSpan) {
-        Context traceContext = Context.from(localRootSpan);
-        state = traceContext.get(SAMPLING_KEY);
-        if (state == null) {
-          boolean sampled = ProbeRateLimiter.tryProbe(sampler, true);
-          state = new CoordinatedSamplingState(sampled ? EMIT : DROP);
-          traceContext.with(SAMPLING_KEY, state).attachTo(localRootSpan);
+    private void sample(LogStatus logStatus, MethodLocation methodLocation) {
+        if (logStatus.isForceSampling()) {
+            return;
+        }
+        // sample only once and when we need to evaluate
+        if (!MethodLocation.isSame(methodLocation, evaluateAt)) {
+            return;
+        }
+        DebugSessionStatus debugSessionStatus = logStatus.getDebugSessionStatus();
+        if (debugSessionStatus.isDisabled()) {
+            return;
+        }
+        boolean sampled;
+        if (debugSessionStatus.isActive()) {
+            // LogStatus.shouldSend() emits unconditionally when the debug session is ACTIVE, so this
+            // probe must not record a coordinated decision that shouldSend() would ignore anyway.
+            // Instead, make sure the shared trace-level state lets the other full-snapshot probes on
+            // this trace emit too, rather than leaving/recording a DROP that would suppress them.
+            sampled = true;
+            if (isFullSnapshot() && useCoordinatedSampling()) {
+                forceCoordinatedEmit();
+            }
+        } else {
+            // if condition has error and no capture Snapshot, the error is reported using errorSampler
+            // at 1/s rate instead of the log template one
+            Sampler localSampler = logStatus.hasConditionErrors && !isFullSnapshot() ? errorSampler : sampler;
+            sampled = trySample(localSampler);
+        }
+        logStatus.setSampled(sampled);
+        if (!sampled) {
+            DebuggerAgent.getSink().skipSnapshot(id, RATE_LIMIT);
         }
-      }
-    }
-    return state.tryEmit(getProbeId().getEncodedId());
-  }
-
-  /**
-   * Ensures the trace-level coordinated sampling state allows emission, upgrading a previously
-   * cached DROP (recorded by an ordinary probe before this debug session became active) so that
-   * every full-snapshot probe on this trace gets a chance to emit.
-   */
-  private void forceCoordinatedEmit() {
-    AgentSpan localRootSpan = getActiveLocalRootSpan();
-    if (localRootSpan == null) {
-      return;
-    }
-    synchronized (localRootSpan) {
-      Context traceContext = Context.from(localRootSpan);
-      CoordinatedSamplingState state = traceContext.get(SAMPLING_KEY);
-      if (state == null || state.status != EMIT) {
-        traceContext.with(SAMPLING_KEY, new CoordinatedSamplingState(EMIT)).attachTo(localRootSpan);
-      }
     }
-  }
 
-  private AgentSpan getActiveLocalRootSpan() {
-    TracerAPI tracer = AgentTracer.get();
-    AgentSpan activeSpan = tracer != null ? tracer.activeSpan() : null;
-    if (activeSpan == null || activeSpan == AgentTracer.noopSpan()) {
-      return null;
-    }
-    AgentSpan localRootSpan = activeSpan.getLocalRootSpan();
-    return localRootSpan != AgentTracer.noopSpan() ? localRootSpan : null;
-  }
-
-  protected Snapshot createSnapshot() {
-    int maxDepth = capture != null ? capture.maxReferenceDepth : -1;
-    return new Snapshot(Thread.currentThread(), this, maxDepth);
-  }
-
-  protected boolean fillSnapshot(
-      CapturedContext entryContext,
-      CapturedContext exitContext,
-      List<CapturedContext.CapturedThrowable> caughtExceptions,
-      Snapshot snapshot) {
-    String probeEncodedId = getProbeId().getEncodedId();
-    LogStatus entryStatus = convertStatus(entryContext.getStatus(probeEncodedId));
-    LogStatus exitStatus = convertStatus(exitContext.getStatus(probeEncodedId));
-    String message = null;
-    switch (evaluateAt) {
-      case ENTRY:
-      case DEFAULT:
-        message = entryStatus.getMessage();
-        break;
-      case EXIT:
-        message = exitStatus.getMessage();
-        break;
-    }
-    boolean shouldCommit = false;
-    if (entryStatus.shouldSend() && exitStatus.shouldSend()) {
-      snapshot.setTraceId(CorrelationIdentifier.getTraceId());
-      snapshot.setSpanId(CorrelationIdentifier.getSpanId());
-      if (isFullSnapshot()) {
-        assignCaptures(snapshot, entryContext, exitContext);
-      }
-      snapshot.setMessage(message);
-      snapshot.setDuration(exitContext.getDuration());
-      snapshot.addCaughtExceptions(caughtExceptions);
-      shouldCommit = true;
-    }
-    if (entryStatus.shouldReportError()) {
-      populateErrors(entryContext, snapshot, entryStatus, snapshot::setEntry);
-      shouldCommit = true;
-    }
-    if (exitStatus.shouldReportError()) {
-      populateErrors(exitContext, snapshot, exitStatus, snapshot::setExit);
-      shouldCommit = true;
-    }
-    return shouldCommit;
-  }
-
-  private void assignCaptures(
-      Snapshot snapshot, CapturedContext entryContext, CapturedContext exitContext) {
-    if (isCaptureSnapshot()) {
-      addContextWithoutCaptureExpressions(entryContext, snapshot::setEntry);
-      addContextWithoutCaptureExpressions(exitContext, snapshot::setExit);
-    } else if (captureExpressions != null) {
-      addFilteredCaptureExpressions(entryContext, snapshot::setEntry);
-      addFilteredCaptureExpressions(exitContext, snapshot::setExit);
-    }
-  }
-
-  private void addContextWithoutCaptureExpressions(
-      CapturedContext context, Consumer<CapturedContext> setContext) {
-    // no capture expressions, assign directly the context in the snapshot
-    if (context.getCaptureExpressions() == null || context.getCaptureExpressions().isEmpty()) {
-      setContext.accept(context);
-      return;
-    }
-    CapturedContext newContext = context.copyWithoutCaptureExpressions();
-    setContext.accept(newContext);
-  }
-
-  private void addFilteredCaptureExpressions(
-      CapturedContext capturedContext, Consumer<CapturedContext> setContext) {
-    Map<String, CapturedContext.CapturedValue> contextCapExpr =
-        capturedContext.getCaptureExpressions();
-    if (contextCapExpr != null && !contextCapExpr.isEmpty()) {
-      CapturedContext newContext = new CapturedContext();
-      for (CaptureExpression capExprDef : captureExpressions) {
-        CapturedContext.CapturedValue capturedValue = contextCapExpr.get(capExprDef.getName());
-        if (capturedValue != null) {
-          newContext.addCaptureExpression(capturedValue);
-        } else {
-          LOGGER.debug("{} capture expression not found in CapturedContext", capExprDef.getName());
+    private boolean evaluateCondition(CapturedContext capture, LogStatus status) {
+        if (probeCondition == null) {
+            return true;
+        }
+        try {
+            Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout());
+            TimeoutChecker timeoutChecker = TimeoutChecker.create(Config.get(), timeout);
+            if (!probeCondition.execute(capture, timeoutChecker)) {
+                return false;
+            }
+        } catch (EvaluationTimeOutException ex) {
+            DebuggerAgent.getSink().skipSnapshot(id, DebuggerMetricCollector.SkippedReason.EVALUATION_TIME_OUT);
+            status.addError(new EvaluationError(ex.getExpr(), ex.getMessage()));
+            status.setConditionErrors(true);
+            return false;
+        } catch (EvaluationException ex) {
+            status.addError(new EvaluationError(ex.getExpr(), ex.getMessage()));
+            status.setConditionErrors(true);
+            return false;
+        } catch (Exception ex) {
+            // catch all for unexpected exceptions
+            status.addError(new EvaluationError(probeCondition.getDslExpression(), ex.getMessage()));
+            status.setConditionErrors(true);
+            return false;
         }
-      }
-      setContext.accept(newContext);
+        return true;
     }
-  }
 
-  private void processCaptureExpressions(CapturedContext context, LogStatus logStatus) {
-    if (captureExpressions == null || !logStatus.shouldSend()) {
-      return;
+    @Override
+    public void commit(
+            CapturedContext entryContext,
+            CapturedContext exitContext,
+            List<CapturedContext.CapturedThrowable> caughtExceptions) {
+        Snapshot snapshot = createSnapshot();
+        boolean shouldCommit = fillSnapshot(entryContext, exitContext, caughtExceptions, snapshot);
+        DebuggerSink sink = DebuggerAgent.getSink();
+        if (shouldCommit) {
+            incrementBudget();
+            if (inBudget()) {
+                commitSnapshot(snapshot, sink);
+                if (snapshotProcessor != null) {
+                    snapshotProcessor.accept(snapshot);
+                }
+            }
+        }
     }
-    for (CaptureExpression captureExpression : captureExpressions) {
-      try {
-        Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout());
-        TimeoutChecker timeoutChecker = TimeoutChecker.create(Config.get(), timeout);
-        Value<?> result = captureExpression.expr.execute(context, timeoutChecker);
-        if (result.isUndefined()) {
-          throw new EvaluationException("UNDEFINED", captureExpression.getExpr().getDsl());
-        }
-        if (result.isNull()) {
-          context.addCaptureExpression(
-              CapturedContext.CapturedValue.of(
-                  captureExpression.getName(), Object.class.getTypeName(), null));
-        } else {
-          if (captureExpression.capture != null) {
-            context.addCaptureExpression(
-                Value.toCapturedSnapshot(
-                    captureExpression.getName(),
-                    result,
-                    captureExpression.capture.maxReferenceDepth,
-                    captureExpression.capture.maxCollectionSize,
-                    captureExpression.capture.maxLength,
-                    captureExpression.capture.maxFieldCount));
-          } else {
-            // inherit from probe capture field because no specific capture
-            if (capture != null) {
-              context.addCaptureExpression(
-                  Value.toCapturedSnapshot(
-                      captureExpression.getName(),
-                      result,
-                      capture.maxReferenceDepth,
-                      capture.maxCollectionSize,
-                      capture.maxLength,
-                      capture.maxFieldCount));
+
+    /**
+     * Holds the once-per-trace coordinated sampling decision shared by all full-snapshot probes on a
+     * given local root span, so that either all of them emit or none of them do.
+     */
+    static class CoordinatedSamplingState {
+        /** Outcome of the first probe's sampling decision for the trace, cached on the root span. */
+        enum Status {
+            /** The trace was not sampled; every probe sharing this state must not emit. */
+            DROP,
+            /** The trace was sampled; probes sharing this state may emit, once each. */
+            EMIT
+        }
+
+        private final Set<String> emittedProbeIds;
+        private final Status status;
+
+        CoordinatedSamplingState(Status status) {
+            this.status = status;
+            if (status == EMIT) {
+                emittedProbeIds = ConcurrentHashMap.newKeySet();
             } else {
-              context.addCaptureExpression(
-                  Value.toCapturedSnapshot(captureExpression.getName(), result));
+                emittedProbeIds = Collections.emptySet();
             }
-          }
-        }
-      } catch (EvaluationException ex) {
-        logStatus.addError(new EvaluationError(ex.getExpr(), ex.getMessage()));
-        logStatus.setLogTemplateErrors(true);
-      } catch (Exception ex) {
-        // catch all for unexpected exceptions
-        logStatus.addError(
-            new EvaluationError(captureExpression.getExpr().getDsl(), ex.getMessage()));
-        logStatus.setLogTemplateErrors(true);
-      }
-    }
-  }
-
-  private static void populateErrors(
-      CapturedContext context,
-      Snapshot snapshot,
-      LogStatus status,
-      Consumer<CapturedContext> contextSetter) {
-    if (context.getCapturedThrowable() != null) {
-      // report also uncaught exception
-      contextSetter.accept(context);
-    }
-    snapshot.addEvaluationErrors(status.getErrors());
-    if (status.getMessage() != null) {
-      snapshot.setMessage(status.getMessage());
-    } else if (!status.getErrors().isEmpty()) {
-      snapshot.setMessage(status.getErrors().get(0).getMessage());
+        }
+
+        boolean tryEmit(String probeEncodedId) {
+            return status == EMIT && emittedProbeIds.add(probeEncodedId);
+        }
     }
-  }
 
-  private LogStatus convertStatus(CapturedContext.Status status) {
-    if (status == CapturedContext.Status.EMPTY_STATUS) {
-      return LogStatus.EMPTY_LOG_STATUS;
+    /**
+     * Whether this probe shares the trace-wide {@link CoordinatedSamplingState} with other
+     * full-snapshot probes on the same local root span, so they all emit together or not at all.
+     * Probes with their own independent sampling flow (e.g. {@link ExceptionProbe}) must not
+     * participate, or their unrelated decision would leak into (and be leaked into by) ordinary
+     * snapshot probes sharing the same trace.
+     */
+    protected boolean useCoordinatedSampling() {
+        return true;
     }
-    if (status == CapturedContext.Status.EMPTY_CAPTURING_STATUS) {
-      return LogStatus.EMPTY_CAPTURING_LOG_STATUS;
+
+    private boolean trySample(Sampler sampler) {
+        if (!isFullSnapshot()) {
+            return ProbeRateLimiter.tryProbe(sampler, false);
+        }
+        if (!useCoordinatedSampling()) {
+            return ProbeRateLimiter.tryProbe(sampler, true);
+        }
+
+        AgentSpan localRootSpan = getActiveLocalRootSpan();
+        if (localRootSpan == null) {
+            return ProbeRateLimiter.tryProbe(sampler, true);
+        }
+
+        CoordinatedSamplingState state = Context.from(localRootSpan).get(SAMPLING_KEY);
+        if (state == null) {
+            synchronized (localRootSpan) {
+                Context traceContext = Context.from(localRootSpan);
+                state = traceContext.get(SAMPLING_KEY);
+                if (state == null) {
+                    boolean sampled = ProbeRateLimiter.tryProbe(sampler, true);
+                    state = new CoordinatedSamplingState(sampled ? EMIT : DROP);
+                    traceContext.with(SAMPLING_KEY, state).attachTo(localRootSpan);
+                }
+            }
+        }
+        return state.tryEmit(getProbeId().getEncodedId());
     }
-    return (LogStatus) status;
-  }
-
-  protected void commitSnapshot(Snapshot snapshot, DebuggerSink sink) {
-    /*
-     * Record stack trace having the caller of this method as 'top' frame.
-     * For this it is necessary to discard:
-     * - Thread.currentThread().getStackTrace()
-     * - Snapshot.recordStackTrace()
-     * - LogProbe.commitSnapshot
-     * - ProbeDefinition.commit()
-     * - DebuggerContext.commit() or DebuggerContext.evalAndCommit()
+
+    /**
+     * Ensures the trace-level coordinated sampling state allows emission, upgrading a previously
+     * cached DROP (recorded by an ordinary probe before this debug session became active) so that
+     * every full-snapshot probe on this trace gets a chance to emit.
      */
-    if (isFullSnapshot()) {
-      snapshot.recordStackTrace(5);
-      sink.addSnapshot(snapshot);
-    } else {
-      sink.addHighRateSnapshot(snapshot);
+    private void forceCoordinatedEmit() {
+        AgentSpan localRootSpan = getActiveLocalRootSpan();
+        if (localRootSpan == null) {
+            return;
+        }
+        synchronized (localRootSpan) {
+            Context traceContext = Context.from(localRootSpan);
+            CoordinatedSamplingState state = traceContext.get(SAMPLING_KEY);
+            if (state == null || state.status != EMIT) {
+                traceContext
+                        .with(SAMPLING_KEY, new CoordinatedSamplingState(EMIT))
+                        .attachTo(localRootSpan);
+            }
+        }
     }
-  }
 
-  @Override
-  public void commit(CapturedContext lineContext, int line) {
-    LogStatus status = (LogStatus) lineContext.getStatus(getProbeId().getEncodedId());
-    if (status == null) {
-      return;
+    private AgentSpan getActiveLocalRootSpan() {
+        TracerAPI tracer = AgentTracer.get();
+        AgentSpan activeSpan = tracer != null ? tracer.activeSpan() : null;
+        if (activeSpan == null || activeSpan == AgentTracer.noopSpan()) {
+            return null;
+        }
+        AgentSpan localRootSpan = activeSpan.getLocalRootSpan();
+        return localRootSpan != AgentTracer.noopSpan() ? localRootSpan : null;
+    }
+
+    protected Snapshot createSnapshot() {
+        int maxDepth = capture != null ? capture.maxReferenceDepth : -1;
+        return new Snapshot(Thread.currentThread(), this, maxDepth);
+    }
+
+    protected boolean fillSnapshot(
+            CapturedContext entryContext,
+            CapturedContext exitContext,
+            List<CapturedContext.CapturedThrowable> caughtExceptions,
+            Snapshot snapshot) {
+        String probeEncodedId = getProbeId().getEncodedId();
+        LogStatus entryStatus = convertStatus(entryContext.getStatus(probeEncodedId));
+        LogStatus exitStatus = convertStatus(exitContext.getStatus(probeEncodedId));
+        String message = null;
+        switch (evaluateAt) {
+            case ENTRY:
+            case DEFAULT:
+                message = entryStatus.getMessage();
+                break;
+            case EXIT:
+                message = exitStatus.getMessage();
+                break;
+        }
+        boolean shouldCommit = false;
+        if (entryStatus.shouldSend() && exitStatus.shouldSend()) {
+            snapshot.setTraceId(CorrelationIdentifier.getTraceId());
+            snapshot.setSpanId(CorrelationIdentifier.getSpanId());
+            if (isFullSnapshot()) {
+                assignCaptures(snapshot, entryContext, exitContext);
+            }
+            snapshot.setMessage(message);
+            snapshot.setDuration(exitContext.getDuration());
+            snapshot.addCaughtExceptions(caughtExceptions);
+            shouldCommit = true;
+        }
+        if (entryStatus.shouldReportError()) {
+            populateErrors(entryContext, snapshot, entryStatus, snapshot::setEntry);
+            shouldCommit = true;
+        }
+        if (exitStatus.shouldReportError()) {
+            populateErrors(exitContext, snapshot, exitStatus, snapshot::setExit);
+            shouldCommit = true;
+        }
+        return shouldCommit;
     }
-    DebuggerSink sink = DebuggerAgent.getSink();
-    Snapshot snapshot = createSnapshot();
-    boolean shouldCommit = false;
-    if (status.shouldSend()) {
-      if (isFullSnapshot()) {
-        // freeze context just before commit because line probes have only one context
-        Duration timeout =
-            Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout());
-        lineContext.freeze(TimeoutChecker.create(Config.get(), timeout));
-        snapshot.addLine(lineContext, line);
-      }
-      snapshot.setTraceId(CorrelationIdentifier.getTraceId());
-      snapshot.setSpanId(CorrelationIdentifier.getSpanId());
-      snapshot.setMessage(status.getMessage());
-      shouldCommit = true;
+
+    private void assignCaptures(Snapshot snapshot, CapturedContext entryContext, CapturedContext exitContext) {
+        if (isCaptureSnapshot()) {
+            addContextWithoutCaptureExpressions(entryContext, snapshot::setEntry);
+            addContextWithoutCaptureExpressions(exitContext, snapshot::setExit);
+        } else if (captureExpressions != null) {
+            addFilteredCaptureExpressions(entryContext, snapshot::setEntry);
+            addFilteredCaptureExpressions(exitContext, snapshot::setExit);
+        }
     }
-    if (status.shouldReportError()) {
-      snapshot.addEvaluationErrors(status.getErrors());
-      shouldCommit = true;
+
+    private void addContextWithoutCaptureExpressions(CapturedContext context, Consumer<CapturedContext> setContext) {
+        // no capture expressions, assign directly the context in the snapshot
+        if (context.getCaptureExpressions() == null
+                || context.getCaptureExpressions().isEmpty()) {
+            setContext.accept(context);
+            return;
+        }
+        CapturedContext newContext = context.copyWithoutCaptureExpressions();
+        setContext.accept(newContext);
+    }
+
+    private void addFilteredCaptureExpressions(CapturedContext capturedContext, Consumer<CapturedContext> setContext) {
+        Map<String, CapturedContext.CapturedValue> contextCapExpr = capturedContext.getCaptureExpressions();
+        if (contextCapExpr != null && !contextCapExpr.isEmpty()) {
+            CapturedContext newContext = new CapturedContext();
+            for (CaptureExpression capExprDef : captureExpressions) {
+                CapturedContext.CapturedValue capturedValue = contextCapExpr.get(capExprDef.getName());
+                if (capturedValue != null) {
+                    newContext.addCaptureExpression(capturedValue);
+                } else {
+                    LOGGER.debug("{} capture expression not found in CapturedContext", capExprDef.getName());
+                }
+            }
+            setContext.accept(newContext);
+        }
     }
-    if (shouldCommit) {
-      incrementBudget();
-      if (inBudget()) {
-        commitSnapshot(snapshot, sink);
-        return;
-      }
+
+    private void processCaptureExpressions(CapturedContext context, LogStatus logStatus) {
+        if (captureExpressions == null || !logStatus.shouldSend()) {
+            return;
+        }
+        for (CaptureExpression captureExpression : captureExpressions) {
+            try {
+                Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout());
+                TimeoutChecker timeoutChecker = TimeoutChecker.create(Config.get(), timeout);
+                Value<?> result = captureExpression.expr.execute(context, timeoutChecker);
+                if (result.isUndefined()) {
+                    throw new EvaluationException(
+                            "UNDEFINED", captureExpression.getExpr().getDsl());
+                }
+                if (result.isNull()) {
+                    context.addCaptureExpression(CapturedContext.CapturedValue.of(
+                            captureExpression.getName(), Object.class.getTypeName(), null));
+                } else {
+                    if (captureExpression.capture != null) {
+                        context.addCaptureExpression(Value.toCapturedSnapshot(
+                                captureExpression.getName(),
+                                result,
+                                captureExpression.capture.maxReferenceDepth,
+                                captureExpression.capture.maxCollectionSize,
+                                captureExpression.capture.maxLength,
+                                captureExpression.capture.maxFieldCount));
+                    } else {
+                        // inherit from probe capture field because no specific capture
+                        if (capture != null) {
+                            context.addCaptureExpression(Value.toCapturedSnapshot(
+                                    captureExpression.getName(),
+                                    result,
+                                    capture.maxReferenceDepth,
+                                    capture.maxCollectionSize,
+                                    capture.maxLength,
+                                    capture.maxFieldCount));
+                        } else {
+                            context.addCaptureExpression(Value.toCapturedSnapshot(captureExpression.getName(), result));
+                        }
+                    }
+                }
+            } catch (EvaluationException ex) {
+                logStatus.addError(new EvaluationError(ex.getExpr(), ex.getMessage()));
+                logStatus.setLogTemplateErrors(true);
+            } catch (Exception ex) {
+                // catch all for unexpected exceptions
+                logStatus.addError(
+                        new EvaluationError(captureExpression.getExpr().getDsl(), ex.getMessage()));
+                logStatus.setLogTemplateErrors(true);
+            }
+        }
     }
-  }
-
-  @Override
-  public boolean hasCondition() {
-    return probeCondition != null;
-  }
-
-  protected String getDebugSessionId() {
-    return getTagMap().get("session_id");
-  }
-
-  @Override
-  public CapturedContext.Status createStatus() {
-    return new LogStatus(this);
-  }
-
-  public static class LogStatus extends CapturedContext.Status {
-    public static final LogStatus EMPTY_LOG_STATUS =
-        new LogStatus(ProbeImplementation.UNKNOWN, false);
-    public static final LogStatus EMPTY_CAPTURING_LOG_STATUS =
-        new LogStatus(ProbeImplementation.UNKNOWN, true);
-
-    private boolean condition = true;
-    private final DebugSessionStatus debugSessionStatus;
-    private boolean hasLogTemplateErrors;
-    private boolean hasConditionErrors;
-    private boolean sampled = true;
-    private boolean forceSampling;
-    private String message;
-
-    public LogStatus(ProbeImplementation probeImplementation) {
-      super(probeImplementation);
-      debugSessionStatus = debugSessionStatus();
+
+    private static void populateErrors(
+            CapturedContext context, Snapshot snapshot, LogStatus status, Consumer<CapturedContext> contextSetter) {
+        if (context.getCapturedThrowable() != null) {
+            // report also uncaught exception
+            contextSetter.accept(context);
+        }
+        snapshot.addEvaluationErrors(status.getErrors());
+        if (status.getMessage() != null) {
+            snapshot.setMessage(status.getMessage());
+        } else if (!status.getErrors().isEmpty()) {
+            snapshot.setMessage(status.getErrors().get(0).getMessage());
+        }
     }
 
-    private LogStatus(ProbeImplementation probeImplementation, boolean condition) {
-      this(probeImplementation);
-      this.condition = condition;
+    private LogStatus convertStatus(CapturedContext.Status status) {
+        if (status == CapturedContext.Status.EMPTY_STATUS) {
+            return LogStatus.EMPTY_LOG_STATUS;
+        }
+        if (status == CapturedContext.Status.EMPTY_CAPTURING_STATUS) {
+            return LogStatus.EMPTY_CAPTURING_LOG_STATUS;
+        }
+        return (LogStatus) status;
+    }
+
+    protected void commitSnapshot(Snapshot snapshot, DebuggerSink sink) {
+        /*
+         * Record stack trace having the caller of this method as 'top' frame.
+         * For this it is necessary to discard:
+         * - Thread.currentThread().getStackTrace()
+         * - Snapshot.recordStackTrace()
+         * - LogProbe.commitSnapshot
+         * - ProbeDefinition.commit()
+         * - DebuggerContext.commit() or DebuggerContext.evalAndCommit()
+         */
+        if (isFullSnapshot()) {
+            snapshot.recordStackTrace(5);
+            sink.addSnapshot(snapshot);
+        } else {
+            sink.addHighRateSnapshot(snapshot);
+        }
     }
 
     @Override
-    public boolean shouldFreezeContext() {
-      return sampled && (((LogProbe) probeImplementation).isFullSnapshot()) && shouldSend();
+    public void commit(CapturedContext lineContext, int line) {
+        LogStatus status = (LogStatus) lineContext.getStatus(getProbeId().getEncodedId());
+        if (status == null) {
+            return;
+        }
+        DebuggerSink sink = DebuggerAgent.getSink();
+        Snapshot snapshot = createSnapshot();
+        boolean shouldCommit = false;
+        if (status.shouldSend()) {
+            if (isFullSnapshot()) {
+                // freeze context just before commit because line probes have only one context
+                Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout());
+                lineContext.freeze(TimeoutChecker.create(Config.get(), timeout));
+                snapshot.addLine(lineContext, line);
+            }
+            snapshot.setTraceId(CorrelationIdentifier.getTraceId());
+            snapshot.setSpanId(CorrelationIdentifier.getSpanId());
+            snapshot.setMessage(status.getMessage());
+            shouldCommit = true;
+        }
+        if (status.shouldReportError()) {
+            snapshot.addEvaluationErrors(status.getErrors());
+            shouldCommit = true;
+        }
+        if (shouldCommit) {
+            incrementBudget();
+            if (inBudget()) {
+                commitSnapshot(snapshot, sink);
+                return;
+            }
+        }
     }
 
     @Override
-    public boolean isCapturing() {
-      return condition;
+    public boolean hasCondition() {
+        return probeCondition != null;
     }
 
-    public boolean shouldSend() {
-      DebugSessionStatus status = getDebugSessionStatus();
-      // an ACTIVE status overrides the sampling as the sampling decision was made by the trigger
-      // probe
-      return status.isActive()
-          || !status.isDefined() && sampled && condition && !hasConditionErrors;
+    protected String getDebugSessionId() {
+        return getTagMap().get("session_id");
     }
 
-    public boolean shouldReportError() {
-      return sampled && (hasConditionErrors || hasLogTemplateErrors);
+    @Override
+    public CapturedContext.Status createStatus() {
+        return new LogStatus(this);
     }
 
-    public boolean getCondition() {
-      return condition;
-    }
+    public static class LogStatus extends CapturedContext.Status {
+        public static final LogStatus EMPTY_LOG_STATUS = new LogStatus(ProbeImplementation.UNKNOWN, false);
+        public static final LogStatus EMPTY_CAPTURING_LOG_STATUS = new LogStatus(ProbeImplementation.UNKNOWN, true);
 
-    public DebugSessionStatus getDebugSessionStatus() {
-      return debugSessionStatus;
-    }
+        private boolean condition = true;
+        private final DebugSessionStatus debugSessionStatus;
+        private boolean hasLogTemplateErrors;
+        private boolean hasConditionErrors;
+        private boolean sampled = true;
+        private boolean forceSampling;
+        private String message;
 
-    private DebugSessionStatus debugSessionStatus() {
-      if (probeImplementation instanceof LogProbe) {
-        LogProbe definition = (LogProbe) probeImplementation;
-        Map<String, String> sessions = getDebugSessions();
-        String sessionId = definition.getDebugSessionId();
-        if (sessionId == null) {
-          return DebugSessionStatus.NONE;
+        public LogStatus(ProbeImplementation probeImplementation) {
+            super(probeImplementation);
+            debugSessionStatus = debugSessionStatus();
         }
-        return "1".equals(sessions.get(sessionId)) || "1".equals(sessions.get("*"))
-            ? DebugSessionStatus.ACTIVE
-            : DebugSessionStatus.DISABLED;
-      }
 
-      return DebugSessionStatus.NONE;
-    }
+        private LogStatus(ProbeImplementation probeImplementation, boolean condition) {
+            this(probeImplementation);
+            this.condition = condition;
+        }
 
-    public void setCondition(boolean value) {
-      this.condition = value;
-    }
+        @Override
+        public boolean shouldFreezeContext() {
+            return sampled && (((LogProbe) probeImplementation).isFullSnapshot()) && shouldSend();
+        }
 
-    public boolean hasConditionErrors() {
-      return hasConditionErrors;
-    }
+        @Override
+        public boolean isCapturing() {
+            return condition;
+        }
 
-    public void setConditionErrors(boolean value) {
-      this.hasConditionErrors = value;
-    }
+        public boolean shouldSend() {
+            DebugSessionStatus status = getDebugSessionStatus();
+            // an ACTIVE status overrides the sampling as the sampling decision was made by the trigger
+            // probe
+            return status.isActive() || !status.isDefined() && sampled && condition && !hasConditionErrors;
+        }
 
-    public boolean hasLogTemplateErrors() {
-      return hasLogTemplateErrors;
-    }
+        public boolean shouldReportError() {
+            return sampled && (hasConditionErrors || hasLogTemplateErrors);
+        }
+
+        public boolean getCondition() {
+            return condition;
+        }
+
+        public DebugSessionStatus getDebugSessionStatus() {
+            return debugSessionStatus;
+        }
+
+        private DebugSessionStatus debugSessionStatus() {
+            if (probeImplementation instanceof LogProbe) {
+                LogProbe definition = (LogProbe) probeImplementation;
+                Map<String, String> sessions = getDebugSessions();
+                String sessionId = definition.getDebugSessionId();
+                if (sessionId == null) {
+                    return DebugSessionStatus.NONE;
+                }
+                return "1".equals(sessions.get(sessionId)) || "1".equals(sessions.get("*"))
+                        ? DebugSessionStatus.ACTIVE
+                        : DebugSessionStatus.DISABLED;
+            }
+
+            return DebugSessionStatus.NONE;
+        }
+
+        public void setCondition(boolean value) {
+            this.condition = value;
+        }
+
+        public boolean hasConditionErrors() {
+            return hasConditionErrors;
+        }
+
+        public void setConditionErrors(boolean value) {
+            this.hasConditionErrors = value;
+        }
+
+        public boolean hasLogTemplateErrors() {
+            return hasLogTemplateErrors;
+        }
+
+        public void setLogTemplateErrors(boolean value) {
+            this.hasLogTemplateErrors = value;
+        }
+
+        public void setMessage(String message) {
+            this.message = message;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public void setSampled(boolean sampled) {
+            this.sampled = sampled;
+        }
+
+        public boolean isSampled() {
+            return sampled;
+        }
+
+        public boolean isForceSampling() {
+            return forceSampling;
+        }
+
+        public void setForceSampling(boolean forceSampling) {
+            this.forceSampling = forceSampling;
+        }
 
-    public void setLogTemplateErrors(boolean value) {
-      this.hasLogTemplateErrors = value;
+        @Override
+        public String toString() {
+            return "LogStatus{"
+                    + ", probeId="
+                    + probeImplementation.getId()
+                    + ", condition="
+                    + condition
+                    + ", debugSessionStatus="
+                    + debugSessionStatus
+                    + ", forceSampling="
+                    + forceSampling
+                    + ", hasConditionErrors="
+                    + hasConditionErrors
+                    + ", hasLogTemplateErrors="
+                    + hasLogTemplateErrors
+                    + ", message='"
+                    + message
+                    + '\''
+                    + ", sampled="
+                    + sampled
+                    + '}';
+        }
     }
 
-    public void setMessage(String message) {
-      this.message = message;
+    private boolean inBudget() {
+        AtomicInteger budgetLevel = getBudgetLevel();
+        return budgetLevel == null
+                || budgetLevel.get() <= (captureSnapshot ? CAPTURING_PROBE_BUDGET : NON_CAPTURING_PROBE_BUDGET);
     }
 
-    public String getMessage() {
-      return message;
+    private AtomicInteger getBudgetLevel() {
+        TracerAPI tracer = AgentTracer.get();
+        AgentSpan span = tracer != null ? tracer.activeSpan() : null;
+        return getDebugSessionId() == null || span == null
+                ? null
+                : budget.computeIfAbsent(span.getLocalRootSpan().getTraceId(), id -> new AtomicInteger());
     }
 
-    public void setSampled(boolean sampled) {
-      this.sampled = sampled;
+    private void incrementBudget() {
+        AtomicInteger budgetLevel = getBudgetLevel();
+        if (budgetLevel != null) {
+            budgetLevel.incrementAndGet();
+            TracerAPI tracer = AgentTracer.get();
+            AgentSpan span = tracer != null ? tracer.activeSpan() : null;
+            if (span != null) {
+                span.getLocalRootSpan().setTag(format("_dd.ld.probe_id.%s", id), budgetLevel.get());
+            }
+        }
     }
 
-    public boolean isSampled() {
-      return sampled;
+    private boolean isFullSnapshot() {
+        return isCaptureSnapshot() || captureExpressions != null;
     }
 
-    public boolean isForceSampling() {
-      return forceSampling;
+    @Generated
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        LogProbe that = (LogProbe) o;
+        return Objects.equals(language, that.language)
+                && Objects.equals(id, that.id)
+                && version == that.version
+                && Arrays.equals(tags, that.tags)
+                && Objects.equals(tagMap, that.tagMap)
+                && Objects.equals(where, that.where)
+                && Objects.equals(evaluateAt, that.evaluateAt)
+                && Objects.equals(template, that.template)
+                && Objects.equals(segments, that.segments)
+                && Objects.equals(captureSnapshot, that.captureSnapshot)
+                && Objects.equals(probeCondition, that.probeCondition)
+                && Objects.equals(capture, that.capture)
+                && Objects.equals(sampling, that.sampling);
     }
 
-    public void setForceSampling(boolean forceSampling) {
-      this.forceSampling = forceSampling;
+    @Generated
+    @Override
+    public int hashCode() {
+        int result = Objects.hash(
+                language,
+                id,
+                version,
+                tagMap,
+                where,
+                evaluateAt,
+                template,
+                segments,
+                captureSnapshot,
+                probeCondition,
+                capture,
+                sampling);
+        result = 31 * result + Arrays.hashCode(tags);
+        return result;
     }
 
+    @Generated
     @Override
     public String toString() {
-      return "LogStatus{"
-          + ", probeId="
-          + probeImplementation.getId()
-          + ", condition="
-          + condition
-          + ", debugSessionStatus="
-          + debugSessionStatus
-          + ", forceSampling="
-          + forceSampling
-          + ", hasConditionErrors="
-          + hasConditionErrors
-          + ", hasLogTemplateErrors="
-          + hasLogTemplateErrors
-          + ", message='"
-          + message
-          + '\''
-          + ", sampled="
-          + sampled
-          + '}';
-    }
-  }
-
-  private boolean inBudget() {
-    AtomicInteger budgetLevel = getBudgetLevel();
-    return budgetLevel == null
-        || budgetLevel.get()
-            <= (captureSnapshot ? CAPTURING_PROBE_BUDGET : NON_CAPTURING_PROBE_BUDGET);
-  }
-
-  private AtomicInteger getBudgetLevel() {
-    TracerAPI tracer = AgentTracer.get();
-    AgentSpan span = tracer != null ? tracer.activeSpan() : null;
-    return getDebugSessionId() == null || span == null
-        ? null
-        : budget.computeIfAbsent(span.getLocalRootSpan().getTraceId(), id -> new AtomicInteger());
-  }
-
-  private void incrementBudget() {
-    AtomicInteger budgetLevel = getBudgetLevel();
-    if (budgetLevel != null) {
-      budgetLevel.incrementAndGet();
-      TracerAPI tracer = AgentTracer.get();
-      AgentSpan span = tracer != null ? tracer.activeSpan() : null;
-      if (span != null) {
-        span.getLocalRootSpan().setTag(format("_dd.ld.probe_id.%s", id), budgetLevel.get());
-      }
-    }
-  }
-
-  private boolean isFullSnapshot() {
-    return isCaptureSnapshot() || captureExpressions != null;
-  }
-
-  @Generated
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    LogProbe that = (LogProbe) o;
-    return Objects.equals(language, that.language)
-        && Objects.equals(id, that.id)
-        && version == that.version
-        && Arrays.equals(tags, that.tags)
-        && Objects.equals(tagMap, that.tagMap)
-        && Objects.equals(where, that.where)
-        && Objects.equals(evaluateAt, that.evaluateAt)
-        && Objects.equals(template, that.template)
-        && Objects.equals(segments, that.segments)
-        && Objects.equals(captureSnapshot, that.captureSnapshot)
-        && Objects.equals(probeCondition, that.probeCondition)
-        && Objects.equals(capture, that.capture)
-        && Objects.equals(sampling, that.sampling);
-  }
-
-  @Generated
-  @Override
-  public int hashCode() {
-    int result =
-        Objects.hash(
-            language,
-            id,
-            version,
-            tagMap,
-            where,
-            evaluateAt,
-            template,
-            segments,
-            captureSnapshot,
-            probeCondition,
-            capture,
-            sampling);
-    result = 31 * result + Arrays.hashCode(tags);
-    return result;
-  }
-
-  @Generated
-  @Override
-  public String toString() {
-    return getClass().getSimpleName()
-        + "{"
-        + "id='"
-        + id
-        + '\''
-        + ", version="
-        + version
-        + ", tags="
-        + Arrays.toString(tags)
-        + ", where="
-        + where
-        + ", evaluateAt="
-        + evaluateAt
-        + ", template='"
-        + template
-        + '\''
-        + ", segments="
-        + segments
-        + ", captureSnapshot="
-        + captureSnapshot
-        + ", when="
-        + probeCondition
-        + ", capture="
-        + capture
-        + ", sampling="
-        + sampling
-        + ", captureExpressions="
-        + captureExpressions
-        + "} ";
-  }
-
-  public static LogProbe.Builder builder() {
-    return new Builder();
-  }
-
-  public static class Builder extends ProbeDefinition.Builder<Builder> {
-    private String template;
-    private List<Segment> segments;
-    private boolean captureSnapshot;
-    private ProbeCondition probeCondition;
-    private Capture capture;
-    private Sampling sampling;
-    private List<CaptureExpression> captureExpressions;
-    private Consumer<Snapshot> snapshotProcessor;
-    private Duration evalTimeout =
-        Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout());
-
-    public Builder snapshotProcessor(Consumer<Snapshot> processor) {
-      this.snapshotProcessor = processor;
-      return this;
-    }
+        return getClass().getSimpleName()
+                + "{"
+                + "id='"
+                + id
+                + '\''
+                + ", version="
+                + version
+                + ", tags="
+                + Arrays.toString(tags)
+                + ", where="
+                + where
+                + ", evaluateAt="
+                + evaluateAt
+                + ", template='"
+                + template
+                + '\''
+                + ", segments="
+                + segments
+                + ", captureSnapshot="
+                + captureSnapshot
+                + ", when="
+                + probeCondition
+                + ", capture="
+                + capture
+                + ", sampling="
+                + sampling
+                + ", captureExpressions="
+                + captureExpressions
+                + "} ";
+    }
+
+    public static LogProbe.Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder extends ProbeDefinition.Builder<Builder> {
+        private String template;
+        private List<Segment> segments;
+        private boolean captureSnapshot;
+        private ProbeCondition probeCondition;
+        private Capture capture;
+        private Sampling sampling;
+        private List<CaptureExpression> captureExpressions;
+        private Consumer<Snapshot> snapshotProcessor;
+        private Duration evalTimeout = Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout());
+
+        public Builder snapshotProcessor(Consumer<Snapshot> processor) {
+            this.snapshotProcessor = processor;
+            return this;
+        }
 
-    public Builder template(String template, List<Segment> segments) {
-      this.template = template;
-      this.segments = segments;
-      return this;
-    }
+        public Builder template(String template, List<Segment> segments) {
+            this.template = template;
+            this.segments = segments;
+            return this;
+        }
 
-    public Builder captureSnapshot(boolean captureSnapshot) {
-      this.captureSnapshot = captureSnapshot;
-      return this;
-    }
+        public Builder captureSnapshot(boolean captureSnapshot) {
+            this.captureSnapshot = captureSnapshot;
+            return this;
+        }
 
-    public Builder capture(Capture capture) {
-      this.capture = capture;
-      return this;
-    }
+        public Builder capture(Capture capture) {
+            this.capture = capture;
+            return this;
+        }
 
-    public Builder sampling(Sampling sampling) {
-      this.sampling = sampling;
-      return this;
-    }
+        public Builder sampling(Sampling sampling) {
+            this.sampling = sampling;
+            return this;
+        }
 
-    public Builder when(ProbeCondition probeCondition) {
-      this.probeCondition = probeCondition;
-      return this;
-    }
+        public Builder when(ProbeCondition probeCondition) {
+            this.probeCondition = probeCondition;
+            return this;
+        }
 
-    public Builder capture(
-        int maxReferenceDepth, int maxCollectionSize, int maxLength, int maxFieldCount) {
-      return capture(new Capture(maxReferenceDepth, maxCollectionSize, maxLength, maxFieldCount));
-    }
+        public Builder capture(int maxReferenceDepth, int maxCollectionSize, int maxLength, int maxFieldCount) {
+            return capture(new Capture(maxReferenceDepth, maxCollectionSize, maxLength, maxFieldCount));
+        }
 
-    public Builder sampling(double rateLimit) {
-      return sampling(new Sampling(rateLimit));
-    }
+        public Builder sampling(double rateLimit) {
+            return sampling(new Sampling(rateLimit));
+        }
 
-    public Builder captureExpressions(List<CaptureExpression> captureExpressions) {
-      this.captureExpressions = captureExpressions;
-      return this;
-    }
+        public Builder captureExpressions(List<CaptureExpression> captureExpressions) {
+            this.captureExpressions = captureExpressions;
+            return this;
+        }
 
-    public Builder evalTimeout(Duration evalTimeout) {
-      this.evalTimeout = evalTimeout;
-      return this;
-    }
+        public Builder evalTimeout(Duration evalTimeout) {
+            this.evalTimeout = evalTimeout;
+            return this;
+        }
 
-    public LogProbe build() {
-      return new LogProbe(this);
+        public LogProbe build() {
+            return new LogProbe(this);
+        }
     }
-  }
-
-  @SuppressForbidden // String#split(String)
-  private static Map<String, String> getDebugSessions() {
-    HashMap<String, String> sessions = new HashMap<>();
-    TracerAPI tracer = AgentTracer.get();
-    if (tracer != null) {
-      AgentSpan span = tracer.activeSpan();
-      if (span instanceof DDSpan) {
-        DDSpanContext spanContext = (DDSpanContext) span.spanContext();
-        String debug = spanContext.getPropagationTags().getDebugPropagation();
-        if (debug != null) {
-          String[] entries = debug.split(",");
-          for (String entry : entries) {
-            if (!entry.contains(":")) {
-              sessions.put("*", entry);
-            } else {
-              String[] values = entry.split(":");
-              sessions.put(values[0], values[1]);
+
+    @SuppressForbidden // String#split(String)
+    private static Map<String, String> getDebugSessions() {
+        HashMap<String, String> sessions = new HashMap<>();
+        TracerAPI tracer = AgentTracer.get();
+        if (tracer != null) {
+            AgentSpan span = tracer.activeSpan();
+            if (span instanceof DDSpan) {
+                DDSpanContext spanContext = (DDSpanContext) span.spanContext();
+                String debug = spanContext.getPropagationTags().getDebugPropagation();
+                if (debug != null) {
+                    String[] entries = debug.split(",");
+                    for (String entry : entries) {
+                        if (!entry.contains(":")) {
+                            sessions.put("*", entry);
+                        } else {
+                            String[] values = entry.split(":");
+                            sessions.put(values[0], values[1]);
+                        }
+                    }
+                }
             }
-          }
         }
-      }
+        return sessions;
     }
-    return sessions;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/MetricProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/MetricProbe.java
index a410b5d2a8a..b9026ad2264 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/MetricProbe.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/MetricProbe.java
@@ -18,207 +18,205 @@
 /** Stores definition of a metric probe */
 public class MetricProbe extends ProbeDefinition {
 
-  public enum MetricKind {
-    COUNT {
-      @Override
-      public boolean isCompatible(Type type) {
-        return isLongOnlyCompatible(type);
-      }
-
-      @Override
-      public Collection<Type> getSupportedTypes() {
-        return Collections.singleton(Type.LONG_TYPE);
-      }
-    },
-    GAUGE {
-      @Override
-      public boolean isCompatible(Type type) {
-        return isLongAndDoubleCompatible(type);
-      }
-
-      @Override
-      public Collection<Type> getSupportedTypes() {
-        return Arrays.asList(Type.LONG_TYPE, Type.DOUBLE_TYPE);
-      }
-    },
-    HISTOGRAM {
-      @Override
-      public boolean isCompatible(Type type) {
-        return isLongAndDoubleCompatible(type);
-      }
-
-      @Override
-      public Collection<Type> getSupportedTypes() {
-        return Arrays.asList(Type.LONG_TYPE, Type.DOUBLE_TYPE);
-      }
-    },
-    DISTRIBUTION {
-      @Override
-      public boolean isCompatible(Type type) {
-        return isLongAndDoubleCompatible(type);
-      }
-
-      @Override
-      public Collection<Type> getSupportedTypes() {
-        return Arrays.asList(Type.LONG_TYPE, Type.DOUBLE_TYPE);
-      }
-    };
-
-    public abstract boolean isCompatible(Type type);
-
-    public abstract Collection<Type> getSupportedTypes();
-
-    protected boolean isLongOnlyCompatible(Type type) {
-      switch (type.getSort()) {
-        case Type.BYTE:
-        case Type.SHORT:
-        case Type.CHAR:
-        case Type.INT:
-        case Type.LONG:
-        case Type.BOOLEAN:
-          return true;
-      }
-      return false;
+    public enum MetricKind {
+        COUNT {
+            @Override
+            public boolean isCompatible(Type type) {
+                return isLongOnlyCompatible(type);
+            }
+
+            @Override
+            public Collection<Type> getSupportedTypes() {
+                return Collections.singleton(Type.LONG_TYPE);
+            }
+        },
+        GAUGE {
+            @Override
+            public boolean isCompatible(Type type) {
+                return isLongAndDoubleCompatible(type);
+            }
+
+            @Override
+            public Collection<Type> getSupportedTypes() {
+                return Arrays.asList(Type.LONG_TYPE, Type.DOUBLE_TYPE);
+            }
+        },
+        HISTOGRAM {
+            @Override
+            public boolean isCompatible(Type type) {
+                return isLongAndDoubleCompatible(type);
+            }
+
+            @Override
+            public Collection<Type> getSupportedTypes() {
+                return Arrays.asList(Type.LONG_TYPE, Type.DOUBLE_TYPE);
+            }
+        },
+        DISTRIBUTION {
+            @Override
+            public boolean isCompatible(Type type) {
+                return isLongAndDoubleCompatible(type);
+            }
+
+            @Override
+            public Collection<Type> getSupportedTypes() {
+                return Arrays.asList(Type.LONG_TYPE, Type.DOUBLE_TYPE);
+            }
+        };
+
+        public abstract boolean isCompatible(Type type);
+
+        public abstract Collection<Type> getSupportedTypes();
+
+        protected boolean isLongOnlyCompatible(Type type) {
+            switch (type.getSort()) {
+                case Type.BYTE:
+                case Type.SHORT:
+                case Type.CHAR:
+                case Type.INT:
+                case Type.LONG:
+                case Type.BOOLEAN:
+                    return true;
+            }
+            return false;
+        }
+
+        protected boolean isLongAndDoubleCompatible(Type type) {
+            switch (type.getSort()) {
+                case Type.BYTE:
+                case Type.SHORT:
+                case Type.CHAR:
+                case Type.INT:
+                case Type.LONG:
+                case Type.FLOAT:
+                case Type.DOUBLE:
+                case Type.BOOLEAN:
+                    return true;
+            }
+            return false;
+        }
     }
 
-    protected boolean isLongAndDoubleCompatible(Type type) {
-      switch (type.getSort()) {
-        case Type.BYTE:
-        case Type.SHORT:
-        case Type.CHAR:
-        case Type.INT:
-        case Type.LONG:
-        case Type.FLOAT:
-        case Type.DOUBLE:
-        case Type.BOOLEAN:
-          return true;
-      }
-      return false;
+    private final MetricKind kind;
+    private final String metricName;
+    private final ValueScript value;
+
+    // no-arg constructor is required by Moshi to avoid creating instance with unsafe and by-passing
+    // constructors, including field initializers.
+    public MetricProbe() {
+        this(LANGUAGE, null, null, null, MethodLocation.DEFAULT, MetricKind.COUNT, null, null);
+    }
+
+    public MetricProbe(
+            String language,
+            ProbeId probeId,
+            String[] tagStrs,
+            Where where,
+            MethodLocation evaluateAt,
+            MetricKind kind,
+            String metricName,
+            ValueScript value) {
+        super(language, probeId, tagStrs, where, evaluateAt);
+        this.kind = kind;
+        this.metricName = metricName;
+        this.value = value;
+    }
+
+    public MetricKind getKind() {
+        return kind;
+    }
+
+    public String getMetricName() {
+        return metricName;
     }
-  }
-
-  private final MetricKind kind;
-  private final String metricName;
-  private final ValueScript value;
-
-  // no-arg constructor is required by Moshi to avoid creating instance with unsafe and by-passing
-  // constructors, including field initializers.
-  public MetricProbe() {
-    this(LANGUAGE, null, null, null, MethodLocation.DEFAULT, MetricKind.COUNT, null, null);
-  }
-
-  public MetricProbe(
-      String language,
-      ProbeId probeId,
-      String[] tagStrs,
-      Where where,
-      MethodLocation evaluateAt,
-      MetricKind kind,
-      String metricName,
-      ValueScript value) {
-    super(language, probeId, tagStrs, where, evaluateAt);
-    this.kind = kind;
-    this.metricName = metricName;
-    this.value = value;
-  }
-
-  public MetricKind getKind() {
-    return kind;
-  }
-
-  public String getMetricName() {
-    return metricName;
-  }
-
-  public ValueScript getValue() {
-    return value;
-  }
-
-  @Override
-  public InstrumentationResult.Status instrument(
-      MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices) {
-    return new MetricInstrumenter(this, methodInfo, diagnostics, probeIndices).instrument();
-  }
-
-  public static Builder builder() {
-    return new Builder();
-  }
-
-  public static class Builder extends ProbeDefinition.Builder<Builder> {
-    private MetricKind kind;
-    private String metricName;
-    private ValueScript valueScript;
-
-    public Builder kind(MetricKind kind) {
-      this.kind = kind;
-      return this;
+
+    public ValueScript getValue() {
+        return value;
+    }
+
+    @Override
+    public InstrumentationResult.Status instrument(
+            MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices) {
+        return new MetricInstrumenter(this, methodInfo, diagnostics, probeIndices).instrument();
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder extends ProbeDefinition.Builder<Builder> {
+        private MetricKind kind;
+        private String metricName;
+        private ValueScript valueScript;
+
+        public Builder kind(MetricKind kind) {
+            this.kind = kind;
+            return this;
+        }
+
+        public Builder metricName(String name) {
+            this.metricName = name;
+            return this;
+        }
+
+        public Builder valueScript(ValueScript valueScript) {
+            this.valueScript = valueScript;
+            return this;
+        }
+
+        public MetricProbe build() {
+            return new MetricProbe(language, probeId, tagStrs, where, evaluateAt, kind, metricName, valueScript);
+        }
     }
 
-    public Builder metricName(String name) {
-      this.metricName = name;
-      return this;
+    @Generated
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        MetricProbe that = (MetricProbe) o;
+        return Objects.equals(language, that.language)
+                && Objects.equals(id, that.id)
+                && version == that.version
+                && Arrays.equals(tags, that.tags)
+                && Objects.equals(tagMap, that.tagMap)
+                && Objects.equals(where, that.where)
+                && Objects.equals(evaluateAt, that.evaluateAt)
+                && kind == that.kind
+                && Objects.equals(metricName, that.metricName)
+                && Objects.equals(value, that.value);
     }
 
-    public Builder valueScript(ValueScript valueScript) {
-      this.valueScript = valueScript;
-      return this;
+    @Generated
+    @Override
+    public int hashCode() {
+        int result = Objects.hash(language, id, version, tagMap, where, evaluateAt, kind, metricName, value);
+        result = 31 * result + Arrays.hashCode(tags);
+        return result;
     }
 
-    public MetricProbe build() {
-      return new MetricProbe(
-          language, probeId, tagStrs, where, evaluateAt, kind, metricName, valueScript);
+    @Generated
+    @Override
+    public String toString() {
+        return "MetricProbe{"
+                + "id='"
+                + id
+                + '\''
+                + ", version="
+                + version
+                + ", tags="
+                + Arrays.toString(tags)
+                + ", where="
+                + where
+                + ", evaluateAt="
+                + evaluateAt
+                + ", kind="
+                + kind
+                + ", metricName='"
+                + metricName
+                + ", valueScript='"
+                + value
+                + '\''
+                + "} ";
     }
-  }
-
-  @Generated
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    MetricProbe that = (MetricProbe) o;
-    return Objects.equals(language, that.language)
-        && Objects.equals(id, that.id)
-        && version == that.version
-        && Arrays.equals(tags, that.tags)
-        && Objects.equals(tagMap, that.tagMap)
-        && Objects.equals(where, that.where)
-        && Objects.equals(evaluateAt, that.evaluateAt)
-        && kind == that.kind
-        && Objects.equals(metricName, that.metricName)
-        && Objects.equals(value, that.value);
-  }
-
-  @Generated
-  @Override
-  public int hashCode() {
-    int result =
-        Objects.hash(language, id, version, tagMap, where, evaluateAt, kind, metricName, value);
-    result = 31 * result + Arrays.hashCode(tags);
-    return result;
-  }
-
-  @Generated
-  @Override
-  public String toString() {
-    return "MetricProbe{"
-        + "id='"
-        + id
-        + '\''
-        + ", version="
-        + version
-        + ", tags="
-        + Arrays.toString(tags)
-        + ", where="
-        + where
-        + ", evaluateAt="
-        + evaluateAt
-        + ", kind="
-        + kind
-        + ", metricName='"
-        + metricName
-        + ", valueScript='"
-        + value
-        + '\''
-        + "} ";
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java
index 39cde2b8938..c9a61174fa9 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java
@@ -23,337 +23,324 @@
 
 /** Generic class storing common probe definition */
 public abstract class ProbeDefinition implements ProbeImplementation {
-  protected static final String LANGUAGE = "java";
-
-  protected final String language;
-  protected final String id;
-  protected final int version;
-  private transient ProbeId probeId;
-  protected final Tag[] tags;
-  protected final Map<String, String> tagMap = new HashMap<>();
-  protected final Where where;
-  protected final MethodLocation evaluateAt;
-  protected transient ProbeLocation location;
-
-  protected ProbeDefinition(
-      String language, ProbeId probeId, String[] tagStrs, Where where, MethodLocation evaluateAt) {
-    this(language, probeId, Tag.fromStrings(tagStrs), where, evaluateAt);
-  }
-
-  protected ProbeDefinition(
-      String language, ProbeId probeId, Tag[] tags, Where where, MethodLocation evaluateAt) {
-    this.language = language;
-    this.id = probeId != null ? probeId.getId() : null;
-    this.version = probeId != null ? probeId.getVersion() : 0;
-    this.probeId = probeId;
-    this.tags = tags;
-    initTagMap(tagMap, tags);
-    this.where = where;
-    this.evaluateAt = evaluateAt;
-  }
-
-  @Override
-  public String getId() {
-    return id;
-  }
-
-  @Override
-  public ProbeId getProbeId() {
-    if (probeId == null) {
-      probeId = new ProbeId(id, version);
+    protected static final String LANGUAGE = "java";
+
+    protected final String language;
+    protected final String id;
+    protected final int version;
+    private transient ProbeId probeId;
+    protected final Tag[] tags;
+    protected final Map<String, String> tagMap = new HashMap<>();
+    protected final Where where;
+    protected final MethodLocation evaluateAt;
+    protected transient ProbeLocation location;
+
+    protected ProbeDefinition(
+            String language, ProbeId probeId, String[] tagStrs, Where where, MethodLocation evaluateAt) {
+        this(language, probeId, Tag.fromStrings(tagStrs), where, evaluateAt);
     }
-    return probeId;
-  }
 
-  public String getLanguage() {
-    return language;
-  }
-
-  public Tag[] getTags() {
-    return tags;
-  }
-
-  @Override
-  public String getStrTags() {
-    return concatTags();
-  }
-
-  public String concatTags() {
-    if (tags == null) {
-      return null;
+    protected ProbeDefinition(String language, ProbeId probeId, Tag[] tags, Where where, MethodLocation evaluateAt) {
+        this.language = language;
+        this.id = probeId != null ? probeId.getId() : null;
+        this.version = probeId != null ? probeId.getVersion() : 0;
+        this.probeId = probeId;
+        this.tags = tags;
+        initTagMap(tagMap, tags);
+        this.where = where;
+        this.evaluateAt = evaluateAt;
     }
-    StringBuilder sb = new StringBuilder();
-    for (Tag tag : tags) {
-      if (sb.length() > 0) {
-        sb.append(',');
-      }
-      sb.append(tag);
-    }
-    return sb.toString();
-  }
 
-  public Map<String, String> getTagMap() {
-    if (tagMap.isEmpty() && tags != null) {
-      initTagMap(tagMap, tags);
-    }
-    return Collections.unmodifiableMap(tagMap);
-  }
-
-  public Where getWhere() {
-    return where;
-  }
-
-  public MethodLocation getEvaluateAt() {
-    return evaluateAt;
-  }
-
-  public void buildLocation(MethodInfo methodInfo) {
-    String type = where.getTypeName();
-    String method = where.getMethodName();
-    if (methodInfo != null) {
-      type = methodInfo.getTypeName();
-      method = methodInfo.getMethodName();
-    }
-    List<String> lines = where.getLines() != null ? Arrays.asList(where.getLines()) : null;
-    this.location = new ProbeLocation(type, method, where.getSourceFile(), lines);
-  }
-
-  private static void initTagMap(Map<String, String> tagMap, Tag[] tags) {
-    tagMap.clear();
-    if (tags != null) {
-      for (Tag tag : tags) {
-        tagMap.put(tag.getKey(), tag.getValue());
-      }
-    }
-  }
-
-  public abstract InstrumentationResult.Status instrument(
-      MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices);
-
-  @Override
-  public ProbeLocation getLocation() {
-    return location;
-  }
-
-  @Override
-  public void evaluate(
-      CapturedContext context,
-      CapturedContext.Status status,
-      MethodLocation methodLocation,
-      boolean singleProbe) {}
-
-  @Override
-  public void commit(
-      CapturedContext entryContext,
-      CapturedContext exitContext,
-      List<CapturedContext.CapturedThrowable> caughtExceptions) {}
-
-  /** Commit snapshot based on line context and the current probe This is for line probes */
-  @Override
-  public void commit(CapturedContext lineContext, int line) {}
-
-  @Override
-  public CapturedContext.Status createStatus() {
-    return null;
-  }
-
-  public boolean isLineProbe() {
-    Where.SourceLine[] sourceLines = where.getSourceLines();
-    return sourceLines != null && sourceLines.length > 0;
-  }
-
-  public abstract static class Builder<T extends Builder> {
-    protected String language = LANGUAGE;
-    protected ProbeId probeId;
-    protected String[] tagStrs;
-    protected Where where;
-    protected MethodLocation evaluateAt = MethodLocation.DEFAULT;
-
-    public T language(String language) {
-      this.language = language;
-      return (T) this;
+    @Override
+    public String getId() {
+        return id;
     }
 
-    public T probeId(String id, int version) {
-      this.probeId = new ProbeId(id, version);
-      return (T) this;
+    @Override
+    public ProbeId getProbeId() {
+        if (probeId == null) {
+            probeId = new ProbeId(id, version);
+        }
+        return probeId;
     }
 
-    public T probeId(ProbeId probeId) {
-      this.probeId = probeId;
-      return (T) this;
+    public String getLanguage() {
+        return language;
     }
 
-    public T tags(String... tagStrs) {
-      this.tagStrs = tagStrs;
-      return (T) this;
+    public Tag[] getTags() {
+        return tags;
     }
 
-    public T where(Where where) {
-      this.where = where;
-      return (T) this;
+    @Override
+    public String getStrTags() {
+        return concatTags();
     }
 
-    public T evaluateAt(MethodLocation evaluateAt) {
-      this.evaluateAt = evaluateAt;
-      return (T) this;
+    public String concatTags() {
+        if (tags == null) {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        for (Tag tag : tags) {
+            if (sb.length() > 0) {
+                sb.append(',');
+            }
+            sb.append(tag);
+        }
+        return sb.toString();
     }
 
-    public T where(String typeName, String methodName) {
-      return where(new Where(typeName, methodName, null, (Where.SourceLine[]) null, null));
+    public Map<String, String> getTagMap() {
+        if (tagMap.isEmpty() && tags != null) {
+            initTagMap(tagMap, tags);
+        }
+        return Collections.unmodifiableMap(tagMap);
     }
 
-    public T where(String typeName, String methodName, String signature) {
-      return where(new Where(typeName, methodName, signature, (Where.SourceLine[]) null, null));
+    public Where getWhere() {
+        return where;
     }
 
-    public T where(String typeName, String methodName, String signature, String... lines) {
-      return where(new Where(typeName, methodName, signature, Where.sourceLines(lines), null));
+    public MethodLocation getEvaluateAt() {
+        return evaluateAt;
     }
 
-    public T where(String sourceFile, int line) {
-      return where(new Where(null, null, null, new String[] {String.valueOf(line)}, sourceFile));
+    public void buildLocation(MethodInfo methodInfo) {
+        String type = where.getTypeName();
+        String method = where.getMethodName();
+        if (methodInfo != null) {
+            type = methodInfo.getTypeName();
+            method = methodInfo.getMethodName();
+        }
+        List<String> lines = where.getLines() != null ? Arrays.asList(where.getLines()) : null;
+        this.location = new ProbeLocation(type, method, where.getSourceFile(), lines);
     }
 
-    public T where(String sourceFile, int lineFrom, int lineTill) {
-      return where(
-          new Where(
-              null,
-              null,
-              null,
-              new Where.SourceLine[] {new Where.SourceLine(lineFrom, lineTill)},
-              sourceFile));
+    private static void initTagMap(Map<String, String> tagMap, Tag[] tags) {
+        tagMap.clear();
+        if (tags != null) {
+            for (Tag tag : tags) {
+                tagMap.put(tag.getKey(), tag.getValue());
+            }
+        }
     }
 
-    public T where(
-        String typeName, String methodName, String signature, int codeLine, String source) {
-      return where(
-          new Where(
-              typeName,
-              methodName,
-              signature,
-              new Where.SourceLine[] {new Where.SourceLine(codeLine)},
-              source));
-    }
+    public abstract InstrumentationResult.Status instrument(
+            MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices);
 
-    public T where(
-        String typeName,
-        String methodName,
-        String signature,
-        int codeLineFrom,
-        int codeLineTill,
-        String source) {
-      return where(
-          new Where(
-              typeName,
-              methodName,
-              signature,
-              new Where.SourceLine[] {new Where.SourceLine(codeLineFrom, codeLineTill)},
-              source));
+    @Override
+    public ProbeLocation getLocation() {
+        return location;
     }
-  }
 
-  public static final class Tag {
-    private final String key;
-    private final String value;
+    @Override
+    public void evaluate(
+            CapturedContext context,
+            CapturedContext.Status status,
+            MethodLocation methodLocation,
+            boolean singleProbe) {}
 
-    public Tag(String key) {
-      this(key, null);
-    }
+    @Override
+    public void commit(
+            CapturedContext entryContext,
+            CapturedContext exitContext,
+            List<CapturedContext.CapturedThrowable> caughtExceptions) {}
 
-    public Tag(String key, String value) {
-      this.key = key;
-      this.value = value;
-    }
+    /** Commit snapshot based on line context and the current probe This is for line probes */
+    @Override
+    public void commit(CapturedContext lineContext, int line) {}
 
-    public String getKey() {
-      return key;
+    @Override
+    public CapturedContext.Status createStatus() {
+        return null;
     }
 
-    public String getValue() {
-      return value;
+    public boolean isLineProbe() {
+        Where.SourceLine[] sourceLines = where.getSourceLines();
+        return sourceLines != null && sourceLines.length > 0;
     }
 
-    public boolean hasValue() {
-      return value != null;
-    }
+    public abstract static class Builder<T extends Builder> {
+        protected String language = LANGUAGE;
+        protected ProbeId probeId;
+        protected String[] tagStrs;
+        protected Where where;
+        protected MethodLocation evaluateAt = MethodLocation.DEFAULT;
 
-    @Override
-    public String toString() {
-      if (hasValue()) {
-        return key + ":" + value;
-      } else {
-        return key;
-      }
-    }
+        public T language(String language) {
+            this.language = language;
+            return (T) this;
+        }
 
-    public static Tag fromString(String def) {
-      int delimIndex = def.indexOf(':');
-      if (delimIndex == -1) {
-        return new Tag(def.trim(), null);
-      } else {
-        String key = def.substring(0, delimIndex).trim();
-        String value = def.substring(delimIndex + 1).trim();
-        return new Tag(key, value);
-      }
-    }
+        public T probeId(String id, int version) {
+            this.probeId = new ProbeId(id, version);
+            return (T) this;
+        }
 
-    public static Tag[] fromStrings(String[] tagStrs) {
-      Tag[] tags = null;
-      if (tagStrs != null) {
-        tags = new ProbeDefinition.Tag[tagStrs.length];
-        for (int i = 0; i < tagStrs.length; i++) {
-          tags[i] = fromString(tagStrs[i]);
+        public T probeId(ProbeId probeId) {
+            this.probeId = probeId;
+            return (T) this;
         }
-      }
-      return tags;
-    }
 
-    @Generated
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      Tag tag = (Tag) o;
-      return Objects.equals(key, tag.key) && Objects.equals(value, tag.value);
-    }
+        public T tags(String... tagStrs) {
+            this.tagStrs = tagStrs;
+            return (T) this;
+        }
 
-    @Generated
-    @Override
-    public int hashCode() {
-      return Objects.hash(key, value);
+        public T where(Where where) {
+            this.where = where;
+            return (T) this;
+        }
+
+        public T evaluateAt(MethodLocation evaluateAt) {
+            this.evaluateAt = evaluateAt;
+            return (T) this;
+        }
+
+        public T where(String typeName, String methodName) {
+            return where(new Where(typeName, methodName, null, (Where.SourceLine[]) null, null));
+        }
+
+        public T where(String typeName, String methodName, String signature) {
+            return where(new Where(typeName, methodName, signature, (Where.SourceLine[]) null, null));
+        }
+
+        public T where(String typeName, String methodName, String signature, String... lines) {
+            return where(new Where(typeName, methodName, signature, Where.sourceLines(lines), null));
+        }
+
+        public T where(String sourceFile, int line) {
+            return where(new Where(null, null, null, new String[] {String.valueOf(line)}, sourceFile));
+        }
+
+        public T where(String sourceFile, int lineFrom, int lineTill) {
+            return where(new Where(
+                    null, null, null, new Where.SourceLine[] {new Where.SourceLine(lineFrom, lineTill)}, sourceFile));
+        }
+
+        public T where(String typeName, String methodName, String signature, int codeLine, String source) {
+            return where(new Where(
+                    typeName, methodName, signature, new Where.SourceLine[] {new Where.SourceLine(codeLine)}, source));
+        }
+
+        public T where(
+                String typeName,
+                String methodName,
+                String signature,
+                int codeLineFrom,
+                int codeLineTill,
+                String source) {
+            return where(new Where(
+                    typeName,
+                    methodName,
+                    signature,
+                    new Where.SourceLine[] {new Where.SourceLine(codeLineFrom, codeLineTill)},
+                    source));
+        }
     }
-  }
 
-  public static class TagAdapter extends JsonAdapter<Tag[]> {
-    private static String[] STRING_ARRAY = new String[0];
+    public static final class Tag {
+        private final String key;
+        private final String value;
 
-    @Override
-    public Tag[] fromJson(JsonReader jsonReader) throws IOException {
-      if (jsonReader.peek() == JsonReader.Token.NULL) {
-        jsonReader.nextNull();
-        return null;
-      }
-      List<String> tags = new ArrayList<>();
-      jsonReader.beginArray();
-      while (jsonReader.hasNext()) {
-        tags.add(jsonReader.nextString());
-      }
-      jsonReader.endArray();
-      return Tag.fromStrings(tags.toArray(STRING_ARRAY));
+        public Tag(String key) {
+            this(key, null);
+        }
+
+        public Tag(String key, String value) {
+            this.key = key;
+            this.value = value;
+        }
+
+        public String getKey() {
+            return key;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public boolean hasValue() {
+            return value != null;
+        }
+
+        @Override
+        public String toString() {
+            if (hasValue()) {
+                return key + ":" + value;
+            } else {
+                return key;
+            }
+        }
+
+        public static Tag fromString(String def) {
+            int delimIndex = def.indexOf(':');
+            if (delimIndex == -1) {
+                return new Tag(def.trim(), null);
+            } else {
+                String key = def.substring(0, delimIndex).trim();
+                String value = def.substring(delimIndex + 1).trim();
+                return new Tag(key, value);
+            }
+        }
+
+        public static Tag[] fromStrings(String[] tagStrs) {
+            Tag[] tags = null;
+            if (tagStrs != null) {
+                tags = new ProbeDefinition.Tag[tagStrs.length];
+                for (int i = 0; i < tagStrs.length; i++) {
+                    tags[i] = fromString(tagStrs[i]);
+                }
+            }
+            return tags;
+        }
+
+        @Generated
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Tag tag = (Tag) o;
+            return Objects.equals(key, tag.key) && Objects.equals(value, tag.value);
+        }
+
+        @Generated
+        @Override
+        public int hashCode() {
+            return Objects.hash(key, value);
+        }
     }
 
-    @Override
-    public void toJson(JsonWriter jsonWriter, Tag[] tags) throws IOException {
-      if (tags == null) {
-        jsonWriter.nullValue();
-        return;
-      }
-      jsonWriter.beginArray();
-      for (Tag tag : tags) {
-        jsonWriter.value(tag.toString());
-      }
-      jsonWriter.endArray();
+    public static class TagAdapter extends JsonAdapter<Tag[]> {
+        private static String[] STRING_ARRAY = new String[0];
+
+        @Override
+        public Tag[] fromJson(JsonReader jsonReader) throws IOException {
+            if (jsonReader.peek() == JsonReader.Token.NULL) {
+                jsonReader.nextNull();
+                return null;
+            }
+            List<String> tags = new ArrayList<>();
+            jsonReader.beginArray();
+            while (jsonReader.hasNext()) {
+                tags.add(jsonReader.nextString());
+            }
+            jsonReader.endArray();
+            return Tag.fromStrings(tags.toArray(STRING_ARRAY));
+        }
+
+        @Override
+        public void toJson(JsonWriter jsonWriter, Tag[] tags) throws IOException {
+            if (tags == null) {
+                jsonWriter.nullValue();
+                return;
+            }
+            jsonWriter.beginArray();
+            for (Tag tag : tags) {
+                jsonWriter.value(tag.toString());
+            }
+            jsonWriter.endArray();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinitionDeserializer.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinitionDeserializer.java
index 891200f0c3d..4d2317ee9fb 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinitionDeserializer.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinitionDeserializer.java
@@ -9,80 +9,76 @@
 import okio.Okio;
 
 public class ProbeDefinitionDeserializer {
-  static final JsonAdapter<Configuration> CONFIGURATION_JSON_ADAPTER =
-      MoshiHelper.createMoshiConfig().adapter(Configuration.class);
-  static final JsonAdapter<MetricProbe> METRIC_PROBE_JSON_ADAPTER =
-      MoshiHelper.createMoshiConfig().adapter(MetricProbe.class);
-  static final JsonAdapter<LogProbe> LOG_PROBE_JSON_ADAPTER =
-      MoshiHelper.createMoshiConfig().adapter(LogProbe.class);
-  static final JsonAdapter<SpanProbe> SPAN_PROBE_JSON_ADAPTER =
-      MoshiHelper.createMoshiConfig().adapter(SpanProbe.class);
-  static final JsonAdapter<TriggerProbe> TRIGGER_PROBE_JSON_ADAPTER =
-      MoshiHelper.createMoshiConfig().adapter(TriggerProbe.class);
-  static final JsonAdapter<SpanDecorationProbe> SPAN_DECORATION_PROBE_JSON_ADAPTER =
-      MoshiHelper.createMoshiConfig().adapter(SpanDecorationProbe.class);
+    static final JsonAdapter<Configuration> CONFIGURATION_JSON_ADAPTER =
+            MoshiHelper.createMoshiConfig().adapter(Configuration.class);
+    static final JsonAdapter<MetricProbe> METRIC_PROBE_JSON_ADAPTER =
+            MoshiHelper.createMoshiConfig().adapter(MetricProbe.class);
+    static final JsonAdapter<LogProbe> LOG_PROBE_JSON_ADAPTER =
+            MoshiHelper.createMoshiConfig().adapter(LogProbe.class);
+    static final JsonAdapter<SpanProbe> SPAN_PROBE_JSON_ADAPTER =
+            MoshiHelper.createMoshiConfig().adapter(SpanProbe.class);
+    static final JsonAdapter<TriggerProbe> TRIGGER_PROBE_JSON_ADAPTER =
+            MoshiHelper.createMoshiConfig().adapter(TriggerProbe.class);
+    static final JsonAdapter<SpanDecorationProbe> SPAN_DECORATION_PROBE_JSON_ADAPTER =
+            MoshiHelper.createMoshiConfig().adapter(SpanDecorationProbe.class);
 
-  public static Configuration deserializeConfiguration(byte[] content) throws IOException {
-    return deserialize(CONFIGURATION_JSON_ADAPTER, content);
-  }
+    public static Configuration deserializeConfiguration(byte[] content) throws IOException {
+        return deserialize(CONFIGURATION_JSON_ADAPTER, content);
+    }
 
-  public static MetricProbe deserializeMetricProbe(byte[] content) throws IOException {
-    return deserialize(METRIC_PROBE_JSON_ADAPTER, content);
-  }
+    public static MetricProbe deserializeMetricProbe(byte[] content) throws IOException {
+        return deserialize(METRIC_PROBE_JSON_ADAPTER, content);
+    }
 
-  public static MetricProbe deserializeMetricProbe(JsonReader reader) throws IOException {
-    return METRIC_PROBE_JSON_ADAPTER.fromJson(reader);
-  }
+    public static MetricProbe deserializeMetricProbe(JsonReader reader) throws IOException {
+        return METRIC_PROBE_JSON_ADAPTER.fromJson(reader);
+    }
 
-  public static LogProbe deserializeLogProbe(byte[] content) throws IOException {
-    LogProbe logProbe = deserialize(LOG_PROBE_JSON_ADAPTER, content);
-    logProbe.initSamplers();
-    return logProbe;
-  }
+    public static LogProbe deserializeLogProbe(byte[] content) throws IOException {
+        LogProbe logProbe = deserialize(LOG_PROBE_JSON_ADAPTER, content);
+        logProbe.initSamplers();
+        return logProbe;
+    }
 
-  public static LogProbe deserializeLogProbe(JsonReader reader) throws IOException {
-    LogProbe logProbe = LOG_PROBE_JSON_ADAPTER.fromJson(reader);
-    logProbe.initSamplers();
-    return logProbe;
-  }
+    public static LogProbe deserializeLogProbe(JsonReader reader) throws IOException {
+        LogProbe logProbe = LOG_PROBE_JSON_ADAPTER.fromJson(reader);
+        logProbe.initSamplers();
+        return logProbe;
+    }
 
-  public static SpanProbe deserializeSpanProbe(byte[] content) throws IOException {
-    return deserialize(SPAN_PROBE_JSON_ADAPTER, content);
-  }
+    public static SpanProbe deserializeSpanProbe(byte[] content) throws IOException {
+        return deserialize(SPAN_PROBE_JSON_ADAPTER, content);
+    }
 
-  public static SpanProbe deserializeSpanProbe(JsonReader reader) throws IOException {
-    return SPAN_PROBE_JSON_ADAPTER.fromJson(reader);
-  }
+    public static SpanProbe deserializeSpanProbe(JsonReader reader) throws IOException {
+        return SPAN_PROBE_JSON_ADAPTER.fromJson(reader);
+    }
 
-  public static TriggerProbe deserializeTriggerProbe(byte[] content) throws IOException {
-    TriggerProbe triggerProbe = deserialize(TRIGGER_PROBE_JSON_ADAPTER, content);
-    triggerProbe.initSamplers();
-    return triggerProbe;
-  }
+    public static TriggerProbe deserializeTriggerProbe(byte[] content) throws IOException {
+        TriggerProbe triggerProbe = deserialize(TRIGGER_PROBE_JSON_ADAPTER, content);
+        triggerProbe.initSamplers();
+        return triggerProbe;
+    }
 
-  public static TriggerProbe deserializeTriggerProbe(JsonReader jsonReader) throws IOException {
-    TriggerProbe triggerProbe = TRIGGER_PROBE_JSON_ADAPTER.fromJson(jsonReader);
-    triggerProbe.initSamplers();
-    return triggerProbe;
-  }
+    public static TriggerProbe deserializeTriggerProbe(JsonReader jsonReader) throws IOException {
+        TriggerProbe triggerProbe = TRIGGER_PROBE_JSON_ADAPTER.fromJson(jsonReader);
+        triggerProbe.initSamplers();
+        return triggerProbe;
+    }
 
-  public static SpanDecorationProbe deserializeSpanDecorationProbe(byte[] content)
-      throws IOException {
-    SpanDecorationProbe spanDecorationProbe =
-        deserialize(SPAN_DECORATION_PROBE_JSON_ADAPTER, content);
-    spanDecorationProbe.initSamplers();
-    return spanDecorationProbe;
-  }
+    public static SpanDecorationProbe deserializeSpanDecorationProbe(byte[] content) throws IOException {
+        SpanDecorationProbe spanDecorationProbe = deserialize(SPAN_DECORATION_PROBE_JSON_ADAPTER, content);
+        spanDecorationProbe.initSamplers();
+        return spanDecorationProbe;
+    }
 
-  public static SpanDecorationProbe deserializeSpanDecorationProbe(JsonReader jsonReader)
-      throws IOException {
-    SpanDecorationProbe spanDecorationProbe =
-        SPAN_DECORATION_PROBE_JSON_ADAPTER.fromJson(jsonReader);
-    spanDecorationProbe.initSamplers();
-    return spanDecorationProbe;
-  }
+    public static SpanDecorationProbe deserializeSpanDecorationProbe(JsonReader jsonReader) throws IOException {
+        SpanDecorationProbe spanDecorationProbe = SPAN_DECORATION_PROBE_JSON_ADAPTER.fromJson(jsonReader);
+        spanDecorationProbe.initSamplers();
+        return spanDecorationProbe;
+    }
 
-  private static <T> T deserialize(JsonAdapter<T> adapter, byte[] content) throws IOException {
-    return adapter.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
-  }
+    private static <T> T deserialize(JsonAdapter<T> adapter, byte[] content) throws IOException {
+        return adapter.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Sampled.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Sampled.java
index 5fbdf25b789..3365d67acdb 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Sampled.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Sampled.java
@@ -1,5 +1,5 @@
 package com.datadog.debugger.probe;
 
 public interface Sampled {
-  void initSamplers();
+    void initSamplers();
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Sampling.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Sampling.java
index 058da4fbb02..d82cd52dcb1 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Sampling.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Sampling.java
@@ -4,73 +4,72 @@
 
 /** Stores sampling configuration */
 public class Sampling {
-  private int coolDownInSeconds;
-  private double eventsPerSecond;
-  private volatile long nextExecution;
-  private int executionInterval = -1;
+    private int coolDownInSeconds;
+    private double eventsPerSecond;
+    private volatile long nextExecution;
+    private int executionInterval = -1;
 
-  public Sampling() {}
+    public Sampling() {}
 
-  public Sampling(int coolDownInSeconds) {
-    this.coolDownInSeconds = coolDownInSeconds;
-    this.executionInterval = coolDownInSeconds * 1000;
-  }
-
-  public Sampling(double eventsPerSecond) {
-    this.eventsPerSecond = eventsPerSecond;
-  }
+    public Sampling(int coolDownInSeconds) {
+        this.coolDownInSeconds = coolDownInSeconds;
+        this.executionInterval = coolDownInSeconds * 1000;
+    }
 
-  public Sampling(int coolDownInSeconds, double eventsPerSecond) {
-    this.coolDownInSeconds = coolDownInSeconds;
-    this.executionInterval = coolDownInSeconds * 1000;
+    public Sampling(double eventsPerSecond) {
+        this.eventsPerSecond = eventsPerSecond;
+    }
 
-    this.eventsPerSecond = eventsPerSecond;
-  }
+    public Sampling(int coolDownInSeconds, double eventsPerSecond) {
+        this.coolDownInSeconds = coolDownInSeconds;
+        this.executionInterval = coolDownInSeconds * 1000;
 
-  public int getCoolDownInSeconds() {
-    return coolDownInSeconds;
-  }
+        this.eventsPerSecond = eventsPerSecond;
+    }
 
-  public boolean inCoolDown() {
-    if (System.currentTimeMillis() > nextExecution) {
-      nextExecution = System.currentTimeMillis() + getExecutionInterval();
-      return false;
+    public int getCoolDownInSeconds() {
+        return coolDownInSeconds;
     }
-    return true;
-  }
 
-  public double getEventsPerSecond() {
-    return eventsPerSecond;
-  }
+    public boolean inCoolDown() {
+        if (System.currentTimeMillis() > nextExecution) {
+            nextExecution = System.currentTimeMillis() + getExecutionInterval();
+            return false;
+        }
+        return true;
+    }
 
-  private int getExecutionInterval() {
-    if (executionInterval == -1) {
-      executionInterval = coolDownInSeconds * 1000;
+    public double getEventsPerSecond() {
+        return eventsPerSecond;
     }
-    return executionInterval;
-  }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    private int getExecutionInterval() {
+        if (executionInterval == -1) {
+            executionInterval = coolDownInSeconds * 1000;
+        }
+        return executionInterval;
     }
-    if (!(o instanceof Sampling)) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Sampling)) {
+            return false;
+        }
+        Sampling sampling = (Sampling) o;
+        return Objects.equals(coolDownInSeconds, sampling.coolDownInSeconds)
+                && Objects.equals(eventsPerSecond, sampling.eventsPerSecond);
     }
-    Sampling sampling = (Sampling) o;
-    return Objects.equals(coolDownInSeconds, sampling.coolDownInSeconds)
-        && Objects.equals(eventsPerSecond, sampling.eventsPerSecond);
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(coolDownInSeconds, eventsPerSecond);
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(coolDownInSeconds, eventsPerSecond);
+    }
 
-  @Override
-  public String toString() {
-    return String.format(
-        "Sampling{coolDownInSeconds=%d, eventsPerSecond=%s}", coolDownInSeconds, eventsPerSecond);
-  }
+    @Override
+    public String toString() {
+        return String.format("Sampling{coolDownInSeconds=%d, eventsPerSecond=%s}", coolDownInSeconds, eventsPerSecond);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java
index 19abfb97235..83c879aae85 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java
@@ -35,427 +35,425 @@
 import org.slf4j.LoggerFactory;
 
 public class SpanDecorationProbe extends ProbeDefinition implements CapturedContextProbe, Sampled {
-  private static final Logger LOGGER = LoggerFactory.getLogger(SpanDecorationProbe.class);
-  private static final String PROBEID_DD_TAGS_FORMAT = "_dd.di.%s.probe_id";
-  private static final String EVALERROR_DD_TAGS_FORMAT = "_dd.di.%s.evaluation_error";
-  private static final Limits LIMITS = new Limits(1, 3, 255, 5);
-
-  @Override
-  public boolean isCaptureSnapshot() {
-    return false;
-  }
-
-  @Override
-  public boolean hasCondition() {
-    return false;
-  }
-
-  @Override
-  public boolean isReadyToCapture() {
-    return true;
-  }
-
-  public enum TargetSpan {
-    ACTIVE,
-    ROOT
-  }
-
-  public static class TagValue {
-    private final String template;
-    private final List<LogProbe.Segment> segments;
-
-    public TagValue(String template, List<LogProbe.Segment> segments) {
-      this.template = template;
-      this.segments = segments;
-    }
+    private static final Logger LOGGER = LoggerFactory.getLogger(SpanDecorationProbe.class);
+    private static final String PROBEID_DD_TAGS_FORMAT = "_dd.di.%s.probe_id";
+    private static final String EVALERROR_DD_TAGS_FORMAT = "_dd.di.%s.evaluation_error";
+    private static final Limits LIMITS = new Limits(1, 3, 255, 5);
 
-    public String getTemplate() {
-      return template;
+    @Override
+    public boolean isCaptureSnapshot() {
+        return false;
     }
 
-    public List<LogProbe.Segment> getSegments() {
-      return segments;
+    @Override
+    public boolean hasCondition() {
+        return false;
     }
 
     @Override
-    public String toString() {
-      return "TagValue{" + "template='" + template + '\'' + ", segments=" + segments + '}';
+    public boolean isReadyToCapture() {
+        return true;
     }
-  }
 
-  public static class Tag {
-    private final String name;
-    private final TagValue value;
-
-    public Tag(String name, TagValue value) {
-      this.name = name;
-      this.value = value;
+    public enum TargetSpan {
+        ACTIVE,
+        ROOT
     }
 
-    public String getName() {
-      return name;
-    }
+    public static class TagValue {
+        private final String template;
+        private final List<LogProbe.Segment> segments;
 
-    public TagValue getValue() {
-      return value;
-    }
+        public TagValue(String template, List<LogProbe.Segment> segments) {
+            this.template = template;
+            this.segments = segments;
+        }
 
-    @Generated
-    @Override
-    public String toString() {
-      return "Tag{" + "name='" + name + '\'' + ", value=" + value + '}';
-    }
+        public String getTemplate() {
+            return template;
+        }
 
-    @Generated
-    @Override
-    public boolean equals(Object o) {
-      if (o == null || getClass() != o.getClass()) return false;
-      Tag tag = (Tag) o;
-      return Objects.equals(name, tag.name) && Objects.equals(value, tag.value);
-    }
+        public List<LogProbe.Segment> getSegments() {
+            return segments;
+        }
 
-    @Generated
-    @Override
-    public int hashCode() {
-      return Objects.hash(name, value);
+        @Override
+        public String toString() {
+            return "TagValue{" + "template='" + template + '\'' + ", segments=" + segments + '}';
+        }
     }
-  }
 
-  public static class Decoration {
-    private final ProbeCondition when;
-    private final List<Tag> tags;
+    public static class Tag {
+        private final String name;
+        private final TagValue value;
 
-    public Decoration(ProbeCondition when, List<Tag> tags) {
-      this.when = when;
-      this.tags = tags;
-    }
+        public Tag(String name, TagValue value) {
+            this.name = name;
+            this.value = value;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public TagValue getValue() {
+            return value;
+        }
+
+        @Generated
+        @Override
+        public String toString() {
+            return "Tag{" + "name='" + name + '\'' + ", value=" + value + '}';
+        }
+
+        @Generated
+        @Override
+        public boolean equals(Object o) {
+            if (o == null || getClass() != o.getClass()) return false;
+            Tag tag = (Tag) o;
+            return Objects.equals(name, tag.name) && Objects.equals(value, tag.value);
+        }
 
-    public ProbeCondition getWhen() {
-      return when;
+        @Generated
+        @Override
+        public int hashCode() {
+            return Objects.hash(name, value);
+        }
     }
 
-    public List<Tag> getTags() {
-      return tags;
+    public static class Decoration {
+        private final ProbeCondition when;
+        private final List<Tag> tags;
+
+        public Decoration(ProbeCondition when, List<Tag> tags) {
+            this.when = when;
+            this.tags = tags;
+        }
+
+        public ProbeCondition getWhen() {
+            return when;
+        }
+
+        public List<Tag> getTags() {
+            return tags;
+        }
+
+        @Generated
+        @Override
+        public String toString() {
+            return "Decoration{" + "when=" + when + ", tags=" + tags + '}';
+        }
+
+        @Generated
+        @Override
+        public boolean equals(Object o) {
+            if (o == null || getClass() != o.getClass()) return false;
+            Decoration that = (Decoration) o;
+            return Objects.equals(when, that.when) && Objects.equals(tags, that.tags);
+        }
+
+        @Generated
+        @Override
+        public int hashCode() {
+            return Objects.hash(when, tags);
+        }
     }
 
-    @Generated
-    @Override
-    public String toString() {
-      return "Decoration{" + "when=" + when + ", tags=" + tags + '}';
+    private final TargetSpan targetSpan;
+    private final List<Decoration> decorations;
+    private transient Sampler errorSampler;
+    private final transient Duration evalTimeout;
+
+    // no-arg constructor is required by Moshi to avoid creating instance with unsafe and by-passing
+    // constructors, including field initializers.
+    public SpanDecorationProbe() {
+        this(
+                LANGUAGE,
+                null,
+                null,
+                null,
+                MethodLocation.DEFAULT,
+                TargetSpan.ACTIVE,
+                null,
+                Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout()));
+    }
+
+    public SpanDecorationProbe(
+            String language,
+            ProbeId probeId,
+            String[] tagStrs,
+            Where where,
+            MethodLocation methodLocation,
+            TargetSpan targetSpan,
+            List<Decoration> decorations,
+            Duration evalTimeout) {
+        super(language, probeId, tagStrs, where, methodLocation);
+        this.targetSpan = targetSpan;
+        this.decorations = decorations;
+        this.evalTimeout = evalTimeout;
+    }
+
+    public SpanDecorationProbe(SpanDecorationProbe.Builder builder) {
+        this(
+                builder.language,
+                builder.probeId,
+                builder.tagStrs,
+                builder.where,
+                builder.evaluateAt,
+                builder.targetSpan,
+                builder.decorations,
+                builder.evalTimeout);
+        initSamplers();
     }
 
-    @Generated
     @Override
-    public boolean equals(Object o) {
-      if (o == null || getClass() != o.getClass()) return false;
-      Decoration that = (Decoration) o;
-      return Objects.equals(when, that.when) && Objects.equals(tags, that.tags);
+    public InstrumentationResult.Status instrument(
+            MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices) {
+        boolean captureEntry = evaluateAt != MethodLocation.EXIT;
+        return new CapturedContextInstrumenter(
+                        this, methodInfo, diagnostics, probeIndices, false, captureEntry, Limits.DEFAULT)
+                .instrument();
     }
 
-    @Generated
     @Override
-    public int hashCode() {
-      return Objects.hash(when, tags);
-    }
-  }
-
-  private final TargetSpan targetSpan;
-  private final List<Decoration> decorations;
-  private transient Sampler errorSampler;
-  private final transient Duration evalTimeout;
-
-  // no-arg constructor is required by Moshi to avoid creating instance with unsafe and by-passing
-  // constructors, including field initializers.
-  public SpanDecorationProbe() {
-    this(
-        LANGUAGE,
-        null,
-        null,
-        null,
-        MethodLocation.DEFAULT,
-        TargetSpan.ACTIVE,
-        null,
-        Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout()));
-  }
-
-  public SpanDecorationProbe(
-      String language,
-      ProbeId probeId,
-      String[] tagStrs,
-      Where where,
-      MethodLocation methodLocation,
-      TargetSpan targetSpan,
-      List<Decoration> decorations,
-      Duration evalTimeout) {
-    super(language, probeId, tagStrs, where, methodLocation);
-    this.targetSpan = targetSpan;
-    this.decorations = decorations;
-    this.evalTimeout = evalTimeout;
-  }
-
-  public SpanDecorationProbe(SpanDecorationProbe.Builder builder) {
-    this(
-        builder.language,
-        builder.probeId,
-        builder.tagStrs,
-        builder.where,
-        builder.evaluateAt,
-        builder.targetSpan,
-        builder.decorations,
-        builder.evalTimeout);
-    initSamplers();
-  }
-
-  @Override
-  public InstrumentationResult.Status instrument(
-      MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices) {
-    boolean captureEntry = evaluateAt != MethodLocation.EXIT;
-    return new CapturedContextInstrumenter(
-            this, methodInfo, diagnostics, probeIndices, false, captureEntry, Limits.DEFAULT)
-        .instrument();
-  }
-
-  @Override
-  public void evaluate(
-      CapturedContext context,
-      CapturedContext.Status status,
-      MethodLocation methodLocation,
-      boolean singleProbe) {
-    // Only one timeout for all conditions
-    TimeoutChecker timeoutChecker = TimeoutChecker.create(Config.get(), evalTimeout);
-    for (Decoration decoration : decorations) {
-      if (decoration.when != null) {
-        try {
-          boolean condition = decoration.when.execute(context, timeoutChecker);
-          if (!condition) {
-            continue;
-          }
-        } catch (EvaluationException ex) {
-          status.addError(new EvaluationError(ex.getExpr(), ex.getMessage()));
-          continue;
-        } catch (Exception ex) {
-          // catch all for unexpected exceptions
-          status.addError(new EvaluationError(decoration.when.getDslExpression(), ex.getMessage()));
-          continue;
-        }
-      }
-      if (!(status instanceof SpanDecorationStatus)) {
-        throw new IllegalStateException("Invalid status: " + status.getClass());
-      }
-      SpanDecorationStatus spanStatus = (SpanDecorationStatus) status;
-      for (Tag tag : decoration.tags) {
-        String tagName = sanitize(tag.name);
-        StringTemplateBuilder builder =
-            new StringTemplateBuilder(tag.value.getSegments(), LIMITS, evalTimeout);
-        LogProbe.LogStatus logStatus = new LogProbe.LogStatus(this);
-        String tagValue = builder.evaluate(context, logStatus);
-        if (logStatus.hasLogTemplateErrors()) {
-          status.getErrors().addAll(logStatus.getErrors());
-          if (logStatus.getErrors().size() > 0) {
-            spanStatus.addTag(
-                String.format(EVALERROR_DD_TAGS_FORMAT, tagName),
-                logStatus.getErrors().get(0).getMessage());
-          }
-        } else {
-          spanStatus.addTag(tagName, tagValue);
-        }
-        spanStatus.addTag(String.format(PROBEID_DD_TAGS_FORMAT, tagName), getProbeId().getId());
-      }
-    }
-  }
-
-  private String sanitize(String tagName) {
-    return TagsHelper.sanitize(tagName);
-  }
-
-  @Override
-  public void commit(
-      CapturedContext entryContext,
-      CapturedContext exitContext,
-      List<CapturedContext.CapturedThrowable> caughtExceptions) {
-    String probeEncodedId = getProbeId().getEncodedId();
-    CapturedContext.Status status =
-        evaluateAt == MethodLocation.EXIT
-            ? exitContext.getStatus(probeEncodedId)
-            : entryContext.getStatus(probeEncodedId);
-    if (status == null) {
-      return;
-    }
-    SpanDecorationStatus spanStatus = (SpanDecorationStatus) status;
-    decorateTags(spanStatus);
-    handleEvaluationErrors(spanStatus);
-  }
-
-  @Override
-  public void commit(CapturedContext lineContext, int line) {
-    CapturedContext.Status status = lineContext.getStatus(getProbeId().getEncodedId());
-    if (status == null) {
-      return;
+    public void evaluate(
+            CapturedContext context,
+            CapturedContext.Status status,
+            MethodLocation methodLocation,
+            boolean singleProbe) {
+        // Only one timeout for all conditions
+        TimeoutChecker timeoutChecker = TimeoutChecker.create(Config.get(), evalTimeout);
+        for (Decoration decoration : decorations) {
+            if (decoration.when != null) {
+                try {
+                    boolean condition = decoration.when.execute(context, timeoutChecker);
+                    if (!condition) {
+                        continue;
+                    }
+                } catch (EvaluationException ex) {
+                    status.addError(new EvaluationError(ex.getExpr(), ex.getMessage()));
+                    continue;
+                } catch (Exception ex) {
+                    // catch all for unexpected exceptions
+                    status.addError(new EvaluationError(decoration.when.getDslExpression(), ex.getMessage()));
+                    continue;
+                }
+            }
+            if (!(status instanceof SpanDecorationStatus)) {
+                throw new IllegalStateException("Invalid status: " + status.getClass());
+            }
+            SpanDecorationStatus spanStatus = (SpanDecorationStatus) status;
+            for (Tag tag : decoration.tags) {
+                String tagName = sanitize(tag.name);
+                StringTemplateBuilder builder = new StringTemplateBuilder(tag.value.getSegments(), LIMITS, evalTimeout);
+                LogProbe.LogStatus logStatus = new LogProbe.LogStatus(this);
+                String tagValue = builder.evaluate(context, logStatus);
+                if (logStatus.hasLogTemplateErrors()) {
+                    status.getErrors().addAll(logStatus.getErrors());
+                    if (logStatus.getErrors().size() > 0) {
+                        spanStatus.addTag(
+                                String.format(EVALERROR_DD_TAGS_FORMAT, tagName),
+                                logStatus.getErrors().get(0).getMessage());
+                    }
+                } else {
+                    spanStatus.addTag(tagName, tagValue);
+                }
+                spanStatus.addTag(
+                        String.format(PROBEID_DD_TAGS_FORMAT, tagName),
+                        getProbeId().getId());
+            }
+        }
     }
-    SpanDecorationStatus spanStatus = (SpanDecorationStatus) status;
-    decorateTags(spanStatus);
-    handleEvaluationErrors(spanStatus);
-  }
-
-  private void decorateTags(SpanDecorationStatus status) {
-    List<Pair<String, String>> tagsToDecorate = status.getTagsToDecorate();
-    if (tagsToDecorate == null) {
-      return;
+
+    private String sanitize(String tagName) {
+        return TagsHelper.sanitize(tagName);
     }
-    AgentTracer.TracerAPI tracerAPI = AgentTracer.get();
-    AgentSpan agentSpan = tracerAPI.activeSpan();
-    if (agentSpan == null) {
-      LOGGER.debug("Cannot find current active span");
-      return;
+
+    @Override
+    public void commit(
+            CapturedContext entryContext,
+            CapturedContext exitContext,
+            List<CapturedContext.CapturedThrowable> caughtExceptions) {
+        String probeEncodedId = getProbeId().getEncodedId();
+        CapturedContext.Status status = evaluateAt == MethodLocation.EXIT
+                ? exitContext.getStatus(probeEncodedId)
+                : entryContext.getStatus(probeEncodedId);
+        if (status == null) {
+            return;
+        }
+        SpanDecorationStatus spanStatus = (SpanDecorationStatus) status;
+        decorateTags(spanStatus);
+        handleEvaluationErrors(spanStatus);
     }
-    if (targetSpan == TargetSpan.ROOT) {
-      agentSpan = agentSpan.getLocalRootSpan();
-      if (agentSpan == null) {
-        LOGGER.debug("Cannot find root span");
-        return;
-      }
+
+    @Override
+    public void commit(CapturedContext lineContext, int line) {
+        CapturedContext.Status status = lineContext.getStatus(getProbeId().getEncodedId());
+        if (status == null) {
+            return;
+        }
+        SpanDecorationStatus spanStatus = (SpanDecorationStatus) status;
+        decorateTags(spanStatus);
+        handleEvaluationErrors(spanStatus);
     }
-    for (Pair<String, String> tag : tagsToDecorate) {
-      agentSpan.setTag(tag.getLeft(), tag.getRight());
+
+    private void decorateTags(SpanDecorationStatus status) {
+        List<Pair<String, String>> tagsToDecorate = status.getTagsToDecorate();
+        if (tagsToDecorate == null) {
+            return;
+        }
+        AgentTracer.TracerAPI tracerAPI = AgentTracer.get();
+        AgentSpan agentSpan = tracerAPI.activeSpan();
+        if (agentSpan == null) {
+            LOGGER.debug("Cannot find current active span");
+            return;
+        }
+        if (targetSpan == TargetSpan.ROOT) {
+            agentSpan = agentSpan.getLocalRootSpan();
+            if (agentSpan == null) {
+                LOGGER.debug("Cannot find root span");
+                return;
+            }
+        }
+        for (Pair<String, String> tag : tagsToDecorate) {
+            agentSpan.setTag(tag.getLeft(), tag.getRight());
+        }
+        if (!tagsToDecorate.isEmpty()) {
+            // only send EMITTING status if we set at least one tag
+            DebuggerAgent.getSink().getProbeStatusSink().addEmitting(getProbeId());
+        }
     }
-    if (!tagsToDecorate.isEmpty()) {
-      // only send EMITTING status if we set at least one tag
-      DebuggerAgent.getSink().getProbeStatusSink().addEmitting(getProbeId());
+
+    private void handleEvaluationErrors(SpanDecorationStatus status) {
+        if (status.getErrors().isEmpty()) {
+            return;
+        }
+        boolean sampled = ProbeRateLimiter.tryProbe(errorSampler, true);
+        if (!sampled) {
+            return;
+        }
+        Snapshot snapshot = new Snapshot(Thread.currentThread(), this, -1);
+        snapshot.addEvaluationErrors(status.getErrors());
+        DebuggerAgent.getSink().addSnapshot(snapshot);
     }
-  }
 
-  private void handleEvaluationErrors(SpanDecorationStatus status) {
-    if (status.getErrors().isEmpty()) {
-      return;
+    @Override
+    public CapturedContext.Status createStatus() {
+        return new SpanDecorationStatus(this);
     }
-    boolean sampled = ProbeRateLimiter.tryProbe(errorSampler, true);
-    if (!sampled) {
-      return;
+
+    public TargetSpan getTargetSpan() {
+        return targetSpan;
     }
-    Snapshot snapshot = new Snapshot(Thread.currentThread(), this, -1);
-    snapshot.addEvaluationErrors(status.getErrors());
-    DebuggerAgent.getSink().addSnapshot(snapshot);
-  }
-
-  @Override
-  public CapturedContext.Status createStatus() {
-    return new SpanDecorationStatus(this);
-  }
-
-  public TargetSpan getTargetSpan() {
-    return targetSpan;
-  }
-
-  public List<Decoration> getDecorations() {
-    return decorations;
-  }
-
-  @Override
-  public void initSamplers() {
-    errorSampler = ProbeRateLimiter.createSampler(1.0);
-  }
-
-  @Generated
-  @Override
-  public int hashCode() {
-    int result =
-        Objects.hash(language, id, version, tagMap, where, evaluateAt, targetSpan, decorations);
-    result = 31 * result + Arrays.hashCode(tags);
-    return result;
-  }
-
-  @Generated
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    SpanDecorationProbe that = (SpanDecorationProbe) o;
-    return Objects.equals(language, that.language)
-        && Objects.equals(id, that.id)
-        && version == that.version
-        && Arrays.equals(tags, that.tags)
-        && Objects.equals(tagMap, that.tagMap)
-        && Objects.equals(where, that.where)
-        && Objects.equals(evaluateAt, that.evaluateAt)
-        && Objects.equals(targetSpan, that.targetSpan)
-        && Objects.equals(decorations, that.decorations);
-  }
-
-  @Generated
-  @Override
-  public String toString() {
-    return "SpanDecorationProbe{"
-        + "id='"
-        + id
-        + '\''
-        + ", version="
-        + version
-        + ", tags="
-        + Arrays.toString(tags)
-        + ", where="
-        + where
-        + ", evaluateAt="
-        + evaluateAt
-        + ", targetSpan="
-        + targetSpan
-        + ", decorations="
-        + decorations
-        + "} ";
-  }
-
-  private static class SpanDecorationStatus extends CapturedContext.Status {
-    private final List<Pair<String, String>> tagsToDecorate = new ArrayList<>();
-
-    public SpanDecorationStatus(ProbeImplementation probeImplementation) {
-      super(probeImplementation);
+
+    public List<Decoration> getDecorations() {
+        return decorations;
     }
 
-    public void addTag(String tagName, String tagValue) {
-      tagsToDecorate.add(Pair.of(tagName, tagValue));
+    @Override
+    public void initSamplers() {
+        errorSampler = ProbeRateLimiter.createSampler(1.0);
     }
 
-    public List<Pair<String, String>> getTagsToDecorate() {
-      return tagsToDecorate;
+    @Generated
+    @Override
+    public int hashCode() {
+        int result = Objects.hash(language, id, version, tagMap, where, evaluateAt, targetSpan, decorations);
+        result = 31 * result + Arrays.hashCode(tags);
+        return result;
     }
 
+    @Generated
     @Override
-    public boolean isCapturing() {
-      return true;
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        SpanDecorationProbe that = (SpanDecorationProbe) o;
+        return Objects.equals(language, that.language)
+                && Objects.equals(id, that.id)
+                && version == that.version
+                && Arrays.equals(tags, that.tags)
+                && Objects.equals(tagMap, that.tagMap)
+                && Objects.equals(where, that.where)
+                && Objects.equals(evaluateAt, that.evaluateAt)
+                && Objects.equals(targetSpan, that.targetSpan)
+                && Objects.equals(decorations, that.decorations);
     }
-  }
 
-  public static SpanDecorationProbe.Builder builder() {
-    return new SpanDecorationProbe.Builder();
-  }
+    @Generated
+    @Override
+    public String toString() {
+        return "SpanDecorationProbe{"
+                + "id='"
+                + id
+                + '\''
+                + ", version="
+                + version
+                + ", tags="
+                + Arrays.toString(tags)
+                + ", where="
+                + where
+                + ", evaluateAt="
+                + evaluateAt
+                + ", targetSpan="
+                + targetSpan
+                + ", decorations="
+                + decorations
+                + "} ";
+    }
+
+    private static class SpanDecorationStatus extends CapturedContext.Status {
+        private final List<Pair<String, String>> tagsToDecorate = new ArrayList<>();
+
+        public SpanDecorationStatus(ProbeImplementation probeImplementation) {
+            super(probeImplementation);
+        }
 
-  public static class Builder extends ProbeDefinition.Builder<SpanDecorationProbe.Builder> {
-    private TargetSpan targetSpan;
-    private List<Decoration> decorations;
-    private Duration evalTimeout =
-        Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout());
+        public void addTag(String tagName, String tagValue) {
+            tagsToDecorate.add(Pair.of(tagName, tagValue));
+        }
 
-    public Builder targetSpan(TargetSpan targetSpan) {
-      this.targetSpan = targetSpan;
-      return this;
-    }
+        public List<Pair<String, String>> getTagsToDecorate() {
+            return tagsToDecorate;
+        }
 
-    public Builder decorations(List<Decoration> decorations) {
-      this.decorations = decorations;
-      return this;
+        @Override
+        public boolean isCapturing() {
+            return true;
+        }
     }
 
-    public Builder decorations(Decoration decoration) {
-      this.decorations = Collections.singletonList(decoration);
-      return this;
+    public static SpanDecorationProbe.Builder builder() {
+        return new SpanDecorationProbe.Builder();
     }
 
-    public Builder evalTimeout(Duration evalTimeout) {
-      this.evalTimeout = evalTimeout;
-      return this;
-    }
+    public static class Builder extends ProbeDefinition.Builder<SpanDecorationProbe.Builder> {
+        private TargetSpan targetSpan;
+        private List<Decoration> decorations;
+        private Duration evalTimeout = Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout());
+
+        public Builder targetSpan(TargetSpan targetSpan) {
+            this.targetSpan = targetSpan;
+            return this;
+        }
+
+        public Builder decorations(List<Decoration> decorations) {
+            this.decorations = decorations;
+            return this;
+        }
+
+        public Builder decorations(Decoration decoration) {
+            this.decorations = Collections.singletonList(decoration);
+            return this;
+        }
 
-    public SpanDecorationProbe build() {
-      return new SpanDecorationProbe(this);
+        public Builder evalTimeout(Duration evalTimeout) {
+            this.evalTimeout = evalTimeout;
+            return this;
+        }
+
+        public SpanDecorationProbe build() {
+            return new SpanDecorationProbe(this);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanProbe.java
index e8a4e2cbf96..fa415a07bdd 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanProbe.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanProbe.java
@@ -12,70 +12,70 @@
 import java.util.Objects;
 
 public class SpanProbe extends ProbeDefinition {
-  // no-arg constructor is required by Moshi to avoid creating instance with unsafe and by-passing
-  // constructors, including field initializers.
-  public SpanProbe() {
-    this(LANGUAGE, null, null, null);
-  }
+    // no-arg constructor is required by Moshi to avoid creating instance with unsafe and by-passing
+    // constructors, including field initializers.
+    public SpanProbe() {
+        this(LANGUAGE, null, null, null);
+    }
 
-  public SpanProbe(String language, ProbeId probeId, String[] tagStrs, Where where) {
-    super(language, probeId, tagStrs, where, MethodLocation.DEFAULT);
-  }
+    public SpanProbe(String language, ProbeId probeId, String[] tagStrs, Where where) {
+        super(language, probeId, tagStrs, where, MethodLocation.DEFAULT);
+    }
 
-  @Override
-  public InstrumentationResult.Status instrument(
-      MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices) {
-    return new SpanInstrumenter(this, methodInfo, diagnostics, probeIndices).instrument();
-  }
+    @Override
+    public InstrumentationResult.Status instrument(
+            MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices) {
+        return new SpanInstrumenter(this, methodInfo, diagnostics, probeIndices).instrument();
+    }
 
-  @Generated
-  @Override
-  public int hashCode() {
-    int result = Objects.hash(language, id, version, tagMap, where, evaluateAt);
-    result = 31 * result + Arrays.hashCode(tags);
-    return result;
-  }
+    @Generated
+    @Override
+    public int hashCode() {
+        int result = Objects.hash(language, id, version, tagMap, where, evaluateAt);
+        result = 31 * result + Arrays.hashCode(tags);
+        return result;
+    }
 
-  @Generated
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    SpanProbe that = (SpanProbe) o;
-    return Objects.equals(language, that.language)
-        && Objects.equals(id, that.id)
-        && version == that.version
-        && Arrays.equals(tags, that.tags)
-        && Objects.equals(tagMap, that.tagMap)
-        && Objects.equals(where, that.where)
-        && Objects.equals(evaluateAt, that.evaluateAt);
-  }
+    @Generated
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        SpanProbe that = (SpanProbe) o;
+        return Objects.equals(language, that.language)
+                && Objects.equals(id, that.id)
+                && version == that.version
+                && Arrays.equals(tags, that.tags)
+                && Objects.equals(tagMap, that.tagMap)
+                && Objects.equals(where, that.where)
+                && Objects.equals(evaluateAt, that.evaluateAt);
+    }
 
-  @Generated
-  @Override
-  public String toString() {
-    return "SpanProbe{"
-        + "id='"
-        + id
-        + '\''
-        + ", version="
-        + version
-        + ", tags="
-        + Arrays.toString(tags)
-        + ", where="
-        + where
-        + ", evaluateAt="
-        + evaluateAt
-        + "} ";
-  }
+    @Generated
+    @Override
+    public String toString() {
+        return "SpanProbe{"
+                + "id='"
+                + id
+                + '\''
+                + ", version="
+                + version
+                + ", tags="
+                + Arrays.toString(tags)
+                + ", where="
+                + where
+                + ", evaluateAt="
+                + evaluateAt
+                + "} ";
+    }
 
-  public static SpanProbe.Builder builder() {
-    return new SpanProbe.Builder();
-  }
+    public static SpanProbe.Builder builder() {
+        return new SpanProbe.Builder();
+    }
 
-  public static class Builder extends ProbeDefinition.Builder<Builder> {
-    public SpanProbe build() {
-      return new SpanProbe(LANGUAGE, probeId, tagStrs, where);
+    public static class Builder extends ProbeDefinition.Builder<Builder> {
+        public SpanProbe build() {
+            return new SpanProbe(LANGUAGE, probeId, tagStrs, where);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/TriggerProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/TriggerProbe.java
index e20f7c39d01..bcfa70eb196 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/TriggerProbe.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/TriggerProbe.java
@@ -28,205 +28,195 @@
 import org.slf4j.LoggerFactory;
 
 public class TriggerProbe extends ProbeDefinition implements Sampled, CapturedContextProbe {
-  private static final Logger LOGGER = LoggerFactory.getLogger(TriggerProbe.class);
-
-  private ProbeCondition probeCondition;
-  private Sampling sampling;
-  private String sessionId;
-  private transient Sampler sampler;
-
-  // no-arg constructor is required by Moshi to avoid creating instance with unsafe and by-passing
-  // constructors, including field initializers.
-  public TriggerProbe() {
-    this(null, null, null, null, null);
-  }
-
-  public TriggerProbe(
-      ProbeId probeId,
-      String[] tagStrs,
-      Where where,
-      ProbeCondition probeCondition,
-      Sampling sampling) {
-    super("java", probeId, tagStrs, where, MethodLocation.ENTRY);
-    this.probeCondition = probeCondition;
-    this.sampling = sampling;
-  }
-
-  public TriggerProbe(ProbeId probeId, Where where) {
-    this(probeId, null, where, null, null);
-  }
-
-  public TriggerProbe(TriggerProbe.Builder builder) {
-    this(builder.probeId, builder.tagStrs, builder.where, builder.probeCondition, builder.sampling);
-    initSamplers();
-  }
-
-  @Override
-  public InstrumentationResult.Status instrument(
-      MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices) {
-    return new CapturedContextInstrumenter(
-            this, methodInfo, diagnostics, probeIndices, false, false, null)
-        .instrument();
-  }
-
-  public TriggerProbe setSessionId(String sessionId) {
-    this.sessionId = sessionId;
-    return this;
-  }
-
-  public Sampling getSampling() {
-    return sampling;
-  }
-
-  @Override
-  public void initSamplers() {
-    double rate = sampling != null ? sampling.getEventsPerSecond() : 1.0;
-    sampler = ProbeRateLimiter.createSampler(rate);
-  }
-
-  @Override
-  public boolean isCaptureSnapshot() {
-    return false;
-  }
-
-  @Override
-  public boolean hasCondition() {
-    return probeCondition != null;
-  }
-
-  @Override
-  public boolean isReadyToCapture() {
-    return true;
-  }
-
-  public TriggerProbe setSampling(Sampling sampling) {
-    this.sampling = sampling;
-    return this;
-  }
-
-  public TriggerProbe setProbeCondition(ProbeCondition probeCondition) {
-    this.probeCondition = probeCondition;
-    return this;
-  }
-
-  @Override
-  public void evaluate(
-      CapturedContext context,
-      CapturedContext.Status status,
-      MethodLocation location,
-      boolean singleProbe) {
-
-    Sampling sampling = getSampling();
-    if (sampling == null || !sampling.inCoolDown()) {
-      boolean sample = true;
-      if (!hasCondition()) {
-        sample =
-            MethodLocation.isSame(location, evaluateAt) && ProbeRateLimiter.tryProbe(sampler, true);
-      }
-      boolean value = evaluateCondition(context);
-
-      if (hasCondition() && value || !hasCondition() && sample) {
-        decorateTags();
-      }
-    }
-  }
-
-  private boolean evaluateCondition(CapturedContext capture) {
-    if (probeCondition == null) {
-      return true;
-    }
-    long start = System.nanoTime();
-    try {
-      Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout());
-      return probeCondition.execute(capture, TimeoutChecker.create(Config.get(), timeout));
-    } catch (Exception ex) {
-      DebuggerAgent.getSink().getProbeStatusSink().addError(getProbeId(), ex);
-      return false;
-    } finally {
-      LOGGER.debug(
-          "ProbeCondition for probe[{}] evaluated in {}ns", id, (System.nanoTime() - start));
-    }
-  }
-
-  private void decorateTags() {
-    AgentTracer.TracerAPI tracerAPI = AgentTracer.get();
-
-    AgentSpan agentSpan = tracerAPI.activeSpan().getLocalRootSpan();
-    agentSpan.setTag(Tags.PROPAGATED_DEBUG, sessionId + ":1");
-    agentSpan.setTag(format("_dd.ld.probe_id.%s", getProbeId().getId()), true);
-  }
-
-  @Override
-  public CapturedContext.Status createStatus() {
-    return new CapturedContext.Status(this);
-  }
-
-  @Generated
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TriggerProbe that = (TriggerProbe) o;
-    return Objects.equals(language, that.language)
-        && Objects.equals(id, that.id)
-        && version == that.version
-        && Arrays.equals(tags, that.tags)
-        && Objects.equals(tagMap, that.tagMap)
-        && Objects.equals(where, that.where)
-        && Objects.equals(evaluateAt, that.evaluateAt);
-  }
-
-  @Generated
-  @Override
-  public int hashCode() {
-    int result = Objects.hash(language, id, version, where, evaluateAt);
-    result = 31 * result + Arrays.hashCode(tags);
-    return result;
-  }
-
-  @Override
-  public String toString() {
-    return String.format(
-        "TriggerProbe{id='%s', sessionId='%s', evaluateAt=%s, language='%s', location=%s, probeCondition=%s, probeId=%s,"
-            + " sampling=%s, tagMap=%s, tags=%s, version=%d, where=%s}",
-        id,
-        sessionId,
-        evaluateAt,
-        language,
-        location,
-        probeCondition,
-        getProbeId(),
-        sampling,
-        tagMap,
-        Arrays.toString(tags),
-        version,
-        where);
-  }
-
-  public static TriggerProbe.Builder builder() {
-    return new TriggerProbe.Builder();
-  }
-
-  public static class Builder extends ProbeDefinition.Builder<TriggerProbe.Builder> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(TriggerProbe.class);
+
     private ProbeCondition probeCondition;
     private Sampling sampling;
+    private String sessionId;
+    private transient Sampler sampler;
+
+    // no-arg constructor is required by Moshi to avoid creating instance with unsafe and by-passing
+    // constructors, including field initializers.
+    public TriggerProbe() {
+        this(null, null, null, null, null);
+    }
+
+    public TriggerProbe(
+            ProbeId probeId, String[] tagStrs, Where where, ProbeCondition probeCondition, Sampling sampling) {
+        super("java", probeId, tagStrs, where, MethodLocation.ENTRY);
+        this.probeCondition = probeCondition;
+        this.sampling = sampling;
+    }
+
+    public TriggerProbe(ProbeId probeId, Where where) {
+        this(probeId, null, where, null, null);
+    }
+
+    public TriggerProbe(TriggerProbe.Builder builder) {
+        this(builder.probeId, builder.tagStrs, builder.where, builder.probeCondition, builder.sampling);
+        initSamplers();
+    }
+
+    @Override
+    public InstrumentationResult.Status instrument(
+            MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices) {
+        return new CapturedContextInstrumenter(this, methodInfo, diagnostics, probeIndices, false, false, null)
+                .instrument();
+    }
 
-    public TriggerProbe.Builder when(ProbeCondition probeCondition) {
-      this.probeCondition = probeCondition;
-      return this;
+    public TriggerProbe setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+        return this;
     }
 
-    public TriggerProbe.Builder sampling(Sampling sampling) {
-      this.sampling = sampling;
-      return this;
+    public Sampling getSampling() {
+        return sampling;
     }
 
-    public TriggerProbe build() {
-      return new TriggerProbe(this);
+    @Override
+    public void initSamplers() {
+        double rate = sampling != null ? sampling.getEventsPerSecond() : 1.0;
+        sampler = ProbeRateLimiter.createSampler(rate);
+    }
+
+    @Override
+    public boolean isCaptureSnapshot() {
+        return false;
+    }
+
+    @Override
+    public boolean hasCondition() {
+        return probeCondition != null;
+    }
+
+    @Override
+    public boolean isReadyToCapture() {
+        return true;
+    }
+
+    public TriggerProbe setSampling(Sampling sampling) {
+        this.sampling = sampling;
+        return this;
+    }
+
+    public TriggerProbe setProbeCondition(ProbeCondition probeCondition) {
+        this.probeCondition = probeCondition;
+        return this;
+    }
+
+    @Override
+    public void evaluate(
+            CapturedContext context, CapturedContext.Status status, MethodLocation location, boolean singleProbe) {
+
+        Sampling sampling = getSampling();
+        if (sampling == null || !sampling.inCoolDown()) {
+            boolean sample = true;
+            if (!hasCondition()) {
+                sample = MethodLocation.isSame(location, evaluateAt) && ProbeRateLimiter.tryProbe(sampler, true);
+            }
+            boolean value = evaluateCondition(context);
+
+            if (hasCondition() && value || !hasCondition() && sample) {
+                decorateTags();
+            }
+        }
+    }
+
+    private boolean evaluateCondition(CapturedContext capture) {
+        if (probeCondition == null) {
+            return true;
+        }
+        long start = System.nanoTime();
+        try {
+            Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout());
+            return probeCondition.execute(capture, TimeoutChecker.create(Config.get(), timeout));
+        } catch (Exception ex) {
+            DebuggerAgent.getSink().getProbeStatusSink().addError(getProbeId(), ex);
+            return false;
+        } finally {
+            LOGGER.debug("ProbeCondition for probe[{}] evaluated in {}ns", id, (System.nanoTime() - start));
+        }
+    }
+
+    private void decorateTags() {
+        AgentTracer.TracerAPI tracerAPI = AgentTracer.get();
+
+        AgentSpan agentSpan = tracerAPI.activeSpan().getLocalRootSpan();
+        agentSpan.setTag(Tags.PROPAGATED_DEBUG, sessionId + ":1");
+        agentSpan.setTag(format("_dd.ld.probe_id.%s", getProbeId().getId()), true);
+    }
+
+    @Override
+    public CapturedContext.Status createStatus() {
+        return new CapturedContext.Status(this);
+    }
+
+    @Generated
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        TriggerProbe that = (TriggerProbe) o;
+        return Objects.equals(language, that.language)
+                && Objects.equals(id, that.id)
+                && version == that.version
+                && Arrays.equals(tags, that.tags)
+                && Objects.equals(tagMap, that.tagMap)
+                && Objects.equals(where, that.where)
+                && Objects.equals(evaluateAt, that.evaluateAt);
+    }
+
+    @Generated
+    @Override
+    public int hashCode() {
+        int result = Objects.hash(language, id, version, where, evaluateAt);
+        result = 31 * result + Arrays.hashCode(tags);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return String.format(
+                "TriggerProbe{id='%s', sessionId='%s', evaluateAt=%s, language='%s', location=%s, probeCondition=%s, probeId=%s,"
+                        + " sampling=%s, tagMap=%s, tags=%s, version=%d, where=%s}",
+                id,
+                sessionId,
+                evaluateAt,
+                language,
+                location,
+                probeCondition,
+                getProbeId(),
+                sampling,
+                tagMap,
+                Arrays.toString(tags),
+                version,
+                where);
+    }
+
+    public static TriggerProbe.Builder builder() {
+        return new TriggerProbe.Builder();
+    }
+
+    public static class Builder extends ProbeDefinition.Builder<TriggerProbe.Builder> {
+        private ProbeCondition probeCondition;
+        private Sampling sampling;
+
+        public TriggerProbe.Builder when(ProbeCondition probeCondition) {
+            this.probeCondition = probeCondition;
+            return this;
+        }
+
+        public TriggerProbe.Builder sampling(Sampling sampling) {
+            this.sampling = sampling;
+            return this;
+        }
+
+        public TriggerProbe build() {
+            return new TriggerProbe(this);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java
index 72787c61e6e..c2808f13561 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java
@@ -18,362 +18,353 @@
 
 /** Stores probe location definition */
 public class Where {
-  private static final String UNKNOWN_RETURN_TYPE = "$com.datadog.debugger.UNKNOWN$";
-  private static final Pattern JVM_CLASS_PATTERN = Pattern.compile("L([^;]+);");
-
-  private final String typeName;
-  private final String methodName;
-  private final String sourceFile;
-  private final String signature;
-  private final SourceLine[] lines;
-  // used as cache for matching signature
-  private String probeMethodDescriptor;
-
-  Where(
-      String typeName, String methodName, String signature, SourceLine[] lines, String sourceFile) {
-    this.typeName = typeName;
-    this.methodName = methodName;
-    this.sourceFile = sourceFile;
-    this.signature = signature;
-    this.lines = lines;
-  }
-
-  Where(String typeName, String methodName, String signature, String[] lines, String sourceFile) {
-    this(typeName, methodName, signature, sourceLines(lines), sourceFile);
-  }
-
-  public static Where of(String typeName, String methodName, String signature, String... lines) {
-    return new Where(typeName, methodName, signature, lines, null);
-  }
-
-  public static Where of(String typeName, String methodName, String signature) {
-    return new Where(typeName, methodName, signature, (SourceLine[]) null, null);
-  }
-
-  protected static SourceLine[] sourceLines(String[] defs) {
-    if (defs == null || defs.length == 0) {
-      return null;
-    }
-    SourceLine[] lines = new SourceLine[defs.length];
-    for (int i = 0; i < lines.length; i++) {
-      lines[i] = SourceLine.fromString(defs[i]);
-    }
-    return lines;
-  }
-
-  public static Where convertLineToMethod(Where lineWhere, ClassFileLines classFileLines) {
-    if (lineWhere.methodName != null && lineWhere.lines != null) {
-      List<MethodNode> methodsByLine =
-          classFileLines.getMethodsByLine(lineWhere.lines[0].getFrom());
-      if (methodsByLine != null && !methodsByLine.isEmpty()) {
-        // pick the first method, as we can have multiple methods (lambdas) on the same line
-        MethodNode method = methodsByLine.get(0);
-        return new Where(
-            lineWhere.typeName,
-            method.name,
-            Types.descriptorToSignature(method.desc),
-            (SourceLine[]) null,
-            null);
-      }
-    }
-    return lineWhere;
-  }
-
-  public String getTypeName() {
-    return typeName;
-  }
-
-  public String getMethodName() {
-    return methodName;
-  }
+    private static final String UNKNOWN_RETURN_TYPE = "$com.datadog.debugger.UNKNOWN$";
+    private static final Pattern JVM_CLASS_PATTERN = Pattern.compile("L([^;]+);");
 
-  public String getSourceFile() {
-    return sourceFile;
-  }
+    private final String typeName;
+    private final String methodName;
+    private final String sourceFile;
+    private final String signature;
+    private final SourceLine[] lines;
+    // used as cache for matching signature
+    private String probeMethodDescriptor;
 
-  public String getSignature() {
-    return signature;
-  }
-
-  public String[] getLines() {
-    if (lines == null) {
-      return null;
-    }
-    String[] defs = new String[lines.length];
-    for (int i = 0; i < defs.length; i++) {
-      defs[i] = lines[i].toString();
-    }
-    return defs;
-  }
-
-  public SourceLine[] getSourceLines() {
-    return lines;
-  }
-
-  public boolean isTypeMatching(String targetType) {
-    return typeName == null || typeName.equals("*") || typeName.equals(targetType);
-  }
-
-  public boolean isMethodNameMatching(String targetMethod) {
-    return methodName == null || methodName.equals("*") || methodName.equals(targetMethod);
-  }
-
-  public enum MethodMatching {
-    MATCH,
-    SKIP,
-    FAIL
-  }
-
-  public MethodMatching isMethodMatching(MethodNode methodNode, ClassFileLines classFileLines) {
-    String targetName = methodNode.name;
-    String targetMethodDescriptor = methodNode.desc;
-    // try exact matching: name + FQN signature
-    if (!isMethodNameMatching(targetName)) {
-      return MethodMatching.FAIL;
-    }
-    if ((methodNode.access & Opcodes.ACC_BRIDGE) == Opcodes.ACC_BRIDGE) {
-      // name is matching but method is a bridge method
-      return MethodMatching.SKIP;
+    Where(String typeName, String methodName, String signature, SourceLine[] lines, String sourceFile) {
+        this.typeName = typeName;
+        this.methodName = methodName;
+        this.sourceFile = sourceFile;
+        this.signature = signature;
+        this.lines = lines;
     }
-    if (signature == null) {
-      if (lines == null || lines.length == 0) {
-        return MethodMatching.MATCH;
-      }
-      // try matching by line
-      List<MethodNode> methodsByLine = classFileLines.getMethodsByLine(lines[0].getFrom());
-      if (methodsByLine == null || methodsByLine.isEmpty()) {
-        return MethodMatching.FAIL;
-      }
-      return methodsByLine.stream().anyMatch(m -> m == methodNode)
-          ? MethodMatching.MATCH
-          : MethodMatching.FAIL;
+
+    Where(String typeName, String methodName, String signature, String[] lines, String sourceFile) {
+        this(typeName, methodName, signature, sourceLines(lines), sourceFile);
     }
-    if (signature.equals("*") || signature.equals(targetMethodDescriptor)) {
-      return MethodMatching.MATCH;
+
+    public static Where of(String typeName, String methodName, String signature, String... lines) {
+        return new Where(typeName, methodName, signature, lines, null);
     }
-    // try full JVM signature: "(Ljava.lang.String;Ljava.util.Map;I)V"
-    if (probeMethodDescriptor == null) {
-      probeMethodDescriptor = signature.trim();
-      if (!probeMethodDescriptor.isEmpty()) {
-        if (isMissingReturnType(probeMethodDescriptor)) {
-          probeMethodDescriptor = UNKNOWN_RETURN_TYPE + " " + probeMethodDescriptor;
-        }
-        probeMethodDescriptor = Types.descriptorFromSignature(probeMethodDescriptor);
-      }
+
+    public static Where of(String typeName, String methodName, String signature) {
+        return new Where(typeName, methodName, signature, (SourceLine[]) null, null);
     }
-    if (probeMethodDescriptor.isEmpty()) {
-      return MethodMatching.MATCH;
+
+    protected static SourceLine[] sourceLines(String[] defs) {
+        if (defs == null || defs.length == 0) {
+            return null;
+        }
+        SourceLine[] lines = new SourceLine[defs.length];
+        for (int i = 0; i < lines.length; i++) {
+            lines[i] = SourceLine.fromString(defs[i]);
+        }
+        return lines;
+    }
+
+    public static Where convertLineToMethod(Where lineWhere, ClassFileLines classFileLines) {
+        if (lineWhere.methodName != null && lineWhere.lines != null) {
+            List<MethodNode> methodsByLine = classFileLines.getMethodsByLine(lineWhere.lines[0].getFrom());
+            if (methodsByLine != null && !methodsByLine.isEmpty()) {
+                // pick the first method, as we can have multiple methods (lambdas) on the same line
+                MethodNode method = methodsByLine.get(0);
+                return new Where(
+                        lineWhere.typeName,
+                        method.name,
+                        Types.descriptorToSignature(method.desc),
+                        (SourceLine[]) null,
+                        null);
+            }
+        }
+        return lineWhere;
     }
-    if (probeMethodDescriptor.equals(targetMethodDescriptor)) {
-      return MethodMatching.MATCH;
+
+    public String getTypeName() {
+        return typeName;
     }
-    // fallback to signature without return type: "Ljava.lang.String;Ljava.util.Map;I"
-    String noRetTypeDescriptor = removeReturnType(probeMethodDescriptor);
-    targetMethodDescriptor = removeReturnType(targetMethodDescriptor);
-    if (noRetTypeDescriptor.equals(targetMethodDescriptor)) {
-      return MethodMatching.MATCH;
+
+    public String getMethodName() {
+        return methodName;
     }
-    // Fallback to signature without Fully Qualified Name: "LString;LMap;I"
-    String simplifiedSignature = removeFQN(targetMethodDescriptor);
-    return noRetTypeDescriptor.equals(simplifiedSignature)
-        ? MethodMatching.MATCH
-        : MethodMatching.FAIL;
-  }
-
-  private static boolean isMissingReturnType(String probeMethodDescriptor) {
-    return probeMethodDescriptor.startsWith("(");
-  }
-
-  private static String removeFQN(String targetSignature) {
-    Matcher matcher = JVM_CLASS_PATTERN.matcher(targetSignature);
-    List<String> classes = new ArrayList<>();
-    while (matcher.find()) {
-      String className = matcher.group(1);
-      classes.add(className);
+
+    public String getSourceFile() {
+        return sourceFile;
     }
-    String result = targetSignature;
-    for (String className : classes) {
-      Pattern classNamePattern = Pattern.compile("L" + escapeClassName(className) + ";");
-      result =
-          classNamePattern
-              .matcher(result)
-              .replaceAll("L" + escapeClassName(simplify(className)) + ";");
+
+    public String getSignature() {
+        return signature;
     }
-    return result;
-  }
 
-  private static String escapeClassName(String className) {
-    return className.replace("$", "\\$");
-  }
+    public String[] getLines() {
+        if (lines == null) {
+            return null;
+        }
+        String[] defs = new String[lines.length];
+        for (int i = 0; i < defs.length; i++) {
+            defs[i] = lines[i].toString();
+        }
+        return defs;
+    }
 
-  private static String simplify(String fqnClass) {
-    if (fqnClass == null) {
-      return null;
+    public SourceLine[] getSourceLines() {
+        return lines;
     }
-    int index = fqnClass.lastIndexOf('.');
-    if (index == -1) {
-      index = fqnClass.lastIndexOf('/');
-      if (index == -1) {
-        return fqnClass;
-      }
+
+    public boolean isTypeMatching(String targetType) {
+        return typeName == null || typeName.equals("*") || typeName.equals(targetType);
     }
-    return fqnClass.substring(index + 1);
-  }
 
-  private static String removeReturnType(String javaSignature) {
-    if (javaSignature == null) {
-      return null;
+    public boolean isMethodNameMatching(String targetMethod) {
+        return methodName == null || methodName.equals("*") || methodName.equals(targetMethod);
     }
-    int leftParen = javaSignature.indexOf('(');
-    int rightParen = javaSignature.indexOf(')');
-    if (leftParen == -1 || rightParen == -1 || leftParen > rightParen) {
-      return javaSignature;
+
+    public enum MethodMatching {
+        MATCH,
+        SKIP,
+        FAIL
     }
-    return javaSignature.substring(leftParen + 1, rightParen);
-  }
 
-  public boolean isSignatureMatching(String targetSignature) {
-    if (signature == null || signature.equals("*")) {
-      return true;
+    public MethodMatching isMethodMatching(MethodNode methodNode, ClassFileLines classFileLines) {
+        String targetName = methodNode.name;
+        String targetMethodDescriptor = methodNode.desc;
+        // try exact matching: name + FQN signature
+        if (!isMethodNameMatching(targetName)) {
+            return MethodMatching.FAIL;
+        }
+        if ((methodNode.access & Opcodes.ACC_BRIDGE) == Opcodes.ACC_BRIDGE) {
+            // name is matching but method is a bridge method
+            return MethodMatching.SKIP;
+        }
+        if (signature == null) {
+            if (lines == null || lines.length == 0) {
+                return MethodMatching.MATCH;
+            }
+            // try matching by line
+            List<MethodNode> methodsByLine = classFileLines.getMethodsByLine(lines[0].getFrom());
+            if (methodsByLine == null || methodsByLine.isEmpty()) {
+                return MethodMatching.FAIL;
+            }
+            return methodsByLine.stream().anyMatch(m -> m == methodNode) ? MethodMatching.MATCH : MethodMatching.FAIL;
+        }
+        if (signature.equals("*") || signature.equals(targetMethodDescriptor)) {
+            return MethodMatching.MATCH;
+        }
+        // try full JVM signature: "(Ljava.lang.String;Ljava.util.Map;I)V"
+        if (probeMethodDescriptor == null) {
+            probeMethodDescriptor = signature.trim();
+            if (!probeMethodDescriptor.isEmpty()) {
+                if (isMissingReturnType(probeMethodDescriptor)) {
+                    probeMethodDescriptor = UNKNOWN_RETURN_TYPE + " " + probeMethodDescriptor;
+                }
+                probeMethodDescriptor = Types.descriptorFromSignature(probeMethodDescriptor);
+            }
+        }
+        if (probeMethodDescriptor.isEmpty()) {
+            return MethodMatching.MATCH;
+        }
+        if (probeMethodDescriptor.equals(targetMethodDescriptor)) {
+            return MethodMatching.MATCH;
+        }
+        // fallback to signature without return type: "Ljava.lang.String;Ljava.util.Map;I"
+        String noRetTypeDescriptor = removeReturnType(probeMethodDescriptor);
+        targetMethodDescriptor = removeReturnType(targetMethodDescriptor);
+        if (noRetTypeDescriptor.equals(targetMethodDescriptor)) {
+            return MethodMatching.MATCH;
+        }
+        // Fallback to signature without Fully Qualified Name: "LString;LMap;I"
+        String simplifiedSignature = removeFQN(targetMethodDescriptor);
+        return noRetTypeDescriptor.equals(simplifiedSignature) ? MethodMatching.MATCH : MethodMatching.FAIL;
     }
-    if (signature.equals(targetSignature)) {
-      return true;
+
+    private static boolean isMissingReturnType(String probeMethodDescriptor) {
+        return probeMethodDescriptor.startsWith("(");
     }
-    return Types.descriptorFromSignature(signature).equals(targetSignature);
-  }
-
-  @Generated
-  @Override
-  public String toString() {
-    return "Where{"
-        + "typeName='"
-        + typeName
-        + '\''
-        + ", methodName='"
-        + methodName
-        + '\''
-        + ", sourceFile='"
-        + sourceFile
-        + '\''
-        + ", signature='"
-        + signature
-        + '\''
-        + ", lines="
-        + Arrays.toString(lines)
-        + '}';
-  }
-
-  @Generated
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    Where where = (Where) o;
-    return Objects.equals(typeName, where.typeName)
-        && Objects.equals(methodName, where.methodName)
-        && Objects.equals(sourceFile, where.sourceFile)
-        && Objects.equals(signature, where.signature)
-        && Arrays.equals(lines, where.lines);
-  }
-
-  @Generated
-  @Override
-  public int hashCode() {
-    int result = Objects.hash(typeName, methodName, sourceFile, signature);
-    result = 31 * result + Arrays.hashCode(lines);
-    return result;
-  }
-
-  public static class SourceLine {
-    private final int from, till;
-
-    public SourceLine(int line) {
-      this(line, line);
+
+    private static String removeFQN(String targetSignature) {
+        Matcher matcher = JVM_CLASS_PATTERN.matcher(targetSignature);
+        List<String> classes = new ArrayList<>();
+        while (matcher.find()) {
+            String className = matcher.group(1);
+            classes.add(className);
+        }
+        String result = targetSignature;
+        for (String className : classes) {
+            Pattern classNamePattern = Pattern.compile("L" + escapeClassName(className) + ";");
+            result = classNamePattern.matcher(result).replaceAll("L" + escapeClassName(simplify(className)) + ";");
+        }
+        return result;
     }
 
-    public SourceLine(int from, int till) {
-      this.from = from;
-      this.till = till;
+    private static String escapeClassName(String className) {
+        return className.replace("$", "\\$");
     }
 
-    public boolean isSingleLine() {
-      return from == till;
+    private static String simplify(String fqnClass) {
+        if (fqnClass == null) {
+            return null;
+        }
+        int index = fqnClass.lastIndexOf('.');
+        if (index == -1) {
+            index = fqnClass.lastIndexOf('/');
+            if (index == -1) {
+                return fqnClass;
+            }
+        }
+        return fqnClass.substring(index + 1);
     }
 
-    public int getFrom() {
-      return from;
+    private static String removeReturnType(String javaSignature) {
+        if (javaSignature == null) {
+            return null;
+        }
+        int leftParen = javaSignature.indexOf('(');
+        int rightParen = javaSignature.indexOf(')');
+        if (leftParen == -1 || rightParen == -1 || leftParen > rightParen) {
+            return javaSignature;
+        }
+        return javaSignature.substring(leftParen + 1, rightParen);
     }
 
-    public int getTill() {
-      return till;
+    public boolean isSignatureMatching(String targetSignature) {
+        if (signature == null || signature.equals("*")) {
+            return true;
+        }
+        if (signature.equals(targetSignature)) {
+            return true;
+        }
+        return Types.descriptorFromSignature(signature).equals(targetSignature);
     }
 
+    @Generated
     @Override
     public String toString() {
-      if (isSingleLine()) {
-        return String.valueOf(from);
-      } else {
-        return from + "-" + till;
-      }
-    }
-
-    public static SourceLine fromString(String lineDef) {
-      int delimIndex = lineDef.indexOf('-');
-      if (delimIndex == -1) {
-        int line = Integer.parseInt(lineDef);
-        return new SourceLine(line, line);
-      } else {
-        int lineFrom = Integer.parseInt(lineDef.substring(0, delimIndex));
-        int lineTill = Integer.parseInt(lineDef.substring(delimIndex + 1));
-        return new SourceLine(lineFrom, lineTill);
-      }
+        return "Where{"
+                + "typeName='"
+                + typeName
+                + '\''
+                + ", methodName='"
+                + methodName
+                + '\''
+                + ", sourceFile='"
+                + sourceFile
+                + '\''
+                + ", signature='"
+                + signature
+                + '\''
+                + ", lines="
+                + Arrays.toString(lines)
+                + '}';
     }
 
     @Generated
     @Override
     public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      SourceLine that = (SourceLine) o;
-      return from == that.from && till == that.till;
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Where where = (Where) o;
+        return Objects.equals(typeName, where.typeName)
+                && Objects.equals(methodName, where.methodName)
+                && Objects.equals(sourceFile, where.sourceFile)
+                && Objects.equals(signature, where.signature)
+                && Arrays.equals(lines, where.lines);
     }
 
     @Generated
     @Override
     public int hashCode() {
-      return Objects.hash(from, till);
+        int result = Objects.hash(typeName, methodName, sourceFile, signature);
+        result = 31 * result + Arrays.hashCode(lines);
+        return result;
     }
-  }
 
-  public static class SourceLineAdapter extends JsonAdapter<SourceLine[]> {
-    private static String[] STRING_ARRAY = new String[0];
+    public static class SourceLine {
+        private final int from, till;
 
-    @Override
-    public Where.SourceLine[] fromJson(JsonReader jsonReader) throws IOException {
-      if (jsonReader.peek() == JsonReader.Token.NULL) {
-        jsonReader.nextNull();
-        return null;
-      }
-      List<String> lines = new ArrayList<>();
-      jsonReader.beginArray();
-      while (jsonReader.hasNext()) {
-        lines.add(jsonReader.nextString());
-      }
-      jsonReader.endArray();
-      return sourceLines(lines.toArray(STRING_ARRAY));
+        public SourceLine(int line) {
+            this(line, line);
+        }
+
+        public SourceLine(int from, int till) {
+            this.from = from;
+            this.till = till;
+        }
+
+        public boolean isSingleLine() {
+            return from == till;
+        }
+
+        public int getFrom() {
+            return from;
+        }
+
+        public int getTill() {
+            return till;
+        }
+
+        @Override
+        public String toString() {
+            if (isSingleLine()) {
+                return String.valueOf(from);
+            } else {
+                return from + "-" + till;
+            }
+        }
+
+        public static SourceLine fromString(String lineDef) {
+            int delimIndex = lineDef.indexOf('-');
+            if (delimIndex == -1) {
+                int line = Integer.parseInt(lineDef);
+                return new SourceLine(line, line);
+            } else {
+                int lineFrom = Integer.parseInt(lineDef.substring(0, delimIndex));
+                int lineTill = Integer.parseInt(lineDef.substring(delimIndex + 1));
+                return new SourceLine(lineFrom, lineTill);
+            }
+        }
+
+        @Generated
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            SourceLine that = (SourceLine) o;
+            return from == that.from && till == that.till;
+        }
+
+        @Generated
+        @Override
+        public int hashCode() {
+            return Objects.hash(from, till);
+        }
     }
 
-    @Override
-    public void toJson(JsonWriter jsonWriter, Where.SourceLine[] sourceLines) throws IOException {
-      if (sourceLines == null) {
-        jsonWriter.nullValue();
-        return;
-      }
-      jsonWriter.beginArray();
-      for (SourceLine sourceLine : sourceLines) {
-        jsonWriter.value(sourceLine.toString());
-      }
-      jsonWriter.endArray();
+    public static class SourceLineAdapter extends JsonAdapter<SourceLine[]> {
+        private static String[] STRING_ARRAY = new String[0];
+
+        @Override
+        public Where.SourceLine[] fromJson(JsonReader jsonReader) throws IOException {
+            if (jsonReader.peek() == JsonReader.Token.NULL) {
+                jsonReader.nextNull();
+                return null;
+            }
+            List<String> lines = new ArrayList<>();
+            jsonReader.beginArray();
+            while (jsonReader.hasNext()) {
+                lines.add(jsonReader.nextString());
+            }
+            jsonReader.endArray();
+            return sourceLines(lines.toArray(STRING_ARRAY));
+        }
+
+        @Override
+        public void toJson(JsonWriter jsonWriter, Where.SourceLine[] sourceLines) throws IOException {
+            if (sourceLines == null) {
+                jsonWriter.nullValue();
+                return;
+            }
+            jsonWriter.beginArray();
+            for (SourceLine sourceLine : sourceLines) {
+                jsonWriter.value(sourceLine.toString());
+            }
+            jsonWriter.endArray();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/DebuggerSink.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/DebuggerSink.java
index 4ad1390b00e..375db29fed5 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/DebuggerSink.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/DebuggerSink.java
@@ -17,225 +17,218 @@
 
 /** Collects data that needs to be sent to the backend: Snapshots, metrics and statuses */
 public class DebuggerSink {
-  private static final Logger LOGGER = LoggerFactory.getLogger(DebuggerSink.class);
-  private static final double FREE_CAPACITY_LOWER_THRESHOLD = 0.25;
-  private static final double FREE_CAPACITY_UPPER_THRESHOLD = 0.75;
-  private static final int LOW_RATE_MIN_FLUSH_INTERVAL = 100;
-  private static final int LOW_RATE_MAX_FLUSH_INTERVAL = 2000;
-  private static final long LOW_RATE_INITIAL_FLUSH_INTERVAL = 1000;
-  static final long LOW_RATE_STEP_SIZE = 200;
-  private static final String PREFIX = "debugger.sink.";
-
-  private final ProbeStatusSink probeStatusSink;
-  private final SnapshotSink snapshotSink;
-  private final SymbolSink symbolSink;
-  private final DebuggerMetricCollector metricCollector;
-  private final String tags;
-  private final int uploadFlushInterval;
-  private final AgentTaskScheduler lowRateScheduler = AgentTaskScheduler.get();
-  private volatile AgentTaskScheduler.Scheduled<DebuggerSink> lowRateScheduled;
-  private volatile AgentTaskScheduler.Scheduled<DebuggerSink> flushIntervalScheduled;
-  private volatile long currentLowRateFlushInterval = LOW_RATE_INITIAL_FLUSH_INTERVAL;
-
-  public DebuggerSink(Config config, ProbeStatusSink probeStatusSink) {
-    this(
-        config,
-        null,
-        DebuggerMetricCollector.get(),
-        probeStatusSink,
-        new SnapshotSink(
-            config,
-            null,
-            new BatchUploader(
-                "Snapshots",
+    private static final Logger LOGGER = LoggerFactory.getLogger(DebuggerSink.class);
+    private static final double FREE_CAPACITY_LOWER_THRESHOLD = 0.25;
+    private static final double FREE_CAPACITY_UPPER_THRESHOLD = 0.75;
+    private static final int LOW_RATE_MIN_FLUSH_INTERVAL = 100;
+    private static final int LOW_RATE_MAX_FLUSH_INTERVAL = 2000;
+    private static final long LOW_RATE_INITIAL_FLUSH_INTERVAL = 1000;
+    static final long LOW_RATE_STEP_SIZE = 200;
+    private static final String PREFIX = "debugger.sink.";
+
+    private final ProbeStatusSink probeStatusSink;
+    private final SnapshotSink snapshotSink;
+    private final SymbolSink symbolSink;
+    private final DebuggerMetricCollector metricCollector;
+    private final String tags;
+    private final int uploadFlushInterval;
+    private final AgentTaskScheduler lowRateScheduler = AgentTaskScheduler.get();
+    private volatile AgentTaskScheduler.Scheduled<DebuggerSink> lowRateScheduled;
+    private volatile AgentTaskScheduler.Scheduled<DebuggerSink> flushIntervalScheduled;
+    private volatile long currentLowRateFlushInterval = LOW_RATE_INITIAL_FLUSH_INTERVAL;
+
+    public DebuggerSink(Config config, ProbeStatusSink probeStatusSink) {
+        this(
                 config,
-                config.getFinalDebuggerSnapshotUrl(),
-                SnapshotSink.RETRY_POLICY),
-            new BatchUploader(
-                "Logs", config, config.getFinalDebuggerSnapshotUrl(), SnapshotSink.RETRY_POLICY)),
-        new SymbolSink(config));
-  }
-
-  public DebuggerSink(
-      Config config,
-      String tags,
-      DebuggerMetricCollector metricCollector,
-      ProbeStatusSink probeStatusSink,
-      SnapshotSink snapshotSink,
-      SymbolSink symbolSink) {
-    this.tags = tags;
-    this.metricCollector = metricCollector;
-    this.probeStatusSink = probeStatusSink;
-    this.snapshotSink = snapshotSink;
-    this.symbolSink = symbolSink;
-    this.uploadFlushInterval = config.getDynamicInstrumentationUploadFlushInterval();
-  }
-
-  public void start() {
-    if (uploadFlushInterval == 0) {
-      flushIntervalScheduled =
-          lowRateScheduler.scheduleAtFixedRate(
-              this::reconsiderLowRateFlushInterval, this, 0, 200, TimeUnit.MILLISECONDS);
-    } else {
-      currentLowRateFlushInterval = uploadFlushInterval;
-    }
-    LOGGER.debug("Scheduling low rate debugger sink flush to {}ms", currentLowRateFlushInterval);
-    lowRateScheduled =
-        lowRateScheduler.scheduleAtFixedRate(
-            this::lowRateFlush, this, 0, currentLowRateFlushInterval, TimeUnit.MILLISECONDS);
-    snapshotSink.start();
-  }
-
-  public void stop() {
-    cancelSchedule(this.flushIntervalScheduled);
-    cancelSchedule(this.lowRateScheduled);
-    lowRateFlush(this);
-    snapshotSink.highRateFlush(null);
-    probeStatusSink.stop();
-    symbolSink.stop();
-    snapshotSink.stop();
-  }
-
-  private void cancelSchedule(AgentTaskScheduler.Scheduled<DebuggerSink> scheduled) {
-    if (scheduled != null) {
-      scheduled.cancel();
-    }
-  }
-
-  public SnapshotSink getSnapshotSink() {
-    return snapshotSink;
-  }
-
-  public ProbeStatusSink getProbeStatusSink() {
-    return probeStatusSink;
-  }
-
-  public SymbolSink getSymbolSink() {
-    return symbolSink;
-  }
-
-  public void addSnapshot(Snapshot snapshot) {
-    boolean added = snapshotSink.addLowRate(snapshot);
-    if (!added) {
-      metricCollector.recordEventDropped(QUEUE_FULL);
-    } else {
-      if (!(snapshot.getProbe() instanceof ExceptionProbe)) {
-        // do not report emitting for exception probes
-        probeStatusSink.addEmitting(snapshot.getProbe().getProbeId());
-      }
-    }
-  }
-
-  public void addHighRateSnapshot(Snapshot snapshot) {
-    boolean added = snapshotSink.addHighRate(snapshot);
-    if (!added) {
-      metricCollector.recordEventDropped(QUEUE_FULL);
-    } else {
-      probeStatusSink.addEmitting(snapshot.getProbe().getProbeId());
-    }
-  }
-
-  ProbeStatusSink getProbeDiagnosticsSink() {
-    return probeStatusSink;
-  }
-
-  private void lowRateReschedule() {
-    cancelSchedule(this.lowRateScheduled);
-    LOGGER.debug("Rescheduling low rate debugger sink flush to {}ms", currentLowRateFlushInterval);
-    this.lowRateScheduled =
-        lowRateScheduler.scheduleAtFixedRate(
-            this::lowRateFlush,
-            this,
-            currentLowRateFlushInterval,
-            currentLowRateFlushInterval,
-            TimeUnit.MILLISECONDS);
-  }
-
-  @VisibleForTesting
-  void lowRateFlush(DebuggerSink ignored) {
-    symbolSink.flush();
-    probeStatusSink.flush(tags);
-    snapshotSink.lowRateFlush(tags);
-  }
-
-  private void reconsiderLowRateFlushInterval(DebuggerSink debuggerSink) {
-    doReconsiderLowRateFlushInterval();
-  }
-
-  // Depending on the remaining capacity in the upload queue, we adjust the flush interval
-  // to avoid filling the queue if we are waiting too long between flushes.
-  // We are using 2 thresholds to adjust the flush interval:
-  // - if the remaining capacity is below the lower threshold, we decrease the flush interval
-  // - if the remaining capacity is above the upper threshold, we increase the flush interval
-  void doReconsiderLowRateFlushInterval() {
-    double remainingCapacityPercent =
-        snapshotSink.remainingCapacity() * 1D / SnapshotSink.LOW_RATE_CAPACITY;
-    long currentInterval = currentLowRateFlushInterval;
-    long newInterval = currentInterval;
-    if (remainingCapacityPercent <= FREE_CAPACITY_LOWER_THRESHOLD) {
-      newInterval = Math.max(currentInterval - LOW_RATE_STEP_SIZE, LOW_RATE_MIN_FLUSH_INTERVAL);
-    } else if (remainingCapacityPercent >= FREE_CAPACITY_UPPER_THRESHOLD) {
-      newInterval = Math.min(currentInterval + LOW_RATE_STEP_SIZE, LOW_RATE_MAX_FLUSH_INTERVAL);
-    }
-    if (newInterval != currentInterval) {
-      currentLowRateFlushInterval = newInterval;
-      LOGGER.debug(
-          "Changing flush interval. Remaining available capacity in upload queue {}%, new flush interval {}ms",
-          remainingCapacityPercent * 100, newInterval);
-      lowRateReschedule();
-    }
-  }
-
-  public void addReceived(ProbeId probeId) {
-    probeStatusSink.addReceived(probeId);
-  }
-
-  public void addInstalled(ProbeId probeId) {
-    probeStatusSink.addInstalled(probeId);
-  }
-
-  public void addBlocked(ProbeId probeId) {
-    probeStatusSink.addBlocked(probeId);
-  }
-
-  public void addError(ProbeId probeId, String msg) {
-    probeStatusSink.addError(probeId, msg);
-  }
-
-  public void removeDiagnostics(ProbeId probeId) {
-    probeStatusSink.removeDiagnostics(probeId);
-  }
-
-  public void addDiagnostics(ProbeId probeId, List<DiagnosticMessage> messages) {
-    for (DiagnosticMessage msg : messages) {
-      switch (msg.getKind()) {
-        case INFO:
-        case WARN:
-          LOGGER.debug(msg.getMessage());
-          break;
-        case ERROR:
-          LOGGER.debug(msg.getMessage());
-          reportError(probeId, msg);
-          break;
-      }
-    }
-  }
-
-  private void reportError(ProbeId probeId, DiagnosticMessage msg) {
-    Throwable throwable = msg.getThrowable();
-    if (throwable != null) {
-      probeStatusSink.addError(probeId, throwable);
-    } else {
-      probeStatusSink.addError(probeId, msg.getMessage());
-    }
-  }
-
-  /** Notifies the snapshot was skipped for one of the SkipCause reason */
-  public void skipSnapshot(String probeId, DebuggerMetricCollector.SkippedReason reason) {
-    metricCollector.recordEventSkipped(reason);
-  }
-
-  long getCurrentLowRateFlushInterval() {
-    return currentLowRateFlushInterval;
-  }
+                null,
+                DebuggerMetricCollector.get(),
+                probeStatusSink,
+                new SnapshotSink(
+                        config,
+                        null,
+                        new BatchUploader(
+                                "Snapshots", config, config.getFinalDebuggerSnapshotUrl(), SnapshotSink.RETRY_POLICY),
+                        new BatchUploader(
+                                "Logs", config, config.getFinalDebuggerSnapshotUrl(), SnapshotSink.RETRY_POLICY)),
+                new SymbolSink(config));
+    }
+
+    public DebuggerSink(
+            Config config,
+            String tags,
+            DebuggerMetricCollector metricCollector,
+            ProbeStatusSink probeStatusSink,
+            SnapshotSink snapshotSink,
+            SymbolSink symbolSink) {
+        this.tags = tags;
+        this.metricCollector = metricCollector;
+        this.probeStatusSink = probeStatusSink;
+        this.snapshotSink = snapshotSink;
+        this.symbolSink = symbolSink;
+        this.uploadFlushInterval = config.getDynamicInstrumentationUploadFlushInterval();
+    }
+
+    public void start() {
+        if (uploadFlushInterval == 0) {
+            flushIntervalScheduled = lowRateScheduler.scheduleAtFixedRate(
+                    this::reconsiderLowRateFlushInterval, this, 0, 200, TimeUnit.MILLISECONDS);
+        } else {
+            currentLowRateFlushInterval = uploadFlushInterval;
+        }
+        LOGGER.debug("Scheduling low rate debugger sink flush to {}ms", currentLowRateFlushInterval);
+        lowRateScheduled = lowRateScheduler.scheduleAtFixedRate(
+                this::lowRateFlush, this, 0, currentLowRateFlushInterval, TimeUnit.MILLISECONDS);
+        snapshotSink.start();
+    }
+
+    public void stop() {
+        cancelSchedule(this.flushIntervalScheduled);
+        cancelSchedule(this.lowRateScheduled);
+        lowRateFlush(this);
+        snapshotSink.highRateFlush(null);
+        probeStatusSink.stop();
+        symbolSink.stop();
+        snapshotSink.stop();
+    }
+
+    private void cancelSchedule(AgentTaskScheduler.Scheduled<DebuggerSink> scheduled) {
+        if (scheduled != null) {
+            scheduled.cancel();
+        }
+    }
+
+    public SnapshotSink getSnapshotSink() {
+        return snapshotSink;
+    }
+
+    public ProbeStatusSink getProbeStatusSink() {
+        return probeStatusSink;
+    }
+
+    public SymbolSink getSymbolSink() {
+        return symbolSink;
+    }
+
+    public void addSnapshot(Snapshot snapshot) {
+        boolean added = snapshotSink.addLowRate(snapshot);
+        if (!added) {
+            metricCollector.recordEventDropped(QUEUE_FULL);
+        } else {
+            if (!(snapshot.getProbe() instanceof ExceptionProbe)) {
+                // do not report emitting for exception probes
+                probeStatusSink.addEmitting(snapshot.getProbe().getProbeId());
+            }
+        }
+    }
+
+    public void addHighRateSnapshot(Snapshot snapshot) {
+        boolean added = snapshotSink.addHighRate(snapshot);
+        if (!added) {
+            metricCollector.recordEventDropped(QUEUE_FULL);
+        } else {
+            probeStatusSink.addEmitting(snapshot.getProbe().getProbeId());
+        }
+    }
+
+    ProbeStatusSink getProbeDiagnosticsSink() {
+        return probeStatusSink;
+    }
+
+    private void lowRateReschedule() {
+        cancelSchedule(this.lowRateScheduled);
+        LOGGER.debug("Rescheduling low rate debugger sink flush to {}ms", currentLowRateFlushInterval);
+        this.lowRateScheduled = lowRateScheduler.scheduleAtFixedRate(
+                this::lowRateFlush,
+                this,
+                currentLowRateFlushInterval,
+                currentLowRateFlushInterval,
+                TimeUnit.MILLISECONDS);
+    }
+
+    @VisibleForTesting
+    void lowRateFlush(DebuggerSink ignored) {
+        symbolSink.flush();
+        probeStatusSink.flush(tags);
+        snapshotSink.lowRateFlush(tags);
+    }
+
+    private void reconsiderLowRateFlushInterval(DebuggerSink debuggerSink) {
+        doReconsiderLowRateFlushInterval();
+    }
+
+    // Depending on the remaining capacity in the upload queue, we adjust the flush interval
+    // to avoid filling the queue if we are waiting too long between flushes.
+    // We are using 2 thresholds to adjust the flush interval:
+    // - if the remaining capacity is below the lower threshold, we decrease the flush interval
+    // - if the remaining capacity is above the upper threshold, we increase the flush interval
+    void doReconsiderLowRateFlushInterval() {
+        double remainingCapacityPercent = snapshotSink.remainingCapacity() * 1D / SnapshotSink.LOW_RATE_CAPACITY;
+        long currentInterval = currentLowRateFlushInterval;
+        long newInterval = currentInterval;
+        if (remainingCapacityPercent <= FREE_CAPACITY_LOWER_THRESHOLD) {
+            newInterval = Math.max(currentInterval - LOW_RATE_STEP_SIZE, LOW_RATE_MIN_FLUSH_INTERVAL);
+        } else if (remainingCapacityPercent >= FREE_CAPACITY_UPPER_THRESHOLD) {
+            newInterval = Math.min(currentInterval + LOW_RATE_STEP_SIZE, LOW_RATE_MAX_FLUSH_INTERVAL);
+        }
+        if (newInterval != currentInterval) {
+            currentLowRateFlushInterval = newInterval;
+            LOGGER.debug(
+                    "Changing flush interval. Remaining available capacity in upload queue {}%, new flush interval {}ms",
+                    remainingCapacityPercent * 100, newInterval);
+            lowRateReschedule();
+        }
+    }
+
+    public void addReceived(ProbeId probeId) {
+        probeStatusSink.addReceived(probeId);
+    }
+
+    public void addInstalled(ProbeId probeId) {
+        probeStatusSink.addInstalled(probeId);
+    }
+
+    public void addBlocked(ProbeId probeId) {
+        probeStatusSink.addBlocked(probeId);
+    }
+
+    public void addError(ProbeId probeId, String msg) {
+        probeStatusSink.addError(probeId, msg);
+    }
+
+    public void removeDiagnostics(ProbeId probeId) {
+        probeStatusSink.removeDiagnostics(probeId);
+    }
+
+    public void addDiagnostics(ProbeId probeId, List<DiagnosticMessage> messages) {
+        for (DiagnosticMessage msg : messages) {
+            switch (msg.getKind()) {
+                case INFO:
+                case WARN:
+                    LOGGER.debug(msg.getMessage());
+                    break;
+                case ERROR:
+                    LOGGER.debug(msg.getMessage());
+                    reportError(probeId, msg);
+                    break;
+            }
+        }
+    }
+
+    private void reportError(ProbeId probeId, DiagnosticMessage msg) {
+        Throwable throwable = msg.getThrowable();
+        if (throwable != null) {
+            probeStatusSink.addError(probeId, throwable);
+        } else {
+            probeStatusSink.addError(probeId, msg.getMessage());
+        }
+    }
+
+    /** Notifies the snapshot was skipped for one of the SkipCause reason */
+    public void skipSnapshot(String probeId, DebuggerMetricCollector.SkippedReason reason) {
+        metricCollector.recordEventSkipped(reason);
+    }
+
+    long getCurrentLowRateFlushInterval() {
+        return currentLowRateFlushInterval;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/IntakeBatchHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/IntakeBatchHelper.java
index dd58de2fe3a..cebb30d8728 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/IntakeBatchHelper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/IntakeBatchHelper.java
@@ -9,82 +9,81 @@
 /** Helper class for batching requests and handling size limit to the intake */
 public class IntakeBatchHelper {
 
-  private static final Logger log = LoggerFactory.getLogger(IntakeBatchHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(IntakeBatchHelper.class);
 
-  private static final int MAX_PAYLOAD_SIZE = 5 * 1024 * 1024;
+    private static final int MAX_PAYLOAD_SIZE = 5 * 1024 * 1024;
 
-  private IntakeBatchHelper() {}
+    private IntakeBatchHelper() {}
 
-  public static List<byte[]> createBatches(List<String> payloads) {
-    List<byte[]> batches = new ArrayList<>();
-    int start = 0;
-    int count = payloads.size();
-    do {
-      StringBuilder sb = new StringBuilder();
-      int includedElements = buildPayloadBatch(payloads, start, count, sb);
-      byte[] payload = sb.toString().getBytes(StandardCharsets.UTF_8);
-      if (includedElements == 0) {
-        // skip the first message because too large
-        start++;
-        count--;
-        continue;
-      }
-      // serialization into UTF-8 can result in a larger payload because of multi-byte character
-      // (non-7bit-ascii), need to check again
-      if (payload.length >= MAX_PAYLOAD_SIZE) {
-        // Remove the last element and retry
-        count = includedElements - 1;
-        if (count == 0) {
-          // only one snapshot was included and actually too large once converted to bytes
-          logSkippedPayload(payloads.get(start));
-        }
-        continue;
-      }
-      batches.add(payload);
-      // adjust start and count to handle the remaining snapshots into the batch
-      start = start + includedElements;
-      count = count - includedElements;
-    } while (count > 0);
-    return batches;
-  }
-
-  /**
-   * Try to serialize as string as many payloads as possible up to the maxPayloadSize
-   *
-   * @param payloads list of elements that we try to include into the StringBuilder
-   * @param start index of the first element into the payloads list that we want to include
-   * @param count number of elements that we want ot include
-   * @param sb StringBuilder that receives serialized elements
-   * @return the number of included elements into the StringBuilder
-   */
-  private static int buildPayloadBatch(
-      List<String> payloads, int start, int count, StringBuilder sb) {
-    int totalSize = 0;
-    int elementCount = 0;
-    sb.append('[');
-    for (int i = start; i < start + count; i++) {
-      String jsonStr = payloads.get(i);
-      totalSize += jsonStr.length();
-      if (totalSize >= MAX_PAYLOAD_SIZE) {
-        // the projected total size is too large, we stop here and do not append the
-        // last serialized snapshot
-        break;
-      }
-      sb.append(jsonStr);
-      sb.append(',');
-      elementCount++;
+    public static List<byte[]> createBatches(List<String> payloads) {
+        List<byte[]> batches = new ArrayList<>();
+        int start = 0;
+        int count = payloads.size();
+        do {
+            StringBuilder sb = new StringBuilder();
+            int includedElements = buildPayloadBatch(payloads, start, count, sb);
+            byte[] payload = sb.toString().getBytes(StandardCharsets.UTF_8);
+            if (includedElements == 0) {
+                // skip the first message because too large
+                start++;
+                count--;
+                continue;
+            }
+            // serialization into UTF-8 can result in a larger payload because of multi-byte character
+            // (non-7bit-ascii), need to check again
+            if (payload.length >= MAX_PAYLOAD_SIZE) {
+                // Remove the last element and retry
+                count = includedElements - 1;
+                if (count == 0) {
+                    // only one snapshot was included and actually too large once converted to bytes
+                    logSkippedPayload(payloads.get(start));
+                }
+                continue;
+            }
+            batches.add(payload);
+            // adjust start and count to handle the remaining snapshots into the batch
+            start = start + includedElements;
+            count = count - includedElements;
+        } while (count > 0);
+        return batches;
     }
-    if (elementCount > 0) {
-      sb.delete(sb.lastIndexOf(","), sb.length());
+
+    /**
+     * Try to serialize as string as many payloads as possible up to the maxPayloadSize
+     *
+     * @param payloads list of elements that we try to include into the StringBuilder
+     * @param start index of the first element into the payloads list that we want to include
+     * @param count number of elements that we want ot include
+     * @param sb StringBuilder that receives serialized elements
+     * @return the number of included elements into the StringBuilder
+     */
+    private static int buildPayloadBatch(List<String> payloads, int start, int count, StringBuilder sb) {
+        int totalSize = 0;
+        int elementCount = 0;
+        sb.append('[');
+        for (int i = start; i < start + count; i++) {
+            String jsonStr = payloads.get(i);
+            totalSize += jsonStr.length();
+            if (totalSize >= MAX_PAYLOAD_SIZE) {
+                // the projected total size is too large, we stop here and do not append the
+                // last serialized snapshot
+                break;
+            }
+            sb.append(jsonStr);
+            sb.append(',');
+            elementCount++;
+        }
+        if (elementCount > 0) {
+            sb.delete(sb.lastIndexOf(","), sb.length());
+        }
+        sb.append(']');
+        return elementCount;
     }
-    sb.append(']');
-    return elementCount;
-  }
 
-  private static void logSkippedPayload(String payload) {
-    log.warn(
-        "Payload ({}mb) exceeding max payload size {}mb, skipping.",
-        payload.getBytes(StandardCharsets.UTF_8).length / 1024 / 1024,
-        MAX_PAYLOAD_SIZE / 1024 / 1024);
-  }
+    private static void logSkippedPayload(String payload) {
+        log.warn(
+                "Payload ({}mb) exceeding max payload size {}mb, skipping.",
+                payload.getBytes(StandardCharsets.UTF_8).length / 1024 / 1024,
+                MAX_PAYLOAD_SIZE / 1024 / 1024);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/ProbeStatusSink.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/ProbeStatusSink.java
index 6a17a522b0e..b0d764a3b2e 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/ProbeStatusSink.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/ProbeStatusSink.java
@@ -30,225 +30,219 @@
 /** Collects probe status messages that needs to be sent to the backend */
 public class ProbeStatusSink {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ProbeStatusSink.class);
-  private static final JsonAdapter<ProbeStatus> PROBE_STATUS_ADAPTER =
-      MoshiHelper.createMoshiProbeStatus().adapter(ProbeStatus.class);
-  private static final int MINUTES_BETWEEN_ERROR_LOG = 5;
-  public static final BatchUploader.RetryPolicy RETRY_POLICY = new BatchUploader.RetryPolicy(10);
-
-  private final BatchUploader diagnosticUploader;
-  private final Builder messageBuilder;
-  private final Map<String, TimedMessage> probeStatuses = new ConcurrentHashMap<>();
-  private final ArrayBlockingQueue<ProbeStatus> queue;
-  private final Duration interval;
-  private final int batchSize;
-  private final RatelimitedLogger ratelimitedLogger =
-      new RatelimitedLogger(LOGGER, MINUTES_BETWEEN_ERROR_LOG, TimeUnit.MINUTES);
-  private final boolean isInstrumentTheWorld;
-  private final boolean useMultiPart;
-
-  public ProbeStatusSink(Config config, String diagnosticsEndpoint, boolean useMultiPart) {
-    this(
-        config,
-        new BatchUploader("Diagnostics", config, diagnosticsEndpoint, RETRY_POLICY),
-        useMultiPart);
-  }
-
-  ProbeStatusSink(Config config, BatchUploader diagnosticUploader, boolean useMultiPart) {
-    this.diagnosticUploader = diagnosticUploader;
-    this.useMultiPart = useMultiPart;
-    this.messageBuilder = new Builder(config);
-    this.interval = Duration.ofSeconds(config.getDynamicInstrumentationDiagnosticsInterval());
-    this.batchSize = config.getDynamicInstrumentationUploadBatchSize();
-    this.queue = new ArrayBlockingQueue<>(2 * this.batchSize);
-    this.isInstrumentTheWorld = config.getDynamicInstrumentationInstrumentTheWorld() != null;
-  }
-
-  public void stop() {
-    diagnosticUploader.shutdown();
-  }
-
-  public void addReceived(ProbeId probeId) {
-    addDiagnostics(messageBuilder.receivedMessage(probeId));
-  }
-
-  public void addInstalled(ProbeId probeId) {
-    addDiagnostics(messageBuilder.installedMessage(probeId));
-  }
-
-  public void addEmitting(ProbeId probeId) {
-    addEmitting(probeId.getEncodedId());
-  }
-
-  public void addEmitting(String encodedProbeId) {
-    TimedMessage timedMessage = probeStatuses.get(encodedProbeId);
-    if (timedMessage != null
-        && timedMessage.getMessage().getDiagnostics().getStatus() == Status.EMITTING) {
-      // if we already have a message for this probe, don't build the message again
-      return;
-    }
-    addDiagnostics(messageBuilder.emittingMessage(encodedProbeId));
-  }
-
-  public void addBlocked(ProbeId probeId) {
-    addDiagnostics(messageBuilder.blockedMessage(probeId));
-  }
-
-  public void addError(ProbeId probeId, Throwable ex) {
-    addDiagnostics(messageBuilder.errorMessage(probeId, ex));
-  }
-
-  public void addError(ProbeId probeId, String message) {
-    addDiagnostics(messageBuilder.errorMessage(probeId, message));
-  }
-
-  public void flush(String tags) {
-    List<String> serializedDiagnostics = getSerializedDiagnostics();
-    List<byte[]> batches = IntakeBatchHelper.createBatches(serializedDiagnostics);
-    for (byte[] batch : batches) {
-      if (useMultiPart) {
-        diagnosticUploader.uploadAsMultipart(
-            tags,
-            new BatchUploader.MultiPartContent(batch, "event", "event.json", APPLICATION_JSON));
-      } else {
-        diagnosticUploader.upload(batch, tags);
-      }
-    }
-  }
-
-  private List<String> getSerializedDiagnostics() {
-    List<ProbeStatus> diagnostics = getDiagnostics();
-    List<String> serializedDiagnostics = new ArrayList<>();
-    for (ProbeStatus message : diagnostics) {
-      try {
-        LOGGER.debug(
-            "Sending probe status[{}] for probe id: {}",
-            message.getDiagnostics().getStatus(),
-            message.getDiagnostics().getProbeId().getId());
-        serializedDiagnostics.add(PROBE_STATUS_ADAPTER.toJson(message));
-      } catch (Exception e) {
-        ExceptionHelper.logException(LOGGER, e, "Error during probe status serialization:");
-      }
-    }
-    return serializedDiagnostics;
-  }
-
-  public HttpUrl getUrl() {
-    return diagnosticUploader.getUrl();
-  }
-
-  public Map<String, String> getProbeStatuses() {
-    Map<String, String> result = new HashMap<>();
-    for (Map.Entry<String, TimedMessage> entry : probeStatuses.entrySet()) {
-      result.put(entry.getKey(), entry.getValue().getMessage().toString());
-    }
-    return result;
-  }
-
-  List<ProbeStatus> getDiagnostics() {
-    return getDiagnostics(Clock.systemDefaultZone());
-  }
-
-  List<ProbeStatus> getDiagnostics(Clock clock) {
-    int missingCapacity = enqueueAllProbesStatusIfNeeded(clock);
-
-    List<ProbeStatus> diagnostics = new ArrayList<>();
-    queue.drainTo(diagnostics, batchSize);
-
-    if (missingCapacity > 0) {
-      // if queue was full before, try re-emit probe status now that there is free capacity
-      enqueueAllProbesStatusIfNeeded(clock);
-    }
-
-    return diagnostics;
-  }
-
-  private int enqueueAllProbesStatusIfNeeded(Clock clock) {
-    Instant now = Instant.now(clock);
-    int missingCapacity = 0;
-    for (TimedMessage entry : probeStatuses.values()) {
-      if (shouldEmitAgain(now, entry.getLastEmit())) {
-        if (!enqueueTimedMessage(entry, now)) {
-          missingCapacity++;
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProbeStatusSink.class);
+    private static final JsonAdapter<ProbeStatus> PROBE_STATUS_ADAPTER =
+            MoshiHelper.createMoshiProbeStatus().adapter(ProbeStatus.class);
+    private static final int MINUTES_BETWEEN_ERROR_LOG = 5;
+    public static final BatchUploader.RetryPolicy RETRY_POLICY = new BatchUploader.RetryPolicy(10);
+
+    private final BatchUploader diagnosticUploader;
+    private final Builder messageBuilder;
+    private final Map<String, TimedMessage> probeStatuses = new ConcurrentHashMap<>();
+    private final ArrayBlockingQueue<ProbeStatus> queue;
+    private final Duration interval;
+    private final int batchSize;
+    private final RatelimitedLogger ratelimitedLogger =
+            new RatelimitedLogger(LOGGER, MINUTES_BETWEEN_ERROR_LOG, TimeUnit.MINUTES);
+    private final boolean isInstrumentTheWorld;
+    private final boolean useMultiPart;
+
+    public ProbeStatusSink(Config config, String diagnosticsEndpoint, boolean useMultiPart) {
+        this(config, new BatchUploader("Diagnostics", config, diagnosticsEndpoint, RETRY_POLICY), useMultiPart);
+    }
+
+    ProbeStatusSink(Config config, BatchUploader diagnosticUploader, boolean useMultiPart) {
+        this.diagnosticUploader = diagnosticUploader;
+        this.useMultiPart = useMultiPart;
+        this.messageBuilder = new Builder(config);
+        this.interval = Duration.ofSeconds(config.getDynamicInstrumentationDiagnosticsInterval());
+        this.batchSize = config.getDynamicInstrumentationUploadBatchSize();
+        this.queue = new ArrayBlockingQueue<>(2 * this.batchSize);
+        this.isInstrumentTheWorld = config.getDynamicInstrumentationInstrumentTheWorld() != null;
+    }
+
+    public void stop() {
+        diagnosticUploader.shutdown();
+    }
+
+    public void addReceived(ProbeId probeId) {
+        addDiagnostics(messageBuilder.receivedMessage(probeId));
+    }
+
+    public void addInstalled(ProbeId probeId) {
+        addDiagnostics(messageBuilder.installedMessage(probeId));
+    }
+
+    public void addEmitting(ProbeId probeId) {
+        addEmitting(probeId.getEncodedId());
+    }
+
+    public void addEmitting(String encodedProbeId) {
+        TimedMessage timedMessage = probeStatuses.get(encodedProbeId);
+        if (timedMessage != null && timedMessage.getMessage().getDiagnostics().getStatus() == Status.EMITTING) {
+            // if we already have a message for this probe, don't build the message again
+            return;
         }
-      }
+        addDiagnostics(messageBuilder.emittingMessage(encodedProbeId));
     }
-    return missingCapacity;
-  }
 
-  public void removeDiagnostics(ProbeId probeId) {
-    probeStatuses.remove(probeId.getEncodedId());
-  }
+    public void addBlocked(ProbeId probeId) {
+        addDiagnostics(messageBuilder.blockedMessage(probeId));
+    }
+
+    public void addError(ProbeId probeId, Throwable ex) {
+        addDiagnostics(messageBuilder.errorMessage(probeId, ex));
+    }
+
+    public void addError(ProbeId probeId, String message) {
+        addDiagnostics(messageBuilder.errorMessage(probeId, message));
+    }
+
+    public void flush(String tags) {
+        List<String> serializedDiagnostics = getSerializedDiagnostics();
+        List<byte[]> batches = IntakeBatchHelper.createBatches(serializedDiagnostics);
+        for (byte[] batch : batches) {
+            if (useMultiPart) {
+                diagnosticUploader.uploadAsMultipart(
+                        tags, new BatchUploader.MultiPartContent(batch, "event", "event.json", APPLICATION_JSON));
+            } else {
+                diagnosticUploader.upload(batch, tags);
+            }
+        }
+    }
+
+    private List<String> getSerializedDiagnostics() {
+        List<ProbeStatus> diagnostics = getDiagnostics();
+        List<String> serializedDiagnostics = new ArrayList<>();
+        for (ProbeStatus message : diagnostics) {
+            try {
+                LOGGER.debug(
+                        "Sending probe status[{}] for probe id: {}",
+                        message.getDiagnostics().getStatus(),
+                        message.getDiagnostics().getProbeId().getId());
+                serializedDiagnostics.add(PROBE_STATUS_ADAPTER.toJson(message));
+            } catch (Exception e) {
+                ExceptionHelper.logException(LOGGER, e, "Error during probe status serialization:");
+            }
+        }
+        return serializedDiagnostics;
+    }
 
-  private void addDiagnostics(ProbeStatus message) {
-    if (isInstrumentTheWorld) {
-      // drop diagnostic messages in Instrument-The-World mode
-      return;
+    public HttpUrl getUrl() {
+        return diagnosticUploader.getUrl();
     }
-    ProbeId probeId = message.getDiagnostics().getProbeId();
-    TimedMessage current = probeStatuses.get(probeId.getId());
-    if (current == null || shouldOverwrite(current.getMessage(), message)) {
-      TimedMessage newMessage = new TimedMessage(message);
-      probeStatuses.put(probeId.getEncodedId(), newMessage);
-      enqueueTimedMessage(newMessage, Instant.now(Clock.systemDefaultZone()));
+
+    public Map<String, String> getProbeStatuses() {
+        Map<String, String> result = new HashMap<>();
+        for (Map.Entry<String, TimedMessage> entry : probeStatuses.entrySet()) {
+            result.put(entry.getKey(), entry.getValue().getMessage().toString());
+        }
+        return result;
     }
-  }
 
-  private boolean enqueueTimedMessage(TimedMessage message, Instant now) {
-    if (!queue.contains(message.getMessage())) {
-      if (queue.offer(
-          message.isAlreadySent()
-              ? message.getMessage().withNewTimestamp(now)
-              : message.getMessage())) {
-        message.setLastEmit(now);
-      } else {
-        ratelimitedLogger.warn(
-            SEND_TELEMETRY,
-            "Diagnostic message queue is full. Dropping probe status[{}] for probe id: {}",
-            message.getMessage().getDiagnostics().getStatus(),
-            message.getMessage().getDiagnostics().getProbeId().getId());
-        return false;
-      }
+    List<ProbeStatus> getDiagnostics() {
+        return getDiagnostics(Clock.systemDefaultZone());
     }
-    return true;
-  }
 
-  private boolean shouldOverwrite(ProbeStatus current, ProbeStatus next) {
-    return next.getDiagnostics().getStatus() == Status.ERROR
-        || (current.getDiagnostics().getStatus() != next.getDiagnostics().getStatus())
-        || (current.getDiagnostics().getProbeId().getVersion()
-            < next.getDiagnostics().getProbeId().getVersion());
-  }
+    List<ProbeStatus> getDiagnostics(Clock clock) {
+        int missingCapacity = enqueueAllProbesStatusIfNeeded(clock);
+
+        List<ProbeStatus> diagnostics = new ArrayList<>();
+        queue.drainTo(diagnostics, batchSize);
 
-  private boolean shouldEmitAgain(Instant now, Instant lastEmit) {
-    return Duration.between(lastEmit, now).compareTo(interval) >= 1;
-  }
+        if (missingCapacity > 0) {
+            // if queue was full before, try re-emit probe status now that there is free capacity
+            enqueueAllProbesStatusIfNeeded(clock);
+        }
+
+        return diagnostics;
+    }
 
-  private static class TimedMessage {
+    private int enqueueAllProbesStatusIfNeeded(Clock clock) {
+        Instant now = Instant.now(clock);
+        int missingCapacity = 0;
+        for (TimedMessage entry : probeStatuses.values()) {
+            if (shouldEmitAgain(now, entry.getLastEmit())) {
+                if (!enqueueTimedMessage(entry, now)) {
+                    missingCapacity++;
+                }
+            }
+        }
+        return missingCapacity;
+    }
 
-    private final ProbeStatus message;
-    private Instant lastEmit;
+    public void removeDiagnostics(ProbeId probeId) {
+        probeStatuses.remove(probeId.getEncodedId());
+    }
 
-    private TimedMessage(ProbeStatus message) {
-      // mark it as never sent before
-      this.lastEmit = Instant.EPOCH;
-      this.message = message;
+    private void addDiagnostics(ProbeStatus message) {
+        if (isInstrumentTheWorld) {
+            // drop diagnostic messages in Instrument-The-World mode
+            return;
+        }
+        ProbeId probeId = message.getDiagnostics().getProbeId();
+        TimedMessage current = probeStatuses.get(probeId.getId());
+        if (current == null || shouldOverwrite(current.getMessage(), message)) {
+            TimedMessage newMessage = new TimedMessage(message);
+            probeStatuses.put(probeId.getEncodedId(), newMessage);
+            enqueueTimedMessage(newMessage, Instant.now(Clock.systemDefaultZone()));
+        }
     }
 
-    public Instant getLastEmit() {
-      return lastEmit;
+    private boolean enqueueTimedMessage(TimedMessage message, Instant now) {
+        if (!queue.contains(message.getMessage())) {
+            if (queue.offer(
+                    message.isAlreadySent() ? message.getMessage().withNewTimestamp(now) : message.getMessage())) {
+                message.setLastEmit(now);
+            } else {
+                ratelimitedLogger.warn(
+                        SEND_TELEMETRY,
+                        "Diagnostic message queue is full. Dropping probe status[{}] for probe id: {}",
+                        message.getMessage().getDiagnostics().getStatus(),
+                        message.getMessage().getDiagnostics().getProbeId().getId());
+                return false;
+            }
+        }
+        return true;
     }
 
-    public ProbeStatus getMessage() {
-      return message;
+    private boolean shouldOverwrite(ProbeStatus current, ProbeStatus next) {
+        return next.getDiagnostics().getStatus() == Status.ERROR
+                || (current.getDiagnostics().getStatus()
+                        != next.getDiagnostics().getStatus())
+                || (current.getDiagnostics().getProbeId().getVersion()
+                        < next.getDiagnostics().getProbeId().getVersion());
     }
 
-    public void setLastEmit(Instant instant) {
-      lastEmit = instant;
+    private boolean shouldEmitAgain(Instant now, Instant lastEmit) {
+        return Duration.between(lastEmit, now).compareTo(interval) >= 1;
     }
 
-    public boolean isAlreadySent() {
-      return !this.lastEmit.equals(Instant.EPOCH);
+    private static class TimedMessage {
+
+        private final ProbeStatus message;
+        private Instant lastEmit;
+
+        private TimedMessage(ProbeStatus message) {
+            // mark it as never sent before
+            this.lastEmit = Instant.EPOCH;
+            this.message = message;
+        }
+
+        public Instant getLastEmit() {
+            return lastEmit;
+        }
+
+        public ProbeStatus getMessage() {
+            return message;
+        }
+
+        public void setLastEmit(Instant instant) {
+            lastEmit = instant;
+        }
+
+        public boolean isAlreadySent() {
+            return !this.lastEmit.equals(Instant.EPOCH);
+        }
     }
-  }
 }
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 7d5639a06b7..8ae2ccba0de 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
@@ -15,327 +15,327 @@
 
 /** Data class representing all data collected at a probe location */
 public class Snapshot {
-  private static final String LANGUAGE = "java";
-  private static final int VERSION = 2;
-
-  private String id;
-  private final transient int version;
-  private final long timestamp;
-  private transient long duration;
-  private final List<CapturedStackFrame> stack = new ArrayList<>();
-  private final Captures captures;
-  private final ProbeImplementation probe;
-  private final String language;
-  private final transient CapturedThread thread;
-  private transient String traceId;
-  private transient String spanId;
-  private List<EvaluationError> evaluationErrors;
-  private transient String message;
-  private final transient int maxDepth;
-  private String exceptionId;
-  private transient int chainedExceptionIdx;
-
-  public Snapshot(java.lang.Thread thread, ProbeImplementation probeImplementation, int maxDepth) {
-    this.version = VERSION;
-    this.timestamp = System.currentTimeMillis();
-    this.captures = new Captures();
-    this.language = LANGUAGE;
-    this.thread = new CapturedThread(thread);
-    this.probe = probeImplementation;
-    this.maxDepth = maxDepth;
-  }
-
-  public Snapshot(
-      String id,
-      int version,
-      long timestamp,
-      long duration,
-      List<CapturedStackFrame> stack,
-      Captures captures,
-      ProbeImplementation probeImplementation,
-      String language,
-      CapturedThread thread,
-      String traceId,
-      String spanId,
-      int maxDepth) {
-    this.id = id;
-    this.version = version;
-    this.timestamp = timestamp;
-    this.duration = duration;
-    this.stack.addAll(stack);
-    this.captures = captures;
-    this.probe = probeImplementation;
-    this.language = language;
-    this.thread = thread;
-    this.traceId = traceId;
-    this.spanId = spanId;
-    this.maxDepth = maxDepth;
-  }
-
-  public void setEntry(CapturedContext context) {
-    captures.setEntry(context);
-  }
-
-  public void setExit(CapturedContext context) {
-    captures.setReturn(context);
-  }
-
-  public void setDuration(long duration) {
-    this.duration = duration;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public void setExceptionId(String exceptionId) {
-    this.exceptionId = exceptionId;
-  }
-
-  public void setChainedExceptionIdx(int chainedExceptionIdx) {
-    this.chainedExceptionIdx = chainedExceptionIdx;
-  }
-
-  public void addLine(CapturedContext context, int line) {
-    captures.addLine(line, context);
-  }
-
-  public void addCaughtExceptions(List<CapturedThrowable> throwables) {
-    if (throwables == null) {
-      return;
-    }
-    for (CapturedThrowable throwable : throwables) {
-      captures.addCaughtException(throwable);
-    }
-  }
-
-  public String getId() {
-    // lazily generates snapshot id
-    if (id == null) {
-      id = RandomUtils.randomUUID().toString();
-    }
-    return id;
-  }
-
-  public int getVersion() {
-    return version;
-  }
-
-  public long getTimestamp() {
-    return timestamp;
-  }
-
-  public long getDuration() {
-    return duration;
-  }
-
-  public List<CapturedStackFrame> getStack() {
-    return stack;
-  }
-
-  public Captures getCaptures() {
-    return captures;
-  }
-
-  public ProbeImplementation getProbe() {
-    return probe;
-  }
-
-  public String getLanguage() {
-    return language;
-  }
-
-  public CapturedThread getThread() {
-    return thread;
-  }
-
-  public String getTraceId() {
-    return traceId;
-  }
-
-  public String getSpanId() {
-    return spanId;
-  }
+    private static final String LANGUAGE = "java";
+    private static final int VERSION = 2;
+
+    private String id;
+    private final transient int version;
+    private final long timestamp;
+    private transient long duration;
+    private final List<CapturedStackFrame> stack = new ArrayList<>();
+    private final Captures captures;
+    private final ProbeImplementation probe;
+    private final String language;
+    private final transient CapturedThread thread;
+    private transient String traceId;
+    private transient String spanId;
+    private List<EvaluationError> evaluationErrors;
+    private transient String message;
+    private final transient int maxDepth;
+    private String exceptionId;
+    private transient int chainedExceptionIdx;
+
+    public Snapshot(java.lang.Thread thread, ProbeImplementation probeImplementation, int maxDepth) {
+        this.version = VERSION;
+        this.timestamp = System.currentTimeMillis();
+        this.captures = new Captures();
+        this.language = LANGUAGE;
+        this.thread = new CapturedThread(thread);
+        this.probe = probeImplementation;
+        this.maxDepth = maxDepth;
+    }
 
-  public List<EvaluationError> getEvaluationErrors() {
-    return evaluationErrors;
-  }
+    public Snapshot(
+            String id,
+            int version,
+            long timestamp,
+            long duration,
+            List<CapturedStackFrame> stack,
+            Captures captures,
+            ProbeImplementation probeImplementation,
+            String language,
+            CapturedThread thread,
+            String traceId,
+            String spanId,
+            int maxDepth) {
+        this.id = id;
+        this.version = version;
+        this.timestamp = timestamp;
+        this.duration = duration;
+        this.stack.addAll(stack);
+        this.captures = captures;
+        this.probe = probeImplementation;
+        this.language = language;
+        this.thread = thread;
+        this.traceId = traceId;
+        this.spanId = spanId;
+        this.maxDepth = maxDepth;
+    }
 
-  public void addEvaluationErrors(List<EvaluationError> errors) {
-    if (errors == null || errors.isEmpty()) {
-      return;
+    public void setEntry(CapturedContext context) {
+        captures.setEntry(context);
     }
-    if (evaluationErrors == null) {
-      evaluationErrors = new ArrayList<>();
+
+    public void setExit(CapturedContext context) {
+        captures.setReturn(context);
     }
-    evaluationErrors.addAll(errors);
-  }
 
-  public String getMessage() {
-    return message;
-  }
+    public void setDuration(long duration) {
+        this.duration = duration;
+    }
 
-  public int getMaxDepth() {
-    return maxDepth;
-  }
+    public void setMessage(String message) {
+        this.message = message;
+    }
 
-  public String getExceptionId() {
-    return exceptionId;
-  }
+    public void setExceptionId(String exceptionId) {
+        this.exceptionId = exceptionId;
+    }
 
-  public int getChainedExceptionIdx() {
-    return chainedExceptionIdx;
-  }
+    public void setChainedExceptionIdx(int chainedExceptionIdx) {
+        this.chainedExceptionIdx = chainedExceptionIdx;
+    }
 
-  public void recordStackTrace(int offset) {
-    stack.clear();
-    int cntr = 0;
-    for (StackTraceElement ste : Thread.currentThread().getStackTrace()) {
-      if (cntr++ < offset) {
-        continue;
-      }
-      stack.add(CapturedStackFrame.from(ste));
+    public void addLine(CapturedContext context, int line) {
+        captures.addLine(line, context);
     }
-  }
 
-  public void setTraceId(String traceId) {
-    this.traceId = traceId;
-  }
+    public void addCaughtExceptions(List<CapturedThrowable> throwables) {
+        if (throwables == null) {
+            return;
+        }
+        for (CapturedThrowable throwable : throwables) {
+            captures.addCaughtException(throwable);
+        }
+    }
 
-  public void setSpanId(String spanId) {
-    this.spanId = spanId;
-  }
+    public String getId() {
+        // lazily generates snapshot id
+        if (id == null) {
+            id = RandomUtils.randomUUID().toString();
+        }
+        return id;
+    }
 
-  public enum Kind {
-    ENTER,
-    RETURN,
-    UNHANDLED_EXCEPTION,
-    HANDLED_EXCEPTION,
-    BEFORE,
-    AFTER
-  }
+    public int getVersion() {
+        return version;
+    }
 
-  /** Stores all collected data at different location (method entry/exit, lines, exceptions) */
-  public static class Captures {
-    private CapturedContext entry;
-    private Map<Integer, CapturedContext> lines;
-    // returnValue encoded into a local of CapturedContext
-    private CapturedContext _return;
+    public long getTimestamp() {
+        return timestamp;
+    }
 
-    private List<CapturedThrowable> caughtExceptions;
+    public long getDuration() {
+        return duration;
+    }
 
-    public CapturedContext getEntry() {
-      return entry;
+    public List<CapturedStackFrame> getStack() {
+        return stack;
     }
 
-    public Map<Integer, CapturedContext> getLines() {
-      return lines;
+    public Captures getCaptures() {
+        return captures;
     }
 
-    public CapturedContext getReturn() {
-      return _return;
+    public ProbeImplementation getProbe() {
+        return probe;
     }
 
-    public List<CapturedThrowable> getCaughtExceptions() {
-      return caughtExceptions;
+    public String getLanguage() {
+        return language;
     }
 
-    public void setEntry(CapturedContext context) {
-      entry = context;
+    public CapturedThread getThread() {
+        return thread;
     }
 
-    public void setReturn(CapturedContext context) {
-      _return = context;
+    public String getTraceId() {
+        return traceId;
     }
 
-    public void addLine(int line, CapturedContext context) {
-      if (lines == null) {
-        lines = new HashMap<>();
-      }
-      lines.put(line, context); // /!\ boxing /!\
+    public String getSpanId() {
+        return spanId;
     }
 
-    public void addCaughtException(CapturedThrowable context) {
-      if (caughtExceptions == null) {
-        caughtExceptions = new ArrayList<>();
-      }
-      caughtExceptions.add(context);
+    public List<EvaluationError> getEvaluationErrors() {
+        return evaluationErrors;
     }
 
-    @Generated
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      Captures captures = (Captures) o;
-      return Objects.equals(entry, captures.entry)
-          && Objects.equals(lines, captures.lines)
-          && Objects.equals(_return, captures._return)
-          && Objects.equals(caughtExceptions, captures.caughtExceptions);
+    public void addEvaluationErrors(List<EvaluationError> errors) {
+        if (errors == null || errors.isEmpty()) {
+            return;
+        }
+        if (evaluationErrors == null) {
+            evaluationErrors = new ArrayList<>();
+        }
+        evaluationErrors.addAll(errors);
     }
 
-    @Generated
-    @Override
-    public int hashCode() {
-      return Objects.hash(entry, lines, _return, caughtExceptions);
+    public String getMessage() {
+        return message;
     }
 
-    @Generated
-    @Override
-    public String toString() {
-      return "Captures{"
-          + "entry="
-          + entry
-          + ", lines="
-          + lines
-          + ", exit="
-          + _return
-          + ", caughtExceptions="
-          + caughtExceptions
-          + '}';
+    public int getMaxDepth() {
+        return maxDepth;
     }
-  }
 
-  public static class CapturedThread {
-    private final long id;
-    private final String name;
+    public String getExceptionId() {
+        return exceptionId;
+    }
 
-    public CapturedThread(Thread thread) {
-      this(thread.getId(), thread.getName());
+    public int getChainedExceptionIdx() {
+        return chainedExceptionIdx;
     }
 
-    public CapturedThread(long id, String name) {
-      this.id = id;
-      this.name = name;
+    public void recordStackTrace(int offset) {
+        stack.clear();
+        int cntr = 0;
+        for (StackTraceElement ste : Thread.currentThread().getStackTrace()) {
+            if (cntr++ < offset) {
+                continue;
+            }
+            stack.add(CapturedStackFrame.from(ste));
+        }
     }
 
-    public long getId() {
-      return id;
+    public void setTraceId(String traceId) {
+        this.traceId = traceId;
     }
 
-    public String getName() {
-      return name;
+    public void setSpanId(String spanId) {
+        this.spanId = spanId;
     }
 
-    @Generated
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      CapturedThread that = (CapturedThread) o;
-      return id == that.id && Objects.equals(name, that.name);
+    public enum Kind {
+        ENTER,
+        RETURN,
+        UNHANDLED_EXCEPTION,
+        HANDLED_EXCEPTION,
+        BEFORE,
+        AFTER
     }
 
-    @Generated
-    @Override
-    public int hashCode() {
-      return Objects.hash(id, name);
+    /** Stores all collected data at different location (method entry/exit, lines, exceptions) */
+    public static class Captures {
+        private CapturedContext entry;
+        private Map<Integer, CapturedContext> lines;
+        // returnValue encoded into a local of CapturedContext
+        private CapturedContext _return;
+
+        private List<CapturedThrowable> caughtExceptions;
+
+        public CapturedContext getEntry() {
+            return entry;
+        }
+
+        public Map<Integer, CapturedContext> getLines() {
+            return lines;
+        }
+
+        public CapturedContext getReturn() {
+            return _return;
+        }
+
+        public List<CapturedThrowable> getCaughtExceptions() {
+            return caughtExceptions;
+        }
+
+        public void setEntry(CapturedContext context) {
+            entry = context;
+        }
+
+        public void setReturn(CapturedContext context) {
+            _return = context;
+        }
+
+        public void addLine(int line, CapturedContext context) {
+            if (lines == null) {
+                lines = new HashMap<>();
+            }
+            lines.put(line, context); // /!\ boxing /!\
+        }
+
+        public void addCaughtException(CapturedThrowable context) {
+            if (caughtExceptions == null) {
+                caughtExceptions = new ArrayList<>();
+            }
+            caughtExceptions.add(context);
+        }
+
+        @Generated
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Captures captures = (Captures) o;
+            return Objects.equals(entry, captures.entry)
+                    && Objects.equals(lines, captures.lines)
+                    && Objects.equals(_return, captures._return)
+                    && Objects.equals(caughtExceptions, captures.caughtExceptions);
+        }
+
+        @Generated
+        @Override
+        public int hashCode() {
+            return Objects.hash(entry, lines, _return, caughtExceptions);
+        }
+
+        @Generated
+        @Override
+        public String toString() {
+            return "Captures{"
+                    + "entry="
+                    + entry
+                    + ", lines="
+                    + lines
+                    + ", exit="
+                    + _return
+                    + ", caughtExceptions="
+                    + caughtExceptions
+                    + '}';
+        }
     }
 
-    @Generated
-    @Override
-    public String toString() {
-      return "CapturedThread{" + "id=" + id + ", name='" + name + '\'' + '}';
+    public static class CapturedThread {
+        private final long id;
+        private final String name;
+
+        public CapturedThread(Thread thread) {
+            this(thread.getId(), thread.getName());
+        }
+
+        public CapturedThread(long id, String name) {
+            this.id = id;
+            this.name = name;
+        }
+
+        public long getId() {
+            return id;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        @Generated
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            CapturedThread that = (CapturedThread) o;
+            return id == that.id && Objects.equals(name, that.name);
+        }
+
+        @Generated
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, name);
+        }
+
+        @Generated
+        @Override
+        public String toString() {
+            return "CapturedThread{" + "id=" + id + ", name='" + name + '\'' + '}';
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SnapshotSink.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SnapshotSink.java
index 694d92112c1..a4db9e43d39 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SnapshotSink.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SnapshotSink.java
@@ -24,197 +24,191 @@
  * captureSnapshot = true) high rate is used for snapshots without Captures (dynamic templated logs)
  */
 public class SnapshotSink {
-  private static final Logger LOGGER = LoggerFactory.getLogger(SnapshotSink.class);
-  public static final int MAX_SNAPSHOT_SIZE = 1024 * 1024;
-  public static final int LOW_RATE_CAPACITY = 1024;
-  static final int HIGH_RATE_MIN_FLUSH_INTERVAL_MS = 1;
-  static final int HIGH_RATE_MAX_FLUSH_INTERVAL_MS = 100;
-  public static final int HIGH_RATE_CAPACITY = 1024;
-  private static final int HIGH_RATE_10_PERCENT_CAPACITY = HIGH_RATE_CAPACITY / 10;
-  private static final int HIGH_RATE_25_PERCENT_CAPACITY = HIGH_RATE_CAPACITY / 4;
-  private static final int HIGH_RATE_75_PERCENT_CAPACITY = HIGH_RATE_CAPACITY * 3 / 4;
-  static final long HIGH_RATE_STEP_SIZE = 10;
-  public static final BatchUploader.RetryPolicy RETRY_POLICY = new BatchUploader.RetryPolicy(0);
-
-  // low rate queue (aka snapshots)
-  private final BlockingQueue<Snapshot> lowRateSnapshots =
-      new ArrayBlockingQueue<>(LOW_RATE_CAPACITY);
-  // high rate queue (aka dynamic templated logs)
-  private final BlockingQueue<Snapshot> highRateSnapshots =
-      new ArrayBlockingQueue<>(HIGH_RATE_CAPACITY);
-  private final String serviceName;
-  private final int batchSize;
-  private final String tags;
-  // uploader for low rate (aka snapshots)
-  private final BatchUploader lowRateUploader;
-  // uploader for high rate (aka dynamic templated logs)
-  private final BatchUploader highRateUploader;
-  private final AgentTaskScheduler highRateScheduler =
-      new AgentTaskScheduler(AgentThreadFactory.AgentThread.DEBUGGER_SNAPSHOT_SERIALIZER);
-  private final AtomicBoolean started = new AtomicBoolean();
-  private volatile AgentTaskScheduler.Scheduled<SnapshotSink> highRateScheduled;
-  private volatile long currentHighRateFlushInterval = HIGH_RATE_MAX_FLUSH_INTERVAL_MS;
-
-  public SnapshotSink(
-      Config config, String tags, BatchUploader lowRateUploader, BatchUploader highRateUploader) {
-    this.serviceName = TagsHelper.sanitize(config.getServiceName());
-    this.batchSize = config.getDynamicInstrumentationUploadBatchSize();
-    this.tags = tags;
-    this.lowRateUploader = lowRateUploader;
-    this.highRateUploader = highRateUploader;
-  }
-
-  public void start() {
-    if (started.compareAndSet(false, true)) {
-      highRateScheduled =
-          highRateScheduler.scheduleAtFixedRate(
-              this::highRateFlush, this, 0, currentHighRateFlushInterval, TimeUnit.MILLISECONDS);
-    }
-  }
-
-  public void stop() {
-    AgentTaskScheduler.Scheduled<SnapshotSink> localScheduled = this.highRateScheduled;
-    if (localScheduled != null) {
-      localScheduled.cancel();
-    }
-    lowRateUploader.shutdown();
-    highRateUploader.shutdown();
-    started.set(false);
-  }
-
-  public void lowRateFlush(String tags) {
-    List<String> snapshots = getSerializedSnapshots(lowRateSnapshots, batchSize);
-    if (snapshots.isEmpty()) {
-      return;
-    }
-    uploadPayloads(lowRateUploader, snapshots, tags);
-  }
-
-  public void highRateFlush(SnapshotSink ignored) {
-    do {
-      List<String> snapshots = getSerializedSnapshots(highRateSnapshots, HIGH_RATE_CAPACITY);
-      if (snapshots.isEmpty()) {
-        backOffHighRateFlush();
-        return;
-      }
-      int count = snapshots.size();
-      reconsiderHighRateFlushInterval(count);
-      uploadPayloads(highRateUploader, snapshots, tags);
-    } while (!highRateSnapshots.isEmpty());
-  }
-
-  public HttpUrl getUrl() {
-    return lowRateUploader.getUrl();
-  }
-
-  public long remainingCapacity() {
-    return lowRateSnapshots.remainingCapacity();
-  }
-
-  public boolean addLowRate(Snapshot snapshot) {
-    return lowRateSnapshots.offer(snapshot);
-  }
-
-  public boolean addHighRate(Snapshot snapshot) {
-    return highRateSnapshots.offer(snapshot);
-  }
-
-  long getCurrentHighRateFlushInterval() {
-    return currentHighRateFlushInterval;
-  }
-
-  private void backOffHighRateFlush() {
-    long interval = currentHighRateFlushInterval;
-    currentHighRateFlushInterval =
-        Math.min(interval + HIGH_RATE_STEP_SIZE, HIGH_RATE_MAX_FLUSH_INTERVAL_MS);
-    if (interval != currentHighRateFlushInterval) {
-      highRateReschedule();
-    }
-  }
-
-  private void reconsiderHighRateFlushInterval(int snapshotCount) {
-    long interval = currentHighRateFlushInterval;
-    if (snapshotCount == HIGH_RATE_CAPACITY) {
-      currentHighRateFlushInterval = HIGH_RATE_MIN_FLUSH_INTERVAL_MS;
-    } else if (snapshotCount > HIGH_RATE_75_PERCENT_CAPACITY) {
-      currentHighRateFlushInterval = Math.max(interval / 4, HIGH_RATE_MIN_FLUSH_INTERVAL_MS);
-    } else if (snapshotCount > HIGH_RATE_25_PERCENT_CAPACITY) {
-      currentHighRateFlushInterval = Math.max(interval / 2, HIGH_RATE_MIN_FLUSH_INTERVAL_MS);
-    } else if (snapshotCount > HIGH_RATE_10_PERCENT_CAPACITY) {
-      currentHighRateFlushInterval =
-          Math.max(interval - HIGH_RATE_STEP_SIZE, HIGH_RATE_MIN_FLUSH_INTERVAL_MS);
-    }
-    if (interval != currentHighRateFlushInterval) {
-      highRateReschedule();
-    }
-  }
-
-  private void highRateReschedule() {
-    if (!started.get()) {
-      return;
-    }
-    AgentTaskScheduler.Scheduled<SnapshotSink> localScheduled = this.highRateScheduled;
-    if (localScheduled != null) {
-      localScheduled.cancel();
-    }
-    LOGGER.debug(
-        "Rescheduling high rate debugger sink flush to {}ms", currentHighRateFlushInterval);
-    this.highRateScheduled =
-        highRateScheduler.scheduleAtFixedRate(
-            this::highRateFlush,
-            this,
-            currentHighRateFlushInterval,
-            currentHighRateFlushInterval,
-            TimeUnit.MILLISECONDS);
-  }
-
-  private List<String> getSerializedSnapshots(BlockingQueue<Snapshot> queue, int localBatchSize) {
-    List<Snapshot> snapshots = new ArrayList<>();
-    if (queue.remainingCapacity() == 0) {
-      localBatchSize = queue.size();
-    }
-    queue.drainTo(snapshots, localBatchSize);
-    List<String> serializedSnapshots = new ArrayList<>();
-    boolean largeBatch = snapshots.size() > 10;
-    if (largeBatch) {
-      LOGGER.debug("Drained {} snapshots, remains {}", snapshots.size(), queue.size());
-    }
-    for (Snapshot snapshot : snapshots) {
-      try {
-        String strSnapshot = serializeSnapshot(serviceName, snapshot);
-        serializedSnapshots.add(strSnapshot);
-        if (!largeBatch) {
-          LOGGER.debug("Sending snapshot for probe: {}", snapshot.getProbe().getId());
+    private static final Logger LOGGER = LoggerFactory.getLogger(SnapshotSink.class);
+    public static final int MAX_SNAPSHOT_SIZE = 1024 * 1024;
+    public static final int LOW_RATE_CAPACITY = 1024;
+    static final int HIGH_RATE_MIN_FLUSH_INTERVAL_MS = 1;
+    static final int HIGH_RATE_MAX_FLUSH_INTERVAL_MS = 100;
+    public static final int HIGH_RATE_CAPACITY = 1024;
+    private static final int HIGH_RATE_10_PERCENT_CAPACITY = HIGH_RATE_CAPACITY / 10;
+    private static final int HIGH_RATE_25_PERCENT_CAPACITY = HIGH_RATE_CAPACITY / 4;
+    private static final int HIGH_RATE_75_PERCENT_CAPACITY = HIGH_RATE_CAPACITY * 3 / 4;
+    static final long HIGH_RATE_STEP_SIZE = 10;
+    public static final BatchUploader.RetryPolicy RETRY_POLICY = new BatchUploader.RetryPolicy(0);
+
+    // low rate queue (aka snapshots)
+    private final BlockingQueue<Snapshot> lowRateSnapshots = new ArrayBlockingQueue<>(LOW_RATE_CAPACITY);
+    // high rate queue (aka dynamic templated logs)
+    private final BlockingQueue<Snapshot> highRateSnapshots = new ArrayBlockingQueue<>(HIGH_RATE_CAPACITY);
+    private final String serviceName;
+    private final int batchSize;
+    private final String tags;
+    // uploader for low rate (aka snapshots)
+    private final BatchUploader lowRateUploader;
+    // uploader for high rate (aka dynamic templated logs)
+    private final BatchUploader highRateUploader;
+    private final AgentTaskScheduler highRateScheduler =
+            new AgentTaskScheduler(AgentThreadFactory.AgentThread.DEBUGGER_SNAPSHOT_SERIALIZER);
+    private final AtomicBoolean started = new AtomicBoolean();
+    private volatile AgentTaskScheduler.Scheduled<SnapshotSink> highRateScheduled;
+    private volatile long currentHighRateFlushInterval = HIGH_RATE_MAX_FLUSH_INTERVAL_MS;
+
+    public SnapshotSink(Config config, String tags, BatchUploader lowRateUploader, BatchUploader highRateUploader) {
+        this.serviceName = TagsHelper.sanitize(config.getServiceName());
+        this.batchSize = config.getDynamicInstrumentationUploadBatchSize();
+        this.tags = tags;
+        this.lowRateUploader = lowRateUploader;
+        this.highRateUploader = highRateUploader;
+    }
+
+    public void start() {
+        if (started.compareAndSet(false, true)) {
+            highRateScheduled = highRateScheduler.scheduleAtFixedRate(
+                    this::highRateFlush, this, 0, currentHighRateFlushInterval, TimeUnit.MILLISECONDS);
+        }
+    }
+
+    public void stop() {
+        AgentTaskScheduler.Scheduled<SnapshotSink> localScheduled = this.highRateScheduled;
+        if (localScheduled != null) {
+            localScheduled.cancel();
         }
-      } catch (AssertionError e) {
-        // Re-queue on AssertionError from Moshi when thread is interrupted so the shutdown hook
-        // flush can retry with a non-interrupted thread
-        ExceptionHelper.logException(LOGGER, e, "Error during snapshot serialization:");
-        queue.offer(snapshot);
-      } catch (Exception e) {
-        ExceptionHelper.logException(LOGGER, e, "Error during snapshot serialization:");
-      }
-    }
-    return serializedSnapshots;
-  }
-
-  private String serializeSnapshot(String serviceName, Snapshot snapshot) {
-    snapshot.getId(); // Ensure id is generated
-    String str = DebuggerAgent.getSnapshotSerializer().serializeSnapshot(serviceName, snapshot);
-    String prunedStr = SnapshotPruner.prune(str, MAX_SNAPSHOT_SIZE, 4);
-    if (prunedStr.length() != str.length()) {
-      LOGGER.debug(
-          "serializing snapshot breached 1MB limit, reducing size from {} -> {}",
-          str.length(),
-          prunedStr.length());
-    }
-    return prunedStr;
-  }
-
-  private static void uploadPayloads(BatchUploader uploader, List<String> payloads, String tags) {
-    List<byte[]> batches = IntakeBatchHelper.createBatches(payloads);
-    for (byte[] batch : batches) {
-      uploader.upload(batch, tags);
-    }
-  }
+        lowRateUploader.shutdown();
+        highRateUploader.shutdown();
+        started.set(false);
+    }
+
+    public void lowRateFlush(String tags) {
+        List<String> snapshots = getSerializedSnapshots(lowRateSnapshots, batchSize);
+        if (snapshots.isEmpty()) {
+            return;
+        }
+        uploadPayloads(lowRateUploader, snapshots, tags);
+    }
+
+    public void highRateFlush(SnapshotSink ignored) {
+        do {
+            List<String> snapshots = getSerializedSnapshots(highRateSnapshots, HIGH_RATE_CAPACITY);
+            if (snapshots.isEmpty()) {
+                backOffHighRateFlush();
+                return;
+            }
+            int count = snapshots.size();
+            reconsiderHighRateFlushInterval(count);
+            uploadPayloads(highRateUploader, snapshots, tags);
+        } while (!highRateSnapshots.isEmpty());
+    }
+
+    public HttpUrl getUrl() {
+        return lowRateUploader.getUrl();
+    }
+
+    public long remainingCapacity() {
+        return lowRateSnapshots.remainingCapacity();
+    }
+
+    public boolean addLowRate(Snapshot snapshot) {
+        return lowRateSnapshots.offer(snapshot);
+    }
+
+    public boolean addHighRate(Snapshot snapshot) {
+        return highRateSnapshots.offer(snapshot);
+    }
+
+    long getCurrentHighRateFlushInterval() {
+        return currentHighRateFlushInterval;
+    }
+
+    private void backOffHighRateFlush() {
+        long interval = currentHighRateFlushInterval;
+        currentHighRateFlushInterval = Math.min(interval + HIGH_RATE_STEP_SIZE, HIGH_RATE_MAX_FLUSH_INTERVAL_MS);
+        if (interval != currentHighRateFlushInterval) {
+            highRateReschedule();
+        }
+    }
+
+    private void reconsiderHighRateFlushInterval(int snapshotCount) {
+        long interval = currentHighRateFlushInterval;
+        if (snapshotCount == HIGH_RATE_CAPACITY) {
+            currentHighRateFlushInterval = HIGH_RATE_MIN_FLUSH_INTERVAL_MS;
+        } else if (snapshotCount > HIGH_RATE_75_PERCENT_CAPACITY) {
+            currentHighRateFlushInterval = Math.max(interval / 4, HIGH_RATE_MIN_FLUSH_INTERVAL_MS);
+        } else if (snapshotCount > HIGH_RATE_25_PERCENT_CAPACITY) {
+            currentHighRateFlushInterval = Math.max(interval / 2, HIGH_RATE_MIN_FLUSH_INTERVAL_MS);
+        } else if (snapshotCount > HIGH_RATE_10_PERCENT_CAPACITY) {
+            currentHighRateFlushInterval = Math.max(interval - HIGH_RATE_STEP_SIZE, HIGH_RATE_MIN_FLUSH_INTERVAL_MS);
+        }
+        if (interval != currentHighRateFlushInterval) {
+            highRateReschedule();
+        }
+    }
+
+    private void highRateReschedule() {
+        if (!started.get()) {
+            return;
+        }
+        AgentTaskScheduler.Scheduled<SnapshotSink> localScheduled = this.highRateScheduled;
+        if (localScheduled != null) {
+            localScheduled.cancel();
+        }
+        LOGGER.debug("Rescheduling high rate debugger sink flush to {}ms", currentHighRateFlushInterval);
+        this.highRateScheduled = highRateScheduler.scheduleAtFixedRate(
+                this::highRateFlush,
+                this,
+                currentHighRateFlushInterval,
+                currentHighRateFlushInterval,
+                TimeUnit.MILLISECONDS);
+    }
+
+    private List<String> getSerializedSnapshots(BlockingQueue<Snapshot> queue, int localBatchSize) {
+        List<Snapshot> snapshots = new ArrayList<>();
+        if (queue.remainingCapacity() == 0) {
+            localBatchSize = queue.size();
+        }
+        queue.drainTo(snapshots, localBatchSize);
+        List<String> serializedSnapshots = new ArrayList<>();
+        boolean largeBatch = snapshots.size() > 10;
+        if (largeBatch) {
+            LOGGER.debug("Drained {} snapshots, remains {}", snapshots.size(), queue.size());
+        }
+        for (Snapshot snapshot : snapshots) {
+            try {
+                String strSnapshot = serializeSnapshot(serviceName, snapshot);
+                serializedSnapshots.add(strSnapshot);
+                if (!largeBatch) {
+                    LOGGER.debug(
+                            "Sending snapshot for probe: {}",
+                            snapshot.getProbe().getId());
+                }
+            } catch (AssertionError e) {
+                // Re-queue on AssertionError from Moshi when thread is interrupted so the shutdown hook
+                // flush can retry with a non-interrupted thread
+                ExceptionHelper.logException(LOGGER, e, "Error during snapshot serialization:");
+                queue.offer(snapshot);
+            } catch (Exception e) {
+                ExceptionHelper.logException(LOGGER, e, "Error during snapshot serialization:");
+            }
+        }
+        return serializedSnapshots;
+    }
+
+    private String serializeSnapshot(String serviceName, Snapshot snapshot) {
+        snapshot.getId(); // Ensure id is generated
+        String str = DebuggerAgent.getSnapshotSerializer().serializeSnapshot(serviceName, snapshot);
+        String prunedStr = SnapshotPruner.prune(str, MAX_SNAPSHOT_SIZE, 4);
+        if (prunedStr.length() != str.length()) {
+            LOGGER.debug(
+                    "serializing snapshot breached 1MB limit, reducing size from {} -> {}",
+                    str.length(),
+                    prunedStr.length());
+        }
+        return prunedStr;
+    }
+
+    private static void uploadPayloads(BatchUploader uploader, List<String> payloads, String tags) {
+        List<byte[]> batches = IntakeBatchHelper.createBatches(payloads);
+        for (byte[] batch : batches) {
+            uploader.upload(batch, tags);
+        }
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SymbolSink.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SymbolSink.java
index ecb064ac251..7ad691798d5 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SymbolSink.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SymbolSink.java
@@ -33,269 +33,261 @@
 
 public class SymbolSink {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(SymbolSink.class);
-  static final int CAPACITY = 1024;
-  public static final BatchUploader.RetryPolicy RETRY_POLICY = new BatchUploader.RetryPolicy(10);
-  private static final JsonAdapter<ServiceVersion> SERVICE_VERSION_ADAPTER =
-      MoshiHelper.createMoshiSymbol().adapter(ServiceVersion.class);
-  // The upload event message JSON. The "final" field is hard-coded to false:
-  // the Java tracer continuously uploads new code as classes get loaded, so
-  // there is no defined end-of-upload point.
-  private static final String EVENT_FORMAT =
-      "{%n"
-          + "\"ddsource\": \"dd_debugger\",%n"
-          + "\"service\": \"%s\",%n"
-          + "\"version\": \"%s\",%n"
-          + "\"language\": \"java\",%n"
-          + "\"runtimeId\": \"%s\",%n"
-          + "\"type\": \"symdb\",%n"
-          + "\"uploadId\": \"%s\",%n"
-          + "\"batchNum\": %d,%n"
-          + "\"final\": false,%n"
-          + "\"attachmentSize\": %d%n"
-          + "}";
-  static final int MAX_SYMDB_UPLOAD_SIZE = 50 * 1024 * 1024;
+    private static final Logger LOGGER = LoggerFactory.getLogger(SymbolSink.class);
+    static final int CAPACITY = 1024;
+    public static final BatchUploader.RetryPolicy RETRY_POLICY = new BatchUploader.RetryPolicy(10);
+    private static final JsonAdapter<ServiceVersion> SERVICE_VERSION_ADAPTER =
+            MoshiHelper.createMoshiSymbol().adapter(ServiceVersion.class);
+    // The upload event message JSON. The "final" field is hard-coded to false:
+    // the Java tracer continuously uploads new code as classes get loaded, so
+    // there is no defined end-of-upload point.
+    private static final String EVENT_FORMAT = "{%n"
+            + "\"ddsource\": \"dd_debugger\",%n"
+            + "\"service\": \"%s\",%n"
+            + "\"version\": \"%s\",%n"
+            + "\"language\": \"java\",%n"
+            + "\"runtimeId\": \"%s\",%n"
+            + "\"type\": \"symdb\",%n"
+            + "\"uploadId\": \"%s\",%n"
+            + "\"batchNum\": %d,%n"
+            + "\"final\": false,%n"
+            + "\"attachmentSize\": %d%n"
+            + "}";
+    static final int MAX_SYMDB_UPLOAD_SIZE = 50 * 1024 * 1024;
 
-  private final String serviceName;
-  private final String env;
-  private final String version;
-  private final String runtimeId;
-  private final BatchUploader symbolUploader;
-  private final int maxPayloadSize;
-  // uploadId is shared by all batches uploaded by this sink. The backend uses
-  // it to group batches belonging to the same logical upload.
-  private final String uploadId = RandomUtils.randomUUID().toString();
-  private final AtomicLong batchNum = new AtomicLong(0);
-  private final BlockingQueue<Scope> scopes = new ArrayBlockingQueue<>(CAPACITY);
-  private final Stats stats = new Stats();
-  private final boolean isCompressed;
+    private final String serviceName;
+    private final String env;
+    private final String version;
+    private final String runtimeId;
+    private final BatchUploader symbolUploader;
+    private final int maxPayloadSize;
+    // uploadId is shared by all batches uploaded by this sink. The backend uses
+    // it to group batches belonging to the same logical upload.
+    private final String uploadId = RandomUtils.randomUUID().toString();
+    private final AtomicLong batchNum = new AtomicLong(0);
+    private final BlockingQueue<Scope> scopes = new ArrayBlockingQueue<>(CAPACITY);
+    private final Stats stats = new Stats();
+    private final boolean isCompressed;
 
-  public SymbolSink(Config config) {
-    this(
-        config,
-        new BatchUploader("SymDB", config, config.getFinalDebuggerSymDBUrl(), RETRY_POLICY),
-        MAX_SYMDB_UPLOAD_SIZE);
-  }
+    public SymbolSink(Config config) {
+        this(
+                config,
+                new BatchUploader("SymDB", config, config.getFinalDebuggerSymDBUrl(), RETRY_POLICY),
+                MAX_SYMDB_UPLOAD_SIZE);
+    }
 
-  SymbolSink(Config config, BatchUploader symbolUploader, int maxPayloadSize) {
-    this.serviceName = TagsHelper.sanitize(config.getServiceName());
-    this.env = TagsHelper.sanitize(config.getEnv());
-    this.version = TagsHelper.sanitize(config.getVersion());
-    this.runtimeId = config.getRuntimeId();
-    this.symbolUploader = symbolUploader;
-    this.maxPayloadSize = maxPayloadSize;
-    this.isCompressed = config.isSymbolDatabaseCompressed();
-  }
+    SymbolSink(Config config, BatchUploader symbolUploader, int maxPayloadSize) {
+        this.serviceName = TagsHelper.sanitize(config.getServiceName());
+        this.env = TagsHelper.sanitize(config.getEnv());
+        this.version = TagsHelper.sanitize(config.getVersion());
+        this.runtimeId = config.getRuntimeId();
+        this.symbolUploader = symbolUploader;
+        this.maxPayloadSize = maxPayloadSize;
+        this.isCompressed = config.isSymbolDatabaseCompressed();
+    }
 
-  public void stop() {
-    symbolUploader.shutdown();
-  }
+    public void stop() {
+        symbolUploader.shutdown();
+    }
 
-  public void addScope(Scope jarScope) {
-    boolean added = scopes.offer(jarScope);
-    int retries = 10;
-    while (!added) {
-      // Q is full, flushing synchronously
-      flush();
-      added = scopes.offer(jarScope);
-      retries--;
-      if (retries < 0) {
-        throw new IllegalStateException("Scope cannot be enqueued after 10 retries" + jarScope);
-      }
+    public void addScope(Scope jarScope) {
+        boolean added = scopes.offer(jarScope);
+        int retries = 10;
+        while (!added) {
+            // Q is full, flushing synchronously
+            flush();
+            added = scopes.offer(jarScope);
+            retries--;
+            if (retries < 0) {
+                throw new IllegalStateException("Scope cannot be enqueued after 10 retries" + jarScope);
+            }
+        }
     }
-  }
 
-  public void flush() {
-    if (scopes.isEmpty()) {
-      return;
+    public void flush() {
+        if (scopes.isEmpty()) {
+            return;
+        }
+        List<Scope> scopesToSerialize = new ArrayList<>();
+        // ArrayBlockingQueue makes drainTo atomic, so it is safe to call flush from different and
+        // concurrent threads
+        scopes.drainTo(scopesToSerialize);
+        // concurrent calls to flush can result in empty scope to send, we don't want to send empty
+        if (scopesToSerialize.isEmpty()) {
+            return;
+        }
+        serializeAndUpload(scopesToSerialize);
     }
-    List<Scope> scopesToSerialize = new ArrayList<>();
-    // ArrayBlockingQueue makes drainTo atomic, so it is safe to call flush from different and
-    // concurrent threads
-    scopes.drainTo(scopesToSerialize);
-    // concurrent calls to flush can result in empty scope to send, we don't want to send empty
-    if (scopesToSerialize.isEmpty()) {
-      return;
+
+    private void serializeAndUpload(List<Scope> scopesToSerialize) {
+        // Determine the batch number once so the attachment body and the EvP event
+        // message agree on it.
+        long currentBatch = batchNum.incrementAndGet();
+        try {
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(2 * 1024 * 1024);
+            try (OutputStream outputStream =
+                    isCompressed ? new GZIPOutputStream(byteArrayOutputStream) : byteArrayOutputStream) {
+                BufferedSink sink = Okio.buffer(Okio.sink(outputStream));
+                SERVICE_VERSION_ADAPTER.toJson(
+                        sink,
+                        new ServiceVersion(
+                                serviceName,
+                                env,
+                                version,
+                                "JAVA",
+                                scopesToSerialize,
+                                uploadId,
+                                currentBatch,
+                                false /* isFinal */));
+                sink.flush();
+            }
+            doUpload(scopesToSerialize, byteArrayOutputStream.toByteArray(), isCompressed, currentBatch);
+        } catch (IOException e) {
+            LOGGER.debug("Error serializing scopes", e);
+        }
     }
-    serializeAndUpload(scopesToSerialize);
-  }
 
-  private void serializeAndUpload(List<Scope> scopesToSerialize) {
-    // Determine the batch number once so the attachment body and the EvP event
-    // message agree on it.
-    long currentBatch = batchNum.incrementAndGet();
-    try {
-      ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(2 * 1024 * 1024);
-      try (OutputStream outputStream =
-          isCompressed ? new GZIPOutputStream(byteArrayOutputStream) : byteArrayOutputStream) {
-        BufferedSink sink = Okio.buffer(Okio.sink(outputStream));
-        SERVICE_VERSION_ADAPTER.toJson(
-            sink,
-            new ServiceVersion(
-                serviceName,
-                env,
-                version,
-                "JAVA",
-                scopesToSerialize,
+    private void doUpload(List<Scope> scopesToSerialize, byte[] payload, boolean isCompressed, long currentBatch) {
+        if (payload.length > maxPayloadSize) {
+            LOGGER.warn("Payload is too big: {}/{} isCompressed={}", payload.length, maxPayloadSize, isCompressed);
+            splitAndSend(scopesToSerialize);
+            return;
+        }
+        updateStats(scopesToSerialize, payload.length);
+        LOGGER.debug(
+                "Sending {} jar scopes size={} isCompressed={} uploadId={} batchNum={}",
+                scopesToSerialize.size(),
+                payload.length,
+                isCompressed,
                 uploadId,
-                currentBatch,
-                false /* isFinal */));
-        sink.flush();
-      }
-      doUpload(scopesToSerialize, byteArrayOutputStream.toByteArray(), isCompressed, currentBatch);
-    } catch (IOException e) {
-      LOGGER.debug("Error serializing scopes", e);
+                currentBatch);
+        String fileName = "file.json";
+        MediaType mediaType = APPLICATION_JSON;
+        if (isCompressed) {
+            fileName = "file.gz";
+            mediaType = APPLICATION_GZIP;
+        }
+        BatchUploader.MultiPartContent event = buildEvent(currentBatch, payload.length);
+        symbolUploader.uploadAsMultipart(
+                "", event, new BatchUploader.MultiPartContent(payload, "file", fileName, mediaType));
     }
-  }
 
-  private void doUpload(
-      List<Scope> scopesToSerialize, byte[] payload, boolean isCompressed, long currentBatch) {
-    if (payload.length > maxPayloadSize) {
-      LOGGER.warn(
-          "Payload is too big: {}/{} isCompressed={}",
-          payload.length,
-          maxPayloadSize,
-          isCompressed);
-      splitAndSend(scopesToSerialize);
-      return;
+    private BatchUploader.MultiPartContent buildEvent(long currentBatch, int attachmentSize) {
+        byte[] eventContent = String.format(
+                        EVENT_FORMAT,
+                        serviceName,
+                        version,
+                        runtimeId,
+                        uploadId.toString(),
+                        currentBatch,
+                        attachmentSize)
+                .getBytes(StandardCharsets.UTF_8);
+        return new BatchUploader.MultiPartContent(eventContent, "event", "event.json", APPLICATION_JSON);
     }
-    updateStats(scopesToSerialize, payload.length);
-    LOGGER.debug(
-        "Sending {} jar scopes size={} isCompressed={} uploadId={} batchNum={}",
-        scopesToSerialize.size(),
-        payload.length,
-        isCompressed,
-        uploadId,
-        currentBatch);
-    String fileName = "file.json";
-    MediaType mediaType = APPLICATION_JSON;
-    if (isCompressed) {
-      fileName = "file.gz";
-      mediaType = APPLICATION_GZIP;
+
+    private static byte[] compressPayload(byte[] jsonBytes) {
+        // usual compression factor 40:1 for those json payload, so we are preallocating 1/40
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(jsonBytes.length / 40);
+        try (GZIPOutputStream gzipOutputStream = new GZIPOutputStream(byteArrayOutputStream)) {
+            gzipOutputStream.write(jsonBytes);
+        } catch (IOException ex) {
+            LOGGER.error("Error compressing json", ex);
+            return null;
+        }
+        LOGGER.debug("Compressed payload from={} to={}", jsonBytes.length, byteArrayOutputStream.size());
+        return byteArrayOutputStream.toByteArray();
     }
-    BatchUploader.MultiPartContent event = buildEvent(currentBatch, payload.length);
-    symbolUploader.uploadAsMultipart(
-        "", event, new BatchUploader.MultiPartContent(payload, "file", fileName, mediaType));
-  }
 
-  private BatchUploader.MultiPartContent buildEvent(long currentBatch, int attachmentSize) {
-    byte[] eventContent =
-        String.format(
-                EVENT_FORMAT,
-                serviceName,
-                version,
-                runtimeId,
-                uploadId.toString(),
-                currentBatch,
-                attachmentSize)
-            .getBytes(StandardCharsets.UTF_8);
-    return new BatchUploader.MultiPartContent(
-        eventContent, "event", "event.json", APPLICATION_JSON);
-  }
+    /*
+     * Try to split recursively the scopes to send in smaller chunks
+     * first try by splitting the jar scopes, then by splitting the class scopes
+     * stopped the recursion when the scopes are small enough to be sent or <2 classes in one scope
+     */
+    private void splitAndSend(List<Scope> scopesToSerialize) {
+        if (scopesToSerialize.size() > 1) {
+            // try to split by jar scopes: one scope per request
+            if (scopesToSerialize.size() < BatchUploader.MAX_ENQUEUED_REQUESTS) {
+                for (Scope scope : scopesToSerialize) {
+                    serializeAndUpload(Collections.singletonList(scope));
+                }
+            } else {
+                // split the list of jar scope in 2 list jar scopes with half of the jar scopes
+                int half = scopesToSerialize.size() / 2;
+                List<Scope> firstHalf = scopesToSerialize.subList(0, half);
+                List<Scope> secondHalf = scopesToSerialize.subList(half, scopesToSerialize.size());
+                LOGGER.debug("split jar scope list in 2: {} and {}", firstHalf.size(), secondHalf.size());
+                serializeAndUpload(firstHalf);
+                serializeAndUpload(secondHalf);
+            }
+        } else {
+            Scope jarScope = scopesToSerialize.get(0);
+            if (jarScope.getScopes() == null) {
+                LOGGER.debug("No class scopes to send for jar scope {}", jarScope.getName());
+                return;
+            }
+            if (jarScope.getScopes().size() < 2) {
+                LOGGER.warn("Cannot split jar scope with less than 2 classes scope: {}", jarScope.getName());
+                return;
+            }
+            // split the jar scope in 2 jar scopes with half of the class scopes
+            int half = jarScope.getScopes().size() / 2;
+            List<Scope> firstHalf = jarScope.getScopes().subList(0, half);
+            List<Scope> secondHalf =
+                    jarScope.getScopes().subList(half, jarScope.getScopes().size());
+            LOGGER.debug(
+                    "split jar scope {} in 2 jar scopes: {} and {}",
+                    jarScope.getName(),
+                    firstHalf.size(),
+                    secondHalf.size());
+            splitAndSend(Arrays.asList(
+                    createJarScope(jarScope.getName(), firstHalf), createJarScope(jarScope.getName(), secondHalf)));
+        }
+    }
 
-  private static byte[] compressPayload(byte[] jsonBytes) {
-    // usual compression factor 40:1 for those json payload, so we are preallocating 1/40
-    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(jsonBytes.length / 40);
-    try (GZIPOutputStream gzipOutputStream = new GZIPOutputStream(byteArrayOutputStream)) {
-      gzipOutputStream.write(jsonBytes);
-    } catch (IOException ex) {
-      LOGGER.error("Error compressing json", ex);
-      return null;
+    private static Scope createJarScope(String jarName, List<Scope> classScopes) {
+        return Scope.builder(ScopeType.JAR, jarName, 0, 0)
+                .name(jarName)
+                .scopes(classScopes)
+                .build();
     }
-    LOGGER.debug(
-        "Compressed payload from={} to={}", jsonBytes.length, byteArrayOutputStream.size());
-    return byteArrayOutputStream.toByteArray();
-  }
 
-  /*
-   * Try to split recursively the scopes to send in smaller chunks
-   * first try by splitting the jar scopes, then by splitting the class scopes
-   * stopped the recursion when the scopes are small enough to be sent or <2 classes in one scope
-   */
-  private void splitAndSend(List<Scope> scopesToSerialize) {
-    if (scopesToSerialize.size() > 1) {
-      // try to split by jar scopes: one scope per request
-      if (scopesToSerialize.size() < BatchUploader.MAX_ENQUEUED_REQUESTS) {
+    private void updateStats(List<Scope> scopesToSerialize, long size) {
+        int totalClasses = 0;
         for (Scope scope : scopesToSerialize) {
-          serializeAndUpload(Collections.singletonList(scope));
+            totalClasses += scope.getScopes() != null ? scope.getScopes().size() : 0;
         }
-      } else {
-        // split the list of jar scope in 2 list jar scopes with half of the jar scopes
-        int half = scopesToSerialize.size() / 2;
-        List<Scope> firstHalf = scopesToSerialize.subList(0, half);
-        List<Scope> secondHalf = scopesToSerialize.subList(half, scopesToSerialize.size());
-        LOGGER.debug("split jar scope list in 2: {} and {}", firstHalf.size(), secondHalf.size());
-        serializeAndUpload(firstHalf);
-        serializeAndUpload(secondHalf);
-      }
-    } else {
-      Scope jarScope = scopesToSerialize.get(0);
-      if (jarScope.getScopes() == null) {
-        LOGGER.debug("No class scopes to send for jar scope {}", jarScope.getName());
-        return;
-      }
-      if (jarScope.getScopes().size() < 2) {
-        LOGGER.warn(
-            "Cannot split jar scope with less than 2 classes scope: {}", jarScope.getName());
-        return;
-      }
-      // split the jar scope in 2 jar scopes with half of the class scopes
-      int half = jarScope.getScopes().size() / 2;
-      List<Scope> firstHalf = jarScope.getScopes().subList(0, half);
-      List<Scope> secondHalf = jarScope.getScopes().subList(half, jarScope.getScopes().size());
-      LOGGER.debug(
-          "split jar scope {} in 2 jar scopes: {} and {}",
-          jarScope.getName(),
-          firstHalf.size(),
-          secondHalf.size());
-      splitAndSend(
-          Arrays.asList(
-              createJarScope(jarScope.getName(), firstHalf),
-              createJarScope(jarScope.getName(), secondHalf)));
+        stats.updateStats(totalClasses, size);
+        LOGGER.debug("SymbolSink stats: {}", stats);
     }
-  }
-
-  private static Scope createJarScope(String jarName, List<Scope> classScopes) {
-    return Scope.builder(ScopeType.JAR, jarName, 0, 0).name(jarName).scopes(classScopes).build();
-  }
 
-  private void updateStats(List<Scope> scopesToSerialize, long size) {
-    int totalClasses = 0;
-    for (Scope scope : scopesToSerialize) {
-      totalClasses += scope.getScopes() != null ? scope.getScopes().size() : 0;
+    public HttpUrl getUrl() {
+        return symbolUploader.getUrl();
     }
-    stats.updateStats(totalClasses, size);
-    LOGGER.debug("SymbolSink stats: {}", stats);
-  }
 
-  public HttpUrl getUrl() {
-    return symbolUploader.getUrl();
-  }
-
-  public Stats getStats() {
-    return stats;
-  }
+    public Stats getStats() {
+        return stats;
+    }
 
-  public static class Stats {
-    private long totalClassScopes;
-    private long totalSize;
+    public static class Stats {
+        private long totalClassScopes;
+        private long totalSize;
 
-    public long getTotalClassScopes() {
-      return totalClassScopes;
-    }
+        public long getTotalClassScopes() {
+            return totalClassScopes;
+        }
 
-    public long getTotalSize() {
-      return totalSize;
-    }
+        public long getTotalSize() {
+            return totalSize;
+        }
 
-    void updateStats(long classScopes, long size) {
-      totalClassScopes += classScopes;
-      totalSize += size;
-    }
+        void updateStats(long classScopes, long size) {
+            totalClassScopes += classScopes;
+            totalSize += size;
+        }
 
-    @Override
-    public String toString() {
-      return "Stats{" + "totalClassScopes=" + totalClassScopes + ", totalSize=" + totalSize + '}';
+        @Override
+        public String toString() {
+            return "Stats{" + "totalClassScopes=" + totalClassScopes + ", totalSize=" + totalSize + '}';
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/AvroFilter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/AvroFilter.java
index 8a7b1130d08..e91bf3b2a16 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/AvroFilter.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/AvroFilter.java
@@ -1,32 +1,30 @@
 package com.datadog.debugger.symbol;
 
 public class AvroFilter implements ScopeFilter {
-  @Override
-  public boolean filterOut(Scope scope) {
-    if (scope == null) {
-      return false;
-    }
-    LanguageSpecifics languageSpecifics = scope.getLanguageSpecifics();
-    if (languageSpecifics != null) {
-      String superClass = languageSpecifics.getSuperClass();
-      // Allow Avro data classes that extend SpecificRecordBase.
-      if ("org.apache.avro.specific.SpecificRecordBase".equals(superClass)) {
+    @Override
+    public boolean filterOut(Scope scope) {
+        if (scope == null) {
+            return false;
+        }
+        LanguageSpecifics languageSpecifics = scope.getLanguageSpecifics();
+        if (languageSpecifics != null) {
+            String superClass = languageSpecifics.getSuperClass();
+            // Allow Avro data classes that extend SpecificRecordBase.
+            if ("org.apache.avro.specific.SpecificRecordBase".equals(superClass)) {
+                return false;
+            }
+        }
+        // Filter out classes that appear to be just schema wrappers.
+        if (scope.getScopeType() == ScopeType.CLASS
+                && scope.getSymbols() != null
+                && scope.getSymbols().stream()
+                        .anyMatch(it -> it.getSymbolType() == SymbolType.STATIC_FIELD
+                                && "SCHEMA$".equals(it.getName())
+                                && it.getType() != null
+                                && it.getType().contains("org.apache.avro.Schema"))) {
+            return true;
+        }
+        // Otherwise, do not filter.
         return false;
-      }
-    }
-    // Filter out classes that appear to be just schema wrappers.
-    if (scope.getScopeType() == ScopeType.CLASS
-        && scope.getSymbols() != null
-        && scope.getSymbols().stream()
-            .anyMatch(
-                it ->
-                    it.getSymbolType() == SymbolType.STATIC_FIELD
-                        && "SCHEMA$".equals(it.getName())
-                        && it.getType() != null
-                        && it.getType().contains("org.apache.avro.Schema"))) {
-      return true;
     }
-    // Otherwise, do not filter.
-    return false;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/BasicSymDBReport.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/BasicSymDBReport.java
index 3bb871a9e6c..8ff40c379b1 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/BasicSymDBReport.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/BasicSymDBReport.java
@@ -11,46 +11,46 @@
 import org.slf4j.LoggerFactory;
 
 public class BasicSymDBReport implements SymDBReport {
-  private static final Logger LOGGER = LoggerFactory.getLogger(BasicSymDBReport.class);
-
-  private final Set<String> missingJars = new HashSet<>();
-  private final Map<String, String> ioExceptions = new HashMap<>();
-  private final List<String> locationErrors = new ArrayList<>();
-  private final Map<String, Integer> classCountByJar = new HashMap<>();
-  private final List<String> scannedJars = new ArrayList<>();
-
-  public void addMissingJar(String jarPath) {
-    missingJars.add(jarPath);
-  }
-
-  public void addIOException(String jarPath, IOException e) {
-    ioExceptions.put(jarPath, e.toString());
-  }
-
-  public void addLocationError(String locationStr) {
-    locationErrors.add(locationStr);
-  }
-
-  public void incClassCount(String jarPath) {
-    classCountByJar.compute(jarPath, (k, v) -> v == null ? 1 : v + 1);
-  }
-
-  public void addScannedJar(String jarPath) {
-    scannedJars.add(jarPath);
-  }
-
-  public void report() {
-    int totalClasses = classCountByJar.values().stream().mapToInt(Integer::intValue).sum();
-    String content =
-        String.format(
-            "SymDB Report: Scanned jar count=%d, Total class count=%d, class count by jar: %s, Scanned jars: %s, Location errors: %s Missing jars: %s IOExceptions: %s",
-            scannedJars.size(),
-            totalClasses,
-            classCountByJar,
-            scannedJars,
-            locationErrors,
-            missingJars,
-            ioExceptions);
-    LOGGER.info(content);
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(BasicSymDBReport.class);
+
+    private final Set<String> missingJars = new HashSet<>();
+    private final Map<String, String> ioExceptions = new HashMap<>();
+    private final List<String> locationErrors = new ArrayList<>();
+    private final Map<String, Integer> classCountByJar = new HashMap<>();
+    private final List<String> scannedJars = new ArrayList<>();
+
+    public void addMissingJar(String jarPath) {
+        missingJars.add(jarPath);
+    }
+
+    public void addIOException(String jarPath, IOException e) {
+        ioExceptions.put(jarPath, e.toString());
+    }
+
+    public void addLocationError(String locationStr) {
+        locationErrors.add(locationStr);
+    }
+
+    public void incClassCount(String jarPath) {
+        classCountByJar.compute(jarPath, (k, v) -> v == null ? 1 : v + 1);
+    }
+
+    public void addScannedJar(String jarPath) {
+        scannedJars.add(jarPath);
+    }
+
+    public void report() {
+        int totalClasses =
+                classCountByJar.values().stream().mapToInt(Integer::intValue).sum();
+        String content = String.format(
+                "SymDB Report: Scanned jar count=%d, Total class count=%d, class count by jar: %s, Scanned jars: %s, Location errors: %s Missing jars: %s IOExceptions: %s",
+                scannedJars.size(),
+                totalClasses,
+                classCountByJar,
+                scannedJars,
+                locationErrors,
+                missingJars,
+                ioExceptions);
+        LOGGER.info(content);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/JarScanner.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/JarScanner.java
index d8a71fdbb61..8d26f093776 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/JarScanner.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/JarScanner.java
@@ -11,68 +11,67 @@
 import org.slf4j.LoggerFactory;
 
 public class JarScanner {
-  private static final Logger LOGGER = LoggerFactory.getLogger(JarScanner.class);
-  private static final String JAR_FILE_PREFIX = "jar:file:";
-  private static final String JAR_NESTED_PREFIX = "jar:nested:";
-  private static final String FILE_PREFIX = "file:";
-  // Spring prefixes:
-  // https://docs.spring.io/spring-boot/docs/current/reference/html/executable-jar.html
-  private static final String SPRING_CLASSES_PREFIX = "BOOT-INF/classes/";
-  private static final String SPRING_DEPS_PREFIX = "BOOT-INF/lib/";
+    private static final Logger LOGGER = LoggerFactory.getLogger(JarScanner.class);
+    private static final String JAR_FILE_PREFIX = "jar:file:";
+    private static final String JAR_NESTED_PREFIX = "jar:nested:";
+    private static final String FILE_PREFIX = "file:";
+    // Spring prefixes:
+    // https://docs.spring.io/spring-boot/docs/current/reference/html/executable-jar.html
+    private static final String SPRING_CLASSES_PREFIX = "BOOT-INF/classes/";
+    private static final String SPRING_DEPS_PREFIX = "BOOT-INF/lib/";
 
-  public static Path extractJarPath(Class<?> clazz, SymDBReport symDBReport)
-      throws URISyntaxException {
-    return extractJarPath(clazz.getProtectionDomain(), symDBReport);
-  }
-
-  public static Path extractJarPath(ProtectionDomain protectionDomain, SymDBReport symDBReport) {
-    if (protectionDomain == null) {
-      return null;
-    }
-    CodeSource codeSource = protectionDomain.getCodeSource();
-    if (codeSource == null) {
-      return null;
+    public static Path extractJarPath(Class<?> clazz, SymDBReport symDBReport) throws URISyntaxException {
+        return extractJarPath(clazz.getProtectionDomain(), symDBReport);
     }
-    URL location = codeSource.getLocation();
-    if (location == null) {
-      return null;
-    }
-    String locationStr = location.toString();
-    LOGGER.debug("CodeSource Location={}", locationStr);
-    if (locationStr.startsWith(JAR_FILE_PREFIX)) {
-      int idx = locationStr.indexOf("!/");
-      if (idx != -1) {
-        return getPathFromPrefixedFileName(locationStr, JAR_FILE_PREFIX, idx);
-      }
-    } else if (locationStr.startsWith(JAR_NESTED_PREFIX)) {
-      int idx = locationStr.indexOf("/!BOOT-INF/");
-      if (idx != -1) {
-        return getPathFromPrefixedFileName(locationStr, JAR_NESTED_PREFIX, idx);
-      }
-    } else if (locationStr.startsWith(FILE_PREFIX)) {
-      return getPathFromPrefixedFileName(locationStr, FILE_PREFIX, locationStr.length());
+
+    public static Path extractJarPath(ProtectionDomain protectionDomain, SymDBReport symDBReport) {
+        if (protectionDomain == null) {
+            return null;
+        }
+        CodeSource codeSource = protectionDomain.getCodeSource();
+        if (codeSource == null) {
+            return null;
+        }
+        URL location = codeSource.getLocation();
+        if (location == null) {
+            return null;
+        }
+        String locationStr = location.toString();
+        LOGGER.debug("CodeSource Location={}", locationStr);
+        if (locationStr.startsWith(JAR_FILE_PREFIX)) {
+            int idx = locationStr.indexOf("!/");
+            if (idx != -1) {
+                return getPathFromPrefixedFileName(locationStr, JAR_FILE_PREFIX, idx);
+            }
+        } else if (locationStr.startsWith(JAR_NESTED_PREFIX)) {
+            int idx = locationStr.indexOf("/!BOOT-INF/");
+            if (idx != -1) {
+                return getPathFromPrefixedFileName(locationStr, JAR_NESTED_PREFIX, idx);
+            }
+        } else if (locationStr.startsWith(FILE_PREFIX)) {
+            return getPathFromPrefixedFileName(locationStr, FILE_PREFIX, locationStr.length());
+        }
+        symDBReport.addLocationError(locationStr);
+        return null;
     }
-    symDBReport.addLocationError(locationStr);
-    return null;
-  }
 
-  public static String trimPrefixes(String classFilePath) {
-    if (classFilePath.startsWith(SPRING_CLASSES_PREFIX)) {
-      return classFilePath.substring(SPRING_CLASSES_PREFIX.length());
+    public static String trimPrefixes(String classFilePath) {
+        if (classFilePath.startsWith(SPRING_CLASSES_PREFIX)) {
+            return classFilePath.substring(SPRING_CLASSES_PREFIX.length());
+        }
+        return classFilePath;
     }
-    return classFilePath;
-  }
 
-  private static Path getPathFromPrefixedFileName(String locationStr, String prefix, int endIdx) {
-    String fileName = locationStr.substring(prefix.length(), endIdx);
-    LOGGER.debug("jar filename={}", fileName);
-    try {
-      // Reconstruct a file URI and use Paths.get(URI) to correctly handle
-      // platform-specific paths, including Windows drive letters (e.g. /C:/...)
-      return Paths.get(new URI("file:" + fileName));
-    } catch (URISyntaxException e) {
-      LOGGER.debug("Failed to parse as URI: {}, falling back to direct path", fileName, e);
-      return Paths.get(fileName);
+    private static Path getPathFromPrefixedFileName(String locationStr, String prefix, int endIdx) {
+        String fileName = locationStr.substring(prefix.length(), endIdx);
+        LOGGER.debug("jar filename={}", fileName);
+        try {
+            // Reconstruct a file URI and use Paths.get(URI) to correctly handle
+            // platform-specific paths, including Windows drive letters (e.g. /C:/...)
+            return Paths.get(new URI("file:" + fileName));
+        } catch (URISyntaxException e) {
+            LOGGER.debug("Failed to parse as URI: {}, falling back to direct path", fileName, e);
+            return Paths.get(fileName);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/LanguageSpecifics.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/LanguageSpecifics.java
index 78599d993d1..2abf0df2e43 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/LanguageSpecifics.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/LanguageSpecifics.java
@@ -8,137 +8,136 @@
 import java.util.Objects;
 
 public class LanguageSpecifics {
-  @Json(name = "access_modifiers")
-  private final List<String> accessModifiers;
-
-  private final List<String> annotations;
-
-  @Json(name = "super_class")
-  private final String superClass;
-
-  private final List<String> interfaces;
-
-  @Json(name = "return_type")
-  private final String returnType;
-
-  public LanguageSpecifics(
-      List<String> accessModifiers,
-      List<String> annotations,
-      String superClass,
-      List<String> interfaces,
-      String returnType) {
-    this.accessModifiers = accessModifiers;
-    this.annotations = annotations;
-    this.superClass = superClass;
-    this.interfaces = interfaces;
-    this.returnType = returnType;
-  }
-
-  public List<String> getAccessModifiers() {
-    return accessModifiers;
-  }
-
-  public List<String> getAnnotations() {
-    return annotations;
-  }
-
-  public String getSuperClass() {
-    return superClass;
-  }
-
-  public List<String> getInterfaces() {
-    return interfaces;
-  }
-
-  public String getReturnType() {
-    return returnType;
-  }
-
-  @Generated
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    LanguageSpecifics that = (LanguageSpecifics) o;
-    return Objects.equals(accessModifiers, that.accessModifiers)
-        && Objects.equals(annotations, that.annotations)
-        && Objects.equals(superClass, that.superClass)
-        && Objects.equals(interfaces, that.interfaces)
-        && Objects.equals(returnType, that.returnType);
-  }
-
-  @Generated
-  @Override
-  public int hashCode() {
-    return Objects.hash(accessModifiers, annotations, superClass, interfaces, returnType);
-  }
-
-  @Generated
-  @Override
-  public String toString() {
-    return "LanguageSpecifics{"
-        + "accessModifiers="
-        + accessModifiers
-        + ", annotations="
-        + annotations
-        + ", superClass='"
-        + superClass
-        + '\''
-        + ", interfaces="
-        + interfaces
-        + ", returnType='"
-        + returnType
-        + '\''
-        + '}';
-  }
-
-  public static class Builder {
-    private List<String> accessModifiers;
-    private List<String> annotations;
-    private String superClass;
-    private List<String> interfaces;
-    private String returnType;
-
-    public Builder addModifiers(Collection<String> modifiers) {
-      if (modifiers == null || modifiers.isEmpty()) {
-        this.accessModifiers = null;
-        return this;
-      }
-      accessModifiers = new ArrayList<>(modifiers);
-      return this;
+    @Json(name = "access_modifiers")
+    private final List<String> accessModifiers;
+
+    private final List<String> annotations;
+
+    @Json(name = "super_class")
+    private final String superClass;
+
+    private final List<String> interfaces;
+
+    @Json(name = "return_type")
+    private final String returnType;
+
+    public LanguageSpecifics(
+            List<String> accessModifiers,
+            List<String> annotations,
+            String superClass,
+            List<String> interfaces,
+            String returnType) {
+        this.accessModifiers = accessModifiers;
+        this.annotations = annotations;
+        this.superClass = superClass;
+        this.interfaces = interfaces;
+        this.returnType = returnType;
     }
 
-    public Builder addAnnotations(Collection<String> annotations) {
-      if (annotations == null || annotations.isEmpty()) {
-        this.annotations = null;
-        return this;
-      }
-      this.annotations = new ArrayList<>(annotations);
-      return this;
+    public List<String> getAccessModifiers() {
+        return accessModifiers;
     }
 
-    public Builder superClass(String superClass) {
-      this.superClass = superClass;
-      return this;
+    public List<String> getAnnotations() {
+        return annotations;
     }
 
-    public Builder addInterfaces(Collection<String> interfaces) {
-      if (interfaces == null || interfaces.isEmpty()) {
-        this.interfaces = null;
-        return this;
-      }
-      this.interfaces = new ArrayList<>(interfaces);
-      return this;
+    public String getSuperClass() {
+        return superClass;
     }
 
-    public Builder returnType(String returnType) {
-      this.returnType = returnType;
-      return this;
+    public List<String> getInterfaces() {
+        return interfaces;
     }
 
-    public LanguageSpecifics build() {
-      return new LanguageSpecifics(
-          accessModifiers, annotations, superClass, interfaces, returnType);
+    public String getReturnType() {
+        return returnType;
+    }
+
+    @Generated
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        LanguageSpecifics that = (LanguageSpecifics) o;
+        return Objects.equals(accessModifiers, that.accessModifiers)
+                && Objects.equals(annotations, that.annotations)
+                && Objects.equals(superClass, that.superClass)
+                && Objects.equals(interfaces, that.interfaces)
+                && Objects.equals(returnType, that.returnType);
+    }
+
+    @Generated
+    @Override
+    public int hashCode() {
+        return Objects.hash(accessModifiers, annotations, superClass, interfaces, returnType);
+    }
+
+    @Generated
+    @Override
+    public String toString() {
+        return "LanguageSpecifics{"
+                + "accessModifiers="
+                + accessModifiers
+                + ", annotations="
+                + annotations
+                + ", superClass='"
+                + superClass
+                + '\''
+                + ", interfaces="
+                + interfaces
+                + ", returnType='"
+                + returnType
+                + '\''
+                + '}';
+    }
+
+    public static class Builder {
+        private List<String> accessModifiers;
+        private List<String> annotations;
+        private String superClass;
+        private List<String> interfaces;
+        private String returnType;
+
+        public Builder addModifiers(Collection<String> modifiers) {
+            if (modifiers == null || modifiers.isEmpty()) {
+                this.accessModifiers = null;
+                return this;
+            }
+            accessModifiers = new ArrayList<>(modifiers);
+            return this;
+        }
+
+        public Builder addAnnotations(Collection<String> annotations) {
+            if (annotations == null || annotations.isEmpty()) {
+                this.annotations = null;
+                return this;
+            }
+            this.annotations = new ArrayList<>(annotations);
+            return this;
+        }
+
+        public Builder superClass(String superClass) {
+            this.superClass = superClass;
+            return this;
+        }
+
+        public Builder addInterfaces(Collection<String> interfaces) {
+            if (interfaces == null || interfaces.isEmpty()) {
+                this.interfaces = null;
+                return this;
+            }
+            this.interfaces = new ArrayList<>(interfaces);
+            return this;
+        }
+
+        public Builder returnType(String returnType) {
+            this.returnType = returnType;
+            return this;
+        }
+
+        public LanguageSpecifics build() {
+            return new LanguageSpecifics(accessModifiers, annotations, superClass, interfaces, returnType);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ProtoFilter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ProtoFilter.java
index b5b94627122..6abc8f098f9 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ProtoFilter.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ProtoFilter.java
@@ -3,55 +3,53 @@
 import java.util.List;
 
 public class ProtoFilter implements ScopeFilter {
-  @Override
-  public boolean filterOut(Scope scope) {
-    if (scope == null) {
-      return false;
-    }
-    LanguageSpecifics languageSpecifics = scope.getLanguageSpecifics();
-    if (languageSpecifics != null) {
-      List<String> interfaces = languageSpecifics.getInterfaces();
-      if (interfaces != null) {
-        if (interfaces.contains("com.google.protobuf.MessageOrBuilder")) {
-          // MessageOrBuilder is an interface implemented by both message classes and their
-          // builders.
-          // Scopes implementing this interface are filtered out because they do not represent
-          // concrete data structures but rather interfaces for accessing or building messages.
-          return true;
+    @Override
+    public boolean filterOut(Scope scope) {
+        if (scope == null) {
+            return false;
         }
-      }
-      String superClass = languageSpecifics.getSuperClass();
-      if ("com.google.protobuf.AbstractParser".equals(superClass)) {
-        // AbstractParser is a base class for parsing protobuf messages. Scopes with this super
-        // class are filtered out because they are utility classes for parsing and do not contain
-        // actual data fields.
-        return true;
-      }
-      if ("com.google.protobuf.GeneratedMessageV3$Builder".equals(superClass)) {
-        // GeneratedMessageV3$Builder is a builder class for constructing GeneratedMessageV3
-        // instances. These scopes are filtered out because they are used for building messages and
-        // do not represent the final data structure.
-        return true;
-      }
-    }
-    // If none of the above matched, see if the class has a proto descriptor field. This is the case
-    // for wrapper
-    // classes (`OuterClass`) and `Enum` classes. They contain metadata, not data.
-    if (hasProtoDescriptorField(scope)) {
-      return true;
+        LanguageSpecifics languageSpecifics = scope.getLanguageSpecifics();
+        if (languageSpecifics != null) {
+            List<String> interfaces = languageSpecifics.getInterfaces();
+            if (interfaces != null) {
+                if (interfaces.contains("com.google.protobuf.MessageOrBuilder")) {
+                    // MessageOrBuilder is an interface implemented by both message classes and their
+                    // builders.
+                    // Scopes implementing this interface are filtered out because they do not represent
+                    // concrete data structures but rather interfaces for accessing or building messages.
+                    return true;
+                }
+            }
+            String superClass = languageSpecifics.getSuperClass();
+            if ("com.google.protobuf.AbstractParser".equals(superClass)) {
+                // AbstractParser is a base class for parsing protobuf messages. Scopes with this super
+                // class are filtered out because they are utility classes for parsing and do not contain
+                // actual data fields.
+                return true;
+            }
+            if ("com.google.protobuf.GeneratedMessageV3$Builder".equals(superClass)) {
+                // GeneratedMessageV3$Builder is a builder class for constructing GeneratedMessageV3
+                // instances. These scopes are filtered out because they are used for building messages and
+                // do not represent the final data structure.
+                return true;
+            }
+        }
+        // If none of the above matched, see if the class has a proto descriptor field. This is the case
+        // for wrapper
+        // classes (`OuterClass`) and `Enum` classes. They contain metadata, not data.
+        if (hasProtoDescriptorField(scope)) {
+            return true;
+        }
+        // Probably no protobuf, pass
+        return false;
     }
-    // Probably no protobuf, pass
-    return false;
-  }
 
-  private boolean hasProtoDescriptorField(Scope scope) {
-    return scope.getScopeType() == ScopeType.CLASS
-        && scope.getSymbols() != null
-        && scope.getSymbols().stream()
-            .anyMatch(
-                it ->
-                    it.getSymbolType() == SymbolType.STATIC_FIELD
-                        && it.getType() != null
-                        && it.getType().contains("com.google.protobuf.Descriptors"));
-  }
+    private boolean hasProtoDescriptorField(Scope scope) {
+        return scope.getScopeType() == ScopeType.CLASS
+                && scope.getSymbols() != null
+                && scope.getSymbols().stream()
+                        .anyMatch(it -> it.getSymbolType() == SymbolType.STATIC_FIELD
+                                && it.getType() != null
+                                && it.getType().contains("com.google.protobuf.Descriptors"));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/Scope.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/Scope.java
index 6a97d2422b0..21fc2559a38 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/Scope.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/Scope.java
@@ -5,195 +5,194 @@
 
 public class Scope {
 
-  public static class LineRange {
-    final int start;
-    final int end;
-
-    public LineRange(int start, int end) {
-      this.start = start;
-      this.end = end;
+    public static class LineRange {
+        final int start;
+        final int end;
+
+        public LineRange(int start, int end) {
+            this.start = start;
+            this.end = end;
+        }
     }
-  }
-
-  @Json(name = "scope_type")
-  private final ScopeType scopeType;
-
-  @Json(name = "source_file")
-  private final String sourceFile;
-
-  @Json(name = "start_line")
-  private final int startLine;
-
-  @Json(name = "end_line")
-  private final int endLine;
-
-  @Json(name = "has_injectible_lines")
-  private final boolean hasInjectibleLines;
-
-  @Json(name = "injectible_lines")
-  private final List<LineRange> injectibleLines;
-
-  private final String name;
-
-  @Json(name = "language_specifics")
-  private final LanguageSpecifics languageSpecifics;
-
-  private final List<Symbol> symbols;
-  private final List<Scope> scopes;
-
-  public Scope(
-      ScopeType scopeType,
-      String sourceFile,
-      int startLine,
-      int endLine,
-      String name,
-      boolean hasInjectibleLines,
-      List<LineRange> injectibleLines,
-      LanguageSpecifics languageSpecifics,
-      List<Symbol> symbols,
-      List<Scope> scopes) {
-    this.scopeType = scopeType;
-    this.sourceFile = sourceFile;
-    this.startLine = startLine;
-    this.endLine = endLine;
-    this.name = name;
-    this.hasInjectibleLines = hasInjectibleLines;
-    this.injectibleLines = injectibleLines;
-    this.languageSpecifics = languageSpecifics;
-    this.symbols = symbols;
-    this.scopes = scopes;
-  }
-
-  public ScopeType getScopeType() {
-    return scopeType;
-  }
-
-  public String getSourceFile() {
-    return sourceFile;
-  }
-
-  public int getStartLine() {
-    return startLine;
-  }
-
-  public int getEndLine() {
-    return endLine;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public boolean hasInjectibleLines() {
-    return hasInjectibleLines;
-  }
-
-  public List<LineRange> getInjectibleLines() {
-    return injectibleLines;
-  }
-
-  public LanguageSpecifics getLanguageSpecifics() {
-    return languageSpecifics;
-  }
-
-  public List<Symbol> getSymbols() {
-    return symbols;
-  }
-
-  public List<Scope> getScopes() {
-    return scopes;
-  }
-
-  @Override
-  public String toString() {
-    return "Scope{"
-        + "scopeType="
-        + scopeType
-        + ", sourceFile='"
-        + sourceFile
-        + '\''
-        + ", startLine="
-        + startLine
-        + ", endLine="
-        + endLine
-        + ", name='"
-        + name
-        + '\''
-        + ", languageSpecifics="
-        + languageSpecifics
-        + ", symbols="
-        + symbols
-        + ", scopes="
-        + scopes
-        + '}';
-  }
-
-  public static Builder builder(
-      ScopeType scopeType, String sourceFile, int startLine, int endLine) {
-    return new Builder(scopeType, sourceFile, startLine, endLine);
-  }
-
-  public static class Builder {
+
+    @Json(name = "scope_type")
     private final ScopeType scopeType;
+
+    @Json(name = "source_file")
     private final String sourceFile;
+
+    @Json(name = "start_line")
     private final int startLine;
+
+    @Json(name = "end_line")
     private final int endLine;
-    private String name;
-    private boolean hasInjectibleLines;
-    private List<LineRange> injectibleLines;
-    private LanguageSpecifics languageSpecifics;
-    private List<Symbol> symbols;
-    private List<Scope> scopes;
-
-    public Builder(ScopeType scopeType, String sourceFile, int startLine, int endLine) {
-      this.scopeType = scopeType;
-      this.sourceFile = sourceFile;
-      this.startLine = startLine;
-      this.endLine = endLine;
+
+    @Json(name = "has_injectible_lines")
+    private final boolean hasInjectibleLines;
+
+    @Json(name = "injectible_lines")
+    private final List<LineRange> injectibleLines;
+
+    private final String name;
+
+    @Json(name = "language_specifics")
+    private final LanguageSpecifics languageSpecifics;
+
+    private final List<Symbol> symbols;
+    private final List<Scope> scopes;
+
+    public Scope(
+            ScopeType scopeType,
+            String sourceFile,
+            int startLine,
+            int endLine,
+            String name,
+            boolean hasInjectibleLines,
+            List<LineRange> injectibleLines,
+            LanguageSpecifics languageSpecifics,
+            List<Symbol> symbols,
+            List<Scope> scopes) {
+        this.scopeType = scopeType;
+        this.sourceFile = sourceFile;
+        this.startLine = startLine;
+        this.endLine = endLine;
+        this.name = name;
+        this.hasInjectibleLines = hasInjectibleLines;
+        this.injectibleLines = injectibleLines;
+        this.languageSpecifics = languageSpecifics;
+        this.symbols = symbols;
+        this.scopes = scopes;
+    }
+
+    public ScopeType getScopeType() {
+        return scopeType;
+    }
+
+    public String getSourceFile() {
+        return sourceFile;
+    }
+
+    public int getStartLine() {
+        return startLine;
+    }
+
+    public int getEndLine() {
+        return endLine;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public boolean hasInjectibleLines() {
+        return hasInjectibleLines;
     }
 
-    public Builder name(String name) {
-      this.name = name;
-      return this;
+    public List<LineRange> getInjectibleLines() {
+        return injectibleLines;
     }
 
-    public Builder hasInjectibleLines(boolean hasInjectibleLines) {
-      this.hasInjectibleLines = hasInjectibleLines;
-      return this;
+    public LanguageSpecifics getLanguageSpecifics() {
+        return languageSpecifics;
     }
 
-    public Builder injectibleLines(List<LineRange> injectibleLines) {
-      this.injectibleLines = injectibleLines;
-      return this;
+    public List<Symbol> getSymbols() {
+        return symbols;
     }
 
-    public Builder languageSpecifics(LanguageSpecifics languageSpecifics) {
-      this.languageSpecifics = languageSpecifics;
-      return this;
+    public List<Scope> getScopes() {
+        return scopes;
     }
 
-    public Builder symbols(List<Symbol> symbols) {
-      this.symbols = symbols;
-      return this;
+    @Override
+    public String toString() {
+        return "Scope{"
+                + "scopeType="
+                + scopeType
+                + ", sourceFile='"
+                + sourceFile
+                + '\''
+                + ", startLine="
+                + startLine
+                + ", endLine="
+                + endLine
+                + ", name='"
+                + name
+                + '\''
+                + ", languageSpecifics="
+                + languageSpecifics
+                + ", symbols="
+                + symbols
+                + ", scopes="
+                + scopes
+                + '}';
     }
 
-    public Builder scopes(List<Scope> scopes) {
-      this.scopes = scopes;
-      return this;
+    public static Builder builder(ScopeType scopeType, String sourceFile, int startLine, int endLine) {
+        return new Builder(scopeType, sourceFile, startLine, endLine);
     }
 
-    public Scope build() {
-      return new Scope(
-          scopeType,
-          sourceFile,
-          startLine,
-          endLine,
-          name,
-          hasInjectibleLines,
-          injectibleLines,
-          languageSpecifics,
-          symbols,
-          scopes);
+    public static class Builder {
+        private final ScopeType scopeType;
+        private final String sourceFile;
+        private final int startLine;
+        private final int endLine;
+        private String name;
+        private boolean hasInjectibleLines;
+        private List<LineRange> injectibleLines;
+        private LanguageSpecifics languageSpecifics;
+        private List<Symbol> symbols;
+        private List<Scope> scopes;
+
+        public Builder(ScopeType scopeType, String sourceFile, int startLine, int endLine) {
+            this.scopeType = scopeType;
+            this.sourceFile = sourceFile;
+            this.startLine = startLine;
+            this.endLine = endLine;
+        }
+
+        public Builder name(String name) {
+            this.name = name;
+            return this;
+        }
+
+        public Builder hasInjectibleLines(boolean hasInjectibleLines) {
+            this.hasInjectibleLines = hasInjectibleLines;
+            return this;
+        }
+
+        public Builder injectibleLines(List<LineRange> injectibleLines) {
+            this.injectibleLines = injectibleLines;
+            return this;
+        }
+
+        public Builder languageSpecifics(LanguageSpecifics languageSpecifics) {
+            this.languageSpecifics = languageSpecifics;
+            return this;
+        }
+
+        public Builder symbols(List<Symbol> symbols) {
+            this.symbols = symbols;
+            return this;
+        }
+
+        public Builder scopes(List<Scope> scopes) {
+            this.scopes = scopes;
+            return this;
+        }
+
+        public Scope build() {
+            return new Scope(
+                    scopeType,
+                    sourceFile,
+                    startLine,
+                    endLine,
+                    name,
+                    hasInjectibleLines,
+                    injectibleLines,
+                    languageSpecifics,
+                    symbols,
+                    scopes);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ScopeFilter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ScopeFilter.java
index b87c550b254..17f134f8e0c 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ScopeFilter.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ScopeFilter.java
@@ -1,6 +1,6 @@
 package com.datadog.debugger.symbol;
 
 public interface ScopeFilter {
-  /** returns true if the scope should be excluded */
-  boolean filterOut(Scope scope);
+    /** returns true if the scope should be excluded */
+    boolean filterOut(Scope scope);
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ScopeType.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ScopeType.java
index 99d8c004a55..aeb6f0bffc2 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ScopeType.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ScopeType.java
@@ -1,9 +1,9 @@
 package com.datadog.debugger.symbol;
 
 public enum ScopeType {
-  JAR,
-  CLASS,
-  METHOD,
-  LOCAL,
-  CLOSURE
+    JAR,
+    CLASS,
+    METHOD,
+    LOCAL,
+    CLOSURE
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ServiceVersion.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ServiceVersion.java
index fd1efaaac04..7091a04c1f7 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ServiceVersion.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/ServiceVersion.java
@@ -4,42 +4,42 @@
 import java.util.List;
 
 public class ServiceVersion {
-  private final String service;
-
-  private final String env;
-  private final String version;
-  private final String language;
-  private final List<Scope> scopes;
-
-  @Json(name = "upload_id")
-  private final String uploadId;
-
-  @Json(name = "batch_num")
-  private final long batchNum;
-
-  @Json(name = "final")
-  private final boolean isFinal;
-
-  public ServiceVersion(
-      String service,
-      String env,
-      String version,
-      String language,
-      List<Scope> scopes,
-      String uploadId,
-      long batchNum,
-      boolean isFinal) {
-    this.service = service;
-    this.env = env;
-    this.version = version;
-    this.language = language;
-    this.scopes = scopes;
-    this.uploadId = uploadId;
-    this.batchNum = batchNum;
-    this.isFinal = isFinal;
-  }
-
-  public List<Scope> getScopes() {
-    return scopes;
-  }
+    private final String service;
+
+    private final String env;
+    private final String version;
+    private final String language;
+    private final List<Scope> scopes;
+
+    @Json(name = "upload_id")
+    private final String uploadId;
+
+    @Json(name = "batch_num")
+    private final long batchNum;
+
+    @Json(name = "final")
+    private final boolean isFinal;
+
+    public ServiceVersion(
+            String service,
+            String env,
+            String version,
+            String language,
+            List<Scope> scopes,
+            String uploadId,
+            long batchNum,
+            boolean isFinal) {
+        this.service = service;
+        this.env = env;
+        this.version = version;
+        this.language = language;
+        this.scopes = scopes;
+        this.uploadId = uploadId;
+        this.batchNum = batchNum;
+        this.isFinal = isFinal;
+    }
+
+    public List<Scope> getScopes() {
+        return scopes;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SourceRemapper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SourceRemapper.java
index 022956ba322..49c1eac431a 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SourceRemapper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SourceRemapper.java
@@ -7,66 +7,66 @@
 
 public interface SourceRemapper {
 
-  int remapSourceLine(int line);
+    int remapSourceLine(int line);
 
-  static SourceRemapper getSourceRemapper(String sourceFile, SourceMap sourceMap) {
-    JvmLanguage jvmLanguage = JvmLanguage.of(sourceFile);
-    switch (jvmLanguage) {
-      case KOTLIN:
-        StratumExt stratumMain = sourceMap.getStratum("Kotlin");
-        if (stratumMain == null) {
-          stratumMain = sourceMap.getStratum(sourceMap.getDefaultStratumName());
-          if (stratumMain == null) {
-            throw new IllegalArgumentException("No default stratum found");
-          }
+    static SourceRemapper getSourceRemapper(String sourceFile, SourceMap sourceMap) {
+        JvmLanguage jvmLanguage = JvmLanguage.of(sourceFile);
+        switch (jvmLanguage) {
+            case KOTLIN:
+                StratumExt stratumMain = sourceMap.getStratum("Kotlin");
+                if (stratumMain == null) {
+                    stratumMain = sourceMap.getStratum(sourceMap.getDefaultStratumName());
+                    if (stratumMain == null) {
+                        throw new IllegalArgumentException("No default stratum found");
+                    }
+                }
+                StratumExt stratumDebug = sourceMap.getStratum("KotlinDebug");
+                if (stratumDebug == null) {
+                    stratumDebug = new StratumExt("KotlinDebug");
+                }
+                return new KotlinSourceRemapper(stratumMain, stratumDebug);
+            default:
+                return NOOP_REMAPPER;
         }
-        StratumExt stratumDebug = sourceMap.getStratum("KotlinDebug");
-        if (stratumDebug == null) {
-          stratumDebug = new StratumExt("KotlinDebug");
-        }
-        return new KotlinSourceRemapper(stratumMain, stratumDebug);
-      default:
-        return NOOP_REMAPPER;
     }
-  }
 
-  SourceRemapper NOOP_REMAPPER = new NoopSourceRemapper();
+    SourceRemapper NOOP_REMAPPER = new NoopSourceRemapper();
 
-  class NoopSourceRemapper implements SourceRemapper {
-    @Override
-    public int remapSourceLine(int line) {
-      return line;
+    class NoopSourceRemapper implements SourceRemapper {
+        @Override
+        public int remapSourceLine(int line) {
+            return line;
+        }
     }
-  }
-
-  class KotlinSourceRemapper implements SourceRemapper {
-    private final StratumExt stratumMain;
-    private final StratumExt stratumDebug;
 
-    public KotlinSourceRemapper(StratumExt stratumMain, StratumExt stratumDebug) {
-      this.stratumMain = stratumMain;
-      this.stratumDebug = stratumDebug;
-    }
+    class KotlinSourceRemapper implements SourceRemapper {
+        private final StratumExt stratumMain;
+        private final StratumExt stratumDebug;
 
-    @Override
-    public int remapSourceLine(int line) {
-      Pair<String, Integer> pairDebug = stratumDebug.getInputLine(line);
-      if (pairDebug == null || pairDebug.getRight() == null) {
-        Pair<String, Integer> pairMain = stratumMain.getInputLine(line);
-        if (pairMain == null || pairMain.getRight() == null) {
-          return line;
-        }
-        String fileId = pairMain.getLeft();
-        String sourceFileName = stratumMain.getSourceFileName(fileId);
-        if (sourceFileName == null) {
-          throw new IllegalArgumentException("Cannot find source filename for fileid=" + fileId);
+        public KotlinSourceRemapper(StratumExt stratumMain, StratumExt stratumDebug) {
+            this.stratumMain = stratumMain;
+            this.stratumDebug = stratumDebug;
         }
-        if (sourceFileName.equals("fake.kt")) {
-          return -1; // no mapping possible
+
+        @Override
+        public int remapSourceLine(int line) {
+            Pair<String, Integer> pairDebug = stratumDebug.getInputLine(line);
+            if (pairDebug == null || pairDebug.getRight() == null) {
+                Pair<String, Integer> pairMain = stratumMain.getInputLine(line);
+                if (pairMain == null || pairMain.getRight() == null) {
+                    return line;
+                }
+                String fileId = pairMain.getLeft();
+                String sourceFileName = stratumMain.getSourceFileName(fileId);
+                if (sourceFileName == null) {
+                    throw new IllegalArgumentException("Cannot find source filename for fileid=" + fileId);
+                }
+                if (sourceFileName.equals("fake.kt")) {
+                    return -1; // no mapping possible
+                }
+                return pairMain.getRight();
+            }
+            return pairDebug.getRight();
         }
-        return pairMain.getRight();
-      }
-      return pairDebug.getRight();
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDBEnablement.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDBEnablement.java
index 1643b1b5b6c..a1d19f4fce0 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDBEnablement.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDBEnablement.java
@@ -25,140 +25,135 @@
 import org.slf4j.LoggerFactory;
 
 public class SymDBEnablement implements ProductListener {
-  private static final Logger LOGGER = LoggerFactory.getLogger(SymDBEnablement.class);
-  private static final JsonAdapter<SymDbRemoteConfigRecord> SYM_DB_JSON_ADAPTER =
-      MoshiHelper.createMoshiConfig().adapter(SymDbRemoteConfigRecord.class);
-  private static final String SYM_DB_RC_KEY = "symDb";
-  private static final int READ_BUFFER_SIZE = 4096;
-  private static final int CLASSFILE_BUFFER_SIZE = 8192;
+    private static final Logger LOGGER = LoggerFactory.getLogger(SymDBEnablement.class);
+    private static final JsonAdapter<SymDbRemoteConfigRecord> SYM_DB_JSON_ADAPTER =
+            MoshiHelper.createMoshiConfig().adapter(SymDbRemoteConfigRecord.class);
+    private static final String SYM_DB_RC_KEY = "symDb";
+    private static final int READ_BUFFER_SIZE = 4096;
+    private static final int CLASSFILE_BUFFER_SIZE = 8192;
 
-  private final Instrumentation instrumentation;
-  private final Config config;
-  private final SymbolAggregator symbolAggregator;
-  private final AtomicBoolean starting = new AtomicBoolean();
-  private SymbolExtractionTransformer symbolExtractionTransformer;
-  private final ClassNameFilter classNameFilter;
-  private volatile long lastUploadTimestamp;
+    private final Instrumentation instrumentation;
+    private final Config config;
+    private final SymbolAggregator symbolAggregator;
+    private final AtomicBoolean starting = new AtomicBoolean();
+    private SymbolExtractionTransformer symbolExtractionTransformer;
+    private final ClassNameFilter classNameFilter;
+    private volatile long lastUploadTimestamp;
 
-  public SymDBEnablement(
-      Instrumentation instrumentation,
-      Config config,
-      SymbolAggregator symbolAggregator,
-      ClassNameFilter classNameFilter) {
-    this.instrumentation = instrumentation;
-    this.config = config;
-    this.symbolAggregator = symbolAggregator;
-    this.classNameFilter = classNameFilter;
-  }
-
-  @Override
-  public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollingRateHinter)
-      throws IOException {
-    if (configKey.getConfigId().equals(SYM_DB_RC_KEY)) {
-      SymDbRemoteConfigRecord symDb = deserializeSymDb(content);
-      if (symDb.isUploadSymbols()) {
-        // can be long, make it async
-        AgentTaskScheduler.get().execute(this::startSymbolExtraction);
-      } else {
-        stopSymbolExtraction();
-      }
-    } else {
-      LOGGER.debug("unsupported configuration id {}", configKey.getConfigId());
+    public SymDBEnablement(
+            Instrumentation instrumentation,
+            Config config,
+            SymbolAggregator symbolAggregator,
+            ClassNameFilter classNameFilter) {
+        this.instrumentation = instrumentation;
+        this.config = config;
+        this.symbolAggregator = symbolAggregator;
+        this.classNameFilter = classNameFilter;
     }
-  }
 
-  @Override
-  public void remove(ConfigKey configKey, PollingRateHinter pollingRateHinter) throws IOException {
-    if (configKey.getConfigId().equals(SYM_DB_RC_KEY)) {
-      stopSymbolExtraction();
+    @Override
+    public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollingRateHinter) throws IOException {
+        if (configKey.getConfigId().equals(SYM_DB_RC_KEY)) {
+            SymDbRemoteConfigRecord symDb = deserializeSymDb(content);
+            if (symDb.isUploadSymbols()) {
+                // can be long, make it async
+                AgentTaskScheduler.get().execute(this::startSymbolExtraction);
+            } else {
+                stopSymbolExtraction();
+            }
+        } else {
+            LOGGER.debug("unsupported configuration id {}", configKey.getConfigId());
+        }
     }
-  }
 
-  @Override
-  public void commit(PollingRateHinter pollingRateHinter) {}
+    @Override
+    public void remove(ConfigKey configKey, PollingRateHinter pollingRateHinter) throws IOException {
+        if (configKey.getConfigId().equals(SYM_DB_RC_KEY)) {
+            stopSymbolExtraction();
+        }
+    }
 
-  private static SymDbRemoteConfigRecord deserializeSymDb(byte[] content) throws IOException {
-    return SYM_DB_JSON_ADAPTER.fromJson(
-        Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
-  }
+    @Override
+    public void commit(PollingRateHinter pollingRateHinter) {}
 
-  public void stopSymbolExtraction() {
-    LOGGER.debug("Stopping symbol extraction.");
-    if (symbolExtractionTransformer != null) {
-      instrumentation.removeTransformer(symbolExtractionTransformer);
-      symbolExtractionTransformer = null;
+    private static SymDbRemoteConfigRecord deserializeSymDb(byte[] content) throws IOException {
+        return SYM_DB_JSON_ADAPTER.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
     }
-  }
-
-  long getLastUploadTimestamp() {
-    return lastUploadTimestamp;
-  }
 
-  public void startSymbolExtraction() {
-    if (!starting.compareAndSet(false, true)) {
-      return;
+    public void stopSymbolExtraction() {
+        LOGGER.debug("Stopping symbol extraction.");
+        if (symbolExtractionTransformer != null) {
+            instrumentation.removeTransformer(symbolExtractionTransformer);
+            symbolExtractionTransformer = null;
+        }
     }
-    try {
-      LOGGER.debug("Starting symbol extraction...");
-      if (lastUploadTimestamp > 0) {
-        LOGGER.debug(
-            "Last upload was on {}",
-            LocalDateTime.ofInstant(
-                Instant.ofEpochMilli(lastUploadTimestamp), ZoneId.systemDefault()));
-        return;
-      }
-      try {
-        symbolExtractionTransformer =
-            new SymbolExtractionTransformer(symbolAggregator, classNameFilter);
-        instrumentation.addTransformer(symbolExtractionTransformer);
-        SymDBReport symDBReport = new BasicSymDBReport();
-        extractSymbolForLoadedClasses(symDBReport);
-        symDBReport.report();
-        lastUploadTimestamp = System.currentTimeMillis();
-      } catch (Throwable ex) {
-        // catch all Throwables because LinkageError is possible (duplicate class definition)
-        LOGGER.debug("Error during symbol extraction: ", ex);
-      }
-    } finally {
-      starting.set(false);
+
+    long getLastUploadTimestamp() {
+        return lastUploadTimestamp;
     }
-  }
 
-  private void extractSymbolForLoadedClasses(SymDBReport symDBReport) {
-    Class<?>[] classesToExtract;
-    try {
-      classesToExtract =
-          Arrays.stream(instrumentation.getAllLoadedClasses())
-              // getAllLoadedClasses can return null classes (Class Unloading)
-              .filter(clazz -> clazz != null && !classNameFilter.isExcluded(clazz.getTypeName()))
-              .filter(instrumentation::isModifiableClass)
-              .toArray(Class<?>[]::new);
-    } catch (Throwable ex) {
-      LOGGER.debug("Failed to get all loaded classes", ex);
-      return;
+    public void startSymbolExtraction() {
+        if (!starting.compareAndSet(false, true)) {
+            return;
+        }
+        try {
+            LOGGER.debug("Starting symbol extraction...");
+            if (lastUploadTimestamp > 0) {
+                LOGGER.debug(
+                        "Last upload was on {}",
+                        LocalDateTime.ofInstant(Instant.ofEpochMilli(lastUploadTimestamp), ZoneId.systemDefault()));
+                return;
+            }
+            try {
+                symbolExtractionTransformer = new SymbolExtractionTransformer(symbolAggregator, classNameFilter);
+                instrumentation.addTransformer(symbolExtractionTransformer);
+                SymDBReport symDBReport = new BasicSymDBReport();
+                extractSymbolForLoadedClasses(symDBReport);
+                symDBReport.report();
+                lastUploadTimestamp = System.currentTimeMillis();
+            } catch (Throwable ex) {
+                // catch all Throwables because LinkageError is possible (duplicate class definition)
+                LOGGER.debug("Error during symbol extraction: ", ex);
+            }
+        } finally {
+            starting.set(false);
+        }
     }
-    byte[] buffer = new byte[READ_BUFFER_SIZE];
-    ByteArrayOutputStream baos = new ByteArrayOutputStream(CLASSFILE_BUFFER_SIZE);
-    for (Class<?> clazz : classesToExtract) {
-      Path jarPath;
-      try {
-        jarPath = JarScanner.extractJarPath(clazz, symDBReport);
-      } catch (URISyntaxException e) {
-        LOGGER.debug("Failed to extract jar path for class {}", clazz.getTypeName(), e);
-        continue;
-      }
-      if (jarPath == null) {
-        continue;
-      }
-      if (!Files.exists(jarPath)) {
-        symDBReport.addMissingJar(jarPath.toString());
-        continue;
-      }
-      try {
-        symbolAggregator.scanJar(symDBReport, jarPath, baos, buffer);
-      } catch (Exception ex) {
-        LOGGER.debug("Failed to scan jar {}", jarPath, ex);
-      }
+
+    private void extractSymbolForLoadedClasses(SymDBReport symDBReport) {
+        Class<?>[] classesToExtract;
+        try {
+            classesToExtract = Arrays.stream(instrumentation.getAllLoadedClasses())
+                    // getAllLoadedClasses can return null classes (Class Unloading)
+                    .filter(clazz -> clazz != null && !classNameFilter.isExcluded(clazz.getTypeName()))
+                    .filter(instrumentation::isModifiableClass)
+                    .toArray(Class<?>[]::new);
+        } catch (Throwable ex) {
+            LOGGER.debug("Failed to get all loaded classes", ex);
+            return;
+        }
+        byte[] buffer = new byte[READ_BUFFER_SIZE];
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(CLASSFILE_BUFFER_SIZE);
+        for (Class<?> clazz : classesToExtract) {
+            Path jarPath;
+            try {
+                jarPath = JarScanner.extractJarPath(clazz, symDBReport);
+            } catch (URISyntaxException e) {
+                LOGGER.debug("Failed to extract jar path for class {}", clazz.getTypeName(), e);
+                continue;
+            }
+            if (jarPath == null) {
+                continue;
+            }
+            if (!Files.exists(jarPath)) {
+                symDBReport.addMissingJar(jarPath.toString());
+                continue;
+            }
+            try {
+                symbolAggregator.scanJar(symDBReport, jarPath, baos, buffer);
+            } catch (Exception ex) {
+                LOGGER.debug("Failed to scan jar {}", jarPath, ex);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDBReport.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDBReport.java
index d407acd5726..f438fa34d2c 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDBReport.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDBReport.java
@@ -4,20 +4,19 @@
 
 public interface SymDBReport {
 
-  void addMissingJar(String jarPath);
+    void addMissingJar(String jarPath);
 
-  void addIOException(String jarPath, IOException e);
+    void addIOException(String jarPath, IOException e);
 
-  void addLocationError(String locationStr);
+    void addLocationError(String locationStr);
 
-  void incClassCount(String jarPath);
+    void incClassCount(String jarPath);
 
-  void addScannedJar(String jarPath);
+    void addScannedJar(String jarPath);
 
-  void report();
+    void report();
 
-  SymDBReport NO_OP =
-      new SymDBReport() {
+    SymDBReport NO_OP = new SymDBReport() {
         @Override
         public void addMissingJar(String jarPath) {}
 
@@ -35,5 +34,5 @@ public void addScannedJar(String jarPath) {}
 
         @Override
         public void report() {}
-      };
+    };
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDbRemoteConfigRecord.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDbRemoteConfigRecord.java
index 85cc2159ae9..7bc9d5a257c 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDbRemoteConfigRecord.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDbRemoteConfigRecord.java
@@ -3,14 +3,14 @@
 import com.squareup.moshi.Json;
 
 public class SymDbRemoteConfigRecord {
-  @Json(name = "upload_symbols")
-  private final boolean uploadSymbols;
+    @Json(name = "upload_symbols")
+    private final boolean uploadSymbols;
 
-  public SymDbRemoteConfigRecord(boolean uploadSymbols) {
-    this.uploadSymbols = uploadSymbols;
-  }
+    public SymDbRemoteConfigRecord(boolean uploadSymbols) {
+        this.uploadSymbols = uploadSymbols;
+    }
 
-  public boolean isUploadSymbols() {
-    return uploadSymbols;
-  }
+    public boolean isUploadSymbols() {
+        return uploadSymbols;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/Symbol.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/Symbol.java
index 66deef6ee9f..acbb2e3862a 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/Symbol.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/Symbol.java
@@ -3,64 +3,59 @@
 import com.squareup.moshi.Json;
 
 public class Symbol {
-  @Json(name = "symbol_type")
-  private final SymbolType symbolType;
-
-  private final String name;
-  private final int line;
-  private final String type;
-
-  @Json(name = "language_specifics")
-  private final LanguageSpecifics languageSpecifics;
-
-  public Symbol(
-      SymbolType symbolType,
-      String name,
-      int line,
-      String type,
-      LanguageSpecifics languageSpecifics) {
-    this.symbolType = symbolType;
-    this.name = name;
-    this.line = line;
-    this.type = type;
-    this.languageSpecifics = languageSpecifics;
-  }
-
-  public SymbolType getSymbolType() {
-    return symbolType;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public int getLine() {
-    return line;
-  }
-
-  public String getType() {
-    return type;
-  }
-
-  public LanguageSpecifics getLanguageSpecifics() {
-    return languageSpecifics;
-  }
-
-  @Override
-  public String toString() {
-    return "Symbol{"
-        + "symbolType="
-        + symbolType
-        + ", name='"
-        + name
-        + '\''
-        + ", line="
-        + line
-        + ", type='"
-        + type
-        + '\''
-        + ", languageSpecifics="
-        + languageSpecifics
-        + '}';
-  }
+    @Json(name = "symbol_type")
+    private final SymbolType symbolType;
+
+    private final String name;
+    private final int line;
+    private final String type;
+
+    @Json(name = "language_specifics")
+    private final LanguageSpecifics languageSpecifics;
+
+    public Symbol(SymbolType symbolType, String name, int line, String type, LanguageSpecifics languageSpecifics) {
+        this.symbolType = symbolType;
+        this.name = name;
+        this.line = line;
+        this.type = type;
+        this.languageSpecifics = languageSpecifics;
+    }
+
+    public SymbolType getSymbolType() {
+        return symbolType;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getLine() {
+        return line;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public LanguageSpecifics getLanguageSpecifics() {
+        return languageSpecifics;
+    }
+
+    @Override
+    public String toString() {
+        return "Symbol{"
+                + "symbolType="
+                + symbolType
+                + ", name='"
+                + name
+                + '\''
+                + ", line="
+                + line
+                + ", type='"
+                + type
+                + '\''
+                + ", languageSpecifics="
+                + languageSpecifics
+                + '}';
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolAggregator.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolAggregator.java
index c88976187bd..fa1df480d2c 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolAggregator.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolAggregator.java
@@ -34,270 +34,259 @@
 import org.slf4j.LoggerFactory;
 
 public class SymbolAggregator {
-  private static final Logger LOGGER = LoggerFactory.getLogger(SymbolAggregator.class);
-  private static final String CLASS_SUFFIX = ".class";
-  private static final int READ_BUFFER_SIZE = 4096;
-  private static final int CLASSFILE_BUFFER_SIZE = 8192;
+    private static final Logger LOGGER = LoggerFactory.getLogger(SymbolAggregator.class);
+    private static final String CLASS_SUFFIX = ".class";
+    private static final int READ_BUFFER_SIZE = 4096;
+    private static final int CLASSFILE_BUFFER_SIZE = 8192;
 
-  private final DebuggerContext.ClassNameFilter classNameFilter;
-  private final List<ScopeFilter> scopeFilters;
-  private final SymbolSink sink;
-  private final int symbolFlushThreshold;
-  private final Map<String, Scope> jarScopesByName = new HashMap<>();
-  private final Object jarScopeLock = new Object();
-  private AgentTaskScheduler.Scheduled<SymbolAggregator> flushRemainingScopeScheduled;
-  private AgentTaskScheduler.Scheduled<SymbolAggregator> scanJarsScheduled;
-  private int totalClasses;
-  // ClassNameTrie is not thread safe, All accesses must be protected by a lock
-  private final ClassNameTrie.Builder loadedClasses = new ClassNameTrie.Builder();
-  private final Queue<String> jarsToScanQueue = new ArrayBlockingQueue<>(128);
-  private final Set<String> alreadyScannedJars = ConcurrentHashMap.newKeySet();
+    private final DebuggerContext.ClassNameFilter classNameFilter;
+    private final List<ScopeFilter> scopeFilters;
+    private final SymbolSink sink;
+    private final int symbolFlushThreshold;
+    private final Map<String, Scope> jarScopesByName = new HashMap<>();
+    private final Object jarScopeLock = new Object();
+    private AgentTaskScheduler.Scheduled<SymbolAggregator> flushRemainingScopeScheduled;
+    private AgentTaskScheduler.Scheduled<SymbolAggregator> scanJarsScheduled;
+    private int totalClasses;
+    // ClassNameTrie is not thread safe, All accesses must be protected by a lock
+    private final ClassNameTrie.Builder loadedClasses = new ClassNameTrie.Builder();
+    private final Queue<String> jarsToScanQueue = new ArrayBlockingQueue<>(128);
+    private final Set<String> alreadyScannedJars = ConcurrentHashMap.newKeySet();
 
-  public SymbolAggregator(
-      DebuggerContext.ClassNameFilter classNameFilter,
-      List<ScopeFilter> scopeFilters,
-      SymbolSink sink,
-      int symbolFlushThreshold) {
-    this.classNameFilter = classNameFilter;
-    this.scopeFilters = scopeFilters;
-    this.sink = sink;
-    this.symbolFlushThreshold = symbolFlushThreshold;
-  }
+    public SymbolAggregator(
+            DebuggerContext.ClassNameFilter classNameFilter,
+            List<ScopeFilter> scopeFilters,
+            SymbolSink sink,
+            int symbolFlushThreshold) {
+        this.classNameFilter = classNameFilter;
+        this.scopeFilters = scopeFilters;
+        this.sink = sink;
+        this.symbolFlushThreshold = symbolFlushThreshold;
+    }
 
-  public void start() {
-    flushRemainingScopeScheduled =
-        AgentTaskScheduler.get()
-            .scheduleAtFixedRate(this::flushRemainingScopes, this, 0, 1, TimeUnit.SECONDS);
-    scanJarsScheduled =
-        AgentTaskScheduler.get()
-            .scheduleAtFixedRate(this::scanQueuedJars, this, 0, 1, TimeUnit.SECONDS);
-  }
+    public void start() {
+        flushRemainingScopeScheduled =
+                AgentTaskScheduler.get().scheduleAtFixedRate(this::flushRemainingScopes, this, 0, 1, TimeUnit.SECONDS);
+        scanJarsScheduled =
+                AgentTaskScheduler.get().scheduleAtFixedRate(this::scanQueuedJars, this, 0, 1, TimeUnit.SECONDS);
+    }
 
-  public void stop() {
-    cancelSchedule(flushRemainingScopeScheduled);
-    cancelSchedule(scanJarsScheduled);
-  }
+    public void stop() {
+        cancelSchedule(flushRemainingScopeScheduled);
+        cancelSchedule(scanJarsScheduled);
+    }
 
-  private void cancelSchedule(AgentTaskScheduler.Scheduled<SymbolAggregator> scheduled) {
-    if (scheduled != null) {
-      scheduled.cancel();
+    private void cancelSchedule(AgentTaskScheduler.Scheduled<SymbolAggregator> scheduled) {
+        if (scheduled != null) {
+            scheduled.cancel();
+        }
     }
-  }
 
-  public void parseClass(
-      String className, byte[] classfileBuffer, ProtectionDomain protectionDomain) {
-    try {
-      String jarName = "DEFAULT";
-      Path jarPath = JarScanner.extractJarPath(protectionDomain, SymDBReport.NO_OP);
-      if (jarPath != null && Files.exists(jarPath)) {
-        LOGGER.debug("jarpath: {}", jarPath);
-        jarName = jarPath.toString();
-        if (!alreadyScannedJars.contains(jarName)) { // filter out already scanned jars
-          if (!jarsToScanQueue.contains(jarName)) { // filter out already queued jars
-            LOGGER.debug("Queuing jar to scan: {}", jarPath);
-            if (!jarsToScanQueue.offer(jarName)) {
-              LOGGER.debug("jarToScan queue is full, skipping jar: {}", jarName);
+    public void parseClass(String className, byte[] classfileBuffer, ProtectionDomain protectionDomain) {
+        try {
+            String jarName = "DEFAULT";
+            Path jarPath = JarScanner.extractJarPath(protectionDomain, SymDBReport.NO_OP);
+            if (jarPath != null && Files.exists(jarPath)) {
+                LOGGER.debug("jarpath: {}", jarPath);
+                jarName = jarPath.toString();
+                if (!alreadyScannedJars.contains(jarName)) { // filter out already scanned jars
+                    if (!jarsToScanQueue.contains(jarName)) { // filter out already queued jars
+                        LOGGER.debug("Queuing jar to scan: {}", jarPath);
+                        if (!jarsToScanQueue.offer(jarName)) {
+                            LOGGER.debug("jarToScan queue is full, skipping jar: {}", jarName);
+                        }
+                    }
+                }
             }
-          }
+            parseClass(SymDBReport.NO_OP, className, classfileBuffer, jarName);
+        } catch (Exception ex) {
+            LOGGER.debug("Error parsing class: {}", className, ex);
         }
-      }
-      parseClass(SymDBReport.NO_OP, className, classfileBuffer, jarName);
-    } catch (Exception ex) {
-      LOGGER.debug("Error parsing class: {}", className, ex);
     }
-  }
 
-  public void parseClass(
-      SymDBReport symDBReport, String className, byte[] classfileBuffer, String jarName) {
-    if (className == null) {
-      return;
-    }
-    className = trimPrefixes(className);
-    if (className.endsWith(CLASS_SUFFIX)) {
-      className = className.substring(0, className.length() - CLASS_SUFFIX.length());
-    }
-    synchronized (loadedClasses) {
-      String fqn = Strings.getClassName(className); // ClassNameTrie expects Java class names ('.')
-      if (loadedClasses.apply(fqn) > 0) {
-        // class already loaded and symbol extracted
-        return;
-      }
-      loadedClasses.put(fqn, 1);
-    }
-    LOGGER.debug("Extracting Symbols from: {}, located in: {}", className, jarName);
-    Scope jarScope = SymbolExtractor.extract(classfileBuffer, jarName);
-    if (jarScope == null) {
-      return;
+    public void parseClass(SymDBReport symDBReport, String className, byte[] classfileBuffer, String jarName) {
+        if (className == null) {
+            return;
+        }
+        className = trimPrefixes(className);
+        if (className.endsWith(CLASS_SUFFIX)) {
+            className = className.substring(0, className.length() - CLASS_SUFFIX.length());
+        }
+        synchronized (loadedClasses) {
+            String fqn = Strings.getClassName(className); // ClassNameTrie expects Java class names ('.')
+            if (loadedClasses.apply(fqn) > 0) {
+                // class already loaded and symbol extracted
+                return;
+            }
+            loadedClasses.put(fqn, 1);
+        }
+        LOGGER.debug("Extracting Symbols from: {}, located in: {}", className, jarName);
+        Scope jarScope = SymbolExtractor.extract(classfileBuffer, jarName);
+        if (jarScope == null) {
+            return;
+        }
+        jarScope = applyFilters(jarScope);
+        addJarScope(jarScope, false);
+        symDBReport.incClassCount(jarName);
     }
-    jarScope = applyFilters(jarScope);
-    addJarScope(jarScope, false);
-    symDBReport.incClassCount(jarName);
-  }
 
-  private Scope applyFilters(Scope jarScope) {
-    for (ScopeFilter filter : scopeFilters) {
-      jarScope.getScopes().removeIf(filter::filterOut);
+    private Scope applyFilters(Scope jarScope) {
+        for (ScopeFilter filter : scopeFilters) {
+            jarScope.getScopes().removeIf(filter::filterOut);
+        }
+        return jarScope;
     }
-    return jarScope;
-  }
 
-  private void flushRemainingScopes(SymbolAggregator symbolAggregator) {
-    synchronized (jarScopeLock) {
-      if (jarScopesByName.isEmpty()) {
-        return;
-      }
-      LOGGER.debug("Flush remaining scopes");
-      addJarScope(null, true); // force flush remaining scopes
+    private void flushRemainingScopes(SymbolAggregator symbolAggregator) {
+        synchronized (jarScopeLock) {
+            if (jarScopesByName.isEmpty()) {
+                return;
+            }
+            LOGGER.debug("Flush remaining scopes");
+            addJarScope(null, true); // force flush remaining scopes
+        }
     }
-  }
 
-  void scanQueuedJars(SymbolAggregator symbolAggregator) {
-    if (jarsToScanQueue.isEmpty()) {
-      return;
-    }
-    byte[] buffer = new byte[READ_BUFFER_SIZE];
-    ByteArrayOutputStream baos = new ByteArrayOutputStream(CLASSFILE_BUFFER_SIZE);
-    while (!jarsToScanQueue.isEmpty()) {
-      String jarPath = jarsToScanQueue.poll();
-      LOGGER.debug("Scanning queued jar: {}", jarPath);
-      try {
-        scanJar(SymDBReport.NO_OP, Paths.get(jarPath), baos, buffer);
-      } catch (Exception ex) {
-        LOGGER.debug("Failed to scan jar {}", jarPath, ex);
-      }
+    void scanQueuedJars(SymbolAggregator symbolAggregator) {
+        if (jarsToScanQueue.isEmpty()) {
+            return;
+        }
+        byte[] buffer = new byte[READ_BUFFER_SIZE];
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(CLASSFILE_BUFFER_SIZE);
+        while (!jarsToScanQueue.isEmpty()) {
+            String jarPath = jarsToScanQueue.poll();
+            LOGGER.debug("Scanning queued jar: {}", jarPath);
+            try {
+                scanJar(SymDBReport.NO_OP, Paths.get(jarPath), baos, buffer);
+            } catch (Exception ex) {
+                LOGGER.debug("Failed to scan jar {}", jarPath, ex);
+            }
+        }
     }
-  }
 
-  private void addJarScope(Scope jarScope, boolean forceFlush) {
-    List<Scope> scopes = Collections.emptyList();
-    synchronized (jarScopeLock) {
-      if (jarScope != null) {
-        Scope scope = jarScopesByName.get(jarScope.getName());
-        if (scope != null) {
-          scope.getScopes().addAll(jarScope.getScopes());
-        } else {
-          jarScopesByName.put(jarScope.getName(), jarScope);
+    private void addJarScope(Scope jarScope, boolean forceFlush) {
+        List<Scope> scopes = Collections.emptyList();
+        synchronized (jarScopeLock) {
+            if (jarScope != null) {
+                Scope scope = jarScopesByName.get(jarScope.getName());
+                if (scope != null) {
+                    scope.getScopes().addAll(jarScope.getScopes());
+                } else {
+                    jarScopesByName.put(jarScope.getName(), jarScope);
+                }
+                totalClasses++;
+            }
+            if (totalClasses >= symbolFlushThreshold || forceFlush) {
+                scopes = new ArrayList<>(jarScopesByName.values());
+                jarScopesByName.clear();
+                totalClasses = 0;
+            }
+        }
+        if (!scopes.isEmpty()) {
+            LOGGER.debug("dumping {} jar scopes to sink", scopes.size());
+            for (Scope scope : scopes) {
+                LOGGER.debug(
+                        "dumping {} class scopes to sink from scope: {}",
+                        scope.getScopes().size(),
+                        scope.getName());
+                sink.addScope(scope);
+            }
         }
-        totalClasses++;
-      }
-      if (totalClasses >= symbolFlushThreshold || forceFlush) {
-        scopes = new ArrayList<>(jarScopesByName.values());
-        jarScopesByName.clear();
-        totalClasses = 0;
-      }
-    }
-    if (!scopes.isEmpty()) {
-      LOGGER.debug("dumping {} jar scopes to sink", scopes.size());
-      for (Scope scope : scopes) {
-        LOGGER.debug(
-            "dumping {} class scopes to sink from scope: {}",
-            scope.getScopes().size(),
-            scope.getName());
-        sink.addScope(scope);
-      }
     }
-  }
 
-  public void scanJar(
-      SymDBReport symDBReport, Path jarPath, ByteArrayOutputStream baos, byte[] buffer) {
-    if (alreadyScannedJars.contains(jarPath.toString())) {
-      return;
-    }
-    File jarPathFile = jarPath.toFile();
-    if (jarPathFile.isDirectory()) {
-      scanDirectory(jarPath, alreadyScannedJars, baos, buffer, symDBReport);
-    } else {
-      try {
-        try (JarFile jarFile = openJarFile(jarPathFile)) {
-          jarFile.stream()
-              .filter(jarEntry -> jarEntry.getName().endsWith(".class"))
-              .filter(
-                  jarEntry ->
-                      !classNameFilter.isExcluded(
-                          Strings.getClassName(trimPrefixes(jarEntry.getName()))))
-              .forEach(
-                  jarEntry -> parseJarEntry(symDBReport, jarEntry, jarFile, jarPath, baos, buffer));
+    public void scanJar(SymDBReport symDBReport, Path jarPath, ByteArrayOutputStream baos, byte[] buffer) {
+        if (alreadyScannedJars.contains(jarPath.toString())) {
+            return;
+        }
+        File jarPathFile = jarPath.toFile();
+        if (jarPathFile.isDirectory()) {
+            scanDirectory(jarPath, alreadyScannedJars, baos, buffer, symDBReport);
+        } else {
+            try {
+                try (JarFile jarFile = openJarFile(jarPathFile)) {
+                    jarFile.stream()
+                            .filter(jarEntry -> jarEntry.getName().endsWith(".class"))
+                            .filter(jarEntry ->
+                                    !classNameFilter.isExcluded(Strings.getClassName(trimPrefixes(jarEntry.getName()))))
+                            .forEach(jarEntry -> parseJarEntry(symDBReport, jarEntry, jarFile, jarPath, baos, buffer));
+                }
+            } catch (IOException e) {
+                symDBReport.addIOException(jarPath.toString(), e);
+                throw new RuntimeException(e);
+            }
         }
-      } catch (IOException e) {
-        symDBReport.addIOException(jarPath.toString(), e);
-        throw new RuntimeException(e);
-      }
+        symDBReport.addScannedJar(jarPath.toString());
+        alreadyScannedJars.add(jarPath.toString());
     }
-    symDBReport.addScannedJar(jarPath.toString());
-    alreadyScannedJars.add(jarPath.toString());
-  }
 
-  @VisibleForTesting
-  JarFile openJarFile(File file) throws IOException {
-    return new JarFile(file);
-  }
+    @VisibleForTesting
+    JarFile openJarFile(File file) throws IOException {
+        return new JarFile(file);
+    }
 
-  private void scanDirectory(
-      Path jarPath,
-      Set<String> alreadyScannedJars,
-      ByteArrayOutputStream baos,
-      byte[] buffer,
-      SymDBReport symDBReport) {
-    try (Stream<Path> paths = Files.walk(jarPath)) {
-      paths
-          // explicitly no follow links walking the directory to avoid cycles
-          .filter(path -> Files.isRegularFile(path, LinkOption.NOFOLLOW_LINKS))
-          .filter(path -> path.toString().endsWith(".class"))
-          .filter(
-              path ->
-                  !classNameFilter.isExcluded(
-                      Strings.getClassName(trimPrefixes(jarPath.relativize(path).toString()))))
-          .forEach(path -> parseFileEntry(symDBReport, path, jarPath, baos, buffer));
-      alreadyScannedJars.add(jarPath.toString());
-    } catch (IOException e) {
-      symDBReport.addIOException(jarPath.toString(), e);
-      LOGGER.debug("Exception during scanning directory: {}", jarPath, e);
+    private void scanDirectory(
+            Path jarPath,
+            Set<String> alreadyScannedJars,
+            ByteArrayOutputStream baos,
+            byte[] buffer,
+            SymDBReport symDBReport) {
+        try (Stream<Path> paths = Files.walk(jarPath)) {
+            paths
+                    // explicitly no follow links walking the directory to avoid cycles
+                    .filter(path -> Files.isRegularFile(path, LinkOption.NOFOLLOW_LINKS))
+                    .filter(path -> path.toString().endsWith(".class"))
+                    .filter(path -> !classNameFilter.isExcluded(Strings.getClassName(
+                            trimPrefixes(jarPath.relativize(path).toString()))))
+                    .forEach(path -> parseFileEntry(symDBReport, path, jarPath, baos, buffer));
+            alreadyScannedJars.add(jarPath.toString());
+        } catch (IOException e) {
+            symDBReport.addIOException(jarPath.toString(), e);
+            LOGGER.debug("Exception during scanning directory: {}", jarPath, e);
+        }
     }
-  }
 
-  private void parseFileEntry(
-      SymDBReport symDBReport, Path path, Path jarPath, ByteArrayOutputStream baos, byte[] buffer) {
-    LOGGER.debug("parsing file class: {}", path.toString());
-    try {
-      try (InputStream inputStream = Files.newInputStream(path)) {
-        int readBytes;
-        baos.reset();
-        while ((readBytes = inputStream.read(buffer)) != -1) {
-          baos.write(buffer, 0, readBytes);
+    private void parseFileEntry(
+            SymDBReport symDBReport, Path path, Path jarPath, ByteArrayOutputStream baos, byte[] buffer) {
+        LOGGER.debug("parsing file class: {}", path.toString());
+        try {
+            try (InputStream inputStream = Files.newInputStream(path)) {
+                int readBytes;
+                baos.reset();
+                while ((readBytes = inputStream.read(buffer)) != -1) {
+                    baos.write(buffer, 0, readBytes);
+                }
+                parseClass(symDBReport, path.getFileName().toString(), baos.toByteArray(), jarPath.toString());
+            }
+        } catch (IOException ex) {
+            symDBReport.addIOException(jarPath.toString(), ex);
+            LOGGER.debug("Exception during parsing file class: {}", path, ex);
         }
-        parseClass(
-            symDBReport, path.getFileName().toString(), baos.toByteArray(), jarPath.toString());
-      }
-    } catch (IOException ex) {
-      symDBReport.addIOException(jarPath.toString(), ex);
-      LOGGER.debug("Exception during parsing file class: {}", path, ex);
     }
-  }
 
-  private void parseJarEntry(
-      SymDBReport symDBReport,
-      JarEntry jarEntry,
-      JarFile jarFile,
-      Path jarPath,
-      ByteArrayOutputStream baos,
-      byte[] buffer) {
-    LOGGER.debug("parsing jarEntry class: {}", jarEntry.getName());
-    try {
-      // must be closed so the JarFile returns its Inflater to the cache instead of allocating a
-      // new native zlib context per entry
-      try (InputStream inputStream = jarFile.getInputStream(jarEntry)) {
-        int readBytes;
-        baos.reset();
-        while ((readBytes = inputStream.read(buffer)) != -1) {
-          baos.write(buffer, 0, readBytes);
+    private void parseJarEntry(
+            SymDBReport symDBReport,
+            JarEntry jarEntry,
+            JarFile jarFile,
+            Path jarPath,
+            ByteArrayOutputStream baos,
+            byte[] buffer) {
+        LOGGER.debug("parsing jarEntry class: {}", jarEntry.getName());
+        try {
+            // must be closed so the JarFile returns its Inflater to the cache instead of allocating a
+            // new native zlib context per entry
+            try (InputStream inputStream = jarFile.getInputStream(jarEntry)) {
+                int readBytes;
+                baos.reset();
+                while ((readBytes = inputStream.read(buffer)) != -1) {
+                    baos.write(buffer, 0, readBytes);
+                }
+            }
+            parseClass(symDBReport, jarEntry.getName(), baos.toByteArray(), jarPath.toString());
+        } catch (IOException ex) {
+            symDBReport.addIOException(jarPath.toString(), ex);
+            LOGGER.debug("Exception during parsing jarEntry class: {}", jarEntry.getName(), ex);
+        } catch (Exception ex) {
+            LOGGER.debug("Exception during parsing jarEntry class: {}", jarEntry.getName(), ex);
         }
-      }
-      parseClass(symDBReport, jarEntry.getName(), baos.toByteArray(), jarPath.toString());
-    } catch (IOException ex) {
-      symDBReport.addIOException(jarPath.toString(), ex);
-      LOGGER.debug("Exception during parsing jarEntry class: {}", jarEntry.getName(), ex);
-    } catch (Exception ex) {
-      LOGGER.debug("Exception during parsing jarEntry class: {}", jarEntry.getName(), ex);
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractionTransformer.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractionTransformer.java
index 9464ea1aa5b..ad419d1f38e 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractionTransformer.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractionTransformer.java
@@ -11,49 +11,48 @@
 
 public class SymbolExtractionTransformer implements ClassFileTransformer {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(SymbolExtractionTransformer.class);
-
-  private final SymbolAggregator symbolAggregator;
-  private final ClassNameFilter classNameFiltering;
-
-  public SymbolExtractionTransformer(
-      SymbolAggregator symbolAggregator, ClassNameFilter classNameFiltering) {
-    this.symbolAggregator = symbolAggregator;
-    this.classNameFiltering = classNameFiltering;
-    if (isDebuggerInternalClass(null)) {
-      // Force DebuggerInternalPAckages to be loaded before calling it into the transform method
-      // avoid LinkageError for duplicated class definition
-      throw new IllegalArgumentException("DebuggerInternalClass should be loaded");
+    private static final Logger LOGGER = LoggerFactory.getLogger(SymbolExtractionTransformer.class);
+
+    private final SymbolAggregator symbolAggregator;
+    private final ClassNameFilter classNameFiltering;
+
+    public SymbolExtractionTransformer(SymbolAggregator symbolAggregator, ClassNameFilter classNameFiltering) {
+        this.symbolAggregator = symbolAggregator;
+        this.classNameFiltering = classNameFiltering;
+        if (isDebuggerInternalClass(null)) {
+            // Force DebuggerInternalPAckages to be loaded before calling it into the transform method
+            // avoid LinkageError for duplicated class definition
+            throw new IllegalArgumentException("DebuggerInternalClass should be loaded");
+        }
     }
-  }
-
-  @Override
-  public byte[] transform(
-      ClassLoader loader,
-      String className,
-      Class<?> classBeingRedefined,
-      ProtectionDomain protectionDomain,
-      byte[] classfileBuffer) {
-    if (className == null) {
-      return null;
-    }
-    try {
-      if (isDebuggerInternalClass(className)) {
-        // Don't parse debugger-internal classes to avoid duplicate class definition
-        return null;
-      }
-      if (classNameFiltering.isExcluded(Strings.getClassName(className))) {
-        return null;
-      }
-      symbolAggregator.parseClass(className, classfileBuffer, protectionDomain);
-      return null;
-    } catch (Exception ex) {
-      LOGGER.debug("Error during extraction: ", ex);
-      return null;
+
+    @Override
+    public byte[] transform(
+            ClassLoader loader,
+            String className,
+            Class<?> classBeingRedefined,
+            ProtectionDomain protectionDomain,
+            byte[] classfileBuffer) {
+        if (className == null) {
+            return null;
+        }
+        try {
+            if (isDebuggerInternalClass(className)) {
+                // Don't parse debugger-internal classes to avoid duplicate class definition
+                return null;
+            }
+            if (classNameFiltering.isExcluded(Strings.getClassName(className))) {
+                return null;
+            }
+            symbolAggregator.parseClass(className, classfileBuffer, protectionDomain);
+            return null;
+        } catch (Exception ex) {
+            LOGGER.debug("Error during extraction: ", ex);
+            return null;
+        }
     }
-  }
 
-  ClassNameFilter getClassNameFiltering() {
-    return classNameFiltering;
-  }
+    ClassNameFilter getClassNameFiltering() {
+        return classNameFiltering;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractor.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractor.java
index d705ffc0175..466284be3ea 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractor.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractor.java
@@ -34,528 +34,501 @@
 import org.slf4j.LoggerFactory;
 
 public class SymbolExtractor {
-  private static final Logger LOGGER = LoggerFactory.getLogger(SymbolExtractor.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SymbolExtractor.class);
 
-  public static Scope extract(byte[] classFileBuffer, String jarName) {
-    ClassNode classNode = parseClassFile(classFileBuffer);
-    return extractScopes(classNode, jarName);
-  }
+    public static Scope extract(byte[] classFileBuffer, String jarName) {
+        ClassNode classNode = parseClassFile(classFileBuffer);
+        return extractScopes(classNode, jarName);
+    }
 
-  private static Scope extractScopes(ClassNode classNode, String jarName) {
-    try {
-      String sourceFile = extractSourceFile(classNode);
-      SourceRemapper sourceRemapper = SourceRemapper.NOOP_REMAPPER;
-      if (classNode.sourceDebug != null) {
-        List<SourceMap> sourceMaps = Parser.parse(classNode.sourceDebug);
-        if (sourceMaps.isEmpty()) {
-          throw new IllegalStateException("No source maps found for " + classNode.name);
-        }
-        SourceMap sourceMap = sourceMaps.get(0);
-        sourceRemapper = SourceRemapper.getSourceRemapper(classNode.sourceFile, sourceMap);
-      }
-      List<Scope> methodScopes = extractMethods(classNode, sourceFile, sourceRemapper);
-      int classStartLine = Integer.MAX_VALUE;
-      int classEndLine = 0;
-      for (Scope scope : methodScopes) {
-        if (scope.getStartLine() > 0) {
-          classStartLine = Math.min(classStartLine, scope.getStartLine());
-        }
-        if (scope.getEndLine() > 0) {
-          classEndLine = Math.max(classEndLine, scope.getEndLine());
+    private static Scope extractScopes(ClassNode classNode, String jarName) {
+        try {
+            String sourceFile = extractSourceFile(classNode);
+            SourceRemapper sourceRemapper = SourceRemapper.NOOP_REMAPPER;
+            if (classNode.sourceDebug != null) {
+                List<SourceMap> sourceMaps = Parser.parse(classNode.sourceDebug);
+                if (sourceMaps.isEmpty()) {
+                    throw new IllegalStateException("No source maps found for " + classNode.name);
+                }
+                SourceMap sourceMap = sourceMaps.get(0);
+                sourceRemapper = SourceRemapper.getSourceRemapper(classNode.sourceFile, sourceMap);
+            }
+            List<Scope> methodScopes = extractMethods(classNode, sourceFile, sourceRemapper);
+            int classStartLine = Integer.MAX_VALUE;
+            int classEndLine = 0;
+            for (Scope scope : methodScopes) {
+                if (scope.getStartLine() > 0) {
+                    classStartLine = Math.min(classStartLine, scope.getStartLine());
+                }
+                if (scope.getEndLine() > 0) {
+                    classEndLine = Math.max(classEndLine, scope.getEndLine());
+                }
+            }
+            List<Symbol> fields = extractFields(classNode);
+            LanguageSpecifics classSpecifics = new LanguageSpecifics.Builder()
+                    .addModifiers(extractClassModifiers(classNode.access))
+                    .addInterfaces(extractInterfaces(classNode))
+                    .addAnnotations(extractAnnotations(classNode.visibleAnnotations))
+                    .superClass(ASMHelper.extractSuperClass(classNode))
+                    .build();
+            Scope classScope = Scope.builder(ScopeType.CLASS, sourceFile, classStartLine, classEndLine)
+                    .name(Strings.getClassName(classNode.name))
+                    .scopes(methodScopes)
+                    .symbols(fields)
+                    .languageSpecifics(classSpecifics)
+                    .build();
+            return Scope.builder(ScopeType.JAR, jarName, 0, 0)
+                    .name(jarName)
+                    .scopes(new ArrayList<>(Collections.singletonList(classScope)))
+                    .build();
+        } catch (Exception ex) {
+            LOGGER.debug("Extracting scopes for class[{}] in jar[{}] failed: ", classNode.name, jarName, ex);
+            return null;
         }
-      }
-      List<Symbol> fields = extractFields(classNode);
-      LanguageSpecifics classSpecifics =
-          new LanguageSpecifics.Builder()
-              .addModifiers(extractClassModifiers(classNode.access))
-              .addInterfaces(extractInterfaces(classNode))
-              .addAnnotations(extractAnnotations(classNode.visibleAnnotations))
-              .superClass(ASMHelper.extractSuperClass(classNode))
-              .build();
-      Scope classScope =
-          Scope.builder(ScopeType.CLASS, sourceFile, classStartLine, classEndLine)
-              .name(Strings.getClassName(classNode.name))
-              .scopes(methodScopes)
-              .symbols(fields)
-              .languageSpecifics(classSpecifics)
-              .build();
-      return Scope.builder(ScopeType.JAR, jarName, 0, 0)
-          .name(jarName)
-          .scopes(new ArrayList<>(Collections.singletonList(classScope)))
-          .build();
-    } catch (Exception ex) {
-      LOGGER.debug(
-          "Extracting scopes for class[{}] in jar[{}] failed: ", classNode.name, jarName, ex);
-      return null;
     }
-  }
 
-  private static Collection<String> extractInterfaces(ClassNode classNode) {
-    if (classNode.interfaces.isEmpty()) {
-      return Collections.emptyList();
+    private static Collection<String> extractInterfaces(ClassNode classNode) {
+        if (classNode.interfaces.isEmpty()) {
+            return Collections.emptyList();
+        }
+        return classNode.interfaces.stream().map(Strings::getClassName).collect(Collectors.toList());
     }
-    return classNode.interfaces.stream().map(Strings::getClassName).collect(Collectors.toList());
-  }
 
-  private static List<Symbol> extractFields(ClassNode classNode) {
-    List<Symbol> fields = new ArrayList<>();
-    for (FieldNode fieldNode : classNode.fields) {
-      SymbolType symbolType =
-          ASMHelper.isStaticField(fieldNode) ? SymbolType.STATIC_FIELD : SymbolType.FIELD;
-      LanguageSpecifics fieldSpecifics =
-          new LanguageSpecifics.Builder()
-              .addModifiers(extractFieldModifiers(fieldNode.access))
-              .addAnnotations(extractAnnotations(fieldNode.visibleAnnotations))
-              .build();
-      fields.add(
-          new Symbol(
-              symbolType,
-              fieldNode.name,
-              0,
-              Type.getType(fieldNode.desc).getClassName(),
-              fieldSpecifics));
+    private static List<Symbol> extractFields(ClassNode classNode) {
+        List<Symbol> fields = new ArrayList<>();
+        for (FieldNode fieldNode : classNode.fields) {
+            SymbolType symbolType = ASMHelper.isStaticField(fieldNode) ? SymbolType.STATIC_FIELD : SymbolType.FIELD;
+            LanguageSpecifics fieldSpecifics = new LanguageSpecifics.Builder()
+                    .addModifiers(extractFieldModifiers(fieldNode.access))
+                    .addAnnotations(extractAnnotations(fieldNode.visibleAnnotations))
+                    .build();
+            fields.add(new Symbol(
+                    symbolType, fieldNode.name, 0, Type.getType(fieldNode.desc).getClassName(), fieldSpecifics));
+        }
+        return fields;
     }
-    return fields;
-  }
 
-  private static List<Scope> extractMethods(
-      ClassNode classNode, String sourceFile, SourceRemapper sourceRemapper) {
-    List<Scope> methodScopes = new ArrayList<>();
-    for (MethodNode method : classNode.methods) {
-      MethodLineInfo methodLineInfo = extractMethodLineInfo(method, sourceRemapper);
-      List<Scope> varScopes = new ArrayList<>();
-      List<Symbol> methodSymbols = new ArrayList<>();
-      int localVarBaseSlot = extractArgs(method, methodSymbols, methodLineInfo.start);
-      extractScopesFromVariables(
-          sourceFile, method, methodLineInfo.lineMap, varScopes, localVarBaseSlot);
-      ScopeType methodScopeType = ScopeType.METHOD;
-      if (method.name.startsWith("lambda$")) {
-        methodScopeType = ScopeType.CLOSURE;
-      }
-      LanguageSpecifics methodSpecifics =
-          new LanguageSpecifics.Builder()
-              .addModifiers(extractMethodModifiers(classNode, method, method.access))
-              .addAnnotations(extractAnnotations(method.visibleAnnotations))
-              .returnType(Type.getType(method.desc).getReturnType().getClassName())
-              .build();
-      Scope methodScope =
-          Scope.builder(methodScopeType, sourceFile, methodLineInfo.start, methodLineInfo.end)
-              .name(method.name)
-              .scopes(varScopes)
-              .symbols(methodSymbols)
-              .hasInjectibleLines(!methodLineInfo.ranges.isEmpty())
-              .injectibleLines(methodLineInfo.ranges)
-              .languageSpecifics(methodSpecifics)
-              .build();
-      methodScopes.add(methodScope);
+    private static List<Scope> extractMethods(ClassNode classNode, String sourceFile, SourceRemapper sourceRemapper) {
+        List<Scope> methodScopes = new ArrayList<>();
+        for (MethodNode method : classNode.methods) {
+            MethodLineInfo methodLineInfo = extractMethodLineInfo(method, sourceRemapper);
+            List<Scope> varScopes = new ArrayList<>();
+            List<Symbol> methodSymbols = new ArrayList<>();
+            int localVarBaseSlot = extractArgs(method, methodSymbols, methodLineInfo.start);
+            extractScopesFromVariables(sourceFile, method, methodLineInfo.lineMap, varScopes, localVarBaseSlot);
+            ScopeType methodScopeType = ScopeType.METHOD;
+            if (method.name.startsWith("lambda$")) {
+                methodScopeType = ScopeType.CLOSURE;
+            }
+            LanguageSpecifics methodSpecifics = new LanguageSpecifics.Builder()
+                    .addModifiers(extractMethodModifiers(classNode, method, method.access))
+                    .addAnnotations(extractAnnotations(method.visibleAnnotations))
+                    .returnType(Type.getType(method.desc).getReturnType().getClassName())
+                    .build();
+            Scope methodScope = Scope.builder(methodScopeType, sourceFile, methodLineInfo.start, methodLineInfo.end)
+                    .name(method.name)
+                    .scopes(varScopes)
+                    .symbols(methodSymbols)
+                    .hasInjectibleLines(!methodLineInfo.ranges.isEmpty())
+                    .injectibleLines(methodLineInfo.ranges)
+                    .languageSpecifics(methodSpecifics)
+                    .build();
+            methodScopes.add(methodScope);
+        }
+        return methodScopes;
     }
-    return methodScopes;
-  }
 
-  private static Collection<String> extractClassModifiers(int access) {
-    List<String> results = new ArrayList<>();
-    for (int remaining = access, bit; remaining != 0; remaining -= bit) {
-      bit = Integer.lowestOneBit(remaining);
-      switch (bit) {
-        case Opcodes.ACC_PUBLIC:
-          results.add("public");
-          break;
-        case Opcodes.ACC_PRIVATE:
-          results.add("private");
-          break;
-        case Opcodes.ACC_PROTECTED:
-          results.add("protected");
-          break;
-        case Opcodes.ACC_STATIC:
-          results.add("static");
-          break;
-        case Opcodes.ACC_FINAL:
-          results.add("final");
-          break;
-        case Opcodes.ACC_SUPER:
-          break; // not interesting
-        case Opcodes.ACC_INTERFACE:
-          results.add("interface");
-          break;
-        case Opcodes.ACC_ABSTRACT:
-          results.add("abstract");
-          break;
-        case Opcodes.ACC_SYNTHETIC:
-          results.add("synthetic");
-          break;
-        case Opcodes.ACC_ANNOTATION:
-          results.add("annotation");
-          break;
-        case Opcodes.ACC_ENUM:
-          results.add("enum");
-          break;
-        case Opcodes.ACC_MODULE:
-          results.add("module");
-          break;
-        case Opcodes.ACC_RECORD:
-          results.add("record");
-          break;
-        case Opcodes.ACC_DEPRECATED:
-          results.add("deprecated");
-          break;
-        default:
-          LOGGER.debug("Invalid class access modifiers: {}", bit);
-      }
+    private static Collection<String> extractClassModifiers(int access) {
+        List<String> results = new ArrayList<>();
+        for (int remaining = access, bit; remaining != 0; remaining -= bit) {
+            bit = Integer.lowestOneBit(remaining);
+            switch (bit) {
+                case Opcodes.ACC_PUBLIC:
+                    results.add("public");
+                    break;
+                case Opcodes.ACC_PRIVATE:
+                    results.add("private");
+                    break;
+                case Opcodes.ACC_PROTECTED:
+                    results.add("protected");
+                    break;
+                case Opcodes.ACC_STATIC:
+                    results.add("static");
+                    break;
+                case Opcodes.ACC_FINAL:
+                    results.add("final");
+                    break;
+                case Opcodes.ACC_SUPER:
+                    break; // not interesting
+                case Opcodes.ACC_INTERFACE:
+                    results.add("interface");
+                    break;
+                case Opcodes.ACC_ABSTRACT:
+                    results.add("abstract");
+                    break;
+                case Opcodes.ACC_SYNTHETIC:
+                    results.add("synthetic");
+                    break;
+                case Opcodes.ACC_ANNOTATION:
+                    results.add("annotation");
+                    break;
+                case Opcodes.ACC_ENUM:
+                    results.add("enum");
+                    break;
+                case Opcodes.ACC_MODULE:
+                    results.add("module");
+                    break;
+                case Opcodes.ACC_RECORD:
+                    results.add("record");
+                    break;
+                case Opcodes.ACC_DEPRECATED:
+                    results.add("deprecated");
+                    break;
+                default:
+                    LOGGER.debug("Invalid class access modifiers: {}", bit);
+            }
+        }
+        return results;
     }
-    return results;
-  }
 
-  private static Collection<String> extractMethodModifiers(
-      ClassNode classNode, MethodNode methodNode, int access) {
-    List<String> results = new ArrayList<>();
-    for (int remaining = access, bit; remaining != 0; remaining -= bit) {
-      bit = Integer.lowestOneBit(remaining);
-      switch (bit) {
-        case Opcodes.ACC_PUBLIC:
-          results.add("public");
-          break;
-        case Opcodes.ACC_PRIVATE:
-          results.add("private");
-          break;
-        case Opcodes.ACC_PROTECTED:
-          results.add("protected");
-          break;
-        case Opcodes.ACC_STATIC:
-          results.add("static");
-          break;
-        case Opcodes.ACC_FINAL:
-          results.add("final");
-          break;
-        case Opcodes.ACC_SYNCHRONIZED:
-          results.add("synchronized");
-          break;
-        case Opcodes.ACC_BRIDGE:
-          results.add("(bridge)");
-          break;
-        case Opcodes.ACC_VARARGS:
-          results.add("(varargs)");
-          break;
-        case Opcodes.ACC_NATIVE:
-          results.add("native");
-          break;
-        case Opcodes.ACC_ABSTRACT:
-          results.add("abstract");
-          break;
-        case Opcodes.ACC_STRICT:
-          results.add("strictfp");
-          break;
-        case Opcodes.ACC_SYNTHETIC:
-          results.add("synthetic");
-          break;
-        case Opcodes.ACC_MANDATED:
-          results.add("mandated");
-          break;
-        case Opcodes.ACC_DEPRECATED:
-          results.add("deprecated");
-          break;
-        default:
-          LOGGER.debug(
-              "Invalid access modifiers method[{}::{}]: {}",
-              classNode.name,
-              methodNode.name + methodNode.desc,
-              bit);
-      }
-    }
-    // if class is an interface && method has code && non-static this is a default method
-    if ((classNode.access & Opcodes.ACC_INTERFACE) > 0
-        && methodNode.instructions.size() > 0
-        && (methodNode.access & Opcodes.ACC_STATIC) == 0) {
-      results.add("default");
+    private static Collection<String> extractMethodModifiers(ClassNode classNode, MethodNode methodNode, int access) {
+        List<String> results = new ArrayList<>();
+        for (int remaining = access, bit; remaining != 0; remaining -= bit) {
+            bit = Integer.lowestOneBit(remaining);
+            switch (bit) {
+                case Opcodes.ACC_PUBLIC:
+                    results.add("public");
+                    break;
+                case Opcodes.ACC_PRIVATE:
+                    results.add("private");
+                    break;
+                case Opcodes.ACC_PROTECTED:
+                    results.add("protected");
+                    break;
+                case Opcodes.ACC_STATIC:
+                    results.add("static");
+                    break;
+                case Opcodes.ACC_FINAL:
+                    results.add("final");
+                    break;
+                case Opcodes.ACC_SYNCHRONIZED:
+                    results.add("synchronized");
+                    break;
+                case Opcodes.ACC_BRIDGE:
+                    results.add("(bridge)");
+                    break;
+                case Opcodes.ACC_VARARGS:
+                    results.add("(varargs)");
+                    break;
+                case Opcodes.ACC_NATIVE:
+                    results.add("native");
+                    break;
+                case Opcodes.ACC_ABSTRACT:
+                    results.add("abstract");
+                    break;
+                case Opcodes.ACC_STRICT:
+                    results.add("strictfp");
+                    break;
+                case Opcodes.ACC_SYNTHETIC:
+                    results.add("synthetic");
+                    break;
+                case Opcodes.ACC_MANDATED:
+                    results.add("mandated");
+                    break;
+                case Opcodes.ACC_DEPRECATED:
+                    results.add("deprecated");
+                    break;
+                default:
+                    LOGGER.debug(
+                            "Invalid access modifiers method[{}::{}]: {}",
+                            classNode.name,
+                            methodNode.name + methodNode.desc,
+                            bit);
+            }
+        }
+        // if class is an interface && method has code && non-static this is a default method
+        if ((classNode.access & Opcodes.ACC_INTERFACE) > 0
+                && methodNode.instructions.size() > 0
+                && (methodNode.access & Opcodes.ACC_STATIC) == 0) {
+            results.add("default");
+        }
+        return results;
     }
-    return results;
-  }
 
-  private static Collection<String> extractFieldModifiers(int access) {
-    List<String> results = new ArrayList<>();
-    for (int remaining = access, bit; remaining != 0; remaining -= bit) {
-      bit = Integer.lowestOneBit(remaining);
-      switch (bit) {
-        case Opcodes.ACC_PUBLIC:
-          results.add("public");
-          break;
-        case Opcodes.ACC_PRIVATE:
-          results.add("private");
-          break;
-        case Opcodes.ACC_PROTECTED:
-          results.add("protected");
-          break;
-        case Opcodes.ACC_STATIC:
-          results.add("static");
-          break;
-        case Opcodes.ACC_FINAL:
-          results.add("final");
-          break;
-        case Opcodes.ACC_VOLATILE:
-          results.add("volatile");
-          break;
-        case Opcodes.ACC_TRANSIENT:
-          results.add("transient");
-          break;
-        case Opcodes.ACC_SYNTHETIC:
-          results.add("synthetic");
-          break;
-        case Opcodes.ACC_ENUM:
-          results.add("enum");
-          break;
-        case Opcodes.ACC_MANDATED:
-          results.add("mandated");
-          break;
-        case Opcodes.ACC_DEPRECATED:
-          results.add("deprecated");
-          break;
-        default:
-          LOGGER.debug("Invalid access modifiers: {}", bit);
-      }
+    private static Collection<String> extractFieldModifiers(int access) {
+        List<String> results = new ArrayList<>();
+        for (int remaining = access, bit; remaining != 0; remaining -= bit) {
+            bit = Integer.lowestOneBit(remaining);
+            switch (bit) {
+                case Opcodes.ACC_PUBLIC:
+                    results.add("public");
+                    break;
+                case Opcodes.ACC_PRIVATE:
+                    results.add("private");
+                    break;
+                case Opcodes.ACC_PROTECTED:
+                    results.add("protected");
+                    break;
+                case Opcodes.ACC_STATIC:
+                    results.add("static");
+                    break;
+                case Opcodes.ACC_FINAL:
+                    results.add("final");
+                    break;
+                case Opcodes.ACC_VOLATILE:
+                    results.add("volatile");
+                    break;
+                case Opcodes.ACC_TRANSIENT:
+                    results.add("transient");
+                    break;
+                case Opcodes.ACC_SYNTHETIC:
+                    results.add("synthetic");
+                    break;
+                case Opcodes.ACC_ENUM:
+                    results.add("enum");
+                    break;
+                case Opcodes.ACC_MANDATED:
+                    results.add("mandated");
+                    break;
+                case Opcodes.ACC_DEPRECATED:
+                    results.add("deprecated");
+                    break;
+                default:
+                    LOGGER.debug("Invalid access modifiers: {}", bit);
+            }
+        }
+        return results;
     }
-    return results;
-  }
 
-  private static Collection<String> extractAnnotations(List<AnnotationNode> annotationNodes) {
-    if (annotationNodes == null || annotationNodes.isEmpty()) {
-      return Collections.emptyList();
-    }
-    List<String> results = new ArrayList<>();
-    for (AnnotationNode annotationNode : annotationNodes) {
-      StringBuilder sb = new StringBuilder("@");
-      sb.append(Type.getType(annotationNode.desc).getClassName());
-      results.add(sb.toString());
+    private static Collection<String> extractAnnotations(List<AnnotationNode> annotationNodes) {
+        if (annotationNodes == null || annotationNodes.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<String> results = new ArrayList<>();
+        for (AnnotationNode annotationNode : annotationNodes) {
+            StringBuilder sb = new StringBuilder("@");
+            sb.append(Type.getType(annotationNode.desc).getClassName());
+            results.add(sb.toString());
+        }
+        return results;
     }
-    return results;
-  }
-
-  private static String extractSourceFile(ClassNode classNode) {
-    String packageName = classNode.name;
-    int idx = packageName.lastIndexOf('/');
-    packageName = idx >= 0 ? packageName.substring(0, idx + 1) : "";
-    return packageName + classNode.sourceFile;
-  }
 
-  private static int extractArgs(
-      MethodNode method, List<Symbol> methodSymbols, int methodStartLine) {
-    boolean isStatic = (method.access & Opcodes.ACC_STATIC) != 0;
-    int slot = isStatic ? 0 : 1;
-    if (method.localVariables == null || method.localVariables.size() == 0) {
-      return slot;
+    private static String extractSourceFile(ClassNode classNode) {
+        String packageName = classNode.name;
+        int idx = packageName.lastIndexOf('/');
+        packageName = idx >= 0 ? packageName.substring(0, idx + 1) : "";
+        return packageName + classNode.sourceFile;
     }
-    Type[] argTypes = Type.getArgumentTypes(method.desc);
-    if (argTypes.length == 0) {
-      return slot;
-    }
-    List<LocalVariableNode> sortedLocalVars = sortLocalVariables(method.localVariables);
-    LocalVariableNode[] localVarsBySlot = createLocalVarNodes(sortedLocalVars);
-    adjustLocalVarsBasedOnArgs(isStatic, localVarsBySlot, argTypes, sortedLocalVars);
-    for (Type argType : argTypes) {
-      if (slot >= localVarsBySlot.length) {
-        break;
-      }
-      String argName = localVarsBySlot[slot] != null ? localVarsBySlot[slot].name : "p" + slot;
-      methodSymbols.add(
-          new Symbol(SymbolType.ARG, argName, methodStartLine, argType.getClassName(), null));
-      slot += argType.getSize();
-    }
-    return slot;
-  }
 
-  private static void extractScopesFromVariables(
-      String sourceFile,
-      MethodNode methodNode,
-      Map<Label, Integer> monotonicLineMap,
-      List<Scope> varScopes,
-      int localVarBaseSlot) {
-    if (methodNode.localVariables == null) {
-      return;
-    }
-    // using a LinkedHashMap only for having a stable order of local scopes (tests)
-    Map<LabelNode, List<LocalVariableNode>> varsByEndLabel = new LinkedHashMap<>();
-    for (int i = 0; i < methodNode.localVariables.size(); i++) {
-      LocalVariableNode localVariable = methodNode.localVariables.get(i);
-      if (localVariable.index < localVarBaseSlot) {
-        continue;
-      }
-      varsByEndLabel.merge(
-          localVariable.end,
-          new ArrayList<>(Collections.singletonList(localVariable)),
-          (curr, next) -> {
-            curr.addAll(next);
-            return curr;
-          });
-    }
-    List<Scope> tmpScopes = new ArrayList<>();
-    for (Map.Entry<LabelNode, List<LocalVariableNode>> entry : varsByEndLabel.entrySet()) {
-      List<Symbol> varSymbols = new ArrayList<>();
-      int minLine = Integer.MAX_VALUE;
-      for (LocalVariableNode var : entry.getValue()) {
-        Integer line = monotonicLineMap.get(var.start.getLabel());
-        if (line == null) {
-          LOGGER.debug(
-              "Cannot find the line for variable {} idx={} in local variables",
-              var.name,
-              var.index);
-          continue;
+    private static int extractArgs(MethodNode method, List<Symbol> methodSymbols, int methodStartLine) {
+        boolean isStatic = (method.access & Opcodes.ACC_STATIC) != 0;
+        int slot = isStatic ? 0 : 1;
+        if (method.localVariables == null || method.localVariables.size() == 0) {
+            return slot;
+        }
+        Type[] argTypes = Type.getArgumentTypes(method.desc);
+        if (argTypes.length == 0) {
+            return slot;
         }
-        minLine = Math.min(line, minLine);
-        varSymbols.add(
-            new Symbol(
-                SymbolType.LOCAL, var.name, line, Type.getType(var.desc).getClassName(), null));
-      }
-      Integer endLine = monotonicLineMap.get(entry.getKey().getLabel());
-      if (endLine == null) {
-        LOGGER.debug("Cannot find the line from end label");
-        continue;
-      }
-      Scope varScope =
-          Scope.builder(ScopeType.LOCAL, sourceFile, minLine, endLine)
-              .symbols(varSymbols)
-              .scopes(new ArrayList<>())
-              .build();
-      tmpScopes.add(varScope);
+        List<LocalVariableNode> sortedLocalVars = sortLocalVariables(method.localVariables);
+        LocalVariableNode[] localVarsBySlot = createLocalVarNodes(sortedLocalVars);
+        adjustLocalVarsBasedOnArgs(isStatic, localVarsBySlot, argTypes, sortedLocalVars);
+        for (Type argType : argTypes) {
+            if (slot >= localVarsBySlot.length) {
+                break;
+            }
+            String argName = localVarsBySlot[slot] != null ? localVarsBySlot[slot].name : "p" + slot;
+            methodSymbols.add(new Symbol(SymbolType.ARG, argName, methodStartLine, argType.getClassName(), null));
+            slot += argType.getSize();
+        }
+        return slot;
     }
-    nestScopes(varScopes, tmpScopes);
-  }
 
-  private static Scope removeWidestScope(List<Scope> scopes) {
-    Scope widestScope = null;
-    for (Scope scope : scopes) {
-      widestScope = widestScope != null ? maxScope(widestScope, scope) : scope;
+    private static void extractScopesFromVariables(
+            String sourceFile,
+            MethodNode methodNode,
+            Map<Label, Integer> monotonicLineMap,
+            List<Scope> varScopes,
+            int localVarBaseSlot) {
+        if (methodNode.localVariables == null) {
+            return;
+        }
+        // using a LinkedHashMap only for having a stable order of local scopes (tests)
+        Map<LabelNode, List<LocalVariableNode>> varsByEndLabel = new LinkedHashMap<>();
+        for (int i = 0; i < methodNode.localVariables.size(); i++) {
+            LocalVariableNode localVariable = methodNode.localVariables.get(i);
+            if (localVariable.index < localVarBaseSlot) {
+                continue;
+            }
+            varsByEndLabel.merge(
+                    localVariable.end, new ArrayList<>(Collections.singletonList(localVariable)), (curr, next) -> {
+                        curr.addAll(next);
+                        return curr;
+                    });
+        }
+        List<Scope> tmpScopes = new ArrayList<>();
+        for (Map.Entry<LabelNode, List<LocalVariableNode>> entry : varsByEndLabel.entrySet()) {
+            List<Symbol> varSymbols = new ArrayList<>();
+            int minLine = Integer.MAX_VALUE;
+            for (LocalVariableNode var : entry.getValue()) {
+                Integer line = monotonicLineMap.get(var.start.getLabel());
+                if (line == null) {
+                    LOGGER.debug("Cannot find the line for variable {} idx={} in local variables", var.name, var.index);
+                    continue;
+                }
+                minLine = Math.min(line, minLine);
+                varSymbols.add(new Symbol(
+                        SymbolType.LOCAL, var.name, line, Type.getType(var.desc).getClassName(), null));
+            }
+            Integer endLine = monotonicLineMap.get(entry.getKey().getLabel());
+            if (endLine == null) {
+                LOGGER.debug("Cannot find the line from end label");
+                continue;
+            }
+            Scope varScope = Scope.builder(ScopeType.LOCAL, sourceFile, minLine, endLine)
+                    .symbols(varSymbols)
+                    .scopes(new ArrayList<>())
+                    .build();
+            tmpScopes.add(varScope);
+        }
+        nestScopes(varScopes, tmpScopes);
     }
-    // Remove the actual widest instance from the list, based on reference equality
-    scopes.remove(widestScope);
-    return widestScope;
-  }
 
-  private static void nestScopes(List<Scope> outerScopes, List<Scope> scopes) {
-    Scope widestScope = removeWidestScope(scopes);
-    if (widestScope == null) {
-      return;
-    }
-    outerScopes.add(widestScope);
-    for (Scope scope : scopes) {
-      boolean added = false;
-      for (Scope outerScope : outerScopes) {
-        if (isInnerScope(outerScope, scope)) {
-          outerScope.getScopes().add(scope);
-          added = true;
-          break;
+    private static Scope removeWidestScope(List<Scope> scopes) {
+        Scope widestScope = null;
+        for (Scope scope : scopes) {
+            widestScope = widestScope != null ? maxScope(widestScope, scope) : scope;
         }
-      }
-      if (!added) {
-        outerScopes.add(scope);
-      }
+        // Remove the actual widest instance from the list, based on reference equality
+        scopes.remove(widestScope);
+        return widestScope;
     }
-    for (Scope outerScope : outerScopes) {
-      List<Scope> tmpScopes = new ArrayList<>(outerScope.getScopes());
-      outerScope.getScopes().clear();
-      nestScopes(outerScope.getScopes(), tmpScopes);
-    }
-  }
 
-  private static boolean isInnerScope(Scope enclosingScope, Scope scope) {
-    return scope.getStartLine() >= enclosingScope.getStartLine()
-        && scope.getEndLine() <= enclosingScope.getEndLine();
-  }
+    private static void nestScopes(List<Scope> outerScopes, List<Scope> scopes) {
+        Scope widestScope = removeWidestScope(scopes);
+        if (widestScope == null) {
+            return;
+        }
+        outerScopes.add(widestScope);
+        for (Scope scope : scopes) {
+            boolean added = false;
+            for (Scope outerScope : outerScopes) {
+                if (isInnerScope(outerScope, scope)) {
+                    outerScope.getScopes().add(scope);
+                    added = true;
+                    break;
+                }
+            }
+            if (!added) {
+                outerScopes.add(scope);
+            }
+        }
+        for (Scope outerScope : outerScopes) {
+            List<Scope> tmpScopes = new ArrayList<>(outerScope.getScopes());
+            outerScope.getScopes().clear();
+            nestScopes(outerScope.getScopes(), tmpScopes);
+        }
+    }
 
-  private static Scope maxScope(Scope scope1, Scope scope2) {
-    return scope1.getStartLine() > scope2.getStartLine()
-            || scope1.getEndLine() < scope2.getEndLine()
-        ? scope2
-        : scope1;
-  }
+    private static boolean isInnerScope(Scope enclosingScope, Scope scope) {
+        return scope.getStartLine() >= enclosingScope.getStartLine()
+                && scope.getEndLine() <= enclosingScope.getEndLine();
+    }
 
-  static List<Scope.LineRange> buildRanges(List<Integer> sortedLineNo) {
-    if (sortedLineNo.isEmpty()) {
-      return Collections.emptyList();
+    private static Scope maxScope(Scope scope1, Scope scope2) {
+        return scope1.getStartLine() > scope2.getStartLine() || scope1.getEndLine() < scope2.getEndLine()
+                ? scope2
+                : scope1;
     }
-    List<Scope.LineRange> ranges = new ArrayList<>();
-    int start = sortedLineNo.get(0);
-    int previous = start;
-    int i = 1;
-    outer:
-    while (i < sortedLineNo.size()) {
-      int currentLineNo = sortedLineNo.get(i);
-      while (currentLineNo == previous + 1) {
-        i++;
-        previous++;
-        if (i < sortedLineNo.size()) {
-          currentLineNo = sortedLineNo.get(i);
-        } else {
-          break outer;
+
+    static List<Scope.LineRange> buildRanges(List<Integer> sortedLineNo) {
+        if (sortedLineNo.isEmpty()) {
+            return Collections.emptyList();
         }
-      }
-      ranges.add(new Scope.LineRange(start, previous));
-      start = currentLineNo;
-      previous = start;
-      i++;
+        List<Scope.LineRange> ranges = new ArrayList<>();
+        int start = sortedLineNo.get(0);
+        int previous = start;
+        int i = 1;
+        outer:
+        while (i < sortedLineNo.size()) {
+            int currentLineNo = sortedLineNo.get(i);
+            while (currentLineNo == previous + 1) {
+                i++;
+                previous++;
+                if (i < sortedLineNo.size()) {
+                    currentLineNo = sortedLineNo.get(i);
+                } else {
+                    break outer;
+                }
+            }
+            ranges.add(new Scope.LineRange(start, previous));
+            start = currentLineNo;
+            previous = start;
+            i++;
+        }
+        ranges.add(new Scope.LineRange(start, previous));
+        return ranges;
     }
-    ranges.add(new Scope.LineRange(start, previous));
-    return ranges;
-  }
 
-  private static MethodLineInfo extractMethodLineInfo(
-      MethodNode methodNode, SourceRemapper sourceRemapper) {
-    Map<Label, Integer> map = new HashMap<>();
-    List<Integer> lineNo = new ArrayList<>();
-    Set<Integer> dedupSet = new HashSet<>();
-    AbstractInsnNode node = methodNode.instructions.getFirst();
-    int maxLine = 0;
-    while (node != null) {
-      if (node.getType() == AbstractInsnNode.LINE) {
-        LineNumberNode lineNumberNode = (LineNumberNode) node;
-        int newLine = sourceRemapper.remapSourceLine(lineNumberNode.line);
-        if (newLine > 0 && dedupSet.add(newLine)) {
-          lineNo.add(newLine);
+    private static MethodLineInfo extractMethodLineInfo(MethodNode methodNode, SourceRemapper sourceRemapper) {
+        Map<Label, Integer> map = new HashMap<>();
+        List<Integer> lineNo = new ArrayList<>();
+        Set<Integer> dedupSet = new HashSet<>();
+        AbstractInsnNode node = methodNode.instructions.getFirst();
+        int maxLine = 0;
+        while (node != null) {
+            if (node.getType() == AbstractInsnNode.LINE) {
+                LineNumberNode lineNumberNode = (LineNumberNode) node;
+                int newLine = sourceRemapper.remapSourceLine(lineNumberNode.line);
+                if (newLine > 0 && dedupSet.add(newLine)) {
+                    lineNo.add(newLine);
+                }
+                maxLine = Math.max(newLine, maxLine);
+            }
+            if (node.getType() == AbstractInsnNode.LABEL) {
+                if (node instanceof LabelNode) {
+                    LabelNode labelNode = (LabelNode) node;
+                    map.put(labelNode.getLabel(), maxLine);
+                }
+            }
+            node = node.getNext();
         }
-        maxLine = Math.max(newLine, maxLine);
-      }
-      if (node.getType() == AbstractInsnNode.LABEL) {
-        if (node instanceof LabelNode) {
-          LabelNode labelNode = (LabelNode) node;
-          map.put(labelNode.getLabel(), maxLine);
+        lineNo.sort(Integer::compareTo);
+        if (methodNode.name.equals("<init>") && !lineNo.isEmpty()) {
+            // for constructors we are dropping the first line because it is not instrumentable:
+            // it needs to call the super or this before
+            lineNo.remove(0);
         }
-      }
-      node = node.getNext();
-    }
-    lineNo.sort(Integer::compareTo);
-    if (methodNode.name.equals("<init>") && !lineNo.isEmpty()) {
-      // for constructors we are dropping the first line because it is not instrumentable:
-      // it needs to call the super or this before
-      lineNo.remove(0);
-    }
-    int startLine;
-    if (lineNo.isEmpty()) {
-      startLine = 0;
-      maxLine = 0;
-    } else {
-      startLine = lineNo.get(0);
+        int startLine;
+        if (lineNo.isEmpty()) {
+            startLine = 0;
+            maxLine = 0;
+        } else {
+            startLine = lineNo.get(0);
+        }
+        List<Scope.LineRange> ranges = buildRanges(lineNo);
+        return new MethodLineInfo(startLine, maxLine, map, ranges);
     }
-    List<Scope.LineRange> ranges = buildRanges(lineNo);
-    return new MethodLineInfo(startLine, maxLine, map, ranges);
-  }
 
-  private static ClassNode parseClassFile(byte[] classfileBuffer) {
-    ClassReader reader = new ClassReader(classfileBuffer);
-    ClassNode classNode = new ClassNode();
-    reader.accept(classNode, ClassReader.SKIP_FRAMES);
-    return classNode;
-  }
+    private static ClassNode parseClassFile(byte[] classfileBuffer) {
+        ClassReader reader = new ClassReader(classfileBuffer);
+        ClassNode classNode = new ClassNode();
+        reader.accept(classNode, ClassReader.SKIP_FRAMES);
+        return classNode;
+    }
 
-  public static class MethodLineInfo {
-    final int start;
-    final int end;
-    final Map<Label, Integer> lineMap;
-    final List<Scope.LineRange> ranges;
+    public static class MethodLineInfo {
+        final int start;
+        final int end;
+        final Map<Label, Integer> lineMap;
+        final List<Scope.LineRange> ranges;
 
-    public MethodLineInfo(
-        int start, int end, Map<Label, Integer> lineMap, List<Scope.LineRange> ranges) {
-      this.start = start;
-      this.end = end;
-      this.lineMap = lineMap;
+        public MethodLineInfo(int start, int end, Map<Label, Integer> lineMap, List<Scope.LineRange> ranges) {
+            this.start = start;
+            this.end = end;
+            this.lineMap = lineMap;
 
-      this.ranges = ranges;
+            this.ranges = ranges;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolType.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolType.java
index 94b5b889c74..7cd9ee2d1f3 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolType.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolType.java
@@ -1,8 +1,8 @@
 package com.datadog.debugger.symbol;
 
 public enum SymbolType {
-  FIELD,
-  STATIC_FIELD,
-  ARG,
-  LOCAL
+    FIELD,
+    STATIC_FIELD,
+    ARG,
+    LOCAL
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/WireFilter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/WireFilter.java
index 9359860eb68..81cb7736ae9 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/WireFilter.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/WireFilter.java
@@ -3,33 +3,33 @@
 import java.util.List;
 
 public class WireFilter implements ScopeFilter {
-  @Override
-  public boolean filterOut(Scope scope) {
-    // Filter out classes generated by Square Wire: https://square.github.io/wire/
-    if (scope == null) {
-      return false;
-    }
-    LanguageSpecifics languageSpecifics = scope.getLanguageSpecifics();
-    if (languageSpecifics == null) {
-      return false;
-    }
-    List<String> interfaces = languageSpecifics.getInterfaces();
-    if (interfaces != null) {
-      if (interfaces.contains("com.squareup.wire.Message")) {
-        // Pass-through for Message since it contains data
+    @Override
+    public boolean filterOut(Scope scope) {
+        // Filter out classes generated by Square Wire: https://square.github.io/wire/
+        if (scope == null) {
+            return false;
+        }
+        LanguageSpecifics languageSpecifics = scope.getLanguageSpecifics();
+        if (languageSpecifics == null) {
+            return false;
+        }
+        List<String> interfaces = languageSpecifics.getInterfaces();
+        if (interfaces != null) {
+            if (interfaces.contains("com.squareup.wire.Message")) {
+                // Pass-through for Message since it contains data
+                return false;
+            }
+            if (interfaces.stream().anyMatch(it -> it.startsWith("com.squareup.wire"))) {
+                return true;
+            }
+        }
+        String superClass = languageSpecifics.getSuperClass();
+        if (superClass != null) {
+            if (superClass.startsWith("com.squareup.wire")) {
+                return true;
+            }
+        }
+        // Probably no protobuf, pass
         return false;
-      }
-      if (interfaces.stream().anyMatch(it -> it.startsWith("com.squareup.wire"))) {
-        return true;
-      }
-    }
-    String superClass = languageSpecifics.getSuperClass();
-    if (superClass != null) {
-      if (superClass.startsWith("com.squareup.wire")) {
-        return true;
-      }
     }
-    // Probably no protobuf, pass
-    return false;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/uploader/BatchUploader.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/uploader/BatchUploader.java
index 993d8194668..aa09bdec506 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/uploader/BatchUploader.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/uploader/BatchUploader.java
@@ -35,367 +35,362 @@
 
 /** Handles batching logic of upload requests sent to the intake */
 public class BatchUploader {
-  public static class MultiPartContent {
-    private final byte[] content;
-    private final String partName;
-    private final String fileName;
-    private final MediaType mediaType;
-
-    public MultiPartContent(byte[] content, String partName, String fileName, MediaType mediaType) {
-      this.content = content;
-      this.partName = partName;
-      this.fileName = fileName;
-      this.mediaType = mediaType;
-    }
+    public static class MultiPartContent {
+        private final byte[] content;
+        private final String partName;
+        private final String fileName;
+        private final MediaType mediaType;
+
+        public MultiPartContent(byte[] content, String partName, String fileName, MediaType mediaType) {
+            this.content = content;
+            this.partName = partName;
+            this.fileName = fileName;
+            this.mediaType = mediaType;
+        }
 
-    public byte[] getContent() {
-      return content;
-    }
+        public byte[] getContent() {
+            return content;
+        }
+
+        public String getPartName() {
+            return partName;
+        }
+
+        public String getFileName() {
+            return fileName;
+        }
 
-    public String getPartName() {
-      return partName;
+        public MediaType getMediaType() {
+            return mediaType;
+        }
     }
 
-    public String getFileName() {
-      return fileName;
+    public static class RetryPolicy {
+        public final ConcurrentMap<Call, Integer> failures = new ConcurrentHashMap<>();
+        public final int maxFailures;
+
+        public RetryPolicy(int maxFailures) {
+            this.maxFailures = maxFailures;
+        }
     }
 
-    public MediaType getMediaType() {
-      return mediaType;
+    private static final Logger LOGGER = LoggerFactory.getLogger(BatchUploader.class);
+    private static final int MINUTES_BETWEEN_ERROR_LOG = 5;
+    private static final String HEADER_DD_CONTAINER_ID = "Datadog-Container-ID";
+    private static final String HEADER_DD_ENTITY_ID = "Datadog-Entity-ID";
+    static final String HEADER_DD_API_KEY = "DD-API-KEY";
+    static final int MAX_RUNNING_REQUESTS = 10;
+    public static final int MAX_ENQUEUED_REQUESTS = 20;
+    static final int TERMINATION_TIMEOUT = 5;
+    public static final MediaType APPLICATION_JSON = MediaType.get("application/json");
+    public static final MediaType APPLICATION_GZIP = MediaType.get("application/gzip");
+
+    private final String name;
+    private final String containerId;
+    private final String entityId;
+    private final ExecutorService okHttpExecutorService;
+    private final OkHttpClient client;
+    private final HttpUrl urlBase;
+    private final Callback responseCallback;
+    private final String apiKey;
+    private final DebuggerMetrics debuggerMetrics;
+    private final boolean instrumentTheWorld;
+    private final RatelimitedLogger ratelimitedLogger;
+    private final RetryPolicy retryPolicy;
+
+    private final Phaser inflightRequests = new Phaser(1);
+
+    public BatchUploader(String name, Config config, String endpoint, RetryPolicy retryPolicy) {
+        this(
+                name,
+                config,
+                endpoint,
+                new RatelimitedLogger(LOGGER, MINUTES_BETWEEN_ERROR_LOG, TimeUnit.MINUTES),
+                retryPolicy);
     }
-  }
 
-  public static class RetryPolicy {
-    public final ConcurrentMap<Call, Integer> failures = new ConcurrentHashMap<>();
-    public final int maxFailures;
+    BatchUploader(
+            String name, Config config, String endpoint, RatelimitedLogger ratelimitedLogger, RetryPolicy retryPolicy) {
+        this(
+                name,
+                config,
+                endpoint,
+                ratelimitedLogger,
+                retryPolicy,
+                ContainerInfo.get().containerId,
+                ContainerInfo.getEntityId());
+    }
 
-    public RetryPolicy(int maxFailures) {
-      this.maxFailures = maxFailures;
+    @VisibleForTesting
+    BatchUploader(
+            String name,
+            Config config,
+            String endpoint,
+            RatelimitedLogger ratelimitedLogger,
+            RetryPolicy retryPolicy,
+            String containerId,
+            String entityId) {
+        this.name = name;
+        instrumentTheWorld = config.getDynamicInstrumentationInstrumentTheWorld() != null;
+        if (endpoint == null || endpoint.length() == 0) {
+            throw new IllegalArgumentException("Endpoint url is empty");
+        }
+        urlBase = HttpUrl.get(endpoint);
+        LOGGER.debug("Started BatchUploader[{}] with target url {}", name, urlBase);
+        apiKey = config.getApiKey();
+        this.ratelimitedLogger = ratelimitedLogger;
+        // This is the same thing OkHttp Dispatcher is doing except thread naming and daemonization
+        okHttpExecutorService = new ThreadPoolExecutor(
+                0,
+                Integer.MAX_VALUE,
+                60,
+                TimeUnit.SECONDS,
+                new SynchronousQueue<>(),
+                new AgentThreadFactory(DEBUGGER_HTTP_DISPATCHER));
+        this.retryPolicy = retryPolicy;
+        this.containerId = containerId;
+        this.entityId = entityId;
+        Duration requestTimeout = Duration.ofSeconds(config.getDynamicInstrumentationUploadTimeout());
+        client = OkHttpUtils.buildHttpClient(
+                config,
+                new Dispatcher(okHttpExecutorService),
+                urlBase,
+                true, /* retry */
+                MAX_RUNNING_REQUESTS,
+                null, /* proxyHost */
+                null, /* proxyPort */
+                null, /* proxyUsername */
+                null, /* proxyPassword */
+                requestTimeout.toMillis());
+        responseCallback = new ResponseCallback(name, ratelimitedLogger, inflightRequests, client, retryPolicy);
+        debuggerMetrics = DebuggerMetrics.getInstance(config);
     }
-  }
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(BatchUploader.class);
-  private static final int MINUTES_BETWEEN_ERROR_LOG = 5;
-  private static final String HEADER_DD_CONTAINER_ID = "Datadog-Container-ID";
-  private static final String HEADER_DD_ENTITY_ID = "Datadog-Entity-ID";
-  static final String HEADER_DD_API_KEY = "DD-API-KEY";
-  static final int MAX_RUNNING_REQUESTS = 10;
-  public static final int MAX_ENQUEUED_REQUESTS = 20;
-  static final int TERMINATION_TIMEOUT = 5;
-  public static final MediaType APPLICATION_JSON = MediaType.get("application/json");
-  public static final MediaType APPLICATION_GZIP = MediaType.get("application/gzip");
-
-  private final String name;
-  private final String containerId;
-  private final String entityId;
-  private final ExecutorService okHttpExecutorService;
-  private final OkHttpClient client;
-  private final HttpUrl urlBase;
-  private final Callback responseCallback;
-  private final String apiKey;
-  private final DebuggerMetrics debuggerMetrics;
-  private final boolean instrumentTheWorld;
-  private final RatelimitedLogger ratelimitedLogger;
-  private final RetryPolicy retryPolicy;
-
-  private final Phaser inflightRequests = new Phaser(1);
-
-  public BatchUploader(String name, Config config, String endpoint, RetryPolicy retryPolicy) {
-    this(
-        name,
-        config,
-        endpoint,
-        new RatelimitedLogger(LOGGER, MINUTES_BETWEEN_ERROR_LOG, TimeUnit.MINUTES),
-        retryPolicy);
-  }
-
-  BatchUploader(
-      String name,
-      Config config,
-      String endpoint,
-      RatelimitedLogger ratelimitedLogger,
-      RetryPolicy retryPolicy) {
-    this(
-        name,
-        config,
-        endpoint,
-        ratelimitedLogger,
-        retryPolicy,
-        ContainerInfo.get().containerId,
-        ContainerInfo.getEntityId());
-  }
-
-  @VisibleForTesting
-  BatchUploader(
-      String name,
-      Config config,
-      String endpoint,
-      RatelimitedLogger ratelimitedLogger,
-      RetryPolicy retryPolicy,
-      String containerId,
-      String entityId) {
-    this.name = name;
-    instrumentTheWorld = config.getDynamicInstrumentationInstrumentTheWorld() != null;
-    if (endpoint == null || endpoint.length() == 0) {
-      throw new IllegalArgumentException("Endpoint url is empty");
+
+    public void upload(byte[] batch) {
+        upload(batch, "");
     }
-    urlBase = HttpUrl.get(endpoint);
-    LOGGER.debug("Started BatchUploader[{}] with target url {}", name, urlBase);
-    apiKey = config.getApiKey();
-    this.ratelimitedLogger = ratelimitedLogger;
-    // This is the same thing OkHttp Dispatcher is doing except thread naming and daemonization
-    okHttpExecutorService =
-        new ThreadPoolExecutor(
-            0,
-            Integer.MAX_VALUE,
-            60,
-            TimeUnit.SECONDS,
-            new SynchronousQueue<>(),
-            new AgentThreadFactory(DEBUGGER_HTTP_DISPATCHER));
-    this.retryPolicy = retryPolicy;
-    this.containerId = containerId;
-    this.entityId = entityId;
-    Duration requestTimeout = Duration.ofSeconds(config.getDynamicInstrumentationUploadTimeout());
-    client =
-        OkHttpUtils.buildHttpClient(
-            config,
-            new Dispatcher(okHttpExecutorService),
-            urlBase,
-            true, /* retry */
-            MAX_RUNNING_REQUESTS,
-            null, /* proxyHost */
-            null, /* proxyPort */
-            null, /* proxyUsername */
-            null, /* proxyPassword */
-            requestTimeout.toMillis());
-    responseCallback =
-        new ResponseCallback(name, ratelimitedLogger, inflightRequests, client, retryPolicy);
-    debuggerMetrics = DebuggerMetrics.getInstance(config);
-  }
-
-  public void upload(byte[] batch) {
-    upload(batch, "");
-  }
-
-  public void upload(byte[] batch, String tags) {
-    doUpload(() -> makeUploadRequest(batch, tags));
-  }
-
-  public void uploadAsMultipart(String tags, MultiPartContent... parts) {
-    doUpload(() -> makeMultipartUploadRequest(tags, parts));
-  }
-
-  private void makeMultipartUploadRequest(String tags, MultiPartContent[] parts) {
-    MultipartBody.Builder builder = new MultipartBody.Builder().setType(MultipartBody.FORM);
-    int contentLength = 0;
-    for (MultiPartContent part : parts) {
-      contentLength += addPart(builder, part);
+
+    public void upload(byte[] batch, String tags) {
+        doUpload(() -> makeUploadRequest(batch, tags));
     }
-    MultipartBody body = builder.build();
-    buildAndSendRequest(body, contentLength, tags);
-  }
-
-  private int addPart(MultipartBody.Builder builder, MultiPartContent part) {
-    RequestBody fileBody = RequestBody.create(part.mediaType, part.content);
-    builder.addFormDataPart(part.partName, part.fileName, fileBody);
-    return part.content.length;
-  }
-
-  private void doUpload(Runnable makeRequest) {
-    if (instrumentTheWorld) {
-      // no upload in Instrument-The-World mode
-      return;
+
+    public void uploadAsMultipart(String tags, MultiPartContent... parts) {
+        doUpload(() -> makeMultipartUploadRequest(tags, parts));
     }
-    try {
-      if (canEnqueueMoreRequests()) {
-        makeRequest.run();
-        debuggerMetrics.count("batch.uploaded", 1);
-      } else {
-        debuggerMetrics.count("request.queue.full", 1);
-        ratelimitedLogger.warn(
-            "Cannot upload batch data to {}: too many enqueued requests!", urlBase);
-      }
-    } catch (Exception ex) {
-      debuggerMetrics.count("batch.upload.error", 1);
-      ratelimitedLogger.warn("Problem uploading batch!", ex);
+
+    private void makeMultipartUploadRequest(String tags, MultiPartContent[] parts) {
+        MultipartBody.Builder builder = new MultipartBody.Builder().setType(MultipartBody.FORM);
+        int contentLength = 0;
+        for (MultiPartContent part : parts) {
+            contentLength += addPart(builder, part);
+        }
+        MultipartBody body = builder.build();
+        buildAndSendRequest(body, contentLength, tags);
     }
-  }
-
-  @VisibleForTesting
-  OkHttpClient getClient() {
-    return client;
-  }
-
-  public HttpUrl getUrl() {
-    return urlBase;
-  }
-
-  RetryPolicy getRetryPolicy() {
-    return retryPolicy;
-  }
-
-  private void makeUploadRequest(byte[] json, String tags) {
-    int contentLength = json.length;
-    // use RequestBody.create(MediaType, byte[]) to avoid changing Content-Type to
-    // "Content-Type: application/json; charset=UTF-8" which is not recognized
-    RequestBody body = RequestBody.create(APPLICATION_JSON, json);
-    buildAndSendRequest(body, contentLength, tags);
-  }
-
-  private void buildAndSendRequest(RequestBody body, int contentLength, String tags) {
-    debuggerMetrics.histogram("batch.uploader.request.size", contentLength);
-    if (LOGGER.isDebugEnabled()) {
-      LOGGER.debug("[{}] Uploading batch data size={} bytes", name, contentLength);
+
+    private int addPart(MultipartBody.Builder builder, MultiPartContent part) {
+        RequestBody fileBody = RequestBody.create(part.mediaType, part.content);
+        builder.addFormDataPart(part.partName, part.fileName, fileBody);
+        return part.content.length;
     }
-    HttpUrl.Builder builder = urlBase.newBuilder();
-    if (tags != null && !tags.isEmpty()) {
-      builder.addQueryParameter("ddtags", tags);
+
+    private void doUpload(Runnable makeRequest) {
+        if (instrumentTheWorld) {
+            // no upload in Instrument-The-World mode
+            return;
+        }
+        try {
+            if (canEnqueueMoreRequests()) {
+                makeRequest.run();
+                debuggerMetrics.count("batch.uploaded", 1);
+            } else {
+                debuggerMetrics.count("request.queue.full", 1);
+                ratelimitedLogger.warn("Cannot upload batch data to {}: too many enqueued requests!", urlBase);
+            }
+        } catch (Exception ex) {
+            debuggerMetrics.count("batch.upload.error", 1);
+            ratelimitedLogger.warn("Problem uploading batch!", ex);
+        }
     }
-    Request.Builder requestBuilder = new Request.Builder().url(builder.build()).post(body);
-    if (apiKey != null) {
-      if (apiKey.isEmpty()) {
-        LOGGER.debug("API key is empty");
-      }
-      if (apiKey.length() != 32) {
-        LOGGER.debug(
-            "API key length is incorrect (truncated?) expected=32 actual={} API key={}...",
-            apiKey.length(),
-            apiKey.substring(0, Math.min(apiKey.length(), 6)));
-      }
-      requestBuilder.addHeader(HEADER_DD_API_KEY, apiKey);
-    } else {
-      LOGGER.debug("API key is null");
+
+    @VisibleForTesting
+    OkHttpClient getClient() {
+        return client;
     }
-    if (containerId != null) {
-      requestBuilder.addHeader(HEADER_DD_CONTAINER_ID, containerId);
+
+    public HttpUrl getUrl() {
+        return urlBase;
     }
-    if (entityId != null) {
-      requestBuilder.addHeader(HEADER_DD_ENTITY_ID, entityId);
+
+    RetryPolicy getRetryPolicy() {
+        return retryPolicy;
     }
-    Request request = requestBuilder.build();
-    LOGGER.debug("[{}] Sending request: {} CT: {}", name, request, request.body().contentType());
-    enqueueCall(client, request, responseCallback, retryPolicy, 0, inflightRequests);
-  }
-
-  public void shutdown() {
-    try {
-      inflightRequests.awaitAdvanceInterruptibly(inflightRequests.arrive(), 10, TimeUnit.SECONDS);
-    } catch (TimeoutException | InterruptedException ignored) {
-      LOGGER.warn("[{}] Not all upload requests have been handled", name);
+
+    private void makeUploadRequest(byte[] json, String tags) {
+        int contentLength = json.length;
+        // use RequestBody.create(MediaType, byte[]) to avoid changing Content-Type to
+        // "Content-Type: application/json; charset=UTF-8" which is not recognized
+        RequestBody body = RequestBody.create(APPLICATION_JSON, json);
+        buildAndSendRequest(body, contentLength, tags);
     }
-    okHttpExecutorService.shutdownNow();
-    try {
-      okHttpExecutorService.awaitTermination(TERMINATION_TIMEOUT, TimeUnit.SECONDS);
-    } catch (final InterruptedException e) {
-      // Note: this should only happen in main thread right before exiting, so eating up interrupted
-      // state should be fine.
-      LOGGER.warn("[{}] Wait for executor shutdown interrupted", name);
+
+    private void buildAndSendRequest(RequestBody body, int contentLength, String tags) {
+        debuggerMetrics.histogram("batch.uploader.request.size", contentLength);
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("[{}] Uploading batch data size={} bytes", name, contentLength);
+        }
+        HttpUrl.Builder builder = urlBase.newBuilder();
+        if (tags != null && !tags.isEmpty()) {
+            builder.addQueryParameter("ddtags", tags);
+        }
+        Request.Builder requestBuilder =
+                new Request.Builder().url(builder.build()).post(body);
+        if (apiKey != null) {
+            if (apiKey.isEmpty()) {
+                LOGGER.debug("API key is empty");
+            }
+            if (apiKey.length() != 32) {
+                LOGGER.debug(
+                        "API key length is incorrect (truncated?) expected=32 actual={} API key={}...",
+                        apiKey.length(),
+                        apiKey.substring(0, Math.min(apiKey.length(), 6)));
+            }
+            requestBuilder.addHeader(HEADER_DD_API_KEY, apiKey);
+        } else {
+            LOGGER.debug("API key is null");
+        }
+        if (containerId != null) {
+            requestBuilder.addHeader(HEADER_DD_CONTAINER_ID, containerId);
+        }
+        if (entityId != null) {
+            requestBuilder.addHeader(HEADER_DD_ENTITY_ID, entityId);
+        }
+        Request request = requestBuilder.build();
+        LOGGER.debug(
+                "[{}] Sending request: {} CT: {}", name, request, request.body().contentType());
+        enqueueCall(client, request, responseCallback, retryPolicy, 0, inflightRequests);
     }
-    client.connectionPool().evictAll();
-  }
-
-  private boolean canEnqueueMoreRequests() {
-    return client.dispatcher().queuedCallsCount() < MAX_ENQUEUED_REQUESTS;
-  }
-
-  private static void enqueueCall(
-      OkHttpClient client,
-      Request request,
-      Callback responseCallback,
-      RetryPolicy retryPolicy,
-      int failureCount,
-      Phaser inflightRequests) {
-    Call call = client.newCall(request);
-    retryPolicy.failures.put(call, failureCount);
-    call.enqueue(responseCallback);
-    inflightRequests.register();
-  }
-
-  private static final class ResponseCallback implements Callback {
 
-    private final String name;
-    private final RatelimitedLogger ratelimitedLogger;
-    private final Phaser inflightRequests;
-    private final OkHttpClient client;
-    private final RetryPolicy retryPolicy;
+    public void shutdown() {
+        try {
+            inflightRequests.awaitAdvanceInterruptibly(inflightRequests.arrive(), 10, TimeUnit.SECONDS);
+        } catch (TimeoutException | InterruptedException ignored) {
+            LOGGER.warn("[{}] Not all upload requests have been handled", name);
+        }
+        okHttpExecutorService.shutdownNow();
+        try {
+            okHttpExecutorService.awaitTermination(TERMINATION_TIMEOUT, TimeUnit.SECONDS);
+        } catch (final InterruptedException e) {
+            // Note: this should only happen in main thread right before exiting, so eating up interrupted
+            // state should be fine.
+            LOGGER.warn("[{}] Wait for executor shutdown interrupted", name);
+        }
+        client.connectionPool().evictAll();
+    }
 
-    public ResponseCallback(
-        String name,
-        final RatelimitedLogger ratelimitedLogger,
-        Phaser inflightRequests,
-        OkHttpClient client,
-        RetryPolicy retryPolicy) {
-      this.name = name;
-      this.ratelimitedLogger = ratelimitedLogger;
-      this.inflightRequests = inflightRequests;
-      this.client = client;
-      this.retryPolicy = retryPolicy;
+    private boolean canEnqueueMoreRequests() {
+        return client.dispatcher().queuedCallsCount() < MAX_ENQUEUED_REQUESTS;
     }
 
-    @Override
-    public void onFailure(Call call, IOException e) {
-      inflightRequests.arriveAndDeregister();
-      ratelimitedLogger.warn("Failed to upload batch to {}", call.request().url(), e);
-      handleRetry(call, retryPolicy.maxFailures);
+    private static void enqueueCall(
+            OkHttpClient client,
+            Request request,
+            Callback responseCallback,
+            RetryPolicy retryPolicy,
+            int failureCount,
+            Phaser inflightRequests) {
+        Call call = client.newCall(request);
+        retryPolicy.failures.put(call, failureCount);
+        call.enqueue(responseCallback);
+        inflightRequests.register();
     }
 
-    private void handleRetry(Call call, int maxFailures) {
-      Integer failure = retryPolicy.failures.remove(call);
-      if (failure != null) {
-        int failureCount = failure + 1;
-        if (failureCount <= maxFailures) {
-          LOGGER.debug(
-              "[{}] Retrying upload to {}, {}/{}",
-              name,
-              call.request().url(),
-              failureCount,
-              maxFailures);
-          enqueueCall(client, call.request(), this, retryPolicy, failureCount, inflightRequests);
-        } else {
-          LOGGER.warn(
-              "[{}] Failed permanently to upload batch to {} after {} attempts",
-              name,
-              call.request().url(),
-              maxFailures);
+    private static final class ResponseCallback implements Callback {
+
+        private final String name;
+        private final RatelimitedLogger ratelimitedLogger;
+        private final Phaser inflightRequests;
+        private final OkHttpClient client;
+        private final RetryPolicy retryPolicy;
+
+        public ResponseCallback(
+                String name,
+                final RatelimitedLogger ratelimitedLogger,
+                Phaser inflightRequests,
+                OkHttpClient client,
+                RetryPolicy retryPolicy) {
+            this.name = name;
+            this.ratelimitedLogger = ratelimitedLogger;
+            this.inflightRequests = inflightRequests;
+            this.client = client;
+            this.retryPolicy = retryPolicy;
         }
-      }
-    }
 
-    @Override
-    public void onResponse(Call call, Response response) {
-      try {
-        inflightRequests.arriveAndDeregister();
-        if (response.isSuccessful()) {
-          LOGGER.debug("[{}] Upload done", name);
-          retryPolicy.failures.remove(call);
-        } else {
-          ResponseBody body = response.body();
-          // Retrieve body content for detailed error messages
-          if (body != null && MediaType.get("application/json").equals(body.contentType())) {
-            try {
-              ratelimitedLogger.warn(
-                  "Failed to upload batch: unexpected response code {} {} {}",
-                  response.message(),
-                  response.code(),
-                  body.string());
-            } catch (IOException ex) {
-              ratelimitedLogger.warn("error while getting error message body", ex);
-            }
-          } else {
+        @Override
+        public void onFailure(Call call, IOException e) {
+            inflightRequests.arriveAndDeregister();
             ratelimitedLogger.warn(
-                "Failed to upload batch: unexpected response code {} {}",
-                response.message(),
-                response.code());
-          }
-          if (response.code() >= 500 || response.code() == 408 || response.code() == 429) {
+                    "Failed to upload batch to {}", call.request().url(), e);
             handleRetry(call, retryPolicy.maxFailures);
-          } else {
-            retryPolicy.failures.remove(call);
-          }
         }
-      } finally {
-        response.close();
-      }
+
+        private void handleRetry(Call call, int maxFailures) {
+            Integer failure = retryPolicy.failures.remove(call);
+            if (failure != null) {
+                int failureCount = failure + 1;
+                if (failureCount <= maxFailures) {
+                    LOGGER.debug(
+                            "[{}] Retrying upload to {}, {}/{}",
+                            name,
+                            call.request().url(),
+                            failureCount,
+                            maxFailures);
+                    enqueueCall(client, call.request(), this, retryPolicy, failureCount, inflightRequests);
+                } else {
+                    LOGGER.warn(
+                            "[{}] Failed permanently to upload batch to {} after {} attempts",
+                            name,
+                            call.request().url(),
+                            maxFailures);
+                }
+            }
+        }
+
+        @Override
+        public void onResponse(Call call, Response response) {
+            try {
+                inflightRequests.arriveAndDeregister();
+                if (response.isSuccessful()) {
+                    LOGGER.debug("[{}] Upload done", name);
+                    retryPolicy.failures.remove(call);
+                } else {
+                    ResponseBody body = response.body();
+                    // Retrieve body content for detailed error messages
+                    if (body != null && MediaType.get("application/json").equals(body.contentType())) {
+                        try {
+                            ratelimitedLogger.warn(
+                                    "Failed to upload batch: unexpected response code {} {} {}",
+                                    response.message(),
+                                    response.code(),
+                                    body.string());
+                        } catch (IOException ex) {
+                            ratelimitedLogger.warn("error while getting error message body", ex);
+                        }
+                    } else {
+                        ratelimitedLogger.warn(
+                                "Failed to upload batch: unexpected response code {} {}",
+                                response.message(),
+                                response.code());
+                    }
+                    if (response.code() >= 500 || response.code() == 408 || response.code() == 429) {
+                        handleRetry(call, retryPolicy.maxFailures);
+                    } else {
+                        retryPolicy.failures.remove(call);
+                    }
+                }
+            } finally {
+                response.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/CircuitBreaker.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/CircuitBreaker.java
index f8a756471ae..2a0f7185843 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/CircuitBreaker.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/CircuitBreaker.java
@@ -9,33 +9,33 @@
 // within a time window. If the number of trips exceeds the limit, the circuit breaker will trip and
 // return false until the time window has passed.
 public class CircuitBreaker {
-  private static final Logger LOGGER = LoggerFactory.getLogger(CircuitBreaker.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CircuitBreaker.class);
 
-  private final int maxTrips;
-  private final Duration timeWindow;
-  private AtomicInteger count = new AtomicInteger(0);
-  private volatile long lastResetTime = System.currentTimeMillis();
-  private volatile long lastLoggingTime = System.currentTimeMillis();
+    private final int maxTrips;
+    private final Duration timeWindow;
+    private AtomicInteger count = new AtomicInteger(0);
+    private volatile long lastResetTime = System.currentTimeMillis();
+    private volatile long lastLoggingTime = System.currentTimeMillis();
 
-  public CircuitBreaker(int maxTrips, Duration timeWindow) {
-    this.maxTrips = maxTrips;
-    this.timeWindow = timeWindow;
-  }
+    public CircuitBreaker(int maxTrips, Duration timeWindow) {
+        this.maxTrips = maxTrips;
+        this.timeWindow = timeWindow;
+    }
 
-  public boolean trip() {
-    int localCount = count.incrementAndGet();
-    if (localCount > maxTrips) {
-      long currentTime = System.currentTimeMillis();
-      if (currentTime - lastLoggingTime > Duration.ofMinutes(1).toMillis()) {
-        lastLoggingTime = currentTime;
-        LOGGER.debug("Circuit breaker opened");
-      }
-      if (currentTime - lastResetTime > timeWindow.toMillis()) {
-        lastResetTime = currentTime;
-        localCount = 1;
-        count.set(localCount);
-      }
+    public boolean trip() {
+        int localCount = count.incrementAndGet();
+        if (localCount > maxTrips) {
+            long currentTime = System.currentTimeMillis();
+            if (currentTime - lastLoggingTime > Duration.ofMinutes(1).toMillis()) {
+                lastLoggingTime = currentTime;
+                LOGGER.debug("Circuit breaker opened");
+            }
+            if (currentTime - lastResetTime > timeWindow.toMillis()) {
+                lastResetTime = currentTime;
+                localCount = 1;
+                count.set(localCount);
+            }
+        }
+        return localCount <= maxTrips;
     }
-    return localCount <= maxTrips;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassFileHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassFileHelper.java
index 0f1a1d796c3..044ac482893 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassFileHelper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassFileHelper.java
@@ -6,161 +6,160 @@
 
 /** Helper class for extracting information of a class file */
 public class ClassFileHelper {
-  private static final int CONSTANT_POOL_COUNT_OFFSET = 8;
-  private static final int CONSTANT_POOL_BASE_OFFSET = 10;
+    private static final int CONSTANT_POOL_COUNT_OFFSET = 8;
+    private static final int CONSTANT_POOL_BASE_OFFSET = 10;
 
-  public static String extractSourceFile(byte[] classFileBuffer) {
-    return extractSourceFileOffsetVersion(classFileBuffer);
-  }
-
-  // Version using ASM library
-  private static String extractSourceFileASM(byte[] classFileBuffer) {
-    ClassReader classReader = new ClassReader(classFileBuffer);
-    ClassNode classNode = new ClassNode();
-    classReader.accept(classNode, ClassReader.SKIP_FRAMES);
-    return classNode.sourceFile;
-  }
-
-  public static String removeExtension(String fileName) {
-    int idx = fileName.lastIndexOf('.');
-    if (idx > -1) {
-      fileName = fileName.substring(0, idx);
+    public static String extractSourceFile(byte[] classFileBuffer) {
+        return extractSourceFileOffsetVersion(classFileBuffer);
     }
-    return fileName;
-  }
 
-  public static String normalizeFilePath(String filePath) {
-    filePath = filePath.replace('/', '.');
-    return filePath;
-  }
+    // Version using ASM library
+    private static String extractSourceFileASM(byte[] classFileBuffer) {
+        ClassReader classReader = new ClassReader(classFileBuffer);
+        ClassNode classNode = new ClassNode();
+        classReader.accept(classNode, ClassReader.SKIP_FRAMES);
+        return classNode.sourceFile;
+    }
 
-  public static String stripPackagePath(String classPath) {
-    int idx = classPath.lastIndexOf('/');
-    if (idx != -1) {
-      classPath = classPath.substring(idx + 1);
+    public static String removeExtension(String fileName) {
+        int idx = fileName.lastIndexOf('.');
+        if (idx > -1) {
+            fileName = fileName.substring(0, idx);
+        }
+        return fileName;
     }
-    return classPath;
-  }
 
-  // Based on JVM spec: https://docs.oracle.com/javase/specs/jvms/se23/html/jvms-4.html
-  // Extracts the SourceFile attribute from a Java class file byte array with minimal parsing.
-  // This method is based on the JVM spec and does not use any external libraries.
-  // We are scanning the constant pool to keep file offsets for later fetching of the SourceFile
-  // attribute value. As the constant pool is a variable length structure, we need to scan them
-  // and based on the tag, we can calculate the length of the entry to skip to the next one.
-  private static String extractSourceFileOffsetVersion(byte[] classFileBytes) {
-    // Quick validation of minimum class file size and magic number
-    if (classFileBytes == null
-        || classFileBytes.length < 10
-        || classFileBytes[0] != (byte) 0xCA
-        || classFileBytes[1] != (byte) 0xFE
-        || classFileBytes[2] != (byte) 0xBA
-        || classFileBytes[3] != (byte) 0xBE) {
-      return null;
+    public static String normalizeFilePath(String filePath) {
+        filePath = filePath.replace('/', '.');
+        return filePath;
     }
-    int constantPoolCount = readUnsignedShort(classFileBytes, CONSTANT_POOL_COUNT_OFFSET);
-    int[] constantPoolOffsets = new int[constantPoolCount];
-    int currentOffset = CONSTANT_POOL_BASE_OFFSET;
-    // based on the JVM spec, constant pool starts from index 1 until constantPoolCount - 1
-    for (int i = 0; i < constantPoolCount - 1; i++) {
-      constantPoolOffsets[i] = currentOffset;
-      int tag = classFileBytes[constantPoolOffsets[i]];
-      switch (tag) {
-        case 1: // CONSTANT_Utf8
-          int length = readUnsignedShort(classFileBytes, constantPoolOffsets[i] + 1);
-          currentOffset += 3 + length;
-          break;
-        case 7: // CONSTANT_Class
-        case 8: // CONSTANT_String
-        case 16: // CONSTANT_MethodType
-        case 19: // CONSTANT_Module
-        case 20: // CONSTANT_Package
-          currentOffset += 3;
-          break;
-        case 15: // CONSTANT_MethodHandle
-          currentOffset += 4;
-          break;
-        case 3: // CONSTANT_Integer
-        case 4: // CONSTANT_Float
-        case 9: // CONSTANT_Fieldref
-        case 10: // CONSTANT_Methodref
-        case 11: // CONSTANT_InterfaceMethodref
-        case 12: // CONSTANT_NameAndType
-        case 17: // CONSTANT_Dynamic
-        case 18: // CONSTANT_InvokeDynamic
-          currentOffset += 5;
-          break;
-        case 5: // CONSTANT_Long
-        case 6: // CONSTANT_Double
-          currentOffset += 9;
-          i++; // Double slot
-          break;
-        default:
-          throw new IllegalArgumentException("Unknown constant pool tag: " + tag);
-      }
+
+    public static String stripPackagePath(String classPath) {
+        int idx = classPath.lastIndexOf('/');
+        if (idx != -1) {
+            classPath = classPath.substring(idx + 1);
+        }
+        return classPath;
     }
-    currentOffset += 2; // Skip access flags
-    currentOffset += 2; // Skip this class
-    currentOffset += 2; // Skip super class
-    int interfacesCount = readUnsignedShort(classFileBytes, currentOffset);
-    currentOffset += 2 + interfacesCount * 2; // Skip interfaces
-    // skip fields
-    currentOffset = skipFieldsOrMethods(classFileBytes, currentOffset);
-    // skip Methods
-    currentOffset = skipFieldsOrMethods(classFileBytes, currentOffset);
-    int attributesCount = readUnsignedShort(classFileBytes, currentOffset);
-    currentOffset += 2; // Skip attributes count
-    for (int i = 0; i < attributesCount; i++) {
-      int attributeNameIndex = readUnsignedShort(classFileBytes, currentOffset);
-      currentOffset += 2; // Skip attribute name index
-      int attributeLength = (int) readUnsignedInt(classFileBytes, currentOffset);
-      currentOffset += 4; // Skip attribute length
-      if (attributeNameIndex == 0) {
-        continue;
-      }
-      // read attribute name
-      int utf8Offset = constantPoolOffsets[attributeNameIndex - 1];
-      int utf8Len = readUnsignedShort(classFileBytes, utf8Offset + 1);
-      String utf8 = new String(classFileBytes, utf8Offset + 3, utf8Len, StandardCharsets.UTF_8);
-      if ("SourceFile".equals(utf8)) {
-        // read SourceFile attribute
-        int sourceFileIndex = readUnsignedShort(classFileBytes, currentOffset);
-        int sourceFileOffset = constantPoolOffsets[sourceFileIndex - 1];
-        int sourceFileLen = readUnsignedShort(classFileBytes, sourceFileOffset + 1);
-        return new String(
-            classFileBytes, sourceFileOffset + 3, sourceFileLen, StandardCharsets.UTF_8);
-      }
-      currentOffset += attributeLength; // Skip attribute data
+
+    // Based on JVM spec: https://docs.oracle.com/javase/specs/jvms/se23/html/jvms-4.html
+    // Extracts the SourceFile attribute from a Java class file byte array with minimal parsing.
+    // This method is based on the JVM spec and does not use any external libraries.
+    // We are scanning the constant pool to keep file offsets for later fetching of the SourceFile
+    // attribute value. As the constant pool is a variable length structure, we need to scan them
+    // and based on the tag, we can calculate the length of the entry to skip to the next one.
+    private static String extractSourceFileOffsetVersion(byte[] classFileBytes) {
+        // Quick validation of minimum class file size and magic number
+        if (classFileBytes == null
+                || classFileBytes.length < 10
+                || classFileBytes[0] != (byte) 0xCA
+                || classFileBytes[1] != (byte) 0xFE
+                || classFileBytes[2] != (byte) 0xBA
+                || classFileBytes[3] != (byte) 0xBE) {
+            return null;
+        }
+        int constantPoolCount = readUnsignedShort(classFileBytes, CONSTANT_POOL_COUNT_OFFSET);
+        int[] constantPoolOffsets = new int[constantPoolCount];
+        int currentOffset = CONSTANT_POOL_BASE_OFFSET;
+        // based on the JVM spec, constant pool starts from index 1 until constantPoolCount - 1
+        for (int i = 0; i < constantPoolCount - 1; i++) {
+            constantPoolOffsets[i] = currentOffset;
+            int tag = classFileBytes[constantPoolOffsets[i]];
+            switch (tag) {
+                case 1: // CONSTANT_Utf8
+                    int length = readUnsignedShort(classFileBytes, constantPoolOffsets[i] + 1);
+                    currentOffset += 3 + length;
+                    break;
+                case 7: // CONSTANT_Class
+                case 8: // CONSTANT_String
+                case 16: // CONSTANT_MethodType
+                case 19: // CONSTANT_Module
+                case 20: // CONSTANT_Package
+                    currentOffset += 3;
+                    break;
+                case 15: // CONSTANT_MethodHandle
+                    currentOffset += 4;
+                    break;
+                case 3: // CONSTANT_Integer
+                case 4: // CONSTANT_Float
+                case 9: // CONSTANT_Fieldref
+                case 10: // CONSTANT_Methodref
+                case 11: // CONSTANT_InterfaceMethodref
+                case 12: // CONSTANT_NameAndType
+                case 17: // CONSTANT_Dynamic
+                case 18: // CONSTANT_InvokeDynamic
+                    currentOffset += 5;
+                    break;
+                case 5: // CONSTANT_Long
+                case 6: // CONSTANT_Double
+                    currentOffset += 9;
+                    i++; // Double slot
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unknown constant pool tag: " + tag);
+            }
+        }
+        currentOffset += 2; // Skip access flags
+        currentOffset += 2; // Skip this class
+        currentOffset += 2; // Skip super class
+        int interfacesCount = readUnsignedShort(classFileBytes, currentOffset);
+        currentOffset += 2 + interfacesCount * 2; // Skip interfaces
+        // skip fields
+        currentOffset = skipFieldsOrMethods(classFileBytes, currentOffset);
+        // skip Methods
+        currentOffset = skipFieldsOrMethods(classFileBytes, currentOffset);
+        int attributesCount = readUnsignedShort(classFileBytes, currentOffset);
+        currentOffset += 2; // Skip attributes count
+        for (int i = 0; i < attributesCount; i++) {
+            int attributeNameIndex = readUnsignedShort(classFileBytes, currentOffset);
+            currentOffset += 2; // Skip attribute name index
+            int attributeLength = (int) readUnsignedInt(classFileBytes, currentOffset);
+            currentOffset += 4; // Skip attribute length
+            if (attributeNameIndex == 0) {
+                continue;
+            }
+            // read attribute name
+            int utf8Offset = constantPoolOffsets[attributeNameIndex - 1];
+            int utf8Len = readUnsignedShort(classFileBytes, utf8Offset + 1);
+            String utf8 = new String(classFileBytes, utf8Offset + 3, utf8Len, StandardCharsets.UTF_8);
+            if ("SourceFile".equals(utf8)) {
+                // read SourceFile attribute
+                int sourceFileIndex = readUnsignedShort(classFileBytes, currentOffset);
+                int sourceFileOffset = constantPoolOffsets[sourceFileIndex - 1];
+                int sourceFileLen = readUnsignedShort(classFileBytes, sourceFileOffset + 1);
+                return new String(classFileBytes, sourceFileOffset + 3, sourceFileLen, StandardCharsets.UTF_8);
+            }
+            currentOffset += attributeLength; // Skip attribute data
+        }
+        return null;
     }
-    return null;
-  }
 
-  private static int skipFieldsOrMethods(byte[] classFileBytes, int currentOffset) {
-    int fieldsCount = readUnsignedShort(classFileBytes, currentOffset);
-    currentOffset += 2; // Skip count
-    for (int i = 0; i < fieldsCount; i++) {
-      currentOffset += 6; // Skip access flags, name index, descriptor index
-      int attributesCount = readUnsignedShort(classFileBytes, currentOffset);
-      currentOffset += 2; // Skip attributes count
-      for (int j = 0; j < attributesCount; j++) {
-        currentOffset += 2; // Skip attribute name index
-        int attributeLength = (int) readUnsignedInt(classFileBytes, currentOffset);
-        currentOffset += 4 + attributeLength; // Skip attribute length and data
-      }
+    private static int skipFieldsOrMethods(byte[] classFileBytes, int currentOffset) {
+        int fieldsCount = readUnsignedShort(classFileBytes, currentOffset);
+        currentOffset += 2; // Skip count
+        for (int i = 0; i < fieldsCount; i++) {
+            currentOffset += 6; // Skip access flags, name index, descriptor index
+            int attributesCount = readUnsignedShort(classFileBytes, currentOffset);
+            currentOffset += 2; // Skip attributes count
+            for (int j = 0; j < attributesCount; j++) {
+                currentOffset += 2; // Skip attribute name index
+                int attributeLength = (int) readUnsignedInt(classFileBytes, currentOffset);
+                currentOffset += 4 + attributeLength; // Skip attribute length and data
+            }
+        }
+        return currentOffset;
     }
-    return currentOffset;
-  }
 
-  // read unsigned short from byte array
-  private static int readUnsignedShort(byte[] bytes, int offset) {
-    return ((bytes[offset] & 0xFF) << 8) | (bytes[offset + 1] & 0xFF);
-  }
+    // read unsigned short from byte array
+    private static int readUnsignedShort(byte[] bytes, int offset) {
+        return ((bytes[offset] & 0xFF) << 8) | (bytes[offset + 1] & 0xFF);
+    }
 
-  // read unsigned int from byte array
-  private static long readUnsignedInt(byte[] bytes, int offset) {
-    return ((long) (bytes[offset] & 0xFF) << 24)
-        + ((bytes[offset + 1] & 0xFF) << 16)
-        + ((bytes[offset + 2] & 0xFF) << 8)
-        + (bytes[offset + 3] & 0xFF);
-  }
+    // read unsigned int from byte array
+    private static long readUnsignedInt(byte[] bytes, int offset) {
+        return ((long) (bytes[offset] & 0xFF) << 24)
+                + ((bytes[offset + 1] & 0xFF) << 16)
+                + ((bytes[offset + 2] & 0xFF) << 8)
+                + (bytes[offset + 3] & 0xFF);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassFileLines.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassFileLines.java
index 6d6aca41e7b..d971dfad858 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassFileLines.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassFileLines.java
@@ -12,51 +12,50 @@
 import org.objectweb.asm.tree.MethodNode;
 
 public class ClassFileLines {
-  private final Map<Integer, List<MethodNode>> methodByLine = new HashMap<>();
-  private final Map<String, Integer> methodStarts = new HashMap<>();
-  private final TreeMap<Integer, LabelNode> lineLabels = new TreeMap<>();
+    private final Map<Integer, List<MethodNode>> methodByLine = new HashMap<>();
+    private final Map<String, Integer> methodStarts = new HashMap<>();
+    private final TreeMap<Integer, LabelNode> lineLabels = new TreeMap<>();
 
-  public ClassFileLines(ClassNode classNode) {
-    for (MethodNode methodNode : classNode.methods) {
-      AbstractInsnNode currentNode = methodNode.instructions.getFirst();
-      while (currentNode != null) {
-        if (currentNode.getType() == AbstractInsnNode.LINE) {
-          LineNumberNode lineNode = (LineNumberNode) currentNode;
-          methodStarts.putIfAbsent(methodNode.name + methodNode.desc, lineNode.line);
-          // on the same line, we can have multiple methods (lambdas, inner classes, etc)
-          List<MethodNode> methodNodes =
-              methodByLine.computeIfAbsent(lineNode.line, k -> new ArrayList<>());
-          // We are not using a Set here to keep the order of the methods
-          // We assume also that the number of methods per line is small
-          if (!methodNodes.contains(methodNode)) {
-            methodNodes.add(methodNode);
-          }
-          // we are putting the line only the first time in the map.
-          // for-loops can generate 2 line nodes for the same line, 1 before the loop, 1 for the
-          // incrementation part.
-          // We consider here that we want to place the probe before the loop.
-          lineLabels.putIfAbsent(lineNode.line, lineNode.start);
+    public ClassFileLines(ClassNode classNode) {
+        for (MethodNode methodNode : classNode.methods) {
+            AbstractInsnNode currentNode = methodNode.instructions.getFirst();
+            while (currentNode != null) {
+                if (currentNode.getType() == AbstractInsnNode.LINE) {
+                    LineNumberNode lineNode = (LineNumberNode) currentNode;
+                    methodStarts.putIfAbsent(methodNode.name + methodNode.desc, lineNode.line);
+                    // on the same line, we can have multiple methods (lambdas, inner classes, etc)
+                    List<MethodNode> methodNodes = methodByLine.computeIfAbsent(lineNode.line, k -> new ArrayList<>());
+                    // We are not using a Set here to keep the order of the methods
+                    // We assume also that the number of methods per line is small
+                    if (!methodNodes.contains(methodNode)) {
+                        methodNodes.add(methodNode);
+                    }
+                    // we are putting the line only the first time in the map.
+                    // for-loops can generate 2 line nodes for the same line, 1 before the loop, 1 for the
+                    // incrementation part.
+                    // We consider here that we want to place the probe before the loop.
+                    lineLabels.putIfAbsent(lineNode.line, lineNode.start);
+                }
+                currentNode = currentNode.getNext();
+            }
         }
-        currentNode = currentNode.getNext();
-      }
     }
-  }
 
-  public int getMethodStart(MethodNode node) {
-    return methodStarts.getOrDefault(node.name + node.desc, -1);
-  }
+    public int getMethodStart(MethodNode node) {
+        return methodStarts.getOrDefault(node.name + node.desc, -1);
+    }
 
-  public List<MethodNode> getMethodsByLine(int line) {
-    return methodByLine.get(line);
-  }
+    public List<MethodNode> getMethodsByLine(int line) {
+        return methodByLine.get(line);
+    }
 
-  public LabelNode getLineLabel(int line) {
-    Map.Entry<Integer, LabelNode> nextLine = lineLabels.ceilingEntry(line);
-    if (nextLine == null) return null;
-    return nextLine.getValue();
-  }
+    public LabelNode getLineLabel(int line) {
+        Map.Entry<Integer, LabelNode> nextLine = lineLabels.ceilingEntry(line);
+        if (nextLine == null) return null;
+        return nextLine.getValue();
+    }
 
-  public boolean isEmpty() {
-    return lineLabels.isEmpty();
-  }
+    public boolean isEmpty() {
+        return lineLabels.isEmpty();
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassNameFiltering.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassNameFiltering.java
index 2fe3681b12a..940de31e101 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassNameFiltering.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassNameFiltering.java
@@ -10,64 +10,62 @@
 
 /** A class to filter out classes based on their package name. */
 public class ClassNameFiltering implements ClassNameFilter {
-  private static final Pattern LAMBDA_PROXY_CLASS_PATTERN = Pattern.compile(".*\\$\\$Lambda.*/.*");
+    private static final Pattern LAMBDA_PROXY_CLASS_PATTERN = Pattern.compile(".*\\$\\$Lambda.*/.*");
 
-  private final ClassNameTrie includeTrie;
-  private final ClassNameTrie excludeTrie;
-  private final ClassNameTrie shadingTrie;
+    private final ClassNameTrie includeTrie;
+    private final ClassNameTrie excludeTrie;
+    private final ClassNameTrie shadingTrie;
 
-  public ClassNameFiltering(Config config) {
-    this(
-        ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(config),
-        ThirdPartyLibraries.INSTANCE.getThirdPartyExcludes(config),
-        ThirdPartyLibraries.INSTANCE.getShadingIdentifiers(config));
-  }
+    public ClassNameFiltering(Config config) {
+        this(
+                ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(config),
+                ThirdPartyLibraries.INSTANCE.getThirdPartyExcludes(config),
+                ThirdPartyLibraries.INSTANCE.getShadingIdentifiers(config));
+    }
 
-  public ClassNameFiltering(Set<String> excludes) {
-    this(excludes, Collections.emptySet(), Collections.emptySet());
-  }
+    public ClassNameFiltering(Set<String> excludes) {
+        this(excludes, Collections.emptySet(), Collections.emptySet());
+    }
 
-  public ClassNameFiltering(
-      Set<String> excludes, Set<String> includes, Set<String> shadingIdentifiers) {
-    ClassNameTrie.Builder excludeBuilder = new ClassNameTrie.Builder();
-    excludes.forEach(s -> excludeBuilder.put(s + "*", 1));
-    this.excludeTrie = excludeBuilder.buildTrie();
-    ClassNameTrie.Builder includeBuilder = new ClassNameTrie.Builder();
-    includes.forEach(s -> includeBuilder.put(s + "*", 1));
-    this.includeTrie = includeBuilder.buildTrie();
-    ClassNameTrie.Builder shadingBuilder = new ClassNameTrie.Builder();
-    shadingIdentifiers.forEach(s -> shadingBuilder.put(s + "*", 1));
-    this.shadingTrie = shadingBuilder.buildTrie();
-  }
+    public ClassNameFiltering(Set<String> excludes, Set<String> includes, Set<String> shadingIdentifiers) {
+        ClassNameTrie.Builder excludeBuilder = new ClassNameTrie.Builder();
+        excludes.forEach(s -> excludeBuilder.put(s + "*", 1));
+        this.excludeTrie = excludeBuilder.buildTrie();
+        ClassNameTrie.Builder includeBuilder = new ClassNameTrie.Builder();
+        includes.forEach(s -> includeBuilder.put(s + "*", 1));
+        this.includeTrie = includeBuilder.buildTrie();
+        ClassNameTrie.Builder shadingBuilder = new ClassNameTrie.Builder();
+        shadingIdentifiers.forEach(s -> shadingBuilder.put(s + "*", 1));
+        this.shadingTrie = shadingBuilder.buildTrie();
+    }
 
-  // className is the fully qualified class name with '.' (Java type) notation
-  public boolean isExcluded(String className) {
-    int shadedIdx = shadedIndexOf(className);
-    shadedIdx = Math.max(shadedIdx, 0);
-    return (includeTrie.apply(className, shadedIdx) < 0
-            && excludeTrie.apply(className, shadedIdx) > 0)
-        || isLambdaProxyClass(className);
-  }
+    // className is the fully qualified class name with '.' (Java type) notation
+    public boolean isExcluded(String className) {
+        int shadedIdx = shadedIndexOf(className);
+        shadedIdx = Math.max(shadedIdx, 0);
+        return (includeTrie.apply(className, shadedIdx) < 0 && excludeTrie.apply(className, shadedIdx) > 0)
+                || isLambdaProxyClass(className);
+    }
 
-  static boolean isLambdaProxyClass(String className) {
-    return className.contains("Lambda") && LAMBDA_PROXY_CLASS_PATTERN.matcher(className).matches();
-  }
+    static boolean isLambdaProxyClass(String className) {
+        return className.contains("Lambda")
+                && LAMBDA_PROXY_CLASS_PATTERN.matcher(className).matches();
+    }
 
-  int shadedIndexOf(String className) {
-    int idx = 0;
-    int previousIdx = 0;
-    while ((idx = className.indexOf('.', previousIdx)) > 0) {
-      if (shadingTrie.apply(className, previousIdx) > 0) {
-        return idx + 1;
-      }
-      idx++;
-      previousIdx = idx;
+    int shadedIndexOf(String className) {
+        int idx = 0;
+        int previousIdx = 0;
+        while ((idx = className.indexOf('.', previousIdx)) > 0) {
+            if (shadingTrie.apply(className, previousIdx) > 0) {
+                return idx + 1;
+            }
+            idx++;
+            previousIdx = idx;
+        }
+        return -1;
     }
-    return -1;
-  }
 
-  public static ClassNameFiltering allowAll() {
-    return new ClassNameFiltering(
-        Collections.emptySet(), Collections.emptySet(), Collections.emptySet());
-  }
+    public static ClassNameFiltering allowAll() {
+        return new ClassNameFiltering(Collections.emptySet(), Collections.emptySet(), Collections.emptySet());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/DebuggerInternalPackages.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/DebuggerInternalPackages.java
index 62179714b75..c7687ad4501 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/DebuggerInternalPackages.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/DebuggerInternalPackages.java
@@ -2,32 +2,32 @@
 
 /** Identifies class files belonging to the debugger's own internal packages. */
 public class DebuggerInternalPackages {
-  private static final String[] SKIPPED_PACKAGES = {
-    "com/datadog/debugger/agent/",
-    "com/datadog/debugger/codeorigin/",
-    "com/datadog/debugger/exception/",
-    "com/datadog/debugger/instrumentation/",
-    "com/datadog/debugger/probe/",
-    "com/datadog/debugger/sink/",
-    "com/datadog/debugger/symbol/",
-    "com/datadog/debugger/uploader/",
-    "com/datadog/debugger/util/"
-  };
+    private static final String[] SKIPPED_PACKAGES = {
+        "com/datadog/debugger/agent/",
+        "com/datadog/debugger/codeorigin/",
+        "com/datadog/debugger/exception/",
+        "com/datadog/debugger/instrumentation/",
+        "com/datadog/debugger/probe/",
+        "com/datadog/debugger/sink/",
+        "com/datadog/debugger/symbol/",
+        "com/datadog/debugger/uploader/",
+        "com/datadog/debugger/util/"
+    };
 
-  /**
-   * @param classFilePath slash-separated class file path (e.g. "com/datadog/debugger/agent/Foo")
-   * @return true if the class belongs to a debugger-internal package that must never be
-   *     re-transformed/parsed, to avoid a re-entrant LinkageError while it is being loaded.
-   */
-  public static boolean isDebuggerInternalClass(String classFilePath) {
-    if (classFilePath == null || !classFilePath.startsWith("com/datadog/debugger/")) {
-      return false;
+    /**
+     * @param classFilePath slash-separated class file path (e.g. "com/datadog/debugger/agent/Foo")
+     * @return true if the class belongs to a debugger-internal package that must never be
+     *     re-transformed/parsed, to avoid a re-entrant LinkageError while it is being loaded.
+     */
+    public static boolean isDebuggerInternalClass(String classFilePath) {
+        if (classFilePath == null || !classFilePath.startsWith("com/datadog/debugger/")) {
+            return false;
+        }
+        for (String pkg : SKIPPED_PACKAGES) {
+            if (classFilePath.startsWith(pkg)) {
+                return true;
+            }
+        }
+        return false;
     }
-    for (String pkg : SKIPPED_PACKAGES) {
-      if (classFilePath.startsWith(pkg)) {
-        return true;
-      }
-    }
-    return false;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/DebuggerMetrics.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/DebuggerMetrics.java
index 098c183c849..68664d156c0 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/DebuggerMetrics.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/DebuggerMetrics.java
@@ -8,95 +8,94 @@
 /** implements a StatsD client for internal debugger agent metrics */
 public class DebuggerMetrics implements StatsDClient {
 
-  private static DebuggerMetrics INSTANCE = null;
+    private static DebuggerMetrics INSTANCE = null;
 
-  private static final String STATSD_NAMESPACE_PREFIX = "datadog.debugger";
+    private static final String STATSD_NAMESPACE_PREFIX = "datadog.debugger";
 
-  private final StatsDClient statsd;
+    private final StatsDClient statsd;
 
-  private DebuggerMetrics(Config config) {
-    if (config.isDynamicInstrumentationMetricsEnabled()) {
+    private DebuggerMetrics(Config config) {
+        if (config.isDynamicInstrumentationMetricsEnabled()) {
 
-      statsd =
-          DDAgentStatsDClientManager.statsDClientManager()
-              .statsDClient(
-                  config.getJmxFetchStatsdHost(),
-                  config.getJmxFetchStatsdPort(),
-                  config.getDogStatsDNamedPipe(),
-                  STATSD_NAMESPACE_PREFIX,
-                  new String[0]);
-    } else {
-      statsd = StatsDClient.NO_OP;
+            statsd = DDAgentStatsDClientManager.statsDClientManager()
+                    .statsDClient(
+                            config.getJmxFetchStatsdHost(),
+                            config.getJmxFetchStatsdPort(),
+                            config.getDogStatsDNamedPipe(),
+                            STATSD_NAMESPACE_PREFIX,
+                            new String[0]);
+        } else {
+            statsd = StatsDClient.NO_OP;
+        }
     }
-  }
-
-  @SuppressFBWarnings(
-      value = {"USO_UNSAFE_METHOD_SYNCHRONIZATION", "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION"},
-      justification = "Agent-internal singleton; neither Class object nor instance monitor escapes")
-  public static synchronized DebuggerMetrics getInstance(Config config) {
-    if (INSTANCE == null) {
-      INSTANCE = new DebuggerMetrics(config);
+
+    @SuppressFBWarnings(
+            value = {"USO_UNSAFE_METHOD_SYNCHRONIZATION", "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION"},
+            justification = "Agent-internal singleton; neither Class object nor instance monitor escapes")
+    public static synchronized DebuggerMetrics getInstance(Config config) {
+        if (INSTANCE == null) {
+            INSTANCE = new DebuggerMetrics(config);
+        }
+        return INSTANCE;
+    }
+
+    @Override
+    public void incrementCounter(String metricName, String... tags) {
+        statsd.incrementCounter(metricName, tags);
+    }
+
+    @Override
+    public void count(String metricName, long delta, String... tags) {
+        statsd.count(metricName, delta, tags);
+    }
+
+    @Override
+    public void gauge(String metricName, long value, String... tags) {
+        statsd.gauge(metricName, value, tags);
+    }
+
+    @Override
+    public void gauge(String metricName, double value, String... tags) {
+        statsd.gauge(metricName, value, tags);
+    }
+
+    @Override
+    public void histogram(String metricName, long value, String... tags) {
+        statsd.histogram(metricName, value, tags);
+    }
+
+    @Override
+    public void histogram(String metricName, double value, String... tags) {
+        statsd.histogram(metricName, value, tags);
+    }
+
+    @Override
+    public void distribution(String metricName, long value, String... tags) {
+        statsd.distribution(metricName, value, tags);
+    }
+
+    @Override
+    public void distribution(String metricName, double value, String... tags) {
+        statsd.distribution(metricName, value, tags);
+    }
+
+    @Override
+    public void serviceCheck(String serviceCheckName, String status, String message, String... tags) {
+        statsd.serviceCheck(serviceCheckName, status, message, tags);
+    }
+
+    @Override
+    public void error(Exception error) {
+        statsd.error(error);
+    }
+
+    @Override
+    public int getErrorCount() {
+        return statsd.getErrorCount();
+    }
+
+    @Override
+    public void close() {
+        statsd.close();
     }
-    return INSTANCE;
-  }
-
-  @Override
-  public void incrementCounter(String metricName, String... tags) {
-    statsd.incrementCounter(metricName, tags);
-  }
-
-  @Override
-  public void count(String metricName, long delta, String... tags) {
-    statsd.count(metricName, delta, tags);
-  }
-
-  @Override
-  public void gauge(String metricName, long value, String... tags) {
-    statsd.gauge(metricName, value, tags);
-  }
-
-  @Override
-  public void gauge(String metricName, double value, String... tags) {
-    statsd.gauge(metricName, value, tags);
-  }
-
-  @Override
-  public void histogram(String metricName, long value, String... tags) {
-    statsd.histogram(metricName, value, tags);
-  }
-
-  @Override
-  public void histogram(String metricName, double value, String... tags) {
-    statsd.histogram(metricName, value, tags);
-  }
-
-  @Override
-  public void distribution(String metricName, long value, String... tags) {
-    statsd.distribution(metricName, value, tags);
-  }
-
-  @Override
-  public void distribution(String metricName, double value, String... tags) {
-    statsd.distribution(metricName, value, tags);
-  }
-
-  @Override
-  public void serviceCheck(String serviceCheckName, String status, String message, String... tags) {
-    statsd.serviceCheck(serviceCheckName, status, message, tags);
-  }
-
-  @Override
-  public void error(Exception error) {
-    statsd.error(error);
-  }
-
-  @Override
-  public int getErrorCount() {
-    return statsd.getErrorCount();
-  }
-
-  @Override
-  public void close() {
-    statsd.close();
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ExceptionHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ExceptionHelper.java
index b4ca9e2a4e2..fd12c972590 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ExceptionHelper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ExceptionHelper.java
@@ -12,124 +12,120 @@
 
 /** Helper class for rate limiting & logging exceptions */
 public class ExceptionHelper {
-  private static final Object[] EMPTY_ARRAY = new Object[0];
+    private static final Object[] EMPTY_ARRAY = new Object[0];
 
-  public static void logException(Logger log, Throwable ex, String message, Object... params) {
-    if (log.isDebugEnabled()) {
-      if (params == null) {
-        params = EMPTY_ARRAY;
-      }
-      Object[] fullParams = Arrays.copyOf(params, params.length + 1);
-      fullParams[params.length] = ex;
-      log.debug(message, fullParams);
-    } else {
-      log.warn(message + " " + ex.toString(), params);
+    public static void logException(Logger log, Throwable ex, String message, Object... params) {
+        if (log.isDebugEnabled()) {
+            if (params == null) {
+                params = EMPTY_ARRAY;
+            }
+            Object[] fullParams = Arrays.copyOf(params, params.length + 1);
+            fullParams[params.length] = ex;
+            log.debug(message, fullParams);
+        } else {
+            log.warn(message + " " + ex.toString(), params);
+        }
     }
-  }
 
-  public static void rateLimitedLogException(
-      RatelimitedLogger ratelimitedLogger,
-      Logger log,
-      Throwable ex,
-      String message,
-      Object... params) {
-    if (log.isDebugEnabled()) {
-      logException(log, ex, message, params);
-    } else {
-      ratelimitedLogger.warn(message + " " + ex.toString(), params);
+    public static void rateLimitedLogException(
+            RatelimitedLogger ratelimitedLogger, Logger log, Throwable ex, String message, Object... params) {
+        if (log.isDebugEnabled()) {
+            logException(log, ex, message, params);
+        } else {
+            ratelimitedLogger.warn(message + " " + ex.toString(), params);
+        }
     }
-  }
-
-  public static String foldExceptionStackTrace(Throwable t) {
-    StringWriter writer = new StringWriter();
-    t.printStackTrace(new NoNewLinePrintWriter(writer));
-    return writer.toString();
-  }
 
-  private static class NoNewLinePrintWriter extends PrintWriter {
-    public NoNewLinePrintWriter(Writer out) {
-      super(out);
+    public static String foldExceptionStackTrace(Throwable t) {
+        StringWriter writer = new StringWriter();
+        t.printStackTrace(new NoNewLinePrintWriter(writer));
+        return writer.toString();
     }
 
-    @Override
-    public void println() {}
-
-    @Override
-    public void write(String s, int off, int len) {
-      super.write(s.replace('\t', ' '), off, len);
-    }
-  }
+    private static class NoNewLinePrintWriter extends PrintWriter {
+        public NoNewLinePrintWriter(Writer out) {
+            super(out);
+        }
 
-  public static Throwable getInnerMostThrowable(Throwable t) {
-    return getInnerMostThrowable(t, null);
-  }
+        @Override
+        public void println() {}
 
-  public static Throwable getInnerMostThrowable(Throwable t, Deque<Throwable> chainedExceptions) {
-    if (chainedExceptions != null) {
-      chainedExceptions.addFirst(t);
-    }
-    // putting an arbitrary limit to avoid infinite loops with cycling causes
-    int i = 100;
-    while (t.getCause() != null && i > 0) {
-      t = t.getCause();
-      if (chainedExceptions != null) {
-        chainedExceptions.addFirst(t);
-      }
-      i--;
-    }
-    if (i == 0) {
-      return null;
+        @Override
+        public void write(String s, int off, int len) {
+            super.write(s.replace('\t', ' '), off, len);
+        }
     }
-    return t;
-  }
 
-  public static StackTraceElement[] flattenStackTrace(Throwable t) {
-    List<StackTraceElement> result = new ArrayList<>();
-    result.addAll(Arrays.asList(t.getStackTrace()));
-    if (t.getCause() != null) {
-      internalFlattenStackTrace(t.getCause(), t.getStackTrace(), result);
+    public static Throwable getInnerMostThrowable(Throwable t) {
+        return getInnerMostThrowable(t, null);
     }
-    return result.toArray(new StackTraceElement[0]);
-  }
 
-  private static void internalFlattenStackTrace(
-      Throwable t, StackTraceElement[] enclosingTrace, List<StackTraceElement> elements) {
-    StackTraceElement[] trace = t.getStackTrace();
-    int m = trace.length - 1;
-    int n = enclosingTrace.length - 1;
-    while (m >= 0 && n >= 0 && trace[m].equals(enclosingTrace[n])) {
-      m--;
-      n--;
+    public static Throwable getInnerMostThrowable(Throwable t, Deque<Throwable> chainedExceptions) {
+        if (chainedExceptions != null) {
+            chainedExceptions.addFirst(t);
+        }
+        // putting an arbitrary limit to avoid infinite loops with cycling causes
+        int i = 100;
+        while (t.getCause() != null && i > 0) {
+            t = t.getCause();
+            if (chainedExceptions != null) {
+                chainedExceptions.addFirst(t);
+            }
+            i--;
+        }
+        if (i == 0) {
+            return null;
+        }
+        return t;
     }
-    for (int i = 0; i <= m; i++) {
-      elements.add(trace[i]);
+
+    public static StackTraceElement[] flattenStackTrace(Throwable t) {
+        List<StackTraceElement> result = new ArrayList<>();
+        result.addAll(Arrays.asList(t.getStackTrace()));
+        if (t.getCause() != null) {
+            internalFlattenStackTrace(t.getCause(), t.getStackTrace(), result);
+        }
+        return result.toArray(new StackTraceElement[0]);
     }
-    if (t.getCause() != null) {
-      internalFlattenStackTrace(t.getCause(), trace, elements);
+
+    private static void internalFlattenStackTrace(
+            Throwable t, StackTraceElement[] enclosingTrace, List<StackTraceElement> elements) {
+        StackTraceElement[] trace = t.getStackTrace();
+        int m = trace.length - 1;
+        int n = enclosingTrace.length - 1;
+        while (m >= 0 && n >= 0 && trace[m].equals(enclosingTrace[n])) {
+            m--;
+            n--;
+        }
+        for (int i = 0; i <= m; i++) {
+            elements.add(trace[i]);
+        }
+        if (t.getCause() != null) {
+            internalFlattenStackTrace(t.getCause(), trace, elements);
+        }
     }
-  }
 
-  // Because flattened stack traces are organized with first frames at the bottom I need to follow
-  // the order of the first frame and wrap around the array with a modulo to continue the matching
-  public static int[] createThrowableMapping(Throwable innerMost, Throwable current) {
-    StackTraceElement[] innerTrace = innerMost.getStackTrace();
-    StackTraceElement[] currentTrace = flattenStackTrace(current);
-    int[] mapping = new int[innerTrace.length];
-    int currentIdx = 0;
-    for (int i = 0; i < innerTrace.length; i++) {
-      mapping[i] = -1;
-      int count = currentTrace.length;
-      int idx = currentIdx;
-      while (count > 0) {
-        if (innerTrace[i].equals(currentTrace[idx])) {
-          mapping[i] = idx;
-          currentIdx = (idx + 1) % currentTrace.length;
-          break;
+    // Because flattened stack traces are organized with first frames at the bottom I need to follow
+    // the order of the first frame and wrap around the array with a modulo to continue the matching
+    public static int[] createThrowableMapping(Throwable innerMost, Throwable current) {
+        StackTraceElement[] innerTrace = innerMost.getStackTrace();
+        StackTraceElement[] currentTrace = flattenStackTrace(current);
+        int[] mapping = new int[innerTrace.length];
+        int currentIdx = 0;
+        for (int i = 0; i < innerTrace.length; i++) {
+            mapping[i] = -1;
+            int count = currentTrace.length;
+            int idx = currentIdx;
+            while (count > 0) {
+                if (innerTrace[i].equals(currentTrace[idx])) {
+                    mapping[i] = idx;
+                    currentIdx = (idx + 1) % currentTrace.length;
+                    break;
+                }
+                idx = (idx + 1) % currentTrace.length;
+                count--;
+            }
         }
-        idx = (idx + 1) % currentTrace.length;
-        count--;
-      }
+        return mapping;
     }
-    return mapping;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/JvmLanguage.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/JvmLanguage.java
index 38dd63da0d7..539adc818fd 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/JvmLanguage.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/JvmLanguage.java
@@ -1,28 +1,28 @@
 package com.datadog.debugger.util;
 
 public enum JvmLanguage {
-  JAVA,
-  KOTLIN,
-  SCALA,
-  GROOVY,
-  UNKNOWN;
+    JAVA,
+    KOTLIN,
+    SCALA,
+    GROOVY,
+    UNKNOWN;
 
-  public static JvmLanguage of(String sourceFile) {
-    if (sourceFile == null) {
-      return UNKNOWN;
+    public static JvmLanguage of(String sourceFile) {
+        if (sourceFile == null) {
+            return UNKNOWN;
+        }
+        if (sourceFile.endsWith(".java")) {
+            return JAVA;
+        }
+        if (sourceFile.endsWith(".kt")) {
+            return KOTLIN;
+        }
+        if (sourceFile.endsWith(".scala")) {
+            return SCALA;
+        }
+        if (sourceFile.endsWith(".groovy")) {
+            return GROOVY;
+        }
+        return UNKNOWN;
     }
-    if (sourceFile.endsWith(".java")) {
-      return JAVA;
-    }
-    if (sourceFile.endsWith(".kt")) {
-      return KOTLIN;
-    }
-    if (sourceFile.endsWith(".scala")) {
-      return SCALA;
-    }
-    if (sourceFile.endsWith(".groovy")) {
-      return GROOVY;
-    }
-    return UNKNOWN;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiHelper.java
index 94d11367ce3..3d38b0df8d5 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiHelper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiHelper.java
@@ -17,45 +17,45 @@
 /** Helper for creating Moshi instances with the right adapters depending on the context */
 public class MoshiHelper {
 
-  public static Moshi createMoshiConfig() {
-    return createMoshiConfigBuilder().build();
-  }
-
-  public static Moshi.Builder createMoshiConfigBuilder() {
-    ProbeCondition.ProbeConditionJsonAdapter probeConditionJsonAdapter =
-        new ProbeCondition.ProbeConditionJsonAdapter();
-    return new Moshi.Builder()
-        .add(ProbeCondition.class, probeConditionJsonAdapter)
-        .add(DebuggerScript.class, probeConditionJsonAdapter)
-        .add(ValueScript.class, new ValueScript.ValueScriptAdapter())
-        .add(LogProbe.Segment.class, new LogProbe.Segment.SegmentJsonAdapter())
-        .add(Where.SourceLine[].class, new Where.SourceLineAdapter())
-        .add(ProbeDefinition.Tag[].class, new ProbeDefinition.TagAdapter());
-  }
-
-  public static Moshi createMoshiSnapshot(Duration captureTimeOut) {
-    return new Moshi.Builder()
-        .add(new MoshiSnapshotHelper.SnapshotJsonFactory(captureTimeOut))
-        .add(
-            DebuggerScript.class,
-            new ProbeCondition.ProbeConditionJsonAdapter()) // ProbeDetails in Snapshot
-        .build();
-  }
-
-  public static Moshi createMoshiProbeStatus() {
-    return new Moshi.Builder().add(new ProbeStatus.DiagnosticsFactory()).build();
-  }
-
-  public static JsonAdapter<Map<String, Object>> createGenericAdapter() {
-    ParameterizedType type = Types.newParameterizedType(Map.class, String.class, Object.class);
-    return new Moshi.Builder().build().adapter(type);
-  }
-
-  public static Moshi createMoshiSymbol() {
-    return new Moshi.Builder().build();
-  }
-
-  public static Moshi createMoshiWatches() {
-    return new Moshi.Builder().add(ValueScript.class, new ValueScript.ValueScriptAdapter()).build();
-  }
+    public static Moshi createMoshiConfig() {
+        return createMoshiConfigBuilder().build();
+    }
+
+    public static Moshi.Builder createMoshiConfigBuilder() {
+        ProbeCondition.ProbeConditionJsonAdapter probeConditionJsonAdapter =
+                new ProbeCondition.ProbeConditionJsonAdapter();
+        return new Moshi.Builder()
+                .add(ProbeCondition.class, probeConditionJsonAdapter)
+                .add(DebuggerScript.class, probeConditionJsonAdapter)
+                .add(ValueScript.class, new ValueScript.ValueScriptAdapter())
+                .add(LogProbe.Segment.class, new LogProbe.Segment.SegmentJsonAdapter())
+                .add(Where.SourceLine[].class, new Where.SourceLineAdapter())
+                .add(ProbeDefinition.Tag[].class, new ProbeDefinition.TagAdapter());
+    }
+
+    public static Moshi createMoshiSnapshot(Duration captureTimeOut) {
+        return new Moshi.Builder()
+                .add(new MoshiSnapshotHelper.SnapshotJsonFactory(captureTimeOut))
+                .add(DebuggerScript.class, new ProbeCondition.ProbeConditionJsonAdapter()) // ProbeDetails in Snapshot
+                .build();
+    }
+
+    public static Moshi createMoshiProbeStatus() {
+        return new Moshi.Builder().add(new ProbeStatus.DiagnosticsFactory()).build();
+    }
+
+    public static JsonAdapter<Map<String, Object>> createGenericAdapter() {
+        ParameterizedType type = Types.newParameterizedType(Map.class, String.class, Object.class);
+        return new Moshi.Builder().build().adapter(type);
+    }
+
+    public static Moshi createMoshiSymbol() {
+        return new Moshi.Builder().build();
+    }
+
+    public static Moshi createMoshiWatches() {
+        return new Moshi.Builder()
+                .add(ValueScript.class, new ValueScript.ValueScriptAdapter())
+                .build();
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiSnapshotHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiSnapshotHelper.java
index 5bbb2d05ca3..e451d04b74f 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiSnapshotHelper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiSnapshotHelper.java
@@ -31,574 +31,544 @@
 
 /** Helper for creating Moshi adapters for (de)serializing snapshots */
 public class MoshiSnapshotHelper {
-  public static final String CAPTURES = "captures";
-  public static final String ENTRY = "entry";
-  public static final String RETURN = "return";
-  public static final String LINES = "lines";
-  public static final String CAUGHT_EXCEPTIONS = "caughtExceptions";
-  public static final String ARGUMENTS = "arguments";
-  public static final String LOCALS = "locals";
-  public static final String CAPTURE_EXPRESSIONS = "captureExpressions";
-  public static final String THROWABLE = "throwable";
-  public static final String STATIC_FIELDS = "staticFields";
-  public static final String THIS = "this";
-  public static final String NOT_CAPTURED_REASON = "notCapturedReason";
-  public static final String FIELD_COUNT_REASON = "fieldCount";
-  public static final String COLLECTION_SIZE_REASON = "collectionSize";
-  public static final String TIMEOUT_REASON = "timeout";
-  public static final String DEPTH_REASON = "depth";
-  public static final String REDACTED_IDENT_REASON = "redactedIdent";
-  public static final String REDACTED_TYPE_REASON = "redactedType";
-  public static final String REDACTED_STRING = "redacted";
-  public static final String TYPE = "type";
-  public static final String VALUE = "value";
-  public static final String FIELDS = "fields";
-  public static final String ELEMENTS = "elements";
-  public static final String ENTRIES = "entries";
-  public static final String IS_NULL = "isNull";
-  public static final String TRUNCATED = "truncated";
-  public static final String SIZE = "size";
-  public static final String ID = "id";
-  public static final String VERSION = "version";
-  public static final String LOCATION = "location";
-  public static final String MESSAGE = "message";
-  public static final String STACKTRACE = "stacktrace";
-
-  public static class SnapshotJsonFactory implements JsonAdapter.Factory {
-    private final Duration captureTimeOut;
-
-    public SnapshotJsonFactory(Duration captureTimeOut) {
-      this.captureTimeOut = captureTimeOut;
-    }
+    public static final String CAPTURES = "captures";
+    public static final String ENTRY = "entry";
+    public static final String RETURN = "return";
+    public static final String LINES = "lines";
+    public static final String CAUGHT_EXCEPTIONS = "caughtExceptions";
+    public static final String ARGUMENTS = "arguments";
+    public static final String LOCALS = "locals";
+    public static final String CAPTURE_EXPRESSIONS = "captureExpressions";
+    public static final String THROWABLE = "throwable";
+    public static final String STATIC_FIELDS = "staticFields";
+    public static final String THIS = "this";
+    public static final String NOT_CAPTURED_REASON = "notCapturedReason";
+    public static final String FIELD_COUNT_REASON = "fieldCount";
+    public static final String COLLECTION_SIZE_REASON = "collectionSize";
+    public static final String TIMEOUT_REASON = "timeout";
+    public static final String DEPTH_REASON = "depth";
+    public static final String REDACTED_IDENT_REASON = "redactedIdent";
+    public static final String REDACTED_TYPE_REASON = "redactedType";
+    public static final String REDACTED_STRING = "redacted";
+    public static final String TYPE = "type";
+    public static final String VALUE = "value";
+    public static final String FIELDS = "fields";
+    public static final String ELEMENTS = "elements";
+    public static final String ENTRIES = "entries";
+    public static final String IS_NULL = "isNull";
+    public static final String TRUNCATED = "truncated";
+    public static final String SIZE = "size";
+    public static final String ID = "id";
+    public static final String VERSION = "version";
+    public static final String LOCATION = "location";
+    public static final String MESSAGE = "message";
+    public static final String STACKTRACE = "stacktrace";
+
+    public static class SnapshotJsonFactory implements JsonAdapter.Factory {
+        private final Duration captureTimeOut;
+
+        public SnapshotJsonFactory(Duration captureTimeOut) {
+            this.captureTimeOut = captureTimeOut;
+        }
 
-    @Override
-    public JsonAdapter<?> create(Type type, Set<? extends Annotation> set, Moshi moshi) {
-      if (Types.equals(type, Snapshot.Captures.class)) {
-        return new CapturesAdapter(
-            moshi,
-            captureTimeOut,
-            new CapturedContextAdapter(
-                moshi, new CapturedValueAdapter(), new CapturedThrowableAdapter(moshi)));
-      }
-      if (Types.equals(type, CapturedContext.CapturedValue.class)) {
-        return new CapturedValueAdapter();
-      }
-      if (Types.equals(type, CapturedContext.class)) {
-        return new CapturedContextAdapter(
-            moshi, new CapturedValueAdapter(), new CapturedThrowableAdapter(moshi));
-      }
-      if (Types.equals(type, ProbeImplementation.class)) {
-        return new ProbeDetailsAdapter(moshi);
-      }
-      return null;
-    }
-  }
-
-  public static class CapturesAdapter extends JsonAdapter<Snapshot.Captures> {
-    protected final Duration captureTimeOut;
-    protected final JsonAdapter<CapturedContext> capturedContextAdapter;
-    protected final JsonAdapter<Map<Integer, CapturedContext>> linesAdapter;
-    protected final JsonAdapter<List<CapturedContext.CapturedThrowable>> caughtExceptionsAdapter;
-
-    public CapturesAdapter(
-        Moshi moshi, Duration captureTimeout, JsonAdapter<CapturedContext> capturedContextAdapter) {
-      this.capturedContextAdapter = capturedContextAdapter;
-      this.captureTimeOut = captureTimeout;
-      linesAdapter =
-          moshi.adapter(
-              Types.newParameterizedType(Map.class, Integer.class, CapturedContext.class));
-      caughtExceptionsAdapter =
-          moshi.adapter(
-              Types.newParameterizedType(List.class, CapturedContext.CapturedThrowable.class));
+        @Override
+        public JsonAdapter<?> create(Type type, Set<? extends Annotation> set, Moshi moshi) {
+            if (Types.equals(type, Snapshot.Captures.class)) {
+                return new CapturesAdapter(
+                        moshi,
+                        captureTimeOut,
+                        new CapturedContextAdapter(
+                                moshi, new CapturedValueAdapter(), new CapturedThrowableAdapter(moshi)));
+            }
+            if (Types.equals(type, CapturedContext.CapturedValue.class)) {
+                return new CapturedValueAdapter();
+            }
+            if (Types.equals(type, CapturedContext.class)) {
+                return new CapturedContextAdapter(
+                        moshi, new CapturedValueAdapter(), new CapturedThrowableAdapter(moshi));
+            }
+            if (Types.equals(type, ProbeImplementation.class)) {
+                return new ProbeDetailsAdapter(moshi);
+            }
+            return null;
+        }
     }
 
-    @Override
-    public void toJson(JsonWriter jsonWriter, Snapshot.Captures captures) throws IOException {
-      if (captures == null) {
-        jsonWriter.nullValue();
-        return;
-      }
-      jsonWriter.setTag(TimeoutChecker.class, TimeoutChecker.create(Config.get(), captureTimeOut));
-      jsonWriter.beginObject();
-      jsonWriter.name(ENTRY);
-      capturedContextAdapter.toJson(jsonWriter, captures.getEntry());
-      jsonWriter.name(LINES);
-      linesAdapter.toJson(jsonWriter, captures.getLines());
-      jsonWriter.name(RETURN);
-      capturedContextAdapter.toJson(jsonWriter, captures.getReturn());
-      jsonWriter.name(CAUGHT_EXCEPTIONS);
-      caughtExceptionsAdapter.toJson(jsonWriter, captures.getCaughtExceptions());
-      jsonWriter.endObject();
-    }
+    public static class CapturesAdapter extends JsonAdapter<Snapshot.Captures> {
+        protected final Duration captureTimeOut;
+        protected final JsonAdapter<CapturedContext> capturedContextAdapter;
+        protected final JsonAdapter<Map<Integer, CapturedContext>> linesAdapter;
+        protected final JsonAdapter<List<CapturedContext.CapturedThrowable>> caughtExceptionsAdapter;
+
+        public CapturesAdapter(
+                Moshi moshi, Duration captureTimeout, JsonAdapter<CapturedContext> capturedContextAdapter) {
+            this.capturedContextAdapter = capturedContextAdapter;
+            this.captureTimeOut = captureTimeout;
+            linesAdapter = moshi.adapter(Types.newParameterizedType(Map.class, Integer.class, CapturedContext.class));
+            caughtExceptionsAdapter =
+                    moshi.adapter(Types.newParameterizedType(List.class, CapturedContext.CapturedThrowable.class));
+        }
 
-    @Override
-    public Snapshot.Captures fromJson(JsonReader reader) throws IOException {
-      // Only used in test, see MoshiSnapshotTestHelper
-      throw new IllegalStateException("Should not reach this code.");
-    }
-  }
-
-  public static class CapturedContextAdapter extends JsonAdapter<CapturedContext> {
-    protected final JsonAdapter<CapturedContext.CapturedThrowable> throwableAdapter;
-    protected final JsonAdapter<CapturedContext.CapturedValue> valueAdapter;
-
-    public CapturedContextAdapter(
-        Moshi moshi,
-        JsonAdapter<CapturedContext.CapturedValue> valueAdapter,
-        CapturedThrowableAdapter throwableAdapter) {
-      this.valueAdapter = valueAdapter;
-      this.throwableAdapter = throwableAdapter;
-    }
+        @Override
+        public void toJson(JsonWriter jsonWriter, Snapshot.Captures captures) throws IOException {
+            if (captures == null) {
+                jsonWriter.nullValue();
+                return;
+            }
+            jsonWriter.setTag(TimeoutChecker.class, TimeoutChecker.create(Config.get(), captureTimeOut));
+            jsonWriter.beginObject();
+            jsonWriter.name(ENTRY);
+            capturedContextAdapter.toJson(jsonWriter, captures.getEntry());
+            jsonWriter.name(LINES);
+            linesAdapter.toJson(jsonWriter, captures.getLines());
+            jsonWriter.name(RETURN);
+            capturedContextAdapter.toJson(jsonWriter, captures.getReturn());
+            jsonWriter.name(CAUGHT_EXCEPTIONS);
+            caughtExceptionsAdapter.toJson(jsonWriter, captures.getCaughtExceptions());
+            jsonWriter.endObject();
+        }
 
-    @Override
-    public void toJson(JsonWriter jsonWriter, CapturedContext capturedContext) throws IOException {
-      if (capturedContext == null) {
-        jsonWriter.nullValue();
-        return;
-      }
-      TimeoutChecker timeoutChecker = jsonWriter.tag(TimeoutChecker.class);
-      if (timeoutChecker == null) {
-        Duration timeout =
-            Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout());
-        timeoutChecker = TimeoutChecker.create(Config.get(), timeout);
-      }
-      // need to 'freeze' the context before serializing it
-      capturedContext.freeze(timeoutChecker);
-      if (timeoutChecker.isTimedOut()) {
-        jsonWriter.beginObject();
-        jsonWriter.name(NOT_CAPTURED_REASON);
-        jsonWriter.value(TIMEOUT_REASON);
-        jsonWriter.endObject();
-        return;
-      }
-      jsonWriter.beginObject();
-      if (capturedContext.getCaptureExpressions() != null) {
-        // only capture expressions are serialized into the snapshot
-        jsonWriter.name(CAPTURE_EXPRESSIONS);
-        jsonWriter.beginObject();
-        SerializationResult resultCaptureExpressions =
-            toJsonCapturedValues(
-                jsonWriter,
-                capturedContext.getCaptureExpressions(),
-                capturedContext.getLimits(),
-                timeoutChecker);
-        jsonWriter.endObject(); // captureExpressions
-        handleSerializationResult(jsonWriter, resultCaptureExpressions);
-        jsonWriter.endObject();
-        return;
-      }
-      jsonWriter.name(ARGUMENTS);
-      jsonWriter.beginObject();
-      SerializationResult resultArgs =
-          toJsonCapturedValues(
-              jsonWriter,
-              capturedContext.getArguments(),
-              capturedContext.getLimits(),
-              timeoutChecker);
-      jsonWriter.endObject(); // ARGUMENTS
-      jsonWriter.name(LOCALS);
-      jsonWriter.beginObject();
-      SerializationResult resultLocals =
-          toJsonCapturedValues(
-              jsonWriter, capturedContext.getLocals(), capturedContext.getLimits(), timeoutChecker);
-      jsonWriter.endObject(); // LOCALS
-      jsonWriter.name(STATIC_FIELDS);
-      jsonWriter.beginObject();
-      SerializationResult resultStaticFields =
-          toJsonCapturedValues(
-              jsonWriter,
-              capturedContext.getStaticFields(),
-              capturedContext.getLimits(),
-              timeoutChecker);
-      jsonWriter.endObject();
-      handleSerializationResult(jsonWriter, resultLocals, resultArgs, resultStaticFields);
-      jsonWriter.name(THROWABLE);
-      throwableAdapter.toJson(jsonWriter, capturedContext.getCapturedThrowable());
-      jsonWriter.endObject();
+        @Override
+        public Snapshot.Captures fromJson(JsonReader reader) throws IOException {
+            // Only used in test, see MoshiSnapshotTestHelper
+            throw new IllegalStateException("Should not reach this code.");
+        }
     }
 
-    private void handleSerializationResult(JsonWriter jsonWriter, SerializationResult... results)
-        throws IOException {
-      boolean fieldCountReported = false;
-      boolean timeoutReported = false;
-      for (SerializationResult result : results) {
-        switch (result) {
-          case OK:
-            break;
-          case FIELD_COUNT:
-            {
-              if (!fieldCountReported) {
-                jsonWriter.name(NOT_CAPTURED_REASON);
-                jsonWriter.value(FIELD_COUNT_REASON);
-                fieldCountReported = true;
-              }
-              break;
-            }
-          case TIMEOUT:
-            {
-              if (!timeoutReported) {
+    public static class CapturedContextAdapter extends JsonAdapter<CapturedContext> {
+        protected final JsonAdapter<CapturedContext.CapturedThrowable> throwableAdapter;
+        protected final JsonAdapter<CapturedContext.CapturedValue> valueAdapter;
+
+        public CapturedContextAdapter(
+                Moshi moshi,
+                JsonAdapter<CapturedContext.CapturedValue> valueAdapter,
+                CapturedThrowableAdapter throwableAdapter) {
+            this.valueAdapter = valueAdapter;
+            this.throwableAdapter = throwableAdapter;
+        }
+
+        @Override
+        public void toJson(JsonWriter jsonWriter, CapturedContext capturedContext) throws IOException {
+            if (capturedContext == null) {
+                jsonWriter.nullValue();
+                return;
+            }
+            TimeoutChecker timeoutChecker = jsonWriter.tag(TimeoutChecker.class);
+            if (timeoutChecker == null) {
+                Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout());
+                timeoutChecker = TimeoutChecker.create(Config.get(), timeout);
+            }
+            // need to 'freeze' the context before serializing it
+            capturedContext.freeze(timeoutChecker);
+            if (timeoutChecker.isTimedOut()) {
+                jsonWriter.beginObject();
                 jsonWriter.name(NOT_CAPTURED_REASON);
                 jsonWriter.value(TIMEOUT_REASON);
-                timeoutReported = true;
-              }
-              break;
+                jsonWriter.endObject();
+                return;
+            }
+            jsonWriter.beginObject();
+            if (capturedContext.getCaptureExpressions() != null) {
+                // only capture expressions are serialized into the snapshot
+                jsonWriter.name(CAPTURE_EXPRESSIONS);
+                jsonWriter.beginObject();
+                SerializationResult resultCaptureExpressions = toJsonCapturedValues(
+                        jsonWriter,
+                        capturedContext.getCaptureExpressions(),
+                        capturedContext.getLimits(),
+                        timeoutChecker);
+                jsonWriter.endObject(); // captureExpressions
+                handleSerializationResult(jsonWriter, resultCaptureExpressions);
+                jsonWriter.endObject();
+                return;
             }
-          default:
-            throw new RuntimeException("Unsupported serialization result: " + result);
+            jsonWriter.name(ARGUMENTS);
+            jsonWriter.beginObject();
+            SerializationResult resultArgs = toJsonCapturedValues(
+                    jsonWriter, capturedContext.getArguments(), capturedContext.getLimits(), timeoutChecker);
+            jsonWriter.endObject(); // ARGUMENTS
+            jsonWriter.name(LOCALS);
+            jsonWriter.beginObject();
+            SerializationResult resultLocals = toJsonCapturedValues(
+                    jsonWriter, capturedContext.getLocals(), capturedContext.getLimits(), timeoutChecker);
+            jsonWriter.endObject(); // LOCALS
+            jsonWriter.name(STATIC_FIELDS);
+            jsonWriter.beginObject();
+            SerializationResult resultStaticFields = toJsonCapturedValues(
+                    jsonWriter, capturedContext.getStaticFields(), capturedContext.getLimits(), timeoutChecker);
+            jsonWriter.endObject();
+            handleSerializationResult(jsonWriter, resultLocals, resultArgs, resultStaticFields);
+            jsonWriter.name(THROWABLE);
+            throwableAdapter.toJson(jsonWriter, capturedContext.getCapturedThrowable());
+            jsonWriter.endObject();
         }
-      }
-    }
 
-    enum SerializationResult {
-      OK,
-      FIELD_COUNT,
-      TIMEOUT
-    }
-
-    /**
-     * @return true if all items where serialized or whether we reach the max field count
-     */
-    private SerializationResult toJsonCapturedValues(
-        JsonWriter jsonWriter,
-        Map<String, CapturedContext.CapturedValue> map,
-        Limits limits,
-        TimeoutChecker timeoutChecker)
-        throws IOException {
-      if (map == null) {
-        return SerializationResult.OK;
-      }
-      int count = 0;
-      for (Map.Entry<String, CapturedContext.CapturedValue> entry : map.entrySet()) {
-        if (count >= limits.maxFieldCount) {
-          return SerializationResult.FIELD_COUNT;
+        private void handleSerializationResult(JsonWriter jsonWriter, SerializationResult... results)
+                throws IOException {
+            boolean fieldCountReported = false;
+            boolean timeoutReported = false;
+            for (SerializationResult result : results) {
+                switch (result) {
+                    case OK:
+                        break;
+                    case FIELD_COUNT: {
+                        if (!fieldCountReported) {
+                            jsonWriter.name(NOT_CAPTURED_REASON);
+                            jsonWriter.value(FIELD_COUNT_REASON);
+                            fieldCountReported = true;
+                        }
+                        break;
+                    }
+                    case TIMEOUT: {
+                        if (!timeoutReported) {
+                            jsonWriter.name(NOT_CAPTURED_REASON);
+                            jsonWriter.value(TIMEOUT_REASON);
+                            timeoutReported = true;
+                        }
+                        break;
+                    }
+                    default:
+                        throw new RuntimeException("Unsupported serialization result: " + result);
+                }
+            }
         }
-        if (timeoutChecker.isTimedOut()) {
-          return SerializationResult.TIMEOUT;
+
+        enum SerializationResult {
+            OK,
+            FIELD_COUNT,
+            TIMEOUT
         }
-        jsonWriter.name(entry.getKey());
-        CapturedContext.CapturedValue capturedValue = entry.getValue();
-        jsonWriter.value(
-            Okio.buffer(
-                Okio.source(
-                    new ByteArrayInputStream(
-                        capturedValue.getStrValue().getBytes(StandardCharsets.UTF_8)))));
-        count++;
-      }
-      return SerializationResult.OK;
-    }
 
-    @Override
-    public CapturedContext fromJson(JsonReader reader) throws IOException {
-      // Only used in test, see MoshiSnapshotTestHelper
-      throw new IllegalStateException("Should not reach this code.");
-    }
-  }
-
-  public static class CapturedValueAdapter extends JsonAdapter<CapturedContext.CapturedValue> {
-    @Override
-    public void toJson(JsonWriter jsonWriter, CapturedContext.CapturedValue capturedValue)
-        throws IOException {
-      if (capturedValue == null) {
-        jsonWriter.nullValue();
-        return;
-      }
-      TimeoutChecker timeoutChecker = capturedValue.getTimeoutChecker();
-      if (timeoutChecker == null) {
-        timeoutChecker = TimeoutChecker.create(Config.get(), Duration.ofMillis(10));
-      }
-      Object value = capturedValue.getValue();
-      String type = capturedValue.getType();
-      Limits limits = capturedValue.getLimits();
-      SerializerWithLimits serializer =
-          new SerializerWithLimits(new JsonTokenWriter(jsonWriter), timeoutChecker);
-      try {
-        serializer.serialize(value, type, limits);
-      } catch (Exception ex) {
-        throw new IOException(ex);
-      }
-    }
+        /**
+         * @return true if all items where serialized or whether we reach the max field count
+         */
+        private SerializationResult toJsonCapturedValues(
+                JsonWriter jsonWriter,
+                Map<String, CapturedContext.CapturedValue> map,
+                Limits limits,
+                TimeoutChecker timeoutChecker)
+                throws IOException {
+            if (map == null) {
+                return SerializationResult.OK;
+            }
+            int count = 0;
+            for (Map.Entry<String, CapturedContext.CapturedValue> entry : map.entrySet()) {
+                if (count >= limits.maxFieldCount) {
+                    return SerializationResult.FIELD_COUNT;
+                }
+                if (timeoutChecker.isTimedOut()) {
+                    return SerializationResult.TIMEOUT;
+                }
+                jsonWriter.name(entry.getKey());
+                CapturedContext.CapturedValue capturedValue = entry.getValue();
+                jsonWriter.value(Okio.buffer(Okio.source(
+                        new ByteArrayInputStream(capturedValue.getStrValue().getBytes(StandardCharsets.UTF_8)))));
+                count++;
+            }
+            return SerializationResult.OK;
+        }
 
-    @Override
-    public CapturedContext.CapturedValue fromJson(JsonReader reader) throws IOException {
-      // Only used in test, see MoshiSnapshotTestHelper
-      throw new IllegalStateException("Should not reach this code.");
+        @Override
+        public CapturedContext fromJson(JsonReader reader) throws IOException {
+            // Only used in test, see MoshiSnapshotTestHelper
+            throw new IllegalStateException("Should not reach this code.");
+        }
     }
 
-    private static class JsonTokenWriter implements SerializerWithLimits.TokenWriter {
-      private static final Logger LOGGER = LoggerFactory.getLogger(JsonTokenWriter.class);
-
-      private final JsonWriter jsonWriter;
-
-      public JsonTokenWriter(JsonWriter jsonWriter) {
-        this.jsonWriter = jsonWriter;
-      }
-
-      @Override
-      public void prologue(Object value, String type) throws Exception {
-        jsonWriter.beginObject();
-        jsonWriter.name(TYPE);
-        jsonWriter.value(type);
-      }
-
-      @Override
-      public void epilogue(Object value) throws IOException {
-        jsonWriter.endObject();
-      }
-
-      @Override
-      public void nullValue() throws Exception {
-        jsonWriter.name(IS_NULL);
-        jsonWriter.value(true);
-      }
-
-      @Override
-      public void string(String value, boolean isComplete, int originalLength) throws Exception {
-        jsonWriter.name(VALUE);
-        jsonWriter.value(value);
-        if (!isComplete) {
-          jsonWriter.name(TRUNCATED);
-          jsonWriter.value(true);
-          jsonWriter.name(SIZE);
-          jsonWriter.value(String.valueOf(originalLength));
-        }
-      }
-
-      @Override
-      public void primitiveValue(Object value) throws Exception {
-        jsonWriter.name(VALUE);
-        String typeName = value.getClass().getTypeName();
-        Function<Object, String> toString = WellKnownClasses.getSafeToString(typeName);
-        if (toString != null) {
-          String strValue = toString.apply(value);
-          jsonWriter.value(strValue);
-        } else {
-          throw new IOException("Cannot convert value from type: " + typeName);
-        }
-      }
-
-      @Override
-      public void arrayPrologue(Object value) throws Exception {
-        jsonWriter.name(ELEMENTS);
-        jsonWriter.beginArray();
-      }
-
-      @Override
-      public void arrayEpilogue(Object value, boolean isComplete, int arraySize) throws Exception {
-        jsonWriter.endArray();
-        if (!isComplete) {
-          jsonWriter.name(NOT_CAPTURED_REASON);
-          jsonWriter.value(COLLECTION_SIZE_REASON);
-        }
-        jsonWriter.name(SIZE);
-        jsonWriter.value(String.valueOf(arraySize));
-      }
-
-      @Override
-      public void primitiveArrayElement(String value, String type) throws Exception {
-        jsonWriter.beginObject();
-        jsonWriter.name(TYPE);
-        jsonWriter.value(type);
-        jsonWriter.name(VALUE);
-        jsonWriter.value(value);
-        jsonWriter.endObject();
-      }
-
-      @Override
-      public void collectionPrologue(Object value) throws Exception {
-        jsonWriter.name(ELEMENTS);
-        jsonWriter.beginArray();
-      }
-
-      @Override
-      public void collectionEpilogue(Object value, boolean isComplete, int size) throws Exception {
-        jsonWriter.endArray();
-        if (!isComplete) {
-          jsonWriter.name(NOT_CAPTURED_REASON);
-          jsonWriter.value(COLLECTION_SIZE_REASON);
-        }
-        jsonWriter.name(SIZE);
-        jsonWriter.value(String.valueOf(size));
-      }
-
-      @Override
-      public void mapPrologue(Object value) throws Exception {
-        jsonWriter.name(ENTRIES);
-        jsonWriter.beginArray();
-      }
-
-      @Override
-      public void mapEntryPrologue(Map.Entry<?, ?> entry) throws Exception {
-        jsonWriter.beginArray();
-      }
-
-      @Override
-      public void mapEntryEpilogue(Map.Entry<?, ?> entry) throws Exception {
-        jsonWriter.endArray();
-      }
-
-      @Override
-      public void mapEpilogue(boolean isComplete, int size) throws Exception {
-        jsonWriter.endArray();
-        if (!isComplete) {
-          jsonWriter.name(NOT_CAPTURED_REASON);
-          jsonWriter.value(COLLECTION_SIZE_REASON);
-        }
-        jsonWriter.name(SIZE);
-        jsonWriter.value(String.valueOf(size));
-      }
-
-      @Override
-      public void objectPrologue(Object value) throws Exception {
-        jsonWriter.name(FIELDS);
-        jsonWriter.beginObject();
-      }
-
-      @Override
-      public void objectFieldPrologue(String fieldName, Object value, int maxDepth)
-          throws Exception {
-        jsonWriter.name(fieldName);
-      }
-
-      @Override
-      public void handleFieldException(Exception ex, Field field) {
-        if (LOGGER.isDebugEnabled()) {
-          // foldExceptionStackTrace can be expensive, only do it if debug is enabled
-          LOGGER.debug(
-              "Exception when extracting field={} exception={}",
-              field.getName(),
-              ExceptionHelper.foldExceptionStackTrace(ex));
-        }
-        fieldNotCaptured(ex.toString(), field);
-      }
-
-      @Override
-      public void fieldNotCaptured(String reason, Field field) {
-        String fieldName = field.getName();
-        try {
-          jsonWriter.name(fieldName);
-          jsonWriter.beginObject();
-          jsonWriter.name(TYPE);
-          jsonWriter.value(field.getType().getTypeName());
-          jsonWriter.name(NOT_CAPTURED_REASON);
-          jsonWriter.value(reason);
-          jsonWriter.endObject();
-        } catch (IOException e) {
-          LOGGER.debug("Serialization error: failed to extract field", e);
+    public static class CapturedValueAdapter extends JsonAdapter<CapturedContext.CapturedValue> {
+        @Override
+        public void toJson(JsonWriter jsonWriter, CapturedContext.CapturedValue capturedValue) throws IOException {
+            if (capturedValue == null) {
+                jsonWriter.nullValue();
+                return;
+            }
+            TimeoutChecker timeoutChecker = capturedValue.getTimeoutChecker();
+            if (timeoutChecker == null) {
+                timeoutChecker = TimeoutChecker.create(Config.get(), Duration.ofMillis(10));
+            }
+            Object value = capturedValue.getValue();
+            String type = capturedValue.getType();
+            Limits limits = capturedValue.getLimits();
+            SerializerWithLimits serializer = new SerializerWithLimits(new JsonTokenWriter(jsonWriter), timeoutChecker);
+            try {
+                serializer.serialize(value, type, limits);
+            } catch (Exception ex) {
+                throw new IOException(ex);
+            }
         }
-      }
-
-      @Override
-      public void objectEpilogue(Object value) throws Exception {
-        jsonWriter.endObject();
-      }
-
-      @Override
-      public void notCaptured(SerializerWithLimits.NotCapturedReason reason) throws Exception {
-        switch (reason) {
-          case MAX_DEPTH:
-            {
-              jsonWriter.name(NOT_CAPTURED_REASON);
-              jsonWriter.value(DEPTH_REASON);
-              break;
-            }
-          case FIELD_COUNT:
-            {
-              jsonWriter.name(NOT_CAPTURED_REASON);
-              jsonWriter.value(FIELD_COUNT_REASON);
-              break;
-            }
-          case TIMEOUT:
-            {
-              jsonWriter.name(NOT_CAPTURED_REASON);
-              jsonWriter.value(TIMEOUT_REASON);
-              break;
-            }
-          case REDACTED_IDENT:
-            {
-              jsonWriter.name(NOT_CAPTURED_REASON);
-              jsonWriter.value(REDACTED_IDENT_REASON);
-              break;
-            }
-          case REDACTED_TYPE:
-            {
-              jsonWriter.name(NOT_CAPTURED_REASON);
-              jsonWriter.value(REDACTED_TYPE_REASON);
-              break;
-            }
-          default:
-            throw new RuntimeException("Unsupported NotCapturedReason: " + reason);
+
+        @Override
+        public CapturedContext.CapturedValue fromJson(JsonReader reader) throws IOException {
+            // Only used in test, see MoshiSnapshotTestHelper
+            throw new IllegalStateException("Should not reach this code.");
         }
-      }
 
-      @Override
-      public void notCaptured(String reason) throws Exception {
-        jsonWriter.name(NOT_CAPTURED_REASON);
-        jsonWriter.value(reason);
-      }
-    }
-  }
+        private static class JsonTokenWriter implements SerializerWithLimits.TokenWriter {
+            private static final Logger LOGGER = LoggerFactory.getLogger(JsonTokenWriter.class);
 
-  public static class CapturedThrowableAdapter
-      extends JsonAdapter<CapturedContext.CapturedThrowable> {
-    private static final int MAX_EXCEPTION_MESSAGE_LENGTH = 2048;
-    protected final JsonAdapter<List<CapturedStackFrame>> stackTraceAdapter;
+            private final JsonWriter jsonWriter;
 
-    public CapturedThrowableAdapter(Moshi moshi) {
-      stackTraceAdapter =
-          moshi.adapter(Types.newParameterizedType(List.class, CapturedStackFrame.class));
-    }
+            public JsonTokenWriter(JsonWriter jsonWriter) {
+                this.jsonWriter = jsonWriter;
+            }
 
-    @Override
-    public void toJson(JsonWriter jsonWriter, CapturedContext.CapturedThrowable value)
-        throws IOException {
-      if (value == null) {
-        jsonWriter.nullValue();
-        return;
-      }
-      jsonWriter.beginObject();
-      jsonWriter.name(TYPE);
-      jsonWriter.value(value.getType());
-      jsonWriter.name(MESSAGE);
-      String msg = value.getMessage();
-      if (msg != null && msg.length() > MAX_EXCEPTION_MESSAGE_LENGTH) {
-        msg = msg.substring(0, MAX_EXCEPTION_MESSAGE_LENGTH);
-      }
-      jsonWriter.value(msg);
-      jsonWriter.name(STACKTRACE);
-      stackTraceAdapter.toJson(jsonWriter, value.getStacktrace());
-      jsonWriter.endObject();
-    }
+            @Override
+            public void prologue(Object value, String type) throws Exception {
+                jsonWriter.beginObject();
+                jsonWriter.name(TYPE);
+                jsonWriter.value(type);
+            }
 
-    @Override
-    public CapturedContext.CapturedThrowable fromJson(JsonReader reader) throws IOException {
-      // Only used in test, see MoshiSnapshotTestHelper
-      throw new IllegalStateException("Should not reach this code.");
-    }
-  }
+            @Override
+            public void epilogue(Object value) throws IOException {
+                jsonWriter.endObject();
+            }
 
-  public static class ProbeDetailsAdapter extends JsonAdapter<ProbeImplementation> {
-    protected final JsonAdapter<ProbeLocation> probeLocationAdapter;
+            @Override
+            public void nullValue() throws Exception {
+                jsonWriter.name(IS_NULL);
+                jsonWriter.value(true);
+            }
 
-    public ProbeDetailsAdapter(Moshi moshi) {
-      probeLocationAdapter = moshi.adapter(ProbeLocation.class);
+            @Override
+            public void string(String value, boolean isComplete, int originalLength) throws Exception {
+                jsonWriter.name(VALUE);
+                jsonWriter.value(value);
+                if (!isComplete) {
+                    jsonWriter.name(TRUNCATED);
+                    jsonWriter.value(true);
+                    jsonWriter.name(SIZE);
+                    jsonWriter.value(String.valueOf(originalLength));
+                }
+            }
+
+            @Override
+            public void primitiveValue(Object value) throws Exception {
+                jsonWriter.name(VALUE);
+                String typeName = value.getClass().getTypeName();
+                Function<Object, String> toString = WellKnownClasses.getSafeToString(typeName);
+                if (toString != null) {
+                    String strValue = toString.apply(value);
+                    jsonWriter.value(strValue);
+                } else {
+                    throw new IOException("Cannot convert value from type: " + typeName);
+                }
+            }
+
+            @Override
+            public void arrayPrologue(Object value) throws Exception {
+                jsonWriter.name(ELEMENTS);
+                jsonWriter.beginArray();
+            }
+
+            @Override
+            public void arrayEpilogue(Object value, boolean isComplete, int arraySize) throws Exception {
+                jsonWriter.endArray();
+                if (!isComplete) {
+                    jsonWriter.name(NOT_CAPTURED_REASON);
+                    jsonWriter.value(COLLECTION_SIZE_REASON);
+                }
+                jsonWriter.name(SIZE);
+                jsonWriter.value(String.valueOf(arraySize));
+            }
+
+            @Override
+            public void primitiveArrayElement(String value, String type) throws Exception {
+                jsonWriter.beginObject();
+                jsonWriter.name(TYPE);
+                jsonWriter.value(type);
+                jsonWriter.name(VALUE);
+                jsonWriter.value(value);
+                jsonWriter.endObject();
+            }
+
+            @Override
+            public void collectionPrologue(Object value) throws Exception {
+                jsonWriter.name(ELEMENTS);
+                jsonWriter.beginArray();
+            }
+
+            @Override
+            public void collectionEpilogue(Object value, boolean isComplete, int size) throws Exception {
+                jsonWriter.endArray();
+                if (!isComplete) {
+                    jsonWriter.name(NOT_CAPTURED_REASON);
+                    jsonWriter.value(COLLECTION_SIZE_REASON);
+                }
+                jsonWriter.name(SIZE);
+                jsonWriter.value(String.valueOf(size));
+            }
+
+            @Override
+            public void mapPrologue(Object value) throws Exception {
+                jsonWriter.name(ENTRIES);
+                jsonWriter.beginArray();
+            }
+
+            @Override
+            public void mapEntryPrologue(Map.Entry<?, ?> entry) throws Exception {
+                jsonWriter.beginArray();
+            }
+
+            @Override
+            public void mapEntryEpilogue(Map.Entry<?, ?> entry) throws Exception {
+                jsonWriter.endArray();
+            }
+
+            @Override
+            public void mapEpilogue(boolean isComplete, int size) throws Exception {
+                jsonWriter.endArray();
+                if (!isComplete) {
+                    jsonWriter.name(NOT_CAPTURED_REASON);
+                    jsonWriter.value(COLLECTION_SIZE_REASON);
+                }
+                jsonWriter.name(SIZE);
+                jsonWriter.value(String.valueOf(size));
+            }
+
+            @Override
+            public void objectPrologue(Object value) throws Exception {
+                jsonWriter.name(FIELDS);
+                jsonWriter.beginObject();
+            }
+
+            @Override
+            public void objectFieldPrologue(String fieldName, Object value, int maxDepth) throws Exception {
+                jsonWriter.name(fieldName);
+            }
+
+            @Override
+            public void handleFieldException(Exception ex, Field field) {
+                if (LOGGER.isDebugEnabled()) {
+                    // foldExceptionStackTrace can be expensive, only do it if debug is enabled
+                    LOGGER.debug(
+                            "Exception when extracting field={} exception={}",
+                            field.getName(),
+                            ExceptionHelper.foldExceptionStackTrace(ex));
+                }
+                fieldNotCaptured(ex.toString(), field);
+            }
+
+            @Override
+            public void fieldNotCaptured(String reason, Field field) {
+                String fieldName = field.getName();
+                try {
+                    jsonWriter.name(fieldName);
+                    jsonWriter.beginObject();
+                    jsonWriter.name(TYPE);
+                    jsonWriter.value(field.getType().getTypeName());
+                    jsonWriter.name(NOT_CAPTURED_REASON);
+                    jsonWriter.value(reason);
+                    jsonWriter.endObject();
+                } catch (IOException e) {
+                    LOGGER.debug("Serialization error: failed to extract field", e);
+                }
+            }
+
+            @Override
+            public void objectEpilogue(Object value) throws Exception {
+                jsonWriter.endObject();
+            }
+
+            @Override
+            public void notCaptured(SerializerWithLimits.NotCapturedReason reason) throws Exception {
+                switch (reason) {
+                    case MAX_DEPTH: {
+                        jsonWriter.name(NOT_CAPTURED_REASON);
+                        jsonWriter.value(DEPTH_REASON);
+                        break;
+                    }
+                    case FIELD_COUNT: {
+                        jsonWriter.name(NOT_CAPTURED_REASON);
+                        jsonWriter.value(FIELD_COUNT_REASON);
+                        break;
+                    }
+                    case TIMEOUT: {
+                        jsonWriter.name(NOT_CAPTURED_REASON);
+                        jsonWriter.value(TIMEOUT_REASON);
+                        break;
+                    }
+                    case REDACTED_IDENT: {
+                        jsonWriter.name(NOT_CAPTURED_REASON);
+                        jsonWriter.value(REDACTED_IDENT_REASON);
+                        break;
+                    }
+                    case REDACTED_TYPE: {
+                        jsonWriter.name(NOT_CAPTURED_REASON);
+                        jsonWriter.value(REDACTED_TYPE_REASON);
+                        break;
+                    }
+                    default:
+                        throw new RuntimeException("Unsupported NotCapturedReason: " + reason);
+                }
+            }
+
+            @Override
+            public void notCaptured(String reason) throws Exception {
+                jsonWriter.name(NOT_CAPTURED_REASON);
+                jsonWriter.value(reason);
+            }
+        }
     }
 
-    @Override
-    public void toJson(JsonWriter writer, ProbeImplementation value) throws IOException {
-      writer.beginObject();
-      writer.name(ID);
-      writer.value(value.getProbeId().getId());
-      writer.name(VERSION);
-      writer.value(value.getProbeId().getVersion());
-      writer.name(LOCATION);
-      probeLocationAdapter.toJson(writer, value.getLocation());
-      writer.endObject();
+    public static class CapturedThrowableAdapter extends JsonAdapter<CapturedContext.CapturedThrowable> {
+        private static final int MAX_EXCEPTION_MESSAGE_LENGTH = 2048;
+        protected final JsonAdapter<List<CapturedStackFrame>> stackTraceAdapter;
+
+        public CapturedThrowableAdapter(Moshi moshi) {
+            stackTraceAdapter = moshi.adapter(Types.newParameterizedType(List.class, CapturedStackFrame.class));
+        }
+
+        @Override
+        public void toJson(JsonWriter jsonWriter, CapturedContext.CapturedThrowable value) throws IOException {
+            if (value == null) {
+                jsonWriter.nullValue();
+                return;
+            }
+            jsonWriter.beginObject();
+            jsonWriter.name(TYPE);
+            jsonWriter.value(value.getType());
+            jsonWriter.name(MESSAGE);
+            String msg = value.getMessage();
+            if (msg != null && msg.length() > MAX_EXCEPTION_MESSAGE_LENGTH) {
+                msg = msg.substring(0, MAX_EXCEPTION_MESSAGE_LENGTH);
+            }
+            jsonWriter.value(msg);
+            jsonWriter.name(STACKTRACE);
+            stackTraceAdapter.toJson(jsonWriter, value.getStacktrace());
+            jsonWriter.endObject();
+        }
+
+        @Override
+        public CapturedContext.CapturedThrowable fromJson(JsonReader reader) throws IOException {
+            // Only used in test, see MoshiSnapshotTestHelper
+            throw new IllegalStateException("Should not reach this code.");
+        }
     }
 
-    @Override
-    public ProbeImplementation fromJson(JsonReader reader) throws IOException {
-      // Only used in test, see MoshiSnapshotTestHelper
-      throw new IllegalStateException("Should not reach this code.");
+    public static class ProbeDetailsAdapter extends JsonAdapter<ProbeImplementation> {
+        protected final JsonAdapter<ProbeLocation> probeLocationAdapter;
+
+        public ProbeDetailsAdapter(Moshi moshi) {
+            probeLocationAdapter = moshi.adapter(ProbeLocation.class);
+        }
+
+        @Override
+        public void toJson(JsonWriter writer, ProbeImplementation value) throws IOException {
+            writer.beginObject();
+            writer.name(ID);
+            writer.value(value.getProbeId().getId());
+            writer.name(VERSION);
+            writer.value(value.getProbeId().getVersion());
+            writer.name(LOCATION);
+            probeLocationAdapter.toJson(writer, value.getLocation());
+            writer.endObject();
+        }
+
+        @Override
+        public ProbeImplementation fromJson(JsonReader reader) throws IOException {
+            // Only used in test, see MoshiSnapshotTestHelper
+            throw new IllegalStateException("Should not reach this code.");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SerializerWithLimits.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SerializerWithLimits.java
index 211543efa14..63c353f24a9 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SerializerWithLimits.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SerializerWithLimits.java
@@ -21,480 +21,468 @@
 
 /** serialize Java Object value with applied {@link Limits} and following references */
 public class SerializerWithLimits {
-  private static final Logger LOG = LoggerFactory.getLogger(SerializerWithLimits.class);
-
-  public static boolean isPrimitive(String type) {
-    switch (type) {
-      case "byte":
-      case "short":
-      case "char":
-      case "int":
-      case "long":
-      case "boolean":
-      case "float":
-      case "double":
-      case "java.lang.Byte":
-      case "java.lang.Short":
-      case "java.lang.Character":
-      case "java.lang.Integer":
-      case "java.lang.Long":
-      case "java.lang.Boolean":
-      case "java.lang.Float":
-      case "java.lang.Double":
-      case "String":
-      case "java.lang.String":
-        return true;
+    private static final Logger LOG = LoggerFactory.getLogger(SerializerWithLimits.class);
+
+    public static boolean isPrimitive(String type) {
+        switch (type) {
+            case "byte":
+            case "short":
+            case "char":
+            case "int":
+            case "long":
+            case "boolean":
+            case "float":
+            case "double":
+            case "java.lang.Byte":
+            case "java.lang.Short":
+            case "java.lang.Character":
+            case "java.lang.Integer":
+            case "java.lang.Long":
+            case "java.lang.Boolean":
+            case "java.lang.Float":
+            case "java.lang.Double":
+            case "String":
+            case "java.lang.String":
+                return true;
+        }
+        return false;
     }
-    return false;
-  }
-
-  enum NotCapturedReason {
-    MAX_DEPTH,
-    FIELD_COUNT,
-    TIMEOUT,
-    REDACTED_IDENT,
-    REDACTED_TYPE
-  }
 
-  public interface TokenWriter {
-    void prologue(Object value, String type) throws Exception;
+    enum NotCapturedReason {
+        MAX_DEPTH,
+        FIELD_COUNT,
+        TIMEOUT,
+        REDACTED_IDENT,
+        REDACTED_TYPE
+    }
 
-    void epilogue(Object value) throws Exception;
+    public interface TokenWriter {
+        void prologue(Object value, String type) throws Exception;
 
-    void nullValue() throws Exception;
+        void epilogue(Object value) throws Exception;
 
-    void string(String value, boolean isComplete, int originalLength) throws Exception;
+        void nullValue() throws Exception;
 
-    void primitiveValue(Object value) throws Exception;
+        void string(String value, boolean isComplete, int originalLength) throws Exception;
 
-    void arrayPrologue(Object value) throws Exception;
+        void primitiveValue(Object value) throws Exception;
 
-    void arrayEpilogue(Object value, boolean isComplete, int arraySize) throws Exception;
+        void arrayPrologue(Object value) throws Exception;
 
-    void primitiveArrayElement(String value, String type) throws Exception;
+        void arrayEpilogue(Object value, boolean isComplete, int arraySize) throws Exception;
 
-    void collectionPrologue(Object value) throws Exception;
+        void primitiveArrayElement(String value, String type) throws Exception;
 
-    void collectionEpilogue(Object value, boolean isComplete, int size) throws Exception;
+        void collectionPrologue(Object value) throws Exception;
 
-    void mapPrologue(Object value) throws Exception;
+        void collectionEpilogue(Object value, boolean isComplete, int size) throws Exception;
 
-    void mapEntryPrologue(Map.Entry<?, ?> entry) throws Exception;
+        void mapPrologue(Object value) throws Exception;
 
-    void mapEntryEpilogue(Map.Entry<?, ?> entry) throws Exception;
+        void mapEntryPrologue(Map.Entry<?, ?> entry) throws Exception;
 
-    void mapEpilogue(boolean isComplete, int size) throws Exception;
+        void mapEntryEpilogue(Map.Entry<?, ?> entry) throws Exception;
 
-    void objectPrologue(Object value) throws Exception;
+        void mapEpilogue(boolean isComplete, int size) throws Exception;
 
-    default boolean objectFilterInField(Field field) throws Exception {
-      // Jacoco insert a transient field
-      if ("$jacocoData".equals(field.getName()) && Modifier.isTransient(field.getModifiers())) {
-        return false;
-      }
-      // skip static fields
-      if (Modifier.isStatic(field.getModifiers())) {
-        return false;
-      }
-      return true;
-    }
+        void objectPrologue(Object value) throws Exception;
 
-    void objectFieldPrologue(String fieldName, Object value, int maxDepth) throws Exception;
+        default boolean objectFilterInField(Field field) throws Exception {
+            // Jacoco insert a transient field
+            if ("$jacocoData".equals(field.getName()) && Modifier.isTransient(field.getModifiers())) {
+                return false;
+            }
+            // skip static fields
+            if (Modifier.isStatic(field.getModifiers())) {
+                return false;
+            }
+            return true;
+        }
 
-    void handleFieldException(Exception ex, Field field);
+        void objectFieldPrologue(String fieldName, Object value, int maxDepth) throws Exception;
 
-    void fieldNotCaptured(String reason, Field field);
+        void handleFieldException(Exception ex, Field field);
 
-    void objectEpilogue(Object value) throws Exception;
+        void fieldNotCaptured(String reason, Field field);
 
-    void notCaptured(NotCapturedReason reason) throws Exception;
+        void objectEpilogue(Object value) throws Exception;
 
-    void notCaptured(String reason) throws Exception;
-  }
+        void notCaptured(NotCapturedReason reason) throws Exception;
 
-  private final TokenWriter tokenWriter;
-  private final TimeoutChecker timeoutChecker;
-  private RuntimeException exception;
+        void notCaptured(String reason) throws Exception;
+    }
 
-  public SerializerWithLimits(TokenWriter tokenWriter, TimeoutChecker timeoutChecker) {
-    this.tokenWriter = tokenWriter;
-    this.timeoutChecker = timeoutChecker;
-  }
+    private final TokenWriter tokenWriter;
+    private final TimeoutChecker timeoutChecker;
+    private RuntimeException exception;
 
-  public void serialize(Object value, String type, Limits limits) throws Exception {
-    if (type == null) {
-      throw new IllegalArgumentException("Type is required for serialization");
-    }
-    tokenWriter.prologue(value, type);
-    NotCapturedReason reason = null;
-    if (value == REDACTED_VALUE) {
-      reason = NotCapturedReason.REDACTED_IDENT;
-    } else if (Redaction.isRedactedType(type)) {
-      reason = NotCapturedReason.REDACTED_TYPE;
-    }
-    if (reason != null) {
-      tokenWriter.notCaptured(reason);
-      tokenWriter.epilogue(value);
-      return;
+    public SerializerWithLimits(TokenWriter tokenWriter, TimeoutChecker timeoutChecker) {
+        this.tokenWriter = tokenWriter;
+        this.timeoutChecker = timeoutChecker;
     }
-    if (timeoutChecker.isTimedOut()) {
-      tokenWriter.notCaptured(NotCapturedReason.TIMEOUT);
-      tokenWriter.epilogue(value);
-      return;
+
+    public void serialize(Object value, String type, Limits limits) throws Exception {
+        if (type == null) {
+            throw new IllegalArgumentException("Type is required for serialization");
+        }
+        tokenWriter.prologue(value, type);
+        NotCapturedReason reason = null;
+        if (value == REDACTED_VALUE) {
+            reason = NotCapturedReason.REDACTED_IDENT;
+        } else if (Redaction.isRedactedType(type)) {
+            reason = NotCapturedReason.REDACTED_TYPE;
+        }
+        if (reason != null) {
+            tokenWriter.notCaptured(reason);
+            tokenWriter.epilogue(value);
+            return;
+        }
+        if (timeoutChecker.isTimedOut()) {
+            tokenWriter.notCaptured(NotCapturedReason.TIMEOUT);
+            tokenWriter.epilogue(value);
+            return;
+        }
+        if (value == null) {
+            tokenWriter.nullValue();
+        } else if (isPrimitive(type) || WellKnownClasses.isToStringSafe(type)) {
+            serializePrimitive(value, limits);
+        } else if (value.getClass().isArray() && (limits.maxReferenceDepth > 0)) {
+            serializeArray(value, limits);
+        } else if (value instanceof Collection && (limits.maxReferenceDepth > 0)) {
+            if (WellKnownClasses.isSafe((Collection<?>) value)) {
+                serializeCollection(value, limits);
+            } else {
+                serializeObjectValue(value, limits);
+            }
+        } else if (value instanceof Map && (limits.maxReferenceDepth > 0)) {
+            if (WellKnownClasses.isSafe((Map<?, ?>) value)) {
+                serializeMap(value, limits);
+            } else {
+                serializeObjectValue(value, limits);
+            }
+        } else if (value instanceof Enum) {
+            serializeEnum(value, limits);
+        } else if (limits.maxReferenceDepth > 0) {
+            serializeObjectValue(value, limits);
+        } else {
+            tokenWriter.notCaptured(NotCapturedReason.MAX_DEPTH);
+        }
+        tokenWriter.epilogue(value);
     }
-    if (value == null) {
-      tokenWriter.nullValue();
-    } else if (isPrimitive(type) || WellKnownClasses.isToStringSafe(type)) {
-      serializePrimitive(value, limits);
-    } else if (value.getClass().isArray() && (limits.maxReferenceDepth > 0)) {
-      serializeArray(value, limits);
-    } else if (value instanceof Collection && (limits.maxReferenceDepth > 0)) {
-      if (WellKnownClasses.isSafe((Collection<?>) value)) {
-        serializeCollection(value, limits);
-      } else {
-        serializeObjectValue(value, limits);
-      }
-    } else if (value instanceof Map && (limits.maxReferenceDepth > 0)) {
-      if (WellKnownClasses.isSafe((Map<?, ?>) value)) {
-        serializeMap(value, limits);
-      } else {
-        serializeObjectValue(value, limits);
-      }
-    } else if (value instanceof Enum) {
-      serializeEnum(value, limits);
-    } else if (limits.maxReferenceDepth > 0) {
-      serializeObjectValue(value, limits);
-    } else {
-      tokenWriter.notCaptured(NotCapturedReason.MAX_DEPTH);
+
+    private void serializeEnum(Object value, Limits limits) throws Exception {
+        Enum<?> enumValue = (Enum<?>) value;
+        serializePrimitive(enumValue.name(), limits);
     }
-    tokenWriter.epilogue(value);
-  }
-
-  private void serializeEnum(Object value, Limits limits) throws Exception {
-    Enum<?> enumValue = (Enum<?>) value;
-    serializePrimitive(enumValue.name(), limits);
-  }
-
-  private void serializeMap(Object value, Limits limits) throws Exception {
-    tokenWriter.mapPrologue(value);
-    Map<?, ?> map;
-    boolean isComplete = true;
-    int size = 0;
-    try {
-      map = (Map<?, ?>) value;
-      size = map.size(); // /!\ alien call /!\
-      Set<? extends Map.Entry<?, ?>> entries = map.entrySet(); // /!\ alien call /!\
-      isComplete = serializeMapEntries(entries, limits); // /!\ contains alien calls /!\
-      tokenWriter.mapEpilogue(isComplete, size);
-    } catch (Exception ex) {
-      tokenWriter.mapEpilogue(isComplete, size);
-      tokenWriter.notCaptured(ex.toString());
+
+    private void serializeMap(Object value, Limits limits) throws Exception {
+        tokenWriter.mapPrologue(value);
+        Map<?, ?> map;
+        boolean isComplete = true;
+        int size = 0;
+        try {
+            map = (Map<?, ?>) value;
+            size = map.size(); // /!\ alien call /!\
+            Set<? extends Map.Entry<?, ?>> entries = map.entrySet(); // /!\ alien call /!\
+            isComplete = serializeMapEntries(entries, limits); // /!\ contains alien calls /!\
+            tokenWriter.mapEpilogue(isComplete, size);
+        } catch (Exception ex) {
+            tokenWriter.mapEpilogue(isComplete, size);
+            tokenWriter.notCaptured(ex.toString());
+        }
     }
-  }
-
-  private void serializeCollection(Object value, Limits limits) throws Exception {
-    tokenWriter.collectionPrologue(value);
-    Collection<?> col;
-    boolean isComplete = true;
-    int size = 0;
-    try {
-      col = (Collection<?>) value;
-      size = col.size(); // /!\ alien call /!\
-      isComplete = serializeCollection(col, limits); // /!\ contains alien calls /!\
-      tokenWriter.collectionEpilogue(value, isComplete, size);
-    } catch (Exception ex) {
-      tokenWriter.collectionEpilogue(value, isComplete, size);
-      tokenWriter.notCaptured(ex.toString());
+
+    private void serializeCollection(Object value, Limits limits) throws Exception {
+        tokenWriter.collectionPrologue(value);
+        Collection<?> col;
+        boolean isComplete = true;
+        int size = 0;
+        try {
+            col = (Collection<?>) value;
+            size = col.size(); // /!\ alien call /!\
+            isComplete = serializeCollection(col, limits); // /!\ contains alien calls /!\
+            tokenWriter.collectionEpilogue(value, isComplete, size);
+        } catch (Exception ex) {
+            tokenWriter.collectionEpilogue(value, isComplete, size);
+            tokenWriter.notCaptured(ex.toString());
+        }
     }
-  }
-
-  private void serializeArray(Object value, Limits limits) throws Exception {
-    int arraySize = Array.getLength(value);
-    boolean isComplete = true;
-    tokenWriter.arrayPrologue(value);
-    if (value.getClass().getComponentType().isPrimitive()) {
-      Class<?> componentType = value.getClass().getComponentType();
-      if (componentType == long.class) {
-        isComplete = serializeLongArray((long[]) value, limits.maxCollectionSize);
-      }
-      if (componentType == int.class) {
-        isComplete = serializeIntArray((int[]) value, limits.maxCollectionSize);
-      }
-      if (componentType == short.class) {
-        isComplete = serializeShortArray((short[]) value, limits.maxCollectionSize);
-      }
-      if (componentType == char.class) {
-        isComplete = serializeCharArray((char[]) value, limits.maxCollectionSize);
-      }
-      if (componentType == byte.class) {
-        isComplete = serializeByteArray((byte[]) value, limits.maxCollectionSize);
-      }
-      if (componentType == boolean.class) {
-        isComplete = serializeBooleanArray((boolean[]) value, limits.maxCollectionSize);
-      }
-      if (componentType == float.class) {
-        isComplete = serializeFloatArray((float[]) value, limits.maxCollectionSize);
-      }
-      if (componentType == double.class) {
-        isComplete = serializeDoubleArray((double[]) value, limits.maxCollectionSize);
-      }
-    } else {
-      isComplete = serializeObjectArray((Object[]) value, limits);
+
+    private void serializeArray(Object value, Limits limits) throws Exception {
+        int arraySize = Array.getLength(value);
+        boolean isComplete = true;
+        tokenWriter.arrayPrologue(value);
+        if (value.getClass().getComponentType().isPrimitive()) {
+            Class<?> componentType = value.getClass().getComponentType();
+            if (componentType == long.class) {
+                isComplete = serializeLongArray((long[]) value, limits.maxCollectionSize);
+            }
+            if (componentType == int.class) {
+                isComplete = serializeIntArray((int[]) value, limits.maxCollectionSize);
+            }
+            if (componentType == short.class) {
+                isComplete = serializeShortArray((short[]) value, limits.maxCollectionSize);
+            }
+            if (componentType == char.class) {
+                isComplete = serializeCharArray((char[]) value, limits.maxCollectionSize);
+            }
+            if (componentType == byte.class) {
+                isComplete = serializeByteArray((byte[]) value, limits.maxCollectionSize);
+            }
+            if (componentType == boolean.class) {
+                isComplete = serializeBooleanArray((boolean[]) value, limits.maxCollectionSize);
+            }
+            if (componentType == float.class) {
+                isComplete = serializeFloatArray((float[]) value, limits.maxCollectionSize);
+            }
+            if (componentType == double.class) {
+                isComplete = serializeDoubleArray((double[]) value, limits.maxCollectionSize);
+            }
+        } else {
+            isComplete = serializeObjectArray((Object[]) value, limits);
+        }
+        tokenWriter.arrayEpilogue(value, isComplete, arraySize);
     }
-    tokenWriter.arrayEpilogue(value, isComplete, arraySize);
-  }
-
-  private void serializePrimitive(Object value, Limits limits) throws Exception {
-    if (value instanceof String) {
-      String strValue = (String) value;
-      int originalLength = strValue.length();
-      boolean isComplete = true;
-      if (originalLength > limits.maxLength) {
-        strValue = strValue.substring(0, limits.maxLength);
-        isComplete = false;
-      }
-      tokenWriter.string(strValue, isComplete, originalLength);
-    } else {
-      tokenWriter.primitiveValue(value);
+
+    private void serializePrimitive(Object value, Limits limits) throws Exception {
+        if (value instanceof String) {
+            String strValue = (String) value;
+            int originalLength = strValue.length();
+            boolean isComplete = true;
+            if (originalLength > limits.maxLength) {
+                strValue = strValue.substring(0, limits.maxLength);
+                isComplete = false;
+            }
+            tokenWriter.string(strValue, isComplete, originalLength);
+        } else {
+            tokenWriter.primitiveValue(value);
+        }
     }
-  }
-
-  private void serializeObjectValue(Object value, Limits limits) throws Exception {
-    tokenWriter.objectPrologue(value);
-    Map<String, Function<Object, CapturedContext.CapturedValue>> specialTypeAccess =
-        WellKnownClasses.getSpecialTypeAccess(value);
-    Class<?> currentClass = value.getClass();
-    int processedFieldCount = 0;
-    NotCapturedReason reason = null;
-    classLoop:
-    do {
-      Field[] fields = currentClass.getDeclaredFields();
-      for (Field field : fields) {
-        try {
-          if (processedFieldCount >= limits.maxFieldCount) {
-            reason = NotCapturedReason.FIELD_COUNT;
-            break classLoop;
-          }
-          if (!tokenWriter.objectFilterInField(field)) {
-            continue;
-          }
-          processedFieldCount++;
-          if (specialTypeAccess != null) {
-            Function<Object, CapturedContext.CapturedValue> specialFieldAccess =
-                specialTypeAccess.get(field.getName());
-            if (specialFieldAccess != null) {
-              onSpecialField(specialFieldAccess, value, limits);
-            } else {
-              onField(field, value, limits);
+
+    private void serializeObjectValue(Object value, Limits limits) throws Exception {
+        tokenWriter.objectPrologue(value);
+        Map<String, Function<Object, CapturedContext.CapturedValue>> specialTypeAccess =
+                WellKnownClasses.getSpecialTypeAccess(value);
+        Class<?> currentClass = value.getClass();
+        int processedFieldCount = 0;
+        NotCapturedReason reason = null;
+        classLoop:
+        do {
+            Field[] fields = currentClass.getDeclaredFields();
+            for (Field field : fields) {
+                try {
+                    if (processedFieldCount >= limits.maxFieldCount) {
+                        reason = NotCapturedReason.FIELD_COUNT;
+                        break classLoop;
+                    }
+                    if (!tokenWriter.objectFilterInField(field)) {
+                        continue;
+                    }
+                    processedFieldCount++;
+                    if (specialTypeAccess != null) {
+                        Function<Object, CapturedContext.CapturedValue> specialFieldAccess =
+                                specialTypeAccess.get(field.getName());
+                        if (specialFieldAccess != null) {
+                            onSpecialField(specialFieldAccess, value, limits);
+                        } else {
+                            onField(field, value, limits);
+                        }
+                    } else {
+                        onField(field, value, limits);
+                    }
+                } catch (Exception e) {
+                    tokenWriter.handleFieldException(e, field);
+                }
             }
-          } else {
-            onField(field, value, limits);
-          }
-        } catch (Exception e) {
-          tokenWriter.handleFieldException(e, field);
+        } while ((currentClass = currentClass.getSuperclass()) != null);
+        tokenWriter.objectEpilogue(value);
+        if (reason != null) {
+            tokenWriter.notCaptured(reason);
         }
-      }
-    } while ((currentClass = currentClass.getSuperclass()) != null);
-    tokenWriter.objectEpilogue(value);
-    if (reason != null) {
-      tokenWriter.notCaptured(reason);
     }
-  }
-
-  private void onField(Field field, Object obj, Limits limits) throws Exception {
-    if (ReflectiveFieldValueResolver.trySetAccessible(field)) {
-      field.setAccessible(true);
-      Object fieldValue = field.get(obj);
-      internalOnField(field.getName(), field.getType().getTypeName(), fieldValue, limits);
-    } else {
-      String msg = ReflectiveFieldValueResolver.buildInaccessibleMsg(field);
-      tokenWriter.fieldNotCaptured(msg, field);
+
+    private void onField(Field field, Object obj, Limits limits) throws Exception {
+        if (ReflectiveFieldValueResolver.trySetAccessible(field)) {
+            field.setAccessible(true);
+            Object fieldValue = field.get(obj);
+            internalOnField(field.getName(), field.getType().getTypeName(), fieldValue, limits);
+        } else {
+            String msg = ReflectiveFieldValueResolver.buildInaccessibleMsg(field);
+            tokenWriter.fieldNotCaptured(msg, field);
+        }
     }
-  }
-
-  private void onSpecialField(
-      Function<Object, CapturedContext.CapturedValue> specialFieldAccess,
-      Object value,
-      Limits limits)
-      throws Exception {
-    CapturedContext.CapturedValue field = specialFieldAccess.apply(value);
-    internalOnField(field.getName(), field.getType(), field.getValue(), limits);
-  }
-
-  private void internalOnField(String fieldName, String fieldType, Object value, Limits limits)
-      throws Exception {
-    tokenWriter.objectFieldPrologue(fieldName, value, limits.maxReferenceDepth);
-    Limits newLimits = Limits.decDepthLimits(limits);
-    String typeName;
-    if (SerializerWithLimits.isPrimitive(fieldType)) {
-      typeName = fieldType;
-    } else {
-      typeName = value != null ? value.getClass().getTypeName() : fieldType;
+
+    private void onSpecialField(
+            Function<Object, CapturedContext.CapturedValue> specialFieldAccess, Object value, Limits limits)
+            throws Exception {
+        CapturedContext.CapturedValue field = specialFieldAccess.apply(value);
+        internalOnField(field.getName(), field.getType(), field.getValue(), limits);
     }
-    if (Redaction.isRedactedKeyword(fieldName)) {
-      value = REDACTED_VALUE;
+
+    private void internalOnField(String fieldName, String fieldType, Object value, Limits limits) throws Exception {
+        tokenWriter.objectFieldPrologue(fieldName, value, limits.maxReferenceDepth);
+        Limits newLimits = Limits.decDepthLimits(limits);
+        String typeName;
+        if (SerializerWithLimits.isPrimitive(fieldType)) {
+            typeName = fieldType;
+        } else {
+            typeName = value != null ? value.getClass().getTypeName() : fieldType;
+        }
+        if (Redaction.isRedactedKeyword(fieldName)) {
+            value = REDACTED_VALUE;
+        }
+        serialize(
+                value instanceof CapturedContext.CapturedValue
+                        ? ((CapturedContext.CapturedValue) value).getValue()
+                        : value,
+                typeName,
+                newLimits);
     }
-    serialize(
-        value instanceof CapturedContext.CapturedValue
-            ? ((CapturedContext.CapturedValue) value).getValue()
-            : value,
-        typeName,
-        newLimits);
-  }
-
-  private boolean serializeLongArray(long[] longArray, int maxSize) throws Exception {
-    maxSize = Math.min(longArray.length, maxSize);
-    int i = 0;
-    while (i < maxSize) {
-      long val = longArray[i];
-      String strVal = String.valueOf(val);
-      tokenWriter.primitiveArrayElement(strVal, "long");
-      i++;
+
+    private boolean serializeLongArray(long[] longArray, int maxSize) throws Exception {
+        maxSize = Math.min(longArray.length, maxSize);
+        int i = 0;
+        while (i < maxSize) {
+            long val = longArray[i];
+            String strVal = String.valueOf(val);
+            tokenWriter.primitiveArrayElement(strVal, "long");
+            i++;
+        }
+        return maxSize == longArray.length;
     }
-    return maxSize == longArray.length;
-  }
-
-  private boolean serializeIntArray(int[] intArray, int maxSize) throws Exception {
-    maxSize = Math.min(intArray.length, maxSize);
-    int i = 0;
-    while (i < maxSize) {
-      long val = intArray[i];
-      String strVal = String.valueOf(val);
-      tokenWriter.primitiveArrayElement(strVal, "int");
-      i++;
+
+    private boolean serializeIntArray(int[] intArray, int maxSize) throws Exception {
+        maxSize = Math.min(intArray.length, maxSize);
+        int i = 0;
+        while (i < maxSize) {
+            long val = intArray[i];
+            String strVal = String.valueOf(val);
+            tokenWriter.primitiveArrayElement(strVal, "int");
+            i++;
+        }
+        return maxSize == intArray.length;
     }
-    return maxSize == intArray.length;
-  }
-
-  private boolean serializeShortArray(short[] shortArray, int maxSize) throws Exception {
-    maxSize = Math.min(shortArray.length, maxSize);
-    int i = 0;
-    while (i < maxSize) {
-      short val = shortArray[i];
-      String strVal = String.valueOf(val);
-      tokenWriter.primitiveArrayElement(strVal, "short");
-      i++;
+
+    private boolean serializeShortArray(short[] shortArray, int maxSize) throws Exception {
+        maxSize = Math.min(shortArray.length, maxSize);
+        int i = 0;
+        while (i < maxSize) {
+            short val = shortArray[i];
+            String strVal = String.valueOf(val);
+            tokenWriter.primitiveArrayElement(strVal, "short");
+            i++;
+        }
+        return maxSize == shortArray.length;
     }
-    return maxSize == shortArray.length;
-  }
-
-  private boolean serializeCharArray(char[] charArray, int maxSize) throws Exception {
-    maxSize = Math.min(charArray.length, maxSize);
-    int i = 0;
-    while (i < maxSize) {
-      char val = charArray[i];
-      String strVal = String.valueOf(val);
-      tokenWriter.primitiveArrayElement(strVal, "char");
-      i++;
+
+    private boolean serializeCharArray(char[] charArray, int maxSize) throws Exception {
+        maxSize = Math.min(charArray.length, maxSize);
+        int i = 0;
+        while (i < maxSize) {
+            char val = charArray[i];
+            String strVal = String.valueOf(val);
+            tokenWriter.primitiveArrayElement(strVal, "char");
+            i++;
+        }
+        return maxSize == charArray.length;
     }
-    return maxSize == charArray.length;
-  }
-
-  private boolean serializeByteArray(byte[] byteArray, int maxSize) throws Exception {
-    maxSize = Math.min(byteArray.length, maxSize);
-    int i = 0;
-    while (i < maxSize) {
-      byte val = byteArray[i];
-      String strVal = String.valueOf(val);
-      tokenWriter.primitiveArrayElement(strVal, "byte");
-      i++;
+
+    private boolean serializeByteArray(byte[] byteArray, int maxSize) throws Exception {
+        maxSize = Math.min(byteArray.length, maxSize);
+        int i = 0;
+        while (i < maxSize) {
+            byte val = byteArray[i];
+            String strVal = String.valueOf(val);
+            tokenWriter.primitiveArrayElement(strVal, "byte");
+            i++;
+        }
+        return maxSize == byteArray.length;
     }
-    return maxSize == byteArray.length;
-  }
-
-  private boolean serializeBooleanArray(boolean[] booleanArray, int maxSize) throws Exception {
-    maxSize = Math.min(booleanArray.length, maxSize);
-    int i = 0;
-    while (i < maxSize) {
-      boolean val = booleanArray[i];
-      String strVal = String.valueOf(val);
-      tokenWriter.primitiveArrayElement(strVal, "boolean");
-      i++;
+
+    private boolean serializeBooleanArray(boolean[] booleanArray, int maxSize) throws Exception {
+        maxSize = Math.min(booleanArray.length, maxSize);
+        int i = 0;
+        while (i < maxSize) {
+            boolean val = booleanArray[i];
+            String strVal = String.valueOf(val);
+            tokenWriter.primitiveArrayElement(strVal, "boolean");
+            i++;
+        }
+        return maxSize == booleanArray.length;
     }
-    return maxSize == booleanArray.length;
-  }
-
-  private boolean serializeFloatArray(float[] floatArray, int maxSize) throws Exception {
-    maxSize = Math.min(floatArray.length, maxSize);
-    int i = 0;
-    while (i < maxSize) {
-      float val = floatArray[i];
-      String strVal = String.valueOf(val);
-      tokenWriter.primitiveArrayElement(strVal, "float");
-      i++;
+
+    private boolean serializeFloatArray(float[] floatArray, int maxSize) throws Exception {
+        maxSize = Math.min(floatArray.length, maxSize);
+        int i = 0;
+        while (i < maxSize) {
+            float val = floatArray[i];
+            String strVal = String.valueOf(val);
+            tokenWriter.primitiveArrayElement(strVal, "float");
+            i++;
+        }
+        return maxSize == floatArray.length;
     }
-    return maxSize == floatArray.length;
-  }
-
-  private boolean serializeDoubleArray(double[] doubleArray, int maxSize) throws Exception {
-    maxSize = Math.min(doubleArray.length, maxSize);
-    int i = 0;
-    while (i < maxSize) {
-      double val = doubleArray[i];
-      String strVal = String.valueOf(val);
-      tokenWriter.primitiveArrayElement(strVal, "double");
-      i++;
+
+    private boolean serializeDoubleArray(double[] doubleArray, int maxSize) throws Exception {
+        maxSize = Math.min(doubleArray.length, maxSize);
+        int i = 0;
+        while (i < maxSize) {
+            double val = doubleArray[i];
+            String strVal = String.valueOf(val);
+            tokenWriter.primitiveArrayElement(strVal, "double");
+            i++;
+        }
+        return maxSize == doubleArray.length;
     }
-    return maxSize == doubleArray.length;
-  }
-
-  private boolean serializeObjectArray(Object[] objArray, Limits limits) throws Exception {
-    int maxSize = Math.min(objArray.length, limits.maxCollectionSize);
-    Limits newLimits = Limits.decDepthLimits(limits);
-    int i = 0;
-    while (i < maxSize) {
-      Object val = objArray[i];
-      serialize(
-          val, val != null ? val.getClass().getTypeName() : Object.class.getTypeName(), newLimits);
-      i++;
+
+    private boolean serializeObjectArray(Object[] objArray, Limits limits) throws Exception {
+        int maxSize = Math.min(objArray.length, limits.maxCollectionSize);
+        Limits newLimits = Limits.decDepthLimits(limits);
+        int i = 0;
+        while (i < maxSize) {
+            Object val = objArray[i];
+            serialize(val, val != null ? val.getClass().getTypeName() : Object.class.getTypeName(), newLimits);
+            i++;
+        }
+        return maxSize == objArray.length;
     }
-    return maxSize == objArray.length;
-  }
-
-  private boolean serializeCollection(Collection<?> collection, Limits limits) throws Exception {
-    // /!\ here we assume that Collection#Size is O(1) /!\
-    int colSize = collection.size(); // /!\ alien call /!\
-    int maxSize = Math.min(colSize, limits.maxCollectionSize);
-    Limits newLimits = Limits.decDepthLimits(limits);
-    int i = 0;
-    Iterator<?> it = collection.iterator(); // /!\ alien call /!\
-    while (i < maxSize && it.hasNext()) { // /!\ alien call /!\
-      Object val = it.next(); // /!\ alien call /!\
-      serialize(
-          val, val != null ? val.getClass().getTypeName() : Object.class.getTypeName(), newLimits);
-      i++;
+
+    private boolean serializeCollection(Collection<?> collection, Limits limits) throws Exception {
+        // /!\ here we assume that Collection#Size is O(1) /!\
+        int colSize = collection.size(); // /!\ alien call /!\
+        int maxSize = Math.min(colSize, limits.maxCollectionSize);
+        Limits newLimits = Limits.decDepthLimits(limits);
+        int i = 0;
+        Iterator<?> it = collection.iterator(); // /!\ alien call /!\
+        while (i < maxSize && it.hasNext()) { // /!\ alien call /!\
+            Object val = it.next(); // /!\ alien call /!\
+            serialize(val, val != null ? val.getClass().getTypeName() : Object.class.getTypeName(), newLimits);
+            i++;
+        }
+        return maxSize == colSize;
     }
-    return maxSize == colSize;
-  }
-
-  private boolean serializeMapEntries(Set<? extends Map.Entry<?, ?>> entries, Limits limits)
-      throws Exception {
-    int mapSize = entries.size(); // /!\ alien call /!\
-    int maxSize = Math.min(mapSize, limits.maxCollectionSize);
-    Limits newLimits = Limits.decDepthLimits(limits);
-    int i = 0;
-    Iterator<?> it = entries.iterator(); // /!\ alien call /!\
-    while (i < maxSize && it.hasNext()) { // /!\ alien call /!\
-      Map.Entry<?, ?> entry = (Map.Entry<?, ?>) it.next(); // /!\ alien call /!\
-      tokenWriter.mapEntryPrologue(entry);
-      Object keyObj = entry.getKey(); // /!\ alien call /!\
-      Object valObj;
-      if (keyObj instanceof String && Redaction.isRedactedKeyword((String) keyObj)) {
-        valObj = REDACTED_VALUE;
-      } else {
-        valObj = entry.getValue(); // /!\ alien call /!\
-      }
-      serialize(
-          keyObj,
-          keyObj != null ? keyObj.getClass().getTypeName() : Object.class.getTypeName(),
-          newLimits);
-      serialize(
-          valObj,
-          valObj != null ? valObj.getClass().getTypeName() : Object.class.getTypeName(),
-          newLimits);
-      tokenWriter.mapEntryEpilogue(entry);
-      i++;
+
+    private boolean serializeMapEntries(Set<? extends Map.Entry<?, ?>> entries, Limits limits) throws Exception {
+        int mapSize = entries.size(); // /!\ alien call /!\
+        int maxSize = Math.min(mapSize, limits.maxCollectionSize);
+        Limits newLimits = Limits.decDepthLimits(limits);
+        int i = 0;
+        Iterator<?> it = entries.iterator(); // /!\ alien call /!\
+        while (i < maxSize && it.hasNext()) { // /!\ alien call /!\
+            Map.Entry<?, ?> entry = (Map.Entry<?, ?>) it.next(); // /!\ alien call /!\
+            tokenWriter.mapEntryPrologue(entry);
+            Object keyObj = entry.getKey(); // /!\ alien call /!\
+            Object valObj;
+            if (keyObj instanceof String && Redaction.isRedactedKeyword((String) keyObj)) {
+                valObj = REDACTED_VALUE;
+            } else {
+                valObj = entry.getValue(); // /!\ alien call /!\
+            }
+            serialize(keyObj, keyObj != null ? keyObj.getClass().getTypeName() : Object.class.getTypeName(), newLimits);
+            serialize(valObj, valObj != null ? valObj.getClass().getTypeName() : Object.class.getTypeName(), newLimits);
+            tokenWriter.mapEntryEpilogue(entry);
+            i++;
+        }
+        return maxSize == mapSize;
     }
-    return maxSize == mapSize;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SnapshotPruner.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SnapshotPruner.java
index 216441237b0..be422e554ac 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SnapshotPruner.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SnapshotPruner.java
@@ -13,228 +13,218 @@
 import java.util.function.Supplier;
 
 public class SnapshotPruner {
-  private static final String NOT_CAPTURED_REASON = "notCapturedReason";
-  private static final String DEPTH = "depth";
-  private static final String PRUNED = "{\"pruned\":true}";
+    private static final String NOT_CAPTURED_REASON = "notCapturedReason";
+    private static final String DEPTH = "depth";
+    private static final String PRUNED = "{\"pruned\":true}";
 
-  private State state = State.OBJECT;
-  private final Deque<Node> stack = new ArrayDeque<>(32);
-  private int currentLevel;
-  private int strMatchIdx;
-  private Supplier<State> onStringMatches;
-  private String matchingString;
-  private Node root;
+    private State state = State.OBJECT;
+    private final Deque<Node> stack = new ArrayDeque<>(32);
+    private int currentLevel;
+    private int strMatchIdx;
+    private Supplier<State> onStringMatches;
+    private String matchingString;
+    private Node root;
 
-  public static String prune(String snapshot, int maxTargetedSize, int minLevel) {
-    int delta = snapshot.length() - maxTargetedSize;
-    if (delta <= 0) {
-      return snapshot;
-    }
-    SnapshotPruner snapshotPruner = new SnapshotPruner(snapshot);
-    Collection<Node> leaves = snapshotPruner.getLeaves(minLevel);
-    PriorityQueue<Node> sortedLeaves =
-        new PriorityQueue<>(
-            Comparator.comparing((Node n) -> n.notCapturedDepth)
+    public static String prune(String snapshot, int maxTargetedSize, int minLevel) {
+        int delta = snapshot.length() - maxTargetedSize;
+        if (delta <= 0) {
+            return snapshot;
+        }
+        SnapshotPruner snapshotPruner = new SnapshotPruner(snapshot);
+        Collection<Node> leaves = snapshotPruner.getLeaves(minLevel);
+        PriorityQueue<Node> sortedLeaves = new PriorityQueue<>(Comparator.comparing((Node n) -> n.notCapturedDepth)
                 .thenComparingInt((Node n) -> n.level)
                 .thenComparing((Node n) -> n.notCaptured)
                 .thenComparingInt(Node::size)
                 .reversed());
-    sortedLeaves.addAll(leaves);
-    int total = 0;
-    Map<Integer, Node> nodes = new HashMap<>();
-    while (!sortedLeaves.isEmpty()) {
-      Node leaf = sortedLeaves.poll();
-      nodes.put(leaf.start, leaf);
-      total += leaf.size() - PRUNED.length();
-      if (total > delta) break;
-      Node parent = leaf.parent;
-      if (parent == null) {
-        break;
-      }
-      parent.pruned++;
-      if (parent.pruned >= parent.children.size() && parent.level >= minLevel) {
-        // We have pruned all the children of this parent node, so we can
-        // treat it as a leaf now.
-        parent.notCaptured = true;
-        parent.notCapturedDepth = true;
-        sortedLeaves.offer(parent);
-        for (Node child : parent.children) {
-          nodes.remove(child.start);
-          total -= child.size() - PRUNED.length();
+        sortedLeaves.addAll(leaves);
+        int total = 0;
+        Map<Integer, Node> nodes = new HashMap<>();
+        while (!sortedLeaves.isEmpty()) {
+            Node leaf = sortedLeaves.poll();
+            nodes.put(leaf.start, leaf);
+            total += leaf.size() - PRUNED.length();
+            if (total > delta) break;
+            Node parent = leaf.parent;
+            if (parent == null) {
+                break;
+            }
+            parent.pruned++;
+            if (parent.pruned >= parent.children.size() && parent.level >= minLevel) {
+                // We have pruned all the children of this parent node, so we can
+                // treat it as a leaf now.
+                parent.notCaptured = true;
+                parent.notCapturedDepth = true;
+                sortedLeaves.offer(parent);
+                for (Node child : parent.children) {
+                    nodes.remove(child.start);
+                    total -= child.size() - PRUNED.length();
+                }
+            }
         }
-      }
-    }
-    List<Node> prunedNodes = new ArrayList<>(nodes.values());
-    prunedNodes.sort(Comparator.comparing((Node n) -> n.start));
-    StringBuilder sb = new StringBuilder();
-    sb.append(snapshot, 0, prunedNodes.get(0).start);
-    for (int i = 1; i < prunedNodes.size(); i++) {
-      sb.append(PRUNED);
-      sb.append(snapshot, prunedNodes.get(i - 1).end + 1, prunedNodes.get(i).start);
+        List<Node> prunedNodes = new ArrayList<>(nodes.values());
+        prunedNodes.sort(Comparator.comparing((Node n) -> n.start));
+        StringBuilder sb = new StringBuilder();
+        sb.append(snapshot, 0, prunedNodes.get(0).start);
+        for (int i = 1; i < prunedNodes.size(); i++) {
+            sb.append(PRUNED);
+            sb.append(snapshot, prunedNodes.get(i - 1).end + 1, prunedNodes.get(i).start);
+        }
+        sb.append(PRUNED);
+        sb.append(snapshot, prunedNodes.get(prunedNodes.size() - 1).end + 1, snapshot.length());
+        return sb.toString();
     }
-    sb.append(PRUNED);
-    sb.append(snapshot, prunedNodes.get(prunedNodes.size() - 1).end + 1, snapshot.length());
-    return sb.toString();
-  }
 
-  private Collection<Node> getLeaves(int minLevel) {
-    if (root == null) {
-      return Collections.emptyList();
+    private Collection<Node> getLeaves(int minLevel) {
+        if (root == null) {
+            return Collections.emptyList();
+        }
+        return root.getLeaves(minLevel);
     }
-    return root.getLeaves(minLevel);
-  }
 
-  private SnapshotPruner(String snapshot) {
-    for (int i = 0; i < snapshot.length(); i++) {
-      state = state.parse(this, snapshot.charAt(i), i);
-      if (state == null) {
-        break;
-      }
+    private SnapshotPruner(String snapshot) {
+        for (int i = 0; i < snapshot.length(); i++) {
+            state = state.parse(this, snapshot.charAt(i), i);
+            if (state == null) {
+                break;
+            }
+        }
     }
-  }
 
-  enum State {
-    OBJECT {
-      @Override
-      public State parse(SnapshotPruner pruner, char c, int index) {
-        switch (c) {
-          case '{':
-            {
-              Node n = new Node(index, pruner.currentLevel);
-              pruner.currentLevel++;
-              if (!pruner.stack.isEmpty()) {
-                n.parent = pruner.stack.peekLast();
-                n.parent.children.add(n);
-              }
-              pruner.stack.addLast(n);
-              return this;
-            }
-          case '}':
-            {
-              Node n = pruner.stack.removeLast();
-              n.end = index;
-              pruner.currentLevel--;
-              if (pruner.stack.isEmpty()) {
-                pruner.root = n;
-                return null;
-              }
-              return this;
-            }
-          case '"':
-            {
-              pruner.strMatchIdx = 0;
-              pruner.matchingString = NOT_CAPTURED_REASON;
-              pruner.onStringMatches =
-                  () -> {
-                    Node n = pruner.stack.peekLast();
-                    if (n == null) {
-                      throw new IllegalStateException("empty stack");
+    enum State {
+        OBJECT {
+            @Override
+            public State parse(SnapshotPruner pruner, char c, int index) {
+                switch (c) {
+                    case '{': {
+                        Node n = new Node(index, pruner.currentLevel);
+                        pruner.currentLevel++;
+                        if (!pruner.stack.isEmpty()) {
+                            n.parent = pruner.stack.peekLast();
+                            n.parent.children.add(n);
+                        }
+                        pruner.stack.addLast(n);
+                        return this;
                     }
-                    n.notCaptured = true;
-                    return NOT_CAPTURED;
-                  };
-              return STRING;
-            }
-          default:
-            return this;
-        }
-      }
-    },
-    STRING {
-      @Override
-      public State parse(SnapshotPruner pruner, char c, int index) {
-        switch (c) {
-          case '"':
-            {
-              if (pruner.strMatchIdx == pruner.matchingString.length()) {
-                return pruner.onStringMatches.get();
-              }
-              return OBJECT;
-            }
-          case '\\':
-            {
-              pruner.strMatchIdx = -1;
-              return ESCAPE;
+                    case '}': {
+                        Node n = pruner.stack.removeLast();
+                        n.end = index;
+                        pruner.currentLevel--;
+                        if (pruner.stack.isEmpty()) {
+                            pruner.root = n;
+                            return null;
+                        }
+                        return this;
+                    }
+                    case '"': {
+                        pruner.strMatchIdx = 0;
+                        pruner.matchingString = NOT_CAPTURED_REASON;
+                        pruner.onStringMatches = () -> {
+                            Node n = pruner.stack.peekLast();
+                            if (n == null) {
+                                throw new IllegalStateException("empty stack");
+                            }
+                            n.notCaptured = true;
+                            return NOT_CAPTURED;
+                        };
+                        return STRING;
+                    }
+                    default:
+                        return this;
+                }
             }
-          default:
-            if (pruner.strMatchIdx > -1) {
-              char current = pruner.matchingString.charAt(pruner.strMatchIdx++);
-              if (c != current) {
-                pruner.strMatchIdx = -1;
-              }
+        },
+        STRING {
+            @Override
+            public State parse(SnapshotPruner pruner, char c, int index) {
+                switch (c) {
+                    case '"': {
+                        if (pruner.strMatchIdx == pruner.matchingString.length()) {
+                            return pruner.onStringMatches.get();
+                        }
+                        return OBJECT;
+                    }
+                    case '\\': {
+                        pruner.strMatchIdx = -1;
+                        return ESCAPE;
+                    }
+                    default:
+                        if (pruner.strMatchIdx > -1) {
+                            char current = pruner.matchingString.charAt(pruner.strMatchIdx++);
+                            if (c != current) {
+                                pruner.strMatchIdx = -1;
+                            }
+                        }
+                        return this;
+                }
             }
-            return this;
-        }
-      }
-    },
-    NOT_CAPTURED {
-      @Override
-      public State parse(SnapshotPruner pruner, char c, int index) {
-        switch (c) {
-          case '"':
-            {
-              pruner.strMatchIdx = 0;
-              pruner.matchingString = DEPTH;
-              pruner.onStringMatches =
-                  () -> {
-                    Node n = pruner.stack.peekLast();
-                    if (n == null) {
-                      throw new IllegalStateException("empty stack");
+        },
+        NOT_CAPTURED {
+            @Override
+            public State parse(SnapshotPruner pruner, char c, int index) {
+                switch (c) {
+                    case '"': {
+                        pruner.strMatchIdx = 0;
+                        pruner.matchingString = DEPTH;
+                        pruner.onStringMatches = () -> {
+                            Node n = pruner.stack.peekLast();
+                            if (n == null) {
+                                throw new IllegalStateException("empty stack");
+                            }
+                            n.notCapturedDepth = true;
+                            return OBJECT;
+                        };
+                        return STRING;
                     }
-                    n.notCapturedDepth = true;
-                    return OBJECT;
-                  };
-              return STRING;
+                    case ' ':
+                    case ':':
+                    case '\n':
+                    case '\t':
+                    case '\r':
+                        return this;
+                    default:
+                        return OBJECT;
+                }
             }
-          case ' ':
-          case ':':
-          case '\n':
-          case '\t':
-          case '\r':
-            return this;
-          default:
-            return OBJECT;
-        }
-      }
-    },
-    ESCAPE {
-      @Override
-      public State parse(SnapshotPruner pruner, char c, int index) {
-        return STRING;
-      }
-    };
+        },
+        ESCAPE {
+            @Override
+            public State parse(SnapshotPruner pruner, char c, int index) {
+                return STRING;
+            }
+        };
 
-    public abstract State parse(SnapshotPruner pruner, char c, int index);
-  }
+        public abstract State parse(SnapshotPruner pruner, char c, int index);
+    }
 
-  private static class Node {
-    int pruned;
-    Node parent;
-    List<Node> children = new ArrayList<>();
-    final int start;
-    int end;
-    final int level;
-    boolean notCaptured;
-    boolean notCapturedDepth;
+    private static class Node {
+        int pruned;
+        Node parent;
+        List<Node> children = new ArrayList<>();
+        final int start;
+        int end;
+        final int level;
+        boolean notCaptured;
+        boolean notCapturedDepth;
 
-    public Node(int start, int level) {
-      this.start = start;
-      this.level = level;
-    }
+        public Node(int start, int level) {
+            this.start = start;
+            this.level = level;
+        }
 
-    public Collection<Node> getLeaves(int minLevel) {
-      if (children.isEmpty() && level >= minLevel) {
-        return Collections.singleton(this);
-      }
-      Collection<Node> results = new ArrayList<>();
-      for (int i = children.size() - 1; i >= 0; i--) {
-        results.addAll(children.get(i).getLeaves(minLevel));
-      }
-      return results;
-    }
+        public Collection<Node> getLeaves(int minLevel) {
+            if (children.isEmpty() && level >= minLevel) {
+                return Collections.singleton(this);
+            }
+            Collection<Node> results = new ArrayList<>();
+            for (int i = children.size() - 1; i >= 0; i--) {
+                results.addAll(children.get(i).getLeaves(minLevel));
+            }
+            return results;
+        }
 
-    public int size() {
-      return end - start + 1;
+        public int size() {
+            return end - start + 1;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SpringHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SpringHelper.java
index 1debb2d80d8..419803d5af5 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SpringHelper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SpringHelper.java
@@ -8,91 +8,89 @@
 import org.slf4j.LoggerFactory;
 
 public class SpringHelper {
-  private static final Logger LOGGER = LoggerFactory.getLogger(SpringHelper.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SpringHelper.class);
 
-  private enum DetectionResult {
-    UNKNOWN,
-    USE_METHOD_PARAMETERS,
-    USE_LOCAL_VARS
-  }
-
-  public static boolean isSpringUsingOnlyMethodParameters(Instrumentation inst) {
-    DetectionResult detectionResult = isSpringUsingOnlyMethodParametersSpringVersion(inst);
-    if (detectionResult == DetectionResult.UNKNOWN) {
-      LOGGER.debug(
-          "isSpringUsingOnlyMethodParameters failed for SpringVersion, trying to detect specific class");
-      // fallback to lookup for specific class
-      return isSpringUsingOnlyMethodParametersSpecificClass(inst);
+    private enum DetectionResult {
+        UNKNOWN,
+        USE_METHOD_PARAMETERS,
+        USE_LOCAL_VARS
     }
-    return detectionResult == DetectionResult.USE_METHOD_PARAMETERS;
-  }
 
-  private static DetectionResult isSpringUsingOnlyMethodParametersSpringVersion(
-      Instrumentation inst) {
-    try {
-      // scan for getting an already loaded class and get the classloader
-      ClassLoader springClassLoader = null;
-      for (Class<?> clazz : inst.getAllLoadedClasses()) {
-        // // getAllLoadedClasses can return null classes (Class Unloading)
-        if (clazz != null && clazz.getName().startsWith("org.springframework.core")) {
-          springClassLoader = clazz.getClassLoader();
+    public static boolean isSpringUsingOnlyMethodParameters(Instrumentation inst) {
+        DetectionResult detectionResult = isSpringUsingOnlyMethodParametersSpringVersion(inst);
+        if (detectionResult == DetectionResult.UNKNOWN) {
+            LOGGER.debug("isSpringUsingOnlyMethodParameters failed for SpringVersion, trying to detect specific class");
+            // fallback to lookup for specific class
+            return isSpringUsingOnlyMethodParametersSpecificClass(inst);
         }
-      }
-      if (springClassLoader == null) {
-        return DetectionResult.UNKNOWN;
-      }
-      Class<?> springVersionClass =
-          Class.forName("org.springframework.core.SpringVersion", true, springClassLoader);
-      Method m = springVersionClass.getDeclaredMethod("getVersion");
-      String version = (String) m.invoke(null);
-      ParsedSpringVersion springVersion = new ParsedSpringVersion(version);
-      // if Spring version is 6.1+ only using MethodParameters
-      return springVersion.major > 6 || (springVersion.major == 6 && springVersion.minor >= 1)
-          ? DetectionResult.USE_METHOD_PARAMETERS
-          : DetectionResult.USE_LOCAL_VARS;
-    } catch (Exception ex) {
-      LOGGER.debug("isSpringUsingOnlyMethodParametersSpringVersion failed", ex);
-      return DetectionResult.UNKNOWN;
+        return detectionResult == DetectionResult.USE_METHOD_PARAMETERS;
     }
-  }
 
-  private static boolean isSpringUsingOnlyMethodParametersSpecificClass(Instrumentation inst) {
-    try {
-      for (Class<?> clazz : inst.getAllLoadedClasses()) {
-        if (clazz == null) {
-          // class unloaded
-          continue;
+    private static DetectionResult isSpringUsingOnlyMethodParametersSpringVersion(Instrumentation inst) {
+        try {
+            // scan for getting an already loaded class and get the classloader
+            ClassLoader springClassLoader = null;
+            for (Class<?> clazz : inst.getAllLoadedClasses()) {
+                // // getAllLoadedClasses can return null classes (Class Unloading)
+                if (clazz != null && clazz.getName().startsWith("org.springframework.core")) {
+                    springClassLoader = clazz.getClassLoader();
+                }
+            }
+            if (springClassLoader == null) {
+                return DetectionResult.UNKNOWN;
+            }
+            Class<?> springVersionClass =
+                    Class.forName("org.springframework.core.SpringVersion", true, springClassLoader);
+            Method m = springVersionClass.getDeclaredMethod("getVersion");
+            String version = (String) m.invoke(null);
+            ParsedSpringVersion springVersion = new ParsedSpringVersion(version);
+            // if Spring version is 6.1+ only using MethodParameters
+            return springVersion.major > 6 || (springVersion.major == 6 && springVersion.minor >= 1)
+                    ? DetectionResult.USE_METHOD_PARAMETERS
+                    : DetectionResult.USE_LOCAL_VARS;
+        } catch (Exception ex) {
+            LOGGER.debug("isSpringUsingOnlyMethodParametersSpringVersion failed", ex);
+            return DetectionResult.UNKNOWN;
         }
-        if ("org.springframework.web.client.RestClient".equals(clazz.getName())) {
-          // If this class (coming from Spring web since version 6.1) is found loaded it means
-          // Spring
-          // supports only getting parameter names from the MethodParameter attribute
-          return true;
+    }
+
+    private static boolean isSpringUsingOnlyMethodParametersSpecificClass(Instrumentation inst) {
+        try {
+            for (Class<?> clazz : inst.getAllLoadedClasses()) {
+                if (clazz == null) {
+                    // class unloaded
+                    continue;
+                }
+                if ("org.springframework.web.client.RestClient".equals(clazz.getName())) {
+                    // If this class (coming from Spring web since version 6.1) is found loaded it means
+                    // Spring
+                    // supports only getting parameter names from the MethodParameter attribute
+                    return true;
+                }
+            }
+        } catch (Exception ex) {
+            LOGGER.debug("isSpringUsingOnlyMethodParametersSpecificClass failed: ", ex);
         }
-      }
-    } catch (Exception ex) {
-      LOGGER.debug("isSpringUsingOnlyMethodParametersSpecificClass failed: ", ex);
+        // class not found, probably no Spring or failed
+        return false;
     }
-    // class not found, probably no Spring or failed
-    return false;
-  }
 
-  static class ParsedSpringVersion {
-    private static final Pattern VERSION_PATTERN = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)");
+    static class ParsedSpringVersion {
+        private static final Pattern VERSION_PATTERN = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)");
 
-    final int major;
-    final int minor;
-    final int patch;
+        final int major;
+        final int minor;
+        final int patch;
 
-    public ParsedSpringVersion(String strVersion) {
-      Matcher matcher = VERSION_PATTERN.matcher(strVersion);
-      if (matcher.find()) {
-        major = Integer.parseInt(matcher.group(1));
-        minor = Integer.parseInt(matcher.group(2));
-        patch = Integer.parseInt(matcher.group(3));
-      } else {
-        throw new IllegalArgumentException("Cannot parse SpringVersion: " + strVersion);
-      }
+        public ParsedSpringVersion(String strVersion) {
+            Matcher matcher = VERSION_PATTERN.matcher(strVersion);
+            if (matcher.find()) {
+                major = Integer.parseInt(matcher.group(1));
+                minor = Integer.parseInt(matcher.group(2));
+                patch = Integer.parseInt(matcher.group(3));
+            } else {
+                throw new IllegalArgumentException("Cannot parse SpringVersion: " + strVersion);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/StringTokenWriter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/StringTokenWriter.java
index b3b4778be8b..6ce84a73561 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/StringTokenWriter.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/StringTokenWriter.java
@@ -16,174 +16,174 @@
  * representation. Only works up to 1 max reference depth
  */
 public class StringTokenWriter implements SerializerWithLimits.TokenWriter {
-  private final StringBuilder sb;
-  private final List<EvaluationError> evalErrors;
-  private boolean initial;
-  private boolean inCollection;
-  private boolean inMapEntry;
-
-  public StringTokenWriter(StringBuilder sb, List<EvaluationError> evalErrors) {
-    this.sb = sb;
-    this.evalErrors = evalErrors;
-  }
-
-  @Override
-  public void prologue(Object value, String type) {
-    if (inMapEntry && !initial) {
-      sb.append('=');
-    } else if (inCollection && !initial) {
-      sb.append(", ");
-    }
-    initial = false;
-  }
-
-  @Override
-  public void epilogue(Object value) {}
-
-  @Override
-  public void nullValue() {
-    sb.append("null");
-  }
-
-  @Override
-  public void string(String value, boolean isComplete, int originalLength) {
-    sb.append(value).append(isComplete ? "" : "...");
-  }
-
-  @Override
-  public void primitiveValue(Object value) {
-    String typeName = value.getClass().getTypeName();
-    Function<Object, String> toString = WellKnownClasses.getSafeToString(typeName);
-    if (toString == null) {
-      throw new UnsupportedOperationException("Cannot convert value from type: " + typeName);
-    }
-    sb.append(toString.apply(value));
-  }
-
-  @Override
-  public void arrayPrologue(Object value) {
-    sb.append('[');
-    initial = true;
-    inCollection = true;
-  }
-
-  @Override
-  public void arrayEpilogue(Object value, boolean isComplete, int arraySize) {
-    sb.append(isComplete ? "]" : ", ...]");
-    inCollection = false;
-  }
-
-  @Override
-  public void primitiveArrayElement(String value, String type) {
-    if (inCollection && !initial) {
-      sb.append(", ");
-    }
-    sb.append(value);
-    initial = false;
-  }
-
-  @Override
-  public void collectionPrologue(Object value) {
-    sb.append('[');
-    initial = true;
-    inCollection = true;
-  }
-
-  @Override
-  public void collectionEpilogue(Object value, boolean isComplete, int size) {
-    sb.append(isComplete ? "]" : ", ...]");
-    inCollection = false;
-  }
-
-  @Override
-  public void mapPrologue(Object value) {
-    sb.append('{');
-    initial = true;
-    inCollection = true;
-  }
-
-  @Override
-  public void mapEntryPrologue(Map.Entry<?, ?> entry) {
-    if (!initial) {
-      sb.append(", ");
-    }
-    sb.append('[');
-    initial = true;
-    inMapEntry = true;
-  }
-
-  @Override
-  public void mapEntryEpilogue(Map.Entry<?, ?> entry) {
-    sb.append(']');
-    inMapEntry = false;
-  }
-
-  @Override
-  public void mapEpilogue(boolean isComplete, int size) {
-    sb.append(isComplete ? "}" : ", ...}");
-    inCollection = false;
-  }
-
-  @Override
-  public void objectPrologue(Object value) {
-    sb.append('{');
-    initial = true;
-  }
-
-  @Override
-  public void objectFieldPrologue(String fieldName, Object value, int maxDepth) {
-    if (!initial) {
-      sb.append(", ");
-    }
-    initial = false;
-    sb.append(fieldName).append('=');
-  }
-
-  @Override
-  public void objectEpilogue(Object value) {
-    sb.append('}');
-  }
-
-  @Override
-  public void handleFieldException(Exception ex, Field field) {
-    fieldNotCaptured("Cannot extract field: " + ex.toString(), field);
-  }
-
-  @Override
-  public void fieldNotCaptured(String reason, Field field) {
-    if (!initial) {
-      sb.append(", ");
-    }
-    initial = false;
-    sb.append(field.getName()).append('=').append(Value.undefinedValue());
-    evalErrors.add(new EvaluationError(field.getName(), reason));
-  }
-
-  @Override
-  public void notCaptured(SerializerWithLimits.NotCapturedReason reason) {
-    switch (reason) {
-      case MAX_DEPTH:
-        sb.append("...");
-        break;
-      case TIMEOUT:
-        sb.append('{').append(TIMEOUT_REASON).append('}');
-        break;
-      case FIELD_COUNT:
-        sb.append(", ...");
-        break;
-      case REDACTED_IDENT:
-        sb.append('{').append(REDACTED_STRING).append('}');
-        break;
-      case REDACTED_TYPE:
-        sb.append('{').append(REDACTED_STRING).append('}');
-        break;
-      default:
-        throw new RuntimeException("Unsupported NotCapturedReason: " + reason);
-    }
-  }
-
-  @Override
-  public void notCaptured(String reason) throws Exception {
-    sb.append("(Error: ").append(reason).append(')');
-  }
+    private final StringBuilder sb;
+    private final List<EvaluationError> evalErrors;
+    private boolean initial;
+    private boolean inCollection;
+    private boolean inMapEntry;
+
+    public StringTokenWriter(StringBuilder sb, List<EvaluationError> evalErrors) {
+        this.sb = sb;
+        this.evalErrors = evalErrors;
+    }
+
+    @Override
+    public void prologue(Object value, String type) {
+        if (inMapEntry && !initial) {
+            sb.append('=');
+        } else if (inCollection && !initial) {
+            sb.append(", ");
+        }
+        initial = false;
+    }
+
+    @Override
+    public void epilogue(Object value) {}
+
+    @Override
+    public void nullValue() {
+        sb.append("null");
+    }
+
+    @Override
+    public void string(String value, boolean isComplete, int originalLength) {
+        sb.append(value).append(isComplete ? "" : "...");
+    }
+
+    @Override
+    public void primitiveValue(Object value) {
+        String typeName = value.getClass().getTypeName();
+        Function<Object, String> toString = WellKnownClasses.getSafeToString(typeName);
+        if (toString == null) {
+            throw new UnsupportedOperationException("Cannot convert value from type: " + typeName);
+        }
+        sb.append(toString.apply(value));
+    }
+
+    @Override
+    public void arrayPrologue(Object value) {
+        sb.append('[');
+        initial = true;
+        inCollection = true;
+    }
+
+    @Override
+    public void arrayEpilogue(Object value, boolean isComplete, int arraySize) {
+        sb.append(isComplete ? "]" : ", ...]");
+        inCollection = false;
+    }
+
+    @Override
+    public void primitiveArrayElement(String value, String type) {
+        if (inCollection && !initial) {
+            sb.append(", ");
+        }
+        sb.append(value);
+        initial = false;
+    }
+
+    @Override
+    public void collectionPrologue(Object value) {
+        sb.append('[');
+        initial = true;
+        inCollection = true;
+    }
+
+    @Override
+    public void collectionEpilogue(Object value, boolean isComplete, int size) {
+        sb.append(isComplete ? "]" : ", ...]");
+        inCollection = false;
+    }
+
+    @Override
+    public void mapPrologue(Object value) {
+        sb.append('{');
+        initial = true;
+        inCollection = true;
+    }
+
+    @Override
+    public void mapEntryPrologue(Map.Entry<?, ?> entry) {
+        if (!initial) {
+            sb.append(", ");
+        }
+        sb.append('[');
+        initial = true;
+        inMapEntry = true;
+    }
+
+    @Override
+    public void mapEntryEpilogue(Map.Entry<?, ?> entry) {
+        sb.append(']');
+        inMapEntry = false;
+    }
+
+    @Override
+    public void mapEpilogue(boolean isComplete, int size) {
+        sb.append(isComplete ? "}" : ", ...}");
+        inCollection = false;
+    }
+
+    @Override
+    public void objectPrologue(Object value) {
+        sb.append('{');
+        initial = true;
+    }
+
+    @Override
+    public void objectFieldPrologue(String fieldName, Object value, int maxDepth) {
+        if (!initial) {
+            sb.append(", ");
+        }
+        initial = false;
+        sb.append(fieldName).append('=');
+    }
+
+    @Override
+    public void objectEpilogue(Object value) {
+        sb.append('}');
+    }
+
+    @Override
+    public void handleFieldException(Exception ex, Field field) {
+        fieldNotCaptured("Cannot extract field: " + ex.toString(), field);
+    }
+
+    @Override
+    public void fieldNotCaptured(String reason, Field field) {
+        if (!initial) {
+            sb.append(", ");
+        }
+        initial = false;
+        sb.append(field.getName()).append('=').append(Value.undefinedValue());
+        evalErrors.add(new EvaluationError(field.getName(), reason));
+    }
+
+    @Override
+    public void notCaptured(SerializerWithLimits.NotCapturedReason reason) {
+        switch (reason) {
+            case MAX_DEPTH:
+                sb.append("...");
+                break;
+            case TIMEOUT:
+                sb.append('{').append(TIMEOUT_REASON).append('}');
+                break;
+            case FIELD_COUNT:
+                sb.append(", ...");
+                break;
+            case REDACTED_IDENT:
+                sb.append('{').append(REDACTED_STRING).append('}');
+                break;
+            case REDACTED_TYPE:
+                sb.append('{').append(REDACTED_STRING).append('}');
+                break;
+            default:
+                throw new RuntimeException("Unsupported NotCapturedReason: " + reason);
+        }
+    }
+
+    @Override
+    public void notCaptured(String reason) throws Exception {
+        sb.append("(Error: ").append(reason).append(')');
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ValueScriptHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ValueScriptHelper.java
index 1ae9d5079d2..2e44290a678 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ValueScriptHelper.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ValueScriptHelper.java
@@ -8,19 +8,17 @@
 import java.time.Duration;
 
 public class ValueScriptHelper {
-  public static void serializeValue(
-      StringBuilder sb, String expr, Object value, CapturedContext.Status status, Limits limits) {
-    Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout());
-    TimeoutChecker timeoutChecker = TimeoutChecker.create(Config.get(), timeout);
-    SerializerWithLimits serializer =
-        new SerializerWithLimits(new StringTokenWriter(sb, status.getErrors()), timeoutChecker);
-    try {
-      serializer.serialize(
-          value,
-          value != null ? value.getClass().getTypeName() : Object.class.getTypeName(),
-          limits);
-    } catch (Exception ex) {
-      status.addError(new EvaluationError(expr, ex.getMessage()));
+    public static void serializeValue(
+            StringBuilder sb, String expr, Object value, CapturedContext.Status status, Limits limits) {
+        Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout());
+        TimeoutChecker timeoutChecker = TimeoutChecker.create(Config.get(), timeout);
+        SerializerWithLimits serializer =
+                new SerializerWithLimits(new StringTokenWriter(sb, status.getErrors()), timeoutChecker);
+        try {
+            serializer.serialize(
+                    value, value != null ? value.getClass().getTypeName() : Object.class.getTypeName(), limits);
+        } catch (Exception ex) {
+            status.addError(new EvaluationError(expr, ex.getMessage()));
+        }
     }
-  }
 }
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 f2c4348aeff..605779cb73c 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
@@ -28,1049 +28,1034 @@
  */
 public class WeakIdentityHashMap<K, V> extends AbstractMap<K, V> implements Map<K, V> {
 
-  /** The default initial capacity -- MUST be a power of two. */
-  private static final int DEFAULT_INITIAL_CAPACITY = 16;
-
-  /**
-   * The maximum capacity, used if a higher value is implicitly specified by either of the
-   * constructors with arguments. MUST be a power of two <= 1<<30.
-   */
-  private static final int MAXIMUM_CAPACITY = 1 << 30;
-
-  /** The load factor used when none specified in constructor. */
-  private static final float DEFAULT_LOAD_FACTOR = 0.75f;
-
-  /** The table, resized as necessary. Length MUST Always be a power of two. */
-  Entry<K, V>[] table;
-
-  /** The number of key-value mappings contained in this weak hash map. */
-  private int size;
-
-  /** The next size value at which to resize (capacity * load factor). */
-  private int threshold;
-
-  /** The load factor for the hash table. */
-  private final float loadFactor;
-
-  /** Reference queue for cleared WeakEntries */
-  private final ReferenceQueue<Object> queue = new ReferenceQueue<>();
-
-  /**
-   * The number of times this WeakHashMap has been structurally modified. Structural modifications
-   * are those that change the number of mappings in the map or otherwise modify its internal
-   * structure (e.g., rehash). This field is used to make iterators on Collection-views of the map
-   * fail-fast.
-   *
-   * @see ConcurrentModificationException
-   */
-  int modCount;
-
-  @SuppressWarnings("unchecked")
-  private Entry<K, V>[] newTable(int n) {
-    return (Entry<K, V>[]) new Entry<?, ?>[n];
-  }
-
-  /**
-   * Constructs a new, empty {@code WeakHashMap} with the given initial capacity and the given load
-   * factor.
-   *
-   * @param initialCapacity The initial capacity of the {@code WeakHashMap}
-   * @param loadFactor The load factor of the {@code WeakHashMap}
-   * @throws IllegalArgumentException if the initial capacity is negative, or if the load factor is
-   *     nonpositive.
-   */
-  public WeakIdentityHashMap(int initialCapacity, float loadFactor) {
-    if (initialCapacity < 0)
-      throw new IllegalArgumentException("Illegal Initial Capacity: " + initialCapacity);
-    if (initialCapacity > MAXIMUM_CAPACITY) initialCapacity = MAXIMUM_CAPACITY;
-
-    if (loadFactor <= 0 || Float.isNaN(loadFactor))
-      throw new IllegalArgumentException("Illegal Load factor: " + loadFactor);
-    int capacity = 1;
-    while (capacity < initialCapacity) capacity <<= 1;
-    table = newTable(capacity);
-    this.loadFactor = loadFactor;
-    threshold = (int) (capacity * loadFactor);
-  }
-
-  /**
-   * Constructs a new, empty {@code WeakHashMap} with the given initial capacity and the default
-   * load factor (0.75).
-   *
-   * @param initialCapacity The initial capacity of the {@code WeakHashMap}
-   * @throws IllegalArgumentException if the initial capacity is negative
-   */
-  public WeakIdentityHashMap(int initialCapacity) {
-    this(initialCapacity, DEFAULT_LOAD_FACTOR);
-  }
-
-  /**
-   * Constructs a new, empty {@code WeakHashMap} with the default initial capacity (16) and load
-   * factor (0.75).
-   */
-  public WeakIdentityHashMap() {
-    this(DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR);
-  }
-
-  /**
-   * Constructs a new {@code WeakHashMap} with the same mappings as the specified map. The {@code
-   * WeakHashMap} is created with the default load factor (0.75) and an initial capacity sufficient
-   * to hold the mappings in the specified map.
-   *
-   * @param m the map whose mappings are to be placed in this map
-   * @throws NullPointerException if the specified map is null
-   * @since 1.3
-   */
-  public WeakIdentityHashMap(Map<? extends K, ? extends V> m) {
-    this(
-        Math.max((int) (m.size() / DEFAULT_LOAD_FACTOR) + 1, DEFAULT_INITIAL_CAPACITY),
-        DEFAULT_LOAD_FACTOR);
-    putAll(m);
-  }
-
-  // internal utilities
-
-  /** Value representing null keys inside tables. */
-  private static final Object NULL_KEY = new Object();
-
-  /** Use NULL_KEY for key if it is null. */
-  private static Object maskNull(Object key) {
-    return (key == null) ? NULL_KEY : key;
-  }
-
-  /** Returns internal representation of null key back to caller as null. */
-  static Object unmaskNull(Object key) {
-    return (key == NULL_KEY) ? null : key;
-  }
-
-  /** Checks for reference equality of non-null reference x and possibly-null y. */
-  private static boolean eq(Object x, Object y) {
-    return x == y;
-  }
-
-  /**
-   * Retrieve object hash code and applies a supplemental hash function to the result hash, which
-   * defends against poor quality hash functions. This is critical because HashMap uses power-of-two
-   * length hash tables, that otherwise encounter collisions for hashCodes that do not differ in
-   * lower bits.
-   */
-  final int hash(Object k) {
-    int h = System.identityHashCode(k);
-
-    // This function ensures that hashCodes that differ only by
-    // constant multiples at each bit position have a bounded
-    // number of collisions (approximately 8 at default load factor).
-    h ^= (h >>> 20) ^ (h >>> 12);
-    return h ^ (h >>> 7) ^ (h >>> 4);
-  }
-
-  /** Returns index for hash code h. */
-  private static int indexFor(int h, int length) {
-    return h & (length - 1);
-  }
-
-  /** Expunges stale entries from the table. */
-  private void expungeStaleEntries() {
-    for (Object x; (x = queue.poll()) != null; ) {
-      synchronized (queue) {
-        @SuppressWarnings("unchecked")
-        Entry<K, V> e = (Entry<K, V>) x;
-        int i = indexFor(e.hash, table.length);
-
-        Entry<K, V> prev = table[i];
-        Entry<K, V> p = prev;
-        while (p != null) {
-          Entry<K, V> next = p.next;
-          if (p == e) {
-            if (prev == e) table[i] = next;
-            else prev.next = next;
-            // Must not null out e.next;
-            // stale entries may be in use by a HashIterator
-            e.value = null; // Help GC
-            size--;
-            break;
-          }
-          prev = p;
-          p = next;
-        }
-      }
-    }
-  }
-
-  /** Returns the table after first expunging stale entries. */
-  private Entry<K, V>[] getTable() {
-    expungeStaleEntries();
-    return table;
-  }
-
-  /**
-   * Returns the number of key-value mappings in this map. This result is a snapshot, and may not
-   * reflect unprocessed entries that will be removed before next attempted access because they are
-   * no longer referenced.
-   */
-  public int size() {
-    if (size == 0) return 0;
-    expungeStaleEntries();
-    return size;
-  }
-
-  /**
-   * Returns {@code true} if this map contains no key-value mappings. This result is a snapshot, and
-   * may not reflect unprocessed entries that will be removed before next attempted access because
-   * they are no longer referenced.
-   */
-  public boolean isEmpty() {
-    return size() == 0;
-  }
-
-  /**
-   * Returns the value to which the specified key is mapped, or {@code null} if this map contains no
-   * mapping for the key.
-   *
-   * <p>More formally, if this map contains a mapping from a key {@code k} to a value {@code v} such
-   * that {@code Objects.equals(key, k)}, then this method returns {@code v}; otherwise it returns
-   * {@code null}. (There can be at most one such mapping.)
-   *
-   * <p>A return value of {@code null} does not <i>necessarily</i> indicate that the map contains no
-   * mapping for the key; it's also possible that the map explicitly maps the key to {@code null}.
-   * The {@link #containsKey containsKey} operation may be used to distinguish these two cases.
-   *
-   * @see #put(Object, Object)
-   */
-  public V get(Object key) {
-    Object k = maskNull(key);
-    int h = hash(k);
-    Entry<K, V>[] tab = getTable();
-    int index = indexFor(h, tab.length);
-    Entry<K, V> e = tab[index];
-    while (e != null) {
-      if (e.hash == h && eq(k, e.get())) return e.value;
-      e = e.next;
-    }
-    return null;
-  }
-
-  /**
-   * Returns {@code true} if this map contains a mapping for the specified key.
-   *
-   * @param key The key whose presence in this map is to be tested
-   * @return {@code true} if there is a mapping for {@code key}; {@code false} otherwise
-   */
-  public boolean containsKey(Object key) {
-    return getEntry(key) != null;
-  }
-
-  /**
-   * Returns the entry associated with the specified key in this map. Returns null if the map
-   * contains no mapping for this key.
-   */
-  Entry<K, V> getEntry(Object key) {
-    Object k = maskNull(key);
-    int h = hash(k);
-    Entry<K, V>[] tab = getTable();
-    int index = indexFor(h, tab.length);
-    Entry<K, V> e = tab[index];
-    while (e != null && !(e.hash == h && eq(k, e.get()))) e = e.next;
-    return e;
-  }
-
-  /**
-   * Associates the specified value with the specified key in this map. If the map previously
-   * contained a mapping for this key, the old value is replaced.
-   *
-   * @param key key with which the specified value is to be associated.
-   * @param value value to be associated with the specified key.
-   * @return the previous value associated with {@code key}, or {@code null} if there was no mapping
-   *     for {@code key}. (A {@code null} return can also indicate that the map previously
-   *     associated {@code null} with {@code key}.)
-   */
-  public V put(K key, V value) {
-    Object k = maskNull(key);
-    int h = hash(k);
-    Entry<K, V>[] tab = getTable();
-    int i = indexFor(h, tab.length);
-
-    for (Entry<K, V> e = tab[i]; e != null; e = e.next) {
-      if (h == e.hash && eq(k, e.get())) {
-        V oldValue = e.value;
-        if (value != oldValue) e.value = value;
-        return oldValue;
-      }
-    }
+    /** The default initial capacity -- MUST be a power of two. */
+    private static final int DEFAULT_INITIAL_CAPACITY = 16;
 
-    modCount++;
-    Entry<K, V> e = tab[i];
-    tab[i] = new Entry<>(k, value, queue, h, e);
-    if (++size >= threshold) resize(tab.length * 2);
-    return null;
-  }
-
-  /**
-   * Rehashes the contents of this map into a new array with a larger capacity. This method is
-   * called automatically when the number of keys in this map reaches its threshold.
-   *
-   * <p>If current capacity is MAXIMUM_CAPACITY, this method does not resize the map, but sets
-   * threshold to Integer.MAX_VALUE. This has the effect of preventing future calls.
-   *
-   * @param newCapacity the new capacity, MUST be a power of two; must be greater than current
-   *     capacity unless current capacity is MAXIMUM_CAPACITY (in which case value is irrelevant).
-   */
-  void resize(int newCapacity) {
-    Entry<K, V>[] oldTable = getTable();
-    int oldCapacity = oldTable.length;
-    if (oldCapacity == MAXIMUM_CAPACITY) {
-      threshold = Integer.MAX_VALUE;
-      return;
-    }
+    /**
+     * The maximum capacity, used if a higher value is implicitly specified by either of the
+     * constructors with arguments. MUST be a power of two <= 1<<30.
+     */
+    private static final int MAXIMUM_CAPACITY = 1 << 30;
 
-    Entry<K, V>[] newTable = newTable(newCapacity);
-    transfer(oldTable, newTable);
-    table = newTable;
+    /** The load factor used when none specified in constructor. */
+    private static final float DEFAULT_LOAD_FACTOR = 0.75f;
 
-    /*
-     * If ignoring null elements and processing ref queue caused massive
-     * shrinkage, then restore old table.  This should be rare, but avoids
-     * unbounded expansion of garbage-filled tables.
+    /** The table, resized as necessary. Length MUST Always be a power of two. */
+    Entry<K, V>[] table;
+
+    /** The number of key-value mappings contained in this weak hash map. */
+    private int size;
+
+    /** The next size value at which to resize (capacity * load factor). */
+    private int threshold;
+
+    /** The load factor for the hash table. */
+    private final float loadFactor;
+
+    /** Reference queue for cleared WeakEntries */
+    private final ReferenceQueue<Object> queue = new ReferenceQueue<>();
+
+    /**
+     * The number of times this WeakHashMap has been structurally modified. Structural modifications
+     * are those that change the number of mappings in the map or otherwise modify its internal
+     * structure (e.g., rehash). This field is used to make iterators on Collection-views of the map
+     * fail-fast.
+     *
+     * @see ConcurrentModificationException
      */
-    if (size >= threshold / 2) {
-      threshold = (int) (newCapacity * loadFactor);
-    } else {
-      expungeStaleEntries();
-      transfer(newTable, oldTable);
-      table = oldTable;
-    }
-  }
-
-  /** Transfers all entries from src to dest tables */
-  private void transfer(Entry<K, V>[] src, Entry<K, V>[] dest) {
-    for (int j = 0; j < src.length; ++j) {
-      Entry<K, V> e = src[j];
-      src[j] = null;
-      while (e != null) {
-        Entry<K, V> next = e.next;
-        Object key = e.get();
-        if (key == null) {
-          e.next = null; // Help GC
-          e.value = null; //  "   "
-          size--;
-        } else {
-          int i = indexFor(e.hash, dest.length);
-          e.next = dest[i];
-          dest[i] = e;
-        }
-        e = next;
-      }
+    int modCount;
+
+    @SuppressWarnings("unchecked")
+    private Entry<K, V>[] newTable(int n) {
+        return (Entry<K, V>[]) new Entry<?, ?>[n];
     }
-  }
-
-  /**
-   * Copies all of the mappings from the specified map to this map. These mappings will replace any
-   * mappings that this map had for any of the keys currently in the specified map.
-   *
-   * @param m mappings to be stored in this map.
-   * @throws NullPointerException if the specified map is null.
-   */
-  public void putAll(Map<? extends K, ? extends V> m) {
-    int numKeysToBeAdded = m.size();
-    if (numKeysToBeAdded == 0) return;
-
-    /*
-     * Expand the map if the map if the number of mappings to be added
-     * is greater than or equal to threshold.  This is conservative; the
-     * obvious condition is (m.size() + size) >= threshold, but this
-     * condition could result in a map with twice the appropriate capacity,
-     * if the keys to be added overlap with the keys already in this map.
-     * By using the conservative calculation, we subject ourself
-     * to at most one extra resize.
+
+    /**
+     * Constructs a new, empty {@code WeakHashMap} with the given initial capacity and the given load
+     * factor.
+     *
+     * @param initialCapacity The initial capacity of the {@code WeakHashMap}
+     * @param loadFactor The load factor of the {@code WeakHashMap}
+     * @throws IllegalArgumentException if the initial capacity is negative, or if the load factor is
+     *     nonpositive.
      */
-    if (numKeysToBeAdded > threshold) {
-      int targetCapacity = (int) (numKeysToBeAdded / loadFactor + 1);
-      if (targetCapacity > MAXIMUM_CAPACITY) targetCapacity = MAXIMUM_CAPACITY;
-      int newCapacity = table.length;
-      while (newCapacity < targetCapacity) newCapacity <<= 1;
-      if (newCapacity > table.length) resize(newCapacity);
-    }
+    public WeakIdentityHashMap(int initialCapacity, float loadFactor) {
+        if (initialCapacity < 0) throw new IllegalArgumentException("Illegal Initial Capacity: " + initialCapacity);
+        if (initialCapacity > MAXIMUM_CAPACITY) initialCapacity = MAXIMUM_CAPACITY;
 
-    for (Map.Entry<? extends K, ? extends V> e : m.entrySet()) put(e.getKey(), e.getValue());
-  }
-
-  /**
-   * Removes the mapping for a key from this weak hash map if it is present. More formally, if this
-   * map contains a mapping from key {@code k} to value {@code v} such that <code>
-   * (key==null ?  k==null :
-   * key.equals(k))</code>, that mapping is removed. (The map can contain at most one such mapping.)
-   *
-   * <p>Returns the value to which this map previously associated the key, or {@code null} if the
-   * map contained no mapping for the key. A return value of {@code null} does not
-   * <i>necessarily</i> indicate that the map contained no mapping for the key; it's also possible
-   * that the map explicitly mapped the key to {@code null}.
-   *
-   * <p>The map will not contain a mapping for the specified key once the call returns.
-   *
-   * @param key key whose mapping is to be removed from the map
-   * @return the previous value associated with {@code key}, or {@code null} if there was no mapping
-   *     for {@code key}
-   */
-  public V remove(Object key) {
-    Object k = maskNull(key);
-    int h = hash(k);
-    Entry<K, V>[] tab = getTable();
-    int i = indexFor(h, tab.length);
-    Entry<K, V> prev = tab[i];
-    Entry<K, V> e = prev;
-
-    while (e != null) {
-      Entry<K, V> next = e.next;
-      if (h == e.hash && eq(k, e.get())) {
-        modCount++;
-        size--;
-        if (prev == e) tab[i] = next;
-        else prev.next = next;
-        return e.value;
-      }
-      prev = e;
-      e = next;
+        if (loadFactor <= 0 || Float.isNaN(loadFactor))
+            throw new IllegalArgumentException("Illegal Load factor: " + loadFactor);
+        int capacity = 1;
+        while (capacity < initialCapacity) capacity <<= 1;
+        table = newTable(capacity);
+        this.loadFactor = loadFactor;
+        threshold = (int) (capacity * loadFactor);
     }
 
-    return null;
-  }
-
-  /** Special version of remove needed by Entry set */
-  boolean removeMapping(Object o) {
-    if (!(o instanceof Map.Entry)) return false;
-    Entry<K, V>[] tab = getTable();
-    Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
-    Object k = maskNull(entry.getKey());
-    int h = hash(k);
-    int i = indexFor(h, tab.length);
-    Entry<K, V> prev = tab[i];
-    Entry<K, V> e = prev;
-
-    while (e != null) {
-      Entry<K, V> next = e.next;
-      if (h == e.hash && e.equals(entry)) {
-        modCount++;
-        size--;
-        if (prev == e) tab[i] = next;
-        else prev.next = next;
-        return true;
-      }
-      prev = e;
-      e = next;
+    /**
+     * Constructs a new, empty {@code WeakHashMap} with the given initial capacity and the default
+     * load factor (0.75).
+     *
+     * @param initialCapacity The initial capacity of the {@code WeakHashMap}
+     * @throws IllegalArgumentException if the initial capacity is negative
+     */
+    public WeakIdentityHashMap(int initialCapacity) {
+        this(initialCapacity, DEFAULT_LOAD_FACTOR);
     }
 
-    return false;
-  }
-
-  /** Removes all of the mappings from this map. The map will be empty after this call returns. */
-  public void clear() {
-    // clear out ref queue. We don't need to expunge entries
-    // since table is getting cleared.
-    while (queue.poll() != null)
-      ;
-
-    modCount++;
-    Arrays.fill(table, null);
-    size = 0;
-
-    // Allocation of array may have caused GC, which may have caused
-    // additional entries to go stale.  Removing these entries from the
-    // reference queue will make them eligible for reclamation.
-    while (queue.poll() != null)
-      ;
-  }
-
-  /**
-   * Returns {@code true} if this map maps one or more keys to the specified value.
-   *
-   * @param value value whose presence in this map is to be tested
-   * @return {@code true} if this map maps one or more keys to the specified value
-   */
-  public boolean containsValue(Object value) {
-    if (value == null) return containsNullValue();
-
-    Entry<K, V>[] tab = getTable();
-    for (int i = tab.length; i-- > 0; )
-      for (Entry<K, V> e = tab[i]; e != null; e = e.next) if (value.equals(e.value)) return true;
-    return false;
-  }
-
-  /** Special-case code for containsValue with null argument */
-  private boolean containsNullValue() {
-    Entry<K, V>[] tab = getTable();
-    for (int i = tab.length; i-- > 0; )
-      for (Entry<K, V> e = tab[i]; e != null; e = e.next) if (e.value == null) return true;
-    return false;
-  }
-
-  /** The entries in this hash table extend WeakReference, using its main ref field as the key. */
-  private static class Entry<K, V> extends WeakReference<Object> implements Map.Entry<K, V> {
-    V value;
-    final int hash;
-    Entry<K, V> next;
-
-    /** Creates new entry. */
-    Entry(Object key, V value, ReferenceQueue<Object> queue, int hash, Entry<K, V> next) {
-      super(key, queue);
-      this.value = value;
-      this.hash = hash;
-      this.next = next;
+    /**
+     * Constructs a new, empty {@code WeakHashMap} with the default initial capacity (16) and load
+     * factor (0.75).
+     */
+    public WeakIdentityHashMap() {
+        this(DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR);
     }
 
-    @SuppressWarnings("unchecked")
-    public K getKey() {
-      return (K) unmaskNull(get());
+    /**
+     * Constructs a new {@code WeakHashMap} with the same mappings as the specified map. The {@code
+     * WeakHashMap} is created with the default load factor (0.75) and an initial capacity sufficient
+     * to hold the mappings in the specified map.
+     *
+     * @param m the map whose mappings are to be placed in this map
+     * @throws NullPointerException if the specified map is null
+     * @since 1.3
+     */
+    public WeakIdentityHashMap(Map<? extends K, ? extends V> m) {
+        this(Math.max((int) (m.size() / DEFAULT_LOAD_FACTOR) + 1, DEFAULT_INITIAL_CAPACITY), DEFAULT_LOAD_FACTOR);
+        putAll(m);
     }
 
-    public V getValue() {
-      return value;
-    }
+    // internal utilities
 
-    public V setValue(V newValue) {
-      V oldValue = value;
-      value = newValue;
-      return oldValue;
-    }
+    /** Value representing null keys inside tables. */
+    private static final Object NULL_KEY = new Object();
 
-    public boolean equals(Object o) {
-      if (!(o instanceof Map.Entry)) return false;
-      Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
-      K k1 = getKey();
-      Object k2 = e.getKey();
-      if (k1 == k2 || (k1 != null && k1.equals(k2))) {
-        V v1 = getValue();
-        Object v2 = e.getValue();
-        if (v1 == v2 || (v1 != null && v1.equals(v2))) return true;
-      }
-      return false;
+    /** Use NULL_KEY for key if it is null. */
+    private static Object maskNull(Object key) {
+        return (key == null) ? NULL_KEY : key;
     }
 
-    public int hashCode() {
-      K k = getKey();
-      V v = getValue();
-      return Objects.hashCode(k) ^ Objects.hashCode(v);
+    /** Returns internal representation of null key back to caller as null. */
+    static Object unmaskNull(Object key) {
+        return (key == NULL_KEY) ? null : key;
     }
 
-    public String toString() {
-      return getKey() + "=" + getValue();
+    /** Checks for reference equality of non-null reference x and possibly-null y. */
+    private static boolean eq(Object x, Object y) {
+        return x == y;
     }
-  }
 
-  private abstract class HashIterator<T> implements Iterator<T> {
-    private int index;
-    private Entry<K, V> entry;
-    private Entry<K, V> lastReturned;
-    private int expectedModCount = modCount;
+    /**
+     * Retrieve object hash code and applies a supplemental hash function to the result hash, which
+     * defends against poor quality hash functions. This is critical because HashMap uses power-of-two
+     * length hash tables, that otherwise encounter collisions for hashCodes that do not differ in
+     * lower bits.
+     */
+    final int hash(Object k) {
+        int h = System.identityHashCode(k);
+
+        // This function ensures that hashCodes that differ only by
+        // constant multiples at each bit position have a bounded
+        // number of collisions (approximately 8 at default load factor).
+        h ^= (h >>> 20) ^ (h >>> 12);
+        return h ^ (h >>> 7) ^ (h >>> 4);
+    }
+
+    /** Returns index for hash code h. */
+    private static int indexFor(int h, int length) {
+        return h & (length - 1);
+    }
+
+    /** Expunges stale entries from the table. */
+    private void expungeStaleEntries() {
+        for (Object x; (x = queue.poll()) != null; ) {
+            synchronized (queue) {
+                @SuppressWarnings("unchecked")
+                Entry<K, V> e = (Entry<K, V>) x;
+                int i = indexFor(e.hash, table.length);
+
+                Entry<K, V> prev = table[i];
+                Entry<K, V> p = prev;
+                while (p != null) {
+                    Entry<K, V> next = p.next;
+                    if (p == e) {
+                        if (prev == e) table[i] = next;
+                        else prev.next = next;
+                        // Must not null out e.next;
+                        // stale entries may be in use by a HashIterator
+                        e.value = null; // Help GC
+                        size--;
+                        break;
+                    }
+                    prev = p;
+                    p = next;
+                }
+            }
+        }
+    }
 
-    /** Strong reference needed to avoid disappearance of key between hasNext and next */
-    private Object nextKey;
+    /** Returns the table after first expunging stale entries. */
+    private Entry<K, V>[] getTable() {
+        expungeStaleEntries();
+        return table;
+    }
 
     /**
-     * Strong reference needed to avoid disappearance of key between nextEntry() and any use of the
-     * entry
+     * Returns the number of key-value mappings in this map. This result is a snapshot, and may not
+     * reflect unprocessed entries that will be removed before next attempted access because they are
+     * no longer referenced.
      */
-    private Object currentKey;
+    public int size() {
+        if (size == 0) return 0;
+        expungeStaleEntries();
+        return size;
+    }
 
-    HashIterator() {
-      index = isEmpty() ? 0 : table.length;
+    /**
+     * Returns {@code true} if this map contains no key-value mappings. This result is a snapshot, and
+     * may not reflect unprocessed entries that will be removed before next attempted access because
+     * they are no longer referenced.
+     */
+    public boolean isEmpty() {
+        return size() == 0;
     }
 
-    public boolean hasNext() {
-      Entry<K, V>[] t = table;
-
-      while (nextKey == null) {
-        Entry<K, V> e = entry;
-        int i = index;
-        while (e == null && i > 0) e = t[--i];
-        entry = e;
-        index = i;
-        if (e == null) {
-          currentKey = null;
-          return false;
-        }
-        nextKey = e.get(); // hold on to key in strong ref
-        if (nextKey == null) entry = entry.next;
-      }
-      return true;
+    /**
+     * Returns the value to which the specified key is mapped, or {@code null} if this map contains no
+     * mapping for the key.
+     *
+     * <p>More formally, if this map contains a mapping from a key {@code k} to a value {@code v} such
+     * that {@code Objects.equals(key, k)}, then this method returns {@code v}; otherwise it returns
+     * {@code null}. (There can be at most one such mapping.)
+     *
+     * <p>A return value of {@code null} does not <i>necessarily</i> indicate that the map contains no
+     * mapping for the key; it's also possible that the map explicitly maps the key to {@code null}.
+     * The {@link #containsKey containsKey} operation may be used to distinguish these two cases.
+     *
+     * @see #put(Object, Object)
+     */
+    public V get(Object key) {
+        Object k = maskNull(key);
+        int h = hash(k);
+        Entry<K, V>[] tab = getTable();
+        int index = indexFor(h, tab.length);
+        Entry<K, V> e = tab[index];
+        while (e != null) {
+            if (e.hash == h && eq(k, e.get())) return e.value;
+            e = e.next;
+        }
+        return null;
     }
 
-    /** The common parts of next() across different types of iterators */
-    protected Entry<K, V> nextEntry() {
-      if (modCount != expectedModCount) throw new ConcurrentModificationException();
-      if (nextKey == null && !hasNext()) throw new NoSuchElementException();
+    /**
+     * Returns {@code true} if this map contains a mapping for the specified key.
+     *
+     * @param key The key whose presence in this map is to be tested
+     * @return {@code true} if there is a mapping for {@code key}; {@code false} otherwise
+     */
+    public boolean containsKey(Object key) {
+        return getEntry(key) != null;
+    }
 
-      lastReturned = entry;
-      entry = entry.next;
-      currentKey = nextKey;
-      nextKey = null;
-      return lastReturned;
+    /**
+     * Returns the entry associated with the specified key in this map. Returns null if the map
+     * contains no mapping for this key.
+     */
+    Entry<K, V> getEntry(Object key) {
+        Object k = maskNull(key);
+        int h = hash(k);
+        Entry<K, V>[] tab = getTable();
+        int index = indexFor(h, tab.length);
+        Entry<K, V> e = tab[index];
+        while (e != null && !(e.hash == h && eq(k, e.get()))) e = e.next;
+        return e;
     }
 
-    public void remove() {
-      if (lastReturned == null) throw new IllegalStateException();
-      if (modCount != expectedModCount) throw new ConcurrentModificationException();
+    /**
+     * Associates the specified value with the specified key in this map. If the map previously
+     * contained a mapping for this key, the old value is replaced.
+     *
+     * @param key key with which the specified value is to be associated.
+     * @param value value to be associated with the specified key.
+     * @return the previous value associated with {@code key}, or {@code null} if there was no mapping
+     *     for {@code key}. (A {@code null} return can also indicate that the map previously
+     *     associated {@code null} with {@code key}.)
+     */
+    public V put(K key, V value) {
+        Object k = maskNull(key);
+        int h = hash(k);
+        Entry<K, V>[] tab = getTable();
+        int i = indexFor(h, tab.length);
+
+        for (Entry<K, V> e = tab[i]; e != null; e = e.next) {
+            if (h == e.hash && eq(k, e.get())) {
+                V oldValue = e.value;
+                if (value != oldValue) e.value = value;
+                return oldValue;
+            }
+        }
 
-      WeakIdentityHashMap.this.remove(currentKey);
-      expectedModCount = modCount;
-      lastReturned = null;
-      currentKey = null;
+        modCount++;
+        Entry<K, V> e = tab[i];
+        tab[i] = new Entry<>(k, value, queue, h, e);
+        if (++size >= threshold) resize(tab.length * 2);
+        return null;
     }
-  }
 
-  private class ValueIterator extends HashIterator<V> {
-    public V next() {
-      return nextEntry().value;
-    }
-  }
+    /**
+     * Rehashes the contents of this map into a new array with a larger capacity. This method is
+     * called automatically when the number of keys in this map reaches its threshold.
+     *
+     * <p>If current capacity is MAXIMUM_CAPACITY, this method does not resize the map, but sets
+     * threshold to Integer.MAX_VALUE. This has the effect of preventing future calls.
+     *
+     * @param newCapacity the new capacity, MUST be a power of two; must be greater than current
+     *     capacity unless current capacity is MAXIMUM_CAPACITY (in which case value is irrelevant).
+     */
+    void resize(int newCapacity) {
+        Entry<K, V>[] oldTable = getTable();
+        int oldCapacity = oldTable.length;
+        if (oldCapacity == MAXIMUM_CAPACITY) {
+            threshold = Integer.MAX_VALUE;
+            return;
+        }
 
-  private class KeyIterator extends HashIterator<K> {
-    public K next() {
-      return nextEntry().getKey();
+        Entry<K, V>[] newTable = newTable(newCapacity);
+        transfer(oldTable, newTable);
+        table = newTable;
+
+        /*
+         * If ignoring null elements and processing ref queue caused massive
+         * shrinkage, then restore old table.  This should be rare, but avoids
+         * unbounded expansion of garbage-filled tables.
+         */
+        if (size >= threshold / 2) {
+            threshold = (int) (newCapacity * loadFactor);
+        } else {
+            expungeStaleEntries();
+            transfer(newTable, oldTable);
+            table = oldTable;
+        }
     }
-  }
 
-  private class EntryIterator extends HashIterator<Map.Entry<K, V>> {
-    public Map.Entry<K, V> next() {
-      return nextEntry();
-    }
-  }
-
-  // Views
-
-  private transient Set<Map.Entry<K, V>> entrySet;
-  private transient volatile Set<K> keySet;
-
-  /**
-   * Returns a {@link Set} view of the keys contained in this map. The set is backed by the map, so
-   * changes to the map are reflected in the set, and vice-versa. If the map is modified while an
-   * iteration over the set is in progress (except through the iterator's own {@code remove}
-   * operation), the results of the iteration are undefined. The set supports element removal, which
-   * removes the corresponding mapping from the map, via the {@code Iterator.remove}, {@code
-   * Set.remove}, {@code removeAll}, {@code retainAll}, and {@code clear} operations. It does not
-   * support the {@code add} or {@code addAll} operations.
-   */
-  public Set<K> keySet() {
-    Set<K> ks = keySet;
-    if (ks == null) {
-      ks = new KeySet();
-      keySet = ks;
+    /** Transfers all entries from src to dest tables */
+    private void transfer(Entry<K, V>[] src, Entry<K, V>[] dest) {
+        for (int j = 0; j < src.length; ++j) {
+            Entry<K, V> e = src[j];
+            src[j] = null;
+            while (e != null) {
+                Entry<K, V> next = e.next;
+                Object key = e.get();
+                if (key == null) {
+                    e.next = null; // Help GC
+                    e.value = null; //  "   "
+                    size--;
+                } else {
+                    int i = indexFor(e.hash, dest.length);
+                    e.next = dest[i];
+                    dest[i] = e;
+                }
+                e = next;
+            }
+        }
     }
-    return ks;
-  }
 
-  private class KeySet extends AbstractSet<K> {
-    public Iterator<K> iterator() {
-      return new KeyIterator();
-    }
+    /**
+     * Copies all of the mappings from the specified map to this map. These mappings will replace any
+     * mappings that this map had for any of the keys currently in the specified map.
+     *
+     * @param m mappings to be stored in this map.
+     * @throws NullPointerException if the specified map is null.
+     */
+    public void putAll(Map<? extends K, ? extends V> m) {
+        int numKeysToBeAdded = m.size();
+        if (numKeysToBeAdded == 0) return;
+
+        /*
+         * Expand the map if the map if the number of mappings to be added
+         * is greater than or equal to threshold.  This is conservative; the
+         * obvious condition is (m.size() + size) >= threshold, but this
+         * condition could result in a map with twice the appropriate capacity,
+         * if the keys to be added overlap with the keys already in this map.
+         * By using the conservative calculation, we subject ourself
+         * to at most one extra resize.
+         */
+        if (numKeysToBeAdded > threshold) {
+            int targetCapacity = (int) (numKeysToBeAdded / loadFactor + 1);
+            if (targetCapacity > MAXIMUM_CAPACITY) targetCapacity = MAXIMUM_CAPACITY;
+            int newCapacity = table.length;
+            while (newCapacity < targetCapacity) newCapacity <<= 1;
+            if (newCapacity > table.length) resize(newCapacity);
+        }
 
-    public int size() {
-      return WeakIdentityHashMap.this.size();
+        for (Map.Entry<? extends K, ? extends V> e : m.entrySet()) put(e.getKey(), e.getValue());
     }
 
-    public boolean contains(Object o) {
-      return containsKey(o);
-    }
+    /**
+     * Removes the mapping for a key from this weak hash map if it is present. More formally, if this
+     * map contains a mapping from key {@code k} to value {@code v} such that <code>
+     * (key==null ?  k==null :
+     * key.equals(k))</code>, that mapping is removed. (The map can contain at most one such mapping.)
+     *
+     * <p>Returns the value to which this map previously associated the key, or {@code null} if the
+     * map contained no mapping for the key. A return value of {@code null} does not
+     * <i>necessarily</i> indicate that the map contained no mapping for the key; it's also possible
+     * that the map explicitly mapped the key to {@code null}.
+     *
+     * <p>The map will not contain a mapping for the specified key once the call returns.
+     *
+     * @param key key whose mapping is to be removed from the map
+     * @return the previous value associated with {@code key}, or {@code null} if there was no mapping
+     *     for {@code key}
+     */
+    public V remove(Object key) {
+        Object k = maskNull(key);
+        int h = hash(k);
+        Entry<K, V>[] tab = getTable();
+        int i = indexFor(h, tab.length);
+        Entry<K, V> prev = tab[i];
+        Entry<K, V> e = prev;
+
+        while (e != null) {
+            Entry<K, V> next = e.next;
+            if (h == e.hash && eq(k, e.get())) {
+                modCount++;
+                size--;
+                if (prev == e) tab[i] = next;
+                else prev.next = next;
+                return e.value;
+            }
+            prev = e;
+            e = next;
+        }
 
-    public boolean remove(Object o) {
-      if (containsKey(o)) {
-        WeakIdentityHashMap.this.remove(o);
-        return true;
-      } else return false;
+        return null;
+    }
+
+    /** Special version of remove needed by Entry set */
+    boolean removeMapping(Object o) {
+        if (!(o instanceof Map.Entry)) return false;
+        Entry<K, V>[] tab = getTable();
+        Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
+        Object k = maskNull(entry.getKey());
+        int h = hash(k);
+        int i = indexFor(h, tab.length);
+        Entry<K, V> prev = tab[i];
+        Entry<K, V> e = prev;
+
+        while (e != null) {
+            Entry<K, V> next = e.next;
+            if (h == e.hash && e.equals(entry)) {
+                modCount++;
+                size--;
+                if (prev == e) tab[i] = next;
+                else prev.next = next;
+                return true;
+            }
+            prev = e;
+            e = next;
+        }
+
+        return false;
     }
 
+    /** Removes all of the mappings from this map. The map will be empty after this call returns. */
     public void clear() {
-      WeakIdentityHashMap.this.clear();
-    }
+        // clear out ref queue. We don't need to expunge entries
+        // since table is getting cleared.
+        while (queue.poll() != null)
+            ;
 
-    public Spliterator<K> spliterator() {
-      return new KeySpliterator<>(WeakIdentityHashMap.this, 0, -1, 0, 0);
-    }
-  }
-
-  private transient volatile Collection<V> values;
-
-  /**
-   * Returns a {@link Collection} view of the values contained in this map. The collection is backed
-   * by the map, so changes to the map are reflected in the collection, and vice-versa. If the map
-   * is modified while an iteration over the collection is in progress (except through the
-   * iterator's own {@code remove} operation), the results of the iteration are undefined. The
-   * collection supports element removal, which removes the corresponding mapping from the map, via
-   * the {@code Iterator.remove}, {@code Collection.remove}, {@code removeAll}, {@code retainAll}
-   * and {@code clear} operations. It does not support the {@code add} or {@code addAll} operations.
-   */
-  public Collection<V> values() {
-    Collection<V> vs = values;
-    if (vs == null) {
-      vs = new Values();
-      values = vs;
-    }
-    return vs;
-  }
+        modCount++;
+        Arrays.fill(table, null);
+        size = 0;
 
-  private class Values extends AbstractCollection<V> {
-    public Iterator<V> iterator() {
-      return new ValueIterator();
+        // Allocation of array may have caused GC, which may have caused
+        // additional entries to go stale.  Removing these entries from the
+        // reference queue will make them eligible for reclamation.
+        while (queue.poll() != null)
+            ;
     }
 
-    public int size() {
-      return WeakIdentityHashMap.this.size();
-    }
+    /**
+     * Returns {@code true} if this map maps one or more keys to the specified value.
+     *
+     * @param value value whose presence in this map is to be tested
+     * @return {@code true} if this map maps one or more keys to the specified value
+     */
+    public boolean containsValue(Object value) {
+        if (value == null) return containsNullValue();
+
+        Entry<K, V>[] tab = getTable();
+        for (int i = tab.length; i-- > 0; )
+            for (Entry<K, V> e = tab[i]; e != null; e = e.next) if (value.equals(e.value)) return true;
+        return false;
+    }
+
+    /** Special-case code for containsValue with null argument */
+    private boolean containsNullValue() {
+        Entry<K, V>[] tab = getTable();
+        for (int i = tab.length; i-- > 0; )
+            for (Entry<K, V> e = tab[i]; e != null; e = e.next) if (e.value == null) return true;
+        return false;
+    }
+
+    /** The entries in this hash table extend WeakReference, using its main ref field as the key. */
+    private static class Entry<K, V> extends WeakReference<Object> implements Map.Entry<K, V> {
+        V value;
+        final int hash;
+        Entry<K, V> next;
+
+        /** Creates new entry. */
+        Entry(Object key, V value, ReferenceQueue<Object> queue, int hash, Entry<K, V> next) {
+            super(key, queue);
+            this.value = value;
+            this.hash = hash;
+            this.next = next;
+        }
 
-    public boolean contains(Object o) {
-      return containsValue(o);
-    }
+        @SuppressWarnings("unchecked")
+        public K getKey() {
+            return (K) unmaskNull(get());
+        }
 
-    public void clear() {
-      WeakIdentityHashMap.this.clear();
-    }
+        public V getValue() {
+            return value;
+        }
 
-    public Spliterator<V> spliterator() {
-      return new ValueSpliterator<>(WeakIdentityHashMap.this, 0, -1, 0, 0);
-    }
-  }
-
-  /**
-   * Returns a {@link Set} view of the mappings contained in this map. The set is backed by the map,
-   * so changes to the map are reflected in the set, and vice-versa. If the map is modified while an
-   * iteration over the set is in progress (except through the iterator's own {@code remove}
-   * operation, or through the {@code setValue} operation on a map entry returned by the iterator)
-   * the results of the iteration are undefined. The set supports element removal, which removes the
-   * corresponding mapping from the map, via the {@code Iterator.remove}, {@code Set.remove}, {@code
-   * removeAll}, {@code retainAll} and {@code clear} operations. It does not support the {@code add}
-   * or {@code addAll} operations.
-   */
-  public Set<Map.Entry<K, V>> entrySet() {
-    Set<Map.Entry<K, V>> es = entrySet;
-    return es != null ? es : (entrySet = new EntrySet());
-  }
-
-  private class EntrySet extends AbstractSet<Map.Entry<K, V>> {
-    public Iterator<Map.Entry<K, V>> iterator() {
-      return new EntryIterator();
-    }
+        public V setValue(V newValue) {
+            V oldValue = value;
+            value = newValue;
+            return oldValue;
+        }
 
-    public boolean contains(Object o) {
-      if (!(o instanceof Map.Entry)) return false;
-      Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
-      Entry<K, V> candidate = getEntry(e.getKey());
-      return candidate != null && candidate.equals(e);
-    }
+        public boolean equals(Object o) {
+            if (!(o instanceof Map.Entry)) return false;
+            Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
+            K k1 = getKey();
+            Object k2 = e.getKey();
+            if (k1 == k2 || (k1 != null && k1.equals(k2))) {
+                V v1 = getValue();
+                Object v2 = e.getValue();
+                if (v1 == v2 || (v1 != null && v1.equals(v2))) return true;
+            }
+            return false;
+        }
 
-    public boolean remove(Object o) {
-      return removeMapping(o);
-    }
+        public int hashCode() {
+            K k = getKey();
+            V v = getValue();
+            return Objects.hashCode(k) ^ Objects.hashCode(v);
+        }
 
-    public int size() {
-      return WeakIdentityHashMap.this.size();
+        public String toString() {
+            return getKey() + "=" + getValue();
+        }
     }
 
-    public void clear() {
-      WeakIdentityHashMap.this.clear();
+    private abstract class HashIterator<T> implements Iterator<T> {
+        private int index;
+        private Entry<K, V> entry;
+        private Entry<K, V> lastReturned;
+        private int expectedModCount = modCount;
+
+        /** Strong reference needed to avoid disappearance of key between hasNext and next */
+        private Object nextKey;
+
+        /**
+         * Strong reference needed to avoid disappearance of key between nextEntry() and any use of the
+         * entry
+         */
+        private Object currentKey;
+
+        HashIterator() {
+            index = isEmpty() ? 0 : table.length;
+        }
+
+        public boolean hasNext() {
+            Entry<K, V>[] t = table;
+
+            while (nextKey == null) {
+                Entry<K, V> e = entry;
+                int i = index;
+                while (e == null && i > 0) e = t[--i];
+                entry = e;
+                index = i;
+                if (e == null) {
+                    currentKey = null;
+                    return false;
+                }
+                nextKey = e.get(); // hold on to key in strong ref
+                if (nextKey == null) entry = entry.next;
+            }
+            return true;
+        }
+
+        /** The common parts of next() across different types of iterators */
+        protected Entry<K, V> nextEntry() {
+            if (modCount != expectedModCount) throw new ConcurrentModificationException();
+            if (nextKey == null && !hasNext()) throw new NoSuchElementException();
+
+            lastReturned = entry;
+            entry = entry.next;
+            currentKey = nextKey;
+            nextKey = null;
+            return lastReturned;
+        }
+
+        public void remove() {
+            if (lastReturned == null) throw new IllegalStateException();
+            if (modCount != expectedModCount) throw new ConcurrentModificationException();
+
+            WeakIdentityHashMap.this.remove(currentKey);
+            expectedModCount = modCount;
+            lastReturned = null;
+            currentKey = null;
+        }
     }
 
-    private List<Map.Entry<K, V>> deepCopy() {
-      List<Map.Entry<K, V>> list = new ArrayList<>(size());
-      for (Map.Entry<K, V> e : this) list.add(new AbstractMap.SimpleEntry<>(e));
-      return list;
+    private class ValueIterator extends HashIterator<V> {
+        public V next() {
+            return nextEntry().value;
+        }
     }
 
-    public Object[] toArray() {
-      return deepCopy().toArray();
+    private class KeyIterator extends HashIterator<K> {
+        public K next() {
+            return nextEntry().getKey();
+        }
     }
 
-    public <T> T[] toArray(T[] a) {
-      return deepCopy().toArray(a);
+    private class EntryIterator extends HashIterator<Map.Entry<K, V>> {
+        public Map.Entry<K, V> next() {
+            return nextEntry();
+        }
     }
 
-    public Spliterator<Map.Entry<K, V>> spliterator() {
-      return new EntrySpliterator<>(WeakIdentityHashMap.this, 0, -1, 0, 0);
+    // Views
+
+    private transient Set<Map.Entry<K, V>> entrySet;
+    private transient volatile Set<K> keySet;
+
+    /**
+     * Returns a {@link Set} view of the keys contained in this map. The set is backed by the map, so
+     * changes to the map are reflected in the set, and vice-versa. If the map is modified while an
+     * iteration over the set is in progress (except through the iterator's own {@code remove}
+     * operation), the results of the iteration are undefined. The set supports element removal, which
+     * removes the corresponding mapping from the map, via the {@code Iterator.remove}, {@code
+     * Set.remove}, {@code removeAll}, {@code retainAll}, and {@code clear} operations. It does not
+     * support the {@code add} or {@code addAll} operations.
+     */
+    public Set<K> keySet() {
+        Set<K> ks = keySet;
+        if (ks == null) {
+            ks = new KeySet();
+            keySet = ks;
+        }
+        return ks;
     }
-  }
 
-  @SuppressWarnings("unchecked")
-  @Override
-  public void forEach(BiConsumer<? super K, ? super V> action) {
-    Objects.requireNonNull(action);
-    int expectedModCount = modCount;
+    private class KeySet extends AbstractSet<K> {
+        public Iterator<K> iterator() {
+            return new KeyIterator();
+        }
 
-    Entry<K, V>[] tab = getTable();
-    for (Entry<K, V> entry : tab) {
-      while (entry != null) {
-        Object key = entry.get();
-        if (key != null) {
-          action.accept((K) unmaskNull(key), entry.value);
+        public int size() {
+            return WeakIdentityHashMap.this.size();
         }
-        entry = entry.next;
 
-        if (expectedModCount != modCount) {
-          throw new ConcurrentModificationException();
+        public boolean contains(Object o) {
+            return containsKey(o);
         }
-      }
-    }
-  }
 
-  @SuppressWarnings("unchecked")
-  @Override
-  public void replaceAll(BiFunction<? super K, ? super V, ? extends V> function) {
-    Objects.requireNonNull(function);
-    int expectedModCount = modCount;
+        public boolean remove(Object o) {
+            if (containsKey(o)) {
+                WeakIdentityHashMap.this.remove(o);
+                return true;
+            } else return false;
+        }
 
-    Entry<K, V>[] tab = getTable();
-    for (Entry<K, V> entry : tab) {
-      while (entry != null) {
-        Object key = entry.get();
-        if (key != null) {
-          entry.value = function.apply((K) unmaskNull(key), entry.value);
+        public void clear() {
+            WeakIdentityHashMap.this.clear();
         }
-        entry = entry.next;
 
-        if (expectedModCount != modCount) {
-          throw new ConcurrentModificationException();
+        public Spliterator<K> spliterator() {
+            return new KeySpliterator<>(WeakIdentityHashMap.this, 0, -1, 0, 0);
         }
-      }
-    }
-  }
-
-  /** Similar form as other hash Spliterators, but skips dead elements. */
-  static class WeakHashMapSpliterator<K, V> {
-    final WeakIdentityHashMap<K, V> map;
-    Entry<K, V> current; // current node
-    int index; // current index, modified on advance/split
-    int fence; // -1 until first use; then one past last index
-    int est; // size estimate
-    int expectedModCount; // for comodification checks
-
-    WeakHashMapSpliterator(
-        WeakIdentityHashMap<K, V> m, int origin, int fence, int est, int expectedModCount) {
-      this.map = m;
-      this.index = origin;
-      this.fence = fence;
-      this.est = est;
-      this.expectedModCount = expectedModCount;
     }
 
-    final int getFence() { // initialize fence and size on first use
-      int hi;
-      if ((hi = fence) < 0) {
-        WeakIdentityHashMap<K, V> m = map;
-        est = m.size();
-        expectedModCount = m.modCount;
-        hi = fence = m.table.length;
-      }
-      return hi;
+    private transient volatile Collection<V> values;
+
+    /**
+     * Returns a {@link Collection} view of the values contained in this map. The collection is backed
+     * by the map, so changes to the map are reflected in the collection, and vice-versa. If the map
+     * is modified while an iteration over the collection is in progress (except through the
+     * iterator's own {@code remove} operation), the results of the iteration are undefined. The
+     * collection supports element removal, which removes the corresponding mapping from the map, via
+     * the {@code Iterator.remove}, {@code Collection.remove}, {@code removeAll}, {@code retainAll}
+     * and {@code clear} operations. It does not support the {@code add} or {@code addAll} operations.
+     */
+    public Collection<V> values() {
+        Collection<V> vs = values;
+        if (vs == null) {
+            vs = new Values();
+            values = vs;
+        }
+        return vs;
     }
 
-    public final long estimateSize() {
-      getFence(); // force init
-      return (long) est;
+    private class Values extends AbstractCollection<V> {
+        public Iterator<V> iterator() {
+            return new ValueIterator();
+        }
+
+        public int size() {
+            return WeakIdentityHashMap.this.size();
+        }
+
+        public boolean contains(Object o) {
+            return containsValue(o);
+        }
+
+        public void clear() {
+            WeakIdentityHashMap.this.clear();
+        }
+
+        public Spliterator<V> spliterator() {
+            return new ValueSpliterator<>(WeakIdentityHashMap.this, 0, -1, 0, 0);
+        }
     }
-  }
 
-  static final class KeySpliterator<K, V> extends WeakHashMapSpliterator<K, V>
-      implements Spliterator<K> {
-    KeySpliterator(
-        WeakIdentityHashMap<K, V> m, int origin, int fence, int est, int expectedModCount) {
-      super(m, origin, fence, est, expectedModCount);
+    /**
+     * Returns a {@link Set} view of the mappings contained in this map. The set is backed by the map,
+     * so changes to the map are reflected in the set, and vice-versa. If the map is modified while an
+     * iteration over the set is in progress (except through the iterator's own {@code remove}
+     * operation, or through the {@code setValue} operation on a map entry returned by the iterator)
+     * the results of the iteration are undefined. The set supports element removal, which removes the
+     * corresponding mapping from the map, via the {@code Iterator.remove}, {@code Set.remove}, {@code
+     * removeAll}, {@code retainAll} and {@code clear} operations. It does not support the {@code add}
+     * or {@code addAll} operations.
+     */
+    public Set<Map.Entry<K, V>> entrySet() {
+        Set<Map.Entry<K, V>> es = entrySet;
+        return es != null ? es : (entrySet = new EntrySet());
     }
 
-    public KeySpliterator<K, V> trySplit() {
-      int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
-      return (lo >= mid)
-          ? null
-          : new KeySpliterator<>(map, lo, index = mid, est >>>= 1, expectedModCount);
+    private class EntrySet extends AbstractSet<Map.Entry<K, V>> {
+        public Iterator<Map.Entry<K, V>> iterator() {
+            return new EntryIterator();
+        }
+
+        public boolean contains(Object o) {
+            if (!(o instanceof Map.Entry)) return false;
+            Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
+            Entry<K, V> candidate = getEntry(e.getKey());
+            return candidate != null && candidate.equals(e);
+        }
+
+        public boolean remove(Object o) {
+            return removeMapping(o);
+        }
+
+        public int size() {
+            return WeakIdentityHashMap.this.size();
+        }
+
+        public void clear() {
+            WeakIdentityHashMap.this.clear();
+        }
+
+        private List<Map.Entry<K, V>> deepCopy() {
+            List<Map.Entry<K, V>> list = new ArrayList<>(size());
+            for (Map.Entry<K, V> e : this) list.add(new AbstractMap.SimpleEntry<>(e));
+            return list;
+        }
+
+        public Object[] toArray() {
+            return deepCopy().toArray();
+        }
+
+        public <T> T[] toArray(T[] a) {
+            return deepCopy().toArray(a);
+        }
+
+        public Spliterator<Map.Entry<K, V>> spliterator() {
+            return new EntrySpliterator<>(WeakIdentityHashMap.this, 0, -1, 0, 0);
+        }
     }
 
-    public void forEachRemaining(Consumer<? super K> action) {
-      int i, hi, mc;
-      if (action == null) throw new NullPointerException();
-      WeakIdentityHashMap<K, V> m = map;
-      Entry<K, V>[] tab = m.table;
-      if ((hi = fence) < 0) {
-        mc = expectedModCount = m.modCount;
-        hi = fence = tab.length;
-      } else mc = expectedModCount;
-      if (tab.length >= hi && (i = index) >= 0 && (i < (index = hi) || current != null)) {
-        Entry<K, V> p = current;
-        current = null; // exhaust
-        do {
-          if (p == null) p = tab[i++];
-          else {
-            Object x = p.get();
-            p = p.next;
-            if (x != null) {
-              @SuppressWarnings("unchecked")
-              K k = (K) unmaskNull(x);
-              action.accept(k);
+    @SuppressWarnings("unchecked")
+    @Override
+    public void forEach(BiConsumer<? super K, ? super V> action) {
+        Objects.requireNonNull(action);
+        int expectedModCount = modCount;
+
+        Entry<K, V>[] tab = getTable();
+        for (Entry<K, V> entry : tab) {
+            while (entry != null) {
+                Object key = entry.get();
+                if (key != null) {
+                    action.accept((K) unmaskNull(key), entry.value);
+                }
+                entry = entry.next;
+
+                if (expectedModCount != modCount) {
+                    throw new ConcurrentModificationException();
+                }
             }
-          }
-        } while (p != null || i < hi);
-      }
-      if (m.modCount != mc) throw new ConcurrentModificationException();
+        }
     }
 
-    public boolean tryAdvance(Consumer<? super K> action) {
-      int hi;
-      if (action == null) throw new NullPointerException();
-      Entry<K, V>[] tab = map.table;
-      if (tab.length >= (hi = getFence()) && index >= 0) {
-        while (current != null || index < hi) {
-          if (current == null) current = tab[index++];
-          else {
-            Object x = current.get();
-            current = current.next;
-            if (x != null) {
-              @SuppressWarnings("unchecked")
-              K k = (K) unmaskNull(x);
-              action.accept(k);
-              if (map.modCount != expectedModCount) throw new ConcurrentModificationException();
-              return true;
+    @SuppressWarnings("unchecked")
+    @Override
+    public void replaceAll(BiFunction<? super K, ? super V, ? extends V> function) {
+        Objects.requireNonNull(function);
+        int expectedModCount = modCount;
+
+        Entry<K, V>[] tab = getTable();
+        for (Entry<K, V> entry : tab) {
+            while (entry != null) {
+                Object key = entry.get();
+                if (key != null) {
+                    entry.value = function.apply((K) unmaskNull(key), entry.value);
+                }
+                entry = entry.next;
+
+                if (expectedModCount != modCount) {
+                    throw new ConcurrentModificationException();
+                }
             }
-          }
         }
-      }
-      return false;
     }
 
-    public int characteristics() {
-      return Spliterator.DISTINCT;
-    }
-  }
+    /** Similar form as other hash Spliterators, but skips dead elements. */
+    static class WeakHashMapSpliterator<K, V> {
+        final WeakIdentityHashMap<K, V> map;
+        Entry<K, V> current; // current node
+        int index; // current index, modified on advance/split
+        int fence; // -1 until first use; then one past last index
+        int est; // size estimate
+        int expectedModCount; // for comodification checks
+
+        WeakHashMapSpliterator(WeakIdentityHashMap<K, V> m, int origin, int fence, int est, int expectedModCount) {
+            this.map = m;
+            this.index = origin;
+            this.fence = fence;
+            this.est = est;
+            this.expectedModCount = expectedModCount;
+        }
 
-  static final class ValueSpliterator<K, V> extends WeakHashMapSpliterator<K, V>
-      implements Spliterator<V> {
-    ValueSpliterator(
-        WeakIdentityHashMap<K, V> m, int origin, int fence, int est, int expectedModCount) {
-      super(m, origin, fence, est, expectedModCount);
-    }
+        final int getFence() { // initialize fence and size on first use
+            int hi;
+            if ((hi = fence) < 0) {
+                WeakIdentityHashMap<K, V> m = map;
+                est = m.size();
+                expectedModCount = m.modCount;
+                hi = fence = m.table.length;
+            }
+            return hi;
+        }
 
-    public ValueSpliterator<K, V> trySplit() {
-      int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
-      return (lo >= mid)
-          ? null
-          : new ValueSpliterator<>(map, lo, index = mid, est >>>= 1, expectedModCount);
+        public final long estimateSize() {
+            getFence(); // force init
+            return (long) est;
+        }
     }
 
-    public void forEachRemaining(Consumer<? super V> action) {
-      int i, hi, mc;
-      if (action == null) throw new NullPointerException();
-      WeakIdentityHashMap<K, V> m = map;
-      Entry<K, V>[] tab = m.table;
-      if ((hi = fence) < 0) {
-        mc = expectedModCount = m.modCount;
-        hi = fence = tab.length;
-      } else mc = expectedModCount;
-      if (tab.length >= hi && (i = index) >= 0 && (i < (index = hi) || current != null)) {
-        Entry<K, V> p = current;
-        current = null; // exhaust
-        do {
-          if (p == null) p = tab[i++];
-          else {
-            Object x = p.get();
-            V v = p.value;
-            p = p.next;
-            if (x != null) action.accept(v);
-          }
-        } while (p != null || i < hi);
-      }
-      if (m.modCount != mc) throw new ConcurrentModificationException();
-    }
+    static final class KeySpliterator<K, V> extends WeakHashMapSpliterator<K, V> implements Spliterator<K> {
+        KeySpliterator(WeakIdentityHashMap<K, V> m, int origin, int fence, int est, int expectedModCount) {
+            super(m, origin, fence, est, expectedModCount);
+        }
+
+        public KeySpliterator<K, V> trySplit() {
+            int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
+            return (lo >= mid) ? null : new KeySpliterator<>(map, lo, index = mid, est >>>= 1, expectedModCount);
+        }
 
-    public boolean tryAdvance(Consumer<? super V> action) {
-      int hi;
-      if (action == null) throw new NullPointerException();
-      Entry<K, V>[] tab = map.table;
-      if (tab.length >= (hi = getFence()) && index >= 0) {
-        while (current != null || index < hi) {
-          if (current == null) current = tab[index++];
-          else {
-            Object x = current.get();
-            V v = current.value;
-            current = current.next;
-            if (x != null) {
-              action.accept(v);
-              if (map.modCount != expectedModCount) throw new ConcurrentModificationException();
-              return true;
+        public void forEachRemaining(Consumer<? super K> action) {
+            int i, hi, mc;
+            if (action == null) throw new NullPointerException();
+            WeakIdentityHashMap<K, V> m = map;
+            Entry<K, V>[] tab = m.table;
+            if ((hi = fence) < 0) {
+                mc = expectedModCount = m.modCount;
+                hi = fence = tab.length;
+            } else mc = expectedModCount;
+            if (tab.length >= hi && (i = index) >= 0 && (i < (index = hi) || current != null)) {
+                Entry<K, V> p = current;
+                current = null; // exhaust
+                do {
+                    if (p == null) p = tab[i++];
+                    else {
+                        Object x = p.get();
+                        p = p.next;
+                        if (x != null) {
+                            @SuppressWarnings("unchecked")
+                            K k = (K) unmaskNull(x);
+                            action.accept(k);
+                        }
+                    }
+                } while (p != null || i < hi);
             }
-          }
+            if (m.modCount != mc) throw new ConcurrentModificationException();
         }
-      }
-      return false;
-    }
 
-    public int characteristics() {
-      return 0;
-    }
-  }
+        public boolean tryAdvance(Consumer<? super K> action) {
+            int hi;
+            if (action == null) throw new NullPointerException();
+            Entry<K, V>[] tab = map.table;
+            if (tab.length >= (hi = getFence()) && index >= 0) {
+                while (current != null || index < hi) {
+                    if (current == null) current = tab[index++];
+                    else {
+                        Object x = current.get();
+                        current = current.next;
+                        if (x != null) {
+                            @SuppressWarnings("unchecked")
+                            K k = (K) unmaskNull(x);
+                            action.accept(k);
+                            if (map.modCount != expectedModCount) throw new ConcurrentModificationException();
+                            return true;
+                        }
+                    }
+                }
+            }
+            return false;
+        }
 
-  static final class EntrySpliterator<K, V> extends WeakHashMapSpliterator<K, V>
-      implements Spliterator<Map.Entry<K, V>> {
-    EntrySpliterator(
-        WeakIdentityHashMap<K, V> m, int origin, int fence, int est, int expectedModCount) {
-      super(m, origin, fence, est, expectedModCount);
+        public int characteristics() {
+            return Spliterator.DISTINCT;
+        }
     }
 
-    public EntrySpliterator<K, V> trySplit() {
-      int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
-      return (lo >= mid)
-          ? null
-          : new EntrySpliterator<>(map, lo, index = mid, est >>>= 1, expectedModCount);
-    }
+    static final class ValueSpliterator<K, V> extends WeakHashMapSpliterator<K, V> implements Spliterator<V> {
+        ValueSpliterator(WeakIdentityHashMap<K, V> m, int origin, int fence, int est, int expectedModCount) {
+            super(m, origin, fence, est, expectedModCount);
+        }
+
+        public ValueSpliterator<K, V> trySplit() {
+            int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
+            return (lo >= mid) ? null : new ValueSpliterator<>(map, lo, index = mid, est >>>= 1, expectedModCount);
+        }
 
-    public void forEachRemaining(Consumer<? super Map.Entry<K, V>> action) {
-      int i, hi, mc;
-      if (action == null) throw new NullPointerException();
-      WeakIdentityHashMap<K, V> m = map;
-      Entry<K, V>[] tab = m.table;
-      if ((hi = fence) < 0) {
-        mc = expectedModCount = m.modCount;
-        hi = fence = tab.length;
-      } else mc = expectedModCount;
-      if (tab.length >= hi && (i = index) >= 0 && (i < (index = hi) || current != null)) {
-        Entry<K, V> p = current;
-        current = null; // exhaust
-        do {
-          if (p == null) p = tab[i++];
-          else {
-            Object x = p.get();
-            V v = p.value;
-            p = p.next;
-            if (x != null) {
-              @SuppressWarnings("unchecked")
-              K k = (K) unmaskNull(x);
-              action.accept(new AbstractMap.SimpleImmutableEntry<>(k, v));
+        public void forEachRemaining(Consumer<? super V> action) {
+            int i, hi, mc;
+            if (action == null) throw new NullPointerException();
+            WeakIdentityHashMap<K, V> m = map;
+            Entry<K, V>[] tab = m.table;
+            if ((hi = fence) < 0) {
+                mc = expectedModCount = m.modCount;
+                hi = fence = tab.length;
+            } else mc = expectedModCount;
+            if (tab.length >= hi && (i = index) >= 0 && (i < (index = hi) || current != null)) {
+                Entry<K, V> p = current;
+                current = null; // exhaust
+                do {
+                    if (p == null) p = tab[i++];
+                    else {
+                        Object x = p.get();
+                        V v = p.value;
+                        p = p.next;
+                        if (x != null) action.accept(v);
+                    }
+                } while (p != null || i < hi);
             }
-          }
-        } while (p != null || i < hi);
-      }
-      if (m.modCount != mc) throw new ConcurrentModificationException();
-    }
+            if (m.modCount != mc) throw new ConcurrentModificationException();
+        }
 
-    public boolean tryAdvance(Consumer<? super Map.Entry<K, V>> action) {
-      int hi;
-      if (action == null) throw new NullPointerException();
-      Entry<K, V>[] tab = map.table;
-      if (tab.length >= (hi = getFence()) && index >= 0) {
-        while (current != null || index < hi) {
-          if (current == null) current = tab[index++];
-          else {
-            Object x = current.get();
-            V v = current.value;
-            current = current.next;
-            if (x != null) {
-              @SuppressWarnings("unchecked")
-              K k = (K) unmaskNull(x);
-              action.accept(new AbstractMap.SimpleImmutableEntry<>(k, v));
-              if (map.modCount != expectedModCount) throw new ConcurrentModificationException();
-              return true;
+        public boolean tryAdvance(Consumer<? super V> action) {
+            int hi;
+            if (action == null) throw new NullPointerException();
+            Entry<K, V>[] tab = map.table;
+            if (tab.length >= (hi = getFence()) && index >= 0) {
+                while (current != null || index < hi) {
+                    if (current == null) current = tab[index++];
+                    else {
+                        Object x = current.get();
+                        V v = current.value;
+                        current = current.next;
+                        if (x != null) {
+                            action.accept(v);
+                            if (map.modCount != expectedModCount) throw new ConcurrentModificationException();
+                            return true;
+                        }
+                    }
+                }
             }
-          }
+            return false;
+        }
+
+        public int characteristics() {
+            return 0;
         }
-      }
-      return false;
     }
 
-    public int characteristics() {
-      return Spliterator.DISTINCT;
+    static final class EntrySpliterator<K, V> extends WeakHashMapSpliterator<K, V>
+            implements Spliterator<Map.Entry<K, V>> {
+        EntrySpliterator(WeakIdentityHashMap<K, V> m, int origin, int fence, int est, int expectedModCount) {
+            super(m, origin, fence, est, expectedModCount);
+        }
+
+        public EntrySpliterator<K, V> trySplit() {
+            int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
+            return (lo >= mid) ? null : new EntrySpliterator<>(map, lo, index = mid, est >>>= 1, expectedModCount);
+        }
+
+        public void forEachRemaining(Consumer<? super Map.Entry<K, V>> action) {
+            int i, hi, mc;
+            if (action == null) throw new NullPointerException();
+            WeakIdentityHashMap<K, V> m = map;
+            Entry<K, V>[] tab = m.table;
+            if ((hi = fence) < 0) {
+                mc = expectedModCount = m.modCount;
+                hi = fence = tab.length;
+            } else mc = expectedModCount;
+            if (tab.length >= hi && (i = index) >= 0 && (i < (index = hi) || current != null)) {
+                Entry<K, V> p = current;
+                current = null; // exhaust
+                do {
+                    if (p == null) p = tab[i++];
+                    else {
+                        Object x = p.get();
+                        V v = p.value;
+                        p = p.next;
+                        if (x != null) {
+                            @SuppressWarnings("unchecked")
+                            K k = (K) unmaskNull(x);
+                            action.accept(new AbstractMap.SimpleImmutableEntry<>(k, v));
+                        }
+                    }
+                } while (p != null || i < hi);
+            }
+            if (m.modCount != mc) throw new ConcurrentModificationException();
+        }
+
+        public boolean tryAdvance(Consumer<? super Map.Entry<K, V>> action) {
+            int hi;
+            if (action == null) throw new NullPointerException();
+            Entry<K, V>[] tab = map.table;
+            if (tab.length >= (hi = getFence()) && index >= 0) {
+                while (current != null || index < hi) {
+                    if (current == null) current = tab[index++];
+                    else {
+                        Object x = current.get();
+                        V v = current.value;
+                        current = current.next;
+                        if (x != null) {
+                            @SuppressWarnings("unchecked")
+                            K k = (K) unmaskNull(x);
+                            action.accept(new AbstractMap.SimpleImmutableEntry<>(k, v));
+                            if (map.modCount != expectedModCount) throw new ConcurrentModificationException();
+                            return true;
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+
+        public int characteristics() {
+            return Spliterator.DISTINCT;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/AllowListHelperTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/AllowListHelperTest.java
index 312e116e2df..286d0084ae1 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/AllowListHelperTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/AllowListHelperTest.java
@@ -8,25 +8,24 @@
 
 public class AllowListHelperTest {
 
-  @Test
-  public void allowAll() {
-    AllowListHelper allowListHelper = new AllowListHelper(null);
-    Assertions.assertTrue(allowListHelper.isAllowed("foo"));
-    allowListHelper = create(Collections.emptyList(), Collections.emptyList());
-    Assertions.assertTrue(allowListHelper.isAllowed("foo"));
-  }
+    @Test
+    public void allowAll() {
+        AllowListHelper allowListHelper = new AllowListHelper(null);
+        Assertions.assertTrue(allowListHelper.isAllowed("foo"));
+        allowListHelper = create(Collections.emptyList(), Collections.emptyList());
+        Assertions.assertTrue(allowListHelper.isAllowed("foo"));
+    }
 
-  @Test
-  public void simple() {
-    AllowListHelper allowListHelper =
-        create(Arrays.asList("com.datadog"), Arrays.asList("java.util.HashMap"));
-    Assertions.assertTrue(allowListHelper.isAllowed(AllowListHelper.class.getTypeName()));
-    Assertions.assertTrue(allowListHelper.isAllowed("java.util.HashMap"));
-    Assertions.assertFalse(allowListHelper.isAllowed("org.junit.jupiter.api.Test"));
-    Assertions.assertFalse(allowListHelper.isAllowed("java.util.ArrayList"));
-  }
+    @Test
+    public void simple() {
+        AllowListHelper allowListHelper = create(Arrays.asList("com.datadog"), Arrays.asList("java.util.HashMap"));
+        Assertions.assertTrue(allowListHelper.isAllowed(AllowListHelper.class.getTypeName()));
+        Assertions.assertTrue(allowListHelper.isAllowed("java.util.HashMap"));
+        Assertions.assertFalse(allowListHelper.isAllowed("org.junit.jupiter.api.Test"));
+        Assertions.assertFalse(allowListHelper.isAllowed("java.util.ArrayList"));
+    }
 
-  private static AllowListHelper create(List<String> packagePrefixes, List<String> classes) {
-    return new AllowListHelper(new Configuration.FilterList(packagePrefixes, classes));
-  }
+    private static AllowListHelper create(List<String> packagePrefixes, List<String> classes) {
+        return new AllowListHelper(new Configuration.FilterList(packagePrefixes, classes));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java
index 321758461d1..de0165a8cbc 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java
@@ -101,3261 +101,2991 @@
 import utils.SourceCompiler;
 
 public class CapturedSnapshotTest extends CapturingTestBase {
-  private static final ProbeId PROBE_ID1 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f6", 0);
-  private static final ProbeId PROBE_ID2 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f7", 0);
-  private static final ProbeId PROBE_ID3 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
-  private static final ProbeId PROBE_ID4 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f9", 0);
-  private static final ProbeId LINE_PROBE_ID1 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000001", 0);
-  private static final ProbeId LINE_PROBE_ID2 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000002", 0);
-  private static final ProbeId LINE_PROBE_ID3 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000003", 0);
-  private static final ProbeId LINE_PROBE_ID4 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000004", 0);
-  private static final String KOTLIN_EXT = ".kt";
-  private static final String SCALA_EXT = ".scala";
-  private static final String GROOVY_EXT = ".groovy";
-
-  @Test
-  public void bridgeMethods() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "BridgeMethods";
-    TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "process", null);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    String result = Reflect.onClass(testClass).call("main").get();
-    assertEquals("hello world", result);
-    assertEquals(1, listener.snapshots.size());
-  }
-
-  @Test
-  public void methodNotFound() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "foobar", null);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "2").get();
-    assertEquals(2, result);
-    verify(probeStatusSink)
-        .addError(eq(PROBE_ID), eq("Cannot find method CapturedSnapshot01::foobar"));
-  }
-
-  @Test
-  public void methodProbe() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    TestSnapshotListener listener =
-        installMethodProbe(CLASS_NAME, "main", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertNotNull(snapshot.getCaptures().getEntry());
-    assertNotNull(snapshot.getCaptures().getReturn());
-    assertCaptureArgs(snapshot.getCaptures().getEntry(), "arg", "java.lang.String", "1");
-    assertCaptureArgs(snapshot.getCaptures().getReturn(), "arg", "java.lang.String", "1");
-    assertTrue(snapshot.getDuration() > 0);
-    assertTrue(snapshot.getStack().size() > 0);
-    assertEquals("CapturedSnapshot01.main", snapshot.getStack().get(0).getFunction());
-  }
-
-  @Test
-  public void methodProbeAtExit() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    TestSnapshotListener listener =
-        installMethodProbeAtExit(CLASS_NAME, "main", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    // no entry values capture
-    assertEquals(CapturedContext.EMPTY_CAPTURING_CONTEXT, snapshot.getCaptures().getEntry());
-    assertCaptureArgs(snapshot.getCaptures().getReturn(), "arg", "java.lang.String", "1");
-    assertTrue(snapshot.getDuration() > 0);
-    assertTrue(snapshot.getStack().size() > 0);
-    assertEquals("CapturedSnapshot01.main", snapshot.getStack().get(0).getFunction());
-  }
-
-  @Test
-  public void methodProbeAtExitWithCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    LogProbe probe =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "main", "int (java.lang.String)")
-            .when(new ProbeCondition(DSL.when(DSL.eq(ref("arg"), DSL.value("1"))), "arg == '1'"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertEquals(CapturedContext.EMPTY_CAPTURING_CONTEXT, snapshot.getCaptures().getEntry());
-    assertCaptureArgs(snapshot.getCaptures().getReturn(), "arg", "java.lang.String", "1");
-    assertTrue(snapshot.getDuration() > 0);
-    assertTrue(snapshot.getStack().size() > 0);
-    assertEquals("CapturedSnapshot01.main", snapshot.getStack().get(0).getFunction());
-  }
-
-  @Test
-  public void localVarHoistingNoPreviousStore() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.fasterxml.jackson.core.json.ByteSourceJsonBootstrapper";
-    TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "detectEncoding", null);
-    Class<?> testClass =
-        loadClass(
-            CLASS_NAME,
-            getClass().getResource("/classfiles/ByteSourceJsonBootstrapper.classfile").getFile());
-    assertNotNull(testClass);
-  }
-
-  @Test
-  public void singleLineProbe() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    TestSnapshotListener listener = installLineProbe(LINE_PROBE_ID1, CLASS_NAME, line);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-    assertNull(snapshot.getCaptures().getEntry());
-    assertNull(snapshot.getCaptures().getReturn());
-    Assertions.assertEquals(1, snapshot.getCaptures().getLines().size());
-    assertCaptureArgs(snapshot.getCaptures().getLines().get(line), "arg", "java.lang.String", "1");
-    assertCaptureLocals(snapshot.getCaptures().getLines().get(line), "var1", "int", "1");
-    assertTrue(snapshot.getStack().size() > 0);
-    assertEquals("CapturedSnapshot01.java", snapshot.getStack().get(0).getFileName());
-  }
-
-  @Test
-  public void resolutionFails() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    TestSnapshotListener listener = installLineProbe(LINE_PROBE_ID1, CLASS_NAME, line);
-    DebuggerAgentHelper.injectSink(listener);
-    DebuggerContext.initProbeResolver(probeIndex -> null);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertEquals(0, listener.snapshots.size());
-  }
-
-  @Test
-  public void resolutionThrows() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    LogProbe lineProbe = createLineProbe(LINE_PROBE_ID1, CLASS_NAME, line);
-    LogProbe methodProbe =
-        createMethodProbe(PROBE_ID2, CLASS_NAME, "main", "int (java.lang.String)");
-    TestSnapshotListener listener = installProbes(lineProbe, methodProbe);
-    DebuggerAgentHelper.injectSink(listener);
-    DebuggerContext.initProbeResolver(
-        probeIndex -> {
-          throw new IllegalArgumentException("oops");
+    private static final ProbeId PROBE_ID1 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f6", 0);
+    private static final ProbeId PROBE_ID2 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f7", 0);
+    private static final ProbeId PROBE_ID3 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
+    private static final ProbeId PROBE_ID4 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f9", 0);
+    private static final ProbeId LINE_PROBE_ID1 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000001", 0);
+    private static final ProbeId LINE_PROBE_ID2 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000002", 0);
+    private static final ProbeId LINE_PROBE_ID3 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000003", 0);
+    private static final ProbeId LINE_PROBE_ID4 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000004", 0);
+    private static final String KOTLIN_EXT = ".kt";
+    private static final String SCALA_EXT = ".scala";
+    private static final String GROOVY_EXT = ".groovy";
+
+    @Test
+    public void bridgeMethods() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "BridgeMethods";
+        TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "process", null);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        String result = Reflect.onClass(testClass).call("main").get();
+        assertEquals("hello world", result);
+        assertEquals(1, listener.snapshots.size());
+    }
+
+    @Test
+    public void methodNotFound() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "foobar", null);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "2").get();
+        assertEquals(2, result);
+        verify(probeStatusSink).addError(eq(PROBE_ID), eq("Cannot find method CapturedSnapshot01::foobar"));
+    }
+
+    @Test
+    public void methodProbe() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "main", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertNotNull(snapshot.getCaptures().getEntry());
+        assertNotNull(snapshot.getCaptures().getReturn());
+        assertCaptureArgs(snapshot.getCaptures().getEntry(), "arg", "java.lang.String", "1");
+        assertCaptureArgs(snapshot.getCaptures().getReturn(), "arg", "java.lang.String", "1");
+        assertTrue(snapshot.getDuration() > 0);
+        assertTrue(snapshot.getStack().size() > 0);
+        assertEquals("CapturedSnapshot01.main", snapshot.getStack().get(0).getFunction());
+    }
+
+    @Test
+    public void methodProbeAtExit() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        TestSnapshotListener listener = installMethodProbeAtExit(CLASS_NAME, "main", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        // no entry values capture
+        assertEquals(
+                CapturedContext.EMPTY_CAPTURING_CONTEXT, snapshot.getCaptures().getEntry());
+        assertCaptureArgs(snapshot.getCaptures().getReturn(), "arg", "java.lang.String", "1");
+        assertTrue(snapshot.getDuration() > 0);
+        assertTrue(snapshot.getStack().size() > 0);
+        assertEquals("CapturedSnapshot01.main", snapshot.getStack().get(0).getFunction());
+    }
+
+    @Test
+    public void methodProbeAtExitWithCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        LogProbe probe = createProbeBuilder(PROBE_ID, CLASS_NAME, "main", "int (java.lang.String)")
+                .when(new ProbeCondition(DSL.when(DSL.eq(ref("arg"), DSL.value("1"))), "arg == '1'"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertEquals(
+                CapturedContext.EMPTY_CAPTURING_CONTEXT, snapshot.getCaptures().getEntry());
+        assertCaptureArgs(snapshot.getCaptures().getReturn(), "arg", "java.lang.String", "1");
+        assertTrue(snapshot.getDuration() > 0);
+        assertTrue(snapshot.getStack().size() > 0);
+        assertEquals("CapturedSnapshot01.main", snapshot.getStack().get(0).getFunction());
+    }
+
+    @Test
+    public void localVarHoistingNoPreviousStore() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.fasterxml.jackson.core.json.ByteSourceJsonBootstrapper";
+        TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "detectEncoding", null);
+        Class<?> testClass = loadClass(
+                CLASS_NAME,
+                getClass()
+                        .getResource("/classfiles/ByteSourceJsonBootstrapper.classfile")
+                        .getFile());
+        assertNotNull(testClass);
+    }
+
+    @Test
+    public void singleLineProbe() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        TestSnapshotListener listener = installLineProbe(LINE_PROBE_ID1, CLASS_NAME, line);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+        assertNull(snapshot.getCaptures().getEntry());
+        assertNull(snapshot.getCaptures().getReturn());
+        Assertions.assertEquals(1, snapshot.getCaptures().getLines().size());
+        assertCaptureArgs(snapshot.getCaptures().getLines().get(line), "arg", "java.lang.String", "1");
+        assertCaptureLocals(snapshot.getCaptures().getLines().get(line), "var1", "int", "1");
+        assertTrue(snapshot.getStack().size() > 0);
+        assertEquals("CapturedSnapshot01.java", snapshot.getStack().get(0).getFileName());
+    }
+
+    @Test
+    public void resolutionFails() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        TestSnapshotListener listener = installLineProbe(LINE_PROBE_ID1, CLASS_NAME, line);
+        DebuggerAgentHelper.injectSink(listener);
+        DebuggerContext.initProbeResolver(probeIndex -> null);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertEquals(0, listener.snapshots.size());
+    }
+
+    @Test
+    public void resolutionThrows() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        LogProbe lineProbe = createLineProbe(LINE_PROBE_ID1, CLASS_NAME, line);
+        LogProbe methodProbe = createMethodProbe(PROBE_ID2, CLASS_NAME, "main", "int (java.lang.String)");
+        TestSnapshotListener listener = installProbes(lineProbe, methodProbe);
+        DebuggerAgentHelper.injectSink(listener);
+        DebuggerContext.initProbeResolver(probeIndex -> {
+            throw new IllegalArgumentException("oops");
         });
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertEquals(0, listener.snapshots.size());
-  }
-
-  @Test
-  public void constructor() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot02";
-    TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "<init>", "(String, Object)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertOneSnapshot(listener);
-  }
-
-  @Test
-  public void constructorFirstLine() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot02";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
-    TestSnapshotListener listener = installLineProbe(LINE_PROBE_ID2, CLASS_NAME, line);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    ArgumentCaptor<ProbeId> probeIdCaptor = ArgumentCaptor.forClass(ProbeId.class);
-    ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
-    verify(probeStatusSink).addError(probeIdCaptor.capture(), strCaptor.capture());
-    assertEquals(LINE_PROBE_ID2.getId(), probeIdCaptor.getAllValues().get(0).getId());
-    assertEquals(
-        "Cannot instrument the first line of a constructor", strCaptor.getAllValues().get(0));
-  }
-
-  @Test
-  public void overloadedConstructor() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot02";
-    TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "<init>", "()");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertOneSnapshot(listener);
-  }
-
-  @Test
-  public void veryOldClassFile() throws Exception {
-    final String CLASS_NAME = "antlr.Token"; // compiled with jdk 1.2
-    TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "<init>", "()");
-    Class<?> testClass = Class.forName(CLASS_NAME);
-    assertNotNull(testClass);
-    testClass.newInstance();
-    assertOneSnapshot(listener);
-  }
-
-  /**
-   * Ensure older pre-Java 6 class files with JSR/RET can be rewritten without "JSR/RET are not
-   * supported with computeFrames option" exceptions being thrown.
-   */
-  @Test
-  public void veryOldClassFileWithJsrRet() throws Exception {
-    final String CLASS_NAME = "antlr.Tool"; // compiled with jdk 1.2
-    TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "copyFile", null);
-    Class<?> testClass = Class.forName(CLASS_NAME);
-    assertNotNull(testClass);
-    try {
-      Reflect.onClass(testClass).create().call("copyFile", null, null);
-    } catch (Throwable t) {
-      // ignore
-    }
-    assertOneSnapshot(listener);
-  }
-
-  @Test
-  public void oldClass1_1() throws Exception {
-    final String CLASS_NAME = "org.apache.commons.lang.BooleanUtils"; // compiled with jdk 1.1
-    TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "toBoolean", null);
-    Class<?> testClass =
-        loadClass(
-            CLASS_NAME, getClass().getResource("/classfiles/BooleanUtils.classfile").getFile());
-
-    boolean result = Reflect.onClass(testClass).call("toBoolean", Boolean.TRUE).get();
-    assertTrue(result);
-    assertOneSnapshot(listener);
-  }
-
-  @Test
-  public void oldJavacBug() throws Exception {
-    setFieldInConfig(Config.get(), "dynamicInstrumentationHoistLocalVarsEnabled", true);
-    try {
-      final String CLASS_NAME = "com.datadog.debugger.classfiles.JavacBug"; // compiled with jdk 1.6
-      TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "main", null);
-      Class<?> testClass = Class.forName(CLASS_NAME);
-      assertNotNull(testClass);
-      int result = Reflect.onClass(testClass).call("main", "").get();
-      assertEquals(45, result);
-      // with local var hoisting and initialization at the beginning of the method, issue is
-      // resolved
-      assertEquals(1, listener.snapshots.size());
-    } finally {
-      setFieldInConfig(Config.get(), "dynamicInstrumentationHoistLocalVarsEnabled", false);
-    }
-  }
-
-  @Test
-  public void nestedConstructor() throws Exception {
-    final String CLASS_NAME = "CapturedSnapshot02";
-    TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "<init>", "(Throwable)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "init").get();
-    assertEquals(42, result);
-    assertOneSnapshot(listener);
-  }
-
-  @Test
-  public void nestedConstructor2() throws Exception {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot13";
-    TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "<init>", "(int)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-  }
-
-  @Test
-  public void nestedConstructor3() throws Exception {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot14";
-    TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "<init>", "(int, int, int)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-  }
-
-  @Test
-  public void inheritedConstructor() throws Exception {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    TestSnapshotListener listener = installMethodProbe(CLASS_NAME + "$Inherited", "<init>", null);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCaptureFields(
-        snapshot.getCaptures().getEntry(), "obj2", "java.lang.Object", (String) null);
-    CapturedContext.CapturedValue obj2 =
-        getFields(snapshot.getCaptures().getReturn().getArguments().get("this")).get("obj2");
-    Map<String, CapturedContext.CapturedValue> obj2Fields =
-        (Map<String, CapturedContext.CapturedValue>) obj2.getValue();
-    assertEquals(24, obj2Fields.get("intValue").getValue());
-    assertEquals(3.14, obj2Fields.get("doubleValue").getValue());
-  }
-
-  @Test
-  public void largeStackInheritedConstructor() throws Exception {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot15";
-    TestSnapshotListener listener =
-        installProbes(
-            createMethodProbe(PROBE_ID1, CLASS_NAME, "<init>", "()"),
-            createMethodProbe(PROBE_ID2, CLASS_NAME, "<init>", "(String, long, String)"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    long result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(4_000_000_001L, result);
-    assertSnapshots(listener, 2, PROBE_ID2, PROBE_ID1);
-  }
-
-  @Test
-  public void multiMethods() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot03";
-    TestSnapshotListener listener =
-        installProbes(
-            createMethodProbe(PROBE_ID1, CLASS_NAME, "f1", "(int)"),
-            createMethodProbe(PROBE_ID2, CLASS_NAME, "f2", "(int)"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(48, result);
-    List<Snapshot> snapshots = assertSnapshots(listener, 2, PROBE_ID1, PROBE_ID2);
-    Snapshot snapshot0 = snapshots.get(0);
-    assertCaptureArgs(snapshot0.getCaptures().getEntry(), "value", "int", "31");
-    assertCaptureReturnValue(snapshot0.getCaptures().getReturn(), "int", "31");
-    Snapshot snapshot1 = snapshots.get(1);
-    assertCaptureArgs(snapshot1.getCaptures().getEntry(), "value", "int", "17");
-    assertCaptureReturnValue(snapshot1.getCaptures().getReturn(), "int", "17");
-  }
-
-  @Test
-  public void multiProbeSameMethod() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot03";
-    LogProbe probe = createMethodProbe(PROBE_ID1, CLASS_NAME, "f1", "(int)");
-    LogProbe probe2 = createMethodProbe(PROBE_ID2, CLASS_NAME, "f1", "(int)");
-    TestSnapshotListener listener = installProbes(probe, probe2);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(48, result);
-    List<Snapshot> snapshots = assertSnapshots(listener, 2, PROBE_ID1, PROBE_ID2);
-    Snapshot snapshot0 = snapshots.get(0);
-    assertCaptureArgs(snapshot0.getCaptures().getEntry(), "value", "int", "31");
-    assertCaptureReturnValue(snapshot0.getCaptures().getReturn(), "int", "31");
-    Snapshot snapshot1 = snapshots.get(1);
-    assertCaptureArgs(snapshot1.getCaptures().getEntry(), "value", "int", "31");
-    assertCaptureReturnValue(snapshot1.getCaptures().getReturn(), "int", "31");
-  }
-
-  @Test
-  public void catchBlock() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot02";
-    TestSnapshotListener listener =
-        installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "f", "()"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertOneSnapshot(listener);
-  }
-
-  @Test
-  @Disabled("no more support of line range")
-  public void insideSynchronizedBlock() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot02";
-    final int LINE_START = 46;
-    final int LINE_END = 48;
-    LogProbe logProbe =
-        createProbeBuilder(PROBE_ID)
-            .where(CLASS_NAME, "synchronizedBlock", "(int)", LINE_START + "-" + LINE_END)
-            .build();
-    TestSnapshotListener listener = installProbes(logProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "synchronizedBlock").get();
-    assertEquals(76, result);
-    List<Snapshot> snapshots = assertSnapshots(listener, 10);
-    int count = 31;
-    for (int i = 0; i < 10; i++) {
-      Snapshot snapshot = snapshots.get(i);
-      assertCaptureLocals(
-          snapshot.getCaptures().getLines().get(LINE_START), "i", "int", String.valueOf(i));
-      assertCaptureLocals(
-          snapshot.getCaptures().getLines().get(LINE_START),
-          "count",
-          "int",
-          String.valueOf(count += i));
-    }
-  }
-
-  @Test
-  @Disabled("no more support of line range")
-  public void outsideSynchronizedBlock() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot02";
-    final int LINE_START = 45;
-    final int LINE_END = 49;
-    LogProbe logProbe =
-        createProbeBuilder(PROBE_ID)
-            .where(CLASS_NAME, "synchronizedBlock", "(int)", LINE_START + "-" + LINE_END)
-            .build();
-    TestSnapshotListener listener = installProbes(logProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "synchronizedBlock").get();
-    assertEquals(76, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertNull(snapshot.getCaptures().getEntry());
-    assertNull(snapshot.getCaptures().getReturn());
-    Assertions.assertEquals(2, snapshot.getCaptures().getLines().size());
-    assertCaptureLocals(snapshot.getCaptures().getLines().get(LINE_START), "count", "int", "31");
-    assertCaptureLocals(snapshot.getCaptures().getLines().get(LINE_END), "count", "int", "76");
-  }
-
-  @Test
-  public void sourceFileProbe() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot03";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    TestSnapshotListener listener =
-        installProbes(createLineProbe(LINE_PROBE_ID1, CLASS_NAME + ".java", line));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(48, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-    assertNull(snapshot.getCaptures().getEntry());
-    assertNull(snapshot.getCaptures().getReturn());
-    Assertions.assertEquals(1, snapshot.getCaptures().getLines().size());
-    Assertions.assertEquals(CLASS_NAME, snapshot.getProbe().getLocation().getType());
-    Assertions.assertEquals("f1", snapshot.getProbe().getLocation().getMethod());
-    assertCaptureArgs(snapshot.getCaptures().getLines().get(line), "value", "int", "31");
-  }
-
-  @Test
-  public void simpleSourceFileProbe() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot10";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    TestSnapshotListener listener =
-        installProbes(createLineProbe(LINE_PROBE_ID1, "CapturedSnapshot10.java", line));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "2").get();
-    assertEquals(2, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-    assertNull(snapshot.getCaptures().getEntry());
-    assertNull(snapshot.getCaptures().getReturn());
-    Assertions.assertEquals(1, snapshot.getCaptures().getLines().size());
-    Assertions.assertEquals(CLASS_NAME, snapshot.getProbe().getLocation().getType());
-    Assertions.assertEquals("main", snapshot.getProbe().getLocation().getMethod());
-    assertCaptureLocals(snapshot.getCaptures().getLines().get(line), "var1", "int", "1");
-  }
-
-  @Test
-  public void sourceFileProbeFullPath() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot10";
-    String DIR_CLASS_NAME = CLASS_NAME.replace('.', '/');
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    TestSnapshotListener listener =
-        installProbes(
-            createLineProbe(LINE_PROBE_ID1, "src/main/java/" + DIR_CLASS_NAME + ".java", line));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "2").get();
-    assertEquals(2, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-    assertNull(snapshot.getCaptures().getEntry());
-    assertNull(snapshot.getCaptures().getReturn());
-    Assertions.assertEquals(1, snapshot.getCaptures().getLines().size());
-    Assertions.assertEquals(CLASS_NAME, snapshot.getProbe().getLocation().getType());
-    Assertions.assertEquals("main", snapshot.getProbe().getLocation().getMethod());
-    assertCaptureArgs(snapshot.getCaptures().getLines().get(line), "arg", "java.lang.String", "2");
-  }
-
-  @Test
-  public void sourceFileProbeFullPathTopLevelClass() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot10";
-    String DIR_CLASS_NAME = CLASS_NAME.replace('.', '/');
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
-    TestSnapshotListener listener =
-        installProbes(
-            createLineProbe(LINE_PROBE_ID2, "src/main/java/" + DIR_CLASS_NAME + ".java", line));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(42 * 42, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID2, listener);
-    assertNull(snapshot.getCaptures().getEntry());
-    assertNull(snapshot.getCaptures().getReturn());
-    Assertions.assertEquals(1, snapshot.getCaptures().getLines().size());
-    Assertions.assertEquals(
-        "com.datadog.debugger.TopLevel01", snapshot.getProbe().getLocation().getType());
-    Assertions.assertEquals("process", snapshot.getProbe().getLocation().getMethod());
-    assertCaptureArgs(snapshot.getCaptures().getLines().get(line), "arg", "int", "42");
-  }
-
-  @Test
-  public void methodProbeLineProbeMix() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot11";
-    String DIR_CLASS_NAME = CLASS_NAME.replace('.', '/');
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    TestSnapshotListener listener =
-        installProbes(
-            createLineProbe(LINE_PROBE_ID1, "src/main/java/" + DIR_CLASS_NAME + ".java", line),
-            createMethodProbe(PROBE_ID2, CLASS_NAME, "main", null));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "2").get();
-    assertEquals(2, result);
-    List<Snapshot> snapshots = assertSnapshots(listener, 2, LINE_PROBE_ID1, PROBE_ID2);
-    Snapshot snapshot0 = snapshots.get(0);
-    assertNull(snapshot0.getCaptures().getEntry());
-    assertNull(snapshot0.getCaptures().getReturn());
-    Assertions.assertEquals(1, snapshot0.getCaptures().getLines().size());
-    Assertions.assertEquals(
-        "com.datadog.debugger.CapturedSnapshot11", snapshot0.getProbe().getLocation().getType());
-    assertEquals("main", snapshot0.getProbe().getLocation().getMethod());
-    assertCaptureArgs(snapshot0.getCaptures().getLines().get(line), "arg", "java.lang.String", "2");
-    assertCaptureLocals(snapshot0.getCaptures().getLines().get(line), "var1", "int", "1");
-    Snapshot snapshot1 = snapshots.get(1);
-    assertEquals(
-        "com.datadog.debugger.CapturedSnapshot11", snapshot1.getProbe().getLocation().getType());
-    assertEquals("main", snapshot1.getProbe().getLocation().getMethod());
-    assertCaptureArgs(snapshot1.getCaptures().getEntry(), "arg", "java.lang.String", "2");
-    assertCaptureReturnValue(snapshot1.getCaptures().getReturn(), "int", "2");
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_21)
-  public void sourceFileProbeScala() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot101";
-    final String FILE_NAME = CLASS_NAME + SCALA_EXT;
-    int line = getLineForLineProbe(CLASS_NAME, SCALA_EXT, LINE_PROBE_ID1);
-    TestSnapshotListener listener = installProbes(createLineProbe(LINE_PROBE_ID1, FILE_NAME, line));
-    String source = getFixtureContent("/" + FILE_NAME);
-    Class<?> testClass = ScalaHelper.compileAndLoad(source, CLASS_NAME, FILE_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(48, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-    assertNull(snapshot.getCaptures().getEntry());
-    assertNull(snapshot.getCaptures().getReturn());
-    Assertions.assertEquals(1, snapshot.getCaptures().getLines().size());
-    Assertions.assertEquals(CLASS_NAME, snapshot.getProbe().getLocation().getType());
-    Assertions.assertEquals("f1", snapshot.getProbe().getLocation().getMethod());
-    assertCaptureArgs(snapshot.getCaptures().getLines().get(line), "value", "int", "31");
-  }
-
-  @Test
-  public void sourceFileProbeGroovy() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot201";
-    int line = getLineForLineProbe(CLASS_NAME, GROOVY_EXT, LINE_PROBE_ID1);
-    TestSnapshotListener listener =
-        installProbes(createLineProbe(LINE_PROBE_ID1, CLASS_NAME + GROOVY_EXT, line));
-    String source = getFixtureContent("/" + CLASS_NAME + GROOVY_EXT);
-    GroovyClassLoader groovyClassLoader = new GroovyClassLoader();
-    Class<?> testClass = groovyClassLoader.parseClass(source);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(48, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-    assertNull(snapshot.getCaptures().getEntry());
-    assertNull(snapshot.getCaptures().getReturn());
-    Assertions.assertEquals(1, snapshot.getCaptures().getLines().size());
-    Assertions.assertEquals(CLASS_NAME, snapshot.getProbe().getLocation().getType());
-    Assertions.assertEquals("f1", snapshot.getProbe().getLocation().getMethod());
-    assertCaptureArgs(snapshot.getCaptures().getLines().get(line), "value", "int", "31");
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Issue with J9 when compiling Kotlin code")
-  public void sourceFileProbeKotlin() throws IOException, URISyntaxException {
-    System.out.println(JavaVersion.class.getProtectionDomain().getCodeSource().getLocation());
-    System.out.println("Java version:" + JavaVersion.current().feature);
-    final String CLASS_NAME = "CapturedSnapshot301";
-    int line = getLineForLineProbe(CLASS_NAME, KOTLIN_EXT, LINE_PROBE_ID1);
-    TestSnapshotListener listener =
-        installProbes(createLineProbe(LINE_PROBE_ID1, CLASS_NAME + KOTLIN_EXT, line));
-    URL resource = CapturedSnapshotTest.class.getResource("/" + CLASS_NAME + KOTLIN_EXT);
-    assertNotNull(resource);
-    List<File> filesToDelete = new ArrayList<>();
-    try {
-      Class<?> testClass =
-          KotlinHelper.compileAndLoad(CLASS_NAME, resource.getFile(), filesToDelete);
-      Object companion = Reflect.onClass(testClass).get("Companion");
-      int result = Reflect.on(companion).call("main", "").get();
-      assertEquals(48, result);
-      Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-      assertNull(snapshot.getCaptures().getEntry());
-      assertNull(snapshot.getCaptures().getReturn());
-      Assertions.assertEquals(1, snapshot.getCaptures().getLines().size());
-      Assertions.assertEquals(CLASS_NAME, snapshot.getProbe().getLocation().getType());
-      Assertions.assertEquals("f1", snapshot.getProbe().getLocation().getMethod());
-      assertCaptureArgs(snapshot.getCaptures().getLines().get(line), "value", "int", "31");
-    } finally {
-      filesToDelete.forEach(File::delete);
-    }
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Issue with J9 when compiling Kotlin code")
-  public void suspendKotlin() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot302";
-    int line = getLineForLineProbe(CLASS_NAME, ".kt", LINE_PROBE_ID1);
-    TestSnapshotListener listener =
-        installProbes(createLineProbe(LINE_PROBE_ID1, CLASS_NAME + ".kt", line));
-    URL resource = CapturedSnapshotTest.class.getResource("/" + CLASS_NAME + ".kt");
-    assertNotNull(resource);
-    List<File> filesToDelete = new ArrayList<>();
-    try {
-      Class<?> testClass =
-          KotlinHelper.compileAndLoad(CLASS_NAME, resource.getFile(), filesToDelete);
-      Object companion = Reflect.onClass(testClass).get("Companion");
-      int result = Reflect.on(companion).call("main", "").get();
-      assertEquals(0, result);
-      Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-      assertCaptureFields(snapshot.getCaptures().getLines().get(line), "intField", "int", "42");
-      assertCaptureFields(
-          snapshot.getCaptures().getLines().get(9), "strField", String.class.getTypeName(), "foo");
-    } finally {
-      filesToDelete.forEach(File::delete);
-    }
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Issue with J9 when compiling Kotlin code")
-  public void suspendMethodKotlin() {
-    final String CLASS_NAME = "CapturedSnapshot302";
-    TestSnapshotListener listener =
-        installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "download", null));
-    URL resource = CapturedSnapshotTest.class.getResource("/" + CLASS_NAME + ".kt");
-    assertNotNull(resource);
-    List<File> filesToDelete = new ArrayList<>();
-    try {
-      Class<?> testClass =
-          KotlinHelper.compileAndLoad(CLASS_NAME, resource.getFile(), filesToDelete);
-      Object companion = Reflect.onClass(testClass).get("Companion");
-      int result = Reflect.on(companion).call("main", "1").get();
-      assertEquals(1, result);
-      // 2 snapshots are expected because the method is executed twice one for each state
-      // before the delay, after the delay
-      List<Snapshot> snapshots = assertSnapshots(listener, 2);
-      Snapshot snapshot0 = snapshots.get(0);
-      assertCaptureReturnValue(
-          snapshot0.getCaptures().getReturn(),
-          "kotlin.coroutines.intrinsics.CoroutineSingletons",
-          "COROUTINE_SUSPENDED");
-      Snapshot snapshot1 = snapshots.get(1);
-      assertCaptureReturnValue(
-          snapshot1.getCaptures().getReturn(), String.class.getTypeName(), "1");
-    } finally {
-      filesToDelete.forEach(File::delete);
-    }
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Issue with J9 when compiling Kotlin code")
-  public void hoistVarKotlin() {
-    final String CLASS_NAME = "CapturedSnapshot303";
-    TestSnapshotListener listener =
-        installProbes(createMethodProbeAtExit(PROBE_ID, CLASS_NAME + "$Companion", "main", null));
-    URL resource = CapturedSnapshotTest.class.getResource("/" + CLASS_NAME + ".kt");
-    assertNotNull(resource);
-    List<File> filesToDelete = new ArrayList<>();
-    try {
-      Class<?> testClass =
-          KotlinHelper.compileAndLoad(CLASS_NAME, resource.getFile(), filesToDelete);
-      Object companion = Reflect.onClass(testClass).get("Companion");
-      int result = Reflect.on(companion).call("main", "").get();
-      assertEquals(0, result);
-      Snapshot snapshot = assertOneSnapshot(listener);
-    } finally {
-      filesToDelete.forEach(File::delete);
-    }
-  }
-
-  @Test
-  public void fieldExtractor() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot04";
-    LogProbe.Builder builder = createProbeBuilder(PROBE_ID1, CLASS_NAME, "createSimpleData", "()");
-    LogProbe simpleDataProbe = builder.capture(1, 100, 255, Limits.DEFAULT_FIELD_COUNT).build();
-    builder = createProbeBuilder(PROBE_ID2, CLASS_NAME, "createCompositeData", "()");
-    LogProbe compositeDataProbe = builder.capture(1, 3, 255, Limits.DEFAULT_FIELD_COUNT).build();
-    TestSnapshotListener listener = installProbes(simpleDataProbe, compositeDataProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(143, result);
-    List<Snapshot> snapshots = assertSnapshots(listener, 2, PROBE_ID1, PROBE_ID2);
-    Snapshot simpleSnapshot = snapshots.get(0);
-    Map<String, String> expectedSimpleFields = new HashMap<>();
-    expectedSimpleFields.put("intValue", "42");
-    expectedSimpleFields.put("strValue", "foo");
-    assertCaptureReturnValue(
-        simpleSnapshot.getCaptures().getReturn(),
-        "CapturedSnapshot04$SimpleData",
-        expectedSimpleFields);
-    Snapshot compositeSnapshot = snapshots.get(1);
-    Map<String, String> expectedCompositeFields = new HashMap<>();
-    expectedCompositeFields.put("nullsd", "null");
-    expectedCompositeFields.put("l1", DEPTH_REASON); // notCapturedReason
-    expectedCompositeFields.put("s1", DEPTH_REASON); // notCapturedReason
-    expectedCompositeFields.put("s2", DEPTH_REASON); // notCapturedReason
-    assertCaptureReturnValue(
-        compositeSnapshot.getCaptures().getReturn(),
-        "CapturedSnapshot04$CompositeData",
-        expectedCompositeFields);
-  }
-
-  @Test
-  public void fieldExtractorDeep2() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot04";
-    LogProbe.Builder builder =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "createCompositeData", "()");
-    LogProbe compositeDataProbe = builder.capture(2, 3, 255, Limits.DEFAULT_FIELD_COUNT).build();
-    TestSnapshotListener listener = installProbes(compositeDataProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(143, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    CapturedContext.CapturedValue returnValue =
-        snapshot.getCaptures().getReturn().getLocals().get("@return");
-    Map<String, CapturedContext.CapturedValue> fields = getFields(returnValue);
-    assertTrue(fields.containsKey("nullsd"));
-    assertTrue(fields.containsKey("l1"));
-    CapturedContext.CapturedValue s1 = fields.get("s1");
-    Map<String, CapturedContext.CapturedValue> s1Fields =
-        (Map<String, CapturedContext.CapturedValue>) s1.getValue();
-    assertEquals("101", String.valueOf(s1Fields.get("intValue").getValue()));
-    assertEquals("foo1", s1Fields.get("strValue").getValue());
-    assertEquals("null", String.valueOf(s1Fields.get("listValue").getValue()));
-    assertEquals(DEPTH_REASON, String.valueOf(s1Fields.get("listValue").getNotCapturedReason()));
-  }
-
-  @Test
-  public void fieldExtractorLength() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot04";
-    LogProbe.Builder builder = createProbeBuilder(PROBE_ID, CLASS_NAME, "createSimpleData", "()");
-    LogProbe simpleDataProbe = builder.capture(1, 100, 2, Limits.DEFAULT_FIELD_COUNT).build();
-    TestSnapshotListener listener = installProbes(simpleDataProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(143, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    Map<String, String> expectedFields = new HashMap<>();
-    expectedFields.put("intValue", "42");
-    expectedFields.put("strValue", "truncated");
-    expectedFields.put("listValue", DEPTH_REASON);
-    assertCaptureReturnValue(
-        snapshot.getCaptures().getReturn(), "CapturedSnapshot04$SimpleData", expectedFields);
-  }
-
-  @Test
-  public void fieldExtractorDisabled() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot04";
-    LogProbe.Builder builder = createProbeBuilder(PROBE_ID, CLASS_NAME, "createSimpleData", "()");
-    LogProbe simpleDataProbe = builder.capture(0, 100, 50, Limits.DEFAULT_FIELD_COUNT).build();
-    TestSnapshotListener listener = installProbes(simpleDataProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(143, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    CapturedContext.CapturedValue simpleData =
-        snapshot.getCaptures().getReturn().getLocals().get("simpleData");
-    Map<String, CapturedContext.CapturedValue> fields = getFields(simpleData);
-    assertEquals(1, fields.size());
-    assertEquals(DEPTH_REASON, fields.get("@" + NOT_CAPTURED_REASON).getNotCapturedReason());
-  }
-
-  @Test
-  public void fieldExtractorDepth0() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot04";
-    LogProbe.Builder builder = createProbeBuilder(PROBE_ID, CLASS_NAME, "createSimpleData", "()");
-    LogProbe simpleDataProbe = builder.capture(0, 100, 50, Limits.DEFAULT_FIELD_COUNT).build();
-    TestSnapshotListener listener = installProbes(simpleDataProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(143, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    CapturedContext.CapturedValue simpleData =
-        snapshot.getCaptures().getReturn().getLocals().get("simpleData");
-    Map<String, CapturedContext.CapturedValue> simpleDataFields = getFields(simpleData);
-    assertEquals(1, simpleDataFields.size());
-    assertEquals(
-        DEPTH_REASON, simpleDataFields.get("@" + NOT_CAPTURED_REASON).getNotCapturedReason());
-  }
-
-  @Test
-  public void fieldExtractorDepth1() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot04";
-    LogProbe.Builder builder = createProbeBuilder(PROBE_ID, CLASS_NAME, "createSimpleData", "()");
-    LogProbe simpleDataProbe = builder.capture(1, 100, 50, Limits.DEFAULT_FIELD_COUNT).build();
-    TestSnapshotListener listener = installProbes(simpleDataProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(143, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    CapturedContext.CapturedValue simpleData =
-        snapshot.getCaptures().getReturn().getLocals().get("simpleData");
-    Map<String, CapturedContext.CapturedValue> simpleDataFields = getFields(simpleData);
-    assertEquals(4, simpleDataFields.size());
-    assertEquals("foo", simpleDataFields.get("strValue").getValue());
-    assertEquals(42, simpleDataFields.get("intValue").getValue());
-    assertEquals(DEPTH_REASON, simpleDataFields.get("listValue").getNotCapturedReason());
-  }
-
-  @Test
-  public void fieldExtractorDuplicateUnionDepth() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot04";
-    LogProbe probe1 =
-        createProbeBuilder(PROBE_ID1, CLASS_NAME, "createSimpleData", "()")
-            .capture(0, 100, 50, Limits.DEFAULT_FIELD_COUNT)
-            .build();
-    LogProbe probe2 =
-        createProbeBuilder(PROBE_ID2, CLASS_NAME, "createSimpleData", "()")
-            .capture(3, 100, 50, Limits.DEFAULT_FIELD_COUNT)
-            .build();
-    TestSnapshotListener listener = installProbes(probe1, probe2);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(143, result);
-    List<Snapshot> snapshots = assertSnapshots(listener, 2);
-    CapturedContext.CapturedValue simpleData =
-        snapshots.get(0).getCaptures().getReturn().getLocals().get("simpleData");
-    Map<String, CapturedContext.CapturedValue> simpleDataFields = getFields(simpleData);
-    assertEquals(4, simpleDataFields.size());
-    assertEquals("foo", simpleDataFields.get("strValue").getValue());
-    assertEquals(42, simpleDataFields.get("intValue").getValue());
-  }
-
-  @Test
-  public void fieldExtractorCount2() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot04";
-    LogProbe.Builder builder =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "createCompositeData", "()");
-    LogProbe compositeDataProbe = builder.capture(2, 3, 255, 2).build();
-    TestSnapshotListener listener = installProbes(compositeDataProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(143, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    CapturedContext.CapturedValue returnValue =
-        snapshot.getCaptures().getReturn().getLocals().get("@return");
-    assertEquals("CapturedSnapshot04$CompositeData", returnValue.getType());
-    Map<String, CapturedContext.CapturedValue> fields = getFields(returnValue);
-    assertEquals(3, fields.size());
-    assertEquals(FIELD_COUNT_REASON, fields.get("@" + NOT_CAPTURED_REASON).getNotCapturedReason());
-    Map<String, CapturedContext.CapturedValue> s1Fields =
-        (Map<String, CapturedContext.CapturedValue>) fields.get("s1").getValue();
-    assertEquals("foo1", s1Fields.get("strValue").getValue());
-    assertEquals(101, s1Fields.get("intValue").getValue());
-    Map<String, CapturedContext.CapturedValue> s2Fields =
-        (Map<String, CapturedContext.CapturedValue>) fields.get("s2").getValue();
-    assertEquals("foo2", s2Fields.get("strValue").getValue());
-    assertEquals(202, s2Fields.get("intValue").getValue());
-
-    CapturedContext.CapturedValue compositeData =
-        snapshot.getCaptures().getReturn().getLocals().get("compositeData");
-    Map<String, CapturedContext.CapturedValue> compositeDataFields = getFields(compositeData);
-    assertEquals(3, compositeDataFields.size());
-    assertEquals(
-        FIELD_COUNT_REASON,
-        compositeDataFields.get("@" + NOT_CAPTURED_REASON).getNotCapturedReason());
-    assertTrue(compositeDataFields.containsKey("s1"));
-    assertTrue(compositeDataFields.containsKey("s2"));
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_17)
-  public void fieldExtractorNotAccessible() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot30";
-    LogProbe logProbe =
-        createMethodProbe(PROBE_ID, CLASS_NAME + "$MyObjectInputStream", "process", "()");
-    TestSnapshotListener listener = installProbes(logProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCaptureFieldsNotCaptured(
-        snapshot.getCaptures().getReturn(),
-        "bin",
-        "Field is not accessible: module java.base does not opens/exports to the current module");
-    assertCaptureFieldsNotCaptured(
-        snapshot.getCaptures().getReturn(),
-        "vlist",
-        "Field is not accessible: module java.base does not opens/exports to the current module");
-  }
-
-  @Test
-  public void uncaughtException() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot05";
-    TestSnapshotListener listener =
-        installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "triggerUncaughtException", "()"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    try {
-      Reflect.onClass(testClass).call("main", "triggerUncaughtException").get();
-      Assertions.fail("should not reach this code");
-    } catch (ReflectException ex) {
-      assertEquals("oops", ex.getCause().getCause().getMessage());
-    }
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCaptureThrowable(
-        snapshot.getCaptures().getReturn(),
-        "CapturedSnapshot05$CustomException",
-        "oops",
-        "CapturedSnapshot05.triggerUncaughtException",
-        8);
-    Map<String, String> expectedFields = new HashMap<>();
-    expectedFields.put("detailMessage", "oops");
-    expectedFields.put("additionalMsg", "I did it again");
-    assertCaptureLocals(
-        snapshot.getCaptures().getReturn(),
-        "@exception",
-        "CapturedSnapshot05$CustomException",
-        expectedFields);
-  }
-
-  @Test
-  public void uncaughtExceptionCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot05";
-    final String LOG_TEMPLATE = "exception msg={@exception.detailMessage}";
-    LogProbe probe =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "triggerUncaughtException", "()")
-            .evaluateAt(MethodLocation.EXIT)
-            .when(
-                new ProbeCondition(
-                    DSL.when(
-                        DSL.and(
-                            DSL.instanceOf(
-                                ref("@exception"), DSL.value("CapturedSnapshot05$CustomException")),
-                            DSL.eq(
-                                DSL.getMember(ref("@exception"), "detailMessage"),
-                                DSL.value("oops")),
-                            DSL.eq(
-                                DSL.getMember(ref("@exception"), "additionalMsg"),
-                                DSL.value("I did it again")))),
-                    "@exception instanceof \"CapturedSnapshot05$CustomException\" and @exception.detailMessage == 'oops' and @exception.additionalMsg == 'I did it again'"))
-            .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
-            .build();
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    try {
-      Reflect.onClass(testClass).call("main", "triggerUncaughtException").get();
-      Assertions.fail("should not reach this code");
-    } catch (ReflectException ex) {
-      assertEquals("oops", ex.getCause().getCause().getMessage());
-    }
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertEquals("exception msg=oops", snapshot.getMessage());
-    assertCaptureThrowable(
-        snapshot.getCaptures().getReturn(),
-        "CapturedSnapshot05$CustomException",
-        "oops",
-        "CapturedSnapshot05.triggerUncaughtException",
-        8);
-  }
-
-  @Test
-  public void caughtException() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot05";
-    TestSnapshotListener listener =
-        installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "triggerCaughtException", "()"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "triggerCaughtException").get();
-    assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCaptureThrowable(
-        snapshot.getCaptures().getCaughtExceptions().get(0),
-        "java.lang.IllegalStateException",
-        "oops",
-        "CapturedSnapshot05.triggerCaughtException",
-        13);
-  }
-
-  @Test
-  public void lineEmptyCaughtException() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot05";
-    int line1 = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    int line2 = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
-    int line3 = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID3);
-    LogProbe probe1 = createLineProbe(LINE_PROBE_ID1, CLASS_NAME, line1);
-    LogProbe probe2 = createLineProbe(LINE_PROBE_ID2, CLASS_NAME, line2);
-    LogProbe probe3 = createLineProbe(LINE_PROBE_ID3, CLASS_NAME, line3);
-    TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "triggerSwallowedException").get();
-    assertEquals(-1, result);
-    List<Snapshot> snapshots =
-        assertSnapshots(listener, 3, LINE_PROBE_ID1, LINE_PROBE_ID2, LINE_PROBE_ID3);
-    Snapshot snapshot0 = snapshots.get(0);
-    Map<String, String> expectedFields0 = new HashMap<>();
-    expectedFields0.put("detailMessage", "oops");
-    assertCaptureLocals(
-        snapshot0.getCaptures().getLines().get(line1),
-        "ex0",
-        IllegalStateException.class.getTypeName(),
-        expectedFields0);
-    Snapshot snapshot1 = snapshots.get(1);
-    Map<String, String> expectedFields1 = new HashMap<>();
-    expectedFields1.put("detailMessage", "nope!");
-    assertCaptureLocals(
-        snapshot1.getCaptures().getLines().get(line2),
-        "ex",
-        IllegalArgumentException.class.getTypeName(),
-        expectedFields1);
-    Snapshot snapshot2 = snapshots.get(2);
-    Map<String, String> expectedFields2 = new HashMap<>();
-    expectedFields2.put("detailMessage", "not there");
-    assertCaptureLocals(
-        snapshot2.getCaptures().getLines().get(line3),
-        "ex",
-        FileNotFoundException.class.getTypeName(),
-        expectedFields2);
-  }
-
-  @Test
-  public void noUncaughtExceptionCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    final String LOG_TEMPLATE = "exception?: {isDefined(@exception)}";
-    LogProbe probe =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "main", "int (String)")
-            .evaluateAt(MethodLocation.EXIT)
-            .when(
-                new ProbeCondition(
-                    DSL.when(not(DSL.isDefined(ref("@exception")))), "not(isDefined(@exception))"))
-            .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
-            .build();
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "2").get();
-    assertEquals(2, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-  }
-
-  @Test
-  public void rateLimitSnapshot() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    LogProbe logProbes =
-        new LogProbe.Builder()
-            .language(LANGUAGE)
-            .probeId(LINE_PROBE_ID1)
-            .where(CLASS_NAME, line)
-            .sampling(new LogProbe.Sampling(1))
-            .build();
-    TestSnapshotListener listener = installProbes(logProbes);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    for (int i = 0; i < 100; i++) {
-      int result = Reflect.onClass(testClass).call("main", "1").get();
-      assertEquals(3, result);
-    }
-    assertTrue(listener.snapshots.size() < 20);
-  }
-
-  @Test
-  public void globalRateLimitSnapshot() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot03";
-    LogProbe probe1 = createProbeBuilder(PROBE_ID1, CLASS_NAME, "f1", "(int)").sampling(10).build();
-    LogProbe probe2 = createProbeBuilder(PROBE_ID1, CLASS_NAME, "f2", "(int)").sampling(10).build();
-    Configuration config =
-        Configuration.builder()
-            .setService(SERVICE_NAME)
-            .add(probe1, probe2)
-            .add(new LogProbe.Sampling(1))
-            .build();
-    TestSnapshotListener listener = installProbes(config);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    for (int i = 0; i < 100; i++) {
-      int result = Reflect.onClass(testClass).call("main", "").get();
-      assertEquals(48, result);
-    }
-    assertTrue(listener.snapshots.size() < 20, "actual snapshots: " + listener.snapshots.size());
-  }
-
-  @Test
-  public void simpleConditionTest() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe logProbe =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", "int (java.lang.String)")
-            .when(
-                new ProbeCondition(
-                    DSL.when(
-                        DSL.and(
-                            // this is always true
-                            DSL.and(
-                                // this reference is resolved directly from the snapshot
-                                DSL.eq(ref("fld"), DSL.value(11)),
-                                // this reference chain needs to use reflection
-                                DSL.eq(
-                                    DSL.getMember(
-                                        DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"),
-                                        "msg"),
-                                    DSL.value("hello"))),
-                            DSL.and(
-                                DSL.eq(ref("arg"), DSL.value("5")),
-                                DSL.ge(ref(ValueReferences.DURATION_REF), DSL.value(0L))))),
-                    "(fld == 11 && typed.fld.fld.msg == \"hello\") && (arg == '5' && @duration >= 0)"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    TestSnapshotListener listener = installProbes(logProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    for (int i = 0; i < 100; i++) {
-      int result = Reflect.onClass(testClass).call("main", String.valueOf(i)).get();
-      assertTrue((i == 2 && result == 2) || result == 3);
-    }
-    assertEquals(1, listener.snapshots.size());
-    assertCaptureArgs(
-        listener.snapshots.get(0).getCaptures().getReturn(), "arg", "java.lang.String", "5");
-  }
-
-  @Test
-  public void lineProbeCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    LogProbe logProbe =
-        createProbeBuilder(LINE_PROBE_ID1, CLASS_NAME, line)
-            .when(
-                new ProbeCondition(
-                    DSL.when(
-                        DSL.and(
-                            // this is always true
-                            DSL.and(
-                                // this reference is resolved directly from the snapshot
-                                DSL.eq(ref("fld"), DSL.value(11)),
-                                // this reference chain needs to use reflection
-                                DSL.eq(
-                                    DSL.getMember(
-                                        DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"),
-                                        "msg"),
-                                    DSL.value("hello"))),
-                            DSL.eq(ref("arg"), DSL.value("5")))),
-                    "(fld == 11 && typed.fld.fld.msg == \"hello\") && arg == '5'"))
-            .build();
-    TestSnapshotListener listener = installProbes(logProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    for (int i = 0; i < 100; i++) {
-      int result = Reflect.onClass(testClass).call("main", String.valueOf(i)).get();
-      assertTrue((i == 2 && result == 2) || result == 3);
-    }
-    assertEquals(1, listener.snapshots.size());
-    assertCaptureArgs(
-        listener.snapshots.get(0).getCaptures().getLines().get(line),
-        "arg",
-        "java.lang.String",
-        "5");
-  }
-
-  @Test
-  public void lineProbeConditionFailed() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    LogProbe logProbe =
-        createProbeBuilder(LINE_PROBE_ID1, CLASS_NAME, line)
-            .when(
-                new ProbeCondition(DSL.when(DSL.eq(ref("foobar"), nullValue())), "foobar == null"))
-            .build();
-    TestSnapshotListener listener = installProbes(logProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "0").get();
-    assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-    assertNull(snapshot.getCaptures().getLines());
-    assertEquals(1, snapshot.getEvaluationErrors().size());
-    assertEquals(
-        "Cannot dereference field: foobar", snapshot.getEvaluationErrors().get(0).getMessage());
-  }
-
-  @Test
-  public void staticFieldCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot19";
-    LogProbe logProbe =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "process", "int (java.lang.String)")
-            .when(
-                new ProbeCondition(
-                    DSL.when(DSL.eq(ref("strField"), DSL.value("foo"))), "strField == 'foo'"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    TestSnapshotListener listener = installProbes(logProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "0").get();
-    assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    Map<String, CapturedContext.CapturedValue> staticFields =
-        snapshot.getCaptures().getReturn().getStaticFields();
-    assertEquals(4, staticFields.size());
-    assertEquals("foo", MoshiSnapshotTestHelper.getValue(staticFields.get("strField")));
-    assertEquals("1001", MoshiSnapshotTestHelper.getValue(staticFields.get("intField")));
-    assertEquals(
-        String.valueOf(Math.PI), MoshiSnapshotTestHelper.getValue(staticFields.get("doubleField")));
-    assertTrue(staticFields.containsKey("intArrayField"));
-  }
-
-  @Test
-  public void simpleFalseConditionTest() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
-    LogProbe logProbe =
-        createProbeBuilder(LINE_PROBE_ID2, CLASS_NAME, line)
-            .when(new ProbeCondition(DSL.when(DSL.eq(ref("arg"), DSL.value("5"))), "arg == '5'"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    TestSnapshotListener listener = installProbes(logProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "0").get();
-    assertEquals(3, result);
-    assertEquals(0, listener.snapshots.size());
-  }
-
-  @Test
-  public void nullCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe logProbes =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", "int (java.lang.String)")
-            .when(
-                new ProbeCondition(
-                    DSL.when(
-                        DSL.eq(
-                            DSL.getMember(
-                                DSL.getMember(DSL.getMember(ref("nullTyped"), "fld"), "fld"),
-                                "msg"),
-                            DSL.value("hello"))),
-                    "nullTyped.fld.fld.msg == 'hello'"))
-            .build();
-    TestSnapshotListener listener = installProbes(logProbes);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    Snapshot snapshot = assertOneSnapshot(listener);
-    List<EvaluationError> evaluationErrors = snapshot.getEvaluationErrors();
-    assertEquals(1, evaluationErrors.size());
-    assertEquals("nullTyped.fld.fld", evaluationErrors.get(0).getExpr());
-    assertEquals("Cannot dereference field: fld", evaluationErrors.get(0).getMessage());
-    assertEquals("Cannot dereference field: fld", snapshot.getMessage());
-  }
-
-  @Test
-  public void nullConditionTemplateOnly() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe logProbes =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", "int (java.lang.String)")
-            .when(
-                new ProbeCondition(
-                    DSL.when(
-                        DSL.eq(
-                            DSL.getMember(
-                                DSL.getMember(DSL.getMember(ref("nullTyped"), "fld"), "fld"),
-                                "msg"),
-                            DSL.value("hello"))),
-                    "nullTyped.fld.fld.msg == 'hello'"))
-            .captureSnapshot(false)
-            .template("plain log", Collections.emptyList())
-            .build();
-    TestSnapshotListener listener = installProbes(logProbes);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertEquals("Cannot dereference field: fld", snapshot.getMessage());
-    List<EvaluationError> evaluationErrors = snapshot.getEvaluationErrors();
-    assertEquals(1, evaluationErrors.size());
-    assertEquals("nullTyped.fld.fld", evaluationErrors.get(0).getExpr());
-    assertEquals("Cannot dereference field: fld", evaluationErrors.get(0).getMessage());
-  }
-
-  @Test
-  public void shortCircuitingCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe logProbes =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", "int (java.lang.String)")
-            .when(
-                new ProbeCondition(
-                    DSL.when(
-                        DSL.and(
-                            DSL.isDefined(ref("@exception")),
-                            DSL.contains(
-                                DSL.getMember(ref("@exception"), "detailMessage"),
-                                new StringValue("closed")))),
-                    "isDefined(@exception) && contains(@exception.detailMessage, 'closed')"))
-            .build();
-    TestSnapshotListener listener = installProbes(logProbes);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    // no snapshot, no eval error, isDefined returns false and do not evaluate the second part
-    assertEquals(0, listener.snapshots.size());
-  }
-
-  @Test
-  public void wellKnownClassesCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe logProbes =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", "int (java.lang.String)")
-            .when(
-                new ProbeCondition(
-                    DSL.when(
-                        DSL.eq(DSL.getMember(ref("maybeStr"), "value"), DSL.value("maybe foo"))),
-                    "maybeStr.value == 'maybe foo'"))
-            .build();
-    TestSnapshotListener listener = installProbes(logProbes);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    CapturedContext.CapturedValue maybeStrField =
-        getFields(snapshot.getCaptures().getReturn().getArguments().get("this")).get("maybeStr");
-    assertEquals(Optional.class.getTypeName(), maybeStrField.getDeclaredType());
-    Map<String, CapturedContext.CapturedValue> maybeStrFields =
-        (Map<String, CapturedContext.CapturedValue>) maybeStrField.getValue();
-    CapturedContext.CapturedValue value = maybeStrFields.get("value");
-    assertEquals("maybe foo", value.getValue());
-  }
-
-  @Test
-  public void mergedProbesWithAllConditionsTrueTest() throws IOException, URISyntaxException {
-    doMergedProbeConditions(
-        new ProbeCondition(DSL.when(DSL.TRUE), "true"),
-        new ProbeCondition(DSL.when(DSL.TRUE), "true"),
-        2);
-  }
-
-  @Test
-  public void mergedProbesWithAllConditionsFalseTest() throws IOException, URISyntaxException {
-    doMergedProbeConditions(
-        new ProbeCondition(DSL.when(DSL.FALSE), "false"),
-        new ProbeCondition(DSL.when(DSL.FALSE), "false"),
-        0);
-  }
-
-  @Test
-  public void mergedProbesWithMainProbeConditionTest() throws IOException, URISyntaxException {
-    doMergedProbeConditions(new ProbeCondition(DSL.when(DSL.TRUE), "true"), null, 2);
-  }
-
-  @Test
-  public void mergedProbesWithAdditionalProbeConditionTest()
-      throws IOException, URISyntaxException {
-    doMergedProbeConditions(null, new ProbeCondition(DSL.when(DSL.TRUE), "true"), 2);
-  }
-
-  @Test
-  public void mergedProbesWithMainProbeConditionFalseTest() throws IOException, URISyntaxException {
-    doMergedProbeConditions(new ProbeCondition(DSL.when(DSL.FALSE), "false"), null, 1);
-  }
-
-  @Test
-  public void mergedProbesWithAdditionalProbeConditionFalseTest()
-      throws IOException, URISyntaxException {
-    doMergedProbeConditions(null, new ProbeCondition(DSL.when(DSL.FALSE), "false"), 1);
-  }
-
-  private List<Snapshot> doMergedProbeConditions(
-      ProbeCondition probeCondition1, ProbeCondition probeCondition2, int expectedSnapshots)
-      throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe probe1 =
-        createProbeBuilder(PROBE_ID1, CLASS_NAME, "doit", "int (java.lang.String)")
-            .when(probeCondition1)
-            .build();
-    LogProbe probe2 =
-        createProbeBuilder(PROBE_ID2, CLASS_NAME, "doit", "int (java.lang.String)")
-            .when(probeCondition2)
-            .build();
-    TestSnapshotListener listener = installProbes(probe1, probe2);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertEquals(expectedSnapshots, listener.snapshots.size());
-    return listener.snapshots;
-  }
-
-  @Test
-  public void mergedProbesConditionMainErrorAdditionalFalse()
-      throws IOException, URISyntaxException {
-    ProbeCondition condition1 =
-        new ProbeCondition(
-            DSL.when(
-                DSL.eq(
-                    DSL.getMember(
-                        DSL.getMember(DSL.getMember(ref("nullTyped"), "fld"), "fld"), "msg"),
-                    DSL.value("hello"))),
-            "nullTyped.fld.fld.msg == 'hello'");
-    ProbeCondition condition2 = new ProbeCondition(DSL.when(DSL.FALSE), "false");
-    List<Snapshot> snapshots = doMergedProbeConditions(condition1, condition2, 1);
-    List<EvaluationError> evaluationErrors = snapshots.get(0).getEvaluationErrors();
-    Assertions.assertEquals(1, evaluationErrors.size());
-    Assertions.assertEquals("nullTyped.fld.fld", evaluationErrors.get(0).getExpr());
-    Assertions.assertEquals("Cannot dereference field: fld", evaluationErrors.get(0).getMessage());
-  }
-
-  @Test
-  public void mergedProbesConditionMainErrorAdditionalTrue()
-      throws IOException, URISyntaxException {
-    ProbeCondition condition1 =
-        new ProbeCondition(
-            DSL.when(
-                DSL.eq(
-                    DSL.getMember(
-                        DSL.getMember(DSL.getMember(ref("nullTyped"), "fld"), "fld"), "msg"),
-                    DSL.value("hello"))),
-            "nullTyped.fld.fld.msg == 'hello'");
-    ProbeCondition condition2 = new ProbeCondition(DSL.when(DSL.TRUE), "true");
-    List<Snapshot> snapshots = doMergedProbeConditions(condition1, condition2, 2);
-    List<EvaluationError> evaluationErrors = snapshots.get(0).getEvaluationErrors();
-    Assertions.assertEquals(1, evaluationErrors.size());
-    Assertions.assertEquals("nullTyped.fld.fld", evaluationErrors.get(0).getExpr());
-    Assertions.assertEquals("Cannot dereference field: fld", evaluationErrors.get(0).getMessage());
-    assertNull(snapshots.get(1).getEvaluationErrors());
-  }
-
-  @Test
-  public void mergedProbesConditionMainFalseAdditionalError()
-      throws IOException, URISyntaxException {
-    ProbeCondition condition1 = new ProbeCondition(DSL.when(DSL.FALSE), "false");
-    ProbeCondition condition2 =
-        new ProbeCondition(
-            DSL.when(
-                DSL.eq(
-                    DSL.getMember(
-                        DSL.getMember(DSL.getMember(ref("nullTyped"), "fld"), "fld"), "msg"),
-                    DSL.value("hello"))),
-            "nullTyped.fld.fld.msg == 'hello'");
-    List<Snapshot> snapshots = doMergedProbeConditions(condition1, condition2, 1);
-    List<EvaluationError> evaluationErrors = snapshots.get(0).getEvaluationErrors();
-    Assertions.assertEquals(1, evaluationErrors.size());
-    Assertions.assertEquals("nullTyped.fld.fld", evaluationErrors.get(0).getExpr());
-    Assertions.assertEquals("Cannot dereference field: fld", evaluationErrors.get(0).getMessage());
-  }
-
-  @Test
-  public void mergedProbesConditionMainTrueAdditionalError()
-      throws IOException, URISyntaxException {
-    ProbeCondition condition1 = new ProbeCondition(DSL.when(DSL.TRUE), "true");
-    ProbeCondition condition2 =
-        new ProbeCondition(
-            DSL.when(
-                DSL.eq(
-                    DSL.getMember(
-                        DSL.getMember(DSL.getMember(ref("nullTyped"), "fld"), "fld"), "msg"),
-                    DSL.value("hello"))),
-            "nullTyped.fld.fld.msg == 'hello'");
-    List<Snapshot> snapshots = doMergedProbeConditions(condition1, condition2, 2);
-    assertNull(snapshots.get(0).getEvaluationErrors());
-    List<EvaluationError> evaluationErrors = snapshots.get(1).getEvaluationErrors();
-    Assertions.assertEquals(1, evaluationErrors.size());
-    Assertions.assertEquals("nullTyped.fld.fld", evaluationErrors.get(0).getExpr());
-    Assertions.assertEquals("Cannot dereference field: fld", evaluationErrors.get(0).getMessage());
-  }
-
-  @Test
-  public void mergedProbesConditionMixedLocation() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe probe1 =
-        createProbeBuilder(PROBE_ID1, CLASS_NAME, "doit", "int (java.lang.String)")
-            .when(new ProbeCondition(DSL.when(DSL.TRUE), "true"))
-            .evaluateAt(MethodLocation.DEFAULT)
-            .build();
-    LogProbe probe2 =
-        createProbeBuilder(PROBE_ID2, CLASS_NAME, "doit", "int (java.lang.String)")
-            .when(
-                new ProbeCondition(
-                    DSL.when(DSL.ge(ref("@duration"), DSL.value(0))), "@duration >= 0"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    TestSnapshotListener listener = installProbes(probe1, probe2);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Assertions.assertEquals(2, listener.snapshots.size());
-    assertNull(listener.snapshots.get(0).getEvaluationErrors());
-    assertNull(listener.snapshots.get(1).getEvaluationErrors());
-  }
-
-  @Test
-  public void mergedProbesDifferentSignature() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe probe1 = createMethodProbeAtExit(PROBE_ID1, CLASS_NAME, "doit", null);
-    LogProbe probe2 =
-        createMethodProbeAtExit(PROBE_ID2, CLASS_NAME, "doit", "int (java.lang.String)");
-    LogProbe probe3 = createMethodProbeAtExit(PROBE_ID3, CLASS_NAME, "doit", "(String)");
-    TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Assertions.assertEquals(3, listener.snapshots.size());
-    assertNull(listener.snapshots.get(0).getEvaluationErrors());
-    assertNull(listener.snapshots.get(1).getEvaluationErrors());
-    assertNull(listener.snapshots.get(2).getEvaluationErrors());
-  }
-
-  @Test
-  public void mergedProbesWithCaptureExpressionsMixed() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe probe1 =
-        createProbeBuilder(PROBE_ID1, CLASS_NAME, "doit", null)
-            .evaluateAt(MethodLocation.EXIT)
-            .captureSnapshot(false)
-            .captureExpressions(
-                Arrays.asList(
-                    new LogProbe.CaptureExpression(
-                        "typed_fld_fld_msg",
-                        new ValueScript(
-                            DSL.getMember(
-                                DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"), "msg"),
-                            "typed.fld.fld.msg"),
-                        null),
-                    new LogProbe.CaptureExpression(
-                        "nullTyped_fld",
-                        new ValueScript(DSL.getMember(ref("nullTyped"), "fld"), "nullTyped.fld"),
-                        null)))
-            .build();
-    LogProbe probe2 = createMethodProbeAtExit(PROBE_ID2, CLASS_NAME, "doit", null);
-    TestSnapshotListener listener = installProbes(probe1, probe2);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    List<Snapshot> snapshots = assertSnapshots(listener, 2, PROBE_ID1, PROBE_ID2);
-    // snapshot with Capture Expressions
-    Snapshot snapshot0 = snapshots.get(0);
-    assertEquals(2, snapshot0.getCaptures().getReturn().getCaptureExpressions().size());
-    assertCaptureExpressions(
-        snapshot0.getCaptures().getReturn(),
-        "typed_fld_fld_msg",
-        String.class.getTypeName(),
-        "hello");
-    assertCaptureExpressions(
-        snapshot0.getCaptures().getReturn(), "nullTyped_fld", Object.class.getTypeName(), null);
-    assertNull(snapshot0.getCaptures().getReturn().getArguments());
-    assertNull(snapshot0.getCaptures().getReturn().getLocals());
-    // Snapshot without Capture Expressions
-    Snapshot snapshot1 = snapshots.get(1);
-    assertNull(snapshot1.getCaptures().getReturn().getCaptureExpressions());
-    assertCaptureArgs(snapshot1.getCaptures().getReturn(), "arg", String.class.getTypeName(), "1");
-    assertCaptureLocals(
-        snapshot1.getCaptures().getReturn(), "var1", Integer.TYPE.getTypeName(), "3");
-    assertCaptureLocals(
-        snapshot1.getCaptures().getReturn(), "@return", Integer.TYPE.getTypeName(), "3");
-  }
-
-  @Test
-  public void mergedProbesWithDifferentCaptureExpressions() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe probe1 =
-        createProbeBuilder(PROBE_ID1, CLASS_NAME, "doit", null)
-            .evaluateAt(MethodLocation.EXIT)
-            .captureSnapshot(false)
-            .captureExpressions(
-                Arrays.asList(
-                    new LogProbe.CaptureExpression(
-                        "typed_fld_fld_msg",
-                        new ValueScript(
-                            DSL.getMember(
-                                DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"), "msg"),
-                            "typed.fld.fld.msg"),
-                        null),
-                    new LogProbe.CaptureExpression(
-                        "nullTyped_fld",
-                        new ValueScript(DSL.getMember(ref("nullTyped"), "fld"), "nullTyped.fld"),
-                        null)))
-            .build();
-    LogProbe probe2 =
-        createProbeBuilder(PROBE_ID2, CLASS_NAME, "doit", null)
-            .evaluateAt(MethodLocation.EXIT)
-            .captureSnapshot(false)
-            .captureExpressions(
-                Arrays.asList(
-                    new LogProbe.CaptureExpression(
-                        "var1", new ValueScript(ref("var1"), "var1"), null),
-                    new LogProbe.CaptureExpression(
-                        "this_fld",
-                        new ValueScript(DSL.getMember(ref("this"), "fld"), "this.fld"),
-                        null)))
-            .build();
-    TestSnapshotListener listener = installProbes(probe1, probe2);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    List<Snapshot> snapshots = assertSnapshots(listener, 2, PROBE_ID1, PROBE_ID2);
-    // Snapshot 0
-    Snapshot snapshot0 = snapshots.get(0);
-    assertEquals(2, snapshot0.getCaptures().getReturn().getCaptureExpressions().size());
-    assertCaptureExpressions(
-        snapshot0.getCaptures().getReturn(),
-        "typed_fld_fld_msg",
-        String.class.getTypeName(),
-        "hello");
-    assertCaptureExpressions(
-        snapshot0.getCaptures().getReturn(), "nullTyped_fld", Object.class.getTypeName(), null);
-    assertNull(snapshot0.getCaptures().getReturn().getArguments());
-    assertNull(snapshot0.getCaptures().getReturn().getLocals());
-    // Snapshot 1
-    Snapshot snapshot1 = snapshots.get(1);
-    assertCaptureExpressions(
-        snapshot1.getCaptures().getReturn(), "var1", Integer.TYPE.getTypeName(), "3");
-    assertCaptureExpressions(
-        snapshot1.getCaptures().getReturn(), "this_fld", Integer.TYPE.getTypeName(), "11");
-    assertNull(snapshot1.getCaptures().getReturn().getArguments());
-    assertNull(snapshot1.getCaptures().getReturn().getLocals());
-  }
-
-  @Test
-  public void fields() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    TestSnapshotListener listener =
-        installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "f", "()"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCaptureFieldCount(snapshot.getCaptures().getEntry(), 5);
-    assertCaptureFields(snapshot.getCaptures().getEntry(), "intValue", "int", "24");
-    assertCaptureFields(snapshot.getCaptures().getEntry(), "doubleValue", "double", "3.14");
-    assertCaptureFields(
-        snapshot.getCaptures().getEntry(), "strValue", "java.lang.String", "foobar");
-    assertCaptureFields(
-        snapshot.getCaptures().getEntry(),
-        "strList",
-        "java.util.ArrayList",
-        Arrays.asList("foo", "bar"));
-    assertCaptureFields(
-        snapshot.getCaptures().getEntry(), "strMap", "java.util.HashMap", Collections.emptyMap());
-    assertCaptureFieldCount(snapshot.getCaptures().getReturn(), 5);
-    assertCaptureFields(snapshot.getCaptures().getReturn(), "intValue", "int", "48");
-    assertCaptureFields(snapshot.getCaptures().getReturn(), "doubleValue", "double", "3.14");
-    assertCaptureFields(snapshot.getCaptures().getReturn(), "strValue", "java.lang.String", "done");
-    assertCaptureFields(
-        snapshot.getCaptures().getReturn(), "strList", "java.util.ArrayList", "[foo, bar, done]");
-    Map<Object, Object> expectedMap = new HashMap<>();
-    expectedMap.put("foo", "bar");
-    assertCaptureFields(
-        snapshot.getCaptures().getReturn(), "strMap", "java.util.HashMap", expectedMap);
-  }
-
-  @Test
-  public void inheritedFields() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    final String INHERITED_CLASS_NAME = CLASS_NAME + "$Inherited";
-    LogProbe probe =
-        createProbeBuilder(PROBE_ID, INHERITED_CLASS_NAME, "f", "()")
-            .when(
-                new ProbeCondition(
-                    DSL.when(DSL.eq(ref("intValue"), DSL.value(24))), "intValue == 24"))
-            .evaluateAt(MethodLocation.ENTRY)
-            .build();
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "inherited").get();
-    assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    // Only Declared fields in the current class are captured, not inherited fields
-    assertCaptureFieldCount(snapshot.getCaptures().getEntry(), 5);
-    assertCaptureFields(
-        snapshot.getCaptures().getEntry(), "strValue", "java.lang.String", "foobar");
-    assertCaptureFields(snapshot.getCaptures().getEntry(), "intValue", "int", "24");
-    assertCaptureFieldCount(snapshot.getCaptures().getReturn(), 5);
-    assertCaptureFields(
-        snapshot.getCaptures().getReturn(), "strValue", "java.lang.String", "barfoo");
-    assertCaptureFields(snapshot.getCaptures().getEntry(), "intValue", "int", "24");
-  }
-
-  @Test
-  public void staticFields() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot15";
-    TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "<init>", "()");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    long result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(4_000_000_001L, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    Map<String, CapturedContext.CapturedValue> staticFields =
-        snapshot.getCaptures().getEntry().getStaticFields();
-    assertEquals(1, staticFields.size());
-    CapturedContext.CapturedValue globalArray = staticFields.get("globalArray");
-    assertNotNull(globalArray);
-    assertEquals("long[]", globalArray.getType());
-  }
-
-  @Test
-  public void staticInheritedFields() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot19";
-    final String INHERITED_CLASS_NAME = CLASS_NAME + "$Inherited";
-    LogProbe logProbe =
-        createProbeBuilder(PROBE_ID, INHERITED_CLASS_NAME, "f", "()")
-            .when(
-                new ProbeCondition(
-                    DSL.when(DSL.eq(ref("intValue"), DSL.value(48))), "intValue == 48"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    TestSnapshotListener listener = installProbes(logProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "inherited").get();
-    assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    Map<String, CapturedContext.CapturedValue> staticFields =
-        snapshot.getCaptures().getReturn().getStaticFields();
-    // inherited static fields are not collected
-    assertEquals(2, staticFields.size());
-    assertEquals("barfoo", MoshiSnapshotTestHelper.getValue(staticFields.get("strValue")));
-  }
-
-  @Test
-  public void staticLambda() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot07";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    TestSnapshotListener listener =
-        installProbes(createLineProbe(LINE_PROBE_ID1, CLASS_NAME, line));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "static", "email@address").get();
-    assertEquals(8, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-    CapturedContext context = snapshot.getCaptures().getLines().get(line);
-    assertNotNull(context);
-    assertCaptureLocals(context, "idx", "int", "5");
-  }
-
-  @Test
-  public void capturingLambda() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot07";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
-    TestSnapshotListener listener =
-        installProbes(createLineProbe(LINE_PROBE_ID2, CLASS_NAME, line));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "capturing", "email@address").get();
-    assertEquals(8, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID2, listener);
-    CapturedContext context = snapshot.getCaptures().getLines().get(line);
-    assertNotNull(context);
-    assertCaptureLocals(context, "idx", "int", "5");
-    assertCaptureFields(context, "strValue", "java.lang.String", "email@address");
-  }
-
-  @Test
-  public void multiLambdas() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot07";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID3);
-    TestSnapshotListener listener =
-        installProbes(createLineProbe(LINE_PROBE_ID3, CLASS_NAME, line));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "multi", "FOO1,FOO2,FOO3").get();
-    assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID3, listener);
-    CapturedContext context = snapshot.getCaptures().getLines().get(line);
-    assertNotNull(context);
-    assertCaptureArgs(context, "arg", String.class.getTypeName(), "FOO1,FOO2,FOO3");
-  }
-
-  @Test
-  public void tracerInstrumentedClass() throws Exception {
-    DebuggerContext.initClassFilter(new DenyListHelper(null));
-    final String CLASS_NAME = "com.datadog.debugger.jaxrs.MyResource";
-    // compile the JAX-RS resource fixture and weave it with the real tracer JAX-RS
-    // instrumentation, so this test exercises argument-name resolution against the same
-    // bytecode shape the tracer actually produces
-    ClassFileTransformer jaxRsTransformer = installTracerInstrumentation(instr);
-    Class<?> testClass;
-    try {
-      TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "createResource", null);
-      testClass = compileAndLoadClass(CLASS_NAME);
-      Object result =
-          Reflect.onClass(testClass)
-              .create()
-              .call("createResource", (Object) null, (Object) null, 1)
-              .get();
-      Snapshot snapshot = assertOneSnapshot(listener);
-      Map<String, CapturedContext.CapturedValue> arguments =
-          snapshot.getCaptures().getEntry().getArguments();
-      // it's important there is no null key in this map, as Jackson is not happy about it
-      // it's means here that argument names are not resolved correctly
-      Assertions.assertFalse(arguments.containsKey(null));
-      assertEquals(4, arguments.size());
-      assertTrue(arguments.containsKey("this"));
-      assertTrue(arguments.containsKey("apiKey"));
-      assertTrue(arguments.containsKey("uriInfo"));
-      assertTrue(arguments.containsKey("value"));
-    } finally {
-      instr.removeTransformer(jaxRsTransformer);
-    }
-  }
-
-  @Test
-  public void noCodeMethods() throws Exception {
-    final String CLASS_NAME = "CapturedSnapshot09";
-    LogProbe nativeMethodProbe = createMethodProbe(PROBE_ID1, CLASS_NAME, "nativeMethod", "()");
-    LogProbe abstractMethodProbe = createMethodProbe(PROBE_ID2, CLASS_NAME, "abstractMethod", "()");
-    TestSnapshotListener listener = installProbes(nativeMethodProbe, abstractMethodProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(1, result);
-    ArgumentCaptor<ProbeId> probeIdCaptor = ArgumentCaptor.forClass(ProbeId.class);
-    ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
-    verify(probeStatusSink, times(2)).addError(probeIdCaptor.capture(), strCaptor.capture());
-    assertEquals(PROBE_ID1.getId(), probeIdCaptor.getAllValues().get(0).getId());
-    assertEquals("Cannot instrument an abstract or native method", strCaptor.getAllValues().get(0));
-    assertEquals(PROBE_ID2.getId(), probeIdCaptor.getAllValues().get(1).getId());
-    assertEquals("Cannot instrument an abstract or native method", strCaptor.getAllValues().get(1));
-  }
-
-  @Test
-  public void duplicateClassDefinition() throws Exception {
-    // this test reproduces a very specific case where we get:
-    // java.lang.LinkageError: loader utils.MemClassLoader @1f7ef9ea
-    // attempted duplicate class definition for com.datadog.debugger.CapturedSnapshot12.
-    // (com.datadog.debugger.CapturedSnapshot12 is in unnamed module of loader utils.MemClassLoader
-    // @1f7ef9ea, parent loader 'app')
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot12";
-    LogProbe abstractMethodProbe = createMethodProbe(PROBE_ID, CLASS_NAME, "<init>", null);
-    TestSnapshotListener listener = installProbes(abstractMethodProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    assertNotNull(testClass);
-  }
-
-  @Test
-  public void overloadedMethods() throws Exception {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot16";
-    TestSnapshotListener listener =
-        installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "overload", null));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(63, result);
-    List<Snapshot> snapshots = assertSnapshots(listener, 1, PROBE_ID);
-    assertCaptureReturnValue(snapshots.get(0).getCaptures().getReturn(), "int", "42");
-    assertEquals(1, snapshots.get(0).getCaptures().getEntry().getArguments().size());
-  }
-
-  @Test
-  public void noDebugInfoEmptyMethod() throws Exception {
-    final String CLASS_NAME = "CapturedSnapshot03";
-    TestSnapshotListener listener =
-        installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "empty", null));
-    Map<String, byte[]> classFileBuffers = compile(CLASS_NAME, SourceCompiler.DebugInfo.NONE, "8");
-    Class<?> testClass = loadClass(CLASS_NAME, classFileBuffers);
-    int result = Reflect.onClass(testClass).call("main", "2").get();
-    assertEquals(48, result);
-    assertOneSnapshot(listener);
-  }
-
-  @Test
-  public void instrumentTheWorld() throws Exception {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    Map<String, byte[]> classFileBuffers = compile(CLASS_NAME);
-    TestSnapshotListener listener =
-        setupInstrumentTheWorldTransformer(
-            null, getClass().getResource("/include-files/singleClass.txt").getPath());
-    Class<?> testClass;
-    try {
-      testClass = loadClass(CLASS_NAME, classFileBuffers);
-    } finally {
-      instr.removeTransformer(currentTransformer);
-    }
-    int result = Reflect.onClass(testClass).call("main", "2").get();
-    assertEquals(2, result);
-    assertEquals(1, listener.snapshots.size());
-    ProbeImplementation probeImplementation = listener.snapshots.get(0).getProbe();
-    assertFalse(((CapturedContextProbe) probeImplementation).isCaptureSnapshot());
-    assertEquals("main", probeImplementation.getLocation().getMethod());
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"/exclude-files/singleClass.txt", "/exclude-files/startsWithClass.txt"})
-  public void instrumentTheWorld_excludeClass(String excludeFileName) throws Exception {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    Map<String, byte[]> classFileBuffers = compile(CLASS_NAME);
-    URL resource = getClass().getResource(excludeFileName);
-    TestSnapshotListener listener =
-        setupInstrumentTheWorldTransformer(
-            resource.getPath(), getClass().getResource("/include-files/singleClass.txt").getPath());
-    Class<?> testClass;
-    try {
-      testClass = loadClass(CLASS_NAME, classFileBuffers);
-    } finally {
-      instr.removeTransformer(currentTransformer);
-    }
-    int result = Reflect.onClass(testClass).call("main", "2").get();
-    assertEquals(2, result);
-    assertEquals(0, listener.snapshots.size());
-  }
-
-  @Test
-  public void objectDynamicType() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot17";
-    TestSnapshotListener listener =
-        installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "processWithArg", null));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "2").get();
-    assertEquals(50, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCaptureArgs(snapshot.getCaptures().getEntry(), "obj", "java.lang.Integer", "42");
-    assertCaptureFields(
-        snapshot.getCaptures().getEntry(), "objField", "java.lang.String", "foobar");
-    assertCaptureLocals(snapshot.getCaptures().getReturn(), "result", "java.lang.Integer", "50");
-    assertCaptureReturnValue(snapshot.getCaptures().getReturn(), "java.lang.Integer", "50");
-  }
-
-  @Test
-  public void exceptionAsLocalVariable() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot18";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    TestSnapshotListener listener =
-        installProbes(createLineProbe(LINE_PROBE_ID1, CLASS_NAME, line));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "2").get();
-    assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-    Map<String, String> expectedFields = new HashMap<>();
-    expectedFields.put("detailMessage", "For input string: \"a\"");
-    assertCaptureLocals(
-        snapshot.getCaptures().getLines().get(line),
-        "ex",
-        "java.lang.NumberFormatException",
-        expectedFields);
-  }
-
-  @Test
-  public void evaluateAtEntry() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    LogProbe logProbes =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "main", "int (java.lang.String)")
-            .when(new ProbeCondition(DSL.when(DSL.eq(ref("arg"), DSL.value("1"))), "arg == '1'"))
-            .evaluateAt(MethodLocation.ENTRY)
-            .build();
-    TestSnapshotListener listener = installProbes(logProbes);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertOneSnapshot(listener);
-  }
-
-  @Test
-  public void evaluateAtExit() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    LogProbe logProbes =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "main", "int (java.lang.String)")
-            .when(
-                new ProbeCondition(DSL.when(DSL.eq(ref("@return"), DSL.value(3))), "@return == 3"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    TestSnapshotListener listener = installProbes(logProbes);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertOneSnapshot(listener);
-  }
-
-  @Test
-  public void evaluateAtExitFalse() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    LogProbe logProbes =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "main", "int (java.lang.String)")
-            .when(
-                new ProbeCondition(DSL.when(DSL.eq(ref("@return"), DSL.value(0))), "@return == 0"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    TestSnapshotListener listener = installProbes(logProbes);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertEquals(0, listener.snapshots.size());
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  public void uncaughtExceptionConditionLocalVar() throws IOException, URISyntaxException {
-    if (Config.get().getDynamicInstrumentationLocalVarHoistingLevel() < 2) {
-      // this test requires local var hoisting level 2 (aggressive)
-      // because we need to hoist long local variables (2 slots)
-      return;
-    }
-    final String CLASS_NAME = "CapturedSnapshot05";
-    LogProbe probe =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "main", "(String)")
-            .when(new ProbeCondition(DSL.when(DSL.ge(ref("after"), DSL.value(0))), "after >= 0"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    try {
-      Reflect.onClass(testClass).call("main", "triggerUncaughtException").get();
-      Assertions.fail("should not reach this code");
-    } catch (ReflectException ex) {
-      assertEquals("oops", ex.getCause().getCause().getMessage());
-    }
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCaptureThrowable(
-        snapshot.getCaptures().getReturn(),
-        "CapturedSnapshot05$CustomException",
-        "oops",
-        "CapturedSnapshot05.triggerUncaughtException",
-        8);
-    assertNull(snapshot.getEvaluationErrors());
-    // after is 0 because the exception is thrown before the assignment and local var initialized
-    // at the beginning of the method by instrumentation
-    assertCaptureLocals(snapshot.getCaptures().getReturn(), "after", "long", "0");
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  public void uncaughtExceptionCaptureLocalVars() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
-    LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "uncaughtException", null);
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    try {
-      Reflect.onClass(testClass).call("main", "uncaughtException").get();
-      Assertions.fail("should not reach this code");
-    } catch (ReflectException ex) {
-      assertEquals("oops", ex.getCause().getCause().getMessage());
-    }
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCaptureThrowable(
-        snapshot.getCaptures().getReturn(),
-        "java.lang.RuntimeException",
-        "oops",
-        "com.datadog.debugger.CapturedSnapshot31.uncaughtException",
-        51);
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  public void methodProbeLocalVarsLocalScopes() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
-    LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "localScopes", "(String)");
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "localScopes").get();
-    assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
-    assertCaptureLocals(snapshot.getCaptures().getReturn(), "@return", "int", "42");
-    assertCaptureLocals(snapshot.getCaptures().getReturn(), "localVar", "int", "42");
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  public void methodProbeLocalVarsDeepScopes() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
-    LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "deepScopes", "(String)");
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "deepScopes").get();
-    assertEquals(4, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    // localVarL4 can not be captured/hoisted because same name, same slot
-    //    LocalVariableTable:
-    //    Start  Length  Slot  Name   Signature
-    //       59       3     6 localVarL4   I
-    //       65       3     6 localVarL4   I
-    //       71       3     6 localVarL4   I
-    //       29      45     5 localVarL3   I
-    //       20      54     4 localVarL2   I
-    //       13      64     3 localVarL1   I
-    //        0      79     0  this   Lcom/datadog/debugger/CapturedSnapshot31;
-    //        0      79     1   arg   Ljava/lang/String;
-    //        2      77     2 localVarL0   I
-    // localVarL4 cannot be hoisted in safe mode because of the same name and slot
-    assertEquals(5, snapshot.getCaptures().getReturn().getLocals().size());
-    assertCaptureLocals(snapshot.getCaptures().getReturn(), "localVarL0", "int", "0");
-    assertCaptureLocals(snapshot.getCaptures().getReturn(), "localVarL1", "int", "1");
-    assertCaptureLocals(snapshot.getCaptures().getReturn(), "localVarL2", "int", "2");
-    assertCaptureLocals(snapshot.getCaptures().getReturn(), "localVarL3", "int", "3");
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  public void methodProbeExceptionLocalVars() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
-    LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "caughtException", "(String)");
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "illegalState").get();
-    assertEquals(0, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
-    Map<String, String> expectedFields = new HashMap<>();
-    expectedFields.put("detailMessage", "state");
-    assertCaptureLocals(
-        snapshot.getCaptures().getReturn(),
-        "ex",
-        IllegalStateException.class.getTypeName(),
-        expectedFields);
-    listener.snapshots.clear();
-    result = Reflect.onClass(testClass).call("main", "illegalArgument").get();
-    assertEquals(0, result);
-    snapshot = assertOneSnapshot(listener);
-    assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
-    expectedFields = new HashMap<>();
-    expectedFields.put("detailMessage", "argument");
-    assertCaptureLocals(
-        snapshot.getCaptures().getReturn(),
-        "ex",
-        IllegalArgumentException.class.getTypeName(),
-        expectedFields);
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  public void overlappingLocalVarSlot() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
-    LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "overlappingSlots", "(String)");
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "overlappingSlots").get();
-    assertEquals(5, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    // i local var cannot be hoisted because of overlapping slots and name
-    assertFalse(snapshot.getCaptures().getReturn().getLocals().containsKey("i"));
-    assertTrue(snapshot.getCaptures().getReturn().getLocals().containsKey("subStr"));
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  public void duplicateLocalDifferentScope() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
-    LogProbe probe =
-        createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "duplicateLocalDifferentScope", "(String)");
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "duplicateLocalDifferentScope").get();
-    assertEquals(28, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertEquals(1, snapshot.getCaptures().getReturn().getLocals().size());
-    // ch cannot be hoisted in safe mode, because it has the duplicate name with different slot
-    assertCaptureLocals(
-        snapshot.getCaptures().getReturn(), "@return", Integer.TYPE.getTypeName(), "28");
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  public void mixingIntAndLongWhenHoisting() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
-    LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "mixingIntAndLong", "(String)");
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "mixingIntAndLong").get();
-    assertEquals(1626, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
-    // no hoisting in safe mode: long local variable and 2-slots type (forbidden slots)
-    assertCaptureLocals(snapshot.getCaptures().getReturn(), "l", Long.TYPE.getTypeName(), "1626");
-    assertCaptureLocals(
-        snapshot.getCaptures().getReturn(), "@return", Integer.TYPE.getTypeName(), "1626");
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  public void mixingIntAndCharWhenHoisting() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
-    LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "mixingIntAndChar", "(String)");
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "mixingIntAndChar").get();
-    assertEquals(-327, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
-    assertCaptureLocals(
-        snapshot.getCaptures().getReturn(), "i", Integer.TYPE.getTypeName(), "-327");
-    assertCaptureLocals(
-        snapshot.getCaptures().getReturn(), "@return", Integer.TYPE.getTypeName(), "-327");
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  public void mixingIntAndRefTypeWhenHoisting() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
-    LogProbe probe =
-        createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "mixingIntAndRefType", "(String)");
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "mixingIntAndRefType").get();
-    assertEquals(19, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
-    assertCaptureLocals(snapshot.getCaptures().getReturn(), "i", Integer.TYPE.getTypeName(), "19");
-    assertCaptureLocals(
-        snapshot.getCaptures().getReturn(), "@return", Integer.TYPE.getTypeName(), "19");
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  public void sameSlotAndTypeDifferentName() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
-    LogProbe probe =
-        createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "sameSlotAndTypeDifferentName", "(String)");
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "sameSlotAndTypeDifferentName").get();
-    assertEquals(28, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    // r and o cannot be hoisted in safe mode, because they have the same slot
-    assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
-    assertCaptureLocals(
-        snapshot.getCaptures().getReturn(),
-        "p",
-        String.class.getTypeName(),
-        "sameSlotAndTypeDifferentName");
-    assertCaptureLocals(
-        snapshot.getCaptures().getReturn(), "@return", Integer.TYPE.getTypeName(), "28");
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  public void sameSlotAndNameOneReturn() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
-    LogProbe probe =
-        createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "sameSlotAndNameOneReturn", "(String)");
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "sameSlotAndNameOneReturn").get();
-    assertEquals(24, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    // o is not hoisted in safe mode, because it has the same slot and name on different range
-    assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
-    assertCaptureLocals(
-        snapshot.getCaptures().getReturn(), "result", Integer.TYPE.getTypeName(), "24");
-    assertCaptureLocals(
-        snapshot.getCaptures().getReturn(), "@return", Integer.TYPE.getTypeName(), "24");
-  }
-
-  @Test
-  public void enumConstructorArgs() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot23";
-    final String ENUM_CLASS = CLASS_NAME + "$MyEnum";
-    TestSnapshotListener listener =
-        installProbes(
-            createProbeBuilder(PROBE_ID, ENUM_CLASS, "<init>", null).sampling(10).build());
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(2, result);
-    assertSnapshots(listener, 3, PROBE_ID);
-    Map<String, CapturedContext.CapturedValue> arguments =
-        listener.snapshots.get(0).getCaptures().getEntry().getArguments();
-    assertEquals(3, arguments.size());
-    assertTrue(arguments.containsKey("this"));
-    assertTrue(arguments.containsKey("p1")); // this the hidden ordinal arg of an enum
-    assertTrue(arguments.containsKey("strValue"));
-  }
-
-  @Test
-  public void enumValues() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot23";
-    TestSnapshotListener listener =
-        installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "convert", null));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "2").get();
-    assertEquals(2, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCaptureReturnValue(
-        snapshot.getCaptures().getReturn(),
-        "com.datadog.debugger.CapturedSnapshot23$MyEnum",
-        "TWO");
-  }
-
-  @Test
-  public void enumCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot23";
-    LogProbe probe =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "convert", null)
-            .evaluateAt(MethodLocation.EXIT)
-            .when(
-                new ProbeCondition(
-                    DSL.when(
-                        DSL.and(
-                            DSL.eq(ref("@return"), DSL.value("TWO")),
-                            DSL.eq(ref("@return"), DSL.value("MyEnum.TWO")),
-                            DSL.eq(
-                                ref("@return"),
-                                DSL.value("com.datadog.debugger.CapturedSnapshot23$MyEnum.TWO")))),
-                    "@return == 'TWO' && @return == 'MyEnum.TWO' && @return == 'com.datadog.debugger.CapturedSnapshot23$MyEnum.TWO'"))
-            .build();
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "2").get();
-    assertEquals(2, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCaptureReturnValue(
-        snapshot.getCaptures().getReturn(),
-        "com.datadog.debugger.CapturedSnapshot23$MyEnum",
-        "TWO");
-  }
-
-  @Test
-  public void recursiveCapture() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot24";
-    final String INNER_CLASS = CLASS_NAME + "$Holder";
-    TestSnapshotListener listener =
-        installProbes(createMethodProbe(PROBE_ID, INNER_CLASS, "size", null));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    assertEquals(1, result);
-  }
-
-  @Test
-  public void recursiveCaptureException() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot24";
-    final String INNER_CLASS = CLASS_NAME + "$HolderWithException";
-    TestSnapshotListener listener =
-        installProbes(createMethodProbe(PROBE_ID, INNER_CLASS, "size", null));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    try {
-      Reflect.onClass(testClass).call("main", "exception").get();
-      Assertions.fail("should not reach this code");
-    } catch (ReflectException ex) {
-      assertEquals("not supported", ex.getCause().getCause().getMessage());
-    }
-  }
-
-  @Test
-  public void unknownCollectionCount() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot24";
-    Snapshot snapshot = doUnknownCount(CLASS_NAME);
-    assertEquals(
-        "Unsupported Collection class: com.datadog.debugger.CapturedSnapshot24$Holder",
-        snapshot.getEvaluationErrors().get(0).getMessage());
-  }
-
-  @Test
-  public void unknownMapCount() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot26";
-    Snapshot snapshot = doUnknownCount(CLASS_NAME);
-    assertEquals(
-        "Unsupported Map class: com.datadog.debugger.CapturedSnapshot26$Holder",
-        snapshot.getEvaluationErrors().get(0).getMessage());
-  }
-
-  private Snapshot doUnknownCount(String CLASS_NAME) throws IOException, URISyntaxException {
-    LogProbe logProbe =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
-            .when(
-                new ProbeCondition(
-                    DSL.when(DSL.ge(DSL.len(ref("holder")), DSL.value(0))), "len(holder) >= 0"))
-            .build();
-    TestSnapshotListener listener = installProbes(logProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "").get();
-    Assertions.assertEquals(1, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertEquals(1, snapshot.getEvaluationErrors().size());
-    assertEquals("len(holder)", snapshot.getEvaluationErrors().get(0).getExpr());
-    return snapshot;
-  }
-
-  @Test
-  public void beforeForLoopLineProbe() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot02";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    TestSnapshotListener listener = installLineProbe(LINE_PROBE_ID1, CLASS_NAME, line);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "synchronizedBlock").get();
-    assertEquals(76, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-    assertCaptureLocals(snapshot.getCaptures().getLines().get(line), "count", "int", "31");
-  }
-
-  @Test
-  public void dupLineProbeSameTemplate() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    final String LOG_TEMPLATE = "msg1={typed.fld.fld.msg}";
-    int line1 = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID3);
-    int line2 = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID4);
-    assertTrue(line1 == line2);
-    LogProbe probe1 =
-        createProbeBuilder(LINE_PROBE_ID3, CLASS_NAME, line1)
-            .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    LogProbe probe2 =
-        createProbeBuilder(LINE_PROBE_ID4, CLASS_NAME, line2)
-            .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    TestSnapshotListener listener = installProbes(probe1, probe2);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    List<Snapshot> snapshots = assertSnapshots(listener, 2, LINE_PROBE_ID3, LINE_PROBE_ID4);
-    for (Snapshot snapshot : snapshots) {
-      assertEquals("msg1=hello", snapshot.getMessage());
-    }
-  }
-
-  @Test
-  public void keywordRedaction() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot27";
-    final String LOG_TEMPLATE =
-        "arg={arg} secret={secret} password={this.password} fromMap={strMap['password']}";
-    LogProbe probe1 =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
-            .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
-            .captureSnapshot(true)
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    TestSnapshotListener listener = installProbes(probe1);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "secret123").get();
-    Assertions.assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertEquals(
-        "arg=secret123 secret={"
-            + REDACTED_VALUE
-            + "} password={"
-            + REDACTED_VALUE
-            + "} fromMap={"
-            + REDACTED_VALUE
-            + "}",
-        snapshot.getMessage());
-    CapturedContext.CapturedValue secretLocalVar =
-        snapshot.getCaptures().getReturn().getLocals().get("secret");
-    CapturedContext.CapturedValue secretValued =
-        VALUE_ADAPTER.fromJson(secretLocalVar.getStrValue());
-    assertEquals(REDACTED_IDENT_REASON, secretValued.getNotCapturedReason());
-    Map<String, CapturedContext.CapturedValue> thisFields =
-        getFields(snapshot.getCaptures().getReturn().getArguments().get("this"));
-    CapturedContext.CapturedValue passwordField = thisFields.get("password");
-    assertEquals(REDACTED_IDENT_REASON, passwordField.getNotCapturedReason());
-    Map<String, String> strMap = (Map<String, String>) thisFields.get("strMap").getValue();
-    assertNull(strMap.get("password"));
-  }
-
-  @Test
-  public void keywordRedactionConditions() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot27";
-    LogProbe probe1 =
-        createProbeBuilder(PROBE_ID1, CLASS_NAME, "doit", null)
-            .when(
-                new ProbeCondition(
-                    DSL.when(
-                        DSL.contains(
-                            DSL.getMember(ref("this"), "password"), new StringValue("123"))),
-                    "contains(this.password, '123')"))
-            .captureSnapshot(true)
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    LogProbe probe2 =
-        createProbeBuilder(PROBE_ID2, CLASS_NAME, "doit", null)
-            .when(
-                new ProbeCondition(
-                    DSL.when(DSL.eq(ref("password"), DSL.value("123"))), "password == '123'"))
-            .captureSnapshot(true)
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    LogProbe probe3 =
-        createProbeBuilder(PROBE_ID3, CLASS_NAME, "doit", null)
-            .when(
-                new ProbeCondition(
-                    DSL.when(
-                        DSL.eq(DSL.index(ref("strMap"), DSL.value("password")), DSL.value("123"))),
-                    "strMap['password'] == '123'"))
-            .captureSnapshot(true)
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "secret123").get();
-    Assertions.assertEquals(42, result);
-    List<Snapshot> snapshots = assertSnapshots(listener, 3, PROBE_ID1, PROBE_ID2, PROBE_ID3);
-    assertEquals(1, snapshots.get(0).getEvaluationErrors().size());
-    assertEquals(
-        "Could not evaluate the expression because 'this.password' was redacted",
-        snapshots.get(0).getEvaluationErrors().get(0).getMessage());
-    assertEquals(1, snapshots.get(1).getEvaluationErrors().size());
-    assertEquals(
-        "Could not evaluate the expression because 'password' was redacted",
-        snapshots.get(1).getEvaluationErrors().get(0).getMessage());
-    assertEquals(1, snapshots.get(2).getEvaluationErrors().size());
-    assertEquals(
-        "Could not evaluate the expression because 'strMap[\"password\"]' was redacted",
-        snapshots.get(2).getEvaluationErrors().get(0).getMessage());
-  }
-
-  @Test
-  public void typeRedactionBlockedProbe() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot27";
-    Config config = mock(Config.class);
-    when(config.getDynamicInstrumentationRedactedTypes())
-        .thenReturn("com.datadog.debugger.CapturedSnapshot27");
-    Redaction.addUserDefinedTypes(config);
-    LogProbe probe1 =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
-            .captureSnapshot(true)
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    TestSnapshotListener listener = installProbes(probe1);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "secret123").get();
-    Assertions.assertEquals(42, result);
-    assertEquals(0, listener.snapshots.size());
-    InstrumentationResult instrumentationResult =
-        instrumentationListener.results.get(PROBE_ID.getId());
-    assertTrue(instrumentationResult.isBlocked());
-  }
-
-  @Test
-  public void typeRedactionSnapshot() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot27";
-    final String LOG_TEMPLATE =
-        "arg={arg} credentials={creds} user={this.creds.user} code={creds.secretCode} dave={credMap['dave'].user}";
-    Config config = mock(Config.class);
-    when(config.getDynamicInstrumentationRedactedTypes())
-        .thenReturn("com.datadog.debugger.CapturedSnapshot27$Creds");
-    Redaction.addUserDefinedTypes(config);
-    LogProbe probe1 =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
-            .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
-            .captureSnapshot(true)
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    TestSnapshotListener listener = installProbes(probe1);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "secret123").get();
-    Assertions.assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertEquals(
-        "arg=secret123 credentials={"
-            + REDACTED_VALUE
-            + "} user={"
-            + REDACTED_VALUE
-            + "} code={"
-            + REDACTED_VALUE
-            + "} dave={"
-            + REDACTED_VALUE
-            + "}",
-        snapshot.getMessage());
-    Map<String, CapturedContext.CapturedValue> thisFields =
-        getFields(snapshot.getCaptures().getReturn().getArguments().get("this"));
-    CapturedContext.CapturedValue credsField = thisFields.get("creds");
-    assertEquals(REDACTED_TYPE_REASON, credsField.getNotCapturedReason());
-    Map<String, String> credMap = (Map<String, String>) thisFields.get("credMap").getValue();
-    assertNull(credMap.get("dave"));
-  }
-
-  @Test
-  public void typeRedactionCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot27";
-    Config config = mock(Config.class);
-    when(config.getDynamicInstrumentationRedactedTypes())
-        .thenReturn("com.datadog.debugger.CapturedSnapshot27$Creds");
-    Redaction.addUserDefinedTypes(config);
-    LogProbe probe1 =
-        createProbeBuilder(PROBE_ID1, CLASS_NAME, "doit", null)
-            .when(
-                new ProbeCondition(
-                    DSL.when(
-                        DSL.contains(
-                            DSL.getMember(DSL.getMember(ref("this"), "creds"), "secretCode"),
-                            new StringValue("123"))),
-                    "contains(this.creds.secretCode, '123')"))
-            .captureSnapshot(true)
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    LogProbe probe2 =
-        createProbeBuilder(PROBE_ID2, CLASS_NAME, "doit", null)
-            .when(
-                new ProbeCondition(
-                    DSL.when(DSL.eq(DSL.getMember(ref("creds"), "secretCode"), DSL.value("123"))),
-                    "creds.secretCode == '123'"))
-            .captureSnapshot(true)
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    LogProbe probe3 =
-        createProbeBuilder(PROBE_ID3, CLASS_NAME, "doit", null)
-            .when(
-                new ProbeCondition(
-                    DSL.when(
-                        DSL.eq(DSL.index(ref("credMap"), DSL.value("dave")), DSL.value("123"))),
-                    "credMap['dave'] == '123'"))
-            .captureSnapshot(true)
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "secret123").get();
-    Assertions.assertEquals(42, result);
-    List<Snapshot> snapshots = assertSnapshots(listener, 3, PROBE_ID1, PROBE_ID2, PROBE_ID3);
-    assertEquals(1, snapshots.get(0).getEvaluationErrors().size());
-    assertEquals(
-        "Could not evaluate the expression because 'this.creds' was redacted",
-        snapshots.get(0).getEvaluationErrors().get(0).getMessage());
-    assertEquals(1, snapshots.get(1).getEvaluationErrors().size());
-    assertEquals(
-        "Could not evaluate the expression because 'creds' was redacted",
-        snapshots.get(1).getEvaluationErrors().get(0).getMessage());
-    assertEquals(1, snapshots.get(2).getEvaluationErrors().size());
-    assertEquals(
-        "Could not evaluate the expression because 'credMap[\"dave\"]' was redacted",
-        snapshots.get(2).getEvaluationErrors().get(0).getMessage());
-  }
-
-  @Test
-  public void ensureCallingSamplingMethodProbe() throws IOException, URISyntaxException {
-    doSamplingTest(this::methodProbe, 1, 1);
-  }
-
-  @Test
-  public void ensureCallingSamplingProbeCondition() throws IOException, URISyntaxException {
-    doSamplingTest(this::simpleConditionTest, 1, 1);
-  }
-
-  @Test
-  public void ensureCallingSamplingProbeConditionError() throws IOException, URISyntaxException {
-    doSamplingTest(this::nullCondition, 1, 1);
-  }
-
-  @Test
-  public void ensureCallingSamplingDupMethodProbeCondition()
-      throws IOException, URISyntaxException {
-    doSamplingTest(this::mergedProbesWithAdditionalProbeConditionTest, 2, 2);
-  }
-
-  @Test
-  public void ensureCallingSamplingLineProbe() throws IOException, URISyntaxException {
-    doSamplingTest(this::singleLineProbe, 1, 1);
-  }
-
-  @Test
-  public void ensureCallingSamplingLineProbeCondition() throws IOException, URISyntaxException {
-    doSamplingTest(this::lineProbeCondition, 1, 1);
-  }
-
-  @Test
-  public void ensureCallingSamplingLogTemplateOnlyConditionError()
-      throws IOException, URISyntaxException {
-    doSamplingTest(this::nullConditionTemplateOnly, ProbeRateLimiter::setGlobalLogRate, 1, 0, 1);
-  }
-
-  @Test
-  public void ensureCallingSamplingCaptureExpression() throws IOException, URISyntaxException {
-    doSamplingTest(this::captureExpressions, 1, 1);
-  }
-
-  @Test
-  public void ensureCallingSamplingCaptureExpressionWithCondition()
-      throws IOException, URISyntaxException {
-    doSamplingTest(this::captureExpressionsWithCondition, 1, 1);
-  }
-
-  @Test
-  public void ensureCallingSamplingCaptureExpressionWithNullCondition()
-      throws IOException, URISyntaxException {
-    doSamplingTest(
-        this::captureExpressionsWithNullCondition,
-        ProbeRateLimiter::setGlobalSnapshotRate,
-        1,
-        1,
-        0);
-  }
-
-  private void doSamplingTest(TestMethod testRun, int expectedGlobalCount, int expectedProbeCount)
-      throws IOException, URISyntaxException {
-    doSamplingTest(
-        testRun,
-        ProbeRateLimiter::setGlobalSnapshotRate,
-        expectedGlobalCount,
-        expectedProbeCount,
-        0);
-  }
-
-  private void doSamplingTest(
-      TestMethod testRun,
-      DoubleConsumer globalRateSetter,
-      int expectedGlobalCount,
-      int expectedProbeCount,
-      int expectedErrorCount)
-      throws IOException, URISyntaxException {
-    MockSampler probeSampler = new MockSampler();
-    MockSampler errorSampler = new MockSampler();
-    MockSampler globalSampler = new MockSampler();
-    ProbeRateLimiter.setSamplerSupplier(
-        rate -> {
-          if (rate < 2) return errorSampler;
-          if (rate < 101) return probeSampler;
-          return globalSampler;
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertEquals(0, listener.snapshots.size());
+    }
+
+    @Test
+    public void constructor() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot02";
+        TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "<init>", "(String, Object)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertOneSnapshot(listener);
+    }
+
+    @Test
+    public void constructorFirstLine() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot02";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
+        TestSnapshotListener listener = installLineProbe(LINE_PROBE_ID2, CLASS_NAME, line);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        ArgumentCaptor<ProbeId> probeIdCaptor = ArgumentCaptor.forClass(ProbeId.class);
+        ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
+        verify(probeStatusSink).addError(probeIdCaptor.capture(), strCaptor.capture());
+        assertEquals(LINE_PROBE_ID2.getId(), probeIdCaptor.getAllValues().get(0).getId());
+        assertEquals(
+                "Cannot instrument the first line of a constructor",
+                strCaptor.getAllValues().get(0));
+    }
+
+    @Test
+    public void overloadedConstructor() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot02";
+        TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "<init>", "()");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertOneSnapshot(listener);
+    }
+
+    @Test
+    public void veryOldClassFile() throws Exception {
+        final String CLASS_NAME = "antlr.Token"; // compiled with jdk 1.2
+        TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "<init>", "()");
+        Class<?> testClass = Class.forName(CLASS_NAME);
+        assertNotNull(testClass);
+        testClass.newInstance();
+        assertOneSnapshot(listener);
+    }
+
+    /**
+     * Ensure older pre-Java 6 class files with JSR/RET can be rewritten without "JSR/RET are not
+     * supported with computeFrames option" exceptions being thrown.
+     */
+    @Test
+    public void veryOldClassFileWithJsrRet() throws Exception {
+        final String CLASS_NAME = "antlr.Tool"; // compiled with jdk 1.2
+        TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "copyFile", null);
+        Class<?> testClass = Class.forName(CLASS_NAME);
+        assertNotNull(testClass);
+        try {
+            Reflect.onClass(testClass).create().call("copyFile", null, null);
+        } catch (Throwable t) {
+            // ignore
+        }
+        assertOneSnapshot(listener);
+    }
+
+    @Test
+    public void oldClass1_1() throws Exception {
+        final String CLASS_NAME = "org.apache.commons.lang.BooleanUtils"; // compiled with jdk 1.1
+        TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "toBoolean", null);
+        Class<?> testClass = loadClass(
+                CLASS_NAME,
+                getClass().getResource("/classfiles/BooleanUtils.classfile").getFile());
+
+        boolean result =
+                Reflect.onClass(testClass).call("toBoolean", Boolean.TRUE).get();
+        assertTrue(result);
+        assertOneSnapshot(listener);
+    }
+
+    @Test
+    public void oldJavacBug() throws Exception {
+        setFieldInConfig(Config.get(), "dynamicInstrumentationHoistLocalVarsEnabled", true);
+        try {
+            final String CLASS_NAME = "com.datadog.debugger.classfiles.JavacBug"; // compiled with jdk 1.6
+            TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "main", null);
+            Class<?> testClass = Class.forName(CLASS_NAME);
+            assertNotNull(testClass);
+            int result = Reflect.onClass(testClass).call("main", "").get();
+            assertEquals(45, result);
+            // with local var hoisting and initialization at the beginning of the method, issue is
+            // resolved
+            assertEquals(1, listener.snapshots.size());
+        } finally {
+            setFieldInConfig(Config.get(), "dynamicInstrumentationHoistLocalVarsEnabled", false);
+        }
+    }
+
+    @Test
+    public void nestedConstructor() throws Exception {
+        final String CLASS_NAME = "CapturedSnapshot02";
+        TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "<init>", "(Throwable)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "init").get();
+        assertEquals(42, result);
+        assertOneSnapshot(listener);
+    }
+
+    @Test
+    public void nestedConstructor2() throws Exception {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot13";
+        TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "<init>", "(int)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+    }
+
+    @Test
+    public void nestedConstructor3() throws Exception {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot14";
+        TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "<init>", "(int, int, int)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+    }
+
+    @Test
+    public void inheritedConstructor() throws Exception {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        TestSnapshotListener listener = installMethodProbe(CLASS_NAME + "$Inherited", "<init>", null);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCaptureFields(snapshot.getCaptures().getEntry(), "obj2", "java.lang.Object", (String) null);
+        CapturedContext.CapturedValue obj2 = getFields(
+                        snapshot.getCaptures().getReturn().getArguments().get("this"))
+                .get("obj2");
+        Map<String, CapturedContext.CapturedValue> obj2Fields =
+                (Map<String, CapturedContext.CapturedValue>) obj2.getValue();
+        assertEquals(24, obj2Fields.get("intValue").getValue());
+        assertEquals(3.14, obj2Fields.get("doubleValue").getValue());
+    }
+
+    @Test
+    public void largeStackInheritedConstructor() throws Exception {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot15";
+        TestSnapshotListener listener = installProbes(
+                createMethodProbe(PROBE_ID1, CLASS_NAME, "<init>", "()"),
+                createMethodProbe(PROBE_ID2, CLASS_NAME, "<init>", "(String, long, String)"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        long result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(4_000_000_001L, result);
+        assertSnapshots(listener, 2, PROBE_ID2, PROBE_ID1);
+    }
+
+    @Test
+    public void multiMethods() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot03";
+        TestSnapshotListener listener = installProbes(
+                createMethodProbe(PROBE_ID1, CLASS_NAME, "f1", "(int)"),
+                createMethodProbe(PROBE_ID2, CLASS_NAME, "f2", "(int)"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(48, result);
+        List<Snapshot> snapshots = assertSnapshots(listener, 2, PROBE_ID1, PROBE_ID2);
+        Snapshot snapshot0 = snapshots.get(0);
+        assertCaptureArgs(snapshot0.getCaptures().getEntry(), "value", "int", "31");
+        assertCaptureReturnValue(snapshot0.getCaptures().getReturn(), "int", "31");
+        Snapshot snapshot1 = snapshots.get(1);
+        assertCaptureArgs(snapshot1.getCaptures().getEntry(), "value", "int", "17");
+        assertCaptureReturnValue(snapshot1.getCaptures().getReturn(), "int", "17");
+    }
+
+    @Test
+    public void multiProbeSameMethod() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot03";
+        LogProbe probe = createMethodProbe(PROBE_ID1, CLASS_NAME, "f1", "(int)");
+        LogProbe probe2 = createMethodProbe(PROBE_ID2, CLASS_NAME, "f1", "(int)");
+        TestSnapshotListener listener = installProbes(probe, probe2);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(48, result);
+        List<Snapshot> snapshots = assertSnapshots(listener, 2, PROBE_ID1, PROBE_ID2);
+        Snapshot snapshot0 = snapshots.get(0);
+        assertCaptureArgs(snapshot0.getCaptures().getEntry(), "value", "int", "31");
+        assertCaptureReturnValue(snapshot0.getCaptures().getReturn(), "int", "31");
+        Snapshot snapshot1 = snapshots.get(1);
+        assertCaptureArgs(snapshot1.getCaptures().getEntry(), "value", "int", "31");
+        assertCaptureReturnValue(snapshot1.getCaptures().getReturn(), "int", "31");
+    }
+
+    @Test
+    public void catchBlock() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot02";
+        TestSnapshotListener listener = installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "f", "()"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertOneSnapshot(listener);
+    }
+
+    @Test
+    @Disabled("no more support of line range")
+    public void insideSynchronizedBlock() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot02";
+        final int LINE_START = 46;
+        final int LINE_END = 48;
+        LogProbe logProbe = createProbeBuilder(PROBE_ID)
+                .where(CLASS_NAME, "synchronizedBlock", "(int)", LINE_START + "-" + LINE_END)
+                .build();
+        TestSnapshotListener listener = installProbes(logProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result =
+                Reflect.onClass(testClass).call("main", "synchronizedBlock").get();
+        assertEquals(76, result);
+        List<Snapshot> snapshots = assertSnapshots(listener, 10);
+        int count = 31;
+        for (int i = 0; i < 10; i++) {
+            Snapshot snapshot = snapshots.get(i);
+            assertCaptureLocals(snapshot.getCaptures().getLines().get(LINE_START), "i", "int", String.valueOf(i));
+            assertCaptureLocals(
+                    snapshot.getCaptures().getLines().get(LINE_START), "count", "int", String.valueOf(count += i));
+        }
+    }
+
+    @Test
+    @Disabled("no more support of line range")
+    public void outsideSynchronizedBlock() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot02";
+        final int LINE_START = 45;
+        final int LINE_END = 49;
+        LogProbe logProbe = createProbeBuilder(PROBE_ID)
+                .where(CLASS_NAME, "synchronizedBlock", "(int)", LINE_START + "-" + LINE_END)
+                .build();
+        TestSnapshotListener listener = installProbes(logProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result =
+                Reflect.onClass(testClass).call("main", "synchronizedBlock").get();
+        assertEquals(76, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertNull(snapshot.getCaptures().getEntry());
+        assertNull(snapshot.getCaptures().getReturn());
+        Assertions.assertEquals(2, snapshot.getCaptures().getLines().size());
+        assertCaptureLocals(snapshot.getCaptures().getLines().get(LINE_START), "count", "int", "31");
+        assertCaptureLocals(snapshot.getCaptures().getLines().get(LINE_END), "count", "int", "76");
+    }
+
+    @Test
+    public void sourceFileProbe() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot03";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        TestSnapshotListener listener = installProbes(createLineProbe(LINE_PROBE_ID1, CLASS_NAME + ".java", line));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(48, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+        assertNull(snapshot.getCaptures().getEntry());
+        assertNull(snapshot.getCaptures().getReturn());
+        Assertions.assertEquals(1, snapshot.getCaptures().getLines().size());
+        Assertions.assertEquals(CLASS_NAME, snapshot.getProbe().getLocation().getType());
+        Assertions.assertEquals("f1", snapshot.getProbe().getLocation().getMethod());
+        assertCaptureArgs(snapshot.getCaptures().getLines().get(line), "value", "int", "31");
+    }
+
+    @Test
+    public void simpleSourceFileProbe() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot10";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        TestSnapshotListener listener = installProbes(createLineProbe(LINE_PROBE_ID1, "CapturedSnapshot10.java", line));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "2").get();
+        assertEquals(2, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+        assertNull(snapshot.getCaptures().getEntry());
+        assertNull(snapshot.getCaptures().getReturn());
+        Assertions.assertEquals(1, snapshot.getCaptures().getLines().size());
+        Assertions.assertEquals(CLASS_NAME, snapshot.getProbe().getLocation().getType());
+        Assertions.assertEquals("main", snapshot.getProbe().getLocation().getMethod());
+        assertCaptureLocals(snapshot.getCaptures().getLines().get(line), "var1", "int", "1");
+    }
+
+    @Test
+    public void sourceFileProbeFullPath() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot10";
+        String DIR_CLASS_NAME = CLASS_NAME.replace('.', '/');
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        TestSnapshotListener listener =
+                installProbes(createLineProbe(LINE_PROBE_ID1, "src/main/java/" + DIR_CLASS_NAME + ".java", line));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "2").get();
+        assertEquals(2, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+        assertNull(snapshot.getCaptures().getEntry());
+        assertNull(snapshot.getCaptures().getReturn());
+        Assertions.assertEquals(1, snapshot.getCaptures().getLines().size());
+        Assertions.assertEquals(CLASS_NAME, snapshot.getProbe().getLocation().getType());
+        Assertions.assertEquals("main", snapshot.getProbe().getLocation().getMethod());
+        assertCaptureArgs(snapshot.getCaptures().getLines().get(line), "arg", "java.lang.String", "2");
+    }
+
+    @Test
+    public void sourceFileProbeFullPathTopLevelClass() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot10";
+        String DIR_CLASS_NAME = CLASS_NAME.replace('.', '/');
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
+        TestSnapshotListener listener =
+                installProbes(createLineProbe(LINE_PROBE_ID2, "src/main/java/" + DIR_CLASS_NAME + ".java", line));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(42 * 42, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID2, listener);
+        assertNull(snapshot.getCaptures().getEntry());
+        assertNull(snapshot.getCaptures().getReturn());
+        Assertions.assertEquals(1, snapshot.getCaptures().getLines().size());
+        Assertions.assertEquals(
+                "com.datadog.debugger.TopLevel01",
+                snapshot.getProbe().getLocation().getType());
+        Assertions.assertEquals("process", snapshot.getProbe().getLocation().getMethod());
+        assertCaptureArgs(snapshot.getCaptures().getLines().get(line), "arg", "int", "42");
+    }
+
+    @Test
+    public void methodProbeLineProbeMix() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot11";
+        String DIR_CLASS_NAME = CLASS_NAME.replace('.', '/');
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        TestSnapshotListener listener = installProbes(
+                createLineProbe(LINE_PROBE_ID1, "src/main/java/" + DIR_CLASS_NAME + ".java", line),
+                createMethodProbe(PROBE_ID2, CLASS_NAME, "main", null));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "2").get();
+        assertEquals(2, result);
+        List<Snapshot> snapshots = assertSnapshots(listener, 2, LINE_PROBE_ID1, PROBE_ID2);
+        Snapshot snapshot0 = snapshots.get(0);
+        assertNull(snapshot0.getCaptures().getEntry());
+        assertNull(snapshot0.getCaptures().getReturn());
+        Assertions.assertEquals(1, snapshot0.getCaptures().getLines().size());
+        Assertions.assertEquals(
+                "com.datadog.debugger.CapturedSnapshot11",
+                snapshot0.getProbe().getLocation().getType());
+        assertEquals("main", snapshot0.getProbe().getLocation().getMethod());
+        assertCaptureArgs(snapshot0.getCaptures().getLines().get(line), "arg", "java.lang.String", "2");
+        assertCaptureLocals(snapshot0.getCaptures().getLines().get(line), "var1", "int", "1");
+        Snapshot snapshot1 = snapshots.get(1);
+        assertEquals(
+                "com.datadog.debugger.CapturedSnapshot11",
+                snapshot1.getProbe().getLocation().getType());
+        assertEquals("main", snapshot1.getProbe().getLocation().getMethod());
+        assertCaptureArgs(snapshot1.getCaptures().getEntry(), "arg", "java.lang.String", "2");
+        assertCaptureReturnValue(snapshot1.getCaptures().getReturn(), "int", "2");
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_21)
+    public void sourceFileProbeScala() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot101";
+        final String FILE_NAME = CLASS_NAME + SCALA_EXT;
+        int line = getLineForLineProbe(CLASS_NAME, SCALA_EXT, LINE_PROBE_ID1);
+        TestSnapshotListener listener = installProbes(createLineProbe(LINE_PROBE_ID1, FILE_NAME, line));
+        String source = getFixtureContent("/" + FILE_NAME);
+        Class<?> testClass = ScalaHelper.compileAndLoad(source, CLASS_NAME, FILE_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(48, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+        assertNull(snapshot.getCaptures().getEntry());
+        assertNull(snapshot.getCaptures().getReturn());
+        Assertions.assertEquals(1, snapshot.getCaptures().getLines().size());
+        Assertions.assertEquals(CLASS_NAME, snapshot.getProbe().getLocation().getType());
+        Assertions.assertEquals("f1", snapshot.getProbe().getLocation().getMethod());
+        assertCaptureArgs(snapshot.getCaptures().getLines().get(line), "value", "int", "31");
+    }
+
+    @Test
+    public void sourceFileProbeGroovy() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot201";
+        int line = getLineForLineProbe(CLASS_NAME, GROOVY_EXT, LINE_PROBE_ID1);
+        TestSnapshotListener listener = installProbes(createLineProbe(LINE_PROBE_ID1, CLASS_NAME + GROOVY_EXT, line));
+        String source = getFixtureContent("/" + CLASS_NAME + GROOVY_EXT);
+        GroovyClassLoader groovyClassLoader = new GroovyClassLoader();
+        Class<?> testClass = groovyClassLoader.parseClass(source);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(48, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+        assertNull(snapshot.getCaptures().getEntry());
+        assertNull(snapshot.getCaptures().getReturn());
+        Assertions.assertEquals(1, snapshot.getCaptures().getLines().size());
+        Assertions.assertEquals(CLASS_NAME, snapshot.getProbe().getLocation().getType());
+        Assertions.assertEquals("f1", snapshot.getProbe().getLocation().getMethod());
+        assertCaptureArgs(snapshot.getCaptures().getLines().get(line), "value", "int", "31");
+    }
+
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "Issue with J9 when compiling Kotlin code")
+    public void sourceFileProbeKotlin() throws IOException, URISyntaxException {
+        System.out.println(
+                JavaVersion.class.getProtectionDomain().getCodeSource().getLocation());
+        System.out.println("Java version:" + JavaVersion.current().feature);
+        final String CLASS_NAME = "CapturedSnapshot301";
+        int line = getLineForLineProbe(CLASS_NAME, KOTLIN_EXT, LINE_PROBE_ID1);
+        TestSnapshotListener listener = installProbes(createLineProbe(LINE_PROBE_ID1, CLASS_NAME + KOTLIN_EXT, line));
+        URL resource = CapturedSnapshotTest.class.getResource("/" + CLASS_NAME + KOTLIN_EXT);
+        assertNotNull(resource);
+        List<File> filesToDelete = new ArrayList<>();
+        try {
+            Class<?> testClass = KotlinHelper.compileAndLoad(CLASS_NAME, resource.getFile(), filesToDelete);
+            Object companion = Reflect.onClass(testClass).get("Companion");
+            int result = Reflect.on(companion).call("main", "").get();
+            assertEquals(48, result);
+            Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+            assertNull(snapshot.getCaptures().getEntry());
+            assertNull(snapshot.getCaptures().getReturn());
+            Assertions.assertEquals(1, snapshot.getCaptures().getLines().size());
+            Assertions.assertEquals(
+                    CLASS_NAME, snapshot.getProbe().getLocation().getType());
+            Assertions.assertEquals("f1", snapshot.getProbe().getLocation().getMethod());
+            assertCaptureArgs(snapshot.getCaptures().getLines().get(line), "value", "int", "31");
+        } finally {
+            filesToDelete.forEach(File::delete);
+        }
+    }
+
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "Issue with J9 when compiling Kotlin code")
+    public void suspendKotlin() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot302";
+        int line = getLineForLineProbe(CLASS_NAME, ".kt", LINE_PROBE_ID1);
+        TestSnapshotListener listener = installProbes(createLineProbe(LINE_PROBE_ID1, CLASS_NAME + ".kt", line));
+        URL resource = CapturedSnapshotTest.class.getResource("/" + CLASS_NAME + ".kt");
+        assertNotNull(resource);
+        List<File> filesToDelete = new ArrayList<>();
+        try {
+            Class<?> testClass = KotlinHelper.compileAndLoad(CLASS_NAME, resource.getFile(), filesToDelete);
+            Object companion = Reflect.onClass(testClass).get("Companion");
+            int result = Reflect.on(companion).call("main", "").get();
+            assertEquals(0, result);
+            Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+            assertCaptureFields(snapshot.getCaptures().getLines().get(line), "intField", "int", "42");
+            assertCaptureFields(
+                    snapshot.getCaptures().getLines().get(9), "strField", String.class.getTypeName(), "foo");
+        } finally {
+            filesToDelete.forEach(File::delete);
+        }
+    }
+
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "Issue with J9 when compiling Kotlin code")
+    public void suspendMethodKotlin() {
+        final String CLASS_NAME = "CapturedSnapshot302";
+        TestSnapshotListener listener = installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "download", null));
+        URL resource = CapturedSnapshotTest.class.getResource("/" + CLASS_NAME + ".kt");
+        assertNotNull(resource);
+        List<File> filesToDelete = new ArrayList<>();
+        try {
+            Class<?> testClass = KotlinHelper.compileAndLoad(CLASS_NAME, resource.getFile(), filesToDelete);
+            Object companion = Reflect.onClass(testClass).get("Companion");
+            int result = Reflect.on(companion).call("main", "1").get();
+            assertEquals(1, result);
+            // 2 snapshots are expected because the method is executed twice one for each state
+            // before the delay, after the delay
+            List<Snapshot> snapshots = assertSnapshots(listener, 2);
+            Snapshot snapshot0 = snapshots.get(0);
+            assertCaptureReturnValue(
+                    snapshot0.getCaptures().getReturn(),
+                    "kotlin.coroutines.intrinsics.CoroutineSingletons",
+                    "COROUTINE_SUSPENDED");
+            Snapshot snapshot1 = snapshots.get(1);
+            assertCaptureReturnValue(snapshot1.getCaptures().getReturn(), String.class.getTypeName(), "1");
+        } finally {
+            filesToDelete.forEach(File::delete);
+        }
+    }
+
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "Issue with J9 when compiling Kotlin code")
+    public void hoistVarKotlin() {
+        final String CLASS_NAME = "CapturedSnapshot303";
+        TestSnapshotListener listener =
+                installProbes(createMethodProbeAtExit(PROBE_ID, CLASS_NAME + "$Companion", "main", null));
+        URL resource = CapturedSnapshotTest.class.getResource("/" + CLASS_NAME + ".kt");
+        assertNotNull(resource);
+        List<File> filesToDelete = new ArrayList<>();
+        try {
+            Class<?> testClass = KotlinHelper.compileAndLoad(CLASS_NAME, resource.getFile(), filesToDelete);
+            Object companion = Reflect.onClass(testClass).get("Companion");
+            int result = Reflect.on(companion).call("main", "").get();
+            assertEquals(0, result);
+            Snapshot snapshot = assertOneSnapshot(listener);
+        } finally {
+            filesToDelete.forEach(File::delete);
+        }
+    }
+
+    @Test
+    public void fieldExtractor() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot04";
+        LogProbe.Builder builder = createProbeBuilder(PROBE_ID1, CLASS_NAME, "createSimpleData", "()");
+        LogProbe simpleDataProbe =
+                builder.capture(1, 100, 255, Limits.DEFAULT_FIELD_COUNT).build();
+        builder = createProbeBuilder(PROBE_ID2, CLASS_NAME, "createCompositeData", "()");
+        LogProbe compositeDataProbe =
+                builder.capture(1, 3, 255, Limits.DEFAULT_FIELD_COUNT).build();
+        TestSnapshotListener listener = installProbes(simpleDataProbe, compositeDataProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(143, result);
+        List<Snapshot> snapshots = assertSnapshots(listener, 2, PROBE_ID1, PROBE_ID2);
+        Snapshot simpleSnapshot = snapshots.get(0);
+        Map<String, String> expectedSimpleFields = new HashMap<>();
+        expectedSimpleFields.put("intValue", "42");
+        expectedSimpleFields.put("strValue", "foo");
+        assertCaptureReturnValue(
+                simpleSnapshot.getCaptures().getReturn(), "CapturedSnapshot04$SimpleData", expectedSimpleFields);
+        Snapshot compositeSnapshot = snapshots.get(1);
+        Map<String, String> expectedCompositeFields = new HashMap<>();
+        expectedCompositeFields.put("nullsd", "null");
+        expectedCompositeFields.put("l1", DEPTH_REASON); // notCapturedReason
+        expectedCompositeFields.put("s1", DEPTH_REASON); // notCapturedReason
+        expectedCompositeFields.put("s2", DEPTH_REASON); // notCapturedReason
+        assertCaptureReturnValue(
+                compositeSnapshot.getCaptures().getReturn(),
+                "CapturedSnapshot04$CompositeData",
+                expectedCompositeFields);
+    }
+
+    @Test
+    public void fieldExtractorDeep2() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot04";
+        LogProbe.Builder builder = createProbeBuilder(PROBE_ID, CLASS_NAME, "createCompositeData", "()");
+        LogProbe compositeDataProbe =
+                builder.capture(2, 3, 255, Limits.DEFAULT_FIELD_COUNT).build();
+        TestSnapshotListener listener = installProbes(compositeDataProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(143, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        CapturedContext.CapturedValue returnValue =
+                snapshot.getCaptures().getReturn().getLocals().get("@return");
+        Map<String, CapturedContext.CapturedValue> fields = getFields(returnValue);
+        assertTrue(fields.containsKey("nullsd"));
+        assertTrue(fields.containsKey("l1"));
+        CapturedContext.CapturedValue s1 = fields.get("s1");
+        Map<String, CapturedContext.CapturedValue> s1Fields =
+                (Map<String, CapturedContext.CapturedValue>) s1.getValue();
+        assertEquals("101", String.valueOf(s1Fields.get("intValue").getValue()));
+        assertEquals("foo1", s1Fields.get("strValue").getValue());
+        assertEquals("null", String.valueOf(s1Fields.get("listValue").getValue()));
+        assertEquals(DEPTH_REASON, String.valueOf(s1Fields.get("listValue").getNotCapturedReason()));
+    }
+
+    @Test
+    public void fieldExtractorLength() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot04";
+        LogProbe.Builder builder = createProbeBuilder(PROBE_ID, CLASS_NAME, "createSimpleData", "()");
+        LogProbe simpleDataProbe =
+                builder.capture(1, 100, 2, Limits.DEFAULT_FIELD_COUNT).build();
+        TestSnapshotListener listener = installProbes(simpleDataProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(143, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        Map<String, String> expectedFields = new HashMap<>();
+        expectedFields.put("intValue", "42");
+        expectedFields.put("strValue", "truncated");
+        expectedFields.put("listValue", DEPTH_REASON);
+        assertCaptureReturnValue(snapshot.getCaptures().getReturn(), "CapturedSnapshot04$SimpleData", expectedFields);
+    }
+
+    @Test
+    public void fieldExtractorDisabled() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot04";
+        LogProbe.Builder builder = createProbeBuilder(PROBE_ID, CLASS_NAME, "createSimpleData", "()");
+        LogProbe simpleDataProbe =
+                builder.capture(0, 100, 50, Limits.DEFAULT_FIELD_COUNT).build();
+        TestSnapshotListener listener = installProbes(simpleDataProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(143, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        CapturedContext.CapturedValue simpleData =
+                snapshot.getCaptures().getReturn().getLocals().get("simpleData");
+        Map<String, CapturedContext.CapturedValue> fields = getFields(simpleData);
+        assertEquals(1, fields.size());
+        assertEquals(DEPTH_REASON, fields.get("@" + NOT_CAPTURED_REASON).getNotCapturedReason());
+    }
+
+    @Test
+    public void fieldExtractorDepth0() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot04";
+        LogProbe.Builder builder = createProbeBuilder(PROBE_ID, CLASS_NAME, "createSimpleData", "()");
+        LogProbe simpleDataProbe =
+                builder.capture(0, 100, 50, Limits.DEFAULT_FIELD_COUNT).build();
+        TestSnapshotListener listener = installProbes(simpleDataProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(143, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        CapturedContext.CapturedValue simpleData =
+                snapshot.getCaptures().getReturn().getLocals().get("simpleData");
+        Map<String, CapturedContext.CapturedValue> simpleDataFields = getFields(simpleData);
+        assertEquals(1, simpleDataFields.size());
+        assertEquals(
+                DEPTH_REASON, simpleDataFields.get("@" + NOT_CAPTURED_REASON).getNotCapturedReason());
+    }
+
+    @Test
+    public void fieldExtractorDepth1() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot04";
+        LogProbe.Builder builder = createProbeBuilder(PROBE_ID, CLASS_NAME, "createSimpleData", "()");
+        LogProbe simpleDataProbe =
+                builder.capture(1, 100, 50, Limits.DEFAULT_FIELD_COUNT).build();
+        TestSnapshotListener listener = installProbes(simpleDataProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(143, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        CapturedContext.CapturedValue simpleData =
+                snapshot.getCaptures().getReturn().getLocals().get("simpleData");
+        Map<String, CapturedContext.CapturedValue> simpleDataFields = getFields(simpleData);
+        assertEquals(4, simpleDataFields.size());
+        assertEquals("foo", simpleDataFields.get("strValue").getValue());
+        assertEquals(42, simpleDataFields.get("intValue").getValue());
+        assertEquals(DEPTH_REASON, simpleDataFields.get("listValue").getNotCapturedReason());
+    }
+
+    @Test
+    public void fieldExtractorDuplicateUnionDepth() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot04";
+        LogProbe probe1 = createProbeBuilder(PROBE_ID1, CLASS_NAME, "createSimpleData", "()")
+                .capture(0, 100, 50, Limits.DEFAULT_FIELD_COUNT)
+                .build();
+        LogProbe probe2 = createProbeBuilder(PROBE_ID2, CLASS_NAME, "createSimpleData", "()")
+                .capture(3, 100, 50, Limits.DEFAULT_FIELD_COUNT)
+                .build();
+        TestSnapshotListener listener = installProbes(probe1, probe2);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(143, result);
+        List<Snapshot> snapshots = assertSnapshots(listener, 2);
+        CapturedContext.CapturedValue simpleData =
+                snapshots.get(0).getCaptures().getReturn().getLocals().get("simpleData");
+        Map<String, CapturedContext.CapturedValue> simpleDataFields = getFields(simpleData);
+        assertEquals(4, simpleDataFields.size());
+        assertEquals("foo", simpleDataFields.get("strValue").getValue());
+        assertEquals(42, simpleDataFields.get("intValue").getValue());
+    }
+
+    @Test
+    public void fieldExtractorCount2() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot04";
+        LogProbe.Builder builder = createProbeBuilder(PROBE_ID, CLASS_NAME, "createCompositeData", "()");
+        LogProbe compositeDataProbe = builder.capture(2, 3, 255, 2).build();
+        TestSnapshotListener listener = installProbes(compositeDataProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(143, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        CapturedContext.CapturedValue returnValue =
+                snapshot.getCaptures().getReturn().getLocals().get("@return");
+        assertEquals("CapturedSnapshot04$CompositeData", returnValue.getType());
+        Map<String, CapturedContext.CapturedValue> fields = getFields(returnValue);
+        assertEquals(3, fields.size());
+        assertEquals(FIELD_COUNT_REASON, fields.get("@" + NOT_CAPTURED_REASON).getNotCapturedReason());
+        Map<String, CapturedContext.CapturedValue> s1Fields =
+                (Map<String, CapturedContext.CapturedValue>) fields.get("s1").getValue();
+        assertEquals("foo1", s1Fields.get("strValue").getValue());
+        assertEquals(101, s1Fields.get("intValue").getValue());
+        Map<String, CapturedContext.CapturedValue> s2Fields =
+                (Map<String, CapturedContext.CapturedValue>) fields.get("s2").getValue();
+        assertEquals("foo2", s2Fields.get("strValue").getValue());
+        assertEquals(202, s2Fields.get("intValue").getValue());
+
+        CapturedContext.CapturedValue compositeData =
+                snapshot.getCaptures().getReturn().getLocals().get("compositeData");
+        Map<String, CapturedContext.CapturedValue> compositeDataFields = getFields(compositeData);
+        assertEquals(3, compositeDataFields.size());
+        assertEquals(
+                FIELD_COUNT_REASON,
+                compositeDataFields.get("@" + NOT_CAPTURED_REASON).getNotCapturedReason());
+        assertTrue(compositeDataFields.containsKey("s1"));
+        assertTrue(compositeDataFields.containsKey("s2"));
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_17)
+    public void fieldExtractorNotAccessible() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot30";
+        LogProbe logProbe = createMethodProbe(PROBE_ID, CLASS_NAME + "$MyObjectInputStream", "process", "()");
+        TestSnapshotListener listener = installProbes(logProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCaptureFieldsNotCaptured(
+                snapshot.getCaptures().getReturn(),
+                "bin",
+                "Field is not accessible: module java.base does not opens/exports to the current module");
+        assertCaptureFieldsNotCaptured(
+                snapshot.getCaptures().getReturn(),
+                "vlist",
+                "Field is not accessible: module java.base does not opens/exports to the current module");
+    }
+
+    @Test
+    public void uncaughtException() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot05";
+        TestSnapshotListener listener =
+                installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "triggerUncaughtException", "()"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        try {
+            Reflect.onClass(testClass).call("main", "triggerUncaughtException").get();
+            Assertions.fail("should not reach this code");
+        } catch (ReflectException ex) {
+            assertEquals("oops", ex.getCause().getCause().getMessage());
+        }
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCaptureThrowable(
+                snapshot.getCaptures().getReturn(),
+                "CapturedSnapshot05$CustomException",
+                "oops",
+                "CapturedSnapshot05.triggerUncaughtException",
+                8);
+        Map<String, String> expectedFields = new HashMap<>();
+        expectedFields.put("detailMessage", "oops");
+        expectedFields.put("additionalMsg", "I did it again");
+        assertCaptureLocals(
+                snapshot.getCaptures().getReturn(), "@exception", "CapturedSnapshot05$CustomException", expectedFields);
+    }
+
+    @Test
+    public void uncaughtExceptionCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot05";
+        final String LOG_TEMPLATE = "exception msg={@exception.detailMessage}";
+        LogProbe probe = createProbeBuilder(PROBE_ID, CLASS_NAME, "triggerUncaughtException", "()")
+                .evaluateAt(MethodLocation.EXIT)
+                .when(
+                        new ProbeCondition(
+                                DSL.when(DSL.and(
+                                        DSL.instanceOf(
+                                                ref("@exception"), DSL.value("CapturedSnapshot05$CustomException")),
+                                        DSL.eq(DSL.getMember(ref("@exception"), "detailMessage"), DSL.value("oops")),
+                                        DSL.eq(
+                                                DSL.getMember(ref("@exception"), "additionalMsg"),
+                                                DSL.value("I did it again")))),
+                                "@exception instanceof \"CapturedSnapshot05$CustomException\" and @exception.detailMessage == 'oops' and @exception.additionalMsg == 'I did it again'"))
+                .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
+                .build();
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        try {
+            Reflect.onClass(testClass).call("main", "triggerUncaughtException").get();
+            Assertions.fail("should not reach this code");
+        } catch (ReflectException ex) {
+            assertEquals("oops", ex.getCause().getCause().getMessage());
+        }
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertEquals("exception msg=oops", snapshot.getMessage());
+        assertCaptureThrowable(
+                snapshot.getCaptures().getReturn(),
+                "CapturedSnapshot05$CustomException",
+                "oops",
+                "CapturedSnapshot05.triggerUncaughtException",
+                8);
+    }
+
+    @Test
+    public void caughtException() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot05";
+        TestSnapshotListener listener =
+                installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "triggerCaughtException", "()"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass)
+                .call("main", "triggerCaughtException")
+                .get();
+        assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCaptureThrowable(
+                snapshot.getCaptures().getCaughtExceptions().get(0),
+                "java.lang.IllegalStateException",
+                "oops",
+                "CapturedSnapshot05.triggerCaughtException",
+                13);
+    }
+
+    @Test
+    public void lineEmptyCaughtException() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot05";
+        int line1 = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        int line2 = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
+        int line3 = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID3);
+        LogProbe probe1 = createLineProbe(LINE_PROBE_ID1, CLASS_NAME, line1);
+        LogProbe probe2 = createLineProbe(LINE_PROBE_ID2, CLASS_NAME, line2);
+        LogProbe probe3 = createLineProbe(LINE_PROBE_ID3, CLASS_NAME, line3);
+        TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass)
+                .call("main", "triggerSwallowedException")
+                .get();
+        assertEquals(-1, result);
+        List<Snapshot> snapshots = assertSnapshots(listener, 3, LINE_PROBE_ID1, LINE_PROBE_ID2, LINE_PROBE_ID3);
+        Snapshot snapshot0 = snapshots.get(0);
+        Map<String, String> expectedFields0 = new HashMap<>();
+        expectedFields0.put("detailMessage", "oops");
+        assertCaptureLocals(
+                snapshot0.getCaptures().getLines().get(line1),
+                "ex0",
+                IllegalStateException.class.getTypeName(),
+                expectedFields0);
+        Snapshot snapshot1 = snapshots.get(1);
+        Map<String, String> expectedFields1 = new HashMap<>();
+        expectedFields1.put("detailMessage", "nope!");
+        assertCaptureLocals(
+                snapshot1.getCaptures().getLines().get(line2),
+                "ex",
+                IllegalArgumentException.class.getTypeName(),
+                expectedFields1);
+        Snapshot snapshot2 = snapshots.get(2);
+        Map<String, String> expectedFields2 = new HashMap<>();
+        expectedFields2.put("detailMessage", "not there");
+        assertCaptureLocals(
+                snapshot2.getCaptures().getLines().get(line3),
+                "ex",
+                FileNotFoundException.class.getTypeName(),
+                expectedFields2);
+    }
+
+    @Test
+    public void noUncaughtExceptionCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        final String LOG_TEMPLATE = "exception?: {isDefined(@exception)}";
+        LogProbe probe = createProbeBuilder(PROBE_ID, CLASS_NAME, "main", "int (String)")
+                .evaluateAt(MethodLocation.EXIT)
+                .when(new ProbeCondition(DSL.when(not(DSL.isDefined(ref("@exception")))), "not(isDefined(@exception))"))
+                .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
+                .build();
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "2").get();
+        assertEquals(2, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+    }
+
+    @Test
+    public void rateLimitSnapshot() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        LogProbe logProbes = new LogProbe.Builder()
+                .language(LANGUAGE)
+                .probeId(LINE_PROBE_ID1)
+                .where(CLASS_NAME, line)
+                .sampling(new LogProbe.Sampling(1))
+                .build();
+        TestSnapshotListener listener = installProbes(logProbes);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        for (int i = 0; i < 100; i++) {
+            int result = Reflect.onClass(testClass).call("main", "1").get();
+            assertEquals(3, result);
+        }
+        assertTrue(listener.snapshots.size() < 20);
+    }
+
+    @Test
+    public void globalRateLimitSnapshot() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot03";
+        LogProbe probe1 = createProbeBuilder(PROBE_ID1, CLASS_NAME, "f1", "(int)")
+                .sampling(10)
+                .build();
+        LogProbe probe2 = createProbeBuilder(PROBE_ID1, CLASS_NAME, "f2", "(int)")
+                .sampling(10)
+                .build();
+        Configuration config = Configuration.builder()
+                .setService(SERVICE_NAME)
+                .add(probe1, probe2)
+                .add(new LogProbe.Sampling(1))
+                .build();
+        TestSnapshotListener listener = installProbes(config);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        for (int i = 0; i < 100; i++) {
+            int result = Reflect.onClass(testClass).call("main", "").get();
+            assertEquals(48, result);
+        }
+        assertTrue(listener.snapshots.size() < 20, "actual snapshots: " + listener.snapshots.size());
+    }
+
+    @Test
+    public void simpleConditionTest() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe logProbe = createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", "int (java.lang.String)")
+                .when(new ProbeCondition(
+                        DSL.when(DSL.and(
+                                // this is always true
+                                DSL.and(
+                                        // this reference is resolved directly from the snapshot
+                                        DSL.eq(ref("fld"), DSL.value(11)),
+                                        // this reference chain needs to use reflection
+                                        DSL.eq(
+                                                DSL.getMember(
+                                                        DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"),
+                                                        "msg"),
+                                                DSL.value("hello"))),
+                                DSL.and(
+                                        DSL.eq(ref("arg"), DSL.value("5")),
+                                        DSL.ge(ref(ValueReferences.DURATION_REF), DSL.value(0L))))),
+                        "(fld == 11 && typed.fld.fld.msg == \"hello\") && (arg == '5' && @duration >= 0)"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        TestSnapshotListener listener = installProbes(logProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        for (int i = 0; i < 100; i++) {
+            int result =
+                    Reflect.onClass(testClass).call("main", String.valueOf(i)).get();
+            assertTrue((i == 2 && result == 2) || result == 3);
+        }
+        assertEquals(1, listener.snapshots.size());
+        assertCaptureArgs(listener.snapshots.get(0).getCaptures().getReturn(), "arg", "java.lang.String", "5");
+    }
+
+    @Test
+    public void lineProbeCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        LogProbe logProbe = createProbeBuilder(LINE_PROBE_ID1, CLASS_NAME, line)
+                .when(new ProbeCondition(
+                        DSL.when(DSL.and(
+                                // this is always true
+                                DSL.and(
+                                        // this reference is resolved directly from the snapshot
+                                        DSL.eq(ref("fld"), DSL.value(11)),
+                                        // this reference chain needs to use reflection
+                                        DSL.eq(
+                                                DSL.getMember(
+                                                        DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"),
+                                                        "msg"),
+                                                DSL.value("hello"))),
+                                DSL.eq(ref("arg"), DSL.value("5")))),
+                        "(fld == 11 && typed.fld.fld.msg == \"hello\") && arg == '5'"))
+                .build();
+        TestSnapshotListener listener = installProbes(logProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        for (int i = 0; i < 100; i++) {
+            int result =
+                    Reflect.onClass(testClass).call("main", String.valueOf(i)).get();
+            assertTrue((i == 2 && result == 2) || result == 3);
+        }
+        assertEquals(1, listener.snapshots.size());
+        assertCaptureArgs(listener.snapshots.get(0).getCaptures().getLines().get(line), "arg", "java.lang.String", "5");
+    }
+
+    @Test
+    public void lineProbeConditionFailed() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        LogProbe logProbe = createProbeBuilder(LINE_PROBE_ID1, CLASS_NAME, line)
+                .when(new ProbeCondition(DSL.when(DSL.eq(ref("foobar"), nullValue())), "foobar == null"))
+                .build();
+        TestSnapshotListener listener = installProbes(logProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "0").get();
+        assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+        assertNull(snapshot.getCaptures().getLines());
+        assertEquals(1, snapshot.getEvaluationErrors().size());
+        assertEquals(
+                "Cannot dereference field: foobar",
+                snapshot.getEvaluationErrors().get(0).getMessage());
+    }
+
+    @Test
+    public void staticFieldCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot19";
+        LogProbe logProbe = createProbeBuilder(PROBE_ID, CLASS_NAME, "process", "int (java.lang.String)")
+                .when(new ProbeCondition(DSL.when(DSL.eq(ref("strField"), DSL.value("foo"))), "strField == 'foo'"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        TestSnapshotListener listener = installProbes(logProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "0").get();
+        assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        Map<String, CapturedContext.CapturedValue> staticFields =
+                snapshot.getCaptures().getReturn().getStaticFields();
+        assertEquals(4, staticFields.size());
+        assertEquals("foo", MoshiSnapshotTestHelper.getValue(staticFields.get("strField")));
+        assertEquals("1001", MoshiSnapshotTestHelper.getValue(staticFields.get("intField")));
+        assertEquals(String.valueOf(Math.PI), MoshiSnapshotTestHelper.getValue(staticFields.get("doubleField")));
+        assertTrue(staticFields.containsKey("intArrayField"));
+    }
+
+    @Test
+    public void simpleFalseConditionTest() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
+        LogProbe logProbe = createProbeBuilder(LINE_PROBE_ID2, CLASS_NAME, line)
+                .when(new ProbeCondition(DSL.when(DSL.eq(ref("arg"), DSL.value("5"))), "arg == '5'"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        TestSnapshotListener listener = installProbes(logProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "0").get();
+        assertEquals(3, result);
+        assertEquals(0, listener.snapshots.size());
+    }
+
+    @Test
+    public void nullCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe logProbes = createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", "int (java.lang.String)")
+                .when(new ProbeCondition(
+                        DSL.when(DSL.eq(
+                                DSL.getMember(DSL.getMember(DSL.getMember(ref("nullTyped"), "fld"), "fld"), "msg"),
+                                DSL.value("hello"))),
+                        "nullTyped.fld.fld.msg == 'hello'"))
+                .build();
+        TestSnapshotListener listener = installProbes(logProbes);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        Snapshot snapshot = assertOneSnapshot(listener);
+        List<EvaluationError> evaluationErrors = snapshot.getEvaluationErrors();
+        assertEquals(1, evaluationErrors.size());
+        assertEquals("nullTyped.fld.fld", evaluationErrors.get(0).getExpr());
+        assertEquals("Cannot dereference field: fld", evaluationErrors.get(0).getMessage());
+        assertEquals("Cannot dereference field: fld", snapshot.getMessage());
+    }
+
+    @Test
+    public void nullConditionTemplateOnly() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe logProbes = createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", "int (java.lang.String)")
+                .when(new ProbeCondition(
+                        DSL.when(DSL.eq(
+                                DSL.getMember(DSL.getMember(DSL.getMember(ref("nullTyped"), "fld"), "fld"), "msg"),
+                                DSL.value("hello"))),
+                        "nullTyped.fld.fld.msg == 'hello'"))
+                .captureSnapshot(false)
+                .template("plain log", Collections.emptyList())
+                .build();
+        TestSnapshotListener listener = installProbes(logProbes);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertEquals("Cannot dereference field: fld", snapshot.getMessage());
+        List<EvaluationError> evaluationErrors = snapshot.getEvaluationErrors();
+        assertEquals(1, evaluationErrors.size());
+        assertEquals("nullTyped.fld.fld", evaluationErrors.get(0).getExpr());
+        assertEquals("Cannot dereference field: fld", evaluationErrors.get(0).getMessage());
+    }
+
+    @Test
+    public void shortCircuitingCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe logProbes = createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", "int (java.lang.String)")
+                .when(new ProbeCondition(
+                        DSL.when(DSL.and(
+                                DSL.isDefined(ref("@exception")),
+                                DSL.contains(
+                                        DSL.getMember(ref("@exception"), "detailMessage"), new StringValue("closed")))),
+                        "isDefined(@exception) && contains(@exception.detailMessage, 'closed')"))
+                .build();
+        TestSnapshotListener listener = installProbes(logProbes);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        // no snapshot, no eval error, isDefined returns false and do not evaluate the second part
+        assertEquals(0, listener.snapshots.size());
+    }
+
+    @Test
+    public void wellKnownClassesCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe logProbes = createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", "int (java.lang.String)")
+                .when(new ProbeCondition(
+                        DSL.when(DSL.eq(DSL.getMember(ref("maybeStr"), "value"), DSL.value("maybe foo"))),
+                        "maybeStr.value == 'maybe foo'"))
+                .build();
+        TestSnapshotListener listener = installProbes(logProbes);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        CapturedContext.CapturedValue maybeStrField = getFields(
+                        snapshot.getCaptures().getReturn().getArguments().get("this"))
+                .get("maybeStr");
+        assertEquals(Optional.class.getTypeName(), maybeStrField.getDeclaredType());
+        Map<String, CapturedContext.CapturedValue> maybeStrFields =
+                (Map<String, CapturedContext.CapturedValue>) maybeStrField.getValue();
+        CapturedContext.CapturedValue value = maybeStrFields.get("value");
+        assertEquals("maybe foo", value.getValue());
+    }
+
+    @Test
+    public void mergedProbesWithAllConditionsTrueTest() throws IOException, URISyntaxException {
+        doMergedProbeConditions(
+                new ProbeCondition(DSL.when(DSL.TRUE), "true"), new ProbeCondition(DSL.when(DSL.TRUE), "true"), 2);
+    }
+
+    @Test
+    public void mergedProbesWithAllConditionsFalseTest() throws IOException, URISyntaxException {
+        doMergedProbeConditions(
+                new ProbeCondition(DSL.when(DSL.FALSE), "false"), new ProbeCondition(DSL.when(DSL.FALSE), "false"), 0);
+    }
+
+    @Test
+    public void mergedProbesWithMainProbeConditionTest() throws IOException, URISyntaxException {
+        doMergedProbeConditions(new ProbeCondition(DSL.when(DSL.TRUE), "true"), null, 2);
+    }
+
+    @Test
+    public void mergedProbesWithAdditionalProbeConditionTest() throws IOException, URISyntaxException {
+        doMergedProbeConditions(null, new ProbeCondition(DSL.when(DSL.TRUE), "true"), 2);
+    }
+
+    @Test
+    public void mergedProbesWithMainProbeConditionFalseTest() throws IOException, URISyntaxException {
+        doMergedProbeConditions(new ProbeCondition(DSL.when(DSL.FALSE), "false"), null, 1);
+    }
+
+    @Test
+    public void mergedProbesWithAdditionalProbeConditionFalseTest() throws IOException, URISyntaxException {
+        doMergedProbeConditions(null, new ProbeCondition(DSL.when(DSL.FALSE), "false"), 1);
+    }
+
+    private List<Snapshot> doMergedProbeConditions(
+            ProbeCondition probeCondition1, ProbeCondition probeCondition2, int expectedSnapshots)
+            throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe probe1 = createProbeBuilder(PROBE_ID1, CLASS_NAME, "doit", "int (java.lang.String)")
+                .when(probeCondition1)
+                .build();
+        LogProbe probe2 = createProbeBuilder(PROBE_ID2, CLASS_NAME, "doit", "int (java.lang.String)")
+                .when(probeCondition2)
+                .build();
+        TestSnapshotListener listener = installProbes(probe1, probe2);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertEquals(expectedSnapshots, listener.snapshots.size());
+        return listener.snapshots;
+    }
+
+    @Test
+    public void mergedProbesConditionMainErrorAdditionalFalse() throws IOException, URISyntaxException {
+        ProbeCondition condition1 = new ProbeCondition(
+                DSL.when(DSL.eq(
+                        DSL.getMember(DSL.getMember(DSL.getMember(ref("nullTyped"), "fld"), "fld"), "msg"),
+                        DSL.value("hello"))),
+                "nullTyped.fld.fld.msg == 'hello'");
+        ProbeCondition condition2 = new ProbeCondition(DSL.when(DSL.FALSE), "false");
+        List<Snapshot> snapshots = doMergedProbeConditions(condition1, condition2, 1);
+        List<EvaluationError> evaluationErrors = snapshots.get(0).getEvaluationErrors();
+        Assertions.assertEquals(1, evaluationErrors.size());
+        Assertions.assertEquals("nullTyped.fld.fld", evaluationErrors.get(0).getExpr());
+        Assertions.assertEquals(
+                "Cannot dereference field: fld", evaluationErrors.get(0).getMessage());
+    }
+
+    @Test
+    public void mergedProbesConditionMainErrorAdditionalTrue() throws IOException, URISyntaxException {
+        ProbeCondition condition1 = new ProbeCondition(
+                DSL.when(DSL.eq(
+                        DSL.getMember(DSL.getMember(DSL.getMember(ref("nullTyped"), "fld"), "fld"), "msg"),
+                        DSL.value("hello"))),
+                "nullTyped.fld.fld.msg == 'hello'");
+        ProbeCondition condition2 = new ProbeCondition(DSL.when(DSL.TRUE), "true");
+        List<Snapshot> snapshots = doMergedProbeConditions(condition1, condition2, 2);
+        List<EvaluationError> evaluationErrors = snapshots.get(0).getEvaluationErrors();
+        Assertions.assertEquals(1, evaluationErrors.size());
+        Assertions.assertEquals("nullTyped.fld.fld", evaluationErrors.get(0).getExpr());
+        Assertions.assertEquals(
+                "Cannot dereference field: fld", evaluationErrors.get(0).getMessage());
+        assertNull(snapshots.get(1).getEvaluationErrors());
+    }
+
+    @Test
+    public void mergedProbesConditionMainFalseAdditionalError() throws IOException, URISyntaxException {
+        ProbeCondition condition1 = new ProbeCondition(DSL.when(DSL.FALSE), "false");
+        ProbeCondition condition2 = new ProbeCondition(
+                DSL.when(DSL.eq(
+                        DSL.getMember(DSL.getMember(DSL.getMember(ref("nullTyped"), "fld"), "fld"), "msg"),
+                        DSL.value("hello"))),
+                "nullTyped.fld.fld.msg == 'hello'");
+        List<Snapshot> snapshots = doMergedProbeConditions(condition1, condition2, 1);
+        List<EvaluationError> evaluationErrors = snapshots.get(0).getEvaluationErrors();
+        Assertions.assertEquals(1, evaluationErrors.size());
+        Assertions.assertEquals("nullTyped.fld.fld", evaluationErrors.get(0).getExpr());
+        Assertions.assertEquals(
+                "Cannot dereference field: fld", evaluationErrors.get(0).getMessage());
+    }
+
+    @Test
+    public void mergedProbesConditionMainTrueAdditionalError() throws IOException, URISyntaxException {
+        ProbeCondition condition1 = new ProbeCondition(DSL.when(DSL.TRUE), "true");
+        ProbeCondition condition2 = new ProbeCondition(
+                DSL.when(DSL.eq(
+                        DSL.getMember(DSL.getMember(DSL.getMember(ref("nullTyped"), "fld"), "fld"), "msg"),
+                        DSL.value("hello"))),
+                "nullTyped.fld.fld.msg == 'hello'");
+        List<Snapshot> snapshots = doMergedProbeConditions(condition1, condition2, 2);
+        assertNull(snapshots.get(0).getEvaluationErrors());
+        List<EvaluationError> evaluationErrors = snapshots.get(1).getEvaluationErrors();
+        Assertions.assertEquals(1, evaluationErrors.size());
+        Assertions.assertEquals("nullTyped.fld.fld", evaluationErrors.get(0).getExpr());
+        Assertions.assertEquals(
+                "Cannot dereference field: fld", evaluationErrors.get(0).getMessage());
+    }
+
+    @Test
+    public void mergedProbesConditionMixedLocation() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe probe1 = createProbeBuilder(PROBE_ID1, CLASS_NAME, "doit", "int (java.lang.String)")
+                .when(new ProbeCondition(DSL.when(DSL.TRUE), "true"))
+                .evaluateAt(MethodLocation.DEFAULT)
+                .build();
+        LogProbe probe2 = createProbeBuilder(PROBE_ID2, CLASS_NAME, "doit", "int (java.lang.String)")
+                .when(new ProbeCondition(DSL.when(DSL.ge(ref("@duration"), DSL.value(0))), "@duration >= 0"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        TestSnapshotListener listener = installProbes(probe1, probe2);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        Assertions.assertEquals(3, result);
+        Assertions.assertEquals(2, listener.snapshots.size());
+        assertNull(listener.snapshots.get(0).getEvaluationErrors());
+        assertNull(listener.snapshots.get(1).getEvaluationErrors());
+    }
+
+    @Test
+    public void mergedProbesDifferentSignature() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe probe1 = createMethodProbeAtExit(PROBE_ID1, CLASS_NAME, "doit", null);
+        LogProbe probe2 = createMethodProbeAtExit(PROBE_ID2, CLASS_NAME, "doit", "int (java.lang.String)");
+        LogProbe probe3 = createMethodProbeAtExit(PROBE_ID3, CLASS_NAME, "doit", "(String)");
+        TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        Assertions.assertEquals(3, result);
+        Assertions.assertEquals(3, listener.snapshots.size());
+        assertNull(listener.snapshots.get(0).getEvaluationErrors());
+        assertNull(listener.snapshots.get(1).getEvaluationErrors());
+        assertNull(listener.snapshots.get(2).getEvaluationErrors());
+    }
+
+    @Test
+    public void mergedProbesWithCaptureExpressionsMixed() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe probe1 = createProbeBuilder(PROBE_ID1, CLASS_NAME, "doit", null)
+                .evaluateAt(MethodLocation.EXIT)
+                .captureSnapshot(false)
+                .captureExpressions(Arrays.asList(
+                        new LogProbe.CaptureExpression(
+                                "typed_fld_fld_msg",
+                                new ValueScript(
+                                        DSL.getMember(DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"), "msg"),
+                                        "typed.fld.fld.msg"),
+                                null),
+                        new LogProbe.CaptureExpression(
+                                "nullTyped_fld",
+                                new ValueScript(DSL.getMember(ref("nullTyped"), "fld"), "nullTyped.fld"),
+                                null)))
+                .build();
+        LogProbe probe2 = createMethodProbeAtExit(PROBE_ID2, CLASS_NAME, "doit", null);
+        TestSnapshotListener listener = installProbes(probe1, probe2);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        List<Snapshot> snapshots = assertSnapshots(listener, 2, PROBE_ID1, PROBE_ID2);
+        // snapshot with Capture Expressions
+        Snapshot snapshot0 = snapshots.get(0);
+        assertEquals(
+                2, snapshot0.getCaptures().getReturn().getCaptureExpressions().size());
+        assertCaptureExpressions(
+                snapshot0.getCaptures().getReturn(), "typed_fld_fld_msg", String.class.getTypeName(), "hello");
+        assertCaptureExpressions(
+                snapshot0.getCaptures().getReturn(), "nullTyped_fld", Object.class.getTypeName(), null);
+        assertNull(snapshot0.getCaptures().getReturn().getArguments());
+        assertNull(snapshot0.getCaptures().getReturn().getLocals());
+        // Snapshot without Capture Expressions
+        Snapshot snapshot1 = snapshots.get(1);
+        assertNull(snapshot1.getCaptures().getReturn().getCaptureExpressions());
+        assertCaptureArgs(snapshot1.getCaptures().getReturn(), "arg", String.class.getTypeName(), "1");
+        assertCaptureLocals(snapshot1.getCaptures().getReturn(), "var1", Integer.TYPE.getTypeName(), "3");
+        assertCaptureLocals(snapshot1.getCaptures().getReturn(), "@return", Integer.TYPE.getTypeName(), "3");
+    }
+
+    @Test
+    public void mergedProbesWithDifferentCaptureExpressions() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe probe1 = createProbeBuilder(PROBE_ID1, CLASS_NAME, "doit", null)
+                .evaluateAt(MethodLocation.EXIT)
+                .captureSnapshot(false)
+                .captureExpressions(Arrays.asList(
+                        new LogProbe.CaptureExpression(
+                                "typed_fld_fld_msg",
+                                new ValueScript(
+                                        DSL.getMember(DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"), "msg"),
+                                        "typed.fld.fld.msg"),
+                                null),
+                        new LogProbe.CaptureExpression(
+                                "nullTyped_fld",
+                                new ValueScript(DSL.getMember(ref("nullTyped"), "fld"), "nullTyped.fld"),
+                                null)))
+                .build();
+        LogProbe probe2 = createProbeBuilder(PROBE_ID2, CLASS_NAME, "doit", null)
+                .evaluateAt(MethodLocation.EXIT)
+                .captureSnapshot(false)
+                .captureExpressions(Arrays.asList(
+                        new LogProbe.CaptureExpression("var1", new ValueScript(ref("var1"), "var1"), null),
+                        new LogProbe.CaptureExpression(
+                                "this_fld", new ValueScript(DSL.getMember(ref("this"), "fld"), "this.fld"), null)))
+                .build();
+        TestSnapshotListener listener = installProbes(probe1, probe2);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        List<Snapshot> snapshots = assertSnapshots(listener, 2, PROBE_ID1, PROBE_ID2);
+        // Snapshot 0
+        Snapshot snapshot0 = snapshots.get(0);
+        assertEquals(
+                2, snapshot0.getCaptures().getReturn().getCaptureExpressions().size());
+        assertCaptureExpressions(
+                snapshot0.getCaptures().getReturn(), "typed_fld_fld_msg", String.class.getTypeName(), "hello");
+        assertCaptureExpressions(
+                snapshot0.getCaptures().getReturn(), "nullTyped_fld", Object.class.getTypeName(), null);
+        assertNull(snapshot0.getCaptures().getReturn().getArguments());
+        assertNull(snapshot0.getCaptures().getReturn().getLocals());
+        // Snapshot 1
+        Snapshot snapshot1 = snapshots.get(1);
+        assertCaptureExpressions(snapshot1.getCaptures().getReturn(), "var1", Integer.TYPE.getTypeName(), "3");
+        assertCaptureExpressions(snapshot1.getCaptures().getReturn(), "this_fld", Integer.TYPE.getTypeName(), "11");
+        assertNull(snapshot1.getCaptures().getReturn().getArguments());
+        assertNull(snapshot1.getCaptures().getReturn().getLocals());
+    }
+
+    @Test
+    public void fields() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        TestSnapshotListener listener = installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "f", "()"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCaptureFieldCount(snapshot.getCaptures().getEntry(), 5);
+        assertCaptureFields(snapshot.getCaptures().getEntry(), "intValue", "int", "24");
+        assertCaptureFields(snapshot.getCaptures().getEntry(), "doubleValue", "double", "3.14");
+        assertCaptureFields(snapshot.getCaptures().getEntry(), "strValue", "java.lang.String", "foobar");
+        assertCaptureFields(
+                snapshot.getCaptures().getEntry(), "strList", "java.util.ArrayList", Arrays.asList("foo", "bar"));
+        assertCaptureFields(snapshot.getCaptures().getEntry(), "strMap", "java.util.HashMap", Collections.emptyMap());
+        assertCaptureFieldCount(snapshot.getCaptures().getReturn(), 5);
+        assertCaptureFields(snapshot.getCaptures().getReturn(), "intValue", "int", "48");
+        assertCaptureFields(snapshot.getCaptures().getReturn(), "doubleValue", "double", "3.14");
+        assertCaptureFields(snapshot.getCaptures().getReturn(), "strValue", "java.lang.String", "done");
+        assertCaptureFields(snapshot.getCaptures().getReturn(), "strList", "java.util.ArrayList", "[foo, bar, done]");
+        Map<Object, Object> expectedMap = new HashMap<>();
+        expectedMap.put("foo", "bar");
+        assertCaptureFields(snapshot.getCaptures().getReturn(), "strMap", "java.util.HashMap", expectedMap);
+    }
+
+    @Test
+    public void inheritedFields() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        final String INHERITED_CLASS_NAME = CLASS_NAME + "$Inherited";
+        LogProbe probe = createProbeBuilder(PROBE_ID, INHERITED_CLASS_NAME, "f", "()")
+                .when(new ProbeCondition(DSL.when(DSL.eq(ref("intValue"), DSL.value(24))), "intValue == 24"))
+                .evaluateAt(MethodLocation.ENTRY)
+                .build();
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "inherited").get();
+        assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        // Only Declared fields in the current class are captured, not inherited fields
+        assertCaptureFieldCount(snapshot.getCaptures().getEntry(), 5);
+        assertCaptureFields(snapshot.getCaptures().getEntry(), "strValue", "java.lang.String", "foobar");
+        assertCaptureFields(snapshot.getCaptures().getEntry(), "intValue", "int", "24");
+        assertCaptureFieldCount(snapshot.getCaptures().getReturn(), 5);
+        assertCaptureFields(snapshot.getCaptures().getReturn(), "strValue", "java.lang.String", "barfoo");
+        assertCaptureFields(snapshot.getCaptures().getEntry(), "intValue", "int", "24");
+    }
+
+    @Test
+    public void staticFields() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot15";
+        TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "<init>", "()");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        long result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(4_000_000_001L, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        Map<String, CapturedContext.CapturedValue> staticFields =
+                snapshot.getCaptures().getEntry().getStaticFields();
+        assertEquals(1, staticFields.size());
+        CapturedContext.CapturedValue globalArray = staticFields.get("globalArray");
+        assertNotNull(globalArray);
+        assertEquals("long[]", globalArray.getType());
+    }
+
+    @Test
+    public void staticInheritedFields() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot19";
+        final String INHERITED_CLASS_NAME = CLASS_NAME + "$Inherited";
+        LogProbe logProbe = createProbeBuilder(PROBE_ID, INHERITED_CLASS_NAME, "f", "()")
+                .when(new ProbeCondition(DSL.when(DSL.eq(ref("intValue"), DSL.value(48))), "intValue == 48"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        TestSnapshotListener listener = installProbes(logProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "inherited").get();
+        assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        Map<String, CapturedContext.CapturedValue> staticFields =
+                snapshot.getCaptures().getReturn().getStaticFields();
+        // inherited static fields are not collected
+        assertEquals(2, staticFields.size());
+        assertEquals("barfoo", MoshiSnapshotTestHelper.getValue(staticFields.get("strValue")));
+    }
+
+    @Test
+    public void staticLambda() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot07";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        TestSnapshotListener listener = installProbes(createLineProbe(LINE_PROBE_ID1, CLASS_NAME, line));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass)
+                .call("main", "static", "email@address")
+                .get();
+        assertEquals(8, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+        CapturedContext context = snapshot.getCaptures().getLines().get(line);
+        assertNotNull(context);
+        assertCaptureLocals(context, "idx", "int", "5");
+    }
+
+    @Test
+    public void capturingLambda() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot07";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
+        TestSnapshotListener listener = installProbes(createLineProbe(LINE_PROBE_ID2, CLASS_NAME, line));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass)
+                .call("main", "capturing", "email@address")
+                .get();
+        assertEquals(8, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID2, listener);
+        CapturedContext context = snapshot.getCaptures().getLines().get(line);
+        assertNotNull(context);
+        assertCaptureLocals(context, "idx", "int", "5");
+        assertCaptureFields(context, "strValue", "java.lang.String", "email@address");
+    }
+
+    @Test
+    public void multiLambdas() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot07";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID3);
+        TestSnapshotListener listener = installProbes(createLineProbe(LINE_PROBE_ID3, CLASS_NAME, line));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass)
+                .call("main", "multi", "FOO1,FOO2,FOO3")
+                .get();
+        assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID3, listener);
+        CapturedContext context = snapshot.getCaptures().getLines().get(line);
+        assertNotNull(context);
+        assertCaptureArgs(context, "arg", String.class.getTypeName(), "FOO1,FOO2,FOO3");
+    }
+
+    @Test
+    public void tracerInstrumentedClass() throws Exception {
+        DebuggerContext.initClassFilter(new DenyListHelper(null));
+        final String CLASS_NAME = "com.datadog.debugger.jaxrs.MyResource";
+        // compile the JAX-RS resource fixture and weave it with the real tracer JAX-RS
+        // instrumentation, so this test exercises argument-name resolution against the same
+        // bytecode shape the tracer actually produces
+        ClassFileTransformer jaxRsTransformer = installTracerInstrumentation(instr);
+        Class<?> testClass;
+        try {
+            TestSnapshotListener listener = installMethodProbe(CLASS_NAME, "createResource", null);
+            testClass = compileAndLoadClass(CLASS_NAME);
+            Object result = Reflect.onClass(testClass)
+                    .create()
+                    .call("createResource", (Object) null, (Object) null, 1)
+                    .get();
+            Snapshot snapshot = assertOneSnapshot(listener);
+            Map<String, CapturedContext.CapturedValue> arguments =
+                    snapshot.getCaptures().getEntry().getArguments();
+            // it's important there is no null key in this map, as Jackson is not happy about it
+            // it's means here that argument names are not resolved correctly
+            Assertions.assertFalse(arguments.containsKey(null));
+            assertEquals(4, arguments.size());
+            assertTrue(arguments.containsKey("this"));
+            assertTrue(arguments.containsKey("apiKey"));
+            assertTrue(arguments.containsKey("uriInfo"));
+            assertTrue(arguments.containsKey("value"));
+        } finally {
+            instr.removeTransformer(jaxRsTransformer);
+        }
+    }
+
+    @Test
+    public void noCodeMethods() throws Exception {
+        final String CLASS_NAME = "CapturedSnapshot09";
+        LogProbe nativeMethodProbe = createMethodProbe(PROBE_ID1, CLASS_NAME, "nativeMethod", "()");
+        LogProbe abstractMethodProbe = createMethodProbe(PROBE_ID2, CLASS_NAME, "abstractMethod", "()");
+        TestSnapshotListener listener = installProbes(nativeMethodProbe, abstractMethodProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(1, result);
+        ArgumentCaptor<ProbeId> probeIdCaptor = ArgumentCaptor.forClass(ProbeId.class);
+        ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
+        verify(probeStatusSink, times(2)).addError(probeIdCaptor.capture(), strCaptor.capture());
+        assertEquals(PROBE_ID1.getId(), probeIdCaptor.getAllValues().get(0).getId());
+        assertEquals(
+                "Cannot instrument an abstract or native method",
+                strCaptor.getAllValues().get(0));
+        assertEquals(PROBE_ID2.getId(), probeIdCaptor.getAllValues().get(1).getId());
+        assertEquals(
+                "Cannot instrument an abstract or native method",
+                strCaptor.getAllValues().get(1));
+    }
+
+    @Test
+    public void duplicateClassDefinition() throws Exception {
+        // this test reproduces a very specific case where we get:
+        // java.lang.LinkageError: loader utils.MemClassLoader @1f7ef9ea
+        // attempted duplicate class definition for com.datadog.debugger.CapturedSnapshot12.
+        // (com.datadog.debugger.CapturedSnapshot12 is in unnamed module of loader utils.MemClassLoader
+        // @1f7ef9ea, parent loader 'app')
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot12";
+        LogProbe abstractMethodProbe = createMethodProbe(PROBE_ID, CLASS_NAME, "<init>", null);
+        TestSnapshotListener listener = installProbes(abstractMethodProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        assertNotNull(testClass);
+    }
+
+    @Test
+    public void overloadedMethods() throws Exception {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot16";
+        TestSnapshotListener listener = installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "overload", null));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(63, result);
+        List<Snapshot> snapshots = assertSnapshots(listener, 1, PROBE_ID);
+        assertCaptureReturnValue(snapshots.get(0).getCaptures().getReturn(), "int", "42");
+        assertEquals(1, snapshots.get(0).getCaptures().getEntry().getArguments().size());
+    }
+
+    @Test
+    public void noDebugInfoEmptyMethod() throws Exception {
+        final String CLASS_NAME = "CapturedSnapshot03";
+        TestSnapshotListener listener = installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "empty", null));
+        Map<String, byte[]> classFileBuffers = compile(CLASS_NAME, SourceCompiler.DebugInfo.NONE, "8");
+        Class<?> testClass = loadClass(CLASS_NAME, classFileBuffers);
+        int result = Reflect.onClass(testClass).call("main", "2").get();
+        assertEquals(48, result);
+        assertOneSnapshot(listener);
+    }
+
+    @Test
+    public void instrumentTheWorld() throws Exception {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        Map<String, byte[]> classFileBuffers = compile(CLASS_NAME);
+        TestSnapshotListener listener = setupInstrumentTheWorldTransformer(
+                null, getClass().getResource("/include-files/singleClass.txt").getPath());
+        Class<?> testClass;
+        try {
+            testClass = loadClass(CLASS_NAME, classFileBuffers);
+        } finally {
+            instr.removeTransformer(currentTransformer);
+        }
+        int result = Reflect.onClass(testClass).call("main", "2").get();
+        assertEquals(2, result);
+        assertEquals(1, listener.snapshots.size());
+        ProbeImplementation probeImplementation = listener.snapshots.get(0).getProbe();
+        assertFalse(((CapturedContextProbe) probeImplementation).isCaptureSnapshot());
+        assertEquals("main", probeImplementation.getLocation().getMethod());
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"/exclude-files/singleClass.txt", "/exclude-files/startsWithClass.txt"})
+    public void instrumentTheWorld_excludeClass(String excludeFileName) throws Exception {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        Map<String, byte[]> classFileBuffers = compile(CLASS_NAME);
+        URL resource = getClass().getResource(excludeFileName);
+        TestSnapshotListener listener = setupInstrumentTheWorldTransformer(
+                resource.getPath(),
+                getClass().getResource("/include-files/singleClass.txt").getPath());
+        Class<?> testClass;
+        try {
+            testClass = loadClass(CLASS_NAME, classFileBuffers);
+        } finally {
+            instr.removeTransformer(currentTransformer);
+        }
+        int result = Reflect.onClass(testClass).call("main", "2").get();
+        assertEquals(2, result);
+        assertEquals(0, listener.snapshots.size());
+    }
+
+    @Test
+    public void objectDynamicType() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot17";
+        TestSnapshotListener listener = installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "processWithArg", null));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "2").get();
+        assertEquals(50, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCaptureArgs(snapshot.getCaptures().getEntry(), "obj", "java.lang.Integer", "42");
+        assertCaptureFields(snapshot.getCaptures().getEntry(), "objField", "java.lang.String", "foobar");
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "result", "java.lang.Integer", "50");
+        assertCaptureReturnValue(snapshot.getCaptures().getReturn(), "java.lang.Integer", "50");
+    }
+
+    @Test
+    public void exceptionAsLocalVariable() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot18";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        TestSnapshotListener listener = installProbes(createLineProbe(LINE_PROBE_ID1, CLASS_NAME, line));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "2").get();
+        assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+        Map<String, String> expectedFields = new HashMap<>();
+        expectedFields.put("detailMessage", "For input string: \"a\"");
+        assertCaptureLocals(
+                snapshot.getCaptures().getLines().get(line), "ex", "java.lang.NumberFormatException", expectedFields);
+    }
+
+    @Test
+    public void evaluateAtEntry() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        LogProbe logProbes = createProbeBuilder(PROBE_ID, CLASS_NAME, "main", "int (java.lang.String)")
+                .when(new ProbeCondition(DSL.when(DSL.eq(ref("arg"), DSL.value("1"))), "arg == '1'"))
+                .evaluateAt(MethodLocation.ENTRY)
+                .build();
+        TestSnapshotListener listener = installProbes(logProbes);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertOneSnapshot(listener);
+    }
+
+    @Test
+    public void evaluateAtExit() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        LogProbe logProbes = createProbeBuilder(PROBE_ID, CLASS_NAME, "main", "int (java.lang.String)")
+                .when(new ProbeCondition(DSL.when(DSL.eq(ref("@return"), DSL.value(3))), "@return == 3"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        TestSnapshotListener listener = installProbes(logProbes);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertOneSnapshot(listener);
+    }
+
+    @Test
+    public void evaluateAtExitFalse() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        LogProbe logProbes = createProbeBuilder(PROBE_ID, CLASS_NAME, "main", "int (java.lang.String)")
+                .when(new ProbeCondition(DSL.when(DSL.eq(ref("@return"), DSL.value(0))), "@return == 0"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        TestSnapshotListener listener = installProbes(logProbes);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertEquals(0, listener.snapshots.size());
+    }
+
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    public void uncaughtExceptionConditionLocalVar() throws IOException, URISyntaxException {
+        if (Config.get().getDynamicInstrumentationLocalVarHoistingLevel() < 2) {
+            // this test requires local var hoisting level 2 (aggressive)
+            // because we need to hoist long local variables (2 slots)
+            return;
+        }
+        final String CLASS_NAME = "CapturedSnapshot05";
+        LogProbe probe = createProbeBuilder(PROBE_ID, CLASS_NAME, "main", "(String)")
+                .when(new ProbeCondition(DSL.when(DSL.ge(ref("after"), DSL.value(0))), "after >= 0"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        try {
+            Reflect.onClass(testClass).call("main", "triggerUncaughtException").get();
+            Assertions.fail("should not reach this code");
+        } catch (ReflectException ex) {
+            assertEquals("oops", ex.getCause().getCause().getMessage());
+        }
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCaptureThrowable(
+                snapshot.getCaptures().getReturn(),
+                "CapturedSnapshot05$CustomException",
+                "oops",
+                "CapturedSnapshot05.triggerUncaughtException",
+                8);
+        assertNull(snapshot.getEvaluationErrors());
+        // after is 0 because the exception is thrown before the assignment and local var initialized
+        // at the beginning of the method by instrumentation
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "after", "long", "0");
+    }
+
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    public void uncaughtExceptionCaptureLocalVars() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
+        LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "uncaughtException", null);
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        try {
+            Reflect.onClass(testClass).call("main", "uncaughtException").get();
+            Assertions.fail("should not reach this code");
+        } catch (ReflectException ex) {
+            assertEquals("oops", ex.getCause().getCause().getMessage());
+        }
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCaptureThrowable(
+                snapshot.getCaptures().getReturn(),
+                "java.lang.RuntimeException",
+                "oops",
+                "com.datadog.debugger.CapturedSnapshot31.uncaughtException",
+                51);
+    }
+
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    public void methodProbeLocalVarsLocalScopes() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
+        LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "localScopes", "(String)");
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "localScopes").get();
+        assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "@return", "int", "42");
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "localVar", "int", "42");
+    }
+
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    public void methodProbeLocalVarsDeepScopes() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
+        LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "deepScopes", "(String)");
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "deepScopes").get();
+        assertEquals(4, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        // localVarL4 can not be captured/hoisted because same name, same slot
+        //    LocalVariableTable:
+        //    Start  Length  Slot  Name   Signature
+        //       59       3     6 localVarL4   I
+        //       65       3     6 localVarL4   I
+        //       71       3     6 localVarL4   I
+        //       29      45     5 localVarL3   I
+        //       20      54     4 localVarL2   I
+        //       13      64     3 localVarL1   I
+        //        0      79     0  this   Lcom/datadog/debugger/CapturedSnapshot31;
+        //        0      79     1   arg   Ljava/lang/String;
+        //        2      77     2 localVarL0   I
+        // localVarL4 cannot be hoisted in safe mode because of the same name and slot
+        assertEquals(5, snapshot.getCaptures().getReturn().getLocals().size());
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "localVarL0", "int", "0");
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "localVarL1", "int", "1");
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "localVarL2", "int", "2");
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "localVarL3", "int", "3");
+    }
+
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    public void methodProbeExceptionLocalVars() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
+        LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "caughtException", "(String)");
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "illegalState").get();
+        assertEquals(0, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
+        Map<String, String> expectedFields = new HashMap<>();
+        expectedFields.put("detailMessage", "state");
+        assertCaptureLocals(
+                snapshot.getCaptures().getReturn(), "ex", IllegalStateException.class.getTypeName(), expectedFields);
+        listener.snapshots.clear();
+        result = Reflect.onClass(testClass).call("main", "illegalArgument").get();
+        assertEquals(0, result);
+        snapshot = assertOneSnapshot(listener);
+        assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
+        expectedFields = new HashMap<>();
+        expectedFields.put("detailMessage", "argument");
+        assertCaptureLocals(
+                snapshot.getCaptures().getReturn(), "ex", IllegalArgumentException.class.getTypeName(), expectedFields);
+    }
+
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    public void overlappingLocalVarSlot() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
+        LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "overlappingSlots", "(String)");
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "overlappingSlots").get();
+        assertEquals(5, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        // i local var cannot be hoisted because of overlapping slots and name
+        assertFalse(snapshot.getCaptures().getReturn().getLocals().containsKey("i"));
+        assertTrue(snapshot.getCaptures().getReturn().getLocals().containsKey("subStr"));
+    }
+
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    public void duplicateLocalDifferentScope() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
+        LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "duplicateLocalDifferentScope", "(String)");
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass)
+                .call("main", "duplicateLocalDifferentScope")
+                .get();
+        assertEquals(28, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertEquals(1, snapshot.getCaptures().getReturn().getLocals().size());
+        // ch cannot be hoisted in safe mode, because it has the duplicate name with different slot
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "@return", Integer.TYPE.getTypeName(), "28");
+    }
+
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    public void mixingIntAndLongWhenHoisting() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
+        LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "mixingIntAndLong", "(String)");
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "mixingIntAndLong").get();
+        assertEquals(1626, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
+        // no hoisting in safe mode: long local variable and 2-slots type (forbidden slots)
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "l", Long.TYPE.getTypeName(), "1626");
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "@return", Integer.TYPE.getTypeName(), "1626");
+    }
+
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    public void mixingIntAndCharWhenHoisting() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
+        LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "mixingIntAndChar", "(String)");
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "mixingIntAndChar").get();
+        assertEquals(-327, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "i", Integer.TYPE.getTypeName(), "-327");
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "@return", Integer.TYPE.getTypeName(), "-327");
+    }
+
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    public void mixingIntAndRefTypeWhenHoisting() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
+        LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "mixingIntAndRefType", "(String)");
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result =
+                Reflect.onClass(testClass).call("main", "mixingIntAndRefType").get();
+        assertEquals(19, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "i", Integer.TYPE.getTypeName(), "19");
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "@return", Integer.TYPE.getTypeName(), "19");
+    }
+
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    public void sameSlotAndTypeDifferentName() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
+        LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "sameSlotAndTypeDifferentName", "(String)");
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass)
+                .call("main", "sameSlotAndTypeDifferentName")
+                .get();
+        assertEquals(28, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        // r and o cannot be hoisted in safe mode, because they have the same slot
+        assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
+        assertCaptureLocals(
+                snapshot.getCaptures().getReturn(), "p", String.class.getTypeName(), "sameSlotAndTypeDifferentName");
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "@return", Integer.TYPE.getTypeName(), "28");
+    }
+
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    public void sameSlotAndNameOneReturn() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
+        LogProbe probe = createMethodProbeAtExit(PROBE_ID, CLASS_NAME, "sameSlotAndNameOneReturn", "(String)");
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass)
+                .call("main", "sameSlotAndNameOneReturn")
+                .get();
+        assertEquals(24, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        // o is not hoisted in safe mode, because it has the same slot and name on different range
+        assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "result", Integer.TYPE.getTypeName(), "24");
+        assertCaptureLocals(snapshot.getCaptures().getReturn(), "@return", Integer.TYPE.getTypeName(), "24");
+    }
+
+    @Test
+    public void enumConstructorArgs() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot23";
+        final String ENUM_CLASS = CLASS_NAME + "$MyEnum";
+        TestSnapshotListener listener = installProbes(createProbeBuilder(PROBE_ID, ENUM_CLASS, "<init>", null)
+                .sampling(10)
+                .build());
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(2, result);
+        assertSnapshots(listener, 3, PROBE_ID);
+        Map<String, CapturedContext.CapturedValue> arguments =
+                listener.snapshots.get(0).getCaptures().getEntry().getArguments();
+        assertEquals(3, arguments.size());
+        assertTrue(arguments.containsKey("this"));
+        assertTrue(arguments.containsKey("p1")); // this the hidden ordinal arg of an enum
+        assertTrue(arguments.containsKey("strValue"));
+    }
+
+    @Test
+    public void enumValues() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot23";
+        TestSnapshotListener listener = installProbes(createMethodProbe(PROBE_ID, CLASS_NAME, "convert", null));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "2").get();
+        assertEquals(2, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCaptureReturnValue(
+                snapshot.getCaptures().getReturn(), "com.datadog.debugger.CapturedSnapshot23$MyEnum", "TWO");
+    }
+
+    @Test
+    public void enumCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot23";
+        LogProbe probe = createProbeBuilder(PROBE_ID, CLASS_NAME, "convert", null)
+                .evaluateAt(MethodLocation.EXIT)
+                .when(
+                        new ProbeCondition(
+                                DSL.when(DSL.and(
+                                        DSL.eq(ref("@return"), DSL.value("TWO")),
+                                        DSL.eq(ref("@return"), DSL.value("MyEnum.TWO")),
+                                        DSL.eq(
+                                                ref("@return"),
+                                                DSL.value("com.datadog.debugger.CapturedSnapshot23$MyEnum.TWO")))),
+                                "@return == 'TWO' && @return == 'MyEnum.TWO' && @return == 'com.datadog.debugger.CapturedSnapshot23$MyEnum.TWO'"))
+                .build();
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "2").get();
+        assertEquals(2, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCaptureReturnValue(
+                snapshot.getCaptures().getReturn(), "com.datadog.debugger.CapturedSnapshot23$MyEnum", "TWO");
+    }
+
+    @Test
+    public void recursiveCapture() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot24";
+        final String INNER_CLASS = CLASS_NAME + "$Holder";
+        TestSnapshotListener listener = installProbes(createMethodProbe(PROBE_ID, INNER_CLASS, "size", null));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        assertEquals(1, result);
+    }
+
+    @Test
+    public void recursiveCaptureException() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot24";
+        final String INNER_CLASS = CLASS_NAME + "$HolderWithException";
+        TestSnapshotListener listener = installProbes(createMethodProbe(PROBE_ID, INNER_CLASS, "size", null));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        try {
+            Reflect.onClass(testClass).call("main", "exception").get();
+            Assertions.fail("should not reach this code");
+        } catch (ReflectException ex) {
+            assertEquals("not supported", ex.getCause().getCause().getMessage());
+        }
+    }
+
+    @Test
+    public void unknownCollectionCount() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot24";
+        Snapshot snapshot = doUnknownCount(CLASS_NAME);
+        assertEquals(
+                "Unsupported Collection class: com.datadog.debugger.CapturedSnapshot24$Holder",
+                snapshot.getEvaluationErrors().get(0).getMessage());
+    }
+
+    @Test
+    public void unknownMapCount() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot26";
+        Snapshot snapshot = doUnknownCount(CLASS_NAME);
+        assertEquals(
+                "Unsupported Map class: com.datadog.debugger.CapturedSnapshot26$Holder",
+                snapshot.getEvaluationErrors().get(0).getMessage());
+    }
+
+    private Snapshot doUnknownCount(String CLASS_NAME) throws IOException, URISyntaxException {
+        LogProbe logProbe = createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
+                .when(new ProbeCondition(DSL.when(DSL.ge(DSL.len(ref("holder")), DSL.value(0))), "len(holder) >= 0"))
+                .build();
+        TestSnapshotListener listener = installProbes(logProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "").get();
+        Assertions.assertEquals(1, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertEquals(1, snapshot.getEvaluationErrors().size());
+        assertEquals("len(holder)", snapshot.getEvaluationErrors().get(0).getExpr());
+        return snapshot;
+    }
+
+    @Test
+    public void beforeForLoopLineProbe() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot02";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        TestSnapshotListener listener = installLineProbe(LINE_PROBE_ID1, CLASS_NAME, line);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result =
+                Reflect.onClass(testClass).call("main", "synchronizedBlock").get();
+        assertEquals(76, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+        assertCaptureLocals(snapshot.getCaptures().getLines().get(line), "count", "int", "31");
+    }
+
+    @Test
+    public void dupLineProbeSameTemplate() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        final String LOG_TEMPLATE = "msg1={typed.fld.fld.msg}";
+        int line1 = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID3);
+        int line2 = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID4);
+        assertTrue(line1 == line2);
+        LogProbe probe1 = createProbeBuilder(LINE_PROBE_ID3, CLASS_NAME, line1)
+                .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        LogProbe probe2 = createProbeBuilder(LINE_PROBE_ID4, CLASS_NAME, line2)
+                .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        TestSnapshotListener listener = installProbes(probe1, probe2);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        List<Snapshot> snapshots = assertSnapshots(listener, 2, LINE_PROBE_ID3, LINE_PROBE_ID4);
+        for (Snapshot snapshot : snapshots) {
+            assertEquals("msg1=hello", snapshot.getMessage());
+        }
+    }
+
+    @Test
+    public void keywordRedaction() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot27";
+        final String LOG_TEMPLATE = "arg={arg} secret={secret} password={this.password} fromMap={strMap['password']}";
+        LogProbe probe1 = createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
+                .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
+                .captureSnapshot(true)
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        TestSnapshotListener listener = installProbes(probe1);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "secret123").get();
+        Assertions.assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertEquals(
+                "arg=secret123 secret={"
+                        + REDACTED_VALUE
+                        + "} password={"
+                        + REDACTED_VALUE
+                        + "} fromMap={"
+                        + REDACTED_VALUE
+                        + "}",
+                snapshot.getMessage());
+        CapturedContext.CapturedValue secretLocalVar =
+                snapshot.getCaptures().getReturn().getLocals().get("secret");
+        CapturedContext.CapturedValue secretValued = VALUE_ADAPTER.fromJson(secretLocalVar.getStrValue());
+        assertEquals(REDACTED_IDENT_REASON, secretValued.getNotCapturedReason());
+        Map<String, CapturedContext.CapturedValue> thisFields =
+                getFields(snapshot.getCaptures().getReturn().getArguments().get("this"));
+        CapturedContext.CapturedValue passwordField = thisFields.get("password");
+        assertEquals(REDACTED_IDENT_REASON, passwordField.getNotCapturedReason());
+        Map<String, String> strMap =
+                (Map<String, String>) thisFields.get("strMap").getValue();
+        assertNull(strMap.get("password"));
+    }
+
+    @Test
+    public void keywordRedactionConditions() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot27";
+        LogProbe probe1 = createProbeBuilder(PROBE_ID1, CLASS_NAME, "doit", null)
+                .when(new ProbeCondition(
+                        DSL.when(DSL.contains(DSL.getMember(ref("this"), "password"), new StringValue("123"))),
+                        "contains(this.password, '123')"))
+                .captureSnapshot(true)
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        LogProbe probe2 = createProbeBuilder(PROBE_ID2, CLASS_NAME, "doit", null)
+                .when(new ProbeCondition(DSL.when(DSL.eq(ref("password"), DSL.value("123"))), "password == '123'"))
+                .captureSnapshot(true)
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        LogProbe probe3 = createProbeBuilder(PROBE_ID3, CLASS_NAME, "doit", null)
+                .when(new ProbeCondition(
+                        DSL.when(DSL.eq(DSL.index(ref("strMap"), DSL.value("password")), DSL.value("123"))),
+                        "strMap['password'] == '123'"))
+                .captureSnapshot(true)
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "secret123").get();
+        Assertions.assertEquals(42, result);
+        List<Snapshot> snapshots = assertSnapshots(listener, 3, PROBE_ID1, PROBE_ID2, PROBE_ID3);
+        assertEquals(1, snapshots.get(0).getEvaluationErrors().size());
+        assertEquals(
+                "Could not evaluate the expression because 'this.password' was redacted",
+                snapshots.get(0).getEvaluationErrors().get(0).getMessage());
+        assertEquals(1, snapshots.get(1).getEvaluationErrors().size());
+        assertEquals(
+                "Could not evaluate the expression because 'password' was redacted",
+                snapshots.get(1).getEvaluationErrors().get(0).getMessage());
+        assertEquals(1, snapshots.get(2).getEvaluationErrors().size());
+        assertEquals(
+                "Could not evaluate the expression because 'strMap[\"password\"]' was redacted",
+                snapshots.get(2).getEvaluationErrors().get(0).getMessage());
+    }
+
+    @Test
+    public void typeRedactionBlockedProbe() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot27";
+        Config config = mock(Config.class);
+        when(config.getDynamicInstrumentationRedactedTypes()).thenReturn("com.datadog.debugger.CapturedSnapshot27");
+        Redaction.addUserDefinedTypes(config);
+        LogProbe probe1 = createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
+                .captureSnapshot(true)
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        TestSnapshotListener listener = installProbes(probe1);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "secret123").get();
+        Assertions.assertEquals(42, result);
+        assertEquals(0, listener.snapshots.size());
+        InstrumentationResult instrumentationResult = instrumentationListener.results.get(PROBE_ID.getId());
+        assertTrue(instrumentationResult.isBlocked());
+    }
+
+    @Test
+    public void typeRedactionSnapshot() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot27";
+        final String LOG_TEMPLATE =
+                "arg={arg} credentials={creds} user={this.creds.user} code={creds.secretCode} dave={credMap['dave'].user}";
+        Config config = mock(Config.class);
+        when(config.getDynamicInstrumentationRedactedTypes())
+                .thenReturn("com.datadog.debugger.CapturedSnapshot27$Creds");
+        Redaction.addUserDefinedTypes(config);
+        LogProbe probe1 = createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
+                .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
+                .captureSnapshot(true)
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        TestSnapshotListener listener = installProbes(probe1);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "secret123").get();
+        Assertions.assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertEquals(
+                "arg=secret123 credentials={"
+                        + REDACTED_VALUE
+                        + "} user={"
+                        + REDACTED_VALUE
+                        + "} code={"
+                        + REDACTED_VALUE
+                        + "} dave={"
+                        + REDACTED_VALUE
+                        + "}",
+                snapshot.getMessage());
+        Map<String, CapturedContext.CapturedValue> thisFields =
+                getFields(snapshot.getCaptures().getReturn().getArguments().get("this"));
+        CapturedContext.CapturedValue credsField = thisFields.get("creds");
+        assertEquals(REDACTED_TYPE_REASON, credsField.getNotCapturedReason());
+        Map<String, String> credMap =
+                (Map<String, String>) thisFields.get("credMap").getValue();
+        assertNull(credMap.get("dave"));
+    }
+
+    @Test
+    public void typeRedactionCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot27";
+        Config config = mock(Config.class);
+        when(config.getDynamicInstrumentationRedactedTypes())
+                .thenReturn("com.datadog.debugger.CapturedSnapshot27$Creds");
+        Redaction.addUserDefinedTypes(config);
+        LogProbe probe1 = createProbeBuilder(PROBE_ID1, CLASS_NAME, "doit", null)
+                .when(new ProbeCondition(
+                        DSL.when(DSL.contains(
+                                DSL.getMember(DSL.getMember(ref("this"), "creds"), "secretCode"),
+                                new StringValue("123"))),
+                        "contains(this.creds.secretCode, '123')"))
+                .captureSnapshot(true)
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        LogProbe probe2 = createProbeBuilder(PROBE_ID2, CLASS_NAME, "doit", null)
+                .when(new ProbeCondition(
+                        DSL.when(DSL.eq(DSL.getMember(ref("creds"), "secretCode"), DSL.value("123"))),
+                        "creds.secretCode == '123'"))
+                .captureSnapshot(true)
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        LogProbe probe3 = createProbeBuilder(PROBE_ID3, CLASS_NAME, "doit", null)
+                .when(new ProbeCondition(
+                        DSL.when(DSL.eq(DSL.index(ref("credMap"), DSL.value("dave")), DSL.value("123"))),
+                        "credMap['dave'] == '123'"))
+                .captureSnapshot(true)
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "secret123").get();
+        Assertions.assertEquals(42, result);
+        List<Snapshot> snapshots = assertSnapshots(listener, 3, PROBE_ID1, PROBE_ID2, PROBE_ID3);
+        assertEquals(1, snapshots.get(0).getEvaluationErrors().size());
+        assertEquals(
+                "Could not evaluate the expression because 'this.creds' was redacted",
+                snapshots.get(0).getEvaluationErrors().get(0).getMessage());
+        assertEquals(1, snapshots.get(1).getEvaluationErrors().size());
+        assertEquals(
+                "Could not evaluate the expression because 'creds' was redacted",
+                snapshots.get(1).getEvaluationErrors().get(0).getMessage());
+        assertEquals(1, snapshots.get(2).getEvaluationErrors().size());
+        assertEquals(
+                "Could not evaluate the expression because 'credMap[\"dave\"]' was redacted",
+                snapshots.get(2).getEvaluationErrors().get(0).getMessage());
+    }
+
+    @Test
+    public void ensureCallingSamplingMethodProbe() throws IOException, URISyntaxException {
+        doSamplingTest(this::methodProbe, 1, 1);
+    }
+
+    @Test
+    public void ensureCallingSamplingProbeCondition() throws IOException, URISyntaxException {
+        doSamplingTest(this::simpleConditionTest, 1, 1);
+    }
+
+    @Test
+    public void ensureCallingSamplingProbeConditionError() throws IOException, URISyntaxException {
+        doSamplingTest(this::nullCondition, 1, 1);
+    }
+
+    @Test
+    public void ensureCallingSamplingDupMethodProbeCondition() throws IOException, URISyntaxException {
+        doSamplingTest(this::mergedProbesWithAdditionalProbeConditionTest, 2, 2);
+    }
+
+    @Test
+    public void ensureCallingSamplingLineProbe() throws IOException, URISyntaxException {
+        doSamplingTest(this::singleLineProbe, 1, 1);
+    }
+
+    @Test
+    public void ensureCallingSamplingLineProbeCondition() throws IOException, URISyntaxException {
+        doSamplingTest(this::lineProbeCondition, 1, 1);
+    }
+
+    @Test
+    public void ensureCallingSamplingLogTemplateOnlyConditionError() throws IOException, URISyntaxException {
+        doSamplingTest(this::nullConditionTemplateOnly, ProbeRateLimiter::setGlobalLogRate, 1, 0, 1);
+    }
+
+    @Test
+    public void ensureCallingSamplingCaptureExpression() throws IOException, URISyntaxException {
+        doSamplingTest(this::captureExpressions, 1, 1);
+    }
+
+    @Test
+    public void ensureCallingSamplingCaptureExpressionWithCondition() throws IOException, URISyntaxException {
+        doSamplingTest(this::captureExpressionsWithCondition, 1, 1);
+    }
+
+    @Test
+    public void ensureCallingSamplingCaptureExpressionWithNullCondition() throws IOException, URISyntaxException {
+        doSamplingTest(this::captureExpressionsWithNullCondition, ProbeRateLimiter::setGlobalSnapshotRate, 1, 1, 0);
+    }
+
+    private void doSamplingTest(TestMethod testRun, int expectedGlobalCount, int expectedProbeCount)
+            throws IOException, URISyntaxException {
+        doSamplingTest(testRun, ProbeRateLimiter::setGlobalSnapshotRate, expectedGlobalCount, expectedProbeCount, 0);
+    }
+
+    private void doSamplingTest(
+            TestMethod testRun,
+            DoubleConsumer globalRateSetter,
+            int expectedGlobalCount,
+            int expectedProbeCount,
+            int expectedErrorCount)
+            throws IOException, URISyntaxException {
+        MockSampler probeSampler = new MockSampler();
+        MockSampler errorSampler = new MockSampler();
+        MockSampler globalSampler = new MockSampler();
+        ProbeRateLimiter.setSamplerSupplier(rate -> {
+            if (rate < 2) return errorSampler;
+            if (rate < 101) return probeSampler;
+            return globalSampler;
         });
-    globalRateSetter.accept(1000);
-    try {
-      testRun.run();
-    } finally {
-      ProbeRateLimiter.setSamplerSupplier(null);
-    }
-    assertEquals(expectedGlobalCount, globalSampler.getCallCount());
-    assertEquals(expectedProbeCount, probeSampler.getCallCount());
-    assertEquals(expectedErrorCount, errorSampler.getCallCount());
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_17)
-  public void record() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot29";
-    final String RECORD_NAME = "com.datadog.debugger.MyRecord1";
-    LogProbe probe1 = createMethodProbeAtExit(PROBE_ID, RECORD_NAME, "age", null);
-    TestSnapshotListener listener = installProbes(probe1);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME, "17");
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCaptureReturnValue(snapshot.getCaptures().getReturn(), "int", "42");
-    assertCaptureFields(
-        snapshot.getCaptures().getReturn(), "firstName", String.class.getTypeName(), "john");
-    assertCaptureFields(
-        snapshot.getCaptures().getReturn(), "lastName", String.class.getTypeName(), "doe");
-    assertCaptureFields(
-        snapshot.getCaptures().getReturn(), "age", Integer.TYPE.getTypeName(), "42");
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_17)
-  public void lineRecord() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot29";
-    final String RECORD_NAME = "com.datadog.debugger.MyRecord2";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    LogProbe probe1 = createLineProbe(LINE_PROBE_ID1, RECORD_NAME, line);
-    TestSnapshotListener listener = installProbes(probe1);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME, "17");
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-    CapturedContext capturedContext = snapshot.getCaptures().getLines().get(line);
-    assertCaptureArgs(capturedContext, "firstName", String.class.getTypeName(), "john");
-    assertCaptureArgs(capturedContext, "lastName", String.class.getTypeName(), "doe");
-    assertCaptureArgs(capturedContext, "age", Integer.TYPE.getTypeName(), "42");
-    assertCaptureFields(capturedContext, "firstName", String.class.getTypeName(), (String) null);
-    assertCaptureFields(capturedContext, "lastName", String.class.getTypeName(), (String) null);
-    assertCaptureFields(capturedContext, "age", Integer.TYPE.getTypeName(), "0");
-  }
-
-  @Test
-  public void allProbesSameMethod() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    final String METRIC_NAME = "count";
-    Where where = Where.of(CLASS_NAME, "main", null);
-    Configuration configuration =
-        Configuration.builder()
-            .add(
-                SpanDecorationProbe.builder()
-                    .probeId(PROBE_ID)
-                    .where(where)
-                    .targetSpan(SpanDecorationProbe.TargetSpan.ACTIVE)
-                    .decorations(
-                        new SpanDecorationProbe.Decoration(
-                            null,
-                            Arrays.asList(
-                                new SpanDecorationProbe.Tag(
-                                    "tag1",
-                                    new SpanDecorationProbe.TagValue(
-                                        "value1", parseTemplate("value1"))))))
-                    .build())
-            .add(SpanProbe.builder().probeId(PROBE_ID1).where(where).build())
-            .add(
-                MetricProbe.builder()
-                    .probeId(PROBE_ID2)
-                    .metricName(METRIC_NAME)
-                    .kind(MetricProbe.MetricKind.COUNT)
-                    .where(where)
-                    .build())
-            .add(LogProbe.builder().probeId(PROBE_ID3).where(where).build())
-            .add(TriggerProbe.builder().probeId(PROBE_ID4).where(where).build())
-            .build();
-
-    CoreTracer tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-    TestTraceInterceptor traceInterceptor = new TestTraceInterceptor();
-    tracer.addTraceInterceptor(traceInterceptor);
-    try {
-      TestSnapshotListener snapshotListener = installProbes(configuration);
-      DebuggerContext.initTracer(new DebuggerTracer(mock(ProbeStatusSink.class)));
-      MetricProbesInstrumentationTest.MetricForwarderListener metricListener =
-          new MetricProbesInstrumentationTest.MetricForwarderListener();
-      DebuggerContext.initMetricForwarder(metricListener);
-      Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-      int result = Reflect.onClass(testClass).call("main", "1").get();
-      // log probe
-      assertEquals(3, result);
-      List<Snapshot> snapshots = snapshotListener.snapshots;
-      assertEquals(
-          1,
-          snapshots.size(),
-          "More than one probe emitted a snapshot: "
-              + snapshots.stream()
-                  .map(snapshot -> snapshot.getProbe().getId())
-                  .collect(Collectors.toList()));
-      Snapshot snapshot = snapshots.get(0);
-      assertEquals(PROBE_ID3.getId(), snapshot.getProbe().getId());
-      // span (deco) probe
-      assertEquals(1, traceInterceptor.getTrace().size());
-      MutableSpan span = traceInterceptor.getFirstSpan();
-      assertEquals(CLASS_NAME + ".main", span.getResourceName());
-      assertEquals(PROBE_ID1.getId(), span.getTag("debugger.probeid"));
-      assertEquals("value1", span.getTag("tag1"));
-      // correlation between log and created span
-      assertEquals(snapshot.getSpanId(), String.valueOf(((DDSpan) span).getSpanId()));
-      // metric probe
-      assertTrue(metricListener.counters.containsKey(METRIC_NAME));
-      assertEquals(1, metricListener.counters.get(METRIC_NAME).longValue());
-      assertArrayEquals(
-          new String[] {"debugger.probeid:" + PROBE_ID2.getId()}, metricListener.lastTags);
-    } finally {
-      TracerInstaller.forceInstallGlobalTracer(null);
-    }
-  }
-
-  @Test
-  public void captureExpressions() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe probe =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
-            .evaluateAt(MethodLocation.EXIT)
-            .captureSnapshot(false)
-            .captureExpressions(
-                Arrays.asList(
-                    new LogProbe.CaptureExpression(
-                        "typed_fld_fld_msg",
-                        new ValueScript(
-                            DSL.getMember(
-                                DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"), "msg"),
-                            "typed.fld.fld.msg"),
-                        null),
-                    new LogProbe.CaptureExpression(
-                        "nullTyped_fld",
-                        new ValueScript(DSL.getMember(ref("nullTyped"), "fld"), "nullTyped.fld"),
-                        null)))
-            .build();
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertEquals(2, snapshot.getCaptures().getReturn().getCaptureExpressions().size());
-    assertCaptureExpressions(
-        snapshot.getCaptures().getReturn(),
-        "typed_fld_fld_msg",
-        String.class.getTypeName(),
-        "hello");
-    assertCaptureExpressions(
-        snapshot.getCaptures().getReturn(), "nullTyped_fld", Object.class.getTypeName(), null);
-  }
-
-  @Test
-  public void captureExpressionsWithCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe probe =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
-            .evaluateAt(MethodLocation.EXIT)
-            .captureSnapshot(false)
-            .captureExpressions(
-                Arrays.asList(
-                    new LogProbe.CaptureExpression(
-                        "typed_fld_fld_msg",
-                        new ValueScript(
-                            DSL.getMember(
-                                DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"), "msg"),
-                            "typed.fld.fld.msg"),
-                        null),
-                    new LogProbe.CaptureExpression(
-                        "nullTyped_fld",
-                        new ValueScript(DSL.getMember(ref("nullTyped"), "fld"), "nullTyped.fld"),
-                        null)))
-            .when(
-                new ProbeCondition(
-                    DSL.when(not(DSL.eq(ref("typed"), nullValue()))), "typed != null"))
-            .build();
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertEquals(2, snapshot.getCaptures().getReturn().getCaptureExpressions().size());
-    assertCaptureExpressions(
-        snapshot.getCaptures().getReturn(),
-        "typed_fld_fld_msg",
-        String.class.getTypeName(),
-        "hello");
-    assertCaptureExpressions(
-        snapshot.getCaptures().getReturn(), "nullTyped_fld", Object.class.getTypeName(), null);
-  }
-
-  @Test
-  public void captureExpressionsWithNullCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe logProbes =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", "int (java.lang.String)")
-            .when(
-                new ProbeCondition(
-                    DSL.when(
-                        DSL.eq(
-                            DSL.getMember(
-                                DSL.getMember(DSL.getMember(ref("nullTyped"), "fld"), "fld"),
-                                "msg"),
-                            DSL.value("hello"))),
-                    "nullTyped.fld.fld.msg == 'hello'"))
-            .captureSnapshot(false)
-            .template("plain log", Collections.emptyList())
-            .captureExpressions(
-                Arrays.asList(
-                    new LogProbe.CaptureExpression(
-                        "typed_fld_fld_msg",
-                        new ValueScript(
-                            DSL.getMember(
-                                DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"), "msg"),
-                            "typed.fld.fld.msg"),
-                        null)))
-            .build();
-    TestSnapshotListener listener = installProbes(logProbes);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertEquals("Cannot dereference field: fld", snapshot.getMessage());
-    List<EvaluationError> evaluationErrors = snapshot.getEvaluationErrors();
-    assertEquals(1, evaluationErrors.size());
-    assertEquals("nullTyped.fld.fld", evaluationErrors.get(0).getExpr());
-    assertEquals("Cannot dereference field: fld", evaluationErrors.get(0).getMessage());
-  }
-
-  @Test
-  public void captureExpressionsWithRejectingCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe probe =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
-            .evaluateAt(MethodLocation.EXIT)
-            .captureSnapshot(false)
-            .when(new ProbeCondition(DSL.when(DSL.eq(DSL.value(1), DSL.value(2))), "1 == 2"))
-            .template("plain log", Collections.emptyList())
-            .captureExpressions(
-                Collections.singletonList(
-                    new LogProbe.CaptureExpression(
-                        "unknown_symbol",
-                        new ValueScript(ref("doesNotExist"), "doesNotExist"),
-                        null)))
-            .build();
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    for (int i = 0; i < 5; i++) {
-      int result = Reflect.onClass(testClass).call("main", "1").get();
-      assertEquals(3, result);
-    }
-    assertEquals(0, listener.snapshots.size());
-  }
-
-  @Test
-  public void captureExpressionsPrimitives() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe probe =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
-            .evaluateAt(MethodLocation.EXIT)
-            .captureSnapshot(false)
-            .captureExpressions(
-                Arrays.asList(
-                    new LogProbe.CaptureExpression(
-                        "this_fld",
-                        new ValueScript(DSL.getMember(ref("this"), "fld"), "this.fld"),
-                        null),
-                    new LogProbe.CaptureExpression(
-                        "var1", new ValueScript(ref("var1"), "var1"), null)))
-            .build();
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCaptureExpressions(
-        snapshot.getCaptures().getReturn(), "this_fld", Integer.TYPE.getTypeName(), "11");
-    assertCaptureExpressions(
-        snapshot.getCaptures().getReturn(), "var1", Integer.TYPE.getTypeName(), "3");
-  }
-
-  @Test
-  public void captureExpressionsLineProbe() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID3);
-    LogProbe probe =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, line)
-            .captureSnapshot(false)
-            .captureExpressions(
-                Arrays.asList(
-                    new LogProbe.CaptureExpression(
+        globalRateSetter.accept(1000);
+        try {
+            testRun.run();
+        } finally {
+            ProbeRateLimiter.setSamplerSupplier(null);
+        }
+        assertEquals(expectedGlobalCount, globalSampler.getCallCount());
+        assertEquals(expectedProbeCount, probeSampler.getCallCount());
+        assertEquals(expectedErrorCount, errorSampler.getCallCount());
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_17)
+    public void record() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot29";
+        final String RECORD_NAME = "com.datadog.debugger.MyRecord1";
+        LogProbe probe1 = createMethodProbeAtExit(PROBE_ID, RECORD_NAME, "age", null);
+        TestSnapshotListener listener = installProbes(probe1);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME, "17");
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCaptureReturnValue(snapshot.getCaptures().getReturn(), "int", "42");
+        assertCaptureFields(snapshot.getCaptures().getReturn(), "firstName", String.class.getTypeName(), "john");
+        assertCaptureFields(snapshot.getCaptures().getReturn(), "lastName", String.class.getTypeName(), "doe");
+        assertCaptureFields(snapshot.getCaptures().getReturn(), "age", Integer.TYPE.getTypeName(), "42");
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_17)
+    public void lineRecord() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot29";
+        final String RECORD_NAME = "com.datadog.debugger.MyRecord2";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        LogProbe probe1 = createLineProbe(LINE_PROBE_ID1, RECORD_NAME, line);
+        TestSnapshotListener listener = installProbes(probe1);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME, "17");
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+        CapturedContext capturedContext = snapshot.getCaptures().getLines().get(line);
+        assertCaptureArgs(capturedContext, "firstName", String.class.getTypeName(), "john");
+        assertCaptureArgs(capturedContext, "lastName", String.class.getTypeName(), "doe");
+        assertCaptureArgs(capturedContext, "age", Integer.TYPE.getTypeName(), "42");
+        assertCaptureFields(capturedContext, "firstName", String.class.getTypeName(), (String) null);
+        assertCaptureFields(capturedContext, "lastName", String.class.getTypeName(), (String) null);
+        assertCaptureFields(capturedContext, "age", Integer.TYPE.getTypeName(), "0");
+    }
+
+    @Test
+    public void allProbesSameMethod() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        final String METRIC_NAME = "count";
+        Where where = Where.of(CLASS_NAME, "main", null);
+        Configuration configuration = Configuration.builder()
+                .add(SpanDecorationProbe.builder()
+                        .probeId(PROBE_ID)
+                        .where(where)
+                        .targetSpan(SpanDecorationProbe.TargetSpan.ACTIVE)
+                        .decorations(new SpanDecorationProbe.Decoration(
+                                null,
+                                Arrays.asList(new SpanDecorationProbe.Tag(
+                                        "tag1", new SpanDecorationProbe.TagValue("value1", parseTemplate("value1"))))))
+                        .build())
+                .add(SpanProbe.builder().probeId(PROBE_ID1).where(where).build())
+                .add(MetricProbe.builder()
+                        .probeId(PROBE_ID2)
+                        .metricName(METRIC_NAME)
+                        .kind(MetricProbe.MetricKind.COUNT)
+                        .where(where)
+                        .build())
+                .add(LogProbe.builder().probeId(PROBE_ID3).where(where).build())
+                .add(TriggerProbe.builder().probeId(PROBE_ID4).where(where).build())
+                .build();
+
+        CoreTracer tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+        TestTraceInterceptor traceInterceptor = new TestTraceInterceptor();
+        tracer.addTraceInterceptor(traceInterceptor);
+        try {
+            TestSnapshotListener snapshotListener = installProbes(configuration);
+            DebuggerContext.initTracer(new DebuggerTracer(mock(ProbeStatusSink.class)));
+            MetricProbesInstrumentationTest.MetricForwarderListener metricListener =
+                    new MetricProbesInstrumentationTest.MetricForwarderListener();
+            DebuggerContext.initMetricForwarder(metricListener);
+            Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+            int result = Reflect.onClass(testClass).call("main", "1").get();
+            // log probe
+            assertEquals(3, result);
+            List<Snapshot> snapshots = snapshotListener.snapshots;
+            assertEquals(
+                    1,
+                    snapshots.size(),
+                    "More than one probe emitted a snapshot: "
+                            + snapshots.stream()
+                                    .map(snapshot -> snapshot.getProbe().getId())
+                                    .collect(Collectors.toList()));
+            Snapshot snapshot = snapshots.get(0);
+            assertEquals(PROBE_ID3.getId(), snapshot.getProbe().getId());
+            // span (deco) probe
+            assertEquals(1, traceInterceptor.getTrace().size());
+            MutableSpan span = traceInterceptor.getFirstSpan();
+            assertEquals(CLASS_NAME + ".main", span.getResourceName());
+            assertEquals(PROBE_ID1.getId(), span.getTag("debugger.probeid"));
+            assertEquals("value1", span.getTag("tag1"));
+            // correlation between log and created span
+            assertEquals(snapshot.getSpanId(), String.valueOf(((DDSpan) span).getSpanId()));
+            // metric probe
+            assertTrue(metricListener.counters.containsKey(METRIC_NAME));
+            assertEquals(1, metricListener.counters.get(METRIC_NAME).longValue());
+            assertArrayEquals(new String[] {"debugger.probeid:" + PROBE_ID2.getId()}, metricListener.lastTags);
+        } finally {
+            TracerInstaller.forceInstallGlobalTracer(null);
+        }
+    }
+
+    @Test
+    public void captureExpressions() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe probe = createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
+                .evaluateAt(MethodLocation.EXIT)
+                .captureSnapshot(false)
+                .captureExpressions(Arrays.asList(
+                        new LogProbe.CaptureExpression(
+                                "typed_fld_fld_msg",
+                                new ValueScript(
+                                        DSL.getMember(DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"), "msg"),
+                                        "typed.fld.fld.msg"),
+                                null),
+                        new LogProbe.CaptureExpression(
+                                "nullTyped_fld",
+                                new ValueScript(DSL.getMember(ref("nullTyped"), "fld"), "nullTyped.fld"),
+                                null)))
+                .build();
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertEquals(
+                2, snapshot.getCaptures().getReturn().getCaptureExpressions().size());
+        assertCaptureExpressions(
+                snapshot.getCaptures().getReturn(), "typed_fld_fld_msg", String.class.getTypeName(), "hello");
+        assertCaptureExpressions(snapshot.getCaptures().getReturn(), "nullTyped_fld", Object.class.getTypeName(), null);
+    }
+
+    @Test
+    public void captureExpressionsWithCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe probe = createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
+                .evaluateAt(MethodLocation.EXIT)
+                .captureSnapshot(false)
+                .captureExpressions(Arrays.asList(
+                        new LogProbe.CaptureExpression(
+                                "typed_fld_fld_msg",
+                                new ValueScript(
+                                        DSL.getMember(DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"), "msg"),
+                                        "typed.fld.fld.msg"),
+                                null),
+                        new LogProbe.CaptureExpression(
+                                "nullTyped_fld",
+                                new ValueScript(DSL.getMember(ref("nullTyped"), "fld"), "nullTyped.fld"),
+                                null)))
+                .when(new ProbeCondition(DSL.when(not(DSL.eq(ref("typed"), nullValue()))), "typed != null"))
+                .build();
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertEquals(
+                2, snapshot.getCaptures().getReturn().getCaptureExpressions().size());
+        assertCaptureExpressions(
+                snapshot.getCaptures().getReturn(), "typed_fld_fld_msg", String.class.getTypeName(), "hello");
+        assertCaptureExpressions(snapshot.getCaptures().getReturn(), "nullTyped_fld", Object.class.getTypeName(), null);
+    }
+
+    @Test
+    public void captureExpressionsWithNullCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe logProbes = createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", "int (java.lang.String)")
+                .when(new ProbeCondition(
+                        DSL.when(DSL.eq(
+                                DSL.getMember(DSL.getMember(DSL.getMember(ref("nullTyped"), "fld"), "fld"), "msg"),
+                                DSL.value("hello"))),
+                        "nullTyped.fld.fld.msg == 'hello'"))
+                .captureSnapshot(false)
+                .template("plain log", Collections.emptyList())
+                .captureExpressions(Arrays.asList(new LogProbe.CaptureExpression(
                         "typed_fld_fld_msg",
                         new ValueScript(
-                            DSL.getMember(
-                                DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"), "msg"),
-                            "typed.fld.fld.msg"),
-                        null),
-                    new LogProbe.CaptureExpression(
-                        "nullTyped_fld",
-                        new ValueScript(DSL.getMember(ref("nullTyped"), "fld"), "nullTyped.fld"),
+                                DSL.getMember(DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"), "msg"),
+                                "typed.fld.fld.msg"),
                         null)))
-            .build();
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    CapturedContext capturedContext = snapshot.getCaptures().getLines().get(line);
-    assertEquals(2, capturedContext.getCaptureExpressions().size());
-    assertCaptureExpressions(
-        capturedContext, "typed_fld_fld_msg", String.class.getTypeName(), "hello");
-    assertCaptureExpressions(capturedContext, "nullTyped_fld", Object.class.getTypeName(), null);
-  }
-
-  @Test
-  public void captureExpressionsWithCaptureLimits() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe probe =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
-            .evaluateAt(MethodLocation.EXIT)
-            .captureSnapshot(false)
-            .captureExpressions(
-                Arrays.asList(
-                    new LogProbe.CaptureExpression(
-                        "typed_fld_fld_msg",
-                        new ValueScript(
-                            DSL.getMember(
-                                DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"), "msg"),
-                            "typed.fld.fld.msg"),
-                        new LogProbe.Capture(3, 100, 3, 20)),
-                    new LogProbe.CaptureExpression(
-                        "typed",
-                        new ValueScript(ref("typed"), "typed"),
-                        new LogProbe.Capture(1, 1, 3, 20))))
-            .build();
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    CapturedContext.CapturedValue msgValue =
-        deserializeCapturedValue(
-            snapshot.getCaptures().getReturn().getCaptureExpressions().get("typed_fld_fld_msg"));
-    assertEquals("hel", msgValue.getValue());
-    assertEquals("truncated", msgValue.getNotCapturedReason());
-    CapturedContext.CapturedValue typedValue =
-        deserializeCapturedValue(
-            snapshot.getCaptures().getReturn().getCaptureExpressions().get("typed"));
-    Map<String, CapturedContext.CapturedValue> fields =
-        (Map<String, CapturedContext.CapturedValue>) typedValue.getValue();
-    CapturedContext.CapturedValue fldValue = fields.get("fld");
-    assertEquals("depth", fldValue.getNotCapturedReason());
-  }
-
-  @Test
-  public void captureExpressionsWithInheritedCaptureLimits()
-      throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    LogProbe probe =
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
-            .evaluateAt(MethodLocation.EXIT)
-            .captureSnapshot(false)
-            .capture(new LogProbe.Capture(1, 10, 3, 1))
-            .captureExpressions(
-                Arrays.asList(
-                    new LogProbe.CaptureExpression(
-                        "typed_fld_fld_msg",
-                        new ValueScript(
-                            DSL.getMember(
-                                DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"), "msg"),
-                            "typed.fld.fld.msg"),
-                        null),
-                    new LogProbe.CaptureExpression(
-                        "typed", new ValueScript(ref("typed"), "typed"), null)))
-            .build();
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    CapturedContext.CapturedValue msgValue =
-        deserializeCapturedValue(
-            snapshot.getCaptures().getReturn().getCaptureExpressions().get("typed_fld_fld_msg"));
-    assertEquals("hel", msgValue.getValue());
-    assertEquals("truncated", msgValue.getNotCapturedReason());
-    CapturedContext.CapturedValue typedValue =
-        deserializeCapturedValue(
-            snapshot.getCaptures().getReturn().getCaptureExpressions().get("typed"));
-    Map<String, CapturedContext.CapturedValue> fields =
-        (Map<String, CapturedContext.CapturedValue>) typedValue.getValue();
-    CapturedContext.CapturedValue fldValue = fields.get("fld");
-    assertEquals("depth", fldValue.getNotCapturedReason());
-  }
-
-  @Test
-  public void methodParametersAttribute() throws Exception {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    Config config = mock(Config.class);
-    when(config.isDebuggerCodeOriginEnabled()).thenReturn(false);
-    when(config.isDebuggerExceptionEnabled()).thenReturn(false);
-    when(config.isDynamicInstrumentationEnabled()).thenReturn(false);
-    Instrumentation inst = mock(Instrumentation.class);
-    if (JavaVirtualMachine.isJavaVersion(17)) {
-      // on JDK 17 introduced Spring6 class
-      Class<?> springClass = Class.forName("org.springframework.web.client.RestClient");
-      when(inst.getAllLoadedClasses()).thenReturn(new Class[] {springClass});
-    } else {
-      when(inst.getAllLoadedClasses()).thenReturn(new Class[0]);
-    }
-    DebuggerAgent.run(config, inst, null);
-    TestSnapshotListener listener =
-        installMethodProbeAtExit(CLASS_NAME, "main", "int (java.lang.String)");
-    Map<String, byte[]> buffers =
-        compile(CLASS_NAME, SourceCompiler.DebugInfo.ALL, "8", Arrays.asList("-parameters"));
-    Class<?> testClass = loadClass(CLASS_NAME, buffers);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    if (JavaVirtualMachine.isJavaVersionBetween(17, 0, 0, 17, 0, 20)) {
-      // on JDK 17 with Spring6 class, transformation cannot happen
-      assertEquals(0, listener.snapshots.size());
-      ArgumentCaptor<ProbeId> probeIdCaptor = ArgumentCaptor.forClass(ProbeId.class);
-      ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
-      verify(probeStatusSink, times(1)).addError(probeIdCaptor.capture(), strCaptor.capture());
-      assertEquals(PROBE_ID.getId(), probeIdCaptor.getAllValues().get(0).getId());
-      assertEquals(
-          "Instrumentation failed for CapturedSnapshot01: Method Parameters attribute detected, instrumentation not supported",
-          strCaptor.getAllValues().get(0));
-    } else {
-      Snapshot snapshot = assertOneSnapshot(listener);
-      assertCaptureArgs(snapshot.getCaptures().getReturn(), "arg", String.class.getTypeName(), "1");
-    }
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_17)
-  public void methodParametersAttributeRecord() throws Exception {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot29";
-    final String RECORD_NAME = "com.datadog.debugger.MyRecord1";
-    Config config = mock(Config.class);
-    when(config.isDebuggerCodeOriginEnabled()).thenReturn(false);
-    when(config.isDebuggerExceptionEnabled()).thenReturn(false);
-    when(config.isDynamicInstrumentationEnabled()).thenReturn(false);
-    Instrumentation inst = mock(Instrumentation.class);
-    Class<?> springClass = Class.forName("org.springframework.core.SpringVersion");
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {springClass});
-    DebuggerAgent.run(config, inst, null);
-    TestSnapshotListener listener = installMethodProbeAtExit(RECORD_NAME, "<init>", null);
-    Map<String, byte[]> buffers =
-        compile(CLASS_NAME, SourceCompiler.DebugInfo.ALL, "17", Arrays.asList("-parameters"));
-    Class<?> testClass = loadClass(CLASS_NAME, buffers);
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(42, result);
-    if (JavaVirtualMachine.isJavaVersionAtLeast(19)
-        || JavaVirtualMachine.isJavaVersionAtLeast(17, 0, 20)) {
-      Snapshot snapshot = assertOneSnapshot(listener);
-      assertCaptureArgs(
-          snapshot.getCaptures().getReturn(), "firstName", String.class.getTypeName(), "john");
-    } else {
-      assertEquals(0, listener.snapshots.size());
-      ArgumentCaptor<ProbeId> probeIdCaptor = ArgumentCaptor.forClass(ProbeId.class);
-      ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
-      verify(probeStatusSink, times(1)).addError(probeIdCaptor.capture(), strCaptor.capture());
-      assertEquals(PROBE_ID.getId(), probeIdCaptor.getAllValues().get(0).getId());
-      assertEquals(
-          "Instrumentation failed for com.datadog.debugger.MyRecord1: Method Parameters attribute detected, instrumentation not supported",
-          strCaptor.getAllValues().get(0));
-    }
-  }
-
-  /*
-   * Regression test for: DatadogClassLoader attempted duplicate class definition for
-   * com.datadog.debugger.instrumentation.Types (LinkageError).
-   *
-   * When a CodeOriginProbe matches the agent's Types class (by FQN or simple name), and Types
-   * is being loaded for the first time by DatadogClassLoader, DebuggerTransformer.transform() is
-   * invoked as a ClassFileTransformer. Inside performInstrumentation(), CodeOriginInstrumenter
-   * accesses the static field Types.DEBUGGER_CONTEXT_TYPE, triggering a re-entrant loadClass()
-   * call for Types on the same thread. Because Java's synchronized is reentrant and Types is not
-   * yet registered in the JVM (defineClass hasn't completed), findLoadedClass() returns null and
-   * defineClass is called a second time, producing the LinkageError.
-   */
-  @Test
-  public void noInstrumentationForAgentClasses() throws Exception {
-    // Install a CodeOriginProbe targeting the agent's Types class by FQN.
-    // This simulates a probe accidentally matching an agent class (e.g. via simple-name fallback
-    // in TransformerDefinitionMatcher when a user class is also named "Types").
-    CodeOriginProbe probe =
-        new CodeOriginProbe(
-            PROBE_ID,
-            true,
-            Where.of("com.datadog.debugger.instrumentation.Types", "descriptorToSignature", null));
-    installProbes(probe);
-    byte[] typeBytes = getClassFileBytes(Types.class);
-    // transform() proceeds to performInstrumentation(), which calls
-    // CodeOriginInstrumenter.codeOriginCall() → accesses Types.DEBUGGER_CONTEXT_TYPE.
-    // In production (when Types is not yet loaded), this re-enters DatadogClassLoader.loadClass()
-    // and triggers LinkageError: duplicate class definition for Types.
-    byte[] result =
-        currentTransformer.transform(
-            Types.class.getClassLoader(),
-            "com/datadog/debugger/instrumentation/Types",
-            null,
-            null,
-            typeBytes);
-    assertNull(result);
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_17)
-  public void recordWithTypeAnnotation() throws IOException, URISyntaxException {
-    if (JavaVirtualMachine.isJavaVersionAtLeast(25, 0, 4)) {
-      // Fixed since JDK 25.0.4
-      return;
-    }
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot33";
-    LogProbe probe1 = createMethodProbeAtExit(PROBE_ID1, CLASS_NAME, "parse", null);
-    TestSnapshotListener listener = installProbes(probe1);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME, "17");
-    Reflect.onClass(testClass).call("parse", "1").get();
-    ArgumentCaptor<ProbeId> probeIdCaptor = ArgumentCaptor.forClass(ProbeId.class);
-    ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
-    verify(probeStatusSink, times(1)).addError(probeIdCaptor.capture(), strCaptor.capture());
-    assertEquals(PROBE_ID1.getId(), probeIdCaptor.getAllValues().get(0).getId());
-    assertEquals(
-        "Instrumentation failed for com.datadog.debugger.CapturedSnapshot33: Instrumentation of a record with type annotation is not supported",
-        strCaptor.getAllValues().get(0));
-  }
-
-  private TestSnapshotListener setupInstrumentTheWorldTransformer(
-      String excludeFileName, String includeFileName) {
-    Config config = mock(Config.class);
-    when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
-    when(config.isDynamicInstrumentationClassFileDumpEnabled()).thenReturn(true);
-    when(config.getDynamicInstrumentationInstrumentTheWorld()).thenReturn("method");
-    when(config.getDynamicInstrumentationExcludeFiles()).thenReturn(excludeFileName);
-    when(config.getDynamicInstrumentationIncludeFiles()).thenReturn(includeFileName);
-    when(config.getFinalDebuggerSnapshotUrl())
-        .thenReturn("http://localhost:8126/debugger/v1/input");
-    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
-    TestSnapshotListener listener = new TestSnapshotListener(config, mock(ProbeStatusSink.class));
-    DebuggerAgentHelper.injectSink(listener);
-    currentTransformer =
-        DebuggerAgent.setupInstrumentTheWorldTransformer(
-            config,
-            instr,
-            new DebuggerSink(
-                config, new ProbeStatusSink(config, config.getFinalDebuggerSnapshotUrl(), false)));
-    DebuggerContext.initClassFilter(new DenyListHelper(null));
-    return listener;
-  }
-
-  private Snapshot assertOneSnapshot(TestSnapshotListener listener) {
-    return assertOneSnapshot(PROBE_ID, listener);
-  }
-
-  private Snapshot assertOneSnapshot(ProbeId probeId, TestSnapshotListener listener) {
-    assertEquals(1, listener.snapshots.size());
-    Snapshot snapshot = listener.snapshots.get(0);
-    assertEquals(probeId.getId(), snapshot.getProbe().getId());
-    return snapshot;
-  }
+                .build();
+        TestSnapshotListener listener = installProbes(logProbes);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertEquals("Cannot dereference field: fld", snapshot.getMessage());
+        List<EvaluationError> evaluationErrors = snapshot.getEvaluationErrors();
+        assertEquals(1, evaluationErrors.size());
+        assertEquals("nullTyped.fld.fld", evaluationErrors.get(0).getExpr());
+        assertEquals("Cannot dereference field: fld", evaluationErrors.get(0).getMessage());
+    }
+
+    @Test
+    public void captureExpressionsWithRejectingCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe probe = createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
+                .evaluateAt(MethodLocation.EXIT)
+                .captureSnapshot(false)
+                .when(new ProbeCondition(DSL.when(DSL.eq(DSL.value(1), DSL.value(2))), "1 == 2"))
+                .template("plain log", Collections.emptyList())
+                .captureExpressions(Collections.singletonList(new LogProbe.CaptureExpression(
+                        "unknown_symbol", new ValueScript(ref("doesNotExist"), "doesNotExist"), null)))
+                .build();
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        for (int i = 0; i < 5; i++) {
+            int result = Reflect.onClass(testClass).call("main", "1").get();
+            assertEquals(3, result);
+        }
+        assertEquals(0, listener.snapshots.size());
+    }
+
+    @Test
+    public void captureExpressionsPrimitives() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe probe = createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
+                .evaluateAt(MethodLocation.EXIT)
+                .captureSnapshot(false)
+                .captureExpressions(Arrays.asList(
+                        new LogProbe.CaptureExpression(
+                                "this_fld", new ValueScript(DSL.getMember(ref("this"), "fld"), "this.fld"), null),
+                        new LogProbe.CaptureExpression("var1", new ValueScript(ref("var1"), "var1"), null)))
+                .build();
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCaptureExpressions(snapshot.getCaptures().getReturn(), "this_fld", Integer.TYPE.getTypeName(), "11");
+        assertCaptureExpressions(snapshot.getCaptures().getReturn(), "var1", Integer.TYPE.getTypeName(), "3");
+    }
+
+    @Test
+    public void captureExpressionsLineProbe() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID3);
+        LogProbe probe = createProbeBuilder(PROBE_ID, CLASS_NAME, line)
+                .captureSnapshot(false)
+                .captureExpressions(Arrays.asList(
+                        new LogProbe.CaptureExpression(
+                                "typed_fld_fld_msg",
+                                new ValueScript(
+                                        DSL.getMember(DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"), "msg"),
+                                        "typed.fld.fld.msg"),
+                                null),
+                        new LogProbe.CaptureExpression(
+                                "nullTyped_fld",
+                                new ValueScript(DSL.getMember(ref("nullTyped"), "fld"), "nullTyped.fld"),
+                                null)))
+                .build();
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        CapturedContext capturedContext = snapshot.getCaptures().getLines().get(line);
+        assertEquals(2, capturedContext.getCaptureExpressions().size());
+        assertCaptureExpressions(capturedContext, "typed_fld_fld_msg", String.class.getTypeName(), "hello");
+        assertCaptureExpressions(capturedContext, "nullTyped_fld", Object.class.getTypeName(), null);
+    }
+
+    @Test
+    public void captureExpressionsWithCaptureLimits() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe probe = createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
+                .evaluateAt(MethodLocation.EXIT)
+                .captureSnapshot(false)
+                .captureExpressions(Arrays.asList(
+                        new LogProbe.CaptureExpression(
+                                "typed_fld_fld_msg",
+                                new ValueScript(
+                                        DSL.getMember(DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"), "msg"),
+                                        "typed.fld.fld.msg"),
+                                new LogProbe.Capture(3, 100, 3, 20)),
+                        new LogProbe.CaptureExpression(
+                                "typed", new ValueScript(ref("typed"), "typed"), new LogProbe.Capture(1, 1, 3, 20))))
+                .build();
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        CapturedContext.CapturedValue msgValue = deserializeCapturedValue(
+                snapshot.getCaptures().getReturn().getCaptureExpressions().get("typed_fld_fld_msg"));
+        assertEquals("hel", msgValue.getValue());
+        assertEquals("truncated", msgValue.getNotCapturedReason());
+        CapturedContext.CapturedValue typedValue = deserializeCapturedValue(
+                snapshot.getCaptures().getReturn().getCaptureExpressions().get("typed"));
+        Map<String, CapturedContext.CapturedValue> fields =
+                (Map<String, CapturedContext.CapturedValue>) typedValue.getValue();
+        CapturedContext.CapturedValue fldValue = fields.get("fld");
+        assertEquals("depth", fldValue.getNotCapturedReason());
+    }
+
+    @Test
+    public void captureExpressionsWithInheritedCaptureLimits() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        LogProbe probe = createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
+                .evaluateAt(MethodLocation.EXIT)
+                .captureSnapshot(false)
+                .capture(new LogProbe.Capture(1, 10, 3, 1))
+                .captureExpressions(Arrays.asList(
+                        new LogProbe.CaptureExpression(
+                                "typed_fld_fld_msg",
+                                new ValueScript(
+                                        DSL.getMember(DSL.getMember(DSL.getMember(ref("typed"), "fld"), "fld"), "msg"),
+                                        "typed.fld.fld.msg"),
+                                null),
+                        new LogProbe.CaptureExpression("typed", new ValueScript(ref("typed"), "typed"), null)))
+                .build();
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        CapturedContext.CapturedValue msgValue = deserializeCapturedValue(
+                snapshot.getCaptures().getReturn().getCaptureExpressions().get("typed_fld_fld_msg"));
+        assertEquals("hel", msgValue.getValue());
+        assertEquals("truncated", msgValue.getNotCapturedReason());
+        CapturedContext.CapturedValue typedValue = deserializeCapturedValue(
+                snapshot.getCaptures().getReturn().getCaptureExpressions().get("typed"));
+        Map<String, CapturedContext.CapturedValue> fields =
+                (Map<String, CapturedContext.CapturedValue>) typedValue.getValue();
+        CapturedContext.CapturedValue fldValue = fields.get("fld");
+        assertEquals("depth", fldValue.getNotCapturedReason());
+    }
+
+    @Test
+    public void methodParametersAttribute() throws Exception {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        Config config = mock(Config.class);
+        when(config.isDebuggerCodeOriginEnabled()).thenReturn(false);
+        when(config.isDebuggerExceptionEnabled()).thenReturn(false);
+        when(config.isDynamicInstrumentationEnabled()).thenReturn(false);
+        Instrumentation inst = mock(Instrumentation.class);
+        if (JavaVirtualMachine.isJavaVersion(17)) {
+            // on JDK 17 introduced Spring6 class
+            Class<?> springClass = Class.forName("org.springframework.web.client.RestClient");
+            when(inst.getAllLoadedClasses()).thenReturn(new Class[] {springClass});
+        } else {
+            when(inst.getAllLoadedClasses()).thenReturn(new Class[0]);
+        }
+        DebuggerAgent.run(config, inst, null);
+        TestSnapshotListener listener = installMethodProbeAtExit(CLASS_NAME, "main", "int (java.lang.String)");
+        Map<String, byte[]> buffers =
+                compile(CLASS_NAME, SourceCompiler.DebugInfo.ALL, "8", Arrays.asList("-parameters"));
+        Class<?> testClass = loadClass(CLASS_NAME, buffers);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        if (JavaVirtualMachine.isJavaVersionBetween(17, 0, 0, 17, 0, 20)) {
+            // on JDK 17 with Spring6 class, transformation cannot happen
+            assertEquals(0, listener.snapshots.size());
+            ArgumentCaptor<ProbeId> probeIdCaptor = ArgumentCaptor.forClass(ProbeId.class);
+            ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
+            verify(probeStatusSink, times(1)).addError(probeIdCaptor.capture(), strCaptor.capture());
+            assertEquals(PROBE_ID.getId(), probeIdCaptor.getAllValues().get(0).getId());
+            assertEquals(
+                    "Instrumentation failed for CapturedSnapshot01: Method Parameters attribute detected, instrumentation not supported",
+                    strCaptor.getAllValues().get(0));
+        } else {
+            Snapshot snapshot = assertOneSnapshot(listener);
+            assertCaptureArgs(snapshot.getCaptures().getReturn(), "arg", String.class.getTypeName(), "1");
+        }
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_17)
+    public void methodParametersAttributeRecord() throws Exception {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot29";
+        final String RECORD_NAME = "com.datadog.debugger.MyRecord1";
+        Config config = mock(Config.class);
+        when(config.isDebuggerCodeOriginEnabled()).thenReturn(false);
+        when(config.isDebuggerExceptionEnabled()).thenReturn(false);
+        when(config.isDynamicInstrumentationEnabled()).thenReturn(false);
+        Instrumentation inst = mock(Instrumentation.class);
+        Class<?> springClass = Class.forName("org.springframework.core.SpringVersion");
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {springClass});
+        DebuggerAgent.run(config, inst, null);
+        TestSnapshotListener listener = installMethodProbeAtExit(RECORD_NAME, "<init>", null);
+        Map<String, byte[]> buffers =
+                compile(CLASS_NAME, SourceCompiler.DebugInfo.ALL, "17", Arrays.asList("-parameters"));
+        Class<?> testClass = loadClass(CLASS_NAME, buffers);
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(42, result);
+        if (JavaVirtualMachine.isJavaVersionAtLeast(19) || JavaVirtualMachine.isJavaVersionAtLeast(17, 0, 20)) {
+            Snapshot snapshot = assertOneSnapshot(listener);
+            assertCaptureArgs(snapshot.getCaptures().getReturn(), "firstName", String.class.getTypeName(), "john");
+        } else {
+            assertEquals(0, listener.snapshots.size());
+            ArgumentCaptor<ProbeId> probeIdCaptor = ArgumentCaptor.forClass(ProbeId.class);
+            ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
+            verify(probeStatusSink, times(1)).addError(probeIdCaptor.capture(), strCaptor.capture());
+            assertEquals(PROBE_ID.getId(), probeIdCaptor.getAllValues().get(0).getId());
+            assertEquals(
+                    "Instrumentation failed for com.datadog.debugger.MyRecord1: Method Parameters attribute detected, instrumentation not supported",
+                    strCaptor.getAllValues().get(0));
+        }
+    }
+
+    /*
+     * Regression test for: DatadogClassLoader attempted duplicate class definition for
+     * com.datadog.debugger.instrumentation.Types (LinkageError).
+     *
+     * When a CodeOriginProbe matches the agent's Types class (by FQN or simple name), and Types
+     * is being loaded for the first time by DatadogClassLoader, DebuggerTransformer.transform() is
+     * invoked as a ClassFileTransformer. Inside performInstrumentation(), CodeOriginInstrumenter
+     * accesses the static field Types.DEBUGGER_CONTEXT_TYPE, triggering a re-entrant loadClass()
+     * call for Types on the same thread. Because Java's synchronized is reentrant and Types is not
+     * yet registered in the JVM (defineClass hasn't completed), findLoadedClass() returns null and
+     * defineClass is called a second time, producing the LinkageError.
+     */
+    @Test
+    public void noInstrumentationForAgentClasses() throws Exception {
+        // Install a CodeOriginProbe targeting the agent's Types class by FQN.
+        // This simulates a probe accidentally matching an agent class (e.g. via simple-name fallback
+        // in TransformerDefinitionMatcher when a user class is also named "Types").
+        CodeOriginProbe probe = new CodeOriginProbe(
+                PROBE_ID, true, Where.of("com.datadog.debugger.instrumentation.Types", "descriptorToSignature", null));
+        installProbes(probe);
+        byte[] typeBytes = getClassFileBytes(Types.class);
+        // transform() proceeds to performInstrumentation(), which calls
+        // CodeOriginInstrumenter.codeOriginCall() → accesses Types.DEBUGGER_CONTEXT_TYPE.
+        // In production (when Types is not yet loaded), this re-enters DatadogClassLoader.loadClass()
+        // and triggers LinkageError: duplicate class definition for Types.
+        byte[] result = currentTransformer.transform(
+                Types.class.getClassLoader(), "com/datadog/debugger/instrumentation/Types", null, null, typeBytes);
+        assertNull(result);
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_17)
+    public void recordWithTypeAnnotation() throws IOException, URISyntaxException {
+        if (JavaVirtualMachine.isJavaVersionAtLeast(25, 0, 4)) {
+            // Fixed since JDK 25.0.4
+            return;
+        }
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot33";
+        LogProbe probe1 = createMethodProbeAtExit(PROBE_ID1, CLASS_NAME, "parse", null);
+        TestSnapshotListener listener = installProbes(probe1);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME, "17");
+        Reflect.onClass(testClass).call("parse", "1").get();
+        ArgumentCaptor<ProbeId> probeIdCaptor = ArgumentCaptor.forClass(ProbeId.class);
+        ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
+        verify(probeStatusSink, times(1)).addError(probeIdCaptor.capture(), strCaptor.capture());
+        assertEquals(PROBE_ID1.getId(), probeIdCaptor.getAllValues().get(0).getId());
+        assertEquals(
+                "Instrumentation failed for com.datadog.debugger.CapturedSnapshot33: Instrumentation of a record with type annotation is not supported",
+                strCaptor.getAllValues().get(0));
+    }
+
+    private TestSnapshotListener setupInstrumentTheWorldTransformer(String excludeFileName, String includeFileName) {
+        Config config = mock(Config.class);
+        when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
+        when(config.isDynamicInstrumentationClassFileDumpEnabled()).thenReturn(true);
+        when(config.getDynamicInstrumentationInstrumentTheWorld()).thenReturn("method");
+        when(config.getDynamicInstrumentationExcludeFiles()).thenReturn(excludeFileName);
+        when(config.getDynamicInstrumentationIncludeFiles()).thenReturn(includeFileName);
+        when(config.getFinalDebuggerSnapshotUrl()).thenReturn("http://localhost:8126/debugger/v1/input");
+        when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
+        TestSnapshotListener listener = new TestSnapshotListener(config, mock(ProbeStatusSink.class));
+        DebuggerAgentHelper.injectSink(listener);
+        currentTransformer = DebuggerAgent.setupInstrumentTheWorldTransformer(
+                config,
+                instr,
+                new DebuggerSink(config, new ProbeStatusSink(config, config.getFinalDebuggerSnapshotUrl(), false)));
+        DebuggerContext.initClassFilter(new DenyListHelper(null));
+        return listener;
+    }
+
+    private Snapshot assertOneSnapshot(TestSnapshotListener listener) {
+        return assertOneSnapshot(PROBE_ID, listener);
+    }
+
+    private Snapshot assertOneSnapshot(ProbeId probeId, TestSnapshotListener listener) {
+        assertEquals(1, listener.snapshots.size());
+        Snapshot snapshot = listener.snapshots.get(0);
+        assertEquals(probeId.getId(), snapshot.getProbe().getId());
+        return snapshot;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturingTestBase.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturingTestBase.java
index 0236897cb96..3330d3a4f4b 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturingTestBase.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturingTestBase.java
@@ -44,373 +44,360 @@
 import org.junit.jupiter.api.BeforeEach;
 
 public class CapturingTestBase {
-  protected static final String LANGUAGE = "java";
-
-  protected static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f5", 0);
-
-  protected static final String SERVICE_NAME = "service-name";
-
-  private static final JsonAdapter<Map<String, Object>> GENERIC_ADAPTER =
-      MoshiHelper.createGenericAdapter();
-
-  protected Config config;
-  protected ConfigurationUpdater configurationUpdater;
-  protected ClassFileTransformer currentTransformer;
-  protected Instrumentation instr;
-  protected MockInstrumentationListener instrumentationListener;
-  protected ProbeStatusSink probeStatusSink;
-  protected ProbeMetadata probeMetadata = new ProbeMetadata();
-
-  @AfterEach
-  public void after() {
-    if (currentTransformer != null) {
-      instr.removeTransformer(currentTransformer);
-    }
-    ProbeRateLimiter.resetGlobalRate();
-    Assertions.assertFalse(DebuggerContext.isInProbe());
-    Redaction.clearUserDefinedTypes();
-  }
-
-  @BeforeEach
-  public void before() {
-    setFieldInConfig(Config.get(), "dynamicInstrumentationCaptureTimeout", 200);
-    instr = ByteBuddyAgent.install();
-  }
-
-  protected void assertCaptureArgs(
-      CapturedContext context, String name, String typeName, String value) {
-    CapturedContext.CapturedValue capturedValue = context.getArguments().get(name);
-    assertEquals(typeName, capturedValue.getType());
-    assertEquals(value, MoshiSnapshotTestHelper.getValue(capturedValue));
-  }
-
-  protected void assertCaptureFieldCount(CapturedContext context, int expectedFieldCount) {
-    assertEquals(expectedFieldCount, getFields(context.getArguments().get("this")).size());
-  }
-
-  public static Map<String, CapturedContext.CapturedValue> getFields(
-      CapturedContext.CapturedValue capturedValue) {
-    try {
-      CapturedContext.CapturedValue valued = VALUE_ADAPTER.fromJson(capturedValue.getStrValue());
-      Map<String, CapturedContext.CapturedValue> results = new HashMap<>();
-      if (valued.getNotCapturedReason() != null) {
-        results.put(
-            "@" + NOT_CAPTURED_REASON,
-            CapturedContext.CapturedValue.notCapturedReason(
-                null, null, valued.getNotCapturedReason()));
-      }
-      if (valued.getValue() == null) {
-        return results;
-      }
-      results.putAll((Map<String, CapturedContext.CapturedValue>) valued.getValue());
-      return results;
-    } catch (IOException e) {
-      e.printStackTrace();
-      return Collections.emptyMap();
-    }
-  }
-
-  protected void assertCaptureFields(
-      CapturedContext context, String name, String typeName, String value) {
-    CapturedContext.CapturedValue field = getFields(context.getArguments().get("this")).get(name);
-    assertEquals(typeName, field.getType());
-    assertEquals(value, MoshiSnapshotTestHelper.getValue(field));
-  }
-
-  protected void assertCaptureFields(
-      CapturedContext context, String name, String typeName, Collection<?> collection) {
-    CapturedContext.CapturedValue field = getFields(context.getArguments().get("this")).get(name);
-    assertEquals(typeName, field.getType());
-    Iterator<?> iterator = collection.iterator();
-    for (Object obj : getCollection(field)) {
-      if (iterator.hasNext()) {
-        assertEquals(iterator.next(), obj);
-      } else {
-        Assertions.fail("not same number of elements");
-      }
-    }
-  }
-
-  private static Collection<?> getCollection(CapturedContext.CapturedValue capturedValue) {
-    try {
-      if (capturedValue.getStrValue() == null) {
-        return (Collection<?>) capturedValue.getValue();
-      }
-      Map<String, Object> capturedValueMap = GENERIC_ADAPTER.fromJson(capturedValue.getStrValue());
-      List<Object> elements = (List<Object>) capturedValueMap.get("elements");
-      if (elements == null) {
-        Assertions.fail("not a collection");
-      }
-      List<Object> result = new ArrayList<>();
-      for (Object obj : elements) {
-        Map<String, Object> element = (Map<String, Object>) obj;
-        String type = (String) element.get("type");
-        if (type == null) {
-          Assertions.fail("no type for element");
+    protected static final String LANGUAGE = "java";
+
+    protected static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f5", 0);
+
+    protected static final String SERVICE_NAME = "service-name";
+
+    private static final JsonAdapter<Map<String, Object>> GENERIC_ADAPTER = MoshiHelper.createGenericAdapter();
+
+    protected Config config;
+    protected ConfigurationUpdater configurationUpdater;
+    protected ClassFileTransformer currentTransformer;
+    protected Instrumentation instr;
+    protected MockInstrumentationListener instrumentationListener;
+    protected ProbeStatusSink probeStatusSink;
+    protected ProbeMetadata probeMetadata = new ProbeMetadata();
+
+    @AfterEach
+    public void after() {
+        if (currentTransformer != null) {
+            instr.removeTransformer(currentTransformer);
+        }
+        ProbeRateLimiter.resetGlobalRate();
+        Assertions.assertFalse(DebuggerContext.isInProbe());
+        Redaction.clearUserDefinedTypes();
+    }
+
+    @BeforeEach
+    public void before() {
+        setFieldInConfig(Config.get(), "dynamicInstrumentationCaptureTimeout", 200);
+        instr = ByteBuddyAgent.install();
+    }
+
+    protected void assertCaptureArgs(CapturedContext context, String name, String typeName, String value) {
+        CapturedContext.CapturedValue capturedValue = context.getArguments().get(name);
+        assertEquals(typeName, capturedValue.getType());
+        assertEquals(value, MoshiSnapshotTestHelper.getValue(capturedValue));
+    }
+
+    protected void assertCaptureFieldCount(CapturedContext context, int expectedFieldCount) {
+        assertEquals(
+                expectedFieldCount,
+                getFields(context.getArguments().get("this")).size());
+    }
+
+    public static Map<String, CapturedContext.CapturedValue> getFields(CapturedContext.CapturedValue capturedValue) {
+        try {
+            CapturedContext.CapturedValue valued = VALUE_ADAPTER.fromJson(capturedValue.getStrValue());
+            Map<String, CapturedContext.CapturedValue> results = new HashMap<>();
+            if (valued.getNotCapturedReason() != null) {
+                results.put(
+                        "@" + NOT_CAPTURED_REASON,
+                        CapturedContext.CapturedValue.notCapturedReason(null, null, valued.getNotCapturedReason()));
+            }
+            if (valued.getValue() == null) {
+                return results;
+            }
+            results.putAll((Map<String, CapturedContext.CapturedValue>) valued.getValue());
+            return results;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return Collections.emptyMap();
+        }
+    }
+
+    protected void assertCaptureFields(CapturedContext context, String name, String typeName, String value) {
+        CapturedContext.CapturedValue field =
+                getFields(context.getArguments().get("this")).get(name);
+        assertEquals(typeName, field.getType());
+        assertEquals(value, MoshiSnapshotTestHelper.getValue(field));
+    }
+
+    protected void assertCaptureFields(
+            CapturedContext context, String name, String typeName, Collection<?> collection) {
+        CapturedContext.CapturedValue field =
+                getFields(context.getArguments().get("this")).get(name);
+        assertEquals(typeName, field.getType());
+        Iterator<?> iterator = collection.iterator();
+        for (Object obj : getCollection(field)) {
+            if (iterator.hasNext()) {
+                assertEquals(iterator.next(), obj);
+            } else {
+                Assertions.fail("not same number of elements");
+            }
+        }
+    }
+
+    private static Collection<?> getCollection(CapturedContext.CapturedValue capturedValue) {
+        try {
+            if (capturedValue.getStrValue() == null) {
+                return (Collection<?>) capturedValue.getValue();
+            }
+            Map<String, Object> capturedValueMap = GENERIC_ADAPTER.fromJson(capturedValue.getStrValue());
+            List<Object> elements = (List<Object>) capturedValueMap.get("elements");
+            if (elements == null) {
+                Assertions.fail("not a collection");
+            }
+            List<Object> result = new ArrayList<>();
+            for (Object obj : elements) {
+                Map<String, Object> element = (Map<String, Object>) obj;
+                String type = (String) element.get("type");
+                if (type == null) {
+                    Assertions.fail("no type for element");
+                }
+                if (SerializerWithLimits.isPrimitive(type)) {
+                    result.add(element.get("value"));
+                } else {
+                    Assertions.fail("not implemented");
+                }
+            }
+            return result;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    protected List<Snapshot> assertSnapshots(TestSnapshotListener listener, int expectedCount, ProbeId... probeIds) {
+        assertEquals(expectedCount, listener.snapshots.size());
+        for (int i = 0; i < probeIds.length; i++) {
+            assertEquals(
+                    probeIds[i].getId(), listener.snapshots.get(i).getProbe().getId());
         }
-        if (SerializerWithLimits.isPrimitive(type)) {
-          result.add(element.get("value"));
-        } else {
-          Assertions.fail("not implemented");
+        return listener.snapshots;
+    }
+
+    protected void assertCaptureFields(
+            CapturedContext context, String name, String typeName, Map<Object, Object> expectedMap) {
+        CapturedContext.CapturedValue field =
+                getFields(context.getArguments().get("this")).get(name);
+        assertEquals(typeName, field.getType());
+        Map<Object, Object> map = getMap(field);
+        assertEquals(expectedMap.size(), map.size());
+        for (Map.Entry<Object, Object> entry : map.entrySet()) {
+            assertTrue(expectedMap.containsKey(entry.getKey()));
+            assertEquals(expectedMap.get(entry.getKey()), entry.getValue());
+        }
+    }
+
+    private Map<Object, Object> getMap(CapturedContext.CapturedValue capturedValue) {
+        try {
+            if (capturedValue.getStrValue() == null) {
+                return (Map<Object, Object>) capturedValue.getValue();
+            }
+            Map<String, Object> capturedValueMap = GENERIC_ADAPTER.fromJson(capturedValue.getStrValue());
+            List<Object> entries = (List<Object>) capturedValueMap.get("entries");
+            if (entries == null) {
+                Assertions.fail("not a map");
+            }
+            Map<Object, Object> result = new HashMap<>();
+            for (Object obj : entries) {
+                List<Object> entry = (List<Object>) obj;
+                Map<String, Object> key = (Map<String, Object>) entry.get(0);
+                Map<String, Object> value = (Map<String, Object>) entry.get(1);
+                result.put(key.get("value"), value.get("value"));
+            }
+            return result;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    protected void assertCaptureFieldsNotCaptured(CapturedContext context, String name, String expectedReasonRegEx) {
+        CapturedContext.CapturedValue field =
+                getFields(context.getArguments().get("this")).get(name);
+        assertTrue(field.getNotCapturedReason().matches(expectedReasonRegEx), field.getNotCapturedReason());
+    }
+
+    protected void assertCaptureLocals(CapturedContext context, String name, String typeName, String value) {
+        CapturedContext.CapturedValue localVar = context.getLocals().get(name);
+        assertEquals(typeName, localVar.getType());
+        assertEquals(value, MoshiSnapshotTestHelper.getValue(localVar));
+    }
+
+    protected void assertCaptureLocals(
+            CapturedContext context, String name, String typeName, Map<String, String> expectedFields) {
+        CapturedContext.CapturedValue localVar = context.getLocals().get(name);
+        assertEquals(typeName, localVar.getType());
+        Map<String, CapturedContext.CapturedValue> fields = getFields(localVar);
+        for (Map.Entry<String, String> entry : expectedFields.entrySet()) {
+            assertTrue(fields.containsKey(entry.getKey()));
+            CapturedContext.CapturedValue fieldCapturedValue = fields.get(entry.getKey());
+            if (fieldCapturedValue.getNotCapturedReason() != null) {
+                assertEquals(entry.getValue(), String.valueOf(fieldCapturedValue.getNotCapturedReason()));
+            } else {
+                assertEquals(entry.getValue(), String.valueOf(fieldCapturedValue.getValue()));
+            }
+        }
+    }
+
+    protected void assertCaptureReturnValue(CapturedContext context, String typeName, String value) {
+        CapturedContext.CapturedValue returnValue = context.getLocals().get("@return");
+        assertEquals(typeName, returnValue.getType());
+        assertEquals(value, MoshiSnapshotTestHelper.getValue(returnValue));
+    }
+
+    protected void assertCaptureReturnValue(
+            CapturedContext context, String typeName, Map<String, String> expectedFields) {
+        CapturedContext.CapturedValue returnValue = context.getLocals().get("@return");
+        assertEquals(typeName, returnValue.getType());
+        Map<String, CapturedContext.CapturedValue> fields = getFields(returnValue);
+        for (Map.Entry<String, String> entry : expectedFields.entrySet()) {
+            assertTrue(fields.containsKey(entry.getKey()));
+            CapturedContext.CapturedValue fieldCapturedValue = fields.get(entry.getKey());
+            if (fieldCapturedValue.getNotCapturedReason() != null) {
+                assertEquals(entry.getValue(), String.valueOf(fieldCapturedValue.getNotCapturedReason()));
+            } else {
+                assertEquals(entry.getValue(), String.valueOf(fieldCapturedValue.getValue()));
+            }
         }
-      }
-      return result;
-    } catch (IOException e) {
-      e.printStackTrace();
-      return null;
-    }
-  }
-
-  protected List<Snapshot> assertSnapshots(
-      TestSnapshotListener listener, int expectedCount, ProbeId... probeIds) {
-    assertEquals(expectedCount, listener.snapshots.size());
-    for (int i = 0; i < probeIds.length; i++) {
-      assertEquals(probeIds[i].getId(), listener.snapshots.get(i).getProbe().getId());
-    }
-    return listener.snapshots;
-  }
-
-  protected void assertCaptureFields(
-      CapturedContext context, String name, String typeName, Map<Object, Object> expectedMap) {
-    CapturedContext.CapturedValue field = getFields(context.getArguments().get("this")).get(name);
-    assertEquals(typeName, field.getType());
-    Map<Object, Object> map = getMap(field);
-    assertEquals(expectedMap.size(), map.size());
-    for (Map.Entry<Object, Object> entry : map.entrySet()) {
-      assertTrue(expectedMap.containsKey(entry.getKey()));
-      assertEquals(expectedMap.get(entry.getKey()), entry.getValue());
-    }
-  }
-
-  private Map<Object, Object> getMap(CapturedContext.CapturedValue capturedValue) {
-    try {
-      if (capturedValue.getStrValue() == null) {
-        return (Map<Object, Object>) capturedValue.getValue();
-      }
-      Map<String, Object> capturedValueMap = GENERIC_ADAPTER.fromJson(capturedValue.getStrValue());
-      List<Object> entries = (List<Object>) capturedValueMap.get("entries");
-      if (entries == null) {
-        Assertions.fail("not a map");
-      }
-      Map<Object, Object> result = new HashMap<>();
-      for (Object obj : entries) {
-        List<Object> entry = (List<Object>) obj;
-        Map<String, Object> key = (Map<String, Object>) entry.get(0);
-        Map<String, Object> value = (Map<String, Object>) entry.get(1);
-        result.put(key.get("value"), value.get("value"));
-      }
-      return result;
-    } catch (IOException e) {
-      e.printStackTrace();
-      return null;
-    }
-  }
-
-  protected void assertCaptureFieldsNotCaptured(
-      CapturedContext context, String name, String expectedReasonRegEx) {
-    CapturedContext.CapturedValue field = getFields(context.getArguments().get("this")).get(name);
-    assertTrue(
-        field.getNotCapturedReason().matches(expectedReasonRegEx), field.getNotCapturedReason());
-  }
-
-  protected void assertCaptureLocals(
-      CapturedContext context, String name, String typeName, String value) {
-    CapturedContext.CapturedValue localVar = context.getLocals().get(name);
-    assertEquals(typeName, localVar.getType());
-    assertEquals(value, MoshiSnapshotTestHelper.getValue(localVar));
-  }
-
-  protected void assertCaptureLocals(
-      CapturedContext context, String name, String typeName, Map<String, String> expectedFields) {
-    CapturedContext.CapturedValue localVar = context.getLocals().get(name);
-    assertEquals(typeName, localVar.getType());
-    Map<String, CapturedContext.CapturedValue> fields = getFields(localVar);
-    for (Map.Entry<String, String> entry : expectedFields.entrySet()) {
-      assertTrue(fields.containsKey(entry.getKey()));
-      CapturedContext.CapturedValue fieldCapturedValue = fields.get(entry.getKey());
-      if (fieldCapturedValue.getNotCapturedReason() != null) {
-        assertEquals(entry.getValue(), String.valueOf(fieldCapturedValue.getNotCapturedReason()));
-      } else {
-        assertEquals(entry.getValue(), String.valueOf(fieldCapturedValue.getValue()));
-      }
-    }
-  }
-
-  protected void assertCaptureReturnValue(CapturedContext context, String typeName, String value) {
-    CapturedContext.CapturedValue returnValue = context.getLocals().get("@return");
-    assertEquals(typeName, returnValue.getType());
-    assertEquals(value, MoshiSnapshotTestHelper.getValue(returnValue));
-  }
-
-  protected void assertCaptureReturnValue(
-      CapturedContext context, String typeName, Map<String, String> expectedFields) {
-    CapturedContext.CapturedValue returnValue = context.getLocals().get("@return");
-    assertEquals(typeName, returnValue.getType());
-    Map<String, CapturedContext.CapturedValue> fields = getFields(returnValue);
-    for (Map.Entry<String, String> entry : expectedFields.entrySet()) {
-      assertTrue(fields.containsKey(entry.getKey()));
-      CapturedContext.CapturedValue fieldCapturedValue = fields.get(entry.getKey());
-      if (fieldCapturedValue.getNotCapturedReason() != null) {
-        assertEquals(entry.getValue(), String.valueOf(fieldCapturedValue.getNotCapturedReason()));
-      } else {
-        assertEquals(entry.getValue(), String.valueOf(fieldCapturedValue.getValue()));
-      }
-    }
-  }
-
-  protected void assertCaptureStaticFieldsNotCaptured(
-      CapturedContext context, String name, String expectedReasonRegEx) {
-    CapturedContext.CapturedValue field = context.getStaticFields().get(name);
-    assertTrue(
-        field.getNotCapturedReason().matches(expectedReasonRegEx), field.getNotCapturedReason());
-  }
-
-  protected void assertCaptureThrowable(
-      CapturedContext context, String typeName, String message, String methodName, int lineNumber) {
-    CapturedContext.CapturedThrowable throwable = context.getCapturedThrowable();
-    assertCaptureThrowable(throwable, typeName, message, methodName, lineNumber);
-  }
-
-  protected void assertCaptureThrowable(
-      CapturedContext.CapturedThrowable throwable,
-      String typeName,
-      String message,
-      String methodName,
-      int lineNumber) {
-    assertNotNull(throwable);
-    assertEquals(typeName, throwable.getType());
-    assertEquals(message, throwable.getMessage());
-    assertNotNull(throwable.getStacktrace());
-    Assertions.assertFalse(throwable.getStacktrace().isEmpty());
-    assertEquals(methodName, throwable.getStacktrace().get(0).getFunction());
-    assertEquals(lineNumber, throwable.getStacktrace().get(0).getLineNumber());
-  }
-
-  protected void assertCaptureExpressions(
-      CapturedContext context, String name, String typeName, String value) {
-    CapturedContext.CapturedValue expression = context.getCaptureExpressions().get(name);
-    assertEquals(typeName, expression.getType());
-    assertEquals(value, MoshiSnapshotTestHelper.getValue(expression));
-  }
-
-  protected TestSnapshotListener installMethodProbe(
-      String typeName, String methodName, String signature) {
-    LogProbe logProbe =
-        createMethodProbe(CapturedSnapshotTest.PROBE_ID, typeName, methodName, signature);
-    return installProbes(logProbe);
-  }
-
-  protected TestSnapshotListener installLineProbe(ProbeId id, String typeName, int line) {
-    LogProbe logProbe = createLineProbe(id, typeName, line);
-    return installProbes(logProbe);
-  }
-
-  protected static LogProbe createMethodProbe(
-      ProbeId id, String typeName, String methodName, String signature) {
-    return createProbeBuilder(id, typeName, methodName, signature).build();
-  }
-
-  protected static LogProbe createLineProbe(ProbeId id, String sourceFile, int line) {
-    return createProbeBuilder(id, sourceFile, line).build();
-  }
-
-  protected TestSnapshotListener installProbes(ProbeDefinition... probes) {
-    return installProbes(
-        Configuration.builder().setService(CapturedSnapshotTest.SERVICE_NAME).add(probes).build());
-  }
-
-  public static LogProbe.Builder createProbeBuilder(
-      ProbeId id, String typeName, String methodName, String signature) {
-    return createProbeBuilder(id)
-        .captureSnapshot(true)
-        .where(typeName, methodName, signature, (String[]) null)
-        // Increase sampling limit to avoid being sampled during tests
-        .sampling(new LogProbe.Sampling(100));
-  }
-
-  public static LogProbe.Builder createProbeBuilder(ProbeId id, String sourceFile, int line) {
-    return createProbeBuilder(id)
-        .captureSnapshot(true)
-        .where(sourceFile, line)
-        // Increase sampling limit to avoid being sampled during tests
-        .sampling(new LogProbe.Sampling(100));
-  }
-
-  public static LogProbe.Builder createProbeBuilder(ProbeId id) {
-    return LogProbe.builder().language(LANGUAGE).probeId(id);
-  }
-
-  protected TestSnapshotListener installProbes(Configuration configuration) {
-    config = getConfig();
-    instrumentationListener = new MockInstrumentationListener();
-    probeStatusSink = mock(ProbeStatusSink.class);
-    TestSnapshotListener listener = new TestSnapshotListener(config, probeStatusSink);
-    configurationUpdater =
-        new ConfigurationUpdater(
-            instr,
-            DebuggerTransformer::new,
-            config,
-            new DebuggerSink(config, probeStatusSink),
-            new ClassesToRetransformFinder());
-    currentTransformer =
-        new DebuggerTransformer(
-            config,
-            configuration,
-            instrumentationListener,
-            configurationUpdater.getProbeMetadata(),
-            listener);
-    instr.addTransformer(currentTransformer);
-    DebuggerAgentHelper.injectSink(listener);
-    DebuggerContext.initProbeResolver(configurationUpdater::resolve);
-    DebuggerContext.initClassFilter(new DenyListHelper(null));
-    DebuggerContext.initValueSerializer(new JsonSnapshotSerializer());
-
-    for (ProbeDefinition probe : configuration.getDefinitions()) {
-      if (probe instanceof Sampled) {
-        ((Sampled) probe).initSamplers();
-      }
-    }
-    if (configuration.getSampling() != null) {
-      ProbeRateLimiter.setGlobalSnapshotRate(configuration.getSampling().getEventsPerSecond());
-    }
-    return listener;
-  }
-
-  public static Config getConfig() {
-    Config config = Config.get();
-    setFieldInConfig(config, "dynamicInstrumentationEnabled", true);
-    setFieldInConfig(config, "dynamicInstrumentationClassFileDumpEnabled", true);
-    setFieldInConfig(config, "dynamicInstrumentationVerifyByteCode", false);
-    setFieldInConfig(config, "debuggerCodeOriginMaxUserFrames", 20);
-    setFieldInConfig(config, "dynamicInstrumentationSnapshotUrl", "http://localhost:8080");
-    return config;
-  }
-
-  protected TestSnapshotListener installMethodProbeAtExit(
-      String typeName, String methodName, String signature) {
-    LogProbe logProbes =
-        createMethodProbeAtExit(CapturedSnapshotTest.PROBE_ID, typeName, methodName, signature);
-    return installProbes(logProbes);
-  }
-
-  protected static LogProbe createMethodProbeAtExit(
-      ProbeId id, String typeName, String methodName, String signature) {
-    return createProbeBuilder(id, typeName, methodName, signature)
-        .evaluateAt(MethodLocation.EXIT)
-        .build();
-  }
-
-  interface TestMethod {
-    void run() throws IOException, URISyntaxException;
-  }
-
-  public static class MockInstrumentationListener
-      implements DebuggerTransformer.InstrumentationListener {
-    public final Map<String, InstrumentationResult> results = new HashMap<>();
-
-    @Override
-    public void instrumentationResult(ProbeDefinition definition, InstrumentationResult result) {
-      results.put(definition.getId(), result);
-    }
-  }
+    }
+
+    protected void assertCaptureStaticFieldsNotCaptured(
+            CapturedContext context, String name, String expectedReasonRegEx) {
+        CapturedContext.CapturedValue field = context.getStaticFields().get(name);
+        assertTrue(field.getNotCapturedReason().matches(expectedReasonRegEx), field.getNotCapturedReason());
+    }
+
+    protected void assertCaptureThrowable(
+            CapturedContext context, String typeName, String message, String methodName, int lineNumber) {
+        CapturedContext.CapturedThrowable throwable = context.getCapturedThrowable();
+        assertCaptureThrowable(throwable, typeName, message, methodName, lineNumber);
+    }
+
+    protected void assertCaptureThrowable(
+            CapturedContext.CapturedThrowable throwable,
+            String typeName,
+            String message,
+            String methodName,
+            int lineNumber) {
+        assertNotNull(throwable);
+        assertEquals(typeName, throwable.getType());
+        assertEquals(message, throwable.getMessage());
+        assertNotNull(throwable.getStacktrace());
+        Assertions.assertFalse(throwable.getStacktrace().isEmpty());
+        assertEquals(methodName, throwable.getStacktrace().get(0).getFunction());
+        assertEquals(lineNumber, throwable.getStacktrace().get(0).getLineNumber());
+    }
+
+    protected void assertCaptureExpressions(CapturedContext context, String name, String typeName, String value) {
+        CapturedContext.CapturedValue expression =
+                context.getCaptureExpressions().get(name);
+        assertEquals(typeName, expression.getType());
+        assertEquals(value, MoshiSnapshotTestHelper.getValue(expression));
+    }
+
+    protected TestSnapshotListener installMethodProbe(String typeName, String methodName, String signature) {
+        LogProbe logProbe = createMethodProbe(CapturedSnapshotTest.PROBE_ID, typeName, methodName, signature);
+        return installProbes(logProbe);
+    }
+
+    protected TestSnapshotListener installLineProbe(ProbeId id, String typeName, int line) {
+        LogProbe logProbe = createLineProbe(id, typeName, line);
+        return installProbes(logProbe);
+    }
+
+    protected static LogProbe createMethodProbe(ProbeId id, String typeName, String methodName, String signature) {
+        return createProbeBuilder(id, typeName, methodName, signature).build();
+    }
+
+    protected static LogProbe createLineProbe(ProbeId id, String sourceFile, int line) {
+        return createProbeBuilder(id, sourceFile, line).build();
+    }
+
+    protected TestSnapshotListener installProbes(ProbeDefinition... probes) {
+        return installProbes(Configuration.builder()
+                .setService(CapturedSnapshotTest.SERVICE_NAME)
+                .add(probes)
+                .build());
+    }
+
+    public static LogProbe.Builder createProbeBuilder(
+            ProbeId id, String typeName, String methodName, String signature) {
+        return createProbeBuilder(id)
+                .captureSnapshot(true)
+                .where(typeName, methodName, signature, (String[]) null)
+                // Increase sampling limit to avoid being sampled during tests
+                .sampling(new LogProbe.Sampling(100));
+    }
+
+    public static LogProbe.Builder createProbeBuilder(ProbeId id, String sourceFile, int line) {
+        return createProbeBuilder(id)
+                .captureSnapshot(true)
+                .where(sourceFile, line)
+                // Increase sampling limit to avoid being sampled during tests
+                .sampling(new LogProbe.Sampling(100));
+    }
+
+    public static LogProbe.Builder createProbeBuilder(ProbeId id) {
+        return LogProbe.builder().language(LANGUAGE).probeId(id);
+    }
+
+    protected TestSnapshotListener installProbes(Configuration configuration) {
+        config = getConfig();
+        instrumentationListener = new MockInstrumentationListener();
+        probeStatusSink = mock(ProbeStatusSink.class);
+        TestSnapshotListener listener = new TestSnapshotListener(config, probeStatusSink);
+        configurationUpdater = new ConfigurationUpdater(
+                instr,
+                DebuggerTransformer::new,
+                config,
+                new DebuggerSink(config, probeStatusSink),
+                new ClassesToRetransformFinder());
+        currentTransformer = new DebuggerTransformer(
+                config, configuration, instrumentationListener, configurationUpdater.getProbeMetadata(), listener);
+        instr.addTransformer(currentTransformer);
+        DebuggerAgentHelper.injectSink(listener);
+        DebuggerContext.initProbeResolver(configurationUpdater::resolve);
+        DebuggerContext.initClassFilter(new DenyListHelper(null));
+        DebuggerContext.initValueSerializer(new JsonSnapshotSerializer());
+
+        for (ProbeDefinition probe : configuration.getDefinitions()) {
+            if (probe instanceof Sampled) {
+                ((Sampled) probe).initSamplers();
+            }
+        }
+        if (configuration.getSampling() != null) {
+            ProbeRateLimiter.setGlobalSnapshotRate(configuration.getSampling().getEventsPerSecond());
+        }
+        return listener;
+    }
+
+    public static Config getConfig() {
+        Config config = Config.get();
+        setFieldInConfig(config, "dynamicInstrumentationEnabled", true);
+        setFieldInConfig(config, "dynamicInstrumentationClassFileDumpEnabled", true);
+        setFieldInConfig(config, "dynamicInstrumentationVerifyByteCode", false);
+        setFieldInConfig(config, "debuggerCodeOriginMaxUserFrames", 20);
+        setFieldInConfig(config, "dynamicInstrumentationSnapshotUrl", "http://localhost:8080");
+        return config;
+    }
+
+    protected TestSnapshotListener installMethodProbeAtExit(String typeName, String methodName, String signature) {
+        LogProbe logProbes = createMethodProbeAtExit(CapturedSnapshotTest.PROBE_ID, typeName, methodName, signature);
+        return installProbes(logProbes);
+    }
+
+    protected static LogProbe createMethodProbeAtExit(
+            ProbeId id, String typeName, String methodName, String signature) {
+        return createProbeBuilder(id, typeName, methodName, signature)
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+    }
+
+    interface TestMethod {
+        void run() throws IOException, URISyntaxException;
+    }
+
+    public static class MockInstrumentationListener implements DebuggerTransformer.InstrumentationListener {
+        public final Map<String, InstrumentationResult> results = new HashMap<>();
+
+        @Override
+        public void instrumentationResult(ProbeDefinition definition, InstrumentationResult result) {
+            results.put(definition.getId(), result);
+        }
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationComparerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationComparerTest.java
index 044aa39bd1a..2e92da23a87 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationComparerTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationComparerTest.java
@@ -23,448 +23,413 @@
 import org.objectweb.asm.tree.MethodNode;
 
 class ConfigurationComparerTest {
-  private static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
-  private static final ProbeId PROBE_ID1 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f6", 0);
-  private static final ProbeId PROBE_ID2 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f7", 0);
-  private static final String SERVICE_NAME = "service-name";
-
-  @Test
-  public void newDefinitions() {
-    Configuration empty = createConfig(Collections.emptyList());
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
-            .build();
-    ConfigurationComparer configurationComparer =
-        new ConfigurationComparer(
-            empty, createConfig(Collections.singletonList(probe)), emptyMap());
-    Collection<ProbeDefinition> addedDefinitions = configurationComparer.getAddedDefinitions();
-    Assertions.assertEquals(1, addedDefinitions.size());
-    Assertions.assertTrue(addedDefinitions.contains(probe));
-    Assertions.assertTrue(configurationComparer.getRemovedDefinitions().isEmpty());
-  }
-
-  @Test
-  public void removeDefinitions() {
-    Configuration empty = createConfig(Collections.emptyList());
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
-            .build();
-    ConfigurationComparer configurationComparer =
-        new ConfigurationComparer(
-            createConfig(Collections.singletonList(probe)), empty, emptyMap());
-    Collection<ProbeDefinition> removedDefinitions = configurationComparer.getRemovedDefinitions();
-    Assertions.assertEquals(1, removedDefinitions.size());
-    Assertions.assertTrue(removedDefinitions.contains(probe));
-    Assertions.assertTrue(configurationComparer.getAddedDefinitions().isEmpty());
-  }
-
-  @Test
-  public void hasProbeRelatedChangesEmpty() {
-    Configuration empty = createConfig(Collections.emptyList());
-    ConfigurationComparer configurationComparer =
-        new ConfigurationComparer(empty, empty, emptyMap());
-    Assertions.assertFalse(configurationComparer.hasProbeRelatedChanges());
-  }
-
-  @Test
-  public void hasProbeRelatedChangesSame() {
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
-            .build();
-    Configuration config = createConfig(Collections.singletonList(probe));
-    ConfigurationComparer configurationComparer =
-        new ConfigurationComparer(config, config, emptyMap());
-    Assertions.assertFalse(configurationComparer.hasProbeRelatedChanges());
-  }
-
-  @Test
-  public void hasProbeRelatedChangesAdded() {
-    Configuration empty = createConfig(Collections.emptyList());
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
-            .build();
-    Configuration config = createConfig(Collections.singletonList(probe));
-    ConfigurationComparer configurationComparer =
-        new ConfigurationComparer(empty, config, emptyMap());
-    Assertions.assertTrue(configurationComparer.hasProbeRelatedChanges());
-    Assertions.assertFalse(configurationComparer.getAddedDefinitions().isEmpty());
-    Assertions.assertTrue(configurationComparer.getRemovedDefinitions().isEmpty());
-  }
-
-  @Test
-  public void hasProbeRelatedChangesRemoved() {
-    Configuration empty = createConfig(Collections.emptyList());
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
-            .build();
-    Configuration config = createConfig(Collections.singletonList(probe));
-    ConfigurationComparer configurationComparer =
-        new ConfigurationComparer(config, empty, emptyMap());
-    Assertions.assertTrue(configurationComparer.hasProbeRelatedChanges());
-    Assertions.assertTrue(configurationComparer.getAddedDefinitions().isEmpty());
-    Assertions.assertFalse(configurationComparer.getRemovedDefinitions().isEmpty());
-  }
-
-  @Test
-  public void addDuplicate() {
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID1)
-            .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
-            .build();
-    Configuration singleProbeConfig = createConfig(Collections.singletonList(probe));
-    LogProbe duplicatedProbe =
-        LogProbe.builder()
-            .probeId(PROBE_ID2)
-            .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
-            .build();
-    Configuration duplicatedProbeConfig = createConfig(Arrays.asList(probe, duplicatedProbe));
-    ConfigurationComparer configurationComparer =
-        new ConfigurationComparer(singleProbeConfig, duplicatedProbeConfig, emptyMap());
-    Assertions.assertTrue(configurationComparer.hasProbeRelatedChanges());
-    Assertions.assertFalse(configurationComparer.getAddedDefinitions().isEmpty());
-    ProbeDefinition added = configurationComparer.getAddedDefinitions().iterator().next();
-    Assertions.assertEquals(duplicatedProbe, added);
-    Assertions.assertTrue(configurationComparer.getRemovedDefinitions().isEmpty());
-  }
-
-  @Test
-  public void removeDuplicate() {
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID1)
-            .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
-            .build();
-    Configuration singleProbeConfig = createConfig(Collections.singletonList(probe));
-    LogProbe duplicatedProbe =
-        LogProbe.builder()
-            .probeId(PROBE_ID2)
-            .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
-            .build();
-    Configuration duplicatedProbeConfig = createConfig(Arrays.asList(probe, duplicatedProbe));
-    ConfigurationComparer configurationComparer =
-        new ConfigurationComparer(duplicatedProbeConfig, singleProbeConfig, emptyMap());
-    Assertions.assertTrue(configurationComparer.hasProbeRelatedChanges());
-    Assertions.assertTrue(configurationComparer.getAddedDefinitions().isEmpty());
-    Assertions.assertFalse(configurationComparer.getRemovedDefinitions().isEmpty());
-    ProbeDefinition removed = configurationComparer.getRemovedDefinitions().iterator().next();
-    Assertions.assertEquals(duplicatedProbe, removed);
-  }
-
-  @Test
-  public void hasProbeRelatedChangesFilteredChanged() {
-    Configuration empty = createConfig(Collections.emptyList());
-    Configuration config =
-        Configuration.builder()
-            .setService(SERVICE_NAME)
-            .addAllowList(
-                new Configuration.FilterList(Arrays.asList("com.datadog"), Collections.emptyList()))
-            .build();
-    ConfigurationComparer configurationComparer =
-        new ConfigurationComparer(empty, config, emptyMap());
-    Assertions.assertTrue(configurationComparer.hasProbeRelatedChanges());
-  }
-
-  @Test
-  public void hasProbeRelatedChangesWhenAllowListAddedWithProbe() {
-    LogProbe probe =
-        LogProbe.builder().probeId(PROBE_ID).where("com.datadog.Blocked", "method", null).build();
-
-    Map<String, InstrumentationResult> instrumentationResults = new HashMap<>();
-    instrumentationResults.put(
-        probe.getProbeId().getEncodedId(),
-        InstrumentationResult.Factory.blocked(probe.getWhere().getTypeName()));
-    Configuration noFilterConfig = createConfig(Collections.singletonList(probe));
-    Configuration config =
-        Configuration.builder()
-            .add(probe)
-            .addAllowList(
-                new Configuration.FilterList(Arrays.asList("com.datadog"), Collections.emptyList()))
-            .build();
-    ConfigurationComparer configurationComparer =
-        new ConfigurationComparer(noFilterConfig, config, instrumentationResults);
-    ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
-    Assertions.assertTrue(configurationComparer.hasProbeRelatedChanges());
-    Assertions.assertTrue(finder.getAllChangedClasses(configurationComparer).isEmpty());
-
-    Configuration changedAllowedList =
-        Configuration.builder()
-            .add(probe)
-            .addAllowList(
-                new Configuration.FilterList(Arrays.asList("com.datacat"), Collections.emptyList()))
-            .build();
-    ConfigurationComparer configurationComparer2 =
-        new ConfigurationComparer(config, changedAllowedList, instrumentationResults);
-    Assertions.assertTrue(configurationComparer2.hasProbeRelatedChanges());
-    Assertions.assertTrue(configurationComparer2.getAddedDefinitions().isEmpty());
-    Assertions.assertTrue(configurationComparer2.getRemovedDefinitions().isEmpty());
-    ClassesToRetransformFinder finder2 = new ClassesToRetransformFinder();
-    Assertions.assertTrue(
-        finder2
-            .getAllChangedClasses(configurationComparer2)
-            .contains(reverseStr(probe.getWhere().getTypeName())));
-  }
-
-  @Test
-  public void hasProbeRelatedChangesWhenDenyListAddedWithProbe() {
-    LogProbe probe =
-        LogProbe.builder().probeId(PROBE_ID).where("com.datadog.Blocked", "method", null).build();
-
-    Map<String, InstrumentationResult> instrumentationResults = new HashMap<>();
-    instrumentationResults.put(
-        probe.getId(),
-        new InstrumentationResult(
-            InstrumentationResult.Status.INSTALLED, "com.datadog.Blocked", "method"));
-    Configuration noFilterConfig = createConfig(Collections.singletonList(probe));
-    Configuration config =
-        Configuration.builder()
-            .add(probe)
-            .addDenyList(
-                new Configuration.FilterList(Arrays.asList("com.datadog"), Collections.emptyList()))
-            .build();
-    ConfigurationComparer configurationComparer =
-        new ConfigurationComparer(noFilterConfig, config, instrumentationResults);
-    Assertions.assertTrue(configurationComparer.hasProbeRelatedChanges());
-    ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
-    Assertions.assertTrue(
-        finder
-            .getAllChangedClasses(configurationComparer)
-            .contains(reverseStr(probe.getWhere().getTypeName())));
-  }
-
-  @Test
-  public void hasProbeRelatedChangesWhenChangeDenyListAndAddingProbe() {
-    LogProbe probe =
-        LogProbe.builder().probeId(PROBE_ID).where("com.datadog.Blocked", "method", null).build();
-
-    Map<String, InstrumentationResult> instrumentationResults = new HashMap<>();
-
-    // first: add a new probe that is going to be filtered
-    instrumentationResults.put(
-        probe.getId(), InstrumentationResult.Factory.blocked(probe.getWhere().getTypeName()));
-    Configuration empty = createConfig(Collections.emptyList());
-    Configuration config =
-        Configuration.builder()
-            .add(probe)
-            .addDenyList(
-                new Configuration.FilterList(Arrays.asList("com.datadog"), Collections.emptyList()))
-            .build();
-    ConfigurationComparer configurationComparer =
-        new ConfigurationComparer(empty, config, emptyMap());
-    Assertions.assertTrue(configurationComparer.hasProbeRelatedChanges());
-    ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
-    Assertions.assertTrue(
-        finder
-            .getAllChangedClasses(configurationComparer)
-            .contains(reverseStr(probe.getWhere().getTypeName())));
-
-    // remove the filtered list and see it will be re-transformed.
-    Configuration noFilterConfig = createConfig(Collections.singletonList(probe));
-    ConfigurationComparer configurationComparer2 =
-        new ConfigurationComparer(config, noFilterConfig, instrumentationResults);
-    Assertions.assertTrue(configurationComparer2.hasProbeRelatedChanges());
-    ClassesToRetransformFinder finder2 = new ClassesToRetransformFinder();
-    Assertions.assertTrue(
-        finder2
-            .getAllChangedClasses(configurationComparer2)
-            .contains(reverseStr(probe.getWhere().getTypeName())));
-  }
-
-  @Test
-  public void changedClassesFQClassName() {
-    Configuration empty = createConfig(Collections.emptyList());
-    Configuration config =
-        createConfig(
-            Arrays.asList(
-                LogProbe.builder()
-                    .probeId(PROBE_ID)
-                    .where("java.lang.String", "indexOf", null)
-                    .build()));
-    ConfigurationComparer configurationComparer =
-        new ConfigurationComparer(empty, config, emptyMap());
-    ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
-    Trie allChangedClasses = finder.getAllChangedClasses(configurationComparer);
-    Assertions.assertTrue(allChangedClasses.contains(reverseStr("java.lang.String")));
-  }
-
-  @Test
-  public void changedClassesSimpleClassName() {
-    Configuration empty = createConfig(Collections.emptyList());
-    Configuration config =
-        createConfig(
-            Arrays.asList(
-                LogProbe.builder().probeId(PROBE_ID).where("String", "indexOf", null).build()));
-    ConfigurationComparer configurationComparer =
-        new ConfigurationComparer(empty, config, emptyMap());
-    ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
-    Trie allChangedClasses = finder.getAllChangedClasses(configurationComparer);
-    Assertions.assertTrue(allChangedClasses.contains(reverseStr("String")));
-  }
-
-  @Test
-  public void changedClassesFullPath() {
-    Configuration empty = createConfig(Collections.emptyList());
-    Configuration config =
-        createConfig(
-            Arrays.asList(
-                LogProbe.builder()
-                    .probeId(PROBE_ID)
-                    .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
-                    .build()));
-    ConfigurationComparer configurationComparer =
-        new ConfigurationComparer(empty, config, emptyMap());
-    ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
-    Trie allChangedClasses = finder.getAllChangedClasses(configurationComparer);
-    Assertions.assertTrue(allChangedClasses.containsPrefix(reverseStr("String")));
-    Assertions.assertTrue(allChangedClasses.containsPrefix(reverseStr("java.lang.String")));
-  }
-
-  @Test
-  public void allLoadedChangedClassesType() {
-    LogProbe probe =
-        LogProbe.builder().probeId(PROBE_ID).where("java.lang.String", "indexOf").build();
-    doAllLoadedChangedClasses(probe, emptyMap(), String.class, false, String.class, HashMap.class);
-    doAllLoadedChangedClasses(probe, emptyMap(), null, false, HashMap.class);
-  }
-
-  @Test
-  public void allLoadedChangedClassesSimpleType() {
-    LogProbe probe = LogProbe.builder().probeId(PROBE_ID).where("String", "indexOf").build();
-    doAllLoadedChangedClasses(probe, emptyMap(), String.class, false, String.class, HashMap.class);
-    doAllLoadedChangedClasses(probe, emptyMap(), null, false, HashMap.class);
-  }
-
-  @Test
-  public void allLoadedChangedClasses() {
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
-            .build();
-    doAllLoadedChangedClasses(probe, emptyMap(), String.class, false, String.class, HashMap.class);
-    doAllLoadedChangedClasses(probe, emptyMap(), null, false, HashMap.class);
-  }
-
-  @Test
-  public void allLoadedChangedClassesSimpleFileName() {
-    LogProbe probe =
-        LogProbe.builder().probeId(PROBE_ID).where(null, null, null, 1966, "String.java").build();
-    doAllLoadedChangedClasses(probe, emptyMap(), String.class, false, String.class, HashMap.class);
-    doAllLoadedChangedClasses(probe, emptyMap(), null, false, HashMap.class);
-  }
-
-  @Test
-  public void allLoadedChangedClassesTypeTopLevelClass() {
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where("com.datadog.debugger.agent.MyTopLevelClass", "process")
-            .build();
-    doAllLoadedChangedClasses(
-        probe, emptyMap(), MyTopLevelClass.class, true, MyTopLevelClass.class);
-  }
-
-  @Test
-  public void allLoadedChangedClassesSimpleTypeTopLevelClass() {
-    LogProbe probe =
-        LogProbe.builder().probeId(PROBE_ID).where("MyTopLevelClass", "process").build();
-    doAllLoadedChangedClasses(
-        probe, emptyMap(), MyTopLevelClass.class, true, MyTopLevelClass.class);
-  }
-
-  @Test
-  public void allLoadedChangedClassesTopLevelClassFileName() {
-    final String CLASS_FILENAME = "com/datadog/debugger/agent/TopLevelHelper.java";
-    Map<String, List<String>> sourceFileMapping = new HashMap<>();
-    String simpleSourceFile = CLASS_FILENAME.substring(CLASS_FILENAME.lastIndexOf('/') + 1);
-    sourceFileMapping.put(simpleSourceFile, Arrays.asList(MyTopLevelClass.class.getTypeName()));
-    LogProbe probe =
-        LogProbe.builder().probeId(PROBE_ID).where(null, null, null, 8, CLASS_FILENAME).build();
-    doAllLoadedChangedClasses(
-        probe, sourceFileMapping, MyTopLevelClass.class, true, MyTopLevelClass.class);
-    doAllLoadedChangedClasses(
-        probe, sourceFileMapping, MyTopLevelClass.class, false, MyTopLevelClass.class);
-  }
-
-  @Test
-  public void allLoadedChangedClassesTopLevelClassSimpleFileName() {
-    final String CLASS_FILENAME = "TopLevelHelper.java";
-    Map<String, List<String>> sourceFileMapping = new HashMap<>();
-    sourceFileMapping.put(CLASS_FILENAME, Arrays.asList(MyTopLevelClass.class.getTypeName()));
-    LogProbe probe =
-        LogProbe.builder().probeId(PROBE_ID).where(null, null, null, 8, CLASS_FILENAME).build();
-    doAllLoadedChangedClasses(
-        probe, sourceFileMapping, TopLevelHelper.class, false, TopLevelHelper.class);
-    doAllLoadedChangedClasses(
-        probe, sourceFileMapping, MyTopLevelClass.class, false, MyTopLevelClass.class);
-  }
-
-  @Test
-  public void allLoadedChangedClassesLargeInnerClasses() {
-    final String CLASS_FILENAME = "LargeInnerClasses.java";
-    Map<String, List<String>> sourceFileMapping = new HashMap<>();
-    List<String> classNames = new ArrayList<>();
-    for (int i = 0; i < 100; i++) {
-      classNames.add(
-          String.format("com.datadog.debugger.agent.LargeInnerClasses$MyInnerClass%02d", i));
+    private static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
+    private static final ProbeId PROBE_ID1 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f6", 0);
+    private static final ProbeId PROBE_ID2 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f7", 0);
+    private static final String SERVICE_NAME = "service-name";
+
+    @Test
+    public void newDefinitions() {
+        Configuration empty = createConfig(Collections.emptyList());
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
+                .build();
+        ConfigurationComparer configurationComparer =
+                new ConfigurationComparer(empty, createConfig(Collections.singletonList(probe)), emptyMap());
+        Collection<ProbeDefinition> addedDefinitions = configurationComparer.getAddedDefinitions();
+        Assertions.assertEquals(1, addedDefinitions.size());
+        Assertions.assertTrue(addedDefinitions.contains(probe));
+        Assertions.assertTrue(configurationComparer.getRemovedDefinitions().isEmpty());
     }
-    sourceFileMapping.put(CLASS_FILENAME, classNames);
-    LogProbe probe =
-        LogProbe.builder().probeId(PROBE_ID).where(null, null, null, 6, CLASS_FILENAME).build();
-    doAllLoadedChangedClasses(
-        probe, sourceFileMapping, LargeInnerClasses.class, false, LargeInnerClasses.class);
-  }
-
-  private void doAllLoadedChangedClasses(
-      LogProbe probe,
-      Map<String, List<String>> sourceFileMapping,
-      Class<?> expectedClass,
-      boolean withInstrumentationResult,
-      Class<?>... loadedClass) {
-    Configuration empty = createConfig(Collections.emptyList());
-    Configuration config = createConfig(Collections.singletonList(probe));
-    Map<String, InstrumentationResult> resultMap = emptyMap();
-    if (expectedClass != null && withInstrumentationResult) {
-      resultMap = new HashMap<>();
-      ClassNode classNode = new ClassNode();
-      classNode.name = expectedClass.getName().replace('.', '/'); // ASM stores with '/' notation
-
-      resultMap.put(
-          PROBE_ID.getId(),
-          new InstrumentationResult(
-              InstrumentationResult.Status.INSTALLED,
-              Collections.emptyMap(),
-              new MethodInfo(null, classNode, new MethodNode(), null)));
+
+    @Test
+    public void removeDefinitions() {
+        Configuration empty = createConfig(Collections.emptyList());
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
+                .build();
+        ConfigurationComparer configurationComparer =
+                new ConfigurationComparer(createConfig(Collections.singletonList(probe)), empty, emptyMap());
+        Collection<ProbeDefinition> removedDefinitions = configurationComparer.getRemovedDefinitions();
+        Assertions.assertEquals(1, removedDefinitions.size());
+        Assertions.assertTrue(removedDefinitions.contains(probe));
+        Assertions.assertTrue(configurationComparer.getAddedDefinitions().isEmpty());
+    }
+
+    @Test
+    public void hasProbeRelatedChangesEmpty() {
+        Configuration empty = createConfig(Collections.emptyList());
+        ConfigurationComparer configurationComparer = new ConfigurationComparer(empty, empty, emptyMap());
+        Assertions.assertFalse(configurationComparer.hasProbeRelatedChanges());
+    }
+
+    @Test
+    public void hasProbeRelatedChangesSame() {
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
+                .build();
+        Configuration config = createConfig(Collections.singletonList(probe));
+        ConfigurationComparer configurationComparer = new ConfigurationComparer(config, config, emptyMap());
+        Assertions.assertFalse(configurationComparer.hasProbeRelatedChanges());
+    }
+
+    @Test
+    public void hasProbeRelatedChangesAdded() {
+        Configuration empty = createConfig(Collections.emptyList());
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
+                .build();
+        Configuration config = createConfig(Collections.singletonList(probe));
+        ConfigurationComparer configurationComparer = new ConfigurationComparer(empty, config, emptyMap());
+        Assertions.assertTrue(configurationComparer.hasProbeRelatedChanges());
+        Assertions.assertFalse(configurationComparer.getAddedDefinitions().isEmpty());
+        Assertions.assertTrue(configurationComparer.getRemovedDefinitions().isEmpty());
+    }
+
+    @Test
+    public void hasProbeRelatedChangesRemoved() {
+        Configuration empty = createConfig(Collections.emptyList());
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
+                .build();
+        Configuration config = createConfig(Collections.singletonList(probe));
+        ConfigurationComparer configurationComparer = new ConfigurationComparer(config, empty, emptyMap());
+        Assertions.assertTrue(configurationComparer.hasProbeRelatedChanges());
+        Assertions.assertTrue(configurationComparer.getAddedDefinitions().isEmpty());
+        Assertions.assertFalse(configurationComparer.getRemovedDefinitions().isEmpty());
+    }
+
+    @Test
+    public void addDuplicate() {
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID1)
+                .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
+                .build();
+        Configuration singleProbeConfig = createConfig(Collections.singletonList(probe));
+        LogProbe duplicatedProbe = LogProbe.builder()
+                .probeId(PROBE_ID2)
+                .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
+                .build();
+        Configuration duplicatedProbeConfig = createConfig(Arrays.asList(probe, duplicatedProbe));
+        ConfigurationComparer configurationComparer =
+                new ConfigurationComparer(singleProbeConfig, duplicatedProbeConfig, emptyMap());
+        Assertions.assertTrue(configurationComparer.hasProbeRelatedChanges());
+        Assertions.assertFalse(configurationComparer.getAddedDefinitions().isEmpty());
+        ProbeDefinition added =
+                configurationComparer.getAddedDefinitions().iterator().next();
+        Assertions.assertEquals(duplicatedProbe, added);
+        Assertions.assertTrue(configurationComparer.getRemovedDefinitions().isEmpty());
+    }
+
+    @Test
+    public void removeDuplicate() {
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID1)
+                .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
+                .build();
+        Configuration singleProbeConfig = createConfig(Collections.singletonList(probe));
+        LogProbe duplicatedProbe = LogProbe.builder()
+                .probeId(PROBE_ID2)
+                .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
+                .build();
+        Configuration duplicatedProbeConfig = createConfig(Arrays.asList(probe, duplicatedProbe));
+        ConfigurationComparer configurationComparer =
+                new ConfigurationComparer(duplicatedProbeConfig, singleProbeConfig, emptyMap());
+        Assertions.assertTrue(configurationComparer.hasProbeRelatedChanges());
+        Assertions.assertTrue(configurationComparer.getAddedDefinitions().isEmpty());
+        Assertions.assertFalse(configurationComparer.getRemovedDefinitions().isEmpty());
+        ProbeDefinition removed =
+                configurationComparer.getRemovedDefinitions().iterator().next();
+        Assertions.assertEquals(duplicatedProbe, removed);
+    }
+
+    @Test
+    public void hasProbeRelatedChangesFilteredChanged() {
+        Configuration empty = createConfig(Collections.emptyList());
+        Configuration config = Configuration.builder()
+                .setService(SERVICE_NAME)
+                .addAllowList(new Configuration.FilterList(Arrays.asList("com.datadog"), Collections.emptyList()))
+                .build();
+        ConfigurationComparer configurationComparer = new ConfigurationComparer(empty, config, emptyMap());
+        Assertions.assertTrue(configurationComparer.hasProbeRelatedChanges());
+    }
+
+    @Test
+    public void hasProbeRelatedChangesWhenAllowListAddedWithProbe() {
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("com.datadog.Blocked", "method", null)
+                .build();
+
+        Map<String, InstrumentationResult> instrumentationResults = new HashMap<>();
+        instrumentationResults.put(
+                probe.getProbeId().getEncodedId(),
+                InstrumentationResult.Factory.blocked(probe.getWhere().getTypeName()));
+        Configuration noFilterConfig = createConfig(Collections.singletonList(probe));
+        Configuration config = Configuration.builder()
+                .add(probe)
+                .addAllowList(new Configuration.FilterList(Arrays.asList("com.datadog"), Collections.emptyList()))
+                .build();
+        ConfigurationComparer configurationComparer =
+                new ConfigurationComparer(noFilterConfig, config, instrumentationResults);
+        ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
+        Assertions.assertTrue(configurationComparer.hasProbeRelatedChanges());
+        Assertions.assertTrue(finder.getAllChangedClasses(configurationComparer).isEmpty());
+
+        Configuration changedAllowedList = Configuration.builder()
+                .add(probe)
+                .addAllowList(new Configuration.FilterList(Arrays.asList("com.datacat"), Collections.emptyList()))
+                .build();
+        ConfigurationComparer configurationComparer2 =
+                new ConfigurationComparer(config, changedAllowedList, instrumentationResults);
+        Assertions.assertTrue(configurationComparer2.hasProbeRelatedChanges());
+        Assertions.assertTrue(configurationComparer2.getAddedDefinitions().isEmpty());
+        Assertions.assertTrue(configurationComparer2.getRemovedDefinitions().isEmpty());
+        ClassesToRetransformFinder finder2 = new ClassesToRetransformFinder();
+        Assertions.assertTrue(finder2.getAllChangedClasses(configurationComparer2)
+                .contains(reverseStr(probe.getWhere().getTypeName())));
+    }
+
+    @Test
+    public void hasProbeRelatedChangesWhenDenyListAddedWithProbe() {
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("com.datadog.Blocked", "method", null)
+                .build();
+
+        Map<String, InstrumentationResult> instrumentationResults = new HashMap<>();
+        instrumentationResults.put(
+                probe.getId(),
+                new InstrumentationResult(InstrumentationResult.Status.INSTALLED, "com.datadog.Blocked", "method"));
+        Configuration noFilterConfig = createConfig(Collections.singletonList(probe));
+        Configuration config = Configuration.builder()
+                .add(probe)
+                .addDenyList(new Configuration.FilterList(Arrays.asList("com.datadog"), Collections.emptyList()))
+                .build();
+        ConfigurationComparer configurationComparer =
+                new ConfigurationComparer(noFilterConfig, config, instrumentationResults);
+        Assertions.assertTrue(configurationComparer.hasProbeRelatedChanges());
+        ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
+        Assertions.assertTrue(finder.getAllChangedClasses(configurationComparer)
+                .contains(reverseStr(probe.getWhere().getTypeName())));
+    }
+
+    @Test
+    public void hasProbeRelatedChangesWhenChangeDenyListAndAddingProbe() {
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("com.datadog.Blocked", "method", null)
+                .build();
+
+        Map<String, InstrumentationResult> instrumentationResults = new HashMap<>();
+
+        // first: add a new probe that is going to be filtered
+        instrumentationResults.put(
+                probe.getId(),
+                InstrumentationResult.Factory.blocked(probe.getWhere().getTypeName()));
+        Configuration empty = createConfig(Collections.emptyList());
+        Configuration config = Configuration.builder()
+                .add(probe)
+                .addDenyList(new Configuration.FilterList(Arrays.asList("com.datadog"), Collections.emptyList()))
+                .build();
+        ConfigurationComparer configurationComparer = new ConfigurationComparer(empty, config, emptyMap());
+        Assertions.assertTrue(configurationComparer.hasProbeRelatedChanges());
+        ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
+        Assertions.assertTrue(finder.getAllChangedClasses(configurationComparer)
+                .contains(reverseStr(probe.getWhere().getTypeName())));
+
+        // remove the filtered list and see it will be re-transformed.
+        Configuration noFilterConfig = createConfig(Collections.singletonList(probe));
+        ConfigurationComparer configurationComparer2 =
+                new ConfigurationComparer(config, noFilterConfig, instrumentationResults);
+        Assertions.assertTrue(configurationComparer2.hasProbeRelatedChanges());
+        ClassesToRetransformFinder finder2 = new ClassesToRetransformFinder();
+        Assertions.assertTrue(finder2.getAllChangedClasses(configurationComparer2)
+                .contains(reverseStr(probe.getWhere().getTypeName())));
+    }
+
+    @Test
+    public void changedClassesFQClassName() {
+        Configuration empty = createConfig(Collections.emptyList());
+        Configuration config = createConfig(Arrays.asList(LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("java.lang.String", "indexOf", null)
+                .build()));
+        ConfigurationComparer configurationComparer = new ConfigurationComparer(empty, config, emptyMap());
+        ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
+        Trie allChangedClasses = finder.getAllChangedClasses(configurationComparer);
+        Assertions.assertTrue(allChangedClasses.contains(reverseStr("java.lang.String")));
     }
-    ConfigurationComparer configurationComparer =
-        new ConfigurationComparer(empty, config, resultMap);
-    ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
-    for (Map.Entry<String, List<String>> entry : sourceFileMapping.entrySet()) {
-      for (String className : entry.getValue()) {
-        finder.register(entry.getKey(), className);
-      }
+
+    @Test
+    public void changedClassesSimpleClassName() {
+        Configuration empty = createConfig(Collections.emptyList());
+        Configuration config = createConfig(Arrays.asList(LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("String", "indexOf", null)
+                .build()));
+        ConfigurationComparer configurationComparer = new ConfigurationComparer(empty, config, emptyMap());
+        ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
+        Trie allChangedClasses = finder.getAllChangedClasses(configurationComparer);
+        Assertions.assertTrue(allChangedClasses.contains(reverseStr("String")));
+    }
+
+    @Test
+    public void changedClassesFullPath() {
+        Configuration empty = createConfig(Collections.emptyList());
+        Configuration config = createConfig(Arrays.asList(LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
+                .build()));
+        ConfigurationComparer configurationComparer = new ConfigurationComparer(empty, config, emptyMap());
+        ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
+        Trie allChangedClasses = finder.getAllChangedClasses(configurationComparer);
+        Assertions.assertTrue(allChangedClasses.containsPrefix(reverseStr("String")));
+        Assertions.assertTrue(allChangedClasses.containsPrefix(reverseStr("java.lang.String")));
+    }
+
+    @Test
+    public void allLoadedChangedClassesType() {
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("java.lang.String", "indexOf")
+                .build();
+        doAllLoadedChangedClasses(probe, emptyMap(), String.class, false, String.class, HashMap.class);
+        doAllLoadedChangedClasses(probe, emptyMap(), null, false, HashMap.class);
+    }
+
+    @Test
+    public void allLoadedChangedClassesSimpleType() {
+        LogProbe probe =
+                LogProbe.builder().probeId(PROBE_ID).where("String", "indexOf").build();
+        doAllLoadedChangedClasses(probe, emptyMap(), String.class, false, String.class, HashMap.class);
+        doAllLoadedChangedClasses(probe, emptyMap(), null, false, HashMap.class);
+    }
+
+    @Test
+    public void allLoadedChangedClasses() {
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
+                .build();
+        doAllLoadedChangedClasses(probe, emptyMap(), String.class, false, String.class, HashMap.class);
+        doAllLoadedChangedClasses(probe, emptyMap(), null, false, HashMap.class);
     }
-    List<Class<?>> allLoadedChangedClasses =
-        finder.getAllLoadedChangedClasses(loadedClass, configurationComparer);
-    if (expectedClass != null) {
-      assertEquals(1, allLoadedChangedClasses.size());
-      assertEquals(expectedClass, allLoadedChangedClasses.get(0));
-    } else {
-      assertTrue(allLoadedChangedClasses.isEmpty());
+
+    @Test
+    public void allLoadedChangedClassesSimpleFileName() {
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(null, null, null, 1966, "String.java")
+                .build();
+        doAllLoadedChangedClasses(probe, emptyMap(), String.class, false, String.class, HashMap.class);
+        doAllLoadedChangedClasses(probe, emptyMap(), null, false, HashMap.class);
+    }
+
+    @Test
+    public void allLoadedChangedClassesTypeTopLevelClass() {
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("com.datadog.debugger.agent.MyTopLevelClass", "process")
+                .build();
+        doAllLoadedChangedClasses(probe, emptyMap(), MyTopLevelClass.class, true, MyTopLevelClass.class);
     }
-  }
 
-  private static Configuration createConfig(List<ProbeDefinition> probes) {
-    return new Configuration(SERVICE_NAME, probes);
-  }
+    @Test
+    public void allLoadedChangedClassesSimpleTypeTopLevelClass() {
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("MyTopLevelClass", "process")
+                .build();
+        doAllLoadedChangedClasses(probe, emptyMap(), MyTopLevelClass.class, true, MyTopLevelClass.class);
+    }
+
+    @Test
+    public void allLoadedChangedClassesTopLevelClassFileName() {
+        final String CLASS_FILENAME = "com/datadog/debugger/agent/TopLevelHelper.java";
+        Map<String, List<String>> sourceFileMapping = new HashMap<>();
+        String simpleSourceFile = CLASS_FILENAME.substring(CLASS_FILENAME.lastIndexOf('/') + 1);
+        sourceFileMapping.put(simpleSourceFile, Arrays.asList(MyTopLevelClass.class.getTypeName()));
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(null, null, null, 8, CLASS_FILENAME)
+                .build();
+        doAllLoadedChangedClasses(probe, sourceFileMapping, MyTopLevelClass.class, true, MyTopLevelClass.class);
+        doAllLoadedChangedClasses(probe, sourceFileMapping, MyTopLevelClass.class, false, MyTopLevelClass.class);
+    }
+
+    @Test
+    public void allLoadedChangedClassesTopLevelClassSimpleFileName() {
+        final String CLASS_FILENAME = "TopLevelHelper.java";
+        Map<String, List<String>> sourceFileMapping = new HashMap<>();
+        sourceFileMapping.put(CLASS_FILENAME, Arrays.asList(MyTopLevelClass.class.getTypeName()));
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(null, null, null, 8, CLASS_FILENAME)
+                .build();
+        doAllLoadedChangedClasses(probe, sourceFileMapping, TopLevelHelper.class, false, TopLevelHelper.class);
+        doAllLoadedChangedClasses(probe, sourceFileMapping, MyTopLevelClass.class, false, MyTopLevelClass.class);
+    }
+
+    @Test
+    public void allLoadedChangedClassesLargeInnerClasses() {
+        final String CLASS_FILENAME = "LargeInnerClasses.java";
+        Map<String, List<String>> sourceFileMapping = new HashMap<>();
+        List<String> classNames = new ArrayList<>();
+        for (int i = 0; i < 100; i++) {
+            classNames.add(String.format("com.datadog.debugger.agent.LargeInnerClasses$MyInnerClass%02d", i));
+        }
+        sourceFileMapping.put(CLASS_FILENAME, classNames);
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(null, null, null, 6, CLASS_FILENAME)
+                .build();
+        doAllLoadedChangedClasses(probe, sourceFileMapping, LargeInnerClasses.class, false, LargeInnerClasses.class);
+    }
+
+    private void doAllLoadedChangedClasses(
+            LogProbe probe,
+            Map<String, List<String>> sourceFileMapping,
+            Class<?> expectedClass,
+            boolean withInstrumentationResult,
+            Class<?>... loadedClass) {
+        Configuration empty = createConfig(Collections.emptyList());
+        Configuration config = createConfig(Collections.singletonList(probe));
+        Map<String, InstrumentationResult> resultMap = emptyMap();
+        if (expectedClass != null && withInstrumentationResult) {
+            resultMap = new HashMap<>();
+            ClassNode classNode = new ClassNode();
+            classNode.name = expectedClass.getName().replace('.', '/'); // ASM stores with '/' notation
+
+            resultMap.put(
+                    PROBE_ID.getId(),
+                    new InstrumentationResult(
+                            InstrumentationResult.Status.INSTALLED,
+                            Collections.emptyMap(),
+                            new MethodInfo(null, classNode, new MethodNode(), null)));
+        }
+        ConfigurationComparer configurationComparer = new ConfigurationComparer(empty, config, resultMap);
+        ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
+        for (Map.Entry<String, List<String>> entry : sourceFileMapping.entrySet()) {
+            for (String className : entry.getValue()) {
+                finder.register(entry.getKey(), className);
+            }
+        }
+        List<Class<?>> allLoadedChangedClasses = finder.getAllLoadedChangedClasses(loadedClass, configurationComparer);
+        if (expectedClass != null) {
+            assertEquals(1, allLoadedChangedClasses.size());
+            assertEquals(expectedClass, allLoadedChangedClasses.get(0));
+        } else {
+            assertTrue(allLoadedChangedClasses.isEmpty());
+        }
+    }
+
+    private static Configuration createConfig(List<ProbeDefinition> probes) {
+        return new Configuration(SERVICE_NAME, probes);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationFileLoaderTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationFileLoaderTest.java
index 16c13a783d1..f75d76d15d2 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationFileLoaderTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationFileLoaderTest.java
@@ -17,19 +17,20 @@
 
 class ConfigurationFileLoaderTest {
 
-  @Test
-  public void load() throws Exception {
-    Path probeFilePath =
-        Paths.get(ConfigurationFileLoaderTest.class.getResource("/test_probe_file.json").toURI());
-    Configuration configuration = ConfigurationFileLoader.from(probeFilePath, 1024 * 1024);
-    assertNotNull(configuration);
-    List<ProbeDefinition> definitions = configuration.getDefinitions();
-    assertEquals(6, definitions.size());
-    assertInstanceOf(TriggerProbe.class, definitions.get(0));
-    assertInstanceOf(MetricProbe.class, definitions.get(1));
-    assertInstanceOf(LogProbe.class, definitions.get(2));
-    assertInstanceOf(LogProbe.class, definitions.get(3));
-    assertInstanceOf(SpanProbe.class, definitions.get(4));
-    assertInstanceOf(SpanDecorationProbe.class, definitions.get(5));
-  }
+    @Test
+    public void load() throws Exception {
+        Path probeFilePath = Paths.get(ConfigurationFileLoaderTest.class
+                .getResource("/test_probe_file.json")
+                .toURI());
+        Configuration configuration = ConfigurationFileLoader.from(probeFilePath, 1024 * 1024);
+        assertNotNull(configuration);
+        List<ProbeDefinition> definitions = configuration.getDefinitions();
+        assertEquals(6, definitions.size());
+        assertInstanceOf(TriggerProbe.class, definitions.get(0));
+        assertInstanceOf(MetricProbe.class, definitions.get(1));
+        assertInstanceOf(LogProbe.class, definitions.get(2));
+        assertInstanceOf(LogProbe.class, definitions.get(3));
+        assertInstanceOf(SpanProbe.class, definitions.get(4));
+        assertInstanceOf(SpanDecorationProbe.class, definitions.get(5));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationTest.java
index b0413b63a08..501e9449b9f 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationTest.java
@@ -33,423 +33,436 @@
 
 public class ConfigurationTest {
 
-  @Test
-  public void getDefinitions() {
-    Configuration config1 = createConfig1();
-    List<String> definitions =
-        config1.getDefinitions().stream().map(d -> d.getId()).sorted().collect(toList());
-    List<String> list =
-        asList("metric1", "probe1", "log1", "span1", "debug1", "decorateSpan1").stream()
-            .sorted()
-            .collect(toList());
+    @Test
+    public void getDefinitions() {
+        Configuration config1 = createConfig1();
+        List<String> definitions =
+                config1.getDefinitions().stream().map(d -> d.getId()).sorted().collect(toList());
+        List<String> list = asList("metric1", "probe1", "log1", "span1", "debug1", "decorateSpan1").stream()
+                .sorted()
+                .collect(toList());
 
-    assertEquals(list, definitions);
-  }
+        assertEquals(list, definitions);
+    }
 
-  @Test
-  public void deserializeMetricProbes() throws Exception {
-    String content = TestHelper.getFixtureContent("/test_metric_probe.json");
-    JsonAdapter<Configuration> adapter =
-        MoshiHelper.createMoshiConfig().adapter(Configuration.class);
-    Configuration config = adapter.fromJson(content);
-    ArrayList<MetricProbe> metricProbes = new ArrayList<>(config.getMetricProbes());
-    assertEquals(4, metricProbes.size());
-    assertEquals("datadog.debugger.calls", metricProbes.get(0).getMetricName());
-    assertEquals("ValueScript{dsl='42'}", metricProbes.get(0).getValue().toString());
-    assertEquals("datadog.debugger.gauge_value", metricProbes.get(1).getMetricName());
-    assertEquals("ValueScript{dsl='value'}", metricProbes.get(1).getValue().toString());
-    assertEquals("datadog.debugger.refpathvalue", metricProbes.get(2).getMetricName());
-    assertEquals("ValueScript{dsl='obj.field'}", metricProbes.get(2).getValue().toString());
-    assertEquals("datadog.debugger.novalue", metricProbes.get(3).getMetricName());
-  }
+    @Test
+    public void deserializeMetricProbes() throws Exception {
+        String content = TestHelper.getFixtureContent("/test_metric_probe.json");
+        JsonAdapter<Configuration> adapter = MoshiHelper.createMoshiConfig().adapter(Configuration.class);
+        Configuration config = adapter.fromJson(content);
+        ArrayList<MetricProbe> metricProbes = new ArrayList<>(config.getMetricProbes());
+        assertEquals(4, metricProbes.size());
+        assertEquals("datadog.debugger.calls", metricProbes.get(0).getMetricName());
+        assertEquals("ValueScript{dsl='42'}", metricProbes.get(0).getValue().toString());
+        assertEquals("datadog.debugger.gauge_value", metricProbes.get(1).getMetricName());
+        assertEquals("ValueScript{dsl='value'}", metricProbes.get(1).getValue().toString());
+        assertEquals("datadog.debugger.refpathvalue", metricProbes.get(2).getMetricName());
+        assertEquals(
+                "ValueScript{dsl='obj.field'}", metricProbes.get(2).getValue().toString());
+        assertEquals("datadog.debugger.novalue", metricProbes.get(3).getMetricName());
+    }
 
-  @Test
-  public void deserializeSpanProbes() throws Exception {
-    String content = TestHelper.getFixtureContent("/test_span_probe.json");
-    JsonAdapter<Configuration> adapter =
-        MoshiHelper.createMoshiConfig().adapter(Configuration.class);
-    Configuration config = adapter.fromJson(content);
-    List<SpanProbe> spanProbes = new ArrayList<>(config.getSpanProbes());
-    assertEquals(4, spanProbes.size());
-    assertEquals("123356536", spanProbes.get(0).getId());
-    assertEquals("123356537", spanProbes.get(1).getId());
-    assertEquals("123356538", spanProbes.get(2).getId());
-    assertEquals("123356539", spanProbes.get(3).getId());
-  }
+    @Test
+    public void deserializeSpanProbes() throws Exception {
+        String content = TestHelper.getFixtureContent("/test_span_probe.json");
+        JsonAdapter<Configuration> adapter = MoshiHelper.createMoshiConfig().adapter(Configuration.class);
+        Configuration config = adapter.fromJson(content);
+        List<SpanProbe> spanProbes = new ArrayList<>(config.getSpanProbes());
+        assertEquals(4, spanProbes.size());
+        assertEquals("123356536", spanProbes.get(0).getId());
+        assertEquals("123356537", spanProbes.get(1).getId());
+        assertEquals("123356538", spanProbes.get(2).getId());
+        assertEquals("123356539", spanProbes.get(3).getId());
+    }
 
-  @Test
-  public void deserializeSpanDecorationProbes() throws Exception {
-    String content = TestHelper.getFixtureContent("/test_span_decoration_probe.json");
-    JsonAdapter<Configuration> adapter =
-        MoshiHelper.createMoshiConfig().adapter(Configuration.class);
-    Configuration config = adapter.fromJson(content);
-    List<SpanDecorationProbe> spanDecorationProbes =
-        new ArrayList<>(config.getSpanDecorationProbes());
-    assertEquals(4, spanDecorationProbes.size());
-    assertEquals(
-        SpanDecorationProbe.TargetSpan.ACTIVE, spanDecorationProbes.get(0).getTargetSpan());
-    assertEquals(
-        "uuid == 'showMe'",
-        spanDecorationProbes.get(0).getDecorations().get(0).getWhen().getDslExpression());
-    assertEquals(
-        "uuid", spanDecorationProbes.get(0).getDecorations().get(0).getTags().get(0).getName());
-    assertEquals(
-        "uuid={uuid}",
-        spanDecorationProbes
-            .get(0)
-            .getDecorations()
-            .get(0)
-            .getTags()
-            .get(0)
-            .getValue()
-            .getTemplate());
-    assertEquals(
-        SpanDecorationProbe.TargetSpan.ACTIVE, spanDecorationProbes.get(1).getTargetSpan());
-    assertNull(spanDecorationProbes.get(1).getDecorations().get(0).getWhen());
-    assertEquals(
-        "uuid", spanDecorationProbes.get(1).getDecorations().get(0).getTags().get(0).getName());
-    assertEquals(
-        "tag2", spanDecorationProbes.get(1).getDecorations().get(0).getTags().get(1).getName());
-    assertEquals(SpanDecorationProbe.TargetSpan.ROOT, spanDecorationProbes.get(2).getTargetSpan());
-    assertEquals(SpanDecorationProbe.TargetSpan.ROOT, spanDecorationProbes.get(3).getTargetSpan());
-  }
+    @Test
+    public void deserializeSpanDecorationProbes() throws Exception {
+        String content = TestHelper.getFixtureContent("/test_span_decoration_probe.json");
+        JsonAdapter<Configuration> adapter = MoshiHelper.createMoshiConfig().adapter(Configuration.class);
+        Configuration config = adapter.fromJson(content);
+        List<SpanDecorationProbe> spanDecorationProbes = new ArrayList<>(config.getSpanDecorationProbes());
+        assertEquals(4, spanDecorationProbes.size());
+        assertEquals(
+                SpanDecorationProbe.TargetSpan.ACTIVE,
+                spanDecorationProbes.get(0).getTargetSpan());
+        assertEquals(
+                "uuid == 'showMe'",
+                spanDecorationProbes.get(0).getDecorations().get(0).getWhen().getDslExpression());
+        assertEquals(
+                "uuid",
+                spanDecorationProbes
+                        .get(0)
+                        .getDecorations()
+                        .get(0)
+                        .getTags()
+                        .get(0)
+                        .getName());
+        assertEquals(
+                "uuid={uuid}",
+                spanDecorationProbes
+                        .get(0)
+                        .getDecorations()
+                        .get(0)
+                        .getTags()
+                        .get(0)
+                        .getValue()
+                        .getTemplate());
+        assertEquals(
+                SpanDecorationProbe.TargetSpan.ACTIVE,
+                spanDecorationProbes.get(1).getTargetSpan());
+        assertNull(spanDecorationProbes.get(1).getDecorations().get(0).getWhen());
+        assertEquals(
+                "uuid",
+                spanDecorationProbes
+                        .get(1)
+                        .getDecorations()
+                        .get(0)
+                        .getTags()
+                        .get(0)
+                        .getName());
+        assertEquals(
+                "tag2",
+                spanDecorationProbes
+                        .get(1)
+                        .getDecorations()
+                        .get(0)
+                        .getTags()
+                        .get(1)
+                        .getName());
+        assertEquals(
+                SpanDecorationProbe.TargetSpan.ROOT, spanDecorationProbes.get(2).getTargetSpan());
+        assertEquals(
+                SpanDecorationProbe.TargetSpan.ROOT, spanDecorationProbes.get(3).getTargetSpan());
+    }
 
-  @Test
-  public void deserializeLogProbes() throws Exception {
-    String content = TestHelper.getFixtureContent("/test_log_probe.json");
-    JsonAdapter<Configuration> adapter =
-        MoshiHelper.createMoshiConfig().adapter(Configuration.class);
-    Configuration config = adapter.fromJson(content);
-    ArrayList<LogProbe> logProbes = new ArrayList<>(config.getLogProbes());
-    assertEquals(2, logProbes.size());
-    LogProbe logProbe0 = logProbes.get(0);
-    assertEquals(2, logProbe0.getTags().length);
-    assertEquals("dd_watches_dsl", logProbe0.getTags()[0].getKey());
-    assertEquals("{object.objField.intField}", logProbe0.getTags()[0].getValue());
-    assertEquals("env", logProbe0.getTags()[1].getKey());
-    assertEquals("staging", logProbe0.getTags()[1].getValue());
-    assertEquals(8, logProbe0.getSegments().size());
-    assertEquals("this is a log line customized! uuid=", logProbe0.getSegments().get(0).getStr());
-    assertEquals("uuid", logProbe0.getSegments().get(1).getExpr());
-    assertEquals(" result=", logProbe0.getSegments().get(2).getStr());
-    assertEquals("result", logProbe0.getSegments().get(3).getExpr());
-    assertEquals(" garbageStart=", logProbe0.getSegments().get(4).getStr());
-    assertEquals("garbageStart", logProbe0.getSegments().get(5).getExpr());
-    assertEquals(" contain=", logProbe0.getSegments().get(6).getStr());
-    assertEquals("contains(arg, 'foo')", logProbe0.getSegments().get(7).getExpr());
-    LogProbe logProbe1 = logProbes.get(1);
-    assertEquals(2, logProbe1.getCaptureExpressions().size());
-    LogProbe.CaptureExpression captureExpression0 = logProbe1.getCaptureExpressions().get(0);
-    assertEquals("uuid", captureExpression0.getName());
-    assertEquals("uuid", captureExpression0.getExpr().getDsl());
-    assertEquals(5, captureExpression0.getCapture().getMaxReferenceDepth());
-    LogProbe.CaptureExpression captureExpression1 = logProbe1.getCaptureExpressions().get(1);
-    assertEquals("field1_map_key_array_3_field2", captureExpression1.getName());
-    assertEquals("field1.map['key'].array[3].field2", captureExpression1.getExpr().getDsl());
-    assertNull(captureExpression1.getCapture());
-  }
+    @Test
+    public void deserializeLogProbes() throws Exception {
+        String content = TestHelper.getFixtureContent("/test_log_probe.json");
+        JsonAdapter<Configuration> adapter = MoshiHelper.createMoshiConfig().adapter(Configuration.class);
+        Configuration config = adapter.fromJson(content);
+        ArrayList<LogProbe> logProbes = new ArrayList<>(config.getLogProbes());
+        assertEquals(2, logProbes.size());
+        LogProbe logProbe0 = logProbes.get(0);
+        assertEquals(2, logProbe0.getTags().length);
+        assertEquals("dd_watches_dsl", logProbe0.getTags()[0].getKey());
+        assertEquals("{object.objField.intField}", logProbe0.getTags()[0].getValue());
+        assertEquals("env", logProbe0.getTags()[1].getKey());
+        assertEquals("staging", logProbe0.getTags()[1].getValue());
+        assertEquals(8, logProbe0.getSegments().size());
+        assertEquals(
+                "this is a log line customized! uuid=",
+                logProbe0.getSegments().get(0).getStr());
+        assertEquals("uuid", logProbe0.getSegments().get(1).getExpr());
+        assertEquals(" result=", logProbe0.getSegments().get(2).getStr());
+        assertEquals("result", logProbe0.getSegments().get(3).getExpr());
+        assertEquals(" garbageStart=", logProbe0.getSegments().get(4).getStr());
+        assertEquals("garbageStart", logProbe0.getSegments().get(5).getExpr());
+        assertEquals(" contain=", logProbe0.getSegments().get(6).getStr());
+        assertEquals("contains(arg, 'foo')", logProbe0.getSegments().get(7).getExpr());
+        LogProbe logProbe1 = logProbes.get(1);
+        assertEquals(2, logProbe1.getCaptureExpressions().size());
+        LogProbe.CaptureExpression captureExpression0 =
+                logProbe1.getCaptureExpressions().get(0);
+        assertEquals("uuid", captureExpression0.getName());
+        assertEquals("uuid", captureExpression0.getExpr().getDsl());
+        assertEquals(5, captureExpression0.getCapture().getMaxReferenceDepth());
+        LogProbe.CaptureExpression captureExpression1 =
+                logProbe1.getCaptureExpressions().get(1);
+        assertEquals("field1_map_key_array_3_field2", captureExpression1.getName());
+        assertEquals(
+                "field1.map['key'].array[3].field2",
+                captureExpression1.getExpr().getDsl());
+        assertNull(captureExpression1.getCapture());
+    }
 
-  @Test
-  public void roundtripSerialization() throws Exception {
-    deserialize(serialize());
-  }
+    @Test
+    public void roundtripSerialization() throws Exception {
+        deserialize(serialize());
+    }
 
-  @Test
-  public void captureDeserialization() throws IOException {
-    doCaptureDeserialization(
-        "{\"maxReferenceDepth\":3,\"maxCollectionSize\":123,\"maxLength\":242,\"maxFieldCount\":2}",
-        3,
-        123,
-        242,
-        2);
-    doCaptureDeserialization(
-        "{\"maxReferenceDepth\":3}",
-        3,
-        Limits.DEFAULT_COLLECTION_SIZE,
-        Limits.DEFAULT_LENGTH,
-        Limits.DEFAULT_FIELD_COUNT);
-    doCaptureDeserialization(
-        "{\"maxCollectionSize\":123}",
-        Limits.DEFAULT_REFERENCE_DEPTH,
-        123,
-        Limits.DEFAULT_LENGTH,
-        Limits.DEFAULT_FIELD_COUNT);
-    doCaptureDeserialization(
-        "{\"maxLength\":242}",
-        Limits.DEFAULT_REFERENCE_DEPTH,
-        Limits.DEFAULT_COLLECTION_SIZE,
-        242,
-        Limits.DEFAULT_FIELD_COUNT);
-    doCaptureDeserialization(
-        "{\"maxFieldDepth\":7}",
-        Limits.DEFAULT_REFERENCE_DEPTH,
-        Limits.DEFAULT_COLLECTION_SIZE,
-        Limits.DEFAULT_LENGTH,
-        Limits.DEFAULT_FIELD_COUNT);
-    doCaptureDeserialization(
-        "{\"maxFieldCount\":2}",
-        Limits.DEFAULT_REFERENCE_DEPTH,
-        Limits.DEFAULT_COLLECTION_SIZE,
-        Limits.DEFAULT_LENGTH,
-        2);
-  }
+    @Test
+    public void captureDeserialization() throws IOException {
+        doCaptureDeserialization(
+                "{\"maxReferenceDepth\":3,\"maxCollectionSize\":123,\"maxLength\":242,\"maxFieldCount\":2}",
+                3,
+                123,
+                242,
+                2);
+        doCaptureDeserialization(
+                "{\"maxReferenceDepth\":3}",
+                3,
+                Limits.DEFAULT_COLLECTION_SIZE,
+                Limits.DEFAULT_LENGTH,
+                Limits.DEFAULT_FIELD_COUNT);
+        doCaptureDeserialization(
+                "{\"maxCollectionSize\":123}",
+                Limits.DEFAULT_REFERENCE_DEPTH,
+                123,
+                Limits.DEFAULT_LENGTH,
+                Limits.DEFAULT_FIELD_COUNT);
+        doCaptureDeserialization(
+                "{\"maxLength\":242}",
+                Limits.DEFAULT_REFERENCE_DEPTH,
+                Limits.DEFAULT_COLLECTION_SIZE,
+                242,
+                Limits.DEFAULT_FIELD_COUNT);
+        doCaptureDeserialization(
+                "{\"maxFieldDepth\":7}",
+                Limits.DEFAULT_REFERENCE_DEPTH,
+                Limits.DEFAULT_COLLECTION_SIZE,
+                Limits.DEFAULT_LENGTH,
+                Limits.DEFAULT_FIELD_COUNT);
+        doCaptureDeserialization(
+                "{\"maxFieldCount\":2}",
+                Limits.DEFAULT_REFERENCE_DEPTH,
+                Limits.DEFAULT_COLLECTION_SIZE,
+                Limits.DEFAULT_LENGTH,
+                2);
+    }
 
-  private void doCaptureDeserialization(
-      String json,
-      int expectedMaxRef,
-      int expectedMaxCol,
-      int expectedMaxLen,
-      int expectedMaxFieldCount)
-      throws IOException {
-    JsonAdapter<LogProbe.Capture> adapter =
-        MoshiHelper.createMoshiConfig().adapter(LogProbe.Capture.class);
-    LogProbe.Capture capture = adapter.fromJson(json);
-    assertEquals(expectedMaxRef, capture.getMaxReferenceDepth());
-    assertEquals(expectedMaxCol, capture.getMaxCollectionSize());
-    assertEquals(expectedMaxLen, capture.getMaxLength());
-    assertEquals(expectedMaxFieldCount, capture.getMaxFieldCount());
-  }
+    private void doCaptureDeserialization(
+            String json, int expectedMaxRef, int expectedMaxCol, int expectedMaxLen, int expectedMaxFieldCount)
+            throws IOException {
+        JsonAdapter<LogProbe.Capture> adapter = MoshiHelper.createMoshiConfig().adapter(LogProbe.Capture.class);
+        LogProbe.Capture capture = adapter.fromJson(json);
+        assertEquals(expectedMaxRef, capture.getMaxReferenceDepth());
+        assertEquals(expectedMaxCol, capture.getMaxCollectionSize());
+        assertEquals(expectedMaxLen, capture.getMaxLength());
+        assertEquals(expectedMaxFieldCount, capture.getMaxFieldCount());
+    }
 
-  private String serialize() {
-    Configuration config1 = createConfig1();
-    Configuration config2 = createConfig2();
-    List<Configuration> configs = new ArrayList<>(asList(config1, config2));
-    ParameterizedType type = Types.newParameterizedType(List.class, Configuration.class);
-    JsonAdapter<List<Configuration>> adapter = MoshiHelper.createMoshiConfig().adapter(type);
-    return adapter.toJson(configs);
-  }
+    private String serialize() {
+        Configuration config1 = createConfig1();
+        Configuration config2 = createConfig2();
+        List<Configuration> configs = new ArrayList<>(asList(config1, config2));
+        ParameterizedType type = Types.newParameterizedType(List.class, Configuration.class);
+        JsonAdapter<List<Configuration>> adapter =
+                MoshiHelper.createMoshiConfig().adapter(type);
+        return adapter.toJson(configs);
+    }
 
-  private void deserialize(String buffer) throws IOException {
-    ParameterizedType type = Types.newParameterizedType(List.class, Configuration.class);
-    JsonAdapter<List<Configuration>> adapter = MoshiHelper.createMoshiConfig().adapter(type);
-    List<Configuration> configs = adapter.fromJson(buffer);
-    assertEquals(2, configs.size());
-    Configuration config0 = configs.get(0);
-    assertEquals("service1", config0.getService());
-    assertEquals(10.0, config0.getSampling().getEventsPerSecond(), 0.1);
-    // snapshot probe
-    assertEquals(2, config0.getLogProbes().size());
-    List<LogProbe> logProbes0 = new ArrayList<>(config0.getLogProbes());
-    LogProbe snapshotProbe0 = logProbes0.get(0);
-    assertEquals("java.lang.String", snapshotProbe0.getWhere().getTypeName());
-    assertEquals(MethodLocation.ENTRY, snapshotProbe0.getEvaluateAt());
-    assertEquals(2, snapshotProbe0.getTags().length);
-    assertTrue(snapshotProbe0.isCaptureSnapshot());
-    assertEquals("tag1:value1", snapshotProbe0.getTags()[0].toString());
-    assertEquals("tag2:value2", snapshotProbe0.getTags()[1].toString());
-    assertEquals(42.0, snapshotProbe0.getSampling().getEventsPerSecond(), 0.1);
-    Configuration config1 = configs.get(1);
-    assertEquals("service2", config1.getService());
-    assertEquals(2, config1.getLogProbes().size());
-    List<LogProbe> logProbes1 = new ArrayList<>(config1.getLogProbes());
-    LogProbe logProbe1 = logProbes1.get(0);
-    assertEquals("java.util.Map", logProbe1.getWhere().getTypeName());
-    // metric probe
-    assertEquals(1, config0.getMetricProbes().size());
-    MetricProbe metricProbe0 = config0.getMetricProbes().iterator().next();
-    assertEquals("metric_count", metricProbe0.getMetricName());
-    assertEquals(COUNT, metricProbe0.getKind());
-    // log probe
-    assertEquals(2, config0.getLogProbes().size());
-    LogProbe logProbe0 = logProbes0.get(1);
-    assertEquals("this is a log line with arg={arg}", logProbe0.getTemplate());
-    assertEquals(2, logProbe0.getSegments().size());
-    assertEquals("this is a log line with arg=", logProbe0.getSegments().get(0).getStr());
-    assertEquals("arg", logProbe0.getSegments().get(1).getExpr());
-    assertFalse(logProbe0.isCaptureSnapshot());
-    // span probe
-    assertEquals(1, config0.getSpanProbes().size());
-    SpanProbe spanProbe1 = config0.getSpanProbes().iterator().next();
-    SpanProbe spanProbe2 = config1.getSpanProbes().iterator().next();
-    assertEquals("12-23", spanProbe2.getWhere().getLines()[0]);
-    // span decoration probe
-    assertEquals(1, config0.getSpanDecorationProbes().size());
-    SpanDecorationProbe spanDecoration1 = config0.getSpanDecorationProbes().iterator().next();
-    assertEquals(SpanDecorationProbe.TargetSpan.ACTIVE, spanDecoration1.getTargetSpan());
-    assertEquals(
-        "arg1 == 'foo'", spanDecoration1.getDecorations().get(0).getWhen().getDslExpression());
-    assertEquals("id", spanDecoration1.getDecorations().get(0).getTags().get(0).getName());
-    assertEquals(
-        "{id}", spanDecoration1.getDecorations().get(0).getTags().get(0).getValue().getTemplate());
-  }
+    private void deserialize(String buffer) throws IOException {
+        ParameterizedType type = Types.newParameterizedType(List.class, Configuration.class);
+        JsonAdapter<List<Configuration>> adapter =
+                MoshiHelper.createMoshiConfig().adapter(type);
+        List<Configuration> configs = adapter.fromJson(buffer);
+        assertEquals(2, configs.size());
+        Configuration config0 = configs.get(0);
+        assertEquals("service1", config0.getService());
+        assertEquals(10.0, config0.getSampling().getEventsPerSecond(), 0.1);
+        // snapshot probe
+        assertEquals(2, config0.getLogProbes().size());
+        List<LogProbe> logProbes0 = new ArrayList<>(config0.getLogProbes());
+        LogProbe snapshotProbe0 = logProbes0.get(0);
+        assertEquals("java.lang.String", snapshotProbe0.getWhere().getTypeName());
+        assertEquals(MethodLocation.ENTRY, snapshotProbe0.getEvaluateAt());
+        assertEquals(2, snapshotProbe0.getTags().length);
+        assertTrue(snapshotProbe0.isCaptureSnapshot());
+        assertEquals("tag1:value1", snapshotProbe0.getTags()[0].toString());
+        assertEquals("tag2:value2", snapshotProbe0.getTags()[1].toString());
+        assertEquals(42.0, snapshotProbe0.getSampling().getEventsPerSecond(), 0.1);
+        Configuration config1 = configs.get(1);
+        assertEquals("service2", config1.getService());
+        assertEquals(2, config1.getLogProbes().size());
+        List<LogProbe> logProbes1 = new ArrayList<>(config1.getLogProbes());
+        LogProbe logProbe1 = logProbes1.get(0);
+        assertEquals("java.util.Map", logProbe1.getWhere().getTypeName());
+        // metric probe
+        assertEquals(1, config0.getMetricProbes().size());
+        MetricProbe metricProbe0 = config0.getMetricProbes().iterator().next();
+        assertEquals("metric_count", metricProbe0.getMetricName());
+        assertEquals(COUNT, metricProbe0.getKind());
+        // log probe
+        assertEquals(2, config0.getLogProbes().size());
+        LogProbe logProbe0 = logProbes0.get(1);
+        assertEquals("this is a log line with arg={arg}", logProbe0.getTemplate());
+        assertEquals(2, logProbe0.getSegments().size());
+        assertEquals(
+                "this is a log line with arg=", logProbe0.getSegments().get(0).getStr());
+        assertEquals("arg", logProbe0.getSegments().get(1).getExpr());
+        assertFalse(logProbe0.isCaptureSnapshot());
+        // span probe
+        assertEquals(1, config0.getSpanProbes().size());
+        SpanProbe spanProbe1 = config0.getSpanProbes().iterator().next();
+        SpanProbe spanProbe2 = config1.getSpanProbes().iterator().next();
+        assertEquals("12-23", spanProbe2.getWhere().getLines()[0]);
+        // span decoration probe
+        assertEquals(1, config0.getSpanDecorationProbes().size());
+        SpanDecorationProbe spanDecoration1 =
+                config0.getSpanDecorationProbes().iterator().next();
+        assertEquals(SpanDecorationProbe.TargetSpan.ACTIVE, spanDecoration1.getTargetSpan());
+        assertEquals(
+                "arg1 == 'foo'",
+                spanDecoration1.getDecorations().get(0).getWhen().getDslExpression());
+        assertEquals(
+                "id", spanDecoration1.getDecorations().get(0).getTags().get(0).getName());
+        assertEquals(
+                "{id}",
+                spanDecoration1
+                        .getDecorations()
+                        .get(0)
+                        .getTags()
+                        .get(0)
+                        .getValue()
+                        .getTemplate());
+    }
 
-  private Configuration createConfig1() {
-    LogProbe probe1 = createProbe("probe1", "java.lang.String", "indexOf", "(String)");
-    MetricProbe metric1 =
-        createMetric("metric1", "metric_count", COUNT, "java.lang.String", "indexOf", "(String)");
-    LogProbe log1 =
-        createLog(
-            "log1", "this is a log line with arg={arg}", "java.lang.String", "indexOf", "(String)");
-    SpanProbe span1 = createSpan("span1", "java.lang.String", "indexOf", "(String)");
-    TriggerProbe triggerProbe =
-        createTriggerProbe("debug1", "java.lang.String", "indexOf", "(String)")
-            .setSampling(new Sampling(47, 12.0));
+    private Configuration createConfig1() {
+        LogProbe probe1 = createProbe("probe1", "java.lang.String", "indexOf", "(String)");
+        MetricProbe metric1 = createMetric("metric1", "metric_count", COUNT, "java.lang.String", "indexOf", "(String)");
+        LogProbe log1 =
+                createLog("log1", "this is a log line with arg={arg}", "java.lang.String", "indexOf", "(String)");
+        SpanProbe span1 = createSpan("span1", "java.lang.String", "indexOf", "(String)");
+        TriggerProbe triggerProbe = createTriggerProbe("debug1", "java.lang.String", "indexOf", "(String)")
+                .setSampling(new Sampling(47, 12.0));
 
-    SpanDecorationProbe.Decoration decoration =
-        new SpanDecorationProbe.Decoration(
-            new ProbeCondition(
-                DSL.when(DSL.eq(DSL.ref("arg1"), DSL.value("foo"))), "arg1 == 'foo'"),
-            asList(
-                new SpanDecorationProbe.Tag(
-                    "id", new SpanDecorationProbe.TagValue("{id}", parseTemplate("{id}")))));
-    SpanDecorationProbe spanDecoration1 =
-        createDecorationSpan(
-            "decorateSpan1",
-            SpanDecorationProbe.TargetSpan.ACTIVE,
-            decoration,
-            "java.lang.String",
-            "indexOf",
-            "(String)");
-    Configuration.FilterList allowList =
-        new Configuration.FilterList(asList("java.lang.util"), asList("java.lang.String"));
-    Configuration.FilterList denyList =
-        new Configuration.FilterList(
-            asList("java.security"), asList("javax.security.auth.AuthPermission"));
-    LogProbe.Sampling globalSampling = new LogProbe.Sampling(10.0);
-    return new Configuration(
-        "service1",
-        asList(metric1, probe1, log1, span1, triggerProbe, spanDecoration1),
-        allowList,
-        denyList,
-        globalSampling);
-  }
+        SpanDecorationProbe.Decoration decoration = new SpanDecorationProbe.Decoration(
+                new ProbeCondition(DSL.when(DSL.eq(DSL.ref("arg1"), DSL.value("foo"))), "arg1 == 'foo'"),
+                asList(new SpanDecorationProbe.Tag(
+                        "id", new SpanDecorationProbe.TagValue("{id}", parseTemplate("{id}")))));
+        SpanDecorationProbe spanDecoration1 = createDecorationSpan(
+                "decorateSpan1",
+                SpanDecorationProbe.TargetSpan.ACTIVE,
+                decoration,
+                "java.lang.String",
+                "indexOf",
+                "(String)");
+        Configuration.FilterList allowList =
+                new Configuration.FilterList(asList("java.lang.util"), asList("java.lang.String"));
+        Configuration.FilterList denyList =
+                new Configuration.FilterList(asList("java.security"), asList("javax.security.auth.AuthPermission"));
+        LogProbe.Sampling globalSampling = new LogProbe.Sampling(10.0);
+        return new Configuration(
+                "service1",
+                asList(metric1, probe1, log1, span1, triggerProbe, spanDecoration1),
+                allowList,
+                denyList,
+                globalSampling);
+    }
 
-  private Configuration createConfig2() {
-    LogProbe probe2 = createProbe("probe2", "java.util.Map", "put", null);
-    MetricProbe metric2 =
-        createMetric("metric2", "metric_gauge", GAUGE, "java.lang.String", "indexOf", "(String)");
-    LogProbe log2 =
-        createLog(
-            "log2",
-            "{transactionId}={transactionStatus}, remaining: {{{count(transactions)}}}",
-            "java.lang.String",
-            "indexOf",
-            "(String)");
-    SpanProbe span2 = createSpan("span2", "String.java", 12, 23);
-    TriggerProbe triggerProbe = createTriggerProbe("debug1", "String.java", "indexOf", "(String)");
+    private Configuration createConfig2() {
+        LogProbe probe2 = createProbe("probe2", "java.util.Map", "put", null);
+        MetricProbe metric2 = createMetric("metric2", "metric_gauge", GAUGE, "java.lang.String", "indexOf", "(String)");
+        LogProbe log2 = createLog(
+                "log2",
+                "{transactionId}={transactionStatus}, remaining: {{{count(transactions)}}}",
+                "java.lang.String",
+                "indexOf",
+                "(String)");
+        SpanProbe span2 = createSpan("span2", "String.java", 12, 23);
+        TriggerProbe triggerProbe = createTriggerProbe("debug1", "String.java", "indexOf", "(String)");
 
-    SpanDecorationProbe.Decoration decoration =
-        new SpanDecorationProbe.Decoration(
-            new ProbeCondition(DSL.when(DSL.eq(DSL.ref("arg"), DSL.value("foo"))), "arg == 'foo'"),
-            asList(
-                new SpanDecorationProbe.Tag(
-                    "tag1", new SpanDecorationProbe.TagValue("{arg1}", parseTemplate("{arg1}"))),
-                new SpanDecorationProbe.Tag(
-                    "tag2", new SpanDecorationProbe.TagValue("{arg2}", parseTemplate("{arg2}")))));
-    SpanDecorationProbe spanDecoration2 =
-        createDecorationSpan(
-            "span2",
-            SpanDecorationProbe.TargetSpan.ACTIVE,
-            decoration,
-            "String.java",
-            "indexOf",
-            "(String)");
-    Configuration.FilterList allowList =
-        new Configuration.FilterList(asList("java.lang.util"), asList("java.lang.String"));
-    Configuration.FilterList denyList =
-        new Configuration.FilterList(
-            asList("java.security"), asList("javax.security.auth.AuthPermission"));
-    LogProbe.Sampling globalSampling = new LogProbe.Sampling(10.0);
-    return new Configuration(
-        "service2",
-        asList(metric2, probe2, log2, span2, triggerProbe, spanDecoration2),
-        allowList,
-        denyList,
-        globalSampling);
-  }
+        SpanDecorationProbe.Decoration decoration = new SpanDecorationProbe.Decoration(
+                new ProbeCondition(DSL.when(DSL.eq(DSL.ref("arg"), DSL.value("foo"))), "arg == 'foo'"),
+                asList(
+                        new SpanDecorationProbe.Tag(
+                                "tag1", new SpanDecorationProbe.TagValue("{arg1}", parseTemplate("{arg1}"))),
+                        new SpanDecorationProbe.Tag(
+                                "tag2", new SpanDecorationProbe.TagValue("{arg2}", parseTemplate("{arg2}")))));
+        SpanDecorationProbe spanDecoration2 = createDecorationSpan(
+                "span2", SpanDecorationProbe.TargetSpan.ACTIVE, decoration, "String.java", "indexOf", "(String)");
+        Configuration.FilterList allowList =
+                new Configuration.FilterList(asList("java.lang.util"), asList("java.lang.String"));
+        Configuration.FilterList denyList =
+                new Configuration.FilterList(asList("java.security"), asList("javax.security.auth.AuthPermission"));
+        LogProbe.Sampling globalSampling = new LogProbe.Sampling(10.0);
+        return new Configuration(
+                "service2",
+                asList(metric2, probe2, log2, span2, triggerProbe, spanDecoration2),
+                allowList,
+                denyList,
+                globalSampling);
+    }
 
-  private static LogProbe createProbe(
-      String id, String typeName, String methodName, String signature) {
-    return LogProbe.builder()
-        .language("java")
-        .probeId(id, 0)
-        .captureSnapshot(true)
-        .where(typeName, methodName, signature)
-        .capture(
-            Limits.DEFAULT_REFERENCE_DEPTH,
-            Limits.DEFAULT_COLLECTION_SIZE,
-            Limits.DEFAULT_LENGTH,
-            Limits.DEFAULT_FIELD_COUNT)
-        .tags("tag1:value1", "tag2:value2")
-        .sampling(42.0)
-        .evaluateAt(MethodLocation.ENTRY)
-        .build();
-  }
+    private static LogProbe createProbe(String id, String typeName, String methodName, String signature) {
+        return LogProbe.builder()
+                .language("java")
+                .probeId(id, 0)
+                .captureSnapshot(true)
+                .where(typeName, methodName, signature)
+                .capture(
+                        Limits.DEFAULT_REFERENCE_DEPTH,
+                        Limits.DEFAULT_COLLECTION_SIZE,
+                        Limits.DEFAULT_LENGTH,
+                        Limits.DEFAULT_FIELD_COUNT)
+                .tags("tag1:value1", "tag2:value2")
+                .sampling(42.0)
+                .evaluateAt(MethodLocation.ENTRY)
+                .build();
+    }
 
-  private static MetricProbe createMetric(
-      String id,
-      String metricName,
-      MetricProbe.MetricKind metricKind,
-      String typeName,
-      String methodName,
-      String signature) {
-    return MetricProbe.builder()
-        .language("java")
-        .probeId(id, 0)
-        .where(typeName, methodName, signature)
-        .evaluateAt(MethodLocation.ENTRY)
-        .metricName(metricName)
-        .kind(metricKind)
-        .tags("tag1:value1", "tag2:value2")
-        .build();
-  }
+    private static MetricProbe createMetric(
+            String id,
+            String metricName,
+            MetricProbe.MetricKind metricKind,
+            String typeName,
+            String methodName,
+            String signature) {
+        return MetricProbe.builder()
+                .language("java")
+                .probeId(id, 0)
+                .where(typeName, methodName, signature)
+                .evaluateAt(MethodLocation.ENTRY)
+                .metricName(metricName)
+                .kind(metricKind)
+                .tags("tag1:value1", "tag2:value2")
+                .build();
+    }
 
-  private static LogProbe createLog(
-      String id, String template, String typeName, String methodName, String signature) {
-    return LogProbe.builder()
-        .language("java")
-        .probeId(id, 0)
-        .captureSnapshot(false)
-        .where(typeName, methodName, signature)
-        .evaluateAt(MethodLocation.ENTRY)
-        .template(template, parseTemplate(template))
-        .tags("tag1:value1", "tag2:value2")
-        .build();
-  }
+    private static LogProbe createLog(
+            String id, String template, String typeName, String methodName, String signature) {
+        return LogProbe.builder()
+                .language("java")
+                .probeId(id, 0)
+                .captureSnapshot(false)
+                .where(typeName, methodName, signature)
+                .evaluateAt(MethodLocation.ENTRY)
+                .template(template, parseTemplate(template))
+                .tags("tag1:value1", "tag2:value2")
+                .build();
+    }
 
-  private static TriggerProbe createTriggerProbe(
-      String id, String typeName, String methodName, String signature) {
-    return TriggerProbe.builder()
-        .probeId(new ProbeId(id, 0))
-        .where(typeName, methodName, signature)
-        .build();
-  }
+    private static TriggerProbe createTriggerProbe(String id, String typeName, String methodName, String signature) {
+        return TriggerProbe.builder()
+                .probeId(new ProbeId(id, 0))
+                .where(typeName, methodName, signature)
+                .build();
+    }
 
-  private static SpanProbe createSpan(
-      String id, String typeName, String methodName, String signature) {
-    return SpanProbe.builder()
-        .language("java")
-        .probeId(id, 0)
-        .where(typeName, methodName, signature)
-        .evaluateAt(MethodLocation.ENTRY)
-        .tags("tag1:value1", "tag2:value2")
-        .build();
-  }
+    private static SpanProbe createSpan(String id, String typeName, String methodName, String signature) {
+        return SpanProbe.builder()
+                .language("java")
+                .probeId(id, 0)
+                .where(typeName, methodName, signature)
+                .evaluateAt(MethodLocation.ENTRY)
+                .tags("tag1:value1", "tag2:value2")
+                .build();
+    }
 
-  private static SpanDecorationProbe createDecorationSpan(
-      String id,
-      SpanDecorationProbe.TargetSpan targetSpan,
-      SpanDecorationProbe.Decoration decoration,
-      String typeName,
-      String methodName,
-      String signature) {
-    return SpanDecorationProbe.builder()
-        .language("java")
-        .probeId(id, 0)
-        .where(typeName, methodName, signature)
-        .evaluateAt(MethodLocation.ENTRY)
-        .tags("tag1:value1", "tag2:value2")
-        .targetSpan(targetSpan)
-        .decorations(decoration)
-        .build();
-  }
+    private static SpanDecorationProbe createDecorationSpan(
+            String id,
+            SpanDecorationProbe.TargetSpan targetSpan,
+            SpanDecorationProbe.Decoration decoration,
+            String typeName,
+            String methodName,
+            String signature) {
+        return SpanDecorationProbe.builder()
+                .language("java")
+                .probeId(id, 0)
+                .where(typeName, methodName, signature)
+                .evaluateAt(MethodLocation.ENTRY)
+                .tags("tag1:value1", "tag2:value2")
+                .targetSpan(targetSpan)
+                .decorations(decoration)
+                .build();
+    }
 
-  private static SpanProbe createSpan(String id, String sourceFile, int lineFrom, int lineTill) {
-    return SpanProbe.builder()
-        .language("java")
-        .probeId(id, 0)
-        .where(sourceFile, lineFrom, lineTill)
-        .tags("tag1:value1", "tag2:value2")
-        .build();
-  }
+    private static SpanProbe createSpan(String id, String sourceFile, int lineFrom, int lineTill) {
+        return SpanProbe.builder()
+                .language("java")
+                .probeId(id, 0)
+                .where(sourceFile, lineFrom, lineTill)
+                .tags("tag1:value1", "tag2:value2")
+                .build();
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationUpdaterTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationUpdaterTest.java
index c8270e2e956..521d82632a7 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationUpdaterTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationUpdaterTest.java
@@ -76,822 +76,849 @@
 
 @ExtendWith(MockitoExtension.class)
 public class ConfigurationUpdaterTest {
-  private static final String LANGUAGE = "java";
-  private static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 42);
-  private static final ProbeId PROBE_ID2 = new ProbeId("beae1808-f3b0-4ea8-a74f-826790c5e6f8", 12);
-  private static final ProbeId METRIC_ID = new ProbeId("cfbf2918-e4c1-5fb9-b85e-937881d6f7e9", 1);
-  private static final ProbeId METRIC_ID2 = new ProbeId("cfbf2919-e4c1-5fb9-b85e-937881d6f7e9", 5);
-  private static final ProbeId LOG_ID = new ProbeId("d0c03a2a-f5d2-60ca-c96f-a48992e708fa", 2);
-  private static final ProbeId LOG_ID2 = new ProbeId("d0c03a2b-f5d2-60ca-c96f-a48992e708fa", 6);
-  private static final ProbeId SPAN_ID = new ProbeId("cfbf2918-e4c1-5fb9-b85e-937881d6f7e9", 1);
-  private static final ProbeId SPAN_DECORATION_ID =
-      new ProbeId("cfbf2918-e4c1-5fb9-b85e-937881d6f7e9", 1);
-
-  @Mock private Instrumentation inst;
-  @Mock private DebuggerTransformer transformer;
-  @Mock private Config tracerConfig;
-  @Mock private DebuggerSink debuggerSink;
-  @Mock private ProbeStatusSink probeStatusSink;
-
-  private DebuggerSink debuggerSinkWithMockStatusSink;
-
-  @BeforeEach
-  void setUp() {
-    lenient().when(tracerConfig.getFinalDebuggerSnapshotUrl()).thenReturn("http://localhost");
-    lenient().when(tracerConfig.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
-    lenient().when(tracerConfig.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost");
-
-    debuggerSinkWithMockStatusSink = new DebuggerSink(tracerConfig, probeStatusSink);
-  }
-
-  @Test
-  public void acceptNoProbes() {
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
-    configurationUpdater.accept(REMOTE_CONFIG, null);
-    verify(inst, never()).addTransformer(any(), eq(true));
-    verifyNoInteractions(debuggerSink);
-  }
-
-  @Test
-  public void acceptNewProbe() {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
-    List<LogProbe> logProbes =
-        singletonList(
-            LogProbe.builder().probeId(PROBE_ID).where("java.lang.String", "concat").build());
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    verify(inst).addTransformer(any(), eq(true));
-    verify(inst).getAllLoadedClasses();
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(1, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
-    verify(probeStatusSink).addReceived(eq(PROBE_ID));
-  }
-
-  @Test
-  public void acceptNewMultiProbes() throws UnmodifiableClassException {
-    doTestAcceptMultiProbes(Class::getName, String.class, HashMap.class);
-  }
-
-  @Test
-  public void acceptNewMultiProbesSimpleName() throws UnmodifiableClassException {
-    doTestAcceptMultiProbes(Class::getSimpleName, String.class, HashMap.class);
-  }
-
-  private void doTestAcceptMultiProbes(Function<Class<?>, String> getClassName, Class<?>... classes)
-      throws UnmodifiableClassException {
-    when(inst.getAllLoadedClasses()).thenReturn(classes);
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
-    List<LogProbe> logProbes =
-        Arrays.stream(classes)
-            .map(getClassName)
-            .map(className -> LogProbe.builder().probeId(PROBE_ID).where(className, "foo").build())
-            .collect(Collectors.toList());
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    verify(inst).addTransformer(any(), eq(true));
-    verify(inst).getAllLoadedClasses();
-    for (Class<?> expectedClass : classes) {
-      verify(inst).retransformClasses(eq(expectedClass));
-    }
-    verify(probeStatusSink, times(2)).addReceived(eq(PROBE_ID));
-  }
-
-  @Test
-  public void acceptDuplicatedProbes() {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
-    List<LogProbe> logProbes =
-        Arrays.asList(
-            LogProbe.builder().probeId(PROBE_ID).where("java.lang.String", "concat").build(),
-            LogProbe.builder().probeId(PROBE_ID2).where("java.lang.String", "concat").build());
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    verify(inst).addTransformer(any(), eq(true));
-    verify(inst).getAllLoadedClasses();
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(2, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
-    assertTrue(appliedDefinitions.containsKey(PROBE_ID2.getEncodedId()));
-    verify(probeStatusSink).addReceived(eq(PROBE_ID));
-    verify(probeStatusSink).addReceived(eq(PROBE_ID2));
-  }
-
-  @Test
-  public void accept2PhaseDuplicatedProbes() {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
-    // phase 1: single probe definition
-    List<LogProbe> logProbes =
-        Arrays.asList(
-            LogProbe.builder().probeId(PROBE_ID).where("java.lang.String", "concat").build());
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    verify(inst).addTransformer(any(), eq(true));
-    verify(inst).getAllLoadedClasses();
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(1, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
-    // phase 2: add duplicated probe definitions
-    logProbes =
-        Arrays.asList(
-            LogProbe.builder().probeId(PROBE_ID).where("java.lang.String", "concat").build(),
-            LogProbe.builder().probeId(PROBE_ID2).where("java.lang.String", "concat").build());
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(2, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(PROBE_ID2.getEncodedId()));
-    verify(probeStatusSink).addReceived(eq(PROBE_ID));
-    verify(probeStatusSink).addReceived(eq(PROBE_ID2));
-  }
-
-  @Test
-  public void acceptRemoveDuplicatedProbes() {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
-    // phase 1: duplicated probe definition
-    List<LogProbe> logProbes =
-        Arrays.asList(
-            LogProbe.builder().probeId(PROBE_ID).where("java.lang.String", "concat").build(),
-            LogProbe.builder().probeId(PROBE_ID2).where("java.lang.String", "concat").build());
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    verify(inst).addTransformer(any(), eq(true));
-    verify(inst).getAllLoadedClasses();
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(2, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
-    assertTrue(appliedDefinitions.containsKey(PROBE_ID2.getEncodedId()));
-    // phase 2: remove duplicated probe definitions
-    logProbes =
-        Arrays.asList(
-            LogProbe.builder().probeId(PROBE_ID).where("java.lang.String", "concat").build());
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(1, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
-    verify(probeStatusSink).addReceived(eq(PROBE_ID));
-    verify(probeStatusSink).addReceived(eq(PROBE_ID2));
-    verify(probeStatusSink).removeDiagnostics(eq(PROBE_ID2));
-  }
-
-  @Test
-  public void acceptDontDedupMetricProbes() {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
-    List<LogProbe> logProbes =
-        Arrays.asList(
-            LogProbe.builder().probeId(PROBE_ID).where("java.lang.String", "concat").build());
-    List<MetricProbe> metricProbes =
-        Arrays.asList(
-            MetricProbe.builder().probeId(METRIC_ID).where("java.lang.String", "concat").build());
-    List<ProbeDefinition> definitions = new ArrayList<>(metricProbes);
-    definitions.addAll(logProbes);
-    configurationUpdater.accept(REMOTE_CONFIG, definitions);
-    verify(inst).addTransformer(any(), eq(true));
-    verify(inst).getAllLoadedClasses();
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(2, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
-    assertTrue(appliedDefinitions.containsKey(METRIC_ID.getEncodedId()));
-    verify(probeStatusSink).addReceived(eq(PROBE_ID));
-    verify(probeStatusSink).addReceived(eq(METRIC_ID));
-  }
-
-  @Test
-  public void acceptSourceFileLineNumber() throws UnmodifiableClassException {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
-    List<LogProbe> logProbes =
-        singletonList(
-            LogProbe.builder()
+    private static final String LANGUAGE = "java";
+    private static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 42);
+    private static final ProbeId PROBE_ID2 = new ProbeId("beae1808-f3b0-4ea8-a74f-826790c5e6f8", 12);
+    private static final ProbeId METRIC_ID = new ProbeId("cfbf2918-e4c1-5fb9-b85e-937881d6f7e9", 1);
+    private static final ProbeId METRIC_ID2 = new ProbeId("cfbf2919-e4c1-5fb9-b85e-937881d6f7e9", 5);
+    private static final ProbeId LOG_ID = new ProbeId("d0c03a2a-f5d2-60ca-c96f-a48992e708fa", 2);
+    private static final ProbeId LOG_ID2 = new ProbeId("d0c03a2b-f5d2-60ca-c96f-a48992e708fa", 6);
+    private static final ProbeId SPAN_ID = new ProbeId("cfbf2918-e4c1-5fb9-b85e-937881d6f7e9", 1);
+    private static final ProbeId SPAN_DECORATION_ID = new ProbeId("cfbf2918-e4c1-5fb9-b85e-937881d6f7e9", 1);
+
+    @Mock
+    private Instrumentation inst;
+
+    @Mock
+    private DebuggerTransformer transformer;
+
+    @Mock
+    private Config tracerConfig;
+
+    @Mock
+    private DebuggerSink debuggerSink;
+
+    @Mock
+    private ProbeStatusSink probeStatusSink;
+
+    private DebuggerSink debuggerSinkWithMockStatusSink;
+
+    @BeforeEach
+    void setUp() {
+        lenient().when(tracerConfig.getFinalDebuggerSnapshotUrl()).thenReturn("http://localhost");
+        lenient().when(tracerConfig.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
+        lenient().when(tracerConfig.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost");
+
+        debuggerSinkWithMockStatusSink = new DebuggerSink(tracerConfig, probeStatusSink);
+    }
+
+    @Test
+    public void acceptNoProbes() {
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
+        configurationUpdater.accept(REMOTE_CONFIG, null);
+        verify(inst, never()).addTransformer(any(), eq(true));
+        verifyNoInteractions(debuggerSink);
+    }
+
+    @Test
+    public void acceptNewProbe() {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
+        List<LogProbe> logProbes = singletonList(LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("java.lang.String", "concat")
+                .build());
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        verify(inst).addTransformer(any(), eq(true));
+        verify(inst).getAllLoadedClasses();
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(1, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
+        verify(probeStatusSink).addReceived(eq(PROBE_ID));
+    }
+
+    @Test
+    public void acceptNewMultiProbes() throws UnmodifiableClassException {
+        doTestAcceptMultiProbes(Class::getName, String.class, HashMap.class);
+    }
+
+    @Test
+    public void acceptNewMultiProbesSimpleName() throws UnmodifiableClassException {
+        doTestAcceptMultiProbes(Class::getSimpleName, String.class, HashMap.class);
+    }
+
+    private void doTestAcceptMultiProbes(Function<Class<?>, String> getClassName, Class<?>... classes)
+            throws UnmodifiableClassException {
+        when(inst.getAllLoadedClasses()).thenReturn(classes);
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
+        List<LogProbe> logProbes = Arrays.stream(classes)
+                .map(getClassName)
+                .map(className -> LogProbe.builder()
+                        .probeId(PROBE_ID)
+                        .where(className, "foo")
+                        .build())
+                .collect(Collectors.toList());
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        verify(inst).addTransformer(any(), eq(true));
+        verify(inst).getAllLoadedClasses();
+        for (Class<?> expectedClass : classes) {
+            verify(inst).retransformClasses(eq(expectedClass));
+        }
+        verify(probeStatusSink, times(2)).addReceived(eq(PROBE_ID));
+    }
+
+    @Test
+    public void acceptDuplicatedProbes() {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
+        List<LogProbe> logProbes = Arrays.asList(
+                LogProbe.builder()
+                        .probeId(PROBE_ID)
+                        .where("java.lang.String", "concat")
+                        .build(),
+                LogProbe.builder()
+                        .probeId(PROBE_ID2)
+                        .where("java.lang.String", "concat")
+                        .build());
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        verify(inst).addTransformer(any(), eq(true));
+        verify(inst).getAllLoadedClasses();
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(2, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
+        assertTrue(appliedDefinitions.containsKey(PROBE_ID2.getEncodedId()));
+        verify(probeStatusSink).addReceived(eq(PROBE_ID));
+        verify(probeStatusSink).addReceived(eq(PROBE_ID2));
+    }
+
+    @Test
+    public void accept2PhaseDuplicatedProbes() {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
+        // phase 1: single probe definition
+        List<LogProbe> logProbes = Arrays.asList(LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("java.lang.String", "concat")
+                .build());
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        verify(inst).addTransformer(any(), eq(true));
+        verify(inst).getAllLoadedClasses();
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(1, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
+        // phase 2: add duplicated probe definitions
+        logProbes = Arrays.asList(
+                LogProbe.builder()
+                        .probeId(PROBE_ID)
+                        .where("java.lang.String", "concat")
+                        .build(),
+                LogProbe.builder()
+                        .probeId(PROBE_ID2)
+                        .where("java.lang.String", "concat")
+                        .build());
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(2, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(PROBE_ID2.getEncodedId()));
+        verify(probeStatusSink).addReceived(eq(PROBE_ID));
+        verify(probeStatusSink).addReceived(eq(PROBE_ID2));
+    }
+
+    @Test
+    public void acceptRemoveDuplicatedProbes() {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
+        // phase 1: duplicated probe definition
+        List<LogProbe> logProbes = Arrays.asList(
+                LogProbe.builder()
+                        .probeId(PROBE_ID)
+                        .where("java.lang.String", "concat")
+                        .build(),
+                LogProbe.builder()
+                        .probeId(PROBE_ID2)
+                        .where("java.lang.String", "concat")
+                        .build());
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        verify(inst).addTransformer(any(), eq(true));
+        verify(inst).getAllLoadedClasses();
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(2, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
+        assertTrue(appliedDefinitions.containsKey(PROBE_ID2.getEncodedId()));
+        // phase 2: remove duplicated probe definitions
+        logProbes = Arrays.asList(LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("java.lang.String", "concat")
+                .build());
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(1, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
+        verify(probeStatusSink).addReceived(eq(PROBE_ID));
+        verify(probeStatusSink).addReceived(eq(PROBE_ID2));
+        verify(probeStatusSink).removeDiagnostics(eq(PROBE_ID2));
+    }
+
+    @Test
+    public void acceptDontDedupMetricProbes() {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
+        List<LogProbe> logProbes = Arrays.asList(LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("java.lang.String", "concat")
+                .build());
+        List<MetricProbe> metricProbes = Arrays.asList(MetricProbe.builder()
+                .probeId(METRIC_ID)
+                .where("java.lang.String", "concat")
+                .build());
+        List<ProbeDefinition> definitions = new ArrayList<>(metricProbes);
+        definitions.addAll(logProbes);
+        configurationUpdater.accept(REMOTE_CONFIG, definitions);
+        verify(inst).addTransformer(any(), eq(true));
+        verify(inst).getAllLoadedClasses();
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(2, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
+        assertTrue(appliedDefinitions.containsKey(METRIC_ID.getEncodedId()));
+        verify(probeStatusSink).addReceived(eq(PROBE_ID));
+        verify(probeStatusSink).addReceived(eq(METRIC_ID));
+    }
+
+    @Test
+    public void acceptSourceFileLineNumber() throws UnmodifiableClassException {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
+        List<LogProbe> logProbes = singletonList(LogProbe.builder()
                 .probeId(PROBE_ID)
                 .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
                 .build());
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    verify(inst).addTransformer(any(), eq(true));
-    verify(inst).getAllLoadedClasses();
-    verify(inst).retransformClasses(eq(String.class));
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(1, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
-  }
-
-  @Test
-  public void acceptSourceFileLineNumberEmptyTypeName() throws UnmodifiableClassException {
-    // create anonymous class for dealing with Class#getSimpleName returning empty string for it
-    Runnable runnable =
-        new Runnable() {
-          @Override
-          public void run() {}
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        verify(inst).addTransformer(any(), eq(true));
+        verify(inst).getAllLoadedClasses();
+        verify(inst).retransformClasses(eq(String.class));
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(1, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
+    }
+
+    @Test
+    public void acceptSourceFileLineNumberEmptyTypeName() throws UnmodifiableClassException {
+        // create anonymous class for dealing with Class#getSimpleName returning empty string for it
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {}
         };
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class, runnable.getClass()});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
-    List<LogProbe> logProbes =
-        singletonList(
-            LogProbe.builder()
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class, runnable.getClass()});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
+        List<LogProbe> logProbes = singletonList(LogProbe.builder()
                 .probeId(PROBE_ID)
                 .where("", "", "", 1966, "java/lang/String.java")
                 .build());
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    verify(inst).addTransformer(any(), eq(true));
-    verify(inst).getAllLoadedClasses();
-    verify(inst).retransformClasses(eq(String.class));
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(1, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
-  }
-
-  @Test
-  public void acceptSourceFileLineNumberAnonymousClass() throws UnmodifiableClassException {
-    Runnable runnable =
-        new Runnable() {
-          @Override
-          public void run() {}
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        verify(inst).addTransformer(any(), eq(true));
+        verify(inst).getAllLoadedClasses();
+        verify(inst).retransformClasses(eq(String.class));
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(1, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
+    }
+
+    @Test
+    public void acceptSourceFileLineNumberAnonymousClass() throws UnmodifiableClassException {
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {}
         };
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class, runnable.getClass()});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
-    List<LogProbe> logProbes =
-        singletonList(
-            LogProbe.builder()
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class, runnable.getClass()});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
+        List<LogProbe> logProbes = singletonList(LogProbe.builder()
                 .probeId(PROBE_ID)
                 .where("", "", "", 136, "ConfigurationUpdaterTest$2")
                 .build());
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    verify(inst).addTransformer(any(), eq(true));
-    verify(inst).getAllLoadedClasses();
-    verify(inst).retransformClasses(eq(runnable.getClass()));
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(1, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
-  }
-
-  @Test
-  public void acceptDeleteProbe() throws UnmodifiableClassException {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class, HashMap.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
-    LogProbe probe1 =
-        LogProbe.builder()
-            .language(LANGUAGE)
-            .probeId(PROBE_ID)
-            .where("java.lang.String", "concat")
-            .build();
-    LogProbe probe2 =
-        LogProbe.builder()
-            .language(LANGUAGE)
-            .probeId(PROBE_ID2)
-            .where("java.util.HashMap", "<init>", "void ()")
-            .build();
-    List<LogProbe> logProbes = Arrays.asList(probe1, probe2);
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    verify(probeStatusSink).addReceived(eq(PROBE_ID));
-    verify(probeStatusSink).addReceived(eq(PROBE_ID2));
-    logProbes = singletonList(probe1);
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    verify(probeStatusSink).removeDiagnostics(eq(PROBE_ID2));
-    verify(inst).removeTransformer(any());
-    ArgumentCaptor<Class<?>[]> captor = ArgumentCaptor.forClass(Class[].class);
-    verify(inst, times(3)).retransformClasses(captor.capture());
-    List<Class<?>[]> allValues = captor.getAllValues();
-    assertEquals(String.class, allValues.get(0));
-    assertEquals(HashMap.class, allValues.get(1));
-    assertEquals(HashMap.class, allValues.get(2)); // for removing instrumentation
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    Assertions.assertEquals(1, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(probe1.getProbeId().getEncodedId()));
-  }
-
-  @Test
-  public void acceptDeleteProbeSameClass() throws UnmodifiableClassException {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    AtomicInteger expectedDefinitions = new AtomicInteger(2);
-    ConfigurationUpdater configurationUpdater =
-        new ConfigurationUpdater(
-            inst,
-            (tracerConfig, configuration, listener, probeMetadata, debuggerSink) -> {
-              assertEquals(expectedDefinitions.get(), configuration.getDefinitions().size());
-              return transformer;
-            },
-            tracerConfig,
-            debuggerSinkWithMockStatusSink,
-            new ClassesToRetransformFinder());
-    LogProbe probe1 =
-        LogProbe.builder()
-            .language(LANGUAGE)
-            .probeId(PROBE_ID)
-            .where("java.lang.String", "concat")
-            .build();
-    LogProbe probe2 =
-        LogProbe.builder()
-            .language(LANGUAGE)
-            .probeId(PROBE_ID2)
-            .where("java.lang.String", "indexOf", "int (int)")
-            .build();
-    List<LogProbe> logProbes = Arrays.asList(probe1, probe2);
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    verify(probeStatusSink).addReceived(eq(PROBE_ID));
-    verify(probeStatusSink).addReceived(eq(PROBE_ID2));
-    logProbes = singletonList(probe1);
-    expectedDefinitions.set(1);
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    verify(probeStatusSink).removeDiagnostics(eq(PROBE_ID2));
-    verify(inst).removeTransformer(any());
-    ArgumentCaptor<Class<?>[]> captor = ArgumentCaptor.forClass(Class[].class);
-    verify(inst, times(2)).retransformClasses(captor.capture());
-    List<Class<?>[]> allValues = captor.getAllValues();
-    assertEquals(String.class, allValues.get(0));
-    assertEquals(String.class, allValues.get(1));
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    Assertions.assertEquals(1, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(probe1.getProbeId().getEncodedId()));
-  }
-
-  @Test
-  public void acceptClearProbes() throws UnmodifiableClassException {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
-    List<LogProbe> logProbes =
-        singletonList(
-            LogProbe.builder().probeId(PROBE_ID).where("java.lang.String", "concat").build());
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    verify(probeStatusSink).addReceived(eq(PROBE_ID));
-    configurationUpdater.accept(REMOTE_CONFIG, null);
-    verify(probeStatusSink).removeDiagnostics(eq(PROBE_ID));
-    verify(inst).removeTransformer(any());
-    verify(inst, times(2)).retransformClasses(any());
-    Assertions.assertEquals(0, configurationUpdater.getAppliedDefinitions().size());
-  }
-
-  @Test
-  public void acceptMustAppliedAtomically() throws Exception {
-    // Regression test: ConfigurationUpdater::accept must apply the whole read-modify-write
-    // sequence (definitionSources.put + createConfiguration + applyNewConfiguration) under a
-    // single lock, otherwise concurrent accept() calls from different sources can race on the
-    // shared EnumMap and cause one source's definitions to be lost when currentConfiguration is
-    // overwritten with a configuration snapshot that doesn't yet reflect the other source's put.
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
-    ConfigurationAcceptor.Source[] sources = ConfigurationAcceptor.Source.values();
-    ExecutorService executor = Executors.newFixedThreadPool(sources.length);
-    try {
-      int iterations = 100;
-      for (int i = 0; i < iterations; i++) {
-        CyclicBarrier barrier = new CyclicBarrier(sources.length);
-        List<ProbeId> expectedProbeIds = new ArrayList<>();
-        List<Future<?>> futures = new ArrayList<>();
-        for (ConfigurationAcceptor.Source source : sources) {
-          ProbeId probeId = new ProbeId("probe-" + source + "-" + i, i);
-          expectedProbeIds.add(probeId);
-          LogProbe probe =
-              LogProbe.builder().probeId(probeId).where("java.lang.String", "concat").build();
-          futures.add(
-              executor.submit(
-                  () -> {
-                    barrier.await();
-                    configurationUpdater.accept(source, singletonList(probe));
-                    return null;
-                  }));
-        }
-        for (Future<?> future : futures) {
-          future.get();
-        }
-        Map<String, ProbeDefinition> appliedDefinitions =
-            configurationUpdater.getAppliedDefinitions();
-        assertEquals(
-            sources.length,
-            appliedDefinitions.size(),
-            "Lost definition(s) from a concurrent source update at iteration " + i);
-        for (ProbeId expectedProbeId : expectedProbeIds) {
-          assertTrue(appliedDefinitions.containsKey(expectedProbeId.getEncodedId()));
-        }
-      }
-    } finally {
-      executor.shutdown();
-    }
-  }
-
-  @Test
-  public void resolve() {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
-    List<LogProbe> logProbes =
-        singletonList(
-            LogProbe.builder()
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        verify(inst).addTransformer(any(), eq(true));
+        verify(inst).getAllLoadedClasses();
+        verify(inst).retransformClasses(eq(runnable.getClass()));
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(1, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(PROBE_ID.getEncodedId()));
+    }
+
+    @Test
+    public void acceptDeleteProbe() throws UnmodifiableClassException {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class, HashMap.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
+        LogProbe probe1 = LogProbe.builder()
+                .language(LANGUAGE)
                 .probeId(PROBE_ID)
                 .where("java.lang.String", "concat")
-                .when(
-                    new ProbeCondition(
-                        DSL.when(DSL.eq(DSL.ref("arg"), DSL.value("foo"))), "arg == 'foo'"))
-                .build());
-    logProbes.get(0).buildLocation(null);
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    configurationUpdater.getProbeMetadata().addProbe(logProbes.get(0));
-    ProbeImplementation probeImplementation = configurationUpdater.resolve(0);
-    Assertions.assertEquals(
-        PROBE_ID.getEncodedId(), probeImplementation.getProbeId().getEncodedId());
-    Assertions.assertEquals("java.lang.String", probeImplementation.getLocation().getType());
-    Assertions.assertEquals("concat", probeImplementation.getLocation().getMethod());
-    Assertions.assertNotNull(((LogProbe) probeImplementation).getProbeCondition());
-  }
-
-  @Test
-  public void resolveFails() throws UnmodifiableClassException {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
-    List<LogProbe> logProbes =
-        singletonList(
-            LogProbe.builder().probeId(PROBE_ID).where("java.lang.String", "concat").build());
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    verify(inst).retransformClasses(eq(String.class));
-    // simulate that there is a snapshot probe instrumentation left in HashMap class
-    ProbeImplementation probeImplementation = configurationUpdater.resolve(1);
-    Assertions.assertNull(probeImplementation);
-  }
-
-  @Test
-  public void acceptNewMetric() {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
-    List<MetricProbe> metricProbes =
-        singletonList(
-            MetricProbe.builder().probeId(METRIC_ID).where("java.lang.String", "concat").build());
-    configurationUpdater.accept(REMOTE_CONFIG, metricProbes);
-    verify(inst).addTransformer(any(), eq(true));
-    verify(inst).getAllLoadedClasses();
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(1, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(METRIC_ID.getEncodedId()));
-  }
-
-  @Test
-  public void acceptNewLog() {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
-    List<LogProbe> logProbes =
-        singletonList(
-            LogProbe.builder().probeId(LOG_ID).where("java.lang.String", "concat").build());
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    verify(inst).addTransformer(any(), eq(true));
-    verify(inst).getAllLoadedClasses();
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(1, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(LOG_ID.getEncodedId()));
-  }
-
-  @Test
-  public void acceptDeleteMetric() throws UnmodifiableClassException {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class, HashMap.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
-    MetricProbe metricProbe1 =
-        MetricProbe.builder()
-            .language(LANGUAGE)
-            .probeId(METRIC_ID)
-            .where("java.lang.String", "concat")
-            .build();
-    MetricProbe metricProbe2 =
-        MetricProbe.builder()
-            .language(LANGUAGE)
-            .probeId(METRIC_ID2)
-            .where("java.util.HashMap", "<init>", "void ()")
-            .build();
-    List<MetricProbe> metricProbes = Arrays.asList(metricProbe1, metricProbe2);
-    configurationUpdater.accept(REMOTE_CONFIG, metricProbes);
-    metricProbes = singletonList(metricProbe1);
-    configurationUpdater.accept(REMOTE_CONFIG, metricProbes);
-    verify(inst).removeTransformer(any());
-    ArgumentCaptor<Class<?>[]> captor = ArgumentCaptor.forClass(Class[].class);
-    verify(inst, times(3)).retransformClasses(captor.capture());
-    List<Class<?>[]> allValues = captor.getAllValues();
-    assertEquals(String.class, allValues.get(0));
-    assertEquals(HashMap.class, allValues.get(1));
-    assertEquals(HashMap.class, allValues.get(2)); // for removing instrumentation
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(1, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(metricProbe1.getProbeId().getEncodedId()));
-  }
-
-  @Test
-  public void acceptDeleteLog() throws UnmodifiableClassException {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class, HashMap.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
-    LogProbe logProbe1 =
-        LogProbe.builder()
-            .language(LANGUAGE)
-            .probeId(LOG_ID)
-            .where("java.lang.String", "concat")
-            .build();
-    LogProbe logProbe2 =
-        LogProbe.builder()
-            .language(LANGUAGE)
-            .probeId(LOG_ID2)
-            .where("java.util.HashMap", "<init>", "void ()")
-            .build();
-    List<LogProbe> logProbes = Arrays.asList(logProbe1, logProbe2);
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    logProbes = singletonList(logProbe1);
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    verify(inst).removeTransformer(any());
-    ArgumentCaptor<Class<?>[]> captor = ArgumentCaptor.forClass(Class[].class);
-    verify(inst, times(3)).retransformClasses(captor.capture());
-    List<Class<?>[]> allValues = captor.getAllValues();
-    assertEquals(String.class, allValues.get(0));
-    assertEquals(HashMap.class, allValues.get(1));
-    assertEquals(HashMap.class, allValues.get(2)); // for removing instrumentation
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(1, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(logProbe1.getProbeId().getEncodedId()));
-  }
-
-  @Test
-  public void acceptClearMetrics() throws UnmodifiableClassException {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
-    List<MetricProbe> metricProbes =
-        singletonList(
-            MetricProbe.builder().probeId(METRIC_ID).where("java.lang.String", "concat").build());
-    configurationUpdater.accept(REMOTE_CONFIG, metricProbes);
-    configurationUpdater.accept(REMOTE_CONFIG, null);
-    verify(inst).removeTransformer(any());
-    verify(inst, times(2)).retransformClasses(any());
-    assertEquals(0, configurationUpdater.getAppliedDefinitions().size());
-  }
-
-  @Test
-  public void acceptClearLogs() throws UnmodifiableClassException {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
-    List<LogProbe> logProbes =
-        singletonList(
-            LogProbe.builder().probeId(LOG_ID).where("java.lang.String", "concat").build());
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    configurationUpdater.accept(REMOTE_CONFIG, null);
-    verify(inst).removeTransformer(any());
-    verify(inst, times(2)).retransformClasses(any());
-    assertEquals(0, configurationUpdater.getAppliedDefinitions().size());
-  }
-
-  @Test
-  public void acceptChangeProbeToMetric() throws UnmodifiableClassException {
-    when(inst.getAllLoadedClasses())
-        .thenReturn(new Class[] {String.class, HashMap.class, StringBuilder.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
-    List<LogProbe> logProbes =
-        Arrays.asList(
-            LogProbe.builder()
+                .build();
+        LogProbe probe2 = LogProbe.builder()
+                .language(LANGUAGE)
+                .probeId(PROBE_ID2)
+                .where("java.util.HashMap", "<init>", "void ()")
+                .build();
+        List<LogProbe> logProbes = Arrays.asList(probe1, probe2);
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        verify(probeStatusSink).addReceived(eq(PROBE_ID));
+        verify(probeStatusSink).addReceived(eq(PROBE_ID2));
+        logProbes = singletonList(probe1);
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        verify(probeStatusSink).removeDiagnostics(eq(PROBE_ID2));
+        verify(inst).removeTransformer(any());
+        ArgumentCaptor<Class<?>[]> captor = ArgumentCaptor.forClass(Class[].class);
+        verify(inst, times(3)).retransformClasses(captor.capture());
+        List<Class<?>[]> allValues = captor.getAllValues();
+        assertEquals(String.class, allValues.get(0));
+        assertEquals(HashMap.class, allValues.get(1));
+        assertEquals(HashMap.class, allValues.get(2)); // for removing instrumentation
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        Assertions.assertEquals(1, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(probe1.getProbeId().getEncodedId()));
+    }
+
+    @Test
+    public void acceptDeleteProbeSameClass() throws UnmodifiableClassException {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        AtomicInteger expectedDefinitions = new AtomicInteger(2);
+        ConfigurationUpdater configurationUpdater = new ConfigurationUpdater(
+                inst,
+                (tracerConfig, configuration, listener, probeMetadata, debuggerSink) -> {
+                    assertEquals(
+                            expectedDefinitions.get(),
+                            configuration.getDefinitions().size());
+                    return transformer;
+                },
+                tracerConfig,
+                debuggerSinkWithMockStatusSink,
+                new ClassesToRetransformFinder());
+        LogProbe probe1 = LogProbe.builder()
                 .language(LANGUAGE)
                 .probeId(PROBE_ID)
                 .where("java.lang.String", "concat")
-                .build(),
-            LogProbe.builder()
+                .build();
+        LogProbe probe2 = LogProbe.builder()
                 .language(LANGUAGE)
                 .probeId(PROBE_ID2)
+                .where("java.lang.String", "indexOf", "int (int)")
+                .build();
+        List<LogProbe> logProbes = Arrays.asList(probe1, probe2);
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        verify(probeStatusSink).addReceived(eq(PROBE_ID));
+        verify(probeStatusSink).addReceived(eq(PROBE_ID2));
+        logProbes = singletonList(probe1);
+        expectedDefinitions.set(1);
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        verify(probeStatusSink).removeDiagnostics(eq(PROBE_ID2));
+        verify(inst).removeTransformer(any());
+        ArgumentCaptor<Class<?>[]> captor = ArgumentCaptor.forClass(Class[].class);
+        verify(inst, times(2)).retransformClasses(captor.capture());
+        List<Class<?>[]> allValues = captor.getAllValues();
+        assertEquals(String.class, allValues.get(0));
+        assertEquals(String.class, allValues.get(1));
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        Assertions.assertEquals(1, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(probe1.getProbeId().getEncodedId()));
+    }
+
+    @Test
+    public void acceptClearProbes() throws UnmodifiableClassException {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
+        List<LogProbe> logProbes = singletonList(LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("java.lang.String", "concat")
+                .build());
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        verify(probeStatusSink).addReceived(eq(PROBE_ID));
+        configurationUpdater.accept(REMOTE_CONFIG, null);
+        verify(probeStatusSink).removeDiagnostics(eq(PROBE_ID));
+        verify(inst).removeTransformer(any());
+        verify(inst, times(2)).retransformClasses(any());
+        Assertions.assertEquals(0, configurationUpdater.getAppliedDefinitions().size());
+    }
+
+    @Test
+    public void acceptMustAppliedAtomically() throws Exception {
+        // Regression test: ConfigurationUpdater::accept must apply the whole read-modify-write
+        // sequence (definitionSources.put + createConfiguration + applyNewConfiguration) under a
+        // single lock, otherwise concurrent accept() calls from different sources can race on the
+        // shared EnumMap and cause one source's definitions to be lost when currentConfiguration is
+        // overwritten with a configuration snapshot that doesn't yet reflect the other source's put.
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
+        ConfigurationAcceptor.Source[] sources = ConfigurationAcceptor.Source.values();
+        ExecutorService executor = Executors.newFixedThreadPool(sources.length);
+        try {
+            int iterations = 100;
+            for (int i = 0; i < iterations; i++) {
+                CyclicBarrier barrier = new CyclicBarrier(sources.length);
+                List<ProbeId> expectedProbeIds = new ArrayList<>();
+                List<Future<?>> futures = new ArrayList<>();
+                for (ConfigurationAcceptor.Source source : sources) {
+                    ProbeId probeId = new ProbeId("probe-" + source + "-" + i, i);
+                    expectedProbeIds.add(probeId);
+                    LogProbe probe = LogProbe.builder()
+                            .probeId(probeId)
+                            .where("java.lang.String", "concat")
+                            .build();
+                    futures.add(executor.submit(() -> {
+                        barrier.await();
+                        configurationUpdater.accept(source, singletonList(probe));
+                        return null;
+                    }));
+                }
+                for (Future<?> future : futures) {
+                    future.get();
+                }
+                Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+                assertEquals(
+                        sources.length,
+                        appliedDefinitions.size(),
+                        "Lost definition(s) from a concurrent source update at iteration " + i);
+                for (ProbeId expectedProbeId : expectedProbeIds) {
+                    assertTrue(appliedDefinitions.containsKey(expectedProbeId.getEncodedId()));
+                }
+            }
+        } finally {
+            executor.shutdown();
+        }
+    }
+
+    @Test
+    public void resolve() {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
+        List<LogProbe> logProbes = singletonList(LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("java.lang.String", "concat")
+                .when(new ProbeCondition(DSL.when(DSL.eq(DSL.ref("arg"), DSL.value("foo"))), "arg == 'foo'"))
+                .build());
+        logProbes.get(0).buildLocation(null);
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        configurationUpdater.getProbeMetadata().addProbe(logProbes.get(0));
+        ProbeImplementation probeImplementation = configurationUpdater.resolve(0);
+        Assertions.assertEquals(
+                PROBE_ID.getEncodedId(), probeImplementation.getProbeId().getEncodedId());
+        Assertions.assertEquals(
+                "java.lang.String", probeImplementation.getLocation().getType());
+        Assertions.assertEquals("concat", probeImplementation.getLocation().getMethod());
+        Assertions.assertNotNull(((LogProbe) probeImplementation).getProbeCondition());
+    }
+
+    @Test
+    public void resolveFails() throws UnmodifiableClassException {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
+        List<LogProbe> logProbes = singletonList(LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("java.lang.String", "concat")
+                .build());
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        verify(inst).retransformClasses(eq(String.class));
+        // simulate that there is a snapshot probe instrumentation left in HashMap class
+        ProbeImplementation probeImplementation = configurationUpdater.resolve(1);
+        Assertions.assertNull(probeImplementation);
+    }
+
+    @Test
+    public void acceptNewMetric() {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
+        List<MetricProbe> metricProbes = singletonList(MetricProbe.builder()
+                .probeId(METRIC_ID)
+                .where("java.lang.String", "concat")
+                .build());
+        configurationUpdater.accept(REMOTE_CONFIG, metricProbes);
+        verify(inst).addTransformer(any(), eq(true));
+        verify(inst).getAllLoadedClasses();
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(1, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(METRIC_ID.getEncodedId()));
+    }
+
+    @Test
+    public void acceptNewLog() {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
+        List<LogProbe> logProbes = singletonList(LogProbe.builder()
+                .probeId(LOG_ID)
+                .where("java.lang.String", "concat")
+                .build());
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        verify(inst).addTransformer(any(), eq(true));
+        verify(inst).getAllLoadedClasses();
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(1, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(LOG_ID.getEncodedId()));
+    }
+
+    @Test
+    public void acceptDeleteMetric() throws UnmodifiableClassException {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class, HashMap.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
+        MetricProbe metricProbe1 = MetricProbe.builder()
+                .language(LANGUAGE)
+                .probeId(METRIC_ID)
+                .where("java.lang.String", "concat")
+                .build();
+        MetricProbe metricProbe2 = MetricProbe.builder()
+                .language(LANGUAGE)
+                .probeId(METRIC_ID2)
                 .where("java.util.HashMap", "<init>", "void ()")
+                .build();
+        List<MetricProbe> metricProbes = Arrays.asList(metricProbe1, metricProbe2);
+        configurationUpdater.accept(REMOTE_CONFIG, metricProbes);
+        metricProbes = singletonList(metricProbe1);
+        configurationUpdater.accept(REMOTE_CONFIG, metricProbes);
+        verify(inst).removeTransformer(any());
+        ArgumentCaptor<Class<?>[]> captor = ArgumentCaptor.forClass(Class[].class);
+        verify(inst, times(3)).retransformClasses(captor.capture());
+        List<Class<?>[]> allValues = captor.getAllValues();
+        assertEquals(String.class, allValues.get(0));
+        assertEquals(HashMap.class, allValues.get(1));
+        assertEquals(HashMap.class, allValues.get(2)); // for removing instrumentation
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(1, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(metricProbe1.getProbeId().getEncodedId()));
+    }
+
+    @Test
+    public void acceptDeleteLog() throws UnmodifiableClassException {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class, HashMap.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
+        LogProbe logProbe1 = LogProbe.builder()
+                .language(LANGUAGE)
+                .probeId(LOG_ID)
+                .where("java.lang.String", "concat")
+                .build();
+        LogProbe logProbe2 = LogProbe.builder()
+                .language(LANGUAGE)
+                .probeId(LOG_ID2)
+                .where("java.util.HashMap", "<init>", "void ()")
+                .build();
+        List<LogProbe> logProbes = Arrays.asList(logProbe1, logProbe2);
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        logProbes = singletonList(logProbe1);
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        verify(inst).removeTransformer(any());
+        ArgumentCaptor<Class<?>[]> captor = ArgumentCaptor.forClass(Class[].class);
+        verify(inst, times(3)).retransformClasses(captor.capture());
+        List<Class<?>[]> allValues = captor.getAllValues();
+        assertEquals(String.class, allValues.get(0));
+        assertEquals(HashMap.class, allValues.get(1));
+        assertEquals(HashMap.class, allValues.get(2)); // for removing instrumentation
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(1, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(logProbe1.getProbeId().getEncodedId()));
+    }
+
+    @Test
+    public void acceptClearMetrics() throws UnmodifiableClassException {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
+        List<MetricProbe> metricProbes = singletonList(MetricProbe.builder()
+                .probeId(METRIC_ID)
+                .where("java.lang.String", "concat")
                 .build());
-    configurationUpdater.accept(REMOTE_CONFIG, logProbes);
-    List<MetricProbe> metricProbes =
-        singletonList(
-            MetricProbe.builder()
+        configurationUpdater.accept(REMOTE_CONFIG, metricProbes);
+        configurationUpdater.accept(REMOTE_CONFIG, null);
+        verify(inst).removeTransformer(any());
+        verify(inst, times(2)).retransformClasses(any());
+        assertEquals(0, configurationUpdater.getAppliedDefinitions().size());
+    }
+
+    @Test
+    public void acceptClearLogs() throws UnmodifiableClassException {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
+        List<LogProbe> logProbes = singletonList(LogProbe.builder()
+                .probeId(LOG_ID)
+                .where("java.lang.String", "concat")
+                .build());
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        configurationUpdater.accept(REMOTE_CONFIG, null);
+        verify(inst).removeTransformer(any());
+        verify(inst, times(2)).retransformClasses(any());
+        assertEquals(0, configurationUpdater.getAppliedDefinitions().size());
+    }
+
+    @Test
+    public void acceptChangeProbeToMetric() throws UnmodifiableClassException {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class, HashMap.class, StringBuilder.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
+        List<LogProbe> logProbes = Arrays.asList(
+                LogProbe.builder()
+                        .language(LANGUAGE)
+                        .probeId(PROBE_ID)
+                        .where("java.lang.String", "concat")
+                        .build(),
+                LogProbe.builder()
+                        .language(LANGUAGE)
+                        .probeId(PROBE_ID2)
+                        .where("java.util.HashMap", "<init>", "void ()")
+                        .build());
+        configurationUpdater.accept(REMOTE_CONFIG, logProbes);
+        List<MetricProbe> metricProbes = singletonList(MetricProbe.builder()
                 .language(LANGUAGE)
                 .probeId(METRIC_ID)
                 .where("java.lang.StringBuilder", "append")
                 .build());
-    configurationUpdater.accept(REMOTE_CONFIG, metricProbes);
-    verify(inst).removeTransformer(any());
-    ArgumentCaptor<Class<?>[]> captor = ArgumentCaptor.forClass(Class[].class);
-    verify(inst, times(5)).retransformClasses(captor.capture());
-    List<Class<?>[]> allValues = captor.getAllValues();
-    assertEquals(String.class, allValues.get(0));
-    assertEquals(HashMap.class, allValues.get(1));
-    assertEquals(String.class, allValues.get(2));
-    assertEquals(HashMap.class, allValues.get(3));
-    assertEquals(StringBuilder.class, allValues.get(4));
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(1, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(METRIC_ID.getEncodedId()));
-  }
-
-  @Test
-  public void acceptNewSpan() {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
-    SpanProbe spanProbe =
-        SpanProbe.builder().probeId(SPAN_ID).where("java.lang.String", "concat").build();
-    configurationUpdater.accept(REMOTE_CONFIG, singletonList(spanProbe));
-    verify(inst).addTransformer(any(), eq(true));
-    verify(inst).getAllLoadedClasses();
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(1, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(SPAN_ID.getEncodedId()));
-  }
-
-  @Test
-  public void acceptNewDecorationSpan() {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
-    SpanDecorationProbe spanProbe =
-        SpanDecorationProbe.builder()
-            .probeId(SPAN_DECORATION_ID)
-            .where("java.lang.String", "concat")
-            .build();
-    configurationUpdater.accept(REMOTE_CONFIG, singletonList(spanProbe));
-    verify(inst).addTransformer(any(), eq(true));
-    verify(inst).getAllLoadedClasses();
-    Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
-    assertEquals(1, appliedDefinitions.size());
-    assertTrue(appliedDefinitions.containsKey(SPAN_DECORATION_ID.getEncodedId()));
-  }
-
-  @Test
-  public void handleException() {
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
-    Exception ex = new Exception("oops");
-    configurationUpdater.handleException(LOG_PROBE_PREFIX + PROBE_ID.getId(), ex);
-    configurationUpdater.handleException(METRIC_PROBE_PREFIX + PROBE_ID.getId(), ex);
-    configurationUpdater.handleException(SPAN_PROBE_PREFIX + PROBE_ID.getId(), ex);
-    configurationUpdater.handleException(SPAN_DECORATION_PROBE_PREFIX + PROBE_ID.getId(), ex);
-    verify(probeStatusSink, times(4)).addError(eq(ProbeId.from(PROBE_ID.getId() + ":0")), eq(ex));
-  }
-
-  @Test
-  public void methodParametersAttribute() throws Exception {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    Map<String, byte[]> buffers =
-        compile(CLASS_NAME, SourceCompiler.DebugInfo.ALL, "8", Arrays.asList("-parameters"));
-    Class<?> testClass = loadClass(CLASS_NAME, buffers);
-    if (JavaVirtualMachine.isJavaVersionBetween(17, 0, 0, 17, 0, 20)) {
-      // on JDK 17 introduced Spring6 class
-      Class<?> springClass = Class.forName("org.springframework.core.SpringVersion");
-      when(inst.getAllLoadedClasses()).thenReturn(new Class[] {testClass, springClass});
-    } else {
-      when(inst.getAllLoadedClasses()).thenReturn(new Class[] {testClass});
-    }
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
-    configurationUpdater.accept(
-        REMOTE_CONFIG,
-        singletonList(LogProbe.builder().probeId(PROBE_ID).where(CLASS_NAME, "main").build()));
-    if (JavaVirtualMachine.isJavaVersionBetween(17, 0, 0, 17, 0, 20)) {
-      // on JDK 17 with Spring6 class, transformation cannot happen
-      verify(inst, times(2)).getAllLoadedClasses();
-      verify(inst, times(0)).retransformClasses(any());
-      ArgumentCaptor<ProbeId> probeIdCaptor = ArgumentCaptor.forClass(ProbeId.class);
-      ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
-      verify(probeStatusSink, times(1)).addError(probeIdCaptor.capture(), strCaptor.capture());
-      assertEquals(PROBE_ID.getId(), probeIdCaptor.getAllValues().get(0).getId());
-      assertEquals(
-          "Method Parameters detected, instrumentation not supported for CapturedSnapshot01",
-          strCaptor.getAllValues().get(0));
-    } else {
-      ArgumentCaptor<Class<?>[]> captor = ArgumentCaptor.forClass(Class[].class);
-      verify(inst, times(1)).retransformClasses(captor.capture());
-      List<Class<?>[]> allValues = captor.getAllValues();
-      assertEquals(testClass, allValues.get(0));
-    }
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_17)
-  public void methodParametersAttributeRecord()
-      throws IOException, URISyntaxException, UnmodifiableClassException {
-    // make sure record method are not detected as having methodParameters attribute.
-    // /!\ record canonical constructor has the MethodParameters attribute,
-    // but not returned by Class::getDeclaredMethods()
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot29";
-    final String RECORD_NAME = "com.datadog.debugger.MyRecord1";
-    Map<String, byte[]> buffers = compile(CLASS_NAME, SourceCompiler.DebugInfo.ALL, "17");
-    Class<?> testClass = loadClass(RECORD_NAME, buffers);
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {testClass});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
-    configurationUpdater.accept(
-        REMOTE_CONFIG,
-        singletonList(LogProbe.builder().probeId(PROBE_ID).where(RECORD_NAME, "<init>").build()));
-    verify(inst).getAllLoadedClasses();
-    ArgumentCaptor<Class<?>[]> captor = ArgumentCaptor.forClass(Class[].class);
-    verify(inst, times(1)).retransformClasses(captor.capture());
-    List<Class<?>[]> allValues = captor.getAllValues();
-    assertEquals(testClass, allValues.get(0));
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_17)
-  public void recordWithTypeAnnotation()
-      throws IOException, URISyntaxException, UnmodifiableClassException {
-    if (JavaVirtualMachine.isJavaVersionAtLeast(25, 0, 4)) {
-      // Fixed since JDK 25.0.4
-      return;
-    }
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot33";
-    Map<String, byte[]> buffers = compile(CLASS_NAME, SourceCompiler.DebugInfo.ALL, "17");
-    Class<?> testClass = loadClass(CLASS_NAME, buffers);
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {testClass});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
-    configurationUpdater.accept(
-        REMOTE_CONFIG,
-        singletonList(LogProbe.builder().probeId(PROBE_ID).where(CLASS_NAME, "parse").build()));
-    verify(inst).getAllLoadedClasses();
-    verify(inst, times(0)).retransformClasses(any());
-  }
-
-  @Test
-  public void logProbeSamplers() throws IOException {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
-    LogProbe probe1 =
-        LogProbe.builder().probeId(PROBE_ID).where("java.lang.String", "concat").build();
-    configurationUpdater.accept(REMOTE_CONFIG, singletonList(probe1));
-    assertTrue(probe1.isReadyToCapture());
-
-    // Simulate JSON round-trip: in production, each remote config delivery deserializes fresh
-    // LogProbe objects.
-    // Moshi skips transient fields, so sampler need to be initialized with initSamplers.
-    LogProbe probe1Deserialized = deserializeLogProbe(serializeLogProbe(probe1).getBytes());
-    LogProbe probe2 =
-        LogProbe.builder().probeId(PROBE_ID2).where("java.lang.String", "concat").build();
-    configurationUpdater.accept(REMOTE_CONFIG, Arrays.asList(probe1Deserialized, probe2));
-    assertTrue(probe1Deserialized.isReadyToCapture());
-    assertTrue(probe2.isReadyToCapture());
-  }
-
-  @Test
-  public void spanDecorationProbeSamplers() throws IOException {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
-    SpanDecorationProbe probe1 =
-        SpanDecorationProbe.builder()
-            .probeId(PROBE_ID)
-            .where("java.lang.String", "concat")
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    configurationUpdater.accept(REMOTE_CONFIG, singletonList(probe1));
-
-    assertCommitSpanDecorationProbe(probe1);
-
-    // Simulate JSON round-trip: in production, each remote config delivery deserializes fresh
-    // SpanDecorationProbe objects.
-    // Moshi skips transient fields, so sampler need to be initialized with initSamplers.
-    SpanDecorationProbe probe1Deserialized =
-        deserializeSpanDecorationProbe(serializeSpanDecorationProbe(probe1).getBytes());
-    SpanDecorationProbe probe2 =
-        SpanDecorationProbe.builder()
-            .probeId(PROBE_ID2)
-            .where("java.lang.String", "concat")
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    configurationUpdater.accept(REMOTE_CONFIG, Arrays.asList(probe1Deserialized, probe2));
-    assertCommitSpanDecorationProbe(probe1Deserialized);
-    assertCommitSpanDecorationProbe(probe2);
-  }
-
-  private static void assertCommitSpanDecorationProbe(SpanDecorationProbe spanDecorationProbe) {
-    DebuggerSink sinkMock = mock(DebuggerSink.class);
-    DebuggerAgent.initSink(sinkMock);
-    CapturedContext capturedContext = mock(CapturedContext.class);
-    CapturedContext.Status status = spanDecorationProbe.createStatus();
-    status.addError(new EvaluationError(null, null));
-    when(capturedContext.getStatus(anyString())).thenReturn(status);
-    spanDecorationProbe.commit(null, capturedContext, null);
-    verify(sinkMock).addSnapshot(any());
-  }
-
-  @Test
-  public void triggerProbeSamplers() throws IOException {
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
-    ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
-    TriggerProbe probe1 =
-        TriggerProbe.builder().probeId(PROBE_ID).where("java.lang.String", "concat").build();
-    configurationUpdater.accept(REMOTE_CONFIG, singletonList(probe1));
-
-    assertEvaluateTriggerProbe(probe1);
-
-    // Simulate JSON round-trip: in production, each remote config delivery deserializes fresh
-    // LogProbe objects.
-    // Moshi skips transient fields, so sampler need to be initialized with initSamplers.
-    TriggerProbe probe1Deserialized =
-        deserializeTriggerProbe(serializeTriggerProbe(probe1).getBytes());
-    TriggerProbe probe2 =
-        TriggerProbe.builder().probeId(PROBE_ID2).where("java.lang.String", "concat").build();
-    configurationUpdater.accept(REMOTE_CONFIG, Arrays.asList(probe1Deserialized, probe2));
-    assertEvaluateTriggerProbe(probe1Deserialized);
-    assertEvaluateTriggerProbe(probe2);
-  }
-
-  private static void assertEvaluateTriggerProbe(TriggerProbe triggerProbe) {
-    AgentTracer.TracerAPI tracerAPIMock = mock(AgentTracer.TracerAPI.class);
-    AgentSpan spanMock = mock(AgentSpan.class);
-    when(tracerAPIMock.activeSpan()).thenReturn(spanMock);
-    when(spanMock.getLocalRootSpan()).thenReturn(spanMock);
-    AgentTracer.forceRegister(tracerAPIMock);
-    triggerProbe.evaluate(
-        new CapturedContext(), triggerProbe.createStatus(), MethodLocation.ENTRY, true);
-    verify(spanMock).setTag(eq(Tags.PROPAGATED_DEBUG), anyString());
-  }
-
-  private DebuggerTransformer createTransformer(
-      Config tracerConfig,
-      Configuration configuration,
-      DebuggerTransformer.InstrumentationListener listener,
-      ProbeMetadata probeMetadata,
-      DebuggerSink debuggerSink) {
-    return transformer;
-  }
-
-  private ConfigurationUpdater createConfigUpdater(DebuggerSink sink) {
-    return new ConfigurationUpdater(
-        inst, this::createTransformer, tracerConfig, sink, new ClassesToRetransformFinder());
-  }
+        configurationUpdater.accept(REMOTE_CONFIG, metricProbes);
+        verify(inst).removeTransformer(any());
+        ArgumentCaptor<Class<?>[]> captor = ArgumentCaptor.forClass(Class[].class);
+        verify(inst, times(5)).retransformClasses(captor.capture());
+        List<Class<?>[]> allValues = captor.getAllValues();
+        assertEquals(String.class, allValues.get(0));
+        assertEquals(HashMap.class, allValues.get(1));
+        assertEquals(String.class, allValues.get(2));
+        assertEquals(HashMap.class, allValues.get(3));
+        assertEquals(StringBuilder.class, allValues.get(4));
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(1, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(METRIC_ID.getEncodedId()));
+    }
+
+    @Test
+    public void acceptNewSpan() {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
+        SpanProbe spanProbe = SpanProbe.builder()
+                .probeId(SPAN_ID)
+                .where("java.lang.String", "concat")
+                .build();
+        configurationUpdater.accept(REMOTE_CONFIG, singletonList(spanProbe));
+        verify(inst).addTransformer(any(), eq(true));
+        verify(inst).getAllLoadedClasses();
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(1, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(SPAN_ID.getEncodedId()));
+    }
+
+    @Test
+    public void acceptNewDecorationSpan() {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSink);
+        SpanDecorationProbe spanProbe = SpanDecorationProbe.builder()
+                .probeId(SPAN_DECORATION_ID)
+                .where("java.lang.String", "concat")
+                .build();
+        configurationUpdater.accept(REMOTE_CONFIG, singletonList(spanProbe));
+        verify(inst).addTransformer(any(), eq(true));
+        verify(inst).getAllLoadedClasses();
+        Map<String, ProbeDefinition> appliedDefinitions = configurationUpdater.getAppliedDefinitions();
+        assertEquals(1, appliedDefinitions.size());
+        assertTrue(appliedDefinitions.containsKey(SPAN_DECORATION_ID.getEncodedId()));
+    }
+
+    @Test
+    public void handleException() {
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
+        Exception ex = new Exception("oops");
+        configurationUpdater.handleException(LOG_PROBE_PREFIX + PROBE_ID.getId(), ex);
+        configurationUpdater.handleException(METRIC_PROBE_PREFIX + PROBE_ID.getId(), ex);
+        configurationUpdater.handleException(SPAN_PROBE_PREFIX + PROBE_ID.getId(), ex);
+        configurationUpdater.handleException(SPAN_DECORATION_PROBE_PREFIX + PROBE_ID.getId(), ex);
+        verify(probeStatusSink, times(4)).addError(eq(ProbeId.from(PROBE_ID.getId() + ":0")), eq(ex));
+    }
+
+    @Test
+    public void methodParametersAttribute() throws Exception {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        Map<String, byte[]> buffers =
+                compile(CLASS_NAME, SourceCompiler.DebugInfo.ALL, "8", Arrays.asList("-parameters"));
+        Class<?> testClass = loadClass(CLASS_NAME, buffers);
+        if (JavaVirtualMachine.isJavaVersionBetween(17, 0, 0, 17, 0, 20)) {
+            // on JDK 17 introduced Spring6 class
+            Class<?> springClass = Class.forName("org.springframework.core.SpringVersion");
+            when(inst.getAllLoadedClasses()).thenReturn(new Class[] {testClass, springClass});
+        } else {
+            when(inst.getAllLoadedClasses()).thenReturn(new Class[] {testClass});
+        }
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
+        configurationUpdater.accept(
+                REMOTE_CONFIG,
+                singletonList(LogProbe.builder()
+                        .probeId(PROBE_ID)
+                        .where(CLASS_NAME, "main")
+                        .build()));
+        if (JavaVirtualMachine.isJavaVersionBetween(17, 0, 0, 17, 0, 20)) {
+            // on JDK 17 with Spring6 class, transformation cannot happen
+            verify(inst, times(2)).getAllLoadedClasses();
+            verify(inst, times(0)).retransformClasses(any());
+            ArgumentCaptor<ProbeId> probeIdCaptor = ArgumentCaptor.forClass(ProbeId.class);
+            ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
+            verify(probeStatusSink, times(1)).addError(probeIdCaptor.capture(), strCaptor.capture());
+            assertEquals(PROBE_ID.getId(), probeIdCaptor.getAllValues().get(0).getId());
+            assertEquals(
+                    "Method Parameters detected, instrumentation not supported for CapturedSnapshot01",
+                    strCaptor.getAllValues().get(0));
+        } else {
+            ArgumentCaptor<Class<?>[]> captor = ArgumentCaptor.forClass(Class[].class);
+            verify(inst, times(1)).retransformClasses(captor.capture());
+            List<Class<?>[]> allValues = captor.getAllValues();
+            assertEquals(testClass, allValues.get(0));
+        }
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_17)
+    public void methodParametersAttributeRecord() throws IOException, URISyntaxException, UnmodifiableClassException {
+        // make sure record method are not detected as having methodParameters attribute.
+        // /!\ record canonical constructor has the MethodParameters attribute,
+        // but not returned by Class::getDeclaredMethods()
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot29";
+        final String RECORD_NAME = "com.datadog.debugger.MyRecord1";
+        Map<String, byte[]> buffers = compile(CLASS_NAME, SourceCompiler.DebugInfo.ALL, "17");
+        Class<?> testClass = loadClass(RECORD_NAME, buffers);
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {testClass});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
+        configurationUpdater.accept(
+                REMOTE_CONFIG,
+                singletonList(LogProbe.builder()
+                        .probeId(PROBE_ID)
+                        .where(RECORD_NAME, "<init>")
+                        .build()));
+        verify(inst).getAllLoadedClasses();
+        ArgumentCaptor<Class<?>[]> captor = ArgumentCaptor.forClass(Class[].class);
+        verify(inst, times(1)).retransformClasses(captor.capture());
+        List<Class<?>[]> allValues = captor.getAllValues();
+        assertEquals(testClass, allValues.get(0));
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_17)
+    public void recordWithTypeAnnotation() throws IOException, URISyntaxException, UnmodifiableClassException {
+        if (JavaVirtualMachine.isJavaVersionAtLeast(25, 0, 4)) {
+            // Fixed since JDK 25.0.4
+            return;
+        }
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot33";
+        Map<String, byte[]> buffers = compile(CLASS_NAME, SourceCompiler.DebugInfo.ALL, "17");
+        Class<?> testClass = loadClass(CLASS_NAME, buffers);
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {testClass});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
+        configurationUpdater.accept(
+                REMOTE_CONFIG,
+                singletonList(LogProbe.builder()
+                        .probeId(PROBE_ID)
+                        .where(CLASS_NAME, "parse")
+                        .build()));
+        verify(inst).getAllLoadedClasses();
+        verify(inst, times(0)).retransformClasses(any());
+    }
+
+    @Test
+    public void logProbeSamplers() throws IOException {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
+        LogProbe probe1 = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("java.lang.String", "concat")
+                .build();
+        configurationUpdater.accept(REMOTE_CONFIG, singletonList(probe1));
+        assertTrue(probe1.isReadyToCapture());
+
+        // Simulate JSON round-trip: in production, each remote config delivery deserializes fresh
+        // LogProbe objects.
+        // Moshi skips transient fields, so sampler need to be initialized with initSamplers.
+        LogProbe probe1Deserialized =
+                deserializeLogProbe(serializeLogProbe(probe1).getBytes());
+        LogProbe probe2 = LogProbe.builder()
+                .probeId(PROBE_ID2)
+                .where("java.lang.String", "concat")
+                .build();
+        configurationUpdater.accept(REMOTE_CONFIG, Arrays.asList(probe1Deserialized, probe2));
+        assertTrue(probe1Deserialized.isReadyToCapture());
+        assertTrue(probe2.isReadyToCapture());
+    }
+
+    @Test
+    public void spanDecorationProbeSamplers() throws IOException {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
+        SpanDecorationProbe probe1 = SpanDecorationProbe.builder()
+                .probeId(PROBE_ID)
+                .where("java.lang.String", "concat")
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        configurationUpdater.accept(REMOTE_CONFIG, singletonList(probe1));
+
+        assertCommitSpanDecorationProbe(probe1);
+
+        // Simulate JSON round-trip: in production, each remote config delivery deserializes fresh
+        // SpanDecorationProbe objects.
+        // Moshi skips transient fields, so sampler need to be initialized with initSamplers.
+        SpanDecorationProbe probe1Deserialized = deserializeSpanDecorationProbe(
+                serializeSpanDecorationProbe(probe1).getBytes());
+        SpanDecorationProbe probe2 = SpanDecorationProbe.builder()
+                .probeId(PROBE_ID2)
+                .where("java.lang.String", "concat")
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        configurationUpdater.accept(REMOTE_CONFIG, Arrays.asList(probe1Deserialized, probe2));
+        assertCommitSpanDecorationProbe(probe1Deserialized);
+        assertCommitSpanDecorationProbe(probe2);
+    }
+
+    private static void assertCommitSpanDecorationProbe(SpanDecorationProbe spanDecorationProbe) {
+        DebuggerSink sinkMock = mock(DebuggerSink.class);
+        DebuggerAgent.initSink(sinkMock);
+        CapturedContext capturedContext = mock(CapturedContext.class);
+        CapturedContext.Status status = spanDecorationProbe.createStatus();
+        status.addError(new EvaluationError(null, null));
+        when(capturedContext.getStatus(anyString())).thenReturn(status);
+        spanDecorationProbe.commit(null, capturedContext, null);
+        verify(sinkMock).addSnapshot(any());
+    }
+
+    @Test
+    public void triggerProbeSamplers() throws IOException {
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {String.class});
+        ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink);
+        TriggerProbe probe1 = TriggerProbe.builder()
+                .probeId(PROBE_ID)
+                .where("java.lang.String", "concat")
+                .build();
+        configurationUpdater.accept(REMOTE_CONFIG, singletonList(probe1));
+
+        assertEvaluateTriggerProbe(probe1);
+
+        // Simulate JSON round-trip: in production, each remote config delivery deserializes fresh
+        // LogProbe objects.
+        // Moshi skips transient fields, so sampler need to be initialized with initSamplers.
+        TriggerProbe probe1Deserialized =
+                deserializeTriggerProbe(serializeTriggerProbe(probe1).getBytes());
+        TriggerProbe probe2 = TriggerProbe.builder()
+                .probeId(PROBE_ID2)
+                .where("java.lang.String", "concat")
+                .build();
+        configurationUpdater.accept(REMOTE_CONFIG, Arrays.asList(probe1Deserialized, probe2));
+        assertEvaluateTriggerProbe(probe1Deserialized);
+        assertEvaluateTriggerProbe(probe2);
+    }
+
+    private static void assertEvaluateTriggerProbe(TriggerProbe triggerProbe) {
+        AgentTracer.TracerAPI tracerAPIMock = mock(AgentTracer.TracerAPI.class);
+        AgentSpan spanMock = mock(AgentSpan.class);
+        when(tracerAPIMock.activeSpan()).thenReturn(spanMock);
+        when(spanMock.getLocalRootSpan()).thenReturn(spanMock);
+        AgentTracer.forceRegister(tracerAPIMock);
+        triggerProbe.evaluate(new CapturedContext(), triggerProbe.createStatus(), MethodLocation.ENTRY, true);
+        verify(spanMock).setTag(eq(Tags.PROPAGATED_DEBUG), anyString());
+    }
+
+    private DebuggerTransformer createTransformer(
+            Config tracerConfig,
+            Configuration configuration,
+            DebuggerTransformer.InstrumentationListener listener,
+            ProbeMetadata probeMetadata,
+            DebuggerSink debuggerSink) {
+        return transformer;
+    }
+
+    private ConfigurationUpdater createConfigUpdater(DebuggerSink sink) {
+        return new ConfigurationUpdater(
+                inst, this::createTransformer, tracerConfig, sink, new ClassesToRetransformFinder());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CoordinatedSamplingTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CoordinatedSamplingTest.java
index 181873a3f96..35c51729041 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CoordinatedSamplingTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CoordinatedSamplingTest.java
@@ -30,328 +30,307 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 public class CoordinatedSamplingTest extends CapturingTestBase {
-  private static final ProbeId PROBE_ID1 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f6", 0);
-  private static final ProbeId PROBE_ID2 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f7", 0);
-  private static final ProbeId PROBE_ID3 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
-  private static final ProbeId LINE_PROBE_ID1 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000001", 0);
-  private static final ProbeId LINE_PROBE_ID2 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000002", 0);
-  private static final ProbeId LINE_PROBE_ID3 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000003", 0);
+    private static final ProbeId PROBE_ID1 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f6", 0);
+    private static final ProbeId PROBE_ID2 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f7", 0);
+    private static final ProbeId PROBE_ID3 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
+    private static final ProbeId LINE_PROBE_ID1 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000001", 0);
+    private static final ProbeId LINE_PROBE_ID2 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000002", 0);
+    private static final ProbeId LINE_PROBE_ID3 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000003", 0);
 
-  interface TestListenerMethod {
-    TestSnapshotListener run() throws IOException, URISyntaxException;
-  }
+    interface TestListenerMethod {
+        TestSnapshotListener run() throws IOException, URISyntaxException;
+    }
 
-  @Test
-  public void coordinatedSamplingFirstEmit() throws IOException, URISyntaxException {
-    TestSnapshotListener listener = doCoordinatedSamplingTest(this::coordinatedSampling, 1);
-    assertSnapshots(listener, 3, PROBE_ID3, PROBE_ID2, PROBE_ID1);
-    assertSame(Context.root(), Context.current());
-  }
+    @Test
+    public void coordinatedSamplingFirstEmit() throws IOException, URISyntaxException {
+        TestSnapshotListener listener = doCoordinatedSamplingTest(this::coordinatedSampling, 1);
+        assertSnapshots(listener, 3, PROBE_ID3, PROBE_ID2, PROBE_ID1);
+        assertSame(Context.root(), Context.current());
+    }
 
-  @Test
-  public void coordinatedSamplingFirstDrop() throws IOException, URISyntaxException {
-    TestSnapshotListener listener = doCoordinatedSamplingTest(this::coordinatedSampling, 0);
-    assertSnapshots(listener, 0);
-  }
+    @Test
+    public void coordinatedSamplingFirstDrop() throws IOException, URISyntaxException {
+        TestSnapshotListener listener = doCoordinatedSamplingTest(this::coordinatedSampling, 0);
+        assertSnapshots(listener, 0);
+    }
 
-  @ParameterizedTest
-  @MethodSource("coordinatedSamplingConditionSource")
-  public void coordinatedSamplingCondition(
-      BooleanExpression cond1,
-      BooleanExpression cond2,
-      BooleanExpression cond3,
-      int numSamples,
-      int expectedSnapshots,
-      ProbeId... probeIds)
-      throws IOException, URISyntaxException {
-    TestSnapshotListener listener =
-        doCoordinatedSamplingTest(
-            () -> coordinatedSamplingWithCondition(cond1, cond2, cond3), numSamples);
-    assertSnapshots(listener, expectedSnapshots, probeIds);
-  }
+    @ParameterizedTest
+    @MethodSource("coordinatedSamplingConditionSource")
+    public void coordinatedSamplingCondition(
+            BooleanExpression cond1,
+            BooleanExpression cond2,
+            BooleanExpression cond3,
+            int numSamples,
+            int expectedSnapshots,
+            ProbeId... probeIds)
+            throws IOException, URISyntaxException {
+        TestSnapshotListener listener =
+                doCoordinatedSamplingTest(() -> coordinatedSamplingWithCondition(cond1, cond2, cond3), numSamples);
+        assertSnapshots(listener, expectedSnapshots, probeIds);
+    }
 
-  private static Stream<Arguments> coordinatedSamplingConditionSource() {
-    return Stream.of(
-        arguments(FALSE, FALSE, FALSE, 1, 0, new ProbeId[] {}),
-        arguments(TRUE, FALSE, FALSE, 1, 1, new ProbeId[] {PROBE_ID1}),
-        arguments(TRUE, TRUE, FALSE, 1, 2, new ProbeId[] {PROBE_ID2, PROBE_ID1}),
-        arguments(TRUE, TRUE, TRUE, 1, 3, new ProbeId[] {PROBE_ID3, PROBE_ID2, PROBE_ID1}),
-        arguments(FALSE, FALSE, TRUE, 1, 1, new ProbeId[] {PROBE_ID3}),
-        arguments(FALSE, TRUE, TRUE, 1, 2, new ProbeId[] {PROBE_ID3, PROBE_ID2}),
-        arguments(FALSE, TRUE, FALSE, 1, 1, new ProbeId[] {PROBE_ID2}),
-        arguments(TRUE, TRUE, TRUE, 0, 0, new ProbeId[] {}));
-  }
+    private static Stream<Arguments> coordinatedSamplingConditionSource() {
+        return Stream.of(
+                arguments(FALSE, FALSE, FALSE, 1, 0, new ProbeId[] {}),
+                arguments(TRUE, FALSE, FALSE, 1, 1, new ProbeId[] {PROBE_ID1}),
+                arguments(TRUE, TRUE, FALSE, 1, 2, new ProbeId[] {PROBE_ID2, PROBE_ID1}),
+                arguments(TRUE, TRUE, TRUE, 1, 3, new ProbeId[] {PROBE_ID3, PROBE_ID2, PROBE_ID1}),
+                arguments(FALSE, FALSE, TRUE, 1, 1, new ProbeId[] {PROBE_ID3}),
+                arguments(FALSE, TRUE, TRUE, 1, 2, new ProbeId[] {PROBE_ID3, PROBE_ID2}),
+                arguments(FALSE, TRUE, FALSE, 1, 1, new ProbeId[] {PROBE_ID2}),
+                arguments(TRUE, TRUE, TRUE, 0, 0, new ProbeId[] {}));
+    }
 
-  @Test
-  public void coordinatedSamplingLoopFirstEmit() throws IOException, URISyntaxException {
-    TestSnapshotListener listener = doCoordinatedSamplingTest(this::coordinatedSamplingLoop, 10);
-    assertSnapshots(listener, 2, PROBE_ID3, PROBE_ID1);
-  }
+    @Test
+    public void coordinatedSamplingLoopFirstEmit() throws IOException, URISyntaxException {
+        TestSnapshotListener listener = doCoordinatedSamplingTest(this::coordinatedSamplingLoop, 10);
+        assertSnapshots(listener, 2, PROBE_ID3, PROBE_ID1);
+    }
 
-  @Test
-  public void coordinatedSamplingSiblingFirstEmit() throws IOException, URISyntaxException {
-    TestSnapshotListener listener = doCoordinatedSamplingTest(this::coordinatedSamplingSibling, 10);
-    assertSnapshots(listener, 3, PROBE_ID1, PROBE_ID2, PROBE_ID3);
-  }
+    @Test
+    public void coordinatedSamplingSiblingFirstEmit() throws IOException, URISyntaxException {
+        TestSnapshotListener listener = doCoordinatedSamplingTest(this::coordinatedSamplingSibling, 10);
+        assertSnapshots(listener, 3, PROBE_ID1, PROBE_ID2, PROBE_ID3);
+    }
 
-  @Test
-  public void coordinatedSamplingLineFirstEmit() throws IOException, URISyntaxException {
-    TestSnapshotListener listener = doCoordinatedSamplingTest(this::lineCoordinatedSampling, 10);
-    assertSnapshots(listener, 3, LINE_PROBE_ID1, LINE_PROBE_ID2, LINE_PROBE_ID3);
-  }
+    @Test
+    public void coordinatedSamplingLineFirstEmit() throws IOException, URISyntaxException {
+        TestSnapshotListener listener = doCoordinatedSamplingTest(this::lineCoordinatedSampling, 10);
+        assertSnapshots(listener, 3, LINE_PROBE_ID1, LINE_PROBE_ID2, LINE_PROBE_ID3);
+    }
 
-  @Test
-  public void coordinatedSamplingLineFirstDrop() throws IOException, URISyntaxException {
-    TestSnapshotListener listener = doCoordinatedSamplingTest(this::lineCoordinatedSampling, 0);
-    assertSnapshots(listener, 0);
-  }
+    @Test
+    public void coordinatedSamplingLineFirstDrop() throws IOException, URISyntaxException {
+        TestSnapshotListener listener = doCoordinatedSamplingTest(this::lineCoordinatedSampling, 0);
+        assertSnapshots(listener, 0);
+    }
 
-  @ParameterizedTest
-  @MethodSource("coordinatedSamplingLineConditionSource")
-  public void coordinatedSamplingLineCondition(
-      BooleanExpression cond1,
-      BooleanExpression cond2,
-      BooleanExpression cond3,
-      int numSamples,
-      int expectedSnapshots,
-      ProbeId... probeIds)
-      throws IOException, URISyntaxException {
-    TestSnapshotListener listener =
-        doCoordinatedSamplingTest(
-            () -> coordinatedSamplingLineWithCondition(cond1, cond2, cond3), numSamples);
-    assertSnapshots(listener, expectedSnapshots, probeIds);
-  }
+    @ParameterizedTest
+    @MethodSource("coordinatedSamplingLineConditionSource")
+    public void coordinatedSamplingLineCondition(
+            BooleanExpression cond1,
+            BooleanExpression cond2,
+            BooleanExpression cond3,
+            int numSamples,
+            int expectedSnapshots,
+            ProbeId... probeIds)
+            throws IOException, URISyntaxException {
+        TestSnapshotListener listener =
+                doCoordinatedSamplingTest(() -> coordinatedSamplingLineWithCondition(cond1, cond2, cond3), numSamples);
+        assertSnapshots(listener, expectedSnapshots, probeIds);
+    }
 
-  private static Stream<Arguments> coordinatedSamplingLineConditionSource() {
-    return Stream.of(
-        arguments(FALSE, FALSE, FALSE, 1, 0, new ProbeId[] {}),
-        arguments(TRUE, FALSE, FALSE, 1, 1, new ProbeId[] {LINE_PROBE_ID1}),
-        arguments(TRUE, TRUE, FALSE, 1, 2, new ProbeId[] {LINE_PROBE_ID1, LINE_PROBE_ID2}),
-        arguments(
-            TRUE, TRUE, TRUE, 1, 3, new ProbeId[] {LINE_PROBE_ID1, LINE_PROBE_ID2, LINE_PROBE_ID3}),
-        arguments(FALSE, FALSE, TRUE, 1, 1, new ProbeId[] {LINE_PROBE_ID3}),
-        arguments(FALSE, TRUE, TRUE, 1, 2, new ProbeId[] {LINE_PROBE_ID2, LINE_PROBE_ID3}),
-        arguments(FALSE, TRUE, FALSE, 1, 1, new ProbeId[] {LINE_PROBE_ID2}),
-        arguments(TRUE, TRUE, TRUE, 0, 0, new ProbeId[] {}));
-  }
+    private static Stream<Arguments> coordinatedSamplingLineConditionSource() {
+        return Stream.of(
+                arguments(FALSE, FALSE, FALSE, 1, 0, new ProbeId[] {}),
+                arguments(TRUE, FALSE, FALSE, 1, 1, new ProbeId[] {LINE_PROBE_ID1}),
+                arguments(TRUE, TRUE, FALSE, 1, 2, new ProbeId[] {LINE_PROBE_ID1, LINE_PROBE_ID2}),
+                arguments(TRUE, TRUE, TRUE, 1, 3, new ProbeId[] {LINE_PROBE_ID1, LINE_PROBE_ID2, LINE_PROBE_ID3}),
+                arguments(FALSE, FALSE, TRUE, 1, 1, new ProbeId[] {LINE_PROBE_ID3}),
+                arguments(FALSE, TRUE, TRUE, 1, 2, new ProbeId[] {LINE_PROBE_ID2, LINE_PROBE_ID3}),
+                arguments(FALSE, TRUE, FALSE, 1, 1, new ProbeId[] {LINE_PROBE_ID2}),
+                arguments(TRUE, TRUE, TRUE, 0, 0, new ProbeId[] {}));
+    }
 
-  @Test
-  public void noCoordinatedSamplingLogTemplate() throws IOException, URISyntaxException {
-    TestSnapshotListener listener =
-        doCoordinatedSamplingTest(this::coordinatedSamplingLogTemplate, 1);
-    // only one snapshot, the other probes do not benefit from coordinated sampling
-    assertSnapshots(listener, 1);
-  }
+    @Test
+    public void noCoordinatedSamplingLogTemplate() throws IOException, URISyntaxException {
+        TestSnapshotListener listener = doCoordinatedSamplingTest(this::coordinatedSamplingLogTemplate, 1);
+        // only one snapshot, the other probes do not benefit from coordinated sampling
+        assertSnapshots(listener, 1);
+    }
 
-  @Test
-  public void coordinatedSamplingIsScopedToLocalRootSpan() throws IOException, URISyntaxException {
-    MockSampler probeSampler = new MockSampler(1);
-    ProbeRateLimiter.setSamplerSupplier(rate -> probeSampler);
-    try {
-      CoreTracer tracer = CoreTracer.builder().build();
-      TracerInstaller.forceInstallGlobalTracer(tracer);
-      final String className = "com.datadog.debugger.CapturedSnapshot21";
-      LogProbe probe1 = createMethodProbeAtExit(PROBE_ID1, className, "process1", null);
-      LogProbe probe2 = createMethodProbeAtExit(PROBE_ID2, className, "process2", null);
-      LogProbe probe3 = createMethodProbeAtExit(PROBE_ID3, className, "process3", null);
-      TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
-      Class<?> testClass = compileAndLoadClass(className);
+    @Test
+    public void coordinatedSamplingIsScopedToLocalRootSpan() throws IOException, URISyntaxException {
+        MockSampler probeSampler = new MockSampler(1);
+        ProbeRateLimiter.setSamplerSupplier(rate -> probeSampler);
+        try {
+            CoreTracer tracer = CoreTracer.builder().build();
+            TracerInstaller.forceInstallGlobalTracer(tracer);
+            final String className = "com.datadog.debugger.CapturedSnapshot21";
+            LogProbe probe1 = createMethodProbeAtExit(PROBE_ID1, className, "process1", null);
+            LogProbe probe2 = createMethodProbeAtExit(PROBE_ID2, className, "process2", null);
+            LogProbe probe3 = createMethodProbeAtExit(PROBE_ID3, className, "process3", null);
+            TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
+            Class<?> testClass = compileAndLoadClass(className);
 
-      Reflect.onClass(testClass).call("main", "1").get();
-      Reflect.onClass(testClass).call("main", "1").get();
+            Reflect.onClass(testClass).call("main", "1").get();
+            Reflect.onClass(testClass).call("main", "1").get();
 
-      assertSnapshots(listener, 3, PROBE_ID3, PROBE_ID2, PROBE_ID1);
-      assertEquals(2, probeSampler.getCallCount());
-      assertSame(Context.root(), Context.current());
-    } finally {
-      ProbeRateLimiter.setSamplerSupplier(null);
+            assertSnapshots(listener, 3, PROBE_ID3, PROBE_ID2, PROBE_ID1);
+            assertEquals(2, probeSampler.getCallCount());
+            assertSame(Context.root(), Context.current());
+        } finally {
+            ProbeRateLimiter.setSamplerSupplier(null);
+        }
     }
-  }
 
-  @Test
-  public void logProbesIgnoreCoordinatedSampling() throws IOException, URISyntaxException {
-    MockSampler probeSampler = new MockSampler(2);
-    ProbeRateLimiter.setSamplerSupplier(rate -> probeSampler);
-    try {
-      CoreTracer tracer = CoreTracer.builder().build();
-      TracerInstaller.forceInstallGlobalTracer(tracer);
-      final String className = "com.datadog.debugger.CapturedSnapshot21";
-      LogProbe logProbe2 =
-          createProbeBuilder(PROBE_ID2)
-              .where(className, "process2")
-              .template("arg={arg}", parseTemplate("arg={arg}"))
-              .captureSnapshot(false)
-              .build();
-      LogProbe logProbe3 =
-          createProbeBuilder(PROBE_ID3)
-              .where(className, "process3")
-              .template("arg={arg}", parseTemplate("arg={arg}"))
-              .captureSnapshot(false)
-              .build();
-      LogProbe snapshotProbe = createMethodProbeAtExit(PROBE_ID1, className, "process1", null);
-      TestSnapshotListener listener = installProbes(snapshotProbe, logProbe2, logProbe3);
-      Class<?> testClass = compileAndLoadClass(className);
+    @Test
+    public void logProbesIgnoreCoordinatedSampling() throws IOException, URISyntaxException {
+        MockSampler probeSampler = new MockSampler(2);
+        ProbeRateLimiter.setSamplerSupplier(rate -> probeSampler);
+        try {
+            CoreTracer tracer = CoreTracer.builder().build();
+            TracerInstaller.forceInstallGlobalTracer(tracer);
+            final String className = "com.datadog.debugger.CapturedSnapshot21";
+            LogProbe logProbe2 = createProbeBuilder(PROBE_ID2)
+                    .where(className, "process2")
+                    .template("arg={arg}", parseTemplate("arg={arg}"))
+                    .captureSnapshot(false)
+                    .build();
+            LogProbe logProbe3 = createProbeBuilder(PROBE_ID3)
+                    .where(className, "process3")
+                    .template("arg={arg}", parseTemplate("arg={arg}"))
+                    .captureSnapshot(false)
+                    .build();
+            LogProbe snapshotProbe = createMethodProbeAtExit(PROBE_ID1, className, "process1", null);
+            TestSnapshotListener listener = installProbes(snapshotProbe, logProbe2, logProbe3);
+            Class<?> testClass = compileAndLoadClass(className);
 
-      Reflect.onClass(testClass).call("main", "1").get();
+            Reflect.onClass(testClass).call("main", "1").get();
 
-      assertEquals(2, listener.snapshots.size());
-      assertTrue(
-          listener.snapshots.stream()
-              .anyMatch(snapshot -> snapshot.getProbe().getId().equals(PROBE_ID1.getId())));
-      assertTrue(
-          listener.snapshots.stream()
-              .anyMatch(snapshot -> !snapshot.getProbe().getId().equals(PROBE_ID1.getId())));
-      assertEquals(3, probeSampler.getCallCount());
-    } finally {
-      ProbeRateLimiter.setSamplerSupplier(null);
+            assertEquals(2, listener.snapshots.size());
+            assertTrue(listener.snapshots.stream()
+                    .anyMatch(snapshot -> snapshot.getProbe().getId().equals(PROBE_ID1.getId())));
+            assertTrue(listener.snapshots.stream()
+                    .anyMatch(snapshot -> !snapshot.getProbe().getId().equals(PROBE_ID1.getId())));
+            assertEquals(3, probeSampler.getCallCount());
+        } finally {
+            ProbeRateLimiter.setSamplerSupplier(null);
+        }
     }
-  }
 
-  private TestSnapshotListener coordinatedSampling() throws IOException, URISyntaxException {
-    CoreTracer tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
-    LogProbe probe1 = createMethodProbeAtExit(PROBE_ID1, CLASS_NAME, "process1", null);
-    LogProbe probe2 = createMethodProbeAtExit(PROBE_ID2, CLASS_NAME, "process2", null);
-    LogProbe probe3 = createMethodProbeAtExit(PROBE_ID3, CLASS_NAME, "process3", null);
-    TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.onClass(testClass).call("main", "1").get();
-    return listener;
-  }
+    private TestSnapshotListener coordinatedSampling() throws IOException, URISyntaxException {
+        CoreTracer tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
+        LogProbe probe1 = createMethodProbeAtExit(PROBE_ID1, CLASS_NAME, "process1", null);
+        LogProbe probe2 = createMethodProbeAtExit(PROBE_ID2, CLASS_NAME, "process2", null);
+        LogProbe probe3 = createMethodProbeAtExit(PROBE_ID3, CLASS_NAME, "process3", null);
+        TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.onClass(testClass).call("main", "1").get();
+        return listener;
+    }
 
-  private TestSnapshotListener lineCoordinatedSampling() throws IOException, URISyntaxException {
-    CoreTracer tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    LogProbe probe1 = createLineProbe(LINE_PROBE_ID1, CLASS_NAME, line);
-    line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
-    LogProbe probe2 = createLineProbe(LINE_PROBE_ID2, CLASS_NAME, line);
-    line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID3);
-    LogProbe probe3 = createLineProbe(LINE_PROBE_ID3, CLASS_NAME, line);
-    TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.onClass(testClass).call("main", "1").get();
-    return listener;
-  }
+    private TestSnapshotListener lineCoordinatedSampling() throws IOException, URISyntaxException {
+        CoreTracer tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        LogProbe probe1 = createLineProbe(LINE_PROBE_ID1, CLASS_NAME, line);
+        line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
+        LogProbe probe2 = createLineProbe(LINE_PROBE_ID2, CLASS_NAME, line);
+        line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID3);
+        LogProbe probe3 = createLineProbe(LINE_PROBE_ID3, CLASS_NAME, line);
+        TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.onClass(testClass).call("main", "1").get();
+        return listener;
+    }
 
-  private TestSnapshotListener coordinatedSamplingWithCondition(
-      BooleanExpression cond1, BooleanExpression cond2, BooleanExpression cond3)
-      throws IOException, URISyntaxException {
-    CoreTracer tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
-    LogProbe probe1 =
-        createProbeBuilder(PROBE_ID1, CLASS_NAME, "process1", null)
-            .when(new ProbeCondition(DSL.when(cond1), ""))
-            .build();
-    LogProbe probe2 =
-        createProbeBuilder(PROBE_ID2, CLASS_NAME, "process2", null)
-            .when(new ProbeCondition(DSL.when(cond2), ""))
-            .build();
-    LogProbe probe3 =
-        createProbeBuilder(PROBE_ID3, CLASS_NAME, "process3", null)
-            .when(new ProbeCondition(DSL.when(cond3), ""))
-            .build();
-    TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.onClass(testClass).call("main", "1").get();
-    return listener;
-  }
+    private TestSnapshotListener coordinatedSamplingWithCondition(
+            BooleanExpression cond1, BooleanExpression cond2, BooleanExpression cond3)
+            throws IOException, URISyntaxException {
+        CoreTracer tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
+        LogProbe probe1 = createProbeBuilder(PROBE_ID1, CLASS_NAME, "process1", null)
+                .when(new ProbeCondition(DSL.when(cond1), ""))
+                .build();
+        LogProbe probe2 = createProbeBuilder(PROBE_ID2, CLASS_NAME, "process2", null)
+                .when(new ProbeCondition(DSL.when(cond2), ""))
+                .build();
+        LogProbe probe3 = createProbeBuilder(PROBE_ID3, CLASS_NAME, "process3", null)
+                .when(new ProbeCondition(DSL.when(cond3), ""))
+                .build();
+        TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.onClass(testClass).call("main", "1").get();
+        return listener;
+    }
 
-  private TestSnapshotListener coordinatedSamplingLineWithCondition(
-      BooleanExpression cond1, BooleanExpression cond2, BooleanExpression cond3)
-      throws IOException, URISyntaxException {
-    CoreTracer tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    LogProbe probe1 =
-        createProbeBuilder(LINE_PROBE_ID1, CLASS_NAME, line)
-            .when(new ProbeCondition(DSL.when(cond1), ""))
-            .build();
-    line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
-    LogProbe probe2 =
-        createProbeBuilder(LINE_PROBE_ID2, CLASS_NAME, line)
-            .when(new ProbeCondition(DSL.when(cond2), ""))
-            .build();
-    line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID3);
-    LogProbe probe3 =
-        createProbeBuilder(LINE_PROBE_ID3, CLASS_NAME, line)
-            .when(new ProbeCondition(DSL.when(cond3), ""))
-            .build();
-    TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.onClass(testClass).call("main", "1").get();
-    return listener;
-  }
+    private TestSnapshotListener coordinatedSamplingLineWithCondition(
+            BooleanExpression cond1, BooleanExpression cond2, BooleanExpression cond3)
+            throws IOException, URISyntaxException {
+        CoreTracer tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        LogProbe probe1 = createProbeBuilder(LINE_PROBE_ID1, CLASS_NAME, line)
+                .when(new ProbeCondition(DSL.when(cond1), ""))
+                .build();
+        line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
+        LogProbe probe2 = createProbeBuilder(LINE_PROBE_ID2, CLASS_NAME, line)
+                .when(new ProbeCondition(DSL.when(cond2), ""))
+                .build();
+        line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID3);
+        LogProbe probe3 = createProbeBuilder(LINE_PROBE_ID3, CLASS_NAME, line)
+                .when(new ProbeCondition(DSL.when(cond3), ""))
+                .build();
+        TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.onClass(testClass).call("main", "1").get();
+        return listener;
+    }
 
-  private TestSnapshotListener coordinatedSamplingLoop() throws IOException, URISyntaxException {
-    CoreTracer tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
-    LogProbe probeRoot = createMethodProbeAtExit(PROBE_ID1, CLASS_NAME, "rootLoopProcess", null);
-    LogProbe probe3 = createMethodProbeAtExit(PROBE_ID3, CLASS_NAME, "process3", null);
-    TestSnapshotListener listener = installProbes(probeRoot, probe3);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.onClass(testClass).call("main", "loop").get();
-    return listener;
-  }
+    private TestSnapshotListener coordinatedSamplingLoop() throws IOException, URISyntaxException {
+        CoreTracer tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
+        LogProbe probeRoot = createMethodProbeAtExit(PROBE_ID1, CLASS_NAME, "rootLoopProcess", null);
+        LogProbe probe3 = createMethodProbeAtExit(PROBE_ID3, CLASS_NAME, "process3", null);
+        TestSnapshotListener listener = installProbes(probeRoot, probe3);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.onClass(testClass).call("main", "loop").get();
+        return listener;
+    }
 
-  private TestSnapshotListener coordinatedSamplingSibling() throws IOException, URISyntaxException {
-    CoreTracer tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
-    LogProbe probe1 = createMethodProbeAtExit(PROBE_ID1, CLASS_NAME, "siblingProcess1", null);
-    LogProbe probe2 = createMethodProbeAtExit(PROBE_ID2, CLASS_NAME, "siblingProcess2", null);
-    LogProbe probe3 = createMethodProbeAtExit(PROBE_ID3, CLASS_NAME, "siblingProcess3", null);
-    TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.onClass(testClass).call("main", "sibling").get();
-    return listener;
-  }
+    private TestSnapshotListener coordinatedSamplingSibling() throws IOException, URISyntaxException {
+        CoreTracer tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
+        LogProbe probe1 = createMethodProbeAtExit(PROBE_ID1, CLASS_NAME, "siblingProcess1", null);
+        LogProbe probe2 = createMethodProbeAtExit(PROBE_ID2, CLASS_NAME, "siblingProcess2", null);
+        LogProbe probe3 = createMethodProbeAtExit(PROBE_ID3, CLASS_NAME, "siblingProcess3", null);
+        TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.onClass(testClass).call("main", "sibling").get();
+        return listener;
+    }
 
-  private TestSnapshotListener coordinatedSamplingLogTemplate()
-      throws IOException, URISyntaxException {
-    CoreTracer tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
-    LogProbe probe1 =
-        createProbeBuilder(PROBE_ID1)
-            .where(CLASS_NAME, "process1")
-            .template("arg={arg}", parseTemplate("arg={arg}"))
-            .captureSnapshot(false)
-            .build();
-    LogProbe probe2 =
-        createProbeBuilder(PROBE_ID2)
-            .where(CLASS_NAME, "process2")
-            .template("arg={arg}", parseTemplate("arg={arg}"))
-            .captureSnapshot(false)
-            .build();
-    LogProbe probe3 =
-        createProbeBuilder(PROBE_ID3)
-            .where(CLASS_NAME, "process3")
-            .template("arg={arg}", parseTemplate("arg={arg}"))
-            .captureSnapshot(false)
-            .build();
-    TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.onClass(testClass).call("main", "1").get();
-    return listener;
-  }
+    private TestSnapshotListener coordinatedSamplingLogTemplate() throws IOException, URISyntaxException {
+        CoreTracer tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
+        LogProbe probe1 = createProbeBuilder(PROBE_ID1)
+                .where(CLASS_NAME, "process1")
+                .template("arg={arg}", parseTemplate("arg={arg}"))
+                .captureSnapshot(false)
+                .build();
+        LogProbe probe2 = createProbeBuilder(PROBE_ID2)
+                .where(CLASS_NAME, "process2")
+                .template("arg={arg}", parseTemplate("arg={arg}"))
+                .captureSnapshot(false)
+                .build();
+        LogProbe probe3 = createProbeBuilder(PROBE_ID3)
+                .where(CLASS_NAME, "process3")
+                .template("arg={arg}", parseTemplate("arg={arg}"))
+                .captureSnapshot(false)
+                .build();
+        TestSnapshotListener listener = installProbes(probe1, probe2, probe3);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.onClass(testClass).call("main", "1").get();
+        return listener;
+    }
 
-  private TestSnapshotListener doCoordinatedSamplingTest(TestListenerMethod testRun, int numSamples)
-      throws IOException, URISyntaxException {
-    MockSampler probeSampler = new MockSampler(numSamples);
-    ProbeRateLimiter.setSamplerSupplier(rate -> probeSampler);
-    try {
-      return testRun.run();
-    } finally {
-      ProbeRateLimiter.setSamplerSupplier(null);
+    private TestSnapshotListener doCoordinatedSamplingTest(TestListenerMethod testRun, int numSamples)
+            throws IOException, URISyntaxException {
+        MockSampler probeSampler = new MockSampler(numSamples);
+        ProbeRateLimiter.setSamplerSupplier(rate -> probeSampler);
+        try {
+            return testRun.run();
+        } finally {
+            ProbeRateLimiter.setSamplerSupplier(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerAgentHelper.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerAgentHelper.java
index 121b6bf6e98..95dda876058 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerAgentHelper.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerAgentHelper.java
@@ -3,11 +3,11 @@
 import com.datadog.debugger.sink.DebuggerSink;
 
 public class DebuggerAgentHelper {
-  public static void injectSink(DebuggerSink sink) {
-    DebuggerAgent.initSink(sink);
-  }
+    public static void injectSink(DebuggerSink sink) {
+        DebuggerAgent.initSink(sink);
+    }
 
-  public static void injectSerializer(JsonSnapshotSerializer snapshotSerializer) {
-    DebuggerAgent.initSnapshotSerializer(snapshotSerializer);
-  }
+    public static void injectSerializer(JsonSnapshotSerializer snapshotSerializer) {
+        DebuggerAgent.initSnapshotSerializer(snapshotSerializer);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerAgentTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerAgentTest.java
index 8245d7312e1..e9e6cc43849 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerAgentTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerAgentTest.java
@@ -48,161 +48,160 @@
 @ExtendWith(MockitoExtension.class)
 public class DebuggerAgentTest {
 
-  public static final String URL_PATH = "/foo";
-  @Mock Config config;
-  @Mock Instrumentation inst;
-  final MockWebServer server = new MockWebServer();
-  HttpUrl url;
-  private ControllableEnvironmentVariables env = ControllableEnvironmentVariables.setup();
+    public static final String URL_PATH = "/foo";
 
-  private static void setFieldInContainerInfo(
-      ContainerInfo containerInfo, String fieldName, Object value) {
-    try {
-      Field field = containerInfo.getClass().getDeclaredField(fieldName);
-      field.setAccessible(true);
-      field.set(containerInfo, value);
-    } catch (Throwable e) {
-      e.printStackTrace();
-    }
-  }
+    @Mock
+    Config config;
+
+    @Mock
+    Instrumentation inst;
 
-  @BeforeEach
-  public void setUp() {
-    env.clear();
-    url = server.url(URL_PATH);
-  }
+    final MockWebServer server = new MockWebServer();
+    HttpUrl url;
+    private ControllableEnvironmentVariables env = ControllableEnvironmentVariables.setup();
+
+    private static void setFieldInContainerInfo(ContainerInfo containerInfo, String fieldName, Object value) {
+        try {
+            Field field = containerInfo.getClass().getDeclaredField(fieldName);
+            field.setAccessible(true);
+            field.set(containerInfo, value);
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+    }
 
-  @AfterEach
-  public void tearDown() throws IOException {
-    DebuggerAgent.reset();
-    try {
-      server.shutdown();
-    } catch (final IOException e) {
-      // Looks like this happens for some unclear reason, but should not affect tests
+    @BeforeEach
+    public void setUp() {
+        env.clear();
+        url = server.url(URL_PATH);
     }
-  }
 
-  @Test
-  @EnabledOnJre({JAVA_8, JAVA_11})
-  public void runDisabled() {
-    when(config.isDynamicInstrumentationEnabled()).thenReturn(false);
-    DebuggerAgent.run(config, inst, new SharedCommunicationObjects());
-    verify(inst, never()).addTransformer(any(), eq(true));
-  }
+    @AfterEach
+    public void tearDown() throws IOException {
+        DebuggerAgent.reset();
+        try {
+            server.shutdown();
+        } catch (final IOException e) {
+            // Looks like this happens for some unclear reason, but should not affect tests
+        }
+    }
 
-  @Test
-  @EnabledOnJre({JAVA_8, JAVA_11})
-  public void runEnabledWithDatadogAgent() throws InterruptedException, IOException {
-    when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
-    when(config.isRemoteConfigEnabled()).thenReturn(true);
-    when(config.getAgentUrl()).thenReturn(url.toString());
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
-    when(config.getRemoteConfigTargetsKeyId())
-        .thenReturn(Config.get().getRemoteConfigTargetsKeyId());
-    when(config.getRemoteConfigTargetsKey()).thenReturn(Config.get().getRemoteConfigTargetsKey());
-    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
-    when(config.getRemoteConfigMaxPayloadSizeBytes())
-        .thenReturn(Config.get().getRemoteConfigMaxPayloadSizeBytes());
-    assertTrue(config.isDynamicInstrumentationEnabled());
-    setFieldInContainerInfo(ContainerInfo.get(), "containerId", "");
-    String infoContent =
-        "{\"endpoints\": [\"v0.4/traces\", \"debugger/v1/input\", \"debugger/v1/diagnostics\", \"v0.7/config\"] }";
-    server.enqueue(new MockResponse().setResponseCode(200).setBody(infoContent));
-    server.enqueue(new MockResponse().setResponseCode(200).setBody(infoContent));
-    try (BufferedReader reader =
-        new BufferedReader(
-            new InputStreamReader(
-                DebuggerAgentTest.class.getResourceAsStream("/test_probe.json")))) {
-      String content = reader.lines().collect(Collectors.joining("\n"));
-      String rcContent = RemoteConfigHelper.encode(content, "petclinic");
-      server.enqueue(new MockResponse().setResponseCode(200).setBody(rcContent));
-    } catch (IOException e) {
-      e.printStackTrace();
+    @Test
+    @EnabledOnJre({JAVA_8, JAVA_11})
+    public void runDisabled() {
+        when(config.isDynamicInstrumentationEnabled()).thenReturn(false);
+        DebuggerAgent.run(config, inst, new SharedCommunicationObjects());
+        verify(inst, never()).addTransformer(any(), eq(true));
     }
-    SharedCommunicationObjects sharedCommunicationObjects = new SharedCommunicationObjects();
-    DebuggerAgent.run(config, inst, sharedCommunicationObjects);
-    ConfigurationPoller configurationPoller =
-        sharedCommunicationObjects.configurationPoller(config);
-    configurationPoller.start();
-    RecordedRequest request;
-    do {
-      request = server.takeRequest(5, TimeUnit.SECONDS);
-      assertNotNull(request);
-    } while ("/info".equals(request.getPath()));
-    assertEquals("/v0.7/config", request.getPath());
-    DebuggerAgent.stop();
-  }
 
-  @Test
-  @EnabledOnJre({JAVA_8, JAVA_11})
-  public void runEnabledWithUnsupportedDatadogAgent() throws InterruptedException {
-    when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
-    when(config.getAgentUrl()).thenReturn(url.toString());
-    when(config.getFinalDebuggerSnapshotUrl())
-        .thenReturn("http://localhost:8126/debugger/v1/input");
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
-    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
-    String infoContent = "{\"endpoints\": [\"v0.4/traces\"]}";
-    server.enqueue(new MockResponse().setResponseCode(200).setBody(infoContent));
-    DebuggerAgent.run(config, inst, new SharedCommunicationObjects());
-    verify(inst, never()).addTransformer(any(), eq(true));
-  }
+    @Test
+    @EnabledOnJre({JAVA_8, JAVA_11})
+    public void runEnabledWithDatadogAgent() throws InterruptedException, IOException {
+        when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
+        when(config.isRemoteConfigEnabled()).thenReturn(true);
+        when(config.getAgentUrl()).thenReturn(url.toString());
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
+        when(config.getRemoteConfigTargetsKeyId()).thenReturn(Config.get().getRemoteConfigTargetsKeyId());
+        when(config.getRemoteConfigTargetsKey()).thenReturn(Config.get().getRemoteConfigTargetsKey());
+        when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+        when(config.getRemoteConfigMaxPayloadSizeBytes())
+                .thenReturn(Config.get().getRemoteConfigMaxPayloadSizeBytes());
+        assertTrue(config.isDynamicInstrumentationEnabled());
+        setFieldInContainerInfo(ContainerInfo.get(), "containerId", "");
+        String infoContent =
+                "{\"endpoints\": [\"v0.4/traces\", \"debugger/v1/input\", \"debugger/v1/diagnostics\", \"v0.7/config\"] }";
+        server.enqueue(new MockResponse().setResponseCode(200).setBody(infoContent));
+        server.enqueue(new MockResponse().setResponseCode(200).setBody(infoContent));
+        try (BufferedReader reader = new BufferedReader(
+                new InputStreamReader(DebuggerAgentTest.class.getResourceAsStream("/test_probe.json")))) {
+            String content = reader.lines().collect(Collectors.joining("\n"));
+            String rcContent = RemoteConfigHelper.encode(content, "petclinic");
+            server.enqueue(new MockResponse().setResponseCode(200).setBody(rcContent));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        SharedCommunicationObjects sharedCommunicationObjects = new SharedCommunicationObjects();
+        DebuggerAgent.run(config, inst, sharedCommunicationObjects);
+        ConfigurationPoller configurationPoller = sharedCommunicationObjects.configurationPoller(config);
+        configurationPoller.start();
+        RecordedRequest request;
+        do {
+            request = server.takeRequest(5, TimeUnit.SECONDS);
+            assertNotNull(request);
+        } while ("/info".equals(request.getPath()));
+        assertEquals("/v0.7/config", request.getPath());
+        DebuggerAgent.stop();
+    }
 
-  @Test
-  @EnabledOnJre({JAVA_8, JAVA_11})
-  public void readFromFile() throws URISyntaxException {
-    URL res = getClass().getClassLoader().getResource("test_probe_file.json");
-    String probeDefinitionPath = Paths.get(res.toURI()).toFile().getAbsolutePath();
-    when(config.getServiceName()).thenReturn("petclinic");
-    when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
-    when(config.getAgentUrl()).thenReturn(url.toString());
-    when(config.getDynamicInstrumentationMaxPayloadSize()).thenReturn(4096L);
-    when(config.getDynamicInstrumentationProbeFile()).thenReturn(probeDefinitionPath);
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
-    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
-    String infoContent =
-        "{\"endpoints\": [\"v0.4/traces\", \"debugger/v1/input\", \"debugger/v1/diagnostics\", \"v0.7/config\"] }";
-    server.enqueue(new MockResponse().setResponseCode(200).setBody(infoContent));
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[0]);
-    DebuggerAgent.run(config, inst, new SharedCommunicationObjects());
-    verify(inst, atLeastOnce()).addTransformer(any(), eq(true));
-  }
+    @Test
+    @EnabledOnJre({JAVA_8, JAVA_11})
+    public void runEnabledWithUnsupportedDatadogAgent() throws InterruptedException {
+        when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
+        when(config.getAgentUrl()).thenReturn(url.toString());
+        when(config.getFinalDebuggerSnapshotUrl()).thenReturn("http://localhost:8126/debugger/v1/input");
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
+        when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+        String infoContent = "{\"endpoints\": [\"v0.4/traces\"]}";
+        server.enqueue(new MockResponse().setResponseCode(200).setBody(infoContent));
+        DebuggerAgent.run(config, inst, new SharedCommunicationObjects());
+        verify(inst, never()).addTransformer(any(), eq(true));
+    }
 
-  @Test
-  @EnabledOnJre({JAVA_8, JAVA_11})
-  public void tags() {
-    Config config = mock(Config.class);
-    when(config.getEnv()).thenReturn("staging");
-    when(config.getVersion()).thenReturn("42.0");
-    when(config.getHostName()).thenReturn("MyHost");
-    Map<String, String> globalTags = new HashMap<>();
-    globalTags.put("globalTag1", "globalValue1");
-    globalTags.put("globalTag2", "globalValue2");
-    when(config.getGlobalTags()).thenReturn(globalTags);
-    // set env vars now to be cached by GitInfoProvider
-    GitInfoProvider.INSTANCE.invalidateCache();
-    env.set("DD_GIT_COMMIT_SHA", "sha1");
-    env.set("DD_GIT_REPOSITORY_URL", "http://github.com");
-    String tags;
-    try {
-      tags = DebuggerAgent.getDefaultTagsMergedWithGlobalTags(config);
-    } finally {
-      env.set("DD_GIT_COMMIT_SHA", null);
-      env.set("DD_GIT_REPOSITORY_URL", null);
-      GitInfoProvider.INSTANCE.invalidateCache();
+    @Test
+    @EnabledOnJre({JAVA_8, JAVA_11})
+    public void readFromFile() throws URISyntaxException {
+        URL res = getClass().getClassLoader().getResource("test_probe_file.json");
+        String probeDefinitionPath = Paths.get(res.toURI()).toFile().getAbsolutePath();
+        when(config.getServiceName()).thenReturn("petclinic");
+        when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
+        when(config.getAgentUrl()).thenReturn(url.toString());
+        when(config.getDynamicInstrumentationMaxPayloadSize()).thenReturn(4096L);
+        when(config.getDynamicInstrumentationProbeFile()).thenReturn(probeDefinitionPath);
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
+        when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+        String infoContent =
+                "{\"endpoints\": [\"v0.4/traces\", \"debugger/v1/input\", \"debugger/v1/diagnostics\", \"v0.7/config\"] }";
+        server.enqueue(new MockResponse().setResponseCode(200).setBody(infoContent));
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[0]);
+        DebuggerAgent.run(config, inst, new SharedCommunicationObjects());
+        verify(inst, atLeastOnce()).addTransformer(any(), eq(true));
     }
-    Map<String, String> resultTags = new HashMap<>();
-    String[] splitTags = tags.split(",");
-    for (String splitTag : splitTags) {
-      int idx = splitTag.indexOf(':');
-      resultTags.put(splitTag.substring(0, idx), splitTag.substring(idx + 1));
+
+    @Test
+    @EnabledOnJre({JAVA_8, JAVA_11})
+    public void tags() {
+        Config config = mock(Config.class);
+        when(config.getEnv()).thenReturn("staging");
+        when(config.getVersion()).thenReturn("42.0");
+        when(config.getHostName()).thenReturn("MyHost");
+        Map<String, String> globalTags = new HashMap<>();
+        globalTags.put("globalTag1", "globalValue1");
+        globalTags.put("globalTag2", "globalValue2");
+        when(config.getGlobalTags()).thenReturn(globalTags);
+        // set env vars now to be cached by GitInfoProvider
+        GitInfoProvider.INSTANCE.invalidateCache();
+        env.set("DD_GIT_COMMIT_SHA", "sha1");
+        env.set("DD_GIT_REPOSITORY_URL", "http://github.com");
+        String tags;
+        try {
+            tags = DebuggerAgent.getDefaultTagsMergedWithGlobalTags(config);
+        } finally {
+            env.set("DD_GIT_COMMIT_SHA", null);
+            env.set("DD_GIT_REPOSITORY_URL", null);
+            GitInfoProvider.INSTANCE.invalidateCache();
+        }
+        Map<String, String> resultTags = new HashMap<>();
+        String[] splitTags = tags.split(",");
+        for (String splitTag : splitTags) {
+            int idx = splitTag.indexOf(':');
+            resultTags.put(splitTag.substring(0, idx), splitTag.substring(idx + 1));
+        }
+        assertEquals("staging", resultTags.get(Tags.ENV));
+        assertEquals("42.0", resultTags.get("version"));
+        assertEquals("MyHost", resultTags.get("host_name"));
+        assertEquals("globalValue1", resultTags.get("globalTag1"));
+        assertEquals("globalValue2", resultTags.get("globalTag2"));
+        assertEquals("sha1", resultTags.get(Tags.GIT_COMMIT_SHA));
+        assertEquals("http://github.com", resultTags.get(Tags.GIT_REPOSITORY_URL));
     }
-    assertEquals("staging", resultTags.get(Tags.ENV));
-    assertEquals("42.0", resultTags.get("version"));
-    assertEquals("MyHost", resultTags.get("host_name"));
-    assertEquals("globalValue1", resultTags.get("globalTag1"));
-    assertEquals("globalValue2", resultTags.get("globalTag2"));
-    assertEquals("sha1", resultTags.get(Tags.GIT_COMMIT_SHA));
-    assertEquals("http://github.com", resultTags.get(Tags.GIT_REPOSITORY_URL));
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerFeaturesTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerFeaturesTest.java
index ce419f9fb2d..671309d1859 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerFeaturesTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerFeaturesTest.java
@@ -8,22 +8,22 @@
 
 public class DebuggerFeaturesTest {
 
-  @Test
-  public void roundtripSerialization() throws Exception {
-    String buffer = serialize();
-    System.out.println(buffer);
-    deserialize(buffer);
-  }
+    @Test
+    public void roundtripSerialization() throws Exception {
+        String buffer = serialize();
+        System.out.println(buffer);
+        deserialize(buffer);
+    }
 
-  private String serialize() throws IOException {
-    DebuggerFeatures features = new DebuggerFeatures();
-    features.enabled = true;
-    return DebuggerFeaturesDeserializer.INSTANCE.serialize(features);
-  }
+    private String serialize() throws IOException {
+        DebuggerFeatures features = new DebuggerFeatures();
+        features.enabled = true;
+        return DebuggerFeaturesDeserializer.INSTANCE.serialize(features);
+    }
 
-  private void deserialize(String buffer) throws IOException {
-    DebuggerFeatures features =
-        DebuggerFeaturesDeserializer.INSTANCE.deserialize(buffer.getBytes(StandardCharsets.UTF_8));
-    assertEquals(true, features.enabled);
-  }
+    private void deserialize(String buffer) throws IOException {
+        DebuggerFeatures features =
+                DebuggerFeaturesDeserializer.INSTANCE.deserialize(buffer.getBytes(StandardCharsets.UTF_8));
+        assertEquals(true, features.enabled);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerProductChangesListenerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerProductChangesListenerTest.java
index 94a5a4afdc8..0cd754ec81d 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerProductChangesListenerTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerProductChangesListenerTest.java
@@ -39,273 +39,246 @@
 
 @ExtendWith(MockitoExtension.class)
 public class DebuggerProductChangesListenerTest {
-  private static final String SERVICE_NAME = "service-name";
+    private static final String SERVICE_NAME = "service-name";
 
-  @Mock private Config tracerConfig;
+    @Mock
+    private Config tracerConfig;
 
-  static class SimpleAcceptor implements ConfigurationAcceptor {
-    private Collection<? extends ProbeDefinition> definitions;
-    private Exception lastException;
+    static class SimpleAcceptor implements ConfigurationAcceptor {
+        private Collection<? extends ProbeDefinition> definitions;
+        private Exception lastException;
 
-    @Override
-    public void accept(Source source, Collection<? extends ProbeDefinition> definitions) {
-      this.definitions = definitions;
+        @Override
+        public void accept(Source source, Collection<? extends ProbeDefinition> definitions) {
+            this.definitions = definitions;
+        }
+
+        @Override
+        public void handleException(String configId, Exception ex) {
+            lastException = ex;
+        }
+
+        public Collection<? extends ProbeDefinition> getDefinitions() {
+            return definitions;
+        }
+
+        public Exception getLastException() {
+            return lastException;
+        }
+    }
+
+    @BeforeEach
+    void setUp() {
+        lenient().when(tracerConfig.getServiceName()).thenReturn(SERVICE_NAME);
+    }
+
+    @Test
+    public void testNoConfiguration() {
+        SimpleAcceptor acceptor = new SimpleAcceptor();
+
+        DebuggerProductChangesListener listener = new DebuggerProductChangesListener(acceptor);
+        listener.commit(NOOP);
+
+        assertTrue(acceptor.getDefinitions().isEmpty());
+    }
+
+    @Test
+    public void testMultipleSingleProbesConfigurations() {
+        SimpleAcceptor acceptor = new SimpleAcceptor();
+
+        DebuggerProductChangesListener listener = new DebuggerProductChangesListener(acceptor);
+
+        MetricProbe metricProbe = createMetricProbe(UUID.randomUUID().toString());
+        LogProbe logProbe = createLogProbe(UUID.randomUUID().toString());
+        SpanProbe spanProbe = createSpanProbe(UUID.randomUUID().toString());
+        SpanDecorationProbe spanDecorationProbe =
+                createSpanDecorationProbe(UUID.randomUUID().toString());
+        TriggerProbe triggerProbe = createTriggerProbe(UUID.randomUUID().toString());
+
+        acceptMetricProbe(listener, metricProbe);
+        listener.commit(NOOP);
+        assertDefinitions(acceptor.getDefinitions(), metricProbe);
+
+        acceptLogProbe(listener, logProbe);
+        listener.commit(NOOP);
+        assertDefinitions(acceptor.getDefinitions(), metricProbe, logProbe);
+
+        acceptSpanProbe(listener, spanProbe);
+        listener.commit(NOOP);
+        assertDefinitions(acceptor.getDefinitions(), metricProbe, logProbe, spanProbe);
+
+        acceptSpanDecorationProbe(listener, spanDecorationProbe);
+        listener.commit(NOOP);
+        assertDefinitions(acceptor.getDefinitions(), metricProbe, logProbe, spanProbe, spanDecorationProbe);
+
+        acceptTriggerProbe(listener, triggerProbe);
+        listener.commit(NOOP);
+        assertDefinitions(
+                acceptor.getDefinitions(), metricProbe, logProbe, spanProbe, spanDecorationProbe, triggerProbe);
+
+        removeMetricProbe(listener, metricProbe);
+        listener.commit(NOOP);
+        assertDefinitions(acceptor.getDefinitions(), logProbe, spanProbe, spanDecorationProbe, triggerProbe);
+
+        removeLogProbe(listener, logProbe);
+        listener.commit(NOOP);
+        assertDefinitions(acceptor.getDefinitions(), spanProbe, spanDecorationProbe, triggerProbe);
+
+        removeSpanProbe(listener, spanProbe);
+        listener.commit(NOOP);
+        assertDefinitions(acceptor.getDefinitions(), spanDecorationProbe, triggerProbe);
+
+        removeSpanDecorationProbe(listener, spanDecorationProbe);
+        listener.commit(NOOP);
+        assertDefinitions(acceptor.getDefinitions(), triggerProbe);
+
+        removeTriggerProbe(listener, triggerProbe);
+        listener.commit(NOOP);
+        assertTrue(acceptor.getDefinitions().isEmpty());
+    }
+
+    @Test
+    public void badConfigIDFailsToAccept() throws IOException {
+        SimpleAcceptor acceptor = new SimpleAcceptor();
+        DebuggerProductChangesListener listener = new DebuggerProductChangesListener(acceptor);
+        listener.accept(createConfigKey("bad-config-id"), null, NOOP);
+        assertNull(acceptor.definitions);
+    }
+
+    @Test
+    public void parsingException() throws IOException {
+        SimpleAcceptor acceptor = new SimpleAcceptor();
+        DebuggerProductChangesListener listener = new DebuggerProductChangesListener(acceptor);
+        String probeUUID = UUID.randomUUID().toString();
+        IOException ioException = assertThrows(
+                IOException.class,
+                () -> listener.accept(
+                        createConfigKey("logProbe_" + probeUUID), "{bad json}".getBytes(StandardCharsets.UTF_8), NOOP));
+        assertNotNull(acceptor.lastException);
+        assertEquals(ioException.getCause(), acceptor.lastException);
+    }
+
+    private void assertDefinitions(
+            Collection<? extends ProbeDefinition> actualDefinitions, ProbeDefinition... expectedDefinitions) {
+        assertEquals(new HashSet<>(Arrays.asList(expectedDefinitions)), new HashSet<>(actualDefinitions));
+    }
+
+    byte[] toContent(MetricProbe probe) {
+        return serializeMetricProbe(probe).getBytes(StandardCharsets.UTF_8);
+    }
+
+    byte[] toContent(LogProbe probe) {
+        return serializeLogProbe(probe).getBytes(StandardCharsets.UTF_8);
+    }
+
+    byte[] toContent(SpanProbe probe) {
+        return serializeSpanProbe(probe).getBytes(StandardCharsets.UTF_8);
+    }
+
+    byte[] toContent(SpanDecorationProbe probe) {
+        return serializeSpanDecorationProbe(probe).getBytes(StandardCharsets.UTF_8);
+    }
+
+    byte[] toContent(TriggerProbe probe) {
+        return serializeTriggerProbe(probe).getBytes(StandardCharsets.UTF_8);
+    }
+
+    void acceptMetricProbe(DebuggerProductChangesListener listener, MetricProbe probe) {
+        assertDoesNotThrow(
+                () -> listener.accept(createConfigKey("metricProbe_" + probe.getId()), toContent(probe), NOOP));
+    }
+
+    void removeMetricProbe(DebuggerProductChangesListener listener, MetricProbe probe) {
+        assertDoesNotThrow(() -> listener.remove(createConfigKey("metricProbe_" + probe.getId()), NOOP));
+    }
+
+    void acceptLogProbe(DebuggerProductChangesListener listener, LogProbe probe) {
+        assertDoesNotThrow(() -> listener.accept(createConfigKey("logProbe_" + probe.getId()), toContent(probe), NOOP));
+    }
+
+    void removeLogProbe(DebuggerProductChangesListener listener, LogProbe probe) {
+        assertDoesNotThrow(() -> listener.remove(createConfigKey("logProbe_" + probe.getId()), NOOP));
+    }
+
+    void acceptSpanProbe(DebuggerProductChangesListener listener, SpanProbe probe) {
+        assertDoesNotThrow(
+                () -> listener.accept(createConfigKey("spanProbe_" + probe.getId()), toContent(probe), NOOP));
+    }
+
+    void acceptSpanDecorationProbe(DebuggerProductChangesListener listener, SpanDecorationProbe probe) {
+        assertDoesNotThrow(
+                () -> listener.accept(createConfigKey("spanDecorationProbe_" + probe.getId()), toContent(probe), NOOP));
+    }
+
+    void acceptTriggerProbe(DebuggerProductChangesListener listener, TriggerProbe probe) {
+        assertDoesNotThrow(
+                () -> listener.accept(createConfigKey("triggerProbe_" + probe.getId()), toContent(probe), NOOP));
+    }
+
+    void removeSpanProbe(DebuggerProductChangesListener listener, SpanProbe probe) {
+        assertDoesNotThrow(() -> listener.remove(createConfigKey("spanProbe_" + probe.getId()), NOOP));
+    }
+
+    void removeSpanDecorationProbe(DebuggerProductChangesListener listener, SpanDecorationProbe probe) {
+        assertDoesNotThrow(() -> listener.remove(createConfigKey("spanDecorationProbe_" + probe.getId()), NOOP));
+    }
+
+    void removeTriggerProbe(DebuggerProductChangesListener listener, TriggerProbe probe) {
+        assertDoesNotThrow(() -> listener.remove(createConfigKey("triggerProbe_" + probe.getId()), NOOP));
+    }
+
+    LogProbe createLogProbeWithSnapshot(String id) {
+        return LogProbe.builder()
+                .probeId(id, 0)
+                .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
+                .captureSnapshot(true)
+                .build();
+    }
+
+    MetricProbe createMetricProbe(String id) {
+        return MetricProbe.builder()
+                .probeId(id, 0)
+                .kind(MetricProbe.MetricKind.COUNT)
+                .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
+                .build();
+    }
+
+    LogProbe createLogProbe(String id) {
+        final String LOG_LINE = "hello {world}";
+        return LogProbe.builder()
+                .probeId(id, 0)
+                .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
+                .template(LOG_LINE, parseTemplate(LOG_LINE))
+                .build();
+    }
+
+    SpanProbe createSpanProbe(String id) {
+        return SpanProbe.builder()
+                .probeId(id, 0)
+                .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
+                .build();
+    }
+
+    SpanDecorationProbe createSpanDecorationProbe(String id) {
+        return SpanDecorationProbe.builder()
+                .probeId(id, 0)
+                .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
+                .targetSpan(SpanDecorationProbe.TargetSpan.ACTIVE)
+                .build();
     }
 
-    @Override
-    public void handleException(String configId, Exception ex) {
-      lastException = ex;
+    TriggerProbe createTriggerProbe(String id) {
+        return TriggerProbe.builder()
+                .probeId(new ProbeId(id, 0))
+                .where("java.lang.String", "indexOf", null)
+                .build();
     }
 
-    public Collection<? extends ProbeDefinition> getDefinitions() {
-      return definitions;
+    Configuration.FilterList createFilteredList() {
+        return new Configuration.FilterList(Collections.singletonList("datadog"), Collections.singletonList("class1"));
     }
 
-    public Exception getLastException() {
-      return lastException;
+    ParsedConfigKey createConfigKey(String configId) {
+        return ParsedConfigKey.parse("datadog/2/LIVE_DEBUGGING/" + configId + "/config");
     }
-  }
-
-  @BeforeEach
-  void setUp() {
-    lenient().when(tracerConfig.getServiceName()).thenReturn(SERVICE_NAME);
-  }
-
-  @Test
-  public void testNoConfiguration() {
-    SimpleAcceptor acceptor = new SimpleAcceptor();
-
-    DebuggerProductChangesListener listener = new DebuggerProductChangesListener(acceptor);
-    listener.commit(NOOP);
-
-    assertTrue(acceptor.getDefinitions().isEmpty());
-  }
-
-  @Test
-  public void testMultipleSingleProbesConfigurations() {
-    SimpleAcceptor acceptor = new SimpleAcceptor();
-
-    DebuggerProductChangesListener listener = new DebuggerProductChangesListener(acceptor);
-
-    MetricProbe metricProbe = createMetricProbe(UUID.randomUUID().toString());
-    LogProbe logProbe = createLogProbe(UUID.randomUUID().toString());
-    SpanProbe spanProbe = createSpanProbe(UUID.randomUUID().toString());
-    SpanDecorationProbe spanDecorationProbe =
-        createSpanDecorationProbe(UUID.randomUUID().toString());
-    TriggerProbe triggerProbe = createTriggerProbe(UUID.randomUUID().toString());
-
-    acceptMetricProbe(listener, metricProbe);
-    listener.commit(NOOP);
-    assertDefinitions(acceptor.getDefinitions(), metricProbe);
-
-    acceptLogProbe(listener, logProbe);
-    listener.commit(NOOP);
-    assertDefinitions(acceptor.getDefinitions(), metricProbe, logProbe);
-
-    acceptSpanProbe(listener, spanProbe);
-    listener.commit(NOOP);
-    assertDefinitions(acceptor.getDefinitions(), metricProbe, logProbe, spanProbe);
-
-    acceptSpanDecorationProbe(listener, spanDecorationProbe);
-    listener.commit(NOOP);
-    assertDefinitions(
-        acceptor.getDefinitions(), metricProbe, logProbe, spanProbe, spanDecorationProbe);
-
-    acceptTriggerProbe(listener, triggerProbe);
-    listener.commit(NOOP);
-    assertDefinitions(
-        acceptor.getDefinitions(),
-        metricProbe,
-        logProbe,
-        spanProbe,
-        spanDecorationProbe,
-        triggerProbe);
-
-    removeMetricProbe(listener, metricProbe);
-    listener.commit(NOOP);
-    assertDefinitions(
-        acceptor.getDefinitions(), logProbe, spanProbe, spanDecorationProbe, triggerProbe);
-
-    removeLogProbe(listener, logProbe);
-    listener.commit(NOOP);
-    assertDefinitions(acceptor.getDefinitions(), spanProbe, spanDecorationProbe, triggerProbe);
-
-    removeSpanProbe(listener, spanProbe);
-    listener.commit(NOOP);
-    assertDefinitions(acceptor.getDefinitions(), spanDecorationProbe, triggerProbe);
-
-    removeSpanDecorationProbe(listener, spanDecorationProbe);
-    listener.commit(NOOP);
-    assertDefinitions(acceptor.getDefinitions(), triggerProbe);
-
-    removeTriggerProbe(listener, triggerProbe);
-    listener.commit(NOOP);
-    assertTrue(acceptor.getDefinitions().isEmpty());
-  }
-
-  @Test
-  public void badConfigIDFailsToAccept() throws IOException {
-    SimpleAcceptor acceptor = new SimpleAcceptor();
-    DebuggerProductChangesListener listener = new DebuggerProductChangesListener(acceptor);
-    listener.accept(createConfigKey("bad-config-id"), null, NOOP);
-    assertNull(acceptor.definitions);
-  }
-
-  @Test
-  public void parsingException() throws IOException {
-    SimpleAcceptor acceptor = new SimpleAcceptor();
-    DebuggerProductChangesListener listener = new DebuggerProductChangesListener(acceptor);
-    String probeUUID = UUID.randomUUID().toString();
-    IOException ioException =
-        assertThrows(
-            IOException.class,
-            () ->
-                listener.accept(
-                    createConfigKey("logProbe_" + probeUUID),
-                    "{bad json}".getBytes(StandardCharsets.UTF_8),
-                    NOOP));
-    assertNotNull(acceptor.lastException);
-    assertEquals(ioException.getCause(), acceptor.lastException);
-  }
-
-  private void assertDefinitions(
-      Collection<? extends ProbeDefinition> actualDefinitions,
-      ProbeDefinition... expectedDefinitions) {
-    assertEquals(
-        new HashSet<>(Arrays.asList(expectedDefinitions)), new HashSet<>(actualDefinitions));
-  }
-
-  byte[] toContent(MetricProbe probe) {
-    return serializeMetricProbe(probe).getBytes(StandardCharsets.UTF_8);
-  }
-
-  byte[] toContent(LogProbe probe) {
-    return serializeLogProbe(probe).getBytes(StandardCharsets.UTF_8);
-  }
-
-  byte[] toContent(SpanProbe probe) {
-    return serializeSpanProbe(probe).getBytes(StandardCharsets.UTF_8);
-  }
-
-  byte[] toContent(SpanDecorationProbe probe) {
-    return serializeSpanDecorationProbe(probe).getBytes(StandardCharsets.UTF_8);
-  }
-
-  byte[] toContent(TriggerProbe probe) {
-    return serializeTriggerProbe(probe).getBytes(StandardCharsets.UTF_8);
-  }
-
-  void acceptMetricProbe(DebuggerProductChangesListener listener, MetricProbe probe) {
-    assertDoesNotThrow(
-        () ->
-            listener.accept(
-                createConfigKey("metricProbe_" + probe.getId()), toContent(probe), NOOP));
-  }
-
-  void removeMetricProbe(DebuggerProductChangesListener listener, MetricProbe probe) {
-    assertDoesNotThrow(
-        () -> listener.remove(createConfigKey("metricProbe_" + probe.getId()), NOOP));
-  }
-
-  void acceptLogProbe(DebuggerProductChangesListener listener, LogProbe probe) {
-    assertDoesNotThrow(
-        () ->
-            listener.accept(createConfigKey("logProbe_" + probe.getId()), toContent(probe), NOOP));
-  }
-
-  void removeLogProbe(DebuggerProductChangesListener listener, LogProbe probe) {
-    assertDoesNotThrow(() -> listener.remove(createConfigKey("logProbe_" + probe.getId()), NOOP));
-  }
-
-  void acceptSpanProbe(DebuggerProductChangesListener listener, SpanProbe probe) {
-    assertDoesNotThrow(
-        () ->
-            listener.accept(createConfigKey("spanProbe_" + probe.getId()), toContent(probe), NOOP));
-  }
-
-  void acceptSpanDecorationProbe(
-      DebuggerProductChangesListener listener, SpanDecorationProbe probe) {
-    assertDoesNotThrow(
-        () ->
-            listener.accept(
-                createConfigKey("spanDecorationProbe_" + probe.getId()), toContent(probe), NOOP));
-  }
-
-  void acceptTriggerProbe(DebuggerProductChangesListener listener, TriggerProbe probe) {
-    assertDoesNotThrow(
-        () ->
-            listener.accept(
-                createConfigKey("triggerProbe_" + probe.getId()), toContent(probe), NOOP));
-  }
-
-  void removeSpanProbe(DebuggerProductChangesListener listener, SpanProbe probe) {
-    assertDoesNotThrow(() -> listener.remove(createConfigKey("spanProbe_" + probe.getId()), NOOP));
-  }
-
-  void removeSpanDecorationProbe(
-      DebuggerProductChangesListener listener, SpanDecorationProbe probe) {
-    assertDoesNotThrow(
-        () -> listener.remove(createConfigKey("spanDecorationProbe_" + probe.getId()), NOOP));
-  }
-
-  void removeTriggerProbe(DebuggerProductChangesListener listener, TriggerProbe probe) {
-    assertDoesNotThrow(
-        () -> listener.remove(createConfigKey("triggerProbe_" + probe.getId()), NOOP));
-  }
-
-  LogProbe createLogProbeWithSnapshot(String id) {
-    return LogProbe.builder()
-        .probeId(id, 0)
-        .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
-        .captureSnapshot(true)
-        .build();
-  }
-
-  MetricProbe createMetricProbe(String id) {
-    return MetricProbe.builder()
-        .probeId(id, 0)
-        .kind(MetricProbe.MetricKind.COUNT)
-        .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
-        .build();
-  }
-
-  LogProbe createLogProbe(String id) {
-    final String LOG_LINE = "hello {world}";
-    return LogProbe.builder()
-        .probeId(id, 0)
-        .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
-        .template(LOG_LINE, parseTemplate(LOG_LINE))
-        .build();
-  }
-
-  SpanProbe createSpanProbe(String id) {
-    return SpanProbe.builder()
-        .probeId(id, 0)
-        .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
-        .build();
-  }
-
-  SpanDecorationProbe createSpanDecorationProbe(String id) {
-    return SpanDecorationProbe.builder()
-        .probeId(id, 0)
-        .where(null, null, null, 1966, "src/main/java/java/lang/String.java")
-        .targetSpan(SpanDecorationProbe.TargetSpan.ACTIVE)
-        .build();
-  }
-
-  TriggerProbe createTriggerProbe(String id) {
-    return TriggerProbe.builder()
-        .probeId(new ProbeId(id, 0))
-        .where("java.lang.String", "indexOf", null)
-        .build();
-  }
-
-  Configuration.FilterList createFilteredList() {
-    return new Configuration.FilterList(
-        Collections.singletonList("datadog"), Collections.singletonList("class1"));
-  }
-
-  ParsedConfigKey createConfigKey(String configId) {
-    return ParsedConfigKey.parse("datadog/2/LIVE_DEBUGGING/" + configId + "/config");
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTracerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTracerTest.java
index a0f24c7f1ab..caa6ac341ff 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTracerTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTracerTest.java
@@ -18,57 +18,55 @@
 
 class DebuggerTracerTest {
 
-  private static final ProbeId SPAN_ID = new ProbeId("spanProbe-id", 1);
+    private static final ProbeId SPAN_ID = new ProbeId("spanProbe-id", 1);
 
-  @AfterEach
-  public void after() {
-    AgentTracer.forceRegister(AgentTracer.NOOP_TRACER);
-  }
+    @AfterEach
+    public void after() {
+        AgentTracer.forceRegister(AgentTracer.NOOP_TRACER);
+    }
 
-  @Test
-  public void createSpan() {
-    AgentTracer.forceRegister(CoreTracer.builder().build());
-    ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
-    DebuggerTracer debuggerTracer = new DebuggerTracer(probeStatusSink);
-    DebuggerSpan span =
-        debuggerTracer.createSpan(SPAN_ID.getEncodedId(), "a-span", new String[] {"foo:bar"});
-    AgentSpan underlyingSpan = ((DebuggerTracer.DebuggerSpanImpl) span).underlyingSpan;
-    assertEquals("dd.dynamic.span", underlyingSpan.getSpanName());
-    assertEquals("a-span", underlyingSpan.getResourceName());
-    assertEquals(0, underlyingSpan.getDurationNano());
-    assertEquals(
-        "dd.dynamic.span",
-        AgentSpan.fromScope(((DebuggerTracer.DebuggerSpanImpl) span).currentScope).getSpanName());
-    assertEquals(
-        "a-span",
-        AgentSpan.fromScope(((DebuggerTracer.DebuggerSpanImpl) span).currentScope)
-            .getResourceName());
-    span.finish();
-    assertNotEquals(0, underlyingSpan.getDurationNano());
-    verify(probeStatusSink).addEmitting(eq(SPAN_ID.getEncodedId()));
-  }
+    @Test
+    public void createSpan() {
+        AgentTracer.forceRegister(CoreTracer.builder().build());
+        ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
+        DebuggerTracer debuggerTracer = new DebuggerTracer(probeStatusSink);
+        DebuggerSpan span = debuggerTracer.createSpan(SPAN_ID.getEncodedId(), "a-span", new String[] {"foo:bar"});
+        AgentSpan underlyingSpan = ((DebuggerTracer.DebuggerSpanImpl) span).underlyingSpan;
+        assertEquals("dd.dynamic.span", underlyingSpan.getSpanName());
+        assertEquals("a-span", underlyingSpan.getResourceName());
+        assertEquals(0, underlyingSpan.getDurationNano());
+        assertEquals(
+                "dd.dynamic.span",
+                AgentSpan.fromScope(((DebuggerTracer.DebuggerSpanImpl) span).currentScope)
+                        .getSpanName());
+        assertEquals(
+                "a-span",
+                AgentSpan.fromScope(((DebuggerTracer.DebuggerSpanImpl) span).currentScope)
+                        .getResourceName());
+        span.finish();
+        assertNotEquals(0, underlyingSpan.getDurationNano());
+        verify(probeStatusSink).addEmitting(eq(SPAN_ID.getEncodedId()));
+    }
 
-  @Test
-  public void setError() {
-    AgentTracer.forceRegister(CoreTracer.builder().build());
-    ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
-    DebuggerTracer debuggerTracer = new DebuggerTracer(probeStatusSink);
-    DebuggerSpan span =
-        debuggerTracer.createSpan(SPAN_ID.getEncodedId(), "a-span", new String[] {"foo:bar"});
-    span.setError(new IllegalArgumentException("oops"));
-    AgentSpan underlyingSpan = ((DebuggerTracer.DebuggerSpanImpl) span).underlyingSpan;
-    assertTrue(underlyingSpan.isError());
-    span.finish();
-    verify(probeStatusSink).addEmitting(eq(SPAN_ID.getEncodedId()));
-  }
+    @Test
+    public void setError() {
+        AgentTracer.forceRegister(CoreTracer.builder().build());
+        ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
+        DebuggerTracer debuggerTracer = new DebuggerTracer(probeStatusSink);
+        DebuggerSpan span = debuggerTracer.createSpan(SPAN_ID.getEncodedId(), "a-span", new String[] {"foo:bar"});
+        span.setError(new IllegalArgumentException("oops"));
+        AgentSpan underlyingSpan = ((DebuggerTracer.DebuggerSpanImpl) span).underlyingSpan;
+        assertTrue(underlyingSpan.isError());
+        span.finish();
+        verify(probeStatusSink).addEmitting(eq(SPAN_ID.getEncodedId()));
+    }
 
-  @Test
-  public void noApi() {
-    AgentTracer.forceRegister(AgentTracer.NOOP_TRACER);
-    ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
-    DebuggerTracer debuggerTracer = new DebuggerTracer(probeStatusSink);
-    DebuggerSpan span =
-        debuggerTracer.createSpan(SPAN_ID.getEncodedId(), "a-span", new String[] {"foo:bar"});
-    assertEquals(DebuggerSpan.NOOP_SPAN, span);
-  }
+    @Test
+    public void noApi() {
+        AgentTracer.forceRegister(AgentTracer.NOOP_TRACER);
+        ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
+        DebuggerTracer debuggerTracer = new DebuggerTracer(probeStatusSink);
+        DebuggerSpan span = debuggerTracer.createSpan(SPAN_ID.getEncodedId(), "a-span", new String[] {"foo:bar"});
+        assertEquals(DebuggerSpan.NOOP_SPAN, span);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTransformerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTransformerTest.java
index ce5fc834fa5..31fe0b645a1 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTransformerTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTransformerTest.java
@@ -61,415 +61,378 @@
 import org.objectweb.asm.tree.TableSwitchInsnNode;
 
 public class DebuggerTransformerTest {
-  private static final String LANGUAGE = "java";
-  private static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
-  private static final String SERVICE_NAME = "service-name";
-
-  enum InstrumentationKind {
-    ENTRY_EXIT,
-    LINE
-  }
-
-  enum ExceptionKind {
-    NONE,
-    UNHANDLED,
-    HANDLED
-  }
-
-  static final String VAR_NAME = "var";
-  static final String SCOPED_VAR_NAME = "scoped";
-  static final String SCOPED_VAR_TYPE = "int";
-  static final Object SCOPED_VAR_VALUE = 10;
-
-  private static Instrumentation instr;
-  private static Template classTemplate;
-
-  private static Tracer noopTracer;
-
-  private static final CapturedContext.CapturedValue[] CORRELATION_FIELDS =
-      new CapturedContext.CapturedValue[2];
-
-  @BeforeAll
-  static void setupAll() throws Exception {
-    // disable tracer integration
-    System.setProperty("dd." + TraceInstrumentationConfig.TRACE_ENABLED, "false");
-
-    // setup the tracer
-    noopTracer = GlobalTracer.get();
-    Tracer mockTracer = mock(Tracer.class);
-    when(mockTracer.getTraceId()).thenReturn("1");
-    when(mockTracer.getSpanId()).thenReturn("2");
-    GlobalTracer.forceRegister(mockTracer);
-
-    // prepare the correlation fields golden muster
-    CORRELATION_FIELDS[0] =
-        CapturedContext.CapturedValue.of(
-            "dd.trace_id", "java.lang.String", mockTracer.getTraceId());
-    CORRELATION_FIELDS[1] =
-        CapturedContext.CapturedValue.of("dd.span_id", "java.lang.String", mockTracer.getSpanId());
-
-    instr = ByteBuddyAgent.install();
-    freemarker.template.Configuration cfg =
-        new freemarker.template.Configuration(freemarker.template.Configuration.VERSION_2_3_29);
-    cfg.setBooleanFormat("c");
-    classTemplate =
-        new Template(
-            "classTemplate",
-            new InputStreamReader(
-                DebuggerTransformerTest.class.getResourceAsStream("/TargetClass.ftlh")),
-            cfg);
-    // TODO asserts are operating on 'toString()' which requires keeping the underlying object so we
-    // just disable serialization for now
-    DebuggerContext.initValueSerializer(null);
-  }
-
-  @AfterEach
-  void tearDown() {
-    // disable tracer integration
-    System.setProperty("dd." + TraceInstrumentationConfig.TRACE_ENABLED, "false");
-    ProbeRateLimiter.resetGlobalRate();
-  }
-
-  @BeforeEach
-  void setup() {
-    DebuggerContext.initProbeResolver(null);
-  }
-
-  @Test
-  public void testDump() {
-    Config config = createConfig();
-    Path initialTmpDir = DebuggerTransformer.DUMP_PATH;
-    DebuggerTransformer.DUMP_PATH = Paths.get("/tmp/debugger");
-    try {
-      when(config.isDynamicInstrumentationClassFileDumpEnabled()).thenReturn(true);
-      File instrumentedClassFile = new File("/tmp/debugger/java.util.ArrayList.class");
-      File origClassFile = new File("/tmp/debugger/java.util.ArrayList_orig.class");
-      if (instrumentedClassFile.exists()) {
-        instrumentedClassFile.delete();
-      }
-      if (origClassFile.exists()) {
-        origClassFile.delete();
-      }
-      LogProbe logProbe =
-          LogProbe.builder().where("java.util.ArrayList", "add").probeId("", 0).build();
-      DebuggerTransformer debuggerTransformer =
-          new DebuggerTransformer(
-              config,
-              new ProbeMetadata(),
-              new Configuration(SERVICE_NAME, Collections.singletonList(logProbe)));
-      debuggerTransformer.transform(
-          ClassLoader.getSystemClassLoader(),
-          "java.util.ArrayList",
-          ArrayList.class,
-          null,
-          getClassFileBytes(ArrayList.class));
-      assertTrue(instrumentedClassFile.exists());
-      assertTrue(origClassFile.exists());
-      assertTrue(instrumentedClassFile.delete());
-      assertTrue(origClassFile.delete());
-    } finally {
-      DebuggerTransformer.DUMP_PATH = initialTmpDir;
+    private static final String LANGUAGE = "java";
+    private static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
+    private static final String SERVICE_NAME = "service-name";
+
+    enum InstrumentationKind {
+        ENTRY_EXIT,
+        LINE
     }
-  }
-
-  @Test
-  public void testMultiProbes() {
-    doTestMultiProbes(
-        Class::getName,
-        new ProbeTestInfo(ArrayList.class, "add"),
-        new ProbeTestInfo(HashMap.class, "<init>", "void ()"));
-  }
-
-  @Test
-  public void testMultiProbesSimpleName() {
-    doTestMultiProbes(
-        Class::getSimpleName,
-        new ProbeTestInfo(ArrayList.class, "add"),
-        new ProbeTestInfo(HashMap.class, "<init>", "void ()"));
-  }
-
-  private void doTestMultiProbes(
-      Function<Class<?>, String> getClassName, ProbeTestInfo... probeInfos) {
-    Config config = createConfig();
-    List<LogProbe> logProbes = new ArrayList<>();
-    for (ProbeTestInfo probeInfo : probeInfos) {
-      String className = getClassName.apply(probeInfo.clazz);
-      LogProbe logProbe =
-          LogProbe.builder()
-              .where(className, probeInfo.methodName, probeInfo.signature)
-              .probeId("", 0)
-              .build();
-      logProbes.add(logProbe);
+
+    enum ExceptionKind {
+        NONE,
+        UNHANDLED,
+        HANDLED
     }
-    Configuration configuration = new Configuration(SERVICE_NAME, logProbes);
-    DebuggerTransformer debuggerTransformer =
-        new DebuggerTransformer(config, new ProbeMetadata(), configuration);
-    for (ProbeTestInfo probeInfo : probeInfos) {
-      byte[] newClassBuffer =
-          debuggerTransformer.transform(
-              ClassLoader.getSystemClassLoader(),
-              probeInfo.clazz.getName(), // always FQN
-              probeInfo.clazz,
-              null,
-              getClassFileBytes(probeInfo.clazz));
-      Assertions.assertNotNull(newClassBuffer);
+
+    static final String VAR_NAME = "var";
+    static final String SCOPED_VAR_NAME = "scoped";
+    static final String SCOPED_VAR_TYPE = "int";
+    static final Object SCOPED_VAR_VALUE = 10;
+
+    private static Instrumentation instr;
+    private static Template classTemplate;
+
+    private static Tracer noopTracer;
+
+    private static final CapturedContext.CapturedValue[] CORRELATION_FIELDS = new CapturedContext.CapturedValue[2];
+
+    @BeforeAll
+    static void setupAll() throws Exception {
+        // disable tracer integration
+        System.setProperty("dd." + TraceInstrumentationConfig.TRACE_ENABLED, "false");
+
+        // setup the tracer
+        noopTracer = GlobalTracer.get();
+        Tracer mockTracer = mock(Tracer.class);
+        when(mockTracer.getTraceId()).thenReturn("1");
+        when(mockTracer.getSpanId()).thenReturn("2");
+        GlobalTracer.forceRegister(mockTracer);
+
+        // prepare the correlation fields golden muster
+        CORRELATION_FIELDS[0] =
+                CapturedContext.CapturedValue.of("dd.trace_id", "java.lang.String", mockTracer.getTraceId());
+        CORRELATION_FIELDS[1] =
+                CapturedContext.CapturedValue.of("dd.span_id", "java.lang.String", mockTracer.getSpanId());
+
+        instr = ByteBuddyAgent.install();
+        freemarker.template.Configuration cfg =
+                new freemarker.template.Configuration(freemarker.template.Configuration.VERSION_2_3_29);
+        cfg.setBooleanFormat("c");
+        classTemplate = new Template(
+                "classTemplate",
+                new InputStreamReader(DebuggerTransformerTest.class.getResourceAsStream("/TargetClass.ftlh")),
+                cfg);
+        // TODO asserts are operating on 'toString()' which requires keeping the underlying object so we
+        // just disable serialization for now
+        DebuggerContext.initValueSerializer(null);
     }
-    byte[] newClassBuffer =
-        debuggerTransformer.transform(
-            ClassLoader.getSystemClassLoader(),
-            "java.util.HashSet",
-            HashSet.class,
-            null,
-            getClassFileBytes(HashSet.class));
-    assertNull(newClassBuffer);
-  }
-
-  static class ProbeTestInfo {
-    final Class<?> clazz;
-    final String methodName;
-    final String signature;
-
-    public ProbeTestInfo(Class<?> clazz, String methodName) {
-      this(clazz, methodName, null);
+
+    @AfterEach
+    void tearDown() {
+        // disable tracer integration
+        System.setProperty("dd." + TraceInstrumentationConfig.TRACE_ENABLED, "false");
+        ProbeRateLimiter.resetGlobalRate();
+    }
+
+    @BeforeEach
+    void setup() {
+        DebuggerContext.initProbeResolver(null);
+    }
+
+    @Test
+    public void testDump() {
+        Config config = createConfig();
+        Path initialTmpDir = DebuggerTransformer.DUMP_PATH;
+        DebuggerTransformer.DUMP_PATH = Paths.get("/tmp/debugger");
+        try {
+            when(config.isDynamicInstrumentationClassFileDumpEnabled()).thenReturn(true);
+            File instrumentedClassFile = new File("/tmp/debugger/java.util.ArrayList.class");
+            File origClassFile = new File("/tmp/debugger/java.util.ArrayList_orig.class");
+            if (instrumentedClassFile.exists()) {
+                instrumentedClassFile.delete();
+            }
+            if (origClassFile.exists()) {
+                origClassFile.delete();
+            }
+            LogProbe logProbe = LogProbe.builder()
+                    .where("java.util.ArrayList", "add")
+                    .probeId("", 0)
+                    .build();
+            DebuggerTransformer debuggerTransformer = new DebuggerTransformer(
+                    config, new ProbeMetadata(), new Configuration(SERVICE_NAME, Collections.singletonList(logProbe)));
+            debuggerTransformer.transform(
+                    ClassLoader.getSystemClassLoader(),
+                    "java.util.ArrayList",
+                    ArrayList.class,
+                    null,
+                    getClassFileBytes(ArrayList.class));
+            assertTrue(instrumentedClassFile.exists());
+            assertTrue(origClassFile.exists());
+            assertTrue(instrumentedClassFile.delete());
+            assertTrue(origClassFile.delete());
+        } finally {
+            DebuggerTransformer.DUMP_PATH = initialTmpDir;
+        }
+    }
+
+    @Test
+    public void testMultiProbes() {
+        doTestMultiProbes(
+                Class::getName,
+                new ProbeTestInfo(ArrayList.class, "add"),
+                new ProbeTestInfo(HashMap.class, "<init>", "void ()"));
+    }
+
+    @Test
+    public void testMultiProbesSimpleName() {
+        doTestMultiProbes(
+                Class::getSimpleName,
+                new ProbeTestInfo(ArrayList.class, "add"),
+                new ProbeTestInfo(HashMap.class, "<init>", "void ()"));
     }
 
-    public ProbeTestInfo(Class<?> clazz, String methodName, String signature) {
-      this.clazz = clazz;
-      this.methodName = methodName;
-      this.signature = signature;
+    private void doTestMultiProbes(Function<Class<?>, String> getClassName, ProbeTestInfo... probeInfos) {
+        Config config = createConfig();
+        List<LogProbe> logProbes = new ArrayList<>();
+        for (ProbeTestInfo probeInfo : probeInfos) {
+            String className = getClassName.apply(probeInfo.clazz);
+            LogProbe logProbe = LogProbe.builder()
+                    .where(className, probeInfo.methodName, probeInfo.signature)
+                    .probeId("", 0)
+                    .build();
+            logProbes.add(logProbe);
+        }
+        Configuration configuration = new Configuration(SERVICE_NAME, logProbes);
+        DebuggerTransformer debuggerTransformer = new DebuggerTransformer(config, new ProbeMetadata(), configuration);
+        for (ProbeTestInfo probeInfo : probeInfos) {
+            byte[] newClassBuffer = debuggerTransformer.transform(
+                    ClassLoader.getSystemClassLoader(),
+                    probeInfo.clazz.getName(), // always FQN
+                    probeInfo.clazz,
+                    null,
+                    getClassFileBytes(probeInfo.clazz));
+            Assertions.assertNotNull(newClassBuffer);
+        }
+        byte[] newClassBuffer = debuggerTransformer.transform(
+                ClassLoader.getSystemClassLoader(),
+                "java.util.HashSet",
+                HashSet.class,
+                null,
+                getClassFileBytes(HashSet.class));
+        assertNull(newClassBuffer);
     }
-  }
-
-  @Test
-  public void testBlockedProbes() {
-    Config config = createConfig();
-    List<LogProbe> logProbes =
-        Arrays.asList(
-            LogProbe.builder()
+
+    static class ProbeTestInfo {
+        final Class<?> clazz;
+        final String methodName;
+        final String signature;
+
+        public ProbeTestInfo(Class<?> clazz, String methodName) {
+            this(clazz, methodName, null);
+        }
+
+        public ProbeTestInfo(Class<?> clazz, String methodName, String signature) {
+            this.clazz = clazz;
+            this.methodName = methodName;
+            this.signature = signature;
+        }
+    }
+
+    @Test
+    public void testBlockedProbes() {
+        Config config = createConfig();
+        List<LogProbe> logProbes = Arrays.asList(LogProbe.builder()
                 .language(LANGUAGE)
                 .probeId(PROBE_ID)
                 .where("java.lang.String", "toString")
                 .build());
-    Configuration configuration = new Configuration(SERVICE_NAME, logProbes);
-    AtomicReference<InstrumentationResult> lastResult = new AtomicReference<>(null);
-    DebuggerTransformer debuggerTransformer =
-        new DebuggerTransformer(
-            config,
-            configuration,
-            ((definition, result) -> lastResult.set(result)),
-            new ProbeMetadata(),
-            new DebuggerSink(
-                config, new ProbeStatusSink(config, config.getFinalDebuggerSnapshotUrl(), false)));
-    byte[] newClassBuffer =
-        debuggerTransformer.transform(
-            ClassLoader.getSystemClassLoader(),
-            "java.lang.String",
-            String.class,
-            null,
-            getClassFileBytes(String.class));
-    assertNull(newClassBuffer);
-    Assertions.assertNotNull(lastResult.get());
-    assertTrue(lastResult.get().isBlocked());
-    Assertions.assertFalse(lastResult.get().isInstalled());
-    assertEquals("java.lang.String", lastResult.get().getTypeName());
-  }
-
-  @Test
-  public void classBeingRedefinedNull() {
-    Config config = createConfig();
-    LogProbe logProbe = LogProbe.builder().where("ArrayList", "add").probeId("", 0).build();
-    Configuration configuration =
-        new Configuration(SERVICE_NAME, Collections.singletonList(logProbe));
-    AtomicReference<InstrumentationResult> lastResult = new AtomicReference<>(null);
-    DebuggerTransformer debuggerTransformer =
-        new DebuggerTransformer(
-            config,
-            configuration,
-            ((definition, result) -> lastResult.set(result)),
-            new ProbeMetadata(),
-            new DebuggerSink(
-                config, new ProbeStatusSink(config, config.getFinalDebuggerSnapshotUrl(), false)));
-    byte[] newClassBuffer =
-        debuggerTransformer.transform(
-            ClassLoader.getSystemClassLoader(),
-            "java.util.ArrayList",
-            null, // classBeingRedefined
-            null,
-            getClassFileBytes(ArrayList.class));
-    Assertions.assertNotNull(newClassBuffer);
-    Assertions.assertNotNull(lastResult.get());
-    Assertions.assertFalse(lastResult.get().isBlocked());
-    assertTrue(lastResult.get().isInstalled());
-    assertEquals("java.util.ArrayList", lastResult.get().getTypeName());
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Issue with J9: Flaky")
-  public void classGenerationFailed() {
-    Config config = createConfig();
-    final String CLASS_NAME = ArrayList.class.getTypeName();
-    final String METHOD_NAME = "add";
-    MockProbe mockProbe = MockProbe.builder(PROBE_ID).where(CLASS_NAME, METHOD_NAME).build();
-    LogProbe logProbe1 =
-        LogProbe.builder().probeId("logprobe1", 0).where(CLASS_NAME, METHOD_NAME).build();
-    LogProbe logProbe2 =
-        LogProbe.builder().probeId("logprobe2", 0).where(CLASS_NAME, METHOD_NAME).build();
-    Configuration configuration =
-        Configuration.builder()
-            .setService(SERVICE_NAME)
-            .add(mockProbe, logProbe1, logProbe2)
-            .build();
-    AtomicReference<InstrumentationResult> lastResult = new AtomicReference<>(null);
-    ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
-    TestSnapshotListener listener = new TestSnapshotListener(config, probeStatusSink);
-    DebuggerTransformer debuggerTransformer =
-        new DebuggerTransformer(
-            config,
-            configuration,
-            ((definition, result) -> lastResult.set(result)),
-            new ProbeMetadata(),
-            listener);
-    DebuggerAgentHelper.injectSink(listener);
-    byte[] newClassBuffer =
+        Configuration configuration = new Configuration(SERVICE_NAME, logProbes);
+        AtomicReference<InstrumentationResult> lastResult = new AtomicReference<>(null);
+        DebuggerTransformer debuggerTransformer = new DebuggerTransformer(
+                config,
+                configuration,
+                ((definition, result) -> lastResult.set(result)),
+                new ProbeMetadata(),
+                new DebuggerSink(config, new ProbeStatusSink(config, config.getFinalDebuggerSnapshotUrl(), false)));
+        byte[] newClassBuffer = debuggerTransformer.transform(
+                ClassLoader.getSystemClassLoader(),
+                "java.lang.String",
+                String.class,
+                null,
+                getClassFileBytes(String.class));
+        assertNull(newClassBuffer);
+        Assertions.assertNotNull(lastResult.get());
+        assertTrue(lastResult.get().isBlocked());
+        Assertions.assertFalse(lastResult.get().isInstalled());
+        assertEquals("java.lang.String", lastResult.get().getTypeName());
+    }
+
+    @Test
+    public void classBeingRedefinedNull() {
+        Config config = createConfig();
+        LogProbe logProbe =
+                LogProbe.builder().where("ArrayList", "add").probeId("", 0).build();
+        Configuration configuration = new Configuration(SERVICE_NAME, Collections.singletonList(logProbe));
+        AtomicReference<InstrumentationResult> lastResult = new AtomicReference<>(null);
+        DebuggerTransformer debuggerTransformer = new DebuggerTransformer(
+                config,
+                configuration,
+                ((definition, result) -> lastResult.set(result)),
+                new ProbeMetadata(),
+                new DebuggerSink(config, new ProbeStatusSink(config, config.getFinalDebuggerSnapshotUrl(), false)));
+        byte[] newClassBuffer = debuggerTransformer.transform(
+                ClassLoader.getSystemClassLoader(),
+                "java.util.ArrayList",
+                null, // classBeingRedefined
+                null,
+                getClassFileBytes(ArrayList.class));
+        Assertions.assertNotNull(newClassBuffer);
+        Assertions.assertNotNull(lastResult.get());
+        Assertions.assertFalse(lastResult.get().isBlocked());
+        assertTrue(lastResult.get().isInstalled());
+        assertEquals("java.util.ArrayList", lastResult.get().getTypeName());
+    }
+
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Issue with J9: Flaky")
+    public void classGenerationFailed() {
+        Config config = createConfig();
+        final String CLASS_NAME = ArrayList.class.getTypeName();
+        final String METHOD_NAME = "add";
+        MockProbe mockProbe =
+                MockProbe.builder(PROBE_ID).where(CLASS_NAME, METHOD_NAME).build();
+        LogProbe logProbe1 = LogProbe.builder()
+                .probeId("logprobe1", 0)
+                .where(CLASS_NAME, METHOD_NAME)
+                .build();
+        LogProbe logProbe2 = LogProbe.builder()
+                .probeId("logprobe2", 0)
+                .where(CLASS_NAME, METHOD_NAME)
+                .build();
+        Configuration configuration = Configuration.builder()
+                .setService(SERVICE_NAME)
+                .add(mockProbe, logProbe1, logProbe2)
+                .build();
+        AtomicReference<InstrumentationResult> lastResult = new AtomicReference<>(null);
+        ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
+        TestSnapshotListener listener = new TestSnapshotListener(config, probeStatusSink);
+        DebuggerTransformer debuggerTransformer = new DebuggerTransformer(
+                config, configuration, ((definition, result) -> lastResult.set(result)), new ProbeMetadata(), listener);
+        DebuggerAgentHelper.injectSink(listener);
+        byte[] newClassBuffer = debuggerTransformer.transform(
+                ClassLoader.getSystemClassLoader(),
+                "java/util/ArrayList",
+                null,
+                null,
+                getClassFileBytes(ArrayList.class));
+        assertNull(newClassBuffer);
+        ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
+        ArgumentCaptor<ProbeId> probeIdCaptor = ArgumentCaptor.forClass(ProbeId.class);
+        verify(probeStatusSink, times(3)).addError(probeIdCaptor.capture(), strCaptor.capture());
+        assertEquals("logprobe1", probeIdCaptor.getAllValues().get(0).getId());
+        assertEquals("logprobe2", probeIdCaptor.getAllValues().get(1).getId());
+        assertEquals(PROBE_ID.getId(), probeIdCaptor.getAllValues().get(2).getId());
+        assertTrue(strCaptor
+                .getAllValues()
+                .get(0)
+                .startsWith(
+                        "Instrumentation failed for " + CLASS_NAME + ": org.objectweb.asm.MethodTooLargeException:"));
+        assertTrue(strCaptor
+                .getAllValues()
+                .get(1)
+                .startsWith(
+                        "Instrumentation failed for " + CLASS_NAME + ": org.objectweb.asm.MethodTooLargeException:"));
+        assertTrue(strCaptor
+                .getAllValues()
+                .get(2)
+                .startsWith(
+                        "Instrumentation failed for " + CLASS_NAME + ": org.objectweb.asm.MethodTooLargeException:"));
+    }
+
+    @Test
+    public void ordering() {
+        Config config = createConfig();
+        List<ProbeDefinition> invocationOrder = new ArrayList<>();
+        MetricProbe metricProbe = createMock(MetricProbe.class, invocationOrder, "metric");
+        LogProbe logProbe = createMock(LogProbe.class, invocationOrder, "log");
+        SpanProbe spanProbe = createMock(SpanProbe.class, invocationOrder, "span");
+        SpanDecorationProbe spanDecorationProbe =
+                createMock(SpanDecorationProbe.class, invocationOrder, "spanDecoration");
+        Configuration configuration = Configuration.builder()
+                .add(spanDecorationProbe)
+                .add(spanProbe)
+                .add(metricProbe)
+                .add(logProbe)
+                .build();
+        DebuggerTransformer debuggerTransformer = new DebuggerTransformer(
+                config,
+                configuration,
+                (definition, result) -> {
+                    if (result.isInstalled()) {
+                        invocationOrder.add(definition);
+                    }
+                },
+                new ProbeMetadata(),
+                new DebuggerSink(config, new ProbeStatusSink(config, config.getFinalDebuggerSnapshotUrl(), false)));
         debuggerTransformer.transform(
-            ClassLoader.getSystemClassLoader(),
-            "java/util/ArrayList",
-            null,
-            null,
-            getClassFileBytes(ArrayList.class));
-    assertNull(newClassBuffer);
-    ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
-    ArgumentCaptor<ProbeId> probeIdCaptor = ArgumentCaptor.forClass(ProbeId.class);
-    verify(probeStatusSink, times(3)).addError(probeIdCaptor.capture(), strCaptor.capture());
-    assertEquals("logprobe1", probeIdCaptor.getAllValues().get(0).getId());
-    assertEquals("logprobe2", probeIdCaptor.getAllValues().get(1).getId());
-    assertEquals(PROBE_ID.getId(), probeIdCaptor.getAllValues().get(2).getId());
-    assertTrue(
-        strCaptor
-            .getAllValues()
-            .get(0)
-            .startsWith(
-                "Instrumentation failed for "
-                    + CLASS_NAME
-                    + ": org.objectweb.asm.MethodTooLargeException:"));
-    assertTrue(
-        strCaptor
-            .getAllValues()
-            .get(1)
-            .startsWith(
-                "Instrumentation failed for "
-                    + CLASS_NAME
-                    + ": org.objectweb.asm.MethodTooLargeException:"));
-    assertTrue(
-        strCaptor
-            .getAllValues()
-            .get(2)
-            .startsWith(
-                "Instrumentation failed for "
-                    + CLASS_NAME
-                    + ": org.objectweb.asm.MethodTooLargeException:"));
-  }
-
-  @Test
-  public void ordering() {
-    Config config = createConfig();
-    List<ProbeDefinition> invocationOrder = new ArrayList<>();
-    MetricProbe metricProbe = createMock(MetricProbe.class, invocationOrder, "metric");
-    LogProbe logProbe = createMock(LogProbe.class, invocationOrder, "log");
-    SpanProbe spanProbe = createMock(SpanProbe.class, invocationOrder, "span");
-    SpanDecorationProbe spanDecorationProbe =
-        createMock(SpanDecorationProbe.class, invocationOrder, "spanDecoration");
-    Configuration configuration =
-        Configuration.builder()
-            .add(spanDecorationProbe)
-            .add(spanProbe)
-            .add(metricProbe)
-            .add(logProbe)
-            .build();
-    DebuggerTransformer debuggerTransformer =
-        new DebuggerTransformer(
-            config,
-            configuration,
-            (definition, result) -> {
-              if (result.isInstalled()) {
-                invocationOrder.add(definition);
-              }
-            },
-            new ProbeMetadata(),
-            new DebuggerSink(
-                config, new ProbeStatusSink(config, config.getFinalDebuggerSnapshotUrl(), false)));
-    debuggerTransformer.transform(
-        ClassLoader.getSystemClassLoader(),
-        ArrayList.class.getName(), // always FQN
-        ArrayList.class,
-        null,
-        getClassFileBytes(ArrayList.class));
-    assertEquals(4, invocationOrder.size());
-    assertEquals(metricProbe, invocationOrder.get(0));
-    assertEquals(logProbe, invocationOrder.get(1));
-    assertEquals(spanProbe, invocationOrder.get(2));
-    assertEquals(spanDecorationProbe, invocationOrder.get(3));
-  }
-
-  <T extends ProbeDefinition> T createMock(
-      Class<T> clazz, List<ProbeDefinition> invocationOrder, String id) {
-    ProbeDefinition mock = mock(clazz);
-    doAnswer(
-            invocation -> {
-              return InstrumentationResult.Status.INSTALLED;
-            })
-        .when(mock)
-        .instrument(any(), anyList(), anyList());
-    when(mock.getProbeId()).thenReturn(new ProbeId(id, 0));
-    Where where = Where.of(ArrayList.class.getName(), "add", "(Object)");
-    when(mock.getWhere()).thenReturn(where);
-    return (T) mock;
-  }
-
-  private Config createConfig() {
-    Config config = mock(Config.class);
-    when(config.getFinalDebuggerSnapshotUrl())
-        .thenReturn("http://localhost:8126/debugger/v1/input");
-    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
-    return config;
-  }
-
-  private static class MockProbe extends SpanProbe {
-
-    public MockProbe(ProbeId probeId, Where where) {
-      super(LANGUAGE, probeId, null, where);
+                ClassLoader.getSystemClassLoader(),
+                ArrayList.class.getName(), // always FQN
+                ArrayList.class,
+                null,
+                getClassFileBytes(ArrayList.class));
+        assertEquals(4, invocationOrder.size());
+        assertEquals(metricProbe, invocationOrder.get(0));
+        assertEquals(logProbe, invocationOrder.get(1));
+        assertEquals(spanProbe, invocationOrder.get(2));
+        assertEquals(spanDecorationProbe, invocationOrder.get(3));
     }
 
-    @Override
-    public InstrumentationResult.Status instrument(
-        MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices) {
-      // Build a single TABLESWITCH with enough case entries (4 bytes each) to push the
-      // method's bytecode past the 65535-byte limit, while keeping the ASM tree
-      // instruction *count* tiny so that dataflow analysis (computeFrames) stays cheap
-      // and succeeds; the failure should only manifest when ASM serializes the method.
-      LabelNode target = new LabelNode();
-      int high = 20_000;
-      LabelNode[] labels = new LabelNode[high + 1];
-      Arrays.fill(labels, target);
-      InsnList list = new InsnList();
-      list.add(new InsnNode(Opcodes.ICONST_0));
-      list.add(new TableSwitchInsnNode(0, high, target, labels));
-      list.add(target);
-      methodInfo.getMethodNode().instructions.insert(list);
-      return InstrumentationResult.Status.INSTALLED;
+    <T extends ProbeDefinition> T createMock(Class<T> clazz, List<ProbeDefinition> invocationOrder, String id) {
+        ProbeDefinition mock = mock(clazz);
+        doAnswer(invocation -> {
+                    return InstrumentationResult.Status.INSTALLED;
+                })
+                .when(mock)
+                .instrument(any(), anyList(), anyList());
+        when(mock.getProbeId()).thenReturn(new ProbeId(id, 0));
+        Where where = Where.of(ArrayList.class.getName(), "add", "(Object)");
+        when(mock.getWhere()).thenReturn(where);
+        return (T) mock;
     }
 
-    public static MockProbe.Builder builder(ProbeId probeId) {
-      return new MockProbe.Builder().probeId(probeId);
+    private Config createConfig() {
+        Config config = mock(Config.class);
+        when(config.getFinalDebuggerSnapshotUrl()).thenReturn("http://localhost:8126/debugger/v1/input");
+        when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
+        return config;
     }
 
-    public static class Builder extends ProbeDefinition.Builder<MockProbe.Builder> {
-      public MockProbe build() {
-        return new MockProbe(probeId, where);
-      }
+    private static class MockProbe extends SpanProbe {
+
+        public MockProbe(ProbeId probeId, Where where) {
+            super(LANGUAGE, probeId, null, where);
+        }
+
+        @Override
+        public InstrumentationResult.Status instrument(
+                MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<Integer> probeIndices) {
+            // Build a single TABLESWITCH with enough case entries (4 bytes each) to push the
+            // method's bytecode past the 65535-byte limit, while keeping the ASM tree
+            // instruction *count* tiny so that dataflow analysis (computeFrames) stays cheap
+            // and succeeds; the failure should only manifest when ASM serializes the method.
+            LabelNode target = new LabelNode();
+            int high = 20_000;
+            LabelNode[] labels = new LabelNode[high + 1];
+            Arrays.fill(labels, target);
+            InsnList list = new InsnList();
+            list.add(new InsnNode(Opcodes.ICONST_0));
+            list.add(new TableSwitchInsnNode(0, high, target, labels));
+            list.add(target);
+            methodInfo.getMethodNode().instructions.insert(list);
+            return InstrumentationResult.Status.INSTALLED;
+        }
+
+        public static MockProbe.Builder builder(ProbeId probeId) {
+            return new MockProbe.Builder().probeId(probeId);
+        }
+
+        public static class Builder extends ProbeDefinition.Builder<MockProbe.Builder> {
+            public MockProbe build() {
+                return new MockProbe(probeId, where);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DefaultDebuggerConfigUpdaterTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DefaultDebuggerConfigUpdaterTest.java
index 1779f642a9f..96db1ae77ed 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DefaultDebuggerConfigUpdaterTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DefaultDebuggerConfigUpdaterTest.java
@@ -17,37 +17,36 @@
 
 class DefaultDebuggerConfigUpdaterTest {
 
-  @Test
-  public void enableDisable() {
-    SharedCommunicationObjects sco = mock(SharedCommunicationObjects.class);
-    when(sco.configurationPoller(null)).thenReturn(mock(ConfigurationPoller.class));
-    when(sco.featuresDiscovery(any())).thenReturn(mock(DDAgentFeaturesDiscovery.class));
-    DebuggerAgent.run(Config.get(), mock(Instrumentation.class), sco);
-    DefaultDebuggerConfigUpdater productConfigUpdater =
-        new DefaultDebuggerConfigUpdater(Config.get());
-    productConfigUpdater.updateConfig(new DebuggerConfigUpdate());
-    productConfigUpdater.updateConfig(new DebuggerConfigUpdate(true, true, true, true));
-    assertTrue(productConfigUpdater.isDynamicInstrumentationEnabled());
-    if (JavaVirtualMachine.isJavaVersionAtLeast(11)) {
-      assertTrue(productConfigUpdater.isExceptionReplayEnabled());
-    } else {
-      assertFalse(productConfigUpdater.isExceptionReplayEnabled());
+    @Test
+    public void enableDisable() {
+        SharedCommunicationObjects sco = mock(SharedCommunicationObjects.class);
+        when(sco.configurationPoller(null)).thenReturn(mock(ConfigurationPoller.class));
+        when(sco.featuresDiscovery(any())).thenReturn(mock(DDAgentFeaturesDiscovery.class));
+        DebuggerAgent.run(Config.get(), mock(Instrumentation.class), sco);
+        DefaultDebuggerConfigUpdater productConfigUpdater = new DefaultDebuggerConfigUpdater(Config.get());
+        productConfigUpdater.updateConfig(new DebuggerConfigUpdate());
+        productConfigUpdater.updateConfig(new DebuggerConfigUpdate(true, true, true, true));
+        assertTrue(productConfigUpdater.isDynamicInstrumentationEnabled());
+        if (JavaVirtualMachine.isJavaVersionAtLeast(11)) {
+            assertTrue(productConfigUpdater.isExceptionReplayEnabled());
+        } else {
+            assertFalse(productConfigUpdater.isExceptionReplayEnabled());
+        }
+        assertTrue(productConfigUpdater.isCodeOriginEnabled());
+        assertTrue(productConfigUpdater.isDistributedDebuggerEnabled());
+        productConfigUpdater.updateConfig(new DebuggerConfigUpdate());
+        assertTrue(productConfigUpdater.isDynamicInstrumentationEnabled());
+        if (JavaVirtualMachine.isJavaVersionAtLeast(11)) {
+            assertTrue(productConfigUpdater.isExceptionReplayEnabled());
+        } else {
+            assertFalse(productConfigUpdater.isExceptionReplayEnabled());
+        }
+        assertTrue(productConfigUpdater.isCodeOriginEnabled());
+        assertTrue(productConfigUpdater.isDistributedDebuggerEnabled());
+        productConfigUpdater.updateConfig(new DebuggerConfigUpdate(false, false, false, false));
+        assertFalse(productConfigUpdater.isDynamicInstrumentationEnabled());
+        assertFalse(productConfigUpdater.isExceptionReplayEnabled());
+        assertFalse(productConfigUpdater.isCodeOriginEnabled());
+        assertFalse(productConfigUpdater.isDistributedDebuggerEnabled());
     }
-    assertTrue(productConfigUpdater.isCodeOriginEnabled());
-    assertTrue(productConfigUpdater.isDistributedDebuggerEnabled());
-    productConfigUpdater.updateConfig(new DebuggerConfigUpdate());
-    assertTrue(productConfigUpdater.isDynamicInstrumentationEnabled());
-    if (JavaVirtualMachine.isJavaVersionAtLeast(11)) {
-      assertTrue(productConfigUpdater.isExceptionReplayEnabled());
-    } else {
-      assertFalse(productConfigUpdater.isExceptionReplayEnabled());
-    }
-    assertTrue(productConfigUpdater.isCodeOriginEnabled());
-    assertTrue(productConfigUpdater.isDistributedDebuggerEnabled());
-    productConfigUpdater.updateConfig(new DebuggerConfigUpdate(false, false, false, false));
-    assertFalse(productConfigUpdater.isDynamicInstrumentationEnabled());
-    assertFalse(productConfigUpdater.isExceptionReplayEnabled());
-    assertFalse(productConfigUpdater.isCodeOriginEnabled());
-    assertFalse(productConfigUpdater.isDistributedDebuggerEnabled());
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DenyListHelperTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DenyListHelperTest.java
index b605782d257..1532264dbe3 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DenyListHelperTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DenyListHelperTest.java
@@ -5,16 +5,16 @@
 
 public class DenyListHelperTest {
 
-  @Test
-  public void isDeniedClass() {
-    DenyListHelper denyListHelper = new DenyListHelper(null);
-    Assertions.assertTrue(denyListHelper.isDenied("java.lang.String"));
-    Assertions.assertTrue(denyListHelper.isDenied("java.lang.Object"));
-    Assertions.assertTrue(denyListHelper.isDenied("java.security.Security"));
-    Assertions.assertTrue(denyListHelper.isDenied("javax.security.auth.AuthPermission"));
-    Assertions.assertFalse(denyListHelper.isDenied("java.util.List"));
-    Assertions.assertFalse(denyListHelper.isDenied("List"));
-    Assertions.assertFalse(denyListHelper.isDenied(null));
-    Assertions.assertFalse(denyListHelper.isDenied(""));
-  }
+    @Test
+    public void isDeniedClass() {
+        DenyListHelper denyListHelper = new DenyListHelper(null);
+        Assertions.assertTrue(denyListHelper.isDenied("java.lang.String"));
+        Assertions.assertTrue(denyListHelper.isDenied("java.lang.Object"));
+        Assertions.assertTrue(denyListHelper.isDenied("java.security.Security"));
+        Assertions.assertTrue(denyListHelper.isDenied("javax.security.auth.AuthPermission"));
+        Assertions.assertFalse(denyListHelper.isDenied("java.util.List"));
+        Assertions.assertFalse(denyListHelper.isDenied("List"));
+        Assertions.assertFalse(denyListHelper.isDenied(null));
+        Assertions.assertFalse(denyListHelper.isDenied(""));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/InnerHelper.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/InnerHelper.java
index a693a988cef..ed45cafcaae 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/InnerHelper.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/InnerHelper.java
@@ -2,7 +2,7 @@
 
 public class InnerHelper {
 
-  public static class MyInner {}
+    public static class MyInner {}
 
-  public static class MySecondInner {}
+    public static class MySecondInner {}
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/KotlinHelper.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/KotlinHelper.java
index e389cd951b7..a2c8a77651d 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/KotlinHelper.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/KotlinHelper.java
@@ -17,46 +17,42 @@
 import org.jetbrains.kotlin.config.Services;
 
 public class KotlinHelper {
-  public static Class<?> compileAndLoad(
-      String className, String sourceFileName, List<File> outputFilesToDelete) {
-    K2JVMCompiler compiler = new K2JVMCompiler();
-    K2JVMCompilerArguments args = compiler.createArguments();
-    args.setFreeArgs(Collections.singletonList(sourceFileName));
-    String compilerOutputDir = "/tmp/" + CapturedSnapshotTest.class.getSimpleName() + "-kotlin";
-    args.setDestination(compilerOutputDir);
-    args.setClasspath(System.getProperty("java.class.path"));
-    ExitCode exitCode =
-        compiler.exec(
-            new PrintingMessageCollector(System.out, MessageRenderer.WITHOUT_PATHS, true),
-            Services.EMPTY,
-            args);
+    public static Class<?> compileAndLoad(String className, String sourceFileName, List<File> outputFilesToDelete) {
+        K2JVMCompiler compiler = new K2JVMCompiler();
+        K2JVMCompilerArguments args = compiler.createArguments();
+        args.setFreeArgs(Collections.singletonList(sourceFileName));
+        String compilerOutputDir = "/tmp/" + CapturedSnapshotTest.class.getSimpleName() + "-kotlin";
+        args.setDestination(compilerOutputDir);
+        args.setClasspath(System.getProperty("java.class.path"));
+        ExitCode exitCode = compiler.exec(
+                new PrintingMessageCollector(System.out, MessageRenderer.WITHOUT_PATHS, true), Services.EMPTY, args);
 
-    if (exitCode.getCode() != 0) {
-      throw new RuntimeException("Kotlin compilation failed");
+        if (exitCode.getCode() != 0) {
+            throw new RuntimeException("Kotlin compilation failed");
+        }
+        File compileOutputDirFile = new File(compilerOutputDir);
+        try {
+            URLClassLoader urlClassLoader =
+                    new URLClassLoader(new URL[] {compileOutputDirFile.toURI().toURL()});
+            return urlClassLoader.loadClass(className);
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        } finally {
+            registerFilesToDeleteDir(compileOutputDirFile, outputFilesToDelete);
+        }
     }
-    File compileOutputDirFile = new File(compilerOutputDir);
-    try {
-      URLClassLoader urlClassLoader =
-          new URLClassLoader(new URL[] {compileOutputDirFile.toURI().toURL()});
-      return urlClassLoader.loadClass(className);
-    } catch (Exception ex) {
-      throw new RuntimeException(ex);
-    } finally {
-      registerFilesToDeleteDir(compileOutputDirFile, outputFilesToDelete);
-    }
-  }
 
-  public static void registerFilesToDeleteDir(File dir, List<File> outputFilesToDelete) {
-    if (!dir.exists()) {
-      return;
-    }
-    try {
-      Files.walk(dir.toPath())
-          .sorted(Comparator.reverseOrder())
-          .map(Path::toFile)
-          .forEach(outputFilesToDelete::add);
-    } catch (IOException ex) {
-      ex.printStackTrace();
+    public static void registerFilesToDeleteDir(File dir, List<File> outputFilesToDelete) {
+        if (!dir.exists()) {
+            return;
+        }
+        try {
+            Files.walk(dir.toPath())
+                    .sorted(Comparator.reverseOrder())
+                    .map(Path::toFile)
+                    .forEach(outputFilesToDelete::add);
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/LargeInnerClasses.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/LargeInnerClasses.java
index 825cba6ad0e..ee6f10dc009 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/LargeInnerClasses.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/LargeInnerClasses.java
@@ -2,207 +2,207 @@
 
 public class LargeInnerClasses {
 
-  public static int main(String arg) {
-    return 42; // beae1817-f3b0-4ea8-a74f-000000000001
-  }
+    public static int main(String arg) {
+        return 42; // beae1817-f3b0-4ea8-a74f-000000000001
+    }
 
-  static class MyInnerClass00 {}
+    static class MyInnerClass00 {}
 
-  static class MyInnerClass01 {}
+    static class MyInnerClass01 {}
 
-  static class MyInnerClass02 {}
+    static class MyInnerClass02 {}
 
-  static class MyInnerClass03 {}
+    static class MyInnerClass03 {}
 
-  static class MyInnerClass04 {}
+    static class MyInnerClass04 {}
 
-  static class MyInnerClass05 {}
+    static class MyInnerClass05 {}
 
-  static class MyInnerClass06 {}
+    static class MyInnerClass06 {}
 
-  static class MyInnerClass07 {}
+    static class MyInnerClass07 {}
 
-  static class MyInnerClass08 {}
+    static class MyInnerClass08 {}
 
-  static class MyInnerClass09 {}
+    static class MyInnerClass09 {}
 
-  static class MyInnerClass10 {}
+    static class MyInnerClass10 {}
 
-  static class MyInnerClass11 {}
+    static class MyInnerClass11 {}
 
-  static class MyInnerClass12 {}
+    static class MyInnerClass12 {}
 
-  static class MyInnerClass13 {}
+    static class MyInnerClass13 {}
 
-  static class MyInnerClass14 {}
+    static class MyInnerClass14 {}
 
-  static class MyInnerClass15 {}
+    static class MyInnerClass15 {}
 
-  static class MyInnerClass16 {}
+    static class MyInnerClass16 {}
 
-  static class MyInnerClass17 {}
+    static class MyInnerClass17 {}
 
-  static class MyInnerClass18 {}
+    static class MyInnerClass18 {}
 
-  static class MyInnerClass19 {}
+    static class MyInnerClass19 {}
 
-  static class MyInnerClass20 {}
+    static class MyInnerClass20 {}
 
-  static class MyInnerClass21 {}
+    static class MyInnerClass21 {}
 
-  static class MyInnerClass22 {}
+    static class MyInnerClass22 {}
 
-  static class MyInnerClass23 {}
+    static class MyInnerClass23 {}
 
-  static class MyInnerClass24 {}
+    static class MyInnerClass24 {}
 
-  static class MyInnerClass25 {}
+    static class MyInnerClass25 {}
 
-  static class MyInnerClass26 {}
+    static class MyInnerClass26 {}
 
-  static class MyInnerClass27 {}
+    static class MyInnerClass27 {}
 
-  static class MyInnerClass28 {}
+    static class MyInnerClass28 {}
 
-  static class MyInnerClass29 {}
+    static class MyInnerClass29 {}
 
-  static class MyInnerClass30 {}
+    static class MyInnerClass30 {}
 
-  static class MyInnerClass31 {}
+    static class MyInnerClass31 {}
 
-  static class MyInnerClass32 {}
+    static class MyInnerClass32 {}
 
-  static class MyInnerClass33 {}
+    static class MyInnerClass33 {}
 
-  static class MyInnerClass34 {}
+    static class MyInnerClass34 {}
 
-  static class MyInnerClass35 {}
+    static class MyInnerClass35 {}
 
-  static class MyInnerClass36 {}
+    static class MyInnerClass36 {}
 
-  static class MyInnerClass37 {}
+    static class MyInnerClass37 {}
 
-  static class MyInnerClass38 {}
+    static class MyInnerClass38 {}
 
-  static class MyInnerClass39 {}
+    static class MyInnerClass39 {}
 
-  static class MyInnerClass40 {}
+    static class MyInnerClass40 {}
 
-  static class MyInnerClass41 {}
+    static class MyInnerClass41 {}
 
-  static class MyInnerClass42 {}
+    static class MyInnerClass42 {}
 
-  static class MyInnerClass43 {}
+    static class MyInnerClass43 {}
 
-  static class MyInnerClass44 {}
+    static class MyInnerClass44 {}
 
-  static class MyInnerClass45 {}
+    static class MyInnerClass45 {}
 
-  static class MyInnerClass46 {}
+    static class MyInnerClass46 {}
 
-  static class MyInnerClass47 {}
+    static class MyInnerClass47 {}
 
-  static class MyInnerClass48 {}
+    static class MyInnerClass48 {}
 
-  static class MyInnerClass49 {}
+    static class MyInnerClass49 {}
 
-  static class MyInnerClass50 {}
+    static class MyInnerClass50 {}
 
-  static class MyInnerClass51 {}
+    static class MyInnerClass51 {}
 
-  static class MyInnerClass52 {}
+    static class MyInnerClass52 {}
 
-  static class MyInnerClass53 {}
+    static class MyInnerClass53 {}
 
-  static class MyInnerClass54 {}
+    static class MyInnerClass54 {}
 
-  static class MyInnerClass55 {}
+    static class MyInnerClass55 {}
 
-  static class MyInnerClass56 {}
+    static class MyInnerClass56 {}
 
-  static class MyInnerClass57 {}
+    static class MyInnerClass57 {}
 
-  static class MyInnerClass58 {}
+    static class MyInnerClass58 {}
 
-  static class MyInnerClass59 {}
+    static class MyInnerClass59 {}
 
-  static class MyInnerClass60 {}
+    static class MyInnerClass60 {}
 
-  static class MyInnerClass61 {}
+    static class MyInnerClass61 {}
 
-  static class MyInnerClass62 {}
+    static class MyInnerClass62 {}
 
-  static class MyInnerClass63 {}
+    static class MyInnerClass63 {}
 
-  static class MyInnerClass64 {}
+    static class MyInnerClass64 {}
 
-  static class MyInnerClass65 {}
+    static class MyInnerClass65 {}
 
-  static class MyInnerClass66 {}
+    static class MyInnerClass66 {}
 
-  static class MyInnerClass67 {}
+    static class MyInnerClass67 {}
 
-  static class MyInnerClass68 {}
+    static class MyInnerClass68 {}
 
-  static class MyInnerClass69 {}
+    static class MyInnerClass69 {}
 
-  static class MyInnerClass70 {}
+    static class MyInnerClass70 {}
 
-  static class MyInnerClass71 {}
+    static class MyInnerClass71 {}
 
-  static class MyInnerClass72 {}
+    static class MyInnerClass72 {}
 
-  static class MyInnerClass73 {}
+    static class MyInnerClass73 {}
 
-  static class MyInnerClass74 {}
+    static class MyInnerClass74 {}
 
-  static class MyInnerClass75 {}
+    static class MyInnerClass75 {}
 
-  static class MyInnerClass76 {}
+    static class MyInnerClass76 {}
 
-  static class MyInnerClass77 {}
+    static class MyInnerClass77 {}
 
-  static class MyInnerClass78 {}
+    static class MyInnerClass78 {}
 
-  static class MyInnerClass79 {}
+    static class MyInnerClass79 {}
 
-  static class MyInnerClass80 {}
+    static class MyInnerClass80 {}
 
-  static class MyInnerClass81 {}
+    static class MyInnerClass81 {}
 
-  static class MyInnerClass82 {}
+    static class MyInnerClass82 {}
 
-  static class MyInnerClass83 {}
+    static class MyInnerClass83 {}
 
-  static class MyInnerClass84 {}
+    static class MyInnerClass84 {}
 
-  static class MyInnerClass85 {}
+    static class MyInnerClass85 {}
 
-  static class MyInnerClass86 {}
+    static class MyInnerClass86 {}
 
-  static class MyInnerClass87 {}
+    static class MyInnerClass87 {}
 
-  static class MyInnerClass88 {}
+    static class MyInnerClass88 {}
 
-  static class MyInnerClass89 {}
+    static class MyInnerClass89 {}
 
-  static class MyInnerClass90 {}
+    static class MyInnerClass90 {}
 
-  static class MyInnerClass91 {}
+    static class MyInnerClass91 {}
 
-  static class MyInnerClass92 {}
+    static class MyInnerClass92 {}
 
-  static class MyInnerClass93 {}
+    static class MyInnerClass93 {}
 
-  static class MyInnerClass94 {}
+    static class MyInnerClass94 {}
 
-  static class MyInnerClass95 {}
+    static class MyInnerClass95 {}
 
-  static class MyInnerClass96 {}
+    static class MyInnerClass96 {}
 
-  static class MyInnerClass97 {}
+    static class MyInnerClass97 {}
 
-  static class MyInnerClass98 {}
+    static class MyInnerClass98 {}
 
-  static class MyInnerClass99 {}
+    static class MyInnerClass99 {}
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/LogProbesInstrumentationTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/LogProbesInstrumentationTest.java
index 7777a1d133a..e3aa43d0d2d 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/LogProbesInstrumentationTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/LogProbesInstrumentationTest.java
@@ -38,580 +38,529 @@
 import org.junit.jupiter.api.Test;
 
 public class LogProbesInstrumentationTest {
-  private static final String LANGUAGE = "java";
-  private static final ProbeId LOG_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
-  private static final ProbeId LOG_ID1 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
-  private static final ProbeId LOG_ID2 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f9", 0);
-  private static final ProbeId LINE_PROBE_ID1 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000001", 0);
-  private static final ProbeId LINE_PROBE_ID2 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000002", 0);
-  private static final String SERVICE_NAME = "service-name";
-  private static final String STR_8K =
-      "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
-
-  private Instrumentation instr = ByteBuddyAgent.install();
-  private ClassFileTransformer currentTransformer;
-
-  @AfterEach
-  public void after() {
-    if (currentTransformer != null) {
-      instr.removeTransformer(currentTransformer);
-    }
-    ProbeRateLimiter.resetGlobalRate();
-  }
-
-  @Test
-  public void methodPlainLog() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    TestSnapshotListener listener =
-        installMethodProbe("this is log line", CLASS_NAME, "main", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCapturesNull(snapshot);
-    assertTrue(snapshot.getStack().isEmpty());
-    assertEquals("this is log line", snapshot.getMessage());
-  }
-
-  @Test
-  public void methodLargePlainLog() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    TestSnapshotListener listener =
-        installMethodProbe(STR_8K + "123", CLASS_NAME, "main", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCapturesNull(snapshot);
-    assertEquals(STR_8K + "...", snapshot.getMessage());
-  }
-
-  @Test
-  public void methodTemplateArgLog() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    TestSnapshotListener listener =
-        installMethodProbe(
-            "this is log line with arg={arg}", CLASS_NAME, "main", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCapturesNull(snapshot);
-    assertEquals("this is log line with arg=1", snapshot.getMessage());
-  }
-
-  @Test
-  public void methodTemplateArgLogLarge() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    TestSnapshotListener listener =
-        installMethodProbe(STR_8K + "{arg}", CLASS_NAME, "main", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCapturesNull(snapshot);
-    assertEquals(STR_8K + "...", snapshot.getMessage());
-  }
-
-  @Test
-  public void methodTemplateLargeArgLog() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    TestSnapshotListener listener =
-        installMethodProbe(
-            "this is log line with arg={arg}", CLASS_NAME, "main", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", STR_8K).get();
-    Assertions.assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCapturesNull(snapshot);
-    final String expectedStr = "this is log line with arg=";
-    assertEquals(
-        expectedStr + STR_8K.substring(0, STR_8K.length() - expectedStr.length()) + "...",
-        snapshot.getMessage());
-  }
-
-  @Test
-  public void methodTemplateTooLargeArgLog() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    TestSnapshotListener listener =
-        installMethodProbe("{arg}", CLASS_NAME, "main", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", STR_8K + "123").get();
-    Assertions.assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCapturesNull(snapshot);
-    assertEquals(STR_8K + "...", snapshot.getMessage());
-  }
-
-  @Test
-  public void methodTemplateArgLogEvaluateAtExit() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    LogProbe probe =
-        createProbeBuilder(
-                LOG_ID,
-                "this is log line with return={@return}",
-                CLASS_NAME,
-                "main",
-                "int (java.lang.String)")
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    TestSnapshotListener listener = installProbes(probe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(listener);
-    assertCapturesNull(snapshot);
-    assertEquals("this is log line with return=3", snapshot.getMessage());
-  }
-
-  @Test
-  public void mergedMethodTemplateArgLog() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    LogProbe logProbe1 =
-        createMethodProbe(
-            LOG_ID1,
-            "this is log line #1 with arg={arg}",
-            CLASS_NAME,
-            "main",
-            "int (java.lang.String)");
-    LogProbe logProbe2 =
-        createMethodProbe(
-            LOG_ID2,
-            "this is log line #2 with arg={arg}",
-            CLASS_NAME,
-            "main",
-            "int (java.lang.String)");
-    TestSnapshotListener listener = installProbes(logProbe1, logProbe2);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Assertions.assertEquals(2, listener.snapshots.size());
-    Snapshot snapshot0 = listener.snapshots.get(0);
-    assertCapturesNull(snapshot0);
-    assertEquals("this is log line #1 with arg=1", snapshot0.getMessage());
-    Snapshot snapshot1 = listener.snapshots.get(1);
-    assertCapturesNull(snapshot1);
-    assertEquals("this is log line #2 with arg=1", snapshot1.getMessage());
-  }
-
-  @Test
-  public void mergedMethodTemplateMainCaptureAdditionalNonCapture()
-      throws IOException, URISyntaxException {
-    List<Snapshot> snapshots = doMergedMethodTemplateMixCapture(true, false);
-    Snapshot snapshot0 = snapshots.get(0);
-    assertEquals(LOG_ID1.getId(), snapshot0.getProbe().getId());
-    assertNotNull(snapshot0.getCaptures().getEntry());
-    assertNotNull(snapshot0.getCaptures().getReturn());
-    assertEquals("this is log line #1 with arg=1", snapshot0.getMessage());
-    Snapshot snapshot1 = snapshots.get(1);
-    assertEquals(LOG_ID2.getId(), snapshot1.getProbe().getId());
-    assertCapturesNull(snapshot1);
-    assertEquals("this is log line #2 with arg=1", snapshot1.getMessage());
-  }
-
-  @Test
-  public void mergedMethodTemplateMainNonCaptureAdditionalCapture()
-      throws IOException, URISyntaxException {
-    List<Snapshot> snapshots = doMergedMethodTemplateMixCapture(false, true);
-    Snapshot snapshot0 = snapshots.get(0);
-    assertEquals(LOG_ID1.getId(), snapshot0.getProbe().getId());
-    assertCapturesNull(snapshot0);
-    assertEquals("this is log line #1 with arg=1", snapshot0.getMessage());
-    Snapshot snapshot1 = snapshots.get(1);
-    assertEquals(LOG_ID2.getId(), snapshot1.getProbe().getId());
-    assertNotNull(snapshot1.getCaptures().getEntry());
-    assertNotNull(snapshot1.getCaptures().getReturn());
-    assertEquals("this is log line #2 with arg=1", snapshot1.getMessage());
-  }
-
-  private List<Snapshot> doMergedMethodTemplateMixCapture(
-      boolean mainCapture, boolean additionalCapture) throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    LogProbe logProbe1 =
-        createProbeBuilder(
-                LOG_ID1,
-                "this is log line #1 with arg={arg}",
+    private static final String LANGUAGE = "java";
+    private static final ProbeId LOG_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
+    private static final ProbeId LOG_ID1 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
+    private static final ProbeId LOG_ID2 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f9", 0);
+    private static final ProbeId LINE_PROBE_ID1 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000001", 0);
+    private static final ProbeId LINE_PROBE_ID2 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000002", 0);
+    private static final String SERVICE_NAME = "service-name";
+    private static final String STR_8K =
+            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
+
+    private Instrumentation instr = ByteBuddyAgent.install();
+    private ClassFileTransformer currentTransformer;
+
+    @AfterEach
+    public void after() {
+        if (currentTransformer != null) {
+            instr.removeTransformer(currentTransformer);
+        }
+        ProbeRateLimiter.resetGlobalRate();
+    }
+
+    @Test
+    public void methodPlainLog() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        TestSnapshotListener listener =
+                installMethodProbe("this is log line", CLASS_NAME, "main", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        Assertions.assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCapturesNull(snapshot);
+        assertTrue(snapshot.getStack().isEmpty());
+        assertEquals("this is log line", snapshot.getMessage());
+    }
+
+    @Test
+    public void methodLargePlainLog() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        TestSnapshotListener listener =
+                installMethodProbe(STR_8K + "123", CLASS_NAME, "main", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        Assertions.assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCapturesNull(snapshot);
+        assertEquals(STR_8K + "...", snapshot.getMessage());
+    }
+
+    @Test
+    public void methodTemplateArgLog() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        TestSnapshotListener listener =
+                installMethodProbe("this is log line with arg={arg}", CLASS_NAME, "main", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        Assertions.assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCapturesNull(snapshot);
+        assertEquals("this is log line with arg=1", snapshot.getMessage());
+    }
+
+    @Test
+    public void methodTemplateArgLogLarge() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        TestSnapshotListener listener =
+                installMethodProbe(STR_8K + "{arg}", CLASS_NAME, "main", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        Assertions.assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCapturesNull(snapshot);
+        assertEquals(STR_8K + "...", snapshot.getMessage());
+    }
+
+    @Test
+    public void methodTemplateLargeArgLog() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        TestSnapshotListener listener =
+                installMethodProbe("this is log line with arg={arg}", CLASS_NAME, "main", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", STR_8K).get();
+        Assertions.assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCapturesNull(snapshot);
+        final String expectedStr = "this is log line with arg=";
+        assertEquals(
+                expectedStr + STR_8K.substring(0, STR_8K.length() - expectedStr.length()) + "...",
+                snapshot.getMessage());
+    }
+
+    @Test
+    public void methodTemplateTooLargeArgLog() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        TestSnapshotListener listener = installMethodProbe("{arg}", CLASS_NAME, "main", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", STR_8K + "123").get();
+        Assertions.assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCapturesNull(snapshot);
+        assertEquals(STR_8K + "...", snapshot.getMessage());
+    }
+
+    @Test
+    public void methodTemplateArgLogEvaluateAtExit() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        LogProbe probe = createProbeBuilder(
+                        LOG_ID, "this is log line with return={@return}", CLASS_NAME, "main", "int (java.lang.String)")
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        TestSnapshotListener listener = installProbes(probe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        Assertions.assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(listener);
+        assertCapturesNull(snapshot);
+        assertEquals("this is log line with return=3", snapshot.getMessage());
+    }
+
+    @Test
+    public void mergedMethodTemplateArgLog() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        LogProbe logProbe1 = createMethodProbe(
+                LOG_ID1, "this is log line #1 with arg={arg}", CLASS_NAME, "main", "int (java.lang.String)");
+        LogProbe logProbe2 = createMethodProbe(
+                LOG_ID2, "this is log line #2 with arg={arg}", CLASS_NAME, "main", "int (java.lang.String)");
+        TestSnapshotListener listener = installProbes(logProbe1, logProbe2);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        Assertions.assertEquals(3, result);
+        Assertions.assertEquals(2, listener.snapshots.size());
+        Snapshot snapshot0 = listener.snapshots.get(0);
+        assertCapturesNull(snapshot0);
+        assertEquals("this is log line #1 with arg=1", snapshot0.getMessage());
+        Snapshot snapshot1 = listener.snapshots.get(1);
+        assertCapturesNull(snapshot1);
+        assertEquals("this is log line #2 with arg=1", snapshot1.getMessage());
+    }
+
+    @Test
+    public void mergedMethodTemplateMainCaptureAdditionalNonCapture() throws IOException, URISyntaxException {
+        List<Snapshot> snapshots = doMergedMethodTemplateMixCapture(true, false);
+        Snapshot snapshot0 = snapshots.get(0);
+        assertEquals(LOG_ID1.getId(), snapshot0.getProbe().getId());
+        assertNotNull(snapshot0.getCaptures().getEntry());
+        assertNotNull(snapshot0.getCaptures().getReturn());
+        assertEquals("this is log line #1 with arg=1", snapshot0.getMessage());
+        Snapshot snapshot1 = snapshots.get(1);
+        assertEquals(LOG_ID2.getId(), snapshot1.getProbe().getId());
+        assertCapturesNull(snapshot1);
+        assertEquals("this is log line #2 with arg=1", snapshot1.getMessage());
+    }
+
+    @Test
+    public void mergedMethodTemplateMainNonCaptureAdditionalCapture() throws IOException, URISyntaxException {
+        List<Snapshot> snapshots = doMergedMethodTemplateMixCapture(false, true);
+        Snapshot snapshot0 = snapshots.get(0);
+        assertEquals(LOG_ID1.getId(), snapshot0.getProbe().getId());
+        assertCapturesNull(snapshot0);
+        assertEquals("this is log line #1 with arg=1", snapshot0.getMessage());
+        Snapshot snapshot1 = snapshots.get(1);
+        assertEquals(LOG_ID2.getId(), snapshot1.getProbe().getId());
+        assertNotNull(snapshot1.getCaptures().getEntry());
+        assertNotNull(snapshot1.getCaptures().getReturn());
+        assertEquals("this is log line #2 with arg=1", snapshot1.getMessage());
+    }
+
+    private List<Snapshot> doMergedMethodTemplateMixCapture(boolean mainCapture, boolean additionalCapture)
+            throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        LogProbe logProbe1 = createProbeBuilder(
+                        LOG_ID1, "this is log line #1 with arg={arg}", CLASS_NAME, "main", "int (java.lang.String)")
+                .captureSnapshot(mainCapture)
+                .build();
+        LogProbe logProbe2 = createProbeBuilder(
+                        LOG_ID2, "this is log line #2 with arg={arg}", CLASS_NAME, "main", "int (java.lang.String)")
+                .captureSnapshot(additionalCapture)
+                .build();
+        TestSnapshotListener listener = installProbes(logProbe1, logProbe2);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        Assertions.assertEquals(3, result);
+        Assertions.assertEquals(2, listener.snapshots.size());
+        return listener.snapshots;
+    }
+
+    @Test
+    public void linePlainLog() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
+        TestSnapshotListener listener = installLineProbe(LINE_PROBE_ID2, "this is log line", CLASS_NAME, line);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        Assertions.assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID2, listener);
+        assertCapturesNull(snapshot);
+        assertEquals("this is log line", snapshot.getMessage());
+    }
+
+    @Test
+    public void lineTemplateVarLog() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
+        TestSnapshotListener listener =
+                installLineProbe(LINE_PROBE_ID2, "this is log line with local var={var1}", CLASS_NAME, line);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        Assertions.assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID2, listener);
+        assertCapturesNull(snapshot);
+        assertEquals("this is log line with local var=3", snapshot.getMessage());
+    }
+
+    @Test
+    public void lineTemplateMultipleVarLog() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot04";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        TestSnapshotListener listener = installLineProbe(
+                LINE_PROBE_ID1,
+                "nullObject={nullObject} sdata={sdata.strValue} cdata={cdata.s1.intValue}",
                 CLASS_NAME,
-                "main",
-                "int (java.lang.String)")
-            .captureSnapshot(mainCapture)
-            .build();
-    LogProbe logProbe2 =
-        createProbeBuilder(
-                LOG_ID2,
-                "this is log line #2 with arg={arg}",
+                line);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        Assertions.assertEquals(143, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+        assertCapturesNull(snapshot);
+        assertEquals("nullObject=null sdata=foo cdata=101", snapshot.getMessage());
+    }
+
+    @Test
+    public void lineTemplateEscapeLog() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
+        TestSnapshotListener listener = installLineProbe(
+                LINE_PROBE_ID2,
+                "this is log line with {{curly braces}} and with local var={{{var1}}}",
                 CLASS_NAME,
-                "main",
-                "int (java.lang.String)")
-            .captureSnapshot(additionalCapture)
-            .build();
-    TestSnapshotListener listener = installProbes(logProbe1, logProbe2);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Assertions.assertEquals(2, listener.snapshots.size());
-    return listener.snapshots;
-  }
-
-  @Test
-  public void linePlainLog() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
-    TestSnapshotListener listener =
-        installLineProbe(LINE_PROBE_ID2, "this is log line", CLASS_NAME, line);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID2, listener);
-    assertCapturesNull(snapshot);
-    assertEquals("this is log line", snapshot.getMessage());
-  }
-
-  @Test
-  public void lineTemplateVarLog() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
-    TestSnapshotListener listener =
-        installLineProbe(
-            LINE_PROBE_ID2, "this is log line with local var={var1}", CLASS_NAME, line);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID2, listener);
-    assertCapturesNull(snapshot);
-    assertEquals("this is log line with local var=3", snapshot.getMessage());
-  }
-
-  @Test
-  public void lineTemplateMultipleVarLog() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot04";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    TestSnapshotListener listener =
-        installLineProbe(
-            LINE_PROBE_ID1,
-            "nullObject={nullObject} sdata={sdata.strValue} cdata={cdata.s1.intValue}",
-            CLASS_NAME,
-            line);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(143, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-    assertCapturesNull(snapshot);
-    assertEquals("nullObject=null sdata=foo cdata=101", snapshot.getMessage());
-  }
-
-  @Test
-  public void lineTemplateEscapeLog() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
-    TestSnapshotListener listener =
-        installLineProbe(
-            LINE_PROBE_ID2,
-            "this is log line with {{curly braces}} and with local var={{{var1}}}",
-            CLASS_NAME,
-            line);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID2, listener);
-    assertCapturesNull(snapshot);
-    assertEquals(
-        "this is log line with {curly braces} and with local var={3}", snapshot.getMessage());
-  }
-
-  @Test
-  public void lineTemplateInvalidVarLog() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
-    TestSnapshotListener listener =
-        installLineProbe(
-            LINE_PROBE_ID2, "this is log line with local var={var42}", CLASS_NAME, line);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID2, listener);
-    assertCapturesNull(snapshot);
-    assertEquals(
-        "this is log line with local var={Cannot find symbol: var42}", snapshot.getMessage());
-    assertEquals(1, snapshot.getEvaluationErrors().size());
-    assertEquals("var42", snapshot.getEvaluationErrors().get(0).getExpr());
-    assertEquals("Cannot find symbol: var42", snapshot.getEvaluationErrors().get(0).getMessage());
-  }
-
-  @Test
-  public void lineTemplateNullFieldLog() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot04";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    TestSnapshotListener listener =
-        installLineProbe(
-            LINE_PROBE_ID1, "this is log line with field={nullObject.intValue}", CLASS_NAME, line);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "").get();
-    Assertions.assertEquals(143, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-    assertCapturesNull(snapshot);
-    assertEquals(
-        "this is log line with field={Cannot dereference field: intValue}", snapshot.getMessage());
-    assertEquals(1, snapshot.getEvaluationErrors().size());
-    assertEquals("nullObject.intValue", snapshot.getEvaluationErrors().get(0).getExpr());
-    assertEquals(
-        "Cannot dereference field: intValue", snapshot.getEvaluationErrors().get(0).getMessage());
-  }
-
-  @Test
-  public void lineTemplateIndexOutOfBoundsLog() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    TestSnapshotListener listener =
-        installLineProbe(
-            LINE_PROBE_ID1,
-            "this is log line with element of list={strList[10]}",
-            CLASS_NAME,
-            line);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    Assertions.assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-    assertEquals(
-        "this is log line with element of list={index[10] out of bounds: [0-3]}",
-        snapshot.getMessage());
-    assertEquals(1, snapshot.getEvaluationErrors().size());
-    assertEquals("strList[10]", snapshot.getEvaluationErrors().get(0).getExpr());
-    assertEquals(
-        "index[10] out of bounds: [0-3]", snapshot.getEvaluationErrors().get(0).getMessage());
-  }
-
-  @Test
-  public void lineTemplateThisLog() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    TestSnapshotListener listener =
-        installLineProbe(LINE_PROBE_ID1, "this is log line for this={this}", CLASS_NAME, line);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    Assertions.assertEquals(42, result);
-    Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
-    assertEquals(
-        "this is log line for this={intValue=48, doubleValue=3.14, strValue=done, strList=..., strMap=...}",
-        snapshot.getMessage());
-  }
-
-  @Test
-  public void conditionWithLogTemplateEvalError() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot08";
-    final String LOG_TEMPLATE = "log line with arg={typoArg}";
-    LogProbe logProbes =
-        createProbeBuilder(LOG_ID, LOG_TEMPLATE, CLASS_NAME, "doit", "int (java.lang.String)")
-            .when(
-                new ProbeCondition(DSL.when(DSL.eq(DSL.ref("arg"), DSL.value("5"))), "arg == '5'"))
-            .evaluateAt(MethodLocation.ENTRY)
-            .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
-            .captureSnapshot(true)
-            .build();
-    TestSnapshotListener listener = installProbes(logProbes);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "5").get();
-    Assertions.assertEquals(3, result);
-    Assertions.assertEquals(1, listener.snapshots.size());
-    Snapshot snapshot = listener.snapshots.get(0);
-    Assertions.assertNotNull(snapshot.getCaptures().getEntry());
-    Assertions.assertEquals(2, snapshot.getCaptures().getEntry().getArguments().size());
-    Assertions.assertEquals(1, snapshot.getEvaluationErrors().size());
-    Assertions.assertEquals(
-        "Cannot dereference field: typoArg", snapshot.getEvaluationErrors().get(0).getMessage());
-  }
-
-  @Test
-  public void mergedMethodTemplateMainNoErrorAdditionalLogError()
-      throws IOException, URISyntaxException {
-    List<Snapshot> snapshots =
-        doMergedMethodTemplateMixLogError(
-            "this is log line #1 with arg={arg}", "this is log line #2 with arg={typoArg}");
-    Snapshot snapshot0 = snapshots.get(0);
-    assertEquals(LOG_ID1.getId(), snapshot0.getProbe().getId());
-    assertNotNull(snapshot0.getCaptures().getEntry());
-    assertNotNull(snapshot0.getCaptures().getReturn());
-    assertNull(snapshot0.getEvaluationErrors());
-    assertEquals("this is log line #1 with arg=1", snapshot0.getMessage());
-    Snapshot snapshot1 = snapshots.get(1);
-    assertEquals(LOG_ID2.getId(), snapshot1.getProbe().getId());
-    assertNotNull(snapshot1.getCaptures().getEntry());
-    assertNotNull(snapshot1.getCaptures().getReturn());
-    assertEquals(
-        "this is log line #2 with arg={Cannot find symbol: typoArg}", snapshot1.getMessage());
-    assertEquals(1, snapshot1.getEvaluationErrors().size());
-    assertEquals(
-        "Cannot find symbol: typoArg", snapshot1.getEvaluationErrors().get(0).getMessage());
-  }
-
-  @Test
-  public void mergedMethodTemplateMainLogErrorAdditionalNoError()
-      throws IOException, URISyntaxException {
-    List<Snapshot> snapshots =
-        doMergedMethodTemplateMixLogError(
-            "this is log line #1 with arg={typoArg}", "this is log line #2 with arg={arg}");
-    Snapshot snapshot0 = snapshots.get(0);
-    assertEquals(LOG_ID1.getId(), snapshot0.getProbe().getId());
-    assertNotNull(snapshot0.getCaptures().getEntry());
-    assertNotNull(snapshot0.getCaptures().getReturn());
-    assertEquals(
-        "this is log line #1 with arg={Cannot find symbol: typoArg}", snapshot0.getMessage());
-    assertEquals(1, snapshot0.getEvaluationErrors().size());
-    assertEquals(
-        "Cannot find symbol: typoArg", snapshot0.getEvaluationErrors().get(0).getMessage());
-    Snapshot snapshot1 = snapshots.get(1);
-    assertEquals(LOG_ID2.getId(), snapshot1.getProbe().getId());
-    assertNotNull(snapshot1.getCaptures().getEntry());
-    assertNotNull(snapshot1.getCaptures().getReturn());
-    assertEquals("this is log line #2 with arg=1", snapshot1.getMessage());
-    assertNull(snapshot1.getEvaluationErrors());
-  }
-
-  @Test
-  public void mergedMethodTemplateMainLogErrorAdditionalLogError()
-      throws IOException, URISyntaxException {
-    List<Snapshot> snapshots =
-        doMergedMethodTemplateMixLogError(
-            "this is log line #1 with arg={typoArg1}", "this is log line #2 with arg={typoArg2}");
-    Snapshot snapshot0 = snapshots.get(0);
-    assertEquals(LOG_ID1.getId(), snapshot0.getProbe().getId());
-    assertNotNull(snapshot0.getCaptures().getEntry());
-    assertNotNull(snapshot0.getCaptures().getReturn());
-    assertEquals(
-        "this is log line #1 with arg={Cannot find symbol: typoArg1}", snapshot0.getMessage());
-    assertEquals(1, snapshot0.getEvaluationErrors().size());
-    assertEquals(
-        "Cannot find symbol: typoArg1", snapshot0.getEvaluationErrors().get(0).getMessage());
-    Snapshot snapshot1 = snapshots.get(1);
-    assertEquals(LOG_ID2.getId(), snapshot1.getProbe().getId());
-    assertNotNull(snapshot1.getCaptures().getEntry());
-    assertNotNull(snapshot1.getCaptures().getReturn());
-    assertEquals(
-        "this is log line #2 with arg={Cannot find symbol: typoArg2}", snapshot1.getMessage());
-    assertEquals(1, snapshot1.getEvaluationErrors().size());
-    assertEquals(
-        "Cannot find symbol: typoArg2", snapshot1.getEvaluationErrors().get(0).getMessage());
-  }
-
-  private List<Snapshot> doMergedMethodTemplateMixLogError(
-      String mainTemplate, String additionalTemplate) throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    LogProbe logProbe1 =
-        createProbeBuilder(LOG_ID1, mainTemplate, CLASS_NAME, "main", "int (java.lang.String)")
-            .captureSnapshot(true)
-            .build();
-    LogProbe logProbe2 =
-        createProbeBuilder(
-                LOG_ID2, additionalTemplate, CLASS_NAME, "main", "int (java.lang.String)")
-            .captureSnapshot(true)
-            .build();
-    TestSnapshotListener listener = installProbes(logProbe1, logProbe2);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    Assertions.assertEquals(3, result);
-    Assertions.assertEquals(2, listener.snapshots.size());
-    return listener.snapshots;
-  }
-
-  private TestSnapshotListener installMethodProbe(
-      String template, String typeName, String methodName, String signature) {
-    LogProbe logProbe = createMethodProbe(LOG_ID, template, typeName, methodName, signature);
-    return installProbes(Configuration.builder().setService(SERVICE_NAME).add(logProbe).build());
-  }
-
-  private TestSnapshotListener installLineProbe(
-      ProbeId probeId, String template, String sourceFile, int line) {
-    LogProbe logProbe = createLineProbe(probeId, template, sourceFile, line);
-    return installProbes(Configuration.builder().setService(SERVICE_NAME).add(logProbe).build());
-  }
-
-  private TestSnapshotListener installProbes(LogProbe... logProbes) {
-    return installProbes(Configuration.builder().setService(SERVICE_NAME).add(logProbes).build());
-  }
-
-  private static LogProbe.Builder createProbeBuilder(
-      ProbeId id, String template, String typeName, String methodName, String signature) {
-    return LogProbe.builder()
-        .language(LANGUAGE)
-        .probeId(id)
-        .where(typeName, methodName, signature)
-        .template(template, parseTemplate(template));
-  }
-
-  private static LogProbe.Builder createProbeBuilder(
-      ProbeId id, String template, String sourceFile, int line) {
-    return LogProbe.builder()
-        .language(LANGUAGE)
-        .probeId(id)
-        .where(sourceFile, line)
-        .template(template, parseTemplate(template));
-  }
-
-  private static LogProbe createMethodProbe(
-      ProbeId id, String template, String typeName, String methodName, String signature) {
-    return createProbeBuilder(id, template, typeName, methodName, signature)
-        .evalTimeout(Duration.ofMillis(1000))
-        .build();
-  }
-
-  private static LogProbe createLineProbe(
-      ProbeId id, String template, String sourceFile, int line) {
-    return createProbeBuilder(id, template, sourceFile, line)
-        .evalTimeout(Duration.ofMillis(1000))
-        .build();
-  }
-
-  private TestSnapshotListener installProbes(Configuration configuration) {
-    Config config = mock(Config.class);
-    when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
-    when(config.isDynamicInstrumentationClassFileDumpEnabled()).thenReturn(true);
-    when(config.getFinalDebuggerSnapshotUrl())
-        .thenReturn("http://localhost:8126/debugger/v1/input");
-    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
-    for (ProbeDefinition probe : configuration.getDefinitions()) {
-      if (probe instanceof Sampled) {
-        ((Sampled) probe).initSamplers();
-      }
-    }
-    ProbeMetadata probeMetadata = new ProbeMetadata();
-    currentTransformer = new DebuggerTransformer(config, probeMetadata, configuration);
-    instr.addTransformer(currentTransformer);
-    TestSnapshotListener listener = new TestSnapshotListener(config, mock(ProbeStatusSink.class));
-    DebuggerAgentHelper.injectSink(listener);
-    DebuggerContext.initProbeResolver(probeMetadata::getProbe);
-    DebuggerContext.initClassFilter(new DenyListHelper(null));
-    DebuggerContext.initValueSerializer(new JsonSnapshotSerializer());
-    return listener;
-  }
-
-  private ProbeImplementation resolver(String encodedProbeId, Collection<LogProbe> logProbes) {
-    for (LogProbe probe : logProbes) {
-      if (probe.getProbeId().getEncodedId().equals(encodedProbeId)) {
-        return probe;
-      }
-    }
-    return null;
-  }
-
-  private Snapshot assertOneSnapshot(TestSnapshotListener listener) {
-    return assertOneSnapshot(LOG_ID, listener);
-  }
-
-  private Snapshot assertOneSnapshot(ProbeId probeId, TestSnapshotListener listener) {
-    Assertions.assertFalse(listener.skipped, "Snapshot skipped because " + listener.reason);
-    Assertions.assertEquals(1, listener.snapshots.size());
-    Snapshot snapshot = listener.snapshots.get(0);
-    Assertions.assertEquals(probeId.getId(), snapshot.getProbe().getId());
-    return snapshot;
-  }
-
-  private void assertCapturesNull(Snapshot snapshot) {
-    Assertions.assertNull(snapshot.getCaptures().getEntry());
-    Assertions.assertNull(snapshot.getCaptures().getReturn());
-    Assertions.assertNull(snapshot.getCaptures().getLines());
-    Assertions.assertNull(snapshot.getCaptures().getCaughtExceptions());
-  }
+                line);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        Assertions.assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID2, listener);
+        assertCapturesNull(snapshot);
+        assertEquals("this is log line with {curly braces} and with local var={3}", snapshot.getMessage());
+    }
+
+    @Test
+    public void lineTemplateInvalidVarLog() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID2);
+        TestSnapshotListener listener =
+                installLineProbe(LINE_PROBE_ID2, "this is log line with local var={var42}", CLASS_NAME, line);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        Assertions.assertEquals(3, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID2, listener);
+        assertCapturesNull(snapshot);
+        assertEquals("this is log line with local var={Cannot find symbol: var42}", snapshot.getMessage());
+        assertEquals(1, snapshot.getEvaluationErrors().size());
+        assertEquals("var42", snapshot.getEvaluationErrors().get(0).getExpr());
+        assertEquals(
+                "Cannot find symbol: var42",
+                snapshot.getEvaluationErrors().get(0).getMessage());
+    }
+
+    @Test
+    public void lineTemplateNullFieldLog() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot04";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        TestSnapshotListener listener =
+                installLineProbe(LINE_PROBE_ID1, "this is log line with field={nullObject.intValue}", CLASS_NAME, line);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "").get();
+        Assertions.assertEquals(143, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+        assertCapturesNull(snapshot);
+        assertEquals("this is log line with field={Cannot dereference field: intValue}", snapshot.getMessage());
+        assertEquals(1, snapshot.getEvaluationErrors().size());
+        assertEquals(
+                "nullObject.intValue", snapshot.getEvaluationErrors().get(0).getExpr());
+        assertEquals(
+                "Cannot dereference field: intValue",
+                snapshot.getEvaluationErrors().get(0).getMessage());
+    }
+
+    @Test
+    public void lineTemplateIndexOutOfBoundsLog() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        TestSnapshotListener listener = installLineProbe(
+                LINE_PROBE_ID1, "this is log line with element of list={strList[10]}", CLASS_NAME, line);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        Assertions.assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+        assertEquals("this is log line with element of list={index[10] out of bounds: [0-3]}", snapshot.getMessage());
+        assertEquals(1, snapshot.getEvaluationErrors().size());
+        assertEquals("strList[10]", snapshot.getEvaluationErrors().get(0).getExpr());
+        assertEquals(
+                "index[10] out of bounds: [0-3]",
+                snapshot.getEvaluationErrors().get(0).getMessage());
+    }
+
+    @Test
+    public void lineTemplateThisLog() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        TestSnapshotListener listener =
+                installLineProbe(LINE_PROBE_ID1, "this is log line for this={this}", CLASS_NAME, line);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        Assertions.assertEquals(42, result);
+        Snapshot snapshot = assertOneSnapshot(LINE_PROBE_ID1, listener);
+        assertEquals(
+                "this is log line for this={intValue=48, doubleValue=3.14, strValue=done, strList=..., strMap=...}",
+                snapshot.getMessage());
+    }
+
+    @Test
+    public void conditionWithLogTemplateEvalError() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot08";
+        final String LOG_TEMPLATE = "log line with arg={typoArg}";
+        LogProbe logProbes = createProbeBuilder(LOG_ID, LOG_TEMPLATE, CLASS_NAME, "doit", "int (java.lang.String)")
+                .when(new ProbeCondition(DSL.when(DSL.eq(DSL.ref("arg"), DSL.value("5"))), "arg == '5'"))
+                .evaluateAt(MethodLocation.ENTRY)
+                .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
+                .captureSnapshot(true)
+                .build();
+        TestSnapshotListener listener = installProbes(logProbes);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "5").get();
+        Assertions.assertEquals(3, result);
+        Assertions.assertEquals(1, listener.snapshots.size());
+        Snapshot snapshot = listener.snapshots.get(0);
+        Assertions.assertNotNull(snapshot.getCaptures().getEntry());
+        Assertions.assertEquals(
+                2, snapshot.getCaptures().getEntry().getArguments().size());
+        Assertions.assertEquals(1, snapshot.getEvaluationErrors().size());
+        Assertions.assertEquals(
+                "Cannot dereference field: typoArg",
+                snapshot.getEvaluationErrors().get(0).getMessage());
+    }
+
+    @Test
+    public void mergedMethodTemplateMainNoErrorAdditionalLogError() throws IOException, URISyntaxException {
+        List<Snapshot> snapshots = doMergedMethodTemplateMixLogError(
+                "this is log line #1 with arg={arg}", "this is log line #2 with arg={typoArg}");
+        Snapshot snapshot0 = snapshots.get(0);
+        assertEquals(LOG_ID1.getId(), snapshot0.getProbe().getId());
+        assertNotNull(snapshot0.getCaptures().getEntry());
+        assertNotNull(snapshot0.getCaptures().getReturn());
+        assertNull(snapshot0.getEvaluationErrors());
+        assertEquals("this is log line #1 with arg=1", snapshot0.getMessage());
+        Snapshot snapshot1 = snapshots.get(1);
+        assertEquals(LOG_ID2.getId(), snapshot1.getProbe().getId());
+        assertNotNull(snapshot1.getCaptures().getEntry());
+        assertNotNull(snapshot1.getCaptures().getReturn());
+        assertEquals("this is log line #2 with arg={Cannot find symbol: typoArg}", snapshot1.getMessage());
+        assertEquals(1, snapshot1.getEvaluationErrors().size());
+        assertEquals(
+                "Cannot find symbol: typoArg",
+                snapshot1.getEvaluationErrors().get(0).getMessage());
+    }
+
+    @Test
+    public void mergedMethodTemplateMainLogErrorAdditionalNoError() throws IOException, URISyntaxException {
+        List<Snapshot> snapshots = doMergedMethodTemplateMixLogError(
+                "this is log line #1 with arg={typoArg}", "this is log line #2 with arg={arg}");
+        Snapshot snapshot0 = snapshots.get(0);
+        assertEquals(LOG_ID1.getId(), snapshot0.getProbe().getId());
+        assertNotNull(snapshot0.getCaptures().getEntry());
+        assertNotNull(snapshot0.getCaptures().getReturn());
+        assertEquals("this is log line #1 with arg={Cannot find symbol: typoArg}", snapshot0.getMessage());
+        assertEquals(1, snapshot0.getEvaluationErrors().size());
+        assertEquals(
+                "Cannot find symbol: typoArg",
+                snapshot0.getEvaluationErrors().get(0).getMessage());
+        Snapshot snapshot1 = snapshots.get(1);
+        assertEquals(LOG_ID2.getId(), snapshot1.getProbe().getId());
+        assertNotNull(snapshot1.getCaptures().getEntry());
+        assertNotNull(snapshot1.getCaptures().getReturn());
+        assertEquals("this is log line #2 with arg=1", snapshot1.getMessage());
+        assertNull(snapshot1.getEvaluationErrors());
+    }
+
+    @Test
+    public void mergedMethodTemplateMainLogErrorAdditionalLogError() throws IOException, URISyntaxException {
+        List<Snapshot> snapshots = doMergedMethodTemplateMixLogError(
+                "this is log line #1 with arg={typoArg1}", "this is log line #2 with arg={typoArg2}");
+        Snapshot snapshot0 = snapshots.get(0);
+        assertEquals(LOG_ID1.getId(), snapshot0.getProbe().getId());
+        assertNotNull(snapshot0.getCaptures().getEntry());
+        assertNotNull(snapshot0.getCaptures().getReturn());
+        assertEquals("this is log line #1 with arg={Cannot find symbol: typoArg1}", snapshot0.getMessage());
+        assertEquals(1, snapshot0.getEvaluationErrors().size());
+        assertEquals(
+                "Cannot find symbol: typoArg1",
+                snapshot0.getEvaluationErrors().get(0).getMessage());
+        Snapshot snapshot1 = snapshots.get(1);
+        assertEquals(LOG_ID2.getId(), snapshot1.getProbe().getId());
+        assertNotNull(snapshot1.getCaptures().getEntry());
+        assertNotNull(snapshot1.getCaptures().getReturn());
+        assertEquals("this is log line #2 with arg={Cannot find symbol: typoArg2}", snapshot1.getMessage());
+        assertEquals(1, snapshot1.getEvaluationErrors().size());
+        assertEquals(
+                "Cannot find symbol: typoArg2",
+                snapshot1.getEvaluationErrors().get(0).getMessage());
+    }
+
+    private List<Snapshot> doMergedMethodTemplateMixLogError(String mainTemplate, String additionalTemplate)
+            throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        LogProbe logProbe1 = createProbeBuilder(LOG_ID1, mainTemplate, CLASS_NAME, "main", "int (java.lang.String)")
+                .captureSnapshot(true)
+                .build();
+        LogProbe logProbe2 = createProbeBuilder(
+                        LOG_ID2, additionalTemplate, CLASS_NAME, "main", "int (java.lang.String)")
+                .captureSnapshot(true)
+                .build();
+        TestSnapshotListener listener = installProbes(logProbe1, logProbe2);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        Assertions.assertEquals(3, result);
+        Assertions.assertEquals(2, listener.snapshots.size());
+        return listener.snapshots;
+    }
+
+    private TestSnapshotListener installMethodProbe(
+            String template, String typeName, String methodName, String signature) {
+        LogProbe logProbe = createMethodProbe(LOG_ID, template, typeName, methodName, signature);
+        return installProbes(
+                Configuration.builder().setService(SERVICE_NAME).add(logProbe).build());
+    }
+
+    private TestSnapshotListener installLineProbe(ProbeId probeId, String template, String sourceFile, int line) {
+        LogProbe logProbe = createLineProbe(probeId, template, sourceFile, line);
+        return installProbes(
+                Configuration.builder().setService(SERVICE_NAME).add(logProbe).build());
+    }
+
+    private TestSnapshotListener installProbes(LogProbe... logProbes) {
+        return installProbes(
+                Configuration.builder().setService(SERVICE_NAME).add(logProbes).build());
+    }
+
+    private static LogProbe.Builder createProbeBuilder(
+            ProbeId id, String template, String typeName, String methodName, String signature) {
+        return LogProbe.builder()
+                .language(LANGUAGE)
+                .probeId(id)
+                .where(typeName, methodName, signature)
+                .template(template, parseTemplate(template));
+    }
+
+    private static LogProbe.Builder createProbeBuilder(ProbeId id, String template, String sourceFile, int line) {
+        return LogProbe.builder()
+                .language(LANGUAGE)
+                .probeId(id)
+                .where(sourceFile, line)
+                .template(template, parseTemplate(template));
+    }
+
+    private static LogProbe createMethodProbe(
+            ProbeId id, String template, String typeName, String methodName, String signature) {
+        return createProbeBuilder(id, template, typeName, methodName, signature)
+                .evalTimeout(Duration.ofMillis(1000))
+                .build();
+    }
+
+    private static LogProbe createLineProbe(ProbeId id, String template, String sourceFile, int line) {
+        return createProbeBuilder(id, template, sourceFile, line)
+                .evalTimeout(Duration.ofMillis(1000))
+                .build();
+    }
+
+    private TestSnapshotListener installProbes(Configuration configuration) {
+        Config config = mock(Config.class);
+        when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
+        when(config.isDynamicInstrumentationClassFileDumpEnabled()).thenReturn(true);
+        when(config.getFinalDebuggerSnapshotUrl()).thenReturn("http://localhost:8126/debugger/v1/input");
+        when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
+        for (ProbeDefinition probe : configuration.getDefinitions()) {
+            if (probe instanceof Sampled) {
+                ((Sampled) probe).initSamplers();
+            }
+        }
+        ProbeMetadata probeMetadata = new ProbeMetadata();
+        currentTransformer = new DebuggerTransformer(config, probeMetadata, configuration);
+        instr.addTransformer(currentTransformer);
+        TestSnapshotListener listener = new TestSnapshotListener(config, mock(ProbeStatusSink.class));
+        DebuggerAgentHelper.injectSink(listener);
+        DebuggerContext.initProbeResolver(probeMetadata::getProbe);
+        DebuggerContext.initClassFilter(new DenyListHelper(null));
+        DebuggerContext.initValueSerializer(new JsonSnapshotSerializer());
+        return listener;
+    }
+
+    private ProbeImplementation resolver(String encodedProbeId, Collection<LogProbe> logProbes) {
+        for (LogProbe probe : logProbes) {
+            if (probe.getProbeId().getEncodedId().equals(encodedProbeId)) {
+                return probe;
+            }
+        }
+        return null;
+    }
+
+    private Snapshot assertOneSnapshot(TestSnapshotListener listener) {
+        return assertOneSnapshot(LOG_ID, listener);
+    }
+
+    private Snapshot assertOneSnapshot(ProbeId probeId, TestSnapshotListener listener) {
+        Assertions.assertFalse(listener.skipped, "Snapshot skipped because " + listener.reason);
+        Assertions.assertEquals(1, listener.snapshots.size());
+        Snapshot snapshot = listener.snapshots.get(0);
+        Assertions.assertEquals(probeId.getId(), snapshot.getProbe().getId());
+        return snapshot;
+    }
+
+    private void assertCapturesNull(Snapshot snapshot) {
+        Assertions.assertNull(snapshot.getCaptures().getEntry());
+        Assertions.assertNull(snapshot.getCaptures().getReturn());
+        Assertions.assertNull(snapshot.getCaptures().getLines());
+        Assertions.assertNull(snapshot.getCaptures().getCaughtExceptions());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/MetricProbesInstrumentationTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/MetricProbesInstrumentationTest.java
index d75ac862a29..a9201bc8d7b 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/MetricProbesInstrumentationTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/MetricProbesInstrumentationTest.java
@@ -49,1441 +49,1253 @@
 import org.mockito.ArgumentCaptor;
 
 public class MetricProbesInstrumentationTest {
-  private static final String LANGUAGE = "java";
-  private static final ProbeId METRIC_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
-  private static final ProbeId METRIC_ID1 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f6", 0);
-  private static final ProbeId METRIC_ID2 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f7", 0);
-  private static final ProbeId METRIC_ID3 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f9", 0);
-  private static final ProbeId LINE_METRIC_ID1 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000001", 0);
-  private static final ProbeId LINE_METRIC_ID2 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000002", 0);
-  private static final ProbeId LINE_METRIC_ID3 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000003", 0);
-  private static final ProbeId LINE_METRIC_ID4 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000004", 0);
-  private static final String SERVICE_NAME = "service-name";
-  private static final String METRIC_PROBEID_TAG =
-      "debugger.probeid:beae1807-f3b0-4ea8-a74f-826790c5e6f8";
-
-  private final List<DiagnosticMessage> currentDiagnostics = new ArrayList<>();
-  private Instrumentation instr = ByteBuddyAgent.install();
-  private ClassFileTransformer currentTransformer;
-  private ProbeStatusSink probeStatusSink;
-
-  @AfterEach
-  public void after() {
-    if (currentTransformer != null) {
-      instr.removeTransformer(currentTransformer);
+    private static final String LANGUAGE = "java";
+    private static final ProbeId METRIC_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
+    private static final ProbeId METRIC_ID1 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f6", 0);
+    private static final ProbeId METRIC_ID2 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f7", 0);
+    private static final ProbeId METRIC_ID3 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f9", 0);
+    private static final ProbeId LINE_METRIC_ID1 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000001", 0);
+    private static final ProbeId LINE_METRIC_ID2 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000002", 0);
+    private static final ProbeId LINE_METRIC_ID3 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000003", 0);
+    private static final ProbeId LINE_METRIC_ID4 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000004", 0);
+    private static final String SERVICE_NAME = "service-name";
+    private static final String METRIC_PROBEID_TAG = "debugger.probeid:beae1807-f3b0-4ea8-a74f-826790c5e6f8";
+
+    private final List<DiagnosticMessage> currentDiagnostics = new ArrayList<>();
+    private Instrumentation instr = ByteBuddyAgent.install();
+    private ClassFileTransformer currentTransformer;
+    private ProbeStatusSink probeStatusSink;
+
+    @AfterEach
+    public void after() {
+        if (currentTransformer != null) {
+            instr.removeTransformer(currentTransformer);
+        }
     }
-  }
-
-  @Test
-  public void methodIncCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    String METRIC_NAME = "call_count";
-    MetricForwarderListener listener =
-        installMethodMetric(METRIC_NAME, COUNT, CLASS_NAME, "main", "int (java.lang.String)", null);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertTrue(listener.counters.containsKey(METRIC_NAME));
-    assertEquals(1, listener.counters.get(METRIC_NAME).longValue());
-    assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
-  }
-
-  @Test
-  public void methodIncCountWithTagsMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    String METRIC_NAME = "call_count";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            COUNT,
-            CLASS_NAME,
-            "main",
-            "int (java.lang.String)",
-            null,
-            new String[] {"tag1:foo1", "tag2:foo2"});
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertTrue(listener.counters.containsKey(METRIC_NAME));
-    assertEquals(1, listener.counters.get(METRIC_NAME).longValue());
-    assertArrayEquals(
-        new String[] {"tag1:foo1", "tag2:foo2", METRIC_PROBEID_TAG}, listener.lastTags);
-  }
-
-  @Test
-  public void methodConstantValueMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    final String METRIC_NAME = "call_count";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            COUNT,
-            CLASS_NAME,
-            "main",
-            "int (java.lang.String)",
-            new ValueScript(DSL.value(42L), "42"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertTrue(listener.counters.containsKey(METRIC_NAME));
-    assertEquals(42, listener.counters.get(METRIC_NAME).longValue());
-  }
-
-  @Test
-  public void invalidConstantValueMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    String METRIC_NAME = "call_count";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            COUNT,
-            CLASS_NAME,
-            "main",
-            "int (java.lang.String)",
-            new ValueScript(DSL.value(42.0), "42.0"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertFalse(listener.counters.containsKey(METRIC_NAME));
-    verify(probeStatusSink)
-        .addError(eq(METRIC_ID), eq("Unsupported constant value: 42.0 type: java.lang.Double"));
-  }
-
-  @Test
-  public void invalidValueMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    String METRIC_NAME = "call_count";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            COUNT,
-            CLASS_NAME,
-            "main",
-            "int (java.lang.String)",
-            new ValueScript(DSL.ref("value"), "value"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertFalse(listener.counters.containsKey(METRIC_NAME));
-    verify(probeStatusSink).addError(eq(METRIC_ID), eq("Cannot resolve symbol value"));
-  }
-
-  @Test
-  public void multiInvalidValueMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    String METRIC_NAME = "call_count";
-    MetricProbe metric1 =
-        MetricProbe.builder()
-            .probeId(METRIC_ID1)
-            .metricName(METRIC_NAME)
-            .kind(COUNT)
-            .where(CLASS_NAME, "main", "int (java.lang.String)")
-            .valueScript(new ValueScript(DSL.ref("value"), "value"))
-            .build();
-    MetricProbe metric2 =
-        MetricProbe.builder()
-            .probeId(METRIC_ID2)
-            .metricName(METRIC_NAME)
-            .kind(COUNT)
-            .where(CLASS_NAME, "main", "int (java.lang.String)")
-            .valueScript(new ValueScript(DSL.ref("invalid"), "invalid"))
-            .build();
-    MetricForwarderListener listener = installMetricProbes(metric1, metric2);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertEquals(0, listener.counters.size());
-    ArgumentCaptor<String> msgCaptor = ArgumentCaptor.forClass(String.class);
-    verify(probeStatusSink, times(2)).addError(any(), msgCaptor.capture());
-    assertEquals("Cannot resolve symbol value", msgCaptor.getAllValues().get(0));
-    assertEquals("Cannot resolve symbol invalid", msgCaptor.getAllValues().get(1));
-  }
-
-  @Test
-  public void methodArgumentRefValueCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot03";
-    String METRIC_NAME = "argument_count";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            COUNT,
-            CLASS_NAME,
-            "f1",
-            "int (int)",
-            new ValueScript(DSL.ref("value"), "value"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(48, result);
-    assertTrue(listener.counters.containsKey(METRIC_NAME));
-    assertEquals(31, listener.counters.get(METRIC_NAME).longValue());
-  }
-
-  @Test
-  public void methodArgumentRefValueGaugeMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot03";
-    String METRIC_NAME = "argument_gauge";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            GAUGE,
-            CLASS_NAME,
-            "f1",
-            "int (int)",
-            new ValueScript(DSL.ref("value"), "value"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(48, result);
-    assertTrue(listener.gauges.containsKey(METRIC_NAME));
-    assertEquals(31, listener.gauges.get(METRIC_NAME).longValue());
-    assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
-  }
-
-  @Test
-  public void methodFieldRefValueGaugeDoubleMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    String METRIC_NAME = "field_double_gauge";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            GAUGE,
-            CLASS_NAME,
-            "f",
-            "()",
-            new ValueScript(DSL.ref("doubleValue"), "doubleValue"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertTrue(listener.doubleGauges.containsKey(METRIC_NAME));
-    assertEquals(3.14, listener.doubleGauges.get(METRIC_NAME).doubleValue(), 0.001);
-    assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
-  }
-
-  @Test
-  public void methodArgumentRefValueGaugeMetricWithTags() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot03";
-    String METRIC_NAME = "argument_gauge";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            GAUGE,
-            CLASS_NAME,
-            "f1",
-            "int (int)",
-            new ValueScript(DSL.ref("value"), "value"),
-            new String[] {"tag1:foo1"});
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertArrayEquals(new String[] {"tag1:foo1", METRIC_PROBEID_TAG}, listener.lastTags);
-  }
-
-  @Test
-  public void methodArgumentRefValueHistogramMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot03";
-    String METRIC_NAME = "argument_histogram";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            HISTOGRAM,
-            CLASS_NAME,
-            "f1",
-            "int (int)",
-            new ValueScript(DSL.ref("value"), "value"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(48, result);
-    assertTrue(listener.histograms.containsKey(METRIC_NAME));
-    assertEquals(31, listener.histograms.get(METRIC_NAME).longValue());
-    assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
-  }
-
-  @Test
-  public void methodFieldRefValueHistogramDoubleMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    String METRIC_NAME = "field_double_histogram";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            HISTOGRAM,
-            CLASS_NAME,
-            "f",
-            "()",
-            new ValueScript(DSL.ref("doubleValue"), "doubleValue"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertTrue(listener.doubleHistograms.containsKey(METRIC_NAME));
-    assertEquals(3.14, listener.doubleHistograms.get(METRIC_NAME).doubleValue(), 0.001);
-    assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
-  }
-
-  @Test
-  public void methodArgumentRefValueHistogramMetricWithTags()
-      throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot03";
-    String METRIC_NAME = "argument_histogram";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            HISTOGRAM,
-            CLASS_NAME,
-            "f1",
-            "int (int)",
-            new ValueScript(DSL.ref("value"), "value"),
-            new String[] {"tag1:foo1"});
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(48, result);
-    assertTrue(listener.histograms.containsKey(METRIC_NAME));
-    assertEquals(31, listener.histograms.get(METRIC_NAME).longValue());
-    assertArrayEquals(new String[] {"tag1:foo1", METRIC_PROBEID_TAG}, listener.lastTags);
-  }
-
-  @Test
-  public void methodArgumentRefValueDistributionMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot03";
-    String METRIC_NAME = "argument_distribution";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            DISTRIBUTION,
-            CLASS_NAME,
-            "f1",
-            "int (int)",
-            new ValueScript(DSL.ref("value"), "value"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(48, result);
-    assertTrue(listener.distributions.containsKey(METRIC_NAME));
-    assertEquals(31, listener.distributions.get(METRIC_NAME).longValue());
-    assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
-  }
-
-  @Test
-  public void methodFieldRefValueDistributionDoubleMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    String METRIC_NAME = "field_double_distribution";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            DISTRIBUTION,
-            CLASS_NAME,
-            "f",
-            "()",
-            new ValueScript(DSL.ref("doubleValue"), "doubleValue"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertTrue(listener.doubleDistributions.containsKey(METRIC_NAME));
-    assertEquals(3.14, listener.doubleDistributions.get(METRIC_NAME).doubleValue(), 0.001);
-    assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
-  }
-
-  @Test
-  public void methodSyntheticReturnGaugeMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    String METRIC_NAME = "syn_gauge";
-    MetricProbe metricProbe =
-        createMetricBuilder(METRIC_ID, METRIC_NAME, GAUGE)
-            .where(CLASS_NAME, "f", "()")
-            .valueScript(new ValueScript(DSL.ref("@return"), "@return"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricForwarderListener listener = installMetricProbes(metricProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertTrue(listener.gauges.containsKey(METRIC_NAME));
-    assertEquals(42, listener.gauges.get(METRIC_NAME).longValue());
-    assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
-  }
-
-  @Test
-  public void methodSyntheticReturnLenGaugeMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot32";
-    String METRIC_NAME = "syn_gauge";
-    MetricProbe metricProbe =
-        createMetricBuilder(METRIC_ID, METRIC_NAME, GAUGE)
-            .where(CLASS_NAME, "processArg", "(String)")
-            .valueScript(new ValueScript(DSL.len(DSL.ref("@return")), "len(@return)"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricForwarderListener listener = installMetricProbes(metricProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "foobar").get();
-    assertEquals(42, result);
-    assertTrue(listener.gauges.containsKey(METRIC_NAME));
-    assertEquals(6, listener.gauges.get(METRIC_NAME).longValue());
-    assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
-  }
-
-  @Test
-  public void methodSyntheticReturnInvalidType() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    final String INHERITED_CLASS_NAME = CLASS_NAME + "$Inherited";
-    String METRIC_NAME = "syn_gauge";
-    MetricProbe metricProbe =
-        createMetricBuilder(METRIC_ID, METRIC_NAME, GAUGE)
-            .where(INHERITED_CLASS_NAME, "<init>", "()")
-            .valueScript(new ValueScript(DSL.ref("@return"), "@return"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricForwarderListener listener = installMetricProbes(metricProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "").get();
-    assertEquals(42, result);
-    assertFalse(listener.gauges.containsKey(METRIC_NAME));
-    verify(probeStatusSink).addError(eq(METRIC_ID), eq("Cannot resolve symbol @return"));
-  }
-
-  @Test
-  public void methodSyntheticDurationGaugeMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    String METRIC_NAME = "syn_gauge";
-    MetricProbe metricProbe =
-        createMetricBuilder(METRIC_ID, METRIC_NAME, GAUGE)
-            .where(CLASS_NAME, "f", "()")
-            .valueScript(new ValueScript(DSL.ref("@duration"), "@duration"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricForwarderListener listener = installMetricProbes(metricProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertTrue(listener.doubleGauges.containsKey(METRIC_NAME));
-    assertTrue(listener.doubleGauges.get(METRIC_NAME).doubleValue() > 0);
-    assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
-  }
-
-  @Test
-  public void methodSyntheticDurationKotlinDist() {
-    final String CLASS_NAME = "CapturedSnapshot302";
-    String METRIC_NAME = "syn_dist";
-    MetricProbe metricProbe =
-        createMetricBuilder(METRIC_ID, METRIC_NAME, DISTRIBUTION)
-            .where(CLASS_NAME, "download", null)
-            .valueScript(new ValueScript(DSL.ref("@duration"), "@duration"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricForwarderListener listener = installMetricProbes(metricProbe);
-    URL resource = CapturedSnapshotTest.class.getResource("/" + CLASS_NAME + ".kt");
-    List<File> filesToDelete = new ArrayList<>();
-    try {
-      Class<?> testClass =
-          KotlinHelper.compileAndLoad(CLASS_NAME, resource.getFile(), filesToDelete);
-      Object companion = Reflect.onClass(testClass).get("Companion");
-      int result = Reflect.on(companion).call("main", "1").get();
-      assertEquals(1, result);
-      assertTrue(listener.doubleDistributions.containsKey(METRIC_NAME));
-      assertTrue(listener.doubleDistributions.get(METRIC_NAME).doubleValue() > 0);
-      assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
-    } finally {
-      filesToDelete.forEach(File::delete);
+
+    @Test
+    public void methodIncCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        String METRIC_NAME = "call_count";
+        MetricForwarderListener listener =
+                installMethodMetric(METRIC_NAME, COUNT, CLASS_NAME, "main", "int (java.lang.String)", null);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertTrue(listener.counters.containsKey(METRIC_NAME));
+        assertEquals(1, listener.counters.get(METRIC_NAME).longValue());
+        assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
+    }
+
+    @Test
+    public void methodIncCountWithTagsMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        String METRIC_NAME = "call_count";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME, COUNT, CLASS_NAME, "main", "int (java.lang.String)", null, new String[] {
+                    "tag1:foo1", "tag2:foo2"
+                });
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertTrue(listener.counters.containsKey(METRIC_NAME));
+        assertEquals(1, listener.counters.get(METRIC_NAME).longValue());
+        assertArrayEquals(new String[] {"tag1:foo1", "tag2:foo2", METRIC_PROBEID_TAG}, listener.lastTags);
+    }
+
+    @Test
+    public void methodConstantValueMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        final String METRIC_NAME = "call_count";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME,
+                COUNT,
+                CLASS_NAME,
+                "main",
+                "int (java.lang.String)",
+                new ValueScript(DSL.value(42L), "42"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertTrue(listener.counters.containsKey(METRIC_NAME));
+        assertEquals(42, listener.counters.get(METRIC_NAME).longValue());
+    }
+
+    @Test
+    public void invalidConstantValueMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        String METRIC_NAME = "call_count";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME,
+                COUNT,
+                CLASS_NAME,
+                "main",
+                "int (java.lang.String)",
+                new ValueScript(DSL.value(42.0), "42.0"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertFalse(listener.counters.containsKey(METRIC_NAME));
+        verify(probeStatusSink).addError(eq(METRIC_ID), eq("Unsupported constant value: 42.0 type: java.lang.Double"));
+    }
+
+    @Test
+    public void invalidValueMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        String METRIC_NAME = "call_count";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME,
+                COUNT,
+                CLASS_NAME,
+                "main",
+                "int (java.lang.String)",
+                new ValueScript(DSL.ref("value"), "value"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertFalse(listener.counters.containsKey(METRIC_NAME));
+        verify(probeStatusSink).addError(eq(METRIC_ID), eq("Cannot resolve symbol value"));
+    }
+
+    @Test
+    public void multiInvalidValueMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        String METRIC_NAME = "call_count";
+        MetricProbe metric1 = MetricProbe.builder()
+                .probeId(METRIC_ID1)
+                .metricName(METRIC_NAME)
+                .kind(COUNT)
+                .where(CLASS_NAME, "main", "int (java.lang.String)")
+                .valueScript(new ValueScript(DSL.ref("value"), "value"))
+                .build();
+        MetricProbe metric2 = MetricProbe.builder()
+                .probeId(METRIC_ID2)
+                .metricName(METRIC_NAME)
+                .kind(COUNT)
+                .where(CLASS_NAME, "main", "int (java.lang.String)")
+                .valueScript(new ValueScript(DSL.ref("invalid"), "invalid"))
+                .build();
+        MetricForwarderListener listener = installMetricProbes(metric1, metric2);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertEquals(0, listener.counters.size());
+        ArgumentCaptor<String> msgCaptor = ArgumentCaptor.forClass(String.class);
+        verify(probeStatusSink, times(2)).addError(any(), msgCaptor.capture());
+        assertEquals("Cannot resolve symbol value", msgCaptor.getAllValues().get(0));
+        assertEquals("Cannot resolve symbol invalid", msgCaptor.getAllValues().get(1));
+    }
+
+    @Test
+    public void methodArgumentRefValueCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot03";
+        String METRIC_NAME = "argument_count";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME, COUNT, CLASS_NAME, "f1", "int (int)", new ValueScript(DSL.ref("value"), "value"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(48, result);
+        assertTrue(listener.counters.containsKey(METRIC_NAME));
+        assertEquals(31, listener.counters.get(METRIC_NAME).longValue());
+    }
+
+    @Test
+    public void methodArgumentRefValueGaugeMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot03";
+        String METRIC_NAME = "argument_gauge";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME, GAUGE, CLASS_NAME, "f1", "int (int)", new ValueScript(DSL.ref("value"), "value"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(48, result);
+        assertTrue(listener.gauges.containsKey(METRIC_NAME));
+        assertEquals(31, listener.gauges.get(METRIC_NAME).longValue());
+        assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
+    }
+
+    @Test
+    public void methodFieldRefValueGaugeDoubleMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        String METRIC_NAME = "field_double_gauge";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME, GAUGE, CLASS_NAME, "f", "()", new ValueScript(DSL.ref("doubleValue"), "doubleValue"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertTrue(listener.doubleGauges.containsKey(METRIC_NAME));
+        assertEquals(3.14, listener.doubleGauges.get(METRIC_NAME).doubleValue(), 0.001);
+        assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
+    }
+
+    @Test
+    public void methodArgumentRefValueGaugeMetricWithTags() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot03";
+        String METRIC_NAME = "argument_gauge";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME,
+                GAUGE,
+                CLASS_NAME,
+                "f1",
+                "int (int)",
+                new ValueScript(DSL.ref("value"), "value"),
+                new String[] {"tag1:foo1"});
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertArrayEquals(new String[] {"tag1:foo1", METRIC_PROBEID_TAG}, listener.lastTags);
+    }
+
+    @Test
+    public void methodArgumentRefValueHistogramMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot03";
+        String METRIC_NAME = "argument_histogram";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME, HISTOGRAM, CLASS_NAME, "f1", "int (int)", new ValueScript(DSL.ref("value"), "value"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(48, result);
+        assertTrue(listener.histograms.containsKey(METRIC_NAME));
+        assertEquals(31, listener.histograms.get(METRIC_NAME).longValue());
+        assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
+    }
+
+    @Test
+    public void methodFieldRefValueHistogramDoubleMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        String METRIC_NAME = "field_double_histogram";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME, HISTOGRAM, CLASS_NAME, "f", "()", new ValueScript(DSL.ref("doubleValue"), "doubleValue"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertTrue(listener.doubleHistograms.containsKey(METRIC_NAME));
+        assertEquals(3.14, listener.doubleHistograms.get(METRIC_NAME).doubleValue(), 0.001);
+        assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
+    }
+
+    @Test
+    public void methodArgumentRefValueHistogramMetricWithTags() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot03";
+        String METRIC_NAME = "argument_histogram";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME,
+                HISTOGRAM,
+                CLASS_NAME,
+                "f1",
+                "int (int)",
+                new ValueScript(DSL.ref("value"), "value"),
+                new String[] {"tag1:foo1"});
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(48, result);
+        assertTrue(listener.histograms.containsKey(METRIC_NAME));
+        assertEquals(31, listener.histograms.get(METRIC_NAME).longValue());
+        assertArrayEquals(new String[] {"tag1:foo1", METRIC_PROBEID_TAG}, listener.lastTags);
+    }
+
+    @Test
+    public void methodArgumentRefValueDistributionMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot03";
+        String METRIC_NAME = "argument_distribution";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME, DISTRIBUTION, CLASS_NAME, "f1", "int (int)", new ValueScript(DSL.ref("value"), "value"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(48, result);
+        assertTrue(listener.distributions.containsKey(METRIC_NAME));
+        assertEquals(31, listener.distributions.get(METRIC_NAME).longValue());
+        assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
+    }
+
+    @Test
+    public void methodFieldRefValueDistributionDoubleMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        String METRIC_NAME = "field_double_distribution";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME,
+                DISTRIBUTION,
+                CLASS_NAME,
+                "f",
+                "()",
+                new ValueScript(DSL.ref("doubleValue"), "doubleValue"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertTrue(listener.doubleDistributions.containsKey(METRIC_NAME));
+        assertEquals(3.14, listener.doubleDistributions.get(METRIC_NAME).doubleValue(), 0.001);
+        assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
+    }
+
+    @Test
+    public void methodSyntheticReturnGaugeMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        String METRIC_NAME = "syn_gauge";
+        MetricProbe metricProbe = createMetricBuilder(METRIC_ID, METRIC_NAME, GAUGE)
+                .where(CLASS_NAME, "f", "()")
+                .valueScript(new ValueScript(DSL.ref("@return"), "@return"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricForwarderListener listener = installMetricProbes(metricProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertTrue(listener.gauges.containsKey(METRIC_NAME));
+        assertEquals(42, listener.gauges.get(METRIC_NAME).longValue());
+        assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
+    }
+
+    @Test
+    public void methodSyntheticReturnLenGaugeMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot32";
+        String METRIC_NAME = "syn_gauge";
+        MetricProbe metricProbe = createMetricBuilder(METRIC_ID, METRIC_NAME, GAUGE)
+                .where(CLASS_NAME, "processArg", "(String)")
+                .valueScript(new ValueScript(DSL.len(DSL.ref("@return")), "len(@return)"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricForwarderListener listener = installMetricProbes(metricProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "foobar").get();
+        assertEquals(42, result);
+        assertTrue(listener.gauges.containsKey(METRIC_NAME));
+        assertEquals(6, listener.gauges.get(METRIC_NAME).longValue());
+        assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
+    }
+
+    @Test
+    public void methodSyntheticReturnInvalidType() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        final String INHERITED_CLASS_NAME = CLASS_NAME + "$Inherited";
+        String METRIC_NAME = "syn_gauge";
+        MetricProbe metricProbe = createMetricBuilder(METRIC_ID, METRIC_NAME, GAUGE)
+                .where(INHERITED_CLASS_NAME, "<init>", "()")
+                .valueScript(new ValueScript(DSL.ref("@return"), "@return"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricForwarderListener listener = installMetricProbes(metricProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "").get();
+        assertEquals(42, result);
+        assertFalse(listener.gauges.containsKey(METRIC_NAME));
+        verify(probeStatusSink).addError(eq(METRIC_ID), eq("Cannot resolve symbol @return"));
+    }
+
+    @Test
+    public void methodSyntheticDurationGaugeMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        String METRIC_NAME = "syn_gauge";
+        MetricProbe metricProbe = createMetricBuilder(METRIC_ID, METRIC_NAME, GAUGE)
+                .where(CLASS_NAME, "f", "()")
+                .valueScript(new ValueScript(DSL.ref("@duration"), "@duration"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricForwarderListener listener = installMetricProbes(metricProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertTrue(listener.doubleGauges.containsKey(METRIC_NAME));
+        assertTrue(listener.doubleGauges.get(METRIC_NAME).doubleValue() > 0);
+        assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
+    }
+
+    @Test
+    public void methodSyntheticDurationKotlinDist() {
+        final String CLASS_NAME = "CapturedSnapshot302";
+        String METRIC_NAME = "syn_dist";
+        MetricProbe metricProbe = createMetricBuilder(METRIC_ID, METRIC_NAME, DISTRIBUTION)
+                .where(CLASS_NAME, "download", null)
+                .valueScript(new ValueScript(DSL.ref("@duration"), "@duration"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricForwarderListener listener = installMetricProbes(metricProbe);
+        URL resource = CapturedSnapshotTest.class.getResource("/" + CLASS_NAME + ".kt");
+        List<File> filesToDelete = new ArrayList<>();
+        try {
+            Class<?> testClass = KotlinHelper.compileAndLoad(CLASS_NAME, resource.getFile(), filesToDelete);
+            Object companion = Reflect.onClass(testClass).get("Companion");
+            int result = Reflect.on(companion).call("main", "1").get();
+            assertEquals(1, result);
+            assertTrue(listener.doubleDistributions.containsKey(METRIC_NAME));
+            assertTrue(listener.doubleDistributions.get(METRIC_NAME).doubleValue() > 0);
+            assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
+        } finally {
+            filesToDelete.forEach(File::delete);
+        }
+    }
+
+    @Test
+    public void methodSyntheticDurationExceptionGaugeMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot05";
+        String METRIC_NAME = "syn_gauge";
+        MetricProbe metricProbe = createMetricBuilder(METRIC_ID, METRIC_NAME, GAUGE)
+                .where(CLASS_NAME, "main", "(String)")
+                .valueScript(new ValueScript(DSL.ref("@duration"), "@duration"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricForwarderListener listener = installMetricProbes(metricProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        try {
+            Reflect.on(testClass).call("main", "triggerUncaughtException").get();
+            fail("should not reach this code");
+        } catch (Exception ex) {
+            assertEquals("oops", ex.getCause().getCause().getMessage());
+        }
+        assertTrue(listener.doubleGauges.containsKey(METRIC_NAME));
+        assertTrue(listener.doubleGauges.get(METRIC_NAME).doubleValue() > 0);
+        assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
+    }
+
+    @Test
+    public void lineArgumentRefValueCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot03";
+        String METRIC_NAME = "argument_count";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID1);
+        MetricProbe metricProbe = createLineMetric(
+                LINE_METRIC_ID1, METRIC_NAME, COUNT, CLASS_NAME, new ValueScript(DSL.ref("value"), "value"), line);
+        MetricForwarderListener listener = installMetricProbes(metricProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(48, result);
+        assertTrue(listener.counters.containsKey(METRIC_NAME));
+        assertEquals(31, listener.counters.get(METRIC_NAME).longValue());
+    }
+
+    @Test
+    public void invalidNameArgumentRefValueCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot03";
+        String METRIC_NAME = "argument_count";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME, COUNT, CLASS_NAME, "f1", "int (int)", new ValueScript(DSL.ref("foo"), "foo"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(48, result);
+        assertFalse(listener.counters.containsKey(METRIC_NAME));
+        verify(probeStatusSink).addError(eq(METRIC_ID), eq("Cannot resolve symbol foo"));
+    }
+
+    @Test
+    public void invalidTypeArgumentRefValueCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot03";
+        String METRIC_NAME = "argument_count";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME,
+                COUNT,
+                CLASS_NAME,
+                "main",
+                "int (java.lang.String)",
+                new ValueScript(DSL.ref("arg"), "arg"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(48, result);
+        assertFalse(listener.counters.containsKey(METRIC_NAME));
+        verify(probeStatusSink)
+                .addError(
+                        eq(METRIC_ID),
+                        eq("Incompatible type for expression: java.lang.String with expected types: [long]"));
+    }
+
+    @Test
+    public void lineLocalRefValueCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        String METRIC_NAME = "localvar_count";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID2);
+        MetricProbe metricProbe = createLineMetric(
+                LINE_METRIC_ID2, METRIC_NAME, COUNT, CLASS_NAME, new ValueScript(DSL.ref("var1"), "var1"), line);
+        MetricForwarderListener listener = installMetricProbes(metricProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertTrue(listener.counters.containsKey(METRIC_NAME));
+        assertEquals(3, listener.counters.get(METRIC_NAME).longValue());
+    }
+
+    @Test
+    public void invalidNameLocalRefValueCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        String METRIC_NAME = "localvar_count";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID2);
+        MetricProbe metricProbe = createLineMetric(
+                LINE_METRIC_ID2, METRIC_NAME, COUNT, CLASS_NAME, new ValueScript(DSL.ref("foo"), "foo"), line);
+        MetricForwarderListener listener = installMetricProbes(metricProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertFalse(listener.counters.containsKey(METRIC_NAME));
+        verify(probeStatusSink).addError(eq(LINE_METRIC_ID2), eq("Cannot resolve symbol foo"));
     }
-  }
-
-  @Test
-  public void methodSyntheticDurationExceptionGaugeMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot05";
-    String METRIC_NAME = "syn_gauge";
-    MetricProbe metricProbe =
-        createMetricBuilder(METRIC_ID, METRIC_NAME, GAUGE)
-            .where(CLASS_NAME, "main", "(String)")
-            .valueScript(new ValueScript(DSL.ref("@duration"), "@duration"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricForwarderListener listener = installMetricProbes(metricProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    try {
-      Reflect.on(testClass).call("main", "triggerUncaughtException").get();
-      fail("should not reach this code");
-    } catch (Exception ex) {
-      assertEquals("oops", ex.getCause().getCause().getMessage());
+
+    @Test
+    public void invalidTypeLocalRefValueCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        String METRIC_NAME = "localvar_count";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID2);
+        MetricProbe metricProbe = createLineMetric(
+                LINE_METRIC_ID2, METRIC_NAME, COUNT, CLASS_NAME, new ValueScript(DSL.ref("arg"), "arg"), line);
+        MetricForwarderListener listener = installMetricProbes(metricProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertFalse(listener.counters.containsKey(METRIC_NAME));
+        verify(probeStatusSink)
+                .addError(
+                        eq(LINE_METRIC_ID2),
+                        eq("Incompatible type for expression: java.lang.String with expected types: [long]"));
+    }
+
+    @Test
+    public void methodFieldRefValueCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        String METRIC_NAME = "field_count";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME, COUNT, CLASS_NAME, "f", "()", new ValueScript(DSL.ref("intValue"), "intValue"));
+
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertTrue(listener.counters.containsKey(METRIC_NAME));
+        assertEquals(24, listener.counters.get(METRIC_NAME).longValue());
+    }
+
+    @Test
+    public void methodThisFieldRefValueCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        String METRIC_NAME = "field_count";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME,
+                COUNT,
+                CLASS_NAME,
+                "f",
+                "()",
+                new ValueScript(DSL.getMember(DSL.ref("this"), "intValue"), "this.intValue"));
+
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertTrue(listener.counters.containsKey(METRIC_NAME));
+        assertEquals(24, listener.counters.get(METRIC_NAME).longValue());
+    }
+
+    @Test
+    public void lineFieldRefValueCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        String METRIC_NAME = "field_count";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID1);
+        MetricProbe metricProbe = createLineMetric(
+                LINE_METRIC_ID1,
+                METRIC_NAME,
+                COUNT,
+                CLASS_NAME,
+                new ValueScript(DSL.getMember(DSL.ref("this"), "intValue"), "intValue"),
+                line);
+        MetricForwarderListener listener = installMetricProbes(metricProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertTrue(listener.counters.containsKey(METRIC_NAME));
+        assertEquals(48, listener.counters.get(METRIC_NAME).longValue());
+    }
+
+    @Test
+    public void lineMultiFieldRefValueCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot04";
+        String METRIC_NAME1 = "field1_count";
+        String METRIC_NAME2 = "field2_count";
+        int line3 = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID3);
+        int line4 = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID4);
+        MetricProbe metricProbe1 = createLineMetric(
+                LINE_METRIC_ID3,
+                METRIC_NAME1,
+                COUNT,
+                CLASS_NAME,
+                new ValueScript(DSL.getMember(DSL.ref("sdata"), "intValue"), "sdata.intValue"),
+                line3);
+        MetricProbe metricProbe2 = createLineMetric(
+                LINE_METRIC_ID4,
+                METRIC_NAME2,
+                COUNT,
+                CLASS_NAME,
+                new ValueScript(DSL.getMember(DSL.getMember(DSL.ref("cdata"), "s1"), "intValue"), "cdata.s1.intValue"),
+                line4);
+        MetricForwarderListener listener = installMetricProbes(metricProbe1, metricProbe2);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "").get();
+        assertEquals(143, result);
+        assertTrue(listener.counters.containsKey(METRIC_NAME1));
+        assertTrue(listener.counters.containsKey(METRIC_NAME2));
+        assertEquals(42, listener.counters.get(METRIC_NAME1).longValue());
+        assertEquals(101, listener.counters.get(METRIC_NAME2).longValue());
+    }
+
+    @Test
+    public void nullMultiFieldRefValueCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot04";
+        String METRIC_NAME1 = "field1_count";
+        String METRIC_NAME2 = "field2_count";
+        int line1 = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID1);
+        int line2 = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID2);
+        MetricProbe metricProbe1 = createLineMetric(
+                LINE_METRIC_ID1,
+                METRIC_NAME1,
+                COUNT,
+                CLASS_NAME,
+                new ValueScript(DSL.getMember(DSL.ref("nullObject"), "intValue"), "nullObject.intValue"),
+                line1);
+        MetricProbe metricProbe2 = createLineMetric(
+                LINE_METRIC_ID2,
+                METRIC_NAME2,
+                COUNT,
+                CLASS_NAME,
+                new ValueScript(
+                        DSL.getMember(DSL.getMember(DSL.ref("cdata"), "nullsd"), "intValue"), "cdata.nullsd.intValue"),
+                line2);
+        MetricForwarderListener listener = installMetricProbes(metricProbe1, metricProbe2);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "").get();
+        assertEquals(143, result);
+        assertFalse(listener.counters.containsKey(METRIC_NAME1));
+        assertFalse(listener.counters.containsKey(METRIC_NAME2));
+        verify(probeStatusSink, times(0)).addError(any(), anyString());
+    }
+
+    @Test
+    public void invalidNameMultiFieldRefValueCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot04";
+        String METRIC_NAME1 = "field1_count";
+        String METRIC_NAME2 = "field2_count";
+        int line3 = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID3);
+        int line4 = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID4);
+        MetricProbe metricProbe1 = createLineMetric(
+                LINE_METRIC_ID3,
+                METRIC_NAME1,
+                COUNT,
+                CLASS_NAME,
+                new ValueScript(DSL.getMember(DSL.ref("sdata"), "foovalue"), "sdata.foovalue"),
+                line3);
+        MetricProbe metricProbe2 = createLineMetric(
+                LINE_METRIC_ID4,
+                METRIC_NAME2,
+                COUNT,
+                CLASS_NAME,
+                new ValueScript(DSL.getMember(DSL.getMember(DSL.ref("cdata"), "s1"), "foovalue"), "cdata.s1.foovalue"),
+                line4);
+        MetricForwarderListener listener = installMetricProbes(metricProbe1, metricProbe2);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "").get();
+        assertEquals(143, result);
+        assertFalse(listener.counters.containsKey(METRIC_NAME1));
+        assertFalse(listener.counters.containsKey(METRIC_NAME2));
+        ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
+        verify(probeStatusSink, times(2)).addError(any(), strCaptor.capture());
+        assertEquals("Cannot resolve field foovalue", strCaptor.getAllValues().get(0));
+        assertEquals("Cannot resolve field foovalue", strCaptor.getAllValues().get(1));
+    }
+
+    @Test
+    public void invalidTypeMultiFieldRefValueCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot04";
+        String METRIC_NAME1 = "field1_count";
+        String METRIC_NAME2 = "field2_count";
+        int line3 = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID3);
+        int line4 = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID4);
+        MetricProbe metricProbe1 = createLineMetric(
+                LINE_METRIC_ID3,
+                METRIC_NAME1,
+                COUNT,
+                CLASS_NAME,
+                new ValueScript(DSL.getMember(DSL.ref("sdata"), "strValue"), "sdata.strValue"),
+                line3);
+        MetricProbe metricProbe2 = createLineMetric(
+                LINE_METRIC_ID4,
+                METRIC_NAME2,
+                COUNT,
+                CLASS_NAME,
+                new ValueScript(DSL.getMember(DSL.getMember(DSL.ref("cdata"), "s1"), "strValue"), "cdata.s1.strValue"),
+                line4);
+        MetricForwarderListener listener = installMetricProbes(metricProbe1, metricProbe2);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "").get();
+        assertEquals(143, result);
+        assertFalse(listener.counters.containsKey(METRIC_NAME1));
+        assertFalse(listener.counters.containsKey(METRIC_NAME2));
+        ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
+        verify(probeStatusSink, times(2)).addError(any(), strCaptor.capture());
+        assertEquals(
+                "Incompatible type for expression: java.lang.String with expected types: [long]",
+                strCaptor.getAllValues().get(0));
+        assertEquals(
+                "Incompatible type for expression: java.lang.String with expected types: [long]",
+                strCaptor.getAllValues().get(1));
+    }
+
+    @Test
+    public void invalidNameFieldRefValueCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        String METRIC_NAME = "field_count";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME, COUNT, CLASS_NAME, "f", "()", new ValueScript(DSL.ref("fooValue"), "fooValue"));
+
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertFalse(listener.counters.containsKey(METRIC_NAME));
+        verify(probeStatusSink).addError(eq(METRIC_ID), eq("Cannot resolve symbol fooValue"));
+    }
+
+    @Test
+    public void invalidTypeFieldRefValueCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        String METRIC_NAME = "field_count";
+        MetricForwarderListener listener = installMethodMetric(
+                METRIC_NAME, COUNT, CLASS_NAME, "f", "()", new ValueScript(DSL.ref("strValue"), "strValue"));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertFalse(listener.counters.containsKey(METRIC_NAME));
+        verify(probeStatusSink)
+                .addError(
+                        eq(METRIC_ID),
+                        eq("Incompatible type for expression: java.lang.String with expected types: [long]"));
     }
-    assertTrue(listener.doubleGauges.containsKey(METRIC_NAME));
-    assertTrue(listener.doubleGauges.get(METRIC_NAME).doubleValue() > 0);
-    assertArrayEquals(new String[] {METRIC_PROBEID_TAG}, listener.lastTags);
-  }
-
-  @Test
-  public void lineArgumentRefValueCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot03";
-    String METRIC_NAME = "argument_count";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID1);
-    MetricProbe metricProbe =
-        createLineMetric(
-            LINE_METRIC_ID1,
-            METRIC_NAME,
-            COUNT,
-            CLASS_NAME,
-            new ValueScript(DSL.ref("value"), "value"),
-            line);
-    MetricForwarderListener listener = installMetricProbes(metricProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(48, result);
-    assertTrue(listener.counters.containsKey(METRIC_NAME));
-    assertEquals(31, listener.counters.get(METRIC_NAME).longValue());
-  }
-
-  @Test
-  public void invalidNameArgumentRefValueCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot03";
-    String METRIC_NAME = "argument_count";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            COUNT,
-            CLASS_NAME,
-            "f1",
-            "int (int)",
-            new ValueScript(DSL.ref("foo"), "foo"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(48, result);
-    assertFalse(listener.counters.containsKey(METRIC_NAME));
-    verify(probeStatusSink).addError(eq(METRIC_ID), eq("Cannot resolve symbol foo"));
-  }
-
-  @Test
-  public void invalidTypeArgumentRefValueCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot03";
-    String METRIC_NAME = "argument_count";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            COUNT,
-            CLASS_NAME,
-            "main",
-            "int (java.lang.String)",
-            new ValueScript(DSL.ref("arg"), "arg"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(48, result);
-    assertFalse(listener.counters.containsKey(METRIC_NAME));
-    verify(probeStatusSink)
-        .addError(
-            eq(METRIC_ID),
-            eq("Incompatible type for expression: java.lang.String with expected types: [long]"));
-  }
-
-  @Test
-  public void lineLocalRefValueCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    String METRIC_NAME = "localvar_count";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID2);
-    MetricProbe metricProbe =
-        createLineMetric(
-            LINE_METRIC_ID2,
-            METRIC_NAME,
-            COUNT,
-            CLASS_NAME,
-            new ValueScript(DSL.ref("var1"), "var1"),
-            line);
-    MetricForwarderListener listener = installMetricProbes(metricProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertTrue(listener.counters.containsKey(METRIC_NAME));
-    assertEquals(3, listener.counters.get(METRIC_NAME).longValue());
-  }
-
-  @Test
-  public void invalidNameLocalRefValueCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    String METRIC_NAME = "localvar_count";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID2);
-    MetricProbe metricProbe =
-        createLineMetric(
-            LINE_METRIC_ID2,
-            METRIC_NAME,
-            COUNT,
-            CLASS_NAME,
-            new ValueScript(DSL.ref("foo"), "foo"),
-            line);
-    MetricForwarderListener listener = installMetricProbes(metricProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertFalse(listener.counters.containsKey(METRIC_NAME));
-    verify(probeStatusSink).addError(eq(LINE_METRIC_ID2), eq("Cannot resolve symbol foo"));
-  }
-
-  @Test
-  public void invalidTypeLocalRefValueCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    String METRIC_NAME = "localvar_count";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID2);
-    MetricProbe metricProbe =
-        createLineMetric(
-            LINE_METRIC_ID2,
-            METRIC_NAME,
-            COUNT,
-            CLASS_NAME,
-            new ValueScript(DSL.ref("arg"), "arg"),
-            line);
-    MetricForwarderListener listener = installMetricProbes(metricProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertFalse(listener.counters.containsKey(METRIC_NAME));
-    verify(probeStatusSink)
-        .addError(
-            eq(LINE_METRIC_ID2),
-            eq("Incompatible type for expression: java.lang.String with expected types: [long]"));
-  }
-
-  @Test
-  public void methodFieldRefValueCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    String METRIC_NAME = "field_count";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            COUNT,
-            CLASS_NAME,
-            "f",
-            "()",
-            new ValueScript(DSL.ref("intValue"), "intValue"));
-
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertTrue(listener.counters.containsKey(METRIC_NAME));
-    assertEquals(24, listener.counters.get(METRIC_NAME).longValue());
-  }
-
-  @Test
-  public void methodThisFieldRefValueCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    String METRIC_NAME = "field_count";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            COUNT,
-            CLASS_NAME,
-            "f",
-            "()",
-            new ValueScript(DSL.getMember(DSL.ref("this"), "intValue"), "this.intValue"));
-
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertTrue(listener.counters.containsKey(METRIC_NAME));
-    assertEquals(24, listener.counters.get(METRIC_NAME).longValue());
-  }
-
-  @Test
-  public void lineFieldRefValueCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    String METRIC_NAME = "field_count";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID1);
-    MetricProbe metricProbe =
-        createLineMetric(
-            LINE_METRIC_ID1,
-            METRIC_NAME,
-            COUNT,
-            CLASS_NAME,
-            new ValueScript(DSL.getMember(DSL.ref("this"), "intValue"), "intValue"),
-            line);
-    MetricForwarderListener listener = installMetricProbes(metricProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertTrue(listener.counters.containsKey(METRIC_NAME));
-    assertEquals(48, listener.counters.get(METRIC_NAME).longValue());
-  }
-
-  @Test
-  public void lineMultiFieldRefValueCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot04";
-    String METRIC_NAME1 = "field1_count";
-    String METRIC_NAME2 = "field2_count";
-    int line3 = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID3);
-    int line4 = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID4);
-    MetricProbe metricProbe1 =
-        createLineMetric(
-            LINE_METRIC_ID3,
-            METRIC_NAME1,
-            COUNT,
-            CLASS_NAME,
-            new ValueScript(DSL.getMember(DSL.ref("sdata"), "intValue"), "sdata.intValue"),
-            line3);
-    MetricProbe metricProbe2 =
-        createLineMetric(
-            LINE_METRIC_ID4,
-            METRIC_NAME2,
-            COUNT,
-            CLASS_NAME,
-            new ValueScript(
-                DSL.getMember(DSL.getMember(DSL.ref("cdata"), "s1"), "intValue"),
-                "cdata.s1.intValue"),
-            line4);
-    MetricForwarderListener listener = installMetricProbes(metricProbe1, metricProbe2);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "").get();
-    assertEquals(143, result);
-    assertTrue(listener.counters.containsKey(METRIC_NAME1));
-    assertTrue(listener.counters.containsKey(METRIC_NAME2));
-    assertEquals(42, listener.counters.get(METRIC_NAME1).longValue());
-    assertEquals(101, listener.counters.get(METRIC_NAME2).longValue());
-  }
-
-  @Test
-  public void nullMultiFieldRefValueCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot04";
-    String METRIC_NAME1 = "field1_count";
-    String METRIC_NAME2 = "field2_count";
-    int line1 = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID1);
-    int line2 = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID2);
-    MetricProbe metricProbe1 =
-        createLineMetric(
-            LINE_METRIC_ID1,
-            METRIC_NAME1,
-            COUNT,
-            CLASS_NAME,
-            new ValueScript(
-                DSL.getMember(DSL.ref("nullObject"), "intValue"), "nullObject.intValue"),
-            line1);
-    MetricProbe metricProbe2 =
-        createLineMetric(
-            LINE_METRIC_ID2,
-            METRIC_NAME2,
-            COUNT,
-            CLASS_NAME,
-            new ValueScript(
-                DSL.getMember(DSL.getMember(DSL.ref("cdata"), "nullsd"), "intValue"),
-                "cdata.nullsd.intValue"),
-            line2);
-    MetricForwarderListener listener = installMetricProbes(metricProbe1, metricProbe2);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "").get();
-    assertEquals(143, result);
-    assertFalse(listener.counters.containsKey(METRIC_NAME1));
-    assertFalse(listener.counters.containsKey(METRIC_NAME2));
-    verify(probeStatusSink, times(0)).addError(any(), anyString());
-  }
-
-  @Test
-  public void invalidNameMultiFieldRefValueCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot04";
-    String METRIC_NAME1 = "field1_count";
-    String METRIC_NAME2 = "field2_count";
-    int line3 = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID3);
-    int line4 = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID4);
-    MetricProbe metricProbe1 =
-        createLineMetric(
-            LINE_METRIC_ID3,
-            METRIC_NAME1,
-            COUNT,
-            CLASS_NAME,
-            new ValueScript(DSL.getMember(DSL.ref("sdata"), "foovalue"), "sdata.foovalue"),
-            line3);
-    MetricProbe metricProbe2 =
-        createLineMetric(
-            LINE_METRIC_ID4,
-            METRIC_NAME2,
-            COUNT,
-            CLASS_NAME,
-            new ValueScript(
-                DSL.getMember(DSL.getMember(DSL.ref("cdata"), "s1"), "foovalue"),
-                "cdata.s1.foovalue"),
-            line4);
-    MetricForwarderListener listener = installMetricProbes(metricProbe1, metricProbe2);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "").get();
-    assertEquals(143, result);
-    assertFalse(listener.counters.containsKey(METRIC_NAME1));
-    assertFalse(listener.counters.containsKey(METRIC_NAME2));
-    ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
-    verify(probeStatusSink, times(2)).addError(any(), strCaptor.capture());
-    assertEquals("Cannot resolve field foovalue", strCaptor.getAllValues().get(0));
-    assertEquals("Cannot resolve field foovalue", strCaptor.getAllValues().get(1));
-  }
-
-  @Test
-  public void invalidTypeMultiFieldRefValueCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot04";
-    String METRIC_NAME1 = "field1_count";
-    String METRIC_NAME2 = "field2_count";
-    int line3 = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID3);
-    int line4 = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID4);
-    MetricProbe metricProbe1 =
-        createLineMetric(
-            LINE_METRIC_ID3,
-            METRIC_NAME1,
-            COUNT,
-            CLASS_NAME,
-            new ValueScript(DSL.getMember(DSL.ref("sdata"), "strValue"), "sdata.strValue"),
-            line3);
-    MetricProbe metricProbe2 =
-        createLineMetric(
-            LINE_METRIC_ID4,
-            METRIC_NAME2,
-            COUNT,
-            CLASS_NAME,
-            new ValueScript(
-                DSL.getMember(DSL.getMember(DSL.ref("cdata"), "s1"), "strValue"),
-                "cdata.s1.strValue"),
-            line4);
-    MetricForwarderListener listener = installMetricProbes(metricProbe1, metricProbe2);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "").get();
-    assertEquals(143, result);
-    assertFalse(listener.counters.containsKey(METRIC_NAME1));
-    assertFalse(listener.counters.containsKey(METRIC_NAME2));
-    ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
-    verify(probeStatusSink, times(2)).addError(any(), strCaptor.capture());
-    assertEquals(
-        "Incompatible type for expression: java.lang.String with expected types: [long]",
-        strCaptor.getAllValues().get(0));
-    assertEquals(
-        "Incompatible type for expression: java.lang.String with expected types: [long]",
-        strCaptor.getAllValues().get(1));
-  }
-
-  @Test
-  public void invalidNameFieldRefValueCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    String METRIC_NAME = "field_count";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            COUNT,
-            CLASS_NAME,
-            "f",
-            "()",
-            new ValueScript(DSL.ref("fooValue"), "fooValue"));
-
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertFalse(listener.counters.containsKey(METRIC_NAME));
-    verify(probeStatusSink).addError(eq(METRIC_ID), eq("Cannot resolve symbol fooValue"));
-  }
-
-  @Test
-  public void invalidTypeFieldRefValueCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    String METRIC_NAME = "field_count";
-    MetricForwarderListener listener =
-        installMethodMetric(
-            METRIC_NAME,
-            COUNT,
-            CLASS_NAME,
-            "f",
-            "()",
-            new ValueScript(DSL.ref("strValue"), "strValue"));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertFalse(listener.counters.containsKey(METRIC_NAME));
-    verify(probeStatusSink)
-        .addError(
-            eq(METRIC_ID),
-            eq("Incompatible type for expression: java.lang.String with expected types: [long]"));
-  }
-
-  @Test
-  public void metricThrows() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    ValueScript valueScript =
-        new ValueScript(DSL.getMember(DSL.ref("this"), "intValue"), "intValue");
-    MetricProbe countProbe =
-        createMethodMetric(
-            METRIC_ID1, "field_count", COUNT, CLASS_NAME, "f", "()", valueScript, null);
-    MetricProbe gaugeProbe =
-        createMethodMetric(
-            METRIC_ID2, "field_gauge", GAUGE, CLASS_NAME, "f", "()", valueScript, null);
-    MetricProbe histogramProbe =
-        createMethodMetric(
-            METRIC_ID3, "field_histo", HISTOGRAM, CLASS_NAME, "f", "()", valueScript, null);
-    MetricForwarderListener listener = installMetricProbes(countProbe, gaugeProbe, histogramProbe);
-    listener.setThrowing(true);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-  }
-
-  @Test
-  public void singleLineIncCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    String METRIC_NAME = "call_count";
-    int line = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID1);
-    MetricForwarderListener listener =
-        installMetricProbes(
-            createLineMetric(LINE_METRIC_ID1, METRIC_NAME, COUNT, CLASS_NAME, null, line));
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertTrue(listener.counters.containsKey(METRIC_NAME));
-    assertEquals(1, listener.counters.get(METRIC_NAME).longValue());
-  }
-
-  @Test
-  @Disabled("no more support of line range")
-  public void multiLineIncCountMetric() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    String METRIC_NAME = "call_count";
-    MetricForwarderListener listener =
-        installMetricProbes(
-            createMetricBuilder(METRIC_ID, METRIC_NAME, COUNT)
+
+    @Test
+    public void metricThrows() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        ValueScript valueScript = new ValueScript(DSL.getMember(DSL.ref("this"), "intValue"), "intValue");
+        MetricProbe countProbe =
+                createMethodMetric(METRIC_ID1, "field_count", COUNT, CLASS_NAME, "f", "()", valueScript, null);
+        MetricProbe gaugeProbe =
+                createMethodMetric(METRIC_ID2, "field_gauge", GAUGE, CLASS_NAME, "f", "()", valueScript, null);
+        MetricProbe histogramProbe =
+                createMethodMetric(METRIC_ID3, "field_histo", HISTOGRAM, CLASS_NAME, "f", "()", valueScript, null);
+        MetricForwarderListener listener = installMetricProbes(countProbe, gaugeProbe, histogramProbe);
+        listener.setThrowing(true);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+    }
+
+    @Test
+    public void singleLineIncCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        String METRIC_NAME = "call_count";
+        int line = getLineForLineProbe(CLASS_NAME, LINE_METRIC_ID1);
+        MetricForwarderListener listener =
+                installMetricProbes(createLineMetric(LINE_METRIC_ID1, METRIC_NAME, COUNT, CLASS_NAME, null, line));
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertTrue(listener.counters.containsKey(METRIC_NAME));
+        assertEquals(1, listener.counters.get(METRIC_NAME).longValue());
+    }
+
+    @Test
+    @Disabled("no more support of line range")
+    public void multiLineIncCountMetric() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        String METRIC_NAME = "call_count";
+        MetricForwarderListener listener = installMetricProbes(createMetricBuilder(METRIC_ID, METRIC_NAME, COUNT)
                 .where("main", "int (java.lang.String)", null, null, "4-8")
                 .build());
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertTrue(listener.counters.containsKey(METRIC_NAME));
-    assertEquals(2, listener.counters.get(METRIC_NAME).longValue());
-    result = Reflect.on(testClass).call("main", "2").get();
-    assertEquals(3, listener.counters.get(METRIC_NAME).longValue());
-  }
-
-  @Test
-  public void evaluateAtEntry() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    String METRIC_NAME = "field_count";
-    MetricProbe metricProbe =
-        createMetricBuilder(METRIC_ID, METRIC_NAME, COUNT)
-            .where(CLASS_NAME, "f", "()")
-            .valueScript(new ValueScript(DSL.ref("intValue"), "intValue"))
-            .evaluateAt(MethodLocation.ENTRY)
-            .build();
-    MetricForwarderListener listener = installMetricProbes(metricProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertTrue(listener.counters.containsKey(METRIC_NAME));
-    assertEquals(24, listener.counters.get(METRIC_NAME).longValue());
-  }
-
-  @Test
-  public void evaluateAtExit() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    String METRIC_NAME = "field_count";
-    MetricProbe metricProbe =
-        createMetricBuilder(METRIC_ID, METRIC_NAME, COUNT)
-            .where(CLASS_NAME, "f", "()")
-            .valueScript(new ValueScript(DSL.ref("intValue"), "intValue"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricForwarderListener listener = installMetricProbes(metricProbe);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertTrue(listener.counters.containsKey(METRIC_NAME));
-    assertEquals(48, listener.counters.get(METRIC_NAME).longValue());
-  }
-
-  @Test
-  public void lenExpression() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    final String STRLEN_METRIC = "strlen";
-    final ProbeId STRLEN_METRIC_ID = new ProbeId(STRLEN_METRIC, 1);
-    final String LISTSIZE_METRIC = "listsize";
-    final ProbeId LISTSIZE_METRIC_ID = new ProbeId(LISTSIZE_METRIC, 1);
-    final String MAPSIZE_METRIC = "mapsize";
-    final ProbeId MAPSIZE_METRIC_ID = new ProbeId(MAPSIZE_METRIC, 1);
-    MetricProbe metricProbe1 =
-        createMetricBuilder(STRLEN_METRIC_ID, STRLEN_METRIC, GAUGE)
-            .where(CLASS_NAME, "f", "()")
-            .valueScript(new ValueScript(DSL.len(DSL.ref("strValue")), "len(strValue)"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricProbe metricProbe2 =
-        createMetricBuilder(LISTSIZE_METRIC_ID, LISTSIZE_METRIC, GAUGE)
-            .where(CLASS_NAME, "f", "()")
-            .valueScript(new ValueScript(DSL.len(DSL.ref("strList")), "len(strList)"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricProbe metricProbe3 =
-        createMetricBuilder(MAPSIZE_METRIC_ID, MAPSIZE_METRIC, GAUGE)
-            .where(CLASS_NAME, "f", "()")
-            .valueScript(new ValueScript(DSL.len(DSL.ref("strMap")), "len(strMap)"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricForwarderListener listener =
-        installMetricProbes(metricProbe1, metricProbe2, metricProbe3);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertTrue(listener.gauges.containsKey(STRLEN_METRIC));
-    assertEquals(4, listener.gauges.get(STRLEN_METRIC).longValue()); // <=> "done".length()
-    assertTrue(listener.gauges.containsKey(LISTSIZE_METRIC));
-    assertEquals(3, listener.gauges.get(LISTSIZE_METRIC).longValue()); // <=> strList.size()
-    assertTrue(listener.gauges.containsKey(MAPSIZE_METRIC));
-    assertEquals(1, listener.gauges.get(MAPSIZE_METRIC).longValue()); // <=> strMap.size()
-  }
-
-  @Test
-  public void nullExpression() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot06";
-    String NULLLEN_METRIC = "nulllen";
-    String MAPNULL_METRIC = "mapnull";
-    String NULL_METRIC = "null";
-    MetricProbe metricProbe1 =
-        createMetricBuilder(METRIC_ID1, NULLLEN_METRIC, GAUGE)
-            .where(CLASS_NAME, "f", "()")
-            .valueScript(new ValueScript(DSL.len(DSL.nullValue()), "len(null)"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricProbe metricProbe2 =
-        createMetricBuilder(METRIC_ID2, MAPNULL_METRIC, GAUGE)
-            .where(CLASS_NAME, "f", "()")
-            .valueScript(
-                new ValueScript(DSL.index(DSL.ref("strMap"), DSL.nullValue()), "strMap[null]"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricProbe metricProbe3 =
-        createMetricBuilder(METRIC_ID3, NULL_METRIC, GAUGE)
-            .where(CLASS_NAME, "f", "()")
-            .valueScript(new ValueScript(DSL.nullValue(), "null"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricForwarderListener listener =
-        installMetricProbes(metricProbe1, metricProbe2, metricProbe3);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertEquals(0, listener.gauges.size());
-    ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
-    verify(probeStatusSink, times(3)).addError(any(), strCaptor.capture());
-    assertEquals(
-        "Unsupported type for len operation: java.lang.Object", strCaptor.getAllValues().get(0));
-    assertEquals(
-        "Incompatible type for expression: java.lang.String with expected types: [long,double]",
-        strCaptor.getAllValues().get(1));
-    assertEquals(
-        "Incompatible type for expression: java.lang.Object with expected types: [long,double]",
-        strCaptor.getAllValues().get(2));
-  }
-
-  @Test
-  public void indexExpression() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot22";
-    final String ARRAYIDX_METRIC = "arrayindex";
-    final ProbeId ARRAYIDX_METRIC_ID = new ProbeId(ARRAYIDX_METRIC, 1);
-    final String LISTIDX_METRIC = "listindex";
-    final ProbeId LISTIDX_METRIC_ID = new ProbeId(LISTIDX_METRIC, 1);
-    final String MAPIDX_METRIC = "mapindex";
-    final ProbeId MAPIDX_METRIC_ID = new ProbeId(MAPIDX_METRIC, 1);
-    MetricProbe metricProbe1 =
-        createMetricBuilder(ARRAYIDX_METRIC_ID, ARRAYIDX_METRIC, GAUGE)
-            .where(CLASS_NAME, "doit", "(String)")
-            .valueScript(
-                new ValueScript(DSL.index(DSL.ref("intArray"), DSL.value(4)), "intArray[4]"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricProbe metricProbe2 =
-        createMetricBuilder(LISTIDX_METRIC_ID, LISTIDX_METRIC, GAUGE)
-            .where(CLASS_NAME, "doit", "(String)")
-            .valueScript(
-                new ValueScript(
-                    DSL.len(DSL.index(DSL.ref("strList"), DSL.value(1))), "len(strList[1])"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricProbe metricProbe3 =
-        createMetricBuilder(MAPIDX_METRIC_ID, MAPIDX_METRIC, GAUGE)
-            .where(CLASS_NAME, "doit", "(String)")
-            .valueScript(
-                new ValueScript(
-                    DSL.len(DSL.index(DSL.ref("strMap"), DSL.value("foo1"))),
-                    "len(strMap['foo1'])"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricForwarderListener listener =
-        installMetricProbes(metricProbe1, metricProbe2, metricProbe3);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertTrue(listener.gauges.containsKey(ARRAYIDX_METRIC));
-    assertEquals(4, listener.gauges.get(ARRAYIDX_METRIC).longValue());
-    assertTrue(listener.gauges.containsKey(LISTIDX_METRIC));
-    assertEquals(3, listener.gauges.get(LISTIDX_METRIC).longValue());
-    assertTrue(listener.gauges.containsKey(MAPIDX_METRIC));
-    assertEquals(4, listener.gauges.get(MAPIDX_METRIC).longValue());
-  }
-
-  @Test
-  public void indexInvalidKeyTypeExpression() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot22";
-    final String ARRAYSTRIDX_METRIC = "arrayStrIndex";
-    final ProbeId ARRAYSTRIDX_METRIC_ID = new ProbeId(ARRAYSTRIDX_METRIC, 1);
-    final String ARRAYOOBIDX_METRIC = "arrayOutOfBoundsIndex";
-    final ProbeId ARRAYOOBIDX_METRIC_ID = new ProbeId(ARRAYOOBIDX_METRIC, 1);
-    MetricProbe metricProbe1 =
-        createMetricBuilder(ARRAYSTRIDX_METRIC_ID, ARRAYSTRIDX_METRIC, GAUGE)
-            .where(CLASS_NAME, "doit", "(String)")
-            .valueScript(
-                new ValueScript(
-                    DSL.index(DSL.ref("intArray"), DSL.value("foo")), "intArray['foo']"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricProbe metricProbe2 =
-        createMetricBuilder(ARRAYOOBIDX_METRIC_ID, ARRAYOOBIDX_METRIC, GAUGE)
-            .where(CLASS_NAME, "doit", "(String)")
-            // generates ArrayOutOfBoundsException
-            .valueScript(
-                new ValueScript(DSL.index(DSL.ref("intArray"), DSL.value(42)), "intArray[42]"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricForwarderListener listener = installMetricProbes(metricProbe1, metricProbe2);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(42, result);
-    assertFalse(listener.gauges.containsKey(ARRAYSTRIDX_METRIC));
-    assertFalse(listener.gauges.containsKey(ARRAYOOBIDX_METRIC));
-    verify(probeStatusSink)
-        .addError(
-            eq(ARRAYSTRIDX_METRIC_ID),
-            eq(
-                "Incompatible type for key: Type{mainType=Ljava/lang/String;, genericTypes=[]}, expected int or long"));
-  }
-
-  @Test
-  public void privateFieldValue() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot04";
-    final String STRVALUE_METRIC = "strvalue_count";
-    final String LONGVALUE_METRIC = "longvalue_count";
-    final String INTVALUE_METRIC = "intvalue_count";
-    MetricProbe metricProbe1 =
-        createMetricBuilder(METRIC_ID1, STRVALUE_METRIC, GAUGE)
-            .where(CLASS_NAME, 24)
-            .valueScript(
-                new ValueScript(
-                    DSL.len(DSL.getMember(DSL.ref("sdata"), "strValue")), "len(sdata.strValue)"))
-            .build();
-    MetricProbe metricProbe2 =
-        createMetricBuilder(METRIC_ID2, LONGVALUE_METRIC, GAUGE)
-            .where(CLASS_NAME, 24)
-            .valueScript(
-                new ValueScript(
-                    DSL.getMember(DSL.getMember(DSL.ref("cdata"), "s2"), "longValue"),
-                    "cdata.s2.longValue"))
-            .build();
-    MetricProbe metricProbe3 =
-        createMetricBuilder(METRIC_ID3, INTVALUE_METRIC, GAUGE)
-            .where(CLASS_NAME, 24)
-            .valueScript(
-                new ValueScript(
-                    DSL.getMember(DSL.getMember(DSL.ref("cdata"), "s2"), "intValue"),
-                    "cdata.s2.intValue"))
-            .build();
-    MetricForwarderListener listener =
-        installMetricProbes(metricProbe1, metricProbe2, metricProbe3);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "f").get();
-    assertEquals(143, result);
-    assertEquals(3, listener.gauges.get(STRVALUE_METRIC));
-    assertEquals(1042, listener.gauges.get(LONGVALUE_METRIC));
-    assertEquals(202, listener.gauges.get(INTVALUE_METRIC));
-  }
-
-  @Test
-  public void primitivesFunction() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot25";
-    final String METRIC_NAME_INT = "int_arg_count";
-    final ProbeId METRIC_INT_ID = new ProbeId(METRIC_NAME_INT, 1);
-    final String METRIC_NAME_LONG = "long_arg_count";
-    final ProbeId METRIC_LONG_ID = new ProbeId(METRIC_NAME_LONG, 1);
-    final String METRIC_NAME_FLOAT = "float_arg_count";
-    final ProbeId METRIC_FLOAT_ID = new ProbeId(METRIC_NAME_FLOAT, 1);
-    final String METRIC_NAME_DOUBLE = "double_arg_count";
-    final ProbeId METRIC_DOUBLE_ID = new ProbeId(METRIC_NAME_DOUBLE, 1);
-    final String METRIC_NAME_BOOLEAN = "boolean_arg_count";
-    final ProbeId METRIC_BOOLEAN_ID = new ProbeId(METRIC_NAME_BOOLEAN, 1);
-    final String METRIC_NAME_BYTE = "byte_arg_count";
-    final ProbeId METRIC_BYTE_ID = new ProbeId(METRIC_NAME_BYTE, 1);
-    final String METRIC_NAME_SHORT = "short_arg_count";
-    final ProbeId METRIC_SHORT_ID = new ProbeId(METRIC_NAME_SHORT, 1);
-    final String METRIC_NAME_CHAR = "char_arg_count";
-    final ProbeId METRIC_CHAR_ID = new ProbeId(METRIC_NAME_CHAR, 1);
-    MetricProbe metricProbeInt =
-        createMetricBuilder(METRIC_INT_ID, METRIC_NAME_INT, COUNT)
-            .where(CLASS_NAME, "intFunction")
-            .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricProbe metricProbeLong =
-        createMetricBuilder(METRIC_LONG_ID, METRIC_NAME_LONG, COUNT)
-            .where(CLASS_NAME, "longFunction")
-            .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricProbe metricProbeFloat =
-        createMetricBuilder(METRIC_FLOAT_ID, METRIC_NAME_FLOAT, GAUGE)
-            .where(CLASS_NAME, "floatFunction")
-            .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricProbe metricProbeDouble =
-        createMetricBuilder(METRIC_DOUBLE_ID, METRIC_NAME_DOUBLE, GAUGE)
-            .where(CLASS_NAME, "doubleFunction")
-            .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricProbe metricProbeBoolean =
-        createMetricBuilder(METRIC_BOOLEAN_ID, METRIC_NAME_BOOLEAN, COUNT)
-            .where(CLASS_NAME, "booleanFunction")
-            .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricProbe metricProbeByte =
-        createMetricBuilder(METRIC_BYTE_ID, METRIC_NAME_BYTE, COUNT)
-            .where(CLASS_NAME, "byteFunction")
-            .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricProbe metricProbeShort =
-        createMetricBuilder(METRIC_SHORT_ID, METRIC_NAME_SHORT, COUNT)
-            .where(CLASS_NAME, "shortFunction")
-            .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    MetricProbe metricProbeChar =
-        createMetricBuilder(METRIC_CHAR_ID, METRIC_NAME_CHAR, COUNT)
-            .where(CLASS_NAME, "charFunction")
-            .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-
-    MetricForwarderListener listener =
-        installMetricProbes(
-            metricProbeInt,
-            metricProbeLong,
-            metricProbeFloat,
-            metricProbeDouble,
-            metricProbeBoolean,
-            metricProbeByte,
-            metricProbeShort,
-            metricProbeChar);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "int").get();
-    assertEquals(42, result);
-    assertEquals(42, listener.counters.get(METRIC_NAME_INT));
-    result = Reflect.on(testClass).call("main", "long").get();
-    assertEquals(42, result);
-    assertEquals(1001, listener.counters.get(METRIC_NAME_LONG));
-    result = Reflect.on(testClass).call("main", "float").get();
-    assertEquals(42, result);
-    assertEquals(3.14, listener.doubleGauges.get(METRIC_NAME_FLOAT), 0.001);
-    result = Reflect.on(testClass).call("main", "double").get();
-    assertEquals(42, result);
-    assertEquals(Math.E, listener.doubleGauges.get(METRIC_NAME_DOUBLE), 0.001);
-    result = Reflect.on(testClass).call("main", "boolean").get();
-    assertEquals(42, result);
-    assertEquals(1, listener.counters.get(METRIC_NAME_BOOLEAN));
-    result = Reflect.on(testClass).call("main", "byte").get();
-    assertEquals(42, result);
-    assertEquals(0x42, listener.counters.get(METRIC_NAME_BYTE));
-    result = Reflect.on(testClass).call("main", "short").get();
-    assertEquals(42, result);
-    assertEquals(1001, listener.counters.get(METRIC_NAME_SHORT));
-    result = Reflect.on(testClass).call("main", "char").get();
-    assertEquals(42, result);
-    assertEquals(97, listener.counters.get(METRIC_NAME_CHAR));
-  }
-
-  @Test
-  public void localVarNotInScope() throws IOException, URISyntaxException {
-    final String METRIC_NAME = "lenstr";
-    final String CLASS_NAME = "com.datadog.debugger.jaxrs.MyResource";
-    // compile the JAX-RS resource fixture and weave it with the real tracer JAX-RS
-    // instrumentation, so this test exercises the same bytecode shape the tracer produces
-    ClassFileTransformer jaxRsTransformer = installTracerInstrumentation(instr);
-    Class<?> testClass;
-    try {
-      MetricProbe metricProbe =
-          createMetricBuilder(METRIC_ID, METRIC_NAME, GAUGE)
-              .where(CLASS_NAME, "createResource", null)
-              .valueScript(new ValueScript(DSL.len(DSL.ref("varStr")), "len(varStr)"))
-              .build();
-      MetricForwarderListener listener = installMetricProbes(metricProbe);
-      testClass = compileAndLoadClass(CLASS_NAME);
-      Object result =
-          Reflect.onClass(testClass)
-              .create()
-              .call("createResource", (Object) null, (Object) null, 1)
-              .get();
-      assertNotNull(result);
-      assertFalse(listener.gauges.containsKey(METRIC_NAME));
-    } finally {
-      instr.removeTransformer(jaxRsTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertTrue(listener.counters.containsKey(METRIC_NAME));
+        assertEquals(2, listener.counters.get(METRIC_NAME).longValue());
+        result = Reflect.on(testClass).call("main", "2").get();
+        assertEquals(3, listener.counters.get(METRIC_NAME).longValue());
     }
-  }
-
-  private MetricForwarderListener installMethodMetric(
-      String metricName,
-      MetricProbe.MetricKind metricKind,
-      String typeName,
-      String methodName,
-      String signature,
-      ValueScript valueScript) {
-    MetricProbe metricProbe =
-        createMethodMetric(
-            METRIC_ID, metricName, metricKind, typeName, methodName, signature, valueScript, null);
-    return installMetricProbes(metricProbe);
-  }
-
-  private MetricForwarderListener installMethodMetric(
-      String metricName,
-      MetricProbe.MetricKind metricKind,
-      String typeName,
-      String methodName,
-      String signature,
-      ValueScript valueScript,
-      String[] tags) {
-    MetricProbe metricProbe =
-        createMethodMetric(
-            METRIC_ID, metricName, metricKind, typeName, methodName, signature, valueScript, tags);
-    return installMetricProbes(metricProbe);
-  }
-
-  private static MetricProbe createMethodMetric(
-      ProbeId id,
-      String metricName,
-      MetricProbe.MetricKind metricKind,
-      String typeName,
-      String methodName,
-      String signature,
-      ValueScript valueScript,
-      String[] tags) {
-    return createMetricBuilder(id, metricName, metricKind)
-        .where(typeName, methodName, signature)
-        .valueScript(valueScript)
-        .tags(tags)
-        .build();
-  }
-
-  private static MetricProbe createLineMetric(
-      ProbeId id,
-      String metricName,
-      MetricProbe.MetricKind metricKind,
-      String sourceFile,
-      ValueScript valueScript,
-      int line) {
-    return createMetricBuilder(id, metricName, metricKind)
-        .where(sourceFile, line)
-        .valueScript(valueScript)
-        .build();
-  }
-
-  private static MetricProbe.Builder createMetricBuilder(
-      ProbeId id, String metricName, MetricProbe.MetricKind metricKind) {
-    return MetricProbe.builder()
-        .language(LANGUAGE)
-        .probeId(id)
-        .metricName(metricName)
-        .kind(metricKind);
-  }
-
-  private MetricForwarderListener installMetricProbes(Configuration configuration) {
-    Config config = mock(Config.class);
-    when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
-    when(config.isDynamicInstrumentationClassFileDumpEnabled()).thenReturn(true);
-    when(config.isDynamicInstrumentationVerifyByteCode()).thenReturn(true);
-    when(config.getFinalDebuggerSnapshotUrl())
-        .thenReturn("http://localhost:8126/debugger/v1/input");
-    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
-    probeStatusSink = mock(ProbeStatusSink.class);
-    currentTransformer =
-        new DebuggerTransformer(
-            config,
-            configuration,
-            null,
-            new ProbeMetadata(),
-            new DebuggerSink(config, probeStatusSink));
-    instr.addTransformer(currentTransformer);
-    MetricForwarderListener listener = new MetricForwarderListener();
-    DebuggerContext.initMetricForwarder(listener);
-    DebuggerContext.initClassFilter(new DenyListHelper(null));
-    return listener;
-  }
-
-  private MetricForwarderListener installMetricProbes(MetricProbe... metricProbes) {
-    return installMetricProbes(
-        Configuration.builder().setService(SERVICE_NAME).add(metricProbes).build());
-  }
-
-  static class MetricForwarderListener implements DebuggerContext.MetricForwarder {
-    Map<String, Long> counters = new HashMap<>();
-    Map<String, Long> gauges = new HashMap<>();
-    Map<String, Double> doubleGauges = new HashMap<>();
-    Map<String, Long> histograms = new HashMap<>();
-    Map<String, Double> doubleHistograms = new HashMap<>();
-    Map<String, Long> distributions = new HashMap<>();
-    Map<String, Double> doubleDistributions = new HashMap<>();
-    String[] lastTags = null;
-    boolean throwing;
-
-    @Override
-    public void count(String encodedProbeId, String name, long delta, String[] tags) {
-      if (throwing) {
-        throw new IllegalArgumentException("oops");
-      }
-      counters.compute(name, (key, value) -> value != null ? value + delta : delta);
-      lastTags = tags;
+
+    @Test
+    public void evaluateAtEntry() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        String METRIC_NAME = "field_count";
+        MetricProbe metricProbe = createMetricBuilder(METRIC_ID, METRIC_NAME, COUNT)
+                .where(CLASS_NAME, "f", "()")
+                .valueScript(new ValueScript(DSL.ref("intValue"), "intValue"))
+                .evaluateAt(MethodLocation.ENTRY)
+                .build();
+        MetricForwarderListener listener = installMetricProbes(metricProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertTrue(listener.counters.containsKey(METRIC_NAME));
+        assertEquals(24, listener.counters.get(METRIC_NAME).longValue());
     }
 
-    @Override
-    public void gauge(String encodedProbeId, String name, long value, String[] tags) {
-      if (throwing) {
-        throw new IllegalArgumentException("oops");
-      }
-      gauges.put(name, value);
-      lastTags = tags;
+    @Test
+    public void evaluateAtExit() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        String METRIC_NAME = "field_count";
+        MetricProbe metricProbe = createMetricBuilder(METRIC_ID, METRIC_NAME, COUNT)
+                .where(CLASS_NAME, "f", "()")
+                .valueScript(new ValueScript(DSL.ref("intValue"), "intValue"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricForwarderListener listener = installMetricProbes(metricProbe);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertTrue(listener.counters.containsKey(METRIC_NAME));
+        assertEquals(48, listener.counters.get(METRIC_NAME).longValue());
     }
 
-    @Override
-    public void gauge(String encodedProbeId, String name, double value, String[] tags) {
-      if (throwing) {
-        throw new IllegalArgumentException("oops");
-      }
-      doubleGauges.put(name, value);
-      lastTags = tags;
+    @Test
+    public void lenExpression() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        final String STRLEN_METRIC = "strlen";
+        final ProbeId STRLEN_METRIC_ID = new ProbeId(STRLEN_METRIC, 1);
+        final String LISTSIZE_METRIC = "listsize";
+        final ProbeId LISTSIZE_METRIC_ID = new ProbeId(LISTSIZE_METRIC, 1);
+        final String MAPSIZE_METRIC = "mapsize";
+        final ProbeId MAPSIZE_METRIC_ID = new ProbeId(MAPSIZE_METRIC, 1);
+        MetricProbe metricProbe1 = createMetricBuilder(STRLEN_METRIC_ID, STRLEN_METRIC, GAUGE)
+                .where(CLASS_NAME, "f", "()")
+                .valueScript(new ValueScript(DSL.len(DSL.ref("strValue")), "len(strValue)"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricProbe metricProbe2 = createMetricBuilder(LISTSIZE_METRIC_ID, LISTSIZE_METRIC, GAUGE)
+                .where(CLASS_NAME, "f", "()")
+                .valueScript(new ValueScript(DSL.len(DSL.ref("strList")), "len(strList)"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricProbe metricProbe3 = createMetricBuilder(MAPSIZE_METRIC_ID, MAPSIZE_METRIC, GAUGE)
+                .where(CLASS_NAME, "f", "()")
+                .valueScript(new ValueScript(DSL.len(DSL.ref("strMap")), "len(strMap)"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricForwarderListener listener = installMetricProbes(metricProbe1, metricProbe2, metricProbe3);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertTrue(listener.gauges.containsKey(STRLEN_METRIC));
+        assertEquals(4, listener.gauges.get(STRLEN_METRIC).longValue()); // <=> "done".length()
+        assertTrue(listener.gauges.containsKey(LISTSIZE_METRIC));
+        assertEquals(3, listener.gauges.get(LISTSIZE_METRIC).longValue()); // <=> strList.size()
+        assertTrue(listener.gauges.containsKey(MAPSIZE_METRIC));
+        assertEquals(1, listener.gauges.get(MAPSIZE_METRIC).longValue()); // <=> strMap.size()
     }
 
-    @Override
-    public void histogram(String encodedProbeId, String name, long value, String[] tags) {
-      if (throwing) {
-        throw new IllegalArgumentException("oops");
-      }
-      histograms.put(name, value);
-      lastTags = tags;
+    @Test
+    public void nullExpression() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot06";
+        String NULLLEN_METRIC = "nulllen";
+        String MAPNULL_METRIC = "mapnull";
+        String NULL_METRIC = "null";
+        MetricProbe metricProbe1 = createMetricBuilder(METRIC_ID1, NULLLEN_METRIC, GAUGE)
+                .where(CLASS_NAME, "f", "()")
+                .valueScript(new ValueScript(DSL.len(DSL.nullValue()), "len(null)"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricProbe metricProbe2 = createMetricBuilder(METRIC_ID2, MAPNULL_METRIC, GAUGE)
+                .where(CLASS_NAME, "f", "()")
+                .valueScript(new ValueScript(DSL.index(DSL.ref("strMap"), DSL.nullValue()), "strMap[null]"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricProbe metricProbe3 = createMetricBuilder(METRIC_ID3, NULL_METRIC, GAUGE)
+                .where(CLASS_NAME, "f", "()")
+                .valueScript(new ValueScript(DSL.nullValue(), "null"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricForwarderListener listener = installMetricProbes(metricProbe1, metricProbe2, metricProbe3);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertEquals(0, listener.gauges.size());
+        ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
+        verify(probeStatusSink, times(3)).addError(any(), strCaptor.capture());
+        assertEquals(
+                "Unsupported type for len operation: java.lang.Object",
+                strCaptor.getAllValues().get(0));
+        assertEquals(
+                "Incompatible type for expression: java.lang.String with expected types: [long,double]",
+                strCaptor.getAllValues().get(1));
+        assertEquals(
+                "Incompatible type for expression: java.lang.Object with expected types: [long,double]",
+                strCaptor.getAllValues().get(2));
     }
 
-    @Override
-    public void histogram(String encodedProbeId, String name, double value, String[] tags) {
-      if (throwing) {
-        throw new IllegalArgumentException("oops");
-      }
-      doubleHistograms.put(name, value);
-      lastTags = tags;
+    @Test
+    public void indexExpression() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot22";
+        final String ARRAYIDX_METRIC = "arrayindex";
+        final ProbeId ARRAYIDX_METRIC_ID = new ProbeId(ARRAYIDX_METRIC, 1);
+        final String LISTIDX_METRIC = "listindex";
+        final ProbeId LISTIDX_METRIC_ID = new ProbeId(LISTIDX_METRIC, 1);
+        final String MAPIDX_METRIC = "mapindex";
+        final ProbeId MAPIDX_METRIC_ID = new ProbeId(MAPIDX_METRIC, 1);
+        MetricProbe metricProbe1 = createMetricBuilder(ARRAYIDX_METRIC_ID, ARRAYIDX_METRIC, GAUGE)
+                .where(CLASS_NAME, "doit", "(String)")
+                .valueScript(new ValueScript(DSL.index(DSL.ref("intArray"), DSL.value(4)), "intArray[4]"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricProbe metricProbe2 = createMetricBuilder(LISTIDX_METRIC_ID, LISTIDX_METRIC, GAUGE)
+                .where(CLASS_NAME, "doit", "(String)")
+                .valueScript(new ValueScript(DSL.len(DSL.index(DSL.ref("strList"), DSL.value(1))), "len(strList[1])"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricProbe metricProbe3 = createMetricBuilder(MAPIDX_METRIC_ID, MAPIDX_METRIC, GAUGE)
+                .where(CLASS_NAME, "doit", "(String)")
+                .valueScript(new ValueScript(
+                        DSL.len(DSL.index(DSL.ref("strMap"), DSL.value("foo1"))), "len(strMap['foo1'])"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricForwarderListener listener = installMetricProbes(metricProbe1, metricProbe2, metricProbe3);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertTrue(listener.gauges.containsKey(ARRAYIDX_METRIC));
+        assertEquals(4, listener.gauges.get(ARRAYIDX_METRIC).longValue());
+        assertTrue(listener.gauges.containsKey(LISTIDX_METRIC));
+        assertEquals(3, listener.gauges.get(LISTIDX_METRIC).longValue());
+        assertTrue(listener.gauges.containsKey(MAPIDX_METRIC));
+        assertEquals(4, listener.gauges.get(MAPIDX_METRIC).longValue());
     }
 
-    @Override
-    public void distribution(String encodedProbeId, String name, long value, String[] tags) {
-      if (throwing) {
-        throw new IllegalArgumentException("oops");
-      }
-      distributions.put(name, value);
-      lastTags = tags;
+    @Test
+    public void indexInvalidKeyTypeExpression() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot22";
+        final String ARRAYSTRIDX_METRIC = "arrayStrIndex";
+        final ProbeId ARRAYSTRIDX_METRIC_ID = new ProbeId(ARRAYSTRIDX_METRIC, 1);
+        final String ARRAYOOBIDX_METRIC = "arrayOutOfBoundsIndex";
+        final ProbeId ARRAYOOBIDX_METRIC_ID = new ProbeId(ARRAYOOBIDX_METRIC, 1);
+        MetricProbe metricProbe1 = createMetricBuilder(ARRAYSTRIDX_METRIC_ID, ARRAYSTRIDX_METRIC, GAUGE)
+                .where(CLASS_NAME, "doit", "(String)")
+                .valueScript(new ValueScript(DSL.index(DSL.ref("intArray"), DSL.value("foo")), "intArray['foo']"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricProbe metricProbe2 = createMetricBuilder(ARRAYOOBIDX_METRIC_ID, ARRAYOOBIDX_METRIC, GAUGE)
+                .where(CLASS_NAME, "doit", "(String)")
+                // generates ArrayOutOfBoundsException
+                .valueScript(new ValueScript(DSL.index(DSL.ref("intArray"), DSL.value(42)), "intArray[42]"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricForwarderListener listener = installMetricProbes(metricProbe1, metricProbe2);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(42, result);
+        assertFalse(listener.gauges.containsKey(ARRAYSTRIDX_METRIC));
+        assertFalse(listener.gauges.containsKey(ARRAYOOBIDX_METRIC));
+        verify(probeStatusSink)
+                .addError(
+                        eq(ARRAYSTRIDX_METRIC_ID),
+                        eq(
+                                "Incompatible type for key: Type{mainType=Ljava/lang/String;, genericTypes=[]}, expected int or long"));
     }
 
-    @Override
-    public void distribution(String encodedProbeId, String name, double value, String[] tags) {
-      if (throwing) {
-        throw new IllegalArgumentException("oops");
-      }
-      doubleDistributions.put(name, value);
-      lastTags = tags;
+    @Test
+    public void privateFieldValue() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot04";
+        final String STRVALUE_METRIC = "strvalue_count";
+        final String LONGVALUE_METRIC = "longvalue_count";
+        final String INTVALUE_METRIC = "intvalue_count";
+        MetricProbe metricProbe1 = createMetricBuilder(METRIC_ID1, STRVALUE_METRIC, GAUGE)
+                .where(CLASS_NAME, 24)
+                .valueScript(
+                        new ValueScript(DSL.len(DSL.getMember(DSL.ref("sdata"), "strValue")), "len(sdata.strValue)"))
+                .build();
+        MetricProbe metricProbe2 = createMetricBuilder(METRIC_ID2, LONGVALUE_METRIC, GAUGE)
+                .where(CLASS_NAME, 24)
+                .valueScript(new ValueScript(
+                        DSL.getMember(DSL.getMember(DSL.ref("cdata"), "s2"), "longValue"), "cdata.s2.longValue"))
+                .build();
+        MetricProbe metricProbe3 = createMetricBuilder(METRIC_ID3, INTVALUE_METRIC, GAUGE)
+                .where(CLASS_NAME, 24)
+                .valueScript(new ValueScript(
+                        DSL.getMember(DSL.getMember(DSL.ref("cdata"), "s2"), "intValue"), "cdata.s2.intValue"))
+                .build();
+        MetricForwarderListener listener = installMetricProbes(metricProbe1, metricProbe2, metricProbe3);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "f").get();
+        assertEquals(143, result);
+        assertEquals(3, listener.gauges.get(STRVALUE_METRIC));
+        assertEquals(1042, listener.gauges.get(LONGVALUE_METRIC));
+        assertEquals(202, listener.gauges.get(INTVALUE_METRIC));
+    }
+
+    @Test
+    public void primitivesFunction() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot25";
+        final String METRIC_NAME_INT = "int_arg_count";
+        final ProbeId METRIC_INT_ID = new ProbeId(METRIC_NAME_INT, 1);
+        final String METRIC_NAME_LONG = "long_arg_count";
+        final ProbeId METRIC_LONG_ID = new ProbeId(METRIC_NAME_LONG, 1);
+        final String METRIC_NAME_FLOAT = "float_arg_count";
+        final ProbeId METRIC_FLOAT_ID = new ProbeId(METRIC_NAME_FLOAT, 1);
+        final String METRIC_NAME_DOUBLE = "double_arg_count";
+        final ProbeId METRIC_DOUBLE_ID = new ProbeId(METRIC_NAME_DOUBLE, 1);
+        final String METRIC_NAME_BOOLEAN = "boolean_arg_count";
+        final ProbeId METRIC_BOOLEAN_ID = new ProbeId(METRIC_NAME_BOOLEAN, 1);
+        final String METRIC_NAME_BYTE = "byte_arg_count";
+        final ProbeId METRIC_BYTE_ID = new ProbeId(METRIC_NAME_BYTE, 1);
+        final String METRIC_NAME_SHORT = "short_arg_count";
+        final ProbeId METRIC_SHORT_ID = new ProbeId(METRIC_NAME_SHORT, 1);
+        final String METRIC_NAME_CHAR = "char_arg_count";
+        final ProbeId METRIC_CHAR_ID = new ProbeId(METRIC_NAME_CHAR, 1);
+        MetricProbe metricProbeInt = createMetricBuilder(METRIC_INT_ID, METRIC_NAME_INT, COUNT)
+                .where(CLASS_NAME, "intFunction")
+                .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricProbe metricProbeLong = createMetricBuilder(METRIC_LONG_ID, METRIC_NAME_LONG, COUNT)
+                .where(CLASS_NAME, "longFunction")
+                .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricProbe metricProbeFloat = createMetricBuilder(METRIC_FLOAT_ID, METRIC_NAME_FLOAT, GAUGE)
+                .where(CLASS_NAME, "floatFunction")
+                .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricProbe metricProbeDouble = createMetricBuilder(METRIC_DOUBLE_ID, METRIC_NAME_DOUBLE, GAUGE)
+                .where(CLASS_NAME, "doubleFunction")
+                .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricProbe metricProbeBoolean = createMetricBuilder(METRIC_BOOLEAN_ID, METRIC_NAME_BOOLEAN, COUNT)
+                .where(CLASS_NAME, "booleanFunction")
+                .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricProbe metricProbeByte = createMetricBuilder(METRIC_BYTE_ID, METRIC_NAME_BYTE, COUNT)
+                .where(CLASS_NAME, "byteFunction")
+                .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricProbe metricProbeShort = createMetricBuilder(METRIC_SHORT_ID, METRIC_NAME_SHORT, COUNT)
+                .where(CLASS_NAME, "shortFunction")
+                .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        MetricProbe metricProbeChar = createMetricBuilder(METRIC_CHAR_ID, METRIC_NAME_CHAR, COUNT)
+                .where(CLASS_NAME, "charFunction")
+                .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+
+        MetricForwarderListener listener = installMetricProbes(
+                metricProbeInt,
+                metricProbeLong,
+                metricProbeFloat,
+                metricProbeDouble,
+                metricProbeBoolean,
+                metricProbeByte,
+                metricProbeShort,
+                metricProbeChar);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "int").get();
+        assertEquals(42, result);
+        assertEquals(42, listener.counters.get(METRIC_NAME_INT));
+        result = Reflect.on(testClass).call("main", "long").get();
+        assertEquals(42, result);
+        assertEquals(1001, listener.counters.get(METRIC_NAME_LONG));
+        result = Reflect.on(testClass).call("main", "float").get();
+        assertEquals(42, result);
+        assertEquals(3.14, listener.doubleGauges.get(METRIC_NAME_FLOAT), 0.001);
+        result = Reflect.on(testClass).call("main", "double").get();
+        assertEquals(42, result);
+        assertEquals(Math.E, listener.doubleGauges.get(METRIC_NAME_DOUBLE), 0.001);
+        result = Reflect.on(testClass).call("main", "boolean").get();
+        assertEquals(42, result);
+        assertEquals(1, listener.counters.get(METRIC_NAME_BOOLEAN));
+        result = Reflect.on(testClass).call("main", "byte").get();
+        assertEquals(42, result);
+        assertEquals(0x42, listener.counters.get(METRIC_NAME_BYTE));
+        result = Reflect.on(testClass).call("main", "short").get();
+        assertEquals(42, result);
+        assertEquals(1001, listener.counters.get(METRIC_NAME_SHORT));
+        result = Reflect.on(testClass).call("main", "char").get();
+        assertEquals(42, result);
+        assertEquals(97, listener.counters.get(METRIC_NAME_CHAR));
+    }
+
+    @Test
+    public void localVarNotInScope() throws IOException, URISyntaxException {
+        final String METRIC_NAME = "lenstr";
+        final String CLASS_NAME = "com.datadog.debugger.jaxrs.MyResource";
+        // compile the JAX-RS resource fixture and weave it with the real tracer JAX-RS
+        // instrumentation, so this test exercises the same bytecode shape the tracer produces
+        ClassFileTransformer jaxRsTransformer = installTracerInstrumentation(instr);
+        Class<?> testClass;
+        try {
+            MetricProbe metricProbe = createMetricBuilder(METRIC_ID, METRIC_NAME, GAUGE)
+                    .where(CLASS_NAME, "createResource", null)
+                    .valueScript(new ValueScript(DSL.len(DSL.ref("varStr")), "len(varStr)"))
+                    .build();
+            MetricForwarderListener listener = installMetricProbes(metricProbe);
+            testClass = compileAndLoadClass(CLASS_NAME);
+            Object result = Reflect.onClass(testClass)
+                    .create()
+                    .call("createResource", (Object) null, (Object) null, 1)
+                    .get();
+            assertNotNull(result);
+            assertFalse(listener.gauges.containsKey(METRIC_NAME));
+        } finally {
+            instr.removeTransformer(jaxRsTransformer);
+        }
+    }
+
+    private MetricForwarderListener installMethodMetric(
+            String metricName,
+            MetricProbe.MetricKind metricKind,
+            String typeName,
+            String methodName,
+            String signature,
+            ValueScript valueScript) {
+        MetricProbe metricProbe = createMethodMetric(
+                METRIC_ID, metricName, metricKind, typeName, methodName, signature, valueScript, null);
+        return installMetricProbes(metricProbe);
+    }
+
+    private MetricForwarderListener installMethodMetric(
+            String metricName,
+            MetricProbe.MetricKind metricKind,
+            String typeName,
+            String methodName,
+            String signature,
+            ValueScript valueScript,
+            String[] tags) {
+        MetricProbe metricProbe = createMethodMetric(
+                METRIC_ID, metricName, metricKind, typeName, methodName, signature, valueScript, tags);
+        return installMetricProbes(metricProbe);
+    }
+
+    private static MetricProbe createMethodMetric(
+            ProbeId id,
+            String metricName,
+            MetricProbe.MetricKind metricKind,
+            String typeName,
+            String methodName,
+            String signature,
+            ValueScript valueScript,
+            String[] tags) {
+        return createMetricBuilder(id, metricName, metricKind)
+                .where(typeName, methodName, signature)
+                .valueScript(valueScript)
+                .tags(tags)
+                .build();
+    }
+
+    private static MetricProbe createLineMetric(
+            ProbeId id,
+            String metricName,
+            MetricProbe.MetricKind metricKind,
+            String sourceFile,
+            ValueScript valueScript,
+            int line) {
+        return createMetricBuilder(id, metricName, metricKind)
+                .where(sourceFile, line)
+                .valueScript(valueScript)
+                .build();
+    }
+
+    private static MetricProbe.Builder createMetricBuilder(
+            ProbeId id, String metricName, MetricProbe.MetricKind metricKind) {
+        return MetricProbe.builder()
+                .language(LANGUAGE)
+                .probeId(id)
+                .metricName(metricName)
+                .kind(metricKind);
+    }
+
+    private MetricForwarderListener installMetricProbes(Configuration configuration) {
+        Config config = mock(Config.class);
+        when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
+        when(config.isDynamicInstrumentationClassFileDumpEnabled()).thenReturn(true);
+        when(config.isDynamicInstrumentationVerifyByteCode()).thenReturn(true);
+        when(config.getFinalDebuggerSnapshotUrl()).thenReturn("http://localhost:8126/debugger/v1/input");
+        when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+        probeStatusSink = mock(ProbeStatusSink.class);
+        currentTransformer = new DebuggerTransformer(
+                config, configuration, null, new ProbeMetadata(), new DebuggerSink(config, probeStatusSink));
+        instr.addTransformer(currentTransformer);
+        MetricForwarderListener listener = new MetricForwarderListener();
+        DebuggerContext.initMetricForwarder(listener);
+        DebuggerContext.initClassFilter(new DenyListHelper(null));
+        return listener;
+    }
+
+    private MetricForwarderListener installMetricProbes(MetricProbe... metricProbes) {
+        return installMetricProbes(Configuration.builder()
+                .setService(SERVICE_NAME)
+                .add(metricProbes)
+                .build());
     }
 
-    public void setThrowing(boolean value) {
-      this.throwing = value;
+    static class MetricForwarderListener implements DebuggerContext.MetricForwarder {
+        Map<String, Long> counters = new HashMap<>();
+        Map<String, Long> gauges = new HashMap<>();
+        Map<String, Double> doubleGauges = new HashMap<>();
+        Map<String, Long> histograms = new HashMap<>();
+        Map<String, Double> doubleHistograms = new HashMap<>();
+        Map<String, Long> distributions = new HashMap<>();
+        Map<String, Double> doubleDistributions = new HashMap<>();
+        String[] lastTags = null;
+        boolean throwing;
+
+        @Override
+        public void count(String encodedProbeId, String name, long delta, String[] tags) {
+            if (throwing) {
+                throw new IllegalArgumentException("oops");
+            }
+            counters.compute(name, (key, value) -> value != null ? value + delta : delta);
+            lastTags = tags;
+        }
+
+        @Override
+        public void gauge(String encodedProbeId, String name, long value, String[] tags) {
+            if (throwing) {
+                throw new IllegalArgumentException("oops");
+            }
+            gauges.put(name, value);
+            lastTags = tags;
+        }
+
+        @Override
+        public void gauge(String encodedProbeId, String name, double value, String[] tags) {
+            if (throwing) {
+                throw new IllegalArgumentException("oops");
+            }
+            doubleGauges.put(name, value);
+            lastTags = tags;
+        }
+
+        @Override
+        public void histogram(String encodedProbeId, String name, long value, String[] tags) {
+            if (throwing) {
+                throw new IllegalArgumentException("oops");
+            }
+            histograms.put(name, value);
+            lastTags = tags;
+        }
+
+        @Override
+        public void histogram(String encodedProbeId, String name, double value, String[] tags) {
+            if (throwing) {
+                throw new IllegalArgumentException("oops");
+            }
+            doubleHistograms.put(name, value);
+            lastTags = tags;
+        }
+
+        @Override
+        public void distribution(String encodedProbeId, String name, long value, String[] tags) {
+            if (throwing) {
+                throw new IllegalArgumentException("oops");
+            }
+            distributions.put(name, value);
+            lastTags = tags;
+        }
+
+        @Override
+        public void distribution(String encodedProbeId, String name, double value, String[] tags) {
+            if (throwing) {
+                throw new IllegalArgumentException("oops");
+            }
+            doubleDistributions.put(name, value);
+            lastTags = tags;
+        }
+
+        public void setThrowing(boolean value) {
+            this.throwing = value;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/MockSampler.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/MockSampler.java
index 0644d0ab2a0..4c07f85cbf4 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/MockSampler.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/MockSampler.java
@@ -3,35 +3,35 @@
 import datadog.trace.api.sampling.Sampler;
 
 public class MockSampler implements Sampler {
-  private final int numSamples;
+    private final int numSamples;
 
-  private int callCount;
+    private int callCount;
 
-  public MockSampler() {
-    this(Integer.MAX_VALUE);
-  }
+    public MockSampler() {
+        this(Integer.MAX_VALUE);
+    }
 
-  public MockSampler(int numSamples) {
-    this.numSamples = numSamples;
-  }
+    public MockSampler(int numSamples) {
+        this.numSamples = numSamples;
+    }
 
-  @Override
-  public boolean sample() {
-    callCount++;
-    return callCount <= numSamples;
-  }
+    @Override
+    public boolean sample() {
+        callCount++;
+        return callCount <= numSamples;
+    }
 
-  @Override
-  public boolean keep() {
-    return false;
-  }
+    @Override
+    public boolean keep() {
+        return false;
+    }
 
-  @Override
-  public boolean drop() {
-    return false;
-  }
+    @Override
+    public boolean drop() {
+        return false;
+    }
 
-  public int getCallCount() {
-    return callCount;
-  }
+    public int getCallCount() {
+        return callCount;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ProbeInstrumentationTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ProbeInstrumentationTest.java
index d7908a16004..f2742fd6dfa 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ProbeInstrumentationTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ProbeInstrumentationTest.java
@@ -13,43 +13,43 @@
 import org.junit.jupiter.api.AfterEach;
 
 public class ProbeInstrumentationTest {
-  protected static final String SERVICE_NAME = "service-name";
-
-  protected Instrumentation instr = ByteBuddyAgent.install();
-  protected ClassFileTransformer currentTransformer;
-  protected MockSink mockSink;
-  protected ProbeStatusSink probeStatusSink;
-
-  @AfterEach
-  public void after() {
-    if (currentTransformer != null) {
-      instr.removeTransformer(currentTransformer);
+    protected static final String SERVICE_NAME = "service-name";
+
+    protected Instrumentation instr = ByteBuddyAgent.install();
+    protected ClassFileTransformer currentTransformer;
+    protected MockSink mockSink;
+    protected ProbeStatusSink probeStatusSink;
+
+    @AfterEach
+    public void after() {
+        if (currentTransformer != null) {
+            instr.removeTransformer(currentTransformer);
+        }
     }
-  }
 
-  protected static class MockSink extends DebuggerSink {
+    protected static class MockSink extends DebuggerSink {
 
-    private final List<Snapshot> snapshots = new ArrayList<>();
+        private final List<Snapshot> snapshots = new ArrayList<>();
 
-    public MockSink(Config config, ProbeStatusSink probeStatusSink) {
-      super(config, probeStatusSink);
-    }
+        public MockSink(Config config, ProbeStatusSink probeStatusSink) {
+            super(config, probeStatusSink);
+        }
 
-    @Override
-    public void addSnapshot(Snapshot snapshot) {
-      snapshots.add(snapshot);
-    }
+        @Override
+        public void addSnapshot(Snapshot snapshot) {
+            snapshots.add(snapshot);
+        }
 
-    @Override
-    public void addHighRateSnapshot(Snapshot snapshot) {
-      snapshots.add(snapshot);
-    }
+        @Override
+        public void addHighRateSnapshot(Snapshot snapshot) {
+            snapshots.add(snapshot);
+        }
 
-    @Override
-    public void skipSnapshot(String probeId, DebuggerMetricCollector.SkippedReason reason) {}
+        @Override
+        public void skipSnapshot(String probeId, DebuggerMetricCollector.SkippedReason reason) {}
 
-    public List<Snapshot> getSnapshots() {
-      return snapshots;
+        public List<Snapshot> getSnapshots() {
+            return snapshots;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ProbeMetadataTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ProbeMetadataTest.java
index 19ac68fbbbf..03bff439a74 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ProbeMetadataTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ProbeMetadataTest.java
@@ -7,26 +7,26 @@
 
 class ProbeMetadataTest {
 
-  @Test
-  void addProbe() {
-    ProbeMetadata probeMetadata = new ProbeMetadata();
-    probeMetadata.addProbe(LogProbe.builder().probeId("probe-id0", 0).build());
-    probeMetadata.addProbe(LogProbe.builder().probeId("probe-id1", 0).build());
-    probeMetadata.addProbe(LogProbe.builder().probeId("probe-id2", 0).build());
-    assertEquals(3, probeMetadata.size());
-    assertEquals("probe-id0", probeMetadata.getProbe(0).getId());
-  }
+    @Test
+    void addProbe() {
+        ProbeMetadata probeMetadata = new ProbeMetadata();
+        probeMetadata.addProbe(LogProbe.builder().probeId("probe-id0", 0).build());
+        probeMetadata.addProbe(LogProbe.builder().probeId("probe-id1", 0).build());
+        probeMetadata.addProbe(LogProbe.builder().probeId("probe-id2", 0).build());
+        assertEquals(3, probeMetadata.size());
+        assertEquals("probe-id0", probeMetadata.getProbe(0).getId());
+    }
 
-  @Test
-  void removeProbe() {
-    ProbeMetadata probeMetadata = new ProbeMetadata();
-    probeMetadata.addProbe(LogProbe.builder().probeId("probe-id0", 0).build());
-    probeMetadata.addProbe(LogProbe.builder().probeId("probe-id1", 0).build());
-    probeMetadata.addProbe(LogProbe.builder().probeId("probe-id2", 0).build());
-    probeMetadata.removeProbe(1);
-    assertEquals(2, probeMetadata.size());
-    probeMetadata.removeProbe("probe-id2:0");
-    assertEquals(1, probeMetadata.size());
-    assertEquals("probe-id0", probeMetadata.getProbe(0).getId());
-  }
+    @Test
+    void removeProbe() {
+        ProbeMetadata probeMetadata = new ProbeMetadata();
+        probeMetadata.addProbe(LogProbe.builder().probeId("probe-id0", 0).build());
+        probeMetadata.addProbe(LogProbe.builder().probeId("probe-id1", 0).build());
+        probeMetadata.addProbe(LogProbe.builder().probeId("probe-id2", 0).build());
+        probeMetadata.removeProbe(1);
+        assertEquals(2, probeMetadata.size());
+        probeMetadata.removeProbe("probe-id2:0");
+        assertEquals(1, probeMetadata.size());
+        assertEquals("probe-id0", probeMetadata.getProbe(0).getId());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ProbeStatusTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ProbeStatusTest.java
index eeb6fcde8bf..09991491d52 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ProbeStatusTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ProbeStatusTest.java
@@ -24,134 +24,123 @@
 @ExtendWith(MockitoExtension.class)
 class ProbeStatusTest {
 
-  private static final String SERVICE_NAME = "service-name";
-  private static final ProbeId PROBE_ID = new ProbeId("probe-id", 42);
-  private static final String RECEIVED_MESSAGE = "Received probe " + PROBE_ID + ".";
-  private static final String INSTALLED_MESSAGE = "Installed probe " + PROBE_ID + ".";
-  private static final String ERROR_MESSAGE = "Error installing probe " + PROBE_ID + ".";
-  private static final String RUNTIME_ID = "foo";
-
-  @Mock private Config config;
-
-  private Builder builder;
-
-  @BeforeEach
-  void setUp() {
-    lenient().when(config.getServiceName()).thenReturn(SERVICE_NAME);
-    lenient().when(config.getRuntimeId()).thenReturn(RUNTIME_ID);
-    builder = new Builder(config);
-  }
-
-  @Test
-  void builderReceived() {
-    ProbeStatus expected =
-        new ProbeStatus(
-            SERVICE_NAME,
-            RECEIVED_MESSAGE,
-            new Diagnostics(PROBE_ID, RUNTIME_ID, Status.RECEIVED, null));
-    ProbeStatus actual = builder.receivedMessage(PROBE_ID);
-    assertEquals(expected, actual);
-  }
-
-  @Test
-  void builderReceivedNullSafe() {
-    assertDoesNotThrow(
-        () -> {
-          builder.receivedMessage(null);
+    private static final String SERVICE_NAME = "service-name";
+    private static final ProbeId PROBE_ID = new ProbeId("probe-id", 42);
+    private static final String RECEIVED_MESSAGE = "Received probe " + PROBE_ID + ".";
+    private static final String INSTALLED_MESSAGE = "Installed probe " + PROBE_ID + ".";
+    private static final String ERROR_MESSAGE = "Error installing probe " + PROBE_ID + ".";
+    private static final String RUNTIME_ID = "foo";
+
+    @Mock
+    private Config config;
+
+    private Builder builder;
+
+    @BeforeEach
+    void setUp() {
+        lenient().when(config.getServiceName()).thenReturn(SERVICE_NAME);
+        lenient().when(config.getRuntimeId()).thenReturn(RUNTIME_ID);
+        builder = new Builder(config);
+    }
+
+    @Test
+    void builderReceived() {
+        ProbeStatus expected = new ProbeStatus(
+                SERVICE_NAME, RECEIVED_MESSAGE, new Diagnostics(PROBE_ID, RUNTIME_ID, Status.RECEIVED, null));
+        ProbeStatus actual = builder.receivedMessage(PROBE_ID);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void builderReceivedNullSafe() {
+        assertDoesNotThrow(() -> {
+            builder.receivedMessage(null);
         });
-  }
-
-  @Test
-  void builderInstalled() {
-    ProbeStatus expected =
-        new ProbeStatus(
-            SERVICE_NAME,
-            INSTALLED_MESSAGE,
-            new Diagnostics(PROBE_ID, RUNTIME_ID, Status.INSTALLED, null));
-    ProbeStatus actual = builder.installedMessage(PROBE_ID);
-    assertEquals(expected, actual);
-  }
-
-  @Test
-  void builderErrorMessage() {
-    String exceptionMessage = "foo";
-    ProbeStatus expected =
-        new ProbeStatus(
-            SERVICE_NAME,
-            ERROR_MESSAGE,
-            new Diagnostics(
-                PROBE_ID,
-                RUNTIME_ID,
-                Status.ERROR,
-                new ProbeException("NO_TYPE", exceptionMessage, Collections.emptyList())));
-    ProbeStatus actual = builder.errorMessage(PROBE_ID, exceptionMessage);
-    assertEquals(expected, actual);
-  }
-
-  @Test
-  void builderErrorThrowable() {
-    String exceptionMessage = "foo";
-    Exception exception = new Exception(exceptionMessage);
-    List<CapturedStackFrame> capturedStackFrames =
-        Arrays.stream(exception.getStackTrace())
-            .map(CapturedStackFrame::from)
-            .collect(Collectors.toList());
-    ProbeStatus expected =
-        new ProbeStatus(
-            SERVICE_NAME,
-            ERROR_MESSAGE,
-            new Diagnostics(
-                PROBE_ID,
-                RUNTIME_ID,
-                Status.ERROR,
-                new ProbeException("java.lang.Exception", exceptionMessage, capturedStackFrames)));
-    ProbeStatus actual = builder.errorMessage(PROBE_ID, exception);
-    assertEquals(expected, actual);
-  }
-
-  @Test
-  void received() {
-    Diagnostics diagnostics = new Diagnostics(PROBE_ID, RUNTIME_ID, Status.RECEIVED, null);
-    ProbeStatus message = new ProbeStatus(SERVICE_NAME, RECEIVED_MESSAGE, diagnostics);
-    assertEquals(SERVICE_NAME, message.getService());
-    assertEquals(RECEIVED_MESSAGE, message.getMessage());
-    assertEquals(diagnostics, message.getDiagnostics());
-  }
-
-  @Test
-  void installed() {
-    Diagnostics diagnostics = new Diagnostics(PROBE_ID, RUNTIME_ID, Status.INSTALLED, null);
-    ProbeStatus message = new ProbeStatus(SERVICE_NAME, INSTALLED_MESSAGE, diagnostics);
-    assertEquals(SERVICE_NAME, message.getService());
-    assertEquals(INSTALLED_MESSAGE, message.getMessage());
-    assertEquals(diagnostics, message.getDiagnostics());
-  }
-
-  @Test
-  void errorMessage() {
-    ProbeException exception =
-        new ProbeException("NO_TYPE", ERROR_MESSAGE, Collections.emptyList());
-    Diagnostics diagnostics = new Diagnostics(PROBE_ID, RUNTIME_ID, Status.ERROR, exception);
-    ProbeStatus message = new ProbeStatus(SERVICE_NAME, ERROR_MESSAGE, diagnostics);
-    assertEquals(SERVICE_NAME, message.getService());
-    assertEquals(ERROR_MESSAGE, message.getMessage());
-    assertEquals(diagnostics, message.getDiagnostics());
-    assertEquals(exception, message.getDiagnostics().getException());
-  }
-
-  @Test
-  void errorException() {
-    List<CapturedStackFrame> stackTrace =
-        Arrays.stream(Thread.currentThread().getStackTrace())
-            .map(CapturedStackFrame::from)
-            .collect(Collectors.toList());
-    ProbeException probeException =
-        new ProbeException("java.lang.Exception", ERROR_MESSAGE, stackTrace);
-    Diagnostics diagnostics = new Diagnostics(PROBE_ID, RUNTIME_ID, Status.ERROR, probeException);
-    ProbeStatus message = new ProbeStatus(SERVICE_NAME, ERROR_MESSAGE, diagnostics);
-    assertEquals(SERVICE_NAME, message.getService());
-    assertEquals(ERROR_MESSAGE, message.getMessage());
-    assertEquals(diagnostics, message.getDiagnostics());
-    assertEquals(probeException, message.getDiagnostics().getException());
-  }
+    }
+
+    @Test
+    void builderInstalled() {
+        ProbeStatus expected = new ProbeStatus(
+                SERVICE_NAME, INSTALLED_MESSAGE, new Diagnostics(PROBE_ID, RUNTIME_ID, Status.INSTALLED, null));
+        ProbeStatus actual = builder.installedMessage(PROBE_ID);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void builderErrorMessage() {
+        String exceptionMessage = "foo";
+        ProbeStatus expected = new ProbeStatus(
+                SERVICE_NAME,
+                ERROR_MESSAGE,
+                new Diagnostics(
+                        PROBE_ID,
+                        RUNTIME_ID,
+                        Status.ERROR,
+                        new ProbeException("NO_TYPE", exceptionMessage, Collections.emptyList())));
+        ProbeStatus actual = builder.errorMessage(PROBE_ID, exceptionMessage);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void builderErrorThrowable() {
+        String exceptionMessage = "foo";
+        Exception exception = new Exception(exceptionMessage);
+        List<CapturedStackFrame> capturedStackFrames = Arrays.stream(exception.getStackTrace())
+                .map(CapturedStackFrame::from)
+                .collect(Collectors.toList());
+        ProbeStatus expected = new ProbeStatus(
+                SERVICE_NAME,
+                ERROR_MESSAGE,
+                new Diagnostics(
+                        PROBE_ID,
+                        RUNTIME_ID,
+                        Status.ERROR,
+                        new ProbeException("java.lang.Exception", exceptionMessage, capturedStackFrames)));
+        ProbeStatus actual = builder.errorMessage(PROBE_ID, exception);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void received() {
+        Diagnostics diagnostics = new Diagnostics(PROBE_ID, RUNTIME_ID, Status.RECEIVED, null);
+        ProbeStatus message = new ProbeStatus(SERVICE_NAME, RECEIVED_MESSAGE, diagnostics);
+        assertEquals(SERVICE_NAME, message.getService());
+        assertEquals(RECEIVED_MESSAGE, message.getMessage());
+        assertEquals(diagnostics, message.getDiagnostics());
+    }
+
+    @Test
+    void installed() {
+        Diagnostics diagnostics = new Diagnostics(PROBE_ID, RUNTIME_ID, Status.INSTALLED, null);
+        ProbeStatus message = new ProbeStatus(SERVICE_NAME, INSTALLED_MESSAGE, diagnostics);
+        assertEquals(SERVICE_NAME, message.getService());
+        assertEquals(INSTALLED_MESSAGE, message.getMessage());
+        assertEquals(diagnostics, message.getDiagnostics());
+    }
+
+    @Test
+    void errorMessage() {
+        ProbeException exception = new ProbeException("NO_TYPE", ERROR_MESSAGE, Collections.emptyList());
+        Diagnostics diagnostics = new Diagnostics(PROBE_ID, RUNTIME_ID, Status.ERROR, exception);
+        ProbeStatus message = new ProbeStatus(SERVICE_NAME, ERROR_MESSAGE, diagnostics);
+        assertEquals(SERVICE_NAME, message.getService());
+        assertEquals(ERROR_MESSAGE, message.getMessage());
+        assertEquals(diagnostics, message.getDiagnostics());
+        assertEquals(exception, message.getDiagnostics().getException());
+    }
+
+    @Test
+    void errorException() {
+        List<CapturedStackFrame> stackTrace = Arrays.stream(
+                        Thread.currentThread().getStackTrace())
+                .map(CapturedStackFrame::from)
+                .collect(Collectors.toList());
+        ProbeException probeException = new ProbeException("java.lang.Exception", ERROR_MESSAGE, stackTrace);
+        Diagnostics diagnostics = new Diagnostics(PROBE_ID, RUNTIME_ID, Status.ERROR, probeException);
+        ProbeStatus message = new ProbeStatus(SERVICE_NAME, ERROR_MESSAGE, diagnostics);
+        assertEquals(SERVICE_NAME, message.getService());
+        assertEquals(ERROR_MESSAGE, message.getMessage());
+        assertEquals(diagnostics, message.getDiagnostics());
+        assertEquals(probeException, message.getDiagnostics().getException());
+    }
 }
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 b856fcd8a5d..22a032f9189 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
@@ -80,1320 +80,1241 @@
 
 public class SnapshotSerializationTest {
 
-  private static final int PROBE_VERSION = 42;
-  private static final ProbeId PROBE_ID = new ProbeId("12fd-8490-c111-4374-ffde", PROBE_VERSION);
-  private static final ProbeLocation PROBE_LOCATION =
-      new ProbeLocation("java.lang.String", "indexOf", "String.java", Arrays.asList("12-15", "23"));
-
-  @BeforeEach
-  public void setup() {
-    DebuggerContext.initClassFilter(new DenyListHelper(null));
-    DebuggerContext.initValueSerializer(new JsonSnapshotSerializer());
-  }
-
-  @Test
-  public void roundTripProbeDetails() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    String buffer = adapter.toJson(snapshot);
-
-    Snapshot deserializedSnapshot = adapter.fromJson(buffer);
-    Assertions.assertEquals(PROBE_ID.getId(), deserializedSnapshot.getProbe().getId());
-    Assertions.assertEquals(
-        PROBE_ID.getVersion(), deserializedSnapshot.getProbe().getProbeId().getVersion());
-    ProbeLocation location = deserializedSnapshot.getProbe().getLocation();
-    Assertions.assertEquals(PROBE_LOCATION.getType(), location.getType());
-    Assertions.assertEquals(PROBE_LOCATION.getFile(), location.getFile());
-    Assertions.assertEquals(PROBE_LOCATION.getMethod(), location.getMethod());
-    Assertions.assertEquals(PROBE_LOCATION.getLines(), location.getLines());
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_17)
-  @DisabledIf("datadog.environment.JavaVirtualMachine#isJ9")
-  public void roundTripCapturedValue() throws IOException, URISyntaxException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    CapturedContext.CapturedValue normalValuedLocal =
-        CapturedContext.CapturedValue.of("normalValuedLocal", String.class.getTypeName(), "foobar");
-    CapturedContext.CapturedValue normalNullLocal =
-        CapturedContext.CapturedValue.of("normalNullLocal", String.class.getTypeName(), null);
-    // this object generates InaccessibleObjectException since JDK16 when extracting its fields
-    CapturedContext.CapturedValue notCapturedLocal =
-        CapturedContext.CapturedValue.of(
-            "notCapturedLocal",
-            OperatingSystemMXBean.class.getTypeName(),
-            ManagementFactory.getOperatingSystemMXBean());
-    context.addLocals(
-        new CapturedContext.CapturedValue[] {normalValuedLocal, normalNullLocal, notCapturedLocal});
-    context.evaluate(
-        new ProbeImplementation.NoopProbeImplementation(PROBE_ID, PROBE_LOCATION),
-        String.class.getTypeName(),
-        -1,
-        MethodLocation.EXIT,
-        false);
-    snapshot.setExit(context);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("roundTripCapturedValue: " + buffer);
-    Snapshot deserializedSnapshot = adapter.fromJson(buffer);
-    Map<String, CapturedContext.CapturedValue> locals =
-        deserializedSnapshot.getCaptures().getReturn().getLocals();
-    Assertions.assertEquals(3, locals.size());
-    normalValuedLocal = locals.get("normalValuedLocal");
-    Assertions.assertEquals("foobar", normalValuedLocal.getValue());
-    Assertions.assertEquals(String.class.getTypeName(), normalValuedLocal.getType());
-    assertNull(normalValuedLocal.getNotCapturedReason());
-    normalNullLocal = locals.get("normalNullLocal");
-    assertNull(normalNullLocal.getValue());
-    Assertions.assertEquals(String.class.getTypeName(), normalNullLocal.getType());
-    assertNull(normalNullLocal.getNotCapturedReason());
-    notCapturedLocal = locals.get("notCapturedLocal");
-    Map<String, CapturedContext.CapturedValue> notCapturedFields =
-        (Map<String, CapturedContext.CapturedValue>) notCapturedLocal.getValue();
-    CapturedContext.CapturedValue processLoadTicks = notCapturedFields.get("processLoadTicks");
-    Assertions.assertEquals(
-        "Field is not accessible: module jdk.management does not opens/exports to the current module",
-        processLoadTicks.getNotCapturedReason());
-    CapturedContext.CapturedValue systemLoadTicks = notCapturedFields.get("systemLoadTicks");
-    Assertions.assertEquals(
-        "Field is not accessible: module jdk.management does not opens/exports to the current module",
-        systemLoadTicks.getNotCapturedReason());
-    CapturedContext.CapturedValue containerMetrics = notCapturedFields.get("containerMetrics");
-    Assertions.assertEquals(
-        "Field is not accessible: module jdk.management does not opens/exports to the current module",
-        containerMetrics.getNotCapturedReason());
-  }
-
-  @Test
-  public void roundTripCaughtException() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    Snapshot.Captures captures = snapshot.getCaptures();
-    captures.addCaughtException(
-        new CapturedContext.CapturedThrowable(
-            IllegalArgumentException.class.getTypeName(),
-            "illegal argument",
-            Arrays.asList(
-                new CapturedStackFrame("f1", 12),
-                new CapturedStackFrame("f2", 23),
-                new CapturedStackFrame("f3", 34)),
-            null));
-    captures.addCaughtException(
-        new CapturedContext.CapturedThrowable(
-            NullPointerException.class.getTypeName(),
-            "illegal argument",
-            Collections.emptyList(),
-            null));
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("roundTripCaughtException: " + buffer);
-    Snapshot deserializedSnapshot = adapter.fromJson(buffer);
-    List<CapturedStackFrame> stacktrace =
-        deserializedSnapshot.getCaptures().getCaughtExceptions().get(0).getStacktrace();
-    Assertions.assertEquals(3, stacktrace.size());
-    assertCapturedFrame(stacktrace.get(0), "f1", 12);
-    assertCapturedFrame(stacktrace.get(1), "f2", 23);
-    assertCapturedFrame(stacktrace.get(2), "f3", 34);
-  }
-
-  @Test
-  public void roundtripEntryReturn() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    CapturedContext entryCapturedContext = new CapturedContext();
-    entryCapturedContext.addLocals(
-        new CapturedContext.CapturedValue[] {
-          CapturedContext.CapturedValue.of("localInt", "int", "42")
-        });
-    snapshot.setEntry(entryCapturedContext);
-    CapturedContext exitCapturedContext = new CapturedContext();
-    exitCapturedContext.addLocals(
-        new CapturedContext.CapturedValue[] {
-          CapturedContext.CapturedValue.of("localInt", "int", "42")
-        });
-    exitCapturedContext.addReturn(
-        CapturedContext.CapturedValue.of(String.class.getTypeName(), "foo"));
-    exitCapturedContext.addThrowable(new RuntimeException("Illegal argument"));
-    snapshot.setExit(exitCapturedContext);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("roundtripEntryReturn: " + buffer);
-    Snapshot deserializedSnapshot = adapter.fromJson(buffer);
-    CapturedContext entry = deserializedSnapshot.getCaptures().getEntry();
-    CapturedContext exit = deserializedSnapshot.getCaptures().getReturn();
-    Assertions.assertEquals(1, entry.getLocals().size());
-    Assertions.assertEquals(42, entry.getLocals().get("localInt").getValue());
-    Assertions.assertEquals(3, exit.getLocals().size());
-    Assertions.assertEquals(42, exit.getLocals().get("localInt").getValue());
-    Assertions.assertEquals("foo", exit.getLocals().get("@return").getValue());
-    Assertions.assertEquals(
-        "Illegal argument",
-        ((HashMap<String, CapturedContext.CapturedValue>)
-                exit.getLocals().get("@exception").getValue())
-            .get("detailMessage")
-            .getValue());
-    Assertions.assertEquals(
-        RuntimeException.class.getTypeName(), exit.getCapturedThrowable().getType());
-    Assertions.assertEquals("Illegal argument", exit.getCapturedThrowable().getMessage());
-  }
-
-  @Test
-  public void truncatedExceptionMessage() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    CapturedContext exitCapturedContext = new CapturedContext();
-    String oneKB =
-        "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123";
-    String largeErrorMessage = oneKB + oneKB + oneKB + oneKB;
-    exitCapturedContext.addThrowable(new RuntimeException(largeErrorMessage));
-    snapshot.setExit(exitCapturedContext);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("truncatedExceptionMessage: " + buffer);
-    Snapshot deserializedSnapshot = adapter.fromJson(buffer);
-    Assertions.assertEquals(
-        2048,
-        deserializedSnapshot
-            .getCaptures()
-            .getReturn()
-            .getCapturedThrowable()
-            .getMessage()
-            .length());
-  }
-
-  @Test
-  public void roundtripLines() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    Snapshot.Captures captures = snapshot.getCaptures();
-    CapturedContext lineCapturedContext = new CapturedContext();
-    lineCapturedContext.addLocals(
-        new CapturedContext.CapturedValue[] {
-          CapturedContext.CapturedValue.of("localInt", "int", "42")
-        });
-    captures.addLine(24, lineCapturedContext);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("roundtripLines: " + buffer);
-    Snapshot deserializedSnapshot = adapter.fromJson(buffer);
-    Map<Integer, CapturedContext> lines = deserializedSnapshot.getCaptures().getLines();
-    Assertions.assertEquals(1, lines.size());
-    Map<String, CapturedContext.CapturedValue> lineLocals = lines.get(24).getLocals();
-    Assertions.assertEquals(1, lineLocals.size());
-    Assertions.assertEquals(42, lineLocals.get("localInt").getValue());
-  }
-
-  static class AnotherClass {
-    int anotherIntField = 11;
-    String anotherStrField = "foobar";
-  }
-
-  static class ComplexClass {
-    int complexIntField = 21;
-    String complexStrField = "bar";
-    AnotherClass complexObjField = new AnotherClass();
-  }
-
-  static class AllPrimitives {
-    long l = 42_000_000_000L;
-    int i = 42_000;
-    byte b = 42;
-    short sh = 420;
-    char c = 'r';
-    float f = 3.14F;
-    double d = 2.612;
-    boolean bool = true;
-  }
-
-  static class FieldHolder {
-    private int intField = 42;
-    private String strField = "foo";
-    private ComplexClass objField = new ComplexClass();
-    private ComplexClass nullField = null;
-  }
-
-  @Test
-  public void primitives() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    CapturedContext.CapturedValue objLocal =
-        capturedValueDepth("objLocal", "Class", new AllPrimitives(), 3);
-    context.addLocals(new CapturedContext.CapturedValue[] {objLocal});
-    snapshot.setExit(context);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("primitives: " + buffer);
-    Map<String, Object> thisFields = getLocalsFromJson(buffer);
-    Map<String, Object> objFieldJson = (Map<String, Object>) thisFields.get("objLocal");
-    Map<String, Object> objFieldFields = (Map<String, Object>) objFieldJson.get(FIELDS);
-    assertPrimitiveValue(objFieldFields, "l", "long", "42000000000");
-    assertPrimitiveValue(objFieldFields, "i", "int", "42000");
-    assertPrimitiveValue(objFieldFields, "b", "byte", "42");
-    assertPrimitiveValue(objFieldFields, "sh", "short", "420");
-    assertPrimitiveValue(objFieldFields, "c", "char", "r");
-    assertPrimitiveValue(objFieldFields, "f", "float", "3.14");
-    assertPrimitiveValue(objFieldFields, "d", "double", "2.612");
-    assertPrimitiveValue(objFieldFields, "bool", "boolean", "true");
-  }
-
-  static class WellKnownClasses {
-    Class<?> clazz = WellKnownClasses.class;
-    Boolean bool = Boolean.TRUE;
-    Long l = Long.valueOf(42L);
-    BigDecimal bigDecimal = new BigDecimal("3.1415926");
-    Duration duration = Duration.ofMillis(1234567890);
-    LocalDateTime localDateTime = LocalDateTime.of(2023, 1, 17, 13, 31);
-    UUID uuid = UUID.nameUUIDFromBytes("foobar".getBytes());
-    AtomicLong atomicLong = new AtomicLong(123);
-    URI uri = URI.create("https://www.datadoghq.com");
-    Optional<Date> maybeDate = Optional.of(new Date(1700000000000L));
-    Optional<Object> empty = Optional.empty();
-    OptionalInt maybeInt = OptionalInt.of(42);
-    OptionalDouble maybeDouble = OptionalDouble.of(3.14);
-    OptionalLong maybeLong = OptionalLong.of(84);
-    Exception ex = new IllegalArgumentException("invalid arg");
-    StackTraceElement element = new StackTraceElement("Foo", "bar", "foo.java", 42);
-    File file = new File("/tmp/foo");
-    Path path = file.toPath();
-    CompletableFuture<String> future = CompletableFuture.completedFuture("FutureCompleted!");
-  }
-
-  @Test
-  public void wellKnownClasses() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    CapturedContext.CapturedValue objLocal =
-        capturedValueDepth(
-            "objLocal", WellKnownClasses.class.getTypeName(), new WellKnownClasses(), 3);
-    context.addLocals(new CapturedContext.CapturedValue[] {objLocal});
-    snapshot.setExit(context);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("wellKnownClasses: " + buffer);
-    Map<String, Object> locals = getLocalsFromJson(buffer);
-    Map<String, Object> objLocalJson = (Map<String, Object>) locals.get("objLocal");
-    Map<String, Object> objLocalFields = (Map<String, Object>) objLocalJson.get(FIELDS);
-    assertPrimitiveValue(
-        objLocalFields,
-        "clazz",
-        Class.class.getTypeName(),
-        "com.datadog.debugger.agent.SnapshotSerializationTest$WellKnownClasses");
-    assertPrimitiveValue(objLocalFields, "bool", Boolean.class.getTypeName(), "true");
-    assertPrimitiveValue(objLocalFields, "l", Long.class.getTypeName(), "42");
-    assertPrimitiveValue(objLocalFields, "bigDecimal", BigDecimal.class.getTypeName(), "3.1415926");
-    assertPrimitiveValue(
-        objLocalFields, "duration", Duration.class.getTypeName(), "PT342H56M7.89S");
-    assertPrimitiveValue(
-        objLocalFields, "localDateTime", LocalDateTime.class.getTypeName(), "2023-01-17T13:31");
-    assertPrimitiveValue(
-        objLocalFields, "uuid", UUID.class.getTypeName(), "3858f622-30ac-3c91-9f30-0c664312c63f");
-    assertPrimitiveValue(objLocalFields, "atomicLong", AtomicLong.class.getTypeName(), "123");
-    assertPrimitiveValue(
-        objLocalFields, "uri", URI.class.getTypeName(), "https://www.datadoghq.com");
-    // maybeDate
-    Map<String, Object> maybeDate = (Map<String, Object>) objLocalFields.get("maybeDate");
-    assertComplexClass(maybeDate, Optional.class.getTypeName());
-    Map<String, Object> maybeDateFields = (Map<String, Object>) maybeDate.get(FIELDS);
-    assertPrimitiveValue(maybeDateFields, "value", Date.class.getTypeName(), "1700000000000");
-    // empty
-    Map<String, Object> empty = (Map<String, Object>) objLocalFields.get("empty");
-    assertComplexClass(empty, Optional.class.getTypeName());
-    Map<String, Object> emptyFields = (Map<String, Object>) empty.get(FIELDS);
-    Map<String, Object> value = (Map<String, Object>) emptyFields.get("value");
-    assertEquals(Object.class.getTypeName(), value.get(TYPE));
-    assertTrue((Boolean) value.get(IS_NULL));
-    // maybeInt
-    Map<String, Object> maybeInt = (Map<String, Object>) objLocalFields.get("maybeInt");
-    assertComplexClass(maybeInt, OptionalInt.class.getTypeName());
-    Map<String, Object> maybeIntFields = (Map<String, Object>) maybeInt.get(FIELDS);
-    assertPrimitiveValue(maybeIntFields, "value", "int", "42");
-    // maybeDouble
-    Map<String, Object> maybeDouble = (Map<String, Object>) objLocalFields.get("maybeDouble");
-    assertComplexClass(maybeDouble, OptionalDouble.class.getTypeName());
-    Map<String, Object> maybeDoubleFields = (Map<String, Object>) maybeDouble.get(FIELDS);
-    assertPrimitiveValue(maybeDoubleFields, "value", "double", "3.14");
-    // maybeLong
-    Map<String, Object> maybeLong = (Map<String, Object>) objLocalFields.get("maybeLong");
-    assertComplexClass(maybeLong, OptionalLong.class.getTypeName());
-    Map<String, Object> maybeLongFields = (Map<String, Object>) maybeLong.get(FIELDS);
-    assertPrimitiveValue(maybeLongFields, "value", "long", "84");
-    // ex
-    Map<String, Object> ex = (Map<String, Object>) objLocalFields.get("ex");
-    assertComplexClass(ex, IllegalArgumentException.class.getTypeName());
-    Map<String, Object> exFields = (Map<String, Object>) ex.get(FIELDS);
-    assertPrimitiveValue(exFields, "detailMessage", String.class.getTypeName(), "invalid arg");
-    Map<String, Object> stackTrace = (Map<String, Object>) exFields.get("stackTrace");
-    Assertions.assertEquals(StackTraceElement[].class.getTypeName(), stackTrace.get(TYPE));
-    Map<String, Object> element = (Map<String, Object>) objLocalFields.get("element");
-    assertComplexClass(element, StackTraceElement.class.getTypeName());
-    Map<String, Object> elementFields = (Map<String, Object>) element.get(FIELDS);
-    assertPrimitiveValue(elementFields, "declaringClass", String.class.getTypeName(), "Foo");
-    assertPrimitiveValue(elementFields, "methodName", String.class.getTypeName(), "bar");
-    assertPrimitiveValue(elementFields, "fileName", String.class.getTypeName(), "foo.java");
-    assertPrimitiveValue(elementFields, "lineNumber", Integer.class.getTypeName(), "42");
-    // file
-    assertPrimitiveValue(objLocalFields, "file", File.class.getTypeName(), "/tmp/foo");
-    // path
-    assertPrimitiveValue(objLocalFields, "path", "sun.nio.fs.UnixPath", "/tmp/foo");
-    if (JavaVirtualMachine.isJavaVersionAtLeast(19)) {
-      Map<String, Object> future = (Map<String, Object>) objLocalFields.get("future");
-      assertComplexClass(future, CompletableFuture.class.getTypeName());
-      Map<String, Object> futureFields = (Map<String, Object>) future.get(FIELDS);
-      assertPrimitiveValue(futureFields, "result", String.class.getTypeName(), "FutureCompleted!");
-    }
-  }
-
-  @Test
-  public void objectArray() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    CapturedContext.CapturedValue localObjArray =
-        capturedValueDepth(
-            "localObjArray", Object[].class.getTypeName(), new Object[] {"foo", null, 42}, 3);
-    context.addLocals(new CapturedContext.CapturedValue[] {localObjArray});
-    snapshot.setExit(context);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("objectArray: " + buffer);
-    Map<String, Object> locals = getLocalsFromJson(buffer);
-    assertArrayItem(locals, "localObjArray", "foo", null, "42");
-  }
-
-  static class ObjetArrayClass {
-    ComplexClass[] complexClasses = new ComplexClass[3];
-  }
-
-  @Test
-  public void fieldObjectArray() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    CapturedContext.CapturedValue localObj =
-        capturedValueDepth(
-            "localObj", ObjetArrayClass.class.getTypeName(), new ObjetArrayClass(), 3);
-    context.addLocals(new CapturedContext.CapturedValue[] {localObj});
-    snapshot.setExit(context);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("fieldObjectArray: " + buffer);
-    Map<String, Object> locals = getLocalsFromJson(buffer);
-    Map<String, Object> localObjMap = (Map<String, Object>) locals.get("localObj");
-    Map<String, Object> localObjFieldsMap = (Map<String, Object>) localObjMap.get(FIELDS);
-    Map<String, Object> complexClasses =
-        (Map<String, Object>) localObjFieldsMap.get("complexClasses");
-    Assertions.assertEquals(
-        "com.datadog.debugger.agent.SnapshotSerializationTest$ComplexClass[]",
-        complexClasses.get(TYPE));
-  }
-
-  static class PrimitiveArrayClass {
-    byte[] byteArray = new byte[] {1, 2, 3};
-    short[] shortArray = new short[] {128, 129, 130};
-    char[] charArray = new char[] {'a', 'b', 'c'};
-    int[] intArray = new int[] {128_001, 128_002, 128_003};
-    long[] longArray = new long[] {3_000_000_000L, 3_000_000_001L, 3_000_000_002L};
-    boolean[] booleanArray = new boolean[] {true, false, true};
-    float[] floatArray = new float[] {3.14F, 3.15F, 3.16F};
-    double[] doubleArray = new double[] {2.612, 2.613, 2.614};
-  }
-
-  @Test
-  public void fieldPrimitiveArray() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    CapturedContext.CapturedValue localObj =
-        capturedValueDepth(
-            "localObj", PrimitiveArrayClass.class.getTypeName(), new PrimitiveArrayClass(), 3);
-    context.addLocals(new CapturedContext.CapturedValue[] {localObj});
-    snapshot.setExit(context);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("fieldPrimitiveArray: " + buffer);
-    Map<String, Object> locals = getLocalsFromJson(buffer);
-    Map<String, Object> localObjMap = (Map<String, Object>) locals.get("localObj");
-    Map<String, Object> localObjFieldsMap = (Map<String, Object>) localObjMap.get(FIELDS);
-    assertArrayItem(localObjFieldsMap, "byteArray", "1", "2", "3");
-    assertArrayItem(localObjFieldsMap, "shortArray", "128", "129", "130");
-    assertArrayItem(localObjFieldsMap, "charArray", "a", "b", "c");
-    assertArrayItem(localObjFieldsMap, "intArray", "128001", "128002", "128003");
-    assertArrayItem(localObjFieldsMap, "longArray", "3000000000", "3000000001", "3000000002");
-    assertArrayItem(localObjFieldsMap, "booleanArray", "true", "false", "true");
-    assertArrayItem(localObjFieldsMap, "floatArray", "3.14", "3.15", "3.16");
-    assertArrayItem(localObjFieldsMap, "doubleArray", "2.612", "2.613", "2.614");
-  }
-
-  @Test
-  public void staticFields() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    CapturedContext.CapturedValue staticStr =
-        CapturedContext.CapturedValue.of("staticStr", String.class.getTypeName(), "foo");
-    context.addStaticFields(new CapturedContext.CapturedValue[] {staticStr});
-    snapshot.setExit(context);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("staticFields: " + buffer);
-    Map<String, Object> staticFields = getStaticFieldsFromJson(buffer);
-    assertPrimitiveValue(staticFields, "staticStr", String.class.getTypeName(), "foo");
-  }
-
-  @Test
-  public void depthLevel0() throws IOException, URISyntaxException {
-    Map<String, Object> returnJson = doRefDepth(0);
-    Map<String, Object> arguments = (Map<String, Object>) returnJson.get(ARGUMENTS);
-    assertNotCaptured(arguments, "this", FieldHolder.class.getTypeName(), DEPTH_REASON);
-    assertPrimitiveValue(arguments, "strArg", String.class.getTypeName(), null);
-    assertPrimitiveValue(arguments, "intArg", "int", "0");
-    assertPrimitiveValue(arguments, "objArg", ComplexClass.class.getTypeName(), null);
-    Map<String, Object> locals = (Map<String, Object>) returnJson.get(LOCALS);
-    assertPrimitiveValue(locals, "intLocal", "int", "42");
-    assertNotCaptured(locals, "objLocal", ComplexClass.class.getTypeName(), DEPTH_REASON);
-  }
-
-  @Test
-  public void depthLevel1() throws IOException, URISyntaxException {
-    Map<String, Object> returnJson = doRefDepth(1);
-    Map<String, Object> arguments = (Map<String, Object>) returnJson.get(ARGUMENTS);
-    Map<String, Object> thisArg = (Map<String, Object>) arguments.get(THIS);
-    Map<String, Object> thisFields = (Map<String, Object>) thisArg.get(FIELDS);
-    assertPrimitiveValue(thisFields, "strField", String.class.getTypeName(), "foo");
-    assertPrimitiveValue(thisFields, "nullField", ComplexClass.class.getTypeName(), null);
-    assertPrimitiveValue(thisFields, "intField", "int", "42");
-    assertNotCaptured(thisFields, "objField", ComplexClass.class.getTypeName(), DEPTH_REASON);
-    assertPrimitiveValue(arguments, "strArg", String.class.getTypeName(), null);
-    assertPrimitiveValue(arguments, "intArg", "int", "0");
-    assertPrimitiveValue(arguments, "objArg", ComplexClass.class.getTypeName(), null);
-    Map<String, Object> locals = (Map<String, Object>) returnJson.get(LOCALS);
-    assertPrimitiveValue(locals, "intLocal", "int", "42");
-    Map<String, Object> objLocal = (Map<String, Object>) locals.get("objLocal");
-    Assertions.assertEquals(ComplexClass.class.getTypeName(), objLocal.get(TYPE));
-    Map<String, Object> objLocalFields = (Map<String, Object>) objLocal.get(FIELDS);
-    assertPrimitiveValue(objLocalFields, "complexIntField", "int", "21");
-    assertPrimitiveValue(objLocalFields, "complexStrField", String.class.getTypeName(), "bar");
-    assertNotCaptured(
-        objLocalFields, "complexObjField", AnotherClass.class.getTypeName(), DEPTH_REASON);
-    assertNotCaptured(
-        objLocalFields, "complexObjField", AnotherClass.class.getTypeName(), DEPTH_REASON);
-  }
-
-  @Test
-  public void depthLevel2() throws IOException, URISyntaxException {
-    Map<String, Object> returnJson = doRefDepth(2);
-    Map<String, Object> arguments = (Map<String, Object>) returnJson.get(ARGUMENTS);
-    Map<String, Object> thisArg = (Map<String, Object>) arguments.get(THIS);
-    Map<String, Object> thisFields = (Map<String, Object>) thisArg.get(FIELDS);
-    assertPrimitiveValue(thisFields, "strField", String.class.getTypeName(), "foo");
-    assertPrimitiveValue(thisFields, "nullField", ComplexClass.class.getTypeName(), null);
-    assertPrimitiveValue(thisFields, "intField", "int", "42");
-    Map<String, Object> objField = (Map<String, Object>) thisFields.get("objField");
-    Assertions.assertEquals(ComplexClass.class.getTypeName(), objField.get(TYPE));
-    Map<String, Object> objFieldFields = (Map<String, Object>) objField.get(FIELDS);
-    assertPrimitiveValue(objFieldFields, "complexIntField", "int", "21");
-    assertPrimitiveValue(objFieldFields, "complexStrField", String.class.getTypeName(), "bar");
-    assertNotCaptured(
-        objFieldFields, "complexObjField", AnotherClass.class.getTypeName(), DEPTH_REASON);
-    assertPrimitiveValue(arguments, "strArg", String.class.getTypeName(), null);
-    assertPrimitiveValue(arguments, "intArg", "int", "0");
-    assertPrimitiveValue(arguments, "objArg", ComplexClass.class.getTypeName(), null);
-    Map<String, Object> locals = (Map<String, Object>) returnJson.get(LOCALS);
-    assertPrimitiveValue(locals, "intLocal", "int", "42");
-    Map<String, Object> objLocal = (Map<String, Object>) locals.get("objLocal");
-    Assertions.assertEquals(ComplexClass.class.getTypeName(), objLocal.get("type"));
-    Map<String, Object> objLocalFields = (Map<String, Object>) objLocal.get(FIELDS);
-    assertPrimitiveValue(objLocalFields, "complexIntField", "int", "21");
-    assertPrimitiveValue(objLocalFields, "complexStrField", String.class.getTypeName(), "bar");
-    Map<String, Object> localComplexObjField =
-        (Map<String, Object>) objLocalFields.get("complexObjField");
-    Assertions.assertEquals(AnotherClass.class.getTypeName(), localComplexObjField.get(TYPE));
-    Map<String, Object> localComplexObjFieldFields =
-        (Map<String, Object>) localComplexObjField.get(FIELDS);
-    assertPrimitiveValue(localComplexObjFieldFields, "anotherIntField", "int", "11");
-    assertPrimitiveValue(
-        localComplexObjFieldFields, "anotherStrField", String.class.getTypeName(), "foobar");
-  }
-
-  private Map<String, Object> doRefDepth(int maxRefDepth) throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshotForRefDepth(maxRefDepth);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("doRefDepth" + maxRefDepth + ": " + buffer);
-    Map<String, Object> json = MoshiHelper.createGenericAdapter().fromJson(buffer);
-    Map<String, Object> capturesJson = (Map<String, Object>) json.get(CAPTURES);
-    return (Map<String, Object>) capturesJson.get(RETURN);
-  }
-
-  @Test
-  public void collectionSize0() throws IOException {
-    Map<String, Object> locals = doCollectionSize(0);
-    assertNotCaptured(locals, "intArrayLocal", "int[]", COLLECTION_SIZE_REASON);
-    Assertions.assertEquals(0, getNbElements(locals, "intArrayLocal"));
-    assertNotCaptured(
-        locals, "strArrayLocal", String[].class.getTypeName(), COLLECTION_SIZE_REASON);
-    Assertions.assertEquals(0, getNbElements(locals, "strArrayLocal"));
-    assertNotCaptured(
-        locals, "objArrayLocal", Object[].class.getTypeName(), COLLECTION_SIZE_REASON);
-    Assertions.assertEquals(0, getNbElements(locals, "objArrayLocal"));
-    assertNotCaptured(locals, "listLocal", ArrayList.class.getTypeName(), COLLECTION_SIZE_REASON);
-    Assertions.assertEquals(0, getNbElements(locals, "listLocal"));
-    assertNotCaptured(locals, "mapLocal", HashMap.class.getTypeName(), COLLECTION_SIZE_REASON);
-    Assertions.assertEquals(0, getNbEntries(locals, "mapLocal"));
-  }
-
-  @Test
-  public void collectionSize3() throws IOException {
-    Map<String, Object> locals = doCollectionSize(3);
-    assertNotCaptured(locals, "intArrayLocal", "int[]", COLLECTION_SIZE_REASON);
-    Assertions.assertEquals(3, getNbElements(locals, "intArrayLocal"));
-    assertArrayItem(locals, "intArrayLocal", "0", "1", "2");
-    assertNotCaptured(
-        locals, "strArrayLocal", String[].class.getTypeName(), COLLECTION_SIZE_REASON);
-    Assertions.assertEquals(3, getNbElements(locals, "strArrayLocal"));
-    assertArrayItem(locals, "strArrayLocal", "foo0", "foo1", "foo2");
-    assertNotCaptured(
-        locals, "objArrayLocal", Object[].class.getTypeName(), COLLECTION_SIZE_REASON);
-    Assertions.assertEquals(3, getNbElements(locals, "objArrayLocal"));
-    List<Object> objArrayElements = getArrayElements(locals, "objArrayLocal");
-    assertComplexClass(objArrayElements.get(0), ComplexClass.class.getTypeName());
-    assertComplexClass(objArrayElements.get(1), ComplexClass.class.getTypeName());
-    assertComplexClass(objArrayElements.get(2), ComplexClass.class.getTypeName());
-    assertNotCaptured(locals, "listLocal", ArrayList.class.getTypeName(), COLLECTION_SIZE_REASON);
-    Assertions.assertEquals(3, getNbElements(locals, "listLocal"));
-    assertArrayItem(locals, "listLocal", "foo0", "foo1", "foo2");
-    assertNotCaptured(locals, "mapLocal", HashMap.class.getTypeName(), COLLECTION_SIZE_REASON);
-    Assertions.assertEquals(3, getNbEntries(locals, "mapLocal"));
-  }
-
-  @Test
-  public void collectionSize100() throws IOException {
-    Map<String, Object> locals = doCollectionSize(100);
-    assertNotCaptured(locals, "intArrayLocal", "int[]", null);
-    Assertions.assertEquals(10, getNbElements(locals, "intArrayLocal"));
-    assertArrayItem(locals, "intArrayLocal", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
-    assertNotCaptured(locals, "strArrayLocal", String[].class.getTypeName(), null);
-    Assertions.assertEquals(10, getNbElements(locals, "strArrayLocal"));
-    assertArrayItem(
-        locals,
-        "strArrayLocal",
-        "foo0",
-        "foo1",
-        "foo2",
-        "foo3",
-        "foo4",
-        "foo5",
-        "foo6",
-        "foo7",
-        "foo8",
-        "foo9");
-    assertNotCaptured(locals, "objArrayLocal", Object[].class.getTypeName(), null);
-    Assertions.assertEquals(10, getNbElements(locals, "objArrayLocal"));
-    List<Object> objArrayElements = getArrayElements(locals, "objArrayLocal");
-    assertComplexClass(objArrayElements.get(0), ComplexClass.class.getTypeName());
-    assertComplexClass(objArrayElements.get(4), ComplexClass.class.getTypeName());
-    assertComplexClass(objArrayElements.get(9), ComplexClass.class.getTypeName());
-    assertNotCaptured(locals, "listLocal", ArrayList.class.getTypeName(), null);
-    Assertions.assertEquals(10, getNbElements(locals, "listLocal"));
-    assertArrayItem(
-        locals,
-        "listLocal",
-        "foo0",
-        "foo1",
-        "foo2",
-        "foo3",
-        "foo4",
-        "foo5",
-        "foo6",
-        "foo7",
-        "foo8",
-        "foo9");
-    assertNotCaptured(locals, "mapLocal", HashMap.class.getTypeName(), null);
-    Assertions.assertEquals(10, getNbEntries(locals, "mapLocal"));
-    assertMapItems(
-        locals,
-        "mapLocal",
-        "foo0",
-        "bar0",
-        "foo1",
-        "bar1",
-        "foo2",
-        "bar2",
-        "foo3",
-        "bar3",
-        "foo4",
-        "bar4",
-        "foo5",
-        "bar5",
-        "foo6",
-        "bar6",
-        "foo7",
-        "bar7",
-        "foo8",
-        "bar8",
-        "foo9",
-        "bar9");
-  }
-
-  private Map<String, Object> doCollectionSize(int maxColSize) throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshotForCollectionSize(maxColSize);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("doCollectionSize" + maxColSize + ": " + buffer);
-    return getLocalsFromJson(buffer);
-  }
-
-  @Test
-  public void map0() throws IOException {
-    Map<String, Object> locals = doMapSize(0);
-    assertNotCaptured(locals, "strMap", HashMap.class.getTypeName(), COLLECTION_SIZE_REASON);
-    assertMapItems(locals, "strMap");
-    assertSize(locals, "strMap", "10");
-  }
-
-  @Test
-  public void map3() throws IOException {
-    Map<String, Object> locals = doMapSize(3);
-    assertNotCaptured(locals, "strMap", HashMap.class.getTypeName(), COLLECTION_SIZE_REASON);
-    Map<String, Object> field = (Map<String, Object>) locals.get("strMap");
-    List<Object> entries = (List<Object>) field.get(ENTRIES);
-    Assertions.assertEquals(3, entries.size());
-    assertSize(locals, "strMap", "10");
-  }
-
-  @Test
-  public void map100() throws IOException {
-    Map<String, Object> locals = doMapSize(100);
-    assertNotCaptured(locals, "strMap", HashMap.class.getTypeName(), null);
-    assertMapItems(
-        locals, "strMap", "foo0", "bar0", "foo1", "bar1", "foo2", "bar2", "foo3", "bar3", "foo4",
-        "bar4", "foo5", "bar5", "foo6", "bar6", "foo7", "bar7", "foo8", "bar8", "foo9", "bar9");
-    assertSize(locals, "strMap", "10");
-  }
-
-  @Test
-  public void synchronizedMapLockedByAnotherThread() throws Exception {
-    Map<String, String> syncMap = Collections.synchronizedMap(new HashMap<>());
-    syncMap.put("foo", "bar");
-    CountDownLatch locked = new CountDownLatch(1);
-    CountDownLatch release = new CountDownLatch(1);
-    Thread holder =
-        new Thread(
-            () -> {
-              synchronized (syncMap) {
-                locked.countDown();
-                try {
-                  release.await();
-                } catch (InterruptedException ignored) {
-                }
-              }
-            },
-            "mutex-holder");
-    // daemon: a failed await below would otherwise leave the mutex held and block the test JVM
-    holder.setDaemon(true);
-    holder.start();
-    try {
-      assertTrue(locked.await(5, TimeUnit.SECONDS));
-      JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-      Snapshot snapshot = createSnapshot();
-      CapturedContext context = new CapturedContext();
-      context.addLocals(
-          new CapturedContext.CapturedValue[] {
-            capturedValueDepth("syncMap", syncMap.getClass().getTypeName(), syncMap, 1)
-          });
-      snapshot.setExit(context);
-      String buffer =
-          CompletableFuture.supplyAsync(() -> adapter.toJson(snapshot)).get(30, TimeUnit.SECONDS);
-      Map<String, Object> local = (Map<String, Object>) getLocalsFromJson(buffer).get("syncMap");
-      assertNull(local.get(ENTRIES));
-      assertNull(local.get(SIZE));
-      Map<String, Object> fields = (Map<String, Object>) local.get(FIELDS);
-      Assertions.assertNotNull(fields);
-      // serialized through the object path: the backing map is a field, not entries
-      assertTrue(fields.containsKey("m"));
-    } finally {
-      release.countDown();
-      holder.join();
-    }
-  }
-
-  private Map<String, Object> doMapSize(int maxColSize) throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshotForMapSize(maxColSize);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("doMapSize" + maxColSize + ": " + buffer);
-    return getLocalsFromJson(buffer);
-  }
-
-  @Test
-  public void length0() throws IOException {
-    Map<String, Object> locals = doLength(0);
-    assertPrimitiveValue(locals, "strLocal", String.class.getTypeName(), "");
-    assertTruncated(locals, "strLocal", String.class.getTypeName(), "true");
-    assertSize(locals, "strLocal", "10");
-  }
-
-  @Test
-  public void length3() throws IOException {
-    Map<String, Object> locals = doLength(3);
-    assertPrimitiveValue(locals, "strLocal", String.class.getTypeName(), "012");
-    assertTruncated(locals, "strLocal", String.class.getTypeName(), "true");
-    assertSize(locals, "strLocal", "10");
-  }
-
-  @Test
-  public void length255() throws IOException {
-    Map<String, Object> locals = doLength(255);
-    assertPrimitiveValue(locals, "strLocal", String.class.getTypeName(), "0123456789");
-    assertTruncated(locals, "strLocal", String.class.getTypeName(), "null");
-    assertSize(locals, "strLocal", "null"); // no size field if no truncation
-  }
-
-  @Test
-  public void capturesAdapterNull() {
-    MoshiSnapshotHelper.CapturesAdapter capturesAdapter =
-        new MoshiSnapshotHelper.CapturesAdapter(
-            MoshiSnapshotTestHelper.createMoshiSnapshot(),
-            Duration.of(5, ChronoUnit.SECONDS),
-            null);
-    Assertions.assertEquals("null", capturesAdapter.toJson(null));
-  }
-
-  @Test
-  public void capturedValueAdapterNull() {
-    MoshiSnapshotHelper.CapturedValueAdapter capturedValueAdapter =
-        new MoshiSnapshotHelper.CapturedValueAdapter();
-    Assertions.assertEquals("null", capturedValueAdapter.toJson(null));
-  }
-
-  @Test
-  public void collectionUnknown() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    CapturedContext.CapturedValue listLocal =
-        CapturedContext.CapturedValue.of(
-            "listLocal", List.class.getTypeName(), new ArrayList<String>() {});
-    context.addLocals(new CapturedContext.CapturedValue[] {listLocal});
-    snapshot.setExit(context);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("collectionUnknown: " + buffer);
-    Map<String, Object> locals = getLocalsFromJson(buffer);
-    Map<String, Object> listLocalField = (Map<String, Object>) locals.get("listLocal");
-    Map<String, Object> listLocalFieldFields = (Map<String, Object>) listLocalField.get(FIELDS);
-    assertTrue(listLocalFieldFields.containsKey("elementData"));
-    assertTrue(listLocalFieldFields.containsKey("size"));
-    assertTrue(listLocalFieldFields.containsKey("modCount"));
-  }
-
-  @Test
-  public void mapValueUnknown() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    CapturedContext.CapturedValue mapLocal =
-        CapturedContext.CapturedValue.of(
-            "mapLocal", Map.class.getTypeName(), new HashMap<String, String>() {});
-    context.addLocals(new CapturedContext.CapturedValue[] {mapLocal});
-    snapshot.setExit(context);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("mapValueUnknown: " + buffer);
-    Map<String, Object> locals = getLocalsFromJson(buffer);
-    Map<String, Object> mapLocalField = (Map<String, Object>) locals.get("mapLocal");
-    Map<String, Object> mapLocalFieldFields = (Map<String, Object>) mapLocalField.get(FIELDS);
-    assertTrue(mapLocalFieldFields.containsKey("table"));
-    assertTrue(mapLocalFieldFields.containsKey("size"));
-    assertTrue(mapLocalFieldFields.containsKey("threshold"));
-    assertTrue(mapLocalFieldFields.containsKey("loadFactor"));
-  }
-
-  @Test
-  public void mapNullValue() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    Map<String, String> map = new HashMap<>();
-    map.put("foo", null);
-    CapturedContext.CapturedValue mapLocal =
-        CapturedContext.CapturedValue.of("mapLocal", Map.class.getTypeName(), map);
-    context.addLocals(new CapturedContext.CapturedValue[] {mapLocal});
-    snapshot.setExit(context);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("mapNullValue: " + buffer);
-    Map<String, Object> locals = getLocalsFromJson(buffer);
-    List<Object> entries = getMapEntries(locals, "mapLocal");
-    assertEquals(1, entries.size());
-    List<Object> entry = (List<Object>) entries.get(0);
-    assertEquals(2, entry.size());
-    Map<String, Object> value = (Map<String, Object>) entry.get(1);
-    assertEquals(Object.class.getTypeName(), value.get(TYPE));
-    assertTrue((Boolean) value.get(IS_NULL));
-  }
-
-  @Test
-  public void listNullValue() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    List<String> list = new ArrayList<>();
-    list.add("foo");
-    list.add(null);
-    list.add("bar");
-    CapturedContext.CapturedValue listLocal =
-        CapturedContext.CapturedValue.of("listLocal", List.class.getTypeName(), list);
-    context.addLocals(new CapturedContext.CapturedValue[] {listLocal});
-    snapshot.setExit(context);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("listNullValue: " + buffer);
-    Map<String, Object> locals = getLocalsFromJson(buffer);
-    List<Object> elements = getArrayElements(locals, "listLocal");
-    Map<String, Object> nullElement = (Map<String, Object>) elements.get(1);
-    assertEquals(Object.class.getTypeName(), nullElement.get(TYPE));
-    assertTrue((Boolean) nullElement.get(IS_NULL));
-  }
-
-  private Map<String, Object> doLength(int maxLength) throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshotForLength(maxLength);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("doLength" + maxLength + ": " + buffer);
-    return getLocalsFromJson(buffer);
-  }
-
-  @Test
-  public void fieldCount0() throws IOException {
-    assertNull(doFieldCount(0));
-  }
-
-  @Test
-  public void fieldCount3() throws IOException {
-    Map<String, Object> thisArg = doFieldCount(3);
-    Map<String, CapturedContext.CapturedValue> fields =
-        (Map<String, CapturedContext.CapturedValue>) thisArg.get(FIELDS);
-    Assertions.assertEquals(3, fields.size());
-    Assertions.assertEquals(FIELD_COUNT_REASON, thisArg.get(NOT_CAPTURED_REASON));
-  }
-
-  @Test
-  public void fieldCount20() throws IOException {
-    Map<String, Object> thisArg = doFieldCount(20);
-    Assertions.assertEquals(
-        4, ((Map<String, CapturedContext.CapturedValue>) thisArg.get(FIELDS)).size());
-    assertNull(thisArg.get(NOT_CAPTURED_REASON));
-  }
-
-  @Test
-  @Flaky
-  public void timeOut() throws IOException {
-    DebuggerContext.initValueSerializer(new TimeoutSnapshotSerializer(Duration.ofMillis(150)));
-    JsonAdapter<Snapshot> adapter =
-        MoshiHelper.createMoshiSnapshot(Duration.ofMillis(100)).adapter(Snapshot.class);
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    CapturedContext.CapturedValue arg1 = CapturedContext.CapturedValue.of("arg1", "int", 42);
-    CapturedContext.CapturedValue arg2 = CapturedContext.CapturedValue.of("arg2", "int", 42);
-    CapturedContext.CapturedValue arg3 = CapturedContext.CapturedValue.of("arg3", "int", 42);
-    context.addArguments(new CapturedContext.CapturedValue[] {arg1, arg2, arg3});
-    snapshot.setEntry(context);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("timeout: " + buffer);
-    Map<String, Object> json = MoshiHelper.createGenericAdapter().fromJson(buffer);
-    Map<String, Object> capturesJson = (Map<String, Object>) json.get(CAPTURES);
-    Map<String, Object> entryJson = (Map<String, Object>) capturesJson.get(ENTRY);
-    Assertions.assertEquals(TIMEOUT_REASON, entryJson.get(NOT_CAPTURED_REASON));
-  }
-
-  @Test
-  @Flaky
-  public void valueTimeout() throws IOException {
-    DebuggerContext.initValueSerializer(
-        new TimeoutSnapshotSerializer(Duration.of(20, ChronoUnit.MILLIS)));
-    CapturedContext.CapturedValue arg1 =
-        CapturedContext.CapturedValue.of("arg1", Random.class.getTypeName(), new Random(0));
-    arg1.freeze(TimeoutChecker.create(Config.get(), Duration.ofMillis(10)));
-    String buffer = arg1.getStrValue();
-    System.out.println(buffer);
-    Map<String, Object> json = MoshiHelper.createGenericAdapter().fromJson(buffer);
-    Assertions.assertEquals(TIMEOUT_REASON, json.get(NOT_CAPTURED_REASON));
-  }
-
-  enum MyEnum {
-    ONE,
-    TWO,
-    THREE
-  }
-
-  @Test
-  public void enumValues() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    CapturedContext.CapturedValue enumValue =
-        CapturedContext.CapturedValue.of("enumValue", MyEnum.class.getTypeName(), MyEnum.TWO);
-    context.addLocals(new CapturedContext.CapturedValue[] {enumValue});
-    snapshot.setExit(context);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println(buffer);
-    Map<String, Object> locals = getLocalsFromJson(buffer);
-    Map<String, Object> enumValueJson = (Map<String, Object>) locals.get("enumValue");
-    assertEquals("TWO", enumValueJson.get("value"));
-  }
-
-  @Test
-  public void captureExpressions() throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    Map<String, String> map = new HashMap<>();
-    map.put("foo1", "bar1");
-    map.put("foo2", "bar2");
-    map.put("foo3", "bar3");
-    context.addCaptureExpression(
-        CapturedContext.CapturedValue.of("expr1", Map.class.getTypeName(), map));
-    context.addCaptureExpression(
-        CapturedContext.CapturedValue.of(
-            "expr2", List.class.getTypeName(), Arrays.asList("1", "2", "3")));
-    context.addCaptureExpression(
-        CapturedContext.CapturedValue.of("expr3", Integer.TYPE.getTypeName(), 42));
-    snapshot.setExit(context);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println(buffer);
-    Map<String, Object> json = MoshiHelper.createGenericAdapter().fromJson(buffer);
-    Map<String, Object> capturesJson = (Map<String, Object>) json.get(CAPTURES);
-    Map<String, Object> returnJson = (Map<String, Object>) capturesJson.get(RETURN);
-    Map<String, Object> captureExpressions =
-        (Map<String, Object>) returnJson.get(CAPTURE_EXPRESSIONS);
-    assertNull(returnJson.get(LOCALS));
-    assertNull(returnJson.get(ARGUMENTS));
-    assertEquals(3, captureExpressions.size());
-    assertMapItems(captureExpressions, "expr1", "foo1", "bar1", "foo2", "bar2", "foo3", "bar3");
-    assertArrayItem(captureExpressions, "expr2", "1", "2", "3");
-    assertPrimitiveValue(captureExpressions, "expr3", Integer.TYPE.getTypeName(), "42");
-  }
-
-  private Map<String, Object> doFieldCount(int maxFieldCount) throws IOException {
-    JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
-    Snapshot snapshot = createSnapshotForFieldCount(maxFieldCount);
-    String buffer = adapter.toJson(snapshot);
-    System.out.println("doFieldCount" + maxFieldCount + ": " + buffer);
-    return getThisFromJson(buffer);
-  }
-
-  private void assertComplexClass(Object obj, String type) {
-    Map<String, Object> objMap = (Map<String, Object>) obj;
-    Assertions.assertEquals(type, objMap.get(TYPE));
-    Assertions.assertTrue(objMap.containsKey(FIELDS));
-  }
-
-  private int getNbElements(Map<String, Object> item, String name) {
-    List<Object> elements = getArrayElements(item, name);
-    return elements.size();
-  }
-
-  private int getNbEntries(Map<String, Object> item, String name) {
-    List<Object> entries = getMapEntries(item, name);
-    return entries.size();
-  }
-
-  private void assertArrayItem(Map<String, Object> item, String name, String... values) {
-    List<Object> elements = getArrayElements(item, name);
-    for (int i = 0; i < values.length; i++) {
-      Map<String, Object> elem = (Map<String, Object>) elements.get(i);
-      Assertions.assertEquals(values[i], elem.get(VALUE));
-    }
-  }
-
-  private List<Object> getArrayElements(Map<String, Object> item, String name) {
-    Map<String, Object> array = (Map<String, Object>) item.get(name);
-    return (List<Object>) array.get(ELEMENTS);
-  }
-
-  private List<Object> getMapEntries(Map<String, Object> item, String name) {
-    Map<String, Object> array = (Map<String, Object>) item.get(name);
-    return (List<Object>) array.get(ENTRIES);
-  }
-
-  private void assertMapItems(Map<String, Object> item, String name, String... expectedValues) {
-    Map<String, Object> field = (Map<String, Object>) item.get(name);
-    List<Object> entries = (List<Object>) field.get(ENTRIES);
-    Assertions.assertEquals(expectedValues.length / 2, entries.size());
-    int index = 0;
-    Map<String, String> tmpMap = new HashMap<>();
-    for (Object obj : entries) {
-      List<Object> entry = (List<Object>) obj;
-      Map<String, Object> key = (Map<String, Object>) entry.get(0);
-      Map<String, Object> value = (Map<String, Object>) entry.get(1);
-      tmpMap.put((String) key.get(VALUE), (String) value.get(VALUE));
-    }
-    index = 0;
-    while (index < expectedValues.length) {
-      String key = expectedValues[index++];
-      String value = expectedValues[index++];
-      Assertions.assertTrue(tmpMap.containsKey(key));
-      Assertions.assertEquals(value, tmpMap.get(key));
-    }
-  }
-
-  private void assertNotCaptured(
-      Map<String, Object> item, String name, String type, String reason) {
-    Map<String, Object> obj = (Map<String, Object>) item.get(name);
-    Assertions.assertEquals(type, obj.get(TYPE));
-    Assertions.assertEquals(reason, obj.get(NOT_CAPTURED_REASON));
-  }
-
-  private void assertTruncated(
-      Map<String, Object> item, String name, String type, String truncated) {
-    Map<String, Object> obj = (Map<String, Object>) item.get(name);
-    Assertions.assertEquals(type, obj.get(TYPE));
-    Assertions.assertEquals(truncated, String.valueOf(obj.get(TRUNCATED)));
-  }
-
-  private void assertSize(Map<String, Object> item, String name, String size) {
-    Map<String, Object> obj = (Map<String, Object>) item.get(name);
-    Assertions.assertEquals(size, String.valueOf(obj.get(SIZE)));
-  }
-
-  private void assertPrimitiveValue(
-      Map<String, Object> item, String name, String type, String value) {
-    Map<String, Object> prim = (Map<String, Object>) item.get(name);
-    Assertions.assertEquals(type, prim.get(TYPE));
-    if (value != null) {
-      Assertions.assertEquals(value, String.valueOf(prim.get(VALUE)));
-    } else {
-      Assertions.assertEquals(true, prim.get(IS_NULL));
-    }
-  }
-
-  private Map<String, Object> getLocalsFromJson(String buffer) throws IOException {
-    Map<String, Object> json = MoshiHelper.createGenericAdapter().fromJson(buffer);
-    Map<String, Object> capturesJson = (Map<String, Object>) json.get(CAPTURES);
-    Map<String, Object> returnJson = (Map<String, Object>) capturesJson.get(RETURN);
-    return (Map<String, Object>) returnJson.get(LOCALS);
-  }
-
-  private Map<String, Object> getFieldsFromJson(String buffer) throws IOException {
-    Map<String, Object> thisArg = getThisFromJson(buffer);
-    return (Map<String, Object>) thisArg.get(FIELDS);
-  }
-
-  private Map<String, Object> getStaticFieldsFromJson(String buffer) throws IOException {
-    Map<String, Object> json = MoshiHelper.createGenericAdapter().fromJson(buffer);
-    Map<String, Object> capturesJson = (Map<String, Object>) json.get(CAPTURES);
-    Map<String, Object> returnJson = (Map<String, Object>) capturesJson.get(RETURN);
-    return (Map<String, Object>) returnJson.get(STATIC_FIELDS);
-  }
-
-  private Map<String, Object> getThisFromJson(String buffer) throws IOException {
-    Map<String, Object> json = MoshiHelper.createGenericAdapter().fromJson(buffer);
-    Map<String, Object> capturesJson = (Map<String, Object>) json.get(CAPTURES);
-    Map<String, Object> returnJson = (Map<String, Object>) capturesJson.get(RETURN);
-    Map<String, Object> arguments = (Map<String, Object>) returnJson.get(ARGUMENTS);
-    return (Map<String, Object>) arguments.get(THIS);
-  }
-
-  private Snapshot createSnapshotForRefDepth(int maxRefDepth) {
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    CapturedContext.CapturedValue fieldHolder =
-        capturedValueDepth(THIS, FieldHolder.class.getTypeName(), new FieldHolder(), maxRefDepth);
-    context.addArguments(new CapturedContext.CapturedValue[] {fieldHolder});
-    CapturedContext.CapturedValue intArg = capturedValueDepth("intArg", "int", 0, maxRefDepth);
-    CapturedContext.CapturedValue strArg =
-        capturedValueDepth("strArg", String.class.getTypeName(), null, maxRefDepth);
-    CapturedContext.CapturedValue objArg =
-        capturedValueDepth("objArg", ComplexClass.class.getTypeName(), null, maxRefDepth);
-    context.addArguments(new CapturedContext.CapturedValue[] {intArg, strArg, objArg});
-    CapturedContext.CapturedValue intLocal = capturedValueDepth("intLocal", "int", 42, maxRefDepth);
-    CapturedContext.CapturedValue objLocal =
-        capturedValueDepth(
-            "objLocal", ComplexClass.class.getTypeName(), new ComplexClass(), maxRefDepth);
-    context.addLocals(new CapturedContext.CapturedValue[] {intLocal, objLocal});
-    snapshot.setExit(context);
-    return snapshot;
-  }
-
-  private Snapshot createSnapshotForCollectionSize(int maxColSize) {
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    CapturedContext.CapturedValue intArrayLocal =
-        capturedValueColSize(
-            "intArrayLocal", "int[]", new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, maxColSize);
-    CapturedContext.CapturedValue strArrayLocal =
-        capturedValueColSize(
-            "strArrayLocal",
-            String[].class.getTypeName(),
-            new String[] {
-              "foo0", "foo1", "foo2", "foo3", "foo4", "foo5", "foo6", "foo7", "foo8", "foo9"
-            },
-            maxColSize);
-    CapturedContext.CapturedValue objArrayLocal =
-        capturedValueColSize(
-            "objArrayLocal",
-            Object[].class.getTypeName(),
-            new Object[] {
-              new ComplexClass(),
-              new ComplexClass(),
-              new ComplexClass(),
-              new ComplexClass(),
-              new ComplexClass(),
-              new ComplexClass(),
-              new ComplexClass(),
-              new ComplexClass(),
-              new ComplexClass(),
-              new ComplexClass()
-            },
-            maxColSize);
-    CapturedContext.CapturedValue listLocal =
-        capturedValueColSize(
-            "listLocal",
-            List.class.getTypeName(),
-            new ArrayList<>(
+    private static final int PROBE_VERSION = 42;
+    private static final ProbeId PROBE_ID = new ProbeId("12fd-8490-c111-4374-ffde", PROBE_VERSION);
+    private static final ProbeLocation PROBE_LOCATION =
+            new ProbeLocation("java.lang.String", "indexOf", "String.java", Arrays.asList("12-15", "23"));
+
+    @BeforeEach
+    public void setup() {
+        DebuggerContext.initClassFilter(new DenyListHelper(null));
+        DebuggerContext.initValueSerializer(new JsonSnapshotSerializer());
+    }
+
+    @Test
+    public void roundTripProbeDetails() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        String buffer = adapter.toJson(snapshot);
+
+        Snapshot deserializedSnapshot = adapter.fromJson(buffer);
+        Assertions.assertEquals(
+                PROBE_ID.getId(), deserializedSnapshot.getProbe().getId());
+        Assertions.assertEquals(
+                PROBE_ID.getVersion(),
+                deserializedSnapshot.getProbe().getProbeId().getVersion());
+        ProbeLocation location = deserializedSnapshot.getProbe().getLocation();
+        Assertions.assertEquals(PROBE_LOCATION.getType(), location.getType());
+        Assertions.assertEquals(PROBE_LOCATION.getFile(), location.getFile());
+        Assertions.assertEquals(PROBE_LOCATION.getMethod(), location.getMethod());
+        Assertions.assertEquals(PROBE_LOCATION.getLines(), location.getLines());
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_17)
+    @DisabledIf("datadog.environment.JavaVirtualMachine#isJ9")
+    public void roundTripCapturedValue() throws IOException, URISyntaxException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        CapturedContext.CapturedValue normalValuedLocal =
+                CapturedContext.CapturedValue.of("normalValuedLocal", String.class.getTypeName(), "foobar");
+        CapturedContext.CapturedValue normalNullLocal =
+                CapturedContext.CapturedValue.of("normalNullLocal", String.class.getTypeName(), null);
+        // this object generates InaccessibleObjectException since JDK16 when extracting its fields
+        CapturedContext.CapturedValue notCapturedLocal = CapturedContext.CapturedValue.of(
+                "notCapturedLocal",
+                OperatingSystemMXBean.class.getTypeName(),
+                ManagementFactory.getOperatingSystemMXBean());
+        context.addLocals(new CapturedContext.CapturedValue[] {normalValuedLocal, normalNullLocal, notCapturedLocal});
+        context.evaluate(
+                new ProbeImplementation.NoopProbeImplementation(PROBE_ID, PROBE_LOCATION),
+                String.class.getTypeName(),
+                -1,
+                MethodLocation.EXIT,
+                false);
+        snapshot.setExit(context);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("roundTripCapturedValue: " + buffer);
+        Snapshot deserializedSnapshot = adapter.fromJson(buffer);
+        Map<String, CapturedContext.CapturedValue> locals =
+                deserializedSnapshot.getCaptures().getReturn().getLocals();
+        Assertions.assertEquals(3, locals.size());
+        normalValuedLocal = locals.get("normalValuedLocal");
+        Assertions.assertEquals("foobar", normalValuedLocal.getValue());
+        Assertions.assertEquals(String.class.getTypeName(), normalValuedLocal.getType());
+        assertNull(normalValuedLocal.getNotCapturedReason());
+        normalNullLocal = locals.get("normalNullLocal");
+        assertNull(normalNullLocal.getValue());
+        Assertions.assertEquals(String.class.getTypeName(), normalNullLocal.getType());
+        assertNull(normalNullLocal.getNotCapturedReason());
+        notCapturedLocal = locals.get("notCapturedLocal");
+        Map<String, CapturedContext.CapturedValue> notCapturedFields =
+                (Map<String, CapturedContext.CapturedValue>) notCapturedLocal.getValue();
+        CapturedContext.CapturedValue processLoadTicks = notCapturedFields.get("processLoadTicks");
+        Assertions.assertEquals(
+                "Field is not accessible: module jdk.management does not opens/exports to the current module",
+                processLoadTicks.getNotCapturedReason());
+        CapturedContext.CapturedValue systemLoadTicks = notCapturedFields.get("systemLoadTicks");
+        Assertions.assertEquals(
+                "Field is not accessible: module jdk.management does not opens/exports to the current module",
+                systemLoadTicks.getNotCapturedReason());
+        CapturedContext.CapturedValue containerMetrics = notCapturedFields.get("containerMetrics");
+        Assertions.assertEquals(
+                "Field is not accessible: module jdk.management does not opens/exports to the current module",
+                containerMetrics.getNotCapturedReason());
+    }
+
+    @Test
+    public void roundTripCaughtException() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        Snapshot.Captures captures = snapshot.getCaptures();
+        captures.addCaughtException(new CapturedContext.CapturedThrowable(
+                IllegalArgumentException.class.getTypeName(),
+                "illegal argument",
                 Arrays.asList(
-                    "foo0", "foo1", "foo2", "foo3", "foo4", "foo5", "foo6", "foo7", "foo8",
-                    "foo9")),
-            maxColSize);
-    Map<String, String> mapObj = new HashMap<>();
-    mapObj.put("foo0", "bar0");
-    mapObj.put("foo1", "bar1");
-    mapObj.put("foo2", "bar2");
-    mapObj.put("foo3", "bar3");
-    mapObj.put("foo4", "bar4");
-    mapObj.put("foo5", "bar5");
-    mapObj.put("foo6", "bar6");
-    mapObj.put("foo7", "bar7");
-    mapObj.put("foo8", "bar8");
-    mapObj.put("foo9", "bar9");
-    CapturedContext.CapturedValue mapLocal =
-        capturedValueColSize("mapLocal", Map.class.getTypeName(), mapObj, maxColSize);
-    context.addLocals(
-        new CapturedContext.CapturedValue[] {
-          intArrayLocal, strArrayLocal, objArrayLocal, listLocal, mapLocal
-        });
-    snapshot.setExit(context);
-    return snapshot;
-  }
-
-  private Snapshot createSnapshotForMapSize(int maxColSize) {
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    HashMap<String, String> strMap = new HashMap<>();
-    strMap.put("foo0", "bar0");
-    strMap.put("foo1", "bar1");
-    strMap.put("foo2", "bar2");
-    strMap.put("foo3", "bar3");
-    strMap.put("foo4", "bar4");
-    strMap.put("foo5", "bar5");
-    strMap.put("foo6", "bar6");
-    strMap.put("foo7", "bar7");
-    strMap.put("foo8", "bar8");
-    strMap.put("foo9", "bar9");
-    CapturedContext.CapturedValue map =
-        CapturedContext.CapturedValue.of(
-            "strMap",
-            strMap.getClass().getTypeName(),
-            strMap,
-            Limits.DEFAULT_REFERENCE_DEPTH,
-            maxColSize,
-            Limits.DEFAULT_LENGTH,
-            Limits.DEFAULT_FIELD_COUNT);
-    context.addLocals(new CapturedContext.CapturedValue[] {map});
-    snapshot.setExit(context);
-    return snapshot;
-  }
-
-  private Snapshot createSnapshotForLength(int maxLength) {
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    CapturedContext.CapturedValue strLocal =
-        CapturedContext.CapturedValue.of(
-            "strLocal",
-            String.class.getTypeName(),
-            "0123456789",
-            Limits.DEFAULT_REFERENCE_DEPTH,
-            Limits.DEFAULT_COLLECTION_SIZE,
-            maxLength,
-            Limits.DEFAULT_FIELD_COUNT);
-    context.addLocals(new CapturedContext.CapturedValue[] {strLocal});
-    snapshot.setExit(context);
-    return snapshot;
-  }
-
-  private Snapshot createSnapshotForFieldCount(int maxFieldCount) {
-    Snapshot snapshot = createSnapshot();
-    CapturedContext context = new CapturedContext();
-    context.setLimits(
-        Limits.DEFAULT_REFERENCE_DEPTH,
-        Limits.DEFAULT_COLLECTION_SIZE,
-        Limits.DEFAULT_LENGTH,
-        maxFieldCount);
-    CapturedContext.CapturedValue fieldHolder =
-        capturedValueFieldCount(
-            THIS, FieldHolder.class.getTypeName(), new FieldHolder(), maxFieldCount);
-    context.addArguments(new CapturedContext.CapturedValue[] {fieldHolder});
-    snapshot.setExit(context);
-    return snapshot;
-  }
-
-  private CapturedContext.CapturedValue capturedValueDepth(
-      String name, String type, Object value, int maxDepth) {
-    return CapturedContext.CapturedValue.of(
-        name,
-        type,
-        value,
-        maxDepth,
-        Limits.DEFAULT_COLLECTION_SIZE,
-        Limits.DEFAULT_LENGTH,
-        Limits.DEFAULT_FIELD_COUNT);
-  }
-
-  private CapturedContext.CapturedValue capturedValueColSize(
-      String name, String type, Object value, int maxColSize) {
-    return CapturedContext.CapturedValue.of(
-        name,
-        type,
-        value,
-        Limits.DEFAULT_REFERENCE_DEPTH,
-        maxColSize,
-        Limits.DEFAULT_LENGTH,
-        Limits.DEFAULT_FIELD_COUNT);
-  }
-
-  private CapturedContext.CapturedValue capturedValueFieldCount(
-      String name, String type, Object value, int maxFieldCount) {
-    return CapturedContext.CapturedValue.of(
-        name,
-        type,
-        value,
-        Limits.DEFAULT_REFERENCE_DEPTH,
-        Limits.DEFAULT_COLLECTION_SIZE,
-        Limits.DEFAULT_LENGTH,
-        maxFieldCount);
-  }
-
-  private void assertCapturedFrame(
-      CapturedStackFrame capturedStackFrame, String methodName, int lineNumber) {
-    assertNull(capturedStackFrame.getFileName());
-    Assertions.assertEquals(methodName, capturedStackFrame.getFunction());
-    Assertions.assertEquals(lineNumber, capturedStackFrame.getLineNumber());
-  }
-
-  private Snapshot createSnapshot() {
-    return new Snapshot(
-        Thread.currentThread(),
-        new ProbeImplementation.NoopProbeImplementation(PROBE_ID, PROBE_LOCATION),
-        Limits.DEFAULT_REFERENCE_DEPTH);
-  }
-
-  private static JsonAdapter<Snapshot> createSnapshotAdapter() {
-    return MoshiSnapshotTestHelper.createMoshiSnapshot().adapter(Snapshot.class);
-  }
-
-  private static class TimeoutSnapshotSerializer implements DebuggerContext.ValueSerializer {
-    private final JsonAdapter<CapturedContext.CapturedValue> VALUE_ADAPTER =
-        new MoshiSnapshotHelper.CapturedValueAdapter();
-    private final Duration sleepTime;
-
-    public TimeoutSnapshotSerializer(Duration sleepTime) {
-      this.sleepTime = sleepTime;
-    }
-
-    @Override
-    public String serializeValue(CapturedContext.CapturedValue value) {
-      LockSupport.parkNanos(sleepTime.toNanos());
-      return VALUE_ADAPTER.toJson(value);
-    }
-  }
+                        new CapturedStackFrame("f1", 12),
+                        new CapturedStackFrame("f2", 23),
+                        new CapturedStackFrame("f3", 34)),
+                null));
+        captures.addCaughtException(new CapturedContext.CapturedThrowable(
+                NullPointerException.class.getTypeName(), "illegal argument", Collections.emptyList(), null));
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("roundTripCaughtException: " + buffer);
+        Snapshot deserializedSnapshot = adapter.fromJson(buffer);
+        List<CapturedStackFrame> stacktrace =
+                deserializedSnapshot.getCaptures().getCaughtExceptions().get(0).getStacktrace();
+        Assertions.assertEquals(3, stacktrace.size());
+        assertCapturedFrame(stacktrace.get(0), "f1", 12);
+        assertCapturedFrame(stacktrace.get(1), "f2", 23);
+        assertCapturedFrame(stacktrace.get(2), "f3", 34);
+    }
+
+    @Test
+    public void roundtripEntryReturn() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        CapturedContext entryCapturedContext = new CapturedContext();
+        entryCapturedContext.addLocals(
+                new CapturedContext.CapturedValue[] {CapturedContext.CapturedValue.of("localInt", "int", "42")});
+        snapshot.setEntry(entryCapturedContext);
+        CapturedContext exitCapturedContext = new CapturedContext();
+        exitCapturedContext.addLocals(
+                new CapturedContext.CapturedValue[] {CapturedContext.CapturedValue.of("localInt", "int", "42")});
+        exitCapturedContext.addReturn(CapturedContext.CapturedValue.of(String.class.getTypeName(), "foo"));
+        exitCapturedContext.addThrowable(new RuntimeException("Illegal argument"));
+        snapshot.setExit(exitCapturedContext);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("roundtripEntryReturn: " + buffer);
+        Snapshot deserializedSnapshot = adapter.fromJson(buffer);
+        CapturedContext entry = deserializedSnapshot.getCaptures().getEntry();
+        CapturedContext exit = deserializedSnapshot.getCaptures().getReturn();
+        Assertions.assertEquals(1, entry.getLocals().size());
+        Assertions.assertEquals(42, entry.getLocals().get("localInt").getValue());
+        Assertions.assertEquals(3, exit.getLocals().size());
+        Assertions.assertEquals(42, exit.getLocals().get("localInt").getValue());
+        Assertions.assertEquals("foo", exit.getLocals().get("@return").getValue());
+        Assertions.assertEquals(
+                "Illegal argument",
+                ((HashMap<String, CapturedContext.CapturedValue>)
+                                exit.getLocals().get("@exception").getValue())
+                        .get("detailMessage")
+                        .getValue());
+        Assertions.assertEquals(
+                RuntimeException.class.getTypeName(),
+                exit.getCapturedThrowable().getType());
+        Assertions.assertEquals("Illegal argument", exit.getCapturedThrowable().getMessage());
+    }
+
+    @Test
+    public void truncatedExceptionMessage() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        CapturedContext exitCapturedContext = new CapturedContext();
+        String oneKB =
+                "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123";
+        String largeErrorMessage = oneKB + oneKB + oneKB + oneKB;
+        exitCapturedContext.addThrowable(new RuntimeException(largeErrorMessage));
+        snapshot.setExit(exitCapturedContext);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("truncatedExceptionMessage: " + buffer);
+        Snapshot deserializedSnapshot = adapter.fromJson(buffer);
+        Assertions.assertEquals(
+                2048,
+                deserializedSnapshot
+                        .getCaptures()
+                        .getReturn()
+                        .getCapturedThrowable()
+                        .getMessage()
+                        .length());
+    }
+
+    @Test
+    public void roundtripLines() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        Snapshot.Captures captures = snapshot.getCaptures();
+        CapturedContext lineCapturedContext = new CapturedContext();
+        lineCapturedContext.addLocals(
+                new CapturedContext.CapturedValue[] {CapturedContext.CapturedValue.of("localInt", "int", "42")});
+        captures.addLine(24, lineCapturedContext);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("roundtripLines: " + buffer);
+        Snapshot deserializedSnapshot = adapter.fromJson(buffer);
+        Map<Integer, CapturedContext> lines = deserializedSnapshot.getCaptures().getLines();
+        Assertions.assertEquals(1, lines.size());
+        Map<String, CapturedContext.CapturedValue> lineLocals = lines.get(24).getLocals();
+        Assertions.assertEquals(1, lineLocals.size());
+        Assertions.assertEquals(42, lineLocals.get("localInt").getValue());
+    }
+
+    static class AnotherClass {
+        int anotherIntField = 11;
+        String anotherStrField = "foobar";
+    }
+
+    static class ComplexClass {
+        int complexIntField = 21;
+        String complexStrField = "bar";
+        AnotherClass complexObjField = new AnotherClass();
+    }
+
+    static class AllPrimitives {
+        long l = 42_000_000_000L;
+        int i = 42_000;
+        byte b = 42;
+        short sh = 420;
+        char c = 'r';
+        float f = 3.14F;
+        double d = 2.612;
+        boolean bool = true;
+    }
+
+    static class FieldHolder {
+        private int intField = 42;
+        private String strField = "foo";
+        private ComplexClass objField = new ComplexClass();
+        private ComplexClass nullField = null;
+    }
+
+    @Test
+    public void primitives() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        CapturedContext.CapturedValue objLocal = capturedValueDepth("objLocal", "Class", new AllPrimitives(), 3);
+        context.addLocals(new CapturedContext.CapturedValue[] {objLocal});
+        snapshot.setExit(context);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("primitives: " + buffer);
+        Map<String, Object> thisFields = getLocalsFromJson(buffer);
+        Map<String, Object> objFieldJson = (Map<String, Object>) thisFields.get("objLocal");
+        Map<String, Object> objFieldFields = (Map<String, Object>) objFieldJson.get(FIELDS);
+        assertPrimitiveValue(objFieldFields, "l", "long", "42000000000");
+        assertPrimitiveValue(objFieldFields, "i", "int", "42000");
+        assertPrimitiveValue(objFieldFields, "b", "byte", "42");
+        assertPrimitiveValue(objFieldFields, "sh", "short", "420");
+        assertPrimitiveValue(objFieldFields, "c", "char", "r");
+        assertPrimitiveValue(objFieldFields, "f", "float", "3.14");
+        assertPrimitiveValue(objFieldFields, "d", "double", "2.612");
+        assertPrimitiveValue(objFieldFields, "bool", "boolean", "true");
+    }
+
+    static class WellKnownClasses {
+        Class<?> clazz = WellKnownClasses.class;
+        Boolean bool = Boolean.TRUE;
+        Long l = Long.valueOf(42L);
+        BigDecimal bigDecimal = new BigDecimal("3.1415926");
+        Duration duration = Duration.ofMillis(1234567890);
+        LocalDateTime localDateTime = LocalDateTime.of(2023, 1, 17, 13, 31);
+        UUID uuid = UUID.nameUUIDFromBytes("foobar".getBytes());
+        AtomicLong atomicLong = new AtomicLong(123);
+        URI uri = URI.create("https://www.datadoghq.com");
+        Optional<Date> maybeDate = Optional.of(new Date(1700000000000L));
+        Optional<Object> empty = Optional.empty();
+        OptionalInt maybeInt = OptionalInt.of(42);
+        OptionalDouble maybeDouble = OptionalDouble.of(3.14);
+        OptionalLong maybeLong = OptionalLong.of(84);
+        Exception ex = new IllegalArgumentException("invalid arg");
+        StackTraceElement element = new StackTraceElement("Foo", "bar", "foo.java", 42);
+        File file = new File("/tmp/foo");
+        Path path = file.toPath();
+        CompletableFuture<String> future = CompletableFuture.completedFuture("FutureCompleted!");
+    }
+
+    @Test
+    public void wellKnownClasses() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        CapturedContext.CapturedValue objLocal =
+                capturedValueDepth("objLocal", WellKnownClasses.class.getTypeName(), new WellKnownClasses(), 3);
+        context.addLocals(new CapturedContext.CapturedValue[] {objLocal});
+        snapshot.setExit(context);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("wellKnownClasses: " + buffer);
+        Map<String, Object> locals = getLocalsFromJson(buffer);
+        Map<String, Object> objLocalJson = (Map<String, Object>) locals.get("objLocal");
+        Map<String, Object> objLocalFields = (Map<String, Object>) objLocalJson.get(FIELDS);
+        assertPrimitiveValue(
+                objLocalFields,
+                "clazz",
+                Class.class.getTypeName(),
+                "com.datadog.debugger.agent.SnapshotSerializationTest$WellKnownClasses");
+        assertPrimitiveValue(objLocalFields, "bool", Boolean.class.getTypeName(), "true");
+        assertPrimitiveValue(objLocalFields, "l", Long.class.getTypeName(), "42");
+        assertPrimitiveValue(objLocalFields, "bigDecimal", BigDecimal.class.getTypeName(), "3.1415926");
+        assertPrimitiveValue(objLocalFields, "duration", Duration.class.getTypeName(), "PT342H56M7.89S");
+        assertPrimitiveValue(objLocalFields, "localDateTime", LocalDateTime.class.getTypeName(), "2023-01-17T13:31");
+        assertPrimitiveValue(objLocalFields, "uuid", UUID.class.getTypeName(), "3858f622-30ac-3c91-9f30-0c664312c63f");
+        assertPrimitiveValue(objLocalFields, "atomicLong", AtomicLong.class.getTypeName(), "123");
+        assertPrimitiveValue(objLocalFields, "uri", URI.class.getTypeName(), "https://www.datadoghq.com");
+        // maybeDate
+        Map<String, Object> maybeDate = (Map<String, Object>) objLocalFields.get("maybeDate");
+        assertComplexClass(maybeDate, Optional.class.getTypeName());
+        Map<String, Object> maybeDateFields = (Map<String, Object>) maybeDate.get(FIELDS);
+        assertPrimitiveValue(maybeDateFields, "value", Date.class.getTypeName(), "1700000000000");
+        // empty
+        Map<String, Object> empty = (Map<String, Object>) objLocalFields.get("empty");
+        assertComplexClass(empty, Optional.class.getTypeName());
+        Map<String, Object> emptyFields = (Map<String, Object>) empty.get(FIELDS);
+        Map<String, Object> value = (Map<String, Object>) emptyFields.get("value");
+        assertEquals(Object.class.getTypeName(), value.get(TYPE));
+        assertTrue((Boolean) value.get(IS_NULL));
+        // maybeInt
+        Map<String, Object> maybeInt = (Map<String, Object>) objLocalFields.get("maybeInt");
+        assertComplexClass(maybeInt, OptionalInt.class.getTypeName());
+        Map<String, Object> maybeIntFields = (Map<String, Object>) maybeInt.get(FIELDS);
+        assertPrimitiveValue(maybeIntFields, "value", "int", "42");
+        // maybeDouble
+        Map<String, Object> maybeDouble = (Map<String, Object>) objLocalFields.get("maybeDouble");
+        assertComplexClass(maybeDouble, OptionalDouble.class.getTypeName());
+        Map<String, Object> maybeDoubleFields = (Map<String, Object>) maybeDouble.get(FIELDS);
+        assertPrimitiveValue(maybeDoubleFields, "value", "double", "3.14");
+        // maybeLong
+        Map<String, Object> maybeLong = (Map<String, Object>) objLocalFields.get("maybeLong");
+        assertComplexClass(maybeLong, OptionalLong.class.getTypeName());
+        Map<String, Object> maybeLongFields = (Map<String, Object>) maybeLong.get(FIELDS);
+        assertPrimitiveValue(maybeLongFields, "value", "long", "84");
+        // ex
+        Map<String, Object> ex = (Map<String, Object>) objLocalFields.get("ex");
+        assertComplexClass(ex, IllegalArgumentException.class.getTypeName());
+        Map<String, Object> exFields = (Map<String, Object>) ex.get(FIELDS);
+        assertPrimitiveValue(exFields, "detailMessage", String.class.getTypeName(), "invalid arg");
+        Map<String, Object> stackTrace = (Map<String, Object>) exFields.get("stackTrace");
+        Assertions.assertEquals(StackTraceElement[].class.getTypeName(), stackTrace.get(TYPE));
+        Map<String, Object> element = (Map<String, Object>) objLocalFields.get("element");
+        assertComplexClass(element, StackTraceElement.class.getTypeName());
+        Map<String, Object> elementFields = (Map<String, Object>) element.get(FIELDS);
+        assertPrimitiveValue(elementFields, "declaringClass", String.class.getTypeName(), "Foo");
+        assertPrimitiveValue(elementFields, "methodName", String.class.getTypeName(), "bar");
+        assertPrimitiveValue(elementFields, "fileName", String.class.getTypeName(), "foo.java");
+        assertPrimitiveValue(elementFields, "lineNumber", Integer.class.getTypeName(), "42");
+        // file
+        assertPrimitiveValue(objLocalFields, "file", File.class.getTypeName(), "/tmp/foo");
+        // path
+        assertPrimitiveValue(objLocalFields, "path", "sun.nio.fs.UnixPath", "/tmp/foo");
+        if (JavaVirtualMachine.isJavaVersionAtLeast(19)) {
+            Map<String, Object> future = (Map<String, Object>) objLocalFields.get("future");
+            assertComplexClass(future, CompletableFuture.class.getTypeName());
+            Map<String, Object> futureFields = (Map<String, Object>) future.get(FIELDS);
+            assertPrimitiveValue(futureFields, "result", String.class.getTypeName(), "FutureCompleted!");
+        }
+    }
+
+    @Test
+    public void objectArray() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        CapturedContext.CapturedValue localObjArray =
+                capturedValueDepth("localObjArray", Object[].class.getTypeName(), new Object[] {"foo", null, 42}, 3);
+        context.addLocals(new CapturedContext.CapturedValue[] {localObjArray});
+        snapshot.setExit(context);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("objectArray: " + buffer);
+        Map<String, Object> locals = getLocalsFromJson(buffer);
+        assertArrayItem(locals, "localObjArray", "foo", null, "42");
+    }
+
+    static class ObjetArrayClass {
+        ComplexClass[] complexClasses = new ComplexClass[3];
+    }
+
+    @Test
+    public void fieldObjectArray() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        CapturedContext.CapturedValue localObj =
+                capturedValueDepth("localObj", ObjetArrayClass.class.getTypeName(), new ObjetArrayClass(), 3);
+        context.addLocals(new CapturedContext.CapturedValue[] {localObj});
+        snapshot.setExit(context);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("fieldObjectArray: " + buffer);
+        Map<String, Object> locals = getLocalsFromJson(buffer);
+        Map<String, Object> localObjMap = (Map<String, Object>) locals.get("localObj");
+        Map<String, Object> localObjFieldsMap = (Map<String, Object>) localObjMap.get(FIELDS);
+        Map<String, Object> complexClasses = (Map<String, Object>) localObjFieldsMap.get("complexClasses");
+        Assertions.assertEquals(
+                "com.datadog.debugger.agent.SnapshotSerializationTest$ComplexClass[]", complexClasses.get(TYPE));
+    }
+
+    static class PrimitiveArrayClass {
+        byte[] byteArray = new byte[] {1, 2, 3};
+        short[] shortArray = new short[] {128, 129, 130};
+        char[] charArray = new char[] {'a', 'b', 'c'};
+        int[] intArray = new int[] {128_001, 128_002, 128_003};
+        long[] longArray = new long[] {3_000_000_000L, 3_000_000_001L, 3_000_000_002L};
+        boolean[] booleanArray = new boolean[] {true, false, true};
+        float[] floatArray = new float[] {3.14F, 3.15F, 3.16F};
+        double[] doubleArray = new double[] {2.612, 2.613, 2.614};
+    }
+
+    @Test
+    public void fieldPrimitiveArray() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        CapturedContext.CapturedValue localObj =
+                capturedValueDepth("localObj", PrimitiveArrayClass.class.getTypeName(), new PrimitiveArrayClass(), 3);
+        context.addLocals(new CapturedContext.CapturedValue[] {localObj});
+        snapshot.setExit(context);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("fieldPrimitiveArray: " + buffer);
+        Map<String, Object> locals = getLocalsFromJson(buffer);
+        Map<String, Object> localObjMap = (Map<String, Object>) locals.get("localObj");
+        Map<String, Object> localObjFieldsMap = (Map<String, Object>) localObjMap.get(FIELDS);
+        assertArrayItem(localObjFieldsMap, "byteArray", "1", "2", "3");
+        assertArrayItem(localObjFieldsMap, "shortArray", "128", "129", "130");
+        assertArrayItem(localObjFieldsMap, "charArray", "a", "b", "c");
+        assertArrayItem(localObjFieldsMap, "intArray", "128001", "128002", "128003");
+        assertArrayItem(localObjFieldsMap, "longArray", "3000000000", "3000000001", "3000000002");
+        assertArrayItem(localObjFieldsMap, "booleanArray", "true", "false", "true");
+        assertArrayItem(localObjFieldsMap, "floatArray", "3.14", "3.15", "3.16");
+        assertArrayItem(localObjFieldsMap, "doubleArray", "2.612", "2.613", "2.614");
+    }
+
+    @Test
+    public void staticFields() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        CapturedContext.CapturedValue staticStr =
+                CapturedContext.CapturedValue.of("staticStr", String.class.getTypeName(), "foo");
+        context.addStaticFields(new CapturedContext.CapturedValue[] {staticStr});
+        snapshot.setExit(context);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("staticFields: " + buffer);
+        Map<String, Object> staticFields = getStaticFieldsFromJson(buffer);
+        assertPrimitiveValue(staticFields, "staticStr", String.class.getTypeName(), "foo");
+    }
+
+    @Test
+    public void depthLevel0() throws IOException, URISyntaxException {
+        Map<String, Object> returnJson = doRefDepth(0);
+        Map<String, Object> arguments = (Map<String, Object>) returnJson.get(ARGUMENTS);
+        assertNotCaptured(arguments, "this", FieldHolder.class.getTypeName(), DEPTH_REASON);
+        assertPrimitiveValue(arguments, "strArg", String.class.getTypeName(), null);
+        assertPrimitiveValue(arguments, "intArg", "int", "0");
+        assertPrimitiveValue(arguments, "objArg", ComplexClass.class.getTypeName(), null);
+        Map<String, Object> locals = (Map<String, Object>) returnJson.get(LOCALS);
+        assertPrimitiveValue(locals, "intLocal", "int", "42");
+        assertNotCaptured(locals, "objLocal", ComplexClass.class.getTypeName(), DEPTH_REASON);
+    }
+
+    @Test
+    public void depthLevel1() throws IOException, URISyntaxException {
+        Map<String, Object> returnJson = doRefDepth(1);
+        Map<String, Object> arguments = (Map<String, Object>) returnJson.get(ARGUMENTS);
+        Map<String, Object> thisArg = (Map<String, Object>) arguments.get(THIS);
+        Map<String, Object> thisFields = (Map<String, Object>) thisArg.get(FIELDS);
+        assertPrimitiveValue(thisFields, "strField", String.class.getTypeName(), "foo");
+        assertPrimitiveValue(thisFields, "nullField", ComplexClass.class.getTypeName(), null);
+        assertPrimitiveValue(thisFields, "intField", "int", "42");
+        assertNotCaptured(thisFields, "objField", ComplexClass.class.getTypeName(), DEPTH_REASON);
+        assertPrimitiveValue(arguments, "strArg", String.class.getTypeName(), null);
+        assertPrimitiveValue(arguments, "intArg", "int", "0");
+        assertPrimitiveValue(arguments, "objArg", ComplexClass.class.getTypeName(), null);
+        Map<String, Object> locals = (Map<String, Object>) returnJson.get(LOCALS);
+        assertPrimitiveValue(locals, "intLocal", "int", "42");
+        Map<String, Object> objLocal = (Map<String, Object>) locals.get("objLocal");
+        Assertions.assertEquals(ComplexClass.class.getTypeName(), objLocal.get(TYPE));
+        Map<String, Object> objLocalFields = (Map<String, Object>) objLocal.get(FIELDS);
+        assertPrimitiveValue(objLocalFields, "complexIntField", "int", "21");
+        assertPrimitiveValue(objLocalFields, "complexStrField", String.class.getTypeName(), "bar");
+        assertNotCaptured(objLocalFields, "complexObjField", AnotherClass.class.getTypeName(), DEPTH_REASON);
+        assertNotCaptured(objLocalFields, "complexObjField", AnotherClass.class.getTypeName(), DEPTH_REASON);
+    }
+
+    @Test
+    public void depthLevel2() throws IOException, URISyntaxException {
+        Map<String, Object> returnJson = doRefDepth(2);
+        Map<String, Object> arguments = (Map<String, Object>) returnJson.get(ARGUMENTS);
+        Map<String, Object> thisArg = (Map<String, Object>) arguments.get(THIS);
+        Map<String, Object> thisFields = (Map<String, Object>) thisArg.get(FIELDS);
+        assertPrimitiveValue(thisFields, "strField", String.class.getTypeName(), "foo");
+        assertPrimitiveValue(thisFields, "nullField", ComplexClass.class.getTypeName(), null);
+        assertPrimitiveValue(thisFields, "intField", "int", "42");
+        Map<String, Object> objField = (Map<String, Object>) thisFields.get("objField");
+        Assertions.assertEquals(ComplexClass.class.getTypeName(), objField.get(TYPE));
+        Map<String, Object> objFieldFields = (Map<String, Object>) objField.get(FIELDS);
+        assertPrimitiveValue(objFieldFields, "complexIntField", "int", "21");
+        assertPrimitiveValue(objFieldFields, "complexStrField", String.class.getTypeName(), "bar");
+        assertNotCaptured(objFieldFields, "complexObjField", AnotherClass.class.getTypeName(), DEPTH_REASON);
+        assertPrimitiveValue(arguments, "strArg", String.class.getTypeName(), null);
+        assertPrimitiveValue(arguments, "intArg", "int", "0");
+        assertPrimitiveValue(arguments, "objArg", ComplexClass.class.getTypeName(), null);
+        Map<String, Object> locals = (Map<String, Object>) returnJson.get(LOCALS);
+        assertPrimitiveValue(locals, "intLocal", "int", "42");
+        Map<String, Object> objLocal = (Map<String, Object>) locals.get("objLocal");
+        Assertions.assertEquals(ComplexClass.class.getTypeName(), objLocal.get("type"));
+        Map<String, Object> objLocalFields = (Map<String, Object>) objLocal.get(FIELDS);
+        assertPrimitiveValue(objLocalFields, "complexIntField", "int", "21");
+        assertPrimitiveValue(objLocalFields, "complexStrField", String.class.getTypeName(), "bar");
+        Map<String, Object> localComplexObjField = (Map<String, Object>) objLocalFields.get("complexObjField");
+        Assertions.assertEquals(AnotherClass.class.getTypeName(), localComplexObjField.get(TYPE));
+        Map<String, Object> localComplexObjFieldFields = (Map<String, Object>) localComplexObjField.get(FIELDS);
+        assertPrimitiveValue(localComplexObjFieldFields, "anotherIntField", "int", "11");
+        assertPrimitiveValue(localComplexObjFieldFields, "anotherStrField", String.class.getTypeName(), "foobar");
+    }
+
+    private Map<String, Object> doRefDepth(int maxRefDepth) throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshotForRefDepth(maxRefDepth);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("doRefDepth" + maxRefDepth + ": " + buffer);
+        Map<String, Object> json = MoshiHelper.createGenericAdapter().fromJson(buffer);
+        Map<String, Object> capturesJson = (Map<String, Object>) json.get(CAPTURES);
+        return (Map<String, Object>) capturesJson.get(RETURN);
+    }
+
+    @Test
+    public void collectionSize0() throws IOException {
+        Map<String, Object> locals = doCollectionSize(0);
+        assertNotCaptured(locals, "intArrayLocal", "int[]", COLLECTION_SIZE_REASON);
+        Assertions.assertEquals(0, getNbElements(locals, "intArrayLocal"));
+        assertNotCaptured(locals, "strArrayLocal", String[].class.getTypeName(), COLLECTION_SIZE_REASON);
+        Assertions.assertEquals(0, getNbElements(locals, "strArrayLocal"));
+        assertNotCaptured(locals, "objArrayLocal", Object[].class.getTypeName(), COLLECTION_SIZE_REASON);
+        Assertions.assertEquals(0, getNbElements(locals, "objArrayLocal"));
+        assertNotCaptured(locals, "listLocal", ArrayList.class.getTypeName(), COLLECTION_SIZE_REASON);
+        Assertions.assertEquals(0, getNbElements(locals, "listLocal"));
+        assertNotCaptured(locals, "mapLocal", HashMap.class.getTypeName(), COLLECTION_SIZE_REASON);
+        Assertions.assertEquals(0, getNbEntries(locals, "mapLocal"));
+    }
+
+    @Test
+    public void collectionSize3() throws IOException {
+        Map<String, Object> locals = doCollectionSize(3);
+        assertNotCaptured(locals, "intArrayLocal", "int[]", COLLECTION_SIZE_REASON);
+        Assertions.assertEquals(3, getNbElements(locals, "intArrayLocal"));
+        assertArrayItem(locals, "intArrayLocal", "0", "1", "2");
+        assertNotCaptured(locals, "strArrayLocal", String[].class.getTypeName(), COLLECTION_SIZE_REASON);
+        Assertions.assertEquals(3, getNbElements(locals, "strArrayLocal"));
+        assertArrayItem(locals, "strArrayLocal", "foo0", "foo1", "foo2");
+        assertNotCaptured(locals, "objArrayLocal", Object[].class.getTypeName(), COLLECTION_SIZE_REASON);
+        Assertions.assertEquals(3, getNbElements(locals, "objArrayLocal"));
+        List<Object> objArrayElements = getArrayElements(locals, "objArrayLocal");
+        assertComplexClass(objArrayElements.get(0), ComplexClass.class.getTypeName());
+        assertComplexClass(objArrayElements.get(1), ComplexClass.class.getTypeName());
+        assertComplexClass(objArrayElements.get(2), ComplexClass.class.getTypeName());
+        assertNotCaptured(locals, "listLocal", ArrayList.class.getTypeName(), COLLECTION_SIZE_REASON);
+        Assertions.assertEquals(3, getNbElements(locals, "listLocal"));
+        assertArrayItem(locals, "listLocal", "foo0", "foo1", "foo2");
+        assertNotCaptured(locals, "mapLocal", HashMap.class.getTypeName(), COLLECTION_SIZE_REASON);
+        Assertions.assertEquals(3, getNbEntries(locals, "mapLocal"));
+    }
+
+    @Test
+    public void collectionSize100() throws IOException {
+        Map<String, Object> locals = doCollectionSize(100);
+        assertNotCaptured(locals, "intArrayLocal", "int[]", null);
+        Assertions.assertEquals(10, getNbElements(locals, "intArrayLocal"));
+        assertArrayItem(locals, "intArrayLocal", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
+        assertNotCaptured(locals, "strArrayLocal", String[].class.getTypeName(), null);
+        Assertions.assertEquals(10, getNbElements(locals, "strArrayLocal"));
+        assertArrayItem(
+                locals,
+                "strArrayLocal",
+                "foo0",
+                "foo1",
+                "foo2",
+                "foo3",
+                "foo4",
+                "foo5",
+                "foo6",
+                "foo7",
+                "foo8",
+                "foo9");
+        assertNotCaptured(locals, "objArrayLocal", Object[].class.getTypeName(), null);
+        Assertions.assertEquals(10, getNbElements(locals, "objArrayLocal"));
+        List<Object> objArrayElements = getArrayElements(locals, "objArrayLocal");
+        assertComplexClass(objArrayElements.get(0), ComplexClass.class.getTypeName());
+        assertComplexClass(objArrayElements.get(4), ComplexClass.class.getTypeName());
+        assertComplexClass(objArrayElements.get(9), ComplexClass.class.getTypeName());
+        assertNotCaptured(locals, "listLocal", ArrayList.class.getTypeName(), null);
+        Assertions.assertEquals(10, getNbElements(locals, "listLocal"));
+        assertArrayItem(
+                locals, "listLocal", "foo0", "foo1", "foo2", "foo3", "foo4", "foo5", "foo6", "foo7", "foo8", "foo9");
+        assertNotCaptured(locals, "mapLocal", HashMap.class.getTypeName(), null);
+        Assertions.assertEquals(10, getNbEntries(locals, "mapLocal"));
+        assertMapItems(
+                locals,
+                "mapLocal",
+                "foo0",
+                "bar0",
+                "foo1",
+                "bar1",
+                "foo2",
+                "bar2",
+                "foo3",
+                "bar3",
+                "foo4",
+                "bar4",
+                "foo5",
+                "bar5",
+                "foo6",
+                "bar6",
+                "foo7",
+                "bar7",
+                "foo8",
+                "bar8",
+                "foo9",
+                "bar9");
+    }
+
+    private Map<String, Object> doCollectionSize(int maxColSize) throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshotForCollectionSize(maxColSize);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("doCollectionSize" + maxColSize + ": " + buffer);
+        return getLocalsFromJson(buffer);
+    }
+
+    @Test
+    public void map0() throws IOException {
+        Map<String, Object> locals = doMapSize(0);
+        assertNotCaptured(locals, "strMap", HashMap.class.getTypeName(), COLLECTION_SIZE_REASON);
+        assertMapItems(locals, "strMap");
+        assertSize(locals, "strMap", "10");
+    }
+
+    @Test
+    public void map3() throws IOException {
+        Map<String, Object> locals = doMapSize(3);
+        assertNotCaptured(locals, "strMap", HashMap.class.getTypeName(), COLLECTION_SIZE_REASON);
+        Map<String, Object> field = (Map<String, Object>) locals.get("strMap");
+        List<Object> entries = (List<Object>) field.get(ENTRIES);
+        Assertions.assertEquals(3, entries.size());
+        assertSize(locals, "strMap", "10");
+    }
+
+    @Test
+    public void map100() throws IOException {
+        Map<String, Object> locals = doMapSize(100);
+        assertNotCaptured(locals, "strMap", HashMap.class.getTypeName(), null);
+        assertMapItems(
+                locals, "strMap", "foo0", "bar0", "foo1", "bar1", "foo2", "bar2", "foo3", "bar3", "foo4", "bar4",
+                "foo5", "bar5", "foo6", "bar6", "foo7", "bar7", "foo8", "bar8", "foo9", "bar9");
+        assertSize(locals, "strMap", "10");
+    }
+
+    @Test
+    public void synchronizedMapLockedByAnotherThread() throws Exception {
+        Map<String, String> syncMap = Collections.synchronizedMap(new HashMap<>());
+        syncMap.put("foo", "bar");
+        CountDownLatch locked = new CountDownLatch(1);
+        CountDownLatch release = new CountDownLatch(1);
+        Thread holder = new Thread(
+                () -> {
+                    synchronized (syncMap) {
+                        locked.countDown();
+                        try {
+                            release.await();
+                        } catch (InterruptedException ignored) {
+                        }
+                    }
+                },
+                "mutex-holder");
+        // daemon: a failed await below would otherwise leave the mutex held and block the test JVM
+        holder.setDaemon(true);
+        holder.start();
+        try {
+            assertTrue(locked.await(5, TimeUnit.SECONDS));
+            JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+            Snapshot snapshot = createSnapshot();
+            CapturedContext context = new CapturedContext();
+            context.addLocals(new CapturedContext.CapturedValue[] {
+                capturedValueDepth("syncMap", syncMap.getClass().getTypeName(), syncMap, 1)
+            });
+            snapshot.setExit(context);
+            String buffer = CompletableFuture.supplyAsync(() -> adapter.toJson(snapshot))
+                    .get(30, TimeUnit.SECONDS);
+            Map<String, Object> local =
+                    (Map<String, Object>) getLocalsFromJson(buffer).get("syncMap");
+            assertNull(local.get(ENTRIES));
+            assertNull(local.get(SIZE));
+            Map<String, Object> fields = (Map<String, Object>) local.get(FIELDS);
+            Assertions.assertNotNull(fields);
+            // serialized through the object path: the backing map is a field, not entries
+            assertTrue(fields.containsKey("m"));
+        } finally {
+            release.countDown();
+            holder.join();
+        }
+    }
+
+    private Map<String, Object> doMapSize(int maxColSize) throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshotForMapSize(maxColSize);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("doMapSize" + maxColSize + ": " + buffer);
+        return getLocalsFromJson(buffer);
+    }
+
+    @Test
+    public void length0() throws IOException {
+        Map<String, Object> locals = doLength(0);
+        assertPrimitiveValue(locals, "strLocal", String.class.getTypeName(), "");
+        assertTruncated(locals, "strLocal", String.class.getTypeName(), "true");
+        assertSize(locals, "strLocal", "10");
+    }
+
+    @Test
+    public void length3() throws IOException {
+        Map<String, Object> locals = doLength(3);
+        assertPrimitiveValue(locals, "strLocal", String.class.getTypeName(), "012");
+        assertTruncated(locals, "strLocal", String.class.getTypeName(), "true");
+        assertSize(locals, "strLocal", "10");
+    }
+
+    @Test
+    public void length255() throws IOException {
+        Map<String, Object> locals = doLength(255);
+        assertPrimitiveValue(locals, "strLocal", String.class.getTypeName(), "0123456789");
+        assertTruncated(locals, "strLocal", String.class.getTypeName(), "null");
+        assertSize(locals, "strLocal", "null"); // no size field if no truncation
+    }
+
+    @Test
+    public void capturesAdapterNull() {
+        MoshiSnapshotHelper.CapturesAdapter capturesAdapter = new MoshiSnapshotHelper.CapturesAdapter(
+                MoshiSnapshotTestHelper.createMoshiSnapshot(), Duration.of(5, ChronoUnit.SECONDS), null);
+        Assertions.assertEquals("null", capturesAdapter.toJson(null));
+    }
+
+    @Test
+    public void capturedValueAdapterNull() {
+        MoshiSnapshotHelper.CapturedValueAdapter capturedValueAdapter = new MoshiSnapshotHelper.CapturedValueAdapter();
+        Assertions.assertEquals("null", capturedValueAdapter.toJson(null));
+    }
+
+    @Test
+    public void collectionUnknown() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        CapturedContext.CapturedValue listLocal =
+                CapturedContext.CapturedValue.of("listLocal", List.class.getTypeName(), new ArrayList<String>() {});
+        context.addLocals(new CapturedContext.CapturedValue[] {listLocal});
+        snapshot.setExit(context);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("collectionUnknown: " + buffer);
+        Map<String, Object> locals = getLocalsFromJson(buffer);
+        Map<String, Object> listLocalField = (Map<String, Object>) locals.get("listLocal");
+        Map<String, Object> listLocalFieldFields = (Map<String, Object>) listLocalField.get(FIELDS);
+        assertTrue(listLocalFieldFields.containsKey("elementData"));
+        assertTrue(listLocalFieldFields.containsKey("size"));
+        assertTrue(listLocalFieldFields.containsKey("modCount"));
+    }
+
+    @Test
+    public void mapValueUnknown() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        CapturedContext.CapturedValue mapLocal =
+                CapturedContext.CapturedValue.of("mapLocal", Map.class.getTypeName(), new HashMap<String, String>() {});
+        context.addLocals(new CapturedContext.CapturedValue[] {mapLocal});
+        snapshot.setExit(context);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("mapValueUnknown: " + buffer);
+        Map<String, Object> locals = getLocalsFromJson(buffer);
+        Map<String, Object> mapLocalField = (Map<String, Object>) locals.get("mapLocal");
+        Map<String, Object> mapLocalFieldFields = (Map<String, Object>) mapLocalField.get(FIELDS);
+        assertTrue(mapLocalFieldFields.containsKey("table"));
+        assertTrue(mapLocalFieldFields.containsKey("size"));
+        assertTrue(mapLocalFieldFields.containsKey("threshold"));
+        assertTrue(mapLocalFieldFields.containsKey("loadFactor"));
+    }
+
+    @Test
+    public void mapNullValue() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        Map<String, String> map = new HashMap<>();
+        map.put("foo", null);
+        CapturedContext.CapturedValue mapLocal =
+                CapturedContext.CapturedValue.of("mapLocal", Map.class.getTypeName(), map);
+        context.addLocals(new CapturedContext.CapturedValue[] {mapLocal});
+        snapshot.setExit(context);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("mapNullValue: " + buffer);
+        Map<String, Object> locals = getLocalsFromJson(buffer);
+        List<Object> entries = getMapEntries(locals, "mapLocal");
+        assertEquals(1, entries.size());
+        List<Object> entry = (List<Object>) entries.get(0);
+        assertEquals(2, entry.size());
+        Map<String, Object> value = (Map<String, Object>) entry.get(1);
+        assertEquals(Object.class.getTypeName(), value.get(TYPE));
+        assertTrue((Boolean) value.get(IS_NULL));
+    }
+
+    @Test
+    public void listNullValue() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        List<String> list = new ArrayList<>();
+        list.add("foo");
+        list.add(null);
+        list.add("bar");
+        CapturedContext.CapturedValue listLocal =
+                CapturedContext.CapturedValue.of("listLocal", List.class.getTypeName(), list);
+        context.addLocals(new CapturedContext.CapturedValue[] {listLocal});
+        snapshot.setExit(context);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("listNullValue: " + buffer);
+        Map<String, Object> locals = getLocalsFromJson(buffer);
+        List<Object> elements = getArrayElements(locals, "listLocal");
+        Map<String, Object> nullElement = (Map<String, Object>) elements.get(1);
+        assertEquals(Object.class.getTypeName(), nullElement.get(TYPE));
+        assertTrue((Boolean) nullElement.get(IS_NULL));
+    }
+
+    private Map<String, Object> doLength(int maxLength) throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshotForLength(maxLength);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("doLength" + maxLength + ": " + buffer);
+        return getLocalsFromJson(buffer);
+    }
+
+    @Test
+    public void fieldCount0() throws IOException {
+        assertNull(doFieldCount(0));
+    }
+
+    @Test
+    public void fieldCount3() throws IOException {
+        Map<String, Object> thisArg = doFieldCount(3);
+        Map<String, CapturedContext.CapturedValue> fields =
+                (Map<String, CapturedContext.CapturedValue>) thisArg.get(FIELDS);
+        Assertions.assertEquals(3, fields.size());
+        Assertions.assertEquals(FIELD_COUNT_REASON, thisArg.get(NOT_CAPTURED_REASON));
+    }
+
+    @Test
+    public void fieldCount20() throws IOException {
+        Map<String, Object> thisArg = doFieldCount(20);
+        Assertions.assertEquals(4, ((Map<String, CapturedContext.CapturedValue>) thisArg.get(FIELDS)).size());
+        assertNull(thisArg.get(NOT_CAPTURED_REASON));
+    }
+
+    @Test
+    @Flaky
+    public void timeOut() throws IOException {
+        DebuggerContext.initValueSerializer(new TimeoutSnapshotSerializer(Duration.ofMillis(150)));
+        JsonAdapter<Snapshot> adapter =
+                MoshiHelper.createMoshiSnapshot(Duration.ofMillis(100)).adapter(Snapshot.class);
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        CapturedContext.CapturedValue arg1 = CapturedContext.CapturedValue.of("arg1", "int", 42);
+        CapturedContext.CapturedValue arg2 = CapturedContext.CapturedValue.of("arg2", "int", 42);
+        CapturedContext.CapturedValue arg3 = CapturedContext.CapturedValue.of("arg3", "int", 42);
+        context.addArguments(new CapturedContext.CapturedValue[] {arg1, arg2, arg3});
+        snapshot.setEntry(context);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("timeout: " + buffer);
+        Map<String, Object> json = MoshiHelper.createGenericAdapter().fromJson(buffer);
+        Map<String, Object> capturesJson = (Map<String, Object>) json.get(CAPTURES);
+        Map<String, Object> entryJson = (Map<String, Object>) capturesJson.get(ENTRY);
+        Assertions.assertEquals(TIMEOUT_REASON, entryJson.get(NOT_CAPTURED_REASON));
+    }
+
+    @Test
+    @Flaky
+    public void valueTimeout() throws IOException {
+        DebuggerContext.initValueSerializer(new TimeoutSnapshotSerializer(Duration.of(20, ChronoUnit.MILLIS)));
+        CapturedContext.CapturedValue arg1 =
+                CapturedContext.CapturedValue.of("arg1", Random.class.getTypeName(), new Random(0));
+        arg1.freeze(TimeoutChecker.create(Config.get(), Duration.ofMillis(10)));
+        String buffer = arg1.getStrValue();
+        System.out.println(buffer);
+        Map<String, Object> json = MoshiHelper.createGenericAdapter().fromJson(buffer);
+        Assertions.assertEquals(TIMEOUT_REASON, json.get(NOT_CAPTURED_REASON));
+    }
+
+    enum MyEnum {
+        ONE,
+        TWO,
+        THREE
+    }
+
+    @Test
+    public void enumValues() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        CapturedContext.CapturedValue enumValue =
+                CapturedContext.CapturedValue.of("enumValue", MyEnum.class.getTypeName(), MyEnum.TWO);
+        context.addLocals(new CapturedContext.CapturedValue[] {enumValue});
+        snapshot.setExit(context);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println(buffer);
+        Map<String, Object> locals = getLocalsFromJson(buffer);
+        Map<String, Object> enumValueJson = (Map<String, Object>) locals.get("enumValue");
+        assertEquals("TWO", enumValueJson.get("value"));
+    }
+
+    @Test
+    public void captureExpressions() throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        Map<String, String> map = new HashMap<>();
+        map.put("foo1", "bar1");
+        map.put("foo2", "bar2");
+        map.put("foo3", "bar3");
+        context.addCaptureExpression(CapturedContext.CapturedValue.of("expr1", Map.class.getTypeName(), map));
+        context.addCaptureExpression(
+                CapturedContext.CapturedValue.of("expr2", List.class.getTypeName(), Arrays.asList("1", "2", "3")));
+        context.addCaptureExpression(CapturedContext.CapturedValue.of("expr3", Integer.TYPE.getTypeName(), 42));
+        snapshot.setExit(context);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println(buffer);
+        Map<String, Object> json = MoshiHelper.createGenericAdapter().fromJson(buffer);
+        Map<String, Object> capturesJson = (Map<String, Object>) json.get(CAPTURES);
+        Map<String, Object> returnJson = (Map<String, Object>) capturesJson.get(RETURN);
+        Map<String, Object> captureExpressions = (Map<String, Object>) returnJson.get(CAPTURE_EXPRESSIONS);
+        assertNull(returnJson.get(LOCALS));
+        assertNull(returnJson.get(ARGUMENTS));
+        assertEquals(3, captureExpressions.size());
+        assertMapItems(captureExpressions, "expr1", "foo1", "bar1", "foo2", "bar2", "foo3", "bar3");
+        assertArrayItem(captureExpressions, "expr2", "1", "2", "3");
+        assertPrimitiveValue(captureExpressions, "expr3", Integer.TYPE.getTypeName(), "42");
+    }
+
+    private Map<String, Object> doFieldCount(int maxFieldCount) throws IOException {
+        JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
+        Snapshot snapshot = createSnapshotForFieldCount(maxFieldCount);
+        String buffer = adapter.toJson(snapshot);
+        System.out.println("doFieldCount" + maxFieldCount + ": " + buffer);
+        return getThisFromJson(buffer);
+    }
+
+    private void assertComplexClass(Object obj, String type) {
+        Map<String, Object> objMap = (Map<String, Object>) obj;
+        Assertions.assertEquals(type, objMap.get(TYPE));
+        Assertions.assertTrue(objMap.containsKey(FIELDS));
+    }
+
+    private int getNbElements(Map<String, Object> item, String name) {
+        List<Object> elements = getArrayElements(item, name);
+        return elements.size();
+    }
+
+    private int getNbEntries(Map<String, Object> item, String name) {
+        List<Object> entries = getMapEntries(item, name);
+        return entries.size();
+    }
+
+    private void assertArrayItem(Map<String, Object> item, String name, String... values) {
+        List<Object> elements = getArrayElements(item, name);
+        for (int i = 0; i < values.length; i++) {
+            Map<String, Object> elem = (Map<String, Object>) elements.get(i);
+            Assertions.assertEquals(values[i], elem.get(VALUE));
+        }
+    }
+
+    private List<Object> getArrayElements(Map<String, Object> item, String name) {
+        Map<String, Object> array = (Map<String, Object>) item.get(name);
+        return (List<Object>) array.get(ELEMENTS);
+    }
+
+    private List<Object> getMapEntries(Map<String, Object> item, String name) {
+        Map<String, Object> array = (Map<String, Object>) item.get(name);
+        return (List<Object>) array.get(ENTRIES);
+    }
+
+    private void assertMapItems(Map<String, Object> item, String name, String... expectedValues) {
+        Map<String, Object> field = (Map<String, Object>) item.get(name);
+        List<Object> entries = (List<Object>) field.get(ENTRIES);
+        Assertions.assertEquals(expectedValues.length / 2, entries.size());
+        int index = 0;
+        Map<String, String> tmpMap = new HashMap<>();
+        for (Object obj : entries) {
+            List<Object> entry = (List<Object>) obj;
+            Map<String, Object> key = (Map<String, Object>) entry.get(0);
+            Map<String, Object> value = (Map<String, Object>) entry.get(1);
+            tmpMap.put((String) key.get(VALUE), (String) value.get(VALUE));
+        }
+        index = 0;
+        while (index < expectedValues.length) {
+            String key = expectedValues[index++];
+            String value = expectedValues[index++];
+            Assertions.assertTrue(tmpMap.containsKey(key));
+            Assertions.assertEquals(value, tmpMap.get(key));
+        }
+    }
+
+    private void assertNotCaptured(Map<String, Object> item, String name, String type, String reason) {
+        Map<String, Object> obj = (Map<String, Object>) item.get(name);
+        Assertions.assertEquals(type, obj.get(TYPE));
+        Assertions.assertEquals(reason, obj.get(NOT_CAPTURED_REASON));
+    }
+
+    private void assertTruncated(Map<String, Object> item, String name, String type, String truncated) {
+        Map<String, Object> obj = (Map<String, Object>) item.get(name);
+        Assertions.assertEquals(type, obj.get(TYPE));
+        Assertions.assertEquals(truncated, String.valueOf(obj.get(TRUNCATED)));
+    }
+
+    private void assertSize(Map<String, Object> item, String name, String size) {
+        Map<String, Object> obj = (Map<String, Object>) item.get(name);
+        Assertions.assertEquals(size, String.valueOf(obj.get(SIZE)));
+    }
+
+    private void assertPrimitiveValue(Map<String, Object> item, String name, String type, String value) {
+        Map<String, Object> prim = (Map<String, Object>) item.get(name);
+        Assertions.assertEquals(type, prim.get(TYPE));
+        if (value != null) {
+            Assertions.assertEquals(value, String.valueOf(prim.get(VALUE)));
+        } else {
+            Assertions.assertEquals(true, prim.get(IS_NULL));
+        }
+    }
+
+    private Map<String, Object> getLocalsFromJson(String buffer) throws IOException {
+        Map<String, Object> json = MoshiHelper.createGenericAdapter().fromJson(buffer);
+        Map<String, Object> capturesJson = (Map<String, Object>) json.get(CAPTURES);
+        Map<String, Object> returnJson = (Map<String, Object>) capturesJson.get(RETURN);
+        return (Map<String, Object>) returnJson.get(LOCALS);
+    }
+
+    private Map<String, Object> getFieldsFromJson(String buffer) throws IOException {
+        Map<String, Object> thisArg = getThisFromJson(buffer);
+        return (Map<String, Object>) thisArg.get(FIELDS);
+    }
+
+    private Map<String, Object> getStaticFieldsFromJson(String buffer) throws IOException {
+        Map<String, Object> json = MoshiHelper.createGenericAdapter().fromJson(buffer);
+        Map<String, Object> capturesJson = (Map<String, Object>) json.get(CAPTURES);
+        Map<String, Object> returnJson = (Map<String, Object>) capturesJson.get(RETURN);
+        return (Map<String, Object>) returnJson.get(STATIC_FIELDS);
+    }
+
+    private Map<String, Object> getThisFromJson(String buffer) throws IOException {
+        Map<String, Object> json = MoshiHelper.createGenericAdapter().fromJson(buffer);
+        Map<String, Object> capturesJson = (Map<String, Object>) json.get(CAPTURES);
+        Map<String, Object> returnJson = (Map<String, Object>) capturesJson.get(RETURN);
+        Map<String, Object> arguments = (Map<String, Object>) returnJson.get(ARGUMENTS);
+        return (Map<String, Object>) arguments.get(THIS);
+    }
+
+    private Snapshot createSnapshotForRefDepth(int maxRefDepth) {
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        CapturedContext.CapturedValue fieldHolder =
+                capturedValueDepth(THIS, FieldHolder.class.getTypeName(), new FieldHolder(), maxRefDepth);
+        context.addArguments(new CapturedContext.CapturedValue[] {fieldHolder});
+        CapturedContext.CapturedValue intArg = capturedValueDepth("intArg", "int", 0, maxRefDepth);
+        CapturedContext.CapturedValue strArg =
+                capturedValueDepth("strArg", String.class.getTypeName(), null, maxRefDepth);
+        CapturedContext.CapturedValue objArg =
+                capturedValueDepth("objArg", ComplexClass.class.getTypeName(), null, maxRefDepth);
+        context.addArguments(new CapturedContext.CapturedValue[] {intArg, strArg, objArg});
+        CapturedContext.CapturedValue intLocal = capturedValueDepth("intLocal", "int", 42, maxRefDepth);
+        CapturedContext.CapturedValue objLocal =
+                capturedValueDepth("objLocal", ComplexClass.class.getTypeName(), new ComplexClass(), maxRefDepth);
+        context.addLocals(new CapturedContext.CapturedValue[] {intLocal, objLocal});
+        snapshot.setExit(context);
+        return snapshot;
+    }
+
+    private Snapshot createSnapshotForCollectionSize(int maxColSize) {
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        CapturedContext.CapturedValue intArrayLocal =
+                capturedValueColSize("intArrayLocal", "int[]", new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, maxColSize);
+        CapturedContext.CapturedValue strArrayLocal = capturedValueColSize(
+                "strArrayLocal",
+                String[].class.getTypeName(),
+                new String[] {"foo0", "foo1", "foo2", "foo3", "foo4", "foo5", "foo6", "foo7", "foo8", "foo9"},
+                maxColSize);
+        CapturedContext.CapturedValue objArrayLocal = capturedValueColSize(
+                "objArrayLocal",
+                Object[].class.getTypeName(),
+                new Object[] {
+                    new ComplexClass(),
+                    new ComplexClass(),
+                    new ComplexClass(),
+                    new ComplexClass(),
+                    new ComplexClass(),
+                    new ComplexClass(),
+                    new ComplexClass(),
+                    new ComplexClass(),
+                    new ComplexClass(),
+                    new ComplexClass()
+                },
+                maxColSize);
+        CapturedContext.CapturedValue listLocal = capturedValueColSize(
+                "listLocal",
+                List.class.getTypeName(),
+                new ArrayList<>(
+                        Arrays.asList("foo0", "foo1", "foo2", "foo3", "foo4", "foo5", "foo6", "foo7", "foo8", "foo9")),
+                maxColSize);
+        Map<String, String> mapObj = new HashMap<>();
+        mapObj.put("foo0", "bar0");
+        mapObj.put("foo1", "bar1");
+        mapObj.put("foo2", "bar2");
+        mapObj.put("foo3", "bar3");
+        mapObj.put("foo4", "bar4");
+        mapObj.put("foo5", "bar5");
+        mapObj.put("foo6", "bar6");
+        mapObj.put("foo7", "bar7");
+        mapObj.put("foo8", "bar8");
+        mapObj.put("foo9", "bar9");
+        CapturedContext.CapturedValue mapLocal =
+                capturedValueColSize("mapLocal", Map.class.getTypeName(), mapObj, maxColSize);
+        context.addLocals(
+                new CapturedContext.CapturedValue[] {intArrayLocal, strArrayLocal, objArrayLocal, listLocal, mapLocal});
+        snapshot.setExit(context);
+        return snapshot;
+    }
+
+    private Snapshot createSnapshotForMapSize(int maxColSize) {
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        HashMap<String, String> strMap = new HashMap<>();
+        strMap.put("foo0", "bar0");
+        strMap.put("foo1", "bar1");
+        strMap.put("foo2", "bar2");
+        strMap.put("foo3", "bar3");
+        strMap.put("foo4", "bar4");
+        strMap.put("foo5", "bar5");
+        strMap.put("foo6", "bar6");
+        strMap.put("foo7", "bar7");
+        strMap.put("foo8", "bar8");
+        strMap.put("foo9", "bar9");
+        CapturedContext.CapturedValue map = CapturedContext.CapturedValue.of(
+                "strMap",
+                strMap.getClass().getTypeName(),
+                strMap,
+                Limits.DEFAULT_REFERENCE_DEPTH,
+                maxColSize,
+                Limits.DEFAULT_LENGTH,
+                Limits.DEFAULT_FIELD_COUNT);
+        context.addLocals(new CapturedContext.CapturedValue[] {map});
+        snapshot.setExit(context);
+        return snapshot;
+    }
+
+    private Snapshot createSnapshotForLength(int maxLength) {
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        CapturedContext.CapturedValue strLocal = CapturedContext.CapturedValue.of(
+                "strLocal",
+                String.class.getTypeName(),
+                "0123456789",
+                Limits.DEFAULT_REFERENCE_DEPTH,
+                Limits.DEFAULT_COLLECTION_SIZE,
+                maxLength,
+                Limits.DEFAULT_FIELD_COUNT);
+        context.addLocals(new CapturedContext.CapturedValue[] {strLocal});
+        snapshot.setExit(context);
+        return snapshot;
+    }
+
+    private Snapshot createSnapshotForFieldCount(int maxFieldCount) {
+        Snapshot snapshot = createSnapshot();
+        CapturedContext context = new CapturedContext();
+        context.setLimits(
+                Limits.DEFAULT_REFERENCE_DEPTH, Limits.DEFAULT_COLLECTION_SIZE, Limits.DEFAULT_LENGTH, maxFieldCount);
+        CapturedContext.CapturedValue fieldHolder =
+                capturedValueFieldCount(THIS, FieldHolder.class.getTypeName(), new FieldHolder(), maxFieldCount);
+        context.addArguments(new CapturedContext.CapturedValue[] {fieldHolder});
+        snapshot.setExit(context);
+        return snapshot;
+    }
+
+    private CapturedContext.CapturedValue capturedValueDepth(String name, String type, Object value, int maxDepth) {
+        return CapturedContext.CapturedValue.of(
+                name,
+                type,
+                value,
+                maxDepth,
+                Limits.DEFAULT_COLLECTION_SIZE,
+                Limits.DEFAULT_LENGTH,
+                Limits.DEFAULT_FIELD_COUNT);
+    }
+
+    private CapturedContext.CapturedValue capturedValueColSize(String name, String type, Object value, int maxColSize) {
+        return CapturedContext.CapturedValue.of(
+                name,
+                type,
+                value,
+                Limits.DEFAULT_REFERENCE_DEPTH,
+                maxColSize,
+                Limits.DEFAULT_LENGTH,
+                Limits.DEFAULT_FIELD_COUNT);
+    }
+
+    private CapturedContext.CapturedValue capturedValueFieldCount(
+            String name, String type, Object value, int maxFieldCount) {
+        return CapturedContext.CapturedValue.of(
+                name,
+                type,
+                value,
+                Limits.DEFAULT_REFERENCE_DEPTH,
+                Limits.DEFAULT_COLLECTION_SIZE,
+                Limits.DEFAULT_LENGTH,
+                maxFieldCount);
+    }
+
+    private void assertCapturedFrame(CapturedStackFrame capturedStackFrame, String methodName, int lineNumber) {
+        assertNull(capturedStackFrame.getFileName());
+        Assertions.assertEquals(methodName, capturedStackFrame.getFunction());
+        Assertions.assertEquals(lineNumber, capturedStackFrame.getLineNumber());
+    }
+
+    private Snapshot createSnapshot() {
+        return new Snapshot(
+                Thread.currentThread(),
+                new ProbeImplementation.NoopProbeImplementation(PROBE_ID, PROBE_LOCATION),
+                Limits.DEFAULT_REFERENCE_DEPTH);
+    }
+
+    private static JsonAdapter<Snapshot> createSnapshotAdapter() {
+        return MoshiSnapshotTestHelper.createMoshiSnapshot().adapter(Snapshot.class);
+    }
+
+    private static class TimeoutSnapshotSerializer implements DebuggerContext.ValueSerializer {
+        private final JsonAdapter<CapturedContext.CapturedValue> VALUE_ADAPTER =
+                new MoshiSnapshotHelper.CapturedValueAdapter();
+        private final Duration sleepTime;
+
+        public TimeoutSnapshotSerializer(Duration sleepTime) {
+            this.sleepTime = sleepTime;
+        }
+
+        @Override
+        public String serializeValue(CapturedContext.CapturedValue value) {
+            LockSupport.parkNanos(sleepTime.toNanos());
+            return VALUE_ADAPTER.toJson(value);
+        }
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SourceFileTrackingTransformerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SourceFileTrackingTransformerTest.java
index d6ceea59d4a..e869516de3b 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SourceFileTrackingTransformerTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SourceFileTrackingTransformerTest.java
@@ -16,172 +16,135 @@
 import utils.TestHelper;
 
 class SourceFileTrackingTransformerTest {
-  @Test
-  void transformTopLevel() throws IllegalClassFormatException {
-    TestHelper.setFieldInConfig(
-        Config.get(),
-        "debuggerThirdPartyExcludes",
-        new HashSet<>(Arrays.asList("com.datadog.debugger.agent")));
-    try {
-      ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
-      SourceFileTrackingTransformer sourceFileTrackingTransformer =
-          new SourceFileTrackingTransformer(finder);
-      ConfigurationComparer comparer = createComparer("TopLevelHelper.java");
-      sourceFileTrackingTransformer.transform(
-          null,
-          getInternalName(TopLevelHelper.class),
-          null,
-          null,
-          getClassFileBytes(TopLevelHelper.class));
-      List<Class<?>> changedClasses =
-          finder.getAllLoadedChangedClasses(new Class[] {TopLevelHelper.class}, comparer);
-      assertEquals(1, changedClasses.size());
-      assertEquals(TopLevelHelper.class, changedClasses.get(0));
-      sourceFileTrackingTransformer.transform(
-          null,
-          getInternalName(MyTopLevelClass.class),
-          null,
-          null,
-          getClassFileBytes(MyTopLevelClass.class));
-      sourceFileTrackingTransformer.flush();
-      changedClasses =
-          finder.getAllLoadedChangedClasses(
-              new Class[] {TopLevelHelper.class, MyTopLevelClass.class}, comparer);
-      assertEquals(2, changedClasses.size());
-      assertEquals(TopLevelHelper.class, changedClasses.get(0));
-      assertEquals(MyTopLevelClass.class, changedClasses.get(1));
-    } finally {
-      TestHelper.setFieldInConfig(
-          Config.get(), "debuggerThirdPartyExcludes", Collections.emptySet());
+    @Test
+    void transformTopLevel() throws IllegalClassFormatException {
+        TestHelper.setFieldInConfig(
+                Config.get(), "debuggerThirdPartyExcludes", new HashSet<>(Arrays.asList("com.datadog.debugger.agent")));
+        try {
+            ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
+            SourceFileTrackingTransformer sourceFileTrackingTransformer = new SourceFileTrackingTransformer(finder);
+            ConfigurationComparer comparer = createComparer("TopLevelHelper.java");
+            sourceFileTrackingTransformer.transform(
+                    null, getInternalName(TopLevelHelper.class), null, null, getClassFileBytes(TopLevelHelper.class));
+            List<Class<?>> changedClasses =
+                    finder.getAllLoadedChangedClasses(new Class[] {TopLevelHelper.class}, comparer);
+            assertEquals(1, changedClasses.size());
+            assertEquals(TopLevelHelper.class, changedClasses.get(0));
+            sourceFileTrackingTransformer.transform(
+                    null, getInternalName(MyTopLevelClass.class), null, null, getClassFileBytes(MyTopLevelClass.class));
+            sourceFileTrackingTransformer.flush();
+            changedClasses = finder.getAllLoadedChangedClasses(
+                    new Class[] {TopLevelHelper.class, MyTopLevelClass.class}, comparer);
+            assertEquals(2, changedClasses.size());
+            assertEquals(TopLevelHelper.class, changedClasses.get(0));
+            assertEquals(MyTopLevelClass.class, changedClasses.get(1));
+        } finally {
+            TestHelper.setFieldInConfig(Config.get(), "debuggerThirdPartyExcludes", Collections.emptySet());
+        }
     }
-  }
 
-  @Test
-  void transformInner() throws IllegalClassFormatException {
-    TestHelper.setFieldInConfig(
-        Config.get(),
-        "debuggerThirdPartyExcludes",
-        new HashSet<>(Arrays.asList("com.datadog.debugger.agent")));
-    try {
-      ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
-      SourceFileTrackingTransformer sourceFileTrackingTransformer =
-          new SourceFileTrackingTransformer(finder);
-      ConfigurationComparer comparer = createComparer("InnerHelper.java");
-      sourceFileTrackingTransformer.transform(
-          null,
-          getInternalName(InnerHelper.class),
-          null,
-          null,
-          getClassFileBytes(InnerHelper.class));
-      sourceFileTrackingTransformer.flush();
-      List<Class<?>> changedClasses =
-          finder.getAllLoadedChangedClasses(new Class[] {InnerHelper.class}, comparer);
-      assertEquals(1, changedClasses.size());
-      assertEquals(InnerHelper.class, changedClasses.get(0));
-      sourceFileTrackingTransformer.transform(
-          null,
-          getInternalName(InnerHelper.MyInner.class),
-          null,
-          null,
-          getClassFileBytes(InnerHelper.MyInner.class));
-      sourceFileTrackingTransformer.transform(
-          null,
-          getInternalName(InnerHelper.MySecondInner.class),
-          null,
-          null,
-          getClassFileBytes(InnerHelper.MySecondInner.class));
-      sourceFileTrackingTransformer.flush();
-      changedClasses =
-          finder.getAllLoadedChangedClasses(
-              new Class[] {
-                InnerHelper.class, InnerHelper.MyInner.class, InnerHelper.MySecondInner.class
-              },
-              comparer);
-      assertEquals(3, changedClasses.size());
-      assertEquals(InnerHelper.class, changedClasses.get(0));
-      assertEquals(InnerHelper.MyInner.class, changedClasses.get(1));
-      assertEquals(InnerHelper.MySecondInner.class, changedClasses.get(2));
-    } finally {
-      TestHelper.setFieldInConfig(
-          Config.get(), "debuggerThirdPartyExcludes", Collections.emptySet());
+    @Test
+    void transformInner() throws IllegalClassFormatException {
+        TestHelper.setFieldInConfig(
+                Config.get(), "debuggerThirdPartyExcludes", new HashSet<>(Arrays.asList("com.datadog.debugger.agent")));
+        try {
+            ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
+            SourceFileTrackingTransformer sourceFileTrackingTransformer = new SourceFileTrackingTransformer(finder);
+            ConfigurationComparer comparer = createComparer("InnerHelper.java");
+            sourceFileTrackingTransformer.transform(
+                    null, getInternalName(InnerHelper.class), null, null, getClassFileBytes(InnerHelper.class));
+            sourceFileTrackingTransformer.flush();
+            List<Class<?>> changedClasses =
+                    finder.getAllLoadedChangedClasses(new Class[] {InnerHelper.class}, comparer);
+            assertEquals(1, changedClasses.size());
+            assertEquals(InnerHelper.class, changedClasses.get(0));
+            sourceFileTrackingTransformer.transform(
+                    null,
+                    getInternalName(InnerHelper.MyInner.class),
+                    null,
+                    null,
+                    getClassFileBytes(InnerHelper.MyInner.class));
+            sourceFileTrackingTransformer.transform(
+                    null,
+                    getInternalName(InnerHelper.MySecondInner.class),
+                    null,
+                    null,
+                    getClassFileBytes(InnerHelper.MySecondInner.class));
+            sourceFileTrackingTransformer.flush();
+            changedClasses = finder.getAllLoadedChangedClasses(
+                    new Class[] {InnerHelper.class, InnerHelper.MyInner.class, InnerHelper.MySecondInner.class},
+                    comparer);
+            assertEquals(3, changedClasses.size());
+            assertEquals(InnerHelper.class, changedClasses.get(0));
+            assertEquals(InnerHelper.MyInner.class, changedClasses.get(1));
+            assertEquals(InnerHelper.MySecondInner.class, changedClasses.get(2));
+        } finally {
+            TestHelper.setFieldInConfig(Config.get(), "debuggerThirdPartyExcludes", Collections.emptySet());
+        }
     }
-  }
 
-  @Test
-  void transformNotAllowed() throws IllegalClassFormatException {
-    ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
-    SourceFileTrackingTransformer sourceFileTrackingTransformer =
-        new SourceFileTrackingTransformer(finder);
-    ConfigurationComparer comparer = createComparer("TopLevelHelper.java");
-    byte[] classFileBytes = getClassFileBytes(TopLevelHelper.class);
-    replaceInByteArray(
-        classFileBytes, "TopLevelHelper.java".getBytes(), "TopLevelHelper.cloj".getBytes());
-    sourceFileTrackingTransformer.transform(null, "", null, null, classFileBytes);
-    sourceFileTrackingTransformer.flush();
-    List<Class<?>> changedClasses =
-        finder.getAllLoadedChangedClasses(new Class[] {InnerHelper.class}, comparer);
-    assertEquals(0, finder.getClassNamesBySourceFile().size());
-  }
+    @Test
+    void transformNotAllowed() throws IllegalClassFormatException {
+        ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
+        SourceFileTrackingTransformer sourceFileTrackingTransformer = new SourceFileTrackingTransformer(finder);
+        ConfigurationComparer comparer = createComparer("TopLevelHelper.java");
+        byte[] classFileBytes = getClassFileBytes(TopLevelHelper.class);
+        replaceInByteArray(classFileBytes, "TopLevelHelper.java".getBytes(), "TopLevelHelper.cloj".getBytes());
+        sourceFileTrackingTransformer.transform(null, "", null, null, classFileBytes);
+        sourceFileTrackingTransformer.flush();
+        List<Class<?>> changedClasses = finder.getAllLoadedChangedClasses(new Class[] {InnerHelper.class}, comparer);
+        assertEquals(0, finder.getClassNamesBySourceFile().size());
+    }
 
-  @Test
-  void thirdPartyExcludes() throws IllegalClassFormatException {
-    ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
-    SourceFileTrackingTransformer sourceFileTrackingTransformer =
-        new SourceFileTrackingTransformer(finder);
-    ConfigurationComparer comparer = createComparer("TopLevelHelper.java");
-    sourceFileTrackingTransformer.transform(
-        null,
-        getInternalName(TopLevelHelper.class),
-        null,
-        null,
-        getClassFileBytes(TopLevelHelper.class));
-    sourceFileTrackingTransformer.flush();
-    assertEquals(0, finder.getClassNamesBySourceFile().size());
-  }
+    @Test
+    void thirdPartyExcludes() throws IllegalClassFormatException {
+        ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
+        SourceFileTrackingTransformer sourceFileTrackingTransformer = new SourceFileTrackingTransformer(finder);
+        ConfigurationComparer comparer = createComparer("TopLevelHelper.java");
+        sourceFileTrackingTransformer.transform(
+                null, getInternalName(TopLevelHelper.class), null, null, getClassFileBytes(TopLevelHelper.class));
+        sourceFileTrackingTransformer.flush();
+        assertEquals(0, finder.getClassNamesBySourceFile().size());
+    }
 
-  @Test
-  void maxQueue() throws IllegalClassFormatException {
-    ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
-    SourceFileTrackingTransformer sourceFileTrackingTransformer =
-        new SourceFileTrackingTransformer(finder);
-    for (int i = 0; i < MAX_QUEUE_SIZE + 10; i++) {
-      sourceFileTrackingTransformer.transform(
-          null,
-          getInternalName(TopLevelHelper.class),
-          null,
-          null,
-          getClassFileBytes(TopLevelHelper.class));
+    @Test
+    void maxQueue() throws IllegalClassFormatException {
+        ClassesToRetransformFinder finder = new ClassesToRetransformFinder();
+        SourceFileTrackingTransformer sourceFileTrackingTransformer = new SourceFileTrackingTransformer(finder);
+        for (int i = 0; i < MAX_QUEUE_SIZE + 10; i++) {
+            sourceFileTrackingTransformer.transform(
+                    null, getInternalName(TopLevelHelper.class), null, null, getClassFileBytes(TopLevelHelper.class));
+        }
+        assertEquals(MAX_QUEUE_SIZE, sourceFileTrackingTransformer.getQueueSize());
     }
-    assertEquals(MAX_QUEUE_SIZE, sourceFileTrackingTransformer.getQueueSize());
-  }
 
-  private static void replaceInByteArray(byte[] buffer, byte[] oldBytes, byte[] newBytes) {
-    int oldIdx = 0;
-    for (int i = 0; i < buffer.length; i++) {
-      if (buffer[i] == oldBytes[oldIdx]) {
-        oldIdx++;
-        if (oldIdx == oldBytes.length) {
-          // Found the oldBytes, replace with newBytes
-          System.arraycopy(newBytes, 0, buffer, i - oldIdx + 1, newBytes.length);
-          oldIdx = 0; // Reset for next search
+    private static void replaceInByteArray(byte[] buffer, byte[] oldBytes, byte[] newBytes) {
+        int oldIdx = 0;
+        for (int i = 0; i < buffer.length; i++) {
+            if (buffer[i] == oldBytes[oldIdx]) {
+                oldIdx++;
+                if (oldIdx == oldBytes.length) {
+                    // Found the oldBytes, replace with newBytes
+                    System.arraycopy(newBytes, 0, buffer, i - oldIdx + 1, newBytes.length);
+                    oldIdx = 0; // Reset for next search
+                }
+            } else {
+                oldIdx = 0; // Reset if current byte does not match
+            }
         }
-      } else {
-        oldIdx = 0; // Reset if current byte does not match
-      }
     }
-  }
 
-  private ConfigurationComparer createComparer(String sourceFile) {
-    Configuration emptyConfig = Configuration.builder().setService("service-name").build();
-    Configuration newConfig =
-        Configuration.builder()
-            .setService("service-name")
-            .add(new LogProbe.Builder().probeId("", 1).where(sourceFile, 42).build())
-            .build();
-    return new ConfigurationComparer(emptyConfig, newConfig, new HashMap<>());
-  }
+    private ConfigurationComparer createComparer(String sourceFile) {
+        Configuration emptyConfig =
+                Configuration.builder().setService("service-name").build();
+        Configuration newConfig = Configuration.builder()
+                .setService("service-name")
+                .add(new LogProbe.Builder().probeId("", 1).where(sourceFile, 42).build())
+                .build();
+        return new ConfigurationComparer(emptyConfig, newConfig, new HashMap<>());
+    }
 
-  private String getInternalName(Class<?> clazz) {
-    return clazz.getName().replace('.', '/');
-  }
+    private String getInternalName(Class<?> clazz) {
+        return clazz.getName().replace('.', '/');
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanDecorationProbeInstrumentationTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanDecorationProbeInstrumentationTest.java
index 5ff94e443b4..82f4483cdbd 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanDecorationProbeInstrumentationTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanDecorationProbeInstrumentationTest.java
@@ -57,751 +57,699 @@
 import org.mockito.ArgumentMatchers;
 
 public class SpanDecorationProbeInstrumentationTest extends ProbeInstrumentationTest {
-  private static final String LANGUAGE = "java";
-  private static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
-  private static final ProbeId PROBE_ID1 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f6", 0);
-  private static final ProbeId PROBE_ID2 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f7", 0);
-  private static final ProbeId PROBE_ID3 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
-  private static final ProbeId PROBE_ID4 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f9", 0);
-  private static final ProbeId LINE_PROBE_ID1 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000001", 0);
-  private static final ProbeId LINE_PROBE_ID3 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000003", 0);
-
-  private TestTraceInterceptor traceInterceptor = new TestTraceInterceptor();
-
-  @BeforeEach
-  public void setUp() {
-    CoreTracer tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-    tracer.addTraceInterceptor(traceInterceptor);
-  }
-
-  @Override
-  @AfterEach
-  public void after() {
-    super.after();
-    Redaction.clearUserDefinedTypes();
-    ProbeRateLimiter.resetGlobalRate();
-  }
-
-  @Test
-  public void methodActiveSpanSimpleTag() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    SpanDecorationProbe.Decoration decoration = createDecoration("tag1", "{arg}");
-    installSingleSpanDecoration(
-        CLASS_NAME, ACTIVE, decoration, "process", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(84, result);
-    MutableSpan span = traceInterceptor.getFirstSpan();
-    assertEquals("1", span.getTags().get("tag1"));
-    assertEquals(PROBE_ID.getId(), span.getTags().get("_dd.di.tag1.probe_id"));
-    verify(probeStatusSink).addEmitting(ArgumentMatchers.eq(PROBE_ID));
-  }
-
-  @Test
-  public void methodActiveSpanTagList() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    SpanDecorationProbe.Decoration deco1 = createDecoration("tag1", "{arg}");
-    SpanDecorationProbe.Decoration deco2 = createDecoration("tag2", "{this.intField}");
-    SpanDecorationProbe.Decoration deco3 = createDecoration("tag3", "{strField}");
-    SpanDecorationProbe.Decoration deco4 = createDecoration("tag4", "{strList[1]}");
-    SpanDecorationProbe.Decoration deco5 = createDecoration("Tag+5", "{map['foo3']}");
-    installSingleSpanDecoration(
-        CLASS_NAME,
-        ACTIVE,
-        asList(deco1, deco2, deco3, deco4, deco5),
-        "process",
-        "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(84, result);
-    MutableSpan span = traceInterceptor.getFirstSpan();
-    assertEquals("1", span.getTags().get("tag1"));
-    assertEquals("42", span.getTags().get("tag2"));
-    assertEquals("hello", span.getTags().get("tag3"));
-    assertEquals("foobar2", span.getTags().get("tag4"));
-    assertEquals("bar3", span.getTags().get("tag_5")); // tag name sanitized
-  }
-
-  @Test
-  public void methodRootSpanTagList() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
-    SpanDecorationProbe.Decoration deco1 = createDecoration("tag1", "{arg}");
-    SpanDecorationProbe.Decoration deco2 = createDecoration("tag2", "{this.intField}");
-    SpanDecorationProbe.Decoration deco3 = createDecoration("tag3", "{strField}");
-    SpanDecorationProbe.Decoration deco4 = createDecoration("tag4", "{@return}");
-    installSingleSpanDecoration(
-        CLASS_NAME, ROOT, asList(deco1, deco2, deco3, deco4), "process3", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(45, result);
-    assertEquals(4, traceInterceptor.getTrace().size());
-    MutableSpan span = traceInterceptor.getFirstSpan();
-    assertEquals("1", span.getTags().get("tag1"));
-    assertEquals("42", span.getTags().get("tag2"));
-    assertEquals("hello", span.getTags().get("tag3"));
-    assertEquals("42", span.getTags().get("tag4"));
-  }
-
-  @Test
-  public void methodActiveSpanCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    SpanDecorationProbe.Decoration decoration =
-        createDecoration(eq(ref("arg"), value("5")), "arg == '5'", "tag1", "{arg}");
-    installSingleSpanDecoration(
-        CLASS_NAME, ACTIVE, decoration, "process", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    for (int i = 0; i < 10; i++) {
-      int result = Reflect.on(testClass).call("main", String.valueOf(i)).get();
-      assertEquals(84, result);
-    }
-    assertEquals(10, traceInterceptor.getAllTraces().size());
-    MutableSpan span = traceInterceptor.getAllTraces().get(5).get(0);
-    assertEquals("5", span.getTags().get("tag1"));
-  }
-
-  @Test
-  public void methodActiveSpanConditionFalse() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    SpanDecorationProbe.Decoration decoration =
-        createDecoration(eq(ref("arg"), value("5")), "arg == '5'", "tag1", "{arg}");
-    installSingleSpanDecoration(
-        CLASS_NAME, ACTIVE, decoration, "process", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "0").get();
-    assertEquals(84, result);
-    assertEquals(1, traceInterceptor.getAllTraces().size());
-    MutableSpan span = traceInterceptor.getAllTraces().get(0).get(0);
-    // probe executed, but no tag set
-    assertFalse(span.getTags().containsKey("tag1"));
-    // EMITTING status is not sent
-    verify(probeStatusSink, times(0)).addEmitting(ArgumentMatchers.eq(PROBE_ID));
-  }
-
-  @Test
-  public void methodTagEvalError() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    SpanDecorationProbe.Decoration decoration = createDecoration("tag1", "{noarg}");
-    installSingleSpanDecoration(
-        CLASS_NAME, ACTIVE, decoration, "process", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(84, result);
-    MutableSpan span = traceInterceptor.getFirstSpan();
-    assertNull(span.getTags().get("tag1"));
-    assertEquals(
-        "Cannot dereference field: noarg", span.getTags().get("_dd.di.tag1.evaluation_error"));
-    assertEquals(1, mockSink.getSnapshots().size());
-    Snapshot snapshot = mockSink.getSnapshots().get(0);
-    assertEquals(1, snapshot.getEvaluationErrors().size());
-    assertEquals(
-        "Cannot dereference field: noarg", snapshot.getEvaluationErrors().get(0).getMessage());
-  }
-
-  @Test
-  public void methodActiveSpanInvalidCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    SpanDecorationProbe.Decoration decoration =
-        createDecoration(eq(ref("noarg"), value("5")), "noarg == '5'", "tag1", "{arg}");
-    installSingleSpanDecoration(
-        CLASS_NAME, ACTIVE, decoration, "process", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "5").get();
-    assertEquals(84, result);
-    assertFalse(traceInterceptor.getFirstSpan().getTags().containsKey("tag1"));
-    assertEquals(1, mockSink.getSnapshots().size());
-    Snapshot snapshot = mockSink.getSnapshots().get(0);
-    assertEquals(1, snapshot.getEvaluationErrors().size());
-    assertEquals(
-        "Cannot dereference field: noarg", snapshot.getEvaluationErrors().get(0).getMessage());
-  }
-
-  @Test
-  public void methodActiveSpanSynthReturn() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    SpanDecorationProbe.Decoration decoration =
-        createDecoration(gt(ref("@return"), value(0)), "@return > '0", "tag1", "{@return}");
-    installSingleSpanDecoration(
-        CLASS_NAME, ACTIVE, decoration, "process", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "5").get();
-    assertEquals(84, result);
-    MutableSpan span = traceInterceptor.getFirstSpan();
-    assertEquals("84", span.getTags().get("tag1"));
-  }
-
-  @Test
-  public void methodActiveSpanSynthDuration() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    SpanDecorationProbe.Decoration decoration =
-        createDecoration(gt(ref("@duration"), value(0)), "@return > 0", "tag1", "{@duration}");
-    installSingleSpanDecoration(
-        CLASS_NAME, ACTIVE, decoration, "process", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "5").get();
-    assertEquals(84, result);
-    MutableSpan span = traceInterceptor.getFirstSpan();
-    assertTrue(Double.parseDouble((String) span.getTags().get("tag1")) > 0);
-  }
-
-  @Test
-  public void methodActiveSpanSynthException() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    SpanDecorationProbe.Decoration decoration =
-        createDecoration(
-            eq(getMember(ref("@exception"), "detailMessage"), value("oops")),
-            "@exception.detailMessage == 'oops'",
-            "tag1",
-            "{@exception.detailMessage}");
-    installSingleSpanDecoration(
-        CLASS_NAME, ACTIVE, decoration, "processWithException", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    try {
-      Reflect.on(testClass).call("main", "exception").get();
-      Assertions.fail("should not reach this code");
-    } catch (RuntimeException ex) {
-      assertEquals("oops", ex.getCause().getCause().getMessage());
-    }
-    MutableSpan span = traceInterceptor.getFirstSpan();
-    assertEquals("oops", span.getTags().get("tag1"));
-  }
-
-  @Test
-  public void lineActiveSpanSimpleTag() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    SpanDecorationProbe.Decoration decoration = createDecoration("tag1", "{arg}");
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    installSingleSpanDecoration(
-        LINE_PROBE_ID1, CLASS_NAME, ACTIVE, decoration, "CapturedSnapshot20.java", line);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(84, result);
-    MutableSpan span = traceInterceptor.getFirstSpan();
-    assertEquals("1", span.getTags().get("tag1"));
-    assertEquals(LINE_PROBE_ID1.getId(), span.getTags().get("_dd.di.tag1.probe_id"));
-    verify(probeStatusSink).addEmitting(ArgumentMatchers.eq(LINE_PROBE_ID1));
-  }
-
-  @Test
-  public void lineRootSpanTagList() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
-    SpanDecorationProbe.Decoration deco1 = createDecoration("tag1", "{arg}");
-    SpanDecorationProbe.Decoration deco2 = createDecoration("tag2", "{this.intField}");
-    SpanDecorationProbe.Decoration deco3 = createDecoration("tag3", "{strField}");
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID3);
-    installSingleSpanDecoration(
-        LINE_PROBE_ID3,
-        CLASS_NAME,
-        ROOT,
-        asList(deco1, deco2, deco3),
-        "CapturedSnapshot21.java",
-        line);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(45, result);
-    assertEquals(4, traceInterceptor.getTrace().size());
-    MutableSpan span = traceInterceptor.getFirstSpan();
-    assertEquals("1", span.getTags().get("tag1"));
-    assertEquals("42", span.getTags().get("tag2"));
-    assertEquals("hello", span.getTags().get("tag3"));
-  }
-
-  @Test
-  public void lineActiveSpanCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    SpanDecorationProbe.Decoration decoration =
-        createDecoration(eq(ref("arg"), value("5")), "arg == '5'", "tag1", "{arg}");
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    installSingleSpanDecoration(
-        LINE_PROBE_ID1, CLASS_NAME, ACTIVE, decoration, "CapturedSnapshot20.java", line);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    for (int i = 0; i < 10; i++) {
-      int result = Reflect.on(testClass).call("main", String.valueOf(i)).get();
-      assertEquals(84, result);
-    }
-    assertEquals(10, traceInterceptor.getAllTraces().size());
-    MutableSpan span = traceInterceptor.getAllTraces().get(5).get(0);
-    assertEquals("5", span.getTags().get("tag1"));
-  }
-
-  @Test
-  public void lineActiveSpanInvalidCondition() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    SpanDecorationProbe.Decoration decoration =
-        createDecoration(eq(ref("noarg"), value("5")), "arg == '5'", "tag1", "{arg}");
-    int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
-    installSingleSpanDecoration(
-        LINE_PROBE_ID1, CLASS_NAME, ACTIVE, decoration, "CapturedSnapshot20.java", line);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "5").get();
-    assertEquals(84, result);
-    assertFalse(traceInterceptor.getFirstSpan().getTags().containsKey("tag1"));
-    assertEquals(1, mockSink.getSnapshots().size());
-    Snapshot snapshot = mockSink.getSnapshots().get(0);
-    assertEquals(1, snapshot.getEvaluationErrors().size());
-    assertEquals(
-        "Cannot dereference field: noarg", snapshot.getEvaluationErrors().get(0).getMessage());
-  }
-
-  @Test
-  public void nullActiveSpan() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    SpanDecorationProbe.Decoration decoration = createDecoration("tag1", "{arg}");
-    installSingleSpanDecoration(CLASS_NAME, ACTIVE, decoration, "main", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertEquals(0, traceInterceptor.getAllTraces().size());
-  }
-
-  @Test
-  public void mixedWithLogProbes() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    SpanDecorationProbe.Decoration decoration1 = createDecoration("tag1", "{intLocal}");
-    SpanDecorationProbe.Decoration decoration2 = createDecoration("tag2", "{arg}");
-    SpanDecorationProbe spanDecoProbe1 =
-        createProbeBuilder(
-                PROBE_ID1, ACTIVE, singletonList(decoration1), CLASS_NAME, "process", null)
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    SpanDecorationProbe spanDecoProbe2 =
-        createProbeBuilder(
-                PROBE_ID2, ACTIVE, singletonList(decoration2), CLASS_NAME, "process", null)
-            .evaluateAt(MethodLocation.ENTRY)
-            .build();
-    LogProbe logProbe1 =
-        LogProbe.builder()
-            .probeId(PROBE_ID3)
-            .where(CLASS_NAME, "process")
-            .captureSnapshot(true)
-            .capture(1, 50, 50, 10)
-            .build();
-    LogProbe logProbe2 =
-        LogProbe.builder()
-            .probeId(PROBE_ID4)
-            .where(CLASS_NAME, "process")
-            .captureSnapshot(true)
-            .capture(5, 200, 200, 30)
-            .build();
-    Configuration configuration =
-        Configuration.builder()
-            .setService(SERVICE_NAME)
-            .add(logProbe1)
-            .add(logProbe2)
-            .add(spanDecoProbe1)
-            .add(spanDecoProbe2)
-            .build();
-    installSpanDecorationProbes(CLASS_NAME, configuration);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(84, result);
-    MutableSpan span = traceInterceptor.getFirstSpan();
-    assertEquals("84", span.getTags().get("tag1"));
-    assertEquals(PROBE_ID1.getId(), span.getTags().get("_dd.di.tag1.probe_id"));
-    assertEquals("1", span.getTags().get("tag2"));
-    assertEquals(PROBE_ID2.getId(), span.getTags().get("_dd.di.tag2.probe_id"));
-    List<Snapshot> snapshots = mockSink.getSnapshots();
-    assertEquals(2, snapshots.size());
-    CapturedContext.CapturedValue intLocal =
-        snapshots.get(0).getCaptures().getReturn().getLocals().get("intLocal");
-    assertNotNull(intLocal);
-  }
-
-  @Test
-  public void mixedEntryExit() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    SpanDecorationProbe.Decoration decoration1 = createDecoration("tag1", "{intLocal}");
-    SpanDecorationProbe.Decoration decoration2 = createDecoration("tag2", "{arg}");
-    SpanDecorationProbe spanDecoProbe1 =
-        createProbeBuilder(
-                PROBE_ID1, ACTIVE, singletonList(decoration1), CLASS_NAME, "process", null)
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    SpanDecorationProbe spanDecoProbe2 =
-        createProbeBuilder(
-                PROBE_ID2, ACTIVE, singletonList(decoration2), CLASS_NAME, "process", null)
-            .evaluateAt(MethodLocation.ENTRY)
-            .build();
-    Configuration configuration =
-        Configuration.builder()
-            .setService(SERVICE_NAME)
-            .add(spanDecoProbe1)
-            .add(spanDecoProbe2)
-            .build();
-    installSpanDecorationProbes(CLASS_NAME, configuration);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(84, result);
-    MutableSpan span = traceInterceptor.getFirstSpan();
-    assertEquals("84", span.getTags().get("tag1"));
-    assertEquals("1", span.getTags().get("tag2"));
-  }
-
-  @Test
-  public void keywordRedaction() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot28";
-    SpanDecorationProbe.Decoration decoration1 = createDecoration("tag1", "{password}");
-    SpanDecorationProbe.Decoration decoration2 = createDecoration("tag2", "{this.password}");
-    SpanDecorationProbe.Decoration decoration3 = createDecoration("tag3", "{strMap['password']}");
-    List<SpanDecorationProbe.Decoration> decorations =
-        asList(decoration1, decoration2, decoration3);
-    installSingleSpanDecoration(
-        CLASS_NAME, ACTIVE, decorations, "process", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "secret123").get();
-    assertEquals(42, result);
-    MutableSpan span = traceInterceptor.getFirstSpan();
-    assertFalse(span.getTags().containsKey("tag1"));
-    assertEquals(PROBE_ID.getId(), span.getTags().get("_dd.di.tag1.probe_id"));
-    assertEquals(
-        "Could not evaluate the expression because 'password' was redacted",
-        span.getTags().get("_dd.di.tag1.evaluation_error"));
-    assertFalse(span.getTags().containsKey("tag2"));
-    assertEquals(PROBE_ID.getId(), span.getTags().get("_dd.di.tag2.probe_id"));
-    assertEquals(
-        "Could not evaluate the expression because 'this.password' was redacted",
-        span.getTags().get("_dd.di.tag2.evaluation_error"));
-    assertFalse(span.getTags().containsKey("tag3"));
-    assertEquals(PROBE_ID.getId(), span.getTags().get("_dd.di.tag3.probe_id"));
-    assertEquals(
-        "Could not evaluate the expression because 'strMap[\"password\"]' was redacted",
-        span.getTags().get("_dd.di.tag3.evaluation_error"));
-  }
-
-  @Test
-  public void keywordRedactionConditions() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot28";
-    SpanDecorationProbe.Decoration decoration1 =
-        createDecoration(
-            DSL.contains(DSL.getMember(DSL.ref("this"), "password"), new StringValue("123")),
-            "contains(this.password, '123')",
-            "tag1",
-            "foo");
-    SpanDecorationProbe.Decoration decoration2 =
-        createDecoration(
-            DSL.eq(DSL.ref("password"), DSL.value("123")), "password == '123'", "tag2", "foo");
-    SpanDecorationProbe.Decoration decoration3 =
-        createDecoration(
-            DSL.eq(DSL.index(DSL.ref("strMap"), DSL.value("password")), DSL.value("123")),
-            "strMap['password'] == '123'",
-            "tag3",
-            "foo");
-    List<SpanDecorationProbe.Decoration> decorations =
-        asList(decoration1, decoration2, decoration3);
-    installSingleSpanDecoration(
-        CLASS_NAME, ACTIVE, decorations, "process", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "secret123").get();
-    assertEquals(42, result);
-    assertFalse(traceInterceptor.getFirstSpan().getTags().containsKey("tag1"));
-    assertFalse(traceInterceptor.getFirstSpan().getTags().containsKey("tag2"));
-    assertFalse(traceInterceptor.getFirstSpan().getTags().containsKey("tag3"));
-    assertEquals(1, mockSink.getSnapshots().size());
-    Snapshot snapshot = mockSink.getSnapshots().get(0);
-    assertEquals(3, snapshot.getEvaluationErrors().size());
-    assertEquals(
-        "Could not evaluate the expression because 'this.password' was redacted",
-        snapshot.getEvaluationErrors().get(0).getMessage());
-    assertEquals(
-        "Could not evaluate the expression because 'password' was redacted",
-        snapshot.getEvaluationErrors().get(1).getMessage());
-    assertEquals(
-        "Could not evaluate the expression because 'strMap[\"password\"]' was redacted",
-        snapshot.getEvaluationErrors().get(2).getMessage());
-  }
-
-  @Test
-  public void typeRedaction() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot28";
-    Config config = mock(Config.class);
-    when(config.getDynamicInstrumentationRedactedTypes())
-        .thenReturn("com.datadog.debugger.CapturedSnapshot28$Creds");
-    Redaction.addUserDefinedTypes(config);
-    SpanDecorationProbe.Decoration decoration1 = createDecoration("tag1", "{creds}");
-    SpanDecorationProbe.Decoration decoration2 = createDecoration("tag2", "{this.creds}");
-    SpanDecorationProbe.Decoration decoration3 = createDecoration("tag3", "{credMap['dave']}");
-    List<SpanDecorationProbe.Decoration> decorations =
-        asList(decoration1, decoration2, decoration3);
-    installSingleSpanDecoration(
-        CLASS_NAME, ACTIVE, decorations, "process", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "secret123").get();
-    assertEquals(42, result);
-    MutableSpan span = traceInterceptor.getFirstSpan();
-    assertFalse(span.getTags().containsKey("tag1"));
-    assertEquals(PROBE_ID.getId(), span.getTags().get("_dd.di.tag1.probe_id"));
-    assertEquals(
-        "Could not evaluate the expression because 'creds' was redacted",
-        span.getTags().get("_dd.di.tag1.evaluation_error"));
-    assertFalse(span.getTags().containsKey("tag2"));
-    assertEquals(PROBE_ID.getId(), span.getTags().get("_dd.di.tag2.probe_id"));
-    assertEquals(
-        "Could not evaluate the expression because 'this.creds' was redacted",
-        span.getTags().get("_dd.di.tag2.evaluation_error"));
-    assertFalse(span.getTags().containsKey("tag3"));
-    assertEquals(PROBE_ID.getId(), span.getTags().get("_dd.di.tag3.probe_id"));
-    assertEquals(
-        "Could not evaluate the expression because 'credMap[\"dave\"]' was redacted",
-        span.getTags().get("_dd.di.tag3.evaluation_error"));
-  }
-
-  @Test
-  public void typeRedactionConditions() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot28";
-    Config config = mock(Config.class);
-    when(config.getDynamicInstrumentationRedactedTypes())
-        .thenReturn("com.datadog.debugger.CapturedSnapshot28$Creds");
-    Redaction.addUserDefinedTypes(config);
-    SpanDecorationProbe.Decoration decoration1 =
-        createDecoration(
-            DSL.contains(
-                DSL.getMember(DSL.getMember(DSL.ref("this"), "creds"), "secretCode"),
-                new StringValue("123")),
-            "contains(this.creds.secretCode, '123')",
-            "tag1",
-            "foo");
-    SpanDecorationProbe.Decoration decoration2 =
-        createDecoration(
-            DSL.eq(DSL.getMember(DSL.ref("creds"), "secretCode"), DSL.value("123")),
-            "creds.secretCode == '123'",
-            "tag2",
-            "foo");
-    SpanDecorationProbe.Decoration decoration3 =
-        createDecoration(
-            DSL.eq(DSL.index(DSL.ref("credMap"), DSL.value("dave")), DSL.value("123")),
-            "credMap['dave'] == '123'",
-            "tag3",
-            "foo");
-    List<SpanDecorationProbe.Decoration> decorations =
-        asList(decoration1, decoration2, decoration3);
-    installSingleSpanDecoration(
-        CLASS_NAME, ACTIVE, decorations, "process", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "secret123").get();
-    assertEquals(42, result);
-    assertFalse(traceInterceptor.getFirstSpan().getTags().containsKey("tag1"));
-    assertFalse(traceInterceptor.getFirstSpan().getTags().containsKey("tag2"));
-    assertFalse(traceInterceptor.getFirstSpan().getTags().containsKey("tag3"));
-    assertEquals(1, mockSink.getSnapshots().size());
-    Snapshot snapshot = mockSink.getSnapshots().get(0);
-    assertEquals(3, snapshot.getEvaluationErrors().size());
-    assertEquals(
-        "Could not evaluate the expression because 'this.creds' was redacted",
-        snapshot.getEvaluationErrors().get(0).getMessage());
-    assertEquals(
-        "Could not evaluate the expression because 'creds' was redacted",
-        snapshot.getEvaluationErrors().get(1).getMessage());
-    assertEquals(
-        "Could not evaluate the expression because 'credMap[\"dave\"]' was redacted",
-        snapshot.getEvaluationErrors().get(2).getMessage());
-  }
-
-  @Test
-  public void ensureCallingSamplingTagEvalError() throws IOException, URISyntaxException {
-    doSamplingTest(this::methodTagEvalError, 1, 1);
-  }
-
-  @Test
-  public void ensureCallingSamplingMethodInvalidCondition() throws IOException, URISyntaxException {
-    doSamplingTest(this::methodActiveSpanInvalidCondition, 1, 1);
-  }
-
-  @Test
-  public void ensureCallingSamplingLineInvalidCondition() throws IOException, URISyntaxException {
-    doSamplingTest(this::lineActiveSpanInvalidCondition, 1, 1);
-  }
-
-  @Test
-  public void ensureCallingSamplingKeywordRedactionConditions()
-      throws IOException, URISyntaxException {
-    doSamplingTest(this::keywordRedactionConditions, 1, 1);
-  }
-
-  private void doSamplingTest(
-      CapturingTestBase.TestMethod testRun, int expectedGlobalCount, int expectedProbeCount)
-      throws IOException, URISyntaxException {
-    MockSampler probeSampler = new MockSampler();
-    MockSampler globalSampler = new MockSampler();
-    ProbeRateLimiter.setSamplerSupplier(rate -> rate < 101 ? probeSampler : globalSampler);
-    ProbeRateLimiter.setGlobalSnapshotRate(1000);
-    try {
-      testRun.run();
-    } finally {
-      ProbeRateLimiter.setSamplerSupplier(null);
-    }
-    assertEquals(expectedGlobalCount, globalSampler.getCallCount());
-    assertEquals(expectedProbeCount, probeSampler.getCallCount());
-  }
-
-  private SpanDecorationProbe.Decoration createDecoration(String tagName, String valueDsl) {
-    List<SpanDecorationProbe.Tag> tags =
-        asList(
-            new SpanDecorationProbe.Tag(
+    private static final String LANGUAGE = "java";
+    private static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
+    private static final ProbeId PROBE_ID1 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f6", 0);
+    private static final ProbeId PROBE_ID2 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f7", 0);
+    private static final ProbeId PROBE_ID3 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
+    private static final ProbeId PROBE_ID4 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f9", 0);
+    private static final ProbeId LINE_PROBE_ID1 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000001", 0);
+    private static final ProbeId LINE_PROBE_ID3 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000003", 0);
+
+    private TestTraceInterceptor traceInterceptor = new TestTraceInterceptor();
+
+    @BeforeEach
+    public void setUp() {
+        CoreTracer tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+        tracer.addTraceInterceptor(traceInterceptor);
+    }
+
+    @Override
+    @AfterEach
+    public void after() {
+        super.after();
+        Redaction.clearUserDefinedTypes();
+        ProbeRateLimiter.resetGlobalRate();
+    }
+
+    @Test
+    public void methodActiveSpanSimpleTag() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        SpanDecorationProbe.Decoration decoration = createDecoration("tag1", "{arg}");
+        installSingleSpanDecoration(CLASS_NAME, ACTIVE, decoration, "process", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(84, result);
+        MutableSpan span = traceInterceptor.getFirstSpan();
+        assertEquals("1", span.getTags().get("tag1"));
+        assertEquals(PROBE_ID.getId(), span.getTags().get("_dd.di.tag1.probe_id"));
+        verify(probeStatusSink).addEmitting(ArgumentMatchers.eq(PROBE_ID));
+    }
+
+    @Test
+    public void methodActiveSpanTagList() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        SpanDecorationProbe.Decoration deco1 = createDecoration("tag1", "{arg}");
+        SpanDecorationProbe.Decoration deco2 = createDecoration("tag2", "{this.intField}");
+        SpanDecorationProbe.Decoration deco3 = createDecoration("tag3", "{strField}");
+        SpanDecorationProbe.Decoration deco4 = createDecoration("tag4", "{strList[1]}");
+        SpanDecorationProbe.Decoration deco5 = createDecoration("Tag+5", "{map['foo3']}");
+        installSingleSpanDecoration(
+                CLASS_NAME, ACTIVE, asList(deco1, deco2, deco3, deco4, deco5), "process", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(84, result);
+        MutableSpan span = traceInterceptor.getFirstSpan();
+        assertEquals("1", span.getTags().get("tag1"));
+        assertEquals("42", span.getTags().get("tag2"));
+        assertEquals("hello", span.getTags().get("tag3"));
+        assertEquals("foobar2", span.getTags().get("tag4"));
+        assertEquals("bar3", span.getTags().get("tag_5")); // tag name sanitized
+    }
+
+    @Test
+    public void methodRootSpanTagList() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
+        SpanDecorationProbe.Decoration deco1 = createDecoration("tag1", "{arg}");
+        SpanDecorationProbe.Decoration deco2 = createDecoration("tag2", "{this.intField}");
+        SpanDecorationProbe.Decoration deco3 = createDecoration("tag3", "{strField}");
+        SpanDecorationProbe.Decoration deco4 = createDecoration("tag4", "{@return}");
+        installSingleSpanDecoration(
+                CLASS_NAME, ROOT, asList(deco1, deco2, deco3, deco4), "process3", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(45, result);
+        assertEquals(4, traceInterceptor.getTrace().size());
+        MutableSpan span = traceInterceptor.getFirstSpan();
+        assertEquals("1", span.getTags().get("tag1"));
+        assertEquals("42", span.getTags().get("tag2"));
+        assertEquals("hello", span.getTags().get("tag3"));
+        assertEquals("42", span.getTags().get("tag4"));
+    }
+
+    @Test
+    public void methodActiveSpanCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        SpanDecorationProbe.Decoration decoration =
+                createDecoration(eq(ref("arg"), value("5")), "arg == '5'", "tag1", "{arg}");
+        installSingleSpanDecoration(CLASS_NAME, ACTIVE, decoration, "process", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        for (int i = 0; i < 10; i++) {
+            int result = Reflect.on(testClass).call("main", String.valueOf(i)).get();
+            assertEquals(84, result);
+        }
+        assertEquals(10, traceInterceptor.getAllTraces().size());
+        MutableSpan span = traceInterceptor.getAllTraces().get(5).get(0);
+        assertEquals("5", span.getTags().get("tag1"));
+    }
+
+    @Test
+    public void methodActiveSpanConditionFalse() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        SpanDecorationProbe.Decoration decoration =
+                createDecoration(eq(ref("arg"), value("5")), "arg == '5'", "tag1", "{arg}");
+        installSingleSpanDecoration(CLASS_NAME, ACTIVE, decoration, "process", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "0").get();
+        assertEquals(84, result);
+        assertEquals(1, traceInterceptor.getAllTraces().size());
+        MutableSpan span = traceInterceptor.getAllTraces().get(0).get(0);
+        // probe executed, but no tag set
+        assertFalse(span.getTags().containsKey("tag1"));
+        // EMITTING status is not sent
+        verify(probeStatusSink, times(0)).addEmitting(ArgumentMatchers.eq(PROBE_ID));
+    }
+
+    @Test
+    public void methodTagEvalError() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        SpanDecorationProbe.Decoration decoration = createDecoration("tag1", "{noarg}");
+        installSingleSpanDecoration(CLASS_NAME, ACTIVE, decoration, "process", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(84, result);
+        MutableSpan span = traceInterceptor.getFirstSpan();
+        assertNull(span.getTags().get("tag1"));
+        assertEquals("Cannot dereference field: noarg", span.getTags().get("_dd.di.tag1.evaluation_error"));
+        assertEquals(1, mockSink.getSnapshots().size());
+        Snapshot snapshot = mockSink.getSnapshots().get(0);
+        assertEquals(1, snapshot.getEvaluationErrors().size());
+        assertEquals(
+                "Cannot dereference field: noarg",
+                snapshot.getEvaluationErrors().get(0).getMessage());
+    }
+
+    @Test
+    public void methodActiveSpanInvalidCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        SpanDecorationProbe.Decoration decoration =
+                createDecoration(eq(ref("noarg"), value("5")), "noarg == '5'", "tag1", "{arg}");
+        installSingleSpanDecoration(CLASS_NAME, ACTIVE, decoration, "process", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "5").get();
+        assertEquals(84, result);
+        assertFalse(traceInterceptor.getFirstSpan().getTags().containsKey("tag1"));
+        assertEquals(1, mockSink.getSnapshots().size());
+        Snapshot snapshot = mockSink.getSnapshots().get(0);
+        assertEquals(1, snapshot.getEvaluationErrors().size());
+        assertEquals(
+                "Cannot dereference field: noarg",
+                snapshot.getEvaluationErrors().get(0).getMessage());
+    }
+
+    @Test
+    public void methodActiveSpanSynthReturn() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        SpanDecorationProbe.Decoration decoration =
+                createDecoration(gt(ref("@return"), value(0)), "@return > '0", "tag1", "{@return}");
+        installSingleSpanDecoration(CLASS_NAME, ACTIVE, decoration, "process", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "5").get();
+        assertEquals(84, result);
+        MutableSpan span = traceInterceptor.getFirstSpan();
+        assertEquals("84", span.getTags().get("tag1"));
+    }
+
+    @Test
+    public void methodActiveSpanSynthDuration() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        SpanDecorationProbe.Decoration decoration =
+                createDecoration(gt(ref("@duration"), value(0)), "@return > 0", "tag1", "{@duration}");
+        installSingleSpanDecoration(CLASS_NAME, ACTIVE, decoration, "process", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "5").get();
+        assertEquals(84, result);
+        MutableSpan span = traceInterceptor.getFirstSpan();
+        assertTrue(Double.parseDouble((String) span.getTags().get("tag1")) > 0);
+    }
+
+    @Test
+    public void methodActiveSpanSynthException() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        SpanDecorationProbe.Decoration decoration = createDecoration(
+                eq(getMember(ref("@exception"), "detailMessage"), value("oops")),
+                "@exception.detailMessage == 'oops'",
+                "tag1",
+                "{@exception.detailMessage}");
+        installSingleSpanDecoration(CLASS_NAME, ACTIVE, decoration, "processWithException", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        try {
+            Reflect.on(testClass).call("main", "exception").get();
+            Assertions.fail("should not reach this code");
+        } catch (RuntimeException ex) {
+            assertEquals("oops", ex.getCause().getCause().getMessage());
+        }
+        MutableSpan span = traceInterceptor.getFirstSpan();
+        assertEquals("oops", span.getTags().get("tag1"));
+    }
+
+    @Test
+    public void lineActiveSpanSimpleTag() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        SpanDecorationProbe.Decoration decoration = createDecoration("tag1", "{arg}");
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        installSingleSpanDecoration(LINE_PROBE_ID1, CLASS_NAME, ACTIVE, decoration, "CapturedSnapshot20.java", line);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(84, result);
+        MutableSpan span = traceInterceptor.getFirstSpan();
+        assertEquals("1", span.getTags().get("tag1"));
+        assertEquals(LINE_PROBE_ID1.getId(), span.getTags().get("_dd.di.tag1.probe_id"));
+        verify(probeStatusSink).addEmitting(ArgumentMatchers.eq(LINE_PROBE_ID1));
+    }
+
+    @Test
+    public void lineRootSpanTagList() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot21";
+        SpanDecorationProbe.Decoration deco1 = createDecoration("tag1", "{arg}");
+        SpanDecorationProbe.Decoration deco2 = createDecoration("tag2", "{this.intField}");
+        SpanDecorationProbe.Decoration deco3 = createDecoration("tag3", "{strField}");
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID3);
+        installSingleSpanDecoration(
+                LINE_PROBE_ID3, CLASS_NAME, ROOT, asList(deco1, deco2, deco3), "CapturedSnapshot21.java", line);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(45, result);
+        assertEquals(4, traceInterceptor.getTrace().size());
+        MutableSpan span = traceInterceptor.getFirstSpan();
+        assertEquals("1", span.getTags().get("tag1"));
+        assertEquals("42", span.getTags().get("tag2"));
+        assertEquals("hello", span.getTags().get("tag3"));
+    }
+
+    @Test
+    public void lineActiveSpanCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        SpanDecorationProbe.Decoration decoration =
+                createDecoration(eq(ref("arg"), value("5")), "arg == '5'", "tag1", "{arg}");
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        installSingleSpanDecoration(LINE_PROBE_ID1, CLASS_NAME, ACTIVE, decoration, "CapturedSnapshot20.java", line);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        for (int i = 0; i < 10; i++) {
+            int result = Reflect.on(testClass).call("main", String.valueOf(i)).get();
+            assertEquals(84, result);
+        }
+        assertEquals(10, traceInterceptor.getAllTraces().size());
+        MutableSpan span = traceInterceptor.getAllTraces().get(5).get(0);
+        assertEquals("5", span.getTags().get("tag1"));
+    }
+
+    @Test
+    public void lineActiveSpanInvalidCondition() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        SpanDecorationProbe.Decoration decoration =
+                createDecoration(eq(ref("noarg"), value("5")), "arg == '5'", "tag1", "{arg}");
+        int line = getLineForLineProbe(CLASS_NAME, LINE_PROBE_ID1);
+        installSingleSpanDecoration(LINE_PROBE_ID1, CLASS_NAME, ACTIVE, decoration, "CapturedSnapshot20.java", line);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "5").get();
+        assertEquals(84, result);
+        assertFalse(traceInterceptor.getFirstSpan().getTags().containsKey("tag1"));
+        assertEquals(1, mockSink.getSnapshots().size());
+        Snapshot snapshot = mockSink.getSnapshots().get(0);
+        assertEquals(1, snapshot.getEvaluationErrors().size());
+        assertEquals(
+                "Cannot dereference field: noarg",
+                snapshot.getEvaluationErrors().get(0).getMessage());
+    }
+
+    @Test
+    public void nullActiveSpan() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        SpanDecorationProbe.Decoration decoration = createDecoration("tag1", "{arg}");
+        installSingleSpanDecoration(CLASS_NAME, ACTIVE, decoration, "main", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertEquals(0, traceInterceptor.getAllTraces().size());
+    }
+
+    @Test
+    public void mixedWithLogProbes() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        SpanDecorationProbe.Decoration decoration1 = createDecoration("tag1", "{intLocal}");
+        SpanDecorationProbe.Decoration decoration2 = createDecoration("tag2", "{arg}");
+        SpanDecorationProbe spanDecoProbe1 = createProbeBuilder(
+                        PROBE_ID1, ACTIVE, singletonList(decoration1), CLASS_NAME, "process", null)
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        SpanDecorationProbe spanDecoProbe2 = createProbeBuilder(
+                        PROBE_ID2, ACTIVE, singletonList(decoration2), CLASS_NAME, "process", null)
+                .evaluateAt(MethodLocation.ENTRY)
+                .build();
+        LogProbe logProbe1 = LogProbe.builder()
+                .probeId(PROBE_ID3)
+                .where(CLASS_NAME, "process")
+                .captureSnapshot(true)
+                .capture(1, 50, 50, 10)
+                .build();
+        LogProbe logProbe2 = LogProbe.builder()
+                .probeId(PROBE_ID4)
+                .where(CLASS_NAME, "process")
+                .captureSnapshot(true)
+                .capture(5, 200, 200, 30)
+                .build();
+        Configuration configuration = Configuration.builder()
+                .setService(SERVICE_NAME)
+                .add(logProbe1)
+                .add(logProbe2)
+                .add(spanDecoProbe1)
+                .add(spanDecoProbe2)
+                .build();
+        installSpanDecorationProbes(CLASS_NAME, configuration);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(84, result);
+        MutableSpan span = traceInterceptor.getFirstSpan();
+        assertEquals("84", span.getTags().get("tag1"));
+        assertEquals(PROBE_ID1.getId(), span.getTags().get("_dd.di.tag1.probe_id"));
+        assertEquals("1", span.getTags().get("tag2"));
+        assertEquals(PROBE_ID2.getId(), span.getTags().get("_dd.di.tag2.probe_id"));
+        List<Snapshot> snapshots = mockSink.getSnapshots();
+        assertEquals(2, snapshots.size());
+        CapturedContext.CapturedValue intLocal =
+                snapshots.get(0).getCaptures().getReturn().getLocals().get("intLocal");
+        assertNotNull(intLocal);
+    }
+
+    @Test
+    public void mixedEntryExit() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        SpanDecorationProbe.Decoration decoration1 = createDecoration("tag1", "{intLocal}");
+        SpanDecorationProbe.Decoration decoration2 = createDecoration("tag2", "{arg}");
+        SpanDecorationProbe spanDecoProbe1 = createProbeBuilder(
+                        PROBE_ID1, ACTIVE, singletonList(decoration1), CLASS_NAME, "process", null)
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        SpanDecorationProbe spanDecoProbe2 = createProbeBuilder(
+                        PROBE_ID2, ACTIVE, singletonList(decoration2), CLASS_NAME, "process", null)
+                .evaluateAt(MethodLocation.ENTRY)
+                .build();
+        Configuration configuration = Configuration.builder()
+                .setService(SERVICE_NAME)
+                .add(spanDecoProbe1)
+                .add(spanDecoProbe2)
+                .build();
+        installSpanDecorationProbes(CLASS_NAME, configuration);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(84, result);
+        MutableSpan span = traceInterceptor.getFirstSpan();
+        assertEquals("84", span.getTags().get("tag1"));
+        assertEquals("1", span.getTags().get("tag2"));
+    }
+
+    @Test
+    public void keywordRedaction() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot28";
+        SpanDecorationProbe.Decoration decoration1 = createDecoration("tag1", "{password}");
+        SpanDecorationProbe.Decoration decoration2 = createDecoration("tag2", "{this.password}");
+        SpanDecorationProbe.Decoration decoration3 = createDecoration("tag3", "{strMap['password']}");
+        List<SpanDecorationProbe.Decoration> decorations = asList(decoration1, decoration2, decoration3);
+        installSingleSpanDecoration(CLASS_NAME, ACTIVE, decorations, "process", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "secret123").get();
+        assertEquals(42, result);
+        MutableSpan span = traceInterceptor.getFirstSpan();
+        assertFalse(span.getTags().containsKey("tag1"));
+        assertEquals(PROBE_ID.getId(), span.getTags().get("_dd.di.tag1.probe_id"));
+        assertEquals(
+                "Could not evaluate the expression because 'password' was redacted",
+                span.getTags().get("_dd.di.tag1.evaluation_error"));
+        assertFalse(span.getTags().containsKey("tag2"));
+        assertEquals(PROBE_ID.getId(), span.getTags().get("_dd.di.tag2.probe_id"));
+        assertEquals(
+                "Could not evaluate the expression because 'this.password' was redacted",
+                span.getTags().get("_dd.di.tag2.evaluation_error"));
+        assertFalse(span.getTags().containsKey("tag3"));
+        assertEquals(PROBE_ID.getId(), span.getTags().get("_dd.di.tag3.probe_id"));
+        assertEquals(
+                "Could not evaluate the expression because 'strMap[\"password\"]' was redacted",
+                span.getTags().get("_dd.di.tag3.evaluation_error"));
+    }
+
+    @Test
+    public void keywordRedactionConditions() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot28";
+        SpanDecorationProbe.Decoration decoration1 = createDecoration(
+                DSL.contains(DSL.getMember(DSL.ref("this"), "password"), new StringValue("123")),
+                "contains(this.password, '123')",
+                "tag1",
+                "foo");
+        SpanDecorationProbe.Decoration decoration2 =
+                createDecoration(DSL.eq(DSL.ref("password"), DSL.value("123")), "password == '123'", "tag2", "foo");
+        SpanDecorationProbe.Decoration decoration3 = createDecoration(
+                DSL.eq(DSL.index(DSL.ref("strMap"), DSL.value("password")), DSL.value("123")),
+                "strMap['password'] == '123'",
+                "tag3",
+                "foo");
+        List<SpanDecorationProbe.Decoration> decorations = asList(decoration1, decoration2, decoration3);
+        installSingleSpanDecoration(CLASS_NAME, ACTIVE, decorations, "process", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "secret123").get();
+        assertEquals(42, result);
+        assertFalse(traceInterceptor.getFirstSpan().getTags().containsKey("tag1"));
+        assertFalse(traceInterceptor.getFirstSpan().getTags().containsKey("tag2"));
+        assertFalse(traceInterceptor.getFirstSpan().getTags().containsKey("tag3"));
+        assertEquals(1, mockSink.getSnapshots().size());
+        Snapshot snapshot = mockSink.getSnapshots().get(0);
+        assertEquals(3, snapshot.getEvaluationErrors().size());
+        assertEquals(
+                "Could not evaluate the expression because 'this.password' was redacted",
+                snapshot.getEvaluationErrors().get(0).getMessage());
+        assertEquals(
+                "Could not evaluate the expression because 'password' was redacted",
+                snapshot.getEvaluationErrors().get(1).getMessage());
+        assertEquals(
+                "Could not evaluate the expression because 'strMap[\"password\"]' was redacted",
+                snapshot.getEvaluationErrors().get(2).getMessage());
+    }
+
+    @Test
+    public void typeRedaction() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot28";
+        Config config = mock(Config.class);
+        when(config.getDynamicInstrumentationRedactedTypes())
+                .thenReturn("com.datadog.debugger.CapturedSnapshot28$Creds");
+        Redaction.addUserDefinedTypes(config);
+        SpanDecorationProbe.Decoration decoration1 = createDecoration("tag1", "{creds}");
+        SpanDecorationProbe.Decoration decoration2 = createDecoration("tag2", "{this.creds}");
+        SpanDecorationProbe.Decoration decoration3 = createDecoration("tag3", "{credMap['dave']}");
+        List<SpanDecorationProbe.Decoration> decorations = asList(decoration1, decoration2, decoration3);
+        installSingleSpanDecoration(CLASS_NAME, ACTIVE, decorations, "process", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "secret123").get();
+        assertEquals(42, result);
+        MutableSpan span = traceInterceptor.getFirstSpan();
+        assertFalse(span.getTags().containsKey("tag1"));
+        assertEquals(PROBE_ID.getId(), span.getTags().get("_dd.di.tag1.probe_id"));
+        assertEquals(
+                "Could not evaluate the expression because 'creds' was redacted",
+                span.getTags().get("_dd.di.tag1.evaluation_error"));
+        assertFalse(span.getTags().containsKey("tag2"));
+        assertEquals(PROBE_ID.getId(), span.getTags().get("_dd.di.tag2.probe_id"));
+        assertEquals(
+                "Could not evaluate the expression because 'this.creds' was redacted",
+                span.getTags().get("_dd.di.tag2.evaluation_error"));
+        assertFalse(span.getTags().containsKey("tag3"));
+        assertEquals(PROBE_ID.getId(), span.getTags().get("_dd.di.tag3.probe_id"));
+        assertEquals(
+                "Could not evaluate the expression because 'credMap[\"dave\"]' was redacted",
+                span.getTags().get("_dd.di.tag3.evaluation_error"));
+    }
+
+    @Test
+    public void typeRedactionConditions() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot28";
+        Config config = mock(Config.class);
+        when(config.getDynamicInstrumentationRedactedTypes())
+                .thenReturn("com.datadog.debugger.CapturedSnapshot28$Creds");
+        Redaction.addUserDefinedTypes(config);
+        SpanDecorationProbe.Decoration decoration1 = createDecoration(
+                DSL.contains(
+                        DSL.getMember(DSL.getMember(DSL.ref("this"), "creds"), "secretCode"), new StringValue("123")),
+                "contains(this.creds.secretCode, '123')",
+                "tag1",
+                "foo");
+        SpanDecorationProbe.Decoration decoration2 = createDecoration(
+                DSL.eq(DSL.getMember(DSL.ref("creds"), "secretCode"), DSL.value("123")),
+                "creds.secretCode == '123'",
+                "tag2",
+                "foo");
+        SpanDecorationProbe.Decoration decoration3 = createDecoration(
+                DSL.eq(DSL.index(DSL.ref("credMap"), DSL.value("dave")), DSL.value("123")),
+                "credMap['dave'] == '123'",
+                "tag3",
+                "foo");
+        List<SpanDecorationProbe.Decoration> decorations = asList(decoration1, decoration2, decoration3);
+        installSingleSpanDecoration(CLASS_NAME, ACTIVE, decorations, "process", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "secret123").get();
+        assertEquals(42, result);
+        assertFalse(traceInterceptor.getFirstSpan().getTags().containsKey("tag1"));
+        assertFalse(traceInterceptor.getFirstSpan().getTags().containsKey("tag2"));
+        assertFalse(traceInterceptor.getFirstSpan().getTags().containsKey("tag3"));
+        assertEquals(1, mockSink.getSnapshots().size());
+        Snapshot snapshot = mockSink.getSnapshots().get(0);
+        assertEquals(3, snapshot.getEvaluationErrors().size());
+        assertEquals(
+                "Could not evaluate the expression because 'this.creds' was redacted",
+                snapshot.getEvaluationErrors().get(0).getMessage());
+        assertEquals(
+                "Could not evaluate the expression because 'creds' was redacted",
+                snapshot.getEvaluationErrors().get(1).getMessage());
+        assertEquals(
+                "Could not evaluate the expression because 'credMap[\"dave\"]' was redacted",
+                snapshot.getEvaluationErrors().get(2).getMessage());
+    }
+
+    @Test
+    public void ensureCallingSamplingTagEvalError() throws IOException, URISyntaxException {
+        doSamplingTest(this::methodTagEvalError, 1, 1);
+    }
+
+    @Test
+    public void ensureCallingSamplingMethodInvalidCondition() throws IOException, URISyntaxException {
+        doSamplingTest(this::methodActiveSpanInvalidCondition, 1, 1);
+    }
+
+    @Test
+    public void ensureCallingSamplingLineInvalidCondition() throws IOException, URISyntaxException {
+        doSamplingTest(this::lineActiveSpanInvalidCondition, 1, 1);
+    }
+
+    @Test
+    public void ensureCallingSamplingKeywordRedactionConditions() throws IOException, URISyntaxException {
+        doSamplingTest(this::keywordRedactionConditions, 1, 1);
+    }
+
+    private void doSamplingTest(CapturingTestBase.TestMethod testRun, int expectedGlobalCount, int expectedProbeCount)
+            throws IOException, URISyntaxException {
+        MockSampler probeSampler = new MockSampler();
+        MockSampler globalSampler = new MockSampler();
+        ProbeRateLimiter.setSamplerSupplier(rate -> rate < 101 ? probeSampler : globalSampler);
+        ProbeRateLimiter.setGlobalSnapshotRate(1000);
+        try {
+            testRun.run();
+        } finally {
+            ProbeRateLimiter.setSamplerSupplier(null);
+        }
+        assertEquals(expectedGlobalCount, globalSampler.getCallCount());
+        assertEquals(expectedProbeCount, probeSampler.getCallCount());
+    }
+
+    private SpanDecorationProbe.Decoration createDecoration(String tagName, String valueDsl) {
+        List<SpanDecorationProbe.Tag> tags = asList(new SpanDecorationProbe.Tag(
                 tagName, new SpanDecorationProbe.TagValue(valueDsl, parseTemplate(valueDsl))));
-    return new SpanDecorationProbe.Decoration(null, tags);
-  }
-
-  private SpanDecorationProbe.Decoration createDecoration(
-      BooleanExpression expression, String dsl, String tagName, String valueDsl) {
-    List<SpanDecorationProbe.Tag> tags =
-        asList(
-            new SpanDecorationProbe.Tag(
+        return new SpanDecorationProbe.Decoration(null, tags);
+    }
+
+    private SpanDecorationProbe.Decoration createDecoration(
+            BooleanExpression expression, String dsl, String tagName, String valueDsl) {
+        List<SpanDecorationProbe.Tag> tags = asList(new SpanDecorationProbe.Tag(
                 tagName, new SpanDecorationProbe.TagValue(valueDsl, parseTemplate(valueDsl))));
-    return new SpanDecorationProbe.Decoration(new ProbeCondition(DSL.when(expression), dsl), tags);
-  }
-
-  private void installSingleSpanDecoration(
-      String typeName,
-      SpanDecorationProbe.TargetSpan targetSpan,
-      SpanDecorationProbe.Decoration decoration,
-      String methodName,
-      String signature) {
-    installSingleSpanDecoration(typeName, targetSpan, asList(decoration), methodName, signature);
-  }
-
-  private void installSingleSpanDecoration(
-      ProbeId probeId,
-      String typeName,
-      SpanDecorationProbe.TargetSpan targetSpan,
-      SpanDecorationProbe.Decoration decoration,
-      String sourceFile,
-      int line) {
-    installSingleSpanDecoration(
-        probeId, typeName, targetSpan, asList(decoration), sourceFile, line);
-  }
-
-  private void installSingleSpanDecoration(
-      String typeName,
-      SpanDecorationProbe.TargetSpan targetSpan,
-      List<SpanDecorationProbe.Decoration> decorations,
-      String methodName,
-      String signature) {
-    SpanDecorationProbe probe =
-        createProbe(PROBE_ID, targetSpan, decorations, typeName, methodName, signature);
-    installSpanDecorationProbes(
-        typeName, Configuration.builder().setService(SERVICE_NAME).add(probe).build());
-  }
-
-  private void installSingleSpanDecoration(
-      ProbeId probeId,
-      String typeName,
-      SpanDecorationProbe.TargetSpan targetSpan,
-      List<SpanDecorationProbe.Decoration> decorations,
-      String sourceFile,
-      int line) {
-    SpanDecorationProbe probe = createProbe(probeId, targetSpan, decorations, sourceFile, line);
-    installSpanDecorationProbes(
-        typeName, Configuration.builder().setService(SERVICE_NAME).add(probe).build());
-  }
-
-  private static SpanDecorationProbe createProbe(
-      ProbeId id,
-      SpanDecorationProbe.TargetSpan targetSpan,
-      List<SpanDecorationProbe.Decoration> decorationList,
-      String typeName,
-      String methodName,
-      String signature) {
-    return createProbeBuilder(id, targetSpan, decorationList, typeName, methodName, signature)
-        .evaluateAt(MethodLocation.EXIT)
-        .build();
-  }
-
-  private static SpanDecorationProbe createProbe(
-      ProbeId id,
-      SpanDecorationProbe.TargetSpan targetSpan,
-      List<SpanDecorationProbe.Decoration> decorationList,
-      String sourceFile,
-      int line) {
-    return createProbeBuilder(id, targetSpan, decorationList, sourceFile, line).build();
-  }
-
-  private static SpanDecorationProbe.Builder createProbeBuilder(
-      ProbeId id,
-      SpanDecorationProbe.TargetSpan targetSpan,
-      List<SpanDecorationProbe.Decoration> decorationList,
-      String typeName,
-      String methodName,
-      String signature) {
-    return SpanDecorationProbe.builder()
-        .language(LANGUAGE)
-        .probeId(id)
-        .where(typeName, methodName, signature)
-        .evaluateAt(MethodLocation.EXIT)
-        .targetSpan(targetSpan)
-        .decorations(decorationList);
-  }
-
-  private static SpanDecorationProbe.Builder createProbeBuilder(
-      ProbeId id,
-      SpanDecorationProbe.TargetSpan targetSpan,
-      List<SpanDecorationProbe.Decoration> decorationList,
-      String sourceFile,
-      int line) {
-    return SpanDecorationProbe.builder()
-        .language(LANGUAGE)
-        .probeId(id)
-        .where(sourceFile, line)
-        .evaluateAt(MethodLocation.EXIT)
-        .targetSpan(targetSpan)
-        .decorations(decorationList);
-  }
-
-  private void installSpanProbes(String expectedClassName, SpanDecorationProbe... probes) {
-    installSpanDecorationProbes(
-        expectedClassName, Configuration.builder().setService(SERVICE_NAME).add(probes).build());
-  }
-
-  private void installSpanDecorationProbes(String expectedClassName, Configuration configuration) {
-    Config config = mock(Config.class);
-    when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
-    when(config.isDynamicInstrumentationClassFileDumpEnabled()).thenReturn(true);
-    when(config.getFinalDebuggerSnapshotUrl())
-        .thenReturn("http://localhost:8126/debugger/v1/input");
-    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
-    probeStatusSink = mock(ProbeStatusSink.class);
-    for (ProbeDefinition probe : configuration.getDefinitions()) {
-      if (probe instanceof Sampled) {
-        ((Sampled) probe).initSamplers();
-      }
-    }
-    ProbeMetadata probeMetadata = new ProbeMetadata();
-    currentTransformer =
-        new DebuggerTransformer(
-            config, configuration, null, probeMetadata, new DebuggerSink(config, probeStatusSink));
-    instr.addTransformer(currentTransformer);
-    mockSink = new MockSink(config, probeStatusSink);
-    DebuggerAgentHelper.injectSink(mockSink);
-    DebuggerContext.initProbeResolver(probeMetadata::getProbe);
-    DebuggerContext.initClassFilter(new DenyListHelper(null));
-  }
-
-  static ProbeImplementation resolver(String encodedProbeId, Configuration configuration) {
-    List<Collection<? extends ProbeDefinition>> list1 =
-        asList(
-            configuration.getSpanDecorationProbes(),
-            configuration.getLogProbes(),
-            configuration.getTriggerProbes());
-    for (Collection<? extends ProbeDefinition> list : list1) {
-
-      ProbeImplementation probe = scanForProbe(encodedProbeId, list);
-      if (probe != null) {
-        return probe;
-      }
-    }
-    return null;
-  }
-
-  private static ProbeDefinition scanForProbe(
-      String encodedProbeId, Collection<? extends ProbeDefinition> probes) {
-    if (probes != null) {
-      for (ProbeDefinition probe : probes) {
-        if (probe.getProbeId().getEncodedId().equals(encodedProbeId)) {
-          return probe;
+        return new SpanDecorationProbe.Decoration(new ProbeCondition(DSL.when(expression), dsl), tags);
+    }
+
+    private void installSingleSpanDecoration(
+            String typeName,
+            SpanDecorationProbe.TargetSpan targetSpan,
+            SpanDecorationProbe.Decoration decoration,
+            String methodName,
+            String signature) {
+        installSingleSpanDecoration(typeName, targetSpan, asList(decoration), methodName, signature);
+    }
+
+    private void installSingleSpanDecoration(
+            ProbeId probeId,
+            String typeName,
+            SpanDecorationProbe.TargetSpan targetSpan,
+            SpanDecorationProbe.Decoration decoration,
+            String sourceFile,
+            int line) {
+        installSingleSpanDecoration(probeId, typeName, targetSpan, asList(decoration), sourceFile, line);
+    }
+
+    private void installSingleSpanDecoration(
+            String typeName,
+            SpanDecorationProbe.TargetSpan targetSpan,
+            List<SpanDecorationProbe.Decoration> decorations,
+            String methodName,
+            String signature) {
+        SpanDecorationProbe probe = createProbe(PROBE_ID, targetSpan, decorations, typeName, methodName, signature);
+        installSpanDecorationProbes(
+                typeName,
+                Configuration.builder().setService(SERVICE_NAME).add(probe).build());
+    }
+
+    private void installSingleSpanDecoration(
+            ProbeId probeId,
+            String typeName,
+            SpanDecorationProbe.TargetSpan targetSpan,
+            List<SpanDecorationProbe.Decoration> decorations,
+            String sourceFile,
+            int line) {
+        SpanDecorationProbe probe = createProbe(probeId, targetSpan, decorations, sourceFile, line);
+        installSpanDecorationProbes(
+                typeName,
+                Configuration.builder().setService(SERVICE_NAME).add(probe).build());
+    }
+
+    private static SpanDecorationProbe createProbe(
+            ProbeId id,
+            SpanDecorationProbe.TargetSpan targetSpan,
+            List<SpanDecorationProbe.Decoration> decorationList,
+            String typeName,
+            String methodName,
+            String signature) {
+        return createProbeBuilder(id, targetSpan, decorationList, typeName, methodName, signature)
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+    }
+
+    private static SpanDecorationProbe createProbe(
+            ProbeId id,
+            SpanDecorationProbe.TargetSpan targetSpan,
+            List<SpanDecorationProbe.Decoration> decorationList,
+            String sourceFile,
+            int line) {
+        return createProbeBuilder(id, targetSpan, decorationList, sourceFile, line)
+                .build();
+    }
+
+    private static SpanDecorationProbe.Builder createProbeBuilder(
+            ProbeId id,
+            SpanDecorationProbe.TargetSpan targetSpan,
+            List<SpanDecorationProbe.Decoration> decorationList,
+            String typeName,
+            String methodName,
+            String signature) {
+        return SpanDecorationProbe.builder()
+                .language(LANGUAGE)
+                .probeId(id)
+                .where(typeName, methodName, signature)
+                .evaluateAt(MethodLocation.EXIT)
+                .targetSpan(targetSpan)
+                .decorations(decorationList);
+    }
+
+    private static SpanDecorationProbe.Builder createProbeBuilder(
+            ProbeId id,
+            SpanDecorationProbe.TargetSpan targetSpan,
+            List<SpanDecorationProbe.Decoration> decorationList,
+            String sourceFile,
+            int line) {
+        return SpanDecorationProbe.builder()
+                .language(LANGUAGE)
+                .probeId(id)
+                .where(sourceFile, line)
+                .evaluateAt(MethodLocation.EXIT)
+                .targetSpan(targetSpan)
+                .decorations(decorationList);
+    }
+
+    private void installSpanProbes(String expectedClassName, SpanDecorationProbe... probes) {
+        installSpanDecorationProbes(
+                expectedClassName,
+                Configuration.builder().setService(SERVICE_NAME).add(probes).build());
+    }
+
+    private void installSpanDecorationProbes(String expectedClassName, Configuration configuration) {
+        Config config = mock(Config.class);
+        when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
+        when(config.isDynamicInstrumentationClassFileDumpEnabled()).thenReturn(true);
+        when(config.getFinalDebuggerSnapshotUrl()).thenReturn("http://localhost:8126/debugger/v1/input");
+        when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+        probeStatusSink = mock(ProbeStatusSink.class);
+        for (ProbeDefinition probe : configuration.getDefinitions()) {
+            if (probe instanceof Sampled) {
+                ((Sampled) probe).initSamplers();
+            }
+        }
+        ProbeMetadata probeMetadata = new ProbeMetadata();
+        currentTransformer = new DebuggerTransformer(
+                config, configuration, null, probeMetadata, new DebuggerSink(config, probeStatusSink));
+        instr.addTransformer(currentTransformer);
+        mockSink = new MockSink(config, probeStatusSink);
+        DebuggerAgentHelper.injectSink(mockSink);
+        DebuggerContext.initProbeResolver(probeMetadata::getProbe);
+        DebuggerContext.initClassFilter(new DenyListHelper(null));
+    }
+
+    static ProbeImplementation resolver(String encodedProbeId, Configuration configuration) {
+        List<Collection<? extends ProbeDefinition>> list1 = asList(
+                configuration.getSpanDecorationProbes(),
+                configuration.getLogProbes(),
+                configuration.getTriggerProbes());
+        for (Collection<? extends ProbeDefinition> list : list1) {
+
+            ProbeImplementation probe = scanForProbe(encodedProbeId, list);
+            if (probe != null) {
+                return probe;
+            }
+        }
+        return null;
+    }
+
+    private static ProbeDefinition scanForProbe(String encodedProbeId, Collection<? extends ProbeDefinition> probes) {
+        if (probes != null) {
+            for (ProbeDefinition probe : probes) {
+                if (probe.getProbeId().getEncodedId().equals(encodedProbeId)) {
+                    return probe;
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanProbeInstrumentationTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanProbeInstrumentationTest.java
index ece84ac483c..a23545cf73f 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanProbeInstrumentationTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanProbeInstrumentationTest.java
@@ -24,200 +24,193 @@
 import org.junit.jupiter.api.Test;
 
 public class SpanProbeInstrumentationTest extends ProbeInstrumentationTest {
-  private static final ProbeId SPAN_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
-  private static final String SPAN_PROBEID_TAG =
-      "debugger.probeid:beae1807-f3b0-4ea8-a74f-826790c5e6f8";
-
-  @Test
-  public void methodSimpleSpan() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    MockTracer tracer = installSingleSpan(CLASS_NAME, "main", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertEquals(1, tracer.spans.size());
-    MockSpan span = tracer.spans.get(0);
-    assertEquals(CLASS_NAME + ".main", span.resourceName);
-    assertTrue(span.isFinished());
-    assertArrayEquals(new String[] {SPAN_PROBEID_TAG}, span.tags);
-    probeStatusSink.addEmitting(eq(SPAN_ID));
-  }
-
-  @Test
-  public void methodSimpleSpanWithPackage() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot10";
-    final String SIMPLE_CLASS_NAME = CLASS_NAME.substring(CLASS_NAME.lastIndexOf('.') + 1);
-    MockTracer tracer = installSingleSpan(CLASS_NAME, "main", "int (java.lang.String)");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(1764, result);
-    assertEquals(1, tracer.spans.size());
-    assertEquals(SIMPLE_CLASS_NAME + ".main", tracer.spans.get(0).resourceName);
-    assertTrue(tracer.spans.get(0).isFinished());
-  }
-
-  @Test
-  public void methodSimpleSpanWithTags() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    MockTracer tracer =
-        installSingleSpan(CLASS_NAME, "main", "int (java.lang.String)", "tag1:foo1", "tag2:foo2");
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertEquals(1, tracer.spans.size());
-    MockSpan span = tracer.spans.get(0);
-    assertEquals(CLASS_NAME + ".main", span.resourceName);
-    assertTrue(span.isFinished());
-    assertArrayEquals(new String[] {"tag1:foo1", "tag2:foo2", SPAN_PROBEID_TAG}, span.tags);
-  }
-
-  @Test
-  public void lineRangeSimpleSpan() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    MockTracer tracer = installSingleSpan(CLASS_NAME + ".java", 4, 8);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertEquals(1, tracer.spans.size());
-    MockSpan span = tracer.spans.get(0);
-    assertEquals(CLASS_NAME + ".main:L4-8", span.resourceName);
-    assertTrue(span.isFinished());
-    assertArrayEquals(new String[] {SPAN_PROBEID_TAG}, span.tags);
-    probeStatusSink.addEmitting(eq(SPAN_ID));
-  }
-
-  @Test
-  public void lineRangeErrorSimpleSpan() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    MockTracer tracer = installSingleSpan(CLASS_NAME + ".java", 5, 9);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    // instrumentation cannot happen, so no span generated
-    assertEquals(0, tracer.spans.size());
-  }
-
-  @Test
-  public void invalidLineSimpleSpan() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    MockTracer tracer = installSingleSpan(CLASS_NAME + ".java", 4, 10);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertEquals(0, tracer.spans.size());
-    verify(probeStatusSink).addError(eq(SPAN_ID), eq("No line info for range 4-10"));
-  }
-
-  @Test
-  public void spanThrows() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "CapturedSnapshot01";
-    MockTracer tracer = installSingleSpan(CLASS_NAME, "main", "int (java.lang.String)");
-    tracer.setThrowing(true);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    int result = Reflect.on(testClass).call("main", "1").get();
-    assertEquals(3, result);
-    assertEquals(0, tracer.spans.size());
-  }
-
-  private MockTracer installSingleSpan(
-      String typeName, String methodName, String signature, String... tags) {
-    SpanProbe spanProbe = createSpan(SPAN_ID, typeName, methodName, signature, tags);
-    return installSpanProbes(spanProbe);
-  }
-
-  private MockTracer installSingleSpan(
-      String sourceFile, int lineFrom, int lineTill, String... tags) {
-    SpanProbe spanProbe = createSpan(SPAN_ID, sourceFile, lineFrom, lineTill, tags);
-    return installSpanProbes(spanProbe);
-  }
-
-  private MockTracer installSpanProbes(SpanProbe... spanProbes) {
-    return installSpanProbes(
-        Configuration.builder().setService(SERVICE_NAME).add(spanProbes).build());
-  }
-
-  private MockTracer installSpanProbes(Configuration configuration) {
-    Config config = mock(Config.class);
-    when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
-    when(config.isDynamicInstrumentationClassFileDumpEnabled()).thenReturn(true);
-    when(config.isDynamicInstrumentationVerifyByteCode()).thenReturn(true);
-    when(config.getFinalDebuggerSnapshotUrl())
-        .thenReturn("http://localhost:8126/debugger/v1/input");
-    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
-    probeStatusSink = mock(ProbeStatusSink.class);
-    currentTransformer =
-        new DebuggerTransformer(
-            config,
-            configuration,
-            null,
-            new ProbeMetadata(),
-            new DebuggerSink(config, probeStatusSink));
-    instr.addTransformer(currentTransformer);
-    mockSink = new MockSink(config, probeStatusSink);
-    DebuggerAgentHelper.injectSink(mockSink);
-    DebuggerContext.initProbeResolver(null);
-    DebuggerContext.initClassFilter(new DenyListHelper(null));
-    MockTracer mockTracer = new MockTracer();
-    DebuggerContext.initTracer(mockTracer);
-    return mockTracer;
-  }
-
-  static class MockTracer implements DebuggerContext.Tracer {
-    List<MockSpan> spans = new ArrayList<>();
-    boolean throwing;
-
-    @Override
-    public DebuggerSpan createSpan(String encodedProbeId, String resourceName, String[] tags) {
-      if (throwing) {
-        throw new IllegalArgumentException("oops");
-      }
-      MockSpan mockSpan = new MockSpan(resourceName, tags);
-      spans.add(mockSpan);
-      return mockSpan;
+    private static final ProbeId SPAN_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
+    private static final String SPAN_PROBEID_TAG = "debugger.probeid:beae1807-f3b0-4ea8-a74f-826790c5e6f8";
+
+    @Test
+    public void methodSimpleSpan() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        MockTracer tracer = installSingleSpan(CLASS_NAME, "main", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertEquals(1, tracer.spans.size());
+        MockSpan span = tracer.spans.get(0);
+        assertEquals(CLASS_NAME + ".main", span.resourceName);
+        assertTrue(span.isFinished());
+        assertArrayEquals(new String[] {SPAN_PROBEID_TAG}, span.tags);
+        probeStatusSink.addEmitting(eq(SPAN_ID));
     }
 
-    public void setThrowing(boolean value) {
-      this.throwing = value;
+    @Test
+    public void methodSimpleSpanWithPackage() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot10";
+        final String SIMPLE_CLASS_NAME = CLASS_NAME.substring(CLASS_NAME.lastIndexOf('.') + 1);
+        MockTracer tracer = installSingleSpan(CLASS_NAME, "main", "int (java.lang.String)");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(1764, result);
+        assertEquals(1, tracer.spans.size());
+        assertEquals(SIMPLE_CLASS_NAME + ".main", tracer.spans.get(0).resourceName);
+        assertTrue(tracer.spans.get(0).isFinished());
     }
-  }
 
-  static class MockSpan implements DebuggerSpan {
-    boolean finished;
-    Throwable throwable;
-    String resourceName;
-    String[] tags;
+    @Test
+    public void methodSimpleSpanWithTags() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        MockTracer tracer = installSingleSpan(CLASS_NAME, "main", "int (java.lang.String)", "tag1:foo1", "tag2:foo2");
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertEquals(1, tracer.spans.size());
+        MockSpan span = tracer.spans.get(0);
+        assertEquals(CLASS_NAME + ".main", span.resourceName);
+        assertTrue(span.isFinished());
+        assertArrayEquals(new String[] {"tag1:foo1", "tag2:foo2", SPAN_PROBEID_TAG}, span.tags);
+    }
+
+    @Test
+    public void lineRangeSimpleSpan() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        MockTracer tracer = installSingleSpan(CLASS_NAME + ".java", 4, 8);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertEquals(1, tracer.spans.size());
+        MockSpan span = tracer.spans.get(0);
+        assertEquals(CLASS_NAME + ".main:L4-8", span.resourceName);
+        assertTrue(span.isFinished());
+        assertArrayEquals(new String[] {SPAN_PROBEID_TAG}, span.tags);
+        probeStatusSink.addEmitting(eq(SPAN_ID));
+    }
+
+    @Test
+    public void lineRangeErrorSimpleSpan() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        MockTracer tracer = installSingleSpan(CLASS_NAME + ".java", 5, 9);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        // instrumentation cannot happen, so no span generated
+        assertEquals(0, tracer.spans.size());
+    }
+
+    @Test
+    public void invalidLineSimpleSpan() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        MockTracer tracer = installSingleSpan(CLASS_NAME + ".java", 4, 10);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertEquals(0, tracer.spans.size());
+        verify(probeStatusSink).addError(eq(SPAN_ID), eq("No line info for range 4-10"));
+    }
+
+    @Test
+    public void spanThrows() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "CapturedSnapshot01";
+        MockTracer tracer = installSingleSpan(CLASS_NAME, "main", "int (java.lang.String)");
+        tracer.setThrowing(true);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        int result = Reflect.on(testClass).call("main", "1").get();
+        assertEquals(3, result);
+        assertEquals(0, tracer.spans.size());
+    }
+
+    private MockTracer installSingleSpan(String typeName, String methodName, String signature, String... tags) {
+        SpanProbe spanProbe = createSpan(SPAN_ID, typeName, methodName, signature, tags);
+        return installSpanProbes(spanProbe);
+    }
+
+    private MockTracer installSingleSpan(String sourceFile, int lineFrom, int lineTill, String... tags) {
+        SpanProbe spanProbe = createSpan(SPAN_ID, sourceFile, lineFrom, lineTill, tags);
+        return installSpanProbes(spanProbe);
+    }
+
+    private MockTracer installSpanProbes(SpanProbe... spanProbes) {
+        return installSpanProbes(
+                Configuration.builder().setService(SERVICE_NAME).add(spanProbes).build());
+    }
+
+    private MockTracer installSpanProbes(Configuration configuration) {
+        Config config = mock(Config.class);
+        when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
+        when(config.isDynamicInstrumentationClassFileDumpEnabled()).thenReturn(true);
+        when(config.isDynamicInstrumentationVerifyByteCode()).thenReturn(true);
+        when(config.getFinalDebuggerSnapshotUrl()).thenReturn("http://localhost:8126/debugger/v1/input");
+        when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+        probeStatusSink = mock(ProbeStatusSink.class);
+        currentTransformer = new DebuggerTransformer(
+                config, configuration, null, new ProbeMetadata(), new DebuggerSink(config, probeStatusSink));
+        instr.addTransformer(currentTransformer);
+        mockSink = new MockSink(config, probeStatusSink);
+        DebuggerAgentHelper.injectSink(mockSink);
+        DebuggerContext.initProbeResolver(null);
+        DebuggerContext.initClassFilter(new DenyListHelper(null));
+        MockTracer mockTracer = new MockTracer();
+        DebuggerContext.initTracer(mockTracer);
+        return mockTracer;
+    }
 
-    public MockSpan(String resourceName, String[] tags) {
-      this.resourceName = resourceName;
-      this.tags = tags;
+    static class MockTracer implements DebuggerContext.Tracer {
+        List<MockSpan> spans = new ArrayList<>();
+        boolean throwing;
+
+        @Override
+        public DebuggerSpan createSpan(String encodedProbeId, String resourceName, String[] tags) {
+            if (throwing) {
+                throw new IllegalArgumentException("oops");
+            }
+            MockSpan mockSpan = new MockSpan(resourceName, tags);
+            spans.add(mockSpan);
+            return mockSpan;
+        }
+
+        public void setThrowing(boolean value) {
+            this.throwing = value;
+        }
     }
 
-    @Override
-    public void finish() {
-      finished = true;
+    static class MockSpan implements DebuggerSpan {
+        boolean finished;
+        Throwable throwable;
+        String resourceName;
+        String[] tags;
+
+        public MockSpan(String resourceName, String[] tags) {
+            this.resourceName = resourceName;
+            this.tags = tags;
+        }
+
+        @Override
+        public void finish() {
+            finished = true;
+        }
+
+        @Override
+        public void setError(Throwable t) {
+            this.throwable = t;
+        }
+
+        public boolean isFinished() {
+            return finished;
+        }
     }
 
-    @Override
-    public void setError(Throwable t) {
-      this.throwable = t;
+    private static SpanProbe createSpan(
+            ProbeId id, String typeName, String methodName, String signature, String[] tags) {
+        return SpanProbe.builder()
+                .probeId(id)
+                .where(typeName, methodName, signature)
+                .tags(tags)
+                .build();
     }
 
-    public boolean isFinished() {
-      return finished;
+    private static SpanProbe createSpan(ProbeId id, String sourceFile, int lineFrom, int lineTill, String[] tags) {
+        return SpanProbe.builder()
+                .probeId(id)
+                .where(sourceFile, lineFrom, lineTill)
+                .tags(tags)
+                .build();
     }
-  }
-
-  private static SpanProbe createSpan(
-      ProbeId id, String typeName, String methodName, String signature, String[] tags) {
-    return SpanProbe.builder()
-        .probeId(id)
-        .where(typeName, methodName, signature)
-        .tags(tags)
-        .build();
-  }
-
-  private static SpanProbe createSpan(
-      ProbeId id, String sourceFile, int lineFrom, int lineTill, String[] tags) {
-    return SpanProbe.builder().probeId(id).where(sourceFile, lineFrom, lineTill).tags(tags).build();
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/StatsdMetricForwarderTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/StatsdMetricForwarderTest.java
index 7ea85632aeb..f0629ce2b42 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/StatsdMetricForwarderTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/StatsdMetricForwarderTest.java
@@ -11,80 +11,69 @@
 import org.junit.jupiter.api.Test;
 
 class StatsdMetricForwarderTest {
-  private static final ProbeId METRIC_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
+    private static final ProbeId METRIC_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
 
-  @Test
-  void emittingCountMetric() {
-    ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
-    StatsdMetricForwarder statsdMetricForwarder =
-        new StatsdMetricForwarder(Config.get(), probeStatusSink);
-    statsdMetricForwarder.count(METRIC_ID.getEncodedId(), "name", 1, new String[] {"foo:bar"});
-    verify(probeStatusSink).addEmitting(eq(METRIC_ID.getEncodedId()));
-  }
+    @Test
+    void emittingCountMetric() {
+        ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
+        StatsdMetricForwarder statsdMetricForwarder = new StatsdMetricForwarder(Config.get(), probeStatusSink);
+        statsdMetricForwarder.count(METRIC_ID.getEncodedId(), "name", 1, new String[] {"foo:bar"});
+        verify(probeStatusSink).addEmitting(eq(METRIC_ID.getEncodedId()));
+    }
 
-  @Test
-  void emittingGaugeLongMetric() {
-    ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
-    StatsdMetricForwarder statsdMetricForwarder =
-        new StatsdMetricForwarder(Config.get(), probeStatusSink);
-    statsdMetricForwarder.gauge(METRIC_ID.getEncodedId(), "name", 1, new String[] {"foo:bar"});
-    verify(probeStatusSink).addEmitting(eq(METRIC_ID.getEncodedId()));
-  }
+    @Test
+    void emittingGaugeLongMetric() {
+        ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
+        StatsdMetricForwarder statsdMetricForwarder = new StatsdMetricForwarder(Config.get(), probeStatusSink);
+        statsdMetricForwarder.gauge(METRIC_ID.getEncodedId(), "name", 1, new String[] {"foo:bar"});
+        verify(probeStatusSink).addEmitting(eq(METRIC_ID.getEncodedId()));
+    }
 
-  @Test
-  void emittingGaugeDoubleMetric() {
-    ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
-    StatsdMetricForwarder statsdMetricForwarder =
-        new StatsdMetricForwarder(Config.get(), probeStatusSink);
-    statsdMetricForwarder.gauge(METRIC_ID.getEncodedId(), "name", 1.0, new String[] {"foo:bar"});
-    verify(probeStatusSink).addEmitting(eq(METRIC_ID.getEncodedId()));
-  }
+    @Test
+    void emittingGaugeDoubleMetric() {
+        ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
+        StatsdMetricForwarder statsdMetricForwarder = new StatsdMetricForwarder(Config.get(), probeStatusSink);
+        statsdMetricForwarder.gauge(METRIC_ID.getEncodedId(), "name", 1.0, new String[] {"foo:bar"});
+        verify(probeStatusSink).addEmitting(eq(METRIC_ID.getEncodedId()));
+    }
 
-  @Test
-  void emittingHistogramLongMetric() {
-    ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
-    StatsdMetricForwarder statsdMetricForwarder =
-        new StatsdMetricForwarder(Config.get(), probeStatusSink);
-    statsdMetricForwarder.histogram(METRIC_ID.getEncodedId(), "name", 1, new String[] {"foo:bar"});
-    verify(probeStatusSink).addEmitting(eq(METRIC_ID.getEncodedId()));
-  }
+    @Test
+    void emittingHistogramLongMetric() {
+        ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
+        StatsdMetricForwarder statsdMetricForwarder = new StatsdMetricForwarder(Config.get(), probeStatusSink);
+        statsdMetricForwarder.histogram(METRIC_ID.getEncodedId(), "name", 1, new String[] {"foo:bar"});
+        verify(probeStatusSink).addEmitting(eq(METRIC_ID.getEncodedId()));
+    }
 
-  @Test
-  void emittingHistogramDoubleMetric() {
-    ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
-    StatsdMetricForwarder statsdMetricForwarder =
-        new StatsdMetricForwarder(Config.get(), probeStatusSink);
-    statsdMetricForwarder.histogram(
-        METRIC_ID.getEncodedId(), "name", 1.0, new String[] {"foo:bar"});
-    verify(probeStatusSink).addEmitting(eq(METRIC_ID.getEncodedId()));
-  }
+    @Test
+    void emittingHistogramDoubleMetric() {
+        ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
+        StatsdMetricForwarder statsdMetricForwarder = new StatsdMetricForwarder(Config.get(), probeStatusSink);
+        statsdMetricForwarder.histogram(METRIC_ID.getEncodedId(), "name", 1.0, new String[] {"foo:bar"});
+        verify(probeStatusSink).addEmitting(eq(METRIC_ID.getEncodedId()));
+    }
 
-  @Test
-  void emittingDistributionLongMetric() {
-    ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
-    StatsdMetricForwarder statsdMetricForwarder =
-        new StatsdMetricForwarder(Config.get(), probeStatusSink);
-    statsdMetricForwarder.distribution(
-        METRIC_ID.getEncodedId(), "name", 1, new String[] {"foo:bar"});
-    verify(probeStatusSink).addEmitting(eq(METRIC_ID.getEncodedId()));
-  }
+    @Test
+    void emittingDistributionLongMetric() {
+        ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
+        StatsdMetricForwarder statsdMetricForwarder = new StatsdMetricForwarder(Config.get(), probeStatusSink);
+        statsdMetricForwarder.distribution(METRIC_ID.getEncodedId(), "name", 1, new String[] {"foo:bar"});
+        verify(probeStatusSink).addEmitting(eq(METRIC_ID.getEncodedId()));
+    }
 
-  @Test
-  void emittingDistributionDoubleMetric() {
-    ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
-    StatsdMetricForwarder statsdMetricForwarder =
-        new StatsdMetricForwarder(Config.get(), probeStatusSink);
-    statsdMetricForwarder.distribution(
-        METRIC_ID.getEncodedId(), "name", 1.0, new String[] {"foo:bar"});
-    verify(probeStatusSink).addEmitting(eq(METRIC_ID.getEncodedId()));
-  }
+    @Test
+    void emittingDistributionDoubleMetric() {
+        ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
+        StatsdMetricForwarder statsdMetricForwarder = new StatsdMetricForwarder(Config.get(), probeStatusSink);
+        statsdMetricForwarder.distribution(METRIC_ID.getEncodedId(), "name", 1.0, new String[] {"foo:bar"});
+        verify(probeStatusSink).addEmitting(eq(METRIC_ID.getEncodedId()));
+    }
 
-  @Test
-  void badResolution() {
-    ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
-    StatsdMetricForwarder statsdMetricForwarder =
-        new StatsdMetricForwarder(Config.get(), probeStatusSink);
-    statsdMetricForwarder.count("badId:0", "name", 1, new String[] {"foo:bar"});
-    verify(probeStatusSink, times(0)).addEmitting(eq(METRIC_ID));
-  }
+    @Test
+    void badResolution() {
+        ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
+        StatsdMetricForwarder statsdMetricForwarder = new StatsdMetricForwarder(Config.get(), probeStatusSink);
+        statsdMetricForwarder.count("badId:0", "name", 1, new String[] {"foo:bar"});
+        verify(probeStatusSink, times(0)).addEmitting(eq(METRIC_ID));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/StringTemplateBuilderTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/StringTemplateBuilderTest.java
index 24b6ca671cb..0b9a89b8947 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/StringTemplateBuilderTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/StringTemplateBuilderTest.java
@@ -26,252 +26,218 @@
 import org.junit.jupiter.api.condition.JRE;
 
 class StringTemplateBuilderTest {
-  private static final Limits LIMITS = new Limits(1, 3, 255, 5);
-  private static final Duration TIMEOUT = Duration.ofSeconds(1);
-
-  @Test
-  public void emptyProbe() {
-    LogProbe probe = LogProbe.builder().build();
-    StringTemplateBuilder summaryBuilder =
-        new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
-    String message = summaryBuilder.evaluate(new CapturedContext(), new LogProbe.LogStatus(probe));
-    assertNull(message);
-  }
+    private static final Limits LIMITS = new Limits(1, 3, 255, 5);
+    private static final Duration TIMEOUT = Duration.ofSeconds(1);
+
+    @Test
+    public void emptyProbe() {
+        LogProbe probe = LogProbe.builder().build();
+        StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
+        String message = summaryBuilder.evaluate(new CapturedContext(), new LogProbe.LogStatus(probe));
+        assertNull(message);
+    }
 
-  @Test
-  public void emptyTemplate() {
-    LogProbe probe = createLogProbe("");
-    StringTemplateBuilder summaryBuilder =
-        new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
-    String message = summaryBuilder.evaluate(new CapturedContext(), new LogProbe.LogStatus(probe));
-    assertEquals("", message);
-  }
+    @Test
+    public void emptyTemplate() {
+        LogProbe probe = createLogProbe("");
+        StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
+        String message = summaryBuilder.evaluate(new CapturedContext(), new LogProbe.LogStatus(probe));
+        assertEquals("", message);
+    }
 
-  @Test
-  public void onlyStringTemplate() {
-    LogProbe probe = createLogProbe("this is a simple string");
-    StringTemplateBuilder summaryBuilder =
-        new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
-    String message = summaryBuilder.evaluate(new CapturedContext(), new LogProbe.LogStatus(probe));
-    assertEquals("this is a simple string", message);
-  }
+    @Test
+    public void onlyStringTemplate() {
+        LogProbe probe = createLogProbe("this is a simple string");
+        StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
+        String message = summaryBuilder.evaluate(new CapturedContext(), new LogProbe.LogStatus(probe));
+        assertEquals("this is a simple string", message);
+    }
 
-  @Test
-  public void undefinedArgTemplate() {
-    LogProbe probe = createLogProbe("{arg}");
-    StringTemplateBuilder summaryBuilder =
-        new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
-    String message = summaryBuilder.evaluate(new CapturedContext(), new LogProbe.LogStatus(probe));
-    assertEquals("{Cannot find symbol: arg}", message);
-  }
+    @Test
+    public void undefinedArgTemplate() {
+        LogProbe probe = createLogProbe("{arg}");
+        StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
+        String message = summaryBuilder.evaluate(new CapturedContext(), new LogProbe.LogStatus(probe));
+        assertEquals("{Cannot find symbol: arg}", message);
+    }
 
-  @Test
-  public void argTemplate() {
-    LogProbe probe = createLogProbe("{arg}");
-    StringTemplateBuilder summaryBuilder =
-        new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
-    CapturedContext capturedContext = new CapturedContext();
-    capturedContext.addArguments(
-        new CapturedContext.CapturedValue[] {
-          CapturedContext.CapturedValue.of("arg", String.class.getTypeName(), "foo")
+    @Test
+    public void argTemplate() {
+        LogProbe probe = createLogProbe("{arg}");
+        StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
+        CapturedContext capturedContext = new CapturedContext();
+        capturedContext.addArguments(new CapturedContext.CapturedValue[] {
+            CapturedContext.CapturedValue.of("arg", String.class.getTypeName(), "foo")
         });
-    String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
-    assertEquals("foo", message);
-  }
+        String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
+        assertEquals("foo", message);
+    }
 
-  @Test
-  public void booleanArgTemplate() {
-    List<LogProbe.Segment> segments = new ArrayList<>();
-    segments.add(
-        new LogProbe.Segment(
-            new ValueScript(
-                DSL.bool(DSL.contains(DSL.ref("arg"), new StringValue("o"))), "{arg}")));
-    LogProbe probe = LogProbe.builder().template("{contains(arg, 'o')}", segments).build();
-    StringTemplateBuilder summaryBuilder =
-        new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
-    CapturedContext capturedContext = new CapturedContext();
-    capturedContext.addArguments(
-        new CapturedContext.CapturedValue[] {
-          CapturedContext.CapturedValue.of("arg", String.class.getTypeName(), "foo")
+    @Test
+    public void booleanArgTemplate() {
+        List<LogProbe.Segment> segments = new ArrayList<>();
+        segments.add(new LogProbe.Segment(
+                new ValueScript(DSL.bool(DSL.contains(DSL.ref("arg"), new StringValue("o"))), "{arg}")));
+        LogProbe probe =
+                LogProbe.builder().template("{contains(arg, 'o')}", segments).build();
+        StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
+        CapturedContext capturedContext = new CapturedContext();
+        capturedContext.addArguments(new CapturedContext.CapturedValue[] {
+            CapturedContext.CapturedValue.of("arg", String.class.getTypeName(), "foo")
         });
-    String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
-    assertEquals("true", message);
-  }
+        String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
+        assertEquals("true", message);
+    }
 
-  @Test
-  public void argMultipleInFlightTemplate() {
-    LogProbe probe = createLogProbe("{arg}");
-    StringTemplateBuilder summaryBuilder =
-        new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
-    CapturedContext capturedContext = new CapturedContext();
-    capturedContext.addArguments(
-        new CapturedContext.CapturedValue[] {
-          CapturedContext.CapturedValue.of("arg", String.class.getTypeName(), "foo")
+    @Test
+    public void argMultipleInFlightTemplate() {
+        LogProbe probe = createLogProbe("{arg}");
+        StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
+        CapturedContext capturedContext = new CapturedContext();
+        capturedContext.addArguments(new CapturedContext.CapturedValue[] {
+            CapturedContext.CapturedValue.of("arg", String.class.getTypeName(), "foo")
         });
-    String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
-    StringTemplateBuilder summaryBuilder2 =
-        new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
-    CapturedContext capturedContext2 = new CapturedContext();
-    capturedContext2.addArguments(
-        new CapturedContext.CapturedValue[] {
-          CapturedContext.CapturedValue.of("arg", String.class.getTypeName(), "bar")
+        String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
+        StringTemplateBuilder summaryBuilder2 = new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
+        CapturedContext capturedContext2 = new CapturedContext();
+        capturedContext2.addArguments(new CapturedContext.CapturedValue[] {
+            CapturedContext.CapturedValue.of("arg", String.class.getTypeName(), "bar")
         });
-    String message2 = summaryBuilder2.evaluate(capturedContext2, new LogProbe.LogStatus(probe));
-    assertEquals("foo", message);
-    assertEquals("bar", message2);
-  }
+        String message2 = summaryBuilder2.evaluate(capturedContext2, new LogProbe.LogStatus(probe));
+        assertEquals("foo", message);
+        assertEquals("bar", message2);
+    }
 
-  @Test
-  public void argNullTemplate() {
-    LogProbe probe = createLogProbe("{nullObject}");
-    StringTemplateBuilder summaryBuilder =
-        new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
-    CapturedContext capturedContext = new CapturedContext();
-    capturedContext.addArguments(
-        new CapturedContext.CapturedValue[] {
-          CapturedContext.CapturedValue.of("nullObject", Object.class.getTypeName(), null)
+    @Test
+    public void argNullTemplate() {
+        LogProbe probe = createLogProbe("{nullObject}");
+        StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
+        CapturedContext capturedContext = new CapturedContext();
+        capturedContext.addArguments(new CapturedContext.CapturedValue[] {
+            CapturedContext.CapturedValue.of("nullObject", Object.class.getTypeName(), null)
         });
-    String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
-    assertEquals("null", message);
-  }
+        String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
+        assertEquals("null", message);
+    }
 
-  @Test
-  public void argArrayTemplate() {
-    LogProbe probe = createLogProbe("{primArray} {strArray}");
-    StringTemplateBuilder summaryBuilder =
-        new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
-    CapturedContext capturedContext = new CapturedContext();
-    capturedContext.addArguments(
-        new CapturedContext.CapturedValue[] {
-          CapturedContext.CapturedValue.of(
-              "primArray", String.class.getTypeName(), new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}),
-          CapturedContext.CapturedValue.of(
-              "strArray",
-              String.class.getTypeName(),
-              new String[] {
+    @Test
+    public void argArrayTemplate() {
+        LogProbe probe = createLogProbe("{primArray} {strArray}");
+        StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
+        CapturedContext capturedContext = new CapturedContext();
+        capturedContext.addArguments(new CapturedContext.CapturedValue[] {
+            CapturedContext.CapturedValue.of(
+                    "primArray", String.class.getTypeName(), new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}),
+            CapturedContext.CapturedValue.of("strArray", String.class.getTypeName(), new String[] {
                 "foo0", "foo1", "foo2", "foo3", "foo4", "foo5", "foo6", "foo7", "foo8", "foo9"
-              })
+            })
         });
-    String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
-    assertEquals("[0, 1, 2, ...] [foo0, foo1, foo2, ...]", message);
-  }
+        String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
+        assertEquals("[0, 1, 2, ...] [foo0, foo1, foo2, ...]", message);
+    }
 
-  @Test
-  public void argCollectionTemplate() {
-    LogProbe probe = createLogProbe("{strList} {strSet}");
-    StringTemplateBuilder summaryBuilder =
-        new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
-    CapturedContext capturedContext = new CapturedContext();
-    capturedContext.addArguments(
-        new CapturedContext.CapturedValue[] {
-          CapturedContext.CapturedValue.of(
-              "strList",
-              String.class.getTypeName(),
-              new ArrayList<>(
-                  Arrays.asList(
-                      "foo0", "foo1", "foo2", "foo3", "foo4", "foo5", "foo6", "foo7", "foo8",
-                      "foo9"))),
-          CapturedContext.CapturedValue.of(
-              "strSet",
-              String.class.getTypeName(),
-              new LinkedHashSet<>(
-                  Arrays.asList(
-                      "bar0", "bar1", "bar2", "bar3", "bar4", "bar5", "bar6", "bar7", "bar8",
-                      "bar9")))
+    @Test
+    public void argCollectionTemplate() {
+        LogProbe probe = createLogProbe("{strList} {strSet}");
+        StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
+        CapturedContext capturedContext = new CapturedContext();
+        capturedContext.addArguments(new CapturedContext.CapturedValue[] {
+            CapturedContext.CapturedValue.of(
+                    "strList",
+                    String.class.getTypeName(),
+                    new ArrayList<>(Arrays.asList(
+                            "foo0", "foo1", "foo2", "foo3", "foo4", "foo5", "foo6", "foo7", "foo8", "foo9"))),
+            CapturedContext.CapturedValue.of(
+                    "strSet",
+                    String.class.getTypeName(),
+                    new LinkedHashSet<>(Arrays.asList(
+                            "bar0", "bar1", "bar2", "bar3", "bar4", "bar5", "bar6", "bar7", "bar8", "bar9")))
         });
-    String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
-    assertEquals("[foo0, foo1, foo2, ...] [bar0, bar1, bar2, ...]", message);
-  }
-
-  @Test
-  public void argMapTemplate() {
-    LogProbe probe = createLogProbe("{strMap}");
-    StringTemplateBuilder summaryBuilder =
-        new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
-    CapturedContext capturedContext = new CapturedContext();
-    Map<String, String> map = new LinkedHashMap<>();
-    for (int i = 0; i < 10; i++) {
-      map.put("foo" + i, "bar" + i);
+        String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
+        assertEquals("[foo0, foo1, foo2, ...] [bar0, bar1, bar2, ...]", message);
     }
-    capturedContext.addArguments(
-        new CapturedContext.CapturedValue[] {
-          CapturedContext.CapturedValue.of("strMap", String.class.getTypeName(), map)
+
+    @Test
+    public void argMapTemplate() {
+        LogProbe probe = createLogProbe("{strMap}");
+        StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
+        CapturedContext capturedContext = new CapturedContext();
+        Map<String, String> map = new LinkedHashMap<>();
+        for (int i = 0; i < 10; i++) {
+            map.put("foo" + i, "bar" + i);
+        }
+        capturedContext.addArguments(new CapturedContext.CapturedValue[] {
+            CapturedContext.CapturedValue.of("strMap", String.class.getTypeName(), map)
         });
-    String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
-    assertEquals("{[foo0=bar0], [foo1=bar1], [foo2=bar2], ...}", message);
-  }
+        String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
+        assertEquals("{[foo0=bar0], [foo1=bar1], [foo2=bar2], ...}", message);
+    }
 
-  static class Level0 {
-    int intField0 = 0;
-    String strField0 = "foo0";
-    Level1 level1 = new Level1();
-  }
+    static class Level0 {
+        int intField0 = 0;
+        String strField0 = "foo0";
+        Level1 level1 = new Level1();
+    }
 
-  static class Level1 {
-    int intField1 = 1;
-    String strField1 = "foo1";
-  }
+    static class Level1 {
+        int intField1 = 1;
+        String strField1 = "foo1";
+    }
 
-  @Test
-  public void argComplexObjectTemplate() {
-    LogProbe probe = createLogProbe("{obj}");
-    StringTemplateBuilder summaryBuilder =
-        new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
-    CapturedContext capturedContext = new CapturedContext();
-    capturedContext.addArguments(
-        new CapturedContext.CapturedValue[] {
-          CapturedContext.CapturedValue.of("obj", Level0.class.getTypeName(), new Level0())
+    @Test
+    public void argComplexObjectTemplate() {
+        LogProbe probe = createLogProbe("{obj}");
+        StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
+        CapturedContext capturedContext = new CapturedContext();
+        capturedContext.addArguments(new CapturedContext.CapturedValue[] {
+            CapturedContext.CapturedValue.of("obj", Level0.class.getTypeName(), new Level0())
         });
-    String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
-    assertEquals("{intField0=0, strField0=foo0, level1=...}", message);
-  }
+        String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
+        assertEquals("{intField0=0, strField0=foo0, level1=...}", message);
+    }
 
-  @Test
-  public void argComplexObjectArrayTemplate() {
-    LogProbe probe = createLogProbe("{array}");
-    StringTemplateBuilder summaryBuilder =
-        new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
-    CapturedContext capturedContext = new CapturedContext();
-    capturedContext.addArguments(
-        new CapturedContext.CapturedValue[] {
-          CapturedContext.CapturedValue.of(
-              "array", Level0[].class.getTypeName(), new Level0[] {new Level0(), new Level0()})
+    @Test
+    public void argComplexObjectArrayTemplate() {
+        LogProbe probe = createLogProbe("{array}");
+        StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
+        CapturedContext capturedContext = new CapturedContext();
+        capturedContext.addArguments(new CapturedContext.CapturedValue[] {
+            CapturedContext.CapturedValue.of(
+                    "array", Level0[].class.getTypeName(), new Level0[] {new Level0(), new Level0()})
         });
-    String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
-    assertEquals("[..., ...]", message);
-  }
+        String message = summaryBuilder.evaluate(capturedContext, new LogProbe.LogStatus(probe));
+        assertEquals("[..., ...]", message);
+    }
 
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_17)
-  @DisabledIf("datadog.environment.JavaVirtualMachine#isJ9")
-  public void argInaccessibleFieldTemplate() {
-    LogProbe probe = createLogProbe("{obj}");
-    StringTemplateBuilder summaryBuilder =
-        new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
-    CapturedContext capturedContext = new CapturedContext();
-    capturedContext.addArguments(
-        new CapturedContext.CapturedValue[] {
-          CapturedContext.CapturedValue.of(
-              "obj", Object.class.getTypeName(), ManagementFactory.getOperatingSystemMXBean())
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_17)
+    @DisabledIf("datadog.environment.JavaVirtualMachine#isJ9")
+    public void argInaccessibleFieldTemplate() {
+        LogProbe probe = createLogProbe("{obj}");
+        StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS, TIMEOUT);
+        CapturedContext capturedContext = new CapturedContext();
+        capturedContext.addArguments(new CapturedContext.CapturedValue[] {
+            CapturedContext.CapturedValue.of(
+                    "obj", Object.class.getTypeName(), ManagementFactory.getOperatingSystemMXBean())
         });
-    LogProbe.LogStatus status = new LogProbe.LogStatus(probe);
-    String message = summaryBuilder.evaluate(capturedContext, status);
-    assertEquals(
-        "{containerMetrics=UNDEFINED, systemLoadTicks=UNDEFINED, processLoadTicks=UNDEFINED, jvm=UNDEFINED, loadavg=UNDEFINED}",
-        message);
-    assertTrue(status.hasLogTemplateErrors());
-    List<EvaluationError> evaluationErrors = status.getErrors();
-    assertEquals(5, evaluationErrors.size());
-    for (int i = 0; i < 5; i++) {
-      String msg = evaluationErrors.get(i).getMessage();
-      assertTrue(
-          msg.matches(
-              "Field is not accessible: module (java|jdk).management does not opens/exports to the current module"),
-          msg);
+        LogProbe.LogStatus status = new LogProbe.LogStatus(probe);
+        String message = summaryBuilder.evaluate(capturedContext, status);
+        assertEquals(
+                "{containerMetrics=UNDEFINED, systemLoadTicks=UNDEFINED, processLoadTicks=UNDEFINED, jvm=UNDEFINED, loadavg=UNDEFINED}",
+                message);
+        assertTrue(status.hasLogTemplateErrors());
+        List<EvaluationError> evaluationErrors = status.getErrors();
+        assertEquals(5, evaluationErrors.size());
+        for (int i = 0; i < 5; i++) {
+            String msg = evaluationErrors.get(i).getMessage();
+            assertTrue(
+                    msg.matches(
+                            "Field is not accessible: module (java|jdk).management does not opens/exports to the current module"),
+                    msg);
+        }
     }
-  }
 
-  private LogProbe createLogProbe(String template) {
-    return LogProbe.builder().template(template, parseTemplate(template)).build();
-  }
+    private LogProbe createLogProbe(String template) {
+        return LogProbe.builder().template(template, parseTemplate(template)).build();
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ThirdPartyLibrariesTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ThirdPartyLibrariesTest.java
index 01abb157469..7236518a9ef 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ThirdPartyLibrariesTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ThirdPartyLibrariesTest.java
@@ -15,80 +15,76 @@
 
 class ThirdPartyLibrariesTest {
 
-  private final Config mockConfig = mock(Config.class);
+    private final Config mockConfig = mock(Config.class);
 
-  @BeforeEach
-  void setUp() {
-    when(mockConfig.getThirdPartyIncludes()).thenReturn(Collections.emptySet());
-    when(mockConfig.getThirdPartyExcludes()).thenReturn(Collections.emptySet());
-    when(mockConfig.getThirdPartyShadingIdentifiers()).thenReturn(Collections.emptySet());
-  }
+    @BeforeEach
+    void setUp() {
+        when(mockConfig.getThirdPartyIncludes()).thenReturn(Collections.emptySet());
+        when(mockConfig.getThirdPartyExcludes()).thenReturn(Collections.emptySet());
+        when(mockConfig.getThirdPartyShadingIdentifiers()).thenReturn(Collections.emptySet());
+    }
 
-  @Test
-  void testGetExcludesContainsDefaultExclude() {
-    assertTrue(ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig).contains("java."));
-  }
+    @Test
+    void testGetExcludesContainsDefaultExclude() {
+        assertTrue(
+                ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig).contains("java."));
+    }
 
-  @Test
-  void testGetExcludesWithExplicitExclude() {
-    when(mockConfig.getThirdPartyIncludes())
-        .thenReturn(Collections.singleton("com.datadog.debugger"));
-    assertTrue(
-        ThirdPartyLibraries.INSTANCE
-            .getThirdPartyLibraries(mockConfig)
-            .contains("com.datadog.debugger"));
-  }
+    @Test
+    void testGetExcludesWithExplicitExclude() {
+        when(mockConfig.getThirdPartyIncludes()).thenReturn(Collections.singleton("com.datadog.debugger"));
+        assertTrue(
+                ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig).contains("com.datadog.debugger"));
+    }
 
-  @Test
-  void testGetExcludesWithExplicitExcludeAndExplicitInclude() {
-    when(mockConfig.getThirdPartyIncludes())
-        .thenReturn(Collections.singleton("com.datadog.debugger"));
-    when(mockConfig.getThirdPartyExcludes())
-        .thenReturn(Collections.singleton("com.datadog.debugger"));
-    assertTrue(
-        ThirdPartyLibraries.INSTANCE
-            .getThirdPartyLibraries(mockConfig)
-            .contains("com.datadog.debugger"));
-    assertTrue(
-        ThirdPartyLibraries.INSTANCE
-            .getThirdPartyExcludes(mockConfig)
-            .contains("com.datadog.debugger"));
-  }
+    @Test
+    void testGetExcludesWithExplicitExcludeAndExplicitInclude() {
+        when(mockConfig.getThirdPartyIncludes()).thenReturn(Collections.singleton("com.datadog.debugger"));
+        when(mockConfig.getThirdPartyExcludes()).thenReturn(Collections.singleton("com.datadog.debugger"));
+        assertTrue(
+                ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig).contains("com.datadog.debugger"));
+        assertTrue(
+                ThirdPartyLibraries.INSTANCE.getThirdPartyExcludes(mockConfig).contains("com.datadog.debugger"));
+    }
 
-  @Test
-  void testGetExcludesWithoutExplicitConfig() {
-    assertNotNull(ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig));
-    assertFalse(ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig).isEmpty());
-  }
+    @Test
+    void testGetExcludesWithoutExplicitConfig() {
+        assertNotNull(ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig));
+        assertFalse(
+                ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig).isEmpty());
+    }
 
-  @Test
-  void testGetExcludesWithIncludeOverridingDefaultExclude() {
-    when(mockConfig.getThirdPartyExcludes()).thenReturn(Collections.singleton("java."));
-    assertTrue(ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig).contains("java."));
-    assertTrue(ThirdPartyLibraries.INSTANCE.getThirdPartyExcludes(mockConfig).contains("java."));
-  }
+    @Test
+    void testGetExcludesWithIncludeOverridingDefaultExclude() {
+        when(mockConfig.getThirdPartyExcludes()).thenReturn(Collections.singleton("java."));
+        assertTrue(
+                ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig).contains("java."));
+        assertTrue(
+                ThirdPartyLibraries.INSTANCE.getThirdPartyExcludes(mockConfig).contains("java."));
+    }
 
-  @Test
-  void testGetExcludeAll() {
-    Set<String> excludeAll = ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(null);
-    for (char c : ThirdPartyLibraries.ALPHABET) assertTrue(excludeAll.contains(String.valueOf(c)));
-  }
+    @Test
+    void testGetExcludeAll() {
+        Set<String> excludeAll = ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(null);
+        for (char c : ThirdPartyLibraries.ALPHABET) assertTrue(excludeAll.contains(String.valueOf(c)));
+    }
 
-  @Test
-  void testEmptyStrings() {
-    int expectedIncludeDefaultSize =
-        ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig).size();
-    int expectedShadingDefaultSize =
-        ThirdPartyLibraries.INSTANCE.getShadingIdentifiers(mockConfig).size();
-    when(mockConfig.getThirdPartyIncludes()).thenReturn(Collections.singleton(""));
-    when(mockConfig.getThirdPartyExcludes()).thenReturn(Collections.singleton(""));
-    when(mockConfig.getThirdPartyShadingIdentifiers()).thenReturn(Collections.singleton(""));
-    assertEquals(
-        expectedIncludeDefaultSize,
-        ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig).size());
-    assertTrue(ThirdPartyLibraries.INSTANCE.getThirdPartyExcludes(mockConfig).isEmpty());
-    assertEquals(
-        expectedShadingDefaultSize,
-        ThirdPartyLibraries.INSTANCE.getShadingIdentifiers(mockConfig).size());
-  }
+    @Test
+    void testEmptyStrings() {
+        int expectedIncludeDefaultSize =
+                ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig).size();
+        int expectedShadingDefaultSize =
+                ThirdPartyLibraries.INSTANCE.getShadingIdentifiers(mockConfig).size();
+        when(mockConfig.getThirdPartyIncludes()).thenReturn(Collections.singleton(""));
+        when(mockConfig.getThirdPartyExcludes()).thenReturn(Collections.singleton(""));
+        when(mockConfig.getThirdPartyShadingIdentifiers()).thenReturn(Collections.singleton(""));
+        assertEquals(
+                expectedIncludeDefaultSize,
+                ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig).size());
+        assertTrue(
+                ThirdPartyLibraries.INSTANCE.getThirdPartyExcludes(mockConfig).isEmpty());
+        assertEquals(
+                expectedShadingDefaultSize,
+                ThirdPartyLibraries.INSTANCE.getShadingIdentifiers(mockConfig).size());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/TopLevelHelper.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/TopLevelHelper.java
index 3e716443477..cff118edbd5 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/TopLevelHelper.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/TopLevelHelper.java
@@ -3,5 +3,5 @@
 public class TopLevelHelper {}
 
 class MyTopLevelClass {
-  public void process() {}
+    public void process() {}
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/TransformerDefinitionMatcherTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/TransformerDefinitionMatcherTest.java
index 96b7bf2da05..21080309643 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/TransformerDefinitionMatcherTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/TransformerDefinitionMatcherTest.java
@@ -13,220 +13,214 @@
 import org.junit.jupiter.api.Test;
 
 public class TransformerDefinitionMatcherTest {
-  private static final ProbeId PROBE_ID1 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f6", 0);
-  private static final ProbeId PROBE_ID2 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f7", 0);
-  private static final ProbeId PROBE_ID3 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
-  private static final String SERVICE_NAME = "service-name";
-
-  @Test
-  public void empty() {
-    TransformerDefinitionMatcher matcher = createMatcher();
-    assertTrue(matcher.isEmpty());
-  }
-
-  @Test
-  public void fullQualifiedClassName() {
-    LogProbe probe = createProbe(PROBE_ID1, "java.lang.String", "indexOf");
-    TransformerDefinitionMatcher matcher = createMatcher(probe);
-    List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
-    assertEquals(1, probeDefinitions.size());
-    assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
-  }
-
-  @Test
-  public void simpleClassName() {
-    LogProbe probe = createProbe(PROBE_ID1, "String", "indexOf");
-    TransformerDefinitionMatcher matcher = createMatcher(probe);
-    List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
-    assertEquals(1, probeDefinitions.size());
-    assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
-  }
-
-  @Test
-  public void simpleClassNameNoClassRedefined() {
-    LogProbe probe = createProbe(PROBE_ID1, "String", "indexOf");
-    TransformerDefinitionMatcher matcher = createMatcher(probe);
-    List<ProbeDefinition> probeDefinitions =
-        matcher.match(
-            null,
-            getClassPath(String.class),
-            String.class.getTypeName(),
-            getClassFileBytes(String.class));
-    assertEquals(1, probeDefinitions.size());
-    assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
-  }
-
-  @Test
-  public void sourceFileFullFileName() {
-    LogProbe probe = createProbe(PROBE_ID1, "src/main/java/java/lang/String.java", 23);
-    TransformerDefinitionMatcher matcher = createMatcher(probe);
-    List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
-    assertEquals(1, probeDefinitions.size());
-    assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
-  }
-
-  @Test
-  public void sourceFileFullFileNameCaseInsensitive() {
-    LogProbe probe = createProbe(PROBE_ID1, "Src/Main/Java/Java/LanG/STRING.jAvA", 23);
-    TransformerDefinitionMatcher matcher = createMatcher(probe);
-    List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
-    assertEquals(1, probeDefinitions.size());
-    assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
-  }
-
-  @Test
-  public void sourceFileAbsoluteFileName() {
-    LogProbe probe =
-        createProbe(PROBE_ID1, "/home/user/project/src/main/java/java/lang/String.java", 23);
-    TransformerDefinitionMatcher matcher = createMatcher(probe);
-    List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
-    assertEquals(1, probeDefinitions.size());
-    assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
-  }
-
-  @Test
-  public void sourceFileWindowsStyleFileName() {
-    LogProbe probe = createProbe(PROBE_ID1, "src\\main\\java\\java\\lang\\String.java", 23);
-    TransformerDefinitionMatcher matcher = createMatcher(probe);
-    List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
-    assertEquals(1, probeDefinitions.size());
-    assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
-  }
-
-  @Test
-  public void sourceFileWindowsStyleAbsoluteFileName() {
-    LogProbe probe =
-        createProbe(
-            PROBE_ID1, "C:\\Users\\user\\project\\src\\main\\java\\java\\lang\\String.java", 23);
-    TransformerDefinitionMatcher matcher = createMatcher(probe);
-    List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
-    assertEquals(1, probeDefinitions.size());
-    assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
-  }
-
-  @Test
-  public void sourceFileSimpleFileName() {
-    LogProbe probe = createProbe(PROBE_ID1, "String.java", 23);
-    TransformerDefinitionMatcher matcher = createMatcher(probe);
-    List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
-    assertEquals(1, probeDefinitions.size());
-    assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
-  }
-
-  @Test
-  public void sourceFileSimpleFileNameCaseInsensitive() {
-    LogProbe probe = createProbe(PROBE_ID1, "sTRINg.JAVA", 23);
-    TransformerDefinitionMatcher matcher = createMatcher(probe);
-    List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
-    assertEquals(1, probeDefinitions.size());
-    assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
-  }
-
-  @Test
-  public void multiProbesFQN() {
-    LogProbe probe1 = createProbe(PROBE_ID1, "java.lang.String", "indexOf");
-    LogProbe probe2 = createProbe(PROBE_ID2, "java.lang.String", "substring");
-    TransformerDefinitionMatcher matcher = createMatcher(probe1, probe2);
-    List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
-    assertEquals(2, probeDefinitions.size());
-    assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
-    assertEquals(PROBE_ID2, probeDefinitions.get(1).getProbeId());
-  }
-
-  @Test
-  public void multiProbesSimpleName() {
-    LogProbe probe1 = createProbe(PROBE_ID1, "String", "indexOf");
-    LogProbe probe2 = createProbe(PROBE_ID2, "String", "substring");
-    TransformerDefinitionMatcher matcher = createMatcher(probe1, probe2);
-    List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
-    assertEquals(2, probeDefinitions.size());
-    assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
-    assertEquals(PROBE_ID2, probeDefinitions.get(1).getProbeId());
-  }
-
-  @Test
-  public void multiProbesSourceFile() {
-    LogProbe probe1 = createProbe(PROBE_ID1, "src/main/java/java/lang/String.java", 23);
-    LogProbe probe2 = createProbe(PROBE_ID2, "src/main/java/java/lang/String.java", 42);
-    TransformerDefinitionMatcher matcher = createMatcher(probe1, probe2);
-    List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
-    assertEquals(2, probeDefinitions.size());
-    assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
-    assertEquals(PROBE_ID2, probeDefinitions.get(1).getProbeId());
-  }
-
-  @Test
-  public void mixedProbesFQNSimple() {
-    LogProbe probe1 = createProbe(PROBE_ID1, "java.lang.String", "indexOf");
-    LogProbe probe2 = createProbe(PROBE_ID2, "String", "substring");
-    TransformerDefinitionMatcher matcher = createMatcher(probe1, probe2);
-    List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
-    assertEquals(2, probeDefinitions.size());
-    assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
-    assertEquals(PROBE_ID2, probeDefinitions.get(1).getProbeId());
-  }
-
-  @Test
-  public void mixedSnapshotMetricProbes() {
-    LogProbe probe1 = createProbe(PROBE_ID1, "java.lang.String", "indexOf");
-    MetricProbe probe2 = createMetric(PROBE_ID2, "String", "substring");
-    TransformerDefinitionMatcher matcher = createMatcher(probe1, probe2);
-    List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
-    assertEquals(2, probeDefinitions.size());
-    assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
-    assertEquals(PROBE_ID2, probeDefinitions.get(1).getProbeId());
-  }
-
-  @Test
-  public void partialSimpleNameShouldNotMatch() {
-    LogProbe probe1 = createProbe(PROBE_ID1, "SuperString.java", 11);
-    TransformerDefinitionMatcher matcher = createMatcher(probe1);
-    List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
-    assertEquals(0, probeDefinitions.size());
-  }
-
-  @Test
-  public void mixedSourceFileName() {
-    LogProbe probe1 = createProbe(PROBE_ID1, "src/main/java/java/lang/String.java", 23);
-    LogProbe probe2 = createProbe(PROBE_ID2, "myproject/src/main/java/java/lang/String.java", 42);
-    LogProbe probe3 = createProbe(PROBE_ID3, "String.java", 11);
-    TransformerDefinitionMatcher matcher = createMatcher(probe1, probe2, probe3);
-    List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
-    assertEquals(3, probeDefinitions.size());
-    assertEquals(PROBE_ID1.getId(), probeDefinitions.get(0).getId());
-    assertEquals(PROBE_ID2.getId(), probeDefinitions.get(1).getId());
-    assertEquals(PROBE_ID3.getId(), probeDefinitions.get(2).getId());
-  }
-
-  private TransformerDefinitionMatcher createMatcher(ProbeDefinition... probes) {
-    return new TransformerDefinitionMatcher(new Configuration(SERVICE_NAME, asList(probes)));
-  }
-
-  private static List<ProbeDefinition> match(TransformerDefinitionMatcher matcher, Class<?> clazz) {
-    return matcher.match(clazz, getClassPath(clazz), clazz.getName(), getClassFileBytes(clazz));
-  }
-
-  private LogProbe createProbe(ProbeId probeId, String typeName, String methodName) {
-    return LogProbe.builder().probeId(probeId).where(typeName, methodName).build();
-  }
-
-  private LogProbe createProbe(ProbeId probeId, String sourceFileName, int line) {
-    return LogProbe.builder()
-        .probeId(probeId)
-        .where(null, null, null, line, sourceFileName)
-        .build();
-  }
-
-  private MetricProbe createMetric(ProbeId probeId, String typeName, String methodName) {
-    return MetricProbe.builder()
-        .probeId(probeId)
-        .where(typeName, methodName)
-        .metricName("count")
-        .kind(MetricProbe.MetricKind.COUNT)
-        .build();
-  }
-
-  private static String getClassPath(Class<?> clazz) {
-    return clazz.getName().replace('.', '/');
-  }
+    private static final ProbeId PROBE_ID1 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f6", 0);
+    private static final ProbeId PROBE_ID2 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f7", 0);
+    private static final ProbeId PROBE_ID3 = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
+    private static final String SERVICE_NAME = "service-name";
+
+    @Test
+    public void empty() {
+        TransformerDefinitionMatcher matcher = createMatcher();
+        assertTrue(matcher.isEmpty());
+    }
+
+    @Test
+    public void fullQualifiedClassName() {
+        LogProbe probe = createProbe(PROBE_ID1, "java.lang.String", "indexOf");
+        TransformerDefinitionMatcher matcher = createMatcher(probe);
+        List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
+        assertEquals(1, probeDefinitions.size());
+        assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
+    }
+
+    @Test
+    public void simpleClassName() {
+        LogProbe probe = createProbe(PROBE_ID1, "String", "indexOf");
+        TransformerDefinitionMatcher matcher = createMatcher(probe);
+        List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
+        assertEquals(1, probeDefinitions.size());
+        assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
+    }
+
+    @Test
+    public void simpleClassNameNoClassRedefined() {
+        LogProbe probe = createProbe(PROBE_ID1, "String", "indexOf");
+        TransformerDefinitionMatcher matcher = createMatcher(probe);
+        List<ProbeDefinition> probeDefinitions = matcher.match(
+                null, getClassPath(String.class), String.class.getTypeName(), getClassFileBytes(String.class));
+        assertEquals(1, probeDefinitions.size());
+        assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
+    }
+
+    @Test
+    public void sourceFileFullFileName() {
+        LogProbe probe = createProbe(PROBE_ID1, "src/main/java/java/lang/String.java", 23);
+        TransformerDefinitionMatcher matcher = createMatcher(probe);
+        List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
+        assertEquals(1, probeDefinitions.size());
+        assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
+    }
+
+    @Test
+    public void sourceFileFullFileNameCaseInsensitive() {
+        LogProbe probe = createProbe(PROBE_ID1, "Src/Main/Java/Java/LanG/STRING.jAvA", 23);
+        TransformerDefinitionMatcher matcher = createMatcher(probe);
+        List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
+        assertEquals(1, probeDefinitions.size());
+        assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
+    }
+
+    @Test
+    public void sourceFileAbsoluteFileName() {
+        LogProbe probe = createProbe(PROBE_ID1, "/home/user/project/src/main/java/java/lang/String.java", 23);
+        TransformerDefinitionMatcher matcher = createMatcher(probe);
+        List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
+        assertEquals(1, probeDefinitions.size());
+        assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
+    }
+
+    @Test
+    public void sourceFileWindowsStyleFileName() {
+        LogProbe probe = createProbe(PROBE_ID1, "src\\main\\java\\java\\lang\\String.java", 23);
+        TransformerDefinitionMatcher matcher = createMatcher(probe);
+        List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
+        assertEquals(1, probeDefinitions.size());
+        assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
+    }
+
+    @Test
+    public void sourceFileWindowsStyleAbsoluteFileName() {
+        LogProbe probe =
+                createProbe(PROBE_ID1, "C:\\Users\\user\\project\\src\\main\\java\\java\\lang\\String.java", 23);
+        TransformerDefinitionMatcher matcher = createMatcher(probe);
+        List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
+        assertEquals(1, probeDefinitions.size());
+        assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
+    }
+
+    @Test
+    public void sourceFileSimpleFileName() {
+        LogProbe probe = createProbe(PROBE_ID1, "String.java", 23);
+        TransformerDefinitionMatcher matcher = createMatcher(probe);
+        List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
+        assertEquals(1, probeDefinitions.size());
+        assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
+    }
+
+    @Test
+    public void sourceFileSimpleFileNameCaseInsensitive() {
+        LogProbe probe = createProbe(PROBE_ID1, "sTRINg.JAVA", 23);
+        TransformerDefinitionMatcher matcher = createMatcher(probe);
+        List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
+        assertEquals(1, probeDefinitions.size());
+        assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
+    }
+
+    @Test
+    public void multiProbesFQN() {
+        LogProbe probe1 = createProbe(PROBE_ID1, "java.lang.String", "indexOf");
+        LogProbe probe2 = createProbe(PROBE_ID2, "java.lang.String", "substring");
+        TransformerDefinitionMatcher matcher = createMatcher(probe1, probe2);
+        List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
+        assertEquals(2, probeDefinitions.size());
+        assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
+        assertEquals(PROBE_ID2, probeDefinitions.get(1).getProbeId());
+    }
+
+    @Test
+    public void multiProbesSimpleName() {
+        LogProbe probe1 = createProbe(PROBE_ID1, "String", "indexOf");
+        LogProbe probe2 = createProbe(PROBE_ID2, "String", "substring");
+        TransformerDefinitionMatcher matcher = createMatcher(probe1, probe2);
+        List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
+        assertEquals(2, probeDefinitions.size());
+        assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
+        assertEquals(PROBE_ID2, probeDefinitions.get(1).getProbeId());
+    }
+
+    @Test
+    public void multiProbesSourceFile() {
+        LogProbe probe1 = createProbe(PROBE_ID1, "src/main/java/java/lang/String.java", 23);
+        LogProbe probe2 = createProbe(PROBE_ID2, "src/main/java/java/lang/String.java", 42);
+        TransformerDefinitionMatcher matcher = createMatcher(probe1, probe2);
+        List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
+        assertEquals(2, probeDefinitions.size());
+        assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
+        assertEquals(PROBE_ID2, probeDefinitions.get(1).getProbeId());
+    }
+
+    @Test
+    public void mixedProbesFQNSimple() {
+        LogProbe probe1 = createProbe(PROBE_ID1, "java.lang.String", "indexOf");
+        LogProbe probe2 = createProbe(PROBE_ID2, "String", "substring");
+        TransformerDefinitionMatcher matcher = createMatcher(probe1, probe2);
+        List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
+        assertEquals(2, probeDefinitions.size());
+        assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
+        assertEquals(PROBE_ID2, probeDefinitions.get(1).getProbeId());
+    }
+
+    @Test
+    public void mixedSnapshotMetricProbes() {
+        LogProbe probe1 = createProbe(PROBE_ID1, "java.lang.String", "indexOf");
+        MetricProbe probe2 = createMetric(PROBE_ID2, "String", "substring");
+        TransformerDefinitionMatcher matcher = createMatcher(probe1, probe2);
+        List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
+        assertEquals(2, probeDefinitions.size());
+        assertEquals(PROBE_ID1, probeDefinitions.get(0).getProbeId());
+        assertEquals(PROBE_ID2, probeDefinitions.get(1).getProbeId());
+    }
+
+    @Test
+    public void partialSimpleNameShouldNotMatch() {
+        LogProbe probe1 = createProbe(PROBE_ID1, "SuperString.java", 11);
+        TransformerDefinitionMatcher matcher = createMatcher(probe1);
+        List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
+        assertEquals(0, probeDefinitions.size());
+    }
+
+    @Test
+    public void mixedSourceFileName() {
+        LogProbe probe1 = createProbe(PROBE_ID1, "src/main/java/java/lang/String.java", 23);
+        LogProbe probe2 = createProbe(PROBE_ID2, "myproject/src/main/java/java/lang/String.java", 42);
+        LogProbe probe3 = createProbe(PROBE_ID3, "String.java", 11);
+        TransformerDefinitionMatcher matcher = createMatcher(probe1, probe2, probe3);
+        List<ProbeDefinition> probeDefinitions = match(matcher, String.class);
+        assertEquals(3, probeDefinitions.size());
+        assertEquals(PROBE_ID1.getId(), probeDefinitions.get(0).getId());
+        assertEquals(PROBE_ID2.getId(), probeDefinitions.get(1).getId());
+        assertEquals(PROBE_ID3.getId(), probeDefinitions.get(2).getId());
+    }
+
+    private TransformerDefinitionMatcher createMatcher(ProbeDefinition... probes) {
+        return new TransformerDefinitionMatcher(new Configuration(SERVICE_NAME, asList(probes)));
+    }
+
+    private static List<ProbeDefinition> match(TransformerDefinitionMatcher matcher, Class<?> clazz) {
+        return matcher.match(clazz, getClassPath(clazz), clazz.getName(), getClassFileBytes(clazz));
+    }
+
+    private LogProbe createProbe(ProbeId probeId, String typeName, String methodName) {
+        return LogProbe.builder().probeId(probeId).where(typeName, methodName).build();
+    }
+
+    private LogProbe createProbe(ProbeId probeId, String sourceFileName, int line) {
+        return LogProbe.builder()
+                .probeId(probeId)
+                .where(null, null, null, line, sourceFileName)
+                .build();
+    }
+
+    private MetricProbe createMetric(ProbeId probeId, String typeName, String methodName) {
+        return MetricProbe.builder()
+                .probeId(probeId)
+                .where(typeName, methodName)
+                .metricName("count")
+                .kind(MetricProbe.MetricKind.COUNT)
+                .build();
+    }
+
+    private static String getClassPath(Class<?> clazz) {
+        return clazz.getName().replace('.', '/');
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/TrieTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/TrieTest.java
index f0a5c24b71f..c2edd8bd4e0 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/TrieTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/TrieTest.java
@@ -10,68 +10,68 @@
 
 public class TrieTest {
 
-  @Test
-  public void prefixMatching() {
-    Trie trie = new Trie();
-    trie.insert("foo");
-    trie.insert("bar");
-    assertTrue(trie.hasMatchingPrefix("foobar"));
-    assertTrue(trie.hasMatchingPrefix("barfoo"));
-    assertFalse(trie.hasMatchingPrefix("fobar"));
-    assertFalse(trie.hasMatchingPrefix("bafoo"));
-    assertFalse(trie.hasMatchingPrefix(""));
-  }
+    @Test
+    public void prefixMatching() {
+        Trie trie = new Trie();
+        trie.insert("foo");
+        trie.insert("bar");
+        assertTrue(trie.hasMatchingPrefix("foobar"));
+        assertTrue(trie.hasMatchingPrefix("barfoo"));
+        assertFalse(trie.hasMatchingPrefix("fobar"));
+        assertFalse(trie.hasMatchingPrefix("bafoo"));
+        assertFalse(trie.hasMatchingPrefix(""));
+    }
 
-  @Test
-  public void startsWith() {
-    Trie trie = new Trie();
-    trie.insert("abcde");
-    trie.insert("abcfe");
-    assertTrue(trie.containsPrefix("a"));
-    assertTrue(trie.containsPrefix("abc"));
-    assertTrue(trie.containsPrefix("abcde"));
-    assertTrue(trie.containsPrefix("abcfe"));
-    assertFalse(trie.containsPrefix("sgsg"));
-  }
+    @Test
+    public void startsWith() {
+        Trie trie = new Trie();
+        trie.insert("abcde");
+        trie.insert("abcfe");
+        assertTrue(trie.containsPrefix("a"));
+        assertTrue(trie.containsPrefix("abc"));
+        assertTrue(trie.containsPrefix("abcde"));
+        assertTrue(trie.containsPrefix("abcfe"));
+        assertFalse(trie.containsPrefix("sgsg"));
+    }
 
-  @Test
-  public void getStringStartingWith() {
-    Trie trie = new Trie();
-    trie.insert("java.Main/debugger/datadog/com/java/main/src");
-    trie.insert("java.Configuration/config/debugger/datadog/com/java/main/src");
-    assertEquals(
-        "java.Main/debugger/datadog/com/java/main/src",
-        trie.getStringStartingWith("java.Main/debugger/datadog/com"));
-  }
+    @Test
+    public void getStringStartingWith() {
+        Trie trie = new Trie();
+        trie.insert("java.Main/debugger/datadog/com/java/main/src");
+        trie.insert("java.Configuration/config/debugger/datadog/com/java/main/src");
+        assertEquals(
+                "java.Main/debugger/datadog/com/java/main/src",
+                trie.getStringStartingWith("java.Main/debugger/datadog/com"));
+    }
 
-  @Test
-  public void getStringStartingWithAmbiguous() {
-    Trie trie = new Trie();
-    trie.insert("abcde");
-    trie.insert("abcfe");
-    assertNull(trie.getStringStartingWith("abc"));
-  }
+    @Test
+    public void getStringStartingWithAmbiguous() {
+        Trie trie = new Trie();
+        trie.insert("abcde");
+        trie.insert("abcfe");
+        assertNull(trie.getStringStartingWith("abc"));
+    }
 
-  @Test
-  public void getStringsStartingWith() {
-    Trie trie = new Trie();
-    trie.insert("java.Main");
-    trie.insert("java.Main/debugger/datadog/com/java/main/src");
-    trie.insert("java.Main/debugger/datadog/com/java/main/src/myproject");
-    trie.insert("java.Configuration/config/debugger/datadog/com/java/main/src");
-    Collection<String> strings = trie.getStringsStartingWith("java.Main/debugger/datadog/com");
-    assertEquals(2, strings.size());
-    assertTrue(strings.contains("java.Main/debugger/datadog/com/java/main/src"));
-    assertTrue(strings.contains("java.Main/debugger/datadog/com/java/main/src/myproject"));
-  }
+    @Test
+    public void getStringsStartingWith() {
+        Trie trie = new Trie();
+        trie.insert("java.Main");
+        trie.insert("java.Main/debugger/datadog/com/java/main/src");
+        trie.insert("java.Main/debugger/datadog/com/java/main/src/myproject");
+        trie.insert("java.Configuration/config/debugger/datadog/com/java/main/src");
+        Collection<String> strings = trie.getStringsStartingWith("java.Main/debugger/datadog/com");
+        assertEquals(2, strings.size());
+        assertTrue(strings.contains("java.Main/debugger/datadog/com/java/main/src"));
+        assertTrue(strings.contains("java.Main/debugger/datadog/com/java/main/src/myproject"));
+    }
 
-  @Test
-  public void empty() {
-    Trie trie = new Trie();
-    assertTrue(trie.isEmpty());
-    trie.insert("");
-    assertTrue(trie.isEmpty());
-    trie.insert("abc");
-    assertFalse(trie.isEmpty());
-  }
+    @Test
+    public void empty() {
+        Trie trie = new Trie();
+        assertTrue(trie.isEmpty());
+        trie.insert("");
+        assertTrue(trie.isEmpty());
+        trie.insert("abc");
+        assertFalse(trie.isEmpty());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/TypeNameHelperTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/TypeNameHelperTest.java
index 07a9297a908..1f41e0a7067 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/TypeNameHelperTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/TypeNameHelperTest.java
@@ -6,12 +6,10 @@
 
 public class TypeNameHelperTest {
 
-  @Test
-  public void extractSimpleName() {
-    Assertions.assertEquals("String", TypeNameHelper.extractSimpleName(String.class));
-    Assertions.assertEquals(
-        "String", TypeNameHelper.extractSimpleNameFromName(String.class.getTypeName()));
-    Assertions.assertEquals(
-        "Entry", TypeNameHelper.extractSimpleNameFromName(Map.Entry.class.getTypeName()));
-  }
+    @Test
+    public void extractSimpleName() {
+        Assertions.assertEquals("String", TypeNameHelper.extractSimpleName(String.class));
+        Assertions.assertEquals("String", TypeNameHelper.extractSimpleNameFromName(String.class.getTypeName()));
+        Assertions.assertEquals("Entry", TypeNameHelper.extractSimpleNameFromName(Map.Entry.class.getTypeName()));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/el/ELIntegrationSanityTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/el/ELIntegrationSanityTest.java
index 7b6382cae21..137e210a9bb 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/el/ELIntegrationSanityTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/el/ELIntegrationSanityTest.java
@@ -19,64 +19,60 @@
 import org.junit.jupiter.api.Test;
 
 public class ELIntegrationSanityTest {
-  static class Name {
-    private String value;
+    static class Name {
+        private String value;
 
-    public Name(String value) {
-      this.value = value;
+        public Name(String value) {
+            this.value = value;
+        }
     }
-  }
 
-  static class Person {
-    private static final String C1 = "constant1";
-    private static final int C2 = 42;
-    private static List<String> list = new ArrayList<>();
-    private String strVal = "strval";
-    private int intVal = 24;
-    private Map<String, String> mapVal = new HashMap<>();
-    private Object[] objArray = new Object[] {new AtomicLong()};
-    private Name name = new Name("name");
-  }
+    static class Person {
+        private static final String C1 = "constant1";
+        private static final int C2 = 42;
+        private static List<String> list = new ArrayList<>();
+        private String strVal = "strval";
+        private int intVal = 24;
+        private Map<String, String> mapVal = new HashMap<>();
+        private Object[] objArray = new Object[] {new AtomicLong()};
+        private Name name = new Name("name");
+    }
 
-  @Test
-  void extractAfterEl() throws IllegalAccessException {
-    JsonSnapshotSerializer serializer =
-        new JsonSnapshotSerializer(); // Mockito.spy(new JsonSnapshotSerializer());
-    DebuggerContext.initValueSerializer(serializer);
-    Person p = new Person();
-    // set the limit not to follow references to fields
-    Limits initialLimits = new Limits(2, 0, Integer.MAX_VALUE, Integer.MAX_VALUE);
-    // create new captured context
-    CapturedContext capturedContext = new CapturedContext();
-    CapturedContext.CapturedValue thisValue =
-        CapturedContext.CapturedValue.of(
-            "this",
-            Person.class.getName(),
-            p,
-            initialLimits.maxReferenceDepth,
-            initialLimits.maxCollectionSize,
-            initialLimits.maxLength,
-            initialLimits.maxFieldCount);
-    capturedContext.addArguments(new CapturedContext.CapturedValue[] {thisValue});
+    @Test
+    void extractAfterEl() throws IllegalAccessException {
+        JsonSnapshotSerializer serializer = new JsonSnapshotSerializer(); // Mockito.spy(new JsonSnapshotSerializer());
+        DebuggerContext.initValueSerializer(serializer);
+        Person p = new Person();
+        // set the limit not to follow references to fields
+        Limits initialLimits = new Limits(2, 0, Integer.MAX_VALUE, Integer.MAX_VALUE);
+        // create new captured context
+        CapturedContext capturedContext = new CapturedContext();
+        CapturedContext.CapturedValue thisValue = CapturedContext.CapturedValue.of(
+                "this",
+                Person.class.getName(),
+                p,
+                initialLimits.maxReferenceDepth,
+                initialLimits.maxCollectionSize,
+                initialLimits.maxLength,
+                initialLimits.maxFieldCount);
+        capturedContext.addArguments(new CapturedContext.CapturedValue[] {thisValue});
 
-    // '.name.value' is not present in the snapshot - it needs to be retrieved via reflection
-    Value<?> val =
-        DSL.getMember(DSL.ref("name"), "value")
-            .evaluate(
-                new EvalContext(
-                    capturedContext, TimeoutChecker.create(Config.get(), Duration.ofMillis(1000))));
-    // make sure the nested field was properly resolved
-    assertEquals(p.name.value, val.getValue());
+        // '.name.value' is not present in the snapshot - it needs to be retrieved via reflection
+        Value<?> val = DSL.getMember(DSL.ref("name"), "value")
+                .evaluate(
+                        new EvalContext(capturedContext, TimeoutChecker.create(Config.get(), Duration.ofMillis(1000))));
+        // make sure the nested field was properly resolved
+        assertEquals(p.name.value, val.getValue());
 
-    // freeze the captured context
-    capturedContext.freeze(TimeoutChecker.create(Config.get(), Duration.of(1, ChronoUnit.SECONDS)));
+        // freeze the captured context
+        capturedContext.freeze(TimeoutChecker.create(Config.get(), Duration.of(1, ChronoUnit.SECONDS)));
 
-    // after freezing the original value is removed and only the serialized json representation
-    // remains
-    Map<String, CapturedContext.CapturedValue> thisFields =
-        getFields(capturedContext.getArguments().get("this"));
-    Map<String, CapturedContext.CapturedValue> name =
-        (Map<String, CapturedContext.CapturedValue>) thisFields.get("name").getValue();
-    assertEquals(p.name.value, name.get("value").getValue());
-  }
+        // after freezing the original value is removed and only the serialized json representation
+        // remains
+        Map<String, CapturedContext.CapturedValue> thisFields =
+                getFields(capturedContext.getArguments().get("this"));
+        Map<String, CapturedContext.CapturedValue> name = (Map<String, CapturedContext.CapturedValue>)
+                thisFields.get("name").getValue();
+        assertEquals(p.name.value, name.get("value").getValue());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/DefaultExceptionDebuggerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/DefaultExceptionDebuggerTest.java
index 5fb5a05bf5d..201c9439b1c 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/DefaultExceptionDebuggerTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/DefaultExceptionDebuggerTest.java
@@ -54,461 +54,430 @@
 
 public class DefaultExceptionDebuggerTest {
 
-  private ClassNameFiltering classNameFiltering;
-  private ConfigurationUpdater configurationUpdater;
-  private DefaultExceptionDebugger exceptionDebugger;
-  private TestSnapshotListener listener;
-  private TagMap spanTags = TagMap.create();
+    private ClassNameFiltering classNameFiltering;
+    private ConfigurationUpdater configurationUpdater;
+    private DefaultExceptionDebugger exceptionDebugger;
+    private TestSnapshotListener listener;
+    private TagMap spanTags = TagMap.create();
 
-  @BeforeEach
-  public void setUp() {
-    configurationUpdater = mock(ConfigurationUpdater.class);
-    classNameFiltering =
-        new ClassNameFiltering(
-            new HashSet<>(singletonList("com.datadog.debugger.exception.ThirdPartyCode")));
-    Config config = createConfig();
-    exceptionDebugger =
-        new DefaultExceptionDebugger(configurationUpdater, classNameFiltering, config);
-    listener = new TestSnapshotListener(createConfig(), mock(ProbeStatusSink.class));
-    DebuggerAgentHelper.injectSink(listener);
-  }
+    @BeforeEach
+    public void setUp() {
+        configurationUpdater = mock(ConfigurationUpdater.class);
+        classNameFiltering =
+                new ClassNameFiltering(new HashSet<>(singletonList("com.datadog.debugger.exception.ThirdPartyCode")));
+        Config config = createConfig();
+        exceptionDebugger = new DefaultExceptionDebugger(configurationUpdater, classNameFiltering, config);
+        listener = new TestSnapshotListener(createConfig(), mock(ProbeStatusSink.class));
+        DebuggerAgentHelper.injectSink(listener);
+    }
 
-  @Test
-  public void simpleException() {
-    RuntimeException exception = new RuntimeException("test");
-    String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
-    AgentSpan span = mock(AgentSpan.class);
-    exceptionDebugger.handleException(exception, span);
-    assertWithTimeout(
-        () -> exceptionDebugger.getExceptionProbeManager().isAlreadyInstrumented(fingerprint),
-        Duration.ofSeconds(30));
-    exceptionDebugger.handleException(exception, span);
-    verify(configurationUpdater).accept(eq(ConfigurationAcceptor.Source.EXCEPTION), any());
-  }
+    @Test
+    public void simpleException() {
+        RuntimeException exception = new RuntimeException("test");
+        String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
+        AgentSpan span = mock(AgentSpan.class);
+        exceptionDebugger.handleException(exception, span);
+        assertWithTimeout(
+                () -> exceptionDebugger.getExceptionProbeManager().isAlreadyInstrumented(fingerprint),
+                Duration.ofSeconds(30));
+        exceptionDebugger.handleException(exception, span);
+        verify(configurationUpdater).accept(eq(ConfigurationAcceptor.Source.EXCEPTION), any());
+    }
 
-  @Test
-  public void doubleHandleException() {
-    RuntimeException exception = new RuntimeException("test");
-    String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
-    AgentSpan span = mock(AgentSpan.class);
-    exceptionDebugger.handleException(exception, span);
-    assertWithTimeout(
-        () -> exceptionDebugger.getExceptionProbeManager().isAlreadyInstrumented(fingerprint),
-        Duration.ofSeconds(30));
-    exceptionDebugger.handleException(exception, span);
-    verify(configurationUpdater).accept(eq(ConfigurationAcceptor.Source.EXCEPTION), any());
-  }
+    @Test
+    public void doubleHandleException() {
+        RuntimeException exception = new RuntimeException("test");
+        String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
+        AgentSpan span = mock(AgentSpan.class);
+        exceptionDebugger.handleException(exception, span);
+        assertWithTimeout(
+                () -> exceptionDebugger.getExceptionProbeManager().isAlreadyInstrumented(fingerprint),
+                Duration.ofSeconds(30));
+        exceptionDebugger.handleException(exception, span);
+        verify(configurationUpdater).accept(eq(ConfigurationAcceptor.Source.EXCEPTION), any());
+    }
 
-  @Test
-  public void nestedException() {
-    RuntimeException exception = createNestException();
-    String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
-    AgentSpan span = mock(AgentSpan.class);
-    doAnswer(this::recordTags).when(span).setTag(anyString(), anyString());
-    exceptionDebugger.handleException(exception, span);
-    assertWithTimeout(
-        () -> exceptionDebugger.getExceptionProbeManager().isAlreadyInstrumented(fingerprint),
-        Duration.ofSeconds(30));
-    generateSnapshots(exception);
-    exception.printStackTrace();
-    Throwable innerMostException = ExceptionHelper.getInnerMostThrowable(exception);
-    // capture the state before the second call: a successful assignment removes it from the
-    // manager, so it can no longer be looked up by throwable afterwards
-    ExceptionProbeManager.ThrowableState state =
-        exceptionDebugger.getExceptionProbeManager().getStateByThrowable(innerMostException);
-    String exceptionId = state.getExceptionId();
-    exceptionDebugger.handleException(exception, span);
-    assertEquals(exceptionId, spanTags.get(DefaultExceptionDebugger.DD_DEBUG_ERROR_EXCEPTION_ID));
-    Map<String, Snapshot> snapshotMap =
-        listener.snapshots.stream().collect(toMap(Snapshot::getId, Function.identity()));
-    List<String> lines = parseStackTrace(exception);
-    int expectedFrameIndex =
-        findFrameIndex(
-            lines,
-            "com.datadog.debugger.exception.DefaultExceptionDebuggerTest.createNestException");
-    assertSnapshot(
-        spanTags,
-        snapshotMap,
-        expectedFrameIndex,
-        "com.datadog.debugger.exception.DefaultExceptionDebuggerTest",
-        "createNestException");
-    expectedFrameIndex =
-        findFrameIndex(
-            lines, "com.datadog.debugger.exception.DefaultExceptionDebuggerTest.nestedException");
-    assertSnapshot(
-        spanTags,
-        snapshotMap,
-        expectedFrameIndex,
-        "com.datadog.debugger.exception.DefaultExceptionDebuggerTest",
-        "nestedException");
-    expectedFrameIndex =
-        findFrameIndex(
-            lines,
-            "com.datadog.debugger.exception.DefaultExceptionDebuggerTest.createTest1Exception");
-    assertSnapshot(
-        spanTags,
-        snapshotMap,
-        expectedFrameIndex,
-        "com.datadog.debugger.exception.DefaultExceptionDebuggerTest",
-        "createTest1Exception");
-    // ThrowableState is keyed by the innermost throwable, not the top-level one passed to
-    // handleException: removal must use that same key or it silently leaks for chained exceptions
-    assertNull(
-        exceptionDebugger.getExceptionProbeManager().getStateByThrowable(innerMostException));
-    // make sure we are not leaking references
-    exception = null; // release strong reference
-    innerMostException = null;
-    System.gc();
-    // calling ExceptionProbeManager#hasExceptionStateTracked() will call WeakIdentityHashMap#size()
-    // through isEmpty() an will purge stale entries
-    assertWithTimeout(
-        () -> !exceptionDebugger.getExceptionProbeManager().hasExceptionStateTracked(),
-        Duration.ofSeconds(30));
-  }
+    @Test
+    public void nestedException() {
+        RuntimeException exception = createNestException();
+        String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
+        AgentSpan span = mock(AgentSpan.class);
+        doAnswer(this::recordTags).when(span).setTag(anyString(), anyString());
+        exceptionDebugger.handleException(exception, span);
+        assertWithTimeout(
+                () -> exceptionDebugger.getExceptionProbeManager().isAlreadyInstrumented(fingerprint),
+                Duration.ofSeconds(30));
+        generateSnapshots(exception);
+        exception.printStackTrace();
+        Throwable innerMostException = ExceptionHelper.getInnerMostThrowable(exception);
+        // capture the state before the second call: a successful assignment removes it from the
+        // manager, so it can no longer be looked up by throwable afterwards
+        ExceptionProbeManager.ThrowableState state =
+                exceptionDebugger.getExceptionProbeManager().getStateByThrowable(innerMostException);
+        String exceptionId = state.getExceptionId();
+        exceptionDebugger.handleException(exception, span);
+        assertEquals(exceptionId, spanTags.get(DefaultExceptionDebugger.DD_DEBUG_ERROR_EXCEPTION_ID));
+        Map<String, Snapshot> snapshotMap =
+                listener.snapshots.stream().collect(toMap(Snapshot::getId, Function.identity()));
+        List<String> lines = parseStackTrace(exception);
+        int expectedFrameIndex = findFrameIndex(
+                lines, "com.datadog.debugger.exception.DefaultExceptionDebuggerTest.createNestException");
+        assertSnapshot(
+                spanTags,
+                snapshotMap,
+                expectedFrameIndex,
+                "com.datadog.debugger.exception.DefaultExceptionDebuggerTest",
+                "createNestException");
+        expectedFrameIndex =
+                findFrameIndex(lines, "com.datadog.debugger.exception.DefaultExceptionDebuggerTest.nestedException");
+        assertSnapshot(
+                spanTags,
+                snapshotMap,
+                expectedFrameIndex,
+                "com.datadog.debugger.exception.DefaultExceptionDebuggerTest",
+                "nestedException");
+        expectedFrameIndex = findFrameIndex(
+                lines, "com.datadog.debugger.exception.DefaultExceptionDebuggerTest.createTest1Exception");
+        assertSnapshot(
+                spanTags,
+                snapshotMap,
+                expectedFrameIndex,
+                "com.datadog.debugger.exception.DefaultExceptionDebuggerTest",
+                "createTest1Exception");
+        // ThrowableState is keyed by the innermost throwable, not the top-level one passed to
+        // handleException: removal must use that same key or it silently leaks for chained exceptions
+        assertNull(exceptionDebugger.getExceptionProbeManager().getStateByThrowable(innerMostException));
+        // make sure we are not leaking references
+        exception = null; // release strong reference
+        innerMostException = null;
+        System.gc();
+        // calling ExceptionProbeManager#hasExceptionStateTracked() will call WeakIdentityHashMap#size()
+        // through isEmpty() an will purge stale entries
+        assertWithTimeout(
+                () -> !exceptionDebugger.getExceptionProbeManager().hasExceptionStateTracked(), Duration.ofSeconds(30));
+    }
 
-  @Test
-  public void doubleNestedException() {
-    RuntimeException nestedException = createNestException();
-    String nestedFingerprint = Fingerprinter.fingerprint(nestedException, classNameFiltering);
-    RuntimeException simpleException = new RuntimeException("test");
-    String simpleFingerprint = Fingerprinter.fingerprint(simpleException, classNameFiltering);
-    AgentSpan span = mock(AgentSpan.class);
-    doAnswer(this::recordTags).when(span).setTag(anyString(), anyString());
-    when(span.getTag(anyString()))
-        .thenAnswer(invocationOnMock -> spanTags.get(invocationOnMock.getArgument(0)));
-    when(span.getTags()).thenReturn(spanTags);
-    // instrument first nested Exception
-    exceptionDebugger.handleException(nestedException, span);
-    // instrument first simple Exception
-    exceptionDebugger.handleException(simpleException, span);
-    assertWithTimeout(
-        () -> exceptionDebugger.getExceptionProbeManager().isAlreadyInstrumented(nestedFingerprint),
-        Duration.ofSeconds(30));
-    assertWithTimeout(
-        () -> exceptionDebugger.getExceptionProbeManager().isAlreadyInstrumented(simpleFingerprint),
-        Duration.ofSeconds(30));
-    generateSnapshots(nestedException);
-    generateSnapshots(simpleException);
-    exceptionDebugger.handleException(simpleException, span);
-    nestedException.printStackTrace();
-    Throwable innerMostException = ExceptionHelper.getInnerMostThrowable(nestedException);
-    // capture the state before the second call: a successful assignment removes it from the
-    // manager, so it can no longer be looked up by throwable afterwards
-    ExceptionProbeManager.ThrowableState state =
-        exceptionDebugger.getExceptionProbeManager().getStateByThrowable(innerMostException);
-    String exceptionId = state.getExceptionId();
-    exceptionDebugger.handleException(nestedException, span);
-    assertEquals(exceptionId, spanTags.get(DefaultExceptionDebugger.DD_DEBUG_ERROR_EXCEPTION_ID));
-    Map<String, Snapshot> snapshotMap =
-        listener.snapshots.stream().collect(toMap(Snapshot::getId, Function.identity()));
-    List<String> lines = parseStackTrace(nestedException);
-    int expectedFrameIndex =
-        findFrameIndex(
-            lines,
-            "com.datadog.debugger.exception.DefaultExceptionDebuggerTest.createNestException");
-    assertSnapshot(
-        spanTags,
-        snapshotMap,
-        expectedFrameIndex,
-        "com.datadog.debugger.exception.DefaultExceptionDebuggerTest",
-        "createNestException");
-    expectedFrameIndex =
-        findFrameIndex(
-            lines,
-            "com.datadog.debugger.exception.DefaultExceptionDebuggerTest.doubleNestedException");
-    assertSnapshot(
-        spanTags,
-        snapshotMap,
-        expectedFrameIndex,
-        "com.datadog.debugger.exception.DefaultExceptionDebuggerTest",
-        "doubleNestedException");
-    expectedFrameIndex =
-        findFrameIndex(
-            lines,
-            "com.datadog.debugger.exception.DefaultExceptionDebuggerTest.createTest1Exception");
-    assertSnapshot(
-        spanTags,
-        snapshotMap,
-        expectedFrameIndex,
-        "com.datadog.debugger.exception.DefaultExceptionDebuggerTest",
-        "createTest1Exception");
-    // ThrowableState is keyed by the innermost throwable, not the top-level one passed to
-    // handleException: removal must use that same key or it silently leaks for chained exceptions
-    assertNull(
-        exceptionDebugger.getExceptionProbeManager().getStateByThrowable(innerMostException));
-  }
+    @Test
+    public void doubleNestedException() {
+        RuntimeException nestedException = createNestException();
+        String nestedFingerprint = Fingerprinter.fingerprint(nestedException, classNameFiltering);
+        RuntimeException simpleException = new RuntimeException("test");
+        String simpleFingerprint = Fingerprinter.fingerprint(simpleException, classNameFiltering);
+        AgentSpan span = mock(AgentSpan.class);
+        doAnswer(this::recordTags).when(span).setTag(anyString(), anyString());
+        when(span.getTag(anyString())).thenAnswer(invocationOnMock -> spanTags.get(invocationOnMock.getArgument(0)));
+        when(span.getTags()).thenReturn(spanTags);
+        // instrument first nested Exception
+        exceptionDebugger.handleException(nestedException, span);
+        // instrument first simple Exception
+        exceptionDebugger.handleException(simpleException, span);
+        assertWithTimeout(
+                () -> exceptionDebugger.getExceptionProbeManager().isAlreadyInstrumented(nestedFingerprint),
+                Duration.ofSeconds(30));
+        assertWithTimeout(
+                () -> exceptionDebugger.getExceptionProbeManager().isAlreadyInstrumented(simpleFingerprint),
+                Duration.ofSeconds(30));
+        generateSnapshots(nestedException);
+        generateSnapshots(simpleException);
+        exceptionDebugger.handleException(simpleException, span);
+        nestedException.printStackTrace();
+        Throwable innerMostException = ExceptionHelper.getInnerMostThrowable(nestedException);
+        // capture the state before the second call: a successful assignment removes it from the
+        // manager, so it can no longer be looked up by throwable afterwards
+        ExceptionProbeManager.ThrowableState state =
+                exceptionDebugger.getExceptionProbeManager().getStateByThrowable(innerMostException);
+        String exceptionId = state.getExceptionId();
+        exceptionDebugger.handleException(nestedException, span);
+        assertEquals(exceptionId, spanTags.get(DefaultExceptionDebugger.DD_DEBUG_ERROR_EXCEPTION_ID));
+        Map<String, Snapshot> snapshotMap =
+                listener.snapshots.stream().collect(toMap(Snapshot::getId, Function.identity()));
+        List<String> lines = parseStackTrace(nestedException);
+        int expectedFrameIndex = findFrameIndex(
+                lines, "com.datadog.debugger.exception.DefaultExceptionDebuggerTest.createNestException");
+        assertSnapshot(
+                spanTags,
+                snapshotMap,
+                expectedFrameIndex,
+                "com.datadog.debugger.exception.DefaultExceptionDebuggerTest",
+                "createNestException");
+        expectedFrameIndex = findFrameIndex(
+                lines, "com.datadog.debugger.exception.DefaultExceptionDebuggerTest.doubleNestedException");
+        assertSnapshot(
+                spanTags,
+                snapshotMap,
+                expectedFrameIndex,
+                "com.datadog.debugger.exception.DefaultExceptionDebuggerTest",
+                "doubleNestedException");
+        expectedFrameIndex = findFrameIndex(
+                lines, "com.datadog.debugger.exception.DefaultExceptionDebuggerTest.createTest1Exception");
+        assertSnapshot(
+                spanTags,
+                snapshotMap,
+                expectedFrameIndex,
+                "com.datadog.debugger.exception.DefaultExceptionDebuggerTest",
+                "createTest1Exception");
+        // ThrowableState is keyed by the innermost throwable, not the top-level one passed to
+        // handleException: removal must use that same key or it silently leaks for chained exceptions
+        assertNull(exceptionDebugger.getExceptionProbeManager().getStateByThrowable(innerMostException));
+    }
 
-  @Test
-  public void innermostExceptionFullThirdParty() {
-    RuntimeException exception = ThirdPartyCode.createThirdPartyException();
-    AgentSpan span = mock(AgentSpan.class);
-    doAnswer(this::recordTags).when(span).setTag(anyString(), anyString());
-    exceptionDebugger.handleException(exception, span);
-    // no probes created as all frames are filtered out (third-party code
-    assertTrue(exceptionDebugger.getExceptionProbeManager().getProbes().isEmpty());
-  }
+    @Test
+    public void innermostExceptionFullThirdParty() {
+        RuntimeException exception = ThirdPartyCode.createThirdPartyException();
+        AgentSpan span = mock(AgentSpan.class);
+        doAnswer(this::recordTags).when(span).setTag(anyString(), anyString());
+        exceptionDebugger.handleException(exception, span);
+        // no probes created as all frames are filtered out (third-party code
+        assertTrue(exceptionDebugger.getExceptionProbeManager().getProbes().isEmpty());
+    }
 
-  @Test
-  public void nestedExceptionFullThirdParty() {
-    RuntimeException thirdPartyException = ThirdPartyCode.createThirdPartyException();
-    RuntimeException exception = createTest2Exception(thirdPartyException);
-    String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
-    AgentSpan span = mock(AgentSpan.class);
-    doAnswer(this::recordTags).when(span).setTag(anyString(), anyString());
-    exceptionDebugger.handleException(exception, span);
-    assertWithTimeout(
-        () -> exceptionDebugger.getExceptionProbeManager().isAlreadyInstrumented(fingerprint),
-        Duration.ofSeconds(30));
-    generateSnapshots(exception);
-    exception.printStackTrace();
-    Throwable innerMostException = ExceptionHelper.getInnerMostThrowable(exception);
-    // capture the state before the second call: a successful assignment removes it from the
-    // manager, so it can no longer be looked up by throwable afterwards
-    ExceptionProbeManager.ThrowableState state =
-        exceptionDebugger.getExceptionProbeManager().getStateByThrowable(innerMostException);
-    String exceptionId = state.getExceptionId();
-    exceptionDebugger.handleException(exception, span);
-    assertEquals(exceptionId, spanTags.get(DefaultExceptionDebugger.DD_DEBUG_ERROR_EXCEPTION_ID));
-    Map<String, Snapshot> snapshotMap =
-        listener.snapshots.stream().collect(toMap(Snapshot::getId, Function.identity()));
-    List<String> lines = parseStackTrace(exception);
-    int expectedFrameIndex =
-        findFrameIndex(
-            lines,
-            "com.datadog.debugger.exception.DefaultExceptionDebuggerTest.createTest2Exception");
-    assertSnapshot(
-        spanTags,
-        snapshotMap,
-        expectedFrameIndex,
-        "com.datadog.debugger.exception.DefaultExceptionDebuggerTest",
-        "createTest2Exception");
-    assertNull(
-        exceptionDebugger.getExceptionProbeManager().getStateByThrowable(innerMostException));
-  }
+    @Test
+    public void nestedExceptionFullThirdParty() {
+        RuntimeException thirdPartyException = ThirdPartyCode.createThirdPartyException();
+        RuntimeException exception = createTest2Exception(thirdPartyException);
+        String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
+        AgentSpan span = mock(AgentSpan.class);
+        doAnswer(this::recordTags).when(span).setTag(anyString(), anyString());
+        exceptionDebugger.handleException(exception, span);
+        assertWithTimeout(
+                () -> exceptionDebugger.getExceptionProbeManager().isAlreadyInstrumented(fingerprint),
+                Duration.ofSeconds(30));
+        generateSnapshots(exception);
+        exception.printStackTrace();
+        Throwable innerMostException = ExceptionHelper.getInnerMostThrowable(exception);
+        // capture the state before the second call: a successful assignment removes it from the
+        // manager, so it can no longer be looked up by throwable afterwards
+        ExceptionProbeManager.ThrowableState state =
+                exceptionDebugger.getExceptionProbeManager().getStateByThrowable(innerMostException);
+        String exceptionId = state.getExceptionId();
+        exceptionDebugger.handleException(exception, span);
+        assertEquals(exceptionId, spanTags.get(DefaultExceptionDebugger.DD_DEBUG_ERROR_EXCEPTION_ID));
+        Map<String, Snapshot> snapshotMap =
+                listener.snapshots.stream().collect(toMap(Snapshot::getId, Function.identity()));
+        List<String> lines = parseStackTrace(exception);
+        int expectedFrameIndex = findFrameIndex(
+                lines, "com.datadog.debugger.exception.DefaultExceptionDebuggerTest.createTest2Exception");
+        assertSnapshot(
+                spanTags,
+                snapshotMap,
+                expectedFrameIndex,
+                "com.datadog.debugger.exception.DefaultExceptionDebuggerTest",
+                "createTest2Exception");
+        assertNull(exceptionDebugger.getExceptionProbeManager().getStateByThrowable(innerMostException));
+    }
 
-  @Test
-  public void filteringOutErrors() {
-    ExceptionProbeManager manager = mock(ExceptionProbeManager.class);
-    exceptionDebugger.handleException(new AssertionError("test"), mock(AgentSpan.class));
-    verify(manager, times(0)).isAlreadyInstrumented(any());
-  }
+    @Test
+    public void filteringOutErrors() {
+        ExceptionProbeManager manager = mock(ExceptionProbeManager.class);
+        exceptionDebugger.handleException(new AssertionError("test"), mock(AgentSpan.class));
+        verify(manager, times(0)).isAlreadyInstrumented(any());
+    }
 
-  @Test
-  public void lambdaTruncatedInnerTraceFallback() {
-    RuntimeException exception =
-        new RuntimeException("lambda") {
-          // mock the stacktrace to simulate a truncated one
-          @Override
-          public StackTraceElement[] getStackTrace() {
-            return new StackTraceElement[] {
-              new StackTraceElement("Main", "handleRequest", "Main.java", 11),
-              new StackTraceElement(
-                  "jdk.internal.reflect.DirectMethodHandleAccessor",
-                  "invoke",
-                  "Unknown Source",
-                  -1),
-              new StackTraceElement("java.lang.reflect.Method", "invoke", "Unknown Source", -1)
-            };
-          }
+    @Test
+    public void lambdaTruncatedInnerTraceFallback() {
+        RuntimeException exception = new RuntimeException("lambda") {
+            // mock the stacktrace to simulate a truncated one
+            @Override
+            public StackTraceElement[] getStackTrace() {
+                return new StackTraceElement[] {
+                    new StackTraceElement("Main", "handleRequest", "Main.java", 11),
+                    new StackTraceElement(
+                            "jdk.internal.reflect.DirectMethodHandleAccessor", "invoke", "Unknown Source", -1),
+                    new StackTraceElement("java.lang.reflect.Method", "invoke", "Unknown Source", -1)
+                };
+            }
         };
-    String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
-    AgentSpan span = mock(AgentSpan.class);
-    doAnswer(this::recordTags).when(span).setTag(anyString(), anyString());
-    when(span.getTag(anyString())).thenAnswer(inv -> spanTags.get(inv.getArgument(0)));
-    when(span.getTags()).thenReturn(spanTags);
-    exceptionDebugger.handleException(exception, span);
-    assertWithTimeout(
-        () -> exceptionDebugger.getExceptionProbeManager().isAlreadyInstrumented(fingerprint),
-        Duration.ofSeconds(30));
-    generateSnapshots(exception);
-    ExceptionProbeManager.ThrowableState state =
-        exceptionDebugger.getExceptionProbeManager().getStateByThrowable(exception);
-    String firstSnapshotId = state.getSnapshots().get(0).getId();
-    // This should hit the `currentIdx < 0` branch and fallback to i=0
-    exceptionDebugger.handleException(exception, span);
-    String tagName = String.format(SNAPSHOT_ID_TAG_FMT, 0);
-    assertTrue(spanTags.containsKey(tagName));
-    assertEquals(firstSnapshotId, spanTags.get(tagName));
-    // ThrowableState is removed once assigned & sent, so the state does not grow indefinitely
-    assertNull(exceptionDebugger.getExceptionProbeManager().getStateByThrowable(exception));
-  }
+        String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
+        AgentSpan span = mock(AgentSpan.class);
+        doAnswer(this::recordTags).when(span).setTag(anyString(), anyString());
+        when(span.getTag(anyString())).thenAnswer(inv -> spanTags.get(inv.getArgument(0)));
+        when(span.getTags()).thenReturn(spanTags);
+        exceptionDebugger.handleException(exception, span);
+        assertWithTimeout(
+                () -> exceptionDebugger.getExceptionProbeManager().isAlreadyInstrumented(fingerprint),
+                Duration.ofSeconds(30));
+        generateSnapshots(exception);
+        ExceptionProbeManager.ThrowableState state =
+                exceptionDebugger.getExceptionProbeManager().getStateByThrowable(exception);
+        String firstSnapshotId = state.getSnapshots().get(0).getId();
+        // This should hit the `currentIdx < 0` branch and fallback to i=0
+        exceptionDebugger.handleException(exception, span);
+        String tagName = String.format(SNAPSHOT_ID_TAG_FMT, 0);
+        assertTrue(spanTags.containsKey(tagName));
+        assertEquals(firstSnapshotId, spanTags.get(tagName));
+        // ThrowableState is removed once assigned & sent, so the state does not grow indefinitely
+        assertNull(exceptionDebugger.getExceptionProbeManager().getStateByThrowable(exception));
+    }
 
-  @Test
-  public void throwableStateRemovedAfterSendingToAvoidUnboundedGrowth() {
-    // simulates a singleton exception instance re-thrown repeatedly, as generated by the JIT's
-    // OmitStackTraceInFastThrow optimization
-    RuntimeException exception = new RuntimeException("test");
-    String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
-    AgentSpan span = mock(AgentSpan.class);
-    doAnswer(this::recordTags).when(span).setTag(anyString(), anyString());
-    when(span.getTag(anyString())).thenAnswer(inv -> spanTags.get(inv.getArgument(0)));
-    when(span.getTags()).thenReturn(spanTags);
-    exceptionDebugger.handleException(exception, span);
-    assertWithTimeout(
-        () -> exceptionDebugger.getExceptionProbeManager().isAlreadyInstrumented(fingerprint),
-        Duration.ofSeconds(30));
-    generateSnapshots(exception);
-    ExceptionProbeManager.ThrowableState state =
-        exceptionDebugger.getExceptionProbeManager().getStateByThrowable(exception);
-    assertTrue(state.getSnapshots().size() > 0);
-    exceptionDebugger.handleException(exception, span);
-    assertNull(exceptionDebugger.getExceptionProbeManager().getStateByThrowable(exception));
-  }
+    @Test
+    public void throwableStateRemovedAfterSendingToAvoidUnboundedGrowth() {
+        // simulates a singleton exception instance re-thrown repeatedly, as generated by the JIT's
+        // OmitStackTraceInFastThrow optimization
+        RuntimeException exception = new RuntimeException("test");
+        String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
+        AgentSpan span = mock(AgentSpan.class);
+        doAnswer(this::recordTags).when(span).setTag(anyString(), anyString());
+        when(span.getTag(anyString())).thenAnswer(inv -> spanTags.get(inv.getArgument(0)));
+        when(span.getTags()).thenReturn(spanTags);
+        exceptionDebugger.handleException(exception, span);
+        assertWithTimeout(
+                () -> exceptionDebugger.getExceptionProbeManager().isAlreadyInstrumented(fingerprint),
+                Duration.ofSeconds(30));
+        generateSnapshots(exception);
+        ExceptionProbeManager.ThrowableState state =
+                exceptionDebugger.getExceptionProbeManager().getStateByThrowable(exception);
+        assertTrue(state.getSnapshots().size() > 0);
+        exceptionDebugger.handleException(exception, span);
+        assertNull(exceptionDebugger.getExceptionProbeManager().getStateByThrowable(exception));
+    }
 
-  private Object recordTags(InvocationOnMock invocationOnMock) {
-    Object[] args = invocationOnMock.getArguments();
-    String key = (String) args[0];
-    String value = (String) args[1];
-    spanTags.put(key, value);
-    return null;
-  }
+    private Object recordTags(InvocationOnMock invocationOnMock) {
+        Object[] args = invocationOnMock.getArguments();
+        String key = (String) args[0];
+        String value = (String) args[1];
+        spanTags.put(key, value);
+        return null;
+    }
 
-  private static int findFrameIndex(List<String> lines, String str) {
-    for (int i = 0; i < lines.size(); i++) {
-      if (lines.get(i).contains(str)) {
-        return i;
-      }
+    private static int findFrameIndex(List<String> lines, String str) {
+        for (int i = 0; i < lines.size(); i++) {
+            if (lines.get(i).contains(str)) {
+                return i;
+            }
+        }
+        return -1;
     }
-    return -1;
-  }
 
-  private static List<String> parseStackTrace(RuntimeException exception) {
-    StringWriter writer = new StringWriter();
-    exception.printStackTrace(new PrintWriter(writer));
-    writer.flush();
-    BufferedReader reader = new BufferedReader(new StringReader(writer.toString()));
-    List<String> results = new ArrayList<>();
-    try {
-      String line;
-      while ((line = reader.readLine()) != null) {
-        if (line.startsWith("\tat ")) {
-          results.add(line);
+    private static List<String> parseStackTrace(RuntimeException exception) {
+        StringWriter writer = new StringWriter();
+        exception.printStackTrace(new PrintWriter(writer));
+        writer.flush();
+        BufferedReader reader = new BufferedReader(new StringReader(writer.toString()));
+        List<String> results = new ArrayList<>();
+        try {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (line.startsWith("\tat ")) {
+                    results.add(line);
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
         }
-      }
-    } catch (IOException e) {
-      e.printStackTrace();
+        return results;
     }
-    return results;
-  }
 
-  private static void assertSnapshot(
-      Map<String, Object> tags,
-      Map<String, Snapshot> snapshotMap,
-      int frameIndex,
-      String className,
-      String methodName) {
-    String snapshotId = (String) tags.get(String.format(SNAPSHOT_ID_TAG_FMT, frameIndex));
-    Snapshot snapshot = snapshotMap.get(snapshotId);
-    assertEquals(className, snapshot.getProbe().getLocation().getType());
-    assertEquals(methodName, snapshot.getProbe().getLocation().getMethod());
-  }
+    private static void assertSnapshot(
+            Map<String, Object> tags,
+            Map<String, Snapshot> snapshotMap,
+            int frameIndex,
+            String className,
+            String methodName) {
+        String snapshotId = (String) tags.get(String.format(SNAPSHOT_ID_TAG_FMT, frameIndex));
+        Snapshot snapshot = snapshotMap.get(snapshotId);
+        assertEquals(className, snapshot.getProbe().getLocation().getType());
+        assertEquals(methodName, snapshot.getProbe().getLocation().getMethod());
+    }
 
-  private void generateSnapshots(RuntimeException exception) {
-    Map<String, ExceptionProbe> probesByLocation = buildProbesByLocation();
-    Deque<Throwable> chainedExceptions = new ArrayDeque<>();
-    ExceptionHelper.getInnerMostThrowable(exception, chainedExceptions);
-    for (Throwable throwable : chainedExceptions) {
-      int framesToRemove = -1;
-      for (StackTraceElement element : throwable.getStackTrace()) {
-        framesToRemove++;
-        String probeLocation =
-            element.getClassName() + "::" + element.getMethodName() + ":" + element.getLineNumber();
-        ExceptionProbe exceptionProbe = probesByLocation.get(probeLocation);
-        if (exceptionProbe == null) {
-          continue;
+    private void generateSnapshots(RuntimeException exception) {
+        Map<String, ExceptionProbe> probesByLocation = buildProbesByLocation();
+        Deque<Throwable> chainedExceptions = new ArrayDeque<>();
+        ExceptionHelper.getInnerMostThrowable(exception, chainedExceptions);
+        for (Throwable throwable : chainedExceptions) {
+            int framesToRemove = -1;
+            for (StackTraceElement element : throwable.getStackTrace()) {
+                framesToRemove++;
+                String probeLocation =
+                        element.getClassName() + "::" + element.getMethodName() + ":" + element.getLineNumber();
+                ExceptionProbe exceptionProbe = probesByLocation.get(probeLocation);
+                if (exceptionProbe == null) {
+                    continue;
+                }
+                evalAndCommitProbe(exception, exceptionProbe);
+                rewriteSnapshotStacktrace(exception, throwable, framesToRemove);
+            }
         }
-        evalAndCommitProbe(exception, exceptionProbe);
-        rewriteSnapshotStacktrace(exception, throwable, framesToRemove);
-      }
     }
-  }
 
-  private void rewriteSnapshotStacktrace(
-      RuntimeException exception, Throwable throwable, int framesToRemove) {
-    ExceptionProbeManager.ThrowableState state =
-        exceptionDebugger
-            .getExceptionProbeManager()
-            .getStateByThrowable(ExceptionHelper.getInnerMostThrowable(exception));
-    Snapshot lastSnapshot = state.getSnapshots().get(state.getSnapshots().size() - 1);
-    lastSnapshot.getStack().clear();
-    lastSnapshot
-        .getStack()
-        .addAll(
-            Arrays.stream(throwable.getStackTrace())
-                .skip(framesToRemove)
-                .map(CapturedStackFrame::from)
-                .collect(toList()));
-  }
+    private void rewriteSnapshotStacktrace(RuntimeException exception, Throwable throwable, int framesToRemove) {
+        ExceptionProbeManager.ThrowableState state = exceptionDebugger
+                .getExceptionProbeManager()
+                .getStateByThrowable(ExceptionHelper.getInnerMostThrowable(exception));
+        Snapshot lastSnapshot = state.getSnapshots().get(state.getSnapshots().size() - 1);
+        lastSnapshot.getStack().clear();
+        lastSnapshot
+                .getStack()
+                .addAll(Arrays.stream(throwable.getStackTrace())
+                        .skip(framesToRemove)
+                        .map(CapturedStackFrame::from)
+                        .collect(toList()));
+    }
 
-  private void evalAndCommitProbe(RuntimeException exception, ExceptionProbe exceptionProbe) {
-    exceptionProbe.buildLocation(null);
-    CapturedContext capturedContext = new CapturedContext();
-    capturedContext.addThrowable(exception);
-    capturedContext.evaluate(
-        exceptionProbe, "", System.currentTimeMillis(), MethodLocation.EXIT, false);
-    exceptionProbe.commit(CapturedContext.EMPTY_CAPTURING_CONTEXT, capturedContext, emptyList());
-  }
+    private void evalAndCommitProbe(RuntimeException exception, ExceptionProbe exceptionProbe) {
+        exceptionProbe.buildLocation(null);
+        CapturedContext capturedContext = new CapturedContext();
+        capturedContext.addThrowable(exception);
+        capturedContext.evaluate(exceptionProbe, "", System.currentTimeMillis(), MethodLocation.EXIT, false);
+        exceptionProbe.commit(CapturedContext.EMPTY_CAPTURING_CONTEXT, capturedContext, emptyList());
+    }
 
-  private Map<String, ExceptionProbe> buildProbesByLocation() {
-    BinaryOperator<ExceptionProbe> dropMerger = (oldValue, newValue) -> oldValue;
-    return exceptionDebugger.getExceptionProbeManager().getProbes().stream()
-        .collect(
-            toMap(
-                probe ->
-                    probe.getWhere().getTypeName()
-                        + "::"
-                        + probe.getWhere().getMethodName()
-                        + ":"
-                        + probe.getWhere().getLines()[0],
-                Function.identity(),
-                dropMerger));
-  }
+    private Map<String, ExceptionProbe> buildProbesByLocation() {
+        BinaryOperator<ExceptionProbe> dropMerger = (oldValue, newValue) -> oldValue;
+        return exceptionDebugger.getExceptionProbeManager().getProbes().stream()
+                .collect(toMap(
+                        probe -> probe.getWhere().getTypeName()
+                                + "::"
+                                + probe.getWhere().getMethodName()
+                                + ":"
+                                + probe.getWhere().getLines()[0],
+                        Function.identity(),
+                        dropMerger));
+    }
 
-  private RuntimeException createNestException() {
-    return new RuntimeException("test3", createTest2Exception(createTest1Exception()));
-  }
+    private RuntimeException createNestException() {
+        return new RuntimeException("test3", createTest2Exception(createTest1Exception()));
+    }
 
-  private RuntimeException createTest1Exception() {
-    return new RuntimeException("test1");
-  }
+    private RuntimeException createTest1Exception() {
+        return new RuntimeException("test1");
+    }
 
-  private RuntimeException createTest2Exception(Throwable cause) {
-    return new RuntimeException("test2", cause);
-  }
+    private RuntimeException createTest2Exception(Throwable cause) {
+        return new RuntimeException("test2", cause);
+    }
 
-  public static Config createConfig() {
-    Config config = mock(Config.class);
-    when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
-    when(config.isDynamicInstrumentationClassFileDumpEnabled()).thenReturn(true);
-    when(config.isDynamicInstrumentationVerifyByteCode()).thenReturn(true);
-    when(config.getFinalDebuggerSnapshotUrl())
-        .thenReturn("http://localhost:8126/debugger/v1/input");
-    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
-    when(config.getDebuggerExceptionCaptureInterval()).thenReturn(3600);
-    when(config.getDebuggerMaxExceptionPerSecond()).thenReturn(100);
-    when(config.getDebuggerExceptionMaxCapturedFrames()).thenReturn(3);
-    return config;
-  }
+    public static Config createConfig() {
+        Config config = mock(Config.class);
+        when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
+        when(config.isDynamicInstrumentationClassFileDumpEnabled()).thenReturn(true);
+        when(config.isDynamicInstrumentationVerifyByteCode()).thenReturn(true);
+        when(config.getFinalDebuggerSnapshotUrl()).thenReturn("http://localhost:8126/debugger/v1/input");
+        when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
+        when(config.getDebuggerExceptionCaptureInterval()).thenReturn(3600);
+        when(config.getDebuggerMaxExceptionPerSecond()).thenReturn(100);
+        when(config.getDebuggerExceptionMaxCapturedFrames()).thenReturn(3);
+        return config;
+    }
 }
 
 // Hacky way to generate an exception with a stacktrace that does not contain the test class
 // we are starting a thread and create an exception in that thread and return it
 class ThirdPartyCode extends Thread {
-  volatile RuntimeException ex;
+    volatile RuntimeException ex;
 
-  public void run() {
-    ex = new RuntimeException("third party code");
-  }
+    public void run() {
+        ex = new RuntimeException("third party code");
+    }
 
-  public static RuntimeException createThirdPartyException() {
-    ThirdPartyCode thirdPartyCode = new ThirdPartyCode();
-    thirdPartyCode.start();
-    try {
-      thirdPartyCode.join();
-    } catch (InterruptedException e) {
-      throw new RuntimeException(e);
+    public static RuntimeException createThirdPartyException() {
+        ThirdPartyCode thirdPartyCode = new ThirdPartyCode();
+        thirdPartyCode.start();
+        try {
+            thirdPartyCode.join();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        return thirdPartyCode.ex;
     }
-    return thirdPartyCode.ex;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/ExceptionProbeInstrumentationTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/ExceptionProbeInstrumentationTest.java
index 376c06c89ce..89b23c35d1c 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/ExceptionProbeInstrumentationTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/ExceptionProbeInstrumentationTest.java
@@ -65,389 +65,380 @@
 import org.junit.jupiter.api.condition.DisabledIf;
 
 public class ExceptionProbeInstrumentationTest {
-  protected static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f5", 0);
+    protected static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f5", 0);
 
-  private final Instrumentation instr = ByteBuddyAgent.install();
-  private final TestTraceInterceptor traceInterceptor = new TestTraceInterceptor();
-  private ClassFileTransformer currentTransformer;
-  private final ClassNameFilter classNameFiltering =
-      new ClassNameFiltering(
-          Stream.of(
-                  "java.",
-                  "jdk.",
-                  "com.sun.",
-                  "sun.",
-                  "org.gradle.",
-                  "worker.org.gradle.",
-                  "org.junit.",
-                  "org.joor.",
-                  "com.datadog.debugger.exception.")
-              .collect(Collectors.toSet()));
-  private MockSampler probeSampler;
-  private MockSampler globalSampler;
+    private final Instrumentation instr = ByteBuddyAgent.install();
+    private final TestTraceInterceptor traceInterceptor = new TestTraceInterceptor();
+    private ClassFileTransformer currentTransformer;
+    private final ClassNameFilter classNameFiltering = new ClassNameFiltering(Stream.of(
+                    "java.",
+                    "jdk.",
+                    "com.sun.",
+                    "sun.",
+                    "org.gradle.",
+                    "worker.org.gradle.",
+                    "org.junit.",
+                    "org.joor.",
+                    "com.datadog.debugger.exception.")
+            .collect(Collectors.toSet()));
+    private MockSampler probeSampler;
+    private MockSampler globalSampler;
 
-  @BeforeAll
-  public static void beforeAll() {
-    setFieldInConfig(Config.get(), "agentUrl", "http://localhost:8126");
-  }
+    @BeforeAll
+    public static void beforeAll() {
+        setFieldInConfig(Config.get(), "agentUrl", "http://localhost:8126");
+    }
 
-  @BeforeEach
-  public void before() {
-    CoreTracer tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-    tracer.addTraceInterceptor(traceInterceptor);
-    probeSampler = new MockSampler();
-    globalSampler = new MockSampler();
-    ProbeRateLimiter.setSamplerSupplier(rate -> rate < 101 ? probeSampler : globalSampler);
-    ProbeRateLimiter.setGlobalSnapshotRate(1000);
-    // to activate the call to DebuggerContext.handleException
-    DebuggerConfigUpdater mockProductConfigUpdater = mock(DebuggerConfigUpdater.class);
-    when(mockProductConfigUpdater.isExceptionReplayEnabled()).thenReturn(true);
-    DebuggerConfigBridge.setUpdater(mockProductConfigUpdater);
-    setFieldInConfig(Config.get(), "debuggerExceptionEnabled", true);
-    setFieldInConfig(Config.get(), "dynamicInstrumentationClassFileDumpEnabled", true);
-  }
+    @BeforeEach
+    public void before() {
+        CoreTracer tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+        tracer.addTraceInterceptor(traceInterceptor);
+        probeSampler = new MockSampler();
+        globalSampler = new MockSampler();
+        ProbeRateLimiter.setSamplerSupplier(rate -> rate < 101 ? probeSampler : globalSampler);
+        ProbeRateLimiter.setGlobalSnapshotRate(1000);
+        // to activate the call to DebuggerContext.handleException
+        DebuggerConfigUpdater mockProductConfigUpdater = mock(DebuggerConfigUpdater.class);
+        when(mockProductConfigUpdater.isExceptionReplayEnabled()).thenReturn(true);
+        DebuggerConfigBridge.setUpdater(mockProductConfigUpdater);
+        setFieldInConfig(Config.get(), "debuggerExceptionEnabled", true);
+        setFieldInConfig(Config.get(), "dynamicInstrumentationClassFileDumpEnabled", true);
+    }
 
-  @AfterEach
-  public void after() {
-    if (currentTransformer != null) {
-      instr.removeTransformer(currentTransformer);
+    @AfterEach
+    public void after() {
+        if (currentTransformer != null) {
+            instr.removeTransformer(currentTransformer);
+        }
+        ProbeRateLimiter.setSamplerSupplier(null);
+        ProbeRateLimiter.resetGlobalRate();
     }
-    ProbeRateLimiter.setSamplerSupplier(null);
-    ProbeRateLimiter.resetGlobalRate();
-  }
 
-  @Test
-  public void onlyInstrument() throws Exception {
-    Config config = createConfig();
-    ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
-    TestSnapshotListener listener =
-        setupExceptionDebugging(config, exceptionProbeManager, classNameFiltering);
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    String fingerprint =
-        callMethodThrowingRuntimeException(testClass); // instrument exception stacktrace
-    assertWithTimeout(
-        () -> exceptionProbeManager.isAlreadyInstrumented(fingerprint), Duration.ofSeconds(30));
-    assertEquals(2, exceptionProbeManager.getProbes().size());
-    callMethodNoException(testClass);
-    assertEquals(0, listener.snapshots.size());
-  }
+    @Test
+    public void onlyInstrument() throws Exception {
+        Config config = createConfig();
+        ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
+        TestSnapshotListener listener = setupExceptionDebugging(config, exceptionProbeManager, classNameFiltering);
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        String fingerprint = callMethodThrowingRuntimeException(testClass); // instrument exception stacktrace
+        assertWithTimeout(() -> exceptionProbeManager.isAlreadyInstrumented(fingerprint), Duration.ofSeconds(30));
+        assertEquals(2, exceptionProbeManager.getProbes().size());
+        callMethodNoException(testClass);
+        assertEquals(0, listener.snapshots.size());
+    }
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Bug in J9: no LocalVariableTable for ClassFileTransformer")
-  public void instrumentAndCaptureSnapshots() throws Exception {
-    Config config = createConfig();
-    ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
-    TestSnapshotListener listener =
-        setupExceptionDebugging(config, exceptionProbeManager, classNameFiltering);
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    String fingerprint =
-        callMethodThrowingRuntimeException(testClass); // instrument exception stacktrace
-    assertWithTimeout(
-        () -> exceptionProbeManager.isAlreadyInstrumented(fingerprint), Duration.ofSeconds(30));
-    assertEquals(2, exceptionProbeManager.getProbes().size());
-    callMethodThrowingRuntimeException(testClass); // generate snapshots
-    Map<String, Set<String>> probeIdsByMethodName =
-        extractProbeIdsByMethodName(exceptionProbeManager);
-    assertEquals(1, listener.snapshots.size());
-    Snapshot snapshot0 = listener.snapshots.get(0);
-    assertProbeId(probeIdsByMethodName, "processWithException", snapshot0.getProbe().getId());
-    assertEquals("oops", snapshot0.getCaptures().getReturn().getCapturedThrowable().getMessage());
-    ProbeLocation location = snapshot0.getProbe().getLocation();
-    assertEquals(
-        location.getType() + "." + location.getMethod(), snapshot0.getStack().get(0).getFunction());
-    MutableSpan span = traceInterceptor.getFirstSpan();
-    assertEquals(snapshot0.getExceptionId(), span.getTags().get(DD_DEBUG_ERROR_EXCEPTION_ID));
-    assertEquals(fingerprint, span.getTags().get(DD_DEBUG_ERROR_EXCEPTION_HASH));
-    assertEquals(Boolean.TRUE, span.getTags().get(Tags.ERROR_DEBUG_INFO_CAPTURED));
-    assertEquals(snapshot0.getId(), span.getTags().get(String.format(SNAPSHOT_ID_TAG_FMT, 0)));
-    assertTrue(snapshot0.getCaptures().getReturn().getArguments().containsKey("arg"));
-    assertTrue(snapshot0.getCaptures().getReturn().getLocals().containsKey("intLocal"));
-    assertEquals(1, probeSampler.getCallCount());
-    assertEquals(1, globalSampler.getCallCount());
-  }
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "Bug in J9: no LocalVariableTable for ClassFileTransformer")
+    public void instrumentAndCaptureSnapshots() throws Exception {
+        Config config = createConfig();
+        ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
+        TestSnapshotListener listener = setupExceptionDebugging(config, exceptionProbeManager, classNameFiltering);
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        String fingerprint = callMethodThrowingRuntimeException(testClass); // instrument exception stacktrace
+        assertWithTimeout(() -> exceptionProbeManager.isAlreadyInstrumented(fingerprint), Duration.ofSeconds(30));
+        assertEquals(2, exceptionProbeManager.getProbes().size());
+        callMethodThrowingRuntimeException(testClass); // generate snapshots
+        Map<String, Set<String>> probeIdsByMethodName = extractProbeIdsByMethodName(exceptionProbeManager);
+        assertEquals(1, listener.snapshots.size());
+        Snapshot snapshot0 = listener.snapshots.get(0);
+        assertProbeId(
+                probeIdsByMethodName,
+                "processWithException",
+                snapshot0.getProbe().getId());
+        assertEquals(
+                "oops",
+                snapshot0.getCaptures().getReturn().getCapturedThrowable().getMessage());
+        ProbeLocation location = snapshot0.getProbe().getLocation();
+        assertEquals(
+                location.getType() + "." + location.getMethod(),
+                snapshot0.getStack().get(0).getFunction());
+        MutableSpan span = traceInterceptor.getFirstSpan();
+        assertEquals(snapshot0.getExceptionId(), span.getTags().get(DD_DEBUG_ERROR_EXCEPTION_ID));
+        assertEquals(fingerprint, span.getTags().get(DD_DEBUG_ERROR_EXCEPTION_HASH));
+        assertEquals(Boolean.TRUE, span.getTags().get(Tags.ERROR_DEBUG_INFO_CAPTURED));
+        assertEquals(snapshot0.getId(), span.getTags().get(String.format(SNAPSHOT_ID_TAG_FMT, 0)));
+        assertTrue(snapshot0.getCaptures().getReturn().getArguments().containsKey("arg"));
+        assertTrue(snapshot0.getCaptures().getReturn().getLocals().containsKey("intLocal"));
+        assertEquals(1, probeSampler.getCallCount());
+        assertEquals(1, globalSampler.getCallCount());
+    }
 
-  @Test
-  public void differentExceptionsSameStack() throws Exception {
-    Config config = createConfig();
-    ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
-    TestSnapshotListener listener =
-        setupExceptionDebugging(config, exceptionProbeManager, classNameFiltering);
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    // instrument RuntimeException stacktrace
-    String fingerprint0 = callMethodThrowingRuntimeException(testClass);
-    assertWithTimeout(
-        () -> exceptionProbeManager.isAlreadyInstrumented(fingerprint0), Duration.ofSeconds(30));
-    assertEquals(2, exceptionProbeManager.getProbes().size());
-    // instrument IllegalArgumentException stacktrace
-    String fingerprint1 = callMethodThrowingIllegalArgException(testClass);
-    assertWithTimeout(
-        () -> exceptionProbeManager.isAlreadyInstrumented(fingerprint1), Duration.ofSeconds(30));
-    assertEquals(4, exceptionProbeManager.getProbes().size());
-    Map<String, Set<String>> probeIdsByMethodName =
-        extractProbeIdsByMethodName(exceptionProbeManager);
-    // clear traces from instrumenting calls
-    traceInterceptor.getAllTraces().clear();
-    // generate snapshots RuntimeException
-    callMethodThrowingRuntimeException(testClass);
-    // generate snapshots IllegalArgumentException
-    callMethodThrowingIllegalArgException(testClass);
-    assertEquals(2, listener.snapshots.size());
-    Snapshot snapshot0 = listener.snapshots.get(0);
-    assertProbeId(probeIdsByMethodName, "processWithException", snapshot0.getProbe().getId());
-    assertExceptionMsg("oops", snapshot0);
-    Snapshot snapshot1 = listener.snapshots.get(1);
-    assertProbeId(probeIdsByMethodName, "processWithException", snapshot1.getProbe().getId());
-    assertExceptionMsg("illegal argument", snapshot1);
-    MutableSpan span0 = traceInterceptor.getAllTraces().get(0).get(0);
-    assertEquals(snapshot0.getExceptionId(), span0.getTags().get(DD_DEBUG_ERROR_EXCEPTION_ID));
-    assertEquals(Boolean.TRUE, span0.getTags().get(Tags.ERROR_DEBUG_INFO_CAPTURED));
-    assertEquals(snapshot0.getId(), span0.getTags().get(String.format(SNAPSHOT_ID_TAG_FMT, 0)));
-    MutableSpan span1 = traceInterceptor.getAllTraces().get(1).get(0);
-    assertEquals(snapshot1.getExceptionId(), span1.getTags().get(DD_DEBUG_ERROR_EXCEPTION_ID));
-    assertEquals(Boolean.TRUE, span1.getTags().get(Tags.ERROR_DEBUG_INFO_CAPTURED));
-    assertEquals(snapshot1.getId(), span1.getTags().get(String.format(SNAPSHOT_ID_TAG_FMT, 0)));
-  }
+    @Test
+    public void differentExceptionsSameStack() throws Exception {
+        Config config = createConfig();
+        ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
+        TestSnapshotListener listener = setupExceptionDebugging(config, exceptionProbeManager, classNameFiltering);
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        // instrument RuntimeException stacktrace
+        String fingerprint0 = callMethodThrowingRuntimeException(testClass);
+        assertWithTimeout(() -> exceptionProbeManager.isAlreadyInstrumented(fingerprint0), Duration.ofSeconds(30));
+        assertEquals(2, exceptionProbeManager.getProbes().size());
+        // instrument IllegalArgumentException stacktrace
+        String fingerprint1 = callMethodThrowingIllegalArgException(testClass);
+        assertWithTimeout(() -> exceptionProbeManager.isAlreadyInstrumented(fingerprint1), Duration.ofSeconds(30));
+        assertEquals(4, exceptionProbeManager.getProbes().size());
+        Map<String, Set<String>> probeIdsByMethodName = extractProbeIdsByMethodName(exceptionProbeManager);
+        // clear traces from instrumenting calls
+        traceInterceptor.getAllTraces().clear();
+        // generate snapshots RuntimeException
+        callMethodThrowingRuntimeException(testClass);
+        // generate snapshots IllegalArgumentException
+        callMethodThrowingIllegalArgException(testClass);
+        assertEquals(2, listener.snapshots.size());
+        Snapshot snapshot0 = listener.snapshots.get(0);
+        assertProbeId(
+                probeIdsByMethodName,
+                "processWithException",
+                snapshot0.getProbe().getId());
+        assertExceptionMsg("oops", snapshot0);
+        Snapshot snapshot1 = listener.snapshots.get(1);
+        assertProbeId(
+                probeIdsByMethodName,
+                "processWithException",
+                snapshot1.getProbe().getId());
+        assertExceptionMsg("illegal argument", snapshot1);
+        MutableSpan span0 = traceInterceptor.getAllTraces().get(0).get(0);
+        assertEquals(snapshot0.getExceptionId(), span0.getTags().get(DD_DEBUG_ERROR_EXCEPTION_ID));
+        assertEquals(Boolean.TRUE, span0.getTags().get(Tags.ERROR_DEBUG_INFO_CAPTURED));
+        assertEquals(snapshot0.getId(), span0.getTags().get(String.format(SNAPSHOT_ID_TAG_FMT, 0)));
+        MutableSpan span1 = traceInterceptor.getAllTraces().get(1).get(0);
+        assertEquals(snapshot1.getExceptionId(), span1.getTags().get(DD_DEBUG_ERROR_EXCEPTION_ID));
+        assertEquals(Boolean.TRUE, span1.getTags().get(Tags.ERROR_DEBUG_INFO_CAPTURED));
+        assertEquals(snapshot1.getId(), span1.getTags().get(String.format(SNAPSHOT_ID_TAG_FMT, 0)));
+    }
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Bug in J9: no LocalVariableTable for ClassFileTransformer")
-  public void recursive() throws Exception {
-    Config config = createConfig();
-    ExceptionProbeManager exceptionProbeManager =
-        new ExceptionProbeManager(classNameFiltering, Duration.ofHours(1), Clock.systemUTC(), 20);
-    TestSnapshotListener listener =
-        setupExceptionDebugging(config, exceptionProbeManager, classNameFiltering);
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    // instrument RuntimeException stacktrace
-    String fingerprint = callMethodFiboException(testClass);
-    assertWithTimeout(
-        () -> exceptionProbeManager.isAlreadyInstrumented(fingerprint), Duration.ofSeconds(30));
-    assertEquals(11, exceptionProbeManager.getProbes().size());
-    callMethodFiboException(testClass); // generate snapshots
-    Map<String, Set<String>> probeIdsByMethodName =
-        extractProbeIdsByMethodName(exceptionProbeManager);
-    // limited by Config::getDebuggerExceptionMaxCapturedFrames
-    assertEquals(3, listener.snapshots.size());
-    Snapshot snapshot0 = listener.snapshots.get(0);
-    assertProbeId(probeIdsByMethodName, "fiboException", snapshot0.getProbe().getId());
-    assertEquals(
-        "oops fibo", snapshot0.getCaptures().getReturn().getCapturedThrowable().getMessage());
-    assertEquals("1", getValue(snapshot0.getCaptures().getReturn().getArguments().get("n")));
-    Snapshot snapshot1 = listener.snapshots.get(1);
-    assertEquals("2", getValue(snapshot1.getCaptures().getReturn().getArguments().get("n")));
-    Snapshot snapshot2 = listener.snapshots.get(2);
-    assertEquals("3", getValue(snapshot2.getCaptures().getReturn().getArguments().get("n")));
-    // sampling happens only once ont he first snapshot then forced for coordinated sampling
-    assertEquals(1, probeSampler.getCallCount());
-    assertEquals(1, globalSampler.getCallCount());
-  }
+    @Test
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "Bug in J9: no LocalVariableTable for ClassFileTransformer")
+    public void recursive() throws Exception {
+        Config config = createConfig();
+        ExceptionProbeManager exceptionProbeManager =
+                new ExceptionProbeManager(classNameFiltering, Duration.ofHours(1), Clock.systemUTC(), 20);
+        TestSnapshotListener listener = setupExceptionDebugging(config, exceptionProbeManager, classNameFiltering);
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        // instrument RuntimeException stacktrace
+        String fingerprint = callMethodFiboException(testClass);
+        assertWithTimeout(() -> exceptionProbeManager.isAlreadyInstrumented(fingerprint), Duration.ofSeconds(30));
+        assertEquals(11, exceptionProbeManager.getProbes().size());
+        callMethodFiboException(testClass); // generate snapshots
+        Map<String, Set<String>> probeIdsByMethodName = extractProbeIdsByMethodName(exceptionProbeManager);
+        // limited by Config::getDebuggerExceptionMaxCapturedFrames
+        assertEquals(3, listener.snapshots.size());
+        Snapshot snapshot0 = listener.snapshots.get(0);
+        assertProbeId(
+                probeIdsByMethodName, "fiboException", snapshot0.getProbe().getId());
+        assertEquals(
+                "oops fibo",
+                snapshot0.getCaptures().getReturn().getCapturedThrowable().getMessage());
+        assertEquals(
+                "1", getValue(snapshot0.getCaptures().getReturn().getArguments().get("n")));
+        Snapshot snapshot1 = listener.snapshots.get(1);
+        assertEquals(
+                "2", getValue(snapshot1.getCaptures().getReturn().getArguments().get("n")));
+        Snapshot snapshot2 = listener.snapshots.get(2);
+        assertEquals(
+                "3", getValue(snapshot2.getCaptures().getReturn().getArguments().get("n")));
+        // sampling happens only once ont he first snapshot then forced for coordinated sampling
+        assertEquals(1, probeSampler.getCallCount());
+        assertEquals(1, globalSampler.getCallCount());
+    }
 
-  @Test
-  public void captureOncePerHour() throws Exception {
-    Config config = createConfig();
-    Clock clockMock = mock(Clock.class);
-    when(clockMock.instant()).thenReturn(Instant.now());
-    ExceptionProbeManager exceptionProbeManager =
-        new ExceptionProbeManager(classNameFiltering, Duration.ofHours(1), clockMock, 3);
-    TestSnapshotListener listener =
-        setupExceptionDebugging(config, exceptionProbeManager, classNameFiltering);
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    // instrument RuntimeException stacktrace
-    String fingerprint0 = callMethodThrowingRuntimeException(testClass);
-    assertWithTimeout(
-        () -> exceptionProbeManager.isAlreadyInstrumented(fingerprint0), Duration.ofSeconds(30));
-    // generate snapshots RuntimeException
-    callMethodThrowingRuntimeException(testClass);
-    assertEquals(1, listener.snapshots.size());
-    listener.snapshots.clear();
-    // second call, no snapshot should be generated
-    callMethodThrowingRuntimeException(testClass);
-    assertEquals(0, listener.snapshots.size());
-    // Fast-forward 1 hour
-    when(clockMock.instant()).thenReturn(Instant.now().plus(Duration.ofMinutes(61)));
-    // second call, snapshot should be generated
-    callMethodThrowingRuntimeException(testClass);
-    assertEquals(1, listener.snapshots.size());
-  }
+    @Test
+    public void captureOncePerHour() throws Exception {
+        Config config = createConfig();
+        Clock clockMock = mock(Clock.class);
+        when(clockMock.instant()).thenReturn(Instant.now());
+        ExceptionProbeManager exceptionProbeManager =
+                new ExceptionProbeManager(classNameFiltering, Duration.ofHours(1), clockMock, 3);
+        TestSnapshotListener listener = setupExceptionDebugging(config, exceptionProbeManager, classNameFiltering);
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        // instrument RuntimeException stacktrace
+        String fingerprint0 = callMethodThrowingRuntimeException(testClass);
+        assertWithTimeout(() -> exceptionProbeManager.isAlreadyInstrumented(fingerprint0), Duration.ofSeconds(30));
+        // generate snapshots RuntimeException
+        callMethodThrowingRuntimeException(testClass);
+        assertEquals(1, listener.snapshots.size());
+        listener.snapshots.clear();
+        // second call, no snapshot should be generated
+        callMethodThrowingRuntimeException(testClass);
+        assertEquals(0, listener.snapshots.size());
+        // Fast-forward 1 hour
+        when(clockMock.instant()).thenReturn(Instant.now().plus(Duration.ofMinutes(61)));
+        // second call, snapshot should be generated
+        callMethodThrowingRuntimeException(testClass);
+        assertEquals(1, listener.snapshots.size());
+    }
 
-  @Test
-  public void mixedWithLogProbes() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    Config config = createConfig();
-    ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
-    LogProbe logProbe =
-        LogProbe.builder().probeId(PROBE_ID).where(CLASS_NAME, "processWithException").build();
-    Collection<ProbeDefinition> definitions = Arrays.asList(logProbe);
-    TestSnapshotListener listener =
-        setupExceptionDebugging(config, exceptionProbeManager, classNameFiltering, definitions);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    String fingerprint =
-        callMethodThrowingRuntimeException(testClass); // instrument exception stacktrace
-    assertWithTimeout(
-        () -> exceptionProbeManager.isAlreadyInstrumented(fingerprint), Duration.ofSeconds(30));
-    assertEquals(2, exceptionProbeManager.getProbes().size());
-    callMethodThrowingRuntimeException(testClass); // generate snapshots
-    Map<String, Set<String>> probeIdsByMethodName =
-        extractProbeIdsByMethodName(exceptionProbeManager);
-    assertEquals(3, listener.snapshots.size()); // 2 log snapshots + 1 exception snapshot
-    Snapshot snapshot0 = listener.snapshots.get(0);
-    assertEquals(PROBE_ID.getId(), snapshot0.getProbe().getId());
-    Snapshot snapshot1 = listener.snapshots.get(1);
-    assertEquals(PROBE_ID.getId(), snapshot1.getProbe().getId());
-    Snapshot snapshot2 = listener.snapshots.get(2);
-    assertProbeId(probeIdsByMethodName, "processWithException", snapshot2.getProbe().getId());
-  }
+    @Test
+    public void mixedWithLogProbes() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        Config config = createConfig();
+        ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
+        LogProbe logProbe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(CLASS_NAME, "processWithException")
+                .build();
+        Collection<ProbeDefinition> definitions = Arrays.asList(logProbe);
+        TestSnapshotListener listener =
+                setupExceptionDebugging(config, exceptionProbeManager, classNameFiltering, definitions);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        String fingerprint = callMethodThrowingRuntimeException(testClass); // instrument exception stacktrace
+        assertWithTimeout(() -> exceptionProbeManager.isAlreadyInstrumented(fingerprint), Duration.ofSeconds(30));
+        assertEquals(2, exceptionProbeManager.getProbes().size());
+        callMethodThrowingRuntimeException(testClass); // generate snapshots
+        Map<String, Set<String>> probeIdsByMethodName = extractProbeIdsByMethodName(exceptionProbeManager);
+        assertEquals(3, listener.snapshots.size()); // 2 log snapshots + 1 exception snapshot
+        Snapshot snapshot0 = listener.snapshots.get(0);
+        assertEquals(PROBE_ID.getId(), snapshot0.getProbe().getId());
+        Snapshot snapshot1 = listener.snapshots.get(1);
+        assertEquals(PROBE_ID.getId(), snapshot1.getProbe().getId());
+        Snapshot snapshot2 = listener.snapshots.get(2);
+        assertProbeId(
+                probeIdsByMethodName,
+                "processWithException",
+                snapshot2.getProbe().getId());
+    }
 
-  @Test
-  public void mixedWithLogProbesCoordinatedSamplingIsIndependent() throws Exception {
-    final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
-    Config config = createConfig();
-    ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
-    LogProbe logProbe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(CLASS_NAME, "processWithException")
-            .captureSnapshot(true)
-            .build();
-    Collection<ProbeDefinition> definitions = Arrays.asList(logProbe);
-    TestSnapshotListener listener =
-        setupExceptionDebugging(config, exceptionProbeManager, classNameFiltering, definitions);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    String fingerprint =
-        callMethodThrowingRuntimeException(testClass); // instrument exception stacktrace, log
-    // probe samples once (its own decision for this first, distinct local root span)
-    assertWithTimeout(
-        () -> exceptionProbeManager.isAlreadyInstrumented(fingerprint), Duration.ofSeconds(30));
-    int callCountBeforeSnapshot = probeSampler.getCallCount();
-    listener.snapshots.clear();
-    callMethodThrowingRuntimeException(testClass); // generate snapshots on a new local root span
-    assertEquals(2, listener.snapshots.size()); // 1 log snapshot + 1 exception snapshot
-    // the log probe (entry) and the deepest exception probe (exit) must each independently
-    // consult the probe sampler rather than sharing a single coordinated decision cached on the
-    // local root span: one call for the log probe's own decision, one for the exception probe's.
-    assertEquals(2, probeSampler.getCallCount() - callCountBeforeSnapshot);
-  }
+    @Test
+    public void mixedWithLogProbesCoordinatedSamplingIsIndependent() throws Exception {
+        final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot20";
+        Config config = createConfig();
+        ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
+        LogProbe logProbe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(CLASS_NAME, "processWithException")
+                .captureSnapshot(true)
+                .build();
+        Collection<ProbeDefinition> definitions = Arrays.asList(logProbe);
+        TestSnapshotListener listener =
+                setupExceptionDebugging(config, exceptionProbeManager, classNameFiltering, definitions);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        String fingerprint = callMethodThrowingRuntimeException(testClass); // instrument exception stacktrace, log
+        // probe samples once (its own decision for this first, distinct local root span)
+        assertWithTimeout(() -> exceptionProbeManager.isAlreadyInstrumented(fingerprint), Duration.ofSeconds(30));
+        int callCountBeforeSnapshot = probeSampler.getCallCount();
+        listener.snapshots.clear();
+        callMethodThrowingRuntimeException(testClass); // generate snapshots on a new local root span
+        assertEquals(2, listener.snapshots.size()); // 1 log snapshot + 1 exception snapshot
+        // the log probe (entry) and the deepest exception probe (exit) must each independently
+        // consult the probe sampler rather than sharing a single coordinated decision cached on the
+        // local root span: one call for the log probe's own decision, one for the exception probe's.
+        assertEquals(2, probeSampler.getCallCount() - callCountBeforeSnapshot);
+    }
 
-  private static void assertExceptionMsg(String expectedMsg, Snapshot snapshot) {
-    assertEquals(
-        expectedMsg, snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
-  }
+    private static void assertExceptionMsg(String expectedMsg, Snapshot snapshot) {
+        assertEquals(
+                expectedMsg,
+                snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
+    }
 
-  private static void assertProbeId(
-      Map<String, Set<String>> probeIdsByMethodName, String methodName, String id) {
-    assertTrue(probeIdsByMethodName.containsKey(methodName));
-    assertTrue(probeIdsByMethodName.get(methodName).contains(id));
-  }
+    private static void assertProbeId(Map<String, Set<String>> probeIdsByMethodName, String methodName, String id) {
+        assertTrue(probeIdsByMethodName.containsKey(methodName));
+        assertTrue(probeIdsByMethodName.get(methodName).contains(id));
+    }
 
-  private String callMethodThrowingRuntimeException(Class<?> testClass) {
-    try {
-      Reflect.onClass(testClass).call("main", "exception").get();
-      Assertions.fail("should not reach this code");
-    } catch (RuntimeException ex) {
-      assertEquals("oops", ex.getCause().getCause().getMessage());
-      return Fingerprinter.fingerprint(ex, classNameFiltering);
+    private String callMethodThrowingRuntimeException(Class<?> testClass) {
+        try {
+            Reflect.onClass(testClass).call("main", "exception").get();
+            Assertions.fail("should not reach this code");
+        } catch (RuntimeException ex) {
+            assertEquals("oops", ex.getCause().getCause().getMessage());
+            return Fingerprinter.fingerprint(ex, classNameFiltering);
+        }
+        return null;
     }
-    return null;
-  }
 
-  private String callMethodThrowingIllegalArgException(Class<?> testClass) {
-    try {
-      Reflect.onClass(testClass).call("main", "illegal").get();
-      Assertions.fail("should not reach this code");
-    } catch (RuntimeException ex) {
-      assertEquals("illegal argument", ex.getCause().getCause().getMessage());
-      return Fingerprinter.fingerprint(ex, classNameFiltering);
+    private String callMethodThrowingIllegalArgException(Class<?> testClass) {
+        try {
+            Reflect.onClass(testClass).call("main", "illegal").get();
+            Assertions.fail("should not reach this code");
+        } catch (RuntimeException ex) {
+            assertEquals("illegal argument", ex.getCause().getCause().getMessage());
+            return Fingerprinter.fingerprint(ex, classNameFiltering);
+        }
+        return null;
     }
-    return null;
-  }
 
-  private static void callMethodNoException(Class<?> testClass) {
-    int result = Reflect.onClass(testClass).call("main", "1").get();
-    assertEquals(84, result);
-  }
+    private static void callMethodNoException(Class<?> testClass) {
+        int result = Reflect.onClass(testClass).call("main", "1").get();
+        assertEquals(84, result);
+    }
 
-  private String callMethodFiboException(Class<?> testClass) {
-    try {
-      Reflect.onClass(testClass).call("main", "recursive").get();
-      Assertions.fail("should not reach this code");
-    } catch (RuntimeException ex) {
-      assertEquals("oops fibo", ex.getCause().getCause().getMessage());
-      return Fingerprinter.fingerprint(ex, classNameFiltering);
+    private String callMethodFiboException(Class<?> testClass) {
+        try {
+            Reflect.onClass(testClass).call("main", "recursive").get();
+            Assertions.fail("should not reach this code");
+        } catch (RuntimeException ex) {
+            assertEquals("oops fibo", ex.getCause().getCause().getMessage());
+            return Fingerprinter.fingerprint(ex, classNameFiltering);
+        }
+        return null;
     }
-    return null;
-  }
 
-  private static Map<String, Set<String>> extractProbeIdsByMethodName(
-      ExceptionProbeManager exceptionProbeManager) {
-    return exceptionProbeManager.getProbes().stream()
-        .collect(
-            Collectors.groupingBy(
-                exceptionProbe -> exceptionProbe.getWhere().getMethodName(),
-                Collectors.mapping(ExceptionProbe::getId, Collectors.toSet())));
-  }
+    private static Map<String, Set<String>> extractProbeIdsByMethodName(ExceptionProbeManager exceptionProbeManager) {
+        return exceptionProbeManager.getProbes().stream()
+                .collect(Collectors.groupingBy(
+                        exceptionProbe -> exceptionProbe.getWhere().getMethodName(),
+                        Collectors.mapping(ExceptionProbe::getId, Collectors.toSet())));
+    }
 
-  private TestSnapshotListener setupExceptionDebugging(
-      Config config,
-      ExceptionProbeManager exceptionProbeManager,
-      ClassNameFilter classNameFiltering) {
-    return setupExceptionDebugging(config, exceptionProbeManager, classNameFiltering, null);
-  }
+    private TestSnapshotListener setupExceptionDebugging(
+            Config config, ExceptionProbeManager exceptionProbeManager, ClassNameFilter classNameFiltering) {
+        return setupExceptionDebugging(config, exceptionProbeManager, classNameFiltering, null);
+    }
 
-  private TestSnapshotListener setupExceptionDebugging(
-      Config config,
-      ExceptionProbeManager exceptionProbeManager,
-      ClassNameFilter classNameFiltering,
-      Collection<ProbeDefinition> definitions) {
-    ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
-    ConfigurationUpdater configurationUpdater =
-        new ConfigurationUpdater(
-            instr,
-            this::createTransformer,
-            config,
-            new DebuggerSink(config, probeStatusSink),
-            new ClassesToRetransformFinder());
-    TestSnapshotListener listener = new TestSnapshotListener(config, probeStatusSink);
-    DebuggerAgentHelper.injectSink(listener);
-    DebuggerContext.initProbeResolver(configurationUpdater);
-    DebuggerContext.initValueSerializer(new JsonSnapshotSerializer());
-    DefaultExceptionDebugger exceptionDebugger =
-        new DefaultExceptionDebugger(
-            exceptionProbeManager, configurationUpdater, classNameFiltering, 100, 3, true);
-    DebuggerContext.initExceptionDebugger(exceptionDebugger);
-    configurationUpdater.accept(REMOTE_CONFIG, definitions);
-    return listener;
-  }
+    private TestSnapshotListener setupExceptionDebugging(
+            Config config,
+            ExceptionProbeManager exceptionProbeManager,
+            ClassNameFilter classNameFiltering,
+            Collection<ProbeDefinition> definitions) {
+        ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
+        ConfigurationUpdater configurationUpdater = new ConfigurationUpdater(
+                instr,
+                this::createTransformer,
+                config,
+                new DebuggerSink(config, probeStatusSink),
+                new ClassesToRetransformFinder());
+        TestSnapshotListener listener = new TestSnapshotListener(config, probeStatusSink);
+        DebuggerAgentHelper.injectSink(listener);
+        DebuggerContext.initProbeResolver(configurationUpdater);
+        DebuggerContext.initValueSerializer(new JsonSnapshotSerializer());
+        DefaultExceptionDebugger exceptionDebugger = new DefaultExceptionDebugger(
+                exceptionProbeManager, configurationUpdater, classNameFiltering, 100, 3, true);
+        DebuggerContext.initExceptionDebugger(exceptionDebugger);
+        configurationUpdater.accept(REMOTE_CONFIG, definitions);
+        return listener;
+    }
 
-  private static Config createConfig() {
-    Config config = mock(Config.class);
-    when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
-    when(config.isDynamicInstrumentationClassFileDumpEnabled()).thenReturn(true);
-    when(config.isDynamicInstrumentationVerifyByteCode()).thenReturn(true);
-    when(config.getFinalDebuggerSnapshotUrl())
-        .thenReturn("http://localhost:8126/debugger/v1/input");
-    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
-    return config;
-  }
+    private static Config createConfig() {
+        Config config = mock(Config.class);
+        when(config.isDynamicInstrumentationEnabled()).thenReturn(true);
+        when(config.isDynamicInstrumentationClassFileDumpEnabled()).thenReturn(true);
+        when(config.isDynamicInstrumentationVerifyByteCode()).thenReturn(true);
+        when(config.getFinalDebuggerSnapshotUrl()).thenReturn("http://localhost:8126/debugger/v1/input");
+        when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
+        return config;
+    }
 
-  private DebuggerTransformer createTransformer(
-      Config config,
-      Configuration configuration,
-      DebuggerTransformer.InstrumentationListener listener,
-      ProbeMetadata probeMetadata,
-      DebuggerSink debuggerSink) {
-    DebuggerTransformer debuggerTransformer =
-        new DebuggerTransformer(config, configuration, listener, probeMetadata, debuggerSink);
-    currentTransformer = debuggerTransformer;
-    return debuggerTransformer;
-  }
+    private DebuggerTransformer createTransformer(
+            Config config,
+            Configuration configuration,
+            DebuggerTransformer.InstrumentationListener listener,
+            ProbeMetadata probeMetadata,
+            DebuggerSink debuggerSink) {
+        DebuggerTransformer debuggerTransformer =
+                new DebuggerTransformer(config, configuration, listener, probeMetadata, debuggerSink);
+        currentTransformer = debuggerTransformer;
+        return debuggerTransformer;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/ExceptionProbeManagerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/ExceptionProbeManagerTest.java
index 3cd66b78f5d..d72d722c833 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/ExceptionProbeManagerTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/ExceptionProbeManagerTest.java
@@ -20,132 +20,115 @@
 import org.junit.jupiter.api.Test;
 
 class ExceptionProbeManagerTest {
-  private final RuntimeException exception = new RuntimeException("test");
+    private final RuntimeException exception = new RuntimeException("test");
 
-  @Test
-  public void instrumentStackTrace() {
-    ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
-    ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
-    RuntimeException exception = new RuntimeException("test");
-    String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
-    exceptionProbeManager.createProbesForException(exception.getStackTrace(), 0);
-    assertFalse(exceptionProbeManager.getProbes().isEmpty());
-  }
-
-  @Test
-  void instrumentSingleFrame() {
-    ClassNameFiltering classNameFiltering =
-        new ClassNameFiltering(
-            Stream.of(
-                    "java.",
-                    "jdk.",
-                    "sun.",
-                    "com.sun.",
-                    "org.gradle.",
-                    "worker.org.gradle.",
-                    "org.junit.")
-                .collect(Collectors.toSet()));
-    ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
+    @Test
+    public void instrumentStackTrace() {
+        ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
+        ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
+        RuntimeException exception = new RuntimeException("test");
+        String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
+        exceptionProbeManager.createProbesForException(exception.getStackTrace(), 0);
+        assertFalse(exceptionProbeManager.getProbes().isEmpty());
+    }
 
-    String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
-    assertEquals("b3cf344f48cb7d44f2f75ac267667fbdda167e494f24d55149843896c16584ca", fingerprint);
-    exceptionProbeManager.createProbesForException(exception.getStackTrace(), 0);
-    assertEquals(1, exceptionProbeManager.getProbes().size());
-    ExceptionProbe exceptionProbe = exceptionProbeManager.getProbes().iterator().next();
-    assertEquals(
-        "com.datadog.debugger.exception.ExceptionProbeManagerTest",
-        exceptionProbe.getWhere().getTypeName());
-  }
+    @Test
+    void instrumentSingleFrame() {
+        ClassNameFiltering classNameFiltering = new ClassNameFiltering(
+                Stream.of("java.", "jdk.", "sun.", "com.sun.", "org.gradle.", "worker.org.gradle.", "org.junit.")
+                        .collect(Collectors.toSet()));
+        ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
 
-  @Test
-  void filterAllFrames() {
-    Config config = mock(Config.class);
-    when(config.getThirdPartyExcludes()).thenReturn(Collections.emptySet());
-    when(config.getThirdPartyIncludes())
-        .thenReturn(
-            Stream.of(
-                    "org.gradle.",
-                    "worker.org.gradle.",
-                    "org.junit.",
-                    "com.datadog.debugger.exception.ExceptionProbeManagerTest")
-                .collect(Collectors.toSet()));
-    ClassNameFiltering classNameFiltering = new ClassNameFiltering(config);
-    ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
-    String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
-    assertEquals("7a1e5e1bcc64ee26801d1471245eff6b6e8d7c61d0ea36fe85f3f75d79e42c", fingerprint);
-    exceptionProbeManager.createProbesForException(exception.getStackTrace(), 0);
-    assertEquals(0, exceptionProbeManager.getProbes().size());
-  }
+        String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
+        assertEquals("b3cf344f48cb7d44f2f75ac267667fbdda167e494f24d55149843896c16584ca", fingerprint);
+        exceptionProbeManager.createProbesForException(exception.getStackTrace(), 0);
+        assertEquals(1, exceptionProbeManager.getProbes().size());
+        ExceptionProbe exceptionProbe =
+                exceptionProbeManager.getProbes().iterator().next();
+        assertEquals(
+                "com.datadog.debugger.exception.ExceptionProbeManagerTest",
+                exceptionProbe.getWhere().getTypeName());
+    }
 
-  @Test
-  void lastCapture() {
-    ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
-    ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
-    RuntimeException exception = new RuntimeException("test");
-    String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
-    exceptionProbeManager.addFingerprint(fingerprint);
-    assertTrue(exceptionProbeManager.shouldCaptureException(fingerprint));
-    exceptionProbeManager.updateLastCapture(fingerprint);
-    assertFalse(exceptionProbeManager.shouldCaptureException(fingerprint));
-    Clock clock =
-        Clock.fixed(Instant.now().plus(Duration.ofMinutes(61)), Clock.systemUTC().getZone());
-    assertTrue(exceptionProbeManager.shouldCaptureException(fingerprint, clock));
-  }
+    @Test
+    void filterAllFrames() {
+        Config config = mock(Config.class);
+        when(config.getThirdPartyExcludes()).thenReturn(Collections.emptySet());
+        when(config.getThirdPartyIncludes())
+                .thenReturn(Stream.of(
+                                "org.gradle.",
+                                "worker.org.gradle.",
+                                "org.junit.",
+                                "com.datadog.debugger.exception.ExceptionProbeManagerTest")
+                        .collect(Collectors.toSet()));
+        ClassNameFiltering classNameFiltering = new ClassNameFiltering(config);
+        ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
+        String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
+        assertEquals("7a1e5e1bcc64ee26801d1471245eff6b6e8d7c61d0ea36fe85f3f75d79e42c", fingerprint);
+        exceptionProbeManager.createProbesForException(exception.getStackTrace(), 0);
+        assertEquals(0, exceptionProbeManager.getProbes().size());
+    }
 
-  @Test
-  void maxFrames() {
-    RuntimeException deepException = level1();
-    ClassNameFiltering classNameFiltering =
-        new ClassNameFiltering(
-            Stream.of(
-                    "java.",
-                    "jdk.",
-                    "sun.",
-                    "com.sun.",
-                    "org.gradle.",
-                    "worker.org.gradle.",
-                    "org.junit.")
-                .collect(Collectors.toSet()));
-    ExceptionProbeManager exceptionProbeManager =
-        new ExceptionProbeManager(classNameFiltering, Duration.ofHours(1), Clock.systemUTC(), 3);
-    exceptionProbeManager.createProbesForException(deepException.getStackTrace(), 0);
-    assertEquals(3, exceptionProbeManager.getProbes().size());
-  }
+    @Test
+    void lastCapture() {
+        ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
+        ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
+        RuntimeException exception = new RuntimeException("test");
+        String fingerprint = Fingerprinter.fingerprint(exception, classNameFiltering);
+        exceptionProbeManager.addFingerprint(fingerprint);
+        assertTrue(exceptionProbeManager.shouldCaptureException(fingerprint));
+        exceptionProbeManager.updateLastCapture(fingerprint);
+        assertFalse(exceptionProbeManager.shouldCaptureException(fingerprint));
+        Clock clock = Clock.fixed(
+                Instant.now().plus(Duration.ofMinutes(61)), Clock.systemUTC().getZone());
+        assertTrue(exceptionProbeManager.shouldCaptureException(fingerprint, clock));
+    }
 
-  RuntimeException level1() {
-    return level2();
-  }
+    @Test
+    void maxFrames() {
+        RuntimeException deepException = level1();
+        ClassNameFiltering classNameFiltering = new ClassNameFiltering(
+                Stream.of("java.", "jdk.", "sun.", "com.sun.", "org.gradle.", "worker.org.gradle.", "org.junit.")
+                        .collect(Collectors.toSet()));
+        ExceptionProbeManager exceptionProbeManager =
+                new ExceptionProbeManager(classNameFiltering, Duration.ofHours(1), Clock.systemUTC(), 3);
+        exceptionProbeManager.createProbesForException(deepException.getStackTrace(), 0);
+        assertEquals(3, exceptionProbeManager.getProbes().size());
+    }
 
-  RuntimeException level2() {
-    return level3();
-  }
+    RuntimeException level1() {
+        return level2();
+    }
 
-  RuntimeException level3() {
-    return new RuntimeException("3 level deep exception");
-  }
+    RuntimeException level2() {
+        return level3();
+    }
 
-  @Test
-  void addSnapshotCapsGrowth() {
-    ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
-    ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
-    RuntimeException throwable = new RuntimeException("test");
-    for (int i = 0; i < 300; i++) {
-      exceptionProbeManager.addSnapshot(createSnapshot(throwable));
+    RuntimeException level3() {
+        return new RuntimeException("3 level deep exception");
     }
-    ExceptionProbeManager.ThrowableState state =
-        exceptionProbeManager.getStateByThrowable(throwable);
-    int cappedSize = state.getSnapshots().size();
-    for (int i = 0; i < 50; i++) {
-      exceptionProbeManager.addSnapshot(createSnapshot(throwable));
+
+    @Test
+    void addSnapshotCapsGrowth() {
+        ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
+        ExceptionProbeManager exceptionProbeManager = new ExceptionProbeManager(classNameFiltering);
+        RuntimeException throwable = new RuntimeException("test");
+        for (int i = 0; i < 300; i++) {
+            exceptionProbeManager.addSnapshot(createSnapshot(throwable));
+        }
+        ExceptionProbeManager.ThrowableState state = exceptionProbeManager.getStateByThrowable(throwable);
+        int cappedSize = state.getSnapshots().size();
+        for (int i = 0; i < 50; i++) {
+            exceptionProbeManager.addSnapshot(createSnapshot(throwable));
+        }
+        assertEquals(cappedSize, state.getSnapshots().size());
     }
-    assertEquals(cappedSize, state.getSnapshots().size());
-  }
 
-  private static Snapshot createSnapshot(Throwable throwable) {
-    Snapshot snapshot = new Snapshot(Thread.currentThread(), null, 1);
-    CapturedContext context = new CapturedContext();
-    context.addThrowable(throwable);
-    snapshot.setExit(context);
-    return snapshot;
-  }
+    private static Snapshot createSnapshot(Throwable throwable) {
+        Snapshot snapshot = new Snapshot(Thread.currentThread(), null, 1);
+        CapturedContext context = new CapturedContext();
+        context.addThrowable(throwable);
+        snapshot.setExit(context);
+        return snapshot;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/FailedTestReplayExceptionDebuggerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/FailedTestReplayExceptionDebuggerTest.java
index fde122cb47c..2211ee00335 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/FailedTestReplayExceptionDebuggerTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/FailedTestReplayExceptionDebuggerTest.java
@@ -20,40 +20,37 @@
 
 public class FailedTestReplayExceptionDebuggerTest {
 
-  private ClassNameFiltering classNameFiltering;
-  private ConfigurationUpdater configurationUpdater;
-  private FailedTestReplayExceptionDebugger exceptionDebugger;
-  private TestSnapshotListener listener;
+    private ClassNameFiltering classNameFiltering;
+    private ConfigurationUpdater configurationUpdater;
+    private FailedTestReplayExceptionDebugger exceptionDebugger;
+    private TestSnapshotListener listener;
 
-  @BeforeEach
-  public void setUp() {
-    configurationUpdater = mock(ConfigurationUpdater.class);
-    classNameFiltering =
-        new ClassNameFiltering(
-            new HashSet<>(singletonList("com.datadog.debugger.exception.ThirdPartyCode")));
-    Config config = createConfig();
-    exceptionDebugger =
-        new FailedTestReplayExceptionDebugger(configurationUpdater, classNameFiltering, config);
-    listener = new TestSnapshotListener(createConfig(), mock(ProbeStatusSink.class));
-    DebuggerAgentHelper.injectSink(listener);
-  }
+    @BeforeEach
+    public void setUp() {
+        configurationUpdater = mock(ConfigurationUpdater.class);
+        classNameFiltering =
+                new ClassNameFiltering(new HashSet<>(singletonList("com.datadog.debugger.exception.ThirdPartyCode")));
+        Config config = createConfig();
+        exceptionDebugger = new FailedTestReplayExceptionDebugger(configurationUpdater, classNameFiltering, config);
+        listener = new TestSnapshotListener(createConfig(), mock(ProbeStatusSink.class));
+        DebuggerAgentHelper.injectSink(listener);
+    }
 
-  @Test
-  public void failedTestReplayModeWithoutActiveTest() {
-    // other execution path is tested with smoke tests
-    ExceptionProbeManager manager = mock(ExceptionProbeManager.class);
-    exceptionDebugger.handleException(new RuntimeException("test"), mock(AgentSpan.class));
-    verify(manager, times(0)).isAlreadyInstrumented(any());
-  }
+    @Test
+    public void failedTestReplayModeWithoutActiveTest() {
+        // other execution path is tested with smoke tests
+        ExceptionProbeManager manager = mock(ExceptionProbeManager.class);
+        exceptionDebugger.handleException(new RuntimeException("test"), mock(AgentSpan.class));
+        verify(manager, times(0)).isAlreadyInstrumented(any());
+    }
 
-  public static Config createConfig() {
-    Config config = mock(Config.class);
-    when(config.getFinalDebuggerSnapshotUrl())
-        .thenReturn("http://localhost:8126/debugger/v1/input");
-    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
-    when(config.getDebuggerExceptionCaptureInterval()).thenReturn(3600);
-    when(config.getDebuggerMaxExceptionPerSecond()).thenReturn(1);
-    when(config.getDebuggerExceptionMaxCapturedFrames()).thenReturn(3);
-    return config;
-  }
+    public static Config createConfig() {
+        Config config = mock(Config.class);
+        when(config.getFinalDebuggerSnapshotUrl()).thenReturn("http://localhost:8126/debugger/v1/input");
+        when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+        when(config.getDebuggerExceptionCaptureInterval()).thenReturn(3600);
+        when(config.getDebuggerMaxExceptionPerSecond()).thenReturn(1);
+        when(config.getDebuggerExceptionMaxCapturedFrames()).thenReturn(3);
+        return config;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/FingerprinterTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/FingerprinterTest.java
index 105c9cc80a0..0d501654661 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/FingerprinterTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/FingerprinterTest.java
@@ -9,83 +9,76 @@
 
 class FingerprinterTest {
 
-  final Throwable TEST_THROWABLE = new RuntimeException("test");
+    final Throwable TEST_THROWABLE = new RuntimeException("test");
 
-  {
-    TEST_THROWABLE.setStackTrace(
-        new StackTraceElement[] {
-          new StackTraceElement(
-              "com.datadog.debugger.exception.FingerprinterTest",
-              "<init>",
-              "FingerprinterTest.java",
-              10),
-          new StackTraceElement(
-              "org.junit.platform.commons.util.ReflectionUtils",
-              "newInstance",
-              "ReflectionUtils.java",
-              552),
-          new StackTraceElement(
-              "org.junit.jupiter.engine.execution.ConstructorInvocation",
-              "proceed",
-              "ConstructorInvocation.java",
-              56),
-          new StackTraceElement(
-              "org.junit.jupiter.engine.execution.InvocationInterceptorChain$ValidatingInvocation",
-              "proceed",
-              "InvocationInterceptorChain.java",
-              131),
+    {
+        TEST_THROWABLE.setStackTrace(new StackTraceElement[] {
+            new StackTraceElement(
+                    "com.datadog.debugger.exception.FingerprinterTest", "<init>", "FingerprinterTest.java", 10),
+            new StackTraceElement(
+                    "org.junit.platform.commons.util.ReflectionUtils", "newInstance", "ReflectionUtils.java", 552),
+            new StackTraceElement(
+                    "org.junit.jupiter.engine.execution.ConstructorInvocation",
+                    "proceed",
+                    "ConstructorInvocation.java",
+                    56),
+            new StackTraceElement(
+                    "org.junit.jupiter.engine.execution.InvocationInterceptorChain$ValidatingInvocation",
+                    "proceed",
+                    "InvocationInterceptorChain.java",
+                    131),
         });
-  }
+    }
 
-  final String TEST_FINGERPRINT = "2ec0db28f254ffa383cbb26a32269bf739ba937b9dd8f111d22294e6a494855";
-  final ClassNameFiltering classNameFiltering = new ClassNameFiltering(emptySet());
+    final String TEST_FINGERPRINT = "2ec0db28f254ffa383cbb26a32269bf739ba937b9dd8f111d22294e6a494855";
+    final ClassNameFiltering classNameFiltering = new ClassNameFiltering(emptySet());
 
-  @Test
-  void basic() {
-    String fingerprint = Fingerprinter.fingerprint(TEST_THROWABLE, classNameFiltering);
-    assertEquals(TEST_FINGERPRINT, fingerprint);
-  }
+    @Test
+    void basic() {
+        String fingerprint = Fingerprinter.fingerprint(TEST_THROWABLE, classNameFiltering);
+        assertEquals(TEST_FINGERPRINT, fingerprint);
+    }
 
-  @Test
-  void inner() {
-    Throwable t = new RuntimeException("outer", TEST_THROWABLE);
-    String fingerprint = Fingerprinter.fingerprint(t, classNameFiltering);
-    assertEquals(TEST_FINGERPRINT, fingerprint);
-  }
+    @Test
+    void inner() {
+        Throwable t = new RuntimeException("outer", TEST_THROWABLE);
+        String fingerprint = Fingerprinter.fingerprint(t, classNameFiltering);
+        assertEquals(TEST_FINGERPRINT, fingerprint);
+    }
 
-  @Test
-  void innerInfiniteLoop() {
-    Exception outer = new RuntimeException("outer");
-    Exception innerCause1 = new RuntimeException("cause1", outer);
-    Exception innerCause2 = new RuntimeException("cause2", innerCause1);
-    outer.initCause(innerCause2);
-    Assertions.assertNull(Fingerprinter.fingerprint(outer, classNameFiltering));
-  }
+    @Test
+    void innerInfiniteLoop() {
+        Exception outer = new RuntimeException("outer");
+        Exception innerCause1 = new RuntimeException("cause1", outer);
+        Exception innerCause2 = new RuntimeException("cause2", innerCause1);
+        outer.initCause(innerCause2);
+        Assertions.assertNull(Fingerprinter.fingerprint(outer, classNameFiltering));
+    }
 
-  @Test
-  void emptyStacktrace() {
-    assertEquals(
-        "843ff84fcbdc76707588c035f63b0e69b6f9b2c53f9a019ef4e5d1a2243778",
-        Fingerprinter.fingerprint(new EmptyException("test"), classNameFiltering));
-  }
+    @Test
+    void emptyStacktrace() {
+        assertEquals(
+                "843ff84fcbdc76707588c035f63b0e69b6f9b2c53f9a019ef4e5d1a2243778",
+                Fingerprinter.fingerprint(new EmptyException("test"), classNameFiltering));
+    }
 
-  @Test
-  void nullStacktrace() {
-    assertEquals(
-        "35ae5d9aa4d7179a7d36838ca6266ea459a7cbb6ebc92afc24098bc85cad586",
-        Fingerprinter.fingerprint(
-            new RuntimeException("test") {
-              @Override
-              public StackTraceElement[] getStackTrace() {
-                return null;
-              }
-            },
-            classNameFiltering));
-  }
+    @Test
+    void nullStacktrace() {
+        assertEquals(
+                "35ae5d9aa4d7179a7d36838ca6266ea459a7cbb6ebc92afc24098bc85cad586",
+                Fingerprinter.fingerprint(
+                        new RuntimeException("test") {
+                            @Override
+                            public StackTraceElement[] getStackTrace() {
+                                return null;
+                            }
+                        },
+                        classNameFiltering));
+    }
 
-  static class EmptyException extends Exception {
-    public EmptyException(String message) {
-      super(message, null, false, false);
+    static class EmptyException extends Exception {
+        public EmptyException(String message) {
+            super(message, null, false, false);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/instrumentation/ASMHelperTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/instrumentation/ASMHelperTest.java
index 85c96aa6559..19507c276e9 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/instrumentation/ASMHelperTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/instrumentation/ASMHelperTest.java
@@ -26,189 +26,158 @@
 
 public class ASMHelperTest {
 
-  public static final LocalVariableNode THIS =
-      createLocalVar(null, Types.OBJECT_TYPE.getDescriptor(), 0);
+    public static final LocalVariableNode THIS = createLocalVar(null, Types.OBJECT_TYPE.getDescriptor(), 0);
 
-  @Test
-  public void ensureSafeLoadClass() {
-    IllegalArgumentException illegalArgumentException =
-        assertThrows(IllegalArgumentException.class, () -> ensureSafeClassLoad("", null, null));
-    assertEquals(
-        "Cannot ensure loading class:  safely as current class being transformed is not provided (null)",
-        illegalArgumentException.getMessage());
-    illegalArgumentException =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                ensureSafeClassLoad(
-                    "com.datadog.debugger.MyClass", "com.datadog.debugger.MyClass", null));
-    assertEquals(
-        "Cannot load class com.datadog.debugger.MyClass as this is the class being currently transformed",
-        illegalArgumentException.getMessage());
-    Class<?> clazz =
-        ensureSafeClassLoad(
-            ASMHelperTest.class.getTypeName(), "", ASMHelperTest.class.getClassLoader());
-    assertEquals(ASMHelperTest.class, clazz);
-  }
-
-  @Test
-  public void isStoreCompatibleType() {
-    assertTrue(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Type.INT_TYPE));
-    assertTrue(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Type.SHORT_TYPE));
-    assertTrue(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Type.BYTE_TYPE));
-    assertTrue(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Type.CHAR_TYPE));
-    assertTrue(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Type.BOOLEAN_TYPE));
-    assertTrue(ASMHelper.isStoreCompatibleType(Type.LONG_TYPE, Type.LONG_TYPE));
-    assertTrue(ASMHelper.isStoreCompatibleType(Type.FLOAT_TYPE, Type.FLOAT_TYPE));
-    assertTrue(ASMHelper.isStoreCompatibleType(Type.DOUBLE_TYPE, Type.DOUBLE_TYPE));
-    assertTrue(ASMHelper.isStoreCompatibleType(Types.OBJECT_TYPE, Type.getType(Object.class)));
-    assertTrue(ASMHelper.isStoreCompatibleType(Type.getType(Object.class), Types.OBJECT_TYPE));
-    assertTrue(
-        ASMHelper.isStoreCompatibleType(Type.getType(Object.class), Type.getType(String.class)));
-    assertTrue(
-        ASMHelper.isStoreCompatibleType(Type.getType(String.class), Type.getType(Object.class)));
-    assertTrue(
-        ASMHelper.isStoreCompatibleType(Type.getType(String.class), Type.getType(String.class)));
-    assertFalse(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Type.LONG_TYPE));
-    assertFalse(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Type.FLOAT_TYPE));
-    assertFalse(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Type.DOUBLE_TYPE));
-    assertFalse(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Types.OBJECT_TYPE));
-    assertFalse(ASMHelper.isStoreCompatibleType(Types.OBJECT_TYPE, Type.INT_TYPE));
-    assertFalse(ASMHelper.isStoreCompatibleType(Types.OBJECT_TYPE, Type.LONG_TYPE));
-    assertFalse(ASMHelper.isStoreCompatibleType(Types.OBJECT_TYPE, Type.FLOAT_TYPE));
-    assertFalse(ASMHelper.isStoreCompatibleType(Types.OBJECT_TYPE, Type.DOUBLE_TYPE));
-    assertFalse(ASMHelper.isStoreCompatibleType(Type.getType(String.class), Type.INT_TYPE));
-  }
+    @Test
+    public void ensureSafeLoadClass() {
+        IllegalArgumentException illegalArgumentException =
+                assertThrows(IllegalArgumentException.class, () -> ensureSafeClassLoad("", null, null));
+        assertEquals(
+                "Cannot ensure loading class:  safely as current class being transformed is not provided (null)",
+                illegalArgumentException.getMessage());
+        illegalArgumentException = assertThrows(
+                IllegalArgumentException.class,
+                () -> ensureSafeClassLoad("com.datadog.debugger.MyClass", "com.datadog.debugger.MyClass", null));
+        assertEquals(
+                "Cannot load class com.datadog.debugger.MyClass as this is the class being currently transformed",
+                illegalArgumentException.getMessage());
+        Class<?> clazz =
+                ensureSafeClassLoad(ASMHelperTest.class.getTypeName(), "", ASMHelperTest.class.getClassLoader());
+        assertEquals(ASMHelperTest.class, clazz);
+    }
 
-  @Test
-  public void adjustLocalVarsBasedOnArgs_empty() {
-    LocalVariableNode[] emptyLocalVariables = new LocalVariableNode[0];
-    Type[] emptyArgs = new Type[0];
-    ASMHelper.adjustLocalVarsBasedOnArgs(
-        false, emptyLocalVariables, emptyArgs, Collections.emptyList());
-    ASMHelper.adjustLocalVarsBasedOnArgs(
-        true, emptyLocalVariables, emptyArgs, Collections.emptyList());
-  }
+    @Test
+    public void isStoreCompatibleType() {
+        assertTrue(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Type.INT_TYPE));
+        assertTrue(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Type.SHORT_TYPE));
+        assertTrue(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Type.BYTE_TYPE));
+        assertTrue(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Type.CHAR_TYPE));
+        assertTrue(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Type.BOOLEAN_TYPE));
+        assertTrue(ASMHelper.isStoreCompatibleType(Type.LONG_TYPE, Type.LONG_TYPE));
+        assertTrue(ASMHelper.isStoreCompatibleType(Type.FLOAT_TYPE, Type.FLOAT_TYPE));
+        assertTrue(ASMHelper.isStoreCompatibleType(Type.DOUBLE_TYPE, Type.DOUBLE_TYPE));
+        assertTrue(ASMHelper.isStoreCompatibleType(Types.OBJECT_TYPE, Type.getType(Object.class)));
+        assertTrue(ASMHelper.isStoreCompatibleType(Type.getType(Object.class), Types.OBJECT_TYPE));
+        assertTrue(ASMHelper.isStoreCompatibleType(Type.getType(Object.class), Type.getType(String.class)));
+        assertTrue(ASMHelper.isStoreCompatibleType(Type.getType(String.class), Type.getType(Object.class)));
+        assertTrue(ASMHelper.isStoreCompatibleType(Type.getType(String.class), Type.getType(String.class)));
+        assertFalse(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Type.LONG_TYPE));
+        assertFalse(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Type.FLOAT_TYPE));
+        assertFalse(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Type.DOUBLE_TYPE));
+        assertFalse(ASMHelper.isStoreCompatibleType(Type.INT_TYPE, Types.OBJECT_TYPE));
+        assertFalse(ASMHelper.isStoreCompatibleType(Types.OBJECT_TYPE, Type.INT_TYPE));
+        assertFalse(ASMHelper.isStoreCompatibleType(Types.OBJECT_TYPE, Type.LONG_TYPE));
+        assertFalse(ASMHelper.isStoreCompatibleType(Types.OBJECT_TYPE, Type.FLOAT_TYPE));
+        assertFalse(ASMHelper.isStoreCompatibleType(Types.OBJECT_TYPE, Type.DOUBLE_TYPE));
+        assertFalse(ASMHelper.isStoreCompatibleType(Type.getType(String.class), Type.INT_TYPE));
+    }
 
-  @Test
-  public void adjustLocalVarsBasedOnArgs() {
-    doAdjustLocalVarsBasedOnArgs(
-        true, asList(Type.INT_TYPE), asList(createLocalVar("a", "I", 0)), asList("a"));
-    doAdjustLocalVarsBasedOnArgs(
-        false, asList(Type.INT_TYPE), asList(THIS, createLocalVar("a", "I", 1)), asList("a"));
-    doAdjustLocalVarsBasedOnArgs(
-        true,
-        asList(Type.INT_TYPE, Type.INT_TYPE, Type.INT_TYPE),
-        asList(
-            createLocalVar("c", "I", 2), createLocalVar("b", "I", 1), createLocalVar("a", "I", 0)),
-        asList("a", "b", "c"));
-    doAdjustLocalVarsBasedOnArgs(
-        false,
-        asList(Type.INT_TYPE, Type.INT_TYPE, Type.INT_TYPE),
-        asList(
-            THIS,
-            createLocalVar("c", "I", 3),
-            createLocalVar("b", "I", 2),
-            createLocalVar("a", "I", 1)),
-        asList("a", "b", "c"));
-    doAdjustLocalVarsBasedOnArgs(
-        true,
-        asList(Type.LONG_TYPE, Type.LONG_TYPE, Type.LONG_TYPE),
-        asList(
-            createLocalVar("c", "J", 4), createLocalVar("b", "J", 2), createLocalVar("a", "J", 0)),
-        asList("a", "b", "c"));
-    doAdjustLocalVarsBasedOnArgs(
-        false,
-        asList(Type.LONG_TYPE, Type.LONG_TYPE, Type.LONG_TYPE),
-        asList(
-            THIS,
-            createLocalVar("c", "J", 5),
-            createLocalVar("b", "J", 3),
-            createLocalVar("a", "J", 1)),
-        asList("a", "b", "c"));
-    doAdjustLocalVarsBasedOnArgs(
-        true,
-        asList(Type.INT_TYPE, Type.INT_TYPE, Type.INT_TYPE),
-        asList(
-            createLocalVar("c", "I", 6), createLocalVar("b", "I", 5), createLocalVar("a", "I", 4)),
-        asList("a", "b", "c"));
-    doAdjustLocalVarsBasedOnArgs(
-        false,
-        asList(Type.INT_TYPE, Type.INT_TYPE, Type.INT_TYPE),
-        asList(
-            THIS,
-            createLocalVar("c", "I", 6),
-            createLocalVar("b", "I", 5),
-            createLocalVar("a", "I", 4)),
-        asList("a", "b", "c"));
-    doAdjustLocalVarsBasedOnArgs(
-        true,
-        asList(Type.LONG_TYPE, Type.LONG_TYPE, Type.LONG_TYPE),
-        asList(
-            createLocalVar("c", "J", 10), createLocalVar("b", "J", 8), createLocalVar("a", "J", 6)),
-        asList("a", "b", "c"));
-    doAdjustLocalVarsBasedOnArgs(
-        false,
-        asList(Type.LONG_TYPE, Type.LONG_TYPE, Type.LONG_TYPE),
-        asList(
-            THIS,
-            createLocalVar("c", "J", 10),
-            createLocalVar("b", "J", 8),
-            createLocalVar("a", "J", 6)),
-        asList("a", "b", "c"));
-  }
+    @Test
+    public void adjustLocalVarsBasedOnArgs_empty() {
+        LocalVariableNode[] emptyLocalVariables = new LocalVariableNode[0];
+        Type[] emptyArgs = new Type[0];
+        ASMHelper.adjustLocalVarsBasedOnArgs(false, emptyLocalVariables, emptyArgs, Collections.emptyList());
+        ASMHelper.adjustLocalVarsBasedOnArgs(true, emptyLocalVariables, emptyArgs, Collections.emptyList());
+    }
 
-  private void doAdjustLocalVarsBasedOnArgs(
-      boolean isStatic,
-      List<Type> argTypes,
-      List<LocalVariableNode> localVarNodes,
-      List<String> expectedLocalVarNames) {
-    Type[] args = argTypes.toArray(new Type[0]);
-    List<LocalVariableNode> sortedLocalVariables = sortLocalVariables(localVarNodes);
-    LocalVariableNode[] localVars = createLocalVarNodes(sortedLocalVariables);
-    ASMHelper.adjustLocalVarsBasedOnArgs(isStatic, localVars, args, sortedLocalVariables);
-    int idx = isStatic ? 0 : 1;
-    for (String name : expectedLocalVarNames) {
-      assertEquals(name, localVars[idx].name);
-      idx += Type.getType(localVars[idx].desc).getSize();
+    @Test
+    public void adjustLocalVarsBasedOnArgs() {
+        doAdjustLocalVarsBasedOnArgs(true, asList(Type.INT_TYPE), asList(createLocalVar("a", "I", 0)), asList("a"));
+        doAdjustLocalVarsBasedOnArgs(
+                false, asList(Type.INT_TYPE), asList(THIS, createLocalVar("a", "I", 1)), asList("a"));
+        doAdjustLocalVarsBasedOnArgs(
+                true,
+                asList(Type.INT_TYPE, Type.INT_TYPE, Type.INT_TYPE),
+                asList(createLocalVar("c", "I", 2), createLocalVar("b", "I", 1), createLocalVar("a", "I", 0)),
+                asList("a", "b", "c"));
+        doAdjustLocalVarsBasedOnArgs(
+                false,
+                asList(Type.INT_TYPE, Type.INT_TYPE, Type.INT_TYPE),
+                asList(THIS, createLocalVar("c", "I", 3), createLocalVar("b", "I", 2), createLocalVar("a", "I", 1)),
+                asList("a", "b", "c"));
+        doAdjustLocalVarsBasedOnArgs(
+                true,
+                asList(Type.LONG_TYPE, Type.LONG_TYPE, Type.LONG_TYPE),
+                asList(createLocalVar("c", "J", 4), createLocalVar("b", "J", 2), createLocalVar("a", "J", 0)),
+                asList("a", "b", "c"));
+        doAdjustLocalVarsBasedOnArgs(
+                false,
+                asList(Type.LONG_TYPE, Type.LONG_TYPE, Type.LONG_TYPE),
+                asList(THIS, createLocalVar("c", "J", 5), createLocalVar("b", "J", 3), createLocalVar("a", "J", 1)),
+                asList("a", "b", "c"));
+        doAdjustLocalVarsBasedOnArgs(
+                true,
+                asList(Type.INT_TYPE, Type.INT_TYPE, Type.INT_TYPE),
+                asList(createLocalVar("c", "I", 6), createLocalVar("b", "I", 5), createLocalVar("a", "I", 4)),
+                asList("a", "b", "c"));
+        doAdjustLocalVarsBasedOnArgs(
+                false,
+                asList(Type.INT_TYPE, Type.INT_TYPE, Type.INT_TYPE),
+                asList(THIS, createLocalVar("c", "I", 6), createLocalVar("b", "I", 5), createLocalVar("a", "I", 4)),
+                asList("a", "b", "c"));
+        doAdjustLocalVarsBasedOnArgs(
+                true,
+                asList(Type.LONG_TYPE, Type.LONG_TYPE, Type.LONG_TYPE),
+                asList(createLocalVar("c", "J", 10), createLocalVar("b", "J", 8), createLocalVar("a", "J", 6)),
+                asList("a", "b", "c"));
+        doAdjustLocalVarsBasedOnArgs(
+                false,
+                asList(Type.LONG_TYPE, Type.LONG_TYPE, Type.LONG_TYPE),
+                asList(THIS, createLocalVar("c", "J", 10), createLocalVar("b", "J", 8), createLocalVar("a", "J", 6)),
+                asList("a", "b", "c"));
     }
-  }
 
-  private static LocalVariableNode createLocalVar(String name, String desc, int index) {
-    return new LocalVariableNode(name, desc, null, null, null, index);
-  }
+    private void doAdjustLocalVarsBasedOnArgs(
+            boolean isStatic,
+            List<Type> argTypes,
+            List<LocalVariableNode> localVarNodes,
+            List<String> expectedLocalVarNames) {
+        Type[] args = argTypes.toArray(new Type[0]);
+        List<LocalVariableNode> sortedLocalVariables = sortLocalVariables(localVarNodes);
+        LocalVariableNode[] localVars = createLocalVarNodes(sortedLocalVariables);
+        ASMHelper.adjustLocalVarsBasedOnArgs(isStatic, localVars, args, sortedLocalVariables);
+        int idx = isStatic ? 0 : 1;
+        for (String name : expectedLocalVarNames) {
+            assertEquals(name, localVars[idx].name);
+            idx += Type.getType(localVars[idx].desc).getSize();
+        }
+    }
 
-  @Test
-  void getLineNumbers() {
-    assertEquals(Collections.emptyList(), ASMHelper.getLineNumbers(null));
-    MethodNode methodNode = new MethodNode();
-    assertEquals(Collections.emptyList(), ASMHelper.getLineNumbers(methodNode));
-    methodNode.instructions.add(new LineNumberNode(40, null));
-    methodNode.instructions.add(new LineNumberNode(2, null));
-    methodNode.instructions.add(new LineNumberNode(82, null));
-    methodNode.instructions.add(new LabelNode());
-    List<Integer> lineNumbers = ASMHelper.getLineNumbers(methodNode);
-    assertEquals(3, lineNumbers.size());
-    assertEquals(40, lineNumbers.get(0).intValue());
-    assertEquals(2, lineNumbers.get(1).intValue());
-    assertEquals(82, lineNumbers.get(2).intValue());
-  }
+    private static LocalVariableNode createLocalVar(String name, String desc, int index) {
+        return new LocalVariableNode(name, desc, null, null, null, index);
+    }
 
-  @Test
-  void computeFramesGrowsMaxStackWhenInsufficient() {
-    MethodNode methodNode = new MethodNode(Opcodes.ACC_STATIC, "deepLongStack", "()V", null, null);
-    methodNode.maxStack = 1; // deliberately too small for the actual stack depth needed below
-    int longCount = 20; // stack depth of 20, well above the initial guess of 16
-    for (int i = 0; i < longCount; i++) {
-      methodNode.instructions.add(new InsnNode(Opcodes.LCONST_0));
+    @Test
+    void getLineNumbers() {
+        assertEquals(Collections.emptyList(), ASMHelper.getLineNumbers(null));
+        MethodNode methodNode = new MethodNode();
+        assertEquals(Collections.emptyList(), ASMHelper.getLineNumbers(methodNode));
+        methodNode.instructions.add(new LineNumberNode(40, null));
+        methodNode.instructions.add(new LineNumberNode(2, null));
+        methodNode.instructions.add(new LineNumberNode(82, null));
+        methodNode.instructions.add(new LabelNode());
+        List<Integer> lineNumbers = ASMHelper.getLineNumbers(methodNode);
+        assertEquals(3, lineNumbers.size());
+        assertEquals(40, lineNumbers.get(0).intValue());
+        assertEquals(2, lineNumbers.get(1).intValue());
+        assertEquals(82, lineNumbers.get(2).intValue());
     }
-    for (int i = 0; i < longCount; i++) {
-      methodNode.instructions.add(new InsnNode(Opcodes.POP2));
+
+    @Test
+    void computeFramesGrowsMaxStackWhenInsufficient() {
+        MethodNode methodNode = new MethodNode(Opcodes.ACC_STATIC, "deepLongStack", "()V", null, null);
+        methodNode.maxStack = 1; // deliberately too small for the actual stack depth needed below
+        int longCount = 20; // stack depth of 20, well above the initial guess of 16
+        for (int i = 0; i < longCount; i++) {
+            methodNode.instructions.add(new InsnNode(Opcodes.LCONST_0));
+        }
+        for (int i = 0; i < longCount; i++) {
+            methodNode.instructions.add(new InsnNode(Opcodes.POP2));
+        }
+        methodNode.instructions.add(new InsnNode(Opcodes.RETURN));
+        Map<AbstractInsnNode, Frame<BasicValue>> frames =
+                ASMHelper.computeFrames("com/datadog/debugger/FakeOwner", methodNode);
+        assertEquals(methodNode.instructions.size(), frames.size());
+        assertTrue(methodNode.maxStack >= longCount);
     }
-    methodNode.instructions.add(new InsnNode(Opcodes.RETURN));
-    Map<AbstractInsnNode, Frame<BasicValue>> frames =
-        ASMHelper.computeFrames("com/datadog/debugger/FakeOwner", methodNode);
-    assertEquals(methodNode.instructions.size(), frames.size());
-    assertTrue(methodNode.maxStack >= longCount);
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/instrumentation/ByteCodeHelperTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/instrumentation/ByteCodeHelperTest.java
index 9dde4c19e8d..c684be1c48e 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/instrumentation/ByteCodeHelperTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/instrumentation/ByteCodeHelperTest.java
@@ -20,129 +20,105 @@
 
 public class ByteCodeHelperTest {
 
-  @Test
-  public void insn() {
-    assertEquals(1, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.ACONST_NULL)));
-    assertEquals(2, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.LCONST_0)));
-    assertEquals(-1, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.IALOAD)));
-    assertEquals(-3, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.IASTORE)));
-    assertEquals(-4, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.LASTORE)));
-    assertEquals(-1, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.POP)));
-    assertEquals(-2, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.POP2)));
-    assertEquals(1, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.DUP)));
-    assertEquals(2, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.DUP2)));
-    assertEquals(0, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.INEG)));
-    assertEquals(-1, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.IADD)));
-    assertEquals(-2, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.LADD)));
-    assertEquals(1, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.I2L)));
-    assertEquals(-1, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.L2I)));
-    assertEquals(-3, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.LCMP)));
-  }
-
-  @Test
-  public void intInsn() {
-    assertEquals(1, ByteCodeHelper.adjustStackUsage(new IntInsnNode(Opcodes.BIPUSH, 0)));
-    assertEquals(0, ByteCodeHelper.adjustStackUsage(new IntInsnNode(Opcodes.NEWARRAY, 0)));
-  }
-
-  @Test
-  public void varInsn() {
-    assertEquals(1, ByteCodeHelper.adjustStackUsage(new VarInsnNode(Opcodes.ILOAD, 0)));
-    assertEquals(2, ByteCodeHelper.adjustStackUsage(new VarInsnNode(Opcodes.LLOAD, 0)));
-    assertEquals(-1, ByteCodeHelper.adjustStackUsage(new VarInsnNode(Opcodes.ISTORE, 0)));
-    assertEquals(-2, ByteCodeHelper.adjustStackUsage(new VarInsnNode(Opcodes.LSTORE, 0)));
-  }
-
-  @Test
-  public void typeInsn() {
-    assertEquals(1, ByteCodeHelper.adjustStackUsage(new TypeInsnNode(Opcodes.NEW, "")));
-    assertEquals(0, ByteCodeHelper.adjustStackUsage(new TypeInsnNode(Opcodes.ANEWARRAY, "")));
-    assertEquals(0, ByteCodeHelper.adjustStackUsage(new TypeInsnNode(Opcodes.CHECKCAST, "")));
-    assertEquals(0, ByteCodeHelper.adjustStackUsage(new TypeInsnNode(Opcodes.INSTANCEOF, "")));
-  }
-
-  @Test
-  public void fieldInsn() {
-    assertEquals(
-        0, ByteCodeHelper.adjustStackUsage(new FieldInsnNode(Opcodes.GETFIELD, "", "", "I")));
-    assertEquals(
-        1, ByteCodeHelper.adjustStackUsage(new FieldInsnNode(Opcodes.GETFIELD, "", "", "J")));
-    assertEquals(
-        -2, ByteCodeHelper.adjustStackUsage(new FieldInsnNode(Opcodes.PUTFIELD, "", "", "I")));
-    assertEquals(
-        -3, ByteCodeHelper.adjustStackUsage(new FieldInsnNode(Opcodes.PUTFIELD, "", "", "J")));
-    assertEquals(
-        1, ByteCodeHelper.adjustStackUsage(new FieldInsnNode(Opcodes.GETSTATIC, "", "", "I")));
-    assertEquals(
-        2, ByteCodeHelper.adjustStackUsage(new FieldInsnNode(Opcodes.GETSTATIC, "", "", "J")));
-    assertEquals(
-        -1, ByteCodeHelper.adjustStackUsage(new FieldInsnNode(Opcodes.PUTSTATIC, "", "", "I")));
-    assertEquals(
-        -2, ByteCodeHelper.adjustStackUsage(new FieldInsnNode(Opcodes.PUTSTATIC, "", "", "J")));
-  }
-
-  @Test
-  public void methodInsn() {
-    assertEquals(
-        1,
-        ByteCodeHelper.adjustStackUsage(new MethodInsnNode(Opcodes.INVOKESTATIC, "", "", "()I")));
-    assertEquals(
-        2,
-        ByteCodeHelper.adjustStackUsage(new MethodInsnNode(Opcodes.INVOKESTATIC, "", "", "()J")));
-    assertEquals(
-        -3,
-        ByteCodeHelper.adjustStackUsage(new MethodInsnNode(Opcodes.INVOKESTATIC, "", "", "(JJ)I")));
-    assertEquals(
-        -4,
-        ByteCodeHelper.adjustStackUsage(
-            new MethodInsnNode(Opcodes.INVOKESPECIAL, "", "", "(JJ)I")));
-    assertEquals(
-        -4,
-        ByteCodeHelper.adjustStackUsage(
-            new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "", "", "(JJ)I")));
-    assertEquals(
-        -4,
-        ByteCodeHelper.adjustStackUsage(
-            new MethodInsnNode(Opcodes.INVOKEINTERFACE, "", "", "(JJ)I")));
-  }
-
-  @Test
-  public void invokeDynamicInsn() {
-    assertEquals(
-        -1, ByteCodeHelper.adjustStackUsage(new InvokeDynamicInsnNode("apply", "(J)I", null)));
-  }
-
-  @Test
-  public void jumpInsn() {
-    assertEquals(-1, ByteCodeHelper.adjustStackUsage(new JumpInsnNode(Opcodes.IFEQ, null)));
-    assertEquals(-2, ByteCodeHelper.adjustStackUsage(new JumpInsnNode(Opcodes.IF_ICMPEQ, null)));
-    assertEquals(1, ByteCodeHelper.adjustStackUsage(new JumpInsnNode(Opcodes.JSR, null)));
-    assertEquals(0, ByteCodeHelper.adjustStackUsage(new JumpInsnNode(Opcodes.GOTO, null)));
-  }
-
-  @Test
-  public void ldcInsn() {
-    assertEquals(1, ByteCodeHelper.adjustStackUsage(new LdcInsnNode(1)));
-    assertEquals(2, ByteCodeHelper.adjustStackUsage(new LdcInsnNode(1L)));
-  }
-
-  @Test
-  public void iincInsn() {
-    assertEquals(0, ByteCodeHelper.adjustStackUsage(new IincInsnNode(1, 1)));
-  }
-
-  @Test
-  public void tableSwitchInsn() {
-    assertEquals(-1, ByteCodeHelper.adjustStackUsage(new TableSwitchInsnNode(1, 1, null)));
-  }
-
-  @Test
-  public void lookupSwitchInsn() {
-    assertEquals(-1, ByteCodeHelper.adjustStackUsage(new LookupSwitchInsnNode(null, null, null)));
-  }
-
-  @Test
-  public void multiANewArrayInsn() {
-    assertEquals(-2, ByteCodeHelper.adjustStackUsage(new MultiANewArrayInsnNode("", 3)));
-  }
+    @Test
+    public void insn() {
+        assertEquals(1, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.ACONST_NULL)));
+        assertEquals(2, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.LCONST_0)));
+        assertEquals(-1, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.IALOAD)));
+        assertEquals(-3, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.IASTORE)));
+        assertEquals(-4, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.LASTORE)));
+        assertEquals(-1, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.POP)));
+        assertEquals(-2, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.POP2)));
+        assertEquals(1, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.DUP)));
+        assertEquals(2, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.DUP2)));
+        assertEquals(0, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.INEG)));
+        assertEquals(-1, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.IADD)));
+        assertEquals(-2, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.LADD)));
+        assertEquals(1, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.I2L)));
+        assertEquals(-1, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.L2I)));
+        assertEquals(-3, ByteCodeHelper.adjustStackUsage(new InsnNode(Opcodes.LCMP)));
+    }
+
+    @Test
+    public void intInsn() {
+        assertEquals(1, ByteCodeHelper.adjustStackUsage(new IntInsnNode(Opcodes.BIPUSH, 0)));
+        assertEquals(0, ByteCodeHelper.adjustStackUsage(new IntInsnNode(Opcodes.NEWARRAY, 0)));
+    }
+
+    @Test
+    public void varInsn() {
+        assertEquals(1, ByteCodeHelper.adjustStackUsage(new VarInsnNode(Opcodes.ILOAD, 0)));
+        assertEquals(2, ByteCodeHelper.adjustStackUsage(new VarInsnNode(Opcodes.LLOAD, 0)));
+        assertEquals(-1, ByteCodeHelper.adjustStackUsage(new VarInsnNode(Opcodes.ISTORE, 0)));
+        assertEquals(-2, ByteCodeHelper.adjustStackUsage(new VarInsnNode(Opcodes.LSTORE, 0)));
+    }
+
+    @Test
+    public void typeInsn() {
+        assertEquals(1, ByteCodeHelper.adjustStackUsage(new TypeInsnNode(Opcodes.NEW, "")));
+        assertEquals(0, ByteCodeHelper.adjustStackUsage(new TypeInsnNode(Opcodes.ANEWARRAY, "")));
+        assertEquals(0, ByteCodeHelper.adjustStackUsage(new TypeInsnNode(Opcodes.CHECKCAST, "")));
+        assertEquals(0, ByteCodeHelper.adjustStackUsage(new TypeInsnNode(Opcodes.INSTANCEOF, "")));
+    }
+
+    @Test
+    public void fieldInsn() {
+        assertEquals(0, ByteCodeHelper.adjustStackUsage(new FieldInsnNode(Opcodes.GETFIELD, "", "", "I")));
+        assertEquals(1, ByteCodeHelper.adjustStackUsage(new FieldInsnNode(Opcodes.GETFIELD, "", "", "J")));
+        assertEquals(-2, ByteCodeHelper.adjustStackUsage(new FieldInsnNode(Opcodes.PUTFIELD, "", "", "I")));
+        assertEquals(-3, ByteCodeHelper.adjustStackUsage(new FieldInsnNode(Opcodes.PUTFIELD, "", "", "J")));
+        assertEquals(1, ByteCodeHelper.adjustStackUsage(new FieldInsnNode(Opcodes.GETSTATIC, "", "", "I")));
+        assertEquals(2, ByteCodeHelper.adjustStackUsage(new FieldInsnNode(Opcodes.GETSTATIC, "", "", "J")));
+        assertEquals(-1, ByteCodeHelper.adjustStackUsage(new FieldInsnNode(Opcodes.PUTSTATIC, "", "", "I")));
+        assertEquals(-2, ByteCodeHelper.adjustStackUsage(new FieldInsnNode(Opcodes.PUTSTATIC, "", "", "J")));
+    }
+
+    @Test
+    public void methodInsn() {
+        assertEquals(1, ByteCodeHelper.adjustStackUsage(new MethodInsnNode(Opcodes.INVOKESTATIC, "", "", "()I")));
+        assertEquals(2, ByteCodeHelper.adjustStackUsage(new MethodInsnNode(Opcodes.INVOKESTATIC, "", "", "()J")));
+        assertEquals(-3, ByteCodeHelper.adjustStackUsage(new MethodInsnNode(Opcodes.INVOKESTATIC, "", "", "(JJ)I")));
+        assertEquals(-4, ByteCodeHelper.adjustStackUsage(new MethodInsnNode(Opcodes.INVOKESPECIAL, "", "", "(JJ)I")));
+        assertEquals(-4, ByteCodeHelper.adjustStackUsage(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "", "", "(JJ)I")));
+        assertEquals(-4, ByteCodeHelper.adjustStackUsage(new MethodInsnNode(Opcodes.INVOKEINTERFACE, "", "", "(JJ)I")));
+    }
+
+    @Test
+    public void invokeDynamicInsn() {
+        assertEquals(-1, ByteCodeHelper.adjustStackUsage(new InvokeDynamicInsnNode("apply", "(J)I", null)));
+    }
+
+    @Test
+    public void jumpInsn() {
+        assertEquals(-1, ByteCodeHelper.adjustStackUsage(new JumpInsnNode(Opcodes.IFEQ, null)));
+        assertEquals(-2, ByteCodeHelper.adjustStackUsage(new JumpInsnNode(Opcodes.IF_ICMPEQ, null)));
+        assertEquals(1, ByteCodeHelper.adjustStackUsage(new JumpInsnNode(Opcodes.JSR, null)));
+        assertEquals(0, ByteCodeHelper.adjustStackUsage(new JumpInsnNode(Opcodes.GOTO, null)));
+    }
+
+    @Test
+    public void ldcInsn() {
+        assertEquals(1, ByteCodeHelper.adjustStackUsage(new LdcInsnNode(1)));
+        assertEquals(2, ByteCodeHelper.adjustStackUsage(new LdcInsnNode(1L)));
+    }
+
+    @Test
+    public void iincInsn() {
+        assertEquals(0, ByteCodeHelper.adjustStackUsage(new IincInsnNode(1, 1)));
+    }
+
+    @Test
+    public void tableSwitchInsn() {
+        assertEquals(-1, ByteCodeHelper.adjustStackUsage(new TableSwitchInsnNode(1, 1, null)));
+    }
+
+    @Test
+    public void lookupSwitchInsn() {
+        assertEquals(-1, ByteCodeHelper.adjustStackUsage(new LookupSwitchInsnNode(null, null, null)));
+    }
+
+    @Test
+    public void multiANewArrayInsn() {
+        assertEquals(-2, ByteCodeHelper.adjustStackUsage(new MultiANewArrayInsnNode("", 3)));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/instrumentation/TypesTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/instrumentation/TypesTest.java
index 28945e2fc78..50d56a53e14 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/instrumentation/TypesTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/instrumentation/TypesTest.java
@@ -30,142 +30,139 @@
 import org.objectweb.asm.Type;
 
 class TypesTest {
-  @ParameterizedTest
-  @ValueSource(classes = {int.class, byte.class, char.class, short.class, String.class})
-  void testFromClassName(Class<?> clazz) {
-    assertEquals(Type.getType(clazz), Types.fromClassName(clazz.getName()));
-
-    assertEquals(
-        Types.asArray(Type.getType(clazz), 1), Types.fromClassName(clazz.getName() + "[]"));
-  }
-
-  @ParameterizedTest
-  @ValueSource(classes = {int[].class, int[][].class, String[].class, String[][].class})
-  void testAsArray(Class<?> clazz) {
-    Type t = Type.getType(clazz);
-
-    assertEquals(t, Types.asArray(t.getElementType(), t.getDimensions()));
-  }
-
-  @Test
-  void testDescriptorFromSignatureWithArgs() {
-    String expectedDesc = "(I[JLjava/util/Map;[[Ljava/lang/String;)Ljava/lang/String;";
-    String signature = "java.lang.String (int, long[], java.util.Map, java.lang.String[][])";
-    String desc = Types.descriptorFromSignature(signature);
-    assertEquals(expectedDesc, desc);
-  }
-
-  @Test
-  void testDescriptorFromSignatureNoArgs() {
-    String expectedDesc = "()Ljava/lang/String;";
-    String signature = "java.lang.String ()";
-    String desc = Types.descriptorFromSignature(signature);
-    assertEquals(expectedDesc, desc);
-  }
-
-  @Test
-  void testDescriptorFromSignatureNoArgsVoid() {
-    String expectedDesc = "()V";
-    String signature = "void   ( )";
-    String desc = Types.descriptorFromSignature(signature);
-    assertEquals(expectedDesc, desc);
-  }
-
-  @Test
-  void testDescriptorFromSignatureInnerClassArgs() {
-    String expectedDesc = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;)V";
-    String signature = "void(java.util.Map$Entry, java.util.Map$Entry)";
-    String desc = Types.descriptorFromSignature(signature);
-    assertEquals(expectedDesc, desc);
-  }
-
-  @Test
-  void testDescriptorFromSignatureInvalid() {
-    assertThrows(IllegalArgumentException.class, () -> Types.descriptorFromSignature("()"));
-    assertThrows(IllegalArgumentException.class, () -> Types.descriptorFromSignature("int"));
-    assertThrows(IllegalArgumentException.class, () -> Types.descriptorFromSignature("int ("));
-    assertThrows(IllegalArgumentException.class, () -> Types.descriptorFromSignature("int ("));
-    assertThrows(IllegalArgumentException.class, () -> Types.descriptorFromSignature("int (, )"));
-    assertThrows(
-        IllegalArgumentException.class, () -> Types.descriptorFromSignature("int (a, ,b)"));
-  }
-
-  @Test
-  void descriptorToSignature() {
-    String desc = "(I[JLjava/util/Map;Ljava/util/Map$Entry;[[Ljava/lang/String;)Ljava/lang/String;";
-    String expectedSignature =
-        "(int, long[], java.util.Map, java.util.Map$Entry, java.lang.String[][])";
-    String signature = Types.descriptorToSignature(desc);
-    assertEquals(expectedSignature, signature);
-  }
-
-  @ParameterizedTest
-  @MethodSource("provideGetArrayType")
-  void testGetArrayType(Class<?> clazz, int opcode) {
-    Assertions.assertEquals(Type.getType(clazz), Types.getArrayType(opcode));
-  }
-
-  private static Stream<Arguments> provideGetArrayType() {
-    return Stream.of(
-        Arguments.of(int[].class, IALOAD),
-        Arguments.of(int[].class, IASTORE),
-        Arguments.of(byte[].class, BALOAD),
-        Arguments.of(byte[].class, BASTORE),
-        Arguments.of(Object[].class, AALOAD),
-        Arguments.of(Object[].class, AASTORE),
-        Arguments.of(char[].class, CALOAD),
-        Arguments.of(char[].class, CASTORE),
-        Arguments.of(float[].class, FALOAD),
-        Arguments.of(float[].class, FASTORE),
-        Arguments.of(short[].class, SALOAD),
-        Arguments.of(short[].class, SASTORE),
-        Arguments.of(long[].class, LALOAD),
-        Arguments.of(long[].class, LASTORE),
-        Arguments.of(double[].class, DALOAD),
-        Arguments.of(double[].class, DASTORE));
-  }
-
-  @ParameterizedTest
-  @MethodSource("provideGetElementType")
-  void testGetElementType(Class<?> clazz, int opcode) {
-    Assertions.assertEquals(Type.getType(clazz), Types.getElementType(opcode));
-  }
-
-  private static Stream<Arguments> provideGetElementType() {
-    return Stream.of(
-        Arguments.of(int.class, IALOAD),
-        Arguments.of(int.class, IASTORE),
-        Arguments.of(byte.class, BALOAD),
-        Arguments.of(byte.class, BASTORE),
-        Arguments.of(Object.class, AALOAD),
-        Arguments.of(Object.class, AASTORE),
-        Arguments.of(char.class, CALOAD),
-        Arguments.of(char.class, CASTORE),
-        Arguments.of(float.class, FALOAD),
-        Arguments.of(float.class, FASTORE),
-        Arguments.of(short.class, SALOAD),
-        Arguments.of(short.class, SASTORE),
-        Arguments.of(long.class, LALOAD),
-        Arguments.of(long.class, LASTORE),
-        Arguments.of(double.class, DALOAD),
-        Arguments.of(double.class, DASTORE));
-  }
-
-  @ParameterizedTest
-  @MethodSource("provideGetFrameItemType")
-  void testGetFrameItemType(Class<?> clazz, Object opcode) {
-    Assertions.assertEquals(Type.getType(clazz), Types.getFrameItemType(opcode));
-  }
-
-  private static Stream<Arguments> provideGetFrameItemType() {
-    return Stream.of(
-        Arguments.of(int.class, Opcodes.T_INT),
-        Arguments.of(byte.class, Opcodes.T_BYTE),
-        Arguments.of(char.class, Opcodes.T_CHAR),
-        Arguments.of(float.class, Opcodes.T_FLOAT),
-        Arguments.of(short.class, Opcodes.T_SHORT),
-        Arguments.of(long.class, Opcodes.T_LONG),
-        Arguments.of(double.class, Opcodes.T_DOUBLE),
-        Arguments.of(String.class, "Ljava/lang/String;"));
-  }
+    @ParameterizedTest
+    @ValueSource(classes = {int.class, byte.class, char.class, short.class, String.class})
+    void testFromClassName(Class<?> clazz) {
+        assertEquals(Type.getType(clazz), Types.fromClassName(clazz.getName()));
+
+        assertEquals(Types.asArray(Type.getType(clazz), 1), Types.fromClassName(clazz.getName() + "[]"));
+    }
+
+    @ParameterizedTest
+    @ValueSource(classes = {int[].class, int[][].class, String[].class, String[][].class})
+    void testAsArray(Class<?> clazz) {
+        Type t = Type.getType(clazz);
+
+        assertEquals(t, Types.asArray(t.getElementType(), t.getDimensions()));
+    }
+
+    @Test
+    void testDescriptorFromSignatureWithArgs() {
+        String expectedDesc = "(I[JLjava/util/Map;[[Ljava/lang/String;)Ljava/lang/String;";
+        String signature = "java.lang.String (int, long[], java.util.Map, java.lang.String[][])";
+        String desc = Types.descriptorFromSignature(signature);
+        assertEquals(expectedDesc, desc);
+    }
+
+    @Test
+    void testDescriptorFromSignatureNoArgs() {
+        String expectedDesc = "()Ljava/lang/String;";
+        String signature = "java.lang.String ()";
+        String desc = Types.descriptorFromSignature(signature);
+        assertEquals(expectedDesc, desc);
+    }
+
+    @Test
+    void testDescriptorFromSignatureNoArgsVoid() {
+        String expectedDesc = "()V";
+        String signature = "void   ( )";
+        String desc = Types.descriptorFromSignature(signature);
+        assertEquals(expectedDesc, desc);
+    }
+
+    @Test
+    void testDescriptorFromSignatureInnerClassArgs() {
+        String expectedDesc = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;)V";
+        String signature = "void(java.util.Map$Entry, java.util.Map$Entry)";
+        String desc = Types.descriptorFromSignature(signature);
+        assertEquals(expectedDesc, desc);
+    }
+
+    @Test
+    void testDescriptorFromSignatureInvalid() {
+        assertThrows(IllegalArgumentException.class, () -> Types.descriptorFromSignature("()"));
+        assertThrows(IllegalArgumentException.class, () -> Types.descriptorFromSignature("int"));
+        assertThrows(IllegalArgumentException.class, () -> Types.descriptorFromSignature("int ("));
+        assertThrows(IllegalArgumentException.class, () -> Types.descriptorFromSignature("int ("));
+        assertThrows(IllegalArgumentException.class, () -> Types.descriptorFromSignature("int (, )"));
+        assertThrows(IllegalArgumentException.class, () -> Types.descriptorFromSignature("int (a, ,b)"));
+    }
+
+    @Test
+    void descriptorToSignature() {
+        String desc = "(I[JLjava/util/Map;Ljava/util/Map$Entry;[[Ljava/lang/String;)Ljava/lang/String;";
+        String expectedSignature = "(int, long[], java.util.Map, java.util.Map$Entry, java.lang.String[][])";
+        String signature = Types.descriptorToSignature(desc);
+        assertEquals(expectedSignature, signature);
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideGetArrayType")
+    void testGetArrayType(Class<?> clazz, int opcode) {
+        Assertions.assertEquals(Type.getType(clazz), Types.getArrayType(opcode));
+    }
+
+    private static Stream<Arguments> provideGetArrayType() {
+        return Stream.of(
+                Arguments.of(int[].class, IALOAD),
+                Arguments.of(int[].class, IASTORE),
+                Arguments.of(byte[].class, BALOAD),
+                Arguments.of(byte[].class, BASTORE),
+                Arguments.of(Object[].class, AALOAD),
+                Arguments.of(Object[].class, AASTORE),
+                Arguments.of(char[].class, CALOAD),
+                Arguments.of(char[].class, CASTORE),
+                Arguments.of(float[].class, FALOAD),
+                Arguments.of(float[].class, FASTORE),
+                Arguments.of(short[].class, SALOAD),
+                Arguments.of(short[].class, SASTORE),
+                Arguments.of(long[].class, LALOAD),
+                Arguments.of(long[].class, LASTORE),
+                Arguments.of(double[].class, DALOAD),
+                Arguments.of(double[].class, DASTORE));
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideGetElementType")
+    void testGetElementType(Class<?> clazz, int opcode) {
+        Assertions.assertEquals(Type.getType(clazz), Types.getElementType(opcode));
+    }
+
+    private static Stream<Arguments> provideGetElementType() {
+        return Stream.of(
+                Arguments.of(int.class, IALOAD),
+                Arguments.of(int.class, IASTORE),
+                Arguments.of(byte.class, BALOAD),
+                Arguments.of(byte.class, BASTORE),
+                Arguments.of(Object.class, AALOAD),
+                Arguments.of(Object.class, AASTORE),
+                Arguments.of(char.class, CALOAD),
+                Arguments.of(char.class, CASTORE),
+                Arguments.of(float.class, FALOAD),
+                Arguments.of(float.class, FASTORE),
+                Arguments.of(short.class, SALOAD),
+                Arguments.of(short.class, SASTORE),
+                Arguments.of(long.class, LALOAD),
+                Arguments.of(long.class, LASTORE),
+                Arguments.of(double.class, DALOAD),
+                Arguments.of(double.class, DASTORE));
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideGetFrameItemType")
+    void testGetFrameItemType(Class<?> clazz, Object opcode) {
+        Assertions.assertEquals(Type.getType(clazz), Types.getFrameItemType(opcode));
+    }
+
+    private static Stream<Arguments> provideGetFrameItemType() {
+        return Stream.of(
+                Arguments.of(int.class, Opcodes.T_INT),
+                Arguments.of(byte.class, Opcodes.T_BYTE),
+                Arguments.of(char.class, Opcodes.T_CHAR),
+                Arguments.of(float.class, Opcodes.T_FLOAT),
+                Arguments.of(short.class, Opcodes.T_SHORT),
+                Arguments.of(long.class, Opcodes.T_LONG),
+                Arguments.of(double.class, Opcodes.T_DOUBLE),
+                Arguments.of(String.class, "Ljava/lang/String;"));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginConfigTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginConfigTest.java
index 52459ca2120..36da75a9939 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginConfigTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginConfigTest.java
@@ -12,38 +12,38 @@
 
 public class CodeOriginConfigTest {
 
-  @EnabledForJreRange(min = JRE.JAVA_25)
-  @Test
-  public void defaultConfigJDK25() {
-    assertTrue(Config.get().isDebuggerCodeOriginEnabled());
-    assertTrue(InstrumenterConfig.get().isCodeOriginEnabled());
-  }
-
-  @EnabledOnJre(JRE.JAVA_21)
-  @Test
-  public void defaultConfigJDK21() {
-    assertTrue(Config.get().isDebuggerCodeOriginEnabled());
-    assertTrue(InstrumenterConfig.get().isCodeOriginEnabled());
-  }
-
-  @EnabledOnJre(JRE.JAVA_17)
-  @Test
-  public void defaultConfigJDK17() {
-    assertFalse(Config.get().isDebuggerCodeOriginEnabled());
-    assertFalse(InstrumenterConfig.get().isCodeOriginEnabled());
-  }
-
-  @EnabledOnJre(JRE.JAVA_11)
-  @Test
-  public void defaultConfigJDK11() {
-    assertFalse(Config.get().isDebuggerCodeOriginEnabled());
-    assertFalse(InstrumenterConfig.get().isCodeOriginEnabled());
-  }
-
-  @EnabledOnJre(JRE.JAVA_8)
-  @Test
-  public void defaultConfigJDK8() {
-    assertFalse(Config.get().isDebuggerCodeOriginEnabled());
-    assertFalse(InstrumenterConfig.get().isCodeOriginEnabled());
-  }
+    @EnabledForJreRange(min = JRE.JAVA_25)
+    @Test
+    public void defaultConfigJDK25() {
+        assertTrue(Config.get().isDebuggerCodeOriginEnabled());
+        assertTrue(InstrumenterConfig.get().isCodeOriginEnabled());
+    }
+
+    @EnabledOnJre(JRE.JAVA_21)
+    @Test
+    public void defaultConfigJDK21() {
+        assertTrue(Config.get().isDebuggerCodeOriginEnabled());
+        assertTrue(InstrumenterConfig.get().isCodeOriginEnabled());
+    }
+
+    @EnabledOnJre(JRE.JAVA_17)
+    @Test
+    public void defaultConfigJDK17() {
+        assertFalse(Config.get().isDebuggerCodeOriginEnabled());
+        assertFalse(InstrumenterConfig.get().isCodeOriginEnabled());
+    }
+
+    @EnabledOnJre(JRE.JAVA_11)
+    @Test
+    public void defaultConfigJDK11() {
+        assertFalse(Config.get().isDebuggerCodeOriginEnabled());
+        assertFalse(InstrumenterConfig.get().isCodeOriginEnabled());
+    }
+
+    @EnabledOnJre(JRE.JAVA_8)
+    @Test
+    public void defaultConfigJDK8() {
+        assertFalse(Config.get().isDebuggerCodeOriginEnabled());
+        assertFalse(InstrumenterConfig.get().isCodeOriginEnabled());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTest.java
index 65bbd72ae9d..4b1bcfcd8db 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTest.java
@@ -61,292 +61,273 @@
 
 public class CodeOriginTest extends CapturingTestBase {
 
-  private static final ProbeId CODE_ORIGIN_ID1 = new ProbeId("code origin 1", 0);
-
-  private static final ProbeId CODE_ORIGIN_ID2 = new ProbeId("code origin 2", 0);
-
-  private static final ProbeId CODE_ORIGIN_DOUBLE_ENTRY_ID =
-      new ProbeId("double entry code origin", 0);
-
-  private static final int MAX_FRAMES = 20;
-
-  private DefaultCodeOriginRecorder codeOriginRecorder;
-
-  private TestSnapshotListener listener;
-
-  private TestTraceInterceptor traceInterceptor;
-
-  public static ClassNameFilter classNameFilter =
-      new ClassNameFiltering(
-          new HashSet<>(
-              asList(
-                  "sun",
-                  "org.junit",
-                  "java.",
-                  "org.gradle",
-                  "com.sun",
-                  "worker.org.gradle",
-                  "datadog",
-                  "com.datadog.debugger.probe",
-                  "com.datadog.debugger.codeorigin")));
-
-  @Override
-  @BeforeEach
-  public void before() {
-    super.before();
-    traceInterceptor = new TestTraceInterceptor();
-
-    CoreTracer tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-    tracer.addTraceInterceptor(traceInterceptor);
-
-    setFieldInConfig(Config.get(), "debuggerCodeOriginEnabled", true);
-    setFieldInConfig(Config.get(), "distributedDebuggerEnabled", true);
-    setFieldInConfig(Config.get(), "dynamicInstrumentationClassFileDumpEnabled", true);
-    setFieldInConfig(InstrumenterConfig.get(), "codeOriginEnabled", true);
-
-    new AgentBuilder.Default()
-        .with(RedefinitionStrategy.RETRANSFORMATION)
-        .with(InitializationStrategy.NoOp.INSTANCE)
-        .with(TypeStrategy.Default.REDEFINE)
-        .type(nameStartsWith("com.datadog.debugger."))
-        .transform(
-            (builder, typeDescription, classLoader, module, protectionDomain) ->
-                builder.visit(
-                    Advice.to(CodeOriginTestAdvice.class)
-                        .on(new Conjunction<>(isMethod(), isAnnotatedWith(CodeOrigin.class)))))
-    //        .installOn(instr)
-    ;
-  }
-
-  @Test
-  public void basicInstrumentation() throws Exception {
-    final String className = "com.datadog.debugger.CodeOrigin01";
-
-    installProbes(codeOriginProbes(className));
-    final Class<?> testClass = compileAndLoadClass(className);
-    checkResults(testClass, "fullTrace", 0);
-  }
-
-  @Test
-  public void withDebug1() throws Exception {
-    final String className = "com.datadog.debugger.CodeOrigin02";
-    installProbes();
-    final Class<?> testClass = compileAndLoadClass(className);
-    codeOriginRecorder.captureCodeOrigin(className, "entry", "()", true);
-    codeOriginRecorder.captureCodeOrigin(className, "exit", "()", false);
-    checkResults(testClass, "fullTrace", 0);
-    checkResults(testClass, "debug_1", 2);
-  }
-
-  @Test
-  public void withLogProbe() throws Exception {
-    final String CLASS_NAME = "com.datadog.debugger.CodeOrigin03";
-    installProbes(
-        createProbeBuilder(PROBE_ID, CLASS_NAME, "entry", "()").captureSnapshot(true).build());
-    final Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    codeOriginRecorder.captureCodeOrigin(CLASS_NAME, "entry", "()", true);
-    codeOriginRecorder.captureCodeOrigin(CLASS_NAME, "exit", "()", false);
-    checkResults(testClass, "debug_1", 3);
-  }
-
-  @Test
-  public void doubleEntry() throws IOException, URISyntaxException {
-    final String className = "com.datadog.debugger.CodeOrigin05";
-
-    installProbes(
-        new CodeOriginProbe(
-            CODE_ORIGIN_ID1,
-            true,
-            Where.of(
-                className, "entry", "()", "" + getLineForLineProbe(className, CODE_ORIGIN_ID1))),
-        new CodeOriginProbe(
-            CODE_ORIGIN_ID2,
-            false,
-            Where.of(
-                className, "exit", "()", "" + getLineForLineProbe(className, CODE_ORIGIN_ID2))),
-        new CodeOriginProbe(
-            CODE_ORIGIN_DOUBLE_ENTRY_ID,
-            true,
-            Where.of(
-                className,
-                "doubleEntry",
-                "()",
-                "" + getLineForLineProbe(className, CODE_ORIGIN_DOUBLE_ENTRY_ID))));
-    final Class<?> testClass = compileAndLoadClass(className);
-    checkResults(testClass, "fullTrace", 0);
-    List<? extends MutableSpan> trace = traceInterceptor.getTrace();
-    MutableSpan span = trace.get(0);
-    // this should be entry but until we get the ordering resolved, it's this.
-    assertEquals("entry", span.getTag(DD_CODE_ORIGIN_FRAME_METHOD));
-  }
-
-  @Test
-  public void stackDepth() throws IOException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.CodeOrigin04";
-    installProbes(
-        new CodeOriginProbe(CODE_ORIGIN_ID1, true, Where.of(CLASS_NAME, "exit", "()", "39")));
-
-    Class<?> testClass = compileAndLoadClass("com.datadog.debugger.CodeOrigin04");
-    countFrames(testClass, 10);
-    countFrames(testClass, 100);
-  }
-
-  private void countFrames(Class<?> testClass, int loops) {
-    int result = Reflect.onClass(testClass).call("main", loops).get();
-    assertEquals(loops, result);
-    long count =
-        traceInterceptor.getTrace().stream()
-            .filter(s -> s.getOperationName().equals("exit"))
-            .flatMap(s -> s.getTags().keySet().stream())
-            .filter(key -> key.contains("frames") && key.endsWith("method"))
-            .count();
-    assertTrue(count <= MAX_FRAMES);
-  }
-
-  @Test
-  public void testCaptureCodeOriginEntry() {
-    installProbes();
-    CodeOriginProbe probe = codeOriginRecorder.getProbe(codeOriginRecorder.captureCodeOrigin(true));
-    assertNotNull(probe);
-    assertTrue(probe.entrySpanProbe());
-  }
-
-  @Test
-  @Disabled("Exit spans are disabled for now")
-  public void testCaptureCodeOriginExit() {
-    installProbes();
-    CodeOriginProbe probe =
-        codeOriginRecorder.getProbe(codeOriginRecorder.captureCodeOrigin(false));
-    assertNotNull(probe);
-    assertFalse(probe.entrySpanProbe());
-  }
-
-  @Test
-  public void testCaptureCodeOriginWithExplicitInfo()
-      throws IOException, URISyntaxException, NoSuchMethodException {
-    final String CLASS_NAME = "com.datadog.debugger.CodeOrigin04";
-    final Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    installProbes();
-    CodeOriginProbe probe =
-        codeOriginRecorder.getProbe(
-            codeOriginRecorder.captureCodeOrigin(CLASS_NAME, "main", "(I)", true));
-    assertNotNull(probe, "The probe should have been created.");
-    assertTrue(probe.entrySpanProbe(), "Should be an entry probe.");
-  }
-
-  @Test
-  public void testDuplicateInstrumentations()
-      throws IOException, URISyntaxException, NoSuchMethodException {
-    final String CLASS_NAME = "com.datadog.debugger.CodeOrigin04";
-    final Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    installProbes();
-    String probe1 = codeOriginRecorder.captureCodeOrigin(CLASS_NAME, "main", "(I)", true);
-    String probe2 = codeOriginRecorder.captureCodeOrigin(CLASS_NAME, "main", "(I)", true);
-    assertEquals(probe1, probe2);
-  }
-
-  @Nonnull
-  private static CodeOriginProbe[] codeOriginProbes(String type) {
-    CodeOriginProbe entry =
-        new CodeOriginProbe(CODE_ORIGIN_ID1, true, Where.of(type, "entry", "()", "53"));
-
-    int line = getLineForLineProbe(type, CODE_ORIGIN_ID2);
-    CodeOriginProbe exit =
-        new CodeOriginProbe(CODE_ORIGIN_ID2, false, Where.of(type, "exit", "()", "" + line));
-    return new CodeOriginProbe[] {entry, exit};
-  }
-
-  private void checkResults(Class<?> testClass, String parameter, int snapshotsExpected) {
-    int result = Reflect.onClass(testClass).call("main", parameter).get();
-    assertEquals(0, result);
-    List<DDSpan> spans = (List<DDSpan>) traceInterceptor.getTrace();
-    assertEquals(3, spans.size());
-    assertEquals("main", spans.get(2).getLocalRootSpan().getOperationName());
-
-    List<DDSpan> list =
-        spans.stream()
-            .filter(span -> !span.getOperationName().equals("exit"))
-            .collect(Collectors.toList());
-
-    for (DDSpan span : list) {
-      checkCodeOriginTags(span, snapshotsExpected != 0);
+    private static final ProbeId CODE_ORIGIN_ID1 = new ProbeId("code origin 1", 0);
+
+    private static final ProbeId CODE_ORIGIN_ID2 = new ProbeId("code origin 2", 0);
+
+    private static final ProbeId CODE_ORIGIN_DOUBLE_ENTRY_ID = new ProbeId("double entry code origin", 0);
+
+    private static final int MAX_FRAMES = 20;
+
+    private DefaultCodeOriginRecorder codeOriginRecorder;
+
+    private TestSnapshotListener listener;
+
+    private TestTraceInterceptor traceInterceptor;
+
+    public static ClassNameFilter classNameFilter = new ClassNameFiltering(new HashSet<>(asList(
+            "sun",
+            "org.junit",
+            "java.",
+            "org.gradle",
+            "com.sun",
+            "worker.org.gradle",
+            "datadog",
+            "com.datadog.debugger.probe",
+            "com.datadog.debugger.codeorigin")));
+
+    @Override
+    @BeforeEach
+    public void before() {
+        super.before();
+        traceInterceptor = new TestTraceInterceptor();
+
+        CoreTracer tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+        tracer.addTraceInterceptor(traceInterceptor);
+
+        setFieldInConfig(Config.get(), "debuggerCodeOriginEnabled", true);
+        setFieldInConfig(Config.get(), "distributedDebuggerEnabled", true);
+        setFieldInConfig(Config.get(), "dynamicInstrumentationClassFileDumpEnabled", true);
+        setFieldInConfig(InstrumenterConfig.get(), "codeOriginEnabled", true);
+
+        new AgentBuilder.Default()
+                .with(RedefinitionStrategy.RETRANSFORMATION)
+                .with(InitializationStrategy.NoOp.INSTANCE)
+                .with(TypeStrategy.Default.REDEFINE)
+                .type(nameStartsWith("com.datadog.debugger."))
+                .transform((builder, typeDescription, classLoader, module, protectionDomain) ->
+                        builder.visit(Advice.to(CodeOriginTestAdvice.class)
+                                .on(new Conjunction<>(isMethod(), isAnnotatedWith(CodeOrigin.class)))))
+        //        .installOn(instr)
+        ;
     }
 
-    assertEquals(
-        snapshotsExpected,
-        listener.snapshots.stream()
-            .filter(s -> s.getCaptures().getEntry() != null && s.getCaptures().getReturn() != null)
-            .collect(Collectors.toList())
-            .size());
-
-    Optional<DDSpan> exit =
-        spans.stream().filter(span -> span.getOperationName().equals("exit")).findFirst();
-    assertTrue(exit.isPresent());
-    exit.ifPresent(span -> checkExitSpanTags(span, false));
-  }
-
-  @Override
-  protected TestSnapshotListener installProbes(ProbeDefinition... probes) {
-    listener = super.installProbes(probes);
-
-    DebuggerContext.initClassNameFilter(classNameFilter);
-    codeOriginRecorder =
-        new DefaultCodeOriginRecorder(
-            config,
-            configurationUpdater,
-            new AgentTaskScheduler(TASK_SCHEDULER) {
-              @Override
-              public void execute(Runnable target) {
-                target.run();
-              }
-            });
-    DebuggerContext.initCodeOrigin(codeOriginRecorder);
-
-    return listener;
-  }
-
-  private static void checkCodeOriginTags(DDSpan span, boolean includeSnapshot) {
-    for (String tag : DDTags.REQUIRED_CODE_ORIGIN_TAGS) {
-      assertKeyPresent(span, tag);
+    @Test
+    public void basicInstrumentation() throws Exception {
+        final String className = "com.datadog.debugger.CodeOrigin01";
+
+        installProbes(codeOriginProbes(className));
+        final Class<?> testClass = compileAndLoadClass(className);
+        checkResults(testClass, "fullTrace", 0);
+    }
+
+    @Test
+    public void withDebug1() throws Exception {
+        final String className = "com.datadog.debugger.CodeOrigin02";
+        installProbes();
+        final Class<?> testClass = compileAndLoadClass(className);
+        codeOriginRecorder.captureCodeOrigin(className, "entry", "()", true);
+        codeOriginRecorder.captureCodeOrigin(className, "exit", "()", false);
+        checkResults(testClass, "fullTrace", 0);
+        checkResults(testClass, "debug_1", 2);
+    }
+
+    @Test
+    public void withLogProbe() throws Exception {
+        final String CLASS_NAME = "com.datadog.debugger.CodeOrigin03";
+        installProbes(createProbeBuilder(PROBE_ID, CLASS_NAME, "entry", "()")
+                .captureSnapshot(true)
+                .build());
+        final Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        codeOriginRecorder.captureCodeOrigin(CLASS_NAME, "entry", "()", true);
+        codeOriginRecorder.captureCodeOrigin(CLASS_NAME, "exit", "()", false);
+        checkResults(testClass, "debug_1", 3);
+    }
+
+    @Test
+    public void doubleEntry() throws IOException, URISyntaxException {
+        final String className = "com.datadog.debugger.CodeOrigin05";
+
+        installProbes(
+                new CodeOriginProbe(
+                        CODE_ORIGIN_ID1,
+                        true,
+                        Where.of(className, "entry", "()", "" + getLineForLineProbe(className, CODE_ORIGIN_ID1))),
+                new CodeOriginProbe(
+                        CODE_ORIGIN_ID2,
+                        false,
+                        Where.of(className, "exit", "()", "" + getLineForLineProbe(className, CODE_ORIGIN_ID2))),
+                new CodeOriginProbe(
+                        CODE_ORIGIN_DOUBLE_ENTRY_ID,
+                        true,
+                        Where.of(
+                                className,
+                                "doubleEntry",
+                                "()",
+                                "" + getLineForLineProbe(className, CODE_ORIGIN_DOUBLE_ENTRY_ID))));
+        final Class<?> testClass = compileAndLoadClass(className);
+        checkResults(testClass, "fullTrace", 0);
+        List<? extends MutableSpan> trace = traceInterceptor.getTrace();
+        MutableSpan span = trace.get(0);
+        // this should be entry but until we get the ordering resolved, it's this.
+        assertEquals("entry", span.getTag(DD_CODE_ORIGIN_FRAME_METHOD));
+    }
+
+    @Test
+    public void stackDepth() throws IOException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.CodeOrigin04";
+        installProbes(new CodeOriginProbe(CODE_ORIGIN_ID1, true, Where.of(CLASS_NAME, "exit", "()", "39")));
+
+        Class<?> testClass = compileAndLoadClass("com.datadog.debugger.CodeOrigin04");
+        countFrames(testClass, 10);
+        countFrames(testClass, 100);
+    }
+
+    private void countFrames(Class<?> testClass, int loops) {
+        int result = Reflect.onClass(testClass).call("main", loops).get();
+        assertEquals(loops, result);
+        long count = traceInterceptor.getTrace().stream()
+                .filter(s -> s.getOperationName().equals("exit"))
+                .flatMap(s -> s.getTags().keySet().stream())
+                .filter(key -> key.contains("frames") && key.endsWith("method"))
+                .count();
+        assertTrue(count <= MAX_FRAMES);
+    }
+
+    @Test
+    public void testCaptureCodeOriginEntry() {
+        installProbes();
+        CodeOriginProbe probe = codeOriginRecorder.getProbe(codeOriginRecorder.captureCodeOrigin(true));
+        assertNotNull(probe);
+        assertTrue(probe.entrySpanProbe());
+    }
+
+    @Test
+    @Disabled("Exit spans are disabled for now")
+    public void testCaptureCodeOriginExit() {
+        installProbes();
+        CodeOriginProbe probe = codeOriginRecorder.getProbe(codeOriginRecorder.captureCodeOrigin(false));
+        assertNotNull(probe);
+        assertFalse(probe.entrySpanProbe());
     }
-    assertNotEquals(-1, span.getTag(DD_CODE_ORIGIN_FRAME_LINE));
 
-    if (includeSnapshot) {
-      assertKeyPresent(span, DD_CODE_ORIGIN_FRAME_SNAPSHOT_ID);
-    } else {
-      assertKeyNotPresent(span, DD_CODE_ORIGIN_FRAME_SNAPSHOT_ID);
+    @Test
+    public void testCaptureCodeOriginWithExplicitInfo() throws IOException, URISyntaxException, NoSuchMethodException {
+        final String CLASS_NAME = "com.datadog.debugger.CodeOrigin04";
+        final Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        installProbes();
+        CodeOriginProbe probe =
+                codeOriginRecorder.getProbe(codeOriginRecorder.captureCodeOrigin(CLASS_NAME, "main", "(I)", true));
+        assertNotNull(probe, "The probe should have been created.");
+        assertTrue(probe.entrySpanProbe(), "Should be an entry probe.");
     }
-  }
-
-  private static void assertKeyPresent(DDSpan span, String key) {
-    assertNotNull(
-        span.getTag(key),
-        format(
-            "'%s' key missing in '%s' span. current keys:  %s",
-            key, span.getOperationName(), ldKeys(span)));
-  }
-
-  private static void assertKeyNotPresent(MutableSpan span, String key) {
-    assertNull(
-        span.getTag(key),
-        format("'%s' key found in '%s' span when it shouldn't be.", key, span.getOperationName()));
-  }
-
-  private static void checkExitSpanTags(DDSpan span, boolean includeSnapshot) {
-    for (String tag : DDTags.REQUIRED_CODE_ORIGIN_TAGS) {
-      assertKeyPresent(span, tag);
+
+    @Test
+    public void testDuplicateInstrumentations() throws IOException, URISyntaxException, NoSuchMethodException {
+        final String CLASS_NAME = "com.datadog.debugger.CodeOrigin04";
+        final Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        installProbes();
+        String probe1 = codeOriginRecorder.captureCodeOrigin(CLASS_NAME, "main", "(I)", true);
+        String probe2 = codeOriginRecorder.captureCodeOrigin(CLASS_NAME, "main", "(I)", true);
+        assertEquals(probe1, probe2);
+    }
+
+    @Nonnull
+    private static CodeOriginProbe[] codeOriginProbes(String type) {
+        CodeOriginProbe entry = new CodeOriginProbe(CODE_ORIGIN_ID1, true, Where.of(type, "entry", "()", "53"));
+
+        int line = getLineForLineProbe(type, CODE_ORIGIN_ID2);
+        CodeOriginProbe exit = new CodeOriginProbe(CODE_ORIGIN_ID2, false, Where.of(type, "exit", "()", "" + line));
+        return new CodeOriginProbe[] {entry, exit};
+    }
+
+    private void checkResults(Class<?> testClass, String parameter, int snapshotsExpected) {
+        int result = Reflect.onClass(testClass).call("main", parameter).get();
+        assertEquals(0, result);
+        List<DDSpan> spans = (List<DDSpan>) traceInterceptor.getTrace();
+        assertEquals(3, spans.size());
+        assertEquals("main", spans.get(2).getLocalRootSpan().getOperationName());
+
+        List<DDSpan> list = spans.stream()
+                .filter(span -> !span.getOperationName().equals("exit"))
+                .collect(Collectors.toList());
+
+        for (DDSpan span : list) {
+            checkCodeOriginTags(span, snapshotsExpected != 0);
+        }
+
+        assertEquals(
+                snapshotsExpected,
+                listener.snapshots.stream()
+                        .filter(s -> s.getCaptures().getEntry() != null
+                                && s.getCaptures().getReturn() != null)
+                        .collect(Collectors.toList())
+                        .size());
+
+        Optional<DDSpan> exit = spans.stream()
+                .filter(span -> span.getOperationName().equals("exit"))
+                .findFirst();
+        assertTrue(exit.isPresent());
+        exit.ifPresent(span -> checkExitSpanTags(span, false));
+    }
+
+    @Override
+    protected TestSnapshotListener installProbes(ProbeDefinition... probes) {
+        listener = super.installProbes(probes);
+
+        DebuggerContext.initClassNameFilter(classNameFilter);
+        codeOriginRecorder =
+                new DefaultCodeOriginRecorder(config, configurationUpdater, new AgentTaskScheduler(TASK_SCHEDULER) {
+                    @Override
+                    public void execute(Runnable target) {
+                        target.run();
+                    }
+                });
+        DebuggerContext.initCodeOrigin(codeOriginRecorder);
+
+        return listener;
     }
-    assertNotEquals(-1, span.getTag(DD_CODE_ORIGIN_FRAME_LINE));
 
-    if (includeSnapshot) {
-      assertKeyPresent(span, DD_CODE_ORIGIN_FRAME_SNAPSHOT_ID);
+    private static void checkCodeOriginTags(DDSpan span, boolean includeSnapshot) {
+        for (String tag : DDTags.REQUIRED_CODE_ORIGIN_TAGS) {
+            assertKeyPresent(span, tag);
+        }
+        assertNotEquals(-1, span.getTag(DD_CODE_ORIGIN_FRAME_LINE));
+
+        if (includeSnapshot) {
+            assertKeyPresent(span, DD_CODE_ORIGIN_FRAME_SNAPSHOT_ID);
+        } else {
+            assertKeyNotPresent(span, DD_CODE_ORIGIN_FRAME_SNAPSHOT_ID);
+        }
     }
-  }
 
-  private static Set<String> ldKeys(MutableSpan span) {
-    return span.getTags().keySet().stream()
-        .filter(key -> key.startsWith(DD_CODE_ORIGIN_PREFIX))
-        .collect(Collectors.toCollection(TreeSet::new));
-  }
+    private static void assertKeyPresent(DDSpan span, String key) {
+        assertNotNull(
+                span.getTag(key),
+                format("'%s' key missing in '%s' span. current keys:  %s", key, span.getOperationName(), ldKeys(span)));
+    }
+
+    private static void assertKeyNotPresent(MutableSpan span, String key) {
+        assertNull(
+                span.getTag(key),
+                format("'%s' key found in '%s' span when it shouldn't be.", key, span.getOperationName()));
+    }
+
+    private static void checkExitSpanTags(DDSpan span, boolean includeSnapshot) {
+        for (String tag : DDTags.REQUIRED_CODE_ORIGIN_TAGS) {
+            assertKeyPresent(span, tag);
+        }
+        assertNotEquals(-1, span.getTag(DD_CODE_ORIGIN_FRAME_LINE));
+
+        if (includeSnapshot) {
+            assertKeyPresent(span, DD_CODE_ORIGIN_FRAME_SNAPSHOT_ID);
+        }
+    }
+
+    private static Set<String> ldKeys(MutableSpan span) {
+        return span.getTags().keySet().stream()
+                .filter(key -> key.startsWith(DD_CODE_ORIGIN_PREFIX))
+                .collect(Collectors.toCollection(TreeSet::new));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTestAdvice.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTestAdvice.java
index 36acb50365c..75ce06752e3 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTestAdvice.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTestAdvice.java
@@ -7,13 +7,13 @@
 
 public class CodeOriginTestAdvice {
 
-  @Advice.OnMethodEnter
-  @SuppressWarnings("bytebuddy-exception-suppression")
-  public static void onEnter(
-      @Advice.Origin("#t") String typeName,
-      @Advice.Origin("#m") String methodName,
-      @Advice.Origin("#d") String descriptor) {
-    marker();
-    captureCodeOrigin(typeName, methodName, descriptor, true);
-  }
+    @Advice.OnMethodEnter
+    @SuppressWarnings("bytebuddy-exception-suppression")
+    public static void onEnter(
+            @Advice.Origin("#t") String typeName,
+            @Advice.Origin("#m") String methodName,
+            @Advice.Origin("#d") String descriptor) {
+        marker();
+        captureCodeOrigin(typeName, methodName, descriptor, true);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java
index b67ec331ed6..acfafabf202 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java
@@ -55,510 +55,502 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 public class LogProbeTest {
-  private static final String LANGUAGE = "java";
-  private static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
-  private static final String DEBUG_SESSION_ID = "TestSession";
-  private static final int BUDGET_RUNS = 1100;
-
-  @Test
-  public void testCapture() {
-    Builder builder = createLog(null);
-    LogProbe snapshotProbe = builder.capture(1, 420, 255, 20).build();
-    assertEquals(1, snapshotProbe.getCapture().getMaxReferenceDepth());
-    assertEquals(420, snapshotProbe.getCapture().getMaxCollectionSize());
-    assertEquals(255, snapshotProbe.getCapture().getMaxLength());
-  }
-
-  @Test
-  public void testSampling() {
-    Builder builder = createLog(null);
-    LogProbe snapshotProbe = builder.sampling(0.25).build();
-    assertEquals(0.25, snapshotProbe.getSampling().getEventsPerSecond(), 0.01);
-  }
-
-  @Test
-  public void coordinatedSamplingEmitsProbeOnceConcurrently() {
-    LogProbe.CoordinatedSamplingState state =
-        new LogProbe.CoordinatedSamplingState(LogProbe.CoordinatedSamplingState.Status.EMIT);
-
-    long emitted =
-        IntStream.range(0, 1_000).parallel().filter(i -> state.tryEmit("probe-id")).count();
-
-    assertEquals(1, emitted);
-  }
-
-  @Test
-  public void debugSessionActive() {
-    assertTrue(
-        fillSnapshot(DebugSessionStatus.ACTIVE),
-        "Session is active so snapshots should get filled.");
-  }
-
-  @Test
-  public void debugSessionDisabled() {
-    Assertions.assertFalse(
-        fillSnapshot(DebugSessionStatus.DISABLED),
-        "Session is disabled so snapshots should not get filled.");
-  }
-
-  @Test
-  public void noDebugSession() {
-    assertTrue(
-        fillSnapshot(DebugSessionStatus.NONE),
-        "With no debug sessions, snapshots should get filled.");
-  }
-
-  @Test
-  public void budgets() {
-    try {
-      ProbeRateLimiter.setGlobalSnapshotRate(-1);
-      TracerAPI tracer =
-          CoreTracer.builder()
-              .idGenerationStrategy(IdGenerationStrategy.fromName("random"))
-              .build();
-      AgentTracer.registerIfAbsent(tracer);
-      String sessionId = "12345";
-
-      Result result = getResult(tracer, sessionId, true, null);
-      assertEquals(BUDGET_RUNS * LogProbe.CAPTURING_PROBE_BUDGET, result.sink.captures);
-
-      result = getResult(tracer, sessionId, false, null);
-      assertEquals(BUDGET_RUNS * LogProbe.NON_CAPTURING_PROBE_BUDGET, result.sink.highRate);
-
-      // run without a session
-      result = getResult(tracer, null, true, 100);
-      assertEquals(result.count, result.sink.captures);
-
-      result = getResult(tracer, null, false, 100);
-      assertEquals(result.count, result.sink.highRate);
-    } finally {
-      ProbeRateLimiter.resetGlobalRate();
+    private static final String LANGUAGE = "java";
+    private static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
+    private static final String DEBUG_SESSION_ID = "TestSession";
+    private static final int BUDGET_RUNS = 1100;
+
+    @Test
+    public void testCapture() {
+        Builder builder = createLog(null);
+        LogProbe snapshotProbe = builder.capture(1, 420, 255, 20).build();
+        assertEquals(1, snapshotProbe.getCapture().getMaxReferenceDepth());
+        assertEquals(420, snapshotProbe.getCapture().getMaxCollectionSize());
+        assertEquals(255, snapshotProbe.getCapture().getMaxLength());
     }
-  }
-
-  @Nonnull
-  private Result getResult(
-      TracerAPI tracer, String sessionId, boolean captureSnapshot, Integer line) {
-    BudgetSink sink = new BudgetSink(getConfig(), mock(ProbeStatusSink.class));
-    DebuggerAgentHelper.injectSink(sink);
-    int count = 0;
-    for (int i = 0; i < BUDGET_RUNS; i++) {
-      count += runTrace(tracer, captureSnapshot, line, sessionId);
+
+    @Test
+    public void testSampling() {
+        Builder builder = createLog(null);
+        LogProbe snapshotProbe = builder.sampling(0.25).build();
+        assertEquals(0.25, snapshotProbe.getSampling().getEventsPerSecond(), 0.01);
+    }
+
+    @Test
+    public void coordinatedSamplingEmitsProbeOnceConcurrently() {
+        LogProbe.CoordinatedSamplingState state =
+                new LogProbe.CoordinatedSamplingState(LogProbe.CoordinatedSamplingState.Status.EMIT);
+
+        long emitted = IntStream.range(0, 1_000)
+                .parallel()
+                .filter(i -> state.tryEmit("probe-id"))
+                .count();
+
+        assertEquals(1, emitted);
     }
-    return new Result(sink, count);
-  }
 
-  private static class Result {
-    final int count;
-    final BudgetSink sink;
+    @Test
+    public void debugSessionActive() {
+        assertTrue(fillSnapshot(DebugSessionStatus.ACTIVE), "Session is active so snapshots should get filled.");
+    }
 
-    private Result(BudgetSink sink, int count) {
-      this.sink = sink;
-      this.count = count;
+    @Test
+    public void debugSessionDisabled() {
+        Assertions.assertFalse(
+                fillSnapshot(DebugSessionStatus.DISABLED), "Session is disabled so snapshots should not get filled.");
     }
-  }
 
-  private int runTrace(TracerAPI tracer, boolean captureSnapshot, Integer line, String sessionId) {
-    AgentSpan span = tracer.startSpan("budget testing", "test span");
-    if (sessionId != null) {
-      span.setTag(Tags.PROPAGATED_DEBUG, sessionId + ":1");
+    @Test
+    public void noDebugSession() {
+        assertTrue(fillSnapshot(DebugSessionStatus.NONE), "With no debug sessions, snapshots should get filled.");
     }
-    try (ContextScope scope = tracer.activateManualSpan(span)) {
-      Builder builder =
-          createLog("Budget testing").probeId(ProbeId.newId()).captureSnapshot(captureSnapshot);
-      if (sessionId != null) {
-        builder.tags("session_id:" + sessionId);
-      }
-      LogProbe logProbe = builder.build();
-      logProbe.initSamplers();
-
-      CapturedContext entryContext = capturedContext(span, logProbe, MethodLocation.ENTRY);
-      CapturedContext exitContext = capturedContext(span, logProbe, MethodLocation.EXIT);
-      logProbe.evaluate(entryContext, new LogStatus(logProbe), MethodLocation.ENTRY, false);
-      logProbe.evaluate(exitContext, new LogStatus(logProbe), MethodLocation.EXIT, false);
-
-      int budget =
-          logProbe.isCaptureSnapshot()
-              ? LogProbe.CAPTURING_PROBE_BUDGET
-              : LogProbe.NON_CAPTURING_PROBE_BUDGET;
-      int runs = budget + 20;
-
-      for (int i = 0; i < runs; i++) {
-        if (line == null) {
-          logProbe.commit(entryContext, exitContext, emptyList());
-        } else {
-          logProbe.commit(entryContext, line);
+
+    @Test
+    public void budgets() {
+        try {
+            ProbeRateLimiter.setGlobalSnapshotRate(-1);
+            TracerAPI tracer = CoreTracer.builder()
+                    .idGenerationStrategy(IdGenerationStrategy.fromName("random"))
+                    .build();
+            AgentTracer.registerIfAbsent(tracer);
+            String sessionId = "12345";
+
+            Result result = getResult(tracer, sessionId, true, null);
+            assertEquals(BUDGET_RUNS * LogProbe.CAPTURING_PROBE_BUDGET, result.sink.captures);
+
+            result = getResult(tracer, sessionId, false, null);
+            assertEquals(BUDGET_RUNS * LogProbe.NON_CAPTURING_PROBE_BUDGET, result.sink.highRate);
+
+            // run without a session
+            result = getResult(tracer, null, true, 100);
+            assertEquals(result.count, result.sink.captures);
+
+            result = getResult(tracer, null, false, 100);
+            assertEquals(result.count, result.sink.highRate);
+        } finally {
+            ProbeRateLimiter.resetGlobalRate();
         }
-      }
-      if (sessionId != null) {
-        assertEquals(
-            runs, span.getLocalRootSpan().getTag(format("_dd.ld.probe_id.%s", logProbe.id)));
-      }
-      return runs;
     }
-  }
-
-  private boolean fillSnapshot(DebugSessionStatus status) {
-    DebuggerAgentHelper.injectSink(new DebuggerSink(getConfig(), mock(ProbeStatusSink.class)));
-    TracerAPI tracer =
-        CoreTracer.builder().idGenerationStrategy(IdGenerationStrategy.fromName("random")).build();
-    AgentTracer.registerIfAbsent(tracer);
-    AgentSpan span = tracer.startSpan("log probe debug session testing", "test span");
-    try (ContextScope scope = tracer.activateManualSpan(span)) {
-      if (status == DebugSessionStatus.ACTIVE) {
-        span.setTag(Tags.PROPAGATED_DEBUG, DEBUG_SESSION_ID + ":1");
-      } else if (status == DebugSessionStatus.DISABLED) {
-        span.setTag(Tags.PROPAGATED_DEBUG, DEBUG_SESSION_ID + ":0");
-      }
-
-      Builder builder = createLog("I'm in a debug session").probeId(ProbeId.newId());
-      if (status != DebugSessionStatus.NONE) {
-        builder.tags(format("session_id:%s", DEBUG_SESSION_ID));
-      }
-
-      LogProbe logProbe = builder.build();
-
-      CapturedContext entryContext = capturedContext(span, logProbe, MethodLocation.ENTRY);
-      CapturedContext exitContext = capturedContext(span, logProbe, MethodLocation.EXIT);
-      logProbe.evaluate(entryContext, new LogStatus(logProbe), MethodLocation.ENTRY, false);
-      logProbe.evaluate(exitContext, new LogStatus(logProbe), MethodLocation.EXIT, false);
-
-      return logProbe.fillSnapshot(
-          entryContext, exitContext, emptyList(), new Snapshot(currentThread(), logProbe, 3));
+
+    @Nonnull
+    private Result getResult(TracerAPI tracer, String sessionId, boolean captureSnapshot, Integer line) {
+        BudgetSink sink = new BudgetSink(getConfig(), mock(ProbeStatusSink.class));
+        DebuggerAgentHelper.injectSink(sink);
+        int count = 0;
+        for (int i = 0; i < BUDGET_RUNS; i++) {
+            count += runTrace(tracer, captureSnapshot, line, sessionId);
+        }
+        return new Result(sink, count);
+    }
+
+    private static class Result {
+        final int count;
+        final BudgetSink sink;
+
+        private Result(BudgetSink sink, int count) {
+            this.sink = sink;
+            this.count = count;
+        }
+    }
+
+    private int runTrace(TracerAPI tracer, boolean captureSnapshot, Integer line, String sessionId) {
+        AgentSpan span = tracer.startSpan("budget testing", "test span");
+        if (sessionId != null) {
+            span.setTag(Tags.PROPAGATED_DEBUG, sessionId + ":1");
+        }
+        try (ContextScope scope = tracer.activateManualSpan(span)) {
+            Builder builder =
+                    createLog("Budget testing").probeId(ProbeId.newId()).captureSnapshot(captureSnapshot);
+            if (sessionId != null) {
+                builder.tags("session_id:" + sessionId);
+            }
+            LogProbe logProbe = builder.build();
+            logProbe.initSamplers();
+
+            CapturedContext entryContext = capturedContext(span, logProbe, MethodLocation.ENTRY);
+            CapturedContext exitContext = capturedContext(span, logProbe, MethodLocation.EXIT);
+            logProbe.evaluate(entryContext, new LogStatus(logProbe), MethodLocation.ENTRY, false);
+            logProbe.evaluate(exitContext, new LogStatus(logProbe), MethodLocation.EXIT, false);
+
+            int budget = logProbe.isCaptureSnapshot()
+                    ? LogProbe.CAPTURING_PROBE_BUDGET
+                    : LogProbe.NON_CAPTURING_PROBE_BUDGET;
+            int runs = budget + 20;
+
+            for (int i = 0; i < runs; i++) {
+                if (line == null) {
+                    logProbe.commit(entryContext, exitContext, emptyList());
+                } else {
+                    logProbe.commit(entryContext, line);
+                }
+            }
+            if (sessionId != null) {
+                assertEquals(runs, span.getLocalRootSpan().getTag(format("_dd.ld.probe_id.%s", logProbe.id)));
+            }
+            return runs;
+        }
+    }
+
+    private boolean fillSnapshot(DebugSessionStatus status) {
+        DebuggerAgentHelper.injectSink(new DebuggerSink(getConfig(), mock(ProbeStatusSink.class)));
+        TracerAPI tracer = CoreTracer.builder()
+                .idGenerationStrategy(IdGenerationStrategy.fromName("random"))
+                .build();
+        AgentTracer.registerIfAbsent(tracer);
+        AgentSpan span = tracer.startSpan("log probe debug session testing", "test span");
+        try (ContextScope scope = tracer.activateManualSpan(span)) {
+            if (status == DebugSessionStatus.ACTIVE) {
+                span.setTag(Tags.PROPAGATED_DEBUG, DEBUG_SESSION_ID + ":1");
+            } else if (status == DebugSessionStatus.DISABLED) {
+                span.setTag(Tags.PROPAGATED_DEBUG, DEBUG_SESSION_ID + ":0");
+            }
+
+            Builder builder = createLog("I'm in a debug session").probeId(ProbeId.newId());
+            if (status != DebugSessionStatus.NONE) {
+                builder.tags(format("session_id:%s", DEBUG_SESSION_ID));
+            }
+
+            LogProbe logProbe = builder.build();
+
+            CapturedContext entryContext = capturedContext(span, logProbe, MethodLocation.ENTRY);
+            CapturedContext exitContext = capturedContext(span, logProbe, MethodLocation.EXIT);
+            logProbe.evaluate(entryContext, new LogStatus(logProbe), MethodLocation.ENTRY, false);
+            logProbe.evaluate(exitContext, new LogStatus(logProbe), MethodLocation.EXIT, false);
+
+            return logProbe.fillSnapshot(
+                    entryContext, exitContext, emptyList(), new Snapshot(currentThread(), logProbe, 3));
+        }
+    }
+
+    private static CapturedContext capturedContext(
+            AgentSpan span, ProbeDefinition probeDefinition, MethodLocation methodLocation) {
+        CapturedContext context = new CapturedContext();
+        context.evaluate(probeDefinition, "Log Probe test", System.currentTimeMillis(), methodLocation, false);
+        return context;
+    }
+
+    @Test
+    public void log() {
+        LogProbe logProbe = createLog(null).build();
+        assertNull(logProbe.getTemplate());
+        assertTrue(logProbe.getSegments().isEmpty());
+        logProbe = createLog("plain log line").build();
+        assertEquals("plain log line", logProbe.getTemplate());
+        assertEquals(1, logProbe.getSegments().size());
+        assertEquals("plain log line", logProbe.getSegments().get(0).getStr());
+        assertNull(logProbe.getSegments().get(0).getExpr());
+        assertNull(logProbe.getSegments().get(0).getParsedExpr());
+        logProbe = createLog("simple template log line {arg}").build();
+        assertEquals("simple template log line {arg}", logProbe.getTemplate());
+        assertEquals(2, logProbe.getSegments().size());
+        assertEquals("simple template log line ", logProbe.getSegments().get(0).getStr());
+        assertEquals("arg", logProbe.getSegments().get(1).getExpr());
+        logProbe = createLog("{arg1}={arg2} {{{count(array)}}}").build();
+        assertEquals("{arg1}={arg2} {{{count(array)}}}", logProbe.getTemplate());
+        assertEquals(6, logProbe.getSegments().size());
+        assertEquals("arg1", logProbe.getSegments().get(0).getExpr());
+        assertEquals("=", logProbe.getSegments().get(1).getStr());
+        assertEquals("arg2", logProbe.getSegments().get(2).getExpr());
+        assertEquals(" {", logProbe.getSegments().get(3).getStr());
+        assertEquals("count(array)", logProbe.getSegments().get(4).getExpr());
+        assertEquals("}", logProbe.getSegments().get(5).getStr());
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"ENTRY", "EXIT"})
+    public void fillSnapshot_shouldSend(String methodLocation) {
+        LogProbe logProbe = createLog(null)
+                .evaluateAt(MethodLocation.valueOf(methodLocation))
+                .build();
+        CapturedContext entryContext = new CapturedContext();
+        CapturedContext exitContext = new CapturedContext();
+        LogStatus logEntryStatus = prepareContext(entryContext, logProbe, MethodLocation.ENTRY);
+        logEntryStatus.setSampled(true); // force sampled to avoid rate limiting executing tests!
+        LogStatus logExitStatus = prepareContext(exitContext, logProbe, MethodLocation.EXIT);
+        logExitStatus.setSampled(true); // force sampled to avoid rate limiting executing tests!
+        Snapshot snapshot = new Snapshot(currentThread(), logProbe, 10);
+        assertTrue(logProbe.fillSnapshot(entryContext, exitContext, null, snapshot));
+    }
+
+    @ParameterizedTest
+    @MethodSource("statusValues")
+    public void fillSnapshot(
+            boolean sampled,
+            boolean condition,
+            boolean conditionErrors,
+            boolean logTemplateErrors,
+            boolean shouldCommit) {
+        LogProbe logProbe = createLog(null).evaluateAt(MethodLocation.EXIT).build();
+        CapturedContext entryContext = new CapturedContext();
+        CapturedContext exitContext = new CapturedContext();
+        LogStatus entryStatus = prepareContext(entryContext, logProbe, MethodLocation.ENTRY);
+        fillStatus(entryStatus, sampled, condition, conditionErrors, logTemplateErrors);
+        LogStatus exitStatus = prepareContext(exitContext, logProbe, MethodLocation.EXIT);
+        fillStatus(exitStatus, sampled, condition, conditionErrors, logTemplateErrors);
+        Snapshot snapshot = new Snapshot(currentThread(), logProbe, 10);
+        assertEquals(shouldCommit, logProbe.fillSnapshot(entryContext, exitContext, null, snapshot));
+    }
+
+    private void fillStatus(
+            LogStatus entryStatus,
+            boolean sampled,
+            boolean condition,
+            boolean conditionErrors,
+            boolean logTemplateErrors) {
+        entryStatus.setSampled(sampled);
+        entryStatus.setCondition(condition);
+        entryStatus.setConditionErrors(conditionErrors);
+        entryStatus.setLogTemplateErrors(logTemplateErrors);
+        entryStatus.setLogTemplateErrors(logTemplateErrors);
+    }
+
+    private LogStatus prepareContext(CapturedContext context, LogProbe logProbe, MethodLocation methodLocation) {
+        context.evaluate(logProbe, "", 0, methodLocation, false);
+        return (LogStatus) context.getStatus(PROBE_ID.getEncodedId());
+    }
+
+    private static Stream<Arguments> statusValues() {
+        return Stream.of(
+                // sampled, condition, conditionErrors, logTemplateErrors, shouldCommit
+                Arguments.of(true, true, false, false, true),
+                Arguments.of(true, false, false, false, false),
+                Arguments.of(true, false, true, false, true),
+                Arguments.of(true, false, true, true, true),
+                Arguments.of(true, false, false, true, true),
+                Arguments.of(false, false, false, false, false),
+                Arguments.of(false, true, false, false, false),
+                Arguments.of(false, false, true, false, false),
+                Arguments.of(false, false, false, true, false),
+                Arguments.of(false, false, true, true, false),
+                Arguments.of(false, true, true, true, false));
     }
-  }
-
-  private static CapturedContext capturedContext(
-      AgentSpan span, ProbeDefinition probeDefinition, MethodLocation methodLocation) {
-    CapturedContext context = new CapturedContext();
-    context.evaluate(
-        probeDefinition, "Log Probe test", System.currentTimeMillis(), methodLocation, false);
-    return context;
-  }
-
-  @Test
-  public void log() {
-    LogProbe logProbe = createLog(null).build();
-    assertNull(logProbe.getTemplate());
-    assertTrue(logProbe.getSegments().isEmpty());
-    logProbe = createLog("plain log line").build();
-    assertEquals("plain log line", logProbe.getTemplate());
-    assertEquals(1, logProbe.getSegments().size());
-    assertEquals("plain log line", logProbe.getSegments().get(0).getStr());
-    assertNull(logProbe.getSegments().get(0).getExpr());
-    assertNull(logProbe.getSegments().get(0).getParsedExpr());
-    logProbe = createLog("simple template log line {arg}").build();
-    assertEquals("simple template log line {arg}", logProbe.getTemplate());
-    assertEquals(2, logProbe.getSegments().size());
-    assertEquals("simple template log line ", logProbe.getSegments().get(0).getStr());
-    assertEquals("arg", logProbe.getSegments().get(1).getExpr());
-    logProbe = createLog("{arg1}={arg2} {{{count(array)}}}").build();
-    assertEquals("{arg1}={arg2} {{{count(array)}}}", logProbe.getTemplate());
-    assertEquals(6, logProbe.getSegments().size());
-    assertEquals("arg1", logProbe.getSegments().get(0).getExpr());
-    assertEquals("=", logProbe.getSegments().get(1).getStr());
-    assertEquals("arg2", logProbe.getSegments().get(2).getExpr());
-    assertEquals(" {", logProbe.getSegments().get(3).getStr());
-    assertEquals("count(array)", logProbe.getSegments().get(4).getExpr());
-    assertEquals("}", logProbe.getSegments().get(5).getStr());
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"ENTRY", "EXIT"})
-  public void fillSnapshot_shouldSend(String methodLocation) {
-    LogProbe logProbe = createLog(null).evaluateAt(MethodLocation.valueOf(methodLocation)).build();
-    CapturedContext entryContext = new CapturedContext();
-    CapturedContext exitContext = new CapturedContext();
-    LogStatus logEntryStatus = prepareContext(entryContext, logProbe, MethodLocation.ENTRY);
-    logEntryStatus.setSampled(true); // force sampled to avoid rate limiting executing tests!
-    LogStatus logExitStatus = prepareContext(exitContext, logProbe, MethodLocation.EXIT);
-    logExitStatus.setSampled(true); // force sampled to avoid rate limiting executing tests!
-    Snapshot snapshot = new Snapshot(currentThread(), logProbe, 10);
-    assertTrue(logProbe.fillSnapshot(entryContext, exitContext, null, snapshot));
-  }
-
-  @ParameterizedTest
-  @MethodSource("statusValues")
-  public void fillSnapshot(
-      boolean sampled,
-      boolean condition,
-      boolean conditionErrors,
-      boolean logTemplateErrors,
-      boolean shouldCommit) {
-    LogProbe logProbe = createLog(null).evaluateAt(MethodLocation.EXIT).build();
-    CapturedContext entryContext = new CapturedContext();
-    CapturedContext exitContext = new CapturedContext();
-    LogStatus entryStatus = prepareContext(entryContext, logProbe, MethodLocation.ENTRY);
-    fillStatus(entryStatus, sampled, condition, conditionErrors, logTemplateErrors);
-    LogStatus exitStatus = prepareContext(exitContext, logProbe, MethodLocation.EXIT);
-    fillStatus(exitStatus, sampled, condition, conditionErrors, logTemplateErrors);
-    Snapshot snapshot = new Snapshot(currentThread(), logProbe, 10);
-    assertEquals(shouldCommit, logProbe.fillSnapshot(entryContext, exitContext, null, snapshot));
-  }
-
-  private void fillStatus(
-      LogStatus entryStatus,
-      boolean sampled,
-      boolean condition,
-      boolean conditionErrors,
-      boolean logTemplateErrors) {
-    entryStatus.setSampled(sampled);
-    entryStatus.setCondition(condition);
-    entryStatus.setConditionErrors(conditionErrors);
-    entryStatus.setLogTemplateErrors(logTemplateErrors);
-    entryStatus.setLogTemplateErrors(logTemplateErrors);
-  }
-
-  private LogStatus prepareContext(
-      CapturedContext context, LogProbe logProbe, MethodLocation methodLocation) {
-    context.evaluate(logProbe, "", 0, methodLocation, false);
-    return (LogStatus) context.getStatus(PROBE_ID.getEncodedId());
-  }
-
-  private static Stream<Arguments> statusValues() {
-    return Stream.of(
-        // sampled, condition, conditionErrors, logTemplateErrors, shouldCommit
-        Arguments.of(true, true, false, false, true),
-        Arguments.of(true, false, false, false, false),
-        Arguments.of(true, false, true, false, true),
-        Arguments.of(true, false, true, true, true),
-        Arguments.of(true, false, false, true, true),
-        Arguments.of(false, false, false, false, false),
-        Arguments.of(false, true, false, false, false),
-        Arguments.of(false, false, true, false, false),
-        Arguments.of(false, false, false, true, false),
-        Arguments.of(false, false, true, true, false),
-        Arguments.of(false, true, true, true, false));
-  }
-
-  @Test
-  public void fillSnapshot_shouldSend_exit() {
-    LogProbe logProbe = createLog(null).evaluateAt(MethodLocation.EXIT).build();
-    CapturedContext entryContext = new CapturedContext();
-    prepareContext(entryContext, logProbe, MethodLocation.ENTRY);
-    CapturedContext exitContext = new CapturedContext();
-    prepareContext(exitContext, logProbe, MethodLocation.EXIT);
-    Snapshot snapshot = new Snapshot(currentThread(), logProbe, 10);
-    assertTrue(logProbe.fillSnapshot(entryContext, exitContext, null, snapshot));
-  }
-
-  @Test
-  public void fillSnapshot_shouldSend_evalErrors() {
-    LogProbe logProbe = createLog(null).evaluateAt(MethodLocation.EXIT).build();
-    CapturedContext entryContext = new CapturedContext();
-    LogStatus logStatus = prepareContext(entryContext, logProbe, MethodLocation.ENTRY);
-    logStatus.addError(new EvaluationError("expr", "msg1"));
-    logStatus.setLogTemplateErrors(true);
-    entryContext.addThrowable(new RuntimeException("errorEntry"));
-    CapturedContext exitContext = new CapturedContext();
-    logStatus = prepareContext(exitContext, logProbe, MethodLocation.EXIT);
-    logStatus.addError(new EvaluationError("expr", "msg2"));
-    logStatus.setLogTemplateErrors(true);
-    exitContext.addThrowable(new RuntimeException("errorExit"));
-    Snapshot snapshot = new Snapshot(currentThread(), logProbe, 10);
-    assertTrue(logProbe.fillSnapshot(entryContext, exitContext, null, snapshot));
-    assertEquals(2, snapshot.getEvaluationErrors().size());
-    assertEquals("msg1", snapshot.getEvaluationErrors().get(0).getMessage());
-    assertEquals("msg2", snapshot.getEvaluationErrors().get(1).getMessage());
-    assertEquals(
-        "errorEntry", snapshot.getCaptures().getEntry().getCapturedThrowable().getMessage());
-    assertEquals(
-        "errorExit", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
-  }
-
-  @Test
-  public void captureExpressionsInActiveDebugSession() {
-    DebuggerAgentHelper.injectSink(new DebuggerSink(getConfig(), mock(ProbeStatusSink.class)));
-    TracerAPI tracer =
-        CoreTracer.builder().idGenerationStrategy(IdGenerationStrategy.fromName("random")).build();
-    AgentTracer.registerIfAbsent(tracer);
-    AgentSpan span = tracer.startSpan("log probe capture expression testing", "test span");
-    try (ContextScope scope = tracer.activateManualSpan(span)) {
-      span.setTag(Tags.PROPAGATED_DEBUG, DEBUG_SESSION_ID + ":1");
-      // the probe sampler always rejects: the active session decision must still win
-      ProbeRateLimiter.setSamplerSupplier(rate -> new ConstantSampler(false));
-      LogProbe logProbe =
-          createLog("log line")
-              .probeId(ProbeId.newId())
-              .evaluateAt(MethodLocation.EXIT)
-              .tags(format("session_id:%s", DEBUG_SESSION_ID))
-              .when(new ProbeCondition(DSL.when(DSL.eq(DSL.value(1), DSL.value(1))), "1 == 1"))
-              .captureExpressions(
-                  singletonList(
-                      new LogProbe.CaptureExpression(
-                          "greeting", new ValueScript(DSL.value("hello"), "'hello'"), null)))
-              .build();
-      logProbe.initSamplers();
-      CapturedContext entryContext = capturedContext(span, logProbe, MethodLocation.ENTRY);
-      CapturedContext exitContext = capturedContext(span, logProbe, MethodLocation.EXIT);
-      logProbe.evaluate(entryContext, new LogStatus(logProbe), MethodLocation.ENTRY, false);
-      logProbe.evaluate(exitContext, new LogStatus(logProbe), MethodLocation.EXIT, false);
-      Snapshot snapshot = new Snapshot(currentThread(), logProbe, 3);
-      assertTrue(logProbe.fillSnapshot(entryContext, exitContext, emptyList(), snapshot));
-      assertEquals(
-          "hello",
-          snapshot
-              .getCaptures()
-              .getReturn()
-              .getCaptureExpressions()
-              .get("greeting")
-              .getValue()
-              .toString());
-    } finally {
-      ProbeRateLimiter.setSamplerSupplier(null);
+
+    @Test
+    public void fillSnapshot_shouldSend_exit() {
+        LogProbe logProbe = createLog(null).evaluateAt(MethodLocation.EXIT).build();
+        CapturedContext entryContext = new CapturedContext();
+        prepareContext(entryContext, logProbe, MethodLocation.ENTRY);
+        CapturedContext exitContext = new CapturedContext();
+        prepareContext(exitContext, logProbe, MethodLocation.EXIT);
+        Snapshot snapshot = new Snapshot(currentThread(), logProbe, 10);
+        assertTrue(logProbe.fillSnapshot(entryContext, exitContext, null, snapshot));
     }
-  }
-
-  @Test
-  public void coordinatedSamplingActiveSessionOverridesCachedDrop() {
-    DebuggerAgentHelper.injectSink(new DebuggerSink(getConfig(), mock(ProbeStatusSink.class)));
-    TracerAPI tracer =
-        CoreTracer.builder().idGenerationStrategy(IdGenerationStrategy.fromName("random")).build();
-    AgentTracer.registerIfAbsent(tracer);
-    AgentSpan span = tracer.startSpan("coordinated sampling debug session testing", "test span");
-    try (ContextScope scope = tracer.activateManualSpan(span)) {
-      // every real sampling decision drops, so the first full-snapshot probe caches a DROP
-      // decision for the whole trace before any debug session is active.
-      ProbeRateLimiter.setSamplerSupplier(rate -> new ConstantSampler(false));
-
-      LogProbe ordinaryProbeBefore =
-          createLog(null)
-              .probeId(ProbeId.newId())
-              .captureSnapshot(true)
-              .evaluateAt(MethodLocation.EXIT)
-              .build();
-      LogStatus statusBefore = evaluateOnce(ordinaryProbeBefore, MethodLocation.EXIT);
-      Assertions.assertFalse(statusBefore.isSampled());
-
-      // the debug session becomes active: a probe belonging to it must emit unconditionally...
-      span.setTag(Tags.PROPAGATED_DEBUG, DEBUG_SESSION_ID + ":1");
-      LogProbe activeSessionProbe =
-          createLog(null)
-              .probeId(ProbeId.newId())
-              .captureSnapshot(true)
-              .evaluateAt(MethodLocation.EXIT)
-              .tags(format("session_id:%s", DEBUG_SESSION_ID))
-              .build();
-      LogStatus activeStatus = evaluateOnce(activeSessionProbe, MethodLocation.EXIT);
-      assertTrue(activeStatus.isSampled());
-      assertTrue(activeStatus.shouldSend());
-
-      // ...and must not leave the earlier cached DROP in place, or every ordinary full-snapshot
-      // probe evaluated afterwards on this trace would keep being suppressed by it.
-      LogProbe ordinaryProbeAfter =
-          createLog(null)
-              .probeId(ProbeId.newId())
-              .captureSnapshot(true)
-              .evaluateAt(MethodLocation.EXIT)
-              .build();
-      LogStatus statusAfter = evaluateOnce(ordinaryProbeAfter, MethodLocation.EXIT);
-      assertTrue(statusAfter.isSampled());
-    } finally {
-      ProbeRateLimiter.setSamplerSupplier(null);
+
+    @Test
+    public void fillSnapshot_shouldSend_evalErrors() {
+        LogProbe logProbe = createLog(null).evaluateAt(MethodLocation.EXIT).build();
+        CapturedContext entryContext = new CapturedContext();
+        LogStatus logStatus = prepareContext(entryContext, logProbe, MethodLocation.ENTRY);
+        logStatus.addError(new EvaluationError("expr", "msg1"));
+        logStatus.setLogTemplateErrors(true);
+        entryContext.addThrowable(new RuntimeException("errorEntry"));
+        CapturedContext exitContext = new CapturedContext();
+        logStatus = prepareContext(exitContext, logProbe, MethodLocation.EXIT);
+        logStatus.addError(new EvaluationError("expr", "msg2"));
+        logStatus.setLogTemplateErrors(true);
+        exitContext.addThrowable(new RuntimeException("errorExit"));
+        Snapshot snapshot = new Snapshot(currentThread(), logProbe, 10);
+        assertTrue(logProbe.fillSnapshot(entryContext, exitContext, null, snapshot));
+        assertEquals(2, snapshot.getEvaluationErrors().size());
+        assertEquals("msg1", snapshot.getEvaluationErrors().get(0).getMessage());
+        assertEquals("msg2", snapshot.getEvaluationErrors().get(1).getMessage());
+        assertEquals(
+                "errorEntry",
+                snapshot.getCaptures().getEntry().getCapturedThrowable().getMessage());
+        assertEquals(
+                "errorExit",
+                snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
+    }
+
+    @Test
+    public void captureExpressionsInActiveDebugSession() {
+        DebuggerAgentHelper.injectSink(new DebuggerSink(getConfig(), mock(ProbeStatusSink.class)));
+        TracerAPI tracer = CoreTracer.builder()
+                .idGenerationStrategy(IdGenerationStrategy.fromName("random"))
+                .build();
+        AgentTracer.registerIfAbsent(tracer);
+        AgentSpan span = tracer.startSpan("log probe capture expression testing", "test span");
+        try (ContextScope scope = tracer.activateManualSpan(span)) {
+            span.setTag(Tags.PROPAGATED_DEBUG, DEBUG_SESSION_ID + ":1");
+            // the probe sampler always rejects: the active session decision must still win
+            ProbeRateLimiter.setSamplerSupplier(rate -> new ConstantSampler(false));
+            LogProbe logProbe = createLog("log line")
+                    .probeId(ProbeId.newId())
+                    .evaluateAt(MethodLocation.EXIT)
+                    .tags(format("session_id:%s", DEBUG_SESSION_ID))
+                    .when(new ProbeCondition(DSL.when(DSL.eq(DSL.value(1), DSL.value(1))), "1 == 1"))
+                    .captureExpressions(singletonList(new LogProbe.CaptureExpression(
+                            "greeting", new ValueScript(DSL.value("hello"), "'hello'"), null)))
+                    .build();
+            logProbe.initSamplers();
+            CapturedContext entryContext = capturedContext(span, logProbe, MethodLocation.ENTRY);
+            CapturedContext exitContext = capturedContext(span, logProbe, MethodLocation.EXIT);
+            logProbe.evaluate(entryContext, new LogStatus(logProbe), MethodLocation.ENTRY, false);
+            logProbe.evaluate(exitContext, new LogStatus(logProbe), MethodLocation.EXIT, false);
+            Snapshot snapshot = new Snapshot(currentThread(), logProbe, 3);
+            assertTrue(logProbe.fillSnapshot(entryContext, exitContext, emptyList(), snapshot));
+            assertEquals(
+                    "hello",
+                    snapshot.getCaptures()
+                            .getReturn()
+                            .getCaptureExpressions()
+                            .get("greeting")
+                            .getValue()
+                            .toString());
+        } finally {
+            ProbeRateLimiter.setSamplerSupplier(null);
+        }
+    }
+
+    @Test
+    public void coordinatedSamplingActiveSessionOverridesCachedDrop() {
+        DebuggerAgentHelper.injectSink(new DebuggerSink(getConfig(), mock(ProbeStatusSink.class)));
+        TracerAPI tracer = CoreTracer.builder()
+                .idGenerationStrategy(IdGenerationStrategy.fromName("random"))
+                .build();
+        AgentTracer.registerIfAbsent(tracer);
+        AgentSpan span = tracer.startSpan("coordinated sampling debug session testing", "test span");
+        try (ContextScope scope = tracer.activateManualSpan(span)) {
+            // every real sampling decision drops, so the first full-snapshot probe caches a DROP
+            // decision for the whole trace before any debug session is active.
+            ProbeRateLimiter.setSamplerSupplier(rate -> new ConstantSampler(false));
+
+            LogProbe ordinaryProbeBefore = createLog(null)
+                    .probeId(ProbeId.newId())
+                    .captureSnapshot(true)
+                    .evaluateAt(MethodLocation.EXIT)
+                    .build();
+            LogStatus statusBefore = evaluateOnce(ordinaryProbeBefore, MethodLocation.EXIT);
+            Assertions.assertFalse(statusBefore.isSampled());
+
+            // the debug session becomes active: a probe belonging to it must emit unconditionally...
+            span.setTag(Tags.PROPAGATED_DEBUG, DEBUG_SESSION_ID + ":1");
+            LogProbe activeSessionProbe = createLog(null)
+                    .probeId(ProbeId.newId())
+                    .captureSnapshot(true)
+                    .evaluateAt(MethodLocation.EXIT)
+                    .tags(format("session_id:%s", DEBUG_SESSION_ID))
+                    .build();
+            LogStatus activeStatus = evaluateOnce(activeSessionProbe, MethodLocation.EXIT);
+            assertTrue(activeStatus.isSampled());
+            assertTrue(activeStatus.shouldSend());
+
+            // ...and must not leave the earlier cached DROP in place, or every ordinary full-snapshot
+            // probe evaluated afterwards on this trace would keep being suppressed by it.
+            LogProbe ordinaryProbeAfter = createLog(null)
+                    .probeId(ProbeId.newId())
+                    .captureSnapshot(true)
+                    .evaluateAt(MethodLocation.EXIT)
+                    .build();
+            LogStatus statusAfter = evaluateOnce(ordinaryProbeAfter, MethodLocation.EXIT);
+            assertTrue(statusAfter.isSampled());
+        } finally {
+            ProbeRateLimiter.setSamplerSupplier(null);
+        }
     }
-  }
-
-  private LogStatus evaluateOnce(LogProbe logProbe, MethodLocation methodLocation) {
-    CapturedContext context = new CapturedContext();
-    context.evaluate(logProbe, "", 0, methodLocation, false);
-    return (LogStatus) context.getStatus(logProbe.getProbeId().getEncodedId());
-  }
-
-  @Test
-  public void isReadyToCaptureRateLimitedRecordsSkip() {
-    DebuggerSink sink = spy(new DebuggerSink(getConfig(), mock(ProbeStatusSink.class)));
-    DebuggerAgentHelper.injectSink(sink);
-    try {
-      ProbeRateLimiter.setSamplerSupplier(rate -> new ConstantSampler(false));
-      LogProbe logProbe = createLog(null).build();
-      logProbe.initSamplers();
-      Assertions.assertFalse(logProbe.isReadyToCapture());
-      verify(sink).skipSnapshot(PROBE_ID.getId(), RATE_LIMIT);
-    } finally {
-      ProbeRateLimiter.setSamplerSupplier(null);
+
+    private LogStatus evaluateOnce(LogProbe logProbe, MethodLocation methodLocation) {
+        CapturedContext context = new CapturedContext();
+        context.evaluate(logProbe, "", 0, methodLocation, false);
+        return (LogStatus) context.getStatus(logProbe.getProbeId().getEncodedId());
     }
-  }
-
-  @Test
-  public void evaluateConditionTimeoutRecordsSkipAndConditionErrors() {
-    DebuggerSink sink = spy(new DebuggerSink(getConfig(), mock(ProbeStatusSink.class)));
-    DebuggerAgentHelper.injectSink(sink);
-    ProbeCondition timingOutCondition = mock(ProbeCondition.class);
-    when(timingOutCondition.execute(any(), any()))
-        .thenThrow(new EvaluationTimeOutException("timeout after 100ms", "slow.expr"));
-    LogProbe logProbe =
-        createLog(null).evaluateAt(MethodLocation.EXIT).when(timingOutCondition).build();
-    CapturedContext context = new CapturedContext();
-    LogStatus status = new LogStatus(logProbe);
-
-    // methodLocation (ENTRY) intentionally differs from evaluateAt (EXIT) so that sample() is a
-    // no-op here, isolating the skipSnapshot call to evaluateCondition()'s timeout handling.
-    logProbe.evaluate(context, status, MethodLocation.ENTRY, false);
-
-    Assertions.assertFalse(status.getCondition());
-    assertTrue(status.hasConditionErrors());
-    assertEquals(1, status.getErrors().size());
-    assertEquals("slow.expr", status.getErrors().get(0).getExpr());
-    assertEquals("timeout after 100ms", status.getErrors().get(0).getMessage());
-    verify(sink).skipSnapshot(PROBE_ID.getId(), EVALUATION_TIME_OUT);
-    verify(sink, times(1)).skipSnapshot(anyString(), any());
-  }
-
-  @Test
-  public void evaluateConditionFalseDoesNotSkipSnapshot() {
-    DebuggerSink sink = spy(new DebuggerSink(getConfig(), mock(ProbeStatusSink.class)));
-    DebuggerAgentHelper.injectSink(sink);
-    LogProbe logProbe =
-        createLog(null)
-            .evaluateAt(MethodLocation.EXIT)
-            .when(new ProbeCondition(DSL.when(DSL.eq(DSL.value(1), DSL.value(2))), "1 == 2"))
-            .build();
-    CapturedContext context = new CapturedContext();
-    LogStatus status = new LogStatus(logProbe);
-
-    logProbe.evaluate(context, status, MethodLocation.EXIT, false);
-
-    Assertions.assertFalse(status.getCondition());
-    Assertions.assertFalse(status.hasConditionErrors());
-    verify(sink, never()).skipSnapshot(anyString(), any());
-  }
-
-  private Builder createLog(String template) {
-    return LogProbe.builder()
-        .language(LANGUAGE)
-        .probeId(PROBE_ID)
-        .where("String.java", 42)
-        .template(template, parseTemplate(template));
-  }
-
-  private static class BudgetSink extends DebuggerSink {
-
-    public int captures;
-
-    public int highRate;
-
-    public BudgetSink(Config config, ProbeStatusSink probeStatusSink) {
-      super(config, probeStatusSink);
+
+    @Test
+    public void isReadyToCaptureRateLimitedRecordsSkip() {
+        DebuggerSink sink = spy(new DebuggerSink(getConfig(), mock(ProbeStatusSink.class)));
+        DebuggerAgentHelper.injectSink(sink);
+        try {
+            ProbeRateLimiter.setSamplerSupplier(rate -> new ConstantSampler(false));
+            LogProbe logProbe = createLog(null).build();
+            logProbe.initSamplers();
+            Assertions.assertFalse(logProbe.isReadyToCapture());
+            verify(sink).skipSnapshot(PROBE_ID.getId(), RATE_LIMIT);
+        } finally {
+            ProbeRateLimiter.setSamplerSupplier(null);
+        }
     }
 
-    @Override
-    public void addHighRateSnapshot(Snapshot snapshot) {
-      highRate++;
+    @Test
+    public void evaluateConditionTimeoutRecordsSkipAndConditionErrors() {
+        DebuggerSink sink = spy(new DebuggerSink(getConfig(), mock(ProbeStatusSink.class)));
+        DebuggerAgentHelper.injectSink(sink);
+        ProbeCondition timingOutCondition = mock(ProbeCondition.class);
+        when(timingOutCondition.execute(any(), any()))
+                .thenThrow(new EvaluationTimeOutException("timeout after 100ms", "slow.expr"));
+        LogProbe logProbe = createLog(null)
+                .evaluateAt(MethodLocation.EXIT)
+                .when(timingOutCondition)
+                .build();
+        CapturedContext context = new CapturedContext();
+        LogStatus status = new LogStatus(logProbe);
+
+        // methodLocation (ENTRY) intentionally differs from evaluateAt (EXIT) so that sample() is a
+        // no-op here, isolating the skipSnapshot call to evaluateCondition()'s timeout handling.
+        logProbe.evaluate(context, status, MethodLocation.ENTRY, false);
+
+        Assertions.assertFalse(status.getCondition());
+        assertTrue(status.hasConditionErrors());
+        assertEquals(1, status.getErrors().size());
+        assertEquals("slow.expr", status.getErrors().get(0).getExpr());
+        assertEquals("timeout after 100ms", status.getErrors().get(0).getMessage());
+        verify(sink).skipSnapshot(PROBE_ID.getId(), EVALUATION_TIME_OUT);
+        verify(sink, times(1)).skipSnapshot(anyString(), any());
     }
 
-    @Override
-    public void addSnapshot(Snapshot snapshot) {
-      captures++;
+    @Test
+    public void evaluateConditionFalseDoesNotSkipSnapshot() {
+        DebuggerSink sink = spy(new DebuggerSink(getConfig(), mock(ProbeStatusSink.class)));
+        DebuggerAgentHelper.injectSink(sink);
+        LogProbe logProbe = createLog(null)
+                .evaluateAt(MethodLocation.EXIT)
+                .when(new ProbeCondition(DSL.when(DSL.eq(DSL.value(1), DSL.value(2))), "1 == 2"))
+                .build();
+        CapturedContext context = new CapturedContext();
+        LogStatus status = new LogStatus(logProbe);
+
+        logProbe.evaluate(context, status, MethodLocation.EXIT, false);
+
+        Assertions.assertFalse(status.getCondition());
+        Assertions.assertFalse(status.hasConditionErrors());
+        verify(sink, never()).skipSnapshot(anyString(), any());
     }
 
-    @Override
-    public void start() {
-      super.start();
+    private Builder createLog(String template) {
+        return LogProbe.builder()
+                .language(LANGUAGE)
+                .probeId(PROBE_ID)
+                .where("String.java", 42)
+                .template(template, parseTemplate(template));
     }
 
-    @Override
-    public void stop() {
-      super.stop();
+    private static class BudgetSink extends DebuggerSink {
+
+        public int captures;
+
+        public int highRate;
+
+        public BudgetSink(Config config, ProbeStatusSink probeStatusSink) {
+            super(config, probeStatusSink);
+        }
+
+        @Override
+        public void addHighRateSnapshot(Snapshot snapshot) {
+            highRate++;
+        }
+
+        @Override
+        public void addSnapshot(Snapshot snapshot) {
+            captures++;
+        }
+
+        @Override
+        public void start() {
+            super.start();
+        }
+
+        @Override
+        public void stop() {
+            super.stop();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/MetricProbeTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/MetricProbeTest.java
index 088f45e6c8f..5f7645a68ca 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/MetricProbeTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/MetricProbeTest.java
@@ -7,80 +7,74 @@
 import org.junit.jupiter.api.Test;
 
 public class MetricProbeTest {
-  private static final String LANGUAGE = "java";
-  private static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
+    private static final String LANGUAGE = "java";
+    private static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
 
-  @Test
-  public void metric() {
-    MetricProbe.Builder metricBuilder = createMetric();
-    MetricProbe metric =
-        metricBuilder
-            .where("java.lang.Object", "toString()", "java.lang.String ()", new String[] {"5-7"})
-            .kind(MetricProbe.MetricKind.COUNT)
-            .metricName("datadog.debugger.calls")
-            .build();
-    Assertions.assertEquals("toString()", metric.getWhere().getMethodName());
-    Assertions.assertEquals("5-7", metric.getWhere().getLines()[0]);
-    Assertions.assertEquals(MetricProbe.MetricKind.COUNT, metric.getKind());
-    Assertions.assertEquals("datadog.debugger.calls", metric.getMetricName());
-  }
+    @Test
+    public void metric() {
+        MetricProbe.Builder metricBuilder = createMetric();
+        MetricProbe metric = metricBuilder
+                .where("java.lang.Object", "toString()", "java.lang.String ()", new String[] {"5-7"})
+                .kind(MetricProbe.MetricKind.COUNT)
+                .metricName("datadog.debugger.calls")
+                .build();
+        Assertions.assertEquals("toString()", metric.getWhere().getMethodName());
+        Assertions.assertEquals("5-7", metric.getWhere().getLines()[0]);
+        Assertions.assertEquals(MetricProbe.MetricKind.COUNT, metric.getKind());
+        Assertions.assertEquals("datadog.debugger.calls", metric.getMetricName());
+    }
 
-  @Test
-  public void metricWithTags() {
-    MetricProbe.Builder metricBuilder = createMetric();
-    MetricProbe metric =
-        metricBuilder
-            .where("java.lang.Object", "toString()", "java.lang.String ()", new String[] {"5-7"})
-            .kind(MetricProbe.MetricKind.COUNT)
-            .metricName("datadog.debugger.calls")
-            .tags("tag1:foo1", "tag2:foo2")
-            .build();
-    Assertions.assertEquals(2, metric.getTags().length);
-    Assertions.assertEquals("foo1", metric.getTagMap().get("tag1"));
-    Assertions.assertEquals("foo2", metric.getTagMap().get("tag2"));
-  }
+    @Test
+    public void metricWithTags() {
+        MetricProbe.Builder metricBuilder = createMetric();
+        MetricProbe metric = metricBuilder
+                .where("java.lang.Object", "toString()", "java.lang.String ()", new String[] {"5-7"})
+                .kind(MetricProbe.MetricKind.COUNT)
+                .metricName("datadog.debugger.calls")
+                .tags("tag1:foo1", "tag2:foo2")
+                .build();
+        Assertions.assertEquals(2, metric.getTags().length);
+        Assertions.assertEquals("foo1", metric.getTagMap().get("tag1"));
+        Assertions.assertEquals("foo2", metric.getTagMap().get("tag2"));
+    }
 
-  @Test
-  public void metricConstantValueScript() {
-    MetricProbe.Builder metricBuilder = createMetric();
-    MetricProbe metric1 =
-        metricBuilder
-            .where("java.lang.Object", "toString()", "java.lang.String ()", new String[] {"5-7"})
-            .kind(MetricProbe.MetricKind.COUNT)
-            .metricName("datadog.debugger.calls")
-            .valueScript(new ValueScript(DSL.value(42), "42"))
-            .build();
-    MetricProbe metric2 =
-        metricBuilder
-            .where("java.lang.Object", "toString()", "java.lang.String ()", new String[] {"5-7"})
-            .kind(MetricProbe.MetricKind.COUNT)
-            .metricName("datadog.debugger.calls")
-            .valueScript(new ValueScript(DSL.value(42), "42"))
-            .build();
-    Assertions.assertEquals(metric1, metric2);
-  }
+    @Test
+    public void metricConstantValueScript() {
+        MetricProbe.Builder metricBuilder = createMetric();
+        MetricProbe metric1 = metricBuilder
+                .where("java.lang.Object", "toString()", "java.lang.String ()", new String[] {"5-7"})
+                .kind(MetricProbe.MetricKind.COUNT)
+                .metricName("datadog.debugger.calls")
+                .valueScript(new ValueScript(DSL.value(42), "42"))
+                .build();
+        MetricProbe metric2 = metricBuilder
+                .where("java.lang.Object", "toString()", "java.lang.String ()", new String[] {"5-7"})
+                .kind(MetricProbe.MetricKind.COUNT)
+                .metricName("datadog.debugger.calls")
+                .valueScript(new ValueScript(DSL.value(42), "42"))
+                .build();
+        Assertions.assertEquals(metric1, metric2);
+    }
 
-  @Test
-  public void metricRefValueScript() {
-    MetricProbe.Builder metricBuilder = createMetric();
-    MetricProbe metric1 =
-        metricBuilder
-            .where("java.lang.Object", "toString()", "java.lang.String ()", new String[] {"5-7"})
-            .kind(MetricProbe.MetricKind.COUNT)
-            .metricName("datadog.debugger.calls")
-            .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
-            .build();
-    MetricProbe metric2 =
-        metricBuilder
-            .where("java.lang.Object", "toString()", "java.lang.String ()", new String[] {"5-7"})
-            .kind(MetricProbe.MetricKind.COUNT)
-            .metricName("datadog.debugger.calls")
-            .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
-            .build();
-    Assertions.assertEquals(metric1, metric2);
-  }
+    @Test
+    public void metricRefValueScript() {
+        MetricProbe.Builder metricBuilder = createMetric();
+        MetricProbe metric1 = metricBuilder
+                .where("java.lang.Object", "toString()", "java.lang.String ()", new String[] {"5-7"})
+                .kind(MetricProbe.MetricKind.COUNT)
+                .metricName("datadog.debugger.calls")
+                .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
+                .build();
+        MetricProbe metric2 = metricBuilder
+                .where("java.lang.Object", "toString()", "java.lang.String ()", new String[] {"5-7"})
+                .kind(MetricProbe.MetricKind.COUNT)
+                .metricName("datadog.debugger.calls")
+                .valueScript(new ValueScript(DSL.ref("arg"), "arg"))
+                .build();
+        Assertions.assertEquals(metric1, metric2);
+    }
 
-  private MetricProbe.Builder createMetric() {
-    return MetricProbe.builder().language(LANGUAGE).probeId(PROBE_ID);
-  }
+    private MetricProbe.Builder createMetric() {
+        return MetricProbe.builder().language(LANGUAGE).probeId(PROBE_ID);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/ProbeDefinitionSerializer.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/ProbeDefinitionSerializer.java
index 4867db10149..2bf86f1336d 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/ProbeDefinitionSerializer.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/ProbeDefinitionSerializer.java
@@ -4,28 +4,27 @@
 
 public class ProbeDefinitionSerializer {
 
-  public static String serializeMetricProbe(MetricProbe metricProbe) {
-    return ProbeDefinitionDeserializer.METRIC_PROBE_JSON_ADAPTER.toJson(metricProbe);
-  }
-
-  public static String serializeLogProbe(LogProbe logProbe) {
-    return ProbeDefinitionDeserializer.LOG_PROBE_JSON_ADAPTER.toJson(logProbe);
-  }
-
-  public static String serializeSpanProbe(SpanProbe spanProbe) {
-    return ProbeDefinitionDeserializer.SPAN_PROBE_JSON_ADAPTER.toJson(spanProbe);
-  }
-
-  public static String serializeSpanDecorationProbe(SpanDecorationProbe spanDecorationProbe) {
-    return ProbeDefinitionDeserializer.SPAN_DECORATION_PROBE_JSON_ADAPTER.toJson(
-        spanDecorationProbe);
-  }
-
-  public static String serializeTriggerProbe(TriggerProbe triggerProbe) {
-    return ProbeDefinitionDeserializer.TRIGGER_PROBE_JSON_ADAPTER.toJson(triggerProbe);
-  }
-
-  public static String serializeConfiguration(Configuration configuration) {
-    return ProbeDefinitionDeserializer.CONFIGURATION_JSON_ADAPTER.toJson(configuration);
-  }
+    public static String serializeMetricProbe(MetricProbe metricProbe) {
+        return ProbeDefinitionDeserializer.METRIC_PROBE_JSON_ADAPTER.toJson(metricProbe);
+    }
+
+    public static String serializeLogProbe(LogProbe logProbe) {
+        return ProbeDefinitionDeserializer.LOG_PROBE_JSON_ADAPTER.toJson(logProbe);
+    }
+
+    public static String serializeSpanProbe(SpanProbe spanProbe) {
+        return ProbeDefinitionDeserializer.SPAN_PROBE_JSON_ADAPTER.toJson(spanProbe);
+    }
+
+    public static String serializeSpanDecorationProbe(SpanDecorationProbe spanDecorationProbe) {
+        return ProbeDefinitionDeserializer.SPAN_DECORATION_PROBE_JSON_ADAPTER.toJson(spanDecorationProbe);
+    }
+
+    public static String serializeTriggerProbe(TriggerProbe triggerProbe) {
+        return ProbeDefinitionDeserializer.TRIGGER_PROBE_JSON_ADAPTER.toJson(triggerProbe);
+    }
+
+    public static String serializeConfiguration(Configuration configuration) {
+        return ProbeDefinitionDeserializer.CONFIGURATION_JSON_ADAPTER.toJson(configuration);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/ProbeDefinitionTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/ProbeDefinitionTest.java
index 79a37dd9987..e6cc63aabf1 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/ProbeDefinitionTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/ProbeDefinitionTest.java
@@ -5,35 +5,36 @@
 import org.junit.jupiter.api.Test;
 
 public class ProbeDefinitionTest {
-  private static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
+    private static final ProbeId PROBE_ID = new ProbeId("beae1807-f3b0-4ea8-a74f-826790c5e6f8", 0);
 
-  @Test
-  public void tags() {
-    String[] tags = new String[] {"tag1:foo1", "tag2:foo2", "tag3"};
-    ProbeDefinition snapshotProbe = LogProbe.builder().probeId(PROBE_ID).tags(tags).build();
-    Assertions.assertEquals("foo1", snapshotProbe.getTagMap().get("tag1"));
-    Assertions.assertEquals("foo2", snapshotProbe.getTagMap().get("tag2"));
-    Assertions.assertNull(snapshotProbe.getTagMap().get("tag3"));
-    Assertions.assertNotNull(snapshotProbe.getTags());
-    Assertions.assertEquals(3, snapshotProbe.getTags().length);
-    Assertions.assertEquals("tag1:foo1", snapshotProbe.getTags()[0].toString());
-    Assertions.assertEquals("tag2:foo2", snapshotProbe.getTags()[1].toString());
-    Assertions.assertEquals("tag3", snapshotProbe.getTags()[2].toString());
-    Assertions.assertEquals("tag1:foo1,tag2:foo2,tag3", snapshotProbe.concatTags());
-  }
+    @Test
+    public void tags() {
+        String[] tags = new String[] {"tag1:foo1", "tag2:foo2", "tag3"};
+        ProbeDefinition snapshotProbe =
+                LogProbe.builder().probeId(PROBE_ID).tags(tags).build();
+        Assertions.assertEquals("foo1", snapshotProbe.getTagMap().get("tag1"));
+        Assertions.assertEquals("foo2", snapshotProbe.getTagMap().get("tag2"));
+        Assertions.assertNull(snapshotProbe.getTagMap().get("tag3"));
+        Assertions.assertNotNull(snapshotProbe.getTags());
+        Assertions.assertEquals(3, snapshotProbe.getTags().length);
+        Assertions.assertEquals("tag1:foo1", snapshotProbe.getTags()[0].toString());
+        Assertions.assertEquals("tag2:foo2", snapshotProbe.getTags()[1].toString());
+        Assertions.assertEquals("tag3", snapshotProbe.getTags()[2].toString());
+        Assertions.assertEquals("tag1:foo1,tag2:foo2,tag3", snapshotProbe.concatTags());
+    }
 
-  @Test
-  public void noTags() {
-    ProbeDefinition snapshotProbe = LogProbe.builder().probeId(PROBE_ID).build();
-    Assertions.assertNull(snapshotProbe.getTags());
-    Assertions.assertNull(snapshotProbe.concatTags());
-  }
+    @Test
+    public void noTags() {
+        ProbeDefinition snapshotProbe = LogProbe.builder().probeId(PROBE_ID).build();
+        Assertions.assertNull(snapshotProbe.getTags());
+        Assertions.assertNull(snapshotProbe.concatTags());
+    }
 
-  @Test
-  public void emptyTags() {
-    ProbeDefinition snapshotProbe =
-        LogProbe.builder().probeId(PROBE_ID).tags(new String[] {}).build();
-    Assertions.assertEquals(0, snapshotProbe.getTags().length);
-    Assertions.assertEquals("", snapshotProbe.concatTags());
-  }
+    @Test
+    public void emptyTags() {
+        ProbeDefinition snapshotProbe =
+                LogProbe.builder().probeId(PROBE_ID).tags(new String[] {}).build();
+        Assertions.assertEquals(0, snapshotProbe.getTags().length);
+        Assertions.assertEquals("", snapshotProbe.concatTags());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/SamplingTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/SamplingTest.java
index 66ef4ed5b53..2f071b83e6f 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/SamplingTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/SamplingTest.java
@@ -7,29 +7,29 @@
 import org.junit.jupiter.api.Test;
 
 public class SamplingTest {
-  @Test
-  public void sampling() {
-    Sampling sampling = new Sampling();
+    @Test
+    public void sampling() {
+        Sampling sampling = new Sampling();
 
-    assertEquals(0, sampling.getEventsPerSecond());
-    assertEquals(0, sampling.getCoolDownInSeconds());
-    assertFalse(sampling.inCoolDown());
-  }
+        assertEquals(0, sampling.getEventsPerSecond());
+        assertEquals(0, sampling.getCoolDownInSeconds());
+        assertFalse(sampling.inCoolDown());
+    }
 
-  @Test
-  public void inCoolDown() {
-    Sampling sampling = new Sampling(5);
+    @Test
+    public void inCoolDown() {
+        Sampling sampling = new Sampling(5);
 
-    assertEquals(0, sampling.getEventsPerSecond());
-    assertEquals(5, sampling.getCoolDownInSeconds());
-    assertFalse(sampling.inCoolDown());
-    assertTrue(sampling.inCoolDown());
-  }
+        assertEquals(0, sampling.getEventsPerSecond());
+        assertEquals(5, sampling.getCoolDownInSeconds());
+        assertFalse(sampling.inCoolDown());
+        assertTrue(sampling.inCoolDown());
+    }
 
-  @Test
-  public void constructors() {
-    assertEquals(new Sampling(0, 0.0), new Sampling());
-    assertEquals(new Sampling(0, 42.0), new Sampling(42.0));
-    assertEquals(new Sampling(10, 0.0), new Sampling(10));
-  }
+    @Test
+    public void constructors() {
+        assertEquals(new Sampling(0, 0.0), new Sampling());
+        assertEquals(new Sampling(0, 42.0), new Sampling(42.0));
+        assertEquals(new Sampling(10, 0.0), new Sampling(10));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/WhereTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/WhereTest.java
index 3723e794ef4..26d7d21d8c7 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/WhereTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/WhereTest.java
@@ -17,144 +17,122 @@
 import org.objectweb.asm.tree.MethodNode;
 
 public class WhereTest {
-  @Test
-  public void simpleLineRange() {
-    Where where =
-        new Where(
-            "java.lang.Object", "toString()", "java.lang.String ()", new String[] {"5-7"}, null);
-    assertTrue(where.isSignatureMatching("java.lang.String ()"));
-    String[] lines = where.getLines();
-    Assertions.assertNotNull(lines);
-    Assertions.assertEquals(1, lines.length);
-    Assertions.assertEquals("5-7", lines[0]);
-  }
+    @Test
+    public void simpleLineRange() {
+        Where where = new Where("java.lang.Object", "toString()", "java.lang.String ()", new String[] {"5-7"}, null);
+        assertTrue(where.isSignatureMatching("java.lang.String ()"));
+        String[] lines = where.getLines();
+        Assertions.assertNotNull(lines);
+        Assertions.assertEquals(1, lines.length);
+        Assertions.assertEquals("5-7", lines[0]);
+    }
 
-  @Test
-  public void multiLines() {
-    Where where =
-        new Where(
-            "java.lang.Object",
-            "toString()",
-            "java.lang.String ()",
-            new String[] {"12-25", "42-45"},
-            null);
-    assertTrue(where.isSignatureMatching("java.lang.String ()"));
-    String[] lines = where.getLines();
-    Assertions.assertNotNull(lines);
-    Assertions.assertEquals(2, lines.length);
-    Assertions.assertEquals("12-25", lines[0]);
-    Assertions.assertEquals("42-45", lines[1]);
-  }
+    @Test
+    public void multiLines() {
+        Where where = new Where(
+                "java.lang.Object", "toString()", "java.lang.String ()", new String[] {"12-25", "42-45"}, null);
+        assertTrue(where.isSignatureMatching("java.lang.String ()"));
+        String[] lines = where.getLines();
+        Assertions.assertNotNull(lines);
+        Assertions.assertEquals(2, lines.length);
+        Assertions.assertEquals("12-25", lines[0]);
+        Assertions.assertEquals("42-45", lines[1]);
+    }
 
-  @Test
-  public void singleLine() {
-    Where where =
-        new Where(
-            "java.lang.Object", "toString()", "java.lang.String ()", new String[] {"12"}, null);
-    assertTrue(where.isSignatureMatching("java.lang.String ()"));
-    String[] lines = where.getLines();
-    Assertions.assertNotNull(lines);
-    Assertions.assertEquals(1, lines.length);
-    Assertions.assertEquals("12", lines[0]);
-  }
+    @Test
+    public void singleLine() {
+        Where where = new Where("java.lang.Object", "toString()", "java.lang.String ()", new String[] {"12"}, null);
+        assertTrue(where.isSignatureMatching("java.lang.String ()"));
+        String[] lines = where.getLines();
+        Assertions.assertNotNull(lines);
+        Assertions.assertEquals(1, lines.length);
+        Assertions.assertEquals("12", lines[0]);
+    }
 
-  @Test
-  public void noLines() {
-    Where where =
-        new Where(
-            "java.lang.Object",
-            "toString()",
-            "java.lang.String ()",
-            (Where.SourceLine[]) null,
-            null);
-    assertTrue(where.isSignatureMatching("java.lang.String ()"));
-    String[] lines = where.getLines();
-    Assertions.assertNull(lines);
-  }
+    @Test
+    public void noLines() {
+        Where where =
+                new Where("java.lang.Object", "toString()", "java.lang.String ()", (Where.SourceLine[]) null, null);
+        assertTrue(where.isSignatureMatching("java.lang.String ()"));
+        String[] lines = where.getLines();
+        Assertions.assertNull(lines);
+    }
 
-  @Test
-  public void linesRoundTrip() throws IOException {
-    JsonAdapter<Where.SourceLine[]> adapter =
-        MoshiHelper.createMoshiConfig().adapter(Where.SourceLine[].class);
+    @Test
+    public void linesRoundTrip() throws IOException {
+        JsonAdapter<Where.SourceLine[]> adapter =
+                MoshiHelper.createMoshiConfig().adapter(Where.SourceLine[].class);
 
-    String linesJson = "[\"12\",\"40-42\"]";
-    Where.SourceLine[] lines = adapter.fromJson(linesJson);
-    Assertions.assertEquals(2, lines.length);
-    Assertions.assertEquals(new Where.SourceLine(12), lines[0]);
-    Assertions.assertEquals(new Where.SourceLine(40, 42), lines[1]);
-    Assertions.assertEquals(linesJson, adapter.toJson(lines));
-  }
+        String linesJson = "[\"12\",\"40-42\"]";
+        Where.SourceLine[] lines = adapter.fromJson(linesJson);
+        Assertions.assertEquals(2, lines.length);
+        Assertions.assertEquals(new Where.SourceLine(12), lines[0]);
+        Assertions.assertEquals(new Where.SourceLine(40, 42), lines[1]);
+        Assertions.assertEquals(linesJson, adapter.toJson(lines));
+    }
 
-  @Test
-  public void convertLineToMethod() {
-    Where wherePut = Where.of("java.util.Map", "put", "(Object, Object)", "42");
-    ClassFileLines classFileLines = mock(ClassFileLines.class);
-    MethodNode methodNode = createMethodNode("put", "(Ljava/lang/Object;Ljava/lang/Object;)V");
-    when(classFileLines.getMethodsByLine(42)).thenReturn(Collections.singletonList(methodNode));
-    Where whereMapPut = Where.convertLineToMethod(wherePut, classFileLines);
-    assertEquals("java.util.Map", whereMapPut.getTypeName());
-    assertEquals("put", whereMapPut.getMethodName());
-    assertEquals("(java.lang.Object, java.lang.Object)", whereMapPut.getSignature());
-    assertNull(whereMapPut.getLines());
-  }
+    @Test
+    public void convertLineToMethod() {
+        Where wherePut = Where.of("java.util.Map", "put", "(Object, Object)", "42");
+        ClassFileLines classFileLines = mock(ClassFileLines.class);
+        MethodNode methodNode = createMethodNode("put", "(Ljava/lang/Object;Ljava/lang/Object;)V");
+        when(classFileLines.getMethodsByLine(42)).thenReturn(Collections.singletonList(methodNode));
+        Where whereMapPut = Where.convertLineToMethod(wherePut, classFileLines);
+        assertEquals("java.util.Map", whereMapPut.getTypeName());
+        assertEquals("put", whereMapPut.getMethodName());
+        assertEquals("(java.lang.Object, java.lang.Object)", whereMapPut.getSignature());
+        assertNull(whereMapPut.getLines());
+    }
 
-  @Test
-  public void methodMatching() {
-    Where where = new Where("String", "substring", "(int,int)", new String[0], null);
-    assertEquals(
-        Where.MethodMatching.MATCH,
-        where.isMethodMatching(createMethodNode("substring", "(II)Ljava/lang/String;"), null));
-    where = new Where("String", "replaceAll", "(String,String)", new String[0], null);
-    assertEquals(
-        Where.MethodMatching.MATCH,
-        where.isMethodMatching(
-            createMethodNode(
-                "replaceAll", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"),
-            null));
-    where = new Where("HashMap", "<init>", "(Map)", new String[0], null);
-    assertEquals(
-        Where.MethodMatching.MATCH,
-        where.isMethodMatching(createMethodNode("<init>", "(Ljava/util/Map;)V"), null));
-    where = new Where("ArrayList", "removeIf", "(Predicate)", new String[0], null);
-    assertEquals(
-        Where.MethodMatching.MATCH,
-        where.isMethodMatching(
-            createMethodNode("removeIf", "(Ljava/util/function/Predicate;)Z"), null));
-    where = new Where("String", "concat", "", new String[0], null);
-    assertEquals(
-        Where.MethodMatching.MATCH,
-        where.isMethodMatching(createMethodNode("concat", "String (String)"), null));
-    where = new Where("String", "concat", " \t", new String[0], null);
-    assertEquals(
-        Where.MethodMatching.MATCH,
-        where.isMethodMatching(createMethodNode("concat", "String (String)"), null));
-    where =
-        new Where(
-            "Inner",
-            "innerMethod",
-            "(com.datadog.debugger.probe.Outer$Inner)",
-            new String[0],
-            null);
-    assertEquals(
-        Where.MethodMatching.MATCH,
-        where.isMethodMatching(
-            createMethodNode("innerMethod", "(Lcom/datadog/debugger/probe/Outer$Inner;)V"), null));
-    where = new Where("Inner", "innerMethod", "(Outer$Inner)", new String[0], null);
-    assertEquals(
-        Where.MethodMatching.MATCH,
-        where.isMethodMatching(
-            createMethodNode("innerMethod", "(Lcom/datadog/debugger/probe/Outer$Inner;)V"), null));
-    where = new Where("MyClass", "myMethod", null, new String[] {"42"}, null);
-    ClassFileLines classFileLines = mock(ClassFileLines.class);
-    MethodNode myMethodNode = createMethodNode("myMethod", "()V");
-    when(classFileLines.getMethodsByLine(42)).thenReturn(Arrays.asList(myMethodNode));
-    assertEquals(Where.MethodMatching.MATCH, where.isMethodMatching(myMethodNode, classFileLines));
-  }
+    @Test
+    public void methodMatching() {
+        Where where = new Where("String", "substring", "(int,int)", new String[0], null);
+        assertEquals(
+                Where.MethodMatching.MATCH,
+                where.isMethodMatching(createMethodNode("substring", "(II)Ljava/lang/String;"), null));
+        where = new Where("String", "replaceAll", "(String,String)", new String[0], null);
+        assertEquals(
+                Where.MethodMatching.MATCH,
+                where.isMethodMatching(
+                        createMethodNode("replaceAll", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"),
+                        null));
+        where = new Where("HashMap", "<init>", "(Map)", new String[0], null);
+        assertEquals(
+                Where.MethodMatching.MATCH,
+                where.isMethodMatching(createMethodNode("<init>", "(Ljava/util/Map;)V"), null));
+        where = new Where("ArrayList", "removeIf", "(Predicate)", new String[0], null);
+        assertEquals(
+                Where.MethodMatching.MATCH,
+                where.isMethodMatching(createMethodNode("removeIf", "(Ljava/util/function/Predicate;)Z"), null));
+        where = new Where("String", "concat", "", new String[0], null);
+        assertEquals(
+                Where.MethodMatching.MATCH,
+                where.isMethodMatching(createMethodNode("concat", "String (String)"), null));
+        where = new Where("String", "concat", " \t", new String[0], null);
+        assertEquals(
+                Where.MethodMatching.MATCH,
+                where.isMethodMatching(createMethodNode("concat", "String (String)"), null));
+        where = new Where("Inner", "innerMethod", "(com.datadog.debugger.probe.Outer$Inner)", new String[0], null);
+        assertEquals(
+                Where.MethodMatching.MATCH,
+                where.isMethodMatching(
+                        createMethodNode("innerMethod", "(Lcom/datadog/debugger/probe/Outer$Inner;)V"), null));
+        where = new Where("Inner", "innerMethod", "(Outer$Inner)", new String[0], null);
+        assertEquals(
+                Where.MethodMatching.MATCH,
+                where.isMethodMatching(
+                        createMethodNode("innerMethod", "(Lcom/datadog/debugger/probe/Outer$Inner;)V"), null));
+        where = new Where("MyClass", "myMethod", null, new String[] {"42"}, null);
+        ClassFileLines classFileLines = mock(ClassFileLines.class);
+        MethodNode myMethodNode = createMethodNode("myMethod", "()V");
+        when(classFileLines.getMethodsByLine(42)).thenReturn(Arrays.asList(myMethodNode));
+        assertEquals(Where.MethodMatching.MATCH, where.isMethodMatching(myMethodNode, classFileLines));
+    }
 
-  private MethodNode createMethodNode(String name, String desc) {
-    MethodNode methodNode = new MethodNode();
-    methodNode.name = name;
-    methodNode.desc = desc;
-    return methodNode;
-  }
+    private MethodNode createMethodNode(String name, String desc) {
+        MethodNode methodNode = new MethodNode();
+        methodNode.name = name;
+        methodNode.desc = desc;
+        return methodNode;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java
index 56d251330bd..1f8b9cf09f7 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java
@@ -59,555 +59,543 @@
 
 @ExtendWith(MockitoExtension.class)
 public class DebuggerSinkTest {
-  private static final ProbeId PROBE_ID = new ProbeId("12fd-8490-c111-4374-ffde", 42);
-  private static final ProbeLocation PROBE_LOCATION =
-      new ProbeLocation("java.lang.String", "indexOf", null, null);
-  public static final int MAX_PAYLOAD = 5 * 1024 * 1024;
-
-  @Mock private Config config;
-  @Mock private BatchUploader snapshotUploader;
-  @Mock private BatchUploader logUploader;
-  @Captor private ArgumentCaptor<byte[]> payloadCaptor;
-
-  private String EXPECTED_SNAPSHOT_TAGS;
-  private ProbeStatusSink probeStatusSink;
-
-  @BeforeEach
-  void setUp() {
-    JsonSnapshotSerializer jsonSnapshotSerializer = new JsonSnapshotSerializer();
-    DebuggerContext.initValueSerializer(jsonSnapshotSerializer);
-    DebuggerAgentHelper.injectSerializer(jsonSnapshotSerializer);
-    when(config.getHostName()).thenReturn("host-name");
-    when(config.getServiceName()).thenReturn("service-name");
-    when(config.getEnv()).thenReturn("test");
-    when(config.getVersion()).thenReturn("foo");
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(1);
-    when(config.getFinalDebuggerSnapshotUrl())
-        .thenReturn("http://localhost:8126/debugger/v1/input");
-    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
-
-    EXPECTED_SNAPSHOT_TAGS =
-        "^env:test,version:foo,debugger_version:\\d+\\.\\d+\\.\\d+[^~]*~[0-9a-f]+,agent_version:[^,]+,host_name:"
-            + config.getHostName()
-            + "$";
-    probeStatusSink = new ProbeStatusSink(config, config.getFinalDebuggerSnapshotUrl(), false);
-  }
-
-  @ParameterizedTest(name = "Process tags enabled ''{0}''")
-  @ValueSource(booleans = {true, false})
-  public void addSnapshot(boolean processTagsEnabled) throws IOException {
-    when(config.isExperimentalPropagateProcessTagsEnabled()).thenReturn(processTagsEnabled);
-    ProcessTags.reset(config);
-    DebuggerSink sink = createDefaultDebuggerSink();
-    DebuggerAgentHelper.injectSerializer(new JsonSnapshotSerializer());
-    Snapshot snapshot = createSnapshot();
-    sink.addSnapshot(snapshot);
-    sink.lowRateFlush(sink);
-    verify(snapshotUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
-    String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
-    System.out.println(strPayload);
-    JsonSnapshotSerializer.IntakeRequest intakeRequest = assertOneIntakeRequest(strPayload);
-    assertEquals("dd_debugger", intakeRequest.getDdsource());
-    assertEquals("service-name", intakeRequest.getService());
-    assertEquals("java.lang.String", intakeRequest.getLoggerName());
-    assertEquals("indexOf", intakeRequest.getLoggerMethod());
-    assertEquals(PROBE_ID.getId(), intakeRequest.getDebugger().getSnapshot().getProbe().getId());
-    assertEquals(
-        PROBE_LOCATION, intakeRequest.getDebugger().getSnapshot().getProbe().getLocation());
-    assertTrue(
-        intakeRequest
-            .getDebugger()
-            .getRuntimeId()
-            .matches("[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}"));
-    if (processTagsEnabled) {
-      assertNotNull(ProcessTags.getTagsForSerialization());
-      assertEquals(
-          ProcessTags.getTagsForSerialization().toString(), intakeRequest.getProcessTags());
-    } else {
-      assertNull(intakeRequest.getProcessTags());
-    }
-  }
-
-  @Test
-  public void addMultipleSnapshots() throws IOException {
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(2);
-    DebuggerSink sink = createDefaultDebuggerSink();
-    DebuggerAgentHelper.injectSerializer(new JsonSnapshotSerializer());
-    Snapshot snapshot = createSnapshot();
-    Arrays.asList(snapshot, snapshot).forEach(sink::addSnapshot);
-    sink.lowRateFlush(sink);
-    verify(snapshotUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
-    String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
-    System.out.println(strPayload);
-    ParameterizedType type =
-        Types.newParameterizedType(List.class, JsonSnapshotSerializer.IntakeRequest.class);
-    JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>> adapter =
-        MoshiSnapshotTestHelper.createMoshiSnapshot().adapter(type);
-    List<JsonSnapshotSerializer.IntakeRequest> intakeRequests = adapter.fromJson(strPayload);
-    assertEquals(2, intakeRequests.size());
-  }
-
-  @Test
-  public void splitSnapshotBatch() {
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(10);
-    DebuggerSink sink = createDefaultDebuggerSink();
-    DebuggerAgentHelper.injectSerializer(new JsonSnapshotSerializer());
-    Snapshot largeSnapshot = createSnapshot();
-    for (int i = 0; i < 15_000; i++) {
-      largeSnapshot.getStack().add(new CapturedStackFrame("f" + i, i));
-    }
-    for (int i = 0; i < 10; i++) {
-      sink.addSnapshot(largeSnapshot);
-    }
-    sink.lowRateFlush(sink);
-    verify(snapshotUploader, times(2))
-        .upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
-    Assertions.assertTrue(payloadCaptor.getAllValues().get(0).length < MAX_PAYLOAD);
-    Assertions.assertTrue(payloadCaptor.getAllValues().get(1).length < MAX_PAYLOAD);
-  }
-
-  @Test
-  public void tooLargeSnapshot() {
-    DebuggerSink sink = createDefaultDebuggerSink();
-    Snapshot largeSnapshot = createSnapshot();
-    for (int i = 0; i < 150_000; i++) {
-      largeSnapshot.getStack().add(new CapturedStackFrame("f" + i, i));
-    }
-    sink.addSnapshot(largeSnapshot);
-    sink.lowRateFlush(sink);
-    verifyNoInteractions(snapshotUploader);
-  }
-
-  @Test
-  public void tooLargeUTF8Snapshot() {
-    DebuggerSink sink = createDefaultDebuggerSink();
-    Snapshot largeSnapshot = createSnapshot();
-    for (int i = 0; i < 140_000; i++) {
-      largeSnapshot.getStack().add(new CapturedStackFrame("f€" + i, i));
-    }
-    sink.addSnapshot(largeSnapshot);
-    sink.lowRateFlush(sink);
-    verifyNoInteractions(snapshotUploader);
-  }
-
-  static class Node {
-    String name;
-    List<Node> children;
-
-    public Node(String name, List<Node> children) {
-      this.name = name;
-      this.children = children;
-    }
-  }
-
-  @Test
-  public void pruneTooLargeSnapshot() {
-    DebuggerSink sink = createDefaultDebuggerSink();
-    char[] chars = new char[Limits.DEFAULT_LENGTH];
-    Arrays.fill(chars, 'a');
-    String strPayLoad = new String(chars);
-    List<Node> children = createChildren(3, strPayLoad);
-    Node root = new Node("ROOT", children);
-    CapturedValue rootLocal =
-        CapturedValue.of(
-            "root",
-            Node.class.getTypeName(),
-            root,
-            5,
-            Limits.DEFAULT_COLLECTION_SIZE,
-            Limits.DEFAULT_LENGTH,
-            Limits.DEFAULT_FIELD_COUNT);
-    CapturedContext context = new CapturedContext();
-    context.addLocals(new CapturedValue[] {rootLocal});
-    Snapshot largeSnapshot =
-        new Snapshot(
-            Thread.currentThread(),
-            new ProbeImplementation.NoopProbeImplementation(PROBE_ID, PROBE_LOCATION),
-            5);
-    largeSnapshot.setEntry(context);
-    sink.addSnapshot(largeSnapshot);
-    sink.lowRateFlush(sink);
-    verify(snapshotUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
-    String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
-    assertTrue(strPayload.length() < SnapshotSink.MAX_SNAPSHOT_SIZE);
-  }
-
-  private List<Node> createChildren(int level, String strPayLoad) {
-    if (level == 0) {
-      return Collections.emptyList();
-    }
-    ArrayList<Node> list = new ArrayList<>();
-    for (int i = 0; i < Limits.DEFAULT_COLLECTION_SIZE; i++) {
-      list.add(new Node(strPayLoad, createChildren(level - 1, strPayLoad)));
-    }
-    return list;
-  }
-
-  @Test
-  public void addNoSnapshots() {
-    DebuggerSink sink = createDefaultDebuggerSink();
-    sink.lowRateFlush(sink);
-    verifyNoInteractions(snapshotUploader);
-  }
-
-  @Test
-  public void addDiagnostics() throws IOException {
-    BatchUploader diagnosticUploader = mock(BatchUploader.class);
-    DebuggerSink sink = createDebuggerSink(diagnosticUploader, false);
-    sink.addReceived(new ProbeId("1", 2));
-    sink.lowRateFlush(sink);
-    verify(diagnosticUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
-    String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
-    System.out.println(strPayload);
-    ParameterizedType type = Types.newParameterizedType(List.class, ProbeStatus.class);
-    JsonAdapter<List<ProbeStatus>> adapter = MoshiHelper.createMoshiProbeStatus().adapter(type);
-    List<ProbeStatus> statuses = adapter.fromJson(strPayload);
-    assertEquals(1, statuses.size());
-    ProbeStatus status = statuses.get(0);
-    assertEquals("dd_debugger", status.getDdSource());
-    assertEquals("Received probe ProbeId{id='1', version=2}.", status.getMessage());
-    assertEquals("service-name", status.getService());
-    assertEquals(ProbeStatus.Status.RECEIVED, status.getDiagnostics().getStatus());
-    assertEquals("1", status.getDiagnostics().getProbeId().getId());
-  }
-
-  @Test
-  public void addDiagnosticsDebuggerTrack() throws IOException {
-    BatchUploader diagnosticUploader = mock(BatchUploader.class);
-    DebuggerSink sink = createDebuggerSink(diagnosticUploader, true);
-    sink.addReceived(new ProbeId("1", 2));
-    sink.lowRateFlush(sink);
-    ArgumentCaptor<BatchUploader.MultiPartContent> partCaptor =
-        ArgumentCaptor.forClass(BatchUploader.MultiPartContent.class);
-    verify(diagnosticUploader).uploadAsMultipart(anyString(), partCaptor.capture());
-    String strPayload =
-        new String(partCaptor.getAllValues().get(0).getContent(), StandardCharsets.UTF_8);
-    System.out.println(strPayload);
-    ParameterizedType type = Types.newParameterizedType(List.class, ProbeStatus.class);
-    JsonAdapter<List<ProbeStatus>> adapter = MoshiHelper.createMoshiProbeStatus().adapter(type);
-    List<ProbeStatus> statuses = adapter.fromJson(strPayload);
-    assertEquals(1, statuses.size());
-    ProbeStatus status = statuses.get(0);
-    assertEquals("dd_debugger", status.getDdSource());
-    assertEquals("Received probe ProbeId{id='1', version=2}.", status.getMessage());
-    assertEquals("service-name", status.getService());
-    assertEquals(ProbeStatus.Status.RECEIVED, status.getDiagnostics().getStatus());
-    assertEquals("1", status.getDiagnostics().getProbeId().getId());
-  }
-
-  @Test
-  public void addMultipleDiagnostics() throws IOException {
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
-    BatchUploader diagnosticUploader = mock(BatchUploader.class);
-    DebuggerSink sink = createDebuggerSink(diagnosticUploader, false);
-    for (String probeId : Arrays.asList("1", "2")) {
-      sink.addReceived(new ProbeId(probeId, 1));
-    }
-    sink.lowRateFlush(sink);
-    verify(diagnosticUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
-    String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
-    System.out.println(strPayload);
-    ParameterizedType type = Types.newParameterizedType(List.class, ProbeStatus.class);
-    JsonAdapter<List<ProbeStatus>> adapter = MoshiHelper.createMoshiProbeStatus().adapter(type);
-    List<ProbeStatus> statuses = adapter.fromJson(strPayload);
-    assertEquals(2, statuses.size());
-  }
-
-  @Test
-  public void addMultipleDiagnosticsDebuggerTrack() throws IOException {
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
-    BatchUploader diagnosticUploader = mock(BatchUploader.class);
-    DebuggerSink sink = createDebuggerSink(diagnosticUploader, true);
-    for (String probeId : Arrays.asList("1", "2")) {
-      sink.addReceived(new ProbeId(probeId, 1));
-    }
-    sink.lowRateFlush(sink);
-    ArgumentCaptor<BatchUploader.MultiPartContent> partCaptor =
-        ArgumentCaptor.forClass(BatchUploader.MultiPartContent.class);
-    verify(diagnosticUploader).uploadAsMultipart(anyString(), partCaptor.capture());
-    String strPayload =
-        new String(partCaptor.getAllValues().get(0).getContent(), StandardCharsets.UTF_8);
-    System.out.println(strPayload);
-    ParameterizedType type = Types.newParameterizedType(List.class, ProbeStatus.class);
-    JsonAdapter<List<ProbeStatus>> adapter = MoshiHelper.createMoshiProbeStatus().adapter(type);
-    List<ProbeStatus> statuses = adapter.fromJson(strPayload);
-    assertEquals(2, statuses.size());
-  }
-
-  @Test
-  public void splitDiagnosticsBatch() {
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
-    BatchUploader diagnosticUploader = mock(BatchUploader.class);
-    DebuggerSink sink = createDebuggerSink(diagnosticUploader, false);
-    StringBuilder largeMessageBuilder = new StringBuilder(100_001);
-    for (int i = 0; i < 100_000; i++) {
-      largeMessageBuilder.append('f');
-    }
-    String largeMessage = largeMessageBuilder.toString();
-    for (int i = 0; i < 100; i++) {
-      sink.getProbeDiagnosticsSink().addError(new ProbeId(String.valueOf(i), i), largeMessage);
-    }
-    sink.lowRateFlush(sink);
-    verify(diagnosticUploader, times(2))
-        .upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
-    Assertions.assertTrue(payloadCaptor.getAllValues().get(0).length < MAX_PAYLOAD);
-    Assertions.assertTrue(payloadCaptor.getAllValues().get(1).length < MAX_PAYLOAD);
-  }
-
-  @Test
-  public void splitDiagnosticsBatchDebuggerTrack() {
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
-    BatchUploader diagnosticUploader = mock(BatchUploader.class);
-    DebuggerSink sink = createDebuggerSink(diagnosticUploader, true);
-    StringBuilder largeMessageBuilder = new StringBuilder(100_001);
-    for (int i = 0; i < 100_000; i++) {
-      largeMessageBuilder.append('f');
-    }
-    String largeMessage = largeMessageBuilder.toString();
-    for (int i = 0; i < 100; i++) {
-      sink.getProbeDiagnosticsSink().addError(new ProbeId(String.valueOf(i), i), largeMessage);
-    }
-    sink.lowRateFlush(sink);
-    ArgumentCaptor<BatchUploader.MultiPartContent> partCaptor =
-        ArgumentCaptor.forClass(BatchUploader.MultiPartContent.class);
-    verify(diagnosticUploader, times(2)).uploadAsMultipart(anyString(), partCaptor.capture());
-    Assertions.assertTrue(partCaptor.getAllValues().get(0).getContent().length < MAX_PAYLOAD);
-    Assertions.assertTrue(partCaptor.getAllValues().get(1).getContent().length < MAX_PAYLOAD);
-  }
-
-  @Test
-  public void tooLargeDiagnostic() {
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
-    DebuggerSink sink = createDefaultDebuggerSink();
-    StringBuilder tooLargeMessageBuilder = new StringBuilder(MAX_PAYLOAD + 1);
-    for (int i = 0; i < MAX_PAYLOAD; i++) {
-      tooLargeMessageBuilder.append('f');
-    }
-    String tooLargeMessage = tooLargeMessageBuilder.toString();
-    sink.getProbeDiagnosticsSink().addError(new ProbeId("1", 1), tooLargeMessage);
-    sink.lowRateFlush(sink);
-    verifyNoInteractions(snapshotUploader);
-  }
-
-  @Test
-  public void tooLargeUTF8Diagnostic() {
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
-    DebuggerSink sink = createDefaultDebuggerSink();
-    StringBuilder tooLargeMessageBuilder = new StringBuilder(MAX_PAYLOAD + 4);
-    for (int i = 0; i < MAX_PAYLOAD; i += 4) {
-      tooLargeMessageBuilder.append("\uD80C\uDCF0"); // 4 bytes
-    }
-    String tooLargeMessage = tooLargeMessageBuilder.toString();
-    sink.getProbeDiagnosticsSink().addError(new ProbeId("1", 1), tooLargeMessage);
-    sink.lowRateFlush(sink);
-    verifyNoInteractions(snapshotUploader);
-  }
-
-  @Test
-  public void addNoDiagnostic() {
-    DebuggerSink sink = createDefaultDebuggerSink();
-    sink.lowRateFlush(sink);
-    verifyNoInteractions(snapshotUploader);
-  }
-
-  @Test
-  public void reconsiderFlushIntervalIncreaseFlushInterval() {
-    DebuggerSink sink = createDefaultDebuggerSink();
-    long currentFlushInterval = sink.getCurrentLowRateFlushInterval();
-    Snapshot snapshot = createSnapshot();
-    sink.addSnapshot(snapshot);
-    sink.doReconsiderLowRateFlushInterval();
-    long newFlushInterval = sink.getCurrentLowRateFlushInterval();
-    assertEquals(currentFlushInterval + DebuggerSink.LOW_RATE_STEP_SIZE, newFlushInterval);
-  }
-
-  @Test
-  public void reconsiderFlushIntervalDecreaseFlushInterval() {
-    DebuggerSink sink = createDefaultDebuggerSink();
-    long currentFlushInterval = sink.getCurrentLowRateFlushInterval();
-    sink.lowRateFlush(sink);
-    Snapshot snapshot = createSnapshot();
-    for (int i = 0; i < 1000; i++) {
-      sink.addSnapshot(snapshot);
-    }
-    sink.doReconsiderLowRateFlushInterval();
-    long newFlushInterval = sink.getCurrentLowRateFlushInterval();
-    assertEquals(currentFlushInterval - DebuggerSink.LOW_RATE_STEP_SIZE, newFlushInterval);
-  }
-
-  @Test
-  public void reconsiderFlushIntervalNoChange() {
-    DebuggerSink sink = createDefaultDebuggerSink();
-    long currentFlushInterval = sink.getCurrentLowRateFlushInterval();
-    Snapshot snapshot = createSnapshot();
-    for (int i = 0; i < 500; i++) {
-      sink.addSnapshot(snapshot);
-    }
-    sink.doReconsiderLowRateFlushInterval();
-    long newFlushInterval = sink.getCurrentLowRateFlushInterval();
-    assertEquals(currentFlushInterval, newFlushInterval);
-  }
-
-  @Test
-  public void addSnapshotWithCorrelationIdsMethodProbe() throws IOException {
-    DebuggerSink sink = createDefaultDebuggerSink();
-    DebuggerAgentHelper.injectSerializer(new JsonSnapshotSerializer());
-    Snapshot snapshot = createSnapshot();
-    snapshot.setTraceId("123");
-    snapshot.setSpanId("456");
-    sink.addSnapshot(snapshot);
-    sink.lowRateFlush(sink);
-    verify(snapshotUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
-    String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
-    System.out.println(strPayload);
-    JsonSnapshotSerializer.IntakeRequest intakeRequest = assertOneIntakeRequest(strPayload);
-    assertEquals("123", intakeRequest.getTraceId());
-    assertEquals("456", intakeRequest.getSpanId());
-  }
-
-  @Test
-  public void addSnapshotWithEvalErrors() throws IOException {
-    DebuggerSink sink = createDefaultDebuggerSink();
-    DebuggerAgentHelper.injectSerializer(new JsonSnapshotSerializer());
-    CapturedContext entry = new CapturedContext();
-    Snapshot snapshot = createSnapshot();
-    snapshot.setEntry(entry);
-    snapshot.addEvaluationErrors(
-        Arrays.asList(new EvaluationError("obj.field", "Cannot dereference obj")));
-    sink.addSnapshot(snapshot);
-    sink.lowRateFlush(sink);
-    verify(snapshotUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
-    String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
-    System.out.println(strPayload);
-    JsonSnapshotSerializer.IntakeRequest intakeRequest = assertOneIntakeRequest(strPayload);
-    List<EvaluationError> evaluationErrors =
-        intakeRequest.getDebugger().getSnapshot().getEvaluationErrors();
-    assertEquals(1, evaluationErrors.size());
-    assertEquals("obj.field", evaluationErrors.get(0).getExpr());
-    assertEquals("Cannot dereference obj", evaluationErrors.get(0).getMessage());
-  }
-
-  @Test
-  public void addDiagnostic() {
-    DebuggerSink sink = createDefaultDebuggerSink();
-    DiagnosticMessage info = new DiagnosticMessage(DiagnosticMessage.Kind.INFO, "info message");
-    DiagnosticMessage warn = new DiagnosticMessage(DiagnosticMessage.Kind.WARN, "info message");
-    DiagnosticMessage error = new DiagnosticMessage(DiagnosticMessage.Kind.ERROR, "info message");
-    sink.addDiagnostics(PROBE_ID, Arrays.asList(info, warn, error));
-    // ensure just that the code is executed to have coverage (just logging)
-  }
-
-  @Test
-  public void skipSnapshot() {
-    DebuggerMetricCollector metricCollector = spy(DebuggerMetricCollector.get());
-    SnapshotSink snapshotSink =
-        new SnapshotSink(
-            config,
-            "",
-            new BatchUploader(
-                "Snapshots",
+    private static final ProbeId PROBE_ID = new ProbeId("12fd-8490-c111-4374-ffde", 42);
+    private static final ProbeLocation PROBE_LOCATION = new ProbeLocation("java.lang.String", "indexOf", null, null);
+    public static final int MAX_PAYLOAD = 5 * 1024 * 1024;
+
+    @Mock
+    private Config config;
+
+    @Mock
+    private BatchUploader snapshotUploader;
+
+    @Mock
+    private BatchUploader logUploader;
+
+    @Captor
+    private ArgumentCaptor<byte[]> payloadCaptor;
+
+    private String EXPECTED_SNAPSHOT_TAGS;
+    private ProbeStatusSink probeStatusSink;
+
+    @BeforeEach
+    void setUp() {
+        JsonSnapshotSerializer jsonSnapshotSerializer = new JsonSnapshotSerializer();
+        DebuggerContext.initValueSerializer(jsonSnapshotSerializer);
+        DebuggerAgentHelper.injectSerializer(jsonSnapshotSerializer);
+        when(config.getHostName()).thenReturn("host-name");
+        when(config.getServiceName()).thenReturn("service-name");
+        when(config.getEnv()).thenReturn("test");
+        when(config.getVersion()).thenReturn("foo");
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(1);
+        when(config.getFinalDebuggerSnapshotUrl()).thenReturn("http://localhost:8126/debugger/v1/input");
+        when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+
+        EXPECTED_SNAPSHOT_TAGS =
+                "^env:test,version:foo,debugger_version:\\d+\\.\\d+\\.\\d+[^~]*~[0-9a-f]+,agent_version:[^,]+,host_name:"
+                        + config.getHostName()
+                        + "$";
+        probeStatusSink = new ProbeStatusSink(config, config.getFinalDebuggerSnapshotUrl(), false);
+    }
+
+    @ParameterizedTest(name = "Process tags enabled ''{0}''")
+    @ValueSource(booleans = {true, false})
+    public void addSnapshot(boolean processTagsEnabled) throws IOException {
+        when(config.isExperimentalPropagateProcessTagsEnabled()).thenReturn(processTagsEnabled);
+        ProcessTags.reset(config);
+        DebuggerSink sink = createDefaultDebuggerSink();
+        DebuggerAgentHelper.injectSerializer(new JsonSnapshotSerializer());
+        Snapshot snapshot = createSnapshot();
+        sink.addSnapshot(snapshot);
+        sink.lowRateFlush(sink);
+        verify(snapshotUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
+        String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
+        System.out.println(strPayload);
+        JsonSnapshotSerializer.IntakeRequest intakeRequest = assertOneIntakeRequest(strPayload);
+        assertEquals("dd_debugger", intakeRequest.getDdsource());
+        assertEquals("service-name", intakeRequest.getService());
+        assertEquals("java.lang.String", intakeRequest.getLoggerName());
+        assertEquals("indexOf", intakeRequest.getLoggerMethod());
+        assertEquals(
+                PROBE_ID.getId(),
+                intakeRequest.getDebugger().getSnapshot().getProbe().getId());
+        assertEquals(
+                PROBE_LOCATION,
+                intakeRequest.getDebugger().getSnapshot().getProbe().getLocation());
+        assertTrue(intakeRequest
+                .getDebugger()
+                .getRuntimeId()
+                .matches("[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}"));
+        if (processTagsEnabled) {
+            assertNotNull(ProcessTags.getTagsForSerialization());
+            assertEquals(ProcessTags.getTagsForSerialization().toString(), intakeRequest.getProcessTags());
+        } else {
+            assertNull(intakeRequest.getProcessTags());
+        }
+    }
+
+    @Test
+    public void addMultipleSnapshots() throws IOException {
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(2);
+        DebuggerSink sink = createDefaultDebuggerSink();
+        DebuggerAgentHelper.injectSerializer(new JsonSnapshotSerializer());
+        Snapshot snapshot = createSnapshot();
+        Arrays.asList(snapshot, snapshot).forEach(sink::addSnapshot);
+        sink.lowRateFlush(sink);
+        verify(snapshotUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
+        String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
+        System.out.println(strPayload);
+        ParameterizedType type = Types.newParameterizedType(List.class, JsonSnapshotSerializer.IntakeRequest.class);
+        JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>> adapter =
+                MoshiSnapshotTestHelper.createMoshiSnapshot().adapter(type);
+        List<JsonSnapshotSerializer.IntakeRequest> intakeRequests = adapter.fromJson(strPayload);
+        assertEquals(2, intakeRequests.size());
+    }
+
+    @Test
+    public void splitSnapshotBatch() {
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(10);
+        DebuggerSink sink = createDefaultDebuggerSink();
+        DebuggerAgentHelper.injectSerializer(new JsonSnapshotSerializer());
+        Snapshot largeSnapshot = createSnapshot();
+        for (int i = 0; i < 15_000; i++) {
+            largeSnapshot.getStack().add(new CapturedStackFrame("f" + i, i));
+        }
+        for (int i = 0; i < 10; i++) {
+            sink.addSnapshot(largeSnapshot);
+        }
+        sink.lowRateFlush(sink);
+        verify(snapshotUploader, times(2)).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
+        Assertions.assertTrue(payloadCaptor.getAllValues().get(0).length < MAX_PAYLOAD);
+        Assertions.assertTrue(payloadCaptor.getAllValues().get(1).length < MAX_PAYLOAD);
+    }
+
+    @Test
+    public void tooLargeSnapshot() {
+        DebuggerSink sink = createDefaultDebuggerSink();
+        Snapshot largeSnapshot = createSnapshot();
+        for (int i = 0; i < 150_000; i++) {
+            largeSnapshot.getStack().add(new CapturedStackFrame("f" + i, i));
+        }
+        sink.addSnapshot(largeSnapshot);
+        sink.lowRateFlush(sink);
+        verifyNoInteractions(snapshotUploader);
+    }
+
+    @Test
+    public void tooLargeUTF8Snapshot() {
+        DebuggerSink sink = createDefaultDebuggerSink();
+        Snapshot largeSnapshot = createSnapshot();
+        for (int i = 0; i < 140_000; i++) {
+            largeSnapshot.getStack().add(new CapturedStackFrame("f€" + i, i));
+        }
+        sink.addSnapshot(largeSnapshot);
+        sink.lowRateFlush(sink);
+        verifyNoInteractions(snapshotUploader);
+    }
+
+    static class Node {
+        String name;
+        List<Node> children;
+
+        public Node(String name, List<Node> children) {
+            this.name = name;
+            this.children = children;
+        }
+    }
+
+    @Test
+    public void pruneTooLargeSnapshot() {
+        DebuggerSink sink = createDefaultDebuggerSink();
+        char[] chars = new char[Limits.DEFAULT_LENGTH];
+        Arrays.fill(chars, 'a');
+        String strPayLoad = new String(chars);
+        List<Node> children = createChildren(3, strPayLoad);
+        Node root = new Node("ROOT", children);
+        CapturedValue rootLocal = CapturedValue.of(
+                "root",
+                Node.class.getTypeName(),
+                root,
+                5,
+                Limits.DEFAULT_COLLECTION_SIZE,
+                Limits.DEFAULT_LENGTH,
+                Limits.DEFAULT_FIELD_COUNT);
+        CapturedContext context = new CapturedContext();
+        context.addLocals(new CapturedValue[] {rootLocal});
+        Snapshot largeSnapshot = new Snapshot(
+                Thread.currentThread(), new ProbeImplementation.NoopProbeImplementation(PROBE_ID, PROBE_LOCATION), 5);
+        largeSnapshot.setEntry(context);
+        sink.addSnapshot(largeSnapshot);
+        sink.lowRateFlush(sink);
+        verify(snapshotUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
+        String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
+        assertTrue(strPayload.length() < SnapshotSink.MAX_SNAPSHOT_SIZE);
+    }
+
+    private List<Node> createChildren(int level, String strPayLoad) {
+        if (level == 0) {
+            return Collections.emptyList();
+        }
+        ArrayList<Node> list = new ArrayList<>();
+        for (int i = 0; i < Limits.DEFAULT_COLLECTION_SIZE; i++) {
+            list.add(new Node(strPayLoad, createChildren(level - 1, strPayLoad)));
+        }
+        return list;
+    }
+
+    @Test
+    public void addNoSnapshots() {
+        DebuggerSink sink = createDefaultDebuggerSink();
+        sink.lowRateFlush(sink);
+        verifyNoInteractions(snapshotUploader);
+    }
+
+    @Test
+    public void addDiagnostics() throws IOException {
+        BatchUploader diagnosticUploader = mock(BatchUploader.class);
+        DebuggerSink sink = createDebuggerSink(diagnosticUploader, false);
+        sink.addReceived(new ProbeId("1", 2));
+        sink.lowRateFlush(sink);
+        verify(diagnosticUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
+        String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
+        System.out.println(strPayload);
+        ParameterizedType type = Types.newParameterizedType(List.class, ProbeStatus.class);
+        JsonAdapter<List<ProbeStatus>> adapter =
+                MoshiHelper.createMoshiProbeStatus().adapter(type);
+        List<ProbeStatus> statuses = adapter.fromJson(strPayload);
+        assertEquals(1, statuses.size());
+        ProbeStatus status = statuses.get(0);
+        assertEquals("dd_debugger", status.getDdSource());
+        assertEquals("Received probe ProbeId{id='1', version=2}.", status.getMessage());
+        assertEquals("service-name", status.getService());
+        assertEquals(ProbeStatus.Status.RECEIVED, status.getDiagnostics().getStatus());
+        assertEquals("1", status.getDiagnostics().getProbeId().getId());
+    }
+
+    @Test
+    public void addDiagnosticsDebuggerTrack() throws IOException {
+        BatchUploader diagnosticUploader = mock(BatchUploader.class);
+        DebuggerSink sink = createDebuggerSink(diagnosticUploader, true);
+        sink.addReceived(new ProbeId("1", 2));
+        sink.lowRateFlush(sink);
+        ArgumentCaptor<BatchUploader.MultiPartContent> partCaptor =
+                ArgumentCaptor.forClass(BatchUploader.MultiPartContent.class);
+        verify(diagnosticUploader).uploadAsMultipart(anyString(), partCaptor.capture());
+        String strPayload = new String(partCaptor.getAllValues().get(0).getContent(), StandardCharsets.UTF_8);
+        System.out.println(strPayload);
+        ParameterizedType type = Types.newParameterizedType(List.class, ProbeStatus.class);
+        JsonAdapter<List<ProbeStatus>> adapter =
+                MoshiHelper.createMoshiProbeStatus().adapter(type);
+        List<ProbeStatus> statuses = adapter.fromJson(strPayload);
+        assertEquals(1, statuses.size());
+        ProbeStatus status = statuses.get(0);
+        assertEquals("dd_debugger", status.getDdSource());
+        assertEquals("Received probe ProbeId{id='1', version=2}.", status.getMessage());
+        assertEquals("service-name", status.getService());
+        assertEquals(ProbeStatus.Status.RECEIVED, status.getDiagnostics().getStatus());
+        assertEquals("1", status.getDiagnostics().getProbeId().getId());
+    }
+
+    @Test
+    public void addMultipleDiagnostics() throws IOException {
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
+        BatchUploader diagnosticUploader = mock(BatchUploader.class);
+        DebuggerSink sink = createDebuggerSink(diagnosticUploader, false);
+        for (String probeId : Arrays.asList("1", "2")) {
+            sink.addReceived(new ProbeId(probeId, 1));
+        }
+        sink.lowRateFlush(sink);
+        verify(diagnosticUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
+        String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
+        System.out.println(strPayload);
+        ParameterizedType type = Types.newParameterizedType(List.class, ProbeStatus.class);
+        JsonAdapter<List<ProbeStatus>> adapter =
+                MoshiHelper.createMoshiProbeStatus().adapter(type);
+        List<ProbeStatus> statuses = adapter.fromJson(strPayload);
+        assertEquals(2, statuses.size());
+    }
+
+    @Test
+    public void addMultipleDiagnosticsDebuggerTrack() throws IOException {
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
+        BatchUploader diagnosticUploader = mock(BatchUploader.class);
+        DebuggerSink sink = createDebuggerSink(diagnosticUploader, true);
+        for (String probeId : Arrays.asList("1", "2")) {
+            sink.addReceived(new ProbeId(probeId, 1));
+        }
+        sink.lowRateFlush(sink);
+        ArgumentCaptor<BatchUploader.MultiPartContent> partCaptor =
+                ArgumentCaptor.forClass(BatchUploader.MultiPartContent.class);
+        verify(diagnosticUploader).uploadAsMultipart(anyString(), partCaptor.capture());
+        String strPayload = new String(partCaptor.getAllValues().get(0).getContent(), StandardCharsets.UTF_8);
+        System.out.println(strPayload);
+        ParameterizedType type = Types.newParameterizedType(List.class, ProbeStatus.class);
+        JsonAdapter<List<ProbeStatus>> adapter =
+                MoshiHelper.createMoshiProbeStatus().adapter(type);
+        List<ProbeStatus> statuses = adapter.fromJson(strPayload);
+        assertEquals(2, statuses.size());
+    }
+
+    @Test
+    public void splitDiagnosticsBatch() {
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
+        BatchUploader diagnosticUploader = mock(BatchUploader.class);
+        DebuggerSink sink = createDebuggerSink(diagnosticUploader, false);
+        StringBuilder largeMessageBuilder = new StringBuilder(100_001);
+        for (int i = 0; i < 100_000; i++) {
+            largeMessageBuilder.append('f');
+        }
+        String largeMessage = largeMessageBuilder.toString();
+        for (int i = 0; i < 100; i++) {
+            sink.getProbeDiagnosticsSink().addError(new ProbeId(String.valueOf(i), i), largeMessage);
+        }
+        sink.lowRateFlush(sink);
+        verify(diagnosticUploader, times(2)).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
+        Assertions.assertTrue(payloadCaptor.getAllValues().get(0).length < MAX_PAYLOAD);
+        Assertions.assertTrue(payloadCaptor.getAllValues().get(1).length < MAX_PAYLOAD);
+    }
+
+    @Test
+    public void splitDiagnosticsBatchDebuggerTrack() {
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
+        BatchUploader diagnosticUploader = mock(BatchUploader.class);
+        DebuggerSink sink = createDebuggerSink(diagnosticUploader, true);
+        StringBuilder largeMessageBuilder = new StringBuilder(100_001);
+        for (int i = 0; i < 100_000; i++) {
+            largeMessageBuilder.append('f');
+        }
+        String largeMessage = largeMessageBuilder.toString();
+        for (int i = 0; i < 100; i++) {
+            sink.getProbeDiagnosticsSink().addError(new ProbeId(String.valueOf(i), i), largeMessage);
+        }
+        sink.lowRateFlush(sink);
+        ArgumentCaptor<BatchUploader.MultiPartContent> partCaptor =
+                ArgumentCaptor.forClass(BatchUploader.MultiPartContent.class);
+        verify(diagnosticUploader, times(2)).uploadAsMultipart(anyString(), partCaptor.capture());
+        Assertions.assertTrue(partCaptor.getAllValues().get(0).getContent().length < MAX_PAYLOAD);
+        Assertions.assertTrue(partCaptor.getAllValues().get(1).getContent().length < MAX_PAYLOAD);
+    }
+
+    @Test
+    public void tooLargeDiagnostic() {
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
+        DebuggerSink sink = createDefaultDebuggerSink();
+        StringBuilder tooLargeMessageBuilder = new StringBuilder(MAX_PAYLOAD + 1);
+        for (int i = 0; i < MAX_PAYLOAD; i++) {
+            tooLargeMessageBuilder.append('f');
+        }
+        String tooLargeMessage = tooLargeMessageBuilder.toString();
+        sink.getProbeDiagnosticsSink().addError(new ProbeId("1", 1), tooLargeMessage);
+        sink.lowRateFlush(sink);
+        verifyNoInteractions(snapshotUploader);
+    }
+
+    @Test
+    public void tooLargeUTF8Diagnostic() {
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
+        DebuggerSink sink = createDefaultDebuggerSink();
+        StringBuilder tooLargeMessageBuilder = new StringBuilder(MAX_PAYLOAD + 4);
+        for (int i = 0; i < MAX_PAYLOAD; i += 4) {
+            tooLargeMessageBuilder.append("\uD80C\uDCF0"); // 4 bytes
+        }
+        String tooLargeMessage = tooLargeMessageBuilder.toString();
+        sink.getProbeDiagnosticsSink().addError(new ProbeId("1", 1), tooLargeMessage);
+        sink.lowRateFlush(sink);
+        verifyNoInteractions(snapshotUploader);
+    }
+
+    @Test
+    public void addNoDiagnostic() {
+        DebuggerSink sink = createDefaultDebuggerSink();
+        sink.lowRateFlush(sink);
+        verifyNoInteractions(snapshotUploader);
+    }
+
+    @Test
+    public void reconsiderFlushIntervalIncreaseFlushInterval() {
+        DebuggerSink sink = createDefaultDebuggerSink();
+        long currentFlushInterval = sink.getCurrentLowRateFlushInterval();
+        Snapshot snapshot = createSnapshot();
+        sink.addSnapshot(snapshot);
+        sink.doReconsiderLowRateFlushInterval();
+        long newFlushInterval = sink.getCurrentLowRateFlushInterval();
+        assertEquals(currentFlushInterval + DebuggerSink.LOW_RATE_STEP_SIZE, newFlushInterval);
+    }
+
+    @Test
+    public void reconsiderFlushIntervalDecreaseFlushInterval() {
+        DebuggerSink sink = createDefaultDebuggerSink();
+        long currentFlushInterval = sink.getCurrentLowRateFlushInterval();
+        sink.lowRateFlush(sink);
+        Snapshot snapshot = createSnapshot();
+        for (int i = 0; i < 1000; i++) {
+            sink.addSnapshot(snapshot);
+        }
+        sink.doReconsiderLowRateFlushInterval();
+        long newFlushInterval = sink.getCurrentLowRateFlushInterval();
+        assertEquals(currentFlushInterval - DebuggerSink.LOW_RATE_STEP_SIZE, newFlushInterval);
+    }
+
+    @Test
+    public void reconsiderFlushIntervalNoChange() {
+        DebuggerSink sink = createDefaultDebuggerSink();
+        long currentFlushInterval = sink.getCurrentLowRateFlushInterval();
+        Snapshot snapshot = createSnapshot();
+        for (int i = 0; i < 500; i++) {
+            sink.addSnapshot(snapshot);
+        }
+        sink.doReconsiderLowRateFlushInterval();
+        long newFlushInterval = sink.getCurrentLowRateFlushInterval();
+        assertEquals(currentFlushInterval, newFlushInterval);
+    }
+
+    @Test
+    public void addSnapshotWithCorrelationIdsMethodProbe() throws IOException {
+        DebuggerSink sink = createDefaultDebuggerSink();
+        DebuggerAgentHelper.injectSerializer(new JsonSnapshotSerializer());
+        Snapshot snapshot = createSnapshot();
+        snapshot.setTraceId("123");
+        snapshot.setSpanId("456");
+        sink.addSnapshot(snapshot);
+        sink.lowRateFlush(sink);
+        verify(snapshotUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
+        String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
+        System.out.println(strPayload);
+        JsonSnapshotSerializer.IntakeRequest intakeRequest = assertOneIntakeRequest(strPayload);
+        assertEquals("123", intakeRequest.getTraceId());
+        assertEquals("456", intakeRequest.getSpanId());
+    }
+
+    @Test
+    public void addSnapshotWithEvalErrors() throws IOException {
+        DebuggerSink sink = createDefaultDebuggerSink();
+        DebuggerAgentHelper.injectSerializer(new JsonSnapshotSerializer());
+        CapturedContext entry = new CapturedContext();
+        Snapshot snapshot = createSnapshot();
+        snapshot.setEntry(entry);
+        snapshot.addEvaluationErrors(Arrays.asList(new EvaluationError("obj.field", "Cannot dereference obj")));
+        sink.addSnapshot(snapshot);
+        sink.lowRateFlush(sink);
+        verify(snapshotUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
+        String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
+        System.out.println(strPayload);
+        JsonSnapshotSerializer.IntakeRequest intakeRequest = assertOneIntakeRequest(strPayload);
+        List<EvaluationError> evaluationErrors =
+                intakeRequest.getDebugger().getSnapshot().getEvaluationErrors();
+        assertEquals(1, evaluationErrors.size());
+        assertEquals("obj.field", evaluationErrors.get(0).getExpr());
+        assertEquals("Cannot dereference obj", evaluationErrors.get(0).getMessage());
+    }
+
+    @Test
+    public void addDiagnostic() {
+        DebuggerSink sink = createDefaultDebuggerSink();
+        DiagnosticMessage info = new DiagnosticMessage(DiagnosticMessage.Kind.INFO, "info message");
+        DiagnosticMessage warn = new DiagnosticMessage(DiagnosticMessage.Kind.WARN, "info message");
+        DiagnosticMessage error = new DiagnosticMessage(DiagnosticMessage.Kind.ERROR, "info message");
+        sink.addDiagnostics(PROBE_ID, Arrays.asList(info, warn, error));
+        // ensure just that the code is executed to have coverage (just logging)
+    }
+
+    @Test
+    public void skipSnapshot() {
+        DebuggerMetricCollector metricCollector = spy(DebuggerMetricCollector.get());
+        SnapshotSink snapshotSink = new SnapshotSink(
+                config,
+                "",
+                new BatchUploader("Snapshots", config, config.getFinalDebuggerSnapshotUrl(), SnapshotSink.RETRY_POLICY),
+                new BatchUploader("Logs", config, config.getFinalDebuggerSnapshotUrl(), SnapshotSink.RETRY_POLICY));
+        SymbolSink symbolSink = new SymbolSink(config);
+        DebuggerSink sink = new DebuggerSink(config, "", metricCollector, probeStatusSink, snapshotSink, symbolSink);
+        Snapshot snapshot = createSnapshot();
+        sink.skipSnapshot(snapshot.getProbe().getId(), RATE_LIMIT);
+        verify(metricCollector).recordEventSkipped(eq(RATE_LIMIT));
+    }
+
+    @Test
+    public void skipSnapshotEvaluationTimeOut() {
+        DebuggerMetricCollector metricCollector = spy(DebuggerMetricCollector.get());
+        DebuggerSink sink = new DebuggerSink(
                 config,
-                config.getFinalDebuggerSnapshotUrl(),
-                SnapshotSink.RETRY_POLICY),
-            new BatchUploader(
-                "Logs", config, config.getFinalDebuggerSnapshotUrl(), SnapshotSink.RETRY_POLICY));
-    SymbolSink symbolSink = new SymbolSink(config);
-    DebuggerSink sink =
-        new DebuggerSink(config, "", metricCollector, probeStatusSink, snapshotSink, symbolSink);
-    Snapshot snapshot = createSnapshot();
-    sink.skipSnapshot(snapshot.getProbe().getId(), RATE_LIMIT);
-    verify(metricCollector).recordEventSkipped(eq(RATE_LIMIT));
-  }
-
-  @Test
-  public void skipSnapshotEvaluationTimeOut() {
-    DebuggerMetricCollector metricCollector = spy(DebuggerMetricCollector.get());
-    DebuggerSink sink =
-        new DebuggerSink(
-            config,
-            "",
-            metricCollector,
-            probeStatusSink,
-            new SnapshotSink(config, "", snapshotUploader, logUploader),
-            new SymbolSink(config));
-    Snapshot snapshot = createSnapshot();
-    sink.skipSnapshot(snapshot.getProbe().getId(), EVALUATION_TIME_OUT);
-    verify(metricCollector).recordEventSkipped(eq(EVALUATION_TIME_OUT));
-  }
-
-  @Test
-  public void addSnapshotQueueFullRecordsDropped() {
-    DebuggerMetricCollector metricCollector = spy(DebuggerMetricCollector.get());
-    SnapshotSink snapshotSink = new SnapshotSink(config, "", snapshotUploader, logUploader);
-    DebuggerSink sink =
-        new DebuggerSink(
-            config, "", metricCollector, probeStatusSink, snapshotSink, new SymbolSink(config));
-    Snapshot snapshot = createSnapshot();
-    for (int i = 0; i < SnapshotSink.LOW_RATE_CAPACITY; i++) {
-      sink.addSnapshot(snapshot);
-    }
-    verify(metricCollector, times(0)).recordEventDropped(QUEUE_FULL);
-    sink.addSnapshot(snapshot);
-    verify(metricCollector, times(1)).recordEventDropped(QUEUE_FULL);
-  }
-
-  @Test
-  public void addHighRateSnapshotRecordsEveryDrop() {
-    DebuggerMetricCollector metricCollector = spy(DebuggerMetricCollector.get());
-    SnapshotSink snapshotSink = new SnapshotSink(config, "", snapshotUploader, logUploader);
-    DebuggerSink sink =
-        new DebuggerSink(
-            config, "", metricCollector, probeStatusSink, snapshotSink, new SymbolSink(config));
-    Snapshot snapshot = createSnapshot();
-    // fill the high rate queue to capacity
-    for (int i = 0; i < SnapshotSink.HIGH_RATE_CAPACITY; i++) {
-      sink.addHighRateSnapshot(snapshot);
-    }
-    verify(metricCollector, times(0)).recordEventDropped(QUEUE_FULL);
-    for (int i = 0; i < 3; i++) {
-      sink.addHighRateSnapshot(snapshot);
-    }
-    verify(metricCollector, times(3)).recordEventDropped(QUEUE_FULL);
-  }
-
-  private JsonSnapshotSerializer.IntakeRequest assertOneIntakeRequest(String strPayload)
-      throws IOException {
-    ParameterizedType type =
-        Types.newParameterizedType(List.class, JsonSnapshotSerializer.IntakeRequest.class);
-    JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>> adapter =
-        MoshiSnapshotTestHelper.createMoshiSnapshot().adapter(type);
-    List<JsonSnapshotSerializer.IntakeRequest> intakeRequests = adapter.fromJson(strPayload);
-    assertEquals(1, intakeRequests.size());
-    return intakeRequests.get(0);
-  }
-
-  private Snapshot createSnapshot() {
-    return new Snapshot(
-        Thread.currentThread(),
-        new ProbeImplementation.NoopProbeImplementation(PROBE_ID, PROBE_LOCATION),
-        Limits.DEFAULT_REFERENCE_DEPTH);
-  }
-
-  private DebuggerSink createDefaultDebuggerSink() {
-    String tags = DebuggerAgent.getDefaultTagsMergedWithGlobalTags(config);
-    return new DebuggerSink(
-        config,
-        tags,
-        DebuggerMetricCollector.get(),
-        probeStatusSink,
-        new SnapshotSink(config, tags, snapshotUploader, logUploader),
-        new SymbolSink(config));
-  }
-
-  private DebuggerSink createDebuggerSink(BatchUploader diagnosticUploader, boolean useMultiPart) {
-    String tags = DebuggerAgent.getDefaultTagsMergedWithGlobalTags(config);
-    ProbeStatusSink probeSink = new ProbeStatusSink(config, diagnosticUploader, useMultiPart);
-    return new DebuggerSink(
-        config,
-        tags,
-        DebuggerMetricCollector.get(),
-        probeSink,
-        new SnapshotSink(config, tags, snapshotUploader, logUploader),
-        new SymbolSink(config));
-  }
+                "",
+                metricCollector,
+                probeStatusSink,
+                new SnapshotSink(config, "", snapshotUploader, logUploader),
+                new SymbolSink(config));
+        Snapshot snapshot = createSnapshot();
+        sink.skipSnapshot(snapshot.getProbe().getId(), EVALUATION_TIME_OUT);
+        verify(metricCollector).recordEventSkipped(eq(EVALUATION_TIME_OUT));
+    }
+
+    @Test
+    public void addSnapshotQueueFullRecordsDropped() {
+        DebuggerMetricCollector metricCollector = spy(DebuggerMetricCollector.get());
+        SnapshotSink snapshotSink = new SnapshotSink(config, "", snapshotUploader, logUploader);
+        DebuggerSink sink =
+                new DebuggerSink(config, "", metricCollector, probeStatusSink, snapshotSink, new SymbolSink(config));
+        Snapshot snapshot = createSnapshot();
+        for (int i = 0; i < SnapshotSink.LOW_RATE_CAPACITY; i++) {
+            sink.addSnapshot(snapshot);
+        }
+        verify(metricCollector, times(0)).recordEventDropped(QUEUE_FULL);
+        sink.addSnapshot(snapshot);
+        verify(metricCollector, times(1)).recordEventDropped(QUEUE_FULL);
+    }
+
+    @Test
+    public void addHighRateSnapshotRecordsEveryDrop() {
+        DebuggerMetricCollector metricCollector = spy(DebuggerMetricCollector.get());
+        SnapshotSink snapshotSink = new SnapshotSink(config, "", snapshotUploader, logUploader);
+        DebuggerSink sink =
+                new DebuggerSink(config, "", metricCollector, probeStatusSink, snapshotSink, new SymbolSink(config));
+        Snapshot snapshot = createSnapshot();
+        // fill the high rate queue to capacity
+        for (int i = 0; i < SnapshotSink.HIGH_RATE_CAPACITY; i++) {
+            sink.addHighRateSnapshot(snapshot);
+        }
+        verify(metricCollector, times(0)).recordEventDropped(QUEUE_FULL);
+        for (int i = 0; i < 3; i++) {
+            sink.addHighRateSnapshot(snapshot);
+        }
+        verify(metricCollector, times(3)).recordEventDropped(QUEUE_FULL);
+    }
+
+    private JsonSnapshotSerializer.IntakeRequest assertOneIntakeRequest(String strPayload) throws IOException {
+        ParameterizedType type = Types.newParameterizedType(List.class, JsonSnapshotSerializer.IntakeRequest.class);
+        JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>> adapter =
+                MoshiSnapshotTestHelper.createMoshiSnapshot().adapter(type);
+        List<JsonSnapshotSerializer.IntakeRequest> intakeRequests = adapter.fromJson(strPayload);
+        assertEquals(1, intakeRequests.size());
+        return intakeRequests.get(0);
+    }
+
+    private Snapshot createSnapshot() {
+        return new Snapshot(
+                Thread.currentThread(),
+                new ProbeImplementation.NoopProbeImplementation(PROBE_ID, PROBE_LOCATION),
+                Limits.DEFAULT_REFERENCE_DEPTH);
+    }
+
+    private DebuggerSink createDefaultDebuggerSink() {
+        String tags = DebuggerAgent.getDefaultTagsMergedWithGlobalTags(config);
+        return new DebuggerSink(
+                config,
+                tags,
+                DebuggerMetricCollector.get(),
+                probeStatusSink,
+                new SnapshotSink(config, tags, snapshotUploader, logUploader),
+                new SymbolSink(config));
+    }
+
+    private DebuggerSink createDebuggerSink(BatchUploader diagnosticUploader, boolean useMultiPart) {
+        String tags = DebuggerAgent.getDefaultTagsMergedWithGlobalTags(config);
+        ProbeStatusSink probeSink = new ProbeStatusSink(config, diagnosticUploader, useMultiPart);
+        return new DebuggerSink(
+                config,
+                tags,
+                DebuggerMetricCollector.get(),
+                probeSink,
+                new SnapshotSink(config, tags, snapshotUploader, logUploader),
+                new SymbolSink(config));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/ProbeStatusSinkTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/ProbeStatusSinkTest.java
index 6a80fc6418b..67aeec384e5 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/ProbeStatusSinkTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/ProbeStatusSinkTest.java
@@ -28,314 +28,302 @@
 @ExtendWith(MockitoExtension.class)
 class ProbeStatusSinkTest {
 
-  private static final String SERVICE_NAME = "service-name";
-  private static final ProbeId PROBE_ID = new ProbeId(UUID.randomUUID().toString(), 12);
-  private static final ProbeId PROBE_ID_NEW_VERSION = new ProbeId(PROBE_ID.getId(), 21);
-  private static final ProbeId PROBE_ID2 = new ProbeId(UUID.randomUUID().toString(), 21);
-  private static final String MESSAGE = "Foo";
-  private static final int DIAGNOSTICS_INTERVAL = 60 * 60; // in seconds = 1h
-  private static final Instant AFTER_INTERVAL_HAS_PASSED =
-      Instant.now().plus(Duration.ofSeconds(DIAGNOSTICS_INTERVAL + 5));
-  private static final Instant BEFORE_INTERVAL_HAS_PASSED =
-      Instant.now().plus(Duration.ofSeconds(DIAGNOSTICS_INTERVAL - 5));
-
-  @Mock private Config config;
-
-  private Builder builder;
-  private ProbeStatusSink probeStatusSink;
-
-  @BeforeEach
-  void setUp() {
-    when(config.getServiceName()).thenReturn(SERVICE_NAME);
-    when(config.getDynamicInstrumentationDiagnosticsInterval()).thenReturn(DIAGNOSTICS_INTERVAL);
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
-    builder = new Builder(config);
-    probeStatusSink = new ProbeStatusSink(config, "http://localhost:8126/debugger/v1/input", true);
-  }
-
-  @Test
-  void addReceived() {
-    probeStatusSink.addReceived(PROBE_ID);
-    assertEquals(
-        Collections.singletonList(builder.receivedMessage(PROBE_ID)),
-        probeStatusSink.getDiagnostics());
-  }
-
-  @Test
-  void addInstalled() {
-    probeStatusSink.addInstalled(PROBE_ID);
-    assertEquals(
-        Collections.singletonList(builder.installedMessage(PROBE_ID)),
-        probeStatusSink.getDiagnostics());
-  }
-
-  @Test
-  void addBlocked() {
-    probeStatusSink.addBlocked(PROBE_ID);
-    assertEquals(
-        Collections.singletonList(builder.blockedMessage(PROBE_ID)),
-        probeStatusSink.getDiagnostics());
-  }
-
-  @Test
-  void addError() {
-    probeStatusSink.addError(PROBE_ID, MESSAGE);
-    assertEquals(
-        Collections.singletonList(builder.errorMessage(PROBE_ID, MESSAGE)),
-        probeStatusSink.getDiagnostics());
-  }
-
-  @Test
-  void addEmitting() {
-    probeStatusSink.addEmitting(PROBE_ID);
-    assertEquals(
-        Arrays.asList(builder.emittingMessage(PROBE_ID.getEncodedId())),
-        probeStatusSink.getDiagnostics());
-  }
-
-  @Test
-  void addReceivedThenInstalled() {
-    probeStatusSink.addReceived(PROBE_ID);
-    probeStatusSink.addInstalled(PROBE_ID);
-    assertEquals(
-        Arrays.asList(builder.receivedMessage(PROBE_ID), builder.installedMessage(PROBE_ID)),
-        probeStatusSink.getDiagnostics());
-  }
-
-  @Test
-  void addReceivedThenBlocked() {
-    probeStatusSink.addReceived(PROBE_ID);
-    probeStatusSink.addBlocked(PROBE_ID);
-    assertEquals(
-        Arrays.asList(builder.receivedMessage(PROBE_ID), builder.blockedMessage(PROBE_ID)),
-        probeStatusSink.getDiagnostics());
-  }
-
-  @Test
-  void addReceivedThenError() {
-    probeStatusSink.addReceived(PROBE_ID);
-    probeStatusSink.addError(PROBE_ID, MESSAGE);
-    assertEquals(
-        Arrays.asList(builder.receivedMessage(PROBE_ID), builder.errorMessage(PROBE_ID, MESSAGE)),
-        probeStatusSink.getDiagnostics());
-  }
-
-  @Test
-  void addReceivedThenInstalledThenError() {
-    probeStatusSink.addReceived(PROBE_ID);
-    probeStatusSink.addInstalled(PROBE_ID);
-    probeStatusSink.addError(PROBE_ID, MESSAGE);
-    assertEquals(
-        Arrays.asList(
-            builder.receivedMessage(PROBE_ID),
-            builder.installedMessage(PROBE_ID),
-            builder.errorMessage(PROBE_ID, MESSAGE)),
-        probeStatusSink.getDiagnostics());
-  }
-
-  @Test
-  void addReceivedThenInstalledThenNewVersion() {
-    probeStatusSink.addReceived(PROBE_ID);
-    probeStatusSink.addInstalled(PROBE_ID);
-    probeStatusSink.addReceived(PROBE_ID_NEW_VERSION);
-    probeStatusSink.addInstalled(PROBE_ID_NEW_VERSION);
-    probeStatusSink.removeDiagnostics(PROBE_ID);
-    assertEquals(
-        Arrays.asList(
-            builder.receivedMessage(PROBE_ID),
-            builder.installedMessage(PROBE_ID),
-            builder.receivedMessage(PROBE_ID_NEW_VERSION),
-            builder.installedMessage(PROBE_ID_NEW_VERSION)),
-        probeStatusSink.getDiagnostics());
-    Clock fixed = Clock.fixed(AFTER_INTERVAL_HAS_PASSED, ZoneId.systemDefault());
-    assertEquals(
-        Collections.singletonList(builder.installedMessage(PROBE_ID_NEW_VERSION)),
-        probeStatusSink.getDiagnostics(fixed));
-  }
-
-  @Test
-  void addErrorWithThrowable() {
-    Throwable throwable = new Exception("test");
-    probeStatusSink.addError(PROBE_ID, throwable);
-    assertEquals(
-        Collections.singletonList(builder.errorMessage(PROBE_ID, throwable)),
-        probeStatusSink.getDiagnostics());
-  }
-
-  @Test
-  void removeDiagnostic() {
-    probeStatusSink.addReceived(PROBE_ID);
-    assertEquals(
-        Collections.singletonList(builder.receivedMessage(PROBE_ID)),
-        probeStatusSink.getDiagnostics());
-    probeStatusSink.removeDiagnostics(PROBE_ID);
-    assertEquals(Collections.emptyList(), probeStatusSink.getDiagnostics());
-  }
-
-  @Test
-  void doNotDoubleEmitMessageIfIntervalHasntPassed() {
-    probeStatusSink.addError(PROBE_ID, MESSAGE);
-    assertEquals(
-        Collections.singletonList(builder.errorMessage(PROBE_ID, MESSAGE)),
-        probeStatusSink.getDiagnostics());
-    assertEquals(Collections.emptyList(), probeStatusSink.getDiagnostics());
-  }
-
-  @Test
-  void reemitOnInterval() {
-    probeStatusSink.addReceived(PROBE_ID);
-    List<ProbeStatus> expected = Collections.singletonList(builder.receivedMessage(PROBE_ID));
-    assertEquals(expected, probeStatusSink.getDiagnostics());
-    assertEquals(Collections.emptyList(), probeStatusSink.getDiagnostics());
-    Clock fixed = Clock.fixed(AFTER_INTERVAL_HAS_PASSED, ZoneId.systemDefault());
-    assertEquals(expected, probeStatusSink.getDiagnostics(fixed));
-  }
-
-  @Test
-  void reemitOnlyLatestMessage() {
-    probeStatusSink.addReceived(PROBE_ID);
-    probeStatusSink.addError(PROBE_ID, MESSAGE);
-    List<ProbeStatus> firstDiagnostics = probeStatusSink.getDiagnostics();
-    assertEquals(
-        Arrays.asList(builder.receivedMessage(PROBE_ID), builder.errorMessage(PROBE_ID, MESSAGE)),
-        firstDiagnostics);
-    Clock fixed = Clock.fixed(AFTER_INTERVAL_HAS_PASSED, ZoneId.systemDefault());
-    List<ProbeStatus> secondDiagnostics = probeStatusSink.getDiagnostics(fixed);
-    assertEquals(
-        Collections.singletonList(builder.errorMessage(PROBE_ID, MESSAGE)), secondDiagnostics);
-
-    // expect timestamp to be updated
-    assertTrue(firstDiagnostics.get(1).getTimestamp() < secondDiagnostics.get(0).getTimestamp());
-  }
-
-  @Test
-  void doNotReemitIfIntervalHasNotPassedBetweenAddingAndNextCall() {
-    probeStatusSink.addReceived(PROBE_ID);
-    assertEquals(
-        Collections.singletonList(builder.receivedMessage(PROBE_ID)),
-        probeStatusSink.getDiagnostics());
-    Clock fixed = Clock.fixed(BEFORE_INTERVAL_HAS_PASSED, ZoneId.systemDefault());
-    assertEquals(Collections.emptyList(), probeStatusSink.getDiagnostics(fixed));
-  }
-
-  @Test
-  void doNotReemitIfIntervalHasNotPassedBetweenAddingAndNextCallNewStatus() {
-    probeStatusSink.addReceived(PROBE_ID);
-    assertEquals(
-        Collections.singletonList(builder.receivedMessage(PROBE_ID)),
-        probeStatusSink.getDiagnostics());
-    probeStatusSink.addInstalled(PROBE_ID);
-    Clock fixed = Clock.fixed(BEFORE_INTERVAL_HAS_PASSED, ZoneId.systemDefault());
-    assertEquals(
-        Collections.singletonList(builder.installedMessage(PROBE_ID)),
-        probeStatusSink.getDiagnostics(fixed));
-  }
-
-  @Test
-  void multipleProbes() {
-    ProbeId secondProbeId = new ProbeId(UUID.randomUUID().toString(), 123);
-
-    // Emit both right-away after adding the messages
-    probeStatusSink.addReceived(PROBE_ID);
-    probeStatusSink.addReceived(secondProbeId);
-    assertEquals(
-        Arrays.asList(builder.receivedMessage(PROBE_ID), builder.receivedMessage(secondProbeId)),
-        probeStatusSink.getDiagnostics());
-
-    // Change stored diagnostic for PROBE_ID
-    probeStatusSink.addInstalled(PROBE_ID);
-
-    // Assert only new (installed) message for PROBE_ID is emitted before DIAGNOSTICS_INTERVAL has
-    // passed
-    Instant beforeIntervalHasPassed = Instant.now();
-    Clock fixed = Clock.fixed(beforeIntervalHasPassed, ZoneId.systemDefault());
-    assertEquals(
-        Collections.singletonList(builder.installedMessage(PROBE_ID)),
-        probeStatusSink.getDiagnostics(fixed));
-  }
-
-  @Test
-  void doNotReemitRemovedMessage() {
-    probeStatusSink.addReceived(PROBE_ID);
-    assertEquals(
-        Collections.singletonList(builder.receivedMessage(PROBE_ID)),
-        probeStatusSink.getDiagnostics());
-    probeStatusSink.removeDiagnostics(PROBE_ID);
-    assertEquals(Collections.emptyList(), probeStatusSink.getDiagnostics());
-  }
-
-  @Test
-  void dropRepeatingDiagnostics() {
-    probeStatusSink.addReceived(PROBE_ID);
-
-    // enqueues only a single error message (checking if queue already have that message).
-    for (int i = 1; i <= 100; i++) {
-      probeStatusSink.addError(PROBE_ID, "bar");
+    private static final String SERVICE_NAME = "service-name";
+    private static final ProbeId PROBE_ID = new ProbeId(UUID.randomUUID().toString(), 12);
+    private static final ProbeId PROBE_ID_NEW_VERSION = new ProbeId(PROBE_ID.getId(), 21);
+    private static final ProbeId PROBE_ID2 = new ProbeId(UUID.randomUUID().toString(), 21);
+    private static final String MESSAGE = "Foo";
+    private static final int DIAGNOSTICS_INTERVAL = 60 * 60; // in seconds = 1h
+    private static final Instant AFTER_INTERVAL_HAS_PASSED =
+            Instant.now().plus(Duration.ofSeconds(DIAGNOSTICS_INTERVAL + 5));
+    private static final Instant BEFORE_INTERVAL_HAS_PASSED =
+            Instant.now().plus(Duration.ofSeconds(DIAGNOSTICS_INTERVAL - 5));
+
+    @Mock
+    private Config config;
+
+    private Builder builder;
+    private ProbeStatusSink probeStatusSink;
+
+    @BeforeEach
+    void setUp() {
+        when(config.getServiceName()).thenReturn(SERVICE_NAME);
+        when(config.getDynamicInstrumentationDiagnosticsInterval()).thenReturn(DIAGNOSTICS_INTERVAL);
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(100);
+        builder = new Builder(config);
+        probeStatusSink = new ProbeStatusSink(config, "http://localhost:8126/debugger/v1/input", true);
     }
-    // this will enqueue a new error message
-    probeStatusSink.addError(PROBE_ID, "foo");
-    assertEquals(
-        Arrays.asList(
-            builder.receivedMessage(PROBE_ID),
-            builder.errorMessage(PROBE_ID, "bar"),
-            builder.errorMessage(PROBE_ID, "foo")),
-        probeStatusSink.getDiagnostics());
-  }
-
-  @Test
-  void dealingFullQueueDroppedDiagnostics() {
-    probeStatusSink.addReceived(PROBE_ID);
-    // enqueues all messages
-    for (int i = 1; i <= 199; i++) {
-      probeStatusSink.addError(PROBE_ID, "bar " + i);
+
+    @Test
+    void addReceived() {
+        probeStatusSink.addReceived(PROBE_ID);
+        assertEquals(Collections.singletonList(builder.receivedMessage(PROBE_ID)), probeStatusSink.getDiagnostics());
+    }
+
+    @Test
+    void addInstalled() {
+        probeStatusSink.addInstalled(PROBE_ID);
+        assertEquals(Collections.singletonList(builder.installedMessage(PROBE_ID)), probeStatusSink.getDiagnostics());
+    }
+
+    @Test
+    void addBlocked() {
+        probeStatusSink.addBlocked(PROBE_ID);
+        assertEquals(Collections.singletonList(builder.blockedMessage(PROBE_ID)), probeStatusSink.getDiagnostics());
+    }
+
+    @Test
+    void addError() {
+        probeStatusSink.addError(PROBE_ID, MESSAGE);
+        assertEquals(
+                Collections.singletonList(builder.errorMessage(PROBE_ID, MESSAGE)), probeStatusSink.getDiagnostics());
+    }
+
+    @Test
+    void addEmitting() {
+        probeStatusSink.addEmitting(PROBE_ID);
+        assertEquals(Arrays.asList(builder.emittingMessage(PROBE_ID.getEncodedId())), probeStatusSink.getDiagnostics());
+    }
+
+    @Test
+    void addReceivedThenInstalled() {
+        probeStatusSink.addReceived(PROBE_ID);
+        probeStatusSink.addInstalled(PROBE_ID);
+        assertEquals(
+                Arrays.asList(builder.receivedMessage(PROBE_ID), builder.installedMessage(PROBE_ID)),
+                probeStatusSink.getDiagnostics());
+    }
+
+    @Test
+    void addReceivedThenBlocked() {
+        probeStatusSink.addReceived(PROBE_ID);
+        probeStatusSink.addBlocked(PROBE_ID);
+        assertEquals(
+                Arrays.asList(builder.receivedMessage(PROBE_ID), builder.blockedMessage(PROBE_ID)),
+                probeStatusSink.getDiagnostics());
+    }
+
+    @Test
+    void addReceivedThenError() {
+        probeStatusSink.addReceived(PROBE_ID);
+        probeStatusSink.addError(PROBE_ID, MESSAGE);
+        assertEquals(
+                Arrays.asList(builder.receivedMessage(PROBE_ID), builder.errorMessage(PROBE_ID, MESSAGE)),
+                probeStatusSink.getDiagnostics());
+    }
+
+    @Test
+    void addReceivedThenInstalledThenError() {
+        probeStatusSink.addReceived(PROBE_ID);
+        probeStatusSink.addInstalled(PROBE_ID);
+        probeStatusSink.addError(PROBE_ID, MESSAGE);
+        assertEquals(
+                Arrays.asList(
+                        builder.receivedMessage(PROBE_ID),
+                        builder.installedMessage(PROBE_ID),
+                        builder.errorMessage(PROBE_ID, MESSAGE)),
+                probeStatusSink.getDiagnostics());
+    }
+
+    @Test
+    void addReceivedThenInstalledThenNewVersion() {
+        probeStatusSink.addReceived(PROBE_ID);
+        probeStatusSink.addInstalled(PROBE_ID);
+        probeStatusSink.addReceived(PROBE_ID_NEW_VERSION);
+        probeStatusSink.addInstalled(PROBE_ID_NEW_VERSION);
+        probeStatusSink.removeDiagnostics(PROBE_ID);
+        assertEquals(
+                Arrays.asList(
+                        builder.receivedMessage(PROBE_ID),
+                        builder.installedMessage(PROBE_ID),
+                        builder.receivedMessage(PROBE_ID_NEW_VERSION),
+                        builder.installedMessage(PROBE_ID_NEW_VERSION)),
+                probeStatusSink.getDiagnostics());
+        Clock fixed = Clock.fixed(AFTER_INTERVAL_HAS_PASSED, ZoneId.systemDefault());
+        assertEquals(
+                Collections.singletonList(builder.installedMessage(PROBE_ID_NEW_VERSION)),
+                probeStatusSink.getDiagnostics(fixed));
+    }
+
+    @Test
+    void addErrorWithThrowable() {
+        Throwable throwable = new Exception("test");
+        probeStatusSink.addError(PROBE_ID, throwable);
+        assertEquals(
+                Collections.singletonList(builder.errorMessage(PROBE_ID, throwable)), probeStatusSink.getDiagnostics());
+    }
+
+    @Test
+    void removeDiagnostic() {
+        probeStatusSink.addReceived(PROBE_ID);
+        assertEquals(Collections.singletonList(builder.receivedMessage(PROBE_ID)), probeStatusSink.getDiagnostics());
+        probeStatusSink.removeDiagnostics(PROBE_ID);
+        assertEquals(Collections.emptyList(), probeStatusSink.getDiagnostics());
+    }
+
+    @Test
+    void doNotDoubleEmitMessageIfIntervalHasntPassed() {
+        probeStatusSink.addError(PROBE_ID, MESSAGE);
+        assertEquals(
+                Collections.singletonList(builder.errorMessage(PROBE_ID, MESSAGE)), probeStatusSink.getDiagnostics());
+        assertEquals(Collections.emptyList(), probeStatusSink.getDiagnostics());
+    }
+
+    @Test
+    void reemitOnInterval() {
+        probeStatusSink.addReceived(PROBE_ID);
+        List<ProbeStatus> expected = Collections.singletonList(builder.receivedMessage(PROBE_ID));
+        assertEquals(expected, probeStatusSink.getDiagnostics());
+        assertEquals(Collections.emptyList(), probeStatusSink.getDiagnostics());
+        Clock fixed = Clock.fixed(AFTER_INTERVAL_HAS_PASSED, ZoneId.systemDefault());
+        assertEquals(expected, probeStatusSink.getDiagnostics(fixed));
+    }
+
+    @Test
+    void reemitOnlyLatestMessage() {
+        probeStatusSink.addReceived(PROBE_ID);
+        probeStatusSink.addError(PROBE_ID, MESSAGE);
+        List<ProbeStatus> firstDiagnostics = probeStatusSink.getDiagnostics();
+        assertEquals(
+                Arrays.asList(builder.receivedMessage(PROBE_ID), builder.errorMessage(PROBE_ID, MESSAGE)),
+                firstDiagnostics);
+        Clock fixed = Clock.fixed(AFTER_INTERVAL_HAS_PASSED, ZoneId.systemDefault());
+        List<ProbeStatus> secondDiagnostics = probeStatusSink.getDiagnostics(fixed);
+        assertEquals(Collections.singletonList(builder.errorMessage(PROBE_ID, MESSAGE)), secondDiagnostics);
+
+        // expect timestamp to be updated
+        assertTrue(firstDiagnostics.get(1).getTimestamp()
+                < secondDiagnostics.get(0).getTimestamp());
+    }
+
+    @Test
+    void doNotReemitIfIntervalHasNotPassedBetweenAddingAndNextCall() {
+        probeStatusSink.addReceived(PROBE_ID);
+        assertEquals(Collections.singletonList(builder.receivedMessage(PROBE_ID)), probeStatusSink.getDiagnostics());
+        Clock fixed = Clock.fixed(BEFORE_INTERVAL_HAS_PASSED, ZoneId.systemDefault());
+        assertEquals(Collections.emptyList(), probeStatusSink.getDiagnostics(fixed));
+    }
+
+    @Test
+    void doNotReemitIfIntervalHasNotPassedBetweenAddingAndNextCallNewStatus() {
+        probeStatusSink.addReceived(PROBE_ID);
+        assertEquals(Collections.singletonList(builder.receivedMessage(PROBE_ID)), probeStatusSink.getDiagnostics());
+        probeStatusSink.addInstalled(PROBE_ID);
+        Clock fixed = Clock.fixed(BEFORE_INTERVAL_HAS_PASSED, ZoneId.systemDefault());
+        assertEquals(
+                Collections.singletonList(builder.installedMessage(PROBE_ID)), probeStatusSink.getDiagnostics(fixed));
+    }
+
+    @Test
+    void multipleProbes() {
+        ProbeId secondProbeId = new ProbeId(UUID.randomUUID().toString(), 123);
+
+        // Emit both right-away after adding the messages
+        probeStatusSink.addReceived(PROBE_ID);
+        probeStatusSink.addReceived(secondProbeId);
+        assertEquals(
+                Arrays.asList(builder.receivedMessage(PROBE_ID), builder.receivedMessage(secondProbeId)),
+                probeStatusSink.getDiagnostics());
+
+        // Change stored diagnostic for PROBE_ID
+        probeStatusSink.addInstalled(PROBE_ID);
+
+        // Assert only new (installed) message for PROBE_ID is emitted before DIAGNOSTICS_INTERVAL has
+        // passed
+        Instant beforeIntervalHasPassed = Instant.now();
+        Clock fixed = Clock.fixed(beforeIntervalHasPassed, ZoneId.systemDefault());
+        assertEquals(
+                Collections.singletonList(builder.installedMessage(PROBE_ID)), probeStatusSink.getDiagnostics(fixed));
+    }
+
+    @Test
+    void doNotReemitRemovedMessage() {
+        probeStatusSink.addReceived(PROBE_ID);
+        assertEquals(Collections.singletonList(builder.receivedMessage(PROBE_ID)), probeStatusSink.getDiagnostics());
+        probeStatusSink.removeDiagnostics(PROBE_ID);
+        assertEquals(Collections.emptyList(), probeStatusSink.getDiagnostics());
+    }
+
+    @Test
+    void dropRepeatingDiagnostics() {
+        probeStatusSink.addReceived(PROBE_ID);
+
+        // enqueues only a single error message (checking if queue already have that message).
+        for (int i = 1; i <= 100; i++) {
+            probeStatusSink.addError(PROBE_ID, "bar");
+        }
+        // this will enqueue a new error message
+        probeStatusSink.addError(PROBE_ID, "foo");
+        assertEquals(
+                Arrays.asList(
+                        builder.receivedMessage(PROBE_ID),
+                        builder.errorMessage(PROBE_ID, "bar"),
+                        builder.errorMessage(PROBE_ID, "foo")),
+                probeStatusSink.getDiagnostics());
+    }
+
+    @Test
+    void dealingFullQueueDroppedDiagnostics() {
+        probeStatusSink.addReceived(PROBE_ID);
+        // enqueues all messages
+        for (int i = 1; i <= 199; i++) {
+            probeStatusSink.addError(PROBE_ID, "bar " + i);
+        }
+        // those two messages would be dropped because the queue is full.
+        // However, getDiagnostics will ensure we emit the last message for each probe once it is
+        // drained
+        probeStatusSink.addReceived(PROBE_ID2);
+        probeStatusSink.addInstalled(PROBE_ID2);
+
+        List<ProbeStatus> firstBatch = probeStatusSink.getDiagnostics();
+        List<ProbeStatus> secondBatch = probeStatusSink.getDiagnostics();
+        List<ProbeStatus> thirdBatch = probeStatusSink.getDiagnostics();
+        assertEquals(100, firstBatch.size());
+        assertEquals(100, secondBatch.size());
+        assertEquals(1, thirdBatch.size());
+
+        // when fetching all messages the queue will reset and only send last messages for ecah probe
+
+        assertEquals(Arrays.asList(builder.installedMessage(PROBE_ID2)), thirdBatch);
+    }
+
+    @Test
+    void roundtripSerialization() throws IOException {
+        String buffer = serialize();
+        deserialize(buffer);
+    }
+
+    private String serialize() {
+        ProbeStatus probeStatus = builder.errorMessage(PROBE_ID, new NullPointerException("null"));
+        JsonAdapter<ProbeStatus> adapter = MoshiHelper.createMoshiProbeStatus().adapter(ProbeStatus.class);
+        return adapter.toJson(probeStatus);
+    }
+
+    private void deserialize(String buffer) throws IOException {
+        JsonAdapter<ProbeStatus> adapter = MoshiHelper.createMoshiProbeStatus().adapter(ProbeStatus.class);
+        ProbeStatus probeStatus = adapter.fromJson(buffer);
+        assertEquals("dd_debugger", probeStatus.getDdSource());
+        assertEquals("diagnostic", probeStatus.getType());
+        assertEquals(SERVICE_NAME, probeStatus.getService());
+        assertEquals("Error installing probe " + PROBE_ID + ".", probeStatus.getMessage());
+        assertEquals(PROBE_ID, probeStatus.getDiagnostics().getProbeId());
+        assertEquals(ProbeStatus.Status.ERROR, probeStatus.getDiagnostics().getStatus());
+        assertEquals("null", probeStatus.getDiagnostics().getException().getMessage());
+        assertEquals(
+                "ProbeStatusSinkTest.java",
+                probeStatus
+                        .getDiagnostics()
+                        .getException()
+                        .getStacktrace()
+                        .get(0)
+                        .getFileName());
+        assertEquals(
+                "com.datadog.debugger.sink.ProbeStatusSinkTest.serialize",
+                probeStatus
+                        .getDiagnostics()
+                        .getException()
+                        .getStacktrace()
+                        .get(0)
+                        .getFunction());
     }
-    // those two messages would be dropped because the queue is full.
-    // However, getDiagnostics will ensure we emit the last message for each probe once it is
-    // drained
-    probeStatusSink.addReceived(PROBE_ID2);
-    probeStatusSink.addInstalled(PROBE_ID2);
-
-    List<ProbeStatus> firstBatch = probeStatusSink.getDiagnostics();
-    List<ProbeStatus> secondBatch = probeStatusSink.getDiagnostics();
-    List<ProbeStatus> thirdBatch = probeStatusSink.getDiagnostics();
-    assertEquals(100, firstBatch.size());
-    assertEquals(100, secondBatch.size());
-    assertEquals(1, thirdBatch.size());
-
-    // when fetching all messages the queue will reset and only send last messages for ecah probe
-
-    assertEquals(Arrays.asList(builder.installedMessage(PROBE_ID2)), thirdBatch);
-  }
-
-  @Test
-  void roundtripSerialization() throws IOException {
-    String buffer = serialize();
-    deserialize(buffer);
-  }
-
-  private String serialize() {
-    ProbeStatus probeStatus = builder.errorMessage(PROBE_ID, new NullPointerException("null"));
-    JsonAdapter<ProbeStatus> adapter =
-        MoshiHelper.createMoshiProbeStatus().adapter(ProbeStatus.class);
-    return adapter.toJson(probeStatus);
-  }
-
-  private void deserialize(String buffer) throws IOException {
-    JsonAdapter<ProbeStatus> adapter =
-        MoshiHelper.createMoshiProbeStatus().adapter(ProbeStatus.class);
-    ProbeStatus probeStatus = adapter.fromJson(buffer);
-    assertEquals("dd_debugger", probeStatus.getDdSource());
-    assertEquals("diagnostic", probeStatus.getType());
-    assertEquals(SERVICE_NAME, probeStatus.getService());
-    assertEquals("Error installing probe " + PROBE_ID + ".", probeStatus.getMessage());
-    assertEquals(PROBE_ID, probeStatus.getDiagnostics().getProbeId());
-    assertEquals(ProbeStatus.Status.ERROR, probeStatus.getDiagnostics().getStatus());
-    assertEquals("null", probeStatus.getDiagnostics().getException().getMessage());
-    assertEquals(
-        "ProbeStatusSinkTest.java",
-        probeStatus.getDiagnostics().getException().getStacktrace().get(0).getFileName());
-    assertEquals(
-        "com.datadog.debugger.sink.ProbeStatusSinkTest.serialize",
-        probeStatus.getDiagnostics().getException().getStacktrace().get(0).getFunction());
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/SnapshotSinkTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/SnapshotSinkTest.java
index d9e1f72c8a0..47e292b9632 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/SnapshotSinkTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/SnapshotSinkTest.java
@@ -40,161 +40,164 @@
 
 @ExtendWith(MockitoExtension.class)
 public class SnapshotSinkTest {
-  private static final ProbeId PROBE_ID = new ProbeId("12fd-8490-c111-4374-ffde", 42);
-  private static final ProbeLocation PROBE_LOCATION =
-      new ProbeLocation("java.lang.String", "indexOf", null, null);
-
-  @Mock private Config config;
-  @Mock private BatchUploader snapshotUploader;
-  @Mock private BatchUploader logUploader;
-  @Captor private ArgumentCaptor<byte[]> payloadCaptor;
-  private ProbeStatusSink probeStatusSink;
-  private String EXPECTED_SNAPSHOT_TAGS;
-
-  @BeforeEach
-  void setUp() {
-    JsonSnapshotSerializer jsonSnapshotSerializer = new JsonSnapshotSerializer();
-    DebuggerContext.initValueSerializer(jsonSnapshotSerializer);
-    DebuggerAgentHelper.injectSerializer(jsonSnapshotSerializer);
-    when(config.getHostName()).thenReturn("host-name");
-    when(config.getServiceName()).thenReturn("service-name");
-    when(config.getEnv()).thenReturn("test");
-    when(config.getVersion()).thenReturn("foo");
-    when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(1);
-    when(config.getFinalDebuggerSnapshotUrl())
-        .thenReturn("http://localhost:8126/debugger/v1/input");
-
-    EXPECTED_SNAPSHOT_TAGS =
-        "^env:test,version:foo,debugger_version:\\d+\\.\\d+\\.\\d+[^~]*~[0-9a-f]+,agent_version:null,host_name:"
-            + config.getHostName()
-            + "$";
-    probeStatusSink = new ProbeStatusSink(config, config.getFinalDebuggerSnapshotUrl(), false);
-  }
-
-  @ParameterizedTest(name = "Process tags enabled ''{0}''")
-  @ValueSource(booleans = {true, false})
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void addHighRateSnapshot(boolean processTagsEnabled) throws IOException {
-    when(config.isExperimentalPropagateProcessTagsEnabled()).thenReturn(processTagsEnabled);
-    ProcessTags.reset(config);
-    SnapshotSink snapshotSink = createSnapshotSink();
-    snapshotSink.start();
-    Snapshot snapshot = createSnapshot();
-    snapshotSink.addHighRate(snapshot);
-    snapshotSink.highRateFlush(null);
-    verify(logUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
-    String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
-    System.out.println(strPayload);
-    JsonSnapshotSerializer.IntakeRequest intakeRequest = assertOneIntakeRequest(strPayload);
-    assertEquals("dd_debugger", intakeRequest.getDdsource());
-    assertEquals("service-name", intakeRequest.getService());
-    assertEquals("java.lang.String", intakeRequest.getLoggerName());
-    assertEquals("indexOf", intakeRequest.getLoggerMethod());
-    assertEquals(PROBE_ID.getId(), intakeRequest.getDebugger().getSnapshot().getProbe().getId());
-    assertEquals(
-        PROBE_LOCATION, intakeRequest.getDebugger().getSnapshot().getProbe().getLocation());
-    assertTrue(
-        intakeRequest
-            .getDebugger()
-            .getRuntimeId()
-            .matches("[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}"));
-    if (processTagsEnabled) {
-      assertNotNull(ProcessTags.getTagsForSerialization());
-      assertEquals(
-          ProcessTags.getTagsForSerialization().toString(), intakeRequest.getProcessTags());
-    } else {
-      assertNull(intakeRequest.getProcessTags());
+    private static final ProbeId PROBE_ID = new ProbeId("12fd-8490-c111-4374-ffde", 42);
+    private static final ProbeLocation PROBE_LOCATION = new ProbeLocation("java.lang.String", "indexOf", null, null);
+
+    @Mock
+    private Config config;
+
+    @Mock
+    private BatchUploader snapshotUploader;
+
+    @Mock
+    private BatchUploader logUploader;
+
+    @Captor
+    private ArgumentCaptor<byte[]> payloadCaptor;
+
+    private ProbeStatusSink probeStatusSink;
+    private String EXPECTED_SNAPSHOT_TAGS;
+
+    @BeforeEach
+    void setUp() {
+        JsonSnapshotSerializer jsonSnapshotSerializer = new JsonSnapshotSerializer();
+        DebuggerContext.initValueSerializer(jsonSnapshotSerializer);
+        DebuggerAgentHelper.injectSerializer(jsonSnapshotSerializer);
+        when(config.getHostName()).thenReturn("host-name");
+        when(config.getServiceName()).thenReturn("service-name");
+        when(config.getEnv()).thenReturn("test");
+        when(config.getVersion()).thenReturn("foo");
+        when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(1);
+        when(config.getFinalDebuggerSnapshotUrl()).thenReturn("http://localhost:8126/debugger/v1/input");
+
+        EXPECTED_SNAPSHOT_TAGS =
+                "^env:test,version:foo,debugger_version:\\d+\\.\\d+\\.\\d+[^~]*~[0-9a-f]+,agent_version:null,host_name:"
+                        + config.getHostName()
+                        + "$";
+        probeStatusSink = new ProbeStatusSink(config, config.getFinalDebuggerSnapshotUrl(), false);
+    }
+
+    @ParameterizedTest(name = "Process tags enabled ''{0}''")
+    @ValueSource(booleans = {true, false})
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void addHighRateSnapshot(boolean processTagsEnabled) throws IOException {
+        when(config.isExperimentalPropagateProcessTagsEnabled()).thenReturn(processTagsEnabled);
+        ProcessTags.reset(config);
+        SnapshotSink snapshotSink = createSnapshotSink();
+        snapshotSink.start();
+        Snapshot snapshot = createSnapshot();
+        snapshotSink.addHighRate(snapshot);
+        snapshotSink.highRateFlush(null);
+        verify(logUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
+        String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
+        System.out.println(strPayload);
+        JsonSnapshotSerializer.IntakeRequest intakeRequest = assertOneIntakeRequest(strPayload);
+        assertEquals("dd_debugger", intakeRequest.getDdsource());
+        assertEquals("service-name", intakeRequest.getService());
+        assertEquals("java.lang.String", intakeRequest.getLoggerName());
+        assertEquals("indexOf", intakeRequest.getLoggerMethod());
+        assertEquals(
+                PROBE_ID.getId(),
+                intakeRequest.getDebugger().getSnapshot().getProbe().getId());
+        assertEquals(
+                PROBE_LOCATION,
+                intakeRequest.getDebugger().getSnapshot().getProbe().getLocation());
+        assertTrue(intakeRequest
+                .getDebugger()
+                .getRuntimeId()
+                .matches("[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}"));
+        if (processTagsEnabled) {
+            assertNotNull(ProcessTags.getTagsForSerialization());
+            assertEquals(ProcessTags.getTagsForSerialization().toString(), intakeRequest.getProcessTags());
+        } else {
+            assertNull(intakeRequest.getProcessTags());
+        }
+    }
+
+    @Test
+    public void reconsiderDecreaseFlushInterval() {
+        SnapshotSink snapshotSink = createSnapshotSink();
+        long previousInterval = snapshotSink.getCurrentHighRateFlushInterval();
+        assertEquals(SnapshotSink.HIGH_RATE_MAX_FLUSH_INTERVAL_MS, previousInterval);
+        for (int i = 0; i < 1000; i++) {
+            snapshotSink.addHighRate(createSnapshot());
+        }
+        snapshotSink.highRateFlush(null); // interval / 4
+        long currentInterval = snapshotSink.getCurrentHighRateFlushInterval();
+        assertEquals(previousInterval / 4, currentInterval);
+        previousInterval = currentInterval;
+        for (int i = 0; i < 520; i++) {
+            snapshotSink.addHighRate(createSnapshot());
+        }
+        snapshotSink.highRateFlush(null); // interval / 2
+        currentInterval = snapshotSink.getCurrentHighRateFlushInterval();
+        assertEquals(previousInterval / 2, currentInterval);
+        previousInterval = currentInterval;
+        for (int i = 0; i < 110; i++) {
+            snapshotSink.addHighRate(createSnapshot());
+        }
+        snapshotSink.highRateFlush(null); // interval - HIGH_RATE_STEP_SIZE
+        currentInterval = snapshotSink.getCurrentHighRateFlushInterval();
+        assertEquals(previousInterval - SnapshotSink.HIGH_RATE_STEP_SIZE, currentInterval);
+        previousInterval = currentInterval;
+        for (int i = 0; i < 1000; i++) {
+            snapshotSink.addHighRate(createSnapshot());
+        }
+        snapshotSink.highRateFlush(null); // interval / 4 => min
+        currentInterval = snapshotSink.getCurrentHighRateFlushInterval();
+        assertEquals(SnapshotSink.HIGH_RATE_MIN_FLUSH_INTERVAL_MS, currentInterval);
     }
-  }
-
-  @Test
-  public void reconsiderDecreaseFlushInterval() {
-    SnapshotSink snapshotSink = createSnapshotSink();
-    long previousInterval = snapshotSink.getCurrentHighRateFlushInterval();
-    assertEquals(SnapshotSink.HIGH_RATE_MAX_FLUSH_INTERVAL_MS, previousInterval);
-    for (int i = 0; i < 1000; i++) {
-      snapshotSink.addHighRate(createSnapshot());
+
+    @Test
+    public void backoffFlushInterval() {
+        SnapshotSink snapshotSink = createSnapshotSink();
+        long previousInterval = snapshotSink.getCurrentHighRateFlushInterval();
+        assertEquals(SnapshotSink.HIGH_RATE_MAX_FLUSH_INTERVAL_MS, previousInterval);
+        for (int flushCount = 0; flushCount < 4; flushCount++) {
+            for (int i = 0; i < 1000; i++) {
+                snapshotSink.addHighRate(createSnapshot());
+            }
+            snapshotSink.highRateFlush(null); // interval / 4
+            previousInterval = snapshotSink.getCurrentHighRateFlushInterval();
+        }
+        assertEquals(SnapshotSink.HIGH_RATE_MIN_FLUSH_INTERVAL_MS, previousInterval);
+        previousInterval = snapshotSink.getCurrentHighRateFlushInterval();
+        snapshotSink.highRateFlush(null); // backoff: interval + HIGH_RATE_STEP_SIZE
+        long currentInterval = snapshotSink.getCurrentHighRateFlushInterval();
+        assertEquals(previousInterval + SnapshotSink.HIGH_RATE_STEP_SIZE, currentInterval);
     }
-    snapshotSink.highRateFlush(null); // interval / 4
-    long currentInterval = snapshotSink.getCurrentHighRateFlushInterval();
-    assertEquals(previousInterval / 4, currentInterval);
-    previousInterval = currentInterval;
-    for (int i = 0; i < 520; i++) {
-      snapshotSink.addHighRate(createSnapshot());
+
+    @Test
+    public void differentiateSnapshotLog() {
+        SnapshotSink snapshotSink = createSnapshotSink();
+        Snapshot snapshot = createSnapshot();
+        snapshotSink.addLowRate(snapshot);
+        snapshotSink.lowRateFlush(DebuggerAgent.getDefaultTagsMergedWithGlobalTags(config));
+        Snapshot logSnapshot = createSnapshot();
+        snapshotSink.addHighRate(logSnapshot);
+        snapshotSink.highRateFlush(null);
+        verify(snapshotUploader).upload(any(), matches(EXPECTED_SNAPSHOT_TAGS));
+        verify(logUploader).upload(any(), matches(EXPECTED_SNAPSHOT_TAGS));
     }
-    snapshotSink.highRateFlush(null); // interval / 2
-    currentInterval = snapshotSink.getCurrentHighRateFlushInterval();
-    assertEquals(previousInterval / 2, currentInterval);
-    previousInterval = currentInterval;
-    for (int i = 0; i < 110; i++) {
-      snapshotSink.addHighRate(createSnapshot());
+
+    private SnapshotSink createSnapshotSink() {
+        String tags = DebuggerAgent.getDefaultTagsMergedWithGlobalTags(config);
+        return new SnapshotSink(config, tags, snapshotUploader, logUploader);
     }
-    snapshotSink.highRateFlush(null); // interval - HIGH_RATE_STEP_SIZE
-    currentInterval = snapshotSink.getCurrentHighRateFlushInterval();
-    assertEquals(previousInterval - SnapshotSink.HIGH_RATE_STEP_SIZE, currentInterval);
-    previousInterval = currentInterval;
-    for (int i = 0; i < 1000; i++) {
-      snapshotSink.addHighRate(createSnapshot());
+
+    private Snapshot createSnapshot() {
+        return new Snapshot(
+                Thread.currentThread(),
+                new ProbeImplementation.NoopProbeImplementation(PROBE_ID, PROBE_LOCATION),
+                Limits.DEFAULT_REFERENCE_DEPTH);
     }
-    snapshotSink.highRateFlush(null); // interval / 4 => min
-    currentInterval = snapshotSink.getCurrentHighRateFlushInterval();
-    assertEquals(SnapshotSink.HIGH_RATE_MIN_FLUSH_INTERVAL_MS, currentInterval);
-  }
-
-  @Test
-  public void backoffFlushInterval() {
-    SnapshotSink snapshotSink = createSnapshotSink();
-    long previousInterval = snapshotSink.getCurrentHighRateFlushInterval();
-    assertEquals(SnapshotSink.HIGH_RATE_MAX_FLUSH_INTERVAL_MS, previousInterval);
-    for (int flushCount = 0; flushCount < 4; flushCount++) {
-      for (int i = 0; i < 1000; i++) {
-        snapshotSink.addHighRate(createSnapshot());
-      }
-      snapshotSink.highRateFlush(null); // interval / 4
-      previousInterval = snapshotSink.getCurrentHighRateFlushInterval();
+
+    private JsonSnapshotSerializer.IntakeRequest assertOneIntakeRequest(String strPayload) throws IOException {
+        ParameterizedType type = Types.newParameterizedType(List.class, JsonSnapshotSerializer.IntakeRequest.class);
+        JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>> adapter =
+                MoshiSnapshotTestHelper.createMoshiSnapshot().adapter(type);
+        List<JsonSnapshotSerializer.IntakeRequest> intakeRequests = adapter.fromJson(strPayload);
+        assertEquals(1, intakeRequests.size());
+        return intakeRequests.get(0);
     }
-    assertEquals(SnapshotSink.HIGH_RATE_MIN_FLUSH_INTERVAL_MS, previousInterval);
-    previousInterval = snapshotSink.getCurrentHighRateFlushInterval();
-    snapshotSink.highRateFlush(null); // backoff: interval + HIGH_RATE_STEP_SIZE
-    long currentInterval = snapshotSink.getCurrentHighRateFlushInterval();
-    assertEquals(previousInterval + SnapshotSink.HIGH_RATE_STEP_SIZE, currentInterval);
-  }
-
-  @Test
-  public void differentiateSnapshotLog() {
-    SnapshotSink snapshotSink = createSnapshotSink();
-    Snapshot snapshot = createSnapshot();
-    snapshotSink.addLowRate(snapshot);
-    snapshotSink.lowRateFlush(DebuggerAgent.getDefaultTagsMergedWithGlobalTags(config));
-    Snapshot logSnapshot = createSnapshot();
-    snapshotSink.addHighRate(logSnapshot);
-    snapshotSink.highRateFlush(null);
-    verify(snapshotUploader).upload(any(), matches(EXPECTED_SNAPSHOT_TAGS));
-    verify(logUploader).upload(any(), matches(EXPECTED_SNAPSHOT_TAGS));
-  }
-
-  private SnapshotSink createSnapshotSink() {
-    String tags = DebuggerAgent.getDefaultTagsMergedWithGlobalTags(config);
-    return new SnapshotSink(config, tags, snapshotUploader, logUploader);
-  }
-
-  private Snapshot createSnapshot() {
-    return new Snapshot(
-        Thread.currentThread(),
-        new ProbeImplementation.NoopProbeImplementation(PROBE_ID, PROBE_LOCATION),
-        Limits.DEFAULT_REFERENCE_DEPTH);
-  }
-
-  private JsonSnapshotSerializer.IntakeRequest assertOneIntakeRequest(String strPayload)
-      throws IOException {
-    ParameterizedType type =
-        Types.newParameterizedType(List.class, JsonSnapshotSerializer.IntakeRequest.class);
-    JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>> adapter =
-        MoshiSnapshotTestHelper.createMoshiSnapshot().adapter(type);
-    List<JsonSnapshotSerializer.IntakeRequest> intakeRequests = adapter.fromJson(strPayload);
-    assertEquals(1, intakeRequests.size());
-    return intakeRequests.get(0);
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/SymbolSinkTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/SymbolSinkTest.java
index d8ff3164bf2..7a117000f51 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/SymbolSinkTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/SymbolSinkTest.java
@@ -20,254 +20,238 @@
 
 class SymbolSinkTest {
 
-  @Test
-  public void testSimpleFlush() {
-    SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
-    Config config = mock(Config.class);
-    when(config.getServiceName()).thenReturn("service1");
-    when(config.getVersion()).thenReturn("1.0.0");
-    when(config.getRuntimeId()).thenReturn("test-runtime");
-    when(config.isSymbolDatabaseCompressed()).thenReturn(false);
-    SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, MAX_SYMDB_UPLOAD_SIZE);
-    symbolSink.addScope(Scope.builder(ScopeType.JAR, null, 0, 0).build());
-    symbolSink.flush();
-    assertEquals(2, symbolUploaderMock.multiPartContents.size());
-    BatchUploader.MultiPartContent eventContent = symbolUploaderMock.multiPartContents.get(0);
-    assertEquals("event", eventContent.getPartName());
-    assertEquals("event.json", eventContent.getFileName());
-    String strEventContent = new String(eventContent.getContent());
-    assertTrue(strEventContent.contains("\"ddsource\": \"dd_debugger\""));
-    assertTrue(strEventContent.contains("\"service\": \"service1\""));
-    assertTrue(strEventContent.contains("\"version\": \"1.0.0\""));
-    assertTrue(strEventContent.contains("\"language\": \"java\""));
-    assertTrue(strEventContent.contains("\"runtimeId\": \"test-runtime\""));
-    assertTrue(strEventContent.contains("\"type\": \"symdb\""));
-    assertTrue(strEventContent.contains("\"uploadId\":"));
-    assertTrue(strEventContent.contains("\"batchNum\": 1"));
-    assertTrue(strEventContent.contains("\"final\": false"));
-    assertTrue(strEventContent.contains("\"attachmentSize\":"));
-    BatchUploader.MultiPartContent symbolContent = symbolUploaderMock.multiPartContents.get(1);
-    assertEquals("file", symbolContent.getPartName());
-    assertEquals("file.json", symbolContent.getFileName());
-    String fileContent = new String(symbolContent.getContent());
-    assertTrue(fileContent.contains("\"language\":\"JAVA\""));
-    assertTrue(fileContent.contains("\"scopes\":["));
-    assertTrue(fileContent.contains("\"service\":\"service1\""));
-    assertTrue(fileContent.contains("\"version\":\"1.0.0\""));
-    assertTrue(fileContent.contains("\"upload_id\":"));
-    assertTrue(fileContent.contains("\"batch_num\":1"));
-    assertTrue(fileContent.contains("\"final\":false"));
-  }
-
-  @Test
-  public void testMultiScopeFlush() {
-    SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
-    Config config = mock(Config.class);
-    when(config.getServiceName()).thenReturn("service1");
-    when(config.isSymbolDatabaseCompressed()).thenReturn(false);
-    SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, MAX_SYMDB_UPLOAD_SIZE);
-    symbolSink.addScope(Scope.builder(ScopeType.JAR, "jar1.jar", 0, 0).build());
-    symbolSink.addScope(Scope.builder(ScopeType.JAR, "jar2.jar", 0, 0).build());
-    symbolSink.flush();
-    // only 1 request because we are batching the scopes
-    assertEquals(2, symbolUploaderMock.multiPartContents.size());
-    String strContent = assertMultipartContent(symbolUploaderMock, 0);
-    assertTrue(strContent.contains("\"source_file\":\"jar1.jar\""));
-    assertTrue(strContent.contains("\"source_file\":\"jar2.jar\""));
-  }
-
-  @Test
-  public void testQueueFull() {
-    SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
-    Config config = mock(Config.class);
-    when(config.getServiceName()).thenReturn("service1");
-    when(config.isSymbolDatabaseCompressed()).thenReturn(false);
-    SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, MAX_SYMDB_UPLOAD_SIZE);
-    for (int i = 0; i < SymbolSink.CAPACITY; i++) {
-      symbolSink.addScope(Scope.builder(ScopeType.JAR, "jar1.jar", 0, 0).build());
+    @Test
+    public void testSimpleFlush() {
+        SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
+        Config config = mock(Config.class);
+        when(config.getServiceName()).thenReturn("service1");
+        when(config.getVersion()).thenReturn("1.0.0");
+        when(config.getRuntimeId()).thenReturn("test-runtime");
+        when(config.isSymbolDatabaseCompressed()).thenReturn(false);
+        SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, MAX_SYMDB_UPLOAD_SIZE);
+        symbolSink.addScope(Scope.builder(ScopeType.JAR, null, 0, 0).build());
+        symbolSink.flush();
+        assertEquals(2, symbolUploaderMock.multiPartContents.size());
+        BatchUploader.MultiPartContent eventContent = symbolUploaderMock.multiPartContents.get(0);
+        assertEquals("event", eventContent.getPartName());
+        assertEquals("event.json", eventContent.getFileName());
+        String strEventContent = new String(eventContent.getContent());
+        assertTrue(strEventContent.contains("\"ddsource\": \"dd_debugger\""));
+        assertTrue(strEventContent.contains("\"service\": \"service1\""));
+        assertTrue(strEventContent.contains("\"version\": \"1.0.0\""));
+        assertTrue(strEventContent.contains("\"language\": \"java\""));
+        assertTrue(strEventContent.contains("\"runtimeId\": \"test-runtime\""));
+        assertTrue(strEventContent.contains("\"type\": \"symdb\""));
+        assertTrue(strEventContent.contains("\"uploadId\":"));
+        assertTrue(strEventContent.contains("\"batchNum\": 1"));
+        assertTrue(strEventContent.contains("\"final\": false"));
+        assertTrue(strEventContent.contains("\"attachmentSize\":"));
+        BatchUploader.MultiPartContent symbolContent = symbolUploaderMock.multiPartContents.get(1);
+        assertEquals("file", symbolContent.getPartName());
+        assertEquals("file.json", symbolContent.getFileName());
+        String fileContent = new String(symbolContent.getContent());
+        assertTrue(fileContent.contains("\"language\":\"JAVA\""));
+        assertTrue(fileContent.contains("\"scopes\":["));
+        assertTrue(fileContent.contains("\"service\":\"service1\""));
+        assertTrue(fileContent.contains("\"version\":\"1.0.0\""));
+        assertTrue(fileContent.contains("\"upload_id\":"));
+        assertTrue(fileContent.contains("\"batch_num\":1"));
+        assertTrue(fileContent.contains("\"final\":false"));
     }
-    assertEquals(0, symbolUploaderMock.multiPartContents.size());
-    // implicit flush because Q is full
-    symbolSink.addScope(Scope.builder(ScopeType.JAR, "jar2.jar", 0, 0).build());
-    assertEquals(2, symbolUploaderMock.multiPartContents.size());
-    assertTrue(
-        new String(symbolUploaderMock.multiPartContents.get(1).getContent())
-            .contains("\"source_file\":\"jar1.jar\""));
-    symbolSink.flush();
-    assertEquals(4, symbolUploaderMock.multiPartContents.size());
-    assertTrue(
-        new String(symbolUploaderMock.multiPartContents.get(3).getContent())
-            .contains("\"source_file\":\"jar2.jar\""));
-  }
 
-  @Test
-  public void splitByJarScopes() {
-    SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
-    Config config = mock(Config.class);
-    when(config.getServiceName()).thenReturn("service1");
-    when(config.isSymbolDatabaseCompressed()).thenReturn(false);
-    SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, 1024);
-    final int NUM_JAR_SCOPES = 10;
-    for (int i = 0; i < NUM_JAR_SCOPES; i++) {
-      symbolSink.addScope(
-          Scope.builder(ScopeType.JAR, "jar" + i + ".jar", 0, 0)
-              .scopes(singletonList(Scope.builder(ScopeType.CLASS, "class" + i, 0, 0).build()))
-              .build());
+    @Test
+    public void testMultiScopeFlush() {
+        SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
+        Config config = mock(Config.class);
+        when(config.getServiceName()).thenReturn("service1");
+        when(config.isSymbolDatabaseCompressed()).thenReturn(false);
+        SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, MAX_SYMDB_UPLOAD_SIZE);
+        symbolSink.addScope(Scope.builder(ScopeType.JAR, "jar1.jar", 0, 0).build());
+        symbolSink.addScope(Scope.builder(ScopeType.JAR, "jar2.jar", 0, 0).build());
+        symbolSink.flush();
+        // only 1 request because we are batching the scopes
+        assertEquals(2, symbolUploaderMock.multiPartContents.size());
+        String strContent = assertMultipartContent(symbolUploaderMock, 0);
+        assertTrue(strContent.contains("\"source_file\":\"jar1.jar\""));
+        assertTrue(strContent.contains("\"source_file\":\"jar2.jar\""));
     }
-    symbolSink.flush();
-    // split upload request per jar scope
-    assertEquals(NUM_JAR_SCOPES * 2, symbolUploaderMock.multiPartContents.size());
-    for (int i = 0; i < NUM_JAR_SCOPES * 2; i += 2) {
-      String strContent = assertMultipartContent(symbolUploaderMock, i);
-      assertTrue(strContent.contains("\"source_file\":\"jar" + (i / 2) + ".jar\""));
-    }
-  }
 
-  @Test
-  public void splitTooManyJarScopes() {
-    SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
-    Config config = mock(Config.class);
-    when(config.getServiceName()).thenReturn("service1");
-    when(config.isSymbolDatabaseCompressed()).thenReturn(false);
-    SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, 4096);
-    final int NUM_JAR_SCOPES = 21;
-    for (int i = 0; i < NUM_JAR_SCOPES; i++) {
-      symbolSink.addScope(
-          Scope.builder(ScopeType.JAR, "jar" + i + ".jar", 0, 0)
-              .scopes(singletonList(Scope.builder(ScopeType.CLASS, "class" + i, 0, 0).build()))
-              .build());
+    @Test
+    public void testQueueFull() {
+        SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
+        Config config = mock(Config.class);
+        when(config.getServiceName()).thenReturn("service1");
+        when(config.isSymbolDatabaseCompressed()).thenReturn(false);
+        SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, MAX_SYMDB_UPLOAD_SIZE);
+        for (int i = 0; i < SymbolSink.CAPACITY; i++) {
+            symbolSink.addScope(Scope.builder(ScopeType.JAR, "jar1.jar", 0, 0).build());
+        }
+        assertEquals(0, symbolUploaderMock.multiPartContents.size());
+        // implicit flush because Q is full
+        symbolSink.addScope(Scope.builder(ScopeType.JAR, "jar2.jar", 0, 0).build());
+        assertEquals(2, symbolUploaderMock.multiPartContents.size());
+        assertTrue(new String(symbolUploaderMock.multiPartContents.get(1).getContent())
+                .contains("\"source_file\":\"jar1.jar\""));
+        symbolSink.flush();
+        assertEquals(4, symbolUploaderMock.multiPartContents.size());
+        assertTrue(new String(symbolUploaderMock.multiPartContents.get(3).getContent())
+                .contains("\"source_file\":\"jar2.jar\""));
     }
-    symbolSink.flush();
-    // split upload request per half jar scopes
-    assertEquals(2 * 2, symbolUploaderMock.multiPartContents.size());
-    String strContent1 = assertMultipartContent(symbolUploaderMock, 0);
-    assertTrue(strContent1.contains("\"source_file\":\"jar0.jar\""));
-    assertTrue(strContent1.contains("\"source_file\":\"jar9.jar\""));
-    String strContent2 = assertMultipartContent(symbolUploaderMock, 2);
-    assertTrue(strContent2.contains("\"source_file\":\"jar10.jar\""));
-    assertTrue(strContent2.contains("\"source_file\":\"jar20.jar\""));
-  }
 
-  @Test
-  public void splitByClassScopes() {
-    SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
-    Config config = mock(Config.class);
-    when(config.getServiceName()).thenReturn("service1");
-    when(config.isSymbolDatabaseCompressed()).thenReturn(false);
-    SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, 1024);
-    final int NUM_CLASS_SCOPES = 10;
-    List<Scope> classScopes = new ArrayList<>();
-    for (int i = 0; i < NUM_CLASS_SCOPES; i++) {
-      classScopes.add(
-          Scope.builder(ScopeType.CLASS, "class" + i, 0, 0)
-              .scopes(
-                  Collections.singletonList(
-                      Scope.builder(ScopeType.METHOD, "class" + i, 0, 0)
-                          .name("method" + i)
-                          .build()))
-              .build());
+    @Test
+    public void splitByJarScopes() {
+        SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
+        Config config = mock(Config.class);
+        when(config.getServiceName()).thenReturn("service1");
+        when(config.isSymbolDatabaseCompressed()).thenReturn(false);
+        SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, 1024);
+        final int NUM_JAR_SCOPES = 10;
+        for (int i = 0; i < NUM_JAR_SCOPES; i++) {
+            symbolSink.addScope(Scope.builder(ScopeType.JAR, "jar" + i + ".jar", 0, 0)
+                    .scopes(singletonList(
+                            Scope.builder(ScopeType.CLASS, "class" + i, 0, 0).build()))
+                    .build());
+        }
+        symbolSink.flush();
+        // split upload request per jar scope
+        assertEquals(NUM_JAR_SCOPES * 2, symbolUploaderMock.multiPartContents.size());
+        for (int i = 0; i < NUM_JAR_SCOPES * 2; i += 2) {
+            String strContent = assertMultipartContent(symbolUploaderMock, i);
+            assertTrue(strContent.contains("\"source_file\":\"jar" + (i / 2) + ".jar\""));
+        }
     }
-    symbolSink.addScope(
-        Scope.builder(ScopeType.JAR, "jar1.jar", 0, 0)
-            .name("jar1.jar")
-            .scopes(classScopes)
-            .build());
-    symbolSink.flush();
-    // split upload request per jar scope
-    final int EXPECTED_REQUESTS = 4;
-    assertEquals(EXPECTED_REQUESTS * 2, symbolUploaderMock.multiPartContents.size());
-    List<List<String>> expectedSourceFiles =
-        Arrays.asList(
-            Arrays.asList("class0", "class1"),
-            Arrays.asList("class2", "class3", "class4"),
-            Arrays.asList("class5", "class6"),
-            Arrays.asList("class7", "class8", "class9"));
-    for (int i = 0; i < EXPECTED_REQUESTS * 2; i += 2) {
-      String strContent = assertMultipartContent(symbolUploaderMock, i);
-      for (String sourceFile : expectedSourceFiles.get(i / 2)) {
-        assertTrue(strContent.contains("\"source_file\":\"" + sourceFile + "\""));
-      }
+
+    @Test
+    public void splitTooManyJarScopes() {
+        SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
+        Config config = mock(Config.class);
+        when(config.getServiceName()).thenReturn("service1");
+        when(config.isSymbolDatabaseCompressed()).thenReturn(false);
+        SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, 4096);
+        final int NUM_JAR_SCOPES = 21;
+        for (int i = 0; i < NUM_JAR_SCOPES; i++) {
+            symbolSink.addScope(Scope.builder(ScopeType.JAR, "jar" + i + ".jar", 0, 0)
+                    .scopes(singletonList(
+                            Scope.builder(ScopeType.CLASS, "class" + i, 0, 0).build()))
+                    .build());
+        }
+        symbolSink.flush();
+        // split upload request per half jar scopes
+        assertEquals(2 * 2, symbolUploaderMock.multiPartContents.size());
+        String strContent1 = assertMultipartContent(symbolUploaderMock, 0);
+        assertTrue(strContent1.contains("\"source_file\":\"jar0.jar\""));
+        assertTrue(strContent1.contains("\"source_file\":\"jar9.jar\""));
+        String strContent2 = assertMultipartContent(symbolUploaderMock, 2);
+        assertTrue(strContent2.contains("\"source_file\":\"jar10.jar\""));
+        assertTrue(strContent2.contains("\"source_file\":\"jar20.jar\""));
     }
-  }
 
-  @Test
-  public void splitByClassScopesImpossible() {
-    SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
-    Config config = mock(Config.class);
-    when(config.getServiceName()).thenReturn("service1");
-    when(config.isSymbolDatabaseCompressed()).thenReturn(false);
-    SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, 1);
-    final int NUM_CLASS_SCOPES = 10;
-    List<Scope> classScopes = new ArrayList<>();
-    for (int i = 0; i < NUM_CLASS_SCOPES; i++) {
-      classScopes.add(
-          Scope.builder(ScopeType.CLASS, "class" + i, 0, 0)
-              .scopes(
-                  Collections.singletonList(
-                      Scope.builder(ScopeType.METHOD, "class" + i, 0, 0)
-                          .name("method" + i)
-                          .build()))
-              .build());
+    @Test
+    public void splitByClassScopes() {
+        SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
+        Config config = mock(Config.class);
+        when(config.getServiceName()).thenReturn("service1");
+        when(config.isSymbolDatabaseCompressed()).thenReturn(false);
+        SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, 1024);
+        final int NUM_CLASS_SCOPES = 10;
+        List<Scope> classScopes = new ArrayList<>();
+        for (int i = 0; i < NUM_CLASS_SCOPES; i++) {
+            classScopes.add(Scope.builder(ScopeType.CLASS, "class" + i, 0, 0)
+                    .scopes(Collections.singletonList(Scope.builder(ScopeType.METHOD, "class" + i, 0, 0)
+                            .name("method" + i)
+                            .build()))
+                    .build());
+        }
+        symbolSink.addScope(Scope.builder(ScopeType.JAR, "jar1.jar", 0, 0)
+                .name("jar1.jar")
+                .scopes(classScopes)
+                .build());
+        symbolSink.flush();
+        // split upload request per jar scope
+        final int EXPECTED_REQUESTS = 4;
+        assertEquals(EXPECTED_REQUESTS * 2, symbolUploaderMock.multiPartContents.size());
+        List<List<String>> expectedSourceFiles = Arrays.asList(
+                Arrays.asList("class0", "class1"),
+                Arrays.asList("class2", "class3", "class4"),
+                Arrays.asList("class5", "class6"),
+                Arrays.asList("class7", "class8", "class9"));
+        for (int i = 0; i < EXPECTED_REQUESTS * 2; i += 2) {
+            String strContent = assertMultipartContent(symbolUploaderMock, i);
+            for (String sourceFile : expectedSourceFiles.get(i / 2)) {
+                assertTrue(strContent.contains("\"source_file\":\"" + sourceFile + "\""));
+            }
+        }
     }
-    symbolSink.addScope(
-        Scope.builder(ScopeType.JAR, "jar1.jar", 0, 0)
-            .name("jar1.jar")
-            .scopes(classScopes)
-            .build());
-    symbolSink.flush();
-    // no request to upload because we cannot split the jar scope
-    assertTrue(symbolUploaderMock.multiPartContents.isEmpty());
-  }
 
-  @Test
-  public void maxCompressedAndSplit() {
-    SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
-    Config config = mock(Config.class);
-    when(config.getServiceName()).thenReturn("service1");
-    when(config.isSymbolDatabaseCompressed()).thenReturn(true);
-    SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, 512);
-    final int NUM_JAR_SCOPES = 100;
-    for (int i = 0; i < NUM_JAR_SCOPES; i++) {
-      symbolSink.addScope(
-          Scope.builder(ScopeType.JAR, "jar" + i + ".jar", 0, 0)
-              .scopes(singletonList(Scope.builder(ScopeType.CLASS, "class" + i, 0, 0).build()))
-              .build());
+    @Test
+    public void splitByClassScopesImpossible() {
+        SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
+        Config config = mock(Config.class);
+        when(config.getServiceName()).thenReturn("service1");
+        when(config.isSymbolDatabaseCompressed()).thenReturn(false);
+        SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, 1);
+        final int NUM_CLASS_SCOPES = 10;
+        List<Scope> classScopes = new ArrayList<>();
+        for (int i = 0; i < NUM_CLASS_SCOPES; i++) {
+            classScopes.add(Scope.builder(ScopeType.CLASS, "class" + i, 0, 0)
+                    .scopes(Collections.singletonList(Scope.builder(ScopeType.METHOD, "class" + i, 0, 0)
+                            .name("method" + i)
+                            .build()))
+                    .build());
+        }
+        symbolSink.addScope(Scope.builder(ScopeType.JAR, "jar1.jar", 0, 0)
+                .name("jar1.jar")
+                .scopes(classScopes)
+                .build());
+        symbolSink.flush();
+        // no request to upload because we cannot split the jar scope
+        assertTrue(symbolUploaderMock.multiPartContents.isEmpty());
     }
-    symbolSink.flush();
-    int total = symbolUploaderMock.multiPartContents.size();
-    assertTrue(
-        total >= 4, "expected at least 4 multipart entries (2+ event/file pairs), got " + total);
-    assertTrue(
-        total % 2 == 0,
-        "expected an even number of multipart entries (event/file pairs), got " + total);
-    for (int i = 0; i < total; i += 2) {
-      BatchUploader.MultiPartContent eventContent = symbolUploaderMock.multiPartContents.get(i);
-      assertEquals("event", eventContent.getPartName());
-      BatchUploader.MultiPartContent symbolContent =
-          symbolUploaderMock.multiPartContents.get(i + 1);
-      assertEquals(MediaType.get("application/gzip"), symbolContent.getMediaType());
+
+    @Test
+    public void maxCompressedAndSplit() {
+        SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
+        Config config = mock(Config.class);
+        when(config.getServiceName()).thenReturn("service1");
+        when(config.isSymbolDatabaseCompressed()).thenReturn(true);
+        SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, 512);
+        final int NUM_JAR_SCOPES = 100;
+        for (int i = 0; i < NUM_JAR_SCOPES; i++) {
+            symbolSink.addScope(Scope.builder(ScopeType.JAR, "jar" + i + ".jar", 0, 0)
+                    .scopes(singletonList(
+                            Scope.builder(ScopeType.CLASS, "class" + i, 0, 0).build()))
+                    .build());
+        }
+        symbolSink.flush();
+        int total = symbolUploaderMock.multiPartContents.size();
+        assertTrue(total >= 4, "expected at least 4 multipart entries (2+ event/file pairs), got " + total);
+        assertTrue(total % 2 == 0, "expected an even number of multipart entries (event/file pairs), got " + total);
+        for (int i = 0; i < total; i += 2) {
+            BatchUploader.MultiPartContent eventContent = symbolUploaderMock.multiPartContents.get(i);
+            assertEquals("event", eventContent.getPartName());
+            BatchUploader.MultiPartContent symbolContent = symbolUploaderMock.multiPartContents.get(i + 1);
+            assertEquals(MediaType.get("application/gzip"), symbolContent.getMediaType());
+        }
     }
-  }
 
-  private static String assertMultipartContent(SymbolUploaderMock symbolUploaderMock, int index) {
-    BatchUploader.MultiPartContent eventContent = symbolUploaderMock.multiPartContents.get(index);
-    assertEquals("event", eventContent.getPartName());
-    BatchUploader.MultiPartContent symbolContent =
-        symbolUploaderMock.multiPartContents.get(index + 1);
-    assertEquals("file", symbolContent.getPartName());
-    return new String(symbolContent.getContent());
-  }
+    private static String assertMultipartContent(SymbolUploaderMock symbolUploaderMock, int index) {
+        BatchUploader.MultiPartContent eventContent = symbolUploaderMock.multiPartContents.get(index);
+        assertEquals("event", eventContent.getPartName());
+        BatchUploader.MultiPartContent symbolContent = symbolUploaderMock.multiPartContents.get(index + 1);
+        assertEquals("file", symbolContent.getPartName());
+        return new String(symbolContent.getContent());
+    }
 
-  static class SymbolUploaderMock extends BatchUploader {
-    final List<MultiPartContent> multiPartContents = new ArrayList<>();
+    static class SymbolUploaderMock extends BatchUploader {
+        final List<MultiPartContent> multiPartContents = new ArrayList<>();
 
-    public SymbolUploaderMock() {
-      super("mock", Config.get(), "http://localhost", SymbolSink.RETRY_POLICY);
-    }
+        public SymbolUploaderMock() {
+            super("mock", Config.get(), "http://localhost", SymbolSink.RETRY_POLICY);
+        }
 
-    @Override
-    public void uploadAsMultipart(String tags, MultiPartContent... parts) {
-      multiPartContents.addAll(Arrays.asList(parts));
+        @Override
+        public void uploadAsMultipart(String tags, MultiPartContent... parts) {
+            multiPartContents.addAll(Arrays.asList(parts));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/AvroFilterTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/AvroFilterTest.java
index 2f43abd6c17..9221122769f 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/AvroFilterTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/AvroFilterTest.java
@@ -7,29 +7,25 @@
 import org.junit.jupiter.api.Test;
 
 class AvroFilterTest {
-  @Test
-  void filterOut() {
-    AvroFilter avroFilter = new AvroFilter();
-    assertFalse(avroFilter.filterOut(null));
-    Scope scope = Scope.builder(ScopeType.CLASS, "", 0, 0).build();
-    assertFalse(avroFilter.filterOut(scope));
-    scope = Scope.builder(ScopeType.CLASS, "", 0, 0).name("org.apache.avro.MyClass").build();
-    assertFalse(avroFilter.filterOut(scope));
-    scope =
-        Scope.builder(ScopeType.CLASS, "", 0, 0)
-            .languageSpecifics(
-                new LanguageSpecifics.Builder()
-                    .superClass("org.apache.avro.specific.SpecificRecordBase")
-                    .build())
-            .build();
-    assertFalse(avroFilter.filterOut(scope));
-    scope =
-        Scope.builder(ScopeType.CLASS, "", 0, 0)
-            .symbols(
-                asList(
-                    new Symbol(
-                        SymbolType.STATIC_FIELD, "SCHEMA$", 0, "org.apache.avro.Schema", null)))
-            .build();
-    assertTrue(avroFilter.filterOut(scope));
-  }
+    @Test
+    void filterOut() {
+        AvroFilter avroFilter = new AvroFilter();
+        assertFalse(avroFilter.filterOut(null));
+        Scope scope = Scope.builder(ScopeType.CLASS, "", 0, 0).build();
+        assertFalse(avroFilter.filterOut(scope));
+        scope = Scope.builder(ScopeType.CLASS, "", 0, 0)
+                .name("org.apache.avro.MyClass")
+                .build();
+        assertFalse(avroFilter.filterOut(scope));
+        scope = Scope.builder(ScopeType.CLASS, "", 0, 0)
+                .languageSpecifics(new LanguageSpecifics.Builder()
+                        .superClass("org.apache.avro.specific.SpecificRecordBase")
+                        .build())
+                .build();
+        assertFalse(avroFilter.filterOut(scope));
+        scope = Scope.builder(ScopeType.CLASS, "", 0, 0)
+                .symbols(asList(new Symbol(SymbolType.STATIC_FIELD, "SCHEMA$", 0, "org.apache.avro.Schema", null)))
+                .build();
+        assertTrue(avroFilter.filterOut(scope));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/JarScannerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/JarScannerTest.java
index 0dcda347746..59869cfa804 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/JarScannerTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/JarScannerTest.java
@@ -19,64 +19,65 @@
 import org.junit.jupiter.api.condition.OS;
 
 class JarScannerTest {
-  @Test
-  public void extractJarPathFromJar()
-      throws ClassNotFoundException, URISyntaxException, MalformedURLException {
-    final String CLASS_NAME = "com.datadog.debugger.symbol.SymbolExtraction01";
-    URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
-    URL jarUrl = new URL("jar:file:" + jarFileUrl.getFile() + "!/");
-    URLClassLoader urlClassLoader = new URLClassLoader(new URL[] {jarUrl}, null);
-    Class<?> testClass = urlClassLoader.loadClass(CLASS_NAME);
-    assertEquals(
-        jarFileUrl.getFile(), JarScanner.extractJarPath(testClass, SymDBReport.NO_OP).toString());
-    assertEquals(
-        jarFileUrl.getFile(),
-        JarScanner.extractJarPath(testClass.getProtectionDomain(), null).toString());
-  }
+    @Test
+    public void extractJarPathFromJar() throws ClassNotFoundException, URISyntaxException, MalformedURLException {
+        final String CLASS_NAME = "com.datadog.debugger.symbol.SymbolExtraction01";
+        URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
+        URL jarUrl = new URL("jar:file:" + jarFileUrl.getFile() + "!/");
+        URLClassLoader urlClassLoader = new URLClassLoader(new URL[] {jarUrl}, null);
+        Class<?> testClass = urlClassLoader.loadClass(CLASS_NAME);
+        assertEquals(
+                jarFileUrl.getFile(),
+                JarScanner.extractJarPath(testClass, SymDBReport.NO_OP).toString());
+        assertEquals(
+                jarFileUrl.getFile(),
+                JarScanner.extractJarPath(testClass.getProtectionDomain(), null).toString());
+    }
 
-  @Test
-  public void extractJarPathFromFile() throws ClassNotFoundException, URISyntaxException {
-    final String CLASS_NAME = "com.datadog.debugger.symbol.SymbolExtraction01";
-    URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
-    URLClassLoader urlClassLoader = new URLClassLoader(new URL[] {jarFileUrl}, null);
-    Class<?> testClass = urlClassLoader.loadClass(CLASS_NAME);
-    assertEquals(
-        jarFileUrl.getFile(), JarScanner.extractJarPath(testClass, SymDBReport.NO_OP).toString());
-  }
+    @Test
+    public void extractJarPathFromFile() throws ClassNotFoundException, URISyntaxException {
+        final String CLASS_NAME = "com.datadog.debugger.symbol.SymbolExtraction01";
+        URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
+        URLClassLoader urlClassLoader = new URLClassLoader(new URL[] {jarFileUrl}, null);
+        Class<?> testClass = urlClassLoader.loadClass(CLASS_NAME);
+        assertEquals(
+                jarFileUrl.getFile(),
+                JarScanner.extractJarPath(testClass, SymDBReport.NO_OP).toString());
+    }
 
-  @Test
-  public void extractJarPathFromNestedJar() throws URISyntaxException {
-    URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
-    URL mockLocation = mock(URL.class);
-    when(mockLocation.toString())
-        .thenReturn("jar:nested:" + jarFileUrl.getFile() + "/!BOOT-INF/classes/!");
-    CodeSource codeSource = new CodeSource(mockLocation, (Certificate[]) null);
-    ProtectionDomain protectionDomain = new ProtectionDomain(codeSource, null);
-    assertEquals(
-        jarFileUrl.getFile(), JarScanner.extractJarPath(protectionDomain, null).toString());
-  }
+    @Test
+    public void extractJarPathFromNestedJar() throws URISyntaxException {
+        URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
+        URL mockLocation = mock(URL.class);
+        when(mockLocation.toString()).thenReturn("jar:nested:" + jarFileUrl.getFile() + "/!BOOT-INF/classes/!");
+        CodeSource codeSource = new CodeSource(mockLocation, (Certificate[]) null);
+        ProtectionDomain protectionDomain = new ProtectionDomain(codeSource, null);
+        assertEquals(
+                jarFileUrl.getFile(),
+                JarScanner.extractJarPath(protectionDomain, null).toString());
+    }
 
-  @Test
-  @EnabledOnOs(OS.WINDOWS)
-  public void extractJarPathFromFileOnWindows() throws URISyntaxException {
-    URL mockLocation = mock(URL.class);
-    when(mockLocation.toString()).thenReturn("file:/C:/apps/server/classes/");
-    CodeSource codeSource = new CodeSource(mockLocation, (Certificate[]) null);
-    ProtectionDomain protectionDomain = new ProtectionDomain(codeSource, null);
-    Path result = JarScanner.extractJarPath(protectionDomain, SymDBReport.NO_OP);
-    assertNotNull(result);
-    assertTrue(result.toString().contains("server"));
-  }
+    @Test
+    @EnabledOnOs(OS.WINDOWS)
+    public void extractJarPathFromFileOnWindows() throws URISyntaxException {
+        URL mockLocation = mock(URL.class);
+        when(mockLocation.toString()).thenReturn("file:/C:/apps/server/classes/");
+        CodeSource codeSource = new CodeSource(mockLocation, (Certificate[]) null);
+        ProtectionDomain protectionDomain = new ProtectionDomain(codeSource, null);
+        Path result = JarScanner.extractJarPath(protectionDomain, SymDBReport.NO_OP);
+        assertNotNull(result);
+        assertTrue(result.toString().contains("server"));
+    }
 
-  @Test
-  @EnabledOnOs(OS.WINDOWS)
-  public void extractJarPathFromJarOnWindows() throws URISyntaxException {
-    URL mockLocation = mock(URL.class);
-    when(mockLocation.toString()).thenReturn("jar:file:/C:/libs/app.jar!/com/example/");
-    CodeSource codeSource = new CodeSource(mockLocation, (Certificate[]) null);
-    ProtectionDomain protectionDomain = new ProtectionDomain(codeSource, null);
-    Path result = JarScanner.extractJarPath(protectionDomain, SymDBReport.NO_OP);
-    assertNotNull(result);
-    assertTrue(result.toString().contains("app.jar"));
-  }
+    @Test
+    @EnabledOnOs(OS.WINDOWS)
+    public void extractJarPathFromJarOnWindows() throws URISyntaxException {
+        URL mockLocation = mock(URL.class);
+        when(mockLocation.toString()).thenReturn("jar:file:/C:/libs/app.jar!/com/example/");
+        CodeSource codeSource = new CodeSource(mockLocation, (Certificate[]) null);
+        ProtectionDomain protectionDomain = new ProtectionDomain(codeSource, null);
+        Path result = JarScanner.extractJarPath(protectionDomain, SymDBReport.NO_OP);
+        assertNotNull(result);
+        assertTrue(result.toString().contains("app.jar"));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/ProtoFilterTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/ProtoFilterTest.java
index 2cacb4028b0..e1b3a325472 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/ProtoFilterTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/ProtoFilterTest.java
@@ -7,49 +7,38 @@
 import org.junit.jupiter.api.Test;
 
 class ProtoFilterTest {
-  @Test
-  void filterOut() {
-    ProtoFilter protoFilter = new ProtoFilter();
-    assertFalse(protoFilter.filterOut(null));
-    Scope scope = Scope.builder(ScopeType.CLASS, "", 0, 0).build();
-    assertFalse(protoFilter.filterOut(scope));
-    scope = Scope.builder(ScopeType.CLASS, "", 0, 0).name("com.google.protobuf.MyClass").build();
-    assertFalse(protoFilter.filterOut(scope));
-    scope =
-        Scope.builder(ScopeType.CLASS, "", 0, 0)
-            .languageSpecifics(
-                new LanguageSpecifics.Builder()
-                    .addInterfaces(asList("com.google.protobuf.MessageOrBuilder"))
-                    .build())
-            .build();
-    assertTrue(protoFilter.filterOut(scope));
-    scope =
-        Scope.builder(ScopeType.CLASS, "", 0, 0)
-            .languageSpecifics(
-                new LanguageSpecifics.Builder()
-                    .superClass("com.google.protobuf.AbstractParser")
-                    .build())
-            .build();
-    assertTrue(protoFilter.filterOut(scope));
-    scope =
-        Scope.builder(ScopeType.CLASS, "", 0, 0)
-            .languageSpecifics(
-                new LanguageSpecifics.Builder()
-                    .superClass("com.google.protobuf.GeneratedMessageV3$Builder")
-                    .build())
-            .build();
-    assertTrue(protoFilter.filterOut(scope));
-    scope =
-        Scope.builder(ScopeType.CLASS, "", 0, 0)
-            .symbols(
-                asList(
-                    new Symbol(
-                        SymbolType.STATIC_FIELD,
-                        "SCHEMA$",
-                        0,
-                        "com.google.protobuf.Descriptors",
-                        null)))
-            .build();
-    assertTrue(protoFilter.filterOut(scope));
-  }
+    @Test
+    void filterOut() {
+        ProtoFilter protoFilter = new ProtoFilter();
+        assertFalse(protoFilter.filterOut(null));
+        Scope scope = Scope.builder(ScopeType.CLASS, "", 0, 0).build();
+        assertFalse(protoFilter.filterOut(scope));
+        scope = Scope.builder(ScopeType.CLASS, "", 0, 0)
+                .name("com.google.protobuf.MyClass")
+                .build();
+        assertFalse(protoFilter.filterOut(scope));
+        scope = Scope.builder(ScopeType.CLASS, "", 0, 0)
+                .languageSpecifics(new LanguageSpecifics.Builder()
+                        .addInterfaces(asList("com.google.protobuf.MessageOrBuilder"))
+                        .build())
+                .build();
+        assertTrue(protoFilter.filterOut(scope));
+        scope = Scope.builder(ScopeType.CLASS, "", 0, 0)
+                .languageSpecifics(new LanguageSpecifics.Builder()
+                        .superClass("com.google.protobuf.AbstractParser")
+                        .build())
+                .build();
+        assertTrue(protoFilter.filterOut(scope));
+        scope = Scope.builder(ScopeType.CLASS, "", 0, 0)
+                .languageSpecifics(new LanguageSpecifics.Builder()
+                        .superClass("com.google.protobuf.GeneratedMessageV3$Builder")
+                        .build())
+                .build();
+        assertTrue(protoFilter.filterOut(scope));
+        scope = Scope.builder(ScopeType.CLASS, "", 0, 0)
+                .symbols(asList(
+                        new Symbol(SymbolType.STATIC_FIELD, "SCHEMA$", 0, "com.google.protobuf.Descriptors", null)))
+                .build();
+        assertTrue(protoFilter.filterOut(scope));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SourceRemapperTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SourceRemapperTest.java
index 1542488b497..a2fa9fde8a2 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SourceRemapperTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SourceRemapperTest.java
@@ -14,33 +14,33 @@
 
 class SourceRemapperTest {
 
-  @Test
-  public void noopSourceRemapper() {
-    assertEquals(SourceRemapper.NOOP_REMAPPER, SourceRemapper.getSourceRemapper("foo.java", null));
-    assertEquals(SourceRemapper.NOOP_REMAPPER, SourceRemapper.getSourceRemapper("foo.dat", null));
-  }
+    @Test
+    public void noopSourceRemapper() {
+        assertEquals(SourceRemapper.NOOP_REMAPPER, SourceRemapper.getSourceRemapper("foo.java", null));
+        assertEquals(SourceRemapper.NOOP_REMAPPER, SourceRemapper.getSourceRemapper("foo.dat", null));
+    }
 
-  @Test
-  public void kotlinSourceRemapper() {
-    SourceMap sourceMapMock = mock(SourceMap.class);
-    StratumExt stratumMainMock = mock(StratumExt.class);
-    StratumExt stratumDebugMock = mock(StratumExt.class);
-    when(sourceMapMock.getStratum(eq("Kotlin"))).thenReturn(stratumMainMock);
-    when(sourceMapMock.getStratum(eq("KotlinDebug"))).thenReturn(stratumDebugMock);
-    when(stratumDebugMock.getInputLine(eq(42))).thenReturn(Pair.of("", 24));
-    SourceRemapper sourceRemapper = SourceRemapper.getSourceRemapper("foo.kt", sourceMapMock);
-    assertTrue(sourceRemapper instanceof SourceRemapper.KotlinSourceRemapper);
-    assertEquals(24, sourceRemapper.remapSourceLine(42));
-  }
+    @Test
+    public void kotlinSourceRemapper() {
+        SourceMap sourceMapMock = mock(SourceMap.class);
+        StratumExt stratumMainMock = mock(StratumExt.class);
+        StratumExt stratumDebugMock = mock(StratumExt.class);
+        when(sourceMapMock.getStratum(eq("Kotlin"))).thenReturn(stratumMainMock);
+        when(sourceMapMock.getStratum(eq("KotlinDebug"))).thenReturn(stratumDebugMock);
+        when(stratumDebugMock.getInputLine(eq(42))).thenReturn(Pair.of("", 24));
+        SourceRemapper sourceRemapper = SourceRemapper.getSourceRemapper("foo.kt", sourceMapMock);
+        assertTrue(sourceRemapper instanceof SourceRemapper.KotlinSourceRemapper);
+        assertEquals(24, sourceRemapper.remapSourceLine(42));
+    }
 
-  @Test
-  public void noKotlinDebug() {
-    SourceMap sourceMapMock = mock(SourceMap.class);
-    when(sourceMapMock.getDefaultStratumName()).thenReturn("Main");
-    StratumExt stratumMainMock = mock(StratumExt.class);
-    when(sourceMapMock.getStratum(eq("Kotlin"))).thenReturn(stratumMainMock);
-    when(sourceMapMock.getStratum(eq("KotlinDebug"))).thenReturn(null);
-    SourceRemapper sourceRemapper = SourceRemapper.getSourceRemapper("foo.kt", sourceMapMock);
-    assertNotNull(sourceRemapper);
-  }
+    @Test
+    public void noKotlinDebug() {
+        SourceMap sourceMapMock = mock(SourceMap.class);
+        when(sourceMapMock.getDefaultStratumName()).thenReturn("Main");
+        StratumExt stratumMainMock = mock(StratumExt.class);
+        when(sourceMapMock.getStratum(eq("Kotlin"))).thenReturn(stratumMainMock);
+        when(sourceMapMock.getStratum(eq("KotlinDebug"))).thenReturn(null);
+        SourceRemapper sourceRemapper = SourceRemapper.getSourceRemapper("foo.kt", sourceMapMock);
+        assertNotNull(sourceRemapper);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymDBEnablementTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymDBEnablementTest.java
index 9c3916067d3..69557ef703d 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymDBEnablementTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymDBEnablementTest.java
@@ -41,218 +41,196 @@
 import org.mockito.ArgumentCaptor;
 
 class SymDBEnablementTest {
-  private static final String CONFIG_KEY =
-      "datadog/2/LIVE_DEBUGGING_SYMBOL_DB/symDb/d5df9e11566aee56b2c9f8a557680ac53fd3a021141a71275345a90e77f2f2ed";
-  private static final byte[] UPlOAD_SYMBOL_TRUE = "{\"upload_symbols\": true}".getBytes();
-  private static final byte[] UPlOAD_SYMBOL_FALSE = "{\"upload_symbols\": false}".getBytes();
-  private Instrumentation instr = mock(Instrumentation.class);
-  private Config config;
-  private SymbolSink symbolSink;
+    private static final String CONFIG_KEY =
+            "datadog/2/LIVE_DEBUGGING_SYMBOL_DB/symDb/d5df9e11566aee56b2c9f8a557680ac53fd3a021141a71275345a90e77f2f2ed";
+    private static final byte[] UPlOAD_SYMBOL_TRUE = "{\"upload_symbols\": true}".getBytes();
+    private static final byte[] UPlOAD_SYMBOL_FALSE = "{\"upload_symbols\": false}".getBytes();
+    private Instrumentation instr = mock(Instrumentation.class);
+    private Config config;
+    private SymbolSink symbolSink;
 
-  @BeforeEach
-  public void before() {
-    when(instr.getAllLoadedClasses()).thenReturn(new Class[0]);
-    when(instr.isModifiableClass(any())).thenReturn(true);
-    config = mock(Config.class);
-    when(config.getThirdPartyIncludes()).thenReturn(Collections.singleton("com.datadog.debugger"));
-    when(config.isSymbolDatabaseEnabled()).thenReturn(true);
-    symbolSink = mock(SymbolSink.class);
-  }
+    @BeforeEach
+    public void before() {
+        when(instr.getAllLoadedClasses()).thenReturn(new Class[0]);
+        when(instr.isModifiableClass(any())).thenReturn(true);
+        config = mock(Config.class);
+        when(config.getThirdPartyIncludes()).thenReturn(Collections.singleton("com.datadog.debugger"));
+        when(config.isSymbolDatabaseEnabled()).thenReturn(true);
+        symbolSink = mock(SymbolSink.class);
+    }
 
-  @Test
-  public void enableDisableSymDBThroughRC() throws Exception {
-    ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
-    SymDBEnablement symDBEnablement =
-        new SymDBEnablement(
-            instr,
-            config,
-            new SymbolAggregator(classNameFiltering, emptyList(), symbolSink, 1),
-            classNameFiltering);
-    symDBEnablement.accept(ParsedConfigKey.parse(CONFIG_KEY), UPlOAD_SYMBOL_TRUE, null);
-    waitForUpload(symDBEnablement);
-    verify(instr).addTransformer(any(SymbolExtractionTransformer.class));
-    symDBEnablement.accept(ParsedConfigKey.parse(CONFIG_KEY), UPlOAD_SYMBOL_FALSE, null);
-    verify(instr).removeTransformer(any(SymbolExtractionTransformer.class));
-  }
+    @Test
+    public void enableDisableSymDBThroughRC() throws Exception {
+        ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
+        SymDBEnablement symDBEnablement = new SymDBEnablement(
+                instr,
+                config,
+                new SymbolAggregator(classNameFiltering, emptyList(), symbolSink, 1),
+                classNameFiltering);
+        symDBEnablement.accept(ParsedConfigKey.parse(CONFIG_KEY), UPlOAD_SYMBOL_TRUE, null);
+        waitForUpload(symDBEnablement);
+        verify(instr).addTransformer(any(SymbolExtractionTransformer.class));
+        symDBEnablement.accept(ParsedConfigKey.parse(CONFIG_KEY), UPlOAD_SYMBOL_FALSE, null);
+        verify(instr).removeTransformer(any(SymbolExtractionTransformer.class));
+    }
 
-  @Test
-  public void removeSymDBConfig() throws Exception {
-    ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
-    SymDBEnablement symDBEnablement =
-        new SymDBEnablement(
-            instr,
-            config,
-            new SymbolAggregator(classNameFiltering, emptyList(), symbolSink, 1),
-            classNameFiltering);
-    symDBEnablement.accept(ParsedConfigKey.parse(CONFIG_KEY), UPlOAD_SYMBOL_TRUE, null);
-    waitForUpload(symDBEnablement);
-    symDBEnablement.remove(ParsedConfigKey.parse(CONFIG_KEY), null);
-    verify(instr).removeTransformer(any(SymbolExtractionTransformer.class));
-  }
+    @Test
+    public void removeSymDBConfig() throws Exception {
+        ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
+        SymDBEnablement symDBEnablement = new SymDBEnablement(
+                instr,
+                config,
+                new SymbolAggregator(classNameFiltering, emptyList(), symbolSink, 1),
+                classNameFiltering);
+        symDBEnablement.accept(ParsedConfigKey.parse(CONFIG_KEY), UPlOAD_SYMBOL_TRUE, null);
+        waitForUpload(symDBEnablement);
+        symDBEnablement.remove(ParsedConfigKey.parse(CONFIG_KEY), null);
+        verify(instr).removeTransformer(any(SymbolExtractionTransformer.class));
+    }
 
-  @Test
-  public void noIncludesFilterOutDatadogClass() {
-    when(config.getThirdPartyExcludes()).thenReturn(Collections.emptySet());
-    when(config.getThirdPartyIncludes()).thenReturn(Collections.singleton("com.datadog.debugger."));
-    ClassNameFiltering classNameFiltering = new ClassNameFiltering(config);
-    SymDBEnablement symDBEnablement =
-        new SymDBEnablement(
-            instr,
-            config,
-            new SymbolAggregator(classNameFiltering, emptyList(), symbolSink, 1),
-            classNameFiltering);
-    symDBEnablement.startSymbolExtraction();
-    ArgumentCaptor<SymbolExtractionTransformer> captor =
-        ArgumentCaptor.forClass(SymbolExtractionTransformer.class);
-    verify(instr).addTransformer(captor.capture());
-    SymbolExtractionTransformer transformer = captor.getValue();
-    ClassNameFilter classNameFilter = transformer.getClassNameFiltering();
-    assertTrue(classNameFilter.isExcluded("com.datadog.debugger.test.TestClass"));
-    assertFalse(classNameFilter.isExcluded("org.foobar.test.TestClass"));
-  }
+    @Test
+    public void noIncludesFilterOutDatadogClass() {
+        when(config.getThirdPartyExcludes()).thenReturn(Collections.emptySet());
+        when(config.getThirdPartyIncludes()).thenReturn(Collections.singleton("com.datadog.debugger."));
+        ClassNameFiltering classNameFiltering = new ClassNameFiltering(config);
+        SymDBEnablement symDBEnablement = new SymDBEnablement(
+                instr,
+                config,
+                new SymbolAggregator(classNameFiltering, emptyList(), symbolSink, 1),
+                classNameFiltering);
+        symDBEnablement.startSymbolExtraction();
+        ArgumentCaptor<SymbolExtractionTransformer> captor = ArgumentCaptor.forClass(SymbolExtractionTransformer.class);
+        verify(instr).addTransformer(captor.capture());
+        SymbolExtractionTransformer transformer = captor.getValue();
+        ClassNameFilter classNameFilter = transformer.getClassNameFiltering();
+        assertTrue(classNameFilter.isExcluded("com.datadog.debugger.test.TestClass"));
+        assertFalse(classNameFilter.isExcluded("org.foobar.test.TestClass"));
+    }
 
-  @Test
-  public void parseLoadedClass() throws ClassNotFoundException, IOException {
-    Class<?> testClass = loadSymbolClassFromJar();
-    when(instr.getAllLoadedClasses()).thenReturn(new Class[] {testClass, null});
-    when(config.getThirdPartyIncludes())
-        .thenReturn(
-            Stream.of("com.datadog.debugger.", "org.springframework.samples.")
-                .collect(Collectors.toSet()));
-    ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
-    SymbolAggregator symbolAggregator =
-        spy(new SymbolAggregator(classNameFiltering, emptyList(), symbolSink, 1));
-    SymDBEnablement symDBEnablement =
-        new SymDBEnablement(instr, config, symbolAggregator, classNameFiltering);
-    symDBEnablement.startSymbolExtraction();
-    verify(instr).addTransformer(any(SymbolExtractionTransformer.class));
-    ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
-    verify(symbolAggregator, times(2))
-        .parseClass(
-            any(),
-            captor.capture(),
-            any(),
-            eq(getClass().getResource("/debugger-symbol.jar").getFile()));
-    assertEquals(
-        "com/datadog/debugger/symbol/SymbolExtraction01.class", captor.getAllValues().get(0));
-    assertEquals(
-        "BOOT-INF/classes/org/springframework/samples/petclinic/vet/VetController.class",
-        captor.getAllValues().get(1));
-  }
+    @Test
+    public void parseLoadedClass() throws ClassNotFoundException, IOException {
+        Class<?> testClass = loadSymbolClassFromJar();
+        when(instr.getAllLoadedClasses()).thenReturn(new Class[] {testClass, null});
+        when(config.getThirdPartyIncludes())
+                .thenReturn(Stream.of("com.datadog.debugger.", "org.springframework.samples.")
+                        .collect(Collectors.toSet()));
+        ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
+        SymbolAggregator symbolAggregator = spy(new SymbolAggregator(classNameFiltering, emptyList(), symbolSink, 1));
+        SymDBEnablement symDBEnablement = new SymDBEnablement(instr, config, symbolAggregator, classNameFiltering);
+        symDBEnablement.startSymbolExtraction();
+        verify(instr).addTransformer(any(SymbolExtractionTransformer.class));
+        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+        verify(symbolAggregator, times(2))
+                .parseClass(
+                        any(),
+                        captor.capture(),
+                        any(),
+                        eq(getClass().getResource("/debugger-symbol.jar").getFile()));
+        assertEquals(
+                "com/datadog/debugger/symbol/SymbolExtraction01.class",
+                captor.getAllValues().get(0));
+        assertEquals(
+                "BOOT-INF/classes/org/springframework/samples/petclinic/vet/VetController.class",
+                captor.getAllValues().get(1));
+    }
 
-  @Test
-  public void processCorruptedJar() throws ClassNotFoundException, MalformedURLException {
-    Class<?> testClass = loadSymbolClassFromJar();
-    when(instr.getAllLoadedClasses())
-        .thenReturn(new Class[] {SymDBEnablementTest.class, testClass});
-    ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
-    SymbolAggregator symbolAggregatorMock = mock(SymbolAggregator.class);
-    doAnswer(
-            invocation -> {
-              Path arg = invocation.getArgument(1, Path.class);
-              if (arg.toString().endsWith("/debugger-symbol.jar")) {
-                return null;
-              }
-              throw new IOException("Corrupted jar");
-            })
-        .when(symbolAggregatorMock)
-        .scanJar(any(), any(), any(), any());
-    SymDBEnablement symDBEnablement =
-        new SymDBEnablement(instr, config, symbolAggregatorMock, classNameFiltering);
-    symDBEnablement.startSymbolExtraction();
-    verify(symbolAggregatorMock, times(2)).scanJar(any(), any(), any(), any());
-  }
+    @Test
+    public void processCorruptedJar() throws ClassNotFoundException, MalformedURLException {
+        Class<?> testClass = loadSymbolClassFromJar();
+        when(instr.getAllLoadedClasses()).thenReturn(new Class[] {SymDBEnablementTest.class, testClass});
+        ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
+        SymbolAggregator symbolAggregatorMock = mock(SymbolAggregator.class);
+        doAnswer(invocation -> {
+                    Path arg = invocation.getArgument(1, Path.class);
+                    if (arg.toString().endsWith("/debugger-symbol.jar")) {
+                        return null;
+                    }
+                    throw new IOException("Corrupted jar");
+                })
+                .when(symbolAggregatorMock)
+                .scanJar(any(), any(), any(), any());
+        SymDBEnablement symDBEnablement = new SymDBEnablement(instr, config, symbolAggregatorMock, classNameFiltering);
+        symDBEnablement.startSymbolExtraction();
+        verify(symbolAggregatorMock, times(2)).scanJar(any(), any(), any(), any());
+    }
 
-  private Class<?> loadSymbolClassFromJar() throws MalformedURLException, ClassNotFoundException {
-    final String CLASS_NAME = "com.datadog.debugger.symbol.SymbolExtraction01";
-    URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
-    URL jarUrl = new URL("jar:file:" + jarFileUrl.getFile() + "!/");
-    URLClassLoader urlClassLoader = new URLClassLoader(new URL[] {jarUrl}, null);
-    Class<?> testClass = urlClassLoader.loadClass(CLASS_NAME);
-    return testClass;
-  }
+    private Class<?> loadSymbolClassFromJar() throws MalformedURLException, ClassNotFoundException {
+        final String CLASS_NAME = "com.datadog.debugger.symbol.SymbolExtraction01";
+        URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
+        URL jarUrl = new URL("jar:file:" + jarFileUrl.getFile() + "!/");
+        URLClassLoader urlClassLoader = new URLClassLoader(new URL[] {jarUrl}, null);
+        Class<?> testClass = urlClassLoader.loadClass(CLASS_NAME);
+        return testClass;
+    }
 
-  @Test
-  public void parseLoadedClassFromDirectory()
-      throws ClassNotFoundException, IOException, URISyntaxException {
-    URL classFilesUrl = getClass().getResource("/");
-    URLClassLoader urlClassLoader = new URLClassLoader(new URL[] {classFilesUrl}, null);
-    Class<?> testClass = urlClassLoader.loadClass(getClass().getTypeName());
-    when(instr.getAllLoadedClasses()).thenReturn(new Class[] {testClass});
-    when(config.getThirdPartyIncludes())
-        .thenReturn(
-            Stream.of("com.datadog.debugger.", "org.springframework.samples.")
-                .collect(Collectors.toSet()));
-    ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
-    SymbolAggregator symbolAggregator =
-        spy(new SymbolAggregator(classNameFiltering, emptyList(), symbolSink, 1));
-    SymDBEnablement symDBEnablement =
-        new SymDBEnablement(instr, config, symbolAggregator, classNameFiltering);
-    symDBEnablement.startSymbolExtraction();
-    verify(instr).addTransformer(any(SymbolExtractionTransformer.class));
-    ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
-    verify(symbolAggregator, atLeastOnce()).parseClass(any(), captor.capture(), any(), anyString());
-    // verify that we called parseClass on this test class
-    assertTrue(captor.getAllValues().contains(getClass().getSimpleName() + ".class"));
-  }
+    @Test
+    public void parseLoadedClassFromDirectory() throws ClassNotFoundException, IOException, URISyntaxException {
+        URL classFilesUrl = getClass().getResource("/");
+        URLClassLoader urlClassLoader = new URLClassLoader(new URL[] {classFilesUrl}, null);
+        Class<?> testClass = urlClassLoader.loadClass(getClass().getTypeName());
+        when(instr.getAllLoadedClasses()).thenReturn(new Class[] {testClass});
+        when(config.getThirdPartyIncludes())
+                .thenReturn(Stream.of("com.datadog.debugger.", "org.springframework.samples.")
+                        .collect(Collectors.toSet()));
+        ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
+        SymbolAggregator symbolAggregator = spy(new SymbolAggregator(classNameFiltering, emptyList(), symbolSink, 1));
+        SymDBEnablement symDBEnablement = new SymDBEnablement(instr, config, symbolAggregator, classNameFiltering);
+        symDBEnablement.startSymbolExtraction();
+        verify(instr).addTransformer(any(SymbolExtractionTransformer.class));
+        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+        verify(symbolAggregator, atLeastOnce()).parseClass(any(), captor.capture(), any(), anyString());
+        // verify that we called parseClass on this test class
+        assertTrue(captor.getAllValues().contains(getClass().getSimpleName() + ".class"));
+    }
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void noDuplicateSymbolExtraction() {
-    final String CLASS_NAME_PATH = "com/datadog/debugger/symbol/SymbolExtraction01";
-    SymbolSink mockSymbolSink = mock(SymbolSink.class);
-    ClassNameFiltering classNameFiltering =
-        new ClassNameFiltering(
-            Collections.singleton("org.springframework."),
-            Collections.singleton("com.datadog.debugger."),
-            Collections.emptySet());
-    SymbolAggregator symbolAggregator =
-        new SymbolAggregator(classNameFiltering, emptyList(), mockSymbolSink, 1);
-    SymDBEnablement symDBEnablement =
-        new SymDBEnablement(instr, config, symbolAggregator, classNameFiltering);
-    doAnswer(
-            invocation -> {
-              SymbolExtractionTransformer transformer = invocation.getArgument(0);
-              JarFile jarFile =
-                  new JarFile(getClass().getResource("/debugger-symbol.jar").getFile());
-              JarEntry jarEntry = jarFile.getJarEntry(CLASS_NAME_PATH + ".class");
-              InputStream inputStream = jarFile.getInputStream(jarEntry);
-              byte[] buffer = new byte[4096];
-              ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
-              int readBytes;
-              baos.reset();
-              while ((readBytes = inputStream.read(buffer)) != -1) {
-                baos.write(buffer, 0, readBytes);
-              }
-              transformer.transform(
-                  getClass().getClassLoader(), CLASS_NAME_PATH, null, null, baos.toByteArray());
-              return null;
-            })
-        .when(instr)
-        .addTransformer(any(SymbolExtractionTransformer.class), eq(true));
-    when(instr.getAllLoadedClasses())
-        .thenAnswer(
-            invocation -> {
-              URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
-              URL jarUrl = new URL("jar:file:" + jarFileUrl.getFile() + "!/");
-              URLClassLoader urlClassLoader = new URLClassLoader(new URL[] {jarUrl}, null);
-              Class<?> testClass = urlClassLoader.loadClass(Strings.getClassName(CLASS_NAME_PATH));
-              return new Class[] {testClass};
-            });
-    symDBEnablement.startSymbolExtraction();
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void noDuplicateSymbolExtraction() {
+        final String CLASS_NAME_PATH = "com/datadog/debugger/symbol/SymbolExtraction01";
+        SymbolSink mockSymbolSink = mock(SymbolSink.class);
+        ClassNameFiltering classNameFiltering = new ClassNameFiltering(
+                Collections.singleton("org.springframework."),
+                Collections.singleton("com.datadog.debugger."),
+                Collections.emptySet());
+        SymbolAggregator symbolAggregator = new SymbolAggregator(classNameFiltering, emptyList(), mockSymbolSink, 1);
+        SymDBEnablement symDBEnablement = new SymDBEnablement(instr, config, symbolAggregator, classNameFiltering);
+        doAnswer(invocation -> {
+                    SymbolExtractionTransformer transformer = invocation.getArgument(0);
+                    JarFile jarFile = new JarFile(
+                            getClass().getResource("/debugger-symbol.jar").getFile());
+                    JarEntry jarEntry = jarFile.getJarEntry(CLASS_NAME_PATH + ".class");
+                    InputStream inputStream = jarFile.getInputStream(jarEntry);
+                    byte[] buffer = new byte[4096];
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
+                    int readBytes;
+                    baos.reset();
+                    while ((readBytes = inputStream.read(buffer)) != -1) {
+                        baos.write(buffer, 0, readBytes);
+                    }
+                    transformer.transform(getClass().getClassLoader(), CLASS_NAME_PATH, null, null, baos.toByteArray());
+                    return null;
+                })
+                .when(instr)
+                .addTransformer(any(SymbolExtractionTransformer.class), eq(true));
+        when(instr.getAllLoadedClasses()).thenAnswer(invocation -> {
+            URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
+            URL jarUrl = new URL("jar:file:" + jarFileUrl.getFile() + "!/");
+            URLClassLoader urlClassLoader = new URLClassLoader(new URL[] {jarUrl}, null);
+            Class<?> testClass = urlClassLoader.loadClass(Strings.getClassName(CLASS_NAME_PATH));
+            return new Class[] {testClass};
+        });
+        symDBEnablement.startSymbolExtraction();
 
-    verify(mockSymbolSink, times(1)).addScope(any());
-  }
+        verify(mockSymbolSink, times(1)).addScope(any());
+    }
 
-  private void waitForUpload(SymDBEnablement symDBEnablement) throws InterruptedException {
-    int count = 0;
-    while (symDBEnablement.getLastUploadTimestamp() == 0) {
-      Thread.sleep(1);
-      if (count++ > 30 * 1000) {
-        throw new RuntimeException("Timeout waiting for symDBEnablement.getLastUploadTimestamp()");
-      }
+    private void waitForUpload(SymDBEnablement symDBEnablement) throws InterruptedException {
+        int count = 0;
+        while (symDBEnablement.getLastUploadTimestamp() == 0) {
+            Thread.sleep(1);
+            if (count++ > 30 * 1000) {
+                throw new RuntimeException("Timeout waiting for symDBEnablement.getLastUploadTimestamp()");
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolAggregatorTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolAggregatorTest.java
index c4f57c0ff8d..2f1b78952fe 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolAggregatorTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolAggregatorTest.java
@@ -36,120 +36,115 @@
 
 class SymbolAggregatorTest {
 
-  @Test
-  void testScanQueuedJars() {
-    SymbolSink symbolSink = mock(SymbolSink.class);
-    SymbolAggregator symbolAggregator =
-        spy(new SymbolAggregator(ClassNameFiltering.allowAll(), emptyList(), symbolSink, 1));
-    URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
-    CodeSource codeSource = new CodeSource(jarFileUrl, (java.security.cert.Certificate[]) null);
-    ProtectionDomain protectionDomain = new ProtectionDomain(codeSource, null);
-    symbolAggregator.parseClass(null, null, protectionDomain);
-    symbolAggregator.scanQueuedJars(null);
-    ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
-    verify(symbolAggregator, atLeastOnce())
-        .parseClass(any(), captor.capture(), any(), eq(jarFileUrl.getFile()));
-    // captor.getAllValues().get(0) is the first argument of the first invocation of parseClass with
-    // null
-    assertEquals(
-        "com/datadog/debugger/symbol/SymbolExtraction01.class", captor.getAllValues().get(1));
-    assertEquals(
-        "BOOT-INF/classes/org/springframework/samples/petclinic/vet/VetController.class",
-        captor.getAllValues().get(2));
-  }
+    @Test
+    void testScanQueuedJars() {
+        SymbolSink symbolSink = mock(SymbolSink.class);
+        SymbolAggregator symbolAggregator =
+                spy(new SymbolAggregator(ClassNameFiltering.allowAll(), emptyList(), symbolSink, 1));
+        URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
+        CodeSource codeSource = new CodeSource(jarFileUrl, (java.security.cert.Certificate[]) null);
+        ProtectionDomain protectionDomain = new ProtectionDomain(codeSource, null);
+        symbolAggregator.parseClass(null, null, protectionDomain);
+        symbolAggregator.scanQueuedJars(null);
+        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+        verify(symbolAggregator, atLeastOnce()).parseClass(any(), captor.capture(), any(), eq(jarFileUrl.getFile()));
+        // captor.getAllValues().get(0) is the first argument of the first invocation of parseClass with
+        // null
+        assertEquals(
+                "com/datadog/debugger/symbol/SymbolExtraction01.class",
+                captor.getAllValues().get(1));
+        assertEquals(
+                "BOOT-INF/classes/org/springframework/samples/petclinic/vet/VetController.class",
+                captor.getAllValues().get(2));
+    }
 
-  @Test
-  void testScanQueuedCorruptedJars() {
-    SymbolSink symbolSink = mock(SymbolSink.class);
-    SymbolAggregator symbolAggregator =
-        spy(new SymbolAggregator(ClassNameFiltering.allowAll(), emptyList(), symbolSink, 1));
-    // add first a corrupted jar
-    URL corruptedUrl = getClass().getResource("/com/datadog/debugger/classfiles/CommandLine.class");
-    CodeSource corruptedCodeSource =
-        new CodeSource(corruptedUrl, (java.security.cert.Certificate[]) null);
-    ProtectionDomain corruptedProtectionDomain = new ProtectionDomain(corruptedCodeSource, null);
-    symbolAggregator.parseClass(null, null, corruptedProtectionDomain);
-    // add second a clean jar
-    URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
-    CodeSource codeSource = new CodeSource(jarFileUrl, (java.security.cert.Certificate[]) null);
-    ProtectionDomain protectionDomain = new ProtectionDomain(codeSource, null);
-    symbolAggregator.parseClass(null, null, protectionDomain);
-    symbolAggregator.scanQueuedJars(null);
-    // clean jar should have been processed
-    ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
-    verify(symbolAggregator, atLeastOnce())
-        .parseClass(any(), captor.capture(), any(), eq(jarFileUrl.getFile()));
-    // captor.getAllValues().get(0) is the first argument of the first invocation of parseClass with
-    // null
-    assertEquals(
-        "com/datadog/debugger/symbol/SymbolExtraction01.class", captor.getAllValues().get(1));
-    assertEquals(
-        "BOOT-INF/classes/org/springframework/samples/petclinic/vet/VetController.class",
-        captor.getAllValues().get(2));
-  }
+    @Test
+    void testScanQueuedCorruptedJars() {
+        SymbolSink symbolSink = mock(SymbolSink.class);
+        SymbolAggregator symbolAggregator =
+                spy(new SymbolAggregator(ClassNameFiltering.allowAll(), emptyList(), symbolSink, 1));
+        // add first a corrupted jar
+        URL corruptedUrl = getClass().getResource("/com/datadog/debugger/classfiles/CommandLine.class");
+        CodeSource corruptedCodeSource = new CodeSource(corruptedUrl, (java.security.cert.Certificate[]) null);
+        ProtectionDomain corruptedProtectionDomain = new ProtectionDomain(corruptedCodeSource, null);
+        symbolAggregator.parseClass(null, null, corruptedProtectionDomain);
+        // add second a clean jar
+        URL jarFileUrl = getClass().getResource("/debugger-symbol.jar");
+        CodeSource codeSource = new CodeSource(jarFileUrl, (java.security.cert.Certificate[]) null);
+        ProtectionDomain protectionDomain = new ProtectionDomain(codeSource, null);
+        symbolAggregator.parseClass(null, null, protectionDomain);
+        symbolAggregator.scanQueuedJars(null);
+        // clean jar should have been processed
+        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+        verify(symbolAggregator, atLeastOnce()).parseClass(any(), captor.capture(), any(), eq(jarFileUrl.getFile()));
+        // captor.getAllValues().get(0) is the first argument of the first invocation of parseClass with
+        // null
+        assertEquals(
+                "com/datadog/debugger/symbol/SymbolExtraction01.class",
+                captor.getAllValues().get(1));
+        assertEquals(
+                "BOOT-INF/classes/org/springframework/samples/petclinic/vet/VetController.class",
+                captor.getAllValues().get(2));
+    }
 
-  @Test
-  void testScanJarClosesEntryStreams() throws Exception {
-    SymbolSink symbolSink = mock(SymbolSink.class);
-    CountingJarFile[] holder = new CountingJarFile[1];
-    SymbolAggregator symbolAggregator =
-        new SymbolAggregator(ClassNameFiltering.allowAll(), emptyList(), symbolSink, 1) {
-          @Override
-          JarFile openJarFile(File file) throws IOException {
-            return holder[0] = new CountingJarFile(file);
-          }
-        };
-    Path jarPath = Paths.get(getClass().getResource("/debugger-symbol.jar").toURI());
-    symbolAggregator.scanJar(
-        SymDBReport.NO_OP, jarPath, new ByteArrayOutputStream(8192), new byte[4096]);
-    assertTrue(holder[0].opened.get() > 0);
-    assertEquals(holder[0].opened.get(), holder[0].closed.get());
-  }
+    @Test
+    void testScanJarClosesEntryStreams() throws Exception {
+        SymbolSink symbolSink = mock(SymbolSink.class);
+        CountingJarFile[] holder = new CountingJarFile[1];
+        SymbolAggregator symbolAggregator =
+                new SymbolAggregator(ClassNameFiltering.allowAll(), emptyList(), symbolSink, 1) {
+                    @Override
+                    JarFile openJarFile(File file) throws IOException {
+                        return holder[0] = new CountingJarFile(file);
+                    }
+                };
+        Path jarPath = Paths.get(getClass().getResource("/debugger-symbol.jar").toURI());
+        symbolAggregator.scanJar(SymDBReport.NO_OP, jarPath, new ByteArrayOutputStream(8192), new byte[4096]);
+        assertTrue(holder[0].opened.get() > 0);
+        assertEquals(holder[0].opened.get(), holder[0].closed.get());
+    }
 
-  private static class CountingJarFile extends JarFile {
-    final AtomicInteger opened = new AtomicInteger();
-    final AtomicInteger closed = new AtomicInteger();
+    private static class CountingJarFile extends JarFile {
+        final AtomicInteger opened = new AtomicInteger();
+        final AtomicInteger closed = new AtomicInteger();
 
-    CountingJarFile(File file) throws IOException {
-      super(file);
-    }
+        CountingJarFile(File file) throws IOException {
+            super(file);
+        }
 
-    @Override
-    public synchronized InputStream getInputStream(ZipEntry ze) throws IOException {
-      opened.incrementAndGet();
-      return new FilterInputStream(super.getInputStream(ze)) {
         @Override
-        public void close() throws IOException {
-          closed.incrementAndGet();
-          super.close();
+        public synchronized InputStream getInputStream(ZipEntry ze) throws IOException {
+            opened.incrementAndGet();
+            return new FilterInputStream(super.getInputStream(ze)) {
+                @Override
+                public void close() throws IOException {
+                    closed.incrementAndGet();
+                    super.close();
+                }
+            };
         }
-      };
     }
-  }
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testScopeFilter() {
-    ScopeFilter mockFilter = mock(ScopeFilter.class);
-    when(mockFilter.filterOut(any())).thenReturn(true);
-    SymbolSink symbolSink = mock(SymbolSink.class);
-    doAnswer(
-            invocation -> {
-              Object[] args = invocation.getArguments();
-              assertEquals(1, args.length);
-              assertInstanceOf(Scope.class, args[0]);
-              Scope scope = (Scope) args[0];
-              assertTrue(scope.getScopes().isEmpty());
-              return null;
-            })
-        .when(symbolSink)
-        .addScope(any());
-    SymbolAggregator symbolAggregator =
-        new SymbolAggregator(ClassNameFiltering.allowAll(), asList(mockFilter), symbolSink, 1);
-    symbolAggregator.parseClass(
-        SymDBReport.NO_OP, String.class.getTypeName(), getClassFileBytes(String.class), null);
-    verify(mockFilter).filterOut(any());
-  }
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testScopeFilter() {
+        ScopeFilter mockFilter = mock(ScopeFilter.class);
+        when(mockFilter.filterOut(any())).thenReturn(true);
+        SymbolSink symbolSink = mock(SymbolSink.class);
+        doAnswer(invocation -> {
+                    Object[] args = invocation.getArguments();
+                    assertEquals(1, args.length);
+                    assertInstanceOf(Scope.class, args[0]);
+                    Scope scope = (Scope) args[0];
+                    assertTrue(scope.getScopes().isEmpty());
+                    return null;
+                })
+                .when(symbolSink)
+                .addScope(any());
+        SymbolAggregator symbolAggregator =
+                new SymbolAggregator(ClassNameFiltering.allowAll(), asList(mockFilter), symbolSink, 1);
+        symbolAggregator.parseClass(
+                SymDBReport.NO_OP, String.class.getTypeName(), getClassFileBytes(String.class), null);
+        verify(mockFilter).filterOut(any());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java
index 2096d965e16..d5e1e12fd21 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java
@@ -43,1190 +43,870 @@
 import org.mockito.Mockito;
 
 class SymbolExtractionTransformerTest {
-  private static final String SYMBOL_PACKAGE = "com.datadog.debugger.symboltest.";
-  private static final String EXCLUDED_PACKAGE = "akka.actor.";
-  private static final String SYMBOL_PACKAGE_DIR = SYMBOL_PACKAGE.replace('.', '/');
-  private static final Set<String> TRANSFORMER_EXCLUDES =
-      Stream.of(
-              "java.",
-              "jdk.",
-              "sun.",
-              "com.sun.",
-              "utils.",
-              "javax.",
-              "javaslang.",
-              "org.omg.",
-              "org.joor.",
-              "com.datadog.debugger.")
-          .collect(toSet());
-
-  private Instrumentation instr = ByteBuddyAgent.install();
-  private ClassFileTransformer currentTransformer;
-  private Config config;
-
-  @BeforeEach
-  public void setUp() {
-    config = Mockito.mock(Config.class);
-    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
-  }
-
-  @AfterEach
-  public void tearDown() {
-    instr.removeTransformer(currentTransformer);
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void symbolExtraction01() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction01";
-    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction01.java";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    currentTransformer = createTransformer(symbolSinkMock);
-    instr.addTransformer(currentTransformer);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.on(testClass).call("main", "1").get();
-    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 4, 20, SOURCE_FILE, 2, 0);
-    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
-    assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
-    Scope mainMethodScope = classScope.getScopes().get(1);
-    assertScope(mainMethodScope, ScopeType.METHOD, "main", 4, 20, SOURCE_FILE, 1, 1);
-    assertLineRanges(mainMethodScope, "4-15", "17-17", "19-20");
-    assertSymbol(
-        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 4);
-    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
-    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 4, 20, SOURCE_FILE, 1, 2);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var1",
-        Integer.TYPE.getTypeName(),
-        4);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(1),
-        SymbolType.LOCAL,
-        "var3",
-        Integer.TYPE.getTypeName(),
-        19);
-    Scope ifLine5Scope = mainMethodLocalScope.getScopes().get(0);
-    assertScope(ifLine5Scope, ScopeType.LOCAL, null, 6, 17, SOURCE_FILE, 1, 1);
-    assertSymbol(
-        ifLine5Scope.getSymbols().get(0), SymbolType.LOCAL, "var2", Integer.TYPE.getTypeName(), 6);
-    Scope forLine7Scope = ifLine5Scope.getScopes().get(0);
-    assertScope(forLine7Scope, ScopeType.LOCAL, null, 7, 15, SOURCE_FILE, 1, 1);
-    assertSymbol(
-        forLine7Scope.getSymbols().get(0), SymbolType.LOCAL, "i", Integer.TYPE.getTypeName(), 7);
-    Scope forBodyLine7Scope = forLine7Scope.getScopes().get(0);
-    assertScope(forBodyLine7Scope, ScopeType.LOCAL, null, 8, 15, SOURCE_FILE, 1, 3);
-    assertSymbol(
-        forBodyLine7Scope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "foo",
-        Integer.TYPE.getTypeName(),
-        8);
-    assertSymbol(
-        forBodyLine7Scope.getSymbols().get(1),
-        SymbolType.LOCAL,
-        "bar",
-        Integer.TYPE.getTypeName(),
-        9);
-    assertSymbol(
-        forBodyLine7Scope.getSymbols().get(2),
-        SymbolType.LOCAL,
-        "j",
-        Integer.TYPE.getTypeName(),
-        11);
-    Scope whileLine12 = forBodyLine7Scope.getScopes().get(0);
-    assertScope(whileLine12, ScopeType.LOCAL, null, 13, 14, SOURCE_FILE, 0, 1);
-    assertSymbol(
-        whileLine12.getSymbols().get(0), SymbolType.LOCAL, "var4", Integer.TYPE.getTypeName(), 13);
-  }
-
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void symbolExtraction02() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction02";
-    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction02.java";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    currentTransformer = createTransformer(symbolSinkMock);
-    instr.addTransformer(currentTransformer);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.on(testClass).call("main", "1").get();
-    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 5, 6, SOURCE_FILE, 2, 0);
-    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
-    assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
-    Scope mainMethodScope = classScope.getScopes().get(1);
-    assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 6, SOURCE_FILE, 1, 1);
-    assertLineRanges(mainMethodScope, "5-6");
-    assertSymbol(
-        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
-    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
-    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 6, SOURCE_FILE, 0, 1);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var1",
-        String.class.getTypeName(),
-        5);
-  }
+    private static final String SYMBOL_PACKAGE = "com.datadog.debugger.symboltest.";
+    private static final String EXCLUDED_PACKAGE = "akka.actor.";
+    private static final String SYMBOL_PACKAGE_DIR = SYMBOL_PACKAGE.replace('.', '/');
+    private static final Set<String> TRANSFORMER_EXCLUDES = Stream.of(
+                    "java.",
+                    "jdk.",
+                    "sun.",
+                    "com.sun.",
+                    "utils.",
+                    "javax.",
+                    "javaslang.",
+                    "org.omg.",
+                    "org.joor.",
+                    "com.datadog.debugger.")
+            .collect(toSet());
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void symbolExtraction03() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction03";
-    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction03.java";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    currentTransformer = createTransformer(symbolSinkMock);
-    instr.addTransformer(currentTransformer);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.on(testClass).call("main", "1").get();
-    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 6, 28, SOURCE_FILE, 2, 0);
-    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
-    assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
-    Scope mainMethodScope = classScope.getScopes().get(1);
-    assertScope(mainMethodScope, ScopeType.METHOD, "main", 6, 28, SOURCE_FILE, 1, 1);
-    assertLineRanges(mainMethodScope, "6-21", "23-24", "27-28");
-    assertSymbol(
-        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 6);
-    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
-    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 6, 28, SOURCE_FILE, 2, 2);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var1",
-        String.class.getTypeName(),
-        6);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(1),
-        SymbolType.LOCAL,
-        "var5",
-        String.class.getTypeName(),
-        27);
-    Scope elseLine10Scope = mainMethodLocalScope.getScopes().get(0);
-    assertScope(elseLine10Scope, ScopeType.LOCAL, null, 12, 24, SOURCE_FILE, 1, 4);
-    assertSymbol(
-        elseLine10Scope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var31",
-        String.class.getTypeName(),
-        12);
-    assertSymbol(
-        elseLine10Scope.getSymbols().get(1),
-        SymbolType.LOCAL,
-        "var32",
-        String.class.getTypeName(),
-        13);
-    assertSymbol(
-        elseLine10Scope.getSymbols().get(2),
-        SymbolType.LOCAL,
-        "var30",
-        String.class.getTypeName(),
-        15);
-    assertSymbol(
-        elseLine10Scope.getSymbols().get(3),
-        SymbolType.LOCAL,
-        "var3",
-        String.class.getTypeName(),
-        17);
-    Scope ifLine19Scope = elseLine10Scope.getScopes().get(0);
-    assertScope(ifLine19Scope, ScopeType.LOCAL, null, 20, 21, SOURCE_FILE, 0, 1);
-    assertSymbol(
-        ifLine19Scope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var4",
-        String.class.getTypeName(),
-        20);
-  }
+    private Instrumentation instr = ByteBuddyAgent.install();
+    private ClassFileTransformer currentTransformer;
+    private Config config;
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void symbolExtraction04() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction04";
-    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction04.java";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    currentTransformer = createTransformer(symbolSinkMock);
-    instr.addTransformer(currentTransformer);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.on(testClass).call("main", "1").get();
-    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 5, 18, SOURCE_FILE, 2, 0);
-    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
-    assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
-    Scope mainMethodScope = classScope.getScopes().get(1);
-    assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 18, SOURCE_FILE, 1, 1);
-    assertLineRanges(mainMethodScope, "5-12", "14-15", "18-18");
-    assertSymbol(
-        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
-    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
-    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 18, SOURCE_FILE, 1, 1);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var1",
-        String.class.getTypeName(),
-        5);
-    Scope forLine6Scope = mainMethodLocalScope.getScopes().get(0);
-    assertScope(forLine6Scope, ScopeType.LOCAL, null, 6, 15, SOURCE_FILE, 1, 1);
-    assertSymbol(
-        forLine6Scope.getSymbols().get(0), SymbolType.LOCAL, "i", Integer.TYPE.getTypeName(), 6);
-    Scope forBodyLine6Scope = forLine6Scope.getScopes().get(0);
-    assertScope(forBodyLine6Scope, ScopeType.LOCAL, null, 7, 15, SOURCE_FILE, 1, 2);
-    assertSymbol(
-        forBodyLine6Scope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "j",
-        Integer.TYPE.getTypeName(),
-        8);
-    assertSymbol(
-        forBodyLine6Scope.getSymbols().get(1),
-        SymbolType.LOCAL,
-        "var2",
-        String.class.getTypeName(),
-        7);
-    Scope forBodyLine8Scope = forBodyLine6Scope.getScopes().get(0);
-    assertScope(forBodyLine8Scope, ScopeType.LOCAL, null, 9, 15, SOURCE_FILE, 1, 2);
-    assertSymbol(
-        forBodyLine8Scope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var3",
-        String.class.getTypeName(),
-        9);
-    assertSymbol(
-        forBodyLine8Scope.getSymbols().get(1),
-        SymbolType.LOCAL,
-        "var5",
-        String.class.getTypeName(),
-        14);
-    Scope forLine10Scope = forBodyLine8Scope.getScopes().get(0);
-    assertScope(forLine10Scope, ScopeType.LOCAL, null, 10, 12, SOURCE_FILE, 1, 1);
-    assertSymbol(
-        forLine10Scope.getSymbols().get(0), SymbolType.LOCAL, "k", Integer.TYPE.getTypeName(), 10);
-    Scope forBodyLine10Scope = forLine10Scope.getScopes().get(0);
-    assertScope(forBodyLine10Scope, ScopeType.LOCAL, null, 11, 12, SOURCE_FILE, 0, 1);
-    assertSymbol(
-        forBodyLine10Scope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var4",
-        String.class.getTypeName(),
-        11);
-  }
+    @BeforeEach
+    public void setUp() {
+        config = Mockito.mock(Config.class);
+        when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+    }
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void symbolExtraction05() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction05";
-    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction05.java";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    currentTransformer = createTransformer(symbolSinkMock);
-    instr.addTransformer(currentTransformer);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.on(testClass).call("main", "1").get();
-    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 5, 15, SOURCE_FILE, 2, 0);
-    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
-    assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
-    Scope mainMethodScope = classScope.getScopes().get(1);
-    assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 15, SOURCE_FILE, 1, 1);
-    assertLineRanges(mainMethodScope, "5-15");
-    assertSymbol(
-        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
-    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
-    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 15, SOURCE_FILE, 1, 1);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "i",
-        Integer.TYPE.getTypeName(),
-        5);
-    Scope whileLine6Scope = mainMethodLocalScope.getScopes().get(0);
-    assertScope(whileLine6Scope, ScopeType.LOCAL, null, 7, 13, SOURCE_FILE, 1, 2);
-    assertSymbol(
-        whileLine6Scope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var1",
-        Integer.TYPE.getTypeName(),
-        7);
-    assertSymbol(
-        whileLine6Scope.getSymbols().get(1), SymbolType.LOCAL, "j", Integer.TYPE.getTypeName(), 8);
-    Scope whileLine9Scope = whileLine6Scope.getScopes().get(0);
-    assertScope(whileLine9Scope, ScopeType.LOCAL, null, 10, 11, SOURCE_FILE, 0, 1);
-    assertSymbol(
-        whileLine9Scope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var2",
-        Integer.TYPE.getTypeName(),
-        10);
-  }
+    @AfterEach
+    public void tearDown() {
+        instr.removeTransformer(currentTransformer);
+    }
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void symbolExtraction06() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction06";
-    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction06.java";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    currentTransformer = createTransformer(symbolSinkMock);
-    instr.addTransformer(currentTransformer);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.on(testClass).call("main", "1").get();
-    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 5, 13, SOURCE_FILE, 2, 0);
-    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
-    assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
-    Scope mainMethodScope = classScope.getScopes().get(1);
-    assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 13, SOURCE_FILE, 1, 1);
-    assertLineRanges(mainMethodScope, "5-5", "7-11", "13-13");
-    assertSymbol(
-        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
-    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
-    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 13, SOURCE_FILE, 2, 1);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var1",
-        Integer.TYPE.getTypeName(),
-        5);
-    Scope catchLine9Scope = mainMethodLocalScope.getScopes().get(0);
-    assertScope(catchLine9Scope, ScopeType.LOCAL, null, 9, 11, SOURCE_FILE, 0, 2);
-    assertSymbol(
-        catchLine9Scope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var3",
-        Integer.TYPE.getTypeName(),
-        10);
-    assertSymbol(
-        catchLine9Scope.getSymbols().get(1),
-        SymbolType.LOCAL,
-        "rte",
-        RuntimeException.class.getTypeName(),
-        9);
-    Scope tryLine6Scope = mainMethodLocalScope.getScopes().get(1);
-    assertScope(tryLine6Scope, ScopeType.LOCAL, null, 7, 8, SOURCE_FILE, 0, 1);
-    assertSymbol(
-        tryLine6Scope.getSymbols().get(0), SymbolType.LOCAL, "var2", Integer.TYPE.getTypeName(), 7);
-  }
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void symbolExtraction01() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction01";
+        final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction01.java";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        currentTransformer = createTransformer(symbolSinkMock);
+        instr.addTransformer(currentTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.on(testClass).call("main", "1").get();
+        Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+        assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 4, 20, SOURCE_FILE, 2, 0);
+        assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
+        assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
+        Scope mainMethodScope = classScope.getScopes().get(1);
+        assertScope(mainMethodScope, ScopeType.METHOD, "main", 4, 20, SOURCE_FILE, 1, 1);
+        assertLineRanges(mainMethodScope, "4-15", "17-17", "19-20");
+        assertSymbol(mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 4);
+        Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+        assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 4, 20, SOURCE_FILE, 1, 2);
+        assertSymbol(mainMethodLocalScope.getSymbols().get(0), SymbolType.LOCAL, "var1", Integer.TYPE.getTypeName(), 4);
+        assertSymbol(
+                mainMethodLocalScope.getSymbols().get(1), SymbolType.LOCAL, "var3", Integer.TYPE.getTypeName(), 19);
+        Scope ifLine5Scope = mainMethodLocalScope.getScopes().get(0);
+        assertScope(ifLine5Scope, ScopeType.LOCAL, null, 6, 17, SOURCE_FILE, 1, 1);
+        assertSymbol(ifLine5Scope.getSymbols().get(0), SymbolType.LOCAL, "var2", Integer.TYPE.getTypeName(), 6);
+        Scope forLine7Scope = ifLine5Scope.getScopes().get(0);
+        assertScope(forLine7Scope, ScopeType.LOCAL, null, 7, 15, SOURCE_FILE, 1, 1);
+        assertSymbol(forLine7Scope.getSymbols().get(0), SymbolType.LOCAL, "i", Integer.TYPE.getTypeName(), 7);
+        Scope forBodyLine7Scope = forLine7Scope.getScopes().get(0);
+        assertScope(forBodyLine7Scope, ScopeType.LOCAL, null, 8, 15, SOURCE_FILE, 1, 3);
+        assertSymbol(forBodyLine7Scope.getSymbols().get(0), SymbolType.LOCAL, "foo", Integer.TYPE.getTypeName(), 8);
+        assertSymbol(forBodyLine7Scope.getSymbols().get(1), SymbolType.LOCAL, "bar", Integer.TYPE.getTypeName(), 9);
+        assertSymbol(forBodyLine7Scope.getSymbols().get(2), SymbolType.LOCAL, "j", Integer.TYPE.getTypeName(), 11);
+        Scope whileLine12 = forBodyLine7Scope.getScopes().get(0);
+        assertScope(whileLine12, ScopeType.LOCAL, null, 13, 14, SOURCE_FILE, 0, 1);
+        assertSymbol(whileLine12.getSymbols().get(0), SymbolType.LOCAL, "var4", Integer.TYPE.getTypeName(), 13);
+    }
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void symbolExtraction07() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction07";
-    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction07.java";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    currentTransformer = createTransformer(symbolSinkMock);
-    instr.addTransformer(currentTransformer);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.on(testClass).call("main", "1").get();
-    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 5, 10, SOURCE_FILE, 2, 0);
-    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
-    assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
-    Scope mainMethodScope = classScope.getScopes().get(1);
-    assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 10, SOURCE_FILE, 1, 1);
-    assertLineRanges(mainMethodScope, "5-5", "7-10");
-    assertSymbol(
-        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
-    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
-    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 10, SOURCE_FILE, 1, 1);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "i",
-        Integer.TYPE.getTypeName(),
-        5);
-    Scope doLine6Scope = mainMethodLocalScope.getScopes().get(0);
-    assertScope(doLine6Scope, ScopeType.LOCAL, null, 7, 8, SOURCE_FILE, 0, 1);
-    assertSymbol(
-        doLine6Scope.getSymbols().get(0), SymbolType.LOCAL, "j", Integer.TYPE.getTypeName(), 7);
-  }
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void symbolExtraction02() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction02";
+        final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction02.java";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        currentTransformer = createTransformer(symbolSinkMock);
+        instr.addTransformer(currentTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.on(testClass).call("main", "1").get();
+        Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+        assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 5, 6, SOURCE_FILE, 2, 0);
+        assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
+        assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
+        Scope mainMethodScope = classScope.getScopes().get(1);
+        assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 6, SOURCE_FILE, 1, 1);
+        assertLineRanges(mainMethodScope, "5-6");
+        assertSymbol(mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
+        Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+        assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 6, SOURCE_FILE, 0, 1);
+        assertSymbol(mainMethodLocalScope.getSymbols().get(0), SymbolType.LOCAL, "var1", String.class.getTypeName(), 5);
+    }
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void symbolExtraction08() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction08";
-    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction08.java";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    currentTransformer = createTransformer(symbolSinkMock);
-    instr.addTransformer(currentTransformer);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.on(testClass).call("main", "1").get();
-    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 5, 11, SOURCE_FILE, 2, 0);
-    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
-    assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
-    Scope mainMethodScope = classScope.getScopes().get(1);
-    assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 11, SOURCE_FILE, 1, 1);
-    assertLineRanges(mainMethodScope, "5-5", "7-9", "11-11");
-    assertSymbol(
-        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
-    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
-    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 11, SOURCE_FILE, 1, 1);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var1",
-        Integer.TYPE.getTypeName(),
-        5);
-    Scope line6Scope = mainMethodLocalScope.getScopes().get(0);
-    assertScope(line6Scope, ScopeType.LOCAL, null, 7, 9, SOURCE_FILE, 0, 2);
-    assertSymbol(
-        line6Scope.getSymbols().get(0), SymbolType.LOCAL, "var2", Integer.TYPE.getTypeName(), 7);
-    assertSymbol(
-        line6Scope.getSymbols().get(1), SymbolType.LOCAL, "var3", Integer.TYPE.getTypeName(), 8);
-  }
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void symbolExtraction03() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction03";
+        final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction03.java";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        currentTransformer = createTransformer(symbolSinkMock);
+        instr.addTransformer(currentTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.on(testClass).call("main", "1").get();
+        Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+        assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 6, 28, SOURCE_FILE, 2, 0);
+        assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
+        assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
+        Scope mainMethodScope = classScope.getScopes().get(1);
+        assertScope(mainMethodScope, ScopeType.METHOD, "main", 6, 28, SOURCE_FILE, 1, 1);
+        assertLineRanges(mainMethodScope, "6-21", "23-24", "27-28");
+        assertSymbol(mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 6);
+        Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+        assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 6, 28, SOURCE_FILE, 2, 2);
+        assertSymbol(mainMethodLocalScope.getSymbols().get(0), SymbolType.LOCAL, "var1", String.class.getTypeName(), 6);
+        assertSymbol(
+                mainMethodLocalScope.getSymbols().get(1), SymbolType.LOCAL, "var5", String.class.getTypeName(), 27);
+        Scope elseLine10Scope = mainMethodLocalScope.getScopes().get(0);
+        assertScope(elseLine10Scope, ScopeType.LOCAL, null, 12, 24, SOURCE_FILE, 1, 4);
+        assertSymbol(elseLine10Scope.getSymbols().get(0), SymbolType.LOCAL, "var31", String.class.getTypeName(), 12);
+        assertSymbol(elseLine10Scope.getSymbols().get(1), SymbolType.LOCAL, "var32", String.class.getTypeName(), 13);
+        assertSymbol(elseLine10Scope.getSymbols().get(2), SymbolType.LOCAL, "var30", String.class.getTypeName(), 15);
+        assertSymbol(elseLine10Scope.getSymbols().get(3), SymbolType.LOCAL, "var3", String.class.getTypeName(), 17);
+        Scope ifLine19Scope = elseLine10Scope.getScopes().get(0);
+        assertScope(ifLine19Scope, ScopeType.LOCAL, null, 20, 21, SOURCE_FILE, 0, 1);
+        assertSymbol(ifLine19Scope.getSymbols().get(0), SymbolType.LOCAL, "var4", String.class.getTypeName(), 20);
+    }
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void symbolExtraction09() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction09";
-    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction09.java";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    currentTransformer = createTransformer(symbolSinkMock);
-    instr.addTransformer(currentTransformer);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.on(testClass).call("main", "1").get();
-    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 6, 23, SOURCE_FILE, 6, 2);
-    assertSymbol(
-        classScope.getSymbols().get(0),
-        SymbolType.STATIC_FIELD,
-        "staticIntField",
-        Integer.TYPE.getTypeName(),
-        0);
-    assertSymbol(
-        classScope.getSymbols().get(1),
-        SymbolType.FIELD,
-        "intField",
-        Integer.TYPE.getTypeName(),
-        0);
-    assertScope(
-        classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 17, 17, SOURCE_FILE, 0, 0);
-    assertLineRanges(classScope.getScopes().get(0), "17-17");
-    Scope mainMethodScope = classScope.getScopes().get(1);
-    assertScope(mainMethodScope, ScopeType.METHOD, "main", 8, 14, SOURCE_FILE, 1, 1);
-    assertLineRanges(mainMethodScope, "8-10", "14-14");
-    assertSymbol(
-        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 8);
-    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
-    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 8, 14, SOURCE_FILE, 0, 3);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "outside",
-        Integer.TYPE.getTypeName(),
-        8);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(1),
-        SymbolType.LOCAL,
-        "outside2",
-        Integer.TYPE.getTypeName(),
-        9);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(2),
-        SymbolType.LOCAL,
-        "lambda",
-        Supplier.class.getTypeName(),
-        10);
-    Scope processMethodScope = classScope.getScopes().get(2);
-    assertScope(processMethodScope, ScopeType.METHOD, "process", 19, 23, SOURCE_FILE, 1, 0);
-    assertLineRanges(processMethodScope, "19-19", "23-23");
-    Scope processMethodLocalScope = processMethodScope.getScopes().get(0);
-    assertScope(processMethodLocalScope, ScopeType.LOCAL, null, 19, 23, SOURCE_FILE, 0, 1);
-    assertSymbol(
-        processMethodLocalScope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "supplier",
-        Supplier.class.getTypeName(),
-        19);
-    Scope supplierClosureScope = classScope.getScopes().get(3);
-    assertScope(
-        supplierClosureScope, ScopeType.CLOSURE, "lambda$process$*", 20, 21, SOURCE_FILE, 1, 0);
-    assertLineRanges(supplierClosureScope, "20-21");
-    Scope supplierClosureLocalScope = supplierClosureScope.getScopes().get(0);
-    assertScope(supplierClosureLocalScope, ScopeType.LOCAL, null, 20, 21, SOURCE_FILE, 0, 1);
-    assertSymbol(
-        supplierClosureLocalScope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var1",
-        Integer.TYPE.getTypeName(),
-        20);
-    Scope lambdaClosureScope = classScope.getScopes().get(4);
-    assertScope(lambdaClosureScope, ScopeType.CLOSURE, "lambda$main$0", 11, 12, SOURCE_FILE, 1, 1);
-    assertLineRanges(lambdaClosureScope, "11-12");
-    assertSymbol(
-        lambdaClosureScope.getSymbols().get(0),
-        SymbolType.ARG,
-        "outside",
-        Integer.TYPE.getTypeName(),
-        11);
-    Scope lambdaMethodLocalScope = lambdaClosureScope.getScopes().get(0);
-    assertScope(lambdaMethodLocalScope, ScopeType.LOCAL, null, 11, 12, SOURCE_FILE, 0, 1);
-    assertSymbol(
-        lambdaMethodLocalScope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var1",
-        Integer.TYPE.getTypeName(),
-        11);
-    Scope clinitMethodScope = classScope.getScopes().get(5);
-    assertScope(clinitMethodScope, ScopeType.METHOD, "<clinit>", 6, 6, SOURCE_FILE, 0, 0);
-    assertLineRanges(clinitMethodScope, "6-6");
-  }
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void symbolExtraction04() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction04";
+        final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction04.java";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        currentTransformer = createTransformer(symbolSinkMock);
+        instr.addTransformer(currentTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.on(testClass).call("main", "1").get();
+        Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+        assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 5, 18, SOURCE_FILE, 2, 0);
+        assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
+        assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
+        Scope mainMethodScope = classScope.getScopes().get(1);
+        assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 18, SOURCE_FILE, 1, 1);
+        assertLineRanges(mainMethodScope, "5-12", "14-15", "18-18");
+        assertSymbol(mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
+        Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+        assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 18, SOURCE_FILE, 1, 1);
+        assertSymbol(mainMethodLocalScope.getSymbols().get(0), SymbolType.LOCAL, "var1", String.class.getTypeName(), 5);
+        Scope forLine6Scope = mainMethodLocalScope.getScopes().get(0);
+        assertScope(forLine6Scope, ScopeType.LOCAL, null, 6, 15, SOURCE_FILE, 1, 1);
+        assertSymbol(forLine6Scope.getSymbols().get(0), SymbolType.LOCAL, "i", Integer.TYPE.getTypeName(), 6);
+        Scope forBodyLine6Scope = forLine6Scope.getScopes().get(0);
+        assertScope(forBodyLine6Scope, ScopeType.LOCAL, null, 7, 15, SOURCE_FILE, 1, 2);
+        assertSymbol(forBodyLine6Scope.getSymbols().get(0), SymbolType.LOCAL, "j", Integer.TYPE.getTypeName(), 8);
+        assertSymbol(forBodyLine6Scope.getSymbols().get(1), SymbolType.LOCAL, "var2", String.class.getTypeName(), 7);
+        Scope forBodyLine8Scope = forBodyLine6Scope.getScopes().get(0);
+        assertScope(forBodyLine8Scope, ScopeType.LOCAL, null, 9, 15, SOURCE_FILE, 1, 2);
+        assertSymbol(forBodyLine8Scope.getSymbols().get(0), SymbolType.LOCAL, "var3", String.class.getTypeName(), 9);
+        assertSymbol(forBodyLine8Scope.getSymbols().get(1), SymbolType.LOCAL, "var5", String.class.getTypeName(), 14);
+        Scope forLine10Scope = forBodyLine8Scope.getScopes().get(0);
+        assertScope(forLine10Scope, ScopeType.LOCAL, null, 10, 12, SOURCE_FILE, 1, 1);
+        assertSymbol(forLine10Scope.getSymbols().get(0), SymbolType.LOCAL, "k", Integer.TYPE.getTypeName(), 10);
+        Scope forBodyLine10Scope = forLine10Scope.getScopes().get(0);
+        assertScope(forBodyLine10Scope, ScopeType.LOCAL, null, 11, 12, SOURCE_FILE, 0, 1);
+        assertSymbol(forBodyLine10Scope.getSymbols().get(0), SymbolType.LOCAL, "var4", String.class.getTypeName(), 11);
+    }
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void symbolExtraction10() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction10";
-    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction10.java";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    currentTransformer = createTransformer(symbolSinkMock, 2, TRANSFORMER_EXCLUDES);
-    instr.addTransformer(currentTransformer);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.on(testClass).call("main", "1").get();
-    assertEquals(2, symbolSinkMock.jarScopes.get(0).getScopes().size());
-    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 5, 6, SOURCE_FILE, 2, 0);
-    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
-    assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
-    Scope mainMethodScope = classScope.getScopes().get(1);
-    assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 6, SOURCE_FILE, 1, 1);
-    assertLineRanges(mainMethodScope, "5-6");
-    assertSymbol(
-        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
-    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
-    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 6, SOURCE_FILE, 0, 1);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "winner",
-        "com.datadog.debugger.symboltest.SymbolExtraction10$Inner",
-        5);
-    Scope innerClassScope = symbolSinkMock.jarScopes.get(0).getScopes().get(1);
-    assertScope(innerClassScope, ScopeType.CLASS, CLASS_NAME + "$Inner", 10, 13, SOURCE_FILE, 2, 1);
-    assertSymbol(
-        innerClassScope.getSymbols().get(0),
-        SymbolType.FIELD,
-        "field1",
-        Integer.TYPE.getTypeName(),
-        0);
-    assertScope(
-        innerClassScope.getScopes().get(0), ScopeType.METHOD, "<init>", 10, 10, SOURCE_FILE, 0, 0);
-    assertLineRanges(innerClassScope.getScopes().get(0), "10-10");
-    Scope addToMethod = innerClassScope.getScopes().get(1);
-    assertScope(addToMethod, ScopeType.METHOD, "addTo", 12, 13, SOURCE_FILE, 1, 1);
-    assertLineRanges(addToMethod, "12-13");
-    assertSymbol(
-        addToMethod.getSymbols().get(0), SymbolType.ARG, "arg", Integer.TYPE.getTypeName(), 12);
-    Scope addToMethodLocalScope = addToMethod.getScopes().get(0);
-    assertScope(addToMethodLocalScope, ScopeType.LOCAL, null, 12, 13, SOURCE_FILE, 0, 1);
-    assertSymbol(
-        addToMethodLocalScope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var1",
-        Integer.TYPE.getTypeName(),
-        12);
-  }
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void symbolExtraction05() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction05";
+        final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction05.java";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        currentTransformer = createTransformer(symbolSinkMock);
+        instr.addTransformer(currentTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.on(testClass).call("main", "1").get();
+        Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+        assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 5, 15, SOURCE_FILE, 2, 0);
+        assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
+        assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
+        Scope mainMethodScope = classScope.getScopes().get(1);
+        assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 15, SOURCE_FILE, 1, 1);
+        assertLineRanges(mainMethodScope, "5-15");
+        assertSymbol(mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
+        Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+        assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 15, SOURCE_FILE, 1, 1);
+        assertSymbol(mainMethodLocalScope.getSymbols().get(0), SymbolType.LOCAL, "i", Integer.TYPE.getTypeName(), 5);
+        Scope whileLine6Scope = mainMethodLocalScope.getScopes().get(0);
+        assertScope(whileLine6Scope, ScopeType.LOCAL, null, 7, 13, SOURCE_FILE, 1, 2);
+        assertSymbol(whileLine6Scope.getSymbols().get(0), SymbolType.LOCAL, "var1", Integer.TYPE.getTypeName(), 7);
+        assertSymbol(whileLine6Scope.getSymbols().get(1), SymbolType.LOCAL, "j", Integer.TYPE.getTypeName(), 8);
+        Scope whileLine9Scope = whileLine6Scope.getScopes().get(0);
+        assertScope(whileLine9Scope, ScopeType.LOCAL, null, 10, 11, SOURCE_FILE, 0, 1);
+        assertSymbol(whileLine9Scope.getSymbols().get(0), SymbolType.LOCAL, "var2", Integer.TYPE.getTypeName(), 10);
+    }
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void symbolExtraction11() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction11";
-    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction11.java";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    currentTransformer = createTransformer(symbolSinkMock);
-    instr.addTransformer(currentTransformer);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.on(testClass).call("main", 1).get();
-    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 4, 11, SOURCE_FILE, 2, 1);
-    assertSymbol(
-        classScope.getSymbols().get(0), SymbolType.FIELD, "field1", Integer.TYPE.getTypeName(), 0);
-    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 4, 4, SOURCE_FILE, 0, 0);
-    assertLineRanges(classScope.getScopes().get(0), "4-4");
-    Scope mainMethodScope = classScope.getScopes().get(1);
-    assertScope(mainMethodScope, ScopeType.METHOD, "main", 6, 11, SOURCE_FILE, 1, 1);
-    assertLineRanges(mainMethodScope, "6-9", "11-11");
-    assertSymbol(
-        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", Integer.TYPE.getTypeName(), 6);
-    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
-    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 6, 11, SOURCE_FILE, 1, 1);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "var1",
-        Integer.TYPE.getTypeName(),
-        6);
-    Scope ifLine7Scope = mainMethodLocalScope.getScopes().get(0);
-    assertScope(ifLine7Scope, ScopeType.LOCAL, null, 8, 9, SOURCE_FILE, 0, 1);
-    assertSymbol(
-        ifLine7Scope.getSymbols().get(0), SymbolType.LOCAL, "var2", Integer.TYPE.getTypeName(), 8);
-  }
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void symbolExtraction06() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction06";
+        final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction06.java";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        currentTransformer = createTransformer(symbolSinkMock);
+        instr.addTransformer(currentTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.on(testClass).call("main", "1").get();
+        Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+        assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 5, 13, SOURCE_FILE, 2, 0);
+        assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
+        assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
+        Scope mainMethodScope = classScope.getScopes().get(1);
+        assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 13, SOURCE_FILE, 1, 1);
+        assertLineRanges(mainMethodScope, "5-5", "7-11", "13-13");
+        assertSymbol(mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
+        Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+        assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 13, SOURCE_FILE, 2, 1);
+        assertSymbol(mainMethodLocalScope.getSymbols().get(0), SymbolType.LOCAL, "var1", Integer.TYPE.getTypeName(), 5);
+        Scope catchLine9Scope = mainMethodLocalScope.getScopes().get(0);
+        assertScope(catchLine9Scope, ScopeType.LOCAL, null, 9, 11, SOURCE_FILE, 0, 2);
+        assertSymbol(catchLine9Scope.getSymbols().get(0), SymbolType.LOCAL, "var3", Integer.TYPE.getTypeName(), 10);
+        assertSymbol(
+                catchLine9Scope.getSymbols().get(1), SymbolType.LOCAL, "rte", RuntimeException.class.getTypeName(), 9);
+        Scope tryLine6Scope = mainMethodLocalScope.getScopes().get(1);
+        assertScope(tryLine6Scope, ScopeType.LOCAL, null, 7, 8, SOURCE_FILE, 0, 1);
+        assertSymbol(tryLine6Scope.getSymbols().get(0), SymbolType.LOCAL, "var2", Integer.TYPE.getTypeName(), 7);
+    }
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void symbolExtraction12() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction12";
-    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction12.java";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    currentTransformer = createTransformer(symbolSinkMock);
-    instr.addTransformer(currentTransformer);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.on(testClass).call("main", 1).get();
-    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 8, 20, SOURCE_FILE, 7, 0);
-    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
-    assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
-    Scope mainMethodScope = classScope.getScopes().get(1);
-    assertScope(mainMethodScope, ScopeType.METHOD, "main", 8, 13, SOURCE_FILE, 1, 1);
-    assertLineRanges(mainMethodScope, "8-13");
-    assertSymbol(
-        mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", Integer.TYPE.getTypeName(), 8);
-    Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
-    assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 8, 13, SOURCE_FILE, 0, 2);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(0),
-        SymbolType.LOCAL,
-        "list",
-        List.class.getTypeName(),
-        8);
-    assertSymbol(
-        mainMethodLocalScope.getSymbols().get(1),
-        SymbolType.LOCAL,
-        "sum",
-        Integer.TYPE.getTypeName(),
-        12);
-    Scope fooMethodScope = classScope.getScopes().get(2);
-    assertScope(fooMethodScope, ScopeType.METHOD, "foo", 17, 20, SOURCE_FILE, 0, 1);
-    assertLineRanges(fooMethodScope, "17-20");
-    assertSymbol(
-        fooMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", Integer.TYPE.getTypeName(), 17);
-    Scope lambdaFoo3MethodScope = classScope.getScopes().get(3);
-    assertScope(
-        lambdaFoo3MethodScope, ScopeType.CLOSURE, "lambda$foo$*", 19, 19, SOURCE_FILE, 0, 1);
-    assertLineRanges(lambdaFoo3MethodScope, "19-19");
-    assertSymbol(
-        lambdaFoo3MethodScope.getSymbols().get(0),
-        SymbolType.ARG,
-        "x",
-        Integer.TYPE.getTypeName(),
-        19);
-    Scope lambdaFoo2MethodScope = classScope.getScopes().get(4);
-    assertScope(
-        lambdaFoo2MethodScope, ScopeType.CLOSURE, "lambda$foo$*", 19, 19, SOURCE_FILE, 0, 1);
-    assertLineRanges(lambdaFoo2MethodScope, "19-19");
-    assertSymbol(
-        lambdaFoo2MethodScope.getSymbols().get(0),
-        SymbolType.ARG,
-        "x",
-        Integer.class.getTypeName(),
-        19);
-    Scope lambdaMain1MethodScope = classScope.getScopes().get(5);
-    assertScope(
-        lambdaMain1MethodScope, ScopeType.CLOSURE, "lambda$main$1", 11, 11, SOURCE_FILE, 0, 1);
-    assertLineRanges(lambdaMain1MethodScope, "11-11");
-    assertSymbol(
-        lambdaMain1MethodScope.getSymbols().get(0),
-        SymbolType.ARG,
-        "x",
-        Integer.TYPE.getTypeName(),
-        11);
-    Scope lambdaMain0MethodScope = classScope.getScopes().get(6);
-    assertScope(
-        lambdaMain0MethodScope, ScopeType.CLOSURE, "lambda$main$0", 11, 11, SOURCE_FILE, 0, 1);
-    assertLineRanges(lambdaMain0MethodScope, "11-11");
-    assertSymbol(
-        lambdaMain0MethodScope.getSymbols().get(0),
-        SymbolType.ARG,
-        "x",
-        Integer.class.getTypeName(),
-        11);
-  }
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void symbolExtraction07() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction07";
+        final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction07.java";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        currentTransformer = createTransformer(symbolSinkMock);
+        instr.addTransformer(currentTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.on(testClass).call("main", "1").get();
+        Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+        assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 5, 10, SOURCE_FILE, 2, 0);
+        assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
+        assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
+        Scope mainMethodScope = classScope.getScopes().get(1);
+        assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 10, SOURCE_FILE, 1, 1);
+        assertLineRanges(mainMethodScope, "5-5", "7-10");
+        assertSymbol(mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
+        Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+        assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 10, SOURCE_FILE, 1, 1);
+        assertSymbol(mainMethodLocalScope.getSymbols().get(0), SymbolType.LOCAL, "i", Integer.TYPE.getTypeName(), 5);
+        Scope doLine6Scope = mainMethodLocalScope.getScopes().get(0);
+        assertScope(doLine6Scope, ScopeType.LOCAL, null, 7, 8, SOURCE_FILE, 0, 1);
+        assertSymbol(doLine6Scope.getSymbols().get(0), SymbolType.LOCAL, "j", Integer.TYPE.getTypeName(), 7);
+    }
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void symbolExtraction13() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction13";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    currentTransformer = createTransformer(symbolSinkMock);
-    instr.addTransformer(currentTransformer);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.on(testClass).call("main", "1").get();
-    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertLangSpecifics(
-        classScope.getLanguageSpecifics(),
-        asList("public"),
-        asList(
-            "@com.datadog.debugger.symboltest.MyAnnotation",
-            "@com.datadog.debugger.symboltest.MyMarker"),
-        Object.class.getTypeName(),
-        null,
-        null);
-    Scope mainMethodScope = classScope.getScopes().get(1);
-    assertLangSpecifics(
-        mainMethodScope.getLanguageSpecifics(),
-        asList("public", "static"),
-        asList("@com.datadog.debugger.symboltest.MyAnnotation"),
-        null,
-        null,
-        Integer.TYPE.getTypeName());
-    assertEquals(3, classScope.getSymbols().size());
-    Symbol intField = classScope.getSymbols().get(0);
-    assertLangSpecifics(
-        intField.getLanguageSpecifics(),
-        asList("private"),
-        asList("@com.datadog.debugger.symboltest.MyAnnotation"),
-        null,
-        null,
-        null);
-    Scope myAnnotationClassScope = symbolSinkMock.jarScopes.get(1).getScopes().get(0);
-    assertLangSpecifics(
-        myAnnotationClassScope.getLanguageSpecifics(),
-        asList("interface", "abstract", "annotation"),
-        asList("@java.lang.annotation.Target", "@java.lang.annotation.Retention"),
-        Object.class.getTypeName(),
-        asList("java.lang.annotation.Annotation"),
-        null);
-    Symbol strField = classScope.getSymbols().get(1);
-    assertLangSpecifics(
-        strField.getLanguageSpecifics(),
-        asList("public", "static", "volatile"),
-        null,
-        null,
-        null,
-        null);
-    Symbol doubleField = classScope.getSymbols().get(2);
-    assertLangSpecifics(
-        doubleField.getLanguageSpecifics(),
-        asList("protected", "final", "transient"),
-        null,
-        null,
-        null,
-        null);
-  }
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void symbolExtraction08() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction08";
+        final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction08.java";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        currentTransformer = createTransformer(symbolSinkMock);
+        instr.addTransformer(currentTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.on(testClass).call("main", "1").get();
+        Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+        assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 5, 11, SOURCE_FILE, 2, 0);
+        assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
+        assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
+        Scope mainMethodScope = classScope.getScopes().get(1);
+        assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 11, SOURCE_FILE, 1, 1);
+        assertLineRanges(mainMethodScope, "5-5", "7-9", "11-11");
+        assertSymbol(mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
+        Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+        assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 11, SOURCE_FILE, 1, 1);
+        assertSymbol(mainMethodLocalScope.getSymbols().get(0), SymbolType.LOCAL, "var1", Integer.TYPE.getTypeName(), 5);
+        Scope line6Scope = mainMethodLocalScope.getScopes().get(0);
+        assertScope(line6Scope, ScopeType.LOCAL, null, 7, 9, SOURCE_FILE, 0, 2);
+        assertSymbol(line6Scope.getSymbols().get(0), SymbolType.LOCAL, "var2", Integer.TYPE.getTypeName(), 7);
+        assertSymbol(line6Scope.getSymbols().get(1), SymbolType.LOCAL, "var3", Integer.TYPE.getTypeName(), 8);
+    }
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void symbolExtraction14() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction14";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    currentTransformer = createTransformer(symbolSinkMock);
-    instr.addTransformer(currentTransformer);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.on(testClass).call("main", "1").get();
-    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertLangSpecifics(
-        classScope.getLanguageSpecifics(),
-        asList("public", "abstract"),
-        null,
-        Object.class.getTypeName(),
-        asList("com.datadog.debugger.symboltest.I1", "com.datadog.debugger.symboltest.I2"),
-        null);
-    assertEquals(4, classScope.getScopes().size());
-    Scope m1MethodScope = classScope.getScopes().get(2);
-    assertLangSpecifics(
-        m1MethodScope.getLanguageSpecifics(),
-        asList("protected", "abstract"),
-        null,
-        null,
-        null,
-        Void.TYPE.getTypeName());
-    Scope m2MethodScope = classScope.getScopes().get(3);
-    assertLangSpecifics(
-        m2MethodScope.getLanguageSpecifics(),
-        asList("private", "final", "synchronized", "(varargs)", "strictfp"),
-        null,
-        null,
-        null,
-        String.class.getTypeName());
-    Scope i1ClassScope = symbolSinkMock.jarScopes.get(1).getScopes().get(0);
-    assertLangSpecifics(
-        i1ClassScope.getLanguageSpecifics(),
-        asList("interface", "abstract"),
-        null,
-        Object.class.getTypeName(),
-        null,
-        null);
-    Scope m3MethodScope = i1ClassScope.getScopes().get(0);
-    assertLangSpecifics(
-        m3MethodScope.getLanguageSpecifics(),
-        asList("public", "default"),
-        null,
-        null,
-        null,
-        Void.TYPE.getTypeName());
-    Scope m4MethodScope = i1ClassScope.getScopes().get(1);
-    assertLangSpecifics(
-        m4MethodScope.getLanguageSpecifics(),
-        asList("public", "static"),
-        null,
-        null,
-        null,
-        String.class.getTypeName());
-    Scope myEnumClassScope = symbolSinkMock.jarScopes.get(3).getScopes().get(0);
-    assertLangSpecifics(
-        myEnumClassScope.getLanguageSpecifics(),
-        asList("final", "enum"),
-        null,
-        Enum.class.getTypeName(),
-        null,
-        null);
-    assertEquals(4, myEnumClassScope.getSymbols().size());
-    Symbol oneField = myEnumClassScope.getSymbols().get(0);
-    assertLangSpecifics(
-        oneField.getLanguageSpecifics(),
-        asList("public", "static", "final", "enum"),
-        null,
-        null,
-        null,
-        null);
-    Symbol valuesField = myEnumClassScope.getSymbols().get(3);
-    assertLangSpecifics(
-        valuesField.getLanguageSpecifics(),
-        asList("private", "static", "final", "synthetic"),
-        null,
-        null,
-        null,
-        null);
-  }
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void symbolExtraction09() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction09";
+        final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction09.java";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        currentTransformer = createTransformer(symbolSinkMock);
+        instr.addTransformer(currentTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.on(testClass).call("main", "1").get();
+        Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+        assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 6, 23, SOURCE_FILE, 6, 2);
+        assertSymbol(
+                classScope.getSymbols().get(0),
+                SymbolType.STATIC_FIELD,
+                "staticIntField",
+                Integer.TYPE.getTypeName(),
+                0);
+        assertSymbol(classScope.getSymbols().get(1), SymbolType.FIELD, "intField", Integer.TYPE.getTypeName(), 0);
+        assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 17, 17, SOURCE_FILE, 0, 0);
+        assertLineRanges(classScope.getScopes().get(0), "17-17");
+        Scope mainMethodScope = classScope.getScopes().get(1);
+        assertScope(mainMethodScope, ScopeType.METHOD, "main", 8, 14, SOURCE_FILE, 1, 1);
+        assertLineRanges(mainMethodScope, "8-10", "14-14");
+        assertSymbol(mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 8);
+        Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+        assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 8, 14, SOURCE_FILE, 0, 3);
+        assertSymbol(
+                mainMethodLocalScope.getSymbols().get(0), SymbolType.LOCAL, "outside", Integer.TYPE.getTypeName(), 8);
+        assertSymbol(
+                mainMethodLocalScope.getSymbols().get(1), SymbolType.LOCAL, "outside2", Integer.TYPE.getTypeName(), 9);
+        assertSymbol(
+                mainMethodLocalScope.getSymbols().get(2), SymbolType.LOCAL, "lambda", Supplier.class.getTypeName(), 10);
+        Scope processMethodScope = classScope.getScopes().get(2);
+        assertScope(processMethodScope, ScopeType.METHOD, "process", 19, 23, SOURCE_FILE, 1, 0);
+        assertLineRanges(processMethodScope, "19-19", "23-23");
+        Scope processMethodLocalScope = processMethodScope.getScopes().get(0);
+        assertScope(processMethodLocalScope, ScopeType.LOCAL, null, 19, 23, SOURCE_FILE, 0, 1);
+        assertSymbol(
+                processMethodLocalScope.getSymbols().get(0),
+                SymbolType.LOCAL,
+                "supplier",
+                Supplier.class.getTypeName(),
+                19);
+        Scope supplierClosureScope = classScope.getScopes().get(3);
+        assertScope(supplierClosureScope, ScopeType.CLOSURE, "lambda$process$*", 20, 21, SOURCE_FILE, 1, 0);
+        assertLineRanges(supplierClosureScope, "20-21");
+        Scope supplierClosureLocalScope = supplierClosureScope.getScopes().get(0);
+        assertScope(supplierClosureLocalScope, ScopeType.LOCAL, null, 20, 21, SOURCE_FILE, 0, 1);
+        assertSymbol(
+                supplierClosureLocalScope.getSymbols().get(0),
+                SymbolType.LOCAL,
+                "var1",
+                Integer.TYPE.getTypeName(),
+                20);
+        Scope lambdaClosureScope = classScope.getScopes().get(4);
+        assertScope(lambdaClosureScope, ScopeType.CLOSURE, "lambda$main$0", 11, 12, SOURCE_FILE, 1, 1);
+        assertLineRanges(lambdaClosureScope, "11-12");
+        assertSymbol(lambdaClosureScope.getSymbols().get(0), SymbolType.ARG, "outside", Integer.TYPE.getTypeName(), 11);
+        Scope lambdaMethodLocalScope = lambdaClosureScope.getScopes().get(0);
+        assertScope(lambdaMethodLocalScope, ScopeType.LOCAL, null, 11, 12, SOURCE_FILE, 0, 1);
+        assertSymbol(
+                lambdaMethodLocalScope.getSymbols().get(0), SymbolType.LOCAL, "var1", Integer.TYPE.getTypeName(), 11);
+        Scope clinitMethodScope = classScope.getScopes().get(5);
+        assertScope(clinitMethodScope, ScopeType.METHOD, "<clinit>", 6, 6, SOURCE_FILE, 0, 0);
+        assertLineRanges(clinitMethodScope, "6-6");
+    }
 
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_17, max = JRE.JAVA_25)
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void symbolExtraction15() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction15";
-    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction15.java";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    currentTransformer = createTransformer(symbolSinkMock);
-    instr.addTransformer(currentTransformer);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME, "17");
-    Reflect.on(testClass).call("main", "1").get();
-    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 10, 13, SOURCE_FILE, 8, 3);
-    assertLangSpecifics(
-        classScope.getLanguageSpecifics(),
-        asList("public", "final", "record"),
-        null,
-        "java.lang.Record",
-        null,
-        null);
-    Scope initMethodScope = classScope.getScopes().get(0);
-    assertScope(initMethodScope, ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 3);
-    assertSymbol(
-        initMethodScope.getSymbols().get(0),
-        SymbolType.ARG,
-        "firstName",
-        String.class.getTypeName(),
-        0);
-    assertSymbol(
-        initMethodScope.getSymbols().get(1),
-        SymbolType.ARG,
-        "lastName",
-        String.class.getTypeName(),
-        0);
-    assertSymbol(
-        initMethodScope.getSymbols().get(2), SymbolType.ARG, "age", Integer.TYPE.getTypeName(), 0);
-    Scope mainMethodScope = classScope.getScopes().get(1);
-    assertScope(mainMethodScope, ScopeType.METHOD, "main", 13, 13, SOURCE_FILE, 0, 1);
-    Scope toStringMethodScope = classScope.getScopes().get(2);
-    assertScope(toStringMethodScope, ScopeType.METHOD, "toString", 10, 10, SOURCE_FILE, 0, 0);
-    Scope hashCodeMethodScope = classScope.getScopes().get(3);
-    assertScope(hashCodeMethodScope, ScopeType.METHOD, "hashCode", 10, 10, SOURCE_FILE, 0, 0);
-    Scope equalsMethodScope = classScope.getScopes().get(4);
-    assertScope(equalsMethodScope, ScopeType.METHOD, "equals", 10, 10, SOURCE_FILE, 0, 1);
-    Scope firstNameMethodScope = classScope.getScopes().get(5);
-    assertScope(firstNameMethodScope, ScopeType.METHOD, "firstName", 10, 10, SOURCE_FILE, 0, 0);
-    Scope lastNameMethodScope = classScope.getScopes().get(6);
-    assertScope(lastNameMethodScope, ScopeType.METHOD, "lastName", 10, 10, SOURCE_FILE, 0, 0);
-    Scope ageMethodScope = classScope.getScopes().get(7);
-    assertScope(ageMethodScope, ScopeType.METHOD, "age", 10, 10, SOURCE_FILE, 0, 0);
-  }
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void symbolExtraction10() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction10";
+        final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction10.java";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        currentTransformer = createTransformer(symbolSinkMock, 2, TRANSFORMER_EXCLUDES);
+        instr.addTransformer(currentTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.on(testClass).call("main", "1").get();
+        assertEquals(2, symbolSinkMock.jarScopes.get(0).getScopes().size());
+        Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+        assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 5, 6, SOURCE_FILE, 2, 0);
+        assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
+        assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
+        Scope mainMethodScope = classScope.getScopes().get(1);
+        assertScope(mainMethodScope, ScopeType.METHOD, "main", 5, 6, SOURCE_FILE, 1, 1);
+        assertLineRanges(mainMethodScope, "5-6");
+        assertSymbol(mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", String.class.getTypeName(), 5);
+        Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+        assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 5, 6, SOURCE_FILE, 0, 1);
+        assertSymbol(
+                mainMethodLocalScope.getSymbols().get(0),
+                SymbolType.LOCAL,
+                "winner",
+                "com.datadog.debugger.symboltest.SymbolExtraction10$Inner",
+                5);
+        Scope innerClassScope = symbolSinkMock.jarScopes.get(0).getScopes().get(1);
+        assertScope(innerClassScope, ScopeType.CLASS, CLASS_NAME + "$Inner", 10, 13, SOURCE_FILE, 2, 1);
+        assertSymbol(innerClassScope.getSymbols().get(0), SymbolType.FIELD, "field1", Integer.TYPE.getTypeName(), 0);
+        assertScope(innerClassScope.getScopes().get(0), ScopeType.METHOD, "<init>", 10, 10, SOURCE_FILE, 0, 0);
+        assertLineRanges(innerClassScope.getScopes().get(0), "10-10");
+        Scope addToMethod = innerClassScope.getScopes().get(1);
+        assertScope(addToMethod, ScopeType.METHOD, "addTo", 12, 13, SOURCE_FILE, 1, 1);
+        assertLineRanges(addToMethod, "12-13");
+        assertSymbol(addToMethod.getSymbols().get(0), SymbolType.ARG, "arg", Integer.TYPE.getTypeName(), 12);
+        Scope addToMethodLocalScope = addToMethod.getScopes().get(0);
+        assertScope(addToMethodLocalScope, ScopeType.LOCAL, null, 12, 13, SOURCE_FILE, 0, 1);
+        assertSymbol(
+                addToMethodLocalScope.getSymbols().get(0), SymbolType.LOCAL, "var1", Integer.TYPE.getTypeName(), 12);
+    }
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void symbolExtraction16() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction16";
-    final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction16.kt";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    Set<String> additionalExcludedPackages =
-        Stream.of(
-                "org.jetbrains.",
-                "kotlin.",
-                "kotlinx.",
-                "org.junit.",
-                "io.vavr.",
-                "com.intellij.",
-                "gnu.trove.")
-            .collect(toSet());
-    currentTransformer = createTransformer(symbolSinkMock, additionalExcludedPackages);
-    instr.addTransformer(currentTransformer);
-    URL resource = CapturedSnapshotTest.class.getResource("/" + SOURCE_FILE);
-    assertNotNull(resource);
-    List<File> filesToDelete = new ArrayList<>();
-    try {
-      Class<?> testClass =
-          KotlinHelper.compileAndLoad(CLASS_NAME, resource.getFile(), filesToDelete);
-      Object companion = Reflect.onClass(testClass).get("Companion");
-      int result = Reflect.on(companion).call("main", "").get();
-      assertEquals(73, result);
-    } finally {
-      filesToDelete.forEach(File::delete);
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void symbolExtraction11() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction11";
+        final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction11.java";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        currentTransformer = createTransformer(symbolSinkMock);
+        instr.addTransformer(currentTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.on(testClass).call("main", 1).get();
+        Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+        assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 4, 11, SOURCE_FILE, 2, 1);
+        assertSymbol(classScope.getSymbols().get(0), SymbolType.FIELD, "field1", Integer.TYPE.getTypeName(), 0);
+        assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 4, 4, SOURCE_FILE, 0, 0);
+        assertLineRanges(classScope.getScopes().get(0), "4-4");
+        Scope mainMethodScope = classScope.getScopes().get(1);
+        assertScope(mainMethodScope, ScopeType.METHOD, "main", 6, 11, SOURCE_FILE, 1, 1);
+        assertLineRanges(mainMethodScope, "6-9", "11-11");
+        assertSymbol(mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", Integer.TYPE.getTypeName(), 6);
+        Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+        assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 6, 11, SOURCE_FILE, 1, 1);
+        assertSymbol(mainMethodLocalScope.getSymbols().get(0), SymbolType.LOCAL, "var1", Integer.TYPE.getTypeName(), 6);
+        Scope ifLine7Scope = mainMethodLocalScope.getScopes().get(0);
+        assertScope(ifLine7Scope, ScopeType.LOCAL, null, 8, 9, SOURCE_FILE, 0, 1);
+        assertSymbol(ifLine7Scope.getSymbols().get(0), SymbolType.LOCAL, "var2", Integer.TYPE.getTypeName(), 8);
     }
-    assertEquals(4, symbolSinkMock.jarScopes.size());
-    Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 6, 28, SOURCE_FILE, 6, 1);
-    assertLangSpecifics(
-        classScope.getLanguageSpecifics(),
-        asList("public", "final"),
-        asList("@kotlin.Metadata"),
-        "java.lang.Object",
-        null,
-        null);
-    assertSymbol(
-        classScope.getSymbols().get(0),
-        SymbolType.STATIC_FIELD,
-        "Companion",
-        CLASS_NAME + "$Companion",
-        0);
-    assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
-    Scope f1MethodScope = classScope.getScopes().get(1);
-    assertScope(f1MethodScope, ScopeType.METHOD, "f1", 6, 6, SOURCE_FILE, 0, 1);
-    assertSymbol(
-        f1MethodScope.getSymbols().get(0), SymbolType.ARG, "value", Integer.TYPE.getTypeName(), 6);
-    Scope f2MethodScope = classScope.getScopes().get(2);
-    assertScope(f2MethodScope, ScopeType.METHOD, "f2", 10, 17, SOURCE_FILE, 3, 1);
-    assertLineRanges(f2MethodScope, "10-10", "12-12", "14-14", "16-17");
-    Scope f3MethodScope = classScope.getScopes().get(3);
-    assertScope(f3MethodScope, ScopeType.METHOD, "f3", 21, 23, SOURCE_FILE, 1, 1);
-    assertLineRanges(f3MethodScope, "21-23");
-    Scope f4MethodScope = classScope.getScopes().get(4);
-    assertScope(f4MethodScope, ScopeType.METHOD, "f4", 27, 28, SOURCE_FILE, 1, 1);
-    assertLineRanges(f4MethodScope, "27-28");
-    assertScope(
-        classScope.getScopes().get(5), ScopeType.METHOD, "<clinit>", 0, 0, SOURCE_FILE, 0, 0);
 
-    Scope companionClassScope = symbolSinkMock.jarScopes.get(1).getScopes().get(0);
-    assertScope(
-        companionClassScope, ScopeType.CLASS, CLASS_NAME + "$Companion", 33, 34, SOURCE_FILE, 3, 0);
-    assertLangSpecifics(
-        classScope.getLanguageSpecifics(),
-        asList("public", "final"),
-        asList("@kotlin.Metadata"),
-        "java.lang.Object",
-        null,
-        null);
-    assertScope(
-        companionClassScope.getScopes().get(0),
-        ScopeType.METHOD,
-        "<init>",
-        0,
-        0,
-        SOURCE_FILE,
-        0,
-        0);
-    Scope mainMethodScope = companionClassScope.getScopes().get(1);
-    assertScope(mainMethodScope, ScopeType.METHOD, "main", 33, 34, SOURCE_FILE, 1, 1);
-    assertLineRanges(mainMethodScope, "33-34");
-  }
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void symbolExtraction12() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction12";
+        final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction12.java";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        currentTransformer = createTransformer(symbolSinkMock);
+        instr.addTransformer(currentTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.on(testClass).call("main", 1).get();
+        Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+        assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 8, 20, SOURCE_FILE, 7, 0);
+        assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
+        assertFalse(classScope.getScopes().get(0).hasInjectibleLines());
+        Scope mainMethodScope = classScope.getScopes().get(1);
+        assertScope(mainMethodScope, ScopeType.METHOD, "main", 8, 13, SOURCE_FILE, 1, 1);
+        assertLineRanges(mainMethodScope, "8-13");
+        assertSymbol(mainMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", Integer.TYPE.getTypeName(), 8);
+        Scope mainMethodLocalScope = mainMethodScope.getScopes().get(0);
+        assertScope(mainMethodLocalScope, ScopeType.LOCAL, null, 8, 13, SOURCE_FILE, 0, 2);
+        assertSymbol(mainMethodLocalScope.getSymbols().get(0), SymbolType.LOCAL, "list", List.class.getTypeName(), 8);
+        assertSymbol(mainMethodLocalScope.getSymbols().get(1), SymbolType.LOCAL, "sum", Integer.TYPE.getTypeName(), 12);
+        Scope fooMethodScope = classScope.getScopes().get(2);
+        assertScope(fooMethodScope, ScopeType.METHOD, "foo", 17, 20, SOURCE_FILE, 0, 1);
+        assertLineRanges(fooMethodScope, "17-20");
+        assertSymbol(fooMethodScope.getSymbols().get(0), SymbolType.ARG, "arg", Integer.TYPE.getTypeName(), 17);
+        Scope lambdaFoo3MethodScope = classScope.getScopes().get(3);
+        assertScope(lambdaFoo3MethodScope, ScopeType.CLOSURE, "lambda$foo$*", 19, 19, SOURCE_FILE, 0, 1);
+        assertLineRanges(lambdaFoo3MethodScope, "19-19");
+        assertSymbol(lambdaFoo3MethodScope.getSymbols().get(0), SymbolType.ARG, "x", Integer.TYPE.getTypeName(), 19);
+        Scope lambdaFoo2MethodScope = classScope.getScopes().get(4);
+        assertScope(lambdaFoo2MethodScope, ScopeType.CLOSURE, "lambda$foo$*", 19, 19, SOURCE_FILE, 0, 1);
+        assertLineRanges(lambdaFoo2MethodScope, "19-19");
+        assertSymbol(lambdaFoo2MethodScope.getSymbols().get(0), SymbolType.ARG, "x", Integer.class.getTypeName(), 19);
+        Scope lambdaMain1MethodScope = classScope.getScopes().get(5);
+        assertScope(lambdaMain1MethodScope, ScopeType.CLOSURE, "lambda$main$1", 11, 11, SOURCE_FILE, 0, 1);
+        assertLineRanges(lambdaMain1MethodScope, "11-11");
+        assertSymbol(lambdaMain1MethodScope.getSymbols().get(0), SymbolType.ARG, "x", Integer.TYPE.getTypeName(), 11);
+        Scope lambdaMain0MethodScope = classScope.getScopes().get(6);
+        assertScope(lambdaMain0MethodScope, ScopeType.CLOSURE, "lambda$main$0", 11, 11, SOURCE_FILE, 0, 1);
+        assertLineRanges(lambdaMain0MethodScope, "11-11");
+        assertSymbol(lambdaMain0MethodScope.getSymbols().get(0), SymbolType.ARG, "x", Integer.class.getTypeName(), 11);
+    }
 
-  @Test
-  public void filterOutClassesFromExcludedPackages() throws IOException, URISyntaxException {
-    config = Mockito.mock(Config.class);
-    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
-    final String CLASS_NAME = EXCLUDED_PACKAGE + "SymbolExtraction16";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    ClassNameFiltering classNameFiltering =
-        new ClassNameFiltering(Collections.singleton(EXCLUDED_PACKAGE));
-    currentTransformer =
-        new SymbolExtractionTransformer(
-            new SymbolAggregator(classNameFiltering, emptyList(), symbolSinkMock, 1),
-            classNameFiltering);
-    instr.addTransformer(currentTransformer);
-    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-    Reflect.on(testClass).call("main", "1").get();
-    assertFalse(
-        symbolSinkMock.jarScopes.stream()
-            .flatMap(scope -> scope.getScopes().stream())
-            .anyMatch(scope -> scope.getName().equals(CLASS_NAME)));
-  }
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void symbolExtraction13() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction13";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        currentTransformer = createTransformer(symbolSinkMock);
+        instr.addTransformer(currentTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.on(testClass).call("main", "1").get();
+        Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+        assertLangSpecifics(
+                classScope.getLanguageSpecifics(),
+                asList("public"),
+                asList("@com.datadog.debugger.symboltest.MyAnnotation", "@com.datadog.debugger.symboltest.MyMarker"),
+                Object.class.getTypeName(),
+                null,
+                null);
+        Scope mainMethodScope = classScope.getScopes().get(1);
+        assertLangSpecifics(
+                mainMethodScope.getLanguageSpecifics(),
+                asList("public", "static"),
+                asList("@com.datadog.debugger.symboltest.MyAnnotation"),
+                null,
+                null,
+                Integer.TYPE.getTypeName());
+        assertEquals(3, classScope.getSymbols().size());
+        Symbol intField = classScope.getSymbols().get(0);
+        assertLangSpecifics(
+                intField.getLanguageSpecifics(),
+                asList("private"),
+                asList("@com.datadog.debugger.symboltest.MyAnnotation"),
+                null,
+                null,
+                null);
+        Scope myAnnotationClassScope =
+                symbolSinkMock.jarScopes.get(1).getScopes().get(0);
+        assertLangSpecifics(
+                myAnnotationClassScope.getLanguageSpecifics(),
+                asList("interface", "abstract", "annotation"),
+                asList("@java.lang.annotation.Target", "@java.lang.annotation.Retention"),
+                Object.class.getTypeName(),
+                asList("java.lang.annotation.Annotation"),
+                null);
+        Symbol strField = classScope.getSymbols().get(1);
+        assertLangSpecifics(
+                strField.getLanguageSpecifics(), asList("public", "static", "volatile"), null, null, null, null);
+        Symbol doubleField = classScope.getSymbols().get(2);
+        assertLangSpecifics(
+                doubleField.getLanguageSpecifics(), asList("protected", "final", "transient"), null, null, null, null);
+    }
 
-  @Test
-  public void skipDebuggerInternalClasses() throws IllegalClassFormatException {
-    // Regression test for: DatadogClassLoader attempted duplicate class definition for
-    // com.datadog.debugger.instrumentation.Types (LinkageError). SymbolExtractionTransformer
-    // must never parse debugger-internal classes, since doing so while such a class is still
-    // being loaded/defined can trigger a re-entrant load of the same class on the same thread.
-    ClassNameFiltering classNameFiltering = new ClassNameFiltering(Collections.emptySet());
-    SymbolAggregator symbolAggregator = mock(SymbolAggregator.class);
-    currentTransformer = new SymbolExtractionTransformer(symbolAggregator, classNameFiltering);
-    byte[] classfileBuffer = new byte[0];
-    assertNull(
-        currentTransformer.transform(
-            null, "com/datadog/debugger/instrumentation/Types", null, null, classfileBuffer));
-    verifyNoInteractions(symbolAggregator);
-  }
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void symbolExtraction14() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction14";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        currentTransformer = createTransformer(symbolSinkMock);
+        instr.addTransformer(currentTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.on(testClass).call("main", "1").get();
+        Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+        assertLangSpecifics(
+                classScope.getLanguageSpecifics(),
+                asList("public", "abstract"),
+                null,
+                Object.class.getTypeName(),
+                asList("com.datadog.debugger.symboltest.I1", "com.datadog.debugger.symboltest.I2"),
+                null);
+        assertEquals(4, classScope.getScopes().size());
+        Scope m1MethodScope = classScope.getScopes().get(2);
+        assertLangSpecifics(
+                m1MethodScope.getLanguageSpecifics(),
+                asList("protected", "abstract"),
+                null,
+                null,
+                null,
+                Void.TYPE.getTypeName());
+        Scope m2MethodScope = classScope.getScopes().get(3);
+        assertLangSpecifics(
+                m2MethodScope.getLanguageSpecifics(),
+                asList("private", "final", "synchronized", "(varargs)", "strictfp"),
+                null,
+                null,
+                null,
+                String.class.getTypeName());
+        Scope i1ClassScope = symbolSinkMock.jarScopes.get(1).getScopes().get(0);
+        assertLangSpecifics(
+                i1ClassScope.getLanguageSpecifics(),
+                asList("interface", "abstract"),
+                null,
+                Object.class.getTypeName(),
+                null,
+                null);
+        Scope m3MethodScope = i1ClassScope.getScopes().get(0);
+        assertLangSpecifics(
+                m3MethodScope.getLanguageSpecifics(),
+                asList("public", "default"),
+                null,
+                null,
+                null,
+                Void.TYPE.getTypeName());
+        Scope m4MethodScope = i1ClassScope.getScopes().get(1);
+        assertLangSpecifics(
+                m4MethodScope.getLanguageSpecifics(),
+                asList("public", "static"),
+                null,
+                null,
+                null,
+                String.class.getTypeName());
+        Scope myEnumClassScope = symbolSinkMock.jarScopes.get(3).getScopes().get(0);
+        assertLangSpecifics(
+                myEnumClassScope.getLanguageSpecifics(),
+                asList("final", "enum"),
+                null,
+                Enum.class.getTypeName(),
+                null,
+                null);
+        assertEquals(4, myEnumClassScope.getSymbols().size());
+        Symbol oneField = myEnumClassScope.getSymbols().get(0);
+        assertLangSpecifics(
+                oneField.getLanguageSpecifics(), asList("public", "static", "final", "enum"), null, null, null, null);
+        Symbol valuesField = myEnumClassScope.getSymbols().get(3);
+        assertLangSpecifics(
+                valuesField.getLanguageSpecifics(),
+                asList("private", "static", "final", "synthetic"),
+                null,
+                null,
+                null,
+                null);
+    }
 
-  @Test
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void duplicateClassThroughDifferentClassLoader() throws IOException, URISyntaxException {
-    final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction01";
-    SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
-    currentTransformer = createTransformer(symbolSinkMock);
-    instr.addTransformer(currentTransformer);
-    for (int i = 0; i < 10; i++) {
-      // compile and load the class in a specific ClassLoader each time
-      Class<?> testClass = compileAndLoadClass(CLASS_NAME);
-      Reflect.on(testClass).call("main", "1").get();
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_17, max = JRE.JAVA_25)
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void symbolExtraction15() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction15";
+        final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction15.java";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        currentTransformer = createTransformer(symbolSinkMock);
+        instr.addTransformer(currentTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME, "17");
+        Reflect.on(testClass).call("main", "1").get();
+        Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+        assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 10, 13, SOURCE_FILE, 8, 3);
+        assertLangSpecifics(
+                classScope.getLanguageSpecifics(),
+                asList("public", "final", "record"),
+                null,
+                "java.lang.Record",
+                null,
+                null);
+        Scope initMethodScope = classScope.getScopes().get(0);
+        assertScope(initMethodScope, ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 3);
+        assertSymbol(initMethodScope.getSymbols().get(0), SymbolType.ARG, "firstName", String.class.getTypeName(), 0);
+        assertSymbol(initMethodScope.getSymbols().get(1), SymbolType.ARG, "lastName", String.class.getTypeName(), 0);
+        assertSymbol(initMethodScope.getSymbols().get(2), SymbolType.ARG, "age", Integer.TYPE.getTypeName(), 0);
+        Scope mainMethodScope = classScope.getScopes().get(1);
+        assertScope(mainMethodScope, ScopeType.METHOD, "main", 13, 13, SOURCE_FILE, 0, 1);
+        Scope toStringMethodScope = classScope.getScopes().get(2);
+        assertScope(toStringMethodScope, ScopeType.METHOD, "toString", 10, 10, SOURCE_FILE, 0, 0);
+        Scope hashCodeMethodScope = classScope.getScopes().get(3);
+        assertScope(hashCodeMethodScope, ScopeType.METHOD, "hashCode", 10, 10, SOURCE_FILE, 0, 0);
+        Scope equalsMethodScope = classScope.getScopes().get(4);
+        assertScope(equalsMethodScope, ScopeType.METHOD, "equals", 10, 10, SOURCE_FILE, 0, 1);
+        Scope firstNameMethodScope = classScope.getScopes().get(5);
+        assertScope(firstNameMethodScope, ScopeType.METHOD, "firstName", 10, 10, SOURCE_FILE, 0, 0);
+        Scope lastNameMethodScope = classScope.getScopes().get(6);
+        assertScope(lastNameMethodScope, ScopeType.METHOD, "lastName", 10, 10, SOURCE_FILE, 0, 0);
+        Scope ageMethodScope = classScope.getScopes().get(7);
+        assertScope(ageMethodScope, ScopeType.METHOD, "age", 10, 10, SOURCE_FILE, 0, 0);
     }
-    assertEquals(1, symbolSinkMock.jarScopes.size());
-  }
 
-  private void assertLangSpecifics(
-      LanguageSpecifics languageSpecifics,
-      List<String> expectedModifiers,
-      List<String> expectedAnnotations,
-      String expectedSuperClass,
-      List<String> expectedInterfaces,
-      String expectedReturnType) {
-    if (expectedModifiers == null) {
-      assertNull(languageSpecifics.getAccessModifiers());
-    } else {
-      assertEquals(expectedModifiers, languageSpecifics.getAccessModifiers());
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void symbolExtraction16() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction16";
+        final String SOURCE_FILE = SYMBOL_PACKAGE_DIR + "SymbolExtraction16.kt";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        Set<String> additionalExcludedPackages = Stream.of(
+                        "org.jetbrains.",
+                        "kotlin.",
+                        "kotlinx.",
+                        "org.junit.",
+                        "io.vavr.",
+                        "com.intellij.",
+                        "gnu.trove.")
+                .collect(toSet());
+        currentTransformer = createTransformer(symbolSinkMock, additionalExcludedPackages);
+        instr.addTransformer(currentTransformer);
+        URL resource = CapturedSnapshotTest.class.getResource("/" + SOURCE_FILE);
+        assertNotNull(resource);
+        List<File> filesToDelete = new ArrayList<>();
+        try {
+            Class<?> testClass = KotlinHelper.compileAndLoad(CLASS_NAME, resource.getFile(), filesToDelete);
+            Object companion = Reflect.onClass(testClass).get("Companion");
+            int result = Reflect.on(companion).call("main", "").get();
+            assertEquals(73, result);
+        } finally {
+            filesToDelete.forEach(File::delete);
+        }
+        assertEquals(4, symbolSinkMock.jarScopes.size());
+        Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
+        assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 6, 28, SOURCE_FILE, 6, 1);
+        assertLangSpecifics(
+                classScope.getLanguageSpecifics(),
+                asList("public", "final"),
+                asList("@kotlin.Metadata"),
+                "java.lang.Object",
+                null,
+                null);
+        assertSymbol(
+                classScope.getSymbols().get(0), SymbolType.STATIC_FIELD, "Companion", CLASS_NAME + "$Companion", 0);
+        assertScope(classScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
+        Scope f1MethodScope = classScope.getScopes().get(1);
+        assertScope(f1MethodScope, ScopeType.METHOD, "f1", 6, 6, SOURCE_FILE, 0, 1);
+        assertSymbol(f1MethodScope.getSymbols().get(0), SymbolType.ARG, "value", Integer.TYPE.getTypeName(), 6);
+        Scope f2MethodScope = classScope.getScopes().get(2);
+        assertScope(f2MethodScope, ScopeType.METHOD, "f2", 10, 17, SOURCE_FILE, 3, 1);
+        assertLineRanges(f2MethodScope, "10-10", "12-12", "14-14", "16-17");
+        Scope f3MethodScope = classScope.getScopes().get(3);
+        assertScope(f3MethodScope, ScopeType.METHOD, "f3", 21, 23, SOURCE_FILE, 1, 1);
+        assertLineRanges(f3MethodScope, "21-23");
+        Scope f4MethodScope = classScope.getScopes().get(4);
+        assertScope(f4MethodScope, ScopeType.METHOD, "f4", 27, 28, SOURCE_FILE, 1, 1);
+        assertLineRanges(f4MethodScope, "27-28");
+        assertScope(classScope.getScopes().get(5), ScopeType.METHOD, "<clinit>", 0, 0, SOURCE_FILE, 0, 0);
+
+        Scope companionClassScope = symbolSinkMock.jarScopes.get(1).getScopes().get(0);
+        assertScope(companionClassScope, ScopeType.CLASS, CLASS_NAME + "$Companion", 33, 34, SOURCE_FILE, 3, 0);
+        assertLangSpecifics(
+                classScope.getLanguageSpecifics(),
+                asList("public", "final"),
+                asList("@kotlin.Metadata"),
+                "java.lang.Object",
+                null,
+                null);
+        assertScope(companionClassScope.getScopes().get(0), ScopeType.METHOD, "<init>", 0, 0, SOURCE_FILE, 0, 0);
+        Scope mainMethodScope = companionClassScope.getScopes().get(1);
+        assertScope(mainMethodScope, ScopeType.METHOD, "main", 33, 34, SOURCE_FILE, 1, 1);
+        assertLineRanges(mainMethodScope, "33-34");
     }
-    if (expectedAnnotations == null) {
-      assertNull(languageSpecifics.getAnnotations());
-    } else {
-      assertEquals(expectedAnnotations, languageSpecifics.getAnnotations());
+
+    @Test
+    public void filterOutClassesFromExcludedPackages() throws IOException, URISyntaxException {
+        config = Mockito.mock(Config.class);
+        when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
+        final String CLASS_NAME = EXCLUDED_PACKAGE + "SymbolExtraction16";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        ClassNameFiltering classNameFiltering = new ClassNameFiltering(Collections.singleton(EXCLUDED_PACKAGE));
+        currentTransformer = new SymbolExtractionTransformer(
+                new SymbolAggregator(classNameFiltering, emptyList(), symbolSinkMock, 1), classNameFiltering);
+        instr.addTransformer(currentTransformer);
+        Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+        Reflect.on(testClass).call("main", "1").get();
+        assertFalse(symbolSinkMock.jarScopes.stream()
+                .flatMap(scope -> scope.getScopes().stream())
+                .anyMatch(scope -> scope.getName().equals(CLASS_NAME)));
     }
-    if (expectedSuperClass == null) {
-      assertNull(languageSpecifics.getSuperClass());
-    } else {
-      assertEquals(expectedSuperClass, languageSpecifics.getSuperClass());
+
+    @Test
+    public void skipDebuggerInternalClasses() throws IllegalClassFormatException {
+        // Regression test for: DatadogClassLoader attempted duplicate class definition for
+        // com.datadog.debugger.instrumentation.Types (LinkageError). SymbolExtractionTransformer
+        // must never parse debugger-internal classes, since doing so while such a class is still
+        // being loaded/defined can trigger a re-entrant load of the same class on the same thread.
+        ClassNameFiltering classNameFiltering = new ClassNameFiltering(Collections.emptySet());
+        SymbolAggregator symbolAggregator = mock(SymbolAggregator.class);
+        currentTransformer = new SymbolExtractionTransformer(symbolAggregator, classNameFiltering);
+        byte[] classfileBuffer = new byte[0];
+        assertNull(currentTransformer.transform(
+                null, "com/datadog/debugger/instrumentation/Types", null, null, classfileBuffer));
+        verifyNoInteractions(symbolAggregator);
     }
-    if (expectedInterfaces == null) {
-      assertNull(languageSpecifics.getInterfaces());
-    } else {
-      assertEquals(expectedInterfaces, languageSpecifics.getInterfaces());
+
+    @Test
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void duplicateClassThroughDifferentClassLoader() throws IOException, URISyntaxException {
+        final String CLASS_NAME = SYMBOL_PACKAGE + "SymbolExtraction01";
+        SymbolSinkMock symbolSinkMock = new SymbolSinkMock(config);
+        currentTransformer = createTransformer(symbolSinkMock);
+        instr.addTransformer(currentTransformer);
+        for (int i = 0; i < 10; i++) {
+            // compile and load the class in a specific ClassLoader each time
+            Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+            Reflect.on(testClass).call("main", "1").get();
+        }
+        assertEquals(1, symbolSinkMock.jarScopes.size());
     }
-    if (expectedReturnType == null) {
-      assertNull(languageSpecifics.getReturnType());
-    } else {
-      assertEquals(expectedReturnType, languageSpecifics.getReturnType());
+
+    private void assertLangSpecifics(
+            LanguageSpecifics languageSpecifics,
+            List<String> expectedModifiers,
+            List<String> expectedAnnotations,
+            String expectedSuperClass,
+            List<String> expectedInterfaces,
+            String expectedReturnType) {
+        if (expectedModifiers == null) {
+            assertNull(languageSpecifics.getAccessModifiers());
+        } else {
+            assertEquals(expectedModifiers, languageSpecifics.getAccessModifiers());
+        }
+        if (expectedAnnotations == null) {
+            assertNull(languageSpecifics.getAnnotations());
+        } else {
+            assertEquals(expectedAnnotations, languageSpecifics.getAnnotations());
+        }
+        if (expectedSuperClass == null) {
+            assertNull(languageSpecifics.getSuperClass());
+        } else {
+            assertEquals(expectedSuperClass, languageSpecifics.getSuperClass());
+        }
+        if (expectedInterfaces == null) {
+            assertNull(languageSpecifics.getInterfaces());
+        } else {
+            assertEquals(expectedInterfaces, languageSpecifics.getInterfaces());
+        }
+        if (expectedReturnType == null) {
+            assertNull(languageSpecifics.getReturnType());
+        } else {
+            assertEquals(expectedReturnType, languageSpecifics.getReturnType());
+        }
     }
-  }
 
-  private static void assertScope(
-      Scope scope,
-      ScopeType scopeType,
-      String name,
-      int startLine,
-      int endLine,
-      String sourceFile,
-      int nbScopes,
-      int nbSymbols) {
-    assertEquals(scopeType, scope.getScopeType());
-    if (name != null && name.endsWith("*")) {
-      name = name.substring(0, name.length() - 1);
-      assertTrue(scope.getName().startsWith(name));
-    } else {
-      assertEquals(name, scope.getName());
+    private static void assertScope(
+            Scope scope,
+            ScopeType scopeType,
+            String name,
+            int startLine,
+            int endLine,
+            String sourceFile,
+            int nbScopes,
+            int nbSymbols) {
+        assertEquals(scopeType, scope.getScopeType());
+        if (name != null && name.endsWith("*")) {
+            name = name.substring(0, name.length() - 1);
+            assertTrue(scope.getName().startsWith(name));
+        } else {
+            assertEquals(name, scope.getName());
+        }
+        assertEquals(startLine, scope.getStartLine());
+        assertEquals(endLine, scope.getEndLine());
+        assertEquals(sourceFile, scope.getSourceFile());
+        assertEquals(nbScopes, scope.getScopes().size());
+        assertEquals(nbSymbols, scope.getSymbols().size());
     }
-    assertEquals(startLine, scope.getStartLine());
-    assertEquals(endLine, scope.getEndLine());
-    assertEquals(sourceFile, scope.getSourceFile());
-    assertEquals(nbScopes, scope.getScopes().size());
-    assertEquals(nbSymbols, scope.getSymbols().size());
-  }
 
-  private void assertSymbol(
-      Symbol symbol, SymbolType symbolType, String name, String type, int line) {
-    assertEquals(symbolType, symbol.getSymbolType());
-    assertEquals(name, symbol.getName());
-    assertEquals(type, symbol.getType());
-    assertEquals(line, symbol.getLine());
-  }
+    private void assertSymbol(Symbol symbol, SymbolType symbolType, String name, String type, int line) {
+        assertEquals(symbolType, symbol.getSymbolType());
+        assertEquals(name, symbol.getName());
+        assertEquals(type, symbol.getType());
+        assertEquals(line, symbol.getLine());
+    }
 
-  private void assertLineRanges(Scope scope, String... expectedRanges) {
-    assertTrue(scope.hasInjectibleLines());
-    assertEquals(expectedRanges.length, scope.getInjectibleLines().size());
-    int idx = 0;
-    for (String expectedRange : expectedRanges) {
-      String[] range = expectedRange.split("-");
-      assertEquals(Integer.parseInt(range[0]), scope.getInjectibleLines().get(idx).start);
-      assertEquals(Integer.parseInt(range[1]), scope.getInjectibleLines().get(idx).end);
-      idx++;
+    private void assertLineRanges(Scope scope, String... expectedRanges) {
+        assertTrue(scope.hasInjectibleLines());
+        assertEquals(expectedRanges.length, scope.getInjectibleLines().size());
+        int idx = 0;
+        for (String expectedRange : expectedRanges) {
+            String[] range = expectedRange.split("-");
+            assertEquals(Integer.parseInt(range[0]), scope.getInjectibleLines().get(idx).start);
+            assertEquals(Integer.parseInt(range[1]), scope.getInjectibleLines().get(idx).end);
+            idx++;
+        }
     }
-  }
 
-  private SymbolExtractionTransformer createTransformer(SymbolSink symbolSink) {
-    return createTransformer(symbolSink, 1, TRANSFORMER_EXCLUDES);
-  }
+    private SymbolExtractionTransformer createTransformer(SymbolSink symbolSink) {
+        return createTransformer(symbolSink, 1, TRANSFORMER_EXCLUDES);
+    }
 
-  private SymbolExtractionTransformer createTransformer(
-      SymbolSinkMock symbolSinkMock, Set<String> additionalExcludedPackages) {
-    Set<String> excludedPackages = new HashSet<>(TRANSFORMER_EXCLUDES);
-    excludedPackages.addAll(additionalExcludedPackages);
-    return createTransformer(symbolSinkMock, 1, excludedPackages);
-  }
+    private SymbolExtractionTransformer createTransformer(
+            SymbolSinkMock symbolSinkMock, Set<String> additionalExcludedPackages) {
+        Set<String> excludedPackages = new HashSet<>(TRANSFORMER_EXCLUDES);
+        excludedPackages.addAll(additionalExcludedPackages);
+        return createTransformer(symbolSinkMock, 1, excludedPackages);
+    }
 
-  private SymbolExtractionTransformer createTransformer(
-      SymbolSink symbolSink, int symbolFlushThreshold, Set<String> excludedPackages) {
-    return createTransformer(
-        symbolSink,
-        symbolFlushThreshold,
-        new ClassNameFiltering(
-            excludedPackages, Collections.singleton(SYMBOL_PACKAGE), Collections.emptySet()));
-  }
+    private SymbolExtractionTransformer createTransformer(
+            SymbolSink symbolSink, int symbolFlushThreshold, Set<String> excludedPackages) {
+        return createTransformer(
+                symbolSink,
+                symbolFlushThreshold,
+                new ClassNameFiltering(
+                        excludedPackages, Collections.singleton(SYMBOL_PACKAGE), Collections.emptySet()));
+    }
 
-  private SymbolExtractionTransformer createTransformer(
-      SymbolSink symbolSink, int symbolFlushThreshold, ClassNameFiltering classNameFiltering) {
-    return new SymbolExtractionTransformer(
-        new SymbolAggregator(classNameFiltering, emptyList(), symbolSink, symbolFlushThreshold),
-        classNameFiltering);
-  }
+    private SymbolExtractionTransformer createTransformer(
+            SymbolSink symbolSink, int symbolFlushThreshold, ClassNameFiltering classNameFiltering) {
+        return new SymbolExtractionTransformer(
+                new SymbolAggregator(classNameFiltering, emptyList(), symbolSink, symbolFlushThreshold),
+                classNameFiltering);
+    }
 
-  static class SymbolSinkMock extends SymbolSink {
-    final List<Scope> jarScopes = new ArrayList<>();
+    static class SymbolSinkMock extends SymbolSink {
+        final List<Scope> jarScopes = new ArrayList<>();
 
-    public SymbolSinkMock(Config config) {
-      super(config);
-    }
+        public SymbolSinkMock(Config config) {
+            super(config);
+        }
 
-    @Override
-    public void addScope(Scope jarScope) {
-      jarScopes.add(jarScope);
+        @Override
+        public void addScope(Scope jarScope) {
+            jarScopes.add(jarScope);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractorTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractorTest.java
index 0f8edba690d..eeb0901545f 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractorTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractorTest.java
@@ -8,30 +8,29 @@
 
 class SymbolExtractorTest {
 
-  @Test
-  void ranges() {
-    List<Scope.LineRange> ranges =
-        SymbolExtractor.buildRanges(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10));
-    assertEquals(1, ranges.size());
-    assertEquals(1, ranges.get(0).start);
-    assertEquals(10, ranges.get(0).end);
-    ranges = SymbolExtractor.buildRanges(Arrays.asList(1, 3, 5, 7, 9));
-    assertEquals(5, ranges.size());
-    assertLineRange(ranges.get(0), 1, 1);
-    assertLineRange(ranges.get(1), 3, 3);
-    assertLineRange(ranges.get(2), 5, 5);
-    assertLineRange(ranges.get(3), 7, 7);
-    assertLineRange(ranges.get(4), 9, 9);
-    ranges = SymbolExtractor.buildRanges(Arrays.asList(1, 2, 4, 5, 7, 9, 10));
-    assertEquals(4, ranges.size());
-    assertLineRange(ranges.get(0), 1, 2);
-    assertLineRange(ranges.get(1), 4, 5);
-    assertLineRange(ranges.get(2), 7, 7);
-    assertLineRange(ranges.get(3), 9, 10);
-  }
+    @Test
+    void ranges() {
+        List<Scope.LineRange> ranges = SymbolExtractor.buildRanges(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10));
+        assertEquals(1, ranges.size());
+        assertEquals(1, ranges.get(0).start);
+        assertEquals(10, ranges.get(0).end);
+        ranges = SymbolExtractor.buildRanges(Arrays.asList(1, 3, 5, 7, 9));
+        assertEquals(5, ranges.size());
+        assertLineRange(ranges.get(0), 1, 1);
+        assertLineRange(ranges.get(1), 3, 3);
+        assertLineRange(ranges.get(2), 5, 5);
+        assertLineRange(ranges.get(3), 7, 7);
+        assertLineRange(ranges.get(4), 9, 9);
+        ranges = SymbolExtractor.buildRanges(Arrays.asList(1, 2, 4, 5, 7, 9, 10));
+        assertEquals(4, ranges.size());
+        assertLineRange(ranges.get(0), 1, 2);
+        assertLineRange(ranges.get(1), 4, 5);
+        assertLineRange(ranges.get(2), 7, 7);
+        assertLineRange(ranges.get(3), 9, 10);
+    }
 
-  private static void assertLineRange(Scope.LineRange range, int expectedStart, int expectedEnd) {
-    assertEquals(expectedStart, range.start);
-    assertEquals(expectedEnd, range.end);
-  }
+    private static void assertLineRange(Scope.LineRange range, int expectedStart, int expectedEnd) {
+        assertEquals(expectedStart, range.start);
+        assertEquals(expectedEnd, range.end);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/WireFilterTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/WireFilterTest.java
index 2d51bc91b00..0e170711488 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/WireFilterTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/WireFilterTest.java
@@ -7,37 +7,33 @@
 import org.junit.jupiter.api.Test;
 
 class WireFilterTest {
-  @Test
-  void filterOut() {
-    WireFilter wireFilter = new WireFilter();
-    assertFalse(wireFilter.filterOut(null));
-    Scope scope = Scope.builder(ScopeType.CLASS, "", 0, 0).build();
-    assertFalse(wireFilter.filterOut(scope));
-    scope = Scope.builder(ScopeType.CLASS, "", 0, 0).name("com.squareup.wire.MyClass").build();
-    assertFalse(wireFilter.filterOut(scope));
-    scope =
-        Scope.builder(ScopeType.CLASS, "", 0, 0)
-            .languageSpecifics(
-                new LanguageSpecifics.Builder()
-                    .addInterfaces(asList("com.squareup.wire.Message"))
-                    .build())
-            .build();
-    assertFalse(wireFilter.filterOut(scope));
-    scope =
-        Scope.builder(ScopeType.CLASS, "", 0, 0)
-            .languageSpecifics(
-                new LanguageSpecifics.Builder()
-                    .superClass("com.squareup.wire.ProtoAdapter")
-                    .build())
-            .build();
-    assertTrue(wireFilter.filterOut(scope));
-    scope =
-        Scope.builder(ScopeType.CLASS, "", 0, 0)
-            .languageSpecifics(
-                new LanguageSpecifics.Builder()
-                    .addInterfaces(asList("com.squareup.wire.ProtoAdapter"))
-                    .build())
-            .build();
-    assertTrue(wireFilter.filterOut(scope));
-  }
+    @Test
+    void filterOut() {
+        WireFilter wireFilter = new WireFilter();
+        assertFalse(wireFilter.filterOut(null));
+        Scope scope = Scope.builder(ScopeType.CLASS, "", 0, 0).build();
+        assertFalse(wireFilter.filterOut(scope));
+        scope = Scope.builder(ScopeType.CLASS, "", 0, 0)
+                .name("com.squareup.wire.MyClass")
+                .build();
+        assertFalse(wireFilter.filterOut(scope));
+        scope = Scope.builder(ScopeType.CLASS, "", 0, 0)
+                .languageSpecifics(new LanguageSpecifics.Builder()
+                        .addInterfaces(asList("com.squareup.wire.Message"))
+                        .build())
+                .build();
+        assertFalse(wireFilter.filterOut(scope));
+        scope = Scope.builder(ScopeType.CLASS, "", 0, 0)
+                .languageSpecifics(new LanguageSpecifics.Builder()
+                        .superClass("com.squareup.wire.ProtoAdapter")
+                        .build())
+                .build();
+        assertTrue(wireFilter.filterOut(scope));
+        scope = Scope.builder(ScopeType.CLASS, "", 0, 0)
+                .languageSpecifics(new LanguageSpecifics.Builder()
+                        .addInterfaces(asList("com.squareup.wire.ProtoAdapter"))
+                        .build())
+                .build();
+        assertTrue(wireFilter.filterOut(scope));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/trigger/TriggerProbeTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/trigger/TriggerProbeTest.java
index bb0c413c612..0a94b39a940 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/trigger/TriggerProbeTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/trigger/TriggerProbeTest.java
@@ -38,228 +38,213 @@
 import org.junit.jupiter.api.Test;
 
 public class TriggerProbeTest extends CapturingTestBase {
-  private static final ProbeId TRIGGER_PROBE_ID1 = new ProbeId("trigger probe 1", 0);
-  private static final String TRIGGER_PROBE_SESSION_ID = "trigger probe sessionID";
+    private static final ProbeId TRIGGER_PROBE_ID1 = new ProbeId("trigger probe 1", 0);
+    private static final String TRIGGER_PROBE_SESSION_ID = "trigger probe sessionID";
 
-  private TestTraceInterceptor traceInterceptor;
+    private TestTraceInterceptor traceInterceptor;
 
-  @Override
-  @BeforeEach
-  public void before() {
-    super.before();
-    traceInterceptor = new TestTraceInterceptor();
+    @Override
+    @BeforeEach
+    public void before() {
+        super.before();
+        traceInterceptor = new TestTraceInterceptor();
 
-    CoreTracer tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-    tracer.addTraceInterceptor(traceInterceptor);
+        CoreTracer tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+        tracer.addTraceInterceptor(traceInterceptor);
 
-    setFieldInConfig(Config.get(), "debuggerCodeOriginEnabled", true);
-    setFieldInConfig(InstrumenterConfig.get(), "codeOriginEnabled", true);
-    setFieldInConfig(Config.get(), "distributedDebuggerEnabled", true);
-  }
-
-  @Test
-  public void conditions() throws IOException, URISyntaxException {
-    final String className = "com.datadog.debugger.TriggerProbe02";
-    TriggerProbe probe1 =
-        createTriggerProbe(
-            TRIGGER_PROBE_ID1,
-            TRIGGER_PROBE_SESSION_ID,
-            className,
-            "entry",
-            "(int)",
-            new ProbeCondition(when(lt(ref("value"), value(25))), "value < 25"),
-            new Sampling(10.0));
-    installProbes(Configuration.builder().setService(SERVICE_NAME).add(probe1).build());
-    Class<?> testClass = compileAndLoadClass(className);
-    for (int i = 0; i < 100; i++) {
-      Reflect.onClass(testClass).call("main", i).get();
+        setFieldInConfig(Config.get(), "debuggerCodeOriginEnabled", true);
+        setFieldInConfig(InstrumenterConfig.get(), "codeOriginEnabled", true);
+        setFieldInConfig(Config.get(), "distributedDebuggerEnabled", true);
     }
-    List<List<? extends MutableSpan>> allTraces = traceInterceptor.getAllTraces();
-    long count =
-        allTraces.stream()
-            .map(span -> span.get(0))
-            .filter(
-                span -> {
-                  DDSpan ddSpan = (DDSpan) span;
-                  PropagationTags tags = ddSpan.spanContext().getPropagationTags();
-                  return (TRIGGER_PROBE_SESSION_ID + ":1").equals(tags.getDebugPropagation());
-                })
-            .count();
-    assertEquals(100, allTraces.size(), "actual traces: " + allTraces.size());
-    assertTrue(count <= 25, "Should have at most 25 debug sessions.  found: " + count);
-  }
-
-  private static TriggerProbe createTriggerProbe(
-      ProbeId id,
-      String sessionId,
-      String typeName,
-      String methodName,
-      String signature,
-      ProbeCondition probeCondition,
-      Sampling sampling) {
-    return TriggerProbe.builder()
-        .probeId(id)
-        .where(typeName, methodName, signature)
-        .when(probeCondition)
-        .sampling(sampling)
-        .build()
-        .setSessionId(sessionId);
-  }
-
-  @Test
-  public void cooldown() throws IOException, URISyntaxException {
-    try {
-      MockSampler sampler = new MockSampler();
-      ProbeRateLimiter.setSamplerSupplier(value -> sampler);
-
-      final String className = "com.datadog.debugger.TriggerProbe01";
-      TriggerProbe probe1 =
-          createTriggerProbe(
-              TRIGGER_PROBE_ID1,
-              TRIGGER_PROBE_SESSION_ID,
-              className,
-              "entry",
-              "()",
-              null,
-              new Sampling(10, 10.0));
-      installProbes(Configuration.builder().setService(SERVICE_NAME).add(probe1).build());
-      Class<?> testClass = compileAndLoadClass(className);
-      int runs = 10000;
-      for (int i = 0; i < runs; i++) {
-        Reflect.onClass(testClass).call("main", "").get();
-      }
 
-      assertEquals(1, sampler.getCallCount());
-      List<List<? extends MutableSpan>> allTraces = traceInterceptor.getAllTraces();
-      assertEquals(runs, allTraces.size(), "actual traces: " + allTraces.size());
-
-      long debugSessions =
-          allTraces.stream()
-              .map(span -> span.get(0))
-              .filter(
-                  span -> {
+    @Test
+    public void conditions() throws IOException, URISyntaxException {
+        final String className = "com.datadog.debugger.TriggerProbe02";
+        TriggerProbe probe1 = createTriggerProbe(
+                TRIGGER_PROBE_ID1,
+                TRIGGER_PROBE_SESSION_ID,
+                className,
+                "entry",
+                "(int)",
+                new ProbeCondition(when(lt(ref("value"), value(25))), "value < 25"),
+                new Sampling(10.0));
+        installProbes(
+                Configuration.builder().setService(SERVICE_NAME).add(probe1).build());
+        Class<?> testClass = compileAndLoadClass(className);
+        for (int i = 0; i < 100; i++) {
+            Reflect.onClass(testClass).call("main", i).get();
+        }
+        List<List<? extends MutableSpan>> allTraces = traceInterceptor.getAllTraces();
+        long count = allTraces.stream()
+                .map(span -> span.get(0))
+                .filter(span -> {
                     DDSpan ddSpan = (DDSpan) span;
                     PropagationTags tags = ddSpan.spanContext().getPropagationTags();
                     return (TRIGGER_PROBE_SESSION_ID + ":1").equals(tags.getDebugPropagation());
-                  })
-              .count();
-      assertEquals(1, debugSessions, "Should only have 1 debug session.  found: " + debugSessions);
-
-      long tagged =
-          allTraces.stream()
-              .flatMap(Collection::stream)
-              .filter(
-                  span ->
-                      span.getTag(format("_dd.ld.probe_id.%s", TRIGGER_PROBE_ID1.getId())) != null)
-              .count();
-      assertEquals(1, tagged, "Should only have 1 tagged span.  found: " + tagged);
-    } finally {
-      ProbeRateLimiter.setSamplerSupplier(null);
+                })
+                .count();
+        assertEquals(100, allTraces.size(), "actual traces: " + allTraces.size());
+        assertTrue(count <= 25, "Should have at most 25 debug sessions.  found: " + count);
     }
-  }
-
-  @Test
-  public void badCondition() throws IOException, URISyntaxException {
-    String className = "com.datadog.debugger.TriggerProbe02";
-    TriggerProbe probe1 =
-        createTriggerProbe(
-            TRIGGER_PROBE_ID1,
-            TRIGGER_PROBE_SESSION_ID,
-            className,
-            "entry",
-            "(int)",
-            new ProbeCondition(when(lt(ref("limit"), value(25))), "limit < 25"),
-            new Sampling(10.0));
 
-    installProbes(Configuration.builder().setService(SERVICE_NAME).add(probe1).build());
-    Class<?> testClass = compileAndLoadClass(className);
-    Reflect.onClass(testClass).call("main", 0).get();
-    verify(probeStatusSink)
-        .addError(
-            eq(TRIGGER_PROBE_ID1),
-            eq(new EvaluationException("Cannot find symbol: limit", "limit")));
-  }
-
-  @Test
-  public void debuggerDisabled() throws IOException, URISyntaxException {
-    boolean original = Config.get().isDistributedDebuggerEnabled();
-    try {
-      setFieldInConfig(Config.get(), "distributedDebuggerEnabled", false);
-
-      MockSampler sampler = new MockSampler();
-      ProbeRateLimiter.setSamplerSupplier(value -> sampler);
-
-      final String className = "com.datadog.debugger.TriggerProbe02";
-      TriggerProbe probe1 =
-          createTriggerProbe(
-              TRIGGER_PROBE_ID1,
-              TRIGGER_PROBE_SESSION_ID,
-              className,
-              "entry",
-              "(int)",
-              new ProbeCondition(when(lt(ref("value"), value(25))), "value < 25"),
-              new Sampling(10.0));
-      installProbes(Configuration.builder().setService(SERVICE_NAME).add(probe1).build());
-      Class<?> testClass = compileAndLoadClass(className);
-      Reflect.onClass(testClass).call("main", 0).get();
-
-      assertEquals(0, sampler.getCallCount());
-    } finally {
-      setFieldInConfig(Config.get(), "distributedDebuggerEnabled", original);
-      ProbeRateLimiter.setSamplerSupplier(null);
+    private static TriggerProbe createTriggerProbe(
+            ProbeId id,
+            String sessionId,
+            String typeName,
+            String methodName,
+            String signature,
+            ProbeCondition probeCondition,
+            Sampling sampling) {
+        return TriggerProbe.builder()
+                .probeId(id)
+                .where(typeName, methodName, signature)
+                .when(probeCondition)
+                .sampling(sampling)
+                .build()
+                .setSessionId(sessionId);
     }
-  }
 
-  @Test
-  public void sampling() throws IOException, URISyntaxException {
-    try {
-      MockSampler sampler = new MockSampler();
-      ProbeRateLimiter.setSamplerSupplier(value -> sampler);
-
-      final String className = "com.datadog.debugger.TriggerProbe01";
-      TriggerProbe probe1 =
-          createTriggerProbe(
-              TRIGGER_PROBE_ID1,
-              TRIGGER_PROBE_SESSION_ID,
-              className,
-              "entry",
-              "()",
-              null,
-              new Sampling(10.0));
-      Configuration config = Configuration.builder().setService(SERVICE_NAME).add(probe1).build();
-      installProbes(config);
-      Class<?> testClass = compileAndLoadClass(className);
-      for (int i = 0; i < 100; i++) {
-        Reflect.onClass(testClass).call("main", "").get();
-      }
+    @Test
+    public void cooldown() throws IOException, URISyntaxException {
+        try {
+            MockSampler sampler = new MockSampler();
+            ProbeRateLimiter.setSamplerSupplier(value -> sampler);
+
+            final String className = "com.datadog.debugger.TriggerProbe01";
+            TriggerProbe probe1 = createTriggerProbe(
+                    TRIGGER_PROBE_ID1,
+                    TRIGGER_PROBE_SESSION_ID,
+                    className,
+                    "entry",
+                    "()",
+                    null,
+                    new Sampling(10, 10.0));
+            installProbes(
+                    Configuration.builder().setService(SERVICE_NAME).add(probe1).build());
+            Class<?> testClass = compileAndLoadClass(className);
+            int runs = 10000;
+            for (int i = 0; i < runs; i++) {
+                Reflect.onClass(testClass).call("main", "").get();
+            }
+
+            assertEquals(1, sampler.getCallCount());
+            List<List<? extends MutableSpan>> allTraces = traceInterceptor.getAllTraces();
+            assertEquals(runs, allTraces.size(), "actual traces: " + allTraces.size());
+
+            long debugSessions = allTraces.stream()
+                    .map(span -> span.get(0))
+                    .filter(span -> {
+                        DDSpan ddSpan = (DDSpan) span;
+                        PropagationTags tags = ddSpan.spanContext().getPropagationTags();
+                        return (TRIGGER_PROBE_SESSION_ID + ":1").equals(tags.getDebugPropagation());
+                    })
+                    .count();
+            assertEquals(1, debugSessions, "Should only have 1 debug session.  found: " + debugSessions);
+
+            long tagged = allTraces.stream()
+                    .flatMap(Collection::stream)
+                    .filter(span -> span.getTag(format("_dd.ld.probe_id.%s", TRIGGER_PROBE_ID1.getId())) != null)
+                    .count();
+            assertEquals(1, tagged, "Should only have 1 tagged span.  found: " + tagged);
+        } finally {
+            ProbeRateLimiter.setSamplerSupplier(null);
+        }
+    }
 
-      assertTrue(sampler.getCallCount() != 0);
-    } finally {
-      ProbeRateLimiter.setSamplerSupplier(null);
+    @Test
+    public void badCondition() throws IOException, URISyntaxException {
+        String className = "com.datadog.debugger.TriggerProbe02";
+        TriggerProbe probe1 = createTriggerProbe(
+                TRIGGER_PROBE_ID1,
+                TRIGGER_PROBE_SESSION_ID,
+                className,
+                "entry",
+                "(int)",
+                new ProbeCondition(when(lt(ref("limit"), value(25))), "limit < 25"),
+                new Sampling(10.0));
+
+        installProbes(
+                Configuration.builder().setService(SERVICE_NAME).add(probe1).build());
+        Class<?> testClass = compileAndLoadClass(className);
+        Reflect.onClass(testClass).call("main", 0).get();
+        verify(probeStatusSink)
+                .addError(eq(TRIGGER_PROBE_ID1), eq(new EvaluationException("Cannot find symbol: limit", "limit")));
     }
-  }
 
-  @Test
-  public void noSampling() throws IOException, URISyntaxException {
-    try {
-      MockSampler sampler = new MockSampler();
-      ProbeRateLimiter.setSamplerSupplier(value -> sampler);
+    @Test
+    public void debuggerDisabled() throws IOException, URISyntaxException {
+        boolean original = Config.get().isDistributedDebuggerEnabled();
+        try {
+            setFieldInConfig(Config.get(), "distributedDebuggerEnabled", false);
+
+            MockSampler sampler = new MockSampler();
+            ProbeRateLimiter.setSamplerSupplier(value -> sampler);
+
+            final String className = "com.datadog.debugger.TriggerProbe02";
+            TriggerProbe probe1 = createTriggerProbe(
+                    TRIGGER_PROBE_ID1,
+                    TRIGGER_PROBE_SESSION_ID,
+                    className,
+                    "entry",
+                    "(int)",
+                    new ProbeCondition(when(lt(ref("value"), value(25))), "value < 25"),
+                    new Sampling(10.0));
+            installProbes(
+                    Configuration.builder().setService(SERVICE_NAME).add(probe1).build());
+            Class<?> testClass = compileAndLoadClass(className);
+            Reflect.onClass(testClass).call("main", 0).get();
+
+            assertEquals(0, sampler.getCallCount());
+        } finally {
+            setFieldInConfig(Config.get(), "distributedDebuggerEnabled", original);
+            ProbeRateLimiter.setSamplerSupplier(null);
+        }
+    }
 
-      final String className = "com.datadog.debugger.TriggerProbe01";
-      TriggerProbe probe1 =
-          createTriggerProbe(
-              TRIGGER_PROBE_ID1, TRIGGER_PROBE_SESSION_ID, className, "entry", "()", null, null);
-      Configuration config = Configuration.builder().setService(SERVICE_NAME).add(probe1).build();
-      installProbes(config);
-      Class<?> testClass = compileAndLoadClass(className);
-      for (int i = 0; i < 100; i++) {
-        Reflect.onClass(testClass).call("main", "").get();
-      }
+    @Test
+    public void sampling() throws IOException, URISyntaxException {
+        try {
+            MockSampler sampler = new MockSampler();
+            ProbeRateLimiter.setSamplerSupplier(value -> sampler);
+
+            final String className = "com.datadog.debugger.TriggerProbe01";
+            TriggerProbe probe1 = createTriggerProbe(
+                    TRIGGER_PROBE_ID1, TRIGGER_PROBE_SESSION_ID, className, "entry", "()", null, new Sampling(10.0));
+            Configuration config =
+                    Configuration.builder().setService(SERVICE_NAME).add(probe1).build();
+            installProbes(config);
+            Class<?> testClass = compileAndLoadClass(className);
+            for (int i = 0; i < 100; i++) {
+                Reflect.onClass(testClass).call("main", "").get();
+            }
+
+            assertTrue(sampler.getCallCount() != 0);
+        } finally {
+            ProbeRateLimiter.setSamplerSupplier(null);
+        }
+    }
 
-      assertTrue(sampler.getCallCount() != 0);
-    } finally {
-      ProbeRateLimiter.setSamplerSupplier(null);
+    @Test
+    public void noSampling() throws IOException, URISyntaxException {
+        try {
+            MockSampler sampler = new MockSampler();
+            ProbeRateLimiter.setSamplerSupplier(value -> sampler);
+
+            final String className = "com.datadog.debugger.TriggerProbe01";
+            TriggerProbe probe1 = createTriggerProbe(
+                    TRIGGER_PROBE_ID1, TRIGGER_PROBE_SESSION_ID, className, "entry", "()", null, null);
+            Configuration config =
+                    Configuration.builder().setService(SERVICE_NAME).add(probe1).build();
+            installProbes(config);
+            Class<?> testClass = compileAndLoadClass(className);
+            for (int i = 0; i < 100; i++) {
+                Reflect.onClass(testClass).call("main", "").get();
+            }
+
+            assertTrue(sampler.getCallCount() != 0);
+        } finally {
+            ProbeRateLimiter.setSamplerSupplier(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/uploader/BatchUploaderTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/uploader/BatchUploaderTest.java
index 1eb7cf59ddf..b467979a7d7 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/uploader/BatchUploaderTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/uploader/BatchUploaderTest.java
@@ -39,327 +39,315 @@
 /** Unit tests for the snapshot uploader. */
 @ExtendWith(MockitoExtension.class)
 public class BatchUploaderTest {
-  private static final MockResponse RESPONSE_200 = new MockResponse().setResponseCode(200);
-  private static final String URL_PATH = "/lalala";
-  public static final byte[] SNAPSHOT_BUFFER = "jsonBuffer".getBytes(StandardCharsets.UTF_8);
-  private final Duration REQUEST_TIMEOUT = Duration.ofSeconds(10);
-  private final Duration REQUEST_IO_OPERATION_TIMEOUT = Duration.ofSeconds(5);
-  private final Duration FOREVER_REQUEST_TIMEOUT = Duration.ofSeconds(1000);
-  private static final String API_KEY_VALUE = "testkey";
-
-  @Mock private Config config;
-  @Mock private RatelimitedLogger ratelimitedLogger;
-
-  private final MockWebServer server = new MockWebServer();
-  private HttpUrl url;
-  private final BatchUploader.RetryPolicy retryPolicy = new BatchUploader.RetryPolicy(3);
-
-  private BatchUploader uploader;
-
-  @BeforeEach
-  public void setup() throws IOException {
-    server.start();
-    url = server.url(URL_PATH);
-
-    when(config.getDynamicInstrumentationUploadTimeout())
-        .thenReturn((int) REQUEST_TIMEOUT.getSeconds());
-
-    uploader = new BatchUploader("test", config, url.toString(), ratelimitedLogger, retryPolicy);
-  }
-
-  @AfterEach
-  public void tearDown() throws IOException {
-    uploader.shutdown();
-    try {
-      server.shutdown();
-    } catch (final IOException e) {
-      // Looks like this happens for some unclear reason, but should not affect tests
+    private static final MockResponse RESPONSE_200 = new MockResponse().setResponseCode(200);
+    private static final String URL_PATH = "/lalala";
+    public static final byte[] SNAPSHOT_BUFFER = "jsonBuffer".getBytes(StandardCharsets.UTF_8);
+    private final Duration REQUEST_TIMEOUT = Duration.ofSeconds(10);
+    private final Duration REQUEST_IO_OPERATION_TIMEOUT = Duration.ofSeconds(5);
+    private final Duration FOREVER_REQUEST_TIMEOUT = Duration.ofSeconds(1000);
+    private static final String API_KEY_VALUE = "testkey";
+
+    @Mock
+    private Config config;
+
+    @Mock
+    private RatelimitedLogger ratelimitedLogger;
+
+    private final MockWebServer server = new MockWebServer();
+    private HttpUrl url;
+    private final BatchUploader.RetryPolicy retryPolicy = new BatchUploader.RetryPolicy(3);
+
+    private BatchUploader uploader;
+
+    @BeforeEach
+    public void setup() throws IOException {
+        server.start();
+        url = server.url(URL_PATH);
+
+        when(config.getDynamicInstrumentationUploadTimeout()).thenReturn((int) REQUEST_TIMEOUT.getSeconds());
+
+        uploader = new BatchUploader("test", config, url.toString(), ratelimitedLogger, retryPolicy);
+    }
+
+    @AfterEach
+    public void tearDown() throws IOException {
+        uploader.shutdown();
+        try {
+            server.shutdown();
+        } catch (final IOException e) {
+            // Looks like this happens for some unclear reason, but should not affect tests
+        }
+    }
+
+    @Test
+    void testUnixDomainSocket() {
+        when(config.getAgentUnixDomainSocket()).thenReturn("/tmp/ddagent/agent.sock");
+        uploader = new BatchUploader("test", config, "http://localhost:8126", retryPolicy);
+        assertEquals(
+                "datadog.common.socket.UnixDomainSocketFactory",
+                uploader.getClient().socketFactory().getClass().getTypeName());
+    }
+
+    @Test
+    void testOkHttpClientForcesCleartextConnspecWhenNotUsingTLS() {
+        uploader = new BatchUploader("test", config, "http://example.com", retryPolicy);
+
+        final List<ConnectionSpec> connectionSpecs = uploader.getClient().connectionSpecs();
+        assertEquals(connectionSpecs.size(), 1);
+        assertTrue(connectionSpecs.contains(ConnectionSpec.CLEARTEXT));
     }
-  }
-
-  @Test
-  void testUnixDomainSocket() {
-    when(config.getAgentUnixDomainSocket()).thenReturn("/tmp/ddagent/agent.sock");
-    uploader = new BatchUploader("test", config, "http://localhost:8126", retryPolicy);
-    assertEquals(
-        "datadog.common.socket.UnixDomainSocketFactory",
-        uploader.getClient().socketFactory().getClass().getTypeName());
-  }
-
-  @Test
-  void testOkHttpClientForcesCleartextConnspecWhenNotUsingTLS() {
-    uploader = new BatchUploader("test", config, "http://example.com", retryPolicy);
-
-    final List<ConnectionSpec> connectionSpecs = uploader.getClient().connectionSpecs();
-    assertEquals(connectionSpecs.size(), 1);
-    assertTrue(connectionSpecs.contains(ConnectionSpec.CLEARTEXT));
-  }
-
-  @Test
-  void testOkHttpClientUsesDefaultConnspecsOverTLS() {
-    uploader = new BatchUploader("test", config, "https://example.com", retryPolicy);
-
-    final List<ConnectionSpec> connectionSpecs = uploader.getClient().connectionSpecs();
-    assertEquals(connectionSpecs.size(), 2);
-    assertTrue(connectionSpecs.contains(ConnectionSpec.MODERN_TLS));
-    assertTrue(connectionSpecs.contains(ConnectionSpec.CLEARTEXT));
-  }
-
-  @Test
-  public void test500Response() throws InterruptedException {
-    server.enqueue(new MockResponse().setResponseCode(500));
-
-    uploader.upload(SNAPSHOT_BUFFER);
-
-    assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
-  }
-
-  @Test
-  public void testConnectionRefused() throws IOException, InterruptedException {
-    server.shutdown();
-
-    uploader.upload(SNAPSHOT_BUFFER);
-
-    // Shutting down uploader ensures all callbacks are called on http client
-    uploader.shutdown();
-    verify(ratelimitedLogger, atLeastOnce())
-        .warn(
-            eq("Failed to upload batch to {}"),
-            ArgumentMatchers.argThat(arg -> arg.toString().startsWith(url.toString())),
-            any(ConnectException.class));
-  }
-
-  @Test
-  public void testTimeout() throws IOException, InterruptedException {
-    server.enqueue(
-        new MockResponse()
-            .setHeadersDelay(
-                REQUEST_IO_OPERATION_TIMEOUT.plus(Duration.ofMillis(1000)).toMillis(),
-                TimeUnit.MILLISECONDS));
-
-    uploader.upload(SNAPSHOT_BUFFER);
-
-    assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
-  }
-
-  @Test
-  public void testEnqueuedRequestsExecuted() throws IOException, InterruptedException {
-    // We have to block all parallel requests to make sure queue is kept full
-    for (int i = 0; i < BatchUploader.MAX_RUNNING_REQUESTS; i++) {
-      server.enqueue(
-          new MockResponse()
-              .setHeadersDelay(
-                  // 1 second should be enough to schedule all requests and not hit timeout
-                  Duration.ofMillis(1000).toMillis(), TimeUnit.MILLISECONDS)
-              .setResponseCode(200));
+
+    @Test
+    void testOkHttpClientUsesDefaultConnspecsOverTLS() {
+        uploader = new BatchUploader("test", config, "https://example.com", retryPolicy);
+
+        final List<ConnectionSpec> connectionSpecs = uploader.getClient().connectionSpecs();
+        assertEquals(connectionSpecs.size(), 2);
+        assertTrue(connectionSpecs.contains(ConnectionSpec.MODERN_TLS));
+        assertTrue(connectionSpecs.contains(ConnectionSpec.CLEARTEXT));
     }
-    server.enqueue(RESPONSE_200);
 
-    for (int i = 0; i < BatchUploader.MAX_RUNNING_REQUESTS; i++) {
-      uploader.upload(SNAPSHOT_BUFFER);
+    @Test
+    public void test500Response() throws InterruptedException {
+        server.enqueue(new MockResponse().setResponseCode(500));
+
+        uploader.upload(SNAPSHOT_BUFFER);
+
+        assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
     }
 
-    uploader.upload(SNAPSHOT_BUFFER);
+    @Test
+    public void testConnectionRefused() throws IOException, InterruptedException {
+        server.shutdown();
+
+        uploader.upload(SNAPSHOT_BUFFER);
 
-    // Make sure all expected requests happened
-    for (int i = 0; i < BatchUploader.MAX_RUNNING_REQUESTS; i++) {
-      assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+        // Shutting down uploader ensures all callbacks are called on http client
+        uploader.shutdown();
+        verify(ratelimitedLogger, atLeastOnce())
+                .warn(
+                        eq("Failed to upload batch to {}"),
+                        ArgumentMatchers.argThat(arg -> arg.toString().startsWith(url.toString())),
+                        any(ConnectException.class));
     }
 
-    assertNotNull(server.takeRequest(2000, TimeUnit.MILLISECONDS), "Got enqueued request");
-  }
-
-  @Test
-  public void testTooManyRequests() throws IOException, InterruptedException {
-    // We need to make sure that initial requests that fill up the queue hang to the duration of the
-    // test. So we specify insanely large timeout here.
-    when(config.getDynamicInstrumentationUploadTimeout())
-        .thenReturn((int) FOREVER_REQUEST_TIMEOUT.getSeconds());
-    uploader = new BatchUploader("test", config, url.toString(), retryPolicy);
-
-    // We have to block all parallel requests to make sure queue is kept full
-    for (int i = 0; i < BatchUploader.MAX_RUNNING_REQUESTS; i++) {
-      server.enqueue(
-          new MockResponse()
-              .setHeadersDelay(FOREVER_REQUEST_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS)
-              .setResponseCode(200));
+    @Test
+    public void testTimeout() throws IOException, InterruptedException {
+        server.enqueue(new MockResponse()
+                .setHeadersDelay(
+                        REQUEST_IO_OPERATION_TIMEOUT
+                                .plus(Duration.ofMillis(1000))
+                                .toMillis(),
+                        TimeUnit.MILLISECONDS));
+
+        uploader.upload(SNAPSHOT_BUFFER);
+
+        assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+    }
+
+    @Test
+    public void testEnqueuedRequestsExecuted() throws IOException, InterruptedException {
+        // We have to block all parallel requests to make sure queue is kept full
+        for (int i = 0; i < BatchUploader.MAX_RUNNING_REQUESTS; i++) {
+            server.enqueue(new MockResponse()
+                    .setHeadersDelay(
+                            // 1 second should be enough to schedule all requests and not hit timeout
+                            Duration.ofMillis(1000).toMillis(), TimeUnit.MILLISECONDS)
+                    .setResponseCode(200));
+        }
+        server.enqueue(RESPONSE_200);
+
+        for (int i = 0; i < BatchUploader.MAX_RUNNING_REQUESTS; i++) {
+            uploader.upload(SNAPSHOT_BUFFER);
+        }
+
+        uploader.upload(SNAPSHOT_BUFFER);
+
+        // Make sure all expected requests happened
+        for (int i = 0; i < BatchUploader.MAX_RUNNING_REQUESTS; i++) {
+            assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+        }
+
+        assertNotNull(server.takeRequest(2000, TimeUnit.MILLISECONDS), "Got enqueued request");
     }
-    server.enqueue(new MockResponse().setResponseCode(200));
 
-    for (int i = 0; i < BatchUploader.MAX_RUNNING_REQUESTS; i++) {
-      uploader.upload(SNAPSHOT_BUFFER);
+    @Test
+    public void testTooManyRequests() throws IOException, InterruptedException {
+        // We need to make sure that initial requests that fill up the queue hang to the duration of the
+        // test. So we specify insanely large timeout here.
+        when(config.getDynamicInstrumentationUploadTimeout()).thenReturn((int) FOREVER_REQUEST_TIMEOUT.getSeconds());
+        uploader = new BatchUploader("test", config, url.toString(), retryPolicy);
+
+        // We have to block all parallel requests to make sure queue is kept full
+        for (int i = 0; i < BatchUploader.MAX_RUNNING_REQUESTS; i++) {
+            server.enqueue(new MockResponse()
+                    .setHeadersDelay(FOREVER_REQUEST_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS)
+                    .setResponseCode(200));
+        }
+        server.enqueue(new MockResponse().setResponseCode(200));
+
+        for (int i = 0; i < BatchUploader.MAX_RUNNING_REQUESTS; i++) {
+            uploader.upload(SNAPSHOT_BUFFER);
+        }
+
+        // We schedule one additional request to check case when request would be rejected immediately
+        // rather than added to the queue.
+        for (int i = 0; i < BatchUploader.MAX_ENQUEUED_REQUESTS + 1; i++) {
+            uploader.upload(SNAPSHOT_BUFFER);
+        }
+        // Make sure all expected requests happened
+        for (int i = 0; i < BatchUploader.MAX_RUNNING_REQUESTS; i++) {
+            assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+        }
+        // Recordings after RecordingUploader.MAX_RUNNING_REQUESTS will not be executed because number
+        // or parallel requests has been reached.
+        assertNull(server.takeRequest(100, TimeUnit.MILLISECONDS), "No more requests");
     }
 
-    // We schedule one additional request to check case when request would be rejected immediately
-    // rather than added to the queue.
-    for (int i = 0; i < BatchUploader.MAX_ENQUEUED_REQUESTS + 1; i++) {
-      uploader.upload(SNAPSHOT_BUFFER);
+    @Test
+    public void testShutdown() throws IOException, InterruptedException {
+        uploader.shutdown();
+
+        uploader.upload(SNAPSHOT_BUFFER);
+
+        assertNull(server.takeRequest(100, TimeUnit.MILLISECONDS), "No more requests");
     }
-    // Make sure all expected requests happened
-    for (int i = 0; i < BatchUploader.MAX_RUNNING_REQUESTS; i++) {
-      assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+
+    @Test
+    public void testEmptyUrl() {
+        Assertions.assertThrows(
+                IllegalArgumentException.class, () -> new BatchUploader("test", config, "", retryPolicy));
     }
-    // Recordings after RecordingUploader.MAX_RUNNING_REQUESTS will not be executed because number
-    // or parallel requests has been reached.
-    assertNull(server.takeRequest(100, TimeUnit.MILLISECONDS), "No more requests");
-  }
-
-  @Test
-  public void testShutdown() throws IOException, InterruptedException {
-    uploader.shutdown();
-
-    uploader.upload(SNAPSHOT_BUFFER);
-
-    assertNull(server.takeRequest(100, TimeUnit.MILLISECONDS), "No more requests");
-  }
-
-  @Test
-  public void testEmptyUrl() {
-    Assertions.assertThrows(
-        IllegalArgumentException.class, () -> new BatchUploader("test", config, "", retryPolicy));
-  }
-
-  @Test
-  public void testNoContainerId() throws InterruptedException {
-    // we don't explicitly specify a container ID
-    server.enqueue(RESPONSE_200);
-    BatchUploader uploaderWithNoContainerId =
-        new BatchUploader(
-            "test", config, url.toString(), ratelimitedLogger, retryPolicy, null, null);
-
-    uploaderWithNoContainerId.upload(SNAPSHOT_BUFFER);
-    uploaderWithNoContainerId.shutdown();
-
-    RecordedRequest request = server.takeRequest(100, TimeUnit.MILLISECONDS);
-    assertNull(request.getHeader("Datadog-Container-ID"));
-  }
-
-  @Test
-  public void testContainerIdHeader() throws InterruptedException {
-    server.enqueue(RESPONSE_200);
-
-    BatchUploader uploaderWithContainerId =
-        new BatchUploader(
-            "test",
-            config,
-            url.toString(),
-            ratelimitedLogger,
-            retryPolicy,
-            "testContainerId",
-            "testEntityId");
-    uploaderWithContainerId.upload(SNAPSHOT_BUFFER);
-    uploaderWithContainerId.shutdown();
-
-    RecordedRequest request = server.takeRequest(100, TimeUnit.MILLISECONDS);
-    assertEquals("testContainerId", request.getHeader("Datadog-Container-ID"));
-    assertEquals("testEntityId", request.getHeader("Datadog-Entity-ID"));
-  }
-
-  @Test
-  public void testApiKey() throws InterruptedException {
-    server.enqueue(RESPONSE_200);
-    when(config.getApiKey()).thenReturn(API_KEY_VALUE);
-
-    BatchUploader uploaderWithApiKey =
-        new BatchUploader("test", config, url.toString(), ratelimitedLogger, retryPolicy);
-    uploaderWithApiKey.upload(SNAPSHOT_BUFFER);
-    uploaderWithApiKey.shutdown();
-
-    RecordedRequest request = server.takeRequest(100, TimeUnit.MILLISECONDS);
-    assertEquals(API_KEY_VALUE, request.getHeader(HEADER_DD_API_KEY));
-  }
-
-  @Test
-  public void testUpload() throws InterruptedException {
-    server.enqueue(RESPONSE_200);
-    uploader.upload(SNAPSHOT_BUFFER);
-    RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    assertNotNull(recordedRequest);
-    String strBody = recordedRequest.getBody().readUtf8();
-    assertEquals(new String(SNAPSHOT_BUFFER), strBody);
-  }
-
-  @Test
-  public void testUploadMultiPart() throws InterruptedException {
-    server.enqueue(RESPONSE_200);
-    uploader.uploadAsMultipart(
-        "",
-        new BatchUploader.MultiPartContent(SNAPSHOT_BUFFER, "file", "file.json", APPLICATION_JSON));
-    RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    assertNotNull(recordedRequest);
-    String strBody = recordedRequest.getBody().readUtf8();
-    assertTrue(strBody.contains(new String(SNAPSHOT_BUFFER)));
-  }
-
-  @Test
-  public void testRetryOnFailure() throws IOException, InterruptedException {
-    int port = server.getPort();
-    server.shutdown();
-    ServerSocket serverSocket = new ServerSocket(port);
-    Thread t =
-        new Thread(
-            () -> {
-              try {
+
+    @Test
+    public void testNoContainerId() throws InterruptedException {
+        // we don't explicitly specify a container ID
+        server.enqueue(RESPONSE_200);
+        BatchUploader uploaderWithNoContainerId =
+                new BatchUploader("test", config, url.toString(), ratelimitedLogger, retryPolicy, null, null);
+
+        uploaderWithNoContainerId.upload(SNAPSHOT_BUFFER);
+        uploaderWithNoContainerId.shutdown();
+
+        RecordedRequest request = server.takeRequest(100, TimeUnit.MILLISECONDS);
+        assertNull(request.getHeader("Datadog-Container-ID"));
+    }
+
+    @Test
+    public void testContainerIdHeader() throws InterruptedException {
+        server.enqueue(RESPONSE_200);
+
+        BatchUploader uploaderWithContainerId = new BatchUploader(
+                "test", config, url.toString(), ratelimitedLogger, retryPolicy, "testContainerId", "testEntityId");
+        uploaderWithContainerId.upload(SNAPSHOT_BUFFER);
+        uploaderWithContainerId.shutdown();
+
+        RecordedRequest request = server.takeRequest(100, TimeUnit.MILLISECONDS);
+        assertEquals("testContainerId", request.getHeader("Datadog-Container-ID"));
+        assertEquals("testEntityId", request.getHeader("Datadog-Entity-ID"));
+    }
+
+    @Test
+    public void testApiKey() throws InterruptedException {
+        server.enqueue(RESPONSE_200);
+        when(config.getApiKey()).thenReturn(API_KEY_VALUE);
+
+        BatchUploader uploaderWithApiKey =
+                new BatchUploader("test", config, url.toString(), ratelimitedLogger, retryPolicy);
+        uploaderWithApiKey.upload(SNAPSHOT_BUFFER);
+        uploaderWithApiKey.shutdown();
+
+        RecordedRequest request = server.takeRequest(100, TimeUnit.MILLISECONDS);
+        assertEquals(API_KEY_VALUE, request.getHeader(HEADER_DD_API_KEY));
+    }
+
+    @Test
+    public void testUpload() throws InterruptedException {
+        server.enqueue(RESPONSE_200);
+        uploader.upload(SNAPSHOT_BUFFER);
+        RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        assertNotNull(recordedRequest);
+        String strBody = recordedRequest.getBody().readUtf8();
+        assertEquals(new String(SNAPSHOT_BUFFER), strBody);
+    }
+
+    @Test
+    public void testUploadMultiPart() throws InterruptedException {
+        server.enqueue(RESPONSE_200);
+        uploader.uploadAsMultipart(
+                "", new BatchUploader.MultiPartContent(SNAPSHOT_BUFFER, "file", "file.json", APPLICATION_JSON));
+        RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        assertNotNull(recordedRequest);
+        String strBody = recordedRequest.getBody().readUtf8();
+        assertTrue(strBody.contains(new String(SNAPSHOT_BUFFER)));
+    }
+
+    @Test
+    public void testRetryOnFailure() throws IOException, InterruptedException {
+        int port = server.getPort();
+        server.shutdown();
+        ServerSocket serverSocket = new ServerSocket(port);
+        Thread t = new Thread(() -> {
+            try {
                 System.out.println("Accepting connection on port " + port);
                 Socket socket = serverSocket.accept();
                 System.out.println("Accepted connection, closing");
                 socket.setSoLinger(true, 0);
                 socket.close();
                 serverSocket.close();
-              } catch (Exception e) {
+            } catch (Exception e) {
                 e.printStackTrace();
-              }
-            });
-    t.start();
-    // only upload once. will fail on first attempt, will succeed on retry
-    uploader.upload(SNAPSHOT_BUFFER);
-    t.join();
-    MockWebServer newServer = new MockWebServer();
-    newServer.start(port);
-    newServer.enqueue(RESPONSE_200);
-    RecordedRequest recordedRequest = newServer.takeRequest(5, TimeUnit.SECONDS);
-    assertNotNull(recordedRequest);
-  }
-
-  @Test
-  public void testRetryOn500() throws InterruptedException {
-    doTestRetryOnResponseCode(500, 2);
-    doTestRetryOnResponseCode(408, 4);
-    doTestRetryOnResponseCode(429, 6);
-  }
-
-  private void doTestRetryOnResponseCode(int code, int expectedReqCount)
-      throws InterruptedException {
-    server.enqueue(new MockResponse().setResponseCode(code));
-    server.enqueue(RESPONSE_200);
-    uploader.upload(SNAPSHOT_BUFFER);
-    assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
-    assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
-    assertEquals(expectedReqCount, server.getRequestCount());
-    assertEmptyFailures();
-  }
-
-  private void assertEmptyFailures() throws InterruptedException {
-    int count = 0;
-    while (uploader.getRetryPolicy().failures.size() > 0 && count < 300) {
-      Thread.sleep(10);
-      count++;
+            }
+        });
+        t.start();
+        // only upload once. will fail on first attempt, will succeed on retry
+        uploader.upload(SNAPSHOT_BUFFER);
+        t.join();
+        MockWebServer newServer = new MockWebServer();
+        newServer.start(port);
+        newServer.enqueue(RESPONSE_200);
+        RecordedRequest recordedRequest = newServer.takeRequest(5, TimeUnit.SECONDS);
+        assertNotNull(recordedRequest);
+    }
+
+    @Test
+    public void testRetryOn500() throws InterruptedException {
+        doTestRetryOnResponseCode(500, 2);
+        doTestRetryOnResponseCode(408, 4);
+        doTestRetryOnResponseCode(429, 6);
+    }
+
+    private void doTestRetryOnResponseCode(int code, int expectedReqCount) throws InterruptedException {
+        server.enqueue(new MockResponse().setResponseCode(code));
+        server.enqueue(RESPONSE_200);
+        uploader.upload(SNAPSHOT_BUFFER);
+        assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+        assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+        assertEquals(expectedReqCount, server.getRequestCount());
+        assertEmptyFailures();
+    }
+
+    private void assertEmptyFailures() throws InterruptedException {
+        int count = 0;
+        while (uploader.getRetryPolicy().failures.size() > 0 && count < 300) {
+            Thread.sleep(10);
+            count++;
+        }
+        assertEquals(0, uploader.getRetryPolicy().failures.size());
+    }
+
+    @Test
+    public void testMaxRetryOn500() throws InterruptedException {
+        server.enqueue(new MockResponse().setResponseCode(500)); // first attempt
+        server.enqueue(new MockResponse().setResponseCode(500)); // first retry
+        server.enqueue(new MockResponse().setResponseCode(500));
+        server.enqueue(new MockResponse().setResponseCode(500)); // last retry
+        uploader.upload(SNAPSHOT_BUFFER);
+        assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+        assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+        assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+        assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+        assertEmptyFailures();
+        assertEquals(4, server.getRequestCount()); // first + 3 retries
     }
-    assertEquals(0, uploader.getRetryPolicy().failures.size());
-  }
-
-  @Test
-  public void testMaxRetryOn500() throws InterruptedException {
-    server.enqueue(new MockResponse().setResponseCode(500)); // first attempt
-    server.enqueue(new MockResponse().setResponseCode(500)); // first retry
-    server.enqueue(new MockResponse().setResponseCode(500));
-    server.enqueue(new MockResponse().setResponseCode(500)); // last retry
-    uploader.upload(SNAPSHOT_BUFFER);
-    assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
-    assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
-    assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
-    assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
-    assertEmptyFailures();
-    assertEquals(4, server.getRequestCount()); // first + 3 retries
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/CapturedValueAdapterTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/CapturedValueAdapterTest.java
index ea16400ce84..8a76f466c78 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/CapturedValueAdapterTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/CapturedValueAdapterTest.java
@@ -13,94 +13,84 @@
 
 public class CapturedValueAdapterTest {
 
-  static final String CAPTURED_VALUE_SIMPLE_TEMPLATE = "{\"type\": \"%s\", \"value\": \"%s\"}";
-  private static final String CAPTURED_VALUE_COLLECTION_TEMPLATE =
-      "{\"type\": \"%s\", \"elements\": [%s]}";
-  private static final String CAPTURED_VALUE_MAP_TEMPLATE = "{\"type\": \"%s\", \"entries\": [%s]}";
-  Moshi moshi = MoshiSnapshotTestHelper.createMoshiSnapshot();
-  JsonAdapter<CapturedContext.CapturedValue> adapter =
-      moshi.adapter(CapturedContext.CapturedValue.class);
+    static final String CAPTURED_VALUE_SIMPLE_TEMPLATE = "{\"type\": \"%s\", \"value\": \"%s\"}";
+    private static final String CAPTURED_VALUE_COLLECTION_TEMPLATE = "{\"type\": \"%s\", \"elements\": [%s]}";
+    private static final String CAPTURED_VALUE_MAP_TEMPLATE = "{\"type\": \"%s\", \"entries\": [%s]}";
+    Moshi moshi = MoshiSnapshotTestHelper.createMoshiSnapshot();
+    JsonAdapter<CapturedContext.CapturedValue> adapter = moshi.adapter(CapturedContext.CapturedValue.class);
 
-  @Test
-  void nullValue() throws IOException {
-    CapturedContext.CapturedValue capturedValue =
-        adapter.fromJson("{\"type\": \"String\", \"isNull\": true}");
-    assertNull(capturedValue.getValue());
-  }
-
-  @Test
-  void primitives() throws IOException {
-    CapturedContext.CapturedValue value = getSimpleValue(Integer.TYPE.getTypeName(), "42");
-    assertEquals(42, value.getValue());
-    value = getSimpleValue(String.class.getTypeName(), "foobar");
-    assertEquals("foobar", value.getValue());
-    value = getSimpleValue(byte.class.getTypeName(), 42);
-    assertEquals((byte) 42, value.getValue());
-    value = getSimpleValue(char.class.getTypeName(), '*');
-    assertEquals('*', value.getValue());
-    value = getSimpleValue(short.class.getTypeName(), 42);
-    assertEquals((short) 42, value.getValue());
-    value = getSimpleValue(long.class.getTypeName(), 42L);
-    assertEquals(42L, value.getValue());
-    value = getSimpleValue(boolean.class.getTypeName(), true);
-    assertEquals(true, value.getValue());
-    value = getSimpleValue(float.class.getTypeName(), 42.1F);
-    assertEquals(42.1F, value.getValue());
-    value = getSimpleValue(double.class.getTypeName(), 42.1D);
-    assertEquals(42.1D, value.getValue());
-  }
+    @Test
+    void nullValue() throws IOException {
+        CapturedContext.CapturedValue capturedValue = adapter.fromJson("{\"type\": \"String\", \"isNull\": true}");
+        assertNull(capturedValue.getValue());
+    }
 
-  @Test
-  void collection() throws IOException {
-    StringBuilder sb = new StringBuilder();
-    for (int i = 0; i < 10; i++) {
-      if (i > 0) {
-        sb.append(',');
-      }
-      sb.append(String.format(CAPTURED_VALUE_SIMPLE_TEMPLATE, int.class.getTypeName(), i));
+    @Test
+    void primitives() throws IOException {
+        CapturedContext.CapturedValue value = getSimpleValue(Integer.TYPE.getTypeName(), "42");
+        assertEquals(42, value.getValue());
+        value = getSimpleValue(String.class.getTypeName(), "foobar");
+        assertEquals("foobar", value.getValue());
+        value = getSimpleValue(byte.class.getTypeName(), 42);
+        assertEquals((byte) 42, value.getValue());
+        value = getSimpleValue(char.class.getTypeName(), '*');
+        assertEquals('*', value.getValue());
+        value = getSimpleValue(short.class.getTypeName(), 42);
+        assertEquals((short) 42, value.getValue());
+        value = getSimpleValue(long.class.getTypeName(), 42L);
+        assertEquals(42L, value.getValue());
+        value = getSimpleValue(boolean.class.getTypeName(), true);
+        assertEquals(true, value.getValue());
+        value = getSimpleValue(float.class.getTypeName(), 42.1F);
+        assertEquals(42.1F, value.getValue());
+        value = getSimpleValue(double.class.getTypeName(), 42.1D);
+        assertEquals(42.1D, value.getValue());
     }
-    CapturedContext.CapturedValue value =
-        getCollectionValue(int[].class.getTypeName(), sb.toString());
-    assertArrayEquals(new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, (int[]) value.getValue());
 
-    sb = new StringBuilder();
-    for (int i = 0; i < 10; i++) {
-      if (i > 0) {
-        sb.append(',');
-      }
-      sb.append(
-          String.format(CAPTURED_VALUE_SIMPLE_TEMPLATE, String.class.getTypeName(), "foo" + i));
+    @Test
+    void collection() throws IOException {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 10; i++) {
+            if (i > 0) {
+                sb.append(',');
+            }
+            sb.append(String.format(CAPTURED_VALUE_SIMPLE_TEMPLATE, int.class.getTypeName(), i));
+        }
+        CapturedContext.CapturedValue value = getCollectionValue(int[].class.getTypeName(), sb.toString());
+        assertArrayEquals(new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, (int[]) value.getValue());
+
+        sb = new StringBuilder();
+        for (int i = 0; i < 10; i++) {
+            if (i > 0) {
+                sb.append(',');
+            }
+            sb.append(String.format(CAPTURED_VALUE_SIMPLE_TEMPLATE, String.class.getTypeName(), "foo" + i));
+        }
+        value = getCollectionValue(String[].class.getTypeName(), sb.toString());
+        assertArrayEquals(
+                new String[] {"foo0", "foo1", "foo2", "foo3", "foo4", "foo5", "foo6", "foo7", "foo8", "foo9"},
+                (String[]) value.getValue());
     }
-    value = getCollectionValue(String[].class.getTypeName(), sb.toString());
-    assertArrayEquals(
-        new String[] {
-          "foo0", "foo1", "foo2", "foo3", "foo4", "foo5", "foo6", "foo7", "foo8", "foo9"
-        },
-        (String[]) value.getValue());
-  }
 
-  @Test
-  void map() throws IOException {
-    String key = String.format(CAPTURED_VALUE_SIMPLE_TEMPLATE, String.class.getTypeName(), "foo");
-    String value = String.format(CAPTURED_VALUE_SIMPLE_TEMPLATE, String.class.getTypeName(), "bar");
-    CapturedContext.CapturedValue capturedValue =
-        getMapValue(int[].class.getTypeName(), "[" + key + "," + value + "]");
-    Map<String, String> stringMap = (Map<String, String>) capturedValue.getValue();
-    assertEquals("bar", stringMap.get("foo"));
-  }
+    @Test
+    void map() throws IOException {
+        String key = String.format(CAPTURED_VALUE_SIMPLE_TEMPLATE, String.class.getTypeName(), "foo");
+        String value = String.format(CAPTURED_VALUE_SIMPLE_TEMPLATE, String.class.getTypeName(), "bar");
+        CapturedContext.CapturedValue capturedValue =
+                getMapValue(int[].class.getTypeName(), "[" + key + "," + value + "]");
+        Map<String, String> stringMap = (Map<String, String>) capturedValue.getValue();
+        assertEquals("bar", stringMap.get("foo"));
+    }
 
-  private CapturedContext.CapturedValue getSimpleValue(String type, Object value)
-      throws IOException {
-    return adapter.fromJson(String.format(CAPTURED_VALUE_SIMPLE_TEMPLATE, type, value));
-  }
+    private CapturedContext.CapturedValue getSimpleValue(String type, Object value) throws IOException {
+        return adapter.fromJson(String.format(CAPTURED_VALUE_SIMPLE_TEMPLATE, type, value));
+    }
 
-  private CapturedContext.CapturedValue getCollectionValue(String type, String elements)
-      throws IOException {
-    return adapter.fromJson(String.format(CAPTURED_VALUE_COLLECTION_TEMPLATE, type, elements));
-  }
+    private CapturedContext.CapturedValue getCollectionValue(String type, String elements) throws IOException {
+        return adapter.fromJson(String.format(CAPTURED_VALUE_COLLECTION_TEMPLATE, type, elements));
+    }
 
-  private CapturedContext.CapturedValue getMapValue(String type, String entries)
-      throws IOException {
-    return adapter.fromJson(String.format(CAPTURED_VALUE_MAP_TEMPLATE, type, entries));
-  }
+    private CapturedContext.CapturedValue getMapValue(String type, String entries) throws IOException {
+        return adapter.fromJson(String.format(CAPTURED_VALUE_MAP_TEMPLATE, type, entries));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/CircuitBreakerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/CircuitBreakerTest.java
index d1658f359ef..06f3f126445 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/CircuitBreakerTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/CircuitBreakerTest.java
@@ -9,30 +9,30 @@
 
 class CircuitBreakerTest {
 
-  @Test
-  void noBreaker() {
-    CircuitBreaker cb = new CircuitBreaker(3, Duration.ofMillis(10));
-    for (int i = 0; i < 10; i++) {
-      assertTrue(cb.trip());
-      LockSupport.parkNanos(Duration.ofMillis(50).toNanos());
+    @Test
+    void noBreaker() {
+        CircuitBreaker cb = new CircuitBreaker(3, Duration.ofMillis(10));
+        for (int i = 0; i < 10; i++) {
+            assertTrue(cb.trip());
+            LockSupport.parkNanos(Duration.ofMillis(50).toNanos());
+        }
     }
-  }
 
-  @Test
-  void breaker() {
-    CircuitBreaker cb = new CircuitBreaker(3, Duration.ofMillis(200));
-    for (int i = 0; i < 3; i++) {
-      assertTrue(cb.trip());
+    @Test
+    void breaker() {
+        CircuitBreaker cb = new CircuitBreaker(3, Duration.ofMillis(200));
+        for (int i = 0; i < 3; i++) {
+            assertTrue(cb.trip());
+        }
+        for (int i = 0; i < 100; i++) {
+            assertFalse(cb.trip());
+        }
+        LockSupport.parkNanos(Duration.ofMillis(250).toNanos());
+        for (int i = 0; i < 3; i++) {
+            assertTrue(cb.trip());
+        }
+        for (int i = 0; i < 100; i++) {
+            assertFalse(cb.trip());
+        }
     }
-    for (int i = 0; i < 100; i++) {
-      assertFalse(cb.trip());
-    }
-    LockSupport.parkNanos(Duration.ofMillis(250).toNanos());
-    for (int i = 0; i < 3; i++) {
-      assertTrue(cb.trip());
-    }
-    for (int i = 0; i < 100; i++) {
-      assertFalse(cb.trip());
-    }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassFileHelperTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassFileHelperTest.java
index 456ad4c6146..452fa9915b4 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassFileHelperTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassFileHelperTest.java
@@ -10,28 +10,27 @@
 
 public class ClassFileHelperTest {
 
-  @Test
-  public void extractSourceFile() {
-    assertEquals(
-        "JDK8.java",
-        ClassFileHelper.extractSourceFile(
-            readClassFileBytes("/com/datadog/debugger/classfiles/JDK8.class")));
-    assertEquals(
-        "JDK23.java",
-        ClassFileHelper.extractSourceFile(
-            readClassFileBytes("/com/datadog/debugger/classfiles/JDK23.class")));
-    // big classfile (80KB)
-    assertEquals(
-        "CommandLine.java",
-        ClassFileHelper.extractSourceFile(
-            readClassFileBytes("/com/datadog/debugger/classfiles/CommandLine.class")));
-  }
+    @Test
+    public void extractSourceFile() {
+        assertEquals(
+                "JDK8.java",
+                ClassFileHelper.extractSourceFile(readClassFileBytes("/com/datadog/debugger/classfiles/JDK8.class")));
+        assertEquals(
+                "JDK23.java",
+                ClassFileHelper.extractSourceFile(readClassFileBytes("/com/datadog/debugger/classfiles/JDK23.class")));
+        // big classfile (80KB)
+        assertEquals(
+                "CommandLine.java",
+                ClassFileHelper.extractSourceFile(
+                        readClassFileBytes("/com/datadog/debugger/classfiles/CommandLine.class")));
+    }
 
-  private static byte[] readClassFileBytes(String fileName) {
-    try {
-      return Files.readAllBytes(Paths.get(ClassFileHelperTest.class.getResource(fileName).toURI()));
-    } catch (IOException | URISyntaxException e) {
-      throw new RuntimeException(e);
+    private static byte[] readClassFileBytes(String fileName) {
+        try {
+            return Files.readAllBytes(
+                    Paths.get(ClassFileHelperTest.class.getResource(fileName).toURI()));
+        } catch (IOException | URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassFileLinesTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassFileLinesTest.java
index 259aa5dae9a..a57b7c73226 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassFileLinesTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassFileLinesTest.java
@@ -13,76 +13,76 @@
 import org.objectweb.asm.tree.MethodNode;
 
 class ClassFileLinesTest {
-  @Test
-  void isEmptyReturnTrue() {
-    ClassFileLines classFileLines = new ClassFileLines(new ClassNode());
-    assertTrue(classFileLines.isEmpty());
-    assertNull(classFileLines.getLineLabel(2));
-  }
+    @Test
+    void isEmptyReturnTrue() {
+        ClassFileLines classFileLines = new ClassFileLines(new ClassNode());
+        assertTrue(classFileLines.isEmpty());
+        assertNull(classFileLines.getLineLabel(2));
+    }
 
-  @Test
-  void ValidateLineMapReturnLinesInRangeOrNull() throws Exception {
-    ClassFileLines classFileLines = createClassFileLines("CapturedSnapshot02");
-    LabelNode line13 = classFileLines.getLineLabel(13);
-    LabelNode line17 = classFileLines.getLineLabel(17);
+    @Test
+    void ValidateLineMapReturnLinesInRangeOrNull() throws Exception {
+        ClassFileLines classFileLines = createClassFileLines("CapturedSnapshot02");
+        LabelNode line13 = classFileLines.getLineLabel(13);
+        LabelNode line17 = classFileLines.getLineLabel(17);
 
-    assertEquals(line13, classFileLines.getLineLabel(0));
-    assertEquals(line17, classFileLines.getLineLabel(15));
-    assertNull(classFileLines.getLineLabel(70));
-  }
+        assertEquals(line13, classFileLines.getLineLabel(0));
+        assertEquals(line17, classFileLines.getLineLabel(15));
+        assertNull(classFileLines.getLineLabel(70));
+    }
 
-  @Test
-  void getMethodsByLine() throws Exception {
-    ClassFileLines classFileLines = createClassFileLines("CapturedSnapshot02");
-    MethodNode method13 = classFileLines.getMethodsByLine(13).get(0);
-    assertEquals("<init>", method13.name);
-    assertEquals("()V", method13.desc);
-    MethodNode method17 = classFileLines.getMethodsByLine(17).get(0);
-    assertEquals("<init>", method17.name);
-    assertEquals("(Ljava/lang/Throwable;)V", method17.desc);
-    MethodNode method26 = classFileLines.getMethodsByLine(26).get(0);
-    assertEquals("<init>", method26.name);
-    assertEquals("(Ljava/lang/String;Ljava/lang/Object;)V", method26.desc);
-    MethodNode method32 = classFileLines.getMethodsByLine(32).get(0);
-    assertEquals("createObject", method32.name);
-    assertEquals("()Ljava/lang/Object;", method32.desc);
-    MethodNode method37 = classFileLines.getMethodsByLine(37).get(0);
-    assertEquals("f", method37.name);
-    assertEquals("()V", method37.desc);
-    MethodNode method44 = classFileLines.getMethodsByLine(44).get(0);
-    assertEquals("synchronizedBlock", method44.name);
-    assertEquals("(I)I", method44.desc);
-    MethodNode method54 = classFileLines.getMethodsByLine(54).get(0);
-    assertEquals("main", method54.name);
-    assertEquals("(Ljava/lang/String;)I", method54.desc);
-  }
+    @Test
+    void getMethodsByLine() throws Exception {
+        ClassFileLines classFileLines = createClassFileLines("CapturedSnapshot02");
+        MethodNode method13 = classFileLines.getMethodsByLine(13).get(0);
+        assertEquals("<init>", method13.name);
+        assertEquals("()V", method13.desc);
+        MethodNode method17 = classFileLines.getMethodsByLine(17).get(0);
+        assertEquals("<init>", method17.name);
+        assertEquals("(Ljava/lang/Throwable;)V", method17.desc);
+        MethodNode method26 = classFileLines.getMethodsByLine(26).get(0);
+        assertEquals("<init>", method26.name);
+        assertEquals("(Ljava/lang/String;Ljava/lang/Object;)V", method26.desc);
+        MethodNode method32 = classFileLines.getMethodsByLine(32).get(0);
+        assertEquals("createObject", method32.name);
+        assertEquals("()Ljava/lang/Object;", method32.desc);
+        MethodNode method37 = classFileLines.getMethodsByLine(37).get(0);
+        assertEquals("f", method37.name);
+        assertEquals("()V", method37.desc);
+        MethodNode method44 = classFileLines.getMethodsByLine(44).get(0);
+        assertEquals("synchronizedBlock", method44.name);
+        assertEquals("(I)I", method44.desc);
+        MethodNode method54 = classFileLines.getMethodsByLine(54).get(0);
+        assertEquals("main", method54.name);
+        assertEquals("(Ljava/lang/String;)I", method54.desc);
+    }
 
-  @Test
-  void getMethodsByLineWithLambdas() throws Exception {
-    ClassFileLines classFileLines = createClassFileLines("CapturedSnapshot07");
-    List<MethodNode> methods57 = classFileLines.getMethodsByLine(57);
-    // despite having the return on multi line which yield multiple BCI for same line
-    // this is still the same method
-    assertEquals(1, methods57.size());
-    assertEquals("multiLambda", methods57.get(0).name);
-    assertEquals("(Ljava/lang/String;)I", methods57.get(0).desc);
-    List<MethodNode> methods58 = classFileLines.getMethodsByLine(58);
-    assertEquals(3, methods58.size());
-    assertEquals("multiLambda", methods58.get(0).name);
-    assertEquals("(Ljava/lang/String;)I", methods58.get(0).desc);
-    // filter
-    assertTrue(methods58.get(1).name.startsWith("lambda$multiLambda$"));
-    assertEquals("(Ljava/lang/String;)Z", methods58.get(1).desc);
-    // map
-    assertTrue(methods58.get(2).name.startsWith("lambda$multiLambda$"));
-    assertEquals("(Ljava/lang/String;)Ljava/lang/String;", methods58.get(2).desc);
-  }
+    @Test
+    void getMethodsByLineWithLambdas() throws Exception {
+        ClassFileLines classFileLines = createClassFileLines("CapturedSnapshot07");
+        List<MethodNode> methods57 = classFileLines.getMethodsByLine(57);
+        // despite having the return on multi line which yield multiple BCI for same line
+        // this is still the same method
+        assertEquals(1, methods57.size());
+        assertEquals("multiLambda", methods57.get(0).name);
+        assertEquals("(Ljava/lang/String;)I", methods57.get(0).desc);
+        List<MethodNode> methods58 = classFileLines.getMethodsByLine(58);
+        assertEquals(3, methods58.size());
+        assertEquals("multiLambda", methods58.get(0).name);
+        assertEquals("(Ljava/lang/String;)I", methods58.get(0).desc);
+        // filter
+        assertTrue(methods58.get(1).name.startsWith("lambda$multiLambda$"));
+        assertEquals("(Ljava/lang/String;)Z", methods58.get(1).desc);
+        // map
+        assertTrue(methods58.get(2).name.startsWith("lambda$multiLambda$"));
+        assertEquals("(Ljava/lang/String;)Ljava/lang/String;", methods58.get(2).desc);
+    }
 
-  private ClassFileLines createClassFileLines(String className) throws Exception {
-    byte[] byteBuffer = compile(className).get(className);
-    ClassReader reader = new ClassReader(byteBuffer);
-    ClassNode classNode = new ClassNode();
-    reader.accept(classNode, ClassReader.SKIP_FRAMES);
-    return new ClassFileLines(classNode);
-  }
+    private ClassFileLines createClassFileLines(String className) throws Exception {
+        byte[] byteBuffer = compile(className).get(className);
+        ClassReader reader = new ClassReader(byteBuffer);
+        ClassNode classNode = new ClassNode();
+        reader.accept(classNode, ClassReader.SKIP_FRAMES);
+        return new ClassFileLines(classNode);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassNameFilteringTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassNameFilteringTest.java
index 6fdf52764a7..f21684b103d 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassNameFilteringTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassNameFilteringTest.java
@@ -19,116 +19,109 @@
 
 class ClassNameFilteringTest {
 
-  @Test
-  public void testAllowAll() {
-    ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
-    assertFalse(classNameFiltering.isExcluded("java.FooBar"));
-  }
+    @Test
+    public void testAllowAll() {
+        ClassNameFiltering classNameFiltering = ClassNameFiltering.allowAll();
+        assertFalse(classNameFiltering.isExcluded("java.FooBar"));
+    }
 
-  @Test
-  public void testExcludeAll() {
-    Set<String> excludeAllPrefixes = new HashSet<>();
-    for (char c : ALPHABET) {
-      excludeAllPrefixes.add(String.valueOf(c));
+    @Test
+    public void testExcludeAll() {
+        Set<String> excludeAllPrefixes = new HashSet<>();
+        for (char c : ALPHABET) {
+            excludeAllPrefixes.add(String.valueOf(c));
+        }
+        ClassNameFiltering classNameFiltering = new ClassNameFiltering(excludeAllPrefixes);
+        assertTrue(classNameFiltering.isExcluded("asd.fgh.ijk.FooBar"));
     }
-    ClassNameFiltering classNameFiltering = new ClassNameFiltering(excludeAllPrefixes);
-    assertTrue(classNameFiltering.isExcluded("asd.fgh.ijk.FooBar"));
-  }
 
-  @Test
-  public void testExcludeSome() {
-    Set<String> excludeSomePrefixes = new HashSet<>();
-    excludeSomePrefixes.add("com.datadog.debugger");
-    excludeSomePrefixes.add("org.junit");
-    ClassNameFiltering classNameFiltering = new ClassNameFiltering(excludeSomePrefixes);
-    assertTrue(classNameFiltering.isExcluded("com.datadog.debugger.FooBar"));
-    assertTrue(classNameFiltering.isExcluded("org.junit.FooBar"));
-    assertFalse(classNameFiltering.isExcluded("akka.Actor"));
-    assertFalse(classNameFiltering.isExcluded("cats.Functor"));
-  }
+    @Test
+    public void testExcludeSome() {
+        Set<String> excludeSomePrefixes = new HashSet<>();
+        excludeSomePrefixes.add("com.datadog.debugger");
+        excludeSomePrefixes.add("org.junit");
+        ClassNameFiltering classNameFiltering = new ClassNameFiltering(excludeSomePrefixes);
+        assertTrue(classNameFiltering.isExcluded("com.datadog.debugger.FooBar"));
+        assertTrue(classNameFiltering.isExcluded("org.junit.FooBar"));
+        assertFalse(classNameFiltering.isExcluded("akka.Actor"));
+        assertFalse(classNameFiltering.isExcluded("cats.Functor"));
+    }
 
-  @Test
-  public void testIncludeOverridesExclude() {
-    ClassNameFiltering classNameFiltering =
-        new ClassNameFiltering(
-            Collections.singleton("com.datadog.debugger"),
-            Collections.singleton("com.datadog.debugger"),
-            Collections.emptySet());
-    assertFalse(classNameFiltering.isExcluded("com.datadog.debugger.FooBar"));
-  }
+    @Test
+    public void testIncludeOverridesExclude() {
+        ClassNameFiltering classNameFiltering = new ClassNameFiltering(
+                Collections.singleton("com.datadog.debugger"),
+                Collections.singleton("com.datadog.debugger"),
+                Collections.emptySet());
+        assertFalse(classNameFiltering.isExcluded("com.datadog.debugger.FooBar"));
+    }
 
-  @Test
-  public void testIncludePrefixOverridesExclude() {
-    ClassNameFiltering classNameFiltering =
-        new ClassNameFiltering(
-            Collections.singleton("com.datadog.debugger"),
-            Collections.singleton("com.datadog"),
-            Collections.emptySet());
-    assertFalse(classNameFiltering.isExcluded("com.datadog.debugger.FooBar"));
-  }
+    @Test
+    public void testIncludePrefixOverridesExclude() {
+        ClassNameFiltering classNameFiltering = new ClassNameFiltering(
+                Collections.singleton("com.datadog.debugger"),
+                Collections.singleton("com.datadog"),
+                Collections.emptySet());
+        assertFalse(classNameFiltering.isExcluded("com.datadog.debugger.FooBar"));
+    }
 
-  @Test
-  public void testIncludeSomeExcludeSome() {
-    ClassNameFiltering classNameFiltering =
-        new ClassNameFiltering(
-            Stream.of("com.datadog.debugger", "org.junit").collect(Collectors.toSet()),
-            Collections.singleton("com.datadog.debugger"),
-            Collections.emptySet());
-    assertFalse(classNameFiltering.isExcluded("com.datadog.debugger.FooBar"));
-    assertTrue(classNameFiltering.isExcluded("org.junit.FooBar"));
-  }
+    @Test
+    public void testIncludeSomeExcludeSome() {
+        ClassNameFiltering classNameFiltering = new ClassNameFiltering(
+                Stream.of("com.datadog.debugger", "org.junit").collect(Collectors.toSet()),
+                Collections.singleton("com.datadog.debugger"),
+                Collections.emptySet());
+        assertFalse(classNameFiltering.isExcluded("com.datadog.debugger.FooBar"));
+        assertTrue(classNameFiltering.isExcluded("org.junit.FooBar"));
+    }
 
-  @ParameterizedTest
-  @ValueSource(
-      strings = {
-        "java.FooBar",
-        "org.junit.Test",
-        "akka.Actor",
-        "cats.Functor",
-        "org.junit.jupiter.api.Test",
-        "org.datadog.jmxfetch.FooBar"
-      })
-  public void testExcludeDefaults(String input) {
-    Config config = mock(Config.class);
-    when(config.getThirdPartyExcludes()).thenReturn(Collections.emptySet());
-    when(config.getThirdPartyIncludes()).thenReturn(Collections.emptySet());
-    when(config.getThirdPartyShadingIdentifiers()).thenReturn(Collections.emptySet());
-    ClassNameFiltering classNameFiltering = new ClassNameFiltering(config);
-    assertTrue(classNameFiltering.isExcluded(input));
-  }
+    @ParameterizedTest
+    @ValueSource(
+            strings = {
+                "java.FooBar",
+                "org.junit.Test",
+                "akka.Actor",
+                "cats.Functor",
+                "org.junit.jupiter.api.Test",
+                "org.datadog.jmxfetch.FooBar"
+            })
+    public void testExcludeDefaults(String input) {
+        Config config = mock(Config.class);
+        when(config.getThirdPartyExcludes()).thenReturn(Collections.emptySet());
+        when(config.getThirdPartyIncludes()).thenReturn(Collections.emptySet());
+        when(config.getThirdPartyShadingIdentifiers()).thenReturn(Collections.emptySet());
+        ClassNameFiltering classNameFiltering = new ClassNameFiltering(config);
+        assertTrue(classNameFiltering.isExcluded(input));
+    }
 
-  @Test
-  public void testShaded() {
-    Config config = mock(Config.class);
-    when(config.getThirdPartyExcludes()).thenReturn(Collections.emptySet());
-    when(config.getThirdPartyIncludes())
-        .thenReturn(new HashSet<>(Arrays.asList("com.google", "org.junit")));
-    when(config.getThirdPartyShadingIdentifiers()).thenReturn(Collections.emptySet());
-    ClassNameFiltering classNameFiltering = new ClassNameFiltering(config);
-    assertTrue(classNameFiltering.isExcluded("com.google.FooBar"));
-    assertTrue(classNameFiltering.isExcluded("shaded.com.google.FooBar"));
-    assertFalse(classNameFiltering.isExcluded("com.example.shaded.com.example.FooBar"));
-    assertTrue(classNameFiltering.isExcluded("com.example.shaded.com.google.FooBar"));
-  }
+    @Test
+    public void testShaded() {
+        Config config = mock(Config.class);
+        when(config.getThirdPartyExcludes()).thenReturn(Collections.emptySet());
+        when(config.getThirdPartyIncludes()).thenReturn(new HashSet<>(Arrays.asList("com.google", "org.junit")));
+        when(config.getThirdPartyShadingIdentifiers()).thenReturn(Collections.emptySet());
+        ClassNameFiltering classNameFiltering = new ClassNameFiltering(config);
+        assertTrue(classNameFiltering.isExcluded("com.google.FooBar"));
+        assertTrue(classNameFiltering.isExcluded("shaded.com.google.FooBar"));
+        assertFalse(classNameFiltering.isExcluded("com.example.shaded.com.example.FooBar"));
+        assertTrue(classNameFiltering.isExcluded("com.example.shaded.com.google.FooBar"));
+    }
 
-  @Test
-  void lambdaProxyClasses() {
-    // jdk8:  at
-    // datadog.smoketest.debugger.ServerDebuggerTestApplication$$Lambda$231/1770027171.apply(<Unknown>:1000008)
-    // jdk11: at
-    // datadog.smoketest.debugger.ServerDebuggerTestApplication$$Lambda$262/0x0000000800467040.apply(Unknown Source)
-    // jdk17:	at
-    // datadog.smoketest.debugger.ServerDebuggerTestApplication$$Lambda$303/0x00000008013dd1f8.apply(Unknown Source)
-    // jdk21: at
-    // datadog.smoketest.debugger.ServerDebuggerTestApplication$$Lambda/0x000000b801392c58.apply(Unknown Source)
-    assertTrue(
-        ClassNameFiltering.isLambdaProxyClass(
-            "datadog.smoketest.debugger.ServerDebuggerTestApplication$$Lambda$231/1770027171"));
-    assertTrue(
-        ClassNameFiltering.isLambdaProxyClass(
-            "datadog.smoketest.debugger.ServerDebuggerTestApplication$$Lambda$262/0x0000000800467040"));
-    assertTrue(
-        ClassNameFiltering.isLambdaProxyClass(
-            "at datadog.smoketest.debugger.ServerDebuggerTestApplication$$Lambda/0x000000b801392c58"));
-  }
+    @Test
+    void lambdaProxyClasses() {
+        // jdk8:  at
+        // datadog.smoketest.debugger.ServerDebuggerTestApplication$$Lambda$231/1770027171.apply(<Unknown>:1000008)
+        // jdk11: at
+        // datadog.smoketest.debugger.ServerDebuggerTestApplication$$Lambda$262/0x0000000800467040.apply(Unknown Source)
+        // jdk17:	at
+        // datadog.smoketest.debugger.ServerDebuggerTestApplication$$Lambda$303/0x00000008013dd1f8.apply(Unknown Source)
+        // jdk21: at
+        // datadog.smoketest.debugger.ServerDebuggerTestApplication$$Lambda/0x000000b801392c58.apply(Unknown Source)
+        assertTrue(ClassNameFiltering.isLambdaProxyClass(
+                "datadog.smoketest.debugger.ServerDebuggerTestApplication$$Lambda$231/1770027171"));
+        assertTrue(ClassNameFiltering.isLambdaProxyClass(
+                "datadog.smoketest.debugger.ServerDebuggerTestApplication$$Lambda$262/0x0000000800467040"));
+        assertTrue(ClassNameFiltering.isLambdaProxyClass(
+                "at datadog.smoketest.debugger.ServerDebuggerTestApplication$$Lambda/0x000000b801392c58"));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/DebuggerInternalPackagesTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/DebuggerInternalPackagesTest.java
index db0b8b2f0ac..c184278d771 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/DebuggerInternalPackagesTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/DebuggerInternalPackagesTest.java
@@ -7,33 +7,28 @@
 
 class DebuggerInternalPackagesTest {
 
-  @Test
-  public void nullIsNotDebuggerInternal() {
-    assertFalse(DebuggerInternalPackages.isDebuggerInternalClass(null));
-  }
-
-  @Test
-  public void applicationClassIsNotDebuggerInternal() {
-    assertFalse(DebuggerInternalPackages.isDebuggerInternalClass("com/example/app/MyClass"));
-  }
-
-  @Test
-  public void debuggerInstrumentationPackageIsInternal() {
-    assertTrue(
-        DebuggerInternalPackages.isDebuggerInternalClass(
-            "com/datadog/debugger/instrumentation/Types"));
-  }
-
-  @Test
-  public void debuggerSymbolPackageIsInternal() {
-    assertTrue(
-        DebuggerInternalPackages.isDebuggerInternalClass(
-            "com/datadog/debugger/symbol/SymbolAggregator"));
-  }
-
-  @Test
-  public void debuggerPackageOutsideSkippedListIsNotInternal() {
-    assertFalse(
-        DebuggerInternalPackages.isDebuggerInternalClass("com/datadog/debugger/el/Something"));
-  }
+    @Test
+    public void nullIsNotDebuggerInternal() {
+        assertFalse(DebuggerInternalPackages.isDebuggerInternalClass(null));
+    }
+
+    @Test
+    public void applicationClassIsNotDebuggerInternal() {
+        assertFalse(DebuggerInternalPackages.isDebuggerInternalClass("com/example/app/MyClass"));
+    }
+
+    @Test
+    public void debuggerInstrumentationPackageIsInternal() {
+        assertTrue(DebuggerInternalPackages.isDebuggerInternalClass("com/datadog/debugger/instrumentation/Types"));
+    }
+
+    @Test
+    public void debuggerSymbolPackageIsInternal() {
+        assertTrue(DebuggerInternalPackages.isDebuggerInternalClass("com/datadog/debugger/symbol/SymbolAggregator"));
+    }
+
+    @Test
+    public void debuggerPackageOutsideSkippedListIsNotInternal() {
+        assertFalse(DebuggerInternalPackages.isDebuggerInternalClass("com/datadog/debugger/el/Something"));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ExceptionHelperTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ExceptionHelperTest.java
index d5e25e8bd0d..fca16bc4921 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ExceptionHelperTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ExceptionHelperTest.java
@@ -22,188 +22,179 @@
 @ExtendWith(MockitoExtension.class)
 public class ExceptionHelperTest {
 
-  @Mock Logger logger;
-
-  @Mock RatelimitedLogger ratelimitedLogger;
-
-  @Test
-  public void testWarn() {
-    when(logger.isDebugEnabled()).thenReturn(false);
-    doAnswer(this::logWarn).when(logger).warn(anyString(), ArgumentMatchers.<Object[]>any());
-    ExceptionHelper.logException(
-        logger, new RuntimeException("this is an exception"), "Error {} {}", "param1", "param2");
-  }
-
-  @Test
-  public void testDebug() {
-    when(logger.isDebugEnabled()).thenReturn(true);
-    doAnswer(this::logDebug).when(logger).debug(anyString(), ArgumentMatchers.<Object[]>any());
-    ExceptionHelper.logException(
-        logger, new RuntimeException("this is an exception"), "Error {} {}", "param1", "param2");
-  }
-
-  @Test
-  public void rateLimitWarn() {
-    when(logger.isDebugEnabled()).thenReturn(false);
-    doAnswer(this::logWarn)
-        .when(ratelimitedLogger)
-        .warn(anyString(), ArgumentMatchers.<Object[]>any());
-    ExceptionHelper.rateLimitedLogException(
-        ratelimitedLogger,
-        logger,
-        new RuntimeException("this is an exception"),
-        "Error {} {}",
-        "param1",
-        "param2");
-  }
-
-  @Test
-  public void rateLimitDebug() {
-    when(logger.isDebugEnabled()).thenReturn(true);
-    doAnswer(this::logDebug).when(logger).debug(anyString(), ArgumentMatchers.<Object[]>any());
-    ExceptionHelper.rateLimitedLogException(
-        ratelimitedLogger,
-        logger,
-        new RuntimeException("this is an exception"),
-        "Error {} {}",
-        "param1",
-        "param2");
-  }
-
-  @Test
-  public void foldExceptionStackTrace() {
-    String strStackTrace = ExceptionHelper.foldExceptionStackTrace(new Exception());
-    assertTrue(
-        strStackTrace.startsWith(
-            "java.lang.Exception at com.datadog.debugger.util.ExceptionHelperTest.foldExceptionStackTrace(ExceptionHelperTest.java:75) at "),
-        strStackTrace);
-    assertFalse(strStackTrace.contains("\n"));
-    assertFalse(strStackTrace.contains("\t"));
-    assertFalse(strStackTrace.contains("\r"));
-  }
-
-  @Test
-  public void innerMostException() {
-    Exception ex = new RuntimeException("test1");
-    Throwable innerMost = ExceptionHelper.getInnerMostThrowable(ex);
-    assertEquals(ex, innerMost);
-    Exception nested = new RuntimeException("test3", new RuntimeException("test2", ex));
-    innerMost = ExceptionHelper.getInnerMostThrowable(nested);
-    assertEquals(ex, innerMost);
-    Deque<Throwable> exceptions = new ArrayDeque<>();
-    innerMost = ExceptionHelper.getInnerMostThrowable(nested, exceptions);
-    assertEquals(ex, innerMost);
-    assertEquals(3, exceptions.size());
-    assertEquals(nested, exceptions.pollLast());
-    assertEquals(nested.getCause(), exceptions.pollLast());
-    assertEquals(nested.getCause().getCause(), exceptions.pollLast());
-    // create a cycle and make sure we handle it gracefully
-    Exception ex2 = new RuntimeException("test2", ex);
-    ex.initCause(ex2);
-    assertNull(ExceptionHelper.getInnerMostThrowable(ex2));
-  }
-
-  @Test
-  public void flattenStackTrace() {
-    Throwable simpleException =
-        new MockException(
-            "oops!",
-            new StackTraceElement[] {
-              new StackTraceElement("MyClass1", "myMethod1", "file1.java", 1)
-            });
-    Throwable nestedException =
-        new MockException(
-            "oops!",
-            new StackTraceElement[] {
-              new StackTraceElement("MyClass2", "myMethod2", "file2.java", 2)
-            },
-            simpleException);
-    StackTraceElement[] stack = ExceptionHelper.flattenStackTrace(simpleException);
-    assertEquals(1, stack.length);
-    stack = ExceptionHelper.flattenStackTrace(nestedException);
-    assertEquals(2, stack.length);
-  }
-
-  @Test
-  public void createThrowableMapping() {
-    Throwable nestedException = createNestException();
-    Throwable innerMostThrowable = ExceptionHelper.getInnerMostThrowable(nestedException);
-    int[] mapping = ExceptionHelper.createThrowableMapping(innerMostThrowable, nestedException);
-    StackTraceElement[] flattenedTrace = ExceptionHelper.flattenStackTrace(nestedException);
-    for (int i = 0; i < mapping.length; i++) {
-      assertEquals(
-          flattenedTrace[mapping[i]].getClassName(),
-          innerMostThrowable.getStackTrace()[i].getClassName());
-    }
-  }
-
-  @Test
-  public void createThrowableMappingRecursive() {
-    Throwable nestedException = createNestExceptionRecursive(4);
-    Throwable innerMostThrowable = ExceptionHelper.getInnerMostThrowable(nestedException);
-    int[] mapping = ExceptionHelper.createThrowableMapping(innerMostThrowable, nestedException);
-    StackTraceElement[] flattenedTrace = ExceptionHelper.flattenStackTrace(nestedException);
-    for (int i = 0; i < mapping.length; i++) {
-      assertEquals(
-          flattenedTrace[mapping[i]].getClassName(),
-          innerMostThrowable.getStackTrace()[i].getClassName());
-    }
-  }
-
-  private RuntimeException createNestExceptionRecursive(int depth) {
-    if (depth == 0) {
-      return createNestException();
-    }
-    return createNestExceptionRecursive(depth - 1);
-  }
-
-  private RuntimeException createNestException() {
-    return new RuntimeException("test3", createTest2Exception(createTest1Exception()));
-  }
-
-  private RuntimeException createTest1Exception() {
-    return new RuntimeException("test1");
-  }
-
-  private RuntimeException createTest2Exception(Throwable cause) {
-    return new RuntimeException("test2", cause);
-  }
-
-  private static class MockException extends Exception {
-    private final StackTraceElement[] stackTrace;
-
-    public MockException(String message, StackTraceElement[] stackTrace) {
-      this(message, stackTrace, null);
-    }
-
-    public MockException(String message, StackTraceElement[] stackTrace, Throwable cause) {
-      super(message, cause);
-      this.stackTrace = stackTrace;
-    }
-
-    @Override
-    public StackTraceElement[] getStackTrace() {
-      return stackTrace;
-    }
-  }
-
-  private Object logDebug(InvocationOnMock invocation) {
-    Object[] args = invocation.getArguments();
-    assertEquals(4, args.length);
-    assertEquals("Error {} {}", args[0]);
-    assertEquals("param1", args[1]);
-    assertEquals("param2", args[2]);
-    assertTrue(args[3] instanceof RuntimeException);
-    assertEquals("this is an exception", ((RuntimeException) args[3]).getMessage());
-    return null;
-  }
-
-  private Object logWarn(InvocationOnMock invocation) {
-    Object[] args = invocation.getArguments();
-    assertEquals(3, args.length);
-    assertEquals("Error {} {} java.lang.RuntimeException: this is an exception", args[0]);
-    assertEquals("param1", args[1]);
-    assertEquals("param2", args[2]);
-    return null;
-  }
+    @Mock
+    Logger logger;
+
+    @Mock
+    RatelimitedLogger ratelimitedLogger;
+
+    @Test
+    public void testWarn() {
+        when(logger.isDebugEnabled()).thenReturn(false);
+        doAnswer(this::logWarn).when(logger).warn(anyString(), ArgumentMatchers.<Object[]>any());
+        ExceptionHelper.logException(
+                logger, new RuntimeException("this is an exception"), "Error {} {}", "param1", "param2");
+    }
+
+    @Test
+    public void testDebug() {
+        when(logger.isDebugEnabled()).thenReturn(true);
+        doAnswer(this::logDebug).when(logger).debug(anyString(), ArgumentMatchers.<Object[]>any());
+        ExceptionHelper.logException(
+                logger, new RuntimeException("this is an exception"), "Error {} {}", "param1", "param2");
+    }
+
+    @Test
+    public void rateLimitWarn() {
+        when(logger.isDebugEnabled()).thenReturn(false);
+        doAnswer(this::logWarn).when(ratelimitedLogger).warn(anyString(), ArgumentMatchers.<Object[]>any());
+        ExceptionHelper.rateLimitedLogException(
+                ratelimitedLogger,
+                logger,
+                new RuntimeException("this is an exception"),
+                "Error {} {}",
+                "param1",
+                "param2");
+    }
+
+    @Test
+    public void rateLimitDebug() {
+        when(logger.isDebugEnabled()).thenReturn(true);
+        doAnswer(this::logDebug).when(logger).debug(anyString(), ArgumentMatchers.<Object[]>any());
+        ExceptionHelper.rateLimitedLogException(
+                ratelimitedLogger,
+                logger,
+                new RuntimeException("this is an exception"),
+                "Error {} {}",
+                "param1",
+                "param2");
+    }
+
+    @Test
+    public void foldExceptionStackTrace() {
+        String strStackTrace = ExceptionHelper.foldExceptionStackTrace(new Exception());
+        assertTrue(
+                strStackTrace.startsWith(
+                        "java.lang.Exception at com.datadog.debugger.util.ExceptionHelperTest.foldExceptionStackTrace(ExceptionHelperTest.java:75) at "),
+                strStackTrace);
+        assertFalse(strStackTrace.contains("\n"));
+        assertFalse(strStackTrace.contains("\t"));
+        assertFalse(strStackTrace.contains("\r"));
+    }
+
+    @Test
+    public void innerMostException() {
+        Exception ex = new RuntimeException("test1");
+        Throwable innerMost = ExceptionHelper.getInnerMostThrowable(ex);
+        assertEquals(ex, innerMost);
+        Exception nested = new RuntimeException("test3", new RuntimeException("test2", ex));
+        innerMost = ExceptionHelper.getInnerMostThrowable(nested);
+        assertEquals(ex, innerMost);
+        Deque<Throwable> exceptions = new ArrayDeque<>();
+        innerMost = ExceptionHelper.getInnerMostThrowable(nested, exceptions);
+        assertEquals(ex, innerMost);
+        assertEquals(3, exceptions.size());
+        assertEquals(nested, exceptions.pollLast());
+        assertEquals(nested.getCause(), exceptions.pollLast());
+        assertEquals(nested.getCause().getCause(), exceptions.pollLast());
+        // create a cycle and make sure we handle it gracefully
+        Exception ex2 = new RuntimeException("test2", ex);
+        ex.initCause(ex2);
+        assertNull(ExceptionHelper.getInnerMostThrowable(ex2));
+    }
+
+    @Test
+    public void flattenStackTrace() {
+        Throwable simpleException = new MockException(
+                "oops!", new StackTraceElement[] {new StackTraceElement("MyClass1", "myMethod1", "file1.java", 1)});
+        Throwable nestedException = new MockException(
+                "oops!",
+                new StackTraceElement[] {new StackTraceElement("MyClass2", "myMethod2", "file2.java", 2)},
+                simpleException);
+        StackTraceElement[] stack = ExceptionHelper.flattenStackTrace(simpleException);
+        assertEquals(1, stack.length);
+        stack = ExceptionHelper.flattenStackTrace(nestedException);
+        assertEquals(2, stack.length);
+    }
+
+    @Test
+    public void createThrowableMapping() {
+        Throwable nestedException = createNestException();
+        Throwable innerMostThrowable = ExceptionHelper.getInnerMostThrowable(nestedException);
+        int[] mapping = ExceptionHelper.createThrowableMapping(innerMostThrowable, nestedException);
+        StackTraceElement[] flattenedTrace = ExceptionHelper.flattenStackTrace(nestedException);
+        for (int i = 0; i < mapping.length; i++) {
+            assertEquals(
+                    flattenedTrace[mapping[i]].getClassName(), innerMostThrowable.getStackTrace()[i].getClassName());
+        }
+    }
+
+    @Test
+    public void createThrowableMappingRecursive() {
+        Throwable nestedException = createNestExceptionRecursive(4);
+        Throwable innerMostThrowable = ExceptionHelper.getInnerMostThrowable(nestedException);
+        int[] mapping = ExceptionHelper.createThrowableMapping(innerMostThrowable, nestedException);
+        StackTraceElement[] flattenedTrace = ExceptionHelper.flattenStackTrace(nestedException);
+        for (int i = 0; i < mapping.length; i++) {
+            assertEquals(
+                    flattenedTrace[mapping[i]].getClassName(), innerMostThrowable.getStackTrace()[i].getClassName());
+        }
+    }
+
+    private RuntimeException createNestExceptionRecursive(int depth) {
+        if (depth == 0) {
+            return createNestException();
+        }
+        return createNestExceptionRecursive(depth - 1);
+    }
+
+    private RuntimeException createNestException() {
+        return new RuntimeException("test3", createTest2Exception(createTest1Exception()));
+    }
+
+    private RuntimeException createTest1Exception() {
+        return new RuntimeException("test1");
+    }
+
+    private RuntimeException createTest2Exception(Throwable cause) {
+        return new RuntimeException("test2", cause);
+    }
+
+    private static class MockException extends Exception {
+        private final StackTraceElement[] stackTrace;
+
+        public MockException(String message, StackTraceElement[] stackTrace) {
+            this(message, stackTrace, null);
+        }
+
+        public MockException(String message, StackTraceElement[] stackTrace, Throwable cause) {
+            super(message, cause);
+            this.stackTrace = stackTrace;
+        }
+
+        @Override
+        public StackTraceElement[] getStackTrace() {
+            return stackTrace;
+        }
+    }
+
+    private Object logDebug(InvocationOnMock invocation) {
+        Object[] args = invocation.getArguments();
+        assertEquals(4, args.length);
+        assertEquals("Error {} {}", args[0]);
+        assertEquals("param1", args[1]);
+        assertEquals("param2", args[2]);
+        assertTrue(args[3] instanceof RuntimeException);
+        assertEquals("this is an exception", ((RuntimeException) args[3]).getMessage());
+        return null;
+    }
+
+    private Object logWarn(InvocationOnMock invocation) {
+        Object[] args = invocation.getArguments();
+        assertEquals(3, args.length);
+        assertEquals("Error {} {} java.lang.RuntimeException: this is an exception", args[0]);
+        assertEquals("param1", args[1]);
+        assertEquals("param2", args[2]);
+        return null;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/RemoteConfigHelper.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/RemoteConfigHelper.java
index 54154b02080..256c4ac9f4a 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/RemoteConfigHelper.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/RemoteConfigHelper.java
@@ -5,17 +5,18 @@
 import java.util.UUID;
 
 public class RemoteConfigHelper {
-  public static String encode(String s, String serviceName) {
-    String encodedConfig = new String(Base64.getEncoder().encode(s.getBytes()));
-    String path = UUID.nameUUIDFromBytes(serviceName.getBytes(StandardCharsets.UTF_8)).toString();
-    return String.format(
-        "{\n"
-            + "\"targets\": \"\",\n"
-            + "\"target_files\": [\n"
-            + "    {\n"
-            + "      \"path\": \"datadog/2/LIVE_DEBUGGING/%s/config\",\n"
-            + "      \"raw\": \"%s\"\n"
-            + "}]}",
-        path, encodedConfig);
-  }
+    public static String encode(String s, String serviceName) {
+        String encodedConfig = new String(Base64.getEncoder().encode(s.getBytes()));
+        String path = UUID.nameUUIDFromBytes(serviceName.getBytes(StandardCharsets.UTF_8))
+                .toString();
+        return String.format(
+                "{\n"
+                        + "\"targets\": \"\",\n"
+                        + "\"target_files\": [\n"
+                        + "    {\n"
+                        + "      \"path\": \"datadog/2/LIVE_DEBUGGING/%s/config\",\n"
+                        + "      \"raw\": \"%s\"\n"
+                        + "}]}",
+                path, encodedConfig);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SnapshotPrunerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SnapshotPrunerTest.java
index 75c9d07578a..ec282d16eea 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SnapshotPrunerTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SnapshotPrunerTest.java
@@ -6,227 +6,215 @@
 import org.junit.jupiter.api.Test;
 
 class SnapshotPrunerTest {
-  @Test
-  public void noPruning() {
-    assertEquals("[]", SnapshotPruner.prune("[]", MAX_SNAPSHOT_SIZE, 0));
-    assertEquals("{}", SnapshotPruner.prune("{}", MAX_SNAPSHOT_SIZE, 0));
-    assertEquals("[{},{},{}]", SnapshotPruner.prune("[{},{},{}]", MAX_SNAPSHOT_SIZE, 0));
-    assertEquals(
-        "{\"foo\":[[],[],[]]}", SnapshotPruner.prune("{\"foo\":[[],[],[]]}", MAX_SNAPSHOT_SIZE, 0));
-    assertEquals(
-        "{\"foo\":\"bar\"}", SnapshotPruner.prune("{\"foo\":\"bar\"}", MAX_SNAPSHOT_SIZE, 0));
-    assertEquals("{\"foo\":1001}", SnapshotPruner.prune("{\"foo\":1001}", MAX_SNAPSHOT_SIZE, 0));
-    assertEquals("{\"foo\":3.14}", SnapshotPruner.prune("{\"foo\":3.14}", MAX_SNAPSHOT_SIZE, 0));
-    assertEquals("{\"foo\":true}", SnapshotPruner.prune("{\"foo\":true}", MAX_SNAPSHOT_SIZE, 0));
-    assertEquals(
-        "{\"foo\":{\"name\":\"value\"}}",
-        SnapshotPruner.prune("{\"foo\":{\"name\":\"value\"}}", MAX_SNAPSHOT_SIZE, 0));
-    assertEquals(
-        "{\"foo1\":{\"foo2\":{\"foo3\":{\"foo4\":{\"foo5\":{}}}}}}",
-        SnapshotPruner.prune(
-            "{\"foo1\":{\"foo2\":{\"foo3\":{\"foo4\":{\"foo5\":{}}}}}}", MAX_SNAPSHOT_SIZE, 0));
-  }
+    @Test
+    public void noPruning() {
+        assertEquals("[]", SnapshotPruner.prune("[]", MAX_SNAPSHOT_SIZE, 0));
+        assertEquals("{}", SnapshotPruner.prune("{}", MAX_SNAPSHOT_SIZE, 0));
+        assertEquals("[{},{},{}]", SnapshotPruner.prune("[{},{},{}]", MAX_SNAPSHOT_SIZE, 0));
+        assertEquals("{\"foo\":[[],[],[]]}", SnapshotPruner.prune("{\"foo\":[[],[],[]]}", MAX_SNAPSHOT_SIZE, 0));
+        assertEquals("{\"foo\":\"bar\"}", SnapshotPruner.prune("{\"foo\":\"bar\"}", MAX_SNAPSHOT_SIZE, 0));
+        assertEquals("{\"foo\":1001}", SnapshotPruner.prune("{\"foo\":1001}", MAX_SNAPSHOT_SIZE, 0));
+        assertEquals("{\"foo\":3.14}", SnapshotPruner.prune("{\"foo\":3.14}", MAX_SNAPSHOT_SIZE, 0));
+        assertEquals("{\"foo\":true}", SnapshotPruner.prune("{\"foo\":true}", MAX_SNAPSHOT_SIZE, 0));
+        assertEquals(
+                "{\"foo\":{\"name\":\"value\"}}",
+                SnapshotPruner.prune("{\"foo\":{\"name\":\"value\"}}", MAX_SNAPSHOT_SIZE, 0));
+        assertEquals(
+                "{\"foo1\":{\"foo2\":{\"foo3\":{\"foo4\":{\"foo5\":{}}}}}}",
+                SnapshotPruner.prune(
+                        "{\"foo1\":{\"foo2\":{\"foo3\":{\"foo4\":{\"foo5\":{}}}}}}", MAX_SNAPSHOT_SIZE, 0));
+    }
 
-  @Test
-  public void basic() {
-    assertEquals("aaaa{\"pruned\":true}bbbb", SnapshotPruner.prune("aaaa{}bbbb", 8, 0));
-    assertEquals(
-        "aa{\"pruned\":true}bb",
-        SnapshotPruner.prune("aa{\"notCapturedReason\": \"depth\"}bb", 8, 0));
-    assertEquals(
-        "aa{\"pruned\":true}bb",
-        SnapshotPruner.prune("aa{\"notCapturedReason\": \"collectionSize\"}bb", 8, 0));
-  }
+    @Test
+    public void basic() {
+        assertEquals("aaaa{\"pruned\":true}bbbb", SnapshotPruner.prune("aaaa{}bbbb", 8, 0));
+        assertEquals("aa{\"pruned\":true}bb", SnapshotPruner.prune("aa{\"notCapturedReason\": \"depth\"}bb", 8, 0));
+        assertEquals(
+                "aa{\"pruned\":true}bb", SnapshotPruner.prune("aa{\"notCapturedReason\": \"collectionSize\"}bb", 8, 0));
+    }
 
-  @Test
-  public void priorityPruning() {
-    final String INPUT =
-        "{\n"
-            + "  \"elements\":[\n"
-            + "    {\n"
-            + "      \"type\": \"list\",\n"
-            + "      \"notCapturedReason\": \"collectionSize\"\n"
-            + "    },\n"
-            + "    {\n"
-            + "      \"type\": \"complex\",\n"
-            + "      \"notCapturedReason\": \"depth\"\n"
-            + "    },\n"
-            + "    {\n"
-            + "      \"type\": \"deep\",\n"
-            + "      \"subobject\": {\n"
-            + "        \"type\": \"complex\",\n"
-            + "        \"value\": \"subobject\"\n"
-            + "      }\n"
-            + "    }\n"
-            + "    {\n"
-            + "      \"type\": \"complex\",\n"
-            + "      \"value\": \"sfsfsdfklsdfslkfjsdfkjsdklfjsdflksdjfsdlfjsdklfsjdfklsjfksfjslkdfjskdlf\"\n"
-            + "    }\n"
-            + "  ]\n"
-            + "}";
-    assertEquals(
-        "{\n"
-            + "  \"elements\":[\n"
-            + "    {\n"
-            + "      \"type\": \"list\",\n"
-            + "      \"notCapturedReason\": \"collectionSize\"\n"
-            + "    },\n"
-            + "    {\"pruned\":true},\n"
-            + "    {\n"
-            + "      \"type\": \"deep\",\n"
-            + "      \"subobject\": {\n"
-            + "        \"type\": \"complex\",\n"
-            + "        \"value\": \"subobject\"\n"
-            + "      }\n"
-            + "    }\n"
-            + "    {\n"
-            + "      \"type\": \"complex\",\n"
-            + "      \"value\": \"sfsfsdfklsdfslkfjsdfkjsdklfjsdflksdjfsdlfjsdklfsjdfklsjfksfjslkdfjskdlf\"\n"
-            + "    }\n"
-            + "  ]\n"
-            + "}",
-        SnapshotPruner.prune(INPUT, 400, 0));
-    assertEquals(
-        "{\n"
-            + "  \"elements\":[\n"
-            + "    {\n"
-            + "      \"type\": \"list\",\n"
-            + "      \"notCapturedReason\": \"collectionSize\"\n"
-            + "    },\n"
-            + "    {\"pruned\":true},\n"
-            + "    {\"pruned\":true}\n"
-            + "    {\n"
-            + "      \"type\": \"complex\",\n"
-            + "      \"value\": \"sfsfsdfklsdfslkfjsdfkjsdklfjsdflksdjfsdlfjsdklfsjdfklsjfksfjslkdfjskdlf\"\n"
-            + "    }\n"
-            + "  ]\n"
-            + "}",
-        SnapshotPruner.prune(INPUT, 300, 0));
-    assertEquals(
-        "{\n"
-            + "  \"elements\":[\n"
-            + "    {\"pruned\":true},\n"
-            + "    {\"pruned\":true},\n"
-            + "    {\"pruned\":true}\n"
-            + "    {\n"
-            + "      \"type\": \"complex\",\n"
-            + "      \"value\": \"sfsfsdfklsdfslkfjsdfkjsdklfjsdflksdjfsdlfjsdklfsjdfklsjfksfjslkdfjskdlf\"\n"
-            + "    }\n"
-            + "  ]\n"
-            + "}",
-        SnapshotPruner.prune(INPUT, 250, 0));
-    assertEquals(
-        "{\n"
-            + "  \"elements\":[\n"
-            + "    {\"pruned\":true},\n"
-            + "    {\"pruned\":true},\n"
-            + "    {\"pruned\":true}\n"
-            + "    {\"pruned\":true}\n"
-            + "  ]\n"
-            + "}",
-        SnapshotPruner.prune(INPUT, 200, 0));
-  }
+    @Test
+    public void priorityPruning() {
+        final String INPUT = "{\n"
+                + "  \"elements\":[\n"
+                + "    {\n"
+                + "      \"type\": \"list\",\n"
+                + "      \"notCapturedReason\": \"collectionSize\"\n"
+                + "    },\n"
+                + "    {\n"
+                + "      \"type\": \"complex\",\n"
+                + "      \"notCapturedReason\": \"depth\"\n"
+                + "    },\n"
+                + "    {\n"
+                + "      \"type\": \"deep\",\n"
+                + "      \"subobject\": {\n"
+                + "        \"type\": \"complex\",\n"
+                + "        \"value\": \"subobject\"\n"
+                + "      }\n"
+                + "    }\n"
+                + "    {\n"
+                + "      \"type\": \"complex\",\n"
+                + "      \"value\": \"sfsfsdfklsdfslkfjsdfkjsdklfjsdflksdjfsdlfjsdklfsjdfklsjfksfjslkdfjskdlf\"\n"
+                + "    }\n"
+                + "  ]\n"
+                + "}";
+        assertEquals(
+                "{\n"
+                        + "  \"elements\":[\n"
+                        + "    {\n"
+                        + "      \"type\": \"list\",\n"
+                        + "      \"notCapturedReason\": \"collectionSize\"\n"
+                        + "    },\n"
+                        + "    {\"pruned\":true},\n"
+                        + "    {\n"
+                        + "      \"type\": \"deep\",\n"
+                        + "      \"subobject\": {\n"
+                        + "        \"type\": \"complex\",\n"
+                        + "        \"value\": \"subobject\"\n"
+                        + "      }\n"
+                        + "    }\n"
+                        + "    {\n"
+                        + "      \"type\": \"complex\",\n"
+                        + "      \"value\": \"sfsfsdfklsdfslkfjsdfkjsdklfjsdflksdjfsdlfjsdklfsjdfklsjfksfjslkdfjskdlf\"\n"
+                        + "    }\n"
+                        + "  ]\n"
+                        + "}",
+                SnapshotPruner.prune(INPUT, 400, 0));
+        assertEquals(
+                "{\n"
+                        + "  \"elements\":[\n"
+                        + "    {\n"
+                        + "      \"type\": \"list\",\n"
+                        + "      \"notCapturedReason\": \"collectionSize\"\n"
+                        + "    },\n"
+                        + "    {\"pruned\":true},\n"
+                        + "    {\"pruned\":true}\n"
+                        + "    {\n"
+                        + "      \"type\": \"complex\",\n"
+                        + "      \"value\": \"sfsfsdfklsdfslkfjsdfkjsdklfjsdflksdjfsdlfjsdklfsjdfklsjfksfjslkdfjskdlf\"\n"
+                        + "    }\n"
+                        + "  ]\n"
+                        + "}",
+                SnapshotPruner.prune(INPUT, 300, 0));
+        assertEquals(
+                "{\n"
+                        + "  \"elements\":[\n"
+                        + "    {\"pruned\":true},\n"
+                        + "    {\"pruned\":true},\n"
+                        + "    {\"pruned\":true}\n"
+                        + "    {\n"
+                        + "      \"type\": \"complex\",\n"
+                        + "      \"value\": \"sfsfsdfklsdfslkfjsdfkjsdklfjsdflksdjfsdlfjsdklfsjdfklsjfksfjslkdfjskdlf\"\n"
+                        + "    }\n"
+                        + "  ]\n"
+                        + "}",
+                SnapshotPruner.prune(INPUT, 250, 0));
+        assertEquals(
+                "{\n"
+                        + "  \"elements\":[\n"
+                        + "    {\"pruned\":true},\n"
+                        + "    {\"pruned\":true},\n"
+                        + "    {\"pruned\":true}\n"
+                        + "    {\"pruned\":true}\n"
+                        + "  ]\n"
+                        + "}",
+                SnapshotPruner.prune(INPUT, 200, 0));
+    }
 
-  @Test
-  public void sizeReduction() {
-    final String INPUT =
-        "{\n"
-            + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
-            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"},\n"
-            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}\n"
-            + "                ]},\n"
-            + "                \"prune\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
-            + "                    {\"type\": \"Custom\", \"notCapturedReason\": \"depth\"},\n"
-            + "                    {\"type\": \"Custom\", \"notCapturedReason\": \"depth\"}\n"
-            + "                ]}\n"
-            + "            }";
-    assertEquals(
-        "{\n"
-            + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
-            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"},\n"
-            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}\n"
-            + "                ]},\n"
-            + "                \"prune\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
-            + "                    {\"type\": \"Custom\", \"notCapturedReason\": \"depth\"},\n"
-            + "                    {\"type\": \"Custom\", \"notCapturedReason\": \"depth\"}\n"
-            + "                ]}\n"
-            + "            }",
-        SnapshotPruner.prune(INPUT, 800, 0));
-    assertEquals(
-        "{\n"
-            + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
-            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"},\n"
-            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}\n"
-            + "                ]},\n"
-            + "                \"prune\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
-            + "                    {\"pruned\":true},\n"
-            + "                    {\"pruned\":true}\n"
-            + "                ]}\n"
-            + "            }",
-        SnapshotPruner.prune(INPUT, 440, 0));
-    assertEquals(
-        "{\n"
-            + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
-            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"},\n"
-            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}\n"
-            + "                ]},\n"
-            + "                \"prune\": {\"pruned\":true}\n"
-            + "            }",
-        SnapshotPruner.prune(INPUT, 350, 0));
-    assertEquals(
-        "{\n"
-            + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
-            + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"},\n"
-            + "                    {\"pruned\":true}\n"
-            + "                ]},\n"
-            + "                \"prune\": {\"pruned\":true}\n"
-            + "            }",
-        SnapshotPruner.prune(INPUT, 270, 0));
-    assertEquals(
-        "{\n"
-            + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
-            + "                    {\"pruned\":true},\n"
-            + "                    {\"pruned\":true}\n"
-            + "                ]},\n"
-            + "                \"prune\": {\"pruned\":true}\n"
-            + "            }",
-        SnapshotPruner.prune(INPUT, 240, 0));
-    assertEquals(
-        "{\n"
-            + "                \"keep\": {\"pruned\":true},\n"
-            + "                \"prune\": {\"pruned\":true}\n"
-            + "            }",
-        SnapshotPruner.prune(INPUT, 120, 0));
-    assertEquals("{\"pruned\":true}", SnapshotPruner.prune(INPUT, 20, 0));
-  }
+    @Test
+    public void sizeReduction() {
+        final String INPUT = "{\n"
+                + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+                + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"},\n"
+                + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}\n"
+                + "                ]},\n"
+                + "                \"prune\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+                + "                    {\"type\": \"Custom\", \"notCapturedReason\": \"depth\"},\n"
+                + "                    {\"type\": \"Custom\", \"notCapturedReason\": \"depth\"}\n"
+                + "                ]}\n"
+                + "            }";
+        assertEquals(
+                "{\n"
+                        + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+                        + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"},\n"
+                        + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}\n"
+                        + "                ]},\n"
+                        + "                \"prune\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+                        + "                    {\"type\": \"Custom\", \"notCapturedReason\": \"depth\"},\n"
+                        + "                    {\"type\": \"Custom\", \"notCapturedReason\": \"depth\"}\n"
+                        + "                ]}\n"
+                        + "            }",
+                SnapshotPruner.prune(INPUT, 800, 0));
+        assertEquals(
+                "{\n"
+                        + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+                        + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"},\n"
+                        + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}\n"
+                        + "                ]},\n"
+                        + "                \"prune\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+                        + "                    {\"pruned\":true},\n"
+                        + "                    {\"pruned\":true}\n"
+                        + "                ]}\n"
+                        + "            }",
+                SnapshotPruner.prune(INPUT, 440, 0));
+        assertEquals(
+                "{\n"
+                        + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+                        + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"},\n"
+                        + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}\n"
+                        + "                ]},\n"
+                        + "                \"prune\": {\"pruned\":true}\n"
+                        + "            }",
+                SnapshotPruner.prune(INPUT, 350, 0));
+        assertEquals(
+                "{\n"
+                        + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+                        + "                    {\"type\": \"str\", \"value\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaa\"},\n"
+                        + "                    {\"pruned\":true}\n"
+                        + "                ]},\n"
+                        + "                \"prune\": {\"pruned\":true}\n"
+                        + "            }",
+                SnapshotPruner.prune(INPUT, 270, 0));
+        assertEquals(
+                "{\n"
+                        + "                \"keep\": {\"type\": \"list\", \"size\":2, \"elements\": [\n"
+                        + "                    {\"pruned\":true},\n"
+                        + "                    {\"pruned\":true}\n"
+                        + "                ]},\n"
+                        + "                \"prune\": {\"pruned\":true}\n"
+                        + "            }",
+                SnapshotPruner.prune(INPUT, 240, 0));
+        assertEquals(
+                "{\n"
+                        + "                \"keep\": {\"pruned\":true},\n"
+                        + "                \"prune\": {\"pruned\":true}\n"
+                        + "            }",
+                SnapshotPruner.prune(INPUT, 120, 0));
+        assertEquals("{\"pruned\":true}", SnapshotPruner.prune(INPUT, 20, 0));
+    }
 
-  @Test
-  public void sliceSmallSnapshot() throws Exception {
-    final int MIN_LEVEL = 6;
-    String inputSmallSnapshot =
-        utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot.json").trim();
-    assertEquals(
-        inputSmallSnapshot,
-        SnapshotPruner.prune(inputSmallSnapshot, inputSmallSnapshot.length(), MIN_LEVEL));
-    String smallSnapshot =
-        utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_pruned0.json")
-            .trim();
-    assertEquals(smallSnapshot, SnapshotPruner.prune(inputSmallSnapshot, 1500, MIN_LEVEL));
-    smallSnapshot =
-        utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_pruned1.json")
-            .trim();
-    assertEquals(smallSnapshot, SnapshotPruner.prune(inputSmallSnapshot, 1250, MIN_LEVEL));
-    smallSnapshot =
-        utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_pruned2.json")
-            .trim();
-    assertEquals(smallSnapshot, SnapshotPruner.prune(inputSmallSnapshot, 1100, MIN_LEVEL));
-    smallSnapshot =
-        utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_pruned3.json")
-            .trim();
-    assertEquals(smallSnapshot, SnapshotPruner.prune(inputSmallSnapshot, 1000, MIN_LEVEL));
-    smallSnapshot =
-        utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_pruned4.json")
-            .trim();
-    assertEquals(smallSnapshot, SnapshotPruner.prune(inputSmallSnapshot, 500, MIN_LEVEL));
-  }
+    @Test
+    public void sliceSmallSnapshot() throws Exception {
+        final int MIN_LEVEL = 6;
+        String inputSmallSnapshot = utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot.json")
+                .trim();
+        assertEquals(
+                inputSmallSnapshot, SnapshotPruner.prune(inputSmallSnapshot, inputSmallSnapshot.length(), MIN_LEVEL));
+        String smallSnapshot = utils.TestHelper.getFixtureContent(
+                        "/com/datadog/debugger/util/smallSnapshot_pruned0.json")
+                .trim();
+        assertEquals(smallSnapshot, SnapshotPruner.prune(inputSmallSnapshot, 1500, MIN_LEVEL));
+        smallSnapshot = utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_pruned1.json")
+                .trim();
+        assertEquals(smallSnapshot, SnapshotPruner.prune(inputSmallSnapshot, 1250, MIN_LEVEL));
+        smallSnapshot = utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_pruned2.json")
+                .trim();
+        assertEquals(smallSnapshot, SnapshotPruner.prune(inputSmallSnapshot, 1100, MIN_LEVEL));
+        smallSnapshot = utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_pruned3.json")
+                .trim();
+        assertEquals(smallSnapshot, SnapshotPruner.prune(inputSmallSnapshot, 1000, MIN_LEVEL));
+        smallSnapshot = utils.TestHelper.getFixtureContent("/com/datadog/debugger/util/smallSnapshot_pruned4.json")
+                .trim();
+        assertEquals(smallSnapshot, SnapshotPruner.prune(inputSmallSnapshot, 500, MIN_LEVEL));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SpringHelperTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SpringHelperTest.java
index a15d9e84883..f51048f79d2 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SpringHelperTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SpringHelperTest.java
@@ -14,36 +14,35 @@
 
 class SpringHelperTest {
 
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_17)
-  void isSpringUsingOnlyMethodParametersTrueSpringVersion() throws Exception {
-    Class<?> clazz = Class.forName("org.springframework.core.SpringVersion");
-    Instrumentation inst = mock(Instrumentation.class);
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {clazz});
-    assertTrue(SpringHelper.isSpringUsingOnlyMethodParameters(inst));
-  }
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_17)
+    void isSpringUsingOnlyMethodParametersTrueSpringVersion() throws Exception {
+        Class<?> clazz = Class.forName("org.springframework.core.SpringVersion");
+        Instrumentation inst = mock(Instrumentation.class);
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {clazz});
+        assertTrue(SpringHelper.isSpringUsingOnlyMethodParameters(inst));
+    }
 
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_17)
-  void isSpringUsingOnlyMethodParametersTrueFallback() throws Exception {
-    Class<?> clazz = Class.forName("org.springframework.web.client.RestClient");
-    Instrumentation inst = mock(Instrumentation.class);
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {clazz});
-    assertTrue(SpringHelper.isSpringUsingOnlyMethodParameters(inst));
-  }
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_17)
+    void isSpringUsingOnlyMethodParametersTrueFallback() throws Exception {
+        Class<?> clazz = Class.forName("org.springframework.web.client.RestClient");
+        Instrumentation inst = mock(Instrumentation.class);
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[] {clazz});
+        assertTrue(SpringHelper.isSpringUsingOnlyMethodParameters(inst));
+    }
 
-  @Test
-  void isSpringUsingOnlyMethodParametersFalseFallback() throws Exception {
-    Instrumentation inst = mock(Instrumentation.class);
-    when(inst.getAllLoadedClasses()).thenReturn(new Class[0]);
-    assertFalse(SpringHelper.isSpringUsingOnlyMethodParameters(inst));
-  }
+    @Test
+    void isSpringUsingOnlyMethodParametersFalseFallback() throws Exception {
+        Instrumentation inst = mock(Instrumentation.class);
+        when(inst.getAllLoadedClasses()).thenReturn(new Class[0]);
+        assertFalse(SpringHelper.isSpringUsingOnlyMethodParameters(inst));
+    }
 
-  @Test
-  void invalidSpringVersion() {
-    IllegalArgumentException illegalArgumentException =
-        assertThrows(
-            IllegalArgumentException.class, () -> new SpringHelper.ParsedSpringVersion("foo"));
-    assertEquals("Cannot parse SpringVersion: foo", illegalArgumentException.getMessage());
-  }
+    @Test
+    void invalidSpringVersion() {
+        IllegalArgumentException illegalArgumentException =
+                assertThrows(IllegalArgumentException.class, () -> new SpringHelper.ParsedSpringVersion("foo"));
+        assertEquals("Cannot parse SpringVersion: foo", illegalArgumentException.getMessage());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/StringTokenWriterTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/StringTokenWriterTest.java
index 3009ff735d6..add06e75c6b 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/StringTokenWriterTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/StringTokenWriterTest.java
@@ -23,161 +23,155 @@
 
 class StringTokenWriterTest {
 
-  private static final Limits DEPTH_0 =
-      new Limits(0, DEFAULT_COLLECTION_SIZE, DEFAULT_LENGTH, DEFAULT_FIELD_COUNT);
-  private static final Limits DEPTH_1 =
-      new Limits(1, DEFAULT_COLLECTION_SIZE, DEFAULT_LENGTH, DEFAULT_FIELD_COUNT);
-
-  @Test
-  public void basic() throws Exception {
-    assertEquals("null", serializeValue(null, DEPTH_0));
-    assertEquals("...", serializeValue(new Object(), DEPTH_0));
-    assertEquals(
-        "foo", serializeValue("foo", DEPTH_0)); // String treated as primitive, no field extraction
-  }
-
-  @Test
-  public void fields() throws Exception {
-    assertEquals("...", serializeValue(new Person(), DEPTH_0));
-  }
-
-  @Test
-  public void deepFields() throws Exception {
-    assertEquals(
-        "{strVal=strval, intVal=24, nullField=null, mapVal=..., objArray=...}",
-        serializeValue(new Person(), DEPTH_1));
-  }
-
-  @Test
-  public void primitiveFields() throws Exception {
-    assertEquals("0", serializeValue((byte) 0, DEPTH_1));
-    assertEquals("0", serializeValue((short) 0, DEPTH_1));
-    assertEquals("*", serializeValue((char) 42, DEPTH_1));
-    assertEquals("0", serializeValue(0, DEPTH_1));
-    assertEquals("0", serializeValue(0L, DEPTH_1));
-    assertEquals("0.0", serializeValue(0F, DEPTH_1));
-    assertEquals("0.0", serializeValue(0D, DEPTH_1));
-    assertEquals("true", serializeValue(true, DEPTH_1));
-    assertEquals(
-        "beae1807-f3b0-4ea8-a74f-826790c5e6f8",
-        serializeValue(UUID.fromString("beae1807-f3b0-4ea8-a74f-826790c5e6f8"), DEPTH_1));
-    assertEquals("java.util.Random", serializeValue(Random.class, DEPTH_1));
-  }
-
-  @Test
-  public void lotsOfFields() throws Exception {
-    assertEquals(
-        "{f00=0, f01=1, f02=2, f03=3, f04=4}, ...",
-        serializeValue(
-            new LotsFields(),
-            new Limits(DEFAULT_REFERENCE_DEPTH, DEFAULT_COLLECTION_SIZE, DEFAULT_LENGTH, 5)));
-  }
-
-  @Test
-  public void parentFields() throws Exception {
-    assertEquals(
-        "{valueField=4, field3=3, field2=2, field1=1}",
-        serializeValue(new LeafClass(), Limits.DEFAULT));
-    assertEquals(
-        "{valueField=4, field3=3}, ...",
-        serializeValue(
-            new LeafClass(),
-            new Limits(DEFAULT_REFERENCE_DEPTH, DEFAULT_COLLECTION_SIZE, DEFAULT_LENGTH, 2)));
-  }
-
-  @Test
-  public void collections() throws Exception {
-    List<String> list = new ArrayList<>();
-    list.add("foo");
-    list.add("bar");
-    list.add(null);
-    assertEquals("[foo, bar, null]", serializeValue(list, DEPTH_1));
-  }
-
-  @Test
-  public void maps() throws Exception {
-    HashMap<String, String> map = new HashMap<>();
-    map.put("foo1", "bar1");
-    map.put(null, null);
-    String serializedStr = serializeValue(map, DEPTH_1);
-    assertTrue(serializedStr.contains("[foo1=bar1]"));
-    assertTrue(serializedStr.contains("[null=null]"));
-  }
-
-  @Test
-  public void collectionUnknown() throws Exception {
-    class MyArrayList<T> extends ArrayList<T> {}
-    String str = serializeValue(new MyArrayList<>(), DEPTH_1);
-    assertTrue(str.contains("elementData="));
-    assertTrue(str.contains("size="));
-    assertTrue(str.contains("modCount="));
-  }
-
-  @Test
-  public void mapUnknown() throws Exception {
-    class MyMap<K, V> extends HashMap<K, V> {
-      @Override
-      public Set<Entry<K, V>> entrySet() {
-        throw new UnsupportedOperationException("entrySet");
-      }
-    }
-    String str = serializeValue(new MyMap<String, String>(), DEPTH_1);
-    assertTrue(str.contains("table="));
-    assertTrue(str.contains("size="));
-    assertTrue(str.contains("modCount="));
-    assertTrue(str.contains("threshold="));
-    assertTrue(str.contains("loadFactor="));
-  }
-
-  static class Person {
-    private static final String C1 = "constant1";
-    private static final int C2 = 42;
-    private static List<String> list = new ArrayList<>();
-    private String strVal = "strval";
-    private int intVal = 24;
-    private Object nullField = null;
-    private Map<String, String> mapVal = new HashMap<>();
-    private Object[] objArray = new Object[] {new AtomicLong()};
-  }
-
-  static class LotsFields {
-    private int f00 = 0;
-    private int f01 = 1;
-    private int f02 = 2;
-    private int f03 = 3;
-    private int f04 = 4;
-    private int f05 = 5;
-    private int f06 = 6;
-    private int f07 = 7;
-    private int f08 = 8;
-    private int f09 = 9;
-    private int f10 = 10;
-  }
-
-  static class Parent1 {
-    private int field1 = 1;
-  }
-
-  static class Parent2 extends Parent1 {
-    private int field2 = 2;
-  }
-
-  static class Parent3 extends Parent2 {
-    private int field3 = 3;
-  }
-
-  static class LeafClass extends Parent3 {
-    private int valueField = 4;
-  }
-
-  private String serializeValue(Object value, Limits limits) throws Exception {
-    StringBuilder sb = new StringBuilder();
-    SerializerWithLimits serializer =
-        new SerializerWithLimits(
-            new StringTokenWriter(sb, new ArrayList<>()),
-            TimeoutChecker.create(Config.get(), Duration.ofSeconds(300)));
-    serializer.serialize(
-        value, value != null ? value.getClass().getTypeName() : Object.class.getTypeName(), limits);
-    return sb.toString();
-  }
+    private static final Limits DEPTH_0 = new Limits(0, DEFAULT_COLLECTION_SIZE, DEFAULT_LENGTH, DEFAULT_FIELD_COUNT);
+    private static final Limits DEPTH_1 = new Limits(1, DEFAULT_COLLECTION_SIZE, DEFAULT_LENGTH, DEFAULT_FIELD_COUNT);
+
+    @Test
+    public void basic() throws Exception {
+        assertEquals("null", serializeValue(null, DEPTH_0));
+        assertEquals("...", serializeValue(new Object(), DEPTH_0));
+        assertEquals("foo", serializeValue("foo", DEPTH_0)); // String treated as primitive, no field extraction
+    }
+
+    @Test
+    public void fields() throws Exception {
+        assertEquals("...", serializeValue(new Person(), DEPTH_0));
+    }
+
+    @Test
+    public void deepFields() throws Exception {
+        assertEquals(
+                "{strVal=strval, intVal=24, nullField=null, mapVal=..., objArray=...}",
+                serializeValue(new Person(), DEPTH_1));
+    }
+
+    @Test
+    public void primitiveFields() throws Exception {
+        assertEquals("0", serializeValue((byte) 0, DEPTH_1));
+        assertEquals("0", serializeValue((short) 0, DEPTH_1));
+        assertEquals("*", serializeValue((char) 42, DEPTH_1));
+        assertEquals("0", serializeValue(0, DEPTH_1));
+        assertEquals("0", serializeValue(0L, DEPTH_1));
+        assertEquals("0.0", serializeValue(0F, DEPTH_1));
+        assertEquals("0.0", serializeValue(0D, DEPTH_1));
+        assertEquals("true", serializeValue(true, DEPTH_1));
+        assertEquals(
+                "beae1807-f3b0-4ea8-a74f-826790c5e6f8",
+                serializeValue(UUID.fromString("beae1807-f3b0-4ea8-a74f-826790c5e6f8"), DEPTH_1));
+        assertEquals("java.util.Random", serializeValue(Random.class, DEPTH_1));
+    }
+
+    @Test
+    public void lotsOfFields() throws Exception {
+        assertEquals(
+                "{f00=0, f01=1, f02=2, f03=3, f04=4}, ...",
+                serializeValue(
+                        new LotsFields(),
+                        new Limits(DEFAULT_REFERENCE_DEPTH, DEFAULT_COLLECTION_SIZE, DEFAULT_LENGTH, 5)));
+    }
+
+    @Test
+    public void parentFields() throws Exception {
+        assertEquals("{valueField=4, field3=3, field2=2, field1=1}", serializeValue(new LeafClass(), Limits.DEFAULT));
+        assertEquals(
+                "{valueField=4, field3=3}, ...",
+                serializeValue(
+                        new LeafClass(),
+                        new Limits(DEFAULT_REFERENCE_DEPTH, DEFAULT_COLLECTION_SIZE, DEFAULT_LENGTH, 2)));
+    }
+
+    @Test
+    public void collections() throws Exception {
+        List<String> list = new ArrayList<>();
+        list.add("foo");
+        list.add("bar");
+        list.add(null);
+        assertEquals("[foo, bar, null]", serializeValue(list, DEPTH_1));
+    }
+
+    @Test
+    public void maps() throws Exception {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("foo1", "bar1");
+        map.put(null, null);
+        String serializedStr = serializeValue(map, DEPTH_1);
+        assertTrue(serializedStr.contains("[foo1=bar1]"));
+        assertTrue(serializedStr.contains("[null=null]"));
+    }
+
+    @Test
+    public void collectionUnknown() throws Exception {
+        class MyArrayList<T> extends ArrayList<T> {}
+        String str = serializeValue(new MyArrayList<>(), DEPTH_1);
+        assertTrue(str.contains("elementData="));
+        assertTrue(str.contains("size="));
+        assertTrue(str.contains("modCount="));
+    }
+
+    @Test
+    public void mapUnknown() throws Exception {
+        class MyMap<K, V> extends HashMap<K, V> {
+            @Override
+            public Set<Entry<K, V>> entrySet() {
+                throw new UnsupportedOperationException("entrySet");
+            }
+        }
+        String str = serializeValue(new MyMap<String, String>(), DEPTH_1);
+        assertTrue(str.contains("table="));
+        assertTrue(str.contains("size="));
+        assertTrue(str.contains("modCount="));
+        assertTrue(str.contains("threshold="));
+        assertTrue(str.contains("loadFactor="));
+    }
+
+    static class Person {
+        private static final String C1 = "constant1";
+        private static final int C2 = 42;
+        private static List<String> list = new ArrayList<>();
+        private String strVal = "strval";
+        private int intVal = 24;
+        private Object nullField = null;
+        private Map<String, String> mapVal = new HashMap<>();
+        private Object[] objArray = new Object[] {new AtomicLong()};
+    }
+
+    static class LotsFields {
+        private int f00 = 0;
+        private int f01 = 1;
+        private int f02 = 2;
+        private int f03 = 3;
+        private int f04 = 4;
+        private int f05 = 5;
+        private int f06 = 6;
+        private int f07 = 7;
+        private int f08 = 8;
+        private int f09 = 9;
+        private int f10 = 10;
+    }
+
+    static class Parent1 {
+        private int field1 = 1;
+    }
+
+    static class Parent2 extends Parent1 {
+        private int field2 = 2;
+    }
+
+    static class Parent3 extends Parent2 {
+        private int field3 = 3;
+    }
+
+    static class LeafClass extends Parent3 {
+        private int valueField = 4;
+    }
+
+    private String serializeValue(Object value, Limits limits) throws Exception {
+        StringBuilder sb = new StringBuilder();
+        SerializerWithLimits serializer = new SerializerWithLimits(
+                new StringTokenWriter(sb, new ArrayList<>()),
+                TimeoutChecker.create(Config.get(), Duration.ofSeconds(300)));
+        serializer.serialize(
+                value, value != null ? value.getClass().getTypeName() : Object.class.getTypeName(), limits);
+        return sb.toString();
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/TestSnapshotListener.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/TestSnapshotListener.java
index 44c626d2fb8..4377cc709ac 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/TestSnapshotListener.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/TestSnapshotListener.java
@@ -9,27 +9,27 @@
 import java.util.List;
 
 public class TestSnapshotListener extends DebuggerSink {
-  public boolean skipped;
-  public DebuggerMetricCollector.SkippedReason reason;
-  public List<Snapshot> snapshots = new ArrayList<>();
+    public boolean skipped;
+    public DebuggerMetricCollector.SkippedReason reason;
+    public List<Snapshot> snapshots = new ArrayList<>();
 
-  public TestSnapshotListener(Config config, ProbeStatusSink probeStatusSink) {
-    super(config, probeStatusSink);
-  }
+    public TestSnapshotListener(Config config, ProbeStatusSink probeStatusSink) {
+        super(config, probeStatusSink);
+    }
 
-  @Override
-  public void skipSnapshot(String probeId, DebuggerMetricCollector.SkippedReason reason) {
-    skipped = true;
-    this.reason = reason;
-  }
+    @Override
+    public void skipSnapshot(String probeId, DebuggerMetricCollector.SkippedReason reason) {
+        skipped = true;
+        this.reason = reason;
+    }
 
-  @Override
-  public void addSnapshot(Snapshot snapshot) {
-    snapshots.add(snapshot);
-  }
+    @Override
+    public void addSnapshot(Snapshot snapshot) {
+        snapshots.add(snapshot);
+    }
 
-  @Override
-  public void addHighRateSnapshot(Snapshot snapshot) {
-    snapshots.add(snapshot);
-  }
+    @Override
+    public void addHighRateSnapshot(Snapshot snapshot) {
+        snapshots.add(snapshot);
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/TestTraceInterceptor.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/TestTraceInterceptor.java
index 776e73e6b09..28d6ad79dbf 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/TestTraceInterceptor.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/TestTraceInterceptor.java
@@ -7,34 +7,33 @@
 import java.util.List;
 
 public class TestTraceInterceptor implements TraceInterceptor {
-  private List<? extends MutableSpan> currentTrace;
-  private List<List<? extends MutableSpan>> allTraces = new ArrayList<>();
+    private List<? extends MutableSpan> currentTrace;
+    private List<List<? extends MutableSpan>> allTraces = new ArrayList<>();
 
-  @Override
-  public Collection<? extends MutableSpan> onTraceComplete(
-      Collection<? extends MutableSpan> trace) {
-    currentTrace = new ArrayList<>(trace);
-    allTraces.add(new ArrayList<>(trace));
-    return trace;
-  }
+    @Override
+    public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
+        currentTrace = new ArrayList<>(trace);
+        allTraces.add(new ArrayList<>(trace));
+        return trace;
+    }
 
-  @Override
-  public int priority() {
-    return 0;
-  }
+    @Override
+    public int priority() {
+        return 0;
+    }
 
-  public List<? extends MutableSpan> getTrace() {
-    return currentTrace;
-  }
+    public List<? extends MutableSpan> getTrace() {
+        return currentTrace;
+    }
 
-  public MutableSpan getFirstSpan() {
-    if (currentTrace == null) {
-      return null;
+    public MutableSpan getFirstSpan() {
+        if (currentTrace == null) {
+            return null;
+        }
+        return currentTrace.iterator().next();
     }
-    return currentTrace.iterator().next();
-  }
 
-  public List<List<? extends MutableSpan>> getAllTraces() {
-    return allTraces;
-  }
+    public List<List<? extends MutableSpan>> getAllTraces() {
+        return allTraces;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ValueScriptHelperTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ValueScriptHelperTest.java
index 2e2a20376b3..d843c5a3a8b 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ValueScriptHelperTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ValueScriptHelperTest.java
@@ -12,27 +12,27 @@
 
 class ValueScriptHelperTest {
 
-  private static final int PROBE_VERSION = 42;
-  private static final ProbeId PROBE_ID = new ProbeId("12fd-8490-c111-4374-ffde", PROBE_VERSION);
-  private static final ProbeLocation PROBE_LOCATION =
-      new ProbeLocation("java.lang.String", "indexOf", "String.java", Arrays.asList("12-15", "23"));
-  private static final ProbeImplementation DUMMY_PROBE =
-      new ProbeImplementation.NoopProbeImplementation(PROBE_ID, PROBE_LOCATION);
-  private static final Limits LIMITS = new Limits(1, 3, 255, 5);
+    private static final int PROBE_VERSION = 42;
+    private static final ProbeId PROBE_ID = new ProbeId("12fd-8490-c111-4374-ffde", PROBE_VERSION);
+    private static final ProbeLocation PROBE_LOCATION =
+            new ProbeLocation("java.lang.String", "indexOf", "String.java", Arrays.asList("12-15", "23"));
+    private static final ProbeImplementation DUMMY_PROBE =
+            new ProbeImplementation.NoopProbeImplementation(PROBE_ID, PROBE_LOCATION);
+    private static final Limits LIMITS = new Limits(1, 3, 255, 5);
 
-  @Test
-  public void nullValue() {
-    CapturedContext.Status status = new CapturedContext.Status(DUMMY_PROBE);
-    StringBuilder sb = new StringBuilder();
-    ValueScriptHelper.serializeValue(sb, "", null, status, LIMITS);
-    assertEquals("null", sb.toString());
-  }
+    @Test
+    public void nullValue() {
+        CapturedContext.Status status = new CapturedContext.Status(DUMMY_PROBE);
+        StringBuilder sb = new StringBuilder();
+        ValueScriptHelper.serializeValue(sb, "", null, status, LIMITS);
+        assertEquals("null", sb.toString());
+    }
 
-  @Test
-  public void basicString() {
-    CapturedContext.Status status = new CapturedContext.Status(DUMMY_PROBE);
-    StringBuilder sb = new StringBuilder();
-    ValueScriptHelper.serializeValue(sb, "", "foo", status, LIMITS);
-    assertEquals("foo", sb.toString());
-  }
+    @Test
+    public void basicString() {
+        CapturedContext.Status status = new CapturedContext.Status(DUMMY_PROBE);
+        StringBuilder sb = new StringBuilder();
+        ValueScriptHelper.serializeValue(sb, "", "foo", status, LIMITS);
+        assertEquals("foo", sb.toString());
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/WeakIdentityHashMapTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/WeakIdentityHashMapTest.java
index 4506625fdc8..0de78dd5e59 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/WeakIdentityHashMapTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/WeakIdentityHashMapTest.java
@@ -9,39 +9,39 @@
 
 class WeakIdentityHashMapTest {
 
-  @Test
-  public void referenceEq() {
-    WeakIdentityHashMap<Object, Object> map = new WeakIdentityHashMap<>();
-    Object key = new BadClass();
-    Object value = new Object();
-    map.put(key, value);
-    assertTrue(map.containsKey(key));
-    assertEquals(value, map.get(key));
-  }
-
-  @Test
-  public void weakKey() {
-    WeakIdentityHashMap<Object, Object> map = new WeakIdentityHashMap<>();
-    map.put(new BadClass(), new Object());
-    System.gc(); // clear weak reference
-    int count = 0;
-    // size method will trigger a check on the reference queue and eventually purge the stale entry
-    while (map.size() > 0 && count < 1000) {
-      LockSupport.parkNanos(Duration.ofMillis(1).toNanos());
-      count++;
+    @Test
+    public void referenceEq() {
+        WeakIdentityHashMap<Object, Object> map = new WeakIdentityHashMap<>();
+        Object key = new BadClass();
+        Object value = new Object();
+        map.put(key, value);
+        assertTrue(map.containsKey(key));
+        assertEquals(value, map.get(key));
     }
-    assertEquals(0, map.size());
-  }
 
-  static class BadClass extends Object {
-    @Override
-    public int hashCode() {
-      return 1;
+    @Test
+    public void weakKey() {
+        WeakIdentityHashMap<Object, Object> map = new WeakIdentityHashMap<>();
+        map.put(new BadClass(), new Object());
+        System.gc(); // clear weak reference
+        int count = 0;
+        // size method will trigger a check on the reference queue and eventually purge the stale entry
+        while (map.size() > 0 && count < 1000) {
+            LockSupport.parkNanos(Duration.ofMillis(1).toNanos());
+            count++;
+        }
+        assertEquals(0, map.size());
     }
 
-    @Override
-    public boolean equals(Object obj) {
-      return false;
+    static class BadClass extends Object {
+        @Override
+        public int hashCode() {
+            return 1;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/utils/InstrumentationTestHelper.java b/dd-java-agent/agent-debugger/src/test/java/utils/InstrumentationTestHelper.java
index 4919e59cdc5..d2e37684480 100644
--- a/dd-java-agent/agent-debugger/src/test/java/utils/InstrumentationTestHelper.java
+++ b/dd-java-agent/agent-debugger/src/test/java/utils/InstrumentationTestHelper.java
@@ -24,93 +24,83 @@
 import java.util.Map;
 
 public class InstrumentationTestHelper {
-  public static Class<?> loadClass(String className, Map<String, byte[]> classFileBuffers) {
-    ClassLoader classLoader =
-        new MemClassLoader(CapturedSnapshotTest.class.getClassLoader(), classFileBuffers);
-    try {
-      return classLoader.loadClass(className);
-    } catch (ClassNotFoundException e) {
-      throw new RuntimeException(e);
+    public static Class<?> loadClass(String className, Map<String, byte[]> classFileBuffers) {
+        ClassLoader classLoader = new MemClassLoader(CapturedSnapshotTest.class.getClassLoader(), classFileBuffers);
+        try {
+            return classLoader.loadClass(className);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  public static Class<?> compileAndLoadClass(String className)
-      throws IOException, URISyntaxException {
-    Map<String, byte[]> classFileBuffers = compile(className);
-    return loadClass(className, classFileBuffers);
-  }
+    public static Class<?> compileAndLoadClass(String className) throws IOException, URISyntaxException {
+        Map<String, byte[]> classFileBuffers = compile(className);
+        return loadClass(className, classFileBuffers);
+    }
 
-  public static Class<?> compileAndLoadClass(String className, String version)
-      throws IOException, URISyntaxException {
-    Map<String, byte[]> classFileBuffers = compile(className, version);
-    return loadClass(className, classFileBuffers);
-  }
+    public static Class<?> compileAndLoadClass(String className, String version)
+            throws IOException, URISyntaxException {
+        Map<String, byte[]> classFileBuffers = compile(className, version);
+        return loadClass(className, classFileBuffers);
+    }
 
-  public static Map<String, byte[]> compile(String className)
-      throws IOException, URISyntaxException {
-    return compile(className, SourceCompiler.DebugInfo.ALL, "8");
-  }
+    public static Map<String, byte[]> compile(String className) throws IOException, URISyntaxException {
+        return compile(className, SourceCompiler.DebugInfo.ALL, "8");
+    }
 
-  public static Map<String, byte[]> compile(String className, String version)
-      throws IOException, URISyntaxException {
-    return compile(className, SourceCompiler.DebugInfo.ALL, version);
-  }
+    public static Map<String, byte[]> compile(String className, String version) throws IOException, URISyntaxException {
+        return compile(className, SourceCompiler.DebugInfo.ALL, version);
+    }
 
-  public static Map<String, byte[]> compile(
-      String className, SourceCompiler.DebugInfo debugInfo, String version)
-      throws IOException, URISyntaxException {
-    return compile(className, debugInfo, version, Collections.emptyList());
-  }
+    public static Map<String, byte[]> compile(String className, SourceCompiler.DebugInfo debugInfo, String version)
+            throws IOException, URISyntaxException {
+        return compile(className, debugInfo, version, Collections.emptyList());
+    }
 
-  public static Map<String, byte[]> compile(
-      String className,
-      SourceCompiler.DebugInfo debugInfo,
-      String version,
-      List<String> additionalOptions)
-      throws IOException, URISyntaxException {
-    String classSource = getFixtureContent("/" + className.replace('.', '/') + ".java");
-    return SourceCompiler.compile(className, classSource, debugInfo, version, additionalOptions);
-  }
+    public static Map<String, byte[]> compile(
+            String className, SourceCompiler.DebugInfo debugInfo, String version, List<String> additionalOptions)
+            throws IOException, URISyntaxException {
+        String classSource = getFixtureContent("/" + className.replace('.', '/') + ".java");
+        return SourceCompiler.compile(className, classSource, debugInfo, version, additionalOptions);
+    }
 
-  public static Class<?> loadClass(String className, String classFileName) throws IOException {
-    Map<String, byte[]> classFileBuffers = new HashMap<>();
-    byte[] buffer = Files.readAllBytes(Paths.get(classFileName));
-    classFileBuffers.put(className, buffer);
-    return loadClass(className, classFileBuffers);
-  }
+    public static Class<?> loadClass(String className, String classFileName) throws IOException {
+        Map<String, byte[]> classFileBuffers = new HashMap<>();
+        byte[] buffer = Files.readAllBytes(Paths.get(classFileName));
+        classFileBuffers.put(className, buffer);
+        return loadClass(className, classFileBuffers);
+    }
 
-  public static Class<?> loadClassFromJar(String className, String jarFileName)
-      throws ClassNotFoundException, MalformedURLException {
-    URLClassLoader jarClassLoader =
-        new URLClassLoader(new URL[] {new URL("file://" + jarFileName)});
-    return jarClassLoader.loadClass(className);
-  }
+    public static Class<?> loadClassFromJar(String className, String jarFileName)
+            throws ClassNotFoundException, MalformedURLException {
+        URLClassLoader jarClassLoader = new URLClassLoader(new URL[] {new URL("file://" + jarFileName)});
+        return jarClassLoader.loadClass(className);
+    }
 
-  public static int getLineForLineProbe(String className, ProbeId lineProbeId) {
-    return getLineForLineProbe(className, ".java", lineProbeId);
-  }
+    public static int getLineForLineProbe(String className, ProbeId lineProbeId) {
+        return getLineForLineProbe(className, ".java", lineProbeId);
+    }
 
-  /**
-   * Installs the real tracer instrumentation modules (e.g. jax-rs-annotations) on top of the given
-   * {@link Instrumentation}, so that classes defined afterwards (typically via {@link
-   * #compileAndLoadClass}) are woven with actual tracer advice, the same way they would be by the
-   * production agent. Callers must remove the returned transformer once done, e.g. via {@link
-   * Instrumentation#removeTransformer(ClassFileTransformer)}.
-   */
-  public static ClassFileTransformer installTracerInstrumentation(Instrumentation instr) {
-    ClassInjector.enableClassInjection(instr);
-    return AgentInstaller.installBytebuddyAgent(
-        instr, false, EnumSet.of(InstrumenterModule.TargetSystem.TRACING));
-  }
+    /**
+     * Installs the real tracer instrumentation modules (e.g. jax-rs-annotations) on top of the given
+     * {@link Instrumentation}, so that classes defined afterwards (typically via {@link
+     * #compileAndLoadClass}) are woven with actual tracer advice, the same way they would be by the
+     * production agent. Callers must remove the returned transformer once done, e.g. via {@link
+     * Instrumentation#removeTransformer(ClassFileTransformer)}.
+     */
+    public static ClassFileTransformer installTracerInstrumentation(Instrumentation instr) {
+        ClassInjector.enableClassInjection(instr);
+        return AgentInstaller.installBytebuddyAgent(instr, false, EnumSet.of(InstrumenterModule.TargetSystem.TRACING));
+    }
 
-  public static int getLineForLineProbe(String className, String ext, ProbeId lineProbeId) {
-    List<String> lines = getFixtureLines("/" + className.replace('.', '/') + ext);
-    for (int i = 0; i < lines.size(); i++) {
-      String line = lines.get(i);
-      if (line.contains("//") && line.contains(lineProbeId.getId())) {
-        return i + 1;
-      }
+    public static int getLineForLineProbe(String className, String ext, ProbeId lineProbeId) {
+        List<String> lines = getFixtureLines("/" + className.replace('.', '/') + ext);
+        for (int i = 0; i < lines.size(); i++) {
+            String line = lines.get(i);
+            if (line.contains("//") && line.contains(lineProbeId.getId())) {
+                return i + 1;
+            }
+        }
+        return -1;
     }
-    return -1;
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/utils/JavaSourceFromString.java b/dd-java-agent/agent-debugger/src/test/java/utils/JavaSourceFromString.java
index 1fe61ecc32f..b91d0435aee 100644
--- a/dd-java-agent/agent-debugger/src/test/java/utils/JavaSourceFromString.java
+++ b/dd-java-agent/agent-debugger/src/test/java/utils/JavaSourceFromString.java
@@ -4,15 +4,15 @@
 import javax.tools.SimpleJavaFileObject;
 
 public class JavaSourceFromString extends SimpleJavaFileObject {
-  final String code;
+    final String code;
 
-  public JavaSourceFromString(String name, String code) {
-    super(URI.create("string:///" + name.replace('.', '/') + Kind.SOURCE.extension), Kind.SOURCE);
-    this.code = code;
-  }
+    public JavaSourceFromString(String name, String code) {
+        super(URI.create("string:///" + name.replace('.', '/') + Kind.SOURCE.extension), Kind.SOURCE);
+        this.code = code;
+    }
 
-  @Override
-  public CharSequence getCharContent(boolean ignoreEncodingErrors) {
-    return code;
-  }
+    @Override
+    public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+        return code;
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/utils/MemClassLoader.java b/dd-java-agent/agent-debugger/src/test/java/utils/MemClassLoader.java
index f7e36163372..368f17afc79 100644
--- a/dd-java-agent/agent-debugger/src/test/java/utils/MemClassLoader.java
+++ b/dd-java-agent/agent-debugger/src/test/java/utils/MemClassLoader.java
@@ -4,19 +4,19 @@
 
 // Custom ClassLoader to be able to load nested classes
 class MemClassLoader extends ClassLoader {
-  private final Map<String, byte[]> classFileBuffers;
+    private final Map<String, byte[]> classFileBuffers;
 
-  public MemClassLoader(ClassLoader parent, Map<String, byte[]> classFileBuffers) {
-    super(parent);
-    this.classFileBuffers = classFileBuffers;
-  }
+    public MemClassLoader(ClassLoader parent, Map<String, byte[]> classFileBuffers) {
+        super(parent);
+        this.classFileBuffers = classFileBuffers;
+    }
 
-  @Override
-  protected Class<?> findClass(String name) throws ClassNotFoundException {
-    byte[] buffer = classFileBuffers.get(name);
-    if (buffer == null) {
-      throw new ClassNotFoundException(name);
+    @Override
+    protected Class<?> findClass(String name) throws ClassNotFoundException {
+        byte[] buffer = classFileBuffers.get(name);
+        if (buffer == null) {
+            throw new ClassNotFoundException(name);
+        }
+        return defineClass(name, buffer, 0, buffer.length);
     }
-    return defineClass(name, buffer, 0, buffer.length);
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/utils/MemoryJavaFileManager.java b/dd-java-agent/agent-debugger/src/test/java/utils/MemoryJavaFileManager.java
index 29f1c5a6939..8a831a13d35 100644
--- a/dd-java-agent/agent-debugger/src/test/java/utils/MemoryJavaFileManager.java
+++ b/dd-java-agent/agent-debugger/src/test/java/utils/MemoryJavaFileManager.java
@@ -16,75 +16,72 @@
 
 public final class MemoryJavaFileManager extends ForwardingJavaFileManager<JavaFileManager> {
 
-  private Map<String, byte[]> classBytes;
+    private Map<String, byte[]> classBytes;
 
-  public MemoryJavaFileManager(JavaFileManager fileManager) {
-    super(fileManager);
-    classBytes = new HashMap<>();
-  }
+    public MemoryJavaFileManager(JavaFileManager fileManager) {
+        super(fileManager);
+        classBytes = new HashMap<>();
+    }
 
-  static URI toURI(String name) {
-    File file = new File(name);
-    if (file.exists()) {
-      return file.toURI();
-    } else {
-      try {
-        return URI.create("mfm:///" + name);
-      } catch (Exception exp) {
-        return URI.create("mfm:///org/openjdk/btrace/script/java/java_source");
-      }
+    static URI toURI(String name) {
+        File file = new File(name);
+        if (file.exists()) {
+            return file.toURI();
+        } else {
+            try {
+                return URI.create("mfm:///" + name);
+            } catch (Exception exp) {
+                return URI.create("mfm:///org/openjdk/btrace/script/java/java_source");
+            }
+        }
     }
-  }
 
-  public Map<String, byte[]> getClassBytes() {
-    return classBytes;
-  }
+    public Map<String, byte[]> getClassBytes() {
+        return classBytes;
+    }
 
-  @Override
-  public void close() throws IOException {
-    classBytes = new HashMap<>();
-  }
+    @Override
+    public void close() throws IOException {
+        classBytes = new HashMap<>();
+    }
 
-  @Override
-  public void flush() throws IOException {}
+    @Override
+    public void flush() throws IOException {}
 
-  @Override
-  public JavaFileObject getJavaFileForOutput(
-      JavaFileManager.Location location,
-      String className,
-      JavaFileObject.Kind kind,
-      FileObject sibling)
-      throws IOException {
-    if (kind == JavaFileObject.Kind.CLASS) {
-      return new ClassOutputBuffer(className);
-    } else {
-      return super.getJavaFileForOutput(location, className, kind, sibling);
+    @Override
+    public JavaFileObject getJavaFileForOutput(
+            JavaFileManager.Location location, String className, JavaFileObject.Kind kind, FileObject sibling)
+            throws IOException {
+        if (kind == JavaFileObject.Kind.CLASS) {
+            return new ClassOutputBuffer(className);
+        } else {
+            return super.getJavaFileForOutput(location, className, kind, sibling);
+        }
     }
-  }
-
-  /** A file object used to represent Java source coming from a string. */
 
-  /** A file object that stores Java bytecode into the classBytes map. */
-  private class ClassOutputBuffer extends SimpleJavaFileObject {
+    /** A file object used to represent Java source coming from a string. */
 
-    private final String name;
+    /** A file object that stores Java bytecode into the classBytes map. */
+    private class ClassOutputBuffer extends SimpleJavaFileObject {
 
-    ClassOutputBuffer(String name) {
-      super(toURI(name), Kind.CLASS);
-      this.name = name;
-    }
+        private final String name;
 
-    @Override
-    public OutputStream openOutputStream() {
-      return new FilterOutputStream(new ByteArrayOutputStream()) {
+        ClassOutputBuffer(String name) {
+            super(toURI(name), Kind.CLASS);
+            this.name = name;
+        }
 
         @Override
-        public void close() throws IOException {
-          out.close();
-          ByteArrayOutputStream bos = (ByteArrayOutputStream) out;
-          classBytes.put(name, bos.toByteArray());
+        public OutputStream openOutputStream() {
+            return new FilterOutputStream(new ByteArrayOutputStream()) {
+
+                @Override
+                public void close() throws IOException {
+                    out.close();
+                    ByteArrayOutputStream bos = (ByteArrayOutputStream) out;
+                    classBytes.put(name, bos.toByteArray());
+                }
+            };
         }
-      };
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/utils/SourceCompiler.java b/dd-java-agent/agent-debugger/src/test/java/utils/SourceCompiler.java
index e2ed7f9b6cb..e81098c06c1 100644
--- a/dd-java-agent/agent-debugger/src/test/java/utils/SourceCompiler.java
+++ b/dd-java-agent/agent-debugger/src/test/java/utils/SourceCompiler.java
@@ -10,63 +10,54 @@
 import javax.tools.ToolProvider;
 
 public final class SourceCompiler {
-  public enum DebugInfo {
-    LINES,
-    VARIABLES,
-    ALL,
-    NONE
-  }
+    public enum DebugInfo {
+        LINES,
+        VARIABLES,
+        ALL,
+        NONE
+    }
 
-  public static Map<String, byte[]> compile(
-      String className,
-      String source,
-      DebugInfo debug,
-      String version,
-      List<String> additionalOptions) {
-    JavaCompiler jc = ToolProvider.getSystemJavaCompiler();
-    if (jc == null) throw new RuntimeException("Compiler unavailable");
+    public static Map<String, byte[]> compile(
+            String className, String source, DebugInfo debug, String version, List<String> additionalOptions) {
+        JavaCompiler jc = ToolProvider.getSystemJavaCompiler();
+        if (jc == null) throw new RuntimeException("Compiler unavailable");
 
-    JavaSourceFromString jsfs = new JavaSourceFromString(className, source);
+        JavaSourceFromString jsfs = new JavaSourceFromString(className, source);
 
-    Iterable<? extends JavaFileObject> fileObjects = Collections.singletonList(jsfs);
+        Iterable<? extends JavaFileObject> fileObjects = Collections.singletonList(jsfs);
 
-    List<String> options = new ArrayList<>(additionalOptions);
-    switch (debug) {
-      case ALL:
-        {
-          options.add("-g");
-          break;
-        }
-      case VARIABLES:
-        {
-          options.add("-g:vars");
-          break;
-        }
-      case LINES:
-        {
-          options.add("-g:lines");
-          break;
+        List<String> options = new ArrayList<>(additionalOptions);
+        switch (debug) {
+            case ALL: {
+                options.add("-g");
+                break;
+            }
+            case VARIABLES: {
+                options.add("-g:vars");
+                break;
+            }
+            case LINES: {
+                options.add("-g:lines");
+                break;
+            }
+            case NONE: {
+                options.add("-g:none");
+                break;
+            }
         }
-      case NONE:
-        {
-          options.add("-g:none");
-          break;
-        }
-    }
-    options.add("-target");
-    options.add(version);
-    options.add("-source");
-    options.add(version);
-    options.add("-cp");
-    options.add(System.getProperty("java.class.path"));
+        options.add("-target");
+        options.add(version);
+        options.add("-source");
+        options.add(version);
+        options.add("-cp");
+        options.add(System.getProperty("java.class.path"));
 
-    StringWriter output = new StringWriter();
-    MemoryJavaFileManager fileManager =
-        new MemoryJavaFileManager(jc.getStandardFileManager(null, null, null));
-    if (jc.getTask(output, fileManager, null, options, null, fileObjects).call()) {
-      return fileManager.getClassBytes();
-    } else {
-      throw new RuntimeException("Compilation failed :" + output);
+        StringWriter output = new StringWriter();
+        MemoryJavaFileManager fileManager = new MemoryJavaFileManager(jc.getStandardFileManager(null, null, null));
+        if (jc.getTask(output, fileManager, null, options, null, fileObjects).call()) {
+            return fileManager.getClassBytes();
+        } else {
+            throw new RuntimeException("Compilation failed :" + output);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/utils/TestClassFileHelper.java b/dd-java-agent/agent-debugger/src/test/java/utils/TestClassFileHelper.java
index 832ab0aef85..662f622a0f9 100644
--- a/dd-java-agent/agent-debugger/src/test/java/utils/TestClassFileHelper.java
+++ b/dd-java-agent/agent-debugger/src/test/java/utils/TestClassFileHelper.java
@@ -8,18 +8,18 @@
 import java.net.URL;
 
 public class TestClassFileHelper {
-  public static byte[] getClassFileBytes(Class<?> clazz) {
-    URL resource = clazz.getResource("/" + getResourceName(clazz.getTypeName()));
-    byte[] buffer = new byte[4096];
-    ByteArrayOutputStream os = new ByteArrayOutputStream();
-    try (InputStream is = resource.openStream()) {
-      int readBytes;
-      while ((readBytes = is.read(buffer)) != -1) {
-        os.write(buffer, 0, readBytes);
-      }
-    } catch (IOException e) {
-      e.printStackTrace();
+    public static byte[] getClassFileBytes(Class<?> clazz) {
+        URL resource = clazz.getResource("/" + getResourceName(clazz.getTypeName()));
+        byte[] buffer = new byte[4096];
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        try (InputStream is = resource.openStream()) {
+            int readBytes;
+            while ((readBytes = is.read(buffer)) != -1) {
+                os.write(buffer, 0, readBytes);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return os.toByteArray();
     }
-    return os.toByteArray();
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/test/java/utils/TestHelper.java b/dd-java-agent/agent-debugger/src/test/java/utils/TestHelper.java
index ea96d90398e..4c5258cfd31 100644
--- a/dd-java-agent/agent-debugger/src/test/java/utils/TestHelper.java
+++ b/dd-java-agent/agent-debugger/src/test/java/utils/TestHelper.java
@@ -12,38 +12,40 @@
 import java.util.function.BooleanSupplier;
 
 public class TestHelper {
-  public static String getFixtureContent(String fixture) throws IOException, URISyntaxException {
-    return new String(Files.readAllBytes(Paths.get(TestHelper.class.getResource(fixture).toURI())));
-  }
+    public static String getFixtureContent(String fixture) throws IOException, URISyntaxException {
+        return new String(Files.readAllBytes(
+                Paths.get(TestHelper.class.getResource(fixture).toURI())));
+    }
 
-  public static List<String> getFixtureLines(String fixture) {
-    try {
-      return Files.readAllLines(Paths.get(TestHelper.class.getResource(fixture).toURI()));
-    } catch (Exception e) {
-      throw new RuntimeException(e.getMessage(), e);
+    public static List<String> getFixtureLines(String fixture) {
+        try {
+            return Files.readAllLines(
+                    Paths.get(TestHelper.class.getResource(fixture).toURI()));
+        } catch (Exception e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
     }
-  }
 
-  public static void setFieldInConfig(Object target, String fieldName, Object value) {
-    try {
-      Field field = target.getClass().getDeclaredField(fieldName);
-      field.setAccessible(true);
-      field.set(target, value); // TODO: JEP 500 - avoid mutating final fields
-    } catch (Throwable e) {
-      e.printStackTrace();
+    public static void setFieldInConfig(Object target, String fieldName, Object value) {
+        try {
+            Field field = target.getClass().getDeclaredField(fieldName);
+            field.setAccessible(true);
+            field.set(target, value); // TODO: JEP 500 - avoid mutating final fields
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
     }
-  }
 
-  public static void assertWithTimeout(BooleanSupplier predicate, Duration timeout) {
-    Duration sleepTime = Duration.ofMillis(10);
-    long count = timeout.toMillis() / sleepTime.toMillis();
-    while (count-- > 0 && !predicate.getAsBoolean()) {
-      try {
-        Thread.sleep(sleepTime.toMillis());
-      } catch (InterruptedException e) {
-        throw new RuntimeException(e);
-      }
+    public static void assertWithTimeout(BooleanSupplier predicate, Duration timeout) {
+        Duration sleepTime = Duration.ofMillis(10);
+        long count = timeout.toMillis() / sleepTime.toMillis();
+        while (count-- > 0 && !predicate.getAsBoolean()) {
+            try {
+                Thread.sleep(sleepTime.toMillis());
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        assertTrue(predicate.getAsBoolean());
     }
-    assertTrue(predicate.getAsBoolean());
-  }
 }
diff --git a/dd-java-agent/agent-debugger/src/testFixtures/java/com/datadog/debugger/util/LogProbeTestHelper.java b/dd-java-agent/agent-debugger/src/testFixtures/java/com/datadog/debugger/util/LogProbeTestHelper.java
index a8aec6b3c43..71bbd345a21 100644
--- a/dd-java-agent/agent-debugger/src/testFixtures/java/com/datadog/debugger/util/LogProbeTestHelper.java
+++ b/dd-java-agent/agent-debugger/src/testFixtures/java/com/datadog/debugger/util/LogProbeTestHelper.java
@@ -9,45 +9,45 @@
 
 public class LogProbeTestHelper {
 
-  public static List<LogProbe.Segment> parseTemplate(String template) {
-    if (template == null) {
-      return Collections.emptyList();
-    }
-    List<LogProbe.Segment> result = new ArrayList<>();
-    int currentIdx = 0;
-    int startStrIdx = 0;
-    do {
-      int startIdx = template.indexOf('{', currentIdx);
-      if (startIdx == -1) {
-        addStrSegment(result, template.substring(startStrIdx));
-        return result;
-      }
-      if (startIdx + 1 < template.length() && template.charAt(startIdx + 1) == '{') {
-        currentIdx = startIdx + 2;
-        continue;
-      }
-      int endIdx = template.indexOf('}', startIdx);
-      if (endIdx == -1) {
-        addStrSegment(result, template.substring(startStrIdx));
-        currentIdx = startIdx + 1;
-        startStrIdx = currentIdx;
-      } else {
-        if (startStrIdx != startIdx) {
-          addStrSegment(result, template.substring(startStrIdx, startIdx));
+    public static List<LogProbe.Segment> parseTemplate(String template) {
+        if (template == null) {
+            return Collections.emptyList();
         }
-        String expr = template.substring(startIdx + 1, endIdx);
+        List<LogProbe.Segment> result = new ArrayList<>();
+        int currentIdx = 0;
+        int startStrIdx = 0;
+        do {
+            int startIdx = template.indexOf('{', currentIdx);
+            if (startIdx == -1) {
+                addStrSegment(result, template.substring(startStrIdx));
+                return result;
+            }
+            if (startIdx + 1 < template.length() && template.charAt(startIdx + 1) == '{') {
+                currentIdx = startIdx + 2;
+                continue;
+            }
+            int endIdx = template.indexOf('}', startIdx);
+            if (endIdx == -1) {
+                addStrSegment(result, template.substring(startStrIdx));
+                currentIdx = startIdx + 1;
+                startStrIdx = currentIdx;
+            } else {
+                if (startStrIdx != startIdx) {
+                    addStrSegment(result, template.substring(startStrIdx, startIdx));
+                }
+                String expr = template.substring(startIdx + 1, endIdx);
 
-        result.add(new LogProbe.Segment(new ValueScript(ValueScript.parseRefPath(expr), expr)));
-        currentIdx = endIdx + 1;
-        startStrIdx = currentIdx;
-      }
-    } while (currentIdx < template.length());
-    return result;
-  }
+                result.add(new LogProbe.Segment(new ValueScript(ValueScript.parseRefPath(expr), expr)));
+                currentIdx = endIdx + 1;
+                startStrIdx = currentIdx;
+            }
+        } while (currentIdx < template.length());
+        return result;
+    }
 
-  private static void addStrSegment(List<LogProbe.Segment> segments, String str) {
-    str = Strings.replace(str, "{{", "{");
-    str = Strings.replace(str, "}}", "}");
-    segments.add(new LogProbe.Segment(str));
-  }
+    private static void addStrSegment(List<LogProbe.Segment> segments, String str) {
+        str = Strings.replace(str, "{{", "{");
+        str = Strings.replace(str, "}}", "}");
+        segments.add(new LogProbe.Segment(str));
+    }
 }
diff --git a/dd-java-agent/agent-debugger/src/testFixtures/java/com/datadog/debugger/util/MoshiSnapshotTestHelper.java b/dd-java-agent/agent-debugger/src/testFixtures/java/com/datadog/debugger/util/MoshiSnapshotTestHelper.java
index 80c0931d236..2e69cba47d8 100644
--- a/dd-java-agent/agent-debugger/src/testFixtures/java/com/datadog/debugger/util/MoshiSnapshotTestHelper.java
+++ b/dd-java-agent/agent-debugger/src/testFixtures/java/com/datadog/debugger/util/MoshiSnapshotTestHelper.java
@@ -52,556 +52,537 @@
 
 public class MoshiSnapshotTestHelper {
 
-  public static final JsonAdapter<CapturedContext.CapturedValue> VALUE_ADAPTER =
-      new MoshiSnapshotTestHelper.CapturedValueAdapter();
+    public static final JsonAdapter<CapturedContext.CapturedValue> VALUE_ADAPTER =
+            new MoshiSnapshotTestHelper.CapturedValueAdapter();
 
-  public static CapturedContext.CapturedValue deserializeCapturedValue(
-      CapturedContext.CapturedValue capturedValue) {
-    try {
-      return VALUE_ADAPTER.fromJson(capturedValue.getStrValue());
-    } catch (IOException e) {
-      e.printStackTrace();
-      return null;
+    public static CapturedContext.CapturedValue deserializeCapturedValue(CapturedContext.CapturedValue capturedValue) {
+        try {
+            return VALUE_ADAPTER.fromJson(capturedValue.getStrValue());
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
     }
-  }
 
-  public static String getValue(CapturedContext.CapturedValue capturedValue) {
-    CapturedContext.CapturedValue valued = null;
-    try {
-      Object obj;
-      if (capturedValue.getStrValue() != null) {
-        valued = VALUE_ADAPTER.fromJson(capturedValue.getStrValue());
-        if (valued.getNotCapturedReason() != null) {
-          Assertions.fail("NotCapturedReason: " + valued.getNotCapturedReason());
-        }
-        obj = valued.getValue();
-      } else {
-        obj = capturedValue.getValue();
-      }
-      if (obj != null && obj.getClass().isArray()) {
-        if (obj.getClass().getComponentType().isPrimitive()) {
-          return primitiveArrayToString(obj);
+    public static String getValue(CapturedContext.CapturedValue capturedValue) {
+        CapturedContext.CapturedValue valued = null;
+        try {
+            Object obj;
+            if (capturedValue.getStrValue() != null) {
+                valued = VALUE_ADAPTER.fromJson(capturedValue.getStrValue());
+                if (valued.getNotCapturedReason() != null) {
+                    Assertions.fail("NotCapturedReason: " + valued.getNotCapturedReason());
+                }
+                obj = valued.getValue();
+            } else {
+                obj = capturedValue.getValue();
+            }
+            if (obj != null && obj.getClass().isArray()) {
+                if (obj.getClass().getComponentType().isPrimitive()) {
+                    return primitiveArrayToString(obj);
+                }
+                return Arrays.toString((Object[]) obj);
+            }
+            return obj != null ? String.valueOf(obj) : null;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
         }
-        return Arrays.toString((Object[]) obj);
-      }
-      return obj != null ? String.valueOf(obj) : null;
-    } catch (IOException e) {
-      e.printStackTrace();
-      return null;
     }
-  }
 
-  public static class SnapshotJsonFactory implements JsonAdapter.Factory {
-    private final Duration captureTimeOut;
+    public static class SnapshotJsonFactory implements JsonAdapter.Factory {
+        private final Duration captureTimeOut;
 
-    public SnapshotJsonFactory(Duration captureTimeout) {
-      this.captureTimeOut = captureTimeout;
-    }
+        public SnapshotJsonFactory(Duration captureTimeout) {
+            this.captureTimeOut = captureTimeout;
+        }
 
-    @Override
-    public JsonAdapter<?> create(Type type, Set<? extends Annotation> set, Moshi moshi) {
-      if (Types.equals(type, Snapshot.Captures.class)) {
-        return new MoshiSnapshotTestHelper.CapturesAdapter(
-            moshi,
-            captureTimeOut,
-            new CapturedContextAdapter(
-                moshi, new CapturedValueAdapter(), new CapturedThrowableAdapter(moshi)));
-      }
-      if (Types.equals(type, CapturedContext.CapturedValue.class)) {
-        return new MoshiSnapshotTestHelper.CapturedValueAdapter();
-      }
-      if (Types.equals(type, CapturedContext.class)) {
-        return new MoshiSnapshotTestHelper.CapturedContextAdapter(
-            moshi, new CapturedValueAdapter(), new CapturedThrowableAdapter(moshi));
-      }
-      if (Types.equals(type, ProbeImplementation.class)) {
-        return new MoshiSnapshotTestHelper.ProbeDetailsAdapter(moshi);
-      }
-      return null;
+        @Override
+        public JsonAdapter<?> create(Type type, Set<? extends Annotation> set, Moshi moshi) {
+            if (Types.equals(type, Snapshot.Captures.class)) {
+                return new MoshiSnapshotTestHelper.CapturesAdapter(
+                        moshi,
+                        captureTimeOut,
+                        new CapturedContextAdapter(
+                                moshi, new CapturedValueAdapter(), new CapturedThrowableAdapter(moshi)));
+            }
+            if (Types.equals(type, CapturedContext.CapturedValue.class)) {
+                return new MoshiSnapshotTestHelper.CapturedValueAdapter();
+            }
+            if (Types.equals(type, CapturedContext.class)) {
+                return new MoshiSnapshotTestHelper.CapturedContextAdapter(
+                        moshi, new CapturedValueAdapter(), new CapturedThrowableAdapter(moshi));
+            }
+            if (Types.equals(type, ProbeImplementation.class)) {
+                return new MoshiSnapshotTestHelper.ProbeDetailsAdapter(moshi);
+            }
+            return null;
+        }
     }
-  }
-
-  public static Moshi createMoshiSnapshot() {
-    // By default, for tests we have a capture timeout of 5 seconds
-    return new Moshi.Builder()
-        .add(new MoshiSnapshotTestHelper.SnapshotJsonFactory(Duration.of(5, ChronoUnit.SECONDS)))
-        .add(
-            DebuggerScript.class,
-            new ProbeCondition.ProbeConditionJsonAdapter()) // ProbeDetails in Snapshot
-        .build();
-  }
 
-  private static String primitiveArrayToString(Object obj) {
-    Class<?> componentType = obj.getClass().getComponentType();
-    if (componentType == long.class) {
-      return Arrays.toString((long[]) obj);
-    }
-    if (componentType == int.class) {
-      return Arrays.toString((int[]) obj);
-    }
-    if (componentType == short.class) {
-      return Arrays.toString((short[]) obj);
-    }
-    if (componentType == char.class) {
-      return Arrays.toString((char[]) obj);
-    }
-    if (componentType == byte.class) {
-      return Arrays.toString((byte[]) obj);
+    public static Moshi createMoshiSnapshot() {
+        // By default, for tests we have a capture timeout of 5 seconds
+        return new Moshi.Builder()
+                .add(new MoshiSnapshotTestHelper.SnapshotJsonFactory(Duration.of(5, ChronoUnit.SECONDS)))
+                .add(DebuggerScript.class, new ProbeCondition.ProbeConditionJsonAdapter()) // ProbeDetails in Snapshot
+                .build();
     }
-    if (componentType == boolean.class) {
-      return Arrays.toString((boolean[]) obj);
-    }
-    if (componentType == float.class) {
-      return Arrays.toString((float[]) obj);
-    }
-    if (componentType == double.class) {
-      return Arrays.toString((double[]) obj);
+
+    private static String primitiveArrayToString(Object obj) {
+        Class<?> componentType = obj.getClass().getComponentType();
+        if (componentType == long.class) {
+            return Arrays.toString((long[]) obj);
+        }
+        if (componentType == int.class) {
+            return Arrays.toString((int[]) obj);
+        }
+        if (componentType == short.class) {
+            return Arrays.toString((short[]) obj);
+        }
+        if (componentType == char.class) {
+            return Arrays.toString((char[]) obj);
+        }
+        if (componentType == byte.class) {
+            return Arrays.toString((byte[]) obj);
+        }
+        if (componentType == boolean.class) {
+            return Arrays.toString((boolean[]) obj);
+        }
+        if (componentType == float.class) {
+            return Arrays.toString((float[]) obj);
+        }
+        if (componentType == double.class) {
+            return Arrays.toString((double[]) obj);
+        }
+        return null;
     }
-    return null;
-  }
 
-  private static class CapturesAdapter extends MoshiSnapshotHelper.CapturesAdapter {
+    private static class CapturesAdapter extends MoshiSnapshotHelper.CapturesAdapter {
 
-    public CapturesAdapter(
-        Moshi moshi, Duration captureTimeout, JsonAdapter<CapturedContext> capturedContextAdapter) {
-      super(moshi, captureTimeout, capturedContextAdapter);
-    }
+        public CapturesAdapter(
+                Moshi moshi, Duration captureTimeout, JsonAdapter<CapturedContext> capturedContextAdapter) {
+            super(moshi, captureTimeout, capturedContextAdapter);
+        }
 
-    @Override
-    public Snapshot.Captures fromJson(JsonReader jsonReader) throws IOException {
-      jsonReader.beginObject();
-      Snapshot.Captures captures = new Snapshot.Captures();
-      while (jsonReader.hasNext()) {
-        String name = jsonReader.nextName();
-        switch (name) {
-          case ENTRY:
-            captures.setEntry(capturedContextAdapter.fromJson(jsonReader));
-            break;
-          case RETURN:
-            captures.setReturn(capturedContextAdapter.fromJson(jsonReader));
-            break;
-          case LINES:
-            Map<Integer, CapturedContext> map = linesAdapter.fromJson(jsonReader);
-            if (map != null) {
-              map.forEach(captures::addLine);
+        @Override
+        public Snapshot.Captures fromJson(JsonReader jsonReader) throws IOException {
+            jsonReader.beginObject();
+            Snapshot.Captures captures = new Snapshot.Captures();
+            while (jsonReader.hasNext()) {
+                String name = jsonReader.nextName();
+                switch (name) {
+                    case ENTRY:
+                        captures.setEntry(capturedContextAdapter.fromJson(jsonReader));
+                        break;
+                    case RETURN:
+                        captures.setReturn(capturedContextAdapter.fromJson(jsonReader));
+                        break;
+                    case LINES:
+                        Map<Integer, CapturedContext> map = linesAdapter.fromJson(jsonReader);
+                        if (map != null) {
+                            map.forEach(captures::addLine);
+                        }
+                        break;
+                    case CAUGHT_EXCEPTIONS:
+                        List<CapturedContext.CapturedThrowable> capturedThrowables =
+                                caughtExceptionsAdapter.fromJson(jsonReader);
+                        capturedThrowables.forEach(captures::addCaughtException);
+                        break;
+                    default:
+                        throw new IllegalArgumentException("Unknown field name for Captures object: " + name);
+                }
             }
-            break;
-          case CAUGHT_EXCEPTIONS:
-            List<CapturedContext.CapturedThrowable> capturedThrowables =
-                caughtExceptionsAdapter.fromJson(jsonReader);
-            capturedThrowables.forEach(captures::addCaughtException);
-            break;
-          default:
-            throw new IllegalArgumentException("Unknown field name for Captures object: " + name);
+            jsonReader.endObject();
+            return captures;
         }
-      }
-      jsonReader.endObject();
-      return captures;
     }
-  }
 
-  public static class CapturedContextAdapter extends MoshiSnapshotHelper.CapturedContextAdapter {
-    private static final CapturedContext.CapturedValue[] EMPTY_VALUES_ARRAY =
-        new CapturedContext.CapturedValue[0];
+    public static class CapturedContextAdapter extends MoshiSnapshotHelper.CapturedContextAdapter {
+        private static final CapturedContext.CapturedValue[] EMPTY_VALUES_ARRAY = new CapturedContext.CapturedValue[0];
 
-    public CapturedContextAdapter(
-        Moshi moshi,
-        JsonAdapter<CapturedContext.CapturedValue> valueAdapter,
-        MoshiSnapshotHelper.CapturedThrowableAdapter throwableAdapter) {
-      super(moshi, valueAdapter, throwableAdapter);
-    }
+        public CapturedContextAdapter(
+                Moshi moshi,
+                JsonAdapter<CapturedContext.CapturedValue> valueAdapter,
+                MoshiSnapshotHelper.CapturedThrowableAdapter throwableAdapter) {
+            super(moshi, valueAdapter, throwableAdapter);
+        }
 
-    @Override
-    public CapturedContext fromJson(JsonReader jsonReader) throws IOException {
-      jsonReader.beginObject();
-      CapturedContext capturedContext = new CapturedContext();
-      while (jsonReader.hasNext()) {
-        String name = jsonReader.nextName();
-        switch (name) {
-          case ARGUMENTS:
+        @Override
+        public CapturedContext fromJson(JsonReader jsonReader) throws IOException {
             jsonReader.beginObject();
-            List<CapturedContext.CapturedValue> argValues = new ArrayList<>();
+            CapturedContext capturedContext = new CapturedContext();
             while (jsonReader.hasNext()) {
-              String argName = jsonReader.nextName();
-              CapturedContext.CapturedValue capturedValue = valueAdapter.fromJson(jsonReader);
-              if (capturedValue != null) {
-                capturedValue.setName(argName);
-                argValues.add(capturedValue);
-              }
+                String name = jsonReader.nextName();
+                switch (name) {
+                    case ARGUMENTS:
+                        jsonReader.beginObject();
+                        List<CapturedContext.CapturedValue> argValues = new ArrayList<>();
+                        while (jsonReader.hasNext()) {
+                            String argName = jsonReader.nextName();
+                            CapturedContext.CapturedValue capturedValue = valueAdapter.fromJson(jsonReader);
+                            if (capturedValue != null) {
+                                capturedValue.setName(argName);
+                                argValues.add(capturedValue);
+                            }
+                        }
+                        jsonReader.endObject();
+                        capturedContext.addArguments(argValues.toArray(EMPTY_VALUES_ARRAY));
+                        break;
+                    case LOCALS:
+                        capturedContext.addLocals(fromJsonCapturedValues(jsonReader));
+                        break;
+                    case STATIC_FIELDS:
+                        capturedContext.addStaticFields(fromJsonCapturedValues(jsonReader));
+                        break;
+                    case THROWABLE:
+                        capturedContext.addThrowable(throwableAdapter.fromJson(jsonReader));
+                        break;
+                    case CAPTURE_EXPRESSIONS:
+                        for (CapturedContext.CapturedValue value : fromJsonCapturedValues(jsonReader)) {
+                            capturedContext.addCaptureExpression(value);
+                        }
+                        break;
+                    case NOT_CAPTURED_REASON:
+                        String reason = jsonReader.nextString();
+                        throw new IllegalArgumentException("Not captured reason: " + reason);
+                    default:
+                        throw new IllegalArgumentException("Unknown field name for Captures object: " + name);
+                }
             }
             jsonReader.endObject();
-            capturedContext.addArguments(argValues.toArray(EMPTY_VALUES_ARRAY));
-            break;
-          case LOCALS:
-            capturedContext.addLocals(fromJsonCapturedValues(jsonReader));
-            break;
-          case STATIC_FIELDS:
-            capturedContext.addStaticFields(fromJsonCapturedValues(jsonReader));
-            break;
-          case THROWABLE:
-            capturedContext.addThrowable(throwableAdapter.fromJson(jsonReader));
-            break;
-          case CAPTURE_EXPRESSIONS:
-            for (CapturedContext.CapturedValue value : fromJsonCapturedValues(jsonReader)) {
-              capturedContext.addCaptureExpression(value);
-            }
-            break;
-          case NOT_CAPTURED_REASON:
-            String reason = jsonReader.nextString();
-            throw new IllegalArgumentException("Not captured reason: " + reason);
-          default:
-            throw new IllegalArgumentException("Unknown field name for Captures object: " + name);
+            return capturedContext;
         }
-      }
-      jsonReader.endObject();
-      return capturedContext;
-    }
 
-    private void fromJsonFields(JsonReader jsonReader, CapturedContext capturedContext)
-        throws IOException {
-      jsonReader.beginObject();
-      while (jsonReader.hasNext()) {
-        String name = jsonReader.nextName();
-        switch (name) {
-          case TYPE:
-            {
-              jsonReader.nextString();
-              break;
-            }
-          case NOT_CAPTURED_REASON:
-            {
-              jsonReader.nextString();
-              break;
+        private void fromJsonFields(JsonReader jsonReader, CapturedContext capturedContext) throws IOException {
+            jsonReader.beginObject();
+            while (jsonReader.hasNext()) {
+                String name = jsonReader.nextName();
+                switch (name) {
+                    case TYPE: {
+                        jsonReader.nextString();
+                        break;
+                    }
+                    case NOT_CAPTURED_REASON: {
+                        jsonReader.nextString();
+                        break;
+                    }
+                    default:
+                        throw new IllegalArgumentException("Unknown field name for 'this' object: " + name);
+                }
             }
-          default:
-            throw new IllegalArgumentException("Unknown field name for 'this' object: " + name);
+            jsonReader.endObject();
         }
-      }
-      jsonReader.endObject();
-    }
 
-    private CapturedContext.CapturedValue[] fromJsonCapturedValues(JsonReader jsonReader)
-        throws IOException {
-      jsonReader.beginObject();
-      List<CapturedContext.CapturedValue> values = new ArrayList<>();
-      while (jsonReader.hasNext()) {
-        String name = jsonReader.nextName();
-        if (NOT_CAPTURED_REASON.equals(name)) {
-          jsonReader.nextString();
-          continue;
-        }
-        CapturedContext.CapturedValue capturedValue = valueAdapter.fromJson(jsonReader);
-        if (capturedValue != null) {
-          capturedValue.setName(name);
-          values.add(capturedValue);
+        private CapturedContext.CapturedValue[] fromJsonCapturedValues(JsonReader jsonReader) throws IOException {
+            jsonReader.beginObject();
+            List<CapturedContext.CapturedValue> values = new ArrayList<>();
+            while (jsonReader.hasNext()) {
+                String name = jsonReader.nextName();
+                if (NOT_CAPTURED_REASON.equals(name)) {
+                    jsonReader.nextString();
+                    continue;
+                }
+                CapturedContext.CapturedValue capturedValue = valueAdapter.fromJson(jsonReader);
+                if (capturedValue != null) {
+                    capturedValue.setName(name);
+                    values.add(capturedValue);
+                }
+            }
+            jsonReader.endObject();
+            return values.toArray(EMPTY_VALUES_ARRAY);
         }
-      }
-      jsonReader.endObject();
-      return values.toArray(EMPTY_VALUES_ARRAY);
     }
-  }
 
-  public static class CapturedValueAdapter extends MoshiSnapshotHelper.CapturedValueAdapter {
-    @Override
-    public CapturedContext.CapturedValue fromJson(JsonReader jsonReader) throws IOException {
-      jsonReader.beginObject();
-      String type = null;
-      Object value = null;
-      String notCapturedReason = null;
-      while (jsonReader.hasNext()) {
-        String name = jsonReader.nextName();
-        switch (name) {
-          case TYPE:
-            type = jsonReader.nextString();
-            break;
-          case VALUE:
-            String strValue = jsonReader.nextString();
-            value = convertPrimitive(strValue, type);
-            break;
-          case FIELDS:
+    public static class CapturedValueAdapter extends MoshiSnapshotHelper.CapturedValueAdapter {
+        @Override
+        public CapturedContext.CapturedValue fromJson(JsonReader jsonReader) throws IOException {
             jsonReader.beginObject();
-            Map<String, CapturedContext.CapturedValue> fields = new HashMap<>();
+            String type = null;
+            Object value = null;
+            String notCapturedReason = null;
             while (jsonReader.hasNext()) {
-              String fieldName = jsonReader.nextName();
-              if (NOT_CAPTURED_REASON.equals(fieldName)) {
-                notCapturedReason = jsonReader.nextString();
-                continue;
-              }
-              CapturedContext.CapturedValue fieldValue = fromJson(jsonReader);
-              fields.put(fieldName, fieldValue);
+                String name = jsonReader.nextName();
+                switch (name) {
+                    case TYPE:
+                        type = jsonReader.nextString();
+                        break;
+                    case VALUE:
+                        String strValue = jsonReader.nextString();
+                        value = convertPrimitive(strValue, type);
+                        break;
+                    case FIELDS:
+                        jsonReader.beginObject();
+                        Map<String, CapturedContext.CapturedValue> fields = new HashMap<>();
+                        while (jsonReader.hasNext()) {
+                            String fieldName = jsonReader.nextName();
+                            if (NOT_CAPTURED_REASON.equals(fieldName)) {
+                                notCapturedReason = jsonReader.nextString();
+                                continue;
+                            }
+                            CapturedContext.CapturedValue fieldValue = fromJson(jsonReader);
+                            fields.put(fieldName, fieldValue);
+                        }
+                        jsonReader.endObject();
+                        value = fields;
+                        break;
+                    case ELEMENTS: {
+                        if (type == null) {
+                            throw new RuntimeException("type is null");
+                        }
+                        jsonReader.beginArray();
+                        List<CapturedContext.CapturedValue> values = new ArrayList<>();
+                        while (jsonReader.hasNext()) {
+                            CapturedContext.CapturedValue elementValue = fromJson(jsonReader);
+                            values.add(elementValue);
+                        }
+                        jsonReader.endArray();
+                        if (type.equals(List.class.getTypeName())
+                                || type.equals(ArrayList.class.getTypeName())
+                                || type.equals("java.util.Collections$UnmodifiableRandomAccessList")) {
+                            List<Object> list = new ArrayList<>();
+                            for (CapturedContext.CapturedValue cValue : values) {
+                                list.add(cValue.getValue());
+                            }
+                            value = list;
+                        } else if (type.endsWith("[]")) {
+                            String componentType = type.substring(0, type.indexOf('['));
+                            if (SerializerWithLimits.isPrimitive(componentType)) {
+                                value = createPrimitiveArray(componentType, values);
+                            } else {
+                                value = values.stream()
+                                        .map(CapturedContext.CapturedValue::getValue)
+                                        .toArray();
+                            }
+                        } else if (type.equals("java.util.Collections$EmptyList")) {
+                            value = Collections.emptyList();
+                        } else {
+                            throw new RuntimeException("Cannot deserialize type: " + type);
+                        }
+                        break;
+                    }
+                    case ENTRIES: {
+                        jsonReader.beginArray();
+                        List<CapturedContext.CapturedValue> values = new ArrayList<>();
+                        while (jsonReader.hasNext()) {
+                            jsonReader.beginArray();
+                            CapturedContext.CapturedValue elementValue = fromJson(jsonReader);
+                            values.add(elementValue);
+                            elementValue = fromJson(jsonReader);
+                            values.add(elementValue);
+                            jsonReader.endArray();
+                        }
+                        jsonReader.endArray();
+                        Map<Object, Object> entries = new HashMap<>();
+                        for (int i = 0; i < values.size(); i += 2) {
+                            Object entryKey = values.get(i).getValue();
+                            if (i + 1 >= values.size()) {
+                                break;
+                            }
+                            Object entryValue = values.get(i + 1).getValue();
+                            entries.put(entryKey, entryValue);
+                        }
+                        value = entries;
+                        break;
+                    }
+                    case IS_NULL:
+                        jsonReader.nextBoolean();
+                        value = null;
+                        break;
+                    case NOT_CAPTURED_REASON:
+                        notCapturedReason = jsonReader.nextString();
+                        break;
+                    case TRUNCATED:
+                        boolean truncated = jsonReader.nextBoolean();
+                        if (truncated) {
+                            notCapturedReason = "truncated";
+                        }
+                        break;
+                    case SIZE:
+                        jsonReader.nextString(); // consume size value
+                        break;
+                    default:
+                        throw new RuntimeException("Unknown attribute: " + name);
+                }
             }
             jsonReader.endObject();
-            value = fields;
-            break;
-          case ELEMENTS:
-            {
-              if (type == null) {
-                throw new RuntimeException("type is null");
-              }
-              jsonReader.beginArray();
-              List<CapturedContext.CapturedValue> values = new ArrayList<>();
-              while (jsonReader.hasNext()) {
-                CapturedContext.CapturedValue elementValue = fromJson(jsonReader);
-                values.add(elementValue);
-              }
-              jsonReader.endArray();
-              if (type.equals(List.class.getTypeName())
-                  || type.equals(ArrayList.class.getTypeName())
-                  || type.equals("java.util.Collections$UnmodifiableRandomAccessList")) {
-                List<Object> list = new ArrayList<>();
-                for (CapturedContext.CapturedValue cValue : values) {
-                  list.add(cValue.getValue());
+            return CapturedContext.CapturedValue.raw(type, value, notCapturedReason);
+        }
+
+        private Object createPrimitiveArray(String componentType, List<CapturedContext.CapturedValue> values) {
+            switch (componentType) {
+                case "byte": {
+                    byte[] bytes = new byte[values.size()];
+                    int i = 0;
+                    for (CapturedContext.CapturedValue capturedValue : values) {
+                        bytes[i++] = (Byte) capturedValue.getValue();
+                    }
+                    return bytes;
                 }
-                value = list;
-              } else if (type.endsWith("[]")) {
-                String componentType = type.substring(0, type.indexOf('['));
-                if (SerializerWithLimits.isPrimitive(componentType)) {
-                  value = createPrimitiveArray(componentType, values);
-                } else {
-                  value = values.stream().map(CapturedContext.CapturedValue::getValue).toArray();
+                case "boolean": {
+                    boolean[] booleans = new boolean[values.size()];
+                    int i = 0;
+                    for (CapturedContext.CapturedValue capturedValue : values) {
+                        booleans[i++] = (Boolean) capturedValue.getValue();
+                    }
+                    return booleans;
                 }
-              } else if (type.equals("java.util.Collections$EmptyList")) {
-                value = Collections.emptyList();
-              } else {
-                throw new RuntimeException("Cannot deserialize type: " + type);
-              }
-              break;
-            }
-          case ENTRIES:
-            {
-              jsonReader.beginArray();
-              List<CapturedContext.CapturedValue> values = new ArrayList<>();
-              while (jsonReader.hasNext()) {
-                jsonReader.beginArray();
-                CapturedContext.CapturedValue elementValue = fromJson(jsonReader);
-                values.add(elementValue);
-                elementValue = fromJson(jsonReader);
-                values.add(elementValue);
-                jsonReader.endArray();
-              }
-              jsonReader.endArray();
-              Map<Object, Object> entries = new HashMap<>();
-              for (int i = 0; i < values.size(); i += 2) {
-                Object entryKey = values.get(i).getValue();
-                if (i + 1 >= values.size()) {
-                  break;
+                case "short": {
+                    short[] shorts = new short[values.size()];
+                    int i = 0;
+                    for (CapturedContext.CapturedValue capturedValue : values) {
+                        shorts[i++] = (Short) capturedValue.getValue();
+                    }
+                    return shorts;
                 }
-                Object entryValue = values.get(i + 1).getValue();
-                entries.put(entryKey, entryValue);
-              }
-              value = entries;
-              break;
-            }
-          case IS_NULL:
-            jsonReader.nextBoolean();
-            value = null;
-            break;
-          case NOT_CAPTURED_REASON:
-            notCapturedReason = jsonReader.nextString();
-            break;
-          case TRUNCATED:
-            boolean truncated = jsonReader.nextBoolean();
-            if (truncated) {
-              notCapturedReason = "truncated";
+                case "char": {
+                    char[] chars = new char[values.size()];
+                    int i = 0;
+                    for (CapturedContext.CapturedValue capturedValue : values) {
+                        chars[i++] = (Character) capturedValue.getValue();
+                    }
+                    return chars;
+                }
+                case "int": {
+                    int[] ints = new int[values.size()];
+                    int i = 0;
+                    for (CapturedContext.CapturedValue capturedValue : values) {
+                        ints[i++] = (Integer) capturedValue.getValue();
+                    }
+                    return ints;
+                }
+                case "long": {
+                    long[] longs = new long[values.size()];
+                    int i = 0;
+                    for (CapturedContext.CapturedValue capturedValue : values) {
+                        longs[i++] = (Long) capturedValue.getValue();
+                    }
+                    return longs;
+                }
+                case "float": {
+                    float[] floats = new float[values.size()];
+                    int i = 0;
+                    for (CapturedContext.CapturedValue capturedValue : values) {
+                        floats[i++] = (Float) capturedValue.getValue();
+                    }
+                    return floats;
+                }
+                case "double": {
+                    double[] doubles = new double[values.size()];
+                    int i = 0;
+                    for (CapturedContext.CapturedValue capturedValue : values) {
+                        doubles[i++] = (Double) capturedValue.getValue();
+                    }
+                    return doubles;
+                }
+                case "java.lang.String": {
+                    String[] strings = new String[values.size()];
+                    int i = 0;
+                    for (CapturedContext.CapturedValue capturedValue : values) {
+                        strings[i++] = (String) capturedValue.getValue();
+                    }
+                    return strings;
+                }
+                default:
+                    throw new RuntimeException("unsupported primitive type: " + componentType);
             }
-            break;
-          case SIZE:
-            jsonReader.nextString(); // consume size value
-            break;
-          default:
-            throw new RuntimeException("Unknown attribute: " + name);
         }
-      }
-      jsonReader.endObject();
-      return CapturedContext.CapturedValue.raw(type, value, notCapturedReason);
-    }
 
-    private Object createPrimitiveArray(
-        String componentType, List<CapturedContext.CapturedValue> values) {
-      switch (componentType) {
-        case "byte":
-          {
-            byte[] bytes = new byte[values.size()];
-            int i = 0;
-            for (CapturedContext.CapturedValue capturedValue : values) {
-              bytes[i++] = (Byte) capturedValue.getValue();
-            }
-            return bytes;
-          }
-        case "boolean":
-          {
-            boolean[] booleans = new boolean[values.size()];
-            int i = 0;
-            for (CapturedContext.CapturedValue capturedValue : values) {
-              booleans[i++] = (Boolean) capturedValue.getValue();
-            }
-            return booleans;
-          }
-        case "short":
-          {
-            short[] shorts = new short[values.size()];
-            int i = 0;
-            for (CapturedContext.CapturedValue capturedValue : values) {
-              shorts[i++] = (Short) capturedValue.getValue();
-            }
-            return shorts;
-          }
-        case "char":
-          {
-            char[] chars = new char[values.size()];
-            int i = 0;
-            for (CapturedContext.CapturedValue capturedValue : values) {
-              chars[i++] = (Character) capturedValue.getValue();
+        private static Object convertPrimitive(String strValue, String type) {
+            if (type == null) {
+                return null;
             }
-            return chars;
-          }
-        case "int":
-          {
-            int[] ints = new int[values.size()];
-            int i = 0;
-            for (CapturedContext.CapturedValue capturedValue : values) {
-              ints[i++] = (Integer) capturedValue.getValue();
+            switch (type) {
+                case "byte":
+                case "java.lang.Byte":
+                    return Byte.parseByte(strValue);
+                case "short":
+                case "java.lang.Short":
+                    return Short.parseShort(strValue);
+                case "char":
+                case "java.lang.Character":
+                    return strValue.charAt(0);
+                case "int":
+                case "java.lang.Integer":
+                    return Integer.parseInt(strValue);
+                case "long":
+                case "java.lang.Long":
+                    return Long.parseLong(strValue);
+                case "boolean":
+                case "java.lang.Boolean":
+                    return Boolean.parseBoolean(strValue);
+                case "float":
+                case "java.lang.Float":
+                    return Float.parseFloat(strValue);
+                case "double":
+                case "java.lang.Double":
+                    return Double.parseDouble(strValue);
+                case "String":
+                case "java.lang.String":
+                    return strValue;
             }
-            return ints;
-          }
-        case "long":
-          {
-            long[] longs = new long[values.size()];
-            int i = 0;
-            for (CapturedContext.CapturedValue capturedValue : values) {
-              longs[i++] = (Long) capturedValue.getValue();
-            }
-            return longs;
-          }
-        case "float":
-          {
-            float[] floats = new float[values.size()];
-            int i = 0;
-            for (CapturedContext.CapturedValue capturedValue : values) {
-              floats[i++] = (Float) capturedValue.getValue();
-            }
-            return floats;
-          }
-        case "double":
-          {
-            double[] doubles = new double[values.size()];
-            int i = 0;
-            for (CapturedContext.CapturedValue capturedValue : values) {
-              doubles[i++] = (Double) capturedValue.getValue();
-            }
-            return doubles;
-          }
-        case "java.lang.String":
-          {
-            String[] strings = new String[values.size()];
-            int i = 0;
-            for (CapturedContext.CapturedValue capturedValue : values) {
-              strings[i++] = (String) capturedValue.getValue();
-            }
-            return strings;
-          }
-        default:
-          throw new RuntimeException("unsupported primitive type: " + componentType);
-      }
-    }
-
-    private static Object convertPrimitive(String strValue, String type) {
-      if (type == null) {
-        return null;
-      }
-      switch (type) {
-        case "byte":
-        case "java.lang.Byte":
-          return Byte.parseByte(strValue);
-        case "short":
-        case "java.lang.Short":
-          return Short.parseShort(strValue);
-        case "char":
-        case "java.lang.Character":
-          return strValue.charAt(0);
-        case "int":
-        case "java.lang.Integer":
-          return Integer.parseInt(strValue);
-        case "long":
-        case "java.lang.Long":
-          return Long.parseLong(strValue);
-        case "boolean":
-        case "java.lang.Boolean":
-          return Boolean.parseBoolean(strValue);
-        case "float":
-        case "java.lang.Float":
-          return Float.parseFloat(strValue);
-        case "double":
-        case "java.lang.Double":
-          return Double.parseDouble(strValue);
-        case "String":
-        case "java.lang.String":
-          return strValue;
-      }
-      return strValue;
+            return strValue;
+        }
     }
-  }
 
-  public static class CapturedThrowableAdapter
-      extends MoshiSnapshotHelper.CapturedThrowableAdapter {
-    public CapturedThrowableAdapter(Moshi moshi) {
-      super(moshi);
-    }
+    public static class CapturedThrowableAdapter extends MoshiSnapshotHelper.CapturedThrowableAdapter {
+        public CapturedThrowableAdapter(Moshi moshi) {
+            super(moshi);
+        }
 
-    @Override
-    public CapturedContext.CapturedThrowable fromJson(JsonReader jsonReader) throws IOException {
-      String type = null;
-      String message = null;
-      List<CapturedStackFrame> stacktrace = null;
-      jsonReader.beginObject();
-      while (jsonReader.hasNext()) {
-        String name = jsonReader.nextName();
-        switch (name) {
-          case TYPE:
-            type = jsonReader.nextString();
-            break;
-          case MESSAGE:
-            message = jsonReader.nextString();
-            break;
-          case STACKTRACE:
-            stacktrace = stackTraceAdapter.fromJson(jsonReader);
-            break;
+        @Override
+        public CapturedContext.CapturedThrowable fromJson(JsonReader jsonReader) throws IOException {
+            String type = null;
+            String message = null;
+            List<CapturedStackFrame> stacktrace = null;
+            jsonReader.beginObject();
+            while (jsonReader.hasNext()) {
+                String name = jsonReader.nextName();
+                switch (name) {
+                    case TYPE:
+                        type = jsonReader.nextString();
+                        break;
+                    case MESSAGE:
+                        message = jsonReader.nextString();
+                        break;
+                    case STACKTRACE:
+                        stacktrace = stackTraceAdapter.fromJson(jsonReader);
+                        break;
+                }
+            }
+            jsonReader.endObject();
+            return new CapturedContext.CapturedThrowable(type, message, stacktrace, null);
         }
-      }
-      jsonReader.endObject();
-      return new CapturedContext.CapturedThrowable(type, message, stacktrace, null);
     }
-  }
 
-  public static class ProbeDetailsAdapter extends MoshiSnapshotHelper.ProbeDetailsAdapter {
-    public ProbeDetailsAdapter(Moshi moshi) {
-      super(moshi);
-    }
+    public static class ProbeDetailsAdapter extends MoshiSnapshotHelper.ProbeDetailsAdapter {
+        public ProbeDetailsAdapter(Moshi moshi) {
+            super(moshi);
+        }
 
-    @Override
-    public ProbeImplementation fromJson(JsonReader jsonReader) throws IOException {
-      String id = null;
-      int version = 0;
-      ProbeLocation location = null;
-      jsonReader.beginObject();
-      while (jsonReader.hasNext()) {
-        String name = jsonReader.nextName();
-        switch (name) {
-          case ID:
-            id = jsonReader.nextString();
-            break;
-          case VERSION:
-            version = jsonReader.nextInt();
-            break;
-          case LOCATION:
-            location = probeLocationAdapter.fromJson(jsonReader);
-            break;
-          default:
-            throw new RuntimeException("Unknown attribute: " + name);
+        @Override
+        public ProbeImplementation fromJson(JsonReader jsonReader) throws IOException {
+            String id = null;
+            int version = 0;
+            ProbeLocation location = null;
+            jsonReader.beginObject();
+            while (jsonReader.hasNext()) {
+                String name = jsonReader.nextName();
+                switch (name) {
+                    case ID:
+                        id = jsonReader.nextString();
+                        break;
+                    case VERSION:
+                        version = jsonReader.nextInt();
+                        break;
+                    case LOCATION:
+                        location = probeLocationAdapter.fromJson(jsonReader);
+                        break;
+                    default:
+                        throw new RuntimeException("Unknown attribute: " + name);
+                }
+            }
+            jsonReader.endObject();
+            return new ProbeImplementation.NoopProbeImplementation(new ProbeId(id, version), location);
         }
-      }
-      jsonReader.endObject();
-      return new ProbeImplementation.NoopProbeImplementation(new ProbeId(id, version), location);
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/overhead/OverheadControllerBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/overhead/OverheadControllerBenchmark.java
index 77fca01830f..55be4a33e01 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/overhead/OverheadControllerBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/overhead/OverheadControllerBenchmark.java
@@ -21,26 +21,26 @@
 @State(Scope.Benchmark)
 public class OverheadControllerBenchmark {
 
-  private OverheadController overheadController;
+    private OverheadController overheadController;
 
-  @Setup(Level.Trial)
-  public void setup() {
-    System.setProperty("dd.iast.request-sampling", "100");
-    System.setProperty("dd.iast.max-context-operations", "100000");
-    overheadController = OverheadController.build(Config.get(), null);
-  }
+    @Setup(Level.Trial)
+    public void setup() {
+        System.setProperty("dd.iast.request-sampling", "100");
+        System.setProperty("dd.iast.max-context-operations", "100000");
+        overheadController = OverheadController.build(Config.get(), null);
+    }
 
-  @Benchmark
-  public void acquireReleaseRequestNoSampling() {
-    if (overheadController.acquireRequest()) {
-      overheadController.releaseRequest();
-    } else {
-      throw new IllegalStateException();
+    @Benchmark
+    public void acquireReleaseRequestNoSampling() {
+        if (overheadController.acquireRequest()) {
+            overheadController.releaseRequest();
+        } else {
+            throw new IllegalStateException();
+        }
     }
-  }
 
-  @Benchmark
-  public void consumeQuota() {
-    overheadController.consumeQuota(Operations.REPORT_VULNERABILITY, null);
-  }
+    @Benchmark
+    public void consumeQuota() {
+        overheadController.consumeQuota(Operations.REPORT_VULNERABILITY, null);
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/AbstractBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/AbstractBenchmark.java
index a2b152b1a90..d00da5aff32 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/AbstractBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/AbstractBenchmark.java
@@ -41,99 +41,101 @@
 @Fork(value = 3)
 public abstract class AbstractBenchmark<C extends AbstractBenchmark.BenchmarkContext> {
 
-  private static final Logger LOG = LoggerFactory.getLogger(AbstractBenchmark.class);
-
-  private AgentSpan span;
-  private ContextScope scope;
-  protected C context;
-
-  @Setup(Level.Trial)
-  public void setup() {
-    final InstrumentationGateway gateway = new InstrumentationGateway();
-    IastSystem.start(gateway.getSubscriptionService(RequestContextSlot.IAST));
-    final CoreTracer tracer =
-        CoreTracer.builder().instrumentationGateway(gateway).writer(new NoOpWriter()).build();
-    AgentTracer.forceRegister(tracer);
-  }
-
-  @Setup(Level.Iteration)
-  public void start() {
-    context = initializeContext();
-    final TagContext tagContext = new TagContext();
-    if (Config.get().getIastActivation() == ProductActivation.FULLY_ENABLED) {
-      tagContext.withRequestContextDataIast(context.getIastContext());
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractBenchmark.class);
+
+    private AgentSpan span;
+    private ContextScope scope;
+    protected C context;
+
+    @Setup(Level.Trial)
+    public void setup() {
+        final InstrumentationGateway gateway = new InstrumentationGateway();
+        IastSystem.start(gateway.getSubscriptionService(RequestContextSlot.IAST));
+        final CoreTracer tracer = CoreTracer.builder()
+                .instrumentationGateway(gateway)
+                .writer(new NoOpWriter())
+                .build();
+        AgentTracer.forceRegister(tracer);
     }
-    span = AgentTracer.startSpan("iast", "benchmark", tagContext);
-    scope = AgentTracer.activateSpan(span);
-  }
-
-  @TearDown(Level.Iteration)
-  public void stop() {
-    scope.close();
-    span.finish();
-  }
-
-  protected abstract C initializeContext();
-
-  protected <E> E tainted(final IastContext context, final E value, final Range... ranges) {
-    final E result = notTainted(value);
-    final TaintedObjects taintedObjects = context.getTaintedObjects();
-    taintedObjects.taint(result, ranges);
-    return result;
-  }
-
-  @SuppressWarnings({"StringOperationCanBeSimplified", "unchecked"})
-  protected <E> E notTainted(final E value) {
-    final E result;
-    if (value instanceof String) {
-      result = (E) new String((String) value);
-    } else {
-      result = value;
+
+    @Setup(Level.Iteration)
+    public void start() {
+        context = initializeContext();
+        final TagContext tagContext = new TagContext();
+        if (Config.get().getIastActivation() == ProductActivation.FULLY_ENABLED) {
+            tagContext.withRequestContextDataIast(context.getIastContext());
+        }
+        span = AgentTracer.startSpan("iast", "benchmark", tagContext);
+        scope = AgentTracer.activateSpan(span);
     }
-    computeHash(result); // compute it before to ensure all tests compare the same
-    return result;
-  }
 
-  protected Source source() {
-    return new Source((byte) 0, "key", "value");
-  }
+    @TearDown(Level.Iteration)
+    public void stop() {
+        scope.close();
+        span.finish();
+    }
 
-  private static long computeHash(final Object value) {
-    final long hash = System.identityHashCode(value);
-    LOG.trace("{} hash: {}", value, hash);
-    return hash;
-  }
+    protected abstract C initializeContext();
 
-  protected abstract static class BenchmarkContext {
+    protected <E> E tainted(final IastContext context, final E value, final Range... ranges) {
+        final E result = notTainted(value);
+        final TaintedObjects taintedObjects = context.getTaintedObjects();
+        taintedObjects.taint(result, ranges);
+        return result;
+    }
 
-    private final IastContext iastContext;
+    @SuppressWarnings({"StringOperationCanBeSimplified", "unchecked"})
+    protected <E> E notTainted(final E value) {
+        final E result;
+        if (value instanceof String) {
+            result = (E) new String((String) value);
+        } else {
+            result = value;
+        }
+        computeHash(result); // compute it before to ensure all tests compare the same
+        return result;
+    }
 
-    protected BenchmarkContext(final IastContext iasContext) {
-      this.iastContext = iasContext;
+    protected Source source() {
+        return new Source((byte) 0, "key", "value");
     }
 
-    public IastContext getIastContext() {
-      return iastContext;
+    private static long computeHash(final Object value) {
+        final long hash = System.identityHashCode(value);
+        LOG.trace("{} hash: {}", value, hash);
+        return hash;
     }
-  }
 
-  private static class NoOpWriter implements Writer {
+    protected abstract static class BenchmarkContext {
 
-    @Override
-    public void write(final List<DDSpan> trace) {}
+        private final IastContext iastContext;
 
-    @Override
-    public void start() {}
+        protected BenchmarkContext(final IastContext iasContext) {
+            this.iastContext = iasContext;
+        }
 
-    @Override
-    public boolean flush() {
-      return false;
+        public IastContext getIastContext() {
+            return iastContext;
+        }
     }
 
-    @Override
-    public void close() {}
+    private static class NoOpWriter implements Writer {
+
+        @Override
+        public void write(final List<DDSpan> trace) {}
 
-    @Override
-    public void incrementDropCounts(final int spanCount) {}
-  }
+        @Override
+        public void start() {}
+
+        @Override
+        public boolean flush() {
+            return false;
+        }
+
+        @Override
+        public void close() {}
+
+        @Override
+        public void incrementDropCounts(final int spanCount) {}
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderAppendBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderAppendBenchmark.java
index 53e4e44a8af..2a2c3b510c6 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderAppendBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderAppendBenchmark.java
@@ -9,96 +9,90 @@
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 
-public class StringBuilderAppendBenchmark
-    extends AbstractBenchmark<StringBuilderAppendBenchmark.Context> {
+public class StringBuilderAppendBenchmark extends AbstractBenchmark<StringBuilderAppendBenchmark.Context> {
 
-  @Override
-  protected Context initializeContext() {
-    final IastRequestContext context = new IastRequestContext();
-    final String notTainted = notTainted("I am not a tainted string");
-    final String tainted =
-        tainted(context, "I am a tainted string", new Range(5, 6, source(), NOT_MARKED));
-    final StringBuilder notTaintedBuilder =
-        notTainted(new StringBuilder("I am not a tainted string builder"));
-    final StringBuilder taintedBuilder =
-        tainted(
-            context,
-            new StringBuilder("I am a tainted string builder"),
-            new Range(5, 6, source(), NOT_MARKED));
-    return new Context(context, notTainted, tainted, notTaintedBuilder, taintedBuilder);
-  }
+    @Override
+    protected Context initializeContext() {
+        final IastRequestContext context = new IastRequestContext();
+        final String notTainted = notTainted("I am not a tainted string");
+        final String tainted = tainted(context, "I am a tainted string", new Range(5, 6, source(), NOT_MARKED));
+        final StringBuilder notTaintedBuilder = notTainted(new StringBuilder("I am not a tainted string builder"));
+        final StringBuilder taintedBuilder = tainted(
+                context, new StringBuilder("I am a tainted string builder"), new Range(5, 6, source(), NOT_MARKED));
+        return new Context(context, notTainted, tainted, notTaintedBuilder, taintedBuilder);
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public StringBuilder baseline() {
-    return context.notTaintedBuilder.append(context.notTainted);
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public StringBuilder baseline() {
+        return context.notTaintedBuilder.append(context.notTainted);
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public StringBuilder iastDisabled() {
-    final String param = context.notTainted;
-    final StringBuilder self = context.notTaintedBuilder.append(param);
-    StringBuilderCallSite.afterAppend(self, param, self);
-    return self;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public StringBuilder iastDisabled() {
+        final String param = context.notTainted;
+        final StringBuilder self = context.notTaintedBuilder.append(param);
+        StringBuilderCallSite.afterAppend(self, param, self);
+        return self;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public StringBuilder notTainted() {
-    final String param = context.notTainted;
-    final StringBuilder self = context.notTaintedBuilder.append(param);
-    StringBuilderCallSite.afterAppend(self, param, self);
-    return self;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public StringBuilder notTainted() {
+        final String param = context.notTainted;
+        final StringBuilder self = context.notTaintedBuilder.append(param);
+        StringBuilderCallSite.afterAppend(self, param, self);
+        return self;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public StringBuilder paramTainted() {
-    final String param = context.tainted;
-    final StringBuilder self = context.notTaintedBuilder.append(param);
-    StringBuilderCallSite.afterAppend(self, param, self);
-    return self;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public StringBuilder paramTainted() {
+        final String param = context.tainted;
+        final StringBuilder self = context.notTaintedBuilder.append(param);
+        StringBuilderCallSite.afterAppend(self, param, self);
+        return self;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public StringBuilder stringBuilderTainted() {
-    final String param = context.notTainted;
-    final StringBuilder self = context.taintedBuilder.append(param);
-    StringBuilderCallSite.afterAppend(self, param, self);
-    return self;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public StringBuilder stringBuilderTainted() {
+        final String param = context.notTainted;
+        final StringBuilder self = context.taintedBuilder.append(param);
+        StringBuilderCallSite.afterAppend(self, param, self);
+        return self;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public StringBuilder bothTainted() {
-    final String param = context.tainted;
-    final StringBuilder self = context.taintedBuilder.append(param);
-    StringBuilderCallSite.afterAppend(self, param, self);
-    return self;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public StringBuilder bothTainted() {
+        final String param = context.tainted;
+        final StringBuilder self = context.taintedBuilder.append(param);
+        StringBuilderCallSite.afterAppend(self, param, self);
+        return self;
+    }
 
-  protected static class Context extends AbstractBenchmark.BenchmarkContext {
+    protected static class Context extends AbstractBenchmark.BenchmarkContext {
 
-    private final String notTainted;
-    private final String tainted;
+        private final String notTainted;
+        private final String tainted;
 
-    private final StringBuilder notTaintedBuilder;
+        private final StringBuilder notTaintedBuilder;
 
-    private final StringBuilder taintedBuilder;
+        private final StringBuilder taintedBuilder;
 
-    protected Context(
-        final IastContext context,
-        final String notTainted,
-        final String tainted,
-        final StringBuilder notTaintedBuilder,
-        final StringBuilder taintedBuilder) {
-      super(context);
-      this.tainted = tainted;
-      this.notTainted = notTainted;
-      this.notTaintedBuilder = notTaintedBuilder;
-      this.taintedBuilder = taintedBuilder;
+        protected Context(
+                final IastContext context,
+                final String notTainted,
+                final String tainted,
+                final StringBuilder notTaintedBuilder,
+                final StringBuilder taintedBuilder) {
+            super(context);
+            this.tainted = tainted;
+            this.notTainted = notTainted;
+            this.notTaintedBuilder = notTaintedBuilder;
+            this.taintedBuilder = taintedBuilder;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderBatchBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderBatchBenchmark.java
index dcc0aad5edb..ce9e3b47be6 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderBatchBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderBatchBenchmark.java
@@ -17,78 +17,76 @@
 import org.openjdk.jmh.annotations.Param;
 
 @OutputTimeUnit(MICROSECONDS)
-public class StringBuilderBatchBenchmark
-    extends AbstractBenchmark<StringBuilderBatchBenchmark.Context> {
+public class StringBuilderBatchBenchmark extends AbstractBenchmark<StringBuilderBatchBenchmark.Context> {
 
-  @Param({"10", "100"})
-  public int stringCount;
+    @Param({"10", "100"})
+    public int stringCount;
 
-  @Param({"0", "50", "100"})
-  public int taintedPct;
+    @Param({"0", "50", "100"})
+    public int taintedPct;
 
-  @Override
-  protected StringBuilderBatchBenchmark.Context initializeContext() {
-    final IastRequestContext context = new IastRequestContext();
-    final List<String> values = new ArrayList<>(stringCount);
-    final double limit = taintedPct / 100D;
-    for (int i = 0; i < stringCount; i++) {
-      double current = i / (double) stringCount;
-      final String value;
-      if (current < limit) {
-        value =
-            tainted(context, UUID.randomUUID().toString(), new Range(3, 6, source(), NOT_MARKED));
-      } else {
-        value = notTainted(UUID.randomUUID().toString());
-      }
-      values.add(value);
+    @Override
+    protected StringBuilderBatchBenchmark.Context initializeContext() {
+        final IastRequestContext context = new IastRequestContext();
+        final List<String> values = new ArrayList<>(stringCount);
+        final double limit = taintedPct / 100D;
+        for (int i = 0; i < stringCount; i++) {
+            double current = i / (double) stringCount;
+            final String value;
+            if (current < limit) {
+                value = tainted(context, UUID.randomUUID().toString(), new Range(3, 6, source(), NOT_MARKED));
+            } else {
+                value = notTainted(UUID.randomUUID().toString());
+            }
+            values.add(value);
+        }
+        Collections.shuffle(values);
+        return new StringBuilderBatchBenchmark.Context(context, values);
     }
-    Collections.shuffle(values);
-    return new StringBuilderBatchBenchmark.Context(context, values);
-  }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public String baseline() {
-    final StringBuilder builder = new StringBuilder();
-    for (final String string : context.strings) {
-      builder.append(string);
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public String baseline() {
+        final StringBuilder builder = new StringBuilder();
+        for (final String string : context.strings) {
+            builder.append(string);
+        }
+        return builder.toString();
     }
-    return builder.toString();
-  }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public String iastDisabled() {
-    final StringBuilder builder = new StringBuilder();
-    for (final String string : context.strings) {
-      builder.append(string);
-      StringBuilderCallSite.afterAppend(builder, string, builder);
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public String iastDisabled() {
+        final StringBuilder builder = new StringBuilder();
+        for (final String string : context.strings) {
+            builder.append(string);
+            StringBuilderCallSite.afterAppend(builder, string, builder);
+        }
+        final String result = builder.toString();
+        StringBuilderCallSite.afterToString(builder, result);
+        return result;
     }
-    final String result = builder.toString();
-    StringBuilderCallSite.afterToString(builder, result);
-    return result;
-  }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public String iastEnabled() {
-    final StringBuilder builder = new StringBuilder();
-    for (final String string : context.strings) {
-      builder.append(string);
-      StringBuilderCallSite.afterAppend(builder, string, builder);
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public String iastEnabled() {
+        final StringBuilder builder = new StringBuilder();
+        for (final String string : context.strings) {
+            builder.append(string);
+            StringBuilderCallSite.afterAppend(builder, string, builder);
+        }
+        final String result = builder.toString();
+        StringBuilderCallSite.afterToString(builder, result);
+        return result;
     }
-    final String result = builder.toString();
-    StringBuilderCallSite.afterToString(builder, result);
-    return result;
-  }
 
-  protected static class Context extends AbstractBenchmark.BenchmarkContext {
+    protected static class Context extends AbstractBenchmark.BenchmarkContext {
 
-    private final List<String> strings;
+        private final List<String> strings;
 
-    protected Context(final IastContext context, final List<String> strings) {
-      super(context);
-      this.strings = strings;
+        protected Context(final IastContext context, final List<String> strings) {
+            super(context);
+            this.strings = strings;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderInitBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderInitBenchmark.java
index e6a402585ee..12a5ac7c8eb 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderInitBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderInitBenchmark.java
@@ -9,60 +9,58 @@
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 
-public class StringBuilderInitBenchmark
-    extends AbstractBenchmark<StringBuilderInitBenchmark.Context> {
+public class StringBuilderInitBenchmark extends AbstractBenchmark<StringBuilderInitBenchmark.Context> {
 
-  @Override
-  protected Context initializeContext() {
-    final IastRequestContext context = new IastRequestContext();
-    final String notTainted = notTainted("I am not a tainted string");
-    final String tainted =
-        tainted(context, "I am a tainted string", new Range(3, 6, source(), NOT_MARKED));
-    return new Context(context, notTainted, tainted);
-  }
+    @Override
+    protected Context initializeContext() {
+        final IastRequestContext context = new IastRequestContext();
+        final String notTainted = notTainted("I am not a tainted string");
+        final String tainted = tainted(context, "I am a tainted string", new Range(3, 6, source(), NOT_MARKED));
+        return new Context(context, notTainted, tainted);
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public StringBuilder baseline() {
-    return new StringBuilder(context.notTainted);
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public StringBuilder baseline() {
+        return new StringBuilder(context.notTainted);
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public StringBuilder iastDisabled() {
-    final String param = context.notTainted;
-    final StringBuilder self = new StringBuilder(param);
-    StringBuilderCallSite.afterInit(new Object[] {param}, self);
-    return self;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public StringBuilder iastDisabled() {
+        final String param = context.notTainted;
+        final StringBuilder self = new StringBuilder(param);
+        StringBuilderCallSite.afterInit(new Object[] {param}, self);
+        return self;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public StringBuilder notTainted() {
-    final String param = context.notTainted;
-    final StringBuilder self = new StringBuilder(param);
-    StringBuilderCallSite.afterInit(new Object[] {param}, self);
-    return self;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public StringBuilder notTainted() {
+        final String param = context.notTainted;
+        final StringBuilder self = new StringBuilder(param);
+        StringBuilderCallSite.afterInit(new Object[] {param}, self);
+        return self;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public StringBuilder tainted() {
-    final String param = context.tainted;
-    final StringBuilder self = new StringBuilder(param);
-    StringBuilderCallSite.afterInit(new Object[] {param}, self);
-    return self;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public StringBuilder tainted() {
+        final String param = context.tainted;
+        final StringBuilder self = new StringBuilder(param);
+        StringBuilderCallSite.afterInit(new Object[] {param}, self);
+        return self;
+    }
 
-  protected static class Context extends AbstractBenchmark.BenchmarkContext {
+    protected static class Context extends AbstractBenchmark.BenchmarkContext {
 
-    private final String notTainted;
-    private final String tainted;
+        private final String notTainted;
+        private final String tainted;
 
-    protected Context(final IastContext context, final String notTainted, final String tainted) {
-      super(context);
-      this.tainted = tainted;
-      this.notTainted = notTainted;
+        protected Context(final IastContext context, final String notTainted, final String tainted) {
+            super(context);
+            this.tainted = tainted;
+            this.notTainted = notTainted;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderToStringBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderToStringBenchmark.java
index 4175dce68af..a7272e5d957 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderToStringBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderToStringBenchmark.java
@@ -9,68 +9,61 @@
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 
-public class StringBuilderToStringBenchmark
-    extends AbstractBenchmark<StringBuilderToStringBenchmark.Context> {
+public class StringBuilderToStringBenchmark extends AbstractBenchmark<StringBuilderToStringBenchmark.Context> {
 
-  @Override
-  protected Context initializeContext() {
-    final IastRequestContext context = new IastRequestContext();
-    final StringBuilder notTaintedBuilder =
-        notTainted(new StringBuilder("I am not a tainted string builder"));
-    final StringBuilder taintedBuilder =
-        tainted(
-            context,
-            new StringBuilder("I am a tainted string builder"),
-            new Range(5, 7, source(), NOT_MARKED));
-    return new Context(context, notTaintedBuilder, taintedBuilder);
-  }
+    @Override
+    protected Context initializeContext() {
+        final IastRequestContext context = new IastRequestContext();
+        final StringBuilder notTaintedBuilder = notTainted(new StringBuilder("I am not a tainted string builder"));
+        final StringBuilder taintedBuilder = tainted(
+                context, new StringBuilder("I am a tainted string builder"), new Range(5, 7, source(), NOT_MARKED));
+        return new Context(context, notTaintedBuilder, taintedBuilder);
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public String baseline() {
-    return context.notTaintedBuilder.toString();
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public String baseline() {
+        return context.notTaintedBuilder.toString();
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public String iastDisabled() {
-    final StringBuilder self = context.notTaintedBuilder;
-    final String result = self.toString();
-    StringBuilderCallSite.afterToString(self, result);
-    return result;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public String iastDisabled() {
+        final StringBuilder self = context.notTaintedBuilder;
+        final String result = self.toString();
+        StringBuilderCallSite.afterToString(self, result);
+        return result;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public String notTainted() {
-    final StringBuilder self = context.notTaintedBuilder;
-    final String result = self.toString();
-    StringBuilderCallSite.afterToString(self, result);
-    return result;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public String notTainted() {
+        final StringBuilder self = context.notTaintedBuilder;
+        final String result = self.toString();
+        StringBuilderCallSite.afterToString(self, result);
+        return result;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public String tainted() {
-    final StringBuilder self = context.taintedBuilder;
-    final String result = self.toString();
-    StringBuilderCallSite.afterToString(self, result);
-    return result;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public String tainted() {
+        final StringBuilder self = context.taintedBuilder;
+        final String result = self.toString();
+        StringBuilderCallSite.afterToString(self, result);
+        return result;
+    }
 
-  protected static class Context extends AbstractBenchmark.BenchmarkContext {
+    protected static class Context extends AbstractBenchmark.BenchmarkContext {
 
-    private final StringBuilder notTaintedBuilder;
+        private final StringBuilder notTaintedBuilder;
 
-    private final StringBuilder taintedBuilder;
+        private final StringBuilder taintedBuilder;
 
-    protected Context(
-        final IastContext context,
-        final StringBuilder notTaintedBuilder,
-        final StringBuilder taintedBuilder) {
-      super(context);
-      this.notTaintedBuilder = notTaintedBuilder;
-      this.taintedBuilder = taintedBuilder;
+        protected Context(
+                final IastContext context, final StringBuilder notTaintedBuilder, final StringBuilder taintedBuilder) {
+            super(context);
+            this.notTaintedBuilder = notTaintedBuilder;
+            this.taintedBuilder = taintedBuilder;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatBenchmark.java
index 2dfbb8fff29..fca24a80c52 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatBenchmark.java
@@ -11,82 +11,81 @@
 
 public class StringConcatBenchmark extends AbstractBenchmark<StringConcatBenchmark.Context> {
 
-  @Override
-  protected StringConcatBenchmark.Context initializeContext() {
-    final IastRequestContext context = new IastRequestContext();
-    final String notTainted = notTainted("I am not a tainted string");
-    final String tainted =
-        tainted(context, "I am a tainted string", new Range(3, 5, source(), NOT_MARKED));
-    return new StringConcatBenchmark.Context(context, notTainted, tainted);
-  }
+    @Override
+    protected StringConcatBenchmark.Context initializeContext() {
+        final IastRequestContext context = new IastRequestContext();
+        final String notTainted = notTainted("I am not a tainted string");
+        final String tainted = tainted(context, "I am a tainted string", new Range(3, 5, source(), NOT_MARKED));
+        return new StringConcatBenchmark.Context(context, notTainted, tainted);
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public String baseline() {
-    final String self = context.notTainted;
-    final String param = context.notTainted;
-    return self.concat(param);
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public String baseline() {
+        final String self = context.notTainted;
+        final String param = context.notTainted;
+        return self.concat(param);
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public String iastDisabled() {
-    final String self = context.notTainted;
-    final String param = context.notTainted;
-    final String result = self.concat(param);
-    StringCallSite.afterConcat(self, param, result);
-    return result;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public String iastDisabled() {
+        final String self = context.notTainted;
+        final String param = context.notTainted;
+        final String result = self.concat(param);
+        StringCallSite.afterConcat(self, param, result);
+        return result;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public String notTainted() {
-    final String self = context.notTainted;
-    final String param = context.notTainted;
-    final String result = self.concat(param);
-    StringCallSite.afterConcat(self, param, result);
-    return result;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public String notTainted() {
+        final String self = context.notTainted;
+        final String param = context.notTainted;
+        final String result = self.concat(param);
+        StringCallSite.afterConcat(self, param, result);
+        return result;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public String paramTainted() {
-    final String self = context.notTainted;
-    final String param = context.tainted;
-    final String result = self.concat(param);
-    StringCallSite.afterConcat(self, param, result);
-    return result;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public String paramTainted() {
+        final String self = context.notTainted;
+        final String param = context.tainted;
+        final String result = self.concat(param);
+        StringCallSite.afterConcat(self, param, result);
+        return result;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public String stringTainted() {
-    final String self = context.tainted;
-    final String param = context.notTainted;
-    final String result = self.concat(param);
-    StringCallSite.afterConcat(self, param, result);
-    return result;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public String stringTainted() {
+        final String self = context.tainted;
+        final String param = context.notTainted;
+        final String result = self.concat(param);
+        StringCallSite.afterConcat(self, param, result);
+        return result;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public String bothTainted() {
-    final String self = context.tainted;
-    final String param = context.tainted;
-    final String result = self.concat(param);
-    StringCallSite.afterConcat(self, param, result);
-    return result;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public String bothTainted() {
+        final String self = context.tainted;
+        final String param = context.tainted;
+        final String result = self.concat(param);
+        StringCallSite.afterConcat(self, param, result);
+        return result;
+    }
 
-  protected static class Context extends AbstractBenchmark.BenchmarkContext {
+    protected static class Context extends AbstractBenchmark.BenchmarkContext {
 
-    private final String notTainted;
-    private final String tainted;
+        private final String notTainted;
+        private final String tainted;
 
-    protected Context(final IastContext context, final String notTainted, final String tainted) {
-      super(context);
-      this.notTainted = notTainted;
-      this.tainted = tainted;
+        protected Context(final IastContext context, final String notTainted, final String tainted) {
+            super(context);
+            this.notTainted = notTainted;
+            this.tainted = tainted;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBatchBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBatchBenchmark.java
index 2a994683b0b..9bc51503f21 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBatchBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBatchBenchmark.java
@@ -35,167 +35,158 @@
 import org.openjdk.jmh.annotations.Param;
 
 @OutputTimeUnit(MICROSECONDS)
-public class StringConcatFactoryBatchBenchmark
-    extends AbstractBenchmark<StringConcatFactoryBatchBenchmark.Context> {
-
-  private static final Class<?> CONCAT_IMPL = buildConcatImplementation(10, 100);
-  private static final Map<Integer, MethodHandle> CONCAT_METHODS = resolveConcatMethods(10, 100);
-
-  @Param({"10", "100"})
-  public int stringCount;
-
-  @Param({"0", "50", "100"})
-  public int taintedPct;
-
-  @Override
-  protected StringConcatFactoryBatchBenchmark.Context initializeContext() {
-    final IastRequestContext context = new IastRequestContext();
-    final String[] values = new String[stringCount];
-    final double limit = taintedPct / 100D;
-    for (int i = 0; i < stringCount; i++) {
-      double current = i / (double) stringCount;
-      final String value;
-      if (current < limit) {
-        value = tainted(context, "Yep, tainted", new Range(3, 5, source(), NOT_MARKED));
-      } else {
-        value = notTainted("Nop, tainted");
-      }
-      values[i] = value;
+public class StringConcatFactoryBatchBenchmark extends AbstractBenchmark<StringConcatFactoryBatchBenchmark.Context> {
+
+    private static final Class<?> CONCAT_IMPL = buildConcatImplementation(10, 100);
+    private static final Map<Integer, MethodHandle> CONCAT_METHODS = resolveConcatMethods(10, 100);
+
+    @Param({"10", "100"})
+    public int stringCount;
+
+    @Param({"0", "50", "100"})
+    public int taintedPct;
+
+    @Override
+    protected StringConcatFactoryBatchBenchmark.Context initializeContext() {
+        final IastRequestContext context = new IastRequestContext();
+        final String[] values = new String[stringCount];
+        final double limit = taintedPct / 100D;
+        for (int i = 0; i < stringCount; i++) {
+            double current = i / (double) stringCount;
+            final String value;
+            if (current < limit) {
+                value = tainted(context, "Yep, tainted", new Range(3, 5, source(), NOT_MARKED));
+            } else {
+                value = notTainted("Nop, tainted");
+            }
+            values[i] = value;
+        }
+        return new StringConcatFactoryBatchBenchmark.Context(context, values, stringCount);
     }
-    return new StringConcatFactoryBatchBenchmark.Context(context, values, stringCount);
-  }
-
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public String baseline() throws Throwable {
-    return (String) context.method.invokeWithArguments(context.strings);
-  }
-
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public String iastDisabled() throws Throwable {
-    final String result = (String) context.method.invokeWithArguments(context.strings);
-    InstrumentationBridge.STRING.onStringConcatFactory(
-        result, context.stringArray, context.recipe, context.constants, context.recipeOffsets);
-    return result;
-  }
-
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public String iastEnabled() throws Throwable {
-    final String result = (String) context.method.invokeWithArguments(context.strings);
-    InstrumentationBridge.STRING.onStringConcatFactory(
-        result, context.stringArray, context.recipe, context.constants, context.recipeOffsets);
-    return result;
-  }
-
-  protected static class Context extends AbstractBenchmark.BenchmarkContext {
-
-    private final List<String> strings;
-    private final String[] stringArray;
-    private final String recipe;
-    private final int[] recipeOffsets;
-    private final Object[] constants;
-    private final MethodHandle method;
-
-    protected Context(final IastContext iasContext, final String[] strings, final int paramCount) {
-      super(iasContext);
-      this.strings = Arrays.asList(strings);
-      stringArray = strings;
-      recipe = buildRecipe(paramCount);
-      recipeOffsets = buildRecipeOffsets(paramCount);
-      constants = new Object[0];
-      method = CONCAT_METHODS.get(paramCount);
+
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public String baseline() throws Throwable {
+        return (String) context.method.invokeWithArguments(context.strings);
+    }
+
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public String iastDisabled() throws Throwable {
+        final String result = (String) context.method.invokeWithArguments(context.strings);
+        InstrumentationBridge.STRING.onStringConcatFactory(
+                result, context.stringArray, context.recipe, context.constants, context.recipeOffsets);
+        return result;
+    }
+
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public String iastEnabled() throws Throwable {
+        final String result = (String) context.method.invokeWithArguments(context.strings);
+        InstrumentationBridge.STRING.onStringConcatFactory(
+                result, context.stringArray, context.recipe, context.constants, context.recipeOffsets);
+        return result;
+    }
+
+    protected static class Context extends AbstractBenchmark.BenchmarkContext {
+
+        private final List<String> strings;
+        private final String[] stringArray;
+        private final String recipe;
+        private final int[] recipeOffsets;
+        private final Object[] constants;
+        private final MethodHandle method;
+
+        protected Context(final IastContext iasContext, final String[] strings, final int paramCount) {
+            super(iasContext);
+            this.strings = Arrays.asList(strings);
+            stringArray = strings;
+            recipe = buildRecipe(paramCount);
+            recipeOffsets = buildRecipeOffsets(paramCount);
+            constants = new Object[0];
+            method = CONCAT_METHODS.get(paramCount);
+        }
     }
-  }
-
-  private static String buildRecipe(final int paramCount) {
-    return IntStream.range(0, paramCount)
-        .mapToObj(i -> "\u0001")
-        .collect(Collectors.joining(" + "));
-  }
-
-  private static int[] buildRecipeOffsets(final int arity) {
-    return IntStream.range(0, arity)
-        .mapToObj(i -> Arrays.asList(i, -3))
-        .flatMap(Collection::stream)
-        .mapToInt(i -> i)
-        .toArray();
-  }
-
-  private static Class<?> buildConcatImplementation(final int... arity) {
-    try {
-      final String packageName = StringConcatFactoryBatchBenchmark.class.getPackage().getName();
-      DynamicType.Builder<?> builder =
-          new ByteBuddy()
-              .subclass(Object.class)
-              .name(packageName + ".StringConcatFactoryImplementor");
-      for (final int paramCount : arity) {
-        builder =
-            builder
-                .defineMethod("concat", String.class, Visibility.PUBLIC, Ownership.STATIC)
-                .withParameters(
-                    IntStream.range(0, paramCount)
-                        .mapToObj(i -> String.class)
-                        .collect(Collectors.toList()))
-                .intercept(
-                    InvokeDynamic.bootstrap(
-                            makeConcatWithConstantsDescriptor(), buildRecipe(paramCount))
-                        .invoke("makeConcatWithConstants")
-                        .withImplicitAndMethodArguments());
-      }
-      return builder
-          .make()
-          .load(StringConcatFactoryBatchBenchmark.class.getClassLoader())
-          .getLoaded();
-    } catch (final Exception e) {
-      throw new RuntimeException(e);
+
+    private static String buildRecipe(final int paramCount) {
+        return IntStream.range(0, paramCount).mapToObj(i -> "\u0001").collect(Collectors.joining(" + "));
     }
-  }
-
-  private static MethodDescription.Latent makeConcatWithConstantsDescriptor() {
-    TypeDescription OBJECT = TypeDescription.ForLoadedType.of(Object.class);
-    TypeDescription STRING = TypeDescription.ForLoadedType.of(String.class);
-    return new MethodDescription.Latent(
-        new TypeDescription.Latent(
-            "java.lang.invoke.StringConcatFactory", Opcodes.ACC_PUBLIC, OBJECT.asGenericType()),
-        "makeConcatWithConstants",
-        Opcodes.ACC_STATIC | Opcodes.ACC_PUBLIC,
-        Collections.emptyList(),
-        JavaType.CALL_SITE.getTypeStub().asGenericType(),
-        Arrays.asList(
-            new ParameterDescription.Token(
-                JavaType.METHOD_HANDLES_LOOKUP.getTypeStub().asGenericType()),
-            new ParameterDescription.Token(STRING.asGenericType()),
-            new ParameterDescription.Token(JavaType.METHOD_TYPE.getTypeStub().asGenericType()),
-            new ParameterDescription.Token(STRING.asGenericType()),
-            new ParameterDescription.Token(
-                TypeDescription.Generic.Builder.of(OBJECT.asGenericType()).asArray().build())),
-        Collections.emptyList(),
-        Collections.emptyList(),
-        AnnotationValue.UNDEFINED,
-        TypeDescription.Generic.UNDEFINED);
-  }
-
-  private static Map<Integer, MethodHandle> resolveConcatMethods(final int... arity) {
-    try {
-      final Map<Integer, MethodHandle> result = new HashMap<>();
-      for (final int paramCount : arity) {
-        final MethodHandle method =
-            MethodHandles.publicLookup()
-                .findStatic(
-                    StringConcatFactoryBatchBenchmark.CONCAT_IMPL,
-                    "concat",
-                    MethodType.methodType(
-                        String.class,
-                        IntStream.range(0, paramCount)
-                            .mapToObj(i -> String.class)
-                            .collect(Collectors.toList())));
-        result.put(paramCount, method);
-      }
-      return result;
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+
+    private static int[] buildRecipeOffsets(final int arity) {
+        return IntStream.range(0, arity)
+                .mapToObj(i -> Arrays.asList(i, -3))
+                .flatMap(Collection::stream)
+                .mapToInt(i -> i)
+                .toArray();
+    }
+
+    private static Class<?> buildConcatImplementation(final int... arity) {
+        try {
+            final String packageName =
+                    StringConcatFactoryBatchBenchmark.class.getPackage().getName();
+            DynamicType.Builder<?> builder =
+                    new ByteBuddy().subclass(Object.class).name(packageName + ".StringConcatFactoryImplementor");
+            for (final int paramCount : arity) {
+                builder = builder.defineMethod("concat", String.class, Visibility.PUBLIC, Ownership.STATIC)
+                        .withParameters(IntStream.range(0, paramCount)
+                                .mapToObj(i -> String.class)
+                                .collect(Collectors.toList()))
+                        .intercept(InvokeDynamic.bootstrap(makeConcatWithConstantsDescriptor(), buildRecipe(paramCount))
+                                .invoke("makeConcatWithConstants")
+                                .withImplicitAndMethodArguments());
+            }
+            return builder.make()
+                    .load(StringConcatFactoryBatchBenchmark.class.getClassLoader())
+                    .getLoaded();
+        } catch (final Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static MethodDescription.Latent makeConcatWithConstantsDescriptor() {
+        TypeDescription OBJECT = TypeDescription.ForLoadedType.of(Object.class);
+        TypeDescription STRING = TypeDescription.ForLoadedType.of(String.class);
+        return new MethodDescription.Latent(
+                new TypeDescription.Latent(
+                        "java.lang.invoke.StringConcatFactory", Opcodes.ACC_PUBLIC, OBJECT.asGenericType()),
+                "makeConcatWithConstants",
+                Opcodes.ACC_STATIC | Opcodes.ACC_PUBLIC,
+                Collections.emptyList(),
+                JavaType.CALL_SITE.getTypeStub().asGenericType(),
+                Arrays.asList(
+                        new ParameterDescription.Token(
+                                JavaType.METHOD_HANDLES_LOOKUP.getTypeStub().asGenericType()),
+                        new ParameterDescription.Token(STRING.asGenericType()),
+                        new ParameterDescription.Token(
+                                JavaType.METHOD_TYPE.getTypeStub().asGenericType()),
+                        new ParameterDescription.Token(STRING.asGenericType()),
+                        new ParameterDescription.Token(TypeDescription.Generic.Builder.of(OBJECT.asGenericType())
+                                .asArray()
+                                .build())),
+                Collections.emptyList(),
+                Collections.emptyList(),
+                AnnotationValue.UNDEFINED,
+                TypeDescription.Generic.UNDEFINED);
+    }
+
+    private static Map<Integer, MethodHandle> resolveConcatMethods(final int... arity) {
+        try {
+            final Map<Integer, MethodHandle> result = new HashMap<>();
+            for (final int paramCount : arity) {
+                final MethodHandle method = MethodHandles.publicLookup()
+                        .findStatic(
+                                StringConcatFactoryBatchBenchmark.CONCAT_IMPL,
+                                "concat",
+                                MethodType.methodType(
+                                        String.class,
+                                        IntStream.range(0, paramCount)
+                                                .mapToObj(i -> String.class)
+                                                .collect(Collectors.toList())));
+                result.put(paramCount, method);
+            }
+            return result;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBenchmark.java
index 0342d1ab377..8f8b4e5a78a 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBenchmark.java
@@ -9,116 +9,94 @@
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 
-public class StringConcatFactoryBenchmark
-    extends AbstractBenchmark<StringConcatFactoryBenchmark.Context> {
+public class StringConcatFactoryBenchmark extends AbstractBenchmark<StringConcatFactoryBenchmark.Context> {
 
-  @Override
-  protected StringConcatFactoryBenchmark.Context initializeContext() {
-    final IastContext context = new IastRequestContext();
-    final String notTainted = notTainted("Nop, tainted");
-    final String tainted = tainted(context, "Yep, tainted", new Range(3, 5, source(), NOT_MARKED));
-    return new StringConcatFactoryBenchmark.Context(context, notTainted, tainted);
-  }
+    @Override
+    protected StringConcatFactoryBenchmark.Context initializeContext() {
+        final IastContext context = new IastRequestContext();
+        final String notTainted = notTainted("Nop, tainted");
+        final String tainted = tainted(context, "Yep, tainted", new Range(3, 5, source(), NOT_MARKED));
+        return new StringConcatFactoryBenchmark.Context(context, notTainted, tainted);
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public String baseline() {
-    final String first = context.notTainted;
-    final String second = context.notTainted;
-    return first + " " + second;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public String baseline() {
+        final String first = context.notTainted;
+        final String second = context.notTainted;
+        return first + " " + second;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public String iastDisabled() {
-    final String first = context.notTainted;
-    final String second = context.notTainted;
-    final String result = first + " " + second;
-    InstrumentationBridge.STRING.onStringConcatFactory(
-        result,
-        new String[] {first, second},
-        context.recipe,
-        context.constants,
-        context.recipeOffsets);
-    return result;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public String iastDisabled() {
+        final String first = context.notTainted;
+        final String second = context.notTainted;
+        final String result = first + " " + second;
+        InstrumentationBridge.STRING.onStringConcatFactory(
+                result, new String[] {first, second}, context.recipe, context.constants, context.recipeOffsets);
+        return result;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public String notTainted() {
-    final String first = context.notTainted;
-    final String second = context.notTainted;
-    final String result = first + " " + second;
-    InstrumentationBridge.STRING.onStringConcatFactory(
-        result,
-        new String[] {first, second},
-        context.recipe,
-        context.constants,
-        context.recipeOffsets);
-    return result;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public String notTainted() {
+        final String first = context.notTainted;
+        final String second = context.notTainted;
+        final String result = first + " " + second;
+        InstrumentationBridge.STRING.onStringConcatFactory(
+                result, new String[] {first, second}, context.recipe, context.constants, context.recipeOffsets);
+        return result;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public String firstTainted() {
-    final String first = context.tainted;
-    final String second = context.notTainted;
-    final String result = first + " " + second;
-    InstrumentationBridge.STRING.onStringConcatFactory(
-        result,
-        new String[] {first, second},
-        context.recipe,
-        context.constants,
-        context.recipeOffsets);
-    return result;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public String firstTainted() {
+        final String first = context.tainted;
+        final String second = context.notTainted;
+        final String result = first + " " + second;
+        InstrumentationBridge.STRING.onStringConcatFactory(
+                result, new String[] {first, second}, context.recipe, context.constants, context.recipeOffsets);
+        return result;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public String secondTainted() {
-    final String first = context.notTainted;
-    final String second = context.tainted;
-    final String result = first + " " + second;
-    InstrumentationBridge.STRING.onStringConcatFactory(
-        result,
-        new String[] {first, second},
-        context.recipe,
-        context.constants,
-        context.recipeOffsets);
-    return result;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public String secondTainted() {
+        final String first = context.notTainted;
+        final String second = context.tainted;
+        final String result = first + " " + second;
+        InstrumentationBridge.STRING.onStringConcatFactory(
+                result, new String[] {first, second}, context.recipe, context.constants, context.recipeOffsets);
+        return result;
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public String bothTainted() {
-    final String first = context.tainted;
-    final String second = context.tainted;
-    final String result = first + " " + second;
-    InstrumentationBridge.STRING.onStringConcatFactory(
-        result,
-        new String[] {first, second},
-        context.recipe,
-        context.constants,
-        context.recipeOffsets);
-    return result;
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public String bothTainted() {
+        final String first = context.tainted;
+        final String second = context.tainted;
+        final String result = first + " " + second;
+        InstrumentationBridge.STRING.onStringConcatFactory(
+                result, new String[] {first, second}, context.recipe, context.constants, context.recipeOffsets);
+        return result;
+    }
 
-  protected static class Context extends AbstractBenchmark.BenchmarkContext {
+    protected static class Context extends AbstractBenchmark.BenchmarkContext {
 
-    private final String notTainted;
-    private final String tainted;
-    private final String recipe;
-    private final int[] recipeOffsets;
-    private final Object[] constants;
+        private final String notTainted;
+        private final String tainted;
+        private final String recipe;
+        private final int[] recipeOffsets;
+        private final Object[] constants;
 
-    protected Context(
-        final IastContext iastContext, final String notTainted, final String tainted) {
-      super(iastContext);
-      this.notTainted = notTainted;
-      this.tainted = tainted;
-      recipe = "\u0001 \u0001";
-      constants = new Object[0];
-      recipeOffsets = new int[] {0, -1, 1};
+        protected Context(final IastContext iastContext, final String notTainted, final String tainted) {
+            super(iastContext);
+            this.notTainted = notTainted;
+            this.tainted = tainted;
+            recipe = "\u0001 \u0001";
+            constants = new Object[0];
+            recipeOffsets = new int[] {0, -1, 1};
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringJoinBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringJoinBenchmark.java
index 010815d7dcc..28a6a426f97 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringJoinBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringJoinBenchmark.java
@@ -11,92 +11,83 @@
 import org.openjdk.jmh.annotations.Fork;
 
 public class StringJoinBenchmark extends AbstractBenchmark<StringJoinBenchmark.Context> {
-  @Override
-  protected StringJoinBenchmark.Context initializeContext() {
-    final String notTainted = new String("I am not a tainted string");
-    final String notTaintedDelimiter = new String("-");
-    final IastRequestContext iastRequestContext = new IastRequestContext();
+    @Override
+    protected StringJoinBenchmark.Context initializeContext() {
+        final String notTainted = new String("I am not a tainted string");
+        final String notTaintedDelimiter = new String("-");
+        final IastRequestContext iastRequestContext = new IastRequestContext();
 
-    final String tainted = new String("I am a tainted string");
-    iastRequestContext
-        .getTaintedObjects()
-        .taint(
-            tainted,
-            new Range[] {
-              new Range(0, tainted.length(), new Source((byte) 0, "key", "value"), NOT_MARKED)
-            });
+        final String tainted = new String("I am a tainted string");
+        iastRequestContext.getTaintedObjects().taint(tainted, new Range[] {
+            new Range(0, tainted.length(), new Source((byte) 0, "key", "value"), NOT_MARKED)
+        });
 
-    final String taintedDelimiter = new String("-");
-    iastRequestContext
-        .getTaintedObjects()
-        .taint(
-            taintedDelimiter,
-            new Range[] {
-              new Range(
-                  0, taintedDelimiter.length(), new Source((byte) 1, "key", "value"), NOT_MARKED)
-            });
+        final String taintedDelimiter = new String("-");
+        iastRequestContext.getTaintedObjects().taint(taintedDelimiter, new Range[] {
+            new Range(0, taintedDelimiter.length(), new Source((byte) 1, "key", "value"), NOT_MARKED)
+        });
 
-    return new StringJoinBenchmark.Context(
-        iastRequestContext, notTainted, tainted, notTaintedDelimiter, taintedDelimiter);
-  }
+        return new StringJoinBenchmark.Context(
+                iastRequestContext, notTainted, tainted, notTaintedDelimiter, taintedDelimiter);
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public String baseline() {
-    final String delimiter = context.noTaintedDelimiter;
-    final String element = context.notTainted;
-    return String.join(delimiter, element, element, element, element, element);
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public String baseline() {
+        final String delimiter = context.noTaintedDelimiter;
+        final String element = context.notTainted;
+        return String.join(delimiter, element, element, element, element, element);
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public String iastDisabled() {
-    final String delimiter = context.noTaintedDelimiter;
-    final String element = context.notTainted;
-    return instrumentStringJoin(delimiter, element);
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public String iastDisabled() {
+        final String delimiter = context.noTaintedDelimiter;
+        final String element = context.notTainted;
+        return instrumentStringJoin(delimiter, element);
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public String notTainted() {
-    final String delimiter = context.noTaintedDelimiter;
-    final String element = context.notTainted;
-    return instrumentStringJoin(delimiter, element);
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public String notTainted() {
+        final String delimiter = context.noTaintedDelimiter;
+        final String element = context.notTainted;
+        return instrumentStringJoin(delimiter, element);
+    }
 
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public String tainted() {
-    final String delimiter = context.taintedDelimiter;
-    final String element = context.tainted;
-    return instrumentStringJoin(delimiter, element);
-  }
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public String tainted() {
+        final String delimiter = context.taintedDelimiter;
+        final String element = context.tainted;
+        return instrumentStringJoin(delimiter, element);
+    }
 
-  private static String instrumentStringJoin(final String delimiter, final String element) {
-    final String result = String.join(delimiter, element, element, element, element, element);
-    InstrumentationBridge.STRING.onStringJoin(
-        result, delimiter, new String[] {element, element, element, element, element});
-    return result;
-  }
+    private static String instrumentStringJoin(final String delimiter, final String element) {
+        final String result = String.join(delimiter, element, element, element, element, element);
+        InstrumentationBridge.STRING.onStringJoin(
+                result, delimiter, new String[] {element, element, element, element, element});
+        return result;
+    }
 
-  protected static class Context extends AbstractBenchmark.BenchmarkContext {
+    protected static class Context extends AbstractBenchmark.BenchmarkContext {
 
-    private final String notTainted;
-    private final String tainted;
-    private final String taintedDelimiter;
-    private final String noTaintedDelimiter;
+        private final String notTainted;
+        private final String tainted;
+        private final String taintedDelimiter;
+        private final String noTaintedDelimiter;
 
-    protected Context(
-        final IastContext iasContext,
-        final String notTainted,
-        final String tainted,
-        final String noTaintedDelimiter,
-        final String taintedDelimiter) {
-      super(iasContext);
-      this.notTainted = notTainted;
-      this.tainted = tainted;
-      this.noTaintedDelimiter = noTaintedDelimiter;
-      this.taintedDelimiter = taintedDelimiter;
+        protected Context(
+                final IastContext iasContext,
+                final String notTainted,
+                final String tainted,
+                final String noTaintedDelimiter,
+                final String taintedDelimiter) {
+            super(iasContext);
+            this.notTainted = notTainted;
+            this.tainted = tainted;
+            this.noTaintedDelimiter = noTaintedDelimiter;
+            this.taintedDelimiter = taintedDelimiter;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringSubsequenceBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringSubsequenceBenchmark.java
index d6e7b7cbb4e..8584c9ab78d 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringSubsequenceBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringSubsequenceBenchmark.java
@@ -10,93 +10,84 @@
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 
-public class StringSubsequenceBenchmark
-    extends AbstractBenchmark<StringSubsequenceBenchmark.Context> {
-
-  private static final String DEFAULT_STRING = "0123456789";
-  private static final int BEGIN_INDEX = 2;
-  private static final int END_INDEX = 8;
-  private static final int RANGE_SIZE = 2;
-
-  @Override
-  protected StringSubsequenceBenchmark.Context initializeContext() {
-    final IastRequestContext iastRequestContext = new IastRequestContext();
-    final String notTainted = new String(DEFAULT_STRING);
-
-    final String taintedLoseRange = new String(DEFAULT_STRING);
-    iastRequestContext
-        .getTaintedObjects()
-        .taint(
-            taintedLoseRange,
-            new Range[] {
-              new Range(0, RANGE_SIZE, new Source((byte) 0, "key", "value"), NOT_MARKED)
-            });
-
-    final String taintedModifyRange = new String(DEFAULT_STRING);
-    iastRequestContext
-        .getTaintedObjects()
-        .taint(
-            taintedModifyRange,
-            new Range[] {
-              new Range(1, RANGE_SIZE, new Source((byte) 1, "key", "value"), NOT_MARKED)
-            });
-
-    return new StringSubsequenceBenchmark.Context(
-        iastRequestContext, notTainted, taintedLoseRange, taintedModifyRange);
-  }
-
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public CharSequence baseline() {
-    final String self = context.notTainted;
-    return self.subSequence(BEGIN_INDEX, END_INDEX);
-  }
-
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
-  public CharSequence iastDisabled() {
-    return instrumentStringSubsequence(context.notTainted);
-  }
-
-  /** For a tainted String with one range subsequence returns a CharSequence without ranges */
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public CharSequence taintedLoseRange() {
-    return instrumentStringSubsequence(context.taintedLoseRange);
-  }
-
-  /**
-   * For a tainted String with one range subsequence returns a CharSequence with a modified range
-   * (changes offset and length)
-   */
-  @Benchmark
-  @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
-  public CharSequence taintedModifyRange() {
-    return instrumentStringSubsequence(context.taintedModifyRange);
-  }
-
-  private CharSequence instrumentStringSubsequence(final String self) {
-    final CharSequence result = self.subSequence(BEGIN_INDEX, END_INDEX);
-    InstrumentationBridge.STRING.onStringSubSequence(self, BEGIN_INDEX, END_INDEX, result);
-    return result;
-  }
-
-  protected static class Context extends AbstractBenchmark.BenchmarkContext {
-    private final String notTainted;
-
-    private final String taintedLoseRange;
-
-    private final String taintedModifyRange;
-
-    protected Context(
-        final IastContext iastContext,
-        final String notTainted,
-        final String taintedLoseRange,
-        final String taintedModifyRange) {
-      super(iastContext);
-      this.notTainted = notTainted;
-      this.taintedLoseRange = taintedLoseRange;
-      this.taintedModifyRange = taintedModifyRange;
+public class StringSubsequenceBenchmark extends AbstractBenchmark<StringSubsequenceBenchmark.Context> {
+
+    private static final String DEFAULT_STRING = "0123456789";
+    private static final int BEGIN_INDEX = 2;
+    private static final int END_INDEX = 8;
+    private static final int RANGE_SIZE = 2;
+
+    @Override
+    protected StringSubsequenceBenchmark.Context initializeContext() {
+        final IastRequestContext iastRequestContext = new IastRequestContext();
+        final String notTainted = new String(DEFAULT_STRING);
+
+        final String taintedLoseRange = new String(DEFAULT_STRING);
+        iastRequestContext.getTaintedObjects().taint(taintedLoseRange, new Range[] {
+            new Range(0, RANGE_SIZE, new Source((byte) 0, "key", "value"), NOT_MARKED)
+        });
+
+        final String taintedModifyRange = new String(DEFAULT_STRING);
+        iastRequestContext.getTaintedObjects().taint(taintedModifyRange, new Range[] {
+            new Range(1, RANGE_SIZE, new Source((byte) 1, "key", "value"), NOT_MARKED)
+        });
+
+        return new StringSubsequenceBenchmark.Context(
+                iastRequestContext, notTainted, taintedLoseRange, taintedModifyRange);
+    }
+
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public CharSequence baseline() {
+        final String self = context.notTainted;
+        return self.subSequence(BEGIN_INDEX, END_INDEX);
+    }
+
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=false"})
+    public CharSequence iastDisabled() {
+        return instrumentStringSubsequence(context.notTainted);
+    }
+
+    /** For a tainted String with one range subsequence returns a CharSequence without ranges */
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public CharSequence taintedLoseRange() {
+        return instrumentStringSubsequence(context.taintedLoseRange);
+    }
+
+    /**
+     * For a tainted String with one range subsequence returns a CharSequence with a modified range
+     * (changes offset and length)
+     */
+    @Benchmark
+    @Fork(jvmArgsAppend = {"-Ddd.iast.enabled=true"})
+    public CharSequence taintedModifyRange() {
+        return instrumentStringSubsequence(context.taintedModifyRange);
+    }
+
+    private CharSequence instrumentStringSubsequence(final String self) {
+        final CharSequence result = self.subSequence(BEGIN_INDEX, END_INDEX);
+        InstrumentationBridge.STRING.onStringSubSequence(self, BEGIN_INDEX, END_INDEX, result);
+        return result;
+    }
+
+    protected static class Context extends AbstractBenchmark.BenchmarkContext {
+        private final String notTainted;
+
+        private final String taintedLoseRange;
+
+        private final String taintedModifyRange;
+
+        protected Context(
+                final IastContext iastContext,
+                final String notTainted,
+                final String taintedLoseRange,
+                final String taintedModifyRange) {
+            super(iastContext);
+            this.notTainted = notTainted;
+            this.taintedLoseRange = taintedLoseRange;
+            this.taintedModifyRange = taintedModifyRange;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/sensitive/SensitiveTokenizerBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/sensitive/SensitiveTokenizerBenchmark.java
index c3d86674e09..538bc303140 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/sensitive/SensitiveTokenizerBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/sensitive/SensitiveTokenizerBenchmark.java
@@ -29,203 +29,203 @@
 @State(Scope.Benchmark)
 public class SensitiveTokenizerBenchmark {
 
-  /** Each scenario pairs a malformed payload shape with the tokenizer that processes it. */
-  public enum Scenario {
-    /** LDAP filter opened, never closed, packed with operators — quadratic: {@code "(" + "="*n}. */
-    LDAP_UNCLOSED_FILTER {
-      @Override
-      String payload(final int n) {
-        return "(" + repeat('=', n - 1);
-      }
-
-      @Override
-      Tokenizer tokenizer(final String payload) {
-        return new LdapRegexTokenizer(new Evidence(payload));
-      }
-    },
-    /** Repeated open-group + operator — CUBIC, the worst found: {@code "(="*n}. */
-    LDAP_NESTED_OPEN_EQ {
-      @Override
-      String payload(final int n) {
-        return repeatUnit("(=", n);
-      }
-
-      @Override
-      Tokenizer tokenizer(final String payload) {
-        return new LdapRegexTokenizer(new Evidence(payload));
-      }
-    },
-    /** ANSI SQL string literal opened but never closed — stack overflow: {@code "'" + "a"*n}. */
-    SQL_ANSI_UNTERMINATED_STRING {
-      @Override
-      String payload(final int n) {
-        return "'" + repeat('a', n - 1);
-      }
-
-      @Override
-      Tokenizer tokenizer(final String payload) {
-        return sql(payload, null);
-      }
-    },
-    /** Oracle {@code q'<delim> ...} escaped literal with no matching close — stack overflow. */
-    SQL_ORACLE_ESCAPED_LITERAL {
-      @Override
-      String payload(final int n) {
-        return "q'~" + repeat('a', n - 3);
-      }
-
-      @Override
-      Tokenizer tokenizer(final String payload) {
-        return sql(payload, "oracle");
-      }
-    },
-    /** MySQL double-quoted string literal opened but never closed — stack overflow. */
-    SQL_MYSQL_UNTERMINATED_STRING {
-      @Override
-      String payload(final int n) {
-        return "\"" + repeat('a', n - 1);
-      }
-
-      @Override
-      Tokenizer tokenizer(final String payload) {
-        return sql(payload, "mysql");
-      }
-    },
-    /** URL query separator + long key, no {@code =} value — linear baseline. */
-    URL_QUERY {
-      @Override
-      String payload(final int n) {
-        return "http://h/p?" + repeat('a', n - 11);
-      }
-
-      @Override
-      Tokenizer tokenizer(final String payload) {
-        return new UrlRegexpTokenizer(new Evidence(payload));
-      }
-    },
-    /** Run of {@code ?} (also matched by {@code [^=&;]}) — quadratic: {@code "?"*n}. */
-    URL_QUESTION_RUN {
-      @Override
-      String payload(final int n) {
-        return repeat('?', n);
-      }
-
-      @Override
-      Tokenizer tokenizer(final String payload) {
-        return new UrlRegexpTokenizer(new Evidence(payload));
-      }
-    },
-    /** URL authority started with {@code //}, no {@code @} terminator — linear baseline. */
-    URL_AUTHORITY {
-      @Override
-      String payload(final int n) {
-        return "//" + repeat('a', n - 2);
-      }
-
-      @Override
-      Tokenizer tokenizer(final String payload) {
-        return new UrlRegexpTokenizer(new Evidence(payload));
-      }
-    },
-    /** Single command + long argument — linear baseline. */
-    COMMAND_SINGLE_TOKEN {
-      @Override
-      String payload(final int n) {
-        return "cmd " + repeat('a', n - 4);
-      }
-
-      @Override
-      Tokenizer tokenizer(final String payload) {
-        return new CommandRegexpTokenizer(new Evidence(payload));
-      }
-    },
-    /**
-     * Blank lines exploit MULTILINE {@code ^} + {@code \s*} backtracking — quadratic: {@code
-     * "\n"*n}.
-     */
-    COMMAND_BLANK_LINES {
-      @Override
-      String payload(final int n) {
-        return repeat('\n', n);
-      }
-
-      @Override
-      Tokenizer tokenizer(final String payload) {
-        return new CommandRegexpTokenizer(new Evidence(payload));
-      }
-    };
-
-    abstract String payload(int sizeBytes);
-
-    abstract Tokenizer tokenizer(String payload);
-
-    static Tokenizer sql(final String payload, final String dialect) {
-      final Evidence evidence = new Evidence(payload);
-      if (dialect != null) {
-        evidence.getContext().put(DATABASE_PARAMETER, dialect);
-      }
-      return new SqlRegexpTokenizer(evidence);
+    /** Each scenario pairs a malformed payload shape with the tokenizer that processes it. */
+    public enum Scenario {
+        /** LDAP filter opened, never closed, packed with operators — quadratic: {@code "(" + "="*n}. */
+        LDAP_UNCLOSED_FILTER {
+            @Override
+            String payload(final int n) {
+                return "(" + repeat('=', n - 1);
+            }
+
+            @Override
+            Tokenizer tokenizer(final String payload) {
+                return new LdapRegexTokenizer(new Evidence(payload));
+            }
+        },
+        /** Repeated open-group + operator — CUBIC, the worst found: {@code "(="*n}. */
+        LDAP_NESTED_OPEN_EQ {
+            @Override
+            String payload(final int n) {
+                return repeatUnit("(=", n);
+            }
+
+            @Override
+            Tokenizer tokenizer(final String payload) {
+                return new LdapRegexTokenizer(new Evidence(payload));
+            }
+        },
+        /** ANSI SQL string literal opened but never closed — stack overflow: {@code "'" + "a"*n}. */
+        SQL_ANSI_UNTERMINATED_STRING {
+            @Override
+            String payload(final int n) {
+                return "'" + repeat('a', n - 1);
+            }
+
+            @Override
+            Tokenizer tokenizer(final String payload) {
+                return sql(payload, null);
+            }
+        },
+        /** Oracle {@code q'<delim> ...} escaped literal with no matching close — stack overflow. */
+        SQL_ORACLE_ESCAPED_LITERAL {
+            @Override
+            String payload(final int n) {
+                return "q'~" + repeat('a', n - 3);
+            }
+
+            @Override
+            Tokenizer tokenizer(final String payload) {
+                return sql(payload, "oracle");
+            }
+        },
+        /** MySQL double-quoted string literal opened but never closed — stack overflow. */
+        SQL_MYSQL_UNTERMINATED_STRING {
+            @Override
+            String payload(final int n) {
+                return "\"" + repeat('a', n - 1);
+            }
+
+            @Override
+            Tokenizer tokenizer(final String payload) {
+                return sql(payload, "mysql");
+            }
+        },
+        /** URL query separator + long key, no {@code =} value — linear baseline. */
+        URL_QUERY {
+            @Override
+            String payload(final int n) {
+                return "http://h/p?" + repeat('a', n - 11);
+            }
+
+            @Override
+            Tokenizer tokenizer(final String payload) {
+                return new UrlRegexpTokenizer(new Evidence(payload));
+            }
+        },
+        /** Run of {@code ?} (also matched by {@code [^=&;]}) — quadratic: {@code "?"*n}. */
+        URL_QUESTION_RUN {
+            @Override
+            String payload(final int n) {
+                return repeat('?', n);
+            }
+
+            @Override
+            Tokenizer tokenizer(final String payload) {
+                return new UrlRegexpTokenizer(new Evidence(payload));
+            }
+        },
+        /** URL authority started with {@code //}, no {@code @} terminator — linear baseline. */
+        URL_AUTHORITY {
+            @Override
+            String payload(final int n) {
+                return "//" + repeat('a', n - 2);
+            }
+
+            @Override
+            Tokenizer tokenizer(final String payload) {
+                return new UrlRegexpTokenizer(new Evidence(payload));
+            }
+        },
+        /** Single command + long argument — linear baseline. */
+        COMMAND_SINGLE_TOKEN {
+            @Override
+            String payload(final int n) {
+                return "cmd " + repeat('a', n - 4);
+            }
+
+            @Override
+            Tokenizer tokenizer(final String payload) {
+                return new CommandRegexpTokenizer(new Evidence(payload));
+            }
+        },
+        /**
+         * Blank lines exploit MULTILINE {@code ^} + {@code \s*} backtracking — quadratic: {@code
+         * "\n"*n}.
+         */
+        COMMAND_BLANK_LINES {
+            @Override
+            String payload(final int n) {
+                return repeat('\n', n);
+            }
+
+            @Override
+            Tokenizer tokenizer(final String payload) {
+                return new CommandRegexpTokenizer(new Evidence(payload));
+            }
+        };
+
+        abstract String payload(int sizeBytes);
+
+        abstract Tokenizer tokenizer(String payload);
+
+        static Tokenizer sql(final String payload, final String dialect) {
+            final Evidence evidence = new Evidence(payload);
+            if (dialect != null) {
+                evidence.getContext().put(DATABASE_PARAMETER, dialect);
+            }
+            return new SqlRegexpTokenizer(evidence);
+        }
+
+        static String repeat(final char c, final int count) {
+            final int n = Math.max(count, 0);
+            final char[] chars = new char[n];
+            Arrays.fill(chars, c);
+            return new String(chars);
+        }
+
+        static String repeatUnit(final String unit, final int totalLen) {
+            final int n = Math.max(totalLen, 0);
+            final StringBuilder sb = new StringBuilder(n);
+            while (sb.length() < n) {
+                sb.append(unit);
+            }
+            sb.setLength(n);
+            return sb.toString();
+        }
     }
 
-    static String repeat(final char c, final int count) {
-      final int n = Math.max(count, 0);
-      final char[] chars = new char[n];
-      Arrays.fill(chars, c);
-      return new String(chars);
+    @Param({
+        "LDAP_UNCLOSED_FILTER",
+        "LDAP_NESTED_OPEN_EQ",
+        "SQL_ANSI_UNTERMINATED_STRING",
+        "SQL_ORACLE_ESCAPED_LITERAL",
+        "SQL_MYSQL_UNTERMINATED_STRING",
+        "URL_QUERY",
+        "URL_QUESTION_RUN",
+        "URL_AUTHORITY",
+        "COMMAND_SINGLE_TOKEN",
+        "COMMAND_BLANK_LINES"
+    })
+    Scenario scenario;
+
+    @Param({"512", "1024", "2048"})
+    int sizeBytes;
+
+    private String payload;
+
+    @Setup(Level.Trial)
+    public void setup() {
+        payload = scenario.payload(sizeBytes);
     }
 
-    static String repeatUnit(final String unit, final int totalLen) {
-      final int n = Math.max(totalLen, 0);
-      final StringBuilder sb = new StringBuilder(n);
-      while (sb.length() < n) {
-        sb.append(unit);
-      }
-      sb.setLength(n);
-      return sb.toString();
-    }
-  }
-
-  @Param({
-    "LDAP_UNCLOSED_FILTER",
-    "LDAP_NESTED_OPEN_EQ",
-    "SQL_ANSI_UNTERMINATED_STRING",
-    "SQL_ORACLE_ESCAPED_LITERAL",
-    "SQL_MYSQL_UNTERMINATED_STRING",
-    "URL_QUERY",
-    "URL_QUESTION_RUN",
-    "URL_AUTHORITY",
-    "COMMAND_SINGLE_TOKEN",
-    "COMMAND_BLANK_LINES"
-  })
-  Scenario scenario;
-
-  @Param({"512", "1024", "2048"})
-  int sizeBytes;
-
-  private String payload;
-
-  @Setup(Level.Trial)
-  public void setup() {
-    payload = scenario.payload(sizeBytes);
-  }
-
-  /**
-   * Builds the tokenizer and fully drains it, exactly as evidence redaction does. Returns the
-   * number of tokens (consumed by JMH). A pathological pattern may overflow the stack; we catch it
-   * so the run stays stable and report {@code -1} — see the class javadoc.
-   */
-  @Benchmark
-  public long tokenize() {
-    try {
-      final Tokenizer tokenizer = scenario.tokenizer(payload);
-      long count = 0;
-      while (tokenizer.next()) {
-        tokenizer.current();
-        count++;
-      }
-      return count;
-    } catch (final Throwable pathological) {
-      return -1;
+    /**
+     * Builds the tokenizer and fully drains it, exactly as evidence redaction does. Returns the
+     * number of tokens (consumed by JMH). A pathological pattern may overflow the stack; we catch it
+     * so the run stays stable and report {@code -1} — see the class javadoc.
+     */
+    @Benchmark
+    public long tokenize() {
+        try {
+            final Tokenizer tokenizer = scenario.tokenizer(payload);
+            long count = 0;
+            while (tokenizer.next()) {
+                tokenizer.current();
+                count++;
+            }
+            return count;
+        } catch (final Throwable pathological) {
+            return -1;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/taint/TaintedMapEmptyBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/taint/TaintedMapEmptyBenchmark.java
index c4ff8bc14a6..0d83fdf34cd 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/taint/TaintedMapEmptyBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/taint/TaintedMapEmptyBenchmark.java
@@ -26,29 +26,29 @@
 @State(Scope.Benchmark)
 public class TaintedMapEmptyBenchmark {
 
-  private static final int OP_COUNT = 1024;
-  private TaintedMap map;
-  private final Object anyObject = new Object();
+    private static final int OP_COUNT = 1024;
+    private TaintedMap map;
+    private final Object anyObject = new Object();
 
-  @Setup(Level.Iteration)
-  public void setup(BenchmarkParams params) {
-    final boolean baseline = params.getBenchmark().endsWith("baseline");
-    map = baseline ? TaintedMap.NoOp.INSTANCE : new TaintedMap.TaintedMapImpl();
-  }
+    @Setup(Level.Iteration)
+    public void setup(BenchmarkParams params) {
+        final boolean baseline = params.getBenchmark().endsWith("baseline");
+        map = baseline ? TaintedMap.NoOp.INSTANCE : new TaintedMap.TaintedMapImpl();
+    }
 
-  @Benchmark
-  @OperationsPerInvocation(OP_COUNT)
-  public void baseline(final Blackhole bh) {
-    for (int i = 0; i < OP_COUNT; i++) {
-      bh.consume(map.get(anyObject));
+    @Benchmark
+    @OperationsPerInvocation(OP_COUNT)
+    public void baseline(final Blackhole bh) {
+        for (int i = 0; i < OP_COUNT; i++) {
+            bh.consume(map.get(anyObject));
+        }
     }
-  }
 
-  @Benchmark
-  @OperationsPerInvocation(OP_COUNT)
-  public void getFromEmptyMap(final Blackhole bh) {
-    for (int i = 0; i < OP_COUNT; i++) {
-      bh.consume(map.get(anyObject));
+    @Benchmark
+    @OperationsPerInvocation(OP_COUNT)
+    public void getFromEmptyMap(final Blackhole bh) {
+        for (int i = 0; i < OP_COUNT; i++) {
+            bh.consume(map.get(anyObject));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/taint/TaintedMapGetsBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/taint/TaintedMapGetsBenchmark.java
index 96416278c83..404adf125a7 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/taint/TaintedMapGetsBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/taint/TaintedMapGetsBenchmark.java
@@ -29,44 +29,44 @@
 @State(Scope.Benchmark)
 public class TaintedMapGetsBenchmark {
 
-  private static final int INITIAL_OP_COUNT = 1 << 12;
-  private static final int OP_COUNT = 1024;
+    private static final int INITIAL_OP_COUNT = 1 << 12;
+    private static final int OP_COUNT = 1024;
 
-  private TaintedMap map;
-  private List<Object> objectList;
-  private List<Object> initialObjectList;
+    private TaintedMap map;
+    private List<Object> objectList;
+    private List<Object> initialObjectList;
 
-  @Setup(Level.Iteration)
-  public void setup(BenchmarkParams params) {
-    final boolean baseline = params.getBenchmark().endsWith("baseline");
-    map = baseline ? TaintedMap.NoOp.INSTANCE : new TaintedMap.TaintedMapImpl();
-    initialObjectList = new ArrayList<>(INITIAL_OP_COUNT);
-    objectList = new ArrayList<>(OP_COUNT);
-    for (int i = 0; i < INITIAL_OP_COUNT; i++) {
-      final Object k = new Object();
-      initialObjectList.add(k);
-      map.put(new TaintedObject(k, new Range[0]));
+    @Setup(Level.Iteration)
+    public void setup(BenchmarkParams params) {
+        final boolean baseline = params.getBenchmark().endsWith("baseline");
+        map = baseline ? TaintedMap.NoOp.INSTANCE : new TaintedMap.TaintedMapImpl();
+        initialObjectList = new ArrayList<>(INITIAL_OP_COUNT);
+        objectList = new ArrayList<>(OP_COUNT);
+        for (int i = 0; i < INITIAL_OP_COUNT; i++) {
+            final Object k = new Object();
+            initialObjectList.add(k);
+            map.put(new TaintedObject(k, new Range[0]));
+        }
+        for (int i = 0; i < OP_COUNT; i++) {
+            final Object k = new Object();
+            objectList.add(k);
+            map.put(new TaintedObject(k, new Range[0]));
+        }
     }
-    for (int i = 0; i < OP_COUNT; i++) {
-      final Object k = new Object();
-      objectList.add(k);
-      map.put(new TaintedObject(k, new Range[0]));
-    }
-  }
 
-  @Benchmark
-  @OperationsPerInvocation(OP_COUNT)
-  public void baseline(final Blackhole bh) {
-    for (int i = 0; i < OP_COUNT; i++) {
-      bh.consume(map.get(objectList.get(i)));
+    @Benchmark
+    @OperationsPerInvocation(OP_COUNT)
+    public void baseline(final Blackhole bh) {
+        for (int i = 0; i < OP_COUNT; i++) {
+            bh.consume(map.get(objectList.get(i)));
+        }
     }
-  }
 
-  @Benchmark
-  @OperationsPerInvocation(OP_COUNT)
-  public void gets(final Blackhole bh) {
-    for (int i = 0; i < OP_COUNT; i++) {
-      bh.consume(map.get(objectList.get(i)));
+    @Benchmark
+    @OperationsPerInvocation(OP_COUNT)
+    public void gets(final Blackhole bh) {
+        for (int i = 0; i < OP_COUNT; i++) {
+            bh.consume(map.get(objectList.get(i)));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/taint/TaintedMapPutsBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/taint/TaintedMapPutsBenchmark.java
index 90b92140874..029159e899e 100644
--- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/taint/TaintedMapPutsBenchmark.java
+++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/taint/TaintedMapPutsBenchmark.java
@@ -33,75 +33,75 @@
 @State(Scope.Benchmark)
 public class TaintedMapPutsBenchmark {
 
-  private static final int INITIAL_OP_COUNT = 1 << 12;
-  private static final int OP_COUNT = 1024;
+    private static final int INITIAL_OP_COUNT = 1 << 12;
+    private static final int OP_COUNT = 1024;
 
-  private static final Range[] EMPTY_RANGES = new Range[0];
+    private static final Range[] EMPTY_RANGES = new Range[0];
 
-  private TaintedMap map;
-  private List<Object> initialObjectList;
-  private GarbageCollectorHandler gcHandler;
+    private TaintedMap map;
+    private List<Object> initialObjectList;
+    private GarbageCollectorHandler gcHandler;
 
-  @Setup(Level.Iteration)
-  public void setup(BenchmarkParams params) {
-    final boolean baseline = params.getBenchmark().endsWith("baseline");
-    map = baseline ? TaintedMap.NoOp.INSTANCE : new TaintedMap.TaintedMapImpl();
-    gcHandler = new GarbageCollectorHandler(OP_COUNT);
-    initialObjectList = new ArrayList<>(INITIAL_OP_COUNT);
-    for (int i = 0; i < INITIAL_OP_COUNT; i++) {
-      final Object k = new Object();
-      initialObjectList.add(k);
-      map.put(new TaintedObject(k, EMPTY_RANGES));
+    @Setup(Level.Iteration)
+    public void setup(BenchmarkParams params) {
+        final boolean baseline = params.getBenchmark().endsWith("baseline");
+        map = baseline ? TaintedMap.NoOp.INSTANCE : new TaintedMap.TaintedMapImpl();
+        gcHandler = new GarbageCollectorHandler(OP_COUNT);
+        initialObjectList = new ArrayList<>(INITIAL_OP_COUNT);
+        for (int i = 0; i < INITIAL_OP_COUNT; i++) {
+            final Object k = new Object();
+            initialObjectList.add(k);
+            map.put(new TaintedObject(k, EMPTY_RANGES));
+        }
     }
-  }
 
-  @Benchmark
-  @OperationsPerInvocation(OP_COUNT)
-  public void baseline() {
-    for (int i = 0; i < OP_COUNT; i++) {
-      final Object k = new Object();
-      final TaintedObject to = new TaintedObject(k, EMPTY_RANGES);
-      gcHandler.add(to);
-      map.put(to);
+    @Benchmark
+    @OperationsPerInvocation(OP_COUNT)
+    public void baseline() {
+        for (int i = 0; i < OP_COUNT; i++) {
+            final Object k = new Object();
+            final TaintedObject to = new TaintedObject(k, EMPTY_RANGES);
+            gcHandler.add(to);
+            map.put(to);
+        }
     }
-  }
 
-  @Benchmark
-  @OperationsPerInvocation(OP_COUNT)
-  public void puts() {
-    for (int i = 0; i < OP_COUNT; i++) {
-      final Object k = new Object();
-      final TaintedObject to = new TaintedObject(k, EMPTY_RANGES);
-      gcHandler.add(to);
-      map.put(to);
+    @Benchmark
+    @OperationsPerInvocation(OP_COUNT)
+    public void puts() {
+        for (int i = 0; i < OP_COUNT; i++) {
+            final Object k = new Object();
+            final TaintedObject to = new TaintedObject(k, EMPTY_RANGES);
+            gcHandler.add(to);
+            map.put(to);
+        }
     }
-  }
 
-  /**
-   * Reference queue that holds a circular buffer of alive objects and enqueues to be purged when
-   * they are removed
-   */
-  private static class GarbageCollectorHandler {
+    /**
+     * Reference queue that holds a circular buffer of alive objects and enqueues to be purged when
+     * they are removed
+     */
+    private static class GarbageCollectorHandler {
 
-    private final Map<Object, TaintedObject> map;
-    private final CircularBuffer<Object> alive;
+        private final Map<Object, TaintedObject> map;
+        private final CircularBuffer<Object> alive;
 
-    public GarbageCollectorHandler(final int aliveCount) {
-      map = new IdentityHashMap<>(aliveCount);
-      alive = new CircularBuffer<>(aliveCount);
-    }
+        public GarbageCollectorHandler(final int aliveCount) {
+            map = new IdentityHashMap<>(aliveCount);
+            alive = new CircularBuffer<>(aliveCount);
+        }
 
-    public void add(TaintedObject reference) {
-      if (reference == null || reference.get() == null) {
-        return;
-      }
-      final Object referent = reference.get();
-      final Object toRemove = alive.add(referent);
-      if (toRemove != null) {
-        final TaintedObject taintedObject = map.remove(toRemove);
-        taintedObject.enqueue();
-      }
-      map.put(reference.get(), reference);
+        public void add(TaintedObject reference) {
+            if (reference == null || reference.get() == null) {
+                return;
+            }
+            final Object referent = reference.get();
+            final Object toRemove = alive.add(referent);
+            if (toRemove != null) {
+                final TaintedObject taintedObject = map.remove(toRemove);
+                taintedObject.enqueue();
+            }
+            map.put(reference.get(), reference);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Dependencies.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Dependencies.java
index de8f760652c..b38d7ac5042 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Dependencies.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Dependencies.java
@@ -8,39 +8,39 @@
 
 public class Dependencies {
 
-  private final Config config;
-  private final Reporter reporter;
-  private final OverheadController overheadController;
-  private final StackWalker stackWalker;
-
-  final IastContext.Provider contextProvider;
-
-  public Dependencies(
-      @Nonnull final Config config,
-      @Nonnull final Reporter reporter,
-      @Nonnull final OverheadController overheadController,
-      @Nonnull final StackWalker stackWalker,
-      @Nonnull final IastContext.Provider contextProvider) {
-    this.config = config;
-    this.reporter = reporter;
-    this.overheadController = overheadController;
-    this.stackWalker = stackWalker;
-    this.contextProvider = contextProvider;
-  }
-
-  public Config getConfig() {
-    return config;
-  }
-
-  public Reporter getReporter() {
-    return reporter;
-  }
-
-  public OverheadController getOverheadController() {
-    return overheadController;
-  }
-
-  public StackWalker getStackWalker() {
-    return stackWalker;
-  }
+    private final Config config;
+    private final Reporter reporter;
+    private final OverheadController overheadController;
+    private final StackWalker stackWalker;
+
+    final IastContext.Provider contextProvider;
+
+    public Dependencies(
+            @Nonnull final Config config,
+            @Nonnull final Reporter reporter,
+            @Nonnull final OverheadController overheadController,
+            @Nonnull final StackWalker stackWalker,
+            @Nonnull final IastContext.Provider contextProvider) {
+        this.config = config;
+        this.reporter = reporter;
+        this.overheadController = overheadController;
+        this.stackWalker = stackWalker;
+        this.contextProvider = contextProvider;
+    }
+
+    public Config getConfig() {
+        return config;
+    }
+
+    public Reporter getReporter() {
+        return reporter;
+    }
+
+    public OverheadController getOverheadController() {
+        return overheadController;
+    }
+
+    public StackWalker getStackWalker() {
+        return stackWalker;
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/GrpcRequestMessageHandler.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/GrpcRequestMessageHandler.java
index 9ab09d3dbcc..6a9ef13ed4b 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/GrpcRequestMessageHandler.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/GrpcRequestMessageHandler.java
@@ -15,45 +15,44 @@
 
 public class GrpcRequestMessageHandler implements BiFunction<RequestContext, Object, Flow<Void>> {
 
-  /**
-   * This will cover:
-   *
-   * <ul>
-   *   <li>com.google.protobuf.GeneratedMessage
-   *   <li>com.google.protobuf.GeneratedMessageV3
-   *   <li>com.google.protobuf.GeneratedMessageLite
-   * </ul>
-   */
-  private static final String GENERATED_MESSAGE = "com.google.protobuf.GeneratedMessage";
+    /**
+     * This will cover:
+     *
+     * <ul>
+     *   <li>com.google.protobuf.GeneratedMessage
+     *   <li>com.google.protobuf.GeneratedMessageV3
+     *   <li>com.google.protobuf.GeneratedMessageLite
+     * </ul>
+     */
+    private static final String GENERATED_MESSAGE = "com.google.protobuf.GeneratedMessage";
 
-  /** Maps map to this class that does not implement Map interface */
-  private static final String MAP_FIELD = "com.google.protobuf.MapField";
+    /** Maps map to this class that does not implement Map interface */
+    private static final String MAP_FIELD = "com.google.protobuf.MapField";
 
-  @Override
-  public Flow<Void> apply(final RequestContext ctx, final Object o) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null && o != null) {
-      final IastContext iastCtx = ctx.getData(RequestContextSlot.IAST);
-      final byte source = SourceTypes.GRPC_BODY;
-      final int tainted =
-          module.taintObjectDeeply(
-              iastCtx, o, source, GrpcRequestMessageHandler::visitProtobufArtifact);
-      if (tainted > 0) {
-        IastMetricCollector.add(IastMetric.EXECUTED_SOURCE, source, tainted, iastCtx);
-      }
+    @Override
+    public Flow<Void> apply(final RequestContext ctx, final Object o) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null && o != null) {
+            final IastContext iastCtx = ctx.getData(RequestContextSlot.IAST);
+            final byte source = SourceTypes.GRPC_BODY;
+            final int tainted =
+                    module.taintObjectDeeply(iastCtx, o, source, GrpcRequestMessageHandler::visitProtobufArtifact);
+            if (tainted > 0) {
+                IastMetricCollector.add(IastMetric.EXECUTED_SOURCE, source, tainted, iastCtx);
+            }
+        }
+        return Flow.ResultFlow.empty();
     }
-    return Flow.ResultFlow.empty();
-  }
 
-  static boolean visitProtobufArtifact(@Nonnull final Class<?> kls) {
-    final Class<?> superClass = kls.getSuperclass();
-    if (superClass != null && superClass.getName().startsWith(GENERATED_MESSAGE)) {
-      return true; // GRPC custom messages
+    static boolean visitProtobufArtifact(@Nonnull final Class<?> kls) {
+        final Class<?> superClass = kls.getSuperclass();
+        if (superClass != null && superClass.getName().startsWith(GENERATED_MESSAGE)) {
+            return true; // GRPC custom messages
+        }
+        if (MAP_FIELD.equals(kls.getName())) {
+            return true; // a map that does not implement the map interface
+        }
+        // nested collections are safe in GRPC
+        return kls.isArray() || Iterable.class.isAssignableFrom(kls) || Map.class.isAssignableFrom(kls);
     }
-    if (MAP_FIELD.equals(kls.getName())) {
-      return true; // a map that does not implement the map interface
-    }
-    // nested collections are safe in GRPC
-    return kls.isArray() || Iterable.class.isAssignableFrom(kls) || Map.class.isAssignableFrom(kls);
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/HttpRouteHandler.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/HttpRouteHandler.java
index 2e6017254d8..711eba335ab 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/HttpRouteHandler.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/HttpRouteHandler.java
@@ -6,11 +6,11 @@
 
 public class HttpRouteHandler implements BiConsumer<RequestContext, String> {
 
-  @Override
-  public void accept(final RequestContext ctx, final String route) {
-    final IastRequestContext iastCtx = ctx.getData(RequestContextSlot.IAST);
-    if (iastCtx != null) {
-      iastCtx.setRoute(route);
+    @Override
+    public void accept(final RequestContext ctx, final String route) {
+        final IastRequestContext iastCtx = ctx.getData(RequestContextSlot.IAST);
+        if (iastCtx != null) {
+            iastCtx.setRoute(route);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastGlobalContext.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastGlobalContext.java
index 44be00c59be..638be7254d3 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastGlobalContext.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastGlobalContext.java
@@ -10,48 +10,47 @@
 
 public class IastGlobalContext implements IastContext {
 
-  private final TaintedObjects taintedObjects;
+    private final TaintedObjects taintedObjects;
 
-  public IastGlobalContext(final TaintedObjects taintedObjects) {
-    this.taintedObjects = taintedObjects;
-  }
-
-  @SuppressWarnings("unchecked")
-  @Nonnull
-  @Override
-  public TaintedObjects getTaintedObjects() {
-    return taintedObjects;
-  }
-
-  @Override
-  public void close() throws IOException {}
-
-  public static class Provider extends IastContext.Provider {
-
-    // (16384 * 4) buckets: approx 256K
-    static final int MAP_SIZE = TaintedMap.DEFAULT_CAPACITY * (1 << 2);
-    static final int MAX_AGE = TaintedMap.DEFAULT_MAX_AGE;
-    static final TimeUnit MAX_AGE_UNIT = TaintedMap.DEFAULT_MAX_AGE_UNIT;
-
-    // Map that with purge option
-    final IastContext globalContext =
-        new IastGlobalContext(
-            TaintedObjects.build(TaintedMap.buildWithPurge(MAP_SIZE, MAX_AGE, MAX_AGE_UNIT)));
-
-    @Nullable
-    @Override
-    public IastContext resolve() {
-      return globalContext;
+    public IastGlobalContext(final TaintedObjects taintedObjects) {
+        this.taintedObjects = taintedObjects;
     }
 
+    @SuppressWarnings("unchecked")
+    @Nonnull
     @Override
-    public IastContext buildRequestContext() {
-      return new IastRequestContext(globalContext.getTaintedObjects());
+    public TaintedObjects getTaintedObjects() {
+        return taintedObjects;
     }
 
     @Override
-    public void releaseRequestContext(@Nonnull final IastContext context) {
-      // nothing to release in global mode
+    public void close() throws IOException {}
+
+    public static class Provider extends IastContext.Provider {
+
+        // (16384 * 4) buckets: approx 256K
+        static final int MAP_SIZE = TaintedMap.DEFAULT_CAPACITY * (1 << 2);
+        static final int MAX_AGE = TaintedMap.DEFAULT_MAX_AGE;
+        static final TimeUnit MAX_AGE_UNIT = TaintedMap.DEFAULT_MAX_AGE_UNIT;
+
+        // Map that with purge option
+        final IastContext globalContext =
+                new IastGlobalContext(TaintedObjects.build(TaintedMap.buildWithPurge(MAP_SIZE, MAX_AGE, MAX_AGE_UNIT)));
+
+        @Nullable
+        @Override
+        public IastContext resolve() {
+            return globalContext;
+        }
+
+        @Override
+        public IastContext buildRequestContext() {
+            return new IastRequestContext(globalContext.getTaintedObjects());
+        }
+
+        @Override
+        public void releaseRequestContext(@Nonnull final IastContext context) {
+            // nothing to release in global mode
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastOptOutContext.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastOptOutContext.java
index 464e38b3681..81b7d7cef31 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastOptOutContext.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastOptOutContext.java
@@ -8,34 +8,34 @@
 
 public class IastOptOutContext implements IastContext {
 
-  @Nonnull
-  @SuppressWarnings("unchecked")
-  @Override
-  public TaintedObjects getTaintedObjects() {
-    return TaintedObjects.NoOp.INSTANCE;
-  }
+    @Nonnull
+    @SuppressWarnings("unchecked")
+    @Override
+    public TaintedObjects getTaintedObjects() {
+        return TaintedObjects.NoOp.INSTANCE;
+    }
 
-  @Override
-  public void close() throws IOException {}
+    @Override
+    public void close() throws IOException {}
 
-  public static class Provider extends IastContext.Provider {
+    public static class Provider extends IastContext.Provider {
 
-    final IastContext optOutContext = new IastOptOutContext();
+        final IastContext optOutContext = new IastOptOutContext();
 
-    @Nullable
-    @Override
-    public IastContext resolve() {
-      return optOutContext;
-    }
+        @Nullable
+        @Override
+        public IastContext resolve() {
+            return optOutContext;
+        }
 
-    @Override
-    public IastContext buildRequestContext() {
-      return new IastRequestContext(optOutContext.getTaintedObjects());
-    }
+        @Override
+        public IastContext buildRequestContext() {
+            return new IastRequestContext(optOutContext.getTaintedObjects());
+        }
 
-    @Override
-    public void releaseRequestContext(@Nonnull final IastContext context) {
-      // nothing to release in opt out mode
+        @Override
+        public void releaseRequestContext(@Nonnull final IastContext context) {
+            // nothing to release in opt out mode
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastRequestContext.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastRequestContext.java
index ebfd78c7d3e..ddb09f71124 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastRequestContext.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastRequestContext.java
@@ -24,200 +24,211 @@
 
 public class IastRequestContext implements IastContext, HasMetricCollector {
 
-  static final int MAP_SIZE = TaintedMap.DEFAULT_CAPACITY;
-
-  private final VulnerabilityBatch vulnerabilityBatch;
-  private final OverheadContext overheadContext;
-  private TaintedObjects taintedObjects;
-  @Nullable private Consumer<IastContext> release;
-  @Nullable private IastMetricCollector collector;
-  @Nullable private volatile String strictTransportSecurity;
-  @Nullable private volatile String xContentTypeOptions;
-  @Nullable private volatile String xForwardedProto;
-  @Nullable private volatile String contentType;
-  @Nullable private volatile String authorization;
-  @Nullable private volatile String route;
-
-  /**
-   * Use {@link IastRequestContext#IastRequestContext(TaintedObjects)} instead as we require more
-   * control over the tainted objects dictionaries
-   */
-  @Deprecated
-  public IastRequestContext() {
-    // map without purge (it will be cleared on request end)
-    this(TaintedObjects.build(TaintedMap.build(MAP_SIZE)));
-  }
-
-  public IastRequestContext(final TaintedObjects taintedObjects) {
-    this(taintedObjects, false);
-  }
-
-  public IastRequestContext(final TaintedObjects taintedObjects, boolean isGlobal) {
-    this.vulnerabilityBatch = new VulnerabilityBatch();
-    this.overheadContext =
-        new OverheadContext(Config.get().getIastVulnerabilitiesPerRequest(), isGlobal);
-    this.taintedObjects = taintedObjects;
-  }
-
-  /**
-   * Use this constructor only when you want to create a new context with a fresh overhead context
-   * (e.g. for testing purposes).
-   *
-   * @param taintedObjects the tainted objects to use
-   * @param overheadContext the overhead context to use
-   */
-  public IastRequestContext(
-      final TaintedObjects taintedObjects, final OverheadContext overheadContext) {
-    this.vulnerabilityBatch = new VulnerabilityBatch();
-    this.overheadContext = overheadContext;
-    this.taintedObjects = taintedObjects;
-  }
-
-  public VulnerabilityBatch getVulnerabilityBatch() {
-    return vulnerabilityBatch;
-  }
-
-  @Nullable
-  public String getStrictTransportSecurity() {
-    return strictTransportSecurity;
-  }
-
-  public void setStrictTransportSecurity(final String strictTransportSecurity) {
-    this.strictTransportSecurity = strictTransportSecurity;
-  }
-
-  @Nullable
-  public String getxContentTypeOptions() {
-    return xContentTypeOptions;
-  }
-
-  public void setxContentTypeOptions(final String xContentTypeOptions) {
-    this.xContentTypeOptions = xContentTypeOptions;
-  }
-
-  @Nullable
-  public String getxForwardedProto() {
-    return xForwardedProto;
-  }
-
-  public void setxForwardedProto(final String xForwardedProto) {
-    this.xForwardedProto = xForwardedProto;
-  }
-
-  @Nullable
-  public String getContentType() {
-    return contentType;
-  }
-
-  public void setContentType(final String contentType) {
-    this.contentType = contentType;
-  }
-
-  @Nullable
-  public String getAuthorization() {
-    return authorization;
-  }
-
-  public void setAuthorization(final String authorization) {
-    this.authorization = authorization;
-  }
-
-  @Nullable
-  public String getRoute() {
-    return route;
-  }
-
-  public void setRoute(final String route) {
-    this.route = route;
-  }
-
-  public OverheadContext getOverheadContext() {
-    return overheadContext;
-  }
-
-  @SuppressWarnings("unchecked")
-  @Nonnull
-  @Override
-  public TaintedObjects getTaintedObjects() {
-    return taintedObjects;
-  }
-
-  @Override
-  @Nullable
-  public IastMetricCollector getMetricCollector() {
-    return collector;
-  }
-
-  public void setCollector(@Nonnull final IastMetricCollector collector) {
-    this.collector = collector;
-  }
-
-  public void setTaintedObjects(@Nonnull final TaintedObjects taintedObjects) {
-    this.taintedObjects = taintedObjects;
-  }
-
-  @Override
-  public void close() throws IOException {
-    if (release != null) {
-      release.accept(this);
-      release = null;
-    }
-  }
-
-  public static class Provider extends IastContext.Provider {
-
-    // 16384 buckets: approx 64K
     static final int MAP_SIZE = TaintedMap.DEFAULT_CAPACITY;
 
-    private final Queue<TaintedObjects> pool =
-        new ArrayBlockingQueue<>(
-            Math.max(
-                Config.get().getIastMaxConcurrentRequests(), DEFAULT_IAST_MAX_CONCURRENT_REQUESTS));
+    private final VulnerabilityBatch vulnerabilityBatch;
+    private final OverheadContext overheadContext;
+    private TaintedObjects taintedObjects;
 
     @Nullable
+    private Consumer<IastContext> release;
+
+    @Nullable
+    private IastMetricCollector collector;
+
+    @Nullable
+    private volatile String strictTransportSecurity;
+
+    @Nullable
+    private volatile String xContentTypeOptions;
+
+    @Nullable
+    private volatile String xForwardedProto;
+
+    @Nullable
+    private volatile String contentType;
+
+    @Nullable
+    private volatile String authorization;
+
+    @Nullable
+    private volatile String route;
+
+    /**
+     * Use {@link IastRequestContext#IastRequestContext(TaintedObjects)} instead as we require more
+     * control over the tainted objects dictionaries
+     */
+    @Deprecated
+    public IastRequestContext() {
+        // map without purge (it will be cleared on request end)
+        this(TaintedObjects.build(TaintedMap.build(MAP_SIZE)));
+    }
+
+    public IastRequestContext(final TaintedObjects taintedObjects) {
+        this(taintedObjects, false);
+    }
+
+    public IastRequestContext(final TaintedObjects taintedObjects, boolean isGlobal) {
+        this.vulnerabilityBatch = new VulnerabilityBatch();
+        this.overheadContext = new OverheadContext(Config.get().getIastVulnerabilitiesPerRequest(), isGlobal);
+        this.taintedObjects = taintedObjects;
+    }
+
+    /**
+     * Use this constructor only when you want to create a new context with a fresh overhead context
+     * (e.g. for testing purposes).
+     *
+     * @param taintedObjects the tainted objects to use
+     * @param overheadContext the overhead context to use
+     */
+    public IastRequestContext(final TaintedObjects taintedObjects, final OverheadContext overheadContext) {
+        this.vulnerabilityBatch = new VulnerabilityBatch();
+        this.overheadContext = overheadContext;
+        this.taintedObjects = taintedObjects;
+    }
+
+    public VulnerabilityBatch getVulnerabilityBatch() {
+        return vulnerabilityBatch;
+    }
+
+    @Nullable
+    public String getStrictTransportSecurity() {
+        return strictTransportSecurity;
+    }
+
+    public void setStrictTransportSecurity(final String strictTransportSecurity) {
+        this.strictTransportSecurity = strictTransportSecurity;
+    }
+
+    @Nullable
+    public String getxContentTypeOptions() {
+        return xContentTypeOptions;
+    }
+
+    public void setxContentTypeOptions(final String xContentTypeOptions) {
+        this.xContentTypeOptions = xContentTypeOptions;
+    }
+
+    @Nullable
+    public String getxForwardedProto() {
+        return xForwardedProto;
+    }
+
+    public void setxForwardedProto(final String xForwardedProto) {
+        this.xForwardedProto = xForwardedProto;
+    }
+
+    @Nullable
+    public String getContentType() {
+        return contentType;
+    }
+
+    public void setContentType(final String contentType) {
+        this.contentType = contentType;
+    }
+
+    @Nullable
+    public String getAuthorization() {
+        return authorization;
+    }
+
+    public void setAuthorization(final String authorization) {
+        this.authorization = authorization;
+    }
+
+    @Nullable
+    public String getRoute() {
+        return route;
+    }
+
+    public void setRoute(final String route) {
+        this.route = route;
+    }
+
+    public OverheadContext getOverheadContext() {
+        return overheadContext;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Nonnull
     @Override
-    public IastContext resolve() {
-      final AgentSpan span = AgentTracer.activeSpan();
-      if (span == null) {
-        return null;
-      }
-      final RequestContext ctx = span.getRequestContext();
-      if (ctx == null) {
-        return null;
-      }
-      return ctx.getData(RequestContextSlot.IAST);
+    public TaintedObjects getTaintedObjects() {
+        return taintedObjects;
     }
 
     @Override
-    public IastContext buildRequestContext() {
-      TaintedObjects taintedObjects = pool.poll();
-      if (taintedObjects == null) {
-        taintedObjects = TaintedObjects.build(TaintedMap.build(MAP_SIZE));
-      }
-      final IastRequestContext ctx = new IastRequestContext(taintedObjects);
-      ctx.release = this::releaseRequestContext;
-      return ctx;
+    @Nullable
+    public IastMetricCollector getMetricCollector() {
+        return collector;
+    }
+
+    public void setCollector(@Nonnull final IastMetricCollector collector) {
+        this.collector = collector;
+    }
+
+    public void setTaintedObjects(@Nonnull final TaintedObjects taintedObjects) {
+        this.taintedObjects = taintedObjects;
     }
 
-    @SuppressWarnings("unchecked")
     @Override
-    public void releaseRequestContext(@Nonnull final IastContext context) {
-      final IastRequestContext iastCtx = (IastRequestContext) context;
-
-      // reset tainted objects map
-      final TaintedObjects taintedObjects = iastCtx.getTaintedObjects();
-      taintedObjects.clear();
-
-      // return to pool and update internal ref
-      final TaintedObjects unwrapped =
-          taintedObjects instanceof Wrapper
-              ? ((Wrapper<TaintedObjects>) taintedObjects).unwrap()
-              : taintedObjects;
-      if (unwrapped != TaintedObjects.NoOp.INSTANCE) {
-        pool.offer(unwrapped);
-        iastCtx.setTaintedObjects(TaintedObjects.NoOp.INSTANCE);
-      }
-      iastCtx.overheadContext.resetMaps();
-    }
-  }
+    public void close() throws IOException {
+        if (release != null) {
+            release.accept(this);
+            release = null;
+        }
+    }
+
+    public static class Provider extends IastContext.Provider {
+
+        // 16384 buckets: approx 64K
+        static final int MAP_SIZE = TaintedMap.DEFAULT_CAPACITY;
+
+        private final Queue<TaintedObjects> pool = new ArrayBlockingQueue<>(
+                Math.max(Config.get().getIastMaxConcurrentRequests(), DEFAULT_IAST_MAX_CONCURRENT_REQUESTS));
+
+        @Nullable
+        @Override
+        public IastContext resolve() {
+            final AgentSpan span = AgentTracer.activeSpan();
+            if (span == null) {
+                return null;
+            }
+            final RequestContext ctx = span.getRequestContext();
+            if (ctx == null) {
+                return null;
+            }
+            return ctx.getData(RequestContextSlot.IAST);
+        }
+
+        @Override
+        public IastContext buildRequestContext() {
+            TaintedObjects taintedObjects = pool.poll();
+            if (taintedObjects == null) {
+                taintedObjects = TaintedObjects.build(TaintedMap.build(MAP_SIZE));
+            }
+            final IastRequestContext ctx = new IastRequestContext(taintedObjects);
+            ctx.release = this::releaseRequestContext;
+            return ctx;
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public void releaseRequestContext(@Nonnull final IastContext context) {
+            final IastRequestContext iastCtx = (IastRequestContext) context;
+
+            // reset tainted objects map
+            final TaintedObjects taintedObjects = iastCtx.getTaintedObjects();
+            taintedObjects.clear();
+
+            // return to pool and update internal ref
+            final TaintedObjects unwrapped = taintedObjects instanceof Wrapper
+                    ? ((Wrapper<TaintedObjects>) taintedObjects).unwrap()
+                    : taintedObjects;
+            if (unwrapped != TaintedObjects.NoOp.INSTANCE) {
+                pool.offer(unwrapped);
+                iastCtx.setTaintedObjects(TaintedObjects.NoOp.INSTANCE);
+            }
+            iastCtx.overheadContext.resetMaps();
+        }
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastSystem.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastSystem.java
index e1992897a7d..bff6c6c4a1a 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastSystem.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastSystem.java
@@ -71,194 +71,186 @@
 
 public class IastSystem {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(IastSystem.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(IastSystem.class);
 
-  @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
-  public static boolean DEBUG = false;
+    @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
+    public static boolean DEBUG = false;
 
-  @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
-  public static Verbosity VERBOSITY = Verbosity.OFF;
+    @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
+    public static Verbosity VERBOSITY = Verbosity.OFF;
 
-  public static void start(final SubscriptionService ss) {
-    start(null, ss, null);
-  }
-
-  public static void start(final SubscriptionService ss, OverheadController overheadController) {
-    start(null, ss, overheadController);
-  }
-
-  public static void start(final Instrumentation instrumentation, final SubscriptionService ss) {
-    start(instrumentation, ss, null);
-  }
-
-  public static void start(
-      @Nullable final Instrumentation instrumentation,
-      final SubscriptionService ss,
-      @Nullable OverheadController overheadController) {
-    final Config config = Config.get();
-    final ProductActivation iast = config.getIastActivation();
-    final ProductActivation appSec = config.getAppSecActivation();
-    if (iast != FULLY_ENABLED && appSec != FULLY_ENABLED) {
-      LOGGER.debug("IAST is disabled: iast={}, appSec={}", iast, appSec);
-      return;
+    public static void start(final SubscriptionService ss) {
+        start(null, ss, null);
     }
-    DEBUG = config.isIastDebugEnabled();
-    VERBOSITY = config.getIastTelemetryVerbosity();
-    LOGGER.debug("IAST is starting: debug={}, verbosity={}", DEBUG, VERBOSITY);
-    if (VERBOSITY != Verbosity.OFF) {
-      IastMetricCollector.register(new IastMetricCollector());
+
+    public static void start(final SubscriptionService ss, OverheadController overheadController) {
+        start(null, ss, overheadController);
     }
-    final Reporter reporter = new Reporter(config, AgentTaskScheduler.get());
-    final boolean globalContext = config.getIastContextMode() == GLOBAL;
-    final IastContext.Provider contextProvider = contextProvider(iast, globalContext);
-    if (overheadController == null) {
-      overheadController =
-          OverheadController.build(
-              globalContext ? UNLIMITED : config.getIastRequestSampling(),
-              config.getIastMaxConcurrentRequests(),
-              globalContext,
-              AgentTaskScheduler.get());
+
+    public static void start(final Instrumentation instrumentation, final SubscriptionService ss) {
+        start(instrumentation, ss, null);
     }
-    IastContext.Provider.register(contextProvider);
-    final Dependencies dependencies =
-        new Dependencies(
-            config, reporter, overheadController, StackWalkerFactory.INSTANCE, contextProvider);
-    final boolean addTelemetry = config.getIastTelemetryVerbosity() != Verbosity.OFF;
-    iastModules(iast, dependencies).forEach(InstrumentationBridge::registerIastModule);
-    registerRequestStartedCallback(ss, addTelemetry, dependencies);
-    registerRequestEndedCallback(ss, addTelemetry, dependencies);
-    registerHeadersCallback(ss);
-    registerHttpRouteCallback(ss);
-    registerGrpcServerRequestMessageCallback(ss);
-    maybeApplySecurityControls(instrumentation);
-    LOGGER.debug("IAST started");
-  }
 
-  private static void maybeApplySecurityControls(@Nullable Instrumentation instrumentation) {
-    if (Config.get().getIastSecurityControlsConfiguration() == null || instrumentation == null) {
-      return;
+    public static void start(
+            @Nullable final Instrumentation instrumentation,
+            final SubscriptionService ss,
+            @Nullable OverheadController overheadController) {
+        final Config config = Config.get();
+        final ProductActivation iast = config.getIastActivation();
+        final ProductActivation appSec = config.getAppSecActivation();
+        if (iast != FULLY_ENABLED && appSec != FULLY_ENABLED) {
+            LOGGER.debug("IAST is disabled: iast={}, appSec={}", iast, appSec);
+            return;
+        }
+        DEBUG = config.isIastDebugEnabled();
+        VERBOSITY = config.getIastTelemetryVerbosity();
+        LOGGER.debug("IAST is starting: debug={}, verbosity={}", DEBUG, VERBOSITY);
+        if (VERBOSITY != Verbosity.OFF) {
+            IastMetricCollector.register(new IastMetricCollector());
+        }
+        final Reporter reporter = new Reporter(config, AgentTaskScheduler.get());
+        final boolean globalContext = config.getIastContextMode() == GLOBAL;
+        final IastContext.Provider contextProvider = contextProvider(iast, globalContext);
+        if (overheadController == null) {
+            overheadController = OverheadController.build(
+                    globalContext ? UNLIMITED : config.getIastRequestSampling(),
+                    config.getIastMaxConcurrentRequests(),
+                    globalContext,
+                    AgentTaskScheduler.get());
+        }
+        IastContext.Provider.register(contextProvider);
+        final Dependencies dependencies =
+                new Dependencies(config, reporter, overheadController, StackWalkerFactory.INSTANCE, contextProvider);
+        final boolean addTelemetry = config.getIastTelemetryVerbosity() != Verbosity.OFF;
+        iastModules(iast, dependencies).forEach(InstrumentationBridge::registerIastModule);
+        registerRequestStartedCallback(ss, addTelemetry, dependencies);
+        registerRequestEndedCallback(ss, addTelemetry, dependencies);
+        registerHeadersCallback(ss);
+        registerHttpRouteCallback(ss);
+        registerGrpcServerRequestMessageCallback(ss);
+        maybeApplySecurityControls(instrumentation);
+        LOGGER.debug("IAST started");
     }
-    Map<String, List<SecurityControl>> securityControls =
-        SecurityControlFormatter.format(Config.get().getIastSecurityControlsConfiguration());
-    if (securityControls == null) {
-      LOGGER.warn("No security controls to apply");
-      return;
+
+    private static void maybeApplySecurityControls(@Nullable Instrumentation instrumentation) {
+        if (Config.get().getIastSecurityControlsConfiguration() == null || instrumentation == null) {
+            return;
+        }
+        Map<String, List<SecurityControl>> securityControls =
+                SecurityControlFormatter.format(Config.get().getIastSecurityControlsConfiguration());
+        if (securityControls == null) {
+            LOGGER.warn("No security controls to apply");
+            return;
+        }
+        instrumentation.addTransformer(new IastSecurityControlTransformer(securityControls), true);
     }
-    instrumentation.addTransformer(new IastSecurityControlTransformer(securityControls), true);
-  }
 
-  private static IastContext.Provider contextProvider(
-      final ProductActivation iast, final boolean global) {
-    if (iast != FULLY_ENABLED) {
-      return new IastOptOutContext.Provider();
-    } else {
-      return global ? new IastGlobalContext.Provider() : new IastRequestContext.Provider();
+    private static IastContext.Provider contextProvider(final ProductActivation iast, final boolean global) {
+        if (iast != FULLY_ENABLED) {
+            return new IastOptOutContext.Provider();
+        } else {
+            return global ? new IastGlobalContext.Provider() : new IastRequestContext.Provider();
+        }
     }
-  }
 
-  private static Stream<IastModule> iastModules(
-      final ProductActivation iast, final Dependencies dependencies) {
-    Stream<Class<? extends IastModule>> modules =
-        Stream.of(
-            StringModuleImpl.class,
-            CodecModuleImpl.class,
-            SqlInjectionModuleImpl.class,
-            PathTraversalModuleImpl.class,
-            CommandInjectionModuleImpl.class,
-            WeakCipherModuleImpl.class,
-            WeakHashModuleImpl.class,
-            LdapInjectionModuleImpl.class,
-            PropagationModuleImpl.class,
-            HttpResponseHeaderModuleImpl.class,
-            HstsMissingHeaderModuleImpl.class,
-            InsecureCookieModuleImpl.class,
-            NoHttpOnlyCookieModuleImpl.class,
-            XContentTypeModuleImpl.class,
-            NoSameSiteCookieModuleImpl.class,
-            SsrfModuleImpl.class,
-            UnvalidatedRedirectModuleImpl.class,
-            WeakRandomnessModuleImpl.class,
-            XPathInjectionModuleImpl.class,
-            TrustBoundaryViolationModuleImpl.class,
-            XssModuleImpl.class,
-            StacktraceLeakModuleImpl.class,
-            HeaderInjectionModuleImpl.class,
-            ApplicationModuleImpl.class,
-            HardcodedSecretModuleImpl.class,
-            InsecureAuthProtocolModuleImpl.class,
-            ReflectionInjectionModuleImpl.class,
-            UntrustedDeserializationModuleImpl.class,
-            EmailInjectionModuleImpl.class,
-            CodeInjectionModuleImpl.class);
-    if (iast != FULLY_ENABLED) {
-      modules = modules.filter(IastSystem::isOptOut);
+    private static Stream<IastModule> iastModules(final ProductActivation iast, final Dependencies dependencies) {
+        Stream<Class<? extends IastModule>> modules = Stream.of(
+                StringModuleImpl.class,
+                CodecModuleImpl.class,
+                SqlInjectionModuleImpl.class,
+                PathTraversalModuleImpl.class,
+                CommandInjectionModuleImpl.class,
+                WeakCipherModuleImpl.class,
+                WeakHashModuleImpl.class,
+                LdapInjectionModuleImpl.class,
+                PropagationModuleImpl.class,
+                HttpResponseHeaderModuleImpl.class,
+                HstsMissingHeaderModuleImpl.class,
+                InsecureCookieModuleImpl.class,
+                NoHttpOnlyCookieModuleImpl.class,
+                XContentTypeModuleImpl.class,
+                NoSameSiteCookieModuleImpl.class,
+                SsrfModuleImpl.class,
+                UnvalidatedRedirectModuleImpl.class,
+                WeakRandomnessModuleImpl.class,
+                XPathInjectionModuleImpl.class,
+                TrustBoundaryViolationModuleImpl.class,
+                XssModuleImpl.class,
+                StacktraceLeakModuleImpl.class,
+                HeaderInjectionModuleImpl.class,
+                ApplicationModuleImpl.class,
+                HardcodedSecretModuleImpl.class,
+                InsecureAuthProtocolModuleImpl.class,
+                ReflectionInjectionModuleImpl.class,
+                UntrustedDeserializationModuleImpl.class,
+                EmailInjectionModuleImpl.class,
+                CodeInjectionModuleImpl.class);
+        if (iast != FULLY_ENABLED) {
+            modules = modules.filter(IastSystem::isOptOut);
+        }
+        return modules.map(type -> newIastModule(dependencies, type));
     }
-    return modules.map(type -> newIastModule(dependencies, type));
-  }
 
-  private static boolean isOptOut(final Class<? extends IastModule> module) {
-    for (final Class<?> itf : module.getInterfaces()) {
-      if (itf.getDeclaredAnnotation(IastModule.OptOut.class) != null) {
-        return true;
-      }
+    private static boolean isOptOut(final Class<? extends IastModule> module) {
+        for (final Class<?> itf : module.getInterfaces()) {
+            if (itf.getDeclaredAnnotation(IastModule.OptOut.class) != null) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 
-  @SuppressWarnings("unchecked")
-  private static <M extends IastModule> M newIastModule(
-      final Dependencies dependencies, final Class<M> type) {
-    try {
-      for (final Constructor<?> ctor : type.getDeclaredConstructors()) {
-        switch (ctor.getParameterCount()) {
-          case 0:
-            return (M) ctor.newInstance();
-          case 1:
-            if (ctor.getParameterTypes()[0] == Dependencies.class) {
-              return (M) ctor.newInstance(dependencies);
+    @SuppressWarnings("unchecked")
+    private static <M extends IastModule> M newIastModule(final Dependencies dependencies, final Class<M> type) {
+        try {
+            for (final Constructor<?> ctor : type.getDeclaredConstructors()) {
+                switch (ctor.getParameterCount()) {
+                    case 0:
+                        return (M) ctor.newInstance();
+                    case 1:
+                        if (ctor.getParameterTypes()[0] == Dependencies.class) {
+                            return (M) ctor.newInstance(dependencies);
+                        }
+                        break;
+                }
             }
-            break;
+            throw new RuntimeException("Cannot find constructor for the module " + type);
+        } catch (final Throwable e) {
+            // should never happen and be caught on IAST tests
+            throw new UndeclaredThrowableException(
+                    e, "Modules should have either default constructor or take only one param of type Dependencies");
         }
-      }
-      throw new RuntimeException("Cannot find constructor for the module " + type);
-    } catch (final Throwable e) {
-      // should never happen and be caught on IAST tests
-      throw new UndeclaredThrowableException(
-          e,
-          "Modules should have either default constructor or take only one param of type Dependencies");
     }
-  }
 
-  private static void registerRequestStartedCallback(
-      final SubscriptionService ss, final boolean addTelemetry, final Dependencies dependencies) {
-    final EventType<Supplier<Flow<Object>>> event = Events.get().requestStarted();
-    final Supplier<Flow<Object>> handler =
-        addTelemetry
-            ? new TelemetryRequestStartedHandler(dependencies)
-            : new RequestStartedHandler(dependencies);
-    ss.registerCallback(event, handler);
-  }
+    private static void registerRequestStartedCallback(
+            final SubscriptionService ss, final boolean addTelemetry, final Dependencies dependencies) {
+        final EventType<Supplier<Flow<Object>>> event = Events.get().requestStarted();
+        final Supplier<Flow<Object>> handler = addTelemetry
+                ? new TelemetryRequestStartedHandler(dependencies)
+                : new RequestStartedHandler(dependencies);
+        ss.registerCallback(event, handler);
+    }
 
-  private static void registerRequestEndedCallback(
-      final SubscriptionService ss, final boolean addTelemetry, final Dependencies dependencies) {
-    final EventType<BiFunction<RequestContext, IGSpanInfo, Flow<Void>>> event =
-        Events.get().requestEnded();
-    final RequestEndedHandler handler = new RequestEndedHandler(dependencies);
-    ss.registerCallback(event, addTelemetry ? new TelemetryRequestEndedHandler(handler) : handler);
-  }
+    private static void registerRequestEndedCallback(
+            final SubscriptionService ss, final boolean addTelemetry, final Dependencies dependencies) {
+        final EventType<BiFunction<RequestContext, IGSpanInfo, Flow<Void>>> event =
+                Events.get().requestEnded();
+        final RequestEndedHandler handler = new RequestEndedHandler(dependencies);
+        ss.registerCallback(event, addTelemetry ? new TelemetryRequestEndedHandler(handler) : handler);
+    }
 
-  private static void registerHeadersCallback(final SubscriptionService ss) {
-    final EventType<TriConsumer<RequestContext, String, String>> event =
-        Events.get().requestHeader();
-    final TriConsumer<RequestContext, String, String> handler = new RequestHeaderHandler();
-    ss.registerCallback(event, handler);
-  }
+    private static void registerHeadersCallback(final SubscriptionService ss) {
+        final EventType<TriConsumer<RequestContext, String, String>> event =
+                Events.get().requestHeader();
+        final TriConsumer<RequestContext, String, String> handler = new RequestHeaderHandler();
+        ss.registerCallback(event, handler);
+    }
 
-  private static void registerHttpRouteCallback(final SubscriptionService ss) {
-    ss.registerCallback(Events.get().httpRoute(), new HttpRouteHandler());
-  }
+    private static void registerHttpRouteCallback(final SubscriptionService ss) {
+        ss.registerCallback(Events.get().httpRoute(), new HttpRouteHandler());
+    }
 
-  private static void registerGrpcServerRequestMessageCallback(final SubscriptionService ss) {
-    ss.registerCallback(Events.get().grpcServerRequestMessage(), new GrpcRequestMessageHandler());
-  }
+    private static void registerGrpcServerRequestMessageCallback(final SubscriptionService ss) {
+        ss.registerCallback(Events.get().grpcServerRequestMessage(), new GrpcRequestMessageHandler());
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastTag.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastTag.java
index d17d59ac3ec..23801014c12 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastTag.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastTag.java
@@ -8,78 +8,78 @@
 
 public interface IastTag {
 
-  void setTagTop(@Nullable final TraceSegment trace);
+    void setTagTop(@Nullable final TraceSegment trace);
 
-  void setTag(@Nullable final AgentSpan span);
+    void setTag(@Nullable final AgentSpan span);
 
-  abstract class BaseTag<E> implements IastTag {
+    abstract class BaseTag<E> implements IastTag {
 
-    protected abstract String key();
+        protected abstract String key();
 
-    protected abstract E value();
+        protected abstract E value();
 
-    @Override
-    public void setTagTop(@Nullable final TraceSegment trace) {
-      if (trace != null) {
-        trace.setTagTop(key(), value());
-      }
-    }
+        @Override
+        public void setTagTop(@Nullable final TraceSegment trace) {
+            if (trace != null) {
+                trace.setTagTop(key(), value());
+            }
+        }
 
-    @Override
-    public void setTag(@Nullable final AgentSpan span) {
-      if (span != null) {
-        span.setTag(key(), value());
-      }
+        @Override
+        public void setTag(@Nullable final AgentSpan span) {
+            if (span != null) {
+                span.setTag(key(), value());
+            }
+        }
     }
-  }
-
-  class NoOp implements IastTag {
-    private static final IastTag INSTANCE = new NoOp();
-
-    @Override
-    public void setTagTop(@Nullable TraceSegment trace) {}
-
-    @Override
-    public void setTag(@Nullable AgentSpan span) {}
-  }
-
-  /**
-   * Sets the value for {@code "_dd.iast.enabled"} in the requests, if IAST is not full activated it
-   * should not set any values.
-   *
-   * <ul>
-   *   <li>{@code 0} for requests skipped by sampling.
-   *   <li>{@code 1} for requests analyzed by IAST.
-   * </ul>
-   */
-  class Enabled extends BaseTag<Integer> {
 
-    public static final IastTag SKIPPED = Enabled.withValue(0);
+    class NoOp implements IastTag {
+        private static final IastTag INSTANCE = new NoOp();
 
-    public static final IastTag ANALYZED = Enabled.withValue(1);
-
-    private final int value;
-
-    private Enabled(int value) {
-      this.value = value;
-    }
-
-    @Override
-    protected String key() {
-      return "_dd.iast.enabled";
-    }
+        @Override
+        public void setTagTop(@Nullable TraceSegment trace) {}
 
-    @Override
-    protected Integer value() {
-      return value;
+        @Override
+        public void setTag(@Nullable AgentSpan span) {}
     }
 
-    public static IastTag withValue(final int value) {
-      if (Config.get().getIastActivation() == ProductActivation.FULLY_ENABLED) {
-        return new Enabled(value);
-      } else {
-        return NoOp.INSTANCE;
-      }
+    /**
+     * Sets the value for {@code "_dd.iast.enabled"} in the requests, if IAST is not full activated it
+     * should not set any values.
+     *
+     * <ul>
+     *   <li>{@code 0} for requests skipped by sampling.
+     *   <li>{@code 1} for requests analyzed by IAST.
+     * </ul>
+     */
+    class Enabled extends BaseTag<Integer> {
+
+        public static final IastTag SKIPPED = Enabled.withValue(0);
+
+        public static final IastTag ANALYZED = Enabled.withValue(1);
+
+        private final int value;
+
+        private Enabled(int value) {
+            this.value = value;
+        }
+
+        @Override
+        protected String key() {
+            return "_dd.iast.enabled";
+        }
+
+        @Override
+        protected Integer value() {
+            return value;
+        }
+
+        public static IastTag withValue(final int value) {
+            if (Config.get().getIastActivation() == ProductActivation.FULLY_ENABLED) {
+                return new Enabled(value);
+            } else {
+                return NoOp.INSTANCE;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java
index f71035127ef..e2df5983f91 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java
@@ -37,166 +37,159 @@
 /** Reports IAST vulnerabilities. */
 public class Reporter {
 
-  private static final Logger LOG = LoggerFactory.getLogger(Reporter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Reporter.class);
 
-  private static final String IAST_TAG = "iast";
+    private static final String IAST_TAG = "iast";
 
-  private static final String VULNERABILITY_SPAN_NAME = "vulnerability";
-  public static final String METASTRUCT_VULNERABILITY = "vulnerability";
+    private static final String VULNERABILITY_SPAN_NAME = "vulnerability";
+    public static final String METASTRUCT_VULNERABILITY = "vulnerability";
 
-  private final Predicate<Vulnerability> duplicated;
+    private final Predicate<Vulnerability> duplicated;
 
-  Reporter() {
-    this(Config.get(), null);
-  }
-
-  public Reporter(final Config config, @Nullable final AgentTaskScheduler taskScheduler) {
-    this(
-        config.isIastDeduplicationEnabled()
-            ? new HashBasedDeduplication(taskScheduler)
-            : v -> false);
-  }
-
-  Reporter(final Predicate<Vulnerability> duplicate) {
-    this.duplicated = duplicate;
-  }
+    Reporter() {
+        this(Config.get(), null);
+    }
 
-  public void report(@Nullable final AgentSpan span, @Nonnull final Vulnerability vulnerability) {
-    if (duplicated.test(vulnerability)) {
-      return;
+    public Reporter(final Config config, @Nullable final AgentTaskScheduler taskScheduler) {
+        this(config.isIastDeduplicationEnabled() ? new HashBasedDeduplication(taskScheduler) : v -> false);
     }
-    if (span == null) {
-      final AgentSpan newSpan = startNewSpan();
-      try (final ContextScope autoClosed = tracer().activateManualSpan(newSpan)) {
-        vulnerability.updateSpan(newSpan);
-        reportVulnerability(newSpan, vulnerability);
-      } finally {
-        newSpan.finish();
-      }
-    } else {
-      reportVulnerability(span, vulnerability);
+
+    Reporter(final Predicate<Vulnerability> duplicate) {
+        this.duplicated = duplicate;
     }
-  }
-
-  private void reportVulnerability(
-      @Nonnull final AgentSpan span, @Nonnull final Vulnerability vulnerability) {
-    final VulnerabilityBatch batch = getOrCreateVulnerabilityBatch(span);
-    if (batch != null) {
-      batch.add(vulnerability);
-      if (Config.get().isIastStackTraceEnabled()
-          && batch.getVulnerabilities() != null
-          && vulnerability.getLocation().getStackId() == null) {
-        String stackId =
-            addVulnerabilityStackTrace(span, String.valueOf(batch.getVulnerabilities().size()));
-        if (stackId != null) {
-          vulnerability.getLocation().setStackId(stackId);
+
+    public void report(@Nullable final AgentSpan span, @Nonnull final Vulnerability vulnerability) {
+        if (duplicated.test(vulnerability)) {
+            return;
+        }
+        if (span == null) {
+            final AgentSpan newSpan = startNewSpan();
+            try (final ContextScope autoClosed = tracer().activateManualSpan(newSpan)) {
+                vulnerability.updateSpan(newSpan);
+                reportVulnerability(newSpan, vulnerability);
+            } finally {
+                newSpan.finish();
+            }
+        } else {
+            reportVulnerability(span, vulnerability);
         }
-      }
     }
-  }
 
-  @Nullable
-  private static String addVulnerabilityStackTrace(@Nonnull AgentSpan span, String index) {
-    final RequestContext reqCtx = span.getRequestContext();
-    if (reqCtx == null) {
-      return null;
-    }
-    List<StackTraceFrame> frames = StackUtils.generateUserCodeStackTrace();
-    StackTraceEvent stackTraceEvent = new StackTraceEvent(frames, DEFAULT_LANGUAGE, index, null);
-    StackUtils.addStacktraceEventsToMetaStruct(
-        reqCtx, METASTRUCT_VULNERABILITY, Collections.singletonList(stackTraceEvent));
-    return stackTraceEvent.getId();
-  }
-
-  @Nullable
-  private VulnerabilityBatch getOrCreateVulnerabilityBatch(final AgentSpan span) {
-    final RequestContext reqCtx = span.getRequestContext();
-    if (reqCtx == null) {
-      return null;
+    private void reportVulnerability(@Nonnull final AgentSpan span, @Nonnull final Vulnerability vulnerability) {
+        final VulnerabilityBatch batch = getOrCreateVulnerabilityBatch(span);
+        if (batch != null) {
+            batch.add(vulnerability);
+            if (Config.get().isIastStackTraceEnabled()
+                    && batch.getVulnerabilities() != null
+                    && vulnerability.getLocation().getStackId() == null) {
+                String stackId = addVulnerabilityStackTrace(
+                        span, String.valueOf(batch.getVulnerabilities().size()));
+                if (stackId != null) {
+                    vulnerability.getLocation().setStackId(stackId);
+                }
+            }
+        }
     }
-    final TraceSegment segment = reqCtx.getTraceSegment();
-    final Object current = segment.getDataTop(IAST_TAG);
-    if (current instanceof VulnerabilityBatch) {
-      return (VulnerabilityBatch) current;
+
+    @Nullable
+    private static String addVulnerabilityStackTrace(@Nonnull AgentSpan span, String index) {
+        final RequestContext reqCtx = span.getRequestContext();
+        if (reqCtx == null) {
+            return null;
+        }
+        List<StackTraceFrame> frames = StackUtils.generateUserCodeStackTrace();
+        StackTraceEvent stackTraceEvent = new StackTraceEvent(frames, DEFAULT_LANGUAGE, index, null);
+        StackUtils.addStacktraceEventsToMetaStruct(
+                reqCtx, METASTRUCT_VULNERABILITY, Collections.singletonList(stackTraceEvent));
+        return stackTraceEvent.getId();
     }
-    if (current == null) {
-      final IastRequestContext iastCtx = reqCtx.getData(RequestContextSlot.IAST);
-      final VulnerabilityBatch batch;
-      if (iastCtx != null) {
-        batch = iastCtx.getVulnerabilityBatch();
-      } else {
-        // in case the request is not handled by IAST create a new one and set the analyzed flag
-        batch = new VulnerabilityBatch();
-        ANALYZED.setTagTop(segment);
-      }
-      segment.setDataTop(IAST_TAG, batch);
-      // Once we have added a vulnerability, try to override sampling and keep the trace.
-      // TODO: We need to check if we can have an API with more fine-grained semantics on why traces
-      // are kept.
-      segment.setTagTop(Tags.ASM_KEEP, true);
-      segment.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
-      return batch;
+
+    @Nullable
+    private VulnerabilityBatch getOrCreateVulnerabilityBatch(final AgentSpan span) {
+        final RequestContext reqCtx = span.getRequestContext();
+        if (reqCtx == null) {
+            return null;
+        }
+        final TraceSegment segment = reqCtx.getTraceSegment();
+        final Object current = segment.getDataTop(IAST_TAG);
+        if (current instanceof VulnerabilityBatch) {
+            return (VulnerabilityBatch) current;
+        }
+        if (current == null) {
+            final IastRequestContext iastCtx = reqCtx.getData(RequestContextSlot.IAST);
+            final VulnerabilityBatch batch;
+            if (iastCtx != null) {
+                batch = iastCtx.getVulnerabilityBatch();
+            } else {
+                // in case the request is not handled by IAST create a new one and set the analyzed flag
+                batch = new VulnerabilityBatch();
+                ANALYZED.setTagTop(segment);
+            }
+            segment.setDataTop(IAST_TAG, batch);
+            // Once we have added a vulnerability, try to override sampling and keep the trace.
+            // TODO: We need to check if we can have an API with more fine-grained semantics on why traces
+            // are kept.
+            segment.setTagTop(Tags.ASM_KEEP, true);
+            segment.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
+            return batch;
+        }
+
+        // TODO: can we do better here? (maybe create a new span)
+        LOG.debug(SEND_TELEMETRY, "Cannot attach vulnerability to span, current={}", current);
+        return null;
     }
 
-    // TODO: can we do better here? (maybe create a new span)
-    LOG.debug(SEND_TELEMETRY, "Cannot attach vulnerability to span, current={}", current);
-    return null;
-  }
-
-  private AgentSpan startNewSpan() {
-    final AgentSpanContext tagContext =
-        new TagContext()
-            .withRequestContextDataIast(new IastRequestContext(TaintedObjects.NoOp.INSTANCE, true));
-    final AgentSpan span =
-        tracer()
-            .startSpan("iast", VULNERABILITY_SPAN_NAME, tagContext)
-            .setSpanType(InternalSpanTypes.VULNERABILITY);
-    ANALYZED.setTag(span);
-    return span;
-  }
-
-  protected AgentTracer.TracerAPI tracer() {
-    return AgentTracer.get();
-  }
-
-  /**
-   * This class maintains a set of vulnerability hashes that have already been reported, we don't
-   * care about thread safety too much as an occasional duplicated report is not a big deal.
-   */
-  protected static class HashBasedDeduplication implements Predicate<Vulnerability> {
-
-    private static final int DEFAULT_MAX_SIZE = 1000;
-
-    private final int maxSize;
-
-    private final Set<Long> hashes;
-
-    public HashBasedDeduplication(@Nullable final AgentTaskScheduler taskScheduler) {
-      this(DEFAULT_MAX_SIZE, taskScheduler);
+    private AgentSpan startNewSpan() {
+        final AgentSpanContext tagContext =
+                new TagContext().withRequestContextDataIast(new IastRequestContext(TaintedObjects.NoOp.INSTANCE, true));
+        final AgentSpan span = tracer().startSpan("iast", VULNERABILITY_SPAN_NAME, tagContext)
+                .setSpanType(InternalSpanTypes.VULNERABILITY);
+        ANALYZED.setTag(span);
+        return span;
     }
 
-    HashBasedDeduplication(final int size, @Nullable final AgentTaskScheduler taskScheduler) {
-      maxSize = size;
-      hashes = ConcurrentHashMap.newKeySet(size);
-      if (taskScheduler != null) {
-        // Reset deduplication cache every hour. This helps the backend when calculating exposure
-        // windows, by sending
-        // the same vulnerabilities from time to time.
-        taskScheduler.scheduleAtFixedRate(hashes::clear, 1, 1, TimeUnit.HOURS);
-      }
+    protected AgentTracer.TracerAPI tracer() {
+        return AgentTracer.get();
     }
 
-    @Override
-    public boolean test(final Vulnerability vulnerability) {
-      if (!vulnerability.getType().isDeduplicable()) {
-        return false;
-      }
-      final boolean newVulnerability = hashes.add(vulnerability.getHash());
-      if (newVulnerability && hashes.size() > maxSize) {
-        hashes.clear();
-        hashes.add(vulnerability.getHash());
-      }
-      return !newVulnerability;
+    /**
+     * This class maintains a set of vulnerability hashes that have already been reported, we don't
+     * care about thread safety too much as an occasional duplicated report is not a big deal.
+     */
+    protected static class HashBasedDeduplication implements Predicate<Vulnerability> {
+
+        private static final int DEFAULT_MAX_SIZE = 1000;
+
+        private final int maxSize;
+
+        private final Set<Long> hashes;
+
+        public HashBasedDeduplication(@Nullable final AgentTaskScheduler taskScheduler) {
+            this(DEFAULT_MAX_SIZE, taskScheduler);
+        }
+
+        HashBasedDeduplication(final int size, @Nullable final AgentTaskScheduler taskScheduler) {
+            maxSize = size;
+            hashes = ConcurrentHashMap.newKeySet(size);
+            if (taskScheduler != null) {
+                // Reset deduplication cache every hour. This helps the backend when calculating exposure
+                // windows, by sending
+                // the same vulnerabilities from time to time.
+                taskScheduler.scheduleAtFixedRate(hashes::clear, 1, 1, TimeUnit.HOURS);
+            }
+        }
+
+        @Override
+        public boolean test(final Vulnerability vulnerability) {
+            if (!vulnerability.getType().isDeduplicable()) {
+                return false;
+            }
+            final boolean newVulnerability = hashes.add(vulnerability.getHash());
+            if (newVulnerability && hashes.size() > maxSize) {
+                hashes.clear();
+                hashes.add(vulnerability.getHash());
+            }
+            return !newVulnerability;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestEndedHandler.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestEndedHandler.java
index 1762f618f57..6e58cb6fffa 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestEndedHandler.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestEndedHandler.java
@@ -17,41 +17,41 @@
 
 public class RequestEndedHandler implements BiFunction<RequestContext, IGSpanInfo, Flow<Void>> {
 
-  private final OverheadController overheadController;
-  private final IastContext.Provider contextProvider;
+    private final OverheadController overheadController;
+    private final IastContext.Provider contextProvider;
 
-  public RequestEndedHandler(@Nonnull final Dependencies dependencies) {
-    this.overheadController = dependencies.getOverheadController();
-    this.contextProvider = dependencies.contextProvider;
-  }
+    public RequestEndedHandler(@Nonnull final Dependencies dependencies) {
+        this.overheadController = dependencies.getOverheadController();
+        this.contextProvider = dependencies.contextProvider;
+    }
 
-  @Override
-  public Flow<Void> apply(final RequestContext requestContext, final IGSpanInfo igSpanInfo) {
-    final TraceSegment traceSegment = requestContext.getTraceSegment();
-    final IastContext iastCtx = requestContext.getData(RequestContextSlot.IAST);
-    if (iastCtx != null) {
-      for (HttpRequestEndModule module : requestEndModules()) {
-        if (module != null) {
-          module.onRequestEnd(iastCtx, igSpanInfo);
+    @Override
+    public Flow<Void> apply(final RequestContext requestContext, final IGSpanInfo igSpanInfo) {
+        final TraceSegment traceSegment = requestContext.getTraceSegment();
+        final IastContext iastCtx = requestContext.getData(RequestContextSlot.IAST);
+        if (iastCtx != null) {
+            for (HttpRequestEndModule module : requestEndModules()) {
+                if (module != null) {
+                    module.onRequestEnd(iastCtx, igSpanInfo);
+                }
+            }
+            try {
+                ANALYZED.setTagTop(traceSegment);
+                contextProvider.releaseRequestContext(iastCtx);
+            } finally {
+                overheadController.releaseRequest();
+            }
+        } else {
+            SKIPPED.setTagTop(traceSegment);
         }
-      }
-      try {
-        ANALYZED.setTagTop(traceSegment);
-        contextProvider.releaseRequestContext(iastCtx);
-      } finally {
-        overheadController.releaseRequest();
-      }
-    } else {
-      SKIPPED.setTagTop(traceSegment);
+        return Flow.ResultFlow.empty();
     }
-    return Flow.ResultFlow.empty();
-  }
 
-  private HttpRequestEndModule[] requestEndModules() {
-    return new HttpRequestEndModule[] {
-      InstrumentationBridge.HSTS_MISSING_HEADER_MODULE,
-      InstrumentationBridge.X_CONTENT_TYPE_HEADER_MODULE,
-      InstrumentationBridge.INSECURE_AUTH_PROTOCOL
-    };
-  }
+    private HttpRequestEndModule[] requestEndModules() {
+        return new HttpRequestEndModule[] {
+            InstrumentationBridge.HSTS_MISSING_HEADER_MODULE,
+            InstrumentationBridge.X_CONTENT_TYPE_HEADER_MODULE,
+            InstrumentationBridge.INSECURE_AUTH_PROTOCOL
+        };
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestHeaderHandler.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestHeaderHandler.java
index e595ac740e9..d882a01e650 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestHeaderHandler.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestHeaderHandler.java
@@ -7,14 +7,14 @@
 
 public class RequestHeaderHandler implements TriConsumer<RequestContext, String, String> {
 
-  @Override
-  public void accept(RequestContext requestContext, String key, String value) {
-    final IastRequestContext ctx = requestContext.getData(RequestContextSlot.IAST);
-    if (null != ctx && key != null) {
-      final HttpHeader header = HttpHeader.from(key);
-      if (header != null) {
-        header.addToContext(ctx, value);
-      }
+    @Override
+    public void accept(RequestContext requestContext, String key, String value) {
+        final IastRequestContext ctx = requestContext.getData(RequestContextSlot.IAST);
+        if (null != ctx && key != null) {
+            final HttpHeader header = HttpHeader.from(key);
+            if (header != null) {
+                header.addToContext(ctx, value);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestStartedHandler.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestStartedHandler.java
index 69e1ea3a779..c0210c8897f 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestStartedHandler.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/RequestStartedHandler.java
@@ -8,23 +8,23 @@
 
 public class RequestStartedHandler implements Supplier<Flow<Object>> {
 
-  private final OverheadController overheadController;
-  private final IastContext.Provider contextProvider;
+    private final OverheadController overheadController;
+    private final IastContext.Provider contextProvider;
 
-  public RequestStartedHandler(@Nonnull final Dependencies dependencies) {
-    this.overheadController = dependencies.getOverheadController();
-    this.contextProvider = dependencies.contextProvider;
-  }
+    public RequestStartedHandler(@Nonnull final Dependencies dependencies) {
+        this.overheadController = dependencies.getOverheadController();
+        this.contextProvider = dependencies.contextProvider;
+    }
 
-  @Override
-  public Flow<Object> get() {
-    if (!overheadController.acquireRequest()) {
-      return Flow.ResultFlow.empty();
+    @Override
+    public Flow<Object> get() {
+        if (!overheadController.acquireRequest()) {
+            return Flow.ResultFlow.empty();
+        }
+        return new Flow.ResultFlow<>(newContext());
     }
-    return new Flow.ResultFlow<>(newContext());
-  }
 
-  protected IastRequestContext newContext() {
-    return (IastRequestContext) contextProvider.buildRequestContext();
-  }
+    protected IastRequestContext newContext() {
+        return (IastRequestContext) contextProvider.buildRequestContext();
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Evidence.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Evidence.java
index ab6d91ecbb4..0bc345d1ed1 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Evidence.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Evidence.java
@@ -9,98 +9,98 @@
 
 public final class Evidence {
 
-  private final @Nonnull String value;
-
-  private final @Nullable Range[] ranges;
-
-  /** Extra context needed for the evidence, for instance Database in case of a SQLi */
-  private final transient @Nonnull Context context = new Evidence.Context(4);
-
-  /** For deserialization in tests via moshi */
-  @Deprecated
-  @SuppressWarnings({"NullAway", "DataFlowIssue", "unused"})
-  private Evidence() {
-    this(null, null);
-  }
-
-  public Evidence(final String value) {
-    this(value, null);
-  }
-
-  public Evidence(@Nonnull final String value, @Nullable final Range[] ranges) {
-    this.value = value;
-    this.ranges = consolidate(ranges);
-  }
-
-  @Nonnull
-  public String getValue() {
-    return value;
-  }
-
-  @Nullable
-  public Range[] getRanges() {
-    return ranges;
-  }
-
-  @Nonnull
-  public Context getContext() {
-    return context;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    Evidence evidence = (Evidence) o;
-    return Objects.equals(value, evidence.value) && Arrays.equals(ranges, evidence.ranges);
-  }
-
-  @Override
-  public int hashCode() {
-    int result = Objects.hash(value);
-    result = 31 * result + Arrays.hashCode(ranges);
-    return result;
-  }
-
-  /**
-   * This method ensures that once a vulnerability has been found, all of it range names and values
-   * are strongly reachable preventing the GC from freeing them before the vul is reported. The
-   * newly created ranges have a lifespan equal to the target vulnerability.
-   */
-  @Nullable
-  private static Range[] consolidate(@Nullable final Range[] ranges) {
-    if (ranges == null || ranges.length == 0) {
-      return ranges;
+    private final @Nonnull String value;
+
+    private final @Nullable Range[] ranges;
+
+    /** Extra context needed for the evidence, for instance Database in case of a SQLi */
+    private final transient @Nonnull Context context = new Evidence.Context(4);
+
+    /** For deserialization in tests via moshi */
+    @Deprecated
+    @SuppressWarnings({"NullAway", "DataFlowIssue", "unused"})
+    private Evidence() {
+        this(null, null);
     }
-    final Range[] result = new Range[ranges.length];
-    for (int i = 0; i < ranges.length; i++) {
-      result[i] = ranges[i].consolidate();
+
+    public Evidence(final String value) {
+        this(value, null);
     }
-    return result;
-  }
 
-  public static class Context {
+    public Evidence(@Nonnull final String value, @Nullable final Range[] ranges) {
+        this.value = value;
+        this.ranges = consolidate(ranges);
+    }
 
-    private final Map<String, Object> context;
-    private final int maxSize;
+    @Nonnull
+    public String getValue() {
+        return value;
+    }
 
-    public Context(final int maxSize) {
-      this.context = new HashMap<>();
-      this.maxSize = maxSize;
+    @Nullable
+    public Range[] getRanges() {
+        return ranges;
     }
 
-    public boolean put(final String key, final Object value) {
-      if (context.size() >= maxSize && !context.containsKey(key)) {
-        return false;
-      }
-      context.put(key, value);
-      return true;
+    @Nonnull
+    public Context getContext() {
+        return context;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Evidence evidence = (Evidence) o;
+        return Objects.equals(value, evidence.value) && Arrays.equals(ranges, evidence.ranges);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = Objects.hash(value);
+        result = 31 * result + Arrays.hashCode(ranges);
+        return result;
+    }
+
+    /**
+     * This method ensures that once a vulnerability has been found, all of it range names and values
+     * are strongly reachable preventing the GC from freeing them before the vul is reported. The
+     * newly created ranges have a lifespan equal to the target vulnerability.
+     */
     @Nullable
-    @SuppressWarnings("unchecked")
-    public <E> E get(@Nonnull final String key) {
-      return (E) context.get(key);
+    private static Range[] consolidate(@Nullable final Range[] ranges) {
+        if (ranges == null || ranges.length == 0) {
+            return ranges;
+        }
+        final Range[] result = new Range[ranges.length];
+        for (int i = 0; i < ranges.length; i++) {
+            result[i] = ranges[i].consolidate();
+        }
+        return result;
+    }
+
+    public static class Context {
+
+        private final Map<String, Object> context;
+        private final int maxSize;
+
+        public Context(final int maxSize) {
+            this.context = new HashMap<>();
+            this.maxSize = maxSize;
+        }
+
+        public boolean put(final String key, final Object value) {
+            if (context.size() >= maxSize && !context.containsKey(key)) {
+                return false;
+            }
+            context.put(key, value);
+            return true;
+        }
+
+        @Nullable
+        @SuppressWarnings("unchecked")
+        public <E> E get(@Nonnull final String key) {
+            return (E) context.get(key);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Location.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Location.java
index 4f31240d7fd..34dec2f1b85 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Location.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Location.java
@@ -5,105 +5,103 @@
 
 public final class Location {
 
-  @Nullable private final String path;
-
-  private final int line;
-
-  @Nullable private final String method;
-
-  @Nullable private Long spanId;
-
-  @Nullable private transient String serviceName;
-
-  private @Nullable String stackId;
-
-  private Location(
-      @Nullable final Long spanId,
-      @Nullable final String path,
-      final int line,
-      @Nullable final String method,
-      @Nullable final String serviceName) {
-    this.spanId = spanId;
-    this.path = path;
-    this.line = line;
-    this.method = method;
-    this.serviceName = serviceName;
-  }
-
-  public static Location forSpanAndStack(
-      @Nullable final AgentSpan span, final StackTraceElement stack) {
-    return new Location(
-        spanId(span),
-        stack.getClassName(),
-        stack.getLineNumber(),
-        stack.getMethodName(),
-        serviceName(span));
-  }
-
-  public static Location forSpanAndClassAndMethod(
-      @Nullable final AgentSpan span, final String clazz, final String method) {
-    return new Location(spanId(span), clazz, -1, method, serviceName(span));
-  }
-
-  public static Location forSpanAndFileAndLine(
-      @Nullable final AgentSpan span, final String file, final int line) {
-    return new Location(spanId(span), file, line, null, serviceName(span));
-  }
-
-  public static Location forSpan(@Nullable final AgentSpan span) {
-    return new Location(spanId(span), null, -1, null, serviceName(span));
-  }
-
-  public static Location forClassAndMethodAndLine(String clazz, String method, int currentLine) {
-    return new Location(null, clazz, currentLine, method, null);
-  }
-
-  public long getSpanId() {
-    return spanId == null ? 0 : spanId;
-  }
-
-  @Nullable
-  public String getPath() {
-    return path;
-  }
-
-  public int getLine() {
-    return line;
-  }
-
-  @Nullable
-  public String getMethod() {
-    return method;
-  }
-
-  @Nullable
-  public String getServiceName() {
-    return serviceName;
-  }
-
-  public void updateSpan(@Nullable final AgentSpan span) {
-    if (span != null) {
-      this.spanId = span.getSpanId();
-      this.serviceName = span.getServiceName();
-    }
-  }
-
-  @Nullable
-  public String getStackId() {
-    return stackId;
-  }
-
-  public void setStackId(@Nullable String stackId) {
-    this.stackId = stackId;
-  }
-
-  @Nullable
-  private static Long spanId(@Nullable AgentSpan span) {
-    return span != null ? span.getSpanId() : null;
-  }
-
-  @Nullable
-  private static String serviceName(@Nullable AgentSpan span) {
-    return span != null ? span.getServiceName() : null;
-  }
+    @Nullable
+    private final String path;
+
+    private final int line;
+
+    @Nullable
+    private final String method;
+
+    @Nullable
+    private Long spanId;
+
+    @Nullable
+    private transient String serviceName;
+
+    private @Nullable String stackId;
+
+    private Location(
+            @Nullable final Long spanId,
+            @Nullable final String path,
+            final int line,
+            @Nullable final String method,
+            @Nullable final String serviceName) {
+        this.spanId = spanId;
+        this.path = path;
+        this.line = line;
+        this.method = method;
+        this.serviceName = serviceName;
+    }
+
+    public static Location forSpanAndStack(@Nullable final AgentSpan span, final StackTraceElement stack) {
+        return new Location(
+                spanId(span), stack.getClassName(), stack.getLineNumber(), stack.getMethodName(), serviceName(span));
+    }
+
+    public static Location forSpanAndClassAndMethod(
+            @Nullable final AgentSpan span, final String clazz, final String method) {
+        return new Location(spanId(span), clazz, -1, method, serviceName(span));
+    }
+
+    public static Location forSpanAndFileAndLine(@Nullable final AgentSpan span, final String file, final int line) {
+        return new Location(spanId(span), file, line, null, serviceName(span));
+    }
+
+    public static Location forSpan(@Nullable final AgentSpan span) {
+        return new Location(spanId(span), null, -1, null, serviceName(span));
+    }
+
+    public static Location forClassAndMethodAndLine(String clazz, String method, int currentLine) {
+        return new Location(null, clazz, currentLine, method, null);
+    }
+
+    public long getSpanId() {
+        return spanId == null ? 0 : spanId;
+    }
+
+    @Nullable
+    public String getPath() {
+        return path;
+    }
+
+    public int getLine() {
+        return line;
+    }
+
+    @Nullable
+    public String getMethod() {
+        return method;
+    }
+
+    @Nullable
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    public void updateSpan(@Nullable final AgentSpan span) {
+        if (span != null) {
+            this.spanId = span.getSpanId();
+            this.serviceName = span.getServiceName();
+        }
+    }
+
+    @Nullable
+    public String getStackId() {
+        return stackId;
+    }
+
+    public void setStackId(@Nullable String stackId) {
+        this.stackId = stackId;
+    }
+
+    @Nullable
+    private static Long spanId(@Nullable AgentSpan span) {
+        return span != null ? span.getSpanId() : null;
+    }
+
+    @Nullable
+    private static String serviceName(@Nullable AgentSpan span) {
+        return span != null ? span.getServiceName() : null;
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Range.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Range.java
index 25b0dbab667..d5e573cf681 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Range.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Range.java
@@ -14,97 +14,96 @@
 
 public final class Range implements Ranged {
 
-  private final @Nonnegative int start;
-  private final @Nonnegative int length;
-  private final @Nonnull @SourceIndex Source source;
-  private final int marks;
-
-  public Range(final int start, final int length, @Nonnull final Source source, final int marks) {
-    this.start = start;
-    this.length = length;
-    this.source = source;
-    this.marks = marks;
-  }
-
-  @Override
-  public int getStart() {
-    return start;
-  }
-
-  @Override
-  public int getLength() {
-    return length;
-  }
-
-  @Nonnull
-  public Source getSource() {
-    return source;
-  }
-
-  public int getMarks() {
-    return marks;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    private final @Nonnegative int start;
+    private final @Nonnegative int length;
+    private final @Nonnull @SourceIndex Source source;
+    private final int marks;
+
+    public Range(final int start, final int length, @Nonnull final Source source, final int marks) {
+        this.start = start;
+        this.length = length;
+        this.source = source;
+        this.marks = marks;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public int getStart() {
+        return start;
+    }
+
+    @Override
+    public int getLength() {
+        return length;
+    }
+
+    @Nonnull
+    public Source getSource() {
+        return source;
+    }
+
+    public int getMarks() {
+        return marks;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Range range = (Range) o;
+        return start == range.start && length == range.length && Objects.equals(source, range.source);
+    }
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", Range.class.getSimpleName() + "[", "]")
+                .add("start=" + start)
+                .add("length=" + length)
+                .add("source=" + source)
+                .toString();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(start, length, source);
     }
-    Range range = (Range) o;
-    return start == range.start && length == range.length && Objects.equals(source, range.source);
-  }
-
-  @Override
-  public String toString() {
-    return new StringJoiner(", ", Range.class.getSimpleName() + "[", "]")
-        .add("start=" + start)
-        .add("length=" + length)
-        .add("source=" + source)
-        .toString();
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(start, length, source);
-  }
-
-  public boolean isValid() {
-    return start >= 0 && length >= 0 && source != null;
-  }
-
-  public Range shift(final int offset) {
-    if (offset == 0) {
-      return this;
+
+    public boolean isValid() {
+        return start >= 0 && length >= 0 && source != null;
     }
-    return new Range(start + offset, length, source, marks);
-  }
 
-  public boolean isMarked(final int mark) {
-    return (marks & mark) != NOT_MARKED;
-  }
+    public Range shift(final int offset) {
+        if (offset == 0) {
+            return this;
+        }
+        return new Range(start + offset, length, source, marks);
+    }
 
-  /** Creates a version of the range without weak references to be used in vulnerabilities */
-  public Range consolidate() {
-    if (!source.isReference()) {
-      return this;
+    public boolean isMarked(final int mark) {
+        return (marks & mark) != NOT_MARKED;
     }
-    return new Range(
-        start, length, new Source(source.getOrigin(), source.getName(), source.getValue()), marks);
-  }
 
-  public @Nullable Set<VulnerabilityType> getMarkedVulnerabilities() {
-    if (marks == NOT_MARKED) {
-      return null;
+    /** Creates a version of the range without weak references to be used in vulnerabilities */
+    public Range consolidate() {
+        if (!source.isReference()) {
+            return this;
+        }
+        return new Range(start, length, new Source(source.getOrigin(), source.getName(), source.getValue()), marks);
     }
-    Set<VulnerabilityType> vulnerabilities = new HashSet<>();
-    for (VulnerabilityType type : VulnerabilityType.MARKED_VULNERABILITIES) {
-      if ((marks & type.mark()) != 0) {
-        vulnerabilities.add(type);
-      }
+
+    public @Nullable Set<VulnerabilityType> getMarkedVulnerabilities() {
+        if (marks == NOT_MARKED) {
+            return null;
+        }
+        Set<VulnerabilityType> vulnerabilities = new HashSet<>();
+        for (VulnerabilityType type : VulnerabilityType.MARKED_VULNERABILITIES) {
+            if ((marks & type.mark()) != 0) {
+                vulnerabilities.add(type);
+            }
+        }
+        return vulnerabilities;
     }
-    return vulnerabilities;
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Source.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Source.java
index 854c38b9234..471a2ea936e 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Source.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Source.java
@@ -15,115 +15,115 @@
 
 public final class Source implements Taintable.Source {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(Source.class);
-
-  /** Placeholder for non char sequence objects */
-  public static final Object PROPAGATION_PLACEHOLDER = new Object();
-
-  /** value to send in the rare case that the name/value have been garbage collected */
-  public static final String GARBAGE_COLLECTED_REF =
-      "[unknown: original value was garbage collected]";
-
-  private final @SourceTypeString byte origin;
-  @Nullable private final Object name;
-  @Nullable private final Object value;
-  private boolean gcReported;
-
-  public Source(final byte origin, @Nullable final Object name, @Nullable final Object value) {
-    this.origin = origin;
-    this.name = name;
-    this.value = value;
-  }
-
-  @Override
-  public byte getOrigin() {
-    return origin;
-  }
-
-  @Override
-  @Nullable
-  public String getName() {
-    return asString(name);
-  }
-
-  @Override
-  @Nullable
-  public String getValue() {
-    return asString(value);
-  }
-
-  /** This will expose the internal reference so be careful */
-  @Nullable
-  public Object getRawValue() {
-    if (value == null) {
-      return null;
+    private static final Logger LOGGER = LoggerFactory.getLogger(Source.class);
+
+    /** Placeholder for non char sequence objects */
+    public static final Object PROPAGATION_PLACEHOLDER = new Object();
+
+    /** value to send in the rare case that the name/value have been garbage collected */
+    public static final String GARBAGE_COLLECTED_REF = "[unknown: original value was garbage collected]";
+
+    private final @SourceTypeString byte origin;
+
+    @Nullable
+    private final Object name;
+
+    @Nullable
+    private final Object value;
+
+    private boolean gcReported;
+
+    public Source(final byte origin, @Nullable final Object name, @Nullable final Object value) {
+        this.origin = origin;
+        this.name = name;
+        this.value = value;
+    }
+
+    @Override
+    public byte getOrigin() {
+        return origin;
+    }
+
+    @Override
+    @Nullable
+    public String getName() {
+        return asString(name);
+    }
+
+    @Override
+    @Nullable
+    public String getValue() {
+        return asString(value);
     }
-    if (value instanceof Reference<?>) {
-      return ((Reference<?>) value).get();
+
+    /** This will expose the internal reference so be careful */
+    @Nullable
+    public Object getRawValue() {
+        if (value == null) {
+            return null;
+        }
+        if (value instanceof Reference<?>) {
+            return ((Reference<?>) value).get();
+        }
+        return value;
     }
-    return value;
-  }
-
-  @SuppressFBWarnings(
-      value = "DM_STRING_CTOR",
-      justification = "New string instance requires constructor")
-  @SuppressWarnings("StringOperationCanBeSimplified")
-  @Nullable
-  private String asString(@Nullable final Object target) {
-    Object value = target;
-    if (value == PROPAGATION_PLACEHOLDER) {
-      value = null;
-    } else if (value instanceof Reference) {
-      value = ((Reference<?>) value).get();
-      if (value != null) {
-        // avoid exposing internal weak reference to the outer world
-        value = new String(value.toString());
-      } else {
-        value = GARBAGE_COLLECTED_REF;
-        if (!gcReported) {
-          gcReported = true;
-          LOGGER.debug(
-              SEND_TELEMETRY,
-              "Source value lost due to GC, origin={}",
-              SourceTypes.toString(origin));
+
+    @SuppressFBWarnings(value = "DM_STRING_CTOR", justification = "New string instance requires constructor")
+    @SuppressWarnings("StringOperationCanBeSimplified")
+    @Nullable
+    private String asString(@Nullable final Object target) {
+        Object value = target;
+        if (value == PROPAGATION_PLACEHOLDER) {
+            value = null;
+        } else if (value instanceof Reference) {
+            value = ((Reference<?>) value).get();
+            if (value != null) {
+                // avoid exposing internal weak reference to the outer world
+                value = new String(value.toString());
+            } else {
+                value = GARBAGE_COLLECTED_REF;
+                if (!gcReported) {
+                    gcReported = true;
+                    LOGGER.debug(
+                            SEND_TELEMETRY, "Source value lost due to GC, origin={}", SourceTypes.toString(origin));
+                }
+            }
         }
-      }
+        return value instanceof String ? (String) value : null;
     }
-    return value instanceof String ? (String) value : null;
-  }
-
-  @Override
-  public String toString() {
-    return new StringJoiner(", ", Source.class.getSimpleName() + "[", "]")
-        .add("origin=" + SourceTypes.toString(origin))
-        .add("name='" + getName() + "'")
-        .add("value='" + getValue() + "'")
-        .toString();
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    Source source = (Source) o;
-    return origin == source.origin
-        && Objects.equals(getName(), source.getName())
-        && Objects.equals(getValue(), source.getValue());
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(origin, getName(), getValue());
-  }
-
-  public Source attachValue(final Object newValue) {
-    if (value != PROPAGATION_PLACEHOLDER) {
-      return this;
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", Source.class.getSimpleName() + "[", "]")
+                .add("origin=" + SourceTypes.toString(origin))
+                .add("name='" + getName() + "'")
+                .add("value='" + getValue() + "'")
+                .toString();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Source source = (Source) o;
+        return origin == source.origin
+                && Objects.equals(getName(), source.getName())
+                && Objects.equals(getValue(), source.getValue());
     }
-    return new Source(origin, name, newValue);
-  }
 
-  public boolean isReference() {
-    return name instanceof Reference || value instanceof Reference;
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(origin, getName(), getValue());
+    }
+
+    public Source attachValue(final Object newValue) {
+        if (value != PROPAGATION_PLACEHOLDER) {
+            return this;
+        }
+        return new Source(origin, name, newValue);
+    }
+
+    public boolean isReference() {
+        return name instanceof Reference || value instanceof Reference;
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Vulnerability.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Vulnerability.java
index a9ba093279d..f215f2e5831 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Vulnerability.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Vulnerability.java
@@ -6,68 +6,68 @@
 
 public final class Vulnerability {
 
-  private final @Nonnull VulnerabilityType type;
+    private final @Nonnull VulnerabilityType type;
 
-  private final @Nonnull Location location;
+    private final @Nonnull Location location;
 
-  private final @Nullable Evidence evidence;
+    private final @Nullable Evidence evidence;
 
-  private long hash;
+    private long hash;
 
-  public Vulnerability(@Nonnull final VulnerabilityType type, @Nonnull final Location location) {
-    this(type, location, null);
-  }
-
-  public Vulnerability(
-      @Nonnull final VulnerabilityType type,
-      @Nonnull final Location location,
-      @Nullable final Evidence evidence) {
-    this.type = type;
-    this.location = location;
-    this.evidence = evidence;
-    this.hash = type.calculateHash(this);
-  }
+    public Vulnerability(@Nonnull final VulnerabilityType type, @Nonnull final Location location) {
+        this(type, location, null);
+    }
 
-  @Nonnull
-  public VulnerabilityType getType() {
-    return type;
-  }
+    public Vulnerability(
+            @Nonnull final VulnerabilityType type,
+            @Nonnull final Location location,
+            @Nullable final Evidence evidence) {
+        this.type = type;
+        this.location = location;
+        this.evidence = evidence;
+        this.hash = type.calculateHash(this);
+    }
 
-  @Nonnull
-  public Location getLocation() {
-    return location;
-  }
+    @Nonnull
+    public VulnerabilityType getType() {
+        return type;
+    }
 
-  @Nullable
-  public Evidence getEvidence() {
-    return evidence;
-  }
+    @Nonnull
+    public Location getLocation() {
+        return location;
+    }
 
-  public long getHash() {
-    return hash;
-  }
+    @Nullable
+    public Evidence getEvidence() {
+        return evidence;
+    }
 
-  public void updateSpan(final AgentSpan newSpan) {
-    if (newSpan != null) {
-      location.updateSpan(newSpan);
-      hash = type.calculateHash(this);
+    public long getHash() {
+        return hash;
     }
-  }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public void updateSpan(final AgentSpan newSpan) {
+        if (newSpan != null) {
+            location.updateSpan(newSpan);
+            hash = type.calculateHash(this);
+        }
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Vulnerability that = (Vulnerability) o;
+        return hash == that.hash;
     }
-    Vulnerability that = (Vulnerability) o;
-    return hash == that.hash;
-  }
 
-  @Override
-  public int hashCode() {
-    return ((Long) hash).hashCode();
-  }
+    @Override
+    public int hashCode() {
+        return ((Long) hash).hashCode();
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/VulnerabilityBatch.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/VulnerabilityBatch.java
index fa5193b0a00..8d07f3c856b 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/VulnerabilityBatch.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/VulnerabilityBatch.java
@@ -8,36 +8,39 @@
 /** Collects vulnerabilities and serializes to JSON lazily on {@link #toString()}. */
 public final class VulnerabilityBatch {
 
-  @Nullable private List<Vulnerability> vulnerabilities;
-  @Nullable private volatile String json;
+    @Nullable
+    private List<Vulnerability> vulnerabilities;
 
-  public void add(final Vulnerability v) {
-    synchronized (this) {
-      json = null;
-      if (vulnerabilities == null) {
-        this.vulnerabilities = new ArrayList<>();
-      }
-      vulnerabilities.add(v);
-    }
-  }
+    @Nullable
+    private volatile String json;
 
-  /** Internal list of vulnerabilities. Not thread-safe. */
-  @Nullable
-  public List<Vulnerability> getVulnerabilities() {
-    return vulnerabilities;
-  }
+    public void add(final Vulnerability v) {
+        synchronized (this) {
+            json = null;
+            if (vulnerabilities == null) {
+                this.vulnerabilities = new ArrayList<>();
+            }
+            vulnerabilities.add(v);
+        }
+    }
 
-  @Override
-  public String toString() {
-    String currentJson = json;
-    if (currentJson != null) {
-      return currentJson;
+    /** Internal list of vulnerabilities. Not thread-safe. */
+    @Nullable
+    public List<Vulnerability> getVulnerabilities() {
+        return vulnerabilities;
     }
-    synchronized (this) {
-      if (json == null) {
-        json = VulnerabilityEncoding.toJson(this);
-      }
-      return json;
+
+    @Override
+    public String toString() {
+        String currentJson = json;
+        if (currentJson != null) {
+            return currentJson;
+        }
+        synchronized (this) {
+            if (json == null) {
+                json = VulnerabilityEncoding.toJson(this);
+            }
+            return json;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/VulnerabilityType.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/VulnerabilityType.java
index 2c5f3e81684..2c5599b6c7f 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/VulnerabilityType.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/VulnerabilityType.java
@@ -27,345 +27,335 @@
 
 public interface VulnerabilityType {
 
-  VulnerabilityType WEAK_CIPHER =
-      type(VulnerabilityTypes.WEAK_CIPHER).excludedSources(Builder.DB_EXCLUDED).build();
-  VulnerabilityType WEAK_HASH =
-      type(VulnerabilityTypes.WEAK_HASH).excludedSources(Builder.DB_EXCLUDED).build();
-  VulnerabilityType INSECURE_COOKIE =
-      type(VulnerabilityTypes.INSECURE_COOKIE)
-          .hash(VulnerabilityType::fileAndLineHash)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-  VulnerabilityType NO_HTTPONLY_COOKIE =
-      type(VulnerabilityTypes.NO_HTTPONLY_COOKIE)
-          .hash(VulnerabilityType::fileAndLineHash)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-  VulnerabilityType HSTS_HEADER_MISSING =
-      type(VulnerabilityTypes.HSTS_HEADER_MISSING)
-          .hash(VulnerabilityType::serviceHash)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-  VulnerabilityType XCONTENTTYPE_HEADER_MISSING =
-      type(VulnerabilityTypes.XCONTENTTYPE_HEADER_MISSING)
-          .hash(VulnerabilityType::serviceHash)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-  VulnerabilityType NO_SAMESITE_COOKIE =
-      type(VulnerabilityTypes.NO_SAMESITE_COOKIE)
-          .hash(VulnerabilityType::fileAndLineHash)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-
-  VulnerabilityType SQL_INJECTION =
-      type(VulnerabilityTypes.SQL_INJECTION).mark(SQL_INJECTION_MARK).build();
-  VulnerabilityType COMMAND_INJECTION =
-      type(VulnerabilityTypes.COMMAND_INJECTION)
-          .mark(COMMAND_INJECTION_MARK)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-  VulnerabilityType PATH_TRAVERSAL =
-      type(VulnerabilityTypes.PATH_TRAVERSAL)
-          .separator(File.separatorChar)
-          .mark(PATH_TRAVERSAL_MARK)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-  VulnerabilityType LDAP_INJECTION =
-      type(VulnerabilityTypes.LDAP_INJECTION)
-          .mark(LDAP_INJECTION_MARK)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-  VulnerabilityType SSRF =
-      type(VulnerabilityTypes.SSRF).mark(SSRF_MARK).excludedSources(Builder.DB_EXCLUDED).build();
-  VulnerabilityType UNVALIDATED_REDIRECT =
-      type(VulnerabilityTypes.UNVALIDATED_REDIRECT)
-          .mark(UNVALIDATED_REDIRECT_MARK)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-  VulnerabilityType WEAK_RANDOMNESS =
-      type(VulnerabilityTypes.WEAK_RANDOMNESS).excludedSources(Builder.DB_EXCLUDED).build();
-
-  VulnerabilityType XPATH_INJECTION =
-      type(VulnerabilityTypes.XPATH_INJECTION)
-          .mark(XPATH_INJECTION_MARK)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-
-  VulnerabilityType TRUST_BOUNDARY_VIOLATION =
-      type(VulnerabilityTypes.TRUST_BOUNDARY_VIOLATION)
-          .mark(TRUST_BOUNDARY_VIOLATION_MARK)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-
-  VulnerabilityType XSS = type(VulnerabilityTypes.XSS).mark(XSS_MARK).build();
-
-  VulnerabilityType HEADER_INJECTION =
-      type(VulnerabilityTypes.HEADER_INJECTION)
-          .mark(HEADER_INJECTION_MARK)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-
-  VulnerabilityType STACKTRACE_LEAK =
-      type(VulnerabilityTypes.STACKTRACE_LEAK).excludedSources(Builder.DB_EXCLUDED).build();
-
-  VulnerabilityType VERB_TAMPERING =
-      type(VulnerabilityTypes.VERB_TAMPERING).excludedSources(Builder.DB_EXCLUDED).build();
-
-  VulnerabilityType ADMIN_CONSOLE_ACTIVE =
-      type(VulnerabilityTypes.ADMIN_CONSOLE_ACTIVE)
-          .deduplicable(false)
-          .hash(VulnerabilityType::serviceHash)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-
-  VulnerabilityType DEFAULT_HTML_ESCAPE_INVALID =
-      type(VulnerabilityTypes.DEFAULT_HTML_ESCAPE_INVALID)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-
-  VulnerabilityType SESSION_TIMEOUT =
-      type(VulnerabilityTypes.SESSION_TIMEOUT).excludedSources(Builder.DB_EXCLUDED).build();
-
-  VulnerabilityType DIRECTORY_LISTING_LEAK =
-      type(VulnerabilityTypes.DIRECTORY_LISTING_LEAK).excludedSources(Builder.DB_EXCLUDED).build();
-  VulnerabilityType INSECURE_JSP_LAYOUT =
-      type(VulnerabilityTypes.INSECURE_JSP_LAYOUT).excludedSources(Builder.DB_EXCLUDED).build();
-
-  VulnerabilityType HARDCODED_SECRET =
-      type(VulnerabilityTypes.HARDCODED_SECRET).excludedSources(Builder.DB_EXCLUDED).build();
-
-  VulnerabilityType INSECURE_AUTH_PROTOCOL =
-      type(VulnerabilityTypes.INSECURE_AUTH_PROTOCOL)
-          .hash(VulnerabilityType::evidenceHash)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-
-  VulnerabilityType REFLECTION_INJECTION =
-      type(VulnerabilityTypes.REFLECTION_INJECTION)
-          .mark(REFLECTION_INJECTION_MARK)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-
-  VulnerabilityType SESSION_REWRITING =
-      type(VulnerabilityTypes.SESSION_REWRITING)
-          .deduplicable(false)
-          .hash(VulnerabilityType::serviceHash)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-
-  VulnerabilityType DEFAULT_APP_DEPLOYED =
-      type(VulnerabilityTypes.DEFAULT_APP_DEPLOYED)
-          .deduplicable(false)
-          .hash(VulnerabilityType::serviceHash)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-
-  VulnerabilityType UNTRUSTED_DESERIALIZATION =
-      type(VulnerabilityTypes.UNTRUSTED_DESERIALIZATION)
-          .mark(UNTRUSTED_DESERIALIZATION_MARK)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-
-  VulnerabilityType EMAIL_HTML_INJECTION =
-      type(VulnerabilityTypes.EMAIL_HTML_INJECTION)
-          .mark(EMAIL_HTML_INJECTION_MARK)
-          .excludedSources(Builder.DB_EXCLUDED)
-          .build();
-
-  VulnerabilityType CODE_INJECTION =
-      type(VulnerabilityTypes.CODE_INJECTION).mark(CODE_INJECTION_MARK).build();
-
-  /* All vulnerability types that have a mark. Should be updated if new vulnerabilityType with mark is added */
-  VulnerabilityType[] MARKED_VULNERABILITIES = {
-    SQL_INJECTION,
-    COMMAND_INJECTION,
-    PATH_TRAVERSAL,
-    LDAP_INJECTION,
-    SSRF,
-    UNVALIDATED_REDIRECT,
-    XPATH_INJECTION,
-    TRUST_BOUNDARY_VIOLATION,
-    XSS,
-    HEADER_INJECTION,
-    REFLECTION_INJECTION,
-    UNTRUSTED_DESERIALIZATION,
-    EMAIL_HTML_INJECTION,
-    CODE_INJECTION
-  };
-
-  String name();
-
-  /** A bit flag to ignore tainted ranges for this vulnerability. Set to 0 if none. */
-  int mark();
-
-  char separator();
-
-  long calculateHash(@Nonnull final Vulnerability vulnerability);
-
-  /** A flag to indicate if the vulnerability is deduplicable. */
-  boolean isDeduplicable();
-
-  byte type();
-
-  BitSet excludedSources();
-
-  static Builder type(final byte type) {
-    return new Builder(type);
-  }
-
-  class VulnerabilityTypeImpl implements VulnerabilityType {
-
-    private final byte type;
-
-    private final char separator;
-
-    private final int mark;
-
-    private final boolean deduplicable;
-
-    private final BitSet excludedSources;
-
-    private final BiFunction<VulnerabilityType, Vulnerability, Long> hash;
-
-    public VulnerabilityTypeImpl(
-        final byte type,
-        final char separator,
-        final int mark,
-        final boolean deduplicable,
-        final BitSet excludedSources,
-        final BiFunction<VulnerabilityType, Vulnerability, Long> hash) {
-      this.type = type;
-      this.separator = separator;
-      this.mark = mark;
-      this.deduplicable = deduplicable;
-      this.excludedSources = excludedSources;
-      this.hash = hash;
+    VulnerabilityType WEAK_CIPHER = type(VulnerabilityTypes.WEAK_CIPHER)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+    VulnerabilityType WEAK_HASH = type(VulnerabilityTypes.WEAK_HASH)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+    VulnerabilityType INSECURE_COOKIE = type(VulnerabilityTypes.INSECURE_COOKIE)
+            .hash(VulnerabilityType::fileAndLineHash)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+    VulnerabilityType NO_HTTPONLY_COOKIE = type(VulnerabilityTypes.NO_HTTPONLY_COOKIE)
+            .hash(VulnerabilityType::fileAndLineHash)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+    VulnerabilityType HSTS_HEADER_MISSING = type(VulnerabilityTypes.HSTS_HEADER_MISSING)
+            .hash(VulnerabilityType::serviceHash)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+    VulnerabilityType XCONTENTTYPE_HEADER_MISSING = type(VulnerabilityTypes.XCONTENTTYPE_HEADER_MISSING)
+            .hash(VulnerabilityType::serviceHash)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+    VulnerabilityType NO_SAMESITE_COOKIE = type(VulnerabilityTypes.NO_SAMESITE_COOKIE)
+            .hash(VulnerabilityType::fileAndLineHash)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType SQL_INJECTION =
+            type(VulnerabilityTypes.SQL_INJECTION).mark(SQL_INJECTION_MARK).build();
+    VulnerabilityType COMMAND_INJECTION = type(VulnerabilityTypes.COMMAND_INJECTION)
+            .mark(COMMAND_INJECTION_MARK)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+    VulnerabilityType PATH_TRAVERSAL = type(VulnerabilityTypes.PATH_TRAVERSAL)
+            .separator(File.separatorChar)
+            .mark(PATH_TRAVERSAL_MARK)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+    VulnerabilityType LDAP_INJECTION = type(VulnerabilityTypes.LDAP_INJECTION)
+            .mark(LDAP_INJECTION_MARK)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+    VulnerabilityType SSRF = type(VulnerabilityTypes.SSRF)
+            .mark(SSRF_MARK)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+    VulnerabilityType UNVALIDATED_REDIRECT = type(VulnerabilityTypes.UNVALIDATED_REDIRECT)
+            .mark(UNVALIDATED_REDIRECT_MARK)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+    VulnerabilityType WEAK_RANDOMNESS = type(VulnerabilityTypes.WEAK_RANDOMNESS)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType XPATH_INJECTION = type(VulnerabilityTypes.XPATH_INJECTION)
+            .mark(XPATH_INJECTION_MARK)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType TRUST_BOUNDARY_VIOLATION = type(VulnerabilityTypes.TRUST_BOUNDARY_VIOLATION)
+            .mark(TRUST_BOUNDARY_VIOLATION_MARK)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType XSS = type(VulnerabilityTypes.XSS).mark(XSS_MARK).build();
+
+    VulnerabilityType HEADER_INJECTION = type(VulnerabilityTypes.HEADER_INJECTION)
+            .mark(HEADER_INJECTION_MARK)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType STACKTRACE_LEAK = type(VulnerabilityTypes.STACKTRACE_LEAK)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType VERB_TAMPERING = type(VulnerabilityTypes.VERB_TAMPERING)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType ADMIN_CONSOLE_ACTIVE = type(VulnerabilityTypes.ADMIN_CONSOLE_ACTIVE)
+            .deduplicable(false)
+            .hash(VulnerabilityType::serviceHash)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType DEFAULT_HTML_ESCAPE_INVALID = type(VulnerabilityTypes.DEFAULT_HTML_ESCAPE_INVALID)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType SESSION_TIMEOUT = type(VulnerabilityTypes.SESSION_TIMEOUT)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType DIRECTORY_LISTING_LEAK = type(VulnerabilityTypes.DIRECTORY_LISTING_LEAK)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+    VulnerabilityType INSECURE_JSP_LAYOUT = type(VulnerabilityTypes.INSECURE_JSP_LAYOUT)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType HARDCODED_SECRET = type(VulnerabilityTypes.HARDCODED_SECRET)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType INSECURE_AUTH_PROTOCOL = type(VulnerabilityTypes.INSECURE_AUTH_PROTOCOL)
+            .hash(VulnerabilityType::evidenceHash)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType REFLECTION_INJECTION = type(VulnerabilityTypes.REFLECTION_INJECTION)
+            .mark(REFLECTION_INJECTION_MARK)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType SESSION_REWRITING = type(VulnerabilityTypes.SESSION_REWRITING)
+            .deduplicable(false)
+            .hash(VulnerabilityType::serviceHash)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType DEFAULT_APP_DEPLOYED = type(VulnerabilityTypes.DEFAULT_APP_DEPLOYED)
+            .deduplicable(false)
+            .hash(VulnerabilityType::serviceHash)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType UNTRUSTED_DESERIALIZATION = type(VulnerabilityTypes.UNTRUSTED_DESERIALIZATION)
+            .mark(UNTRUSTED_DESERIALIZATION_MARK)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType EMAIL_HTML_INJECTION = type(VulnerabilityTypes.EMAIL_HTML_INJECTION)
+            .mark(EMAIL_HTML_INJECTION_MARK)
+            .excludedSources(Builder.DB_EXCLUDED)
+            .build();
+
+    VulnerabilityType CODE_INJECTION =
+            type(VulnerabilityTypes.CODE_INJECTION).mark(CODE_INJECTION_MARK).build();
+
+    /* All vulnerability types that have a mark. Should be updated if new vulnerabilityType with mark is added */
+    VulnerabilityType[] MARKED_VULNERABILITIES = {
+        SQL_INJECTION,
+        COMMAND_INJECTION,
+        PATH_TRAVERSAL,
+        LDAP_INJECTION,
+        SSRF,
+        UNVALIDATED_REDIRECT,
+        XPATH_INJECTION,
+        TRUST_BOUNDARY_VIOLATION,
+        XSS,
+        HEADER_INJECTION,
+        REFLECTION_INJECTION,
+        UNTRUSTED_DESERIALIZATION,
+        EMAIL_HTML_INJECTION,
+        CODE_INJECTION
+    };
+
+    String name();
+
+    /** A bit flag to ignore tainted ranges for this vulnerability. Set to 0 if none. */
+    int mark();
+
+    char separator();
+
+    long calculateHash(@Nonnull final Vulnerability vulnerability);
+
+    /** A flag to indicate if the vulnerability is deduplicable. */
+    boolean isDeduplicable();
+
+    byte type();
+
+    BitSet excludedSources();
+
+    static Builder type(final byte type) {
+        return new Builder(type);
     }
 
-    @Override
-    public String name() {
-      return VulnerabilityTypes.toString(type);
+    class VulnerabilityTypeImpl implements VulnerabilityType {
+
+        private final byte type;
+
+        private final char separator;
+
+        private final int mark;
+
+        private final boolean deduplicable;
+
+        private final BitSet excludedSources;
+
+        private final BiFunction<VulnerabilityType, Vulnerability, Long> hash;
+
+        public VulnerabilityTypeImpl(
+                final byte type,
+                final char separator,
+                final int mark,
+                final boolean deduplicable,
+                final BitSet excludedSources,
+                final BiFunction<VulnerabilityType, Vulnerability, Long> hash) {
+            this.type = type;
+            this.separator = separator;
+            this.mark = mark;
+            this.deduplicable = deduplicable;
+            this.excludedSources = excludedSources;
+            this.hash = hash;
+        }
+
+        @Override
+        public String name() {
+            return VulnerabilityTypes.toString(type);
+        }
+
+        @Override
+        public int mark() {
+            return mark;
+        }
+
+        @Override
+        public char separator() {
+            return separator;
+        }
+
+        @Override
+        public long calculateHash(@Nonnull Vulnerability vulnerability) {
+            return hash.apply(this, vulnerability);
+        }
+
+        @Override
+        public boolean isDeduplicable() {
+            return deduplicable;
+        }
+
+        @Override
+        public byte type() {
+            return type;
+        }
+
+        @Override
+        public BitSet excludedSources() {
+            return excludedSources;
+        }
+
+        /** Useful for troubleshooting issues when vulns are serialized without moshi */
+        public String getName() {
+            return name();
+        }
     }
 
-    @Override
-    public int mark() {
-      return mark;
+    class Builder {
+        private static final BitSet DB_EXCLUDED;
+
+        static {
+            DB_EXCLUDED = new BitSet(SourceTypes.STRINGS.length + 1);
+            DB_EXCLUDED.set(SourceTypes.SQL_TABLE);
+        }
+
+        private final byte type;
+        private char separator = ' ';
+        private int mark = NOT_MARKED;
+        private boolean deduplicable = true;
+        private BitSet excludedSources = new BitSet();
+        private BiFunction<VulnerabilityType, Vulnerability, Long> hash = VulnerabilityType::fileAndLineHash;
+
+        public Builder(byte type) {
+            this.type = type;
+        }
+
+        public Builder separator(final char separator) {
+            this.separator = separator;
+            return this;
+        }
+
+        public Builder mark(final int mark) {
+            this.mark = mark;
+            return this;
+        }
+
+        public Builder deduplicable(final boolean deduplicable) {
+            this.deduplicable = deduplicable;
+            return this;
+        }
+
+        public Builder excludedSources(final BitSet excludedSources) {
+            this.excludedSources = excludedSources;
+            return this;
+        }
+
+        public Builder hash(final BiFunction<VulnerabilityType, Vulnerability, Long> hash) {
+            this.hash = hash;
+            return this;
+        }
+
+        public VulnerabilityType build() {
+            return new VulnerabilityTypeImpl(type, separator, mark, deduplicable, excludedSources, hash);
+        }
     }
 
-    @Override
-    public char separator() {
-      return separator;
+    static long fileAndLineHash(final VulnerabilityType type, final Vulnerability vulnerability) {
+        CRC32 crc = new CRC32();
+        update(crc, type.name());
+        final Location location = vulnerability.getLocation();
+        if (location != null) {
+            crc.update(location.getLine());
+            if (location.getPath() != null) {
+                update(crc, location.getPath());
+            }
+            if (location.getLine() <= -1 && location.getMethod() != null) {
+                update(crc, location.getMethod());
+            }
+        }
+        return crc.getValue();
     }
 
-    @Override
-    public long calculateHash(@Nonnull Vulnerability vulnerability) {
-      return hash.apply(this, vulnerability);
+    static long evidenceHash(final VulnerabilityType type, final Vulnerability vulnerability) {
+        CRC32 crc = new CRC32();
+        update(crc, type.name());
+        final Evidence evidence = vulnerability.getEvidence();
+        if (evidence != null) {
+            update(crc, evidence.getValue());
+        }
+        return crc.getValue();
     }
 
-    @Override
-    public boolean isDeduplicable() {
-      return deduplicable;
+    static long serviceHash(final VulnerabilityType type, final Vulnerability vulnerability) {
+        CRC32 crc = new CRC32();
+        update(crc, type.name());
+        final String serviceName = vulnerability.getLocation().getServiceName();
+        if (serviceName != null) {
+            update(crc, serviceName);
+        }
+        return crc.getValue();
     }
-
-    @Override
-    public byte type() {
-      return type;
-    }
-
-    @Override
-    public BitSet excludedSources() {
-      return excludedSources;
-    }
-
-    /** Useful for troubleshooting issues when vulns are serialized without moshi */
-    public String getName() {
-      return name();
-    }
-  }
-
-  class Builder {
-    private static final BitSet DB_EXCLUDED;
-
-    static {
-      DB_EXCLUDED = new BitSet(SourceTypes.STRINGS.length + 1);
-      DB_EXCLUDED.set(SourceTypes.SQL_TABLE);
-    }
-
-    private final byte type;
-    private char separator = ' ';
-    private int mark = NOT_MARKED;
-    private boolean deduplicable = true;
-    private BitSet excludedSources = new BitSet();
-    private BiFunction<VulnerabilityType, Vulnerability, Long> hash =
-        VulnerabilityType::fileAndLineHash;
-
-    public Builder(byte type) {
-      this.type = type;
-    }
-
-    public Builder separator(final char separator) {
-      this.separator = separator;
-      return this;
-    }
-
-    public Builder mark(final int mark) {
-      this.mark = mark;
-      return this;
-    }
-
-    public Builder deduplicable(final boolean deduplicable) {
-      this.deduplicable = deduplicable;
-      return this;
-    }
-
-    public Builder excludedSources(final BitSet excludedSources) {
-      this.excludedSources = excludedSources;
-      return this;
-    }
-
-    public Builder hash(final BiFunction<VulnerabilityType, Vulnerability, Long> hash) {
-      this.hash = hash;
-      return this;
-    }
-
-    public VulnerabilityType build() {
-      return new VulnerabilityTypeImpl(type, separator, mark, deduplicable, excludedSources, hash);
-    }
-  }
-
-  static long fileAndLineHash(final VulnerabilityType type, final Vulnerability vulnerability) {
-    CRC32 crc = new CRC32();
-    update(crc, type.name());
-    final Location location = vulnerability.getLocation();
-    if (location != null) {
-      crc.update(location.getLine());
-      if (location.getPath() != null) {
-        update(crc, location.getPath());
-      }
-      if (location.getLine() <= -1 && location.getMethod() != null) {
-        update(crc, location.getMethod());
-      }
-    }
-    return crc.getValue();
-  }
-
-  static long evidenceHash(final VulnerabilityType type, final Vulnerability vulnerability) {
-    CRC32 crc = new CRC32();
-    update(crc, type.name());
-    final Evidence evidence = vulnerability.getEvidence();
-    if (evidence != null) {
-      update(crc, evidence.getValue());
-    }
-    return crc.getValue();
-  }
-
-  static long serviceHash(final VulnerabilityType type, final Vulnerability vulnerability) {
-    CRC32 crc = new CRC32();
-    update(crc, type.name());
-    final String serviceName = vulnerability.getLocation().getServiceName();
-    if (serviceName != null) {
-      update(crc, serviceName);
-    }
-    return crc.getValue();
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/AdapterFactory.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/AdapterFactory.java
index 30bfca64bc5..a2c6ddabfa1 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/AdapterFactory.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/AdapterFactory.java
@@ -29,204 +29,206 @@
  */
 class AdapterFactory implements JsonAdapter.Factory {
 
-  static class Context {
+    static class Context {
 
-    private static final ThreadLocal<Context> CONTEXT_THREAD_LOCAL =
-        ThreadLocal.withInitial(Context::new);
+        private static final ThreadLocal<Context> CONTEXT_THREAD_LOCAL = ThreadLocal.withInitial(Context::new);
 
-    final List<Source> sources;
-    final Map<Source, Integer> sourceIndexMap;
-    final Map<Source, RedactionContext> sourceContext;
-    @Nullable Vulnerability vulnerability;
+        final List<Source> sources;
+        final Map<Source, Integer> sourceIndexMap;
+        final Map<Source, RedactionContext> sourceContext;
 
-    public Context() {
-      sources = new ArrayList<>();
-      sourceIndexMap = new HashMap<>();
-      sourceContext = new HashMap<>();
-    }
-
-    public static Context get() {
-      return CONTEXT_THREAD_LOCAL.get();
-    }
+        @Nullable
+        Vulnerability vulnerability;
 
-    public static void set(@Nonnull final Context context) {
-      CONTEXT_THREAD_LOCAL.set(context);
-    }
+        public Context() {
+            sources = new ArrayList<>();
+            sourceIndexMap = new HashMap<>();
+            sourceContext = new HashMap<>();
+        }
 
-    public static void remove() {
-      CONTEXT_THREAD_LOCAL.remove();
-    }
+        public static Context get() {
+            return CONTEXT_THREAD_LOCAL.get();
+        }
 
-    public RedactionContext getRedaction(final Source source) {
-      return sourceContext.computeIfAbsent(source, RedactionContext::new);
-    }
-  }
-
-  @Override
-  @Nullable
-  public JsonAdapter<?> create(
-      @Nonnull final Type type,
-      @Nonnull final Set<? extends Annotation> annotations,
-      @Nonnull final Moshi moshi) {
-    final Class<?> rawType = Types.getRawType(type);
-    if (Source.class.equals(rawType)) {
-      if (hasSourceIndexAnnotation(annotations)) {
-        return new SourceIndexAdapter();
-      } else {
-        return new SourceAdapter();
-      }
-    } else if (VulnerabilityBatch.class.equals(rawType)) {
-      return new VulnerabilityBatchAdapter(moshi);
-    } else if (Vulnerability.class.equals(rawType)) {
-      return new VulnerabilityAdapter(this, moshi);
-    } else if (Evidence.class.equals(rawType)) {
-      return new EvidenceAdapter(moshi);
-    } else if (VulnerabilityType.class.equals(rawType)) {
-      return new VulnerabilityTypeAdapter();
-    } else if (TruncatedVulnerabilities.class.equals(rawType)) {
-      return new TruncatedVulnerabilitiesAdapter(moshi);
-    }
-    return null;
-  }
+        public static void set(@Nonnull final Context context) {
+            CONTEXT_THREAD_LOCAL.set(context);
+        }
 
-  protected boolean hasSourceIndexAnnotation(@Nonnull final Set<? extends Annotation> annotations) {
-    return annotations.stream()
-        .anyMatch(annotation -> annotation.annotationType() == SourceIndex.class);
-  }
+        public static void remove() {
+            CONTEXT_THREAD_LOCAL.remove();
+        }
 
-  public static class SourceIndexAdapter extends FormattingAdapter<Source> {
+        public RedactionContext getRedaction(final Source source) {
+            return sourceContext.computeIfAbsent(source, RedactionContext::new);
+        }
+    }
 
     @Override
-    public void toJson(@Nonnull final JsonWriter writer, @Nullable @SourceIndex final Source value)
-        throws IOException {
-      if (value == null) {
-        writer.nullValue();
-        return;
-      }
-      final Context ctx = Context.get();
-      Integer index = ctx.sourceIndexMap.get(value);
-      if (index == null) {
-        index = ctx.sources.size();
-        ctx.sources.add(value);
-        ctx.sourceIndexMap.put(value, index);
-      }
-      writer.value(index);
+    @Nullable
+    public JsonAdapter<?> create(
+            @Nonnull final Type type,
+            @Nonnull final Set<? extends Annotation> annotations,
+            @Nonnull final Moshi moshi) {
+        final Class<?> rawType = Types.getRawType(type);
+        if (Source.class.equals(rawType)) {
+            if (hasSourceIndexAnnotation(annotations)) {
+                return new SourceIndexAdapter();
+            } else {
+                return new SourceAdapter();
+            }
+        } else if (VulnerabilityBatch.class.equals(rawType)) {
+            return new VulnerabilityBatchAdapter(moshi);
+        } else if (Vulnerability.class.equals(rawType)) {
+            return new VulnerabilityAdapter(this, moshi);
+        } else if (Evidence.class.equals(rawType)) {
+            return new EvidenceAdapter(moshi);
+        } else if (VulnerabilityType.class.equals(rawType)) {
+            return new VulnerabilityTypeAdapter();
+        } else if (TruncatedVulnerabilities.class.equals(rawType)) {
+            return new TruncatedVulnerabilitiesAdapter(moshi);
+        }
+        return null;
+    }
+
+    protected boolean hasSourceIndexAnnotation(@Nonnull final Set<? extends Annotation> annotations) {
+        return annotations.stream().anyMatch(annotation -> annotation.annotationType() == SourceIndex.class);
+    }
+
+    public static class SourceIndexAdapter extends FormattingAdapter<Source> {
+
+        @Override
+        public void toJson(@Nonnull final JsonWriter writer, @Nullable @SourceIndex final Source value)
+                throws IOException {
+            if (value == null) {
+                writer.nullValue();
+                return;
+            }
+            final Context ctx = Context.get();
+            Integer index = ctx.sourceIndexMap.get(value);
+            if (index == null) {
+                index = ctx.sources.size();
+                ctx.sources.add(value);
+                ctx.sourceIndexMap.put(value, index);
+            }
+            writer.value(index);
+        }
     }
-  }
 
-  public static class VulnerabilityBatchAdapter extends FormattingAdapter<VulnerabilityBatch> {
+    public static class VulnerabilityBatchAdapter extends FormattingAdapter<VulnerabilityBatch> {
 
-    private final JsonAdapter<List<Source>> sourcesAdapter;
+        private final JsonAdapter<List<Source>> sourcesAdapter;
 
-    private final JsonAdapter<List<Vulnerability>> vulnerabilitiesAdapter;
+        private final JsonAdapter<List<Vulnerability>> vulnerabilitiesAdapter;
 
-    public VulnerabilityBatchAdapter(@Nonnull final Moshi moshi) {
-      sourcesAdapter = moshi.adapter(Types.newParameterizedType(List.class, Source.class));
-      vulnerabilitiesAdapter =
-          moshi.adapter(Types.newParameterizedType(List.class, Vulnerability.class));
-    }
+        public VulnerabilityBatchAdapter(@Nonnull final Moshi moshi) {
+            sourcesAdapter = moshi.adapter(Types.newParameterizedType(List.class, Source.class));
+            vulnerabilitiesAdapter = moshi.adapter(Types.newParameterizedType(List.class, Vulnerability.class));
+        }
 
-    @Override
-    public void toJson(@Nonnull final JsonWriter writer, @Nullable final VulnerabilityBatch value)
-        throws IOException {
-      if (value == null) {
-        writer.nullValue();
-        return;
-      }
-
-      final Context ctx = Context.get();
-      try {
-        final List<Vulnerability> vulnerabilities = value.getVulnerabilities();
-        writer.beginObject();
-        if (vulnerabilities != null && !vulnerabilities.isEmpty()) {
-          writer.name("vulnerabilities");
-          vulnerabilitiesAdapter.toJson(writer, vulnerabilities);
-
-          if (!ctx.sources.isEmpty()) {
-            writer.name("sources");
-            sourcesAdapter.toJson(writer, ctx.sources);
-          }
-        }
-
-        writer.endObject();
-      } finally {
-        Context.remove();
-      }
+        @Override
+        public void toJson(@Nonnull final JsonWriter writer, @Nullable final VulnerabilityBatch value)
+                throws IOException {
+            if (value == null) {
+                writer.nullValue();
+                return;
+            }
+
+            final Context ctx = Context.get();
+            try {
+                final List<Vulnerability> vulnerabilities = value.getVulnerabilities();
+                writer.beginObject();
+                if (vulnerabilities != null && !vulnerabilities.isEmpty()) {
+                    writer.name("vulnerabilities");
+                    vulnerabilitiesAdapter.toJson(writer, vulnerabilities);
+
+                    if (!ctx.sources.isEmpty()) {
+                        writer.name("sources");
+                        sourcesAdapter.toJson(writer, ctx.sources);
+                    }
+                }
+
+                writer.endObject();
+            } finally {
+                Context.remove();
+            }
+        }
     }
-  }
 
-  public static class VulnerabilityAdapter extends FormattingAdapter<Vulnerability> {
+    public static class VulnerabilityAdapter extends FormattingAdapter<Vulnerability> {
 
-    private final JsonAdapter<Vulnerability> adapter;
+        private final JsonAdapter<Vulnerability> adapter;
 
-    public VulnerabilityAdapter(@Nonnull final AdapterFactory factory, @Nonnull final Moshi moshi) {
-      adapter = moshi.nextAdapter(factory, Vulnerability.class, Collections.emptySet());
-    }
+        public VulnerabilityAdapter(@Nonnull final AdapterFactory factory, @Nonnull final Moshi moshi) {
+            adapter = moshi.nextAdapter(factory, Vulnerability.class, Collections.emptySet());
+        }
 
-    @Override
-    public void toJson(@Nonnull final JsonWriter writer, @Nullable final Vulnerability value)
-        throws IOException {
-      if (value == null) {
-        return;
-      }
-      final Context ctx = Context.get();
-      ctx.vulnerability = value;
-      try {
-        adapter.toJson(writer, value);
-      } finally {
-        ctx.vulnerability = null;
-      }
-    }
-  }
-
-  public static class RedactionContext {
-    private final Source source;
-    private final boolean sensitive;
-    private boolean sensitiveRanges;
-    @Nullable private String redactedValue;
-    @Nullable private Set<VulnerabilityType> markedTypes;
-
-    public RedactionContext(final Source source) {
-      this.source = source;
-      final SensitiveHandler handler = SensitiveHandler.get();
-      this.sensitive = handler.isSensitive(source);
-      if (this.sensitive) {
-        this.redactedValue = handler.redactSource(source);
-      }
-      this.markedTypes = null;
+        @Override
+        public void toJson(@Nonnull final JsonWriter writer, @Nullable final Vulnerability value) throws IOException {
+            if (value == null) {
+                return;
+            }
+            final Context ctx = Context.get();
+            ctx.vulnerability = value;
+            try {
+                adapter.toJson(writer, value);
+            } finally {
+                ctx.vulnerability = null;
+            }
+        }
     }
 
-    public Source getSource() {
-      return source;
-    }
+    public static class RedactionContext {
+        private final Source source;
+        private final boolean sensitive;
+        private boolean sensitiveRanges;
 
-    public boolean isSensitive() {
-      return sensitive;
-    }
+        @Nullable
+        private String redactedValue;
 
-    public boolean shouldRedact() {
-      return sensitive || sensitiveRanges;
-    }
+        @Nullable
+        private Set<VulnerabilityType> markedTypes;
 
-    @Nullable
-    public String getRedactedValue() {
-      return redactedValue;
-    }
+        public RedactionContext(final Source source) {
+            this.source = source;
+            final SensitiveHandler handler = SensitiveHandler.get();
+            this.sensitive = handler.isSensitive(source);
+            if (this.sensitive) {
+                this.redactedValue = handler.redactSource(source);
+            }
+            this.markedTypes = null;
+        }
 
-    public void markWithSensitiveRanges() {
-      sensitiveRanges = true;
-      if (redactedValue == null) {
-        redactedValue = SensitiveHandler.get().redactSource(source);
-      }
-    }
+        public Source getSource() {
+            return source;
+        }
 
-    public void setMarkedTypes(@Nullable Set<VulnerabilityType> markedTypes) {
-      this.markedTypes = markedTypes;
-    }
+        public boolean isSensitive() {
+            return sensitive;
+        }
 
-    @Nullable
-    public Set<VulnerabilityType> getMarkedTypes() {
-      return markedTypes;
+        public boolean shouldRedact() {
+            return sensitive || sensitiveRanges;
+        }
+
+        @Nullable
+        public String getRedactedValue() {
+            return redactedValue;
+        }
+
+        public void markWithSensitiveRanges() {
+            sensitiveRanges = true;
+            if (redactedValue == null) {
+                redactedValue = SensitiveHandler.get().redactSource(source);
+            }
+        }
+
+        public void setMarkedTypes(@Nullable Set<VulnerabilityType> markedTypes) {
+            this.markedTypes = markedTypes;
+        }
+
+        @Nullable
+        public Set<VulnerabilityType> getMarkedTypes() {
+            return markedTypes;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/EvidenceAdapter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/EvidenceAdapter.java
index 666d5c7c0c8..34e33d79112 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/EvidenceAdapter.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/EvidenceAdapter.java
@@ -37,520 +37,511 @@
 
 public class EvidenceAdapter extends FormattingAdapter<Evidence> {
 
-  private static final Logger log = LoggerFactory.getLogger(EvidenceAdapter.class);
-
-  private final JsonAdapter<Source> sourceAdapter;
-  private final JsonAdapter<Evidence> defaultAdapter;
-  private final JsonAdapter<Evidence> redactedAdapter;
-
-  public EvidenceAdapter(@Nonnull final Moshi moshi) {
-    sourceAdapter = moshi.adapter(Source.class, SourceIndex.class);
-    defaultAdapter = new DefaultEvidenceAdapter();
-    redactedAdapter = new RedactedEvidenceAdapter();
-  }
-
-  @Override
-  public void toJson(@Nonnull final JsonWriter writer, final @Nullable Evidence evidence)
-      throws IOException {
-    if (evidence == null || evidence.getValue() == null) {
-      writer.nullValue();
-      return;
-    }
-    if (Config.get().isIastRedactionEnabled()) {
-      redactedAdapter.toJson(writer, evidence);
-    } else {
-      defaultAdapter.toJson(writer, evidence);
-    }
-  }
+    private static final Logger log = LoggerFactory.getLogger(EvidenceAdapter.class);
 
-  private String substring(final String value, final Ranged range) {
-    int end = Math.min(range.getStart() + range.getLength(), value.length());
-    if (end < 0) {
-      log.debug("Invalid negative end parameter for substring. Value: {} Range: {}", value, range);
-      end = value.length();
-    }
-    return value.substring(range.getStart(), end);
-  }
-
-  private static void writeSecureMarks(
-      final JsonWriter writer, final @Nullable Set<VulnerabilityType> markedVulnerabilities)
-      throws IOException {
-    if (markedVulnerabilities == null || markedVulnerabilities.isEmpty()) {
-      return;
-    }
-    writer.name("secure_marks");
-    writer.beginArray();
-    for (VulnerabilityType type : markedVulnerabilities) {
-      writer.value(type.name());
-    }
-    writer.endArray();
-  }
+    private final JsonAdapter<Source> sourceAdapter;
+    private final JsonAdapter<Evidence> defaultAdapter;
+    private final JsonAdapter<Evidence> redactedAdapter;
 
-  private class DefaultEvidenceAdapter extends FormattingAdapter<Evidence> {
+    public EvidenceAdapter(@Nonnull final Moshi moshi) {
+        sourceAdapter = moshi.adapter(Source.class, SourceIndex.class);
+        defaultAdapter = new DefaultEvidenceAdapter();
+        redactedAdapter = new RedactedEvidenceAdapter();
+    }
 
     @Override
-    public void toJson(@Nonnull final JsonWriter writer, final @Nullable Evidence evidence)
-        throws IOException {
-      if (evidence == null) {
-        writer.nullValue();
-        return;
-      }
-      writer.beginObject();
-      if (evidence.getRanges() == null || evidence.getRanges().length == 0) {
-        writer.name("value");
-        writer.value(evidence.getValue());
-      } else {
-        writer.name("valueParts");
-        toJsonTaintedValue(writer, evidence.getValue(), evidence.getRanges());
-      }
-      writer.endObject();
+    public void toJson(@Nonnull final JsonWriter writer, final @Nullable Evidence evidence) throws IOException {
+        if (evidence == null || evidence.getValue() == null) {
+            writer.nullValue();
+            return;
+        }
+        if (Config.get().isIastRedactionEnabled()) {
+            redactedAdapter.toJson(writer, evidence);
+        } else {
+            defaultAdapter.toJson(writer, evidence);
+        }
     }
 
-    private void toJsonTaintedValue(
-        @Nonnull final JsonWriter writer,
-        @Nonnull final String value,
-        @Nonnull final Range... ranges)
-        throws IOException {
-      writer.beginArray();
-      int start = 0;
-      for (Range range : ranges) {
-        if (range.getStart() > start) {
-          writeValuePart(writer, value.substring(start, range.getStart()));
-        }
-        final String substring = substring(value, range);
-        writeValuePart(writer, substring, range);
-        start = range.getStart() + substring.length();
-      }
-      if (start < value.length()) {
-        writeValuePart(writer, value.substring(start));
-      }
-      writer.endArray();
+    private String substring(final String value, final Ranged range) {
+        int end = Math.min(range.getStart() + range.getLength(), value.length());
+        if (end < 0) {
+            log.debug("Invalid negative end parameter for substring. Value: {} Range: {}", value, range);
+            end = value.length();
+        }
+        return value.substring(range.getStart(), end);
     }
 
-    private void writeValuePart(@Nonnull final JsonWriter writer, @Nonnull final String value)
-        throws IOException {
-      if (!value.isEmpty()) {
-        writeValuePart(writer, value, null);
-      }
-    }
+    private static void writeSecureMarks(
+            final JsonWriter writer, final @Nullable Set<VulnerabilityType> markedVulnerabilities) throws IOException {
+        if (markedVulnerabilities == null || markedVulnerabilities.isEmpty()) {
+            return;
+        }
+        writer.name("secure_marks");
+        writer.beginArray();
+        for (VulnerabilityType type : markedVulnerabilities) {
+            writer.value(type.name());
+        }
+        writer.endArray();
+    }
+
+    private class DefaultEvidenceAdapter extends FormattingAdapter<Evidence> {
+
+        @Override
+        public void toJson(@Nonnull final JsonWriter writer, final @Nullable Evidence evidence) throws IOException {
+            if (evidence == null) {
+                writer.nullValue();
+                return;
+            }
+            writer.beginObject();
+            if (evidence.getRanges() == null || evidence.getRanges().length == 0) {
+                writer.name("value");
+                writer.value(evidence.getValue());
+            } else {
+                writer.name("valueParts");
+                toJsonTaintedValue(writer, evidence.getValue(), evidence.getRanges());
+            }
+            writer.endObject();
+        }
 
-    private void writeValuePart(
-        @Nonnull final JsonWriter writer, @Nonnull final String value, @Nullable final Range range)
-        throws IOException {
-      writer.beginObject();
-      writer.name("value");
-      writer.value(value);
-      if (range != null) {
-        writer.name("source");
-        sourceAdapter.toJson(writer, range.getSource());
-        writeSecureMarks(writer, range.getMarkedVulnerabilities());
-      }
-      writer.endObject();
-    }
-  }
+        private void toJsonTaintedValue(
+                @Nonnull final JsonWriter writer, @Nonnull final String value, @Nonnull final Range... ranges)
+                throws IOException {
+            writer.beginArray();
+            int start = 0;
+            for (Range range : ranges) {
+                if (range.getStart() > start) {
+                    writeValuePart(writer, value.substring(start, range.getStart()));
+                }
+                final String substring = substring(value, range);
+                writeValuePart(writer, substring, range);
+                start = range.getStart() + substring.length();
+            }
+            if (start < value.length()) {
+                writeValuePart(writer, value.substring(start));
+            }
+            writer.endArray();
+        }
 
-  private class RedactedEvidenceAdapter extends FormattingAdapter<Evidence> {
+        private void writeValuePart(@Nonnull final JsonWriter writer, @Nonnull final String value) throws IOException {
+            if (!value.isEmpty()) {
+                writeValuePart(writer, value, null);
+            }
+        }
 
-    @Override
-    public void toJson(@Nonnull final JsonWriter writer, @Nullable final Evidence evidence)
-        throws IOException {
-      if (evidence == null) {
-        writer.nullValue();
-        return;
-      }
-      final Context ctx = Context.get();
-      final Vulnerability vulnerability = ctx.vulnerability;
-      if (vulnerability == null) {
-        defaultAdapter.toJson(writer, evidence);
-      } else {
-        final RangedDeque<Range> tainted = taintedRanges(evidence);
-        final RangedDeque<Ranged> sensitive = sensitiveRanges(vulnerability.getType(), evidence);
-        writer.beginObject();
-        if (tainted.isEmpty() && sensitive.isEmpty()) {
-          writer.name("value");
-          writer.value(evidence.getValue());
-        } else {
-          writer.name("valueParts");
-          toRedactedJson(ctx, writer, evidence.getValue(), tainted, sensitive);
+        private void writeValuePart(
+                @Nonnull final JsonWriter writer, @Nonnull final String value, @Nullable final Range range)
+                throws IOException {
+            writer.beginObject();
+            writer.name("value");
+            writer.value(value);
+            if (range != null) {
+                writer.name("source");
+                sourceAdapter.toJson(writer, range.getSource());
+                writeSecureMarks(writer, range.getMarkedVulnerabilities());
+            }
+            writer.endObject();
         }
-        writer.endObject();
-      }
     }
 
-    private void toRedactedJson(
-        final Context ctx,
-        final JsonWriter writer,
-        final String value,
-        final RangedDeque<Range> tainted,
-        final RangedDeque<Ranged> sensitive)
-        throws IOException {
-      writer.beginArray();
-      for (final Iterator<ValuePart> it = new ValuePartIterator(ctx, value, tainted, sensitive);
-          it.hasNext(); ) {
-        final ValuePart next = it.next();
-        if (next != null) {
-          next.write(ctx, writer);
-        }
-      }
-      writer.endArray();
-    }
+    private class RedactedEvidenceAdapter extends FormattingAdapter<Evidence> {
+
+        @Override
+        public void toJson(@Nonnull final JsonWriter writer, @Nullable final Evidence evidence) throws IOException {
+            if (evidence == null) {
+                writer.nullValue();
+                return;
+            }
+            final Context ctx = Context.get();
+            final Vulnerability vulnerability = ctx.vulnerability;
+            if (vulnerability == null) {
+                defaultAdapter.toJson(writer, evidence);
+            } else {
+                final RangedDeque<Range> tainted = taintedRanges(evidence);
+                final RangedDeque<Ranged> sensitive = sensitiveRanges(vulnerability.getType(), evidence);
+                writer.beginObject();
+                if (tainted.isEmpty() && sensitive.isEmpty()) {
+                    writer.name("value");
+                    writer.value(evidence.getValue());
+                } else {
+                    writer.name("valueParts");
+                    toRedactedJson(ctx, writer, evidence.getValue(), tainted, sensitive);
+                }
+                writer.endObject();
+            }
+        }
 
-    private RangedDeque<Range> taintedRanges(final Evidence evidence) {
-      return RangedDeque.forArray(evidence.getRanges());
-    }
+        private void toRedactedJson(
+                final Context ctx,
+                final JsonWriter writer,
+                final String value,
+                final RangedDeque<Range> tainted,
+                final RangedDeque<Ranged> sensitive)
+                throws IOException {
+            writer.beginArray();
+            for (final Iterator<ValuePart> it = new ValuePartIterator(ctx, value, tainted, sensitive); it.hasNext(); ) {
+                final ValuePart next = it.next();
+                if (next != null) {
+                    next.write(ctx, writer);
+                }
+            }
+            writer.endArray();
+        }
 
-    private RangedDeque<Ranged> sensitiveRanges(
-        final VulnerabilityType type, final Evidence evidence) {
-      final SensitiveHandler handler = SensitiveHandler.get();
-      final Tokenizer tokenizer = handler.tokenizeEvidence(type, evidence);
-      return RangedDeque.forTokenizer(tokenizer);
-    }
-  }
-
-  private class ValuePartIterator implements Iterator<ValuePart> {
-    private final Context ctx;
-    private final String value;
-    private final RangedDeque<Range> tainted;
-    private final RangedDeque<Ranged> sensitive;
-    private final Map<Range, List<Ranged>> intersections = new HashMap<>();
-    private final Queue<ValuePart> next = new LinkedList<>();
-    private int index;
-
-    private ValuePartIterator(
-        final Context ctx,
-        final String value,
-        final RangedDeque<Range> tainted,
-        final RangedDeque<Ranged> sensitive) {
-      this.ctx = ctx;
-      this.value = value;
-      this.tainted = tainted;
-      this.sensitive = sensitive;
-    }
+        private RangedDeque<Range> taintedRanges(final Evidence evidence) {
+            return RangedDeque.forArray(evidence.getRanges());
+        }
 
-    @Override
-    public boolean hasNext() {
-      return !next.isEmpty() || index < value.length();
+        private RangedDeque<Ranged> sensitiveRanges(final VulnerabilityType type, final Evidence evidence) {
+            final SensitiveHandler handler = SensitiveHandler.get();
+            final Tokenizer tokenizer = handler.tokenizeEvidence(type, evidence);
+            return RangedDeque.forTokenizer(tokenizer);
+        }
     }
 
-    @Nullable
-    @Override
-    public ValuePart next() {
-      if (!hasNext()) {
-        throw new NoSuchElementException();
-      }
-      if (!next.isEmpty()) {
-        return next.poll();
-      }
-      if (tainted.isEmpty() && sensitive.isEmpty()) {
-        return nextStringValuePart(value.length()); // last string chunk
-      }
-      final Range nextTainted = this.tainted.poll();
-      Ranged nextSensitive = this.sensitive.poll();
-      if (nextTainted != null) {
-        if (nextTainted.isBefore(nextSensitive)) {
-          addNextStringValuePart(nextTainted.getStart(), next); // pending string chunk
-          nextSensitive = handleTaintedValue(nextTainted, nextSensitive);
-        } else {
-          tainted.addFirst(nextTainted);
+    private class ValuePartIterator implements Iterator<ValuePart> {
+        private final Context ctx;
+        private final String value;
+        private final RangedDeque<Range> tainted;
+        private final RangedDeque<Ranged> sensitive;
+        private final Map<Range, List<Ranged>> intersections = new HashMap<>();
+        private final Queue<ValuePart> next = new LinkedList<>();
+        private int index;
+
+        private ValuePartIterator(
+                final Context ctx,
+                final String value,
+                final RangedDeque<Range> tainted,
+                final RangedDeque<Ranged> sensitive) {
+            this.ctx = ctx;
+            this.value = value;
+            this.tainted = tainted;
+            this.sensitive = sensitive;
         }
-      }
-      if (nextSensitive != null) {
-        if (nextSensitive.isBefore(nextTainted)) {
-          addNextStringValuePart(nextSensitive.getStart(), next); // pending string chunk
-          handleSensitiveValue(nextSensitive);
-        } else {
-          sensitive.addFirst(nextSensitive);
+
+        @Override
+        public boolean hasNext() {
+            return !next.isEmpty() || index < value.length();
         }
-      }
-      return next.poll();
-    }
 
-    @Nullable
-    private Ranged handleTaintedValue(
-        @Nonnull final Range nextTainted, @Nullable Ranged nextSensitive) {
-      final RedactionContext redactionCtx = ctx.getRedaction(nextTainted.getSource());
-      List<Ranged> intersections = this.intersections.remove(nextTainted);
-      intersections = intersections == null ? new LinkedList<>() : intersections;
-
-      // remove fully overlapped sensitive ranges
-      while (nextSensitive != null && nextTainted.contains(nextSensitive)) {
-        redactionCtx.markWithSensitiveRanges();
-        intersections.add(nextSensitive);
-        nextSensitive = sensitive.poll();
-      }
-
-      final Ranged intersection;
-      // truncate last sensitive range if intersects with the tainted one
-      if (nextSensitive != null
-          && (intersection = nextTainted.intersection(nextSensitive)) != null) {
-        redactionCtx.markWithSensitiveRanges();
-        intersections.add(intersection);
-        nextSensitive = removeTaintedRange(nextSensitive, nextTainted);
-      }
-
-      // finally add value part
-      final String taintedValue = substring(value, nextTainted);
-      next.add(
-          new RedactableTaintedValuePart(sourceAdapter, nextTainted, taintedValue, intersections));
-      index = nextTainted.getStart() + nextTainted.getLength();
-      return nextSensitive;
-    }
+        @Nullable
+        @Override
+        public ValuePart next() {
+            if (!hasNext()) {
+                throw new NoSuchElementException();
+            }
+            if (!next.isEmpty()) {
+                return next.poll();
+            }
+            if (tainted.isEmpty() && sensitive.isEmpty()) {
+                return nextStringValuePart(value.length()); // last string chunk
+            }
+            final Range nextTainted = this.tainted.poll();
+            Ranged nextSensitive = this.sensitive.poll();
+            if (nextTainted != null) {
+                if (nextTainted.isBefore(nextSensitive)) {
+                    addNextStringValuePart(nextTainted.getStart(), next); // pending string chunk
+                    nextSensitive = handleTaintedValue(nextTainted, nextSensitive);
+                } else {
+                    tainted.addFirst(nextTainted);
+                }
+            }
+            if (nextSensitive != null) {
+                if (nextSensitive.isBefore(nextTainted)) {
+                    addNextStringValuePart(nextSensitive.getStart(), next); // pending string chunk
+                    handleSensitiveValue(nextSensitive);
+                } else {
+                    sensitive.addFirst(nextSensitive);
+                }
+            }
+            return next.poll();
+        }
 
-    private void handleSensitiveValue(@Nonnull Ranged nextSensitive) {
-      // truncate sensitive part if intersects with the next tainted range
-      final Range nextTainted = tainted.peek();
-      final Ranged intersection;
-      if (nextTainted != null && (intersection = nextTainted.intersection(nextSensitive)) != null) {
-        final RedactionContext redactionCtx = ctx.getRedaction(nextTainted.getSource());
-        redactionCtx.markWithSensitiveRanges();
-        intersections.computeIfAbsent(nextTainted, r -> new LinkedList<>()).add(intersection);
-        nextSensitive = removeTaintedRange(nextSensitive, nextTainted);
-      }
-
-      // finally add value part
-      if (nextSensitive != null) {
-        final String sensitiveValue = substring(value, nextSensitive);
-        next.add(new RedactedValuePart(sensitiveValue));
-        index = nextSensitive.getStart() + nextSensitive.getLength();
-      }
-    }
+        @Nullable
+        private Ranged handleTaintedValue(@Nonnull final Range nextTainted, @Nullable Ranged nextSensitive) {
+            final RedactionContext redactionCtx = ctx.getRedaction(nextTainted.getSource());
+            List<Ranged> intersections = this.intersections.remove(nextTainted);
+            intersections = intersections == null ? new LinkedList<>() : intersections;
+
+            // remove fully overlapped sensitive ranges
+            while (nextSensitive != null && nextTainted.contains(nextSensitive)) {
+                redactionCtx.markWithSensitiveRanges();
+                intersections.add(nextSensitive);
+                nextSensitive = sensitive.poll();
+            }
+
+            final Ranged intersection;
+            // truncate last sensitive range if intersects with the tainted one
+            if (nextSensitive != null && (intersection = nextTainted.intersection(nextSensitive)) != null) {
+                redactionCtx.markWithSensitiveRanges();
+                intersections.add(intersection);
+                nextSensitive = removeTaintedRange(nextSensitive, nextTainted);
+            }
+
+            // finally add value part
+            final String taintedValue = substring(value, nextTainted);
+            next.add(new RedactableTaintedValuePart(sourceAdapter, nextTainted, taintedValue, intersections));
+            index = nextTainted.getStart() + nextTainted.getLength();
+            return nextSensitive;
+        }
 
-    /**
-     * Removes the tainted range from the sensitive one and returns whatever is before and enqueues
-     * the rest
-     */
-    @Nullable
-    private Ranged removeTaintedRange(final Ranged sensitive, final Range tainted) {
-      final List<Ranged> disjointRanges = sensitive.remove(tainted);
-      Ranged result = null;
-      for (final Ranged disjoint : disjointRanges) {
-        if (disjoint.isBefore(tainted)) {
-          result = disjoint;
-        } else {
-          this.sensitive.addFirst(disjoint);
+        private void handleSensitiveValue(@Nonnull Ranged nextSensitive) {
+            // truncate sensitive part if intersects with the next tainted range
+            final Range nextTainted = tainted.peek();
+            final Ranged intersection;
+            if (nextTainted != null && (intersection = nextTainted.intersection(nextSensitive)) != null) {
+                final RedactionContext redactionCtx = ctx.getRedaction(nextTainted.getSource());
+                redactionCtx.markWithSensitiveRanges();
+                intersections
+                        .computeIfAbsent(nextTainted, r -> new LinkedList<>())
+                        .add(intersection);
+                nextSensitive = removeTaintedRange(nextSensitive, nextTainted);
+            }
+
+            // finally add value part
+            if (nextSensitive != null) {
+                final String sensitiveValue = substring(value, nextSensitive);
+                next.add(new RedactedValuePart(sensitiveValue));
+                index = nextSensitive.getStart() + nextSensitive.getLength();
+            }
         }
-      }
-      return result;
-    }
 
-    @Nullable
-    private ValuePart nextStringValuePart(final int end) {
-      if (index < end) {
-        final String chunk = value.substring(index, end);
-        index = end;
-        return new StringValuePart(chunk);
-      }
-      return null;
-    }
+        /**
+         * Removes the tainted range from the sensitive one and returns whatever is before and enqueues
+         * the rest
+         */
+        @Nullable
+        private Ranged removeTaintedRange(final Ranged sensitive, final Range tainted) {
+            final List<Ranged> disjointRanges = sensitive.remove(tainted);
+            Ranged result = null;
+            for (final Ranged disjoint : disjointRanges) {
+                if (disjoint.isBefore(tainted)) {
+                    result = disjoint;
+                } else {
+                    this.sensitive.addFirst(disjoint);
+                }
+            }
+            return result;
+        }
+
+        @Nullable
+        private ValuePart nextStringValuePart(final int end) {
+            if (index < end) {
+                final String chunk = value.substring(index, end);
+                index = end;
+                return new StringValuePart(chunk);
+            }
+            return null;
+        }
 
-    private void addNextStringValuePart(final int end, final Collection<ValuePart> target) {
-      final ValuePart part = nextStringValuePart(end);
-      if (part != null) {
-        target.add(part);
-      }
+        private void addNextStringValuePart(final int end, final Collection<ValuePart> target) {
+            final ValuePart part = nextStringValuePart(end);
+            if (part != null) {
+                target.add(part);
+            }
+        }
     }
-  }
 
-  interface ValuePart {
-    void write(final Context ctx, final JsonWriter writer) throws IOException;
-  }
+    interface ValuePart {
+        void write(final Context ctx, final JsonWriter writer) throws IOException;
+    }
 
-  static class StringValuePart implements ValuePart {
+    static class StringValuePart implements ValuePart {
 
-    @Nullable private final String value;
+        @Nullable
+        private final String value;
 
-    private StringValuePart(@Nullable final String value) {
-      this.value = value;
-    }
+        private StringValuePart(@Nullable final String value) {
+            this.value = value;
+        }
 
-    @Override
-    public void write(final Context ctx, final JsonWriter writer) throws IOException {
-      if (value == null || value.isEmpty()) {
-        return;
-      }
-      writer.beginObject();
-      writer.name("value");
-      writeTruncableValue(writer, value);
-      writer.endObject();
+        @Override
+        public void write(final Context ctx, final JsonWriter writer) throws IOException {
+            if (value == null || value.isEmpty()) {
+                return;
+            }
+            writer.beginObject();
+            writer.name("value");
+            writeTruncableValue(writer, value);
+            writer.endObject();
+        }
     }
-  }
 
-  static class RedactedValuePart implements ValuePart {
+    static class RedactedValuePart implements ValuePart {
 
-    private final String value;
+        private final String value;
 
-    private RedactedValuePart(final String value) {
-      this.value = value;
-    }
+        private RedactedValuePart(final String value) {
+            this.value = value;
+        }
 
-    @Override
-    public void write(final Context ctx, final JsonWriter writer) throws IOException {
-      if (value == null) {
-        return;
-      }
-      writer.beginObject();
-      writer.name("redacted");
-      writer.value(true);
-      writer.endObject();
+        @Override
+        public void write(final Context ctx, final JsonWriter writer) throws IOException {
+            if (value == null) {
+                return;
+            }
+            writer.beginObject();
+            writer.name("redacted");
+            writer.value(true);
+            writer.endObject();
+        }
     }
-  }
 
-  static class RedactableTaintedValuePart implements ValuePart {
+    static class RedactableTaintedValuePart implements ValuePart {
 
-    private final JsonAdapter<Source> adapter;
+        private final JsonAdapter<Source> adapter;
 
-    private final Source source;
+        private final Source source;
 
-    private final String value;
+        private final String value;
 
-    private final List<Ranged> sensitiveRanges;
+        private final List<Ranged> sensitiveRanges;
 
-    @Nullable private final Set<VulnerabilityType> markedTypes;
+        @Nullable
+        private final Set<VulnerabilityType> markedTypes;
 
-    private RedactableTaintedValuePart(
-        final JsonAdapter<Source> adapter,
-        final Range range,
-        final String value,
-        final List<Ranged> sensitive) {
-      this.adapter = adapter;
-      this.source = range.getSource();
-      this.value = value;
-      // shift ranges to the start of the tainted range and sort them
-      this.sensitiveRanges =
-          sensitive.stream()
-              .map(it -> shift(it, -range.getStart()))
-              .sorted(Comparator.comparing(Ranged::getStart))
-              .collect(Collectors.toList());
+        private RedactableTaintedValuePart(
+                final JsonAdapter<Source> adapter,
+                final Range range,
+                final String value,
+                final List<Ranged> sensitive) {
+            this.adapter = adapter;
+            this.source = range.getSource();
+            this.value = value;
+            // shift ranges to the start of the tainted range and sort them
+            this.sensitiveRanges = sensitive.stream()
+                    .map(it -> shift(it, -range.getStart()))
+                    .sorted(Comparator.comparing(Ranged::getStart))
+                    .collect(Collectors.toList());
 
-      this.markedTypes = range.getMarkedVulnerabilities();
-    }
+            this.markedTypes = range.getMarkedVulnerabilities();
+        }
 
-    @Override
-    public void write(final Context ctx, final JsonWriter writer) throws IOException {
-      final RedactionContext redaction = ctx.getRedaction(source);
-      redaction.setMarkedTypes(markedTypes);
-      if (redaction.shouldRedact()) {
-        for (final ValuePart part : split(redaction)) {
-          part.write(ctx, writer);
-        }
-      } else {
-        writer.beginObject();
-        writer.name("value");
-        writeTruncableValue(writer, value);
-        writer.name("source");
-        adapter.toJson(writer, source);
-        writeSecureMarks(writer, markedTypes);
-        writer.endObject();
-      }
-    }
+        @Override
+        public void write(final Context ctx, final JsonWriter writer) throws IOException {
+            final RedactionContext redaction = ctx.getRedaction(source);
+            redaction.setMarkedTypes(markedTypes);
+            if (redaction.shouldRedact()) {
+                for (final ValuePart part : split(redaction)) {
+                    part.write(ctx, writer);
+                }
+            } else {
+                writer.beginObject();
+                writer.name("value");
+                writeTruncableValue(writer, value);
+                writer.name("source");
+                adapter.toJson(writer, source);
+                writeSecureMarks(writer, markedTypes);
+                writer.endObject();
+            }
+        }
 
-    private List<ValuePart> split(final RedactionContext redaction) {
-      final List<ValuePart> parts = new ArrayList<>();
-      // Identical sensitive chunks redact to the same pattern (the first occurrence in the source),
-      // so cache chunk -> offset to avoid an O(sourceLength) indexOf per repeated occurrence.
-      final Map<String, Integer> matchingOffsets = new HashMap<>();
-      if (redaction.isSensitive()) {
-        // redact the full tainted value as the source is sensitive (password, certificate, ...)
-        addValuePart(0, value.length(), redaction, matchingOffsets, true, parts);
-      } else {
-        // redact only sensitive parts
-        int index = 0;
-        for (final Ranged sensitive : this.sensitiveRanges) {
-          final int start = sensitive.getStart();
-          final int end = sensitive.getStart() + sensitive.getLength();
-          // append previous tainted chunk (if any)
-          addValuePart(index, start, redaction, matchingOffsets, false, parts);
-          // append current sensitive tainted chunk
-          addValuePart(start, end, redaction, matchingOffsets, true, parts);
-          index = end;
-        }
-        // append last tainted chunk (if any)
-        addValuePart(index, value.length(), redaction, matchingOffsets, false, parts);
-      }
-      return parts;
-    }
+        private List<ValuePart> split(final RedactionContext redaction) {
+            final List<ValuePart> parts = new ArrayList<>();
+            // Identical sensitive chunks redact to the same pattern (the first occurrence in the source),
+            // so cache chunk -> offset to avoid an O(sourceLength) indexOf per repeated occurrence.
+            final Map<String, Integer> matchingOffsets = new HashMap<>();
+            if (redaction.isSensitive()) {
+                // redact the full tainted value as the source is sensitive (password, certificate, ...)
+                addValuePart(0, value.length(), redaction, matchingOffsets, true, parts);
+            } else {
+                // redact only sensitive parts
+                int index = 0;
+                for (final Ranged sensitive : this.sensitiveRanges) {
+                    final int start = sensitive.getStart();
+                    final int end = sensitive.getStart() + sensitive.getLength();
+                    // append previous tainted chunk (if any)
+                    addValuePart(index, start, redaction, matchingOffsets, false, parts);
+                    // append current sensitive tainted chunk
+                    addValuePart(start, end, redaction, matchingOffsets, true, parts);
+                    index = end;
+                }
+                // append last tainted chunk (if any)
+                addValuePart(index, value.length(), redaction, matchingOffsets, false, parts);
+            }
+            return parts;
+        }
 
-    private void addValuePart(
-        final int start,
-        final int end,
-        final RedactionContext ctx,
-        final Map<String, Integer> matchingOffsets,
-        final boolean redact,
-        final List<ValuePart> valueParts) {
-      if (start < end) {
-        final Source source = ctx.getSource();
-        final String chunk = value.substring(start, end);
-        final Set<VulnerabilityType> markedTypes = ctx.getMarkedTypes();
-        if (!redact) {
-          // append the value
-          valueParts.add(new TaintedValuePart(adapter, source, chunk, false, markedTypes));
-        } else {
-          final int length = chunk.length();
-          final String sourceValue = source.getValue();
-          final String redactedValue = ctx.getRedactedValue();
-          final int matching =
-              matchingOffsets.computeIfAbsent(
-                  chunk, c -> sourceValue == null ? -1 : sourceValue.indexOf(c));
-          final String pattern;
-          if (matching >= 0 && redactedValue != null) {
-            // if matches append the matching part from the redacted value
-            pattern = redactedValue.substring(matching, matching + length);
-          } else {
-            // otherwise redact the string
-            pattern = SensitiveHandler.get().redactString(chunk);
-          }
-          valueParts.add(new TaintedValuePart(adapter, source, pattern, true, markedTypes));
-        }
-      }
-    }
+        private void addValuePart(
+                final int start,
+                final int end,
+                final RedactionContext ctx,
+                final Map<String, Integer> matchingOffsets,
+                final boolean redact,
+                final List<ValuePart> valueParts) {
+            if (start < end) {
+                final Source source = ctx.getSource();
+                final String chunk = value.substring(start, end);
+                final Set<VulnerabilityType> markedTypes = ctx.getMarkedTypes();
+                if (!redact) {
+                    // append the value
+                    valueParts.add(new TaintedValuePart(adapter, source, chunk, false, markedTypes));
+                } else {
+                    final int length = chunk.length();
+                    final String sourceValue = source.getValue();
+                    final String redactedValue = ctx.getRedactedValue();
+                    final int matching = matchingOffsets.computeIfAbsent(
+                            chunk, c -> sourceValue == null ? -1 : sourceValue.indexOf(c));
+                    final String pattern;
+                    if (matching >= 0 && redactedValue != null) {
+                        // if matches append the matching part from the redacted value
+                        pattern = redactedValue.substring(matching, matching + length);
+                    } else {
+                        // otherwise redact the string
+                        pattern = SensitiveHandler.get().redactString(chunk);
+                    }
+                    valueParts.add(new TaintedValuePart(adapter, source, pattern, true, markedTypes));
+                }
+            }
+        }
 
-    private Ranged shift(final Ranged ranged, final int offset) {
-      return Ranged.build(ranged.getStart() + offset, ranged.getLength());
+        private Ranged shift(final Ranged ranged, final int offset) {
+            return Ranged.build(ranged.getStart() + offset, ranged.getLength());
+        }
     }
-  }
 
-  static class TaintedValuePart implements ValuePart {
-    private final JsonAdapter<Source> adapter;
+    static class TaintedValuePart implements ValuePart {
+        private final JsonAdapter<Source> adapter;
 
-    private final Source source;
+        private final Source source;
 
-    private final String value;
+        private final String value;
 
-    private final boolean redacted;
+        private final boolean redacted;
 
-    @Nullable private final Set<VulnerabilityType> markedTypes;
+        @Nullable
+        private final Set<VulnerabilityType> markedTypes;
 
-    private TaintedValuePart(
-        final JsonAdapter<Source> adapter,
-        final Source source,
-        final String value,
-        final boolean redacted,
-        final @Nullable Set<VulnerabilityType> markedTypes) {
-      this.adapter = adapter;
-      this.source = source;
-      this.value = value;
-      this.redacted = redacted;
-      this.markedTypes = markedTypes;
-    }
+        private TaintedValuePart(
+                final JsonAdapter<Source> adapter,
+                final Source source,
+                final String value,
+                final boolean redacted,
+                final @Nullable Set<VulnerabilityType> markedTypes) {
+            this.adapter = adapter;
+            this.source = source;
+            this.value = value;
+            this.redacted = redacted;
+            this.markedTypes = markedTypes;
+        }
 
-    @Override
-    public void write(final Context ctx, final JsonWriter writer) throws IOException {
-      if (value == null) {
-        return;
-      }
-      writer.beginObject();
-      writer.name("source");
-      adapter.toJson(writer, source);
-      if (redacted) {
-        writer.name("redacted");
-        writer.value(true);
-        writer.name("pattern");
-      } else {
-        writer.name("value");
-      }
-      writeTruncableValue(writer, value);
-      writeSecureMarks(writer, markedTypes);
-      writer.endObject();
+        @Override
+        public void write(final Context ctx, final JsonWriter writer) throws IOException {
+            if (value == null) {
+                return;
+            }
+            writer.beginObject();
+            writer.name("source");
+            adapter.toJson(writer, source);
+            if (redacted) {
+                writer.name("redacted");
+                writer.value(true);
+                writer.name("pattern");
+            } else {
+                writer.name("value");
+            }
+            writeTruncableValue(writer, value);
+            writeSecureMarks(writer, markedTypes);
+            writer.endObject();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/FormattingAdapter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/FormattingAdapter.java
index 12d00ff344d..3d23a23c187 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/FormattingAdapter.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/FormattingAdapter.java
@@ -9,11 +9,11 @@
 
 public abstract class FormattingAdapter<V> extends JsonAdapter<V> {
 
-  @FromJson
-  @Nullable
-  @Override
-  public final V fromJson(@Nonnull final JsonReader reader) throws IOException {
-    throw new UnsupportedOperationException(
-        "Deserialization is not supported at " + getClass().getName());
-  }
+    @FromJson
+    @Nullable
+    @Override
+    public final V fromJson(@Nonnull final JsonReader reader) throws IOException {
+        throw new UnsupportedOperationException(
+                "Deserialization is not supported at " + getClass().getName());
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/SourceAdapter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/SourceAdapter.java
index 7f5ab7edc1f..7fda166f295 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/SourceAdapter.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/SourceAdapter.java
@@ -14,71 +14,68 @@
 
 public class SourceAdapter extends FormattingAdapter<Source> {
 
-  private final SourceTypeAdapter sourceTypeAdapter;
-  private final JsonAdapter<Source> defaultAdapter;
-  private final JsonAdapter<Source> redactedAdapter;
+    private final SourceTypeAdapter sourceTypeAdapter;
+    private final JsonAdapter<Source> defaultAdapter;
+    private final JsonAdapter<Source> redactedAdapter;
 
-  public SourceAdapter() {
-    sourceTypeAdapter = new SourceTypeAdapter();
-    defaultAdapter = new DefaultSourceAdapter();
-    redactedAdapter = new RedactedSourceAdapter();
-  }
-
-  @Override
-  public void toJson(@Nonnull final JsonWriter writer, final @Nullable Source source)
-      throws IOException {
-    if (source == null) {
-      writer.nullValue();
-      return;
-    }
-    if (Config.get().isIastRedactionEnabled()) {
-      redactedAdapter.toJson(writer, source);
-    } else {
-      defaultAdapter.toJson(writer, source);
+    public SourceAdapter() {
+        sourceTypeAdapter = new SourceTypeAdapter();
+        defaultAdapter = new DefaultSourceAdapter();
+        redactedAdapter = new RedactedSourceAdapter();
     }
-  }
-
-  private class DefaultSourceAdapter extends FormattingAdapter<Source> {
 
     @Override
-    public void toJson(@Nonnull JsonWriter writer, @Nonnull Source source) throws IOException {
-      writer.beginObject();
-      writer.name("origin");
-      sourceTypeAdapter.toJson(writer, source.getOrigin());
-      writer.name("name");
-      writer.value(source.getName());
-      writer.name("value");
-      writeTruncableValue(writer, source.getValue());
-      writer.endObject();
+    public void toJson(@Nonnull final JsonWriter writer, final @Nullable Source source) throws IOException {
+        if (source == null) {
+            writer.nullValue();
+            return;
+        }
+        if (Config.get().isIastRedactionEnabled()) {
+            redactedAdapter.toJson(writer, source);
+        } else {
+            defaultAdapter.toJson(writer, source);
+        }
     }
-  }
 
-  private class RedactedSourceAdapter extends FormattingAdapter<Source> {
+    private class DefaultSourceAdapter extends FormattingAdapter<Source> {
 
-    @Override
-    public void toJson(@Nonnull final JsonWriter writer, final @Nonnull Source source)
-        throws IOException {
-      final RedactionContext ctx = Context.get().getRedaction(source);
-      if (ctx.shouldRedact()) {
-        toRedactedJson(writer, source, ctx.getRedactedValue());
-      } else {
-        defaultAdapter.toJson(writer, source);
-      }
+        @Override
+        public void toJson(@Nonnull JsonWriter writer, @Nonnull Source source) throws IOException {
+            writer.beginObject();
+            writer.name("origin");
+            sourceTypeAdapter.toJson(writer, source.getOrigin());
+            writer.name("name");
+            writer.value(source.getName());
+            writer.name("value");
+            writeTruncableValue(writer, source.getValue());
+            writer.endObject();
+        }
     }
 
-    private void toRedactedJson(
-        final JsonWriter writer, final Source source, @Nullable final String value)
-        throws IOException {
-      writer.beginObject();
-      writer.name("origin");
-      sourceTypeAdapter.toJson(writer, source.getOrigin());
-      writer.name("name");
-      writer.value(source.getName());
-      writer.name("redacted");
-      writer.value(true);
-      writer.name("pattern");
-      writeTruncableValue(writer, value);
-      writer.endObject();
+    private class RedactedSourceAdapter extends FormattingAdapter<Source> {
+
+        @Override
+        public void toJson(@Nonnull final JsonWriter writer, final @Nonnull Source source) throws IOException {
+            final RedactionContext ctx = Context.get().getRedaction(source);
+            if (ctx.shouldRedact()) {
+                toRedactedJson(writer, source, ctx.getRedactedValue());
+            } else {
+                defaultAdapter.toJson(writer, source);
+            }
+        }
+
+        private void toRedactedJson(final JsonWriter writer, final Source source, @Nullable final String value)
+                throws IOException {
+            writer.beginObject();
+            writer.name("origin");
+            sourceTypeAdapter.toJson(writer, source.getOrigin());
+            writer.name("name");
+            writer.value(source.getName());
+            writer.name("redacted");
+            writer.value(true);
+            writer.name("pattern");
+            writeTruncableValue(writer, value);
+            writer.endObject();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/SourceTypeAdapter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/SourceTypeAdapter.java
index ca9b6a009ba..0f529bf40f6 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/SourceTypeAdapter.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/SourceTypeAdapter.java
@@ -9,19 +9,19 @@
 
 class SourceTypeAdapter {
 
-  @ToJson
-  void toJson(JsonWriter writer, @SourceTypeString byte value) throws IOException {
-    final String stringValue = SourceTypes.toString(value);
-    if (stringValue == null) {
-      writer.nullValue();
-      return;
+    @ToJson
+    void toJson(JsonWriter writer, @SourceTypeString byte value) throws IOException {
+        final String stringValue = SourceTypes.toString(value);
+        if (stringValue == null) {
+            writer.nullValue();
+            return;
+        }
+        writer.value(stringValue);
     }
-    writer.value(stringValue);
-  }
 
-  @FromJson
-  @SourceTypeString
-  byte fromJson(JsonReader reader) {
-    throw new UnsupportedOperationException("SourceType deserialization not supported");
-  }
+    @FromJson
+    @SourceTypeString
+    byte fromJson(JsonReader reader) {
+        throw new UnsupportedOperationException("SourceType deserialization not supported");
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TaintedObjectAdapter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TaintedObjectAdapter.java
index bee0d8ab221..f751d649c0b 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TaintedObjectAdapter.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TaintedObjectAdapter.java
@@ -14,60 +14,57 @@
 
 public class TaintedObjectAdapter {
 
-  @ToJson
-  public void toJson(@Nonnull final JsonWriter writer, @Nullable final TaintedObject value)
-      throws IOException {
-    if (value == null) {
-      writer.nullValue();
-    } else {
-      writer.beginObject();
-      final Object weak = value.get();
-      writer.name("value");
-      writer.value(weak == null ? "[Value GCed]" : weak.toString());
-      writer.name("ranges");
-      writer.beginArray();
-      for (final Range range : value.getRanges()) {
-        toJson(writer, range);
-      }
-      writer.endArray();
-      writer.endObject();
+    @ToJson
+    public void toJson(@Nonnull final JsonWriter writer, @Nullable final TaintedObject value) throws IOException {
+        if (value == null) {
+            writer.nullValue();
+        } else {
+            writer.beginObject();
+            final Object weak = value.get();
+            writer.name("value");
+            writer.value(weak == null ? "[Value GCed]" : weak.toString());
+            writer.name("ranges");
+            writer.beginArray();
+            for (final Range range : value.getRanges()) {
+                toJson(writer, range);
+            }
+            writer.endArray();
+            writer.endObject();
+        }
     }
-  }
 
-  private void toJson(@Nonnull final JsonWriter writer, @Nullable final Range value)
-      throws IOException {
-    if (value == null) {
-      writer.nullValue();
-    } else {
-      writer.beginObject();
-      writer.name("source");
-      toJson(writer, value.getSource());
-      writer.name("start");
-      writer.value(value.getStart());
-      writer.name("length");
-      writer.value(value.getLength());
-      writer.endObject();
+    private void toJson(@Nonnull final JsonWriter writer, @Nullable final Range value) throws IOException {
+        if (value == null) {
+            writer.nullValue();
+        } else {
+            writer.beginObject();
+            writer.name("source");
+            toJson(writer, value.getSource());
+            writer.name("start");
+            writer.value(value.getStart());
+            writer.name("length");
+            writer.value(value.getLength());
+            writer.endObject();
+        }
     }
-  }
 
-  private void toJson(@Nonnull final JsonWriter writer, @Nullable final Source value)
-      throws IOException {
-    if (value == null) {
-      writer.nullValue();
-    } else {
-      writer.beginObject();
-      writer.name("origin");
-      writer.value(SourceTypes.toString(value.getOrigin()));
-      writer.name("name");
-      writer.value(value.getName());
-      writer.name("value");
-      writer.value(value.getValue());
-      writer.endObject();
+    private void toJson(@Nonnull final JsonWriter writer, @Nullable final Source value) throws IOException {
+        if (value == null) {
+            writer.nullValue();
+        } else {
+            writer.beginObject();
+            writer.name("origin");
+            writer.value(SourceTypes.toString(value.getOrigin()));
+            writer.name("name");
+            writer.value(value.getName());
+            writer.name("value");
+            writer.value(value.getValue());
+            writer.endObject();
+        }
     }
-  }
 
-  @FromJson
-  public TaintedObject fromJson(@Nonnull final JsonReader reader) {
-    throw new UnsupportedOperationException("TaintedObject deserialization not supported");
-  }
+    @FromJson
+    public TaintedObject fromJson(@Nonnull final JsonReader reader) {
+        throw new UnsupportedOperationException("TaintedObject deserialization not supported");
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TaintedObjectEncoding.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TaintedObjectEncoding.java
index 27a92bf7dd7..38d1b62e860 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TaintedObjectEncoding.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TaintedObjectEncoding.java
@@ -8,20 +8,19 @@
 
 public class TaintedObjectEncoding {
 
-  private static final JsonAdapter<List<TaintedObject>> LIST_ADAPTER =
-      new Moshi.Builder()
-          .add(new TaintedObjectAdapter())
-          .build()
-          .adapter(Types.newParameterizedType(List.class, TaintedObject.class));
+    private static final JsonAdapter<List<TaintedObject>> LIST_ADAPTER = new Moshi.Builder()
+            .add(new TaintedObjectAdapter())
+            .build()
+            .adapter(Types.newParameterizedType(List.class, TaintedObject.class));
 
-  private static final JsonAdapter<TaintedObject> ADAPTER =
-      new Moshi.Builder().add(new TaintedObjectAdapter()).build().adapter(TaintedObject.class);
+    private static final JsonAdapter<TaintedObject> ADAPTER =
+            new Moshi.Builder().add(new TaintedObjectAdapter()).build().adapter(TaintedObject.class);
 
-  public static String toJson(final List<TaintedObject> value) {
-    return LIST_ADAPTER.toJson(value);
-  }
+    public static String toJson(final List<TaintedObject> value) {
+        return LIST_ADAPTER.toJson(value);
+    }
 
-  public static String toJson(final TaintedObject value) {
-    return ADAPTER.toJson(value);
-  }
+    public static String toJson(final TaintedObject value) {
+        return ADAPTER.toJson(value);
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TruncatedVulnerabilities.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TruncatedVulnerabilities.java
index fe767384ef2..19c876b7aa1 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TruncatedVulnerabilities.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TruncatedVulnerabilities.java
@@ -6,14 +6,15 @@
 
 public class TruncatedVulnerabilities {
 
-  @Nullable private final List<Vulnerability> vulnerabilities;
+    @Nullable
+    private final List<Vulnerability> vulnerabilities;
 
-  public TruncatedVulnerabilities(@Nullable final List<Vulnerability> vulnerabilities) {
-    this.vulnerabilities = vulnerabilities;
-  }
+    public TruncatedVulnerabilities(@Nullable final List<Vulnerability> vulnerabilities) {
+        this.vulnerabilities = vulnerabilities;
+    }
 
-  @Nullable
-  public List<Vulnerability> getVulnerabilities() {
-    return vulnerabilities;
-  }
+    @Nullable
+    public List<Vulnerability> getVulnerabilities() {
+        return vulnerabilities;
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TruncatedVulnerabilitiesAdapter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TruncatedVulnerabilitiesAdapter.java
index f4a72d77602..85e61608eb8 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TruncatedVulnerabilitiesAdapter.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TruncatedVulnerabilitiesAdapter.java
@@ -14,74 +14,72 @@
 
 class TruncatedVulnerabilitiesAdapter extends FormattingAdapter<TruncatedVulnerabilities> {
 
-  private static final String MAX_SIZE_EXCEEDED = "MAX_SIZE_EXCEEDED";
+    private static final String MAX_SIZE_EXCEEDED = "MAX_SIZE_EXCEEDED";
 
-  private final JsonAdapter<Vulnerability> vulnerabilityAdapter;
+    private final JsonAdapter<Vulnerability> vulnerabilityAdapter;
 
-  public TruncatedVulnerabilitiesAdapter(Moshi moshi) {
-    this.vulnerabilityAdapter = new TruncatedVulnerabilityAdapter(moshi);
-  }
-
-  @Override
-  public void toJson(@Nonnull JsonWriter writer, @Nullable TruncatedVulnerabilities value)
-      throws IOException {
-    if (value == null) {
-      writer.nullValue();
-      return;
+    public TruncatedVulnerabilitiesAdapter(Moshi moshi) {
+        this.vulnerabilityAdapter = new TruncatedVulnerabilityAdapter(moshi);
     }
-    final List<Vulnerability> vulnerabilities = value.getVulnerabilities();
-    writer.beginObject();
-    if (vulnerabilities != null && !vulnerabilities.isEmpty()) {
-      writer.name("vulnerabilities");
-      writer.beginArray();
-      for (Vulnerability vulnerability : vulnerabilities) {
-        vulnerabilityAdapter.toJson(writer, vulnerability);
-      }
-      writer.endArray();
+
+    @Override
+    public void toJson(@Nonnull JsonWriter writer, @Nullable TruncatedVulnerabilities value) throws IOException {
+        if (value == null) {
+            writer.nullValue();
+            return;
+        }
+        final List<Vulnerability> vulnerabilities = value.getVulnerabilities();
+        writer.beginObject();
+        if (vulnerabilities != null && !vulnerabilities.isEmpty()) {
+            writer.name("vulnerabilities");
+            writer.beginArray();
+            for (Vulnerability vulnerability : vulnerabilities) {
+                vulnerabilityAdapter.toJson(writer, vulnerability);
+            }
+            writer.endArray();
+        }
+        writer.endObject();
     }
-    writer.endObject();
-  }
 
-  private static class TruncatedVulnerabilityAdapter extends FormattingAdapter<Vulnerability> {
+    private static class TruncatedVulnerabilityAdapter extends FormattingAdapter<Vulnerability> {
 
-    private final JsonAdapter<VulnerabilityType> vulnerabilityTypeAdapter;
+        private final JsonAdapter<VulnerabilityType> vulnerabilityTypeAdapter;
 
-    private final JsonAdapter<Evidence> evidenceAdapter;
+        private final JsonAdapter<Evidence> evidenceAdapter;
 
-    private final JsonAdapter<Location> locationAdapter;
+        private final JsonAdapter<Location> locationAdapter;
 
-    public TruncatedVulnerabilityAdapter(Moshi moshi) {
-      this.vulnerabilityTypeAdapter = moshi.adapter(VulnerabilityType.class);
-      this.evidenceAdapter = new TruncatedEvidenceAdapter();
-      this.locationAdapter = moshi.adapter(Location.class);
-    }
+        public TruncatedVulnerabilityAdapter(Moshi moshi) {
+            this.vulnerabilityTypeAdapter = moshi.adapter(VulnerabilityType.class);
+            this.evidenceAdapter = new TruncatedEvidenceAdapter();
+            this.locationAdapter = moshi.adapter(Location.class);
+        }
 
-    @Override
-    public void toJson(@Nonnull JsonWriter writer, @Nullable Vulnerability value)
-        throws IOException {
-      if (value == null) {
-        return;
-      }
-      writer.beginObject();
-      writer.name("type");
-      vulnerabilityTypeAdapter.toJson(writer, value.getType());
-      writer.name("evidence");
-      evidenceAdapter.toJson(writer, value.getEvidence());
-      writer.name("hash");
-      writer.value(value.getHash());
-      writer.name("location");
-      locationAdapter.toJson(writer, value.getLocation());
-      writer.endObject();
+        @Override
+        public void toJson(@Nonnull JsonWriter writer, @Nullable Vulnerability value) throws IOException {
+            if (value == null) {
+                return;
+            }
+            writer.beginObject();
+            writer.name("type");
+            vulnerabilityTypeAdapter.toJson(writer, value.getType());
+            writer.name("evidence");
+            evidenceAdapter.toJson(writer, value.getEvidence());
+            writer.name("hash");
+            writer.value(value.getHash());
+            writer.name("location");
+            locationAdapter.toJson(writer, value.getLocation());
+            writer.endObject();
+        }
     }
-  }
 
-  private static class TruncatedEvidenceAdapter extends FormattingAdapter<Evidence> {
-    @Override
-    public void toJson(@Nonnull JsonWriter writer, @Nullable Evidence evidence) throws IOException {
-      writer.beginObject();
-      writer.name("value");
-      writer.value(MAX_SIZE_EXCEEDED);
-      writer.endObject();
+    private static class TruncatedEvidenceAdapter extends FormattingAdapter<Evidence> {
+        @Override
+        public void toJson(@Nonnull JsonWriter writer, @Nullable Evidence evidence) throws IOException {
+            writer.beginObject();
+            writer.name("value");
+            writer.value(MAX_SIZE_EXCEEDED);
+            writer.endObject();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TruncationUtils.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TruncationUtils.java
index 7125ae86ead..34829f8e3d0 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TruncationUtils.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/TruncationUtils.java
@@ -7,20 +7,19 @@
 import javax.annotation.Nullable;
 
 public final class TruncationUtils {
-  private static final int VALUE_MAX_LENGTH = Config.get().getIastTruncationMaxValueLength();
-  private static final String TRUNCATED = "truncated";
-  private static final String RIGHT = "right";
+    private static final int VALUE_MAX_LENGTH = Config.get().getIastTruncationMaxValueLength();
+    private static final String TRUNCATED = "truncated";
+    private static final String RIGHT = "right";
 
-  private TruncationUtils() {}
+    private TruncationUtils() {}
 
-  public static void writeTruncableValue(@Nonnull JsonWriter writer, @Nullable String value)
-      throws IOException {
-    if (value != null && value.length() > VALUE_MAX_LENGTH) {
-      writer.value(value.substring(0, VALUE_MAX_LENGTH));
-      writer.name(TRUNCATED);
-      writer.value(RIGHT);
-    } else {
-      writer.value(value);
+    public static void writeTruncableValue(@Nonnull JsonWriter writer, @Nullable String value) throws IOException {
+        if (value != null && value.length() > VALUE_MAX_LENGTH) {
+            writer.value(value.substring(0, VALUE_MAX_LENGTH));
+            writer.name(TRUNCATED);
+            writer.value(RIGHT);
+        } else {
+            writer.value(value);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/VulnerabilityEncoding.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/VulnerabilityEncoding.java
index a573dc784e5..642001dd5f8 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/VulnerabilityEncoding.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/VulnerabilityEncoding.java
@@ -11,32 +11,33 @@
 
 public class VulnerabilityEncoding {
 
-  private static final Logger log = LoggerFactory.getLogger(VulnerabilityEncoding.class);
-  private static final int MAX_SPAN_TAG_SIZE = 25000;
-
-  static final Moshi MOSHI =
-      new Moshi.Builder().add(new SourceTypeAdapter()).add(new AdapterFactory()).build();
-
-  private static final JsonAdapter<VulnerabilityBatch> BATCH_ADAPTER =
-      MOSHI.adapter(VulnerabilityBatch.class);
-
-  private static final JsonAdapter<TruncatedVulnerabilities> TRUNCATED_VULNERABILITIES_ADAPTER =
-      MOSHI.adapter(TruncatedVulnerabilities.class);
-
-  public static String toJson(final VulnerabilityBatch value) {
-    try {
-      String json = BATCH_ADAPTER.toJson(value);
-      return json.getBytes(StandardCharsets.UTF_8).length > MAX_SPAN_TAG_SIZE
-          ? getExceededTagSizeJson(new TruncatedVulnerabilities(value.getVulnerabilities()))
-          : json;
-    } catch (Exception ex) {
-      log.debug("Vulnerability serialization error", ex);
-      return "{\"vulnerabilities\":[]}";
+    private static final Logger log = LoggerFactory.getLogger(VulnerabilityEncoding.class);
+    private static final int MAX_SPAN_TAG_SIZE = 25000;
+
+    static final Moshi MOSHI = new Moshi.Builder()
+            .add(new SourceTypeAdapter())
+            .add(new AdapterFactory())
+            .build();
+
+    private static final JsonAdapter<VulnerabilityBatch> BATCH_ADAPTER = MOSHI.adapter(VulnerabilityBatch.class);
+
+    private static final JsonAdapter<TruncatedVulnerabilities> TRUNCATED_VULNERABILITIES_ADAPTER =
+            MOSHI.adapter(TruncatedVulnerabilities.class);
+
+    public static String toJson(final VulnerabilityBatch value) {
+        try {
+            String json = BATCH_ADAPTER.toJson(value);
+            return json.getBytes(StandardCharsets.UTF_8).length > MAX_SPAN_TAG_SIZE
+                    ? getExceededTagSizeJson(new TruncatedVulnerabilities(value.getVulnerabilities()))
+                    : json;
+        } catch (Exception ex) {
+            log.debug("Vulnerability serialization error", ex);
+            return "{\"vulnerabilities\":[]}";
+        }
     }
-  }
 
-  static String getExceededTagSizeJson(final TruncatedVulnerabilities truncatedVulnerabilities) {
-    IastMetricCollector.add(IastMetric.JSON_TAG_SIZE_EXCEED, 1);
-    return TRUNCATED_VULNERABILITIES_ADAPTER.toJson(truncatedVulnerabilities);
-  }
+    static String getExceededTagSizeJson(final TruncatedVulnerabilities truncatedVulnerabilities) {
+        IastMetricCollector.add(IastMetric.JSON_TAG_SIZE_EXCEED, 1);
+        return TRUNCATED_VULNERABILITIES_ADAPTER.toJson(truncatedVulnerabilities);
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/VulnerabilityTypeAdapter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/VulnerabilityTypeAdapter.java
index cefe5530b28..acd256073f7 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/VulnerabilityTypeAdapter.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/VulnerabilityTypeAdapter.java
@@ -8,13 +8,12 @@
 
 public class VulnerabilityTypeAdapter extends FormattingAdapter<VulnerabilityType> {
 
-  @Override
-  public void toJson(@Nonnull final JsonWriter writer, @Nullable final VulnerabilityType value)
-      throws IOException {
-    if (value == null) {
-      writer.nullValue();
-      return;
+    @Override
+    public void toJson(@Nonnull final JsonWriter writer, @Nullable final VulnerabilityType value) throws IOException {
+        if (value == null) {
+            writer.nullValue();
+            return;
+        }
+        writer.value(value.name());
     }
-    writer.value(value.name());
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/Operation.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/Operation.java
index c21cec9d9c7..9f9b0a24702 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/Operation.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/Operation.java
@@ -3,7 +3,7 @@
 import javax.annotation.Nullable;
 
 public interface Operation {
-  boolean hasQuota(@Nullable final OverheadContext context);
+    boolean hasQuota(@Nullable final OverheadContext context);
 
-  boolean consumeQuota(@Nullable final OverheadContext context);
+    boolean consumeQuota(@Nullable final OverheadContext context);
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/Operations.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/Operations.java
index e7bb35f1550..e0989210737 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/Operations.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/Operations.java
@@ -4,29 +4,28 @@
 
 public class Operations {
 
-  private Operations() {}
+    private Operations() {}
 
-  public static final Operation REPORT_VULNERABILITY =
-      new Operation() {
+    public static final Operation REPORT_VULNERABILITY = new Operation() {
         @Override
         public boolean hasQuota(@Nullable final OverheadContext context) {
-          if (context == null) {
-            return false;
-          }
-          return context.getAvailableQuota() > 0;
+            if (context == null) {
+                return false;
+            }
+            return context.getAvailableQuota() > 0;
         }
 
         @Override
         public boolean consumeQuota(@Nullable final OverheadContext context) {
-          if (context == null) {
-            return false;
-          }
-          return context.consumeQuota(1);
+            if (context == null) {
+                return false;
+            }
+            return context.consumeQuota(1);
         }
 
         @Override
         public String toString() {
-          return "Operation#REPORT_VULNERABILITY";
+            return "Operation#REPORT_VULNERABILITY";
         }
-      };
+    };
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadContext.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadContext.java
index 89dc03c1a59..247e269e525 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadContext.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadContext.java
@@ -15,107 +15,103 @@
 
 public class OverheadContext {
 
-  /** Maximum number of distinct endpoints to remember in the global cache. */
-  private static final int GLOBAL_MAP_MAX_SIZE = 4096;
-
-  /**
-   * Global concurrent cache mapping each “method + path” key to its historical vulnerabilityCounts
-   * map. As soon as size() > GLOBAL_MAP_MAX_SIZE, we clear() the whole map.
-   */
-  static final ConcurrentMap<String, AtomicIntegerArray> globalMap =
-      new ConcurrentHashMap<String, AtomicIntegerArray>() {
-
-        @Override
-        public AtomicIntegerArray computeIfAbsent(
-            String key,
-            @Nonnull Function<? super String, ? extends AtomicIntegerArray> mappingFunction) {
-          if (this.size() >= GLOBAL_MAP_MAX_SIZE) {
-            super.clear();
-          }
-          return super.computeIfAbsent(key, mappingFunction);
-        }
-      };
-
-  // Snapshot of the globalMap for the current request
-  private @Nullable final Map<String, int[]> copyMap;
-  // Map of vulnerabilities per endpoint for the current request, needs to use AtomicIntegerArray
-  // because it's possible to have concurrent updates in the same request
-  private @Nullable final Map<String, AtomicIntegerArray> requestMap;
-
-  private final NonBlockingSemaphore availableVulnerabilities;
-  private final boolean isGlobal;
-
-  public OverheadContext(final int vulnerabilitiesPerRequest) {
-    this(vulnerabilitiesPerRequest, false);
-  }
-
-  public OverheadContext(final int vulnerabilitiesPerRequest, final boolean isGlobal) {
-    availableVulnerabilities =
-        vulnerabilitiesPerRequest == UNLIMITED
-            ? NonBlockingSemaphore.unlimited()
-            : NonBlockingSemaphore.withPermitCount(vulnerabilitiesPerRequest);
-    this.isGlobal = isGlobal;
-    this.requestMap = isGlobal ? null : new ConcurrentHashMap<>();
-    this.copyMap = isGlobal ? null : new ConcurrentHashMap<>();
-  }
-
-  public int getAvailableQuota() {
-    return availableVulnerabilities.available();
-  }
-
-  public boolean consumeQuota(final int delta) {
-    return availableVulnerabilities.acquire(delta);
-  }
-
-  public void reset() {
-    availableVulnerabilities.reset();
-  }
-
-  public void resetMaps() {
-    // If this is a global context, we do not reset the maps
-    if (isGlobal || requestMap == null || copyMap == null) {
-      return;
+    /** Maximum number of distinct endpoints to remember in the global cache. */
+    private static final int GLOBAL_MAP_MAX_SIZE = 4096;
+
+    /**
+     * Global concurrent cache mapping each “method + path” key to its historical vulnerabilityCounts
+     * map. As soon as size() > GLOBAL_MAP_MAX_SIZE, we clear() the whole map.
+     */
+    static final ConcurrentMap<String, AtomicIntegerArray> globalMap =
+            new ConcurrentHashMap<String, AtomicIntegerArray>() {
+
+                @Override
+                public AtomicIntegerArray computeIfAbsent(
+                        String key, @Nonnull Function<? super String, ? extends AtomicIntegerArray> mappingFunction) {
+                    if (this.size() >= GLOBAL_MAP_MAX_SIZE) {
+                        super.clear();
+                    }
+                    return super.computeIfAbsent(key, mappingFunction);
+                }
+            };
+
+    // Snapshot of the globalMap for the current request
+    private @Nullable final Map<String, int[]> copyMap;
+    // Map of vulnerabilities per endpoint for the current request, needs to use AtomicIntegerArray
+    // because it's possible to have concurrent updates in the same request
+    private @Nullable final Map<String, AtomicIntegerArray> requestMap;
+
+    private final NonBlockingSemaphore availableVulnerabilities;
+    private final boolean isGlobal;
+
+    public OverheadContext(final int vulnerabilitiesPerRequest) {
+        this(vulnerabilitiesPerRequest, false);
     }
-    Set<String> endpoints = requestMap.keySet();
-    // If the budget is not consumed, we can reset the maps
-    if (getAvailableQuota() > 0) {
-      // clean endpoints from globalMap
-      endpoints.forEach(globalMap::remove);
-      return;
+
+    public OverheadContext(final int vulnerabilitiesPerRequest, final boolean isGlobal) {
+        availableVulnerabilities = vulnerabilitiesPerRequest == UNLIMITED
+                ? NonBlockingSemaphore.unlimited()
+                : NonBlockingSemaphore.withPermitCount(vulnerabilitiesPerRequest);
+        this.isGlobal = isGlobal;
+        this.requestMap = isGlobal ? null : new ConcurrentHashMap<>();
+        this.copyMap = isGlobal ? null : new ConcurrentHashMap<>();
     }
-    // If the budget is consumed, we need to merge the requestMap into the globalMap
-    endpoints.forEach(
-        endpoint -> {
-          AtomicIntegerArray countMap = requestMap.get(endpoint);
-          // should not happen, but just in case
-          if (countMap == null) {
-            globalMap.remove(endpoint);
+
+    public int getAvailableQuota() {
+        return availableVulnerabilities.available();
+    }
+
+    public boolean consumeQuota(final int delta) {
+        return availableVulnerabilities.acquire(delta);
+    }
+
+    public void reset() {
+        availableVulnerabilities.reset();
+    }
+
+    public void resetMaps() {
+        // If this is a global context, we do not reset the maps
+        if (isGlobal || requestMap == null || copyMap == null) {
             return;
-          }
-          // Iterate over the vulnerabilities and update the globalMap
-          int numberOfVulnerabilities = VulnerabilityTypes.STRINGS.length;
-          for (int i = 0; i < numberOfVulnerabilities; i++) {
-            int counter = countMap.get(i);
-            if (counter > 0) {
-              AtomicIntegerArray globalCountMap =
-                  globalMap.computeIfAbsent(
-                      endpoint, value -> new AtomicIntegerArray(numberOfVulnerabilities));
-
-              globalCountMap.accumulateAndGet(i, counter, Math::max);
+        }
+        Set<String> endpoints = requestMap.keySet();
+        // If the budget is not consumed, we can reset the maps
+        if (getAvailableQuota() > 0) {
+            // clean endpoints from globalMap
+            endpoints.forEach(globalMap::remove);
+            return;
+        }
+        // If the budget is consumed, we need to merge the requestMap into the globalMap
+        endpoints.forEach(endpoint -> {
+            AtomicIntegerArray countMap = requestMap.get(endpoint);
+            // should not happen, but just in case
+            if (countMap == null) {
+                globalMap.remove(endpoint);
+                return;
+            }
+            // Iterate over the vulnerabilities and update the globalMap
+            int numberOfVulnerabilities = VulnerabilityTypes.STRINGS.length;
+            for (int i = 0; i < numberOfVulnerabilities; i++) {
+                int counter = countMap.get(i);
+                if (counter > 0) {
+                    AtomicIntegerArray globalCountMap = globalMap.computeIfAbsent(
+                            endpoint, value -> new AtomicIntegerArray(numberOfVulnerabilities));
+
+                    globalCountMap.accumulateAndGet(i, counter, Math::max);
+                }
             }
-          }
         });
-  }
+    }
 
-  public boolean isGlobal() {
-    return isGlobal;
-  }
+    public boolean isGlobal() {
+        return isGlobal;
+    }
 
-  public @Nullable Map<String, int[]> getCopyMap() {
-    return copyMap;
-  }
+    public @Nullable Map<String, int[]> getCopyMap() {
+        return copyMap;
+    }
 
-  public @Nullable Map<String, AtomicIntegerArray> getRequestMap() {
-    return requestMap;
-  }
+    public @Nullable Map<String, AtomicIntegerArray> getRequestMap() {
+        return requestMap;
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadController.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadController.java
index 344ae25226f..a0bbbb78939 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadController.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadController.java
@@ -26,346 +26,334 @@
 
 public interface OverheadController {
 
-  boolean acquireRequest();
+    boolean acquireRequest();
 
-  void reset();
+    void reset();
 
-  int releaseRequest();
+    int releaseRequest();
 
-  boolean hasQuota(Operation operation, @Nullable AgentSpan span);
+    boolean hasQuota(Operation operation, @Nullable AgentSpan span);
 
-  boolean consumeQuota(Operation operation, @Nullable AgentSpan span);
+    boolean consumeQuota(Operation operation, @Nullable AgentSpan span);
 
-  boolean consumeQuota(
-      Operation operation, @Nullable AgentSpan span, @Nullable VulnerabilityType type);
+    boolean consumeQuota(Operation operation, @Nullable AgentSpan span, @Nullable VulnerabilityType type);
 
-  static OverheadController build(final Config config, final AgentTaskScheduler scheduler) {
-    return build(
-        config.getIastRequestSampling(),
-        config.getIastMaxConcurrentRequests(),
-        config.getIastContextMode() == IastContext.Mode.GLOBAL,
-        scheduler);
-  }
+    static OverheadController build(final Config config, final AgentTaskScheduler scheduler) {
+        return build(
+                config.getIastRequestSampling(),
+                config.getIastMaxConcurrentRequests(),
+                config.getIastContextMode() == IastContext.Mode.GLOBAL,
+                scheduler);
+    }
 
-  static OverheadController build(
-      final float requestSampling,
-      final int maxConcurrentRequests,
-      final boolean globalFallback,
-      final AgentTaskScheduler scheduler) {
-    final OverheadControllerImpl result =
-        new OverheadControllerImpl(
-            requestSampling, maxConcurrentRequests, globalFallback, scheduler);
-    return IastSystem.DEBUG ? new OverheadControllerDebugAdapter(result) : result;
-  }
+    static OverheadController build(
+            final float requestSampling,
+            final int maxConcurrentRequests,
+            final boolean globalFallback,
+            final AgentTaskScheduler scheduler) {
+        final OverheadControllerImpl result =
+                new OverheadControllerImpl(requestSampling, maxConcurrentRequests, globalFallback, scheduler);
+        return IastSystem.DEBUG ? new OverheadControllerDebugAdapter(result) : result;
+    }
 
-  class OverheadControllerDebugAdapter implements OverheadController {
+    class OverheadControllerDebugAdapter implements OverheadController {
 
-    static Logger LOGGER = LoggerFactory.getLogger(OverheadController.class);
+        static Logger LOGGER = LoggerFactory.getLogger(OverheadController.class);
 
-    private final OverheadControllerImpl delegate;
+        private final OverheadControllerImpl delegate;
 
-    public OverheadControllerDebugAdapter(final OverheadControllerImpl delegate) {
-      this.delegate = delegate;
-    }
+        public OverheadControllerDebugAdapter(final OverheadControllerImpl delegate) {
+            this.delegate = delegate;
+        }
 
-    @Override
-    public boolean acquireRequest() {
-      final boolean result = delegate.acquireRequest();
-      if (LOGGER.isDebugEnabled()) {
-        final int available = delegate.availableRequests.available();
-        LOGGER.debug(
-            "acquireRequest: acquired={}, availableRequests={}, span={}",
-            result,
-            available,
-            AgentTracer.activeSpan());
-      }
-      return result;
-    }
+        @Override
+        public boolean acquireRequest() {
+            final boolean result = delegate.acquireRequest();
+            if (LOGGER.isDebugEnabled()) {
+                final int available = delegate.availableRequests.available();
+                LOGGER.debug(
+                        "acquireRequest: acquired={}, availableRequests={}, span={}",
+                        result,
+                        available,
+                        AgentTracer.activeSpan());
+            }
+            return result;
+        }
 
-    @Override
-    public int releaseRequest() {
-      int result = delegate.releaseRequest();
-      if (LOGGER.isDebugEnabled()) {
-        LOGGER.debug(
-            "releaseRequest: availableRequests={}, span={}", result, AgentTracer.activeSpan());
-      }
-      return result;
-    }
+        @Override
+        public int releaseRequest() {
+            int result = delegate.releaseRequest();
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug("releaseRequest: availableRequests={}, span={}", result, AgentTracer.activeSpan());
+            }
+            return result;
+        }
 
-    @Override
-    public boolean hasQuota(final Operation operation, @Nullable final AgentSpan span) {
-      final boolean result = delegate.hasQuota(operation, span);
-      if (LOGGER.isDebugEnabled()) {
-        LOGGER.debug(
-            "hasQuota: operation={}, result={}, availableQuota={}, span={}",
-            operation,
-            result,
-            getAvailableQuote(span),
-            span);
-      }
-      return result;
-    }
+        @Override
+        public boolean hasQuota(final Operation operation, @Nullable final AgentSpan span) {
+            final boolean result = delegate.hasQuota(operation, span);
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug(
+                        "hasQuota: operation={}, result={}, availableQuota={}, span={}",
+                        operation,
+                        result,
+                        getAvailableQuote(span),
+                        span);
+            }
+            return result;
+        }
 
-    @Override
-    public boolean consumeQuota(final Operation operation, @Nullable final AgentSpan span) {
-      return consumeQuota(operation, span, null);
-    }
+        @Override
+        public boolean consumeQuota(final Operation operation, @Nullable final AgentSpan span) {
+            return consumeQuota(operation, span, null);
+        }
 
-    @Override
-    public boolean consumeQuota(
-        final Operation operation,
-        @Nullable final AgentSpan span,
-        @Nullable final VulnerabilityType type) {
-      final boolean result = delegate.consumeQuota(operation, span, type);
-      if (LOGGER.isDebugEnabled()) {
-        LOGGER.debug(
-            "consumeQuota: operation={}, result={}, availableQuota={}, span={}, type={}",
-            operation,
-            result,
-            getAvailableQuote(span),
-            span,
-            type);
-      }
-      return result;
-    }
+        @Override
+        public boolean consumeQuota(
+                final Operation operation, @Nullable final AgentSpan span, @Nullable final VulnerabilityType type) {
+            final boolean result = delegate.consumeQuota(operation, span, type);
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug(
+                        "consumeQuota: operation={}, result={}, availableQuota={}, span={}, type={}",
+                        operation,
+                        result,
+                        getAvailableQuote(span),
+                        span,
+                        type);
+            }
+            return result;
+        }
 
-    @Override
-    public void reset() {
-      delegate.reset();
-      if (LOGGER.isDebugEnabled()) {
-        LOGGER.debug("reset: span={}", AgentTracer.activeSpan());
-      }
-    }
+        @Override
+        public void reset() {
+            delegate.reset();
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug("reset: span={}", AgentTracer.activeSpan());
+            }
+        }
 
-    private int getAvailableQuote(@Nullable final AgentSpan span) {
-      final OverheadContext context = delegate.getContext(span);
-      return context == null ? -1 : context.getAvailableQuota();
+        private int getAvailableQuote(@Nullable final AgentSpan span) {
+            final OverheadContext context = delegate.getContext(span);
+            return context == null ? -1 : context.getAvailableQuota();
+        }
     }
-  }
 
-  class OverheadControllerImpl implements OverheadController {
+    class OverheadControllerImpl implements OverheadController {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OverheadControllerImpl.class);
+        private static final Logger LOGGER = LoggerFactory.getLogger(OverheadControllerImpl.class);
 
-    private static final int RESET_PERIOD_SECONDS = 30;
+        private static final int RESET_PERIOD_SECONDS = 30;
 
-    private final int sampling;
+        private final int sampling;
 
-    /**
-     * Fallback to use the global context instance when no IAST context is present in the active
-     * span
-     */
-    private final boolean useGlobalAsFallback;
+        /**
+         * Fallback to use the global context instance when no IAST context is present in the active
+         * span
+         */
+        private final boolean useGlobalAsFallback;
 
-    final NonBlockingSemaphore availableRequests;
+        final NonBlockingSemaphore availableRequests;
 
-    final AtomicLong cumulativeCounter;
+        final AtomicLong cumulativeCounter;
 
-    private volatile long lastAcquiredTimestamp = Long.MAX_VALUE;
+        private volatile long lastAcquiredTimestamp = Long.MAX_VALUE;
 
-    final OverheadContext globalContext =
-        new OverheadContext(Config.get().getIastVulnerabilitiesPerRequest(), true);
+        final OverheadContext globalContext =
+                new OverheadContext(Config.get().getIastVulnerabilitiesPerRequest(), true);
 
-    public OverheadControllerImpl(
-        final float requestSampling,
-        final int maxConcurrentRequests,
-        final boolean useGlobalAsFallback,
-        final AgentTaskScheduler taskScheduler) {
-      this.sampling = computeSamplingParameter(requestSampling);
-      availableRequests = maxConcurrentRequests(maxConcurrentRequests);
-      cumulativeCounter = new AtomicLong(sampling);
-      this.useGlobalAsFallback = useGlobalAsFallback;
-      if (taskScheduler != null) {
-        taskScheduler.scheduleAtFixedRate(
-            this::reset, 2 * RESET_PERIOD_SECONDS, RESET_PERIOD_SECONDS, TimeUnit.SECONDS);
-      }
-    }
-
-    @Override
-    public boolean acquireRequest() {
-      long prevValue = cumulativeCounter.getAndAdd(sampling);
-      long newValue = prevValue + sampling;
-      if (newValue / 100 == prevValue / 100 + 1) {
-        // Sample request
-        final boolean acquired = availableRequests.acquire();
-        if (acquired) {
-          lastAcquiredTimestamp = System.currentTimeMillis();
+        public OverheadControllerImpl(
+                final float requestSampling,
+                final int maxConcurrentRequests,
+                final boolean useGlobalAsFallback,
+                final AgentTaskScheduler taskScheduler) {
+            this.sampling = computeSamplingParameter(requestSampling);
+            availableRequests = maxConcurrentRequests(maxConcurrentRequests);
+            cumulativeCounter = new AtomicLong(sampling);
+            this.useGlobalAsFallback = useGlobalAsFallback;
+            if (taskScheduler != null) {
+                taskScheduler.scheduleAtFixedRate(
+                        this::reset, 2 * RESET_PERIOD_SECONDS, RESET_PERIOD_SECONDS, TimeUnit.SECONDS);
+            }
         }
-        return acquired;
-      }
-      // Skipped by sampling
-      return false;
-    }
 
-    @Override
-    public int releaseRequest() {
-      return availableRequests.release();
-    }
-
-    @Override
-    public boolean hasQuota(final Operation operation, @Nullable final AgentSpan span) {
-      return operation.hasQuota(getContext(span));
-    }
+        @Override
+        public boolean acquireRequest() {
+            long prevValue = cumulativeCounter.getAndAdd(sampling);
+            long newValue = prevValue + sampling;
+            if (newValue / 100 == prevValue / 100 + 1) {
+                // Sample request
+                final boolean acquired = availableRequests.acquire();
+                if (acquired) {
+                    lastAcquiredTimestamp = System.currentTimeMillis();
+                }
+                return acquired;
+            }
+            // Skipped by sampling
+            return false;
+        }
 
-    @Override
-    public boolean consumeQuota(final Operation operation, @Nullable final AgentSpan span) {
-      return consumeQuota(operation, span, null);
-    }
+        @Override
+        public int releaseRequest() {
+            return availableRequests.release();
+        }
 
-    @Override
-    public boolean consumeQuota(
-        final Operation operation,
-        @Nullable final AgentSpan span,
-        @Nullable final VulnerabilityType type) {
-
-      OverheadContext ctx = getContext(span);
-      if (ctx == null) {
-        return false;
-      }
-      if (ctx.isGlobal()) {
-        return operation.consumeQuota(ctx);
-      }
-      if (operation.hasQuota(ctx)) {
-        String method = null;
-        String path = null;
-        if (span != null) {
-          AgentSpan rootSpan = span.getLocalRootSpan();
-          Object methodTag = rootSpan.getTag(Tags.HTTP_METHOD);
-          method = (methodTag == null) ? "" : methodTag.toString();
-          Object routeTag = rootSpan.getTag(Tags.HTTP_ROUTE);
-          path = (routeTag == null) ? getHttpRouteFromRequestContext(span) : routeTag.toString();
+        @Override
+        public boolean hasQuota(final Operation operation, @Nullable final AgentSpan span) {
+            return operation.hasQuota(getContext(span));
         }
-        if (!maybeSkipVulnerability(ctx, type, method, path)) {
-          return operation.consumeQuota(ctx);
+
+        @Override
+        public boolean consumeQuota(final Operation operation, @Nullable final AgentSpan span) {
+            return consumeQuota(operation, span, null);
         }
-      }
-      return false;
-    }
 
-    /**
-     * Method to be called when a vulnerability of a certain type is detected. Implements the
-     * RFC-1029 algorithm.
-     *
-     * @param ctx the overhead context for the current request
-     * @param type the type of vulnerability detected
-     * @param httpMethod the HTTP method of the request (e.g., GET, POST)
-     * @param httpPath the HTTP path of the request
-     * @return true if the vulnerability should be skipped, false otherwise
-     */
-    private boolean maybeSkipVulnerability(
-        @Nullable final OverheadContext ctx,
-        @Nullable final VulnerabilityType type,
-        @Nullable final String httpMethod,
-        @Nullable final String httpPath) {
-
-      if (ctx == null || type == null || ctx.getRequestMap() == null || ctx.getCopyMap() == null) {
-        return false;
-      }
-
-      int numberOfVulnerabilities = VulnerabilityTypes.STRINGS.length;
-
-      String currentEndpoint = httpMethod + " " + httpPath;
-
-      AtomicIntegerArray requestArray = ctx.getRequestMap().get(currentEndpoint);
-      int[] copyArray;
-
-      if (requestArray == null) {
-        AtomicIntegerArray globalArray =
-            globalMap.computeIfAbsent(
-                currentEndpoint, k -> new AtomicIntegerArray(numberOfVulnerabilities));
-        copyArray = toIntArray(globalArray);
-        ctx.getCopyMap().put(currentEndpoint, copyArray);
-        requestArray =
-            ctx.getRequestMap()
-                .computeIfAbsent(
-                    currentEndpoint, k -> new AtomicIntegerArray(numberOfVulnerabilities));
-      } else {
-        copyArray = ctx.getCopyMap().get(currentEndpoint);
-      }
-
-      int counter = requestArray.getAndIncrement(type.type());
-      int storedCounter = 0;
-      if (copyArray != null) {
-        storedCounter = copyArray[type.type()];
-      }
-
-      return counter < storedCounter;
-    }
+        @Override
+        public boolean consumeQuota(
+                final Operation operation, @Nullable final AgentSpan span, @Nullable final VulnerabilityType type) {
+
+            OverheadContext ctx = getContext(span);
+            if (ctx == null) {
+                return false;
+            }
+            if (ctx.isGlobal()) {
+                return operation.consumeQuota(ctx);
+            }
+            if (operation.hasQuota(ctx)) {
+                String method = null;
+                String path = null;
+                if (span != null) {
+                    AgentSpan rootSpan = span.getLocalRootSpan();
+                    Object methodTag = rootSpan.getTag(Tags.HTTP_METHOD);
+                    method = (methodTag == null) ? "" : methodTag.toString();
+                    Object routeTag = rootSpan.getTag(Tags.HTTP_ROUTE);
+                    path = (routeTag == null) ? getHttpRouteFromRequestContext(span) : routeTag.toString();
+                }
+                if (!maybeSkipVulnerability(ctx, type, method, path)) {
+                    return operation.consumeQuota(ctx);
+                }
+            }
+            return false;
+        }
 
-    private static int[] toIntArray(AtomicIntegerArray atomic) {
-      int length = atomic.length();
-      int[] result = new int[length];
-      for (int i = 0; i < length; i++) {
-        result[i] = atomic.get(i);
-      }
-      return result;
-    }
+        /**
+         * Method to be called when a vulnerability of a certain type is detected. Implements the
+         * RFC-1029 algorithm.
+         *
+         * @param ctx the overhead context for the current request
+         * @param type the type of vulnerability detected
+         * @param httpMethod the HTTP method of the request (e.g., GET, POST)
+         * @param httpPath the HTTP path of the request
+         * @return true if the vulnerability should be skipped, false otherwise
+         */
+        private boolean maybeSkipVulnerability(
+                @Nullable final OverheadContext ctx,
+                @Nullable final VulnerabilityType type,
+                @Nullable final String httpMethod,
+                @Nullable final String httpPath) {
+
+            if (ctx == null || type == null || ctx.getRequestMap() == null || ctx.getCopyMap() == null) {
+                return false;
+            }
+
+            int numberOfVulnerabilities = VulnerabilityTypes.STRINGS.length;
+
+            String currentEndpoint = httpMethod + " " + httpPath;
+
+            AtomicIntegerArray requestArray = ctx.getRequestMap().get(currentEndpoint);
+            int[] copyArray;
+
+            if (requestArray == null) {
+                AtomicIntegerArray globalArray = globalMap.computeIfAbsent(
+                        currentEndpoint, k -> new AtomicIntegerArray(numberOfVulnerabilities));
+                copyArray = toIntArray(globalArray);
+                ctx.getCopyMap().put(currentEndpoint, copyArray);
+                requestArray = ctx.getRequestMap()
+                        .computeIfAbsent(currentEndpoint, k -> new AtomicIntegerArray(numberOfVulnerabilities));
+            } else {
+                copyArray = ctx.getCopyMap().get(currentEndpoint);
+            }
+
+            int counter = requestArray.getAndIncrement(type.type());
+            int storedCounter = 0;
+            if (copyArray != null) {
+                storedCounter = copyArray[type.type()];
+            }
+
+            return counter < storedCounter;
+        }
 
-    @Nullable
-    public OverheadContext getContext(@Nullable final AgentSpan span) {
-      final RequestContext requestContext = span != null ? span.getRequestContext() : null;
-      if (requestContext != null) {
-        IastRequestContext iastRequestContext = requestContext.getData(RequestContextSlot.IAST);
-        if (iastRequestContext != null) {
-          return iastRequestContext.getOverheadContext();
+        private static int[] toIntArray(AtomicIntegerArray atomic) {
+            int length = atomic.length();
+            int[] result = new int[length];
+            for (int i = 0; i < length; i++) {
+                result[i] = atomic.get(i);
+            }
+            return result;
         }
-        if (!useGlobalAsFallback) {
-          return null;
+
+        @Nullable
+        public OverheadContext getContext(@Nullable final AgentSpan span) {
+            final RequestContext requestContext = span != null ? span.getRequestContext() : null;
+            if (requestContext != null) {
+                IastRequestContext iastRequestContext = requestContext.getData(RequestContextSlot.IAST);
+                if (iastRequestContext != null) {
+                    return iastRequestContext.getOverheadContext();
+                }
+                if (!useGlobalAsFallback) {
+                    return null;
+                }
+            }
+            return globalContext;
         }
-      }
-      return globalContext;
-    }
 
-    @Nullable
-    public String getHttpRouteFromRequestContext(@Nullable final AgentSpan span) {
-      String httpRoute = null;
-      final RequestContext requestContext = span != null ? span.getRequestContext() : null;
-      if (requestContext != null) {
-        IastRequestContext iastRequestContext = requestContext.getData(RequestContextSlot.IAST);
-        if (iastRequestContext != null) {
-          httpRoute = iastRequestContext.getRoute();
+        @Nullable
+        public String getHttpRouteFromRequestContext(@Nullable final AgentSpan span) {
+            String httpRoute = null;
+            final RequestContext requestContext = span != null ? span.getRequestContext() : null;
+            if (requestContext != null) {
+                IastRequestContext iastRequestContext = requestContext.getData(RequestContextSlot.IAST);
+                if (iastRequestContext != null) {
+                    httpRoute = iastRequestContext.getRoute();
+                }
+            }
+            return httpRoute == null ? "" : httpRoute;
         }
-      }
-      return httpRoute == null ? "" : httpRoute;
-    }
 
-    static int computeSamplingParameter(final float pct) {
-      if (pct >= 100) {
-        return 100;
-      }
-      if (pct <= 0) {
-        // We don't support disabling IAST by setting it, so we set it to 100%.
-        // TODO: We probably want a warning here.
-        return 100;
-      }
-      return (int) pct;
-    }
+        static int computeSamplingParameter(final float pct) {
+            if (pct >= 100) {
+                return 100;
+            }
+            if (pct <= 0) {
+                // We don't support disabling IAST by setting it, so we set it to 100%.
+                // TODO: We probably want a warning here.
+                return 100;
+            }
+            return (int) pct;
+        }
 
-    static NonBlockingSemaphore maxConcurrentRequests(final int max) {
-      return max == UNLIMITED
-          ? NonBlockingSemaphore.unlimited()
-          : NonBlockingSemaphore.withPermitCount(max);
-    }
+        static NonBlockingSemaphore maxConcurrentRequests(final int max) {
+            return max == UNLIMITED ? NonBlockingSemaphore.unlimited() : NonBlockingSemaphore.withPermitCount(max);
+        }
 
-    @Override
-    public void reset() {
-      globalContext.reset();
-      if (lastAcquiredTimestamp != Long.MAX_VALUE
-          && System.currentTimeMillis() - lastAcquiredTimestamp > 1000 * 60 * 60) {
-        // If the last time a request was acquired is longer than 1h, we check the number of
-        // available requests. If it
-        // is zero, we might have lost request end events, leading to IAST not being able to acquire
-        // new requests.
-        // We report it to telemetry for further investigation.
-        if (availableRequests.available() == 0) {
-          LOGGER.debug(
-              LogCollector.SEND_TELEMETRY,
-              "IAST cannot acquire new requests, end of request events might be missing.");
-          // Once starved, do not report this again, unless this is recovered and then starved
-          // again.
-          lastAcquiredTimestamp = Long.MAX_VALUE;
+        @Override
+        public void reset() {
+            globalContext.reset();
+            if (lastAcquiredTimestamp != Long.MAX_VALUE
+                    && System.currentTimeMillis() - lastAcquiredTimestamp > 1000 * 60 * 60) {
+                // If the last time a request was acquired is longer than 1h, we check the number of
+                // available requests. If it
+                // is zero, we might have lost request end events, leading to IAST not being able to acquire
+                // new requests.
+                // We report it to telemetry for further investigation.
+                if (availableRequests.available() == 0) {
+                    LOGGER.debug(
+                            LogCollector.SEND_TELEMETRY,
+                            "IAST cannot acquire new requests, end of request events might be missing.");
+                    // Once starved, do not report this again, unless this is recovered and then starved
+                    // again.
+                    lastAcquiredTimestamp = Long.MAX_VALUE;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/CodecModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/CodecModuleImpl.java
index 2bbe779babb..c2e257c98f0 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/CodecModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/CodecModuleImpl.java
@@ -16,112 +16,112 @@
 
 public class CodecModuleImpl implements CodecModule {
 
-  private final PropagationModule propagationModule;
+    private final PropagationModule propagationModule;
 
-  public CodecModuleImpl() {
-    this(new PropagationModuleImpl());
-  }
-
-  CodecModuleImpl(final PropagationModule propagationModule) {
-    this.propagationModule = propagationModule;
-  }
-
-  @Override
-  public void onUrlDecode(
-      @Nonnull final String value, @Nullable final String encoding, @Nonnull final String result) {
-    propagationModule.taintStringIfTainted(result, value);
-  }
+    public CodecModuleImpl() {
+        this(new PropagationModuleImpl());
+    }
 
-  @Override
-  public void onUrlEncode(
-      @Nonnull final String value, @Nullable final String encoding, @Nonnull final String result) {
-    // the new string should be safe to be used in
-    propagationModule.taintStringIfTainted(result, value, false, XSS_MARK);
-  }
+    CodecModuleImpl(final PropagationModule propagationModule) {
+        this.propagationModule = propagationModule;
+    }
 
-  @Override
-  public void onStringFromBytes(
-      @Nonnull final byte[] value,
-      int offset,
-      int length,
-      @Nullable final String charset,
-      @Nonnull final String result) {
-    // create a new range shifted to the result string coordinates
-    propagationModule.taintStringIfRangeTainted(result, value, offset, length, false, NOT_MARKED);
-  }
+    @Override
+    public void onUrlDecode(
+            @Nonnull final String value, @Nullable final String encoding, @Nonnull final String result) {
+        propagationModule.taintStringIfTainted(result, value);
+    }
 
-  @Override
-  public void onStringGetBytes(
-      @Nonnull final String value, @Nullable final String charset, @Nonnull final byte[] result) {
-    propagationModule.taintObjectIfTainted(result, value);
-  }
+    @Override
+    public void onUrlEncode(
+            @Nonnull final String value, @Nullable final String encoding, @Nonnull final String result) {
+        // the new string should be safe to be used in
+        propagationModule.taintStringIfTainted(result, value, false, XSS_MARK);
+    }
 
-  @Override
-  public void onBase64Encode(@Nullable byte[] value, @Nullable byte[] result) {
-    propagationModule.taintObjectIfTainted(result, value);
-  }
+    @Override
+    public void onStringFromBytes(
+            @Nonnull final byte[] value,
+            int offset,
+            int length,
+            @Nullable final String charset,
+            @Nonnull final String result) {
+        // create a new range shifted to the result string coordinates
+        propagationModule.taintStringIfRangeTainted(result, value, offset, length, false, NOT_MARKED);
+    }
 
-  @Override
-  public void onBase64Decode(@Nullable byte[] value, @Nullable byte[] result) {
-    propagationModule.taintObjectIfTainted(result, value);
-  }
+    @Override
+    public void onStringGetBytes(
+            @Nonnull final String value, @Nullable final String charset, @Nonnull final byte[] result) {
+        propagationModule.taintObjectIfTainted(result, value);
+    }
 
-  @Override
-  public void onUriCreate(@Nonnull final URI result, final Object... args) {
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
+    @Override
+    public void onBase64Encode(@Nullable byte[] value, @Nullable byte[] result) {
+        propagationModule.taintObjectIfTainted(result, value);
     }
-    taintUrlIfAnyTainted(ctx.getTaintedObjects(), result, args);
-  }
 
-  @Override
-  public void onUrlCreate(@Nonnull final URL result, final Object... args) {
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
+    @Override
+    public void onBase64Decode(@Nullable byte[] value, @Nullable byte[] result) {
+        propagationModule.taintObjectIfTainted(result, value);
     }
-    final TaintedObjects to = ctx.getTaintedObjects();
-    if (args.length > 0 && args[0] instanceof URL) {
-      final TaintedObject tainted = to.get(args[0]);
-      if (tainted != null) {
-        final URL context = (URL) args[0];
-        // TODO improve matching when using a URL context
-        // Checking if the toString representation of the context is present in the final URL is a
-        // bit fragile, the spec might override some of it's parts (e.g. the final file). We can get
-        // away with this as having a context with tainted values is probably pretty rare.
-        if (!context.getProtocol().equals(result.getProtocol())
-            || !context.getHost().equals(result.getHost())) {
-          args[0] = null;
+
+    @Override
+    public void onUriCreate(@Nonnull final URI result, final Object... args) {
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
         }
-      }
+        taintUrlIfAnyTainted(ctx.getTaintedObjects(), result, args);
     }
-    taintUrlIfAnyTainted(to, result, args);
-  }
 
-  private void taintUrlIfAnyTainted(
-      @Nonnull final TaintedObjects to, @Nonnull final Object url, @Nonnull final Object... args) {
-    final String toString = url.toString();
-    final RangeBuilder builder = new RangeBuilder();
-    boolean hasTainted = false;
-    for (final Object arg : args) {
-      final TaintedObject tainted = to.get(arg);
-      if (tainted != null) {
-        hasTainted = true;
-        final int offset = toString.indexOf(arg.toString());
-        if (offset >= 0) {
-          builder.add(tainted.getRanges(), offset);
+    @Override
+    public void onUrlCreate(@Nonnull final URL result, final Object... args) {
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
         }
-      }
-    }
-    if (!hasTainted) {
-      return;
+        final TaintedObjects to = ctx.getTaintedObjects();
+        if (args.length > 0 && args[0] instanceof URL) {
+            final TaintedObject tainted = to.get(args[0]);
+            if (tainted != null) {
+                final URL context = (URL) args[0];
+                // TODO improve matching when using a URL context
+                // Checking if the toString representation of the context is present in the final URL is a
+                // bit fragile, the spec might override some of it's parts (e.g. the final file). We can get
+                // away with this as having a context with tainted values is probably pretty rare.
+                if (!context.getProtocol().equals(result.getProtocol())
+                        || !context.getHost().equals(result.getHost())) {
+                    args[0] = null;
+                }
+            }
+        }
+        taintUrlIfAnyTainted(to, result, args);
     }
-    if (builder.isEmpty()) {
-      // no mappings of tainted values in the URL, resort to fully tainting it
-      propagationModule.taintObjectIfAnyTainted(url, args);
-    } else {
-      to.taint(url, builder.toArray());
+
+    private void taintUrlIfAnyTainted(
+            @Nonnull final TaintedObjects to, @Nonnull final Object url, @Nonnull final Object... args) {
+        final String toString = url.toString();
+        final RangeBuilder builder = new RangeBuilder();
+        boolean hasTainted = false;
+        for (final Object arg : args) {
+            final TaintedObject tainted = to.get(arg);
+            if (tainted != null) {
+                hasTainted = true;
+                final int offset = toString.indexOf(arg.toString());
+                if (offset >= 0) {
+                    builder.add(tainted.getRanges(), offset);
+                }
+            }
+        }
+        if (!hasTainted) {
+            return;
+        }
+        if (builder.isEmpty()) {
+            // no mappings of tainted values in the URL, resort to fully tainting it
+            propagationModule.taintObjectIfAnyTainted(url, args);
+        } else {
+            to.taint(url, builder.toArray());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/PropagationModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/PropagationModuleImpl.java
index 1503fd12909..f58f5b0d89f 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/PropagationModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/PropagationModuleImpl.java
@@ -24,908 +24,871 @@
 @SuppressWarnings("DuplicatedCode")
 public class PropagationModuleImpl implements PropagationModule {
 
-  /** Prevent copy of values bigger than this threshold */
-  private static final int MAX_VALUE_LENGTH = Config.get().getIastTruncationMaxValueLength();
-
-  @Override
-  public void taintObject(@Nullable Object target, byte origin) {
-    taintObject(target, origin, null);
-  }
-
-  @Override
-  public void taintObject(@Nullable IastContext ctx, @Nullable Object target, byte origin) {
-    taintObject(ctx, target, origin, null);
-  }
-
-  @Override
-  public void taintString(@Nullable String target, byte origin) {
-    taintString(target, origin, null);
-  }
-
-  @Override
-  public void taintString(@Nullable IastContext ctx, @Nullable String target, byte origin) {
-    taintString(ctx, target, origin, null);
-  }
-
-  @Override
-  public void taintObject(@Nullable Object target, byte origin, @Nullable CharSequence name) {
-    taintObject(target, origin, name, target);
-  }
-
-  @Override
-  public void taintObject(
-      @Nullable IastContext ctx,
-      @Nullable Object target,
-      byte origin,
-      @Nullable CharSequence name) {
-    taintObject(ctx, target, origin, name, target);
-  }
-
-  @Override
-  public void taintString(@Nullable String target, byte origin, @Nullable CharSequence name) {
-    taintString(target, origin, name, target);
-  }
-
-  @Override
-  public void taintString(
-      @Nullable IastContext ctx,
-      @Nullable String target,
-      byte origin,
-      @Nullable CharSequence name) {
-    taintString(ctx, target, origin, name, target);
-  }
-
-  @Override
-  public void taintObjectRange(
-      @Nullable final Object target, final byte origin, final int start, final int length) {
-    if (target == null || length == 0) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    taintObjectRange(ctx, target, origin, start, length);
-  }
-
-  @Override
-  public void taintObjectRange(
-      @Nullable final IastContext ctx,
-      @Nullable final Object target,
-      final byte origin,
-      final int start,
-      final int length) {
-    if (ctx == null || target == null || length == 0) {
-      return;
-    }
-    final TaintedObjects to = ctx.getTaintedObjects();
-    final Range range =
-        new Range(start, length, newSource(target, origin, null, target), NOT_MARKED);
-    internalTaint(to, target, new Range[] {range}, NOT_MARKED);
-  }
-
-  @Override
-  public void taintStringRange(
-      @Nullable final String target, final byte origin, final int start, final int length) {
-    if (target == null || length == 0) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    taintStringRange(ctx, target, origin, start, length);
-  }
-
-  @Override
-  public void taintStringRange(
-      @Nullable final IastContext ctx,
-      @Nullable final String target,
-      final byte origin,
-      final int start,
-      final int length) {
-    if (ctx == null || target == null || length == 0) {
-      return;
-    }
-    final TaintedObjects to = ctx.getTaintedObjects();
-    final Range range =
-        new Range(start, length, newSource(target, origin, null, target), NOT_MARKED);
-    internalTaint(to, target, new Range[] {range}, NOT_MARKED);
-  }
-
-  @Override
-  public void taintObject(
-      @Nullable final Object target,
-      final byte origin,
-      @Nullable final CharSequence name,
-      @Nullable final Object value) {
-    if (target == null) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    taintObject(ctx, target, origin, name, value);
-  }
-
-  @Override
-  public void taintObject(
-      @Nullable final IastContext ctx,
-      @Nullable final Object target,
-      final byte origin,
-      @Nullable final CharSequence name,
-      @Nullable final Object value) {
-    if (ctx == null || target == null) {
-      return;
-    }
-    final TaintedObjects to = ctx.getTaintedObjects();
-    internalTaint(to, target, newSource(target, origin, name, value), NOT_MARKED);
-  }
-
-  @Override
-  public void taintString(
-      @Nullable final String target,
-      final byte origin,
-      @Nullable final CharSequence name,
-      @Nullable final CharSequence value) {
-    if (target == null) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    taintString(ctx, target, origin, name, value);
-  }
-
-  @Override
-  public void taintString(
-      @Nullable final IastContext ctx,
-      @Nullable final String target,
-      final byte origin,
-      @Nullable final CharSequence name,
-      @Nullable final CharSequence value) {
-    if (ctx == null || target == null) {
-      return;
-    }
-    final TaintedObjects to = ctx.getTaintedObjects();
-    internalTaint(to, target, newSource(target, origin, name, value), NOT_MARKED);
-  }
-
-  @Override
-  public void taintObjectIfTainted(@Nullable Object target, @Nullable Object input) {
-    taintObjectIfTainted(target, input, false, NOT_MARKED);
-  }
-
-  @Override
-  public void taintObjectIfTainted(
-      @Nullable IastContext ctx, @Nullable Object target, @Nullable Object input) {
-    taintObjectIfTainted(ctx, target, input, false, NOT_MARKED);
-  }
-
-  @Override
-  public void taintStringIfTainted(@Nullable String target, @Nullable Object input) {
-    taintStringIfTainted(target, input, false, NOT_MARKED);
-  }
-
-  @Override
-  public void taintStringIfTainted(
-      @Nullable IastContext ctx, @Nullable String target, @Nullable Object input) {
-    taintStringIfTainted(ctx, target, input, false, NOT_MARKED);
-  }
-
-  @Override
-  public void taintObjectIfTainted(
-      @Nullable final Object target, @Nullable final Object input, boolean keepRanges, int mark) {
-    if (target == null || input == null) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    taintObjectIfTainted(ctx, target, input, keepRanges, mark);
-  }
-
-  @Override
-  public void taintObjectIfTainted(
-      @Nullable final IastContext ctx,
-      @Nullable final Object target,
-      @Nullable final Object input,
-      boolean keepRanges,
-      int mark) {
-    if (ctx == null || target == null || input == null) {
-      return;
-    }
-    final TaintedObjects to = ctx.getTaintedObjects();
-    if (keepRanges) {
-      internalTaint(to, target, getRanges(to, input), mark);
-    } else {
-      internalTaint(to, target, highestPrioritySource(to, input), mark);
-    }
-  }
-
-  @Override
-  public void taintStringIfTainted(
-      @Nullable final String target, @Nullable final Object input, boolean keepRanges, int mark) {
-    if (target == null || input == null) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    taintStringIfTainted(ctx, target, input, keepRanges, mark);
-  }
-
-  @Override
-  public void taintStringIfTainted(
-      @Nullable final IastContext ctx,
-      @Nullable final String target,
-      @Nullable final Object input,
-      boolean keepRanges,
-      int mark) {
-    if (ctx == null || target == null || input == null) {
-      return;
-    }
-    final TaintedObjects to = ctx.getTaintedObjects();
-    if (keepRanges) {
-      internalTaint(to, target, getRanges(to, input), mark);
-    } else {
-      internalTaint(to, target, highestPrioritySource(to, input), mark);
-    }
-  }
-
-  @Override
-  public void taintObjectIfRangeTainted(
-      @Nullable final Object target,
-      @Nullable final Object input,
-      final int start,
-      final int length,
-      boolean keepRanges,
-      int mark) {
-    if (target == null || input == null || length == 0) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    taintObjectIfRangeTainted(ctx, target, input, start, length, keepRanges, mark);
-  }
-
-  @Override
-  public void taintObjectIfRangeTainted(
-      @Nullable final IastContext ctx,
-      @Nullable final Object target,
-      @Nullable final Object input,
-      final int start,
-      final int length,
-      boolean keepRanges,
-      int mark) {
-    if (ctx == null || target == null || input == null || length == 0) {
-      return;
-    }
-    final TaintedObjects to = ctx.getTaintedObjects();
-    final Range[] ranges = getRanges(to, input);
-    if (ranges == null || ranges.length == 0) {
-      return;
-    }
-    final Range[] intersection = Ranges.intersection(Ranged.build(start, length), ranges);
-    if (intersection == null || intersection.length == 0) {
-      return;
-    }
-    if (keepRanges) {
-      internalTaint(to, target, intersection, mark);
-    } else {
-      final Range range = highestPriorityRange(intersection);
-      internalTaint(to, target, range.getSource(), mark);
-    }
-  }
-
-  @Override
-  public void taintStringIfRangeTainted(
-      @Nullable final String target,
-      @Nullable final Object input,
-      final int start,
-      final int length,
-      boolean keepRanges,
-      int mark) {
-    if (target == null || input == null || length == 0) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    taintStringIfRangeTainted(ctx, target, input, start, length, keepRanges, mark);
-  }
-
-  @Override
-  public void taintStringIfRangeTainted(
-      @Nullable final IastContext ctx,
-      @Nullable final String target,
-      @Nullable final Object input,
-      final int start,
-      final int length,
-      boolean keepRanges,
-      int mark) {
-    if (ctx == null || target == null || input == null || length == 0) {
-      return;
-    }
-    final TaintedObjects to = ctx.getTaintedObjects();
-    final Range[] ranges = getRanges(to, input);
-    if (ranges == null || ranges.length == 0) {
-      return;
-    }
-    final Range[] intersection = Ranges.intersection(Ranged.build(start, length), ranges);
-    if (intersection == null || intersection.length == 0) {
-      return;
-    }
-    if (keepRanges) {
-      internalTaint(to, target, intersection, mark);
-    } else {
-      final Range range = highestPriorityRange(intersection);
-      internalTaint(to, target, range.getSource(), mark);
-    }
-  }
-
-  @Override
-  public void taintObjectIfTainted(@Nullable Object target, @Nullable Object input, byte origin) {
-    taintObjectIfTainted(target, input, origin, null, target);
-  }
-
-  @Override
-  public void taintObjectIfTainted(
-      @Nullable IastContext ctx, @Nullable Object target, @Nullable Object input, byte origin) {
-    taintObjectIfTainted(ctx, target, input, origin, null, target);
-  }
-
-  @Override
-  public void taintStringIfTainted(@Nullable String target, @Nullable Object input, byte origin) {
-    taintStringIfTainted(target, input, origin, null, target);
-  }
-
-  @Override
-  public void taintStringIfTainted(
-      @Nullable IastContext ctx, @Nullable String target, @Nullable Object input, byte origin) {
-    taintStringIfTainted(ctx, target, input, origin, null, target);
-  }
-
-  @Override
-  public void taintObjectIfTainted(
-      @Nullable Object target, @Nullable Object input, byte origin, @Nullable CharSequence name) {
-    taintObjectIfTainted(target, input, origin, name, target);
-  }
-
-  @Override
-  public void taintObjectIfTainted(
-      @Nullable IastContext ctx,
-      @Nullable Object target,
-      @Nullable Object input,
-      byte origin,
-      @Nullable CharSequence name) {
-    taintObjectIfTainted(ctx, target, input, origin, name, target);
-  }
-
-  @Override
-  public void taintStringIfTainted(
-      @Nullable String target, @Nullable Object input, byte origin, @Nullable CharSequence name) {
-    taintStringIfTainted(target, input, origin, name, target);
-  }
-
-  @Override
-  public void taintStringIfTainted(
-      @Nullable IastContext ctx,
-      @Nullable String target,
-      @Nullable Object input,
-      byte origin,
-      @Nullable CharSequence name) {
-    taintStringIfTainted(ctx, target, input, origin, name, target);
-  }
-
-  @Override
-  public void taintObjectIfTainted(
-      @Nullable final Object target,
-      @Nullable final Object input,
-      final byte origin,
-      @Nullable final CharSequence name,
-      @Nullable final Object value) {
-    if (target == null || input == null) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    taintObjectIfTainted(ctx, target, input, origin, name, value);
-  }
-
-  @Override
-  public void taintObjectIfTainted(
-      @Nullable final IastContext ctx,
-      @Nullable final Object target,
-      @Nullable final Object input,
-      final byte origin,
-      @Nullable final CharSequence name,
-      @Nullable final Object value) {
-    if (ctx == null || target == null || input == null) {
-      return;
-    }
-    if (isTainted(ctx, target)) {
-      final TaintedObjects to = ctx.getTaintedObjects();
-      internalTaint(to, target, newSource(target, origin, name, value), NOT_MARKED);
-    }
-  }
-
-  @Override
-  public void taintStringIfTainted(
-      @Nullable final String target,
-      @Nullable final Object input,
-      final byte origin,
-      @Nullable final CharSequence name,
-      @Nullable final Object value) {
-    if (target == null || input == null) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    taintStringIfTainted(ctx, target, input, origin, name, value);
-  }
-
-  @Override
-  public void taintStringIfTainted(
-      @Nullable final IastContext ctx,
-      @Nullable final String target,
-      @Nullable final Object input,
-      final byte origin,
-      @Nullable final CharSequence name,
-      @Nullable final Object value) {
-    if (ctx == null || target == null || input == null) {
-      return;
-    }
-    if (isTainted(ctx, input)) {
-      final TaintedObjects to = ctx.getTaintedObjects();
-      internalTaint(to, target, newSource(target, origin, name, value), NOT_MARKED);
-    }
-  }
-
-  @Override
-  public void taintObjectIfAnyTainted(@Nullable Object target, @Nullable Object[] inputs) {
-    taintObjectIfAnyTainted(target, inputs, false, NOT_MARKED);
-  }
-
-  @Override
-  public void taintObjectIfAnyTainted(
-      @Nullable IastContext ctx, @Nullable Object target, @Nullable Object[] inputs) {
-    taintObjectIfAnyTainted(ctx, target, inputs, false, NOT_MARKED);
-  }
-
-  @Override
-  public void taintStringIfAnyTainted(@Nullable String target, @Nullable Object[] inputs) {
-    taintStringIfAnyTainted(target, inputs, false, NOT_MARKED);
-  }
-
-  @Override
-  public void taintStringIfAnyTainted(
-      @Nullable IastContext ctx, @Nullable String target, @Nullable Object[] inputs) {
-    taintStringIfAnyTainted(ctx, target, inputs, false, NOT_MARKED);
-  }
-
-  @Override
-  public void taintObjectIfAnyTainted(
-      @Nullable final Object target,
-      @Nullable final Object[] inputs,
-      final boolean keepRanges,
-      final int mark) {
-    if (target == null || inputs == null || inputs.length == 0) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    taintObjectIfAnyTainted(ctx, target, inputs, keepRanges, mark);
-  }
-
-  @Override
-  public void taintObjectIfAnyTainted(
-      @Nullable final IastContext ctx,
-      @Nullable final Object target,
-      @Nullable final Object[] inputs,
-      final boolean keepRanges,
-      final int mark) {
-    if (ctx == null || target == null || inputs == null || inputs.length == 0) {
-      return;
-    }
-    final TaintedObjects to = ctx.getTaintedObjects();
-    if (keepRanges) {
-      final Range[] ranges = getRangesInArray(to, inputs);
-      if (ranges != null) {
-        internalTaint(to, target, ranges, mark);
-      }
-    } else {
-      final Source source = highestPrioritySourceInArray(to, inputs);
-      if (source != null) {
-        internalTaint(to, target, source, mark);
-      }
-    }
-  }
-
-  @Override
-  public void taintStringIfAnyTainted(
-      @Nullable final String target,
-      @Nullable final Object[] inputs,
-      final boolean keepRanges,
-      final int mark) {
-    if (target == null || inputs == null || inputs.length == 0) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    taintStringIfAnyTainted(ctx, target, inputs, keepRanges, mark);
-  }
-
-  @Override
-  public void taintStringIfAnyTainted(
-      @Nullable final IastContext ctx,
-      @Nullable final String target,
-      @Nullable final Object[] inputs,
-      final boolean keepRanges,
-      final int mark) {
-    if (ctx == null || target == null || inputs == null || inputs.length == 0) {
-      return;
-    }
-    final TaintedObjects to = ctx.getTaintedObjects();
-    if (keepRanges) {
-      final Range[] ranges = getRangesInArray(to, inputs);
-      if (ranges != null) {
-        internalTaint(to, target, ranges, mark);
-      }
-    } else {
-      final Source source = highestPrioritySourceInArray(to, inputs);
-      if (source != null) {
-        internalTaint(to, target, source, mark);
-      }
-    }
-  }
-
-  @Override
-  public int taintObjectDeeply(
-      @Nullable final Object target, final byte origin, final Predicate<Class<?>> classFilter) {
-    if (target == null) {
-      return 0;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return 0;
-    }
-    return taintObjectDeeply(ctx, target, origin, classFilter);
-  }
-
-  @Override
-  public int taintObjectDeeply(
-      @Nullable final IastContext ctx,
-      @Nullable final Object target,
-      final byte origin,
-      final Predicate<Class<?>> classFilter) {
-    if (ctx == null || target == null) {
-      return 0;
-    }
-    final TaintedObjects to = ctx.getTaintedObjects();
-    if (target instanceof CharSequence) {
-      internalTaint(to, target, newSource(target, origin, null, target), NOT_MARKED);
-      return 1;
-    } else {
-      final TaintingVisitor visitor = new TaintingVisitor(to, origin);
-      ObjectVisitor.visit(target, visitor, classFilter);
-      return visitor.getCount();
-    }
-  }
-
-  @Nullable
-  @Override
-  public Taintable.Source findSource(@Nullable final Object target) {
-    if (target == null) {
-      return null;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return null;
-    }
-    return findSource(ctx, target);
-  }
-
-  @Nullable
-  @Override
-  public Taintable.Source findSource(
-      @Nullable final IastContext ctx, @Nullable final Object target) {
-    if (ctx == null || target == null) {
-      return null;
-    }
-    final TaintedObjects to = ctx.getTaintedObjects();
-    return highestPrioritySource(to, target);
-  }
-
-  @Override
-  public void markIfTainted(@Nullable Object target, int mark) {
-    if (target == null) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    TaintedObject taintedObject = taintedObjects.get(target);
-    if (taintedObject != null) {
-      taintedObject.setRanges(markRanges(taintedObject.getRanges(), mark));
-    }
-  }
-
-  @Override
-  public boolean isTainted(@Nullable final Object target) {
-    if (target == null) {
-      return false;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return false;
-    }
-    return isTainted(ctx, target);
-  }
-
-  @Override
-  public boolean isTainted(@Nullable final IastContext ctx, @Nullable final Object target) {
-    return ctx != null && target != null && findSource(ctx, target) != null;
-  }
-
-  /**
-   * Ensures that the reference is not kept due to a strong reference via the name or value
-   * properties
-   */
-  private static Source newSource(
-      @Nonnull final Object target,
-      final byte origin,
-      @Nullable final CharSequence name,
-      @Nullable final Object value) {
-    final Object sourceValue = sourceReference(target, value, true);
-    final Object sourceName = name == value ? sourceValue : sourceReference(target, name, false);
-    return new Source(origin, sourceName, sourceValue);
-  }
-
-  /**
-   * Ensures that the reference is not kept due to a strong reference via the name or value
-   * properties
-   */
-  private static Source newSource(
-      @Nonnull final String tainted,
-      final byte origin,
-      @Nullable final CharSequence name,
-      @Nullable final CharSequence value) {
-    final Object sourceValue = sourceReference(tainted, value, true);
-    final Object sourceName = name == value ? sourceValue : sourceReference(tainted, name, false);
-    return new Source(origin, sourceName, sourceValue);
-  }
-
-  /**
-   * This method will prevent the code from creating a strong reference to what should remain weakly
-   * reachable
-   */
-  @Nullable
-  private static Object sourceReference(
-      @Nonnull final Object tainted, @Nullable final Object target, final boolean value) {
-    if (target instanceof String) {
-      // weak reference if it's a value or matches the tainted value
-      return value || tainted == target ? new WeakReference<>(target) : target;
-    } else if (target instanceof CharSequence) {
-      // char-sequences can mutate so we have to keep a snapshot
-      CharSequence charSequence = (CharSequence) target;
-      if (charSequence.length() > MAX_VALUE_LENGTH) {
-        charSequence = charSequence.subSequence(0, MAX_VALUE_LENGTH);
-      }
-      return charSequence.toString();
-    }
-    // ignore non char-sequence instances (e.g. byte buffers)
-    return value ? PROPAGATION_PLACEHOLDER : null;
-  }
-
-  @Nullable
-  private static Range[] getRangesInArray(
-      final @Nonnull TaintedObjects to, final @Nonnull Object[] objects) {
-    for (final Object object : objects) {
-      final Range[] ranges = getRanges(to, object);
-      if (ranges != null) {
-        return ranges;
-      }
-    }
-    return null;
-  }
-
-  @Nullable
-  private static Range[] getRanges(final @Nonnull TaintedObjects to, final @Nonnull Object object) {
-    if (object instanceof Taintable) {
-      final Source source = highestPrioritySource(to, object);
-      if (source == null) {
-        return null;
-      } else {
-        return new Range[] {new Range(0, Integer.MAX_VALUE, source, NOT_MARKED)};
-      }
-    }
-    final TaintedObject tainted = to.get(object);
-    return tainted == null ? null : tainted.getRanges();
-  }
-
-  @Nullable
-  private static Source highestPrioritySourceInArray(
-      final @Nonnull TaintedObjects to, final @Nonnull Object[] objects) {
-    for (final Object object : objects) {
-      final Source source = highestPrioritySource(to, object);
-      if (source != null) {
-        return source;
-      }
-    }
-    return null;
-  }
-
-  @Nullable
-  private static Source highestPrioritySource(
-      final @Nonnull TaintedObjects to, final @Nonnull Object object) {
-    if (object instanceof Taintable) {
-      return (Source) ((Taintable) object).$$DD$getSource();
-    } else {
-      final Range[] ranges = getRanges(to, object);
-      return ranges != null && ranges.length > 0 ? highestPriorityRange(ranges).getSource() : null;
-    }
-  }
-
-  private static void internalTaint(
-      @Nonnull final TaintedObjects to,
-      @Nonnull final Object value,
-      @Nullable Source source,
-      int mark) {
-    if (source == null) {
-      return;
-    }
-    if (value instanceof Taintable) {
-      ((Taintable) value).$$DD$setSource(source);
-    } else {
-      if (value instanceof CharSequence) {
-        source = attachSourceValue(source, (CharSequence) value);
-        to.taint(value, Ranges.forCharSequence((CharSequence) value, source, mark));
-      } else {
-        to.taint(value, Ranges.forObject(source, mark));
-      }
-    }
-  }
-
-  private static void internalTaint(
-      @Nonnull final TaintedObjects to,
-      @Nonnull final String value,
-      @Nullable Source source,
-      int mark) {
-    if (source == null) {
-      return;
-    }
-    source = attachSourceValue(source, value);
-    to.taint(value, Ranges.forCharSequence(value, source, mark));
-  }
-
-  private static void internalTaint(
-      @Nonnull final TaintedObjects to,
-      @Nonnull final Object value,
-      @Nullable Range[] ranges,
-      final int mark) {
-    if (ranges == null || ranges.length == 0) {
-      return;
-    }
-    if (value instanceof Taintable) {
-      final Taintable taintable = (Taintable) value;
-      if (!taintable.$DD$isTainted()) {
-        taintable.$$DD$setSource(ranges[0].getSource());
-      }
-    } else {
-      if (value instanceof CharSequence) {
-        ranges = attachSourceValue(ranges, (CharSequence) value);
-      }
-      ranges = markRanges(ranges, mark);
-      final TaintedObject tainted = to.get(value);
-      if (tainted != null) {
-        // append ranges
-        final Range[] newRanges = Ranges.mergeRangesSorted(tainted.getRanges(), ranges);
-        tainted.setRanges(newRanges);
-      } else {
-        // taint new value
-        to.taint(value, ranges);
-      }
-    }
-  }
-
-  private static void internalTaint(
-      @Nonnull final TaintedObjects to,
-      @Nonnull final String value,
-      @Nullable Range[] ranges,
-      final int mark) {
-    if (ranges == null || ranges.length == 0) {
-      return;
-    }
-    ranges = attachSourceValue(ranges, value);
-    ranges = markRanges(ranges, mark);
-    final TaintedObject tainted = to.get(value);
-    if (tainted != null) {
-      // append ranges
-      final Range[] newRanges = Ranges.mergeRangesSorted(tainted.getRanges(), ranges);
-      tainted.setRanges(newRanges);
-    } else {
-      // taint new value
-      to.taint(value, ranges);
-    }
-  }
-
-  @Nonnull
-  private static Range[] markRanges(@Nonnull final Range[] ranges, final int mark) {
-    if (mark == NOT_MARKED) {
-      return ranges;
-    }
-    final Range[] result = new Range[ranges.length];
-    for (int i = 0; i < ranges.length; i++) {
-      final Range range = ranges[i];
-      final int newMark = range.getMarks() | mark;
-      result[i] = new Range(range.getStart(), range.getLength(), range.getSource(), newMark);
-    }
-    return result;
-  }
-
-  private static Source attachSourceValue(final Source source, final CharSequence value) {
-    final Object newValue = sourceReference(value, value, true);
-    return newValue == null ? source : source.attachValue(newValue);
-  }
-
-  private static Range[] attachSourceValue(
-      @Nonnull final Range[] ranges, @Nonnull final CharSequence value) {
-    // unbound sources can only occur when there's a single range in the array
-    if (ranges.length != 1) {
-      return ranges;
-    }
-    final Range range = ranges[0];
-    final Source source = range.getSource();
-    final Source newSource = attachSourceValue(source, value);
-    return newSource == source
-        ? ranges
-        : Ranges.forCharSequence(value, newSource, range.getMarks());
-  }
-
-  private static class TaintingVisitor implements ObjectVisitor.Visitor {
-
-    private final TaintedObjects taintedObjects;
-    private final byte origin;
-    private int count;
-
-    private TaintingVisitor(@Nonnull final TaintedObjects taintedObjects, final byte origin) {
-      this.taintedObjects = taintedObjects;
-      this.origin = origin;
+    /** Prevent copy of values bigger than this threshold */
+    private static final int MAX_VALUE_LENGTH = Config.get().getIastTruncationMaxValueLength();
+
+    @Override
+    public void taintObject(@Nullable Object target, byte origin) {
+        taintObject(target, origin, null);
+    }
+
+    @Override
+    public void taintObject(@Nullable IastContext ctx, @Nullable Object target, byte origin) {
+        taintObject(ctx, target, origin, null);
+    }
+
+    @Override
+    public void taintString(@Nullable String target, byte origin) {
+        taintString(target, origin, null);
+    }
+
+    @Override
+    public void taintString(@Nullable IastContext ctx, @Nullable String target, byte origin) {
+        taintString(ctx, target, origin, null);
+    }
+
+    @Override
+    public void taintObject(@Nullable Object target, byte origin, @Nullable CharSequence name) {
+        taintObject(target, origin, name, target);
+    }
+
+    @Override
+    public void taintObject(
+            @Nullable IastContext ctx, @Nullable Object target, byte origin, @Nullable CharSequence name) {
+        taintObject(ctx, target, origin, name, target);
+    }
+
+    @Override
+    public void taintString(@Nullable String target, byte origin, @Nullable CharSequence name) {
+        taintString(target, origin, name, target);
+    }
+
+    @Override
+    public void taintString(
+            @Nullable IastContext ctx, @Nullable String target, byte origin, @Nullable CharSequence name) {
+        taintString(ctx, target, origin, name, target);
+    }
+
+    @Override
+    public void taintObjectRange(@Nullable final Object target, final byte origin, final int start, final int length) {
+        if (target == null || length == 0) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        taintObjectRange(ctx, target, origin, start, length);
+    }
+
+    @Override
+    public void taintObjectRange(
+            @Nullable final IastContext ctx,
+            @Nullable final Object target,
+            final byte origin,
+            final int start,
+            final int length) {
+        if (ctx == null || target == null || length == 0) {
+            return;
+        }
+        final TaintedObjects to = ctx.getTaintedObjects();
+        final Range range = new Range(start, length, newSource(target, origin, null, target), NOT_MARKED);
+        internalTaint(to, target, new Range[] {range}, NOT_MARKED);
+    }
+
+    @Override
+    public void taintStringRange(@Nullable final String target, final byte origin, final int start, final int length) {
+        if (target == null || length == 0) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        taintStringRange(ctx, target, origin, start, length);
+    }
+
+    @Override
+    public void taintStringRange(
+            @Nullable final IastContext ctx,
+            @Nullable final String target,
+            final byte origin,
+            final int start,
+            final int length) {
+        if (ctx == null || target == null || length == 0) {
+            return;
+        }
+        final TaintedObjects to = ctx.getTaintedObjects();
+        final Range range = new Range(start, length, newSource(target, origin, null, target), NOT_MARKED);
+        internalTaint(to, target, new Range[] {range}, NOT_MARKED);
+    }
+
+    @Override
+    public void taintObject(
+            @Nullable final Object target,
+            final byte origin,
+            @Nullable final CharSequence name,
+            @Nullable final Object value) {
+        if (target == null) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        taintObject(ctx, target, origin, name, value);
+    }
+
+    @Override
+    public void taintObject(
+            @Nullable final IastContext ctx,
+            @Nullable final Object target,
+            final byte origin,
+            @Nullable final CharSequence name,
+            @Nullable final Object value) {
+        if (ctx == null || target == null) {
+            return;
+        }
+        final TaintedObjects to = ctx.getTaintedObjects();
+        internalTaint(to, target, newSource(target, origin, name, value), NOT_MARKED);
+    }
+
+    @Override
+    public void taintString(
+            @Nullable final String target,
+            final byte origin,
+            @Nullable final CharSequence name,
+            @Nullable final CharSequence value) {
+        if (target == null) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        taintString(ctx, target, origin, name, value);
+    }
+
+    @Override
+    public void taintString(
+            @Nullable final IastContext ctx,
+            @Nullable final String target,
+            final byte origin,
+            @Nullable final CharSequence name,
+            @Nullable final CharSequence value) {
+        if (ctx == null || target == null) {
+            return;
+        }
+        final TaintedObjects to = ctx.getTaintedObjects();
+        internalTaint(to, target, newSource(target, origin, name, value), NOT_MARKED);
+    }
+
+    @Override
+    public void taintObjectIfTainted(@Nullable Object target, @Nullable Object input) {
+        taintObjectIfTainted(target, input, false, NOT_MARKED);
+    }
+
+    @Override
+    public void taintObjectIfTainted(@Nullable IastContext ctx, @Nullable Object target, @Nullable Object input) {
+        taintObjectIfTainted(ctx, target, input, false, NOT_MARKED);
+    }
+
+    @Override
+    public void taintStringIfTainted(@Nullable String target, @Nullable Object input) {
+        taintStringIfTainted(target, input, false, NOT_MARKED);
+    }
+
+    @Override
+    public void taintStringIfTainted(@Nullable IastContext ctx, @Nullable String target, @Nullable Object input) {
+        taintStringIfTainted(ctx, target, input, false, NOT_MARKED);
+    }
+
+    @Override
+    public void taintObjectIfTainted(
+            @Nullable final Object target, @Nullable final Object input, boolean keepRanges, int mark) {
+        if (target == null || input == null) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        taintObjectIfTainted(ctx, target, input, keepRanges, mark);
+    }
+
+    @Override
+    public void taintObjectIfTainted(
+            @Nullable final IastContext ctx,
+            @Nullable final Object target,
+            @Nullable final Object input,
+            boolean keepRanges,
+            int mark) {
+        if (ctx == null || target == null || input == null) {
+            return;
+        }
+        final TaintedObjects to = ctx.getTaintedObjects();
+        if (keepRanges) {
+            internalTaint(to, target, getRanges(to, input), mark);
+        } else {
+            internalTaint(to, target, highestPrioritySource(to, input), mark);
+        }
+    }
+
+    @Override
+    public void taintStringIfTainted(
+            @Nullable final String target, @Nullable final Object input, boolean keepRanges, int mark) {
+        if (target == null || input == null) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        taintStringIfTainted(ctx, target, input, keepRanges, mark);
+    }
+
+    @Override
+    public void taintStringIfTainted(
+            @Nullable final IastContext ctx,
+            @Nullable final String target,
+            @Nullable final Object input,
+            boolean keepRanges,
+            int mark) {
+        if (ctx == null || target == null || input == null) {
+            return;
+        }
+        final TaintedObjects to = ctx.getTaintedObjects();
+        if (keepRanges) {
+            internalTaint(to, target, getRanges(to, input), mark);
+        } else {
+            internalTaint(to, target, highestPrioritySource(to, input), mark);
+        }
+    }
+
+    @Override
+    public void taintObjectIfRangeTainted(
+            @Nullable final Object target,
+            @Nullable final Object input,
+            final int start,
+            final int length,
+            boolean keepRanges,
+            int mark) {
+        if (target == null || input == null || length == 0) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        taintObjectIfRangeTainted(ctx, target, input, start, length, keepRanges, mark);
+    }
+
+    @Override
+    public void taintObjectIfRangeTainted(
+            @Nullable final IastContext ctx,
+            @Nullable final Object target,
+            @Nullable final Object input,
+            final int start,
+            final int length,
+            boolean keepRanges,
+            int mark) {
+        if (ctx == null || target == null || input == null || length == 0) {
+            return;
+        }
+        final TaintedObjects to = ctx.getTaintedObjects();
+        final Range[] ranges = getRanges(to, input);
+        if (ranges == null || ranges.length == 0) {
+            return;
+        }
+        final Range[] intersection = Ranges.intersection(Ranged.build(start, length), ranges);
+        if (intersection == null || intersection.length == 0) {
+            return;
+        }
+        if (keepRanges) {
+            internalTaint(to, target, intersection, mark);
+        } else {
+            final Range range = highestPriorityRange(intersection);
+            internalTaint(to, target, range.getSource(), mark);
+        }
+    }
+
+    @Override
+    public void taintStringIfRangeTainted(
+            @Nullable final String target,
+            @Nullable final Object input,
+            final int start,
+            final int length,
+            boolean keepRanges,
+            int mark) {
+        if (target == null || input == null || length == 0) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        taintStringIfRangeTainted(ctx, target, input, start, length, keepRanges, mark);
+    }
+
+    @Override
+    public void taintStringIfRangeTainted(
+            @Nullable final IastContext ctx,
+            @Nullable final String target,
+            @Nullable final Object input,
+            final int start,
+            final int length,
+            boolean keepRanges,
+            int mark) {
+        if (ctx == null || target == null || input == null || length == 0) {
+            return;
+        }
+        final TaintedObjects to = ctx.getTaintedObjects();
+        final Range[] ranges = getRanges(to, input);
+        if (ranges == null || ranges.length == 0) {
+            return;
+        }
+        final Range[] intersection = Ranges.intersection(Ranged.build(start, length), ranges);
+        if (intersection == null || intersection.length == 0) {
+            return;
+        }
+        if (keepRanges) {
+            internalTaint(to, target, intersection, mark);
+        } else {
+            final Range range = highestPriorityRange(intersection);
+            internalTaint(to, target, range.getSource(), mark);
+        }
+    }
+
+    @Override
+    public void taintObjectIfTainted(@Nullable Object target, @Nullable Object input, byte origin) {
+        taintObjectIfTainted(target, input, origin, null, target);
+    }
+
+    @Override
+    public void taintObjectIfTainted(
+            @Nullable IastContext ctx, @Nullable Object target, @Nullable Object input, byte origin) {
+        taintObjectIfTainted(ctx, target, input, origin, null, target);
+    }
+
+    @Override
+    public void taintStringIfTainted(@Nullable String target, @Nullable Object input, byte origin) {
+        taintStringIfTainted(target, input, origin, null, target);
+    }
+
+    @Override
+    public void taintStringIfTainted(
+            @Nullable IastContext ctx, @Nullable String target, @Nullable Object input, byte origin) {
+        taintStringIfTainted(ctx, target, input, origin, null, target);
+    }
+
+    @Override
+    public void taintObjectIfTainted(
+            @Nullable Object target, @Nullable Object input, byte origin, @Nullable CharSequence name) {
+        taintObjectIfTainted(target, input, origin, name, target);
+    }
+
+    @Override
+    public void taintObjectIfTainted(
+            @Nullable IastContext ctx,
+            @Nullable Object target,
+            @Nullable Object input,
+            byte origin,
+            @Nullable CharSequence name) {
+        taintObjectIfTainted(ctx, target, input, origin, name, target);
+    }
+
+    @Override
+    public void taintStringIfTainted(
+            @Nullable String target, @Nullable Object input, byte origin, @Nullable CharSequence name) {
+        taintStringIfTainted(target, input, origin, name, target);
+    }
+
+    @Override
+    public void taintStringIfTainted(
+            @Nullable IastContext ctx,
+            @Nullable String target,
+            @Nullable Object input,
+            byte origin,
+            @Nullable CharSequence name) {
+        taintStringIfTainted(ctx, target, input, origin, name, target);
+    }
+
+    @Override
+    public void taintObjectIfTainted(
+            @Nullable final Object target,
+            @Nullable final Object input,
+            final byte origin,
+            @Nullable final CharSequence name,
+            @Nullable final Object value) {
+        if (target == null || input == null) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        taintObjectIfTainted(ctx, target, input, origin, name, value);
+    }
+
+    @Override
+    public void taintObjectIfTainted(
+            @Nullable final IastContext ctx,
+            @Nullable final Object target,
+            @Nullable final Object input,
+            final byte origin,
+            @Nullable final CharSequence name,
+            @Nullable final Object value) {
+        if (ctx == null || target == null || input == null) {
+            return;
+        }
+        if (isTainted(ctx, target)) {
+            final TaintedObjects to = ctx.getTaintedObjects();
+            internalTaint(to, target, newSource(target, origin, name, value), NOT_MARKED);
+        }
     }
 
-    @Nonnull
     @Override
-    public ObjectVisitor.State visit(@Nonnull final String path, @Nonnull final Object value) {
-      if (value instanceof CharSequence) {
-        final CharSequence charSequence = (CharSequence) value;
-        final Source source = newSource(charSequence, origin, path, charSequence);
-        count++;
-        taintedObjects.taint(
-            charSequence, Ranges.forCharSequence(charSequence, source, NOT_MARKED));
-      }
-      return CONTINUE;
+    public void taintStringIfTainted(
+            @Nullable final String target,
+            @Nullable final Object input,
+            final byte origin,
+            @Nullable final CharSequence name,
+            @Nullable final Object value) {
+        if (target == null || input == null) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        taintStringIfTainted(ctx, target, input, origin, name, value);
     }
 
-    public int getCount() {
-      return count;
+    @Override
+    public void taintStringIfTainted(
+            @Nullable final IastContext ctx,
+            @Nullable final String target,
+            @Nullable final Object input,
+            final byte origin,
+            @Nullable final CharSequence name,
+            @Nullable final Object value) {
+        if (ctx == null || target == null || input == null) {
+            return;
+        }
+        if (isTainted(ctx, input)) {
+            final TaintedObjects to = ctx.getTaintedObjects();
+            internalTaint(to, target, newSource(target, origin, name, value), NOT_MARKED);
+        }
+    }
+
+    @Override
+    public void taintObjectIfAnyTainted(@Nullable Object target, @Nullable Object[] inputs) {
+        taintObjectIfAnyTainted(target, inputs, false, NOT_MARKED);
+    }
+
+    @Override
+    public void taintObjectIfAnyTainted(@Nullable IastContext ctx, @Nullable Object target, @Nullable Object[] inputs) {
+        taintObjectIfAnyTainted(ctx, target, inputs, false, NOT_MARKED);
+    }
+
+    @Override
+    public void taintStringIfAnyTainted(@Nullable String target, @Nullable Object[] inputs) {
+        taintStringIfAnyTainted(target, inputs, false, NOT_MARKED);
+    }
+
+    @Override
+    public void taintStringIfAnyTainted(@Nullable IastContext ctx, @Nullable String target, @Nullable Object[] inputs) {
+        taintStringIfAnyTainted(ctx, target, inputs, false, NOT_MARKED);
+    }
+
+    @Override
+    public void taintObjectIfAnyTainted(
+            @Nullable final Object target, @Nullable final Object[] inputs, final boolean keepRanges, final int mark) {
+        if (target == null || inputs == null || inputs.length == 0) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        taintObjectIfAnyTainted(ctx, target, inputs, keepRanges, mark);
+    }
+
+    @Override
+    public void taintObjectIfAnyTainted(
+            @Nullable final IastContext ctx,
+            @Nullable final Object target,
+            @Nullable final Object[] inputs,
+            final boolean keepRanges,
+            final int mark) {
+        if (ctx == null || target == null || inputs == null || inputs.length == 0) {
+            return;
+        }
+        final TaintedObjects to = ctx.getTaintedObjects();
+        if (keepRanges) {
+            final Range[] ranges = getRangesInArray(to, inputs);
+            if (ranges != null) {
+                internalTaint(to, target, ranges, mark);
+            }
+        } else {
+            final Source source = highestPrioritySourceInArray(to, inputs);
+            if (source != null) {
+                internalTaint(to, target, source, mark);
+            }
+        }
+    }
+
+    @Override
+    public void taintStringIfAnyTainted(
+            @Nullable final String target, @Nullable final Object[] inputs, final boolean keepRanges, final int mark) {
+        if (target == null || inputs == null || inputs.length == 0) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        taintStringIfAnyTainted(ctx, target, inputs, keepRanges, mark);
+    }
+
+    @Override
+    public void taintStringIfAnyTainted(
+            @Nullable final IastContext ctx,
+            @Nullable final String target,
+            @Nullable final Object[] inputs,
+            final boolean keepRanges,
+            final int mark) {
+        if (ctx == null || target == null || inputs == null || inputs.length == 0) {
+            return;
+        }
+        final TaintedObjects to = ctx.getTaintedObjects();
+        if (keepRanges) {
+            final Range[] ranges = getRangesInArray(to, inputs);
+            if (ranges != null) {
+                internalTaint(to, target, ranges, mark);
+            }
+        } else {
+            final Source source = highestPrioritySourceInArray(to, inputs);
+            if (source != null) {
+                internalTaint(to, target, source, mark);
+            }
+        }
+    }
+
+    @Override
+    public int taintObjectDeeply(
+            @Nullable final Object target, final byte origin, final Predicate<Class<?>> classFilter) {
+        if (target == null) {
+            return 0;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return 0;
+        }
+        return taintObjectDeeply(ctx, target, origin, classFilter);
+    }
+
+    @Override
+    public int taintObjectDeeply(
+            @Nullable final IastContext ctx,
+            @Nullable final Object target,
+            final byte origin,
+            final Predicate<Class<?>> classFilter) {
+        if (ctx == null || target == null) {
+            return 0;
+        }
+        final TaintedObjects to = ctx.getTaintedObjects();
+        if (target instanceof CharSequence) {
+            internalTaint(to, target, newSource(target, origin, null, target), NOT_MARKED);
+            return 1;
+        } else {
+            final TaintingVisitor visitor = new TaintingVisitor(to, origin);
+            ObjectVisitor.visit(target, visitor, classFilter);
+            return visitor.getCount();
+        }
+    }
+
+    @Nullable
+    @Override
+    public Taintable.Source findSource(@Nullable final Object target) {
+        if (target == null) {
+            return null;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return null;
+        }
+        return findSource(ctx, target);
+    }
+
+    @Nullable
+    @Override
+    public Taintable.Source findSource(@Nullable final IastContext ctx, @Nullable final Object target) {
+        if (ctx == null || target == null) {
+            return null;
+        }
+        final TaintedObjects to = ctx.getTaintedObjects();
+        return highestPrioritySource(to, target);
+    }
+
+    @Override
+    public void markIfTainted(@Nullable Object target, int mark) {
+        if (target == null) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        TaintedObject taintedObject = taintedObjects.get(target);
+        if (taintedObject != null) {
+            taintedObject.setRanges(markRanges(taintedObject.getRanges(), mark));
+        }
+    }
+
+    @Override
+    public boolean isTainted(@Nullable final Object target) {
+        if (target == null) {
+            return false;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return false;
+        }
+        return isTainted(ctx, target);
+    }
+
+    @Override
+    public boolean isTainted(@Nullable final IastContext ctx, @Nullable final Object target) {
+        return ctx != null && target != null && findSource(ctx, target) != null;
+    }
+
+    /**
+     * Ensures that the reference is not kept due to a strong reference via the name or value
+     * properties
+     */
+    private static Source newSource(
+            @Nonnull final Object target,
+            final byte origin,
+            @Nullable final CharSequence name,
+            @Nullable final Object value) {
+        final Object sourceValue = sourceReference(target, value, true);
+        final Object sourceName = name == value ? sourceValue : sourceReference(target, name, false);
+        return new Source(origin, sourceName, sourceValue);
+    }
+
+    /**
+     * Ensures that the reference is not kept due to a strong reference via the name or value
+     * properties
+     */
+    private static Source newSource(
+            @Nonnull final String tainted,
+            final byte origin,
+            @Nullable final CharSequence name,
+            @Nullable final CharSequence value) {
+        final Object sourceValue = sourceReference(tainted, value, true);
+        final Object sourceName = name == value ? sourceValue : sourceReference(tainted, name, false);
+        return new Source(origin, sourceName, sourceValue);
+    }
+
+    /**
+     * This method will prevent the code from creating a strong reference to what should remain weakly
+     * reachable
+     */
+    @Nullable
+    private static Object sourceReference(
+            @Nonnull final Object tainted, @Nullable final Object target, final boolean value) {
+        if (target instanceof String) {
+            // weak reference if it's a value or matches the tainted value
+            return value || tainted == target ? new WeakReference<>(target) : target;
+        } else if (target instanceof CharSequence) {
+            // char-sequences can mutate so we have to keep a snapshot
+            CharSequence charSequence = (CharSequence) target;
+            if (charSequence.length() > MAX_VALUE_LENGTH) {
+                charSequence = charSequence.subSequence(0, MAX_VALUE_LENGTH);
+            }
+            return charSequence.toString();
+        }
+        // ignore non char-sequence instances (e.g. byte buffers)
+        return value ? PROPAGATION_PLACEHOLDER : null;
+    }
+
+    @Nullable
+    private static Range[] getRangesInArray(final @Nonnull TaintedObjects to, final @Nonnull Object[] objects) {
+        for (final Object object : objects) {
+            final Range[] ranges = getRanges(to, object);
+            if (ranges != null) {
+                return ranges;
+            }
+        }
+        return null;
+    }
+
+    @Nullable
+    private static Range[] getRanges(final @Nonnull TaintedObjects to, final @Nonnull Object object) {
+        if (object instanceof Taintable) {
+            final Source source = highestPrioritySource(to, object);
+            if (source == null) {
+                return null;
+            } else {
+                return new Range[] {new Range(0, Integer.MAX_VALUE, source, NOT_MARKED)};
+            }
+        }
+        final TaintedObject tainted = to.get(object);
+        return tainted == null ? null : tainted.getRanges();
+    }
+
+    @Nullable
+    private static Source highestPrioritySourceInArray(
+            final @Nonnull TaintedObjects to, final @Nonnull Object[] objects) {
+        for (final Object object : objects) {
+            final Source source = highestPrioritySource(to, object);
+            if (source != null) {
+                return source;
+            }
+        }
+        return null;
+    }
+
+    @Nullable
+    private static Source highestPrioritySource(final @Nonnull TaintedObjects to, final @Nonnull Object object) {
+        if (object instanceof Taintable) {
+            return (Source) ((Taintable) object).$$DD$getSource();
+        } else {
+            final Range[] ranges = getRanges(to, object);
+            return ranges != null && ranges.length > 0
+                    ? highestPriorityRange(ranges).getSource()
+                    : null;
+        }
+    }
+
+    private static void internalTaint(
+            @Nonnull final TaintedObjects to, @Nonnull final Object value, @Nullable Source source, int mark) {
+        if (source == null) {
+            return;
+        }
+        if (value instanceof Taintable) {
+            ((Taintable) value).$$DD$setSource(source);
+        } else {
+            if (value instanceof CharSequence) {
+                source = attachSourceValue(source, (CharSequence) value);
+                to.taint(value, Ranges.forCharSequence((CharSequence) value, source, mark));
+            } else {
+                to.taint(value, Ranges.forObject(source, mark));
+            }
+        }
+    }
+
+    private static void internalTaint(
+            @Nonnull final TaintedObjects to, @Nonnull final String value, @Nullable Source source, int mark) {
+        if (source == null) {
+            return;
+        }
+        source = attachSourceValue(source, value);
+        to.taint(value, Ranges.forCharSequence(value, source, mark));
+    }
+
+    private static void internalTaint(
+            @Nonnull final TaintedObjects to, @Nonnull final Object value, @Nullable Range[] ranges, final int mark) {
+        if (ranges == null || ranges.length == 0) {
+            return;
+        }
+        if (value instanceof Taintable) {
+            final Taintable taintable = (Taintable) value;
+            if (!taintable.$DD$isTainted()) {
+                taintable.$$DD$setSource(ranges[0].getSource());
+            }
+        } else {
+            if (value instanceof CharSequence) {
+                ranges = attachSourceValue(ranges, (CharSequence) value);
+            }
+            ranges = markRanges(ranges, mark);
+            final TaintedObject tainted = to.get(value);
+            if (tainted != null) {
+                // append ranges
+                final Range[] newRanges = Ranges.mergeRangesSorted(tainted.getRanges(), ranges);
+                tainted.setRanges(newRanges);
+            } else {
+                // taint new value
+                to.taint(value, ranges);
+            }
+        }
+    }
+
+    private static void internalTaint(
+            @Nonnull final TaintedObjects to, @Nonnull final String value, @Nullable Range[] ranges, final int mark) {
+        if (ranges == null || ranges.length == 0) {
+            return;
+        }
+        ranges = attachSourceValue(ranges, value);
+        ranges = markRanges(ranges, mark);
+        final TaintedObject tainted = to.get(value);
+        if (tainted != null) {
+            // append ranges
+            final Range[] newRanges = Ranges.mergeRangesSorted(tainted.getRanges(), ranges);
+            tainted.setRanges(newRanges);
+        } else {
+            // taint new value
+            to.taint(value, ranges);
+        }
+    }
+
+    @Nonnull
+    private static Range[] markRanges(@Nonnull final Range[] ranges, final int mark) {
+        if (mark == NOT_MARKED) {
+            return ranges;
+        }
+        final Range[] result = new Range[ranges.length];
+        for (int i = 0; i < ranges.length; i++) {
+            final Range range = ranges[i];
+            final int newMark = range.getMarks() | mark;
+            result[i] = new Range(range.getStart(), range.getLength(), range.getSource(), newMark);
+        }
+        return result;
+    }
+
+    private static Source attachSourceValue(final Source source, final CharSequence value) {
+        final Object newValue = sourceReference(value, value, true);
+        return newValue == null ? source : source.attachValue(newValue);
+    }
+
+    private static Range[] attachSourceValue(@Nonnull final Range[] ranges, @Nonnull final CharSequence value) {
+        // unbound sources can only occur when there's a single range in the array
+        if (ranges.length != 1) {
+            return ranges;
+        }
+        final Range range = ranges[0];
+        final Source source = range.getSource();
+        final Source newSource = attachSourceValue(source, value);
+        return newSource == source ? ranges : Ranges.forCharSequence(value, newSource, range.getMarks());
+    }
+
+    private static class TaintingVisitor implements ObjectVisitor.Visitor {
+
+        private final TaintedObjects taintedObjects;
+        private final byte origin;
+        private int count;
+
+        private TaintingVisitor(@Nonnull final TaintedObjects taintedObjects, final byte origin) {
+            this.taintedObjects = taintedObjects;
+            this.origin = origin;
+        }
+
+        @Nonnull
+        @Override
+        public ObjectVisitor.State visit(@Nonnull final String path, @Nonnull final Object value) {
+            if (value instanceof CharSequence) {
+                final CharSequence charSequence = (CharSequence) value;
+                final Source source = newSource(charSequence, origin, path, charSequence);
+                count++;
+                taintedObjects.taint(charSequence, Ranges.forCharSequence(charSequence, source, NOT_MARKED));
+            }
+            return CONTINUE;
+        }
+
+        public int getCount() {
+            return count;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java
index 3fbb52cb0de..cf31ad5cdb7 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java
@@ -36,945 +36,923 @@
 
 public class StringModuleImpl implements StringModule {
 
-  /** {@link java.util.Formatter#formatSpecifier} */
-  private static final Pattern FORMAT_PATTERN =
-      Pattern.compile("%(?<index>\\d+\\$)?([-#+ 0,(\\<]*)?(\\d+)?(\\.\\d+)?([tT])?([a-zA-Z%])");
-
-  /** Escaped format patterns * */
-  private static final Map<String, String> ESCAPED_PATTERNS =
-      Stream.of("%%", "%n").collect(Collectors.toMap(Function.identity(), String::format));
-
-  private static final Ranged END = Ranged.build(Integer.MAX_VALUE, 0);
-
-  private static final int NULL_STR_LENGTH = "null".length();
-
-  @SuppressWarnings("NullAway") // NullAway fails with taintedLeft and taintedRight checks
-  @Override
-  public void onStringConcat(
-      @Nonnull final String left, @Nullable final String right, @Nonnull final String result) {
-    if (!canBeTainted(result)) {
-      return;
-    }
-    if (!canBeTainted(left) && !canBeTainted(right)) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final TaintedObject taintedLeft = getTainted(taintedObjects, left);
-    final TaintedObject taintedRight = getTainted(taintedObjects, right);
-    if (taintedLeft == null && taintedRight == null) {
-      return;
-    }
-    final Range[] ranges;
-    if (taintedRight == null) {
-      ranges = taintedLeft.getRanges();
-    } else if (taintedLeft == null) {
-      ranges = new Range[taintedRight.getRanges().length];
-      Ranges.copyShift(taintedRight.getRanges(), ranges, 0, left.length());
-    } else {
-      ranges = mergeRanges(left.length(), taintedLeft.getRanges(), taintedRight.getRanges());
-    }
-    taintedObjects.taint(result, ranges);
-  }
-
-  @Override
-  public void onStringBuilderInit(
-      @Nonnull final CharSequence builder, @Nullable final CharSequence param) {
-    if (!canBeTainted(param)) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final TaintedObject paramTainted = taintedObjects.get(param);
-    if (paramTainted == null) {
-      return;
-    }
-    taintedObjects.taint(builder, paramTainted.getRanges());
-  }
-
-  @Override
-  public void onStringBuilderAppend(
-      @Nonnull final CharSequence builder, @Nullable final CharSequence param) {
-    if (!canBeTainted(builder) || !canBeTainted(param)) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final TaintedObject paramTainted = taintedObjects.get(param);
-    if (paramTainted == null) {
-      return;
-    }
-    final TaintedObject builderTainted = taintedObjects.get(builder);
-    final int shift = builder.length() - param.length();
-    if (builderTainted == null) {
-      final Range[] paramRanges = paramTainted.getRanges();
-      final Range[] ranges = new Range[paramRanges.length];
-      Ranges.copyShift(paramRanges, ranges, 0, shift);
-      taintedObjects.taint(builder, ranges);
-    } else {
-      final Range[] builderRanges = builderTainted.getRanges();
-      final Range[] paramRanges = paramTainted.getRanges();
-      final Range[] ranges = mergeRanges(shift, builderRanges, paramRanges);
-      builderTainted.setRanges(ranges);
-    }
-  }
-
-  @Override
-  public void onStringBuilderAppend(
-      @Nonnull CharSequence builder, @Nullable CharSequence param, int start, int end) {
-    if (!canBeTainted(builder) || !canBeTainted(param)) {
-      return;
-    }
-    if (start < 0 || end > param.length() || start > end) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final TaintedObject paramTainted = taintedObjects.get(param);
-    if (paramTainted == null) {
-      return;
-    }
-    // We get the ranges for the new substring that will be appended to the builder
-    final Range[] paramRanges = paramTainted.getRanges();
-    final Range[] newParamRanges = Ranges.forSubstring(start, end - start, paramRanges);
-    if (newParamRanges == null) {
-      return;
-    }
-    final TaintedObject builderTainted = taintedObjects.get(builder);
-    // If the builder is not tainted we must shift the ranges of the parameter
-    // Else we shift the ranges of the parameter and merge with the ranges of the builder
-    final int shift = builder.length() - (end - start);
-    if (builderTainted == null) {
-      final Range[] ranges = new Range[newParamRanges.length];
-      Ranges.copyShift(newParamRanges, ranges, 0, shift);
-      taintedObjects.taint(builder, ranges);
-    } else {
-      final Range[] builderRanges = builderTainted.getRanges();
-      final Range[] ranges = mergeRanges(shift, builderRanges, newParamRanges);
-      builderTainted.setRanges(ranges);
-    }
-  }
-
-  @Override
-  public void onStringBuilderToString(
-      @Nonnull final CharSequence builder, @Nonnull final String result) {
-    if (!canBeTainted(builder) || !canBeTainted(result)) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final TaintedObject to = taintedObjects.get(builder);
-    if (to == null) {
-      return;
-    }
-    taintedObjects.taint(result, to.getRanges());
-  }
-
-  @Override
-  public void onStringConcatFactory(
-      @Nullable final String result,
-      @Nullable final String[] args,
-      @Nullable final String recipe,
-      @Nullable final Object[] constants,
-      @Nonnull final int[] recipeOffsets) {
-    if (!canBeTainted(result) || !canBeTainted(args)) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final RangeBuilder targetRanges = new RangeBuilder();
-    int offset = 0;
-    for (int item : recipeOffsets) {
-      if (item < 0) {
-        offset -= item;
-      } else {
-        final String argument = args[item];
-        final Range[] ranges = getRanges(getTainted(taintedObjects, argument));
-        if (ranges.length > 0) {
-          targetRanges.add(ranges, offset);
-          if (targetRanges.isFull()) {
-            break;
-          }
-        }
-        offset += getToStringLength(argument);
-      }
-    }
-    if (!targetRanges.isEmpty()) {
-      taintedObjects.taint(result, targetRanges.toArray());
-    }
-  }
-
-  @Override
-  public void onStringSubSequence(
-      @Nonnull CharSequence self, int beginIndex, int endIndex, @Nullable CharSequence result) {
-    if (self == result || !canBeTainted(result)) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final TaintedObject selfTainted = taintedObjects.get(self);
-    if (selfTainted == null) {
-      return;
-    }
-    final Range[] rangesSelf = selfTainted.getRanges();
-    if (rangesSelf.length == 0) {
-      return;
-    }
-    Range[] newRanges = Ranges.forSubstring(beginIndex, result.length(), rangesSelf);
-    if (newRanges != null && newRanges.length > 0) {
-      taintedObjects.taint(result, newRanges);
-    }
-  }
-
-  @Override
-  public void onStringJoin(
-      @Nullable String result, @Nonnull CharSequence delimiter, @Nonnull CharSequence[] elements) {
-    if (!canBeTainted(result)) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    // String.join may internally call StringJoiner, if StringJoiner did the job don't do it twice
-    if (getTainted(taintedObjects, result) != null) {
-      return;
-    }
-    final Range[] delimiterRanges = getRanges(getTainted(taintedObjects, delimiter));
-    final RangeBuilder targetRanges = new RangeBuilder();
-    int delimiterLength = getToStringLength(delimiter), offset = 0;
-    for (int i = 0; i < elements.length; i++) {
-      // insert element ranges
-      final CharSequence element = elements[i];
-      final Range[] ranges = getRanges(getTainted(taintedObjects, element));
-      if (ranges.length > 0) {
-        targetRanges.add(ranges, offset);
-        if (targetRanges.isFull()) {
-          break;
-        }
-      }
-      offset += getToStringLength(element);
-
-      if (i < elements.length - 1) {
-        // add delimiter ranges
-        targetRanges.add(delimiterRanges, offset);
-        if (targetRanges.isFull()) {
-          break;
-        }
-        offset += delimiterLength;
-      }
-    }
-    if (!targetRanges.isEmpty()) {
-      taintedObjects.taint(result, targetRanges.toArray());
-    }
-  }
-
-  @Override
-  @SuppressFBWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ")
-  public void onStringTranslateEscapes(@Nonnull String self, @Nullable String result) {
-    if (!canBeTainted(result)) {
-      return;
-    }
-    if (self == result) { // same ref, no change in taint status
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final TaintedObject taintedSelf = taintedObjects.get(self);
-    if (taintedSelf == null) {
-      return; // original string is not tainted
-    }
-    taintedObjects.taint(result, taintedSelf.getRanges()); // only possibility left
-  }
-
-  @Override
-  @SuppressFBWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ")
-  public void onStringRepeat(@Nonnull String self, int count, @Nonnull String result) {
-    if (!canBeTainted(self) || !canBeTainted(result) || self == result) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final Range[] selfRanges = getRanges(taintedObjects.get(self));
-    if (selfRanges.length == 0) {
-      return;
-    }
-    final Range[] ranges = Ranges.newArray(selfRanges.length * (long) count);
-    int rangeIndex = 0;
-    for (int i = 0; i < count; i++) {
-      rangeIndex = insertRange(ranges, selfRanges, i * self.length(), rangeIndex);
-      if (rangeIndex >= ranges.length) {
-        break;
-      }
-    }
-    taintedObjects.taint(result, ranges);
-  }
-
-  private static int getToStringLength(@Nullable final CharSequence s) {
-    return s == null ? NULL_STR_LENGTH : s.length();
-  }
-
-  @Override
-  public void onStringToUpperCase(@Nonnull String self, @Nullable String result) {
-    onStringCaseChanged(self, result);
-  }
-
-  @Override
-  public void onStringToLowerCase(@Nonnull String self, @Nullable String result) {
-    onStringCaseChanged(self, result);
-  }
-
-  @SuppressFBWarnings
-  public void onStringCaseChanged(@Nonnull String self, @Nullable String result) {
-    if (!canBeTainted(result)) {
-      return;
-    }
-    if (self == result) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final TaintedObject taintedSelf = taintedObjects.get(self);
-    if (taintedSelf == null) {
-      return;
-    }
-    final Range[] rangesSelf = taintedSelf.getRanges();
-    if (null == rangesSelf || rangesSelf.length == 0) {
-      return;
-    }
-    if (result.length() == self.length()) {
-      taintedObjects.taint(result, rangesSelf);
-      return;
-    }
-    if (result.length() >= self.length()) {
-      taintedObjects.taint(result, rangesSelf);
-    } // Pathological case where the string's length actually becomes smaller
-    else {
-      stringCaseChangedWithReducedSize(rangesSelf, taintedObjects, result);
-    }
-  }
-
-  private void stringCaseChangedWithReducedSize(
-      final Range[] rangesSelf, final TaintedObjects taintedObjects, @Nonnull String result) {
-    int skippedRanges = 0;
-    Range adjustedRange = null;
-    for (int i = rangesSelf.length - 1; i >= 0; i--) {
-      Range currentRange = rangesSelf[i];
-      if (currentRange.getStart() >= result.length()) {
-        skippedRanges++;
-      } else if (currentRange.getStart() + currentRange.getLength() >= result.length()) {
-        adjustedRange =
-            Ranges.copyWithPosition(
-                currentRange, currentRange.getStart(), result.length() - currentRange.getStart());
-      }
-    }
-    Range[] newRanges = new Range[rangesSelf.length - skippedRanges];
-    System.arraycopy(rangesSelf, 0, newRanges, 0, newRanges.length);
-
-    if (null != adjustedRange) {
-      newRanges[newRanges.length - 1] = adjustedRange;
-    }
-    taintedObjects.taint(result, newRanges);
-  }
-
-  /** Inserts the range in the selected position and returns the new position for further ranges */
-  private static int insertRange(
-      final Range[] targetRanges, final Range[] ranges, final int offset, final int rangeIndex) {
-    if (ranges.length == 0) {
-      return rangeIndex;
-    }
-    final int count = Math.min(targetRanges.length - rangeIndex, ranges.length);
-    Ranges.copyShift(ranges, targetRanges, rangeIndex, offset, count);
-    return rangeIndex + count;
-  }
-
-  private static Range[] getRanges(@Nullable final TaintedObject taintedObject) {
-    return taintedObject == null ? EMPTY : taintedObject.getRanges();
-  }
-
-  @Override
-  @SuppressFBWarnings
-  public void onStringTrim(@Nonnull final String self, @Nullable final String result) {
-    if (!canBeTainted(result)) {
-      return;
-    }
-    if (self == result) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final TaintedObject taintedSelf = taintedObjects.get(self);
-    if (taintedSelf == null) {
-      return;
-    }
-
-    int offset = 0;
-    while ((offset < self.length()) && (self.charAt(offset) <= ' ')) {
-      offset++;
-    }
-
-    int resultLength = result.length();
-
-    final Range[] rangesSelf = taintedSelf.getRanges();
-    if (null == rangesSelf || rangesSelf.length == 0) {
-      return;
-    }
-
-    final Range[] newRanges = Ranges.forSubstring(offset, resultLength, rangesSelf);
-
-    if (null != newRanges) {
-      taintedObjects.taint(result, newRanges);
-    }
-  }
-
-  @Override
-  public void onStringConstructor(@Nonnull CharSequence self, @Nonnull String result) {
-    if (!canBeTainted(self)) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final Range[] selfRanges = getRanges(taintedObjects.get(self));
-    if (selfRanges.length == 0) {
-      return;
-    }
-    taintedObjects.taint(result, selfRanges);
-  }
-
-  @Override
-  public void onStringFormat(
-      @Nonnull final String format, @Nonnull final Object[] params, @Nonnull final String result) {
-    onStringFormat(null, format, params, result);
-  }
-
-  @Override
-  public void onStringFormat(
-      @Nullable final Locale locale,
-      @Nonnull final String format,
-      @Nonnull final Object[] parameters,
-      @Nonnull final String result) {
-    if (!canBeTainted(result)) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects to = ctx.getTaintedObjects();
-    final Deque<Range> formatRanges = new LinkedList<>();
-    final TaintedObject formatTainted = to.get(format);
-    if (formatTainted != null) {
-      formatRanges.addAll(Arrays.asList(formatTainted.getRanges()));
-    }
-    // params can appear zero or multiple times in the pattern so the final number of ranges is
-    // unknown beforehand
-    final RangeBuilder finalRanges = new RangeBuilder();
-    final Matcher matcher = FORMAT_PATTERN.matcher(format);
-    int offset = 0, paramIndex = 0;
-    while (matcher.find()) {
-      final String placeholder = matcher.group();
-      final Object parameter;
-      final String formattedValue;
-      final TaintedObject taintedObject;
-      final String escaped = ESCAPED_PATTERNS.get(placeholder);
-      if (escaped != null) {
-        parameter = placeholder;
-        formattedValue = escaped;
-        taintedObject = null;
-      } else {
-        final String index = matcher.group("index");
-        if (index != null) {
-          // indexes are 1-based
-          final int parsedIndex = Integer.parseInt(index.substring(0, index.length() - 1)) - 1;
-          // remove the index before the formatting without increment the current state
-          parameter = parameters[parsedIndex];
-          formattedValue = formatValue(locale, placeholder.replace(index, ""), parameter);
+    /** {@link java.util.Formatter#formatSpecifier} */
+    private static final Pattern FORMAT_PATTERN =
+            Pattern.compile("%(?<index>\\d+\\$)?([-#+ 0,(\\<]*)?(\\d+)?(\\.\\d+)?([tT])?([a-zA-Z%])");
+
+    /** Escaped format patterns * */
+    private static final Map<String, String> ESCAPED_PATTERNS =
+            Stream.of("%%", "%n").collect(Collectors.toMap(Function.identity(), String::format));
+
+    private static final Ranged END = Ranged.build(Integer.MAX_VALUE, 0);
+
+    private static final int NULL_STR_LENGTH = "null".length();
+
+    @SuppressWarnings("NullAway") // NullAway fails with taintedLeft and taintedRight checks
+    @Override
+    public void onStringConcat(@Nonnull final String left, @Nullable final String right, @Nonnull final String result) {
+        if (!canBeTainted(result)) {
+            return;
+        }
+        if (!canBeTainted(left) && !canBeTainted(right)) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final TaintedObject taintedLeft = getTainted(taintedObjects, left);
+        final TaintedObject taintedRight = getTainted(taintedObjects, right);
+        if (taintedLeft == null && taintedRight == null) {
+            return;
+        }
+        final Range[] ranges;
+        if (taintedRight == null) {
+            ranges = taintedLeft.getRanges();
+        } else if (taintedLeft == null) {
+            ranges = new Range[taintedRight.getRanges().length];
+            Ranges.copyShift(taintedRight.getRanges(), ranges, 0, left.length());
         } else {
-          if (!checkParameterBounds(format, parameters, paramIndex)) {
-            return; // return without tainting the string in case of error
-          }
-          parameter = parameters[paramIndex++];
-          formattedValue = formatValue(locale, placeholder, parameter);
-        }
-        taintedObject = to.get(parameter);
-      }
-      final Ranged placeholderPos = Ranged.build(matcher.start(), placeholder.length());
-      final Range placeholderRange =
-          addFormatTaintedRanges(placeholderPos, offset, formatRanges, finalRanges);
-      final Range[] paramRanges = taintedObject == null ? null : taintedObject.getRanges();
-      final int shift = placeholderPos.getStart() + offset;
-      addParameterTaintedRanges(
-          placeholderRange, parameter, formattedValue, shift, paramRanges, finalRanges);
-      offset += (formattedValue.length() - placeholder.length());
-      if (finalRanges.isFull()) {
-        break;
-      }
-    }
-    addFormatTaintedRanges(
-        END, offset, formatRanges, finalRanges); // add remaining ranges from the format
-    if (!finalRanges.isEmpty()) {
-      to.taint(result, finalRanges.toArray());
-    }
-  }
-
-  private static boolean checkParameterBounds(
-      final String format, final Object[] parameters, int paramIndex) {
-    if (paramIndex < parameters.length) {
-      return true;
-    }
-    LOG.debug(
-        SEND_TELEMETRY,
-        "Error handling string format pattern {} with args {} at index {}",
-        format,
-        parameters.length,
-        paramIndex);
-    return false;
-  }
-
-  /**
-   * Formats a value using String.format with telemtry report on IllegalFormatException.
-   *
-   * @param locale the locale to use for formatting
-   * @param placeholder the format placeholder (e.g., "%f", "%d")
-   * @param parameter the parameter to format
-   * @return the formatted value
-   */
-  private static String formatValue(
-      @Nullable final Locale locale, final String placeholder, final Object parameter) {
-    try {
-      return String.format(locale, placeholder, parameter);
-    } catch (final java.util.IllegalFormatException e) {
-      // Send telemetry to improve future bug fixes
-      LOG.debug(
-          SEND_TELEMETRY,
-          "Format conversion failed for placeholder {} with parameter type {}: {}",
-          placeholder,
-          parameter == null ? "null" : parameter.getClass().getName(),
-          e.getMessage());
-      throw e;
-    }
-  }
-
-  @Override
-  public void onStringFormat(
-      @Nonnull final Iterable<String> literals,
-      @Nonnull final Object[] parameters,
-      @Nonnull final String result) {
-    if (!canBeTainted(result)) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects to = ctx.getTaintedObjects();
-    // since we might join ranges the final number is unknown beforehand
-    final RangeBuilder finalRanges = new RangeBuilder();
-    int offset = 0, paramIndex = 0;
-    for (final Iterator<String> it = literals.iterator(); it.hasNext(); ) {
-      final String literal = it.next();
-      offset += literal.length();
-      if (it.hasNext() && paramIndex < parameters.length) {
-        final Object parameter = parameters[paramIndex++];
-        final TaintedObject tainted = to.get(parameter);
-        final Range[] parameterRanges = tainted == null ? null : tainted.getRanges();
-        final String formatted = String.valueOf(parameter);
-        addParameterTaintedRanges(null, parameter, formatted, offset, parameterRanges, finalRanges);
-        offset += formatted.length();
-      }
-      if (finalRanges.isFull()) {
-        break;
-      }
-    }
-    if (!finalRanges.isEmpty()) {
-      to.taint(result, finalRanges.toArray());
-    }
-  }
-
-  @Override
-  @SuppressFBWarnings
-  public void onSplit(@Nonnull String self, @Nonnull String[] result) {
-    if (!canBeTainted(self) || !canBeTainted(result)) {
-      return;
-    }
-    if (result.length == 1 && result[0] == self) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects to = ctx.getTaintedObjects();
-    TaintedObject taintedString = to.get(self);
-    if (taintedString == null) {
-      return;
-    }
-    Range priorityRange = highestPriorityRange(taintedString.getRanges());
-    for (String s : result) {
-      to.taint(s, new Range[] {Ranges.copyWithPosition(priorityRange, 0, s.length())});
-    }
-  }
-
-  @Override
-  @SuppressFBWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ")
-  public void onStringStrip(@Nonnull String self, @Nonnull String result, boolean trailing) {
-    if (self == result || !canBeTainted(result)) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final TaintedObject taintedSelf = taintedObjects.get(self);
-    if (taintedSelf == null) {
-      return;
-    }
-
-    final Range[] rangesSelf = taintedSelf.getRanges();
-    if (rangesSelf.length == 0) {
-      return;
-    }
-
-    int offset = 0;
-    if (!trailing) {
-      while ((offset < self.length()) && (Character.isWhitespace(self.charAt(offset)))) {
-        offset++;
-      }
-    }
-
-    int resultLength = result.length();
-
-    final Range[] newRanges = Ranges.forSubstring(offset, resultLength, rangesSelf);
-
-    if (newRanges != null) {
-      taintedObjects.taint(result, newRanges);
-    }
-  }
-
-  @Override
-  @SuppressFBWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ")
-  public void onIndent(@Nonnull String self, int indentation, @Nonnull String result) {
-    if (self == result || !canBeTainted(self)) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final TaintedObject taintedSelf = taintedObjects.get(self);
-    if (taintedSelf == null) {
-      return;
-    }
-
-    final Range[] rangesSelf = taintedSelf.getRanges();
-    if (rangesSelf.length == 0) {
-      return;
+            ranges = mergeRanges(left.length(), taintedLeft.getRanges(), taintedRight.getRanges());
+        }
+        taintedObjects.taint(result, ranges);
     }
 
-    final Range[] newRanges = Ranges.forIndentation(self, indentation, rangesSelf);
-    if (newRanges != null) {
-      taintedObjects.taint(result, newRanges);
+    @Override
+    public void onStringBuilderInit(@Nonnull final CharSequence builder, @Nullable final CharSequence param) {
+        if (!canBeTainted(param)) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final TaintedObject paramTainted = taintedObjects.get(param);
+        if (paramTainted == null) {
+            return;
+        }
+        taintedObjects.taint(builder, paramTainted.getRanges());
     }
-  }
 
-  @Override
-  @SuppressFBWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ")
-  public void onStringReplace(
-      @Nonnull String self, char oldChar, char newChar, @Nonnull String result) {
-    if (self == result || !canBeTainted(result)) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
+    @Override
+    public void onStringBuilderAppend(@Nonnull final CharSequence builder, @Nullable final CharSequence param) {
+        if (!canBeTainted(builder) || !canBeTainted(param)) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final TaintedObject paramTainted = taintedObjects.get(param);
+        if (paramTainted == null) {
+            return;
+        }
+        final TaintedObject builderTainted = taintedObjects.get(builder);
+        final int shift = builder.length() - param.length();
+        if (builderTainted == null) {
+            final Range[] paramRanges = paramTainted.getRanges();
+            final Range[] ranges = new Range[paramRanges.length];
+            Ranges.copyShift(paramRanges, ranges, 0, shift);
+            taintedObjects.taint(builder, ranges);
+        } else {
+            final Range[] builderRanges = builderTainted.getRanges();
+            final Range[] paramRanges = paramTainted.getRanges();
+            final Range[] ranges = mergeRanges(shift, builderRanges, paramRanges);
+            builderTainted.setRanges(ranges);
+        }
     }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final TaintedObject taintedSelf = taintedObjects.get(self);
-    if (taintedSelf == null) {
-      return;
+
+    @Override
+    public void onStringBuilderAppend(@Nonnull CharSequence builder, @Nullable CharSequence param, int start, int end) {
+        if (!canBeTainted(builder) || !canBeTainted(param)) {
+            return;
+        }
+        if (start < 0 || end > param.length() || start > end) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final TaintedObject paramTainted = taintedObjects.get(param);
+        if (paramTainted == null) {
+            return;
+        }
+        // We get the ranges for the new substring that will be appended to the builder
+        final Range[] paramRanges = paramTainted.getRanges();
+        final Range[] newParamRanges = Ranges.forSubstring(start, end - start, paramRanges);
+        if (newParamRanges == null) {
+            return;
+        }
+        final TaintedObject builderTainted = taintedObjects.get(builder);
+        // If the builder is not tainted we must shift the ranges of the parameter
+        // Else we shift the ranges of the parameter and merge with the ranges of the builder
+        final int shift = builder.length() - (end - start);
+        if (builderTainted == null) {
+            final Range[] ranges = new Range[newParamRanges.length];
+            Ranges.copyShift(newParamRanges, ranges, 0, shift);
+            taintedObjects.taint(builder, ranges);
+        } else {
+            final Range[] builderRanges = builderTainted.getRanges();
+            final Range[] ranges = mergeRanges(shift, builderRanges, newParamRanges);
+            builderTainted.setRanges(ranges);
+        }
     }
 
-    final Range[] rangesSelf = taintedSelf.getRanges();
-    if (rangesSelf.length == 0) {
-      return;
+    @Override
+    public void onStringBuilderToString(@Nonnull final CharSequence builder, @Nonnull final String result) {
+        if (!canBeTainted(builder) || !canBeTainted(result)) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final TaintedObject to = taintedObjects.get(builder);
+        if (to == null) {
+            return;
+        }
+        taintedObjects.taint(result, to.getRanges());
+    }
+
+    @Override
+    public void onStringConcatFactory(
+            @Nullable final String result,
+            @Nullable final String[] args,
+            @Nullable final String recipe,
+            @Nullable final Object[] constants,
+            @Nonnull final int[] recipeOffsets) {
+        if (!canBeTainted(result) || !canBeTainted(args)) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final RangeBuilder targetRanges = new RangeBuilder();
+        int offset = 0;
+        for (int item : recipeOffsets) {
+            if (item < 0) {
+                offset -= item;
+            } else {
+                final String argument = args[item];
+                final Range[] ranges = getRanges(getTainted(taintedObjects, argument));
+                if (ranges.length > 0) {
+                    targetRanges.add(ranges, offset);
+                    if (targetRanges.isFull()) {
+                        break;
+                    }
+                }
+                offset += getToStringLength(argument);
+            }
+        }
+        if (!targetRanges.isEmpty()) {
+            taintedObjects.taint(result, targetRanges.toArray());
+        }
     }
 
-    taintedObjects.taint(result, rangesSelf);
-  }
+    @Override
+    public void onStringSubSequence(
+            @Nonnull CharSequence self, int beginIndex, int endIndex, @Nullable CharSequence result) {
+        if (self == result || !canBeTainted(result)) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final TaintedObject selfTainted = taintedObjects.get(self);
+        if (selfTainted == null) {
+            return;
+        }
+        final Range[] rangesSelf = selfTainted.getRanges();
+        if (rangesSelf.length == 0) {
+            return;
+        }
+        Range[] newRanges = Ranges.forSubstring(beginIndex, result.length(), rangesSelf);
+        if (newRanges != null && newRanges.length > 0) {
+            taintedObjects.taint(result, newRanges);
+        }
+    }
 
-  /** This method is used to make an {@code CallSite.Around} of the {@code String.replace} method */
-  @Override
-  public String onStringReplace(
-      @Nonnull String self, CharSequence oldCharSeq, CharSequence newCharSeq) {
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return self.replace(oldCharSeq, newCharSeq);
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final TaintedObject taintedSelf = taintedObjects.get(self);
-    Range[] rangesSelf = new Range[0];
-    if (taintedSelf != null) {
-      rangesSelf = taintedSelf.getRanges();
-    }
-
-    final TaintedObject taintedInput = taintedObjects.get(newCharSeq);
-    Range[] rangesInput = null;
-    if (taintedInput != null) {
-      rangesInput = taintedInput.getRanges();
-    }
-
-    if (rangesSelf.length == 0 && rangesInput == null) {
-      return self.replace(oldCharSeq, newCharSeq);
+    @Override
+    public void onStringJoin(
+            @Nullable String result, @Nonnull CharSequence delimiter, @Nonnull CharSequence[] elements) {
+        if (!canBeTainted(result)) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        // String.join may internally call StringJoiner, if StringJoiner did the job don't do it twice
+        if (getTainted(taintedObjects, result) != null) {
+            return;
+        }
+        final Range[] delimiterRanges = getRanges(getTainted(taintedObjects, delimiter));
+        final RangeBuilder targetRanges = new RangeBuilder();
+        int delimiterLength = getToStringLength(delimiter), offset = 0;
+        for (int i = 0; i < elements.length; i++) {
+            // insert element ranges
+            final CharSequence element = elements[i];
+            final Range[] ranges = getRanges(getTainted(taintedObjects, element));
+            if (ranges.length > 0) {
+                targetRanges.add(ranges, offset);
+                if (targetRanges.isFull()) {
+                    break;
+                }
+            }
+            offset += getToStringLength(element);
+
+            if (i < elements.length - 1) {
+                // add delimiter ranges
+                targetRanges.add(delimiterRanges, offset);
+                if (targetRanges.isFull()) {
+                    break;
+                }
+                offset += delimiterLength;
+            }
+        }
+        if (!targetRanges.isEmpty()) {
+            taintedObjects.taint(result, targetRanges.toArray());
+        }
     }
 
-    return StringUtils.replaceAndTaint(
-        taintedObjects,
-        self,
-        Pattern.compile(oldCharSeq.toString(), Pattern.LITERAL),
-        newCharSeq.toString(),
-        rangesSelf,
-        rangesInput,
-        Integer.MAX_VALUE);
-  }
-
-  /**
-   * This method is used to make an {@code CallSite.Around} of the {@code String.replaceFirst} and
-   * {@code String.replaceAll} methods
-   */
-  @Override
-  @SuppressForbidden
-  public String onStringReplace(
-      @Nonnull String self, String regex, String replacement, int numReplacements) {
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      if (numReplacements > 1) {
-        return self.replaceAll(regex, replacement);
-      } else {
-        return self.replaceFirst(regex, replacement);
-      }
-    }
-
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final TaintedObject taintedSelf = taintedObjects.get(self);
-    Range[] rangesSelf = new Range[0];
-    if (taintedSelf != null) {
-      rangesSelf = taintedSelf.getRanges();
-    }
-
-    final TaintedObject taintedInput = taintedObjects.get(replacement);
-    Range[] rangesInput = null;
-    if (taintedInput != null) {
-      rangesInput = taintedInput.getRanges();
-    }
-
-    if (rangesSelf.length == 0 && rangesInput == null) {
-      if (numReplacements > 1) {
-        return self.replaceAll(regex, replacement);
-      } else {
-        return self.replaceFirst(regex, replacement);
-      }
-    }
-
-    return StringUtils.replaceAndTaint(
-        taintedObjects,
-        self,
-        Pattern.compile(regex),
-        replacement,
-        rangesSelf,
-        rangesInput,
-        numReplacements);
-  }
-
-  @Override
-  public void onStringValueOf(Object param, @Nonnull String result) {
-    if (param == null || !canBeTainted(result)) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-
-    if (param instanceof Taintable) {
-      final Taintable taintable = (Taintable) param;
-      if (!taintable.$DD$isTainted()) {
-        return;
-      }
-      final Source source = (Source) taintable.$$DD$getSource();
-      final Range[] ranges =
-          Ranges.forCharSequence(
-              result, new Source(source.getOrigin(), source.getName(), source.getValue()));
-
-      taintedObjects.taint(result, ranges);
-    } else {
-      final TaintedObject taintedParam = taintedObjects.get(param);
-      if (taintedParam == null) {
-        return;
-      }
-
-      final Range[] rangesParam = taintedParam.getRanges();
-      if (rangesParam.length == 0) {
-        return;
-      }
-
-      // Special objects like InputStream...
-      if (rangesParam[0].getLength() == Integer.MAX_VALUE) {
-        final Source source = rangesParam[0].getSource();
-        final Range[] ranges =
-            Ranges.forCharSequence(
-                result, new Source(source.getOrigin(), source.getName(), source.getValue()));
+    @Override
+    @SuppressFBWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ")
+    public void onStringTranslateEscapes(@Nonnull String self, @Nullable String result) {
+        if (!canBeTainted(result)) {
+            return;
+        }
+        if (self == result) { // same ref, no change in taint status
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final TaintedObject taintedSelf = taintedObjects.get(self);
+        if (taintedSelf == null) {
+            return; // original string is not tainted
+        }
+        taintedObjects.taint(result, taintedSelf.getRanges()); // only possibility left
+    }
 
+    @Override
+    @SuppressFBWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ")
+    public void onStringRepeat(@Nonnull String self, int count, @Nonnull String result) {
+        if (!canBeTainted(self) || !canBeTainted(result) || self == result) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final Range[] selfRanges = getRanges(taintedObjects.get(self));
+        if (selfRanges.length == 0) {
+            return;
+        }
+        final Range[] ranges = Ranges.newArray(selfRanges.length * (long) count);
+        int rangeIndex = 0;
+        for (int i = 0; i < count; i++) {
+            rangeIndex = insertRange(ranges, selfRanges, i * self.length(), rangeIndex);
+            if (rangeIndex >= ranges.length) {
+                break;
+            }
+        }
         taintedObjects.taint(result, ranges);
-      } else {
-        taintedObjects.taint(result, rangesParam);
-      }
-    }
-  }
-
-  @Override
-  public void onStringBuilderSetLength(@Nonnull CharSequence self, int length) {
-    if (self.length() != length) {
-      return;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
-    }
-    final TaintedObjects taintedObjects = ctx.getTaintedObjects();
-    final TaintedObject selfTainted = taintedObjects.get(self);
-    if (selfTainted == null) {
-      return;
-    }
-    final Range[] rangesSelf = selfTainted.getRanges();
-    if (rangesSelf.length == 0) {
-      return;
-    }
-    Range[] newRanges = Ranges.forSubstring(0, length, rangesSelf);
-    if (newRanges != null && newRanges.length > 0) {
-      selfTainted.setRanges(newRanges);
-    } else {
-      selfTainted.clear();
-    }
-  }
-
-  /**
-   * Adds the tainted ranges belonging to the current parameter added via placeholder taking care of
-   * an optional tainted placeholder.
-   *
-   * @param placeholderRange tainted range of the placeholder or {@code null} if not tainted
-   * @param param value of the parameter
-   * @param formatted parameter as a string
-   * @param offset offset from the beginning of the format string
-   * @param ranges tainted ranges of the parameter
-   * @param finalRanges result with all ranges
-   */
-  private void addParameterTaintedRanges(
-      @Nullable final Range placeholderRange,
-      final Object param,
-      final String formatted,
-      final int offset,
-      @Nullable final Range[] ranges,
-      /* out */ final RangeBuilder finalRanges) {
-    if (ranges != null && ranges.length > 0) {
-      // only shift ranges if they are character sequences of the same length, otherwise taint the
-      // whole thing
-      if (charSequencesOfSameLength(param, formatted)) {
-        finalRanges.add(ranges, offset);
-      } else {
-        finalRanges.add(Ranges.copyWithPosition(ranges[0], offset, formatted.length()));
-      }
-    } else if (placeholderRange != null) {
-      finalRanges.add(Ranges.copyWithPosition(placeholderRange, offset, formatted.length()));
-    }
-  }
-
-  /**
-   * Adds all the ranges contained in the format string before the current placeholder.
-   *
-   * @param placeholderPos location of the current placeholder
-   * @param offset offset from the beginning of the format string
-   * @param ranges queue of format string ranges
-   * @param finalRanges result with all ranges
-   * @return tainted range of the placeholder or {@code null} if not tainted
-   */
-  @Nullable
-  private Range addFormatTaintedRanges(
-      final Ranged placeholderPos,
-      final int offset,
-      final Deque<Range> ranges,
-      /* out */ final RangeBuilder finalRanges) {
-    Range formatRange;
-    int end = placeholderPos.getStart() + placeholderPos.getLength();
-    Range placeholderRange = null;
-    while ((formatRange = ranges.peek()) != null && formatRange.getStart() < end) {
-      ranges.poll();
-
-      // check if the placeholder was tainted
-      if (placeholderRange == null) {
-        placeholderRange = placeholderPos.intersects(formatRange) ? formatRange : null;
-      }
-
-      // 1. remove the placeholder range from the format one
-      // 2. append ranges located before tha placeholder
-      // 3. enqueue the remaining ones
-      for (final Ranged disjoint : formatRange.remove(placeholderPos)) {
-        final Range newFormatRange =
-            Ranges.copyWithPosition(formatRange, disjoint.getStart(), disjoint.getLength());
-        if (newFormatRange.getStart() < placeholderPos.getStart()) {
-          finalRanges.add(newFormatRange.shift(offset));
+    }
+
+    private static int getToStringLength(@Nullable final CharSequence s) {
+        return s == null ? NULL_STR_LENGTH : s.length();
+    }
+
+    @Override
+    public void onStringToUpperCase(@Nonnull String self, @Nullable String result) {
+        onStringCaseChanged(self, result);
+    }
+
+    @Override
+    public void onStringToLowerCase(@Nonnull String self, @Nullable String result) {
+        onStringCaseChanged(self, result);
+    }
+
+    @SuppressFBWarnings
+    public void onStringCaseChanged(@Nonnull String self, @Nullable String result) {
+        if (!canBeTainted(result)) {
+            return;
+        }
+        if (self == result) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final TaintedObject taintedSelf = taintedObjects.get(self);
+        if (taintedSelf == null) {
+            return;
+        }
+        final Range[] rangesSelf = taintedSelf.getRanges();
+        if (null == rangesSelf || rangesSelf.length == 0) {
+            return;
+        }
+        if (result.length() == self.length()) {
+            taintedObjects.taint(result, rangesSelf);
+            return;
+        }
+        if (result.length() >= self.length()) {
+            taintedObjects.taint(result, rangesSelf);
+        } // Pathological case where the string's length actually becomes smaller
+        else {
+            stringCaseChangedWithReducedSize(rangesSelf, taintedObjects, result);
+        }
+    }
+
+    private void stringCaseChangedWithReducedSize(
+            final Range[] rangesSelf, final TaintedObjects taintedObjects, @Nonnull String result) {
+        int skippedRanges = 0;
+        Range adjustedRange = null;
+        for (int i = rangesSelf.length - 1; i >= 0; i--) {
+            Range currentRange = rangesSelf[i];
+            if (currentRange.getStart() >= result.length()) {
+                skippedRanges++;
+            } else if (currentRange.getStart() + currentRange.getLength() >= result.length()) {
+                adjustedRange = Ranges.copyWithPosition(
+                        currentRange, currentRange.getStart(), result.length() - currentRange.getStart());
+            }
+        }
+        Range[] newRanges = new Range[rangesSelf.length - skippedRanges];
+        System.arraycopy(rangesSelf, 0, newRanges, 0, newRanges.length);
+
+        if (null != adjustedRange) {
+            newRanges[newRanges.length - 1] = adjustedRange;
+        }
+        taintedObjects.taint(result, newRanges);
+    }
+
+    /** Inserts the range in the selected position and returns the new position for further ranges */
+    private static int insertRange(
+            final Range[] targetRanges, final Range[] ranges, final int offset, final int rangeIndex) {
+        if (ranges.length == 0) {
+            return rangeIndex;
+        }
+        final int count = Math.min(targetRanges.length - rangeIndex, ranges.length);
+        Ranges.copyShift(ranges, targetRanges, rangeIndex, offset, count);
+        return rangeIndex + count;
+    }
+
+    private static Range[] getRanges(@Nullable final TaintedObject taintedObject) {
+        return taintedObject == null ? EMPTY : taintedObject.getRanges();
+    }
+
+    @Override
+    @SuppressFBWarnings
+    public void onStringTrim(@Nonnull final String self, @Nullable final String result) {
+        if (!canBeTainted(result)) {
+            return;
+        }
+        if (self == result) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final TaintedObject taintedSelf = taintedObjects.get(self);
+        if (taintedSelf == null) {
+            return;
+        }
+
+        int offset = 0;
+        while ((offset < self.length()) && (self.charAt(offset) <= ' ')) {
+            offset++;
+        }
+
+        int resultLength = result.length();
+
+        final Range[] rangesSelf = taintedSelf.getRanges();
+        if (null == rangesSelf || rangesSelf.length == 0) {
+            return;
+        }
+
+        final Range[] newRanges = Ranges.forSubstring(offset, resultLength, rangesSelf);
+
+        if (null != newRanges) {
+            taintedObjects.taint(result, newRanges);
+        }
+    }
+
+    @Override
+    public void onStringConstructor(@Nonnull CharSequence self, @Nonnull String result) {
+        if (!canBeTainted(self)) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final Range[] selfRanges = getRanges(taintedObjects.get(self));
+        if (selfRanges.length == 0) {
+            return;
+        }
+        taintedObjects.taint(result, selfRanges);
+    }
+
+    @Override
+    public void onStringFormat(
+            @Nonnull final String format, @Nonnull final Object[] params, @Nonnull final String result) {
+        onStringFormat(null, format, params, result);
+    }
+
+    @Override
+    public void onStringFormat(
+            @Nullable final Locale locale,
+            @Nonnull final String format,
+            @Nonnull final Object[] parameters,
+            @Nonnull final String result) {
+        if (!canBeTainted(result)) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects to = ctx.getTaintedObjects();
+        final Deque<Range> formatRanges = new LinkedList<>();
+        final TaintedObject formatTainted = to.get(format);
+        if (formatTainted != null) {
+            formatRanges.addAll(Arrays.asList(formatTainted.getRanges()));
+        }
+        // params can appear zero or multiple times in the pattern so the final number of ranges is
+        // unknown beforehand
+        final RangeBuilder finalRanges = new RangeBuilder();
+        final Matcher matcher = FORMAT_PATTERN.matcher(format);
+        int offset = 0, paramIndex = 0;
+        while (matcher.find()) {
+            final String placeholder = matcher.group();
+            final Object parameter;
+            final String formattedValue;
+            final TaintedObject taintedObject;
+            final String escaped = ESCAPED_PATTERNS.get(placeholder);
+            if (escaped != null) {
+                parameter = placeholder;
+                formattedValue = escaped;
+                taintedObject = null;
+            } else {
+                final String index = matcher.group("index");
+                if (index != null) {
+                    // indexes are 1-based
+                    final int parsedIndex = Integer.parseInt(index.substring(0, index.length() - 1)) - 1;
+                    // remove the index before the formatting without increment the current state
+                    parameter = parameters[parsedIndex];
+                    formattedValue = formatValue(locale, placeholder.replace(index, ""), parameter);
+                } else {
+                    if (!checkParameterBounds(format, parameters, paramIndex)) {
+                        return; // return without tainting the string in case of error
+                    }
+                    parameter = parameters[paramIndex++];
+                    formattedValue = formatValue(locale, placeholder, parameter);
+                }
+                taintedObject = to.get(parameter);
+            }
+            final Ranged placeholderPos = Ranged.build(matcher.start(), placeholder.length());
+            final Range placeholderRange = addFormatTaintedRanges(placeholderPos, offset, formatRanges, finalRanges);
+            final Range[] paramRanges = taintedObject == null ? null : taintedObject.getRanges();
+            final int shift = placeholderPos.getStart() + offset;
+            addParameterTaintedRanges(placeholderRange, parameter, formattedValue, shift, paramRanges, finalRanges);
+            offset += (formattedValue.length() - placeholder.length());
+            if (finalRanges.isFull()) {
+                break;
+            }
+        }
+        addFormatTaintedRanges(END, offset, formatRanges, finalRanges); // add remaining ranges from the format
+        if (!finalRanges.isEmpty()) {
+            to.taint(result, finalRanges.toArray());
+        }
+    }
+
+    private static boolean checkParameterBounds(final String format, final Object[] parameters, int paramIndex) {
+        if (paramIndex < parameters.length) {
+            return true;
+        }
+        LOG.debug(
+                SEND_TELEMETRY,
+                "Error handling string format pattern {} with args {} at index {}",
+                format,
+                parameters.length,
+                paramIndex);
+        return false;
+    }
+
+    /**
+     * Formats a value using String.format with telemtry report on IllegalFormatException.
+     *
+     * @param locale the locale to use for formatting
+     * @param placeholder the format placeholder (e.g., "%f", "%d")
+     * @param parameter the parameter to format
+     * @return the formatted value
+     */
+    private static String formatValue(@Nullable final Locale locale, final String placeholder, final Object parameter) {
+        try {
+            return String.format(locale, placeholder, parameter);
+        } catch (final java.util.IllegalFormatException e) {
+            // Send telemetry to improve future bug fixes
+            LOG.debug(
+                    SEND_TELEMETRY,
+                    "Format conversion failed for placeholder {} with parameter type {}: {}",
+                    placeholder,
+                    parameter == null ? "null" : parameter.getClass().getName(),
+                    e.getMessage());
+            throw e;
+        }
+    }
+
+    @Override
+    public void onStringFormat(
+            @Nonnull final Iterable<String> literals,
+            @Nonnull final Object[] parameters,
+            @Nonnull final String result) {
+        if (!canBeTainted(result)) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects to = ctx.getTaintedObjects();
+        // since we might join ranges the final number is unknown beforehand
+        final RangeBuilder finalRanges = new RangeBuilder();
+        int offset = 0, paramIndex = 0;
+        for (final Iterator<String> it = literals.iterator(); it.hasNext(); ) {
+            final String literal = it.next();
+            offset += literal.length();
+            if (it.hasNext() && paramIndex < parameters.length) {
+                final Object parameter = parameters[paramIndex++];
+                final TaintedObject tainted = to.get(parameter);
+                final Range[] parameterRanges = tainted == null ? null : tainted.getRanges();
+                final String formatted = String.valueOf(parameter);
+                addParameterTaintedRanges(null, parameter, formatted, offset, parameterRanges, finalRanges);
+                offset += formatted.length();
+            }
+            if (finalRanges.isFull()) {
+                break;
+            }
+        }
+        if (!finalRanges.isEmpty()) {
+            to.taint(result, finalRanges.toArray());
+        }
+    }
+
+    @Override
+    @SuppressFBWarnings
+    public void onSplit(@Nonnull String self, @Nonnull String[] result) {
+        if (!canBeTainted(self) || !canBeTainted(result)) {
+            return;
+        }
+        if (result.length == 1 && result[0] == self) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects to = ctx.getTaintedObjects();
+        TaintedObject taintedString = to.get(self);
+        if (taintedString == null) {
+            return;
+        }
+        Range priorityRange = highestPriorityRange(taintedString.getRanges());
+        for (String s : result) {
+            to.taint(s, new Range[] {Ranges.copyWithPosition(priorityRange, 0, s.length())});
+        }
+    }
+
+    @Override
+    @SuppressFBWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ")
+    public void onStringStrip(@Nonnull String self, @Nonnull String result, boolean trailing) {
+        if (self == result || !canBeTainted(result)) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final TaintedObject taintedSelf = taintedObjects.get(self);
+        if (taintedSelf == null) {
+            return;
+        }
+
+        final Range[] rangesSelf = taintedSelf.getRanges();
+        if (rangesSelf.length == 0) {
+            return;
+        }
+
+        int offset = 0;
+        if (!trailing) {
+            while ((offset < self.length()) && (Character.isWhitespace(self.charAt(offset)))) {
+                offset++;
+            }
+        }
+
+        int resultLength = result.length();
+
+        final Range[] newRanges = Ranges.forSubstring(offset, resultLength, rangesSelf);
+
+        if (newRanges != null) {
+            taintedObjects.taint(result, newRanges);
+        }
+    }
+
+    @Override
+    @SuppressFBWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ")
+    public void onIndent(@Nonnull String self, int indentation, @Nonnull String result) {
+        if (self == result || !canBeTainted(self)) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final TaintedObject taintedSelf = taintedObjects.get(self);
+        if (taintedSelf == null) {
+            return;
+        }
+
+        final Range[] rangesSelf = taintedSelf.getRanges();
+        if (rangesSelf.length == 0) {
+            return;
+        }
+
+        final Range[] newRanges = Ranges.forIndentation(self, indentation, rangesSelf);
+        if (newRanges != null) {
+            taintedObjects.taint(result, newRanges);
+        }
+    }
+
+    @Override
+    @SuppressFBWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ")
+    public void onStringReplace(@Nonnull String self, char oldChar, char newChar, @Nonnull String result) {
+        if (self == result || !canBeTainted(result)) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final TaintedObject taintedSelf = taintedObjects.get(self);
+        if (taintedSelf == null) {
+            return;
+        }
+
+        final Range[] rangesSelf = taintedSelf.getRanges();
+        if (rangesSelf.length == 0) {
+            return;
+        }
+
+        taintedObjects.taint(result, rangesSelf);
+    }
+
+    /** This method is used to make an {@code CallSite.Around} of the {@code String.replace} method */
+    @Override
+    public String onStringReplace(@Nonnull String self, CharSequence oldCharSeq, CharSequence newCharSeq) {
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return self.replace(oldCharSeq, newCharSeq);
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final TaintedObject taintedSelf = taintedObjects.get(self);
+        Range[] rangesSelf = new Range[0];
+        if (taintedSelf != null) {
+            rangesSelf = taintedSelf.getRanges();
+        }
+
+        final TaintedObject taintedInput = taintedObjects.get(newCharSeq);
+        Range[] rangesInput = null;
+        if (taintedInput != null) {
+            rangesInput = taintedInput.getRanges();
+        }
+
+        if (rangesSelf.length == 0 && rangesInput == null) {
+            return self.replace(oldCharSeq, newCharSeq);
+        }
+
+        return StringUtils.replaceAndTaint(
+                taintedObjects,
+                self,
+                Pattern.compile(oldCharSeq.toString(), Pattern.LITERAL),
+                newCharSeq.toString(),
+                rangesSelf,
+                rangesInput,
+                Integer.MAX_VALUE);
+    }
+
+    /**
+     * This method is used to make an {@code CallSite.Around} of the {@code String.replaceFirst} and
+     * {@code String.replaceAll} methods
+     */
+    @Override
+    @SuppressForbidden
+    public String onStringReplace(@Nonnull String self, String regex, String replacement, int numReplacements) {
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            if (numReplacements > 1) {
+                return self.replaceAll(regex, replacement);
+            } else {
+                return self.replaceFirst(regex, replacement);
+            }
+        }
+
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final TaintedObject taintedSelf = taintedObjects.get(self);
+        Range[] rangesSelf = new Range[0];
+        if (taintedSelf != null) {
+            rangesSelf = taintedSelf.getRanges();
+        }
+
+        final TaintedObject taintedInput = taintedObjects.get(replacement);
+        Range[] rangesInput = null;
+        if (taintedInput != null) {
+            rangesInput = taintedInput.getRanges();
+        }
+
+        if (rangesSelf.length == 0 && rangesInput == null) {
+            if (numReplacements > 1) {
+                return self.replaceAll(regex, replacement);
+            } else {
+                return self.replaceFirst(regex, replacement);
+            }
+        }
+
+        return StringUtils.replaceAndTaint(
+                taintedObjects, self, Pattern.compile(regex), replacement, rangesSelf, rangesInput, numReplacements);
+    }
+
+    @Override
+    public void onStringValueOf(Object param, @Nonnull String result) {
+        if (param == null || !canBeTainted(result)) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+
+        if (param instanceof Taintable) {
+            final Taintable taintable = (Taintable) param;
+            if (!taintable.$DD$isTainted()) {
+                return;
+            }
+            final Source source = (Source) taintable.$$DD$getSource();
+            final Range[] ranges =
+                    Ranges.forCharSequence(result, new Source(source.getOrigin(), source.getName(), source.getValue()));
+
+            taintedObjects.taint(result, ranges);
         } else {
-          ranges.addFirst(newFormatRange);
+            final TaintedObject taintedParam = taintedObjects.get(param);
+            if (taintedParam == null) {
+                return;
+            }
+
+            final Range[] rangesParam = taintedParam.getRanges();
+            if (rangesParam.length == 0) {
+                return;
+            }
+
+            // Special objects like InputStream...
+            if (rangesParam[0].getLength() == Integer.MAX_VALUE) {
+                final Source source = rangesParam[0].getSource();
+                final Range[] ranges = Ranges.forCharSequence(
+                        result, new Source(source.getOrigin(), source.getName(), source.getValue()));
+
+                taintedObjects.taint(result, ranges);
+            } else {
+                taintedObjects.taint(result, rangesParam);
+            }
         }
-      }
     }
-    return placeholderRange;
-  }
 
-  private boolean charSequencesOfSameLength(final Object param, final CharSequence param2) {
-    if (!(param instanceof CharSequence) || param2 == null) {
-      return false;
+    @Override
+    public void onStringBuilderSetLength(@Nonnull CharSequence self, int length) {
+        if (self.length() != length) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        final TaintedObjects taintedObjects = ctx.getTaintedObjects();
+        final TaintedObject selfTainted = taintedObjects.get(self);
+        if (selfTainted == null) {
+            return;
+        }
+        final Range[] rangesSelf = selfTainted.getRanges();
+        if (rangesSelf.length == 0) {
+            return;
+        }
+        Range[] newRanges = Ranges.forSubstring(0, length, rangesSelf);
+        if (newRanges != null && newRanges.length > 0) {
+            selfTainted.setRanges(newRanges);
+        } else {
+            selfTainted.clear();
+        }
+    }
+
+    /**
+     * Adds the tainted ranges belonging to the current parameter added via placeholder taking care of
+     * an optional tainted placeholder.
+     *
+     * @param placeholderRange tainted range of the placeholder or {@code null} if not tainted
+     * @param param value of the parameter
+     * @param formatted parameter as a string
+     * @param offset offset from the beginning of the format string
+     * @param ranges tainted ranges of the parameter
+     * @param finalRanges result with all ranges
+     */
+    private void addParameterTaintedRanges(
+            @Nullable final Range placeholderRange,
+            final Object param,
+            final String formatted,
+            final int offset,
+            @Nullable final Range[] ranges,
+            /* out */ final RangeBuilder finalRanges) {
+        if (ranges != null && ranges.length > 0) {
+            // only shift ranges if they are character sequences of the same length, otherwise taint the
+            // whole thing
+            if (charSequencesOfSameLength(param, formatted)) {
+                finalRanges.add(ranges, offset);
+            } else {
+                finalRanges.add(Ranges.copyWithPosition(ranges[0], offset, formatted.length()));
+            }
+        } else if (placeholderRange != null) {
+            finalRanges.add(Ranges.copyWithPosition(placeholderRange, offset, formatted.length()));
+        }
+    }
+
+    /**
+     * Adds all the ranges contained in the format string before the current placeholder.
+     *
+     * @param placeholderPos location of the current placeholder
+     * @param offset offset from the beginning of the format string
+     * @param ranges queue of format string ranges
+     * @param finalRanges result with all ranges
+     * @return tainted range of the placeholder or {@code null} if not tainted
+     */
+    @Nullable
+    private Range addFormatTaintedRanges(
+            final Ranged placeholderPos,
+            final int offset,
+            final Deque<Range> ranges,
+            /* out */ final RangeBuilder finalRanges) {
+        Range formatRange;
+        int end = placeholderPos.getStart() + placeholderPos.getLength();
+        Range placeholderRange = null;
+        while ((formatRange = ranges.peek()) != null && formatRange.getStart() < end) {
+            ranges.poll();
+
+            // check if the placeholder was tainted
+            if (placeholderRange == null) {
+                placeholderRange = placeholderPos.intersects(formatRange) ? formatRange : null;
+            }
+
+            // 1. remove the placeholder range from the format one
+            // 2. append ranges located before tha placeholder
+            // 3. enqueue the remaining ones
+            for (final Ranged disjoint : formatRange.remove(placeholderPos)) {
+                final Range newFormatRange =
+                        Ranges.copyWithPosition(formatRange, disjoint.getStart(), disjoint.getLength());
+                if (newFormatRange.getStart() < placeholderPos.getStart()) {
+                    finalRanges.add(newFormatRange.shift(offset));
+                } else {
+                    ranges.addFirst(newFormatRange);
+                }
+            }
+        }
+        return placeholderRange;
+    }
+
+    private boolean charSequencesOfSameLength(final Object param, final CharSequence param2) {
+        if (!(param instanceof CharSequence) || param2 == null) {
+            return false;
+        }
+        return ((CharSequence) param).length() == param2.length();
     }
-    return ((CharSequence) param).length() == param2.length();
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/AbstractMethodAdapter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/AbstractMethodAdapter.java
index 0cd8663b7e5..60f0c11694b 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/AbstractMethodAdapter.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/AbstractMethodAdapter.java
@@ -7,39 +7,35 @@
 
 public class AbstractMethodAdapter extends MethodVisitor {
 
-  private static final String HELPER =
-      "datadog/trace/api/iast/securitycontrol/SecurityControlHelper";
-  private static final String METHOD = "setSecureMarks";
-  private static final String DESCRIPTOR = "(Ljava/lang/Object;I)V";
-  protected final MethodVisitor mv;
-  protected final SecurityControl securityControl;
-  protected final int accessFlags;
-  protected final Type method;
+    private static final String HELPER = "datadog/trace/api/iast/securitycontrol/SecurityControlHelper";
+    private static final String METHOD = "setSecureMarks";
+    private static final String DESCRIPTOR = "(Ljava/lang/Object;I)V";
+    protected final MethodVisitor mv;
+    protected final SecurityControl securityControl;
+    protected final int accessFlags;
+    protected final Type method;
 
-  public AbstractMethodAdapter(
-      final MethodVisitor mv,
-      final SecurityControl securityControl,
-      final int accessFlags,
-      final Type method) {
-    super(Opcodes.ASM9, mv);
-    this.mv = mv;
-    this.securityControl = securityControl;
-    this.accessFlags = accessFlags;
-    this.method = method;
-  }
+    public AbstractMethodAdapter(
+            final MethodVisitor mv, final SecurityControl securityControl, final int accessFlags, final Type method) {
+        super(Opcodes.ASM9, mv);
+        this.mv = mv;
+        this.securityControl = securityControl;
+        this.accessFlags = accessFlags;
+        this.method = method;
+    }
 
-  protected boolean isStatic() {
-    return (accessFlags & Opcodes.ACC_STATIC) > 0;
-  }
+    protected boolean isStatic() {
+        return (accessFlags & Opcodes.ACC_STATIC) > 0;
+    }
 
-  /**
-   * This method loads the current secure marks defined in the control and then calls the helper
-   * method
-   */
-  protected void loadMarksAndCallHelper() {
-    // Load the marks from securityControl onto the stack
-    mv.visitLdcInsn(securityControl.getMarks());
-    // Insert the call to setSecureMarks with the return value and marks as parameters
-    mv.visitMethodInsn(Opcodes.INVOKESTATIC, HELPER, METHOD, DESCRIPTOR, false);
-  }
+    /**
+     * This method loads the current secure marks defined in the control and then calls the helper
+     * method
+     */
+    protected void loadMarksAndCallHelper() {
+        // Load the marks from securityControl onto the stack
+        mv.visitLdcInsn(securityControl.getMarks());
+        // Insert the call to setSecureMarks with the return value and marks as parameters
+        mv.visitMethodInsn(Opcodes.INVOKESTATIC, HELPER, METHOD, DESCRIPTOR, false);
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/IastSecurityControlTransformer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/IastSecurityControlTransformer.java
index b15e7abeeb6..d33530bf3f2 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/IastSecurityControlTransformer.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/IastSecurityControlTransformer.java
@@ -16,36 +16,35 @@
 
 public class IastSecurityControlTransformer implements ClassFileTransformer {
 
-  private static final Logger LOGGER =
-      LoggerFactory.getLogger(IastSecurityControlTransformer.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(IastSecurityControlTransformer.class);
 
-  private final Map<String, List<SecurityControl>> securityControls;
+    private final Map<String, List<SecurityControl>> securityControls;
 
-  public IastSecurityControlTransformer(Map<String, List<SecurityControl>> securityControls) {
-    this.securityControls = securityControls;
-  }
-
-  @Override
-  @Nullable
-  public byte[] transform(
-      ClassLoader loader,
-      String className,
-      Class<?> classBeingRedefined,
-      java.security.ProtectionDomain protectionDomain,
-      byte[] classfileBuffer) {
-    List<SecurityControl> match = securityControls.get(className);
-    if (match == null || match.isEmpty()) {
-      return null; // Do not transform classes that do not have a security control
+    public IastSecurityControlTransformer(Map<String, List<SecurityControl>> securityControls) {
+        this.securityControls = securityControls;
     }
-    try {
-      ClassReader cr = new ClassReader(classfileBuffer);
-      ClassWriter cw = new ClassWriter(cr, ClassWriter.COMPUTE_FRAMES);
-      ClassVisitor cv = new SecurityControlMethodClassVisitor(cw, match);
-      cr.accept(cv, SKIP_DEBUG | SKIP_FRAMES);
-      return cw.toByteArray();
-    } catch (Throwable e) {
-      LOGGER.warn("Failed to transform class: {}", className, e);
-      return null;
+
+    @Override
+    @Nullable
+    public byte[] transform(
+            ClassLoader loader,
+            String className,
+            Class<?> classBeingRedefined,
+            java.security.ProtectionDomain protectionDomain,
+            byte[] classfileBuffer) {
+        List<SecurityControl> match = securityControls.get(className);
+        if (match == null || match.isEmpty()) {
+            return null; // Do not transform classes that do not have a security control
+        }
+        try {
+            ClassReader cr = new ClassReader(classfileBuffer);
+            ClassWriter cw = new ClassWriter(cr, ClassWriter.COMPUTE_FRAMES);
+            ClassVisitor cv = new SecurityControlMethodClassVisitor(cw, match);
+            cr.accept(cv, SKIP_DEBUG | SKIP_FRAMES);
+            return cw.toByteArray();
+        } catch (Throwable e) {
+            LOGGER.warn("Failed to transform class: {}", className, e);
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/InputValidatorMethodAdapter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/InputValidatorMethodAdapter.java
index def0bde8ba6..a3b3cb6761b 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/InputValidatorMethodAdapter.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/InputValidatorMethodAdapter.java
@@ -10,54 +10,50 @@
 
 public class InputValidatorMethodAdapter extends AbstractMethodAdapter {
 
-  private final boolean isStatic;
-
-  public InputValidatorMethodAdapter(
-      final MethodVisitor mv,
-      final SecurityControl securityControl,
-      final int accessFlags,
-      final Type method) {
-    super(mv, securityControl, accessFlags, method);
-    isStatic = isStatic();
-  }
-
-  @Override
-  public void visitCode() {
-    super.visitCode();
-    processInputValidator();
-  }
-
-  private void processInputValidator() {
-    boolean allParameters = securityControl.getParametersToMark() == null;
-    Type[] types = method.getArgumentTypes();
-    int parametersCount = 0;
-    for (int i = 0; i < types.length; i++) {
-      Type type = types[i];
-      boolean isPrimitive = isPrimitive(type);
-      if (allParameters) {
-        if (!isPrimitive) {
-          callInputValidation(parametersCount);
-        }
-      } else if (securityControl.getParametersToMark().get(i)) {
-        if (isPrimitive) {
-          LOGGER.warn(
-              "Input validators should not be used on primitive types. Parameter {} with type {} .Security control: {}",
-              i,
-              type.getClassName(),
-              securityControl);
-        } else {
-          callInputValidation(parametersCount);
+    private final boolean isStatic;
+
+    public InputValidatorMethodAdapter(
+            final MethodVisitor mv, final SecurityControl securityControl, final int accessFlags, final Type method) {
+        super(mv, securityControl, accessFlags, method);
+        isStatic = isStatic();
+    }
+
+    @Override
+    public void visitCode() {
+        super.visitCode();
+        processInputValidator();
+    }
+
+    private void processInputValidator() {
+        boolean allParameters = securityControl.getParametersToMark() == null;
+        Type[] types = method.getArgumentTypes();
+        int parametersCount = 0;
+        for (int i = 0; i < types.length; i++) {
+            Type type = types[i];
+            boolean isPrimitive = isPrimitive(type);
+            if (allParameters) {
+                if (!isPrimitive) {
+                    callInputValidation(parametersCount);
+                }
+            } else if (securityControl.getParametersToMark().get(i)) {
+                if (isPrimitive) {
+                    LOGGER.warn(
+                            "Input validators should not be used on primitive types. Parameter {} with type {} .Security control: {}",
+                            i,
+                            type.getClassName(),
+                            securityControl);
+                } else {
+                    callInputValidation(parametersCount);
+                }
+            }
+            parametersCount += type.getSize();
         }
-      }
-      parametersCount += type.getSize();
     }
-  }
-
-  private void callInputValidation(int i) {
-    // Load the parameter onto the stack
-    mv.visitVarInsn(
-        Opcodes.ALOAD,
-        isStatic ? i : i + 1); // instance methods have this as first element in the stack
-    loadMarksAndCallHelper();
-  }
+
+    private void callInputValidation(int i) {
+        // Load the parameter onto the stack
+        mv.visitVarInsn(
+                Opcodes.ALOAD, isStatic ? i : i + 1); // instance methods have this as first element in the stack
+        loadMarksAndCallHelper();
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/SanitizerMethodAdapter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/SanitizerMethodAdapter.java
index 26502759f42..09516fa4c3d 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/SanitizerMethodAdapter.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/SanitizerMethodAdapter.java
@@ -7,25 +7,22 @@
 
 public class SanitizerMethodAdapter extends AbstractMethodAdapter {
 
-  public SanitizerMethodAdapter(
-      final MethodVisitor mv,
-      final SecurityControl securityControl,
-      final int accessFlags,
-      final Type method) {
-    super(mv, securityControl, accessFlags, method);
-  }
+    public SanitizerMethodAdapter(
+            final MethodVisitor mv, final SecurityControl securityControl, final int accessFlags, final Type method) {
+        super(mv, securityControl, accessFlags, method);
+    }
 
-  @Override
-  public void visitInsn(int opcode) {
-    if (opcode == Opcodes.ARETURN) {
-      processSanitizer();
+    @Override
+    public void visitInsn(int opcode) {
+        if (opcode == Opcodes.ARETURN) {
+            processSanitizer();
+        }
+        super.visitInsn(opcode);
     }
-    super.visitInsn(opcode);
-  }
 
-  private void processSanitizer() {
-    // Duplicate the return value on the stack
-    mv.visitInsn(Opcodes.DUP);
-    loadMarksAndCallHelper();
-  }
+    private void processSanitizer() {
+        // Duplicate the return value on the stack
+        mv.visitInsn(Opcodes.DUP);
+        loadMarksAndCallHelper();
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/SecurityControlMethodClassVisitor.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/SecurityControlMethodClassVisitor.java
index 0a1c825fd55..063a71af0df 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/SecurityControlMethodClassVisitor.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/securitycontrol/SecurityControlMethodClassVisitor.java
@@ -15,97 +15,90 @@
 
 public class SecurityControlMethodClassVisitor extends ClassVisitor {
 
-  static final Logger LOGGER = LoggerFactory.getLogger(SecurityControlMethodClassVisitor.class);
-
-  private final List<SecurityControl> securityControls;
-
-  public SecurityControlMethodClassVisitor(
-      final ClassWriter cw, final List<SecurityControl> securityControls) {
-    super(ASM8, cw);
-    this.securityControls = securityControls;
-  }
-
-  @Override
-  @Nullable
-  public MethodVisitor visitMethod(
-      int access, String name, String desc, String signature, String[] exceptions) {
-    MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions);
-    if (mv == null) {
-      return null;
+    static final Logger LOGGER = LoggerFactory.getLogger(SecurityControlMethodClassVisitor.class);
+
+    private final List<SecurityControl> securityControls;
+
+    public SecurityControlMethodClassVisitor(final ClassWriter cw, final List<SecurityControl> securityControls) {
+        super(ASM8, cw);
+        this.securityControls = securityControls;
     }
-    SecurityControl match = null;
-    for (SecurityControl securityControl : securityControls) {
-      if (shouldBeAdapted(securityControl, name, desc)) {
-        match = securityControl;
-        break;
-      }
+
+    @Override
+    @Nullable
+    public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+        MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions);
+        if (mv == null) {
+            return null;
+        }
+        SecurityControl match = null;
+        for (SecurityControl securityControl : securityControls) {
+            if (shouldBeAdapted(securityControl, name, desc)) {
+                match = securityControl;
+                break;
+            }
+        }
+        if (match != null) {
+            final Type method = Type.getMethodType(desc);
+            if (match.getType() == SecurityControlType.SANITIZER) {
+                mv = adaptSanitizer(mv, match, access, method);
+            } else {
+                mv = adaptInputValidator(mv, match, access, method);
+            }
+        }
+        return mv;
     }
-    if (match != null) {
-      final Type method = Type.getMethodType(desc);
-      if (match.getType() == SecurityControlType.SANITIZER) {
-        mv = adaptSanitizer(mv, match, access, method);
-      } else {
-        mv = adaptInputValidator(mv, match, access, method);
-      }
+
+    public void visitEnd() {
+        cv.visitEnd();
     }
-    return mv;
-  }
 
-  public void visitEnd() {
-    cv.visitEnd();
-  }
+    private boolean shouldBeAdapted(SecurityControl securityControl, String name, String desc) {
 
-  private boolean shouldBeAdapted(SecurityControl securityControl, String name, String desc) {
+        if (!securityControl.getMethod().equals(name)) {
+            return false;
+        }
 
-    if (!securityControl.getMethod().equals(name)) {
-      return false;
-    }
+        if (securityControl.getParameterTypes() == null) {
+            return true;
+        }
+
+        Type[] types = Type.getArgumentTypes(desc);
+        if (types.length != securityControl.getParameterTypes().size()) {
+            return false;
+        }
+
+        for (int i = 0; i < types.length; i++) {
+            if (!types[i].getClassName()
+                    .equals(securityControl.getParameterTypes().get(i))) {
+                return false;
+            }
+        }
 
-    if (securityControl.getParameterTypes() == null) {
-      return true;
+        return true;
     }
 
-    Type[] types = Type.getArgumentTypes(desc);
-    if (types.length != securityControl.getParameterTypes().size()) {
-      return false;
+    private MethodVisitor adaptSanitizer(
+            final MethodVisitor mv, final SecurityControl control, final int accessFlags, final Type method) {
+        if (isPrimitive(method.getReturnType())) {
+            // no need to check primitives as we are not tainting them
+            LOGGER.warn(
+                    "Sanitizers should not be used on primitive return types. Return type {}. Security control: {}",
+                    method.getReturnType().getClassName(),
+                    control);
+            return mv;
+        }
+        return new SanitizerMethodAdapter(mv, control, accessFlags, method);
     }
 
-    for (int i = 0; i < types.length; i++) {
-      if (!types[i].getClassName().equals(securityControl.getParameterTypes().get(i))) {
-        return false;
-      }
+    private MethodVisitor adaptInputValidator(
+            final MethodVisitor mv, final SecurityControl control, final int accessFlags, final Type method) {
+        return new InputValidatorMethodAdapter(mv, control, accessFlags, method);
     }
 
-    return true;
-  }
-
-  private MethodVisitor adaptSanitizer(
-      final MethodVisitor mv,
-      final SecurityControl control,
-      final int accessFlags,
-      final Type method) {
-    if (isPrimitive(method.getReturnType())) {
-      // no need to check primitives as we are not tainting them
-      LOGGER.warn(
-          "Sanitizers should not be used on primitive return types. Return type {}. Security control: {}",
-          method.getReturnType().getClassName(),
-          control);
-      return mv;
+    public static boolean isPrimitive(final Type type) {
+        // Check if is a primitive type
+        int sort = type.getSort();
+        return sort >= Type.BOOLEAN && sort <= Type.DOUBLE;
     }
-    return new SanitizerMethodAdapter(mv, control, accessFlags, method);
-  }
-
-  private MethodVisitor adaptInputValidator(
-      final MethodVisitor mv,
-      final SecurityControl control,
-      final int accessFlags,
-      final Type method) {
-    return new InputValidatorMethodAdapter(mv, control, accessFlags, method);
-  }
-
-  public static boolean isPrimitive(final Type type) {
-    // Check if is a primitive type
-    int sort = type.getSort();
-    return sort >= Type.BOOLEAN && sort <= Type.DOUBLE;
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/AbstractRegexTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/AbstractRegexTokenizer.java
index f43f00df26f..ca674194233 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/AbstractRegexTokenizer.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/AbstractRegexTokenizer.java
@@ -8,27 +8,29 @@
 
 public abstract class AbstractRegexTokenizer implements SensitiveHandler.Tokenizer {
 
-  protected final Matcher matcher;
-  @Nullable private Ranged current;
-
-  protected AbstractRegexTokenizer(final Pattern pattern, final String evidence) {
-    matcher = pattern.matcher(evidence);
-  }
-
-  @Override
-  public final boolean next() {
-    final boolean hasNext = matcher.find();
-    current = hasNext ? buildNext() : null;
-    return hasNext;
-  }
-
-  @Override
-  public final Ranged current() {
-    if (current == null) {
-      throw new NoSuchElementException();
+    protected final Matcher matcher;
+
+    @Nullable
+    private Ranged current;
+
+    protected AbstractRegexTokenizer(final Pattern pattern, final String evidence) {
+        matcher = pattern.matcher(evidence);
+    }
+
+    @Override
+    public final boolean next() {
+        final boolean hasNext = matcher.find();
+        current = hasNext ? buildNext() : null;
+        return hasNext;
+    }
+
+    @Override
+    public final Ranged current() {
+        if (current == null) {
+            throw new NoSuchElementException();
+        }
+        return current;
     }
-    return current;
-  }
 
-  protected abstract Ranged buildNext();
+    protected abstract Ranged buildNext();
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/CommandRegexpTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/CommandRegexpTokenizer.java
index b9108d103e8..b63db70a168 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/CommandRegexpTokenizer.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/CommandRegexpTokenizer.java
@@ -6,17 +6,16 @@
 
 public class CommandRegexpTokenizer extends AbstractRegexTokenizer {
 
-  private static final Pattern COMMAND_PATTERN =
-      Pattern.compile(
-          "^(?:\\s*(?:sudo|doas)\\s+)?\\b\\S+\\b\\s*(.*)", Pattern.MULTILINE | Pattern.DOTALL);
+    private static final Pattern COMMAND_PATTERN =
+            Pattern.compile("^(?:\\s*(?:sudo|doas)\\s+)?\\b\\S+\\b\\s*(.*)", Pattern.MULTILINE | Pattern.DOTALL);
 
-  public CommandRegexpTokenizer(final Evidence evidence) {
-    super(COMMAND_PATTERN, evidence.getValue());
-  }
+    public CommandRegexpTokenizer(final Evidence evidence) {
+        super(COMMAND_PATTERN, evidence.getValue());
+    }
 
-  @Override
-  protected Ranged buildNext() {
-    final int start = matcher.start(1);
-    return Ranged.build(start, matcher.end(1) - start);
-  }
+    @Override
+    protected Ranged buildNext() {
+        final int start = matcher.start(1);
+        return Ranged.build(start, matcher.end(1) - start);
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/HeaderRegexpTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/HeaderRegexpTokenizer.java
index ae3645879b3..a479cbbc701 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/HeaderRegexpTokenizer.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/HeaderRegexpTokenizer.java
@@ -8,55 +8,56 @@
 
 public class HeaderRegexpTokenizer implements SensitiveHandler.Tokenizer {
 
-  @Nullable private Ranged current;
+    @Nullable
+    private Ranged current;
 
-  private boolean checked = false;
+    private boolean checked = false;
 
-  private String evidenceValue;
+    private String evidenceValue;
 
-  private Pattern namePattern;
+    private Pattern namePattern;
 
-  private Pattern valuePattern;
+    private Pattern valuePattern;
 
-  public HeaderRegexpTokenizer(final Evidence evidence, Pattern namePattern, Pattern valuePattern) {
-    this.evidenceValue = evidence.getValue();
-    this.namePattern = namePattern;
-    this.valuePattern = valuePattern;
-  }
+    public HeaderRegexpTokenizer(final Evidence evidence, Pattern namePattern, Pattern valuePattern) {
+        this.evidenceValue = evidence.getValue();
+        this.namePattern = namePattern;
+        this.valuePattern = valuePattern;
+    }
 
-  @Override
-  public boolean next() {
-    current = buildNext();
-    return current != null;
-  }
+    @Override
+    public boolean next() {
+        current = buildNext();
+        return current != null;
+    }
 
-  @Override
-  public Ranged current() {
-    if (current == null) {
-      throw new NoSuchElementException();
+    @Override
+    public Ranged current() {
+        if (current == null) {
+            throw new NoSuchElementException();
+        }
+        return current;
     }
-    return current;
-  }
-
-  @Nullable
-  private Ranged buildNext() {
-    if (!checked) {
-      checked = true;
-      // Header evidence format is <headerName>: <headerValue>
-      int separatorIndex = evidenceValue.indexOf(':');
-      if (separatorIndex < 1) {
-        return null; // Wrong evidence format: there is no separator or <headerName>
-      }
-      int headerValueIndex = separatorIndex + 2; // there is a white space after :
-      if (evidenceValue.length() <= headerValueIndex) {
-        return null; // Wrong evidence format: there is no <headerValue>
-      }
-      String name = evidenceValue.substring(0, separatorIndex);
-      String value = evidenceValue.substring(headerValueIndex);
-      if (namePattern.matcher(name).find() || valuePattern.matcher(value).find()) {
-        return Ranged.build(name.length() + 2, value.length());
-      }
+
+    @Nullable
+    private Ranged buildNext() {
+        if (!checked) {
+            checked = true;
+            // Header evidence format is <headerName>: <headerValue>
+            int separatorIndex = evidenceValue.indexOf(':');
+            if (separatorIndex < 1) {
+                return null; // Wrong evidence format: there is no separator or <headerName>
+            }
+            int headerValueIndex = separatorIndex + 2; // there is a white space after :
+            if (evidenceValue.length() <= headerValueIndex) {
+                return null; // Wrong evidence format: there is no <headerValue>
+            }
+            String name = evidenceValue.substring(0, separatorIndex);
+            String value = evidenceValue.substring(headerValueIndex);
+            if (namePattern.matcher(name).find() || valuePattern.matcher(value).find()) {
+                return Ranged.build(name.length() + 2, value.length());
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/LdapRegexTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/LdapRegexTokenizer.java
index 5e3f84adafa..7d2ccc0ea66 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/LdapRegexTokenizer.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/LdapRegexTokenizer.java
@@ -10,19 +10,18 @@
  */
 public class LdapRegexTokenizer extends AbstractRegexTokenizer {
 
-  private static final String LITERAL_GROUP = "LITERAL";
+    private static final String LITERAL_GROUP = "LITERAL";
 
-  private static final Pattern LDAP_PATTERN =
-      Pattern.compile(
-          String.format("\\(.*?(?:~=|=|<=|>=)(?P<%s>[^)]+)\\)", LITERAL_GROUP), Pattern.MULTILINE);
+    private static final Pattern LDAP_PATTERN =
+            Pattern.compile(String.format("\\(.*?(?:~=|=|<=|>=)(?P<%s>[^)]+)\\)", LITERAL_GROUP), Pattern.MULTILINE);
 
-  public LdapRegexTokenizer(final Evidence evidence) {
-    super(LDAP_PATTERN, evidence.getValue());
-  }
+    public LdapRegexTokenizer(final Evidence evidence) {
+        super(LDAP_PATTERN, evidence.getValue());
+    }
 
-  @Override
-  protected Ranged buildNext() {
-    final int start = matcher.start(LITERAL_GROUP);
-    return Ranged.build(start, matcher.end(LITERAL_GROUP) - start);
-  }
+    @Override
+    protected Ranged buildNext() {
+        final int start = matcher.start(LITERAL_GROUP);
+        return Ranged.build(start, matcher.end(LITERAL_GROUP) - start);
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SensitiveHandler.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SensitiveHandler.java
index b44415852e3..d4fd58c14f6 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SensitiveHandler.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SensitiveHandler.java
@@ -10,43 +10,41 @@
 
 public interface SensitiveHandler {
 
-  static SensitiveHandler get() {
-    return SensitiveHandlerImpl.INSTANCE;
-  }
+    static SensitiveHandler get() {
+        return SensitiveHandlerImpl.INSTANCE;
+    }
 
-  boolean isSensitiveName(@Nullable String name);
+    boolean isSensitiveName(@Nullable String name);
 
-  boolean isSensitiveValue(@Nullable String value);
+    boolean isSensitiveValue(@Nullable String value);
 
-  String redactSource(@Nonnull Source source);
+    String redactSource(@Nonnull Source source);
 
-  String redactString(String value);
+    String redactString(String value);
 
-  Tokenizer tokenizeEvidence(@Nonnull VulnerabilityType type, @Nonnull final Evidence evidence);
+    Tokenizer tokenizeEvidence(@Nonnull VulnerabilityType type, @Nonnull final Evidence evidence);
 
-  default boolean isSensitive(@Nullable final Source source) {
-    return source != null
-        && (isSensitiveName(source.getName()) || isSensitiveValue(source.getValue()));
-  }
+    default boolean isSensitive(@Nullable final Source source) {
+        return source != null && (isSensitiveName(source.getName()) || isSensitiveValue(source.getValue()));
+    }
 
-  interface Tokenizer {
+    interface Tokenizer {
 
-    boolean next();
+        boolean next();
 
-    Ranged current();
+        Ranged current();
 
-    Tokenizer EMPTY =
-        new Tokenizer() {
+        Tokenizer EMPTY = new Tokenizer() {
 
-          @Override
-          public boolean next() {
-            return false;
-          }
+            @Override
+            public boolean next() {
+                return false;
+            }
 
-          @Override
-          public Ranged current() {
-            throw new NoSuchElementException("Tokenizer is empty");
-          }
+            @Override
+            public Ranged current() {
+                throw new NoSuchElementException("Tokenizer is empty");
+            }
         };
-  }
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SensitiveHandlerImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SensitiveHandlerImpl.java
index 3aaaa67a775..204ada1a8c2 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SensitiveHandlerImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SensitiveHandlerImpl.java
@@ -23,105 +23,99 @@
 
 public class SensitiveHandlerImpl implements SensitiveHandler {
 
-  private static final Logger LOG = LoggerFactory.getLogger(SensitiveHandlerImpl.class);
-
-  static final SensitiveHandler INSTANCE = new SensitiveHandlerImpl();
-
-  private static final char[] REDACTED_SENSITIVE_BUFFER = newCharArray(16, '*');
-  private static final char[] REDACTED_SOURCE_BUFFER = new char[62];
-
-  static {
-    int offset = 0;
-    offset += fillCharArray(offset, 'a', 'z', REDACTED_SOURCE_BUFFER);
-    offset += fillCharArray(offset, 'A', 'Z', REDACTED_SOURCE_BUFFER);
-    fillCharArray(offset, '0', '9', REDACTED_SOURCE_BUFFER);
-  }
-
-  private final Pattern namePattern;
-  private final Pattern valuePattern;
-  private final Map<VulnerabilityType, TokenizerSupplier> tokenizers;
-
-  public SensitiveHandlerImpl() {
-    this(Config.get().getIastRedactionNamePattern(), Config.get().getIastRedactionValuePattern());
-  }
-
-  SensitiveHandlerImpl(final String configuredNamePattern, final String configuredValuePattern) {
-    namePattern =
-        safeCompile(configuredNamePattern, DEFAULT_IAST_REDACTION_NAME_PATTERN, CASE_INSENSITIVE);
-    valuePattern =
-        safeCompile(
-            configuredValuePattern,
-            DEFAULT_IAST_REDACTION_VALUE_PATTERN,
-            CASE_INSENSITIVE | MULTILINE);
-    tokenizers = new HashMap<>();
-    tokenizers.put(VulnerabilityType.SQL_INJECTION, SqlRegexpTokenizer::new);
-    tokenizers.put(VulnerabilityType.LDAP_INJECTION, LdapRegexTokenizer::new);
-    tokenizers.put(VulnerabilityType.COMMAND_INJECTION, CommandRegexpTokenizer::new);
-    tokenizers.put(VulnerabilityType.SSRF, UrlRegexpTokenizer::new);
-    tokenizers.put(VulnerabilityType.UNVALIDATED_REDIRECT, UrlRegexpTokenizer::new);
-    tokenizers.put(VulnerabilityType.XSS, TaintedRangeBasedTokenizer::new);
-    tokenizers.put(
-        VulnerabilityType.HEADER_INJECTION,
-        evidence -> new HeaderRegexpTokenizer(evidence, namePattern, valuePattern));
-  }
-
-  @Override
-  public boolean isSensitiveName(@Nullable final String name) {
-    return name != null && namePattern.matcher(name).find();
-  }
-
-  @Override
-  public boolean isSensitiveValue(@Nullable final String value) {
-    return value != null && valuePattern.matcher(value).find();
-  }
-
-  @Override
-  public String redactSource(@Nonnull final Source source) {
-    final String value = source.getValue();
-    return newString(computeLength(value), REDACTED_SOURCE_BUFFER);
-  }
-
-  @Override
-  public String redactString(final String value) {
-    return newString(computeLength(value), REDACTED_SENSITIVE_BUFFER);
-  }
-
-  @Override
-  public Tokenizer tokenizeEvidence(
-      @Nonnull final VulnerabilityType type, @Nonnull final Evidence evidence) {
-    final TokenizerSupplier supplier = tokenizers.get(type);
-    return supplier == null ? Tokenizer.EMPTY : supplier.tokenizerFor(evidence);
-  }
-
-  private int computeLength(@Nullable final String value) {
-    if (value == null || value.isEmpty()) {
-      return 0;
+    private static final Logger LOG = LoggerFactory.getLogger(SensitiveHandlerImpl.class);
+
+    static final SensitiveHandler INSTANCE = new SensitiveHandlerImpl();
+
+    private static final char[] REDACTED_SENSITIVE_BUFFER = newCharArray(16, '*');
+    private static final char[] REDACTED_SOURCE_BUFFER = new char[62];
+
+    static {
+        int offset = 0;
+        offset += fillCharArray(offset, 'a', 'z', REDACTED_SOURCE_BUFFER);
+        offset += fillCharArray(offset, 'A', 'Z', REDACTED_SOURCE_BUFFER);
+        fillCharArray(offset, '0', '9', REDACTED_SOURCE_BUFFER);
     }
-    int size = 0;
-    for (int i = 0; i < value.length(); i++) {
-      final char c = value.charAt(i);
-      if (!Character.isHighSurrogate(c)) {
-        size++;
-      }
+
+    private final Pattern namePattern;
+    private final Pattern valuePattern;
+    private final Map<VulnerabilityType, TokenizerSupplier> tokenizers;
+
+    public SensitiveHandlerImpl() {
+        this(Config.get().getIastRedactionNamePattern(), Config.get().getIastRedactionValuePattern());
     }
-    return size;
-  }
-
-  private static Pattern safeCompile(
-      final String configured, final String fallback, final int flags) {
-    try {
-      return Pattern.compile(configured, flags);
-    } catch (final PatternSyntaxException e) {
-      LOG.error(
-          "Could not compile IAST redaction pattern with RE2J, falling back to the default: {} (configured: {})",
-          fallback,
-          configured,
-          e);
-      return Pattern.compile(fallback, flags);
+
+    SensitiveHandlerImpl(final String configuredNamePattern, final String configuredValuePattern) {
+        namePattern = safeCompile(configuredNamePattern, DEFAULT_IAST_REDACTION_NAME_PATTERN, CASE_INSENSITIVE);
+        valuePattern =
+                safeCompile(configuredValuePattern, DEFAULT_IAST_REDACTION_VALUE_PATTERN, CASE_INSENSITIVE | MULTILINE);
+        tokenizers = new HashMap<>();
+        tokenizers.put(VulnerabilityType.SQL_INJECTION, SqlRegexpTokenizer::new);
+        tokenizers.put(VulnerabilityType.LDAP_INJECTION, LdapRegexTokenizer::new);
+        tokenizers.put(VulnerabilityType.COMMAND_INJECTION, CommandRegexpTokenizer::new);
+        tokenizers.put(VulnerabilityType.SSRF, UrlRegexpTokenizer::new);
+        tokenizers.put(VulnerabilityType.UNVALIDATED_REDIRECT, UrlRegexpTokenizer::new);
+        tokenizers.put(VulnerabilityType.XSS, TaintedRangeBasedTokenizer::new);
+        tokenizers.put(
+                VulnerabilityType.HEADER_INJECTION,
+                evidence -> new HeaderRegexpTokenizer(evidence, namePattern, valuePattern));
     }
-  }
 
-  private interface TokenizerSupplier {
-    Tokenizer tokenizerFor(Evidence evidence);
-  }
+    @Override
+    public boolean isSensitiveName(@Nullable final String name) {
+        return name != null && namePattern.matcher(name).find();
+    }
+
+    @Override
+    public boolean isSensitiveValue(@Nullable final String value) {
+        return value != null && valuePattern.matcher(value).find();
+    }
+
+    @Override
+    public String redactSource(@Nonnull final Source source) {
+        final String value = source.getValue();
+        return newString(computeLength(value), REDACTED_SOURCE_BUFFER);
+    }
+
+    @Override
+    public String redactString(final String value) {
+        return newString(computeLength(value), REDACTED_SENSITIVE_BUFFER);
+    }
+
+    @Override
+    public Tokenizer tokenizeEvidence(@Nonnull final VulnerabilityType type, @Nonnull final Evidence evidence) {
+        final TokenizerSupplier supplier = tokenizers.get(type);
+        return supplier == null ? Tokenizer.EMPTY : supplier.tokenizerFor(evidence);
+    }
+
+    private int computeLength(@Nullable final String value) {
+        if (value == null || value.isEmpty()) {
+            return 0;
+        }
+        int size = 0;
+        for (int i = 0; i < value.length(); i++) {
+            final char c = value.charAt(i);
+            if (!Character.isHighSurrogate(c)) {
+                size++;
+            }
+        }
+        return size;
+    }
+
+    private static Pattern safeCompile(final String configured, final String fallback, final int flags) {
+        try {
+            return Pattern.compile(configured, flags);
+        } catch (final PatternSyntaxException e) {
+            LOG.error(
+                    "Could not compile IAST redaction pattern with RE2J, falling back to the default: {} (configured: {})",
+                    fallback,
+                    configured,
+                    e);
+            return Pattern.compile(fallback, flags);
+        }
+    }
+
+    private interface TokenizerSupplier {
+        Tokenizer tokenizerFor(Evidence evidence);
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SqlRegexpTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SqlRegexpTokenizer.java
index 51587036686..c2197fe4170 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SqlRegexpTokenizer.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SqlRegexpTokenizer.java
@@ -18,259 +18,245 @@
 
 public class SqlRegexpTokenizer implements SensitiveHandler.Tokenizer {
 
-  private static final String STRING_LITERAL = "'(?:''|[^'])*'";
-  private static final String ORACLE_ESCAPED_LITERAL = buildOracleEscapedLiteral();
-  // $$ or $tag$ where tag is a SQL identifier
-  private static final String POSTGRESQL_ESCAPED_LITERAL = "\\$(?:[a-zA-Z_]\\w*)?\\$";
-  private static final String MYSQL_STRING_LITERAL = "\"(?:\\\"|[^\"])*\"|'(?:\\'|[^'])*'";
-  private static final String LINE_COMMENT = "--.*$";
-  private static final String BLOCK_COMMENT = "/\\*[\\s\\S]*\\*/";
-  private static final String EXPONENT = "(?:E[-+]?\\d+[fd]?)?";
-  private static final String INTEGER_NUMBER = "\\b\\d+";
-  private static final String DECIMAL_NUMBER = "\\d*\\.\\d+";
-  private static final String HEX_NUMBER = "x'[0-9a-f]+'|0x[0-9a-f]+";
-  private static final String BIN_NUMBER = "b'[0-9a-f]+'|0b[0-9a-f]+";
-  private static final String NUMERIC_LITERAL =
-      String.format(
-          "[-+]?(?:%s)",
-          String.join(
-              "|", HEX_NUMBER, BIN_NUMBER, DECIMAL_NUMBER + EXPONENT, INTEGER_NUMBER + EXPONENT));
+    private static final String STRING_LITERAL = "'(?:''|[^'])*'";
+    private static final String ORACLE_ESCAPED_LITERAL = buildOracleEscapedLiteral();
+    // $$ or $tag$ where tag is a SQL identifier
+    private static final String POSTGRESQL_ESCAPED_LITERAL = "\\$(?:[a-zA-Z_]\\w*)?\\$";
+    private static final String MYSQL_STRING_LITERAL = "\"(?:\\\"|[^\"])*\"|'(?:\\'|[^'])*'";
+    private static final String LINE_COMMENT = "--.*$";
+    private static final String BLOCK_COMMENT = "/\\*[\\s\\S]*\\*/";
+    private static final String EXPONENT = "(?:E[-+]?\\d+[fd]?)?";
+    private static final String INTEGER_NUMBER = "\\b\\d+";
+    private static final String DECIMAL_NUMBER = "\\d*\\.\\d+";
+    private static final String HEX_NUMBER = "x'[0-9a-f]+'|0x[0-9a-f]+";
+    private static final String BIN_NUMBER = "b'[0-9a-f]+'|0b[0-9a-f]+";
+    private static final String NUMERIC_LITERAL = String.format(
+            "[-+]?(?:%s)",
+            String.join("|", HEX_NUMBER, BIN_NUMBER, DECIMAL_NUMBER + EXPONENT, INTEGER_NUMBER + EXPONENT));
 
-  private static final Map<Dialect, Pattern> PATTERNS = new ConcurrentHashMap<>();
+    private static final Map<Dialect, Pattern> PATTERNS = new ConcurrentHashMap<>();
 
-  private final String sql;
-  private final Matcher matcher;
-  private int searchFrom;
-  @Nullable private Ranged current;
-  // Lazily built (Postgres only): every "$tag$" occurrence indexed by tag, so the matching close
-  // can be located with a binary search instead of an O(n) scan per opener.
-  @Nullable private Map<String, int[]> dollarTagPositions;
+    private final String sql;
+    private final Matcher matcher;
+    private int searchFrom;
 
-  public SqlRegexpTokenizer(final Evidence evidence) {
-    this.sql = evidence.getValue();
-    this.matcher =
-        PATTERNS
-            .computeIfAbsent(Dialect.fromEvidence(evidence), Dialect::buildPattern)
-            .matcher(sql);
-  }
+    @Nullable
+    private Ranged current;
+    // Lazily built (Postgres only): every "$tag$" occurrence indexed by tag, so the matching close
+    // can be located with a binary search instead of an O(n) scan per opener.
+    @Nullable
+    private Map<String, int[]> dollarTagPositions;
 
-  @Override
-  public boolean next() {
-    while (matcher.find(searchFrom)) {
-      final int start = matcher.start();
-      int end = matcher.end();
-      int rangeStart = start;
-      int rangeEnd = end;
-      final char startChar = sql.charAt(start);
-      if (startChar == '$') {
-        // Postgres dollar-quoting: the regex matched the opening "$tag$"; find the matching close.
-        final String tag = sql.substring(start, end);
-        final int close = nextDollarTag(tag, end);
-        if (close < 0) {
-          // No matching close tag: not a dollar-quoted literal. Skip past the whole opener we
-          // already matched (not just one char) so find() does not re-scan it.
-          searchFrom = end;
-          continue;
-        }
-        end = close + tag.length();
-        rangeStart = start + tag.length();
-        rangeEnd = close;
-      } else if (startChar == '\'' || startChar == '"') {
-        rangeStart++;
-        rangeEnd--;
-      } else if (end > start + 1) {
-        final char nextChar = sql.charAt(start + 1);
-        if (startChar == '/' && nextChar == '*') {
-          rangeStart += 2;
-          rangeEnd -= 2;
-        } else if (startChar == '-' && startChar == nextChar) {
-          rangeStart += 2;
-        } else if (Character.toLowerCase(startChar) == 'q' && nextChar == '\'') {
-          rangeStart += 3;
-          rangeEnd -= 2;
-        }
-      }
-      searchFrom = end;
-      current = Ranged.build(rangeStart, rangeEnd - rangeStart);
-      return true;
+    public SqlRegexpTokenizer(final Evidence evidence) {
+        this.sql = evidence.getValue();
+        this.matcher = PATTERNS.computeIfAbsent(Dialect.fromEvidence(evidence), Dialect::buildPattern)
+                .matcher(sql);
     }
-    current = null;
-    return false;
-  }
 
-  @Override
-  public Ranged current() {
-    if (current == null) {
-      throw new NoSuchElementException();
+    @Override
+    public boolean next() {
+        while (matcher.find(searchFrom)) {
+            final int start = matcher.start();
+            int end = matcher.end();
+            int rangeStart = start;
+            int rangeEnd = end;
+            final char startChar = sql.charAt(start);
+            if (startChar == '$') {
+                // Postgres dollar-quoting: the regex matched the opening "$tag$"; find the matching close.
+                final String tag = sql.substring(start, end);
+                final int close = nextDollarTag(tag, end);
+                if (close < 0) {
+                    // No matching close tag: not a dollar-quoted literal. Skip past the whole opener we
+                    // already matched (not just one char) so find() does not re-scan it.
+                    searchFrom = end;
+                    continue;
+                }
+                end = close + tag.length();
+                rangeStart = start + tag.length();
+                rangeEnd = close;
+            } else if (startChar == '\'' || startChar == '"') {
+                rangeStart++;
+                rangeEnd--;
+            } else if (end > start + 1) {
+                final char nextChar = sql.charAt(start + 1);
+                if (startChar == '/' && nextChar == '*') {
+                    rangeStart += 2;
+                    rangeEnd -= 2;
+                } else if (startChar == '-' && startChar == nextChar) {
+                    rangeStart += 2;
+                } else if (Character.toLowerCase(startChar) == 'q' && nextChar == '\'') {
+                    rangeStart += 3;
+                    rangeEnd -= 2;
+                }
+            }
+            searchFrom = end;
+            current = Ranged.build(rangeStart, rangeEnd - rangeStart);
+            return true;
+        }
+        current = null;
+        return false;
     }
-    return current;
-  }
 
-  /**
-   * Returns the start offset of the first {@code "$tag$"} occurrence at or after {@code from}, or
-   * {@code -1} if there is none. Equivalent to {@code sql.indexOf(tag, from)} for dollar-quote tags
-   * but backed by a precomputed index so the whole tokenization stays near-linear instead of
-   * scanning to end-of-string once per opener.
-   */
-  private int nextDollarTag(final String tag, final int from) {
-    final int[] positions = dollarTagPositions().get(tag);
-    if (positions == null) {
-      return -1;
-    }
-    // first position >= from
-    int lo = 0;
-    int hi = positions.length;
-    while (lo < hi) {
-      final int mid = (lo + hi) >>> 1;
-      if (positions[mid] < from) {
-        lo = mid + 1;
-      } else {
-        hi = mid;
-      }
+    @Override
+    public Ranged current() {
+        if (current == null) {
+            throw new NoSuchElementException();
+        }
+        return current;
     }
-    return lo < positions.length ? positions[lo] : -1;
-  }
 
-  private Map<String, int[]> dollarTagPositions() {
-    if (dollarTagPositions == null) {
-      dollarTagPositions = buildDollarTagPositions(sql);
+    /**
+     * Returns the start offset of the first {@code "$tag$"} occurrence at or after {@code from}, or
+     * {@code -1} if there is none. Equivalent to {@code sql.indexOf(tag, from)} for dollar-quote tags
+     * but backed by a precomputed index so the whole tokenization stays near-linear instead of
+     * scanning to end-of-string once per opener.
+     */
+    private int nextDollarTag(final String tag, final int from) {
+        final int[] positions = dollarTagPositions().get(tag);
+        if (positions == null) {
+            return -1;
+        }
+        // first position >= from
+        int lo = 0;
+        int hi = positions.length;
+        while (lo < hi) {
+            final int mid = (lo + hi) >>> 1;
+            if (positions[mid] < from) {
+                lo = mid + 1;
+            } else {
+                hi = mid;
+            }
+        }
+        return lo < positions.length ? positions[lo] : -1;
     }
-    return dollarTagPositions;
-  }
 
-  /**
-   * Single left-to-right pass collecting the start offset of every {@code "$tag$"} token (empty tag
-   * or a SQL identifier), keyed by the token text. Each character is visited once: the optional
-   * identifier run after a {@code '$'} contains no {@code '$'}, so runs from distinct openers never
-   * overlap, making the scan O(n).
-   */
-  private static Map<String, int[]> buildDollarTagPositions(final String sql) {
-    final Map<String, List<Integer>> positions = new HashMap<>();
-    final int length = sql.length();
-    for (int i = 0; i < length; i++) {
-      if (sql.charAt(i) != '$') {
-        continue;
-      }
-      int end = i + 1;
-      if (end < length && isIdentifierStart(sql.charAt(end))) {
-        end++;
-        while (end < length && isIdentifierPart(sql.charAt(end))) {
-          end++;
+    private Map<String, int[]> dollarTagPositions() {
+        if (dollarTagPositions == null) {
+            dollarTagPositions = buildDollarTagPositions(sql);
         }
-      }
-      if (end < length && sql.charAt(end) == '$') {
-        final String tag = sql.substring(i, end + 1);
-        positions.computeIfAbsent(tag, k -> new ArrayList<>()).add(i);
-      }
+        return dollarTagPositions;
     }
-    final Map<String, int[]> result = new HashMap<>(positions.size() * 2);
-    for (final Map.Entry<String, List<Integer>> entry : positions.entrySet()) {
-      final List<Integer> list = entry.getValue();
-      final int[] array = new int[list.size()];
-      for (int i = 0; i < array.length; i++) {
-        array[i] = list.get(i);
-      }
-      result.put(entry.getKey(), array);
+
+    /**
+     * Single left-to-right pass collecting the start offset of every {@code "$tag$"} token (empty tag
+     * or a SQL identifier), keyed by the token text. Each character is visited once: the optional
+     * identifier run after a {@code '$'} contains no {@code '$'}, so runs from distinct openers never
+     * overlap, making the scan O(n).
+     */
+    private static Map<String, int[]> buildDollarTagPositions(final String sql) {
+        final Map<String, List<Integer>> positions = new HashMap<>();
+        final int length = sql.length();
+        for (int i = 0; i < length; i++) {
+            if (sql.charAt(i) != '$') {
+                continue;
+            }
+            int end = i + 1;
+            if (end < length && isIdentifierStart(sql.charAt(end))) {
+                end++;
+                while (end < length && isIdentifierPart(sql.charAt(end))) {
+                    end++;
+                }
+            }
+            if (end < length && sql.charAt(end) == '$') {
+                final String tag = sql.substring(i, end + 1);
+                positions.computeIfAbsent(tag, k -> new ArrayList<>()).add(i);
+            }
+        }
+        final Map<String, int[]> result = new HashMap<>(positions.size() * 2);
+        for (final Map.Entry<String, List<Integer>> entry : positions.entrySet()) {
+            final List<Integer> list = entry.getValue();
+            final int[] array = new int[list.size()];
+            for (int i = 0; i < array.length; i++) {
+                array[i] = list.get(i);
+            }
+            result.put(entry.getKey(), array);
+        }
+        return result;
     }
-    return result;
-  }
 
-  private static boolean isIdentifierStart(final char c) {
-    return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_';
-  }
+    private static boolean isIdentifierStart(final char c) {
+        return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_';
+    }
 
-  private static boolean isIdentifierPart(final char c) {
-    return isIdentifierStart(c) || (c >= '0' && c <= '9');
-  }
+    private static boolean isIdentifierPart(final char c) {
+        return isIdentifierStart(c) || (c >= '0' && c <= '9');
+    }
 
-  /**
-   * Builds the Oracle {@code q'…'} alternation: the four bracket-paired delimiters plus one branch
-   * per other printable single-character delimiter (RE2J has no back-reference to require the same
-   * closing char, so the finite delimiter alphabet is enumerated).
-   *
-   * <p>The enumeration is intentionally restricted to the printable ASCII range {@code 0x21..0x7e}.
-   * Oracle forbids whitespace (space, tab, carriage return) as a {@code q'} delimiter, so excluding
-   * those characters matches Oracle's own rules rather than dropping valid literals. Multi-byte
-   * (non-ASCII) delimiters, which Oracle does allow, are not enumerated; such literals fall back to
-   * being tokenized by the generic {@code STRING_LITERAL} branch.
-   */
-  private static String buildOracleEscapedLiteral() {
-    final List<String> alternatives = new ArrayList<>();
-    alternatives.add("q'<.*?>'");
-    alternatives.add("q'\\(.*?\\)'");
-    alternatives.add("q'\\{.*?\\}'");
-    alternatives.add("q'\\[.*?\\]'");
-    for (char delim = 0x21; delim <= 0x7e; delim++) {
-      // brackets handled above; ' is ambiguous with the surrounding quotes.
-      if ("<>(){}[]'".indexOf(delim) >= 0) {
-        continue;
-      }
-      final String escaped = escapeDelimiter(delim);
-      alternatives.add("q'" + escaped + ".*?" + escaped + "'");
+    /**
+     * Builds the Oracle {@code q'…'} alternation: the four bracket-paired delimiters plus one branch
+     * per other printable single-character delimiter (RE2J has no back-reference to require the same
+     * closing char, so the finite delimiter alphabet is enumerated).
+     *
+     * <p>The enumeration is intentionally restricted to the printable ASCII range {@code 0x21..0x7e}.
+     * Oracle forbids whitespace (space, tab, carriage return) as a {@code q'} delimiter, so excluding
+     * those characters matches Oracle's own rules rather than dropping valid literals. Multi-byte
+     * (non-ASCII) delimiters, which Oracle does allow, are not enumerated; such literals fall back to
+     * being tokenized by the generic {@code STRING_LITERAL} branch.
+     */
+    private static String buildOracleEscapedLiteral() {
+        final List<String> alternatives = new ArrayList<>();
+        alternatives.add("q'<.*?>'");
+        alternatives.add("q'\\(.*?\\)'");
+        alternatives.add("q'\\{.*?\\}'");
+        alternatives.add("q'\\[.*?\\]'");
+        for (char delim = 0x21; delim <= 0x7e; delim++) {
+            // brackets handled above; ' is ambiguous with the surrounding quotes.
+            if ("<>(){}[]'".indexOf(delim) >= 0) {
+                continue;
+            }
+            final String escaped = escapeDelimiter(delim);
+            alternatives.add("q'" + escaped + ".*?" + escaped + "'");
+        }
+        return String.join("|", alternatives);
     }
-    return String.join("|", alternatives);
-  }
 
-  private static String escapeDelimiter(final char delim) {
-    return "\\.+*?^$|".indexOf(delim) >= 0 ? "\\" + delim : String.valueOf(delim);
-  }
+    private static String escapeDelimiter(final char delim) {
+        return "\\.+*?^$|".indexOf(delim) >= 0 ? "\\" + delim : String.valueOf(delim);
+    }
 
-  private enum Dialect {
-    ORACLE(
-        "oracle"::equalsIgnoreCase,
-        () ->
-            buildPattern(
-                NUMERIC_LITERAL,
-                ORACLE_ESCAPED_LITERAL,
-                STRING_LITERAL,
-                LINE_COMMENT,
-                BLOCK_COMMENT)),
-    POSTGRESQL(
-        "postgresql"::equalsIgnoreCase,
-        () ->
-            buildPattern(
-                NUMERIC_LITERAL,
-                POSTGRESQL_ESCAPED_LITERAL,
-                STRING_LITERAL,
-                LINE_COMMENT,
-                BLOCK_COMMENT)),
+    private enum Dialect {
+        ORACLE(
+                "oracle"::equalsIgnoreCase,
+                () -> buildPattern(
+                        NUMERIC_LITERAL, ORACLE_ESCAPED_LITERAL, STRING_LITERAL, LINE_COMMENT, BLOCK_COMMENT)),
+        POSTGRESQL(
+                "postgresql"::equalsIgnoreCase,
+                () -> buildPattern(
+                        NUMERIC_LITERAL, POSTGRESQL_ESCAPED_LITERAL, STRING_LITERAL, LINE_COMMENT, BLOCK_COMMENT)),
 
-    MYSQL(
-        "mysql"::equalsIgnoreCase,
-        () -> buildPattern(NUMERIC_LITERAL, MYSQL_STRING_LITERAL, LINE_COMMENT, BLOCK_COMMENT)),
-    MARIADB("mariadb"::equalsIgnoreCase, MYSQL::buildPattern),
-    SQLITE("sqlite"::equalsIgnoreCase, MYSQL::buildPattern),
-    ANSI(
-        dialect -> true,
-        () -> buildPattern(NUMERIC_LITERAL, STRING_LITERAL, LINE_COMMENT, BLOCK_COMMENT));
+        MYSQL(
+                "mysql"::equalsIgnoreCase,
+                () -> buildPattern(NUMERIC_LITERAL, MYSQL_STRING_LITERAL, LINE_COMMENT, BLOCK_COMMENT)),
+        MARIADB("mariadb"::equalsIgnoreCase, MYSQL::buildPattern),
+        SQLITE("sqlite"::equalsIgnoreCase, MYSQL::buildPattern),
+        ANSI(dialect -> true, () -> buildPattern(NUMERIC_LITERAL, STRING_LITERAL, LINE_COMMENT, BLOCK_COMMENT));
 
-    private final Predicate<String> dialect;
-    private final Supplier<Pattern> pattern;
+        private final Predicate<String> dialect;
+        private final Supplier<Pattern> pattern;
 
-    Dialect(final Predicate<String> dialect, final Supplier<Pattern> pattern) {
-      this.dialect = dialect;
-      this.pattern = pattern;
-    }
+        Dialect(final Predicate<String> dialect, final Supplier<Pattern> pattern) {
+            this.dialect = dialect;
+            this.pattern = pattern;
+        }
 
-    public static Dialect fromEvidence(final Evidence evidence) {
-      if (evidence.getContext() != null) {
-        final String database = evidence.getContext().get(DATABASE_PARAMETER);
-        for (Dialect item : Dialect.values()) {
-          if (item.dialect.test(database)) {
-            return item;
-          }
+        public static Dialect fromEvidence(final Evidence evidence) {
+            if (evidence.getContext() != null) {
+                final String database = evidence.getContext().get(DATABASE_PARAMETER);
+                for (Dialect item : Dialect.values()) {
+                    if (item.dialect.test(database)) {
+                        return item;
+                    }
+                }
+            }
+            return ANSI;
         }
-      }
-      return ANSI;
-    }
 
-    public Pattern buildPattern() {
-      return pattern.get();
-    }
+        public Pattern buildPattern() {
+            return pattern.get();
+        }
 
-    private static Pattern buildPattern(final String... patterns) {
-      return Pattern.compile(
-          String.join("|", patterns), Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+        private static Pattern buildPattern(final String... patterns) {
+            return Pattern.compile(String.join("|", patterns), Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/TaintedRangeBasedTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/TaintedRangeBasedTokenizer.java
index b2cff3356b4..1f7cdccb33b 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/TaintedRangeBasedTokenizer.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/TaintedRangeBasedTokenizer.java
@@ -9,53 +9,54 @@
 
 public class TaintedRangeBasedTokenizer implements SensitiveHandler.Tokenizer {
 
-  private final String value;
-  private final Range[] ranges;
+    private final String value;
+    private final Range[] ranges;
 
-  @Nullable private Ranged current;
+    @Nullable
+    private Ranged current;
 
-  private int rangesIndex;
+    private int rangesIndex;
 
-  private int pos;
+    private int pos;
 
-  public TaintedRangeBasedTokenizer(final Evidence evidence) {
-    this.ranges = evidence.getRanges() == null ? Ranges.EMPTY : evidence.getRanges();
-    this.value = evidence.getValue();
-    rangesIndex = 0;
-    pos = 0; // current value position
-  }
-
-  @Override
-  public boolean next() {
-    current = buildNext();
-    return current != null;
-  }
+    public TaintedRangeBasedTokenizer(final Evidence evidence) {
+        this.ranges = evidence.getRanges() == null ? Ranges.EMPTY : evidence.getRanges();
+        this.value = evidence.getValue();
+        rangesIndex = 0;
+        pos = 0; // current value position
+    }
 
-  @Override
-  public Ranged current() {
-    if (current == null) {
-      throw new NoSuchElementException();
+    @Override
+    public boolean next() {
+        current = buildNext();
+        return current != null;
     }
-    return current;
-  }
-
-  @Nullable
-  private Ranged buildNext() {
-    for (; rangesIndex < ranges.length; rangesIndex++) {
-      Range range = ranges[rangesIndex];
-      if (range.getStart() <= pos) {
-        pos = range.getStart() + range.getLength();
-      } else {
-        Ranged next = Ranged.build(pos, range.getStart() - pos);
-        pos = range.getStart() + range.getLength();
-        return next;
-      }
+
+    @Override
+    public Ranged current() {
+        if (current == null) {
+            throw new NoSuchElementException();
+        }
+        return current;
     }
-    if (pos < value.length()) {
-      Ranged next = Ranged.build(pos, value.length() - pos);
-      pos = value.length();
-      return next;
+
+    @Nullable
+    private Ranged buildNext() {
+        for (; rangesIndex < ranges.length; rangesIndex++) {
+            Range range = ranges[rangesIndex];
+            if (range.getStart() <= pos) {
+                pos = range.getStart() + range.getLength();
+            } else {
+                Ranged next = Ranged.build(pos, range.getStart() - pos);
+                pos = range.getStart() + range.getLength();
+                return next;
+            }
+        }
+        if (pos < value.length()) {
+            Ranged next = Ranged.build(pos, value.length() - pos);
+            pos = value.length();
+            return next;
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/UrlRegexpTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/UrlRegexpTokenizer.java
index 06e1001a637..4a898454b84 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/UrlRegexpTokenizer.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/UrlRegexpTokenizer.java
@@ -9,26 +9,22 @@
  */
 public class UrlRegexpTokenizer extends AbstractRegexTokenizer {
 
-  private static final String AUTHORITY_GROUP = "AUTHORITY";
-  private static final String QUERY_FRAGMENT_GROUP = "QUERY";
+    private static final String AUTHORITY_GROUP = "AUTHORITY";
+    private static final String QUERY_FRAGMENT_GROUP = "QUERY";
 
-  private static final String AUTHORITY =
-      String.format("^(?:[^:]+:)?//(?P<%s>[^@]+)@", AUTHORITY_GROUP);
-  private static final String QUERY_FRAGMENT =
-      String.format("[?#&]([^=&;]+)=(?P<%s>[^?#&]+)", QUERY_FRAGMENT_GROUP);
+    private static final String AUTHORITY = String.format("^(?:[^:]+:)?//(?P<%s>[^@]+)@", AUTHORITY_GROUP);
+    private static final String QUERY_FRAGMENT = String.format("[?#&]([^=&;]+)=(?P<%s>[^?#&]+)", QUERY_FRAGMENT_GROUP);
 
-  private static final Pattern PATTERN =
-      Pattern.compile(String.join("|", AUTHORITY, QUERY_FRAGMENT));
+    private static final Pattern PATTERN = Pattern.compile(String.join("|", AUTHORITY, QUERY_FRAGMENT));
 
-  protected UrlRegexpTokenizer(final Evidence evidence) {
-    super(PATTERN, evidence.getValue());
-  }
+    protected UrlRegexpTokenizer(final Evidence evidence) {
+        super(PATTERN, evidence.getValue());
+    }
 
-  @Override
-  protected Ranged buildNext() {
-    final String group =
-        matcher.group(AUTHORITY_GROUP) != null ? AUTHORITY_GROUP : QUERY_FRAGMENT_GROUP;
-    final int start = matcher.start(group);
-    return Ranged.build(start, matcher.end(group) - start);
-  }
+    @Override
+    protected Ranged buildNext() {
+        final String group = matcher.group(AUTHORITY_GROUP) != null ? AUTHORITY_GROUP : QUERY_FRAGMENT_GROUP;
+        final int start = matcher.start(group);
+        return Ranged.build(start, matcher.end(group) - start);
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/ApplicationModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/ApplicationModuleImpl.java
index e2a9ea77e73..33b20dc7ddf 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/ApplicationModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/ApplicationModuleImpl.java
@@ -38,413 +38,386 @@
 
 public class ApplicationModuleImpl extends SinkModuleBase implements ApplicationModule {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationModule.class);
-
-  /** Bounds for the file visitor depth when trying to locate insecure JSP folders */
-  private static final int JSP_MAX_WALK_DEPTH = 32;
-
-  private static final String CONTEXT_LOADER_LISTENER =
-      "org.springframework.web.context.ContextLoaderListener";
-  private static final String DISPATCHER_SERVLET =
-      "org.springframework.web.servlet.DispatcherServlet";
-  private static final String DEFAULT_HTML_ESCAPE = "defaultHtmlEscape";
-  private static final String LISTINGS_PATTERN = "<param-name>listings</param-name>";
-  private static final String JETTY_LISTINGS_PATTERN = "<param-name>dirAllowed</param-name>";
-  private static final String WEBLOGIC_LISTING_PATTERN =
-      "<index-directory-enabled>true</index-directory-enabled>";
-  private static final String WEBSPHERE_XMI_LISTING_PATTERN = "directoryBrowsingEnabled=\"true\"";
-  private static final String WEBSPHERE_XML_LISTING_PATTERN =
-      "<enable-directory-browsing value=\"true\"/>";
-  private static final String SESSION_TIMEOUT_START_TAG = "<session-timeout>";
-  private static final String SESSION_TIMEOUT_END_TAG = "</session-timeout>";
-  private static final String SECURITY_CONSTRAINT_START_TAG = "<security-constraint>";
-  private static final String SECURITY_CONSTRAINT_END_TAG = "</security-constraint>";
-  public static final String PARAM_VALUE_START_TAG = "<param-value>";
-  public static final String PARAM_VALUE_END_TAG = "</param-value>";
-  public static final String DISPLAY_NAME_PATTERN = "<display-name>(.*?)</display-name>";
-  static final String TOMCAT_MANAGER_APP = "Tomcat Manager Application";
-  static final String TOMCAT_HOST_MANAGER_APP = "Tomcat Host Manager Application";
-  static final String TOMCAT_SAMPLES_APP = "Servlet and JSP Examples";
-  static final String JETTY_ASYNC_REST_APP = "Async REST Webservice Example";
-  static final String JETTY_JAVADOC_APP = "Transparent Proxy WebApp";
-  static final String JETTY_JAAS_APP = "JAAS Test";
-  static final String JETTY_JNDI_APP = "Test JNDI WebApp";
-  static final String JETTY_SPEC_APP = "Test Annotations WebApp";
-  static final String JETTY_TEST_APP = "Test WebApp";
-  public static final Set<String> ADMIN_CONSOLE_LIST =
-      new HashSet<>(Arrays.asList(TOMCAT_MANAGER_APP, TOMCAT_HOST_MANAGER_APP));
-  public static final Set<String> DEFAULT_APP_LIST =
-      new HashSet<>(
-          Arrays.asList(
-              TOMCAT_SAMPLES_APP,
-              JETTY_ASYNC_REST_APP,
-              JETTY_JAVADOC_APP,
-              JETTY_JAAS_APP,
-              JETTY_JNDI_APP,
-              JETTY_SPEC_APP,
-              JETTY_TEST_APP));
-  public static final String WEB_INF = "WEB-INF";
-  public static final String WEB_XML = "web.xml";
-  public static final String WEBLOGIC_XML = "weblogic.xml";
-  public static final String IBM_WEB_EXT_XMI = "ibm-web-ext.xmi";
-  public static final String IBM_WEB_EXT_XML = "ibm-web-ext.xml";
-  static final String SESSION_REWRITING_EVIDENCE_VALUE = "Servlet URL Session Tracking Mode";
-
-  private static final Pattern PATTERN =
-      Pattern.compile(
-          Stream.of(
-                  CONTEXT_LOADER_LISTENER,
-                  DISPATCHER_SERVLET,
-                  DEFAULT_HTML_ESCAPE,
-                  LISTINGS_PATTERN,
-                  JETTY_LISTINGS_PATTERN,
-                  SESSION_TIMEOUT_START_TAG,
-                  SECURITY_CONSTRAINT_START_TAG,
-                  DISPLAY_NAME_PATTERN)
-              .collect(Collectors.joining("|")));
-
-  private static final Pattern WEBLOGIC_PATTERN =
-      Pattern.compile(WEBLOGIC_LISTING_PATTERN, Pattern.CASE_INSENSITIVE);
-
-  private static final Pattern WEBSPHERE_XMI_PATTERN =
-      Pattern.compile(WEBSPHERE_XMI_LISTING_PATTERN, Pattern.CASE_INSENSITIVE);
-
-  private static final Pattern WEBSPHERE_XML_PATTERN =
-      Pattern.compile(WEBSPHERE_XML_LISTING_PATTERN, Pattern.CASE_INSENSITIVE);
-
-  private static final int NO_LINE = -1;
-
-  public ApplicationModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
-
-  /**
-   * Overhead is not checked here as it's called once per application context
-   *
-   * @param realPath the real path of the application
-   */
-  @Override
-  public void onRealPath(final @Nullable String realPath) {
-    if (realPath == null) {
-      return;
+    private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationModule.class);
+
+    /** Bounds for the file visitor depth when trying to locate insecure JSP folders */
+    private static final int JSP_MAX_WALK_DEPTH = 32;
+
+    private static final String CONTEXT_LOADER_LISTENER = "org.springframework.web.context.ContextLoaderListener";
+    private static final String DISPATCHER_SERVLET = "org.springframework.web.servlet.DispatcherServlet";
+    private static final String DEFAULT_HTML_ESCAPE = "defaultHtmlEscape";
+    private static final String LISTINGS_PATTERN = "<param-name>listings</param-name>";
+    private static final String JETTY_LISTINGS_PATTERN = "<param-name>dirAllowed</param-name>";
+    private static final String WEBLOGIC_LISTING_PATTERN = "<index-directory-enabled>true</index-directory-enabled>";
+    private static final String WEBSPHERE_XMI_LISTING_PATTERN = "directoryBrowsingEnabled=\"true\"";
+    private static final String WEBSPHERE_XML_LISTING_PATTERN = "<enable-directory-browsing value=\"true\"/>";
+    private static final String SESSION_TIMEOUT_START_TAG = "<session-timeout>";
+    private static final String SESSION_TIMEOUT_END_TAG = "</session-timeout>";
+    private static final String SECURITY_CONSTRAINT_START_TAG = "<security-constraint>";
+    private static final String SECURITY_CONSTRAINT_END_TAG = "</security-constraint>";
+    public static final String PARAM_VALUE_START_TAG = "<param-value>";
+    public static final String PARAM_VALUE_END_TAG = "</param-value>";
+    public static final String DISPLAY_NAME_PATTERN = "<display-name>(.*?)</display-name>";
+    static final String TOMCAT_MANAGER_APP = "Tomcat Manager Application";
+    static final String TOMCAT_HOST_MANAGER_APP = "Tomcat Host Manager Application";
+    static final String TOMCAT_SAMPLES_APP = "Servlet and JSP Examples";
+    static final String JETTY_ASYNC_REST_APP = "Async REST Webservice Example";
+    static final String JETTY_JAVADOC_APP = "Transparent Proxy WebApp";
+    static final String JETTY_JAAS_APP = "JAAS Test";
+    static final String JETTY_JNDI_APP = "Test JNDI WebApp";
+    static final String JETTY_SPEC_APP = "Test Annotations WebApp";
+    static final String JETTY_TEST_APP = "Test WebApp";
+    public static final Set<String> ADMIN_CONSOLE_LIST =
+            new HashSet<>(Arrays.asList(TOMCAT_MANAGER_APP, TOMCAT_HOST_MANAGER_APP));
+    public static final Set<String> DEFAULT_APP_LIST = new HashSet<>(Arrays.asList(
+            TOMCAT_SAMPLES_APP,
+            JETTY_ASYNC_REST_APP,
+            JETTY_JAVADOC_APP,
+            JETTY_JAAS_APP,
+            JETTY_JNDI_APP,
+            JETTY_SPEC_APP,
+            JETTY_TEST_APP));
+    public static final String WEB_INF = "WEB-INF";
+    public static final String WEB_XML = "web.xml";
+    public static final String WEBLOGIC_XML = "weblogic.xml";
+    public static final String IBM_WEB_EXT_XMI = "ibm-web-ext.xmi";
+    public static final String IBM_WEB_EXT_XML = "ibm-web-ext.xml";
+    static final String SESSION_REWRITING_EVIDENCE_VALUE = "Servlet URL Session Tracking Mode";
+
+    private static final Pattern PATTERN = Pattern.compile(Stream.of(
+                    CONTEXT_LOADER_LISTENER,
+                    DISPATCHER_SERVLET,
+                    DEFAULT_HTML_ESCAPE,
+                    LISTINGS_PATTERN,
+                    JETTY_LISTINGS_PATTERN,
+                    SESSION_TIMEOUT_START_TAG,
+                    SECURITY_CONSTRAINT_START_TAG,
+                    DISPLAY_NAME_PATTERN)
+            .collect(Collectors.joining("|")));
+
+    private static final Pattern WEBLOGIC_PATTERN = Pattern.compile(WEBLOGIC_LISTING_PATTERN, Pattern.CASE_INSENSITIVE);
+
+    private static final Pattern WEBSPHERE_XMI_PATTERN =
+            Pattern.compile(WEBSPHERE_XMI_LISTING_PATTERN, Pattern.CASE_INSENSITIVE);
+
+    private static final Pattern WEBSPHERE_XML_PATTERN =
+            Pattern.compile(WEBSPHERE_XML_LISTING_PATTERN, Pattern.CASE_INSENSITIVE);
+
+    private static final int NO_LINE = -1;
+
+    public ApplicationModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
     }
-    final Path root = Paths.get(realPath);
-    if (!Files.exists(root)) {
-      return;
-    }
-    final AgentSpan span = AgentTracer.activeSpan();
-    checkInsecureJSPLayout(root, span);
-    checkWebXmlVulnerabilities(root, span);
-    // WEBLOGIC
-    checkWeblogicVulnerabilities(root, span);
-    // WEBSPHERE
-    checkWebsphereVulnerabilities(root, span);
-  }
-
-  /**
-   * Overhead is not checked here as it's called once per application context
-   *
-   * @param sessionTrackingModes the session tracking modes
-   */
-  @Override
-  public void checkSessionTrackingModes(@Nonnull Set<String> sessionTrackingModes) {
-    if (!sessionTrackingModes.contains("URL")) {
-      return;
-    }
-    final AgentSpan span = AgentTracer.activeSpan();
-    // No deduplication is needed as same service can have multiple applications
-    reporter.report(
-        span,
-        new Vulnerability(
-            VulnerabilityType.SESSION_REWRITING,
-            Location.forSpan(span),
-            new Evidence(SESSION_REWRITING_EVIDENCE_VALUE)));
-  }
-
-  private void checkWebsphereVulnerabilities(@Nonnull final Path path, final AgentSpan span) {
-    checkWebsphereXMLVulnerabilities(path, span);
-    checkWebsphereXMIVulnerabilities(path, span);
-  }
-
-  private void checkWebsphereXMIVulnerabilities(@Nonnull final Path path, final AgentSpan span) {
-    String xmlContent = getXmlContent(path, IBM_WEB_EXT_XMI);
-    if (xmlContent == null) {
-      return;
+
+    /**
+     * Overhead is not checked here as it's called once per application context
+     *
+     * @param realPath the real path of the application
+     */
+    @Override
+    public void onRealPath(final @Nullable String realPath) {
+        if (realPath == null) {
+            return;
+        }
+        final Path root = Paths.get(realPath);
+        if (!Files.exists(root)) {
+            return;
+        }
+        final AgentSpan span = AgentTracer.activeSpan();
+        checkInsecureJSPLayout(root, span);
+        checkWebXmlVulnerabilities(root, span);
+        // WEBLOGIC
+        checkWeblogicVulnerabilities(root, span);
+        // WEBSPHERE
+        checkWebsphereVulnerabilities(root, span);
     }
-    Matcher matcher = WEBSPHERE_XMI_PATTERN.matcher(xmlContent);
-    while (matcher.find()) {
-      reportDirectoryListingLeak(xmlContent, matcher.start(), span);
+
+    /**
+     * Overhead is not checked here as it's called once per application context
+     *
+     * @param sessionTrackingModes the session tracking modes
+     */
+    @Override
+    public void checkSessionTrackingModes(@Nonnull Set<String> sessionTrackingModes) {
+        if (!sessionTrackingModes.contains("URL")) {
+            return;
+        }
+        final AgentSpan span = AgentTracer.activeSpan();
+        // No deduplication is needed as same service can have multiple applications
+        reporter.report(
+                span,
+                new Vulnerability(
+                        VulnerabilityType.SESSION_REWRITING,
+                        Location.forSpan(span),
+                        new Evidence(SESSION_REWRITING_EVIDENCE_VALUE)));
     }
-  }
 
-  private void checkWebsphereXMLVulnerabilities(@Nonnull final Path path, final AgentSpan span) {
-    String xmlContent = getXmlContent(path, IBM_WEB_EXT_XML);
-    if (xmlContent == null) {
-      return;
+    private void checkWebsphereVulnerabilities(@Nonnull final Path path, final AgentSpan span) {
+        checkWebsphereXMLVulnerabilities(path, span);
+        checkWebsphereXMIVulnerabilities(path, span);
     }
-    Matcher matcher = WEBSPHERE_XML_PATTERN.matcher(xmlContent);
-    while (matcher.find()) {
-      reportDirectoryListingLeak(xmlContent, matcher.start(), span);
+
+    private void checkWebsphereXMIVulnerabilities(@Nonnull final Path path, final AgentSpan span) {
+        String xmlContent = getXmlContent(path, IBM_WEB_EXT_XMI);
+        if (xmlContent == null) {
+            return;
+        }
+        Matcher matcher = WEBSPHERE_XMI_PATTERN.matcher(xmlContent);
+        while (matcher.find()) {
+            reportDirectoryListingLeak(xmlContent, matcher.start(), span);
+        }
     }
-  }
 
-  private void checkWeblogicVulnerabilities(@Nonnull final Path path, final AgentSpan span) {
-    String xmlContent = getXmlContent(path, WEBLOGIC_XML);
-    if (xmlContent == null) {
-      return;
+    private void checkWebsphereXMLVulnerabilities(@Nonnull final Path path, final AgentSpan span) {
+        String xmlContent = getXmlContent(path, IBM_WEB_EXT_XML);
+        if (xmlContent == null) {
+            return;
+        }
+        Matcher matcher = WEBSPHERE_XML_PATTERN.matcher(xmlContent);
+        while (matcher.find()) {
+            reportDirectoryListingLeak(xmlContent, matcher.start(), span);
+        }
     }
-    Matcher matcher = WEBLOGIC_PATTERN.matcher(xmlContent);
-    while (matcher.find()) {
-      reportDirectoryListingLeak(xmlContent, matcher.start(), span);
+
+    private void checkWeblogicVulnerabilities(@Nonnull final Path path, final AgentSpan span) {
+        String xmlContent = getXmlContent(path, WEBLOGIC_XML);
+        if (xmlContent == null) {
+            return;
+        }
+        Matcher matcher = WEBLOGIC_PATTERN.matcher(xmlContent);
+        while (matcher.find()) {
+            reportDirectoryListingLeak(xmlContent, matcher.start(), span);
+        }
     }
-  }
 
-  private void checkWebXmlVulnerabilities(@Nonnull final Path path, final AgentSpan span) {
-    String webXmlContent = getXmlContent(path, WEB_XML);
-    if (webXmlContent == null) {
-      return;
+    private void checkWebXmlVulnerabilities(@Nonnull final Path path, final AgentSpan span) {
+        String webXmlContent = getXmlContent(path, WEB_XML);
+        if (webXmlContent == null) {
+            return;
+        }
+
+        int defaultHtmlEscapeIndex = -1;
+        boolean isSpring = false;
+
+        Matcher matcher = PATTERN.matcher(webXmlContent);
+        while (matcher.find()) {
+            String match = matcher.group();
+            switch (match) {
+                case DISPATCHER_SERVLET:
+                case CONTEXT_LOADER_LISTENER:
+                    isSpring = true;
+                    break;
+                case DEFAULT_HTML_ESCAPE:
+                    defaultHtmlEscapeIndex = matcher.start();
+                    break;
+                case LISTINGS_PATTERN:
+                case JETTY_LISTINGS_PATTERN:
+                    checkDirectoryListingLeak(webXmlContent, matcher.start(), span);
+                    break;
+                case SESSION_TIMEOUT_START_TAG:
+                    checkSessionTimeOut(webXmlContent, matcher.start(), span);
+                    break;
+                case SECURITY_CONSTRAINT_START_TAG:
+                    checkVerbTampering(webXmlContent, matcher.start(), span);
+                    break;
+                default: // DISPLAY NAME MATCH
+                    String displayName = matcher.group(1);
+                    if (ADMIN_CONSOLE_LIST.contains(displayName)) {
+                        reportAdminConsoleActive(span, displayName);
+                    } else if (DEFAULT_APP_LIST.contains(displayName)) {
+                        reportDefaultAppDeployed(span, displayName);
+                    }
+                    break;
+            }
+        }
+
+        if (isSpring) {
+            checkDefaultHtmlEscapeInvalid(webXmlContent, defaultHtmlEscapeIndex, span);
+        }
     }
 
-    int defaultHtmlEscapeIndex = -1;
-    boolean isSpring = false;
-
-    Matcher matcher = PATTERN.matcher(webXmlContent);
-    while (matcher.find()) {
-      String match = matcher.group();
-      switch (match) {
-        case DISPATCHER_SERVLET:
-        case CONTEXT_LOADER_LISTENER:
-          isSpring = true;
-          break;
-        case DEFAULT_HTML_ESCAPE:
-          defaultHtmlEscapeIndex = matcher.start();
-          break;
-        case LISTINGS_PATTERN:
-        case JETTY_LISTINGS_PATTERN:
-          checkDirectoryListingLeak(webXmlContent, matcher.start(), span);
-          break;
-        case SESSION_TIMEOUT_START_TAG:
-          checkSessionTimeOut(webXmlContent, matcher.start(), span);
-          break;
-        case SECURITY_CONSTRAINT_START_TAG:
-          checkVerbTampering(webXmlContent, matcher.start(), span);
-          break;
-        default: // DISPLAY NAME MATCH
-          String displayName = matcher.group(1);
-          if (ADMIN_CONSOLE_LIST.contains(displayName)) {
-            reportAdminConsoleActive(span, displayName);
-          } else if (DEFAULT_APP_LIST.contains(displayName)) {
-            reportDefaultAppDeployed(span, displayName);
-          }
-          break;
-      }
+    private void checkDefaultHtmlEscapeInvalid(
+            @Nonnull String webXmlContent, int defaultHtmlEscapeIndex, AgentSpan span) {
+        if (defaultHtmlEscapeIndex != -1) {
+            int start = webXmlContent.indexOf(PARAM_VALUE_START_TAG, defaultHtmlEscapeIndex)
+                    + PARAM_VALUE_START_TAG.length();
+            String value = substringTrim(webXmlContent, start, webXmlContent.indexOf(PARAM_VALUE_END_TAG, start));
+            if (!value.equalsIgnoreCase("true")) {
+                report(
+                        span,
+                        VulnerabilityType.DEFAULT_HTML_ESCAPE_INVALID,
+                        "defaultHtmlEscape tag should be true",
+                        getLine(webXmlContent, start));
+            }
+        } else {
+            report(span, VulnerabilityType.DEFAULT_HTML_ESCAPE_INVALID, "defaultHtmlEscape tag should be set", NO_LINE);
+        }
     }
 
-    if (isSpring) {
-      checkDefaultHtmlEscapeInvalid(webXmlContent, defaultHtmlEscapeIndex, span);
+    private void reportAdminConsoleActive(AgentSpan span, final String evidence) {
+        // No deduplication is needed as same service can have multiple applications
+        reporter.report(
+                span,
+                new Vulnerability(
+                        VulnerabilityType.ADMIN_CONSOLE_ACTIVE, Location.forSpan(span), new Evidence(evidence)));
     }
-  }
-
-  private void checkDefaultHtmlEscapeInvalid(
-      @Nonnull String webXmlContent, int defaultHtmlEscapeIndex, AgentSpan span) {
-    if (defaultHtmlEscapeIndex != -1) {
-      int start =
-          webXmlContent.indexOf(PARAM_VALUE_START_TAG, defaultHtmlEscapeIndex)
-              + PARAM_VALUE_START_TAG.length();
-      String value =
-          substringTrim(webXmlContent, start, webXmlContent.indexOf(PARAM_VALUE_END_TAG, start));
-      if (!value.equalsIgnoreCase("true")) {
-        report(
-            span,
-            VulnerabilityType.DEFAULT_HTML_ESCAPE_INVALID,
-            "defaultHtmlEscape tag should be true",
-            getLine(webXmlContent, start));
-      }
-    } else {
-      report(
-          span,
-          VulnerabilityType.DEFAULT_HTML_ESCAPE_INVALID,
-          "defaultHtmlEscape tag should be set",
-          NO_LINE);
+
+    private void reportDefaultAppDeployed(final AgentSpan span, final String evidence) {
+        reporter.report(
+                span,
+                new Vulnerability(
+                        VulnerabilityType.DEFAULT_APP_DEPLOYED, Location.forSpan(span), new Evidence(evidence)));
     }
-  }
-
-  private void reportAdminConsoleActive(AgentSpan span, final String evidence) {
-    // No deduplication is needed as same service can have multiple applications
-    reporter.report(
-        span,
-        new Vulnerability(
-            VulnerabilityType.ADMIN_CONSOLE_ACTIVE,
-            Location.forSpan(span),
-            new Evidence(evidence)));
-  }
-
-  private void reportDefaultAppDeployed(final AgentSpan span, final String evidence) {
-    reporter.report(
-        span,
-        new Vulnerability(
-            VulnerabilityType.DEFAULT_APP_DEPLOYED,
-            Location.forSpan(span),
-            new Evidence(evidence)));
-  }
-
-  private void checkDirectoryListingLeak(
-      final String webXmlContent, int index, final AgentSpan span) {
-    int valueIndex =
-        webXmlContent.indexOf(PARAM_VALUE_START_TAG, index) + PARAM_VALUE_START_TAG.length();
-    int valueLast = webXmlContent.indexOf(PARAM_VALUE_END_TAG, valueIndex);
-    String data = substringTrim(webXmlContent, valueIndex, valueLast);
-    if (data.equalsIgnoreCase("true")) {
-      reportDirectoryListingLeak(webXmlContent, index, span);
+
+    private void checkDirectoryListingLeak(final String webXmlContent, int index, final AgentSpan span) {
+        int valueIndex = webXmlContent.indexOf(PARAM_VALUE_START_TAG, index) + PARAM_VALUE_START_TAG.length();
+        int valueLast = webXmlContent.indexOf(PARAM_VALUE_END_TAG, valueIndex);
+        String data = substringTrim(webXmlContent, valueIndex, valueLast);
+        if (data.equalsIgnoreCase("true")) {
+            reportDirectoryListingLeak(webXmlContent, index, span);
+        }
     }
-  }
-
-  private void reportDirectoryListingLeak(
-      final String webXmlContent, int index, final AgentSpan span) {
-    report(
-        span,
-        VulnerabilityType.DIRECTORY_LISTING_LEAK,
-        "Directory listings configured",
-        getLine(webXmlContent, index));
-  }
-
-  private void checkSessionTimeOut(final String webXmlContent, int index, final AgentSpan span) {
-    try {
-      String innerText =
-          substringTrim(
-              webXmlContent,
-              index + SESSION_TIMEOUT_START_TAG.length(),
-              webXmlContent.indexOf(SESSION_TIMEOUT_END_TAG, index));
-      int timeoutValue = Integer.parseInt(innerText);
-      if (timeoutValue > 30 || timeoutValue == -1) {
+
+    private void reportDirectoryListingLeak(final String webXmlContent, int index, final AgentSpan span) {
         report(
-            span,
-            VulnerabilityType.SESSION_TIMEOUT,
-            "Found vulnerable timeout value: " + timeoutValue,
-            getLine(webXmlContent, index));
-      }
-    } catch (NumberFormatException e) {
-      // Nothing to do
+                span,
+                VulnerabilityType.DIRECTORY_LISTING_LEAK,
+                "Directory listings configured",
+                getLine(webXmlContent, index));
     }
-  }
-
-  private void checkVerbTampering(final String webXmlContent, int index, final AgentSpan span) {
-    String innerText =
-        substringTrim(
-            webXmlContent,
-            index + SECURITY_CONSTRAINT_START_TAG.length(),
-            webXmlContent.indexOf(SECURITY_CONSTRAINT_END_TAG, index));
-    if (!innerText.contains("<http-method>")) {
-      report(
-          span,
-          VulnerabilityType.VERB_TAMPERING,
-          "http-method not defined in web.xml",
-          getLine(webXmlContent, index));
-    }
-  }
-
-  private void report(AgentSpan span, VulnerabilityType type, String value, int line) {
-    reporter.report(
-        span,
-        new Vulnerability(
-            type, Location.forSpanAndFileAndLine(span, WEB_XML, line), new Evidence(value)));
-  }
-
-  private void checkInsecureJSPLayout(@Nonnull Path path, AgentSpan span) {
-    final Collection<Path> jspPaths = findInsecureJspPaths(path);
-    if (jspPaths.isEmpty()) {
-      return;
-    }
-    String result =
-        jspPaths.stream()
-            .map(jspFolder -> relativize(path, jspFolder))
-            .collect(Collectors.joining(System.lineSeparator()));
-    reporter.report(
-        span,
-        new Vulnerability(
-            VulnerabilityType.INSECURE_JSP_LAYOUT, Location.forSpan(span), new Evidence(result)));
-  }
-
-  private static int getLine(String webXmlContent, int index) {
-    int line = 1;
-    int limit = Math.min(index, webXmlContent.length());
-    for (int i = limit; i > 0; i--) {
-      if (webXmlContent.charAt(i) == '\n') {
-        line++;
-      }
-    }
-    return line;
-  }
-
-  @Nullable
-  private static String getXmlContent(final Path realPath, final String fileName) {
-    Path path = realPath.resolve(WEB_INF).resolve(fileName);
-    if (Files.exists(path)) {
-      try {
-        return new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
-      } catch (IOException e) {
-        LOGGER.debug(SEND_TELEMETRY, "Failed to read {}, encoding issue?", path, e);
-      }
+
+    private void checkSessionTimeOut(final String webXmlContent, int index, final AgentSpan span) {
+        try {
+            String innerText = substringTrim(
+                    webXmlContent,
+                    index + SESSION_TIMEOUT_START_TAG.length(),
+                    webXmlContent.indexOf(SESSION_TIMEOUT_END_TAG, index));
+            int timeoutValue = Integer.parseInt(innerText);
+            if (timeoutValue > 30 || timeoutValue == -1) {
+                report(
+                        span,
+                        VulnerabilityType.SESSION_TIMEOUT,
+                        "Found vulnerable timeout value: " + timeoutValue,
+                        getLine(webXmlContent, index));
+            }
+        } catch (NumberFormatException e) {
+            // Nothing to do
+        }
     }
-    return null;
-  }
-
-  private static Collection<Path> findInsecureJspPaths(final Path root) {
-    try {
-      final InsecureJspFolderVisitor visitor = new InsecureJspFolderVisitor();
-      // TODO is it OK to ignore symlinks here?
-      Files.walkFileTree(root, EnumSet.noneOf(FileVisitOption.class), JSP_MAX_WALK_DEPTH, visitor);
-      return visitor.folders;
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+
+    private void checkVerbTampering(final String webXmlContent, int index, final AgentSpan span) {
+        String innerText = substringTrim(
+                webXmlContent,
+                index + SECURITY_CONSTRAINT_START_TAG.length(),
+                webXmlContent.indexOf(SECURITY_CONSTRAINT_END_TAG, index));
+        if (!innerText.contains("<http-method>")) {
+            report(
+                    span,
+                    VulnerabilityType.VERB_TAMPERING,
+                    "http-method not defined in web.xml",
+                    getLine(webXmlContent, index));
+        }
     }
-  }
 
-  private static String relativize(final Path root, final Path path) {
-    final String relative = root.relativize(path).toString();
-    if (relative.isEmpty()) {
-      return File.separator;
+    private void report(AgentSpan span, VulnerabilityType type, String value, int line) {
+        reporter.report(
+                span,
+                new Vulnerability(type, Location.forSpanAndFileAndLine(span, WEB_XML, line), new Evidence(value)));
     }
-    if (relative.charAt(0) == File.separatorChar) {
-      return relative;
+
+    private void checkInsecureJSPLayout(@Nonnull Path path, AgentSpan span) {
+        final Collection<Path> jspPaths = findInsecureJspPaths(path);
+        if (jspPaths.isEmpty()) {
+            return;
+        }
+        String result = jspPaths.stream()
+                .map(jspFolder -> relativize(path, jspFolder))
+                .collect(Collectors.joining(System.lineSeparator()));
+        reporter.report(
+                span,
+                new Vulnerability(VulnerabilityType.INSECURE_JSP_LAYOUT, Location.forSpan(span), new Evidence(result)));
     }
-    return File.separatorChar + relative;
-  }
 
-  private static class InsecureJspFolderVisitor implements FileVisitor<Path> {
-    private final Set<Path> folders = new HashSet<>();
+    private static int getLine(String webXmlContent, int index) {
+        int line = 1;
+        int limit = Math.min(index, webXmlContent.length());
+        for (int i = limit; i > 0; i--) {
+            if (webXmlContent.charAt(i) == '\n') {
+                line++;
+            }
+        }
+        return line;
+    }
 
-    @Override
-    public FileVisitResult preVisitDirectory(final Path dir, final BasicFileAttributes attrs) {
-      final Path fileName = dir.getFileName();
-      if (fileName == null) {
-        return FileVisitResult.CONTINUE;
-      }
-      final String folder = fileName.toString();
-      if (endsWithIgnoreCase(folder, WEB_INF)) {
-        return FileVisitResult.SKIP_SUBTREE;
-      }
-      return FileVisitResult.CONTINUE;
+    @Nullable
+    private static String getXmlContent(final Path realPath, final String fileName) {
+        Path path = realPath.resolve(WEB_INF).resolve(fileName);
+        if (Files.exists(path)) {
+            try {
+                return new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
+            } catch (IOException e) {
+                LOGGER.debug(SEND_TELEMETRY, "Failed to read {}, encoding issue?", path, e);
+            }
+        }
+        return null;
     }
 
-    @Override
-    public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) {
-      final String fileName = file.getFileName().toString();
-      if (endsWithIgnoreCase(fileName, ".jsp") || endsWithIgnoreCase(fileName, ".jspx")) {
-        folders.add(file.getParent());
-        return FileVisitResult.SKIP_SIBLINGS;
-      }
-      return FileVisitResult.CONTINUE;
+    private static Collection<Path> findInsecureJspPaths(final Path root) {
+        try {
+            final InsecureJspFolderVisitor visitor = new InsecureJspFolderVisitor();
+            // TODO is it OK to ignore symlinks here?
+            Files.walkFileTree(root, EnumSet.noneOf(FileVisitOption.class), JSP_MAX_WALK_DEPTH, visitor);
+            return visitor.folders;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    @Override
-    public FileVisitResult visitFileFailed(final Path file, final IOException exc) {
-      return FileVisitResult.CONTINUE;
+    private static String relativize(final Path root, final Path path) {
+        final String relative = root.relativize(path).toString();
+        if (relative.isEmpty()) {
+            return File.separator;
+        }
+        if (relative.charAt(0) == File.separatorChar) {
+            return relative;
+        }
+        return File.separatorChar + relative;
     }
 
-    @Override
-    public FileVisitResult postVisitDirectory(final Path dir, final IOException exc) {
-      return FileVisitResult.CONTINUE;
+    private static class InsecureJspFolderVisitor implements FileVisitor<Path> {
+        private final Set<Path> folders = new HashSet<>();
+
+        @Override
+        public FileVisitResult preVisitDirectory(final Path dir, final BasicFileAttributes attrs) {
+            final Path fileName = dir.getFileName();
+            if (fileName == null) {
+                return FileVisitResult.CONTINUE;
+            }
+            final String folder = fileName.toString();
+            if (endsWithIgnoreCase(folder, WEB_INF)) {
+                return FileVisitResult.SKIP_SUBTREE;
+            }
+            return FileVisitResult.CONTINUE;
+        }
+
+        @Override
+        public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) {
+            final String fileName = file.getFileName().toString();
+            if (endsWithIgnoreCase(fileName, ".jsp") || endsWithIgnoreCase(fileName, ".jspx")) {
+                folders.add(file.getParent());
+                return FileVisitResult.SKIP_SIBLINGS;
+            }
+            return FileVisitResult.CONTINUE;
+        }
+
+        @Override
+        public FileVisitResult visitFileFailed(final Path file, final IOException exc) {
+            return FileVisitResult.CONTINUE;
+        }
+
+        @Override
+        public FileVisitResult postVisitDirectory(final Path dir, final IOException exc) {
+            return FileVisitResult.CONTINUE;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/CodeInjectionModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/CodeInjectionModuleImpl.java
index 770300da0e5..9d66b27377e 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/CodeInjectionModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/CodeInjectionModuleImpl.java
@@ -12,24 +12,24 @@
 
 public class CodeInjectionModuleImpl extends SinkModuleBase implements CodeInjectionModule {
 
-  public CodeInjectionModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
+    public CodeInjectionModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
+    }
 
-  @Override
-  public void onEval(@Nonnull Reader reader) {
-    // IAST propagates taint only to StringReader and InputStreamReader.
-    if (!(reader instanceof StringReader) && !(reader instanceof InputStreamReader)) {
-      return;
+    @Override
+    public void onEval(@Nonnull Reader reader) {
+        // IAST propagates taint only to StringReader and InputStreamReader.
+        if (!(reader instanceof StringReader) && !(reader instanceof InputStreamReader)) {
+            return;
+        }
+        checkInjection(VulnerabilityType.CODE_INJECTION, reader);
     }
-    checkInjection(VulnerabilityType.CODE_INJECTION, reader);
-  }
 
-  @Override
-  public void onEval(@Nonnull String script) {
-    if (!canBeTainted(script)) {
-      return;
+    @Override
+    public void onEval(@Nonnull String script) {
+        if (!canBeTainted(script)) {
+            return;
+        }
+        checkInjection(VulnerabilityType.CODE_INJECTION, script);
     }
-    checkInjection(VulnerabilityType.CODE_INJECTION, script);
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/CommandInjectionModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/CommandInjectionModuleImpl.java
index ac180f06fc9..f19bd110f61 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/CommandInjectionModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/CommandInjectionModuleImpl.java
@@ -12,33 +12,31 @@
 
 public class CommandInjectionModuleImpl extends SinkModuleBase implements CommandInjectionModule {
 
-  public CommandInjectionModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
+    public CommandInjectionModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
+    }
 
-  @Override
-  public void onRuntimeExec(@Nullable final String[] cmdArray) {
-    if (!canBeTainted(cmdArray)) {
-      return;
+    @Override
+    public void onRuntimeExec(@Nullable final String[] cmdArray) {
+        if (!canBeTainted(cmdArray)) {
+            return;
+        }
+        checkInjection(VulnerabilityType.COMMAND_INJECTION, Iterators.of(cmdArray));
     }
-    checkInjection(VulnerabilityType.COMMAND_INJECTION, Iterators.of(cmdArray));
-  }
 
-  @Override
-  public void onRuntimeExec(@Nullable final String[] env, @Nonnull final String[] command) {
-    if (!canBeTainted(command) && !canBeTainted(env)) {
-      return;
+    @Override
+    public void onRuntimeExec(@Nullable final String[] env, @Nonnull final String[] command) {
+        if (!canBeTainted(command) && !canBeTainted(env)) {
+            return;
+        }
+        checkInjection(VulnerabilityType.COMMAND_INJECTION, Iterators.join(Iterators.of(env), Iterators.of(command)));
     }
-    checkInjection(
-        VulnerabilityType.COMMAND_INJECTION,
-        Iterators.join(Iterators.of(env), Iterators.of(command)));
-  }
 
-  @Override
-  public void onProcessBuilderStart(@Nullable final List<String> command) {
-    if (!canBeTainted(command)) {
-      return;
+    @Override
+    public void onProcessBuilderStart(@Nullable final List<String> command) {
+        if (!canBeTainted(command)) {
+            return;
+        }
+        checkInjection(VulnerabilityType.COMMAND_INJECTION, command.iterator());
     }
-    checkInjection(VulnerabilityType.COMMAND_INJECTION, command.iterator());
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/EmailInjectionModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/EmailInjectionModuleImpl.java
index ab524c2e108..c4902a29406 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/EmailInjectionModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/EmailInjectionModuleImpl.java
@@ -6,15 +6,15 @@
 import javax.annotation.Nullable;
 
 public class EmailInjectionModuleImpl extends SinkModuleBase implements EmailInjectionModule {
-  public EmailInjectionModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
+    public EmailInjectionModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
+    }
 
-  @Override
-  public void onSendEmail(@Nullable final Object messageContent) {
-    if (messageContent == null) {
-      return;
+    @Override
+    public void onSendEmail(@Nullable final Object messageContent) {
+        if (messageContent == null) {
+            return;
+        }
+        checkInjection(VulnerabilityType.EMAIL_HTML_INJECTION, messageContent);
     }
-    checkInjection(VulnerabilityType.EMAIL_HTML_INJECTION, messageContent);
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HardcodedSecretModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HardcodedSecretModuleImpl.java
index 55c83d075a2..e839ea91035 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HardcodedSecretModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HardcodedSecretModuleImpl.java
@@ -10,22 +10,22 @@
 
 public class HardcodedSecretModuleImpl extends SinkModuleBase implements HardcodedSecretModule {
 
-  public HardcodedSecretModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
+    public HardcodedSecretModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
+    }
 
-  @Override
-  public void onHardcodedSecret(
-      @Nonnull final String value,
-      @Nonnull final String method,
-      @Nonnull final String clazz,
-      final int currentLine) {
+    @Override
+    public void onHardcodedSecret(
+            @Nonnull final String value,
+            @Nonnull final String method,
+            @Nonnull final String clazz,
+            final int currentLine) {
 
-    reporter.report(
-        null,
-        new Vulnerability(
-            VulnerabilityType.HARDCODED_SECRET,
-            Location.forClassAndMethodAndLine(clazz, method, currentLine),
-            new Evidence(value)));
-  }
+        reporter.report(
+                null,
+                new Vulnerability(
+                        VulnerabilityType.HARDCODED_SECRET,
+                        Location.forClassAndMethodAndLine(clazz, method, currentLine),
+                        new Evidence(value)));
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HeaderInjectionModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HeaderInjectionModuleImpl.java
index 69637bf6c25..14a088b3bfc 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HeaderInjectionModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HeaderInjectionModuleImpl.java
@@ -27,123 +27,122 @@
 
 public class HeaderInjectionModuleImpl extends SinkModuleBase implements HeaderInjectionModule {
 
-  private static final Set<HttpHeader> headerInjectionExclusions =
-      EnumSet.of(SEC_WEBSOCKET_LOCATION, SEC_WEBSOCKET_ACCEPT, UPGRADE, CONNECTION, LOCATION);
+    private static final Set<HttpHeader> headerInjectionExclusions =
+            EnumSet.of(SEC_WEBSOCKET_LOCATION, SEC_WEBSOCKET_ACCEPT, UPGRADE, CONNECTION, LOCATION);
 
-  private static final String ACCESS_CONTROL_ALLOW_PREFIX = "ACCESS-CONTROL-ALLOW-";
+    private static final String ACCESS_CONTROL_ALLOW_PREFIX = "ACCESS-CONTROL-ALLOW-";
 
-  public HeaderInjectionModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
-
-  @Override
-  public void onHeader(@Nonnull final String name, @Nullable final String value) {
-    if (null == value) {
-      return;
+    public HeaderInjectionModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
     }
 
-    HttpHeader header = HttpHeader.from(name);
-    if (headerInjectionExclusions.contains(header)) {
-      return;
-    }
+    @Override
+    public void onHeader(@Nonnull final String name, @Nullable final String value) {
+        if (null == value) {
+            return;
+        }
 
-    checkInjection(
-        VulnerabilityType.HEADER_INJECTION,
-        value,
-        new HeaderInjectionEvidenceBuilder(name, header));
-  }
+        HttpHeader header = HttpHeader.from(name);
+        if (headerInjectionExclusions.contains(header)) {
+            return;
+        }
 
-  private static class HeaderInjectionEvidenceBuilder implements EvidenceBuilder {
+        checkInjection(VulnerabilityType.HEADER_INJECTION, value, new HeaderInjectionEvidenceBuilder(name, header));
+    }
 
-    private final String name;
-    @Nullable private final HttpHeader header;
+    private static class HeaderInjectionEvidenceBuilder implements EvidenceBuilder {
 
-    private HeaderInjectionEvidenceBuilder(final String name, @Nullable final HttpHeader header) {
-      this.name = name;
-      this.header = header;
-    }
+        private final String name;
 
-    @Override
-    public void tainted(
-        final StringBuilder evidence,
-        final RangeBuilder ranges,
-        final Object value,
-        final Range[] valueRanges) {
-      if (shouldIgnoreHeader(valueRanges)) {
-        return;
-      }
-      evidence.append(name).append(": ").append(value);
-      ranges.add(valueRanges, name.length() + 2);
-    }
+        @Nullable
+        private final HttpHeader header;
 
-    private boolean shouldIgnoreHeader(final Range[] valueRanges) {
-      if (header != null) {
-        switch (header) {
-          case SET_COOKIE:
-          case SET_COOKIE2:
-            if (ignoreSetCookieHeader(valueRanges)) {
-              return true;
-            }
-            break;
-          case PRAGMA:
-            if (ignorePragmaHeader(valueRanges)) {
-              return true;
-            }
-            break;
-          case TRANSFER_ENCODING:
-          case CONTENT_ENCODING:
-            if (ignoreEncodingHeader(valueRanges)) {
-              return true;
-            }
-            break;
-          case VARY:
-            if (ignoreVaryHeader(valueRanges)) {
-              return true;
+        private HeaderInjectionEvidenceBuilder(final String name, @Nullable final HttpHeader header) {
+            this.name = name;
+            this.header = header;
+        }
+
+        @Override
+        public void tainted(
+                final StringBuilder evidence,
+                final RangeBuilder ranges,
+                final Object value,
+                final Range[] valueRanges) {
+            if (shouldIgnoreHeader(valueRanges)) {
+                return;
             }
-            break;
+            evidence.append(name).append(": ").append(value);
+            ranges.add(valueRanges, name.length() + 2);
         }
-      }
 
-      return ignoreAccessControlAllow(valueRanges) || ignoreReflectedHeader(valueRanges);
-    }
+        private boolean shouldIgnoreHeader(final Range[] valueRanges) {
+            if (header != null) {
+                switch (header) {
+                    case SET_COOKIE:
+                    case SET_COOKIE2:
+                        if (ignoreSetCookieHeader(valueRanges)) {
+                            return true;
+                        }
+                        break;
+                    case PRAGMA:
+                        if (ignorePragmaHeader(valueRanges)) {
+                            return true;
+                        }
+                        break;
+                    case TRANSFER_ENCODING:
+                    case CONTENT_ENCODING:
+                        if (ignoreEncodingHeader(valueRanges)) {
+                            return true;
+                        }
+                        break;
+                    case VARY:
+                        if (ignoreVaryHeader(valueRanges)) {
+                            return true;
+                        }
+                        break;
+                }
+            }
 
-    /** Ignore pragma headers when the source is the cache control header. */
-    private boolean ignorePragmaHeader(final Range[] ranges) {
-      return allRangesFromHeader(CACHE_CONTROL, ranges);
-    }
+            return ignoreAccessControlAllow(valueRanges) || ignoreReflectedHeader(valueRanges);
+        }
 
-    /**
-     * Ignore transfer and content encoding headers when the source is the accept encoding header.
-     */
-    private boolean ignoreEncodingHeader(final Range[] ranges) {
-      return allRangesFromHeader(ACCEPT_ENCODING, ranges);
-    }
+        /** Ignore pragma headers when the source is the cache control header. */
+        private boolean ignorePragmaHeader(final Range[] ranges) {
+            return allRangesFromHeader(CACHE_CONTROL, ranges);
+        }
 
-    /** Ignore vary header when the sources are only header names */
-    private boolean ignoreVaryHeader(final Range[] ranges) {
-      return allRangesFromSource(REQUEST_HEADER_NAME, ranges);
-    }
+        /**
+         * Ignore transfer and content encoding headers when the source is the accept encoding header.
+         */
+        private boolean ignoreEncodingHeader(final Range[] ranges) {
+            return allRangesFromHeader(ACCEPT_ENCODING, ranges);
+        }
 
-    /**
-     * Exclude access-control-allow-*: when the header starts with access-control-allow- and the
-     * source of the tainted range is a request header
-     */
-    private boolean ignoreAccessControlAllow(final Range[] ranges) {
-      return nameMatchesPrefix(ACCESS_CONTROL_ALLOW_PREFIX) && allRangesFromAnyHeader(ranges);
-    }
+        /** Ignore vary header when the sources are only header names */
+        private boolean ignoreVaryHeader(final Range[] ranges) {
+            return allRangesFromSource(REQUEST_HEADER_NAME, ranges);
+        }
 
-    /** Exclude set-cookie header if the source of all the tainted ranges are cookies */
-    private boolean ignoreSetCookieHeader(final Range[] ranges) {
-      return allRangesFromHeader(COOKIE, ranges);
-    }
+        /**
+         * Exclude access-control-allow-*: when the header starts with access-control-allow- and the
+         * source of the tainted range is a request header
+         */
+        private boolean ignoreAccessControlAllow(final Range[] ranges) {
+            return nameMatchesPrefix(ACCESS_CONTROL_ALLOW_PREFIX) && allRangesFromAnyHeader(ranges);
+        }
 
-    /** Exclude when the header is reflected from the request */
-    private boolean ignoreReflectedHeader(final Range[] ranges) {
-      return ranges.length == 1 && rangeFromHeader(name, ranges[0]);
-    }
+        /** Exclude set-cookie header if the source of all the tainted ranges are cookies */
+        private boolean ignoreSetCookieHeader(final Range[] ranges) {
+            return allRangesFromHeader(COOKIE, ranges);
+        }
 
-    private boolean nameMatchesPrefix(final String prefix) {
-      return name.regionMatches(true, 0, prefix, 0, prefix.length());
+        /** Exclude when the header is reflected from the request */
+        private boolean ignoreReflectedHeader(final Range[] ranges) {
+            return ranges.length == 1 && rangeFromHeader(name, ranges[0]);
+        }
+
+        private boolean nameMatchesPrefix(final String prefix) {
+            return name.regionMatches(true, 0, prefix, 0, prefix.length());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HstsMissingHeaderModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HstsMissingHeaderModuleImpl.java
index c96247c8870..4ad84b15136 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HstsMissingHeaderModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HstsMissingHeaderModuleImpl.java
@@ -18,66 +18,64 @@
 import org.slf4j.LoggerFactory;
 
 public class HstsMissingHeaderModuleImpl extends SinkModuleBase implements HstsMissingHeaderModule {
-  private static final Pattern MAX_AGE =
-      Pattern.compile("max-age=(\\d+)", Pattern.CASE_INSENSITIVE);
+    private static final Pattern MAX_AGE = Pattern.compile("max-age=(\\d+)", Pattern.CASE_INSENSITIVE);
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(HstsMissingHeaderModuleImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(HstsMissingHeaderModuleImpl.class);
 
-  public HstsMissingHeaderModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
-
-  @Override
-  public void onRequestEnd(final IastContext ctx, final IGSpanInfo igSpanInfo) {
-    if (!(ctx instanceof IastRequestContext)) {
-      return;
+    public HstsMissingHeaderModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
     }
-    final IastRequestContext iastRequestContext = (IastRequestContext) ctx;
 
-    if (!isValidMaxAge(iastRequestContext.getStrictTransportSecurity())) {
-      try {
-        Map<String, Object> tags = igSpanInfo.getTags();
-        String urlString = (String) tags.get("http.url");
-        Integer httpStatus = (Integer) tags.get("http.status_code");
-        if (isIgnorableResponseCode(httpStatus)) {
-          return;
-        }
-        if (!isHtmlResponse(iastRequestContext.getContentType())) {
-          return;
+    @Override
+    public void onRequestEnd(final IastContext ctx, final IGSpanInfo igSpanInfo) {
+        if (!(ctx instanceof IastRequestContext)) {
+            return;
         }
-        if (!isHttps(urlString, iastRequestContext.getxForwardedProto())) {
-          return;
+        final IastRequestContext iastRequestContext = (IastRequestContext) ctx;
+
+        if (!isValidMaxAge(iastRequestContext.getStrictTransportSecurity())) {
+            try {
+                Map<String, Object> tags = igSpanInfo.getTags();
+                String urlString = (String) tags.get("http.url");
+                Integer httpStatus = (Integer) tags.get("http.status_code");
+                if (isIgnorableResponseCode(httpStatus)) {
+                    return;
+                }
+                if (!isHtmlResponse(iastRequestContext.getContentType())) {
+                    return;
+                }
+                if (!isHttps(urlString, iastRequestContext.getxForwardedProto())) {
+                    return;
+                }
+                final AgentSpan span = (AgentSpan) igSpanInfo;
+                report(span, new Vulnerability(VulnerabilityType.HSTS_HEADER_MISSING, Location.forSpan(span)));
+            } catch (Throwable e) {
+                LOGGER.debug("Exception while checking for missing HSTS headers vulnerability", e);
+            }
         }
-        final AgentSpan span = (AgentSpan) igSpanInfo;
-        report(
-            span, new Vulnerability(VulnerabilityType.HSTS_HEADER_MISSING, Location.forSpan(span)));
-      } catch (Throwable e) {
-        LOGGER.debug("Exception while checking for missing HSTS headers vulnerability", e);
-      }
     }
-  }
 
-  static boolean isValidMaxAge(@Nullable final String value) {
-    if (value == null) {
-      return false;
-    }
-    final Matcher matcher = MAX_AGE.matcher(value);
-    if (!matcher.find()) {
-      return false;
+    static boolean isValidMaxAge(@Nullable final String value) {
+        if (value == null) {
+            return false;
+        }
+        final Matcher matcher = MAX_AGE.matcher(value);
+        if (!matcher.find()) {
+            return false;
+        }
+        return Integer.parseInt(matcher.group(1)) > 0;
     }
-    return Integer.parseInt(matcher.group(1)) > 0;
-  }
 
-  static boolean isHttps(@Nullable final String urlString, @Nullable final String forwardedFor) {
-    if (urlString == null) {
-      return false;
-    }
-    if (urlString.toLowerCase(Locale.ROOT).startsWith("https://")) {
-      return true;
-    }
-    if (forwardedFor == null) {
-      return false;
+    static boolean isHttps(@Nullable final String urlString, @Nullable final String forwardedFor) {
+        if (urlString == null) {
+            return false;
+        }
+        if (urlString.toLowerCase(Locale.ROOT).startsWith("https://")) {
+            return true;
+        }
+        if (forwardedFor == null) {
+            return false;
+        }
+        return forwardedFor.toLowerCase(Locale.ROOT).contains("https");
     }
-    return forwardedFor.toLowerCase(Locale.ROOT).contains("https");
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HttpResponseHeaderModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HttpResponseHeaderModuleImpl.java
index 70ec869951d..b0113f5b8a7 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HttpResponseHeaderModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/HttpResponseHeaderModuleImpl.java
@@ -27,88 +27,87 @@
 import java.util.Map;
 import javax.annotation.Nonnull;
 
-public class HttpResponseHeaderModuleImpl extends SinkModuleBase
-    implements HttpResponseHeaderModule {
+public class HttpResponseHeaderModuleImpl extends SinkModuleBase implements HttpResponseHeaderModule {
 
-  public HttpResponseHeaderModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
-
-  @Override
-  public void onHeader(@Nonnull final String name, final String value) {
-    final HttpHeader header = HttpHeader.from(name);
-    if (header != null) {
-      final AgentSpan span = AgentTracer.activeSpan();
-      final IastContext ctx = IastContext.Provider.get(span);
-      if (ctx instanceof IastRequestContext) {
-        header.addToContext((IastRequestContext) ctx, value);
-      }
-      if (header == SET_COOKIE || header == SET_COOKIE2) {
-        onCookies(CookieSecurityParser.parse(header, value));
-      }
-      if (null != InstrumentationBridge.UNVALIDATED_REDIRECT) {
-        InstrumentationBridge.UNVALIDATED_REDIRECT.onHeader(name, value);
-      }
-    }
-    if (null != InstrumentationBridge.HEADER_INJECTION) {
-      InstrumentationBridge.HEADER_INJECTION.onHeader(name, value);
+    public HttpResponseHeaderModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
     }
-  }
 
-  @Override
-  public void onCookie(@Nonnull final Cookie cookie) {
-    onCookies(singletonList(cookie));
-  }
-
-  private void onCookies(final List<Cookie> cookies) {
-    final Map<VulnerabilityType, Cookie> vulnerable = findVulnerableCookies(cookies);
-    if (vulnerable.isEmpty()) {
-      return;
-    }
-    final AgentSpan span = AgentTracer.activeSpan();
-    if (!overheadController.consumeQuota(
-        Operations.REPORT_VULNERABILITY, span, INSECURE_COOKIE // we need a type to check quota
-        )) {
-      return;
+    @Override
+    public void onHeader(@Nonnull final String name, final String value) {
+        final HttpHeader header = HttpHeader.from(name);
+        if (header != null) {
+            final AgentSpan span = AgentTracer.activeSpan();
+            final IastContext ctx = IastContext.Provider.get(span);
+            if (ctx instanceof IastRequestContext) {
+                header.addToContext((IastRequestContext) ctx, value);
+            }
+            if (header == SET_COOKIE || header == SET_COOKIE2) {
+                onCookies(CookieSecurityParser.parse(header, value));
+            }
+            if (null != InstrumentationBridge.UNVALIDATED_REDIRECT) {
+                InstrumentationBridge.UNVALIDATED_REDIRECT.onHeader(name, value);
+            }
+        }
+        if (null != InstrumentationBridge.HEADER_INJECTION) {
+            InstrumentationBridge.HEADER_INJECTION.onHeader(name, value);
+        }
     }
-    final Location location = Location.forSpanAndStack(span, getCurrentStackTrace());
-    for (final Map.Entry<VulnerabilityType, Cookie> entry : vulnerable.entrySet()) {
-      final Cookie cookie = entry.getValue();
-      final Evidence evidence = new Evidence(cookie.getCookieName());
-      reporter.report(span, new Vulnerability(entry.getKey(), location, evidence));
+
+    @Override
+    public void onCookie(@Nonnull final Cookie cookie) {
+        onCookies(singletonList(cookie));
     }
-  }
 
-  private static Map<VulnerabilityType, Cookie> findVulnerableCookies(final List<Cookie> cookies) {
-    final List<HttpCookieModule<VulnerabilityType>> modules = httpCookieModules();
-    final Map<VulnerabilityType, Cookie> found = new HashMap<>(modules.size());
-    for (final Cookie cookie : cookies) {
-      for (int i = modules.size() - 1; i >= 0; i--) {
-        final HttpCookieModule<VulnerabilityType> module = modules.get(i);
-        if (module.isVulnerable(cookie)) {
-          found.put(module.getType(), cookie);
-          modules.remove(i); // remove module as we already found a vulnerability
+    private void onCookies(final List<Cookie> cookies) {
+        final Map<VulnerabilityType, Cookie> vulnerable = findVulnerableCookies(cookies);
+        if (vulnerable.isEmpty()) {
+            return;
+        }
+        final AgentSpan span = AgentTracer.activeSpan();
+        if (!overheadController.consumeQuota(
+                Operations.REPORT_VULNERABILITY, span, INSECURE_COOKIE // we need a type to check quota
+                )) {
+            return;
+        }
+        final Location location = Location.forSpanAndStack(span, getCurrentStackTrace());
+        for (final Map.Entry<VulnerabilityType, Cookie> entry : vulnerable.entrySet()) {
+            final Cookie cookie = entry.getValue();
+            final Evidence evidence = new Evidence(cookie.getCookieName());
+            reporter.report(span, new Vulnerability(entry.getKey(), location, evidence));
         }
-      }
-      if (modules.isEmpty()) {
-        break;
-      }
     }
-    return found;
-  }
 
-  @SuppressWarnings("unchecked")
-  private static List<HttpCookieModule<VulnerabilityType>> httpCookieModules() {
-    final List<HttpCookieModule<VulnerabilityType>> modules = new ArrayList<>();
-    if (InstrumentationBridge.NO_HTTPONLY_COOKIE != null) {
-      modules.add((HttpCookieModule<VulnerabilityType>) InstrumentationBridge.NO_HTTPONLY_COOKIE);
-    }
-    if (InstrumentationBridge.INSECURE_COOKIE != null) {
-      modules.add((HttpCookieModule<VulnerabilityType>) InstrumentationBridge.INSECURE_COOKIE);
+    private static Map<VulnerabilityType, Cookie> findVulnerableCookies(final List<Cookie> cookies) {
+        final List<HttpCookieModule<VulnerabilityType>> modules = httpCookieModules();
+        final Map<VulnerabilityType, Cookie> found = new HashMap<>(modules.size());
+        for (final Cookie cookie : cookies) {
+            for (int i = modules.size() - 1; i >= 0; i--) {
+                final HttpCookieModule<VulnerabilityType> module = modules.get(i);
+                if (module.isVulnerable(cookie)) {
+                    found.put(module.getType(), cookie);
+                    modules.remove(i); // remove module as we already found a vulnerability
+                }
+            }
+            if (modules.isEmpty()) {
+                break;
+            }
+        }
+        return found;
     }
-    if (InstrumentationBridge.NO_SAMESITE_COOKIE != null) {
-      modules.add((HttpCookieModule<VulnerabilityType>) InstrumentationBridge.NO_SAMESITE_COOKIE);
+
+    @SuppressWarnings("unchecked")
+    private static List<HttpCookieModule<VulnerabilityType>> httpCookieModules() {
+        final List<HttpCookieModule<VulnerabilityType>> modules = new ArrayList<>();
+        if (InstrumentationBridge.NO_HTTPONLY_COOKIE != null) {
+            modules.add((HttpCookieModule<VulnerabilityType>) InstrumentationBridge.NO_HTTPONLY_COOKIE);
+        }
+        if (InstrumentationBridge.INSECURE_COOKIE != null) {
+            modules.add((HttpCookieModule<VulnerabilityType>) InstrumentationBridge.INSECURE_COOKIE);
+        }
+        if (InstrumentationBridge.NO_SAMESITE_COOKIE != null) {
+            modules.add((HttpCookieModule<VulnerabilityType>) InstrumentationBridge.NO_SAMESITE_COOKIE);
+        }
+        return modules;
     }
-    return modules;
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/InsecureAuthProtocolModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/InsecureAuthProtocolModuleImpl.java
index cd59059d230..96cfb40a1dd 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/InsecureAuthProtocolModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/InsecureAuthProtocolModuleImpl.java
@@ -10,44 +10,42 @@
 import java.util.Map;
 import javax.annotation.Nullable;
 
-public class InsecureAuthProtocolModuleImpl extends SinkModuleBase
-    implements InsecureAuthProtocolModule {
+public class InsecureAuthProtocolModuleImpl extends SinkModuleBase implements InsecureAuthProtocolModule {
 
-  private static final String BASIC = "Basic";
-  private static final String DIGEST = "Digest";
+    private static final String BASIC = "Basic";
+    private static final String DIGEST = "Digest";
 
-  public InsecureAuthProtocolModuleImpl(Dependencies dependencies) {
-    super(dependencies);
-  }
-
-  @Override
-  public void onRequestEnd(IastContext ctx, IGSpanInfo igSpanInfo) {
-    if (!(ctx instanceof IastRequestContext)) {
-      return;
-    }
-    final IastRequestContext iastRequestContext = (IastRequestContext) ctx;
-    String authorization = iastRequestContext.getAuthorization();
-    if (authorization == null) {
-      return;
-    }
-    Map<String, Object> tags = igSpanInfo.getTags();
-    if (isIgnorableResponseCode((Integer) tags.get("http.status_code"))) {
-      return;
+    public InsecureAuthProtocolModuleImpl(Dependencies dependencies) {
+        super(dependencies);
     }
-    String authScheme =
-        authorization.startsWith(BASIC) ? BASIC : authorization.startsWith(DIGEST) ? DIGEST : null;
-    if (authScheme == null) {
-      return;
+
+    @Override
+    public void onRequestEnd(IastContext ctx, IGSpanInfo igSpanInfo) {
+        if (!(ctx instanceof IastRequestContext)) {
+            return;
+        }
+        final IastRequestContext iastRequestContext = (IastRequestContext) ctx;
+        String authorization = iastRequestContext.getAuthorization();
+        if (authorization == null) {
+            return;
+        }
+        Map<String, Object> tags = igSpanInfo.getTags();
+        if (isIgnorableResponseCode((Integer) tags.get("http.status_code"))) {
+            return;
+        }
+        String authScheme = authorization.startsWith(BASIC) ? BASIC : authorization.startsWith(DIGEST) ? DIGEST : null;
+        if (authScheme == null) {
+            return;
+        }
+        final Evidence result = new Evidence(String.format("Authorization : %s", authScheme));
+        report(VulnerabilityType.INSECURE_AUTH_PROTOCOL, result);
     }
-    final Evidence result = new Evidence(String.format("Authorization : %s", authScheme));
-    report(VulnerabilityType.INSECURE_AUTH_PROTOCOL, result);
-  }
 
-  @Override
-  public boolean isIgnorableResponseCode(@Nullable Integer httpStatus) {
-    // To minimize false positives when we get auth credentials to a page that doesn't exist (e.g.
-    // happens with vulnerability scanners),
-    // we'll just ignore this vulnerability when there is no success response.
-    return httpStatus != null && httpStatus >= 400;
-  }
+    @Override
+    public boolean isIgnorableResponseCode(@Nullable Integer httpStatus) {
+        // To minimize false positives when we get auth credentials to a page that doesn't exist (e.g.
+        // happens with vulnerability scanners),
+        // we'll just ignore this vulnerability when there is no success response.
+        return httpStatus != null && httpStatus >= 400;
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/InsecureCookieModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/InsecureCookieModuleImpl.java
index 0d0fd1a38f0..25270b089f2 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/InsecureCookieModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/InsecureCookieModuleImpl.java
@@ -7,29 +7,29 @@
 
 public class InsecureCookieModuleImpl implements InsecureCookieModule<VulnerabilityType> {
 
-  private static final int EXPIRES_YEAR_LIMIT = 2000;
+    private static final int EXPIRES_YEAR_LIMIT = 2000;
 
-  @Override
-  public boolean isVulnerable(@Nonnull final Cookie cookie) {
-    return !cookie.isSecure() && !cookieValueIsEmpty(cookie.getCookieValue()) && !expired(cookie);
-  }
-
-  private boolean cookieValueIsEmpty(final String cookieValue) {
-    return cookieValue == null || cookieValue.isEmpty();
-  }
+    @Override
+    public boolean isVulnerable(@Nonnull final Cookie cookie) {
+        return !cookie.isSecure() && !cookieValueIsEmpty(cookie.getCookieValue()) && !expired(cookie);
+    }
 
-  private boolean expired(final Cookie cookie) {
-    if (cookie.getMaxAge() != null && cookie.getMaxAge() == 0) {
-      return true;
+    private boolean cookieValueIsEmpty(final String cookieValue) {
+        return cookieValue == null || cookieValue.isEmpty();
     }
-    if (cookie.getExpiresYear() != null && cookie.getExpiresYear() < EXPIRES_YEAR_LIMIT) {
-      return true;
+
+    private boolean expired(final Cookie cookie) {
+        if (cookie.getMaxAge() != null && cookie.getMaxAge() == 0) {
+            return true;
+        }
+        if (cookie.getExpiresYear() != null && cookie.getExpiresYear() < EXPIRES_YEAR_LIMIT) {
+            return true;
+        }
+        return false;
     }
-    return false;
-  }
 
-  @Override
-  public VulnerabilityType getType() {
-    return VulnerabilityType.INSECURE_COOKIE;
-  }
+    @Override
+    public VulnerabilityType getType() {
+        return VulnerabilityType.INSECURE_COOKIE;
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/LdapInjectionModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/LdapInjectionModuleImpl.java
index 4045118f1c1..94649d960af 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/LdapInjectionModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/LdapInjectionModuleImpl.java
@@ -11,20 +11,18 @@
 
 public class LdapInjectionModuleImpl extends SinkModuleBase implements LdapInjectionModule {
 
-  public LdapInjectionModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
+    public LdapInjectionModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
+    }
 
-  @Override
-  public void onDirContextSearch(
-      @Nullable final String name,
-      @Nonnull final String filterExpr,
-      @Nullable final Object[] filterArgs) {
-    if (!canBeTainted(name) && !canBeTainted(filterExpr) && filterArgs == null) {
-      return;
+    @Override
+    public void onDirContextSearch(
+            @Nullable final String name, @Nonnull final String filterExpr, @Nullable final Object[] filterArgs) {
+        if (!canBeTainted(name) && !canBeTainted(filterExpr) && filterArgs == null) {
+            return;
+        }
+        checkInjection(
+                VulnerabilityType.LDAP_INJECTION,
+                Iterators.join(Iterators.of(name, filterExpr), Iterators.of(filterArgs)));
     }
-    checkInjection(
-        VulnerabilityType.LDAP_INJECTION,
-        Iterators.join(Iterators.of(name, filterExpr), Iterators.of(filterArgs)));
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/NoHttpOnlyCookieModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/NoHttpOnlyCookieModuleImpl.java
index 74f3cb3de08..6b53d212886 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/NoHttpOnlyCookieModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/NoHttpOnlyCookieModuleImpl.java
@@ -7,13 +7,13 @@
 
 public class NoHttpOnlyCookieModuleImpl implements NoHttpOnlyCookieModule<VulnerabilityType> {
 
-  @Override
-  public boolean isVulnerable(@Nonnull final Cookie cookie) {
-    return !cookie.isHttpOnly();
-  }
+    @Override
+    public boolean isVulnerable(@Nonnull final Cookie cookie) {
+        return !cookie.isHttpOnly();
+    }
 
-  @Override
-  public VulnerabilityType getType() {
-    return VulnerabilityType.NO_HTTPONLY_COOKIE;
-  }
+    @Override
+    public VulnerabilityType getType() {
+        return VulnerabilityType.NO_HTTPONLY_COOKIE;
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/NoSameSiteCookieModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/NoSameSiteCookieModuleImpl.java
index 8327c194bd2..e0e47697b2f 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/NoSameSiteCookieModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/NoSameSiteCookieModuleImpl.java
@@ -7,15 +7,15 @@
 
 public class NoSameSiteCookieModuleImpl implements NoSameSiteCookieModule<VulnerabilityType> {
 
-  private static final String STRICT_VALUE = "Strict";
+    private static final String STRICT_VALUE = "Strict";
 
-  @Override
-  public boolean isVulnerable(@Nonnull final Cookie cookie) {
-    return !STRICT_VALUE.equalsIgnoreCase(cookie.getSameSite());
-  }
+    @Override
+    public boolean isVulnerable(@Nonnull final Cookie cookie) {
+        return !STRICT_VALUE.equalsIgnoreCase(cookie.getSameSite());
+    }
 
-  @Override
-  public VulnerabilityType getType() {
-    return VulnerabilityType.NO_SAMESITE_COOKIE;
-  }
+    @Override
+    public VulnerabilityType getType() {
+        return VulnerabilityType.NO_SAMESITE_COOKIE;
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/PathTraversalModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/PathTraversalModuleImpl.java
index 20a7afd634b..64d8a8b1551 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/PathTraversalModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/PathTraversalModuleImpl.java
@@ -13,56 +13,56 @@
 
 public class PathTraversalModuleImpl extends SinkModuleBase implements PathTraversalModule {
 
-  public PathTraversalModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
-
-  @Override
-  public void onPathTraversal(final @Nullable String path) {
-    if (!canBeTainted(path)) {
-      return;
+    public PathTraversalModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
     }
-    checkInjection(VulnerabilityType.PATH_TRAVERSAL, path);
-  }
 
-  @Override
-  public void onPathTraversal(final @Nullable String parent, final @Nonnull String child) {
-    if (!canBeTainted(parent) && !canBeTainted(child)) {
-      return;
-    }
-    if (parent == null) {
-      checkInjection(VulnerabilityType.PATH_TRAVERSAL, child);
-    } else {
-      checkInjection(VulnerabilityType.PATH_TRAVERSAL, Iterators.of(parent, child));
+    @Override
+    public void onPathTraversal(final @Nullable String path) {
+        if (!canBeTainted(path)) {
+            return;
+        }
+        checkInjection(VulnerabilityType.PATH_TRAVERSAL, path);
     }
-  }
 
-  @Override
-  public void onPathTraversal(final @Nonnull String first, final @Nonnull String[] more) {
-    if (!canBeTainted(first) && !canBeTainted(more)) {
-      return;
-    }
-    if (more.length == 0) {
-      checkInjection(VulnerabilityType.PATH_TRAVERSAL, first);
-    } else {
-      checkInjection(VulnerabilityType.PATH_TRAVERSAL, Iterators.of(first, more));
+    @Override
+    public void onPathTraversal(final @Nullable String parent, final @Nonnull String child) {
+        if (!canBeTainted(parent) && !canBeTainted(child)) {
+            return;
+        }
+        if (parent == null) {
+            checkInjection(VulnerabilityType.PATH_TRAVERSAL, child);
+        } else {
+            checkInjection(VulnerabilityType.PATH_TRAVERSAL, Iterators.of(parent, child));
+        }
     }
-  }
 
-  @Override
-  public void onPathTraversal(final @Nonnull URI uri) {
-    checkInjection(VulnerabilityType.PATH_TRAVERSAL, uri);
-  }
+    @Override
+    public void onPathTraversal(final @Nonnull String first, final @Nonnull String[] more) {
+        if (!canBeTainted(first) && !canBeTainted(more)) {
+            return;
+        }
+        if (more.length == 0) {
+            checkInjection(VulnerabilityType.PATH_TRAVERSAL, first);
+        } else {
+            checkInjection(VulnerabilityType.PATH_TRAVERSAL, Iterators.of(first, more));
+        }
+    }
 
-  @Override
-  public void onPathTraversal(final @Nullable File parent, final @Nonnull String child) {
-    if (!canBeTainted(child)) {
-      return;
+    @Override
+    public void onPathTraversal(final @Nonnull URI uri) {
+        checkInjection(VulnerabilityType.PATH_TRAVERSAL, uri);
     }
-    if (parent == null) {
-      checkInjection(VulnerabilityType.PATH_TRAVERSAL, child);
-    } else {
-      checkInjection(VulnerabilityType.PATH_TRAVERSAL, Iterators.of(parent, child));
+
+    @Override
+    public void onPathTraversal(final @Nullable File parent, final @Nonnull String child) {
+        if (!canBeTainted(child)) {
+            return;
+        }
+        if (parent == null) {
+            checkInjection(VulnerabilityType.PATH_TRAVERSAL, child);
+        } else {
+            checkInjection(VulnerabilityType.PATH_TRAVERSAL, Iterators.of(parent, child));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/ReflectionInjectionModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/ReflectionInjectionModuleImpl.java
index a216fcc6cd7..6592bfe007b 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/ReflectionInjectionModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/ReflectionInjectionModuleImpl.java
@@ -10,91 +10,89 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public class ReflectionInjectionModuleImpl extends SinkModuleBase
-    implements ReflectionInjectionModule {
+public class ReflectionInjectionModuleImpl extends SinkModuleBase implements ReflectionInjectionModule {
 
-  public ReflectionInjectionModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
+    public ReflectionInjectionModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
+    }
 
-  @Override
-  public void onClassName(@Nullable String className) {
-    if (!canBeTainted(className)) {
-      return;
+    @Override
+    public void onClassName(@Nullable String className) {
+        if (!canBeTainted(className)) {
+            return;
+        }
+        checkInjection(VulnerabilityType.REFLECTION_INJECTION, className);
     }
-    checkInjection(VulnerabilityType.REFLECTION_INJECTION, className);
-  }
-
-  @Override
-  public void onMethodName(
-      @Nonnull Class<?> clazz, @Nonnull String methodName, @Nullable Class<?>... parameterTypes) {
-    if (!canBeTainted(methodName)) {
-      return;
+
+    @Override
+    public void onMethodName(
+            @Nonnull Class<?> clazz, @Nonnull String methodName, @Nullable Class<?>... parameterTypes) {
+        if (!canBeTainted(methodName)) {
+            return;
+        }
+        checkInjection(
+                VulnerabilityType.REFLECTION_INJECTION, methodName, new MethodEvidenceBuilder(clazz, parameterTypes));
     }
-    checkInjection(
-        VulnerabilityType.REFLECTION_INJECTION,
-        methodName,
-        new MethodEvidenceBuilder(clazz, parameterTypes));
-  }
-
-  @Override
-  public void onFieldName(@Nonnull Class<?> clazz, @Nonnull String fieldName) {
-    if (!canBeTainted(fieldName)) {
-      return;
+
+    @Override
+    public void onFieldName(@Nonnull Class<?> clazz, @Nonnull String fieldName) {
+        if (!canBeTainted(fieldName)) {
+            return;
+        }
+        checkInjection(VulnerabilityType.REFLECTION_INJECTION, fieldName, new FieldEvidenceBuilder(clazz));
     }
-    checkInjection(
-        VulnerabilityType.REFLECTION_INJECTION, fieldName, new FieldEvidenceBuilder(clazz));
-  }
 
-  private static class MethodEvidenceBuilder implements EvidenceBuilder {
+    private static class MethodEvidenceBuilder implements EvidenceBuilder {
 
-    private final Class<?> clazz;
-    @Nullable private final Class<?>[] parameterTypes;
+        private final Class<?> clazz;
 
-    private MethodEvidenceBuilder(final Class<?> clazz, @Nullable final Class<?>[] parameterTypes) {
-      this.clazz = clazz;
-      this.parameterTypes = parameterTypes;
-    }
+        @Nullable
+        private final Class<?>[] parameterTypes;
 
-    @Override
-    public void tainted(
-        final StringBuilder evidence,
-        final RangeBuilder ranges,
-        final Object value,
-        final Range[] valueRanges) {
-      final String className = clazz.getName();
-      evidence.append(className).append('#').append(value).append('(');
-      if (parameterTypes != null) {
-        for (int i = 0; i < parameterTypes.length; i++) {
-          if (i > 0) {
-            evidence.append(", ");
-          }
-          final Class<?> parameter = parameterTypes[i];
-          evidence.append(parameter == null ? "UNKNOWN" : parameter.getName());
+        private MethodEvidenceBuilder(final Class<?> clazz, @Nullable final Class<?>[] parameterTypes) {
+            this.clazz = clazz;
+            this.parameterTypes = parameterTypes;
+        }
+
+        @Override
+        public void tainted(
+                final StringBuilder evidence,
+                final RangeBuilder ranges,
+                final Object value,
+                final Range[] valueRanges) {
+            final String className = clazz.getName();
+            evidence.append(className).append('#').append(value).append('(');
+            if (parameterTypes != null) {
+                for (int i = 0; i < parameterTypes.length; i++) {
+                    if (i > 0) {
+                        evidence.append(", ");
+                    }
+                    final Class<?> parameter = parameterTypes[i];
+                    evidence.append(parameter == null ? "UNKNOWN" : parameter.getName());
+                }
+            }
+            evidence.append(')');
+            ranges.add(valueRanges, className.length() + 1);
         }
-      }
-      evidence.append(')');
-      ranges.add(valueRanges, className.length() + 1);
     }
-  }
 
-  private static class FieldEvidenceBuilder implements EvidenceBuilder {
+    private static class FieldEvidenceBuilder implements EvidenceBuilder {
 
-    private final Class<?> clazz;
+        private final Class<?> clazz;
 
-    private FieldEvidenceBuilder(final Class<?> clazz) {
-      this.clazz = clazz;
-    }
+        private FieldEvidenceBuilder(final Class<?> clazz) {
+            this.clazz = clazz;
+        }
 
-    @Override
-    public void tainted(
-        final StringBuilder evidence,
-        final RangeBuilder ranges,
-        final Object value,
-        final Range[] valueRanges) {
-      final String className = clazz.getName();
-      evidence.append(className).append('#').append(value);
-      ranges.add(valueRanges, className.length() + 1);
+        @Override
+        public void tainted(
+                final StringBuilder evidence,
+                final RangeBuilder ranges,
+                final Object value,
+                final Range[] valueRanges) {
+            final String className = clazz.getName();
+            evidence.append(className).append('#').append(value);
+            ranges.add(valueRanges, className.length() + 1);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SinkModuleBase.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SinkModuleBase.java
index 38c66cb4c53..58935e091c4 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SinkModuleBase.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SinkModuleBase.java
@@ -41,410 +41,401 @@
 @SuppressWarnings({"UnusedReturnValue", "SameParameterValue"})
 public abstract class SinkModuleBase {
 
-  private static final int MAX_EVIDENCE_LENGTH = Config.get().getIastTruncationMaxValueLength();
-
-  protected final OverheadController overheadController;
-  protected final Reporter reporter;
-  protected final StackWalker stackWalker;
-
-  protected SinkModuleBase(@Nonnull final Dependencies dependencies) {
-    overheadController = dependencies.getOverheadController();
-    reporter = dependencies.getReporter();
-    stackWalker = dependencies.getStackWalker();
-  }
-
-  protected void report(final Vulnerability vulnerability) {
-    report(AgentTracer.activeSpan(), vulnerability);
-  }
-
-  protected void report(@Nullable final AgentSpan span, final Vulnerability vulnerability) {
-    if (!overheadController.consumeQuota(
-        Operations.REPORT_VULNERABILITY, span, vulnerability.getType())) {
-      return;
+    private static final int MAX_EVIDENCE_LENGTH = Config.get().getIastTruncationMaxValueLength();
+
+    protected final OverheadController overheadController;
+    protected final Reporter reporter;
+    protected final StackWalker stackWalker;
+
+    protected SinkModuleBase(@Nonnull final Dependencies dependencies) {
+        overheadController = dependencies.getOverheadController();
+        reporter = dependencies.getReporter();
+        stackWalker = dependencies.getStackWalker();
     }
-    reporter.report(span, vulnerability);
-  }
 
-  protected void report(final VulnerabilityType type, final Evidence evidence) {
-    report(AgentTracer.activeSpan(), type, evidence);
-  }
+    protected void report(final Vulnerability vulnerability) {
+        report(AgentTracer.activeSpan(), vulnerability);
+    }
 
-  protected void report(
-      @Nullable final AgentSpan span, final VulnerabilityType type, final Evidence evidence) {
-    if (!overheadController.consumeQuota(Operations.REPORT_VULNERABILITY, span, type)) {
-      return;
+    protected void report(@Nullable final AgentSpan span, final Vulnerability vulnerability) {
+        if (!overheadController.consumeQuota(Operations.REPORT_VULNERABILITY, span, vulnerability.getType())) {
+            return;
+        }
+        reporter.report(span, vulnerability);
     }
-    final Vulnerability vulnerability =
-        new Vulnerability(type, buildLocation(span, null), evidence);
-    reporter.report(span, vulnerability);
-  }
-
-  @Nullable
-  protected final Evidence checkInjection(final VulnerabilityType type, final Object value) {
-    return checkInjection(type, value, null, null);
-  }
-
-  @Nullable
-  protected final Evidence checkInjection(
-      final VulnerabilityType type, final Object value, final LocationSupplier locationSupplier) {
-    return checkInjection(type, value, null, locationSupplier);
-  }
-
-  @Nullable
-  protected final Evidence checkInjection(
-      final VulnerabilityType type, final Object value, final EvidenceBuilder evidenceBuilder) {
-    return checkInjection(type, value, evidenceBuilder, null);
-  }
-
-  @Nullable
-  protected final Evidence checkInjection(
-      final VulnerabilityType type,
-      final Object value,
-      @Nullable final EvidenceBuilder evidenceBuilder,
-      @Nullable final LocationSupplier locationSupplier) {
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return null;
+
+    protected void report(final VulnerabilityType type, final Evidence evidence) {
+        report(AgentTracer.activeSpan(), type, evidence);
     }
 
-    return checkInjection(ctx, type, value, evidenceBuilder, locationSupplier);
-  }
-
-  @Nullable
-  protected final Evidence checkInjection(
-      final IastContext ctx,
-      final VulnerabilityType type,
-      Object value,
-      @Nullable final EvidenceBuilder evidenceBuilder,
-      @Nullable final LocationSupplier locationSupplier) {
-
-    final TaintedObjects to = ctx.getTaintedObjects();
-    final Range[] valueRanges;
-    if (value instanceof Taintable) {
-      final Taintable taintable = (Taintable) value;
-      if (!taintable.$DD$isTainted()) {
-        return null;
-      }
-      final Source source = (Source) taintable.$$DD$getSource();
-      final Object origin = source.getRawValue();
-      final TaintedObject tainted = origin == null ? null : to.get(origin);
-      if (origin != null && tainted != null) {
-        valueRanges = Ranges.getNotMarkedRanges(tainted.getRanges(), type.mark());
-        addSecurityControlMetrics(ctx, valueRanges, tainted.getRanges(), type);
-        value = origin;
-      } else {
-        valueRanges = Ranges.forObject((Source) taintable.$$DD$getSource(), type.mark());
-        value = String.format("Tainted reference detected in " + value.getClass());
-      }
-    } else {
-      final TaintedObject tainted = to.get(value);
-      if (tainted == null) {
-        return null;
-      }
-      valueRanges = Ranges.getNotMarkedRanges(tainted.getRanges(), type.mark());
-      addSecurityControlMetrics(ctx, valueRanges, tainted.getRanges(), type);
+    protected void report(@Nullable final AgentSpan span, final VulnerabilityType type, final Evidence evidence) {
+        if (!overheadController.consumeQuota(Operations.REPORT_VULNERABILITY, span, type)) {
+            return;
+        }
+        final Vulnerability vulnerability = new Vulnerability(type, buildLocation(span, null), evidence);
+        reporter.report(span, vulnerability);
     }
 
-    if (valueRanges == null || valueRanges.length == 0) {
-      return null;
+    @Nullable
+    protected final Evidence checkInjection(final VulnerabilityType type, final Object value) {
+        return checkInjection(type, value, null, null);
     }
 
-    // filter excluded ranges
-    final Range[] filteredRanges;
-    if (!type.excludedSources().isEmpty()) {
-      filteredRanges = Ranges.excludeRangesBySource(valueRanges, type.excludedSources());
-    } else {
-      filteredRanges = valueRanges;
+    @Nullable
+    protected final Evidence checkInjection(
+            final VulnerabilityType type, final Object value, final LocationSupplier locationSupplier) {
+        return checkInjection(type, value, null, locationSupplier);
     }
 
-    if (filteredRanges == null || filteredRanges.length == 0) {
-      return null;
+    @Nullable
+    protected final Evidence checkInjection(
+            final VulnerabilityType type, final Object value, final EvidenceBuilder evidenceBuilder) {
+        return checkInjection(type, value, evidenceBuilder, null);
     }
 
-    final StringBuilder evidence = new StringBuilder();
-    final RangeBuilder ranges = new RangeBuilder();
-    addToEvidence(type, evidence, ranges, value, filteredRanges, evidenceBuilder);
+    @Nullable
+    protected final Evidence checkInjection(
+            final VulnerabilityType type,
+            final Object value,
+            @Nullable final EvidenceBuilder evidenceBuilder,
+            @Nullable final LocationSupplier locationSupplier) {
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return null;
+        }
 
-    // check if finally we have an injection
-    if (ranges.isEmpty()) {
-      return null;
+        return checkInjection(ctx, type, value, evidenceBuilder, locationSupplier);
     }
 
-    final AgentSpan span = AgentTracer.activeSpan();
-    if (!overheadController.consumeQuota(Operations.REPORT_VULNERABILITY, span, type)) {
-      return null;
+    @Nullable
+    protected final Evidence checkInjection(
+            final IastContext ctx,
+            final VulnerabilityType type,
+            Object value,
+            @Nullable final EvidenceBuilder evidenceBuilder,
+            @Nullable final LocationSupplier locationSupplier) {
+
+        final TaintedObjects to = ctx.getTaintedObjects();
+        final Range[] valueRanges;
+        if (value instanceof Taintable) {
+            final Taintable taintable = (Taintable) value;
+            if (!taintable.$DD$isTainted()) {
+                return null;
+            }
+            final Source source = (Source) taintable.$$DD$getSource();
+            final Object origin = source.getRawValue();
+            final TaintedObject tainted = origin == null ? null : to.get(origin);
+            if (origin != null && tainted != null) {
+                valueRanges = Ranges.getNotMarkedRanges(tainted.getRanges(), type.mark());
+                addSecurityControlMetrics(ctx, valueRanges, tainted.getRanges(), type);
+                value = origin;
+            } else {
+                valueRanges = Ranges.forObject((Source) taintable.$$DD$getSource(), type.mark());
+                value = String.format("Tainted reference detected in " + value.getClass());
+            }
+        } else {
+            final TaintedObject tainted = to.get(value);
+            if (tainted == null) {
+                return null;
+            }
+            valueRanges = Ranges.getNotMarkedRanges(tainted.getRanges(), type.mark());
+            addSecurityControlMetrics(ctx, valueRanges, tainted.getRanges(), type);
+        }
+
+        if (valueRanges == null || valueRanges.length == 0) {
+            return null;
+        }
+
+        // filter excluded ranges
+        final Range[] filteredRanges;
+        if (!type.excludedSources().isEmpty()) {
+            filteredRanges = Ranges.excludeRangesBySource(valueRanges, type.excludedSources());
+        } else {
+            filteredRanges = valueRanges;
+        }
+
+        if (filteredRanges == null || filteredRanges.length == 0) {
+            return null;
+        }
+
+        final StringBuilder evidence = new StringBuilder();
+        final RangeBuilder ranges = new RangeBuilder();
+        addToEvidence(type, evidence, ranges, value, filteredRanges, evidenceBuilder);
+
+        // check if finally we have an injection
+        if (ranges.isEmpty()) {
+            return null;
+        }
+
+        final AgentSpan span = AgentTracer.activeSpan();
+        if (!overheadController.consumeQuota(Operations.REPORT_VULNERABILITY, span, type)) {
+            return null;
+        }
+
+        return report(span, type, evidence, ranges, locationSupplier);
     }
 
-    return report(span, type, evidence, ranges, locationSupplier);
-  }
-
-  private void addSecurityControlMetrics(
-      @Nonnull final IastContext ctx,
-      @Nullable final Range[] valueRanges,
-      @Nonnull final Range[] taintedRanges,
-      @Nonnull final VulnerabilityType type) {
-    if ((valueRanges != null
-            && valueRanges.length
-                != 0) // ranges without the vulnerability mark implies vulnerability
-        || taintedRanges.length == 0 // no tainted ranges
-    ) {
-      return;
+    private void addSecurityControlMetrics(
+            @Nonnull final IastContext ctx,
+            @Nullable final Range[] valueRanges,
+            @Nonnull final Range[] taintedRanges,
+            @Nonnull final VulnerabilityType type) {
+        if ((valueRanges != null
+                        && valueRanges.length != 0) // ranges without the vulnerability mark implies vulnerability
+                || taintedRanges.length == 0 // no tainted ranges
+        ) {
+            return;
+        }
+        // check if there are tainted ranges without the security control mark
+        Range[] marked = Ranges.getNotMarkedRanges(taintedRanges, CUSTOM_SECURITY_CONTROL_MARK);
+        if (marked == null || marked.length == 0) {
+            IastMetricCollector.add(IastMetric.SUPPRESSED_VULNERABILITIES, type.type(), 1, ctx);
+        }
     }
-    // check if there are tainted ranges without the security control mark
-    Range[] marked = Ranges.getNotMarkedRanges(taintedRanges, CUSTOM_SECURITY_CONTROL_MARK);
-    if (marked == null || marked.length == 0) {
-      IastMetricCollector.add(IastMetric.SUPPRESSED_VULNERABILITIES, type.type(), 1, ctx);
+
+    @Nullable
+    protected final Evidence checkInjection(final VulnerabilityType type, final Iterator<?> items) {
+        return checkInjection(type, items, null, null);
     }
-  }
-
-  @Nullable
-  protected final Evidence checkInjection(final VulnerabilityType type, final Iterator<?> items) {
-    return checkInjection(type, items, null, null);
-  }
-
-  @Nullable
-  protected final Evidence checkInjection(
-      final VulnerabilityType type,
-      final Iterator<?> items,
-      final LocationSupplier locationSupplier) {
-    return checkInjection(type, items, null, locationSupplier);
-  }
-
-  @Nullable
-  protected final Evidence checkInjection(
-      final VulnerabilityType type,
-      final Iterator<?> items,
-      final EvidenceBuilder evidenceBuilder) {
-    return checkInjection(type, items, evidenceBuilder, null);
-  }
-
-  @Nullable
-  protected final Evidence checkInjection(
-      final VulnerabilityType type,
-      final Iterator<?> items,
-      @Nullable final EvidenceBuilder evidenceBuilder,
-      @Nullable final LocationSupplier locationSupplier) {
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return null;
+
+    @Nullable
+    protected final Evidence checkInjection(
+            final VulnerabilityType type, final Iterator<?> items, final LocationSupplier locationSupplier) {
+        return checkInjection(type, items, null, locationSupplier);
     }
 
-    final TaintedObjects to = ctx.getTaintedObjects();
-    final StringBuilder evidence = new StringBuilder();
-    final RangeBuilder ranges = new RangeBuilder();
-    boolean spanFetched = false;
-    AgentSpan span = null;
-    while (items.hasNext()) {
-      final Object value = items.next();
-      if (value == null) {
-        continue;
-      }
-
-      final TaintedObject tainted = to.get(value);
-      Range[] valueRanges = null;
-      if (tainted != null) {
-        valueRanges = Ranges.getNotMarkedRanges(tainted.getRanges(), type.mark());
-        addSecurityControlMetrics(ctx, valueRanges, tainted.getRanges(), type);
-      }
-      addToEvidence(type, evidence, ranges, value, valueRanges, evidenceBuilder);
-
-      // in case we have an injection let's check if we can report it and exit early if not
-      if (!spanFetched && valueRanges != null && valueRanges.length > 0) {
-        span = AgentTracer.activeSpan();
-        spanFetched = true;
-        if (!overheadController.consumeQuota(Operations.REPORT_VULNERABILITY, span, type)) {
-          return null;
+    @Nullable
+    protected final Evidence checkInjection(
+            final VulnerabilityType type, final Iterator<?> items, final EvidenceBuilder evidenceBuilder) {
+        return checkInjection(type, items, evidenceBuilder, null);
+    }
+
+    @Nullable
+    protected final Evidence checkInjection(
+            final VulnerabilityType type,
+            final Iterator<?> items,
+            @Nullable final EvidenceBuilder evidenceBuilder,
+            @Nullable final LocationSupplier locationSupplier) {
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return null;
         }
-      }
 
-      if (ranges.isFull() || evidence.length() >= MAX_EVIDENCE_LENGTH) {
-        break;
-      }
+        final TaintedObjects to = ctx.getTaintedObjects();
+        final StringBuilder evidence = new StringBuilder();
+        final RangeBuilder ranges = new RangeBuilder();
+        boolean spanFetched = false;
+        AgentSpan span = null;
+        while (items.hasNext()) {
+            final Object value = items.next();
+            if (value == null) {
+                continue;
+            }
+
+            final TaintedObject tainted = to.get(value);
+            Range[] valueRanges = null;
+            if (tainted != null) {
+                valueRanges = Ranges.getNotMarkedRanges(tainted.getRanges(), type.mark());
+                addSecurityControlMetrics(ctx, valueRanges, tainted.getRanges(), type);
+            }
+            addToEvidence(type, evidence, ranges, value, valueRanges, evidenceBuilder);
+
+            // in case we have an injection let's check if we can report it and exit early if not
+            if (!spanFetched && valueRanges != null && valueRanges.length > 0) {
+                span = AgentTracer.activeSpan();
+                spanFetched = true;
+                if (!overheadController.consumeQuota(Operations.REPORT_VULNERABILITY, span, type)) {
+                    return null;
+                }
+            }
+
+            if (ranges.isFull() || evidence.length() >= MAX_EVIDENCE_LENGTH) {
+                break;
+            }
+        }
+        return report(span, type, evidence, ranges, locationSupplier);
+    }
+
+    @Nullable
+    protected Evidence checkInjectionDeeply(
+            final VulnerabilityType type, final Object value, final Predicate<Class<?>> filter) {
+        return checkInjectionDeeply(type, value, filter, null, null);
+    }
+
+    @Nullable
+    @SuppressWarnings("unused")
+    protected Evidence checkInjectionDeeply(
+            final VulnerabilityType type,
+            final Object value,
+            final Predicate<Class<?>> filter,
+            @Nullable final EvidenceBuilder evidenceBuilder) {
+        return checkInjectionDeeply(type, value, filter, evidenceBuilder, null);
+    }
+
+    @Nullable
+    @SuppressWarnings("unused")
+    protected Evidence checkInjectionDeeply(
+            final VulnerabilityType type,
+            final Object value,
+            final Predicate<Class<?>> filter,
+            @Nullable final LocationSupplier locationSupplier) {
+        return checkInjectionDeeply(type, value, filter, null, locationSupplier);
     }
-    return report(span, type, evidence, ranges, locationSupplier);
-  }
-
-  @Nullable
-  protected Evidence checkInjectionDeeply(
-      final VulnerabilityType type, final Object value, final Predicate<Class<?>> filter) {
-    return checkInjectionDeeply(type, value, filter, null, null);
-  }
-
-  @Nullable
-  @SuppressWarnings("unused")
-  protected Evidence checkInjectionDeeply(
-      final VulnerabilityType type,
-      final Object value,
-      final Predicate<Class<?>> filter,
-      @Nullable final EvidenceBuilder evidenceBuilder) {
-    return checkInjectionDeeply(type, value, filter, evidenceBuilder, null);
-  }
-
-  @Nullable
-  @SuppressWarnings("unused")
-  protected Evidence checkInjectionDeeply(
-      final VulnerabilityType type,
-      final Object value,
-      final Predicate<Class<?>> filter,
-      @Nullable final LocationSupplier locationSupplier) {
-    return checkInjectionDeeply(type, value, filter, null, locationSupplier);
-  }
-
-  @Nullable
-  protected Evidence checkInjectionDeeply(
-      final VulnerabilityType type,
-      final Object value,
-      final Predicate<Class<?>> filter,
-      @Nullable final EvidenceBuilder evidenceBuilder,
-      @Nullable final LocationSupplier locationSupplier) {
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return null;
+
+    @Nullable
+    protected Evidence checkInjectionDeeply(
+            final VulnerabilityType type,
+            final Object value,
+            final Predicate<Class<?>> filter,
+            @Nullable final EvidenceBuilder evidenceBuilder,
+            @Nullable final LocationSupplier locationSupplier) {
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return null;
+        }
+
+        final InjectionVisitor visitor = new InjectionVisitor(ctx, type, evidenceBuilder, locationSupplier);
+        ObjectVisitor.visit(value, visitor, filter);
+        return visitor.evidence;
     }
 
-    final InjectionVisitor visitor =
-        new InjectionVisitor(ctx, type, evidenceBuilder, locationSupplier);
-    ObjectVisitor.visit(value, visitor, filter);
-    return visitor.evidence;
-  }
-
-  @Nullable
-  private Evidence report(
-      @Nullable final AgentSpan span,
-      final VulnerabilityType type,
-      final StringBuilder evidenceString,
-      final RangeBuilder ranges,
-      @Nullable final LocationSupplier locationSupplier) {
-    if (ranges.isEmpty()) {
-      return null;
+    @Nullable
+    private Evidence report(
+            @Nullable final AgentSpan span,
+            final VulnerabilityType type,
+            final StringBuilder evidenceString,
+            final RangeBuilder ranges,
+            @Nullable final LocationSupplier locationSupplier) {
+        if (ranges.isEmpty()) {
+            return null;
+        }
+        final Evidence evidence = new Evidence(evidenceString.toString(), ranges.toArray());
+        final Location location = buildLocation(span, locationSupplier);
+        final Vulnerability vulnerability = new Vulnerability(type, location, evidence);
+        reporter.report(span, vulnerability);
+        return evidence;
     }
-    final Evidence evidence = new Evidence(evidenceString.toString(), ranges.toArray());
-    final Location location = buildLocation(span, locationSupplier);
-    final Vulnerability vulnerability = new Vulnerability(type, location, evidence);
-    reporter.report(span, vulnerability);
-    return evidence;
-  }
-
-  protected void addToEvidence(
-      final VulnerabilityType type,
-      final StringBuilder evidence,
-      final RangeBuilder ranges,
-      final Object value,
-      @Nullable final Range[] valueRanges,
-      @Nullable final EvidenceBuilder evidenceBuilder) {
-    if (evidenceBuilder != null) {
-      if (isTainted(valueRanges)) {
-        evidenceBuilder.tainted(evidence, ranges, value, valueRanges);
-      } else {
-        evidenceBuilder.nonTainted(evidence, value);
-      }
-    } else {
-      int offset = evidence.length();
-      if (offset > 0) {
-        evidence.append(type.separator());
-        offset++;
-      }
-      evidence.append(value);
-      if (isTainted(valueRanges)) {
-        final Range unbound = Ranges.findUnbound(valueRanges);
-        if (unbound != null) {
-          // use a single range covering the whole value for unbound items
-          final Source source = unbound.getSource();
-          ranges.add(new Range(offset, evidence.length() - offset, source, unbound.getMarks()));
+
+    protected void addToEvidence(
+            final VulnerabilityType type,
+            final StringBuilder evidence,
+            final RangeBuilder ranges,
+            final Object value,
+            @Nullable final Range[] valueRanges,
+            @Nullable final EvidenceBuilder evidenceBuilder) {
+        if (evidenceBuilder != null) {
+            if (isTainted(valueRanges)) {
+                evidenceBuilder.tainted(evidence, ranges, value, valueRanges);
+            } else {
+                evidenceBuilder.nonTainted(evidence, value);
+            }
         } else {
-          ranges.add(valueRanges, offset);
+            int offset = evidence.length();
+            if (offset > 0) {
+                evidence.append(type.separator());
+                offset++;
+            }
+            evidence.append(value);
+            if (isTainted(valueRanges)) {
+                final Range unbound = Ranges.findUnbound(valueRanges);
+                if (unbound != null) {
+                    // use a single range covering the whole value for unbound items
+                    final Source source = unbound.getSource();
+                    ranges.add(new Range(offset, evidence.length() - offset, source, unbound.getMarks()));
+                } else {
+                    ranges.add(valueRanges, offset);
+                }
+            }
         }
-      }
     }
-  }
 
-  protected Location buildLocation(
-      @Nullable final AgentSpan span, @Nullable final LocationSupplier supplier) {
-    if (supplier != null) {
-      return supplier.build(span);
+    protected Location buildLocation(@Nullable final AgentSpan span, @Nullable final LocationSupplier supplier) {
+        if (supplier != null) {
+            return supplier.build(span);
+        }
+        return Location.forSpanAndStack(span, getCurrentStackTrace());
     }
-    return Location.forSpanAndStack(span, getCurrentStackTrace());
-  }
-
-  protected final StackTraceElement getCurrentStackTrace() {
-    StackTraceElement stackTraceElement =
-        stackWalker.walk(SinkModuleBase::findValidPackageForVulnerability);
-    // If the source mapper is enabled, we should try to map the stack trace element to the original
-    // source file
-    if (SourceMapperImpl.INSTANCE != null) {
-      Pair<String, Integer> pair =
-          SourceMapperImpl.INSTANCE.getFileAndLine(
-              stackTraceElement.getClassName(), stackTraceElement.getLineNumber());
-      if (pair != null && pair.getLeft() != null && pair.getRight() != null) {
-        return new StackTraceElement(
-            pair.getLeft(), stackTraceElement.getMethodName(), pair.getLeft(), pair.getRight());
-      }
+
+    protected final StackTraceElement getCurrentStackTrace() {
+        StackTraceElement stackTraceElement = stackWalker.walk(SinkModuleBase::findValidPackageForVulnerability);
+        // If the source mapper is enabled, we should try to map the stack trace element to the original
+        // source file
+        if (SourceMapperImpl.INSTANCE != null) {
+            Pair<String, Integer> pair = SourceMapperImpl.INSTANCE.getFileAndLine(
+                    stackTraceElement.getClassName(), stackTraceElement.getLineNumber());
+            if (pair != null && pair.getLeft() != null && pair.getRight() != null) {
+                return new StackTraceElement(
+                        pair.getLeft(), stackTraceElement.getMethodName(), pair.getLeft(), pair.getRight());
+            }
+        }
+        return stackTraceElement;
     }
-    return stackTraceElement;
-  }
-
-  static StackTraceElement findValidPackageForVulnerability(
-      @Nonnull final Stream<StackTraceElement> stream) {
-    final StackTraceElement[] first = new StackTraceElement[1];
-    return stream
-        .filter(
-            stack -> {
-              if (first[0] == null) {
-                first[0] = stack;
-              }
-              return IastExclusionTrie.apply(stack.getClassName()) < 1;
-            })
-        .findFirst()
-        .orElse(first[0]);
-  }
-
-  @Contract("null -> false")
-  private static boolean isTainted(@Nullable final Range[] ranges) {
-    return ranges != null && ranges.length > 0;
-  }
-
-  /**
-   * Building the location of a vulnerability might be expensive (e.g. when computing the call stack
-   * to traverse until customer code), this interface makes the construction of the location a lazy
-   * op that only happens when a vulnerability has been discovered.
-   */
-  public interface LocationSupplier {
-    Location build(@Nullable AgentSpan span);
-  }
-
-  /** Builder instance to construct the final evidence of a vulnerability */
-  public interface EvidenceBuilder {
-    void tainted(StringBuilder evidence, RangeBuilder ranges, Object value, Range[] valueRanges);
-
-    default void nonTainted(StringBuilder evidence, Object value) {
-      // do nothing by default if the value is not tainted
+
+    static StackTraceElement findValidPackageForVulnerability(@Nonnull final Stream<StackTraceElement> stream) {
+        final StackTraceElement[] first = new StackTraceElement[1];
+        return stream.filter(stack -> {
+                    if (first[0] == null) {
+                        first[0] = stack;
+                    }
+                    return IastExclusionTrie.apply(stack.getClassName()) < 1;
+                })
+                .findFirst()
+                .orElse(first[0]);
     }
-  }
-
-  private class InjectionVisitor implements ObjectVisitor.Visitor {
-
-    private final IastContext ctx;
-    private final VulnerabilityType type;
-    @Nullable private final EvidenceBuilder evidenceBuilder;
-    @Nullable private final LocationSupplier locationSupplier;
-    @Nullable private Evidence evidence;
-
-    private InjectionVisitor(
-        final IastContext ctx,
-        final VulnerabilityType type,
-        @Nullable final EvidenceBuilder evidenceBuilder,
-        @Nullable final LocationSupplier locationSupplier) {
-      this.ctx = ctx;
-      this.type = type;
-      this.evidenceBuilder = evidenceBuilder;
-      this.locationSupplier = locationSupplier;
+
+    @Contract("null -> false")
+    private static boolean isTainted(@Nullable final Range[] ranges) {
+        return ranges != null && ranges.length > 0;
+    }
+
+    /**
+     * Building the location of a vulnerability might be expensive (e.g. when computing the call stack
+     * to traverse until customer code), this interface makes the construction of the location a lazy
+     * op that only happens when a vulnerability has been discovered.
+     */
+    public interface LocationSupplier {
+        Location build(@Nullable AgentSpan span);
+    }
+
+    /** Builder instance to construct the final evidence of a vulnerability */
+    public interface EvidenceBuilder {
+        void tainted(StringBuilder evidence, RangeBuilder ranges, Object value, Range[] valueRanges);
+
+        default void nonTainted(StringBuilder evidence, Object value) {
+            // do nothing by default if the value is not tainted
+        }
     }
 
-    @Nonnull
-    @Override
-    public ObjectVisitor.State visit(@Nonnull final String path, @Nonnull final Object value) {
-      evidence = checkInjection(ctx, type, value, evidenceBuilder, locationSupplier);
-      return evidence != null ? EXIT : CONTINUE; // report first tainted value only
+    private class InjectionVisitor implements ObjectVisitor.Visitor {
+
+        private final IastContext ctx;
+        private final VulnerabilityType type;
+
+        @Nullable
+        private final EvidenceBuilder evidenceBuilder;
+
+        @Nullable
+        private final LocationSupplier locationSupplier;
+
+        @Nullable
+        private Evidence evidence;
+
+        private InjectionVisitor(
+                final IastContext ctx,
+                final VulnerabilityType type,
+                @Nullable final EvidenceBuilder evidenceBuilder,
+                @Nullable final LocationSupplier locationSupplier) {
+            this.ctx = ctx;
+            this.type = type;
+            this.evidenceBuilder = evidenceBuilder;
+            this.locationSupplier = locationSupplier;
+        }
+
+        @Nonnull
+        @Override
+        public ObjectVisitor.State visit(@Nonnull final String path, @Nonnull final Object value) {
+            evidence = checkInjection(ctx, type, value, evidenceBuilder, locationSupplier);
+            return evidence != null ? EXIT : CONTINUE; // report first tainted value only
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SqlInjectionModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SqlInjectionModuleImpl.java
index 53c609bb09c..f53cc58edd4 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SqlInjectionModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SqlInjectionModuleImpl.java
@@ -10,23 +10,23 @@
 
 public class SqlInjectionModuleImpl extends SinkModuleBase implements SqlInjectionModule {
 
-  public SqlInjectionModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
-
-  @Override
-  public void onJdbcQuery(@Nullable final String queryString) {
-    onJdbcQuery(queryString, null);
-  }
+    public SqlInjectionModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
+    }
 
-  @Override
-  public void onJdbcQuery(@Nullable final String queryString, @Nullable final String database) {
-    if (!canBeTainted(queryString)) {
-      return;
+    @Override
+    public void onJdbcQuery(@Nullable final String queryString) {
+        onJdbcQuery(queryString, null);
     }
-    final Evidence evidence = checkInjection(VulnerabilityType.SQL_INJECTION, queryString);
-    if (evidence != null && database != null) {
-      evidence.getContext().put(DATABASE_PARAMETER, database);
+
+    @Override
+    public void onJdbcQuery(@Nullable final String queryString, @Nullable final String database) {
+        if (!canBeTainted(queryString)) {
+            return;
+        }
+        final Evidence evidence = checkInjection(VulnerabilityType.SQL_INJECTION, queryString);
+        if (evidence != null && database != null) {
+            evidence.getContext().put(DATABASE_PARAMETER, database);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SsrfModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SsrfModuleImpl.java
index 96b4515bb68..d4a68bc54c7 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SsrfModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/SsrfModuleImpl.java
@@ -7,15 +7,15 @@
 
 public class SsrfModuleImpl extends SinkModuleBase implements SsrfModule {
 
-  public SsrfModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
+    public SsrfModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
+    }
 
-  @Override
-  public void onURLConnection(@Nullable final Object url) {
-    if (url == null) {
-      return;
+    @Override
+    public void onURLConnection(@Nullable final Object url) {
+        if (url == null) {
+            return;
+        }
+        checkInjection(VulnerabilityType.SSRF, url);
     }
-    checkInjection(VulnerabilityType.SSRF, url);
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/StacktraceLeakModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/StacktraceLeakModuleImpl.java
index ef0fc13b7e7..9ef6f8ac0e0 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/StacktraceLeakModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/StacktraceLeakModuleImpl.java
@@ -12,23 +12,20 @@
 
 public class StacktraceLeakModuleImpl extends SinkModuleBase implements StacktraceLeakModule {
 
-  public StacktraceLeakModuleImpl(@Nonnull Dependencies dependencies) {
-    super(dependencies);
-  }
+    public StacktraceLeakModuleImpl(@Nonnull Dependencies dependencies) {
+        super(dependencies);
+    }
 
-  @Override
-  public void onStacktraceLeak(
-      Throwable throwable, String moduleName, String className, String methodName) {
-    if (throwable != null) {
-      final AgentSpan span = AgentTracer.activeSpan();
-      Evidence evidence =
-          new Evidence(
-              "ExceptionHandler in "
-                  + moduleName
-                  + " \r\nthrown "
-                  + throwable.getClass().getName());
-      Location location = Location.forSpanAndClassAndMethod(span, className, methodName);
-      report(span, new Vulnerability(VulnerabilityType.STACKTRACE_LEAK, location, evidence));
+    @Override
+    public void onStacktraceLeak(Throwable throwable, String moduleName, String className, String methodName) {
+        if (throwable != null) {
+            final AgentSpan span = AgentTracer.activeSpan();
+            Evidence evidence = new Evidence("ExceptionHandler in "
+                    + moduleName
+                    + " \r\nthrown "
+                    + throwable.getClass().getName());
+            Location location = Location.forSpanAndClassAndMethod(span, className, methodName);
+            report(span, new Vulnerability(VulnerabilityType.STACKTRACE_LEAK, location, evidence));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/TrustBoundaryViolationModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/TrustBoundaryViolationModuleImpl.java
index 829fa5da882..3541992717d 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/TrustBoundaryViolationModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/TrustBoundaryViolationModuleImpl.java
@@ -8,49 +8,46 @@
 import java.util.Map;
 import javax.annotation.Nonnull;
 
-public class TrustBoundaryViolationModuleImpl extends SinkModuleBase
-    implements TrustBoundaryViolationModule {
+public class TrustBoundaryViolationModuleImpl extends SinkModuleBase implements TrustBoundaryViolationModule {
 
-  private static final ClassNameTrie ALLOWED_COLLECTION_PKGS;
+    private static final ClassNameTrie ALLOWED_COLLECTION_PKGS;
 
-  static {
-    final ClassNameTrie.Builder builder = new ClassNameTrie.Builder();
-    builder.put("java.util.*", 1);
-    builder.put("org.apache.commons.collections*", 1);
-    builder.put("com.google.common.collect*", 1);
-    builder.put("org.springframework.web.servlet.FlashMap", 1);
-    ALLOWED_COLLECTION_PKGS = builder.buildTrie();
-  }
-
-  public TrustBoundaryViolationModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
+    static {
+        final ClassNameTrie.Builder builder = new ClassNameTrie.Builder();
+        builder.put("java.util.*", 1);
+        builder.put("org.apache.commons.collections*", 1);
+        builder.put("com.google.common.collect*", 1);
+        builder.put("org.springframework.web.servlet.FlashMap", 1);
+        ALLOWED_COLLECTION_PKGS = builder.buildTrie();
+    }
 
-  @Override
-  public void onSessionValue(@Nonnull String name, Object value) {
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
+    public TrustBoundaryViolationModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
     }
-    checkInjection(VulnerabilityType.TRUST_BOUNDARY_VIOLATION, name);
-    if (value != null) {
-      checkInjectionDeeply(
-          VulnerabilityType.TRUST_BOUNDARY_VIOLATION,
-          value,
-          TrustBoundaryViolationModuleImpl::visitClass);
+
+    @Override
+    public void onSessionValue(@Nonnull String name, Object value) {
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        checkInjection(VulnerabilityType.TRUST_BOUNDARY_VIOLATION, name);
+        if (value != null) {
+            checkInjectionDeeply(
+                    VulnerabilityType.TRUST_BOUNDARY_VIOLATION, value, TrustBoundaryViolationModuleImpl::visitClass);
+        }
     }
-  }
 
-  /**
-   * Any potential object can be stored in the session (including lazy ones) so we must be very
-   * careful and ensure that we don't potentially cause any harm by limiting ourselves to well known
-   * types.
-   */
-  private static boolean visitClass(final Class<?> clazz) {
-    if ((Iterable.class.isAssignableFrom(clazz) || Map.class.isAssignableFrom(clazz))) {
-      final String className = clazz.getName();
-      return ALLOWED_COLLECTION_PKGS.apply(className) > 0;
+    /**
+     * Any potential object can be stored in the session (including lazy ones) so we must be very
+     * careful and ensure that we don't potentially cause any harm by limiting ourselves to well known
+     * types.
+     */
+    private static boolean visitClass(final Class<?> clazz) {
+        if ((Iterable.class.isAssignableFrom(clazz) || Map.class.isAssignableFrom(clazz))) {
+            final String className = clazz.getName();
+            return ALLOWED_COLLECTION_PKGS.apply(className) > 0;
+        }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/UntrustedDeserializationModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/UntrustedDeserializationModuleImpl.java
index c0879dffffb..b4070410dcb 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/UntrustedDeserializationModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/UntrustedDeserializationModuleImpl.java
@@ -5,18 +5,17 @@
 import datadog.trace.api.iast.sink.UntrustedDeserializationModule;
 import javax.annotation.Nullable;
 
-public class UntrustedDeserializationModuleImpl extends SinkModuleBase
-    implements UntrustedDeserializationModule {
+public class UntrustedDeserializationModuleImpl extends SinkModuleBase implements UntrustedDeserializationModule {
 
-  public UntrustedDeserializationModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
+    public UntrustedDeserializationModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
+    }
 
-  @Override
-  public void onObject(@Nullable Object object) {
-    if (object == null) {
-      return;
+    @Override
+    public void onObject(@Nullable Object object) {
+        if (object == null) {
+            return;
+        }
+        checkInjection(VulnerabilityType.UNTRUSTED_DESERIALIZATION, object);
     }
-    checkInjection(VulnerabilityType.UNTRUSTED_DESERIALIZATION, object);
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/UnvalidatedRedirectModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/UnvalidatedRedirectModuleImpl.java
index 550fca68b85..ee2fe9547db 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/UnvalidatedRedirectModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/UnvalidatedRedirectModuleImpl.java
@@ -16,90 +16,91 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public class UnvalidatedRedirectModuleImpl extends SinkModuleBase
-    implements UnvalidatedRedirectModule {
+public class UnvalidatedRedirectModuleImpl extends SinkModuleBase implements UnvalidatedRedirectModule {
 
-  public UnvalidatedRedirectModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
+    public UnvalidatedRedirectModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
+    }
 
-  @Override
-  public void onRedirect(final @Nullable String value) {
-    if (!canBeTainted(value)) {
-      return;
+    @Override
+    public void onRedirect(final @Nullable String value) {
+        if (!canBeTainted(value)) {
+            return;
+        }
+        checkUnvalidatedRedirect(value);
     }
-    checkUnvalidatedRedirect(value);
-  }
 
-  @Override
-  public void onRedirect(@Nonnull String value, @Nonnull String clazz, @Nonnull String method) {
-    if (!canBeTainted(value)) {
-      return;
+    @Override
+    public void onRedirect(@Nonnull String value, @Nonnull String clazz, @Nonnull String method) {
+        if (!canBeTainted(value)) {
+            return;
+        }
+        checkUnvalidatedRedirect(value, clazz, method);
     }
-    checkUnvalidatedRedirect(value, clazz, method);
-  }
 
-  @Override
-  public void onURIRedirect(@Nullable URI uri) {
-    if (uri == null) {
-      return;
+    @Override
+    public void onURIRedirect(@Nullable URI uri) {
+        if (uri == null) {
+            return;
+        }
+        checkUnvalidatedRedirect(uri);
     }
-    checkUnvalidatedRedirect(uri);
-  }
 
-  @Override
-  public void onHeader(@Nonnull final String name, @Nullable final String value) {
-    if (value != null && LOCATION.matches(name)) {
-      onRedirect(value);
+    @Override
+    public void onHeader(@Nonnull final String name, @Nullable final String value) {
+        if (value != null && LOCATION.matches(name)) {
+            onRedirect(value);
+        }
     }
-  }
 
-  private void checkUnvalidatedRedirect(@Nonnull final Object value) {
-    checkUnvalidatedRedirect(value, null, null);
-  }
+    private void checkUnvalidatedRedirect(@Nonnull final Object value) {
+        checkUnvalidatedRedirect(value, null, null);
+    }
 
-  private void checkUnvalidatedRedirect(
-      @Nonnull final Object value, @Nullable final String clazz, @Nullable final String method) {
-    checkInjection(
-        VulnerabilityType.UNVALIDATED_REDIRECT,
-        value,
-        new UnvalidatedRedirectEvidenceBuilder(),
-        new UnvalidatedRedirectLocationSupplier(clazz, method));
-  }
+    private void checkUnvalidatedRedirect(
+            @Nonnull final Object value, @Nullable final String clazz, @Nullable final String method) {
+        checkInjection(
+                VulnerabilityType.UNVALIDATED_REDIRECT,
+                value,
+                new UnvalidatedRedirectEvidenceBuilder(),
+                new UnvalidatedRedirectLocationSupplier(clazz, method));
+    }
 
-  private static class UnvalidatedRedirectEvidenceBuilder implements EvidenceBuilder {
+    private static class UnvalidatedRedirectEvidenceBuilder implements EvidenceBuilder {
 
-    @Override
-    public void tainted(
-        final StringBuilder evidence,
-        final RangeBuilder ranges,
-        final Object value,
-        final Range[] valueRanges) {
-      if (allRangesFromHeader(REFERER, valueRanges)) {
-        return;
-      }
-      evidence.append(value);
-      ranges.add(valueRanges);
+        @Override
+        public void tainted(
+                final StringBuilder evidence,
+                final RangeBuilder ranges,
+                final Object value,
+                final Range[] valueRanges) {
+            if (allRangesFromHeader(REFERER, valueRanges)) {
+                return;
+            }
+            evidence.append(value);
+            ranges.add(valueRanges);
+        }
     }
-  }
 
-  private class UnvalidatedRedirectLocationSupplier implements LocationSupplier {
-    @Nullable private final String clazz;
-    @Nullable private final String method;
+    private class UnvalidatedRedirectLocationSupplier implements LocationSupplier {
+        @Nullable
+        private final String clazz;
 
-    private UnvalidatedRedirectLocationSupplier(
-        @Nullable final String clazz, @Nullable final String method) {
-      this.clazz = clazz;
-      this.method = method;
-    }
+        @Nullable
+        private final String method;
 
-    @Override
-    public Location build(@Nullable final AgentSpan span) {
-      if (clazz != null && method != null) {
-        return Location.forSpanAndClassAndMethod(span, clazz, method);
-      } else {
-        return Location.forSpanAndStack(span, getCurrentStackTrace());
-      }
+        private UnvalidatedRedirectLocationSupplier(@Nullable final String clazz, @Nullable final String method) {
+            this.clazz = clazz;
+            this.method = method;
+        }
+
+        @Override
+        public Location build(@Nullable final AgentSpan span) {
+            if (clazz != null && method != null) {
+                return Location.forSpanAndClassAndMethod(span, clazz, method);
+            } else {
+                return Location.forSpanAndStack(span, getCurrentStackTrace());
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakCipherModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakCipherModuleImpl.java
index 40d3f407091..87167d4ae0b 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakCipherModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakCipherModuleImpl.java
@@ -10,19 +10,19 @@
 
 public class WeakCipherModuleImpl extends SinkModuleBase implements WeakCipherModule {
 
-  private Config config;
+    private Config config;
 
-  public WeakCipherModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-    config = dependencies.getConfig();
-  }
+    public WeakCipherModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
+        config = dependencies.getConfig();
+    }
 
-  @Override
-  public void onCipherAlgorithm(@Nonnull final String algorithm) {
-    final String algorithmId = algorithm.toUpperCase(Locale.ROOT);
-    if (!config.getIastWeakCipherAlgorithms().matcher(algorithmId).matches()) {
-      return;
+    @Override
+    public void onCipherAlgorithm(@Nonnull final String algorithm) {
+        final String algorithmId = algorithm.toUpperCase(Locale.ROOT);
+        if (!config.getIastWeakCipherAlgorithms().matcher(algorithmId).matches()) {
+            return;
+        }
+        report(VulnerabilityType.WEAK_CIPHER, new Evidence(algorithm));
     }
-    report(VulnerabilityType.WEAK_CIPHER, new Evidence(algorithm));
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakHashModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakHashModuleImpl.java
index d8013234ba2..6a19e742b4a 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakHashModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakHashModuleImpl.java
@@ -10,19 +10,19 @@
 
 public class WeakHashModuleImpl extends SinkModuleBase implements WeakHashModule {
 
-  private Config config;
+    private Config config;
 
-  public WeakHashModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-    config = dependencies.getConfig();
-  }
+    public WeakHashModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
+        config = dependencies.getConfig();
+    }
 
-  @Override
-  public void onHashingAlgorithm(@Nonnull final String algorithm) {
-    final String algorithmId = algorithm.toUpperCase(Locale.ROOT);
-    if (!config.getIastWeakHashAlgorithms().contains(algorithmId)) {
-      return;
+    @Override
+    public void onHashingAlgorithm(@Nonnull final String algorithm) {
+        final String algorithmId = algorithm.toUpperCase(Locale.ROOT);
+        if (!config.getIastWeakHashAlgorithms().contains(algorithmId)) {
+            return;
+        }
+        report(VulnerabilityType.WEAK_HASH, new Evidence(algorithm));
     }
-    report(VulnerabilityType.WEAK_HASH, new Evidence(algorithm));
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakRandomnessModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakRandomnessModuleImpl.java
index b92ef308432..6edbc4619f5 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakRandomnessModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/WeakRandomnessModuleImpl.java
@@ -9,23 +9,23 @@
 
 public class WeakRandomnessModuleImpl extends SinkModuleBase implements WeakRandomnessModule {
 
-  public WeakRandomnessModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
+    public WeakRandomnessModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
+    }
 
-  @Override
-  public void onWeakRandom(@Nonnull final Class<?> instance) {
-    if (isSecuredInstance(instance)) {
-      return;
+    @Override
+    public void onWeakRandom(@Nonnull final Class<?> instance) {
+        if (isSecuredInstance(instance)) {
+            return;
+        }
+        report(VulnerabilityType.WEAK_RANDOMNESS, new Evidence(instance.getName()));
     }
-    report(VulnerabilityType.WEAK_RANDOMNESS, new Evidence(instance.getName()));
-  }
 
-  /**
-   * Skip vulnerabilities on {@link java.security.SecureRandom} or any impl that contains secure in
-   * the name
-   */
-  private boolean isSecuredInstance(@Nonnull final Class<?> instance) {
-    return instance.getSimpleName().toLowerCase(Locale.ROOT).contains("secure");
-  }
+    /**
+     * Skip vulnerabilities on {@link java.security.SecureRandom} or any impl that contains secure in
+     * the name
+     */
+    private boolean isSecuredInstance(@Nonnull final Class<?> instance) {
+        return instance.getSimpleName().toLowerCase(Locale.ROOT).contains("secure");
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XContentTypeModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XContentTypeModuleImpl.java
index d9815bfd5e6..559c57013b9 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XContentTypeModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XContentTypeModuleImpl.java
@@ -16,42 +16,39 @@
 import org.slf4j.LoggerFactory;
 
 public class XContentTypeModuleImpl extends SinkModuleBase implements XContentTypeModule {
-  private static final Logger LOGGER = LoggerFactory.getLogger(XContentTypeModuleImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(XContentTypeModuleImpl.class);
 
-  public XContentTypeModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
-
-  @Override
-  public void onRequestEnd(final IastContext ctx, final IGSpanInfo igSpanInfo) {
-    if (!(ctx instanceof IastRequestContext)) {
-      return;
+    public XContentTypeModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
     }
-    try {
-      final IastRequestContext iastRequestContext = (IastRequestContext) ctx;
-      if (!isNoSniffContentOptions(iastRequestContext.getxContentTypeOptions())) {
-        if (!isHtmlResponse(iastRequestContext.getContentType())) {
-          return;
+
+    @Override
+    public void onRequestEnd(final IastContext ctx, final IGSpanInfo igSpanInfo) {
+        if (!(ctx instanceof IastRequestContext)) {
+            return;
         }
-        Map<String, Object> tags = igSpanInfo.getTags();
-        if (isIgnorableResponseCode((Integer) tags.get("http.status_code"))) {
-          return;
+        try {
+            final IastRequestContext iastRequestContext = (IastRequestContext) ctx;
+            if (!isNoSniffContentOptions(iastRequestContext.getxContentTypeOptions())) {
+                if (!isHtmlResponse(iastRequestContext.getContentType())) {
+                    return;
+                }
+                Map<String, Object> tags = igSpanInfo.getTags();
+                if (isIgnorableResponseCode((Integer) tags.get("http.status_code"))) {
+                    return;
+                }
+                final AgentSpan span = (AgentSpan) igSpanInfo;
+                report(span, new Vulnerability(VulnerabilityType.XCONTENTTYPE_HEADER_MISSING, Location.forSpan(span)));
+            }
+        } catch (Throwable e) {
+            LOGGER.debug("Exception while checking for missing X Content type options header", e);
         }
-        final AgentSpan span = (AgentSpan) igSpanInfo;
-        report(
-            span,
-            new Vulnerability(
-                VulnerabilityType.XCONTENTTYPE_HEADER_MISSING, Location.forSpan(span)));
-      }
-    } catch (Throwable e) {
-      LOGGER.debug("Exception while checking for missing X Content type options header", e);
     }
-  }
 
-  static boolean isNoSniffContentOptions(@Nullable final String value) {
-    if (value == null) {
-      return false;
+    static boolean isNoSniffContentOptions(@Nullable final String value) {
+        if (value == null) {
+            return false;
+        }
+        return value.toLowerCase(Locale.ROOT).contains("nosniff");
     }
-    return value.toLowerCase(Locale.ROOT).contains("nosniff");
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XPathInjectionModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XPathInjectionModuleImpl.java
index 391782df73e..d7749319121 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XPathInjectionModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XPathInjectionModuleImpl.java
@@ -10,19 +10,19 @@
 
 public class XPathInjectionModuleImpl extends SinkModuleBase implements XPathInjectionModule {
 
-  public XPathInjectionModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
-
-  @Override
-  public void onExpression(@Nullable String expression) {
-    if (!canBeTainted(expression)) {
-      return;
+    public XPathInjectionModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
     }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return;
+
+    @Override
+    public void onExpression(@Nullable String expression) {
+        if (!canBeTainted(expression)) {
+            return;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return;
+        }
+        checkInjection(VulnerabilityType.XPATH_INJECTION, expression);
     }
-    checkInjection(VulnerabilityType.XPATH_INJECTION, expression);
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XssModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XssModuleImpl.java
index e0becd04810..8883fde6a82 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XssModuleImpl.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/XssModuleImpl.java
@@ -13,90 +13,90 @@
 
 public class XssModuleImpl extends SinkModuleBase implements XssModule {
 
-  private static final int MAX_LENGTH = 500;
+    private static final int MAX_LENGTH = 500;
 
-  public XssModuleImpl(final Dependencies dependencies) {
-    super(dependencies);
-  }
-
-  @Override
-  public void onXss(@Nonnull String s) {
-    if (!canBeTainted(s)) {
-      return;
+    public XssModuleImpl(final Dependencies dependencies) {
+        super(dependencies);
     }
-    checkInjection(VulnerabilityType.XSS, s);
-  }
 
-  @Override
-  public void onXss(@Nonnull String s, @Nonnull String clazz, @Nonnull String method) {
-    if (!canBeTainted(s)) {
-      return;
+    @Override
+    public void onXss(@Nonnull String s) {
+        if (!canBeTainted(s)) {
+            return;
+        }
+        checkInjection(VulnerabilityType.XSS, s);
     }
-    checkInjection(VulnerabilityType.XSS, s, new ClassMethodLocationSupplier(clazz, method));
-  }
 
-  @Override
-  public void onXss(@Nonnull char[] array) {
-    if (array == null || array.length == 0) {
-      return;
+    @Override
+    public void onXss(@Nonnull String s, @Nonnull String clazz, @Nonnull String method) {
+        if (!canBeTainted(s)) {
+            return;
+        }
+        checkInjection(VulnerabilityType.XSS, s, new ClassMethodLocationSupplier(clazz, method));
     }
-    checkInjection(VulnerabilityType.XSS, array);
-  }
 
-  @Override
-  public void onXss(@Nonnull String format, @Nullable Object[] args) {
-    if ((args == null || args.length == 0) && !canBeTainted(format)) {
-      return;
+    @Override
+    public void onXss(@Nonnull char[] array) {
+        if (array == null || array.length == 0) {
+            return;
+        }
+        checkInjection(VulnerabilityType.XSS, array);
     }
-    if (args == null || args.length == 0) {
-      checkInjection(VulnerabilityType.XSS, format);
-    } else {
-      checkInjection(VulnerabilityType.XSS, Iterators.of(format, args));
+
+    @Override
+    public void onXss(@Nonnull String format, @Nullable Object[] args) {
+        if ((args == null || args.length == 0) && !canBeTainted(format)) {
+            return;
+        }
+        if (args == null || args.length == 0) {
+            checkInjection(VulnerabilityType.XSS, format);
+        } else {
+            checkInjection(VulnerabilityType.XSS, Iterators.of(format, args));
+        }
     }
-  }
 
-  @Override
-  public void onXss(@Nonnull CharSequence s, @Nullable String file, int line) {
-    if (!canBeTainted(s) || !canBeTainted(file)) {
-      return;
+    @Override
+    public void onXss(@Nonnull CharSequence s, @Nullable String file, int line) {
+        if (!canBeTainted(s) || !canBeTainted(file)) {
+            return;
+        }
+        checkInjection(VulnerabilityType.XSS, s, new FileAndLineLocationSupplier(file, line));
     }
-    checkInjection(VulnerabilityType.XSS, s, new FileAndLineLocationSupplier(file, line));
-  }
 
-  private static String truncate(final String s) {
-    if (s == null || s.length() <= MAX_LENGTH) {
-      return s;
+    private static String truncate(final String s) {
+        if (s == null || s.length() <= MAX_LENGTH) {
+            return s;
+        }
+        return s.substring(0, MAX_LENGTH);
     }
-    return s.substring(0, MAX_LENGTH);
-  }
 
-  private static class ClassMethodLocationSupplier implements LocationSupplier {
-    private final String clazz;
-    private final String method;
+    private static class ClassMethodLocationSupplier implements LocationSupplier {
+        private final String clazz;
+        private final String method;
 
-    private ClassMethodLocationSupplier(final String clazz, final String method) {
-      this.clazz = clazz;
-      this.method = method;
-    }
+        private ClassMethodLocationSupplier(final String clazz, final String method) {
+            this.clazz = clazz;
+            this.method = method;
+        }
 
-    @Override
-    public Location build(final @Nullable AgentSpan span) {
-      return Location.forSpanAndClassAndMethod(span, truncate(clazz), truncate(method));
+        @Override
+        public Location build(final @Nullable AgentSpan span) {
+            return Location.forSpanAndClassAndMethod(span, truncate(clazz), truncate(method));
+        }
     }
-  }
 
-  private static class FileAndLineLocationSupplier implements LocationSupplier {
-    private final String file;
-    private final int line;
+    private static class FileAndLineLocationSupplier implements LocationSupplier {
+        private final String file;
+        private final int line;
 
-    private FileAndLineLocationSupplier(final String file, final int line) {
-      this.file = file;
-      this.line = line;
-    }
+        private FileAndLineLocationSupplier(final String file, final int line) {
+            this.file = file;
+            this.line = line;
+        }
 
-    @Override
-    public Location build(@Nullable final AgentSpan span) {
-      return Location.forSpanAndFileAndLine(span, truncate(file), line);
+        @Override
+        public Location build(@Nullable final AgentSpan span) {
+            return Location.forSpanAndFileAndLine(span, truncate(file), line);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/Ranges.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/Ranges.java
index f3e8dec789b..0aa1f6f3199 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/Ranges.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/Ranges.java
@@ -17,435 +17,421 @@
 /** Utilities to work with {@link Range} instances. */
 public final class Ranges {
 
-  public static final Range[] EMPTY = new Range[0];
-
-  private Ranges() {}
-
-  public static Range[] forCharSequence(
-      final @Nonnull CharSequence obj, final @Nonnull Source source) {
-    return forCharSequence(obj, source, NOT_MARKED);
-  }
-
-  public static Range[] forCharSequence(
-      final @Nonnull CharSequence obj, final @Nonnull Source source, final int mark) {
-    return new Range[] {new Range(0, obj.length(), source, mark)};
-  }
-
-  public static Range[] forObject(final @Nonnull Source source) {
-    return forObject(source, NOT_MARKED);
-  }
-
-  public static Range[] forObject(final @Nonnull Source source, final int mark) {
-    return new Range[] {new Range(0, Integer.MAX_VALUE, source, mark)};
-  }
-
-  @Nullable
-  public static Range[] intersection(
-      final @Nonnull Ranged targetRange, @Nonnull final Range[] ranges, final int offset) {
-    final Range last = ranges[ranges.length - 1];
-    final int lastIndex = last.getStart() + last.getLength();
-
-    final RangeBuilder targetRanges = new RangeBuilder(ranges.length);
-    for (final Range range : ranges) {
-      if (range.getStart() >= lastIndex) {
-        break;
-      }
-      final Ranged intersection = targetRange.intersection(range);
-      if (intersection != null) {
-        targetRanges.add(
-            new Range(
-                intersection.getStart() + offset,
-                intersection.getLength(),
-                range.getSource(),
-                range.getMarks()));
-      }
-    }
-    return targetRanges.isEmpty() ? null : targetRanges.toArray();
-  }
-
-  @Nullable
-  public static Range[] intersection(
-      final @Nonnull Ranged targetRange, @Nonnull final Range[] ranges) {
-    return intersection(targetRange, ranges, 0);
-  }
-
-  @Nullable
-  public static Range findUnbound(@Nonnull final Range[] ranges) {
-    if (ranges.length != 1) {
-      return null;
+    public static final Range[] EMPTY = new Range[0];
+
+    private Ranges() {}
+
+    public static Range[] forCharSequence(final @Nonnull CharSequence obj, final @Nonnull Source source) {
+        return forCharSequence(obj, source, NOT_MARKED);
     }
-    final Range range = ranges[0];
-    return range.getStart() == 0 && range.getLength() == Integer.MAX_VALUE ? range : null;
-  }
-
-  public static void copyShift(
-      final @Nonnull Range[] src, final @Nonnull Range[] dst, final int dstPos, final int shift) {
-    copyShift(src, dst, dstPos, shift, src.length);
-  }
-
-  public static void copyShift(
-      final @Nonnull Range[] src,
-      final @Nonnull Range[] dst,
-      final int dstPos,
-      final int shift,
-      final int max) {
-    final int srcLength = Math.min(max, src.length);
-    if (srcLength <= 0) {
-      return;
+
+    public static Range[] forCharSequence(
+            final @Nonnull CharSequence obj, final @Nonnull Source source, final int mark) {
+        return new Range[] {new Range(0, obj.length(), source, mark)};
     }
-    if (shift == 0) {
-      System.arraycopy(src, 0, dst, dstPos, srcLength);
-    } else {
-      for (int iSrc = 0, iDst = dstPos; iSrc < srcLength; iSrc++, iDst++) {
-        dst[iDst] = src[iSrc].shift(shift);
-      }
+
+    public static Range[] forObject(final @Nonnull Source source) {
+        return forObject(source, NOT_MARKED);
     }
-  }
-
-  public static Range[] mergeRanges(
-      final int offset, @Nonnull final Range[] rangesLeft, @Nonnull final Range[] rangesRight) {
-    final long nRanges = rangesLeft.length + (long) rangesRight.length;
-    final Range[] ranges = newArray(nRanges);
-    int remaining = ranges.length;
-    if (rangesLeft.length > 0) {
-      final int count = Math.min(rangesLeft.length, remaining);
-      System.arraycopy(rangesLeft, 0, ranges, 0, count);
-      remaining -= count;
+
+    public static Range[] forObject(final @Nonnull Source source, final int mark) {
+        return new Range[] {new Range(0, Integer.MAX_VALUE, source, mark)};
     }
-    if (rangesRight.length > 0 && remaining > 0) {
-      Ranges.copyShift(rangesRight, ranges, rangesLeft.length, offset, remaining);
+
+    @Nullable
+    public static Range[] intersection(
+            final @Nonnull Ranged targetRange, @Nonnull final Range[] ranges, final int offset) {
+        final Range last = ranges[ranges.length - 1];
+        final int lastIndex = last.getStart() + last.getLength();
+
+        final RangeBuilder targetRanges = new RangeBuilder(ranges.length);
+        for (final Range range : ranges) {
+            if (range.getStart() >= lastIndex) {
+                break;
+            }
+            final Ranged intersection = targetRange.intersection(range);
+            if (intersection != null) {
+                targetRanges.add(new Range(
+                        intersection.getStart() + offset,
+                        intersection.getLength(),
+                        range.getSource(),
+                        range.getMarks()));
+            }
+        }
+        return targetRanges.isEmpty() ? null : targetRanges.toArray();
     }
-    return ranges;
-  }
-
-  @Nullable
-  public static Range[] forSubstring(int offset, int length, final @Nonnull Range[] ranges) {
-    final Ranged substring = Ranged.build(offset, length);
-    return intersection(substring, ranges, -offset);
-  }
-
-  @Nonnull
-  public static Range highestPriorityRange(@Nonnull final Range[] ranges) {
-    /*
-     * This approach is better but not completely correct ideally the highest priority should use the following patterns:
-     * 1) Range coming from the request with no mark related with the vulnerability
-     * 2) Range coming from other origins with no mark related with the vulnerability
-     * 3) Range coming from the request with a mark related with the vulnerability
-     * 4) Range coming from other origins with a mark related with the vulnerability
-     *
-     * To improve performance we decide to simplify the algorithm:
-     * 1) First range with no mark
-     * 2) Fist Range
-     */
-    for (Range range : ranges) {
-      if (range.getMarks() == NOT_MARKED) {
-        return range;
-      }
+
+    @Nullable
+    public static Range[] intersection(final @Nonnull Ranged targetRange, @Nonnull final Range[] ranges) {
+        return intersection(targetRange, ranges, 0);
     }
-    return ranges[0];
-  }
-
-  /**
-   * Checks if all ranges are coming from any header, in case no ranges are provided it will return
-   * {@code true}
-   */
-  public static boolean allRangesFromAnyHeader(@Nonnull final Range[] ranges) {
-    for (Range range : ranges) {
-      final Source source = range.getSource();
-      if (source.getOrigin() != SourceTypes.REQUEST_HEADER_VALUE) {
-        return false;
-      }
+
+    @Nullable
+    public static Range findUnbound(@Nonnull final Range[] ranges) {
+        if (ranges.length != 1) {
+            return null;
+        }
+        final Range range = ranges[0];
+        return range.getStart() == 0 && range.getLength() == Integer.MAX_VALUE ? range : null;
     }
-    return true;
-  }
-
-  /** Checks if a range is coming from the header */
-  public static boolean rangeFromHeader(@Nonnull final String header, @Nonnull final Range range) {
-    final Source source = range.getSource();
-    if (source.getOrigin() != SourceTypes.REQUEST_HEADER_VALUE) {
-      return false;
+
+    public static void copyShift(
+            final @Nonnull Range[] src, final @Nonnull Range[] dst, final int dstPos, final int shift) {
+        copyShift(src, dst, dstPos, shift, src.length);
     }
-    if (!header.equalsIgnoreCase(source.getName())) {
-      return false;
+
+    public static void copyShift(
+            final @Nonnull Range[] src, final @Nonnull Range[] dst, final int dstPos, final int shift, final int max) {
+        final int srcLength = Math.min(max, src.length);
+        if (srcLength <= 0) {
+            return;
+        }
+        if (shift == 0) {
+            System.arraycopy(src, 0, dst, dstPos, srcLength);
+        } else {
+            for (int iSrc = 0, iDst = dstPos; iSrc < srcLength; iSrc++, iDst++) {
+                dst[iDst] = src[iSrc].shift(shift);
+            }
+        }
     }
-    return true;
-  }
-
-  /**
-   * Checks if all ranges are coming from a specify source type, in case no ranges are provided it
-   * will return {@code true}
-   */
-  public static boolean allRangesFromSource(final byte origin, @Nonnull final Range[] ranges) {
-    for (Range range : ranges) {
-      final Source current = range.getSource();
-      if (current.getOrigin() != origin) {
-        return false;
-      }
+
+    public static Range[] mergeRanges(
+            final int offset, @Nonnull final Range[] rangesLeft, @Nonnull final Range[] rangesRight) {
+        final long nRanges = rangesLeft.length + (long) rangesRight.length;
+        final Range[] ranges = newArray(nRanges);
+        int remaining = ranges.length;
+        if (rangesLeft.length > 0) {
+            final int count = Math.min(rangesLeft.length, remaining);
+            System.arraycopy(rangesLeft, 0, ranges, 0, count);
+            remaining -= count;
+        }
+        if (rangesRight.length > 0 && remaining > 0) {
+            Ranges.copyShift(rangesRight, ranges, rangesLeft.length, offset, remaining);
+        }
+        return ranges;
     }
-    return true;
-  }
-
-  /**
-   * Checks if all ranges are coming from the header, in case no ranges are provided it will return
-   * {@code true}
-   */
-  public static boolean allRangesFromHeader(
-      @Nonnull final String header, @Nonnull final Range[] ranges) {
-    for (Range range : ranges) {
-      if (!rangeFromHeader(header, range)) {
-        return false;
-      }
+
+    @Nullable
+    public static Range[] forSubstring(int offset, int length, final @Nonnull Range[] ranges) {
+        final Ranged substring = Ranged.build(offset, length);
+        return intersection(substring, ranges, -offset);
     }
-    return true;
-  }
-
-  /**
-   * @see #allRangesFromHeader(String, Range[])
-   */
-  public static boolean allRangesFromHeader(
-      @Nonnull final HttpHeader header, @Nonnull final Range[] ranges) {
-    return allRangesFromHeader(header.name, ranges);
-  }
-
-  public static Range[] newArray(final long size) {
-    return new Range[size > MAX_RANGE_COUNT ? MAX_RANGE_COUNT : (int) size];
-  }
-
-  /** Merge the new ranges maintaining order (it assumes that both arrays are already sorted) */
-  public static Range[] mergeRangesSorted(final Range[] leftRanges, final Range[] rightRanges) {
-    if (leftRanges.length == 0) {
-      return rightRanges;
+
+    @Nonnull
+    public static Range highestPriorityRange(@Nonnull final Range[] ranges) {
+        /*
+         * This approach is better but not completely correct ideally the highest priority should use the following patterns:
+         * 1) Range coming from the request with no mark related with the vulnerability
+         * 2) Range coming from other origins with no mark related with the vulnerability
+         * 3) Range coming from the request with a mark related with the vulnerability
+         * 4) Range coming from other origins with a mark related with the vulnerability
+         *
+         * To improve performance we decide to simplify the algorithm:
+         * 1) First range with no mark
+         * 2) Fist Range
+         */
+        for (Range range : ranges) {
+            if (range.getMarks() == NOT_MARKED) {
+                return range;
+            }
+        }
+        return ranges[0];
     }
-    if (rightRanges.length == 0) {
-      return leftRanges;
+
+    /**
+     * Checks if all ranges are coming from any header, in case no ranges are provided it will return
+     * {@code true}
+     */
+    public static boolean allRangesFromAnyHeader(@Nonnull final Range[] ranges) {
+        for (Range range : ranges) {
+            final Source source = range.getSource();
+            if (source.getOrigin() != SourceTypes.REQUEST_HEADER_VALUE) {
+                return false;
+            }
+        }
+        return true;
     }
-    int rightIndex = 0;
-    Range rightRange = rightRanges[0];
-    final Range[] result = new Range[rightRanges.length + leftRanges.length];
-    for (int leftIndex = 0; leftIndex < leftRanges.length; leftIndex++) {
-      final Range leftRange = leftRanges[leftIndex];
-      if (rightRange == null) {
-        result[leftIndex + rightRanges.length] = leftRange;
-      } else {
-        if (rightRange.getStart() < leftRange.getStart()) {
-          result[leftIndex + rightIndex] = rightRange;
-          rightIndex++;
-          rightRange = rightIndex >= rightRanges.length ? null : rightRanges[rightIndex];
+
+    /** Checks if a range is coming from the header */
+    public static boolean rangeFromHeader(@Nonnull final String header, @Nonnull final Range range) {
+        final Source source = range.getSource();
+        if (source.getOrigin() != SourceTypes.REQUEST_HEADER_VALUE) {
+            return false;
+        }
+        if (!header.equalsIgnoreCase(source.getName())) {
+            return false;
         }
-        result[leftIndex + rightIndex] = leftRange;
-      }
+        return true;
     }
-    for (; rightIndex < rightRanges.length; rightIndex++) {
-      result[leftRanges.length + rightIndex] = rightRanges[rightIndex];
+
+    /**
+     * Checks if all ranges are coming from a specify source type, in case no ranges are provided it
+     * will return {@code true}
+     */
+    public static boolean allRangesFromSource(final byte origin, @Nonnull final Range[] ranges) {
+        for (Range range : ranges) {
+            final Source current = range.getSource();
+            if (current.getOrigin() != origin) {
+                return false;
+            }
+        }
+        return true;
     }
-    return result;
-  }
 
-  @Nullable
-  public static Range[] getNotMarkedRanges(@Nullable final Range[] ranges, final int mark) {
-    if (ranges == null) {
-      return null;
+    /**
+     * Checks if all ranges are coming from the header, in case no ranges are provided it will return
+     * {@code true}
+     */
+    public static boolean allRangesFromHeader(@Nonnull final String header, @Nonnull final Range[] ranges) {
+        for (Range range : ranges) {
+            if (!rangeFromHeader(header, range)) {
+                return false;
+            }
+        }
+        return true;
     }
-    int markedRangesNumber = 0;
-    for (Range range : ranges) {
-      if (range.isMarked(mark)) {
-        markedRangesNumber++;
-      }
+
+    /**
+     * @see #allRangesFromHeader(String, Range[])
+     */
+    public static boolean allRangesFromHeader(@Nonnull final HttpHeader header, @Nonnull final Range[] ranges) {
+        return allRangesFromHeader(header.name, ranges);
     }
-    if (markedRangesNumber == 0) {
-      return ranges;
+
+    public static Range[] newArray(final long size) {
+        return new Range[size > MAX_RANGE_COUNT ? MAX_RANGE_COUNT : (int) size];
     }
-    if (markedRangesNumber == ranges.length) {
-      return null;
+
+    /** Merge the new ranges maintaining order (it assumes that both arrays are already sorted) */
+    public static Range[] mergeRangesSorted(final Range[] leftRanges, final Range[] rightRanges) {
+        if (leftRanges.length == 0) {
+            return rightRanges;
+        }
+        if (rightRanges.length == 0) {
+            return leftRanges;
+        }
+        int rightIndex = 0;
+        Range rightRange = rightRanges[0];
+        final Range[] result = new Range[rightRanges.length + leftRanges.length];
+        for (int leftIndex = 0; leftIndex < leftRanges.length; leftIndex++) {
+            final Range leftRange = leftRanges[leftIndex];
+            if (rightRange == null) {
+                result[leftIndex + rightRanges.length] = leftRange;
+            } else {
+                if (rightRange.getStart() < leftRange.getStart()) {
+                    result[leftIndex + rightIndex] = rightRange;
+                    rightIndex++;
+                    rightRange = rightIndex >= rightRanges.length ? null : rightRanges[rightIndex];
+                }
+                result[leftIndex + rightIndex] = leftRange;
+            }
+        }
+        for (; rightIndex < rightRanges.length; rightIndex++) {
+            result[leftRanges.length + rightIndex] = rightRanges[rightIndex];
+        }
+        return result;
     }
-    Range[] notMarkedRanges = new Range[ranges.length - markedRangesNumber];
-    int notMarkedRangesIndex = 0;
-    for (Range range : ranges) {
-      if (!range.isMarked(mark)) {
-        notMarkedRanges[notMarkedRangesIndex] = range;
-        notMarkedRangesIndex++;
-      }
+
+    @Nullable
+    public static Range[] getNotMarkedRanges(@Nullable final Range[] ranges, final int mark) {
+        if (ranges == null) {
+            return null;
+        }
+        int markedRangesNumber = 0;
+        for (Range range : ranges) {
+            if (range.isMarked(mark)) {
+                markedRangesNumber++;
+            }
+        }
+        if (markedRangesNumber == 0) {
+            return ranges;
+        }
+        if (markedRangesNumber == ranges.length) {
+            return null;
+        }
+        Range[] notMarkedRanges = new Range[ranges.length - markedRangesNumber];
+        int notMarkedRangesIndex = 0;
+        for (Range range : ranges) {
+            if (!range.isMarked(mark)) {
+                notMarkedRanges[notMarkedRangesIndex] = range;
+                notMarkedRangesIndex++;
+            }
+        }
+        return notMarkedRanges;
     }
-    return notMarkedRanges;
-  }
-
-  public static Range copyWithPosition(final Range range, final int offset, final int length) {
-    return new Range(offset, length, range.getSource(), range.getMarks());
-  }
-
-  /** Returns a new array of ranges with the indentation applied to each line */
-  public static Range[] forIndentation(
-      String input, int indentation, final @Nonnull Range[] ranges) {
-    final Range[] newRanges = new Range[ranges.length];
-    int delimitersCount = 0;
-    int offset = 0;
-    int rangeStart = 0;
-    int currentIndex = 0;
-    int totalWhiteSpaces = 0;
-    while (rangeStart < ranges.length || currentIndex < input.length() - 1) {
-      final int[] delimiterIndex = getNextDelimiterIndex(input, currentIndex, currentIndex + 1);
-      final int lineOffset = delimiterIndex[1] == 2 ? 1 : 0;
-      int currentIndentation;
-      // In case indentation is negative we need to check if it will take more than the first
-      // non-white space character
-      if (indentation < 0) {
-        final int whiteSpaces =
-            StringUtils.leadingWhitespaces(input, currentIndex, delimiterIndex[0]);
-        currentIndentation = Math.max(indentation, -whiteSpaces) - totalWhiteSpaces;
-        totalWhiteSpaces += whiteSpaces;
-      } else {
-        currentIndentation = indentation * ++delimitersCount;
-      }
-      currentIndentation -= offset;
-      rangeStart =
-          updateRangesWithIndentation(
-              currentIndex,
-              delimiterIndex[0] - 1,
-              indentation,
-              rangeStart,
-              ranges,
-              newRanges,
-              currentIndentation,
-              lineOffset);
-      offset += lineOffset;
-      currentIndex = delimiterIndex[0];
+
+    public static Range copyWithPosition(final Range range, final int offset, final int length) {
+        return new Range(offset, length, range.getSource(), range.getMarks());
     }
 
-    return newRanges;
-  }
-
-  /**
-   * Returns two numbers in an array:
-   *
-   * <p>1. The index of the next delimiter (his last character)
-   *
-   * <p>2. The length of the delimiter ({@code 1} or {@code 2})
-   *
-   * <p>In case there is no delimiter, it will return the last index of the string and {@code 1}
-   *
-   * @param original is the original string
-   * @param start is the start index of the substring
-   * @param offset is to take into account the previous lines
-   */
-  private static int[] getNextDelimiterIndex(
-      @Nonnull final String original, final int start, final int offset) {
-    for (int i = start; i < original.length(); i++) {
-      final char c = original.charAt(i);
-      if (c == '\n') {
-        return new int[] {i + offset, 1};
-      } else if (c == '\r') {
-        if (i + 1 < original.length() && original.charAt(i + 1) == '\n') {
-          return new int[] {i + 1 + offset, 2};
+    /** Returns a new array of ranges with the indentation applied to each line */
+    public static Range[] forIndentation(String input, int indentation, final @Nonnull Range[] ranges) {
+        final Range[] newRanges = new Range[ranges.length];
+        int delimitersCount = 0;
+        int offset = 0;
+        int rangeStart = 0;
+        int currentIndex = 0;
+        int totalWhiteSpaces = 0;
+        while (rangeStart < ranges.length || currentIndex < input.length() - 1) {
+            final int[] delimiterIndex = getNextDelimiterIndex(input, currentIndex, currentIndex + 1);
+            final int lineOffset = delimiterIndex[1] == 2 ? 1 : 0;
+            int currentIndentation;
+            // In case indentation is negative we need to check if it will take more than the first
+            // non-white space character
+            if (indentation < 0) {
+                final int whiteSpaces = StringUtils.leadingWhitespaces(input, currentIndex, delimiterIndex[0]);
+                currentIndentation = Math.max(indentation, -whiteSpaces) - totalWhiteSpaces;
+                totalWhiteSpaces += whiteSpaces;
+            } else {
+                currentIndentation = indentation * ++delimitersCount;
+            }
+            currentIndentation -= offset;
+            rangeStart = updateRangesWithIndentation(
+                    currentIndex,
+                    delimiterIndex[0] - 1,
+                    indentation,
+                    rangeStart,
+                    ranges,
+                    newRanges,
+                    currentIndentation,
+                    lineOffset);
+            offset += lineOffset;
+            currentIndex = delimiterIndex[0];
         }
-        return new int[] {i + offset, 1};
-      }
+
+        return newRanges;
     }
 
-    return new int[] {original.length() - 1 + offset - start, 1};
-  }
-
-  /**
-   * Updates the {@code newRanges} array between the {@code start} index and the {@code end} index
-   * and taking into account the {@code indentation}
-   *
-   * <p>The {@code rangeStart} is the index of the first range that will be checked
-   *
-   * <p>The {@code ranges} is the current ranges array
-   *
-   * <p>The {@code offset} is to take into account the normalization of the indent method
-   *
-   * <p>The {@code lineOffset} is to know if the line is being normalized
-   *
-   * @return the index of the first range that will be checked
-   */
-  private static int updateRangesWithIndentation(
-      int start,
-      int end,
-      int indentation,
-      int rangeStart,
-      final @Nonnull Range[] ranges,
-      final @Nonnull Range[] newRanges,
-      int offset,
-      int lineOffset) {
-    int i = rangeStart;
-    while (i < ranges.length && ranges[i].getStart() <= end) {
-      Range range = ranges[i];
-      if (range.getStart() >= start) {
-        final int newStart = range.getStart() + offset;
-        int newLength = range.getLength();
-        if (range.getStart() + range.getLength() > end) {
-          newLength -= lineOffset;
+    /**
+     * Returns two numbers in an array:
+     *
+     * <p>1. The index of the next delimiter (his last character)
+     *
+     * <p>2. The length of the delimiter ({@code 1} or {@code 2})
+     *
+     * <p>In case there is no delimiter, it will return the last index of the string and {@code 1}
+     *
+     * @param original is the original string
+     * @param start is the start index of the substring
+     * @param offset is to take into account the previous lines
+     */
+    private static int[] getNextDelimiterIndex(@Nonnull final String original, final int start, final int offset) {
+        for (int i = start; i < original.length(); i++) {
+            final char c = original.charAt(i);
+            if (c == '\n') {
+                return new int[] {i + offset, 1};
+            } else if (c == '\r') {
+                if (i + 1 < original.length() && original.charAt(i + 1) == '\n') {
+                    return new int[] {i + 1 + offset, 2};
+                }
+                return new int[] {i + offset, 1};
+            }
         }
-        newRanges[i] = copyWithPosition(range, newStart, newLength);
-      } else if (range.getStart() + range.getLength() >= start) {
-        final Range newRange = newRanges[i];
-        final int newLength = newRange.getLength() + indentation;
-        newRanges[i] = copyWithPosition(newRange, newRange.getStart(), newLength);
-      }
-
-      if (range.getStart() + range.getLength() - 1 <= end) {
-        rangeStart++;
-      }
-
-      i++;
+
+        return new int[] {original.length() - 1 + offset - start, 1};
     }
 
-    return rangeStart;
-  }
-
-  /**
-   * Split the range in two taking into account the new length of the characters.
-   *
-   * <p>In case start and end are out of the range, it will return the range without splitting but
-   * taking into account the offset. In the case that the new length is less than or equal to 0, it
-   * will return an empty array.
-   *
-   * @param start is the start of the character sequence
-   * @param end is the end of the character sequence
-   * @param newLength is the new length of the character sequence
-   * @param range is the range to split
-   * @param offset is the offset to apply to the range
-   * @param diffLength is the difference between the new length and the old length
-   */
-  public static Range[] splitRanges(
-      int start, int end, int newLength, Range range, int offset, int diffLength) {
-    start += offset;
-    end += offset;
-    int rangeStart = range.getStart() + offset;
-    int rangeEnd = rangeStart + range.getLength() + diffLength;
-
-    int firstLength = start - rangeStart;
-    int secondLength = range.getLength() - firstLength - newLength + diffLength;
-    if (rangeStart > end || rangeEnd <= start) {
-      if (firstLength <= 0) {
-        return Ranges.EMPTY;
-      }
-      return new Range[] {copyWithPosition(range, rangeStart, firstLength)};
+    /**
+     * Updates the {@code newRanges} array between the {@code start} index and the {@code end} index
+     * and taking into account the {@code indentation}
+     *
+     * <p>The {@code rangeStart} is the index of the first range that will be checked
+     *
+     * <p>The {@code ranges} is the current ranges array
+     *
+     * <p>The {@code offset} is to take into account the normalization of the indent method
+     *
+     * <p>The {@code lineOffset} is to know if the line is being normalized
+     *
+     * @return the index of the first range that will be checked
+     */
+    private static int updateRangesWithIndentation(
+            int start,
+            int end,
+            int indentation,
+            int rangeStart,
+            final @Nonnull Range[] ranges,
+            final @Nonnull Range[] newRanges,
+            int offset,
+            int lineOffset) {
+        int i = rangeStart;
+        while (i < ranges.length && ranges[i].getStart() <= end) {
+            Range range = ranges[i];
+            if (range.getStart() >= start) {
+                final int newStart = range.getStart() + offset;
+                int newLength = range.getLength();
+                if (range.getStart() + range.getLength() > end) {
+                    newLength -= lineOffset;
+                }
+                newRanges[i] = copyWithPosition(range, newStart, newLength);
+            } else if (range.getStart() + range.getLength() >= start) {
+                final Range newRange = newRanges[i];
+                final int newLength = newRange.getLength() + indentation;
+                newRanges[i] = copyWithPosition(newRange, newRange.getStart(), newLength);
+            }
+
+            if (range.getStart() + range.getLength() - 1 <= end) {
+                rangeStart++;
+            }
+
+            i++;
+        }
+
+        return rangeStart;
     }
 
-    Range[] splittedRanges = new Range[2];
-    splittedRanges[0] = copyWithPosition(range, rangeStart, firstLength);
-    splittedRanges[1] = copyWithPosition(range, rangeEnd - secondLength, secondLength);
-
-    return splittedRanges;
-  }
-
-  /**
-   * Remove the ranges that have the same origin as the input source.
-   *
-   * @param ranges the ranges to filter
-   * @param source the byte value of the source to exclude (see {@link SourceTypes})
-   */
-  public static Range[] excludeRangesBySource(Range[] ranges, BitSet source) {
-    RangeBuilder newRanges = new RangeBuilder(ranges.length);
-
-    for (Range range : ranges) {
-      if (range.getSource().getOrigin() == SourceTypes.NONE
-          || !source.get(range.getSource().getOrigin())) {
-        newRanges.add(range);
-      }
+    /**
+     * Split the range in two taking into account the new length of the characters.
+     *
+     * <p>In case start and end are out of the range, it will return the range without splitting but
+     * taking into account the offset. In the case that the new length is less than or equal to 0, it
+     * will return an empty array.
+     *
+     * @param start is the start of the character sequence
+     * @param end is the end of the character sequence
+     * @param newLength is the new length of the character sequence
+     * @param range is the range to split
+     * @param offset is the offset to apply to the range
+     * @param diffLength is the difference between the new length and the old length
+     */
+    public static Range[] splitRanges(int start, int end, int newLength, Range range, int offset, int diffLength) {
+        start += offset;
+        end += offset;
+        int rangeStart = range.getStart() + offset;
+        int rangeEnd = rangeStart + range.getLength() + diffLength;
+
+        int firstLength = start - rangeStart;
+        int secondLength = range.getLength() - firstLength - newLength + diffLength;
+        if (rangeStart > end || rangeEnd <= start) {
+            if (firstLength <= 0) {
+                return Ranges.EMPTY;
+            }
+            return new Range[] {copyWithPosition(range, rangeStart, firstLength)};
+        }
+
+        Range[] splittedRanges = new Range[2];
+        splittedRanges[0] = copyWithPosition(range, rangeStart, firstLength);
+        splittedRanges[1] = copyWithPosition(range, rangeEnd - secondLength, secondLength);
+
+        return splittedRanges;
     }
 
-    return newRanges.toArray();
-  }
+    /**
+     * Remove the ranges that have the same origin as the input source.
+     *
+     * @param ranges the ranges to filter
+     * @param source the byte value of the source to exclude (see {@link SourceTypes})
+     */
+    public static Range[] excludeRangesBySource(Range[] ranges, BitSet source) {
+        RangeBuilder newRanges = new RangeBuilder(ranges.length);
+
+        for (Range range : ranges) {
+            if (range.getSource().getOrigin() == SourceTypes.NONE
+                    || !source.get(range.getSource().getOrigin())) {
+                newRanges.add(range);
+            }
+        }
+
+        return newRanges.toArray();
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedMap.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedMap.java
index 63f77c7ca28..6e81d1776c6 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedMap.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedMap.java
@@ -46,435 +46,434 @@
  */
 public interface TaintedMap extends Iterable<TaintedObject> {
 
-  /** Default capacity. It MUST be a power of 2. */
-  int DEFAULT_CAPACITY = 1 << 14;
+    /** Default capacity. It MUST be a power of 2. */
+    int DEFAULT_CAPACITY = 1 << 14;
 
-  /** Bitmask to convert hashes to positive integers. */
-  int POSITIVE_MASK = Integer.MAX_VALUE;
+    /** Bitmask to convert hashes to positive integers. */
+    int POSITIVE_MASK = Integer.MAX_VALUE;
 
-  /** Max allowed size for the linked list inside a bucket */
-  int DEFAULT_MAX_BUCKET_SIZE = 10;
+    /** Max allowed size for the linked list inside a bucket */
+    int DEFAULT_MAX_BUCKET_SIZE = 10;
 
-  /** Max age of entries contained in the map (worst case will be {@code 2 * maxAge}) */
-  int DEFAULT_MAX_AGE = 5;
+    /** Max age of entries contained in the map (worst case will be {@code 2 * maxAge}) */
+    int DEFAULT_MAX_AGE = 5;
 
-  TimeUnit DEFAULT_MAX_AGE_UNIT = TimeUnit.MINUTES;
+    TimeUnit DEFAULT_MAX_AGE_UNIT = TimeUnit.MINUTES;
 
-  /**
-   * Builds an instance suitable to be used while in short-lived contexts (e.g. a request), in that
-   * cases no purge will happen as they will be cleared on the end of the context.
-   */
-  static TaintedMap build(final int capacity) {
-    final TaintedMapImpl map =
-        new TaintedMapImpl(capacity, DEFAULT_MAX_BUCKET_SIZE, -1, null, null);
-    return IastSystem.DEBUG ? new Debug(map) : map;
-  }
-
-  /**
-   * Builds an instance suitable to be used in long lived-context (e.g a global instance), in that
-   * case there is a purge logic that will clear stale entries according to the scheduled interval.
-   */
-  static TaintedMap buildWithPurge(final int capacity, int maxAge, TimeUnit maxAgeUnit) {
-    final TaintedMapImpl map =
-        new TaintedMapImpl(
-            capacity, DEFAULT_MAX_BUCKET_SIZE, maxAge, maxAgeUnit, AgentTaskScheduler.get());
-    return IastSystem.DEBUG ? new Debug(map) : map;
-  }
-
-  @Nullable
-  TaintedObject get(@Nonnull Object key);
+    /**
+     * Builds an instance suitable to be used while in short-lived contexts (e.g. a request), in that
+     * cases no purge will happen as they will be cleared on the end of the context.
+     */
+    static TaintedMap build(final int capacity) {
+        final TaintedMapImpl map = new TaintedMapImpl(capacity, DEFAULT_MAX_BUCKET_SIZE, -1, null, null);
+        return IastSystem.DEBUG ? new Debug(map) : map;
+    }
 
-  void put(final @Nonnull TaintedObject entry);
+    /**
+     * Builds an instance suitable to be used in long lived-context (e.g a global instance), in that
+     * case there is a purge logic that will clear stale entries according to the scheduled interval.
+     */
+    static TaintedMap buildWithPurge(final int capacity, int maxAge, TimeUnit maxAgeUnit) {
+        final TaintedMapImpl map =
+                new TaintedMapImpl(capacity, DEFAULT_MAX_BUCKET_SIZE, maxAge, maxAgeUnit, AgentTaskScheduler.get());
+        return IastSystem.DEBUG ? new Debug(map) : map;
+    }
 
-  int count();
+    @Nullable
+    TaintedObject get(@Nonnull Object key);
 
-  void clear();
+    void put(final @Nonnull TaintedObject entry);
 
-  class TaintedMapImpl implements TaintedMap, Runnable {
+    int count();
 
-    protected final TaintedObject[] table;
+    void clear();
 
-    /** Bitmask for fast modulo with table length. */
-    protected final int lengthMask;
+    class TaintedMapImpl implements TaintedMap, Runnable {
 
-    /** Max size of each bucket. */
-    protected final int maxBucketSize;
+        protected final TaintedObject[] table;
 
-    /**
-     * Flag for the current alive tainted objects (red/black style marking for max age calculation).
-     */
-    @SuppressFBWarnings(
-        value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
-        justification =
-            "The design explicitly tolerates losses in high-concurrency scenarios. The delayed visibility of the generation flag can cause some entries to be purged a bit earlier or later than ideal, but this is still within the acceptable boundaries of the design.")
-    protected boolean generation;
-
-    /** Whether to collect the {@link IastMetric#TAINTED_FLAT_MODE} metric or not */
-    protected boolean collectFlatBucketMetric;
-
-    /** Default constructor. Uses {@link #DEFAULT_CAPACITY}. */
-    TaintedMapImpl() {
-      this(DEFAULT_CAPACITY);
-    }
+        /** Bitmask for fast modulo with table length. */
+        protected final int lengthMask;
 
-    /**
-     * Creates a new hash map with the given capacity, a max bucket size of {@link
-     * #DEFAULT_MAX_BUCKET_SIZE} and a max age of {@link #DEFAULT_MAX_AGE} with {@link
-     * #DEFAULT_MAX_AGE_UNIT} units
-     */
-    TaintedMapImpl(int capacity) {
-      this(capacity, DEFAULT_MAX_BUCKET_SIZE, DEFAULT_MAX_AGE, DEFAULT_MAX_AGE_UNIT);
-    }
+        /** Max size of each bucket. */
+        protected final int maxBucketSize;
 
-    /**
-     * Create a new hash map with the given capacity and purge schedule.
-     *
-     * @param capacity Capacity of the internal array. It must be a power of 2.
-     * @param maxBucketSize Max size for each bucket
-     * @param maxAge max time an entry can stay in the map (can take up to {@code 2 * maxAge} in the
-     *     worst case)
-     * @param maxAgeUnit unit for the max age
-     */
-    TaintedMapImpl(
-        final int capacity, final int maxBucketSize, final int maxAge, final TimeUnit maxAgeUnit) {
-      this(capacity, maxBucketSize, maxAge, maxAgeUnit, AgentTaskScheduler.get());
-    }
+        /**
+         * Flag for the current alive tainted objects (red/black style marking for max age calculation).
+         */
+        @SuppressFBWarnings(
+                value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
+                justification =
+                        "The design explicitly tolerates losses in high-concurrency scenarios. The delayed visibility of the generation flag can cause some entries to be purged a bit earlier or later than ideal, but this is still within the acceptable boundaries of the design.")
+        protected boolean generation;
 
-    TaintedMapImpl(
-        final int capacity,
-        final int maxBucketSize,
-        final int maxAge,
-        @Nullable final TimeUnit maxAgeUnit,
-        @Nullable final AgentTaskScheduler scheduler) {
-      table = new TaintedObject[capacity];
-      lengthMask = table.length - 1;
-      generation = true;
-      this.maxBucketSize = maxBucketSize;
-      final Verbosity verbosity = Config.get().getIastTelemetryVerbosity();
-      collectFlatBucketMetric = IastMetric.TAINTED_FLAT_MODE.isEnabled(verbosity);
-      generation = true;
-      if (scheduler != null) {
-        scheduler.weakScheduleAtFixedRate(this, maxAge, maxAge, maxAgeUnit);
-      }
-    }
+        /** Whether to collect the {@link IastMetric#TAINTED_FLAT_MODE} metric or not */
+        protected boolean collectFlatBucketMetric;
 
-    /**
-     * Returns the {@link TaintedObject} for the given input object.
-     *
-     * @param key Key object.
-     * @return The {@link TaintedObject} if it exists, {@code null} otherwise.
-     */
-    @Nullable
-    @Override
-    public TaintedObject get(final @Nonnull Object key) {
-      final int index = indexObject(key);
-      TaintedObject entry = head(index);
-      while (entry != null) {
-        if (key == entry.get()) {
-          return entry;
+        /** Default constructor. Uses {@link #DEFAULT_CAPACITY}. */
+        TaintedMapImpl() {
+            this(DEFAULT_CAPACITY);
         }
-        entry = next(entry);
-      }
-      return null;
-    }
 
-    /**
-     * Put a new {@link TaintedObject} in the hash table, always to the tail of the chain. It will
-     * not insert the element if it is already present in the map. This method will lose puts in
-     * concurrent scenarios.
-     *
-     * @param entry Tainted object.
-     */
-    @Override
-    public void put(final @Nonnull TaintedObject entry) {
-      final int index = index(entry.positiveHashCode);
-      TaintedObject cur = head(index);
-      if (cur == null) {
-        table[index] = entry;
-        entry.generation = generation;
-      } else {
-        int bucketSize = 1;
-        while (true) {
-          if (cur.positiveHashCode == entry.positiveHashCode && cur.get() == entry.get()) {
-            // Duplicate, exit early.
-            return;
-          }
-          final TaintedObject next = next(cur);
-          if (next == null) {
-            break;
-          }
-          bucketSize++;
-          cur = next;
+        /**
+         * Creates a new hash map with the given capacity, a max bucket size of {@link
+         * #DEFAULT_MAX_BUCKET_SIZE} and a max age of {@link #DEFAULT_MAX_AGE} with {@link
+         * #DEFAULT_MAX_AGE_UNIT} units
+         */
+        TaintedMapImpl(int capacity) {
+            this(capacity, DEFAULT_MAX_BUCKET_SIZE, DEFAULT_MAX_AGE, DEFAULT_MAX_AGE_UNIT);
         }
-        if (bucketSize >= maxBucketSize) {
-          table[index] = entry;
-          if (collectFlatBucketMetric) {
-            IastMetricCollector.add(IastMetric.TAINTED_FLAT_MODE, 1);
-          }
-        } else {
-          cur.next = entry;
+
+        /**
+         * Create a new hash map with the given capacity and purge schedule.
+         *
+         * @param capacity Capacity of the internal array. It must be a power of 2.
+         * @param maxBucketSize Max size for each bucket
+         * @param maxAge max time an entry can stay in the map (can take up to {@code 2 * maxAge} in the
+         *     worst case)
+         * @param maxAgeUnit unit for the max age
+         */
+        TaintedMapImpl(final int capacity, final int maxBucketSize, final int maxAge, final TimeUnit maxAgeUnit) {
+            this(capacity, maxBucketSize, maxAge, maxAgeUnit, AgentTaskScheduler.get());
         }
-        entry.generation = generation;
-      }
-    }
 
-    @Override
-    public void clear() {
-      Arrays.fill(table, null);
-    }
+        TaintedMapImpl(
+                final int capacity,
+                final int maxBucketSize,
+                final int maxAge,
+                @Nullable final TimeUnit maxAgeUnit,
+                @Nullable final AgentTaskScheduler scheduler) {
+            table = new TaintedObject[capacity];
+            lengthMask = table.length - 1;
+            generation = true;
+            this.maxBucketSize = maxBucketSize;
+            final Verbosity verbosity = Config.get().getIastTelemetryVerbosity();
+            collectFlatBucketMetric = IastMetric.TAINTED_FLAT_MODE.isEnabled(verbosity);
+            generation = true;
+            if (scheduler != null) {
+                scheduler.weakScheduleAtFixedRate(this, maxAge, maxAge, maxAgeUnit);
+            }
+        }
 
-    @Nonnull
-    @Override
-    public Iterator<TaintedObject> iterator() {
-      return iterator(0, table.length);
-    }
+        /**
+         * Returns the {@link TaintedObject} for the given input object.
+         *
+         * @param key Key object.
+         * @return The {@link TaintedObject} if it exists, {@code null} otherwise.
+         */
+        @Nullable
+        @Override
+        public TaintedObject get(final @Nonnull Object key) {
+            final int index = indexObject(key);
+            TaintedObject entry = head(index);
+            while (entry != null) {
+                if (key == entry.get()) {
+                    return entry;
+                }
+                entry = next(entry);
+            }
+            return null;
+        }
 
-    @Override
-    public int count() {
-      int size = 0;
-      for (int i = 0; i < table.length; i++) {
-        TaintedObject entry = table[i];
-        while (entry != null) {
-          entry = entry.next;
-          size++;
+        /**
+         * Put a new {@link TaintedObject} in the hash table, always to the tail of the chain. It will
+         * not insert the element if it is already present in the map. This method will lose puts in
+         * concurrent scenarios.
+         *
+         * @param entry Tainted object.
+         */
+        @Override
+        public void put(final @Nonnull TaintedObject entry) {
+            final int index = index(entry.positiveHashCode);
+            TaintedObject cur = head(index);
+            if (cur == null) {
+                table[index] = entry;
+                entry.generation = generation;
+            } else {
+                int bucketSize = 1;
+                while (true) {
+                    if (cur.positiveHashCode == entry.positiveHashCode && cur.get() == entry.get()) {
+                        // Duplicate, exit early.
+                        return;
+                    }
+                    final TaintedObject next = next(cur);
+                    if (next == null) {
+                        break;
+                    }
+                    bucketSize++;
+                    cur = next;
+                }
+                if (bucketSize >= maxBucketSize) {
+                    table[index] = entry;
+                    if (collectFlatBucketMetric) {
+                        IastMetricCollector.add(IastMetric.TAINTED_FLAT_MODE, 1);
+                    }
+                } else {
+                    cur.next = entry;
+                }
+                entry.generation = generation;
+            }
         }
-      }
-      return size;
-    }
 
-    private Iterator<TaintedObject> iterator(final int start, final int stop) {
-      return new Iterator<TaintedObject>() {
-        int currentIndex = start;
-        @Nullable TaintedObject currentSubPos;
+        @Override
+        public void clear() {
+            Arrays.fill(table, null);
+        }
 
+        @Nonnull
         @Override
-        public boolean hasNext() {
-          if (currentSubPos != null) {
-            return true;
-          }
-          for (; currentIndex < stop; currentIndex++) {
-            if (table[currentIndex] != null) {
-              return true;
-            }
-          }
-          return false;
+        public Iterator<TaintedObject> iterator() {
+            return iterator(0, table.length);
         }
 
         @Override
-        public TaintedObject next() {
-          if (currentSubPos != null) {
-            TaintedObject toReturn = currentSubPos;
-            currentSubPos = toReturn.next;
-            return toReturn;
-          }
-          for (; currentIndex < stop; currentIndex++) {
-            final TaintedObject entry = table[currentIndex];
-            if (entry != null) {
-              currentSubPos = entry.next;
-              currentIndex++;
-              return entry;
+        public int count() {
+            int size = 0;
+            for (int i = 0; i < table.length; i++) {
+                TaintedObject entry = table[i];
+                while (entry != null) {
+                    entry = entry.next;
+                    size++;
+                }
             }
-          }
-          throw new NoSuchElementException();
+            return size;
         }
-      };
-    }
 
-    protected int indexObject(final Object obj) {
-      return index(positiveHashCode(System.identityHashCode(obj)));
-    }
+        private Iterator<TaintedObject> iterator(final int start, final int stop) {
+            return new Iterator<TaintedObject>() {
+                int currentIndex = start;
+
+                @Nullable
+                TaintedObject currentSubPos;
+
+                @Override
+                public boolean hasNext() {
+                    if (currentSubPos != null) {
+                        return true;
+                    }
+                    for (; currentIndex < stop; currentIndex++) {
+                        if (table[currentIndex] != null) {
+                            return true;
+                        }
+                    }
+                    return false;
+                }
+
+                @Override
+                public TaintedObject next() {
+                    if (currentSubPos != null) {
+                        TaintedObject toReturn = currentSubPos;
+                        currentSubPos = toReturn.next;
+                        return toReturn;
+                    }
+                    for (; currentIndex < stop; currentIndex++) {
+                        final TaintedObject entry = table[currentIndex];
+                        if (entry != null) {
+                            currentSubPos = entry.next;
+                            currentIndex++;
+                            return entry;
+                        }
+                    }
+                    throw new NoSuchElementException();
+                }
+            };
+        }
 
-    protected int positiveHashCode(final int h) {
-      return h & POSITIVE_MASK;
-    }
+        protected int indexObject(final Object obj) {
+            return index(positiveHashCode(System.identityHashCode(obj)));
+        }
 
-    protected int index(int h) {
-      return h & lengthMask;
-    }
+        protected int positiveHashCode(final int h) {
+            return h & POSITIVE_MASK;
+        }
 
-    @Nullable
-    protected TaintedObject head(final int index) {
-      final TaintedObject head = findAlive(table[index]);
-      table[index] = head;
-      return head;
-    }
+        protected int index(int h) {
+            return h & lengthMask;
+        }
 
-    @Nullable
-    protected TaintedObject next(@Nonnull final TaintedObject item) {
-      final TaintedObject next = findAlive(item.next);
-      item.next = next;
-      return next;
-    }
+        @Nullable
+        protected TaintedObject head(final int index) {
+            final TaintedObject head = findAlive(table[index]);
+            table[index] = head;
+            return head;
+        }
 
-    /** Gets the first reachable reference that has not been GC'ed */
-    @Nullable
-    protected TaintedObject findAlive(@Nullable TaintedObject item) {
-      while (item != null && item.get() == null) {
-        item = item.next;
-      }
-      return item;
-    }
+        @Nullable
+        protected TaintedObject next(@Nonnull final TaintedObject item) {
+            final TaintedObject next = findAlive(item.next);
+            item.next = next;
+            return next;
+        }
 
-    /** Runnable used to purge stale entries after max age */
-    @Override
-    public void run() {
-      for (int bucket = 0; bucket < table.length; bucket++) {
-        for (TaintedObject cur = head(bucket), prev = null; cur != null; cur = next(cur)) {
-          if (cur.generation != generation) { // entry added to the map in previous generation
-            if (prev == null) {
-              table[bucket] = cur.next;
-            } else {
-              prev.next = cur.next;
-              prev = cur;
+        /** Gets the first reachable reference that has not been GC'ed */
+        @Nullable
+        protected TaintedObject findAlive(@Nullable TaintedObject item) {
+            while (item != null && item.get() == null) {
+                item = item.next;
             }
-          } else {
-            prev = cur;
-          }
+            return item;
+        }
+
+        /** Runnable used to purge stale entries after max age */
+        @Override
+        public void run() {
+            for (int bucket = 0; bucket < table.length; bucket++) {
+                for (TaintedObject cur = head(bucket), prev = null; cur != null; cur = next(cur)) {
+                    if (cur.generation != generation) { // entry added to the map in previous generation
+                        if (prev == null) {
+                            table[bucket] = cur.next;
+                        } else {
+                            prev.next = cur.next;
+                            prev = cur;
+                        }
+                    } else {
+                        prev = cur;
+                    }
+                }
+            }
+            generation = !generation;
         }
-      }
-      generation = !generation;
     }
-  }
 
-  class Debug implements TaintedMap, Wrapper<TaintedMapImpl> {
+    class Debug implements TaintedMap, Wrapper<TaintedMapImpl> {
 
-    static final Logger LOGGER = LoggerFactory.getLogger(TaintedMap.class);
+        static final Logger LOGGER = LoggerFactory.getLogger(TaintedMap.class);
 
-    /** Interval to compute statistics in debug mode * */
-    static final int COMPUTE_STATISTICS_INTERVAL = 1 << 17;
+        /** Interval to compute statistics in debug mode * */
+        static final int COMPUTE_STATISTICS_INTERVAL = 1 << 17;
 
-    private final TaintedMapImpl delegate;
+        private final TaintedMapImpl delegate;
 
-    private final AtomicLong puts = new AtomicLong(0);
+        private final AtomicLong puts = new AtomicLong(0);
 
-    public Debug(final TaintedMapImpl delegate) {
-      this.delegate = delegate;
-    }
+        public Debug(final TaintedMapImpl delegate) {
+            this.delegate = delegate;
+        }
 
-    @Override
-    public void put(@Nonnull final TaintedObject entry) {
-      delegate.put(entry);
-      final long putOps = puts.updateAndGet(current -> current == Long.MAX_VALUE ? 0 : current + 1);
-      if (putOps % COMPUTE_STATISTICS_INTERVAL == 0 && LOGGER.isDebugEnabled()) {
-        AgentTaskScheduler.get().execute(this::computeStatistics);
-      }
-    }
+        @Override
+        public void put(@Nonnull final TaintedObject entry) {
+            delegate.put(entry);
+            final long putOps = puts.updateAndGet(current -> current == Long.MAX_VALUE ? 0 : current + 1);
+            if (putOps % COMPUTE_STATISTICS_INTERVAL == 0 && LOGGER.isDebugEnabled()) {
+                AgentTaskScheduler.get().execute(this::computeStatistics);
+            }
+        }
 
-    @Nullable
-    @Override
-    public TaintedObject get(@Nonnull final Object key) {
-      return delegate.get(key);
-    }
+        @Nullable
+        @Override
+        public TaintedObject get(@Nonnull final Object key) {
+            return delegate.get(key);
+        }
 
-    @Override
-    public int count() {
-      return delegate.count();
-    }
+        @Override
+        public int count() {
+            return delegate.count();
+        }
 
-    @Override
-    public void clear() {
-      delegate.clear();
-    }
+        @Override
+        public void clear() {
+            delegate.clear();
+        }
 
-    @Nonnull
-    @Override
-    public Iterator<TaintedObject> iterator() {
-      return delegate.iterator();
-    }
+        @Nonnull
+        @Override
+        public Iterator<TaintedObject> iterator() {
+            return delegate.iterator();
+        }
 
-    @Override
-    public TaintedMapImpl unwrap() {
-      return delegate;
-    }
+        @Override
+        public TaintedMapImpl unwrap() {
+            return delegate;
+        }
 
-    protected void computeStatistics() {
-      final TaintedObject[] table = delegate.table;
-      final int[] chains = new int[table.length];
-      long stale = 0;
-      long count = 0;
-      for (int bucket = 0; bucket < table.length; bucket++) {
-        TaintedObject cur = table[bucket];
-        int chainLength = 0;
-        while (cur != null) {
-          count++;
-          chainLength++;
-          if (cur.get() == null) {
-            stale++;
-          }
-          cur = cur.next;
+        protected void computeStatistics() {
+            final TaintedObject[] table = delegate.table;
+            final int[] chains = new int[table.length];
+            long stale = 0;
+            long count = 0;
+            for (int bucket = 0; bucket < table.length; bucket++) {
+                TaintedObject cur = table[bucket];
+                int chainLength = 0;
+                while (cur != null) {
+                    count++;
+                    chainLength++;
+                    if (cur.get() == null) {
+                        stale++;
+                    }
+                    cur = cur.next;
+                }
+                chains[bucket] = chainLength;
+            }
+            Arrays.sort(chains);
+            LOGGER.debug(
+                    "Map [size:{}, count:{}, stale:{}], Chains [{}, {}, {}, {}, {}, {}]",
+                    delegate.table.length,
+                    count,
+                    percentage(stale, count),
+                    average(chains),
+                    percentile(chains, 50),
+                    percentile(chains, 75),
+                    percentile(chains, 90),
+                    percentile(chains, 99),
+                    percentile(chains, 100));
         }
-        chains[bucket] = chainLength;
-      }
-      Arrays.sort(chains);
-      LOGGER.debug(
-          "Map [size:{}, count:{}, stale:{}], Chains [{}, {}, {}, {}, {}, {}]",
-          delegate.table.length,
-          count,
-          percentage(stale, count),
-          average(chains),
-          percentile(chains, 50),
-          percentile(chains, 75),
-          percentile(chains, 90),
-          percentile(chains, 99),
-          percentile(chains, 100));
-    }
 
-    private static String percentage(final long actual, final long total) {
-      return String.format("%2.2f%%", total == 0 ? 0 : (actual * 100D / total));
-    }
+        private static String percentage(final long actual, final long total) {
+            return String.format("%2.2f%%", total == 0 ? 0 : (actual * 100D / total));
+        }
 
-    /** Computes different percentiles, values array MUST be sorted beforehand */
-    private static String percentile(final int[] values, final int percentile) {
-      assert percentile >= 0 && percentile <= 100;
-      final String prefix;
-      final int value;
-      switch (percentile) {
-        case 0:
-          prefix = "min";
-          value = values[0];
-          break;
-        case 100:
-          prefix = "max";
-          value = values[values.length - 1];
-          break;
-        default:
-          prefix = "pct" + percentile;
-          value = values[Math.round(values.length * percentile / 100F)];
-          break;
-      }
-      return String.format("%s:%s", prefix, value);
-    }
+        /** Computes different percentiles, values array MUST be sorted beforehand */
+        private static String percentile(final int[] values, final int percentile) {
+            assert percentile >= 0 && percentile <= 100;
+            final String prefix;
+            final int value;
+            switch (percentile) {
+                case 0:
+                    prefix = "min";
+                    value = values[0];
+                    break;
+                case 100:
+                    prefix = "max";
+                    value = values[values.length - 1];
+                    break;
+                default:
+                    prefix = "pct" + percentile;
+                    value = values[Math.round(values.length * percentile / 100F)];
+                    break;
+            }
+            return String.format("%s:%s", prefix, value);
+        }
 
-    private static String average(final int[] values) {
-      return String.format("avg:%2.2f", Arrays.stream(values).sum() / (double) values.length);
+        private static String average(final int[] values) {
+            return String.format("avg:%2.2f", Arrays.stream(values).sum() / (double) values.length);
+        }
     }
-  }
 
-  class NoOp implements TaintedMap {
+    class NoOp implements TaintedMap {
 
-    public static final TaintedMap INSTANCE = new NoOp();
+        public static final TaintedMap INSTANCE = new NoOp();
 
-    @Nullable
-    @Override
-    public TaintedObject get(@Nonnull Object key) {
-      return null;
-    }
+        @Nullable
+        @Override
+        public TaintedObject get(@Nonnull Object key) {
+            return null;
+        }
 
-    @Override
-    public void put(@Nonnull TaintedObject entry) {}
+        @Override
+        public void put(@Nonnull TaintedObject entry) {}
 
-    @Override
-    public int count() {
-      return 0;
-    }
+        @Override
+        public int count() {
+            return 0;
+        }
 
-    @Override
-    public void clear() {}
+        @Override
+        public void clear() {}
 
-    @Nonnull
-    @Override
-    public Iterator<TaintedObject> iterator() {
-      return Collections.emptyIterator();
+        @Nonnull
+        @Override
+        public Iterator<TaintedObject> iterator() {
+            return Collections.emptyIterator();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedObject.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedObject.java
index 95df171b5ab..424c35e0e4e 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedObject.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedObject.java
@@ -13,70 +13,73 @@
 
 public class TaintedObject extends WeakReference<Object> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TaintedObject.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TaintedObject.class);
 
-  public static final int MAX_RANGE_COUNT = Config.get().getIastMaxRangeCount();
+    public static final int MAX_RANGE_COUNT = Config.get().getIastMaxRangeCount();
 
-  final int positiveHashCode;
-  @Nullable TaintedObject next;
-  private Range[] ranges;
+    final int positiveHashCode;
 
-  /** generation of the tainted for max age purging purposes */
-  boolean generation;
+    @Nullable
+    TaintedObject next;
 
-  public TaintedObject(final @Nonnull Object obj, final @Nonnull Range[] ranges) {
-    super(obj);
-    validateRanges(ranges);
-    this.positiveHashCode = System.identityHashCode(obj) & POSITIVE_MASK;
-    // ensure ranges never go over the limit
-    if (ranges.length > MAX_RANGE_COUNT) {
-      this.ranges = new Range[MAX_RANGE_COUNT];
-      System.arraycopy(ranges, 0, this.ranges, 0, MAX_RANGE_COUNT);
-    } else {
-      this.ranges = ranges;
-    }
-  }
+    private Range[] ranges;
 
-  /**
-   * Get ranges. The array or its elements MUST NOT be mutated. This may be reused in multiple
-   * instances.
-   */
-  @Nonnull
-  public Range[] getRanges() {
-    return ranges;
-  }
+    /** generation of the tainted for max age purging purposes */
+    boolean generation;
 
-  public void setRanges(@Nonnull final Range[] ranges) {
-    try {
-      validateRanges(ranges);
-      this.ranges = ranges;
-    } catch (Throwable e) {
-      LOGGER.debug("Error tainting object with custom ranges, ranges won't be updated", e);
+    public TaintedObject(final @Nonnull Object obj, final @Nonnull Range[] ranges) {
+        super(obj);
+        validateRanges(ranges);
+        this.positiveHashCode = System.identityHashCode(obj) & POSITIVE_MASK;
+        // ensure ranges never go over the limit
+        if (ranges.length > MAX_RANGE_COUNT) {
+            this.ranges = new Range[MAX_RANGE_COUNT];
+            System.arraycopy(ranges, 0, this.ranges, 0, MAX_RANGE_COUNT);
+        } else {
+            this.ranges = ranges;
+        }
     }
-  }
 
-  @Override
-  public String toString() {
-    final Object referent = get();
-    return "[hash: "
-        + positiveHashCode
-        + ", gen: "
-        + generation
-        + "] "
-        + (referent == null ? "GCed" : referent)
-        + " ("
-        + (ranges == null ? 0 : ranges.length)
-        + " ranges)";
-  }
+    /**
+     * Get ranges. The array or its elements MUST NOT be mutated. This may be reused in multiple
+     * instances.
+     */
+    @Nonnull
+    public Range[] getRanges() {
+        return ranges;
+    }
 
-  private void validateRanges(final Range[] ranges) {
-    if (ranges == null) {
-      throw new IllegalArgumentException("ranges cannot be null");
+    public void setRanges(@Nonnull final Range[] ranges) {
+        try {
+            validateRanges(ranges);
+            this.ranges = ranges;
+        } catch (Throwable e) {
+            LOGGER.debug("Error tainting object with custom ranges, ranges won't be updated", e);
+        }
     }
-    for (Range range : ranges) {
-      if (range == null) {
-        throw new IllegalArgumentException("found null range in " + Arrays.toString(ranges));
-      }
+
+    @Override
+    public String toString() {
+        final Object referent = get();
+        return "[hash: "
+                + positiveHashCode
+                + ", gen: "
+                + generation
+                + "] "
+                + (referent == null ? "GCed" : referent)
+                + " ("
+                + (ranges == null ? 0 : ranges.length)
+                + " ranges)";
+    }
+
+    private void validateRanges(final Range[] ranges) {
+        if (ranges == null) {
+            throw new IllegalArgumentException("ranges cannot be null");
+        }
+        for (Range range : ranges) {
+            if (range == null) {
+                throw new IllegalArgumentException("found null range in " + Arrays.toString(ranges));
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedObjects.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedObjects.java
index bef90743403..2fe9de27b95 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedObjects.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedObjects.java
@@ -19,167 +19,167 @@
 @SuppressWarnings("UnusedReturnValue")
 public interface TaintedObjects extends Iterable<TaintedObject> {
 
-  Logger LOGGER = LoggerFactory.getLogger(TaintedObjects.class);
+    Logger LOGGER = LoggerFactory.getLogger(TaintedObjects.class);
 
-  static TaintedObjects build(@Nonnull final TaintedMap map) {
-    final TaintedObjectsImpl taintedObjects = new TaintedObjectsImpl(map);
-    return IastSystem.DEBUG ? new TaintedObjectsDebugAdapter(taintedObjects) : taintedObjects;
-  }
+    static TaintedObjects build(@Nonnull final TaintedMap map) {
+        final TaintedObjectsImpl taintedObjects = new TaintedObjectsImpl(map);
+        return IastSystem.DEBUG ? new TaintedObjectsDebugAdapter(taintedObjects) : taintedObjects;
+    }
 
-  @Nullable
-  TaintedObject taint(@Nonnull Object obj, @Nonnull Range[] ranges);
+    @Nullable
+    TaintedObject taint(@Nonnull Object obj, @Nonnull Range[] ranges);
 
-  @Nullable
-  TaintedObject get(@Nonnull Object obj);
+    @Nullable
+    TaintedObject get(@Nonnull Object obj);
 
-  void clear();
+    void clear();
 
-  int count();
+    int count();
 
-  class TaintedObjectsImpl implements TaintedObjects {
+    class TaintedObjectsImpl implements TaintedObjects {
 
-    private final TaintedMap map;
+        private final TaintedMap map;
 
-    private TaintedObjectsImpl(final @Nonnull TaintedMap map) {
-      this.map = map;
-    }
+        private TaintedObjectsImpl(final @Nonnull TaintedMap map) {
+            this.map = map;
+        }
 
-    @Nullable
-    @Override
-    public TaintedObject taint(final @Nonnull Object obj, final @Nonnull Range[] ranges) {
-      try {
-        final TaintedObject tainted = new TaintedObject(obj, ranges);
-        map.put(tainted);
-        return tainted;
-      } catch (Throwable e) {
-        LOGGER.debug("Error tainting object, it won't be tainted", e);
-        return null;
-      }
-    }
+        @Nullable
+        @Override
+        public TaintedObject taint(final @Nonnull Object obj, final @Nonnull Range[] ranges) {
+            try {
+                final TaintedObject tainted = new TaintedObject(obj, ranges);
+                map.put(tainted);
+                return tainted;
+            } catch (Throwable e) {
+                LOGGER.debug("Error tainting object, it won't be tainted", e);
+                return null;
+            }
+        }
 
-    @Nullable
-    @Override
-    public TaintedObject get(final @Nonnull Object obj) {
-      return map.get(obj);
-    }
+        @Nullable
+        @Override
+        public TaintedObject get(final @Nonnull Object obj) {
+            return map.get(obj);
+        }
 
-    @Override
-    public void clear() {
-      map.clear();
-    }
+        @Override
+        public void clear() {
+            map.clear();
+        }
 
-    @Override
-    public int count() {
-      return map.count();
-    }
+        @Override
+        public int count() {
+            return map.count();
+        }
 
-    @Nonnull
-    @Override
-    public Iterator<TaintedObject> iterator() {
-      return map.iterator();
+        @Nonnull
+        @Override
+        public Iterator<TaintedObject> iterator() {
+            return map.iterator();
+        }
     }
-  }
 
-  final class TaintedObjectsDebugAdapter implements TaintedObjects, Wrapper<TaintedObjectsImpl> {
+    final class TaintedObjectsDebugAdapter implements TaintedObjects, Wrapper<TaintedObjectsImpl> {
 
-    private final TaintedObjectsImpl delegated;
-    private final UUID id;
+        private final TaintedObjectsImpl delegated;
+        private final UUID id;
 
-    public TaintedObjectsDebugAdapter(final TaintedObjectsImpl delegated) {
-      this.delegated = delegated;
-      id = RandomUtils.randomUUID();
-      LOGGER.debug("new: id={}", id);
-    }
+        public TaintedObjectsDebugAdapter(final TaintedObjectsImpl delegated) {
+            this.delegated = delegated;
+            id = RandomUtils.randomUUID();
+            LOGGER.debug("new: id={}", id);
+        }
 
-    @Nullable
-    @Override
-    public TaintedObject taint(final @Nonnull Object obj, final @Nonnull Range[] ranges) {
-      final TaintedObject tainted = delegated.taint(obj, ranges);
-      logTainted(tainted);
-      return tainted;
-    }
+        @Nullable
+        @Override
+        public TaintedObject taint(final @Nonnull Object obj, final @Nonnull Range[] ranges) {
+            final TaintedObject tainted = delegated.taint(obj, ranges);
+            logTainted(tainted);
+            return tainted;
+        }
 
-    @Nullable
-    @Override
-    public TaintedObject get(final @Nonnull Object obj) {
-      return delegated.get(obj);
-    }
+        @Nullable
+        @Override
+        public TaintedObject get(final @Nonnull Object obj) {
+            return delegated.get(obj);
+        }
 
-    @Override
-    public void clear() {
-      if (IastSystem.DEBUG && LOGGER.isDebugEnabled()) {
-        try {
-          final List<TaintedObject> entries = new ArrayList<>();
-          for (final TaintedObject to : delegated.map) {
-            entries.add(to);
-          }
-          LOGGER.debug("clear {}: map={}", id, TaintedObjectEncoding.toJson(entries));
-        } catch (final Throwable e) {
-          LOGGER.error("Failed to debug tainted objects release", e);
-        }
-      }
-      delegated.clear();
-    }
+        @Override
+        public void clear() {
+            if (IastSystem.DEBUG && LOGGER.isDebugEnabled()) {
+                try {
+                    final List<TaintedObject> entries = new ArrayList<>();
+                    for (final TaintedObject to : delegated.map) {
+                        entries.add(to);
+                    }
+                    LOGGER.debug("clear {}: map={}", id, TaintedObjectEncoding.toJson(entries));
+                } catch (final Throwable e) {
+                    LOGGER.error("Failed to debug tainted objects release", e);
+                }
+            }
+            delegated.clear();
+        }
 
-    @Override
-    public int count() {
-      return delegated.count();
-    }
+        @Override
+        public int count() {
+            return delegated.count();
+        }
 
-    @Nonnull
-    @Override
-    public Iterator<TaintedObject> iterator() {
-      return delegated.iterator();
-    }
+        @Nonnull
+        @Override
+        public Iterator<TaintedObject> iterator() {
+            return delegated.iterator();
+        }
 
-    private void logTainted(@Nullable final TaintedObject tainted) {
-      if (LOGGER.isDebugEnabled()) {
-        try {
-          if (tainted == null) {
-            LOGGER.debug("taint {}: ignored", id);
-          } else {
-            LOGGER.debug("taint {}: tainted={}", id, TaintedObjectEncoding.toJson(tainted));
-          }
-        } catch (final Throwable e) {
-          LOGGER.error("Failed to debug new tainted object", e);
-        }
-      }
-    }
+        private void logTainted(@Nullable final TaintedObject tainted) {
+            if (LOGGER.isDebugEnabled()) {
+                try {
+                    if (tainted == null) {
+                        LOGGER.debug("taint {}: ignored", id);
+                    } else {
+                        LOGGER.debug("taint {}: tainted={}", id, TaintedObjectEncoding.toJson(tainted));
+                    }
+                } catch (final Throwable e) {
+                    LOGGER.error("Failed to debug new tainted object", e);
+                }
+            }
+        }
 
-    @Override
-    public TaintedObjectsImpl unwrap() {
-      return delegated;
+        @Override
+        public TaintedObjectsImpl unwrap() {
+            return delegated;
+        }
     }
-  }
 
-  final class NoOp implements TaintedObjects {
+    final class NoOp implements TaintedObjects {
 
-    public static final TaintedObjects INSTANCE = new NoOp();
+        public static final TaintedObjects INSTANCE = new NoOp();
 
-    @Nullable
-    @Override
-    public TaintedObject taint(@Nonnull final Object obj, @Nonnull final Range[] ranges) {
-      return null;
-    }
+        @Nullable
+        @Override
+        public TaintedObject taint(@Nonnull final Object obj, @Nonnull final Range[] ranges) {
+            return null;
+        }
 
-    @Nullable
-    @Override
-    public TaintedObject get(@Nonnull final Object obj) {
-      return null;
-    }
+        @Nullable
+        @Override
+        public TaintedObject get(@Nonnull final Object obj) {
+            return null;
+        }
 
-    @Override
-    public void clear() {}
+        @Override
+        public void clear() {}
 
-    @Override
-    public int count() {
-      return 0;
-    }
+        @Override
+        public int count() {
+            return 0;
+        }
 
-    @Override
-    @Nonnull
-    public Iterator<TaintedObject> iterator() {
-      return emptyIterator();
+        @Override
+        @Nonnull
+        public Iterator<TaintedObject> iterator() {
+            return emptyIterator();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/Tainteds.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/Tainteds.java
index d4d6ac5fe36..711277b419b 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/Tainteds.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/Tainteds.java
@@ -9,57 +9,56 @@
 /** Utilities to work with {@link TaintedObject} */
 public final class Tainteds {
 
-  private Tainteds() {}
+    private Tainteds() {}
 
-  @Contract("null -> false")
-  public static boolean canBeTainted(@Nullable final CharSequence s) {
-    return s != null && s.length() > 0;
-  }
-
-  @Contract("null -> false")
-  public static boolean canBeTainted(@Nullable final String s) {
-    return s != null && !s.isEmpty();
-  }
-
-  @SuppressWarnings("RedundantLengthCheck")
-  @Contract("null -> false")
-  public static boolean canBeTainted(@Nullable final String[] e) {
-    if (e == null || e.length == 0) {
-      return false;
+    @Contract("null -> false")
+    public static boolean canBeTainted(@Nullable final CharSequence s) {
+        return s != null && s.length() > 0;
     }
-    for (final String item : e) {
-      if (canBeTainted(item)) {
-        return true;
-      }
+
+    @Contract("null -> false")
+    public static boolean canBeTainted(@Nullable final String s) {
+        return s != null && !s.isEmpty();
     }
-    return false;
-  }
 
-  @Contract("null -> false")
-  public static boolean canBeTainted(@Nullable final List<String> e) {
-    if (e == null || e.isEmpty()) {
-      return false;
+    @SuppressWarnings("RedundantLengthCheck")
+    @Contract("null -> false")
+    public static boolean canBeTainted(@Nullable final String[] e) {
+        if (e == null || e.length == 0) {
+            return false;
+        }
+        for (final String item : e) {
+            if (canBeTainted(item)) {
+                return true;
+            }
+        }
+        return false;
     }
-    if (e instanceof RandomAccess) {
-      // indexed optimization for RandomAccess to prevent the iterator allocation
-      for (int i = e.size() - 1; i >= 0; i--) {
-        if (canBeTainted(e.get(i))) {
-          return true;
+
+    @Contract("null -> false")
+    public static boolean canBeTainted(@Nullable final List<String> e) {
+        if (e == null || e.isEmpty()) {
+            return false;
         }
-      }
-    } else {
-      for (final String item : e) {
-        if (canBeTainted(item)) {
-          return true;
+        if (e instanceof RandomAccess) {
+            // indexed optimization for RandomAccess to prevent the iterator allocation
+            for (int i = e.size() - 1; i >= 0; i--) {
+                if (canBeTainted(e.get(i))) {
+                    return true;
+                }
+            }
+        } else {
+            for (final String item : e) {
+                if (canBeTainted(item)) {
+                    return true;
+                }
+            }
         }
-      }
+        return false;
     }
-    return false;
-  }
 
-  @Nullable
-  public static TaintedObject getTainted(
-      @Nonnull final TaintedObjects to, @Nullable final Object value) {
-    return value == null ? null : to.get(value);
-  }
+    @Nullable
+    public static TaintedObject getTainted(@Nonnull final TaintedObjects to, @Nullable final Object value) {
+        return value == null ? null : to.get(value);
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/TelemetryRequestEndedHandler.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/TelemetryRequestEndedHandler.java
index 9e6d8c89b24..e3ad4fbfab2 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/TelemetryRequestEndedHandler.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/TelemetryRequestEndedHandler.java
@@ -16,52 +16,49 @@
 import java.util.function.BiFunction;
 import javax.annotation.Nonnull;
 
-public class TelemetryRequestEndedHandler
-    implements BiFunction<RequestContext, IGSpanInfo, Flow<Void>> {
+public class TelemetryRequestEndedHandler implements BiFunction<RequestContext, IGSpanInfo, Flow<Void>> {
 
-  private final BiFunction<RequestContext, IGSpanInfo, Flow<Void>> delegate;
+    private final BiFunction<RequestContext, IGSpanInfo, Flow<Void>> delegate;
 
-  public TelemetryRequestEndedHandler(
-      @Nonnull final BiFunction<RequestContext, IGSpanInfo, Flow<Void>> delegate) {
-    this.delegate = delegate;
-  }
-
-  @Override
-  public Flow<Void> apply(final RequestContext context, final IGSpanInfo igSpanInfo) {
-    final Flow<Void> result = delegate.apply(context, igSpanInfo);
-    onRequestEnded(context);
-    return result;
-  }
-
-  private static void onRequestEnded(final RequestContext context) {
-    final IastContext iastCtx = context.getData(RequestContextSlot.IAST);
-    if (!(iastCtx instanceof HasMetricCollector)) {
-      return;
+    public TelemetryRequestEndedHandler(@Nonnull final BiFunction<RequestContext, IGSpanInfo, Flow<Void>> delegate) {
+        this.delegate = delegate;
     }
-    final IastMetricCollector collector = ((HasMetricCollector) iastCtx).getMetricCollector();
-    if (collector == null) {
-      return;
+
+    @Override
+    public Flow<Void> apply(final RequestContext context, final IGSpanInfo igSpanInfo) {
+        final Flow<Void> result = delegate.apply(context, igSpanInfo);
+        onRequestEnded(context);
+        return result;
     }
-    collector.prepareMetrics();
-    final Collection<IastMetricData> metrics = collector.drain();
-    if (!metrics.isEmpty()) {
-      final TraceSegment trace = context.getTraceSegment();
-      addMetricsToTrace(trace, metrics);
-      addMetricsToTelemetry(metrics);
+
+    private static void onRequestEnded(final RequestContext context) {
+        final IastContext iastCtx = context.getData(RequestContextSlot.IAST);
+        if (!(iastCtx instanceof HasMetricCollector)) {
+            return;
+        }
+        final IastMetricCollector collector = ((HasMetricCollector) iastCtx).getMetricCollector();
+        if (collector == null) {
+            return;
+        }
+        collector.prepareMetrics();
+        final Collection<IastMetricData> metrics = collector.drain();
+        if (!metrics.isEmpty()) {
+            final TraceSegment trace = context.getTraceSegment();
+            addMetricsToTrace(trace, metrics);
+            addMetricsToTelemetry(metrics);
+        }
     }
-  }
 
-  private static void addMetricsToTrace(
-      final TraceSegment trace, final Collection<IastMetricData> metrics) {
-    for (final IastMetricData data : metrics) {
-      final IastMetric metric = data.getMetric();
-      if (metric.getScope() == REQUEST) {
-        trace.setTagTop(data.getSpanTag(), data.value);
-      }
+    private static void addMetricsToTrace(final TraceSegment trace, final Collection<IastMetricData> metrics) {
+        for (final IastMetricData data : metrics) {
+            final IastMetric metric = data.getMetric();
+            if (metric.getScope() == REQUEST) {
+                trace.setTagTop(data.getSpanTag(), data.value);
+            }
+        }
     }
-  }
 
-  private static void addMetricsToTelemetry(final Collection<IastMetricData> metrics) {
-    IastMetricCollector.get().merge(metrics);
-  }
+    private static void addMetricsToTelemetry(final Collection<IastMetricData> metrics) {
+        IastMetricCollector.get().merge(metrics);
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/TelemetryRequestStartedHandler.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/TelemetryRequestStartedHandler.java
index 92dcf317886..8ceabda364f 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/TelemetryRequestStartedHandler.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/TelemetryRequestStartedHandler.java
@@ -12,18 +12,18 @@
 
 public class TelemetryRequestStartedHandler extends RequestStartedHandler {
 
-  public TelemetryRequestStartedHandler(@Nonnull final Dependencies dependencies) {
-    super(dependencies);
-  }
+    public TelemetryRequestStartedHandler(@Nonnull final Dependencies dependencies) {
+        super(dependencies);
+    }
 
-  @Override
-  protected IastRequestContext newContext() {
-    final IastRequestContext ctx = super.newContext();
-    final Config config = Config.get();
-    final Verbosity verbosity = config.getIastTelemetryVerbosity();
-    final TaintedObjects withTelemetry = TaintedObjectsWithTelemetry.build(verbosity, ctx);
-    ctx.setTaintedObjects(withTelemetry);
-    ctx.setCollector(new IastMetricCollector());
-    return ctx;
-  }
+    @Override
+    protected IastRequestContext newContext() {
+        final IastRequestContext ctx = super.newContext();
+        final Config config = Config.get();
+        final Verbosity verbosity = config.getIastTelemetryVerbosity();
+        final TaintedObjects withTelemetry = TaintedObjectsWithTelemetry.build(verbosity, ctx);
+        ctx.setTaintedObjects(withTelemetry);
+        ctx.setCollector(new IastMetricCollector());
+        return ctx;
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/taint/TaintedObjectsWithTelemetry.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/taint/TaintedObjectsWithTelemetry.java
index 14caf7fae4a..a9def2844fd 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/taint/TaintedObjectsWithTelemetry.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/telemetry/taint/TaintedObjectsWithTelemetry.java
@@ -16,63 +16,62 @@
 
 public class TaintedObjectsWithTelemetry implements TaintedObjects, Wrapper<TaintedObjects> {
 
-  public static TaintedObjects build(final Verbosity verbosity, final IastContext ctx) {
-    final TaintedObjects delegate = ctx.getTaintedObjects();
-    if (verbosity.isInformationEnabled()) {
-      return new TaintedObjectsWithTelemetry(verbosity.isDebugEnabled(), delegate, ctx);
+    public static TaintedObjects build(final Verbosity verbosity, final IastContext ctx) {
+        final TaintedObjects delegate = ctx.getTaintedObjects();
+        if (verbosity.isInformationEnabled()) {
+            return new TaintedObjectsWithTelemetry(verbosity.isDebugEnabled(), delegate, ctx);
+        }
+        return delegate;
     }
-    return delegate;
-  }
 
-  private final TaintedObjects delegate;
-  private final boolean debug;
-  private final IastContext ctx;
+    private final TaintedObjects delegate;
+    private final boolean debug;
+    private final IastContext ctx;
 
-  protected TaintedObjectsWithTelemetry(
-      final boolean debug, final TaintedObjects delegate, final IastContext ctx) {
-    this.delegate = delegate;
-    this.debug = debug;
-    this.ctx = ctx;
-  }
+    protected TaintedObjectsWithTelemetry(final boolean debug, final TaintedObjects delegate, final IastContext ctx) {
+        this.delegate = delegate;
+        this.debug = debug;
+        this.ctx = ctx;
+    }
 
-  @Nullable
-  @Override
-  public TaintedObject taint(@Nonnull Object obj, @Nonnull Range[] ranges) {
-    final TaintedObject result = delegate.taint(obj, ranges);
-    if (debug) {
-      IastMetricCollector.add(EXECUTED_TAINTED, 1, ctx);
+    @Nullable
+    @Override
+    public TaintedObject taint(@Nonnull Object obj, @Nonnull Range[] ranges) {
+        final TaintedObject result = delegate.taint(obj, ranges);
+        if (debug) {
+            IastMetricCollector.add(EXECUTED_TAINTED, 1, ctx);
+        }
+        return result;
     }
-    return result;
-  }
 
-  @Nullable
-  @Override
-  public TaintedObject get(@Nonnull Object obj) {
-    return delegate.get(obj);
-  }
+    @Nullable
+    @Override
+    public TaintedObject get(@Nonnull Object obj) {
+        return delegate.get(obj);
+    }
 
-  @Override
-  public void clear() {
-    try {
-      IastMetricCollector.add(REQUEST_TAINTED, count(), ctx);
-    } finally {
-      delegate.clear();
+    @Override
+    public void clear() {
+        try {
+            IastMetricCollector.add(REQUEST_TAINTED, count(), ctx);
+        } finally {
+            delegate.clear();
+        }
     }
-  }
 
-  @Nonnull
-  @Override
-  public Iterator<TaintedObject> iterator() {
-    return delegate.iterator();
-  }
+    @Nonnull
+    @Override
+    public Iterator<TaintedObject> iterator() {
+        return delegate.iterator();
+    }
 
-  @Override
-  public int count() {
-    return delegate.count();
-  }
+    @Override
+    public int count() {
+        return delegate.count();
+    }
 
-  @Override
-  public TaintedObjects unwrap() {
-    return delegate;
-  }
+    @Override
+    public TaintedObjects unwrap() {
+        return delegate;
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/CRCUtils.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/CRCUtils.java
index f0601fc1d06..dc6862f2101 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/CRCUtils.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/CRCUtils.java
@@ -6,20 +6,20 @@
 
 public abstract class CRCUtils {
 
-  private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
+    private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
 
-  private CRCUtils() {}
+    private CRCUtils() {}
 
-  public static void update(final CRC32 crc, final String value) {
-    update(crc, value, DEFAULT_CHARSET);
-  }
+    public static void update(final CRC32 crc, final String value) {
+        update(crc, value, DEFAULT_CHARSET);
+    }
 
-  public static void update(final CRC32 crc, final String value, final Charset charset) {
-    final byte[] bytes = value.getBytes(charset);
-    update(crc, bytes);
-  }
+    public static void update(final CRC32 crc, final String value, final Charset charset) {
+        final byte[] bytes = value.getBytes(charset);
+        update(crc, bytes);
+    }
 
-  public static void update(final CRC32 crc, final byte[] bytes) {
-    crc.update(bytes, 0, bytes.length);
-  }
+    public static void update(final CRC32 crc, final byte[] bytes) {
+        crc.update(bytes, 0, bytes.length);
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/CharUtils.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/CharUtils.java
index d580366c04b..786e37c3b98 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/CharUtils.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/CharUtils.java
@@ -3,34 +3,33 @@
 import java.util.Arrays;
 
 public abstract class CharUtils {
-  private CharUtils() {}
+    private CharUtils() {}
 
-  /** Builds a new string of a given length using the buffer as a source of values. */
-  public static String newString(final int length, final char[] buffer) {
-    final StringBuilder result = new StringBuilder(length);
-    int remaining = length;
-    while (remaining > 0) {
-      final int next = Math.min(remaining, buffer.length);
-      result.append(buffer, 0, next);
-      remaining -= next;
+    /** Builds a new string of a given length using the buffer as a source of values. */
+    public static String newString(final int length, final char[] buffer) {
+        final StringBuilder result = new StringBuilder(length);
+        int remaining = length;
+        while (remaining > 0) {
+            final int next = Math.min(remaining, buffer.length);
+            result.append(buffer, 0, next);
+            remaining -= next;
+        }
+        return result.toString();
     }
-    return result.toString();
-  }
 
-  /** Creates a new array filled with the given value. */
-  public static char[] newCharArray(int size, final char value) {
-    final char[] result = new char[size];
-    Arrays.fill(result, value);
-    return result;
-  }
+    /** Creates a new array filled with the given value. */
+    public static char[] newCharArray(int size, final char value) {
+        final char[] result = new char[size];
+        Arrays.fill(result, value);
+        return result;
+    }
 
-  /** Fills the given array with the range of characters and returns the number of items written. */
-  public static int fillCharArray(
-      final int offset, final char start, final char end, final char[] result) {
-    int index = offset;
-    for (int i = start; i <= end; i++) {
-      result[index++] = (char) i;
+    /** Fills the given array with the range of characters and returns the number of items written. */
+    public static int fillCharArray(final int offset, final char start, final char end, final char[] result) {
+        int index = offset;
+        for (int i = start; i <= end; i++) {
+            result[index++] = (char) i;
+        }
+        return index - offset;
     }
-    return index - offset;
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/CookieSecurityParser.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/CookieSecurityParser.java
index 4163f573f83..f6a53d5f0cd 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/CookieSecurityParser.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/CookieSecurityParser.java
@@ -14,206 +14,207 @@
 
 public class CookieSecurityParser {
 
-  private static final Logger LOG = LoggerFactory.getLogger(CookieSecurityParser.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CookieSecurityParser.class);
 
-  private static final String SECURE = "Secure";
-  private static final String HTTP_ONLY = "HttpOnly";
-  private static final String SAME_SITE = "SameSite";
-  private static final String EXPIRES = "Expires";
-  private static final String VERSION = "Version";
-  private static final String MAX_AGE = "Max-Age";
+    private static final String SECURE = "Secure";
+    private static final String HTTP_ONLY = "HttpOnly";
+    private static final String SAME_SITE = "SameSite";
+    private static final String EXPIRES = "Expires";
+    private static final String VERSION = "Version";
+    private static final String MAX_AGE = "Max-Age";
 
-  // states for the FSM
-  private static final byte COOKIE_NAME = 1;
-  private static final byte COOKIE_VALUE = 2;
-  private static final byte COOKIE_ATTR_NAME = 3;
-  private static final byte COOKIE_ATTR_VALUE = 4;
-  private static final byte SAME_SITE_ATTR = 1;
-  private static final byte EXPIRES_ATTR = 2;
-  private static final byte MAX_AGE_ATTR = 3;
+    // states for the FSM
+    private static final byte COOKIE_NAME = 1;
+    private static final byte COOKIE_VALUE = 2;
+    private static final byte COOKIE_ATTR_NAME = 3;
+    private static final byte COOKIE_ATTR_VALUE = 4;
+    private static final byte SAME_SITE_ATTR = 1;
+    private static final byte EXPIRES_ATTR = 2;
+    private static final byte MAX_AGE_ATTR = 3;
 
-  public static List<Cookie> parse(final String header) {
-    final int end = header.indexOf(':');
-    if (end < 0) {
-      return Collections.emptyList();
-    }
-    final String headerName = header.substring(0, end).trim();
-    final HttpHeader httpHeader = HttpHeader.from(headerName);
-    if (httpHeader != HttpHeader.SET_COOKIE && httpHeader != SET_COOKIE2) {
-      return Collections.emptyList();
+    public static List<Cookie> parse(final String header) {
+        final int end = header.indexOf(':');
+        if (end < 0) {
+            return Collections.emptyList();
+        }
+        final String headerName = header.substring(0, end).trim();
+        final HttpHeader httpHeader = HttpHeader.from(headerName);
+        if (httpHeader != HttpHeader.SET_COOKIE && httpHeader != SET_COOKIE2) {
+            return Collections.emptyList();
+        }
+        final String headerValue = header.substring(end + 1).trim();
+        return parse(httpHeader, headerValue);
     }
-    final String headerValue = header.substring(end + 1).trim();
-    return parse(httpHeader, headerValue);
-  }
 
-  /** Cookie parsing algo based on a little FSM */
-  public static List<Cookie> parse(final HttpHeader headerName, String headerValue) {
-    if (headerValue == null || headerValue.isEmpty()) {
-      return Collections.emptyList();
-    }
-    try {
-      // only rfc 2965 cookie starts with 'set-cookie2'
-      int version = headerName == SET_COOKIE2 ? 1 : 0;
-      List<Cookie> result = new ArrayList<>();
-      int start = 0, quoteCount = 0;
-      Integer maxAge = null;
-      Integer expiresYear = null;
-      String cookieName = null, cookieValue = null, sameSite = null;
-      boolean secure = false, httpOnly = false;
-      byte state = COOKIE_NAME, attribute = -1;
-      for (int i = 0; i < headerValue.length(); i++) {
-        final char next = headerValue.charAt(i);
-        if (next == '"') {
-          quoteCount++;
+    /** Cookie parsing algo based on a little FSM */
+    public static List<Cookie> parse(final HttpHeader headerName, String headerValue) {
+        if (headerValue == null || headerValue.isEmpty()) {
+            return Collections.emptyList();
         }
-        boolean addCookie = false;
-        boolean eof = i == headerValue.length() - 1;
-        boolean separator = next == ',' || next == '=' || next == ';';
-        if (eof || separator) {
-          if (next == ',') {
-            if (quoteCount % 2 == 0 && version == 1) {
-              addCookie = true; // multiple cookie separator
-            } else {
-              continue;
-            }
-          }
-          final int end = separator ? i : i + 1;
-          switch (state) {
-            case COOKIE_NAME:
-              cookieName = headerValue.substring(start, end).trim();
-              state = next == '=' ? COOKIE_VALUE : COOKIE_ATTR_NAME;
-              break;
-            case COOKIE_VALUE:
-              if (headerValue.charAt(start) == '"' && headerValue.charAt(end - 1) == '"') {
-                if (i != start + 1) { // avoid empty value ""
-                  cookieValue = headerValue.substring(start + 1, end - 1).trim();
+        try {
+            // only rfc 2965 cookie starts with 'set-cookie2'
+            int version = headerName == SET_COOKIE2 ? 1 : 0;
+            List<Cookie> result = new ArrayList<>();
+            int start = 0, quoteCount = 0;
+            Integer maxAge = null;
+            Integer expiresYear = null;
+            String cookieName = null, cookieValue = null, sameSite = null;
+            boolean secure = false, httpOnly = false;
+            byte state = COOKIE_NAME, attribute = -1;
+            for (int i = 0; i < headerValue.length(); i++) {
+                final char next = headerValue.charAt(i);
+                if (next == '"') {
+                    quoteCount++;
                 }
-              } else {
-                cookieValue = headerValue.substring(start, end).trim();
-              }
-              state = COOKIE_ATTR_NAME;
-              break;
-            case COOKIE_ATTR_NAME:
-              attribute = -1;
-              final int from = trimLeft(start, headerValue);
-              final int length = trimRight(end, headerValue) - from;
-              if (equalsIgnoreCase(SECURE, headerValue, from, length)) {
-                secure = true;
-              } else if (equalsIgnoreCase(HTTP_ONLY, headerValue, from, length)) {
-                httpOnly = true;
-              } else if (equalsIgnoreCase(EXPIRES, headerValue, from, length)) {
-                version = 0; // only netscape cookie using 'expires'
-                attribute = EXPIRES_ATTR;
-              } else if (equalsIgnoreCase(VERSION, headerValue, from, length)) {
-                version = 1; // version is mandatory for rfc 2965/2109 cookie
-              } else if (equalsIgnoreCase(MAX_AGE, headerValue, from, length)) {
-                version = 1; // rfc 2965/2109 use 'max-age'
-                attribute = MAX_AGE_ATTR;
-              } else if (equalsIgnoreCase(SAME_SITE, headerValue, from, length)) {
-                attribute = SAME_SITE_ATTR;
-              }
-              state = next == '=' ? COOKIE_ATTR_VALUE : COOKIE_ATTR_NAME;
-              break;
-            default: // COOKIE_ATTR_VALUE
-              if (attribute > 0) {
-                final String value = headerValue.substring(start, end).trim();
-                switch (attribute) {
-                  case SAME_SITE_ATTR:
-                    sameSite = value;
-                    break;
-                  case EXPIRES_ATTR:
-                    expiresYear = parseExpires(value, headerValue);
-                    break;
-                  case MAX_AGE_ATTR:
-                    maxAge = parseMaxAge(value, headerValue);
-                    break;
-                  default:
-                    break;
+                boolean addCookie = false;
+                boolean eof = i == headerValue.length() - 1;
+                boolean separator = next == ',' || next == '=' || next == ';';
+                if (eof || separator) {
+                    if (next == ',') {
+                        if (quoteCount % 2 == 0 && version == 1) {
+                            addCookie = true; // multiple cookie separator
+                        } else {
+                            continue;
+                        }
+                    }
+                    final int end = separator ? i : i + 1;
+                    switch (state) {
+                        case COOKIE_NAME:
+                            cookieName = headerValue.substring(start, end).trim();
+                            state = next == '=' ? COOKIE_VALUE : COOKIE_ATTR_NAME;
+                            break;
+                        case COOKIE_VALUE:
+                            if (headerValue.charAt(start) == '"' && headerValue.charAt(end - 1) == '"') {
+                                if (i != start + 1) { // avoid empty value ""
+                                    cookieValue = headerValue
+                                            .substring(start + 1, end - 1)
+                                            .trim();
+                                }
+                            } else {
+                                cookieValue = headerValue.substring(start, end).trim();
+                            }
+                            state = COOKIE_ATTR_NAME;
+                            break;
+                        case COOKIE_ATTR_NAME:
+                            attribute = -1;
+                            final int from = trimLeft(start, headerValue);
+                            final int length = trimRight(end, headerValue) - from;
+                            if (equalsIgnoreCase(SECURE, headerValue, from, length)) {
+                                secure = true;
+                            } else if (equalsIgnoreCase(HTTP_ONLY, headerValue, from, length)) {
+                                httpOnly = true;
+                            } else if (equalsIgnoreCase(EXPIRES, headerValue, from, length)) {
+                                version = 0; // only netscape cookie using 'expires'
+                                attribute = EXPIRES_ATTR;
+                            } else if (equalsIgnoreCase(VERSION, headerValue, from, length)) {
+                                version = 1; // version is mandatory for rfc 2965/2109 cookie
+                            } else if (equalsIgnoreCase(MAX_AGE, headerValue, from, length)) {
+                                version = 1; // rfc 2965/2109 use 'max-age'
+                                attribute = MAX_AGE_ATTR;
+                            } else if (equalsIgnoreCase(SAME_SITE, headerValue, from, length)) {
+                                attribute = SAME_SITE_ATTR;
+                            }
+                            state = next == '=' ? COOKIE_ATTR_VALUE : COOKIE_ATTR_NAME;
+                            break;
+                        default: // COOKIE_ATTR_VALUE
+                            if (attribute > 0) {
+                                final String value =
+                                        headerValue.substring(start, end).trim();
+                                switch (attribute) {
+                                    case SAME_SITE_ATTR:
+                                        sameSite = value;
+                                        break;
+                                    case EXPIRES_ATTR:
+                                        expiresYear = parseExpires(value, headerValue);
+                                        break;
+                                    case MAX_AGE_ATTR:
+                                        maxAge = parseMaxAge(value, headerValue);
+                                        break;
+                                    default:
+                                        break;
+                                }
+                            }
+                            state = COOKIE_ATTR_NAME;
+                            break;
+                    }
+                    start = end + 1;
                 }
-              }
-              state = COOKIE_ATTR_NAME;
-              break;
-          }
-          start = end + 1;
-        }
-        if (addCookie || eof) {
-          if (cookieName != null && !cookieName.isEmpty()) {
-            result.add(
-                new Cookie(
-                    cookieName, cookieValue, secure, httpOnly, sameSite, expiresYear, maxAge));
-          }
-          cookieName = null;
-          cookieValue = null;
-          attribute = -1;
-          secure = false;
-          httpOnly = false;
-          sameSite = null;
-          expiresYear = null;
-          maxAge = null;
-          state = COOKIE_NAME;
+                if (addCookie || eof) {
+                    if (cookieName != null && !cookieName.isEmpty()) {
+                        result.add(
+                                new Cookie(cookieName, cookieValue, secure, httpOnly, sameSite, expiresYear, maxAge));
+                    }
+                    cookieName = null;
+                    cookieValue = null;
+                    attribute = -1;
+                    secure = false;
+                    httpOnly = false;
+                    sameSite = null;
+                    expiresYear = null;
+                    maxAge = null;
+                    state = COOKIE_NAME;
+                }
+            }
+            return result;
+        } catch (final Throwable e) {
+            LOG.debug(SEND_TELEMETRY, "Failed to parse the cookie {}", headerValue, e);
+            return emptyList();
         }
-      }
-      return result;
-    } catch (final Throwable e) {
-      LOG.debug(SEND_TELEMETRY, "Failed to parse the cookie {}", headerValue, e);
-      return emptyList();
     }
-  }
 
-  @Nullable
-  private static Integer parseMaxAge(final String value, final String headerValue) {
-    try {
-      return Integer.parseInt(value);
-    } catch (final NumberFormatException e) {
-      LOG.debug(SEND_TELEMETRY, "Failed to parse the max-age {}", headerValue);
-      return null;
+    @Nullable
+    private static Integer parseMaxAge(final String value, final String headerValue) {
+        try {
+            return Integer.parseInt(value);
+        } catch (final NumberFormatException e) {
+            LOG.debug(SEND_TELEMETRY, "Failed to parse the max-age {}", headerValue);
+            return null;
+        }
     }
-  }
 
-  @Nullable
-  private static Integer parseExpires(final String value, final String headerValue) {
+    @Nullable
+    private static Integer parseExpires(final String value, final String headerValue) {
 
-    Integer year = null;
-    try {
-      int count = 0;
-      int start = 0;
-      for (int i = 0; i < value.length(); i++) {
-        final char next = value.charAt(i);
-        if (next == ' ') {
-          count++;
-          if (count == 4) {
-            year = Integer.parseInt(value.substring(start, i));
-            break;
-          } else {
-            start = i + 1;
-          }
+        Integer year = null;
+        try {
+            int count = 0;
+            int start = 0;
+            for (int i = 0; i < value.length(); i++) {
+                final char next = value.charAt(i);
+                if (next == ' ') {
+                    count++;
+                    if (count == 4) {
+                        year = Integer.parseInt(value.substring(start, i));
+                        break;
+                    } else {
+                        start = i + 1;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            year = null;
         }
-      }
-    } catch (Exception e) {
-      year = null;
-    }
-    if (year == null) {
-      LOG.debug(SEND_TELEMETRY, "Failed to parse the expires {}", headerValue);
+        if (year == null) {
+            LOG.debug(SEND_TELEMETRY, "Failed to parse the expires {}", headerValue);
+        }
+        return year;
     }
-    return year;
-  }
 
-  private static int trimLeft(int start, final String value) {
-    while (Character.isWhitespace(value.charAt(start))) {
-      start++;
+    private static int trimLeft(int start, final String value) {
+        while (Character.isWhitespace(value.charAt(start))) {
+            start++;
+        }
+        return start;
     }
-    return start;
-  }
 
-  private static int trimRight(int end, final String value) {
-    while (Character.isWhitespace(value.charAt(end - 1))) {
-      end--;
+    private static int trimRight(int end, final String value) {
+        while (Character.isWhitespace(value.charAt(end - 1))) {
+            end--;
+        }
+        return end;
     }
-    return end;
-  }
 
-  private static boolean equalsIgnoreCase(
-      final String token, final String value, int start, final int length) {
-    return token.regionMatches(true, 0, value, start, length);
-  }
+    private static boolean equalsIgnoreCase(final String token, final String value, int start, final int length) {
+        return token.regionMatches(true, 0, value, start, length);
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/HttpHeader.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/HttpHeader.java
index 89349eec28c..b8e5ecd0c1f 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/HttpHeader.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/HttpHeader.java
@@ -4,77 +4,77 @@
 import javax.annotation.Nullable;
 
 public enum HttpHeader {
-  X_FORWARDED_PROTO("X-Forwarded-Proto") {
-    @Override
-    public void addToContext(final IastRequestContext ctx, final String value) {
-      ctx.setxForwardedProto(value);
-    }
-  },
-  STRICT_TRANSPORT_SECURITY("Strict-Transport-Security") {
-    @Override
-    public void addToContext(final IastRequestContext ctx, final String value) {
-      ctx.setStrictTransportSecurity(value);
-    }
-  },
-  CONTENT_TYPE("Content-Type") {
-    @Override
-    public void addToContext(final IastRequestContext ctx, final String value) {
-      ctx.setContentType(value);
-    }
-  },
-  X_CONTENT_TYPE_OPTIONS("X-Content-Type-Options") {
-    @Override
-    public void addToContext(final IastRequestContext ctx, final String value) {
-      ctx.setxContentTypeOptions(value);
-    }
-  },
-  AUTHORIZATION("Authorization") {
-    @Override
-    public void addToContext(final IastRequestContext ctx, final String value) {
-      ctx.setAuthorization(value);
-    }
-  },
-  COOKIE("Cookie"),
-  SET_COOKIE("Set-Cookie"),
-  SET_COOKIE2("Set-Cookie2"),
-  LOCATION("Location"),
-  REFERER("Referer"),
-  SEC_WEBSOCKET_LOCATION("Sec-WebSocket-Location"),
-  SEC_WEBSOCKET_ACCEPT("Sec-WebSocket-Accept"),
-  UPGRADE("Upgrade"),
-  CONNECTION("Connection"),
-  ORIGIN("Origin"),
-  CONTENT_ENCODING("Content-Encoding"),
-  TRANSFER_ENCODING("Transfer-Encoding"),
-  ACCEPT_ENCODING("Accept-Encoding"),
-  VARY("Vary"),
-  PRAGMA("Pragma"),
-  CACHE_CONTROL("Cache-Control");
+    X_FORWARDED_PROTO("X-Forwarded-Proto") {
+        @Override
+        public void addToContext(final IastRequestContext ctx, final String value) {
+            ctx.setxForwardedProto(value);
+        }
+    },
+    STRICT_TRANSPORT_SECURITY("Strict-Transport-Security") {
+        @Override
+        public void addToContext(final IastRequestContext ctx, final String value) {
+            ctx.setStrictTransportSecurity(value);
+        }
+    },
+    CONTENT_TYPE("Content-Type") {
+        @Override
+        public void addToContext(final IastRequestContext ctx, final String value) {
+            ctx.setContentType(value);
+        }
+    },
+    X_CONTENT_TYPE_OPTIONS("X-Content-Type-Options") {
+        @Override
+        public void addToContext(final IastRequestContext ctx, final String value) {
+            ctx.setxContentTypeOptions(value);
+        }
+    },
+    AUTHORIZATION("Authorization") {
+        @Override
+        public void addToContext(final IastRequestContext ctx, final String value) {
+            ctx.setAuthorization(value);
+        }
+    },
+    COOKIE("Cookie"),
+    SET_COOKIE("Set-Cookie"),
+    SET_COOKIE2("Set-Cookie2"),
+    LOCATION("Location"),
+    REFERER("Referer"),
+    SEC_WEBSOCKET_LOCATION("Sec-WebSocket-Location"),
+    SEC_WEBSOCKET_ACCEPT("Sec-WebSocket-Accept"),
+    UPGRADE("Upgrade"),
+    CONNECTION("Connection"),
+    ORIGIN("Origin"),
+    CONTENT_ENCODING("Content-Encoding"),
+    TRANSFER_ENCODING("Transfer-Encoding"),
+    ACCEPT_ENCODING("Accept-Encoding"),
+    VARY("Vary"),
+    PRAGMA("Pragma"),
+    CACHE_CONTROL("Cache-Control");
 
-  /** Faster lookup for headers */
-  private static final HttpHeaderMap<HttpHeader> HEADERS;
+    /** Faster lookup for headers */
+    private static final HttpHeaderMap<HttpHeader> HEADERS;
 
-  static {
-    HEADERS = new HttpHeaderMap<>();
-    for (final HttpHeader header : values()) {
-      HEADERS.put(header.name, header);
+    static {
+        HEADERS = new HttpHeaderMap<>();
+        for (final HttpHeader header : values()) {
+            HEADERS.put(header.name, header);
+        }
     }
-  }
 
-  public final String name;
+    public final String name;
 
-  HttpHeader(final String name) {
-    this.name = name;
-  }
+    HttpHeader(final String name) {
+        this.name = name;
+    }
 
-  public void addToContext(final IastRequestContext ctx, final String value) {}
+    public void addToContext(final IastRequestContext ctx, final String value) {}
 
-  public boolean matches(@Nullable final String name) {
-    return this.name.equalsIgnoreCase(name);
-  }
+    public boolean matches(@Nullable final String name) {
+        return this.name.equalsIgnoreCase(name);
+    }
 
-  @Nullable
-  public static HttpHeader from(final String name) {
-    return HEADERS.get(name);
-  }
+    @Nullable
+    public static HttpHeader from(final String name) {
+        return HEADERS.get(name);
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/HttpHeaderMap.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/HttpHeaderMap.java
index d023f870ecc..5ec04295225 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/HttpHeaderMap.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/HttpHeaderMap.java
@@ -10,151 +10,153 @@
  */
 public class HttpHeaderMap<T> {
 
-  private static final int DEFAULT_BUCKETS = 1 << 4;
+    private static final int DEFAULT_BUCKETS = 1 << 4;
 
-  private static final class Entry<T> {
+    private static final class Entry<T> {
 
-    private final String key;
+        private final String key;
 
-    @Nullable private T value;
+        @Nullable
+        private T value;
 
-    @Nullable private Entry<T> next;
+        @Nullable
+        private Entry<T> next;
 
-    private Entry(final String key, @Nullable final T value) {
-      this.key = key;
-      this.value = value;
+        private Entry(final String key, @Nullable final T value) {
+            this.key = key;
+            this.value = value;
+        }
     }
-  }
 
-  private final Entry<T>[] entries;
-  private final int bucketCount;
+    private final Entry<T>[] entries;
+    private final int bucketCount;
 
-  @SuppressWarnings("unchecked")
-  public HttpHeaderMap(int bucketCount) {
-    this.bucketCount = bucketCount;
-    this.entries = (Entry<T>[]) Array.newInstance(Entry.class, bucketCount);
-  }
+    @SuppressWarnings("unchecked")
+    public HttpHeaderMap(int bucketCount) {
+        this.bucketCount = bucketCount;
+        this.entries = (Entry<T>[]) Array.newInstance(Entry.class, bucketCount);
+    }
 
-  public HttpHeaderMap() {
-    this(DEFAULT_BUCKETS);
-  }
+    public HttpHeaderMap() {
+        this(DEFAULT_BUCKETS);
+    }
 
-  @Nullable
-  public T put(final String header, @Nullable final T value) {
-    if (header == null) {
-      return null;
+    @Nullable
+    public T put(final String header, @Nullable final T value) {
+        if (header == null) {
+            return null;
+        }
+        final int index = index(hash(header));
+        Entry<T> cur = entries[index];
+        if (cur == null) {
+            entries[index] = new Entry<>(header, value);
+        } else {
+            while (true) {
+                if (equals(cur.key, header)) {
+                    final T currentValue = cur.value;
+                    cur.value = value;
+                    return currentValue;
+                }
+                if (cur.next == null) {
+                    cur.next = new Entry<>(header, value);
+                    return null;
+                }
+                cur = cur.next;
+            }
+        }
+        return null;
     }
-    final int index = index(hash(header));
-    Entry<T> cur = entries[index];
-    if (cur == null) {
-      entries[index] = new Entry<>(header, value);
-    } else {
-      while (true) {
-        if (equals(cur.key, header)) {
-          final T currentValue = cur.value;
-          cur.value = value;
-          return currentValue;
+
+    @Nullable
+    public T get(final String name) {
+        if (name == null) {
+            return null;
         }
-        if (cur.next == null) {
-          cur.next = new Entry<>(header, value);
-          return null;
+        final int index = index(hash(name));
+        Entry<T> entry = entries[index];
+        while (entry != null) {
+            if (equals(entry.key, name)) {
+                return entry.value;
+            }
+            entry = entry.next;
         }
-        cur = cur.next;
-      }
+        return null;
     }
-    return null;
-  }
 
-  @Nullable
-  public T get(final String name) {
-    if (name == null) {
-      return null;
+    @Nullable
+    public T remove(final String name) {
+        if (name == null) {
+            return null;
+        }
+        final int index = index(hash(name));
+        Entry<T> cur = entries[index], prev = null;
+        while (cur != null) {
+            if (equals(cur.key, name)) {
+                if (prev == null) {
+                    entries[index] = cur.next;
+                } else {
+                    prev.next = cur.next;
+                }
+                return cur.value;
+            }
+            prev = cur;
+            cur = cur.next;
+        }
+        return null;
     }
-    final int index = index(hash(name));
-    Entry<T> entry = entries[index];
-    while (entry != null) {
-      if (equals(entry.key, name)) {
-        return entry.value;
-      }
-      entry = entry.next;
+
+    public int size() {
+        int result = 0;
+        for (Entry<T> cur : entries) {
+            while (cur != null) {
+                result++;
+                cur = cur.next;
+            }
+        }
+        return result;
     }
-    return null;
-  }
 
-  @Nullable
-  public T remove(final String name) {
-    if (name == null) {
-      return null;
+    private int index(final int hash) {
+        return hash % bucketCount;
     }
-    final int index = index(hash(name));
-    Entry<T> cur = entries[index], prev = null;
-    while (cur != null) {
-      if (equals(cur.key, name)) {
-        if (prev == null) {
-          entries[index] = cur.next;
+
+    /** Case insensitive hash */
+    private static int hash(final String name) {
+        int h = 0;
+        for (int i = 0; i < name.length(); i++) {
+            char c = lowerCase(name, i);
+            h = 31 * h + c;
+        }
+        if (h > 0) {
+            return h;
+        } else if (h == Integer.MIN_VALUE) {
+            return Integer.MAX_VALUE;
         } else {
-          prev.next = cur.next;
+            return -h;
         }
-        return cur.value;
-      }
-      prev = cur;
-      cur = cur.next;
-    }
-    return null;
-  }
-
-  public int size() {
-    int result = 0;
-    for (Entry<T> cur : entries) {
-      while (cur != null) {
-        result++;
-        cur = cur.next;
-      }
-    }
-    return result;
-  }
-
-  private int index(final int hash) {
-    return hash % bucketCount;
-  }
-
-  /** Case insensitive hash */
-  private static int hash(final String name) {
-    int h = 0;
-    for (int i = 0; i < name.length(); i++) {
-      char c = lowerCase(name, i);
-      h = 31 * h + c;
-    }
-    if (h > 0) {
-      return h;
-    } else if (h == Integer.MIN_VALUE) {
-      return Integer.MAX_VALUE;
-    } else {
-      return -h;
     }
-  }
 
-  /** Case insensitive equals * */
-  private static boolean equals(final String name1, final String name2) {
-    if (name1.length() != name2.length()) {
-      return false;
-    }
-    for (int i = 0; i < name1.length(); i++) {
-      char c1 = lowerCase(name1, i);
-      char c2 = lowerCase(name2, i);
-      if (c1 != c2) {
-        return false;
-      }
+    /** Case insensitive equals * */
+    private static boolean equals(final String name1, final String name2) {
+        if (name1.length() != name2.length()) {
+            return false;
+        }
+        for (int i = 0; i < name1.length(); i++) {
+            char c1 = lowerCase(name1, i);
+            char c2 = lowerCase(name2, i);
+            if (c1 != c2) {
+                return false;
+            }
+        }
+        return true;
     }
-    return true;
-  }
-
-  /** It works for our subset of headers */
-  private static char lowerCase(final String string, final int index) {
-    final char c = string.charAt(index);
-    if (c >= 'A' && c <= 'Z') {
-      return (char) (c + 32); // 'a' - 'A'
+
+    /** It works for our subset of headers */
+    private static char lowerCase(final String string, final int index) {
+        final char c = string.charAt(index);
+        if (c >= 'A' && c <= 'Z') {
+            return (char) (c + 32); // 'a' - 'A'
+        }
+        return c;
     }
-    return c;
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Iterators.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Iterators.java
index f7fcf595a16..ef82ee829e1 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Iterators.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Iterators.java
@@ -7,123 +7,123 @@
 
 public abstract class Iterators {
 
-  private static final Iterator<?> EMPTY =
-      new Iterator<Object>() {
+    private static final Iterator<?> EMPTY = new Iterator<Object>() {
         @Override
         public boolean hasNext() {
-          return false;
+            return false;
         }
 
         @Override
         public Object next() {
-          throw new NoSuchElementException();
+            throw new NoSuchElementException();
         }
-      };
+    };
 
-  private Iterators() {}
+    private Iterators() {}
 
-  @SuppressWarnings("unchecked")
-  public static <E> Iterator<E> empty() {
-    return (Iterator<E>) EMPTY;
-  }
+    @SuppressWarnings("unchecked")
+    public static <E> Iterator<E> empty() {
+        return (Iterator<E>) EMPTY;
+    }
 
-  @Nonnull
-  public static <E> Iterator<E> of(@Nonnull final E head, @Nullable final E[] tail) {
-    return new HeadedArrayIterator<>(head, tail);
-  }
+    @Nonnull
+    public static <E> Iterator<E> of(@Nonnull final E head, @Nullable final E[] tail) {
+        return new HeadedArrayIterator<>(head, tail);
+    }
 
-  @SuppressWarnings("unchecked")
-  @Nonnull
-  public static <E> Iterator<E> of(
-      final @org.jetbrains.annotations.Nullable E @org.jetbrains.annotations.Nullable ... items) {
-    return items == null || items.length == 0 ? empty() : new ArrayIterator<>(items);
-  }
+    @SuppressWarnings("unchecked")
+    @Nonnull
+    public static <E> Iterator<E> of(
+            final @org.jetbrains.annotations.Nullable E @org.jetbrains.annotations.Nullable ... items) {
+        return items == null || items.length == 0 ? empty() : new ArrayIterator<>(items);
+    }
 
-  @Nonnull
-  public static Iterator<?> join(
-      final Iterator<?> @org.jetbrains.annotations.Nullable ... iterators) {
-    return iterators == null || iterators.length == 0 ? empty() : new JoinIterator(iterators);
-  }
+    @Nonnull
+    public static Iterator<?> join(final Iterator<?> @org.jetbrains.annotations.Nullable ... iterators) {
+        return iterators == null || iterators.length == 0 ? empty() : new JoinIterator(iterators);
+    }
 
-  private static class HeadedArrayIterator<E> extends ArrayIterator<E> {
+    private static class HeadedArrayIterator<E> extends ArrayIterator<E> {
 
-    private static final Object[] EMPTY_TAIL = new Object[0];
+        private static final Object[] EMPTY_TAIL = new Object[0];
 
-    private boolean first;
+        private boolean first;
 
-    private final E head;
+        private final E head;
 
-    @SuppressWarnings("unchecked")
-    private HeadedArrayIterator(final E head, @Nullable final E[] tail) {
-      super(tail == null ? (E[]) EMPTY_TAIL : tail);
-      this.head = head;
-      this.first = true;
-    }
+        @SuppressWarnings("unchecked")
+        private HeadedArrayIterator(final E head, @Nullable final E[] tail) {
+            super(tail == null ? (E[]) EMPTY_TAIL : tail);
+            this.head = head;
+            this.first = true;
+        }
 
-    @Override
-    public boolean hasNext() {
-      return first || super.hasNext();
-    }
+        @Override
+        public boolean hasNext() {
+            return first || super.hasNext();
+        }
 
-    @Override
-    public E next() {
-      if (first) {
-        first = false;
-        return head;
-      }
-      return super.next();
+        @Override
+        public E next() {
+            if (first) {
+                first = false;
+                return head;
+            }
+            return super.next();
+        }
     }
-  }
 
-  private static class ArrayIterator<E> implements Iterator<E> {
-    private final E[] items;
-    private int index = 0;
+    private static class ArrayIterator<E> implements Iterator<E> {
+        private final E[] items;
+        private int index = 0;
 
-    private ArrayIterator(@Nonnull final E[] items) {
-      this.items = items;
-    }
+        private ArrayIterator(@Nonnull final E[] items) {
+            this.items = items;
+        }
 
-    @Override
-    public boolean hasNext() {
-      return index < items.length;
-    }
+        @Override
+        public boolean hasNext() {
+            return index < items.length;
+        }
 
-    @Override
-    public E next() {
-      if (index >= items.length) {
-        throw new NoSuchElementException();
-      }
-      return items[index++];
+        @Override
+        public E next() {
+            if (index >= items.length) {
+                throw new NoSuchElementException();
+            }
+            return items[index++];
+        }
     }
-  }
 
-  private static class JoinIterator implements Iterator<Object> {
-    private final Iterator<?>[] iterators;
-    private int index;
-    @Nullable private Iterator<?> current;
+    private static class JoinIterator implements Iterator<Object> {
+        private final Iterator<?>[] iterators;
+        private int index;
 
-    private JoinIterator(@Nonnull final Iterator<?>[] iterators) {
-      this.iterators = iterators;
-      current = iterators[0];
-      index = 0;
-    }
+        @Nullable
+        private Iterator<?> current;
 
-    @Override
-    public boolean hasNext() {
-      return current != null && current.hasNext();
-    }
+        private JoinIterator(@Nonnull final Iterator<?>[] iterators) {
+            this.iterators = iterators;
+            current = iterators[0];
+            index = 0;
+        }
+
+        @Override
+        public boolean hasNext() {
+            return current != null && current.hasNext();
+        }
 
-    @Override
-    public Object next() {
-      if (current == null || !current.hasNext()) {
-        throw new NoSuchElementException();
-      }
-      final Object result = current.next();
-      if (!current.hasNext()) {
-        index++;
-        current = index >= iterators.length ? null : iterators[index];
-      }
-      return result;
+        @Override
+        public Object next() {
+            if (current == null || !current.hasNext()) {
+                throw new NoSuchElementException();
+            }
+            final Object result = current.next();
+            if (!current.hasNext()) {
+                index++;
+                current = index >= iterators.length ? null : iterators[index];
+            }
+            return result;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/NonBlockingSemaphore.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/NonBlockingSemaphore.java
index ef6e529980a..32e4c2eac76 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/NonBlockingSemaphore.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/NonBlockingSemaphore.java
@@ -5,113 +5,113 @@
 
 public interface NonBlockingSemaphore {
 
-  default boolean acquire() {
-    return acquire(1);
-  }
-
-  boolean acquire(int count);
-
-  default int release() {
-    return release(1);
-  }
-
-  int release(int count);
+    default boolean acquire() {
+        return acquire(1);
+    }
 
-  int available();
+    boolean acquire(int count);
 
-  void reset();
+    default int release() {
+        return release(1);
+    }
 
-  static NonBlockingSemaphore unlimited() {
-    return new UnlimitedSemaphore();
-  }
+    int release(int count);
 
-  static NonBlockingSemaphore withPermitCount(final int permits) {
-    assert permits > 0;
-    return permits == 1 ? new AtomicBooleanSemaphore() : new AtomicIntegerSemaphore(permits);
-  }
+    int available();
 
-  class UnlimitedSemaphore implements NonBlockingSemaphore {
+    void reset();
 
-    @Override
-    public boolean acquire(final int count) {
-      return true;
+    static NonBlockingSemaphore unlimited() {
+        return new UnlimitedSemaphore();
     }
 
-    @Override
-    public int release(final int count) {
-      return Integer.MAX_VALUE;
+    static NonBlockingSemaphore withPermitCount(final int permits) {
+        assert permits > 0;
+        return permits == 1 ? new AtomicBooleanSemaphore() : new AtomicIntegerSemaphore(permits);
     }
 
-    @Override
-    public int available() {
-      return Integer.MAX_VALUE;
-    }
+    class UnlimitedSemaphore implements NonBlockingSemaphore {
 
-    @Override
-    public void reset() {}
-  }
+        @Override
+        public boolean acquire(final int count) {
+            return true;
+        }
 
-  class AtomicBooleanSemaphore implements NonBlockingSemaphore {
-    private final AtomicBoolean available = new AtomicBoolean();
+        @Override
+        public int release(final int count) {
+            return Integer.MAX_VALUE;
+        }
 
-    public AtomicBooleanSemaphore() {
-      reset();
-    }
+        @Override
+        public int available() {
+            return Integer.MAX_VALUE;
+        }
 
-    @Override
-    public boolean acquire(final int count) {
-      return count == 1 && available.compareAndSet(true, false);
+        @Override
+        public void reset() {}
     }
 
-    @Override
-    public int release(final int count) {
-      reset();
-      return 1;
+    class AtomicBooleanSemaphore implements NonBlockingSemaphore {
+        private final AtomicBoolean available = new AtomicBoolean();
+
+        public AtomicBooleanSemaphore() {
+            reset();
+        }
+
+        @Override
+        public boolean acquire(final int count) {
+            return count == 1 && available.compareAndSet(true, false);
+        }
+
+        @Override
+        public int release(final int count) {
+            reset();
+            return 1;
+        }
+
+        @Override
+        public final void reset() {
+            this.available.set(true);
+        }
+
+        @Override
+        public int available() {
+            return this.available.get() ? 1 : 0;
+        }
     }
 
-    @Override
-    public final void reset() {
-      this.available.set(true);
-    }
+    class AtomicIntegerSemaphore implements NonBlockingSemaphore {
 
-    @Override
-    public int available() {
-      return this.available.get() ? 1 : 0;
-    }
-  }
-
-  class AtomicIntegerSemaphore implements NonBlockingSemaphore {
+        private final int permits;
 
-    private final int permits;
+        private final AtomicInteger available = new AtomicInteger();
 
-    private final AtomicInteger available = new AtomicInteger();
+        public AtomicIntegerSemaphore(final int permits) {
+            this.permits = permits;
+            reset();
+        }
 
-    public AtomicIntegerSemaphore(final int permits) {
-      this.permits = permits;
-      reset();
-    }
+        @Override
+        public boolean acquire(final int count) {
+            if (available.get() == 0) {
+                return false;
+            }
+            return available.getAndUpdate(x -> x >= count ? x - count : x) >= count;
+        }
 
-    @Override
-    public boolean acquire(final int count) {
-      if (available.get() == 0) {
-        return false;
-      }
-      return available.getAndUpdate(x -> x >= count ? x - count : x) >= count;
-    }
+        @Override
+        public int release(final int count) {
+            return available.updateAndGet(x -> (x + count) <= permits ? x + count : x);
+        }
 
-    @Override
-    public int release(final int count) {
-      return available.updateAndGet(x -> (x + count) <= permits ? x + count : x);
-    }
-
-    @Override
-    public final void reset() {
-      this.available.set(permits);
-    }
+        @Override
+        public final void reset() {
+            this.available.set(permits);
+        }
 
-    @Override
-    public int available() {
-      return this.available.get();
+        @Override
+        public int available() {
+            return this.available.get();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/ObjectVisitor.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/ObjectVisitor.java
index 66cc4073ef3..d5f323b5dfb 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/ObjectVisitor.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/ObjectVisitor.java
@@ -20,214 +20,213 @@
 
 public class ObjectVisitor {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ObjectVisitor.class);
-  private static final int MAX_VISITED_OBJECTS = 1000;
-  private static final int MAX_DEPTH = 10;
-  @Nullable private static final Method TRY_SET_ACCESSIBLE;
-
-  static {
-    TRY_SET_ACCESSIBLE = fetchTrySetAccessibleMethod();
-  }
-
-  public static void visit(
-      @Nonnull final Object object,
-      @Nonnull final Visitor visitor,
-      @Nonnull final Predicate<Class<?>> classFilter) {
-    visit(object, visitor, classFilter, MAX_DEPTH, MAX_VISITED_OBJECTS);
-  }
-
-  public static void visit(
-      @Nonnull final Object object,
-      @Nonnull final Visitor visitor,
-      @Nonnull final Predicate<Class<?>> classFilter,
-      final int maxDepth,
-      final int maxObjects) {
-    new ObjectVisitor(classFilter, maxDepth, maxObjects, visitor).visit(0, "root", object);
-  }
-
-  private int remaining;
-  private final int maxDepth;
-  private final Set<Object> visited;
-  private final Visitor visitor;
-  private final Predicate<Class<?>> classFilter;
-
-  private ObjectVisitor(
-      final Predicate<Class<?>> classFilter,
-      final int maxDepth,
-      final int maxObjects,
-      final Visitor visitor) {
-    this.maxDepth = maxDepth;
-    this.remaining = maxObjects;
-    this.visited = Collections.newSetFromMap(new IdentityHashMap<>());
-    this.visitor = visitor;
-    this.classFilter = classFilter;
-  }
-
-  private State visit(final int depth, final String path, final Object value) {
-    if (remaining <= 0) {
-      return EXIT;
-    }
-    remaining--;
-    if (depth > maxDepth) {
-      return CONTINUE;
-    }
-    if (!visited.add(value)) {
-      return CONTINUE;
-    }
-    State state = CONTINUE;
-    try {
-      if (value instanceof Object[]) {
-        state = visitArray(depth, path, (Object[]) value);
-      } else if (value instanceof Map) {
-        state = visitMap(depth, path, (Map<?, ?>) value);
-      } else if (value instanceof Iterable) {
-        state = visitIterable(depth, path, (Iterable<?>) value);
-      } else {
-        state = visitObject(depth, path, value);
-      }
-    } catch (final Throwable e) {
-      LOGGER.debug("Failed to visit object of type {}", value.getClass(), e);
-    }
-    return state;
-  }
-
-  private State visitArray(final int depth, final String path, final Object[] array) {
-    final int arrayDepth = depth + 1;
-    for (int i = 0; i < array.length; i++) {
-      final Object item = array[i];
-      if (item != null) {
-        final String itemPath = path + "[" + i + "]";
-        final State state = visit(arrayDepth, itemPath, item);
-        if (state != CONTINUE) {
-          return state;
-        }
-      }
-    }
-    return CONTINUE;
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(ObjectVisitor.class);
+    private static final int MAX_VISITED_OBJECTS = 1000;
+    private static final int MAX_DEPTH = 10;
 
-  private State visitMap(final int depth, final String path, final Map<?, ?> map) {
-    if (!classFilter.test(map.getClass())) {
-      return CONTINUE;
-    }
-    final int mapDepth = depth + 1;
-    for (final Map.Entry<?, ?> entry : map.entrySet()) {
-      final Object key = entry.getKey();
-      if (key != null) {
-        final String keyPath = path + "[]";
-        final ObjectVisitor.State state = visit(mapDepth, keyPath, key);
-        if (state != CONTINUE) {
-          return state;
-        }
-      }
-      final Object item = entry.getValue();
-      if (item != null) {
-        final String itemPath = path + "[" + key + "]";
-        final State state = visit(mapDepth, itemPath, item);
-        if (state != CONTINUE) {
-          return state;
-        }
-      }
+    @Nullable
+    private static final Method TRY_SET_ACCESSIBLE;
+
+    static {
+        TRY_SET_ACCESSIBLE = fetchTrySetAccessibleMethod();
     }
-    return CONTINUE;
-  }
 
-  private State visitIterable(final int depth, final String path, final Iterable<?> iterable) {
-    if (!classFilter.test(iterable.getClass())) {
-      return CONTINUE;
+    public static void visit(
+            @Nonnull final Object object,
+            @Nonnull final Visitor visitor,
+            @Nonnull final Predicate<Class<?>> classFilter) {
+        visit(object, visitor, classFilter, MAX_DEPTH, MAX_VISITED_OBJECTS);
     }
-    final int iterableDepth = depth + 1;
-    int index = 0;
-    for (final Object item : iterable) {
-      if (item != null) {
-        final String itemPath = path + "[" + (index++) + "]";
-        final State state = visit(iterableDepth, itemPath, item);
-        if (state != CONTINUE) {
-          return state;
-        }
-      }
+
+    public static void visit(
+            @Nonnull final Object object,
+            @Nonnull final Visitor visitor,
+            @Nonnull final Predicate<Class<?>> classFilter,
+            final int maxDepth,
+            final int maxObjects) {
+        new ObjectVisitor(classFilter, maxDepth, maxObjects, visitor).visit(0, "root", object);
     }
-    return CONTINUE;
-  }
-
-  private State visitObject(final int depth, final String path, final Object value) {
-    final int childDepth = depth + 1;
-    State state = visitor.visit(path, value);
-    if (state != State.CONTINUE || !classFilter.test(value.getClass())) {
-      return state;
+
+    private int remaining;
+    private final int maxDepth;
+    private final Set<Object> visited;
+    private final Visitor visitor;
+    private final Predicate<Class<?>> classFilter;
+
+    private ObjectVisitor(
+            final Predicate<Class<?>> classFilter, final int maxDepth, final int maxObjects, final Visitor visitor) {
+        this.maxDepth = maxDepth;
+        this.remaining = maxObjects;
+        this.visited = Collections.newSetFromMap(new IdentityHashMap<>());
+        this.visitor = visitor;
+        this.classFilter = classFilter;
     }
-    Class<?> klass = value.getClass();
-    while (klass != Object.class) {
-      for (final Field field : klass.getDeclaredFields()) {
+
+    private State visit(final int depth, final String path, final Object value) {
+        if (remaining <= 0) {
+            return EXIT;
+        }
+        remaining--;
+        if (depth > maxDepth) {
+            return CONTINUE;
+        }
+        if (!visited.add(value)) {
+            return CONTINUE;
+        }
+        State state = CONTINUE;
         try {
-          if (inspectField(field) && trySetAccessible(field)) {
-            final Object fieldValue = field.get(value);
-            if (fieldValue != null) {
-              final String fieldPath = path + "." + field.getName();
-              state = visit(childDepth, fieldPath, fieldValue);
-              if (state != CONTINUE) {
-                return state;
-              }
+            if (value instanceof Object[]) {
+                state = visitArray(depth, path, (Object[]) value);
+            } else if (value instanceof Map) {
+                state = visitMap(depth, path, (Map<?, ?>) value);
+            } else if (value instanceof Iterable) {
+                state = visitIterable(depth, path, (Iterable<?>) value);
+            } else {
+                state = visitObject(depth, path, value);
             }
-          }
         } catch (final Throwable e) {
-          LOGGER.debug("Unable to get field {}", field, e);
+            LOGGER.debug("Failed to visit object of type {}", value.getClass(), e);
+        }
+        return state;
+    }
+
+    private State visitArray(final int depth, final String path, final Object[] array) {
+        final int arrayDepth = depth + 1;
+        for (int i = 0; i < array.length; i++) {
+            final Object item = array[i];
+            if (item != null) {
+                final String itemPath = path + "[" + i + "]";
+                final State state = visit(arrayDepth, itemPath, item);
+                if (state != CONTINUE) {
+                    return state;
+                }
+            }
+        }
+        return CONTINUE;
+    }
+
+    private State visitMap(final int depth, final String path, final Map<?, ?> map) {
+        if (!classFilter.test(map.getClass())) {
+            return CONTINUE;
+        }
+        final int mapDepth = depth + 1;
+        for (final Map.Entry<?, ?> entry : map.entrySet()) {
+            final Object key = entry.getKey();
+            if (key != null) {
+                final String keyPath = path + "[]";
+                final ObjectVisitor.State state = visit(mapDepth, keyPath, key);
+                if (state != CONTINUE) {
+                    return state;
+                }
+            }
+            final Object item = entry.getValue();
+            if (item != null) {
+                final String itemPath = path + "[" + key + "]";
+                final State state = visit(mapDepth, itemPath, item);
+                if (state != CONTINUE) {
+                    return state;
+                }
+            }
         }
-      }
-      klass = klass.getSuperclass();
+        return CONTINUE;
     }
-    return ObjectVisitor.State.CONTINUE;
-  }
 
-  private static boolean inspectField(final Field field) {
-    final int modifiers = field.getModifiers();
-    if (Modifier.isStatic(modifiers)) {
-      return false;
+    private State visitIterable(final int depth, final String path, final Iterable<?> iterable) {
+        if (!classFilter.test(iterable.getClass())) {
+            return CONTINUE;
+        }
+        final int iterableDepth = depth + 1;
+        int index = 0;
+        for (final Object item : iterable) {
+            if (item != null) {
+                final String itemPath = path + "[" + (index++) + "]";
+                final State state = visit(iterableDepth, itemPath, item);
+                if (state != CONTINUE) {
+                    return state;
+                }
+            }
+        }
+        return CONTINUE;
     }
-    final String fieldName = field.getName();
-    if ("this$0".equals(fieldName)) {
-      return false; // skip back references from inner class
+
+    private State visitObject(final int depth, final String path, final Object value) {
+        final int childDepth = depth + 1;
+        State state = visitor.visit(path, value);
+        if (state != State.CONTINUE || !classFilter.test(value.getClass())) {
+            return state;
+        }
+        Class<?> klass = value.getClass();
+        while (klass != Object.class) {
+            for (final Field field : klass.getDeclaredFields()) {
+                try {
+                    if (inspectField(field) && trySetAccessible(field)) {
+                        final Object fieldValue = field.get(value);
+                        if (fieldValue != null) {
+                            final String fieldPath = path + "." + field.getName();
+                            state = visit(childDepth, fieldPath, fieldValue);
+                            if (state != CONTINUE) {
+                                return state;
+                            }
+                        }
+                    }
+                } catch (final Throwable e) {
+                    LOGGER.debug("Unable to get field {}", field, e);
+                }
+            }
+            klass = klass.getSuperclass();
+        }
+        return ObjectVisitor.State.CONTINUE;
     }
-    final Class<?> fieldType = field.getType();
-    if ("groovy.lang.MetaClass".equals(fieldType.getName())) {
-      return false; // skip the whole groovy MOP
+
+    private static boolean inspectField(final Field field) {
+        final int modifiers = field.getModifiers();
+        if (Modifier.isStatic(modifiers)) {
+            return false;
+        }
+        final String fieldName = field.getName();
+        if ("this$0".equals(fieldName)) {
+            return false; // skip back references from inner class
+        }
+        final Class<?> fieldType = field.getType();
+        if ("groovy.lang.MetaClass".equals(fieldType.getName())) {
+            return false; // skip the whole groovy MOP
+        }
+        return true;
     }
-    return true;
-  }
-
-  @Nullable
-  private static Method fetchTrySetAccessibleMethod() {
-    Method method = null;
-    if (JavaVirtualMachine.isJavaVersionAtLeast(9)) {
-      try {
-        method = Field.class.getMethod("trySetAccessible");
-      } catch (NoSuchMethodException e) {
-        LOGGER.warn("Can't get method 'Field.trySetAccessible'", e);
-      }
+
+    @Nullable
+    private static Method fetchTrySetAccessibleMethod() {
+        Method method = null;
+        if (JavaVirtualMachine.isJavaVersionAtLeast(9)) {
+            try {
+                method = Field.class.getMethod("trySetAccessible");
+            } catch (NoSuchMethodException e) {
+                LOGGER.warn("Can't get method 'Field.trySetAccessible'", e);
+            }
+        }
+        return method;
     }
-    return method;
-  }
-
-  private static boolean trySetAccessible(final Field field) {
-    try {
-      if (TRY_SET_ACCESSIBLE != null) {
-        return (boolean) TRY_SET_ACCESSIBLE.invoke(field);
-      }
-      field.setAccessible(true);
-      return true;
-    } catch (RuntimeException | IllegalAccessException | InvocationTargetException e) {
-      LOGGER.debug("Unable to make field accessible", e);
-      return false;
+
+    private static boolean trySetAccessible(final Field field) {
+        try {
+            if (TRY_SET_ACCESSIBLE != null) {
+                return (boolean) TRY_SET_ACCESSIBLE.invoke(field);
+            }
+            field.setAccessible(true);
+            return true;
+        } catch (RuntimeException | IllegalAccessException | InvocationTargetException e) {
+            LOGGER.debug("Unable to make field accessible", e);
+            return false;
+        }
     }
-  }
 
-  public interface Visitor {
-    @Nonnull
-    State visit(@Nonnull String path, @Nonnull Object value);
-  }
+    public interface Visitor {
+        @Nonnull
+        State visit(@Nonnull String path, @Nonnull Object value);
+    }
 
-  public enum State {
-    CONTINUE,
-    EXIT
-  }
+    public enum State {
+        CONTINUE,
+        EXIT
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/RangeBuilder.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/RangeBuilder.java
index 52fdcae97db..5ae45179ab7 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/RangeBuilder.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/RangeBuilder.java
@@ -22,235 +22,242 @@
  */
 public class RangeBuilder {
 
-  private final int maxSize;
-  private final int arrayChunkSize;
-  private int size;
-  @Nullable protected Entry head;
-  @Nullable protected Entry tail;
-
-  public RangeBuilder() {
-    this(TaintedObject.MAX_RANGE_COUNT);
-  }
-
-  public RangeBuilder(final int maxSize) {
-    this(
-        maxSize,
-        Math.min(ConfigDefaults.DEFAULT_IAST_MAX_RANGE_COUNT, Config.get().getIastMaxRangeCount()));
-  }
-
-  public RangeBuilder(final int maxSize, final int arrayChunkSize) {
-    this.maxSize = maxSize;
-    this.arrayChunkSize = arrayChunkSize;
-    this.head = null;
-    this.tail = null;
-    this.size = 0;
-  }
-
-  public boolean add(final Range range) {
-    return add(range, 0);
-  }
-
-  public boolean add(final Range range, final int offset) {
-    if (size >= maxSize) {
-      return false;
-    }
-    if (head == null) {
-      addNewEntry(new SingleEntry(range.shift(offset)));
-    } else {
-      final ArrayEntry entry;
-      if (tail instanceof ArrayEntry && tail.size() < arrayChunkSize) {
-        entry = (ArrayEntry) tail;
-      } else {
-        entry = new ArrayEntry(arrayChunkSize);
-        addNewEntry(entry);
-      }
-      entry.add(range.shift(offset));
-    }
-    size += 1;
-    return true;
-  }
+    private final int maxSize;
+    private final int arrayChunkSize;
+    private int size;
 
-  public boolean add(final Range[] ranges) {
-    return add(ranges, 0);
-  }
+    @Nullable
+    protected Entry head;
 
-  public boolean add(final Range[] ranges, final int offset) {
-    if (size >= maxSize) {
-      return false;
-    }
-    if (ranges.length == 0) {
-      return true;
-    }
-    if (ranges.length == 1) {
-      return add(ranges[0], offset);
-    }
+    @Nullable
+    protected Entry tail;
 
-    if (tail instanceof ArrayEntry && ranges.length <= (arrayChunkSize - tail.size())) {
-      // compact intermediate ranges
-      final ArrayEntry entry = (ArrayEntry) tail;
-      for (Range range : ranges) {
-        entry.add(range.shift(offset));
-      }
-      size += ranges.length;
-      return true;
+    public RangeBuilder() {
+        this(TaintedObject.MAX_RANGE_COUNT);
     }
 
-    // we might go over the max but, it's OK (better not to generate a new array)
-    final FixedArrayEntry entry = new FixedArrayEntry(ranges, offset);
-    addNewEntry(entry);
-    size += entry.size();
-    return true;
-  }
-
-  public Range[] toArray() {
-    if (head == null) {
-      return Ranges.EMPTY;
-    }
-    if (size == head.size()) {
-      return head.toArray();
-    }
-    final Range[] result = new Range[Math.min(maxSize, size)];
-    int offset = 0;
-    Entry entry = head;
-    while (entry != null && offset < result.length) {
-      offset += entry.arrayCopy(result, offset);
-      entry = entry.next;
-    }
-    return result;
-  }
-
-  public boolean isFull() {
-    return size >= maxSize;
-  }
-
-  public boolean isEmpty() {
-    return size == 0;
-  }
-
-  public int size() {
-    return size;
-  }
-
-  protected void addNewEntry(final Entry entry) {
-    if (head == null || tail == null) {
-      head = entry;
-    } else {
-      tail.next = entry;
+    public RangeBuilder(final int maxSize) {
+        this(
+                maxSize,
+                Math.min(
+                        ConfigDefaults.DEFAULT_IAST_MAX_RANGE_COUNT,
+                        Config.get().getIastMaxRangeCount()));
     }
-    tail = entry;
-  }
 
-  protected abstract static class Entry {
-    @Nullable protected Entry next;
-
-    protected abstract int size();
-
-    protected abstract Range[] toArray();
-
-    protected abstract int arrayCopy(Range[] result, int start);
-  }
-
-  /** Optimized case for single range scenarios */
-  protected static class SingleEntry extends Entry {
-    protected final Range range;
-
-    protected SingleEntry(Range range) {
-      this.range = range;
+    public RangeBuilder(final int maxSize, final int arrayChunkSize) {
+        this.maxSize = maxSize;
+        this.arrayChunkSize = arrayChunkSize;
+        this.head = null;
+        this.tail = null;
+        this.size = 0;
     }
 
-    @Override
-    protected int size() {
-      return 1;
+    public boolean add(final Range range) {
+        return add(range, 0);
     }
 
-    @Override
-    protected Range[] toArray() {
-      return new Range[] {range};
+    public boolean add(final Range range, final int offset) {
+        if (size >= maxSize) {
+            return false;
+        }
+        if (head == null) {
+            addNewEntry(new SingleEntry(range.shift(offset)));
+        } else {
+            final ArrayEntry entry;
+            if (tail instanceof ArrayEntry && tail.size() < arrayChunkSize) {
+                entry = (ArrayEntry) tail;
+            } else {
+                entry = new ArrayEntry(arrayChunkSize);
+                addNewEntry(entry);
+            }
+            entry.add(range.shift(offset));
+        }
+        size += 1;
+        return true;
     }
 
-    @Override
-    protected int arrayCopy(final Range[] result, final int start) {
-      if (start < 0 || start >= result.length) {
-        return 0;
-      }
-      result[start] = range;
-      return 1;
+    public boolean add(final Range[] ranges) {
+        return add(ranges, 0);
     }
-  }
 
-  /** Array buffer of entries */
-  protected static class ArrayEntry extends Entry {
-    protected final Range[] ranges;
-    protected int size;
+    public boolean add(final Range[] ranges, final int offset) {
+        if (size >= maxSize) {
+            return false;
+        }
+        if (ranges.length == 0) {
+            return true;
+        }
+        if (ranges.length == 1) {
+            return add(ranges[0], offset);
+        }
+
+        if (tail instanceof ArrayEntry && ranges.length <= (arrayChunkSize - tail.size())) {
+            // compact intermediate ranges
+            final ArrayEntry entry = (ArrayEntry) tail;
+            for (Range range : ranges) {
+                entry.add(range.shift(offset));
+            }
+            size += ranges.length;
+            return true;
+        }
+
+        // we might go over the max but, it's OK (better not to generate a new array)
+        final FixedArrayEntry entry = new FixedArrayEntry(ranges, offset);
+        addNewEntry(entry);
+        size += entry.size();
+        return true;
+    }
 
-    protected ArrayEntry(final int size) {
-      this.ranges = new Range[size];
-      this.size = 0;
+    public Range[] toArray() {
+        if (head == null) {
+            return Ranges.EMPTY;
+        }
+        if (size == head.size()) {
+            return head.toArray();
+        }
+        final Range[] result = new Range[Math.min(maxSize, size)];
+        int offset = 0;
+        Entry entry = head;
+        while (entry != null && offset < result.length) {
+            offset += entry.arrayCopy(result, offset);
+            entry = entry.next;
+        }
+        return result;
     }
 
-    protected void add(final Range range) {
-      ranges[size++] = range;
+    public boolean isFull() {
+        return size >= maxSize;
     }
 
-    @Override
-    protected int size() {
-      return size;
+    public boolean isEmpty() {
+        return size == 0;
     }
 
-    @Override
-    protected Range[] toArray() {
-      if (size == ranges.length) {
-        return ranges;
-      }
-      final Range[] result = new Range[size];
-      arrayCopy(result, 0);
-      return result;
+    public int size() {
+        return size;
     }
 
-    @Override
-    protected int arrayCopy(final Range[] result, final int start) {
-      final int length = Math.min(size, result.length - start);
-      if (start < 0 || length <= 0) {
-        return 0;
-      }
-      System.arraycopy(ranges, 0, result, start, length);
-      return length;
+    protected void addNewEntry(final Entry entry) {
+        if (head == null || tail == null) {
+            head = entry;
+        } else {
+            tail.next = entry;
+        }
+        tail = entry;
     }
-  }
 
-  /** Fixed size array with an offset */
-  protected static class FixedArrayEntry extends Entry {
-    protected final Range[] ranges;
-    protected final int offset;
+    protected abstract static class Entry {
+        @Nullable
+        protected Entry next;
+
+        protected abstract int size();
+
+        protected abstract Range[] toArray();
 
-    protected FixedArrayEntry(final Range[] ranges, final int offset) {
-      this.ranges = ranges;
-      this.offset = offset;
+        protected abstract int arrayCopy(Range[] result, int start);
     }
 
-    @Override
-    protected int size() {
-      return ranges.length;
+    /** Optimized case for single range scenarios */
+    protected static class SingleEntry extends Entry {
+        protected final Range range;
+
+        protected SingleEntry(Range range) {
+            this.range = range;
+        }
+
+        @Override
+        protected int size() {
+            return 1;
+        }
+
+        @Override
+        protected Range[] toArray() {
+            return new Range[] {range};
+        }
+
+        @Override
+        protected int arrayCopy(final Range[] result, final int start) {
+            if (start < 0 || start >= result.length) {
+                return 0;
+            }
+            result[start] = range;
+            return 1;
+        }
     }
 
-    @Override
-    protected Range[] toArray() {
-      if (offset == 0) {
-        return ranges;
-      }
-      final Range[] result = new Range[ranges.length];
-      arrayCopy(result, 0);
-      return result;
+    /** Array buffer of entries */
+    protected static class ArrayEntry extends Entry {
+        protected final Range[] ranges;
+        protected int size;
+
+        protected ArrayEntry(final int size) {
+            this.ranges = new Range[size];
+            this.size = 0;
+        }
+
+        protected void add(final Range range) {
+            ranges[size++] = range;
+        }
+
+        @Override
+        protected int size() {
+            return size;
+        }
+
+        @Override
+        protected Range[] toArray() {
+            if (size == ranges.length) {
+                return ranges;
+            }
+            final Range[] result = new Range[size];
+            arrayCopy(result, 0);
+            return result;
+        }
+
+        @Override
+        protected int arrayCopy(final Range[] result, final int start) {
+            final int length = Math.min(size, result.length - start);
+            if (start < 0 || length <= 0) {
+                return 0;
+            }
+            System.arraycopy(ranges, 0, result, start, length);
+            return length;
+        }
     }
 
-    @Override
-    protected int arrayCopy(final Range[] result, final int start) {
-      final int length = Math.min(result.length - start, ranges.length);
-      if (start < 0 || length <= 0) {
-        return 0;
-      }
-      Ranges.copyShift(ranges, result, start, offset, length);
-      return length;
+    /** Fixed size array with an offset */
+    protected static class FixedArrayEntry extends Entry {
+        protected final Range[] ranges;
+        protected final int offset;
+
+        protected FixedArrayEntry(final Range[] ranges, final int offset) {
+            this.ranges = ranges;
+            this.offset = offset;
+        }
+
+        @Override
+        protected int size() {
+            return ranges.length;
+        }
+
+        @Override
+        protected Range[] toArray() {
+            if (offset == 0) {
+                return ranges;
+            }
+            final Range[] result = new Range[ranges.length];
+            arrayCopy(result, 0);
+            return result;
+        }
+
+        @Override
+        protected int arrayCopy(final Range[] result, final int start) {
+            final int length = Math.min(result.length - start, ranges.length);
+            if (start < 0 || length <= 0) {
+                return 0;
+            }
+            Ranges.copyShift(ranges, result, start, offset, length);
+            return length;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Ranged.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Ranged.java
index 645fb58cfdc..f1d704e6630 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Ranged.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Ranged.java
@@ -9,115 +9,113 @@
 
 public interface Ranged {
 
-  int getStart();
+    int getStart();
 
-  int getLength();
+    int getLength();
 
-  /**
-   * Checks if the two ranges have values in common
-   *
-   * @param range range to check for common values
-   * @return {@code true} if {@code this} has common values with the range
-   */
-  default boolean intersects(final Ranged range) {
-    return range.getStart() < (getStart() + getLength())
-        && (range.getStart() + range.getLength() > getStart());
-  }
-
-  /**
-   * Checks if the range fully contains the range passed as parameter
-   *
-   * @param range range to check if it fully contains
-   * @return {@code} if {@code this} is fully contained in the range
-   */
-  default boolean contains(final Ranged range) {
-    if (getStart() > range.getStart()) {
-      return false;
+    /**
+     * Checks if the two ranges have values in common
+     *
+     * @param range range to check for common values
+     * @return {@code true} if {@code this} has common values with the range
+     */
+    default boolean intersects(final Ranged range) {
+        return range.getStart() < (getStart() + getLength()) && (range.getStart() + range.getLength() > getStart());
     }
-    return (getStart() + getLength()) >= (range.getStart() + range.getLength());
-  }
 
-  /**
-   * Removes the values from the range
-   *
-   * @param range range whose values are to be removed
-   * @return list with the ranges present in {@code this} but not in the range
-   */
-  default List<Ranged> remove(final Ranged range) {
-    if (!intersects(range)) {
-      return singletonList(this);
-    } else if (range.contains(this)) {
-      return emptyList();
-    } else {
-      final List<Ranged> result = new ArrayList<>(3);
-      if (range.getStart() > getStart()) {
-        result.add(build(getStart(), range.getStart() - getStart()));
-      }
-      int end = getStart() + getLength();
-      int rangeEnd = range.getStart() + range.getLength();
-      if (rangeEnd < end) {
-        result.add(build(rangeEnd, (end - rangeEnd)));
-      }
-      return result;
+    /**
+     * Checks if the range fully contains the range passed as parameter
+     *
+     * @param range range to check if it fully contains
+     * @return {@code} if {@code this} is fully contained in the range
+     */
+    default boolean contains(final Ranged range) {
+        if (getStart() > range.getStart()) {
+            return false;
+        }
+        return (getStart() + getLength()) >= (range.getStart() + range.getLength());
     }
-  }
 
-  /** Computes the intersection of the ranges or {@code null} if they do not intersect */
-  @Nullable
-  default Ranged intersection(final Ranged range) {
-    if (this.getStart() == range.getStart() && this.getLength() == range.getLength()) {
-      return this;
-    }
-    final Ranged lead, trail;
-    if (getStart() < range.getStart()) {
-      lead = this;
-      trail = range;
-    } else {
-      lead = range;
-      trail = this;
+    /**
+     * Removes the values from the range
+     *
+     * @param range range whose values are to be removed
+     * @return list with the ranges present in {@code this} but not in the range
+     */
+    default List<Ranged> remove(final Ranged range) {
+        if (!intersects(range)) {
+            return singletonList(this);
+        } else if (range.contains(this)) {
+            return emptyList();
+        } else {
+            final List<Ranged> result = new ArrayList<>(3);
+            if (range.getStart() > getStart()) {
+                result.add(build(getStart(), range.getStart() - getStart()));
+            }
+            int end = getStart() + getLength();
+            int rangeEnd = range.getStart() + range.getLength();
+            if (rangeEnd < end) {
+                result.add(build(rangeEnd, (end - rangeEnd)));
+            }
+            return result;
+        }
     }
-    final int start = Math.max(lead.getStart(), trail.getStart());
-    final int end =
-        Math.min(lead.getStart() + lead.getLength(), trail.getStart() + trail.getLength());
-    if (start >= end) {
-      return null;
-    } else {
-      return build(start, end - start);
-    }
-  }
 
-  default boolean isBefore(@Nullable final Ranged range) {
-    if (range == null) {
-      return true;
+    /** Computes the intersection of the ranges or {@code null} if they do not intersect */
+    @Nullable
+    default Ranged intersection(final Ranged range) {
+        if (this.getStart() == range.getStart() && this.getLength() == range.getLength()) {
+            return this;
+        }
+        final Ranged lead, trail;
+        if (getStart() < range.getStart()) {
+            lead = this;
+            trail = range;
+        } else {
+            lead = range;
+            trail = this;
+        }
+        final int start = Math.max(lead.getStart(), trail.getStart());
+        final int end = Math.min(lead.getStart() + lead.getLength(), trail.getStart() + trail.getLength());
+        if (start >= end) {
+            return null;
+        } else {
+            return build(start, end - start);
+        }
     }
-    final int offset = getStart() - range.getStart();
-    if (offset == 0) {
-      return getLength() <= range.getLength(); // put smaller ranges first
+
+    default boolean isBefore(@Nullable final Ranged range) {
+        if (range == null) {
+            return true;
+        }
+        final int offset = getStart() - range.getStart();
+        if (offset == 0) {
+            return getLength() <= range.getLength(); // put smaller ranges first
+        }
+        return offset < 0;
     }
-    return offset < 0;
-  }
 
-  static Ranged build(int start, int length) {
-    return new RangedImpl(start, length);
-  }
+    static Ranged build(int start, int length) {
+        return new RangedImpl(start, length);
+    }
 
-  class RangedImpl implements Ranged {
-    private final int start;
-    private final int length;
+    class RangedImpl implements Ranged {
+        private final int start;
+        private final int length;
 
-    public RangedImpl(final int start, final int length) {
-      this.start = start;
-      this.length = length;
-    }
+        public RangedImpl(final int start, final int length) {
+            this.start = start;
+            this.length = length;
+        }
 
-    @Override
-    public int getStart() {
-      return start;
-    }
+        @Override
+        public int getStart() {
+            return start;
+        }
 
-    @Override
-    public int getLength() {
-      return length;
+        @Override
+        public int getLength() {
+            return length;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/RangedDeque.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/RangedDeque.java
index 4e66a2bf5a1..4330fe5ef4c 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/RangedDeque.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/RangedDeque.java
@@ -9,108 +9,107 @@
 /** */
 public interface RangedDeque<E extends Ranged> {
 
-  @Nullable
-  E poll();
-
-  @Nullable
-  E peek();
-
-  void addFirst(@Nonnull E item);
-
-  boolean isEmpty();
-
-  static RangedDeque<Ranged> forTokenizer(@Nonnull final Tokenizer tokenizer) {
-    return new TokenizerQueue(tokenizer);
-  }
-
-  static <E extends Ranged> RangedDeque<E> forArray(@Nullable final E[] array) {
-    return array == null || array.length == 0
-        ? new EmptyRangedDequeue<>()
-        : new ArrayQueue<>(array);
-  }
-
-  abstract class BaseRangedDequeue<E extends Ranged> implements RangedDeque<E> {
-
-    private final Deque<E> head = new LinkedList<>();
-
-    @Nullable protected E next;
-
     @Nullable
-    @Override
-    public final E poll() {
-      final E result = next;
-      next = fetchNext();
-      return result;
-    }
+    E poll();
 
     @Nullable
-    @Override
-    public final E peek() {
-      return next;
-    }
+    E peek();
 
-    @Override
-    public final void addFirst(@Nonnull final E item) {
-      if (next != null) {
-        head.addFirst(next);
-      }
-      next = item;
-    }
+    void addFirst(@Nonnull E item);
+
+    boolean isEmpty();
 
-    @Override
-    public final boolean isEmpty() {
-      return next == null;
+    static RangedDeque<Ranged> forTokenizer(@Nonnull final Tokenizer tokenizer) {
+        return new TokenizerQueue(tokenizer);
     }
 
-    @Nullable
-    protected final E fetchNext() {
-      return head.isEmpty() ? internalPoll() : head.poll();
+    static <E extends Ranged> RangedDeque<E> forArray(@Nullable final E[] array) {
+        return array == null || array.length == 0 ? new EmptyRangedDequeue<>() : new ArrayQueue<>(array);
     }
 
-    @Nullable
-    protected abstract E internalPoll();
-  }
+    abstract class BaseRangedDequeue<E extends Ranged> implements RangedDeque<E> {
+
+        private final Deque<E> head = new LinkedList<>();
+
+        @Nullable
+        protected E next;
+
+        @Nullable
+        @Override
+        public final E poll() {
+            final E result = next;
+            next = fetchNext();
+            return result;
+        }
+
+        @Nullable
+        @Override
+        public final E peek() {
+            return next;
+        }
+
+        @Override
+        public final void addFirst(@Nonnull final E item) {
+            if (next != null) {
+                head.addFirst(next);
+            }
+            next = item;
+        }
+
+        @Override
+        public final boolean isEmpty() {
+            return next == null;
+        }
+
+        @Nullable
+        protected final E fetchNext() {
+            return head.isEmpty() ? internalPoll() : head.poll();
+        }
+
+        @Nullable
+        protected abstract E internalPoll();
+    }
 
-  class EmptyRangedDequeue<E extends Ranged> extends BaseRangedDequeue<E> {
+    class EmptyRangedDequeue<E extends Ranged> extends BaseRangedDequeue<E> {
 
-    @Nullable
-    @Override
-    protected E internalPoll() {
-      return null;
+        @Nullable
+        @Override
+        protected E internalPoll() {
+            return null;
+        }
     }
-  }
 
-  class TokenizerQueue extends BaseRangedDequeue<Ranged> {
+    class TokenizerQueue extends BaseRangedDequeue<Ranged> {
 
-    private final Tokenizer tokenizer;
+        private final Tokenizer tokenizer;
 
-    TokenizerQueue(final Tokenizer tokenizer) {
-      this.tokenizer = tokenizer;
-      next = fetchNext();
-    }
+        TokenizerQueue(final Tokenizer tokenizer) {
+            this.tokenizer = tokenizer;
+            next = fetchNext();
+        }
 
-    @Nullable
-    @Override
-    protected Ranged internalPoll() {
-      return tokenizer.next() ? tokenizer.current() : null;
+        @Nullable
+        @Override
+        protected Ranged internalPoll() {
+            return tokenizer.next() ? tokenizer.current() : null;
+        }
     }
-  }
 
-  class ArrayQueue<E extends Ranged> extends BaseRangedDequeue<E> {
+    class ArrayQueue<E extends Ranged> extends BaseRangedDequeue<E> {
 
-    private final E[] array;
-    private int index;
+        private final E[] array;
+        private int index;
 
-    ArrayQueue(final E[] array) {
-      this.array = array;
-      index = 0;
-      next = fetchNext();
-    }
+        ArrayQueue(final E[] array) {
+            this.array = array;
+            index = 0;
+            next = fetchNext();
+        }
 
-    @Nullable
-    @Override
-    protected E internalPoll() {
-      return index >= array.length ? null : array[index++];
+        @Nullable
+        @Override
+        protected E internalPoll() {
+            return index >= array.length ? null : array[index++];
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/StringUtils.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/StringUtils.java
index fd02d0dc78e..f649b9fece7 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/StringUtils.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/StringUtils.java
@@ -10,191 +10,187 @@
 
 public abstract class StringUtils {
 
-  private StringUtils() {}
-
-  /**
-   * Checks if the string ends with the selected suffix ignoring case. Note that this method does
-   * not take locale into account.
-   */
-  public static boolean endsWithIgnoreCase(
-      @Nonnull final String value, @Nonnull final String suffix) {
-    if (value.length() < suffix.length()) {
-      return false;
-    }
-    if (suffix.isEmpty()) {
-      return true;
-    }
-    final int offset = value.length() - suffix.length();
-    return value.regionMatches(true, offset, suffix, 0, suffix.length());
-  }
-
-  /**
-   * Performs a substring of the selected string taking care of leading and trailing whitespaces.
-   */
-  @Nonnull
-  public static String substringTrim(@Nonnull final String value, int start, int end) {
-    if (start >= end) {
-      return "";
-    }
-    while (start < end && Character.isWhitespace(value.charAt(start))) {
-      start++;
-    }
-    while (end > start && Character.isWhitespace(value.charAt(end - 1))) {
-      end--;
-    }
-    return start >= end ? "" : value.substring(start, end);
-  }
-
-  /** Returns how many leading whitespaces are between the start and the end of the string */
-  @Nonnull
-  public static int leadingWhitespaces(@Nonnull final String value, int start, int end) {
-    int whitespaces = start;
-    while (whitespaces < end && Character.isWhitespace(value.charAt(whitespaces))) {
-      whitespaces++;
-    }
-    return whitespaces;
-  }
-
-  /**
-   * Returns the string replaced with the regex and the values tainted (if needed)
-   *
-   * @param taintedObjects the ctx object to save the range of the tainted values
-   * @param target the string to be replaced
-   * @param pattern the pattern to be replaced
-   * @param replacement the replacement string
-   * @param ranges the ranges of the string to be replaced
-   * @param rangesInput the ranges of the input string
-   * @param numOfReplacements the number of replacements to be made
-   */
-  @Nonnull
-  public static String replaceAndTaint(
-      @Nonnull TaintedObjects taintedObjects,
-      @Nonnull final String target,
-      Pattern pattern,
-      String replacement,
-      Range[] ranges,
-      @Nullable Range[] rangesInput,
-      int numOfReplacements) {
-    if (numOfReplacements <= 0) {
-      return target;
+    private StringUtils() {}
+
+    /**
+     * Checks if the string ends with the selected suffix ignoring case. Note that this method does
+     * not take locale into account.
+     */
+    public static boolean endsWithIgnoreCase(@Nonnull final String value, @Nonnull final String suffix) {
+        if (value.length() < suffix.length()) {
+            return false;
+        }
+        if (suffix.isEmpty()) {
+            return true;
+        }
+        final int offset = value.length() - suffix.length();
+        return value.regionMatches(true, offset, suffix, 0, suffix.length());
     }
-    Matcher matcher = pattern.matcher(target);
-    boolean result = matcher.find();
-    if (result) {
-      int offset = 0;
-      RangeBuilder newRanges = new RangeBuilder();
-
-      int firstRange = 0;
-      int newLength = replacement.length();
-
-      // In case there is a '\' or '$' in the replacement string we need to make a
-      // quoteReplacement
-      // If there is no '\' or '$' it will return the same string.
-      String finalReplacement = Matcher.quoteReplacement(replacement);
-
-      boolean canAddRange = true;
-      StringBuffer sb = new StringBuffer();
-      do {
-        int start = matcher.start();
-        int end = matcher.end();
-        int diffLength = newLength - (end - start);
-
-        boolean rangesAdded = false;
-        while (firstRange < ranges.length && canAddRange) {
-          Range range = ranges[firstRange];
-          int rangeStart = range.getStart();
-          int rangeEnd = rangeStart + range.getLength();
-          // If the replaced value is between one range
-          if (rangeStart <= start && rangeEnd >= end) {
-            Range[] splittedRanges =
-                Ranges.splitRanges(start, end, newLength, range, offset, diffLength);
-
-            if (splittedRanges.length > 0 && splittedRanges[0].getLength() > 0) {
-              canAddRange = newRanges.add(splittedRanges[0]);
-            }
-
-            if (rangesInput != null) {
-              canAddRange = newRanges.add(rangesInput, start + offset);
-              rangesAdded = true;
-            }
-
-            if (splittedRanges.length > 1 && splittedRanges[1].getLength() > 0) {
-              canAddRange = newRanges.add(splittedRanges[1]);
-            }
-
-            firstRange++;
-            break;
-            // If the replaced value starts in the range and not end there
-          } else if (rangeStart <= start && rangeEnd > start) {
-            Range[] splittedRanges =
-                Ranges.splitRanges(start, end, newLength, range, offset, diffLength);
-
-            if (splittedRanges.length > 0 && splittedRanges[0].getLength() > 0) {
-              canAddRange = newRanges.add(splittedRanges[0]);
-            }
 
-            if (rangesInput != null && !rangesAdded) {
-              canAddRange = newRanges.add(rangesInput, start + offset);
-              rangesAdded = true;
-            }
-
-            // If the replaced value ends in the range
-          } else if (rangeEnd >= end) {
-            Range[] splittedRanges =
-                Ranges.splitRanges(start, end, newLength, range, offset, diffLength);
-
-            if (rangesInput != null && !rangesAdded) {
-              canAddRange = newRanges.add(rangesInput, start + offset);
-              rangesAdded = true;
-            }
-
-            if (splittedRanges.length > 1 && splittedRanges[1].getLength() > 0) {
-              canAddRange = newRanges.add(splittedRanges[1]);
-            }
-
-            firstRange++;
-            break;
-            // Middle ranges
-          } else if (rangeStart >= start) {
-            firstRange++;
-            continue;
-          } else {
-            canAddRange = newRanges.add(range, rangeStart + offset);
-          }
-
-          firstRange++;
+    /**
+     * Performs a substring of the selected string taking care of leading and trailing whitespaces.
+     */
+    @Nonnull
+    public static String substringTrim(@Nonnull final String value, int start, int end) {
+        if (start >= end) {
+            return "";
         }
-
-        // In case there are no ranges
-        if (rangesInput != null && !rangesAdded && canAddRange) {
-          canAddRange = newRanges.add(rangesInput, start + offset);
+        while (start < end && Character.isWhitespace(value.charAt(start))) {
+            start++;
         }
+        while (end > start && Character.isWhitespace(value.charAt(end - 1))) {
+            end--;
+        }
+        return start >= end ? "" : value.substring(start, end);
+    }
 
-        matcher.appendReplacement(sb, finalReplacement);
+    /** Returns how many leading whitespaces are between the start and the end of the string */
+    @Nonnull
+    public static int leadingWhitespaces(@Nonnull final String value, int start, int end) {
+        int whitespaces = start;
+        while (whitespaces < end && Character.isWhitespace(value.charAt(whitespaces))) {
+            whitespaces++;
+        }
+        return whitespaces;
+    }
 
-        offset = diffLength;
-        numOfReplacements--;
-        if (numOfReplacements > 0) {
-          result = matcher.find();
+    /**
+     * Returns the string replaced with the regex and the values tainted (if needed)
+     *
+     * @param taintedObjects the ctx object to save the range of the tainted values
+     * @param target the string to be replaced
+     * @param pattern the pattern to be replaced
+     * @param replacement the replacement string
+     * @param ranges the ranges of the string to be replaced
+     * @param rangesInput the ranges of the input string
+     * @param numOfReplacements the number of replacements to be made
+     */
+    @Nonnull
+    public static String replaceAndTaint(
+            @Nonnull TaintedObjects taintedObjects,
+            @Nonnull final String target,
+            Pattern pattern,
+            String replacement,
+            Range[] ranges,
+            @Nullable Range[] rangesInput,
+            int numOfReplacements) {
+        if (numOfReplacements <= 0) {
+            return target;
         }
-      } while (result && numOfReplacements > 0);
+        Matcher matcher = pattern.matcher(target);
+        boolean result = matcher.find();
+        if (result) {
+            int offset = 0;
+            RangeBuilder newRanges = new RangeBuilder();
+
+            int firstRange = 0;
+            int newLength = replacement.length();
+
+            // In case there is a '\' or '$' in the replacement string we need to make a
+            // quoteReplacement
+            // If there is no '\' or '$' it will return the same string.
+            String finalReplacement = Matcher.quoteReplacement(replacement);
+
+            boolean canAddRange = true;
+            StringBuffer sb = new StringBuffer();
+            do {
+                int start = matcher.start();
+                int end = matcher.end();
+                int diffLength = newLength - (end - start);
+
+                boolean rangesAdded = false;
+                while (firstRange < ranges.length && canAddRange) {
+                    Range range = ranges[firstRange];
+                    int rangeStart = range.getStart();
+                    int rangeEnd = rangeStart + range.getLength();
+                    // If the replaced value is between one range
+                    if (rangeStart <= start && rangeEnd >= end) {
+                        Range[] splittedRanges = Ranges.splitRanges(start, end, newLength, range, offset, diffLength);
+
+                        if (splittedRanges.length > 0 && splittedRanges[0].getLength() > 0) {
+                            canAddRange = newRanges.add(splittedRanges[0]);
+                        }
+
+                        if (rangesInput != null) {
+                            canAddRange = newRanges.add(rangesInput, start + offset);
+                            rangesAdded = true;
+                        }
+
+                        if (splittedRanges.length > 1 && splittedRanges[1].getLength() > 0) {
+                            canAddRange = newRanges.add(splittedRanges[1]);
+                        }
+
+                        firstRange++;
+                        break;
+                        // If the replaced value starts in the range and not end there
+                    } else if (rangeStart <= start && rangeEnd > start) {
+                        Range[] splittedRanges = Ranges.splitRanges(start, end, newLength, range, offset, diffLength);
+
+                        if (splittedRanges.length > 0 && splittedRanges[0].getLength() > 0) {
+                            canAddRange = newRanges.add(splittedRanges[0]);
+                        }
+
+                        if (rangesInput != null && !rangesAdded) {
+                            canAddRange = newRanges.add(rangesInput, start + offset);
+                            rangesAdded = true;
+                        }
+
+                        // If the replaced value ends in the range
+                    } else if (rangeEnd >= end) {
+                        Range[] splittedRanges = Ranges.splitRanges(start, end, newLength, range, offset, diffLength);
+
+                        if (rangesInput != null && !rangesAdded) {
+                            canAddRange = newRanges.add(rangesInput, start + offset);
+                            rangesAdded = true;
+                        }
+
+                        if (splittedRanges.length > 1 && splittedRanges[1].getLength() > 0) {
+                            canAddRange = newRanges.add(splittedRanges[1]);
+                        }
+
+                        firstRange++;
+                        break;
+                        // Middle ranges
+                    } else if (rangeStart >= start) {
+                        firstRange++;
+                        continue;
+                    } else {
+                        canAddRange = newRanges.add(range, rangeStart + offset);
+                    }
+
+                    firstRange++;
+                }
+
+                // In case there are no ranges
+                if (rangesInput != null && !rangesAdded && canAddRange) {
+                    canAddRange = newRanges.add(rangesInput, start + offset);
+                }
+
+                matcher.appendReplacement(sb, finalReplacement);
+
+                offset = diffLength;
+                numOfReplacements--;
+                if (numOfReplacements > 0) {
+                    result = matcher.find();
+                }
+            } while (result && numOfReplacements > 0);
+
+            // In the case there is no tainted object
+            if (firstRange < ranges.length && canAddRange) {
+                for (int i = firstRange; i < ranges.length && canAddRange; i++) {
+                    canAddRange = newRanges.add(ranges[i], offset);
+                }
+            }
 
-      // In the case there is no tainted object
-      if (firstRange < ranges.length && canAddRange) {
-        for (int i = firstRange; i < ranges.length && canAddRange; i++) {
-          canAddRange = newRanges.add(ranges[i], offset);
+            matcher.appendTail(sb);
+            String finalString = sb.toString();
+            Range[] finalRanges = newRanges.toArray();
+            if (finalRanges.length > 0) {
+                taintedObjects.taint(finalString, finalRanges);
+            }
+            return finalString;
         }
-      }
-
-      matcher.appendTail(sb);
-      String finalString = sb.toString();
-      Range[] finalRanges = newRanges.toArray();
-      if (finalRanges.length > 0) {
-        taintedObjects.taint(finalString, finalRanges);
-      }
-      return finalString;
-    }
 
-    return target;
-  }
+        return target;
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Wrapper.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Wrapper.java
index 8c0a6e00c74..31e846b940d 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Wrapper.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Wrapper.java
@@ -2,5 +2,5 @@
 
 public interface Wrapper<E> {
 
-  E unwrap();
+    E unwrap();
 }
diff --git a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/model/json/EvidenceAdapterTest.java b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/model/json/EvidenceAdapterTest.java
index a3189181c7f..3918cdf5c18 100644
--- a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/model/json/EvidenceAdapterTest.java
+++ b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/model/json/EvidenceAdapterTest.java
@@ -18,45 +18,41 @@
 
 class EvidenceAdapterTest {
 
-  @Test
-  void repeatedSensitiveLiteralsRedactToTheSamePattern() throws Exception {
-    assumeTrue(Config.get().isIastRedactionEnabled(), "redaction must be enabled");
-
-    // The two 'abc' string literals are detected as sensitive ranges within the same tainted value.
-    // Both must map to the first occurrence of "abc" in the source (index 8 -> "ijk"), so they
-    // render with an identical pattern. This is the behavior preserved by the chunk -> offset
-    // memoization in EvidenceAdapter#addValuePart.
-    final String sql = "select 'abc' or 'abc'";
-    final Source source = new Source(SourceTypes.REQUEST_PARAMETER_VALUE, "query", sql);
-    final Range range = new Range(0, sql.length(), source, VulnerabilityMarks.NOT_MARKED);
-    final Evidence evidence = new Evidence(sql, new Range[] {range});
-    final Vulnerability vulnerability =
-        new Vulnerability(
-            VulnerabilityType.SQL_INJECTION,
-            Location.forClassAndMethodAndLine("Test", "test", 1),
-            evidence);
-    final VulnerabilityBatch batch = new VulnerabilityBatch();
-    batch.add(vulnerability);
-
-    final String json = VulnerabilityEncoding.toJson(batch);
-
-    final String expected =
-        "{"
-            + "  \"sources\": ["
-            + "    { \"origin\": \"http.request.parameter\", \"name\": \"query\","
-            + "      \"redacted\": true, \"pattern\": \"abcdefghijklmnopqrstu\" }"
-            + "  ],"
-            + "  \"vulnerabilities\": ["
-            + "    { \"type\": \"SQL_INJECTION\", \"evidence\": { \"valueParts\": ["
-            + "      { \"source\": 0, \"value\": \"select '\" },"
-            + "      { \"source\": 0, \"redacted\": true, \"pattern\": \"ijk\" },"
-            + "      { \"source\": 0, \"value\": \"' or '\" },"
-            + "      { \"source\": 0, \"redacted\": true, \"pattern\": \"ijk\" },"
-            + "      { \"source\": 0, \"value\": \"'\" }"
-            + "    ] } }"
-            + "  ]"
-            + "}";
-
-    JSONAssert.assertEquals(expected, json, JSONCompareMode.LENIENT);
-  }
+    @Test
+    void repeatedSensitiveLiteralsRedactToTheSamePattern() throws Exception {
+        assumeTrue(Config.get().isIastRedactionEnabled(), "redaction must be enabled");
+
+        // The two 'abc' string literals are detected as sensitive ranges within the same tainted value.
+        // Both must map to the first occurrence of "abc" in the source (index 8 -> "ijk"), so they
+        // render with an identical pattern. This is the behavior preserved by the chunk -> offset
+        // memoization in EvidenceAdapter#addValuePart.
+        final String sql = "select 'abc' or 'abc'";
+        final Source source = new Source(SourceTypes.REQUEST_PARAMETER_VALUE, "query", sql);
+        final Range range = new Range(0, sql.length(), source, VulnerabilityMarks.NOT_MARKED);
+        final Evidence evidence = new Evidence(sql, new Range[] {range});
+        final Vulnerability vulnerability = new Vulnerability(
+                VulnerabilityType.SQL_INJECTION, Location.forClassAndMethodAndLine("Test", "test", 1), evidence);
+        final VulnerabilityBatch batch = new VulnerabilityBatch();
+        batch.add(vulnerability);
+
+        final String json = VulnerabilityEncoding.toJson(batch);
+
+        final String expected = "{"
+                + "  \"sources\": ["
+                + "    { \"origin\": \"http.request.parameter\", \"name\": \"query\","
+                + "      \"redacted\": true, \"pattern\": \"abcdefghijklmnopqrstu\" }"
+                + "  ],"
+                + "  \"vulnerabilities\": ["
+                + "    { \"type\": \"SQL_INJECTION\", \"evidence\": { \"valueParts\": ["
+                + "      { \"source\": 0, \"value\": \"select '\" },"
+                + "      { \"source\": 0, \"redacted\": true, \"pattern\": \"ijk\" },"
+                + "      { \"source\": 0, \"value\": \"' or '\" },"
+                + "      { \"source\": 0, \"redacted\": true, \"pattern\": \"ijk\" },"
+                + "      { \"source\": 0, \"value\": \"'\" }"
+                + "    ] } }"
+                + "  ]"
+                + "}";
+
+        JSONAssert.assertEquals(expected, json, JSONCompareMode.LENIENT);
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/CommandRegexpTokenizerTest.java b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/CommandRegexpTokenizerTest.java
index d43b3495713..55e19ef0d7e 100644
--- a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/CommandRegexpTokenizerTest.java
+++ b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/CommandRegexpTokenizerTest.java
@@ -16,29 +16,27 @@
 
 class CommandRegexpTokenizerTest {
 
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("redactsCommandArgumentsArguments")
-  void redactsCommandArguments(
-      final String description, final String command, final List<String> expected) {
-    assertEquals(expected, tokenize(command));
-  }
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("redactsCommandArgumentsArguments")
+    void redactsCommandArguments(final String description, final String command, final List<String> expected) {
+        assertEquals(expected, tokenize(command));
+    }
 
-  static Stream<Arguments> redactsCommandArgumentsArguments() {
-    return Stream.of(
-        arguments("plain command keeps its arguments", "ls -la /tmp", asList("-la /tmp")),
-        arguments("sudo prefix is skipped", "sudo rm -rf /", asList("-rf /")),
-        arguments("doas prefix is skipped", "doas cat /etc/passwd", asList("/etc/passwd")),
-        arguments(
-            "everything after the binary is captured", "echo hello world", asList("hello world")));
-  }
+    static Stream<Arguments> redactsCommandArgumentsArguments() {
+        return Stream.of(
+                arguments("plain command keeps its arguments", "ls -la /tmp", asList("-la /tmp")),
+                arguments("sudo prefix is skipped", "sudo rm -rf /", asList("-rf /")),
+                arguments("doas prefix is skipped", "doas cat /etc/passwd", asList("/etc/passwd")),
+                arguments("everything after the binary is captured", "echo hello world", asList("hello world")));
+    }
 
-  private static List<String> tokenize(String command) {
-    Tokenizer tokenizer = new CommandRegexpTokenizer(new Evidence(command));
-    List<String> tokens = new ArrayList<>();
-    while (tokenizer.next()) {
-      Ranged range = tokenizer.current();
-      tokens.add(command.substring(range.getStart(), range.getStart() + range.getLength()));
+    private static List<String> tokenize(String command) {
+        Tokenizer tokenizer = new CommandRegexpTokenizer(new Evidence(command));
+        List<String> tokens = new ArrayList<>();
+        while (tokenizer.next()) {
+            Ranged range = tokenizer.current();
+            tokens.add(command.substring(range.getStart(), range.getStart() + range.getLength()));
+        }
+        return tokens;
     }
-    return tokens;
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/HeaderRegexpTokenizerTest.java b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/HeaderRegexpTokenizerTest.java
index c24a2d4dd61..73b0de80e48 100644
--- a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/HeaderRegexpTokenizerTest.java
+++ b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/HeaderRegexpTokenizerTest.java
@@ -19,40 +19,31 @@
 
 class HeaderRegexpTokenizerTest {
 
-  private static final Pattern NAME_PATTERN =
-      Pattern.compile("password|authorization", CASE_INSENSITIVE);
-  private static final Pattern VALUE_PATTERN = Pattern.compile("bearer\\s", CASE_INSENSITIVE);
+    private static final Pattern NAME_PATTERN = Pattern.compile("password|authorization", CASE_INSENSITIVE);
+    private static final Pattern VALUE_PATTERN = Pattern.compile("bearer\\s", CASE_INSENSITIVE);
 
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("redactsSensitiveHeadersArguments")
-  void redactsSensitiveHeaders(
-      final String description, final String header, final List<String> expected) {
-    assertEquals(expected, tokenize(header));
-  }
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("redactsSensitiveHeadersArguments")
+    void redactsSensitiveHeaders(final String description, final String header, final List<String> expected) {
+        assertEquals(expected, tokenize(header));
+    }
 
-  static Stream<Arguments> redactsSensitiveHeadersArguments() {
-    return Stream.of(
-        arguments(
-            "sensitive name redacts the value",
-            "Authorization: Bearer xyz",
-            singletonList("Bearer xyz")),
-        arguments(
-            "sensitive value redacts the value",
-            "X-Auth: Bearer secret",
-            singletonList("Bearer secret")),
-        arguments("non-sensitive header is ignored", "Accept: text/html", emptyList()),
-        arguments("missing separator is ignored", "NoColonHeader", emptyList()),
-        arguments("missing value is ignored", "Empty:", emptyList()));
-  }
+    static Stream<Arguments> redactsSensitiveHeadersArguments() {
+        return Stream.of(
+                arguments("sensitive name redacts the value", "Authorization: Bearer xyz", singletonList("Bearer xyz")),
+                arguments("sensitive value redacts the value", "X-Auth: Bearer secret", singletonList("Bearer secret")),
+                arguments("non-sensitive header is ignored", "Accept: text/html", emptyList()),
+                arguments("missing separator is ignored", "NoColonHeader", emptyList()),
+                arguments("missing value is ignored", "Empty:", emptyList()));
+    }
 
-  private static List<String> tokenize(String header) {
-    Tokenizer tokenizer =
-        new HeaderRegexpTokenizer(new Evidence(header), NAME_PATTERN, VALUE_PATTERN);
-    List<String> tokens = new ArrayList<>();
-    while (tokenizer.next()) {
-      Ranged range = tokenizer.current();
-      tokens.add(header.substring(range.getStart(), range.getStart() + range.getLength()));
+    private static List<String> tokenize(String header) {
+        Tokenizer tokenizer = new HeaderRegexpTokenizer(new Evidence(header), NAME_PATTERN, VALUE_PATTERN);
+        List<String> tokens = new ArrayList<>();
+        while (tokenizer.next()) {
+            Ranged range = tokenizer.current();
+            tokens.add(header.substring(range.getStart(), range.getStart() + range.getLength()));
+        }
+        return tokens;
     }
-    return tokens;
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/LdapRegexTokenizerTest.java b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/LdapRegexTokenizerTest.java
index 4060e00eca1..5d536f6af8f 100644
--- a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/LdapRegexTokenizerTest.java
+++ b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/LdapRegexTokenizerTest.java
@@ -17,29 +17,28 @@
 
 class LdapRegexTokenizerTest {
 
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("redactsFilterLiteralsArguments")
-  void redactsFilterLiterals(
-      final String description, final String filter, final List<String> expected) {
-    assertEquals(expected, tokenize(filter));
-  }
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("redactsFilterLiteralsArguments")
+    void redactsFilterLiterals(final String description, final String filter, final List<String> expected) {
+        assertEquals(expected, tokenize(filter));
+    }
 
-  static Stream<Arguments> redactsFilterLiteralsArguments() {
-    return Stream.of(
-        arguments("equality literal", "(cn=John Doe)", singletonList("John Doe")),
-        arguments("nested filter literals", "(&(uid=bob)(role=admin))", asList("bob", "admin")),
-        arguments("greater-or-equal operator", "(age>=21)", singletonList("21")),
-        arguments("less-or-equal operator", "(score<=100)", singletonList("100")),
-        arguments("approximate operator", "(attr~=approx)", singletonList("approx")));
-  }
+    static Stream<Arguments> redactsFilterLiteralsArguments() {
+        return Stream.of(
+                arguments("equality literal", "(cn=John Doe)", singletonList("John Doe")),
+                arguments("nested filter literals", "(&(uid=bob)(role=admin))", asList("bob", "admin")),
+                arguments("greater-or-equal operator", "(age>=21)", singletonList("21")),
+                arguments("less-or-equal operator", "(score<=100)", singletonList("100")),
+                arguments("approximate operator", "(attr~=approx)", singletonList("approx")));
+    }
 
-  private static List<String> tokenize(String filter) {
-    Tokenizer tokenizer = new LdapRegexTokenizer(new Evidence(filter));
-    List<String> tokens = new ArrayList<>();
-    while (tokenizer.next()) {
-      Ranged range = tokenizer.current();
-      tokens.add(filter.substring(range.getStart(), range.getStart() + range.getLength()));
+    private static List<String> tokenize(String filter) {
+        Tokenizer tokenizer = new LdapRegexTokenizer(new Evidence(filter));
+        List<String> tokens = new ArrayList<>();
+        while (tokenizer.next()) {
+            Ranged range = tokenizer.current();
+            tokens.add(filter.substring(range.getStart(), range.getStart() + range.getLength()));
+        }
+        return tokens;
     }
-    return tokens;
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/SensitiveHandlerTest.java b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/SensitiveHandlerTest.java
index 6f296eafb4e..ad357030678 100644
--- a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/SensitiveHandlerTest.java
+++ b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/SensitiveHandlerTest.java
@@ -14,39 +14,39 @@
 /** Most of the testing is done via {@link com.datadog.iast.model.json.EvidenceRedactionTest}. */
 class SensitiveHandlerTest {
 
-  // Valid under java.util.regex (named group + backreference) but rejected by RE2J, so
-  // SensitiveHandlerImpl must fall back to the default pattern instead of failing to compile.
-  private static final String RE2J_INCOMPATIBLE_PATTERN = "(?<g>secret)\\k<g>";
-
-  @Test
-  void emptyTokenizerReturnsNothing() {
-    final Tokenizer tokenizer = Tokenizer.EMPTY;
-    assertFalse(tokenizer.next());
-    assertThrows(NoSuchElementException.class, tokenizer::current);
-  }
-
-  @Test
-  void currentInstanceHasValue() {
-    assertNotNull(SensitiveHandler.get());
-  }
-
-  @Test
-  void incompatibleNamePatternFallsBackToDefault() {
-    final SensitiveHandlerImpl handler =
-        new SensitiveHandlerImpl(RE2J_INCOMPATIBLE_PATTERN, DEFAULT_IAST_REDACTION_VALUE_PATTERN);
-
-    // the default name pattern is used instead of failing to compile
-    assertTrue(handler.isSensitiveName("password"));
-    assertFalse(handler.isSensitiveName("username"));
-  }
-
-  @Test
-  void incompatibleValuePatternFallsBackToDefault() {
-    final SensitiveHandlerImpl handler =
-        new SensitiveHandlerImpl(DEFAULT_IAST_REDACTION_NAME_PATTERN, RE2J_INCOMPATIBLE_PATTERN);
-
-    // the default value pattern is used instead of failing to compile
-    assertTrue(handler.isSensitiveValue("bearer abc123def456"));
-    assertFalse(handler.isSensitiveValue("not a secret value"));
-  }
+    // Valid under java.util.regex (named group + backreference) but rejected by RE2J, so
+    // SensitiveHandlerImpl must fall back to the default pattern instead of failing to compile.
+    private static final String RE2J_INCOMPATIBLE_PATTERN = "(?<g>secret)\\k<g>";
+
+    @Test
+    void emptyTokenizerReturnsNothing() {
+        final Tokenizer tokenizer = Tokenizer.EMPTY;
+        assertFalse(tokenizer.next());
+        assertThrows(NoSuchElementException.class, tokenizer::current);
+    }
+
+    @Test
+    void currentInstanceHasValue() {
+        assertNotNull(SensitiveHandler.get());
+    }
+
+    @Test
+    void incompatibleNamePatternFallsBackToDefault() {
+        final SensitiveHandlerImpl handler =
+                new SensitiveHandlerImpl(RE2J_INCOMPATIBLE_PATTERN, DEFAULT_IAST_REDACTION_VALUE_PATTERN);
+
+        // the default name pattern is used instead of failing to compile
+        assertTrue(handler.isSensitiveName("password"));
+        assertFalse(handler.isSensitiveName("username"));
+    }
+
+    @Test
+    void incompatibleValuePatternFallsBackToDefault() {
+        final SensitiveHandlerImpl handler =
+                new SensitiveHandlerImpl(DEFAULT_IAST_REDACTION_NAME_PATTERN, RE2J_INCOMPATIBLE_PATTERN);
+
+        // the default value pattern is used instead of failing to compile
+        assertTrue(handler.isSensitiveValue("bearer abc123def456"));
+        assertFalse(handler.isSensitiveValue("not a secret value"));
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/SqlRegexpTokenizerTest.java b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/SqlRegexpTokenizerTest.java
index 4268b95539b..5c6f337e1e6 100644
--- a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/SqlRegexpTokenizerTest.java
+++ b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/SqlRegexpTokenizerTest.java
@@ -24,137 +24,107 @@
 
 class SqlRegexpTokenizerTest {
 
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("tokenizesSqlLiteralsArguments")
-  void tokenizesSqlLiterals(
-      final String description,
-      @Nullable final String dialect,
-      final String sql,
-      final List<String> expected) {
-    assertEquals(expected, tokenize(dialect, sql));
-  }
-
-  static Stream<Arguments> tokenizesSqlLiteralsArguments() {
-    return Stream.of(
-        // ANSI (default dialect when no database is provided)
-        arguments(
-            "ansi single-quoted string",
-            null,
-            "SELECT name FROM u WHERE name = 'john'",
-            singletonList("john")),
-        arguments(
-            "ansi escaped single quote", null, "SELECT 'O''Brien'", singletonList("O''Brien")),
-        arguments("ansi integer literal", null, "SELECT 12345", singletonList("12345")),
-        arguments("ansi decimal literal", null, "SELECT 3.14", singletonList("3.14")),
-        arguments("ansi hex literal", null, "SELECT 0x1aF", singletonList("0x1aF")),
-        arguments("ansi line comment", null, "SELECT a -- bye", singletonList(" bye")),
-        arguments("ansi block comment", null, "SELECT /* hidden */ a", singletonList(" hidden ")),
-        arguments("ansi ignores double quotes", null, "SELECT \"x\" FROM t", emptyList()),
-        // MySQL family treats double-quoted strings as literals
-        arguments(
-            "mysql double-quoted string",
-            "mysql",
-            "SELECT \"secret\" FROM t",
-            singletonList("secret")),
-        // Oracle q'...' escaped literals (bracket pairs + enumerated single-char delimiters)
-        arguments(
-            "oracle q bracket literal",
-            "oracle",
-            "SELECT q'[hello]' FROM dual",
-            singletonList("hello")),
-        arguments(
-            "oracle q paren literal",
-            "oracle",
-            "SELECT q'(hello)' FROM dual",
-            singletonList("hello")),
-        arguments(
-            "oracle q custom delimiter",
-            "oracle",
-            "SELECT q'#hello#' FROM dual",
-            singletonList("hello")),
-        // Oracle forbids whitespace as a q' delimiter, so a space-delimited q' is intentionally
-        // NOT recognized as a q-literal; its content is still captured by the generic
-        // single-quoted-string branch (so the secret is still redacted, just not q-unwrapped).
-        arguments(
-            "oracle q whitespace delimiter is not a q-literal",
-            "oracle",
-            "SELECT q' secret ' FROM dual",
-            singletonList(" secret ")),
-        // PostgreSQL dollar-quoting
-        arguments(
-            "postgres dollar quote",
-            "postgresql",
-            "SELECT $tag$secret$tag$",
-            singletonList("secret")),
-        arguments(
-            "postgres empty-tag dollar quote",
-            "postgresql",
-            "SELECT $$secret$$",
-            singletonList("secret")),
-        arguments("postgres overlapping tags", "postgresql", "SELECT $a$x$a$", singletonList("x")),
-        arguments(
-            "postgres unterminated tag is skipped", "postgresql", "SELECT $tag$value", emptyList()),
-        // Boundary cases around buildDollarTagPositions: the scan must not read past end-of-string.
-        arguments("postgres lone dollar at end of string", "postgresql", "SELECT a$", emptyList()),
-        arguments(
-            "postgres identifier tag without closing dollar at end of string",
-            "postgresql",
-            "SELECT $tag",
-            emptyList()),
-        arguments(
-            "postgres empty-tag opener without close at end of string",
-            "postgresql",
-            "SELECT $$secret",
-            emptyList()),
-        // Parameter placeholders ($1, $2) must NOT be treated as dollar-quote openers; only their
-        // digits are tokenized as numeric literals.
-        arguments(
-            "postgres placeholders are not dollar quotes",
-            "postgresql",
-            "SELECT * FROM t WHERE a = $1 AND b = $2",
-            asList("1", "2")));
-  }
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("tokenizesSqlLiteralsArguments")
+    void tokenizesSqlLiterals(
+            final String description, @Nullable final String dialect, final String sql, final List<String> expected) {
+        assertEquals(expected, tokenize(dialect, sql));
+    }
 
-  @Test
-  void manyUnterminatedDollarTagsRunInLinearTime() {
-    // Each "$tN$" is a distinct, valid but unterminated dollar-quote opener. The previous
-    // indexOf-per-opener implementation scanned to end-of-string once per opener (O(n^2)) and would
-    // not finish anywhere near this budget; the precomputed tag index keeps it near-linear.
-    StringBuilder builder = new StringBuilder();
-    for (int i = 0; i < 60_000; i++) {
-      builder.append('$').append('t').append(i).append('$');
+    static Stream<Arguments> tokenizesSqlLiteralsArguments() {
+        return Stream.of(
+                // ANSI (default dialect when no database is provided)
+                arguments(
+                        "ansi single-quoted string",
+                        null,
+                        "SELECT name FROM u WHERE name = 'john'",
+                        singletonList("john")),
+                arguments("ansi escaped single quote", null, "SELECT 'O''Brien'", singletonList("O''Brien")),
+                arguments("ansi integer literal", null, "SELECT 12345", singletonList("12345")),
+                arguments("ansi decimal literal", null, "SELECT 3.14", singletonList("3.14")),
+                arguments("ansi hex literal", null, "SELECT 0x1aF", singletonList("0x1aF")),
+                arguments("ansi line comment", null, "SELECT a -- bye", singletonList(" bye")),
+                arguments("ansi block comment", null, "SELECT /* hidden */ a", singletonList(" hidden ")),
+                arguments("ansi ignores double quotes", null, "SELECT \"x\" FROM t", emptyList()),
+                // MySQL family treats double-quoted strings as literals
+                arguments("mysql double-quoted string", "mysql", "SELECT \"secret\" FROM t", singletonList("secret")),
+                // Oracle q'...' escaped literals (bracket pairs + enumerated single-char delimiters)
+                arguments("oracle q bracket literal", "oracle", "SELECT q'[hello]' FROM dual", singletonList("hello")),
+                arguments("oracle q paren literal", "oracle", "SELECT q'(hello)' FROM dual", singletonList("hello")),
+                arguments("oracle q custom delimiter", "oracle", "SELECT q'#hello#' FROM dual", singletonList("hello")),
+                // Oracle forbids whitespace as a q' delimiter, so a space-delimited q' is intentionally
+                // NOT recognized as a q-literal; its content is still captured by the generic
+                // single-quoted-string branch (so the secret is still redacted, just not q-unwrapped).
+                arguments(
+                        "oracle q whitespace delimiter is not a q-literal",
+                        "oracle",
+                        "SELECT q' secret ' FROM dual",
+                        singletonList(" secret ")),
+                // PostgreSQL dollar-quoting
+                arguments("postgres dollar quote", "postgresql", "SELECT $tag$secret$tag$", singletonList("secret")),
+                arguments(
+                        "postgres empty-tag dollar quote", "postgresql", "SELECT $$secret$$", singletonList("secret")),
+                arguments("postgres overlapping tags", "postgresql", "SELECT $a$x$a$", singletonList("x")),
+                arguments("postgres unterminated tag is skipped", "postgresql", "SELECT $tag$value", emptyList()),
+                // Boundary cases around buildDollarTagPositions: the scan must not read past end-of-string.
+                arguments("postgres lone dollar at end of string", "postgresql", "SELECT a$", emptyList()),
+                arguments(
+                        "postgres identifier tag without closing dollar at end of string",
+                        "postgresql",
+                        "SELECT $tag",
+                        emptyList()),
+                arguments(
+                        "postgres empty-tag opener without close at end of string",
+                        "postgresql",
+                        "SELECT $$secret",
+                        emptyList()),
+                // Parameter placeholders ($1, $2) must NOT be treated as dollar-quote openers; only their
+                // digits are tokenized as numeric literals.
+                arguments(
+                        "postgres placeholders are not dollar quotes",
+                        "postgresql",
+                        "SELECT * FROM t WHERE a = $1 AND b = $2",
+                        asList("1", "2")));
     }
-    String sql = builder.toString();
 
-    assertTimeoutPreemptively(
-        Duration.ofSeconds(10),
-        () -> {
-          Tokenizer tokenizer = new SqlRegexpTokenizer(postgresEvidence(sql));
-          // None of the openers has a matching close, so tokenization yields nothing and must
-          // simply terminate quickly.
-          assertFalse(tokenizer.next());
+    @Test
+    void manyUnterminatedDollarTagsRunInLinearTime() {
+        // Each "$tN$" is a distinct, valid but unterminated dollar-quote opener. The previous
+        // indexOf-per-opener implementation scanned to end-of-string once per opener (O(n^2)) and would
+        // not finish anywhere near this budget; the precomputed tag index keeps it near-linear.
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < 60_000; i++) {
+            builder.append('$').append('t').append(i).append('$');
+        }
+        String sql = builder.toString();
+
+        assertTimeoutPreemptively(Duration.ofSeconds(10), () -> {
+            Tokenizer tokenizer = new SqlRegexpTokenizer(postgresEvidence(sql));
+            // None of the openers has a matching close, so tokenization yields nothing and must
+            // simply terminate quickly.
+            assertFalse(tokenizer.next());
         });
-  }
+    }
 
-  private static Evidence postgresEvidence(String sql) {
-    return evidence("postgresql", sql);
-  }
+    private static Evidence postgresEvidence(String sql) {
+        return evidence("postgresql", sql);
+    }
 
-  private static Evidence evidence(@Nullable String dialect, String sql) {
-    Evidence evidence = new Evidence(sql);
-    if (dialect != null) {
-      evidence.getContext().put(DATABASE_PARAMETER, dialect);
+    private static Evidence evidence(@Nullable String dialect, String sql) {
+        Evidence evidence = new Evidence(sql);
+        if (dialect != null) {
+            evidence.getContext().put(DATABASE_PARAMETER, dialect);
+        }
+        return evidence;
     }
-    return evidence;
-  }
 
-  private static List<String> tokenize(@Nullable String dialect, String sql) {
-    Tokenizer tokenizer = new SqlRegexpTokenizer(evidence(dialect, sql));
-    List<String> tokens = new ArrayList<>();
-    while (tokenizer.next()) {
-      Ranged range = tokenizer.current();
-      tokens.add(sql.substring(range.getStart(), range.getStart() + range.getLength()));
+    private static List<String> tokenize(@Nullable String dialect, String sql) {
+        Tokenizer tokenizer = new SqlRegexpTokenizer(evidence(dialect, sql));
+        List<String> tokens = new ArrayList<>();
+        while (tokenizer.next()) {
+            Ranged range = tokenizer.current();
+            tokens.add(sql.substring(range.getStart(), range.getStart() + range.getLength()));
+        }
+        return tokens;
     }
-    return tokens;
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/UrlRegexpTokenizerTest.java b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/UrlRegexpTokenizerTest.java
index 1e5fd780fd8..97ffab96ddf 100644
--- a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/UrlRegexpTokenizerTest.java
+++ b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/UrlRegexpTokenizerTest.java
@@ -17,28 +17,27 @@
 
 class UrlRegexpTokenizerTest {
 
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("redactsUrlSecretsArguments")
-  void redactsUrlSecrets(final String description, final String url, final List<String> expected) {
-    assertEquals(expected, tokenize(url));
-  }
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("redactsUrlSecretsArguments")
+    void redactsUrlSecrets(final String description, final String url, final List<String> expected) {
+        assertEquals(expected, tokenize(url));
+    }
 
-  static Stream<Arguments> redactsUrlSecretsArguments() {
-    return Stream.of(
-        arguments("userinfo authority", "https://user:pass@host/path", singletonList("user:pass")),
-        arguments("single user authority", "ftp://bob@server/file", singletonList("bob")),
-        arguments(
-            "query parameter values", "http://h/p?token=secret&id=42", asList("secret", "42")),
-        arguments("authority and query together", "https://user@host/p?q=v", asList("user", "v")));
-  }
+    static Stream<Arguments> redactsUrlSecretsArguments() {
+        return Stream.of(
+                arguments("userinfo authority", "https://user:pass@host/path", singletonList("user:pass")),
+                arguments("single user authority", "ftp://bob@server/file", singletonList("bob")),
+                arguments("query parameter values", "http://h/p?token=secret&id=42", asList("secret", "42")),
+                arguments("authority and query together", "https://user@host/p?q=v", asList("user", "v")));
+    }
 
-  private static List<String> tokenize(String url) {
-    Tokenizer tokenizer = new UrlRegexpTokenizer(new Evidence(url));
-    List<String> tokens = new ArrayList<>();
-    while (tokenizer.next()) {
-      Ranged range = tokenizer.current();
-      tokens.add(url.substring(range.getStart(), range.getStart() + range.getLength()));
+    private static List<String> tokenize(String url) {
+        Tokenizer tokenizer = new UrlRegexpTokenizer(new Evidence(url));
+        List<String> tokens = new ArrayList<>();
+        while (tokenizer.next()) {
+            Ranged range = tokenizer.current();
+            tokens.add(url.substring(range.getStart(), range.getStart() + range.getLength()));
+        }
+        return tokens;
     }
-    return tokens;
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sink/CodeInjectionModuleTest.java b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sink/CodeInjectionModuleTest.java
index 98bb0022cc9..57a72ebe234 100644
--- a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sink/CodeInjectionModuleTest.java
+++ b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sink/CodeInjectionModuleTest.java
@@ -49,201 +49,189 @@
 
 class CodeInjectionModuleTest {
 
-  private static final AgentTracer.TracerAPI ORIGINAL_TRACER = AgentTracer.get();
-  private static final IastContext.Provider ORIGINAL_CONTEXT_PROVIDER = readContextProvider();
-
-  private IastContext.Provider contextProvider;
-  private IastRequestContext ctx;
-  private AgentSpan span;
-  private AgentTracer.TracerAPI tracer;
-  private Reporter reporter;
-  private OverheadController overheadController;
-  private CodeInjectionModule module;
-
-  @BeforeEach
-  void setup() {
-    contextProvider =
-        Config.get().getIastContextMode() == GLOBAL
-            ? new IastGlobalContext.Provider()
-            : new IastRequestContext.Provider();
-    ctx = (IastRequestContext) contextProvider.buildRequestContext();
-
-    TraceSegment traceSegment = mock(TraceSegment.class);
-    RequestContext reqCtx = mock(RequestContext.class);
-    when(reqCtx.getData(RequestContextSlot.IAST)).thenReturn(ctx);
-    when(reqCtx.getTraceSegment()).thenReturn(traceSegment);
-
-    span = mock(AgentSpan.class);
-    when(span.getSpanId()).thenReturn(123456L);
-    when(span.getRequestContext()).thenReturn(reqCtx);
-
-    tracer = mock(AgentTracer.TracerAPI.class);
-    when(tracer.activeSpan()).thenReturn(span);
-    when(tracer.getTraceSegment()).thenReturn(traceSegment);
-
-    reporter = mock(Reporter.class);
-
-    overheadController = mock(OverheadController.class);
-    when(overheadController.acquireRequest()).thenReturn(true);
-    when(overheadController.consumeQuota(any(), any(), any())).thenReturn(true);
-
-    Dependencies dependencies =
-        new Dependencies(
-            Config.get(),
-            reporter,
-            overheadController,
-            StackWalkerFactory.INSTANCE,
-            contextProvider);
-
-    AgentTracer.forceRegister(tracer);
-    IastContext.Provider.register(contextProvider);
-
-    module = new CodeInjectionModuleImpl(dependencies);
-  }
-
-  @AfterEach
-  void cleanup() {
-    contextProvider.releaseRequestContext(ctx);
-    AgentTracer.forceRegister(ORIGINAL_TRACER);
-    writeContextProvider(ORIGINAL_CONTEXT_PROVIDER);
-  }
-
-  @ParameterizedTest
-  @NullAndEmptySource
-  void nullOrEmptyScriptIsIgnored(String script) {
-    // a String-typed argument selects the onEval(String) overload, no cast needed
-    module.onEval(script);
-
-    // mirrors the Groovy original's `0 * _`: nothing is touched on the early-return path
-    verifyNoInteractions(reporter, overheadController, tracer);
-  }
-
-  @Test
-  void codeInjectionDetectionOnString() {
-    String script = "2 + 2";
-
-    // report is not called if the script is not tainted
-    module.onEval(script);
-    verify(reporter, never()).report(any(), any());
-
-    // report is not called if no active span, even when the script is tainted
-    taint(script);
-    when(tracer.activeSpan()).thenReturn(null);
-    module.onEval(script);
-    verify(reporter, never()).report(any(), any());
-
-    // report is called when the script is tainted and there is an active span
-    when(tracer.activeSpan()).thenReturn(span);
-    module.onEval(script);
-    verify(reporter).report(eq(span), argThat(vul -> vul.getType() == CODE_INJECTION));
-  }
-
-  @Test
-  void codeInjectionDetectionOnStringReader() {
-    StringReader reader = new StringReader("2 + 2");
-
-    // report is not called if the reader is not tainted
-    module.onEval(reader);
-    verify(reporter, never()).report(any(), any());
-
-    // report is called when the reader is tainted
-    taint(reader);
-    module.onEval(reader);
-    verify(reporter).report(eq(span), argThat(vul -> vul.getType() == CODE_INJECTION));
-  }
-
-  @Test
-  void codeInjectionDetectionOnInputStreamReader() throws IOException {
-    try (InputStreamReader reader =
-        new InputStreamReader(new ByteArrayInputStream("2 + 2".getBytes()))) {
-      // report is not called if the reader is not tainted
-      module.onEval(reader);
-      verify(reporter, never()).report(any(), any());
-
-      // report is called when the reader is tainted
-      taint(reader);
-      module.onEval(reader);
-      verify(reporter).report(eq(span), argThat(vul -> vul.getType() == CODE_INJECTION));
+    private static final AgentTracer.TracerAPI ORIGINAL_TRACER = AgentTracer.get();
+    private static final IastContext.Provider ORIGINAL_CONTEXT_PROVIDER = readContextProvider();
+
+    private IastContext.Provider contextProvider;
+    private IastRequestContext ctx;
+    private AgentSpan span;
+    private AgentTracer.TracerAPI tracer;
+    private Reporter reporter;
+    private OverheadController overheadController;
+    private CodeInjectionModule module;
+
+    @BeforeEach
+    void setup() {
+        contextProvider = Config.get().getIastContextMode() == GLOBAL
+                ? new IastGlobalContext.Provider()
+                : new IastRequestContext.Provider();
+        ctx = (IastRequestContext) contextProvider.buildRequestContext();
+
+        TraceSegment traceSegment = mock(TraceSegment.class);
+        RequestContext reqCtx = mock(RequestContext.class);
+        when(reqCtx.getData(RequestContextSlot.IAST)).thenReturn(ctx);
+        when(reqCtx.getTraceSegment()).thenReturn(traceSegment);
+
+        span = mock(AgentSpan.class);
+        when(span.getSpanId()).thenReturn(123456L);
+        when(span.getRequestContext()).thenReturn(reqCtx);
+
+        tracer = mock(AgentTracer.TracerAPI.class);
+        when(tracer.activeSpan()).thenReturn(span);
+        when(tracer.getTraceSegment()).thenReturn(traceSegment);
+
+        reporter = mock(Reporter.class);
+
+        overheadController = mock(OverheadController.class);
+        when(overheadController.acquireRequest()).thenReturn(true);
+        when(overheadController.consumeQuota(any(), any(), any())).thenReturn(true);
+
+        Dependencies dependencies = new Dependencies(
+                Config.get(), reporter, overheadController, StackWalkerFactory.INSTANCE, contextProvider);
+
+        AgentTracer.forceRegister(tracer);
+        IastContext.Provider.register(contextProvider);
+
+        module = new CodeInjectionModuleImpl(dependencies);
     }
-  }
 
-  @Test
-  void unsupportedReaderTypeIsIgnoredEvenWhenTainted() {
-    // only StringReader and InputStreamReader are inspected (see CodeInjectionModuleImpl.onEval)
-    try (CharArrayReader reader = new CharArrayReader("2 + 2".toCharArray())) {
-      taint(reader);
+    @AfterEach
+    void cleanup() {
+        contextProvider.releaseRequestContext(ctx);
+        AgentTracer.forceRegister(ORIGINAL_TRACER);
+        writeContextProvider(ORIGINAL_CONTEXT_PROVIDER);
+    }
 
-      module.onEval(reader);
+    @ParameterizedTest
+    @NullAndEmptySource
+    void nullOrEmptyScriptIsIgnored(String script) {
+        // a String-typed argument selects the onEval(String) overload, no cast needed
+        module.onEval(script);
 
-      // mirrors the Groovy original's `0 * _`: the unsupported-reader path touches no mock
-      verifyNoInteractions(reporter, overheadController, tracer);
+        // mirrors the Groovy original's `0 * _`: nothing is touched on the early-return path
+        verifyNoInteractions(reporter, overheadController, tracer);
     }
-  }
-
-  @Test
-  void allRangesWithMarkOnScriptAreNotReported() {
-    String script = "2 + 2";
-    Range[] ranges = markedRanges();
-    ctx.getTaintedObjects().taint(script, ranges);
-
-    module.onEval(script);
-
-    verify(reporter, never()).report(any(), any());
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("allRangesWithMarkOnReaderAreNotReportedArguments")
-  void allRangesWithMarkOnReaderAreNotReported(String scenario, Reader reader) throws IOException {
-    Range[] ranges = markedRanges();
-    ctx.getTaintedObjects().taint(reader, ranges);
-
-    module.onEval(reader);
-
-    verify(reporter, never()).report(any(), any());
-
-    reader.close();
-  }
-
-  static Stream<Arguments> allRangesWithMarkOnReaderAreNotReportedArguments() {
-    return Stream.of(
-        arguments("StringReader", new StringReader("2 + 2")),
-        arguments(
-            "InputStreamReader",
-            new InputStreamReader(new ByteArrayInputStream("2 + 2".getBytes()))));
-  }
-
-  private Range[] markedRanges() {
-    return new Range[] {
-      new Range(0, 1, new Source(REQUEST_PARAMETER_VALUE, "name", "value"), CODE_INJECTION_MARK)
-    };
-  }
-
-  private void taint(Object value) {
-    ctx.getTaintedObjects()
-        .taint(
-            value, Ranges.forObject(new Source(REQUEST_PARAMETER_VALUE, "name", value.toString())));
-  }
-
-  // IastContext.Provider.INSTANCE is a private static field; the Groovy base read and restored it
-  // directly, which Java cannot, so snapshot and restore it reflectively to preserve test
-  // isolation.
-  private static IastContext.Provider readContextProvider() {
-    try {
-      Field field = IastContext.Provider.class.getDeclaredField("INSTANCE");
-      field.setAccessible(true);
-      return (IastContext.Provider) field.get(null);
-    } catch (ReflectiveOperationException e) {
-      throw new IllegalStateException(e);
+
+    @Test
+    void codeInjectionDetectionOnString() {
+        String script = "2 + 2";
+
+        // report is not called if the script is not tainted
+        module.onEval(script);
+        verify(reporter, never()).report(any(), any());
+
+        // report is not called if no active span, even when the script is tainted
+        taint(script);
+        when(tracer.activeSpan()).thenReturn(null);
+        module.onEval(script);
+        verify(reporter, never()).report(any(), any());
+
+        // report is called when the script is tainted and there is an active span
+        when(tracer.activeSpan()).thenReturn(span);
+        module.onEval(script);
+        verify(reporter).report(eq(span), argThat(vul -> vul.getType() == CODE_INJECTION));
+    }
+
+    @Test
+    void codeInjectionDetectionOnStringReader() {
+        StringReader reader = new StringReader("2 + 2");
+
+        // report is not called if the reader is not tainted
+        module.onEval(reader);
+        verify(reporter, never()).report(any(), any());
+
+        // report is called when the reader is tainted
+        taint(reader);
+        module.onEval(reader);
+        verify(reporter).report(eq(span), argThat(vul -> vul.getType() == CODE_INJECTION));
     }
-  }
-
-  private static void writeContextProvider(IastContext.Provider provider) {
-    try {
-      Field field = IastContext.Provider.class.getDeclaredField("INSTANCE");
-      field.setAccessible(true);
-      field.set(null, provider);
-    } catch (ReflectiveOperationException e) {
-      throw new IllegalStateException(e);
+
+    @Test
+    void codeInjectionDetectionOnInputStreamReader() throws IOException {
+        try (InputStreamReader reader = new InputStreamReader(new ByteArrayInputStream("2 + 2".getBytes()))) {
+            // report is not called if the reader is not tainted
+            module.onEval(reader);
+            verify(reporter, never()).report(any(), any());
+
+            // report is called when the reader is tainted
+            taint(reader);
+            module.onEval(reader);
+            verify(reporter).report(eq(span), argThat(vul -> vul.getType() == CODE_INJECTION));
+        }
+    }
+
+    @Test
+    void unsupportedReaderTypeIsIgnoredEvenWhenTainted() {
+        // only StringReader and InputStreamReader are inspected (see CodeInjectionModuleImpl.onEval)
+        try (CharArrayReader reader = new CharArrayReader("2 + 2".toCharArray())) {
+            taint(reader);
+
+            module.onEval(reader);
+
+            // mirrors the Groovy original's `0 * _`: the unsupported-reader path touches no mock
+            verifyNoInteractions(reporter, overheadController, tracer);
+        }
+    }
+
+    @Test
+    void allRangesWithMarkOnScriptAreNotReported() {
+        String script = "2 + 2";
+        Range[] ranges = markedRanges();
+        ctx.getTaintedObjects().taint(script, ranges);
+
+        module.onEval(script);
+
+        verify(reporter, never()).report(any(), any());
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("allRangesWithMarkOnReaderAreNotReportedArguments")
+    void allRangesWithMarkOnReaderAreNotReported(String scenario, Reader reader) throws IOException {
+        Range[] ranges = markedRanges();
+        ctx.getTaintedObjects().taint(reader, ranges);
+
+        module.onEval(reader);
+
+        verify(reporter, never()).report(any(), any());
+
+        reader.close();
+    }
+
+    static Stream<Arguments> allRangesWithMarkOnReaderAreNotReportedArguments() {
+        return Stream.of(
+                arguments("StringReader", new StringReader("2 + 2")),
+                arguments("InputStreamReader", new InputStreamReader(new ByteArrayInputStream("2 + 2".getBytes()))));
+    }
+
+    private Range[] markedRanges() {
+        return new Range[] {new Range(0, 1, new Source(REQUEST_PARAMETER_VALUE, "name", "value"), CODE_INJECTION_MARK)};
+    }
+
+    private void taint(Object value) {
+        ctx.getTaintedObjects()
+                .taint(value, Ranges.forObject(new Source(REQUEST_PARAMETER_VALUE, "name", value.toString())));
+    }
+
+    // IastContext.Provider.INSTANCE is a private static field; the Groovy base read and restored it
+    // directly, which Java cannot, so snapshot and restore it reflectively to preserve test
+    // isolation.
+    private static IastContext.Provider readContextProvider() {
+        try {
+            Field field = IastContext.Provider.class.getDeclaredField("INSTANCE");
+            field.setAccessible(true);
+            return (IastContext.Provider) field.get(null);
+        } catch (ReflectiveOperationException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    private static void writeContextProvider(IastContext.Provider provider) {
+        try {
+            Field field = IastContext.Provider.class.getDeclaredField("INSTANCE");
+            field.setAccessible(true);
+            field.set(null, provider);
+        } catch (ReflectiveOperationException e) {
+            throw new IllegalStateException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-iast/src/test/java/foo/bar/securitycontrol/SecurityControlStaticTestSuite.java b/dd-java-agent/agent-iast/src/test/java/foo/bar/securitycontrol/SecurityControlStaticTestSuite.java
index d0169c06773..2162967962f 100644
--- a/dd-java-agent/agent-iast/src/test/java/foo/bar/securitycontrol/SecurityControlStaticTestSuite.java
+++ b/dd-java-agent/agent-iast/src/test/java/foo/bar/securitycontrol/SecurityControlStaticTestSuite.java
@@ -2,99 +2,99 @@
 
 public class SecurityControlStaticTestSuite {
 
-  public static boolean validateAll(long input, String input2) {
-    return true; // dummy implementation
-  }
-
-  public static boolean validateAll(String input) {
-    return true; // dummy implementation
-  }
-
-  public static boolean validateAll(String input, String input2) {
-    return true; // dummy implementation
-  }
-
-  public static boolean validateAll(
-      String input,
-      String input2,
-      String input3,
-      String input4,
-      String input5,
-      String input6,
-      String input7,
-      String input8,
-      String input9,
-      String input10) {
-    return true; // dummy implementation
-  }
-
-  public static boolean validateLong(long input, String input2) {
-    return true; // dummy implementation
-  }
-
-  public static boolean validateLong(String input, long input2) {
-    return true; // dummy implementation
-  }
-
-  public static boolean validateLong(long intput1, String input2, long input3) {
-    return true; // dummy implementation
-  }
-
-  public static boolean validateSelectedLong(long intput1) {
-    return true; // dummy implementation
-  }
-
-  public static boolean validateSelectedLong(long input1, long intput2) {
-    return true; // dummy implementation
-  }
-
-  public static boolean validate(String input) {
-    return true; // dummy implementation
-  }
-
-  public static boolean validate(Object o, String input, String input2) {
-    return true; // dummy implementation
-  }
-
-  public static int validateReturningInt(String input) {
-    return 1; // dummy implementation
-  }
-
-  public static int validateObject(Object input) {
-    return 1; // dummy implementation
-  }
-
-  public static String sanitize(String input) {
-    return "Sanitized";
-  }
-
-  public static Object sanitizeObject(String input) {
-    return "Sanitized";
-  }
-
-  public static String sanitizeInputs(String input, Object input2, int input3) {
-    return "Sanitized";
-  }
-
-  public static String sanitizeManyInputs(
-      String input,
-      String input2,
-      String input3,
-      String input4,
-      String input5,
-      String input6,
-      String input7,
-      String input8,
-      String input9,
-      String input10) {
-    return "Sanitized";
-  }
-
-  public static int sanitizeInt(int input) {
-    return input;
-  }
-
-  public static long sanitizeLong(long input) {
-    return input;
-  }
+    public static boolean validateAll(long input, String input2) {
+        return true; // dummy implementation
+    }
+
+    public static boolean validateAll(String input) {
+        return true; // dummy implementation
+    }
+
+    public static boolean validateAll(String input, String input2) {
+        return true; // dummy implementation
+    }
+
+    public static boolean validateAll(
+            String input,
+            String input2,
+            String input3,
+            String input4,
+            String input5,
+            String input6,
+            String input7,
+            String input8,
+            String input9,
+            String input10) {
+        return true; // dummy implementation
+    }
+
+    public static boolean validateLong(long input, String input2) {
+        return true; // dummy implementation
+    }
+
+    public static boolean validateLong(String input, long input2) {
+        return true; // dummy implementation
+    }
+
+    public static boolean validateLong(long intput1, String input2, long input3) {
+        return true; // dummy implementation
+    }
+
+    public static boolean validateSelectedLong(long intput1) {
+        return true; // dummy implementation
+    }
+
+    public static boolean validateSelectedLong(long input1, long intput2) {
+        return true; // dummy implementation
+    }
+
+    public static boolean validate(String input) {
+        return true; // dummy implementation
+    }
+
+    public static boolean validate(Object o, String input, String input2) {
+        return true; // dummy implementation
+    }
+
+    public static int validateReturningInt(String input) {
+        return 1; // dummy implementation
+    }
+
+    public static int validateObject(Object input) {
+        return 1; // dummy implementation
+    }
+
+    public static String sanitize(String input) {
+        return "Sanitized";
+    }
+
+    public static Object sanitizeObject(String input) {
+        return "Sanitized";
+    }
+
+    public static String sanitizeInputs(String input, Object input2, int input3) {
+        return "Sanitized";
+    }
+
+    public static String sanitizeManyInputs(
+            String input,
+            String input2,
+            String input3,
+            String input4,
+            String input5,
+            String input6,
+            String input7,
+            String input8,
+            String input9,
+            String input10) {
+        return "Sanitized";
+    }
+
+    public static int sanitizeInt(int input) {
+        return input;
+    }
+
+    public static long sanitizeLong(long input) {
+        return input;
+    }
 }
diff --git a/dd-java-agent/agent-iast/src/test/java/foo/bar/securitycontrol/SecurityControlTestSuite.java b/dd-java-agent/agent-iast/src/test/java/foo/bar/securitycontrol/SecurityControlTestSuite.java
index 99fae518950..cc7125988dc 100644
--- a/dd-java-agent/agent-iast/src/test/java/foo/bar/securitycontrol/SecurityControlTestSuite.java
+++ b/dd-java-agent/agent-iast/src/test/java/foo/bar/securitycontrol/SecurityControlTestSuite.java
@@ -2,99 +2,99 @@
 
 public class SecurityControlTestSuite {
 
-  public boolean validateAll(long input, String input2) {
-    return true; // dummy implementation
-  }
-
-  public boolean validateAll(String input) {
-    return true; // dummy implementation
-  }
-
-  public boolean validateAll(String input, String input2) {
-    return true; // dummy implementation
-  }
-
-  public boolean validateAll(
-      String input,
-      String input2,
-      String input3,
-      String input4,
-      String input5,
-      String input6,
-      String input7,
-      String input8,
-      String input9,
-      String input10) {
-    return true; // dummy implementation
-  }
-
-  public boolean validateLong(long input, String input2) {
-    return true; // dummy implementation
-  }
-
-  public boolean validateLong(String input, long input2) {
-    return true; // dummy implementation
-  }
-
-  public boolean validateLong(long intput1, String input2, long input3) {
-    return true; // dummy implementation
-  }
-
-  public boolean validateSelectedLong(long intput1) {
-    return true; // dummy implementation
-  }
-
-  public boolean validateSelectedLong(long input1, long intput2) {
-    return true; // dummy implementation
-  }
-
-  public boolean validate(String input) {
-    return true; // dummy implementation
-  }
-
-  public boolean validate(Object o, String input, String input2) {
-    return true; // dummy implementation
-  }
-
-  public int validateReturningInt(String input) {
-    return 1; // dummy implementation
-  }
-
-  public int validateObject(Object input) {
-    return 1; // dummy implementation
-  }
-
-  public String sanitize(String input) {
-    return "Sanitized";
-  }
-
-  public Object sanitizeObject(String input) {
-    return "Sanitized";
-  }
-
-  public String sanitizeInputs(String input, Object input2, int input3) {
-    return "Sanitized";
-  }
-
-  public String sanitizeManyInputs(
-      String input,
-      String input2,
-      String input3,
-      String input4,
-      String input5,
-      String input6,
-      String input7,
-      String input8,
-      String input9,
-      String input10) {
-    return "Sanitized";
-  }
-
-  public int sanitizeInt(int input) {
-    return input;
-  }
-
-  public long sanitizeLong(long input) {
-    return input;
-  }
+    public boolean validateAll(long input, String input2) {
+        return true; // dummy implementation
+    }
+
+    public boolean validateAll(String input) {
+        return true; // dummy implementation
+    }
+
+    public boolean validateAll(String input, String input2) {
+        return true; // dummy implementation
+    }
+
+    public boolean validateAll(
+            String input,
+            String input2,
+            String input3,
+            String input4,
+            String input5,
+            String input6,
+            String input7,
+            String input8,
+            String input9,
+            String input10) {
+        return true; // dummy implementation
+    }
+
+    public boolean validateLong(long input, String input2) {
+        return true; // dummy implementation
+    }
+
+    public boolean validateLong(String input, long input2) {
+        return true; // dummy implementation
+    }
+
+    public boolean validateLong(long intput1, String input2, long input3) {
+        return true; // dummy implementation
+    }
+
+    public boolean validateSelectedLong(long intput1) {
+        return true; // dummy implementation
+    }
+
+    public boolean validateSelectedLong(long input1, long intput2) {
+        return true; // dummy implementation
+    }
+
+    public boolean validate(String input) {
+        return true; // dummy implementation
+    }
+
+    public boolean validate(Object o, String input, String input2) {
+        return true; // dummy implementation
+    }
+
+    public int validateReturningInt(String input) {
+        return 1; // dummy implementation
+    }
+
+    public int validateObject(Object input) {
+        return 1; // dummy implementation
+    }
+
+    public String sanitize(String input) {
+        return "Sanitized";
+    }
+
+    public Object sanitizeObject(String input) {
+        return "Sanitized";
+    }
+
+    public String sanitizeInputs(String input, Object input2, int input3) {
+        return "Sanitized";
+    }
+
+    public String sanitizeManyInputs(
+            String input,
+            String input2,
+            String input3,
+            String input4,
+            String input5,
+            String input6,
+            String input7,
+            String input8,
+            String input9,
+            String input10) {
+        return "Sanitized";
+    }
+
+    public int sanitizeInt(int input) {
+        return input;
+    }
+
+    public long sanitizeLong(long input) {
+        return input;
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AdviceStack.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AdviceStack.java
index 834d9d5e266..f49bf99ca69 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AdviceStack.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AdviceStack.java
@@ -9,28 +9,28 @@
 
 /** Stack of advice transformations declared by a particular instrumentation. */
 final class AdviceStack implements AgentBuilder.Transformer {
-  private final AgentBuilder.Transformer[] advices;
+    private final AgentBuilder.Transformer[] advices;
 
-  AdviceStack(List<AgentBuilder.Transformer> advices) {
-    this.advices = advices.toArray(new AgentBuilder.Transformer[0]);
-  }
+    AdviceStack(List<AgentBuilder.Transformer> advices) {
+        this.advices = advices.toArray(new AgentBuilder.Transformer[0]);
+    }
+
+    AdviceStack(AgentBuilder.Transformer advice) {
+        this.advices = new AgentBuilder.Transformer[] {advice};
+    }
 
-  AdviceStack(AgentBuilder.Transformer advice) {
-    this.advices = new AgentBuilder.Transformer[] {advice};
-  }
+    @Override
+    public DynamicType.Builder<?> transform(
+            DynamicType.Builder<?> builder,
+            TypeDescription target,
+            ClassLoader classLoader,
+            JavaModule module,
+            ProtectionDomain pd) {
 
-  @Override
-  public DynamicType.Builder<?> transform(
-      DynamicType.Builder<?> builder,
-      TypeDescription target,
-      ClassLoader classLoader,
-      JavaModule module,
-      ProtectionDomain pd) {
+        for (AgentBuilder.Transformer advice : advices) {
+            builder = advice.transform(builder, target, classLoader, module, pd);
+        }
 
-    for (AgentBuilder.Transformer advice : advices) {
-      builder = advice.transform(builder, target, classLoader, module, pd);
+        return builder;
     }
-
-    return builder;
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AdviceTransformationException.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AdviceTransformationException.java
index cee4f39b48b..d50c05904ed 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AdviceTransformationException.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AdviceTransformationException.java
@@ -2,37 +2,33 @@
 
 /** Carries advice and target context for a failed advice transformation. */
 final class AdviceTransformationException extends RuntimeException {
-  private final String instrumentationClass;
-  private final String adviceClass;
-  private final String targetClass;
-  private final String targetMethod;
+    private final String instrumentationClass;
+    private final String adviceClass;
+    private final String targetClass;
+    private final String targetMethod;
 
-  AdviceTransformationException(
-      String instrumentationClass,
-      String adviceClass,
-      String targetClass,
-      String targetMethod,
-      Throwable cause) {
-    super("Advice transformation failed for " + targetClass + '.' + targetMethod, cause);
-    this.instrumentationClass = instrumentationClass;
-    this.adviceClass = adviceClass;
-    this.targetClass = targetClass;
-    this.targetMethod = targetMethod;
-  }
+    AdviceTransformationException(
+            String instrumentationClass, String adviceClass, String targetClass, String targetMethod, Throwable cause) {
+        super("Advice transformation failed for " + targetClass + '.' + targetMethod, cause);
+        this.instrumentationClass = instrumentationClass;
+        this.adviceClass = adviceClass;
+        this.targetClass = targetClass;
+        this.targetMethod = targetMethod;
+    }
 
-  String getInstrumentationClass() {
-    return instrumentationClass;
-  }
+    String getInstrumentationClass() {
+        return instrumentationClass;
+    }
 
-  String getAdviceClass() {
-    return adviceClass;
-  }
+    String getAdviceClass() {
+        return adviceClass;
+    }
 
-  String getTargetClass() {
-    return targetClass;
-  }
+    String getTargetClass() {
+        return targetClass;
+    }
 
-  String getTargetMethod() {
-    return targetMethod;
-  }
+    String getTargetMethod() {
+        return targetMethod;
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentCLI.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentCLI.java
index 861fd92542f..e87b1083b3e 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentCLI.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentCLI.java
@@ -34,177 +34,170 @@
 /** CLI methods, used when running the agent as a sample application with -jar. */
 public final class AgentCLI {
 
-  private static final Logger log = LoggerFactory.getLogger(AgentCLI.class);
-
-  static {
-    SharedTypePools.registerIfAbsent(SharedTypePools.simpleCache());
-    HierarchyMatchers.registerIfAbsent(HierarchyMatchers.simpleChecks());
-  }
-
-  /** Prints all known integrations in alphabetical order. */
-  @SuppressForbidden
-  public static void printIntegrationNames() {
-    Set<String> names = new TreeSet<>();
-    for (InstrumenterModule module : InstrumenterIndex.readIndex().modules()) {
-      names.add(module.name());
-    }
-    for (String name : names) {
-      System.out.println(name);
-    }
-  }
-
-  /**
-   * Sends sample traces at a regular interval for diagnostic purposes.
-   *
-   * @param count how many traces to send, negative means send forever
-   * @param interval the interval (in seconds) to wait for each trace
-   */
-  @SuppressForbidden
-  public static void sendSampleTraces(final int count, final double interval) throws Exception {
-    Agent.startDatadogTracer(InitializationTelemetry.noOpInstance());
-
-    int numTraces = 0;
-    while (++numTraces <= count || count < 0) {
-      AgentSpan span = AgentTracer.startSpan("datadog", "sample");
-      try {
-        Thread.sleep(Math.max((long) (1000.0 * interval), 1L));
-      } catch (InterruptedException ignore) {
-      } finally {
-        span.finish();
-      }
-      if (count < 0) {
-        System.out.print("... completed " + numTraces + (numTraces < 2 ? " trace\r" : " traces\r"));
-      } else {
-        System.out.print("... completed " + numTraces + "/" + count + " traces\r");
-      }
+    private static final Logger log = LoggerFactory.getLogger(AgentCLI.class);
+
+    static {
+        SharedTypePools.registerIfAbsent(SharedTypePools.simpleCache());
+        HierarchyMatchers.registerIfAbsent(HierarchyMatchers.simpleChecks());
     }
-  }
-
-  public static void uploadCrash(final String configFile, final String file) throws Exception {
-    String error = null;
-    ConfigManager.StoredConfig storedConfig = null;
-    if (configFile != null) {
-      File configFilePath = new File(configFile);
-      if (!configFilePath.exists()) {
-        log.error("Config file {} does not exist", configFile);
-        error = "Config file does not exist";
-      }
-      storedConfig = readConfig(Config.get(), configFilePath);
-      if (storedConfig == null) {
-        log.error("Unable to parse config file {}", configFile);
-        if (error == null) {
-          error = "Unable to parse config file";
-        } else {
-          error += ", Unable to parse config file";
+
+    /** Prints all known integrations in alphabetical order. */
+    @SuppressForbidden
+    public static void printIntegrationNames() {
+        Set<String> names = new TreeSet<>();
+        for (InstrumenterModule module : InstrumenterIndex.readIndex().modules()) {
+            names.add(module.name());
+        }
+        for (String name : names) {
+            System.out.println(name);
         }
-      }
-    }
-    if (storedConfig == null) {
-      // if the PID is not provided, the config file will be null
-      storedConfig = new ConfigManager.StoredConfig.Builder(Config.get()).build();
     }
 
-    final Path path = Paths.get(file);
-    if (!Files.exists(path)) {
-      log.error("Crash log {} does not exist", file);
-      if (error == null) {
-        error = "Crash log does not exist";
-      } else {
-        error = ", Crash log does not exist";
-      }
+    /**
+     * Sends sample traces at a regular interval for diagnostic purposes.
+     *
+     * @param count how many traces to send, negative means send forever
+     * @param interval the interval (in seconds) to wait for each trace
+     */
+    @SuppressForbidden
+    public static void sendSampleTraces(final int count, final double interval) throws Exception {
+        Agent.startDatadogTracer(InitializationTelemetry.noOpInstance());
+
+        int numTraces = 0;
+        while (++numTraces <= count || count < 0) {
+            AgentSpan span = AgentTracer.startSpan("datadog", "sample");
+            try {
+                Thread.sleep(Math.max((long) (1000.0 * interval), 1L));
+            } catch (InterruptedException ignore) {
+            } finally {
+                span.finish();
+            }
+            if (count < 0) {
+                System.out.print("... completed " + numTraces + (numTraces < 2 ? " trace\r" : " traces\r"));
+            } else {
+                System.out.print("... completed " + numTraces + "/" + count + " traces\r");
+            }
+        }
     }
 
-    final CrashUploader crashUploader = new CrashUploader(storedConfig);
-    // send the crash ping
-    crashUploader.notifyCrashStarted(error);
+    public static void uploadCrash(final String configFile, final String file) throws Exception {
+        String error = null;
+        ConfigManager.StoredConfig storedConfig = null;
+        if (configFile != null) {
+            File configFilePath = new File(configFile);
+            if (!configFilePath.exists()) {
+                log.error("Config file {} does not exist", configFile);
+                error = "Config file does not exist";
+            }
+            storedConfig = readConfig(Config.get(), configFilePath);
+            if (storedConfig == null) {
+                log.error("Unable to parse config file {}", configFile);
+                if (error == null) {
+                    error = "Unable to parse config file";
+                } else {
+                    error += ", Unable to parse config file";
+                }
+            }
+        }
+        if (storedConfig == null) {
+            // if the PID is not provided, the config file will be null
+            storedConfig = new ConfigManager.StoredConfig.Builder(Config.get()).build();
+        }
+
+        final Path path = Paths.get(file);
+        if (!Files.exists(path)) {
+            log.error("Crash log {} does not exist", file);
+            if (error == null) {
+                error = "Crash log does not exist";
+            } else {
+                error = ", Crash log does not exist";
+            }
+        }
 
-    if (error != null) {
-      System.exit(1);
+        final CrashUploader crashUploader = new CrashUploader(storedConfig);
+        // send the crash ping
+        crashUploader.notifyCrashStarted(error);
+
+        if (error != null) {
+            System.exit(1);
+        }
+        crashUploader.upload(path);
     }
-    crashUploader.upload(path);
-  }
-
-  public static void sendOomeEvent(String taglist) throws Exception {
-    OOMENotifier.sendOomeEvent(taglist);
-  }
-
-  @SuppressForbidden
-  public static void scanDependencies(final String[] args) throws Exception {
-    Class depClass =
-        Class.forName(
-            "datadog.telemetry.dependency.DependencyService",
-            true,
-            AgentCLI.class.getClassLoader());
-    Object depService = depClass.getConstructor().newInstance();
-    Method addUrlMethod = depService.getClass().getMethod("addURL", URL.class);
-    Method resolveOne = depService.getClass().getMethod("resolveOneDependency");
-
-    Consumer<File> invoker =
-        (file) -> {
-          try {
-            addUrlMethod.invoke(depService, file.toURI().toURL());
-            resolveOne.invoke(depService);
-          } catch (Exception e) {
-            log.error("Error invoking dependencies service", e);
-          }
-        };
-    File origin = new File(args[0]);
-    if (origin.isFile()) {
-      recursiveDependencySearch(invoker, origin);
-    } else if (origin.isDirectory()) {
-      File[] files = origin.listFiles();
-      for (File file : files) {
-        recursiveDependencySearch(invoker, file);
-      }
-    } else {
-      System.err.println("Invalid path found:" + origin.getAbsolutePath());
+
+    public static void sendOomeEvent(String taglist) throws Exception {
+        OOMENotifier.sendOomeEvent(taglist);
     }
 
-    System.out.println("Scan finished");
-  }
+    @SuppressForbidden
+    public static void scanDependencies(final String[] args) throws Exception {
+        Class depClass =
+                Class.forName("datadog.telemetry.dependency.DependencyService", true, AgentCLI.class.getClassLoader());
+        Object depService = depClass.getConstructor().newInstance();
+        Method addUrlMethod = depService.getClass().getMethod("addURL", URL.class);
+        Method resolveOne = depService.getClass().getMethod("resolveOneDependency");
+
+        Consumer<File> invoker = (file) -> {
+            try {
+                addUrlMethod.invoke(depService, file.toURI().toURL());
+                resolveOne.invoke(depService);
+            } catch (Exception e) {
+                log.error("Error invoking dependencies service", e);
+            }
+        };
+        File origin = new File(args[0]);
+        if (origin.isFile()) {
+            recursiveDependencySearch(invoker, origin);
+        } else if (origin.isDirectory()) {
+            File[] files = origin.listFiles();
+            for (File file : files) {
+                recursiveDependencySearch(invoker, file);
+            }
+        } else {
+            System.err.println("Invalid path found:" + origin.getAbsolutePath());
+        }
 
-  public static void checkProfilerEnv(String temp) {
-    if (!EnvironmentChecker.checkEnvironment(temp)) {
-      System.exit(1);
+        System.out.println("Scan finished");
     }
-  }
 
-  private static void recursiveDependencySearch(Consumer<File> invoker, File origin)
-      throws IOException {
-    invoker.accept(origin);
-    unzipJar(invoker, origin);
-  }
+    public static void checkProfilerEnv(String temp) {
+        if (!EnvironmentChecker.checkEnvironment(temp)) {
+            System.exit(1);
+        }
+    }
+
+    private static void recursiveDependencySearch(Consumer<File> invoker, File origin) throws IOException {
+        invoker.accept(origin);
+        unzipJar(invoker, origin);
+    }
 
-  private static void unzipJar(Consumer<File> invoker, File file) throws IOException {
-    try (JarFile jar = new JarFile(file)) {
-      log.debug("Finding entries in file: {}", file.getName());
+    private static void unzipJar(Consumer<File> invoker, File file) throws IOException {
+        try (JarFile jar = new JarFile(file)) {
+            log.debug("Finding entries in file: {}", file.getName());
 
-      jar.stream()
-          .forEach(
-              e -> {
+            jar.stream().forEach(e -> {
                 if (e.getName().endsWith(".jar") || e.getName().endsWith(".war")) {
-                  try {
-                    log.debug("Jar entry found in file: {} entry: {}", file.getName(), e.getName());
-                    File temp = File.createTempFile("internal", ".jar");
-                    try (InputStream is = jar.getInputStream(e);
-                        OutputStream out = new FileOutputStream(temp)) {
-                      int read;
-                      while ((read = is.read()) != -1) {
-                        out.write(read);
-                      }
-                    }
-                    log.debug("Adding new jar: {}", temp.getAbsolutePath());
-                    recursiveDependencySearch(invoker, temp);
-                    if (!temp.delete()) {
-                      log.error("Error deleting temp file: {}", temp.getAbsolutePath());
+                    try {
+                        log.debug("Jar entry found in file: {} entry: {}", file.getName(), e.getName());
+                        File temp = File.createTempFile("internal", ".jar");
+                        try (InputStream is = jar.getInputStream(e);
+                                OutputStream out = new FileOutputStream(temp)) {
+                            int read;
+                            while ((read = is.read()) != -1) {
+                                out.write(read);
+                            }
+                        }
+                        log.debug("Adding new jar: {}", temp.getAbsolutePath());
+                        recursiveDependencySearch(invoker, temp);
+                        if (!temp.delete()) {
+                            log.error("Error deleting temp file: {}", temp.getAbsolutePath());
+                        }
+                    } catch (Exception ex) {
+                        log.error("Error unzipping file", ex);
                     }
-                  } catch (Exception ex) {
-                    log.error("Error unzipping file", ex);
-                  }
                 } else {
-                  log.debug("Entry: {} ignored in file: {}", e.getName(), file.getAbsolutePath());
+                    log.debug("Entry: {} ignored in file: {}", e.getName(), file.getAbsolutePath());
                 }
-              });
+            });
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
index d331759d2df..1dd5127273a 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
@@ -50,550 +50,527 @@
 import org.slf4j.LoggerFactory;
 
 public class AgentInstaller {
-  private static final Logger log = LoggerFactory.getLogger(AgentInstaller.class);
-  private static final boolean DEBUG = log.isDebugEnabled();
-
-  private static final List<Runnable> LOG_MANAGER_CALLBACKS = new CopyOnWriteArrayList<>();
-  private static final List<Runnable> MBEAN_SERVER_BUILDER_CALLBACKS = new CopyOnWriteArrayList<>();
-
-  private static final long GLOBAL_OBJECT_STORE_CLEAN_FREQUENCY_SECONDS = 1;
-
-  static {
-    enableByteBuddyRawTypes();
-    disableByteBuddyNexus();
-    // register weak map supplier as early as possible
-    WeakMaps.registerAsSupplier();
-    circularityErrorWorkaround();
-  }
-
-  @SuppressForbidden
-  private static void circularityErrorWorkaround() {
-    // these classes have been involved in intermittent ClassCircularityErrors during startup
-    // they don't need context storage, so it's safe to load them before installing the agent
-    try {
-      Class.forName("java.util.concurrent.ThreadLocalRandom");
-    } catch (Throwable ignore) {
-    }
-  }
+    private static final Logger log = LoggerFactory.getLogger(AgentInstaller.class);
+    private static final boolean DEBUG = log.isDebugEnabled();
 
-  public static void installBytebuddyAgent(final Instrumentation inst) {
-    /*
-     * ByteBuddy agent is used by several systems which can be enabled independently;
-     * we need to install the agent whenever any of them is active.
-     */
-    Set<InstrumenterModule.TargetSystem> enabledSystems = getEnabledSystems();
-    if (!enabledSystems.isEmpty()) {
-      installBytebuddyAgent(inst, false, enabledSystems);
-      if (DEBUG) {
-        log.debug("Instrumentation installed for {}", enabledSystems);
-      }
-      int poolCleaningInterval = InstrumenterConfig.get().getResolverResetInterval();
-      if (poolCleaningInterval > 0) {
-        AgentTaskScheduler.get()
-            .scheduleAtFixedRate(
-                SharedTypePools::clear,
-                poolCleaningInterval,
-                Math.max(poolCleaningInterval, 10),
-                TimeUnit.SECONDS);
-      }
-    } else if (DEBUG) {
-      log.debug("No target systems enabled, skipping instrumentation.");
-    }
-  }
-
-  /**
-   * Install the core bytebuddy agent along with all registered {@link InstrumenterModule}s.
-   *
-   * @return the agent's class transformer
-   */
-  public static ClassFileTransformer installBytebuddyAgent(
-      final Instrumentation inst,
-      final boolean skipAdditionalLibraryMatcher,
-      final Set<InstrumenterModule.TargetSystem> enabledSystems,
-      final AgentBuilder.Listener... listeners) {
-    return installBytebuddyAgent(
-        inst, skipAdditionalLibraryMatcher, enabledSystems, DEBUG, listeners);
-  }
-
-  @VisibleForTesting
-  public static ClassFileTransformer installBytebuddyAgent(
-      final Instrumentation inst,
-      final boolean skipAdditionalLibraryMatcher,
-      final Set<InstrumenterModule.TargetSystem> enabledSystems,
-      final boolean adviceTransformationDiagnosticsEnabled,
-      final AgentBuilder.Listener... listeners) {
-    Utils.setInstrumentation(inst);
-
-    TypePoolFacade.registerAsSupplier();
-
-    if (InstrumenterConfig.get().isResolverMemoizingEnabled()) {
-      MemoizedMatchers.registerAsSupplier();
-    } else {
-      DDElementMatchers.registerAsSupplier();
-    }
+    private static final List<Runnable> LOG_MANAGER_CALLBACKS = new CopyOnWriteArrayList<>();
+    private static final List<Runnable> MBEAN_SERVER_BUILDER_CALLBACKS = new CopyOnWriteArrayList<>();
 
-    if (enabledSystems.contains(InstrumenterModule.TargetSystem.USM)) {
-      UsmMessageFactoryImpl.registerAsSupplier();
-      UsmExtractorImpl.registerAsSupplier();
-    }
+    private static final long GLOBAL_OBJECT_STORE_CLEAN_FREQUENCY_SECONDS = 1;
 
-    // By default ByteBuddy will skip all methods that are synthetic or default finalizer
-    // but we need to instrument some synthetic methods in Scala, so change the ignore matcher
-    ByteBuddy byteBuddy =
-        new ByteBuddy().ignore(new LatentMatcher.Resolved<>(isDefaultFinalizer()));
-
-    boolean simpleMethodGraph = InstrumenterConfig.get().isResolverSimpleMethodGraph();
-    if (simpleMethodGraph) {
-      // faster compiler that just considers visibility of locally declared methods
-      byteBuddy =
-          byteBuddy
-              .with(MethodGraph.Compiler.ForDeclaredMethods.INSTANCE)
-              .with(VisibilityBridgeStrategy.Default.NEVER)
-              .with(InstrumentedType.Factory.Default.FROZEN);
+    static {
+        enableByteBuddyRawTypes();
+        disableByteBuddyNexus();
+        // register weak map supplier as early as possible
+        WeakMaps.registerAsSupplier();
+        circularityErrorWorkaround();
     }
 
-    AgentBuilder agentBuilder = new AgentBuilder.Default(byteBuddy);
-    if (simpleMethodGraph) {
-      // faster strategy that assumes transformations use @Advice or AsmVisitorWrapper
-      agentBuilder = agentBuilder.with(AgentBuilder.TypeStrategy.Default.DECORATE);
+    @SuppressForbidden
+    private static void circularityErrorWorkaround() {
+        // these classes have been involved in intermittent ClassCircularityErrors during startup
+        // they don't need context storage, so it's safe to load them before installing the agent
+        try {
+            Class.forName("java.util.concurrent.ThreadLocalRandom");
+        } catch (Throwable ignore) {
+        }
     }
 
-    agentBuilder =
-        agentBuilder
-            .disableClassFormatChanges()
-            .assureReadEdgeTo(inst, FieldBackedContextAccessor.class)
-            .with(AgentStrategies.transformerDecorator())
-            .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
-            .with(AgentStrategies.rediscoveryStrategy())
-            .with(AgentStrategies.locationStrategy())
-            .with(AgentStrategies.poolStrategy())
-            .with(AgentBuilder.DescriptionStrategy.Default.POOL_ONLY)
-            .with(AgentStrategies.bufferStrategy())
-            .with(AgentStrategies.typeStrategy())
-            .with(new ClassLoadListener())
-            // FIXME: we cannot enable it yet due to BB/JVM bug, see
-            // https://github.com/raphw/byte-buddy/issues/558
-            // .with(AgentBuilder.LambdaInstrumentationStrategy.ENABLED)
-            .ignore(globalIgnoresMatcher(skipAdditionalLibraryMatcher));
-
-    if (DEBUG) {
-      agentBuilder =
-          agentBuilder
-              .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
-              .with(AgentStrategies.rediscoveryStrategy())
-              .with(new RedefinitionLoggingListener())
-              .with(new TransformLoggingListener());
+    public static void installBytebuddyAgent(final Instrumentation inst) {
+        /*
+         * ByteBuddy agent is used by several systems which can be enabled independently;
+         * we need to install the agent whenever any of them is active.
+         */
+        Set<InstrumenterModule.TargetSystem> enabledSystems = getEnabledSystems();
+        if (!enabledSystems.isEmpty()) {
+            installBytebuddyAgent(inst, false, enabledSystems);
+            if (DEBUG) {
+                log.debug("Instrumentation installed for {}", enabledSystems);
+            }
+            int poolCleaningInterval = InstrumenterConfig.get().getResolverResetInterval();
+            if (poolCleaningInterval > 0) {
+                AgentTaskScheduler.get()
+                        .scheduleAtFixedRate(
+                                SharedTypePools::clear,
+                                poolCleaningInterval,
+                                Math.max(poolCleaningInterval, 10),
+                                TimeUnit.SECONDS);
+            }
+        } else if (DEBUG) {
+            log.debug("No target systems enabled, skipping instrumentation.");
+        }
     }
 
-    for (final AgentBuilder.Listener listener : listeners) {
-      agentBuilder = agentBuilder.with(listener);
-    }
+    /**
+     * Install the core bytebuddy agent along with all registered {@link InstrumenterModule}s.
+     *
+     * @return the agent's class transformer
+     */
+    public static ClassFileTransformer installBytebuddyAgent(
+            final Instrumentation inst,
+            final boolean skipAdditionalLibraryMatcher,
+            final Set<InstrumenterModule.TargetSystem> enabledSystems,
+            final AgentBuilder.Listener... listeners) {
+        return installBytebuddyAgent(inst, skipAdditionalLibraryMatcher, enabledSystems, DEBUG, listeners);
+    }
+
+    @VisibleForTesting
+    public static ClassFileTransformer installBytebuddyAgent(
+            final Instrumentation inst,
+            final boolean skipAdditionalLibraryMatcher,
+            final Set<InstrumenterModule.TargetSystem> enabledSystems,
+            final boolean adviceTransformationDiagnosticsEnabled,
+            final AgentBuilder.Listener... listeners) {
+        Utils.setInstrumentation(inst);
+
+        TypePoolFacade.registerAsSupplier();
+
+        if (InstrumenterConfig.get().isResolverMemoizingEnabled()) {
+            MemoizedMatchers.registerAsSupplier();
+        } else {
+            DDElementMatchers.registerAsSupplier();
+        }
 
-    InstrumenterIndex instrumenterIndex = InstrumenterIndex.readIndex();
+        if (enabledSystems.contains(InstrumenterModule.TargetSystem.USM)) {
+            UsmMessageFactoryImpl.registerAsSupplier();
+            UsmExtractorImpl.registerAsSupplier();
+        }
 
-    // pre-size state before registering instrumentations to reduce number of allocations
-    InstrumenterState.initialize(instrumenterIndex.instrumentationCount());
+        // By default ByteBuddy will skip all methods that are synthetic or default finalizer
+        // but we need to instrument some synthetic methods in Scala, so change the ignore matcher
+        ByteBuddy byteBuddy = new ByteBuddy().ignore(new LatentMatcher.Resolved<>(isDefaultFinalizer()));
+
+        boolean simpleMethodGraph = InstrumenterConfig.get().isResolverSimpleMethodGraph();
+        if (simpleMethodGraph) {
+            // faster compiler that just considers visibility of locally declared methods
+            byteBuddy = byteBuddy
+                    .with(MethodGraph.Compiler.ForDeclaredMethods.INSTANCE)
+                    .with(VisibilityBridgeStrategy.Default.NEVER)
+                    .with(InstrumentedType.Factory.Default.FROZEN);
+        }
 
-    // combine known modules indexed at build-time with extensions contributed at run-time
-    Iterable<InstrumenterModule> instrumenterModules =
-        withExtensions(instrumenterIndex.modules(enabledSystems));
+        AgentBuilder agentBuilder = new AgentBuilder.Default(byteBuddy);
+        if (simpleMethodGraph) {
+            // faster strategy that assumes transformations use @Advice or AsmVisitorWrapper
+            agentBuilder = agentBuilder.with(AgentBuilder.TypeStrategy.Default.DECORATE);
+        }
 
-    final boolean javaModuleSupported = JavaModule.isSupported();
+        agentBuilder = agentBuilder
+                .disableClassFormatChanges()
+                .assureReadEdgeTo(inst, FieldBackedContextAccessor.class)
+                .with(AgentStrategies.transformerDecorator())
+                .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
+                .with(AgentStrategies.rediscoveryStrategy())
+                .with(AgentStrategies.locationStrategy())
+                .with(AgentStrategies.poolStrategy())
+                .with(AgentBuilder.DescriptionStrategy.Default.POOL_ONLY)
+                .with(AgentStrategies.bufferStrategy())
+                .with(AgentStrategies.typeStrategy())
+                .with(new ClassLoadListener())
+                // FIXME: we cannot enable it yet due to BB/JVM bug, see
+                // https://github.com/raphw/byte-buddy/issues/558
+                // .with(AgentBuilder.LambdaInstrumentationStrategy.ENABLED)
+                .ignore(globalIgnoresMatcher(skipAdditionalLibraryMatcher));
 
-    // This needs to be a separate loop through all instrumentations before we start adding
-    // advice so that we can exclude field injection, since that will try to check exclusion
-    // immediately and we don't have the ability to express dependencies between different
-    // instrumentations to control the load order.
-    for (InstrumenterModule module : instrumenterModules) {
-      if (module instanceof ExcludeFilterProvider) {
-        ExcludeFilterProvider provider = (ExcludeFilterProvider) module;
-        ExcludeFilter.add(provider.excludedClasses());
         if (DEBUG) {
-          log.debug(
-              "Registering exclude-filter module - instrumentation.class={}",
-              module.getClass().getName());
+            agentBuilder = agentBuilder
+                    .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
+                    .with(AgentStrategies.rediscoveryStrategy())
+                    .with(new RedefinitionLoggingListener())
+                    .with(new TransformLoggingListener());
         }
-      }
-      if (javaModuleSupported && module instanceof JavaModuleOpenProvider) {
-        JpmsHelper.addTriggers(((JavaModuleOpenProvider) module).triggerClasses());
-        if (DEBUG) {
-          log.debug(
-              "Registering JPMS trigger module - instrumentation.class={}",
-              module.getClass().getName());
+
+        for (final AgentBuilder.Listener listener : listeners) {
+            agentBuilder = agentBuilder.with(listener);
         }
-      }
-    }
 
-    CombiningTransformerBuilder transformerBuilder =
-        new CombiningTransformerBuilder(
-            agentBuilder,
-            instrumenterIndex,
-            enabledSystems,
-            adviceTransformationDiagnosticsEnabled);
+        InstrumenterIndex instrumenterIndex = InstrumenterIndex.readIndex();
+
+        // pre-size state before registering instrumentations to reduce number of allocations
+        InstrumenterState.initialize(instrumenterIndex.instrumentationCount());
+
+        // combine known modules indexed at build-time with extensions contributed at run-time
+        Iterable<InstrumenterModule> instrumenterModules = withExtensions(instrumenterIndex.modules(enabledSystems));
+
+        final boolean javaModuleSupported = JavaModule.isSupported();
+
+        // This needs to be a separate loop through all instrumentations before we start adding
+        // advice so that we can exclude field injection, since that will try to check exclusion
+        // immediately and we don't have the ability to express dependencies between different
+        // instrumentations to control the load order.
+        for (InstrumenterModule module : instrumenterModules) {
+            if (module instanceof ExcludeFilterProvider) {
+                ExcludeFilterProvider provider = (ExcludeFilterProvider) module;
+                ExcludeFilter.add(provider.excludedClasses());
+                if (DEBUG) {
+                    log.debug(
+                            "Registering exclude-filter module - instrumentation.class={}",
+                            module.getClass().getName());
+                }
+            }
+            if (javaModuleSupported && module instanceof JavaModuleOpenProvider) {
+                JpmsHelper.addTriggers(((JavaModuleOpenProvider) module).triggerClasses());
+                if (DEBUG) {
+                    log.debug(
+                            "Registering JPMS trigger module - instrumentation.class={}",
+                            module.getClass().getName());
+                }
+            }
+        }
 
-    int installedCount = 0;
-    for (InstrumenterModule module : instrumenterModules) {
-      if (!module.isApplicable(enabledSystems)) {
+        CombiningTransformerBuilder transformerBuilder = new CombiningTransformerBuilder(
+                agentBuilder, instrumenterIndex, enabledSystems, adviceTransformationDiagnosticsEnabled);
+
+        int installedCount = 0;
+        for (InstrumenterModule module : instrumenterModules) {
+            if (!module.isApplicable(enabledSystems)) {
+                if (DEBUG) {
+                    log.debug(
+                            "Not applicable - instrumentation.class={}",
+                            module.getClass().getName());
+                }
+                continue;
+            }
+            if (DEBUG) {
+                log.debug(
+                        "Loading - instrumentation.class={}", module.getClass().getName());
+            }
+            try {
+                transformerBuilder.applyInstrumentation(module);
+                installedCount++;
+            } catch (Exception | LinkageError e) {
+                log.error(
+                        "Failed to load - instrumentation.class={}",
+                        module.getClass().getName(),
+                        e);
+            }
+        }
         if (DEBUG) {
-          log.debug("Not applicable - instrumentation.class={}", module.getClass().getName());
-        }
-        continue;
-      }
-      if (DEBUG) {
-        log.debug("Loading - instrumentation.class={}", module.getClass().getName());
-      }
-      try {
-        transformerBuilder.applyInstrumentation(module);
-        installedCount++;
-      } catch (Exception | LinkageError e) {
-        log.error("Failed to load - instrumentation.class={}", module.getClass().getName(), e);
-      }
-    }
-    if (DEBUG) {
-      log.debug("Installed {} instrumenter(s)", installedCount);
-    }
+            log.debug("Installed {} instrumenter(s)", installedCount);
+        }
+
+        if (!Platform.isNativeImageBuilder()) {
+            InstrumenterFlare.register();
+        }
+
+        if (InstrumenterConfig.get().isTelemetryEnabled()) {
+            InstrumenterState.setObserver(new InstrumenterState.Observer() {
+                @Override
+                public void applied(Iterable<String> instrumentationNames) {
+                    IntegrationsCollector.get().update(instrumentationNames, true);
+                }
+            });
+        }
+
+        if (!InstrumenterConfig.get().isRuntimeContextMapPerStore()) {
+            AgentTaskScheduler.get()
+                    .scheduleAtFixedRate(
+                            GlobalObjectStore::removeStaleEntries,
+                            GLOBAL_OBJECT_STORE_CLEAN_FREQUENCY_SECONDS,
+                            GLOBAL_OBJECT_STORE_CLEAN_FREQUENCY_SECONDS,
+                            TimeUnit.SECONDS);
+        }
 
-    if (!Platform.isNativeImageBuilder()) {
-      InstrumenterFlare.register();
+        InstrumenterState.resetDefaultState();
+        try {
+            return transformerBuilder.installOn(inst);
+        } finally {
+            SharedTypePools.endInstall();
+        }
     }
 
-    if (InstrumenterConfig.get().isTelemetryEnabled()) {
-      InstrumenterState.setObserver(
-          new InstrumenterState.Observer() {
-            @Override
-            public void applied(Iterable<String> instrumentationNames) {
-              IntegrationsCollector.get().update(instrumentationNames, true);
+    /** Returns an iterable that combines the original sequence with any discovered extensions. */
+    private static Iterable<InstrumenterModule> withExtensions(Iterable<InstrumenterModule> initial) {
+        String extensionsPath = InstrumenterConfig.get().getTraceExtensionsPath();
+        if (null != extensionsPath) {
+            if (findExtensions(extensionsPath, InstrumenterModule.class)) {
+                final List<InstrumenterModule> extensions = loadExtensions(InstrumenterModule.class);
+                extensions.sort(Comparator.comparingInt(InstrumenterModule::order));
+                return new Iterable<InstrumenterModule>() {
+                    @Override
+                    public Iterator<InstrumenterModule> iterator() {
+                        return withExtensions(initial.iterator(), extensions);
+                    }
+                };
             }
-          });
+        }
+        return initial;
     }
 
-    if (!InstrumenterConfig.get().isRuntimeContextMapPerStore()) {
-      AgentTaskScheduler.get()
-          .scheduleAtFixedRate(
-              GlobalObjectStore::removeStaleEntries,
-              GLOBAL_OBJECT_STORE_CLEAN_FREQUENCY_SECONDS,
-              GLOBAL_OBJECT_STORE_CLEAN_FREQUENCY_SECONDS,
-              TimeUnit.SECONDS);
-    }
+    /** Returns an iterator that combines the original sequence with any discovered extensions. */
+    private static Iterator<InstrumenterModule> withExtensions(
+            final Iterator<InstrumenterModule> initial, final Iterable<InstrumenterModule> extensions) {
+        return new Iterator<InstrumenterModule>() {
+            private Iterator<InstrumenterModule> delegate = initial;
 
-    InstrumenterState.resetDefaultState();
-    try {
-      return transformerBuilder.installOn(inst);
-    } finally {
-      SharedTypePools.endInstall();
-    }
-  }
-
-  /** Returns an iterable that combines the original sequence with any discovered extensions. */
-  private static Iterable<InstrumenterModule> withExtensions(Iterable<InstrumenterModule> initial) {
-    String extensionsPath = InstrumenterConfig.get().getTraceExtensionsPath();
-    if (null != extensionsPath) {
-      if (findExtensions(extensionsPath, InstrumenterModule.class)) {
-        final List<InstrumenterModule> extensions = loadExtensions(InstrumenterModule.class);
-        extensions.sort(Comparator.comparingInt(InstrumenterModule::order));
-        return new Iterable<InstrumenterModule>() {
-          @Override
-          public Iterator<InstrumenterModule> iterator() {
-            return withExtensions(initial.iterator(), extensions);
-          }
+            @Override
+            public boolean hasNext() {
+                if (delegate.hasNext()) {
+                    return true;
+                } else if (delegate == initial) {
+                    delegate = extensions.iterator();
+                    return delegate.hasNext();
+                } else {
+                    return false;
+                }
+            }
+
+            @Override
+            public InstrumenterModule next() {
+                if (hasNext()) {
+                    return delegate.next();
+                } else {
+                    throw new NoSuchElementException();
+                }
+            }
         };
-      }
     }
-    return initial;
-  }
-
-  /** Returns an iterator that combines the original sequence with any discovered extensions. */
-  private static Iterator<InstrumenterModule> withExtensions(
-      final Iterator<InstrumenterModule> initial, final Iterable<InstrumenterModule> extensions) {
-    return new Iterator<InstrumenterModule>() {
-      private Iterator<InstrumenterModule> delegate = initial;
-
-      @Override
-      public boolean hasNext() {
-        if (delegate.hasNext()) {
-          return true;
-        } else if (delegate == initial) {
-          delegate = extensions.iterator();
-          return delegate.hasNext();
-        } else {
-          return false;
-        }
-      }
 
-      @Override
-      public InstrumenterModule next() {
-        if (hasNext()) {
-          return delegate.next();
-        } else {
-          throw new NoSuchElementException();
-        }
-      }
-    };
-  }
-
-  public static Set<InstrumenterModule.TargetSystem> getEnabledSystems() {
-    EnumSet<InstrumenterModule.TargetSystem> enabledSystems =
-        EnumSet.of(InstrumenterModule.TargetSystem.CONTEXT_TRACKING);
-    InstrumenterConfig cfg = InstrumenterConfig.get();
-    if (cfg.isTraceEnabled()) {
-      enabledSystems.add(InstrumenterModule.TargetSystem.TRACING);
-    }
-    if (cfg.isProfilingEnabled()) {
-      enabledSystems.add(InstrumenterModule.TargetSystem.PROFILING);
-    }
-    if (cfg.getAppSecActivation() != ProductActivation.FULLY_DISABLED) {
-      enabledSystems.add(InstrumenterModule.TargetSystem.APPSEC);
-    }
-    if (cfg.getIastActivation() != ProductActivation.FULLY_DISABLED) {
-      enabledSystems.add(InstrumenterModule.TargetSystem.IAST);
-    }
-    if (cfg.isRaspEnabled()) {
-      enabledSystems.add(InstrumenterModule.TargetSystem.RASP);
+    public static Set<InstrumenterModule.TargetSystem> getEnabledSystems() {
+        EnumSet<InstrumenterModule.TargetSystem> enabledSystems =
+                EnumSet.of(InstrumenterModule.TargetSystem.CONTEXT_TRACKING);
+        InstrumenterConfig cfg = InstrumenterConfig.get();
+        if (cfg.isTraceEnabled()) {
+            enabledSystems.add(InstrumenterModule.TargetSystem.TRACING);
+        }
+        if (cfg.isProfilingEnabled()) {
+            enabledSystems.add(InstrumenterModule.TargetSystem.PROFILING);
+        }
+        if (cfg.getAppSecActivation() != ProductActivation.FULLY_DISABLED) {
+            enabledSystems.add(InstrumenterModule.TargetSystem.APPSEC);
+        }
+        if (cfg.getIastActivation() != ProductActivation.FULLY_DISABLED) {
+            enabledSystems.add(InstrumenterModule.TargetSystem.IAST);
+        }
+        if (cfg.isRaspEnabled()) {
+            enabledSystems.add(InstrumenterModule.TargetSystem.RASP);
+        }
+        if (cfg.isCiVisibilityEnabled()) {
+            enabledSystems.add(InstrumenterModule.TargetSystem.CIVISIBILITY);
+        }
+        if (cfg.isUsmEnabled()) {
+            enabledSystems.add(InstrumenterModule.TargetSystem.USM);
+        }
+        if (cfg.isLlmObsEnabled()) {
+            enabledSystems.add(InstrumenterModule.TargetSystem.LLMOBS);
+        }
+        return enabledSystems;
     }
-    if (cfg.isCiVisibilityEnabled()) {
-      enabledSystems.add(InstrumenterModule.TargetSystem.CIVISIBILITY);
+
+    private static void enableByteBuddyRawTypes() {
+        temporaryOverride("net.bytebuddy.raw", "true", AgentInstaller::rawTypesEnabled);
     }
-    if (cfg.isUsmEnabled()) {
-      enabledSystems.add(InstrumenterModule.TargetSystem.USM);
+
+    private static boolean rawTypesEnabled() {
+        return TypeDescription.AbstractBase.RAW_TYPES; // must avoid touching this before the override
     }
-    if (cfg.isLlmObsEnabled()) {
-      enabledSystems.add(InstrumenterModule.TargetSystem.LLMOBS);
+
+    private static void disableByteBuddyNexus() {
+        // disable byte-buddy's Nexus mechanism (we don't need it, and it triggers use of Unsafe)
+        temporaryOverride("net.bytebuddy.nexus.disabled", "true", AgentInstaller::nexusDisabled);
     }
-    return enabledSystems;
-  }
-
-  private static void enableByteBuddyRawTypes() {
-    temporaryOverride("net.bytebuddy.raw", "true", AgentInstaller::rawTypesEnabled);
-  }
-
-  private static boolean rawTypesEnabled() {
-    return TypeDescription.AbstractBase.RAW_TYPES; // must avoid touching this before the override
-  }
-
-  private static void disableByteBuddyNexus() {
-    // disable byte-buddy's Nexus mechanism (we don't need it, and it triggers use of Unsafe)
-    temporaryOverride("net.bytebuddy.nexus.disabled", "true", AgentInstaller::nexusDisabled);
-  }
-
-  private static boolean nexusDisabled() {
-    return !NexusAccessor.isAlive(); // must avoid touching this before the override
-  }
-
-  /** Temporarily overrides a system property while checking it's had the intended side effect. */
-  private static void temporaryOverride(String key, String value, BooleanSupplier sideEffect) {
-    final String savedPropertyValue = SystemProperties.get(key);
-    final boolean overridden = SystemProperties.set(key, value);
-    if (!sideEffect.getAsBoolean() && DEBUG) {
-      log.debug("Too late to apply {}={}", key, value);
+
+    private static boolean nexusDisabled() {
+        return !NexusAccessor.isAlive(); // must avoid touching this before the override
     }
-    if (overridden) {
-      if (savedPropertyValue == null) {
-        SystemProperties.clear(key);
-      } else {
-        SystemProperties.set(key, savedPropertyValue);
-      }
+
+    /** Temporarily overrides a system property while checking it's had the intended side effect. */
+    private static void temporaryOverride(String key, String value, BooleanSupplier sideEffect) {
+        final String savedPropertyValue = SystemProperties.get(key);
+        final boolean overridden = SystemProperties.set(key, value);
+        if (!sideEffect.getAsBoolean() && DEBUG) {
+            log.debug("Too late to apply {}={}", key, value);
+        }
+        if (overridden) {
+            if (savedPropertyValue == null) {
+                SystemProperties.clear(key);
+            } else {
+                SystemProperties.set(key, savedPropertyValue);
+            }
+        }
     }
-  }
 
-  static class RedefinitionLoggingListener implements AgentBuilder.RedefinitionStrategy.Listener {
+    static class RedefinitionLoggingListener implements AgentBuilder.RedefinitionStrategy.Listener {
 
-    private static final Logger log = LoggerFactory.getLogger(RedefinitionLoggingListener.class);
+        private static final Logger log = LoggerFactory.getLogger(RedefinitionLoggingListener.class);
 
-    @Override
-    public void onBatch(final int index, final List<Class<?>> batch, final List<Class<?>> types) {}
+        @Override
+        public void onBatch(final int index, final List<Class<?>> batch, final List<Class<?>> types) {}
 
-    @Override
-    public Iterable<? extends List<Class<?>>> onError(
-        final int index,
-        final List<Class<?>> batch,
-        final Throwable throwable,
-        final List<Class<?>> types) {
-      if (DEBUG) {
-        log.debug("Exception while retransforming {} classes: {}", batch.size(), batch, throwable);
-      }
-      return Collections.emptyList();
-    }
+        @Override
+        public Iterable<? extends List<Class<?>>> onError(
+                final int index, final List<Class<?>> batch, final Throwable throwable, final List<Class<?>> types) {
+            if (DEBUG) {
+                log.debug("Exception while retransforming {} classes: {}", batch.size(), batch, throwable);
+            }
+            return Collections.emptyList();
+        }
 
-    @Override
-    public void onComplete(
-        final int amount,
-        final List<Class<?>> types,
-        final Map<List<Class<?>>, Throwable> failures) {}
-  }
-
-  static class TransformLoggingListener implements AgentBuilder.Listener {
-
-    private static final Logger log = LoggerFactory.getLogger(TransformLoggingListener.class);
-
-    @Override
-    public void onError(
-        final String typeName,
-        final ClassLoader classLoader,
-        final JavaModule module,
-        final boolean loaded,
-        final Throwable throwable) {
-      if (DEBUG) {
-        if (throwable instanceof AdviceTransformationException) {
-          AdviceTransformationException failure = (AdviceTransformationException) throwable;
-          try {
-            InstrumenterFlare.recordTransformationError(
-                "instrumentation.class="
-                    + failure.getInstrumentationClass()
-                    + " advice.class="
-                    + failure.getAdviceClass()
-                    + " instrumentation.target.class="
-                    + failure.getTargetClass()
-                    + " instrumentation.target.method="
-                    + failure.getTargetMethod()
-                    + " instrumentation.target.loaded="
-                    + loaded
-                    + " instrumentation.target.classloader="
-                    + classLoader
-                    + " error="
-                    + failure.getCause());
-          } catch (RuntimeException ignored) {
-            // Flare collection must not interfere with transformation failure reporting.
-          }
-          log.debug(
-              "Advice transformation failed - instrumentation.class={} advice.class={} instrumentation.target.class={} instrumentation.target.method={} instrumentation.target.loaded={} instrumentation.target.classloader={}",
-              failure.getInstrumentationClass(),
-              failure.getAdviceClass(),
-              failure.getTargetClass(),
-              failure.getTargetMethod(),
-              loaded,
-              classLoader,
-              failure.getCause());
-        } else {
-          log.debug(
-              "Transformation failed - instrumentation.target.class={} instrumentation.target.loaded={} instrumentation.target.classloader={}",
-              typeName,
-              loaded,
-              classLoader,
-              throwable);
-        }
-      }
-    }
+        @Override
+        public void onComplete(
+                final int amount, final List<Class<?>> types, final Map<List<Class<?>>, Throwable> failures) {}
+    }
+
+    static class TransformLoggingListener implements AgentBuilder.Listener {
+
+        private static final Logger log = LoggerFactory.getLogger(TransformLoggingListener.class);
+
+        @Override
+        public void onError(
+                final String typeName,
+                final ClassLoader classLoader,
+                final JavaModule module,
+                final boolean loaded,
+                final Throwable throwable) {
+            if (DEBUG) {
+                if (throwable instanceof AdviceTransformationException) {
+                    AdviceTransformationException failure = (AdviceTransformationException) throwable;
+                    try {
+                        InstrumenterFlare.recordTransformationError("instrumentation.class="
+                                + failure.getInstrumentationClass()
+                                + " advice.class="
+                                + failure.getAdviceClass()
+                                + " instrumentation.target.class="
+                                + failure.getTargetClass()
+                                + " instrumentation.target.method="
+                                + failure.getTargetMethod()
+                                + " instrumentation.target.loaded="
+                                + loaded
+                                + " instrumentation.target.classloader="
+                                + classLoader
+                                + " error="
+                                + failure.getCause());
+                    } catch (RuntimeException ignored) {
+                        // Flare collection must not interfere with transformation failure reporting.
+                    }
+                    log.debug(
+                            "Advice transformation failed - instrumentation.class={} advice.class={} instrumentation.target.class={} instrumentation.target.method={} instrumentation.target.loaded={} instrumentation.target.classloader={}",
+                            failure.getInstrumentationClass(),
+                            failure.getAdviceClass(),
+                            failure.getTargetClass(),
+                            failure.getTargetMethod(),
+                            loaded,
+                            classLoader,
+                            failure.getCause());
+                } else {
+                    log.debug(
+                            "Transformation failed - instrumentation.target.class={} instrumentation.target.loaded={} instrumentation.target.classloader={}",
+                            typeName,
+                            loaded,
+                            classLoader,
+                            throwable);
+                }
+            }
+        }
 
-    @Override
-    public void onTransformation(
-        final TypeDescription typeDescription,
-        final ClassLoader classLoader,
-        final JavaModule module,
-        final boolean loaded,
-        final DynamicType dynamicType) {
-      if (DEBUG) {
-        log.debug(
-            "Transformed - instrumentation.target.class={} instrumentation.target.classloader={}",
-            typeDescription.getName(),
-            classLoader);
-      }
-    }
+        @Override
+        public void onTransformation(
+                final TypeDescription typeDescription,
+                final ClassLoader classLoader,
+                final JavaModule module,
+                final boolean loaded,
+                final DynamicType dynamicType) {
+            if (DEBUG) {
+                log.debug(
+                        "Transformed - instrumentation.target.class={} instrumentation.target.classloader={}",
+                        typeDescription.getName(),
+                        classLoader);
+            }
+        }
 
-    @Override
-    public void onIgnored(
-        final TypeDescription typeDescription,
-        final ClassLoader classLoader,
-        final JavaModule module,
-        final boolean loaded) {
-      //      log.debug("onIgnored {}", typeDescription.getName());
-    }
+        @Override
+        public void onIgnored(
+                final TypeDescription typeDescription,
+                final ClassLoader classLoader,
+                final JavaModule module,
+                final boolean loaded) {
+            //      log.debug("onIgnored {}", typeDescription.getName());
+        }
 
-    @Override
-    public void onComplete(
-        final String typeName,
-        final ClassLoader classLoader,
-        final JavaModule module,
-        final boolean loaded) {
-      //      log.debug("onComplete {}", typeName);
-    }
+        @Override
+        public void onComplete(
+                final String typeName, final ClassLoader classLoader, final JavaModule module, final boolean loaded) {
+            //      log.debug("onComplete {}", typeName);
+        }
 
-    @Override
-    public void onDiscovery(
-        final String typeName,
-        final ClassLoader classLoader,
-        final JavaModule module,
-        final boolean loaded) {
-      //      log.debug("onDiscovery {}", typeName);
+        @Override
+        public void onDiscovery(
+                final String typeName, final ClassLoader classLoader, final JavaModule module, final boolean loaded) {
+            //      log.debug("onDiscovery {}", typeName);
+        }
     }
-  }
-
-  /**
-   * Register a callback to run when a class is loading.
-   *
-   * <p>Caveats:
-   *
-   * <ul>
-   *   <li>This callback will be invoked by a jvm class transformer.
-   *   <li>Classes filtered out by {@link AgentInstaller}'s skip list will not be matched.
-   * </ul>
-   *
-   * @param className name of the class to match against
-   * @param callback runnable to invoke when class name matches
-   */
-  public static void registerClassLoadCallback(final String className, final Runnable callback) {
-    if ("java.util.logging.LogManager".equals(className)) {
-      LOG_MANAGER_CALLBACKS.add(callback);
-    } else if ("javax.management.MBeanServerBuilder".equals(className)) {
-      MBEAN_SERVER_BUILDER_CALLBACKS.add(callback);
-    } else if (DEBUG) {
-      log.debug("Callback not registered for unexpected class {}", className);
+
+    /**
+     * Register a callback to run when a class is loading.
+     *
+     * <p>Caveats:
+     *
+     * <ul>
+     *   <li>This callback will be invoked by a jvm class transformer.
+     *   <li>Classes filtered out by {@link AgentInstaller}'s skip list will not be matched.
+     * </ul>
+     *
+     * @param className name of the class to match against
+     * @param callback runnable to invoke when class name matches
+     */
+    public static void registerClassLoadCallback(final String className, final Runnable callback) {
+        if ("java.util.logging.LogManager".equals(className)) {
+            LOG_MANAGER_CALLBACKS.add(callback);
+        } else if ("javax.management.MBeanServerBuilder".equals(className)) {
+            MBEAN_SERVER_BUILDER_CALLBACKS.add(callback);
+        } else if (DEBUG) {
+            log.debug("Callback not registered for unexpected class {}", className);
+        }
     }
-  }
-
-  private static class ClassLoadListener implements AgentBuilder.Listener {
-    @Override
-    public void onDiscovery(
-        final String typeName,
-        final ClassLoader classLoader,
-        final JavaModule javaModule,
-        final boolean b) {}
-
-    @Override
-    public void onTransformation(
-        final TypeDescription typeDescription,
-        final ClassLoader classLoader,
-        final JavaModule javaModule,
-        final boolean b,
-        final DynamicType dynamicType) {}
-
-    @Override
-    public void onIgnored(
-        final TypeDescription typeDescription,
-        final ClassLoader classLoader,
-        final JavaModule javaModule,
-        final boolean b) {}
-
-    @Override
-    public void onError(
-        final String s,
-        final ClassLoader classLoader,
-        final JavaModule javaModule,
-        final boolean b,
-        final Throwable throwable) {}
-
-    @Override
-    public void onComplete(
-        final String typeName,
-        final ClassLoader classLoader,
-        final JavaModule javaModule,
-        final boolean b) {
-      final List<Runnable> callbacks;
-      // On Java 17 java.util.logging.LogManager is loaded early even though it's not initialized,
-      // so wait for the LoggerContext to be initialized before the callbacks are processed.
-      if ("java.util.logging.LogManager$LoggerContext".equals(typeName)) {
-        callbacks = LOG_MANAGER_CALLBACKS;
-      } else if ("javax.management.MBeanServerBuilder".equals(typeName)) {
-        callbacks = MBEAN_SERVER_BUILDER_CALLBACKS;
-      } else {
-        callbacks = null;
-      }
-      if (callbacks != null) {
-        for (final Runnable callback : callbacks) {
-          callback.run();
-        }
-      }
+
+    private static class ClassLoadListener implements AgentBuilder.Listener {
+        @Override
+        public void onDiscovery(
+                final String typeName, final ClassLoader classLoader, final JavaModule javaModule, final boolean b) {}
+
+        @Override
+        public void onTransformation(
+                final TypeDescription typeDescription,
+                final ClassLoader classLoader,
+                final JavaModule javaModule,
+                final boolean b,
+                final DynamicType dynamicType) {}
+
+        @Override
+        public void onIgnored(
+                final TypeDescription typeDescription,
+                final ClassLoader classLoader,
+                final JavaModule javaModule,
+                final boolean b) {}
+
+        @Override
+        public void onError(
+                final String s,
+                final ClassLoader classLoader,
+                final JavaModule javaModule,
+                final boolean b,
+                final Throwable throwable) {}
+
+        @Override
+        public void onComplete(
+                final String typeName, final ClassLoader classLoader, final JavaModule javaModule, final boolean b) {
+            final List<Runnable> callbacks;
+            // On Java 17 java.util.logging.LogManager is loaded early even though it's not initialized,
+            // so wait for the LoggerContext to be initialized before the callbacks are processed.
+            if ("java.util.logging.LogManager$LoggerContext".equals(typeName)) {
+                callbacks = LOG_MANAGER_CALLBACKS;
+            } else if ("javax.management.MBeanServerBuilder".equals(typeName)) {
+                callbacks = MBEAN_SERVER_BUILDER_CALLBACKS;
+            } else {
+                callbacks = null;
+            }
+            if (callbacks != null) {
+                for (final Runnable callback : callbacks) {
+                    callback.run();
+                }
+            }
+        }
     }
-  }
 
-  private AgentInstaller() {}
+    private AgentInstaller() {}
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentStrategies.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentStrategies.java
index 59a647d888a..140b3b87dc2 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentStrategies.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentStrategies.java
@@ -21,53 +21,52 @@
  * logic out.
  */
 public class AgentStrategies {
-  private static final Logger log = LoggerFactory.getLogger(AgentStrategies.class);
+    private static final Logger log = LoggerFactory.getLogger(AgentStrategies.class);
 
-  private static TransformerDecorator loadTransformerDecorator() {
-    if (JavaVirtualMachine.isJavaVersionAtLeast(9)) {
-      try {
-        return (TransformerDecorator)
-            Instrumenter.class
-                .getClassLoader()
-                .loadClass("datadog.trace.agent.tooling.bytebuddy.DDJava9ClassFileTransformer")
-                .getField("DECORATOR")
-                .get(null);
-      } catch (Throwable e) {
-        log.warn("Problem loading Java9 Module support, falling back to legacy transformer", e);
-      }
+    private static TransformerDecorator loadTransformerDecorator() {
+        if (JavaVirtualMachine.isJavaVersionAtLeast(9)) {
+            try {
+                return (TransformerDecorator) Instrumenter.class
+                        .getClassLoader()
+                        .loadClass("datadog.trace.agent.tooling.bytebuddy.DDJava9ClassFileTransformer")
+                        .getField("DECORATOR")
+                        .get(null);
+            } catch (Throwable e) {
+                log.warn("Problem loading Java9 Module support, falling back to legacy transformer", e);
+            }
+        }
+        return DDClassFileTransformer.DECORATOR;
     }
-    return DDClassFileTransformer.DECORATOR;
-  }
 
-  private static final TransformerDecorator TRANSFORMER_DECORATOR = loadTransformerDecorator();
-  private static final DiscoveryStrategy REDISCOVERY_STRATEGY = new DDRediscoveryStrategy();
-  private static final LocationStrategy LOCATION_STRATEGY = new DDLocationStrategy();
+    private static final TransformerDecorator TRANSFORMER_DECORATOR = loadTransformerDecorator();
+    private static final DiscoveryStrategy REDISCOVERY_STRATEGY = new DDRediscoveryStrategy();
+    private static final LocationStrategy LOCATION_STRATEGY = new DDLocationStrategy();
 
-  private static final PoolStrategy POOL_STRATEGY = DDOutlinePoolStrategy.INSTANCE;
-  private static final ClassFileBufferStrategy BUFFER_STRATEGY = DDOutlineTypeStrategy.INSTANCE;
-  private static final TypeStrategy TYPE_STRATEGY = DDOutlineTypeStrategy.INSTANCE;
+    private static final PoolStrategy POOL_STRATEGY = DDOutlinePoolStrategy.INSTANCE;
+    private static final ClassFileBufferStrategy BUFFER_STRATEGY = DDOutlineTypeStrategy.INSTANCE;
+    private static final TypeStrategy TYPE_STRATEGY = DDOutlineTypeStrategy.INSTANCE;
 
-  public static TransformerDecorator transformerDecorator() {
-    return TRANSFORMER_DECORATOR;
-  }
+    public static TransformerDecorator transformerDecorator() {
+        return TRANSFORMER_DECORATOR;
+    }
 
-  public static DiscoveryStrategy rediscoveryStrategy() {
-    return REDISCOVERY_STRATEGY;
-  }
+    public static DiscoveryStrategy rediscoveryStrategy() {
+        return REDISCOVERY_STRATEGY;
+    }
 
-  public static LocationStrategy locationStrategy() {
-    return LOCATION_STRATEGY;
-  }
+    public static LocationStrategy locationStrategy() {
+        return LOCATION_STRATEGY;
+    }
 
-  public static PoolStrategy poolStrategy() {
-    return POOL_STRATEGY;
-  }
+    public static PoolStrategy poolStrategy() {
+        return POOL_STRATEGY;
+    }
 
-  public static ClassFileBufferStrategy bufferStrategy() {
-    return BUFFER_STRATEGY;
-  }
+    public static ClassFileBufferStrategy bufferStrategy() {
+        return BUFFER_STRATEGY;
+    }
 
-  public static TypeStrategy typeStrategy() {
-    return TYPE_STRATEGY;
-  }
+    public static TypeStrategy typeStrategy() {
+        return TYPE_STRATEGY;
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/CombiningMatcher.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/CombiningMatcher.java
index 5ac7ea2e67c..ce001b8dd18 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/CombiningMatcher.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/CombiningMatcher.java
@@ -24,175 +24,172 @@
 
 /** Combines separate matcher results into a single bit-set for {@link SplittingTransformer}. */
 final class CombiningMatcher implements AgentBuilder.RawMatcher {
-  private static final Logger log = LoggerFactory.getLogger(CombiningMatcher.class);
+    private static final Logger log = LoggerFactory.getLogger(CombiningMatcher.class);
 
-  private static final boolean DEFER_MATCHING =
-      null != InstrumenterConfig.get().deferIntegrationsUntil();
+    private static final boolean DEFER_MATCHING =
+            null != InstrumenterConfig.get().deferIntegrationsUntil();
 
-  private static final Set<String> DEFERRED_CLASSLOADER_NAMES =
-      InstrumenterConfig.get().getDeferredClassLoaders();
+    private static final Set<String> DEFERRED_CLASSLOADER_NAMES =
+            InstrumenterConfig.get().getDeferredClassLoaders();
 
-  private static final boolean DEFER_ALL = DEFERRED_CLASSLOADER_NAMES.isEmpty();
+    private static final boolean DEFER_ALL = DEFERRED_CLASSLOADER_NAMES.isEmpty();
 
-  // optimization to avoid repeated allocations inside BitSet as matched ids are set
-  static final int MAX_COMBINED_ID_HINT = 512;
+    // optimization to avoid repeated allocations inside BitSet as matched ids are set
+    static final int MAX_COMBINED_ID_HINT = 512;
 
-  /** Matcher results shared between {@link CombiningMatcher} and {@link SplittingTransformer} */
-  static final ThreadLocal<BitSet> recordedMatches =
-      ThreadLocal.withInitial(() -> new BitSet(MAX_COMBINED_ID_HINT));
+    /** Matcher results shared between {@link CombiningMatcher} and {@link SplittingTransformer} */
+    static final ThreadLocal<BitSet> recordedMatches = ThreadLocal.withInitial(() -> new BitSet(MAX_COMBINED_ID_HINT));
 
-  private final KnownTypesIndex knownTypesIndex = KnownTypesIndex.readIndex();
+    private final KnownTypesIndex knownTypesIndex = KnownTypesIndex.readIndex();
 
-  private final BitSet knownTypesMask;
-  private final MatchRecorder[] matchers;
+    private final BitSet knownTypesMask;
+    private final MatchRecorder[] matchers;
 
-  private volatile boolean deferring;
+    private volatile boolean deferring;
 
-  CombiningMatcher(
-      Instrumentation instrumentation, BitSet knownTypesMask, List<MatchRecorder> matchers) {
-    this.knownTypesMask = knownTypesMask;
-    this.matchers = matchers.toArray(new MatchRecorder[0]);
+    CombiningMatcher(Instrumentation instrumentation, BitSet knownTypesMask, List<MatchRecorder> matchers) {
+        this.knownTypesMask = knownTypesMask;
+        this.matchers = matchers.toArray(new MatchRecorder[0]);
 
-    if (DEFER_MATCHING) {
-      scheduleResumeMatching(instrumentation, InstrumenterConfig.get().deferIntegrationsUntil());
-    }
-  }
-
-  @Override
-  public boolean matches(
-      TypeDescription target,
-      ClassLoader classLoader,
-      JavaModule module,
-      Class<?> classBeingRedefined,
-      ProtectionDomain pd) {
-
-    // check initial requests to see if we should defer matching until retransformation
-    if (DEFER_MATCHING && null == classBeingRedefined && deferring && isDeferred(classLoader)) {
-      return false;
+        if (DEFER_MATCHING) {
+            scheduleResumeMatching(instrumentation, InstrumenterConfig.get().deferIntegrationsUntil());
+        }
     }
 
-    BitSet ids = recordedMatches.get();
-    ids.clear();
+    @Override
+    public boolean matches(
+            TypeDescription target,
+            ClassLoader classLoader,
+            JavaModule module,
+            Class<?> classBeingRedefined,
+            ProtectionDomain pd) {
+
+        // check initial requests to see if we should defer matching until retransformation
+        if (DEFER_MATCHING && null == classBeingRedefined && deferring && isDeferred(classLoader)) {
+            return false;
+        }
 
-    long fromTick = InstrumenterMetrics.tick();
-    knownTypesIndex.apply(target.getName(), knownTypesMask, ids);
-    if (ids.isEmpty()) {
-      InstrumenterMetrics.knownTypeMiss(fromTick);
-    } else {
-      InstrumenterMetrics.knownTypeHit(fromTick);
-    }
+        BitSet ids = recordedMatches.get();
+        ids.clear();
 
-    for (MatchRecorder matcher : matchers) {
-      try {
-        matcher.record(target, classLoader, classBeingRedefined, ids);
-      } catch (Throwable e) {
-        if (log.isDebugEnabled()) {
-          log.debug("Instrumentation matcher unexpected exception - {}", matcher.describe(), e);
+        long fromTick = InstrumenterMetrics.tick();
+        knownTypesIndex.apply(target.getName(), knownTypesMask, ids);
+        if (ids.isEmpty()) {
+            InstrumenterMetrics.knownTypeMiss(fromTick);
+        } else {
+            InstrumenterMetrics.knownTypeHit(fromTick);
         }
-      }
-    }
 
-    InstrumenterMetrics.matchType(fromTick);
+        for (MatchRecorder matcher : matchers) {
+            try {
+                matcher.record(target, classLoader, classBeingRedefined, ids);
+            } catch (Throwable e) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Instrumentation matcher unexpected exception - {}", matcher.describe(), e);
+                }
+            }
+        }
+
+        InstrumenterMetrics.matchType(fromTick);
 
-    return !ids.isEmpty();
-  }
+        return !ids.isEmpty();
+    }
 
-  /** Arranges for any deferred matching to resume at the requested trigger point. */
-  private void scheduleResumeMatching(Instrumentation instrumentation, String untilTrigger) {
-    if (null != untilTrigger && !untilTrigger.isEmpty()) {
-      long delay = TimeUtils.parseSimpleDelay(untilTrigger);
-      if (delay < 0) {
-        log.info(
-            "Unrecognized value for dd.{}: {}",
-            EXPERIMENTAL_DEFER_INTEGRATIONS_UNTIL,
-            untilTrigger);
-      } else if (delay >= 5) { // don't bother deferring small delays
+    /** Arranges for any deferred matching to resume at the requested trigger point. */
+    private void scheduleResumeMatching(Instrumentation instrumentation, String untilTrigger) {
+        if (null != untilTrigger && !untilTrigger.isEmpty()) {
+            long delay = TimeUtils.parseSimpleDelay(untilTrigger);
+            if (delay < 0) {
+                log.info("Unrecognized value for dd.{}: {}", EXPERIMENTAL_DEFER_INTEGRATIONS_UNTIL, untilTrigger);
+            } else if (delay >= 5) { // don't bother deferring small delays
 
-        new AgentTaskScheduler(RETRANSFORMER)
-            .schedule(this::resumeMatching, instrumentation, delay, TimeUnit.SECONDS);
+                new AgentTaskScheduler(RETRANSFORMER)
+                        .schedule(this::resumeMatching, instrumentation, delay, TimeUnit.SECONDS);
 
-        deferring = true;
-      }
-    }
-  }
-
-  /**
-   * Scans loaded classes to find which ones we should retransform to resume matching them.
-   *
-   * <p>We try to only trigger retransformations for classes we know would match. Caching and
-   * memoization means running matching twice is cheaper than unnecessary retransformations.
-   */
-  void resumeMatching(Instrumentation instrumentation) {
-    if (!deferring) {
-      return;
+                deferring = true;
+            }
+        }
     }
 
-    deferring = false;
+    /**
+     * Scans loaded classes to find which ones we should retransform to resume matching them.
+     *
+     * <p>We try to only trigger retransformations for classes we know would match. Caching and
+     * memoization means running matching twice is cheaper than unnecessary retransformations.
+     */
+    void resumeMatching(Instrumentation instrumentation) {
+        if (!deferring) {
+            return;
+        }
 
-    Iterator<Iterable<Class<?>>> rediscovery =
-        AgentStrategies.rediscoveryStrategy().resolve(instrumentation).iterator();
+        deferring = false;
+
+        Iterator<Iterable<Class<?>>> rediscovery =
+                AgentStrategies.rediscoveryStrategy().resolve(instrumentation).iterator();
+
+        List<Class<?>> resuming = new ArrayList<>();
+        while (rediscovery.hasNext()) {
+            for (Class<?> clazz : rediscovery.next()) {
+                ClassLoader classLoader = clazz.getClassLoader();
+                if (isDeferred(classLoader)
+                        && !wouldIgnore(clazz.getName())
+                        && instrumentation.isModifiableClass(clazz)
+                        && wouldMatch(classLoader, clazz)) {
+                    resuming.add(clazz);
+                }
+            }
+        }
 
-    List<Class<?>> resuming = new ArrayList<>();
-    while (rediscovery.hasNext()) {
-      for (Class<?> clazz : rediscovery.next()) {
-        ClassLoader classLoader = clazz.getClassLoader();
-        if (isDeferred(classLoader)
-            && !wouldIgnore(clazz.getName())
-            && instrumentation.isModifiableClass(clazz)
-            && wouldMatch(classLoader, clazz)) {
-          resuming.add(clazz);
+        try {
+            log.debug("Resuming deferred matching for {}", resuming);
+            instrumentation.retransformClasses(resuming.toArray(new Class[0]));
+        } catch (Throwable e) {
+            log.debug("Problem resuming deferred matching", e);
         }
-      }
     }
 
-    try {
-      log.debug("Resuming deferred matching for {}", resuming);
-      instrumentation.retransformClasses(resuming.toArray(new Class[0]));
-    } catch (Throwable e) {
-      log.debug("Problem resuming deferred matching", e);
+    /**
+     * Tests whether matches involving this class-loader should be deferred until later.
+     *
+     * <p>The bootstrap class-loader is never deferred.
+     */
+    private static boolean isDeferred(ClassLoader classLoader) {
+        return null != classLoader
+                && (DEFER_ALL
+                        || DEFERRED_CLASSLOADER_NAMES.contains(
+                                classLoader.getClass().getName()));
     }
-  }
-
-  /**
-   * Tests whether matches involving this class-loader should be deferred until later.
-   *
-   * <p>The bootstrap class-loader is never deferred.
-   */
-  private static boolean isDeferred(ClassLoader classLoader) {
-    return null != classLoader
-        && (DEFER_ALL || DEFERRED_CLASSLOADER_NAMES.contains(classLoader.getClass().getName()));
-  }
-
-  /** Tests whether this class would be ignored on retransformation. */
-  private static boolean wouldIgnore(String name) {
-    return name.indexOf('/') >= 0 // don't retransform lambdas
-        || CustomExcludes.isExcluded(name)
-        || ProxyClassIgnores.isIgnored(name);
-  }
-
-  /** Tests whether this class would be matched at least once on retransformation. */
-  private boolean wouldMatch(ClassLoader classLoader, Class<?> clazz) {
-    BitSet ids = recordedMatches.get();
-    ids.clear();
-
-    knownTypesIndex.apply(clazz.getName(), knownTypesMask, ids);
-    if (!ids.isEmpty()) {
-      return true;
+
+    /** Tests whether this class would be ignored on retransformation. */
+    private static boolean wouldIgnore(String name) {
+        return name.indexOf('/') >= 0 // don't retransform lambdas
+                || CustomExcludes.isExcluded(name)
+                || ProxyClassIgnores.isIgnored(name);
     }
 
-    TypeDescription target = new TypeDescription.ForLoadedType(clazz);
+    /** Tests whether this class would be matched at least once on retransformation. */
+    private boolean wouldMatch(ClassLoader classLoader, Class<?> clazz) {
+        BitSet ids = recordedMatches.get();
+        ids.clear();
 
-    for (MatchRecorder matcher : matchers) {
-      try {
-        matcher.record(target, classLoader, clazz, ids);
+        knownTypesIndex.apply(clazz.getName(), knownTypesMask, ids);
         if (!ids.isEmpty()) {
-          return true;
+            return true;
+        }
+
+        TypeDescription target = new TypeDescription.ForLoadedType(clazz);
+
+        for (MatchRecorder matcher : matchers) {
+            try {
+                matcher.record(target, classLoader, clazz, ids);
+                if (!ids.isEmpty()) {
+                    return true;
+                }
+            } catch (Throwable ignore) {
+                // skip misbehaving matchers
+            }
         }
-      } catch (Throwable ignore) {
-        // skip misbehaving matchers
-      }
-    }
 
-    return false;
-  }
+        return false;
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/CombiningTransformerBuilder.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/CombiningTransformerBuilder.java
index 6c2dd3e8a6d..4b8483ba79b 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/CombiningTransformerBuilder.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/CombiningTransformerBuilder.java
@@ -43,412 +43,384 @@
  * <p>Each transformation defined by a module is allocated a unique {@code transformationId} used to
  * combine match results in a bitset. This bitset determines the transformations to apply to a type.
  */
-public final class CombiningTransformerBuilder
-    implements Instrumenter.TypeTransformer, Instrumenter.MethodTransformer {
-
-  private static final Logger log = LoggerFactory.getLogger(CombiningTransformerBuilder.class);
-
-  // Added here instead of byte-buddy's ignores because it's relatively
-  // expensive. https://github.com/DataDog/dd-trace-java/pull/1045
-  private static final ElementMatcher.Junction<TypeDescription> NOT_DECORATOR_MATCHER =
-      not(
-          declaresAnnotation(
-              namedOneOf("javax.decorator.Decorator", "jakarta.decorator.Decorator")));
-
-  /** Associates context stores with the class-loader matchers to activate them. */
-  private final Map<Map.Entry<String, String>, ElementMatcher<ClassLoader>> contextStoreInjection =
-      new HashMap<>();
-
-  private final AgentBuilder agentBuilder;
-  private final InstrumenterIndex instrumenterIndex;
-  private final int knownTransformationCount;
-  private final Set<InstrumenterModule.TargetSystem> enabledSystems;
-  private final boolean adviceTransformationDiagnosticsEnabled;
-
-  private final List<MatchRecorder> matchers = new ArrayList<>();
-  private final BitSet knownTypesMask;
-  private AdviceStack[] transformers;
-
-  // used to allocate ids to instrumentations not known at build-time
-  private int nextRuntimeInstrumentationId;
-  private int nextRuntimeTransformationId;
-
-  // module defined matchers and transformers, shared across members
-  private ElementMatcher<? super MethodDescription> ignoredMethods;
-  private ElementMatcher<ClassLoader> classLoaderMatcher;
-  private Map<String, String> contextStore;
-  private AgentBuilder.Transformer contextRequestRewriter;
-  private AdviceShader adviceShader;
-  private HelperTransformer helperTransformer;
-  private Advice.PostProcessor.Factory postProcessor;
-  private MuzzleCheck muzzle;
-  private String instrumentationClass;
-
-  // temporary buffer for collecting advice; reset for each instrumenter
-  private final List<AgentBuilder.Transformer> advice = new ArrayList<>();
-
-  public CombiningTransformerBuilder(
-      AgentBuilder agentBuilder,
-      InstrumenterIndex instrumenterIndex,
-      Set<InstrumenterModule.TargetSystem> enabledSystems,
-      boolean adviceTransformationDiagnosticsEnabled) {
-    this.agentBuilder = agentBuilder;
-    this.instrumenterIndex = instrumenterIndex;
-    int knownInstrumentationCount = instrumenterIndex.instrumentationCount();
-    this.knownTransformationCount = instrumenterIndex.transformationCount();
-    this.knownTypesMask = new BitSet(knownTransformationCount);
-    this.transformers = new AdviceStack[knownTransformationCount];
-    this.nextRuntimeInstrumentationId = knownInstrumentationCount;
-    this.nextRuntimeTransformationId = knownTransformationCount;
-    this.enabledSystems = enabledSystems;
-    this.adviceTransformationDiagnosticsEnabled = adviceTransformationDiagnosticsEnabled;
-  }
-
-  /** Builds matchers and transformers for an instrumentation module and its members. */
-  public void applyInstrumentation(InstrumenterModule module) {
-    if (module.isEnabled()) {
-      int instrumentationId = instrumenterIndex.instrumentationId(module);
-      if (instrumentationId < 0) {
-        // this is a non-indexed instrumentation configured at runtime
-        instrumentationId = nextRuntimeInstrumentationId++;
-      }
-      InstrumenterState.registerInstrumentation(module, instrumentationId);
-      prepareInstrumentation(module, instrumentationId);
-      for (Instrumenter member : module.typeInstrumentations()) {
-        buildTypeInstrumentation(member);
-      }
+public final class CombiningTransformerBuilder implements Instrumenter.TypeTransformer, Instrumenter.MethodTransformer {
+
+    private static final Logger log = LoggerFactory.getLogger(CombiningTransformerBuilder.class);
+
+    // Added here instead of byte-buddy's ignores because it's relatively
+    // expensive. https://github.com/DataDog/dd-trace-java/pull/1045
+    private static final ElementMatcher.Junction<TypeDescription> NOT_DECORATOR_MATCHER =
+            not(declaresAnnotation(namedOneOf("javax.decorator.Decorator", "jakarta.decorator.Decorator")));
+
+    /** Associates context stores with the class-loader matchers to activate them. */
+    private final Map<Map.Entry<String, String>, ElementMatcher<ClassLoader>> contextStoreInjection = new HashMap<>();
+
+    private final AgentBuilder agentBuilder;
+    private final InstrumenterIndex instrumenterIndex;
+    private final int knownTransformationCount;
+    private final Set<InstrumenterModule.TargetSystem> enabledSystems;
+    private final boolean adviceTransformationDiagnosticsEnabled;
+
+    private final List<MatchRecorder> matchers = new ArrayList<>();
+    private final BitSet knownTypesMask;
+    private AdviceStack[] transformers;
+
+    // used to allocate ids to instrumentations not known at build-time
+    private int nextRuntimeInstrumentationId;
+    private int nextRuntimeTransformationId;
+
+    // module defined matchers and transformers, shared across members
+    private ElementMatcher<? super MethodDescription> ignoredMethods;
+    private ElementMatcher<ClassLoader> classLoaderMatcher;
+    private Map<String, String> contextStore;
+    private AgentBuilder.Transformer contextRequestRewriter;
+    private AdviceShader adviceShader;
+    private HelperTransformer helperTransformer;
+    private Advice.PostProcessor.Factory postProcessor;
+    private MuzzleCheck muzzle;
+    private String instrumentationClass;
+
+    // temporary buffer for collecting advice; reset for each instrumenter
+    private final List<AgentBuilder.Transformer> advice = new ArrayList<>();
+
+    public CombiningTransformerBuilder(
+            AgentBuilder agentBuilder,
+            InstrumenterIndex instrumenterIndex,
+            Set<InstrumenterModule.TargetSystem> enabledSystems,
+            boolean adviceTransformationDiagnosticsEnabled) {
+        this.agentBuilder = agentBuilder;
+        this.instrumenterIndex = instrumenterIndex;
+        int knownInstrumentationCount = instrumenterIndex.instrumentationCount();
+        this.knownTransformationCount = instrumenterIndex.transformationCount();
+        this.knownTypesMask = new BitSet(knownTransformationCount);
+        this.transformers = new AdviceStack[knownTransformationCount];
+        this.nextRuntimeInstrumentationId = knownInstrumentationCount;
+        this.nextRuntimeTransformationId = knownTransformationCount;
+        this.enabledSystems = enabledSystems;
+        this.adviceTransformationDiagnosticsEnabled = adviceTransformationDiagnosticsEnabled;
     }
-  }
 
-  /** Prepares shared matchers and transformers defined by an instrumentation module. */
-  private void prepareInstrumentation(InstrumenterModule module, int instrumentationId) {
-    ignoredMethods = module.methodIgnoreMatcher();
-    classLoaderMatcher = module.classLoaderMatcher();
-    contextStore = module.contextStore();
-
-    contextRequestRewriter =
-        !contextStore.isEmpty()
-            ? new VisitingTransformer(
-                new FieldBackedContextRequestRewriter(contextStore, module.name()))
-            : null;
-
-    adviceShader = AdviceShader.with(module);
-
-    String[] helperClassNames = module.helperClassNames();
-    if (module.injectHelperDependencies()) {
-      helperClassNames = HelperScanner.withClassDependencies(helperClassNames);
+    /** Builds matchers and transformers for an instrumentation module and its members. */
+    public void applyInstrumentation(InstrumenterModule module) {
+        if (module.isEnabled()) {
+            int instrumentationId = instrumenterIndex.instrumentationId(module);
+            if (instrumentationId < 0) {
+                // this is a non-indexed instrumentation configured at runtime
+                instrumentationId = nextRuntimeInstrumentationId++;
+            }
+            InstrumenterState.registerInstrumentation(module, instrumentationId);
+            prepareInstrumentation(module, instrumentationId);
+            for (Instrumenter member : module.typeInstrumentations()) {
+                buildTypeInstrumentation(member);
+            }
+        }
     }
-    helperTransformer =
-        helperClassNames.length > 0
-            ? new HelperTransformer(
-                module.useAgentCodeSource(),
-                adviceShader,
-                module.getClass().getSimpleName(),
-                helperClassNames)
-            : null;
-
-    postProcessor = module.postProcessor();
-
-    muzzle = new MuzzleCheck(module, instrumentationId);
-  }
-
-  /** Allocates a fresh transformation id not known at build-time, growing storage as needed. */
-  private int allocateRuntimeTransformationId() {
-    int transformationId = nextRuntimeTransformationId++;
-    if (transformers.length <= transformationId) {
-      int newLen = Math.max(transformationId + 1, transformers.length + (transformers.length >> 1));
-      transformers = Arrays.copyOf(transformers, newLen);
+
+    /** Prepares shared matchers and transformers defined by an instrumentation module. */
+    private void prepareInstrumentation(InstrumenterModule module, int instrumentationId) {
+        ignoredMethods = module.methodIgnoreMatcher();
+        classLoaderMatcher = module.classLoaderMatcher();
+        contextStore = module.contextStore();
+
+        contextRequestRewriter = !contextStore.isEmpty()
+                ? new VisitingTransformer(new FieldBackedContextRequestRewriter(contextStore, module.name()))
+                : null;
+
+        adviceShader = AdviceShader.with(module);
+
+        String[] helperClassNames = module.helperClassNames();
+        if (module.injectHelperDependencies()) {
+            helperClassNames = HelperScanner.withClassDependencies(helperClassNames);
+        }
+        helperTransformer = helperClassNames.length > 0
+                ? new HelperTransformer(
+                        module.useAgentCodeSource(),
+                        adviceShader,
+                        module.getClass().getSimpleName(),
+                        helperClassNames)
+                : null;
+
+        postProcessor = module.postProcessor();
+
+        muzzle = new MuzzleCheck(module, instrumentationId);
     }
-    return transformationId;
-  }
 
-  /** Builds a type-specific transformer, controlled by one or more matchers. */
-  private void buildTypeInstrumentation(Instrumenter member) {
+    /** Allocates a fresh transformation id not known at build-time, growing storage as needed. */
+    private int allocateRuntimeTransformationId() {
+        int transformationId = nextRuntimeTransformationId++;
+        if (transformers.length <= transformationId) {
+            int newLen = Math.max(transformationId + 1, transformers.length + (transformers.length >> 1));
+            transformers = Arrays.copyOf(transformers, newLen);
+        }
+        return transformationId;
+    }
 
-    instrumentationClass =
-        adviceTransformationDiagnosticsEnabled ? member.getClass().getName() : null;
+    /** Builds a type-specific transformer, controlled by one or more matchers. */
+    private void buildTypeInstrumentation(Instrumenter member) {
 
-    int transformationId = instrumenterIndex.transformationId(member);
-    if (transformationId < 0) {
-      // this is a non-indexed transformation configured at runtime, e.g. "dd.trace.methods"
-      // allocate a distinct runtime id to each extra transformation for matching purposes
-      transformationId = allocateRuntimeTransformationId();
-    }
+        instrumentationClass =
+                adviceTransformationDiagnosticsEnabled ? member.getClass().getName() : null;
 
-    buildTypeMatcher(member, transformationId);
-    buildTypeAdvice(member, transformationId);
-  }
-
-  private void buildTypeMatcher(Instrumenter member, int transformationId) {
-
-    if (member instanceof Instrumenter.ForSingleType) {
-      if (transformationId < knownTransformationCount) {
-        knownTypesMask.set(transformationId); // can use known-types index
-      } else {
-        String name = ((Instrumenter.ForSingleType) member).instrumentedType();
-        matchers.add(new MatchRecorder.ForType(transformationId, named(name)));
-      }
-    } else if (member instanceof Instrumenter.ForKnownTypes) {
-      if (transformationId < knownTransformationCount) {
-        knownTypesMask.set(transformationId); // can use known-types index
-      } else {
-        String[] names = ((Instrumenter.ForKnownTypes) member).knownMatchingTypes();
-        matchers.add(new MatchRecorder.ForType(transformationId, namedOneOf(names)));
-      }
-    } else if (member instanceof Instrumenter.ForTypeHierarchy) {
-      matchers.add(
-          new MatchRecorder.ForHierarchy(transformationId, (Instrumenter.ForTypeHierarchy) member));
-    } else if (member instanceof Instrumenter.ForCallSite) {
-      matchers.add(
-          new MatchRecorder.ForType(
-              transformationId, ((Instrumenter.ForCallSite) member).callerType()));
-    }
+        int transformationId = instrumenterIndex.transformationId(member);
+        if (transformationId < 0) {
+            // this is a non-indexed transformation configured at runtime, e.g. "dd.trace.methods"
+            // allocate a distinct runtime id to each extra transformation for matching purposes
+            transformationId = allocateRuntimeTransformationId();
+        }
 
-    if (member instanceof Instrumenter.ForConfiguredTypes) {
-      Collection<String> names =
-          ((Instrumenter.ForConfiguredTypes) member).configuredMatchingTypes();
-      if (null != names && !names.isEmpty()) {
-        matchers.add(new MatchRecorder.ForType(transformationId, namedOneOf(names)));
-      }
+        buildTypeMatcher(member, transformationId);
+        buildTypeAdvice(member, transformationId);
     }
 
-    if (member instanceof Instrumenter.CanShortcutTypeMatching
-        && !((Instrumenter.CanShortcutTypeMatching) member).onlyMatchKnownTypes()) {
-      matchers.add(
-          new MatchRecorder.ForHierarchy(transformationId, (Instrumenter.ForTypeHierarchy) member));
+    private void buildTypeMatcher(Instrumenter member, int transformationId) {
+
+        if (member instanceof Instrumenter.ForSingleType) {
+            if (transformationId < knownTransformationCount) {
+                knownTypesMask.set(transformationId); // can use known-types index
+            } else {
+                String name = ((Instrumenter.ForSingleType) member).instrumentedType();
+                matchers.add(new MatchRecorder.ForType(transformationId, named(name)));
+            }
+        } else if (member instanceof Instrumenter.ForKnownTypes) {
+            if (transformationId < knownTransformationCount) {
+                knownTypesMask.set(transformationId); // can use known-types index
+            } else {
+                String[] names = ((Instrumenter.ForKnownTypes) member).knownMatchingTypes();
+                matchers.add(new MatchRecorder.ForType(transformationId, namedOneOf(names)));
+            }
+        } else if (member instanceof Instrumenter.ForTypeHierarchy) {
+            matchers.add(new MatchRecorder.ForHierarchy(transformationId, (Instrumenter.ForTypeHierarchy) member));
+        } else if (member instanceof Instrumenter.ForCallSite) {
+            matchers.add(new MatchRecorder.ForType(transformationId, ((Instrumenter.ForCallSite) member).callerType()));
+        }
+
+        if (member instanceof Instrumenter.ForConfiguredTypes) {
+            Collection<String> names = ((Instrumenter.ForConfiguredTypes) member).configuredMatchingTypes();
+            if (null != names && !names.isEmpty()) {
+                matchers.add(new MatchRecorder.ForType(transformationId, namedOneOf(names)));
+            }
+        }
+
+        if (member instanceof Instrumenter.CanShortcutTypeMatching
+                && !((Instrumenter.CanShortcutTypeMatching) member).onlyMatchKnownTypes()) {
+            matchers.add(new MatchRecorder.ForHierarchy(transformationId, (Instrumenter.ForTypeHierarchy) member));
+        }
+
+        if (classLoaderMatcher != ANY_CLASS_LOADER) {
+            matchers.add(new MatchRecorder.NarrowLocation(transformationId, classLoaderMatcher));
+        }
+
+        if (member instanceof Instrumenter.WithTypeStructure) {
+            matchers.add(new MatchRecorder.NarrowType(
+                    transformationId, ((Instrumenter.WithTypeStructure) member).structureMatcher()));
+        }
+
+        matchers.add(new MatchRecorder.NarrowLocation(transformationId, muzzle));
+
+        // preserve structural change, unless we're going to split it out in buildTypeAdvice
+        if (member instanceof Instrumenter.WithStructuralChange && !(member instanceof Instrumenter.HasMethodAdvice)) {
+            addStructuralNarrowing((Instrumenter.WithStructuralChange) member, transformationId);
+        }
     }
 
-    if (classLoaderMatcher != ANY_CLASS_LOADER) {
-      matchers.add(new MatchRecorder.NarrowLocation(transformationId, classLoaderMatcher));
+    private void buildTypeAdvice(Instrumenter member, int transformationId) {
+        if (null != helperTransformer) {
+            advice.add(helperTransformer);
+        }
+        if (null != contextRequestRewriter) {
+            registerContextStoreInjection(member, contextStore);
+            // rewrite context store access to call FieldBackedContextStores with assigned store-id
+            advice.add(contextRequestRewriter);
+        }
+
+        // a structural change may contain method advice that works with and without the change
+        // we split out the structural change to its own transformation so it can't accidentally
+        // turn off the method advice when it's skipped
+        boolean splitOutStructuralChange =
+                member instanceof Instrumenter.WithStructuralChange && member instanceof Instrumenter.HasMethodAdvice;
+
+        if (member instanceof Instrumenter.HasTypeAdvice && !splitOutStructuralChange) {
+            ((Instrumenter.HasTypeAdvice) member).typeAdvice(this);
+        }
+        if (member instanceof Instrumenter.HasMethodAdvice) {
+            ((Instrumenter.HasMethodAdvice) member).methodAdvice(this);
+        }
+        finishAdviceStack(transformationId);
+
+        if (splitOutStructuralChange) {
+            Instrumenter.WithStructuralChange structuralChange = (Instrumenter.WithStructuralChange) member;
+
+            // reuse the type match already computed for transformationId instead of rebuilding it
+            int structuralTransformationId = allocateRuntimeTransformationId();
+            matchers.add(new MatchRecorder.CopyMatch(transformationId, structuralTransformationId));
+            addStructuralNarrowing(structuralChange, structuralTransformationId);
+            structuralChange.typeAdvice(this);
+            finishAdviceStack(structuralTransformationId);
+        }
     }
 
-    if (member instanceof Instrumenter.WithTypeStructure) {
-      matchers.add(
-          new MatchRecorder.NarrowType(
-              transformationId, ((Instrumenter.WithTypeStructure) member).structureMatcher()));
+    /** Narrows a transformation away from already-loaded types missing the structural marker. */
+    private void addStructuralNarrowing(Instrumenter.WithStructuralChange member, int transformationId) {
+        matchers.add(new MatchRecorder.PreserveLoadedStructure(transformationId, member.structuralChangeMarker()));
     }
 
-    matchers.add(new MatchRecorder.NarrowLocation(transformationId, muzzle));
-
-    // preserve structural change, unless we're going to split it out in buildTypeAdvice
-    if (member instanceof Instrumenter.WithStructuralChange
-        && !(member instanceof Instrumenter.HasMethodAdvice)) {
-      addStructuralNarrowing((Instrumenter.WithStructuralChange) member, transformationId);
+    /** Records the advice collected so far as the stack for this transformationId. */
+    private void finishAdviceStack(int transformationId) {
+        transformers[transformationId] = new AdviceStack(advice);
+        advice.clear(); // reset for next transformationId
     }
-  }
 
-  private void buildTypeAdvice(Instrumenter member, int transformationId) {
-    if (null != helperTransformer) {
-      advice.add(helperTransformer);
-    }
-    if (null != contextRequestRewriter) {
-      registerContextStoreInjection(member, contextStore);
-      // rewrite context store access to call FieldBackedContextStores with assigned store-id
-      advice.add(contextRequestRewriter);
+    @Override
+    public void applyAdvice(Instrumenter.TransformingAdvice typeAdvice) {
+        advice.add(typeAdvice::transform);
     }
 
-    // a structural change may contain method advice that works with and without the change
-    // we split out the structural change to its own transformation so it can't accidentally
-    // turn off the method advice when it's skipped
-    boolean splitOutStructuralChange =
-        member instanceof Instrumenter.WithStructuralChange
-            && member instanceof Instrumenter.HasMethodAdvice;
-
-    if (member instanceof Instrumenter.HasTypeAdvice && !splitOutStructuralChange) {
-      ((Instrumenter.HasTypeAdvice) member).typeAdvice(this);
-    }
-    if (member instanceof Instrumenter.HasMethodAdvice) {
-      ((Instrumenter.HasMethodAdvice) member).methodAdvice(this);
-    }
-    finishAdviceStack(transformationId);
-
-    if (splitOutStructuralChange) {
-      Instrumenter.WithStructuralChange structuralChange =
-          (Instrumenter.WithStructuralChange) member;
-
-      // reuse the type match already computed for transformationId instead of rebuilding it
-      int structuralTransformationId = allocateRuntimeTransformationId();
-      matchers.add(new MatchRecorder.CopyMatch(transformationId, structuralTransformationId));
-      addStructuralNarrowing(structuralChange, structuralTransformationId);
-      structuralChange.typeAdvice(this);
-      finishAdviceStack(structuralTransformationId);
-    }
-  }
-
-  /** Narrows a transformation away from already-loaded types missing the structural marker. */
-  private void addStructuralNarrowing(
-      Instrumenter.WithStructuralChange member, int transformationId) {
-    matchers.add(
-        new MatchRecorder.PreserveLoadedStructure(
-            transformationId, member.structuralChangeMarker()));
-  }
-
-  /** Records the advice collected so far as the stack for this transformationId. */
-  private void finishAdviceStack(int transformationId) {
-    transformers[transformationId] = new AdviceStack(advice);
-    advice.clear(); // reset for next transformationId
-  }
-
-  @Override
-  public void applyAdvice(Instrumenter.TransformingAdvice typeAdvice) {
-    advice.add(typeAdvice::transform);
-  }
-
-  @Override
-  public void applyAdvices(
-      ElementMatcher<? super MethodDescription> matcher,
-      String adviceClass,
-      String... additionalAdviceClasses) {
-    addAdviceIfEnabled(matcher, adviceClass);
-
-    if (additionalAdviceClasses != null) {
-      for (String adviceClassName : additionalAdviceClasses) {
-        addAdviceIfEnabled(matcher, adviceClassName);
-      }
+    @Override
+    public void applyAdvices(
+            ElementMatcher<? super MethodDescription> matcher, String adviceClass, String... additionalAdviceClasses) {
+        addAdviceIfEnabled(matcher, adviceClass);
+
+        if (additionalAdviceClasses != null) {
+            for (String adviceClassName : additionalAdviceClasses) {
+                addAdviceIfEnabled(matcher, adviceClassName);
+            }
+        }
     }
-  }
 
-  private void addAdviceIfEnabled(
-      ElementMatcher<? super MethodDescription> matcher, String adviceClass) {
-    if (!instrumenterIndex.isAdviceEnabled(adviceClass, enabledSystems)) {
-      log.debug("Skipping advice class {} as it is not enabled", adviceClass);
-      return;
+    private void addAdviceIfEnabled(ElementMatcher<? super MethodDescription> matcher, String adviceClass) {
+        if (!instrumenterIndex.isAdviceEnabled(adviceClass, enabledSystems)) {
+            log.debug("Skipping advice class {} as it is not enabled", adviceClass);
+            return;
+        }
+        log.debug("Installing advice class {}", adviceClass);
+        Advice.WithCustomMapping customMapping = Advice.withCustomMapping();
+        if (postProcessor != null) {
+            customMapping = customMapping.with(postProcessor);
+        }
+        AgentBuilder.Transformer.ForAdvice forAdvice = adviceTransformationDiagnosticsEnabled
+                ? new DebuggingAdviceTransformer(customMapping, instrumentationClass, adviceClass)
+                : new AgentBuilder.Transformer.ForAdvice(customMapping);
+        forAdvice = forAdvice
+                .withExceptionHandler(ExceptionHandlers.exceptionHandlerFor(adviceClass))
+                .include(Utils.getBootstrapProxy());
+        ClassLoader adviceLoader = Utils.getExtendedClassLoader();
+        if (adviceShader != null) {
+            forAdvice = forAdvice.include(new ShadedAdviceLocator(adviceLoader, adviceShader));
+        } else {
+            forAdvice = forAdvice.include(adviceLoader);
+        }
+        advice.add(forAdvice.advice(not(ignoredMethods).and(matcher), adviceClass));
     }
-    log.debug("Installing advice class {}", adviceClass);
-    Advice.WithCustomMapping customMapping = Advice.withCustomMapping();
-    if (postProcessor != null) {
-      customMapping = customMapping.with(postProcessor);
-    }
-    AgentBuilder.Transformer.ForAdvice forAdvice =
-        adviceTransformationDiagnosticsEnabled
-            ? new DebuggingAdviceTransformer(customMapping, instrumentationClass, adviceClass)
-            : new AgentBuilder.Transformer.ForAdvice(customMapping);
-    forAdvice =
-        forAdvice
-            .withExceptionHandler(ExceptionHandlers.exceptionHandlerFor(adviceClass))
-            .include(Utils.getBootstrapProxy());
-    ClassLoader adviceLoader = Utils.getExtendedClassLoader();
-    if (adviceShader != null) {
-      forAdvice = forAdvice.include(new ShadedAdviceLocator(adviceLoader, adviceShader));
-    } else {
-      forAdvice = forAdvice.include(adviceLoader);
-    }
-    advice.add(forAdvice.advice(not(ignoredMethods).and(matcher), adviceClass));
-  }
 
-  public ClassFileTransformer installOn(Instrumentation instrumentation) {
-    if (InstrumenterConfig.get().isRuntimeContextFieldInjection()) {
-      applyContextStoreInjection();
+    public ClassFileTransformer installOn(Instrumentation instrumentation) {
+        if (InstrumenterConfig.get().isRuntimeContextFieldInjection()) {
+            applyContextStoreInjection();
+        }
+
+        return agentBuilder
+                .type(new CombiningMatcher(instrumentation, knownTypesMask, matchers))
+                .and(NOT_DECORATOR_MATCHER)
+                .transform(defaultTransformers())
+                .transform(new SplittingTransformer(transformers))
+                .installOn(instrumentation);
     }
 
-    return agentBuilder
-        .type(new CombiningMatcher(instrumentation, knownTypesMask, matchers))
-        .and(NOT_DECORATOR_MATCHER)
-        .transform(defaultTransformers())
-        .transform(new SplittingTransformer(transformers))
-        .installOn(instrumentation);
-  }
-
-  /** Counts the number of distinct context store injections registered with this builder. */
-  private int contextStoreCount() {
-    return contextStoreInjection.size();
-  }
-
-  /** Tracks which class-loader matchers are associated with each store request. */
-  private void registerContextStoreInjection(
-      Instrumenter member, Map<String, String> contextStore) {
-    ElementMatcher<ClassLoader> activation;
-
-    if (member instanceof Instrumenter.ForBootstrap) {
-      activation = ANY_CLASS_LOADER;
-    } else if (member instanceof Instrumenter.ForTypeHierarchy) {
-      String hierarchyHint = ((Instrumenter.ForTypeHierarchy) member).hierarchyMarkerType();
-      activation = null != hierarchyHint ? hasClassNamed(hierarchyHint) : ANY_CLASS_LOADER;
-    } else if (member instanceof Instrumenter.ForSingleType) {
-      activation = hasClassNamed(((Instrumenter.ForSingleType) member).instrumentedType());
-    } else if (member instanceof Instrumenter.ForKnownTypes) {
-      activation = hasClassNamedOneOf(((Instrumenter.ForKnownTypes) member).knownMatchingTypes());
-    } else {
-      activation = ANY_CLASS_LOADER;
+    /** Counts the number of distinct context store injections registered with this builder. */
+    private int contextStoreCount() {
+        return contextStoreInjection.size();
     }
 
-    activation = requireBoth(activation, classLoaderMatcher);
-
-    for (Map.Entry<String, String> storeEntry : contextStore.entrySet()) {
-      ElementMatcher<ClassLoader> oldActivation = contextStoreInjection.get(storeEntry);
-      // optimization: treat 'any' as if there wasn't an old matcher
-      if (null == oldActivation || ANY_CLASS_LOADER == activation) {
-        contextStoreInjection.put(storeEntry, activation);
-      } else if (ANY_CLASS_LOADER != oldActivation) {
-        // store can be activated by either the old OR new matcher
-        contextStoreInjection.put(
-            storeEntry, new ElementMatcher.Junction.Disjunction<>(oldActivation, activation));
-      }
+    /** Tracks which class-loader matchers are associated with each store request. */
+    private void registerContextStoreInjection(Instrumenter member, Map<String, String> contextStore) {
+        ElementMatcher<ClassLoader> activation;
+
+        if (member instanceof Instrumenter.ForBootstrap) {
+            activation = ANY_CLASS_LOADER;
+        } else if (member instanceof Instrumenter.ForTypeHierarchy) {
+            String hierarchyHint = ((Instrumenter.ForTypeHierarchy) member).hierarchyMarkerType();
+            activation = null != hierarchyHint ? hasClassNamed(hierarchyHint) : ANY_CLASS_LOADER;
+        } else if (member instanceof Instrumenter.ForSingleType) {
+            activation = hasClassNamed(((Instrumenter.ForSingleType) member).instrumentedType());
+        } else if (member instanceof Instrumenter.ForKnownTypes) {
+            activation = hasClassNamedOneOf(((Instrumenter.ForKnownTypes) member).knownMatchingTypes());
+        } else {
+            activation = ANY_CLASS_LOADER;
+        }
+
+        activation = requireBoth(activation, classLoaderMatcher);
+
+        for (Map.Entry<String, String> storeEntry : contextStore.entrySet()) {
+            ElementMatcher<ClassLoader> oldActivation = contextStoreInjection.get(storeEntry);
+            // optimization: treat 'any' as if there wasn't an old matcher
+            if (null == oldActivation || ANY_CLASS_LOADER == activation) {
+                contextStoreInjection.put(storeEntry, activation);
+            } else if (ANY_CLASS_LOADER != oldActivation) {
+                // store can be activated by either the old OR new matcher
+                contextStoreInjection.put(
+                        storeEntry, new ElementMatcher.Junction.Disjunction<>(oldActivation, activation));
+            }
+        }
     }
-  }
-
-  /** Applies each context store injection, guarded by the associated class-loader matcher. */
-  private void applyContextStoreInjection() {
-    // expand array so we have enough space for a context injecting transformer for each store
-    transformers = Arrays.copyOf(transformers, transformers.length + contextStoreCount());
 
-    contextStoreInjection.forEach(this::applyContextStoreInjection);
-  }
+    /** Applies each context store injection, guarded by the associated class-loader matcher. */
+    private void applyContextStoreInjection() {
+        // expand array so we have enough space for a context injecting transformer for each store
+        transformers = Arrays.copyOf(transformers, transformers.length + contextStoreCount());
 
-  /** Arranges for a context value field to be injected into types extending the context key. */
-  private void applyContextStoreInjection(
-      Map.Entry<String, String> contextStore, ElementMatcher<ClassLoader> activation) {
-    String keyClassName = contextStore.getKey();
-    String contextClassName = contextStore.getValue();
-
-    FieldBackedContextMatcher contextMatcher =
-        new FieldBackedContextMatcher(keyClassName, contextClassName);
-    FieldBackedContextInjector contextAdvice =
-        new FieldBackedContextInjector(keyClassName, contextClassName);
+        contextStoreInjection.forEach(this::applyContextStoreInjection);
+    }
 
-    // transformers array has already been expanded to fit in 'applyContextStoreInjection()'
-    int transformationId = nextRuntimeTransformationId++;
+    /** Arranges for a context value field to be injected into types extending the context key. */
+    private void applyContextStoreInjection(
+            Map.Entry<String, String> contextStore, ElementMatcher<ClassLoader> activation) {
+        String keyClassName = contextStore.getKey();
+        String contextClassName = contextStore.getValue();
 
-    matchers.add(new MatchRecorder.ForContextStore(transformationId, activation, contextMatcher));
-    transformers[transformationId] = new AdviceStack(new VisitingTransformer(contextAdvice));
-  }
+        FieldBackedContextMatcher contextMatcher = new FieldBackedContextMatcher(keyClassName, contextClassName);
+        FieldBackedContextInjector contextAdvice = new FieldBackedContextInjector(keyClassName, contextClassName);
 
-  static final class VisitingTransformer implements AgentBuilder.Transformer {
-    private final AsmVisitorWrapper visitor;
+        // transformers array has already been expanded to fit in 'applyContextStoreInjection()'
+        int transformationId = nextRuntimeTransformationId++;
 
-    VisitingTransformer(AsmVisitorWrapper visitor) {
-      this.visitor = visitor;
+        matchers.add(new MatchRecorder.ForContextStore(transformationId, activation, contextMatcher));
+        transformers[transformationId] = new AdviceStack(new VisitingTransformer(contextAdvice));
     }
 
-    @Override
-    public DynamicType.Builder<?> transform(
-        DynamicType.Builder<?> builder,
-        TypeDescription typeDescription,
-        ClassLoader classLoader,
-        JavaModule module,
-        ProtectionDomain pd) {
-      return builder.visit(visitor);
+    static final class VisitingTransformer implements AgentBuilder.Transformer {
+        private final AsmVisitorWrapper visitor;
+
+        VisitingTransformer(AsmVisitorWrapper visitor) {
+            this.visitor = visitor;
+        }
+
+        @Override
+        public DynamicType.Builder<?> transform(
+                DynamicType.Builder<?> builder,
+                TypeDescription typeDescription,
+                ClassLoader classLoader,
+                JavaModule module,
+                ProtectionDomain pd) {
+            return builder.visit(visitor);
+        }
     }
-  }
-
-  static final class HelperTransformer extends HelperInjector implements AgentBuilder.Transformer {
-    HelperTransformer(
-        boolean useAgentCodeSource,
-        AdviceShader adviceShader,
-        String requestingName,
-        String... helperClassNames) {
-      super(useAgentCodeSource, adviceShader, requestingName, helperClassNames);
+
+    static final class HelperTransformer extends HelperInjector implements AgentBuilder.Transformer {
+        HelperTransformer(
+                boolean useAgentCodeSource,
+                AdviceShader adviceShader,
+                String requestingName,
+                String... helperClassNames) {
+            super(useAgentCodeSource, adviceShader, requestingName, helperClassNames);
+        }
     }
-  }
-
-  static ElementMatcher<ClassLoader> requireBoth(
-      ElementMatcher<ClassLoader> lhs, ElementMatcher<ClassLoader> rhs) {
-    if (ANY_CLASS_LOADER == lhs) {
-      return rhs;
-    } else if (ANY_CLASS_LOADER == rhs) {
-      return lhs;
-    } else {
-      return new ElementMatcher.Junction.Conjunction<>(lhs, rhs);
+
+    static ElementMatcher<ClassLoader> requireBoth(ElementMatcher<ClassLoader> lhs, ElementMatcher<ClassLoader> rhs) {
+        if (ANY_CLASS_LOADER == lhs) {
+            return rhs;
+        } else if (ANY_CLASS_LOADER == rhs) {
+            return lhs;
+        } else {
+            return new ElementMatcher.Junction.Conjunction<>(lhs, rhs);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/DebuggingAdviceTransformer.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/DebuggingAdviceTransformer.java
index 9e0838bdbd0..763ec45d988 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/DebuggingAdviceTransformer.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/DebuggingAdviceTransformer.java
@@ -22,417 +22,410 @@
 
 /** Adds method and advice context to Byte Buddy advice application failures in debug mode. */
 final class DebuggingAdviceTransformer extends AgentBuilder.Transformer.ForAdvice {
-  private final String instrumentationClass;
-  private final String adviceClass;
-
-  DebuggingAdviceTransformer(
-      Advice.WithCustomMapping advice, String instrumentationClass, String adviceClass) {
-    super(advice);
-    this.instrumentationClass = instrumentationClass;
-    this.adviceClass = adviceClass;
-  }
-
-  private DebuggingAdviceTransformer(
-      Advice.WithCustomMapping advice,
-      Advice.ExceptionHandler exceptionHandler,
-      Assigner assigner,
-      ClassFileLocator classFileLocator,
-      AgentBuilder.PoolStrategy poolStrategy,
-      AgentBuilder.LocationStrategy locationStrategy,
-      List<AgentBuilder.Transformer.ForAdvice.Entry> entries,
-      List<String> auxiliaries,
-      String instrumentationClass,
-      String adviceClass) {
-    super(
-        advice,
-        exceptionHandler,
-        assigner,
-        classFileLocator,
-        poolStrategy,
-        locationStrategy,
-        entries,
-        auxiliaries);
-    this.instrumentationClass = instrumentationClass;
-    this.adviceClass = adviceClass;
-  }
-
-  @Override
-  protected AgentBuilder.Transformer.ForAdvice make(
-      Advice.WithCustomMapping advice,
-      Advice.ExceptionHandler exceptionHandler,
-      Assigner assigner,
-      ClassFileLocator classFileLocator,
-      AgentBuilder.PoolStrategy poolStrategy,
-      AgentBuilder.LocationStrategy locationStrategy,
-      List<AgentBuilder.Transformer.ForAdvice.Entry> entries,
-      List<String> auxiliaries) {
-    return new DebuggingAdviceTransformer(
-        advice,
-        exceptionHandler,
-        assigner,
-        classFileLocator,
-        poolStrategy,
-        locationStrategy,
-        entries,
-        auxiliaries,
-        instrumentationClass,
-        adviceClass);
-  }
-
-  @Override
-  protected AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper wrap(
-      TypeDescription target,
-      ClassLoader classLoader,
-      JavaModule module,
-      ProtectionDomain protectionDomain,
-      Advice advice) {
-    return wrap(
-        super.wrap(target, classLoader, module, protectionDomain, advice),
-        instrumentationClass,
-        adviceClass);
-  }
-
-  static AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper wrap(
-      AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate,
-      String instrumentationClass,
-      String adviceClass) {
-    return new DebuggingMethodVisitorWrapper(delegate, instrumentationClass, adviceClass);
-  }
-
-  private static final class DebuggingMethodVisitorWrapper
-      implements AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper {
-    private final AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate;
     private final String instrumentationClass;
     private final String adviceClass;
 
-    private DebuggingMethodVisitorWrapper(
-        AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate,
-        String instrumentationClass,
-        String adviceClass) {
-      this.delegate = delegate;
-      this.instrumentationClass = instrumentationClass;
-      this.adviceClass = adviceClass;
+    DebuggingAdviceTransformer(Advice.WithCustomMapping advice, String instrumentationClass, String adviceClass) {
+        super(advice);
+        this.instrumentationClass = instrumentationClass;
+        this.adviceClass = adviceClass;
     }
 
-    @Override
-    public MethodVisitor wrap(
-        TypeDescription instrumentedType,
-        MethodDescription instrumentedMethod,
-        MethodVisitor methodVisitor,
-        Implementation.Context implementationContext,
-        TypePool typePool,
-        int writerFlags,
-        int readerFlags) {
-      DownstreamMethodVisitor downstreamVisitor = new DownstreamMethodVisitor(methodVisitor);
-      try {
-        MethodVisitor adviceVisitor =
-            delegate.wrap(
-                instrumentedType,
-                instrumentedMethod,
-                downstreamVisitor,
-                implementationContext,
-                typePool,
-                writerFlags,
-                readerFlags);
-        return adviceVisitor == null
-            ? null
-            : new DebuggingMethodVisitor(
-                adviceVisitor,
-                instrumentationClass,
-                adviceClass,
-                instrumentedType,
-                instrumentedMethod,
-                downstreamVisitor);
-      } catch (RuntimeException | LinkageError failure) {
-        throw recordAdviceFailure(
-            instrumentationClass,
-            adviceClass,
-            instrumentedType,
-            instrumentedMethod,
-            downstreamVisitor,
-            failure);
-      }
-    }
-  }
-
-  private static RuntimeException recordAdviceFailure(
-      String instrumentationClass,
-      String adviceClass,
-      TypeDescription instrumentedType,
-      MethodDescription instrumentedMethod,
-      DownstreamMethodVisitor downstreamVisitor,
-      Throwable failure) {
-    if (downstreamVisitor.isDownstreamFailure(failure)) {
-      return propagate(failure);
-    }
-    return wrapAdviceFailure(
-        instrumentationClass, adviceClass, instrumentedType, instrumentedMethod, failure);
-  }
-
-  private static AdviceTransformationException wrapAdviceFailure(
-      String instrumentationClass,
-      String adviceClass,
-      TypeDescription instrumentedType,
-      MethodDescription instrumentedMethod,
-      Throwable failure) {
-    if (failure instanceof AdviceTransformationException) {
-      return (AdviceTransformationException) failure;
-    }
-    return new AdviceTransformationException(
-        instrumentationClass,
-        adviceClass,
-        instrumentedType.getName(),
-        instrumentedMethod.getInternalName() + instrumentedMethod.getDescriptor(),
-        failure);
-  }
-
-  private static RuntimeException propagate(Throwable failure) {
-    if (failure instanceof RuntimeException) {
-      return (RuntimeException) failure;
-    }
-    throw (Error) failure;
-  }
-
-  /** Marks failures crossing the visitor boundary below advice so they keep their attribution. */
-  private static final class DownstreamMethodVisitor extends FailureTrackingMethodVisitor {
-    private Throwable failure;
-
-    private DownstreamMethodVisitor(MethodVisitor delegate) {
-      super(delegate);
-    }
-
-    @Override
-    RuntimeException record(Throwable failure) {
-      this.failure = failure;
-      return propagate(failure);
-    }
-
-    /** Returns whether the same failure came from downstream, then clears the recorded failure. */
-    private boolean isDownstreamFailure(Throwable failure) {
-      Throwable downstreamFailure = this.failure;
-      this.failure = null;
-      return downstreamFailure == failure;
-    }
-  }
-
-  /**
-   * Advice binding is triggered by the first code event after the exception table. Forwarding all
-   * code events here attributes failures thrown during that binding to the exact target method.
-   */
-  private static final class DebuggingMethodVisitor extends FailureTrackingMethodVisitor {
-    private final String instrumentationClass;
-    private final String adviceClass;
-    private final TypeDescription instrumentedType;
-    private final MethodDescription instrumentedMethod;
-    private final DownstreamMethodVisitor downstreamVisitor;
-
-    private DebuggingMethodVisitor(
-        MethodVisitor delegate,
-        String instrumentationClass,
-        String adviceClass,
-        TypeDescription instrumentedType,
-        MethodDescription instrumentedMethod,
-        DownstreamMethodVisitor downstreamVisitor) {
-      super(delegate);
-      this.instrumentationClass = instrumentationClass;
-      this.adviceClass = adviceClass;
-      this.instrumentedType = instrumentedType;
-      this.instrumentedMethod = instrumentedMethod;
-      this.downstreamVisitor = downstreamVisitor;
-    }
-
-    @Override
-    RuntimeException record(Throwable failure) {
-      return recordAdviceFailure(
-          instrumentationClass,
-          adviceClass,
-          instrumentedType,
-          instrumentedMethod,
-          downstreamVisitor,
-          failure);
-    }
-  }
-
-  /** Tracks callbacks where Byte Buddy binds, emits, or adjusts advice. */
-  private abstract static class FailureTrackingMethodVisitor extends MethodVisitor {
-
-    private FailureTrackingMethodVisitor(MethodVisitor delegate) {
-      super(ASM_API, delegate);
-    }
-
-    abstract RuntimeException record(Throwable failure);
-
-    @Override
-    public void visitFrame(int type, int numLocal, Object[] local, int numStack, Object[] stack) {
-      try {
-        super.visitFrame(type, numLocal, local, numStack, stack);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
-    }
-
-    @Override
-    public void visitInsn(int opcode) {
-      try {
-        super.visitInsn(opcode);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
-    }
-
-    @Override
-    public void visitIntInsn(int opcode, int operand) {
-      try {
-        super.visitIntInsn(opcode, operand);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
-    }
-
-    @Override
-    public void visitVarInsn(int opcode, int varIndex) {
-      try {
-        super.visitVarInsn(opcode, varIndex);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
-    }
-
-    @Override
-    public void visitTypeInsn(int opcode, String type) {
-      try {
-        super.visitTypeInsn(opcode, type);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
-    }
-
-    @Override
-    public void visitFieldInsn(int opcode, String owner, String name, String descriptor) {
-      try {
-        super.visitFieldInsn(opcode, owner, name, descriptor);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
-    }
-
-    @Override
-    public void visitMethodInsn(
-        int opcode, String owner, String name, String descriptor, boolean isInterface) {
-      try {
-        super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
-    }
-
-    @Override
-    public void visitInvokeDynamicInsn(
-        String name, String descriptor, Handle bootstrapMethodHandle, Object... arguments) {
-      try {
-        super.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, arguments);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
+    private DebuggingAdviceTransformer(
+            Advice.WithCustomMapping advice,
+            Advice.ExceptionHandler exceptionHandler,
+            Assigner assigner,
+            ClassFileLocator classFileLocator,
+            AgentBuilder.PoolStrategy poolStrategy,
+            AgentBuilder.LocationStrategy locationStrategy,
+            List<AgentBuilder.Transformer.ForAdvice.Entry> entries,
+            List<String> auxiliaries,
+            String instrumentationClass,
+            String adviceClass) {
+        super(
+                advice,
+                exceptionHandler,
+                assigner,
+                classFileLocator,
+                poolStrategy,
+                locationStrategy,
+                entries,
+                auxiliaries);
+        this.instrumentationClass = instrumentationClass;
+        this.adviceClass = adviceClass;
     }
 
     @Override
-    public void visitJumpInsn(int opcode, Label label) {
-      try {
-        super.visitJumpInsn(opcode, label);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
+    protected AgentBuilder.Transformer.ForAdvice make(
+            Advice.WithCustomMapping advice,
+            Advice.ExceptionHandler exceptionHandler,
+            Assigner assigner,
+            ClassFileLocator classFileLocator,
+            AgentBuilder.PoolStrategy poolStrategy,
+            AgentBuilder.LocationStrategy locationStrategy,
+            List<AgentBuilder.Transformer.ForAdvice.Entry> entries,
+            List<String> auxiliaries) {
+        return new DebuggingAdviceTransformer(
+                advice,
+                exceptionHandler,
+                assigner,
+                classFileLocator,
+                poolStrategy,
+                locationStrategy,
+                entries,
+                auxiliaries,
+                instrumentationClass,
+                adviceClass);
     }
 
     @Override
-    public void visitLabel(Label label) {
-      try {
-        super.visitLabel(label);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
+    protected AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper wrap(
+            TypeDescription target,
+            ClassLoader classLoader,
+            JavaModule module,
+            ProtectionDomain protectionDomain,
+            Advice advice) {
+        return wrap(
+                super.wrap(target, classLoader, module, protectionDomain, advice), instrumentationClass, adviceClass);
     }
 
-    @Override
-    public void visitLdcInsn(Object value) {
-      try {
-        super.visitLdcInsn(value);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
+    static AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper wrap(
+            AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate,
+            String instrumentationClass,
+            String adviceClass) {
+        return new DebuggingMethodVisitorWrapper(delegate, instrumentationClass, adviceClass);
     }
 
-    @Override
-    public void visitIincInsn(int varIndex, int increment) {
-      try {
-        super.visitIincInsn(varIndex, increment);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
+    private static final class DebuggingMethodVisitorWrapper
+            implements AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper {
+        private final AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate;
+        private final String instrumentationClass;
+        private final String adviceClass;
+
+        private DebuggingMethodVisitorWrapper(
+                AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate,
+                String instrumentationClass,
+                String adviceClass) {
+            this.delegate = delegate;
+            this.instrumentationClass = instrumentationClass;
+            this.adviceClass = adviceClass;
+        }
+
+        @Override
+        public MethodVisitor wrap(
+                TypeDescription instrumentedType,
+                MethodDescription instrumentedMethod,
+                MethodVisitor methodVisitor,
+                Implementation.Context implementationContext,
+                TypePool typePool,
+                int writerFlags,
+                int readerFlags) {
+            DownstreamMethodVisitor downstreamVisitor = new DownstreamMethodVisitor(methodVisitor);
+            try {
+                MethodVisitor adviceVisitor = delegate.wrap(
+                        instrumentedType,
+                        instrumentedMethod,
+                        downstreamVisitor,
+                        implementationContext,
+                        typePool,
+                        writerFlags,
+                        readerFlags);
+                return adviceVisitor == null
+                        ? null
+                        : new DebuggingMethodVisitor(
+                                adviceVisitor,
+                                instrumentationClass,
+                                adviceClass,
+                                instrumentedType,
+                                instrumentedMethod,
+                                downstreamVisitor);
+            } catch (RuntimeException | LinkageError failure) {
+                throw recordAdviceFailure(
+                        instrumentationClass,
+                        adviceClass,
+                        instrumentedType,
+                        instrumentedMethod,
+                        downstreamVisitor,
+                        failure);
+            }
+        }
     }
 
-    @Override
-    public void visitTableSwitchInsn(int min, int max, Label defaultLabel, Label... labels) {
-      try {
-        super.visitTableSwitchInsn(min, max, defaultLabel, labels);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
+    private static RuntimeException recordAdviceFailure(
+            String instrumentationClass,
+            String adviceClass,
+            TypeDescription instrumentedType,
+            MethodDescription instrumentedMethod,
+            DownstreamMethodVisitor downstreamVisitor,
+            Throwable failure) {
+        if (downstreamVisitor.isDownstreamFailure(failure)) {
+            return propagate(failure);
+        }
+        return wrapAdviceFailure(instrumentationClass, adviceClass, instrumentedType, instrumentedMethod, failure);
     }
 
-    @Override
-    public void visitLookupSwitchInsn(Label defaultLabel, int[] keys, Label[] labels) {
-      try {
-        super.visitLookupSwitchInsn(defaultLabel, keys, labels);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
+    private static AdviceTransformationException wrapAdviceFailure(
+            String instrumentationClass,
+            String adviceClass,
+            TypeDescription instrumentedType,
+            MethodDescription instrumentedMethod,
+            Throwable failure) {
+        if (failure instanceof AdviceTransformationException) {
+            return (AdviceTransformationException) failure;
+        }
+        return new AdviceTransformationException(
+                instrumentationClass,
+                adviceClass,
+                instrumentedType.getName(),
+                instrumentedMethod.getInternalName() + instrumentedMethod.getDescriptor(),
+                failure);
     }
 
-    @Override
-    public void visitMultiANewArrayInsn(String descriptor, int dimensions) {
-      try {
-        super.visitMultiANewArrayInsn(descriptor, dimensions);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
+    private static RuntimeException propagate(Throwable failure) {
+        if (failure instanceof RuntimeException) {
+            return (RuntimeException) failure;
+        }
+        throw (Error) failure;
     }
 
-    @Override
-    public void visitLocalVariable(
-        String name, String descriptor, String signature, Label start, Label end, int index) {
-      try {
-        super.visitLocalVariable(name, descriptor, signature, start, end, index);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
+    /** Marks failures crossing the visitor boundary below advice so they keep their attribution. */
+    private static final class DownstreamMethodVisitor extends FailureTrackingMethodVisitor {
+        private Throwable failure;
+
+        private DownstreamMethodVisitor(MethodVisitor delegate) {
+            super(delegate);
+        }
+
+        @Override
+        RuntimeException record(Throwable failure) {
+            this.failure = failure;
+            return propagate(failure);
+        }
+
+        /** Returns whether the same failure came from downstream, then clears the recorded failure. */
+        private boolean isDownstreamFailure(Throwable failure) {
+            Throwable downstreamFailure = this.failure;
+            this.failure = null;
+            return downstreamFailure == failure;
+        }
     }
 
-    @Override
-    public AnnotationVisitor visitLocalVariableAnnotation(
-        int typeRef,
-        TypePath typePath,
-        Label[] start,
-        Label[] end,
-        int[] index,
-        String descriptor,
-        boolean visible) {
-      try {
-        return super.visitLocalVariableAnnotation(
-            typeRef, typePath, start, end, index, descriptor, visible);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
+    /**
+     * Advice binding is triggered by the first code event after the exception table. Forwarding all
+     * code events here attributes failures thrown during that binding to the exact target method.
+     */
+    private static final class DebuggingMethodVisitor extends FailureTrackingMethodVisitor {
+        private final String instrumentationClass;
+        private final String adviceClass;
+        private final TypeDescription instrumentedType;
+        private final MethodDescription instrumentedMethod;
+        private final DownstreamMethodVisitor downstreamVisitor;
+
+        private DebuggingMethodVisitor(
+                MethodVisitor delegate,
+                String instrumentationClass,
+                String adviceClass,
+                TypeDescription instrumentedType,
+                MethodDescription instrumentedMethod,
+                DownstreamMethodVisitor downstreamVisitor) {
+            super(delegate);
+            this.instrumentationClass = instrumentationClass;
+            this.adviceClass = adviceClass;
+            this.instrumentedType = instrumentedType;
+            this.instrumentedMethod = instrumentedMethod;
+            this.downstreamVisitor = downstreamVisitor;
+        }
+
+        @Override
+        RuntimeException record(Throwable failure) {
+            return recordAdviceFailure(
+                    instrumentationClass,
+                    adviceClass,
+                    instrumentedType,
+                    instrumentedMethod,
+                    downstreamVisitor,
+                    failure);
+        }
     }
 
-    @Override
-    public void visitMaxs(int maxStack, int maxLocals) {
-      try {
-        super.visitMaxs(maxStack, maxLocals);
-      } catch (RuntimeException | LinkageError failure) {
-        throw record(failure);
-      }
+    /** Tracks callbacks where Byte Buddy binds, emits, or adjusts advice. */
+    private abstract static class FailureTrackingMethodVisitor extends MethodVisitor {
+
+        private FailureTrackingMethodVisitor(MethodVisitor delegate) {
+            super(ASM_API, delegate);
+        }
+
+        abstract RuntimeException record(Throwable failure);
+
+        @Override
+        public void visitFrame(int type, int numLocal, Object[] local, int numStack, Object[] stack) {
+            try {
+                super.visitFrame(type, numLocal, local, numStack, stack);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public void visitInsn(int opcode) {
+            try {
+                super.visitInsn(opcode);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public void visitIntInsn(int opcode, int operand) {
+            try {
+                super.visitIntInsn(opcode, operand);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public void visitVarInsn(int opcode, int varIndex) {
+            try {
+                super.visitVarInsn(opcode, varIndex);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public void visitTypeInsn(int opcode, String type) {
+            try {
+                super.visitTypeInsn(opcode, type);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public void visitFieldInsn(int opcode, String owner, String name, String descriptor) {
+            try {
+                super.visitFieldInsn(opcode, owner, name, descriptor);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public void visitMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) {
+            try {
+                super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public void visitInvokeDynamicInsn(
+                String name, String descriptor, Handle bootstrapMethodHandle, Object... arguments) {
+            try {
+                super.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, arguments);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public void visitJumpInsn(int opcode, Label label) {
+            try {
+                super.visitJumpInsn(opcode, label);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public void visitLabel(Label label) {
+            try {
+                super.visitLabel(label);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public void visitLdcInsn(Object value) {
+            try {
+                super.visitLdcInsn(value);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public void visitIincInsn(int varIndex, int increment) {
+            try {
+                super.visitIincInsn(varIndex, increment);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public void visitTableSwitchInsn(int min, int max, Label defaultLabel, Label... labels) {
+            try {
+                super.visitTableSwitchInsn(min, max, defaultLabel, labels);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public void visitLookupSwitchInsn(Label defaultLabel, int[] keys, Label[] labels) {
+            try {
+                super.visitLookupSwitchInsn(defaultLabel, keys, labels);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public void visitMultiANewArrayInsn(String descriptor, int dimensions) {
+            try {
+                super.visitMultiANewArrayInsn(descriptor, dimensions);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public void visitLocalVariable(
+                String name, String descriptor, String signature, Label start, Label end, int index) {
+            try {
+                super.visitLocalVariable(name, descriptor, signature, start, end, index);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public AnnotationVisitor visitLocalVariableAnnotation(
+                int typeRef,
+                TypePath typePath,
+                Label[] start,
+                Label[] end,
+                int[] index,
+                String descriptor,
+                boolean visible) {
+            try {
+                return super.visitLocalVariableAnnotation(typeRef, typePath, start, end, index, descriptor, visible);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
+
+        @Override
+        public void visitMaxs(int maxStack, int maxLocals) {
+            try {
+                super.visitMaxs(maxStack, maxLocals);
+            } catch (RuntimeException | LinkageError failure) {
+                throw record(failure);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/ExtensionFinder.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/ExtensionFinder.java
index f61b477b32b..49282389858 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/ExtensionFinder.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/ExtensionFinder.java
@@ -23,182 +23,182 @@
 
 /** Finds extensions to the Datadog tracer. */
 public final class ExtensionFinder {
-  private static final Logger log = LoggerFactory.getLogger(ExtensionFinder.class);
-
-  private static final ExtensionHandler[] handlers = {OPENTELEMETRY, DATADOG};
-
-  private static final String EXTENSIONS_PATH_SOURCE = "extensions_path";
-  private static final String SERVICES_PREFIX = "META-INF/services/";
-
-  private static final String[] OTEL_SPI_FQNS = {
-    "io.opentelemetry.context.ContextStorageProvider",
-    "io.opentelemetry.exporter.internal.compression.CompressorProvider",
-    "io.opentelemetry.exporter.internal.grpc.GrpcSenderProvider",
-    "io.opentelemetry.exporter.internal.http.HttpSenderProvider",
-    "io.opentelemetry.javaagent.extension.AgentListener",
-    "io.opentelemetry.javaagent.extension.ignore.IgnoredTypesConfigurer",
-    "io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule",
-    "io.opentelemetry.javaagent.tooling.BeforeAgentListener",
-    "io.opentelemetry.javaagent.tooling.LoggingCustomizer",
-    "io.opentelemetry.javaagent.tooling.bootstrap.BootstrapPackagesConfigurer",
-    "io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider",
-    "io.opentelemetry.sdk.autoconfigure.spi.AutoConfigureListener",
-    "io.opentelemetry.sdk.autoconfigure.spi.ConditionalResourceProvider",
-    "io.opentelemetry.sdk.autoconfigure.spi.ConfigurablePropagatorProvider",
-    "io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider",
-    "io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider",
-    "io.opentelemetry.sdk.autoconfigure.spi.logs.ConfigurableLogRecordExporterProvider",
-    "io.opentelemetry.sdk.autoconfigure.spi.metrics.ConfigurableMetricExporterProvider",
-    "io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSamplerProvider",
-    "io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider",
-    "io.opentelemetry.sdk.autoconfigure.spi.traces.SpanExporterCustomizer",
-  };
-
-  /**
-   * Discovers extensions on the configured path and creates a classloader for each extension.
-   * Registers the combined classloader with {@link Utils#setExtendedClassLoader(ClassLoader)}.
-   *
-   * @return {@code true} if any extensions were found
-   */
-  public static boolean findExtensions(String extensionsPath, Class<?>... extensionTypes) {
-    List<ClassLoader> classLoaders = new ArrayList<>();
-    List<JarFile> unusedJars = new ArrayList<>();
-
-    ClassLoader parent = Utils.getAgentClassLoader();
-    String[] descriptors = descriptors(extensionTypes);
-
-    for (JarFile jar : findExtensionJars(extensionsPath)) {
-      recordOtelSpiTelemetry(jar);
-      URL extensionURL = findExtensionURL(jar, descriptors);
-      if (null != extensionURL) {
-        log.debug("Found extension jar {}", jar.getName());
-        classLoaders.add(new URLClassLoader(new URL[] {extensionURL}, parent));
-      } else {
-        unusedJars.add(jar);
-      }
-    }
+    private static final Logger log = LoggerFactory.getLogger(ExtensionFinder.class);
+
+    private static final ExtensionHandler[] handlers = {OPENTELEMETRY, DATADOG};
+
+    private static final String EXTENSIONS_PATH_SOURCE = "extensions_path";
+    private static final String SERVICES_PREFIX = "META-INF/services/";
+
+    private static final String[] OTEL_SPI_FQNS = {
+        "io.opentelemetry.context.ContextStorageProvider",
+        "io.opentelemetry.exporter.internal.compression.CompressorProvider",
+        "io.opentelemetry.exporter.internal.grpc.GrpcSenderProvider",
+        "io.opentelemetry.exporter.internal.http.HttpSenderProvider",
+        "io.opentelemetry.javaagent.extension.AgentListener",
+        "io.opentelemetry.javaagent.extension.ignore.IgnoredTypesConfigurer",
+        "io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule",
+        "io.opentelemetry.javaagent.tooling.BeforeAgentListener",
+        "io.opentelemetry.javaagent.tooling.LoggingCustomizer",
+        "io.opentelemetry.javaagent.tooling.bootstrap.BootstrapPackagesConfigurer",
+        "io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider",
+        "io.opentelemetry.sdk.autoconfigure.spi.AutoConfigureListener",
+        "io.opentelemetry.sdk.autoconfigure.spi.ConditionalResourceProvider",
+        "io.opentelemetry.sdk.autoconfigure.spi.ConfigurablePropagatorProvider",
+        "io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider",
+        "io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider",
+        "io.opentelemetry.sdk.autoconfigure.spi.logs.ConfigurableLogRecordExporterProvider",
+        "io.opentelemetry.sdk.autoconfigure.spi.metrics.ConfigurableMetricExporterProvider",
+        "io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSamplerProvider",
+        "io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider",
+        "io.opentelemetry.sdk.autoconfigure.spi.traces.SpanExporterCustomizer",
+    };
+
+    /**
+     * Discovers extensions on the configured path and creates a classloader for each extension.
+     * Registers the combined classloader with {@link Utils#setExtendedClassLoader(ClassLoader)}.
+     *
+     * @return {@code true} if any extensions were found
+     */
+    public static boolean findExtensions(String extensionsPath, Class<?>... extensionTypes) {
+        List<ClassLoader> classLoaders = new ArrayList<>();
+        List<JarFile> unusedJars = new ArrayList<>();
+
+        ClassLoader parent = Utils.getAgentClassLoader();
+        String[] descriptors = descriptors(extensionTypes);
+
+        for (JarFile jar : findExtensionJars(extensionsPath)) {
+            recordOtelSpiTelemetry(jar);
+            URL extensionURL = findExtensionURL(jar, descriptors);
+            if (null != extensionURL) {
+                log.debug("Found extension jar {}", jar.getName());
+                classLoaders.add(new URLClassLoader(new URL[] {extensionURL}, parent));
+            } else {
+                unusedJars.add(jar);
+            }
+        }
 
-    close(unusedJars);
+        close(unusedJars);
 
-    if (classLoaders.size() > 1) {
-      Utils.setExtendedClassLoader(new MultipleParentClassLoader(classLoaders));
-    } else if (!classLoaders.isEmpty()) {
-      Utils.setExtendedClassLoader(classLoaders.get(0));
-    }
+        if (classLoaders.size() > 1) {
+            Utils.setExtendedClassLoader(new MultipleParentClassLoader(classLoaders));
+        } else if (!classLoaders.isEmpty()) {
+            Utils.setExtendedClassLoader(classLoaders.get(0));
+        }
 
-    return !classLoaders.isEmpty();
-  }
+        return !classLoaders.isEmpty();
+    }
 
-  /** Reports telemetry for any tracked OpenTelemetry SPI service descriptors present in the jar. */
-  static void recordOtelSpiTelemetry(JarFile jar) {
-    for (String fqn : OTEL_SPI_FQNS) {
-      if (null != jar.getJarEntry(SERVICES_PREFIX + fqn)) {
-        OtelSpiCollector.getInstance().recordSpiDetected(fqn, EXTENSIONS_PATH_SOURCE);
-      }
+    /** Reports telemetry for any tracked OpenTelemetry SPI service descriptors present in the jar. */
+    static void recordOtelSpiTelemetry(JarFile jar) {
+        for (String fqn : OTEL_SPI_FQNS) {
+            if (null != jar.getJarEntry(SERVICES_PREFIX + fqn)) {
+                OtelSpiCollector.getInstance().recordSpiDetected(fqn, EXTENSIONS_PATH_SOURCE);
+            }
+        }
     }
-  }
-
-  /** Closes jar resources from the extension path which did not contain any extensions. */
-  private static void close(List<JarFile> unusedJars) {
-    for (JarFile jar : unusedJars) {
-      try {
-        jar.close();
-      } catch (Exception ignore) {
-        // move onto next jar
-      }
+
+    /** Closes jar resources from the extension path which did not contain any extensions. */
+    private static void close(List<JarFile> unusedJars) {
+        for (JarFile jar : unusedJars) {
+            try {
+                jar.close();
+            } catch (Exception ignore) {
+                // move onto next jar
+            }
+        }
     }
-  }
-
-  /**
-   * Uses the registered {@link ExtensionHandler}s to find jars containing matching extensions.
-   * Creates a URL that uses the matched extension handler to access content from the extension.
-   */
-  private static URL findExtensionURL(JarFile jar, String[] descriptors) {
-    for (ExtensionHandler handler : handlers) {
-      for (String descriptor : descriptors) {
-        if (null != handler.mapEntry(jar, descriptor)) {
-          return buildExtensionURL(jar, handler);
+
+    /**
+     * Uses the registered {@link ExtensionHandler}s to find jars containing matching extensions.
+     * Creates a URL that uses the matched extension handler to access content from the extension.
+     */
+    private static URL findExtensionURL(JarFile jar, String[] descriptors) {
+        for (ExtensionHandler handler : handlers) {
+            for (String descriptor : descriptors) {
+                if (null != handler.mapEntry(jar, descriptor)) {
+                    return buildExtensionURL(jar, handler);
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
-
-  /** Builds a URL that uses an {@link ExtensionHandler} to access the extension. */
-  private static URL buildExtensionURL(JarFile jar, ExtensionHandler handler) {
-    try {
-      return new URL("dd-ext", null, -1, "/", new StreamMapper(jar, handler));
-    } catch (MalformedURLException ignore) {
-      return null;
+
+    /** Builds a URL that uses an {@link ExtensionHandler} to access the extension. */
+    private static URL buildExtensionURL(JarFile jar, ExtensionHandler handler) {
+        try {
+            return new URL("dd-ext", null, -1, "/", new StreamMapper(jar, handler));
+        } catch (MalformedURLException ignore) {
+            return null;
+        }
     }
-  }
 
-  /** Uses a {@link ExtensionHandler} to map and stream content from the extension. */
-  static final class StreamMapper extends URLStreamHandler {
-    private final JarFile jar;
-    private final ExtensionHandler handler;
+    /** Uses a {@link ExtensionHandler} to map and stream content from the extension. */
+    static final class StreamMapper extends URLStreamHandler {
+        private final JarFile jar;
+        private final ExtensionHandler handler;
 
-    StreamMapper(JarFile jar, ExtensionHandler handler) {
-      this.jar = jar;
-      this.handler = handler;
-    }
+        StreamMapper(JarFile jar, ExtensionHandler handler) {
+            this.jar = jar;
+            this.handler = handler;
+        }
 
-    @Override
-    protected URLConnection openConnection(URL url) throws IOException {
-      String file = url.getFile();
-      if (!file.isEmpty() && file.charAt(0) == '/') {
-        file = file.substring(1);
-      }
-      JarEntry jarEntry = handler.mapEntry(jar, file);
-      if (null != jarEntry) {
-        return handler.mapContent(url, jar, jarEntry);
-      } else {
-        throw new FileNotFoundException("JAR entry " + file + " not found in " + jar.getName());
-      }
+        @Override
+        protected URLConnection openConnection(URL url) throws IOException {
+            String file = url.getFile();
+            if (!file.isEmpty() && file.charAt(0) == '/') {
+                file = file.substring(1);
+            }
+            JarEntry jarEntry = handler.mapEntry(jar, file);
+            if (null != jarEntry) {
+                return handler.mapContent(url, jar, jarEntry);
+            } else {
+                throw new FileNotFoundException("JAR entry " + file + " not found in " + jar.getName());
+            }
+        }
     }
-  }
-
-  @SuppressForbidden // split on single-character uses fast path
-  private static List<JarFile> findExtensionJars(String extensionsPath) {
-    List<JarFile> extensionJars = new ArrayList<>();
-    for (String entry : extensionsPath.split(",")) {
-      File file = new File(entry);
-      if (file.isDirectory()) {
-        visitDirectory(file, extensionJars);
-      } else if (isJar(file)) {
-        addExtensionJar(file, extensionJars);
-      }
+
+    @SuppressForbidden // split on single-character uses fast path
+    private static List<JarFile> findExtensionJars(String extensionsPath) {
+        List<JarFile> extensionJars = new ArrayList<>();
+        for (String entry : extensionsPath.split(",")) {
+            File file = new File(entry);
+            if (file.isDirectory()) {
+                visitDirectory(file, extensionJars);
+            } else if (isJar(file)) {
+                addExtensionJar(file, extensionJars);
+            }
+        }
+        return extensionJars;
     }
-    return extensionJars;
-  }
-
-  private static void visitDirectory(File dir, List<JarFile> extensionJars) {
-    File[] files = dir.listFiles(ExtensionFinder::isJar);
-    if (null != files) {
-      for (File file : files) {
-        addExtensionJar(file, extensionJars);
-      }
+
+    private static void visitDirectory(File dir, List<JarFile> extensionJars) {
+        File[] files = dir.listFiles(ExtensionFinder::isJar);
+        if (null != files) {
+            for (File file : files) {
+                addExtensionJar(file, extensionJars);
+            }
+        }
     }
-  }
 
-  private static void addExtensionJar(File file, List<JarFile> extensionJars) {
-    try {
-      extensionJars.add(new JarFile(file, false));
-    } catch (Exception e) {
-      log.debug("Problem reading extension jar {}", file, e);
+    private static void addExtensionJar(File file, List<JarFile> extensionJars) {
+        try {
+            extensionJars.add(new JarFile(file, false));
+        } catch (Exception e) {
+            log.debug("Problem reading extension jar {}", file, e);
+        }
     }
-  }
 
-  /** The {@code META-INF/service} descriptors to look for. */
-  private static String[] descriptors(Class<?>[] extensionTypes) {
-    String[] descriptors = new String[extensionTypes.length];
-    for (int i = 0; i < extensionTypes.length; i++) {
-      descriptors[i] = "META-INF/services/" + extensionTypes[i].getName();
+    /** The {@code META-INF/service} descriptors to look for. */
+    private static String[] descriptors(Class<?>[] extensionTypes) {
+        String[] descriptors = new String[extensionTypes.length];
+        for (int i = 0; i < extensionTypes.length; i++) {
+            descriptors[i] = "META-INF/services/" + extensionTypes[i].getName();
+        }
+        return descriptors;
     }
-    return descriptors;
-  }
 
-  private static boolean isJar(File file) {
-    return file.getName().endsWith(".jar") && file.isFile();
-  }
+    private static boolean isJar(File file) {
+        return file.getName().endsWith(".jar") && file.isFile();
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/ExtensionLoader.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/ExtensionLoader.java
index 10715db8b78..dbbfe605a20 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/ExtensionLoader.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/ExtensionLoader.java
@@ -15,50 +15,49 @@
 
 /** Loads extensions into the Datadog tracer. */
 public final class ExtensionLoader {
-  private static final Logger log = LoggerFactory.getLogger(ExtensionLoader.class);
+    private static final Logger log = LoggerFactory.getLogger(ExtensionLoader.class);
 
-  private static final String[] NO_EXTENSIONS = {};
+    private static final String[] NO_EXTENSIONS = {};
 
-  /** Loads extensions from the extended classloader built by {@link ExtensionFinder}. */
-  public static <T> List<T> loadExtensions(Class<T> extensionType) {
-    return loadExtensions(Utils.getExtendedClassLoader(), extensionType);
-  }
+    /** Loads extensions from the extended classloader built by {@link ExtensionFinder}. */
+    public static <T> List<T> loadExtensions(Class<T> extensionType) {
+        return loadExtensions(Utils.getExtendedClassLoader(), extensionType);
+    }
 
-  private static <T> List<T> loadExtensions(ClassLoader classLoader, Class<T> extensionType) {
-    List<T> extensions = new ArrayList<>();
-    for (String className : listExtensionNames(classLoader, extensionType)) {
-      try {
-        @SuppressWarnings("unchecked")
-        Class<T> extensionClass = (Class<T>) classLoader.loadClass(className);
-        extensions.add(extensionClass.getConstructor().newInstance());
-        log.debug("Loaded extension {}", className);
-      } catch (Throwable e) {
-        log.warn("Failed to load extension {}", className, e);
-      }
+    private static <T> List<T> loadExtensions(ClassLoader classLoader, Class<T> extensionType) {
+        List<T> extensions = new ArrayList<>();
+        for (String className : listExtensionNames(classLoader, extensionType)) {
+            try {
+                @SuppressWarnings("unchecked")
+                Class<T> extensionClass = (Class<T>) classLoader.loadClass(className);
+                extensions.add(extensionClass.getConstructor().newInstance());
+                log.debug("Loaded extension {}", className);
+            } catch (Throwable e) {
+                log.warn("Failed to load extension {}", className, e);
+            }
+        }
+        return extensions;
     }
-    return extensions;
-  }
 
-  /** Returns the class names listed under the extension's {@code META-INF/services} descriptor. */
-  private static String[] listExtensionNames(ClassLoader classLoader, Class<?> extensionType) {
-    try {
-      Set<String> lines = new LinkedHashSet<>();
-      Enumeration<URL> urls =
-          classLoader.getResources("META-INF/services/" + extensionType.getName());
-      while (urls.hasMoreElements()) {
-        try (BufferedReader reader =
-            new BufferedReader(new InputStreamReader(urls.nextElement().openStream(), UTF_8))) {
-          String line = reader.readLine();
-          while (line != null) {
-            lines.add(line);
-            line = reader.readLine();
-          }
+    /** Returns the class names listed under the extension's {@code META-INF/services} descriptor. */
+    private static String[] listExtensionNames(ClassLoader classLoader, Class<?> extensionType) {
+        try {
+            Set<String> lines = new LinkedHashSet<>();
+            Enumeration<URL> urls = classLoader.getResources("META-INF/services/" + extensionType.getName());
+            while (urls.hasMoreElements()) {
+                try (BufferedReader reader = new BufferedReader(
+                        new InputStreamReader(urls.nextElement().openStream(), UTF_8))) {
+                    String line = reader.readLine();
+                    while (line != null) {
+                        lines.add(line);
+                        line = reader.readLine();
+                    }
+                }
+            }
+            return lines.toArray(new String[0]);
+        } catch (Throwable e) {
+            log.warn("Problem reading extensions descriptor", e);
+            return NO_EXTENSIONS;
         }
-      }
-      return lines.toArray(new String[0]);
-    } catch (Throwable e) {
-      log.warn("Problem reading extensions descriptor", e);
-      return NO_EXTENSIONS;
     }
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/MatchRecorder.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/MatchRecorder.java
index f93fdb8eb5a..9ee1acbfda1 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/MatchRecorder.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/MatchRecorder.java
@@ -11,210 +11,188 @@
 
 /** Records a single match result in the bit-set. */
 abstract class MatchRecorder {
-  protected final int id;
+    protected final int id;
 
-  MatchRecorder(int id) {
-    this.id = id;
-  }
+    MatchRecorder(int id) {
+        this.id = id;
+    }
 
-  public abstract void record(
-      TypeDescription type, ClassLoader classLoader, Class<?> classBeingRedefined, BitSet matches);
+    public abstract void record(
+            TypeDescription type, ClassLoader classLoader, Class<?> classBeingRedefined, BitSet matches);
 
-  public String describe() {
-    return InstrumenterState.describe(id);
-  }
+    public String describe() {
+        return InstrumenterState.describe(id);
+    }
 
-  /** Selects types based on a simple direct match that doesn't require further lookup. */
-  static final class ForType extends MatchRecorder {
-    private final ElementMatcher<TypeDescription> typeMatcher;
+    /** Selects types based on a simple direct match that doesn't require further lookup. */
+    static final class ForType extends MatchRecorder {
+        private final ElementMatcher<TypeDescription> typeMatcher;
 
-    ForType(int id, ElementMatcher<TypeDescription> typeMatcher) {
-      super(id);
-      this.typeMatcher = typeMatcher;
-    }
+        ForType(int id, ElementMatcher<TypeDescription> typeMatcher) {
+            super(id);
+            this.typeMatcher = typeMatcher;
+        }
 
-    @Override
-    public void record(
-        TypeDescription type,
-        ClassLoader classLoader,
-        Class<?> classBeingRedefined,
-        BitSet matches) {
-      long fromTick = InstrumenterMetrics.tick();
-      if (typeMatcher.matches(type)) {
-        InstrumenterMetrics.knownTypeHit(fromTick);
-        matches.set(id);
-      } else {
-        InstrumenterMetrics.knownTypeMiss(fromTick);
-      }
-    }
-  }
-
-  /** Selects types based on more complex matching against the type's hierarchy. */
-  static final class ForHierarchy extends MatchRecorder {
-    private final ElementMatcher<ClassLoader> hintMatcher;
-    private final ElementMatcher<TypeDescription> typeMatcher;
-
-    ForHierarchy(int id, Instrumenter.ForTypeHierarchy instrumenter) {
-      super(id);
-      String hint = instrumenter.hierarchyMarkerType();
-      this.hintMatcher = null != hint ? hasClassNamed(hint) : ANY_CLASS_LOADER;
-      this.typeMatcher = instrumenter.hierarchyMatcher();
+        @Override
+        public void record(
+                TypeDescription type, ClassLoader classLoader, Class<?> classBeingRedefined, BitSet matches) {
+            long fromTick = InstrumenterMetrics.tick();
+            if (typeMatcher.matches(type)) {
+                InstrumenterMetrics.knownTypeHit(fromTick);
+                matches.set(id);
+            } else {
+                InstrumenterMetrics.knownTypeMiss(fromTick);
+            }
+        }
     }
 
-    @Override
-    public void record(
-        TypeDescription type,
-        ClassLoader classLoader,
-        Class<?> classBeingRedefined,
-        BitSet matches) {
-      // check current state first in case a known-type already matched this instrumentation
-      if (!matches.get(id)) {
-        long fromTick = InstrumenterMetrics.tick();
-        if (hintMatcher.matches(classLoader) && typeMatcher.matches(type)) {
-          InstrumenterMetrics.typeHierarchyHit(fromTick);
-          matches.set(id);
-        } else {
-          InstrumenterMetrics.typeHierarchyMiss(fromTick);
+    /** Selects types based on more complex matching against the type's hierarchy. */
+    static final class ForHierarchy extends MatchRecorder {
+        private final ElementMatcher<ClassLoader> hintMatcher;
+        private final ElementMatcher<TypeDescription> typeMatcher;
+
+        ForHierarchy(int id, Instrumenter.ForTypeHierarchy instrumenter) {
+            super(id);
+            String hint = instrumenter.hierarchyMarkerType();
+            this.hintMatcher = null != hint ? hasClassNamed(hint) : ANY_CLASS_LOADER;
+            this.typeMatcher = instrumenter.hierarchyMatcher();
         }
-      }
-    }
-  }
-
-  /** Selects types that can and should have a context-store field injected. */
-  static final class ForContextStore extends MatchRecorder {
-    private final ElementMatcher<ClassLoader> activation;
-    private final FieldBackedContextMatcher contextMatcher;
-
-    ForContextStore(
-        int id, ElementMatcher<ClassLoader> activation, FieldBackedContextMatcher contextMatcher) {
-      super(id);
-      this.activation = activation;
-      this.contextMatcher = contextMatcher;
-    }
 
-    @Override
-    public void record(
-        TypeDescription type,
-        ClassLoader classLoader,
-        Class<?> classBeingRedefined,
-        BitSet matches) {
-      long fromTick = InstrumenterMetrics.tick();
-      if (activation.matches(classLoader) && contextMatcher.matches(type, classBeingRedefined)) {
-        InstrumenterMetrics.contextStoreHit(fromTick);
-        matches.set(id);
-      } else {
-        InstrumenterMetrics.contextStoreMiss(fromTick);
-      }
+        @Override
+        public void record(
+                TypeDescription type, ClassLoader classLoader, Class<?> classBeingRedefined, BitSet matches) {
+            // check current state first in case a known-type already matched this instrumentation
+            if (!matches.get(id)) {
+                long fromTick = InstrumenterMetrics.tick();
+                if (hintMatcher.matches(classLoader) && typeMatcher.matches(type)) {
+                    InstrumenterMetrics.typeHierarchyHit(fromTick);
+                    matches.set(id);
+                } else {
+                    InstrumenterMetrics.typeHierarchyMiss(fromTick);
+                }
+            }
+        }
     }
 
-    @Override
-    public String describe() {
-      // store description is more useful, as stores cut across instrumentations
-      return contextMatcher.describe();
-    }
-  }
+    /** Selects types that can and should have a context-store field injected. */
+    static final class ForContextStore extends MatchRecorder {
+        private final ElementMatcher<ClassLoader> activation;
+        private final FieldBackedContextMatcher contextMatcher;
 
-  /** Narrows the current match to eliminate incompatible types. */
-  static final class NarrowType extends MatchRecorder {
-    private final ElementMatcher<TypeDescription> matcher;
+        ForContextStore(int id, ElementMatcher<ClassLoader> activation, FieldBackedContextMatcher contextMatcher) {
+            super(id);
+            this.activation = activation;
+            this.contextMatcher = contextMatcher;
+        }
 
-    NarrowType(int id, ElementMatcher<TypeDescription> matcher) {
-      super(id);
-      this.matcher = matcher;
-    }
+        @Override
+        public void record(
+                TypeDescription type, ClassLoader classLoader, Class<?> classBeingRedefined, BitSet matches) {
+            long fromTick = InstrumenterMetrics.tick();
+            if (activation.matches(classLoader) && contextMatcher.matches(type, classBeingRedefined)) {
+                InstrumenterMetrics.contextStoreHit(fromTick);
+                matches.set(id);
+            } else {
+                InstrumenterMetrics.contextStoreMiss(fromTick);
+            }
+        }
 
-    @Override
-    public void record(
-        TypeDescription type,
-        ClassLoader classLoader,
-        Class<?> classBeingRedefined,
-        BitSet matches) {
-      if (matches.get(id)) {
-        long fromTick = InstrumenterMetrics.tick();
-        if (!matcher.matches(type)) {
-          InstrumenterMetrics.narrowTypeMiss(fromTick);
-          matches.clear(id);
-        } else {
-          InstrumenterMetrics.narrowTypeHit(fromTick);
+        @Override
+        public String describe() {
+            // store description is more useful, as stores cut across instrumentations
+            return contextMatcher.describe();
         }
-      }
     }
-  }
 
-  /** Narrows the current match to avoid structural changes on already-loaded classes. */
-  static final class PreserveLoadedStructure extends MatchRecorder {
-    private final Class<?> structuralChangeMarker;
+    /** Narrows the current match to eliminate incompatible types. */
+    static final class NarrowType extends MatchRecorder {
+        private final ElementMatcher<TypeDescription> matcher;
 
-    PreserveLoadedStructure(int id, Class<?> structuralChangeMarker) {
-      super(id);
-      this.structuralChangeMarker = structuralChangeMarker;
-    }
+        NarrowType(int id, ElementMatcher<TypeDescription> matcher) {
+            super(id);
+            this.matcher = matcher;
+        }
 
-    @Override
-    public void record(
-        TypeDescription type,
-        ClassLoader classLoader,
-        Class<?> classBeingRedefined,
-        BitSet matches) {
-      // don't transform loaded classes unless they directly declare the marker
-      // - we must re-transform those to preserve the original structural change
-      if (matches.get(id)
-          && null != classBeingRedefined
-          && !arrayContains(classBeingRedefined.getInterfaces(), structuralChangeMarker)) {
-        matches.clear(id);
-      }
-    }
-  }
-
-  /** Copies an already-computed match into another id, avoiding a redundant type match. */
-  static final class CopyMatch extends MatchRecorder {
-    private final int fromId;
-
-    CopyMatch(int fromId, int toId) {
-      super(toId);
-      if (toId <= fromId) {
-        // matchers are evaluated in 'id' order; we can only copy from ids strictly before this id
-        throw new IllegalArgumentException("fromId " + fromId + " must be before toId " + toId);
-      }
-      this.fromId = fromId;
+        @Override
+        public void record(
+                TypeDescription type, ClassLoader classLoader, Class<?> classBeingRedefined, BitSet matches) {
+            if (matches.get(id)) {
+                long fromTick = InstrumenterMetrics.tick();
+                if (!matcher.matches(type)) {
+                    InstrumenterMetrics.narrowTypeMiss(fromTick);
+                    matches.clear(id);
+                } else {
+                    InstrumenterMetrics.narrowTypeHit(fromTick);
+                }
+            }
+        }
     }
 
-    @Override
-    public void record(
-        TypeDescription type,
-        ClassLoader classLoader,
-        Class<?> classBeingRedefined,
-        BitSet matches) {
-      if (matches.get(fromId)) {
-        matches.set(id);
-      }
+    /** Narrows the current match to avoid structural changes on already-loaded classes. */
+    static final class PreserveLoadedStructure extends MatchRecorder {
+        private final Class<?> structuralChangeMarker;
+
+        PreserveLoadedStructure(int id, Class<?> structuralChangeMarker) {
+            super(id);
+            this.structuralChangeMarker = structuralChangeMarker;
+        }
+
+        @Override
+        public void record(
+                TypeDescription type, ClassLoader classLoader, Class<?> classBeingRedefined, BitSet matches) {
+            // don't transform loaded classes unless they directly declare the marker
+            // - we must re-transform those to preserve the original structural change
+            if (matches.get(id)
+                    && null != classBeingRedefined
+                    && !arrayContains(classBeingRedefined.getInterfaces(), structuralChangeMarker)) {
+                matches.clear(id);
+            }
+        }
     }
-  }
 
-  /** Narrows the current match to eliminate incompatible class-loaders. */
-  static final class NarrowLocation extends MatchRecorder {
-    private final ElementMatcher<ClassLoader> matcher;
+    /** Copies an already-computed match into another id, avoiding a redundant type match. */
+    static final class CopyMatch extends MatchRecorder {
+        private final int fromId;
+
+        CopyMatch(int fromId, int toId) {
+            super(toId);
+            if (toId <= fromId) {
+                // matchers are evaluated in 'id' order; we can only copy from ids strictly before this id
+                throw new IllegalArgumentException("fromId " + fromId + " must be before toId " + toId);
+            }
+            this.fromId = fromId;
+        }
 
-    NarrowLocation(int id, ElementMatcher<ClassLoader> matcher) {
-      super(id);
-      this.matcher = matcher;
+        @Override
+        public void record(
+                TypeDescription type, ClassLoader classLoader, Class<?> classBeingRedefined, BitSet matches) {
+            if (matches.get(fromId)) {
+                matches.set(id);
+            }
+        }
     }
 
-    @Override
-    public void record(
-        TypeDescription type,
-        ClassLoader classLoader,
-        Class<?> classBeingRedefined,
-        BitSet matches) {
-      if (matches.get(id)) {
-        long fromTick = InstrumenterMetrics.tick();
-        if (!matcher.matches(classLoader)) {
-          InstrumenterMetrics.narrowLocationMiss(fromTick);
-          matches.clear(id);
-        } else {
-          InstrumenterMetrics.narrowLocationHit(fromTick);
+    /** Narrows the current match to eliminate incompatible class-loaders. */
+    static final class NarrowLocation extends MatchRecorder {
+        private final ElementMatcher<ClassLoader> matcher;
+
+        NarrowLocation(int id, ElementMatcher<ClassLoader> matcher) {
+            super(id);
+            this.matcher = matcher;
+        }
+
+        @Override
+        public void record(
+                TypeDescription type, ClassLoader classLoader, Class<?> classBeingRedefined, BitSet matches) {
+            if (matches.get(id)) {
+                long fromTick = InstrumenterMetrics.tick();
+                if (!matcher.matches(classLoader)) {
+                    InstrumenterMetrics.narrowLocationMiss(fromTick);
+                    matches.clear(id);
+                } else {
+                    InstrumenterMetrics.narrowLocationHit(fromTick);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/MeterInstaller.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/MeterInstaller.java
index 0f3e507f72b..ad983f9fd0a 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/MeterInstaller.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/MeterInstaller.java
@@ -16,70 +16,69 @@
 import java.util.Map;
 
 public class MeterInstaller {
-  private static final String LANG_STATSD_TAG = "lang";
-  private static final String LANG_VERSION_STATSD_TAG = "lang_version";
-  private static final String LANG_INTERPRETER_STATSD_TAG = "lang_interpreter";
-  private static final String LANG_INTERPRETER_VENDOR_STATSD_TAG = "lang_interpreter_vendor";
-  private static final String TRACER_VERSION_STATSD_TAG = "tracer_version";
+    private static final String LANG_STATSD_TAG = "lang";
+    private static final String LANG_VERSION_STATSD_TAG = "lang_version";
+    private static final String LANG_INTERPRETER_STATSD_TAG = "lang_interpreter";
+    private static final String LANG_INTERPRETER_VENDOR_STATSD_TAG = "lang_interpreter_vendor";
+    private static final String TRACER_VERSION_STATSD_TAG = "tracer_version";
 
-  public static void installMeter() {
-    Config config = Config.get();
-    StatsDClient statsDClient = createStatsDClient(config);
-    Monitoring monitoring =
-        config.isHealthMetricsEnabled()
-            ? new MonitoringImpl(statsDClient, 10, SECONDS)
-            : MonitoringImpl.DISABLED;
-    AgentMeter.registerIfAbsent(statsDClient, monitoring, DDSketchHistograms.FACTORY);
-  }
-
-  private static StatsDClient createStatsDClient(Config config) {
-    if (!config.isHealthMetricsEnabled()) {
-      return StatsDClient.NO_OP;
-    }
-    String host = config.getHealthMetricsStatsdHost();
-    if (host == null) {
-      host = config.getJmxFetchStatsdHost();
+    public static void installMeter() {
+        Config config = Config.get();
+        StatsDClient statsDClient = createStatsDClient(config);
+        Monitoring monitoring = config.isHealthMetricsEnabled()
+                ? new MonitoringImpl(statsDClient, 10, SECONDS)
+                : MonitoringImpl.DISABLED;
+        AgentMeter.registerIfAbsent(statsDClient, monitoring, DDSketchHistograms.FACTORY);
     }
-    Integer port = config.getHealthMetricsStatsdPort();
-    if (port == null) {
-      port = config.getJmxFetchStatsdPort();
+
+    private static StatsDClient createStatsDClient(Config config) {
+        if (!config.isHealthMetricsEnabled()) {
+            return StatsDClient.NO_OP;
+        }
+        String host = config.getHealthMetricsStatsdHost();
+        if (host == null) {
+            host = config.getJmxFetchStatsdHost();
+        }
+        Integer port = config.getHealthMetricsStatsdPort();
+        if (port == null) {
+            port = config.getJmxFetchStatsdPort();
+        }
+
+        return statsDClientManager()
+                .statsDClient(
+                        host,
+                        port,
+                        config.getDogStatsDNamedPipe(),
+                        // use replace to stop string being changed to 'ddtrot.dd.tracer' in dd-trace-ot
+                        "datadog:tracer".replace(':', '.'),
+                        generateConstantTags(config));
     }
 
-    return statsDClientManager()
-        .statsDClient(
-            host,
-            port,
-            config.getDogStatsDNamedPipe(),
-            // use replace to stop string being changed to 'ddtrot.dd.tracer' in dd-trace-ot
-            "datadog:tracer".replace(':', '.'),
-            generateConstantTags(config));
-  }
+    private static String[] generateConstantTags(final Config config) {
+        final List<String> constantTags = new ArrayList<>();
 
-  private static String[] generateConstantTags(final Config config) {
-    final List<String> constantTags = new ArrayList<>();
+        constantTags.add(statsdTag(LANG_STATSD_TAG, "java"));
+        constantTags.add(statsdTag(LANG_VERSION_STATSD_TAG, DDTraceCoreInfo.JAVA_VERSION));
+        constantTags.add(statsdTag(LANG_INTERPRETER_STATSD_TAG, DDTraceCoreInfo.JAVA_VM_NAME));
+        constantTags.add(statsdTag(LANG_INTERPRETER_VENDOR_STATSD_TAG, DDTraceCoreInfo.JAVA_VM_VENDOR));
+        constantTags.add(statsdTag(TRACER_VERSION_STATSD_TAG, DDTraceCoreInfo.VERSION));
+        constantTags.add(statsdTag("service", config.getServiceName()));
 
-    constantTags.add(statsdTag(LANG_STATSD_TAG, "java"));
-    constantTags.add(statsdTag(LANG_VERSION_STATSD_TAG, DDTraceCoreInfo.JAVA_VERSION));
-    constantTags.add(statsdTag(LANG_INTERPRETER_STATSD_TAG, DDTraceCoreInfo.JAVA_VM_NAME));
-    constantTags.add(statsdTag(LANG_INTERPRETER_VENDOR_STATSD_TAG, DDTraceCoreInfo.JAVA_VM_VENDOR));
-    constantTags.add(statsdTag(TRACER_VERSION_STATSD_TAG, DDTraceCoreInfo.VERSION));
-    constantTags.add(statsdTag("service", config.getServiceName()));
+        final Map<String, String> mergedSpanTags = config.getMergedSpanTags();
+        final String version = mergedSpanTags.get(GeneralConfig.VERSION);
+        if (version != null && !version.isEmpty()) {
+            constantTags.add(statsdTag("version", version));
+        }
 
-    final Map<String, String> mergedSpanTags = config.getMergedSpanTags();
-    final String version = mergedSpanTags.get(GeneralConfig.VERSION);
-    if (version != null && !version.isEmpty()) {
-      constantTags.add(statsdTag("version", version));
-    }
+        final String env = mergedSpanTags.get(GeneralConfig.ENV);
+        if (env != null && !env.isEmpty()) {
+            constantTags.add(statsdTag("env", env));
+        }
 
-    final String env = mergedSpanTags.get(GeneralConfig.ENV);
-    if (env != null && !env.isEmpty()) {
-      constantTags.add(statsdTag("env", env));
+        return constantTags.toArray(new String[0]);
     }
 
-    return constantTags.toArray(new String[0]);
-  }
-
-  private static String statsdTag(final String tagPrefix, final String tagValue) {
-    return tagPrefix + ":" + tagValue;
-  }
+    private static String statsdTag(final String tagPrefix, final String tagValue) {
+        return tagPrefix + ":" + tagValue;
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/ProfilerInstaller.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/ProfilerInstaller.java
index 3488f7615dd..c4be56baff3 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/ProfilerInstaller.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/ProfilerInstaller.java
@@ -4,15 +4,15 @@
 import datadog.trace.api.Config;
 
 public class ProfilerInstaller {
-  public static boolean installProfiler() {
-    if (Config.get().isProfilingEnabled()) {
-      try {
-        ProfilingAgent.run(true, null);
-        return true;
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
+    public static boolean installProfiler() {
+        if (Config.get().isProfilingEnabled()) {
+            try {
+                ProfilingAgent.run(true, null);
+                return true;
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/ShadedAdviceLocator.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/ShadedAdviceLocator.java
index 484fa9fa55e..d202b7ce1cc 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/ShadedAdviceLocator.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/ShadedAdviceLocator.java
@@ -5,26 +5,26 @@
 
 /** Locates and shades class-file resources from the advice class-loader. */
 public final class ShadedAdviceLocator implements ClassFileLocator {
-  private final ClassFileLocator adviceLocator;
-  private final AdviceShader adviceShader;
+    private final ClassFileLocator adviceLocator;
+    private final AdviceShader adviceShader;
 
-  public ShadedAdviceLocator(ClassLoader adviceLoader, AdviceShader adviceShader) {
-    this.adviceLocator = ClassFileLocator.ForClassLoader.of(adviceLoader);
-    this.adviceShader = adviceShader;
-  }
+    public ShadedAdviceLocator(ClassLoader adviceLoader, AdviceShader adviceShader) {
+        this.adviceLocator = ClassFileLocator.ForClassLoader.of(adviceLoader);
+        this.adviceShader = adviceShader;
+    }
 
-  @Override
-  public Resolution locate(String className) throws IOException {
-    final Resolution resolution = adviceLocator.locate(className);
-    if (resolution.isResolved()) {
-      return new Resolution.Explicit(adviceShader.shadeClass(resolution.resolve()));
-    } else {
-      return resolution;
+    @Override
+    public Resolution locate(String className) throws IOException {
+        final Resolution resolution = adviceLocator.locate(className);
+        if (resolution.isResolved()) {
+            return new Resolution.Explicit(adviceShader.shadeClass(resolution.resolve()));
+        } else {
+            return resolution;
+        }
     }
-  }
 
-  @Override
-  public void close() throws IOException {
-    adviceLocator.close();
-  }
+    @Override
+    public void close() throws IOException {
+        adviceLocator.close();
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/SplittingTransformer.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/SplittingTransformer.java
index 91c31daba1f..630b907b8a3 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/SplittingTransformer.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/SplittingTransformer.java
@@ -9,27 +9,27 @@
 
 /** Splits matches recorded by {@link CombiningMatcher} back into separate transformation steps. */
 final class SplittingTransformer implements AgentBuilder.Transformer {
-  private final AdviceStack[] transformers;
+    private final AdviceStack[] transformers;
 
-  SplittingTransformer(AdviceStack[] transformers) {
-    this.transformers = transformers;
-  }
+    SplittingTransformer(AdviceStack[] transformers) {
+        this.transformers = transformers;
+    }
 
-  @Override
-  public DynamicType.Builder<?> transform(
-      DynamicType.Builder<?> builder,
-      TypeDescription target,
-      ClassLoader classLoader,
-      JavaModule module,
-      ProtectionDomain pd) {
+    @Override
+    public DynamicType.Builder<?> transform(
+            DynamicType.Builder<?> builder,
+            TypeDescription target,
+            ClassLoader classLoader,
+            JavaModule module,
+            ProtectionDomain pd) {
 
-    BitSet ids = CombiningMatcher.recordedMatches.get();
-    for (int id = ids.nextSetBit(0); id >= 0; id = ids.nextSetBit(id + 1)) {
-      long fromTick = InstrumenterMetrics.tick();
-      builder = transformers[id].transform(builder, target, classLoader, module, pd);
-      InstrumenterMetrics.transformType(fromTick);
-    }
+        BitSet ids = CombiningMatcher.recordedMatches.get();
+        for (int id = ids.nextSetBit(0); id >= 0; id = ids.nextSetBit(id + 1)) {
+            long fromTick = InstrumenterMetrics.tick();
+            builder = transformers[id].transform(builder, target, classLoader, module, pd);
+            InstrumenterMetrics.transformType(fromTick);
+        }
 
-    return builder;
-  }
+        return builder;
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/TracerInstaller.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/TracerInstaller.java
index 54f96813623..d0e19d216ae 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/TracerInstaller.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/TracerInstaller.java
@@ -18,90 +18,89 @@
 import org.slf4j.LoggerFactory;
 
 public class TracerInstaller {
-  private static final Logger log = LoggerFactory.getLogger(TracerInstaller.class);
+    private static final Logger log = LoggerFactory.getLogger(TracerInstaller.class);
 
-  /** Register a global tracer if no global tracer is already registered. */
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification =
-          "Agent-internal class; Class object does not escape to app code and lock only guards one-time tracer install.")
-  public static synchronized void installGlobalTracer(
-      SharedCommunicationObjects sharedCommunicationObjects,
-      ProfilingContextIntegration profilingContextIntegration) {
-    if (Config.get().isTraceEnabled() || Config.get().isCiVisibilityEnabled()) {
-      if (!(GlobalTracer.get() instanceof CoreTracer)) {
-        CoreTracer tracer =
-            CoreTracer.builder()
-                .sharedCommunicationObjects(sharedCommunicationObjects)
-                .profilingContextIntegration(profilingContextIntegration)
-                .reportInTracerFlare()
-                .pollForTracingConfiguration()
-                .serviceDiscoveryFactory(serviceDiscoveryFactory())
-                .build();
-        installGlobalTracer(tracer);
-      } else {
-        log.debug("GlobalTracer already registered.");
-      }
-    } else {
-      log.debug("Tracing is disabled, not installing GlobalTracer.");
+    /** Register a global tracer if no global tracer is already registered. */
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification =
+                    "Agent-internal class; Class object does not escape to app code and lock only guards one-time tracer install.")
+    public static synchronized void installGlobalTracer(
+            SharedCommunicationObjects sharedCommunicationObjects,
+            ProfilingContextIntegration profilingContextIntegration) {
+        if (Config.get().isTraceEnabled() || Config.get().isCiVisibilityEnabled()) {
+            if (!(GlobalTracer.get() instanceof CoreTracer)) {
+                CoreTracer tracer = CoreTracer.builder()
+                        .sharedCommunicationObjects(sharedCommunicationObjects)
+                        .profilingContextIntegration(profilingContextIntegration)
+                        .reportInTracerFlare()
+                        .pollForTracingConfiguration()
+                        .serviceDiscoveryFactory(serviceDiscoveryFactory())
+                        .build();
+                installGlobalTracer(tracer);
+            } else {
+                log.debug("GlobalTracer already registered.");
+            }
+        } else {
+            log.debug("Tracing is disabled, not installing GlobalTracer.");
+        }
     }
-  }
 
-  private static ServiceDiscoveryFactory serviceDiscoveryFactory() {
-    if (!Config.get().isServiceDiscoveryEnabled()) {
-      return null;
+    private static ServiceDiscoveryFactory serviceDiscoveryFactory() {
+        if (!Config.get().isServiceDiscoveryEnabled()) {
+            return null;
+        }
+        if (!OperatingSystem.isLinux()) {
+            log.debug("service discovery not supported outside linux");
+            return null;
+        }
+        // make sure this branch is not considered possible for graalvm artifact
+        if (Platform.isNativeImageBuilder() || Platform.isNativeImage()) {
+            log.debug("service discovery not supported on native images");
+            return null;
+        }
+        return TracerInstaller::initServiceDiscovery;
     }
-    if (!OperatingSystem.isLinux()) {
-      log.debug("service discovery not supported outside linux");
-      return null;
-    }
-    // make sure this branch is not considered possible for graalvm artifact
-    if (Platform.isNativeImageBuilder() || Platform.isNativeImage()) {
-      log.debug("service discovery not supported on native images");
-      return null;
-    }
-    return TracerInstaller::initServiceDiscovery;
-  }
 
-  private static ServiceDiscovery initServiceDiscovery() {
-    final ForeignMemoryWriter writer = new ForeignMemoryWriterFactory().get();
-    if (writer != null) {
-      return new ServiceDiscovery(writer);
+    private static ServiceDiscovery initServiceDiscovery() {
+        final ForeignMemoryWriter writer = new ForeignMemoryWriterFactory().get();
+        if (writer != null) {
+            return new ServiceDiscovery(writer);
+        }
+        return null;
     }
-    return null;
-  }
 
-  public static void installGlobalTracer(final CoreTracer tracer) {
-    try {
-      GlobalTracer.registerIfAbsent(tracer);
-      AgentTracer.registerIfAbsent(tracer);
+    public static void installGlobalTracer(final CoreTracer tracer) {
+        try {
+            GlobalTracer.registerIfAbsent(tracer);
+            AgentTracer.registerIfAbsent(tracer);
 
-      if (Platform.isNativeImage()) {
-        // TagsPostProcessorFactory (dd-trace-core) caches its tag processors, including
-        // InternalTagsAdder which stamps _dd.base_service, in a holder class that GraalVM
-        // native-image initializes at build time by default. At that point Config resolves
-        // to a build-time fallback service name (typically the native-image builder's own
-        // process identity), not the real DD_SERVICE the app is run with. Force the cache to
-        // recompute here, now that Config reflects the actual runtime environment.
-        TagsPostProcessorFactory.reset();
-      }
+            if (Platform.isNativeImage()) {
+                // TagsPostProcessorFactory (dd-trace-core) caches its tag processors, including
+                // InternalTagsAdder which stamps _dd.base_service, in a holder class that GraalVM
+                // native-image initializes at build time by default. At that point Config resolves
+                // to a build-time fallback service name (typically the native-image builder's own
+                // process identity), not the real DD_SERVICE the app is run with. Force the cache to
+                // recompute here, now that Config reflects the actual runtime environment.
+                TagsPostProcessorFactory.reset();
+            }
 
-      log.debug("Global tracer installed");
-    } catch (final RuntimeException re) {
-      log.warn("Failed to register tracer: {}", tracer, re);
+            log.debug("Global tracer installed");
+        } catch (final RuntimeException re) {
+            log.warn("Failed to register tracer: {}", tracer, re);
+        }
     }
-  }
 
-  public static void forceInstallGlobalTracer(CoreTracer tracer) {
-    try {
-      log.warn("Overriding installed global tracer.  This is not intended for production use");
+    public static void forceInstallGlobalTracer(CoreTracer tracer) {
+        try {
+            log.warn("Overriding installed global tracer.  This is not intended for production use");
 
-      GlobalTracer.forceRegister(tracer);
-      AgentTracer.forceRegister(tracer);
+            GlobalTracer.forceRegister(tracer);
+            AgentTracer.forceRegister(tracer);
 
-      log.debug("Global tracer installed");
-    } catch (final RuntimeException re) {
-      log.warn("Failed to register tracer: {}", tracer, re);
+            log.debug("Global tracer installed");
+        } catch (final RuntimeException re) {
+            log.warn("Failed to register tracer: {}", tracer, re);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDClassFileTransformer.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDClassFileTransformer.java
index c42cac42336..852364b9759 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDClassFileTransformer.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDClassFileTransformer.java
@@ -14,30 +14,30 @@
  */
 public final class DDClassFileTransformer extends ResettableClassFileTransformer.WithDelegation {
 
-  public static final TransformerDecorator DECORATOR = DDClassFileTransformer::new;
-
-  public DDClassFileTransformer(final ResettableClassFileTransformer classFileTransformer) {
-    super(classFileTransformer);
-  }
-
-  @Override
-  public byte[] transform(
-      final ClassLoader classLoader,
-      final String internalClassName,
-      final Class<?> classBeingRedefined,
-      final ProtectionDomain protectionDomain,
-      final byte[] classFileBuffer)
-      throws IllegalClassFormatException {
-
-    if (null != classLoader && canSkipClassLoaderByName(classLoader)) {
-      return null;
+    public static final TransformerDecorator DECORATOR = DDClassFileTransformer::new;
+
+    public DDClassFileTransformer(final ResettableClassFileTransformer classFileTransformer) {
+        super(classFileTransformer);
     }
 
-    try {
-      return classFileTransformer.transform(
-          classLoader, internalClassName, classBeingRedefined, protectionDomain, classFileBuffer);
-    } finally {
-      SharedTypePools.endTransform();
+    @Override
+    public byte[] transform(
+            final ClassLoader classLoader,
+            final String internalClassName,
+            final Class<?> classBeingRedefined,
+            final ProtectionDomain protectionDomain,
+            final byte[] classFileBuffer)
+            throws IllegalClassFormatException {
+
+        if (null != classLoader && canSkipClassLoaderByName(classLoader)) {
+            return null;
+        }
+
+        try {
+            return classFileTransformer.transform(
+                    classLoader, internalClassName, classBeingRedefined, protectionDomain, classFileBuffer);
+        } finally {
+            SharedTypePools.endTransform();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDLocationStrategy.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDLocationStrategy.java
index 4d4bfeb296d..b37119b4215 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDLocationStrategy.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDLocationStrategy.java
@@ -6,12 +6,12 @@
 
 /** Strategy that uses {@link ClassFileLocators} to locate class files. */
 public final class DDLocationStrategy implements AgentBuilder.LocationStrategy {
-  public ClassFileLocator classFileLocator(ClassLoader classLoader) {
-    return ClassFileLocators.classFileLocator(classLoader);
-  }
+    public ClassFileLocator classFileLocator(ClassLoader classLoader) {
+        return ClassFileLocators.classFileLocator(classLoader);
+    }
 
-  @Override
-  public ClassFileLocator classFileLocator(ClassLoader classLoader, JavaModule javaModule) {
-    return ClassFileLocators.classFileLocator(classLoader);
-  }
+    @Override
+    public ClassFileLocator classFileLocator(ClassLoader classLoader, JavaModule javaModule) {
+        return ClassFileLocators.classFileLocator(classLoader);
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDOutlinePoolStrategy.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDOutlinePoolStrategy.java
index c8ddb34f915..169300dc616 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDOutlinePoolStrategy.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDOutlinePoolStrategy.java
@@ -16,21 +16,21 @@
  * {@link DDOutlineTypeStrategy} is used to determine when to switch modes.
  */
 public final class DDOutlinePoolStrategy implements AgentBuilder.PoolStrategy {
-  public static final AgentBuilder.PoolStrategy INSTANCE = new DDOutlinePoolStrategy();
+    public static final AgentBuilder.PoolStrategy INSTANCE = new DDOutlinePoolStrategy();
 
-  @Override
-  public TypePool typePool(ClassFileLocator ignored, ClassLoader classLoader) {
-    // it's safe to ignore this ClassFileLocator because we capture the target bytecode
-    // in DDOutlineTypeStrategy, so we don't need the compound locator provided here
-    TypePoolFacade.switchContext(classLoader);
-    return TypePoolFacade.INSTANCE;
-  }
+    @Override
+    public TypePool typePool(ClassFileLocator ignored, ClassLoader classLoader) {
+        // it's safe to ignore this ClassFileLocator because we capture the target bytecode
+        // in DDOutlineTypeStrategy, so we don't need the compound locator provided here
+        TypePoolFacade.switchContext(classLoader);
+        return TypePoolFacade.INSTANCE;
+    }
 
-  @Override
-  public TypePool typePool(ClassFileLocator ignored, ClassLoader classLoader, String name) {
-    // it's safe to ignore this ClassFileLocator because we capture the target bytecode
-    // in DDOutlineTypeStrategy, so we don't need the compound locator provided here
-    TypePoolFacade.switchContext(classLoader);
-    return TypePoolFacade.INSTANCE;
-  }
+    @Override
+    public TypePool typePool(ClassFileLocator ignored, ClassLoader classLoader, String name) {
+        // it's safe to ignore this ClassFileLocator because we capture the target bytecode
+        // in DDOutlineTypeStrategy, so we don't need the compound locator provided here
+        TypePoolFacade.switchContext(classLoader);
+        return TypePoolFacade.INSTANCE;
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDOutlineTypeStrategy.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDOutlineTypeStrategy.java
index e1dfc1d2aee..7dcf27af412 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDOutlineTypeStrategy.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDOutlineTypeStrategy.java
@@ -15,48 +15,47 @@
  * Custom type strategy that captures the target bytecode when matching starts and switches from
  * outline types to full type parsing when the actual transformation begins.
  */
-public final class DDOutlineTypeStrategy
-    implements AgentBuilder.ClassFileBufferStrategy, AgentBuilder.TypeStrategy {
-  public static final DDOutlineTypeStrategy INSTANCE = new DDOutlineTypeStrategy();
+public final class DDOutlineTypeStrategy implements AgentBuilder.ClassFileBufferStrategy, AgentBuilder.TypeStrategy {
+    public static final DDOutlineTypeStrategy INSTANCE = new DDOutlineTypeStrategy();
 
-  @Override
-  public ClassFileLocator resolve(
-      String name,
-      byte[] binaryRepresentation,
-      ClassLoader classLoader,
-      JavaModule module,
-      ProtectionDomain protectionDomain) {
-    TypePoolFacade.beginTransform(name, binaryRepresentation);
-    return ClassFileLocator.Simple.of(name, binaryRepresentation);
-  }
+    @Override
+    public ClassFileLocator resolve(
+            String name,
+            byte[] binaryRepresentation,
+            ClassLoader classLoader,
+            JavaModule module,
+            ProtectionDomain protectionDomain) {
+        TypePoolFacade.beginTransform(name, binaryRepresentation);
+        return ClassFileLocator.Simple.of(name, binaryRepresentation);
+    }
 
-  @Override
-  public TypePool typePool(
-      AgentBuilder.PoolStrategy poolStrategy,
-      ClassFileLocator classFileLocator,
-      ClassLoader classLoader,
-      String name) {
-    TypePoolFacade.switchContext(classLoader);
-    return TypePoolFacade.INSTANCE;
-  }
+    @Override
+    public TypePool typePool(
+            AgentBuilder.PoolStrategy poolStrategy,
+            ClassFileLocator classFileLocator,
+            ClassLoader classLoader,
+            String name) {
+        TypePoolFacade.switchContext(classLoader);
+        return TypePoolFacade.INSTANCE;
+    }
 
-  @Override
-  public DynamicType.Builder<?> builder(
-      TypeDescription typeDescription,
-      ByteBuddy byteBuddy,
-      ClassFileLocator classFileLocator,
-      MethodNameTransformer methodNameTransformer,
-      ClassLoader classLoader,
-      JavaModule module,
-      ProtectionDomain protectionDomain) {
-    TypePoolFacade.enableFullDescriptions();
-    return AgentBuilder.TypeStrategy.Default.REDEFINE_FROZEN.builder(
-        typeDescription,
-        byteBuddy,
-        classFileLocator,
-        methodNameTransformer,
-        classLoader,
-        module,
-        protectionDomain);
-  }
+    @Override
+    public DynamicType.Builder<?> builder(
+            TypeDescription typeDescription,
+            ByteBuddy byteBuddy,
+            ClassFileLocator classFileLocator,
+            MethodNameTransformer methodNameTransformer,
+            ClassLoader classLoader,
+            JavaModule module,
+            ProtectionDomain protectionDomain) {
+        TypePoolFacade.enableFullDescriptions();
+        return AgentBuilder.TypeStrategy.Default.REDEFINE_FROZEN.builder(
+                typeDescription,
+                byteBuddy,
+                classFileLocator,
+                methodNameTransformer,
+                classLoader,
+                module,
+                protectionDomain);
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDRediscoveryStrategy.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDRediscoveryStrategy.java
index 6ef5c9a49ae..a147bb5bca6 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDRediscoveryStrategy.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDRediscoveryStrategy.java
@@ -27,84 +27,84 @@
  * @see Instrumentation#addTransformer(ClassFileTransformer, boolean)
  */
 public final class DDRediscoveryStrategy implements RedefinitionStrategy.DiscoveryStrategy {
-  static final int MAX_ROUNDS = 10;
+    static final int MAX_ROUNDS = 10;
 
-  @Override
-  public Iterable<Iterable<Class<?>>> resolve(final Instrumentation instrumentation) {
-    return new Iterable<Iterable<Class<?>>>() {
-      @Override
-      public Iterator<Iterable<Class<?>>> iterator() {
-        final Set<Class<?>> visited = new HashSet<>(256);
-        return new Iterator<Iterable<Class<?>>>() {
-          private int round = 0;
+    @Override
+    public Iterable<Iterable<Class<?>>> resolve(final Instrumentation instrumentation) {
+        return new Iterable<Iterable<Class<?>>>() {
+            @Override
+            public Iterator<Iterable<Class<?>>> iterator() {
+                final Set<Class<?>> visited = new HashSet<>(256);
+                return new Iterator<Iterable<Class<?>>>() {
+                    private int round = 0;
 
-          @Override
-          public boolean hasNext() {
-            return round < MAX_ROUNDS;
-          }
+                    @Override
+                    public boolean hasNext() {
+                        return round < MAX_ROUNDS;
+                    }
 
-          @Override
-          public Iterable<Class<?>> next() {
-            if (!hasNext()) {
-              throw new NoSuchElementException();
-            }
-            List<Class<?>> next = selectClassesForRetransformation(instrumentation, visited);
-            if (next.isEmpty()) {
-              round = MAX_ROUNDS; // halt iterator, nothing more to re-transform
-            } else {
-              visited.addAll(next); // mark as visited so they're not transformed again
-              round++;
-            }
-            return next;
-          }
+                    @Override
+                    public Iterable<Class<?>> next() {
+                        if (!hasNext()) {
+                            throw new NoSuchElementException();
+                        }
+                        List<Class<?>> next = selectClassesForRetransformation(instrumentation, visited);
+                        if (next.isEmpty()) {
+                            round = MAX_ROUNDS; // halt iterator, nothing more to re-transform
+                        } else {
+                            visited.addAll(next); // mark as visited so they're not transformed again
+                            round++;
+                        }
+                        return next;
+                    }
 
-          @Override
-          public void remove() {
-            throw new UnsupportedOperationException();
-          }
+                    @Override
+                    public void remove() {
+                        throw new UnsupportedOperationException();
+                    }
+                };
+            }
         };
-      }
-    };
-  }
+    }
 
-  /** Selects classes to retransform from already loaded classes that we haven't previously seen. */
-  static List<Class<?>> selectClassesForRetransformation(
-      final Instrumentation instrumentation, final Set<Class<?>> visited) {
-    List<Class<?>> retransforming = new ArrayList<>();
-    for (Class<?> clazz : instrumentation.getAllLoadedClasses()) {
-      if (clazz == null) {
-        // getAllLoadedClasses can return null classes (Class Unloading)
-        continue;
-      }
-      ClassLoader classLoader = clazz.getClassLoader();
-      if (null != classLoader) {
-        if (canSkipClassLoaderByName(classLoader)) {
-          continue;
-        }
-        Class<?> loaderClass = classLoader.getClass();
-        // postpone transforming types if their class-loader has yet to be transformed
-        // (this stops us from accidentally marking the class-loader as skipped when we
-        // haven't yet patched it to delegate to the boot-class-path for tracer types)
-        if (!visited.contains(loaderClass) && allowRetransform(loaderClass)) {
-          continue;
+    /** Selects classes to retransform from already loaded classes that we haven't previously seen. */
+    static List<Class<?>> selectClassesForRetransformation(
+            final Instrumentation instrumentation, final Set<Class<?>> visited) {
+        List<Class<?>> retransforming = new ArrayList<>();
+        for (Class<?> clazz : instrumentation.getAllLoadedClasses()) {
+            if (clazz == null) {
+                // getAllLoadedClasses can return null classes (Class Unloading)
+                continue;
+            }
+            ClassLoader classLoader = clazz.getClassLoader();
+            if (null != classLoader) {
+                if (canSkipClassLoaderByName(classLoader)) {
+                    continue;
+                }
+                Class<?> loaderClass = classLoader.getClass();
+                // postpone transforming types if their class-loader has yet to be transformed
+                // (this stops us from accidentally marking the class-loader as skipped when we
+                // haven't yet patched it to delegate to the boot-class-path for tracer types)
+                if (!visited.contains(loaderClass) && allowRetransform(loaderClass)) {
+                    continue;
+                }
+            }
+            if (!visited.contains(clazz) && allowRetransform(clazz)) {
+                retransforming.add(clazz);
+            }
         }
-      }
-      if (!visited.contains(clazz) && allowRetransform(clazz)) {
-        retransforming.add(clazz);
-      }
+        return retransforming;
     }
-    return retransforming;
-  }
 
-  private static boolean allowRetransform(Class<?> clazz) {
-    switch (IgnoredClassNameTrie.apply(clazz.getName())) {
-      case 0:
-        return true; // explicitly allowed
-      case -1:
-        // unknown type; if it's from the boot-class-path ignore it, otherwise allow
-        return null != clazz.getClassLoader();
-      default:
-        return false; // explicitly ignored
+    private static boolean allowRetransform(Class<?> clazz) {
+        switch (IgnoredClassNameTrie.apply(clazz.getName())) {
+            case 0:
+                return true; // explicitly allowed
+            case -1:
+                // unknown type; if it's from the boot-class-path ignore it, otherwise allow
+                return null != clazz.getClassLoader();
+            default:
+                return false; // explicitly ignored
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDTransformers.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDTransformers.java
index 0c105c0d2b9..a3f5a30b4a7 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDTransformers.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDTransformers.java
@@ -9,20 +9,19 @@
 
 public class DDTransformers {
 
-  private static final AgentBuilder.Transformer CONSTANT_ADJUSTER =
-      new AgentBuilder.Transformer() {
+    private static final AgentBuilder.Transformer CONSTANT_ADJUSTER = new AgentBuilder.Transformer() {
         @Override
         public DynamicType.Builder<?> transform(
-            final DynamicType.Builder<?> builder,
-            final TypeDescription typeDescription,
-            final ClassLoader classLoader,
-            final JavaModule javaModule,
-            final ProtectionDomain pd) {
-          return builder.visit(TypeConstantAdjustment.INSTANCE);
+                final DynamicType.Builder<?> builder,
+                final TypeDescription typeDescription,
+                final ClassLoader classLoader,
+                final JavaModule javaModule,
+                final ProtectionDomain pd) {
+            return builder.visit(TypeConstantAdjustment.INSTANCE);
         }
-      };
+    };
 
-  public static AgentBuilder.Transformer defaultTransformers() {
-    return CONSTANT_ADJUSTER;
-  }
+    public static AgentBuilder.Transformer defaultTransformers() {
+        return CONSTANT_ADJUSTER;
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/DDElementMatchers.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/DDElementMatchers.java
index f1e07970e95..64ff5f607cf 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/DDElementMatchers.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/DDElementMatchers.java
@@ -16,84 +16,77 @@
  * This class provides some custom ByteBuddy element matchers to use when applying instrumentation
  */
 public class DDElementMatchers implements HierarchyMatchers.Supplier {
-  public static void registerAsSupplier() {
-    HierarchyMatchers.registerIfAbsent(new DDElementMatchers());
-  }
+    public static void registerAsSupplier() {
+        HierarchyMatchers.registerIfAbsent(new DDElementMatchers());
+    }
 
-  @Override
-  @SuppressForbidden
-  public ElementMatcher.Junction<TypeDescription> declaresAnnotation(
-      ElementMatcher<? super NamedElement> matcher) {
-    return ElementMatchers.isAnnotatedWith(matcher);
-  }
+    @Override
+    @SuppressForbidden
+    public ElementMatcher.Junction<TypeDescription> declaresAnnotation(ElementMatcher<? super NamedElement> matcher) {
+        return ElementMatchers.isAnnotatedWith(matcher);
+    }
 
-  @Override
-  @SuppressForbidden
-  public ElementMatcher.Junction<TypeDescription> declaresField(
-      ElementMatcher<? super FieldDescription> matcher) {
-    return ElementMatchers.declaresField(matcher);
-  }
+    @Override
+    @SuppressForbidden
+    public ElementMatcher.Junction<TypeDescription> declaresField(ElementMatcher<? super FieldDescription> matcher) {
+        return ElementMatchers.declaresField(matcher);
+    }
 
-  @Override
-  @SuppressForbidden
-  public ElementMatcher.Junction<TypeDescription> declaresMethod(
-      ElementMatcher<? super MethodDescription> matcher) {
-    return ElementMatchers.declaresMethod(matcher);
-  }
+    @Override
+    @SuppressForbidden
+    public ElementMatcher.Junction<TypeDescription> declaresMethod(ElementMatcher<? super MethodDescription> matcher) {
+        return ElementMatchers.declaresMethod(matcher);
+    }
 
-  @Override
-  @SuppressForbidden
-  public ElementMatcher.Junction<TypeDescription> concreteClass() {
-    return not(ElementMatchers.isAbstract());
-  }
+    @Override
+    @SuppressForbidden
+    public ElementMatcher.Junction<TypeDescription> concreteClass() {
+        return not(ElementMatchers.isAbstract());
+    }
 
-  @Override
-  public ElementMatcher.Junction<TypeDescription> extendsClass(
-      ElementMatcher<? super TypeDescription> matcher) {
-    return new SafeHasSuperTypeMatcher<>(matcher, false, true, false);
-  }
+    @Override
+    public ElementMatcher.Junction<TypeDescription> extendsClass(ElementMatcher<? super TypeDescription> matcher) {
+        return new SafeHasSuperTypeMatcher<>(matcher, false, true, false);
+    }
 
-  @Override
-  public ElementMatcher.Junction<TypeDescription> implementsInterface(
-      ElementMatcher<? super TypeDescription> matcher) {
-    return new SafeHasSuperTypeMatcher<>(matcher, true, true, true);
-  }
+    @Override
+    public ElementMatcher.Junction<TypeDescription> implementsInterface(
+            ElementMatcher<? super TypeDescription> matcher) {
+        return new SafeHasSuperTypeMatcher<>(matcher, true, true, true);
+    }
 
-  @Override
-  public ElementMatcher.Junction<TypeDescription> hasInterface(
-      ElementMatcher<? super TypeDescription> matcher) {
-    return new SafeHasSuperTypeMatcher<>(matcher, true, false, true);
-  }
+    @Override
+    public ElementMatcher.Junction<TypeDescription> hasInterface(ElementMatcher<? super TypeDescription> matcher) {
+        return new SafeHasSuperTypeMatcher<>(matcher, true, false, true);
+    }
 
-  @Override
-  public ElementMatcher.Junction<TypeDescription> hasSuperType(
-      ElementMatcher<? super TypeDescription> matcher) {
-    return new SafeHasSuperTypeMatcher<>(matcher, false, true, true);
-  }
+    @Override
+    public ElementMatcher.Junction<TypeDescription> hasSuperType(ElementMatcher<? super TypeDescription> matcher) {
+        return new SafeHasSuperTypeMatcher<>(matcher, false, true, true);
+    }
 
-  @Override
-  public ElementMatcher.Junction<MethodDescription> hasSuperMethod(
-      ElementMatcher<? super MethodDescription> matcher) {
-    return new HasSuperMethodMatcher<>(matcher);
-  }
+    @Override
+    public ElementMatcher.Junction<MethodDescription> hasSuperMethod(
+            ElementMatcher<? super MethodDescription> matcher) {
+        return new HasSuperMethodMatcher<>(matcher);
+    }
 
-  @Override
-  public ElementMatcher.Junction<TypeDescription> declaresContextField(
-      String keyClassName, String contextClassName) {
-    return new ShouldInjectFieldsMatcher(keyClassName, contextClassName);
-  }
+    @Override
+    public ElementMatcher.Junction<TypeDescription> declaresContextField(String keyClassName, String contextClassName) {
+        return new ShouldInjectFieldsMatcher(keyClassName, contextClassName);
+    }
 
-  @SuppressForbidden
-  static String safeTypeDefinitionName(final TypeDefinition td) {
-    try {
-      return td.getTypeName();
-    } catch (final IllegalStateException ex) {
-      final String message = ex.getMessage();
-      if (message.startsWith("Cannot resolve type description for ")) {
-        return message.replace("Cannot resolve type description for ", "");
-      } else {
-        return "?";
-      }
+    @SuppressForbidden
+    static String safeTypeDefinitionName(final TypeDefinition td) {
+        try {
+            return td.getTypeName();
+        } catch (final IllegalStateException ex) {
+            final String message = ex.getMessage();
+            if (message.startsWith("Cannot resolve type description for ")) {
+                return message.replace("Cannot resolve type description for ", "");
+            } else {
+                return "?";
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/FailSafeRawMatcher.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/FailSafeRawMatcher.java
index cb89b846eb7..ee4002e2fd1 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/FailSafeRawMatcher.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/FailSafeRawMatcher.java
@@ -11,68 +11,67 @@
 
 /** {@link AgentBuilder.RawMatcher} that logs and swallows exceptions while matching. */
 public class FailSafeRawMatcher implements AgentBuilder.RawMatcher {
-  private static final Logger log = LoggerFactory.getLogger(FailSafeRawMatcher.class);
+    private static final Logger log = LoggerFactory.getLogger(FailSafeRawMatcher.class);
 
-  /** The type matcher that might throw an exception. */
-  private final ElementMatcher<? super TypeDescription> typeMatcher;
+    /** The type matcher that might throw an exception. */
+    private final ElementMatcher<? super TypeDescription> typeMatcher;
 
-  /** The classloader matcher that might throw an exception. */
-  private final ElementMatcher<? super ClassLoader> classLoaderMatcher;
+    /** The classloader matcher that might throw an exception. */
+    private final ElementMatcher<? super ClassLoader> classLoaderMatcher;
 
-  /** The text description to log if exception happens. */
-  private final String description;
+    /** The text description to log if exception happens. */
+    private final String description;
 
-  /**
-   * Creates a new fail-safe raw matcher.
-   *
-   * @param typeMatcher The type matcher that might throw an exception.
-   * @param classLoaderMatcher The classloader matcher that might throw an exception.
-   * @param description Descriptive string to log along with exception.
-   */
-  public FailSafeRawMatcher(
-      ElementMatcher<? super TypeDescription> typeMatcher,
-      ElementMatcher<? super ClassLoader> classLoaderMatcher,
-      String description) {
-    this.typeMatcher = typeMatcher;
-    this.classLoaderMatcher = classLoaderMatcher;
-    this.description = description;
-  }
-
-  @Override
-  public boolean matches(
-      TypeDescription typeDescription,
-      ClassLoader classLoader,
-      JavaModule module,
-      Class<?> classBeingRedefined,
-      ProtectionDomain protectionDomain) {
-    try {
-      return classLoaderMatcher.matches(classLoader) && typeMatcher.matches(typeDescription);
-    } catch (Exception e) {
-      log.debug(description, e);
-      return false;
+    /**
+     * Creates a new fail-safe raw matcher.
+     *
+     * @param typeMatcher The type matcher that might throw an exception.
+     * @param classLoaderMatcher The classloader matcher that might throw an exception.
+     * @param description Descriptive string to log along with exception.
+     */
+    public FailSafeRawMatcher(
+            ElementMatcher<? super TypeDescription> typeMatcher,
+            ElementMatcher<? super ClassLoader> classLoaderMatcher,
+            String description) {
+        this.typeMatcher = typeMatcher;
+        this.classLoaderMatcher = classLoaderMatcher;
+        this.description = description;
     }
-  }
 
-  @Override
-  public String toString() {
-    return "failSafe(try(" + typeMatcher + "," + classLoaderMatcher + ") or false)";
-  }
+    @Override
+    public boolean matches(
+            TypeDescription typeDescription,
+            ClassLoader classLoader,
+            JavaModule module,
+            Class<?> classBeingRedefined,
+            ProtectionDomain protectionDomain) {
+        try {
+            return classLoaderMatcher.matches(classLoader) && typeMatcher.matches(typeDescription);
+        } catch (Exception e) {
+            log.debug(description, e);
+            return false;
+        }
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    @Override
+    public String toString() {
+        return "failSafe(try(" + typeMatcher + "," + classLoaderMatcher + ") or false)";
     }
-    if (o instanceof FailSafeRawMatcher) {
-      FailSafeRawMatcher that = (FailSafeRawMatcher) o;
-      return typeMatcher.equals(that.typeMatcher)
-          && classLoaderMatcher.equals(that.classLoaderMatcher);
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o instanceof FailSafeRawMatcher) {
+            FailSafeRawMatcher that = (FailSafeRawMatcher) o;
+            return typeMatcher.equals(that.typeMatcher) && classLoaderMatcher.equals(that.classLoaderMatcher);
+        }
+        return false;
     }
-    return false;
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(typeMatcher, classLoaderMatcher);
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(typeMatcher, classLoaderMatcher);
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/GlobalIgnoresMatcher.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/GlobalIgnoresMatcher.java
index fc487ad9a1d..c06f2ff4090 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/GlobalIgnoresMatcher.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/GlobalIgnoresMatcher.java
@@ -13,53 +13,52 @@
  */
 public class GlobalIgnoresMatcher implements AgentBuilder.RawMatcher {
 
-  public static GlobalIgnoresMatcher globalIgnoresMatcher(boolean skipAdditionalLibraryMatcher) {
-    return new GlobalIgnoresMatcher(skipAdditionalLibraryMatcher);
-  }
+    public static GlobalIgnoresMatcher globalIgnoresMatcher(boolean skipAdditionalLibraryMatcher) {
+        return new GlobalIgnoresMatcher(skipAdditionalLibraryMatcher);
+    }
 
-  private final boolean skipAdditionalLibraryMatcher;
+    private final boolean skipAdditionalLibraryMatcher;
 
-  private GlobalIgnoresMatcher(final boolean skipAdditionalLibraryMatcher) {
-    this.skipAdditionalLibraryMatcher = skipAdditionalLibraryMatcher;
-  }
+    private GlobalIgnoresMatcher(final boolean skipAdditionalLibraryMatcher) {
+        this.skipAdditionalLibraryMatcher = skipAdditionalLibraryMatcher;
+    }
 
-  @Override
-  public boolean matches(
-      TypeDescription typeDescription,
-      ClassLoader classLoader,
-      JavaModule module,
-      Class<?> classBeingRedefined,
-      ProtectionDomain protectionDomain) {
-    // put cheaper name checks first...
-    String name = typeDescription.getName();
-    return GlobalIgnores.isIgnored(name, skipAdditionalLibraryMatcher)
-        || CustomExcludes.isExcluded(name)
-        || CodeSourceExcludes.isExcluded(protectionDomain)
-        || ProxyClassIgnores.isIgnored(name)
-        || incompatibleClassLoader(classLoader);
-  }
+    @Override
+    public boolean matches(
+            TypeDescription typeDescription,
+            ClassLoader classLoader,
+            JavaModule module,
+            Class<?> classBeingRedefined,
+            ProtectionDomain protectionDomain) {
+        // put cheaper name checks first...
+        String name = typeDescription.getName();
+        return GlobalIgnores.isIgnored(name, skipAdditionalLibraryMatcher)
+                || CustomExcludes.isExcluded(name)
+                || CodeSourceExcludes.isExcluded(protectionDomain)
+                || ProxyClassIgnores.isIgnored(name)
+                || incompatibleClassLoader(classLoader);
+    }
 
-  @Override
-  public String toString() {
-    return "globalIgnoresMatcher(" + skipAdditionalLibraryMatcher + ")";
-  }
+    @Override
+    public String toString() {
+        return "globalIgnoresMatcher(" + skipAdditionalLibraryMatcher + ")";
+    }
 
-  @Override
-  public boolean equals(final Object other) {
-    if (this == other) {
-      return true;
-    } else if (other == null) {
-      return false;
-    } else if (getClass() != other.getClass()) {
-      return false;
-    } else {
-      return skipAdditionalLibraryMatcher
-          == ((GlobalIgnoresMatcher) other).skipAdditionalLibraryMatcher;
+    @Override
+    public boolean equals(final Object other) {
+        if (this == other) {
+            return true;
+        } else if (other == null) {
+            return false;
+        } else if (getClass() != other.getClass()) {
+            return false;
+        } else {
+            return skipAdditionalLibraryMatcher == ((GlobalIgnoresMatcher) other).skipAdditionalLibraryMatcher;
+        }
     }
-  }
 
-  @Override
-  public int hashCode() {
-    return 17 * 31 + (skipAdditionalLibraryMatcher ? 1231 : 1237);
-  }
+    @Override
+    public int hashCode() {
+        return 17 * 31 + (skipAdditionalLibraryMatcher ? 1231 : 1237);
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/HasSuperMethodMatcher.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/HasSuperMethodMatcher.java
index af054c79569..3f458721046 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/HasSuperMethodMatcher.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/HasSuperMethodMatcher.java
@@ -11,77 +11,76 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 // TODO: add javadoc
-class HasSuperMethodMatcher<T extends MethodDescription>
-    extends ElementMatcher.Junction.ForNonNullValues<T> {
+class HasSuperMethodMatcher<T extends MethodDescription> extends ElementMatcher.Junction.ForNonNullValues<T> {
 
-  private final ElementMatcher<? super MethodDescription> matcher;
+    private final ElementMatcher<? super MethodDescription> matcher;
 
-  public HasSuperMethodMatcher(final ElementMatcher<? super MethodDescription> matcher) {
-    this.matcher = matcher;
-  }
-
-  @Override
-  protected boolean doMatch(final MethodDescription target) {
-    if (target.isConstructor()) {
-      return false;
+    public HasSuperMethodMatcher(final ElementMatcher<? super MethodDescription> matcher) {
+        this.matcher = matcher;
     }
-    final Junction<MethodDescription> signatureMatcher = hasSignature(target.asSignatureToken());
-    TypeDefinition declaringType = target.getDeclaringType();
-    final Set<TypeDefinition> checkedInterfaces = new HashSet<>(8);
 
-    while (declaringType != null) {
-      for (final MethodDescription methodDescription : declaringType.getDeclaredMethods()) {
-        if (signatureMatcher.matches(methodDescription) && matcher.matches(methodDescription)) {
-          return true;
+    @Override
+    protected boolean doMatch(final MethodDescription target) {
+        if (target.isConstructor()) {
+            return false;
         }
-      }
-      if (matchesInterface(declaringType.getInterfaces(), signatureMatcher, checkedInterfaces)) {
-        return true;
-      }
-      declaringType = safeGetSuperClass(declaringType);
-    }
-    return false;
-  }
+        final Junction<MethodDescription> signatureMatcher = hasSignature(target.asSignatureToken());
+        TypeDefinition declaringType = target.getDeclaringType();
+        final Set<TypeDefinition> checkedInterfaces = new HashSet<>(8);
 
-  private boolean matchesInterface(
-      final TypeList.Generic interfaces,
-      final Junction<MethodDescription> signatureMatcher,
-      final Set<TypeDefinition> checkedInterfaces) {
-    for (final TypeDefinition type : interfaces) {
-      if (checkedInterfaces.add(type)) {
-        for (final MethodDescription methodDescription : type.getDeclaredMethods()) {
-          if (signatureMatcher.matches(methodDescription) && matcher.matches(methodDescription)) {
-            return true;
-          }
+        while (declaringType != null) {
+            for (final MethodDescription methodDescription : declaringType.getDeclaredMethods()) {
+                if (signatureMatcher.matches(methodDescription) && matcher.matches(methodDescription)) {
+                    return true;
+                }
+            }
+            if (matchesInterface(declaringType.getInterfaces(), signatureMatcher, checkedInterfaces)) {
+                return true;
+            }
+            declaringType = safeGetSuperClass(declaringType);
         }
-        if (matchesInterface(type.getInterfaces(), signatureMatcher, checkedInterfaces)) {
-          return true;
+        return false;
+    }
+
+    private boolean matchesInterface(
+            final TypeList.Generic interfaces,
+            final Junction<MethodDescription> signatureMatcher,
+            final Set<TypeDefinition> checkedInterfaces) {
+        for (final TypeDefinition type : interfaces) {
+            if (checkedInterfaces.add(type)) {
+                for (final MethodDescription methodDescription : type.getDeclaredMethods()) {
+                    if (signatureMatcher.matches(methodDescription) && matcher.matches(methodDescription)) {
+                        return true;
+                    }
+                }
+                if (matchesInterface(type.getInterfaces(), signatureMatcher, checkedInterfaces)) {
+                    return true;
+                }
+            }
         }
-      }
+        return false;
     }
-    return false;
-  }
 
-  @Override
-  public String toString() {
-    return "hasSuperMethodMatcher(" + matcher + ")";
-  }
+    @Override
+    public String toString() {
+        return "hasSuperMethodMatcher(" + matcher + ")";
+    }
 
-  @Override
-  public boolean equals(final Object other) {
-    if (this == other) {
-      return true;
-    } else if (other == null) {
-      return false;
-    } else if (getClass() != other.getClass()) {
-      return false;
-    } else {
-      return matcher.equals(((HasSuperMethodMatcher) other).matcher);
+    @Override
+    public boolean equals(final Object other) {
+        if (this == other) {
+            return true;
+        } else if (other == null) {
+            return false;
+        } else if (getClass() != other.getClass()) {
+            return false;
+        } else {
+            return matcher.equals(((HasSuperMethodMatcher) other).matcher);
+        }
     }
-  }
 
-  @Override
-  public int hashCode() {
-    return 17 * 31 + matcher.hashCode();
-  }
+    @Override
+    public int hashCode() {
+        return 17 * 31 + matcher.hashCode();
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/SafeHasSuperTypeMatcher.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/SafeHasSuperTypeMatcher.java
index b688286c809..a93f009f473 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/SafeHasSuperTypeMatcher.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/SafeHasSuperTypeMatcher.java
@@ -30,223 +30,220 @@
  * @param <T> The type of the matched entity.
  * @see net.bytebuddy.matcher.HasSuperTypeMatcher
  */
-class SafeHasSuperTypeMatcher<T extends TypeDescription>
-    extends ElementMatcher.Junction.ForNonNullValues<T> {
-
-  private static final Logger log = LoggerFactory.getLogger(SafeHasSuperTypeMatcher.class);
-
-  /** The matcher to apply to any super type of the matched type. */
-  private final ElementMatcher<? super TypeDescription> matcher;
-
-  private final boolean interfacesOnly;
-  private final boolean rejectInterfaceTargets;
-  private final boolean checkInterfaces;
-
-  /**
-   * Creates a new matcher for a super type.
-   *
-   * @param matcher The matcher to apply to any super type of the matched type.
-   */
-  public SafeHasSuperTypeMatcher(
-      ElementMatcher<? super TypeDescription> matcher,
-      boolean interfacesOnly,
-      boolean rejectInterfaceTargets,
-      boolean checkInterfaces) {
-    this.matcher = matcher;
-    this.interfacesOnly = interfacesOnly;
-    this.rejectInterfaceTargets = rejectInterfaceTargets;
-    this.checkInterfaces = checkInterfaces;
-  }
-
-  @Override
-  protected boolean doMatch(final T target) {
-    boolean isInterface = safeIsInterface(target);
-    if (rejectInterfaceTargets && isInterface) {
-      return false;
+class SafeHasSuperTypeMatcher<T extends TypeDescription> extends ElementMatcher.Junction.ForNonNullValues<T> {
+
+    private static final Logger log = LoggerFactory.getLogger(SafeHasSuperTypeMatcher.class);
+
+    /** The matcher to apply to any super type of the matched type. */
+    private final ElementMatcher<? super TypeDescription> matcher;
+
+    private final boolean interfacesOnly;
+    private final boolean rejectInterfaceTargets;
+    private final boolean checkInterfaces;
+
+    /**
+     * Creates a new matcher for a super type.
+     *
+     * @param matcher The matcher to apply to any super type of the matched type.
+     */
+    public SafeHasSuperTypeMatcher(
+            ElementMatcher<? super TypeDescription> matcher,
+            boolean interfacesOnly,
+            boolean rejectInterfaceTargets,
+            boolean checkInterfaces) {
+        this.matcher = matcher;
+        this.interfacesOnly = interfacesOnly;
+        this.rejectInterfaceTargets = rejectInterfaceTargets;
+        this.checkInterfaces = checkInterfaces;
     }
-    // We do not use foreach loop and iterator interface here because we need to catch exceptions
-    // in {@code getSuperClass} calls
-    TypeDefinition typeDefinition = target;
-    if (checkInterfaces) {
-      final Set<TypeDescription> checkedInterfaces = new HashSet<>(8);
-      while (typeDefinition != null) {
-        if (((!interfacesOnly || isInterface) && erasureMatches(typeDefinition.asGenericType()))
-            || (hasInterface(typeDefinition, checkedInterfaces))) {
-          return true;
-        }
-        typeDefinition = safeGetSuperClass(typeDefinition);
-      }
-    } else {
-      while (typeDefinition != null) {
-        if (erasureMatches(typeDefinition.asGenericType())) {
-          return true;
+
+    @Override
+    protected boolean doMatch(final T target) {
+        boolean isInterface = safeIsInterface(target);
+        if (rejectInterfaceTargets && isInterface) {
+            return false;
         }
-        typeDefinition = safeGetSuperClass(typeDefinition);
-      }
-    }
-    return false;
-  }
-
-  private boolean erasureMatches(TypeDescription.Generic typeDefinition) {
-    TypeDescription erasure = safeAsErasure(typeDefinition);
-    return null != erasure && matcher.matches(erasure);
-  }
-
-  /**
-   * Matches a type's interfaces against the provided matcher.
-   *
-   * @param typeDefinition The type for which to check all implemented interfaces.
-   * @param checkedInterfaces The interfaces that have already been checked.
-   * @return {@code true} if any interface matches the supplied matcher.
-   */
-  private boolean hasInterface(
-      final TypeDefinition typeDefinition, final Set<TypeDescription> checkedInterfaces) {
-    for (final TypeDefinition interfaceType : safeGetInterfaces(typeDefinition)) {
-      final TypeDescription erasure = safeAsErasure(interfaceType);
-      if (erasure != null) {
-        if (checkedInterfaces.add(interfaceType.asErasure())
-            && (erasureMatches(interfaceType.asGenericType())
-                || hasInterface(interfaceType, checkedInterfaces))) {
-          return true;
+        // We do not use foreach loop and iterator interface here because we need to catch exceptions
+        // in {@code getSuperClass} calls
+        TypeDefinition typeDefinition = target;
+        if (checkInterfaces) {
+            final Set<TypeDescription> checkedInterfaces = new HashSet<>(8);
+            while (typeDefinition != null) {
+                if (((!interfacesOnly || isInterface) && erasureMatches(typeDefinition.asGenericType()))
+                        || (hasInterface(typeDefinition, checkedInterfaces))) {
+                    return true;
+                }
+                typeDefinition = safeGetSuperClass(typeDefinition);
+            }
+        } else {
+            while (typeDefinition != null) {
+                if (erasureMatches(typeDefinition.asGenericType())) {
+                    return true;
+                }
+                typeDefinition = safeGetSuperClass(typeDefinition);
+            }
         }
-      }
+        return false;
     }
-    return false;
-  }
-
-  private Iterable<TypeDefinition> safeGetInterfaces(final TypeDefinition typeDefinition) {
-    return new SafeInterfaceIterator(typeDefinition);
-  }
-
-  static boolean safeIsInterface(final TypeDefinition typeDefinition) {
-    try {
-      return typeDefinition.isInterface();
-    } catch (final Exception e) {
-      if (log.isDebugEnabled()) {
-        log.debug(
-            "{} trying to check isInterface for target {}: {}",
-            e.getClass().getSimpleName(),
-            safeTypeDefinitionName(typeDefinition),
-            e.getMessage());
-      }
-      return false;
+
+    private boolean erasureMatches(TypeDescription.Generic typeDefinition) {
+        TypeDescription erasure = safeAsErasure(typeDefinition);
+        return null != erasure && matcher.matches(erasure);
     }
-  }
-
-  static TypeDefinition safeGetSuperClass(final TypeDefinition typeDefinition) {
-    try {
-      return typeDefinition.getSuperClass();
-    } catch (final Exception e) {
-      if (log.isDebugEnabled()) {
-        log.debug(
-            "{} trying to get super class for target {}: {}",
-            e.getClass().getSimpleName(),
-            safeTypeDefinitionName(typeDefinition),
-            e.getMessage());
-      }
-      return null;
+
+    /**
+     * Matches a type's interfaces against the provided matcher.
+     *
+     * @param typeDefinition The type for which to check all implemented interfaces.
+     * @param checkedInterfaces The interfaces that have already been checked.
+     * @return {@code true} if any interface matches the supplied matcher.
+     */
+    private boolean hasInterface(final TypeDefinition typeDefinition, final Set<TypeDescription> checkedInterfaces) {
+        for (final TypeDefinition interfaceType : safeGetInterfaces(typeDefinition)) {
+            final TypeDescription erasure = safeAsErasure(interfaceType);
+            if (erasure != null) {
+                if (checkedInterfaces.add(interfaceType.asErasure())
+                        && (erasureMatches(interfaceType.asGenericType())
+                                || hasInterface(interfaceType, checkedInterfaces))) {
+                    return true;
+                }
+            }
+        }
+        return false;
     }
-  }
-
-  @Override
-  public String toString() {
-    return "safeHasSuperType(" + matcher + ")";
-  }
-
-  @Override
-  public boolean equals(final Object other) {
-    if (this == other) {
-      return true;
-    } else if (other == null) {
-      return false;
-    } else if (getClass() != other.getClass()) {
-      return false;
-    } else {
-      return matcher.equals(((SafeHasSuperTypeMatcher) other).matcher);
+
+    private Iterable<TypeDefinition> safeGetInterfaces(final TypeDefinition typeDefinition) {
+        return new SafeInterfaceIterator(typeDefinition);
     }
-  }
-
-  @Override
-  public int hashCode() {
-    return 17 * 31 + matcher.hashCode();
-  }
-
-  /**
-   * TypeDefinition#getInterfaces() produces an iterator which may throw an exception during
-   * iteration if an interface is absent from the classpath.
-   *
-   * <p>The caller MUST call hasNext() before calling next().
-   *
-   * <p>This wrapper exists to allow getting interfaces even if the lookup on one fails.
-   */
-  private static class SafeInterfaceIterator
-      implements Iterator<TypeDefinition>, Iterable<TypeDefinition> {
-    private final TypeDefinition typeDefinition;
-    private final Iterator<TypeDescription.Generic> it;
-    private TypeDefinition next;
-
-    private SafeInterfaceIterator(TypeDefinition typeDefinition) {
-      this.typeDefinition = typeDefinition;
-      Iterator<TypeDescription.Generic> it = null;
-      try {
-        it = typeDefinition.getInterfaces().iterator();
-      } catch (Exception e) {
-        logException(typeDefinition, e);
-      }
-      this.it = it;
+
+    static boolean safeIsInterface(final TypeDefinition typeDefinition) {
+        try {
+            return typeDefinition.isInterface();
+        } catch (final Exception e) {
+            if (log.isDebugEnabled()) {
+                log.debug(
+                        "{} trying to check isInterface for target {}: {}",
+                        e.getClass().getSimpleName(),
+                        safeTypeDefinitionName(typeDefinition),
+                        e.getMessage());
+            }
+            return false;
+        }
     }
 
-    @Override
-    public boolean hasNext() {
-      if (null != it && it.hasNext()) {
+    static TypeDefinition safeGetSuperClass(final TypeDefinition typeDefinition) {
         try {
-          this.next = it.next();
-          return true;
-        } catch (Exception e) {
-          logException(typeDefinition, e);
-          return false;
+            return typeDefinition.getSuperClass();
+        } catch (final Exception e) {
+            if (log.isDebugEnabled()) {
+                log.debug(
+                        "{} trying to get super class for target {}: {}",
+                        e.getClass().getSimpleName(),
+                        safeTypeDefinitionName(typeDefinition),
+                        e.getMessage());
+            }
+            return null;
         }
-      }
-      return false;
     }
 
     @Override
-    @SuppressFBWarnings("IT_NO_SUCH_ELEMENT")
-    public TypeDefinition next() {
-      return next;
+    public String toString() {
+        return "safeHasSuperType(" + matcher + ")";
     }
 
     @Override
-    public void remove() {}
+    public boolean equals(final Object other) {
+        if (this == other) {
+            return true;
+        } else if (other == null) {
+            return false;
+        } else if (getClass() != other.getClass()) {
+            return false;
+        } else {
+            return matcher.equals(((SafeHasSuperTypeMatcher) other).matcher);
+        }
+    }
 
     @Override
-    public Iterator<TypeDefinition> iterator() {
-      return this;
+    public int hashCode() {
+        return 17 * 31 + matcher.hashCode();
     }
 
-    private void logException(TypeDefinition typeDefinition, Exception e) {
-      if (log.isDebugEnabled()) {
-        log.debug(
-            "{} trying to get interfaces for target {}: {}",
-            e.getClass().getSimpleName(),
-            safeTypeDefinitionName(typeDefinition),
-            e.getMessage());
-      }
+    /**
+     * TypeDefinition#getInterfaces() produces an iterator which may throw an exception during
+     * iteration if an interface is absent from the classpath.
+     *
+     * <p>The caller MUST call hasNext() before calling next().
+     *
+     * <p>This wrapper exists to allow getting interfaces even if the lookup on one fails.
+     */
+    private static class SafeInterfaceIterator implements Iterator<TypeDefinition>, Iterable<TypeDefinition> {
+        private final TypeDefinition typeDefinition;
+        private final Iterator<TypeDescription.Generic> it;
+        private TypeDefinition next;
+
+        private SafeInterfaceIterator(TypeDefinition typeDefinition) {
+            this.typeDefinition = typeDefinition;
+            Iterator<TypeDescription.Generic> it = null;
+            try {
+                it = typeDefinition.getInterfaces().iterator();
+            } catch (Exception e) {
+                logException(typeDefinition, e);
+            }
+            this.it = it;
+        }
+
+        @Override
+        public boolean hasNext() {
+            if (null != it && it.hasNext()) {
+                try {
+                    this.next = it.next();
+                    return true;
+                } catch (Exception e) {
+                    logException(typeDefinition, e);
+                    return false;
+                }
+            }
+            return false;
+        }
+
+        @Override
+        @SuppressFBWarnings("IT_NO_SUCH_ELEMENT")
+        public TypeDefinition next() {
+            return next;
+        }
+
+        @Override
+        public void remove() {}
+
+        @Override
+        public Iterator<TypeDefinition> iterator() {
+            return this;
+        }
+
+        private void logException(TypeDefinition typeDefinition, Exception e) {
+            if (log.isDebugEnabled()) {
+                log.debug(
+                        "{} trying to get interfaces for target {}: {}",
+                        e.getClass().getSimpleName(),
+                        safeTypeDefinitionName(typeDefinition),
+                        e.getMessage());
+            }
+        }
     }
-  }
-
-  static TypeDescription safeAsErasure(final TypeDefinition typeDefinition) {
-    try {
-      return typeDefinition.asErasure();
-    } catch (final Exception e) {
-      if (log.isDebugEnabled()) {
-        log.debug(
-            "{} trying to get erasure for target {}: {}",
-            e.getClass().getSimpleName(),
-            safeTypeDefinitionName(typeDefinition),
-            e.getMessage());
-      }
-      return null;
+
+    static TypeDescription safeAsErasure(final TypeDefinition typeDefinition) {
+        try {
+            return typeDefinition.asErasure();
+        } catch (final Exception e) {
+            if (log.isDebugEnabled()) {
+                log.debug(
+                        "{} trying to get erasure for target {}: {}",
+                        e.getClass().getSimpleName(),
+                        safeTypeDefinitionName(typeDefinition),
+                        e.getMessage());
+            }
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/nativeimage/TracerActivation.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/nativeimage/TracerActivation.java
index e6ff1031faa..de47d50964f 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/nativeimage/TracerActivation.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/nativeimage/TracerActivation.java
@@ -14,24 +14,22 @@
 
 /** Activates the tracer in native executables, see {@code VMRuntimeInstrumentation}. */
 public final class TracerActivation {
-  private static final Logger log = LoggerFactory.getLogger(TracerActivation.class);
+    private static final Logger log = LoggerFactory.getLogger(TracerActivation.class);
 
-  public static void activate() {
-    try {
-      // Initialize meter
-      MeterInstaller.installMeter();
-      // Initialize tracer
-      boolean withProfiler = ProfilerInstaller.installProfiler();
-      TracerInstaller.installGlobalTracer(
-          new SharedCommunicationObjects(),
-          withProfiler
-              ? new JFREventContextIntegration()
-              : ProfilingContextIntegration.NoOp.INSTANCE);
-      // Initialize JMXFetch
-      StatsDClientManager statsDClientManager = DDAgentStatsDClientManager.statsDClientManager();
-      JMXFetch.run(statsDClientManager);
-    } catch (Throwable e) {
-      log.warn("Problem activating datadog tracer", e);
+    public static void activate() {
+        try {
+            // Initialize meter
+            MeterInstaller.installMeter();
+            // Initialize tracer
+            boolean withProfiler = ProfilerInstaller.installProfiler();
+            TracerInstaller.installGlobalTracer(
+                    new SharedCommunicationObjects(),
+                    withProfiler ? new JFREventContextIntegration() : ProfilingContextIntegration.NoOp.INSTANCE);
+            // Initialize JMXFetch
+            StatsDClientManager statsDClientManager = DDAgentStatsDClientManager.statsDClientManager();
+            JMXFetch.run(statsDClientManager);
+        } catch (Throwable e) {
+            log.warn("Problem activating datadog tracer", e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/profiler/EnvironmentChecker.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/profiler/EnvironmentChecker.java
index 5eb2d73c426..7cfe8af3690 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/profiler/EnvironmentChecker.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/profiler/EnvironmentChecker.java
@@ -3,13 +3,12 @@
 import de.thetaphi.forbiddenapis.SuppressForbidden;
 
 public final class EnvironmentChecker {
-  @SuppressForbidden
-  public static boolean checkEnvironment(String temp) {
-    StringBuilder builder = new StringBuilder();
-    // forward the functionality to the core profiling env checker class
-    boolean rslt =
-        com.datadog.profiling.controller.EnvironmentChecker.checkEnvironment(temp, builder);
-    System.out.println(builder);
-    return rslt;
-  }
+    @SuppressForbidden
+    public static boolean checkEnvironment(String temp) {
+        StringBuilder builder = new StringBuilder();
+        // forward the functionality to the core profiling env checker class
+        boolean rslt = com.datadog.profiling.controller.EnvironmentChecker.checkEnvironment(temp, builder);
+        System.out.println(builder);
+        return rslt;
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriter.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriter.java
index 23e13b582fb..c3260d41d4c 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriter.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriter.java
@@ -10,76 +10,73 @@
 import org.slf4j.LoggerFactory;
 
 abstract class MemFDUnixWriter implements ForeignMemoryWriter {
-  private static final Logger log = LoggerFactory.getLogger(MemFDUnixWriter.class);
+    private static final Logger log = LoggerFactory.getLogger(MemFDUnixWriter.class);
 
-  protected abstract long syscall(long number, String name, int flags);
+    protected abstract long syscall(long number, String name, int flags);
 
-  protected abstract long write(int fd, byte[] payload);
+    protected abstract long write(int fd, byte[] payload);
 
-  protected abstract int fcntl(int fd, int cmd, int arg);
+    protected abstract int fcntl(int fd, int cmd, int arg);
 
-  protected abstract int getLastError();
+    protected abstract int getLastError();
 
-  // https://elixir.bootlin.com/linux/v6.17.1/source/include/uapi/linux/memfd.h#L8-L9
-  private static final int MFD_CLOEXEC = 0x0001;
-  private static final int MFD_ALLOW_SEALING = 0x0002;
+    // https://elixir.bootlin.com/linux/v6.17.1/source/include/uapi/linux/memfd.h#L8-L9
+    private static final int MFD_CLOEXEC = 0x0001;
+    private static final int MFD_ALLOW_SEALING = 0x0002;
 
-  // https://elixir.bootlin.com/linux/v6.17.1/source/include/uapi/linux/fcntl.h#L40
-  private static final int F_ADD_SEALS = 1033; //
+    // https://elixir.bootlin.com/linux/v6.17.1/source/include/uapi/linux/fcntl.h#L40
+    private static final int F_ADD_SEALS = 1033; //
 
-  // https://elixir.bootlin.com/linux/v6.17.1/source/include/uapi/linux/fcntl.h#L46-L49
-  private static final int F_SEAL_SEAL = 0x0001;
-  private static final int F_SEAL_SHRINK = 0x0002;
-  private static final int F_SEAL_GROW = 0x0004;
+    // https://elixir.bootlin.com/linux/v6.17.1/source/include/uapi/linux/fcntl.h#L46-L49
+    private static final int F_SEAL_SEAL = 0x0001;
+    private static final int F_SEAL_SHRINK = 0x0002;
+    private static final int F_SEAL_GROW = 0x0004;
 
-  @Override
-  public final void write(String fileName, byte[] payload) {
-    OperatingSystem.Architecture arch = OperatingSystem.architecture();
-    int memfdSyscall = getMemfdSyscall(arch);
-    if (memfdSyscall <= 0) {
-      log.debug(
-          SEND_TELEMETRY,
-          "service discovery not supported for arch={}",
-          SystemProperties.get("os.arch"));
-      return;
-    }
-    int memFd = (int) syscall(memfdSyscall, fileName, MFD_CLOEXEC | MFD_ALLOW_SEALING);
-    if (memFd < 0) {
-      log.warn("{} memfd create failed, errno={}", fileName, getLastError());
-      return;
-    }
+    @Override
+    public final void write(String fileName, byte[] payload) {
+        OperatingSystem.Architecture arch = OperatingSystem.architecture();
+        int memfdSyscall = getMemfdSyscall(arch);
+        if (memfdSyscall <= 0) {
+            log.debug(SEND_TELEMETRY, "service discovery not supported for arch={}", SystemProperties.get("os.arch"));
+            return;
+        }
+        int memFd = (int) syscall(memfdSyscall, fileName, MFD_CLOEXEC | MFD_ALLOW_SEALING);
+        if (memFd < 0) {
+            log.warn("{} memfd create failed, errno={}", fileName, getLastError());
+            return;
+        }
 
-    log.debug("{} memfd created (fd={})", fileName, memFd);
+        log.debug("{} memfd created (fd={})", fileName, memFd);
 
-    long written = write(memFd, payload);
-    if (written != payload.length) {
-      log.warn("write to {} memfd failed errno={}", fileName, Native.getLastError());
-      return;
-    }
-    log.debug("wrote {} bytes to memfd {}", written, memFd);
-    int returnCode = fcntl(memFd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_SEAL);
-    if (returnCode == -1) {
-      log.warn("failed to add seal to {} memfd errno={}", fileName, Native.getLastError());
+        long written = write(memFd, payload);
+        if (written != payload.length) {
+            log.warn("write to {} memfd failed errno={}", fileName, Native.getLastError());
+            return;
+        }
+        log.debug("wrote {} bytes to memfd {}", written, memFd);
+        int returnCode = fcntl(memFd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_SEAL);
+        if (returnCode == -1) {
+            log.warn("failed to add seal to {} memfd errno={}", fileName, Native.getLastError());
+        }
+        // memfd is not closed to keep it readable for the lifetime of the process.
     }
-    // memfd is not closed to keep it readable for the lifetime of the process.
-  }
 
-  private static int getMemfdSyscall(OperatingSystem.Architecture arch) {
-    switch (arch) {
-      case X64:
-        // https://github.com/torvalds/linux/blob/v6.17/arch/x86/entry/syscalls/syscall_64.tbl#L331
-        return 319;
-      case X86:
-        // https://github.com/torvalds/linux/blob/v6.17/arch/x86/entry/syscalls/syscall_32.tbl#L371
-        return 356;
-      case ARM64:
-        // https://github.com/torvalds/linux/blob/v6.17/scripts/syscall.tbl#L329
-        return 279;
-      case ARM:
-        // https://github.com/torvalds/linux/blob/v6.17/arch/arm64/tools/syscall_32.tbl#L400
-        return 385;
-      default:
-        return -1;
+    private static int getMemfdSyscall(OperatingSystem.Architecture arch) {
+        switch (arch) {
+            case X64:
+                // https://github.com/torvalds/linux/blob/v6.17/arch/x86/entry/syscalls/syscall_64.tbl#L331
+                return 319;
+            case X86:
+                // https://github.com/torvalds/linux/blob/v6.17/arch/x86/entry/syscalls/syscall_32.tbl#L371
+                return 356;
+            case ARM64:
+                // https://github.com/torvalds/linux/blob/v6.17/scripts/syscall.tbl#L329
+                return 279;
+            case ARM:
+                // https://github.com/torvalds/linux/blob/v6.17/arch/arm64/tools/syscall_32.tbl#L400
+                return 385;
+            default:
+                return -1;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriterJNA.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriterJNA.java
index 1cc7bee170f..15ff071bf9d 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriterJNA.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriterJNA.java
@@ -7,37 +7,37 @@
 import com.sun.jna.Pointer;
 
 public final class MemFDUnixWriterJNA extends MemFDUnixWriter {
-  private static final class Lazy {
-    static final LibC LIBC = Native.load("c", LibC.class);
-  }
-
-  private interface LibC extends Library {
-    long syscall(long number, Object... args);
-
-    NativeLong write(int fd, Pointer buf, NativeLong count);
-
-    int fcntl(int fd, int cmd, int arg);
-  }
-
-  @Override
-  protected long syscall(long number, String name, int flags) {
-    return Lazy.LIBC.syscall(number, name, flags);
-  }
-
-  @Override
-  protected long write(int fd, byte[] payload) {
-    Memory buf = new Memory(payload.length);
-    buf.write(0, payload, 0, payload.length);
-    return Lazy.LIBC.write(fd, buf, new NativeLong(payload.length)).longValue();
-  }
-
-  @Override
-  protected int fcntl(int fd, int cmd, int arg) {
-    return Lazy.LIBC.fcntl(fd, cmd, arg);
-  }
-
-  @Override
-  protected int getLastError() {
-    return Native.getLastError();
-  }
+    private static final class Lazy {
+        static final LibC LIBC = Native.load("c", LibC.class);
+    }
+
+    private interface LibC extends Library {
+        long syscall(long number, Object... args);
+
+        NativeLong write(int fd, Pointer buf, NativeLong count);
+
+        int fcntl(int fd, int cmd, int arg);
+    }
+
+    @Override
+    protected long syscall(long number, String name, int flags) {
+        return Lazy.LIBC.syscall(number, name, flags);
+    }
+
+    @Override
+    protected long write(int fd, byte[] payload) {
+        Memory buf = new Memory(payload.length);
+        buf.write(0, payload, 0, payload.length);
+        return Lazy.LIBC.write(fd, buf, new NativeLong(payload.length)).longValue();
+    }
+
+    @Override
+    protected int fcntl(int fd, int cmd, int arg) {
+        return Lazy.LIBC.fcntl(fd, cmd, arg);
+    }
+
+    @Override
+    protected int getLastError() {
+        return Native.getLastError();
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/usm/UsmExtractorImpl.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/usm/UsmExtractorImpl.java
index 51a3108b97f..5740d5f3503 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/usm/UsmExtractorImpl.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/usm/UsmExtractorImpl.java
@@ -11,32 +11,28 @@
 import org.slf4j.LoggerFactory;
 
 public class UsmExtractorImpl implements UsmExtractor {
-  private static final Logger log = LoggerFactory.getLogger(UsmExtractorImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(UsmExtractorImpl.class);
 
-  public interface CLibrary extends Library {
-    CLibrary Instance = (CLibrary) Native.load("c", CLibrary.class);
+    public interface CLibrary extends Library {
+        CLibrary Instance = (CLibrary) Native.load("c", CLibrary.class);
 
-    NativeLong ioctl(NativeLong fd, NativeLong request, Object... args);
-  }
+        NativeLong ioctl(NativeLong fd, NativeLong request, Object... args);
+    }
 
-  public void send(UsmMessage message) {
-    if (message.validate()) {
-      BaseUsmMessage bm = (BaseUsmMessage) message;
+    public void send(UsmMessage message) {
+        if (message.validate()) {
+            BaseUsmMessage bm = (BaseUsmMessage) message;
 
-      log.debug(
-          " sending ioctl: {}", String.format("%08x", UsmMessageImpl.USM_IOCTL_ID.intValue()));
-      NativeLong res =
-          CLibrary.Instance.ioctl(
-              new NativeLong(0),
-              UsmMessageImpl.USM_IOCTL_ID,
-              Pointer.nativeValue(bm.getBufferPtr()));
-      log.debug("ioctl result: {}", String.format("%08x", res.intValue()));
-    } else {
-      log.debug("INVALID MESSAGE: {}", message.getClass());
+            log.debug(" sending ioctl: {}", String.format("%08x", UsmMessageImpl.USM_IOCTL_ID.intValue()));
+            NativeLong res = CLibrary.Instance.ioctl(
+                    new NativeLong(0), UsmMessageImpl.USM_IOCTL_ID, Pointer.nativeValue(bm.getBufferPtr()));
+            log.debug("ioctl result: {}", String.format("%08x", res.intValue()));
+        } else {
+            log.debug("INVALID MESSAGE: {}", message.getClass());
+        }
     }
-  }
 
-  public static void registerAsSupplier() {
-    UsmExtractor.Supplier.registerIfAbsent(new UsmExtractorImpl());
-  }
+    public static void registerAsSupplier() {
+        UsmExtractor.Supplier.registerIfAbsent(new UsmExtractorImpl());
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/usm/UsmMessageFactoryImpl.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/usm/UsmMessageFactoryImpl.java
index f82a7b0216c..0afdd2e3a48 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/usm/UsmMessageFactoryImpl.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/usm/UsmMessageFactoryImpl.java
@@ -7,18 +7,17 @@
 import datadog.trace.bootstrap.instrumentation.usm.UsmMessageFactory;
 
 public class UsmMessageFactoryImpl implements UsmMessageFactory {
-  @Override
-  public UsmMessage getCloseMessage(UsmConnection connection) {
-    return new CloseConnectionUsmMessage(connection);
-  }
+    @Override
+    public UsmMessage getCloseMessage(UsmConnection connection) {
+        return new CloseConnectionUsmMessage(connection);
+    }
 
-  @Override
-  public UsmMessage getRequestMessage(
-      UsmConnection connection, byte[] buffer, int bufferOffset, int len) {
-    return new RequestUsmMessage(connection, buffer, bufferOffset, len);
-  }
+    @Override
+    public UsmMessage getRequestMessage(UsmConnection connection, byte[] buffer, int bufferOffset, int len) {
+        return new RequestUsmMessage(connection, buffer, bufferOffset, len);
+    }
 
-  public static void registerAsSupplier() {
-    UsmMessageFactory.Supplier.registerIfAbsent(new UsmMessageFactoryImpl());
-  }
+    public static void registerAsSupplier() {
+        UsmMessageFactory.Supplier.registerIfAbsent(new UsmMessageFactoryImpl());
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/usm/UsmMessageImpl.java b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/usm/UsmMessageImpl.java
index f7a71315af7..e4e8d529ef5 100644
--- a/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/usm/UsmMessageImpl.java
+++ b/dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/usm/UsmMessageImpl.java
@@ -10,178 +10,178 @@
 import org.slf4j.LoggerFactory;
 
 public abstract class UsmMessageImpl {
-  enum MessageType {
-    // message created from hooks on from read / write functions of AppInputStream
-    // and AppOutputStream respectively
-    REQUEST,
+    enum MessageType {
+        // message created from hooks on from read / write functions of AppInputStream
+        // and AppOutputStream respectively
+        REQUEST,
 
-    // message created from a hook on close method of the SSLSocketImpl
-    CLOSE_CONNECTION,
-  }
+        // message created from a hook on close method of the SSLSocketImpl
+        CLOSE_CONNECTION,
+    }
 
-  private static final Logger log = LoggerFactory.getLogger(BaseUsmMessage.class);
+    private static final Logger log = LoggerFactory.getLogger(BaseUsmMessage.class);
 
-  // TODO: sync with systemprobe code
-  static final NativeLong USM_IOCTL_ID = new NativeLong(0xda7ad09L);
+    // TODO: sync with systemprobe code
+    static final NativeLong USM_IOCTL_ID = new NativeLong(0xda7ad09L);
 
-  abstract static class BaseUsmMessage implements UsmMessage {
+    abstract static class BaseUsmMessage implements UsmMessage {
 
-    // Message type [1 byte]
-    static final int HEADER_SIZE = 1;
+        // Message type [1 byte]
+        static final int HEADER_SIZE = 1;
 
-    // size of the connection struct:
-    // SrcIP [16 bytes] || DstIP [16 bytes] || Src Port [2 bytes] || Dst port [2
-    // bytes] || Reserved [4 bytes] || Pid [4 bytes] || Metadata [4 bytes]
-    static final int CONNECTION_INFO_SIZE = 48;
+        // size of the connection struct:
+        // SrcIP [16 bytes] || DstIP [16 bytes] || Src Port [2 bytes] || Dst port [2
+        // bytes] || Reserved [4 bytes] || Pid [4 bytes] || Metadata [4 bytes]
+        static final int CONNECTION_INFO_SIZE = 48;
 
-    // pointer to native memory buffer
-    protected Pointer pointer;
+        // pointer to native memory buffer
+        protected Pointer pointer;
 
-    protected int offset;
-    private MessageType messageType;
-    private int totalMessageSize;
+        protected int offset;
+        private MessageType messageType;
+        private int totalMessageSize;
 
-    public final Pointer getBufferPtr() {
-      return pointer;
-    }
+        public final Pointer getBufferPtr() {
+            return pointer;
+        }
 
-    @Override
-    public boolean validate() {
-      if (offset > getMessageSize()) {
-        log.warn("invalid message size, expected: {} actual: {}", getMessageSize(), offset);
-        return false;
-      }
-      return true;
-    }
+        @Override
+        public boolean validate() {
+            if (offset > getMessageSize()) {
+                log.warn("invalid message size, expected: {} actual: {}", getMessageSize(), offset);
+                return false;
+            }
+            return true;
+        }
 
-    private int getMessageSize() {
-      return totalMessageSize;
-    }
+        private int getMessageSize() {
+            return totalMessageSize;
+        }
 
-    public BaseUsmMessage(MessageType type, UsmConnection connection) {
-      messageType = type;
+        public BaseUsmMessage(MessageType type, UsmConnection connection) {
+            messageType = type;
 
-      totalMessageSize = HEADER_SIZE + CONNECTION_INFO_SIZE + dataSize();
-      pointer = new Memory(totalMessageSize);
-      pointer.clear(totalMessageSize);
-      offset = 0;
+            totalMessageSize = HEADER_SIZE + CONNECTION_INFO_SIZE + dataSize();
+            pointer = new Memory(totalMessageSize);
+            pointer.clear(totalMessageSize);
+            offset = 0;
 
-      // encode message type
-      pointer.setByte(offset, (byte) messageType.ordinal());
-      offset += Byte.BYTES;
+            // encode message type
+            pointer.setByte(offset, (byte) messageType.ordinal());
+            offset += Byte.BYTES;
 
-      encodeConnection(connection);
-    }
+            encodeConnection(connection);
+        }
 
-    private void encodeConnection(UsmConnection connection) {
-
-      // we reserve 2 long for ip, as IPv6 takes 128 bytes
-      int ipReservedSize = Long.BYTES * 2;
-      byte[] srcIPBuffer = connection.getSrcIP().getAddress();
-      // if IPv4 (4 bytes long), encode it into low part of the reserved space
-      if (srcIPBuffer.length == 4) {
-        pointer.write(offset + Long.BYTES, srcIPBuffer, 0, srcIPBuffer.length);
-      } else {
-        pointer.write(offset, srcIPBuffer, 0, srcIPBuffer.length);
-      }
-      offset += ipReservedSize;
-
-      InetAddress dstIP = connection.getDstIP();
-      if (dstIP != null) {
-        byte[] dstIPBuffer = dstIP.getAddress();
-        // if IPv4 (4 bytes long), encode it into low part of the reserved space
-        if (dstIPBuffer.length == 4) {
-          pointer.write(offset + Long.BYTES, dstIPBuffer, 0, dstIPBuffer.length);
-        } else {
-          pointer.write(offset, dstIPBuffer, 0, dstIPBuffer.length);
+        private void encodeConnection(UsmConnection connection) {
+
+            // we reserve 2 long for ip, as IPv6 takes 128 bytes
+            int ipReservedSize = Long.BYTES * 2;
+            byte[] srcIPBuffer = connection.getSrcIP().getAddress();
+            // if IPv4 (4 bytes long), encode it into low part of the reserved space
+            if (srcIPBuffer.length == 4) {
+                pointer.write(offset + Long.BYTES, srcIPBuffer, 0, srcIPBuffer.length);
+            } else {
+                pointer.write(offset, srcIPBuffer, 0, srcIPBuffer.length);
+            }
+            offset += ipReservedSize;
+
+            InetAddress dstIP = connection.getDstIP();
+            if (dstIP != null) {
+                byte[] dstIPBuffer = dstIP.getAddress();
+                // if IPv4 (4 bytes long), encode it into low part of the reserved space
+                if (dstIPBuffer.length == 4) {
+                    pointer.write(offset + Long.BYTES, dstIPBuffer, 0, dstIPBuffer.length);
+                } else {
+                    pointer.write(offset, dstIPBuffer, 0, dstIPBuffer.length);
+                }
+            }
+
+            offset += ipReservedSize;
+
+            // encode src and dst ports
+            pointer.setShort(offset, (short) connection.getSrcPort());
+            offset += Short.BYTES;
+            pointer.setShort(offset, (short) connection.getDstPort());
+            offset += Short.BYTES;
+
+            // we put 0 as netns
+            pointer.setInt(offset, 0);
+            offset += Integer.BYTES;
+            // use 0 for Pid, since we determine the Pid on the kernel side using the bpf
+            // helper bpf_get_current_pid_tgid
+            pointer.setInt(offset, 0);
+            offset += Integer.BYTES;
+
+            // we turn on the first bit - indicating it is a tcp connection
+            int metadata = 1;
+            if (connection.isIPV6()) {
+                // turn on the 2nd bit indicating it is a ipv6 connection
+                metadata |= 2;
+            }
+            pointer.setInt(offset, metadata);
+            offset += Integer.BYTES;
         }
-      }
-
-      offset += ipReservedSize;
-
-      // encode src and dst ports
-      pointer.setShort(offset, (short) connection.getSrcPort());
-      offset += Short.BYTES;
-      pointer.setShort(offset, (short) connection.getDstPort());
-      offset += Short.BYTES;
-
-      // we put 0 as netns
-      pointer.setInt(offset, 0);
-      offset += Integer.BYTES;
-      // use 0 for Pid, since we determine the Pid on the kernel side using the bpf
-      // helper bpf_get_current_pid_tgid
-      pointer.setInt(offset, 0);
-      offset += Integer.BYTES;
-
-      // we turn on the first bit - indicating it is a tcp connection
-      int metadata = 1;
-      if (connection.isIPV6()) {
-        // turn on the 2nd bit indicating it is a ipv6 connection
-        metadata |= 2;
-      }
-      pointer.setInt(offset, metadata);
-      offset += Integer.BYTES;
     }
-  }
 
-  static class CloseConnectionUsmMessage extends BaseUsmMessage {
+    static class CloseConnectionUsmMessage extends BaseUsmMessage {
 
-    public CloseConnectionUsmMessage(UsmConnection connection) {
-      super(MessageType.CLOSE_CONNECTION, connection);
-      log.debug("close socket:");
-      log.debug("src host: {} src port: {}", connection.getSrcIP(), connection.getSrcPort());
+        public CloseConnectionUsmMessage(UsmConnection connection) {
+            super(MessageType.CLOSE_CONNECTION, connection);
+            log.debug("close socket:");
+            log.debug("src host: {} src port: {}", connection.getSrcIP(), connection.getSrcPort());
 
-      InetAddress dstIP = connection.getDstIP();
-      if (dstIP != null) {
-        log.debug("dst host: {} dst port: {}", dstIP, connection.getDstPort());
-      }
-    }
+            InetAddress dstIP = connection.getDstIP();
+            if (dstIP != null) {
+                log.debug("dst host: {} dst port: {}", dstIP, connection.getDstPort());
+            }
+        }
 
-    @Override
-    public int dataSize() {
-      // no actual data for closed connection message, only the connection tuple
-      return 0;
-    }
-  }
-
-  static class RequestUsmMessage extends BaseUsmMessage {
-
-    // This determines the size of the payload fragment that is captured for each
-    // HTTPS request
-    // should be equal to:
-    // https://github.com/DataDog/datadog-agent/blob/main/pkg/network/ebpf/c/protocols/http-types.h#L7
-    static final int MAX_HTTPS_BUFFER_SIZE = 8 * 20;
-
-    public RequestUsmMessage(UsmConnection connection, byte[] buffer, int bufferOffset, int len) {
-      super(MessageType.REQUEST, connection);
-
-      log.debug("Request packet:");
-      log.debug("src host: {} src port: {}", connection.getSrcIP(), connection.getSrcPort());
-      log.debug("dst host: {} dst port: {}", connection.getDstIP(), connection.getDstPort());
-      log.debug("intercepted byte len: {}", len);
-
-      // check the buffer is not larger than max allowed,
-      if (len - bufferOffset <= MAX_HTTPS_BUFFER_SIZE) {
-        pointer.setInt(offset, len);
-        offset += Integer.BYTES;
-
-        pointer.write(offset, buffer, bufferOffset, len);
-        offset += len;
-
-      }
-      // if it is, use only max allowed bytes
-      else {
-        pointer.setInt(offset, MAX_HTTPS_BUFFER_SIZE);
-        offset += Integer.BYTES;
-        pointer.write(offset, buffer, bufferOffset, MAX_HTTPS_BUFFER_SIZE);
-        offset += MAX_HTTPS_BUFFER_SIZE;
-      }
+        @Override
+        public int dataSize() {
+            // no actual data for closed connection message, only the connection tuple
+            return 0;
+        }
     }
 
-    @Override
-    public int dataSize() {
-      // max buffer preceded by the actual length [4 bytes] of the buffer
-      return MAX_HTTPS_BUFFER_SIZE + Integer.BYTES;
+    static class RequestUsmMessage extends BaseUsmMessage {
+
+        // This determines the size of the payload fragment that is captured for each
+        // HTTPS request
+        // should be equal to:
+        // https://github.com/DataDog/datadog-agent/blob/main/pkg/network/ebpf/c/protocols/http-types.h#L7
+        static final int MAX_HTTPS_BUFFER_SIZE = 8 * 20;
+
+        public RequestUsmMessage(UsmConnection connection, byte[] buffer, int bufferOffset, int len) {
+            super(MessageType.REQUEST, connection);
+
+            log.debug("Request packet:");
+            log.debug("src host: {} src port: {}", connection.getSrcIP(), connection.getSrcPort());
+            log.debug("dst host: {} dst port: {}", connection.getDstIP(), connection.getDstPort());
+            log.debug("intercepted byte len: {}", len);
+
+            // check the buffer is not larger than max allowed,
+            if (len - bufferOffset <= MAX_HTTPS_BUFFER_SIZE) {
+                pointer.setInt(offset, len);
+                offset += Integer.BYTES;
+
+                pointer.write(offset, buffer, bufferOffset, len);
+                offset += len;
+
+            }
+            // if it is, use only max allowed bytes
+            else {
+                pointer.setInt(offset, MAX_HTTPS_BUFFER_SIZE);
+                offset += Integer.BYTES;
+                pointer.write(offset, buffer, bufferOffset, MAX_HTTPS_BUFFER_SIZE);
+                offset += MAX_HTTPS_BUFFER_SIZE;
+            }
+        }
+
+        @Override
+        public int dataSize() {
+            // max buffer preceded by the actual length [4 bytes] of the buffer
+            return MAX_HTTPS_BUFFER_SIZE + Integer.BYTES;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java11/datadog/trace/agent/tooling/bytebuddy/DDJava9ClassFileTransformer.java b/dd-java-agent/agent-installer/src/main/java11/datadog/trace/agent/tooling/bytebuddy/DDJava9ClassFileTransformer.java
index 7b7f14afc10..7f104e12624 100644
--- a/dd-java-agent/agent-installer/src/main/java11/datadog/trace/agent/tooling/bytebuddy/DDJava9ClassFileTransformer.java
+++ b/dd-java-agent/agent-installer/src/main/java11/datadog/trace/agent/tooling/bytebuddy/DDJava9ClassFileTransformer.java
@@ -12,60 +12,54 @@
  *
  * <p>This class is only used on Java 9+, for Java 7/8 see {@link DDClassFileTransformer}.
  */
-public final class DDJava9ClassFileTransformer
-    extends ResettableClassFileTransformer.WithDelegation {
+public final class DDJava9ClassFileTransformer extends ResettableClassFileTransformer.WithDelegation {
 
-  public static final TransformerDecorator DECORATOR = DDJava9ClassFileTransformer::new;
+    public static final TransformerDecorator DECORATOR = DDJava9ClassFileTransformer::new;
 
-  public DDJava9ClassFileTransformer(final ResettableClassFileTransformer classFileTransformer) {
-    super(classFileTransformer);
-  }
+    public DDJava9ClassFileTransformer(final ResettableClassFileTransformer classFileTransformer) {
+        super(classFileTransformer);
+    }
 
-  @Override
-  public byte[] transform(
-      final ClassLoader classLoader,
-      final String internalClassName,
-      final Class<?> classBeingRedefined,
-      final ProtectionDomain protectionDomain,
-      final byte[] classFileBuffer)
-      throws IllegalClassFormatException {
+    @Override
+    public byte[] transform(
+            final ClassLoader classLoader,
+            final String internalClassName,
+            final Class<?> classBeingRedefined,
+            final ProtectionDomain protectionDomain,
+            final byte[] classFileBuffer)
+            throws IllegalClassFormatException {
 
-    if (null != classLoader && canSkipClassLoaderByName(classLoader)) {
-      return null;
-    }
+        if (null != classLoader && canSkipClassLoaderByName(classLoader)) {
+            return null;
+        }
 
-    try {
-      return classFileTransformer.transform(
-          classLoader, internalClassName, classBeingRedefined, protectionDomain, classFileBuffer);
-    } finally {
-      SharedTypePools.endTransform();
+        try {
+            return classFileTransformer.transform(
+                    classLoader, internalClassName, classBeingRedefined, protectionDomain, classFileBuffer);
+        } finally {
+            SharedTypePools.endTransform();
+        }
     }
-  }
 
-  @Override
-  public byte[] transform(
-      final Module module,
-      final ClassLoader classLoader,
-      final String internalClassName,
-      final Class<?> classBeingRedefined,
-      final ProtectionDomain protectionDomain,
-      final byte[] classFileBuffer)
-      throws IllegalClassFormatException {
+    @Override
+    public byte[] transform(
+            final Module module,
+            final ClassLoader classLoader,
+            final String internalClassName,
+            final Class<?> classBeingRedefined,
+            final ProtectionDomain protectionDomain,
+            final byte[] classFileBuffer)
+            throws IllegalClassFormatException {
 
-    if (null != classLoader && canSkipClassLoaderByName(classLoader)) {
-      return null;
-    }
+        if (null != classLoader && canSkipClassLoaderByName(classLoader)) {
+            return null;
+        }
 
-    try {
-      return classFileTransformer.transform(
-          module,
-          classLoader,
-          internalClassName,
-          classBeingRedefined,
-          protectionDomain,
-          classFileBuffer);
-    } finally {
-      SharedTypePools.endTransform();
+        try {
+            return classFileTransformer.transform(
+                    module, classLoader, internalClassName, classBeingRedefined, protectionDomain, classFileBuffer);
+        } finally {
+            SharedTypePools.endTransform();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/main/java25/datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriterFFM.java b/dd-java-agent/agent-installer/src/main/java25/datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriterFFM.java
index a6222d6cfe4..3d971849ba5 100644
--- a/dd-java-agent/agent-installer/src/main/java25/datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriterFFM.java
+++ b/dd-java-agent/agent-installer/src/main/java25/datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriterFFM.java
@@ -14,147 +14,143 @@
 import org.slf4j.LoggerFactory;
 
 public class MemFDUnixWriterFFM extends MemFDUnixWriter {
-  private static final Logger log = LoggerFactory.getLogger(MemFDUnixWriterFFM.class);
+    private static final Logger log = LoggerFactory.getLogger(MemFDUnixWriterFFM.class);
 
-  // Captured call state layout for errno
-  private static final StructLayout CAPTURE_STATE_LAYOUT = Linker.Option.captureStateLayout();
-  private static final long ERRNO_OFFSET =
-      CAPTURE_STATE_LAYOUT.byteOffset(MemoryLayout.PathElement.groupElement("errno"));
+    // Captured call state layout for errno
+    private static final StructLayout CAPTURE_STATE_LAYOUT = Linker.Option.captureStateLayout();
+    private static final long ERRNO_OFFSET =
+            CAPTURE_STATE_LAYOUT.byteOffset(MemoryLayout.PathElement.groupElement("errno"));
 
-  private static class Lazy {
-    // Function handles - initialized once
-    static final MethodHandle syscallMH;
-    static final MethodHandle writeMH;
-    static final MethodHandle fcntlMH;
+    private static class Lazy {
+        // Function handles - initialized once
+        static final MethodHandle syscallMH;
+        static final MethodHandle writeMH;
+        static final MethodHandle fcntlMH;
 
-    static {
-      MethodHandle syscall = null;
-      MethodHandle write = null;
-      MethodHandle fcntl = null;
-      try {
-        final Linker linker = Linker.nativeLinker();
-        final SymbolLookup lookup = linker.defaultLookup();
-        // long syscall(long number, ...)
-        // Note: variadic functions require special handling, we'll use a fixed signature
-        syscall =
-            linker.downcallHandle(
-                lookup.find("syscall").orElseThrow(),
-                FunctionDescriptor.of(
-                    ValueLayout.JAVA_LONG, // return type: long
-                    ValueLayout.JAVA_LONG, // syscall number
-                    ValueLayout.ADDRESS, // const char* name
-                    ValueLayout.JAVA_INT // int flags
-                    ),
-                Linker.Option.captureCallState("errno"));
+        static {
+            MethodHandle syscall = null;
+            MethodHandle write = null;
+            MethodHandle fcntl = null;
+            try {
+                final Linker linker = Linker.nativeLinker();
+                final SymbolLookup lookup = linker.defaultLookup();
+                // long syscall(long number, ...)
+                // Note: variadic functions require special handling, we'll use a fixed signature
+                syscall = linker.downcallHandle(
+                        lookup.find("syscall").orElseThrow(),
+                        FunctionDescriptor.of(
+                                ValueLayout.JAVA_LONG, // return type: long
+                                ValueLayout.JAVA_LONG, // syscall number
+                                ValueLayout.ADDRESS, // const char* name
+                                ValueLayout.JAVA_INT // int flags
+                                ),
+                        Linker.Option.captureCallState("errno"));
 
-        // ssize_t write(int fd, const void *buf, size_t count)
-        write =
-            linker.downcallHandle(
-                lookup.find("write").orElseThrow(),
-                FunctionDescriptor.of(
-                    ValueLayout.JAVA_LONG, // return type: ssize_t
-                    ValueLayout.JAVA_INT, // int fd
-                    ValueLayout.ADDRESS, // const void* buf
-                    ValueLayout.JAVA_LONG // size_t count
-                    ),
-                Linker.Option.captureCallState("errno"));
+                // ssize_t write(int fd, const void *buf, size_t count)
+                write = linker.downcallHandle(
+                        lookup.find("write").orElseThrow(),
+                        FunctionDescriptor.of(
+                                ValueLayout.JAVA_LONG, // return type: ssize_t
+                                ValueLayout.JAVA_INT, // int fd
+                                ValueLayout.ADDRESS, // const void* buf
+                                ValueLayout.JAVA_LONG // size_t count
+                                ),
+                        Linker.Option.captureCallState("errno"));
 
-        // int fcntl(int fd, int cmd, ... /* arg */)
-        fcntl =
-            linker.downcallHandle(
-                lookup.find("fcntl").orElseThrow(),
-                FunctionDescriptor.of(
-                    ValueLayout.JAVA_INT, // return type: int
-                    ValueLayout.JAVA_INT, // int fd
-                    ValueLayout.JAVA_INT, // int cmd
-                    ValueLayout.JAVA_INT // int arg
-                    ),
-                Linker.Option.captureCallState("errno"));
-      } catch (final Throwable ex) {
-        log.error("Failed to initialize MemFDUnixWriterFFM", ex);
-      } finally {
-        syscallMH = syscall;
-        writeMH = write;
-        fcntlMH = fcntl;
-      }
-    }
+                // int fcntl(int fd, int cmd, ... /* arg */)
+                fcntl = linker.downcallHandle(
+                        lookup.find("fcntl").orElseThrow(),
+                        FunctionDescriptor.of(
+                                ValueLayout.JAVA_INT, // return type: int
+                                ValueLayout.JAVA_INT, // int fd
+                                ValueLayout.JAVA_INT, // int cmd
+                                ValueLayout.JAVA_INT // int arg
+                                ),
+                        Linker.Option.captureCallState("errno"));
+            } catch (final Throwable ex) {
+                log.error("Failed to initialize MemFDUnixWriterFFM", ex);
+            } finally {
+                syscallMH = syscall;
+                writeMH = write;
+                fcntlMH = fcntl;
+            }
+        }
 
-    static boolean isAvailable() {
-      // just check the first - either all null or all non-null.
-      return syscallMH != null;
+        static boolean isAvailable() {
+            // just check the first - either all null or all non-null.
+            return syscallMH != null;
+        }
     }
-  }
-
-  private final MemorySegment captureState;
 
-  public MemFDUnixWriterFFM() {
-    // Allocate memory for capturing errno (need to be alive until the class instance is collected)
-    this.captureState = Arena.ofAuto().allocate(CAPTURE_STATE_LAYOUT);
-  }
+    private final MemorySegment captureState;
 
-  @Override
-  protected long syscall(long number, String name, int flags) {
-    if (!Lazy.isAvailable()) {
-      return -1;
-    }
-    try (Arena arena = Arena.ofConfined()) {
-      // Allocate native string for file name (manual allocation for compatibility)
-      // the following works for UTF8 (not for unicode / UTF16)
-      byte[] nameBytes = name.getBytes(StandardCharsets.UTF_8);
-      MemorySegment fileNameSegment =
-          arena.allocate(nameBytes.length + 1); // +1 for null terminator
-      MemorySegment.copy(nameBytes, 0, fileNameSegment, ValueLayout.JAVA_BYTE, 0, nameBytes.length);
-      fileNameSegment.set(ValueLayout.JAVA_BYTE, nameBytes.length, (byte) 0); // null terminator
-      // Call memfd_create via syscall, passing captureState as first arg
-      return (long) Lazy.syscallMH.invoke(captureState, (long) number, fileNameSegment, flags);
-    } catch (Throwable t) {
-      log.error("Unable to make a syscall through FFM", t);
-      return -1;
+    public MemFDUnixWriterFFM() {
+        // Allocate memory for capturing errno (need to be alive until the class instance is collected)
+        this.captureState = Arena.ofAuto().allocate(CAPTURE_STATE_LAYOUT);
     }
-  }
 
-  @Override
-  protected long write(int fd, byte[] payload) {
-    if (!Lazy.isAvailable()) {
-      return -1;
+    @Override
+    protected long syscall(long number, String name, int flags) {
+        if (!Lazy.isAvailable()) {
+            return -1;
+        }
+        try (Arena arena = Arena.ofConfined()) {
+            // Allocate native string for file name (manual allocation for compatibility)
+            // the following works for UTF8 (not for unicode / UTF16)
+            byte[] nameBytes = name.getBytes(StandardCharsets.UTF_8);
+            MemorySegment fileNameSegment = arena.allocate(nameBytes.length + 1); // +1 for null terminator
+            MemorySegment.copy(nameBytes, 0, fileNameSegment, ValueLayout.JAVA_BYTE, 0, nameBytes.length);
+            fileNameSegment.set(ValueLayout.JAVA_BYTE, nameBytes.length, (byte) 0); // null terminator
+            // Call memfd_create via syscall, passing captureState as first arg
+            return (long) Lazy.syscallMH.invoke(captureState, (long) number, fileNameSegment, flags);
+        } catch (Throwable t) {
+            log.error("Unable to make a syscall through FFM", t);
+            return -1;
+        }
     }
-    try (Arena arena = Arena.ofConfined()) {
-      // Allocate native memory for payload
-      MemorySegment buffer = arena.allocate(payload.length);
-      MemorySegment.copy(payload, 0, buffer, ValueLayout.JAVA_BYTE, 0, payload.length);
 
-      // Write payload to memfd, passing captureState as first arg
-      return (long) Lazy.writeMH.invoke(captureState, fd, buffer, (long) payload.length);
-    } catch (Throwable t) {
-      log.error("Unable to make a write call through FFM", t);
-      return -1;
-    }
-  }
+    @Override
+    protected long write(int fd, byte[] payload) {
+        if (!Lazy.isAvailable()) {
+            return -1;
+        }
+        try (Arena arena = Arena.ofConfined()) {
+            // Allocate native memory for payload
+            MemorySegment buffer = arena.allocate(payload.length);
+            MemorySegment.copy(payload, 0, buffer, ValueLayout.JAVA_BYTE, 0, payload.length);
 
-  @Override
-  protected int fcntl(int fd, int cmd, int arg) {
-    if (!Lazy.isAvailable()) {
-      return -1;
-    }
-    try {
-      return (int) Lazy.fcntlMH.invoke(captureState, fd, cmd, arg);
-    } catch (Throwable t) {
-      log.error("Unable to make a fcntl call through FFM", t);
-      return -1;
+            // Write payload to memfd, passing captureState as first arg
+            return (long) Lazy.writeMH.invoke(captureState, fd, buffer, (long) payload.length);
+        } catch (Throwable t) {
+            log.error("Unable to make a write call through FFM", t);
+            return -1;
+        }
     }
-  }
 
-  @Override
-  protected int getLastError() {
-    if (!Lazy.isAvailable()) {
-      return -1;
+    @Override
+    protected int fcntl(int fd, int cmd, int arg) {
+        if (!Lazy.isAvailable()) {
+            return -1;
+        }
+        try {
+            return (int) Lazy.fcntlMH.invoke(captureState, fd, cmd, arg);
+        } catch (Throwable t) {
+            log.error("Unable to make a fcntl call through FFM", t);
+            return -1;
+        }
     }
-    try {
-      // Read errno from the captured state memory segment
-      return captureState.get(ValueLayout.JAVA_INT, ERRNO_OFFSET);
-    } catch (Throwable t) {
-      log.error("Unable to read errno from captured state", t);
-      return -1;
+
+    @Override
+    protected int getLastError() {
+        if (!Lazy.isAvailable()) {
+            return -1;
+        }
+        try {
+            // Read errno from the captured state memory segment
+            return captureState.get(ValueLayout.JAVA_INT, ERRNO_OFFSET);
+        } catch (Throwable t) {
+            log.error("Unable to read errno from captured state", t);
+            return -1;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/A.java b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/A.java
index 43f723cb498..e6a26dc148e 100644
--- a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/A.java
+++ b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/A.java
@@ -1,5 +1,5 @@
 package datadog.trace.agent.tooling.bytebuddy.matcher.testclasses;
 
 public interface A {
-  void a();
+    void a();
 }
diff --git a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/B.java b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/B.java
index d956115c2ee..6b1b96d526c 100644
--- a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/B.java
+++ b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/B.java
@@ -3,6 +3,6 @@
 import datadog.trace.api.Trace;
 
 public interface B extends A {
-  @Trace
-  void b();
+    @Trace
+    void b();
 }
diff --git a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/C.java b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/C.java
index 4643231c7ce..668a9a00fcd 100644
--- a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/C.java
+++ b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/C.java
@@ -1,5 +1,5 @@
 package datadog.trace.agent.tooling.bytebuddy.matcher.testclasses;
 
 public interface C extends A, B {
-  void c();
+    void c();
 }
diff --git a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/D.java b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/D.java
index d5ae42e5fd2..dab70c11539 100644
--- a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/D.java
+++ b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/D.java
@@ -3,6 +3,6 @@
 import datadog.trace.api.Trace;
 
 public interface D extends A, B, C {
-  @Trace
-  void d();
+    @Trace
+    void d();
 }
diff --git a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/E.java b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/E.java
index 859429ccb35..b7be2d224a5 100644
--- a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/E.java
+++ b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/E.java
@@ -1,5 +1,5 @@
 package datadog.trace.agent.tooling.bytebuddy.matcher.testclasses;
 
 public interface E extends B, C, D {
-  void e();
+    void e();
 }
diff --git a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/F.java b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/F.java
index 0c6e562897d..e5fc589b085 100644
--- a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/F.java
+++ b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/F.java
@@ -3,6 +3,6 @@
 import datadog.trace.api.Trace;
 
 public abstract class F implements E {
-  @Trace
-  public abstract void f();
+    @Trace
+    public abstract void f();
 }
diff --git a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/G.java b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/G.java
index 62e2ce4aa84..bcf308bae0e 100644
--- a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/G.java
+++ b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/G.java
@@ -1,5 +1,5 @@
 package datadog.trace.agent.tooling.bytebuddy.matcher.testclasses;
 
 public abstract class G extends F {
-  public void g() {}
+    public void g() {}
 }
diff --git a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/TracedClass.java b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/TracedClass.java
index 31a96b24a5e..cfc5a9a7792 100644
--- a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/TracedClass.java
+++ b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/TracedClass.java
@@ -3,31 +3,31 @@
 import datadog.trace.api.Trace;
 
 public class TracedClass extends UntracedClass {
-  @Trace
-  @Override
-  public void g() {}
+    @Trace
+    @Override
+    public void g() {}
 
-  @Trace
-  @Override
-  public void f() {}
+    @Trace
+    @Override
+    public void f() {}
 
-  @Trace
-  @Override
-  public void e() {}
+    @Trace
+    @Override
+    public void e() {}
 
-  @Trace
-  @Override
-  public void d() {}
+    @Trace
+    @Override
+    public void d() {}
 
-  @Trace
-  @Override
-  public void c() {}
+    @Trace
+    @Override
+    public void c() {}
 
-  @Trace
-  @Override
-  public void b() {}
+    @Trace
+    @Override
+    public void b() {}
 
-  @Trace
-  @Override
-  public void a() {}
+    @Trace
+    @Override
+    public void a() {}
 }
diff --git a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/UntracedClass.java b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/UntracedClass.java
index 2ae032e5617..1f237246776 100644
--- a/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/UntracedClass.java
+++ b/dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/matcher/testclasses/UntracedClass.java
@@ -1,24 +1,24 @@
 package datadog.trace.agent.tooling.bytebuddy.matcher.testclasses;
 
 public class UntracedClass extends G {
-  @Override
-  public void g() {}
+    @Override
+    public void g() {}
 
-  @Override
-  public void f() {}
+    @Override
+    public void f() {}
 
-  @Override
-  public void e() {}
+    @Override
+    public void e() {}
 
-  @Override
-  public void d() {}
+    @Override
+    public void d() {}
 
-  @Override
-  public void c() {}
+    @Override
+    public void c() {}
 
-  @Override
-  public void b() {}
+    @Override
+    public void b() {}
 
-  @Override
-  public void a() {}
+    @Override
+    public void a() {}
 }
diff --git a/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/test/ARecursiveTask.java b/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/test/ARecursiveTask.java
index 90054c9cf50..58c125799b2 100644
--- a/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/test/ARecursiveTask.java
+++ b/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/test/ARecursiveTask.java
@@ -3,8 +3,8 @@
 import java.util.concurrent.RecursiveTask;
 
 public class ARecursiveTask extends RecursiveTask<Void> {
-  @Override
-  protected Void compute() {
-    return null;
-  }
+    @Override
+    protected Void compute() {
+        return null;
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/test/DirectRunnable.java b/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/test/DirectRunnable.java
index 5fc7ea13d00..bc0dbc9a8fe 100644
--- a/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/test/DirectRunnable.java
+++ b/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/test/DirectRunnable.java
@@ -1,6 +1,6 @@
 package datadog.trace.agent.test;
 
 public class DirectRunnable implements Runnable {
-  @Override
-  public void run() {}
+    @Override
+    public void run() {}
 }
diff --git a/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/test/LeafFutureTask.java b/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/test/LeafFutureTask.java
index 4a3b6c1f191..d03e0205f6e 100644
--- a/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/test/LeafFutureTask.java
+++ b/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/test/LeafFutureTask.java
@@ -3,7 +3,7 @@
 import java.util.concurrent.Callable;
 
 public class LeafFutureTask extends NoInterfacesInTheMiddle {
-  public LeafFutureTask(Callable callable) {
-    super(callable);
-  }
+    public LeafFutureTask(Callable callable) {
+        super(callable);
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/test/NoInterfacesInTheMiddle.java b/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/test/NoInterfacesInTheMiddle.java
index ba1447475db..82a97d8b7d7 100644
--- a/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/test/NoInterfacesInTheMiddle.java
+++ b/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/test/NoInterfacesInTheMiddle.java
@@ -4,7 +4,7 @@
 import java.util.concurrent.FutureTask;
 
 public class NoInterfacesInTheMiddle extends FutureTask {
-  public NoInterfacesInTheMiddle(Callable callable) {
-    super(callable);
-  }
+    public NoInterfacesInTheMiddle(Callable callable) {
+        super(callable);
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/tooling/DebuggingAdviceTransformerTest.java b/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/tooling/DebuggingAdviceTransformerTest.java
index f76c5dee25a..dbaba6aeff7 100644
--- a/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/tooling/DebuggingAdviceTransformerTest.java
+++ b/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/tooling/DebuggingAdviceTransformerTest.java
@@ -32,301 +32,274 @@
 
 class DebuggingAdviceTransformerTest {
 
-  @Test
-  void doesNotChangeGeneratedBytecode() {
-    byte[] regular = transform(new AgentBuilder.Transformer.ForAdvice(), ValidAdvice.class);
-    byte[] debugging =
-        transform(
-            new DebuggingAdviceTransformer(
-                Advice.withCustomMapping(), "test.Instrumentation", ValidAdvice.class.getName()),
-            ValidAdvice.class);
-
-    assertArrayEquals(regular, debugging);
-  }
-
-  @Test
-  void preservesOriginalBindingFailureAsCause() {
-    RuntimeException failure = new IllegalStateException("binding failed");
-    AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate =
-        (type, method, visitor, context, typePool, writerFlags, readerFlags) -> {
-          throw failure;
-        };
+    @Test
+    void doesNotChangeGeneratedBytecode() {
+        byte[] regular = transform(new AgentBuilder.Transformer.ForAdvice(), ValidAdvice.class);
+        byte[] debugging = transform(
+                new DebuggingAdviceTransformer(
+                        Advice.withCustomMapping(), "test.Instrumentation", ValidAdvice.class.getName()),
+                ValidAdvice.class);
+
+        assertArrayEquals(regular, debugging);
+    }
+
+    @Test
+    void preservesOriginalBindingFailureAsCause() {
+        RuntimeException failure = new IllegalStateException("binding failed");
+        AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate =
+                (type, method, visitor, context, typePool, writerFlags, readerFlags) -> {
+                    throw failure;
+                };
+
+        RuntimeException thrown = assertThrows(RuntimeException.class, () -> wrapTargetMethod(delegate));
+
+        assertTrue(thrown instanceof AdviceTransformationException);
+        assertSame(failure, thrown.getCause());
+    }
 
-    RuntimeException thrown =
-        assertThrows(RuntimeException.class, () -> wrapTargetMethod(delegate));
+    @Test
+    void preservesLinkageFailureAsCause() {
+        LinkageError failure = new NoClassDefFoundError("missing.AdviceDependency");
+        AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate =
+                (type, method, visitor, context, typePool, writerFlags, readerFlags) -> {
+                    throw failure;
+                };
 
-    assertTrue(thrown instanceof AdviceTransformationException);
-    assertSame(failure, thrown.getCause());
-  }
+        RuntimeException thrown = assertThrows(RuntimeException.class, () -> wrapTargetMethod(delegate));
 
-  @Test
-  void preservesLinkageFailureAsCause() {
-    LinkageError failure = new NoClassDefFoundError("missing.AdviceDependency");
-    AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate =
-        (type, method, visitor, context, typePool, writerFlags, readerFlags) -> {
-          throw failure;
+        assertTrue(thrown instanceof AdviceTransformationException);
+        assertSame(failure, thrown.getCause());
+    }
+
+    @Test
+    void preservesLinkageFailureRaisedDuringAdviceApplicationAsCause() {
+        LinkageError failure = new NoClassDefFoundError("missing.AdviceDependency");
+        AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate =
+                (type, method, visitor, context, typePool, writerFlags, readerFlags) -> new MethodVisitor(ASM_API) {
+                    @Override
+                    public void visitMaxs(int maxStack, int maxLocals) {
+                        throw failure;
+                    }
+                };
+
+        MethodVisitor visitor = wrapTargetMethod(delegate);
+        RuntimeException thrown = assertThrows(RuntimeException.class, () -> visitor.visitMaxs(0, 0));
+
+        assertTrue(thrown instanceof AdviceTransformationException);
+        assertSame(failure, thrown.getCause());
+    }
+
+    @Test
+    void doesNotAttributeDownstreamRuntimeFailureToAdvice() {
+        RuntimeException failure = new IllegalStateException("custom visitor failed");
+        MethodVisitor downstream = new MethodVisitor(ASM_API) {
+            @Override
+            public void visitMaxs(int maxStack, int maxLocals) {
+                throw failure;
+            }
         };
 
-    RuntimeException thrown =
-        assertThrows(RuntimeException.class, () -> wrapTargetMethod(delegate));
-
-    assertTrue(thrown instanceof AdviceTransformationException);
-    assertSame(failure, thrown.getCause());
-  }
-
-  @Test
-  void preservesLinkageFailureRaisedDuringAdviceApplicationAsCause() {
-    LinkageError failure = new NoClassDefFoundError("missing.AdviceDependency");
-    AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate =
-        (type, method, visitor, context, typePool, writerFlags, readerFlags) ->
-            new MethodVisitor(ASM_API) {
-              @Override
-              public void visitMaxs(int maxStack, int maxLocals) {
+        RuntimeException thrown = assertThrows(
+                RuntimeException.class,
+                () -> wrapTargetMethod(forwardingVisitor(), downstream).visitMaxs(0, 0));
+
+        assertSame(failure, thrown);
+    }
+
+    @Test
+    void doesNotAttributeDownstreamLinkageFailureToAdvice() {
+        LinkageError failure = new NoClassDefFoundError("missing.CustomVisitorDependency");
+        MethodVisitor downstream = new MethodVisitor(ASM_API) {
+            @Override
+            public void visitMaxs(int maxStack, int maxLocals) {
                 throw failure;
-              }
-            };
-
-    MethodVisitor visitor = wrapTargetMethod(delegate);
-    RuntimeException thrown = assertThrows(RuntimeException.class, () -> visitor.visitMaxs(0, 0));
-
-    assertTrue(thrown instanceof AdviceTransformationException);
-    assertSame(failure, thrown.getCause());
-  }
-
-  @Test
-  void doesNotAttributeDownstreamRuntimeFailureToAdvice() {
-    RuntimeException failure = new IllegalStateException("custom visitor failed");
-    MethodVisitor downstream =
-        new MethodVisitor(ASM_API) {
-          @Override
-          public void visitMaxs(int maxStack, int maxLocals) {
-            throw failure;
-          }
+            }
         };
 
-    RuntimeException thrown =
-        assertThrows(
-            RuntimeException.class,
-            () -> wrapTargetMethod(forwardingVisitor(), downstream).visitMaxs(0, 0));
-
-    assertSame(failure, thrown);
-  }
-
-  @Test
-  void doesNotAttributeDownstreamLinkageFailureToAdvice() {
-    LinkageError failure = new NoClassDefFoundError("missing.CustomVisitorDependency");
-    MethodVisitor downstream =
-        new MethodVisitor(ASM_API) {
-          @Override
-          public void visitMaxs(int maxStack, int maxLocals) {
-            throw failure;
-          }
+        LinkageError thrown = assertThrows(
+                LinkageError.class,
+                () -> wrapTargetMethod(forwardingVisitor(), downstream).visitMaxs(0, 0));
+
+        assertSame(failure, thrown);
+    }
+
+    @Test
+    void attributesLocalVariableAnnotationFailureToAdvice() {
+        RuntimeException failure = new IllegalStateException("annotation binding failed");
+        AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate =
+                (type, method, visitor, context, typePool, writerFlags, readerFlags) ->
+                        localVariableAnnotationFailureVisitor(null, failure);
+
+        RuntimeException thrown =
+                assertThrows(RuntimeException.class, () -> visitLocalVariableAnnotation(wrapTargetMethod(delegate)));
+
+        assertTrue(thrown instanceof AdviceTransformationException);
+        assertSame(failure, thrown.getCause());
+    }
+
+    @Test
+    void doesNotAttributeDownstreamLocalVariableAnnotationFailureToAdvice() {
+        RuntimeException failure = new IllegalStateException("custom annotation visitor failed");
+        MethodVisitor downstream = localVariableAnnotationFailureVisitor(null, failure);
+
+        RuntimeException thrown = assertThrows(
+                RuntimeException.class,
+                () -> visitLocalVariableAnnotation(wrapTargetMethod(forwardingVisitor(), downstream)));
+
+        assertSame(failure, thrown);
+    }
+
+    @Test
+    void logsInvalidArgumentWithFullTransformationContext() {
+        AgentBuilder.Transformer.ForAdvice transformer = debuggingTransformer(InvalidArgumentAdvice.class);
+
+        Logger debugControl = (Logger) LoggerFactory.getLogger(AgentInstaller.class);
+        Logger logger = (Logger) LoggerFactory.getLogger(AgentInstaller.TransformLoggingListener.class);
+        Level previousDebugControlLevel = debugControl.getLevel();
+        Level previousLoggerLevel = logger.getLevel();
+        ListAppender<ILoggingEvent> appender = new ListAppender<>();
+        appender.start();
+        logger.addAppender(appender);
+        InstrumenterFlare.resetTransformationErrors();
+        try {
+            debugControl.setLevel(Level.DEBUG);
+            logger.setLevel(Level.DEBUG);
+            RuntimeException failure = assertThrows(RuntimeException.class, () -> materialize(transformer));
+            assertTrue(failure instanceof AdviceTransformationException);
+            assertTrue(failure.getCause().getMessage().contains("does not define an index 1"));
+
+            new AgentInstaller.TransformLoggingListener()
+                    .onError(
+                            Target.class.getName(),
+                            Target.class.getClassLoader(),
+                            JavaModule.ofType(Target.class),
+                            false,
+                            failure);
+
+            assertEquals(1, appender.list.size());
+            ILoggingEvent event = appender.list.get(0);
+            assertNull(event.getMarker());
+            assertTrue(event.getFormattedMessage().contains("test.Instrumentation"));
+            assertTrue(event.getFormattedMessage().contains(InvalidArgumentAdvice.class.getName()));
+            assertTrue(event.getFormattedMessage().contains(Target.class.getName()));
+            assertTrue(event.getFormattedMessage().contains("greet(Ljava/lang/String;)Ljava/lang/String;"));
+            assertTrue(event.getFormattedMessage().contains("instrumentation.target.loaded=false"));
+            assertEquals(
+                    failure.getCause().getMessage(), event.getThrowableProxy().getMessage());
+            String flareErrors = InstrumenterFlare.transformationErrors();
+            assertTrue(flareErrors.contains(InvalidArgumentAdvice.class.getName()));
+            assertTrue(flareErrors.contains("greet(Ljava/lang/String;)Ljava/lang/String;"));
+            assertTrue(flareErrors.contains("does not define an index 1"));
+        } finally {
+            InstrumenterFlare.resetTransformationErrors();
+            logger.detachAppender(appender);
+            appender.stop();
+            logger.setLevel(previousLoggerLevel);
+            debugControl.setLevel(previousDebugControlLevel);
+        }
+    }
+
+    @Test
+    void attributesStackedAdviceFailureOnlyToFailingAdvice() {
+        RuntimeException failure = assertThrows(
+                RuntimeException.class,
+                () -> materialize(
+                        debuggingTransformer(InvalidArgumentAdvice.class), debuggingTransformer(ValidAdvice.class)));
+
+        assertTrue(failure instanceof AdviceTransformationException);
+        AdviceTransformationException diagnostic = (AdviceTransformationException) failure;
+        assertEquals(InvalidArgumentAdvice.class.getName(), diagnostic.getAdviceClass());
+        assertTrue(diagnostic.getCause().getMessage().contains("does not define an index 1"));
+    }
+
+    private AgentBuilder.Transformer.ForAdvice debuggingTransformer(Class<?> adviceClass) {
+        return new DebuggingAdviceTransformer(Advice.withCustomMapping(), "test.Instrumentation", adviceClass.getName())
+                .include(getClass().getClassLoader())
+                .advice(named("greet"), adviceClass.getName());
+    }
+
+    private MethodVisitor wrapTargetMethod(AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate) {
+        return wrapTargetMethod(delegate, null);
+    }
+
+    private MethodVisitor wrapTargetMethod(
+            AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate, MethodVisitor methodVisitor) {
+        return DebuggingAdviceTransformer.wrap(delegate, "test.Instrumentation", InvalidArgumentAdvice.class.getName())
+                .wrap(
+                        new TypeDescription.ForLoadedType(Target.class),
+                        new MethodDescription.ForLoadedMethod(getTargetMethod()),
+                        methodVisitor,
+                        null,
+                        null,
+                        0,
+                        0);
+    }
+
+    private AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper forwardingVisitor() {
+        return (type, method, visitor, context, typePool, writerFlags, readerFlags) ->
+                new MethodVisitor(ASM_API, visitor) {};
+    }
+
+    private MethodVisitor localVariableAnnotationFailureVisitor(MethodVisitor delegate, RuntimeException failure) {
+        return new MethodVisitor(ASM_API, delegate) {
+            @Override
+            public AnnotationVisitor visitLocalVariableAnnotation(
+                    int typeRef,
+                    TypePath typePath,
+                    Label[] start,
+                    Label[] end,
+                    int[] index,
+                    String descriptor,
+                    boolean visible) {
+                throw failure;
+            }
         };
+    }
 
-    LinkageError thrown =
-        assertThrows(
-            LinkageError.class,
-            () -> wrapTargetMethod(forwardingVisitor(), downstream).visitMaxs(0, 0));
-
-    assertSame(failure, thrown);
-  }
-
-  @Test
-  void attributesLocalVariableAnnotationFailureToAdvice() {
-    RuntimeException failure = new IllegalStateException("annotation binding failed");
-    AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate =
-        (type, method, visitor, context, typePool, writerFlags, readerFlags) ->
-            localVariableAnnotationFailureVisitor(null, failure);
-
-    RuntimeException thrown =
-        assertThrows(
-            RuntimeException.class, () -> visitLocalVariableAnnotation(wrapTargetMethod(delegate)));
-
-    assertTrue(thrown instanceof AdviceTransformationException);
-    assertSame(failure, thrown.getCause());
-  }
-
-  @Test
-  void doesNotAttributeDownstreamLocalVariableAnnotationFailureToAdvice() {
-    RuntimeException failure = new IllegalStateException("custom annotation visitor failed");
-    MethodVisitor downstream = localVariableAnnotationFailureVisitor(null, failure);
-
-    RuntimeException thrown =
-        assertThrows(
-            RuntimeException.class,
-            () -> visitLocalVariableAnnotation(wrapTargetMethod(forwardingVisitor(), downstream)));
-
-    assertSame(failure, thrown);
-  }
-
-  @Test
-  void logsInvalidArgumentWithFullTransformationContext() {
-    AgentBuilder.Transformer.ForAdvice transformer =
-        debuggingTransformer(InvalidArgumentAdvice.class);
-
-    Logger debugControl = (Logger) LoggerFactory.getLogger(AgentInstaller.class);
-    Logger logger = (Logger) LoggerFactory.getLogger(AgentInstaller.TransformLoggingListener.class);
-    Level previousDebugControlLevel = debugControl.getLevel();
-    Level previousLoggerLevel = logger.getLevel();
-    ListAppender<ILoggingEvent> appender = new ListAppender<>();
-    appender.start();
-    logger.addAppender(appender);
-    InstrumenterFlare.resetTransformationErrors();
-    try {
-      debugControl.setLevel(Level.DEBUG);
-      logger.setLevel(Level.DEBUG);
-      RuntimeException failure =
-          assertThrows(RuntimeException.class, () -> materialize(transformer));
-      assertTrue(failure instanceof AdviceTransformationException);
-      assertTrue(failure.getCause().getMessage().contains("does not define an index 1"));
-
-      new AgentInstaller.TransformLoggingListener()
-          .onError(
-              Target.class.getName(),
-              Target.class.getClassLoader(),
-              JavaModule.ofType(Target.class),
-              false,
-              failure);
-
-      assertEquals(1, appender.list.size());
-      ILoggingEvent event = appender.list.get(0);
-      assertNull(event.getMarker());
-      assertTrue(event.getFormattedMessage().contains("test.Instrumentation"));
-      assertTrue(event.getFormattedMessage().contains(InvalidArgumentAdvice.class.getName()));
-      assertTrue(event.getFormattedMessage().contains(Target.class.getName()));
-      assertTrue(
-          event.getFormattedMessage().contains("greet(Ljava/lang/String;)Ljava/lang/String;"));
-      assertTrue(event.getFormattedMessage().contains("instrumentation.target.loaded=false"));
-      assertEquals(failure.getCause().getMessage(), event.getThrowableProxy().getMessage());
-      String flareErrors = InstrumenterFlare.transformationErrors();
-      assertTrue(flareErrors.contains(InvalidArgumentAdvice.class.getName()));
-      assertTrue(flareErrors.contains("greet(Ljava/lang/String;)Ljava/lang/String;"));
-      assertTrue(flareErrors.contains("does not define an index 1"));
-    } finally {
-      InstrumenterFlare.resetTransformationErrors();
-      logger.detachAppender(appender);
-      appender.stop();
-      logger.setLevel(previousLoggerLevel);
-      debugControl.setLevel(previousDebugControlLevel);
+    private void visitLocalVariableAnnotation(MethodVisitor visitor) {
+        Label start = new Label();
+        Label end = new Label();
+        visitor.visitLocalVariableAnnotation(
+                0, null, new Label[] {start}, new Label[] {end}, new int[] {0}, "Ltest/Marker;", true);
     }
-  }
-
-  @Test
-  void attributesStackedAdviceFailureOnlyToFailingAdvice() {
-    RuntimeException failure =
-        assertThrows(
-            RuntimeException.class,
-            () ->
-                materialize(
-                    debuggingTransformer(InvalidArgumentAdvice.class),
-                    debuggingTransformer(ValidAdvice.class)));
-
-    assertTrue(failure instanceof AdviceTransformationException);
-    AdviceTransformationException diagnostic = (AdviceTransformationException) failure;
-    assertEquals(InvalidArgumentAdvice.class.getName(), diagnostic.getAdviceClass());
-    assertTrue(diagnostic.getCause().getMessage().contains("does not define an index 1"));
-  }
-
-  private AgentBuilder.Transformer.ForAdvice debuggingTransformer(Class<?> adviceClass) {
-    return new DebuggingAdviceTransformer(
-            Advice.withCustomMapping(), "test.Instrumentation", adviceClass.getName())
-        .include(getClass().getClassLoader())
-        .advice(named("greet"), adviceClass.getName());
-  }
-
-  private MethodVisitor wrapTargetMethod(
-      AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate) {
-    return wrapTargetMethod(delegate, null);
-  }
-
-  private MethodVisitor wrapTargetMethod(
-      AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper delegate,
-      MethodVisitor methodVisitor) {
-    return DebuggingAdviceTransformer.wrap(
-            delegate, "test.Instrumentation", InvalidArgumentAdvice.class.getName())
-        .wrap(
-            new TypeDescription.ForLoadedType(Target.class),
-            new MethodDescription.ForLoadedMethod(getTargetMethod()),
-            methodVisitor,
-            null,
-            null,
-            0,
-            0);
-  }
-
-  private AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper forwardingVisitor() {
-    return (type, method, visitor, context, typePool, writerFlags, readerFlags) ->
-        new MethodVisitor(ASM_API, visitor) {};
-  }
-
-  private MethodVisitor localVariableAnnotationFailureVisitor(
-      MethodVisitor delegate, RuntimeException failure) {
-    return new MethodVisitor(ASM_API, delegate) {
-      @Override
-      public AnnotationVisitor visitLocalVariableAnnotation(
-          int typeRef,
-          TypePath typePath,
-          Label[] start,
-          Label[] end,
-          int[] index,
-          String descriptor,
-          boolean visible) {
-        throw failure;
-      }
-    };
-  }
-
-  private void visitLocalVariableAnnotation(MethodVisitor visitor) {
-    Label start = new Label();
-    Label end = new Label();
-    visitor.visitLocalVariableAnnotation(
-        0, null, new Label[] {start}, new Label[] {end}, new int[] {0}, "Ltest/Marker;", true);
-  }
-
-  private Method getTargetMethod() {
-    try {
-      return Target.class.getDeclaredMethod("greet", String.class);
-    } catch (NoSuchMethodException impossible) {
-      throw new AssertionError(impossible);
+
+    private Method getTargetMethod() {
+        try {
+            return Target.class.getDeclaredMethod("greet", String.class);
+        } catch (NoSuchMethodException impossible) {
+            throw new AssertionError(impossible);
+        }
     }
-  }
-
-  private byte[] transform(AgentBuilder.Transformer.ForAdvice transformer, Class<?> adviceClass) {
-    return materialize(
-        transformer
-            .include(getClass().getClassLoader())
-            .advice(named("greet"), adviceClass.getName()));
-  }
-
-  private byte[] materialize(AgentBuilder.Transformer.ForAdvice... transformers) {
-    TypeDescription target = new TypeDescription.ForLoadedType(Target.class);
-    DynamicType.Builder<?> builder = new ByteBuddy().redefine(Target.class);
-    ProtectionDomain protectionDomain = Target.class.getProtectionDomain();
-    for (AgentBuilder.Transformer.ForAdvice transformer : transformers) {
-      builder =
-          transformer.transform(
-              builder,
-              target,
-              Target.class.getClassLoader(),
-              JavaModule.ofType(Target.class),
-              protectionDomain);
+
+    private byte[] transform(AgentBuilder.Transformer.ForAdvice transformer, Class<?> adviceClass) {
+        return materialize(
+                transformer.include(getClass().getClassLoader()).advice(named("greet"), adviceClass.getName()));
     }
-    return builder.make().getBytes();
-  }
 
-  static class Target {
-    public String greet(String name) {
-      return name;
+    private byte[] materialize(AgentBuilder.Transformer.ForAdvice... transformers) {
+        TypeDescription target = new TypeDescription.ForLoadedType(Target.class);
+        DynamicType.Builder<?> builder = new ByteBuddy().redefine(Target.class);
+        ProtectionDomain protectionDomain = Target.class.getProtectionDomain();
+        for (AgentBuilder.Transformer.ForAdvice transformer : transformers) {
+            builder = transformer.transform(
+                    builder, target, Target.class.getClassLoader(), JavaModule.ofType(Target.class), protectionDomain);
+        }
+        return builder.make().getBytes();
     }
-  }
 
-  static class ValidAdvice {
-    @Advice.OnMethodEnter
-    public static void enter(@Advice.Argument(0) String name) {}
-  }
+    static class Target {
+        public String greet(String name) {
+            return name;
+        }
+    }
 
-  static class InvalidArgumentAdvice {
-    @Advice.OnMethodEnter
-    public static void enter(@Advice.Argument(1) String name) {}
-  }
+    static class ValidAdvice {
+        @Advice.OnMethodEnter
+        public static void enter(@Advice.Argument(0) String name) {}
+    }
+
+    static class InvalidArgumentAdvice {
+        @Advice.OnMethodEnter
+        public static void enter(@Advice.Argument(1) String name) {}
+    }
 }
diff --git a/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/tooling/ExtensionFinderTest.java b/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/tooling/ExtensionFinderTest.java
index 624d73ef0c4..982356a5ec5 100644
--- a/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/tooling/ExtensionFinderTest.java
+++ b/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/tooling/ExtensionFinderTest.java
@@ -20,160 +20,151 @@
 
 public class ExtensionFinderTest {
 
-  private static final String AUTOCONFIGURE_PROPAGATOR =
-      "io.opentelemetry.sdk.autoconfigure.spi.ConfigurablePropagatorProvider";
-  private static final String AUTOCONFIGURE_RESOURCE =
-      "io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider";
-  private static final String AUTOCONFIGURE_SAMPLER =
-      "io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSamplerProvider";
-  private static final String AUTOCONFIGURE_EXPORTER =
-      "io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider";
-  private static final String JAVAAGENT_INSTRUMENTATION_MODULE =
-      "io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule";
-  private static final String JAVAAGENT_AGENT_LISTENER =
-      "io.opentelemetry.javaagent.extension.AgentListener";
-  private static final String SHADED_AUTOCONFIGURE_SAMPLER =
-      "io.opentelemetry.javaagent.shaded.io.opentelemetry.sdk.autoconfigure.spi.ConfigurableSamplerProvider";
-
-  private final OtelSpiCollector collector = OtelSpiCollector.getInstance();
-
-  @BeforeEach
-  public void clearCollector() {
-    collector.drain();
-  }
-
-  @Test
-  public void singleOtelSpiIsReported(@TempDir Path tempDir) throws IOException {
-    Path jarPath = buildJar(tempDir, "ext.jar", AUTOCONFIGURE_PROPAGATOR);
-
-    try (JarFile jar = new JarFile(jarPath.toFile(), false)) {
-      ExtensionFinder.recordOtelSpiTelemetry(jar);
+    private static final String AUTOCONFIGURE_PROPAGATOR =
+            "io.opentelemetry.sdk.autoconfigure.spi.ConfigurablePropagatorProvider";
+    private static final String AUTOCONFIGURE_RESOURCE = "io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider";
+    private static final String AUTOCONFIGURE_SAMPLER =
+            "io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSamplerProvider";
+    private static final String AUTOCONFIGURE_EXPORTER =
+            "io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider";
+    private static final String JAVAAGENT_INSTRUMENTATION_MODULE =
+            "io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule";
+    private static final String JAVAAGENT_AGENT_LISTENER = "io.opentelemetry.javaagent.extension.AgentListener";
+    private static final String SHADED_AUTOCONFIGURE_SAMPLER =
+            "io.opentelemetry.javaagent.shaded.io.opentelemetry.sdk.autoconfigure.spi.ConfigurableSamplerProvider";
+
+    private final OtelSpiCollector collector = OtelSpiCollector.getInstance();
+
+    @BeforeEach
+    public void clearCollector() {
+        collector.drain();
     }
 
-    Collection<OtelSpiCollector.OtelSpiMetric> drained = collector.drain();
-    assertEquals(1, drained.size());
-    OtelSpiCollector.OtelSpiMetric metric = drained.iterator().next();
-    assertEquals("otel.spi.detected", metric.metricName);
-    assertTrue(metric.tags.contains("spi_class:" + AUTOCONFIGURE_PROPAGATOR));
-    assertTrue(metric.tags.contains("source:extensions_path"));
-  }
-
-  @Test
-  public void allFourAutoconfigureSpisAreReported(@TempDir Path tempDir) throws IOException {
-    Path jarPath =
-        buildJar(
-            tempDir,
-            "ext.jar",
-            AUTOCONFIGURE_PROPAGATOR,
-            AUTOCONFIGURE_RESOURCE,
-            AUTOCONFIGURE_SAMPLER,
-            AUTOCONFIGURE_EXPORTER);
-
-    try (JarFile jar = new JarFile(jarPath.toFile(), false)) {
-      ExtensionFinder.recordOtelSpiTelemetry(jar);
+    @Test
+    public void singleOtelSpiIsReported(@TempDir Path tempDir) throws IOException {
+        Path jarPath = buildJar(tempDir, "ext.jar", AUTOCONFIGURE_PROPAGATOR);
+
+        try (JarFile jar = new JarFile(jarPath.toFile(), false)) {
+            ExtensionFinder.recordOtelSpiTelemetry(jar);
+        }
+
+        Collection<OtelSpiCollector.OtelSpiMetric> drained = collector.drain();
+        assertEquals(1, drained.size());
+        OtelSpiCollector.OtelSpiMetric metric = drained.iterator().next();
+        assertEquals("otel.spi.detected", metric.metricName);
+        assertTrue(metric.tags.contains("spi_class:" + AUTOCONFIGURE_PROPAGATOR));
+        assertTrue(metric.tags.contains("source:extensions_path"));
     }
 
-    assertEquals(
-        new HashSet<>(
-            java.util.Arrays.asList(
+    @Test
+    public void allFourAutoconfigureSpisAreReported(@TempDir Path tempDir) throws IOException {
+        Path jarPath = buildJar(
+                tempDir,
+                "ext.jar",
                 AUTOCONFIGURE_PROPAGATOR,
                 AUTOCONFIGURE_RESOURCE,
                 AUTOCONFIGURE_SAMPLER,
-                AUTOCONFIGURE_EXPORTER)),
-        reportedFqns(collector.drain()));
-  }
+                AUTOCONFIGURE_EXPORTER);
 
-  @Test
-  public void javaagentExtensionSpisAreReported(@TempDir Path tempDir) throws IOException {
-    Path jarPath =
-        buildJar(tempDir, "ext.jar", JAVAAGENT_INSTRUMENTATION_MODULE, JAVAAGENT_AGENT_LISTENER);
+        try (JarFile jar = new JarFile(jarPath.toFile(), false)) {
+            ExtensionFinder.recordOtelSpiTelemetry(jar);
+        }
 
-    try (JarFile jar = new JarFile(jarPath.toFile(), false)) {
-      ExtensionFinder.recordOtelSpiTelemetry(jar);
+        assertEquals(
+                new HashSet<>(java.util.Arrays.asList(
+                        AUTOCONFIGURE_PROPAGATOR,
+                        AUTOCONFIGURE_RESOURCE,
+                        AUTOCONFIGURE_SAMPLER,
+                        AUTOCONFIGURE_EXPORTER)),
+                reportedFqns(collector.drain()));
     }
 
-    assertEquals(
-        new HashSet<>(
-            java.util.Arrays.asList(JAVAAGENT_INSTRUMENTATION_MODULE, JAVAAGENT_AGENT_LISTENER)),
-        reportedFqns(collector.drain()));
-  }
-
-  @Test
-  public void nonOtelSpiIsIgnored(@TempDir Path tempDir) throws IOException {
-    Path jarPath =
-        buildJar(
-            tempDir,
-            "ext.jar",
-            "com.example.MyService",
-            "org.springframework.context.ApplicationContextInitializer",
-            "java.sql.Driver");
-
-    try (JarFile jar = new JarFile(jarPath.toFile(), false)) {
-      ExtensionFinder.recordOtelSpiTelemetry(jar);
+    @Test
+    public void javaagentExtensionSpisAreReported(@TempDir Path tempDir) throws IOException {
+        Path jarPath = buildJar(tempDir, "ext.jar", JAVAAGENT_INSTRUMENTATION_MODULE, JAVAAGENT_AGENT_LISTENER);
+
+        try (JarFile jar = new JarFile(jarPath.toFile(), false)) {
+            ExtensionFinder.recordOtelSpiTelemetry(jar);
+        }
+
+        assertEquals(
+                new HashSet<>(java.util.Arrays.asList(JAVAAGENT_INSTRUMENTATION_MODULE, JAVAAGENT_AGENT_LISTENER)),
+                reportedFqns(collector.drain()));
     }
 
-    assertEquals(0, collector.drain().size());
-  }
-
-  @Test
-  public void jarWithoutAnyServiceDescriptorsEmitsNothing(@TempDir Path tempDir)
-      throws IOException {
-    Path jarPath = tempDir.resolve("empty.jar");
-    try (JarOutputStream jos = new JarOutputStream(Files.newOutputStream(jarPath))) {
-      jos.putNextEntry(new JarEntry("README.txt"));
-      jos.write("not an extension".getBytes());
-      jos.closeEntry();
+    @Test
+    public void nonOtelSpiIsIgnored(@TempDir Path tempDir) throws IOException {
+        Path jarPath = buildJar(
+                tempDir,
+                "ext.jar",
+                "com.example.MyService",
+                "org.springframework.context.ApplicationContextInitializer",
+                "java.sql.Driver");
+
+        try (JarFile jar = new JarFile(jarPath.toFile(), false)) {
+            ExtensionFinder.recordOtelSpiTelemetry(jar);
+        }
+
+        assertEquals(0, collector.drain().size());
     }
 
-    try (JarFile jar = new JarFile(jarPath.toFile(), false)) {
-      ExtensionFinder.recordOtelSpiTelemetry(jar);
+    @Test
+    public void jarWithoutAnyServiceDescriptorsEmitsNothing(@TempDir Path tempDir) throws IOException {
+        Path jarPath = tempDir.resolve("empty.jar");
+        try (JarOutputStream jos = new JarOutputStream(Files.newOutputStream(jarPath))) {
+            jos.putNextEntry(new JarEntry("README.txt"));
+            jos.write("not an extension".getBytes());
+            jos.closeEntry();
+        }
+
+        try (JarFile jar = new JarFile(jarPath.toFile(), false)) {
+            ExtensionFinder.recordOtelSpiTelemetry(jar);
+        }
+
+        assertEquals(0, collector.drain().size());
     }
 
-    assertEquals(0, collector.drain().size());
-  }
-
-  @Test
-  public void mixedOtelAndNonOtelReportsOnlyOtel(@TempDir Path tempDir) throws IOException {
-    Path jarPath =
-        buildJar(
-            tempDir,
-            "ext.jar",
-            AUTOCONFIGURE_PROPAGATOR,
-            "com.example.MyService",
-            JAVAAGENT_AGENT_LISTENER,
-            "java.sql.Driver");
-
-    try (JarFile jar = new JarFile(jarPath.toFile(), false)) {
-      ExtensionFinder.recordOtelSpiTelemetry(jar);
+    @Test
+    public void mixedOtelAndNonOtelReportsOnlyOtel(@TempDir Path tempDir) throws IOException {
+        Path jarPath = buildJar(
+                tempDir,
+                "ext.jar",
+                AUTOCONFIGURE_PROPAGATOR,
+                "com.example.MyService",
+                JAVAAGENT_AGENT_LISTENER,
+                "java.sql.Driver");
+
+        try (JarFile jar = new JarFile(jarPath.toFile(), false)) {
+            ExtensionFinder.recordOtelSpiTelemetry(jar);
+        }
+
+        assertEquals(
+                new HashSet<>(java.util.Arrays.asList(AUTOCONFIGURE_PROPAGATOR, JAVAAGENT_AGENT_LISTENER)),
+                reportedFqns(collector.drain()));
     }
 
-    assertEquals(
-        new HashSet<>(java.util.Arrays.asList(AUTOCONFIGURE_PROPAGATOR, JAVAAGENT_AGENT_LISTENER)),
-        reportedFqns(collector.drain()));
-  }
-
-  private static Set<String> reportedFqns(Collection<OtelSpiCollector.OtelSpiMetric> drained) {
-    Set<String> fqns = new HashSet<>();
-    for (OtelSpiCollector.OtelSpiMetric metric : drained) {
-      for (String tag : metric.tags) {
-        if (tag.startsWith("spi_class:")) {
-          fqns.add(tag.substring("spi_class:".length()));
+    private static Set<String> reportedFqns(Collection<OtelSpiCollector.OtelSpiMetric> drained) {
+        Set<String> fqns = new HashSet<>();
+        for (OtelSpiCollector.OtelSpiMetric metric : drained) {
+            for (String tag : metric.tags) {
+                if (tag.startsWith("spi_class:")) {
+                    fqns.add(tag.substring("spi_class:".length()));
+                }
+            }
         }
-      }
+        return fqns;
     }
-    return fqns;
-  }
-
-  /** Builds a jar with empty {@code META-INF/services/<fqn>} entries for each given FQN. */
-  private static Path buildJar(Path dir, String name, String... serviceFqns) throws IOException {
-    Path jarPath = dir.resolve(name);
-    try (OutputStream out = Files.newOutputStream(jarPath);
-        JarOutputStream jos = new JarOutputStream(out)) {
-      for (String fqn : serviceFqns) {
-        jos.putNextEntry(new JarEntry("META-INF/services/" + fqn));
-        jos.closeEntry();
-      }
+
+    /** Builds a jar with empty {@code META-INF/services/<fqn>} entries for each given FQN. */
+    private static Path buildJar(Path dir, String name, String... serviceFqns) throws IOException {
+        Path jarPath = dir.resolve(name);
+        try (OutputStream out = Files.newOutputStream(jarPath);
+                JarOutputStream jos = new JarOutputStream(out)) {
+            for (String fqn : serviceFqns) {
+                jos.putNextEntry(new JarEntry("META-INF/services/" + fqn));
+                jos.closeEntry();
+            }
+        }
+        return jarPath;
     }
-    return jarPath;
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/tooling/StructuralChangeRetransformationForkedTest.java b/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/tooling/StructuralChangeRetransformationForkedTest.java
index 9b2857a94c9..a8396cf7f2e 100644
--- a/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/tooling/StructuralChangeRetransformationForkedTest.java
+++ b/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/tooling/StructuralChangeRetransformationForkedTest.java
@@ -33,165 +33,155 @@
 
 class StructuralChangeRetransformationForkedTest {
 
-  private static final String TARGET_CLASS_NAME =
-      "datadog.trace.agent.tooling.GeneratedStructuralChangeTarget";
+    private static final String TARGET_CLASS_NAME = "datadog.trace.agent.tooling.GeneratedStructuralChangeTarget";
 
-  @Test
-  void reappliesStructuralChangeWhenRetransformingClassModifiedOnInitialLoad() throws Exception {
-    Instrumentation instrumentation = ByteBuddyAgent.install();
+    @Test
+    void reappliesStructuralChangeWhenRetransformingClassModifiedOnInitialLoad() throws Exception {
+        Instrumentation instrumentation = ByteBuddyAgent.install();
 
-    StructuralChangeInstrumentation structuralChange = new StructuralChangeInstrumentation();
-    ClassFileTransformer transformer = installTransformer(instrumentation, structuralChange);
-    try {
-      Class<?> targetClass = loadTargetClass();
+        StructuralChangeInstrumentation structuralChange = new StructuralChangeInstrumentation();
+        ClassFileTransformer transformer = installTransformer(instrumentation, structuralChange);
+        try {
+            Class<?> targetClass = loadTargetClass();
 
-      assertEquals(1, structuralChange.transformations.get());
-      assertTrue(StructuralChangeMarker.class.isAssignableFrom(targetClass));
+            assertEquals(1, structuralChange.transformations.get());
+            assertTrue(StructuralChangeMarker.class.isAssignableFrom(targetClass));
 
-      instrumentation.retransformClasses(targetClass);
+            instrumentation.retransformClasses(targetClass);
 
-      assertEquals(2, structuralChange.transformations.get());
-      assertTrue(StructuralChangeMarker.class.isAssignableFrom(targetClass));
-    } finally {
-      instrumentation.removeTransformer(transformer);
+            assertEquals(2, structuralChange.transformations.get());
+            assertTrue(StructuralChangeMarker.class.isAssignableFrom(targetClass));
+        } finally {
+            instrumentation.removeTransformer(transformer);
+        }
     }
-  }
 
-  @Test
-  void skipsStructuralChangeForClassLoadedBeforeTransformerInstallation() throws Exception {
-    Instrumentation instrumentation = ByteBuddyAgent.install();
+    @Test
+    void skipsStructuralChangeForClassLoadedBeforeTransformerInstallation() throws Exception {
+        Instrumentation instrumentation = ByteBuddyAgent.install();
 
-    Class<?> targetClass = loadTargetClass();
+        Class<?> targetClass = loadTargetClass();
 
-    StructuralChangeInstrumentation structuralChange = new StructuralChangeInstrumentation();
-    ClassFileTransformer transformer = installTransformer(instrumentation, structuralChange);
-    try {
-      assertEquals(0, structuralChange.transformations.get());
-      assertFalse(StructuralChangeMarker.class.isAssignableFrom(targetClass));
+        StructuralChangeInstrumentation structuralChange = new StructuralChangeInstrumentation();
+        ClassFileTransformer transformer = installTransformer(instrumentation, structuralChange);
+        try {
+            assertEquals(0, structuralChange.transformations.get());
+            assertFalse(StructuralChangeMarker.class.isAssignableFrom(targetClass));
 
-      instrumentation.retransformClasses(targetClass);
+            instrumentation.retransformClasses(targetClass);
 
-      assertEquals(0, structuralChange.transformations.get());
-      assertFalse(StructuralChangeMarker.class.isAssignableFrom(targetClass));
-    } finally {
-      instrumentation.removeTransformer(transformer);
-    }
-  }
-
-  private ClassFileTransformer installTransformer(
-      Instrumentation instrumentation, StructuralChangeInstrumentation structuralChange) {
-    TypePoolFacade.registerAsSupplier();
-    MemoizedMatchers.registerAsSupplier();
-
-    InstrumenterIndex instrumenterIndex = InstrumenterIndex.readIndex();
-    InstrumenterState.initialize(instrumenterIndex.instrumentationCount());
-    CombiningTransformerBuilder transformerBuilder =
-        new CombiningTransformerBuilder(
-            new AgentBuilder.Default()
-                .disableClassFormatChanges()
-                .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
-                .ignore(none()),
-            instrumenterIndex,
-            EnumSet.of(InstrumenterModule.TargetSystem.TRACING),
-            false);
-    transformerBuilder.applyInstrumentation(structuralChange);
-    InstrumenterState.resetDefaultState();
-
-    ClassFileTransformer transformer = transformerBuilder.installOn(instrumentation);
-    SharedTypePools.endInstall();
-    return transformer;
-  }
-
-  private Class<?> loadTargetClass() {
-    return new ByteBuddy()
-        .subclass(Object.class)
-        .name(TARGET_CLASS_NAME)
-        .make()
-        .load(getClass().getClassLoader(), ClassLoadingStrategy.Default.WRAPPER)
-        .getLoaded();
-  }
-
-  public interface StructuralChangeMarker {}
-
-  private static final class StructuralChangeInstrumentation extends InstrumenterModule.Tracing
-      implements Instrumenter.ForSingleType,
-          Instrumenter.WithStructuralChange,
-          Instrumenter.HasMethodAdvice {
-
-    private final AtomicInteger transformations = new AtomicInteger();
-
-    private StructuralChangeInstrumentation() {
-      super("structural-change-retransformation-test");
+            assertEquals(0, structuralChange.transformations.get());
+            assertFalse(StructuralChangeMarker.class.isAssignableFrom(targetClass));
+        } finally {
+            instrumentation.removeTransformer(transformer);
+        }
     }
 
-    @Override
-    public String instrumentedType() {
-      return TARGET_CLASS_NAME;
+    private ClassFileTransformer installTransformer(
+            Instrumentation instrumentation, StructuralChangeInstrumentation structuralChange) {
+        TypePoolFacade.registerAsSupplier();
+        MemoizedMatchers.registerAsSupplier();
+
+        InstrumenterIndex instrumenterIndex = InstrumenterIndex.readIndex();
+        InstrumenterState.initialize(instrumenterIndex.instrumentationCount());
+        CombiningTransformerBuilder transformerBuilder = new CombiningTransformerBuilder(
+                new AgentBuilder.Default()
+                        .disableClassFormatChanges()
+                        .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
+                        .ignore(none()),
+                instrumenterIndex,
+                EnumSet.of(InstrumenterModule.TargetSystem.TRACING),
+                false);
+        transformerBuilder.applyInstrumentation(structuralChange);
+        InstrumenterState.resetDefaultState();
+
+        ClassFileTransformer transformer = transformerBuilder.installOn(instrumentation);
+        SharedTypePools.endInstall();
+        return transformer;
     }
 
-    @Override
-    public void typeAdvice(TypeTransformer transformer) {
-      transformer.applyAdvice(
-          (builder, typeDescription, classLoader, module, protectionDomain) -> {
-            transformations.incrementAndGet();
-            return builder.visit(new AddStructuralMarkerVisitor());
-          });
+    private Class<?> loadTargetClass() {
+        return new ByteBuddy()
+                .subclass(Object.class)
+                .name(TARGET_CLASS_NAME)
+                .make()
+                .load(getClass().getClassLoader(), ClassLoadingStrategy.Default.WRAPPER)
+                .getLoaded();
     }
 
-    @Override
-    public void methodAdvice(MethodTransformer transformer) {}
+    public interface StructuralChangeMarker {}
 
-    @Override
-    public Class<?> structuralChangeMarker() {
-      return StructuralChangeMarker.class;
-    }
+    private static final class StructuralChangeInstrumentation extends InstrumenterModule.Tracing
+            implements Instrumenter.ForSingleType, Instrumenter.WithStructuralChange, Instrumenter.HasMethodAdvice {
 
-    public static class Muzzle {
-      public static ReferenceMatcher create() {
-        return ReferenceMatcher.NO_REFERENCES;
-      }
-    }
-  }
+        private final AtomicInteger transformations = new AtomicInteger();
 
-  private static final class AddStructuralMarkerVisitor implements AsmVisitorWrapper {
+        private StructuralChangeInstrumentation() {
+            super("structural-change-retransformation-test");
+        }
 
-    private static final String MARKER_NAME = Type.getInternalName(StructuralChangeMarker.class);
+        @Override
+        public String instrumentedType() {
+            return TARGET_CLASS_NAME;
+        }
 
-    @Override
-    public int mergeWriter(int flags) {
-      return flags;
-    }
+        @Override
+        public void typeAdvice(TypeTransformer transformer) {
+            transformer.applyAdvice((builder, typeDescription, classLoader, module, protectionDomain) -> {
+                transformations.incrementAndGet();
+                return builder.visit(new AddStructuralMarkerVisitor());
+            });
+        }
+
+        @Override
+        public void methodAdvice(MethodTransformer transformer) {}
 
-    @Override
-    public int mergeReader(int flags) {
-      return flags;
+        @Override
+        public Class<?> structuralChangeMarker() {
+            return StructuralChangeMarker.class;
+        }
+
+        public static class Muzzle {
+            public static ReferenceMatcher create() {
+                return ReferenceMatcher.NO_REFERENCES;
+            }
+        }
     }
 
-    @Override
-    public ClassVisitor wrap(
-        TypeDescription instrumentedType,
-        ClassVisitor classVisitor,
-        Implementation.Context implementationContext,
-        TypePool typePool,
-        FieldList<FieldDescription.InDefinedShape> fields,
-        MethodList<?> methods,
-        int writerFlags,
-        int readerFlags) {
-      return new ClassVisitor(OpenedClassReader.ASM_API, classVisitor) {
+    private static final class AddStructuralMarkerVisitor implements AsmVisitorWrapper {
+
+        private static final String MARKER_NAME = Type.getInternalName(StructuralChangeMarker.class);
+
+        @Override
+        public int mergeWriter(int flags) {
+            return flags;
+        }
+
+        @Override
+        public int mergeReader(int flags) {
+            return flags;
+        }
+
         @Override
-        public void visit(
-            int version,
-            int access,
-            String name,
-            String signature,
-            String superName,
-            String[] interfaces) {
-          if (!arrayContains(interfaces, MARKER_NAME)) {
-            interfaces = appendToArray(interfaces, MARKER_NAME);
-          }
-          super.visit(version, access, name, signature, superName, interfaces);
+        public ClassVisitor wrap(
+                TypeDescription instrumentedType,
+                ClassVisitor classVisitor,
+                Implementation.Context implementationContext,
+                TypePool typePool,
+                FieldList<FieldDescription.InDefinedShape> fields,
+                MethodList<?> methods,
+                int writerFlags,
+                int readerFlags) {
+            return new ClassVisitor(OpenedClassReader.ASM_API, classVisitor) {
+                @Override
+                public void visit(
+                        int version, int access, String name, String signature, String superName, String[] interfaces) {
+                    if (!arrayContains(interfaces, MARKER_NAME)) {
+                        interfaces = appendToArray(interfaces, MARKER_NAME);
+                    }
+                    super.visit(version, access, name, signature, superName, interfaces);
+                }
+            };
         }
-      };
     }
-  }
 }
diff --git a/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriterTest.java b/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriterTest.java
index e41187d92ac..c651c646255 100644
--- a/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriterTest.java
+++ b/dd-java-agent/agent-installer/src/test/java/datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriterTest.java
@@ -19,50 +19,48 @@
 
 @EnabledOnOs(OS.LINUX)
 class MemFDUnixWriterTest {
-  public static List<MemFDUnixWriter> writerProvider() {
-    final List<MemFDUnixWriter> ret = new ArrayList<>();
-    ret.add(new MemFDUnixWriterJNA()); // JNA is compatible with all the java versions
-    if (JavaVirtualMachine.isJavaVersionAtLeast(22)) {
-      ret.add(new MemFDUnixWriterFFM()); // FFM API is GA from java 22.
+    public static List<MemFDUnixWriter> writerProvider() {
+        final List<MemFDUnixWriter> ret = new ArrayList<>();
+        ret.add(new MemFDUnixWriterJNA()); // JNA is compatible with all the java versions
+        if (JavaVirtualMachine.isJavaVersionAtLeast(22)) {
+            ret.add(new MemFDUnixWriterFFM()); // FFM API is GA from java 22.
+        }
+        return ret;
     }
-    return ret;
-  }
 
-  @ParameterizedTest
-  @MethodSource("writerProvider")
-  void testWriteCreatesMemFd(MemFDUnixWriter writer) throws IOException {
-    // Given
-    String fileName = "test-memfd-" + System.currentTimeMillis();
-    String testContent = "Hello from Foreign Memory API!";
-    byte[] payload = testContent.getBytes(StandardCharsets.UTF_8);
+    @ParameterizedTest
+    @MethodSource("writerProvider")
+    void testWriteCreatesMemFd(MemFDUnixWriter writer) throws IOException {
+        // Given
+        String fileName = "test-memfd-" + System.currentTimeMillis();
+        String testContent = "Hello from Foreign Memory API!";
+        byte[] payload = testContent.getBytes(StandardCharsets.UTF_8);
 
-    // When
-    writer.write(fileName, payload);
+        // When
+        writer.write(fileName, payload);
 
-    // Then - verify memfd was created by checking /proc/self/fd
-    // The memfd should be open and readable
-    Path procSelfFd = Paths.get("/proc/self/fd");
-    boolean memfdFound = false;
+        // Then - verify memfd was created by checking /proc/self/fd
+        // The memfd should be open and readable
+        Path procSelfFd = Paths.get("/proc/self/fd");
+        boolean memfdFound = false;
 
-    try (Stream<Path> fdStream = Files.list(procSelfFd)) {
-      memfdFound =
-          fdStream.anyMatch(
-              fd -> {
+        try (Stream<Path> fdStream = Files.list(procSelfFd)) {
+            memfdFound = fdStream.anyMatch(fd -> {
                 try {
-                  Path linkTarget = Files.readSymbolicLink(fd);
-                  return linkTarget.toString().contains(fileName);
+                    Path linkTarget = Files.readSymbolicLink(fd);
+                    return linkTarget.toString().contains(fileName);
                 } catch (IOException e) {
-                  return false;
+                    return false;
                 }
-              });
+            });
+        }
+        assertTrue(memfdFound, "memfd should be created and visible in /proc/self/fd");
     }
-    assertTrue(memfdFound, "memfd should be created and visible in /proc/self/fd");
-  }
 
-  @ParameterizedTest
-  @MethodSource("writerProvider")
-  void testErrnoWorks(MemFDUnixWriter writer) {
-    assertEquals(-1, writer.fcntl(-1, 0, 0)); // this call will fail
-    assertTrue(writer.getLastError() > 0);
-  }
+    @ParameterizedTest
+    @MethodSource("writerProvider")
+    void testErrnoWorks(MemFDUnixWriter writer) {
+        assertEquals(-1, writer.fcntl(-1, 0, 0)); // this call will fail
+        assertTrue(writer.getLastError() > 0);
+    }
 }
diff --git a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/AgentConnectionFactory.java b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/AgentConnectionFactory.java
index 8647cc5de18..c48a12c7914 100644
--- a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/AgentConnectionFactory.java
+++ b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/AgentConnectionFactory.java
@@ -12,25 +12,25 @@
 import org.slf4j.LoggerFactory;
 
 public class AgentConnectionFactory implements ConnectionFactory {
-  private static final Logger log = LoggerFactory.getLogger(AgentConnectionFactory.class);
+    private static final Logger log = LoggerFactory.getLogger(AgentConnectionFactory.class);
 
-  private final ConnectionFactory defaultConnectionFactory = new DefaultConnectionFactory();
+    private final ConnectionFactory defaultConnectionFactory = new DefaultConnectionFactory();
 
-  public AgentConnectionFactory() {}
+    public AgentConnectionFactory() {}
 
-  @Override
-  public Connection createConnection(Map<String, Object> connectionParams) throws IOException {
-    Object mbeanServerClass = connectionParams.get("mbean_server_class");
-    if (mbeanServerClass != null) {
-      MBeanServer mbeanServer = MBeanServerRegistry.getServer(mbeanServerClass.toString());
-      if (mbeanServer != null) {
-        return new InitialMBeanServerConnection(mbeanServer);
-      }
-      log.warn(
-          "Unable to provide a MBean server instance of {}. Falling back to platform default",
-          mbeanServerClass);
-      return new JvmDirectConnection();
+    @Override
+    public Connection createConnection(Map<String, Object> connectionParams) throws IOException {
+        Object mbeanServerClass = connectionParams.get("mbean_server_class");
+        if (mbeanServerClass != null) {
+            MBeanServer mbeanServer = MBeanServerRegistry.getServer(mbeanServerClass.toString());
+            if (mbeanServer != null) {
+                return new InitialMBeanServerConnection(mbeanServer);
+            }
+            log.warn(
+                    "Unable to provide a MBean server instance of {}. Falling back to platform default",
+                    mbeanServerClass);
+            return new JvmDirectConnection();
+        }
+        return defaultConnectionFactory.createConnection(connectionParams);
     }
-    return defaultConnectionFactory.createConnection(connectionParams);
-  }
 }
diff --git a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/AgentStatsdReporter.java b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/AgentStatsdReporter.java
index 6bcb7ce0694..a9b683e7d65 100644
--- a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/AgentStatsdReporter.java
+++ b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/AgentStatsdReporter.java
@@ -16,96 +16,95 @@
 /** Based on {@link org.datadog.jmxfetch.reporter.StatsdReporter}. */
 public final class AgentStatsdReporter extends Reporter implements TracerFlare.Reporter {
 
-  private final StatsDClient statsd;
-
-  private volatile Map<String, Double> history;
-
-  public AgentStatsdReporter(final StatsDClient statsd) {
-    this.statsd = statsd;
-    this.handler = new ErrorHandler();
-  }
-
-  @Override
-  protected void sendMetricPoint(
-      final String metricType, final String metricName, final double value, final String[] tags) {
-    Map<String, Double> h = history;
-    if (null != h) {
-      // preparing for tracer-flare, record JMXFetch metrics as they're reported
-      h.put(metricName, value);
+    private final StatsDClient statsd;
+
+    private volatile Map<String, Double> history;
+
+    public AgentStatsdReporter(final StatsDClient statsd) {
+        this.statsd = statsd;
+        this.handler = new ErrorHandler();
+    }
+
+    @Override
+    protected void sendMetricPoint(
+            final String metricType, final String metricName, final double value, final String[] tags) {
+        Map<String, Double> h = history;
+        if (null != h) {
+            // preparing for tracer-flare, record JMXFetch metrics as they're reported
+            h.put(metricName, value);
+        }
+        if ("monotonic_count".equals(metricType)) {
+            statsd.count(metricName, (long) value, tags);
+        } else if ("histogram".equals(metricType)) {
+            statsd.histogram(metricName, value, tags);
+        } else { // JMXFetch treats everything else as a gauge
+            statsd.gauge(metricName, value, tags);
+        }
+    }
+
+    @Override
+    protected void doSendServiceCheck(
+            final String serviceCheckName, final String status, final String message, final String[] tags) {
+        statsd.serviceCheck(serviceCheckName, status, message, tags);
+    }
+
+    @Override
+    public void displayMetricReached() {
+        throw new UnsupportedOperationException();
     }
-    if ("monotonic_count".equals(metricType)) {
-      statsd.count(metricName, (long) value, tags);
-    } else if ("histogram".equals(metricType)) {
-      statsd.histogram(metricName, value, tags);
-    } else { // JMXFetch treats everything else as a gauge
-      statsd.gauge(metricName, value, tags);
+
+    @Override
+    public void displayMatchingAttributeName(final JmxAttribute jmxAttribute, final int rank, final int limit) {
+        throw new UnsupportedOperationException();
     }
-  }
-
-  @Override
-  protected void doSendServiceCheck(
-      final String serviceCheckName,
-      final String status,
-      final String message,
-      final String[] tags) {
-    statsd.serviceCheck(serviceCheckName, status, message, tags);
-  }
-
-  @Override
-  public void displayMetricReached() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void displayMatchingAttributeName(
-      final JmxAttribute jmxAttribute, final int rank, final int limit) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void displayNonMatchingAttributeName(final JmxAttribute jmxAttribute) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void displayInstanceName(final Instance instance) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void prepareForFlare() {
-    history = new ConcurrentSkipListMap<>();
-  }
-
-  @Override
-  public void addReportToFlare(ZipOutputStream zip) throws IOException {
-    Map<String, Double> h = history;
-    if (null != h) {
-      // report any JMXFetch metrics recorded while preparing for tracer-flare
-      StringBuilder buf = new StringBuilder();
-      NumberFormat nf = NumberFormat.getInstance(Locale.ROOT);
-      for (Map.Entry<String, Double> metric : h.entrySet()) {
-        buf.append(metric.getKey()).append('=').append(nf.format(metric.getValue())).append('\n');
-      }
-      TracerFlare.addText(zip, "jmxfetch.txt", buf.toString());
+
+    @Override
+    public void displayNonMatchingAttributeName(final JmxAttribute jmxAttribute) {
+        throw new UnsupportedOperationException();
     }
-  }
 
-  @Override
-  public void cleanupAfterFlare() {
-    history = null;
-  }
+    @Override
+    public void displayInstanceName(final Instance instance) {
+        throw new UnsupportedOperationException();
+    }
 
-  /** Handler that delegates to the shared statsd connection for error tracking purposes. */
-  final class ErrorHandler extends LoggingErrorHandler {
     @Override
-    public void handle(final Exception error) {
-      statsd.error(error);
+    public void prepareForFlare() {
+        history = new ConcurrentSkipListMap<>();
     }
 
     @Override
-    public int getErrors() {
-      return statsd.getErrorCount();
+    public void addReportToFlare(ZipOutputStream zip) throws IOException {
+        Map<String, Double> h = history;
+        if (null != h) {
+            // report any JMXFetch metrics recorded while preparing for tracer-flare
+            StringBuilder buf = new StringBuilder();
+            NumberFormat nf = NumberFormat.getInstance(Locale.ROOT);
+            for (Map.Entry<String, Double> metric : h.entrySet()) {
+                buf.append(metric.getKey())
+                        .append('=')
+                        .append(nf.format(metric.getValue()))
+                        .append('\n');
+            }
+            TracerFlare.addText(zip, "jmxfetch.txt", buf.toString());
+        }
+    }
+
+    @Override
+    public void cleanupAfterFlare() {
+        history = null;
+    }
+
+    /** Handler that delegates to the shared statsd connection for error tracking purposes. */
+    final class ErrorHandler extends LoggingErrorHandler {
+        @Override
+        public void handle(final Exception error) {
+            statsd.error(error);
+        }
+
+        @Override
+        public int getErrors() {
+            return statsd.getErrorCount();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/InitialMBeanServerConnection.java b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/InitialMBeanServerConnection.java
index b486bbc4d9b..afecb786c46 100644
--- a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/InitialMBeanServerConnection.java
+++ b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/InitialMBeanServerConnection.java
@@ -7,12 +7,12 @@
 
 public class InitialMBeanServerConnection extends JvmDirectConnection {
 
-  public InitialMBeanServerConnection(@Nonnull final MBeanServerConnection mbs) throws IOException {
-    this.mbs = mbs;
-  }
+    public InitialMBeanServerConnection(@Nonnull final MBeanServerConnection mbs) throws IOException {
+        this.mbs = mbs;
+    }
 
-  @Override
-  protected void createConnection() {
-    // already connected
-  }
+    @Override
+    protected void createConnection() {
+        // already connected
+    }
 }
diff --git a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JMXFetch.java b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JMXFetch.java
index a46b1cb81a1..ca861c2b4cb 100644
--- a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JMXFetch.java
+++ b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JMXFetch.java
@@ -30,216 +30,204 @@
 
 public class JMXFetch {
 
-  private static final Logger log = LoggerFactory.getLogger(JMXFetch.class);
+    private static final Logger log = LoggerFactory.getLogger(JMXFetch.class);
 
-  private static final String DEFAULT_CONFIG = "jmxfetch-config.yaml";
-  private static final String OTLP_JMX_CONFIG = "jmxfetch-config-no-jvm-defaults.yaml";
-  private static final String WEBSPHERE_CONFIG = "jmxfetch-websphere-config.yaml";
+    private static final String DEFAULT_CONFIG = "jmxfetch-config.yaml";
+    private static final String OTLP_JMX_CONFIG = "jmxfetch-config-no-jvm-defaults.yaml";
+    private static final String WEBSPHERE_CONFIG = "jmxfetch-websphere-config.yaml";
 
-  private static final int DELAY_BETWEEN_RUN_ATTEMPTS = 5000;
+    private static final int DELAY_BETWEEN_RUN_ATTEMPTS = 5000;
 
-  public static void run(final StatsDClientManager statsDClientManager) {
-    run(statsDClientManager, Config.get());
-  }
-
-  // This is used by tests
-  private static void run(final StatsDClientManager statsDClientManager, final Config config) {
-    if (!config.isJmxFetchEnabled()) {
-      log.debug("JMXFetch is disabled");
-      return;
+    public static void run(final StatsDClientManager statsDClientManager) {
+        run(statsDClientManager, Config.get());
     }
 
-    if (!log.isDebugEnabled()
-        && SystemProperties.get("org.slf4j.simpleLogger.log.org.datadog.jmxfetch") == null) {
-      // Reduce noisiness of jmxfetch logging.
-      SystemProperties.set("org.slf4j.simpleLogger.log.org.datadog.jmxfetch", "warn");
-    }
+    // This is used by tests
+    private static void run(final StatsDClientManager statsDClientManager, final Config config) {
+        if (!config.isJmxFetchEnabled()) {
+            log.debug("JMXFetch is disabled");
+            return;
+        }
 
-    final String jmxFetchConfigDir = config.getJmxFetchConfigDir();
-    final List<String> jmxFetchConfigs = config.getJmxFetchConfigs();
-    final List<String> internalMetricsConfigs = getInternalMetricFiles();
-    final List<String> metricsConfigs = config.getJmxFetchMetricsConfigs();
-    final Integer checkPeriod = config.getJmxFetchCheckPeriod();
-    final Integer refreshBeansPeriod = config.getJmxFetchRefreshBeansPeriod();
-    final Integer initialRefreshBeansPeriod = config.getJmxFetchInitialRefreshBeansPeriod();
-    final Map<String, String> globalTags = config.getMergedJmxTags();
-
-    String host = config.getJmxFetchStatsdHost();
-    Integer port = config.getJmxFetchStatsdPort();
-    String namedPipe = config.getDogStatsDNamedPipe();
-
-    if (log.isDebugEnabled()) {
-      String statsDConnectionString;
-      if (namedPipe == null) {
-        statsDConnectionString =
-            "statsd:"
-                + (null != host ? host : "<auto-detect>")
-                + (null != port && port > 0 ? ":" + port : "");
-      } else {
-        statsDConnectionString = "statsd:" + namedPipe;
-      }
-
-      log.debug(
-          "JMXFetch config: {} {} {} {} {} {} {} {} {}",
-          jmxFetchConfigDir,
-          jmxFetchConfigs,
-          internalMetricsConfigs,
-          metricsConfigs,
-          checkPeriod,
-          initialRefreshBeansPeriod,
-          refreshBeansPeriod,
-          globalTags,
-          statsDConnectionString);
-    }
+        if (!log.isDebugEnabled() && SystemProperties.get("org.slf4j.simpleLogger.log.org.datadog.jmxfetch") == null) {
+            // Reduce noisiness of jmxfetch logging.
+            SystemProperties.set("org.slf4j.simpleLogger.log.org.datadog.jmxfetch", "warn");
+        }
 
-    final StatsDClient statsd = statsDClientManager.statsDClient(host, port, namedPipe, null, null);
-    final AgentStatsdReporter reporter = new AgentStatsdReporter(statsd);
-
-    final boolean otlpRuntimeMetricsEnabled =
-        InstrumenterConfig.get().isMetricsOtelEnabled() && config.isMetricsOtlpExporterEnabled();
-
-    TracerFlare.addReporter(reporter);
-    final List<String> defaultConfigs = new ArrayList<>();
-    if (otlpRuntimeMetricsEnabled) {
-      // Register JVM runtime metric callbacks against the OtelMeterProvider so the OTLP
-      // exporter started by CoreTracer collects them. Started here so it rides the same
-      // delayed-start path as JMXFetch itself.
-      JvmOtlpRuntimeMetrics.start(config.isMetricsOtelExperimentalEnabled());
-      // When the OTLP exporter is collecting JVM runtime metrics, skip the default JMXFetch
-      // JVM config to avoid double-reporting.
-      defaultConfigs.add(OTLP_JMX_CONFIG);
-    } else {
-      defaultConfigs.add(DEFAULT_CONFIG);
-    }
-    if (config.isJmxFetchIntegrationEnabled(Collections.singletonList("websphere"), false)) {
-      defaultConfigs.add(WEBSPHERE_CONFIG);
-    }
+        final String jmxFetchConfigDir = config.getJmxFetchConfigDir();
+        final List<String> jmxFetchConfigs = config.getJmxFetchConfigs();
+        final List<String> internalMetricsConfigs = getInternalMetricFiles();
+        final List<String> metricsConfigs = config.getJmxFetchMetricsConfigs();
+        final Integer checkPeriod = config.getJmxFetchCheckPeriod();
+        final Integer refreshBeansPeriod = config.getJmxFetchRefreshBeansPeriod();
+        final Integer initialRefreshBeansPeriod = config.getJmxFetchInitialRefreshBeansPeriod();
+        final Map<String, String> globalTags = config.getMergedJmxTags();
+
+        String host = config.getJmxFetchStatsdHost();
+        Integer port = config.getJmxFetchStatsdPort();
+        String namedPipe = config.getDogStatsDNamedPipe();
+
+        if (log.isDebugEnabled()) {
+            String statsDConnectionString;
+            if (namedPipe == null) {
+                statsDConnectionString = "statsd:"
+                        + (null != host ? host : "<auto-detect>")
+                        + (null != port && port > 0 ? ":" + port : "");
+            } else {
+                statsDConnectionString = "statsd:" + namedPipe;
+            }
 
-    final AppConfig.AppConfigBuilder configBuilder =
-        AppConfig.builder()
-            .action(Collections.singletonList(ACTION_COLLECT))
-            // App should be run as daemon otherwise CLI apps would not exit once main method exits.
-            .daemon(true)
-            .embedded(true)
-            .confdDirectory(jmxFetchConfigDir)
-            .yamlFileList(jmxFetchConfigs)
-            .targetDirectInstances(true)
-            .instanceConfigResources(defaultConfigs)
-            .metricConfigResources(internalMetricsConfigs)
-            .metricConfigFiles(metricsConfigs)
-            .initialRefreshBeansPeriod(initialRefreshBeansPeriod)
-            .refreshBeansPeriod(refreshBeansPeriod)
-            .globalTags(globalTags)
-            .reporter(reporter)
-            .connectionFactory(new AgentConnectionFactory());
-
-    if (config.isJmxFetchMultipleRuntimeServicesEnabled()) {
-      ServiceNameCollectingTraceInterceptor serviceNameProvider =
-          ServiceNameCollectingTraceInterceptor.INSTANCE;
-      GlobalTracer.get().addTraceInterceptor(serviceNameProvider);
-
-      configBuilder.serviceNameProvider(serviceNameProvider);
-    }
+            log.debug(
+                    "JMXFetch config: {} {} {} {} {} {} {} {} {}",
+                    jmxFetchConfigDir,
+                    jmxFetchConfigs,
+                    internalMetricsConfigs,
+                    metricsConfigs,
+                    checkPeriod,
+                    initialRefreshBeansPeriod,
+                    refreshBeansPeriod,
+                    globalTags,
+                    statsDConnectionString);
+        }
 
-    if (checkPeriod != null) {
-      configBuilder.checkPeriod(checkPeriod);
-    }
+        final StatsDClient statsd = statsDClientManager.statsDClient(host, port, namedPipe, null, null);
+        final AgentStatsdReporter reporter = new AgentStatsdReporter(statsd);
+
+        final boolean otlpRuntimeMetricsEnabled =
+                InstrumenterConfig.get().isMetricsOtelEnabled() && config.isMetricsOtlpExporterEnabled();
+
+        TracerFlare.addReporter(reporter);
+        final List<String> defaultConfigs = new ArrayList<>();
+        if (otlpRuntimeMetricsEnabled) {
+            // Register JVM runtime metric callbacks against the OtelMeterProvider so the OTLP
+            // exporter started by CoreTracer collects them. Started here so it rides the same
+            // delayed-start path as JMXFetch itself.
+            JvmOtlpRuntimeMetrics.start(config.isMetricsOtelExperimentalEnabled());
+            // When the OTLP exporter is collecting JVM runtime metrics, skip the default JMXFetch
+            // JVM config to avoid double-reporting.
+            defaultConfigs.add(OTLP_JMX_CONFIG);
+        } else {
+            defaultConfigs.add(DEFAULT_CONFIG);
+        }
+        if (config.isJmxFetchIntegrationEnabled(Collections.singletonList("websphere"), false)) {
+            defaultConfigs.add(WEBSPHERE_CONFIG);
+        }
 
-    final AppConfig appConfig = configBuilder.build();
+        final AppConfig.AppConfigBuilder configBuilder = AppConfig.builder()
+                .action(Collections.singletonList(ACTION_COLLECT))
+                // App should be run as daemon otherwise CLI apps would not exit once main method exits.
+                .daemon(true)
+                .embedded(true)
+                .confdDirectory(jmxFetchConfigDir)
+                .yamlFileList(jmxFetchConfigs)
+                .targetDirectInstances(true)
+                .instanceConfigResources(defaultConfigs)
+                .metricConfigResources(internalMetricsConfigs)
+                .metricConfigFiles(metricsConfigs)
+                .initialRefreshBeansPeriod(initialRefreshBeansPeriod)
+                .refreshBeansPeriod(refreshBeansPeriod)
+                .globalTags(globalTags)
+                .reporter(reporter)
+                .connectionFactory(new AgentConnectionFactory());
+
+        if (config.isJmxFetchMultipleRuntimeServicesEnabled()) {
+            ServiceNameCollectingTraceInterceptor serviceNameProvider = ServiceNameCollectingTraceInterceptor.INSTANCE;
+            GlobalTracer.get().addTraceInterceptor(serviceNameProvider);
+
+            configBuilder.serviceNameProvider(serviceNameProvider);
+        }
+
+        if (checkPeriod != null) {
+            configBuilder.checkPeriod(checkPeriod);
+        }
+
+        final AppConfig appConfig = configBuilder.build();
 
-    final Thread thread =
-        newAgentThread(
-            JMX_COLLECTOR,
-            new Runnable() {
-              @Override
-              public void run() {
+        final Thread thread = newAgentThread(JMX_COLLECTOR, new Runnable() {
+            @Override
+            public void run() {
                 App app = new App(appConfig);
                 while (true) {
-                  // check in case dynamic-config has temporarily disabled JMXFetch
-                  if (!appConfig.getExitWatcher().shouldExit()) {
+                    // check in case dynamic-config has temporarily disabled JMXFetch
+                    if (!appConfig.getExitWatcher().shouldExit()) {
+                        try {
+                            final int result = app.run();
+                            if (result != 0) {
+                                log.warn("jmx collector exited with error code: {}", result);
+                            }
+                        } catch (final Exception e) {
+                            String message = e.getMessage();
+                            boolean ignoredException = message != null && message.startsWith("Shutdown in progress");
+                            if (!ignoredException) {
+                                log.warn("Exception in jmx collector thread", e);
+                            }
+                        }
+                    }
+                    // always wait before next attempt
                     try {
-                      final int result = app.run();
-                      if (result != 0) {
-                        log.warn("jmx collector exited with error code: {}", result);
-                      }
-                    } catch (final Exception e) {
-                      String message = e.getMessage();
-                      boolean ignoredException =
-                          message != null && message.startsWith("Shutdown in progress");
-                      if (!ignoredException) {
-                        log.warn("Exception in jmx collector thread", e);
-                      }
+                        Thread.sleep(DELAY_BETWEEN_RUN_ATTEMPTS);
+                    } catch (final InterruptedException ignore) {
+                        Thread.currentThread().interrupt();
+                        break;
                     }
-                  }
-                  // always wait before next attempt
-                  try {
-                    Thread.sleep(DELAY_BETWEEN_RUN_ATTEMPTS);
-                  } catch (final InterruptedException ignore) {
-                    Thread.currentThread().interrupt();
-                    break;
-                  }
                 }
-              }
-            });
-    thread.setContextClassLoader(JMXFetch.class.getClassLoader());
-    thread.start();
-  }
-
-  @SuppressForbidden
-  private static List<String> getInternalMetricFiles() {
-    try (final InputStream metricConfigsStream =
-        JMXFetch.class.getResourceAsStream("metricconfigs.txt")) {
-      if (metricConfigsStream == null) {
-        log.debug("metricconfigs not found. returning empty set");
-        return Collections.emptyList();
-      }
-      log.debug("reading found metricconfigs");
-      Scanner scanner = new Scanner(metricConfigsStream);
-      scanner.useDelimiter("\n");
-      final List<String> result = new ArrayList<>();
-      final SortedSet<String> integrationName = new TreeSet<>();
-      while (scanner.hasNext()) {
-        String config = scanner.next();
-        integrationName.clear();
-        integrationName.add(config.replace(".yaml", ""));
-
-        if (!Config.get().isJmxFetchIntegrationEnabled(integrationName, false)) {
-          log.debug(
-              "skipping metric config `{}` because integration {} is disabled",
-              config,
-              integrationName);
-        } else {
-          final URL resource = JMXFetch.class.getResource("metricconfigs/" + config);
-          if (resource == null) {
-            log.debug(
-                LogCollector.SEND_TELEMETRY, "metric config `{}` not found. skipping", config);
-            continue;
-          }
-          log.debug("adding metric config `{}`", config);
-
-          // jar!/ means a file internal to a jar, only add the part after if it exists
-          final String path = resource.getPath();
-          final int filenameIndex = path.indexOf("jar!/");
-          if (filenameIndex != -1) {
-            result.add(path.substring(filenameIndex + 5));
-          } else {
-            result.add(path.substring(1));
-          }
+            }
+        });
+        thread.setContextClassLoader(JMXFetch.class.getClassLoader());
+        thread.start();
+    }
+
+    @SuppressForbidden
+    private static List<String> getInternalMetricFiles() {
+        try (final InputStream metricConfigsStream = JMXFetch.class.getResourceAsStream("metricconfigs.txt")) {
+            if (metricConfigsStream == null) {
+                log.debug("metricconfigs not found. returning empty set");
+                return Collections.emptyList();
+            }
+            log.debug("reading found metricconfigs");
+            Scanner scanner = new Scanner(metricConfigsStream);
+            scanner.useDelimiter("\n");
+            final List<String> result = new ArrayList<>();
+            final SortedSet<String> integrationName = new TreeSet<>();
+            while (scanner.hasNext()) {
+                String config = scanner.next();
+                integrationName.clear();
+                integrationName.add(config.replace(".yaml", ""));
+
+                if (!Config.get().isJmxFetchIntegrationEnabled(integrationName, false)) {
+                    log.debug(
+                            "skipping metric config `{}` because integration {} is disabled", config, integrationName);
+                } else {
+                    final URL resource = JMXFetch.class.getResource("metricconfigs/" + config);
+                    if (resource == null) {
+                        log.debug(LogCollector.SEND_TELEMETRY, "metric config `{}` not found. skipping", config);
+                        continue;
+                    }
+                    log.debug("adding metric config `{}`", config);
+
+                    // jar!/ means a file internal to a jar, only add the part after if it exists
+                    final String path = resource.getPath();
+                    final int filenameIndex = path.indexOf("jar!/");
+                    if (filenameIndex != -1) {
+                        result.add(path.substring(filenameIndex + 5));
+                    } else {
+                        result.add(path.substring(1));
+                    }
+                }
+            }
+            return result;
+        } catch (final IOException e) {
+            log.debug("error reading metricconfigs. returning empty set", e);
+            return Collections.emptyList();
         }
-      }
-      return result;
-    } catch (final IOException e) {
-      log.debug("error reading metricconfigs. returning empty set", e);
-      return Collections.emptyList();
     }
-  }
 
-  private static String getLogLocation() {
-    return SystemProperties.getOrDefault("org.slf4j.simpleLogger.logFile", "System.err");
-  }
+    private static String getLogLocation() {
+        return SystemProperties.getOrDefault("org.slf4j.simpleLogger.logFile", "System.err");
+    }
 
-  private static String getLogLevel() {
-    return SystemProperties.getOrDefault("org.slf4j.simpleLogger.defaultLogLevel", "info")
-        .toUpperCase();
-  }
+    private static String getLogLevel() {
+        return SystemProperties.getOrDefault("org.slf4j.simpleLogger.defaultLogLevel", "info")
+                .toUpperCase();
+    }
 }
diff --git a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JvmOtlpRuntimeMetrics.java b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JvmOtlpRuntimeMetrics.java
index 5f26cdb2206..d7585a6cf16 100644
--- a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JvmOtlpRuntimeMetrics.java
+++ b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JvmOtlpRuntimeMetrics.java
@@ -51,676 +51,626 @@
  * registry.
  */
 public final class JvmOtlpRuntimeMetrics {
-  private static final Logger log = LoggerFactory.getLogger(JvmOtlpRuntimeMetrics.class);
-
-  private static final OtelInstrumentationScope JVM_SCOPE =
-      new OtelInstrumentationScope("datadog.jvm.runtime", null, null);
-
-  private static final AttributeKey<String> MEMORY_TYPE = AttributeKey.stringKey("jvm.memory.type");
-  private static final AttributeKey<String> MEMORY_POOL =
-      AttributeKey.stringKey("jvm.memory.pool.name");
-  private static final AttributeKey<String> BUFFER_POOL =
-      AttributeKey.stringKey("jvm.buffer.pool.name");
-  private static final AttributeKey<String> GC_NAME = AttributeKey.stringKey("jvm.gc.name");
-  private static final AttributeKey<String> GC_ACTION = AttributeKey.stringKey("jvm.gc.action");
-  private static final AttributeKey<String> GC_CAUSE = AttributeKey.stringKey("jvm.gc.cause");
-  private static final AttributeKey<Boolean> THREAD_DAEMON =
-      AttributeKey.booleanKey("jvm.thread.daemon");
-  private static final AttributeKey<String> THREAD_STATE =
-      AttributeKey.stringKey("jvm.thread.state");
-  private static final Attributes HEAP_ATTRS = Attributes.of(MEMORY_TYPE, "heap");
-  private static final Attributes NON_HEAP_ATTRS = Attributes.of(MEMORY_TYPE, "non_heap");
-
-  /**
-   * Precomputed Attributes for each (daemon, Thread.State) pair, used by jvm.thread.count. There
-   * are only 12 combinations, so caching avoids per-poll allocation of identical Attribute objects.
-   */
-  private static final Attributes[] DAEMON_THREAD_STATE_ATTRS = buildThreadStateAttrs(true);
-
-  private static final Attributes[] NON_DAEMON_THREAD_STATE_ATTRS = buildThreadStateAttrs(false);
-
-  private static Attributes[] buildThreadStateAttrs(boolean daemon) {
-    Thread.State[] states = Thread.State.values();
-    Attributes[] result = new Attributes[states.length];
-    for (Thread.State state : states) {
-      result[state.ordinal()] =
-          Attributes.of(THREAD_DAEMON, daemon, THREAD_STATE, state.name().toLowerCase(Locale.ROOT));
+    private static final Logger log = LoggerFactory.getLogger(JvmOtlpRuntimeMetrics.class);
+
+    private static final OtelInstrumentationScope JVM_SCOPE =
+            new OtelInstrumentationScope("datadog.jvm.runtime", null, null);
+
+    private static final AttributeKey<String> MEMORY_TYPE = AttributeKey.stringKey("jvm.memory.type");
+    private static final AttributeKey<String> MEMORY_POOL = AttributeKey.stringKey("jvm.memory.pool.name");
+    private static final AttributeKey<String> BUFFER_POOL = AttributeKey.stringKey("jvm.buffer.pool.name");
+    private static final AttributeKey<String> GC_NAME = AttributeKey.stringKey("jvm.gc.name");
+    private static final AttributeKey<String> GC_ACTION = AttributeKey.stringKey("jvm.gc.action");
+    private static final AttributeKey<String> GC_CAUSE = AttributeKey.stringKey("jvm.gc.cause");
+    private static final AttributeKey<Boolean> THREAD_DAEMON = AttributeKey.booleanKey("jvm.thread.daemon");
+    private static final AttributeKey<String> THREAD_STATE = AttributeKey.stringKey("jvm.thread.state");
+    private static final Attributes HEAP_ATTRS = Attributes.of(MEMORY_TYPE, "heap");
+    private static final Attributes NON_HEAP_ATTRS = Attributes.of(MEMORY_TYPE, "non_heap");
+
+    /**
+     * Precomputed Attributes for each (daemon, Thread.State) pair, used by jvm.thread.count. There
+     * are only 12 combinations, so caching avoids per-poll allocation of identical Attribute objects.
+     */
+    private static final Attributes[] DAEMON_THREAD_STATE_ATTRS = buildThreadStateAttrs(true);
+
+    private static final Attributes[] NON_DAEMON_THREAD_STATE_ATTRS = buildThreadStateAttrs(false);
+
+    private static Attributes[] buildThreadStateAttrs(boolean daemon) {
+        Thread.State[] states = Thread.State.values();
+        Attributes[] result = new Attributes[states.length];
+        for (Thread.State state : states) {
+            result[state.ordinal()] = Attributes.of(
+                    THREAD_DAEMON, daemon, THREAD_STATE, state.name().toLowerCase(Locale.ROOT));
+        }
+        return result;
     }
-    return result;
-  }
-
-  /**
-   * MethodHandle for {@code ThreadInfo#isDaemon()}: non-null on Java 9+, null on Java 8. Doubles as
-   * the Java-version probe since this code is compiled against Java 8 and cannot reference the
-   * symbol directly.
-   */
-  private static final MethodHandle THREAD_INFO_IS_DAEMON = resolveThreadInfoIsDaemon();
-
-  private static final ThreadMXBean THREAD_BEAN = ManagementFactory.getThreadMXBean();
-
-  /**
-   * jvm.thread.count collector, chosen once at class load. Java 9+ uses {@link
-   * ThreadMXBean#getThreadInfo(long[])} (the single-arg overload omits stack-trace capture); Java 8
-   * (and GraalVM native image, where ThreadMXBean is unsupported) walks the root {@link
-   * ThreadGroup}. Avoids {@link Thread#getAllStackTraces()}, which forces a safepoint and allocates
-   * a {@code StackTraceElement[]} per thread on every poll.
-   */
-  private static final Consumer<OtelMetricStorage> THREAD_COUNT_COLLECTOR =
-      chooseThreadCountCollector();
-
-  private static MethodHandle resolveThreadInfoIsDaemon() {
-    try {
-      return MethodHandles.publicLookup()
-          .findVirtual(ThreadInfo.class, "isDaemon", MethodType.methodType(boolean.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
-      return null; // Java 8 — fall back to ThreadGroup walk
-    }
-  }
 
-  private static Consumer<OtelMetricStorage> chooseThreadCountCollector() {
-    boolean isJava9OrNewer = THREAD_INFO_IS_DAEMON != null;
-    boolean isNativeImage = System.getProperty("org.graalvm.nativeimage.imagecode") != null;
-    if (isJava9OrNewer && !isNativeImage) {
-      return JvmOtlpRuntimeMetrics::collectThreadCountsViaThreadMXBean;
-    }
-    return JvmOtlpRuntimeMetrics::collectThreadCountsViaThreadGroup;
-  }
-
-  /** Explicit bucket advice for jvm.gc.duration in seconds (matches OTel runtime-telemetry). */
-  private static final List<Double> GC_DURATION_BUCKETS = Arrays.asList(0.01, 0.1, 1.0, 10.0);
-
-  private static final String GC_NOTIFICATION_TYPE = "com.sun.management.gc.notification";
-
-  private static final AtomicBoolean started = new AtomicBoolean(false);
-
-  /**
-   * Registers all JVM runtime metric instruments on the bootstrap-level metric registry.
-   *
-   * @param emitExperimentalMetrics when {@code true} (the spec-aligned default), metrics marked as
-   *     <em>Development</em> in the OTel semantic conventions are also registered. When {@code
-   *     false}, only metrics with stable status are emitted.
-   */
-  public static void start(boolean emitExperimentalMetrics) {
-    if (!started.compareAndSet(false, true)) {
-      return;
+    /**
+     * MethodHandle for {@code ThreadInfo#isDaemon()}: non-null on Java 9+, null on Java 8. Doubles as
+     * the Java-version probe since this code is compiled against Java 8 and cannot reference the
+     * symbol directly.
+     */
+    private static final MethodHandle THREAD_INFO_IS_DAEMON = resolveThreadInfoIsDaemon();
+
+    private static final ThreadMXBean THREAD_BEAN = ManagementFactory.getThreadMXBean();
+
+    /**
+     * jvm.thread.count collector, chosen once at class load. Java 9+ uses {@link
+     * ThreadMXBean#getThreadInfo(long[])} (the single-arg overload omits stack-trace capture); Java 8
+     * (and GraalVM native image, where ThreadMXBean is unsupported) walks the root {@link
+     * ThreadGroup}. Avoids {@link Thread#getAllStackTraces()}, which forces a safepoint and allocates
+     * a {@code StackTraceElement[]} per thread on every poll.
+     */
+    private static final Consumer<OtelMetricStorage> THREAD_COUNT_COLLECTOR = chooseThreadCountCollector();
+
+    private static MethodHandle resolveThreadInfoIsDaemon() {
+        try {
+            return MethodHandles.publicLookup()
+                    .findVirtual(ThreadInfo.class, "isDaemon", MethodType.methodType(boolean.class));
+        } catch (NoSuchMethodException | IllegalAccessException e) {
+            return null; // Java 8 — fall back to ThreadGroup walk
+        }
     }
 
-    try {
-      // Ensure OtelMetricStorage can serialize io.opentelemetry.api Attributes recorded below;
-      // the otel-shim registers an equivalent reader on its own class-loader, but agent-jmxfetch
-      // does not depend on the shim — so we register one here for our Attributes class-loader.
-      OtelMetricStorage.registerAttributeReader(
-          Attributes.class.getClassLoader(),
-          (attributes, visitor) ->
-              ((Attributes) attributes)
-                  .forEach((a, v) -> visitor.visitAttribute(a.getType().ordinal(), a.getKey(), v)));
-
-      // Stable metrics — always registered.
-      registerMemoryMetrics();
-      registerThreadMetrics();
-      registerClassLoadingMetrics();
-      registerCpuMetrics();
-      registerGcDurationMetric(emitExperimentalMetrics);
-
-      // Development-status metrics — gated by the experimental flag.
-      if (emitExperimentalMetrics) {
-        registerMemoryInitMetric();
-        registerBufferMetrics();
-        registerSystemCpuMetrics();
-        registerFileDescriptorMetrics();
-      }
-      log.debug(
-          "Started OTLP runtime metrics with OTel-native naming (jvm.*), experimental={}",
-          emitExperimentalMetrics);
-    } catch (Exception e) {
-      log.error("Failed to start JVM OTLP runtime metrics", e);
+    private static Consumer<OtelMetricStorage> chooseThreadCountCollector() {
+        boolean isJava9OrNewer = THREAD_INFO_IS_DAEMON != null;
+        boolean isNativeImage = System.getProperty("org.graalvm.nativeimage.imagecode") != null;
+        if (isJava9OrNewer && !isNativeImage) {
+            return JvmOtlpRuntimeMetrics::collectThreadCountsViaThreadMXBean;
+        }
+        return JvmOtlpRuntimeMetrics::collectThreadCountsViaThreadGroup;
     }
-  }
-
-  /**
-   * jvm.memory.used, jvm.memory.committed, jvm.memory.limit, jvm.memory.used_after_last_gc — all
-   * Stable per spec. All UpDownCounter.
-   */
-  private static void registerMemoryMetrics() {
-    MemoryMXBean memoryBean = ManagementFactory.getMemoryMXBean();
-    List<MemoryPoolMXBean> pools = ManagementFactory.getMemoryPoolMXBeans();
-
-    registerLongObservable(
-        "jvm.memory.used",
-        "Measure of memory used.",
-        "By",
-        UP_DOWN_COUNTER,
-        storage -> {
-          storage.recordLong(memoryBean.getHeapMemoryUsage().getUsed(), HEAP_ATTRS);
-          storage.recordLong(memoryBean.getNonHeapMemoryUsage().getUsed(), NON_HEAP_ATTRS);
-          for (MemoryPoolMXBean pool : pools) {
-            storage.recordLong(pool.getUsage().getUsed(), poolAttributes(pool));
-          }
-        });
 
-    registerLongObservable(
-        "jvm.memory.committed",
-        "Measure of memory committed.",
-        "By",
-        UP_DOWN_COUNTER,
-        storage -> {
-          storage.recordLong(memoryBean.getHeapMemoryUsage().getCommitted(), HEAP_ATTRS);
-          storage.recordLong(memoryBean.getNonHeapMemoryUsage().getCommitted(), NON_HEAP_ATTRS);
-          for (MemoryPoolMXBean pool : pools) {
-            storage.recordLong(pool.getUsage().getCommitted(), poolAttributes(pool));
-          }
-        });
-
-    registerLongObservable(
-        "jvm.memory.limit",
-        "Measure of max obtainable memory.",
-        "By",
-        UP_DOWN_COUNTER,
-        storage -> {
-          long heapMax = memoryBean.getHeapMemoryUsage().getMax();
-          if (heapMax != -1) {
-            storage.recordLong(heapMax, HEAP_ATTRS);
-          }
-          long nonHeapMax = memoryBean.getNonHeapMemoryUsage().getMax();
-          if (nonHeapMax != -1) {
-            storage.recordLong(nonHeapMax, NON_HEAP_ATTRS);
-          }
-          for (MemoryPoolMXBean pool : pools) {
-            long max = pool.getUsage().getMax();
-            if (max != -1) {
-              storage.recordLong(max, poolAttributes(pool));
+    /** Explicit bucket advice for jvm.gc.duration in seconds (matches OTel runtime-telemetry). */
+    private static final List<Double> GC_DURATION_BUCKETS = Arrays.asList(0.01, 0.1, 1.0, 10.0);
+
+    private static final String GC_NOTIFICATION_TYPE = "com.sun.management.gc.notification";
+
+    private static final AtomicBoolean started = new AtomicBoolean(false);
+
+    /**
+     * Registers all JVM runtime metric instruments on the bootstrap-level metric registry.
+     *
+     * @param emitExperimentalMetrics when {@code true} (the spec-aligned default), metrics marked as
+     *     <em>Development</em> in the OTel semantic conventions are also registered. When {@code
+     *     false}, only metrics with stable status are emitted.
+     */
+    public static void start(boolean emitExperimentalMetrics) {
+        if (!started.compareAndSet(false, true)) {
+            return;
+        }
+
+        try {
+            // Ensure OtelMetricStorage can serialize io.opentelemetry.api Attributes recorded below;
+            // the otel-shim registers an equivalent reader on its own class-loader, but agent-jmxfetch
+            // does not depend on the shim — so we register one here for our Attributes class-loader.
+            OtelMetricStorage.registerAttributeReader(
+                    Attributes.class.getClassLoader(),
+                    (attributes, visitor) -> ((Attributes) attributes)
+                            .forEach(
+                                    (a, v) -> visitor.visitAttribute(a.getType().ordinal(), a.getKey(), v)));
+
+            // Stable metrics — always registered.
+            registerMemoryMetrics();
+            registerThreadMetrics();
+            registerClassLoadingMetrics();
+            registerCpuMetrics();
+            registerGcDurationMetric(emitExperimentalMetrics);
+
+            // Development-status metrics — gated by the experimental flag.
+            if (emitExperimentalMetrics) {
+                registerMemoryInitMetric();
+                registerBufferMetrics();
+                registerSystemCpuMetrics();
+                registerFileDescriptorMetrics();
             }
-          }
-        });
+            log.debug(
+                    "Started OTLP runtime metrics with OTel-native naming (jvm.*), experimental={}",
+                    emitExperimentalMetrics);
+        } catch (Exception e) {
+            log.error("Failed to start JVM OTLP runtime metrics", e);
+        }
+    }
 
-    registerLongObservable(
-        "jvm.memory.used_after_last_gc",
-        "Measure of memory used after the most recent garbage collection event.",
-        "By",
-        UP_DOWN_COUNTER,
-        storage -> {
-          for (MemoryPoolMXBean pool : pools) {
-            MemoryUsage collectionUsage = pool.getCollectionUsage();
-            if (collectionUsage != null && collectionUsage.getUsed() >= 0) {
-              storage.recordLong(collectionUsage.getUsed(), poolAttributes(pool));
-            }
-          }
-        });
-  }
-
-  /** jvm.memory.init (UpDownCounter, Development). */
-  private static void registerMemoryInitMetric() {
-    MemoryMXBean memoryBean = ManagementFactory.getMemoryMXBean();
-    List<MemoryPoolMXBean> pools = ManagementFactory.getMemoryPoolMXBeans();
-    registerLongObservable(
-        "jvm.memory.init",
-        "Measure of initial memory requested.",
-        "By",
-        UP_DOWN_COUNTER,
-        storage -> {
-          long heapInit = memoryBean.getHeapMemoryUsage().getInit();
-          if (heapInit != -1) {
-            storage.recordLong(heapInit, HEAP_ATTRS);
-          }
-          long nonHeapInit = memoryBean.getNonHeapMemoryUsage().getInit();
-          if (nonHeapInit != -1) {
-            storage.recordLong(nonHeapInit, NON_HEAP_ATTRS);
-          }
-          for (MemoryPoolMXBean pool : pools) {
-            long init = pool.getUsage().getInit();
-            if (init != -1) {
-              storage.recordLong(init, poolAttributes(pool));
+    /**
+     * jvm.memory.used, jvm.memory.committed, jvm.memory.limit, jvm.memory.used_after_last_gc — all
+     * Stable per spec. All UpDownCounter.
+     */
+    private static void registerMemoryMetrics() {
+        MemoryMXBean memoryBean = ManagementFactory.getMemoryMXBean();
+        List<MemoryPoolMXBean> pools = ManagementFactory.getMemoryPoolMXBeans();
+
+        registerLongObservable("jvm.memory.used", "Measure of memory used.", "By", UP_DOWN_COUNTER, storage -> {
+            storage.recordLong(memoryBean.getHeapMemoryUsage().getUsed(), HEAP_ATTRS);
+            storage.recordLong(memoryBean.getNonHeapMemoryUsage().getUsed(), NON_HEAP_ATTRS);
+            for (MemoryPoolMXBean pool : pools) {
+                storage.recordLong(pool.getUsage().getUsed(), poolAttributes(pool));
             }
-          }
         });
-  }
-
-  /** jvm.buffer.* (UpDownCounter, Development) — direct + mapped pool metrics. */
-  private static void registerBufferMetrics() {
-    List<BufferPoolMXBean> bufferPools =
-        ManagementFactory.getPlatformMXBeans(BufferPoolMXBean.class);
-    bufferPoolMetric(
-        "jvm.buffer.memory.used",
-        "Measure of memory used by buffers.",
-        "By",
-        bufferPools,
-        BufferPoolMXBean::getMemoryUsed);
-    bufferPoolMetric(
-        "jvm.buffer.memory.limit",
-        "Measure of total memory capacity of buffers.",
-        "By",
-        bufferPools,
-        BufferPoolMXBean::getTotalCapacity);
-    bufferPoolMetric(
-        "jvm.buffer.count",
-        "Number of buffers in the pool.",
-        "{buffer}",
-        bufferPools,
-        BufferPoolMXBean::getCount);
-  }
-
-  /**
-   * jvm.thread.count (UpDownCounter, Stable). Bucketed by {@code jvm.thread.daemon} and {@code
-   * jvm.thread.state} per the OTel JVM semantic conventions.
-   */
-  private static void registerThreadMetrics() {
-    registerLongObservable(
-        "jvm.thread.count",
-        "Number of executing platform threads.",
-        "{thread}",
-        UP_DOWN_COUNTER,
-        THREAD_COUNT_COLLECTOR);
-  }
-
-  /**
-   * Java 9+ path. Enumerates threads via {@link ThreadMXBean#getThreadInfo(long[])}; the single-arg
-   * overload omits stack-trace capture, avoiding the safepoint and per-frame allocation incurred by
-   * {@link Thread#getAllStackTraces()}.
-   */
-  private static void collectThreadCountsViaThreadMXBean(OtelMetricStorage storage) {
-    Map<Thread.State, long[]> daemonCounts = new EnumMap<>(Thread.State.class);
-    Map<Thread.State, long[]> nonDaemonCounts = new EnumMap<>(Thread.State.class);
-    long[] ids = THREAD_BEAN.getAllThreadIds();
-    for (ThreadInfo info : THREAD_BEAN.getThreadInfo(ids)) {
-      if (info == null) {
-        continue; // thread terminated between getAllThreadIds and getThreadInfo
-      }
-      Map<Thread.State, long[]> bucket = threadInfoIsDaemon(info) ? daemonCounts : nonDaemonCounts;
-      bucket.computeIfAbsent(info.getThreadState(), k -> new long[1])[0]++;
+
+        registerLongObservable(
+                "jvm.memory.committed", "Measure of memory committed.", "By", UP_DOWN_COUNTER, storage -> {
+                    storage.recordLong(memoryBean.getHeapMemoryUsage().getCommitted(), HEAP_ATTRS);
+                    storage.recordLong(memoryBean.getNonHeapMemoryUsage().getCommitted(), NON_HEAP_ATTRS);
+                    for (MemoryPoolMXBean pool : pools) {
+                        storage.recordLong(pool.getUsage().getCommitted(), poolAttributes(pool));
+                    }
+                });
+
+        registerLongObservable(
+                "jvm.memory.limit", "Measure of max obtainable memory.", "By", UP_DOWN_COUNTER, storage -> {
+                    long heapMax = memoryBean.getHeapMemoryUsage().getMax();
+                    if (heapMax != -1) {
+                        storage.recordLong(heapMax, HEAP_ATTRS);
+                    }
+                    long nonHeapMax = memoryBean.getNonHeapMemoryUsage().getMax();
+                    if (nonHeapMax != -1) {
+                        storage.recordLong(nonHeapMax, NON_HEAP_ATTRS);
+                    }
+                    for (MemoryPoolMXBean pool : pools) {
+                        long max = pool.getUsage().getMax();
+                        if (max != -1) {
+                            storage.recordLong(max, poolAttributes(pool));
+                        }
+                    }
+                });
+
+        registerLongObservable(
+                "jvm.memory.used_after_last_gc",
+                "Measure of memory used after the most recent garbage collection event.",
+                "By",
+                UP_DOWN_COUNTER,
+                storage -> {
+                    for (MemoryPoolMXBean pool : pools) {
+                        MemoryUsage collectionUsage = pool.getCollectionUsage();
+                        if (collectionUsage != null && collectionUsage.getUsed() >= 0) {
+                            storage.recordLong(collectionUsage.getUsed(), poolAttributes(pool));
+                        }
+                    }
+                });
+    }
+
+    /** jvm.memory.init (UpDownCounter, Development). */
+    private static void registerMemoryInitMetric() {
+        MemoryMXBean memoryBean = ManagementFactory.getMemoryMXBean();
+        List<MemoryPoolMXBean> pools = ManagementFactory.getMemoryPoolMXBeans();
+        registerLongObservable(
+                "jvm.memory.init", "Measure of initial memory requested.", "By", UP_DOWN_COUNTER, storage -> {
+                    long heapInit = memoryBean.getHeapMemoryUsage().getInit();
+                    if (heapInit != -1) {
+                        storage.recordLong(heapInit, HEAP_ATTRS);
+                    }
+                    long nonHeapInit = memoryBean.getNonHeapMemoryUsage().getInit();
+                    if (nonHeapInit != -1) {
+                        storage.recordLong(nonHeapInit, NON_HEAP_ATTRS);
+                    }
+                    for (MemoryPoolMXBean pool : pools) {
+                        long init = pool.getUsage().getInit();
+                        if (init != -1) {
+                            storage.recordLong(init, poolAttributes(pool));
+                        }
+                    }
+                });
     }
-    recordThreadStateCounts(storage, daemonCounts, DAEMON_THREAD_STATE_ATTRS);
-    recordThreadStateCounts(storage, nonDaemonCounts, NON_DAEMON_THREAD_STATE_ATTRS);
-  }
-
-  /**
-   * Java 8 / GraalVM fallback. Walks the root {@link ThreadGroup} because {@code
-   * ThreadInfo.isDaemon()} was added in Java 9 and {@link ThreadMXBean} is not supported on GraalVM
-   * native images.
-   */
-  private static void collectThreadCountsViaThreadGroup(OtelMetricStorage storage) {
-    Map<Thread.State, long[]> daemonCounts = new EnumMap<>(Thread.State.class);
-    Map<Thread.State, long[]> nonDaemonCounts = new EnumMap<>(Thread.State.class);
-    for (Thread thread : enumerateAllThreads()) {
-      Map<Thread.State, long[]> bucket = thread.isDaemon() ? daemonCounts : nonDaemonCounts;
-      bucket.computeIfAbsent(thread.getState(), k -> new long[1])[0]++;
+
+    /** jvm.buffer.* (UpDownCounter, Development) — direct + mapped pool metrics. */
+    private static void registerBufferMetrics() {
+        List<BufferPoolMXBean> bufferPools = ManagementFactory.getPlatformMXBeans(BufferPoolMXBean.class);
+        bufferPoolMetric(
+                "jvm.buffer.memory.used",
+                "Measure of memory used by buffers.",
+                "By",
+                bufferPools,
+                BufferPoolMXBean::getMemoryUsed);
+        bufferPoolMetric(
+                "jvm.buffer.memory.limit",
+                "Measure of total memory capacity of buffers.",
+                "By",
+                bufferPools,
+                BufferPoolMXBean::getTotalCapacity);
+        bufferPoolMetric(
+                "jvm.buffer.count",
+                "Number of buffers in the pool.",
+                "{buffer}",
+                bufferPools,
+                BufferPoolMXBean::getCount);
     }
-    recordThreadStateCounts(storage, daemonCounts, DAEMON_THREAD_STATE_ATTRS);
-    recordThreadStateCounts(storage, nonDaemonCounts, NON_DAEMON_THREAD_STATE_ATTRS);
-  }
-
-  /** Invokes {@code ThreadInfo#isDaemon()} via {@link #THREAD_INFO_IS_DAEMON} (Java 9+ only). */
-  private static boolean threadInfoIsDaemon(ThreadInfo info) {
-    try {
-      return (boolean) THREAD_INFO_IS_DAEMON.invoke(info);
-    } catch (Throwable t) {
-      throw new IllegalStateException("Unexpected error invoking ThreadInfo#isDaemon()", t);
+
+    /**
+     * jvm.thread.count (UpDownCounter, Stable). Bucketed by {@code jvm.thread.daemon} and {@code
+     * jvm.thread.state} per the OTel JVM semantic conventions.
+     */
+    private static void registerThreadMetrics() {
+        registerLongObservable(
+                "jvm.thread.count",
+                "Number of executing platform threads.",
+                "{thread}",
+                UP_DOWN_COUNTER,
+                THREAD_COUNT_COLLECTOR);
     }
-  }
-
-  /**
-   * Walks the root {@link ThreadGroup} and returns a snapshot of active threads. Allocates a
-   * slightly oversized buffer to absorb threads created between {@code activeCount()} and {@code
-   * enumerate()}; if the buffer is still too small the returned array may be truncated.
-   */
-  private static Thread[] enumerateAllThreads() {
-    ThreadGroup group = Thread.currentThread().getThreadGroup();
-    // ThreadGroup.enumerate() recursively descends through children by default, so enumerating from
-    // the root gives every live thread in the JVM.
-    while (group.getParent() != null) {
-      group = group.getParent();
+
+    /**
+     * Java 9+ path. Enumerates threads via {@link ThreadMXBean#getThreadInfo(long[])}; the single-arg
+     * overload omits stack-trace capture, avoiding the safepoint and per-frame allocation incurred by
+     * {@link Thread#getAllStackTraces()}.
+     */
+    private static void collectThreadCountsViaThreadMXBean(OtelMetricStorage storage) {
+        Map<Thread.State, long[]> daemonCounts = new EnumMap<>(Thread.State.class);
+        Map<Thread.State, long[]> nonDaemonCounts = new EnumMap<>(Thread.State.class);
+        long[] ids = THREAD_BEAN.getAllThreadIds();
+        for (ThreadInfo info : THREAD_BEAN.getThreadInfo(ids)) {
+            if (info == null) {
+                continue; // thread terminated between getAllThreadIds and getThreadInfo
+            }
+            Map<Thread.State, long[]> bucket = threadInfoIsDaemon(info) ? daemonCounts : nonDaemonCounts;
+            bucket.computeIfAbsent(info.getThreadState(), k -> new long[1])[0]++;
+        }
+        recordThreadStateCounts(storage, daemonCounts, DAEMON_THREAD_STATE_ATTRS);
+        recordThreadStateCounts(storage, nonDaemonCounts, NON_DAEMON_THREAD_STATE_ATTRS);
     }
-    Thread[] buffer = new Thread[group.activeCount() + 10];
-    int n = group.enumerate(buffer);
-    if (n == buffer.length) {
-      return buffer;
+
+    /**
+     * Java 8 / GraalVM fallback. Walks the root {@link ThreadGroup} because {@code
+     * ThreadInfo.isDaemon()} was added in Java 9 and {@link ThreadMXBean} is not supported on GraalVM
+     * native images.
+     */
+    private static void collectThreadCountsViaThreadGroup(OtelMetricStorage storage) {
+        Map<Thread.State, long[]> daemonCounts = new EnumMap<>(Thread.State.class);
+        Map<Thread.State, long[]> nonDaemonCounts = new EnumMap<>(Thread.State.class);
+        for (Thread thread : enumerateAllThreads()) {
+            Map<Thread.State, long[]> bucket = thread.isDaemon() ? daemonCounts : nonDaemonCounts;
+            bucket.computeIfAbsent(thread.getState(), k -> new long[1])[0]++;
+        }
+        recordThreadStateCounts(storage, daemonCounts, DAEMON_THREAD_STATE_ATTRS);
+        recordThreadStateCounts(storage, nonDaemonCounts, NON_DAEMON_THREAD_STATE_ATTRS);
     }
-    Thread[] trimmed = new Thread[n];
-    System.arraycopy(buffer, 0, trimmed, 0, n);
-    return trimmed;
-  }
-
-  private static void recordThreadStateCounts(
-      OtelMetricStorage storage, Map<Thread.State, long[]> counts, Attributes[] attrsByState) {
-    for (Map.Entry<Thread.State, long[]> entry : counts.entrySet()) {
-      storage.recordLong(entry.getValue()[0], attrsByState[entry.getKey().ordinal()]);
+
+    /** Invokes {@code ThreadInfo#isDaemon()} via {@link #THREAD_INFO_IS_DAEMON} (Java 9+ only). */
+    private static boolean threadInfoIsDaemon(ThreadInfo info) {
+        try {
+            return (boolean) THREAD_INFO_IS_DAEMON.invoke(info);
+        } catch (Throwable t) {
+            throw new IllegalStateException("Unexpected error invoking ThreadInfo#isDaemon()", t);
+        }
     }
-  }
-
-  /**
-   * jvm.class.loaded (Counter), jvm.class.unloaded (Counter), jvm.class.count (UpDownCounter) — all
-   * Stable per spec.
-   */
-  private static void registerClassLoadingMetrics() {
-    ClassLoadingMXBean classLoadingBean = ManagementFactory.getClassLoadingMXBean();
-    registerLongObservable(
-        "jvm.class.loaded",
-        "Number of classes loaded since JVM start.",
-        "{class}",
-        COUNTER,
-        storage ->
-            storage.recordLong(classLoadingBean.getTotalLoadedClassCount(), Attributes.empty()));
-
-    registerLongObservable(
-        "jvm.class.count",
-        "Number of classes currently loaded.",
-        "{class}",
-        UP_DOWN_COUNTER,
-        storage -> storage.recordLong(classLoadingBean.getLoadedClassCount(), Attributes.empty()));
-
-    registerLongObservable(
-        "jvm.class.unloaded",
-        "Number of classes unloaded since JVM start.",
-        "{class}",
-        COUNTER,
-        storage ->
-            storage.recordLong(classLoadingBean.getUnloadedClassCount(), Attributes.empty()));
-  }
-
-  /**
-   * jvm.cpu.time (Counter), jvm.cpu.count (UpDownCounter), jvm.cpu.recent_utilization (Gauge) — all
-   * Stable per spec.
-   */
-  private static void registerCpuMetrics() {
-    java.lang.management.OperatingSystemMXBean rawOsBean =
-        ManagementFactory.getOperatingSystemMXBean();
-    if (rawOsBean instanceof OperatingSystemMXBean) {
-      OperatingSystemMXBean sunOsBean = (OperatingSystemMXBean) rawOsBean;
-      registerDoubleObservable(
-          "jvm.cpu.time",
-          "CPU time used by the process as reported by the JVM.",
-          "s",
-          COUNTER,
-          storage -> {
-            long nanos = sunOsBean.getProcessCpuTime();
-            if (nanos >= 0) {
-              storage.recordDouble(nanos / 1e9, Attributes.empty());
-            }
-          });
-
-      registerDoubleObservable(
-          "jvm.cpu.recent_utilization",
-          "Recent CPU utilization for the process as reported by the JVM.",
-          "1",
-          GAUGE,
-          storage -> {
-            double cpuLoad = sunOsBean.getProcessCpuLoad();
-            if (cpuLoad >= 0) {
-              storage.recordDouble(cpuLoad, Attributes.empty());
-            }
-          });
-    } else {
-      log.debug(
-          "com.sun.management.OperatingSystemMXBean not available; skipping jvm.cpu.time and jvm.cpu.recent_utilization");
+
+    /**
+     * Walks the root {@link ThreadGroup} and returns a snapshot of active threads. Allocates a
+     * slightly oversized buffer to absorb threads created between {@code activeCount()} and {@code
+     * enumerate()}; if the buffer is still too small the returned array may be truncated.
+     */
+    private static Thread[] enumerateAllThreads() {
+        ThreadGroup group = Thread.currentThread().getThreadGroup();
+        // ThreadGroup.enumerate() recursively descends through children by default, so enumerating from
+        // the root gives every live thread in the JVM.
+        while (group.getParent() != null) {
+            group = group.getParent();
+        }
+        Thread[] buffer = new Thread[group.activeCount() + 10];
+        int n = group.enumerate(buffer);
+        if (n == buffer.length) {
+            return buffer;
+        }
+        Thread[] trimmed = new Thread[n];
+        System.arraycopy(buffer, 0, trimmed, 0, n);
+        return trimmed;
+    }
+
+    private static void recordThreadStateCounts(
+            OtelMetricStorage storage, Map<Thread.State, long[]> counts, Attributes[] attrsByState) {
+        for (Map.Entry<Thread.State, long[]> entry : counts.entrySet()) {
+            storage.recordLong(entry.getValue()[0], attrsByState[entry.getKey().ordinal()]);
+        }
     }
 
-    registerLongObservable(
-        "jvm.cpu.count",
-        "Number of processors available to the JVM.",
-        "{cpu}",
-        UP_DOWN_COUNTER,
-        storage ->
-            storage.recordLong(Runtime.getRuntime().availableProcessors(), Attributes.empty()));
-  }
-
-  /**
-   * jvm.gc.duration (Histogram, Stable) — synchronous; recorded from a JMX notification listener
-   * attached to each {@link GarbageCollectorMXBean} when the JVM completes a GC.
-   *
-   * <p>The {@code jvm.gc.cause} attribute is gated on {@code captureGcCause} because cause is not
-   * part of the stable attribute set in the OTel semantic conventions.
-   */
-  private static void registerGcDurationMetric(boolean captureGcCause) {
-    if (!isGcNotificationInfoAvailable()) {
-      log.debug(
-          "com.sun.management.GarbageCollectionNotificationInfo not available; skipping jvm.gc.duration");
-      return;
+    /**
+     * jvm.class.loaded (Counter), jvm.class.unloaded (Counter), jvm.class.count (UpDownCounter) — all
+     * Stable per spec.
+     */
+    private static void registerClassLoadingMetrics() {
+        ClassLoadingMXBean classLoadingBean = ManagementFactory.getClassLoadingMXBean();
+        registerLongObservable(
+                "jvm.class.loaded",
+                "Number of classes loaded since JVM start.",
+                "{class}",
+                COUNTER,
+                storage -> storage.recordLong(classLoadingBean.getTotalLoadedClassCount(), Attributes.empty()));
+
+        registerLongObservable(
+                "jvm.class.count",
+                "Number of classes currently loaded.",
+                "{class}",
+                UP_DOWN_COUNTER,
+                storage -> storage.recordLong(classLoadingBean.getLoadedClassCount(), Attributes.empty()));
+
+        registerLongObservable(
+                "jvm.class.unloaded",
+                "Number of classes unloaded since JVM start.",
+                "{class}",
+                COUNTER,
+                storage -> storage.recordLong(classLoadingBean.getUnloadedClassCount(), Attributes.empty()));
     }
-    OtelMetricStorage storage =
-        registerDoubleHistogramStorage(
-            "jvm.gc.duration",
-            "Duration of JVM garbage collection actions.",
-            "s",
-            GC_DURATION_BUCKETS);
-    NotificationFilter filter = n -> GC_NOTIFICATION_TYPE.equals(n.getType());
-    GcNotificationListener listener = new GcNotificationListener(storage, captureGcCause);
-    for (GarbageCollectorMXBean bean : ManagementFactory.getGarbageCollectorMXBeans()) {
-      if (bean instanceof NotificationEmitter) {
-        ((NotificationEmitter) bean).addNotificationListener(listener, filter, null);
-      }
+
+    /**
+     * jvm.cpu.time (Counter), jvm.cpu.count (UpDownCounter), jvm.cpu.recent_utilization (Gauge) — all
+     * Stable per spec.
+     */
+    private static void registerCpuMetrics() {
+        java.lang.management.OperatingSystemMXBean rawOsBean = ManagementFactory.getOperatingSystemMXBean();
+        if (rawOsBean instanceof OperatingSystemMXBean) {
+            OperatingSystemMXBean sunOsBean = (OperatingSystemMXBean) rawOsBean;
+            registerDoubleObservable(
+                    "jvm.cpu.time", "CPU time used by the process as reported by the JVM.", "s", COUNTER, storage -> {
+                        long nanos = sunOsBean.getProcessCpuTime();
+                        if (nanos >= 0) {
+                            storage.recordDouble(nanos / 1e9, Attributes.empty());
+                        }
+                    });
+
+            registerDoubleObservable(
+                    "jvm.cpu.recent_utilization",
+                    "Recent CPU utilization for the process as reported by the JVM.",
+                    "1",
+                    GAUGE,
+                    storage -> {
+                        double cpuLoad = sunOsBean.getProcessCpuLoad();
+                        if (cpuLoad >= 0) {
+                            storage.recordDouble(cpuLoad, Attributes.empty());
+                        }
+                    });
+        } else {
+            log.debug(
+                    "com.sun.management.OperatingSystemMXBean not available; skipping jvm.cpu.time and jvm.cpu.recent_utilization");
+        }
+
+        registerLongObservable(
+                "jvm.cpu.count",
+                "Number of processors available to the JVM.",
+                "{cpu}",
+                UP_DOWN_COUNTER,
+                storage -> storage.recordLong(Runtime.getRuntime().availableProcessors(), Attributes.empty()));
     }
-  }
-
-  private static boolean isGcNotificationInfoAvailable() {
-    try {
-      Class.forName(
-          "com.sun.management.GarbageCollectionNotificationInfo",
-          false,
-          GarbageCollectorMXBean.class.getClassLoader());
-      return true;
-    } catch (Exception e) {
-      return false;
+
+    /**
+     * jvm.gc.duration (Histogram, Stable) — synchronous; recorded from a JMX notification listener
+     * attached to each {@link GarbageCollectorMXBean} when the JVM completes a GC.
+     *
+     * <p>The {@code jvm.gc.cause} attribute is gated on {@code captureGcCause} because cause is not
+     * part of the stable attribute set in the OTel semantic conventions.
+     */
+    private static void registerGcDurationMetric(boolean captureGcCause) {
+        if (!isGcNotificationInfoAvailable()) {
+            log.debug("com.sun.management.GarbageCollectionNotificationInfo not available; skipping jvm.gc.duration");
+            return;
+        }
+        OtelMetricStorage storage = registerDoubleHistogramStorage(
+                "jvm.gc.duration", "Duration of JVM garbage collection actions.", "s", GC_DURATION_BUCKETS);
+        NotificationFilter filter = n -> GC_NOTIFICATION_TYPE.equals(n.getType());
+        GcNotificationListener listener = new GcNotificationListener(storage, captureGcCause);
+        for (GarbageCollectorMXBean bean : ManagementFactory.getGarbageCollectorMXBeans()) {
+            if (bean instanceof NotificationEmitter) {
+                ((NotificationEmitter) bean).addNotificationListener(listener, filter, null);
+            }
+        }
     }
-  }
-
-  private static void recordGcDuration(
-      OtelMetricStorage storage, GarbageCollectionNotificationInfo info, boolean captureGcCause) {
-    double durationSeconds = info.getGcInfo().getDuration() / 1000d;
-    Attributes attrs =
-        captureGcCause
-            ? Attributes.of(
-                GC_NAME, info.getGcName(),
-                GC_ACTION, info.getGcAction(),
-                GC_CAUSE, info.getGcCause())
-            : Attributes.of(
-                GC_NAME, info.getGcName(),
-                GC_ACTION, info.getGcAction());
-    storage.recordDouble(durationSeconds, attrs);
-  }
-
-  /** Listener fired by the JVM on the JMX notification thread when a GC completes. */
-  static final class GcNotificationListener implements NotificationListener {
-    private final OtelMetricStorage storage;
-    private final boolean captureGcCause;
-
-    GcNotificationListener(OtelMetricStorage storage, boolean captureGcCause) {
-      this.storage = storage;
-      this.captureGcCause = captureGcCause;
+
+    private static boolean isGcNotificationInfoAvailable() {
+        try {
+            Class.forName(
+                    "com.sun.management.GarbageCollectionNotificationInfo",
+                    false,
+                    GarbageCollectorMXBean.class.getClassLoader());
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
     }
 
-    @Override
-    public void handleNotification(Notification notification, Object handback) {
-      GarbageCollectionNotificationInfo info =
-          GarbageCollectionNotificationInfo.from((CompositeData) notification.getUserData());
-      if (info == null) {
-        log.debug("Skipping jvm.gc.duration record: GC notification carried no info payload");
-        return;
-      }
-      recordGcDuration(storage, info, captureGcCause);
+    private static void recordGcDuration(
+            OtelMetricStorage storage, GarbageCollectionNotificationInfo info, boolean captureGcCause) {
+        double durationSeconds = info.getGcInfo().getDuration() / 1000d;
+        Attributes attrs = captureGcCause
+                ? Attributes.of(
+                        GC_NAME, info.getGcName(),
+                        GC_ACTION, info.getGcAction(),
+                        GC_CAUSE, info.getGcCause())
+                : Attributes.of(
+                        GC_NAME, info.getGcName(),
+                        GC_ACTION, info.getGcAction());
+        storage.recordDouble(durationSeconds, attrs);
     }
-  }
-
-  /**
-   * jvm.system.cpu.utilization (Gauge) and jvm.system.cpu.load_1m (Gauge) — both Development per
-   * spec.
-   */
-  private static void registerSystemCpuMetrics() {
-    java.lang.management.OperatingSystemMXBean rawOsBean =
-        ManagementFactory.getOperatingSystemMXBean();
-    if (rawOsBean instanceof OperatingSystemMXBean) {
-      OperatingSystemMXBean sunOsBean = (OperatingSystemMXBean) rawOsBean;
-      registerDoubleObservable(
-          "jvm.system.cpu.utilization",
-          "Recent CPU utilization for the whole system as reported by the JVM.",
-          "1",
-          GAUGE,
-          storage -> {
-            double load = sunOsBean.getSystemCpuLoad();
-            if (load >= 0) {
-              storage.recordDouble(load, Attributes.empty());
+
+    /** Listener fired by the JVM on the JMX notification thread when a GC completes. */
+    static final class GcNotificationListener implements NotificationListener {
+        private final OtelMetricStorage storage;
+        private final boolean captureGcCause;
+
+        GcNotificationListener(OtelMetricStorage storage, boolean captureGcCause) {
+            this.storage = storage;
+            this.captureGcCause = captureGcCause;
+        }
+
+        @Override
+        public void handleNotification(Notification notification, Object handback) {
+            GarbageCollectionNotificationInfo info =
+                    GarbageCollectionNotificationInfo.from((CompositeData) notification.getUserData());
+            if (info == null) {
+                log.debug("Skipping jvm.gc.duration record: GC notification carried no info payload");
+                return;
             }
-          });
-    } else {
-      log.debug(
-          "com.sun.management.OperatingSystemMXBean not available; skipping jvm.system.cpu.utilization");
+            recordGcDuration(storage, info, captureGcCause);
+        }
     }
 
-    registerDoubleObservable(
-        "jvm.system.cpu.load_1m",
-        "Average CPU load of the whole system for the last minute as reported by the JVM.",
-        "{run_queue_item}",
-        GAUGE,
-        storage -> {
-          double load = rawOsBean.getSystemLoadAverage();
-          if (load >= 0) {
-            storage.recordDouble(load, Attributes.empty());
-          }
-        });
-  }
-
-  /**
-   * jvm.file_descriptor.count (UpDownCounter) and jvm.file_descriptor.limit (UpDownCounter) — both
-   * Development per spec. Only registered when the underlying JVM exposes {@link
-   * UnixOperatingSystemMXBean} (Unix-like platforms).
-   */
-  private static void registerFileDescriptorMetrics() {
-    java.lang.management.OperatingSystemMXBean rawOsBean =
-        ManagementFactory.getOperatingSystemMXBean();
-    if (!(rawOsBean instanceof UnixOperatingSystemMXBean)) {
-      log.debug(
-          "com.sun.management.UnixOperatingSystemMXBean not available (non-Unix JVM); skipping jvm.file_descriptor.count and jvm.file_descriptor.limit");
-      return;
+    /**
+     * jvm.system.cpu.utilization (Gauge) and jvm.system.cpu.load_1m (Gauge) — both Development per
+     * spec.
+     */
+    private static void registerSystemCpuMetrics() {
+        java.lang.management.OperatingSystemMXBean rawOsBean = ManagementFactory.getOperatingSystemMXBean();
+        if (rawOsBean instanceof OperatingSystemMXBean) {
+            OperatingSystemMXBean sunOsBean = (OperatingSystemMXBean) rawOsBean;
+            registerDoubleObservable(
+                    "jvm.system.cpu.utilization",
+                    "Recent CPU utilization for the whole system as reported by the JVM.",
+                    "1",
+                    GAUGE,
+                    storage -> {
+                        double load = sunOsBean.getSystemCpuLoad();
+                        if (load >= 0) {
+                            storage.recordDouble(load, Attributes.empty());
+                        }
+                    });
+        } else {
+            log.debug("com.sun.management.OperatingSystemMXBean not available; skipping jvm.system.cpu.utilization");
+        }
+
+        registerDoubleObservable(
+                "jvm.system.cpu.load_1m",
+                "Average CPU load of the whole system for the last minute as reported by the JVM.",
+                "{run_queue_item}",
+                GAUGE,
+                storage -> {
+                    double load = rawOsBean.getSystemLoadAverage();
+                    if (load >= 0) {
+                        storage.recordDouble(load, Attributes.empty());
+                    }
+                });
     }
-    UnixOperatingSystemMXBean unixOsBean = (UnixOperatingSystemMXBean) rawOsBean;
-
-    registerLongObservable(
-        "jvm.file_descriptor.count",
-        "Number of open file descriptors as reported by the JVM.",
-        "{file_descriptor}",
-        UP_DOWN_COUNTER,
-        storage -> {
-          long count = unixOsBean.getOpenFileDescriptorCount();
-          if (count >= 0) {
-            storage.recordLong(count, Attributes.empty());
-          }
-        });
 
-    registerLongObservable(
-        "jvm.file_descriptor.limit",
-        "Measure of max open file descriptors as reported by the JVM.",
-        "{file_descriptor}",
-        UP_DOWN_COUNTER,
-        storage -> {
-          long limit = unixOsBean.getMaxFileDescriptorCount();
-          if (limit >= 0) {
-            storage.recordLong(limit, Attributes.empty());
-          }
-        });
-  }
-
-  /**
-   * Registers an UpDownCounter that iterates each platform buffer pool and records {@code getter}
-   * with the {@code jvm.buffer.pool.name} attribute. Skips negative readings.
-   */
-  private static void bufferPoolMetric(
-      String name,
-      String description,
-      String unit,
-      List<BufferPoolMXBean> bufferPools,
-      ToLongFunction<BufferPoolMXBean> getter) {
-    registerLongObservable(
-        name,
-        description,
-        unit,
-        UP_DOWN_COUNTER,
-        storage -> {
-          for (BufferPoolMXBean pool : bufferPools) {
-            long value = getter.applyAsLong(pool);
-            if (value >= 0) {
-              storage.recordLong(value, Attributes.of(BUFFER_POOL, pool.getName()));
+    /**
+     * jvm.file_descriptor.count (UpDownCounter) and jvm.file_descriptor.limit (UpDownCounter) — both
+     * Development per spec. Only registered when the underlying JVM exposes {@link
+     * UnixOperatingSystemMXBean} (Unix-like platforms).
+     */
+    private static void registerFileDescriptorMetrics() {
+        java.lang.management.OperatingSystemMXBean rawOsBean = ManagementFactory.getOperatingSystemMXBean();
+        if (!(rawOsBean instanceof UnixOperatingSystemMXBean)) {
+            log.debug(
+                    "com.sun.management.UnixOperatingSystemMXBean not available (non-Unix JVM); skipping jvm.file_descriptor.count and jvm.file_descriptor.limit");
+            return;
+        }
+        UnixOperatingSystemMXBean unixOsBean = (UnixOperatingSystemMXBean) rawOsBean;
+
+        registerLongObservable(
+                "jvm.file_descriptor.count",
+                "Number of open file descriptors as reported by the JVM.",
+                "{file_descriptor}",
+                UP_DOWN_COUNTER,
+                storage -> {
+                    long count = unixOsBean.getOpenFileDescriptorCount();
+                    if (count >= 0) {
+                        storage.recordLong(count, Attributes.empty());
+                    }
+                });
+
+        registerLongObservable(
+                "jvm.file_descriptor.limit",
+                "Measure of max open file descriptors as reported by the JVM.",
+                "{file_descriptor}",
+                UP_DOWN_COUNTER,
+                storage -> {
+                    long limit = unixOsBean.getMaxFileDescriptorCount();
+                    if (limit >= 0) {
+                        storage.recordLong(limit, Attributes.empty());
+                    }
+                });
+    }
+
+    /**
+     * Registers an UpDownCounter that iterates each platform buffer pool and records {@code getter}
+     * with the {@code jvm.buffer.pool.name} attribute. Skips negative readings.
+     */
+    private static void bufferPoolMetric(
+            String name,
+            String description,
+            String unit,
+            List<BufferPoolMXBean> bufferPools,
+            ToLongFunction<BufferPoolMXBean> getter) {
+        registerLongObservable(name, description, unit, UP_DOWN_COUNTER, storage -> {
+            for (BufferPoolMXBean pool : bufferPools) {
+                long value = getter.applyAsLong(pool);
+                if (value >= 0) {
+                    storage.recordLong(value, Attributes.of(BUFFER_POOL, pool.getName()));
+                }
             }
-          }
         });
-  }
-
-  /** Registers a long observable instrument and its callback against the bootstrap registry. */
-  private static void registerLongObservable(
-      String name,
-      String description,
-      String unit,
-      OtelInstrumentType type,
-      Consumer<OtelMetricStorage> callback) {
-    registerObservable(OtelInstrumentBuilder.ofLongs(name, type), description, unit, callback);
-  }
-
-  /** Registers a double observable instrument and its callback against the bootstrap registry. */
-  private static void registerDoubleObservable(
-      String name,
-      String description,
-      String unit,
-      OtelInstrumentType type,
-      Consumer<OtelMetricStorage> callback) {
-    registerObservable(OtelInstrumentBuilder.ofDoubles(name, type), description, unit, callback);
-  }
-
-  /** Registers an observable instrument and its callback against the bootstrap registry. */
-  private static void registerObservable(
-      OtelInstrumentBuilder builder,
-      String description,
-      String unit,
-      Consumer<OtelMetricStorage> callback) {
-    builder.setDescription(description);
-    builder.setUnit(unit);
-    OtelMetricStorage storage = registerStorage(builder.observableDescriptor());
-    OtelMetricRegistry.INSTANCE.registerObservable(
-        JVM_SCOPE, new OtelRunnableObservable(() -> callback.accept(storage)));
-  }
-
-  /**
-   * Registers a synchronous double histogram against the bootstrap registry and returns its storage
-   * so callers can record values directly (e.g. from a JMX notification listener).
-   */
-  private static OtelMetricStorage registerDoubleHistogramStorage(
-      String name, String description, String unit, List<Double> bucketBoundaries) {
-    OtelInstrumentBuilder builder = OtelInstrumentBuilder.ofDoubles(name, HISTOGRAM);
-    builder.setDescription(description);
-    builder.setUnit(unit);
-    return OtelMetricRegistry.INSTANCE.registerStorage(
-        JVM_SCOPE,
-        builder.descriptor(),
-        descriptor -> OtelMetricStorage.newHistogramStorage(descriptor, bucketBoundaries));
-  }
-
-  /** Registers metric storage for the instrument against the bootstrap registry. */
-  private static OtelMetricStorage registerStorage(OtelInstrumentDescriptor descriptor) {
-    Function<OtelInstrumentDescriptor, OtelMetricStorage> storageFactory;
-    switch (descriptor.getType()) {
-      case OBSERVABLE_GAUGE:
-        // observable gauges always use last-value
-        storageFactory =
-            descriptor.hasLongValues()
-                ? OtelMetricStorage::newLongValueStorage
-                : OtelMetricStorage::newDoubleValueStorage;
-        break;
-      case OBSERVABLE_COUNTER:
-      case OBSERVABLE_UP_DOWN_COUNTER:
-        // observable counters use delta value since last reset
-        storageFactory =
-            descriptor.hasLongValues()
-                ? OtelMetricStorage::newLongDeltaStorage
-                : OtelMetricStorage::newDoubleDeltaStorage;
-        break;
-      default:
-        throw new IllegalStateException("Unexpected value: " + descriptor.getType());
     }
-    return OtelMetricRegistry.INSTANCE.registerStorage(JVM_SCOPE, descriptor, storageFactory);
-  }
 
-  /** Returns Attributes carrying jvm.memory.type and jvm.memory.pool.name for the given pool. */
-  private static Attributes poolAttributes(MemoryPoolMXBean pool) {
-    return Attributes.of(
-        MEMORY_TYPE, pool.getType().name().toLowerCase(Locale.ROOT),
-        MEMORY_POOL, pool.getName());
-  }
+    /** Registers a long observable instrument and its callback against the bootstrap registry. */
+    private static void registerLongObservable(
+            String name,
+            String description,
+            String unit,
+            OtelInstrumentType type,
+            Consumer<OtelMetricStorage> callback) {
+        registerObservable(OtelInstrumentBuilder.ofLongs(name, type), description, unit, callback);
+    }
+
+    /** Registers a double observable instrument and its callback against the bootstrap registry. */
+    private static void registerDoubleObservable(
+            String name,
+            String description,
+            String unit,
+            OtelInstrumentType type,
+            Consumer<OtelMetricStorage> callback) {
+        registerObservable(OtelInstrumentBuilder.ofDoubles(name, type), description, unit, callback);
+    }
+
+    /** Registers an observable instrument and its callback against the bootstrap registry. */
+    private static void registerObservable(
+            OtelInstrumentBuilder builder, String description, String unit, Consumer<OtelMetricStorage> callback) {
+        builder.setDescription(description);
+        builder.setUnit(unit);
+        OtelMetricStorage storage = registerStorage(builder.observableDescriptor());
+        OtelMetricRegistry.INSTANCE.registerObservable(
+                JVM_SCOPE, new OtelRunnableObservable(() -> callback.accept(storage)));
+    }
+
+    /**
+     * Registers a synchronous double histogram against the bootstrap registry and returns its storage
+     * so callers can record values directly (e.g. from a JMX notification listener).
+     */
+    private static OtelMetricStorage registerDoubleHistogramStorage(
+            String name, String description, String unit, List<Double> bucketBoundaries) {
+        OtelInstrumentBuilder builder = OtelInstrumentBuilder.ofDoubles(name, HISTOGRAM);
+        builder.setDescription(description);
+        builder.setUnit(unit);
+        return OtelMetricRegistry.INSTANCE.registerStorage(
+                JVM_SCOPE,
+                builder.descriptor(),
+                descriptor -> OtelMetricStorage.newHistogramStorage(descriptor, bucketBoundaries));
+    }
+
+    /** Registers metric storage for the instrument against the bootstrap registry. */
+    private static OtelMetricStorage registerStorage(OtelInstrumentDescriptor descriptor) {
+        Function<OtelInstrumentDescriptor, OtelMetricStorage> storageFactory;
+        switch (descriptor.getType()) {
+            case OBSERVABLE_GAUGE:
+                // observable gauges always use last-value
+                storageFactory = descriptor.hasLongValues()
+                        ? OtelMetricStorage::newLongValueStorage
+                        : OtelMetricStorage::newDoubleValueStorage;
+                break;
+            case OBSERVABLE_COUNTER:
+            case OBSERVABLE_UP_DOWN_COUNTER:
+                // observable counters use delta value since last reset
+                storageFactory = descriptor.hasLongValues()
+                        ? OtelMetricStorage::newLongDeltaStorage
+                        : OtelMetricStorage::newDoubleDeltaStorage;
+                break;
+            default:
+                throw new IllegalStateException("Unexpected value: " + descriptor.getType());
+        }
+        return OtelMetricRegistry.INSTANCE.registerStorage(JVM_SCOPE, descriptor, storageFactory);
+    }
+
+    /** Returns Attributes carrying jvm.memory.type and jvm.memory.pool.name for the given pool. */
+    private static Attributes poolAttributes(MemoryPoolMXBean pool) {
+        return Attributes.of(
+                MEMORY_TYPE, pool.getType().name().toLowerCase(Locale.ROOT),
+                MEMORY_POOL, pool.getName());
+    }
 
-  private JvmOtlpRuntimeMetrics() {}
+    private JvmOtlpRuntimeMetrics() {}
 }
diff --git a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/LegacyYaml.java b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/LegacyYaml.java
index 09a31edeeeb..b81bf88d6f6 100644
--- a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/LegacyYaml.java
+++ b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/LegacyYaml.java
@@ -8,11 +8,11 @@
  * it's never called because JMXFetch discovers the embedded snakeyaml-engine library and uses that.
  */
 public class LegacyYaml {
-  public <T> T load(InputStream in) {
-    throw new UnsupportedOperationException();
-  }
+    public <T> T load(InputStream in) {
+        throw new UnsupportedOperationException();
+    }
 
-  public String dump(Object data) {
-    throw new UnsupportedOperationException();
-  }
+    public String dump(Object data) {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/ServiceNameCollectingTraceInterceptor.java b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/ServiceNameCollectingTraceInterceptor.java
index 442bea4e332..00b3a5767ad 100644
--- a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/ServiceNameCollectingTraceInterceptor.java
+++ b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/ServiceNameCollectingTraceInterceptor.java
@@ -12,51 +12,46 @@
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import org.datadog.jmxfetch.service.ServiceNameProvider;
 
-public class ServiceNameCollectingTraceInterceptor extends AbstractTraceInterceptor
-    implements ServiceNameProvider {
-
-  public static final ServiceNameCollectingTraceInterceptor INSTANCE =
-      new ServiceNameCollectingTraceInterceptor(Priority.SERVICE_NAME_COLLECTING);
-
-  /*
-   * The other span types all set their own service names, so we ignore them. They should not have JVM
-   * runtime metrics applied to their service names.
-   */
-  private static final Set<String> VALID_ENTRY_SPAN_TYPES =
-      new HashSet<>(Arrays.asList(DDSpanTypes.HTTP_SERVER, DDSpanTypes.RPC, DDSpanTypes.SOAP));
-  private static final int SERVICE_NAME_LIMIT =
-      Config.get().getJmxFetchMultipleRuntimeServicesLimit();
-  private static final AtomicIntegerFieldUpdater<ServiceNameCollectingTraceInterceptor>
-      SERVICE_NAMES_SIZE_UPDATER =
-          AtomicIntegerFieldUpdater.newUpdater(
-              ServiceNameCollectingTraceInterceptor.class, "serviceNamesSize");
-
-  private volatile int serviceNamesSize = 0;
-  private final ConcurrentHashMap<String, Boolean> serviceNames = new ConcurrentHashMap<>();
-
-  protected ServiceNameCollectingTraceInterceptor(Priority priority) {
-    super(priority);
-  }
-
-  @Override
-  public Collection<? extends MutableSpan> onTraceComplete(
-      Collection<? extends MutableSpan> trace) {
-    if (!trace.isEmpty()) {
-      MutableSpan rootSpan = trace.iterator().next().getLocalRootSpan();
-      if (VALID_ENTRY_SPAN_TYPES.contains(rootSpan.getSpanType())) {
-        // Not a hard limit, the race here is acceptable to not add locking on every trace report
-        if (serviceNamesSize < SERVICE_NAME_LIMIT) {
-          if (serviceNames.putIfAbsent(rootSpan.getServiceName(), Boolean.TRUE) == null) {
-            SERVICE_NAMES_SIZE_UPDATER.incrementAndGet(this);
-          }
+public class ServiceNameCollectingTraceInterceptor extends AbstractTraceInterceptor implements ServiceNameProvider {
+
+    public static final ServiceNameCollectingTraceInterceptor INSTANCE =
+            new ServiceNameCollectingTraceInterceptor(Priority.SERVICE_NAME_COLLECTING);
+
+    /*
+     * The other span types all set their own service names, so we ignore them. They should not have JVM
+     * runtime metrics applied to their service names.
+     */
+    private static final Set<String> VALID_ENTRY_SPAN_TYPES =
+            new HashSet<>(Arrays.asList(DDSpanTypes.HTTP_SERVER, DDSpanTypes.RPC, DDSpanTypes.SOAP));
+    private static final int SERVICE_NAME_LIMIT = Config.get().getJmxFetchMultipleRuntimeServicesLimit();
+    private static final AtomicIntegerFieldUpdater<ServiceNameCollectingTraceInterceptor> SERVICE_NAMES_SIZE_UPDATER =
+            AtomicIntegerFieldUpdater.newUpdater(ServiceNameCollectingTraceInterceptor.class, "serviceNamesSize");
+
+    private volatile int serviceNamesSize = 0;
+    private final ConcurrentHashMap<String, Boolean> serviceNames = new ConcurrentHashMap<>();
+
+    protected ServiceNameCollectingTraceInterceptor(Priority priority) {
+        super(priority);
+    }
+
+    @Override
+    public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
+        if (!trace.isEmpty()) {
+            MutableSpan rootSpan = trace.iterator().next().getLocalRootSpan();
+            if (VALID_ENTRY_SPAN_TYPES.contains(rootSpan.getSpanType())) {
+                // Not a hard limit, the race here is acceptable to not add locking on every trace report
+                if (serviceNamesSize < SERVICE_NAME_LIMIT) {
+                    if (serviceNames.putIfAbsent(rootSpan.getServiceName(), Boolean.TRUE) == null) {
+                        SERVICE_NAMES_SIZE_UPDATER.incrementAndGet(this);
+                    }
+                }
+            }
         }
-      }
+        return trace;
     }
-    return trace;
-  }
 
-  @Override
-  public Iterable<String> getServiceNames() {
-    return serviceNames.keySet();
-  }
+    @Override
+    public Iterable<String> getServiceNames() {
+        return serviceNames.keySet();
+    }
 }
diff --git a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/TraceConfigExitWatcher.java b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/TraceConfigExitWatcher.java
index 107d761b925..554713eaec9 100644
--- a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/TraceConfigExitWatcher.java
+++ b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/TraceConfigExitWatcher.java
@@ -4,9 +4,9 @@
 import org.datadog.jmxfetch.ExitWatcher;
 
 public final class TraceConfigExitWatcher extends ExitWatcher {
-  @Override
-  public boolean shouldExit() {
-    // only stop JMXFetch when the registered tracer says that metrics have been disabled
-    return AgentTracer.isRegistered() && !AgentTracer.traceConfig().isRuntimeMetricsEnabled();
-  }
+    @Override
+    public boolean shouldExit() {
+        // only stop JMXFetch when the registered tracer says that metrics have been disabled
+        return AgentTracer.isRegistered() && !AgentTracer.traceConfig().isRuntimeMetricsEnabled();
+    }
 }
diff --git a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/LLMObsIntakeWorker.java b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/LLMObsIntakeWorker.java
index 68916a33fe2..2c9da42184e 100644
--- a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/LLMObsIntakeWorker.java
+++ b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/LLMObsIntakeWorker.java
@@ -33,202 +33,200 @@
  */
 public class LLMObsIntakeWorker<T> implements AutoCloseable {
 
-  private static final String INTAKE_API_DOMAIN = "api";
-
-  private static final String EVP_SUBDOMAIN_HEADER_NAME = "X-Datadog-EVP-Subdomain";
-  private static final String DD_API_KEY_HEADER_NAME = "DD-API-KEY";
-
-  private static final Logger log = LoggerFactory.getLogger(LLMObsIntakeWorker.class);
-
-  /** Serializes a whole batch into the request body sent to the intake. */
-  public interface BatchSerializer<T> {
-    String toJson(List<T> batch);
-  }
-
-  private final MessagePassingBlockingQueue<T> queue;
-  private final Thread serializerThread;
-
-  public LLMObsIntakeWorker(
-      final String payloadDescription,
-      final String apiPath,
-      final AgentThread agentThread,
-      final int capacity,
-      final long flushInterval,
-      final TimeUnit timeUnit,
-      final SharedCommunicationObjects sco,
-      final Config config,
-      final BatchSerializer<T> serializer) {
-    this.queue = Queues.mpscBlockingConsumerArrayQueue(capacity);
-
-    boolean isAgentless = config.isLlmObsAgentlessEnabled();
-    if (isAgentless && (config.getApiKey() == null || config.getApiKey().isEmpty())) {
-      log.error("Agentless {} submission requires an API key", payloadDescription);
-    }
+    private static final String INTAKE_API_DOMAIN = "api";
 
-    Headers headers;
-    HttpUrl submissionUrl;
-    if (isAgentless) {
-      submissionUrl =
-          HttpUrl.get("https://" + INTAKE_API_DOMAIN + "." + config.getSite() + "/" + apiPath);
-      headers = Headers.of(DD_API_KEY_HEADER_NAME, config.getApiKey());
-    } else {
-      submissionUrl =
-          HttpUrl.get(
-              sco.agentUrl.toString() + DDAgentFeaturesDiscovery.V2_EVP_PROXY_ENDPOINT + apiPath);
-      headers = Headers.of(EVP_SUBDOMAIN_HEADER_NAME, INTAKE_API_DOMAIN);
-    }
+    private static final String EVP_SUBDOMAIN_HEADER_NAME = "X-Datadog-EVP-Subdomain";
+    private static final String DD_API_KEY_HEADER_NAME = "DD-API-KEY";
+
+    private static final Logger log = LoggerFactory.getLogger(LLMObsIntakeWorker.class);
 
-    SerializingHandler<T> serializingHandler =
-        new SerializingHandler<>(
-            payloadDescription, queue, flushInterval, timeUnit, submissionUrl, headers, serializer);
-    this.serializerThread = newAgentThread(agentThread, serializingHandler);
-  }
-
-  public void start() {
-    this.serializerThread.start();
-  }
-
-  public boolean addToQueue(final T payload) {
-    return queue.offer(payload);
-  }
-
-  @Override
-  public void close() {
-    serializerThread.interrupt();
-    try {
-      serializerThread.join(THREAD_JOIN_TIMOUT_MS);
-    } catch (InterruptedException ignored) {
+    /** Serializes a whole batch into the request body sent to the intake. */
+    public interface BatchSerializer<T> {
+        String toJson(List<T> batch);
     }
-  }
 
-  public static class SerializingHandler<T> implements Runnable {
+    private final MessagePassingBlockingQueue<T> queue;
+    private final Thread serializerThread;
+
+    public LLMObsIntakeWorker(
+            final String payloadDescription,
+            final String apiPath,
+            final AgentThread agentThread,
+            final int capacity,
+            final long flushInterval,
+            final TimeUnit timeUnit,
+            final SharedCommunicationObjects sco,
+            final Config config,
+            final BatchSerializer<T> serializer) {
+        this.queue = Queues.mpscBlockingConsumerArrayQueue(capacity);
+
+        boolean isAgentless = config.isLlmObsAgentlessEnabled();
+        if (isAgentless && (config.getApiKey() == null || config.getApiKey().isEmpty())) {
+            log.error("Agentless {} submission requires an API key", payloadDescription);
+        }
 
-    private static final Logger log = LoggerFactory.getLogger(SerializingHandler.class);
-    private static final int FLUSH_THRESHOLD = 50;
+        Headers headers;
+        HttpUrl submissionUrl;
+        if (isAgentless) {
+            submissionUrl = HttpUrl.get("https://" + INTAKE_API_DOMAIN + "." + config.getSite() + "/" + apiPath);
+            headers = Headers.of(DD_API_KEY_HEADER_NAME, config.getApiKey());
+        } else {
+            submissionUrl =
+                    HttpUrl.get(sco.agentUrl.toString() + DDAgentFeaturesDiscovery.V2_EVP_PROXY_ENDPOINT + apiPath);
+            headers = Headers.of(EVP_SUBDOMAIN_HEADER_NAME, INTAKE_API_DOMAIN);
+        }
 
-    private final String payloadDescription;
-    private final MessagePassingBlockingQueue<T> queue;
-    private final long ticksRequiredToFlush;
-    private long lastTicks;
-
-    private final BatchSerializer<T> serializer;
-    private final OkHttpClient httpClient;
-    private final HttpUrl submissionUrl;
-    private final Headers headers;
-
-    private final List<T> buffer = new ArrayList<>();
-
-    public SerializingHandler(
-        final String payloadDescription,
-        final MessagePassingBlockingQueue<T> queue,
-        final long flushInterval,
-        final TimeUnit timeUnit,
-        final HttpUrl submissionUrl,
-        final Headers headers,
-        final BatchSerializer<T> serializer) {
-      this.payloadDescription = payloadDescription;
-      this.queue = queue;
-      this.serializer = serializer;
-      this.httpClient = new OkHttpClient();
-      this.submissionUrl = submissionUrl;
-      this.headers = headers;
-
-      this.lastTicks = System.nanoTime();
-      this.ticksRequiredToFlush = timeUnit.toNanos(flushInterval);
-
-      log.debug("starting {} serializer, url={}", payloadDescription, submissionUrl);
+        SerializingHandler<T> serializingHandler = new SerializingHandler<>(
+                payloadDescription, queue, flushInterval, timeUnit, submissionUrl, headers, serializer);
+        this.serializerThread = newAgentThread(agentThread, serializingHandler);
     }
 
-    @Override
-    public void run() {
-      try {
-        runDutyCycle();
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      }
-      log.debug(
-          "{} processor worker exited. submitting stopped. unsubmitted payloads left: {}",
-          payloadDescription,
-          !queuesAreEmpty());
+    public void start() {
+        this.serializerThread.start();
     }
 
-    private void runDutyCycle() throws InterruptedException {
-      Thread thread = Thread.currentThread();
-      while (!thread.isInterrupted()) {
-        T payload = queue.poll(100, TimeUnit.MILLISECONDS);
-        if (payload != null) {
-          buffer.add(payload);
-          consumeBatch();
-        }
-        flushIfNecessary();
-      }
+    public boolean addToQueue(final T payload) {
+        return queue.offer(payload);
     }
 
-    private void consumeBatch() {
-      queue.drain(buffer::add, queue.size());
+    @Override
+    public void close() {
+        serializerThread.interrupt();
+        try {
+            serializerThread.join(THREAD_JOIN_TIMOUT_MS);
+        } catch (InterruptedException ignored) {
+        }
     }
 
-    protected void flushIfNecessary() {
-      if (buffer.isEmpty()) {
-        return;
-      }
-      if (shouldFlush()) {
-        HttpRetryPolicy.Factory retryPolicyFactory = new HttpRetryPolicy.Factory(5, 100, 2.0, true);
+    public static class SerializingHandler<T> implements Runnable {
+
+        private static final Logger log = LoggerFactory.getLogger(SerializingHandler.class);
+        private static final int FLUSH_THRESHOLD = 50;
+
+        private final String payloadDescription;
+        private final MessagePassingBlockingQueue<T> queue;
+        private final long ticksRequiredToFlush;
+        private long lastTicks;
+
+        private final BatchSerializer<T> serializer;
+        private final OkHttpClient httpClient;
+        private final HttpUrl submissionUrl;
+        private final Headers headers;
+
+        private final List<T> buffer = new ArrayList<>();
+
+        public SerializingHandler(
+                final String payloadDescription,
+                final MessagePassingBlockingQueue<T> queue,
+                final long flushInterval,
+                final TimeUnit timeUnit,
+                final HttpUrl submissionUrl,
+                final Headers headers,
+                final BatchSerializer<T> serializer) {
+            this.payloadDescription = payloadDescription;
+            this.queue = queue;
+            this.serializer = serializer;
+            this.httpClient = new OkHttpClient();
+            this.submissionUrl = submissionUrl;
+            this.headers = headers;
+
+            this.lastTicks = System.nanoTime();
+            this.ticksRequiredToFlush = timeUnit.toNanos(flushInterval);
+
+            log.debug("starting {} serializer, url={}", payloadDescription, submissionUrl);
+        }
 
-        String reqBod;
-        try {
-          reqBod = serializer.toJson(this.buffer);
-        } catch (Exception e) {
-          // A batch that cannot be serialized will never serialize, so it is dropped rather than
-          // retried. Letting this escape would kill the worker and strand every later payload.
-          log.error(
-              "Could not serialize {} payloads, dropping {} of them",
-              payloadDescription,
-              this.buffer.size(),
-              e);
-          this.buffer.clear();
-          return;
+        @Override
+        public void run() {
+            try {
+                runDutyCycle();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+            log.debug(
+                    "{} processor worker exited. submitting stopped. unsubmitted payloads left: {}",
+                    payloadDescription,
+                    !queuesAreEmpty());
         }
 
-        RequestBody requestBody =
-            RequestBody.create(okhttp3.MediaType.parse("application/json"), reqBod);
-        Request request =
-            new Request.Builder().headers(headers).url(submissionUrl).post(requestBody).build();
+        private void runDutyCycle() throws InterruptedException {
+            Thread thread = Thread.currentThread();
+            while (!thread.isInterrupted()) {
+                T payload = queue.poll(100, TimeUnit.MILLISECONDS);
+                if (payload != null) {
+                    buffer.add(payload);
+                    consumeBatch();
+                }
+                flushIfNecessary();
+            }
+        }
 
-        try (okhttp3.Response response =
-            OkHttpUtils.sendWithRetries(httpClient, retryPolicyFactory, request)) {
+        private void consumeBatch() {
+            queue.drain(buffer::add, queue.size());
+        }
 
-          if (response.isSuccessful()) {
-            log.debug(
-                "successfully flushed {} request with {} payloads",
-                payloadDescription,
-                this.buffer.size());
-            this.buffer.clear();
-          } else {
-            log.error(
-                "Could not submit {} (HTTP code {}) {}",
-                payloadDescription,
-                response.code(),
-                response.body() != null ? response.body().string() : "");
-          }
-        } catch (Exception e) {
-          log.error("Could not submit " + payloadDescription, e);
+        protected void flushIfNecessary() {
+            if (buffer.isEmpty()) {
+                return;
+            }
+            if (shouldFlush()) {
+                HttpRetryPolicy.Factory retryPolicyFactory = new HttpRetryPolicy.Factory(5, 100, 2.0, true);
+
+                String reqBod;
+                try {
+                    reqBod = serializer.toJson(this.buffer);
+                } catch (Exception e) {
+                    // A batch that cannot be serialized will never serialize, so it is dropped rather than
+                    // retried. Letting this escape would kill the worker and strand every later payload.
+                    log.error(
+                            "Could not serialize {} payloads, dropping {} of them",
+                            payloadDescription,
+                            this.buffer.size(),
+                            e);
+                    this.buffer.clear();
+                    return;
+                }
+
+                RequestBody requestBody = RequestBody.create(okhttp3.MediaType.parse("application/json"), reqBod);
+                Request request = new Request.Builder()
+                        .headers(headers)
+                        .url(submissionUrl)
+                        .post(requestBody)
+                        .build();
+
+                try (okhttp3.Response response = OkHttpUtils.sendWithRetries(httpClient, retryPolicyFactory, request)) {
+
+                    if (response.isSuccessful()) {
+                        log.debug(
+                                "successfully flushed {} request with {} payloads",
+                                payloadDescription,
+                                this.buffer.size());
+                        this.buffer.clear();
+                    } else {
+                        log.error(
+                                "Could not submit {} (HTTP code {}) {}",
+                                payloadDescription,
+                                response.code(),
+                                response.body() != null ? response.body().string() : "");
+                    }
+                } catch (Exception e) {
+                    log.error("Could not submit " + payloadDescription, e);
+                }
+            }
         }
-      }
-    }
 
-    private boolean shouldFlush() {
-      long nanoTime = System.nanoTime();
-      long ticks = nanoTime - lastTicks;
-      if (ticks > ticksRequiredToFlush || queue.size() >= FLUSH_THRESHOLD) {
-        lastTicks = nanoTime;
-        return true;
-      }
-      return false;
-    }
+        private boolean shouldFlush() {
+            long nanoTime = System.nanoTime();
+            long ticks = nanoTime - lastTicks;
+            if (ticks > ticksRequiredToFlush || queue.size() >= FLUSH_THRESHOLD) {
+                lastTicks = nanoTime;
+                return true;
+            }
+            return false;
+        }
 
-    protected boolean queuesAreEmpty() {
-      return queue.isEmpty();
+        protected boolean queuesAreEmpty() {
+            return queue.isEmpty();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/LLMObsSystem.java b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/LLMObsSystem.java
index 864cf27eb2c..61c06929561 100644
--- a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/LLMObsSystem.java
+++ b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/LLMObsSystem.java
@@ -22,339 +22,283 @@
 
 public class LLMObsSystem {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(LLMObsSystem.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LLMObsSystem.class);
 
-  private static final String CUSTOM_MODEL_VAL = "custom";
+    private static final String CUSTOM_MODEL_VAL = "custom";
 
-  private static final String EVAL_METRIC_API_PATH = "api/intake/llm-obs/v1/eval-metric";
-  // Feedback is a v2 concept: submitter, the feedback-only targets and the non-score value types
-  // only exist there. Evaluations deliberately stay on v1 with their existing flat payload; both
-  // now carry event_kind, so the two are told apart the same way as in dd-trace-py and dd-trace-js.
-  private static final String FEEDBACK_API_PATH = "api/intake/llm-obs/v2/eval-metric";
+    private static final String EVAL_METRIC_API_PATH = "api/intake/llm-obs/v1/eval-metric";
+    // Feedback is a v2 concept: submitter, the feedback-only targets and the non-score value types
+    // only exist there. Evaluations deliberately stay on v1 with their existing flat payload; both
+    // now carry event_kind, so the two are told apart the same way as in dd-trace-py and dd-trace-js.
+    private static final String FEEDBACK_API_PATH = "api/intake/llm-obs/v2/eval-metric";
 
-  private static final int QUEUE_CAPACITY = 1024;
-  private static final long FLUSH_INTERVAL_MS = 100;
+    private static final int QUEUE_CAPACITY = 1024;
+    private static final long FLUSH_INTERVAL_MS = 100;
 
-  public static void start(Instrumentation inst, SharedCommunicationObjects sco) {
-    Config config = Config.get();
-    if (!config.isLlmObsEnabled()) {
-      LOGGER.debug("LLM Observability is disabled");
-      return;
-    }
-
-    sco.createRemaining(config);
-
-    String mlApp = config.getLlmObsMlApp();
-    WellKnownTags wellKnownTags = config.getWellKnownTags();
-    LLMObsInternal.setSpanFactory(new LLMObsManualSpanFactory(mlApp, wellKnownTags));
-
-    LLMObsInternal.setEvalProcessor(new LLMObsCustomEvalProcessor(mlApp, sco, config));
-
-    LLMObsInternal.setFeedbackProcessor(new LLMObsCustomFeedbackProcessor(mlApp, sco, config));
-  }
-
-  private static class LLMObsCustomFeedbackProcessor implements LLMObs.LLMObsFeedbackProcessor {
-    private final String defaultMLApp;
-    private final LLMObsIntakeWorker<LLMObsFeedbackEvent> feedbackProcessingWorker;
-
-    public LLMObsCustomFeedbackProcessor(
-        String defaultMLApp, SharedCommunicationObjects sco, Config config) {
-
-      this.defaultMLApp = defaultMLApp;
-      this.feedbackProcessingWorker =
-          new LLMObsIntakeWorker<>(
-              "feedback",
-              FEEDBACK_API_PATH,
-              AgentThread.LLMOBS_FEEDBACK_PROCESSOR,
-              QUEUE_CAPACITY,
-              FLUSH_INTERVAL_MS,
-              TimeUnit.MILLISECONDS,
-              sco,
-              config,
-              LLMObsFeedbackEvent.batchSerializer());
-      this.feedbackProcessingWorker.start();
-    }
-
-    @Override
-    public void submitFeedback(LLMObs.Feedback feedback) {
-      if (feedback == null) {
-        LLMObsMetricCollector.get().recordFeedbackSubmitted(null, null, "invalid_feedback");
-        LOGGER.error("null feedback provided, feedback not recorded");
-        return;
-      }
-
-      // The builder never throws so that instrumented code stays safe when the agent is absent;
-      // validation happens here instead, only once LLM Observability is actually enabled.
-      LLMObs.Feedback.ValidationError error = feedback.validate();
-      if (error != null) {
-        recordFeedbackTelemetry(feedback, error.getCode());
-        throw new IllegalArgumentException(error.getMessage());
-      }
-
-      String mlApp = feedback.getMlApp();
-      if (mlApp == null || mlApp.isEmpty()) {
-        mlApp = defaultMLApp;
-      }
-
-      if (!this.feedbackProcessingWorker.addToQueue(new LLMObsFeedbackEvent(feedback, mlApp))) {
-        recordFeedbackTelemetry(feedback, "queue_full");
-        LOGGER.warn(
-            "queue full, failed to add feedback, ml_app={}, {}={}, label={}",
-            mlApp,
-            feedback.getTargetType().getWireKey(),
-            feedback.getTargetValue(),
-            feedback.getLabel());
-        return;
-      }
-
-      recordFeedbackTelemetry(feedback, null);
-    }
-
-    private static void recordFeedbackTelemetry(
-        LLMObs.Feedback feedback, @Nullable String errorCode) {
-      LLMObs.Feedback.MetricType metricType = feedback.getMetricType();
-      LLMObs.Feedback.TargetType targetType = feedback.getTargetType();
-      LLMObsMetricCollector.get()
-          .recordFeedbackSubmitted(
-              metricType == null ? null : metricType.toString(),
-              targetType == null ? null : targetType.getWireKey(),
-              errorCode);
-    }
-  }
-
-  private static class LLMObsCustomEvalProcessor implements LLMObs.LLMObsEvalProcessor {
-    private final String defaultMLApp;
-    private final LLMObsIntakeWorker<LLMObsEval> evalProcessingWorker;
-
-    public LLMObsCustomEvalProcessor(
-        String defaultMLApp, SharedCommunicationObjects sco, Config config) {
-
-      this.defaultMLApp = defaultMLApp;
-      this.evalProcessingWorker =
-          new LLMObsIntakeWorker<>(
-              "eval metrics",
-              EVAL_METRIC_API_PATH,
-              AgentThread.LLMOBS_EVALS_PROCESSOR,
-              QUEUE_CAPACITY,
-              FLUSH_INTERVAL_MS,
-              TimeUnit.MILLISECONDS,
-              sco,
-              config,
-              LLMObsEval.batchSerializer());
-      this.evalProcessingWorker.start();
-    }
-
-    @Override
-    public void SubmitEvaluation(
-        LLMObsSpan llmObsSpan, String label, double scoreValue, Map<String, Object> tags) {
-      SubmitEvaluation(llmObsSpan, label, scoreValue, defaultMLApp, tags);
-    }
+    public static void start(Instrumentation inst, SharedCommunicationObjects sco) {
+        Config config = Config.get();
+        if (!config.isLlmObsEnabled()) {
+            LOGGER.debug("LLM Observability is disabled");
+            return;
+        }
 
-    @Override
-    public void SubmitEvaluation(
-        LLMObsSpan llmObsSpan,
-        String label,
-        double scoreValue,
-        String mlApp,
-        Map<String, Object> tags) {
-      if (llmObsSpan == null) {
-        LOGGER.error("null llm obs span provided, eval not recorded");
-        return;
-      }
-
-      if (mlApp == null || mlApp.isEmpty()) {
-        mlApp = defaultMLApp;
-      }
-      String traceID = llmObsSpan.getTraceId().toHexString();
-      long spanID = llmObsSpan.getSpanId();
-      LLMObsEval.Score score =
-          new LLMObsEval.Score(
-              traceID, spanID, System.currentTimeMillis(), mlApp, label, tags, scoreValue);
-      if (!this.evalProcessingWorker.addToQueue(score)) {
-        LOGGER.warn(
-            "queue full, failed to add score eval, ml_app={}, trace_id={}, span_id={}, label={}",
-            mlApp,
-            traceID,
-            spanID,
-            label);
-      }
-    }
+        sco.createRemaining(config);
 
-    @Override
-    public void SubmitEvaluation(
-        LLMObsSpan llmObsSpan, String label, String categoricalValue, Map<String, Object> tags) {
-      SubmitEvaluation(llmObsSpan, label, categoricalValue, defaultMLApp, tags);
-    }
-
-    @Override
-    public void SubmitEvaluation(
-        LLMObsSpan llmObsSpan,
-        String label,
-        String categoricalValue,
-        String mlApp,
-        Map<String, Object> tags) {
-      if (llmObsSpan == null) {
-        LOGGER.error("null llm obs span provided, eval not recorded");
-        return;
-      }
-
-      if (mlApp == null || mlApp.isEmpty()) {
-        mlApp = defaultMLApp;
-      }
-      String traceID = llmObsSpan.getTraceId().toHexString();
-      long spanID = llmObsSpan.getSpanId();
-      LLMObsEval.Categorical category =
-          new LLMObsEval.Categorical(
-              traceID, spanID, System.currentTimeMillis(), mlApp, label, tags, categoricalValue);
-      if (!this.evalProcessingWorker.addToQueue(category)) {
-        LOGGER.warn(
-            "queue full, failed to add categorical eval, ml_app={}, trace_id={}, span_id={}, label={}",
-            mlApp,
-            traceID,
-            spanID,
-            label);
-      }
-    }
-  }
+        String mlApp = config.getLlmObsMlApp();
+        WellKnownTags wellKnownTags = config.getWellKnownTags();
+        LLMObsInternal.setSpanFactory(new LLMObsManualSpanFactory(mlApp, wellKnownTags));
 
-  private static class LLMObsManualSpanFactory implements LLMObs.LLMObsSpanFactory {
-
-    private final String defaultMLApp;
-    private final String serviceName;
-    private final WellKnownTags wellKnownTags;
-
-    public LLMObsManualSpanFactory(String defaultMLApp, WellKnownTags wellKnownTags) {
-      this.defaultMLApp = defaultMLApp;
-      this.serviceName = wellKnownTags.getService().toString();
-      this.wellKnownTags = wellKnownTags;
-    }
-
-    @Override
-    public LLMObsSpan startLLMSpan(
-        String spanName,
-        String modelName,
-        String modelProvider,
-        @Nullable String mlApp,
-        @Nullable String sessionId) {
-
-      DDLLMObsSpan span =
-          new DDLLMObsSpan(
-              Tags.LLMOBS_LLM_SPAN_KIND,
-              spanName,
-              getMLApp(mlApp),
-              sessionId,
-              serviceName,
-              wellKnownTags);
-
-      if (modelName == null || modelName.isEmpty()) {
-        modelName = CUSTOM_MODEL_VAL;
-      }
-      span.setTag(LLMObsTags.MODEL_NAME, modelName);
-
-      if (modelProvider == null || modelProvider.isEmpty()) {
-        modelProvider = CUSTOM_MODEL_VAL;
-      }
-      span.setTag(LLMObsTags.MODEL_PROVIDER, modelProvider);
-      return span;
-    }
-
-    @Override
-    public LLMObsSpan startAgentSpan(
-        String spanName, @Nullable String mlApp, @Nullable String sessionId) {
-      return startAgentSpan(spanName, mlApp, sessionId, null);
-    }
-
-    @Override
-    public LLMObsSpan startAgentSpan(
-        String spanName,
-        @Nullable String mlApp,
-        @Nullable String sessionId,
-        @Nullable String version) {
-      return new DDLLMObsSpan(
-          Tags.LLMOBS_AGENT_SPAN_KIND,
-          spanName,
-          getMLApp(mlApp),
-          sessionId,
-          serviceName,
-          wellKnownTags,
-          version);
-    }
-
-    @Override
-    public LLMObsSpan startToolSpan(
-        String spanName, @Nullable String mlApp, @Nullable String sessionId) {
-      return new DDLLMObsSpan(
-          Tags.LLMOBS_TOOL_SPAN_KIND,
-          spanName,
-          getMLApp(mlApp),
-          sessionId,
-          serviceName,
-          wellKnownTags);
-    }
-
-    @Override
-    public LLMObsSpan startTaskSpan(
-        String spanName, @Nullable String mlApp, @Nullable String sessionId) {
-      return new DDLLMObsSpan(
-          Tags.LLMOBS_TASK_SPAN_KIND,
-          spanName,
-          getMLApp(mlApp),
-          sessionId,
-          serviceName,
-          wellKnownTags);
-    }
+        LLMObsInternal.setEvalProcessor(new LLMObsCustomEvalProcessor(mlApp, sco, config));
 
-    @Override
-    public LLMObsSpan startWorkflowSpan(
-        String spanName, @Nullable String mlApp, @Nullable String sessionId) {
-      return new DDLLMObsSpan(
-          Tags.LLMOBS_WORKFLOW_SPAN_KIND,
-          spanName,
-          getMLApp(mlApp),
-          sessionId,
-          serviceName,
-          wellKnownTags);
+        LLMObsInternal.setFeedbackProcessor(new LLMObsCustomFeedbackProcessor(mlApp, sco, config));
     }
 
-    @Override
-    public LLMObsSpan startEmbeddingSpan(
-        String spanName,
-        @Nullable String mlApp,
-        @Nullable String modelProvider,
-        @Nullable String modelName,
-        @Nullable String sessionId) {
-      if (modelProvider == null) {
-        modelProvider = "custom";
-      }
-      DDLLMObsSpan embeddingSpan =
-          new DDLLMObsSpan(
-              Tags.LLMOBS_EMBEDDING_SPAN_KIND,
-              spanName,
-              getMLApp(mlApp),
-              sessionId,
-              serviceName,
-              wellKnownTags);
-      embeddingSpan.setTag(LLMObsTags.MODEL_PROVIDER, modelProvider);
-      embeddingSpan.setTag(LLMObsTags.MODEL_NAME, modelName);
-      return embeddingSpan;
+    private static class LLMObsCustomFeedbackProcessor implements LLMObs.LLMObsFeedbackProcessor {
+        private final String defaultMLApp;
+        private final LLMObsIntakeWorker<LLMObsFeedbackEvent> feedbackProcessingWorker;
+
+        public LLMObsCustomFeedbackProcessor(String defaultMLApp, SharedCommunicationObjects sco, Config config) {
+
+            this.defaultMLApp = defaultMLApp;
+            this.feedbackProcessingWorker = new LLMObsIntakeWorker<>(
+                    "feedback",
+                    FEEDBACK_API_PATH,
+                    AgentThread.LLMOBS_FEEDBACK_PROCESSOR,
+                    QUEUE_CAPACITY,
+                    FLUSH_INTERVAL_MS,
+                    TimeUnit.MILLISECONDS,
+                    sco,
+                    config,
+                    LLMObsFeedbackEvent.batchSerializer());
+            this.feedbackProcessingWorker.start();
+        }
+
+        @Override
+        public void submitFeedback(LLMObs.Feedback feedback) {
+            if (feedback == null) {
+                LLMObsMetricCollector.get().recordFeedbackSubmitted(null, null, "invalid_feedback");
+                LOGGER.error("null feedback provided, feedback not recorded");
+                return;
+            }
+
+            // The builder never throws so that instrumented code stays safe when the agent is absent;
+            // validation happens here instead, only once LLM Observability is actually enabled.
+            LLMObs.Feedback.ValidationError error = feedback.validate();
+            if (error != null) {
+                recordFeedbackTelemetry(feedback, error.getCode());
+                throw new IllegalArgumentException(error.getMessage());
+            }
+
+            String mlApp = feedback.getMlApp();
+            if (mlApp == null || mlApp.isEmpty()) {
+                mlApp = defaultMLApp;
+            }
+
+            if (!this.feedbackProcessingWorker.addToQueue(new LLMObsFeedbackEvent(feedback, mlApp))) {
+                recordFeedbackTelemetry(feedback, "queue_full");
+                LOGGER.warn(
+                        "queue full, failed to add feedback, ml_app={}, {}={}, label={}",
+                        mlApp,
+                        feedback.getTargetType().getWireKey(),
+                        feedback.getTargetValue(),
+                        feedback.getLabel());
+                return;
+            }
+
+            recordFeedbackTelemetry(feedback, null);
+        }
+
+        private static void recordFeedbackTelemetry(LLMObs.Feedback feedback, @Nullable String errorCode) {
+            LLMObs.Feedback.MetricType metricType = feedback.getMetricType();
+            LLMObs.Feedback.TargetType targetType = feedback.getTargetType();
+            LLMObsMetricCollector.get()
+                    .recordFeedbackSubmitted(
+                            metricType == null ? null : metricType.toString(),
+                            targetType == null ? null : targetType.getWireKey(),
+                            errorCode);
+        }
     }
 
-    public LLMObsSpan startRetrievalSpan(
-        String spanName, @Nullable String mlApp, @Nullable String sessionId) {
-      return new DDLLMObsSpan(
-          Tags.LLMOBS_RETRIEVAL_SPAN_KIND,
-          spanName,
-          getMLApp(mlApp),
-          sessionId,
-          serviceName,
-          wellKnownTags);
+    private static class LLMObsCustomEvalProcessor implements LLMObs.LLMObsEvalProcessor {
+        private final String defaultMLApp;
+        private final LLMObsIntakeWorker<LLMObsEval> evalProcessingWorker;
+
+        public LLMObsCustomEvalProcessor(String defaultMLApp, SharedCommunicationObjects sco, Config config) {
+
+            this.defaultMLApp = defaultMLApp;
+            this.evalProcessingWorker = new LLMObsIntakeWorker<>(
+                    "eval metrics",
+                    EVAL_METRIC_API_PATH,
+                    AgentThread.LLMOBS_EVALS_PROCESSOR,
+                    QUEUE_CAPACITY,
+                    FLUSH_INTERVAL_MS,
+                    TimeUnit.MILLISECONDS,
+                    sco,
+                    config,
+                    LLMObsEval.batchSerializer());
+            this.evalProcessingWorker.start();
+        }
+
+        @Override
+        public void SubmitEvaluation(LLMObsSpan llmObsSpan, String label, double scoreValue, Map<String, Object> tags) {
+            SubmitEvaluation(llmObsSpan, label, scoreValue, defaultMLApp, tags);
+        }
+
+        @Override
+        public void SubmitEvaluation(
+                LLMObsSpan llmObsSpan, String label, double scoreValue, String mlApp, Map<String, Object> tags) {
+            if (llmObsSpan == null) {
+                LOGGER.error("null llm obs span provided, eval not recorded");
+                return;
+            }
+
+            if (mlApp == null || mlApp.isEmpty()) {
+                mlApp = defaultMLApp;
+            }
+            String traceID = llmObsSpan.getTraceId().toHexString();
+            long spanID = llmObsSpan.getSpanId();
+            LLMObsEval.Score score =
+                    new LLMObsEval.Score(traceID, spanID, System.currentTimeMillis(), mlApp, label, tags, scoreValue);
+            if (!this.evalProcessingWorker.addToQueue(score)) {
+                LOGGER.warn(
+                        "queue full, failed to add score eval, ml_app={}, trace_id={}, span_id={}, label={}",
+                        mlApp,
+                        traceID,
+                        spanID,
+                        label);
+            }
+        }
+
+        @Override
+        public void SubmitEvaluation(
+                LLMObsSpan llmObsSpan, String label, String categoricalValue, Map<String, Object> tags) {
+            SubmitEvaluation(llmObsSpan, label, categoricalValue, defaultMLApp, tags);
+        }
+
+        @Override
+        public void SubmitEvaluation(
+                LLMObsSpan llmObsSpan, String label, String categoricalValue, String mlApp, Map<String, Object> tags) {
+            if (llmObsSpan == null) {
+                LOGGER.error("null llm obs span provided, eval not recorded");
+                return;
+            }
+
+            if (mlApp == null || mlApp.isEmpty()) {
+                mlApp = defaultMLApp;
+            }
+            String traceID = llmObsSpan.getTraceId().toHexString();
+            long spanID = llmObsSpan.getSpanId();
+            LLMObsEval.Categorical category = new LLMObsEval.Categorical(
+                    traceID, spanID, System.currentTimeMillis(), mlApp, label, tags, categoricalValue);
+            if (!this.evalProcessingWorker.addToQueue(category)) {
+                LOGGER.warn(
+                        "queue full, failed to add categorical eval, ml_app={}, trace_id={}, span_id={}, label={}",
+                        mlApp,
+                        traceID,
+                        spanID,
+                        label);
+            }
+        }
     }
 
-    private String getMLApp(String mlApp) {
-      if (mlApp == null || mlApp.isEmpty()) {
-        return defaultMLApp;
-      }
-      return mlApp;
+    private static class LLMObsManualSpanFactory implements LLMObs.LLMObsSpanFactory {
+
+        private final String defaultMLApp;
+        private final String serviceName;
+        private final WellKnownTags wellKnownTags;
+
+        public LLMObsManualSpanFactory(String defaultMLApp, WellKnownTags wellKnownTags) {
+            this.defaultMLApp = defaultMLApp;
+            this.serviceName = wellKnownTags.getService().toString();
+            this.wellKnownTags = wellKnownTags;
+        }
+
+        @Override
+        public LLMObsSpan startLLMSpan(
+                String spanName,
+                String modelName,
+                String modelProvider,
+                @Nullable String mlApp,
+                @Nullable String sessionId) {
+
+            DDLLMObsSpan span = new DDLLMObsSpan(
+                    Tags.LLMOBS_LLM_SPAN_KIND, spanName, getMLApp(mlApp), sessionId, serviceName, wellKnownTags);
+
+            if (modelName == null || modelName.isEmpty()) {
+                modelName = CUSTOM_MODEL_VAL;
+            }
+            span.setTag(LLMObsTags.MODEL_NAME, modelName);
+
+            if (modelProvider == null || modelProvider.isEmpty()) {
+                modelProvider = CUSTOM_MODEL_VAL;
+            }
+            span.setTag(LLMObsTags.MODEL_PROVIDER, modelProvider);
+            return span;
+        }
+
+        @Override
+        public LLMObsSpan startAgentSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId) {
+            return startAgentSpan(spanName, mlApp, sessionId, null);
+        }
+
+        @Override
+        public LLMObsSpan startAgentSpan(
+                String spanName, @Nullable String mlApp, @Nullable String sessionId, @Nullable String version) {
+            return new DDLLMObsSpan(
+                    Tags.LLMOBS_AGENT_SPAN_KIND,
+                    spanName,
+                    getMLApp(mlApp),
+                    sessionId,
+                    serviceName,
+                    wellKnownTags,
+                    version);
+        }
+
+        @Override
+        public LLMObsSpan startToolSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId) {
+            return new DDLLMObsSpan(
+                    Tags.LLMOBS_TOOL_SPAN_KIND, spanName, getMLApp(mlApp), sessionId, serviceName, wellKnownTags);
+        }
+
+        @Override
+        public LLMObsSpan startTaskSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId) {
+            return new DDLLMObsSpan(
+                    Tags.LLMOBS_TASK_SPAN_KIND, spanName, getMLApp(mlApp), sessionId, serviceName, wellKnownTags);
+        }
+
+        @Override
+        public LLMObsSpan startWorkflowSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId) {
+            return new DDLLMObsSpan(
+                    Tags.LLMOBS_WORKFLOW_SPAN_KIND, spanName, getMLApp(mlApp), sessionId, serviceName, wellKnownTags);
+        }
+
+        @Override
+        public LLMObsSpan startEmbeddingSpan(
+                String spanName,
+                @Nullable String mlApp,
+                @Nullable String modelProvider,
+                @Nullable String modelName,
+                @Nullable String sessionId) {
+            if (modelProvider == null) {
+                modelProvider = "custom";
+            }
+            DDLLMObsSpan embeddingSpan = new DDLLMObsSpan(
+                    Tags.LLMOBS_EMBEDDING_SPAN_KIND, spanName, getMLApp(mlApp), sessionId, serviceName, wellKnownTags);
+            embeddingSpan.setTag(LLMObsTags.MODEL_PROVIDER, modelProvider);
+            embeddingSpan.setTag(LLMObsTags.MODEL_NAME, modelName);
+            return embeddingSpan;
+        }
+
+        public LLMObsSpan startRetrievalSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId) {
+            return new DDLLMObsSpan(
+                    Tags.LLMOBS_RETRIEVAL_SPAN_KIND, spanName, getMLApp(mlApp), sessionId, serviceName, wellKnownTags);
+        }
+
+        private String getMLApp(String mlApp) {
+            if (mlApp == null || mlApp.isEmpty()) {
+                return defaultMLApp;
+            }
+            return mlApp;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/DDLLMObsSpan.java b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/DDLLMObsSpan.java
index ae4016fb37e..63231e6604a 100644
--- a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/DDLLMObsSpan.java
+++ b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/DDLLMObsSpan.java
@@ -28,716 +28,692 @@
 import org.slf4j.LoggerFactory;
 
 public class DDLLMObsSpan implements LLMObsSpan {
-  private static final String LLM_MESSAGE_UNKNOWN_ROLE = "unknown";
-
-  // Well known tags for LLM obs will be prefixed with _ml_obs_(tags|metrics).
-  // Prefix for tags
-  private static final String LLMOBS_TAG_PREFIX = "_ml_obs_tag.";
-  // Prefix for metrics
-  private static final String LLMOBS_METRIC_PREFIX = "_ml_obs_metric.";
-
-  // internal tags to be prefixed
-  private static final String INPUT = LLMOBS_TAG_PREFIX + "input";
-  private static final String OUTPUT = LLMOBS_TAG_PREFIX + "output";
-  private static final String INPUT_PROMPT = LLMOBS_TAG_PREFIX + "input_prompt";
-  private static final String SPAN_KIND = LLMOBS_TAG_PREFIX + Tags.SPAN_KIND;
-  private static final String METADATA = LLMOBS_TAG_PREFIX + LLMObsTags.METADATA;
-  private static final String TOOL_DEFINITIONS = LLMOBS_TAG_PREFIX + LLMObsTags.TOOL_DEFINITIONS;
-  private static final String METADATA_DD = "_dd";
-  private static final String MANUAL_FRAMEWORK = "manual";
-  private static final String PROMPT_TRACKING_INSTRUMENTATION_METHOD =
-      LLMOBS_TAG_PREFIX + "prompt_tracking_instrumentation_method";
-  private static final String INSTRUMENTATION_METHOD_ANNOTATED = "annotated";
-  private static final String DEFAULT_PROMPT_NAME = "unnamed-prompt";
-  private static final String CONTEXT_VARIABLE_KEYS = "_dd_context_variable_keys";
-  private static final String QUERY_VARIABLE_KEYS = "_dd_query_variable_keys";
-  private static final String PARENT_ID_TAG_INTERNAL = "parent_id";
-  private static final String SAMPLE_RATE_TAG_INTERNAL = "sample_rate";
-  private static final String SAMPLING_DECISION_TAG_INTERNAL = "sampling_decision";
-  private static final String PAGENT_SPAN_ID_TAG_INTERNAL =
-      LLMOBS_TAG_PREFIX + LLMObsTags.PAGENT_SPAN_ID;
-  private static final String PAGENT_NAME_TAG_INTERNAL = LLMOBS_TAG_PREFIX + LLMObsTags.PAGENT_NAME;
-
-  private static final String SERVICE = LLMOBS_TAG_PREFIX + "service";
-  private static final String VERSION = LLMOBS_TAG_PREFIX + "version";
-  private static final String DDTRACE_VERSION = LLMOBS_TAG_PREFIX + "ddtrace.version";
-  private static final String ENV = LLMOBS_TAG_PREFIX + "env";
-
-  private static final String LLM_OBS_INSTRUMENTATION_NAME = "llmobs";
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(DDLLMObsSpan.class);
-
-  private static final LLMObsSampler CONFIGURED_SAMPLER = LLMObsSampler.fromConfig();
-
-  private final AgentSpan span;
-  private final String spanKind;
-  private final String mlApp;
-  private final boolean hasSessionId;
-  private final ContextScope scope;
-  // Non-null only for agent-kind spans started without an ambient APM root. Activating the
-  // agent's APM span keeps children in the same APM trace so the trace-ID gate passes and
-  // they inherit agent attribution correctly.
-  private final ContextScope standaloneApmScope;
-
-  private boolean finished = false;
-
-  public DDLLMObsSpan(
-      @Nonnull String kind,
-      String spanName,
-      @Nonnull String mlApp,
-      String sessionId,
-      @Nonnull String serviceName,
-      WellKnownTags wellKnownTags) {
-    this(kind, spanName, mlApp, sessionId, serviceName, wellKnownTags, null);
-  }
-
-  public DDLLMObsSpan(
-      @Nonnull String kind,
-      String spanName,
-      @Nonnull String mlApp,
-      String sessionId,
-      @Nonnull String serviceName,
-      WellKnownTags wellKnownTags,
-      String agentVersion) {
-    this(
-        kind,
-        spanName,
-        mlApp,
-        sessionId,
-        serviceName,
-        wellKnownTags,
-        agentVersion,
-        CONFIGURED_SAMPLER);
-  }
-
-  DDLLMObsSpan(
-      @Nonnull String kind,
-      String spanName,
-      @Nonnull String mlApp,
-      String sessionId,
-      @Nonnull String serviceName,
-      WellKnownTags wellKnownTags,
-      String agentVersion,
-      @Nonnull LLMObsSampler sampler) {
-
-    if (null == spanName || spanName.isEmpty()) {
-      spanName = kind;
-    }
-
-    AgentTracer.SpanBuilder spanBuilder =
-        AgentTracer.get()
-            .buildSpan(LLM_OBS_INSTRUMENTATION_NAME, spanName)
-            .withServiceName(serviceName)
-            .withSpanType(DDSpanTypes.LLMOBS);
-
-    span = spanBuilder.start();
-
-    // set global dd_tags as base layer so UST and span-level tags can override them
-    for (Map.Entry<String, String> entry : Config.get().getGlobalTags().entrySet()) {
-      span.setTag(LLMOBS_TAG_PREFIX + entry.getKey(), entry.getValue());
-    }
-
-    // set UST (unified service tags, env, service, version)
-    span.setTag(ENV, wellKnownTags.getEnv());
-    span.setTag(SERVICE, wellKnownTags.getService());
-    span.setTag(VERSION, wellKnownTags.getVersion());
-    span.setTag(DDTRACE_VERSION, DDTraceApiInfo.VERSION);
-
-    span.setTag(SPAN_KIND, kind);
-    spanKind = kind;
-    this.mlApp = mlApp;
-    span.setTag(LLMOBS_TAG_PREFIX + LLMObsTags.ML_APP, mlApp);
-    // Resolve effective parent_id, session_id, agent_version, agent attribution and sampling
-    // decision from the LLMObs context, all gated on trace-id consistency. A stale context from a
-    // different trace (e.g. async boundary leakage) must not contribute any of them. Every
-    // inherited value is read inside the one same-trace branch below, so a newly propagated tag
-    // cannot ship with a weaker gate of its own.
-    AgentSpanContext parent = LLMObsContext.current();
-    String parentSpanID = LLMObsContext.ROOT_SPAN_ID;
-    String resolvedAgentVersion = agentVersion;
-    String sampleRate = null;
-    String samplingDecision = null;
-    String resolvedParentAgentSpanId = null;
-    String resolvedParentAgentName = null;
-    if (null != parent) {
-      if (parent.getTraceId() != span.getTraceId()) {
-        LOGGER.error(
-            "trace ID mismatch, retrieved parent from context trace_id={}, span_id={}, started span trace_id={}, span_id={}",
-            parent.getTraceId(),
-            parent.getSpanId(),
-            span.getTraceId(),
-            span.getSpanId());
-      } else {
-        parentSpanID = String.valueOf(parent.getSpanId());
-        // Inherit session_id from parent context only when it belongs to the same trace.
-        // Matches dd-trace-py and dd-trace-js: session_id need only be set on the root
-        // span; descendants inherit transitively via context propagation.
-        if (sessionId == null || sessionId.isEmpty()) {
-          String inherited = LLMObsContext.currentSessionId();
-          if (inherited != null && !inherited.isEmpty()) {
-            sessionId = inherited;
-          }
-        }
-        // Inherit agent_version from the enclosing agent span, if this span doesn't set its own.
-        // An explicit value always wins, so a nested agent's own version overrides an ancestor's
-        // for its own subtree, matching session_id's explicit-wins semantics.
-        if (agentVersion == null || agentVersion.isEmpty()) {
-          String inherited = LLMObsContext.currentAgentVersion();
-          if (inherited != null && !inherited.isEmpty()) {
-            resolvedAgentVersion = inherited;
-          }
-        }
-        // Inherit the sampling decision from the context if present.
-        sampleRate = LLMObsContext.currentSampleRate();
-        samplingDecision = LLMObsContext.currentSamplingDecision();
-        // Inherit agent attribution: the nearest agent-kind ancestor. Overridden just below when
-        // this span is itself an agent.
-        resolvedParentAgentSpanId = LLMObsContext.currentParentAgentSpanId();
-        resolvedParentAgentName = LLMObsContext.currentParentAgentName();
-      }
-    }
-
-    // An agent span is its own descendants' nearest agent ancestor, replacing anything inherited.
-    // Use the span name as the initial pagent name; annotateAgentManifest() will update it to the
-    // manifest name if one is provided later.
-    if (Tags.LLMOBS_AGENT_SPAN_KIND.equals(kind)) {
-      resolvedParentAgentSpanId = String.valueOf(span.getSpanId());
-      resolvedParentAgentName = spanName;
-    }
-
-    if (samplingDecision == null || sampleRate == null) {
-      sampleRate = sampler.formattedRate();
-      samplingDecision =
-          sampler.sample(span.getTraceId().toLong())
-              ? LLMObsContext.SAMPLING_DECISION_SAMPLED
-              : LLMObsContext.SAMPLING_DECISION_DROPPED;
-    }
-    span.setTag(LLMOBS_TAG_PREFIX + SAMPLE_RATE_TAG_INTERNAL, sampleRate);
-    span.setTag(LLMOBS_TAG_PREFIX + SAMPLING_DECISION_TAG_INTERNAL, samplingDecision);
-
-    this.hasSessionId = sessionId != null && !sessionId.isEmpty();
-    if (this.hasSessionId) {
-      span.setTag(LLMOBS_TAG_PREFIX + LLMObsTags.SESSION_ID, sessionId);
-    }
-    if (resolvedAgentVersion != null && !resolvedAgentVersion.isEmpty()) {
-      span.setTag(LLMOBS_TAG_PREFIX + LLMObsTags.AGENT_VERSION, resolvedAgentVersion);
-    }
-    span.setTag(LLMOBS_TAG_PREFIX + PARENT_ID_TAG_INTERNAL, parentSpanID);
-    // Store pagent values as internal tags so the serializer can emit agent_attribution.
-    if (resolvedParentAgentSpanId != null) {
-      span.setTag(PAGENT_SPAN_ID_TAG_INTERNAL, resolvedParentAgentSpanId);
-      if (resolvedParentAgentName != null) {
-        span.setTag(PAGENT_NAME_TAG_INTERNAL, resolvedParentAgentName);
-      }
-    }
-
-    // Propagate the effective sessionId, agent_version, sampling decision and agent attribution
-    // to descendant LLMObs spans via the context.
-    scope =
-        LLMObsContext.attach(
-            span.spanContext(),
-            sessionId,
-            resolvedAgentVersion,
-            sampleRate,
-            samplingDecision,
-            resolvedParentAgentSpanId,
-            resolvedParentAgentName);
-
-    // For standalone agent spans (no ambient APM root), activate the underlying APM span so
-    // that child LLMObs spans share the same trace ID and pass the trace-ID gate. Without
-    // this, children start a fresh APM trace, the gate rejects the agent context, and
-    // agent attribution is silently dropped.
-    standaloneApmScope =
-        Tags.LLMOBS_AGENT_SPAN_KIND.equals(kind) && span.getLocalRootSpan() == span
-            ? AgentTracer.activateSpan(span)
-            : null;
-  }
-
-  @Override
-  public String toString() {
-    return super.toString()
-        + ", trace_id="
-        + span.spanContext().getTraceId()
-        + ", span_id="
-        + span.spanContext().getSpanId()
-        + ", ml_app="
-        + span.getTag(LLMObsTags.ML_APP)
-        + ", service="
-        + span.getServiceName()
-        + ", span_kind="
-        + span.getTag(SPAN_KIND);
-  }
-
-  @Override
-  public void annotateIO(List<LLMObs.LLMMessage> inputData, List<LLMObs.LLMMessage> outputData) {
-    if (finished) {
-      return;
-    }
-    if (inputData != null && !inputData.isEmpty()) {
-      span.setTag(INPUT, inputData);
-    }
-    if (outputData != null && !outputData.isEmpty()) {
-      span.setTag(OUTPUT, outputData);
-    }
-  }
-
-  @Override
-  public void annotateEmbeddingIO(List<LLMObs.Document> inputDocuments, String outputData) {
-    if (finished) {
-      return;
-    }
-    if (inputDocuments != null && !inputDocuments.isEmpty()) {
-      span.setTag(INPUT, inputDocuments);
-    }
-    if (outputData != null && !outputData.isEmpty()) {
-      span.setTag(OUTPUT, outputData);
-    }
-  }
-
-  @Override
-  public void annotateRetrievalIO(String inputData, List<LLMObs.Document> outputDocuments) {
-    if (finished) {
-      return;
-    }
-    if (inputData != null && !inputData.isEmpty()) {
-      span.setTag(INPUT, inputData);
-    }
-    if (outputDocuments != null && !outputDocuments.isEmpty()) {
-      span.setTag(OUTPUT, outputDocuments);
-    }
-  }
-
-  @Override
-  public void annotateIO(String inputData, String outputData) {
-    if (finished) {
-      return;
-    }
-    boolean hasInput = inputData != null && !inputData.isEmpty();
-    boolean hasOutput = outputData != null && !outputData.isEmpty();
-    if (Tags.LLMOBS_LLM_SPAN_KIND.equals(spanKind)) {
-      List<LLMObs.LLMMessage> inputMessages =
-          hasInput
-              ? Collections.singletonList(
-                  LLMObs.LLMMessage.from(LLM_MESSAGE_UNKNOWN_ROLE, inputData))
-              : null;
-      List<LLMObs.LLMMessage> outputMessages =
-          hasOutput
-              ? Collections.singletonList(
-                  LLMObs.LLMMessage.from(LLM_MESSAGE_UNKNOWN_ROLE, outputData))
-              : null;
-      annotateIO(inputMessages, outputMessages);
-      if (hasInput || hasOutput) {
-        LOGGER.warn(
-            "the span being annotated is an LLM span, it is recommended to use the overload with List<LLMObs.LLMMessage> as arguments");
-      }
-      return;
-    }
-    if (Tags.LLMOBS_EMBEDDING_SPAN_KIND.equals(spanKind)) {
-      List<LLMObs.Document> inputDocuments =
-          hasInput ? Collections.singletonList(LLMObs.Document.from(inputData)) : null;
-      annotateEmbeddingIO(inputDocuments, outputData);
-      if (hasInput) {
-        LOGGER.warn(
-            "the span being annotated is an embedding span, it is recommended to use annotateEmbeddingIO");
-      }
-      return;
-    }
-    if (Tags.LLMOBS_RETRIEVAL_SPAN_KIND.equals(spanKind)) {
-      List<LLMObs.Document> outputDocuments =
-          hasOutput ? Collections.singletonList(LLMObs.Document.from(outputData)) : null;
-      annotateRetrievalIO(inputData, outputDocuments);
-      if (hasOutput) {
-        LOGGER.warn(
-            "the span being annotated is a retrieval span, it is recommended to use annotateRetrievalIO");
-      }
-      return;
-    }
-    if (hasInput) {
-      span.setTag(INPUT, inputData);
-    }
-    if (hasOutput) {
-      span.setTag(OUTPUT, outputData);
-    }
-  }
-
-  @Override
-  public void annotatePrompt(LLMObs.Prompt prompt) {
-    if (finished || prompt == null) {
-      return;
-    }
-    if (!Tags.LLMOBS_LLM_SPAN_KIND.equals(spanKind)) {
-      LOGGER.warn(
-          "dropping prompt on non-LLM span kind, annotating prompts is only supported for LLM span kinds");
-      return;
-    }
-
-    Map<String, Object> annotatedPrompt = new LinkedHashMap<>();
-    Object currentPrompt = span.getTag(INPUT_PROMPT);
-    if (currentPrompt instanceof Map) {
-      annotatedPrompt.putAll(copyStringKeyedMap((Map<?, ?>) currentPrompt));
-    }
-    if (prompt.getId() != null && !prompt.getId().isEmpty()) {
-      annotatedPrompt.put("id", prompt.getId());
-    }
-    if (!annotatedPrompt.containsKey("id")) {
-      annotatedPrompt.put("id", mlApp + "_" + DEFAULT_PROMPT_NAME);
-    }
-    putIfPresent(annotatedPrompt, "version", prompt.getVersion());
-    putIfPresent(annotatedPrompt, "variables", prompt.getVariables());
-    if (prompt.getTemplate() != null) {
-      annotatedPrompt.remove("chat_template");
-      annotatedPrompt.put("template", prompt.getTemplate());
-    } else if (prompt.getChatTemplate() != null && !prompt.getChatTemplate().isEmpty()) {
-      annotatedPrompt.remove("template");
-      annotatedPrompt.put("chat_template", toChatTemplate(prompt.getChatTemplate()));
-    }
-    putIfPresent(annotatedPrompt, "tags", prompt.getTags());
-    annotatedPrompt.put(
-        CONTEXT_VARIABLE_KEYS,
-        prompt.getContextVariables() == null
-            ? Collections.singletonList("context")
-            : prompt.getContextVariables());
-    annotatedPrompt.put(
-        QUERY_VARIABLE_KEYS,
-        prompt.getQueryVariables() == null
-            ? Collections.singletonList("question")
-            : prompt.getQueryVariables());
-
-    span.setTag(INPUT_PROMPT, annotatedPrompt);
-    span.setTag(PROMPT_TRACKING_INSTRUMENTATION_METHOD, INSTRUMENTATION_METHOD_ANNOTATED);
-  }
-
-  @Override
-  public void annotateAgentManifest(LLMObs.AgentManifest manifest) {
-    if (finished || manifest == null) {
-      return;
-    }
-    if (!Tags.LLMOBS_AGENT_SPAN_KIND.equals(spanKind)) {
-      LOGGER.warn(
-          "dropping agent manifest on non-agent span kind; annotateAgentManifest is only supported for agent spans");
-      return;
-    }
-    // The manifest rides inside metadata under the reserved _dd namespace, serializing to
-    // meta.metadata._dd.agent_manifest
-    Map<String, Object> metadata = copyStringKeyedMap(span.getTag(METADATA));
-    Map<String, Object> dd = copyStringKeyedMap(metadata.get(METADATA_DD));
-    // Empty on the first call; merges with itself on subsequent ones.
-    Map<String, Object> base = copyStringKeyedMap(dd.get(LLMObsTags.AGENT_MANIFEST));
-
-    mergeManifest(base, manifest);
-    base.put("framework", MANUAL_FRAMEWORK);
-
-    dd.put(LLMObsTags.AGENT_MANIFEST, base);
-    metadata.put(METADATA_DD, dd);
-    span.setTag(METADATA, metadata);
-
-    // Sync pagent name to the manifest name so the serializer emits the manifest name in
-    // agent_attribution. The manifest name takes priority over the span name set at construction.
-    span.setTag(PAGENT_NAME_TAG_INTERNAL, (String) base.get("name"));
-  }
-
-  private void mergeManifest(Map<String, Object> base, LLMObs.AgentManifest manifest) {
-    // name: new non-empty wins, else keep existing, else span name
-    String manifestName = manifest.getName();
-    if (manifestName != null && !manifestName.isEmpty()) {
-      base.put("name", manifestName);
-    } else if (!base.containsKey("name")) {
-      CharSequence spanName = span.getSpanName();
-      if (spanName != null && spanName.length() > 0) {
-        base.put("name", spanName.toString());
-      }
-    }
-    // instructions
-    String instructions = manifest.getInstructions();
-    if (instructions != null && !instructions.isEmpty()) {
-      base.put("instructions", instructions);
-    }
-    // model
-    String model = manifest.getModel();
-    if (model != null && !model.isEmpty()) {
-      base.put("model", model);
-    }
-    // model_settings: shallow merge
-    Map<String, Object> modelSettings = manifest.getModelSettings();
-    if (modelSettings != null && !modelSettings.isEmpty()) {
-      @SuppressWarnings("unchecked")
-      Map<String, Object> existingSettings =
-          (base.get("model_settings") instanceof Map)
-              ? new LinkedHashMap<>((Map<String, Object>) base.get("model_settings"))
-              : new LinkedHashMap<>();
-      existingSettings.putAll(modelSettings);
-      base.put("model_settings", existingSettings);
-    }
-    // tools: replace if non-null non-empty
-    List<LLMObs.AgentTool> tools = manifest.getTools();
-    if (tools != null && !tools.isEmpty()) {
-      List<Map<String, Object>> toolList = new ArrayList<>();
-      for (LLMObs.AgentTool tool : tools) {
-        String toolName = tool == null ? null : tool.getName();
-        if (toolName == null || toolName.isEmpty()) {
-          LOGGER.warn("agent manifest tool missing required name; skipping");
-          continue;
-        }
-        Map<String, Object> toolMap = new LinkedHashMap<>();
-        toolMap.put("name", toolName);
-        if (tool.getDescription() != null) {
-          toolMap.put("description", tool.getDescription());
-        }
-        if (tool.getParameters() != null && !tool.getParameters().isEmpty()) {
-          toolMap.put("parameters", new LinkedHashMap<>(tool.getParameters()));
-        }
-        toolList.add(toolMap);
-      }
-      if (!toolList.isEmpty()) {
-        base.put("tools", toolList);
-      }
-    }
-  }
-
-  /** Copies {@code source} if it is a map, else returns an empty mutable map. */
-  private static Map<String, Object> copyStringKeyedMap(Object source) {
-    return source instanceof Map
-        ? copyStringKeyedMap((Map<?, ?>) source)
-        : new LinkedHashMap<String, Object>();
-  }
-
-  private static Map<String, Object> copyStringKeyedMap(Map<?, ?> source) {
-    Map<String, Object> copy = new LinkedHashMap<>();
-    for (Map.Entry<?, ?> entry : source.entrySet()) {
-      if (entry.getKey() instanceof String) {
-        copy.put((String) entry.getKey(), entry.getValue());
-      }
-    }
-    return copy;
-  }
-
-  private static void putIfPresent(Map<String, Object> prompt, String key, Object value) {
-    if (value != null) {
-      prompt.put(key, value);
-    }
-  }
-
-  private static List<Map<String, String>> toChatTemplate(List<LLMObs.LLMMessage> messages) {
-    List<Map<String, String>> chatTemplate = new ArrayList<>(messages.size());
-    for (LLMObs.LLMMessage message : messages) {
-      if (message == null || message.getRole() == null || message.getContent() == null) {
-        LOGGER.warn("prompt chat template messages must define both role and content; skipping");
-        continue;
-      }
-      Map<String, String> templateMessage = new LinkedHashMap<>();
-      templateMessage.put("role", message.getRole());
-      templateMessage.put("content", message.getContent());
-      chatTemplate.add(templateMessage);
-    }
-    return chatTemplate;
-  }
-
-  @Override
-  public void setToolDefinitions(List<LLMObs.ToolDefinition> toolDefinitions) {
-    if (finished || toolDefinitions == null || toolDefinitions.isEmpty()) {
-      return;
-    }
-    List<LLMObs.ToolDefinition> validToolDefinitions = new ArrayList<>(toolDefinitions.size());
-    for (int i = 0; i < toolDefinitions.size(); i++) {
-      LLMObs.ToolDefinition toolDefinition = toolDefinitions.get(i);
-      if (toolDefinition == null) {
-        LOGGER.warn("tool definition at index {} is null; skipping", i);
-        continue;
-      }
-      if (toolDefinition.getName() == null || toolDefinition.getName().isEmpty()) {
-        LOGGER.warn("tool definition at index {} must have a non-empty name; skipping", i);
-        continue;
-      }
-      validToolDefinitions.add(toolDefinition);
-    }
-    if (!validToolDefinitions.isEmpty()) {
-      span.setTag(TOOL_DEFINITIONS, validToolDefinitions);
-    }
-  }
-
-  @Override
-  public void setMetadata(Map<String, Object> metadata) {
-    if (finished) {
-      return;
-    }
-    Object value = span.getTag(METADATA);
-    if (value == null) {
-      span.setTag(METADATA, new HashMap<>(metadata));
-      return;
-    }
-
-    if (value instanceof Map) {
-      Map<String, Object> mergedMetadata = copyStringKeyedMap((Map<?, ?>) value);
-      // Reserved entries already under _dd, such as the agent manifest, must survive a later
-      // annotation: putAll would replace the whole _dd map if the caller supplies one, so merge
-      // that namespace key by key instead, letting the caller win per key.
-      Map<String, Object> reservedDd = copyStringKeyedMap(mergedMetadata.get(METADATA_DD));
-      mergedMetadata.putAll(metadata);
-      if (!reservedDd.isEmpty()) {
-        reservedDd.putAll(copyStringKeyedMap(mergedMetadata.get(METADATA_DD)));
-        mergedMetadata.put(METADATA_DD, reservedDd);
-      }
-      span.setTag(METADATA, mergedMetadata);
-    } else {
-      LOGGER.debug(
-          "unexpected instance type for metadata {}, overwriting for now",
-          value.getClass().getName());
-      span.setTag(METADATA, new HashMap<>(metadata));
-    }
-  }
-
-  @Override
-  public void setMetrics(Map<String, Number> metrics) {
-    if (finished) {
-      return;
-    }
-    for (Map.Entry<String, Number> entry : metrics.entrySet()) {
-      span.setMetric(LLMOBS_METRIC_PREFIX + entry.getKey(), entry.getValue().doubleValue());
-    }
-  }
-
-  @Override
-  public void setMetric(CharSequence key, int value) {
-    if (finished) {
-      return;
-    }
-    span.setMetric(LLMOBS_METRIC_PREFIX + key, value);
-  }
-
-  @Override
-  public void setMetric(CharSequence key, long value) {
-    if (finished) {
-      return;
-    }
-    span.setMetric(LLMOBS_METRIC_PREFIX + key, value);
-  }
-
-  @Override
-  public void setMetric(CharSequence key, double value) {
-    if (finished) {
-      return;
-    }
-    span.setMetric(LLMOBS_METRIC_PREFIX + key, value);
-  }
-
-  @Override
-  public void setTags(Map<String, Object> tags) {
-    if (finished) {
-      return;
-    }
-    if (tags != null && !tags.isEmpty()) {
-      for (Map.Entry<String, Object> entry : tags.entrySet()) {
-        span.setTag(LLMOBS_TAG_PREFIX + entry.getKey(), entry.getValue());
-      }
-    }
-  }
-
-  @Override
-  public void setTag(String key, String value) {
-    if (finished) {
-      return;
-    }
-    span.setTag(LLMOBS_TAG_PREFIX + key, value);
-  }
-
-  @Override
-  public void setTag(String key, boolean value) {
-    if (finished) {
-      return;
-    }
-    span.setTag(LLMOBS_TAG_PREFIX + key, value);
-  }
-
-  @Override
-  public void setTag(String key, int value) {
-    if (finished) {
-      return;
-    }
-    span.setTag(LLMOBS_TAG_PREFIX + key, value);
-  }
-
-  @Override
-  public void setTag(String key, long value) {
-    if (finished) {
-      return;
-    }
-    span.setTag(LLMOBS_TAG_PREFIX + key, value);
-  }
-
-  @Override
-  public void setTag(String key, double value) {
-    if (finished) {
-      return;
-    }
-    span.setTag(LLMOBS_TAG_PREFIX + key, value);
-  }
-
-  @Override
-  public void setError(boolean error) {
-    if (finished) {
-      return;
-    }
-    span.setError(error);
-  }
-
-  @Override
-  public void setErrorMessage(String errorMessage) {
-    if (finished) {
-      return;
-    }
-    if (errorMessage == null || errorMessage.isEmpty()) {
-      return;
-    }
-    span.setError(true);
-    span.setErrorMessage(errorMessage);
-  }
-
-  @Override
-  public void addThrowable(Throwable throwable) {
-    if (finished) {
-      return;
-    }
-    if (throwable == null) {
-      return;
-    }
-    span.setError(true);
-    span.addThrowable(throwable);
-  }
-
-  @Override
-  public void finish() {
-    if (finished) {
-      return;
-    }
-    try {
-      GenAiApmTags.apply(span);
-    } catch (Throwable t) {
-      LOGGER.debug("failed to set gen_ai APM tags", t);
-    }
-    span.finish();
-    if (standaloneApmScope != null) {
-      standaloneApmScope.close();
-    }
-    scope.close();
-    finished = true;
-    boolean isRootSpan = span.getLocalRootSpan() == span;
-    LLMObsMetricCollector.get()
-        .recordSpanFinished(
-            LLM_OBS_INSTRUMENTATION_NAME,
-            spanKind,
-            isRootSpan,
-            false,
-            span.isError(),
-            hasSessionId);
-  }
-
-  @Override
-  public DDTraceId getTraceId() {
-    return span.getTraceId();
-  }
-
-  @Override
-  public long getSpanId() {
-    return span.getSpanId();
-  }
+    private static final String LLM_MESSAGE_UNKNOWN_ROLE = "unknown";
+
+    // Well known tags for LLM obs will be prefixed with _ml_obs_(tags|metrics).
+    // Prefix for tags
+    private static final String LLMOBS_TAG_PREFIX = "_ml_obs_tag.";
+    // Prefix for metrics
+    private static final String LLMOBS_METRIC_PREFIX = "_ml_obs_metric.";
+
+    // internal tags to be prefixed
+    private static final String INPUT = LLMOBS_TAG_PREFIX + "input";
+    private static final String OUTPUT = LLMOBS_TAG_PREFIX + "output";
+    private static final String INPUT_PROMPT = LLMOBS_TAG_PREFIX + "input_prompt";
+    private static final String SPAN_KIND = LLMOBS_TAG_PREFIX + Tags.SPAN_KIND;
+    private static final String METADATA = LLMOBS_TAG_PREFIX + LLMObsTags.METADATA;
+    private static final String TOOL_DEFINITIONS = LLMOBS_TAG_PREFIX + LLMObsTags.TOOL_DEFINITIONS;
+    private static final String METADATA_DD = "_dd";
+    private static final String MANUAL_FRAMEWORK = "manual";
+    private static final String PROMPT_TRACKING_INSTRUMENTATION_METHOD =
+            LLMOBS_TAG_PREFIX + "prompt_tracking_instrumentation_method";
+    private static final String INSTRUMENTATION_METHOD_ANNOTATED = "annotated";
+    private static final String DEFAULT_PROMPT_NAME = "unnamed-prompt";
+    private static final String CONTEXT_VARIABLE_KEYS = "_dd_context_variable_keys";
+    private static final String QUERY_VARIABLE_KEYS = "_dd_query_variable_keys";
+    private static final String PARENT_ID_TAG_INTERNAL = "parent_id";
+    private static final String SAMPLE_RATE_TAG_INTERNAL = "sample_rate";
+    private static final String SAMPLING_DECISION_TAG_INTERNAL = "sampling_decision";
+    private static final String PAGENT_SPAN_ID_TAG_INTERNAL = LLMOBS_TAG_PREFIX + LLMObsTags.PAGENT_SPAN_ID;
+    private static final String PAGENT_NAME_TAG_INTERNAL = LLMOBS_TAG_PREFIX + LLMObsTags.PAGENT_NAME;
+
+    private static final String SERVICE = LLMOBS_TAG_PREFIX + "service";
+    private static final String VERSION = LLMOBS_TAG_PREFIX + "version";
+    private static final String DDTRACE_VERSION = LLMOBS_TAG_PREFIX + "ddtrace.version";
+    private static final String ENV = LLMOBS_TAG_PREFIX + "env";
+
+    private static final String LLM_OBS_INSTRUMENTATION_NAME = "llmobs";
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(DDLLMObsSpan.class);
+
+    private static final LLMObsSampler CONFIGURED_SAMPLER = LLMObsSampler.fromConfig();
+
+    private final AgentSpan span;
+    private final String spanKind;
+    private final String mlApp;
+    private final boolean hasSessionId;
+    private final ContextScope scope;
+    // Non-null only for agent-kind spans started without an ambient APM root. Activating the
+    // agent's APM span keeps children in the same APM trace so the trace-ID gate passes and
+    // they inherit agent attribution correctly.
+    private final ContextScope standaloneApmScope;
+
+    private boolean finished = false;
+
+    public DDLLMObsSpan(
+            @Nonnull String kind,
+            String spanName,
+            @Nonnull String mlApp,
+            String sessionId,
+            @Nonnull String serviceName,
+            WellKnownTags wellKnownTags) {
+        this(kind, spanName, mlApp, sessionId, serviceName, wellKnownTags, null);
+    }
+
+    public DDLLMObsSpan(
+            @Nonnull String kind,
+            String spanName,
+            @Nonnull String mlApp,
+            String sessionId,
+            @Nonnull String serviceName,
+            WellKnownTags wellKnownTags,
+            String agentVersion) {
+        this(kind, spanName, mlApp, sessionId, serviceName, wellKnownTags, agentVersion, CONFIGURED_SAMPLER);
+    }
+
+    DDLLMObsSpan(
+            @Nonnull String kind,
+            String spanName,
+            @Nonnull String mlApp,
+            String sessionId,
+            @Nonnull String serviceName,
+            WellKnownTags wellKnownTags,
+            String agentVersion,
+            @Nonnull LLMObsSampler sampler) {
+
+        if (null == spanName || spanName.isEmpty()) {
+            spanName = kind;
+        }
+
+        AgentTracer.SpanBuilder spanBuilder = AgentTracer.get()
+                .buildSpan(LLM_OBS_INSTRUMENTATION_NAME, spanName)
+                .withServiceName(serviceName)
+                .withSpanType(DDSpanTypes.LLMOBS);
+
+        span = spanBuilder.start();
+
+        // set global dd_tags as base layer so UST and span-level tags can override them
+        for (Map.Entry<String, String> entry : Config.get().getGlobalTags().entrySet()) {
+            span.setTag(LLMOBS_TAG_PREFIX + entry.getKey(), entry.getValue());
+        }
+
+        // set UST (unified service tags, env, service, version)
+        span.setTag(ENV, wellKnownTags.getEnv());
+        span.setTag(SERVICE, wellKnownTags.getService());
+        span.setTag(VERSION, wellKnownTags.getVersion());
+        span.setTag(DDTRACE_VERSION, DDTraceApiInfo.VERSION);
+
+        span.setTag(SPAN_KIND, kind);
+        spanKind = kind;
+        this.mlApp = mlApp;
+        span.setTag(LLMOBS_TAG_PREFIX + LLMObsTags.ML_APP, mlApp);
+        // Resolve effective parent_id, session_id, agent_version, agent attribution and sampling
+        // decision from the LLMObs context, all gated on trace-id consistency. A stale context from a
+        // different trace (e.g. async boundary leakage) must not contribute any of them. Every
+        // inherited value is read inside the one same-trace branch below, so a newly propagated tag
+        // cannot ship with a weaker gate of its own.
+        AgentSpanContext parent = LLMObsContext.current();
+        String parentSpanID = LLMObsContext.ROOT_SPAN_ID;
+        String resolvedAgentVersion = agentVersion;
+        String sampleRate = null;
+        String samplingDecision = null;
+        String resolvedParentAgentSpanId = null;
+        String resolvedParentAgentName = null;
+        if (null != parent) {
+            if (parent.getTraceId() != span.getTraceId()) {
+                LOGGER.error(
+                        "trace ID mismatch, retrieved parent from context trace_id={}, span_id={}, started span trace_id={}, span_id={}",
+                        parent.getTraceId(),
+                        parent.getSpanId(),
+                        span.getTraceId(),
+                        span.getSpanId());
+            } else {
+                parentSpanID = String.valueOf(parent.getSpanId());
+                // Inherit session_id from parent context only when it belongs to the same trace.
+                // Matches dd-trace-py and dd-trace-js: session_id need only be set on the root
+                // span; descendants inherit transitively via context propagation.
+                if (sessionId == null || sessionId.isEmpty()) {
+                    String inherited = LLMObsContext.currentSessionId();
+                    if (inherited != null && !inherited.isEmpty()) {
+                        sessionId = inherited;
+                    }
+                }
+                // Inherit agent_version from the enclosing agent span, if this span doesn't set its own.
+                // An explicit value always wins, so a nested agent's own version overrides an ancestor's
+                // for its own subtree, matching session_id's explicit-wins semantics.
+                if (agentVersion == null || agentVersion.isEmpty()) {
+                    String inherited = LLMObsContext.currentAgentVersion();
+                    if (inherited != null && !inherited.isEmpty()) {
+                        resolvedAgentVersion = inherited;
+                    }
+                }
+                // Inherit the sampling decision from the context if present.
+                sampleRate = LLMObsContext.currentSampleRate();
+                samplingDecision = LLMObsContext.currentSamplingDecision();
+                // Inherit agent attribution: the nearest agent-kind ancestor. Overridden just below when
+                // this span is itself an agent.
+                resolvedParentAgentSpanId = LLMObsContext.currentParentAgentSpanId();
+                resolvedParentAgentName = LLMObsContext.currentParentAgentName();
+            }
+        }
+
+        // An agent span is its own descendants' nearest agent ancestor, replacing anything inherited.
+        // Use the span name as the initial pagent name; annotateAgentManifest() will update it to the
+        // manifest name if one is provided later.
+        if (Tags.LLMOBS_AGENT_SPAN_KIND.equals(kind)) {
+            resolvedParentAgentSpanId = String.valueOf(span.getSpanId());
+            resolvedParentAgentName = spanName;
+        }
+
+        if (samplingDecision == null || sampleRate == null) {
+            sampleRate = sampler.formattedRate();
+            samplingDecision = sampler.sample(span.getTraceId().toLong())
+                    ? LLMObsContext.SAMPLING_DECISION_SAMPLED
+                    : LLMObsContext.SAMPLING_DECISION_DROPPED;
+        }
+        span.setTag(LLMOBS_TAG_PREFIX + SAMPLE_RATE_TAG_INTERNAL, sampleRate);
+        span.setTag(LLMOBS_TAG_PREFIX + SAMPLING_DECISION_TAG_INTERNAL, samplingDecision);
+
+        this.hasSessionId = sessionId != null && !sessionId.isEmpty();
+        if (this.hasSessionId) {
+            span.setTag(LLMOBS_TAG_PREFIX + LLMObsTags.SESSION_ID, sessionId);
+        }
+        if (resolvedAgentVersion != null && !resolvedAgentVersion.isEmpty()) {
+            span.setTag(LLMOBS_TAG_PREFIX + LLMObsTags.AGENT_VERSION, resolvedAgentVersion);
+        }
+        span.setTag(LLMOBS_TAG_PREFIX + PARENT_ID_TAG_INTERNAL, parentSpanID);
+        // Store pagent values as internal tags so the serializer can emit agent_attribution.
+        if (resolvedParentAgentSpanId != null) {
+            span.setTag(PAGENT_SPAN_ID_TAG_INTERNAL, resolvedParentAgentSpanId);
+            if (resolvedParentAgentName != null) {
+                span.setTag(PAGENT_NAME_TAG_INTERNAL, resolvedParentAgentName);
+            }
+        }
+
+        // Propagate the effective sessionId, agent_version, sampling decision and agent attribution
+        // to descendant LLMObs spans via the context.
+        scope = LLMObsContext.attach(
+                span.spanContext(),
+                sessionId,
+                resolvedAgentVersion,
+                sampleRate,
+                samplingDecision,
+                resolvedParentAgentSpanId,
+                resolvedParentAgentName);
+
+        // For standalone agent spans (no ambient APM root), activate the underlying APM span so
+        // that child LLMObs spans share the same trace ID and pass the trace-ID gate. Without
+        // this, children start a fresh APM trace, the gate rejects the agent context, and
+        // agent attribution is silently dropped.
+        standaloneApmScope = Tags.LLMOBS_AGENT_SPAN_KIND.equals(kind) && span.getLocalRootSpan() == span
+                ? AgentTracer.activateSpan(span)
+                : null;
+    }
+
+    @Override
+    public String toString() {
+        return super.toString()
+                + ", trace_id="
+                + span.spanContext().getTraceId()
+                + ", span_id="
+                + span.spanContext().getSpanId()
+                + ", ml_app="
+                + span.getTag(LLMObsTags.ML_APP)
+                + ", service="
+                + span.getServiceName()
+                + ", span_kind="
+                + span.getTag(SPAN_KIND);
+    }
+
+    @Override
+    public void annotateIO(List<LLMObs.LLMMessage> inputData, List<LLMObs.LLMMessage> outputData) {
+        if (finished) {
+            return;
+        }
+        if (inputData != null && !inputData.isEmpty()) {
+            span.setTag(INPUT, inputData);
+        }
+        if (outputData != null && !outputData.isEmpty()) {
+            span.setTag(OUTPUT, outputData);
+        }
+    }
+
+    @Override
+    public void annotateEmbeddingIO(List<LLMObs.Document> inputDocuments, String outputData) {
+        if (finished) {
+            return;
+        }
+        if (inputDocuments != null && !inputDocuments.isEmpty()) {
+            span.setTag(INPUT, inputDocuments);
+        }
+        if (outputData != null && !outputData.isEmpty()) {
+            span.setTag(OUTPUT, outputData);
+        }
+    }
+
+    @Override
+    public void annotateRetrievalIO(String inputData, List<LLMObs.Document> outputDocuments) {
+        if (finished) {
+            return;
+        }
+        if (inputData != null && !inputData.isEmpty()) {
+            span.setTag(INPUT, inputData);
+        }
+        if (outputDocuments != null && !outputDocuments.isEmpty()) {
+            span.setTag(OUTPUT, outputDocuments);
+        }
+    }
+
+    @Override
+    public void annotateIO(String inputData, String outputData) {
+        if (finished) {
+            return;
+        }
+        boolean hasInput = inputData != null && !inputData.isEmpty();
+        boolean hasOutput = outputData != null && !outputData.isEmpty();
+        if (Tags.LLMOBS_LLM_SPAN_KIND.equals(spanKind)) {
+            List<LLMObs.LLMMessage> inputMessages = hasInput
+                    ? Collections.singletonList(LLMObs.LLMMessage.from(LLM_MESSAGE_UNKNOWN_ROLE, inputData))
+                    : null;
+            List<LLMObs.LLMMessage> outputMessages = hasOutput
+                    ? Collections.singletonList(LLMObs.LLMMessage.from(LLM_MESSAGE_UNKNOWN_ROLE, outputData))
+                    : null;
+            annotateIO(inputMessages, outputMessages);
+            if (hasInput || hasOutput) {
+                LOGGER.warn(
+                        "the span being annotated is an LLM span, it is recommended to use the overload with List<LLMObs.LLMMessage> as arguments");
+            }
+            return;
+        }
+        if (Tags.LLMOBS_EMBEDDING_SPAN_KIND.equals(spanKind)) {
+            List<LLMObs.Document> inputDocuments =
+                    hasInput ? Collections.singletonList(LLMObs.Document.from(inputData)) : null;
+            annotateEmbeddingIO(inputDocuments, outputData);
+            if (hasInput) {
+                LOGGER.warn(
+                        "the span being annotated is an embedding span, it is recommended to use annotateEmbeddingIO");
+            }
+            return;
+        }
+        if (Tags.LLMOBS_RETRIEVAL_SPAN_KIND.equals(spanKind)) {
+            List<LLMObs.Document> outputDocuments =
+                    hasOutput ? Collections.singletonList(LLMObs.Document.from(outputData)) : null;
+            annotateRetrievalIO(inputData, outputDocuments);
+            if (hasOutput) {
+                LOGGER.warn(
+                        "the span being annotated is a retrieval span, it is recommended to use annotateRetrievalIO");
+            }
+            return;
+        }
+        if (hasInput) {
+            span.setTag(INPUT, inputData);
+        }
+        if (hasOutput) {
+            span.setTag(OUTPUT, outputData);
+        }
+    }
+
+    @Override
+    public void annotatePrompt(LLMObs.Prompt prompt) {
+        if (finished || prompt == null) {
+            return;
+        }
+        if (!Tags.LLMOBS_LLM_SPAN_KIND.equals(spanKind)) {
+            LOGGER.warn(
+                    "dropping prompt on non-LLM span kind, annotating prompts is only supported for LLM span kinds");
+            return;
+        }
+
+        Map<String, Object> annotatedPrompt = new LinkedHashMap<>();
+        Object currentPrompt = span.getTag(INPUT_PROMPT);
+        if (currentPrompt instanceof Map) {
+            annotatedPrompt.putAll(copyStringKeyedMap((Map<?, ?>) currentPrompt));
+        }
+        if (prompt.getId() != null && !prompt.getId().isEmpty()) {
+            annotatedPrompt.put("id", prompt.getId());
+        }
+        if (!annotatedPrompt.containsKey("id")) {
+            annotatedPrompt.put("id", mlApp + "_" + DEFAULT_PROMPT_NAME);
+        }
+        putIfPresent(annotatedPrompt, "version", prompt.getVersion());
+        putIfPresent(annotatedPrompt, "variables", prompt.getVariables());
+        if (prompt.getTemplate() != null) {
+            annotatedPrompt.remove("chat_template");
+            annotatedPrompt.put("template", prompt.getTemplate());
+        } else if (prompt.getChatTemplate() != null && !prompt.getChatTemplate().isEmpty()) {
+            annotatedPrompt.remove("template");
+            annotatedPrompt.put("chat_template", toChatTemplate(prompt.getChatTemplate()));
+        }
+        putIfPresent(annotatedPrompt, "tags", prompt.getTags());
+        annotatedPrompt.put(
+                CONTEXT_VARIABLE_KEYS,
+                prompt.getContextVariables() == null
+                        ? Collections.singletonList("context")
+                        : prompt.getContextVariables());
+        annotatedPrompt.put(
+                QUERY_VARIABLE_KEYS,
+                prompt.getQueryVariables() == null
+                        ? Collections.singletonList("question")
+                        : prompt.getQueryVariables());
+
+        span.setTag(INPUT_PROMPT, annotatedPrompt);
+        span.setTag(PROMPT_TRACKING_INSTRUMENTATION_METHOD, INSTRUMENTATION_METHOD_ANNOTATED);
+    }
+
+    @Override
+    public void annotateAgentManifest(LLMObs.AgentManifest manifest) {
+        if (finished || manifest == null) {
+            return;
+        }
+        if (!Tags.LLMOBS_AGENT_SPAN_KIND.equals(spanKind)) {
+            LOGGER.warn(
+                    "dropping agent manifest on non-agent span kind; annotateAgentManifest is only supported for agent spans");
+            return;
+        }
+        // The manifest rides inside metadata under the reserved _dd namespace, serializing to
+        // meta.metadata._dd.agent_manifest
+        Map<String, Object> metadata = copyStringKeyedMap(span.getTag(METADATA));
+        Map<String, Object> dd = copyStringKeyedMap(metadata.get(METADATA_DD));
+        // Empty on the first call; merges with itself on subsequent ones.
+        Map<String, Object> base = copyStringKeyedMap(dd.get(LLMObsTags.AGENT_MANIFEST));
+
+        mergeManifest(base, manifest);
+        base.put("framework", MANUAL_FRAMEWORK);
+
+        dd.put(LLMObsTags.AGENT_MANIFEST, base);
+        metadata.put(METADATA_DD, dd);
+        span.setTag(METADATA, metadata);
+
+        // Sync pagent name to the manifest name so the serializer emits the manifest name in
+        // agent_attribution. The manifest name takes priority over the span name set at construction.
+        span.setTag(PAGENT_NAME_TAG_INTERNAL, (String) base.get("name"));
+    }
+
+    private void mergeManifest(Map<String, Object> base, LLMObs.AgentManifest manifest) {
+        // name: new non-empty wins, else keep existing, else span name
+        String manifestName = manifest.getName();
+        if (manifestName != null && !manifestName.isEmpty()) {
+            base.put("name", manifestName);
+        } else if (!base.containsKey("name")) {
+            CharSequence spanName = span.getSpanName();
+            if (spanName != null && spanName.length() > 0) {
+                base.put("name", spanName.toString());
+            }
+        }
+        // instructions
+        String instructions = manifest.getInstructions();
+        if (instructions != null && !instructions.isEmpty()) {
+            base.put("instructions", instructions);
+        }
+        // model
+        String model = manifest.getModel();
+        if (model != null && !model.isEmpty()) {
+            base.put("model", model);
+        }
+        // model_settings: shallow merge
+        Map<String, Object> modelSettings = manifest.getModelSettings();
+        if (modelSettings != null && !modelSettings.isEmpty()) {
+            @SuppressWarnings("unchecked")
+            Map<String, Object> existingSettings = (base.get("model_settings") instanceof Map)
+                    ? new LinkedHashMap<>((Map<String, Object>) base.get("model_settings"))
+                    : new LinkedHashMap<>();
+            existingSettings.putAll(modelSettings);
+            base.put("model_settings", existingSettings);
+        }
+        // tools: replace if non-null non-empty
+        List<LLMObs.AgentTool> tools = manifest.getTools();
+        if (tools != null && !tools.isEmpty()) {
+            List<Map<String, Object>> toolList = new ArrayList<>();
+            for (LLMObs.AgentTool tool : tools) {
+                String toolName = tool == null ? null : tool.getName();
+                if (toolName == null || toolName.isEmpty()) {
+                    LOGGER.warn("agent manifest tool missing required name; skipping");
+                    continue;
+                }
+                Map<String, Object> toolMap = new LinkedHashMap<>();
+                toolMap.put("name", toolName);
+                if (tool.getDescription() != null) {
+                    toolMap.put("description", tool.getDescription());
+                }
+                if (tool.getParameters() != null && !tool.getParameters().isEmpty()) {
+                    toolMap.put("parameters", new LinkedHashMap<>(tool.getParameters()));
+                }
+                toolList.add(toolMap);
+            }
+            if (!toolList.isEmpty()) {
+                base.put("tools", toolList);
+            }
+        }
+    }
+
+    /** Copies {@code source} if it is a map, else returns an empty mutable map. */
+    private static Map<String, Object> copyStringKeyedMap(Object source) {
+        return source instanceof Map ? copyStringKeyedMap((Map<?, ?>) source) : new LinkedHashMap<String, Object>();
+    }
+
+    private static Map<String, Object> copyStringKeyedMap(Map<?, ?> source) {
+        Map<String, Object> copy = new LinkedHashMap<>();
+        for (Map.Entry<?, ?> entry : source.entrySet()) {
+            if (entry.getKey() instanceof String) {
+                copy.put((String) entry.getKey(), entry.getValue());
+            }
+        }
+        return copy;
+    }
+
+    private static void putIfPresent(Map<String, Object> prompt, String key, Object value) {
+        if (value != null) {
+            prompt.put(key, value);
+        }
+    }
+
+    private static List<Map<String, String>> toChatTemplate(List<LLMObs.LLMMessage> messages) {
+        List<Map<String, String>> chatTemplate = new ArrayList<>(messages.size());
+        for (LLMObs.LLMMessage message : messages) {
+            if (message == null || message.getRole() == null || message.getContent() == null) {
+                LOGGER.warn("prompt chat template messages must define both role and content; skipping");
+                continue;
+            }
+            Map<String, String> templateMessage = new LinkedHashMap<>();
+            templateMessage.put("role", message.getRole());
+            templateMessage.put("content", message.getContent());
+            chatTemplate.add(templateMessage);
+        }
+        return chatTemplate;
+    }
+
+    @Override
+    public void setToolDefinitions(List<LLMObs.ToolDefinition> toolDefinitions) {
+        if (finished || toolDefinitions == null || toolDefinitions.isEmpty()) {
+            return;
+        }
+        List<LLMObs.ToolDefinition> validToolDefinitions = new ArrayList<>(toolDefinitions.size());
+        for (int i = 0; i < toolDefinitions.size(); i++) {
+            LLMObs.ToolDefinition toolDefinition = toolDefinitions.get(i);
+            if (toolDefinition == null) {
+                LOGGER.warn("tool definition at index {} is null; skipping", i);
+                continue;
+            }
+            if (toolDefinition.getName() == null || toolDefinition.getName().isEmpty()) {
+                LOGGER.warn("tool definition at index {} must have a non-empty name; skipping", i);
+                continue;
+            }
+            validToolDefinitions.add(toolDefinition);
+        }
+        if (!validToolDefinitions.isEmpty()) {
+            span.setTag(TOOL_DEFINITIONS, validToolDefinitions);
+        }
+    }
+
+    @Override
+    public void setMetadata(Map<String, Object> metadata) {
+        if (finished) {
+            return;
+        }
+        Object value = span.getTag(METADATA);
+        if (value == null) {
+            span.setTag(METADATA, new HashMap<>(metadata));
+            return;
+        }
+
+        if (value instanceof Map) {
+            Map<String, Object> mergedMetadata = copyStringKeyedMap((Map<?, ?>) value);
+            // Reserved entries already under _dd, such as the agent manifest, must survive a later
+            // annotation: putAll would replace the whole _dd map if the caller supplies one, so merge
+            // that namespace key by key instead, letting the caller win per key.
+            Map<String, Object> reservedDd = copyStringKeyedMap(mergedMetadata.get(METADATA_DD));
+            mergedMetadata.putAll(metadata);
+            if (!reservedDd.isEmpty()) {
+                reservedDd.putAll(copyStringKeyedMap(mergedMetadata.get(METADATA_DD)));
+                mergedMetadata.put(METADATA_DD, reservedDd);
+            }
+            span.setTag(METADATA, mergedMetadata);
+        } else {
+            LOGGER.debug(
+                    "unexpected instance type for metadata {}, overwriting for now",
+                    value.getClass().getName());
+            span.setTag(METADATA, new HashMap<>(metadata));
+        }
+    }
+
+    @Override
+    public void setMetrics(Map<String, Number> metrics) {
+        if (finished) {
+            return;
+        }
+        for (Map.Entry<String, Number> entry : metrics.entrySet()) {
+            span.setMetric(
+                    LLMOBS_METRIC_PREFIX + entry.getKey(), entry.getValue().doubleValue());
+        }
+    }
+
+    @Override
+    public void setMetric(CharSequence key, int value) {
+        if (finished) {
+            return;
+        }
+        span.setMetric(LLMOBS_METRIC_PREFIX + key, value);
+    }
+
+    @Override
+    public void setMetric(CharSequence key, long value) {
+        if (finished) {
+            return;
+        }
+        span.setMetric(LLMOBS_METRIC_PREFIX + key, value);
+    }
+
+    @Override
+    public void setMetric(CharSequence key, double value) {
+        if (finished) {
+            return;
+        }
+        span.setMetric(LLMOBS_METRIC_PREFIX + key, value);
+    }
+
+    @Override
+    public void setTags(Map<String, Object> tags) {
+        if (finished) {
+            return;
+        }
+        if (tags != null && !tags.isEmpty()) {
+            for (Map.Entry<String, Object> entry : tags.entrySet()) {
+                span.setTag(LLMOBS_TAG_PREFIX + entry.getKey(), entry.getValue());
+            }
+        }
+    }
+
+    @Override
+    public void setTag(String key, String value) {
+        if (finished) {
+            return;
+        }
+        span.setTag(LLMOBS_TAG_PREFIX + key, value);
+    }
+
+    @Override
+    public void setTag(String key, boolean value) {
+        if (finished) {
+            return;
+        }
+        span.setTag(LLMOBS_TAG_PREFIX + key, value);
+    }
+
+    @Override
+    public void setTag(String key, int value) {
+        if (finished) {
+            return;
+        }
+        span.setTag(LLMOBS_TAG_PREFIX + key, value);
+    }
+
+    @Override
+    public void setTag(String key, long value) {
+        if (finished) {
+            return;
+        }
+        span.setTag(LLMOBS_TAG_PREFIX + key, value);
+    }
+
+    @Override
+    public void setTag(String key, double value) {
+        if (finished) {
+            return;
+        }
+        span.setTag(LLMOBS_TAG_PREFIX + key, value);
+    }
+
+    @Override
+    public void setError(boolean error) {
+        if (finished) {
+            return;
+        }
+        span.setError(error);
+    }
+
+    @Override
+    public void setErrorMessage(String errorMessage) {
+        if (finished) {
+            return;
+        }
+        if (errorMessage == null || errorMessage.isEmpty()) {
+            return;
+        }
+        span.setError(true);
+        span.setErrorMessage(errorMessage);
+    }
+
+    @Override
+    public void addThrowable(Throwable throwable) {
+        if (finished) {
+            return;
+        }
+        if (throwable == null) {
+            return;
+        }
+        span.setError(true);
+        span.addThrowable(throwable);
+    }
+
+    @Override
+    public void finish() {
+        if (finished) {
+            return;
+        }
+        try {
+            GenAiApmTags.apply(span);
+        } catch (Throwable t) {
+            LOGGER.debug("failed to set gen_ai APM tags", t);
+        }
+        span.finish();
+        if (standaloneApmScope != null) {
+            standaloneApmScope.close();
+        }
+        scope.close();
+        finished = true;
+        boolean isRootSpan = span.getLocalRootSpan() == span;
+        LLMObsMetricCollector.get()
+                .recordSpanFinished(
+                        LLM_OBS_INSTRUMENTATION_NAME, spanKind, isRootSpan, false, span.isError(), hasSessionId);
+    }
+
+    @Override
+    public DDTraceId getTraceId() {
+        return span.getTraceId();
+    }
+
+    @Override
+    public long getSpanId() {
+        return span.getSpanId();
+    }
 }
diff --git a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/IntakeTags.java b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/IntakeTags.java
index 05764000928..8ac03d93a86 100644
--- a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/IntakeTags.java
+++ b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/IntakeTags.java
@@ -8,26 +8,25 @@
 /** Tag helpers shared by the payloads sent to the eval metric intake. */
 final class IntakeTags {
 
-  private IntakeTags() {}
+    private IntakeTags() {}
 
-  /**
-   * Flattens user tags into the {@code key:value} strings the intake expects.
-   *
-   * @param userTags the user supplied tags, may be {@code null}
-   * @param baseTags the already flattened tags to prepend, in order
-   * @return the flattened tag list
-   */
-  static List<String> flatten(@Nullable Map<String, Object> userTags, String... baseTags) {
-    List<String> tagList =
-        new ArrayList<>((userTags == null ? 0 : userTags.size()) + baseTags.length);
-    for (String baseTag : baseTags) {
-      tagList.add(baseTag);
+    /**
+     * Flattens user tags into the {@code key:value} strings the intake expects.
+     *
+     * @param userTags the user supplied tags, may be {@code null}
+     * @param baseTags the already flattened tags to prepend, in order
+     * @return the flattened tag list
+     */
+    static List<String> flatten(@Nullable Map<String, Object> userTags, String... baseTags) {
+        List<String> tagList = new ArrayList<>((userTags == null ? 0 : userTags.size()) + baseTags.length);
+        for (String baseTag : baseTags) {
+            tagList.add(baseTag);
+        }
+        if (userTags != null) {
+            for (Map.Entry<String, Object> entry : userTags.entrySet()) {
+                tagList.add(entry.getKey() + ":" + entry.getValue());
+            }
+        }
+        return tagList;
     }
-    if (userTags != null) {
-      for (Map.Entry<String, Object> entry : userTags.entrySet()) {
-        tagList.add(entry.getKey() + ":" + entry.getValue());
-      }
-    }
-    return tagList;
-  }
 }
diff --git a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/LLMObsEval.java b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/LLMObsEval.java
index f38f00f4c4c..7cbaf03434d 100644
--- a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/LLMObsEval.java
+++ b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/LLMObsEval.java
@@ -12,135 +12,127 @@
 import javax.annotation.Nullable;
 
 public abstract class LLMObsEval {
-  private static final String METRIC_TYPE_SCORE = "score";
-  private static final String METRIC_TYPE_CATEGORICAL = "categorical";
-
-  private static final String EVENT_KIND_EVALUATION = "evaluation";
-
-  /**
-   * Discriminates evaluations from feedback, mirroring dd-trace-py and dd-trace-js. Purely
-   * additive: the rest of the v1 payload is unchanged.
-   */
-  public final String event_kind = EVENT_KIND_EVALUATION;
-
-  public final String trace_id;
-  public final String span_id;
-  public final long timestamp_ms;
-  public final String ml_app;
-  public final String metric_type;
-  public final String label;
-  public final List<String> tags;
-
-  public LLMObsEval(
-      String traceID,
-      String spanID,
-      long timestampMs,
-      String mlApp,
-      String metricType,
-      String label,
-      Map<String, Object> tags) {
-    this.trace_id = traceID;
-    this.span_id = spanID;
-    this.timestamp_ms = timestampMs;
-    this.ml_app = mlApp;
-    this.metric_type = metricType;
-    this.label = label;
-    this.tags = tags == null ? null : IntakeTags.flatten(tags);
-  }
-
-  /**
-   * Returns a serializer turning a batch of evaluations into an intake request body.
-   *
-   * @return the batch serializer
-   */
-  public static LLMObsIntakeWorker.BatchSerializer<LLMObsEval> batchSerializer() {
-    Moshi moshi = new Moshi.Builder().add(LLMObsEval.class, new Adapter()).build();
-    JsonAdapter<Request> requestAdapter = moshi.adapter(Request.class);
-    return batch -> requestAdapter.toJson(new Request(batch));
-  }
-
-  public static final class Adapter extends JsonAdapter<LLMObsEval> {
-    private final Moshi moshi = new Moshi.Builder().build();
-    private final JsonAdapter<Score> scoreJsonAdapter = moshi.adapter(Score.class);
-    private final JsonAdapter<Categorical> categoricalJsonAdapter =
-        moshi.adapter(Categorical.class);
-
-    @Nullable
-    @Override
-    public LLMObsEval fromJson(JsonReader reader) {
-      return null;
+    private static final String METRIC_TYPE_SCORE = "score";
+    private static final String METRIC_TYPE_CATEGORICAL = "categorical";
+
+    private static final String EVENT_KIND_EVALUATION = "evaluation";
+
+    /**
+     * Discriminates evaluations from feedback, mirroring dd-trace-py and dd-trace-js. Purely
+     * additive: the rest of the v1 payload is unchanged.
+     */
+    public final String event_kind = EVENT_KIND_EVALUATION;
+
+    public final String trace_id;
+    public final String span_id;
+    public final long timestamp_ms;
+    public final String ml_app;
+    public final String metric_type;
+    public final String label;
+    public final List<String> tags;
+
+    public LLMObsEval(
+            String traceID,
+            String spanID,
+            long timestampMs,
+            String mlApp,
+            String metricType,
+            String label,
+            Map<String, Object> tags) {
+        this.trace_id = traceID;
+        this.span_id = spanID;
+        this.timestamp_ms = timestampMs;
+        this.ml_app = mlApp;
+        this.metric_type = metricType;
+        this.label = label;
+        this.tags = tags == null ? null : IntakeTags.flatten(tags);
     }
 
-    @Override
-    public void toJson(JsonWriter writer, LLMObsEval value) throws IOException {
-      if (value == null) {
-        throw new JsonDataException("unexpectedly got null llm obs eval ");
-      }
-      if (value instanceof Score) {
-        scoreJsonAdapter.toJson(writer, (Score) value);
-      } else if (value instanceof Categorical) {
-        categoricalJsonAdapter.toJson(writer, (Categorical) value);
-      } else {
-        throw new JsonDataException("Unknown llm obs eval subclass: " + value.getClass());
-      }
+    /**
+     * Returns a serializer turning a batch of evaluations into an intake request body.
+     *
+     * @return the batch serializer
+     */
+    public static LLMObsIntakeWorker.BatchSerializer<LLMObsEval> batchSerializer() {
+        Moshi moshi = new Moshi.Builder().add(LLMObsEval.class, new Adapter()).build();
+        JsonAdapter<Request> requestAdapter = moshi.adapter(Request.class);
+        return batch -> requestAdapter.toJson(new Request(batch));
     }
-  }
-
-  public static final class Score extends LLMObsEval {
-    public final double score_value;
-
-    public Score(
-        String traceID,
-        long spanID,
-        long timestampMS,
-        String mlApp,
-        String label,
-        Map<String, Object> tags,
-        double scoreValue) {
-      super(traceID, String.valueOf(spanID), timestampMS, mlApp, METRIC_TYPE_SCORE, label, tags);
-      this.score_value = scoreValue;
-    }
-  }
-
-  public static final class Categorical extends LLMObsEval {
-    public final String categorical_value;
-
-    public Categorical(
-        String traceID,
-        long spanID,
-        long timestampMS,
-        String mlApp,
-        String label,
-        Map<String, Object> tags,
-        String categoricalValue) {
-      super(
-          traceID,
-          String.valueOf(spanID),
-          timestampMS,
-          mlApp,
-          METRIC_TYPE_CATEGORICAL,
-          label,
-          tags);
-      this.categorical_value = categoricalValue;
-    }
-  }
 
-  public static final class Request {
-    public final Data data;
+    public static final class Adapter extends JsonAdapter<LLMObsEval> {
+        private final Moshi moshi = new Moshi.Builder().build();
+        private final JsonAdapter<Score> scoreJsonAdapter = moshi.adapter(Score.class);
+        private final JsonAdapter<Categorical> categoricalJsonAdapter = moshi.adapter(Categorical.class);
+
+        @Nullable
+        @Override
+        public LLMObsEval fromJson(JsonReader reader) {
+            return null;
+        }
+
+        @Override
+        public void toJson(JsonWriter writer, LLMObsEval value) throws IOException {
+            if (value == null) {
+                throw new JsonDataException("unexpectedly got null llm obs eval ");
+            }
+            if (value instanceof Score) {
+                scoreJsonAdapter.toJson(writer, (Score) value);
+            } else if (value instanceof Categorical) {
+                categoricalJsonAdapter.toJson(writer, (Categorical) value);
+            } else {
+                throw new JsonDataException("Unknown llm obs eval subclass: " + value.getClass());
+            }
+        }
+    }
 
-    public static class Data {
-      public final String type = "evaluation_metric";
-      public Attributes attributes;
+    public static final class Score extends LLMObsEval {
+        public final double score_value;
+
+        public Score(
+                String traceID,
+                long spanID,
+                long timestampMS,
+                String mlApp,
+                String label,
+                Map<String, Object> tags,
+                double scoreValue) {
+            super(traceID, String.valueOf(spanID), timestampMS, mlApp, METRIC_TYPE_SCORE, label, tags);
+            this.score_value = scoreValue;
+        }
     }
 
-    public static class Attributes {
-      public List<LLMObsEval> metrics;
+    public static final class Categorical extends LLMObsEval {
+        public final String categorical_value;
+
+        public Categorical(
+                String traceID,
+                long spanID,
+                long timestampMS,
+                String mlApp,
+                String label,
+                Map<String, Object> tags,
+                String categoricalValue) {
+            super(traceID, String.valueOf(spanID), timestampMS, mlApp, METRIC_TYPE_CATEGORICAL, label, tags);
+            this.categorical_value = categoricalValue;
+        }
     }
 
-    public Request(List<LLMObsEval> metrics) {
-      this.data = new Data();
-      this.data.attributes = new Attributes();
-      this.data.attributes.metrics = metrics;
+    public static final class Request {
+        public final Data data;
+
+        public static class Data {
+            public final String type = "evaluation_metric";
+            public Attributes attributes;
+        }
+
+        public static class Attributes {
+            public List<LLMObsEval> metrics;
+        }
+
+        public Request(List<LLMObsEval> metrics) {
+            this.data = new Data();
+            this.data.attributes = new Attributes();
+            this.data.attributes.metrics = metrics;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/LLMObsFeedbackEvent.java b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/LLMObsFeedbackEvent.java
index 87a282d1a27..fe9ec7aae2f 100644
--- a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/LLMObsFeedbackEvent.java
+++ b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/LLMObsFeedbackEvent.java
@@ -21,115 +21,116 @@
  */
 public final class LLMObsFeedbackEvent {
 
-  private static final String EVENT_KIND_FEEDBACK = "feedback";
-
-  private final LLMObs.Feedback feedback;
-  private final String mlApp;
-  private final List<String> tags;
-
-  public LLMObsFeedbackEvent(LLMObs.Feedback feedback, String mlApp) {
-    this.feedback = feedback;
-    this.mlApp = mlApp;
-    this.tags = buildTags(feedback.getTags(), mlApp);
-  }
-
-  public LLMObs.Feedback getFeedback() {
-    return feedback;
-  }
-
-  public String getMlApp() {
-    return mlApp;
-  }
-
-  public List<String> getTags() {
-    return tags;
-  }
-
-  private static List<String> buildTags(@Nullable Map<String, Object> userTags, String mlApp) {
-    return IntakeTags.flatten(
-        userTags, "ddtrace.version:" + DDTraceApiInfo.VERSION, "ml_app:" + mlApp);
-  }
-
-  /**
-   * Returns a serializer turning a batch of feedback events into an intake request body.
-   *
-   * @return the batch serializer
-   */
-  public static LLMObsIntakeWorker.BatchSerializer<LLMObsFeedbackEvent> batchSerializer() {
-    Moshi moshi = new Moshi.Builder().add(LLMObsFeedbackEvent.class, new Adapter()).build();
-    JsonAdapter<Request> requestAdapter = moshi.adapter(Request.class);
-    return batch -> requestAdapter.toJson(new Request(batch));
-  }
-
-  public static final class Adapter extends JsonAdapter<LLMObsFeedbackEvent> {
-    private final JsonAdapter<Object> valueAdapter =
-        new Moshi.Builder().build().adapter(Object.class);
-
-    @Nullable
-    @Override
-    public LLMObsFeedbackEvent fromJson(JsonReader reader) {
-      return null;
+    private static final String EVENT_KIND_FEEDBACK = "feedback";
+
+    private final LLMObs.Feedback feedback;
+    private final String mlApp;
+    private final List<String> tags;
+
+    public LLMObsFeedbackEvent(LLMObs.Feedback feedback, String mlApp) {
+        this.feedback = feedback;
+        this.mlApp = mlApp;
+        this.tags = buildTags(feedback.getTags(), mlApp);
+    }
+
+    public LLMObs.Feedback getFeedback() {
+        return feedback;
+    }
+
+    public String getMlApp() {
+        return mlApp;
     }
 
-    @Override
-    public void toJson(JsonWriter writer, @Nullable LLMObsFeedbackEvent event) throws IOException {
-      if (event == null) {
-        throw new JsonDataException("unexpectedly got null llm obs feedback event");
-      }
-      LLMObs.Feedback feedback = event.feedback;
-
-      writer.beginObject();
-      writer.name("event_kind").value(EVENT_KIND_FEEDBACK);
-      // Exactly one target, enforced by the builder.
-      writer.name(feedback.getTargetType().getWireKey()).value(feedback.getTargetValue());
-      writer.name("label").value(feedback.getLabel());
-      writer.name("metric_type").value(feedback.getMetricType().toString());
-      writer.name(feedback.getMetricType() + "_value");
-      valueAdapter.toJson(writer, feedback.getValue());
-      writer.name("ml_app").value(event.mlApp);
-      writer.name("timestamp_ms").value(feedback.getTimestampMs());
-
-      writer.name("submitter").beginObject();
-      writer.name("id").value(feedback.getSubmitter().getId());
-      if (feedback.getSubmitter().getType() != null) {
-        writer.name("type").value(feedback.getSubmitter().getType());
-      }
-      writer.endObject();
-
-      if (feedback.getAssessment() != null) {
-        writer.name("assessment").value(feedback.getAssessment().toString());
-      }
-      if (feedback.getReasoning() != null) {
-        writer.name("reasoning").value(feedback.getReasoning());
-      }
-
-      writer.name("tags").beginArray();
-      for (String tag : event.tags) {
-        writer.value(tag);
-      }
-      writer.endArray();
-
-      writer.endObject();
+    public List<String> getTags() {
+        return tags;
     }
-  }
 
-  /** The request envelope, identical in shape to the one used for evaluations. */
-  public static final class Request {
-    public final Data data;
+    private static List<String> buildTags(@Nullable Map<String, Object> userTags, String mlApp) {
+        return IntakeTags.flatten(userTags, "ddtrace.version:" + DDTraceApiInfo.VERSION, "ml_app:" + mlApp);
+    }
 
-    public static class Data {
-      public final String type = "evaluation_metric";
-      public Attributes attributes;
+    /**
+     * Returns a serializer turning a batch of feedback events into an intake request body.
+     *
+     * @return the batch serializer
+     */
+    public static LLMObsIntakeWorker.BatchSerializer<LLMObsFeedbackEvent> batchSerializer() {
+        Moshi moshi = new Moshi.Builder()
+                .add(LLMObsFeedbackEvent.class, new Adapter())
+                .build();
+        JsonAdapter<Request> requestAdapter = moshi.adapter(Request.class);
+        return batch -> requestAdapter.toJson(new Request(batch));
     }
 
-    public static class Attributes {
-      public List<LLMObsFeedbackEvent> metrics;
+    public static final class Adapter extends JsonAdapter<LLMObsFeedbackEvent> {
+        private final JsonAdapter<Object> valueAdapter =
+                new Moshi.Builder().build().adapter(Object.class);
+
+        @Nullable
+        @Override
+        public LLMObsFeedbackEvent fromJson(JsonReader reader) {
+            return null;
+        }
+
+        @Override
+        public void toJson(JsonWriter writer, @Nullable LLMObsFeedbackEvent event) throws IOException {
+            if (event == null) {
+                throw new JsonDataException("unexpectedly got null llm obs feedback event");
+            }
+            LLMObs.Feedback feedback = event.feedback;
+
+            writer.beginObject();
+            writer.name("event_kind").value(EVENT_KIND_FEEDBACK);
+            // Exactly one target, enforced by the builder.
+            writer.name(feedback.getTargetType().getWireKey()).value(feedback.getTargetValue());
+            writer.name("label").value(feedback.getLabel());
+            writer.name("metric_type").value(feedback.getMetricType().toString());
+            writer.name(feedback.getMetricType() + "_value");
+            valueAdapter.toJson(writer, feedback.getValue());
+            writer.name("ml_app").value(event.mlApp);
+            writer.name("timestamp_ms").value(feedback.getTimestampMs());
+
+            writer.name("submitter").beginObject();
+            writer.name("id").value(feedback.getSubmitter().getId());
+            if (feedback.getSubmitter().getType() != null) {
+                writer.name("type").value(feedback.getSubmitter().getType());
+            }
+            writer.endObject();
+
+            if (feedback.getAssessment() != null) {
+                writer.name("assessment").value(feedback.getAssessment().toString());
+            }
+            if (feedback.getReasoning() != null) {
+                writer.name("reasoning").value(feedback.getReasoning());
+            }
+
+            writer.name("tags").beginArray();
+            for (String tag : event.tags) {
+                writer.value(tag);
+            }
+            writer.endArray();
+
+            writer.endObject();
+        }
     }
 
-    public Request(List<LLMObsFeedbackEvent> metrics) {
-      this.data = new Data();
-      this.data.attributes = new Attributes();
-      this.data.attributes.metrics = metrics;
+    /** The request envelope, identical in shape to the one used for evaluations. */
+    public static final class Request {
+        public final Data data;
+
+        public static class Data {
+            public final String type = "evaluation_metric";
+            public Attributes attributes;
+        }
+
+        public static class Attributes {
+            public List<LLMObsFeedbackEvent> metrics;
+        }
+
+        public Request(List<LLMObsFeedbackEvent> metrics) {
+            this.data = new Data();
+            this.data.attributes = new Attributes();
+            this.data.attributes.metrics = metrics;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanAgentAttributionTest.java b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanAgentAttributionTest.java
index 1096fa8d219..0cc716b26c4 100644
--- a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanAgentAttributionTest.java
+++ b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanAgentAttributionTest.java
@@ -19,266 +19,267 @@
 
 class DDLLMObsSpanAgentAttributionTest {
 
-  private static final String PAGENT_SPAN_ID_TAG = "_ml_obs_tag.pagent_span_id";
-  private static final String PAGENT_NAME_TAG = "_ml_obs_tag.pagent_name";
-  private static final Field SPAN_FIELD;
+    private static final String PAGENT_SPAN_ID_TAG = "_ml_obs_tag.pagent_span_id";
+    private static final String PAGENT_NAME_TAG = "_ml_obs_tag.pagent_name";
+    private static final Field SPAN_FIELD;
 
-  private static CoreTracer tracer;
+    private static CoreTracer tracer;
 
-  static {
-    try {
-      SPAN_FIELD = DDLLMObsSpan.class.getDeclaredField("span");
-      SPAN_FIELD.setAccessible(true);
-    } catch (ReflectiveOperationException e) {
-      throw new ExceptionInInitializerError(e);
+    static {
+        try {
+            SPAN_FIELD = DDLLMObsSpan.class.getDeclaredField("span");
+            SPAN_FIELD.setAccessible(true);
+        } catch (ReflectiveOperationException e) {
+            throw new ExceptionInInitializerError(e);
+        }
     }
-  }
 
-  @BeforeAll
-  static void installTracer() {
-    tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-  }
+    @BeforeAll
+    static void installTracer() {
+        tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+    }
 
-  @AfterAll
-  static void closeTracer() {
-    TracerInstaller.forceInstallGlobalTracer(null);
-    tracer.close();
-  }
+    @AfterAll
+    static void closeTracer() {
+        TracerInstaller.forceInstallGlobalTracer(null);
+        tracer.close();
+    }
 
-  private static DDLLMObsSpan newSpan(String kind, String name) {
-    WellKnownTags tags =
-        new WellKnownTags("runtime-id", "hostname", "test", "service", "version", "java");
-    return new DDLLMObsSpan(kind, name, "test-ml-app", null, "service", tags);
-  }
+    private static DDLLMObsSpan newSpan(String kind, String name) {
+        WellKnownTags tags = new WellKnownTags("runtime-id", "hostname", "test", "service", "version", "java");
+        return new DDLLMObsSpan(kind, name, "test-ml-app", null, "service", tags);
+    }
 
-  private static AgentSpan innerSpan(DDLLMObsSpan llmObsSpan) throws IllegalAccessException {
-    return (AgentSpan) SPAN_FIELD.get(llmObsSpan);
-  }
+    private static AgentSpan innerSpan(DDLLMObsSpan llmObsSpan) throws IllegalAccessException {
+        return (AgentSpan) SPAN_FIELD.get(llmObsSpan);
+    }
 
-  /** Starts a root APM span and activates it, so all LLMObs spans created within share a trace. */
-  private static ContextScope startRootApmScope() {
-    AgentSpan root = AgentTracer.get().buildSpan("apm", "http.server.request").start();
-    return AgentTracer.activateSpan(root);
-  }
+    /** Starts a root APM span and activates it, so all LLMObs spans created within share a trace. */
+    private static ContextScope startRootApmScope() {
+        AgentSpan root =
+                AgentTracer.get().buildSpan("apm", "http.server.request").start();
+        return AgentTracer.activateSpan(root);
+    }
 
-  @Test
-  void agentSpanStoresOwnIdAndNameAsPagent() throws Exception {
-    try (ContextScope apmScope = startRootApmScope()) {
-      DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "my-agent");
-      try {
-        AgentSpan inner = innerSpan(agentSpan);
-        String parentAgentSpanId = (String) inner.getTag(PAGENT_SPAN_ID_TAG);
-        String parentAgentName = (String) inner.getTag(PAGENT_NAME_TAG);
+    @Test
+    void agentSpanStoresOwnIdAndNameAsPagent() throws Exception {
+        try (ContextScope apmScope = startRootApmScope()) {
+            DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "my-agent");
+            try {
+                AgentSpan inner = innerSpan(agentSpan);
+                String parentAgentSpanId = (String) inner.getTag(PAGENT_SPAN_ID_TAG);
+                String parentAgentName = (String) inner.getTag(PAGENT_NAME_TAG);
 
-        assertEquals(String.valueOf(inner.getSpanId()), parentAgentSpanId);
-        assertEquals("my-agent", parentAgentName);
-      } finally {
-        agentSpan.finish();
-        spanFromScope(apmScope).finish();
-      }
+                assertEquals(String.valueOf(inner.getSpanId()), parentAgentSpanId);
+                assertEquals("my-agent", parentAgentName);
+            } finally {
+                agentSpan.finish();
+                spanFromScope(apmScope).finish();
+            }
+        }
     }
-  }
 
-  @Test
-  void agentSpanNameIsPreservedRegardlessOfCharacters() throws Exception {
-    // Agent names are stored as-is — no character restrictions since the only wire consumer
-    // is the msgpack intake mapper, which accepts any string.
-    try (ContextScope apmScope = startRootApmScope()) {
-      DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "router~v2,résumé");
-      try {
-        AgentSpan inner = innerSpan(agentSpan);
-        assertEquals(String.valueOf(inner.getSpanId()), inner.getTag(PAGENT_SPAN_ID_TAG));
-        assertEquals("router~v2,résumé", inner.getTag(PAGENT_NAME_TAG));
-      } finally {
-        agentSpan.finish();
-        spanFromScope(apmScope).finish();
-      }
+    @Test
+    void agentSpanNameIsPreservedRegardlessOfCharacters() throws Exception {
+        // Agent names are stored as-is — no character restrictions since the only wire consumer
+        // is the msgpack intake mapper, which accepts any string.
+        try (ContextScope apmScope = startRootApmScope()) {
+            DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "router~v2,résumé");
+            try {
+                AgentSpan inner = innerSpan(agentSpan);
+                assertEquals(String.valueOf(inner.getSpanId()), inner.getTag(PAGENT_SPAN_ID_TAG));
+                assertEquals("router~v2,résumé", inner.getTag(PAGENT_NAME_TAG));
+            } finally {
+                agentSpan.finish();
+                spanFromScope(apmScope).finish();
+            }
+        }
     }
-  }
 
-  @Test
-  void innerAgentNameOverridesOuterAgentNameForDescendants() throws Exception {
-    // Descendants of an inner agent must see the inner agent's name, not the outer agent's.
-    try (ContextScope apmScope = startRootApmScope()) {
-      DDLLMObsSpan outerAgent = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "outer-agent");
-      try {
-        DDLLMObsSpan innerAgent = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "inner-agent");
-        try {
-          DDLLMObsSpan tool = newSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "tool");
-          try {
-            AgentSpan toolInner = innerSpan(tool);
-            AgentSpan innerAgentSpan = innerSpan(innerAgent);
-            assertEquals(
-                String.valueOf(innerAgentSpan.getSpanId()), toolInner.getTag(PAGENT_SPAN_ID_TAG));
-            assertEquals("inner-agent", toolInner.getTag(PAGENT_NAME_TAG));
-          } finally {
-            tool.finish();
-          }
-        } finally {
-          innerAgent.finish();
+    @Test
+    void innerAgentNameOverridesOuterAgentNameForDescendants() throws Exception {
+        // Descendants of an inner agent must see the inner agent's name, not the outer agent's.
+        try (ContextScope apmScope = startRootApmScope()) {
+            DDLLMObsSpan outerAgent = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "outer-agent");
+            try {
+                DDLLMObsSpan innerAgent = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "inner-agent");
+                try {
+                    DDLLMObsSpan tool = newSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "tool");
+                    try {
+                        AgentSpan toolInner = innerSpan(tool);
+                        AgentSpan innerAgentSpan = innerSpan(innerAgent);
+                        assertEquals(String.valueOf(innerAgentSpan.getSpanId()), toolInner.getTag(PAGENT_SPAN_ID_TAG));
+                        assertEquals("inner-agent", toolInner.getTag(PAGENT_NAME_TAG));
+                    } finally {
+                        tool.finish();
+                    }
+                } finally {
+                    innerAgent.finish();
+                }
+            } finally {
+                outerAgent.finish();
+                spanFromScope(apmScope).finish();
+            }
         }
-      } finally {
-        outerAgent.finish();
-        spanFromScope(apmScope).finish();
-      }
     }
-  }
 
-  @Test
-  void nonAgentChildUnderAgentInheritsAttribution() throws Exception {
-    // All LLMObs spans share the same APM trace so the trace-ID consistency gate passes.
-    try (ContextScope apmScope = startRootApmScope()) {
-      DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "parent-agent");
-      try {
-        AgentSpan agentInner = innerSpan(agentSpan);
-        String expectedParentAgentSpanId = String.valueOf(agentInner.getSpanId());
+    @Test
+    void nonAgentChildUnderAgentInheritsAttribution() throws Exception {
+        // All LLMObs spans share the same APM trace so the trace-ID consistency gate passes.
+        try (ContextScope apmScope = startRootApmScope()) {
+            DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "parent-agent");
+            try {
+                AgentSpan agentInner = innerSpan(agentSpan);
+                String expectedParentAgentSpanId = String.valueOf(agentInner.getSpanId());
 
-        // Created while agentSpan's ContextScope is active — should inherit attribution
-        DDLLMObsSpan toolSpan = newSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "child-tool");
-        try {
-          AgentSpan toolInner = innerSpan(toolSpan);
-          assertEquals(expectedParentAgentSpanId, toolInner.getTag(PAGENT_SPAN_ID_TAG));
-          assertEquals("parent-agent", toolInner.getTag(PAGENT_NAME_TAG));
-        } finally {
-          toolSpan.finish();
+                // Created while agentSpan's ContextScope is active — should inherit attribution
+                DDLLMObsSpan toolSpan = newSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "child-tool");
+                try {
+                    AgentSpan toolInner = innerSpan(toolSpan);
+                    assertEquals(expectedParentAgentSpanId, toolInner.getTag(PAGENT_SPAN_ID_TAG));
+                    assertEquals("parent-agent", toolInner.getTag(PAGENT_NAME_TAG));
+                } finally {
+                    toolSpan.finish();
+                }
+            } finally {
+                agentSpan.finish();
+                spanFromScope(apmScope).finish();
+            }
         }
-      } finally {
-        agentSpan.finish();
-        spanFromScope(apmScope).finish();
-      }
     }
-  }
 
-  @Test
-  void transitiveInheritanceAgentToLlmToTool() throws Exception {
-    try (ContextScope apmScope = startRootApmScope()) {
-      DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "root-agent");
-      try {
-        AgentSpan agentInner = innerSpan(agentSpan);
-        String expectedParentAgentSpanId = String.valueOf(agentInner.getSpanId());
+    @Test
+    void transitiveInheritanceAgentToLlmToTool() throws Exception {
+        try (ContextScope apmScope = startRootApmScope()) {
+            DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "root-agent");
+            try {
+                AgentSpan agentInner = innerSpan(agentSpan);
+                String expectedParentAgentSpanId = String.valueOf(agentInner.getSpanId());
 
-        DDLLMObsSpan llmSpan = newSpan(Tags.LLMOBS_LLM_SPAN_KIND, "intermediate-llm");
-        try {
-          DDLLMObsSpan toolSpan = newSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "leaf-tool");
-          try {
-            AgentSpan toolInner = innerSpan(toolSpan);
-            // Tool must point to the original agent, not the intermediate LLM span
-            assertEquals(expectedParentAgentSpanId, toolInner.getTag(PAGENT_SPAN_ID_TAG));
-            assertEquals("root-agent", toolInner.getTag(PAGENT_NAME_TAG));
-          } finally {
-            toolSpan.finish();
-          }
-        } finally {
-          llmSpan.finish();
+                DDLLMObsSpan llmSpan = newSpan(Tags.LLMOBS_LLM_SPAN_KIND, "intermediate-llm");
+                try {
+                    DDLLMObsSpan toolSpan = newSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "leaf-tool");
+                    try {
+                        AgentSpan toolInner = innerSpan(toolSpan);
+                        // Tool must point to the original agent, not the intermediate LLM span
+                        assertEquals(expectedParentAgentSpanId, toolInner.getTag(PAGENT_SPAN_ID_TAG));
+                        assertEquals("root-agent", toolInner.getTag(PAGENT_NAME_TAG));
+                    } finally {
+                        toolSpan.finish();
+                    }
+                } finally {
+                    llmSpan.finish();
+                }
+            } finally {
+                agentSpan.finish();
+                spanFromScope(apmScope).finish();
+            }
         }
-      } finally {
-        agentSpan.finish();
-        spanFromScope(apmScope).finish();
-      }
     }
-  }
 
-  @Test
-  void noAgentAncestorProducesNoPagentTags() throws Exception {
-    try (ContextScope apmScope = startRootApmScope()) {
-      DDLLMObsSpan workflowSpan = newSpan(Tags.LLMOBS_WORKFLOW_SPAN_KIND, "standalone-workflow");
-      try {
-        AgentSpan inner = innerSpan(workflowSpan);
-        assertNull(inner.getTag(PAGENT_SPAN_ID_TAG));
-        assertNull(inner.getTag(PAGENT_NAME_TAG));
-      } finally {
-        workflowSpan.finish();
-        spanFromScope(apmScope).finish();
-      }
+    @Test
+    void noAgentAncestorProducesNoPagentTags() throws Exception {
+        try (ContextScope apmScope = startRootApmScope()) {
+            DDLLMObsSpan workflowSpan = newSpan(Tags.LLMOBS_WORKFLOW_SPAN_KIND, "standalone-workflow");
+            try {
+                AgentSpan inner = innerSpan(workflowSpan);
+                assertNull(inner.getTag(PAGENT_SPAN_ID_TAG));
+                assertNull(inner.getTag(PAGENT_NAME_TAG));
+            } finally {
+                workflowSpan.finish();
+                spanFromScope(apmScope).finish();
+            }
+        }
     }
-  }
 
-  @Test
-  void innerAgentFinishRestoresOuterAgentPropagationTags() throws Exception {
-    // Outer agent's LLMObsContext is active. Inner agent starts (its own context pushed on top).
-    // After inner agent finishes its context is popped, restoring outer agent's context.
-    // A sibling span then sees outer agent's attribution via LLMObsContext.
-    try (ContextScope apmScope = startRootApmScope()) {
-      DDLLMObsSpan outerAgent = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "outer-agent");
-      try {
-        AgentSpan outerInner = innerSpan(outerAgent);
-        String outerParentAgentSpanId = String.valueOf(outerInner.getSpanId());
+    @Test
+    void innerAgentFinishRestoresOuterAgentPropagationTags() throws Exception {
+        // Outer agent's LLMObsContext is active. Inner agent starts (its own context pushed on top).
+        // After inner agent finishes its context is popped, restoring outer agent's context.
+        // A sibling span then sees outer agent's attribution via LLMObsContext.
+        try (ContextScope apmScope = startRootApmScope()) {
+            DDLLMObsSpan outerAgent = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "outer-agent");
+            try {
+                AgentSpan outerInner = innerSpan(outerAgent);
+                String outerParentAgentSpanId = String.valueOf(outerInner.getSpanId());
 
-        DDLLMObsSpan innerAgent = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "inner-agent");
-        innerAgent.finish();
-        // After finish(), inner agent's LLMObsContext scope is closed — outer agent's is restored.
+                DDLLMObsSpan innerAgent = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "inner-agent");
+                innerAgent.finish();
+                // After finish(), inner agent's LLMObsContext scope is closed — outer agent's is restored.
 
-        // Sibling span created now sees outer agent's attribution via the restored LLMObsContext.
-        DDLLMObsSpan siblingTool = newSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "sibling-tool");
-        try {
-          AgentSpan siblingInner = innerSpan(siblingTool);
-          assertEquals(outerParentAgentSpanId, siblingInner.getTag(PAGENT_SPAN_ID_TAG));
-          assertEquals("outer-agent", siblingInner.getTag(PAGENT_NAME_TAG));
-        } finally {
-          siblingTool.finish();
+                // Sibling span created now sees outer agent's attribution via the restored LLMObsContext.
+                DDLLMObsSpan siblingTool = newSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "sibling-tool");
+                try {
+                    AgentSpan siblingInner = innerSpan(siblingTool);
+                    assertEquals(outerParentAgentSpanId, siblingInner.getTag(PAGENT_SPAN_ID_TAG));
+                    assertEquals("outer-agent", siblingInner.getTag(PAGENT_NAME_TAG));
+                } finally {
+                    siblingTool.finish();
+                }
+            } finally {
+                outerAgent.finish();
+                spanFromScope(apmScope).finish();
+            }
         }
-      } finally {
-        outerAgent.finish();
-        spanFromScope(apmScope).finish();
-      }
     }
-  }
 
-  @Test
-  void staleContextInDifferentTraceDoesNotInheritPagent() throws Exception {
-    // Create an agent span in one APM trace, then create a non-agent span in a different APM
-    // trace. The stale LLMObsContext from the first trace must not leak pagent attribution.
-    AgentSpan firstRoot = AgentTracer.get().buildSpan("apm", "http.request.1").start();
-    ContextScope firstScope = AgentTracer.activateSpan(firstRoot);
+    @Test
+    void staleContextInDifferentTraceDoesNotInheritPagent() throws Exception {
+        // Create an agent span in one APM trace, then create a non-agent span in a different APM
+        // trace. The stale LLMObsContext from the first trace must not leak pagent attribution.
+        AgentSpan firstRoot =
+                AgentTracer.get().buildSpan("apm", "http.request.1").start();
+        ContextScope firstScope = AgentTracer.activateSpan(firstRoot);
 
-    DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "first-trace-agent");
-    // agentSpan's LLMObsContext is now active in the current thread
+        DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "first-trace-agent");
+        // agentSpan's LLMObsContext is now active in the current thread
 
-    // Close the first APM scope (but do NOT close agentSpan's scope yet) — simulate a context
-    // leak where the LLMObsContext outlives the APM scope it was created in.
-    firstScope.close();
+        // Close the first APM scope (but do NOT close agentSpan's scope yet) — simulate a context
+        // leak where the LLMObsContext outlives the APM scope it was created in.
+        firstScope.close();
 
-    // Start a fresh APM root (different trace) while the first trace's LLMObsContext is active
-    AgentSpan secondRoot = AgentTracer.get().buildSpan("apm", "http.request.2").start();
-    ContextScope secondScope = AgentTracer.activateSpan(secondRoot);
-    try {
-      DDLLMObsSpan toolInSecondTrace = newSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "second-trace-tool");
-      try {
-        // The tool span's APM parent is secondRoot (different trace from agentSpan).
-        // The trace-ID gate must block inheritance from the stale LLMObsContext.
-        AgentSpan toolInner = innerSpan(toolInSecondTrace);
-        assertNull(toolInner.getTag(PAGENT_SPAN_ID_TAG));
-        assertNull(toolInner.getTag(PAGENT_NAME_TAG));
-      } finally {
-        toolInSecondTrace.finish();
-      }
-    } finally {
-      secondScope.close();
-      secondRoot.finish();
-      agentSpan.finish();
-      firstRoot.finish();
+        // Start a fresh APM root (different trace) while the first trace's LLMObsContext is active
+        AgentSpan secondRoot =
+                AgentTracer.get().buildSpan("apm", "http.request.2").start();
+        ContextScope secondScope = AgentTracer.activateSpan(secondRoot);
+        try {
+            DDLLMObsSpan toolInSecondTrace = newSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "second-trace-tool");
+            try {
+                // The tool span's APM parent is secondRoot (different trace from agentSpan).
+                // The trace-ID gate must block inheritance from the stale LLMObsContext.
+                AgentSpan toolInner = innerSpan(toolInSecondTrace);
+                assertNull(toolInner.getTag(PAGENT_SPAN_ID_TAG));
+                assertNull(toolInner.getTag(PAGENT_NAME_TAG));
+            } finally {
+                toolInSecondTrace.finish();
+            }
+        } finally {
+            secondScope.close();
+            secondRoot.finish();
+            agentSpan.finish();
+            firstRoot.finish();
+        }
     }
-  }
 
-  @Test
-  void manifestNameOverridesSpanNameForPagent() throws Exception {
-    try (ContextScope apmScope = startRootApmScope()) {
-      DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "span-name");
-      try {
-        AgentSpan inner = innerSpan(agentSpan);
-        assertEquals("span-name", inner.getTag(PAGENT_NAME_TAG));
+    @Test
+    void manifestNameOverridesSpanNameForPagent() throws Exception {
+        try (ContextScope apmScope = startRootApmScope()) {
+            DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "span-name");
+            try {
+                AgentSpan inner = innerSpan(agentSpan);
+                assertEquals("span-name", inner.getTag(PAGENT_NAME_TAG));
 
-        agentSpan.annotateAgentManifest(
-            LLMObs.AgentManifest.builder().name("manifest-name").build());
+                agentSpan.annotateAgentManifest(
+                        LLMObs.AgentManifest.builder().name("manifest-name").build());
 
-        // The internal tag (used by the serializer for this span's agent_attribution) updates
-        // to the manifest name. Context-propagated pagent name for children remains the span name.
-        assertEquals("manifest-name", inner.getTag(PAGENT_NAME_TAG));
-      } finally {
-        agentSpan.finish();
-        spanFromScope(apmScope).finish();
-      }
+                // The internal tag (used by the serializer for this span's agent_attribution) updates
+                // to the manifest name. Context-propagated pagent name for children remains the span name.
+                assertEquals("manifest-name", inner.getTag(PAGENT_NAME_TAG));
+            } finally {
+                agentSpan.finish();
+                spanFromScope(apmScope).finish();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanAgentVersionTest.java b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanAgentVersionTest.java
index 3e36b979c62..d29d3649f82 100644
--- a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanAgentVersionTest.java
+++ b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanAgentVersionTest.java
@@ -24,172 +24,170 @@
  * ancestor's).
  */
 class DDLLMObsSpanAgentVersionTest {
-  private static final String AGENT_VERSION_TAG = "_ml_obs_tag." + LLMObsTags.AGENT_VERSION;
+    private static final String AGENT_VERSION_TAG = "_ml_obs_tag." + LLMObsTags.AGENT_VERSION;
 
-  private static final Field SPAN_FIELD;
-  private static final Field STANDALONE_APM_SCOPE_FIELD;
+    private static final Field SPAN_FIELD;
+    private static final Field STANDALONE_APM_SCOPE_FIELD;
 
-  private static CoreTracer tracer;
+    private static CoreTracer tracer;
 
-  static {
-    try {
-      SPAN_FIELD = DDLLMObsSpan.class.getDeclaredField("span");
-      SPAN_FIELD.setAccessible(true);
-      STANDALONE_APM_SCOPE_FIELD = DDLLMObsSpan.class.getDeclaredField("standaloneApmScope");
-      STANDALONE_APM_SCOPE_FIELD.setAccessible(true);
-    } catch (ReflectiveOperationException error) {
-      throw new ExceptionInInitializerError(error);
+    static {
+        try {
+            SPAN_FIELD = DDLLMObsSpan.class.getDeclaredField("span");
+            SPAN_FIELD.setAccessible(true);
+            STANDALONE_APM_SCOPE_FIELD = DDLLMObsSpan.class.getDeclaredField("standaloneApmScope");
+            STANDALONE_APM_SCOPE_FIELD.setAccessible(true);
+        } catch (ReflectiveOperationException error) {
+            throw new ExceptionInInitializerError(error);
+        }
     }
-  }
-
-  @BeforeAll
-  static void installTracer() {
-    tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-  }
-
-  @AfterAll
-  static void closeTracer() {
-    TracerInstaller.forceInstallGlobalTracer(null);
-    tracer.close();
-  }
-
-  @Test
-  void agentSpanWithExplicitVersionTagsItself() {
-    DDLLMObsSpan agent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "agent1", "v3");
-    try {
-      assertEquals("v3", spanOf(agent).getTag(AGENT_VERSION_TAG));
-    } finally {
-      agent.finish();
+
+    @BeforeAll
+    static void installTracer() {
+        tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
     }
-  }
-
-  @Test
-  void childSpanInheritsAgentVersionFromParentContext() {
-    DDLLMObsSpan agent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "agent1", "v3");
-    try (ContextScope ignored = AgentTracer.activateSpan(spanOf(agent))) {
-      DDLLMObsSpan child = llmObsSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "tool1", null);
-      try {
-        assertEquals("v3", spanOf(child).getTag(AGENT_VERSION_TAG));
-      } finally {
-        child.finish();
-      }
-    } finally {
-      agent.finish();
+
+    @AfterAll
+    static void closeTracer() {
+        TracerInstaller.forceInstallGlobalTracer(null);
+        tracer.close();
     }
-  }
-
-  @Test
-  void grandchildTransitivelyInheritsAgentVersionThroughIntermediateSpan() {
-    DDLLMObsSpan agent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "agent1", "v3");
-    try (ContextScope agentScope = AgentTracer.activateSpan(spanOf(agent))) {
-      DDLLMObsSpan workflow = llmObsSpan(Tags.LLMOBS_WORKFLOW_SPAN_KIND, "workflow1", null);
-      try (ContextScope workflowScope = AgentTracer.activateSpan(spanOf(workflow))) {
-        DDLLMObsSpan grandchild = llmObsSpan(Tags.LLMOBS_LLM_SPAN_KIND, "llm1", null);
+
+    @Test
+    void agentSpanWithExplicitVersionTagsItself() {
+        DDLLMObsSpan agent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "agent1", "v3");
         try {
-          assertEquals("v3", spanOf(grandchild).getTag(AGENT_VERSION_TAG));
+            assertEquals("v3", spanOf(agent).getTag(AGENT_VERSION_TAG));
         } finally {
-          grandchild.finish();
+            agent.finish();
         }
-      } finally {
-        workflow.finish();
-      }
-    } finally {
-      agent.finish();
     }
-  }
 
-  @Test
-  void nestedAgentWithOwnVersionOverridesForItsOwnSubtree() {
-    DDLLMObsSpan outerAgent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "outer-agent", "v1");
-    try (ContextScope outerScope = AgentTracer.activateSpan(spanOf(outerAgent))) {
-      DDLLMObsSpan innerAgent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "inner-agent", "v2");
-      try (ContextScope innerScope = AgentTracer.activateSpan(spanOf(innerAgent))) {
-        assertEquals("v2", spanOf(innerAgent).getTag(AGENT_VERSION_TAG));
+    @Test
+    void childSpanInheritsAgentVersionFromParentContext() {
+        DDLLMObsSpan agent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "agent1", "v3");
+        try (ContextScope ignored = AgentTracer.activateSpan(spanOf(agent))) {
+            DDLLMObsSpan child = llmObsSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "tool1", null);
+            try {
+                assertEquals("v3", spanOf(child).getTag(AGENT_VERSION_TAG));
+            } finally {
+                child.finish();
+            }
+        } finally {
+            agent.finish();
+        }
+    }
 
-        DDLLMObsSpan child = llmObsSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "inner-tool", null);
-        try {
-          assertEquals(
-              "v2",
-              spanOf(child).getTag(AGENT_VERSION_TAG),
-              "child of the nested agent must inherit the nested agent's own version, not the outer one");
+    @Test
+    void grandchildTransitivelyInheritsAgentVersionThroughIntermediateSpan() {
+        DDLLMObsSpan agent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "agent1", "v3");
+        try (ContextScope agentScope = AgentTracer.activateSpan(spanOf(agent))) {
+            DDLLMObsSpan workflow = llmObsSpan(Tags.LLMOBS_WORKFLOW_SPAN_KIND, "workflow1", null);
+            try (ContextScope workflowScope = AgentTracer.activateSpan(spanOf(workflow))) {
+                DDLLMObsSpan grandchild = llmObsSpan(Tags.LLMOBS_LLM_SPAN_KIND, "llm1", null);
+                try {
+                    assertEquals("v3", spanOf(grandchild).getTag(AGENT_VERSION_TAG));
+                } finally {
+                    grandchild.finish();
+                }
+            } finally {
+                workflow.finish();
+            }
         } finally {
-          child.finish();
+            agent.finish();
         }
-      } finally {
-        innerAgent.finish();
-      }
-    } finally {
-      outerAgent.finish();
     }
-  }
-
-  @Test
-  void noVersionSetAnywhereMeansNoTagOnAnySpanInTheSubtree() {
-    DDLLMObsSpan agent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "agent1", null);
-    try (ContextScope agentScope = AgentTracer.activateSpan(spanOf(agent))) {
-      DDLLMObsSpan child = llmObsSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "tool1", null);
-      try {
-        assertNull(spanOf(agent).getTag(AGENT_VERSION_TAG));
-        assertNull(spanOf(child).getTag(AGENT_VERSION_TAG));
-      } finally {
-        child.finish();
-      }
-    } finally {
-      agent.finish();
+
+    @Test
+    void nestedAgentWithOwnVersionOverridesForItsOwnSubtree() {
+        DDLLMObsSpan outerAgent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "outer-agent", "v1");
+        try (ContextScope outerScope = AgentTracer.activateSpan(spanOf(outerAgent))) {
+            DDLLMObsSpan innerAgent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "inner-agent", "v2");
+            try (ContextScope innerScope = AgentTracer.activateSpan(spanOf(innerAgent))) {
+                assertEquals("v2", spanOf(innerAgent).getTag(AGENT_VERSION_TAG));
+
+                DDLLMObsSpan child = llmObsSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "inner-tool", null);
+                try {
+                    assertEquals(
+                            "v2",
+                            spanOf(child).getTag(AGENT_VERSION_TAG),
+                            "child of the nested agent must inherit the nested agent's own version, not the outer one");
+                } finally {
+                    child.finish();
+                }
+            } finally {
+                innerAgent.finish();
+            }
+        } finally {
+            outerAgent.finish();
+        }
     }
-  }
-
-  @Test
-  void childDoesNotInheritAgentVersionWhenStaleContextIsFromADifferentTrace()
-      throws ReflectiveOperationException {
-    // Simulates a stale LLMObsContext (e.g. leaked across an async boundary): the agent's
-    // LLMObs context is still active but its APM scope is closed (as it would be on a different
-    // thread or after an async handoff). The child starts a fresh APM trace and the
-    // trace-consistency gate must skip inheritance.
-    DDLLMObsSpan agent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "stale-agent", "stale-v1");
-    // Close the standalone APM scope to simulate async boundary — LLMObs context leaks but
-    // APM scope does not.
-    ContextScope apmScope = (ContextScope) STANDALONE_APM_SCOPE_FIELD.get(agent);
-    if (apmScope != null) {
-      apmScope.close();
+
+    @Test
+    void noVersionSetAnywhereMeansNoTagOnAnySpanInTheSubtree() {
+        DDLLMObsSpan agent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "agent1", null);
+        try (ContextScope agentScope = AgentTracer.activateSpan(spanOf(agent))) {
+            DDLLMObsSpan child = llmObsSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "tool1", null);
+            try {
+                assertNull(spanOf(agent).getTag(AGENT_VERSION_TAG));
+                assertNull(spanOf(child).getTag(AGENT_VERSION_TAG));
+            } finally {
+                child.finish();
+            }
+        } finally {
+            agent.finish();
+        }
     }
-    try {
-      DDLLMObsSpan child = llmObsSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "tool1", null);
-      try (ContextScope childScope = AgentTracer.activateSpan(spanOf(child))) {
-        assertNotEquals(
-            spanOf(agent).getTraceId(),
-            spanOf(child).getTraceId(),
-            "sanity: traces must differ for this scenario to be meaningful");
-        assertNull(spanOf(child).getTag(AGENT_VERSION_TAG));
-
-        DDLLMObsSpan grandchild = llmObsSpan(Tags.LLMOBS_LLM_SPAN_KIND, "llm1", null);
+
+    @Test
+    void childDoesNotInheritAgentVersionWhenStaleContextIsFromADifferentTrace() throws ReflectiveOperationException {
+        // Simulates a stale LLMObsContext (e.g. leaked across an async boundary): the agent's
+        // LLMObs context is still active but its APM scope is closed (as it would be on a different
+        // thread or after an async handoff). The child starts a fresh APM trace and the
+        // trace-consistency gate must skip inheritance.
+        DDLLMObsSpan agent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "stale-agent", "stale-v1");
+        // Close the standalone APM scope to simulate async boundary — LLMObs context leaks but
+        // APM scope does not.
+        ContextScope apmScope = (ContextScope) STANDALONE_APM_SCOPE_FIELD.get(agent);
+        if (apmScope != null) {
+            apmScope.close();
+        }
         try {
-          assertNull(
-              spanOf(grandchild).getTag(AGENT_VERSION_TAG),
-              "the stale agent_version must not leak transitively into a grandchild either");
+            DDLLMObsSpan child = llmObsSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "tool1", null);
+            try (ContextScope childScope = AgentTracer.activateSpan(spanOf(child))) {
+                assertNotEquals(
+                        spanOf(agent).getTraceId(),
+                        spanOf(child).getTraceId(),
+                        "sanity: traces must differ for this scenario to be meaningful");
+                assertNull(spanOf(child).getTag(AGENT_VERSION_TAG));
+
+                DDLLMObsSpan grandchild = llmObsSpan(Tags.LLMOBS_LLM_SPAN_KIND, "llm1", null);
+                try {
+                    assertNull(
+                            spanOf(grandchild).getTag(AGENT_VERSION_TAG),
+                            "the stale agent_version must not leak transitively into a grandchild either");
+                } finally {
+                    grandchild.finish();
+                }
+            } finally {
+                child.finish();
+            }
         } finally {
-          grandchild.finish();
+            agent.finish();
         }
-      } finally {
-        child.finish();
-      }
-    } finally {
-      agent.finish();
     }
-  }
-
-  private static DDLLMObsSpan llmObsSpan(String kind, String name, String agentVersion) {
-    WellKnownTags tags =
-        new WellKnownTags("runtime-id", "hostname", "test", "service", "version", "java");
-    return new DDLLMObsSpan(kind, name, "test-ml-app", null, "service", tags, agentVersion);
-  }
-
-  private static AgentSpan spanOf(DDLLMObsSpan llmObsSpan) {
-    try {
-      return (AgentSpan) SPAN_FIELD.get(llmObsSpan);
-    } catch (IllegalAccessException error) {
-      throw new AssertionError(error);
+
+    private static DDLLMObsSpan llmObsSpan(String kind, String name, String agentVersion) {
+        WellKnownTags tags = new WellKnownTags("runtime-id", "hostname", "test", "service", "version", "java");
+        return new DDLLMObsSpan(kind, name, "test-ml-app", null, "service", tags, agentVersion);
+    }
+
+    private static AgentSpan spanOf(DDLLMObsSpan llmObsSpan) {
+        try {
+            return (AgentSpan) SPAN_FIELD.get(llmObsSpan);
+        } catch (IllegalAccessException error) {
+            throw new AssertionError(error);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanDocumentIOTest.java b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanDocumentIOTest.java
index 10e8a6af54a..90017064c51 100644
--- a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanDocumentIOTest.java
+++ b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanDocumentIOTest.java
@@ -18,124 +18,120 @@
 import org.junit.jupiter.api.Test;
 
 class DDLLMObsSpanDocumentIOTest {
-  private static final String INPUT_TAG = "_ml_obs_tag.input";
-  private static final String OUTPUT_TAG = "_ml_obs_tag.output";
-  private static final Field SPAN_FIELD;
-
-  private static CoreTracer tracer;
-
-  static {
-    try {
-      SPAN_FIELD = DDLLMObsSpan.class.getDeclaredField("span");
-      SPAN_FIELD.setAccessible(true);
-    } catch (ReflectiveOperationException error) {
-      throw new ExceptionInInitializerError(error);
+    private static final String INPUT_TAG = "_ml_obs_tag.input";
+    private static final String OUTPUT_TAG = "_ml_obs_tag.output";
+    private static final Field SPAN_FIELD;
+
+    private static CoreTracer tracer;
+
+    static {
+        try {
+            SPAN_FIELD = DDLLMObsSpan.class.getDeclaredField("span");
+            SPAN_FIELD.setAccessible(true);
+        } catch (ReflectiveOperationException error) {
+            throw new ExceptionInInitializerError(error);
+        }
     }
-  }
-
-  @BeforeAll
-  static void installTracer() {
-    tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-  }
-
-  @AfterAll
-  static void closeTracer() {
-    TracerInstaller.forceInstallGlobalTracer(null);
-    tracer.close();
-  }
-
-  @Test
-  void formatsEmbeddingStringInputAsDocument() throws IllegalAccessException {
-    DDLLMObsSpan llmObsSpan = newSpan(Tags.LLMOBS_EMBEDDING_SPAN_KIND);
-    try {
-      llmObsSpan.annotateIO("embedding input", "embedding output");
-
-      AgentSpan span = (AgentSpan) SPAN_FIELD.get(llmObsSpan);
-      assertDocument(span.getTag(INPUT_TAG), "embedding input");
-      assertEquals("embedding output", span.getTag(OUTPUT_TAG));
-    } finally {
-      llmObsSpan.finish();
+
+    @BeforeAll
+    static void installTracer() {
+        tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+    }
+
+    @AfterAll
+    static void closeTracer() {
+        TracerInstaller.forceInstallGlobalTracer(null);
+        tracer.close();
+    }
+
+    @Test
+    void formatsEmbeddingStringInputAsDocument() throws IllegalAccessException {
+        DDLLMObsSpan llmObsSpan = newSpan(Tags.LLMOBS_EMBEDDING_SPAN_KIND);
+        try {
+            llmObsSpan.annotateIO("embedding input", "embedding output");
+
+            AgentSpan span = (AgentSpan) SPAN_FIELD.get(llmObsSpan);
+            assertDocument(span.getTag(INPUT_TAG), "embedding input");
+            assertEquals("embedding output", span.getTag(OUTPUT_TAG));
+        } finally {
+            llmObsSpan.finish();
+        }
+    }
+
+    @Test
+    void formatsRetrievalStringOutputAsDocument() throws IllegalAccessException {
+        DDLLMObsSpan llmObsSpan = newSpan(Tags.LLMOBS_RETRIEVAL_SPAN_KIND);
+        try {
+            llmObsSpan.annotateIO("retrieval input", "retrieval output");
+
+            AgentSpan span = (AgentSpan) SPAN_FIELD.get(llmObsSpan);
+            assertEquals("retrieval input", span.getTag(INPUT_TAG));
+            assertDocument(span.getTag(OUTPUT_TAG), "retrieval output");
+        } finally {
+            llmObsSpan.finish();
+        }
     }
-  }
-
-  @Test
-  void formatsRetrievalStringOutputAsDocument() throws IllegalAccessException {
-    DDLLMObsSpan llmObsSpan = newSpan(Tags.LLMOBS_RETRIEVAL_SPAN_KIND);
-    try {
-      llmObsSpan.annotateIO("retrieval input", "retrieval output");
-
-      AgentSpan span = (AgentSpan) SPAN_FIELD.get(llmObsSpan);
-      assertEquals("retrieval input", span.getTag(INPUT_TAG));
-      assertDocument(span.getTag(OUTPUT_TAG), "retrieval output");
-    } finally {
-      llmObsSpan.finish();
+
+    @Test
+    void acceptsEmbeddingDocumentInputs() throws IllegalAccessException {
+        DDLLMObsSpan llmObsSpan = newSpan(Tags.LLMOBS_EMBEDDING_SPAN_KIND);
+        List<LLMObs.Document> documents = Arrays.asList(
+                LLMObs.Document.from("first input", "first.txt", "input-1", 0.5), LLMObs.Document.from("second input"));
+        try {
+            llmObsSpan.annotateEmbeddingIO(documents, "embedding output");
+
+            AgentSpan span = (AgentSpan) SPAN_FIELD.get(llmObsSpan);
+            assertEquals(documents, span.getTag(INPUT_TAG));
+            assertDocument(documents.get(0), "first input", "first.txt", "input-1", 0.5);
+            assertEquals("embedding output", span.getTag(OUTPUT_TAG));
+        } finally {
+            llmObsSpan.finish();
+        }
+    }
+
+    @Test
+    void acceptsRetrievalDocumentOutputs() throws IllegalAccessException {
+        DDLLMObsSpan llmObsSpan = newSpan(Tags.LLMOBS_RETRIEVAL_SPAN_KIND);
+        List<LLMObs.Document> documents = Arrays.asList(
+                LLMObs.Document.from("first output", "result.txt", "output-1", 0.95),
+                LLMObs.Document.from("second output"));
+        try {
+            llmObsSpan.annotateRetrievalIO("retrieval input", documents);
+
+            AgentSpan span = (AgentSpan) SPAN_FIELD.get(llmObsSpan);
+            assertEquals("retrieval input", span.getTag(INPUT_TAG));
+            assertEquals(documents, span.getTag(OUTPUT_TAG));
+            assertDocument(documents.get(0), "first output", "result.txt", "output-1", 0.95);
+        } finally {
+            llmObsSpan.finish();
+        }
     }
-  }
-
-  @Test
-  void acceptsEmbeddingDocumentInputs() throws IllegalAccessException {
-    DDLLMObsSpan llmObsSpan = newSpan(Tags.LLMOBS_EMBEDDING_SPAN_KIND);
-    List<LLMObs.Document> documents =
-        Arrays.asList(
-            LLMObs.Document.from("first input", "first.txt", "input-1", 0.5),
-            LLMObs.Document.from("second input"));
-    try {
-      llmObsSpan.annotateEmbeddingIO(documents, "embedding output");
-
-      AgentSpan span = (AgentSpan) SPAN_FIELD.get(llmObsSpan);
-      assertEquals(documents, span.getTag(INPUT_TAG));
-      assertDocument(documents.get(0), "first input", "first.txt", "input-1", 0.5);
-      assertEquals("embedding output", span.getTag(OUTPUT_TAG));
-    } finally {
-      llmObsSpan.finish();
+
+    private static DDLLMObsSpan newSpan(String kind) {
+        WellKnownTags tags = new WellKnownTags("runtime-id", "hostname", "test", "service", "version", "java");
+        return new DDLLMObsSpan(kind, "span", "ml-app", null, "service", tags);
     }
-  }
-
-  @Test
-  void acceptsRetrievalDocumentOutputs() throws IllegalAccessException {
-    DDLLMObsSpan llmObsSpan = newSpan(Tags.LLMOBS_RETRIEVAL_SPAN_KIND);
-    List<LLMObs.Document> documents =
-        Arrays.asList(
-            LLMObs.Document.from("first output", "result.txt", "output-1", 0.95),
-            LLMObs.Document.from("second output"));
-    try {
-      llmObsSpan.annotateRetrievalIO("retrieval input", documents);
-
-      AgentSpan span = (AgentSpan) SPAN_FIELD.get(llmObsSpan);
-      assertEquals("retrieval input", span.getTag(INPUT_TAG));
-      assertEquals(documents, span.getTag(OUTPUT_TAG));
-      assertDocument(documents.get(0), "first output", "result.txt", "output-1", 0.95);
-    } finally {
-      llmObsSpan.finish();
+
+    private static void assertDocument(Object value, String expectedText) {
+        List<?> documents = assertInstanceOf(List.class, value);
+        assertEquals(1, documents.size());
+        LLMObs.Document document = assertInstanceOf(LLMObs.Document.class, documents.get(0));
+        assertEquals(expectedText, document.getText());
+        assertNull(document.getName());
+        assertNull(document.getId());
+        assertNull(document.getScore());
+    }
+
+    private static void assertDocument(
+            LLMObs.Document document,
+            String expectedText,
+            String expectedName,
+            String expectedId,
+            double expectedScore) {
+        assertEquals(expectedText, document.getText());
+        assertEquals(expectedName, document.getName());
+        assertEquals(expectedId, document.getId());
+        assertEquals(expectedScore, document.getScore());
     }
-  }
-
-  private static DDLLMObsSpan newSpan(String kind) {
-    WellKnownTags tags =
-        new WellKnownTags("runtime-id", "hostname", "test", "service", "version", "java");
-    return new DDLLMObsSpan(kind, "span", "ml-app", null, "service", tags);
-  }
-
-  private static void assertDocument(Object value, String expectedText) {
-    List<?> documents = assertInstanceOf(List.class, value);
-    assertEquals(1, documents.size());
-    LLMObs.Document document = assertInstanceOf(LLMObs.Document.class, documents.get(0));
-    assertEquals(expectedText, document.getText());
-    assertNull(document.getName());
-    assertNull(document.getId());
-    assertNull(document.getScore());
-  }
-
-  private static void assertDocument(
-      LLMObs.Document document,
-      String expectedText,
-      String expectedName,
-      String expectedId,
-      double expectedScore) {
-    assertEquals(expectedText, document.getText());
-    assertEquals(expectedName, document.getName());
-    assertEquals(expectedId, document.getId());
-    assertEquals(expectedScore, document.getScore());
-  }
 }
diff --git a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanGenAiApmTagsTest.java b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanGenAiApmTagsTest.java
index 52bbe9d3751..81db2d5064c 100644
--- a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanGenAiApmTagsTest.java
+++ b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanGenAiApmTagsTest.java
@@ -19,108 +19,107 @@
 
 /** Covers the {@code gen_ai.*} attributes a manual LLM Observability span emits at finish. */
 class DDLLMObsSpanGenAiApmTagsTest {
-  private static final Field SPAN_FIELD;
+    private static final Field SPAN_FIELD;
 
-  private static CoreTracer tracer;
+    private static CoreTracer tracer;
 
-  static {
-    try {
-      SPAN_FIELD = DDLLMObsSpan.class.getDeclaredField("span");
-      SPAN_FIELD.setAccessible(true);
-    } catch (ReflectiveOperationException error) {
-      throw new ExceptionInInitializerError(error);
+    static {
+        try {
+            SPAN_FIELD = DDLLMObsSpan.class.getDeclaredField("span");
+            SPAN_FIELD.setAccessible(true);
+        } catch (ReflectiveOperationException error) {
+            throw new ExceptionInInitializerError(error);
+        }
     }
-  }
-
-  @BeforeAll
-  static void installTracer() {
-    tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-  }
-
-  @AfterAll
-  static void closeTracer() {
-    TracerInstaller.forceInstallGlobalTracer(null);
-    tracer.close();
-  }
-
-  @Test
-  void llmSpanEmitsEveryScalarAndTokenUsage() {
-    DDLLMObsSpan llm = llmObsSpan(Tags.LLMOBS_LLM_SPAN_KIND, "chat", "sess-1");
-    llm.setTag(LLMObsTags.MODEL_NAME, "gpt-4");
-    llm.setTag(LLMObsTags.MODEL_PROVIDER, "OpenAI");
-    Map<String, Number> metrics = new HashMap<>();
-    metrics.put("input_tokens", 10);
-    metrics.put("output_tokens", 20);
-    metrics.put("total_tokens", 30);
-    metrics.put("cache_read_input_tokens", 4);
-    metrics.put("cache_write_input_tokens", 5);
-    metrics.put("reasoning_output_tokens", 6);
-    llm.setMetrics(metrics);
-    llm.finish();
-
-    AgentSpan span = spanOf(llm);
-    assertEquals(Tags.LLMOBS_LLM_SPAN_KIND, span.getTag(GenAiApmTags.OPERATION_NAME));
-    assertEquals("gpt-4", span.getTag(GenAiApmTags.REQUEST_MODEL));
-    assertEquals("openai", span.getTag(GenAiApmTags.PROVIDER_NAME));
-    assertEquals("test-ml-app", span.getTag(GenAiApmTags.APPLICATION_NAME));
-    assertEquals("sess-1", span.getTag(GenAiApmTags.CONVERSATION_ID));
-    assertEquals(10.0, span.getTag(GenAiApmTags.USAGE_INPUT_TOKENS));
-    assertEquals(20.0, span.getTag(GenAiApmTags.USAGE_OUTPUT_TOKENS));
-    assertEquals(30.0, span.getTag(GenAiApmTags.USAGE_TOTAL_TOKENS));
-    assertEquals(4.0, span.getTag(GenAiApmTags.USAGE_CACHE_READ_INPUT_TOKENS));
-    assertEquals(5.0, span.getTag(GenAiApmTags.USAGE_CACHE_WRITE_INPUT_TOKENS));
-    assertEquals(6.0, span.getTag(GenAiApmTags.USAGE_REASONING_OUTPUT_TOKENS));
-    assertEquals("true", span.getTag(GenAiApmTags.ARTIFICIAL_TAGS));
-  }
-
-  @Test
-  void modelBackedSpanWithoutModelFallsBackToCustom() {
-    DDLLMObsSpan embedding = llmObsSpan(Tags.LLMOBS_EMBEDDING_SPAN_KIND, "embed", null);
-    embedding.finish();
-
-    AgentSpan span = spanOf(embedding);
-    assertEquals("custom", span.getTag(GenAiApmTags.REQUEST_MODEL));
-    assertEquals("custom", span.getTag(GenAiApmTags.PROVIDER_NAME));
-    assertNull(span.getTag(GenAiApmTags.CONVERSATION_ID));
-  }
-
-  @Test
-  void nonModelBackedSpanEmitsNoModelFieldsOrTokenUsage() {
-    DDLLMObsSpan workflow = llmObsSpan(Tags.LLMOBS_WORKFLOW_SPAN_KIND, "flow", null);
-    workflow.setMetric("input_tokens", 10);
-    workflow.finish();
-
-    AgentSpan span = spanOf(workflow);
-    assertEquals(Tags.LLMOBS_WORKFLOW_SPAN_KIND, span.getTag(GenAiApmTags.OPERATION_NAME));
-    assertNull(span.getTag(GenAiApmTags.REQUEST_MODEL));
-    assertNull(span.getTag(GenAiApmTags.PROVIDER_NAME));
-    assertNull(span.getTag(GenAiApmTags.USAGE_INPUT_TOKENS));
-  }
-
-  @Test
-  void nonModelBackedSpanKeepsExplicitModelFields() {
-    DDLLMObsSpan agent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "agent", null);
-    agent.setTag(LLMObsTags.MODEL_NAME, "gpt-4");
-    agent.setTag(LLMObsTags.MODEL_PROVIDER, "OpenAI");
-    agent.finish();
-
-    AgentSpan span = spanOf(agent);
-    assertEquals("gpt-4", span.getTag(GenAiApmTags.REQUEST_MODEL));
-    assertEquals("openai", span.getTag(GenAiApmTags.PROVIDER_NAME));
-  }
-
-  private static DDLLMObsSpan llmObsSpan(String kind, String name, String sessionId) {
-    WellKnownTags tags =
-        new WellKnownTags("runtime-id", "hostname", "test", "service", "version", "java");
-    return new DDLLMObsSpan(kind, name, "test-ml-app", sessionId, "service", tags);
-  }
-
-  private static AgentSpan spanOf(DDLLMObsSpan llmObsSpan) {
-    try {
-      return (AgentSpan) SPAN_FIELD.get(llmObsSpan);
-    } catch (IllegalAccessException error) {
-      throw new AssertionError(error);
+
+    @BeforeAll
+    static void installTracer() {
+        tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+    }
+
+    @AfterAll
+    static void closeTracer() {
+        TracerInstaller.forceInstallGlobalTracer(null);
+        tracer.close();
+    }
+
+    @Test
+    void llmSpanEmitsEveryScalarAndTokenUsage() {
+        DDLLMObsSpan llm = llmObsSpan(Tags.LLMOBS_LLM_SPAN_KIND, "chat", "sess-1");
+        llm.setTag(LLMObsTags.MODEL_NAME, "gpt-4");
+        llm.setTag(LLMObsTags.MODEL_PROVIDER, "OpenAI");
+        Map<String, Number> metrics = new HashMap<>();
+        metrics.put("input_tokens", 10);
+        metrics.put("output_tokens", 20);
+        metrics.put("total_tokens", 30);
+        metrics.put("cache_read_input_tokens", 4);
+        metrics.put("cache_write_input_tokens", 5);
+        metrics.put("reasoning_output_tokens", 6);
+        llm.setMetrics(metrics);
+        llm.finish();
+
+        AgentSpan span = spanOf(llm);
+        assertEquals(Tags.LLMOBS_LLM_SPAN_KIND, span.getTag(GenAiApmTags.OPERATION_NAME));
+        assertEquals("gpt-4", span.getTag(GenAiApmTags.REQUEST_MODEL));
+        assertEquals("openai", span.getTag(GenAiApmTags.PROVIDER_NAME));
+        assertEquals("test-ml-app", span.getTag(GenAiApmTags.APPLICATION_NAME));
+        assertEquals("sess-1", span.getTag(GenAiApmTags.CONVERSATION_ID));
+        assertEquals(10.0, span.getTag(GenAiApmTags.USAGE_INPUT_TOKENS));
+        assertEquals(20.0, span.getTag(GenAiApmTags.USAGE_OUTPUT_TOKENS));
+        assertEquals(30.0, span.getTag(GenAiApmTags.USAGE_TOTAL_TOKENS));
+        assertEquals(4.0, span.getTag(GenAiApmTags.USAGE_CACHE_READ_INPUT_TOKENS));
+        assertEquals(5.0, span.getTag(GenAiApmTags.USAGE_CACHE_WRITE_INPUT_TOKENS));
+        assertEquals(6.0, span.getTag(GenAiApmTags.USAGE_REASONING_OUTPUT_TOKENS));
+        assertEquals("true", span.getTag(GenAiApmTags.ARTIFICIAL_TAGS));
+    }
+
+    @Test
+    void modelBackedSpanWithoutModelFallsBackToCustom() {
+        DDLLMObsSpan embedding = llmObsSpan(Tags.LLMOBS_EMBEDDING_SPAN_KIND, "embed", null);
+        embedding.finish();
+
+        AgentSpan span = spanOf(embedding);
+        assertEquals("custom", span.getTag(GenAiApmTags.REQUEST_MODEL));
+        assertEquals("custom", span.getTag(GenAiApmTags.PROVIDER_NAME));
+        assertNull(span.getTag(GenAiApmTags.CONVERSATION_ID));
+    }
+
+    @Test
+    void nonModelBackedSpanEmitsNoModelFieldsOrTokenUsage() {
+        DDLLMObsSpan workflow = llmObsSpan(Tags.LLMOBS_WORKFLOW_SPAN_KIND, "flow", null);
+        workflow.setMetric("input_tokens", 10);
+        workflow.finish();
+
+        AgentSpan span = spanOf(workflow);
+        assertEquals(Tags.LLMOBS_WORKFLOW_SPAN_KIND, span.getTag(GenAiApmTags.OPERATION_NAME));
+        assertNull(span.getTag(GenAiApmTags.REQUEST_MODEL));
+        assertNull(span.getTag(GenAiApmTags.PROVIDER_NAME));
+        assertNull(span.getTag(GenAiApmTags.USAGE_INPUT_TOKENS));
+    }
+
+    @Test
+    void nonModelBackedSpanKeepsExplicitModelFields() {
+        DDLLMObsSpan agent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "agent", null);
+        agent.setTag(LLMObsTags.MODEL_NAME, "gpt-4");
+        agent.setTag(LLMObsTags.MODEL_PROVIDER, "OpenAI");
+        agent.finish();
+
+        AgentSpan span = spanOf(agent);
+        assertEquals("gpt-4", span.getTag(GenAiApmTags.REQUEST_MODEL));
+        assertEquals("openai", span.getTag(GenAiApmTags.PROVIDER_NAME));
+    }
+
+    private static DDLLMObsSpan llmObsSpan(String kind, String name, String sessionId) {
+        WellKnownTags tags = new WellKnownTags("runtime-id", "hostname", "test", "service", "version", "java");
+        return new DDLLMObsSpan(kind, name, "test-ml-app", sessionId, "service", tags);
+    }
+
+    private static AgentSpan spanOf(DDLLMObsSpan llmObsSpan) {
+        try {
+            return (AgentSpan) SPAN_FIELD.get(llmObsSpan);
+        } catch (IllegalAccessException error) {
+            throw new AssertionError(error);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanMetadataTest.java b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanMetadataTest.java
index e01e3cab701..a6bd9df2182 100644
--- a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanMetadataTest.java
+++ b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanMetadataTest.java
@@ -22,74 +22,75 @@
  */
 class DDLLMObsSpanMetadataTest {
 
-  private static final String METADATA_TAG = "_ml_obs_tag.metadata";
-  private static final Field SPAN_FIELD;
+    private static final String METADATA_TAG = "_ml_obs_tag.metadata";
+    private static final Field SPAN_FIELD;
+
+    private static CoreTracer tracer;
+
+    static {
+        try {
+            SPAN_FIELD = DDLLMObsSpan.class.getDeclaredField("span");
+            SPAN_FIELD.setAccessible(true);
+        } catch (ReflectiveOperationException e) {
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
+    @BeforeAll
+    static void installTracer() {
+        tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+    }
+
+    @AfterAll
+    static void closeTracer() {
+        TracerInstaller.forceInstallGlobalTracer(null);
+        tracer.close();
+    }
+
+    private static DDLLMObsSpan newAgentSpan(String name) {
+        WellKnownTags tags = new WellKnownTags("runtime-id", "hostname", "test", "service", "version", "java");
+        return new DDLLMObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, name, "test-ml-app", null, "service", tags);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> metadata(DDLLMObsSpan span) throws IllegalAccessException {
+        return (Map<String, Object>) ((AgentSpan) SPAN_FIELD.get(span)).getTag(METADATA_TAG);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> reservedDd(DDLLMObsSpan span) throws IllegalAccessException {
+        return (Map<String, Object>) metadata(span).get("_dd");
+    }
+
+    private static LLMObs.AgentManifest manifest(String name) {
+        return LLMObs.AgentManifest.builder()
+                .name(name)
+                .instructions("Do things.")
+                .build();
+    }
+
+    private static Map<String, Object> callerDd(String key, Object value) {
+        return Collections.singletonMap("_dd", Collections.singletonMap(key, value));
+    }
+
+    @Test
+    void manifestSurvivesMetadataAnnotationCarryingItsOwnReservedNamespace() throws Exception {
+        DDLLMObsSpan span = newAgentSpan("agent");
+        span.annotateAgentManifest(manifest("agent"));
+        span.setMetadata(callerDd("cost_tags", Collections.singletonList("model:gpt-4o")));
+
+        Map<String, Object> dd = reservedDd(span);
+        assertTrue(dd.containsKey("agent_manifest"));
+        assertEquals(Collections.singletonList("model:gpt-4o"), dd.get("cost_tags"));
+    }
 
-  private static CoreTracer tracer;
+    @Test
+    void callerSuppliedReservedNamespaceIsKeptWhenThereIsNoManifest() throws Exception {
+        DDLLMObsSpan span = newAgentSpan("agent");
+        span.setMetadata(Collections.singletonMap("tenant", "acme"));
+        span.setMetadata(callerDd("cost_tags", Collections.singletonList("a")));
 
-  static {
-    try {
-      SPAN_FIELD = DDLLMObsSpan.class.getDeclaredField("span");
-      SPAN_FIELD.setAccessible(true);
-    } catch (ReflectiveOperationException e) {
-      throw new ExceptionInInitializerError(e);
+        assertEquals(Collections.singletonList("a"), reservedDd(span).get("cost_tags"));
     }
-  }
-
-  @BeforeAll
-  static void installTracer() {
-    tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-  }
-
-  @AfterAll
-  static void closeTracer() {
-    TracerInstaller.forceInstallGlobalTracer(null);
-    tracer.close();
-  }
-
-  private static DDLLMObsSpan newAgentSpan(String name) {
-    WellKnownTags tags =
-        new WellKnownTags("runtime-id", "hostname", "test", "service", "version", "java");
-    return new DDLLMObsSpan(
-        Tags.LLMOBS_AGENT_SPAN_KIND, name, "test-ml-app", null, "service", tags);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> metadata(DDLLMObsSpan span) throws IllegalAccessException {
-    return (Map<String, Object>) ((AgentSpan) SPAN_FIELD.get(span)).getTag(METADATA_TAG);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> reservedDd(DDLLMObsSpan span) throws IllegalAccessException {
-    return (Map<String, Object>) metadata(span).get("_dd");
-  }
-
-  private static LLMObs.AgentManifest manifest(String name) {
-    return LLMObs.AgentManifest.builder().name(name).instructions("Do things.").build();
-  }
-
-  private static Map<String, Object> callerDd(String key, Object value) {
-    return Collections.singletonMap("_dd", Collections.singletonMap(key, value));
-  }
-
-  @Test
-  void manifestSurvivesMetadataAnnotationCarryingItsOwnReservedNamespace() throws Exception {
-    DDLLMObsSpan span = newAgentSpan("agent");
-    span.annotateAgentManifest(manifest("agent"));
-    span.setMetadata(callerDd("cost_tags", Collections.singletonList("model:gpt-4o")));
-
-    Map<String, Object> dd = reservedDd(span);
-    assertTrue(dd.containsKey("agent_manifest"));
-    assertEquals(Collections.singletonList("model:gpt-4o"), dd.get("cost_tags"));
-  }
-
-  @Test
-  void callerSuppliedReservedNamespaceIsKeptWhenThereIsNoManifest() throws Exception {
-    DDLLMObsSpan span = newAgentSpan("agent");
-    span.setMetadata(Collections.singletonMap("tenant", "acme"));
-    span.setMetadata(callerDd("cost_tags", Collections.singletonList("a")));
-
-    assertEquals(Collections.singletonList("a"), reservedDd(span).get("cost_tags"));
-  }
 }
diff --git a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanSamplingTest.java b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanSamplingTest.java
index 3b105bae69b..09682e1599b 100644
--- a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanSamplingTest.java
+++ b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanSamplingTest.java
@@ -20,115 +20,113 @@
  * computed once, at the root of an LLMObs trace, and every descendant reports it verbatim.
  */
 class DDLLMObsSpanSamplingTest {
-  private static final String SAMPLE_RATE_TAG = "_ml_obs_tag.sample_rate";
-  private static final String SAMPLING_DECISION_TAG = "_ml_obs_tag.sampling_decision";
+    private static final String SAMPLE_RATE_TAG = "_ml_obs_tag.sample_rate";
+    private static final String SAMPLING_DECISION_TAG = "_ml_obs_tag.sampling_decision";
 
-  private static final Field SPAN_FIELD;
+    private static final Field SPAN_FIELD;
 
-  private static CoreTracer tracer;
+    private static CoreTracer tracer;
 
-  static {
-    try {
-      SPAN_FIELD = DDLLMObsSpan.class.getDeclaredField("span");
-      SPAN_FIELD.setAccessible(true);
-    } catch (ReflectiveOperationException error) {
-      throw new ExceptionInInitializerError(error);
+    static {
+        try {
+            SPAN_FIELD = DDLLMObsSpan.class.getDeclaredField("span");
+            SPAN_FIELD.setAccessible(true);
+        } catch (ReflectiveOperationException error) {
+            throw new ExceptionInInitializerError(error);
+        }
     }
-  }
 
-  @BeforeAll
-  static void installTracer() {
-    tracer = CoreTracer.builder().build();
-    TracerInstaller.forceInstallGlobalTracer(tracer);
-  }
+    @BeforeAll
+    static void installTracer() {
+        tracer = CoreTracer.builder().build();
+        TracerInstaller.forceInstallGlobalTracer(tracer);
+    }
 
-  @AfterAll
-  static void closeTracer() {
-    TracerInstaller.forceInstallGlobalTracer(null);
-    tracer.close();
-  }
+    @AfterAll
+    static void closeTracer() {
+        TracerInstaller.forceInstallGlobalTracer(null);
+        tracer.close();
+    }
 
-  @Test
-  void stampsRetainedDecisionAtTheDefaultRate() throws IllegalAccessException {
-    // The fields are stamped at every rate, including 1.0, matching dd-trace-py.
-    DDLLMObsSpan llmObsSpan = newSpan(new LLMObsSampler(1.0));
-    try {
-      AgentSpan span = spanOf(llmObsSpan);
-      assertEquals("1", span.getTag(SAMPLING_DECISION_TAG));
-      assertEquals("1", span.getTag(SAMPLE_RATE_TAG));
-    } finally {
-      llmObsSpan.finish();
+    @Test
+    void stampsRetainedDecisionAtTheDefaultRate() throws IllegalAccessException {
+        // The fields are stamped at every rate, including 1.0, matching dd-trace-py.
+        DDLLMObsSpan llmObsSpan = newSpan(new LLMObsSampler(1.0));
+        try {
+            AgentSpan span = spanOf(llmObsSpan);
+            assertEquals("1", span.getTag(SAMPLING_DECISION_TAG));
+            assertEquals("1", span.getTag(SAMPLE_RATE_TAG));
+        } finally {
+            llmObsSpan.finish();
+        }
     }
-  }
 
-  @Test
-  void stampsDroppedDecisionOnRoot() throws IllegalAccessException {
-    DDLLMObsSpan llmObsSpan = newSpan(new LLMObsSampler(0.0));
-    try {
-      AgentSpan span = spanOf(llmObsSpan);
-      assertEquals("0", span.getTag(SAMPLING_DECISION_TAG));
-      assertEquals("0", span.getTag(SAMPLE_RATE_TAG));
-    } finally {
-      llmObsSpan.finish();
+    @Test
+    void stampsDroppedDecisionOnRoot() throws IllegalAccessException {
+        DDLLMObsSpan llmObsSpan = newSpan(new LLMObsSampler(0.0));
+        try {
+            AgentSpan span = spanOf(llmObsSpan);
+            assertEquals("0", span.getTag(SAMPLING_DECISION_TAG));
+            assertEquals("0", span.getTag(SAMPLE_RATE_TAG));
+        } finally {
+            llmObsSpan.finish();
+        }
     }
-  }
 
-  @Test
-  void childInheritsTheRootDecisionInsteadOfRecomputingIt() throws IllegalAccessException {
-    // The child's sampler drops everything. If the decision were recomputed per span, the child
-    // would report "0" and the trace would be torn in half at the intake.
-    DDLLMObsSpan root = newSpan(new LLMObsSampler(1.0));
-    try {
-      AgentSpan rootSpan = spanOf(root);
-      // Inheritance is gated on the two spans sharing an APM trace, so the root's APM span has to
-      // be active for the child to be started under it.
-      try (ContextScope ignored = AgentTracer.activateSpan(rootSpan)) {
-        DDLLMObsSpan child = newSpan(new LLMObsSampler(0.0));
+    @Test
+    void childInheritsTheRootDecisionInsteadOfRecomputingIt() throws IllegalAccessException {
+        // The child's sampler drops everything. If the decision were recomputed per span, the child
+        // would report "0" and the trace would be torn in half at the intake.
+        DDLLMObsSpan root = newSpan(new LLMObsSampler(1.0));
         try {
-          AgentSpan childSpan = spanOf(child);
-          assertEquals("1", childSpan.getTag(SAMPLING_DECISION_TAG));
-          assertEquals(
-              rootSpan.getTag(SAMPLE_RATE_TAG),
-              childSpan.getTag(SAMPLE_RATE_TAG),
-              "every span in a trace must report the rate the decision was made at");
+            AgentSpan rootSpan = spanOf(root);
+            // Inheritance is gated on the two spans sharing an APM trace, so the root's APM span has to
+            // be active for the child to be started under it.
+            try (ContextScope ignored = AgentTracer.activateSpan(rootSpan)) {
+                DDLLMObsSpan child = newSpan(new LLMObsSampler(0.0));
+                try {
+                    AgentSpan childSpan = spanOf(child);
+                    assertEquals("1", childSpan.getTag(SAMPLING_DECISION_TAG));
+                    assertEquals(
+                            rootSpan.getTag(SAMPLE_RATE_TAG),
+                            childSpan.getTag(SAMPLE_RATE_TAG),
+                            "every span in a trace must report the rate the decision was made at");
+                } finally {
+                    child.finish();
+                }
+            }
         } finally {
-          child.finish();
+            root.finish();
         }
-      }
-    } finally {
-      root.finish();
     }
-  }
 
-  @Test
-  void childOfADroppedRootStaysDropped() throws IllegalAccessException {
-    // Symmetric case. Because a decision is stamped at every rate, "the context carries a decision"
-    // is an unambiguous signal, so a child never mistakes an inherited drop for being a root.
-    DDLLMObsSpan root = newSpan(new LLMObsSampler(0.0));
-    try {
-      try (ContextScope ignored = AgentTracer.activateSpan(spanOf(root))) {
-        DDLLMObsSpan child = newSpan(new LLMObsSampler(1.0));
+    @Test
+    void childOfADroppedRootStaysDropped() throws IllegalAccessException {
+        // Symmetric case. Because a decision is stamped at every rate, "the context carries a decision"
+        // is an unambiguous signal, so a child never mistakes an inherited drop for being a root.
+        DDLLMObsSpan root = newSpan(new LLMObsSampler(0.0));
         try {
-          AgentSpan childSpan = spanOf(child);
-          assertEquals("0", childSpan.getTag(SAMPLING_DECISION_TAG));
-          assertEquals("0", childSpan.getTag(SAMPLE_RATE_TAG));
+            try (ContextScope ignored = AgentTracer.activateSpan(spanOf(root))) {
+                DDLLMObsSpan child = newSpan(new LLMObsSampler(1.0));
+                try {
+                    AgentSpan childSpan = spanOf(child);
+                    assertEquals("0", childSpan.getTag(SAMPLING_DECISION_TAG));
+                    assertEquals("0", childSpan.getTag(SAMPLE_RATE_TAG));
+                } finally {
+                    child.finish();
+                }
+            }
         } finally {
-          child.finish();
+            root.finish();
         }
-      }
-    } finally {
-      root.finish();
     }
-  }
 
-  private static DDLLMObsSpan newSpan(LLMObsSampler sampler) {
-    WellKnownTags tags =
-        new WellKnownTags("runtime-id", "hostname", "test", "service", "version", "java");
-    return new DDLLMObsSpan(
-        Tags.LLMOBS_LLM_SPAN_KIND, "span", "ml-app", null, "service", tags, null, sampler);
-  }
+    private static DDLLMObsSpan newSpan(LLMObsSampler sampler) {
+        WellKnownTags tags = new WellKnownTags("runtime-id", "hostname", "test", "service", "version", "java");
+        return new DDLLMObsSpan(Tags.LLMOBS_LLM_SPAN_KIND, "span", "ml-app", null, "service", tags, null, sampler);
+    }
 
-  private static AgentSpan spanOf(DDLLMObsSpan llmObsSpan) throws IllegalAccessException {
-    return (AgentSpan) SPAN_FIELD.get(llmObsSpan);
-  }
+    private static AgentSpan spanOf(DDLLMObsSpan llmObsSpan) throws IllegalAccessException {
+        return (AgentSpan) SPAN_FIELD.get(llmObsSpan);
+    }
 }
diff --git a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/LLMObsEvalTest.java b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/LLMObsEvalTest.java
index c293537a3f9..a97f494c94f 100644
--- a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/LLMObsEvalTest.java
+++ b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/LLMObsEvalTest.java
@@ -26,29 +26,25 @@
  */
 class LLMObsEvalTest {
 
-  private static final JsonAdapter<Map<String, Object>> JSON_READER =
-      new Moshi.Builder()
-          .build()
-          .adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
-
-  private static List<?> serialize(LLMObsEval... evals) throws IOException {
-    String body = LLMObsEval.batchSerializer().toJson(Arrays.asList(evals));
-
-    Map<String, Object> data = asMap(JSON_READER.fromJson(body).get("data"));
-    assertEquals("evaluation_metric", data.get("type"));
-    return (List<?>) asMap(data.get("attributes")).get("metrics");
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> asMap(Object value) {
-    return (Map<String, Object>) value;
-  }
-
-  @Test
-  void testScoreEvalCarriesTheV1KeySetAndNothingElse() throws IOException {
-    List<?> metrics =
-        serialize(
-            new LLMObsEval.Score(
+    private static final JsonAdapter<Map<String, Object>> JSON_READER =
+            new Moshi.Builder().build().adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
+
+    private static List<?> serialize(LLMObsEval... evals) throws IOException {
+        String body = LLMObsEval.batchSerializer().toJson(Arrays.asList(evals));
+
+        Map<String, Object> data = asMap(JSON_READER.fromJson(body).get("data"));
+        assertEquals("evaluation_metric", data.get("type"));
+        return (List<?>) asMap(data.get("attributes")).get("metrics");
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> asMap(Object value) {
+        return (Map<String, Object>) value;
+    }
+
+    @Test
+    void testScoreEvalCarriesTheV1KeySetAndNothingElse() throws IOException {
+        List<?> metrics = serialize(new LLMObsEval.Score(
                 "abc123",
                 42L,
                 1700000000000L,
@@ -57,56 +53,52 @@ void testScoreEvalCarriesTheV1KeySetAndNothingElse() throws IOException {
                 Collections.singletonMap("source", "web-ui"),
                 0.75));
 
-    assertEquals(1, metrics.size());
-    Map<String, Object> metric = asMap(metrics.get(0));
-
-    assertEquals("abc123", metric.get("trace_id"));
-    assertEquals("42", metric.get("span_id"));
-    assertEquals(1.7e12, metric.get("timestamp_ms"));
-    assertEquals("my-app", metric.get("ml_app"));
-    assertEquals("score", metric.get("metric_type"));
-    assertEquals("sentiment", metric.get("label"));
-    assertEquals(0.75, metric.get("score_value"));
-    assertEquals(Collections.singletonList("source:web-ui"), metric.get("tags"));
-
-    // The only addition to the v1 payload.
-    assertEquals("evaluation", metric.get("event_kind"));
-
-    // Feedback-only keys must never leak into the v1 payload.
-    assertFalse(metric.containsKey("submitter"), metric.toString());
-    assertFalse(metric.containsKey("session_id"), metric.toString());
-    assertFalse(metric.containsKey("feedback_join_key"), metric.toString());
-    assertFalse(metric.containsKey("assessment"), metric.toString());
-    assertFalse(metric.containsKey("reasoning"), metric.toString());
-  }
-
-  @Test
-  void testCategoricalEvalCarriesTheV1KeySet() throws IOException {
-    List<?> metrics =
-        serialize(
-            new LLMObsEval.Categorical(
-                "abc123", 42L, 1700000000000L, "my-app", "tone", null, "positive"));
-
-    Map<String, Object> metric = asMap(metrics.get(0));
-
-    assertEquals("categorical", metric.get("metric_type"));
-    assertEquals("positive", metric.get("categorical_value"));
-    assertFalse(metric.containsKey("score_value"), metric.toString());
-    // A null tag map is omitted rather than serialized as an empty list.
-    assertFalse(metric.containsKey("tags"), metric.toString());
-    assertEquals("evaluation", metric.get("event_kind"));
-  }
-
-  @Test
-  void testABatchMixesScoreAndCategoricalInOneEnvelope() throws IOException {
-    List<?> metrics =
-        serialize(
-            new LLMObsEval.Score("abc123", 42L, 1700000000000L, "my-app", "sentiment", null, 0.75),
-            new LLMObsEval.Categorical(
-                "abc123", 42L, 1700000000000L, "my-app", "tone", null, "positive"));
-
-    assertEquals(2, metrics.size());
-    assertEquals(0.75, asMap(metrics.get(0)).get("score_value"));
-    assertEquals("positive", asMap(metrics.get(1)).get("categorical_value"));
-  }
+        assertEquals(1, metrics.size());
+        Map<String, Object> metric = asMap(metrics.get(0));
+
+        assertEquals("abc123", metric.get("trace_id"));
+        assertEquals("42", metric.get("span_id"));
+        assertEquals(1.7e12, metric.get("timestamp_ms"));
+        assertEquals("my-app", metric.get("ml_app"));
+        assertEquals("score", metric.get("metric_type"));
+        assertEquals("sentiment", metric.get("label"));
+        assertEquals(0.75, metric.get("score_value"));
+        assertEquals(Collections.singletonList("source:web-ui"), metric.get("tags"));
+
+        // The only addition to the v1 payload.
+        assertEquals("evaluation", metric.get("event_kind"));
+
+        // Feedback-only keys must never leak into the v1 payload.
+        assertFalse(metric.containsKey("submitter"), metric.toString());
+        assertFalse(metric.containsKey("session_id"), metric.toString());
+        assertFalse(metric.containsKey("feedback_join_key"), metric.toString());
+        assertFalse(metric.containsKey("assessment"), metric.toString());
+        assertFalse(metric.containsKey("reasoning"), metric.toString());
+    }
+
+    @Test
+    void testCategoricalEvalCarriesTheV1KeySet() throws IOException {
+        List<?> metrics = serialize(
+                new LLMObsEval.Categorical("abc123", 42L, 1700000000000L, "my-app", "tone", null, "positive"));
+
+        Map<String, Object> metric = asMap(metrics.get(0));
+
+        assertEquals("categorical", metric.get("metric_type"));
+        assertEquals("positive", metric.get("categorical_value"));
+        assertFalse(metric.containsKey("score_value"), metric.toString());
+        // A null tag map is omitted rather than serialized as an empty list.
+        assertFalse(metric.containsKey("tags"), metric.toString());
+        assertEquals("evaluation", metric.get("event_kind"));
+    }
+
+    @Test
+    void testABatchMixesScoreAndCategoricalInOneEnvelope() throws IOException {
+        List<?> metrics = serialize(
+                new LLMObsEval.Score("abc123", 42L, 1700000000000L, "my-app", "sentiment", null, 0.75),
+                new LLMObsEval.Categorical("abc123", 42L, 1700000000000L, "my-app", "tone", null, "positive"));
+
+        assertEquals(2, metrics.size());
+        assertEquals(0.75, asMap(metrics.get(0)).get("score_value"));
+        assertEquals("positive", asMap(metrics.get(1)).get("categorical_value"));
+    }
 }
diff --git a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/LLMObsFeedbackEventTest.java b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/LLMObsFeedbackEventTest.java
index ba31458cf5d..1ae5786363c 100644
--- a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/LLMObsFeedbackEventTest.java
+++ b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/LLMObsFeedbackEventTest.java
@@ -18,271 +18,247 @@
 
 class LLMObsFeedbackEventTest {
 
-  private static final JsonAdapter<Map<String, Object>> JSON_READER =
-      new Moshi.Builder()
-          .build()
-          .adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
-
-  private static Map<String, Object> serializeOne(LLMObs.Feedback feedback, String mlApp)
-      throws IOException {
-    String body =
-        LLMObsFeedbackEvent.batchSerializer()
-            .toJson(Collections.singletonList(new LLMObsFeedbackEvent(feedback, mlApp)));
-
-    Map<String, Object> parsed = JSON_READER.fromJson(body);
-    Map<String, Object> data = asMap(parsed.get("data"));
-    assertEquals("evaluation_metric", data.get("type"));
-
-    List<?> metrics = (List<?>) asMap(data.get("attributes")).get("metrics");
-    assertEquals(1, metrics.size());
-    return asMap(metrics.get(0));
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> asMap(Object value) {
-    return (Map<String, Object>) value;
-  }
-
-  @Test
-  void testFeedbackIsToldApartFromEvaluationsByEventKind() throws IOException {
-    Map<String, Object> event =
-        serializeOne(
-            LLMObs.Feedback.builder()
-                .spanId("123")
-                .label("thumbs")
-                .booleanValue(true)
-                .submitter("user-123", "end_user")
-                .timestampMs(1700000000000L)
-                .build(),
-            "my-app");
-
-    assertEquals("feedback", event.get("event_kind"));
-    assertEquals("thumbs", event.get("label"));
-    assertEquals("boolean", event.get("metric_type"));
-    assertEquals(Boolean.TRUE, event.get("boolean_value"));
-    assertEquals("my-app", event.get("ml_app"));
-    assertEquals(1.7e12, event.get("timestamp_ms"));
-    assertEquals("123", event.get("span_id"));
-  }
-
-  @Test
-  void testExactlyOneTargetIsEmitted() throws IOException {
-    Map<String, Object> bySessionId =
-        serializeOne(
-            LLMObs.Feedback.builder()
-                .sessionId("session-2")
-                .label("thumbs")
-                .booleanValue(true)
-                .submitter("user-123", null)
-                .build(),
-            "my-app");
-
-    assertEquals("session-2", bySessionId.get("session_id"));
-    assertFalse(bySessionId.containsKey("span_id"), bySessionId.toString());
-    assertFalse(bySessionId.containsKey("trace_id"), bySessionId.toString());
-    assertFalse(bySessionId.containsKey("feedback_join_key"), bySessionId.toString());
-  }
-
-  @Test
-  void testJoinKeyTargetCarriesNoSpanNorTraceIdentifier() throws IOException {
-    Map<String, Object> event =
-        serializeOne(
-            LLMObs.Feedback.builder()
-                .feedbackJoinKey("incident-123")
-                .label("user_comment")
-                .textValue("The investigation missed the customer impact.")
-                .submitter("user-123", "end_user")
-                .assessment(LLMObs.Feedback.Assessment.FAIL)
-                .build(),
-            "incident-agent");
-
-    assertEquals("incident-123", event.get("feedback_join_key"));
-    assertEquals("text", event.get("metric_type"));
-    assertEquals("The investigation missed the customer impact.", event.get("text_value"));
-    assertEquals("fail", event.get("assessment"));
-    assertFalse(event.containsKey("span_id"), event.toString());
-    assertFalse(event.containsKey("trace_id"), event.toString());
-  }
-
-  @Test
-  void testExactlyOneValueKeyIsEmittedPerMetricType() throws IOException {
-    Map<String, Object> categorical =
-        serializeOne(
-            LLMObs.Feedback.builder()
-                .spanId("123")
-                .label("satisfaction")
-                .categoricalValue("satisfied")
-                .submitter("user-123", null)
-                .build(),
-            "my-app");
-    assertEquals("satisfied", categorical.get("categorical_value"));
-    assertFalse(categorical.containsKey("boolean_value"), categorical.toString());
-    assertFalse(categorical.containsKey("text_value"), categorical.toString());
-
-    Map<String, Object> score =
-        serializeOne(
-            LLMObs.Feedback.builder()
-                .spanId("123")
-                .label("rating")
-                .scoreValue(0.75)
-                .submitter("user-123", null)
-                .build(),
-            "my-app");
-    assertEquals(0.75, score.get("score_value"));
-
-    Map<String, Object> json =
-        serializeOne(
-            LLMObs.Feedback.builder()
-                .spanId("123")
-                .label("details")
-                .jsonValue(Collections.singletonMap("missing", "customer impact"))
-                .submitter("user-123", null)
-                .build(),
-            "my-app");
-    assertEquals(Collections.singletonMap("missing", "customer impact"), json.get("json_value"));
-  }
-
-  @Test
-  void testSubmitterTypeIsOmittedWhenAbsent() throws IOException {
-    Map<String, Object> withType =
-        serializeOne(
-            LLMObs.Feedback.builder()
-                .spanId("123")
-                .label("thumbs")
-                .booleanValue(true)
-                .submitter("user-123", "end_user")
-                .build(),
-            "my-app");
-    assertEquals("user-123", asMap(withType.get("submitter")).get("id"));
-    assertEquals("end_user", asMap(withType.get("submitter")).get("type"));
-
-    Map<String, Object> withoutType =
-        serializeOne(
-            LLMObs.Feedback.builder()
-                .spanId("123")
-                .label("thumbs")
-                .booleanValue(true)
-                .submitter("user-123", null)
-                .build(),
-            "my-app");
-    assertEquals("user-123", asMap(withoutType.get("submitter")).get("id"));
-    assertFalse(asMap(withoutType.get("submitter")).containsKey("type"), withoutType.toString());
-  }
-
-  @Test
-  void testAssessmentAndReasoningAreOmittedWhenAbsent() throws IOException {
-    Map<String, Object> event =
-        serializeOne(
-            LLMObs.Feedback.builder()
+    private static final JsonAdapter<Map<String, Object>> JSON_READER =
+            new Moshi.Builder().build().adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
+
+    private static Map<String, Object> serializeOne(LLMObs.Feedback feedback, String mlApp) throws IOException {
+        String body = LLMObsFeedbackEvent.batchSerializer()
+                .toJson(Collections.singletonList(new LLMObsFeedbackEvent(feedback, mlApp)));
+
+        Map<String, Object> parsed = JSON_READER.fromJson(body);
+        Map<String, Object> data = asMap(parsed.get("data"));
+        assertEquals("evaluation_metric", data.get("type"));
+
+        List<?> metrics = (List<?>) asMap(data.get("attributes")).get("metrics");
+        assertEquals(1, metrics.size());
+        return asMap(metrics.get(0));
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> asMap(Object value) {
+        return (Map<String, Object>) value;
+    }
+
+    @Test
+    void testFeedbackIsToldApartFromEvaluationsByEventKind() throws IOException {
+        Map<String, Object> event = serializeOne(
+                LLMObs.Feedback.builder()
+                        .spanId("123")
+                        .label("thumbs")
+                        .booleanValue(true)
+                        .submitter("user-123", "end_user")
+                        .timestampMs(1700000000000L)
+                        .build(),
+                "my-app");
+
+        assertEquals("feedback", event.get("event_kind"));
+        assertEquals("thumbs", event.get("label"));
+        assertEquals("boolean", event.get("metric_type"));
+        assertEquals(Boolean.TRUE, event.get("boolean_value"));
+        assertEquals("my-app", event.get("ml_app"));
+        assertEquals(1.7e12, event.get("timestamp_ms"));
+        assertEquals("123", event.get("span_id"));
+    }
+
+    @Test
+    void testExactlyOneTargetIsEmitted() throws IOException {
+        Map<String, Object> bySessionId = serializeOne(
+                LLMObs.Feedback.builder()
+                        .sessionId("session-2")
+                        .label("thumbs")
+                        .booleanValue(true)
+                        .submitter("user-123", null)
+                        .build(),
+                "my-app");
+
+        assertEquals("session-2", bySessionId.get("session_id"));
+        assertFalse(bySessionId.containsKey("span_id"), bySessionId.toString());
+        assertFalse(bySessionId.containsKey("trace_id"), bySessionId.toString());
+        assertFalse(bySessionId.containsKey("feedback_join_key"), bySessionId.toString());
+    }
+
+    @Test
+    void testJoinKeyTargetCarriesNoSpanNorTraceIdentifier() throws IOException {
+        Map<String, Object> event = serializeOne(
+                LLMObs.Feedback.builder()
+                        .feedbackJoinKey("incident-123")
+                        .label("user_comment")
+                        .textValue("The investigation missed the customer impact.")
+                        .submitter("user-123", "end_user")
+                        .assessment(LLMObs.Feedback.Assessment.FAIL)
+                        .build(),
+                "incident-agent");
+
+        assertEquals("incident-123", event.get("feedback_join_key"));
+        assertEquals("text", event.get("metric_type"));
+        assertEquals("The investigation missed the customer impact.", event.get("text_value"));
+        assertEquals("fail", event.get("assessment"));
+        assertFalse(event.containsKey("span_id"), event.toString());
+        assertFalse(event.containsKey("trace_id"), event.toString());
+    }
+
+    @Test
+    void testExactlyOneValueKeyIsEmittedPerMetricType() throws IOException {
+        Map<String, Object> categorical = serializeOne(
+                LLMObs.Feedback.builder()
+                        .spanId("123")
+                        .label("satisfaction")
+                        .categoricalValue("satisfied")
+                        .submitter("user-123", null)
+                        .build(),
+                "my-app");
+        assertEquals("satisfied", categorical.get("categorical_value"));
+        assertFalse(categorical.containsKey("boolean_value"), categorical.toString());
+        assertFalse(categorical.containsKey("text_value"), categorical.toString());
+
+        Map<String, Object> score = serializeOne(
+                LLMObs.Feedback.builder()
+                        .spanId("123")
+                        .label("rating")
+                        .scoreValue(0.75)
+                        .submitter("user-123", null)
+                        .build(),
+                "my-app");
+        assertEquals(0.75, score.get("score_value"));
+
+        Map<String, Object> json = serializeOne(
+                LLMObs.Feedback.builder()
+                        .spanId("123")
+                        .label("details")
+                        .jsonValue(Collections.singletonMap("missing", "customer impact"))
+                        .submitter("user-123", null)
+                        .build(),
+                "my-app");
+        assertEquals(Collections.singletonMap("missing", "customer impact"), json.get("json_value"));
+    }
+
+    @Test
+    void testSubmitterTypeIsOmittedWhenAbsent() throws IOException {
+        Map<String, Object> withType = serializeOne(
+                LLMObs.Feedback.builder()
+                        .spanId("123")
+                        .label("thumbs")
+                        .booleanValue(true)
+                        .submitter("user-123", "end_user")
+                        .build(),
+                "my-app");
+        assertEquals("user-123", asMap(withType.get("submitter")).get("id"));
+        assertEquals("end_user", asMap(withType.get("submitter")).get("type"));
+
+        Map<String, Object> withoutType = serializeOne(
+                LLMObs.Feedback.builder()
+                        .spanId("123")
+                        .label("thumbs")
+                        .booleanValue(true)
+                        .submitter("user-123", null)
+                        .build(),
+                "my-app");
+        assertEquals("user-123", asMap(withoutType.get("submitter")).get("id"));
+        assertFalse(asMap(withoutType.get("submitter")).containsKey("type"), withoutType.toString());
+    }
+
+    @Test
+    void testAssessmentAndReasoningAreOmittedWhenAbsent() throws IOException {
+        Map<String, Object> event = serializeOne(
+                LLMObs.Feedback.builder()
+                        .spanId("123")
+                        .label("thumbs")
+                        .booleanValue(true)
+                        .submitter("user-123", null)
+                        .build(),
+                "my-app");
+
+        assertFalse(event.containsKey("assessment"), event.toString());
+        assertFalse(event.containsKey("reasoning"), event.toString());
+    }
+
+    @Test
+    void testReasoningIsEmittedWhenPresent() throws IOException {
+        Map<String, Object> event = serializeOne(
+                LLMObs.Feedback.builder()
+                        .spanId("123")
+                        .label("thumbs")
+                        .booleanValue(false)
+                        .submitter("user-123", null)
+                        .reasoning("did not answer the question")
+                        .build(),
+                "my-app");
+
+        assertEquals("did not answer the question", event.get("reasoning"));
+    }
+
+    @Test
+    void testTagsCarryTracerVersionAndMlAppAlongsideUserTags() throws IOException {
+        Map<String, Object> event = serializeOne(
+                LLMObs.Feedback.builder()
+                        .spanId("123")
+                        .label("thumbs")
+                        .booleanValue(true)
+                        .submitter("user-123", null)
+                        .tag("source", "web-ui")
+                        .build(),
+                "my-app");
+
+        List<?> tags = (List<?>) event.get("tags");
+        assertTrue(tags.contains("ddtrace.version:" + DDTraceApiInfo.VERSION), tags.toString());
+        assertTrue(tags.contains("ml_app:my-app"), tags.toString());
+        assertTrue(tags.contains("source:web-ui"), tags.toString());
+    }
+
+    @Test
+    void testTagsAreEmittedEvenWithoutUserTags() throws IOException {
+        Map<String, Object> event = serializeOne(
+                LLMObs.Feedback.builder()
+                        .spanId("123")
+                        .label("thumbs")
+                        .booleanValue(true)
+                        .submitter("user-123", null)
+                        .build(),
+                "my-app");
+
+        assertEquals(Arrays.asList("ddtrace.version:" + DDTraceApiInfo.VERSION, "ml_app:my-app"), event.get("tags"));
+    }
+
+    @Test
+    void testABatchIsSerializedAsSeveralMetricsInOneEnvelope() throws IOException {
+        LLMObs.Feedback thumbs = LLMObs.Feedback.builder()
                 .spanId("123")
                 .label("thumbs")
                 .booleanValue(true)
                 .submitter("user-123", null)
-                .build(),
-            "my-app");
-
-    assertFalse(event.containsKey("assessment"), event.toString());
-    assertFalse(event.containsKey("reasoning"), event.toString());
-  }
-
-  @Test
-  void testReasoningIsEmittedWhenPresent() throws IOException {
-    Map<String, Object> event =
-        serializeOne(
-            LLMObs.Feedback.builder()
+                .build();
+        LLMObs.Feedback comment = LLMObs.Feedback.builder()
                 .spanId("123")
-                .label("thumbs")
-                .booleanValue(false)
+                .label("comment")
+                .textValue("helpful")
                 .submitter("user-123", null)
-                .reasoning("did not answer the question")
-                .build(),
-            "my-app");
-
-    assertEquals("did not answer the question", event.get("reasoning"));
-  }
-
-  @Test
-  void testTagsCarryTracerVersionAndMlAppAlongsideUserTags() throws IOException {
-    Map<String, Object> event =
-        serializeOne(
-            LLMObs.Feedback.builder()
-                .spanId("123")
-                .label("thumbs")
-                .booleanValue(true)
-                .submitter("user-123", null)
-                .tag("source", "web-ui")
-                .build(),
-            "my-app");
-
-    List<?> tags = (List<?>) event.get("tags");
-    assertTrue(tags.contains("ddtrace.version:" + DDTraceApiInfo.VERSION), tags.toString());
-    assertTrue(tags.contains("ml_app:my-app"), tags.toString());
-    assertTrue(tags.contains("source:web-ui"), tags.toString());
-  }
-
-  @Test
-  void testTagsAreEmittedEvenWithoutUserTags() throws IOException {
-    Map<String, Object> event =
-        serializeOne(
-            LLMObs.Feedback.builder()
-                .spanId("123")
-                .label("thumbs")
-                .booleanValue(true)
-                .submitter("user-123", null)
-                .build(),
-            "my-app");
-
-    assertEquals(
-        Arrays.asList("ddtrace.version:" + DDTraceApiInfo.VERSION, "ml_app:my-app"),
-        event.get("tags"));
-  }
-
-  @Test
-  void testABatchIsSerializedAsSeveralMetricsInOneEnvelope() throws IOException {
-    LLMObs.Feedback thumbs =
-        LLMObs.Feedback.builder()
-            .spanId("123")
-            .label("thumbs")
-            .booleanValue(true)
-            .submitter("user-123", null)
-            .build();
-    LLMObs.Feedback comment =
-        LLMObs.Feedback.builder()
-            .spanId("123")
-            .label("comment")
-            .textValue("helpful")
-            .submitter("user-123", null)
-            .build();
-
-    String body =
-        LLMObsFeedbackEvent.batchSerializer()
-            .toJson(
-                Arrays.asList(
-                    new LLMObsFeedbackEvent(thumbs, "my-app"),
-                    new LLMObsFeedbackEvent(comment, "my-app")));
-
-    Map<String, Object> data = asMap(JSON_READER.fromJson(body).get("data"));
-    List<?> metrics = (List<?>) asMap(data.get("attributes")).get("metrics");
-
-    assertEquals(2, metrics.size());
-    assertEquals("thumbs", asMap(metrics.get(0)).get("label"));
-    assertEquals("comment", asMap(metrics.get(1)).get("label"));
-  }
-
-  @Test
-  void testMlAppFallsBackToTheProvidedDefault() throws IOException {
-    Map<String, Object> event =
-        serializeOne(
-            LLMObs.Feedback.builder()
-                .spanId("123")
-                .label("thumbs")
-                .booleanValue(true)
-                .submitter("user-123", null)
-                .build(),
-            "fallback-app");
-
-    assertEquals("fallback-app", event.get("ml_app"));
-    List<?> tags = (List<?>) event.get("tags");
-    assertTrue(tags.contains("ml_app:fallback-app"), tags.toString());
-  }
+                .build();
+
+        String body = LLMObsFeedbackEvent.batchSerializer()
+                .toJson(Arrays.asList(
+                        new LLMObsFeedbackEvent(thumbs, "my-app"), new LLMObsFeedbackEvent(comment, "my-app")));
+
+        Map<String, Object> data = asMap(JSON_READER.fromJson(body).get("data"));
+        List<?> metrics = (List<?>) asMap(data.get("attributes")).get("metrics");
+
+        assertEquals(2, metrics.size());
+        assertEquals("thumbs", asMap(metrics.get(0)).get("label"));
+        assertEquals("comment", asMap(metrics.get(1)).get("label"));
+    }
+
+    @Test
+    void testMlAppFallsBackToTheProvidedDefault() throws IOException {
+        Map<String, Object> event = serializeOne(
+                LLMObs.Feedback.builder()
+                        .spanId("123")
+                        .label("thumbs")
+                        .booleanValue(true)
+                        .submitter("user-123", null)
+                        .build(),
+                "fallback-app");
+
+        assertEquals("fallback-app", event.get("ml_app"));
+        List<?> tags = (List<?>) event.get("tags");
+        assertTrue(tags.contains("ml_app:fallback-app"), tags.toString());
+    }
 }
diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/slf4j/impl/StaticLoggerBinder.java b/dd-java-agent/agent-logging/src/main/java/datadog/slf4j/impl/StaticLoggerBinder.java
index 88ebc8cacfa..6e496c4eb1f 100644
--- a/dd-java-agent/agent-logging/src/main/java/datadog/slf4j/impl/StaticLoggerBinder.java
+++ b/dd-java-agent/agent-logging/src/main/java/datadog/slf4j/impl/StaticLoggerBinder.java
@@ -10,28 +10,28 @@
 
 public class StaticLoggerBinder implements LoggerFactoryBinder {
 
-  // declare this field to satisfy GraalVM's static analysis
-  public static final String REQUESTED_API_VERSION = "1.7.30";
+    // declare this field to satisfy GraalVM's static analysis
+    public static final String REQUESTED_API_VERSION = "1.7.30";
 
-  private static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder();
+    private static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder();
 
-  public static final StaticLoggerBinder getSingleton() {
-    return SINGLETON;
-  }
+    public static final StaticLoggerBinder getSingleton() {
+        return SINGLETON;
+    }
 
-  private static final String loggerFactoryClassStr = DDLoggerFactory.class.getName();
+    private static final String loggerFactoryClassStr = DDLoggerFactory.class.getName();
 
-  private final ILoggerFactory loggerFactory;
+    private final ILoggerFactory loggerFactory;
 
-  private StaticLoggerBinder() {
-    loggerFactory = new DDLoggerFactory();
-  }
+    private StaticLoggerBinder() {
+        loggerFactory = new DDLoggerFactory();
+    }
 
-  public ILoggerFactory getLoggerFactory() {
-    return loggerFactory;
-  }
+    public ILoggerFactory getLoggerFactory() {
+        return loggerFactory;
+    }
 
-  public String getLoggerFactoryClassStr() {
-    return loggerFactoryClassStr;
-  }
+    public String getLoggerFactoryClassStr() {
+        return loggerFactoryClassStr;
+    }
 }
diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/slf4j/impl/StaticMDCBinder.java b/dd-java-agent/agent-logging/src/main/java/datadog/slf4j/impl/StaticMDCBinder.java
index c0cbfecd1aa..d2b45ef82d4 100644
--- a/dd-java-agent/agent-logging/src/main/java/datadog/slf4j/impl/StaticMDCBinder.java
+++ b/dd-java-agent/agent-logging/src/main/java/datadog/slf4j/impl/StaticMDCBinder.java
@@ -9,15 +9,15 @@
 
 public class StaticMDCBinder {
 
-  public static final StaticMDCBinder SINGLETON = new StaticMDCBinder();
+    public static final StaticMDCBinder SINGLETON = new StaticMDCBinder();
 
-  private StaticMDCBinder() {}
+    private StaticMDCBinder() {}
 
-  public MDCAdapter getMDCA() {
-    return new NOPMDCAdapter();
-  }
+    public MDCAdapter getMDCA() {
+        return new NOPMDCAdapter();
+    }
 
-  public String getMDCAdapterClassStr() {
-    return NOPMDCAdapter.class.getName();
-  }
+    public String getMDCAdapterClassStr() {
+        return NOPMDCAdapter.class.getName();
+    }
 }
diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/slf4j/impl/StaticMarkerBinder.java b/dd-java-agent/agent-logging/src/main/java/datadog/slf4j/impl/StaticMarkerBinder.java
index b235d617f37..0885bd87a17 100644
--- a/dd-java-agent/agent-logging/src/main/java/datadog/slf4j/impl/StaticMarkerBinder.java
+++ b/dd-java-agent/agent-logging/src/main/java/datadog/slf4j/impl/StaticMarkerBinder.java
@@ -10,21 +10,21 @@
 
 public class StaticMarkerBinder implements MarkerFactoryBinder {
 
-  public static final StaticMarkerBinder SINGLETON = new StaticMarkerBinder();
+    public static final StaticMarkerBinder SINGLETON = new StaticMarkerBinder();
 
-  final IMarkerFactory markerFactory = new BasicMarkerFactory();
+    final IMarkerFactory markerFactory = new BasicMarkerFactory();
 
-  private StaticMarkerBinder() {}
+    private StaticMarkerBinder() {}
 
-  public static StaticMarkerBinder getSingleton() {
-    return SINGLETON;
-  }
+    public static StaticMarkerBinder getSingleton() {
+        return SINGLETON;
+    }
 
-  public IMarkerFactory getMarkerFactory() {
-    return markerFactory;
-  }
+    public IMarkerFactory getMarkerFactory() {
+        return markerFactory;
+    }
 
-  public String getMarkerFactoryClassStr() {
-    return BasicMarkerFactory.class.getName();
-  }
+    public String getMarkerFactoryClassStr() {
+        return BasicMarkerFactory.class.getName();
+    }
 }
diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/LogReporter.java b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/LogReporter.java
index 0e6c9892dff..dead3c6cd04 100644
--- a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/LogReporter.java
+++ b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/LogReporter.java
@@ -14,110 +14,109 @@
 import java.util.zip.ZipOutputStream;
 
 public class LogReporter implements TracerFlare.Reporter {
-  private static final LogReporter INSTANCE = new LogReporter();
-  private static final int MAX_LOGFILE_SIZE_MB = 15;
-  public static final int MAX_LOGFILE_SIZE_BYTES = MAX_LOGFILE_SIZE_MB << 20;
-  private Path capturedLogPath;
-  private boolean isFlarePrepared;
-  private static File configuredLogFile;
-  private static PrintStreamWrapper wrappedPrintStream;
+    private static final LogReporter INSTANCE = new LogReporter();
+    private static final int MAX_LOGFILE_SIZE_MB = 15;
+    public static final int MAX_LOGFILE_SIZE_BYTES = MAX_LOGFILE_SIZE_MB << 20;
+    private Path capturedLogPath;
+    private boolean isFlarePrepared;
+    private static File configuredLogFile;
+    private static PrintStreamWrapper wrappedPrintStream;
 
-  private LogReporter() {}
+    private LogReporter() {}
 
-  public static void register(PrintStreamWrapper printStreamWrapper) {
-    wrappedPrintStream = printStreamWrapper;
-    register();
-  }
+    public static void register(PrintStreamWrapper printStreamWrapper) {
+        wrappedPrintStream = printStreamWrapper;
+        register();
+    }
 
-  public static void register(File configuredFile) {
-    configuredLogFile = configuredFile;
-    register();
-  }
+    public static void register(File configuredFile) {
+        configuredLogFile = configuredFile;
+        register();
+    }
 
-  private static void register() {
-    TracerFlare.addReporter(INSTANCE);
-  }
+    private static void register() {
+        TracerFlare.addReporter(INSTANCE);
+    }
 
-  @Override
-  public void prepareForFlare() {
-    isFlarePrepared = true;
-    if (wrappedPrintStream != null) {
-      long endMillis = System.currentTimeMillis();
-      String captureFilename =
-          "tracer" + "-" + Config.get().getRuntimeId() + "-" + endMillis + ".log";
-      try {
-        Path tempPath = Paths.get(SystemProperties.get("java.io.tmpdir"), captureFilename);
-        Path parentPath = tempPath.getParent();
-        if (parentPath != null && !Files.isDirectory(parentPath)) {
-          Files.createDirectories(parentPath);
+    @Override
+    public void prepareForFlare() {
+        isFlarePrepared = true;
+        if (wrappedPrintStream != null) {
+            long endMillis = System.currentTimeMillis();
+            String captureFilename = "tracer" + "-" + Config.get().getRuntimeId() + "-" + endMillis + ".log";
+            try {
+                Path tempPath = Paths.get(SystemProperties.get("java.io.tmpdir"), captureFilename);
+                Path parentPath = tempPath.getParent();
+                if (parentPath != null && !Files.isDirectory(parentPath)) {
+                    Files.createDirectories(parentPath);
+                }
+                capturedLogPath = Files.createFile(tempPath);
+                wrappedPrintStream.startCapturing(capturedLogPath);
+            } catch (IOException e) {
+                // Nothing to do, file creation failed, we don't have access to log yet
+            }
         }
-        capturedLogPath = Files.createFile(tempPath);
-        wrappedPrintStream.startCapturing(capturedLogPath);
-      } catch (IOException e) {
-        // Nothing to do, file creation failed, we don't have access to log yet
-      }
     }
-  }
 
-  @Override
-  public void addReportToFlare(ZipOutputStream zip) throws IOException {
-    if (configuredLogFile == null) {
-      if (isFlarePrepared) {
-        try {
-          if (capturedLogPath != null) {
-            TracerFlare.addBinary(zip, "tracer.log", readAllBytes(capturedLogPath));
-          }
-        } catch (Exception e) {
-          TracerFlare.addText(
-              zip, "tracer.log", "Problem reading temporary tracer log file: " + e.getMessage());
-        }
-      } else {
-        TracerFlare.addText(
-            zip, "tracer.log", "No tracer log file specified and no prepare flare event received");
-      }
+    @Override
+    public void addReportToFlare(ZipOutputStream zip) throws IOException {
+        if (configuredLogFile == null) {
+            if (isFlarePrepared) {
+                try {
+                    if (capturedLogPath != null) {
+                        TracerFlare.addBinary(zip, "tracer.log", readAllBytes(capturedLogPath));
+                    }
+                } catch (Exception e) {
+                    TracerFlare.addText(
+                            zip, "tracer.log", "Problem reading temporary tracer log file: " + e.getMessage());
+                }
+            } else {
+                TracerFlare.addText(
+                        zip, "tracer.log", "No tracer log file specified and no prepare flare event received");
+            }
 
-    } else {
-      Path path = Paths.get(configuredLogFile.getPath());
-      if (Files.exists(path)) {
-        try {
-          long size = Files.size(path);
-          if (size > MAX_LOGFILE_SIZE_BYTES) {
-            int maxSizeOfSplit = MAX_LOGFILE_SIZE_BYTES / 2;
-            File originalFile = new File(path.toString());
-            try (RandomAccessFile ras = new RandomAccessFile(originalFile, "r")) {
-              final byte[] buffer = new byte[maxSizeOfSplit];
-              ras.readFully(buffer);
-              TracerFlare.addBinary(zip, "tracer_begin.log", buffer);
-              ras.seek(size - maxSizeOfSplit);
-              ras.readFully(buffer);
-              TracerFlare.addBinary(zip, "tracer_end.log", buffer);
+        } else {
+            Path path = Paths.get(configuredLogFile.getPath());
+            if (Files.exists(path)) {
+                try {
+                    long size = Files.size(path);
+                    if (size > MAX_LOGFILE_SIZE_BYTES) {
+                        int maxSizeOfSplit = MAX_LOGFILE_SIZE_BYTES / 2;
+                        File originalFile = new File(path.toString());
+                        try (RandomAccessFile ras = new RandomAccessFile(originalFile, "r")) {
+                            final byte[] buffer = new byte[maxSizeOfSplit];
+                            ras.readFully(buffer);
+                            TracerFlare.addBinary(zip, "tracer_begin.log", buffer);
+                            ras.seek(size - maxSizeOfSplit);
+                            ras.readFully(buffer);
+                            TracerFlare.addBinary(zip, "tracer_end.log", buffer);
+                        }
+                    } else {
+                        TracerFlare.addBinary(zip, "tracer.log", readAllBytes(path));
+                    }
+                } catch (Throwable e) {
+                    TracerFlare.addText(zip, "tracer.log", "Problem collecting tracer log: " + e);
+                }
             }
-          } else {
-            TracerFlare.addBinary(zip, "tracer.log", readAllBytes(path));
-          }
-        } catch (Throwable e) {
-          TracerFlare.addText(zip, "tracer.log", "Problem collecting tracer log: " + e);
         }
-      }
     }
-  }
 
-  @Override
-  public void cleanupAfterFlare() {
-    isFlarePrepared = false;
-    if (wrappedPrintStream != null) {
-      try {
-        wrappedPrintStream.stopCapturing();
-        File outputFile = capturedLogPath.toFile();
-        if (outputFile.exists()) {
-          if (!outputFile.delete()) {
-            throw new RuntimeException("Failed to delete file: " + capturedLogPath);
-          }
+    @Override
+    public void cleanupAfterFlare() {
+        isFlarePrepared = false;
+        if (wrappedPrintStream != null) {
+            try {
+                wrappedPrintStream.stopCapturing();
+                File outputFile = capturedLogPath.toFile();
+                if (outputFile.exists()) {
+                    if (!outputFile.delete()) {
+                        throw new RuntimeException("Failed to delete file: " + capturedLogPath);
+                    }
+                }
+            } catch (Exception e) {
+                // not sure what to do here
+            }
+            capturedLogPath = null;
         }
-      } catch (Exception e) {
-        // not sure what to do here
-      }
-      capturedLogPath = null;
     }
-  }
 }
diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/LoggerHelper.java b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/LoggerHelper.java
index 63d20d87d0a..925af07887f 100644
--- a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/LoggerHelper.java
+++ b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/LoggerHelper.java
@@ -3,26 +3,26 @@
 import org.slf4j.Marker;
 
 public abstract class LoggerHelper {
-  /**
-   * Check if the provided {@link LogLevel} and {@link Marker} combination is enabled.
-   *
-   * @param level the {@link LogLevel} to check
-   * @param marker the {@link Marker} to check
-   * @return true if logging is enabled for the {@code level} and {@code marker} combination, false
-   *     otherwise
-   */
-  public abstract boolean enabled(LogLevel level, Marker marker);
+    /**
+     * Check if the provided {@link LogLevel} and {@link Marker} combination is enabled.
+     *
+     * @param level the {@link LogLevel} to check
+     * @param marker the {@link Marker} to check
+     * @return true if logging is enabled for the {@code level} and {@code marker} combination, false
+     *     otherwise
+     */
+    public abstract boolean enabled(LogLevel level, Marker marker);
 
-  /**
-   * Log a message at a certain level.
-   *
-   * <p>The {@link LoggerHelper} can assume that the caller have checked if the {@code level} is
-   * {@code enabled}.
-   *
-   * @param level the {@link LogLevel} to log at
-   * @param marker the {@link Marker} to log
-   * @param message the message to log
-   * @param t the {@link Throwable} to log
-   */
-  public abstract void log(LogLevel level, Marker marker, String message, Throwable t);
+    /**
+     * Log a message at a certain level.
+     *
+     * <p>The {@link LoggerHelper} can assume that the caller have checked if the {@code level} is
+     * {@code enabled}.
+     *
+     * @param level the {@link LogLevel} to log at
+     * @param marker the {@link Marker} to log
+     * @param message the message to log
+     * @param t the {@link Throwable} to log
+     */
+    public abstract void log(LogLevel level, Marker marker, String message, Throwable t);
 }
diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/LoggerHelperFactory.java b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/LoggerHelperFactory.java
index 152e44bfc18..cb6019e56b5 100644
--- a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/LoggerHelperFactory.java
+++ b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/LoggerHelperFactory.java
@@ -4,18 +4,18 @@
 
 /** A factory for creating {@link LoggerHelper} instances. */
 public abstract class LoggerHelperFactory {
-  /**
-   * Create a {@link LoggerHelper} for the given {@code name}.
-   *
-   * @param name the name of the {@code logger}
-   * @return the {@link LoggerHelper} for the given name
-   */
-  public abstract LoggerHelper loggerHelperForName(String name);
+    /**
+     * Create a {@link LoggerHelper} for the given {@code name}.
+     *
+     * @param name the name of the {@code logger}
+     * @return the {@link LoggerHelper} for the given name
+     */
+    public abstract LoggerHelper loggerHelperForName(String name);
 
-  /**
-   * Return a map describing all the settings for this {@link LoggerHelperFactory}.
-   *
-   * @return a {@link Map} describing the settings for this {@link LoggerHelperFactory}
-   */
-  public abstract Map<String, Object> getSettingsDescription();
+    /**
+     * Return a map describing all the settings for this {@link LoggerHelperFactory}.
+     *
+     * @return a {@link Map} describing the settings for this {@link LoggerHelperFactory}
+     */
+    public abstract Map<String, Object> getSettingsDescription();
 }
diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/PrintStreamWrapper.java b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/PrintStreamWrapper.java
index c71390a8e23..3a44f27fcf8 100644
--- a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/PrintStreamWrapper.java
+++ b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/PrintStreamWrapper.java
@@ -9,62 +9,62 @@
 import java.nio.file.Path;
 
 public class PrintStreamWrapper extends PrintStream {
-  private static final int LINE_SEPARATOR_LENGTH = OperatingSystem.isWindows() ? 2 : 1;
-  private volatile boolean captureOutput = false;
-  private volatile int currentSize = 0;
-  private PrintStream capturingStream = null;
+    private static final int LINE_SEPARATOR_LENGTH = OperatingSystem.isWindows() ? 2 : 1;
+    private volatile boolean captureOutput = false;
+    private volatile int currentSize = 0;
+    private PrintStream capturingStream = null;
 
-  public PrintStreamWrapper(PrintStream ps) {
-    super(ps);
-  }
+    public PrintStreamWrapper(PrintStream ps) {
+        super(ps);
+    }
 
-  @VisibleForTesting
-  public OutputStream getOriginalPrintStream() {
-    return super.out;
-  }
+    @VisibleForTesting
+    public OutputStream getOriginalPrintStream() {
+        return super.out;
+    }
 
-  @Override
-  public void println(String x) {
-    super.println(x); // log as usual
-    if (captureOutput) {
-      int outputLength = x.length() + LINE_SEPARATOR_LENGTH;
-      if (currentSize + outputLength < LogReporter.MAX_LOGFILE_SIZE_BYTES) {
-        synchronized (this) {
-          capturingStream.println(x);
-          currentSize += outputLength;
+    @Override
+    public void println(String x) {
+        super.println(x); // log as usual
+        if (captureOutput) {
+            int outputLength = x.length() + LINE_SEPARATOR_LENGTH;
+            if (currentSize + outputLength < LogReporter.MAX_LOGFILE_SIZE_BYTES) {
+                synchronized (this) {
+                    capturingStream.println(x);
+                    currentSize += outputLength;
+                }
+            } else {
+                captureOutput = false;
+            }
         }
-      } else {
-        captureOutput = false;
-      }
     }
-  }
 
-  @Override
-  public void println(Object x) {
-    String s = String.valueOf(x);
-    println(s);
-  }
+    @Override
+    public void println(Object x) {
+        String s = String.valueOf(x);
+        println(s);
+    }
 
-  public void startCapturing(Path filepath) {
-    stopCapturing();
-    try {
-      if (filepath != null) {
-        String logFile = filepath.toString();
-        FileOutputStream fileOutputStream = new FileOutputStream(logFile);
-        capturingStream = new PrintStream(fileOutputStream, true);
-        captureOutput = true;
-      }
-    } catch (FileNotFoundException e) {
-      // TODO maybe have support for delayed logging of early failures?
+    public void startCapturing(Path filepath) {
+        stopCapturing();
+        try {
+            if (filepath != null) {
+                String logFile = filepath.toString();
+                FileOutputStream fileOutputStream = new FileOutputStream(logFile);
+                capturingStream = new PrintStream(fileOutputStream, true);
+                captureOutput = true;
+            }
+        } catch (FileNotFoundException e) {
+            // TODO maybe have support for delayed logging of early failures?
+        }
     }
-  }
 
-  public void stopCapturing() {
-    if (capturingStream != null) {
-      capturingStream.close();
-      capturingStream = null;
+    public void stopCapturing() {
+        if (capturingStream != null) {
+            capturingStream.close();
+            capturingStream = null;
+        }
+        currentSize = 0;
+        captureOutput = false;
     }
-    currentSize = 0;
-    captureOutput = false;
-  }
 }
diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLogger.java b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLogger.java
index 73cdbd06d04..4e30c4303e6 100644
--- a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLogger.java
+++ b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLogger.java
@@ -10,354 +10,354 @@
 /** Implementation of org.slf4j.Logger. Delegates actual rendering to {@link LoggerHelper}. */
 public class DDLogger implements Logger {
 
-  private final String name;
-  private final LoggerHelper helper;
-
-  public DDLogger(LoggerHelper helper, String name) {
-    this.name = name;
-    this.helper = helper;
-  }
-
-  @Override
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public boolean isTraceEnabled() {
-    return helper.enabled(LogLevel.TRACE, null);
-  }
-
-  @Override
-  public void trace(String msg) {
-    log(LogLevel.TRACE, null, msg, null);
-  }
-
-  @Override
-  public void trace(String format, Object arg) {
-    formatLog(LogLevel.TRACE, null, format, arg);
-  }
-
-  @Override
-  public void trace(String format, Object arg1, Object arg2) {
-    formatLog(LogLevel.TRACE, null, format, arg1, arg2);
-  }
-
-  @Override
-  public void trace(String format, Object... arguments) {
-    formatLog(LogLevel.TRACE, null, format, arguments);
-  }
-
-  @Override
-  public void trace(String msg, Throwable t) {
-    log(LogLevel.TRACE, null, msg, t);
-  }
-
-  @Override
-  public boolean isTraceEnabled(Marker marker) {
-    return helper.enabled(LogLevel.TRACE, marker);
-  }
-
-  @Override
-  public void trace(Marker marker, String msg) {
-    log(LogLevel.TRACE, marker, msg, null);
-  }
-
-  @Override
-  public void trace(Marker marker, String format, Object arg) {
-    formatLog(LogLevel.TRACE, marker, format, arg);
-  }
-
-  @Override
-  public void trace(Marker marker, String format, Object arg1, Object arg2) {
-    formatLog(LogLevel.TRACE, marker, format, arg1, arg2);
-  }
-
-  @Override
-  public void trace(Marker marker, String format, Object... arguments) {
-    formatLog(LogLevel.TRACE, marker, format, arguments);
-  }
-
-  @Override
-  public void trace(Marker marker, String msg, Throwable t) {
-    log(LogLevel.TRACE, marker, msg, t);
-  }
-
-  @Override
-  public boolean isDebugEnabled() {
-    return helper.enabled(LogLevel.DEBUG, null);
-  }
-
-  @Override
-  public void debug(String msg) {
-    log(LogLevel.DEBUG, null, msg, null);
-  }
-
-  @Override
-  public void debug(String format, Object arg) {
-    formatLog(LogLevel.DEBUG, null, format, arg);
-  }
-
-  @Override
-  public void debug(String format, Object arg1, Object arg2) {
-    formatLog(LogLevel.DEBUG, null, format, arg1, arg2);
-  }
-
-  @Override
-  public void debug(String format, Object... arguments) {
-    formatLog(LogLevel.DEBUG, null, format, arguments);
-  }
-
-  @Override
-  public void debug(String msg, Throwable t) {
-    log(LogLevel.DEBUG, null, msg, t);
-  }
-
-  @Override
-  public boolean isDebugEnabled(Marker marker) {
-    return helper.enabled(LogLevel.DEBUG, marker);
-  }
-
-  @Override
-  public void debug(Marker marker, String msg) {
-    log(LogLevel.DEBUG, marker, msg, null);
-  }
-
-  @Override
-  public void debug(Marker marker, String format, Object arg) {
-    formatLog(LogLevel.DEBUG, marker, format, arg);
-  }
-
-  @Override
-  public void debug(Marker marker, String format, Object arg1, Object arg2) {
-    formatLog(LogLevel.DEBUG, marker, format, arg1, arg2);
-  }
-
-  @Override
-  public void debug(Marker marker, String format, Object... arguments) {
-    formatLog(LogLevel.DEBUG, marker, format, arguments);
-  }
-
-  @Override
-  public void debug(Marker marker, String msg, Throwable t) {
-    log(LogLevel.DEBUG, marker, msg, t);
-  }
-
-  @Override
-  public boolean isInfoEnabled() {
-    return helper.enabled(LogLevel.INFO, null);
-  }
-
-  @Override
-  public void info(String msg) {
-    log(LogLevel.INFO, null, msg, null);
-  }
-
-  @Override
-  public void info(String format, Object arg) {
-    formatLog(LogLevel.INFO, null, format, arg);
-  }
-
-  @Override
-  public void info(String format, Object arg1, Object arg2) {
-    formatLog(LogLevel.INFO, null, format, arg1, arg2);
-  }
-
-  @Override
-  public void info(String format, Object... arguments) {
-    formatLog(LogLevel.INFO, null, format, arguments);
-  }
-
-  @Override
-  public void info(String msg, Throwable t) {
-    log(LogLevel.INFO, null, msg, t);
-  }
-
-  @Override
-  public boolean isInfoEnabled(Marker marker) {
-    return helper.enabled(LogLevel.INFO, marker);
-  }
-
-  @Override
-  public void info(Marker marker, String msg) {
-    log(LogLevel.INFO, marker, msg, null);
-  }
-
-  @Override
-  public void info(Marker marker, String format, Object arg) {
-    formatLog(LogLevel.INFO, marker, format, arg);
-  }
-
-  @Override
-  public void info(Marker marker, String format, Object arg1, Object arg2) {
-    formatLog(LogLevel.INFO, marker, format, arg1, arg2);
-  }
-
-  @Override
-  public void info(Marker marker, String format, Object... arguments) {
-    formatLog(LogLevel.INFO, marker, format, arguments);
-  }
-
-  @Override
-  public void info(Marker marker, String msg, Throwable t) {
-    log(LogLevel.INFO, marker, msg, t);
-  }
-
-  @Override
-  public boolean isWarnEnabled() {
-    return helper.enabled(LogLevel.WARN, null);
-  }
-
-  @Override
-  public void warn(String msg) {
-    log(LogLevel.WARN, null, msg, null);
-  }
-
-  @Override
-  public void warn(String format, Object arg) {
-    formatLog(LogLevel.WARN, null, format, arg);
-  }
-
-  @Override
-  public void warn(String format, Object arg1, Object arg2) {
-    formatLog(LogLevel.WARN, null, format, arg1, arg2);
-  }
-
-  @Override
-  public void warn(String format, Object... arguments) {
-    formatLog(LogLevel.WARN, null, format, arguments);
-  }
-
-  @Override
-  public void warn(String msg, Throwable t) {
-    log(LogLevel.WARN, null, msg, t);
-  }
-
-  @Override
-  public boolean isWarnEnabled(Marker marker) {
-    return helper.enabled(LogLevel.WARN, marker);
-  }
-
-  @Override
-  public void warn(Marker marker, String msg) {
-    log(LogLevel.WARN, marker, msg, null);
-  }
-
-  @Override
-  public void warn(Marker marker, String format, Object arg) {
-    formatLog(LogLevel.WARN, marker, format, arg);
-  }
-
-  @Override
-  public void warn(Marker marker, String format, Object arg1, Object arg2) {
-    formatLog(LogLevel.WARN, marker, format, arg1, arg2);
-  }
-
-  @Override
-  public void warn(Marker marker, String format, Object... arguments) {
-    formatLog(LogLevel.WARN, marker, format, arguments);
-  }
-
-  @Override
-  public void warn(Marker marker, String msg, Throwable t) {
-    log(LogLevel.WARN, marker, msg, t);
-  }
-
-  @Override
-  public boolean isErrorEnabled() {
-    return helper.enabled(LogLevel.ERROR, null);
-  }
-
-  @Override
-  public void error(String msg) {
-    log(LogLevel.ERROR, null, msg, null);
-  }
-
-  @Override
-  public void error(String format, Object arg) {
-    formatLog(LogLevel.ERROR, null, format, arg);
-  }
-
-  @Override
-  public void error(String format, Object arg1, Object arg2) {
-    formatLog(LogLevel.ERROR, null, format, arg1, arg2);
-  }
-
-  @Override
-  public void error(String format, Object... arguments) {
-    formatLog(LogLevel.ERROR, null, format, arguments);
-  }
-
-  @Override
-  public void error(String msg, Throwable t) {
-    log(LogLevel.ERROR, null, msg, t);
-  }
-
-  @Override
-  public boolean isErrorEnabled(Marker marker) {
-    return helper.enabled(LogLevel.ERROR, marker);
-  }
-
-  @Override
-  public void error(Marker marker, String msg) {
-    log(LogLevel.ERROR, marker, msg, null);
-  }
-
-  @Override
-  public void error(Marker marker, String format, Object arg) {
-    formatLog(LogLevel.ERROR, marker, format, arg);
-  }
-
-  @Override
-  public void error(Marker marker, String format, Object arg1, Object arg2) {
-    formatLog(LogLevel.ERROR, marker, format, arg1, arg2);
-  }
-
-  @Override
-  public void error(Marker marker, String format, Object... arguments) {
-    formatLog(LogLevel.ERROR, marker, format, arguments);
-  }
-
-  @Override
-  public void error(Marker marker, String msg, Throwable t) {
-    log(LogLevel.ERROR, marker, msg, t);
-  }
-
-  public void formatLog(LogLevel level, Marker marker, String format, Object arg) {
-    if (!helper.enabled(level, marker)) {
-      return;
-    }
-
-    FormattingTuple tuple = MessageFormatter.format(format, arg);
-    alwaysLog(level, marker, tuple.getMessage(), tuple.getThrowable());
-  }
-
-  public void formatLog(LogLevel level, Marker marker, String format, Object arg1, Object arg2) {
-    if (!helper.enabled(level, marker)) {
-      return;
-    }
-
-    FormattingTuple tuple = MessageFormatter.format(format, arg1, arg2);
-    alwaysLog(level, marker, tuple.getMessage(), tuple.getThrowable());
-  }
-
-  public void formatLog(LogLevel level, Marker marker, String format, Object... arguments) {
-    if (!helper.enabled(level, marker)) {
-      return;
-    }
-
-    FormattingTuple tuple = MessageFormatter.arrayFormat(format, arguments);
-    alwaysLog(level, marker, tuple.getMessage(), tuple.getThrowable());
-  }
-
-  protected void log(LogLevel level, Marker marker, String msg, Throwable t) {
-    if (!helper.enabled(level, marker)) {
-      return;
-    }
-    helper.log(level, marker, msg, t);
-  }
-
-  private void alwaysLog(LogLevel level, Marker marker, String msg, Throwable t) {
-    helper.log(level, marker, msg, t);
-  }
+    private final String name;
+    private final LoggerHelper helper;
+
+    public DDLogger(LoggerHelper helper, String name) {
+        this.name = name;
+        this.helper = helper;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public boolean isTraceEnabled() {
+        return helper.enabled(LogLevel.TRACE, null);
+    }
+
+    @Override
+    public void trace(String msg) {
+        log(LogLevel.TRACE, null, msg, null);
+    }
+
+    @Override
+    public void trace(String format, Object arg) {
+        formatLog(LogLevel.TRACE, null, format, arg);
+    }
+
+    @Override
+    public void trace(String format, Object arg1, Object arg2) {
+        formatLog(LogLevel.TRACE, null, format, arg1, arg2);
+    }
+
+    @Override
+    public void trace(String format, Object... arguments) {
+        formatLog(LogLevel.TRACE, null, format, arguments);
+    }
+
+    @Override
+    public void trace(String msg, Throwable t) {
+        log(LogLevel.TRACE, null, msg, t);
+    }
+
+    @Override
+    public boolean isTraceEnabled(Marker marker) {
+        return helper.enabled(LogLevel.TRACE, marker);
+    }
+
+    @Override
+    public void trace(Marker marker, String msg) {
+        log(LogLevel.TRACE, marker, msg, null);
+    }
+
+    @Override
+    public void trace(Marker marker, String format, Object arg) {
+        formatLog(LogLevel.TRACE, marker, format, arg);
+    }
+
+    @Override
+    public void trace(Marker marker, String format, Object arg1, Object arg2) {
+        formatLog(LogLevel.TRACE, marker, format, arg1, arg2);
+    }
+
+    @Override
+    public void trace(Marker marker, String format, Object... arguments) {
+        formatLog(LogLevel.TRACE, marker, format, arguments);
+    }
+
+    @Override
+    public void trace(Marker marker, String msg, Throwable t) {
+        log(LogLevel.TRACE, marker, msg, t);
+    }
+
+    @Override
+    public boolean isDebugEnabled() {
+        return helper.enabled(LogLevel.DEBUG, null);
+    }
+
+    @Override
+    public void debug(String msg) {
+        log(LogLevel.DEBUG, null, msg, null);
+    }
+
+    @Override
+    public void debug(String format, Object arg) {
+        formatLog(LogLevel.DEBUG, null, format, arg);
+    }
+
+    @Override
+    public void debug(String format, Object arg1, Object arg2) {
+        formatLog(LogLevel.DEBUG, null, format, arg1, arg2);
+    }
+
+    @Override
+    public void debug(String format, Object... arguments) {
+        formatLog(LogLevel.DEBUG, null, format, arguments);
+    }
+
+    @Override
+    public void debug(String msg, Throwable t) {
+        log(LogLevel.DEBUG, null, msg, t);
+    }
+
+    @Override
+    public boolean isDebugEnabled(Marker marker) {
+        return helper.enabled(LogLevel.DEBUG, marker);
+    }
+
+    @Override
+    public void debug(Marker marker, String msg) {
+        log(LogLevel.DEBUG, marker, msg, null);
+    }
+
+    @Override
+    public void debug(Marker marker, String format, Object arg) {
+        formatLog(LogLevel.DEBUG, marker, format, arg);
+    }
+
+    @Override
+    public void debug(Marker marker, String format, Object arg1, Object arg2) {
+        formatLog(LogLevel.DEBUG, marker, format, arg1, arg2);
+    }
+
+    @Override
+    public void debug(Marker marker, String format, Object... arguments) {
+        formatLog(LogLevel.DEBUG, marker, format, arguments);
+    }
+
+    @Override
+    public void debug(Marker marker, String msg, Throwable t) {
+        log(LogLevel.DEBUG, marker, msg, t);
+    }
+
+    @Override
+    public boolean isInfoEnabled() {
+        return helper.enabled(LogLevel.INFO, null);
+    }
+
+    @Override
+    public void info(String msg) {
+        log(LogLevel.INFO, null, msg, null);
+    }
+
+    @Override
+    public void info(String format, Object arg) {
+        formatLog(LogLevel.INFO, null, format, arg);
+    }
+
+    @Override
+    public void info(String format, Object arg1, Object arg2) {
+        formatLog(LogLevel.INFO, null, format, arg1, arg2);
+    }
+
+    @Override
+    public void info(String format, Object... arguments) {
+        formatLog(LogLevel.INFO, null, format, arguments);
+    }
+
+    @Override
+    public void info(String msg, Throwable t) {
+        log(LogLevel.INFO, null, msg, t);
+    }
+
+    @Override
+    public boolean isInfoEnabled(Marker marker) {
+        return helper.enabled(LogLevel.INFO, marker);
+    }
+
+    @Override
+    public void info(Marker marker, String msg) {
+        log(LogLevel.INFO, marker, msg, null);
+    }
+
+    @Override
+    public void info(Marker marker, String format, Object arg) {
+        formatLog(LogLevel.INFO, marker, format, arg);
+    }
+
+    @Override
+    public void info(Marker marker, String format, Object arg1, Object arg2) {
+        formatLog(LogLevel.INFO, marker, format, arg1, arg2);
+    }
+
+    @Override
+    public void info(Marker marker, String format, Object... arguments) {
+        formatLog(LogLevel.INFO, marker, format, arguments);
+    }
+
+    @Override
+    public void info(Marker marker, String msg, Throwable t) {
+        log(LogLevel.INFO, marker, msg, t);
+    }
+
+    @Override
+    public boolean isWarnEnabled() {
+        return helper.enabled(LogLevel.WARN, null);
+    }
+
+    @Override
+    public void warn(String msg) {
+        log(LogLevel.WARN, null, msg, null);
+    }
+
+    @Override
+    public void warn(String format, Object arg) {
+        formatLog(LogLevel.WARN, null, format, arg);
+    }
+
+    @Override
+    public void warn(String format, Object arg1, Object arg2) {
+        formatLog(LogLevel.WARN, null, format, arg1, arg2);
+    }
+
+    @Override
+    public void warn(String format, Object... arguments) {
+        formatLog(LogLevel.WARN, null, format, arguments);
+    }
+
+    @Override
+    public void warn(String msg, Throwable t) {
+        log(LogLevel.WARN, null, msg, t);
+    }
+
+    @Override
+    public boolean isWarnEnabled(Marker marker) {
+        return helper.enabled(LogLevel.WARN, marker);
+    }
+
+    @Override
+    public void warn(Marker marker, String msg) {
+        log(LogLevel.WARN, marker, msg, null);
+    }
+
+    @Override
+    public void warn(Marker marker, String format, Object arg) {
+        formatLog(LogLevel.WARN, marker, format, arg);
+    }
+
+    @Override
+    public void warn(Marker marker, String format, Object arg1, Object arg2) {
+        formatLog(LogLevel.WARN, marker, format, arg1, arg2);
+    }
+
+    @Override
+    public void warn(Marker marker, String format, Object... arguments) {
+        formatLog(LogLevel.WARN, marker, format, arguments);
+    }
+
+    @Override
+    public void warn(Marker marker, String msg, Throwable t) {
+        log(LogLevel.WARN, marker, msg, t);
+    }
+
+    @Override
+    public boolean isErrorEnabled() {
+        return helper.enabled(LogLevel.ERROR, null);
+    }
+
+    @Override
+    public void error(String msg) {
+        log(LogLevel.ERROR, null, msg, null);
+    }
+
+    @Override
+    public void error(String format, Object arg) {
+        formatLog(LogLevel.ERROR, null, format, arg);
+    }
+
+    @Override
+    public void error(String format, Object arg1, Object arg2) {
+        formatLog(LogLevel.ERROR, null, format, arg1, arg2);
+    }
+
+    @Override
+    public void error(String format, Object... arguments) {
+        formatLog(LogLevel.ERROR, null, format, arguments);
+    }
+
+    @Override
+    public void error(String msg, Throwable t) {
+        log(LogLevel.ERROR, null, msg, t);
+    }
+
+    @Override
+    public boolean isErrorEnabled(Marker marker) {
+        return helper.enabled(LogLevel.ERROR, marker);
+    }
+
+    @Override
+    public void error(Marker marker, String msg) {
+        log(LogLevel.ERROR, marker, msg, null);
+    }
+
+    @Override
+    public void error(Marker marker, String format, Object arg) {
+        formatLog(LogLevel.ERROR, marker, format, arg);
+    }
+
+    @Override
+    public void error(Marker marker, String format, Object arg1, Object arg2) {
+        formatLog(LogLevel.ERROR, marker, format, arg1, arg2);
+    }
+
+    @Override
+    public void error(Marker marker, String format, Object... arguments) {
+        formatLog(LogLevel.ERROR, marker, format, arguments);
+    }
+
+    @Override
+    public void error(Marker marker, String msg, Throwable t) {
+        log(LogLevel.ERROR, marker, msg, t);
+    }
+
+    public void formatLog(LogLevel level, Marker marker, String format, Object arg) {
+        if (!helper.enabled(level, marker)) {
+            return;
+        }
+
+        FormattingTuple tuple = MessageFormatter.format(format, arg);
+        alwaysLog(level, marker, tuple.getMessage(), tuple.getThrowable());
+    }
+
+    public void formatLog(LogLevel level, Marker marker, String format, Object arg1, Object arg2) {
+        if (!helper.enabled(level, marker)) {
+            return;
+        }
+
+        FormattingTuple tuple = MessageFormatter.format(format, arg1, arg2);
+        alwaysLog(level, marker, tuple.getMessage(), tuple.getThrowable());
+    }
+
+    public void formatLog(LogLevel level, Marker marker, String format, Object... arguments) {
+        if (!helper.enabled(level, marker)) {
+            return;
+        }
+
+        FormattingTuple tuple = MessageFormatter.arrayFormat(format, arguments);
+        alwaysLog(level, marker, tuple.getMessage(), tuple.getThrowable());
+    }
+
+    protected void log(LogLevel level, Marker marker, String msg, Throwable t) {
+        if (!helper.enabled(level, marker)) {
+            return;
+        }
+        helper.log(level, marker, msg, t);
+    }
+
+    private void alwaysLog(LogLevel level, Marker marker, String msg, Throwable t) {
+        helper.log(level, marker, msg, t);
+    }
 }
diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java
index e0a75b8213a..85e64612061 100644
--- a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java
+++ b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java
@@ -15,106 +15,103 @@
 
 public class DDLoggerFactory implements ILoggerFactory, LogLevelSwitcher {
 
-  private final boolean telemetryLogCollectionEnabled = isLogCollectionEnabled();
+    private final boolean telemetryLogCollectionEnabled = isLogCollectionEnabled();
 
-  private volatile LoggerHelperFactory helperFactory = null;
-  private volatile LogLevel override = null;
+    private volatile LoggerHelperFactory helperFactory = null;
+    private volatile LogLevel override = null;
 
-  public DDLoggerFactory() {}
+    public DDLoggerFactory() {}
 
-  // Only used for testing
-  public DDLoggerFactory(LoggerHelperFactory helperFactory) {
-    this.helperFactory = helperFactory;
-  }
+    // Only used for testing
+    public DDLoggerFactory(LoggerHelperFactory helperFactory) {
+        this.helperFactory = helperFactory;
+    }
 
-  @Override
-  public void switchLevel(LogLevel level) {
-    override = level;
-  }
+    @Override
+    public void switchLevel(LogLevel level) {
+        override = level;
+    }
 
-  @Override
-  public void restore() {
-    override = null;
-  }
+    @Override
+    public void restore() {
+        override = null;
+    }
 
-  final class HelperWrapper extends LoggerHelper {
-    private final LoggerHelper delegate;
+    final class HelperWrapper extends LoggerHelper {
+        private final LoggerHelper delegate;
 
-    private HelperWrapper(LoggerHelper delegate) {
-      this.delegate = delegate;
-    }
+        private HelperWrapper(LoggerHelper delegate) {
+            this.delegate = delegate;
+        }
 
-    @Override
-    public boolean enabled(LogLevel level, Marker marker) {
-      LogLevel levelOverride = override;
-      if (levelOverride != null) {
-        return level.isEnabled(levelOverride);
-      }
+        @Override
+        public boolean enabled(LogLevel level, Marker marker) {
+            LogLevel levelOverride = override;
+            if (levelOverride != null) {
+                return level.isEnabled(levelOverride);
+            }
 
-      return delegate.enabled(level, marker);
+            return delegate.enabled(level, marker);
+        }
+
+        @Override
+        public void log(LogLevel level, Marker marker, String message, Throwable t) {
+            delegate.log(level, marker, message, t);
+        }
     }
 
     @Override
-    public void log(LogLevel level, Marker marker, String message, Throwable t) {
-      delegate.log(level, marker, message, t);
-    }
-  }
-
-  @Override
-  public Logger getLogger(String name) {
-    LoggerHelper helper = getHelperFactory().loggerHelperForName(name);
-    HelperWrapper helperWrapper = new HelperWrapper(helper);
-    if (!telemetryLogCollectionEnabled || Platform.isNativeImageBuilder()) {
-      return new DDLogger(helperWrapper, name);
-    } else {
-      return new DDTelemetryLogger(helperWrapper, name);
+    public Logger getLogger(String name) {
+        LoggerHelper helper = getHelperFactory().loggerHelperForName(name);
+        HelperWrapper helperWrapper = new HelperWrapper(helper);
+        if (!telemetryLogCollectionEnabled || Platform.isNativeImageBuilder()) {
+            return new DDLogger(helperWrapper, name);
+        } else {
+            return new DDTelemetryLogger(helperWrapper, name);
+        }
     }
-  }
 
-  private LoggerHelperFactory getHelperFactory() {
-    LoggerHelperFactory factory = helperFactory;
-    if (factory == null) {
-      synchronized (this) {
-        factory = helperFactory;
+    private LoggerHelperFactory getHelperFactory() {
+        LoggerHelperFactory factory = helperFactory;
         if (factory == null) {
-          factory = helperFactory = new SLCompatFactory();
-          LoggingSettingsDescription.setDescription(factory.getSettingsDescription());
+            synchronized (this) {
+                factory = helperFactory;
+                if (factory == null) {
+                    factory = helperFactory = new SLCompatFactory();
+                    LoggingSettingsDescription.setDescription(factory.getSettingsDescription());
+                }
+            }
         }
-      }
-    }
-    return factory;
-  }
-
-  @Override
-  public void reinitialize() {
-    helperFactory = null;
-  }
-
-  // DDLoggerFactory can be called at very early stage, before Config is loaded
-  // So to get property/env we use this custom function
-  private static boolean isLogCollectionEnabled() {
-    return isFlagEnabled(
-            "dd.instrumentation.telemetry.enabled", "DD_INSTRUMENTATION_TELEMETRY_ENABLED", true)
-        && isFlagEnabled(
-            "dd.telemetry.log-collection.enabled", "DD_TELEMETRY_LOG_COLLECTION_ENABLED", true);
-  }
-
-  private static boolean isFlagEnabled(
-      final String systemProperty, final String envVar, final boolean defaultValue) {
-    String value = SystemProperties.get(systemProperty);
-    if ("true".equalsIgnoreCase(value)) {
-      return true;
+        return factory;
     }
-    if ("false".equalsIgnoreCase(value)) {
-      return false;
+
+    @Override
+    public void reinitialize() {
+        helperFactory = null;
     }
-    value = ConfigHelper.env(envVar);
-    if ("true".equalsIgnoreCase(value)) {
-      return true;
+
+    // DDLoggerFactory can be called at very early stage, before Config is loaded
+    // So to get property/env we use this custom function
+    private static boolean isLogCollectionEnabled() {
+        return isFlagEnabled("dd.instrumentation.telemetry.enabled", "DD_INSTRUMENTATION_TELEMETRY_ENABLED", true)
+                && isFlagEnabled("dd.telemetry.log-collection.enabled", "DD_TELEMETRY_LOG_COLLECTION_ENABLED", true);
     }
-    if ("false".equalsIgnoreCase(value)) {
-      return false;
+
+    private static boolean isFlagEnabled(final String systemProperty, final String envVar, final boolean defaultValue) {
+        String value = SystemProperties.get(systemProperty);
+        if ("true".equalsIgnoreCase(value)) {
+            return true;
+        }
+        if ("false".equalsIgnoreCase(value)) {
+            return false;
+        }
+        value = ConfigHelper.env(envVar);
+        if ("true".equalsIgnoreCase(value)) {
+            return true;
+        }
+        if ("false".equalsIgnoreCase(value)) {
+            return false;
+        }
+        return defaultValue;
     }
-    return defaultValue;
-  }
 }
diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDTelemetryLogger.java b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDTelemetryLogger.java
index 563ce883187..efe2a9428d2 100644
--- a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDTelemetryLogger.java
+++ b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDTelemetryLogger.java
@@ -8,47 +8,47 @@
 
 public class DDTelemetryLogger extends DDLogger {
 
-  public DDTelemetryLogger(LoggerHelper helper, String name) {
-    super(helper, name);
-  }
-
-  @Override
-  public void formatLog(LogLevel level, Marker marker, String format, Object arg) {
-    telemetryLog(level, marker, format, getIfThrowable(arg));
-    super.formatLog(level, marker, format, arg);
-  }
-
-  @Override
-  public void formatLog(LogLevel level, Marker marker, String format, Object arg1, Object arg2) {
-    telemetryLog(level, marker, format, getIfThrowable(arg2));
-    super.formatLog(level, marker, format, arg1, arg2);
-  }
-
-  @Override
-  public void formatLog(LogLevel level, Marker marker, String format, Object... arguments) {
-    telemetryLog(level, marker, format, MessageFormatter.getThrowableCandidate(arguments));
-    super.formatLog(level, marker, format, arguments);
-  }
-
-  @Override
-  protected void log(LogLevel level, Marker marker, String msg, Throwable t) {
-    telemetryLog(level, marker, msg, t);
-    super.log(level, marker, msg, t);
-  }
-
-  private void telemetryLog(LogLevel level, Marker marker, String msgOrgFormat, Throwable t) {
-    if (marker == LogCollector.EXCLUDE_TELEMETRY) {
-      return;
+    public DDTelemetryLogger(LoggerHelper helper, String name) {
+        super(helper, name);
     }
-    // Report only messages with Throwable or explicitly marked with SEND_TELEMETRY.
-    // This might be extended to error level without throwable.
-    if (marker != LogCollector.SEND_TELEMETRY && (t == null || t instanceof OutOfMemoryError)) {
-      return;
+
+    @Override
+    public void formatLog(LogLevel level, Marker marker, String format, Object arg) {
+        telemetryLog(level, marker, format, getIfThrowable(arg));
+        super.formatLog(level, marker, format, arg);
+    }
+
+    @Override
+    public void formatLog(LogLevel level, Marker marker, String format, Object arg1, Object arg2) {
+        telemetryLog(level, marker, format, getIfThrowable(arg2));
+        super.formatLog(level, marker, format, arg1, arg2);
+    }
+
+    @Override
+    public void formatLog(LogLevel level, Marker marker, String format, Object... arguments) {
+        telemetryLog(level, marker, format, MessageFormatter.getThrowableCandidate(arguments));
+        super.formatLog(level, marker, format, arguments);
     }
-    LogCollector.get().addLogMessage(level.name(), msgOrgFormat, t);
-  }
 
-  private Throwable getIfThrowable(final Object obj) {
-    return obj instanceof Throwable ? (Throwable) obj : null;
-  }
+    @Override
+    protected void log(LogLevel level, Marker marker, String msg, Throwable t) {
+        telemetryLog(level, marker, msg, t);
+        super.log(level, marker, msg, t);
+    }
+
+    private void telemetryLog(LogLevel level, Marker marker, String msgOrgFormat, Throwable t) {
+        if (marker == LogCollector.EXCLUDE_TELEMETRY) {
+            return;
+        }
+        // Report only messages with Throwable or explicitly marked with SEND_TELEMETRY.
+        // This might be extended to error level without throwable.
+        if (marker != LogCollector.SEND_TELEMETRY && (t == null || t instanceof OutOfMemoryError)) {
+            return;
+        }
+        LogCollector.get().addLogMessage(level.name(), msgOrgFormat, t);
+    }
+
+    private Throwable getIfThrowable(final Object obj) {
+        return obj instanceof Throwable ? (Throwable) obj : null;
+    }
 }
diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatFactory.java b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatFactory.java
index ead0ac255a7..231fb36cb52 100644
--- a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatFactory.java
+++ b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatFactory.java
@@ -12,79 +12,79 @@
  * <p>Tries to initialize lazily to mimic the behavior of {@code SimpleLogger} as much as possible.
  */
 public final class SLCompatFactory extends LoggerHelperFactory {
-  static final long START_TIME = System.currentTimeMillis();
+    static final long START_TIME = System.currentTimeMillis();
 
-  // DQH - ExceptionLogger isn't visible to this class, so hard-coding instead
-  static final String EXCEPTION_LOGGER_NAME = "datadog.trace.bootstrap.ExceptionLogger";
-  LoggerHelper cachedExceptionLoggerHelper;
+    // DQH - ExceptionLogger isn't visible to this class, so hard-coding instead
+    static final String EXCEPTION_LOGGER_NAME = "datadog.trace.bootstrap.ExceptionLogger";
+    LoggerHelper cachedExceptionLoggerHelper;
 
-  private static Properties getProperties() {
-    try {
-      return System.getProperties();
-    } catch (SecurityException e) {
-      return new Properties();
+    private static Properties getProperties() {
+        try {
+            return System.getProperties();
+        } catch (SecurityException e) {
+            return new Properties();
+        }
     }
-  }
 
-  private final Properties properties;
-  private volatile SLCompatSettings lazySettings;
+    private final Properties properties;
+    private volatile SLCompatSettings lazySettings;
 
-  public SLCompatFactory() {
-    this(getProperties());
-  }
+    public SLCompatFactory() {
+        this(getProperties());
+    }
 
-  public SLCompatFactory(Properties properties) {
-    this(properties, null);
-  }
+    public SLCompatFactory(Properties properties) {
+        this(properties, null);
+    }
 
-  public SLCompatFactory(Properties properties, SLCompatSettings settings) {
-    this.properties = properties;
-    this.lazySettings = settings;
-  }
+    public SLCompatFactory(Properties properties, SLCompatSettings settings) {
+        this.properties = properties;
+        this.lazySettings = settings;
+    }
 
-  private SLCompatSettings getSettings() {
-    // This race condition is intentional and benign.
-    SLCompatSettings settings = lazySettings;
-    while (settings == null) {
-      try {
-        settings = lazySettings = new SLCompatSettings(properties);
-      } catch (IllegalStateException e) {
-        // This can only happen if there is a race within the constructor and multiple
-        // threads try to create conflicting log files
-      }
+    private SLCompatSettings getSettings() {
+        // This race condition is intentional and benign.
+        SLCompatSettings settings = lazySettings;
+        while (settings == null) {
+            try {
+                settings = lazySettings = new SLCompatSettings(properties);
+            } catch (IllegalStateException e) {
+                // This can only happen if there is a race within the constructor and multiple
+                // threads try to create conflicting log files
+            }
+        }
+        return settings;
     }
-    return settings;
-  }
 
-  @Override
-  public LoggerHelper loggerHelperForName(String name) {
-    if (EXCEPTION_LOGGER_NAME.equals(name)) {
-      // DQH - This is ugly.  The exception propagation protection that handles
-      // unexpected exceptions in instrumentation always calls LoggerFactory.getLogger.
+    @Override
+    public LoggerHelper loggerHelperForName(String name) {
+        if (EXCEPTION_LOGGER_NAME.equals(name)) {
+            // DQH - This is ugly.  The exception propagation protection that handles
+            // unexpected exceptions in instrumentation always calls LoggerFactory.getLogger.
 
-      // getLogger is actually a factory method that always creates a new instance,
-      // which can cause this method to become extremely hot -- leading to significant
-      // amount of allocation and garbage collection.
+            // getLogger is actually a factory method that always creates a new instance,
+            // which can cause this method to become extremely hot -- leading to significant
+            // amount of allocation and garbage collection.
 
-      // To guard against that scenario, cache the ExceptionLogger LoggerHelper instance
-      LoggerHelper helper = cachedExceptionLoggerHelper;
-      if (helper != null) return helper;
+            // To guard against that scenario, cache the ExceptionLogger LoggerHelper instance
+            LoggerHelper helper = cachedExceptionLoggerHelper;
+            if (helper != null) return helper;
 
-      helper = createLoggerHelperForName(name);
-      cachedExceptionLoggerHelper = helper;
-      return helper;
-    } else {
-      return createLoggerHelperForName(name);
+            helper = createLoggerHelperForName(name);
+            cachedExceptionLoggerHelper = helper;
+            return helper;
+        } else {
+            return createLoggerHelperForName(name);
+        }
     }
-  }
 
-  private LoggerHelper createLoggerHelperForName(String name) {
-    SLCompatSettings settings = getSettings();
-    return new SLCompatHelper(name, settings);
-  }
+    private LoggerHelper createLoggerHelperForName(String name) {
+        SLCompatSettings settings = getSettings();
+        return new SLCompatHelper(name, settings);
+    }
 
-  @Override
-  public Map<String, Object> getSettingsDescription() {
-    return getSettings().getSettingsDescription();
-  }
+    @Override
+    public Map<String, Object> getSettingsDescription() {
+        return getSettings().getSettingsDescription();
+    }
 }
diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatHelper.java b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatHelper.java
index f8218b78820..d5c9ccf02f8 100644
--- a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatHelper.java
+++ b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatHelper.java
@@ -9,193 +9,181 @@
  * A {@link LoggerHelper} that logs in a way compatible with the {@code SimpleLogger} from SLF4J.
  */
 class SLCompatHelper extends LoggerHelper {
-  private final String logName;
-  private final LogLevel logLevel;
-  private final SLCompatSettings settings;
-
-  SLCompatHelper(String name, SLCompatSettings settings) {
-    this(settings.logNameForName(name), settings.logLevelForName(name), settings);
-  }
-
-  SLCompatHelper(String logName, LogLevel logLevel, SLCompatSettings settings) {
-    this.logName = logName;
-    this.logLevel = logLevel;
-    this.settings = settings;
-  }
-
-  @Override
-  public boolean enabled(LogLevel level, Marker marker) {
-    // Due to limited Marker support we assume it's depends on LogLevel only
-    return level.isEnabled(this.logLevel);
-  }
-
-  @Override
-  public void log(LogLevel level, Marker marker, String message, Throwable t) {
-    long timeMillis = Integer.MIN_VALUE;
-    if (settings.showDateTime) {
-      timeMillis = System.currentTimeMillis();
+    private final String logName;
+    private final LogLevel logLevel;
+    private final SLCompatSettings settings;
+
+    SLCompatHelper(String name, SLCompatSettings settings) {
+        this(settings.logNameForName(name), settings.logLevelForName(name), settings);
+    }
+
+    SLCompatHelper(String logName, LogLevel logLevel, SLCompatSettings settings) {
+        this.logName = logName;
+        this.logLevel = logLevel;
+        this.settings = settings;
+    }
+
+    @Override
+    public boolean enabled(LogLevel level, Marker marker) {
+        // Due to limited Marker support we assume it's depends on LogLevel only
+        return level.isEnabled(this.logLevel);
+    }
+
+    @Override
+    public void log(LogLevel level, Marker marker, String message, Throwable t) {
+        long timeMillis = Integer.MIN_VALUE;
+        if (settings.showDateTime) {
+            timeMillis = System.currentTimeMillis();
+        }
+        if (settings.jsonEnabled) {
+            logJson(level, marker, SLCompatFactory.START_TIME, timeMillis, message, t);
+        } else {
+            log(level, marker, SLCompatFactory.START_TIME, timeMillis, message, t);
+        }
+    }
+
+    void log(LogLevel level, Marker marker, long startTimeMillis, long timeMillis, String message, Throwable t) {
+        String threadName = null;
+        if (settings.showThreadName) {
+            threadName = Thread.currentThread().getName();
+        }
+        log(level, marker, startTimeMillis, timeMillis, threadName, message, t);
+    }
+
+    void log(
+            LogLevel level,
+            Marker marker,
+            long startTimeMillis,
+            long timeMillis,
+            String threadName,
+            String message,
+            Throwable t) {
+        StringBuilder buf = new StringBuilder(32);
+
+        if (timeMillis >= 0 && settings.showDateTime) {
+            settings.dateTimeFormatter.appendFormattedDate(buf, timeMillis, startTimeMillis);
+            buf.append(' ');
+        }
+
+        if (settings.showThreadName && threadName != null) {
+            buf.append('[');
+            buf.append(threadName);
+            buf.append("] ");
+        }
+
+        if (settings.levelInBrackets) {
+            buf.append('[');
+        }
+
+        if (settings.warnLevelString != null && level == LogLevel.WARN) {
+            buf.append(settings.warnLevelString);
+        } else if (marker != null) {
+            buf.append(marker.getName());
+        } else {
+            buf.append(level.name());
+        }
+        if (settings.levelInBrackets) {
+            buf.append(']');
+        }
+        buf.append(' ');
+
+        if (!logName.isEmpty()) {
+            buf.append(logName).append(" - ");
+        }
+
+        buf.append(message);
+
+        if (settings.embedException && t != null) {
+            embedException(buf, t);
+        }
+
+        settings.printStream.println(buf);
+        if (!settings.embedException && t != null) {
+            t.printStackTrace(settings.printStream);
+        }
+    }
+
+    private void embedException(StringBuilder buf, Throwable t) {
+        buf.append(" [exception:");
+        buf.append(t.toString());
+        buf.append(".");
+        for (StackTraceElement element : t.getStackTrace()) {
+            buf.append(" at ");
+            buf.append(element.toString());
+        }
+        buf.append("]");
+    }
+
+    void logJson(LogLevel level, Marker marker, long startTimeMillis, long timeMillis, String message, Throwable t) {
+        String threadName = null;
+        if (settings.showThreadName) {
+            threadName = Thread.currentThread().getName();
+        }
+        logJson(level, marker, startTimeMillis, timeMillis, threadName, message, t);
+    }
+
+    void logJson(
+            LogLevel level,
+            Marker marker,
+            long startTimeMillis,
+            long timeMillis,
+            String threadName,
+            String message,
+            Throwable t) {
+
+        JsonWriter writer = new JsonWriter();
+        writer.beginObject();
+        writer.name("origin").value("dd.trace");
+
+        if (timeMillis >= 0 && settings.showDateTime) {
+            writer.name("date");
+            StringBuilder buf = new StringBuilder(32);
+            settings.dateTimeFormatter.appendFormattedDate(buf, timeMillis, startTimeMillis);
+            writer.value(buf.toString());
+        }
+
+        if (settings.showThreadName && threadName != null) {
+            writer.name("logger.thread_name").value(threadName);
+        }
+
+        writer.name("level");
+
+        if (settings.warnLevelString != null && level == LogLevel.WARN) {
+            writer.value(wrappedValueWithBracketsIfRequested(settings.warnLevelString));
+        } else if (marker != null) {
+            writer.value(wrappedValueWithBracketsIfRequested(marker.getName()));
+        } else {
+            writer.value(wrappedValueWithBracketsIfRequested(level.name()));
+        }
+
+        if (!logName.isEmpty()) {
+            writer.name("logger.name").value(logName);
+        }
+        writer.name("message").value(message);
+
+        if (t != null) {
+            embedExceptionJson(writer, t);
+        }
+        writer.endObject();
+        settings.printStream.println(writer);
+    }
+
+    private String wrappedValueWithBracketsIfRequested(String value) {
+        return settings.levelInBrackets ? '[' + value + ']' : value;
+    }
+
+    private void embedExceptionJson(JsonWriter writer, Throwable t) {
+        writer.name("exception");
+        writer.beginObject();
+        writer.name("message").value(t.getMessage());
+        if (t.getStackTrace().length > 0) {
+            writer.name("stackTrace");
+            writer.beginArray();
+            for (StackTraceElement element : t.getStackTrace()) {
+                writer.value(element.toString());
+            }
+            writer.endArray();
+        }
+        writer.endObject();
     }
-    if (settings.jsonEnabled) {
-      logJson(level, marker, SLCompatFactory.START_TIME, timeMillis, message, t);
-    } else {
-      log(level, marker, SLCompatFactory.START_TIME, timeMillis, message, t);
-    }
-  }
-
-  void log(
-      LogLevel level,
-      Marker marker,
-      long startTimeMillis,
-      long timeMillis,
-      String message,
-      Throwable t) {
-    String threadName = null;
-    if (settings.showThreadName) {
-      threadName = Thread.currentThread().getName();
-    }
-    log(level, marker, startTimeMillis, timeMillis, threadName, message, t);
-  }
-
-  void log(
-      LogLevel level,
-      Marker marker,
-      long startTimeMillis,
-      long timeMillis,
-      String threadName,
-      String message,
-      Throwable t) {
-    StringBuilder buf = new StringBuilder(32);
-
-    if (timeMillis >= 0 && settings.showDateTime) {
-      settings.dateTimeFormatter.appendFormattedDate(buf, timeMillis, startTimeMillis);
-      buf.append(' ');
-    }
-
-    if (settings.showThreadName && threadName != null) {
-      buf.append('[');
-      buf.append(threadName);
-      buf.append("] ");
-    }
-
-    if (settings.levelInBrackets) {
-      buf.append('[');
-    }
-
-    if (settings.warnLevelString != null && level == LogLevel.WARN) {
-      buf.append(settings.warnLevelString);
-    } else if (marker != null) {
-      buf.append(marker.getName());
-    } else {
-      buf.append(level.name());
-    }
-    if (settings.levelInBrackets) {
-      buf.append(']');
-    }
-    buf.append(' ');
-
-    if (!logName.isEmpty()) {
-      buf.append(logName).append(" - ");
-    }
-
-    buf.append(message);
-
-    if (settings.embedException && t != null) {
-      embedException(buf, t);
-    }
-
-    settings.printStream.println(buf);
-    if (!settings.embedException && t != null) {
-      t.printStackTrace(settings.printStream);
-    }
-  }
-
-  private void embedException(StringBuilder buf, Throwable t) {
-    buf.append(" [exception:");
-    buf.append(t.toString());
-    buf.append(".");
-    for (StackTraceElement element : t.getStackTrace()) {
-      buf.append(" at ");
-      buf.append(element.toString());
-    }
-    buf.append("]");
-  }
-
-  void logJson(
-      LogLevel level,
-      Marker marker,
-      long startTimeMillis,
-      long timeMillis,
-      String message,
-      Throwable t) {
-    String threadName = null;
-    if (settings.showThreadName) {
-      threadName = Thread.currentThread().getName();
-    }
-    logJson(level, marker, startTimeMillis, timeMillis, threadName, message, t);
-  }
-
-  void logJson(
-      LogLevel level,
-      Marker marker,
-      long startTimeMillis,
-      long timeMillis,
-      String threadName,
-      String message,
-      Throwable t) {
-
-    JsonWriter writer = new JsonWriter();
-    writer.beginObject();
-    writer.name("origin").value("dd.trace");
-
-    if (timeMillis >= 0 && settings.showDateTime) {
-      writer.name("date");
-      StringBuilder buf = new StringBuilder(32);
-      settings.dateTimeFormatter.appendFormattedDate(buf, timeMillis, startTimeMillis);
-      writer.value(buf.toString());
-    }
-
-    if (settings.showThreadName && threadName != null) {
-      writer.name("logger.thread_name").value(threadName);
-    }
-
-    writer.name("level");
-
-    if (settings.warnLevelString != null && level == LogLevel.WARN) {
-      writer.value(wrappedValueWithBracketsIfRequested(settings.warnLevelString));
-    } else if (marker != null) {
-      writer.value(wrappedValueWithBracketsIfRequested(marker.getName()));
-    } else {
-      writer.value(wrappedValueWithBracketsIfRequested(level.name()));
-    }
-
-    if (!logName.isEmpty()) {
-      writer.name("logger.name").value(logName);
-    }
-    writer.name("message").value(message);
-
-    if (t != null) {
-      embedExceptionJson(writer, t);
-    }
-    writer.endObject();
-    settings.printStream.println(writer);
-  }
-
-  private String wrappedValueWithBracketsIfRequested(String value) {
-    return settings.levelInBrackets ? '[' + value + ']' : value;
-  }
-
-  private void embedExceptionJson(JsonWriter writer, Throwable t) {
-    writer.name("exception");
-    writer.beginObject();
-    writer.name("message").value(t.getMessage());
-    if (t.getStackTrace().length > 0) {
-      writer.name("stackTrace");
-      writer.beginArray();
-      for (StackTraceElement element : t.getStackTrace()) {
-        writer.value(element.toString());
-      }
-      writer.endArray();
-    }
-    writer.endObject();
-  }
 }
diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatSettings.java b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatSettings.java
index f3cc1a57a27..d1de8bbc104 100644
--- a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatSettings.java
+++ b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatSettings.java
@@ -25,376 +25,358 @@
 /** Settings that provide the same configurable options as {@code SimpleLogger} from SLF4J. */
 public class SLCompatSettings {
 
-  public static final class Names {
-    public static final String WARN_LEVEL_STRING = "warnLevelString";
-    public static final String LEVEL_IN_BRACKETS = "levelInBrackets";
-    public static final String LOG_FILE = "logFile";
-    public static final String SHOW_SHORT_LOG_NAME = "showShortLogName";
-    public static final String SHOW_LOG_NAME = "showLogName";
-    public static final String SHOW_THREAD_NAME = "showThreadName";
-    public static final String DATE_TIME_FORMAT = "dateTimeFormat";
-    public static final String SHOW_DATE_TIME = "showDateTime";
-    public static final String JSON_ENABLED = "jsonEnabled";
-    public static final String DEFAULT_LOG_LEVEL = "defaultLogLevel";
-    public static final String EMBED_EXCEPTION = "embedException";
-    public static final String CONFIGURATION_FILE = "configurationFile";
-  }
-
-  public static final class Keys {
-    // This is the package name that the shaded SimpleLogger had before. Use that for compatibility.
-    private static final String PREFIX = "datadog.slf4j.simpleLogger.";
-
-    public static final String LOG_KEY_PREFIX = PREFIX + "log.";
-    // This setting does not change anything in the behavior as of slf4j 1.7.30 so we ignore it
-    // public static final String CACHE_OUTPUT_STREAM = PREFIX + "cacheOutputStream";
-    public static final String WARN_LEVEL_STRING = PREFIX + Names.WARN_LEVEL_STRING;
-    public static final String LEVEL_IN_BRACKETS = PREFIX + Names.LEVEL_IN_BRACKETS;
-    public static final String LOG_FILE = PREFIX + Names.LOG_FILE;
-    public static final String SHOW_SHORT_LOG_NAME = PREFIX + Names.SHOW_SHORT_LOG_NAME;
-    public static final String SHOW_LOG_NAME = PREFIX + Names.SHOW_LOG_NAME;
-    public static final String SHOW_THREAD_NAME = PREFIX + Names.SHOW_THREAD_NAME;
-    public static final String DATE_TIME_FORMAT = PREFIX + Names.DATE_TIME_FORMAT;
-    public static final String SHOW_DATE_TIME = PREFIX + Names.SHOW_DATE_TIME;
-    public static final String JSON_ENABLED = PREFIX + Names.JSON_ENABLED;
-    public static final String DEFAULT_LOG_LEVEL = PREFIX + Names.DEFAULT_LOG_LEVEL;
-    public static final String EMBED_EXCEPTION = PREFIX + Names.EMBED_EXCEPTION;
-
-    // This is not available in SimpleLogger, but added here to simplify testing.
-    static final String CONFIGURATION_FILE = PREFIX + Names.CONFIGURATION_FILE;
-  }
-
-  public static final class Defaults {
-    // This setting does not change anything in the behavior as of slf4j 1.7.30 so we ignore it
-    // static final boolean CACHE_OUTPUT_STREAM = false;
-    public static final boolean LEVEL_IN_BRACKETS = false;
-    public static final String LOG_FILE = "System.err";
-    public static final boolean SHOW_SHORT_LOG_NAME = false;
-    public static final boolean SHOW_LOG_NAME = true;
-    public static final boolean SHOW_THREAD_NAME = true;
-    public static final String DATE_TIME_FORMAT = null;
-    public static final boolean SHOW_DATE_TIME = false;
-    public static final boolean JSON_ENABLED = false;
-    public static final String DEFAULT_LOG_LEVEL = "INFO";
-    public static final boolean EMBED_EXCEPTION = false;
-
-    public static final String CONFIGURATION_FILE = "simplelogger.properties";
-  }
-
-  public abstract static class DTFormatter {
-    public static DTFormatter create(String dateTimeFormat) {
-      if (dateTimeFormat == null) {
-        return new DiffDTFormatter();
-      }
-      try {
-        return new NewDTFormatter(dateTimeFormat);
-      } catch (Throwable t) {
-        try {
-          return new LegacyDTFormatter(dateTimeFormat);
-        } catch (IllegalArgumentException e) {
-        }
-      }
-      return new DiffDTFormatter();
+    public static final class Names {
+        public static final String WARN_LEVEL_STRING = "warnLevelString";
+        public static final String LEVEL_IN_BRACKETS = "levelInBrackets";
+        public static final String LOG_FILE = "logFile";
+        public static final String SHOW_SHORT_LOG_NAME = "showShortLogName";
+        public static final String SHOW_LOG_NAME = "showLogName";
+        public static final String SHOW_THREAD_NAME = "showThreadName";
+        public static final String DATE_TIME_FORMAT = "dateTimeFormat";
+        public static final String SHOW_DATE_TIME = "showDateTime";
+        public static final String JSON_ENABLED = "jsonEnabled";
+        public static final String DEFAULT_LOG_LEVEL = "defaultLogLevel";
+        public static final String EMBED_EXCEPTION = "embedException";
+        public static final String CONFIGURATION_FILE = "configurationFile";
     }
 
-    public abstract void appendFormattedDate(
-        StringBuilder builder, long timeMillis, long startTimeMillis);
-  }
+    public static final class Keys {
+        // This is the package name that the shaded SimpleLogger had before. Use that for compatibility.
+        private static final String PREFIX = "datadog.slf4j.simpleLogger.";
+
+        public static final String LOG_KEY_PREFIX = PREFIX + "log.";
+        // This setting does not change anything in the behavior as of slf4j 1.7.30 so we ignore it
+        // public static final String CACHE_OUTPUT_STREAM = PREFIX + "cacheOutputStream";
+        public static final String WARN_LEVEL_STRING = PREFIX + Names.WARN_LEVEL_STRING;
+        public static final String LEVEL_IN_BRACKETS = PREFIX + Names.LEVEL_IN_BRACKETS;
+        public static final String LOG_FILE = PREFIX + Names.LOG_FILE;
+        public static final String SHOW_SHORT_LOG_NAME = PREFIX + Names.SHOW_SHORT_LOG_NAME;
+        public static final String SHOW_LOG_NAME = PREFIX + Names.SHOW_LOG_NAME;
+        public static final String SHOW_THREAD_NAME = PREFIX + Names.SHOW_THREAD_NAME;
+        public static final String DATE_TIME_FORMAT = PREFIX + Names.DATE_TIME_FORMAT;
+        public static final String SHOW_DATE_TIME = PREFIX + Names.SHOW_DATE_TIME;
+        public static final String JSON_ENABLED = PREFIX + Names.JSON_ENABLED;
+        public static final String DEFAULT_LOG_LEVEL = PREFIX + Names.DEFAULT_LOG_LEVEL;
+        public static final String EMBED_EXCEPTION = PREFIX + Names.EMBED_EXCEPTION;
+
+        // This is not available in SimpleLogger, but added here to simplify testing.
+        static final String CONFIGURATION_FILE = PREFIX + Names.CONFIGURATION_FILE;
+    }
 
-  public static class DiffDTFormatter extends DTFormatter {
-    @Override
-    public void appendFormattedDate(StringBuilder builder, long timeMillis, long startTimeMillis) {
-      builder.append(timeMillis - startTimeMillis);
+    public static final class Defaults {
+        // This setting does not change anything in the behavior as of slf4j 1.7.30 so we ignore it
+        // static final boolean CACHE_OUTPUT_STREAM = false;
+        public static final boolean LEVEL_IN_BRACKETS = false;
+        public static final String LOG_FILE = "System.err";
+        public static final boolean SHOW_SHORT_LOG_NAME = false;
+        public static final boolean SHOW_LOG_NAME = true;
+        public static final boolean SHOW_THREAD_NAME = true;
+        public static final String DATE_TIME_FORMAT = null;
+        public static final boolean SHOW_DATE_TIME = false;
+        public static final boolean JSON_ENABLED = false;
+        public static final String DEFAULT_LOG_LEVEL = "INFO";
+        public static final boolean EMBED_EXCEPTION = false;
+
+        public static final String CONFIGURATION_FILE = "simplelogger.properties";
     }
-  }
 
-  public static class LegacyDTFormatter extends DTFormatter {
-    private final DateFormat dateFormat;
+    public abstract static class DTFormatter {
+        public static DTFormatter create(String dateTimeFormat) {
+            if (dateTimeFormat == null) {
+                return new DiffDTFormatter();
+            }
+            try {
+                return new NewDTFormatter(dateTimeFormat);
+            } catch (Throwable t) {
+                try {
+                    return new LegacyDTFormatter(dateTimeFormat);
+                } catch (IllegalArgumentException e) {
+                }
+            }
+            return new DiffDTFormatter();
+        }
 
-    public LegacyDTFormatter(String dateTimeFormat) {
-      this.dateFormat = new SimpleDateFormat(dateTimeFormat);
+        public abstract void appendFormattedDate(StringBuilder builder, long timeMillis, long startTimeMillis);
     }
 
-    @Override
-    public void appendFormattedDate(StringBuilder builder, long timeMillis, long startTimeMillis) {
-      Date date = new Date(timeMillis);
-      String dateString;
-      synchronized (dateFormat) {
-        dateString = dateFormat.format(date);
-      }
-      builder.append(dateString);
-    }
-  }
-
-  public static class NewDTFormatter extends DTFormatter {
-    private final Object dateTimeFormatter;
-    private final MethodHandle formatTo;
-    private final MethodHandle instantOfEpochMilli;
-    private final Object zoneId;
-    private final MethodHandle zdtOfInstant;
-
-    public NewDTFormatter(String dateTimeFormat) {
-      MethodHandles.Lookup l = MethodHandles.publicLookup();
-      try {
-        ClassLoader cl = ClassLoader.getSystemClassLoader();
-        Class<?> fClass = cl.loadClass("java.time.format.DateTimeFormatter");
-        Class<?> tClass = cl.loadClass("java.time.temporal.TemporalAccessor");
-        Class<?> iClass = cl.loadClass("java.time.Instant");
-        Class<?> zdtClass = cl.loadClass("java.time.ZonedDateTime");
-        Class<?> zClass = cl.loadClass("java.time.ZoneId");
-        this.dateTimeFormatter =
-            l.findStatic(fClass, "ofPattern", MethodType.methodType(fClass, String.class))
-                .invoke(dateTimeFormat);
-        this.formatTo =
-            l.findVirtual(
-                fClass, "formatTo", MethodType.methodType(void.class, tClass, Appendable.class));
-        this.instantOfEpochMilli =
-            l.findStatic(iClass, "ofEpochMilli", MethodType.methodType(iClass, long.class));
-        this.zoneId = l.findStatic(zClass, "systemDefault", MethodType.methodType(zClass)).invoke();
-        this.zdtOfInstant =
-            l.findStatic(zdtClass, "ofInstant", MethodType.methodType(zdtClass, iClass, zClass));
-      } catch (Throwable t) {
-        throw new IllegalArgumentException();
-      }
+    public static class DiffDTFormatter extends DTFormatter {
+        @Override
+        public void appendFormattedDate(StringBuilder builder, long timeMillis, long startTimeMillis) {
+            builder.append(timeMillis - startTimeMillis);
+        }
     }
 
-    @Override
-    public void appendFormattedDate(StringBuilder builder, long timeMillis, long startTimeMillis) {
-      try {
-        formatTo.invoke(
-            dateTimeFormatter,
-            zdtOfInstant.invoke(instantOfEpochMilli.invoke(timeMillis), zoneId),
-            builder);
-      } catch (Throwable t) {
-        // ignore
-      }
+    public static class LegacyDTFormatter extends DTFormatter {
+        private final DateFormat dateFormat;
+
+        public LegacyDTFormatter(String dateTimeFormat) {
+            this.dateFormat = new SimpleDateFormat(dateTimeFormat);
+        }
+
+        @Override
+        public void appendFormattedDate(StringBuilder builder, long timeMillis, long startTimeMillis) {
+            Date date = new Date(timeMillis);
+            String dateString;
+            synchronized (dateFormat) {
+                dateString = dateFormat.format(date);
+            }
+            builder.append(dateString);
+        }
     }
-  }
-
-  @SuppressForbidden
-  static PrintStream getPrintStream(String logFile) {
-    PrintStreamWrapper printStreamWrapper;
-    switch (logFile.toLowerCase(Locale.ROOT)) {
-      case "system.err":
-        printStreamWrapper = new PrintStreamWrapper(System.err);
-        break;
-      case "system.out":
-        printStreamWrapper = new PrintStreamWrapper(System.out);
-        break;
-      default:
-        FileOutputStream outputStream = null;
-        try {
-          File outputFile = new File(logFile);
-          File parentFile = outputFile.getParentFile();
-          if (parentFile != null) {
-            parentFile.mkdirs();
-          }
-          outputStream = new FileOutputStream(outputFile);
-          PrintStream printStream = new PrintStream(outputStream, true);
-          LogReporter.register(outputFile);
-          return printStream;
-        } catch (IOException | SecurityException e) {
-          if (outputStream != null) {
+
+    public static class NewDTFormatter extends DTFormatter {
+        private final Object dateTimeFormatter;
+        private final MethodHandle formatTo;
+        private final MethodHandle instantOfEpochMilli;
+        private final Object zoneId;
+        private final MethodHandle zdtOfInstant;
+
+        public NewDTFormatter(String dateTimeFormat) {
+            MethodHandles.Lookup l = MethodHandles.publicLookup();
+            try {
+                ClassLoader cl = ClassLoader.getSystemClassLoader();
+                Class<?> fClass = cl.loadClass("java.time.format.DateTimeFormatter");
+                Class<?> tClass = cl.loadClass("java.time.temporal.TemporalAccessor");
+                Class<?> iClass = cl.loadClass("java.time.Instant");
+                Class<?> zdtClass = cl.loadClass("java.time.ZonedDateTime");
+                Class<?> zClass = cl.loadClass("java.time.ZoneId");
+                this.dateTimeFormatter = l.findStatic(fClass, "ofPattern", MethodType.methodType(fClass, String.class))
+                        .invoke(dateTimeFormat);
+                this.formatTo =
+                        l.findVirtual(fClass, "formatTo", MethodType.methodType(void.class, tClass, Appendable.class));
+                this.instantOfEpochMilli =
+                        l.findStatic(iClass, "ofEpochMilli", MethodType.methodType(iClass, long.class));
+                this.zoneId = l.findStatic(zClass, "systemDefault", MethodType.methodType(zClass))
+                        .invoke();
+                this.zdtOfInstant =
+                        l.findStatic(zdtClass, "ofInstant", MethodType.methodType(zdtClass, iClass, zClass));
+            } catch (Throwable t) {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        @Override
+        public void appendFormattedDate(StringBuilder builder, long timeMillis, long startTimeMillis) {
             try {
-              outputStream.close();
-            } catch (IOException ce) {
-              // TODO maybe have support for delayed logging of early failures?
+                formatTo.invoke(
+                        dateTimeFormatter,
+                        zdtOfInstant.invoke(instantOfEpochMilli.invoke(timeMillis), zoneId),
+                        builder);
+            } catch (Throwable t) {
+                // ignore
+            }
+        }
+    }
+
+    @SuppressForbidden
+    static PrintStream getPrintStream(String logFile) {
+        PrintStreamWrapper printStreamWrapper;
+        switch (logFile.toLowerCase(Locale.ROOT)) {
+            case "system.err":
+                printStreamWrapper = new PrintStreamWrapper(System.err);
+                break;
+            case "system.out":
+                printStreamWrapper = new PrintStreamWrapper(System.out);
+                break;
+            default:
+                FileOutputStream outputStream = null;
+                try {
+                    File outputFile = new File(logFile);
+                    File parentFile = outputFile.getParentFile();
+                    if (parentFile != null) {
+                        parentFile.mkdirs();
+                    }
+                    outputStream = new FileOutputStream(outputFile);
+                    PrintStream printStream = new PrintStream(outputStream, true);
+                    LogReporter.register(outputFile);
+                    return printStream;
+                } catch (IOException | SecurityException e) {
+                    if (outputStream != null) {
+                        try {
+                            outputStream.close();
+                        } catch (IOException ce) {
+                            // TODO maybe have support for delayed logging of early failures?
+                        }
+                    }
+                    // TODO maybe have support for delayed logging of early failures?
+                    printStreamWrapper = new PrintStreamWrapper(System.err);
+                }
+        }
+        LogReporter.register(printStreamWrapper);
+        return printStreamWrapper;
+    }
+
+    private static final class ResourceStreamPrivilegedAction implements PrivilegedAction<InputStream> {
+        private final String fileName;
+
+        public ResourceStreamPrivilegedAction(String fileName) {
+            this.fileName = fileName;
+        }
+
+        @Override
+        public InputStream run() {
+            ClassLoader threadCL = Thread.currentThread().getContextClassLoader();
+            if (threadCL != null) {
+                return threadCL.getResourceAsStream(fileName);
+            } else {
+                return ClassLoader.getSystemResourceAsStream(fileName);
+            }
+        }
+    }
+
+    static Properties loadProperties(final String fileName) {
+        // Load properties in the same way that SimpleLogger does
+        try (InputStream inputStream = AccessController.doPrivileged(new ResourceStreamPrivilegedAction(fileName))) {
+            if (inputStream != null) {
+                Properties properties = new Properties();
+                properties.load(inputStream);
+                return properties;
             }
-          }
-          // TODO maybe have support for delayed logging of early failures?
-          printStreamWrapper = new PrintStreamWrapper(System.err);
+        } catch (IOException e) {
+            // ignored
+        }
+
+        return null;
+    }
+
+    private static String getString(Properties properties, Properties fallbackProperties, String name) {
+        String property = properties == null ? null : properties.getProperty(name);
+        if (property == null) {
+            property = fallbackProperties == null ? null : fallbackProperties.getProperty(name);
         }
+        return property;
+    }
+
+    static String getString(Properties properties, Properties fallbackProperties, String name, String defaultValue) {
+        String property = getString(properties, fallbackProperties, name);
+        return property == null ? defaultValue : property;
     }
-    LogReporter.register(printStreamWrapper);
-    return printStreamWrapper;
-  }
 
-  private static final class ResourceStreamPrivilegedAction
-      implements PrivilegedAction<InputStream> {
-    private final String fileName;
+    static boolean getBoolean(Properties properties, Properties fallbackProperties, String name, boolean defaultValue) {
+        String property = getString(properties, fallbackProperties, name);
+        return property == null ? defaultValue : Boolean.parseBoolean(property);
+    }
+
+    private final Properties properties;
+    private final Properties fileProperties;
+
+    // Package reachable for SLCompatHelper and tests
+    final String warnLevelString;
+    final boolean levelInBrackets;
+    final PrintStream printStream;
+    final boolean showShortLogName;
+    final boolean showLogName;
+    final boolean showThreadName;
+    final DTFormatter dateTimeFormatter;
+    final boolean showDateTime;
+    final boolean jsonEnabled;
+    final LogLevel defaultLogLevel;
+    final boolean embedException;
+
+    public SLCompatSettings(Properties properties) {
+        this(properties, loadProperties(properties.getProperty(Keys.CONFIGURATION_FILE, Defaults.CONFIGURATION_FILE)));
+    }
 
-    public ResourceStreamPrivilegedAction(String fileName) {
-      this.fileName = fileName;
+    public SLCompatSettings(Properties properties, Properties fileProperties) {
+        this(
+                properties,
+                fileProperties,
+                getPrintStream(getString(properties, fileProperties, Keys.LOG_FILE, Defaults.LOG_FILE)));
     }
 
-    @Override
-    public InputStream run() {
-      ClassLoader threadCL = Thread.currentThread().getContextClassLoader();
-      if (threadCL != null) {
-        return threadCL.getResourceAsStream(fileName);
-      } else {
-        return ClassLoader.getSystemResourceAsStream(fileName);
-      }
+    public SLCompatSettings(Properties properties, Properties fileProperties, PrintStream printStream) {
+        this(
+                properties,
+                fileProperties,
+                getString(properties, fileProperties, Keys.WARN_LEVEL_STRING),
+                getBoolean(properties, fileProperties, Keys.LEVEL_IN_BRACKETS, Defaults.LEVEL_IN_BRACKETS),
+                printStream,
+                getBoolean(properties, fileProperties, Keys.SHOW_SHORT_LOG_NAME, Defaults.SHOW_SHORT_LOG_NAME),
+                getBoolean(properties, fileProperties, Keys.SHOW_LOG_NAME, Defaults.SHOW_LOG_NAME),
+                getBoolean(properties, fileProperties, Keys.SHOW_THREAD_NAME, Defaults.SHOW_THREAD_NAME),
+                DTFormatter.create(
+                        getString(properties, fileProperties, Keys.DATE_TIME_FORMAT, Defaults.DATE_TIME_FORMAT)),
+                getBoolean(properties, fileProperties, Keys.SHOW_DATE_TIME, Defaults.SHOW_DATE_TIME),
+                getBoolean(properties, fileProperties, Keys.JSON_ENABLED, Defaults.JSON_ENABLED),
+                LogLevel.fromString(
+                        getString(properties, fileProperties, Keys.DEFAULT_LOG_LEVEL, Defaults.DEFAULT_LOG_LEVEL)),
+                getBoolean(properties, fileProperties, Keys.EMBED_EXCEPTION, Defaults.EMBED_EXCEPTION));
     }
-  }
-
-  static Properties loadProperties(final String fileName) {
-    // Load properties in the same way that SimpleLogger does
-    try (InputStream inputStream =
-        AccessController.doPrivileged(new ResourceStreamPrivilegedAction(fileName))) {
-      if (inputStream != null) {
-        Properties properties = new Properties();
-        properties.load(inputStream);
-        return properties;
-      }
-    } catch (IOException e) {
-      // ignored
+
+    public SLCompatSettings(
+            Properties properties,
+            Properties fileProperties,
+            String warnLevelString,
+            boolean levelInBrackets,
+            PrintStream printStream,
+            boolean showShortLogName,
+            boolean showLogName,
+            boolean showThreadName,
+            DTFormatter dateTimeFormatter,
+            boolean showDateTime,
+            boolean jsonEnabled,
+            LogLevel defaultLogLevel,
+            boolean embedException) {
+        this.properties = properties;
+        this.fileProperties = fileProperties;
+        this.warnLevelString = warnLevelString;
+        this.levelInBrackets = levelInBrackets;
+        this.printStream = printStream;
+        this.showShortLogName = showShortLogName;
+        this.showLogName = showLogName;
+        this.showThreadName = showThreadName;
+        this.dateTimeFormatter = dateTimeFormatter;
+        this.showDateTime = showDateTime;
+        this.jsonEnabled = jsonEnabled;
+        this.defaultLogLevel = defaultLogLevel;
+        this.embedException = embedException;
     }
 
-    return null;
-  }
+    String getString(String name) {
+        return getString(properties, fileProperties, name);
+    }
 
-  private static String getString(
-      Properties properties, Properties fallbackProperties, String name) {
-    String property = properties == null ? null : properties.getProperty(name);
-    if (property == null) {
-      property = fallbackProperties == null ? null : fallbackProperties.getProperty(name);
+    public LogLevel logLevelForName(String name) {
+        String level = null;
+        String remainder = name;
+        int end = name.length();
+        while (level == null && end > -1) {
+            remainder = remainder.substring(0, end);
+            level = getString(Keys.LOG_KEY_PREFIX + remainder);
+            end = remainder.lastIndexOf('.');
+        }
+        return level != null ? LogLevel.fromString(level) : defaultLogLevel;
     }
-    return property;
-  }
-
-  static String getString(
-      Properties properties, Properties fallbackProperties, String name, String defaultValue) {
-    String property = getString(properties, fallbackProperties, name);
-    return property == null ? defaultValue : property;
-  }
-
-  static boolean getBoolean(
-      Properties properties, Properties fallbackProperties, String name, boolean defaultValue) {
-    String property = getString(properties, fallbackProperties, name);
-    return property == null ? defaultValue : Boolean.parseBoolean(property);
-  }
-
-  private final Properties properties;
-  private final Properties fileProperties;
-
-  // Package reachable for SLCompatHelper and tests
-  final String warnLevelString;
-  final boolean levelInBrackets;
-  final PrintStream printStream;
-  final boolean showShortLogName;
-  final boolean showLogName;
-  final boolean showThreadName;
-  final DTFormatter dateTimeFormatter;
-  final boolean showDateTime;
-  final boolean jsonEnabled;
-  final LogLevel defaultLogLevel;
-  final boolean embedException;
-
-  public SLCompatSettings(Properties properties) {
-    this(
-        properties,
-        loadProperties(
-            properties.getProperty(Keys.CONFIGURATION_FILE, Defaults.CONFIGURATION_FILE)));
-  }
-
-  public SLCompatSettings(Properties properties, Properties fileProperties) {
-    this(
-        properties,
-        fileProperties,
-        getPrintStream(getString(properties, fileProperties, Keys.LOG_FILE, Defaults.LOG_FILE)));
-  }
-
-  public SLCompatSettings(
-      Properties properties, Properties fileProperties, PrintStream printStream) {
-    this(
-        properties,
-        fileProperties,
-        getString(properties, fileProperties, Keys.WARN_LEVEL_STRING),
-        getBoolean(properties, fileProperties, Keys.LEVEL_IN_BRACKETS, Defaults.LEVEL_IN_BRACKETS),
-        printStream,
-        getBoolean(
-            properties, fileProperties, Keys.SHOW_SHORT_LOG_NAME, Defaults.SHOW_SHORT_LOG_NAME),
-        getBoolean(properties, fileProperties, Keys.SHOW_LOG_NAME, Defaults.SHOW_LOG_NAME),
-        getBoolean(properties, fileProperties, Keys.SHOW_THREAD_NAME, Defaults.SHOW_THREAD_NAME),
-        DTFormatter.create(
-            getString(
-                properties, fileProperties, Keys.DATE_TIME_FORMAT, Defaults.DATE_TIME_FORMAT)),
-        getBoolean(properties, fileProperties, Keys.SHOW_DATE_TIME, Defaults.SHOW_DATE_TIME),
-        getBoolean(properties, fileProperties, Keys.JSON_ENABLED, Defaults.JSON_ENABLED),
-        LogLevel.fromString(
-            getString(
-                properties, fileProperties, Keys.DEFAULT_LOG_LEVEL, Defaults.DEFAULT_LOG_LEVEL)),
-        getBoolean(properties, fileProperties, Keys.EMBED_EXCEPTION, Defaults.EMBED_EXCEPTION));
-  }
-
-  public SLCompatSettings(
-      Properties properties,
-      Properties fileProperties,
-      String warnLevelString,
-      boolean levelInBrackets,
-      PrintStream printStream,
-      boolean showShortLogName,
-      boolean showLogName,
-      boolean showThreadName,
-      DTFormatter dateTimeFormatter,
-      boolean showDateTime,
-      boolean jsonEnabled,
-      LogLevel defaultLogLevel,
-      boolean embedException) {
-    this.properties = properties;
-    this.fileProperties = fileProperties;
-    this.warnLevelString = warnLevelString;
-    this.levelInBrackets = levelInBrackets;
-    this.printStream = printStream;
-    this.showShortLogName = showShortLogName;
-    this.showLogName = showLogName;
-    this.showThreadName = showThreadName;
-    this.dateTimeFormatter = dateTimeFormatter;
-    this.showDateTime = showDateTime;
-    this.jsonEnabled = jsonEnabled;
-    this.defaultLogLevel = defaultLogLevel;
-    this.embedException = embedException;
-  }
-
-  String getString(String name) {
-    return getString(properties, fileProperties, name);
-  }
-
-  public LogLevel logLevelForName(String name) {
-    String level = null;
-    String remainder = name;
-    int end = name.length();
-    while (level == null && end > -1) {
-      remainder = remainder.substring(0, end);
-      level = getString(Keys.LOG_KEY_PREFIX + remainder);
-      end = remainder.lastIndexOf('.');
+
+    public String logNameForName(String name) {
+        if (showShortLogName) {
+            return name.substring(name.lastIndexOf(".") + 1);
+        } else if (showLogName) {
+            return name;
+        } else {
+            return "";
+        }
     }
-    return level != null ? LogLevel.fromString(level) : defaultLogLevel;
-  }
-
-  public String logNameForName(String name) {
-    if (showShortLogName) {
-      return name.substring(name.lastIndexOf(".") + 1);
-    } else if (showLogName) {
-      return name;
-    } else {
-      return "";
+
+    public Map<String, Object> getSettingsDescription() {
+        Map<String, Object> settingsDescription = new HashMap<>();
+        settingsDescription.put(
+                Names.WARN_LEVEL_STRING, warnLevelString != null ? warnLevelString : LogLevel.WARN.toString());
+        settingsDescription.put(Names.LEVEL_IN_BRACKETS, levelInBrackets);
+        settingsDescription.put(
+                Names.LOG_FILE, getString(properties, fileProperties, Keys.LOG_FILE, Defaults.LOG_FILE));
+        settingsDescription.put(Names.SHOW_LOG_NAME, showLogName);
+        settingsDescription.put(Names.SHOW_SHORT_LOG_NAME, showShortLogName);
+        settingsDescription.put(Names.SHOW_THREAD_NAME, showThreadName);
+        settingsDescription.put(Names.SHOW_DATE_TIME, showDateTime);
+        settingsDescription.put(Names.JSON_ENABLED, jsonEnabled);
+        String dateTimeFormat = getString(properties, fileProperties, Keys.DATE_TIME_FORMAT, Defaults.DATE_TIME_FORMAT);
+        settingsDescription.put(Names.DATE_TIME_FORMAT, dateTimeFormat != null ? dateTimeFormat : "relative");
+        settingsDescription.put(Names.DEFAULT_LOG_LEVEL, defaultLogLevel.toString());
+        settingsDescription.put(Names.EMBED_EXCEPTION, embedException);
+        settingsDescription.put(
+                Names.CONFIGURATION_FILE, properties.getProperty(Keys.CONFIGURATION_FILE, Defaults.CONFIGURATION_FILE));
+
+        return settingsDescription;
     }
-  }
-
-  public Map<String, Object> getSettingsDescription() {
-    Map<String, Object> settingsDescription = new HashMap<>();
-    settingsDescription.put(
-        Names.WARN_LEVEL_STRING,
-        warnLevelString != null ? warnLevelString : LogLevel.WARN.toString());
-    settingsDescription.put(Names.LEVEL_IN_BRACKETS, levelInBrackets);
-    settingsDescription.put(
-        Names.LOG_FILE, getString(properties, fileProperties, Keys.LOG_FILE, Defaults.LOG_FILE));
-    settingsDescription.put(Names.SHOW_LOG_NAME, showLogName);
-    settingsDescription.put(Names.SHOW_SHORT_LOG_NAME, showShortLogName);
-    settingsDescription.put(Names.SHOW_THREAD_NAME, showThreadName);
-    settingsDescription.put(Names.SHOW_DATE_TIME, showDateTime);
-    settingsDescription.put(Names.JSON_ENABLED, jsonEnabled);
-    String dateTimeFormat =
-        getString(properties, fileProperties, Keys.DATE_TIME_FORMAT, Defaults.DATE_TIME_FORMAT);
-    settingsDescription.put(
-        Names.DATE_TIME_FORMAT, dateTimeFormat != null ? dateTimeFormat : "relative");
-    settingsDescription.put(Names.DEFAULT_LOG_LEVEL, defaultLogLevel.toString());
-    settingsDescription.put(Names.EMBED_EXCEPTION, embedException);
-    settingsDescription.put(
-        Names.CONFIGURATION_FILE,
-        properties.getProperty(Keys.CONFIGURATION_FILE, Defaults.CONFIGURATION_FILE));
-
-    return settingsDescription;
-  }
 }
diff --git a/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsDispatcher.java b/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsDispatcher.java
index 03a0a24c734..3a691546f56 100644
--- a/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsDispatcher.java
+++ b/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsDispatcher.java
@@ -17,80 +17,79 @@
 
 public class LogsDispatcher {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(LogsDispatcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LogsDispatcher.class);
 
-  private static final MediaType JSON = MediaType.get("application/json");
-  private static final IOThrowingFunction<InputStream, Object> IGNORE_RESPONSE = is -> null;
+    private static final MediaType JSON = MediaType.get("application/json");
+    private static final IOThrowingFunction<InputStream, Object> IGNORE_RESPONSE = is -> null;
 
-  // Maximum array size if sending multiple logs in an array: 1000 entries
-  static final int MAX_BATCH_RECORDS = 1000;
+    // Maximum array size if sending multiple logs in an array: 1000 entries
+    static final int MAX_BATCH_RECORDS = 1000;
 
-  // Maximum content size per payload (uncompressed): 5MB
-  static final int MAX_BATCH_BYTES = 5 * 1024 * 1024;
+    // Maximum content size per payload (uncompressed): 5MB
+    static final int MAX_BATCH_BYTES = 5 * 1024 * 1024;
 
-  // Maximum size for a single log: 1MB
-  static final int MAX_MESSAGE_BYTES = 1024 * 1024;
+    // Maximum size for a single log: 1MB
+    static final int MAX_MESSAGE_BYTES = 1024 * 1024;
 
-  private final BackendApi backendApi;
-  private final JsonAdapter<Map> jsonAdapter;
-  private final int maxBatchRecords;
-  private final int maxBatchBytes;
-  private final int maxMessageBytes;
+    private final BackendApi backendApi;
+    private final JsonAdapter<Map> jsonAdapter;
+    private final int maxBatchRecords;
+    private final int maxBatchBytes;
+    private final int maxMessageBytes;
 
-  public LogsDispatcher(BackendApi backendApi) {
-    this(backendApi, MAX_BATCH_RECORDS, MAX_BATCH_BYTES, MAX_MESSAGE_BYTES);
-  }
-
-  LogsDispatcher(
-      BackendApi backendApi, int maxBatchRecords, int maxBatchBytes, int maxMessageBytes) {
-    this.backendApi = backendApi;
+    public LogsDispatcher(BackendApi backendApi) {
+        this(backendApi, MAX_BATCH_RECORDS, MAX_BATCH_BYTES, MAX_MESSAGE_BYTES);
+    }
 
-    Moshi moshi = new Moshi.Builder().build();
-    jsonAdapter = moshi.adapter(Map.class);
+    LogsDispatcher(BackendApi backendApi, int maxBatchRecords, int maxBatchBytes, int maxMessageBytes) {
+        this.backendApi = backendApi;
 
-    this.maxBatchRecords = maxBatchRecords;
-    this.maxBatchBytes = maxBatchBytes;
-    this.maxMessageBytes = maxMessageBytes;
-  }
+        Moshi moshi = new Moshi.Builder().build();
+        jsonAdapter = moshi.adapter(Map.class);
 
-  public void dispatch(List<Map<String, Object>> messages) {
-    StringBuilder batch = new StringBuilder("[");
-    int batchCount = 0, batchLength = 0;
+        this.maxBatchRecords = maxBatchRecords;
+        this.maxBatchBytes = maxBatchBytes;
+        this.maxMessageBytes = maxMessageBytes;
+    }
 
-    for (Map<String, Object> message : messages) {
-      String json = jsonAdapter.toJson(message);
-      byte[] bytes = json.getBytes(StandardCharsets.UTF_8);
-      if (bytes.length > maxMessageBytes) {
-        LOGGER.debug("Discarding a log message whose size {} exceeds the limit", bytes.length);
-        continue;
-      }
+    public void dispatch(List<Map<String, Object>> messages) {
+        StringBuilder batch = new StringBuilder("[");
+        int batchCount = 0, batchLength = 0;
+
+        for (Map<String, Object> message : messages) {
+            String json = jsonAdapter.toJson(message);
+            byte[] bytes = json.getBytes(StandardCharsets.UTF_8);
+            if (bytes.length > maxMessageBytes) {
+                LOGGER.debug("Discarding a log message whose size {} exceeds the limit", bytes.length);
+                continue;
+            }
+
+            if (batchCount + 1 > maxBatchRecords || batchLength + bytes.length >= maxBatchBytes) {
+                flush(batch.append(']'));
+                batch = new StringBuilder("[");
+                batchCount = 0;
+                batchLength = 0;
+            }
+
+            if (batchCount != 0) {
+                batch.append(',');
+            }
+            batch.append(json);
+            batchCount += 1;
+            batchLength += bytes.length;
+        }
 
-      if (batchCount + 1 > maxBatchRecords || batchLength + bytes.length >= maxBatchBytes) {
         flush(batch.append(']'));
-        batch = new StringBuilder("[");
-        batchCount = 0;
-        batchLength = 0;
-      }
-
-      if (batchCount != 0) {
-        batch.append(',');
-      }
-      batch.append(json);
-      batchCount += 1;
-      batchLength += bytes.length;
     }
 
-    flush(batch.append(']'));
-  }
-
-  private void flush(StringBuilder batch) {
-    try {
-      String json = batch.toString();
-      RequestBody requestBody = RequestBody.create(JSON, json);
-      RequestBody gzippedRequestBody = OkHttpUtils.gzippedRequestBodyOf(requestBody);
-      backendApi.post("logs", gzippedRequestBody, IGNORE_RESPONSE, null, true);
-    } catch (IOException e) {
-      LOGGER.error("Could not dispatch logs", e);
+    private void flush(StringBuilder batch) {
+        try {
+            String json = batch.toString();
+            RequestBody requestBody = RequestBody.create(JSON, json);
+            RequestBody gzippedRequestBody = OkHttpUtils.gzippedRequestBodyOf(requestBody);
+            backendApi.post("logs", gzippedRequestBody, IGNORE_RESPONSE, null, true);
+        } catch (IOException e) {
+            LOGGER.error("Could not dispatch logs", e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsIntakeSystem.java b/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsIntakeSystem.java
index d068c78deb0..e51987e9d8c 100644
--- a/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsIntakeSystem.java
+++ b/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsIntakeSystem.java
@@ -10,23 +10,23 @@
 
 public class LogsIntakeSystem {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(LogsIntakeSystem.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LogsIntakeSystem.class);
 
-  public static void install(SharedCommunicationObjects sco, Intake intake) {
-    Config config = Config.get();
-    if (!config.isAgentlessLogSubmissionEnabled() && !config.isAppLogsCollectionEnabled()) {
-      LOGGER.debug("Agentless logs intake and logs capture are disabled");
-      return;
-    }
+    public static void install(SharedCommunicationObjects sco, Intake intake) {
+        Config config = Config.get();
+        if (!config.isAgentlessLogSubmissionEnabled() && !config.isAppLogsCollectionEnabled()) {
+            LOGGER.debug("Agentless logs intake and logs capture are disabled");
+            return;
+        }
 
-    BackendApiFactory apiFactory = new BackendApiFactory(config, sco);
-    LogsWriterImpl writer = new LogsWriterImpl(config, apiFactory, intake);
-    sco.whenReady(writer::start);
+        BackendApiFactory apiFactory = new BackendApiFactory(config, sco);
+        LogsWriterImpl writer = new LogsWriterImpl(config, apiFactory, intake);
+        sco.whenReady(writer::start);
 
-    LogsIntake.registerWriter(writer);
-  }
+        LogsIntake.registerWriter(writer);
+    }
 
-  public static void shutdown() {
-    LogsIntake.shutdown();
-  }
+    public static void shutdown() {
+        LogsIntake.shutdown();
+    }
 }
diff --git a/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsWriterImpl.java b/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsWriterImpl.java
index 6d88d0e0a59..951a2dec0b7 100644
--- a/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsWriterImpl.java
+++ b/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsWriterImpl.java
@@ -20,94 +20,92 @@
 
 public class LogsWriterImpl implements LogsWriter {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(LogsWriterImpl.class);
-
-  private static final long POLLING_THREAD_SHUTDOWN_TIMEOUT_MILLIS = 5_000;
-  private static final int ENQUEUE_LOG_TIMEOUT_MILLIS = 1_000;
-
-  private final Map<String, Object> commonTags;
-  private final BackendApiFactory apiFactory;
-  private final Intake intake;
-  private final BlockingQueue<Map<String, Object>> messageQueue;
-  private final Thread messagePollingThread;
-
-  public LogsWriterImpl(Config config, BackendApiFactory apiFactory, Intake intake) {
-    this.apiFactory = apiFactory;
-    this.intake = intake;
-
-    commonTags = new HashMap<>();
-    commonTags.put("ddsource", "java");
-    commonTags.put("ddtags", "datadog.product:" + config.getAgentlessLogSubmissionProduct());
-    commonTags.put("service", config.getServiceName());
-    commonTags.put("hostname", config.getHostName());
-
-    messageQueue = new ArrayBlockingQueue<>(config.getAgentlessLogSubmissionQueueSize());
-    messagePollingThread =
-        AgentThreadFactory.newAgentThread(
-            AgentThreadFactory.AgentThread.LOGS_INTAKE, this::logPollingLoop);
-  }
-
-  @Override
-  public void start() {
-    try {
-      Runtime.getRuntime()
-          .addShutdownHook(
-              new Thread(AGENT_THREAD_GROUP, this::shutdown, "dd-logs-intake-shutdown-hook"));
-      messagePollingThread.start();
-    } catch (final IllegalStateException ex) {
-      // The JVM is already shutting down.
+    private static final Logger LOGGER = LoggerFactory.getLogger(LogsWriterImpl.class);
+
+    private static final long POLLING_THREAD_SHUTDOWN_TIMEOUT_MILLIS = 5_000;
+    private static final int ENQUEUE_LOG_TIMEOUT_MILLIS = 1_000;
+
+    private final Map<String, Object> commonTags;
+    private final BackendApiFactory apiFactory;
+    private final Intake intake;
+    private final BlockingQueue<Map<String, Object>> messageQueue;
+    private final Thread messagePollingThread;
+
+    public LogsWriterImpl(Config config, BackendApiFactory apiFactory, Intake intake) {
+        this.apiFactory = apiFactory;
+        this.intake = intake;
+
+        commonTags = new HashMap<>();
+        commonTags.put("ddsource", "java");
+        commonTags.put("ddtags", "datadog.product:" + config.getAgentlessLogSubmissionProduct());
+        commonTags.put("service", config.getServiceName());
+        commonTags.put("hostname", config.getHostName());
+
+        messageQueue = new ArrayBlockingQueue<>(config.getAgentlessLogSubmissionQueueSize());
+        messagePollingThread =
+                AgentThreadFactory.newAgentThread(AgentThreadFactory.AgentThread.LOGS_INTAKE, this::logPollingLoop);
     }
-  }
 
-  @Override
-  public void shutdown() {
-    if (!messagePollingThread.isAlive()) {
-      return;
+    @Override
+    public void start() {
+        try {
+            Runtime.getRuntime()
+                    .addShutdownHook(new Thread(AGENT_THREAD_GROUP, this::shutdown, "dd-logs-intake-shutdown-hook"));
+            messagePollingThread.start();
+        } catch (final IllegalStateException ex) {
+            // The JVM is already shutting down.
+        }
     }
 
-    messagePollingThread.interrupt();
-    try {
-      messagePollingThread.join(POLLING_THREAD_SHUTDOWN_TIMEOUT_MILLIS);
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      LOGGER.debug("Interrupted while waiting for log polling thread to stop");
+    @Override
+    public void shutdown() {
+        if (!messagePollingThread.isAlive()) {
+            return;
+        }
+
+        messagePollingThread.interrupt();
+        try {
+            messagePollingThread.join(POLLING_THREAD_SHUTDOWN_TIMEOUT_MILLIS);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            LOGGER.debug("Interrupted while waiting for log polling thread to stop");
+        }
     }
-  }
-
-  @Override
-  public void log(Map<String, Object> message) {
-    try {
-      message.putAll(commonTags);
-
-      if (!messageQueue.offer(message, ENQUEUE_LOG_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)) {
-        LOGGER.debug("Timeout while trying to enqueue log message");
-      }
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      LOGGER.debug("Interrupted while trying to log");
+
+    @Override
+    public void log(Map<String, Object> message) {
+        try {
+            message.putAll(commonTags);
+
+            if (!messageQueue.offer(message, ENQUEUE_LOG_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)) {
+                LOGGER.debug("Timeout while trying to enqueue log message");
+            }
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            LOGGER.debug("Interrupted while trying to log");
+        }
     }
-  }
 
-  private void logPollingLoop() {
-    BackendApi backendApi = apiFactory.createBackendApi(intake);
-    LogsDispatcher logsDispatcher = new LogsDispatcher(backendApi);
+    private void logPollingLoop() {
+        BackendApi backendApi = apiFactory.createBackendApi(intake);
+        LogsDispatcher logsDispatcher = new LogsDispatcher(backendApi);
 
-    while (!Thread.currentThread().isInterrupted()) {
-      try {
-        List<Map<String, Object>> batch = new ArrayList<>();
-        batch.add(messageQueue.take());
-        messageQueue.drainTo(batch);
-        logsDispatcher.dispatch(batch);
+        while (!Thread.currentThread().isInterrupted()) {
+            try {
+                List<Map<String, Object>> batch = new ArrayList<>();
+                batch.add(messageQueue.take());
+                messageQueue.drainTo(batch);
+                logsDispatcher.dispatch(batch);
 
-      } catch (InterruptedException e) {
-        break;
-      }
-    }
+            } catch (InterruptedException e) {
+                break;
+            }
+        }
 
-    List<Map<String, Object>> batch = new ArrayList<>();
-    messageQueue.drainTo(batch);
-    if (!batch.isEmpty()) {
-      logsDispatcher.dispatch(batch);
+        List<Map<String, Object>> batch = new ArrayList<>();
+        messageQueue.drainTo(batch);
+        if (!batch.isEmpty()) {
+            logsDispatcher.dispatch(batch);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/common/OtelInstrumentationScope.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/common/OtelInstrumentationScope.java
index 28e912d8a54..bfd613ee830 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/common/OtelInstrumentationScope.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/common/OtelInstrumentationScope.java
@@ -7,87 +7,90 @@
 /** Instrumentation scopes have a mandatory name, optional version, and optional schema URL. */
 public final class OtelInstrumentationScope implements Comparable<OtelInstrumentationScope> {
 
-  private final UTF8BytesString scopeName;
-  @Nullable private final UTF8BytesString scopeVersion;
-  @Nullable private final UTF8BytesString schemaUrl;
+    private final UTF8BytesString scopeName;
 
-  public OtelInstrumentationScope(
-      String scopeName, @Nullable String scopeVersion, @Nullable String schemaUrl) {
-    this.scopeName = UTF8BytesString.create(scopeName);
-    this.scopeVersion = UTF8BytesString.create(scopeVersion);
-    this.schemaUrl = UTF8BytesString.create(schemaUrl);
-  }
+    @Nullable
+    private final UTF8BytesString scopeVersion;
 
-  public UTF8BytesString getName() {
-    return scopeName;
-  }
+    @Nullable
+    private final UTF8BytesString schemaUrl;
 
-  @Nullable
-  public UTF8BytesString getVersion() {
-    return scopeVersion;
-  }
-
-  @Nullable
-  public UTF8BytesString getSchemaUrl() {
-    return schemaUrl;
-  }
+    public OtelInstrumentationScope(String scopeName, @Nullable String scopeVersion, @Nullable String schemaUrl) {
+        this.scopeName = UTF8BytesString.create(scopeName);
+        this.scopeVersion = UTF8BytesString.create(scopeVersion);
+        this.schemaUrl = UTF8BytesString.create(schemaUrl);
+    }
 
-  @Override
-  public int compareTo(OtelInstrumentationScope that) {
-    int cmp = scopeName.toString().compareTo(that.scopeName.toString());
-    if (cmp != 0) {
-      return cmp;
+    public UTF8BytesString getName() {
+        return scopeName;
     }
-    if (scopeVersion != that.scopeVersion) {
-      if (scopeVersion == null) {
-        return -1;
-      } else if (that.scopeVersion == null) {
-        return 1;
-      }
-      cmp = scopeVersion.toString().compareTo(that.scopeVersion.toString());
-      if (cmp != 0) {
-        return cmp;
-      }
+
+    @Nullable
+    public UTF8BytesString getVersion() {
+        return scopeVersion;
     }
-    if (schemaUrl != that.schemaUrl) {
-      if (schemaUrl == null) {
-        return -1;
-      } else if (that.schemaUrl == null) {
-        return 1;
-      }
-      return schemaUrl.toString().compareTo(that.schemaUrl.toString());
+
+    @Nullable
+    public UTF8BytesString getSchemaUrl() {
+        return schemaUrl;
     }
-    return 0;
-  }
 
-  @Override
-  public boolean equals(Object o) {
-    if (!(o instanceof OtelInstrumentationScope)) {
-      return false;
+    @Override
+    public int compareTo(OtelInstrumentationScope that) {
+        int cmp = scopeName.toString().compareTo(that.scopeName.toString());
+        if (cmp != 0) {
+            return cmp;
+        }
+        if (scopeVersion != that.scopeVersion) {
+            if (scopeVersion == null) {
+                return -1;
+            } else if (that.scopeVersion == null) {
+                return 1;
+            }
+            cmp = scopeVersion.toString().compareTo(that.scopeVersion.toString());
+            if (cmp != 0) {
+                return cmp;
+            }
+        }
+        if (schemaUrl != that.schemaUrl) {
+            if (schemaUrl == null) {
+                return -1;
+            } else if (that.schemaUrl == null) {
+                return 1;
+            }
+            return schemaUrl.toString().compareTo(that.schemaUrl.toString());
+        }
+        return 0;
     }
 
-    OtelInstrumentationScope that = (OtelInstrumentationScope) o;
-    return scopeName.equals(that.scopeName)
-        && Objects.equals(scopeVersion, that.scopeVersion)
-        && Objects.equals(schemaUrl, that.schemaUrl);
-  }
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof OtelInstrumentationScope)) {
+            return false;
+        }
 
-  @Override
-  public int hashCode() {
-    int result = scopeName.hashCode();
-    result = 31 * result + Objects.hashCode(scopeVersion);
-    result = 31 * result + Objects.hashCode(schemaUrl);
-    return result;
-  }
+        OtelInstrumentationScope that = (OtelInstrumentationScope) o;
+        return scopeName.equals(that.scopeName)
+                && Objects.equals(scopeVersion, that.scopeVersion)
+                && Objects.equals(schemaUrl, that.schemaUrl);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = scopeName.hashCode();
+        result = 31 * result + Objects.hashCode(scopeVersion);
+        result = 31 * result + Objects.hashCode(schemaUrl);
+        return result;
+    }
 
-  @Override
-  public String toString() {
-    // use same property names as OTel in toString
-    return "OtelInstrumentationScope{"
-        + "name='"
-        + scopeName
-        + (scopeVersion != null ? "', version='" + scopeVersion : "")
-        + (schemaUrl != null ? "', schemaUrl='" + schemaUrl : "")
-        + "'}";
-  }
+    @Override
+    public String toString() {
+        // use same property names as OTel in toString
+        return "OtelInstrumentationScope{"
+                + "name='"
+                + scopeName
+                + (scopeVersion != null ? "', version='" + scopeVersion : "")
+                + (schemaUrl != null ? "', schemaUrl='" + schemaUrl : "")
+                + "'}";
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/context/StrictContextStorage.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/context/StrictContextStorage.java
index 3fe59dce668..f341cd065d1 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/context/StrictContextStorage.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/context/StrictContextStorage.java
@@ -12,23 +12,23 @@
  * touches, including some types we are not embedding. This simple replacement fixes this issue.
  */
 final class StrictContextStorage implements ContextStorage {
-  private final ContextStorage delegate;
+    private final ContextStorage delegate;
 
-  static StrictContextStorage create(ContextStorage delegate) {
-    return new StrictContextStorage(delegate);
-  }
+    static StrictContextStorage create(ContextStorage delegate) {
+        return new StrictContextStorage(delegate);
+    }
 
-  public StrictContextStorage(ContextStorage delegate) {
-    this.delegate = delegate;
-  }
+    public StrictContextStorage(ContextStorage delegate) {
+        this.delegate = delegate;
+    }
 
-  @Override
-  public Scope attach(Context context) {
-    return delegate.attach(context);
-  }
+    @Override
+    public Scope attach(Context context) {
+        return delegate.attach(context);
+    }
 
-  @Override
-  public Context current() {
-    return delegate.current();
-  }
+    @Override
+    public Context current() {
+        return delegate.current();
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/instrumentation/CallDepth.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/instrumentation/CallDepth.java
index d0376ff2f4c..34a5f5eb59e 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/instrumentation/CallDepth.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/instrumentation/CallDepth.java
@@ -4,21 +4,21 @@
 
 /** Redirects requests to our own {@link CallDepthThreadLocalMap}. */
 public final class CallDepth {
-  private final Class<?> clazz;
+    private final Class<?> clazz;
 
-  private CallDepth(final Class<?> clazz) {
-    this.clazz = clazz;
-  }
+    private CallDepth(final Class<?> clazz) {
+        this.clazz = clazz;
+    }
 
-  public static CallDepth forClass(Class<?> clazz) {
-    return new CallDepth(clazz);
-  }
+    public static CallDepth forClass(Class<?> clazz) {
+        return new CallDepth(clazz);
+    }
 
-  public int getAndIncrement() {
-    return CallDepthThreadLocalMap.incrementCallDepth(clazz);
-  }
+    public int getAndIncrement() {
+        return CallDepthThreadLocalMap.incrementCallDepth(clazz);
+    }
 
-  public int decrementAndGet() {
-    return CallDepthThreadLocalMap.decrementCallDepth(clazz);
-  }
+    public int decrementAndGet() {
+        return CallDepthThreadLocalMap.decrementCallDepth(clazz);
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/instrumentation/api/incubator/semconv/db/SqlStatementInfo.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/instrumentation/api/incubator/semconv/db/SqlStatementInfo.java
index 2a9ed1c92e9..539f0bed486 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/instrumentation/api/incubator/semconv/db/SqlStatementInfo.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/instrumentation/api/incubator/semconv/db/SqlStatementInfo.java
@@ -3,29 +3,29 @@
 /** Simple holder of sanitized statements. */
 public final class SqlStatementInfo {
 
-  private final String statement;
-  private final String operation;
-  private final String table;
+    private final String statement;
+    private final String operation;
+    private final String table;
 
-  public static SqlStatementInfo create(String statement, String operation, String table) {
-    return new SqlStatementInfo(statement, operation, table);
-  }
+    public static SqlStatementInfo create(String statement, String operation, String table) {
+        return new SqlStatementInfo(statement, operation, table);
+    }
 
-  private SqlStatementInfo(String statement, String operation, String table) {
-    this.statement = statement;
-    this.operation = operation;
-    this.table = table;
-  }
+    private SqlStatementInfo(String statement, String operation, String table) {
+        this.statement = statement;
+        this.operation = operation;
+        this.table = table;
+    }
 
-  public String getFullStatement() {
-    return statement;
-  }
+    public String getFullStatement() {
+        return statement;
+    }
 
-  public String getOperation() {
-    return operation;
-  }
+    public String getOperation() {
+        return operation;
+    }
 
-  public String getMainIdentifier() {
-    return table;
-  }
+    public String getMainIdentifier() {
+        return table;
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/instrumentation/api/incubator/semconv/db/SqlStatementSanitizer.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/instrumentation/api/incubator/semconv/db/SqlStatementSanitizer.java
index a86eb113987..cb2fb4b6047 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/instrumentation/api/incubator/semconv/db/SqlStatementSanitizer.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/instrumentation/api/incubator/semconv/db/SqlStatementSanitizer.java
@@ -5,23 +5,23 @@
 /** Redirects requests to our own {@link DBQueryInfo} sanitizer. */
 public final class SqlStatementSanitizer {
 
-  public static SqlStatementSanitizer create(boolean sanitizationEnabled) {
-    return new SqlStatementSanitizer(sanitizationEnabled);
-  }
+    public static SqlStatementSanitizer create(boolean sanitizationEnabled) {
+        return new SqlStatementSanitizer(sanitizationEnabled);
+    }
 
-  private final boolean sanitizationEnabled;
+    private final boolean sanitizationEnabled;
 
-  private SqlStatementSanitizer(boolean sanitizationEnabled) {
-    this.sanitizationEnabled = sanitizationEnabled;
-  }
+    private SqlStatementSanitizer(boolean sanitizationEnabled) {
+        this.sanitizationEnabled = sanitizationEnabled;
+    }
 
-  public SqlStatementInfo sanitize(String statement) {
-    if (sanitizationEnabled) {
-      DBQueryInfo dbQueryInfo = DBQueryInfo.ofPreparedStatement(statement);
-      return SqlStatementInfo.create(
-          dbQueryInfo.getSql().toString(), dbQueryInfo.getOperation().toString(), null);
-    } else {
-      return SqlStatementInfo.create(statement, null, null);
+    public SqlStatementInfo sanitize(String statement) {
+        if (sanitizationEnabled) {
+            DBQueryInfo dbQueryInfo = DBQueryInfo.ofPreparedStatement(statement);
+            return SqlStatementInfo.create(
+                    dbQueryInfo.getSql().toString(), dbQueryInfo.getOperation().toString(), null);
+        } else {
+            return SqlStatementInfo.create(statement, null, null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/instrumentation/internal/InstrumentationConfig.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/instrumentation/internal/InstrumentationConfig.java
index 78df63fde73..ac9e79a694a 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/instrumentation/internal/InstrumentationConfig.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/instrumentation/internal/InstrumentationConfig.java
@@ -11,83 +11,82 @@
 
 /** Redirects requests to our own {@link ConfigProvider}. */
 public final class InstrumentationConfig {
-  private static final InstrumentationConfig INSTANCE = new InstrumentationConfig();
+    private static final InstrumentationConfig INSTANCE = new InstrumentationConfig();
 
-  private static final Pattern DURATION_PATTERN = Pattern.compile("(\\d+)(ms|[DdHhMmSs]?)");
+    private static final Pattern DURATION_PATTERN = Pattern.compile("(\\d+)(ms|[DdHhMmSs]?)");
 
-  private static final ConfigProvider delegate = ConfigProvider.getInstance();
+    private static final ConfigProvider delegate = ConfigProvider.getInstance();
 
-  public static InstrumentationConfig get() {
-    return INSTANCE;
-  }
-
-  public String getString(String name) {
-    return delegate.getString(name);
-  }
+    public static InstrumentationConfig get() {
+        return INSTANCE;
+    }
 
-  public String getString(String name, String defaultValue) {
-    return delegate.getString(name, defaultValue);
-  }
+    public String getString(String name) {
+        return delegate.getString(name);
+    }
 
-  public boolean getBoolean(String name, boolean defaultValue) {
-    return delegate.getBoolean(name, defaultValue);
-  }
+    public String getString(String name, String defaultValue) {
+        return delegate.getString(name, defaultValue);
+    }
 
-  public int getInt(String name, int defaultValue) {
-    return delegate.getInteger(name, defaultValue);
-  }
+    public boolean getBoolean(String name, boolean defaultValue) {
+        return delegate.getBoolean(name, defaultValue);
+    }
 
-  public long getLong(String name, long defaultValue) {
-    return delegate.getLong(name, defaultValue);
-  }
+    public int getInt(String name, int defaultValue) {
+        return delegate.getInteger(name, defaultValue);
+    }
 
-  public double getDouble(String name, double defaultValue) {
-    return delegate.getDouble(name, defaultValue);
-  }
+    public long getLong(String name, long defaultValue) {
+        return delegate.getLong(name, defaultValue);
+    }
 
-  public Duration getDuration(String name, Duration defaultValue) {
-    String durationString = delegate.getString(name);
-    if (null == durationString) {
-      return defaultValue;
+    public double getDouble(String name, double defaultValue) {
+        return delegate.getDouble(name, defaultValue);
     }
-    Matcher matcher = DURATION_PATTERN.matcher(durationString);
-    if (matcher.matches()) {
-      long value = Integer.parseInt(matcher.group(1));
-      String unit = matcher.group(2);
-      if ("D".equalsIgnoreCase(unit)) {
-        return Duration.ofDays(value);
-      } else if ("H".equalsIgnoreCase(unit)) {
-        return Duration.ofHours(value);
-      } else if ("M".equalsIgnoreCase(unit)) {
-        return Duration.ofMinutes(value);
-      } else if ("S".equalsIgnoreCase(unit)) {
-        return Duration.ofSeconds(value);
-      } else {
-        return Duration.ofMillis(value); // already in ms
-      }
-    } else {
-      throw new IllegalArgumentException(
-          "Invalid duration property " + name + "=" + durationString);
+
+    public Duration getDuration(String name, Duration defaultValue) {
+        String durationString = delegate.getString(name);
+        if (null == durationString) {
+            return defaultValue;
+        }
+        Matcher matcher = DURATION_PATTERN.matcher(durationString);
+        if (matcher.matches()) {
+            long value = Integer.parseInt(matcher.group(1));
+            String unit = matcher.group(2);
+            if ("D".equalsIgnoreCase(unit)) {
+                return Duration.ofDays(value);
+            } else if ("H".equalsIgnoreCase(unit)) {
+                return Duration.ofHours(value);
+            } else if ("M".equalsIgnoreCase(unit)) {
+                return Duration.ofMinutes(value);
+            } else if ("S".equalsIgnoreCase(unit)) {
+                return Duration.ofSeconds(value);
+            } else {
+                return Duration.ofMillis(value); // already in ms
+            }
+        } else {
+            throw new IllegalArgumentException("Invalid duration property " + name + "=" + durationString);
+        }
     }
-  }
 
-  public List<String> getList(String name) {
-    return getList(name, Collections.emptyList());
-  }
+    public List<String> getList(String name) {
+        return getList(name, Collections.emptyList());
+    }
 
-  public List<String> getList(String name, List<String> defaultValue) {
-    return delegate.getList(name, defaultValue);
-  }
+    public List<String> getList(String name, List<String> defaultValue) {
+        return delegate.getList(name, defaultValue);
+    }
 
-  public Set<String> getSet(String name, Set<String> defaultValue) {
-    return delegate.getSet(name, defaultValue);
-  }
+    public Set<String> getSet(String name, Set<String> defaultValue) {
+        return delegate.getSet(name, defaultValue);
+    }
 
-  public Map<String, String> getMap(String name, Map<String, String> defaultValue) {
-    Map<String, String> map = delegate.getMergedMap(name);
-    if (map.isEmpty()) {
-      map = defaultValue;
+    public Map<String, String> getMap(String name, Map<String, String> defaultValue) {
+        Map<String, String> map = delegate.getMergedMap(name);
+        if (map.isEmpty()) {
+            map = defaultValue;
+        }
+        return map;
     }
-    return map;
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/logs/data/OtelLogRecordProcessor.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/logs/data/OtelLogRecordProcessor.java
index 6893a60f51d..08bf65aba25 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/logs/data/OtelLogRecordProcessor.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/logs/data/OtelLogRecordProcessor.java
@@ -21,102 +21,100 @@
 /** Processes log records, grouping them by instrumentation scope. */
 public final class OtelLogRecordProcessor {
 
-  private static final Comparator<OtlpLogRecord> BY_SCOPE =
-      Comparator.comparing(o -> o.instrumentationScope);
+    private static final Comparator<OtlpLogRecord> BY_SCOPE = Comparator.comparing(o -> o.instrumentationScope);
 
-  private static final Map<ClassLoader, BiConsumer<Map<?, ?>, OtlpAttributeVisitor>>
-      ATTRIBUTE_READERS = Collections.synchronizedMap(new WeakHashMap<>());
+    private static final Map<ClassLoader, BiConsumer<Map<?, ?>, OtlpAttributeVisitor>> ATTRIBUTE_READERS =
+            Collections.synchronizedMap(new WeakHashMap<>());
 
-  public static final OtelLogRecordProcessor INSTANCE = new OtelLogRecordProcessor();
+    public static final OtelLogRecordProcessor INSTANCE = new OtelLogRecordProcessor();
 
-  private final int maxQueueSize = Config.get().getLogsOtelQueueSize();
-  private final int maxBatchSize = Config.get().getLogsOtelBatchSize();
+    private final int maxQueueSize = Config.get().getLogsOtelQueueSize();
+    private final int maxBatchSize = Config.get().getLogsOtelBatchSize();
 
-  private final Queue<OtlpLogRecord> queue = new ArrayBlockingQueue<>(maxQueueSize);
+    private final Queue<OtlpLogRecord> queue = new ArrayBlockingQueue<>(maxQueueSize);
 
-  private final BlockingQueue<Boolean> logsReady = new ArrayBlockingQueue<>(1);
-  private volatile int logsNeeded = Integer.MAX_VALUE;
+    private final BlockingQueue<Boolean> logsReady = new ArrayBlockingQueue<>(1);
+    private volatile int logsNeeded = Integer.MAX_VALUE;
 
-  public void addLog(OtlpLogRecord logRecord) {
-    if (queue.offer(logRecord)) {
-      // report when we have enough logs for the collector's needs
-      if (queue.size() >= logsNeeded) {
-        logsReady.offer(true);
-      }
-    }
-  }
-
-  public void waitForLogs(OtlpLogsVisitor visitor, int intervalMillis) {
-    long nextExportNanos = System.nanoTime() + TimeUnit.MILLISECONDS.toNanos(intervalMillis);
-    List<OtlpLogRecord> batch = new ArrayList<>(maxBatchSize);
-    int batchSize = 0;
-
-    while (true) {
-
-      // attempt to collect enough logs to complete the batch
-      OtlpLogRecord record;
-      while (batchSize < maxBatchSize && (record = queue.poll()) != null) {
-        batch.add(record);
-        batchSize++;
-      }
-
-      // bail out if we have enough logs, or the interval has expired
-      long waitNanos;
-      if (batchSize >= maxBatchSize || (waitNanos = nextExportNanos - System.nanoTime()) <= 0) {
-        break;
-      }
-
-      logsNeeded = maxBatchSize - batchSize; // declare what we need and wait
-      try {
-        if (queue.isEmpty()) {
-          logsReady.poll(waitNanos, TimeUnit.NANOSECONDS);
+    public void addLog(OtlpLogRecord logRecord) {
+        if (queue.offer(logRecord)) {
+            // report when we have enough logs for the collector's needs
+            if (queue.size() >= logsNeeded) {
+                logsReady.offer(true);
+            }
         }
-      } catch (InterruptedException ignore) {
-        // don't set interrupt flag as we might then busy-loop, just return batch as-is
-        break;
-      } finally {
-        logsNeeded = Integer.MAX_VALUE;
-      }
     }
 
-    visitBatch(visitor, batch); // send what we have for this interval
-  }
-
-  private static void visitBatch(OtlpLogsVisitor visitor, List<OtlpLogRecord> batch) {
-    batch.sort(BY_SCOPE);
-
-    OtlpScopedLogsVisitor scopedVisitor = null;
-    OtelInstrumentationScope currentScope = null;
-    BiConsumer<Map<?, ?>, OtlpAttributeVisitor> attributesReader = null;
-    ClassLoader attributesClassLoader = null;
-    for (OtlpLogRecord logRecord : batch) {
-      if (logRecord.instrumentationScope != currentScope) {
-        currentScope = logRecord.instrumentationScope;
-        scopedVisitor = visitor.visitScopedLogs(currentScope);
-      }
-      Map<?, ?> attributes = logRecord.attributes;
-      if (!attributes.isEmpty()) {
-        ClassLoader cl = getAttributesClassLoader(attributes);
-        // avoid repeated lookups when attribute class-loader is same for all records
-        if (attributesReader == null || cl != attributesClassLoader) {
-          attributesReader = ATTRIBUTE_READERS.get(cl);
-          attributesClassLoader = cl;
+    public void waitForLogs(OtlpLogsVisitor visitor, int intervalMillis) {
+        long nextExportNanos = System.nanoTime() + TimeUnit.MILLISECONDS.toNanos(intervalMillis);
+        List<OtlpLogRecord> batch = new ArrayList<>(maxBatchSize);
+        int batchSize = 0;
+
+        while (true) {
+
+            // attempt to collect enough logs to complete the batch
+            OtlpLogRecord record;
+            while (batchSize < maxBatchSize && (record = queue.poll()) != null) {
+                batch.add(record);
+                batchSize++;
+            }
+
+            // bail out if we have enough logs, or the interval has expired
+            long waitNanos;
+            if (batchSize >= maxBatchSize || (waitNanos = nextExportNanos - System.nanoTime()) <= 0) {
+                break;
+            }
+
+            logsNeeded = maxBatchSize - batchSize; // declare what we need and wait
+            try {
+                if (queue.isEmpty()) {
+                    logsReady.poll(waitNanos, TimeUnit.NANOSECONDS);
+                }
+            } catch (InterruptedException ignore) {
+                // don't set interrupt flag as we might then busy-loop, just return batch as-is
+                break;
+            } finally {
+                logsNeeded = Integer.MAX_VALUE;
+            }
         }
-        if (attributesReader != null) {
-          attributesReader.accept(attributes, scopedVisitor);
+
+        visitBatch(visitor, batch); // send what we have for this interval
+    }
+
+    private static void visitBatch(OtlpLogsVisitor visitor, List<OtlpLogRecord> batch) {
+        batch.sort(BY_SCOPE);
+
+        OtlpScopedLogsVisitor scopedVisitor = null;
+        OtelInstrumentationScope currentScope = null;
+        BiConsumer<Map<?, ?>, OtlpAttributeVisitor> attributesReader = null;
+        ClassLoader attributesClassLoader = null;
+        for (OtlpLogRecord logRecord : batch) {
+            if (logRecord.instrumentationScope != currentScope) {
+                currentScope = logRecord.instrumentationScope;
+                scopedVisitor = visitor.visitScopedLogs(currentScope);
+            }
+            Map<?, ?> attributes = logRecord.attributes;
+            if (!attributes.isEmpty()) {
+                ClassLoader cl = getAttributesClassLoader(attributes);
+                // avoid repeated lookups when attribute class-loader is same for all records
+                if (attributesReader == null || cl != attributesClassLoader) {
+                    attributesReader = ATTRIBUTE_READERS.get(cl);
+                    attributesClassLoader = cl;
+                }
+                if (attributesReader != null) {
+                    attributesReader.accept(attributes, scopedVisitor);
+                }
+            }
+            scopedVisitor.visitLogRecord(logRecord);
         }
-      }
-      scopedVisitor.visitLogRecord(logRecord);
     }
-  }
 
-  private static ClassLoader getAttributesClassLoader(Map<?, ?> attributes) {
-    // need to peek at the first key, as the map will be a JDK collection type
-    return attributes.keySet().iterator().next().getClass().getClassLoader();
-  }
+    private static ClassLoader getAttributesClassLoader(Map<?, ?> attributes) {
+        // need to peek at the first key, as the map will be a JDK collection type
+        return attributes.keySet().iterator().next().getClass().getClassLoader();
+    }
 
-  public static void registerAttributeReader(
-      ClassLoader cl, BiConsumer<Map<?, ?>, OtlpAttributeVisitor> reader) {
-    ATTRIBUTE_READERS.put(cl, reader);
-  }
+    public static void registerAttributeReader(ClassLoader cl, BiConsumer<Map<?, ?>, OtlpAttributeVisitor> reader) {
+        ATTRIBUTE_READERS.put(cl, reader);
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrument.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrument.java
index 010c463dde0..ec5143f2df9 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrument.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrument.java
@@ -4,29 +4,29 @@
 
 /** Ensure all instruments implement the same equivalency. */
 public abstract class OtelInstrument {
-  protected final OtelMetricStorage storage;
+    protected final OtelMetricStorage storage;
 
-  protected OtelInstrument(OtelMetricStorage storage) {
-    this.storage = storage;
-  }
-
-  @Override
-  public final boolean equals(Object o) {
-    if (!(o instanceof OtelInstrument)) {
-      return false;
+    protected OtelInstrument(OtelMetricStorage storage) {
+        this.storage = storage;
     }
 
-    OtelInstrument that = (OtelInstrument) o;
-    return storage.getDescriptor().equals(that.storage.getDescriptor());
-  }
+    @Override
+    public final boolean equals(Object o) {
+        if (!(o instanceof OtelInstrument)) {
+            return false;
+        }
 
-  @Override
-  public final int hashCode() {
-    return storage.getDescriptor().hashCode();
-  }
+        OtelInstrument that = (OtelInstrument) o;
+        return storage.getDescriptor().equals(that.storage.getDescriptor());
+    }
 
-  @Override
-  public final String toString() {
-    return getClass().getSimpleName() + "{descriptor=" + storage.getDescriptor() + '}';
-  }
+    @Override
+    public final int hashCode() {
+        return storage.getDescriptor().hashCode();
+    }
+
+    @Override
+    public final String toString() {
+        return getClass().getSimpleName() + "{descriptor=" + storage.getDescriptor() + '}';
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentBuilder.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentBuilder.java
index 80791e9007a..c800b7429f8 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentBuilder.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentBuilder.java
@@ -7,101 +7,98 @@
 import javax.annotation.Nullable;
 
 public final class OtelInstrumentBuilder {
-  private final String instrumentName;
-  private final OtelInstrumentType instrumentType;
-  private final boolean longValues;
+    private final String instrumentName;
+    private final OtelInstrumentType instrumentType;
+    private final boolean longValues;
 
-  @Nullable private String description;
-  @Nullable private String unit;
+    @Nullable
+    private String description;
 
-  /**
-   * Starts building an instrument of long values with the given name and type.
-   *
-   * @param instrumentName the name of the instrument
-   * @param instrumentType the type of the instrument
-   * @return new instrument builder
-   */
-  public static OtelInstrumentBuilder ofLongs(
-      String instrumentName, OtelInstrumentType instrumentType) {
-    return new OtelInstrumentBuilder(instrumentName, instrumentType, true);
-  }
+    @Nullable
+    private String unit;
 
-  /**
-   * Starts building an instrument of long values based on another builder.
-   *
-   * @param builder the builder to copy details from
-   * @param instrumentType the type of the instrument
-   * @return new instrument builder
-   */
-  public static OtelInstrumentBuilder ofLongs(
-      OtelInstrumentBuilder builder, OtelInstrumentType instrumentType) {
-    return new OtelInstrumentBuilder(builder.instrumentName, instrumentType, true);
-  }
+    /**
+     * Starts building an instrument of long values with the given name and type.
+     *
+     * @param instrumentName the name of the instrument
+     * @param instrumentType the type of the instrument
+     * @return new instrument builder
+     */
+    public static OtelInstrumentBuilder ofLongs(String instrumentName, OtelInstrumentType instrumentType) {
+        return new OtelInstrumentBuilder(instrumentName, instrumentType, true);
+    }
 
-  /**
-   * Starts building an instrument of double values with the given name and type.
-   *
-   * @param instrumentName the name of the instrument
-   * @param instrumentType the type of the instrument
-   * @return new instrument builder
-   */
-  public static OtelInstrumentBuilder ofDoubles(
-      String instrumentName, OtelInstrumentType instrumentType) {
-    return new OtelInstrumentBuilder(instrumentName, instrumentType, false);
-  }
+    /**
+     * Starts building an instrument of long values based on another builder.
+     *
+     * @param builder the builder to copy details from
+     * @param instrumentType the type of the instrument
+     * @return new instrument builder
+     */
+    public static OtelInstrumentBuilder ofLongs(OtelInstrumentBuilder builder, OtelInstrumentType instrumentType) {
+        return new OtelInstrumentBuilder(builder.instrumentName, instrumentType, true);
+    }
 
-  /**
-   * Starts building an instrument of double values based on another builder.
-   *
-   * @param builder the builder to copy details from
-   * @param instrumentType the type of the instrument
-   * @return new instrument builder
-   */
-  public static OtelInstrumentBuilder ofDoubles(
-      OtelInstrumentBuilder builder, OtelInstrumentType instrumentType) {
-    return new OtelInstrumentBuilder(builder.instrumentName, instrumentType, false);
-  }
+    /**
+     * Starts building an instrument of double values with the given name and type.
+     *
+     * @param instrumentName the name of the instrument
+     * @param instrumentType the type of the instrument
+     * @return new instrument builder
+     */
+    public static OtelInstrumentBuilder ofDoubles(String instrumentName, OtelInstrumentType instrumentType) {
+        return new OtelInstrumentBuilder(instrumentName, instrumentType, false);
+    }
+
+    /**
+     * Starts building an instrument of double values based on another builder.
+     *
+     * @param builder the builder to copy details from
+     * @param instrumentType the type of the instrument
+     * @return new instrument builder
+     */
+    public static OtelInstrumentBuilder ofDoubles(OtelInstrumentBuilder builder, OtelInstrumentType instrumentType) {
+        return new OtelInstrumentBuilder(builder.instrumentName, instrumentType, false);
+    }
 
-  private OtelInstrumentBuilder(
-      String instrumentName, OtelInstrumentType instrumentType, boolean longValues) {
-    this.instrumentName = instrumentName;
-    this.instrumentType = instrumentType;
-    this.longValues = longValues;
-  }
+    private OtelInstrumentBuilder(String instrumentName, OtelInstrumentType instrumentType, boolean longValues) {
+        this.instrumentName = instrumentName;
+        this.instrumentType = instrumentType;
+        this.longValues = longValues;
+    }
 
-  public void setDescription(String description) {
-    this.description = description;
-  }
+    public void setDescription(String description) {
+        this.description = description;
+    }
 
-  public void setUnit(String unit) {
-    this.unit = unit;
-  }
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
 
-  public OtelInstrumentDescriptor descriptor() {
-    return new OtelInstrumentDescriptor(
-        instrumentName, instrumentType, longValues, description, unit);
-  }
+    public OtelInstrumentDescriptor descriptor() {
+        return new OtelInstrumentDescriptor(instrumentName, instrumentType, longValues, description, unit);
+    }
 
-  public OtelInstrumentDescriptor observableDescriptor() {
-    return new OtelInstrumentDescriptor(
-        instrumentName, observableType(instrumentType), longValues, description, unit);
-  }
+    public OtelInstrumentDescriptor observableDescriptor() {
+        return new OtelInstrumentDescriptor(
+                instrumentName, observableType(instrumentType), longValues, description, unit);
+    }
 
-  /**
-   * Maps the given {@link OtelInstrumentType} to its observable equivalent.
-   *
-   * @throws IllegalArgumentException if the type has no observable equivalent
-   */
-  private OtelInstrumentType observableType(OtelInstrumentType instrumentType) {
-    switch (instrumentType) {
-      case COUNTER:
-        return OBSERVABLE_COUNTER;
-      case UP_DOWN_COUNTER:
-        return OBSERVABLE_UP_DOWN_COUNTER;
-      case GAUGE:
-        return OBSERVABLE_GAUGE;
-      default:
-        throw new IllegalArgumentException(instrumentType + " has no observable equivalent");
+    /**
+     * Maps the given {@link OtelInstrumentType} to its observable equivalent.
+     *
+     * @throws IllegalArgumentException if the type has no observable equivalent
+     */
+    private OtelInstrumentType observableType(OtelInstrumentType instrumentType) {
+        switch (instrumentType) {
+            case COUNTER:
+                return OBSERVABLE_COUNTER;
+            case UP_DOWN_COUNTER:
+                return OBSERVABLE_UP_DOWN_COUNTER;
+            case GAUGE:
+                return OBSERVABLE_GAUGE;
+            default:
+                throw new IllegalArgumentException(instrumentType + " has no observable equivalent");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentDescriptor.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentDescriptor.java
index 9c77db43bbf..13414586d7b 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentDescriptor.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentDescriptor.java
@@ -7,88 +7,93 @@
 
 /** Uniquely describes an instrument for the Meter that created it. */
 public final class OtelInstrumentDescriptor {
-  private final UTF8BytesString instrumentName;
-  private final OtelInstrumentType instrumentType;
-  private final boolean longValues;
-  @Nullable private final UTF8BytesString description;
-  @Nullable private final UTF8BytesString unit;
-  private int hash;
+    private final UTF8BytesString instrumentName;
+    private final OtelInstrumentType instrumentType;
+    private final boolean longValues;
 
-  public OtelInstrumentDescriptor(
-      String instrumentName,
-      OtelInstrumentType instrumentType,
-      boolean longValues,
-      @Nullable String description,
-      @Nullable String unit) {
-    this.instrumentName = UTF8BytesString.create(instrumentName);
-    this.instrumentType = instrumentType;
-    this.longValues = longValues;
-    this.description = UTF8BytesString.create(description);
-    this.unit = UTF8BytesString.create(unit);
-  }
+    @Nullable
+    private final UTF8BytesString description;
 
-  public UTF8BytesString getName() {
-    return instrumentName;
-  }
+    @Nullable
+    private final UTF8BytesString unit;
 
-  public OtelInstrumentType getType() {
-    return instrumentType;
-  }
+    private int hash;
 
-  public boolean hasLongValues() {
-    return longValues;
-  }
+    public OtelInstrumentDescriptor(
+            String instrumentName,
+            OtelInstrumentType instrumentType,
+            boolean longValues,
+            @Nullable String description,
+            @Nullable String unit) {
+        this.instrumentName = UTF8BytesString.create(instrumentName);
+        this.instrumentType = instrumentType;
+        this.longValues = longValues;
+        this.description = UTF8BytesString.create(description);
+        this.unit = UTF8BytesString.create(unit);
+    }
+
+    public UTF8BytesString getName() {
+        return instrumentName;
+    }
+
+    public OtelInstrumentType getType() {
+        return instrumentType;
+    }
 
-  @Nullable
-  public UTF8BytesString getDescription() {
-    return description;
-  }
+    public boolean hasLongValues() {
+        return longValues;
+    }
 
-  @Nullable
-  public UTF8BytesString getUnit() {
-    return unit;
-  }
+    @Nullable
+    public UTF8BytesString getDescription() {
+        return description;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (!(o instanceof OtelInstrumentDescriptor)) {
-      return false;
+    @Nullable
+    public UTF8BytesString getUnit() {
+        return unit;
     }
 
-    OtelInstrumentDescriptor that = (OtelInstrumentDescriptor) o;
-    return instrumentName.toString().equalsIgnoreCase(that.instrumentName.toString())
-        && instrumentType == that.instrumentType
-        && longValues == that.longValues
-        && Objects.equals(description, that.description)
-        && Objects.equals(unit, that.unit);
-  }
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof OtelInstrumentDescriptor)) {
+            return false;
+        }
 
-  @Override
-  public int hashCode() {
-    int result = hash;
-    if (result == 0) {
-      result = instrumentName.toString().toLowerCase(Locale.ROOT).hashCode();
-      result = 31 * result + instrumentType.hashCode();
-      result = 31 * result + Boolean.hashCode(longValues);
-      result = 31 * result + Objects.hashCode(description);
-      result = 31 * result + Objects.hashCode(unit);
-      hash = result;
+        OtelInstrumentDescriptor that = (OtelInstrumentDescriptor) o;
+        return instrumentName.toString().equalsIgnoreCase(that.instrumentName.toString())
+                && instrumentType == that.instrumentType
+                && longValues == that.longValues
+                && Objects.equals(description, that.description)
+                && Objects.equals(unit, that.unit);
     }
-    return result;
-  }
 
-  @Override
-  public String toString() {
-    // use same property names as OTel in toString
-    return "OtelInstrumentDescriptor{"
-        + "name='"
-        + instrumentName
-        + (description != null ? "', description='" + description : "")
-        + (unit != null ? "', unit='" + unit : "")
-        + "', type="
-        + instrumentType
-        + ", valueType="
-        + (longValues ? "LONG" : "DOUBLE")
-        + "}";
-  }
+    @Override
+    public int hashCode() {
+        int result = hash;
+        if (result == 0) {
+            result = instrumentName.toString().toLowerCase(Locale.ROOT).hashCode();
+            result = 31 * result + instrumentType.hashCode();
+            result = 31 * result + Boolean.hashCode(longValues);
+            result = 31 * result + Objects.hashCode(description);
+            result = 31 * result + Objects.hashCode(unit);
+            hash = result;
+        }
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        // use same property names as OTel in toString
+        return "OtelInstrumentDescriptor{"
+                + "name='"
+                + instrumentName
+                + (description != null ? "', description='" + description : "")
+                + (unit != null ? "', unit='" + unit : "")
+                + "', type="
+                + instrumentType
+                + ", valueType="
+                + (longValues ? "LONG" : "DOUBLE")
+                + "}";
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentType.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentType.java
index d8b7ea9ac22..277e3be73e8 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentType.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentType.java
@@ -1,22 +1,22 @@
 package datadog.trace.bootstrap.otel.metrics;
 
 public enum OtelInstrumentType {
-  // same order as io.opentelemetry.sdk.metrics.InstrumentType
-  COUNTER(false),
-  UP_DOWN_COUNTER(false),
-  HISTOGRAM(false),
-  OBSERVABLE_COUNTER(true),
-  OBSERVABLE_UP_DOWN_COUNTER(true),
-  OBSERVABLE_GAUGE(true),
-  GAUGE(false);
+    // same order as io.opentelemetry.sdk.metrics.InstrumentType
+    COUNTER(false),
+    UP_DOWN_COUNTER(false),
+    HISTOGRAM(false),
+    OBSERVABLE_COUNTER(true),
+    OBSERVABLE_UP_DOWN_COUNTER(true),
+    OBSERVABLE_GAUGE(true),
+    GAUGE(false);
 
-  private final boolean observable;
+    private final boolean observable;
 
-  OtelInstrumentType(boolean observable) {
-    this.observable = observable;
-  }
+    OtelInstrumentType(boolean observable) {
+        this.observable = observable;
+    }
 
-  public boolean isObservable() {
-    return observable;
-  }
+    public boolean isObservable() {
+        return observable;
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelAggregator.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelAggregator.java
index 654a0b19f69..954ce63b461 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelAggregator.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelAggregator.java
@@ -4,39 +4,39 @@
 
 /** Common behaviour shared across all aggregators. */
 abstract class OtelAggregator {
-  private volatile boolean empty = true;
+    private volatile boolean empty = true;
 
-  final boolean isEmpty() {
-    return empty;
-  }
+    final boolean isEmpty() {
+        return empty;
+    }
 
-  final void recordDouble(double value) {
-    doRecordDouble(value);
-    empty = false;
-  }
+    final void recordDouble(double value) {
+        doRecordDouble(value);
+        empty = false;
+    }
 
-  final void recordLong(long value) {
-    doRecordLong(value);
-    empty = false;
-  }
+    final void recordLong(long value) {
+        doRecordLong(value);
+        empty = false;
+    }
 
-  final OtlpDataPoint collect() {
-    return doCollect(false);
-  }
+    final OtlpDataPoint collect() {
+        return doCollect(false);
+    }
 
-  final OtlpDataPoint collectAndReset() {
-    OtlpDataPoint point = doCollect(true);
-    empty = true;
-    return point;
-  }
+    final OtlpDataPoint collectAndReset() {
+        OtlpDataPoint point = doCollect(true);
+        empty = true;
+        return point;
+    }
 
-  void doRecordDouble(double value) {
-    throw new UnsupportedOperationException();
-  }
+    void doRecordDouble(double value) {
+        throw new UnsupportedOperationException();
+    }
 
-  void doRecordLong(long value) {
-    throw new UnsupportedOperationException();
-  }
+    void doRecordLong(long value) {
+        throw new UnsupportedOperationException();
+    }
 
-  abstract OtlpDataPoint doCollect(boolean reset);
+    abstract OtlpDataPoint doCollect(boolean reset);
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelDoubleDelta.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelDoubleDelta.java
index 9544fe44f04..623d0d04f6d 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelDoubleDelta.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelDoubleDelta.java
@@ -5,21 +5,21 @@
 
 /** Reports the delta value since the last reset. */
 final class OtelDoubleDelta extends OtelAggregator {
-  private volatile double value;
-  private double lastValue;
+    private volatile double value;
+    private double lastValue;
 
-  @Override
-  void doRecordDouble(double value) {
-    this.value = value;
-  }
+    @Override
+    void doRecordDouble(double value) {
+        this.value = value;
+    }
 
-  @Override
-  OtlpDataPoint doCollect(boolean reset) {
-    double collectedValue = value;
-    double delta = collectedValue - lastValue;
-    if (reset) {
-      lastValue = collectedValue;
+    @Override
+    OtlpDataPoint doCollect(boolean reset) {
+        double collectedValue = value;
+        double delta = collectedValue - lastValue;
+        if (reset) {
+            lastValue = collectedValue;
+        }
+        return new OtlpDoublePoint(delta);
     }
-    return new OtlpDoublePoint(delta);
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelDoubleSum.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelDoubleSum.java
index 7e5bd48bc6a..b6fbebaca5b 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelDoubleSum.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelDoubleSum.java
@@ -6,15 +6,15 @@
 
 /** Reports the sum of values since the last reset. */
 final class OtelDoubleSum extends OtelAggregator {
-  private final DoubleAdder total = new DoubleAdder();
+    private final DoubleAdder total = new DoubleAdder();
 
-  @Override
-  void doRecordDouble(double value) {
-    total.add(value);
-  }
+    @Override
+    void doRecordDouble(double value) {
+        total.add(value);
+    }
 
-  @Override
-  OtlpDataPoint doCollect(boolean reset) {
-    return new OtlpDoublePoint(reset ? total.sumThenReset() : total.sum());
-  }
+    @Override
+    OtlpDataPoint doCollect(boolean reset) {
+        return new OtlpDoublePoint(reset ? total.sumThenReset() : total.sum());
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelDoubleValue.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelDoubleValue.java
index 6e1269e73a5..801f64b6c4f 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelDoubleValue.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelDoubleValue.java
@@ -5,15 +5,15 @@
 
 /** Always reports the latest value. */
 final class OtelDoubleValue extends OtelAggregator {
-  private volatile double value;
+    private volatile double value;
 
-  @Override
-  void doRecordDouble(double value) {
-    this.value = value;
-  }
+    @Override
+    void doRecordDouble(double value) {
+        this.value = value;
+    }
 
-  @Override
-  OtlpDataPoint doCollect(boolean reset) {
-    return new OtlpDoublePoint(value);
-  }
+    @Override
+    OtlpDataPoint doCollect(boolean reset) {
+        return new OtlpDoublePoint(value);
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelHistogramSketch.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelHistogramSketch.java
index 35092bc55a0..0c70dbee7e2 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelHistogramSketch.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelHistogramSketch.java
@@ -8,54 +8,54 @@
 
 /** Reports the histogram of values since the last reset. */
 final class OtelHistogramSketch extends OtelAggregator {
-  private final HistogramWithSum histogram;
+    private final HistogramWithSum histogram;
 
-  OtelHistogramSketch(List<Double> bucketBoundaries) {
-    this.histogram = Histogram.newHistogramWithSum(bucketBoundaries);
-  }
+    OtelHistogramSketch(List<Double> bucketBoundaries) {
+        this.histogram = Histogram.newHistogramWithSum(bucketBoundaries);
+    }
 
-  @Override
-  void doRecordDouble(double value) {
-    synchronized (histogram) {
-      histogram.accept(value);
+    @Override
+    void doRecordDouble(double value) {
+        synchronized (histogram) {
+            histogram.accept(value);
+        }
     }
-  }
 
-  @Override
-  void doRecordLong(long value) {
-    doRecordDouble(fixedPrecision(value));
-  }
+    @Override
+    void doRecordLong(long value) {
+        doRecordDouble(fixedPrecision(value));
+    }
 
-  @Override
-  OtlpDataPoint doCollect(boolean reset) {
-    double count;
-    List<Double> binBoundaries;
-    List<Double> binCounts;
-    double sum;
-    double min;
-    double max;
-    synchronized (histogram) {
-      count = histogram.getCount();
-      binBoundaries = histogram.getBinBoundaries();
-      binCounts = histogram.getBinCounts();
-      sum = histogram.getSum();
-      min = histogram.getMinValue();
-      max = histogram.getMaxValue();
-      if (reset) {
-        histogram.clear();
-      }
+    @Override
+    OtlpDataPoint doCollect(boolean reset) {
+        double count;
+        List<Double> binBoundaries;
+        List<Double> binCounts;
+        double sum;
+        double min;
+        double max;
+        synchronized (histogram) {
+            count = histogram.getCount();
+            binBoundaries = histogram.getBinBoundaries();
+            binCounts = histogram.getBinCounts();
+            sum = histogram.getSum();
+            min = histogram.getMinValue();
+            max = histogram.getMaxValue();
+            if (reset) {
+                histogram.clear();
+            }
+        }
+        return new OtlpHistogramPoint(count, binBoundaries, binCounts, sum, min, max);
     }
-    return new OtlpHistogramPoint(count, binBoundaries, binCounts, sum, min, max);
-  }
 
-  /** Truncate IEEE-754 floating-point value to 10 bits precision. */
-  private static double fixedPrecision(long value) {
-    long bits = Double.doubleToRawLongBits(value);
-    // the mask include 1 bit sign 11 bits exponent (0xfff)
-    // then we filter the mantissa to 10bits (0xff8) (9 bits as it has implicit value of 1)
-    // 10 bits precision (any value will be +/- 1/1024)
-    // https://en.wikipedia.org/wiki/Double-precision_floating-point_format
-    bits &= 0xfffff80000000000L;
-    return Double.longBitsToDouble(bits);
-  }
+    /** Truncate IEEE-754 floating-point value to 10 bits precision. */
+    private static double fixedPrecision(long value) {
+        long bits = Double.doubleToRawLongBits(value);
+        // the mask include 1 bit sign 11 bits exponent (0xfff)
+        // then we filter the mantissa to 10bits (0xff8) (9 bits as it has implicit value of 1)
+        // 10 bits precision (any value will be +/- 1/1024)
+        // https://en.wikipedia.org/wiki/Double-precision_floating-point_format
+        bits &= 0xfffff80000000000L;
+        return Double.longBitsToDouble(bits);
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelLongDelta.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelLongDelta.java
index a644ee6085d..8f45d0c9c01 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelLongDelta.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelLongDelta.java
@@ -5,21 +5,21 @@
 
 /** Reports the delta value since the last reset. */
 final class OtelLongDelta extends OtelAggregator {
-  private volatile long value;
-  private long lastValue;
+    private volatile long value;
+    private long lastValue;
 
-  @Override
-  void doRecordLong(long value) {
-    this.value = value;
-  }
+    @Override
+    void doRecordLong(long value) {
+        this.value = value;
+    }
 
-  @Override
-  OtlpDataPoint doCollect(boolean reset) {
-    long collectedValue = value;
-    long delta = collectedValue - lastValue;
-    if (reset) {
-      lastValue = collectedValue;
+    @Override
+    OtlpDataPoint doCollect(boolean reset) {
+        long collectedValue = value;
+        long delta = collectedValue - lastValue;
+        if (reset) {
+            lastValue = collectedValue;
+        }
+        return new OtlpLongPoint(delta);
     }
-    return new OtlpLongPoint(delta);
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelLongSum.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelLongSum.java
index 773e107a613..fcf73631dad 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelLongSum.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelLongSum.java
@@ -6,15 +6,15 @@
 
 /** Reports the sum of values since the last reset. */
 final class OtelLongSum extends OtelAggregator {
-  private final LongAdder total = new LongAdder();
+    private final LongAdder total = new LongAdder();
 
-  @Override
-  void doRecordLong(long value) {
-    total.add(value);
-  }
+    @Override
+    void doRecordLong(long value) {
+        total.add(value);
+    }
 
-  @Override
-  OtlpDataPoint doCollect(boolean reset) {
-    return new OtlpLongPoint(reset ? total.sumThenReset() : total.sum());
-  }
+    @Override
+    OtlpDataPoint doCollect(boolean reset) {
+        return new OtlpLongPoint(reset ? total.sumThenReset() : total.sum());
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelLongValue.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelLongValue.java
index 5f6967fca84..066c9c11eb5 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelLongValue.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelLongValue.java
@@ -5,15 +5,15 @@
 
 /** Always reports the latest value. */
 final class OtelLongValue extends OtelAggregator {
-  private volatile long value;
+    private volatile long value;
 
-  @Override
-  void doRecordLong(long value) {
-    this.value = value;
-  }
+    @Override
+    void doRecordLong(long value) {
+        this.value = value;
+    }
 
-  @Override
-  OtlpDataPoint doCollect(boolean reset) {
-    return new OtlpLongPoint(value);
-  }
+    @Override
+    OtlpDataPoint doCollect(boolean reset) {
+        return new OtlpLongPoint(value);
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelMetricRegistry.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelMetricRegistry.java
index 18c4e379e96..37d6308729d 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelMetricRegistry.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelMetricRegistry.java
@@ -12,63 +12,59 @@
 
 /** Tracks metric storage and observable callbacks by instrumentation scope. */
 public final class OtelMetricRegistry {
-  public static final OtelMetricRegistry INSTANCE = new OtelMetricRegistry();
+    public static final OtelMetricRegistry INSTANCE = new OtelMetricRegistry();
 
-  private final Map<OtelInstrumentationScope, Map<OtelInstrumentDescriptor, OtelMetricStorage>>
-      scopedStorage = new ConcurrentHashMap<>();
+    private final Map<OtelInstrumentationScope, Map<OtelInstrumentDescriptor, OtelMetricStorage>> scopedStorage =
+            new ConcurrentHashMap<>();
 
-  private final Map<OtelInstrumentationScope, List<OtelObservable>> scopedObservables =
-      new ConcurrentHashMap<>();
+    private final Map<OtelInstrumentationScope, List<OtelObservable>> scopedObservables = new ConcurrentHashMap<>();
 
-  public OtelMetricStorage registerStorage(
-      OtelInstrumentationScope instrumentationScope,
-      OtelInstrumentDescriptor descriptor,
-      Function<OtelInstrumentDescriptor, OtelMetricStorage> storageFactory) {
-    return scopedStorage
-        .computeIfAbsent(instrumentationScope, unused -> new ConcurrentHashMap<>())
-        .computeIfAbsent(descriptor, storageFactory);
-  }
-
-  public void registerObservable(
-      OtelInstrumentationScope instrumentationScope, OtelObservable observable) {
-    List<OtelObservable> observables =
-        scopedObservables.computeIfAbsent(instrumentationScope, unused -> new ArrayList<>());
-    synchronized (observables) {
-      observables.add(observable);
+    public OtelMetricStorage registerStorage(
+            OtelInstrumentationScope instrumentationScope,
+            OtelInstrumentDescriptor descriptor,
+            Function<OtelInstrumentDescriptor, OtelMetricStorage> storageFactory) {
+        return scopedStorage
+                .computeIfAbsent(instrumentationScope, unused -> new ConcurrentHashMap<>())
+                .computeIfAbsent(descriptor, storageFactory);
     }
-  }
 
-  public boolean unregisterObservable(
-      OtelInstrumentationScope instrumentationScope, OtelObservable observable) {
-    List<OtelObservable> observables = scopedObservables.get(instrumentationScope);
-    if (observables == null) {
-      return false;
+    public void registerObservable(OtelInstrumentationScope instrumentationScope, OtelObservable observable) {
+        List<OtelObservable> observables =
+                scopedObservables.computeIfAbsent(instrumentationScope, unused -> new ArrayList<>());
+        synchronized (observables) {
+            observables.add(observable);
+        }
     }
-    synchronized (observables) {
-      return observables.remove(observable);
+
+    public boolean unregisterObservable(OtelInstrumentationScope instrumentationScope, OtelObservable observable) {
+        List<OtelObservable> observables = scopedObservables.get(instrumentationScope);
+        if (observables == null) {
+            return false;
+        }
+        synchronized (observables) {
+            return observables.remove(observable);
+        }
     }
-  }
 
-  public void collectMetrics(OtlpMetricsVisitor visitor) {
-    scopedStorage.forEach(
-        (scope, storage) ->
-            collectScopedMetrics(scope, storage, visitor.visitScopedMetrics(scope)));
-  }
+    public void collectMetrics(OtlpMetricsVisitor visitor) {
+        scopedStorage.forEach(
+                (scope, storage) -> collectScopedMetrics(scope, storage, visitor.visitScopedMetrics(scope)));
+    }
 
-  private void collectScopedMetrics(
-      OtelInstrumentationScope instrumentationScope,
-      Map<OtelInstrumentDescriptor, OtelMetricStorage> storage,
-      OtlpScopedMetricsVisitor visitor) {
-    List<OtelObservable> observables = scopedObservables.get(instrumentationScope);
-    if (observables != null) {
-      // take local snapshot of current observables
-      List<OtelObservable> observablesCopy;
-      synchronized (observables) {
-        observablesCopy = new ArrayList<>(observables);
-      }
-      // must observe measurements outside of lock
-      observablesCopy.forEach(OtelObservable::observeMeasurements);
+    private void collectScopedMetrics(
+            OtelInstrumentationScope instrumentationScope,
+            Map<OtelInstrumentDescriptor, OtelMetricStorage> storage,
+            OtlpScopedMetricsVisitor visitor) {
+        List<OtelObservable> observables = scopedObservables.get(instrumentationScope);
+        if (observables != null) {
+            // take local snapshot of current observables
+            List<OtelObservable> observablesCopy;
+            synchronized (observables) {
+                observablesCopy = new ArrayList<>(observables);
+            }
+            // must observe measurements outside of lock
+            observablesCopy.forEach(OtelObservable::observeMeasurements);
+        }
+        storage.forEach((descriptor, s) -> s.collectMetric(visitor.visitMetric(descriptor)));
     }
-    storage.forEach((descriptor, s) -> s.collectMetric(visitor.visitMetric(descriptor)));
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelMetricStorage.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelMetricStorage.java
index 15e953016bf..a0b51614704 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelMetricStorage.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelMetricStorage.java
@@ -30,264 +30,261 @@
 
 /** Stores and aggregates metrics data for a given instrument. */
 public final class OtelMetricStorage {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtelMetricStorage.class);
-  private static final RatelimitedLogger RATELIMITED_LOGGER =
-      new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
-
-  private static final OtlpConfig.Temporality TEMPORALITY_PREFERENCE =
-      Config.get().getOtlpMetricsTemporalityPreference();
-
-  private static final int CARDINALITY_LIMIT = Config.get().getMetricsOtelCardinalityLimit();
-
-  private static final Attributes CARDINALITY_OVERFLOW =
-      Attributes.builder().put("otel.metric.overflow", true).build();
-
-  private static final Map<ClassLoader, BiConsumer<Object, OtlpAttributeVisitor>>
-      ATTRIBUTE_READERS = Collections.synchronizedMap(new WeakHashMap<>());
-
-  private final OtelInstrumentDescriptor descriptor;
-  private final boolean resetOnCollect;
-  private final boolean toggleRecordings;
-  private final Function<Object, OtelAggregator> aggregatorSupplier;
-  private volatile Recording currentRecording;
-
-  // only used with DELTA temporality
-  private Recording previousRecording;
-
-  private OtelMetricStorage(
-      OtelInstrumentDescriptor descriptor, Supplier<OtelAggregator> aggregatorSupplier) {
-    this.descriptor = descriptor;
-    this.resetOnCollect = shouldResetOnCollect(descriptor.getType());
-    // no need to toggle if not resetting on collect, or if it's an observable instrument
-    // (observables are always invoked within the collect cycle, so no concurrent writers)
-    this.toggleRecordings = resetOnCollect && !descriptor.getType().isObservable();
-    this.aggregatorSupplier = unused -> aggregatorSupplier.get();
-    this.currentRecording = new Recording();
-    if (toggleRecordings) {
-      this.previousRecording = new Recording();
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtelMetricStorage.class);
+    private static final RatelimitedLogger RATELIMITED_LOGGER = new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
+
+    private static final OtlpConfig.Temporality TEMPORALITY_PREFERENCE =
+            Config.get().getOtlpMetricsTemporalityPreference();
+
+    private static final int CARDINALITY_LIMIT = Config.get().getMetricsOtelCardinalityLimit();
+
+    private static final Attributes CARDINALITY_OVERFLOW =
+            Attributes.builder().put("otel.metric.overflow", true).build();
+
+    private static final Map<ClassLoader, BiConsumer<Object, OtlpAttributeVisitor>> ATTRIBUTE_READERS =
+            Collections.synchronizedMap(new WeakHashMap<>());
+
+    private final OtelInstrumentDescriptor descriptor;
+    private final boolean resetOnCollect;
+    private final boolean toggleRecordings;
+    private final Function<Object, OtelAggregator> aggregatorSupplier;
+    private volatile Recording currentRecording;
+
+    // only used with DELTA temporality
+    private Recording previousRecording;
+
+    private OtelMetricStorage(OtelInstrumentDescriptor descriptor, Supplier<OtelAggregator> aggregatorSupplier) {
+        this.descriptor = descriptor;
+        this.resetOnCollect = shouldResetOnCollect(descriptor.getType());
+        // no need to toggle if not resetting on collect, or if it's an observable instrument
+        // (observables are always invoked within the collect cycle, so no concurrent writers)
+        this.toggleRecordings = resetOnCollect && !descriptor.getType().isObservable();
+        this.aggregatorSupplier = unused -> aggregatorSupplier.get();
+        this.currentRecording = new Recording();
+        if (toggleRecordings) {
+            this.previousRecording = new Recording();
+        }
     }
-  }
-
-  /** Should storage reset on collect? (Depends on instrument type and temporality preference.) */
-  private static boolean shouldResetOnCollect(OtelInstrumentType type) {
-    switch (TEMPORALITY_PREFERENCE) {
-      case DELTA:
-        // gauges and up/down counters stay as cumulative
-        return type == HISTOGRAM || type == COUNTER || type == OBSERVABLE_COUNTER;
-      case LOWMEMORY:
-        // observable counters, gauges, and up/down counters stay as cumulative
-        return type == HISTOGRAM || type == COUNTER;
-      case CUMULATIVE:
-      default:
-        return false;
+
+    /** Should storage reset on collect? (Depends on instrument type and temporality preference.) */
+    private static boolean shouldResetOnCollect(OtelInstrumentType type) {
+        switch (TEMPORALITY_PREFERENCE) {
+            case DELTA:
+                // gauges and up/down counters stay as cumulative
+                return type == HISTOGRAM || type == COUNTER || type == OBSERVABLE_COUNTER;
+            case LOWMEMORY:
+                // observable counters, gauges, and up/down counters stay as cumulative
+                return type == HISTOGRAM || type == COUNTER;
+            case CUMULATIVE:
+            default:
+                return false;
+        }
     }
-  }
-
-  public static OtelMetricStorage newDoubleSumStorage(OtelInstrumentDescriptor descriptor) {
-    return new OtelMetricStorage(descriptor, OtelDoubleSum::new);
-  }
-
-  public static OtelMetricStorage newDoubleValueStorage(OtelInstrumentDescriptor descriptor) {
-    return new OtelMetricStorage(descriptor, OtelDoubleValue::new);
-  }
-
-  public static OtelMetricStorage newDoubleDeltaStorage(OtelInstrumentDescriptor descriptor) {
-    return new OtelMetricStorage(descriptor, OtelDoubleDelta::new);
-  }
-
-  public static OtelMetricStorage newLongSumStorage(OtelInstrumentDescriptor descriptor) {
-    return new OtelMetricStorage(descriptor, OtelLongSum::new);
-  }
-
-  public static OtelMetricStorage newLongValueStorage(OtelInstrumentDescriptor descriptor) {
-    return new OtelMetricStorage(descriptor, OtelLongValue::new);
-  }
-
-  public static OtelMetricStorage newLongDeltaStorage(OtelInstrumentDescriptor descriptor) {
-    return new OtelMetricStorage(descriptor, OtelLongDelta::new);
-  }
-
-  public static OtelMetricStorage newHistogramStorage(
-      OtelInstrumentDescriptor descriptor, List<Double> bucketBoundaries) {
-    return new OtelMetricStorage(descriptor, () -> new OtelHistogramSketch(bucketBoundaries));
-  }
-
-  public UTF8BytesString getInstrumentName() {
-    return descriptor.getName();
-  }
-
-  public OtelInstrumentDescriptor getDescriptor() {
-    return descriptor;
-  }
-
-  public void recordLong(long value, Object attributes) {
-    if (toggleRecordings) {
-      Recording recording = acquireRecordingForWrite();
-      try {
-        aggregator(recording.aggregators, attributes).recordLong(value);
-      } finally {
-        releaseRecordingAfterWrite(recording);
-      }
-    } else {
-      // no need to hold writers back if we are not resetting metrics on collect
-      aggregator(currentRecording.aggregators, attributes).recordLong(value);
+
+    public static OtelMetricStorage newDoubleSumStorage(OtelInstrumentDescriptor descriptor) {
+        return new OtelMetricStorage(descriptor, OtelDoubleSum::new);
     }
-  }
-
-  public void recordDouble(double value, Object attributes) {
-    if (Double.isNaN(value)) {
-      LOGGER.debug(
-          "Instrument {} has recorded measurement Not-a-Number (NaN) value with attributes {}. Dropping measurement.",
-          getInstrumentName(),
-          attributes);
-      return;
+
+    public static OtelMetricStorage newDoubleValueStorage(OtelInstrumentDescriptor descriptor) {
+        return new OtelMetricStorage(descriptor, OtelDoubleValue::new);
     }
-    if (toggleRecordings) {
-      Recording recording = acquireRecordingForWrite();
-      try {
-        aggregator(recording.aggregators, attributes).recordDouble(value);
-      } finally {
-        releaseRecordingAfterWrite(recording);
-      }
-    } else {
-      // no need to hold writers back if we are not resetting metrics on collect
-      aggregator(currentRecording.aggregators, attributes).recordDouble(value);
+
+    public static OtelMetricStorage newDoubleDeltaStorage(OtelInstrumentDescriptor descriptor) {
+        return new OtelMetricStorage(descriptor, OtelDoubleDelta::new);
     }
-  }
 
-  private OtelAggregator aggregator(Map<Object, OtelAggregator> aggregators, Object attributes) {
-    Objects.requireNonNull(attributes, "attributes");
-    OtelAggregator aggregator = aggregators.get(attributes);
-    if (null != aggregator) {
-      return aggregator;
+    public static OtelMetricStorage newLongSumStorage(OtelInstrumentDescriptor descriptor) {
+        return new OtelMetricStorage(descriptor, OtelLongSum::new);
     }
-    if (aggregators.size() >= CARDINALITY_LIMIT) {
-      RATELIMITED_LOGGER.warn(
-          "Instrument {} has exceeded the maximum allowed cardinality ({}).",
-          descriptor.getName(),
-          CARDINALITY_LIMIT);
-      attributes = CARDINALITY_OVERFLOW; // write data to overflow
+
+    public static OtelMetricStorage newLongValueStorage(OtelInstrumentDescriptor descriptor) {
+        return new OtelMetricStorage(descriptor, OtelLongValue::new);
     }
-    return aggregators.computeIfAbsent(attributes, aggregatorSupplier);
-  }
-
-  public void collectMetric(OtlpMetricVisitor visitor) {
-    if (resetOnCollect) {
-      doCollectAndReset(visitor);
-    } else {
-      doCollect(visitor);
+
+    public static OtelMetricStorage newLongDeltaStorage(OtelInstrumentDescriptor descriptor) {
+        return new OtelMetricStorage(descriptor, OtelLongDelta::new);
     }
-  }
-
-  public static void registerAttributeReader(
-      ClassLoader cl, BiConsumer<Object, OtlpAttributeVisitor> reader) {
-    ATTRIBUTE_READERS.put(cl, reader);
-  }
-
-  /** Collect data for CUMULATIVE temporality, keeping aggregators for future writes. */
-  private void doCollect(OtlpMetricVisitor visitor) {
-    // no need to hold writers back if we are not resetting metrics on collect
-    collectDataPoints(currentRecording.aggregators, visitor, OtelAggregator::collect);
-  }
-
-  /**
-   * Collect data for DELTA temporality, resetting aggregators for future writes.
-   *
-   * <p>Each collect request toggles between two groups of aggregators: current / previous.
-   */
-  private void doCollectAndReset(OtlpMetricVisitor visitor) {
-
-    // capture _current_ recording for collection, its aggregators will be reset at the end
-    final Recording recording = currentRecording;
-
-    if (toggleRecordings) {
-      // publish fresh recording for new writers, using aggregators from _previous_ recording
-      currentRecording = new Recording(previousRecording);
-
-      // notify writers that the captured recording is about to be reset
-      ACTIVITY.addAndGet(recording, RESET_PENDING);
-      while (recording.activity > 1) {
-        Thread.yield(); // other threads are still writing to this recording
-      }
+
+    public static OtelMetricStorage newHistogramStorage(
+            OtelInstrumentDescriptor descriptor, List<Double> bucketBoundaries) {
+        return new OtelMetricStorage(descriptor, () -> new OtelHistogramSketch(bucketBoundaries));
     }
 
-    Map<Object, OtelAggregator> aggregators = recording.aggregators;
+    public UTF8BytesString getInstrumentName() {
+        return descriptor.getName();
+    }
 
-    // avoid churn: only remove empty aggregators if we're over cardinality
-    if (aggregators.size() >= CARDINALITY_LIMIT) {
-      aggregators.values().removeIf(OtelAggregator::isEmpty);
+    public OtelInstrumentDescriptor getDescriptor() {
+        return descriptor;
     }
 
-    collectDataPoints(aggregators, visitor, OtelAggregator::collectAndReset);
+    public void recordLong(long value, Object attributes) {
+        if (toggleRecordings) {
+            Recording recording = acquireRecordingForWrite();
+            try {
+                aggregator(recording.aggregators, attributes).recordLong(value);
+            } finally {
+                releaseRecordingAfterWrite(recording);
+            }
+        } else {
+            // no need to hold writers back if we are not resetting metrics on collect
+            aggregator(currentRecording.aggregators, attributes).recordLong(value);
+        }
+    }
 
-    if (toggleRecordings) {
-      previousRecording = recording;
+    public void recordDouble(double value, Object attributes) {
+        if (Double.isNaN(value)) {
+            LOGGER.debug(
+                    "Instrument {} has recorded measurement Not-a-Number (NaN) value with attributes {}. Dropping measurement.",
+                    getInstrumentName(),
+                    attributes);
+            return;
+        }
+        if (toggleRecordings) {
+            Recording recording = acquireRecordingForWrite();
+            try {
+                aggregator(recording.aggregators, attributes).recordDouble(value);
+            } finally {
+                releaseRecordingAfterWrite(recording);
+            }
+        } else {
+            // no need to hold writers back if we are not resetting metrics on collect
+            aggregator(currentRecording.aggregators, attributes).recordDouble(value);
+        }
     }
-  }
-
-  private void collectDataPoints(
-      Map<Object, OtelAggregator> aggregators,
-      OtlpMetricVisitor visitor,
-      Function<OtelAggregator, OtlpDataPoint> collect) {
-    BiConsumer<Object, OtlpAttributeVisitor> attributesReader = null;
-    ClassLoader attributesClassLoader = null;
-
-    for (Map.Entry<Object, OtelAggregator> entry : aggregators.entrySet()) {
-      OtelAggregator aggregator = entry.getValue();
-      if (!aggregator.isEmpty()) {
-        Object attributes = entry.getKey();
-        ClassLoader cl = attributes.getClass().getClassLoader();
-        // avoid repeated lookups when attribute class-loader is same for all records
-        if (attributesReader == null || cl != attributesClassLoader) {
-          attributesReader = ATTRIBUTE_READERS.get(cl);
-          attributesClassLoader = cl;
+
+    private OtelAggregator aggregator(Map<Object, OtelAggregator> aggregators, Object attributes) {
+        Objects.requireNonNull(attributes, "attributes");
+        OtelAggregator aggregator = aggregators.get(attributes);
+        if (null != aggregator) {
+            return aggregator;
         }
-        if (attributesReader != null) {
-          attributesReader.accept(attributes, visitor);
+        if (aggregators.size() >= CARDINALITY_LIMIT) {
+            RATELIMITED_LOGGER.warn(
+                    "Instrument {} has exceeded the maximum allowed cardinality ({}).",
+                    descriptor.getName(),
+                    CARDINALITY_LIMIT);
+            attributes = CARDINALITY_OVERFLOW; // write data to overflow
         }
-        visitor.visitDataPoint(collect.apply(aggregator));
-      }
+        return aggregators.computeIfAbsent(attributes, aggregatorSupplier);
     }
-  }
-
-  private Recording acquireRecordingForWrite() {
-    // busy loop to limit impact on caller
-    while (true) {
-      final Recording recording = currentRecording;
-      // atomically notify collector of write activity and check state
-      if ((ACTIVITY.addAndGet(recording, WRITER) & RESET_PENDING) == 0) {
-        return recording;
-      } else {
-        // reset pending: rollback and check again for a fresh recording
-        ACTIVITY.addAndGet(recording, -WRITER);
-      }
+
+    public void collectMetric(OtlpMetricVisitor visitor) {
+        if (resetOnCollect) {
+            doCollectAndReset(visitor);
+        } else {
+            doCollect(visitor);
+        }
+    }
+
+    public static void registerAttributeReader(ClassLoader cl, BiConsumer<Object, OtlpAttributeVisitor> reader) {
+        ATTRIBUTE_READERS.put(cl, reader);
     }
-  }
 
-  private void releaseRecordingAfterWrite(Recording recording) {
-    ACTIVITY.addAndGet(recording, -WRITER);
-  }
+    /** Collect data for CUMULATIVE temporality, keeping aggregators for future writes. */
+    private void doCollect(OtlpMetricVisitor visitor) {
+        // no need to hold writers back if we are not resetting metrics on collect
+        collectDataPoints(currentRecording.aggregators, visitor, OtelAggregator::collect);
+    }
+
+    /**
+     * Collect data for DELTA temporality, resetting aggregators for future writes.
+     *
+     * <p>Each collect request toggles between two groups of aggregators: current / previous.
+     */
+    private void doCollectAndReset(OtlpMetricVisitor visitor) {
+
+        // capture _current_ recording for collection, its aggregators will be reset at the end
+        final Recording recording = currentRecording;
+
+        if (toggleRecordings) {
+            // publish fresh recording for new writers, using aggregators from _previous_ recording
+            currentRecording = new Recording(previousRecording);
+
+            // notify writers that the captured recording is about to be reset
+            ACTIVITY.addAndGet(recording, RESET_PENDING);
+            while (recording.activity > 1) {
+                Thread.yield(); // other threads are still writing to this recording
+            }
+        }
 
-  static final AtomicIntegerFieldUpdater<Recording> ACTIVITY =
-      AtomicIntegerFieldUpdater.newUpdater(Recording.class, "activity");
+        Map<Object, OtelAggregator> aggregators = recording.aggregators;
+
+        // avoid churn: only remove empty aggregators if we're over cardinality
+        if (aggregators.size() >= CARDINALITY_LIMIT) {
+            aggregators.values().removeIf(OtelAggregator::isEmpty);
+        }
 
-  // first activity bit indicates if this recording is about to be reset
-  private static final int RESET_PENDING = 1;
+        collectDataPoints(aggregators, visitor, OtelAggregator::collectAndReset);
 
-  // the other activity bits indicate how many threads are writing to it
-  private static final int WRITER = 2;
+        if (toggleRecordings) {
+            previousRecording = recording;
+        }
+    }
 
-  static final class Recording {
-    final Map<Object, OtelAggregator> aggregators;
+    private void collectDataPoints(
+            Map<Object, OtelAggregator> aggregators,
+            OtlpMetricVisitor visitor,
+            Function<OtelAggregator, OtlpDataPoint> collect) {
+        BiConsumer<Object, OtlpAttributeVisitor> attributesReader = null;
+        ClassLoader attributesClassLoader = null;
+
+        for (Map.Entry<Object, OtelAggregator> entry : aggregators.entrySet()) {
+            OtelAggregator aggregator = entry.getValue();
+            if (!aggregator.isEmpty()) {
+                Object attributes = entry.getKey();
+                ClassLoader cl = attributes.getClass().getClassLoader();
+                // avoid repeated lookups when attribute class-loader is same for all records
+                if (attributesReader == null || cl != attributesClassLoader) {
+                    attributesReader = ATTRIBUTE_READERS.get(cl);
+                    attributesClassLoader = cl;
+                }
+                if (attributesReader != null) {
+                    attributesReader.accept(attributes, visitor);
+                }
+                visitor.visitDataPoint(collect.apply(aggregator));
+            }
+        }
+    }
 
-    transient volatile int activity;
+    private Recording acquireRecordingForWrite() {
+        // busy loop to limit impact on caller
+        while (true) {
+            final Recording recording = currentRecording;
+            // atomically notify collector of write activity and check state
+            if ((ACTIVITY.addAndGet(recording, WRITER) & RESET_PENDING) == 0) {
+                return recording;
+            } else {
+                // reset pending: rollback and check again for a fresh recording
+                ACTIVITY.addAndGet(recording, -WRITER);
+            }
+        }
+    }
 
-    Recording() {
-      this.aggregators = new ConcurrentHashMap<>();
+    private void releaseRecordingAfterWrite(Recording recording) {
+        ACTIVITY.addAndGet(recording, -WRITER);
     }
 
-    Recording(Recording previous) {
-      this.aggregators = previous.aggregators;
+    static final AtomicIntegerFieldUpdater<Recording> ACTIVITY =
+            AtomicIntegerFieldUpdater.newUpdater(Recording.class, "activity");
+
+    // first activity bit indicates if this recording is about to be reset
+    private static final int RESET_PENDING = 1;
+
+    // the other activity bits indicate how many threads are writing to it
+    private static final int WRITER = 2;
+
+    static final class Recording {
+        final Map<Object, OtelAggregator> aggregators;
+
+        transient volatile int activity;
+
+        Recording() {
+            this.aggregators = new ConcurrentHashMap<>();
+        }
+
+        Recording(Recording previous) {
+            this.aggregators = previous.aggregators;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelObservable.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelObservable.java
index 47bda02b086..88baa371a77 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelObservable.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelObservable.java
@@ -1,5 +1,5 @@
 package datadog.trace.bootstrap.otel.metrics.data;
 
 public abstract class OtelObservable {
-  protected abstract void observeMeasurements();
+    protected abstract void observeMeasurements();
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelRunnableObservable.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelRunnableObservable.java
index 975d59f8826..9c698004247 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelRunnableObservable.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelRunnableObservable.java
@@ -7,22 +7,21 @@
 
 /** {@link OtelObservable} backed by a {@link Runnable}, for call sites that prefer a lambda. */
 public final class OtelRunnableObservable extends OtelObservable {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtelRunnableObservable.class);
-  private static final RatelimitedLogger RATELIMITED_LOGGER =
-      new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtelRunnableObservable.class);
+    private static final RatelimitedLogger RATELIMITED_LOGGER = new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
 
-  private final Runnable callback;
+    private final Runnable callback;
 
-  public OtelRunnableObservable(Runnable callback) {
-    this.callback = callback;
-  }
+    public OtelRunnableObservable(Runnable callback) {
+        this.callback = callback;
+    }
 
-  @Override
-  protected void observeMeasurements() {
-    try {
-      callback.run();
-    } catch (Throwable e) {
-      RATELIMITED_LOGGER.warn("An exception occurred invoking observable callback.", e);
+    @Override
+    protected void observeMeasurements() {
+        try {
+            callback.run();
+        } catch (Throwable e) {
+            RATELIMITED_LOGGER.warn("An exception occurred invoking observable callback.", e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/common/OtlpAttributeVisitor.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/common/OtlpAttributeVisitor.java
index 886ad3ac122..8b0d50dc9ec 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/common/OtlpAttributeVisitor.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/common/OtlpAttributeVisitor.java
@@ -3,21 +3,21 @@
 /** A visitor to visit OpenTelemetry attributes. */
 public interface OtlpAttributeVisitor {
 
-  int STRING_ATTRIBUTE = 0; // AttributeType.STRING
-  int BOOLEAN_ATTRIBUTE = 1; // AttributeType.BOOLEAN
-  int LONG_ATTRIBUTE = 2; // AttributeType.LONG
-  int DOUBLE_ATTRIBUTE = 3; // AttributeType.DOUBLE
-  int STRING_ARRAY_ATTRIBUTE = 4; // AttributeType.STRING_ARRAY
-  int BOOLEAN_ARRAY_ATTRIBUTE = 5; // AttributeType.BOOLEAN_ARRAY
-  int LONG_ARRAY_ATTRIBUTE = 6; // AttributeType.LONG_ARRAY
-  int DOUBLE_ARRAY_ATTRIBUTE = 7; // AttributeType.DOUBLE_ARRAY
+    int STRING_ATTRIBUTE = 0; // AttributeType.STRING
+    int BOOLEAN_ATTRIBUTE = 1; // AttributeType.BOOLEAN
+    int LONG_ATTRIBUTE = 2; // AttributeType.LONG
+    int DOUBLE_ATTRIBUTE = 3; // AttributeType.DOUBLE
+    int STRING_ARRAY_ATTRIBUTE = 4; // AttributeType.STRING_ARRAY
+    int BOOLEAN_ARRAY_ATTRIBUTE = 5; // AttributeType.BOOLEAN_ARRAY
+    int LONG_ARRAY_ATTRIBUTE = 6; // AttributeType.LONG_ARRAY
+    int DOUBLE_ARRAY_ATTRIBUTE = 7; // AttributeType.DOUBLE_ARRAY
 
-  /**
-   * Visits an attribute.
-   *
-   * @param type the attribute type
-   * @param key the attribute key
-   * @param value the attribute value
-   */
-  void visitAttribute(int type, String key, Object value);
+    /**
+     * Visits an attribute.
+     *
+     * @param type the attribute type
+     * @param key the attribute key
+     * @param value the attribute value
+     */
+    void visitAttribute(int type, String key, Object value);
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/logs/OtlpLogRecord.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/logs/OtlpLogRecord.java
index c4aa16c5461..ea3c1c1a647 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/logs/OtlpLogRecord.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/logs/OtlpLogRecord.java
@@ -7,35 +7,44 @@
 
 public final class OtlpLogRecord {
 
-  public final OtelInstrumentationScope instrumentationScope;
-
-  public final long timestampNanos;
-  public final long observedNanos;
-  public final int severityNumber;
-  @Nullable public final String severityText;
-  @Nullable public final String body;
-  public final Map<?, ?> attributes;
-  @Nullable public final AgentSpanContext spanContext;
-  @Nullable public final String eventName;
-
-  public OtlpLogRecord(
-      OtelInstrumentationScope instrumentationScope,
-      long timestampNanos,
-      long observedNanos,
-      int severityNumber,
-      @Nullable String severityText,
-      @Nullable String body,
-      Map<?, ?> attributes,
-      @Nullable AgentSpanContext spanContext,
-      @Nullable String eventName) {
-    this.instrumentationScope = instrumentationScope;
-    this.timestampNanos = timestampNanos;
-    this.observedNanos = observedNanos;
-    this.severityNumber = severityNumber;
-    this.severityText = severityText;
-    this.body = body;
-    this.attributes = attributes;
-    this.spanContext = spanContext;
-    this.eventName = eventName;
-  }
+    public final OtelInstrumentationScope instrumentationScope;
+
+    public final long timestampNanos;
+    public final long observedNanos;
+    public final int severityNumber;
+
+    @Nullable
+    public final String severityText;
+
+    @Nullable
+    public final String body;
+
+    public final Map<?, ?> attributes;
+
+    @Nullable
+    public final AgentSpanContext spanContext;
+
+    @Nullable
+    public final String eventName;
+
+    public OtlpLogRecord(
+            OtelInstrumentationScope instrumentationScope,
+            long timestampNanos,
+            long observedNanos,
+            int severityNumber,
+            @Nullable String severityText,
+            @Nullable String body,
+            Map<?, ?> attributes,
+            @Nullable AgentSpanContext spanContext,
+            @Nullable String eventName) {
+        this.instrumentationScope = instrumentationScope;
+        this.timestampNanos = timestampNanos;
+        this.observedNanos = observedNanos;
+        this.severityNumber = severityNumber;
+        this.severityText = severityText;
+        this.body = body;
+        this.attributes = attributes;
+        this.spanContext = spanContext;
+        this.eventName = eventName;
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/logs/OtlpLogsVisitor.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/logs/OtlpLogsVisitor.java
index e77f05d936a..44604ce6689 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/logs/OtlpLogsVisitor.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/logs/OtlpLogsVisitor.java
@@ -4,6 +4,6 @@
 
 /** A visitor to visit OpenTelemetry logs. */
 public interface OtlpLogsVisitor {
-  /** Visits logs produced by an instrumentation scope. */
-  OtlpScopedLogsVisitor visitScopedLogs(OtelInstrumentationScope scope);
+    /** Visits logs produced by an instrumentation scope. */
+    OtlpScopedLogsVisitor visitScopedLogs(OtelInstrumentationScope scope);
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/logs/OtlpScopedLogsVisitor.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/logs/OtlpScopedLogsVisitor.java
index d03a5e4e4ac..c21b90eb7ce 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/logs/OtlpScopedLogsVisitor.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/logs/OtlpScopedLogsVisitor.java
@@ -5,9 +5,9 @@
 /** A visitor to visit log records produced by an instrumentation scope. */
 public interface OtlpScopedLogsVisitor extends OtlpAttributeVisitor {
 
-  /** Visits an attribute of the upcoming log record. */
-  void visitAttribute(int type, String key, Object value);
+    /** Visits an attribute of the upcoming log record. */
+    void visitAttribute(int type, String key, Object value);
 
-  /** Visits a log record. */
-  void visitLogRecord(OtlpLogRecord logRecord);
+    /** Visits a log record. */
+    void visitLogRecord(OtlpLogRecord logRecord);
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpDoublePoint.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpDoublePoint.java
index 135ae0d4caa..f81aa1de2c1 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpDoublePoint.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpDoublePoint.java
@@ -1,9 +1,9 @@
 package datadog.trace.bootstrap.otlp.metrics;
 
 public final class OtlpDoublePoint extends OtlpDataPoint {
-  public final double value;
+    public final double value;
 
-  public OtlpDoublePoint(double value) {
-    this.value = value;
-  }
+    public OtlpDoublePoint(double value) {
+        this.value = value;
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpHistogramPoint.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpHistogramPoint.java
index 3d6be508253..38945ead620 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpHistogramPoint.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpHistogramPoint.java
@@ -3,25 +3,25 @@
 import java.util.List;
 
 public final class OtlpHistogramPoint extends OtlpDataPoint {
-  public final double count;
-  public final List<Double> bucketBoundaries;
-  public final List<Double> bucketCounts;
-  public final double sum;
-  public final double min;
-  public final double max;
+    public final double count;
+    public final List<Double> bucketBoundaries;
+    public final List<Double> bucketCounts;
+    public final double sum;
+    public final double min;
+    public final double max;
 
-  public OtlpHistogramPoint(
-      double count,
-      List<Double> bucketBoundaries,
-      List<Double> bucketCounts,
-      double sum,
-      double min,
-      double max) {
-    this.count = count;
-    this.bucketBoundaries = bucketBoundaries;
-    this.bucketCounts = bucketCounts;
-    this.sum = sum;
-    this.min = min;
-    this.max = max;
-  }
+    public OtlpHistogramPoint(
+            double count,
+            List<Double> bucketBoundaries,
+            List<Double> bucketCounts,
+            double sum,
+            double min,
+            double max) {
+        this.count = count;
+        this.bucketBoundaries = bucketBoundaries;
+        this.bucketCounts = bucketCounts;
+        this.sum = sum;
+        this.min = min;
+        this.max = max;
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpLongPoint.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpLongPoint.java
index 831c8949f3f..d931e129082 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpLongPoint.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpLongPoint.java
@@ -1,9 +1,9 @@
 package datadog.trace.bootstrap.otlp.metrics;
 
 public final class OtlpLongPoint extends OtlpDataPoint {
-  public final long value;
+    public final long value;
 
-  public OtlpLongPoint(long value) {
-    this.value = value;
-  }
+    public OtlpLongPoint(long value) {
+        this.value = value;
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpMetricVisitor.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpMetricVisitor.java
index b7a2b2959a2..dc8487a051f 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpMetricVisitor.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpMetricVisitor.java
@@ -8,9 +8,9 @@
  * <p>Methods must be called in the following order: ( visitAttribute* visitDataPoint )*
  */
 public interface OtlpMetricVisitor extends OtlpAttributeVisitor {
-  /** Visits an attribute of the upcoming data point. */
-  void visitAttribute(int type, String key, Object value);
+    /** Visits an attribute of the upcoming data point. */
+    void visitAttribute(int type, String key, Object value);
 
-  /** Visits a data point in the metric. */
-  void visitDataPoint(OtlpDataPoint point);
+    /** Visits a data point in the metric. */
+    void visitDataPoint(OtlpDataPoint point);
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpMetricsVisitor.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpMetricsVisitor.java
index 8653d052f0e..5ca0b6a3d14 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpMetricsVisitor.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpMetricsVisitor.java
@@ -4,6 +4,6 @@
 
 /** A visitor to visit OpenTelemetry metrics. */
 public interface OtlpMetricsVisitor {
-  /** Visits metrics produced by an instrumentation scope. */
-  OtlpScopedMetricsVisitor visitScopedMetrics(OtelInstrumentationScope scope);
+    /** Visits metrics produced by an instrumentation scope. */
+    OtlpScopedMetricsVisitor visitScopedMetrics(OtelInstrumentationScope scope);
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpScopedMetricsVisitor.java b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpScopedMetricsVisitor.java
index 6cf8e85c0fb..f64c1873f43 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpScopedMetricsVisitor.java
+++ b/dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otlp/metrics/OtlpScopedMetricsVisitor.java
@@ -4,6 +4,6 @@
 
 /** A visitor to visit metrics produced by an instrumentation scope. */
 public interface OtlpScopedMetricsVisitor {
-  /** Visits a metric in the instrumentation scope. */
-  OtlpMetricVisitor visitMetric(OtelInstrumentDescriptor descriptor);
+    /** Visits a metric in the instrumentation scope. */
+    OtlpMetricVisitor visitMetric(OtelInstrumentDescriptor descriptor);
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/baggage/OtelBaggage.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/baggage/OtelBaggage.java
index 0d2fba36ad5..414f5003689 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/baggage/OtelBaggage.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/baggage/OtelBaggage.java
@@ -14,84 +14,84 @@
 
 @ParametersAreNonnullByDefault
 public class OtelBaggage implements Baggage {
-  private final datadog.trace.bootstrap.instrumentation.api.Baggage delegate;
+    private final datadog.trace.bootstrap.instrumentation.api.Baggage delegate;
 
-  public OtelBaggage(datadog.trace.bootstrap.instrumentation.api.Baggage delegate) {
-    this.delegate = delegate;
-  }
-
-  public OtelBaggage(Map<String, String> items) {
-    this(datadog.trace.bootstrap.instrumentation.api.Baggage.create(items));
-  }
-
-  @Override
-  public int size() {
-    return delegate.asMap().size();
-  }
+    public OtelBaggage(datadog.trace.bootstrap.instrumentation.api.Baggage delegate) {
+        this.delegate = delegate;
+    }
 
-  @Override
-  public void forEach(BiConsumer<? super String, ? super BaggageEntry> consumer) {
-    for (Map.Entry<String, String> entry : delegate.asMap().entrySet()) {
-      consumer.accept(entry.getKey(), new ValueOnly(entry));
+    public OtelBaggage(Map<String, String> items) {
+        this(datadog.trace.bootstrap.instrumentation.api.Baggage.create(items));
     }
-  }
-
-  @Override
-  public Map<String, BaggageEntry> asMap() {
-    return delegate.asMap().entrySet().stream().collect(toMap(Map.Entry::getKey, ValueOnly::new));
-  }
-
-  @Nullable
-  @Override
-  public String getEntryValue(String key) {
-    return delegate.asMap().get(key);
-  }
-
-  @Nullable
-  @Override
-  public BaggageEntry getEntry(String key) {
-    String value = getEntryValue(key);
-    return value != null ? new ValueOnly(value) : null;
-  }
-
-  @Override
-  public BaggageBuilder toBuilder() {
-    return new OtelBaggageBuilder(delegate.asMap());
-  }
-
-  public datadog.trace.bootstrap.instrumentation.api.Baggage asAgentBaggage() {
-    return delegate;
-  }
-
-  static class ValueOnly implements BaggageEntry {
-    private final String value;
-
-    ValueOnly(String value) {
-      this.value = value;
+
+    @Override
+    public int size() {
+        return delegate.asMap().size();
     }
 
-    ValueOnly(Map.Entry<String, String> entry) {
-      this(entry.getValue());
+    @Override
+    public void forEach(BiConsumer<? super String, ? super BaggageEntry> consumer) {
+        for (Map.Entry<String, String> entry : delegate.asMap().entrySet()) {
+            consumer.accept(entry.getKey(), new ValueOnly(entry));
+        }
     }
 
     @Override
-    public String getValue() {
-      return value;
+    public Map<String, BaggageEntry> asMap() {
+        return delegate.asMap().entrySet().stream().collect(toMap(Map.Entry::getKey, ValueOnly::new));
     }
 
+    @Nullable
     @Override
-    public BaggageEntryMetadata getMetadata() {
-      return BaggageEntryMetadata.empty();
+    public String getEntryValue(String key) {
+        return delegate.asMap().get(key);
     }
 
+    @Nullable
     @Override
-    public int hashCode() {
-      return Objects.hashCode(value);
+    public BaggageEntry getEntry(String key) {
+        String value = getEntryValue(key);
+        return value != null ? new ValueOnly(value) : null;
     }
 
     @Override
-    public final boolean equals(Object o) {
-      return (o instanceof ValueOnly) && Objects.equals(value, ((ValueOnly) o).value);
+    public BaggageBuilder toBuilder() {
+        return new OtelBaggageBuilder(delegate.asMap());
+    }
+
+    public datadog.trace.bootstrap.instrumentation.api.Baggage asAgentBaggage() {
+        return delegate;
+    }
+
+    static class ValueOnly implements BaggageEntry {
+        private final String value;
+
+        ValueOnly(String value) {
+            this.value = value;
+        }
+
+        ValueOnly(Map.Entry<String, String> entry) {
+            this(entry.getValue());
+        }
+
+        @Override
+        public String getValue() {
+            return value;
+        }
+
+        @Override
+        public BaggageEntryMetadata getMetadata() {
+            return BaggageEntryMetadata.empty();
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hashCode(value);
+        }
+
+        @Override
+        public final boolean equals(Object o) {
+            return (o instanceof ValueOnly) && Objects.equals(value, ((ValueOnly) o).value);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/baggage/OtelBaggageBuilder.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/baggage/OtelBaggageBuilder.java
index bc456d7f8f1..bc7d3deda13 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/baggage/OtelBaggageBuilder.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/baggage/OtelBaggageBuilder.java
@@ -10,31 +10,30 @@
 
 @ParametersAreNonnullByDefault
 public class OtelBaggageBuilder implements BaggageBuilder {
-  private final Map<String, String> items;
+    private final Map<String, String> items;
 
-  public OtelBaggageBuilder(Map<String, String> items) {
-    this.items = new HashMap<>(items);
-  }
+    public OtelBaggageBuilder(Map<String, String> items) {
+        this.items = new HashMap<>(items);
+    }
 
-  @Override
-  public BaggageBuilder put(
-      @Nullable String key, @Nullable String value, BaggageEntryMetadata ignore) {
-    if (key != null && value != null) {
-      items.put(key, value);
+    @Override
+    public BaggageBuilder put(@Nullable String key, @Nullable String value, BaggageEntryMetadata ignore) {
+        if (key != null && value != null) {
+            items.put(key, value);
+        }
+        return this;
     }
-    return this;
-  }
 
-  @Override
-  public BaggageBuilder remove(@Nullable String key) {
-    if (key != null) {
-      items.remove(key);
+    @Override
+    public BaggageBuilder remove(@Nullable String key) {
+        if (key != null) {
+            items.remove(key);
+        }
+        return this;
     }
-    return this;
-  }
 
-  @Override
-  public Baggage build() {
-    return new OtelBaggage(new HashMap<>(items));
-  }
+    @Override
+    public Baggage build() {
+        return new OtelBaggage(new HashMap<>(items));
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/OtelContext.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/OtelContext.java
index ba4199b0c51..173979b80cc 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/OtelContext.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/OtelContext.java
@@ -17,123 +17,121 @@
 @ParametersAreNonnullByDefault
 public class OtelContext implements Context {
 
-  /** Overridden root context. */
-  public static final Context ROOT = new OtelContext(datadog.context.Context.root());
-
-  private static final String OTEL_CONTEXT_BAGGAGE_KEY = "opentelemetry-baggage-key";
-  private static final String OTEL_CONTEXT_SPAN_KEY = "opentelemetry-trace-span-key";
-  private static final String OTEL_CONTEXT_ROOT_SPAN_KEY = "opentelemetry-traces-local-root-span";
-
-  /** Records the keys needed to access the delegate context, mapped by key name. */
-  private static final Map<ContextKey<?>, datadog.context.ContextKey<?>> DELEGATE_KEYS =
-      new ConcurrentHashMap<>();
-
-  private final datadog.context.Context delegate;
-
-  public OtelContext(datadog.context.Context delegate) {
-    this.delegate = delegate;
-  }
-
-  public static Context current() {
-    return new OtelContext(datadog.context.Context.current());
-  }
-
-  @Override
-  public Scope makeCurrent() {
-    return new OtelScope(Context.super.makeCurrent(), delegate.attach());
-  }
-
-  @Nullable
-  @Override
-  public <V> V get(ContextKey<V> key) {
-    if (OTEL_CONTEXT_SPAN_KEY.equals(key.toString())) {
-      AgentSpan span = AgentSpan.fromContext(delegate);
-      if (span != null && span.isValid()) {
-        return (V) toOtelSpan(span);
-      }
-      // fall-through and check for non-datadog span data
-    } else if (OTEL_CONTEXT_ROOT_SPAN_KEY.equals(key.toString())) {
-      AgentSpan span = AgentSpan.fromContext(delegate);
-      if (span != null && span.isValid()) {
-        return (V) toOtelSpan(span.getLocalRootSpan());
-      }
-      // fall-through and check for non-datadog span data
-    } else if (OTEL_CONTEXT_BAGGAGE_KEY.equals(key.toString())) {
-      Baggage baggage = Baggage.fromContext(delegate);
-      if (baggage != null) {
-        return (V) new OtelBaggage(baggage);
-      }
-      // fall-through and check for non-datadog baggage
+    /** Overridden root context. */
+    public static final Context ROOT = new OtelContext(datadog.context.Context.root());
+
+    private static final String OTEL_CONTEXT_BAGGAGE_KEY = "opentelemetry-baggage-key";
+    private static final String OTEL_CONTEXT_SPAN_KEY = "opentelemetry-trace-span-key";
+    private static final String OTEL_CONTEXT_ROOT_SPAN_KEY = "opentelemetry-traces-local-root-span";
+
+    /** Records the keys needed to access the delegate context, mapped by key name. */
+    private static final Map<ContextKey<?>, datadog.context.ContextKey<?>> DELEGATE_KEYS = new ConcurrentHashMap<>();
+
+    private final datadog.context.Context delegate;
+
+    public OtelContext(datadog.context.Context delegate) {
+        this.delegate = delegate;
+    }
+
+    public static Context current() {
+        return new OtelContext(datadog.context.Context.current());
+    }
+
+    @Override
+    public Scope makeCurrent() {
+        return new OtelScope(Context.super.makeCurrent(), delegate.attach());
+    }
+
+    @Nullable
+    @Override
+    public <V> V get(ContextKey<V> key) {
+        if (OTEL_CONTEXT_SPAN_KEY.equals(key.toString())) {
+            AgentSpan span = AgentSpan.fromContext(delegate);
+            if (span != null && span.isValid()) {
+                return (V) toOtelSpan(span);
+            }
+            // fall-through and check for non-datadog span data
+        } else if (OTEL_CONTEXT_ROOT_SPAN_KEY.equals(key.toString())) {
+            AgentSpan span = AgentSpan.fromContext(delegate);
+            if (span != null && span.isValid()) {
+                return (V) toOtelSpan(span.getLocalRootSpan());
+            }
+            // fall-through and check for non-datadog span data
+        } else if (OTEL_CONTEXT_BAGGAGE_KEY.equals(key.toString())) {
+            Baggage baggage = Baggage.fromContext(delegate);
+            if (baggage != null) {
+                return (V) new OtelBaggage(baggage);
+            }
+            // fall-through and check for non-datadog baggage
+        }
+        return (V) delegate.get(delegateKey(key));
+    }
+
+    @Override
+    public <V> Context with(ContextKey<V> key, V value) {
+        if (OTEL_CONTEXT_SPAN_KEY.equals(key.toString())) {
+            if (value instanceof OtelSpan) {
+                AgentSpan span = ((OtelSpan) value).asAgentSpan();
+                return new OtelContext(delegate.with(span));
+            }
+            // fall-through and store as non-datadog span data
+        } else if (OTEL_CONTEXT_BAGGAGE_KEY.equals(key.toString())) {
+            if (value instanceof OtelBaggage) {
+                Baggage baggage = ((OtelBaggage) value).asAgentBaggage();
+                return new OtelContext(delegate.with(baggage));
+            } else if (value instanceof io.opentelemetry.api.baggage.Baggage) {
+                Baggage baggage = Baggage.empty();
+                // transfer baggage to our internal container for propagation purposes
+                ((io.opentelemetry.api.baggage.Baggage) value).forEach((k, b) -> baggage.addItem(k, b.getValue()));
+                return new OtelContext(delegate.with(baggage));
+            }
+            // fall-through and store as non-datadog baggage
+        }
+        return new OtelContext(delegate.with(delegateKey(key), value));
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        return delegate.equals(((OtelContext) o).delegate);
     }
-    return (V) delegate.get(delegateKey(key));
-  }
-
-  @Override
-  public <V> Context with(ContextKey<V> key, V value) {
-    if (OTEL_CONTEXT_SPAN_KEY.equals(key.toString())) {
-      if (value instanceof OtelSpan) {
-        AgentSpan span = ((OtelSpan) value).asAgentSpan();
-        return new OtelContext(delegate.with(span));
-      }
-      // fall-through and store as non-datadog span data
-    } else if (OTEL_CONTEXT_BAGGAGE_KEY.equals(key.toString())) {
-      if (value instanceof OtelBaggage) {
-        Baggage baggage = ((OtelBaggage) value).asAgentBaggage();
-        return new OtelContext(delegate.with(baggage));
-      } else if (value instanceof io.opentelemetry.api.baggage.Baggage) {
-        Baggage baggage = Baggage.empty();
-        // transfer baggage to our internal container for propagation purposes
-        ((io.opentelemetry.api.baggage.Baggage) value)
-            .forEach((k, b) -> baggage.addItem(k, b.getValue()));
-        return new OtelContext(delegate.with(baggage));
-      }
-      // fall-through and store as non-datadog baggage
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return "OtelContext{" + "delegate=" + delegate + '}';
     }
-    return new OtelContext(delegate.with(delegateKey(key), value));
-  }
 
-  @Override
-  public boolean equals(Object o) {
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+    /**
+     * Returns the underlying context.
+     *
+     * @return The underlying context.
+     */
+    public datadog.context.Context asContext() {
+        return this.delegate;
     }
-    return delegate.equals(((OtelContext) o).delegate);
-  }
-
-  @Override
-  public int hashCode() {
-    return delegate.hashCode();
-  }
-
-  @Override
-  public String toString() {
-    return "OtelContext{" + "delegate=" + delegate + '}';
-  }
-
-  /**
-   * Returns the underlying context.
-   *
-   * @return The underlying context.
-   */
-  public datadog.context.Context asContext() {
-    return this.delegate;
-  }
-
-  private static datadog.context.ContextKey delegateKey(ContextKey key) {
-    return DELEGATE_KEYS.computeIfAbsent(key, OtelContext::mapByKeyName);
-  }
-
-  private static datadog.context.ContextKey mapByKeyName(ContextKey key) {
-    return datadog.context.ContextKey.named(key.toString());
-  }
-
-  private static OtelSpan toOtelSpan(AgentSpan span) {
-    if (span instanceof AttachableWrapper) {
-      Object wrapper = ((AttachableWrapper) span).getWrapper();
-      if (wrapper instanceof OtelSpan) {
-        return (OtelSpan) wrapper;
-      }
+
+    private static datadog.context.ContextKey delegateKey(ContextKey key) {
+        return DELEGATE_KEYS.computeIfAbsent(key, OtelContext::mapByKeyName);
+    }
+
+    private static datadog.context.ContextKey mapByKeyName(ContextKey key) {
+        return datadog.context.ContextKey.named(key.toString());
+    }
+
+    private static OtelSpan toOtelSpan(AgentSpan span) {
+        if (span instanceof AttachableWrapper) {
+            Object wrapper = ((AttachableWrapper) span).getWrapper();
+            if (wrapper instanceof OtelSpan) {
+                return (OtelSpan) wrapper;
+            }
+        }
+        return new OtelSpan(span);
     }
-    return new OtelSpan(span);
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/OtelScope.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/OtelScope.java
index db28fa46606..be0c0d76af7 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/OtelScope.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/OtelScope.java
@@ -4,17 +4,17 @@
 import io.opentelemetry.context.Scope;
 
 public class OtelScope implements Scope {
-  private final Scope scope;
-  private final ContextScope delegate;
+    private final Scope scope;
+    private final ContextScope delegate;
 
-  public OtelScope(Scope scope, ContextScope delegate) {
-    this.scope = scope;
-    this.delegate = delegate;
-  }
+    public OtelScope(Scope scope, ContextScope delegate) {
+        this.scope = scope;
+        this.delegate = delegate;
+    }
 
-  @Override
-  public void close() {
-    delegate.close();
-    scope.close();
-  }
+    @Override
+    public void close() {
+        delegate.close();
+        scope.close();
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/propagation/AgentTextMapPropagator.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/propagation/AgentTextMapPropagator.java
index ae7d708b5e4..8c3445af72e 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/propagation/AgentTextMapPropagator.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/propagation/AgentTextMapPropagator.java
@@ -23,64 +23,59 @@
 @ParametersAreNonnullByDefault
 public class AgentTextMapPropagator implements TextMapPropagator {
 
-  @Override
-  public Collection<String> fields() {
-    return PropagationUtils.KNOWN_PROPAGATION_HEADERS;
-  }
-
-  @Override
-  public <C> void inject(Context context, @Nullable C carrier, TextMapSetter<C> setter) {
-    if (carrier == null) {
-      return;
+    @Override
+    public Collection<String> fields() {
+        return PropagationUtils.KNOWN_PROPAGATION_HEADERS;
     }
-    defaultPropagator().inject(convertContext(context), carrier, setter::set);
-  }
 
-  @Override
-  public <C> Context extract(Context context, @Nullable C carrier, TextMapGetter<C> getter) {
-    if (carrier == null) {
-      return context;
+    @Override
+    public <C> void inject(Context context, @Nullable C carrier, TextMapSetter<C> setter) {
+        if (carrier == null) {
+            return;
+        }
+        defaultPropagator().inject(convertContext(context), carrier, setter::set);
     }
-    datadog.context.Context extracted =
-        defaultPropagator()
-            .extract(
-                convertContext(context),
-                carrier,
-                (carrier1, classifier) -> {
-                  for (String key : getter.keys(carrier1)) {
-                    classifier.accept(key, getter.get(carrier1, key));
-                  }
+
+    @Override
+    public <C> Context extract(Context context, @Nullable C carrier, TextMapGetter<C> getter) {
+        if (carrier == null) {
+            return context;
+        }
+        datadog.context.Context extracted = defaultPropagator()
+                .extract(convertContext(context), carrier, (carrier1, classifier) -> {
+                    for (String key : getter.keys(carrier1)) {
+                        classifier.accept(key, getter.get(carrier1, key));
+                    }
                 });
-    return new OtelContext(extracted);
-  }
+        return new OtelContext(extracted);
+    }
 
-  private static datadog.context.Context convertContext(Context context) {
-    // Try to get the underlying context when injecting a Datadog context
-    if (context instanceof OtelContext) {
-      return ((OtelContext) context).asContext();
+    private static datadog.context.Context convertContext(Context context) {
+        // Try to get the underlying context when injecting a Datadog context
+        if (context instanceof OtelContext) {
+            return ((OtelContext) context).asContext();
+        }
+        // Otherwise, fallback to extracting limited tracing context and recreating an OTel context from
+        AgentSpanContext extract = OtelExtractedContext.extract(context);
+        return AgentSpan.fromSpanContext(extract);
     }
-    // Otherwise, fallback to extracting limited tracing context and recreating an OTel context from
-    AgentSpanContext extract = OtelExtractedContext.extract(context);
-    return AgentSpan.fromSpanContext(extract);
-  }
 
-  /**
-   * Extracts tracestate if {@code tracestate} header is present and extracted context comes from
-   * {@link TracePropagationStyle#TRACECONTEXT}
-   *
-   * @param extracted The extracted context.
-   * @param carrier The context carrier.
-   * @param getter The context getter.
-   * @param <C> The carrier type.
-   * @return The extracted tracestate, or an empty tracestate otherwise.
-   */
-  private static <C> TraceState extractTraceState(
-      Extracted extracted, C carrier, TextMapGetter<C> getter) {
-    String header;
-    return extracted instanceof TagContext
-            && TRACECONTEXT.equals(((TagContext) extracted).getPropagationStyle())
-            && (header = getter.get(carrier, "tracestate")) != null
-        ? TraceStateHelper.decodeHeader(header)
-        : TraceState.getDefault();
-  }
+    /**
+     * Extracts tracestate if {@code tracestate} header is present and extracted context comes from
+     * {@link TracePropagationStyle#TRACECONTEXT}
+     *
+     * @param extracted The extracted context.
+     * @param carrier The context carrier.
+     * @param getter The context getter.
+     * @param <C> The carrier type.
+     * @return The extracted tracestate, or an empty tracestate otherwise.
+     */
+    private static <C> TraceState extractTraceState(Extracted extracted, C carrier, TextMapGetter<C> getter) {
+        String header;
+        return extracted instanceof TagContext
+                        && TRACECONTEXT.equals(((TagContext) extracted).getPropagationStyle())
+                        && (header = getter.get(carrier, "tracestate")) != null
+                ? TraceStateHelper.decodeHeader(header)
+                : TraceState.getDefault();
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/propagation/OtelContextPropagators.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/propagation/OtelContextPropagators.java
index 682ebd9ce20..c9e093d55a4 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/propagation/OtelContextPropagators.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/propagation/OtelContextPropagators.java
@@ -4,11 +4,11 @@
 import io.opentelemetry.context.propagation.TextMapPropagator;
 
 public class OtelContextPropagators implements ContextPropagators {
-  public static final ContextPropagators INSTANCE = new OtelContextPropagators();
-  private final TextMapPropagator propagator = new AgentTextMapPropagator();
+    public static final ContextPropagators INSTANCE = new OtelContextPropagators();
+    private final TextMapPropagator propagator = new AgentTextMapPropagator();
 
-  @Override
-  public TextMapPropagator getTextMapPropagator() {
-    return this.propagator;
-  }
+    @Override
+    public TextMapPropagator getTextMapPropagator() {
+        return this.propagator;
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/propagation/TraceStateHelper.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/propagation/TraceStateHelper.java
index b0e2c135936..3246df0d5f9 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/propagation/TraceStateHelper.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/propagation/TraceStateHelper.java
@@ -8,55 +8,53 @@
 
 /** This class helps to decode W3C tracestate header into a {@link TraceState} instance. */
 public final class TraceStateHelper {
-  private static final int TRACESTATE_MAX_SIZE = 512;
-  private static final char TRACESTATE_ENTRY_DELIMITER = ',';
-  private static final char TRACESTATE_KEY_VALUE_DELIMITER = '=';
-  private static final Pattern TRACESTATE_ENTRY_DELIMITER_SPLIT_PATTERN =
-      Pattern.compile("[ \t]*,[ \t]*");
-  private static final Logger LOGGER = LoggerFactory.getLogger(TraceStateHelper.class);
+    private static final int TRACESTATE_MAX_SIZE = 512;
+    private static final char TRACESTATE_ENTRY_DELIMITER = ',';
+    private static final char TRACESTATE_KEY_VALUE_DELIMITER = '=';
+    private static final Pattern TRACESTATE_ENTRY_DELIMITER_SPLIT_PATTERN = Pattern.compile("[ \t]*,[ \t]*");
+    private static final Logger LOGGER = LoggerFactory.getLogger(TraceStateHelper.class);
 
-  private TraceStateHelper() {}
+    private TraceStateHelper() {}
 
-  // Inspired from W3CTraceContextEncoding.decodeTraceState only available in API later versions.
-  public static TraceState decodeHeader(String header) {
-    TraceStateBuilder traceStateBuilder = TraceState.builder();
-    String[] listMembers = TRACESTATE_ENTRY_DELIMITER_SPLIT_PATTERN.split(header);
-    if (listMembers.length > 32) {
-      LOGGER.warn("TraceState has too many elements: {}", header);
-      return TraceState.getDefault();
-    }
+    // Inspired from W3CTraceContextEncoding.decodeTraceState only available in API later versions.
+    public static TraceState decodeHeader(String header) {
+        TraceStateBuilder traceStateBuilder = TraceState.builder();
+        String[] listMembers = TRACESTATE_ENTRY_DELIMITER_SPLIT_PATTERN.split(header);
+        if (listMembers.length > 32) {
+            LOGGER.warn("TraceState has too many elements: {}", header);
+            return TraceState.getDefault();
+        }
 
-    for (int i = listMembers.length - 1; i >= 0; --i) {
-      String listMember = listMembers[i];
-      int index = listMember.indexOf(61);
-      if (index == -1) {
-        LOGGER.warn("Invalid TraceState list-member format: {}", listMember);
-        return TraceState.getDefault();
-      }
-      traceStateBuilder.put(listMember.substring(0, index), listMember.substring(index + 1));
-    }
+        for (int i = listMembers.length - 1; i >= 0; --i) {
+            String listMember = listMembers[i];
+            int index = listMember.indexOf(61);
+            if (index == -1) {
+                LOGGER.warn("Invalid TraceState list-member format: {}", listMember);
+                return TraceState.getDefault();
+            }
+            traceStateBuilder.put(listMember.substring(0, index), listMember.substring(index + 1));
+        }
 
-    TraceState traceState = traceStateBuilder.build();
-    if (traceState.size() != listMembers.length) {
-      return TraceState.getDefault();
-    } else {
-      return traceState;
+        TraceState traceState = traceStateBuilder.build();
+        if (traceState.size() != listMembers.length) {
+            return TraceState.getDefault();
+        } else {
+            return traceState;
+        }
     }
-  }
 
-  // Inspired from W3CTraceContextEncoding.encodeTraceState only available in API later versions.
-  public static String encodeHeader(TraceState traceState) {
-    if (traceState.isEmpty()) {
-      return "";
-    }
-    StringBuilder builder = new StringBuilder(TRACESTATE_MAX_SIZE);
-    traceState.forEach(
-        (key, value) -> {
-          if (builder.length() != 0) {
-            builder.append(TRACESTATE_ENTRY_DELIMITER);
-          }
-          builder.append(key).append(TRACESTATE_KEY_VALUE_DELIMITER).append(value);
+    // Inspired from W3CTraceContextEncoding.encodeTraceState only available in API later versions.
+    public static String encodeHeader(TraceState traceState) {
+        if (traceState.isEmpty()) {
+            return "";
+        }
+        StringBuilder builder = new StringBuilder(TRACESTATE_MAX_SIZE);
+        traceState.forEach((key, value) -> {
+            if (builder.length() != 0) {
+                builder.append(TRACESTATE_ENTRY_DELIMITER);
+            }
+            builder.append(key).append(TRACESTATE_KEY_VALUE_DELIMITER).append(value);
         });
-    return builder.toString();
-  }
+        return builder.toString();
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/logs/OtelLogRecordBuilder.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/logs/OtelLogRecordBuilder.java
index 81cfb7c875e..79acfcfb9c2 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/logs/OtelLogRecordBuilder.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/logs/OtelLogRecordBuilder.java
@@ -24,147 +24,157 @@
 
 @ParametersAreNonnullByDefault
 final class OtelLogRecordBuilder implements LogRecordBuilder {
-  @VisibleForTesting static TimeSource TIME_SOURCE = SystemTimeSource.INSTANCE;
-
-  private static final AttributeKey<String> EXCEPTION_TYPE_KEY = stringKey("exception.type");
-  private static final AttributeKey<String> EXCEPTION_MESSAGE_KEY = stringKey("exception.message");
-
-  private final OtelLogger logger;
-
-  private long timestampNanos;
-  private long observedNanos;
-  private Severity severity = Severity.UNDEFINED_SEVERITY_NUMBER;
-  @Nullable private String severityText;
-  @Nullable private String body;
-  @Nullable private Map<AttributeKey<?>, Object> attributes;
-  @Nullable private Context context;
-  @Nullable private String eventName;
-
-  private boolean attributesEmitted;
-
-  OtelLogRecordBuilder(OtelLogger logger) {
-    this.logger = logger;
-  }
-
-  @Override
-  public LogRecordBuilder setTimestamp(long timestamp, TimeUnit unit) {
-    this.timestampNanos = unit.toNanos(timestamp);
-    return this;
-  }
-
-  @Override
-  public LogRecordBuilder setTimestamp(Instant instant) {
-    this.timestampNanos = TimeUnit.SECONDS.toNanos(instant.getEpochSecond()) + instant.getNano();
-    return this;
-  }
-
-  @Override
-  public LogRecordBuilder setObservedTimestamp(long timestamp, TimeUnit unit) {
-    this.observedNanos = unit.toNanos(timestamp);
-    return this;
-  }
-
-  @Override
-  public LogRecordBuilder setObservedTimestamp(Instant instant) {
-    this.observedNanos = TimeUnit.SECONDS.toNanos(instant.getEpochSecond()) + instant.getNano();
-    return this;
-  }
-
-  @Override
-  public LogRecordBuilder setSeverity(Severity severity) {
-    this.severity = Objects.requireNonNull(severity);
-    return this;
-  }
-
-  @Override
-  public LogRecordBuilder setSeverityText(String severityText) {
-    this.severityText = emptyToNull(severityText);
-    return this;
-  }
-
-  @Override
-  public LogRecordBuilder setBody(String body) {
-    this.body = emptyToNull(body);
-    return this;
-  }
-
-  @Override
-  public LogRecordBuilder setBody(Value<?> body) {
-    this.body = body.asString();
-    return this;
-  }
-
-  @Override
-  public <T> LogRecordBuilder setAttribute(@Nullable AttributeKey<T> key, @Nullable T value) {
-    if (key == null || key.getKey().isEmpty()) {
-      return this;
-    }
-    if (attributesEmitted && attributes != null) {
-      // defensive copy if builder used after emit
-      attributes = new HashMap<>(attributes);
-      attributesEmitted = false;
-    }
-    if (value != null) {
-      if (attributes == null) {
-        attributes = new HashMap<>();
-      }
-      attributes.put(key, value);
-    } else if (attributes != null) {
-      attributes.remove(key);
-    }
-    return this;
-  }
-
-  @Override
-  public LogRecordBuilder setContext(Context context) {
-    this.context = context;
-    return this;
-  }
-
-  public LogRecordBuilder setEventName(String eventName) {
-    this.eventName = emptyToNull(eventName);
-    return this;
-  }
-
-  public LogRecordBuilder setException(@Nullable Throwable throwable) {
-    if (throwable != null) {
-      setExceptionAttribute(EXCEPTION_TYPE_KEY, throwable.getClass().getName());
-      setExceptionAttribute(EXCEPTION_MESSAGE_KEY, throwable.getMessage());
-    }
-    return this;
-  }
-
-  private void setExceptionAttribute(AttributeKey<String> key, @Nullable String value) {
-    // avoid overwriting/removing existing exception details
-    if (value != null && (attributes == null || !attributes.containsKey(key))) {
-      setAttribute(key, value);
-    }
-  }
-
-  @Override
-  public void emit() {
-    if (body == null && eventName == null) {
-      return; // drop log records where body and eventName are both missing
-    }
-    Context context = this.context != null ? this.context : Context.current();
-    if (logger.isEnabled(severity, context)) {
-      OtelLogRecordProcessor.INSTANCE.addLog(
-          new OtlpLogRecord(
-              logger.instrumentationScope,
-              timestampNanos,
-              observedNanos != 0 ? observedNanos : TIME_SOURCE.getCurrentTimeNanos(),
-              severity.getSeverityNumber(),
-              severityText,
-              body,
-              attributes != null ? attributes : Collections.emptyMap(),
-              extract(context),
-              eventName));
-
-      attributesEmitted = true;
-    }
-  }
-
-  private static String emptyToNull(@Nullable String value) {
-    return "".equals(value) ? null : value;
-  }
+    @VisibleForTesting
+    static TimeSource TIME_SOURCE = SystemTimeSource.INSTANCE;
+
+    private static final AttributeKey<String> EXCEPTION_TYPE_KEY = stringKey("exception.type");
+    private static final AttributeKey<String> EXCEPTION_MESSAGE_KEY = stringKey("exception.message");
+
+    private final OtelLogger logger;
+
+    private long timestampNanos;
+    private long observedNanos;
+    private Severity severity = Severity.UNDEFINED_SEVERITY_NUMBER;
+
+    @Nullable
+    private String severityText;
+
+    @Nullable
+    private String body;
+
+    @Nullable
+    private Map<AttributeKey<?>, Object> attributes;
+
+    @Nullable
+    private Context context;
+
+    @Nullable
+    private String eventName;
+
+    private boolean attributesEmitted;
+
+    OtelLogRecordBuilder(OtelLogger logger) {
+        this.logger = logger;
+    }
+
+    @Override
+    public LogRecordBuilder setTimestamp(long timestamp, TimeUnit unit) {
+        this.timestampNanos = unit.toNanos(timestamp);
+        return this;
+    }
+
+    @Override
+    public LogRecordBuilder setTimestamp(Instant instant) {
+        this.timestampNanos = TimeUnit.SECONDS.toNanos(instant.getEpochSecond()) + instant.getNano();
+        return this;
+    }
+
+    @Override
+    public LogRecordBuilder setObservedTimestamp(long timestamp, TimeUnit unit) {
+        this.observedNanos = unit.toNanos(timestamp);
+        return this;
+    }
+
+    @Override
+    public LogRecordBuilder setObservedTimestamp(Instant instant) {
+        this.observedNanos = TimeUnit.SECONDS.toNanos(instant.getEpochSecond()) + instant.getNano();
+        return this;
+    }
+
+    @Override
+    public LogRecordBuilder setSeverity(Severity severity) {
+        this.severity = Objects.requireNonNull(severity);
+        return this;
+    }
+
+    @Override
+    public LogRecordBuilder setSeverityText(String severityText) {
+        this.severityText = emptyToNull(severityText);
+        return this;
+    }
+
+    @Override
+    public LogRecordBuilder setBody(String body) {
+        this.body = emptyToNull(body);
+        return this;
+    }
+
+    @Override
+    public LogRecordBuilder setBody(Value<?> body) {
+        this.body = body.asString();
+        return this;
+    }
+
+    @Override
+    public <T> LogRecordBuilder setAttribute(@Nullable AttributeKey<T> key, @Nullable T value) {
+        if (key == null || key.getKey().isEmpty()) {
+            return this;
+        }
+        if (attributesEmitted && attributes != null) {
+            // defensive copy if builder used after emit
+            attributes = new HashMap<>(attributes);
+            attributesEmitted = false;
+        }
+        if (value != null) {
+            if (attributes == null) {
+                attributes = new HashMap<>();
+            }
+            attributes.put(key, value);
+        } else if (attributes != null) {
+            attributes.remove(key);
+        }
+        return this;
+    }
+
+    @Override
+    public LogRecordBuilder setContext(Context context) {
+        this.context = context;
+        return this;
+    }
+
+    public LogRecordBuilder setEventName(String eventName) {
+        this.eventName = emptyToNull(eventName);
+        return this;
+    }
+
+    public LogRecordBuilder setException(@Nullable Throwable throwable) {
+        if (throwable != null) {
+            setExceptionAttribute(EXCEPTION_TYPE_KEY, throwable.getClass().getName());
+            setExceptionAttribute(EXCEPTION_MESSAGE_KEY, throwable.getMessage());
+        }
+        return this;
+    }
+
+    private void setExceptionAttribute(AttributeKey<String> key, @Nullable String value) {
+        // avoid overwriting/removing existing exception details
+        if (value != null && (attributes == null || !attributes.containsKey(key))) {
+            setAttribute(key, value);
+        }
+    }
+
+    @Override
+    public void emit() {
+        if (body == null && eventName == null) {
+            return; // drop log records where body and eventName are both missing
+        }
+        Context context = this.context != null ? this.context : Context.current();
+        if (logger.isEnabled(severity, context)) {
+            OtelLogRecordProcessor.INSTANCE.addLog(new OtlpLogRecord(
+                    logger.instrumentationScope,
+                    timestampNanos,
+                    observedNanos != 0 ? observedNanos : TIME_SOURCE.getCurrentTimeNanos(),
+                    severity.getSeverityNumber(),
+                    severityText,
+                    body,
+                    attributes != null ? attributes : Collections.emptyMap(),
+                    extract(context),
+                    eventName));
+
+            attributesEmitted = true;
+        }
+    }
+
+    private static String emptyToNull(@Nullable String value) {
+        return "".equals(value) ? null : value;
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/logs/OtelLogger.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/logs/OtelLogger.java
index bd11a07f9f0..ec485f09ad8 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/logs/OtelLogger.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/logs/OtelLogger.java
@@ -9,23 +9,23 @@
 
 @ParametersAreNonnullByDefault
 final class OtelLogger implements Logger {
-  final OtelInstrumentationScope instrumentationScope;
+    final OtelInstrumentationScope instrumentationScope;
 
-  OtelLogger(OtelInstrumentationScope instrumentationScope) {
-    this.instrumentationScope = instrumentationScope;
-  }
+    OtelLogger(OtelInstrumentationScope instrumentationScope) {
+        this.instrumentationScope = instrumentationScope;
+    }
 
-  @Override
-  public LogRecordBuilder logRecordBuilder() {
-    return new OtelLogRecordBuilder(this);
-  }
+    @Override
+    public LogRecordBuilder logRecordBuilder() {
+        return new OtelLogRecordBuilder(this);
+    }
 
-  public boolean isEnabled(Severity severity, Context context) {
-    return true;
-  }
+    public boolean isEnabled(Severity severity, Context context) {
+        return true;
+    }
 
-  @Override
-  public String toString() {
-    return "OtelLogger{instrumentationScope=" + instrumentationScope + "}";
-  }
+    @Override
+    public String toString() {
+        return "OtelLogger{instrumentationScope=" + instrumentationScope + "}";
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/logs/OtelLoggerBuilder.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/logs/OtelLoggerBuilder.java
index b0b9da1f90e..26f75275969 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/logs/OtelLoggerBuilder.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/logs/OtelLoggerBuilder.java
@@ -7,32 +7,35 @@
 
 @ParametersAreNonnullByDefault
 final class OtelLoggerBuilder implements LoggerBuilder {
-  private final OtelLoggerProvider loggerProvider;
-
-  private final String instrumentationScopeName;
-  @Nullable private String instrumentationScopeVersion;
-  @Nullable private String schemaUrl;
-
-  OtelLoggerBuilder(OtelLoggerProvider loggerProvider, String instrumentationScopeName) {
-    this.loggerProvider = loggerProvider;
-    this.instrumentationScopeName = instrumentationScopeName;
-  }
-
-  @Override
-  public LoggerBuilder setInstrumentationVersion(String instrumentationScopeVersion) {
-    this.instrumentationScopeVersion = instrumentationScopeVersion;
-    return this;
-  }
-
-  @Override
-  public LoggerBuilder setSchemaUrl(String schemaUrl) {
-    this.schemaUrl = schemaUrl;
-    return this;
-  }
-
-  @Override
-  public Logger build() {
-    return loggerProvider.getLoggerShim(
-        instrumentationScopeName, instrumentationScopeVersion, schemaUrl);
-  }
+    private final OtelLoggerProvider loggerProvider;
+
+    private final String instrumentationScopeName;
+
+    @Nullable
+    private String instrumentationScopeVersion;
+
+    @Nullable
+    private String schemaUrl;
+
+    OtelLoggerBuilder(OtelLoggerProvider loggerProvider, String instrumentationScopeName) {
+        this.loggerProvider = loggerProvider;
+        this.instrumentationScopeName = instrumentationScopeName;
+    }
+
+    @Override
+    public LoggerBuilder setInstrumentationVersion(String instrumentationScopeVersion) {
+        this.instrumentationScopeVersion = instrumentationScopeVersion;
+        return this;
+    }
+
+    @Override
+    public LoggerBuilder setSchemaUrl(String schemaUrl) {
+        this.schemaUrl = schemaUrl;
+        return this;
+    }
+
+    @Override
+    public Logger build() {
+        return loggerProvider.getLoggerShim(instrumentationScopeName, instrumentationScopeVersion, schemaUrl);
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/logs/OtelLoggerProvider.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/logs/OtelLoggerProvider.java
index 45fc6924353..fd0542f17ff 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/logs/OtelLoggerProvider.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/logs/OtelLoggerProvider.java
@@ -15,45 +15,41 @@
 
 @ParametersAreNonnullByDefault
 public final class OtelLoggerProvider implements LoggerProvider {
-  private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(OtelLoggerProvider.class);
-  private static final String DEFAULT_LOGGER_NAME = "unknown";
-
-  public static final LoggerProvider INSTANCE = new OtelLoggerProvider();
-
-  /** Logger shims, indexed by instrumentation scope. */
-  private final Map<OtelInstrumentationScope, OtelLogger> loggers = new ConcurrentHashMap<>();
-
-  @SuppressWarnings("unchecked")
-  private OtelLoggerProvider() {
-    // register attribute reader for class-loader where this provider is being used/injected
-    OtelLogRecordProcessor.registerAttributeReader(
-        AttributeKey.class.getClassLoader(),
-        (attributes, visitor) ->
-            ((Map<AttributeKey<?>, ?>) attributes)
-                .forEach((a, v) -> visitor.visitAttribute(a.getType().ordinal(), a.getKey(), v)));
-  }
-
-  @Override
-  public Logger get(String instrumentationScopeName) {
-    return getLoggerShim(instrumentationScopeName, null, null);
-  }
-
-  @Override
-  public LoggerBuilder loggerBuilder(String instrumentationScopeName) {
-    return new OtelLoggerBuilder(this, instrumentationScopeName);
-  }
-
-  Logger getLoggerShim(
-      String instrumentationScopeName,
-      @Nullable String instrumentationScopeVersion,
-      @Nullable String schemaUrl) {
-    if (Strings.isBlank(instrumentationScopeName)) {
-      LOGGER.debug("Logger requested without instrumentation scope name.");
-      instrumentationScopeName = DEFAULT_LOGGER_NAME;
+    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(OtelLoggerProvider.class);
+    private static final String DEFAULT_LOGGER_NAME = "unknown";
+
+    public static final LoggerProvider INSTANCE = new OtelLoggerProvider();
+
+    /** Logger shims, indexed by instrumentation scope. */
+    private final Map<OtelInstrumentationScope, OtelLogger> loggers = new ConcurrentHashMap<>();
+
+    @SuppressWarnings("unchecked")
+    private OtelLoggerProvider() {
+        // register attribute reader for class-loader where this provider is being used/injected
+        OtelLogRecordProcessor.registerAttributeReader(
+                AttributeKey.class.getClassLoader(),
+                (attributes, visitor) -> ((Map<AttributeKey<?>, ?>) attributes)
+                        .forEach((a, v) -> visitor.visitAttribute(a.getType().ordinal(), a.getKey(), v)));
+    }
+
+    @Override
+    public Logger get(String instrumentationScopeName) {
+        return getLoggerShim(instrumentationScopeName, null, null);
+    }
+
+    @Override
+    public LoggerBuilder loggerBuilder(String instrumentationScopeName) {
+        return new OtelLoggerBuilder(this, instrumentationScopeName);
+    }
+
+    Logger getLoggerShim(
+            String instrumentationScopeName, @Nullable String instrumentationScopeVersion, @Nullable String schemaUrl) {
+        if (Strings.isBlank(instrumentationScopeName)) {
+            LOGGER.debug("Logger requested without instrumentation scope name.");
+            instrumentationScopeName = DEFAULT_LOGGER_NAME;
+        }
+        return loggers.computeIfAbsent(
+                new OtelInstrumentationScope(instrumentationScopeName, instrumentationScopeVersion, schemaUrl),
+                OtelLogger::new);
     }
-    return loggers.computeIfAbsent(
-        new OtelInstrumentationScope(
-            instrumentationScopeName, instrumentationScopeVersion, schemaUrl),
-        OtelLogger::new);
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleCounter.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleCounter.java
index 1395dbbe8ad..4375bed0bf7 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleCounter.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleCounter.java
@@ -21,71 +21,68 @@
 
 @ParametersAreNonnullByDefault
 final class OtelDoubleCounter extends OtelInstrument implements DoubleCounter {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtelDoubleCounter.class);
-  private static final RatelimitedLogger RATELIMITED_LOGGER =
-      new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtelDoubleCounter.class);
+    private static final RatelimitedLogger RATELIMITED_LOGGER = new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
 
-  OtelDoubleCounter(OtelMetricStorage storage) {
-    super(storage);
-  }
-
-  @Override
-  public void add(double value) {
-    add(value, Attributes.empty());
-  }
-
-  @Override
-  public void add(double value, Attributes attributes) {
-    if (value < 0) {
-      RATELIMITED_LOGGER.warn(
-          "Counters can only increase. Instrument {} has recorded a negative value.",
-          storage.getInstrumentName());
-    } else {
-      storage.recordDouble(value, attributes);
-    }
-  }
-
-  @Override
-  public void add(double value, Attributes attributes, Context unused) {
-    add(value, attributes);
-  }
-
-  static final class Builder implements DoubleCounterBuilder {
-    private final OtelMeter meter;
-    private final OtelInstrumentBuilder builder;
-
-    Builder(OtelMeter meter, OtelInstrumentBuilder builder) {
-      this.meter = meter;
-      this.builder = ofDoubles(builder, COUNTER);
+    OtelDoubleCounter(OtelMetricStorage storage) {
+        super(storage);
     }
 
     @Override
-    public DoubleCounterBuilder setDescription(String description) {
-      builder.setDescription(description);
-      return this;
+    public void add(double value) {
+        add(value, Attributes.empty());
     }
 
     @Override
-    public DoubleCounterBuilder setUnit(String unit) {
-      builder.setUnit(unit);
-      return this;
+    public void add(double value, Attributes attributes) {
+        if (value < 0) {
+            RATELIMITED_LOGGER.warn(
+                    "Counters can only increase. Instrument {} has recorded a negative value.",
+                    storage.getInstrumentName());
+        } else {
+            storage.recordDouble(value, attributes);
+        }
     }
 
     @Override
-    public DoubleCounter build() {
-      return new OtelDoubleCounter(
-          meter.registerStorage(builder, OtelMetricStorage::newDoubleSumStorage));
+    public void add(double value, Attributes attributes, Context unused) {
+        add(value, attributes);
     }
 
-    @Override
-    public ObservableDoubleMeasurement buildObserver() {
-      return meter.registerObservableStorage(builder, OtelMetricStorage::newDoubleDeltaStorage);
-    }
+    static final class Builder implements DoubleCounterBuilder {
+        private final OtelMeter meter;
+        private final OtelInstrumentBuilder builder;
 
-    @Override
-    public ObservableDoubleCounter buildWithCallback(
-        Consumer<ObservableDoubleMeasurement> callback) {
-      return meter.registerObservableCallback(callback, buildObserver());
+        Builder(OtelMeter meter, OtelInstrumentBuilder builder) {
+            this.meter = meter;
+            this.builder = ofDoubles(builder, COUNTER);
+        }
+
+        @Override
+        public DoubleCounterBuilder setDescription(String description) {
+            builder.setDescription(description);
+            return this;
+        }
+
+        @Override
+        public DoubleCounterBuilder setUnit(String unit) {
+            builder.setUnit(unit);
+            return this;
+        }
+
+        @Override
+        public DoubleCounter build() {
+            return new OtelDoubleCounter(meter.registerStorage(builder, OtelMetricStorage::newDoubleSumStorage));
+        }
+
+        @Override
+        public ObservableDoubleMeasurement buildObserver() {
+            return meter.registerObservableStorage(builder, OtelMetricStorage::newDoubleDeltaStorage);
+        }
+
+        @Override
+        public ObservableDoubleCounter buildWithCallback(Consumer<ObservableDoubleMeasurement> callback) {
+            return meter.registerObservableCallback(callback, buildObserver());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleGauge.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleGauge.java
index 31df22eb688..d78319a9933 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleGauge.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleGauge.java
@@ -18,65 +18,64 @@
 
 @ParametersAreNonnullByDefault
 final class OtelDoubleGauge extends OtelInstrument implements DoubleGauge {
-  OtelDoubleGauge(OtelMetricStorage storage) {
-    super(storage);
-  }
-
-  @Override
-  public void set(double value) {
-    set(value, Attributes.empty());
-  }
-
-  @Override
-  public void set(double value, Attributes attributes) {
-    storage.recordDouble(value, attributes);
-  }
-
-  @Override
-  public void set(double value, Attributes attributes, Context unused) {
-    set(value, attributes);
-  }
-
-  static final class Builder implements DoubleGaugeBuilder {
-    private final OtelMeter meter;
-    private final OtelInstrumentBuilder builder;
-
-    Builder(OtelMeter meter, String instrumentName) {
-      this.meter = meter;
-      this.builder = ofDoubles(instrumentName, GAUGE);
+    OtelDoubleGauge(OtelMetricStorage storage) {
+        super(storage);
     }
 
     @Override
-    public DoubleGaugeBuilder setDescription(String description) {
-      builder.setDescription(description);
-      return this;
+    public void set(double value) {
+        set(value, Attributes.empty());
     }
 
     @Override
-    public DoubleGaugeBuilder setUnit(String unit) {
-      builder.setUnit(unit);
-      return this;
+    public void set(double value, Attributes attributes) {
+        storage.recordDouble(value, attributes);
     }
 
     @Override
-    public LongGaugeBuilder ofLongs() {
-      return new OtelLongGauge.Builder(meter, builder);
+    public void set(double value, Attributes attributes, Context unused) {
+        set(value, attributes);
     }
 
-    @Override
-    public DoubleGauge build() {
-      return new OtelDoubleGauge(
-          meter.registerStorage(builder, OtelMetricStorage::newDoubleValueStorage));
-    }
+    static final class Builder implements DoubleGaugeBuilder {
+        private final OtelMeter meter;
+        private final OtelInstrumentBuilder builder;
 
-    @Override
-    public ObservableDoubleMeasurement buildObserver() {
-      return meter.registerObservableStorage(builder, OtelMetricStorage::newDoubleValueStorage);
-    }
+        Builder(OtelMeter meter, String instrumentName) {
+            this.meter = meter;
+            this.builder = ofDoubles(instrumentName, GAUGE);
+        }
 
-    @Override
-    public ObservableDoubleGauge buildWithCallback(Consumer<ObservableDoubleMeasurement> callback) {
-      return meter.registerObservableCallback(callback, buildObserver());
+        @Override
+        public DoubleGaugeBuilder setDescription(String description) {
+            builder.setDescription(description);
+            return this;
+        }
+
+        @Override
+        public DoubleGaugeBuilder setUnit(String unit) {
+            builder.setUnit(unit);
+            return this;
+        }
+
+        @Override
+        public LongGaugeBuilder ofLongs() {
+            return new OtelLongGauge.Builder(meter, builder);
+        }
+
+        @Override
+        public DoubleGauge build() {
+            return new OtelDoubleGauge(meter.registerStorage(builder, OtelMetricStorage::newDoubleValueStorage));
+        }
+
+        @Override
+        public ObservableDoubleMeasurement buildObserver() {
+            return meter.registerObservableStorage(builder, OtelMetricStorage::newDoubleValueStorage);
+        }
+
+        @Override
+        public ObservableDoubleGauge buildWithCallback(Consumer<ObservableDoubleMeasurement> callback) {
+            return meter.registerObservableCallback(callback, buildObserver());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleHistogram.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleHistogram.java
index c0e950917f7..c99d33ca9ec 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleHistogram.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleHistogram.java
@@ -26,112 +26,105 @@
 
 @ParametersAreNonnullByDefault
 final class OtelDoubleHistogram extends OtelInstrument implements DoubleHistogram {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtelDoubleHistogram.class);
-  private static final RatelimitedLogger RATELIMITED_LOGGER =
-      new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
-
-  OtelDoubleHistogram(OtelMetricStorage storage) {
-    super(storage);
-  }
-
-  @Override
-  public void record(double value) {
-    record(value, Attributes.empty());
-  }
-
-  @Override
-  public void record(double value, Attributes attributes) {
-    if (value < 0) {
-      RATELIMITED_LOGGER.warn(
-          "Histograms can only record non-negative values. Instrument {} has recorded a negative value.",
-          storage.getInstrumentName());
-    } else {
-      storage.recordDouble(value, attributes);
-    }
-  }
-
-  @Override
-  public void record(double value, Attributes attributes, Context unused) {
-    record(value, attributes);
-  }
-
-  static final class Builder implements DoubleHistogramBuilder {
-    private static final List<Double> DEFAULT_BOUNDARIES =
-        asList(
-            0d, 5d, 10d, 25d, 50d, 75d, 100d, 250d, 500d, 750d, 1_000d, 2_500d, 5_000d, 7_500d,
-            10_000d);
-
-    private final OtelMeter meter;
-    private final OtelInstrumentBuilder builder;
-    private List<Double> bucketBoundaries;
-
-    Builder(OtelMeter meter, String instrumentName) {
-      this.meter = meter;
-      this.builder = ofDoubles(instrumentName, HISTOGRAM);
-      this.bucketBoundaries = DEFAULT_BOUNDARIES;
-    }
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtelDoubleHistogram.class);
+    private static final RatelimitedLogger RATELIMITED_LOGGER = new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
 
-    @Override
-    public DoubleHistogramBuilder setDescription(String description) {
-      builder.setDescription(description);
-      return this;
+    OtelDoubleHistogram(OtelMetricStorage storage) {
+        super(storage);
     }
 
     @Override
-    public DoubleHistogramBuilder setUnit(String unit) {
-      builder.setUnit(unit);
-      return this;
+    public void record(double value) {
+        record(value, Attributes.empty());
     }
 
     @Override
-    @SuppressFBWarnings("DCN") // match OTel in catching and logging NPE
-    public DoubleHistogramBuilder setExplicitBucketBoundariesAdvice(List<Double> bucketBoundaries) {
-      try {
-        Objects.requireNonNull(bucketBoundaries, "bucketBoundaries must not be null");
-        this.bucketBoundaries = validateBoundaries(new ArrayList<>(bucketBoundaries));
-      } catch (IllegalArgumentException | NullPointerException e) {
-        LOGGER.warn("Error setting explicit bucket boundaries advice: {}", e.getMessage());
-      }
-      return this;
+    public void record(double value, Attributes attributes) {
+        if (value < 0) {
+            RATELIMITED_LOGGER.warn(
+                    "Histograms can only record non-negative values. Instrument {} has recorded a negative value.",
+                    storage.getInstrumentName());
+        } else {
+            storage.recordDouble(value, attributes);
+        }
     }
 
     @Override
-    public LongHistogramBuilder ofLongs() {
-      return new OtelLongHistogram.Builder(meter, builder, bucketBoundaries);
+    public void record(double value, Attributes attributes, Context unused) {
+        record(value, attributes);
     }
 
-    @Override
-    public DoubleHistogram build() {
-      return new OtelDoubleHistogram(
-          meter.registerStorage(
-              builder, descriptor -> newHistogramStorage(descriptor, bucketBoundaries)));
-    }
+    static final class Builder implements DoubleHistogramBuilder {
+        private static final List<Double> DEFAULT_BOUNDARIES =
+                asList(0d, 5d, 10d, 25d, 50d, 75d, 100d, 250d, 500d, 750d, 1_000d, 2_500d, 5_000d, 7_500d, 10_000d);
+
+        private final OtelMeter meter;
+        private final OtelInstrumentBuilder builder;
+        private List<Double> bucketBoundaries;
+
+        Builder(OtelMeter meter, String instrumentName) {
+            this.meter = meter;
+            this.builder = ofDoubles(instrumentName, HISTOGRAM);
+            this.bucketBoundaries = DEFAULT_BOUNDARIES;
+        }
 
-    static List<Double> validateBoundaries(List<Double> boundaries) {
-      if (boundaries.isEmpty()) {
-        return emptyList();
-      }
-      if (boundaries.get(0) == Double.NEGATIVE_INFINITY) {
-        throw new IllegalArgumentException("invalid bucket boundary: -Inf");
-      }
-      if (boundaries.get(boundaries.size() - 1) == Double.POSITIVE_INFINITY) {
-        throw new IllegalArgumentException("invalid bucket boundary: +Inf");
-      }
-      Double previousBoundary = null;
-      for (Double boundary : boundaries) {
-        if (boundary.isNaN()) {
-          throw new IllegalArgumentException("invalid bucket boundary: NaN");
+        @Override
+        public DoubleHistogramBuilder setDescription(String description) {
+            builder.setDescription(description);
+            return this;
         }
-        if (previousBoundary != null && previousBoundary >= boundary) {
-          throw new IllegalArgumentException(
-              "Bucket boundaries must be in increasing order: "
-                  + previousBoundary
-                  + " >= "
-                  + boundary);
+
+        @Override
+        public DoubleHistogramBuilder setUnit(String unit) {
+            builder.setUnit(unit);
+            return this;
+        }
+
+        @Override
+        @SuppressFBWarnings("DCN") // match OTel in catching and logging NPE
+        public DoubleHistogramBuilder setExplicitBucketBoundariesAdvice(List<Double> bucketBoundaries) {
+            try {
+                Objects.requireNonNull(bucketBoundaries, "bucketBoundaries must not be null");
+                this.bucketBoundaries = validateBoundaries(new ArrayList<>(bucketBoundaries));
+            } catch (IllegalArgumentException | NullPointerException e) {
+                LOGGER.warn("Error setting explicit bucket boundaries advice: {}", e.getMessage());
+            }
+            return this;
+        }
+
+        @Override
+        public LongHistogramBuilder ofLongs() {
+            return new OtelLongHistogram.Builder(meter, builder, bucketBoundaries);
+        }
+
+        @Override
+        public DoubleHistogram build() {
+            return new OtelDoubleHistogram(
+                    meter.registerStorage(builder, descriptor -> newHistogramStorage(descriptor, bucketBoundaries)));
+        }
+
+        static List<Double> validateBoundaries(List<Double> boundaries) {
+            if (boundaries.isEmpty()) {
+                return emptyList();
+            }
+            if (boundaries.get(0) == Double.NEGATIVE_INFINITY) {
+                throw new IllegalArgumentException("invalid bucket boundary: -Inf");
+            }
+            if (boundaries.get(boundaries.size() - 1) == Double.POSITIVE_INFINITY) {
+                throw new IllegalArgumentException("invalid bucket boundary: +Inf");
+            }
+            Double previousBoundary = null;
+            for (Double boundary : boundaries) {
+                if (boundary.isNaN()) {
+                    throw new IllegalArgumentException("invalid bucket boundary: NaN");
+                }
+                if (previousBoundary != null && previousBoundary >= boundary) {
+                    throw new IllegalArgumentException(
+                            "Bucket boundaries must be in increasing order: " + previousBoundary + " >= " + boundary);
+                }
+                previousBoundary = boundary;
+            }
+            return boundaries;
         }
-        previousBoundary = boundary;
-      }
-      return boundaries;
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleUpDownCounter.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleUpDownCounter.java
index f66a09d2d69..d615fb68e5b 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleUpDownCounter.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleUpDownCounter.java
@@ -17,61 +17,59 @@
 
 @ParametersAreNonnullByDefault
 final class OtelDoubleUpDownCounter extends OtelInstrument implements DoubleUpDownCounter {
-  OtelDoubleUpDownCounter(OtelMetricStorage storage) {
-    super(storage);
-  }
-
-  @Override
-  public void add(double value) {
-    add(value, Attributes.empty());
-  }
-
-  @Override
-  public void add(double value, Attributes attributes) {
-    storage.recordDouble(value, attributes);
-  }
-
-  @Override
-  public void add(double value, Attributes attributes, Context unused) {
-    add(value, attributes);
-  }
-
-  static final class Builder implements DoubleUpDownCounterBuilder {
-    private final OtelMeter meter;
-    private final OtelInstrumentBuilder builder;
-
-    Builder(OtelMeter meter, OtelInstrumentBuilder builder) {
-      this.meter = meter;
-      this.builder = ofDoubles(builder, UP_DOWN_COUNTER);
+    OtelDoubleUpDownCounter(OtelMetricStorage storage) {
+        super(storage);
     }
 
     @Override
-    public DoubleUpDownCounterBuilder setDescription(String description) {
-      builder.setDescription(description);
-      return this;
+    public void add(double value) {
+        add(value, Attributes.empty());
     }
 
     @Override
-    public DoubleUpDownCounterBuilder setUnit(String unit) {
-      builder.setUnit(unit);
-      return this;
+    public void add(double value, Attributes attributes) {
+        storage.recordDouble(value, attributes);
     }
 
     @Override
-    public DoubleUpDownCounter build() {
-      return new OtelDoubleUpDownCounter(
-          meter.registerStorage(builder, OtelMetricStorage::newDoubleSumStorage));
+    public void add(double value, Attributes attributes, Context unused) {
+        add(value, attributes);
     }
 
-    @Override
-    public ObservableDoubleMeasurement buildObserver() {
-      return meter.registerObservableStorage(builder, OtelMetricStorage::newDoubleDeltaStorage);
-    }
+    static final class Builder implements DoubleUpDownCounterBuilder {
+        private final OtelMeter meter;
+        private final OtelInstrumentBuilder builder;
 
-    @Override
-    public ObservableDoubleUpDownCounter buildWithCallback(
-        Consumer<ObservableDoubleMeasurement> callback) {
-      return meter.registerObservableCallback(callback, buildObserver());
+        Builder(OtelMeter meter, OtelInstrumentBuilder builder) {
+            this.meter = meter;
+            this.builder = ofDoubles(builder, UP_DOWN_COUNTER);
+        }
+
+        @Override
+        public DoubleUpDownCounterBuilder setDescription(String description) {
+            builder.setDescription(description);
+            return this;
+        }
+
+        @Override
+        public DoubleUpDownCounterBuilder setUnit(String unit) {
+            builder.setUnit(unit);
+            return this;
+        }
+
+        @Override
+        public DoubleUpDownCounter build() {
+            return new OtelDoubleUpDownCounter(meter.registerStorage(builder, OtelMetricStorage::newDoubleSumStorage));
+        }
+
+        @Override
+        public ObservableDoubleMeasurement buildObserver() {
+            return meter.registerObservableStorage(builder, OtelMetricStorage::newDoubleDeltaStorage);
+        }
+
+        @Override
+        public ObservableDoubleUpDownCounter buildWithCallback(Consumer<ObservableDoubleMeasurement> callback) {
+            return meter.registerObservableCallback(callback, buildObserver());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongCounter.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongCounter.java
index 76507eed9d8..58d2e84c9a5 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongCounter.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongCounter.java
@@ -22,75 +22,73 @@
 
 @ParametersAreNonnullByDefault
 final class OtelLongCounter extends OtelInstrument implements LongCounter {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtelLongCounter.class);
-  private static final RatelimitedLogger RATELIMITED_LOGGER =
-      new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtelLongCounter.class);
+    private static final RatelimitedLogger RATELIMITED_LOGGER = new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
 
-  OtelLongCounter(OtelMetricStorage storage) {
-    super(storage);
-  }
-
-  @Override
-  public void add(long value) {
-    add(value, Attributes.empty());
-  }
-
-  @Override
-  public void add(long value, Attributes attributes) {
-    if (value < 0) {
-      RATELIMITED_LOGGER.warn(
-          "Counters can only increase. Instrument {} has recorded a negative value.",
-          storage.getInstrumentName());
-    } else {
-      storage.recordLong(value, attributes);
-    }
-  }
-
-  @Override
-  public void add(long value, Attributes attributes, Context unused) {
-    add(value, attributes);
-  }
-
-  static final class Builder implements LongCounterBuilder {
-    private final OtelMeter meter;
-    private final OtelInstrumentBuilder builder;
-
-    Builder(OtelMeter meter, String instrumentName) {
-      this.meter = meter;
-      this.builder = ofLongs(instrumentName, COUNTER);
+    OtelLongCounter(OtelMetricStorage storage) {
+        super(storage);
     }
 
     @Override
-    public LongCounterBuilder setDescription(String description) {
-      builder.setDescription(description);
-      return this;
+    public void add(long value) {
+        add(value, Attributes.empty());
     }
 
     @Override
-    public LongCounterBuilder setUnit(String unit) {
-      builder.setUnit(unit);
-      return this;
+    public void add(long value, Attributes attributes) {
+        if (value < 0) {
+            RATELIMITED_LOGGER.warn(
+                    "Counters can only increase. Instrument {} has recorded a negative value.",
+                    storage.getInstrumentName());
+        } else {
+            storage.recordLong(value, attributes);
+        }
     }
 
     @Override
-    public DoubleCounterBuilder ofDoubles() {
-      return new OtelDoubleCounter.Builder(meter, builder);
+    public void add(long value, Attributes attributes, Context unused) {
+        add(value, attributes);
     }
 
-    @Override
-    public LongCounter build() {
-      return new OtelLongCounter(
-          meter.registerStorage(builder, OtelMetricStorage::newLongSumStorage));
-    }
+    static final class Builder implements LongCounterBuilder {
+        private final OtelMeter meter;
+        private final OtelInstrumentBuilder builder;
 
-    @Override
-    public ObservableLongMeasurement buildObserver() {
-      return meter.registerObservableStorage(builder, OtelMetricStorage::newLongDeltaStorage);
-    }
+        Builder(OtelMeter meter, String instrumentName) {
+            this.meter = meter;
+            this.builder = ofLongs(instrumentName, COUNTER);
+        }
 
-    @Override
-    public ObservableLongCounter buildWithCallback(Consumer<ObservableLongMeasurement> callback) {
-      return meter.registerObservableCallback(callback, buildObserver());
+        @Override
+        public LongCounterBuilder setDescription(String description) {
+            builder.setDescription(description);
+            return this;
+        }
+
+        @Override
+        public LongCounterBuilder setUnit(String unit) {
+            builder.setUnit(unit);
+            return this;
+        }
+
+        @Override
+        public DoubleCounterBuilder ofDoubles() {
+            return new OtelDoubleCounter.Builder(meter, builder);
+        }
+
+        @Override
+        public LongCounter build() {
+            return new OtelLongCounter(meter.registerStorage(builder, OtelMetricStorage::newLongSumStorage));
+        }
+
+        @Override
+        public ObservableLongMeasurement buildObserver() {
+            return meter.registerObservableStorage(builder, OtelMetricStorage::newLongDeltaStorage);
+        }
+
+        @Override
+        public ObservableLongCounter buildWithCallback(Consumer<ObservableLongMeasurement> callback) {
+            return meter.registerObservableCallback(callback, buildObserver());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongGauge.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongGauge.java
index 594dd2147bb..30bdeefd049 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongGauge.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongGauge.java
@@ -17,60 +17,59 @@
 
 @ParametersAreNonnullByDefault
 final class OtelLongGauge extends OtelInstrument implements LongGauge {
-  OtelLongGauge(OtelMetricStorage storage) {
-    super(storage);
-  }
-
-  @Override
-  public void set(long value) {
-    set(value, Attributes.empty());
-  }
-
-  @Override
-  public void set(long value, Attributes attributes) {
-    storage.recordLong(value, attributes);
-  }
-
-  @Override
-  public void set(long value, Attributes attributes, Context unused) {
-    set(value, attributes);
-  }
-
-  static final class Builder implements LongGaugeBuilder {
-    private final OtelMeter meter;
-    private final OtelInstrumentBuilder builder;
-
-    Builder(OtelMeter meter, OtelInstrumentBuilder builder) {
-      this.meter = meter;
-      this.builder = ofLongs(builder, GAUGE);
+    OtelLongGauge(OtelMetricStorage storage) {
+        super(storage);
     }
 
     @Override
-    public LongGaugeBuilder setDescription(String description) {
-      builder.setDescription(description);
-      return this;
+    public void set(long value) {
+        set(value, Attributes.empty());
     }
 
     @Override
-    public LongGaugeBuilder setUnit(String unit) {
-      builder.setUnit(unit);
-      return this;
+    public void set(long value, Attributes attributes) {
+        storage.recordLong(value, attributes);
     }
 
     @Override
-    public LongGauge build() {
-      return new OtelLongGauge(
-          meter.registerStorage(builder, OtelMetricStorage::newLongValueStorage));
+    public void set(long value, Attributes attributes, Context unused) {
+        set(value, attributes);
     }
 
-    @Override
-    public ObservableLongMeasurement buildObserver() {
-      return meter.registerObservableStorage(builder, OtelMetricStorage::newLongValueStorage);
-    }
+    static final class Builder implements LongGaugeBuilder {
+        private final OtelMeter meter;
+        private final OtelInstrumentBuilder builder;
 
-    @Override
-    public ObservableLongGauge buildWithCallback(Consumer<ObservableLongMeasurement> callback) {
-      return meter.registerObservableCallback(callback, buildObserver());
+        Builder(OtelMeter meter, OtelInstrumentBuilder builder) {
+            this.meter = meter;
+            this.builder = ofLongs(builder, GAUGE);
+        }
+
+        @Override
+        public LongGaugeBuilder setDescription(String description) {
+            builder.setDescription(description);
+            return this;
+        }
+
+        @Override
+        public LongGaugeBuilder setUnit(String unit) {
+            builder.setUnit(unit);
+            return this;
+        }
+
+        @Override
+        public LongGauge build() {
+            return new OtelLongGauge(meter.registerStorage(builder, OtelMetricStorage::newLongValueStorage));
+        }
+
+        @Override
+        public ObservableLongMeasurement buildObserver() {
+            return meter.registerObservableStorage(builder, OtelMetricStorage::newLongValueStorage);
+        }
+
+        @Override
+        public ObservableLongGauge buildWithCallback(Consumer<ObservableLongMeasurement> callback) {
+            return meter.registerObservableCallback(callback, buildObserver());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongHistogram.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongHistogram.java
index 6543748ee26..ae549f28d86 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongHistogram.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongHistogram.java
@@ -24,76 +24,74 @@
 
 @ParametersAreNonnullByDefault
 final class OtelLongHistogram extends OtelInstrument implements LongHistogram {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtelLongHistogram.class);
-  private static final RatelimitedLogger RATELIMITED_LOGGER =
-      new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtelLongHistogram.class);
+    private static final RatelimitedLogger RATELIMITED_LOGGER = new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
 
-  OtelLongHistogram(OtelMetricStorage storage) {
-    super(storage);
-  }
-
-  @Override
-  public void record(long value) {
-    record(value, Attributes.empty());
-  }
-
-  @Override
-  public void record(long value, Attributes attributes) {
-    if (value < 0) {
-      RATELIMITED_LOGGER.warn(
-          "Histograms can only record non-negative values. Instrument {} has recorded a negative value.",
-          storage.getInstrumentName());
-    } else {
-      storage.recordLong(value, attributes);
-    }
-  }
-
-  @Override
-  public void record(long value, Attributes attributes, Context unused) {
-    record(value, attributes);
-  }
-
-  static final class Builder implements LongHistogramBuilder {
-    private final OtelMeter meter;
-    private final OtelInstrumentBuilder builder;
-    private List<Double> bucketBoundaries;
-
-    Builder(OtelMeter meter, OtelInstrumentBuilder builder, List<Double> bucketBoundaries) {
-      this.meter = meter;
-      this.builder = ofLongs(builder, HISTOGRAM);
-      this.bucketBoundaries = bucketBoundaries;
+    OtelLongHistogram(OtelMetricStorage storage) {
+        super(storage);
     }
 
     @Override
-    public LongHistogramBuilder setDescription(String description) {
-      builder.setDescription(description);
-      return this;
+    public void record(long value) {
+        record(value, Attributes.empty());
     }
 
     @Override
-    public LongHistogramBuilder setUnit(String unit) {
-      builder.setUnit(unit);
-      return this;
+    public void record(long value, Attributes attributes) {
+        if (value < 0) {
+            RATELIMITED_LOGGER.warn(
+                    "Histograms can only record non-negative values. Instrument {} has recorded a negative value.",
+                    storage.getInstrumentName());
+        } else {
+            storage.recordLong(value, attributes);
+        }
     }
 
     @Override
-    @SuppressFBWarnings("DCN") // match OTel in catching and logging NPE
-    public LongHistogramBuilder setExplicitBucketBoundariesAdvice(List<Long> bucketBoundaries) {
-      try {
-        Objects.requireNonNull(bucketBoundaries, "bucketBoundaries must not be null");
-        this.bucketBoundaries =
-            validateBoundaries(bucketBoundaries.stream().map(Long::doubleValue).collect(toList()));
-      } catch (IllegalArgumentException | NullPointerException e) {
-        LOGGER.warn("Error setting explicit bucket boundaries advice: {}", e.getMessage());
-      }
-      return this;
+    public void record(long value, Attributes attributes, Context unused) {
+        record(value, attributes);
     }
 
-    @Override
-    public LongHistogram build() {
-      return new OtelLongHistogram(
-          meter.registerStorage(
-              builder, descriptor -> newHistogramStorage(descriptor, bucketBoundaries)));
+    static final class Builder implements LongHistogramBuilder {
+        private final OtelMeter meter;
+        private final OtelInstrumentBuilder builder;
+        private List<Double> bucketBoundaries;
+
+        Builder(OtelMeter meter, OtelInstrumentBuilder builder, List<Double> bucketBoundaries) {
+            this.meter = meter;
+            this.builder = ofLongs(builder, HISTOGRAM);
+            this.bucketBoundaries = bucketBoundaries;
+        }
+
+        @Override
+        public LongHistogramBuilder setDescription(String description) {
+            builder.setDescription(description);
+            return this;
+        }
+
+        @Override
+        public LongHistogramBuilder setUnit(String unit) {
+            builder.setUnit(unit);
+            return this;
+        }
+
+        @Override
+        @SuppressFBWarnings("DCN") // match OTel in catching and logging NPE
+        public LongHistogramBuilder setExplicitBucketBoundariesAdvice(List<Long> bucketBoundaries) {
+            try {
+                Objects.requireNonNull(bucketBoundaries, "bucketBoundaries must not be null");
+                this.bucketBoundaries = validateBoundaries(
+                        bucketBoundaries.stream().map(Long::doubleValue).collect(toList()));
+            } catch (IllegalArgumentException | NullPointerException e) {
+                LOGGER.warn("Error setting explicit bucket boundaries advice: {}", e.getMessage());
+            }
+            return this;
+        }
+
+        @Override
+        public LongHistogram build() {
+            return new OtelLongHistogram(
+                    meter.registerStorage(builder, descriptor -> newHistogramStorage(descriptor, bucketBoundaries)));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongUpDownCounter.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongUpDownCounter.java
index 2bd9833a6bd..fe8e30063d1 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongUpDownCounter.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongUpDownCounter.java
@@ -18,66 +18,64 @@
 
 @ParametersAreNonnullByDefault
 final class OtelLongUpDownCounter extends OtelInstrument implements LongUpDownCounter {
-  OtelLongUpDownCounter(OtelMetricStorage storage) {
-    super(storage);
-  }
-
-  @Override
-  public void add(long value) {
-    add(value, Attributes.empty());
-  }
-
-  @Override
-  public void add(long value, Attributes attributes) {
-    storage.recordLong(value, attributes);
-  }
-
-  @Override
-  public void add(long value, Attributes attributes, Context unused) {
-    add(value, attributes);
-  }
-
-  static final class Builder implements LongUpDownCounterBuilder {
-    private final OtelMeter meter;
-    private final OtelInstrumentBuilder builder;
-
-    Builder(OtelMeter meter, String instrumentName) {
-      this.meter = meter;
-      this.builder = ofLongs(instrumentName, UP_DOWN_COUNTER);
+    OtelLongUpDownCounter(OtelMetricStorage storage) {
+        super(storage);
     }
 
     @Override
-    public LongUpDownCounterBuilder setDescription(String description) {
-      builder.setDescription(description);
-      return this;
+    public void add(long value) {
+        add(value, Attributes.empty());
     }
 
     @Override
-    public LongUpDownCounterBuilder setUnit(String unit) {
-      builder.setUnit(unit);
-      return this;
+    public void add(long value, Attributes attributes) {
+        storage.recordLong(value, attributes);
     }
 
     @Override
-    public DoubleUpDownCounterBuilder ofDoubles() {
-      return new OtelDoubleUpDownCounter.Builder(meter, builder);
+    public void add(long value, Attributes attributes, Context unused) {
+        add(value, attributes);
     }
 
-    @Override
-    public LongUpDownCounter build() {
-      return new OtelLongUpDownCounter(
-          meter.registerStorage(builder, OtelMetricStorage::newLongSumStorage));
-    }
+    static final class Builder implements LongUpDownCounterBuilder {
+        private final OtelMeter meter;
+        private final OtelInstrumentBuilder builder;
 
-    @Override
-    public ObservableLongMeasurement buildObserver() {
-      return meter.registerObservableStorage(builder, OtelMetricStorage::newLongDeltaStorage);
-    }
+        Builder(OtelMeter meter, String instrumentName) {
+            this.meter = meter;
+            this.builder = ofLongs(instrumentName, UP_DOWN_COUNTER);
+        }
 
-    @Override
-    public ObservableLongUpDownCounter buildWithCallback(
-        Consumer<ObservableLongMeasurement> callback) {
-      return meter.registerObservableCallback(callback, buildObserver());
+        @Override
+        public LongUpDownCounterBuilder setDescription(String description) {
+            builder.setDescription(description);
+            return this;
+        }
+
+        @Override
+        public LongUpDownCounterBuilder setUnit(String unit) {
+            builder.setUnit(unit);
+            return this;
+        }
+
+        @Override
+        public DoubleUpDownCounterBuilder ofDoubles() {
+            return new OtelDoubleUpDownCounter.Builder(meter, builder);
+        }
+
+        @Override
+        public LongUpDownCounter build() {
+            return new OtelLongUpDownCounter(meter.registerStorage(builder, OtelMetricStorage::newLongSumStorage));
+        }
+
+        @Override
+        public ObservableLongMeasurement buildObserver() {
+            return meter.registerObservableStorage(builder, OtelMetricStorage::newLongDeltaStorage);
+        }
+
+        @Override
+        public ObservableLongUpDownCounter buildWithCallback(Consumer<ObservableLongMeasurement> callback) {
+            return meter.registerObservableCallback(callback, buildObserver());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelMeter.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelMeter.java
index 1befb5a1b6b..f1c633a770b 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelMeter.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelMeter.java
@@ -29,112 +29,108 @@
 
 @ParametersAreNonnullByDefault
 final class OtelMeter implements Meter {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtelMeter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtelMeter.class);
 
-  private static final Pattern VALID_INSTRUMENT_NAME_PATTERN =
-      Pattern.compile("([A-Za-z])([A-Za-z0-9_\\-./]){0,254}");
+    private static final Pattern VALID_INSTRUMENT_NAME_PATTERN =
+            Pattern.compile("([A-Za-z])([A-Za-z0-9_\\-./]){0,254}");
 
-  static final Meter NOOP_METER = MeterProvider.noop().get("noop");
-  static final String NOOP_INSTRUMENT_NAME = "noop";
+    static final Meter NOOP_METER = MeterProvider.noop().get("noop");
+    static final String NOOP_INSTRUMENT_NAME = "noop";
 
-  private final OtelInstrumentationScope instrumentationScope;
+    private final OtelInstrumentationScope instrumentationScope;
 
-  OtelMeter(OtelInstrumentationScope instrumentationScope) {
-    this.instrumentationScope = instrumentationScope;
-  }
+    OtelMeter(OtelInstrumentationScope instrumentationScope) {
+        this.instrumentationScope = instrumentationScope;
+    }
+
+    @Override
+    public LongCounterBuilder counterBuilder(String instrumentName) {
+        if (!validInstrumentName(instrumentName)) {
+            return NOOP_METER.counterBuilder(NOOP_INSTRUMENT_NAME);
+        }
+        return new OtelLongCounter.Builder(this, instrumentName);
+    }
+
+    @Override
+    public LongUpDownCounterBuilder upDownCounterBuilder(String instrumentName) {
+        if (!validInstrumentName(instrumentName)) {
+            return NOOP_METER.upDownCounterBuilder(NOOP_INSTRUMENT_NAME);
+        }
+        return new OtelLongUpDownCounter.Builder(this, instrumentName);
+    }
+
+    @Override
+    public DoubleHistogramBuilder histogramBuilder(String instrumentName) {
+        if (!validInstrumentName(instrumentName)) {
+            return NOOP_METER.histogramBuilder(NOOP_INSTRUMENT_NAME);
+        }
+        return new OtelDoubleHistogram.Builder(this, instrumentName);
+    }
+
+    @Override
+    public DoubleGaugeBuilder gaugeBuilder(String instrumentName) {
+        if (!validInstrumentName(instrumentName)) {
+            return NOOP_METER.gaugeBuilder(NOOP_INSTRUMENT_NAME);
+        }
+        return new OtelDoubleGauge.Builder(this, instrumentName);
+    }
+
+    @Override
+    public BatchCallback batchCallback(
+            Runnable callback,
+            ObservableMeasurement observableMeasurement,
+            ObservableMeasurement... additionalMeasurements) {
+        return registerObservableCallback(
+                callback,
+                concat(Stream.of(observableMeasurement), Stream.of(additionalMeasurements))
+                        .filter(OtelObservableMeasurement.class::isInstance)
+                        .map(OtelObservableMeasurement.class::cast)
+                        .collect(toList()));
+    }
+
+    @Override
+    public String toString() {
+        return "OtelMeter{instrumentationScope=" + instrumentationScope + "}";
+    }
 
-  @Override
-  public LongCounterBuilder counterBuilder(String instrumentName) {
-    if (!validInstrumentName(instrumentName)) {
-      return NOOP_METER.counterBuilder(NOOP_INSTRUMENT_NAME);
+    OtelMetricStorage registerStorage(
+            OtelInstrumentBuilder builder, Function<OtelInstrumentDescriptor, OtelMetricStorage> storageFactory) {
+        return OtelMetricRegistry.INSTANCE.registerStorage(instrumentationScope, builder.descriptor(), storageFactory);
     }
-    return new OtelLongCounter.Builder(this, instrumentName);
-  }
 
-  @Override
-  public LongUpDownCounterBuilder upDownCounterBuilder(String instrumentName) {
-    if (!validInstrumentName(instrumentName)) {
-      return NOOP_METER.upDownCounterBuilder(NOOP_INSTRUMENT_NAME);
+    OtelObservableMeasurement registerObservableStorage(
+            OtelInstrumentBuilder builder, Function<OtelInstrumentDescriptor, OtelMetricStorage> storageFactory) {
+        return new OtelObservableMeasurement(OtelMetricRegistry.INSTANCE.registerStorage(
+                instrumentationScope, builder.observableDescriptor(), storageFactory));
     }
-    return new OtelLongUpDownCounter.Builder(this, instrumentName);
-  }
 
-  @Override
-  public DoubleHistogramBuilder histogramBuilder(String instrumentName) {
-    if (!validInstrumentName(instrumentName)) {
-      return NOOP_METER.histogramBuilder(NOOP_INSTRUMENT_NAME);
+    <M> OtelObservableCallback registerObservableCallback(Consumer<M> callback, M measurement) {
+        return registerObservableCallback(
+                () -> callback.accept(measurement), singletonList((OtelObservableMeasurement) measurement));
     }
-    return new OtelDoubleHistogram.Builder(this, instrumentName);
-  }
 
-  @Override
-  public DoubleGaugeBuilder gaugeBuilder(String instrumentName) {
-    if (!validInstrumentName(instrumentName)) {
-      return NOOP_METER.gaugeBuilder(NOOP_INSTRUMENT_NAME);
+    OtelObservableCallback registerObservableCallback(Runnable callback, List<OtelObservableMeasurement> measurements) {
+        OtelObservableCallback observable = new OtelObservableCallback(this, callback, measurements);
+        OtelMetricRegistry.INSTANCE.registerObservable(instrumentationScope, observable);
+        return observable;
     }
-    return new OtelDoubleGauge.Builder(this, instrumentName);
-  }
-
-  @Override
-  public BatchCallback batchCallback(
-      Runnable callback,
-      ObservableMeasurement observableMeasurement,
-      ObservableMeasurement... additionalMeasurements) {
-    return registerObservableCallback(
-        callback,
-        concat(Stream.of(observableMeasurement), Stream.of(additionalMeasurements))
-            .filter(OtelObservableMeasurement.class::isInstance)
-            .map(OtelObservableMeasurement.class::cast)
-            .collect(toList()));
-  }
-
-  @Override
-  public String toString() {
-    return "OtelMeter{instrumentationScope=" + instrumentationScope + "}";
-  }
-
-  OtelMetricStorage registerStorage(
-      OtelInstrumentBuilder builder,
-      Function<OtelInstrumentDescriptor, OtelMetricStorage> storageFactory) {
-    return OtelMetricRegistry.INSTANCE.registerStorage(
-        instrumentationScope, builder.descriptor(), storageFactory);
-  }
-
-  OtelObservableMeasurement registerObservableStorage(
-      OtelInstrumentBuilder builder,
-      Function<OtelInstrumentDescriptor, OtelMetricStorage> storageFactory) {
-    return new OtelObservableMeasurement(
-        OtelMetricRegistry.INSTANCE.registerStorage(
-            instrumentationScope, builder.observableDescriptor(), storageFactory));
-  }
-
-  <M> OtelObservableCallback registerObservableCallback(Consumer<M> callback, M measurement) {
-    return registerObservableCallback(
-        () -> callback.accept(measurement), singletonList((OtelObservableMeasurement) measurement));
-  }
-
-  OtelObservableCallback registerObservableCallback(
-      Runnable callback, List<OtelObservableMeasurement> measurements) {
-    OtelObservableCallback observable = new OtelObservableCallback(this, callback, measurements);
-    OtelMetricRegistry.INSTANCE.registerObservable(instrumentationScope, observable);
-    return observable;
-  }
-
-  boolean unregisterObservableCallback(OtelObservableCallback observable) {
-    return OtelMetricRegistry.INSTANCE.unregisterObservable(instrumentationScope, observable);
-  }
-
-  private static boolean validInstrumentName(@Nullable String instrumentName) {
-    if (instrumentName != null && VALID_INSTRUMENT_NAME_PATTERN.matcher(instrumentName).matches()) {
-      return true;
+
+    boolean unregisterObservableCallback(OtelObservableCallback observable) {
+        return OtelMetricRegistry.INSTANCE.unregisterObservable(instrumentationScope, observable);
     }
 
-    LOGGER.warn(
-        "Instrument name \"{}\" is invalid, returning noop instrument."
-            + " Instrument names must consist of 255 or fewer characters"
-            + " including alphanumeric, _, ., -, /, and start with a letter.",
-        instrumentName);
+    private static boolean validInstrumentName(@Nullable String instrumentName) {
+        if (instrumentName != null
+                && VALID_INSTRUMENT_NAME_PATTERN.matcher(instrumentName).matches()) {
+            return true;
+        }
 
-    return false;
-  }
+        LOGGER.warn(
+                "Instrument name \"{}\" is invalid, returning noop instrument."
+                        + " Instrument names must consist of 255 or fewer characters"
+                        + " including alphanumeric, _, ., -, /, and start with a letter.",
+                instrumentName);
+
+        return false;
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelMeterBuilder.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelMeterBuilder.java
index 6ce632e24d3..44646e1d999 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelMeterBuilder.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelMeterBuilder.java
@@ -7,32 +7,35 @@
 
 @ParametersAreNonnullByDefault
 final class OtelMeterBuilder implements MeterBuilder {
-  private final OtelMeterProvider meterProvider;
-
-  private final String instrumentationScopeName;
-  @Nullable private String instrumentationScopeVersion;
-  @Nullable private String schemaUrl;
-
-  OtelMeterBuilder(OtelMeterProvider meterProvider, String instrumentationScopeName) {
-    this.meterProvider = meterProvider;
-    this.instrumentationScopeName = instrumentationScopeName;
-  }
-
-  @Override
-  public MeterBuilder setInstrumentationVersion(String instrumentationScopeVersion) {
-    this.instrumentationScopeVersion = instrumentationScopeVersion;
-    return this;
-  }
-
-  @Override
-  public MeterBuilder setSchemaUrl(String schemaUrl) {
-    this.schemaUrl = schemaUrl;
-    return this;
-  }
-
-  @Override
-  public Meter build() {
-    return meterProvider.getMeterShim(
-        instrumentationScopeName, instrumentationScopeVersion, schemaUrl);
-  }
+    private final OtelMeterProvider meterProvider;
+
+    private final String instrumentationScopeName;
+
+    @Nullable
+    private String instrumentationScopeVersion;
+
+    @Nullable
+    private String schemaUrl;
+
+    OtelMeterBuilder(OtelMeterProvider meterProvider, String instrumentationScopeName) {
+        this.meterProvider = meterProvider;
+        this.instrumentationScopeName = instrumentationScopeName;
+    }
+
+    @Override
+    public MeterBuilder setInstrumentationVersion(String instrumentationScopeVersion) {
+        this.instrumentationScopeVersion = instrumentationScopeVersion;
+        return this;
+    }
+
+    @Override
+    public MeterBuilder setSchemaUrl(String schemaUrl) {
+        this.schemaUrl = schemaUrl;
+        return this;
+    }
+
+    @Override
+    public Meter build() {
+        return meterProvider.getMeterShim(instrumentationScopeName, instrumentationScopeVersion, schemaUrl);
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelMeterProvider.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelMeterProvider.java
index 245a5e19a1f..4867da65cd8 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelMeterProvider.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelMeterProvider.java
@@ -16,44 +16,40 @@
 
 @ParametersAreNonnullByDefault
 public final class OtelMeterProvider implements MeterProvider {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtelMeterProvider.class);
-  private static final String DEFAULT_METER_NAME = "unknown";
-
-  public static final MeterProvider INSTANCE = new OtelMeterProvider();
-
-  /** Meter shims, indexed by instrumentation scope. */
-  private final Map<OtelInstrumentationScope, OtelMeter> meters = new ConcurrentHashMap<>();
-
-  private OtelMeterProvider() {
-    // register attribute reader for class-loader where this provider is being used/injected
-    OtelMetricStorage.registerAttributeReader(
-        Attributes.class.getClassLoader(),
-        (attributes, visitor) ->
-            ((Attributes) attributes)
-                .forEach((a, v) -> visitor.visitAttribute(a.getType().ordinal(), a.getKey(), v)));
-  }
-
-  @Override
-  public Meter get(String instrumentationScopeName) {
-    return getMeterShim(instrumentationScopeName, null, null);
-  }
-
-  @Override
-  public MeterBuilder meterBuilder(String instrumentationScopeName) {
-    return new OtelMeterBuilder(this, instrumentationScopeName);
-  }
-
-  OtelMeter getMeterShim(
-      String instrumentationScopeName,
-      @Nullable String instrumentationScopeVersion,
-      @Nullable String schemaUrl) {
-    if (Strings.isBlank(instrumentationScopeName)) {
-      LOGGER.debug("Meter requested without instrumentation scope name.");
-      instrumentationScopeName = DEFAULT_METER_NAME;
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtelMeterProvider.class);
+    private static final String DEFAULT_METER_NAME = "unknown";
+
+    public static final MeterProvider INSTANCE = new OtelMeterProvider();
+
+    /** Meter shims, indexed by instrumentation scope. */
+    private final Map<OtelInstrumentationScope, OtelMeter> meters = new ConcurrentHashMap<>();
+
+    private OtelMeterProvider() {
+        // register attribute reader for class-loader where this provider is being used/injected
+        OtelMetricStorage.registerAttributeReader(
+                Attributes.class.getClassLoader(),
+                (attributes, visitor) -> ((Attributes) attributes)
+                        .forEach((a, v) -> visitor.visitAttribute(a.getType().ordinal(), a.getKey(), v)));
+    }
+
+    @Override
+    public Meter get(String instrumentationScopeName) {
+        return getMeterShim(instrumentationScopeName, null, null);
+    }
+
+    @Override
+    public MeterBuilder meterBuilder(String instrumentationScopeName) {
+        return new OtelMeterBuilder(this, instrumentationScopeName);
+    }
+
+    OtelMeter getMeterShim(
+            String instrumentationScopeName, @Nullable String instrumentationScopeVersion, @Nullable String schemaUrl) {
+        if (Strings.isBlank(instrumentationScopeName)) {
+            LOGGER.debug("Meter requested without instrumentation scope name.");
+            instrumentationScopeName = DEFAULT_METER_NAME;
+        }
+        return meters.computeIfAbsent(
+                new OtelInstrumentationScope(instrumentationScopeName, instrumentationScopeVersion, schemaUrl),
+                OtelMeter::new);
     }
-    return meters.computeIfAbsent(
-        new OtelInstrumentationScope(
-            instrumentationScopeName, instrumentationScopeVersion, schemaUrl),
-        OtelMeter::new);
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelObservableCallback.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelObservableCallback.java
index 80bf2c7f47d..4abf632991c 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelObservableCallback.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelObservableCallback.java
@@ -15,45 +15,43 @@
 import org.slf4j.LoggerFactory;
 
 final class OtelObservableCallback extends OtelObservable
-    implements ObservableDoubleCounter,
-        ObservableLongCounter,
-        ObservableDoubleGauge,
-        ObservableLongGauge,
-        ObservableDoubleUpDownCounter,
-        ObservableLongUpDownCounter,
-        BatchCallback {
+        implements ObservableDoubleCounter,
+                ObservableLongCounter,
+                ObservableDoubleGauge,
+                ObservableLongGauge,
+                ObservableDoubleUpDownCounter,
+                ObservableLongUpDownCounter,
+                BatchCallback {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtelObservableCallback.class);
-  private static final RatelimitedLogger RATELIMITED_LOGGER =
-      new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtelObservableCallback.class);
+    private static final RatelimitedLogger RATELIMITED_LOGGER = new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
 
-  private final OtelMeter meter;
-  private final Runnable callback;
-  private final List<OtelObservableMeasurement> measurements;
+    private final OtelMeter meter;
+    private final Runnable callback;
+    private final List<OtelObservableMeasurement> measurements;
 
-  OtelObservableCallback(
-      OtelMeter meter, Runnable callback, List<OtelObservableMeasurement> measurements) {
-    this.meter = meter;
-    this.callback = callback;
-    this.measurements = measurements;
-  }
+    OtelObservableCallback(OtelMeter meter, Runnable callback, List<OtelObservableMeasurement> measurements) {
+        this.meter = meter;
+        this.callback = callback;
+        this.measurements = measurements;
+    }
 
-  @Override
-  public void observeMeasurements() {
-    measurements.forEach(OtelObservableMeasurement::activate);
-    try {
-      callback.run();
-    } catch (Throwable e) {
-      RATELIMITED_LOGGER.warn("An exception occurred invoking callback for {}.", measurements, e);
-    } finally {
-      measurements.forEach(OtelObservableMeasurement::passivate);
+    @Override
+    public void observeMeasurements() {
+        measurements.forEach(OtelObservableMeasurement::activate);
+        try {
+            callback.run();
+        } catch (Throwable e) {
+            RATELIMITED_LOGGER.warn("An exception occurred invoking callback for {}.", measurements, e);
+        } finally {
+            measurements.forEach(OtelObservableMeasurement::passivate);
+        }
     }
-  }
 
-  @Override
-  public void close() {
-    if (!meter.unregisterObservableCallback(this)) {
-      RATELIMITED_LOGGER.warn("Callback for {} has called close() multiple times.", measurements);
+    @Override
+    public void close() {
+        if (!meter.unregisterObservableCallback(this)) {
+            RATELIMITED_LOGGER.warn("Callback for {} has called close() multiple times.", measurements);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelObservableMeasurement.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelObservableMeasurement.java
index 7c5888b2a53..163a62e4bde 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelObservableMeasurement.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelObservableMeasurement.java
@@ -11,61 +11,59 @@
 import org.slf4j.LoggerFactory;
 
 @ParametersAreNonnullByDefault
-final class OtelObservableMeasurement
-    implements ObservableDoubleMeasurement, ObservableLongMeasurement {
+final class OtelObservableMeasurement implements ObservableDoubleMeasurement, ObservableLongMeasurement {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtelObservableMeasurement.class);
-  private static final RatelimitedLogger RATELIMITED_LOGGER =
-      new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtelObservableMeasurement.class);
+    private static final RatelimitedLogger RATELIMITED_LOGGER = new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
 
-  private final OtelMetricStorage storage;
-  private volatile boolean active;
+    private final OtelMetricStorage storage;
+    private volatile boolean active;
 
-  OtelObservableMeasurement(OtelMetricStorage storage) {
-    this.storage = storage;
-  }
+    OtelObservableMeasurement(OtelMetricStorage storage) {
+        this.storage = storage;
+    }
 
-  void activate() {
-    this.active = true;
-  }
+    void activate() {
+        this.active = true;
+    }
 
-  void passivate() {
-    this.active = false;
-  }
+    void passivate() {
+        this.active = false;
+    }
 
-  @Override
-  public void record(double value) {
-    record(value, Attributes.empty());
-  }
+    @Override
+    public void record(double value) {
+        record(value, Attributes.empty());
+    }
 
-  @Override
-  public void record(double value, Attributes attributes) {
-    if (active) {
-      storage.recordDouble(value, attributes);
-    } else {
-      logNotActive();
+    @Override
+    public void record(double value, Attributes attributes) {
+        if (active) {
+            storage.recordDouble(value, attributes);
+        } else {
+            logNotActive();
+        }
     }
-  }
 
-  @Override
-  public void record(long value) {
-    record(value, Attributes.empty());
-  }
+    @Override
+    public void record(long value) {
+        record(value, Attributes.empty());
+    }
 
-  @Override
-  public void record(long value, Attributes attributes) {
-    if (active) {
-      storage.recordLong(value, attributes);
-    } else {
-      logNotActive();
+    @Override
+    public void record(long value, Attributes attributes) {
+        if (active) {
+            storage.recordLong(value, attributes);
+        } else {
+            logNotActive();
+        }
     }
-  }
 
-  private void logNotActive() {
-    if (LOGGER.isDebugEnabled()) {
-      RATELIMITED_LOGGER.warn(
-          "Measurement recorded for instrument {} outside callback registered to instrument. Dropping measurement.",
-          storage.getInstrumentName());
+    private void logNotActive() {
+        if (LOGGER.isDebugEnabled()) {
+            RATELIMITED_LOGGER.warn(
+                    "Measurement recorded for instrument {} outside callback registered to instrument. Dropping measurement.",
+                    storage.getInstrumentName());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelConventions.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelConventions.java
index a328a63140f..b42cb279e95 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelConventions.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelConventions.java
@@ -33,265 +33,258 @@
 import org.slf4j.LoggerFactory;
 
 public final class OtelConventions {
-  static final String SPAN_KIND_INTERNAL = "internal";
-  static final String OPERATION_NAME_SPECIFIC_ATTRIBUTE = "operation.name";
-  static final String SPAN_TYPE = "span.type";
-  static final String ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES = "analytics.event";
-  static final String HTTP_RESPONSE_STATUS_CODE_ATTRIBUTE = "http.response.status_code";
+    static final String SPAN_KIND_INTERNAL = "internal";
+    static final String OPERATION_NAME_SPECIFIC_ATTRIBUTE = "operation.name";
+    static final String SPAN_TYPE = "span.type";
+    static final String ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES = "analytics.event";
+    static final String HTTP_RESPONSE_STATUS_CODE_ATTRIBUTE = "http.response.status_code";
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtelConventions.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtelConventions.class);
 
-  private OtelConventions() {}
+    private OtelConventions() {}
 
-  /**
-   * Convert OpenTelemetry {@link SpanKind} to {@link Tags#SPAN_KIND} value.
-   *
-   * @param spanKind The OpenTelemetry span kind to convert.
-   * @return The {@link Tags#SPAN_KIND} value.
-   */
-  public static String toSpanKindTagValue(SpanKind spanKind) {
-    switch (spanKind) {
-      case CLIENT:
-        return SPAN_KIND_CLIENT;
-      case SERVER:
-        return SPAN_KIND_SERVER;
-      case PRODUCER:
-        return SPAN_KIND_PRODUCER;
-      case CONSUMER:
-        return SPAN_KIND_CONSUMER;
-      case INTERNAL:
-        return SPAN_KIND_INTERNAL;
-      default:
-        return spanKind.toString().toLowerCase(ROOT);
-    }
-  }
-
-  /**
-   * Convert {@link Tags#SPAN_KIND} value to OpenTelemetry {@link SpanKind}.
-   *
-   * @param spanKind The {@link Tags#SPAN_KIND} value to convert.
-   * @return The related OpenTelemetry {@link SpanKind}.
-   */
-  public static SpanKind toOtelSpanKind(String spanKind) {
-    if (spanKind == null) {
-      return INTERNAL;
-    }
-    switch (spanKind) {
-      case SPAN_KIND_CLIENT:
-        return CLIENT;
-      case SPAN_KIND_SERVER:
-        return SERVER;
-      case SPAN_KIND_PRODUCER:
-        return PRODUCER;
-      case SPAN_KIND_CONSUMER:
-        return CONSUMER;
-      default:
-        return INTERNAL;
+    /**
+     * Convert OpenTelemetry {@link SpanKind} to {@link Tags#SPAN_KIND} value.
+     *
+     * @param spanKind The OpenTelemetry span kind to convert.
+     * @return The {@link Tags#SPAN_KIND} value.
+     */
+    public static String toSpanKindTagValue(SpanKind spanKind) {
+        switch (spanKind) {
+            case CLIENT:
+                return SPAN_KIND_CLIENT;
+            case SERVER:
+                return SPAN_KIND_SERVER;
+            case PRODUCER:
+                return SPAN_KIND_PRODUCER;
+            case CONSUMER:
+                return SPAN_KIND_CONSUMER;
+            case INTERNAL:
+                return SPAN_KIND_INTERNAL;
+            default:
+                return spanKind.toString().toLowerCase(ROOT);
+        }
     }
-  }
 
-  /**
-   * Applies the reserved span attributes. Only OpenTelemetry specific span attributes are handled
-   * here, the default ones are handled by tag interceptor while setting span attributes.
-   *
-   * @param span The span to apply the attributes.
-   * @param key The attribute key.
-   * @param value The attribute value.
-   * @param <T> The attribute type.
-   * @return {@code true} if the attributes is a reserved attribute applied to the span, {@code
-   *     false} otherwise.
-   */
-  public static <T> boolean applyReservedAttribute(AgentSpan span, AttributeKey<T> key, T value) {
-    String name = key.getKey();
-    switch (key.getType()) {
-      case STRING:
-        if (OPERATION_NAME_SPECIFIC_ATTRIBUTE.equals(name) && value instanceof String) {
-          span.setOperationName(((String) value).toLowerCase(ROOT));
-          return true;
-        } else if (ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES.equals(name) && value instanceof String) {
-          span.setMetric(ANALYTICS_SAMPLE_RATE, parseBoolean((String) value) ? 1 : 0);
-          return true;
-        } else if (SPAN_TYPE.equals(name) && value instanceof String) {
-          span.setSpanType((CharSequence) value);
-          return true;
-        }
-      case BOOLEAN:
-        if (ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES.equals(name) && value instanceof Boolean) {
-          span.setMetric(ANALYTICS_SAMPLE_RATE, ((Boolean) value) ? 1 : 0);
-          return true;
+    /**
+     * Convert {@link Tags#SPAN_KIND} value to OpenTelemetry {@link SpanKind}.
+     *
+     * @param spanKind The {@link Tags#SPAN_KIND} value to convert.
+     * @return The related OpenTelemetry {@link SpanKind}.
+     */
+    public static SpanKind toOtelSpanKind(String spanKind) {
+        if (spanKind == null) {
+            return INTERNAL;
         }
-      case LONG:
-        if (HTTP_RESPONSE_STATUS_CODE_ATTRIBUTE.equals(name) && value instanceof Number) {
-          span.setHttpStatusCode(((Number) value).intValue());
-          return true;
+        switch (spanKind) {
+            case SPAN_KIND_CLIENT:
+                return CLIENT;
+            case SPAN_KIND_SERVER:
+                return SERVER;
+            case SPAN_KIND_PRODUCER:
+                return PRODUCER;
+            case SPAN_KIND_CONSUMER:
+                return CONSUMER;
+            default:
+                return INTERNAL;
         }
     }
-    return false;
-  }
 
-  public static void applyNamingConvention(AgentSpan span) {
-    // Check if span operation name is unchanged from its default value
-    if (span.getOperationName() == SPAN_KIND_INTERNAL) {
-      span.setOperationName(computeOperationName(span).toLowerCase(ROOT));
+    /**
+     * Applies the reserved span attributes. Only OpenTelemetry specific span attributes are handled
+     * here, the default ones are handled by tag interceptor while setting span attributes.
+     *
+     * @param span The span to apply the attributes.
+     * @param key The attribute key.
+     * @param value The attribute value.
+     * @param <T> The attribute type.
+     * @return {@code true} if the attributes is a reserved attribute applied to the span, {@code
+     *     false} otherwise.
+     */
+    public static <T> boolean applyReservedAttribute(AgentSpan span, AttributeKey<T> key, T value) {
+        String name = key.getKey();
+        switch (key.getType()) {
+            case STRING:
+                if (OPERATION_NAME_SPECIFIC_ATTRIBUTE.equals(name) && value instanceof String) {
+                    span.setOperationName(((String) value).toLowerCase(ROOT));
+                    return true;
+                } else if (ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES.equals(name) && value instanceof String) {
+                    span.setMetric(ANALYTICS_SAMPLE_RATE, parseBoolean((String) value) ? 1 : 0);
+                    return true;
+                } else if (SPAN_TYPE.equals(name) && value instanceof String) {
+                    span.setSpanType((CharSequence) value);
+                    return true;
+                }
+            case BOOLEAN:
+                if (ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES.equals(name) && value instanceof Boolean) {
+                    span.setMetric(ANALYTICS_SAMPLE_RATE, ((Boolean) value) ? 1 : 0);
+                    return true;
+                }
+            case LONG:
+                if (HTTP_RESPONSE_STATUS_CODE_ATTRIBUTE.equals(name) && value instanceof Number) {
+                    span.setHttpStatusCode(((Number) value).intValue());
+                    return true;
+                }
+        }
+        return false;
     }
-  }
 
-  public static void setEventsAsTag(AgentSpan span, List<OtelSpanEvent> events) {
-    if (events == null || events.isEmpty()) {
-      return;
+    public static void applyNamingConvention(AgentSpan span) {
+        // Check if span operation name is unchanged from its default value
+        if (span.getOperationName() == SPAN_KIND_INTERNAL) {
+            span.setOperationName(computeOperationName(span).toLowerCase(ROOT));
+        }
     }
-    span.setTag(SPAN_EVENTS, OtelSpanEvent.toTag(events));
-  }
-
-  public static void applySpanEventExceptionAttributesAsTags(
-      AgentSpan span, Attributes exceptionAttributes) {
-    span.setTag(ERROR_MSG, exceptionAttributes.get(EXCEPTION_MESSAGE_ATTRIBUTE_KEY));
-    span.setTag(ERROR_TYPE, exceptionAttributes.get(EXCEPTION_TYPE_ATTRIBUTE_KEY));
-    span.setTag(ERROR_STACK, exceptionAttributes.get(EXCEPTION_STACK_TRACE_ATTRIBUTE_KEY));
-  }
 
-  private static String computeOperationName(AgentSpan span) {
-    Object spanKingTag = span.getTag(SPAN_KIND);
-    SpanKind spanKind =
-        spanKingTag instanceof String ? toOtelSpanKind((String) spanKingTag) : INTERNAL;
-    /*
-     * HTTP convention: https://opentelemetry.io/docs/specs/otel/trace/semantic_conventions/http/
-     */
-    String httpRequestMethod = getStringAttribute(span, "http.request.method");
-    if (spanKind == SERVER && httpRequestMethod != null) {
-      return "http.server.request";
-    }
-    if (spanKind == CLIENT && httpRequestMethod != null) {
-      return "http.client.request";
-    }
-    /*
-     * Database convention: https://opentelemetry.io/docs/specs/semconv/database/database-spans/
-     */
-    String dbSystem = getStringAttribute(span, "db.system");
-    if (spanKind == CLIENT && dbSystem != null) {
-      return dbSystem + ".query";
-    }
-    /*
-     * Messaging: https://opentelemetry.io/docs/specs/semconv/messaging/messaging-spans/
-     */
-    String messagingSystem = getStringAttribute(span, "messaging.system");
-    String messagingOperation = getStringAttribute(span, "messaging.operation");
-    if ((spanKind == CONSUMER || spanKind == PRODUCER || spanKind == CLIENT || spanKind == SERVER)
-        && messagingSystem != null
-        && messagingOperation != null) {
-      return messagingSystem + "." + messagingOperation;
-    }
-    /*
-     * AWS: https://opentelemetry.io/docs/specs/semconv/cloud-providers/aws-sdk/
-     */
-    String rpcSystem = getStringAttribute(span, "rpc.system");
-    if (spanKind == CLIENT && "aws-api".equals(rpcSystem)) {
-      String service = getStringAttribute(span, "rpc.service");
-      if (service == null) {
-        return "aws.client.request";
-      } else {
-        return "aws." + service + ".request";
-      }
-    }
-    /*
-     * RPC: https://opentelemetry.io/docs/specs/semconv/rpc/rpc-spans/
-     */
-    if (spanKind == CLIENT && rpcSystem != null) {
-      return rpcSystem + ".client.request";
-    }
-    if (spanKind == SERVER && rpcSystem != null) {
-      return rpcSystem + ".server.request";
-    }
-    /*
-     * FaaS:
-     * https://opentelemetry.io/docs/specs/semconv/faas/faas-spans/#incoming-faas-span-attributes
-     * https://opentelemetry.io/docs/specs/semconv/faas/faas-spans/#outgoing-invocations
-     */
-    String faasInvokedProvider = getStringAttribute(span, "faas.invoked_provider");
-    String faasInvokedName = getStringAttribute(span, "faas.invoked_name");
-    if (spanKind == CLIENT && faasInvokedProvider != null && faasInvokedName != null) {
-      return faasInvokedProvider + "." + faasInvokedName + ".invoke";
-    }
-    String faasTrigger = getStringAttribute(span, "faas.trigger");
-    if (spanKind == SERVER && faasTrigger != null) {
-      return faasTrigger + ".invoke";
-    }
-    /*
-     * GraphQL: https://opentelemetry.io/docs/specs/otel/trace/semantic_conventions/instrumentation/graphql/
-     */
-    String graphqlOperationType = getStringAttribute(span, "graphql.operation.type");
-    if (graphqlOperationType != null) {
-      return "graphql.server.request";
-    }
-    /*
-     * Generic server / client: https://opentelemetry.io/docs/specs/semconv/http/http-spans/
-     */
-    String networkProtocolName = getStringAttribute(span, "network.protocol.name");
-    if (spanKind == SERVER) {
-      return networkProtocolName == null
-          ? "server.request"
-          : networkProtocolName + ".server.request";
+    public static void setEventsAsTag(AgentSpan span, List<OtelSpanEvent> events) {
+        if (events == null || events.isEmpty()) {
+            return;
+        }
+        span.setTag(SPAN_EVENTS, OtelSpanEvent.toTag(events));
     }
-    if (spanKind == CLIENT) {
-      return networkProtocolName == null
-          ? "client.request"
-          : networkProtocolName + ".client.request";
+
+    public static void applySpanEventExceptionAttributesAsTags(AgentSpan span, Attributes exceptionAttributes) {
+        span.setTag(ERROR_MSG, exceptionAttributes.get(EXCEPTION_MESSAGE_ATTRIBUTE_KEY));
+        span.setTag(ERROR_TYPE, exceptionAttributes.get(EXCEPTION_TYPE_ATTRIBUTE_KEY));
+        span.setTag(ERROR_STACK, exceptionAttributes.get(EXCEPTION_STACK_TRACE_ATTRIBUTE_KEY));
     }
-    // Fallback if no convention match
-    return spanKind.name();
-  }
 
-  @Nullable
-  private static String getStringAttribute(AgentSpan span, String key) {
-    Object tag = span.getTag(key);
-    if (tag == null) {
-      return null;
-    } else if (!(tag instanceof String)) {
-      LOGGER.debug("Span attributes {} is not a string", key);
-      return key;
+    private static String computeOperationName(AgentSpan span) {
+        Object spanKingTag = span.getTag(SPAN_KIND);
+        SpanKind spanKind = spanKingTag instanceof String ? toOtelSpanKind((String) spanKingTag) : INTERNAL;
+        /*
+         * HTTP convention: https://opentelemetry.io/docs/specs/otel/trace/semantic_conventions/http/
+         */
+        String httpRequestMethod = getStringAttribute(span, "http.request.method");
+        if (spanKind == SERVER && httpRequestMethod != null) {
+            return "http.server.request";
+        }
+        if (spanKind == CLIENT && httpRequestMethod != null) {
+            return "http.client.request";
+        }
+        /*
+         * Database convention: https://opentelemetry.io/docs/specs/semconv/database/database-spans/
+         */
+        String dbSystem = getStringAttribute(span, "db.system");
+        if (spanKind == CLIENT && dbSystem != null) {
+            return dbSystem + ".query";
+        }
+        /*
+         * Messaging: https://opentelemetry.io/docs/specs/semconv/messaging/messaging-spans/
+         */
+        String messagingSystem = getStringAttribute(span, "messaging.system");
+        String messagingOperation = getStringAttribute(span, "messaging.operation");
+        if ((spanKind == CONSUMER || spanKind == PRODUCER || spanKind == CLIENT || spanKind == SERVER)
+                && messagingSystem != null
+                && messagingOperation != null) {
+            return messagingSystem + "." + messagingOperation;
+        }
+        /*
+         * AWS: https://opentelemetry.io/docs/specs/semconv/cloud-providers/aws-sdk/
+         */
+        String rpcSystem = getStringAttribute(span, "rpc.system");
+        if (spanKind == CLIENT && "aws-api".equals(rpcSystem)) {
+            String service = getStringAttribute(span, "rpc.service");
+            if (service == null) {
+                return "aws.client.request";
+            } else {
+                return "aws." + service + ".request";
+            }
+        }
+        /*
+         * RPC: https://opentelemetry.io/docs/specs/semconv/rpc/rpc-spans/
+         */
+        if (spanKind == CLIENT && rpcSystem != null) {
+            return rpcSystem + ".client.request";
+        }
+        if (spanKind == SERVER && rpcSystem != null) {
+            return rpcSystem + ".server.request";
+        }
+        /*
+         * FaaS:
+         * https://opentelemetry.io/docs/specs/semconv/faas/faas-spans/#incoming-faas-span-attributes
+         * https://opentelemetry.io/docs/specs/semconv/faas/faas-spans/#outgoing-invocations
+         */
+        String faasInvokedProvider = getStringAttribute(span, "faas.invoked_provider");
+        String faasInvokedName = getStringAttribute(span, "faas.invoked_name");
+        if (spanKind == CLIENT && faasInvokedProvider != null && faasInvokedName != null) {
+            return faasInvokedProvider + "." + faasInvokedName + ".invoke";
+        }
+        String faasTrigger = getStringAttribute(span, "faas.trigger");
+        if (spanKind == SERVER && faasTrigger != null) {
+            return faasTrigger + ".invoke";
+        }
+        /*
+         * GraphQL: https://opentelemetry.io/docs/specs/otel/trace/semantic_conventions/instrumentation/graphql/
+         */
+        String graphqlOperationType = getStringAttribute(span, "graphql.operation.type");
+        if (graphqlOperationType != null) {
+            return "graphql.server.request";
+        }
+        /*
+         * Generic server / client: https://opentelemetry.io/docs/specs/semconv/http/http-spans/
+         */
+        String networkProtocolName = getStringAttribute(span, "network.protocol.name");
+        if (spanKind == SERVER) {
+            return networkProtocolName == null ? "server.request" : networkProtocolName + ".server.request";
+        }
+        if (spanKind == CLIENT) {
+            return networkProtocolName == null ? "client.request" : networkProtocolName + ".client.request";
+        }
+        // Fallback if no convention match
+        return spanKind.name();
     }
-    return (String) tag;
-  }
 
-  public static SpanAttributes convertAttributes(Attributes attributes) {
-    if (attributes.isEmpty()) {
-      return SpanAttributes.EMPTY;
+    @Nullable
+    private static String getStringAttribute(AgentSpan span, String key) {
+        Object tag = span.getTag(key);
+        if (tag == null) {
+            return null;
+        } else if (!(tag instanceof String)) {
+            LOGGER.debug("Span attributes {} is not a string", key);
+            return key;
+        }
+        return (String) tag;
     }
-    SpanAttributes.Builder builder = SpanAttributes.builder();
-    attributes.forEach(
-        (attributeKey, value) -> {
-          String key = attributeKey.getKey();
-          switch (attributeKey.getType()) {
-            case STRING:
-              builder.put(key, (String) value);
-              break;
-            case BOOLEAN:
-              builder.put(key, (boolean) value);
-              break;
-            case LONG:
-              builder.put(key, (long) value);
-              break;
-            case DOUBLE:
-              builder.put(key, (double) value);
-              break;
-            case STRING_ARRAY:
-              //noinspection unchecked
-              builder.putStringArray(key, (List<String>) value);
-              break;
-            case BOOLEAN_ARRAY:
-              //noinspection unchecked
-              builder.putBooleanArray(key, (List<Boolean>) value);
-              break;
-            case LONG_ARRAY:
-              //noinspection unchecked
-              builder.putLongArray(key, (List<Long>) value);
-              break;
-            case DOUBLE_ARRAY:
-              //noinspection unchecked
-              builder.putDoubleArray(key, (List<Double>) value);
-              break;
-          }
+
+    public static SpanAttributes convertAttributes(Attributes attributes) {
+        if (attributes.isEmpty()) {
+            return SpanAttributes.EMPTY;
+        }
+        SpanAttributes.Builder builder = SpanAttributes.builder();
+        attributes.forEach((attributeKey, value) -> {
+            String key = attributeKey.getKey();
+            switch (attributeKey.getType()) {
+                case STRING:
+                    builder.put(key, (String) value);
+                    break;
+                case BOOLEAN:
+                    builder.put(key, (boolean) value);
+                    break;
+                case LONG:
+                    builder.put(key, (long) value);
+                    break;
+                case DOUBLE:
+                    builder.put(key, (double) value);
+                    break;
+                case STRING_ARRAY:
+                    //noinspection unchecked
+                    builder.putStringArray(key, (List<String>) value);
+                    break;
+                case BOOLEAN_ARRAY:
+                    //noinspection unchecked
+                    builder.putBooleanArray(key, (List<Boolean>) value);
+                    break;
+                case LONG_ARRAY:
+                    //noinspection unchecked
+                    builder.putLongArray(key, (List<Long>) value);
+                    break;
+                case DOUBLE_ARRAY:
+                    //noinspection unchecked
+                    builder.putDoubleArray(key, (List<Double>) value);
+                    break;
+            }
         });
-    return builder.build();
-  }
+        return builder.build();
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelExtractedContext.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelExtractedContext.java
index c8ad8fc4b2a..67b6f2569df 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelExtractedContext.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelExtractedContext.java
@@ -15,72 +15,71 @@
 import org.slf4j.LoggerFactory;
 
 public class OtelExtractedContext implements AgentSpanContext {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtelExtractedContext.class);
-  private final DDTraceId traceId;
-  private final long spanId;
-  private final int prioritySampling;
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtelExtractedContext.class);
+    private final DDTraceId traceId;
+    private final long spanId;
+    private final int prioritySampling;
 
-  private OtelExtractedContext(SpanContext context) {
-    this.traceId = DDTraceId.fromHex(context.getTraceId());
-    this.spanId = DDSpanId.fromHex(context.getSpanId());
-    this.prioritySampling =
-        context.isSampled() ? PrioritySampling.SAMPLER_KEEP : PrioritySampling.UNSET;
-  }
-
-  public static AgentSpanContext extract(Context context) {
-    Span span = Span.fromContext(context);
-    if (span instanceof OtelSpan) {
-      // avoid creating unnecessary OtelSpanContext
-      return ((OtelSpan) span).getAgentSpanContext();
+    private OtelExtractedContext(SpanContext context) {
+        this.traceId = DDTraceId.fromHex(context.getTraceId());
+        this.spanId = DDSpanId.fromHex(context.getSpanId());
+        this.prioritySampling = context.isSampled() ? PrioritySampling.SAMPLER_KEEP : PrioritySampling.UNSET;
     }
-    SpanContext spanContext = span.getSpanContext();
-    if (spanContext instanceof OtelSpanContext) {
-      return ((OtelSpanContext) spanContext).delegate;
-    } else if (spanContext.isValid()) {
-      try {
-        return new OtelExtractedContext(spanContext);
-      } catch (NumberFormatException e) {
-        LOGGER.debug(
-            "Failed to convert span context with trace id = {} and span id = {}",
-            spanContext.getTraceId(),
-            spanContext.getSpanId());
-      }
+
+    public static AgentSpanContext extract(Context context) {
+        Span span = Span.fromContext(context);
+        if (span instanceof OtelSpan) {
+            // avoid creating unnecessary OtelSpanContext
+            return ((OtelSpan) span).getAgentSpanContext();
+        }
+        SpanContext spanContext = span.getSpanContext();
+        if (spanContext instanceof OtelSpanContext) {
+            return ((OtelSpanContext) spanContext).delegate;
+        } else if (spanContext.isValid()) {
+            try {
+                return new OtelExtractedContext(spanContext);
+            } catch (NumberFormatException e) {
+                LOGGER.debug(
+                        "Failed to convert span context with trace id = {} and span id = {}",
+                        spanContext.getTraceId(),
+                        spanContext.getSpanId());
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Override
-  public DDTraceId getTraceId() {
-    return this.traceId;
-  }
+    @Override
+    public DDTraceId getTraceId() {
+        return this.traceId;
+    }
 
-  @Override
-  public long getSpanId() {
-    return this.spanId;
-  }
+    @Override
+    public long getSpanId() {
+        return this.spanId;
+    }
 
-  @Override
-  public AgentTraceCollector getTraceCollector() {
-    return AgentTracer.NoopAgentTraceCollector.INSTANCE;
-  }
+    @Override
+    public AgentTraceCollector getTraceCollector() {
+        return AgentTracer.NoopAgentTraceCollector.INSTANCE;
+    }
 
-  @Override
-  public int getSamplingPriority() {
-    return this.prioritySampling;
-  }
+    @Override
+    public int getSamplingPriority() {
+        return this.prioritySampling;
+    }
 
-  @Override
-  public Iterable<Map.Entry<String, String>> baggageItems() {
-    return null;
-  }
+    @Override
+    public Iterable<Map.Entry<String, String>> baggageItems() {
+        return null;
+    }
 
-  @Override
-  public PathwayContext getPathwayContext() {
-    return null;
-  }
+    @Override
+    public PathwayContext getPathwayContext() {
+        return null;
+    }
 
-  @Override
-  public boolean isRemote() {
-    return true;
-  }
+    @Override
+    public boolean isRemote() {
+        return true;
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpan.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpan.java
index 86581c215b0..390330eb374 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpan.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpan.java
@@ -33,243 +33,243 @@
 
 @ParametersAreNonnullByDefault
 public class OtelSpan implements Span, WithAgentSpan, SpanWrapper {
-  private final AgentSpan delegate;
-  private StatusCode statusCode = UNSET;
-  private volatile boolean recording = true;
-
-  /**
-   * Span events ({@code null} until an event is added).
-   *
-   * <p>Volatile so {@link #onSpanFinished()} can skip the lock in common no-events case; writes and
-   * the rare non-null read synchronize on {@code this} to guard against concurrent recording from
-   * another thread.
-   */
-  private volatile List<OtelSpanEvent> events;
-
-  public OtelSpan(AgentSpan delegate) {
-    this.delegate = delegate;
-    if (delegate instanceof AttachableWrapper) {
-      ((AttachableWrapper) delegate).attachWrapper(this);
+    private final AgentSpan delegate;
+    private StatusCode statusCode = UNSET;
+    private volatile boolean recording = true;
+
+    /**
+     * Span events ({@code null} until an event is added).
+     *
+     * <p>Volatile so {@link #onSpanFinished()} can skip the lock in common no-events case; writes and
+     * the rare non-null read synchronize on {@code this} to guard against concurrent recording from
+     * another thread.
+     */
+    private volatile List<OtelSpanEvent> events;
+
+    public OtelSpan(AgentSpan delegate) {
+        this.delegate = delegate;
+        if (delegate instanceof AttachableWrapper) {
+            ((AttachableWrapper) delegate).attachWrapper(this);
+        }
+        delegate.spanContext().setIntegrationName("otel");
     }
-    delegate.spanContext().setIntegrationName("otel");
-  }
-
-  public static Span invalid() {
-    return NoopSpan.INSTANCE;
-  }
-
-  @Override
-  public <T> Span setAttribute(AttributeKey<T> key, T value) {
-    if (this.recording && !applyReservedAttribute(this.delegate, key, value)) {
-      switch (key.getType()) {
-        case STRING_ARRAY:
-        case BOOLEAN_ARRAY:
-        case LONG_ARRAY:
-        case DOUBLE_ARRAY:
-          if (value instanceof List) {
-            List<?> valueList = (List<?>) value;
-            if (valueList.isEmpty()) {
-              // Store as object to prevent delegate to remove tag when value is empty
-              this.delegate.setTag(key.getKey(), (Object) "");
-            } else {
-              for (int index = 0; index < valueList.size(); index++) {
-                this.delegate.setTag(key.getKey() + "." + index, valueList.get(index));
-              }
-            }
-          }
-          break;
-        default:
-          this.delegate.setTag(key.getKey(), value);
-          break;
-      }
-    }
-    return this;
-  }
-
-  @Override
-  public Span addEvent(String name, Attributes attributes) {
-    if (this.recording) {
-      doAddEvent(new OtelSpanEvent(name, attributes));
-    }
-    return this;
-  }
-
-  @Override
-  public Span addEvent(String name, Attributes attributes, long timestamp, TimeUnit unit) {
-    if (this.recording) {
-      doAddEvent(new OtelSpanEvent(name, attributes, timestamp, unit));
-    }
-    return this;
-  }
 
-  private synchronized void doAddEvent(OtelSpanEvent event) {
-    List<OtelSpanEvent> eventsSnapshot = this.events;
-    if (eventsSnapshot == null) {
-      this.events = eventsSnapshot = new ArrayList<>();
+    public static Span invalid() {
+        return NoopSpan.INSTANCE;
     }
-    eventsSnapshot.add(event);
-  }
-
-  @Override
-  public Span setStatus(StatusCode statusCode, String description) {
-    if (this.recording) {
-      if (this.statusCode == UNSET) {
-        this.statusCode = statusCode;
-        this.delegate.setError(statusCode == ERROR, ErrorPriorities.MANUAL_INSTRUMENTATION);
-        this.delegate.setErrorMessage(statusCode == ERROR ? description : null);
-      } else if (this.statusCode == ERROR && statusCode == OK) {
-        this.statusCode = statusCode;
-        this.delegate.setError(false, ErrorPriorities.MANUAL_INSTRUMENTATION);
-        this.delegate.setErrorMessage(null);
-      }
-    }
-    return this;
-  }
-
-  @Override
-  public Span recordException(Throwable exception, Attributes additionalAttributes) {
-    if (this.recording) {
-      additionalAttributes = initializeExceptionAttributes(exception, additionalAttributes);
-      applySpanEventExceptionAttributesAsTags(this.delegate, additionalAttributes);
-      doAddEvent(new OtelSpanEvent(EXCEPTION_SPAN_EVENT_NAME, additionalAttributes));
-    }
-    return this;
-  }
-
-  @Override
-  public Span updateName(String name) {
-    if (this.recording) {
-      this.delegate.setResourceName(name, ResourceNamePriorities.MANUAL_INSTRUMENTATION);
-    }
-    return this;
-  }
-
-  @Override
-  public void end() {
-    this.recording = false;
-    this.delegate.finish();
-  }
-
-  @Override
-  public void end(long timestamp, TimeUnit unit) {
-    this.recording = false;
-    this.delegate.finish(unit.toMicros(timestamp));
-  }
-
-  @Override
-  public SpanContext getSpanContext() {
-    return OtelSpanContext.fromLocalSpan(this.delegate);
-  }
-
-  @Override
-  public boolean isRecording() {
-    return this.recording;
-  }
-
-  public ContextScope activate() {
-    return activateSpan(this.delegate);
-  }
-
-  public AgentSpanContext getAgentSpanContext() {
-    return this.delegate.spanContext();
-  }
-
-  @Override
-  public AgentSpan asAgentSpan() {
-    return this.delegate;
-  }
-
-  @Override
-  public void onSpanFinished() {
-    applyNamingConvention(this.delegate);
-    // Fast path: skip the lock when there are no events (the common case)
-    if (this.events != null) {
-      List<OtelSpanEvent> eventsSnapshot;
-      synchronized (this) {
-        // detach events for serialization
-        eventsSnapshot = this.events;
-        this.events = null;
-      }
-      setEventsAsTag(this.delegate, eventsSnapshot);
-    }
-  }
-
-  private static class NoopSpan implements Span {
-    private static final Span INSTANCE = new NoopSpan();
 
     @Override
     public <T> Span setAttribute(AttributeKey<T> key, T value) {
-      return this;
+        if (this.recording && !applyReservedAttribute(this.delegate, key, value)) {
+            switch (key.getType()) {
+                case STRING_ARRAY:
+                case BOOLEAN_ARRAY:
+                case LONG_ARRAY:
+                case DOUBLE_ARRAY:
+                    if (value instanceof List) {
+                        List<?> valueList = (List<?>) value;
+                        if (valueList.isEmpty()) {
+                            // Store as object to prevent delegate to remove tag when value is empty
+                            this.delegate.setTag(key.getKey(), (Object) "");
+                        } else {
+                            for (int index = 0; index < valueList.size(); index++) {
+                                this.delegate.setTag(key.getKey() + "." + index, valueList.get(index));
+                            }
+                        }
+                    }
+                    break;
+                default:
+                    this.delegate.setTag(key.getKey(), value);
+                    break;
+            }
+        }
+        return this;
     }
 
     @Override
     public Span addEvent(String name, Attributes attributes) {
-      return this;
+        if (this.recording) {
+            doAddEvent(new OtelSpanEvent(name, attributes));
+        }
+        return this;
     }
 
     @Override
     public Span addEvent(String name, Attributes attributes, long timestamp, TimeUnit unit) {
-      return this;
+        if (this.recording) {
+            doAddEvent(new OtelSpanEvent(name, attributes, timestamp, unit));
+        }
+        return this;
+    }
+
+    private synchronized void doAddEvent(OtelSpanEvent event) {
+        List<OtelSpanEvent> eventsSnapshot = this.events;
+        if (eventsSnapshot == null) {
+            this.events = eventsSnapshot = new ArrayList<>();
+        }
+        eventsSnapshot.add(event);
     }
 
     @Override
     public Span setStatus(StatusCode statusCode, String description) {
-      return this;
+        if (this.recording) {
+            if (this.statusCode == UNSET) {
+                this.statusCode = statusCode;
+                this.delegate.setError(statusCode == ERROR, ErrorPriorities.MANUAL_INSTRUMENTATION);
+                this.delegate.setErrorMessage(statusCode == ERROR ? description : null);
+            } else if (this.statusCode == ERROR && statusCode == OK) {
+                this.statusCode = statusCode;
+                this.delegate.setError(false, ErrorPriorities.MANUAL_INSTRUMENTATION);
+                this.delegate.setErrorMessage(null);
+            }
+        }
+        return this;
     }
 
     @Override
     public Span recordException(Throwable exception, Attributes additionalAttributes) {
-      return this;
+        if (this.recording) {
+            additionalAttributes = initializeExceptionAttributes(exception, additionalAttributes);
+            applySpanEventExceptionAttributesAsTags(this.delegate, additionalAttributes);
+            doAddEvent(new OtelSpanEvent(EXCEPTION_SPAN_EVENT_NAME, additionalAttributes));
+        }
+        return this;
     }
 
     @Override
     public Span updateName(String name) {
-      return this;
+        if (this.recording) {
+            this.delegate.setResourceName(name, ResourceNamePriorities.MANUAL_INSTRUMENTATION);
+        }
+        return this;
     }
 
     @Override
-    public void end() {}
+    public void end() {
+        this.recording = false;
+        this.delegate.finish();
+    }
 
     @Override
-    public void end(long timestamp, TimeUnit unit) {}
+    public void end(long timestamp, TimeUnit unit) {
+        this.recording = false;
+        this.delegate.finish(unit.toMicros(timestamp));
+    }
 
     @Override
     public SpanContext getSpanContext() {
-      return NoopSpanContext.INSTANCE;
+        return OtelSpanContext.fromLocalSpan(this.delegate);
     }
 
     @Override
     public boolean isRecording() {
-      return false;
+        return this.recording;
     }
-  }
 
-  private static class NoopSpanContext implements SpanContext {
-    private static final SpanContext INSTANCE = new NoopSpanContext();
+    public ContextScope activate() {
+        return activateSpan(this.delegate);
+    }
 
-    @Override
-    public String getTraceId() {
-      return "00000000000000000000000000000000";
+    public AgentSpanContext getAgentSpanContext() {
+        return this.delegate.spanContext();
     }
 
     @Override
-    public String getSpanId() {
-      return "0000000000000000";
+    public AgentSpan asAgentSpan() {
+        return this.delegate;
     }
 
     @Override
-    public TraceFlags getTraceFlags() {
-      return TraceFlags.getDefault();
+    public void onSpanFinished() {
+        applyNamingConvention(this.delegate);
+        // Fast path: skip the lock when there are no events (the common case)
+        if (this.events != null) {
+            List<OtelSpanEvent> eventsSnapshot;
+            synchronized (this) {
+                // detach events for serialization
+                eventsSnapshot = this.events;
+                this.events = null;
+            }
+            setEventsAsTag(this.delegate, eventsSnapshot);
+        }
     }
 
-    @Override
-    public TraceState getTraceState() {
-      return TraceState.getDefault();
+    private static class NoopSpan implements Span {
+        private static final Span INSTANCE = new NoopSpan();
+
+        @Override
+        public <T> Span setAttribute(AttributeKey<T> key, T value) {
+            return this;
+        }
+
+        @Override
+        public Span addEvent(String name, Attributes attributes) {
+            return this;
+        }
+
+        @Override
+        public Span addEvent(String name, Attributes attributes, long timestamp, TimeUnit unit) {
+            return this;
+        }
+
+        @Override
+        public Span setStatus(StatusCode statusCode, String description) {
+            return this;
+        }
+
+        @Override
+        public Span recordException(Throwable exception, Attributes additionalAttributes) {
+            return this;
+        }
+
+        @Override
+        public Span updateName(String name) {
+            return this;
+        }
+
+        @Override
+        public void end() {}
+
+        @Override
+        public void end(long timestamp, TimeUnit unit) {}
+
+        @Override
+        public SpanContext getSpanContext() {
+            return NoopSpanContext.INSTANCE;
+        }
+
+        @Override
+        public boolean isRecording() {
+            return false;
+        }
     }
 
-    @Override
-    public boolean isRemote() {
-      return false;
+    private static class NoopSpanContext implements SpanContext {
+        private static final SpanContext INSTANCE = new NoopSpanContext();
+
+        @Override
+        public String getTraceId() {
+            return "00000000000000000000000000000000";
+        }
+
+        @Override
+        public String getSpanId() {
+            return "0000000000000000";
+        }
+
+        @Override
+        public TraceFlags getTraceFlags() {
+            return TraceFlags.getDefault();
+        }
+
+        @Override
+        public TraceState getTraceState() {
+            return TraceState.getDefault();
+        }
+
+        @Override
+        public boolean isRemote() {
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanBuilder.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanBuilder.java
index 63b8f8a6ddf..bc27c7774e3 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanBuilder.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanBuilder.java
@@ -27,196 +27,196 @@
 
 @ParametersAreNonnullByDefault
 public class OtelSpanBuilder implements SpanBuilder {
-  private final AgentTracer.SpanBuilder delegate;
-  private boolean spanKindSet;
-  private boolean ignoreActiveSpan;
-
-  /**
-   * Operation name overridden value by {@link OtelConventions#OPERATION_NAME_SPECIFIC_ATTRIBUTE}
-   * reserved attribute ({@code null} if not set).
-   */
-  private String overriddenOperationName;
-
-  /**
-   * Analytics sample rate metric value from {@link
-   * OtelConventions#ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES} reserved attribute ({@code -1} if not
-   * set).
-   */
-  private int overriddenAnalyticsSampleRate;
-
-  /**
-   * HTTP status code overridden value by {@link
-   * OtelConventions#HTTP_RESPONSE_STATUS_CODE_ATTRIBUTE} reserved attribute ({@code -1} if not
-   * set).
-   */
-  private int overriddenHttpStatusCode;
-
-  public OtelSpanBuilder(AgentTracer.SpanBuilder delegate) {
-    this.delegate = delegate;
-    this.spanKindSet = false;
-    this.overriddenOperationName = null;
-    this.overriddenAnalyticsSampleRate = -1;
-    this.overriddenHttpStatusCode = -1;
-  }
-
-  @Override
-  public SpanBuilder setParent(Context context) {
-    AgentSpanContext extractedContext = extract(context);
-    if (extractedContext != null) {
-      this.delegate.asChildOf(extractedContext);
-      this.ignoreActiveSpan = true;
+    private final AgentTracer.SpanBuilder delegate;
+    private boolean spanKindSet;
+    private boolean ignoreActiveSpan;
+
+    /**
+     * Operation name overridden value by {@link OtelConventions#OPERATION_NAME_SPECIFIC_ATTRIBUTE}
+     * reserved attribute ({@code null} if not set).
+     */
+    private String overriddenOperationName;
+
+    /**
+     * Analytics sample rate metric value from {@link
+     * OtelConventions#ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES} reserved attribute ({@code -1} if not
+     * set).
+     */
+    private int overriddenAnalyticsSampleRate;
+
+    /**
+     * HTTP status code overridden value by {@link
+     * OtelConventions#HTTP_RESPONSE_STATUS_CODE_ATTRIBUTE} reserved attribute ({@code -1} if not
+     * set).
+     */
+    private int overriddenHttpStatusCode;
+
+    public OtelSpanBuilder(AgentTracer.SpanBuilder delegate) {
+        this.delegate = delegate;
+        this.spanKindSet = false;
+        this.overriddenOperationName = null;
+        this.overriddenAnalyticsSampleRate = -1;
+        this.overriddenHttpStatusCode = -1;
     }
-    return this;
-  }
-
-  @Override
-  public SpanBuilder setNoParent() {
-    this.delegate.ignoreActiveSpan().asChildOf(null);
-    this.ignoreActiveSpan = true;
-    return this;
-  }
-
-  @Override
-  public SpanBuilder addLink(SpanContext spanContext) {
-    if (spanContext.isValid()) {
-      this.delegate.withLink(new OtelSpanLink(spanContext));
-    }
-    return this;
-  }
 
-  @Override
-  public SpanBuilder addLink(SpanContext spanContext, Attributes attributes) {
-    if (spanContext.isValid()) {
-      this.delegate.withLink(new OtelSpanLink(spanContext, attributes));
-    }
-    return this;
-  }
-
-  @Override
-  public SpanBuilder setAttribute(String key, String value) {
-    // Check reserved attributes
-    if (OPERATION_NAME_SPECIFIC_ATTRIBUTE.equals(key) && value != null) {
-      this.overriddenOperationName = value.toLowerCase(ROOT);
-      return this;
-    } else if (ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES.equals(key) && value != null) {
-      this.overriddenAnalyticsSampleRate = parseBoolean(value) ? 1 : 0;
-      return this;
-    }
-    // Store as object to prevent delegate to remove tag when value is empty
-    this.delegate.withTag(key, (Object) value);
-    return this;
-  }
-
-  @Override
-  public SpanBuilder setAttribute(String key, long value) {
-    // Check reserved attributes
-    if (HTTP_RESPONSE_STATUS_CODE_ATTRIBUTE.equals(key)) {
-      this.overriddenHttpStatusCode = (int) value;
-      return this;
+    @Override
+    public SpanBuilder setParent(Context context) {
+        AgentSpanContext extractedContext = extract(context);
+        if (extractedContext != null) {
+            this.delegate.asChildOf(extractedContext);
+            this.ignoreActiveSpan = true;
+        }
+        return this;
     }
-    this.delegate.withTag(key, value);
-    return this;
-  }
-
-  @Override
-  public SpanBuilder setAttribute(String key, double value) {
-    this.delegate.withTag(key, value);
-    return this;
-  }
-
-  @Override
-  public SpanBuilder setAttribute(String key, boolean value) {
-    // Check reserved attributes
-    if (ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES.equals(key)) {
-      this.overriddenAnalyticsSampleRate = value ? 1 : 0;
-      return this;
+
+    @Override
+    public SpanBuilder setNoParent() {
+        this.delegate.ignoreActiveSpan().asChildOf(null);
+        this.ignoreActiveSpan = true;
+        return this;
     }
-    this.delegate.withTag(key, value);
-    return this;
-  }
-
-  @Override
-  public <T> SpanBuilder setAttribute(AttributeKey<T> key, T value) {
-    String name = key.getKey();
-    switch (key.getType()) {
-      case STRING:
-        if (value instanceof String) {
-          setAttribute(name, (String) value);
-          break;
-        }
-      case BOOLEAN:
-        if (value instanceof Boolean) {
-          setAttribute(name, ((Boolean) value).booleanValue());
-          break;
+
+    @Override
+    public SpanBuilder addLink(SpanContext spanContext) {
+        if (spanContext.isValid()) {
+            this.delegate.withLink(new OtelSpanLink(spanContext));
         }
-      case LONG:
-        if (value instanceof Number) {
-          setAttribute(name, ((Number) value).longValue());
-          break;
+        return this;
+    }
+
+    @Override
+    public SpanBuilder addLink(SpanContext spanContext, Attributes attributes) {
+        if (spanContext.isValid()) {
+            this.delegate.withLink(new OtelSpanLink(spanContext, attributes));
         }
-      case DOUBLE:
-        if (value instanceof Number) {
-          setAttribute(name, ((Number) value).doubleValue());
-          break;
+        return this;
+    }
+
+    @Override
+    public SpanBuilder setAttribute(String key, String value) {
+        // Check reserved attributes
+        if (OPERATION_NAME_SPECIFIC_ATTRIBUTE.equals(key) && value != null) {
+            this.overriddenOperationName = value.toLowerCase(ROOT);
+            return this;
+        } else if (ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES.equals(key) && value != null) {
+            this.overriddenAnalyticsSampleRate = parseBoolean(value) ? 1 : 0;
+            return this;
         }
-      case STRING_ARRAY:
-      case BOOLEAN_ARRAY:
-      case LONG_ARRAY:
-      case DOUBLE_ARRAY:
-        if (value instanceof List) {
-          List<?> valueList = (List<?>) value;
-          if (valueList.isEmpty()) {
-            // Store as object to prevent delegate to remove tag when value is empty
-            this.delegate.withTag(name, (Object) "");
-          } else {
-            for (int index = 0; index < valueList.size(); index++) {
-              this.delegate.withTag(name + "." + index, valueList.get(index));
-            }
-          }
+        // Store as object to prevent delegate to remove tag when value is empty
+        this.delegate.withTag(key, (Object) value);
+        return this;
+    }
+
+    @Override
+    public SpanBuilder setAttribute(String key, long value) {
+        // Check reserved attributes
+        if (HTTP_RESPONSE_STATUS_CODE_ATTRIBUTE.equals(key)) {
+            this.overriddenHttpStatusCode = (int) value;
+            return this;
         }
-        break;
-      default:
-        this.delegate.withTag(name, value);
-        break;
+        this.delegate.withTag(key, value);
+        return this;
     }
-    return this;
-  }
-
-  @Override
-  public SpanBuilder setSpanKind(SpanKind spanKind) {
-    if (spanKind != null) {
-      this.delegate.withTag(SPAN_KIND, toSpanKindTagValue(spanKind));
-      this.spanKindSet = true;
+
+    @Override
+    public SpanBuilder setAttribute(String key, double value) {
+        this.delegate.withTag(key, value);
+        return this;
     }
-    return this;
-  }
-
-  @Override
-  public SpanBuilder setStartTimestamp(long startTimestamp, TimeUnit unit) {
-    this.delegate.withStartTimestamp(unit.toMicros(startTimestamp));
-    return this;
-  }
-
-  @Override
-  public Span startSpan() {
-    // Ensure the span kind is set
-    if (!this.spanKindSet) {
-      setSpanKind(INTERNAL);
+
+    @Override
+    public SpanBuilder setAttribute(String key, boolean value) {
+        // Check reserved attributes
+        if (ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES.equals(key)) {
+            this.overriddenAnalyticsSampleRate = value ? 1 : 0;
+            return this;
+        }
+        this.delegate.withTag(key, value);
+        return this;
     }
-    if (!this.ignoreActiveSpan) {
-      setParent(Context.current());
+
+    @Override
+    public <T> SpanBuilder setAttribute(AttributeKey<T> key, T value) {
+        String name = key.getKey();
+        switch (key.getType()) {
+            case STRING:
+                if (value instanceof String) {
+                    setAttribute(name, (String) value);
+                    break;
+                }
+            case BOOLEAN:
+                if (value instanceof Boolean) {
+                    setAttribute(name, ((Boolean) value).booleanValue());
+                    break;
+                }
+            case LONG:
+                if (value instanceof Number) {
+                    setAttribute(name, ((Number) value).longValue());
+                    break;
+                }
+            case DOUBLE:
+                if (value instanceof Number) {
+                    setAttribute(name, ((Number) value).doubleValue());
+                    break;
+                }
+            case STRING_ARRAY:
+            case BOOLEAN_ARRAY:
+            case LONG_ARRAY:
+            case DOUBLE_ARRAY:
+                if (value instanceof List) {
+                    List<?> valueList = (List<?>) value;
+                    if (valueList.isEmpty()) {
+                        // Store as object to prevent delegate to remove tag when value is empty
+                        this.delegate.withTag(name, (Object) "");
+                    } else {
+                        for (int index = 0; index < valueList.size(); index++) {
+                            this.delegate.withTag(name + "." + index, valueList.get(index));
+                        }
+                    }
+                }
+                break;
+            default:
+                this.delegate.withTag(name, value);
+                break;
+        }
+        return this;
     }
-    AgentSpan delegate = this.delegate.start();
-    // Apply overrides
-    if (this.overriddenOperationName != null) {
-      delegate.setOperationName(this.overriddenOperationName);
+
+    @Override
+    public SpanBuilder setSpanKind(SpanKind spanKind) {
+        if (spanKind != null) {
+            this.delegate.withTag(SPAN_KIND, toSpanKindTagValue(spanKind));
+            this.spanKindSet = true;
+        }
+        return this;
     }
-    if (this.overriddenAnalyticsSampleRate != -1) {
-      delegate.setMetric(ANALYTICS_SAMPLE_RATE, this.overriddenAnalyticsSampleRate);
+
+    @Override
+    public SpanBuilder setStartTimestamp(long startTimestamp, TimeUnit unit) {
+        this.delegate.withStartTimestamp(unit.toMicros(startTimestamp));
+        return this;
     }
-    if (this.overriddenHttpStatusCode != -1) {
-      delegate.setHttpStatusCode(this.overriddenHttpStatusCode);
+
+    @Override
+    public Span startSpan() {
+        // Ensure the span kind is set
+        if (!this.spanKindSet) {
+            setSpanKind(INTERNAL);
+        }
+        if (!this.ignoreActiveSpan) {
+            setParent(Context.current());
+        }
+        AgentSpan delegate = this.delegate.start();
+        // Apply overrides
+        if (this.overriddenOperationName != null) {
+            delegate.setOperationName(this.overriddenOperationName);
+        }
+        if (this.overriddenAnalyticsSampleRate != -1) {
+            delegate.setMetric(ANALYTICS_SAMPLE_RATE, this.overriddenAnalyticsSampleRate);
+        }
+        if (this.overriddenHttpStatusCode != -1) {
+            delegate.setHttpStatusCode(this.overriddenHttpStatusCode);
+        }
+        return new OtelSpan(delegate);
     }
-    return new OtelSpan(delegate);
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanContext.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanContext.java
index 8a39a88b1dd..33869e94a7b 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanContext.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanContext.java
@@ -8,75 +8,74 @@
 import io.opentelemetry.api.trace.TraceState;
 
 public class OtelSpanContext implements SpanContext {
-  final AgentSpanContext delegate;
-  private final boolean sampled;
-  private final boolean remote;
-  private final TraceState traceState;
-  private String traceId;
-  private String spanId;
+    final AgentSpanContext delegate;
+    private final boolean sampled;
+    private final boolean remote;
+    private final TraceState traceState;
+    private String traceId;
+    private String spanId;
 
-  public OtelSpanContext(
-      AgentSpanContext delegate, boolean sampled, boolean remote, TraceState traceState) {
-    this.delegate = delegate;
-    this.sampled = sampled;
-    this.remote = remote;
-    this.traceState = traceState;
-  }
+    public OtelSpanContext(AgentSpanContext delegate, boolean sampled, boolean remote, TraceState traceState) {
+        this.delegate = delegate;
+        this.sampled = sampled;
+        this.remote = remote;
+        this.traceState = traceState;
+    }
 
-  public static SpanContext fromLocalSpan(AgentSpan span) {
-    AgentSpanContext delegate = span.spanContext();
-    AgentSpan localRootSpan = span.getLocalRootSpan();
-    Integer samplingPriority = localRootSpan.getSamplingPriority();
-    boolean sampled = samplingPriority != null && samplingPriority > 0;
-    return new OtelSpanContext(delegate, sampled, false, TraceState.getDefault());
-  }
+    public static SpanContext fromLocalSpan(AgentSpan span) {
+        AgentSpanContext delegate = span.spanContext();
+        AgentSpan localRootSpan = span.getLocalRootSpan();
+        Integer samplingPriority = localRootSpan.getSamplingPriority();
+        boolean sampled = samplingPriority != null && samplingPriority > 0;
+        return new OtelSpanContext(delegate, sampled, false, TraceState.getDefault());
+    }
 
-  public static SpanContext fromRemote(AgentSpanContext extracted, TraceState traceState) {
-    return new OtelSpanContext(extracted, extracted.getSamplingPriority() > 0, true, traceState);
-  }
+    public static SpanContext fromRemote(AgentSpanContext extracted, TraceState traceState) {
+        return new OtelSpanContext(extracted, extracted.getSamplingPriority() > 0, true, traceState);
+    }
 
-  @Override
-  public String getTraceId() {
-    if (this.traceId == null) {
-      this.traceId = this.delegate.getTraceId().toHexString();
+    @Override
+    public String getTraceId() {
+        if (this.traceId == null) {
+            this.traceId = this.delegate.getTraceId().toHexString();
+        }
+        return this.traceId;
     }
-    return this.traceId;
-  }
 
-  @Override
-  public String getSpanId() {
-    if (this.spanId == null) {
-      this.spanId = DDSpanId.toHexStringPadded(this.delegate.getSpanId());
+    @Override
+    public String getSpanId() {
+        if (this.spanId == null) {
+            this.spanId = DDSpanId.toHexStringPadded(this.delegate.getSpanId());
+        }
+        return this.spanId;
     }
-    return this.spanId;
-  }
 
-  @Override
-  public TraceFlags getTraceFlags() {
-    return this.sampled ? TraceFlags.getSampled() : TraceFlags.getDefault();
-  }
+    @Override
+    public TraceFlags getTraceFlags() {
+        return this.sampled ? TraceFlags.getSampled() : TraceFlags.getDefault();
+    }
 
-  @Override
-  public TraceState getTraceState() {
-    return this.traceState;
-  }
+    @Override
+    public TraceState getTraceState() {
+        return this.traceState;
+    }
 
-  @Override
-  public boolean isRemote() {
-    return this.remote;
-  }
+    @Override
+    public boolean isRemote() {
+        return this.remote;
+    }
 
-  @Override
-  public String toString() {
-    return "OtelSpanContext{"
-        + "traceId='"
-        + getTraceId()
-        + "', spanId='"
-        + getSpanId()
-        + "', sampled="
-        + this.sampled
-        + ", remote="
-        + this.remote
-        + '}';
-  }
+    @Override
+    public String toString() {
+        return "OtelSpanContext{"
+                + "traceId='"
+                + getTraceId()
+                + "', spanId='"
+                + getSpanId()
+                + "', sampled="
+                + this.sampled
+                + ", remote="
+                + this.remote
+                + '}';
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanEvent.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanEvent.java
index a49cab4b877..5e29540448a 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanEvent.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanEvent.java
@@ -14,180 +14,177 @@
 import javax.annotation.Nonnull;
 
 public class OtelSpanEvent {
-  public static final String EXCEPTION_SPAN_EVENT_NAME = "exception";
-  public static final AttributeKey<String> EXCEPTION_MESSAGE_ATTRIBUTE_KEY =
-      AttributeKey.stringKey("exception.message");
-  public static final AttributeKey<String> EXCEPTION_TYPE_ATTRIBUTE_KEY =
-      AttributeKey.stringKey("exception.type");
-  public static final AttributeKey<String> EXCEPTION_STACK_TRACE_ATTRIBUTE_KEY =
-      AttributeKey.stringKey("exception.stacktrace");
-
-  // TODO TimeSource instance is not retrieved from CoreTracer
-  private static TimeSource timeSource = SystemTimeSource.INSTANCE;
-
-  private final String name;
-  private final String attributes;
-
-  /** Event timestamp in nanoseconds. */
-  private final long timestamp;
-
-  public OtelSpanEvent(String name, Attributes attributes) {
-    this.name = name;
-    this.attributes = AttributesJsonParser.toJson(attributes);
-    this.timestamp = OtelSpanEvent.timeSource.getCurrentTimeNanos();
-  }
-
-  public OtelSpanEvent(String name, Attributes attributes, long timestamp, TimeUnit unit) {
-    this.name = name;
-    this.attributes = AttributesJsonParser.toJson(attributes);
-    this.timestamp = unit.toNanos(timestamp);
-  }
-
-  @Nonnull
-  public static String toTag(List<OtelSpanEvent> events) {
-    StringBuilder builder = new StringBuilder("[");
-    for (OtelSpanEvent event : events) {
-      if (builder.length() > 1) {
-        builder.append(',');
-      }
-      builder.append(event.toJson());
+    public static final String EXCEPTION_SPAN_EVENT_NAME = "exception";
+    public static final AttributeKey<String> EXCEPTION_MESSAGE_ATTRIBUTE_KEY =
+            AttributeKey.stringKey("exception.message");
+    public static final AttributeKey<String> EXCEPTION_TYPE_ATTRIBUTE_KEY = AttributeKey.stringKey("exception.type");
+    public static final AttributeKey<String> EXCEPTION_STACK_TRACE_ATTRIBUTE_KEY =
+            AttributeKey.stringKey("exception.stacktrace");
+
+    // TODO TimeSource instance is not retrieved from CoreTracer
+    private static TimeSource timeSource = SystemTimeSource.INSTANCE;
+
+    private final String name;
+    private final String attributes;
+
+    /** Event timestamp in nanoseconds. */
+    private final long timestamp;
+
+    public OtelSpanEvent(String name, Attributes attributes) {
+        this.name = name;
+        this.attributes = AttributesJsonParser.toJson(attributes);
+        this.timestamp = OtelSpanEvent.timeSource.getCurrentTimeNanos();
     }
-    return builder.append(']').toString();
-  }
-
-  /**
-   * Make sure exception related attributes are presents and generates them if needed.
-   *
-   * <p>All exception span events get the following reserved attributes: {@link
-   * #EXCEPTION_MESSAGE_ATTRIBUTE_KEY}, {@link #EXCEPTION_TYPE_ATTRIBUTE_KEY} and {@link
-   * #EXCEPTION_STACK_TRACE_ATTRIBUTE_KEY}. If additionalAttributes contains a reserved key, the
-   * value in additionalAttributes is used. Else, the value is determined from the provided
-   * Throwable.
-   *
-   * @param exception The Throwable from which to build reserved attributes
-   * @param additionalAttributes The user-provided attributes
-   * @return An {@link Attributes} collection with exception attributes.
-   */
-  static Attributes initializeExceptionAttributes(
-      Throwable exception, Attributes additionalAttributes) {
-    // Create an AttributesBuilder with the additionalAttributes provided
-    AttributesBuilder builder = additionalAttributes.toBuilder();
-    // Handle exception message
-    String value = additionalAttributes.get(EXCEPTION_MESSAGE_ATTRIBUTE_KEY);
-    if (value == null) {
-      value = exception.getMessage();
-      builder.put(EXCEPTION_MESSAGE_ATTRIBUTE_KEY, value);
-    }
-    // Handle exception type
-    value = additionalAttributes.get(EXCEPTION_TYPE_ATTRIBUTE_KEY);
-    if (value == null) {
-      value = exception.getClass().getName();
-      builder.put(EXCEPTION_TYPE_ATTRIBUTE_KEY, value);
-    }
-    // Handle exception stacktrace
-    value = additionalAttributes.get(EXCEPTION_STACK_TRACE_ATTRIBUTE_KEY);
-    if (value == null) {
-      value = stringifyErrorStack(exception);
-      builder.put(EXCEPTION_STACK_TRACE_ATTRIBUTE_KEY, value);
+
+    public OtelSpanEvent(String name, Attributes attributes, long timestamp, TimeUnit unit) {
+        this.name = name;
+        this.attributes = AttributesJsonParser.toJson(attributes);
+        this.timestamp = unit.toNanos(timestamp);
     }
-    return builder.build();
-  }
-
-  static String stringifyErrorStack(Throwable error) {
-    final StringWriter errorString = new StringWriter();
-    error.printStackTrace(new PrintWriter(errorString));
-    return errorString.toString();
-  }
-
-  /** Helper class for JSON-encoding {@link OtelSpanEvent} {@link #attributes}. */
-  public static class AttributesJsonParser {
-    public static String toJson(Attributes attributes) {
-      if (attributes == null || attributes.isEmpty()) {
-        return "";
-      }
-      StringBuilder jsonBuilder = new StringBuilder();
-      jsonBuilder.append('{');
-
-      Set<Map.Entry<AttributeKey<?>, Object>> entrySet = attributes.asMap().entrySet();
-
-      for (Map.Entry<AttributeKey<?>, Object> entry : entrySet) {
-        if (jsonBuilder.length() > 1) {
-          jsonBuilder.append(',');
+
+    @Nonnull
+    public static String toTag(List<OtelSpanEvent> events) {
+        StringBuilder builder = new StringBuilder("[");
+        for (OtelSpanEvent event : events) {
+            if (builder.length() > 1) {
+                builder.append(',');
+            }
+            builder.append(event.toJson());
         }
-        // AttributeKey type has method `getKey()` that "stringifies" the key
-        String key = entry.getKey().getKey();
-        Object value = entry.getValue();
-        // Escape key and append it
-        jsonBuilder.append('"').append(escapeJson(key)).append("\":");
-        // Append value to jsonBuilder
-        appendValue(value, jsonBuilder);
-      }
-      jsonBuilder.append('}');
-      return jsonBuilder.toString();
+        return builder.append(']').toString();
     }
 
     /**
-     * Recursively adds the value of an {@link Attributes} to the active StringBuilder in JSON
-     * format, depending on the value's type.
+     * Make sure exception related attributes are presents and generates them if needed.
+     *
+     * <p>All exception span events get the following reserved attributes: {@link
+     * #EXCEPTION_MESSAGE_ATTRIBUTE_KEY}, {@link #EXCEPTION_TYPE_ATTRIBUTE_KEY} and {@link
+     * #EXCEPTION_STACK_TRACE_ATTRIBUTE_KEY}. If additionalAttributes contains a reserved key, the
+     * value in additionalAttributes is used. Else, the value is determined from the provided
+     * Throwable.
      *
-     * @param value The value to append
-     * @param jsonBuilder The active {@link StringBuilder}
+     * @param exception The Throwable from which to build reserved attributes
+     * @param additionalAttributes The user-provided attributes
+     * @return An {@link Attributes} collection with exception attributes.
      */
-    private static void appendValue(Object value, StringBuilder jsonBuilder) {
-      // Append value based on its type
-      if (value instanceof String) {
-        jsonBuilder.append('"').append(escapeJson((String) value)).append('"');
-      } else if (value instanceof List) {
-        jsonBuilder.append('[');
-        List<?> valArray = (List<?>) value;
-        for (int i = 0; i < valArray.size(); i++) {
-          if (i > 0) {
-            jsonBuilder.append(',');
-          }
-          appendValue(valArray.get(i), jsonBuilder);
+    static Attributes initializeExceptionAttributes(Throwable exception, Attributes additionalAttributes) {
+        // Create an AttributesBuilder with the additionalAttributes provided
+        AttributesBuilder builder = additionalAttributes.toBuilder();
+        // Handle exception message
+        String value = additionalAttributes.get(EXCEPTION_MESSAGE_ATTRIBUTE_KEY);
+        if (value == null) {
+            value = exception.getMessage();
+            builder.put(EXCEPTION_MESSAGE_ATTRIBUTE_KEY, value);
+        }
+        // Handle exception type
+        value = additionalAttributes.get(EXCEPTION_TYPE_ATTRIBUTE_KEY);
+        if (value == null) {
+            value = exception.getClass().getName();
+            builder.put(EXCEPTION_TYPE_ATTRIBUTE_KEY, value);
+        }
+        // Handle exception stacktrace
+        value = additionalAttributes.get(EXCEPTION_STACK_TRACE_ATTRIBUTE_KEY);
+        if (value == null) {
+            value = stringifyErrorStack(exception);
+            builder.put(EXCEPTION_STACK_TRACE_ATTRIBUTE_KEY, value);
+        }
+        return builder.build();
+    }
+
+    static String stringifyErrorStack(Throwable error) {
+        final StringWriter errorString = new StringWriter();
+        error.printStackTrace(new PrintWriter(errorString));
+        return errorString.toString();
+    }
+
+    /** Helper class for JSON-encoding {@link OtelSpanEvent} {@link #attributes}. */
+    public static class AttributesJsonParser {
+        public static String toJson(Attributes attributes) {
+            if (attributes == null || attributes.isEmpty()) {
+                return "";
+            }
+            StringBuilder jsonBuilder = new StringBuilder();
+            jsonBuilder.append('{');
+
+            Set<Map.Entry<AttributeKey<?>, Object>> entrySet =
+                    attributes.asMap().entrySet();
+
+            for (Map.Entry<AttributeKey<?>, Object> entry : entrySet) {
+                if (jsonBuilder.length() > 1) {
+                    jsonBuilder.append(',');
+                }
+                // AttributeKey type has method `getKey()` that "stringifies" the key
+                String key = entry.getKey().getKey();
+                Object value = entry.getValue();
+                // Escape key and append it
+                jsonBuilder.append('"').append(escapeJson(key)).append("\":");
+                // Append value to jsonBuilder
+                appendValue(value, jsonBuilder);
+            }
+            jsonBuilder.append('}');
+            return jsonBuilder.toString();
+        }
+
+        /**
+         * Recursively adds the value of an {@link Attributes} to the active StringBuilder in JSON
+         * format, depending on the value's type.
+         *
+         * @param value The value to append
+         * @param jsonBuilder The active {@link StringBuilder}
+         */
+        private static void appendValue(Object value, StringBuilder jsonBuilder) {
+            // Append value based on its type
+            if (value instanceof String) {
+                jsonBuilder.append('"').append(escapeJson((String) value)).append('"');
+            } else if (value instanceof List) {
+                jsonBuilder.append('[');
+                List<?> valArray = (List<?>) value;
+                for (int i = 0; i < valArray.size(); i++) {
+                    if (i > 0) {
+                        jsonBuilder.append(',');
+                    }
+                    appendValue(valArray.get(i), jsonBuilder);
+                }
+                jsonBuilder.append(']');
+            } else if (value instanceof Number || value instanceof Boolean) {
+                jsonBuilder.append(value);
+            } else {
+                jsonBuilder.append("null"); // null for unsupported types
+            }
+        }
+
+        private static String escapeJson(String value) {
+            return value.replace("\\", "\\\\")
+                    .replace("\"", "\\\"")
+                    .replace("\b", "\\b")
+                    .replace("\f", "\\f")
+                    .replace("\n", "\\n")
+                    .replace("\r", "\\r")
+                    .replace("\t", "\\t");
         }
-        jsonBuilder.append(']');
-      } else if (value instanceof Number || value instanceof Boolean) {
-        jsonBuilder.append(value);
-      } else {
-        jsonBuilder.append("null"); // null for unsupported types
-      }
     }
 
-    private static String escapeJson(String value) {
-      return value
-          .replace("\\", "\\\\")
-          .replace("\"", "\\\"")
-          .replace("\b", "\\b")
-          .replace("\f", "\\f")
-          .replace("\n", "\\n")
-          .replace("\r", "\\r")
-          .replace("\t", "\\t");
+    public static void setTimeSource(TimeSource newTimeSource) {
+        timeSource = newTimeSource;
     }
-  }
-
-  public static void setTimeSource(TimeSource newTimeSource) {
-    timeSource = newTimeSource;
-  }
-
-  public String toJson() {
-    StringBuilder builder =
-        new StringBuilder(
-            "{\"time_unix_nano\":" + this.timestamp + ",\"name\":\"" + this.name + "\"");
-    if (!this.attributes.isEmpty()) {
-      builder.append(",\"attributes\":").append(this.attributes);
+
+    public String toJson() {
+        StringBuilder builder =
+                new StringBuilder("{\"time_unix_nano\":" + this.timestamp + ",\"name\":\"" + this.name + "\"");
+        if (!this.attributes.isEmpty()) {
+            builder.append(",\"attributes\":").append(this.attributes);
+        }
+        return builder.append('}').toString();
+    }
+
+    @Override
+    public String toString() {
+        return "OtelSpanEvent{timestamp="
+                + this.timestamp
+                + ", name='"
+                + this.name
+                + "', attributes='"
+                + this.attributes
+                + "'}";
     }
-    return builder.append('}').toString();
-  }
-
-  @Override
-  public String toString() {
-    return "OtelSpanEvent{timestamp="
-        + this.timestamp
-        + ", name='"
-        + this.name
-        + "', attributes='"
-        + this.attributes
-        + "'}";
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanLink.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanLink.java
index 81255e15027..2e26089ae4b 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanLink.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanLink.java
@@ -9,16 +9,16 @@
 import io.opentelemetry.api.trace.SpanContext;
 
 public class OtelSpanLink extends SpanLink {
-  public OtelSpanLink(SpanContext spanContext) {
-    this(spanContext, io.opentelemetry.api.common.Attributes.empty());
-  }
+    public OtelSpanLink(SpanContext spanContext) {
+        this(spanContext, io.opentelemetry.api.common.Attributes.empty());
+    }
 
-  public OtelSpanLink(SpanContext spanContext, io.opentelemetry.api.common.Attributes attributes) {
-    super(
-        DDTraceId.fromHex(spanContext.getTraceId()),
-        DDSpanId.fromHex(spanContext.getSpanId()),
-        spanContext.isSampled() ? SAMPLED_FLAG : DEFAULT_FLAGS,
-        TraceStateHelper.encodeHeader(spanContext.getTraceState()),
-        convertAttributes(attributes));
-  }
+    public OtelSpanLink(SpanContext spanContext, io.opentelemetry.api.common.Attributes attributes) {
+        super(
+                DDTraceId.fromHex(spanContext.getTraceId()),
+                DDSpanId.fromHex(spanContext.getSpanId()),
+                spanContext.isSampled() ? SAMPLED_FLAG : DEFAULT_FLAGS,
+                TraceStateHelper.encodeHeader(spanContext.getTraceState()),
+                convertAttributes(attributes));
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracer.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracer.java
index d286c6d1cde..32d2f5e6fc9 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracer.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracer.java
@@ -10,34 +10,32 @@
 
 @ParametersAreNonnullByDefault
 final class OtelTracer implements Tracer {
-  private static final String INSTRUMENTATION_NAME = otelInstrumentationName();
-
-  private final OtelInstrumentationScope instrumentationScope;
-
-  private final AgentTracer.TracerAPI tracer;
-
-  OtelTracer(OtelInstrumentationScope instrumentationScope) {
-    this.instrumentationScope = instrumentationScope;
-    this.tracer = AgentTracer.get();
-  }
-
-  @Override
-  public SpanBuilder spanBuilder(String spanName) {
-    AgentTracer.SpanBuilder delegate =
-        this.tracer.buildSpan(INSTRUMENTATION_NAME, SPAN_KIND_INTERNAL).withResourceName(spanName);
-    return new OtelSpanBuilder(delegate);
-  }
-
-  @Override
-  public String toString() {
-    return "OtelTracer{instrumentationScope=" + instrumentationScope + "}";
-  }
-
-  @SuppressWarnings("ConstantConditions")
-  private static String otelInstrumentationName() {
-    // is this the bootstrap shim for drop-in support, or the shim for manual instrumentation?
-    return OtelTracer.class.getName().startsWith("datadog.trace.bootstrap")
-        ? "otel.library"
-        : "otel";
-  }
+    private static final String INSTRUMENTATION_NAME = otelInstrumentationName();
+
+    private final OtelInstrumentationScope instrumentationScope;
+
+    private final AgentTracer.TracerAPI tracer;
+
+    OtelTracer(OtelInstrumentationScope instrumentationScope) {
+        this.instrumentationScope = instrumentationScope;
+        this.tracer = AgentTracer.get();
+    }
+
+    @Override
+    public SpanBuilder spanBuilder(String spanName) {
+        AgentTracer.SpanBuilder delegate =
+                this.tracer.buildSpan(INSTRUMENTATION_NAME, SPAN_KIND_INTERNAL).withResourceName(spanName);
+        return new OtelSpanBuilder(delegate);
+    }
+
+    @Override
+    public String toString() {
+        return "OtelTracer{instrumentationScope=" + instrumentationScope + "}";
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    private static String otelInstrumentationName() {
+        // is this the bootstrap shim for drop-in support, or the shim for manual instrumentation?
+        return OtelTracer.class.getName().startsWith("datadog.trace.bootstrap") ? "otel.library" : "otel";
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracerBuilder.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracerBuilder.java
index 2db018771e5..b295a8bf522 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracerBuilder.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracerBuilder.java
@@ -7,32 +7,35 @@
 
 @ParametersAreNonnullByDefault
 final class OtelTracerBuilder implements TracerBuilder {
-  private final OtelTracerProvider tracerProvider;
-
-  private final String instrumentationScopeName;
-  @Nullable private String instrumentationScopeVersion;
-  @Nullable private String schemaUrl;
-
-  OtelTracerBuilder(OtelTracerProvider tracerProvider, String instrumentationScopeName) {
-    this.tracerProvider = tracerProvider;
-    this.instrumentationScopeName = instrumentationScopeName;
-  }
-
-  @Override
-  public TracerBuilder setInstrumentationVersion(String instrumentationScopeVersion) {
-    this.instrumentationScopeVersion = instrumentationScopeVersion;
-    return this;
-  }
-
-  @Override
-  public TracerBuilder setSchemaUrl(String schemaUrl) {
-    this.schemaUrl = schemaUrl;
-    return this;
-  }
-
-  @Override
-  public Tracer build() {
-    return tracerProvider.getTracerShim(
-        instrumentationScopeName, instrumentationScopeVersion, schemaUrl);
-  }
+    private final OtelTracerProvider tracerProvider;
+
+    private final String instrumentationScopeName;
+
+    @Nullable
+    private String instrumentationScopeVersion;
+
+    @Nullable
+    private String schemaUrl;
+
+    OtelTracerBuilder(OtelTracerProvider tracerProvider, String instrumentationScopeName) {
+        this.tracerProvider = tracerProvider;
+        this.instrumentationScopeName = instrumentationScopeName;
+    }
+
+    @Override
+    public TracerBuilder setInstrumentationVersion(String instrumentationScopeVersion) {
+        this.instrumentationScopeVersion = instrumentationScopeVersion;
+        return this;
+    }
+
+    @Override
+    public TracerBuilder setSchemaUrl(String schemaUrl) {
+        this.schemaUrl = schemaUrl;
+        return this;
+    }
+
+    @Override
+    public Tracer build() {
+        return tracerProvider.getTracerShim(instrumentationScopeName, instrumentationScopeVersion, schemaUrl);
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracerProvider.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracerProvider.java
index 1bd76137414..33af89aaf8e 100644
--- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracerProvider.java
+++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracerProvider.java
@@ -14,40 +14,37 @@
 
 @ParametersAreNonnullByDefault
 public final class OtelTracerProvider implements TracerProvider {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtelTracerProvider.class);
-  private static final String DEFAULT_TRACER_NAME = "";
-
-  public static final TracerProvider INSTANCE = new OtelTracerProvider();
-
-  /** Tracer shims, indexed by instrumentation scope. */
-  private final Map<OtelInstrumentationScope, OtelTracer> tracers = new ConcurrentHashMap<>();
-
-  @Override
-  public Tracer get(String instrumentationScopeName) {
-    return getTracerShim(instrumentationScopeName, null, null);
-  }
-
-  @Override
-  public Tracer get(String instrumentationScopeName, String instrumentationScopeVersion) {
-    return getTracerShim(instrumentationScopeName, instrumentationScopeVersion, null);
-  }
-
-  @Override
-  public TracerBuilder tracerBuilder(String instrumentationScopeName) {
-    return new OtelTracerBuilder(this, instrumentationScopeName);
-  }
-
-  OtelTracer getTracerShim(
-      String instrumentationScopeName,
-      @Nullable String instrumentationScopeVersion,
-      @Nullable String schemaUrl) {
-    if (Strings.isBlank(instrumentationScopeName)) {
-      LOGGER.debug("Tracer requested without instrumentation scope name.");
-      instrumentationScopeName = DEFAULT_TRACER_NAME;
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtelTracerProvider.class);
+    private static final String DEFAULT_TRACER_NAME = "";
+
+    public static final TracerProvider INSTANCE = new OtelTracerProvider();
+
+    /** Tracer shims, indexed by instrumentation scope. */
+    private final Map<OtelInstrumentationScope, OtelTracer> tracers = new ConcurrentHashMap<>();
+
+    @Override
+    public Tracer get(String instrumentationScopeName) {
+        return getTracerShim(instrumentationScopeName, null, null);
+    }
+
+    @Override
+    public Tracer get(String instrumentationScopeName, String instrumentationScopeVersion) {
+        return getTracerShim(instrumentationScopeName, instrumentationScopeVersion, null);
+    }
+
+    @Override
+    public TracerBuilder tracerBuilder(String instrumentationScopeName) {
+        return new OtelTracerBuilder(this, instrumentationScopeName);
+    }
+
+    OtelTracer getTracerShim(
+            String instrumentationScopeName, @Nullable String instrumentationScopeVersion, @Nullable String schemaUrl) {
+        if (Strings.isBlank(instrumentationScopeName)) {
+            LOGGER.debug("Tracer requested without instrumentation scope name.");
+            instrumentationScopeName = DEFAULT_TRACER_NAME;
+        }
+        return tracers.computeIfAbsent(
+                new OtelInstrumentationScope(instrumentationScopeName, instrumentationScopeVersion, schemaUrl),
+                OtelTracer::new);
     }
-    return tracers.computeIfAbsent(
-        new OtelInstrumentationScope(
-            instrumentationScopeName, instrumentationScopeVersion, schemaUrl),
-        OtelTracer::new);
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelElementMatchers.java b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelElementMatchers.java
index eba7043e9be..3ef60262968 100644
--- a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelElementMatchers.java
+++ b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelElementMatchers.java
@@ -10,34 +10,32 @@
 /** Replaces OpenTelemetry's {@code AgentElementMatchers} when mapping extensions. */
 public final class OtelElementMatchers {
 
-  public static ElementMatcher.Junction<TypeDescription> extendsClass(
-      ElementMatcher<TypeDescription> matcher) {
-    return HierarchyMatchers.extendsClass(matcher);
-  }
-
-  public static ElementMatcher.Junction<TypeDescription> implementsInterface(
-      ElementMatcher<TypeDescription> matcher) {
-    return HierarchyMatchers.implementsInterface(matcher);
-  }
-
-  public static ElementMatcher.Junction<TypeDescription> hasSuperType(
-      ElementMatcher<TypeDescription> matcher) {
-    return HierarchyMatchers.hasSuperType(matcher);
-  }
-
-  public static ElementMatcher.Junction<MethodDescription> methodIsDeclaredByType(
-      ElementMatcher<? super TypeDescription> matcher) {
-    return ElementMatchers.isDeclaredBy(matcher);
-  }
-
-  public static ElementMatcher.Junction<MethodDescription> hasSuperMethod(
-      ElementMatcher<? super MethodDescription> matcher) {
-    return HierarchyMatchers.hasSuperMethod(matcher);
-  }
-
-  public static ElementMatcher.Junction<ClassLoader> hasClassesNamed(String... classNames) {
-    return ClassLoaderMatchers.hasClassNamedOneOf(classNames);
-  }
-
-  private OtelElementMatchers() {}
+    public static ElementMatcher.Junction<TypeDescription> extendsClass(ElementMatcher<TypeDescription> matcher) {
+        return HierarchyMatchers.extendsClass(matcher);
+    }
+
+    public static ElementMatcher.Junction<TypeDescription> implementsInterface(
+            ElementMatcher<TypeDescription> matcher) {
+        return HierarchyMatchers.implementsInterface(matcher);
+    }
+
+    public static ElementMatcher.Junction<TypeDescription> hasSuperType(ElementMatcher<TypeDescription> matcher) {
+        return HierarchyMatchers.hasSuperType(matcher);
+    }
+
+    public static ElementMatcher.Junction<MethodDescription> methodIsDeclaredByType(
+            ElementMatcher<? super TypeDescription> matcher) {
+        return ElementMatchers.isDeclaredBy(matcher);
+    }
+
+    public static ElementMatcher.Junction<MethodDescription> hasSuperMethod(
+            ElementMatcher<? super MethodDescription> matcher) {
+        return HierarchyMatchers.hasSuperMethod(matcher);
+    }
+
+    public static ElementMatcher.Junction<ClassLoader> hasClassesNamed(String... classNames) {
+        return ClassLoaderMatchers.hasClassNamedOneOf(classNames);
+    }
+
+    private OtelElementMatchers() {}
 }
diff --git a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelExtensionHandler.java b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelExtensionHandler.java
index 4411a342c40..fe772778089 100644
--- a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelExtensionHandler.java
+++ b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelExtensionHandler.java
@@ -15,87 +15,75 @@
 /** Handles OpenTelemetry instrumentations, so they can be loaded into the Datadog tracer. */
 public final class OtelExtensionHandler extends ExtensionHandler {
 
-  /** Handler for loading externally built OpenTelemetry extensions. */
-  public static final OtelExtensionHandler OPENTELEMETRY = new OtelExtensionHandler();
+    /** Handler for loading externally built OpenTelemetry extensions. */
+    public static final OtelExtensionHandler OPENTELEMETRY = new OtelExtensionHandler();
 
-  private static final String OPENTELEMETRY_MODULE_DESCRIPTOR =
-      "META-INF/services/io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule";
+    private static final String OPENTELEMETRY_MODULE_DESCRIPTOR =
+            "META-INF/services/io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule";
 
-  private static final String DATADOG_MODULE_DESCRIPTOR =
-      "META-INF/services/datadog.trace.agent.tooling.InstrumenterModule";
+    private static final String DATADOG_MODULE_DESCRIPTOR =
+            "META-INF/services/datadog.trace.agent.tooling.InstrumenterModule";
 
-  @Override
-  public JarEntry mapEntry(JarFile jar, String file) {
-    if (DATADOG_MODULE_DESCRIPTOR.equals(file)) {
-      // redirect request to include OpenTelemetry instrumentations
-      return super.mapEntry(jar, OPENTELEMETRY_MODULE_DESCRIPTOR);
-    } else if (file.endsWith("$Muzzle.class")) {
-      return new JarEntry(file); // pretend we have a static Muzzle class
-    } else {
-      return super.mapEntry(jar, file);
+    @Override
+    public JarEntry mapEntry(JarFile jar, String file) {
+        if (DATADOG_MODULE_DESCRIPTOR.equals(file)) {
+            // redirect request to include OpenTelemetry instrumentations
+            return super.mapEntry(jar, OPENTELEMETRY_MODULE_DESCRIPTOR);
+        } else if (file.endsWith("$Muzzle.class")) {
+            return new JarEntry(file); // pretend we have a static Muzzle class
+        } else {
+            return super.mapEntry(jar, file);
+        }
     }
-  }
 
-  @Override
-  public URLConnection mapContent(URL url, JarFile jar, JarEntry entry) {
-    String file = entry.getName();
-    if (file.endsWith("$Muzzle.class")) {
-      return new EmptyMuzzleConnection(url); // generate an empty static Muzzle class
-    } else if (file.endsWith(".class")) {
-      return new ClassMappingConnection(url, jar, entry, OtelInstrumentationMapper::new);
-    } else {
-      return new JarFileConnection(url, jar, entry);
+    @Override
+    public URLConnection mapContent(URL url, JarFile jar, JarEntry entry) {
+        String file = entry.getName();
+        if (file.endsWith("$Muzzle.class")) {
+            return new EmptyMuzzleConnection(url); // generate an empty static Muzzle class
+        } else if (file.endsWith(".class")) {
+            return new ClassMappingConnection(url, jar, entry, OtelInstrumentationMapper::new);
+        } else {
+            return new JarFileConnection(url, jar, entry);
+        }
     }
-  }
 
-  /** Generates an empty static muzzle class for OpenTelemetry instrumentations. */
-  static final class EmptyMuzzleConnection extends ClassMappingConnection {
+    /** Generates an empty static muzzle class for OpenTelemetry instrumentations. */
+    static final class EmptyMuzzleConnection extends ClassMappingConnection {
 
-    private static final String REFERENCE_MATCHER_CLASS =
-        Type.getInternalName(ReferenceMatcher.class);
+        private static final String REFERENCE_MATCHER_CLASS = Type.getInternalName(ReferenceMatcher.class);
 
-    private static final String REFERENCE_CLASS = Type.getInternalName(Reference.class);
+        private static final String REFERENCE_CLASS = Type.getInternalName(Reference.class);
 
-    public EmptyMuzzleConnection(URL url) {
-      super(url, null, null, null);
-    }
+        public EmptyMuzzleConnection(URL url) {
+            super(url, null, null, null);
+        }
 
-    @Override
-    protected byte[] doMapBytecode(String unused) {
-      String file = url.getFile();
-      // remove .class suffix and optional forward-slash prefix
-      String className = file.substring(file.charAt(0) == '/' ? 1 : 0, file.length() - 6);
-      ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
-      cw.visit(
-          Opcodes.V1_8,
-          Opcodes.ACC_PUBLIC | Opcodes.ACC_FINAL,
-          className,
-          null,
-          "java/lang/Object",
-          null);
-      MethodVisitor mv =
-          cw.visitMethod(
-              Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC,
-              "create",
-              "()L" + REFERENCE_MATCHER_CLASS + ";",
-              null,
-              null);
-      mv.visitCode();
-      mv.visitTypeInsn(Opcodes.NEW, REFERENCE_MATCHER_CLASS);
-      mv.visitInsn(Opcodes.DUP);
-      mv.visitInsn(Opcodes.ICONST_0);
-      mv.visitTypeInsn(Opcodes.ANEWARRAY, REFERENCE_CLASS);
-      mv.visitMethodInsn(
-          Opcodes.INVOKESPECIAL,
-          REFERENCE_MATCHER_CLASS,
-          "<init>",
-          "([L" + REFERENCE_CLASS + ";)V",
-          false);
-      mv.visitInsn(Opcodes.ARETURN);
-      mv.visitMaxs(0, 0);
-      mv.visitEnd();
-      cw.visitEnd();
-      return cw.toByteArray();
+        @Override
+        protected byte[] doMapBytecode(String unused) {
+            String file = url.getFile();
+            // remove .class suffix and optional forward-slash prefix
+            String className = file.substring(file.charAt(0) == '/' ? 1 : 0, file.length() - 6);
+            ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
+            cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC | Opcodes.ACC_FINAL, className, null, "java/lang/Object", null);
+            MethodVisitor mv = cw.visitMethod(
+                    Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC,
+                    "create",
+                    "()L" + REFERENCE_MATCHER_CLASS + ";",
+                    null,
+                    null);
+            mv.visitCode();
+            mv.visitTypeInsn(Opcodes.NEW, REFERENCE_MATCHER_CLASS);
+            mv.visitInsn(Opcodes.DUP);
+            mv.visitInsn(Opcodes.ICONST_0);
+            mv.visitTypeInsn(Opcodes.ANEWARRAY, REFERENCE_CLASS);
+            mv.visitMethodInsn(
+                    Opcodes.INVOKESPECIAL, REFERENCE_MATCHER_CLASS, "<init>", "([L" + REFERENCE_CLASS + ";)V", false);
+            mv.visitInsn(Opcodes.ARETURN);
+            mv.visitMaxs(0, 0);
+            mv.visitEnd();
+            cw.visitEnd();
+            return cw.toByteArray();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelInstrumentationMapper.java b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelInstrumentationMapper.java
index 5f1df5d050a..b0386b0d619 100644
--- a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelInstrumentationMapper.java
+++ b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelInstrumentationMapper.java
@@ -20,144 +20,136 @@
 /** Maps OpenTelemetry instrumentations to use the Datadog {@link InstrumenterModule} API. */
 public final class OtelInstrumentationMapper extends ClassRemapper {
 
-  private static final Set<String> UNSUPPORTED_TYPES =
-      Collections.singleton(
-          "io/opentelemetry/javaagent/tooling/muzzle/InstrumentationModuleMuzzle");
-
-  public OtelInstrumentationMapper(ClassVisitor classVisitor) {
-    super(classVisitor, Renamer.INSTANCE);
-  }
-
-  @Override
-  protected MethodVisitor createMethodRemapper(MethodVisitor methodVisitor) {
-    return new OtelMethodCallMapper(methodVisitor, remapper);
-  }
-
-  @Override
-  public void visit(
-      int version,
-      int access,
-      String name,
-      String signature,
-      String superName,
-      String[] interfaces) {
-    super.visit(version, access, name, signature, superName, removeUnsupportedTypes(interfaces));
-  }
-
-  private String[] removeUnsupportedTypes(String[] interfaces) {
-    List<String> filtered = null;
-    for (int i = interfaces.length - 1; i >= 0; i--) {
-      if (UNSUPPORTED_TYPES.contains(interfaces[i])) {
-        if (null == filtered) {
-          filtered = new ArrayList<>(Arrays.asList(interfaces));
-        }
-        filtered.remove(i); // remove unsupported interface
-      }
-    }
-    return null != filtered ? filtered.toArray(new String[0]) : interfaces;
-  }
-
-  static final class Renamer extends Remapper {
-    static final Renamer INSTANCE = new Renamer();
-
-    /** Datadog equivalent of OpenTelemetry instrumentation classes. */
-    private static final Map<String, String> RENAMED_TYPES = new HashMap<>();
-
-    static {
-      RENAMED_TYPES.put(
-          "io/opentelemetry/javaagent/extension/instrumentation/InstrumentationModule",
-          Type.getInternalName(OtelInstrumenterModule.class));
-      RENAMED_TYPES.put(
-          "io/opentelemetry/javaagent/extension/instrumentation/TypeInstrumentation",
-          Type.getInternalName(OtelInstrumenter.class));
-      RENAMED_TYPES.put(
-          "io/opentelemetry/javaagent/extension/instrumentation/TypeTransformer",
-          Type.getInternalName(OtelTransformer.class));
-      RENAMED_TYPES.put(
-          "io/opentelemetry/javaagent/extension/matcher/AgentElementMatchers",
-          Type.getInternalName(OtelElementMatchers.class));
-      RENAMED_TYPES.put(
-          "io/opentelemetry/javaagent/tooling/muzzle/VirtualFieldMappingsBuilder",
-          Type.getInternalName(OtelInstrumenterModule.VirtualFieldBuilder.class));
-      RENAMED_TYPES.put(
-          "io/opentelemetry/javaagent/shaded/instrumentation/api/util/VirtualField",
-          Type.getInternalName(ContextStore.class));
-      RENAMED_TYPES.put(
-          "io/opentelemetry/javaagent/tooling/muzzle/references/ClassRefBuilder",
-          Type.getInternalName(OtelMuzzleRefBuilder.class));
-      RENAMED_TYPES.put(
-          "io/opentelemetry/javaagent/tooling/muzzle/references/ClassRef",
-          Type.getInternalName(OtelMuzzleRefBuilder.ClassRef.class));
-      RENAMED_TYPES.put(
-          "io/opentelemetry/javaagent/tooling/muzzle/references/Flag",
-          Type.getInternalName(OtelMuzzleRefBuilder.Flag.class));
-      RENAMED_TYPES.put(
-          "io/opentelemetry/javaagent/tooling/muzzle/references/Flag$VisibilityFlag",
-          Type.getInternalName(OtelMuzzleRefBuilder.Flag.class));
-      RENAMED_TYPES.put(
-          "io/opentelemetry/javaagent/tooling/muzzle/references/Flag$MinimumVisibilityFlag",
-          Type.getInternalName(OtelMuzzleRefBuilder.Flag.class));
-      RENAMED_TYPES.put(
-          "io/opentelemetry/javaagent/tooling/muzzle/references/Flag$ManifestationFlag",
-          Type.getInternalName(OtelMuzzleRefBuilder.Flag.class));
-      RENAMED_TYPES.put(
-          "io/opentelemetry/javaagent/tooling/muzzle/references/Flag$OwnershipFlag",
-          Type.getInternalName(OtelMuzzleRefBuilder.Flag.class));
-      RENAMED_TYPES.put(
-          "io/opentelemetry/javaagent/tooling/muzzle/references/Source",
-          Type.getInternalName(OtelMuzzleRefBuilder.Source.class));
-      RENAMED_TYPES.put(
-          "io/opentelemetry/instrumentation/CallDepth",
-          "datadog/trace/bootstrap/otel/instrumentation/CallDepth");
-      RENAMED_TYPES.put(
-          "io/opentelemetry/instrumentation/Java8BytecodeBridge",
-          "datadog/trace/bootstrap/otel/instrumentation/Java8BytecodeBridge");
+    private static final Set<String> UNSUPPORTED_TYPES =
+            Collections.singleton("io/opentelemetry/javaagent/tooling/muzzle/InstrumentationModuleMuzzle");
+
+    public OtelInstrumentationMapper(ClassVisitor classVisitor) {
+        super(classVisitor, Renamer.INSTANCE);
     }
 
-    /** OpenTelemetry and related packages shaded inside the tracer. */
-    private static final Map<String, String> RENAMED_PACKAGES = new HashMap<>();
-
-    static {
-      RENAMED_PACKAGES.put(
-          "io/opentelemetry/javaagent/shaded/io/opentelemetry/", "datadog/trace/bootstrap/otel/");
-
-      RENAMED_PACKAGES.put("io/opentelemetry/api/", "datadog/trace/bootstrap/otel/api/");
-      RENAMED_PACKAGES.put("io/opentelemetry/context/", "datadog/trace/bootstrap/otel/context/");
-      RENAMED_PACKAGES.put("io/opentelemetry/semconv/", "datadog/trace/bootstrap/otel/semconv/");
-
-      RENAMED_PACKAGES.put(
-          "io/opentelemetry/instrumentation/api/",
-          "datadog/trace/bootstrap/otel/instrumentation/api/");
-      RENAMED_PACKAGES.put(
-          "io/opentelemetry/instrumentation/http/",
-          "datadog/trace/bootstrap/otel/instrumentation/http/");
-      RENAMED_PACKAGES.put(
-          "io/opentelemetry/instrumentation/servlet/",
-          "datadog/trace/bootstrap/otel/instrumentation/servlet/");
-      RENAMED_PACKAGES.put(
-          "io/opentelemetry/instrumentation/internal/",
-          "datadog/trace/bootstrap/otel/instrumentation/internal/");
-
-      RENAMED_PACKAGES.put(
-          "io/opentelemetry/javaagent/bootstrap/", "datadog/trace/bootstrap/otel/instrumentation/");
-
-      // we want to keep this package unchanged so it matches against any unshaded extensions
-      // dropped in at runtime; use replace to stop it being transformed by the shadow plugin
-      RENAMED_PACKAGES.put("org|objectweb|asm|".replace('|', '/'), "net/bytebuddy/jar/asm/");
+    @Override
+    protected MethodVisitor createMethodRemapper(MethodVisitor methodVisitor) {
+        return new OtelMethodCallMapper(methodVisitor, remapper);
     }
 
     @Override
-    public String map(String internalName) {
-      String rename = RENAMED_TYPES.get(internalName);
-      if (null != rename) {
-        return rename;
-      }
-      for (Map.Entry<String, String> mapping : RENAMED_PACKAGES.entrySet()) {
-        if (internalName.startsWith(mapping.getKey())) {
-          return mapping.getValue() + internalName.substring(mapping.getKey().length());
+    public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+        super.visit(version, access, name, signature, superName, removeUnsupportedTypes(interfaces));
+    }
+
+    private String[] removeUnsupportedTypes(String[] interfaces) {
+        List<String> filtered = null;
+        for (int i = interfaces.length - 1; i >= 0; i--) {
+            if (UNSUPPORTED_TYPES.contains(interfaces[i])) {
+                if (null == filtered) {
+                    filtered = new ArrayList<>(Arrays.asList(interfaces));
+                }
+                filtered.remove(i); // remove unsupported interface
+            }
+        }
+        return null != filtered ? filtered.toArray(new String[0]) : interfaces;
+    }
+
+    static final class Renamer extends Remapper {
+        static final Renamer INSTANCE = new Renamer();
+
+        /** Datadog equivalent of OpenTelemetry instrumentation classes. */
+        private static final Map<String, String> RENAMED_TYPES = new HashMap<>();
+
+        static {
+            RENAMED_TYPES.put(
+                    "io/opentelemetry/javaagent/extension/instrumentation/InstrumentationModule",
+                    Type.getInternalName(OtelInstrumenterModule.class));
+            RENAMED_TYPES.put(
+                    "io/opentelemetry/javaagent/extension/instrumentation/TypeInstrumentation",
+                    Type.getInternalName(OtelInstrumenter.class));
+            RENAMED_TYPES.put(
+                    "io/opentelemetry/javaagent/extension/instrumentation/TypeTransformer",
+                    Type.getInternalName(OtelTransformer.class));
+            RENAMED_TYPES.put(
+                    "io/opentelemetry/javaagent/extension/matcher/AgentElementMatchers",
+                    Type.getInternalName(OtelElementMatchers.class));
+            RENAMED_TYPES.put(
+                    "io/opentelemetry/javaagent/tooling/muzzle/VirtualFieldMappingsBuilder",
+                    Type.getInternalName(OtelInstrumenterModule.VirtualFieldBuilder.class));
+            RENAMED_TYPES.put(
+                    "io/opentelemetry/javaagent/shaded/instrumentation/api/util/VirtualField",
+                    Type.getInternalName(ContextStore.class));
+            RENAMED_TYPES.put(
+                    "io/opentelemetry/javaagent/tooling/muzzle/references/ClassRefBuilder",
+                    Type.getInternalName(OtelMuzzleRefBuilder.class));
+            RENAMED_TYPES.put(
+                    "io/opentelemetry/javaagent/tooling/muzzle/references/ClassRef",
+                    Type.getInternalName(OtelMuzzleRefBuilder.ClassRef.class));
+            RENAMED_TYPES.put(
+                    "io/opentelemetry/javaagent/tooling/muzzle/references/Flag",
+                    Type.getInternalName(OtelMuzzleRefBuilder.Flag.class));
+            RENAMED_TYPES.put(
+                    "io/opentelemetry/javaagent/tooling/muzzle/references/Flag$VisibilityFlag",
+                    Type.getInternalName(OtelMuzzleRefBuilder.Flag.class));
+            RENAMED_TYPES.put(
+                    "io/opentelemetry/javaagent/tooling/muzzle/references/Flag$MinimumVisibilityFlag",
+                    Type.getInternalName(OtelMuzzleRefBuilder.Flag.class));
+            RENAMED_TYPES.put(
+                    "io/opentelemetry/javaagent/tooling/muzzle/references/Flag$ManifestationFlag",
+                    Type.getInternalName(OtelMuzzleRefBuilder.Flag.class));
+            RENAMED_TYPES.put(
+                    "io/opentelemetry/javaagent/tooling/muzzle/references/Flag$OwnershipFlag",
+                    Type.getInternalName(OtelMuzzleRefBuilder.Flag.class));
+            RENAMED_TYPES.put(
+                    "io/opentelemetry/javaagent/tooling/muzzle/references/Source",
+                    Type.getInternalName(OtelMuzzleRefBuilder.Source.class));
+            RENAMED_TYPES.put(
+                    "io/opentelemetry/instrumentation/CallDepth",
+                    "datadog/trace/bootstrap/otel/instrumentation/CallDepth");
+            RENAMED_TYPES.put(
+                    "io/opentelemetry/instrumentation/Java8BytecodeBridge",
+                    "datadog/trace/bootstrap/otel/instrumentation/Java8BytecodeBridge");
+        }
+
+        /** OpenTelemetry and related packages shaded inside the tracer. */
+        private static final Map<String, String> RENAMED_PACKAGES = new HashMap<>();
+
+        static {
+            RENAMED_PACKAGES.put(
+                    "io/opentelemetry/javaagent/shaded/io/opentelemetry/", "datadog/trace/bootstrap/otel/");
+
+            RENAMED_PACKAGES.put("io/opentelemetry/api/", "datadog/trace/bootstrap/otel/api/");
+            RENAMED_PACKAGES.put("io/opentelemetry/context/", "datadog/trace/bootstrap/otel/context/");
+            RENAMED_PACKAGES.put("io/opentelemetry/semconv/", "datadog/trace/bootstrap/otel/semconv/");
+
+            RENAMED_PACKAGES.put(
+                    "io/opentelemetry/instrumentation/api/", "datadog/trace/bootstrap/otel/instrumentation/api/");
+            RENAMED_PACKAGES.put(
+                    "io/opentelemetry/instrumentation/http/", "datadog/trace/bootstrap/otel/instrumentation/http/");
+            RENAMED_PACKAGES.put(
+                    "io/opentelemetry/instrumentation/servlet/",
+                    "datadog/trace/bootstrap/otel/instrumentation/servlet/");
+            RENAMED_PACKAGES.put(
+                    "io/opentelemetry/instrumentation/internal/",
+                    "datadog/trace/bootstrap/otel/instrumentation/internal/");
+
+            RENAMED_PACKAGES.put(
+                    "io/opentelemetry/javaagent/bootstrap/", "datadog/trace/bootstrap/otel/instrumentation/");
+
+            // we want to keep this package unchanged so it matches against any unshaded extensions
+            // dropped in at runtime; use replace to stop it being transformed by the shadow plugin
+            RENAMED_PACKAGES.put("org|objectweb|asm|".replace('|', '/'), "net/bytebuddy/jar/asm/");
+        }
+
+        @Override
+        public String map(String internalName) {
+            String rename = RENAMED_TYPES.get(internalName);
+            if (null != rename) {
+                return rename;
+            }
+            for (Map.Entry<String, String> mapping : RENAMED_PACKAGES.entrySet()) {
+                if (internalName.startsWith(mapping.getKey())) {
+                    return mapping.getValue()
+                            + internalName.substring(mapping.getKey().length());
+                }
+            }
+            return MAP_LOGGING.apply(internalName);
         }
-      }
-      return MAP_LOGGING.apply(internalName);
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelInstrumenter.java b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelInstrumenter.java
index 47f6bcbb6bf..5719633ae80 100644
--- a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelInstrumenter.java
+++ b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelInstrumenter.java
@@ -6,36 +6,34 @@
 
 /** Replaces OpenTelemetry's {@code TypeInstrumentation} callback when mapping extensions. */
 public interface OtelInstrumenter
-    extends Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice,
-        Instrumenter.HasTypeAdvice {
-
-  @Override
-  default String hierarchyMarkerType() {
-    return null; // no hint available
-  }
-
-  @Override
-  default ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return typeMatcher();
-  }
-
-  @Override
-  default void methodAdvice(MethodTransformer methodTransformer) {
-    OtelTransformerState.capture(this).with(methodTransformer);
-  }
-
-  @Override
-  default void typeAdvice(TypeTransformer typeTransformer) {
-    OtelTransformerState.capture(this).with(typeTransformer);
-  }
-
-  ElementMatcher<TypeDescription> typeMatcher();
-
-  /**
-   * Once both transformers have been captured in {@link #methodAdvice} and {@link #typeAdvice} the
-   * {@code #transform} method will be called. This allows the extension to register method and type
-   * advice at the same time, using the single interface expected by OpenTelemetry.
-   */
-  void transform(OtelTransformer transformer);
+        extends Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice, Instrumenter.HasTypeAdvice {
+
+    @Override
+    default String hierarchyMarkerType() {
+        return null; // no hint available
+    }
+
+    @Override
+    default ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return typeMatcher();
+    }
+
+    @Override
+    default void methodAdvice(MethodTransformer methodTransformer) {
+        OtelTransformerState.capture(this).with(methodTransformer);
+    }
+
+    @Override
+    default void typeAdvice(TypeTransformer typeTransformer) {
+        OtelTransformerState.capture(this).with(typeTransformer);
+    }
+
+    ElementMatcher<TypeDescription> typeMatcher();
+
+    /**
+     * Once both transformers have been captured in {@link #methodAdvice} and {@link #typeAdvice} the
+     * {@code #transform} method will be called. This allows the extension to register method and type
+     * advice at the same time, using the single interface expected by OpenTelemetry.
+     */
+    void transform(OtelTransformer transformer);
 }
diff --git a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelInstrumenterModule.java b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelInstrumenterModule.java
index 52f74215432..7887ec18a70 100644
--- a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelInstrumenterModule.java
+++ b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelInstrumenterModule.java
@@ -19,108 +19,107 @@
  */
 public abstract class OtelInstrumenterModule extends InstrumenterModule.Tracing {
 
-  public OtelInstrumenterModule(String instrumentationName, String... additionalNames) {
-    super(namespace(instrumentationName), namespace(additionalNames));
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isTraceOtelEnabled() && super.defaultEnabled();
-  }
-
-  private static String namespace(String name) {
-    return "otel." + name;
-  }
-
-  private static String[] namespace(String[] names) {
-    String[] namespaced = new String[names.length];
-    for (int i = 0; i < names.length; i++) {
-      namespaced[i] = namespace(names[i]);
+    public OtelInstrumenterModule(String instrumentationName, String... additionalNames) {
+        super(namespace(instrumentationName), namespace(additionalNames));
     }
-    return namespaced;
-  }
 
-  private volatile String[] helperClassNames;
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isTraceOtelEnabled() && super.defaultEnabled();
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    if (null == helperClassNames) {
-      helperClassNames = buildHelperClassNames();
+    private static String namespace(String name) {
+        return "otel." + name;
     }
-    return helperClassNames;
-  }
-
-  private String[] buildHelperClassNames() {
-    List<String> helperClassNames;
-    List<String> additionalClassNames = getAdditionalHelperClassNames();
-    if (additionalClassNames.isEmpty()) {
-      // no additional names, just use those captured at build time
-      helperClassNames = getMuzzleHelperClassNames();
-    } else {
-      // combine names captured at build time with additional names
-      helperClassNames = new ArrayList<>(getMuzzleHelperClassNames());
-      helperClassNames.addAll(additionalClassNames);
+
+    private static String[] namespace(String[] names) {
+        String[] namespaced = new String[names.length];
+        for (int i = 0; i < names.length; i++) {
+            namespaced[i] = namespace(names[i]);
+        }
+        return namespaced;
     }
-    if (helperClassNames.isEmpty()) {
-      return NO_HELPERS;
-    } else {
-      return helperClassNames.toArray(new String[0]);
+
+    private volatile String[] helperClassNames;
+
+    @Override
+    public String[] helperClassNames() {
+        if (null == helperClassNames) {
+            helperClassNames = buildHelperClassNames();
+        }
+        return helperClassNames;
     }
-  }
-
-  /** This method is generated by OpenTelemetry's muzzle plugin at build time. */
-  public List<String> getMuzzleHelperClassNames() {
-    return Collections.emptyList();
-  }
-
-  /** Extensions override this to supply names not covered by the muzzle plugin. */
-  public List<String> getAdditionalHelperClassNames() {
-    return Collections.emptyList();
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> virtualFields = new HashMap<>();
-    registerMuzzleVirtualFields(
-        new VirtualFieldBuilder() {
-          @Override
-          public VirtualFieldBuilder register(String typeName, String fieldTypeName) {
-            virtualFields.put(typeName, fieldTypeName);
-            return this;
-          }
-        });
-    return virtualFields;
-  }
-
-  /** This method is generated by OpenTelemetry's muzzle plugin at build time. */
-  public void registerMuzzleVirtualFields(VirtualFieldBuilder builder) {}
-
-  public interface VirtualFieldBuilder {
-    VirtualFieldBuilder register(String typeName, String fieldTypeName);
-  }
-
-  @Override
-  public ReferenceProvider runtimeMuzzleReferences() {
-    return new ReferenceProvider() {
-      private volatile Iterable<Reference> muzzleReferences;
-
-      @Override
-      @SuppressWarnings({"unchecked", "rawtypes"})
-      public Iterable<Reference> buildReferences(TypePool ignored) {
-        if (null == muzzleReferences) {
-          Map<String, ClassRef> muzzleMap = getMuzzleReferences();
-          for (String helper : helperClassNames()) {
-            muzzleMap.remove(helper);
-          }
-          muzzleReferences = (Iterable) muzzleMap.values();
+
+    private String[] buildHelperClassNames() {
+        List<String> helperClassNames;
+        List<String> additionalClassNames = getAdditionalHelperClassNames();
+        if (additionalClassNames.isEmpty()) {
+            // no additional names, just use those captured at build time
+            helperClassNames = getMuzzleHelperClassNames();
+        } else {
+            // combine names captured at build time with additional names
+            helperClassNames = new ArrayList<>(getMuzzleHelperClassNames());
+            helperClassNames.addAll(additionalClassNames);
+        }
+        if (helperClassNames.isEmpty()) {
+            return NO_HELPERS;
+        } else {
+            return helperClassNames.toArray(new String[0]);
         }
-        return muzzleReferences;
-      }
-    };
-  }
-
-  /** This method is generated by OpenTelemetry's muzzle plugin at build time. */
-  public Map<String, ClassRef> getMuzzleReferences() {
-    return Collections.emptyMap();
-  }
+    }
+
+    /** This method is generated by OpenTelemetry's muzzle plugin at build time. */
+    public List<String> getMuzzleHelperClassNames() {
+        return Collections.emptyList();
+    }
+
+    /** Extensions override this to supply names not covered by the muzzle plugin. */
+    public List<String> getAdditionalHelperClassNames() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> virtualFields = new HashMap<>();
+        registerMuzzleVirtualFields(new VirtualFieldBuilder() {
+            @Override
+            public VirtualFieldBuilder register(String typeName, String fieldTypeName) {
+                virtualFields.put(typeName, fieldTypeName);
+                return this;
+            }
+        });
+        return virtualFields;
+    }
+
+    /** This method is generated by OpenTelemetry's muzzle plugin at build time. */
+    public void registerMuzzleVirtualFields(VirtualFieldBuilder builder) {}
+
+    public interface VirtualFieldBuilder {
+        VirtualFieldBuilder register(String typeName, String fieldTypeName);
+    }
+
+    @Override
+    public ReferenceProvider runtimeMuzzleReferences() {
+        return new ReferenceProvider() {
+            private volatile Iterable<Reference> muzzleReferences;
+
+            @Override
+            @SuppressWarnings({"unchecked", "rawtypes"})
+            public Iterable<Reference> buildReferences(TypePool ignored) {
+                if (null == muzzleReferences) {
+                    Map<String, ClassRef> muzzleMap = getMuzzleReferences();
+                    for (String helper : helperClassNames()) {
+                        muzzleMap.remove(helper);
+                    }
+                    muzzleReferences = (Iterable) muzzleMap.values();
+                }
+                return muzzleReferences;
+            }
+        };
+    }
+
+    /** This method is generated by OpenTelemetry's muzzle plugin at build time. */
+    public Map<String, ClassRef> getMuzzleReferences() {
+        return Collections.emptyMap();
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelMethodCallMapper.java b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelMethodCallMapper.java
index 3d8021acf84..6f1de524b9e 100644
--- a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelMethodCallMapper.java
+++ b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelMethodCallMapper.java
@@ -14,101 +14,101 @@
 /** Maps OpenTelemetry method calls to use the Datadog equivalent API. */
 public final class OtelMethodCallMapper extends MethodRemapper {
 
-  private static final String VIRTUAL_FIELD_CLASS =
-      "io/opentelemetry/javaagent/shaded/instrumentation/api/util/VirtualField";
-
-  private static final String FIELD_BACKED_CONTEXT_STORES_CLASS =
-      Type.getInternalName(FieldBackedContextStores.class);
-
-  private static final String GET_CONTENT_STORE_METHOD = "getContextStore";
-  private static final String GET_CONTENT_STORE_METHOD_DESCRIPTOR =
-      Type.getMethodDescriptor(Type.getType(FieldBackedContextStore.class), Type.INT_TYPE);
-
-  private static final String FIELD_BACKED_CONTENT_STORE_DESCRIPTOR =
-      Type.getDescriptor(FieldBackedContextStore.class);
-
-  private static final String FAST_CONTENT_STORE_PREFIX = "contextStore";
-
-  /** The last two constants pushed onto the stack. */
-  private Object constant1, constant2;
-
-  public OtelMethodCallMapper(MethodVisitor methodVisitor, Remapper remapper) {
-    super(methodVisitor, remapper);
-  }
-
-  @Override
-  public void visitLdcInsn(final Object value) {
-    // 'first' constant gets moved over once 'second' one comes in
-    constant1 = constant2;
-    constant2 = value;
-    super.visitLdcInsn(value);
-  }
-
-  @Override
-  public void visitMethodInsn(
-      final int opcode,
-      final String owner,
-      final String name,
-      final String descriptor,
-      final boolean isInterface) {
-
-    if (VIRTUAL_FIELD_CLASS.equals(owner)) {
-      // replace VirtualField calls with their equivalent in the ContextStore API
-      if ("find".equals(name)) {
-        redirectVirtualFieldLookup();
-        return;
-      } else if ("set".equals(name)) {
-        super.visitMethodInsn(Opcodes.INVOKEINTERFACE, owner, "put", descriptor, true);
-        return;
-      } else if ("get".equals(name)) {
-        super.visitMethodInsn(Opcodes.INVOKEINTERFACE, owner, "get", descriptor, true);
-        return;
-      }
+    private static final String VIRTUAL_FIELD_CLASS =
+            "io/opentelemetry/javaagent/shaded/instrumentation/api/util/VirtualField";
+
+    private static final String FIELD_BACKED_CONTEXT_STORES_CLASS =
+            Type.getInternalName(FieldBackedContextStores.class);
+
+    private static final String GET_CONTENT_STORE_METHOD = "getContextStore";
+    private static final String GET_CONTENT_STORE_METHOD_DESCRIPTOR =
+            Type.getMethodDescriptor(Type.getType(FieldBackedContextStore.class), Type.INT_TYPE);
+
+    private static final String FIELD_BACKED_CONTENT_STORE_DESCRIPTOR =
+            Type.getDescriptor(FieldBackedContextStore.class);
+
+    private static final String FAST_CONTENT_STORE_PREFIX = "contextStore";
+
+    /** The last two constants pushed onto the stack. */
+    private Object constant1, constant2;
+
+    public OtelMethodCallMapper(MethodVisitor methodVisitor, Remapper remapper) {
+        super(methodVisitor, remapper);
     }
 
-    super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-
-    // reset constants for next method check
-    constant1 = null;
-    constant2 = null;
-  }
-
-  private void redirectVirtualFieldLookup() {
-    // We track the last two constants pushed onto the stack to make sure they match
-    // the expected key and context types. Matching calls are rewritten to call the
-    // dynamically injected context store implementation instead.
-    String keyClassName = null;
-    String contextClassName = null;
-    if (constant1 instanceof Type && constant2 instanceof Type) {
-      keyClassName = ((Type) constant1).getClassName();
-      contextClassName = ((Type) constant2).getClassName();
+    @Override
+    public void visitLdcInsn(final Object value) {
+        // 'first' constant gets moved over once 'second' one comes in
+        constant1 = constant2;
+        constant2 = value;
+        super.visitLdcInsn(value);
     }
 
-    if (null == keyClassName || null == contextClassName) {
-      throw new IllegalStateException(
-          "Incorrect VirtualField usage detected. Type and fieldType must be class-literals. "
-              + "Example of correct usage: VirtualField.find(Runnable.class, RunnableContext.class)");
+    @Override
+    public void visitMethodInsn(
+            final int opcode,
+            final String owner,
+            final String name,
+            final String descriptor,
+            final boolean isInterface) {
+
+        if (VIRTUAL_FIELD_CLASS.equals(owner)) {
+            // replace VirtualField calls with their equivalent in the ContextStore API
+            if ("find".equals(name)) {
+                redirectVirtualFieldLookup();
+                return;
+            } else if ("set".equals(name)) {
+                super.visitMethodInsn(Opcodes.INVOKEINTERFACE, owner, "put", descriptor, true);
+                return;
+            } else if ("get".equals(name)) {
+                super.visitMethodInsn(Opcodes.INVOKEINTERFACE, owner, "get", descriptor, true);
+                return;
+            }
+        }
+
+        super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+
+        // reset constants for next method check
+        constant1 = null;
+        constant2 = null;
     }
 
-    // discard original parameters so we can use numeric id instead
-    mv.visitInsn(Opcodes.POP2);
-
-    int storeId = getContextStoreId(keyClassName, contextClassName);
-    // use fast direct field access for a small number of stores
-    if (storeId < FAST_STORE_ID_LIMIT) {
-      mv.visitFieldInsn(
-          Opcodes.GETSTATIC,
-          FIELD_BACKED_CONTEXT_STORES_CLASS,
-          FAST_CONTENT_STORE_PREFIX + storeId,
-          FIELD_BACKED_CONTENT_STORE_DESCRIPTOR);
-    } else {
-      mv.visitLdcInsn(storeId);
-      mv.visitMethodInsn(
-          Opcodes.INVOKESTATIC,
-          FIELD_BACKED_CONTEXT_STORES_CLASS,
-          GET_CONTENT_STORE_METHOD,
-          GET_CONTENT_STORE_METHOD_DESCRIPTOR,
-          false);
+    private void redirectVirtualFieldLookup() {
+        // We track the last two constants pushed onto the stack to make sure they match
+        // the expected key and context types. Matching calls are rewritten to call the
+        // dynamically injected context store implementation instead.
+        String keyClassName = null;
+        String contextClassName = null;
+        if (constant1 instanceof Type && constant2 instanceof Type) {
+            keyClassName = ((Type) constant1).getClassName();
+            contextClassName = ((Type) constant2).getClassName();
+        }
+
+        if (null == keyClassName || null == contextClassName) {
+            throw new IllegalStateException(
+                    "Incorrect VirtualField usage detected. Type and fieldType must be class-literals. "
+                            + "Example of correct usage: VirtualField.find(Runnable.class, RunnableContext.class)");
+        }
+
+        // discard original parameters so we can use numeric id instead
+        mv.visitInsn(Opcodes.POP2);
+
+        int storeId = getContextStoreId(keyClassName, contextClassName);
+        // use fast direct field access for a small number of stores
+        if (storeId < FAST_STORE_ID_LIMIT) {
+            mv.visitFieldInsn(
+                    Opcodes.GETSTATIC,
+                    FIELD_BACKED_CONTEXT_STORES_CLASS,
+                    FAST_CONTENT_STORE_PREFIX + storeId,
+                    FIELD_BACKED_CONTENT_STORE_DESCRIPTOR);
+        } else {
+            mv.visitLdcInsn(storeId);
+            mv.visitMethodInsn(
+                    Opcodes.INVOKESTATIC,
+                    FIELD_BACKED_CONTEXT_STORES_CLASS,
+                    GET_CONTENT_STORE_METHOD,
+                    GET_CONTENT_STORE_METHOD_DESCRIPTOR,
+                    false);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelMuzzleRefBuilder.java b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelMuzzleRefBuilder.java
index 88bc87e0370..4a0cbd4bc36 100644
--- a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelMuzzleRefBuilder.java
+++ b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelMuzzleRefBuilder.java
@@ -15,124 +15,116 @@
 
 /** Maps OpenTelemetry muzzle references to the Datadog equivalent. */
 public final class OtelMuzzleRefBuilder {
-  private final Reference.Builder builder;
+    private final Reference.Builder builder;
 
-  OtelMuzzleRefBuilder(String className) {
-    this.builder = new Reference.Builder(className);
-  }
+    OtelMuzzleRefBuilder(String className) {
+        this.builder = new Reference.Builder(className);
+    }
+
+    public OtelMuzzleRefBuilder setSuperClassName(String superName) {
+        builder.withSuperName(superName);
+        return this;
+    }
+
+    public OtelMuzzleRefBuilder addInterfaceNames(Collection<String> interfaceNames) {
+        for (String interfaceName : interfaceNames) {
+            builder.withInterface(interfaceName);
+        }
+        return this;
+    }
+
+    public OtelMuzzleRefBuilder addInterfaceName(String interfaceName) {
+        builder.withInterface(interfaceName);
+        return this;
+    }
 
-  public OtelMuzzleRefBuilder setSuperClassName(String superName) {
-    builder.withSuperName(superName);
-    return this;
-  }
+    public OtelMuzzleRefBuilder addSource(String sourceName) {
+        builder.withSource(sourceName, 0);
+        return this;
+    }
 
-  public OtelMuzzleRefBuilder addInterfaceNames(Collection<String> interfaceNames) {
-    for (String interfaceName : interfaceNames) {
-      builder.withInterface(interfaceName);
+    public OtelMuzzleRefBuilder addSource(String sourceName, int line) {
+        builder.withSource(sourceName, line);
+        return this;
     }
-    return this;
-  }
-
-  public OtelMuzzleRefBuilder addInterfaceName(String interfaceName) {
-    builder.withInterface(interfaceName);
-    return this;
-  }
-
-  public OtelMuzzleRefBuilder addSource(String sourceName) {
-    builder.withSource(sourceName, 0);
-    return this;
-  }
-
-  public OtelMuzzleRefBuilder addSource(String sourceName, int line) {
-    builder.withSource(sourceName, line);
-    return this;
-  }
-
-  public OtelMuzzleRefBuilder addFlag(Flag flag) {
-    builder.withFlag(flag.bit);
-    return this;
-  }
-
-  public OtelMuzzleRefBuilder addField(
-      Source[] sources, Flag[] flags, String fieldName, Type fieldType, boolean isDeclared) {
-    builder.withField(Source.flatten(sources), Flag.flatten(flags), fieldName, fieldType);
-    return this;
-  }
-
-  public OtelMuzzleRefBuilder addMethod(
-      Source[] sources, Flag[] flags, String methodName, Type returnType, Type... argumentTypes) {
-    builder.withMethod(
-        Source.flatten(sources), Flag.flatten(flags), methodName, returnType, argumentTypes);
-    return this;
-  }
-
-  public ClassRef build() {
-    return new ClassRef(builder.build());
-  }
-
-  public static final class ClassRef extends Reference {
-    public ClassRef(Reference ref) {
-      super(
-          ref.sources,
-          ref.flags,
-          ref.className,
-          ref.superName,
-          ref.interfaces,
-          ref.fields,
-          ref.methods);
+
+    public OtelMuzzleRefBuilder addFlag(Flag flag) {
+        builder.withFlag(flag.bit);
+        return this;
     }
 
-    public static OtelMuzzleRefBuilder builder(String className) {
-      return new OtelMuzzleRefBuilder(className);
+    public OtelMuzzleRefBuilder addField(
+            Source[] sources, Flag[] flags, String fieldName, Type fieldType, boolean isDeclared) {
+        builder.withField(Source.flatten(sources), Flag.flatten(flags), fieldName, fieldType);
+        return this;
     }
-  }
-
-  public enum Flag {
-    PUBLIC(EXPECTS_PUBLIC),
-    PROTECTED_OR_HIGHER(EXPECTS_PUBLIC_OR_PROTECTED),
-    PROTECTED(EXPECTS_PUBLIC_OR_PROTECTED),
-    PACKAGE_OR_HIGHER(EXPECTS_NON_PRIVATE),
-    PACKAGE(EXPECTS_NON_PRIVATE),
-    PRIVATE_OR_HIGHER(0),
-    PRIVATE(0),
-    ABSTRACT(0),
-    FINAL(0),
-    NON_FINAL(EXPECTS_NON_FINAL),
-    INTERFACE(EXPECTS_INTERFACE),
-    NON_INTERFACE(EXPECTS_NON_INTERFACE),
-    STATIC(EXPECTS_STATIC),
-    NON_STATIC(EXPECTS_NON_STATIC);
-
-    final int bit;
-
-    Flag(int bit) {
-      this.bit = bit;
+
+    public OtelMuzzleRefBuilder addMethod(
+            Source[] sources, Flag[] flags, String methodName, Type returnType, Type... argumentTypes) {
+        builder.withMethod(Source.flatten(sources), Flag.flatten(flags), methodName, returnType, argumentTypes);
+        return this;
     }
 
-    public static int flatten(Flag[] flags) {
-      int bits = 0;
-      for (Flag flag : flags) {
-        bits |= flag.bit;
-      }
-      return bits;
+    public ClassRef build() {
+        return new ClassRef(builder.build());
     }
-  }
 
-  public static final class Source {
-    final String name;
-    final int line;
+    public static final class ClassRef extends Reference {
+        public ClassRef(Reference ref) {
+            super(ref.sources, ref.flags, ref.className, ref.superName, ref.interfaces, ref.fields, ref.methods);
+        }
+
+        public static OtelMuzzleRefBuilder builder(String className) {
+            return new OtelMuzzleRefBuilder(className);
+        }
+    }
 
-    public Source(String name, int line) {
-      this.name = name;
-      this.line = line;
+    public enum Flag {
+        PUBLIC(EXPECTS_PUBLIC),
+        PROTECTED_OR_HIGHER(EXPECTS_PUBLIC_OR_PROTECTED),
+        PROTECTED(EXPECTS_PUBLIC_OR_PROTECTED),
+        PACKAGE_OR_HIGHER(EXPECTS_NON_PRIVATE),
+        PACKAGE(EXPECTS_NON_PRIVATE),
+        PRIVATE_OR_HIGHER(0),
+        PRIVATE(0),
+        ABSTRACT(0),
+        FINAL(0),
+        NON_FINAL(EXPECTS_NON_FINAL),
+        INTERFACE(EXPECTS_INTERFACE),
+        NON_INTERFACE(EXPECTS_NON_INTERFACE),
+        STATIC(EXPECTS_STATIC),
+        NON_STATIC(EXPECTS_NON_STATIC);
+
+        final int bit;
+
+        Flag(int bit) {
+            this.bit = bit;
+        }
+
+        public static int flatten(Flag[] flags) {
+            int bits = 0;
+            for (Flag flag : flags) {
+                bits |= flag.bit;
+            }
+            return bits;
+        }
     }
 
-    public static String[] flatten(Source[] sources) {
-      String[] locations = new String[sources.length];
-      for (int i = 0; i < sources.length; i++) {
-        locations[i] = sources[i].name + ":" + sources[i].line;
-      }
-      return locations;
+    public static final class Source {
+        final String name;
+        final int line;
+
+        public Source(String name, int line) {
+            this.name = name;
+            this.line = line;
+        }
+
+        public static String[] flatten(Source[] sources) {
+            String[] locations = new String[sources.length];
+            for (int i = 0; i < sources.length; i++) {
+                locations[i] = sources[i].name + ":" + sources[i].line;
+            }
+            return locations;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelTransformer.java b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelTransformer.java
index f57bf753481..139465bfabf 100644
--- a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelTransformer.java
+++ b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelTransformer.java
@@ -7,8 +7,7 @@
 /** Replaces OpenTelemetry's {@code TypeTransformer} callback when mapping extensions. */
 public interface OtelTransformer {
 
-  void applyAdviceToMethod(
-      ElementMatcher<? super MethodDescription> methodMatcher, String adviceClassName);
+    void applyAdviceToMethod(ElementMatcher<? super MethodDescription> methodMatcher, String adviceClassName);
 
-  void applyTransformer(AgentBuilder.Transformer transformer);
+    void applyTransformer(AgentBuilder.Transformer transformer);
 }
diff --git a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelTransformerState.java b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelTransformerState.java
index 04bfe4949a6..c4dc4d03ff7 100644
--- a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelTransformerState.java
+++ b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelTransformerState.java
@@ -18,56 +18,55 @@
  * request through the mapped OpenTelemetry callback.
  */
 final class OtelTransformerState implements OtelTransformer {
-  private static final OtelTransformerState CURRENT = new OtelTransformerState();
+    private static final OtelTransformerState CURRENT = new OtelTransformerState();
 
-  private OtelInstrumenter instrumenter;
-  private Instrumenter.MethodTransformer methodTransformer;
-  private Instrumenter.TypeTransformer typeTransformer;
+    private OtelInstrumenter instrumenter;
+    private Instrumenter.MethodTransformer methodTransformer;
+    private Instrumenter.TypeTransformer typeTransformer;
 
-  static OtelTransformerState capture(OtelInstrumenter instrumenter) {
-    if (instrumenter != CURRENT.instrumenter) {
-      CURRENT.reset();
-      CURRENT.instrumenter = instrumenter;
+    static OtelTransformerState capture(OtelInstrumenter instrumenter) {
+        if (instrumenter != CURRENT.instrumenter) {
+            CURRENT.reset();
+            CURRENT.instrumenter = instrumenter;
+        }
+        return CURRENT;
     }
-    return CURRENT;
-  }
 
-  void with(Instrumenter.MethodTransformer methodTransformer) {
-    this.methodTransformer = methodTransformer;
-    if (null != this.typeTransformer) {
-      triggerTransform();
+    void with(Instrumenter.MethodTransformer methodTransformer) {
+        this.methodTransformer = methodTransformer;
+        if (null != this.typeTransformer) {
+            triggerTransform();
+        }
     }
-  }
 
-  void with(Instrumenter.TypeTransformer typeTransformer) {
-    this.typeTransformer = typeTransformer;
-    if (null != this.methodTransformer) {
-      triggerTransform();
+    void with(Instrumenter.TypeTransformer typeTransformer) {
+        this.typeTransformer = typeTransformer;
+        if (null != this.methodTransformer) {
+            triggerTransform();
+        }
     }
-  }
 
-  private void triggerTransform() {
-    try {
-      instrumenter.transform(this);
-    } finally {
-      reset();
+    private void triggerTransform() {
+        try {
+            instrumenter.transform(this);
+        } finally {
+            reset();
+        }
     }
-  }
 
-  private void reset() {
-    this.instrumenter = null;
-    this.methodTransformer = null;
-    this.typeTransformer = null;
-  }
+    private void reset() {
+        this.instrumenter = null;
+        this.methodTransformer = null;
+        this.typeTransformer = null;
+    }
 
-  @Override
-  public void applyAdviceToMethod(
-      ElementMatcher<? super MethodDescription> methodMatcher, String adviceClassName) {
-    methodTransformer.applyAdvice(methodMatcher, adviceClassName);
-  }
+    @Override
+    public void applyAdviceToMethod(ElementMatcher<? super MethodDescription> methodMatcher, String adviceClassName) {
+        methodTransformer.applyAdvice(methodMatcher, adviceClassName);
+    }
 
-  @Override
-  public void applyTransformer(AgentBuilder.Transformer transformer) {
-    typeTransformer.applyAdvice(transformer::transform);
-  }
+    @Override
+    public void applyTransformer(AgentBuilder.Transformer transformer) {
+        typeTransformer.applyAdvice(transformer::transform);
+    }
 }
diff --git a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/shim/OtelShimGradlePlugin.java b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/shim/OtelShimGradlePlugin.java
index 6477e8fcbc5..8c4c4482e32 100644
--- a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/shim/OtelShimGradlePlugin.java
+++ b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/shim/OtelShimGradlePlugin.java
@@ -16,30 +16,30 @@
  * @see datadog.gradle.plugin.instrument.BuildTimeInstrumentationPlugin
  */
 public class OtelShimGradlePlugin extends Plugin.ForElementMatcher {
-  private final File targetDir;
+    private final File targetDir;
 
-  static final String[] OTEL_SHIM_INJECTED_CLASSES = {
-    "io.opentelemetry.api.DefaultOpenTelemetry",
-    "io.opentelemetry.api.GlobalOpenTelemetry$ObfuscatedOpenTelemetry",
-    "io.opentelemetry.context.ThreadLocalContextStorage",
-    "io.opentelemetry.context.StrictContextStorage",
-    "io.opentelemetry.context.ArrayBasedContext",
-  };
+    static final String[] OTEL_SHIM_INJECTED_CLASSES = {
+        "io.opentelemetry.api.DefaultOpenTelemetry",
+        "io.opentelemetry.api.GlobalOpenTelemetry$ObfuscatedOpenTelemetry",
+        "io.opentelemetry.context.ThreadLocalContextStorage",
+        "io.opentelemetry.context.StrictContextStorage",
+        "io.opentelemetry.context.ArrayBasedContext",
+    };
 
-  @SuppressForbidden
-  public OtelShimGradlePlugin(File targetDir) {
-    super(namedOneOf(OTEL_SHIM_INJECTED_CLASSES));
-    this.targetDir = targetDir;
-  }
+    @SuppressForbidden
+    public OtelShimGradlePlugin(File targetDir) {
+        super(namedOneOf(OTEL_SHIM_INJECTED_CLASSES));
+        this.targetDir = targetDir;
+    }
 
-  @Override
-  public DynamicType.Builder<?> apply(
-      final DynamicType.Builder<?> builder,
-      final TypeDescription typeDescription,
-      final ClassFileLocator classFileLocator) {
-    return builder.visit(OtelShimInjector.INSTANCE);
-  }
+    @Override
+    public DynamicType.Builder<?> apply(
+            final DynamicType.Builder<?> builder,
+            final TypeDescription typeDescription,
+            final ClassFileLocator classFileLocator) {
+        return builder.visit(OtelShimInjector.INSTANCE);
+    }
 
-  @Override
-  public void close() throws IOException {}
+    @Override
+    public void close() throws IOException {}
 }
diff --git a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/shim/OtelShimInjector.java b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/shim/OtelShimInjector.java
index 01390fc8bcd..e2fef16d97c 100644
--- a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/shim/OtelShimInjector.java
+++ b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/shim/OtelShimInjector.java
@@ -14,103 +14,97 @@
 
 /** ASM visitor which injects our OpenTelemetry shim into the target API. */
 public final class OtelShimInjector implements AsmVisitorWrapper {
-  static final OtelShimInjector INSTANCE = new OtelShimInjector();
+    static final OtelShimInjector INSTANCE = new OtelShimInjector();
 
-  static final String TRACER_PROVIDER_DESCRIPTOR = "Lio/opentelemetry/api/trace/TracerProvider;";
+    static final String TRACER_PROVIDER_DESCRIPTOR = "Lio/opentelemetry/api/trace/TracerProvider;";
 
-  static final String CONTEXT_PROPAGATORS_DESCRIPTOR =
-      "Lio/opentelemetry/context/propagation/ContextPropagators;";
+    static final String CONTEXT_PROPAGATORS_DESCRIPTOR = "Lio/opentelemetry/context/propagation/ContextPropagators;";
 
-  static final String CONTEXT_DESCRIPTOR = "Lio/opentelemetry/context/Context;";
+    static final String CONTEXT_DESCRIPTOR = "Lio/opentelemetry/context/Context;";
 
-  static final String GET_TRACER_PROVIDER_METHOD_DESCRIPTOR = "()" + TRACER_PROVIDER_DESCRIPTOR;
+    static final String GET_TRACER_PROVIDER_METHOD_DESCRIPTOR = "()" + TRACER_PROVIDER_DESCRIPTOR;
 
-  static final String GET_PROPAGATORS_METHOD_DESCRIPTOR = "()" + CONTEXT_PROPAGATORS_DESCRIPTOR;
+    static final String GET_PROPAGATORS_METHOD_DESCRIPTOR = "()" + CONTEXT_PROPAGATORS_DESCRIPTOR;
 
-  static final String CURRENT_CONTEXT_METHOD_DESCRIPTOR = "()" + CONTEXT_DESCRIPTOR;
+    static final String CURRENT_CONTEXT_METHOD_DESCRIPTOR = "()" + CONTEXT_DESCRIPTOR;
 
-  static final String ROOT_CONTEXT_METHOD_DESCRIPTOR = "()" + CONTEXT_DESCRIPTOR;
+    static final String ROOT_CONTEXT_METHOD_DESCRIPTOR = "()" + CONTEXT_DESCRIPTOR;
 
-  static final String SHIM_PACKAGE_PREFIX = "datadog/opentelemetry/shim/";
+    static final String SHIM_PACKAGE_PREFIX = "datadog/opentelemetry/shim/";
 
-  @Override
-  public int mergeWriter(final int flags) {
-    return flags | ClassWriter.COMPUTE_MAXS;
-  }
+    @Override
+    public int mergeWriter(final int flags) {
+        return flags | ClassWriter.COMPUTE_MAXS;
+    }
 
-  @Override
-  public int mergeReader(final int flags) {
-    return flags;
-  }
+    @Override
+    public int mergeReader(final int flags) {
+        return flags;
+    }
 
-  @Override
-  public ClassVisitor wrap(
-      final TypeDescription instrumentedType,
-      final ClassVisitor classVisitor,
-      final Implementation.Context implementationContext,
-      final TypePool typePool,
-      final FieldList<FieldDescription.InDefinedShape> fields,
-      final MethodList<?> methods,
-      final int writerFlags,
-      final int readerFlags) {
-    // for convenience use the same bytecode injector for each class of interest
-    // this is safe because the shim-injected methods don't overlap between them
-    return new ClassVisitor(Opcodes.ASM7, classVisitor) {
-      @Override
-      public MethodVisitor visitMethod(
-          final int access,
-          final String name,
-          final String descriptor,
-          final String signature,
-          final String[] exceptions) {
-        MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
-        if ("getTracerProvider".equals(name)
-            && GET_TRACER_PROVIDER_METHOD_DESCRIPTOR.equals(descriptor)) {
-          mv.visitCode();
-          mv.visitFieldInsn(
-              Opcodes.GETSTATIC,
-              SHIM_PACKAGE_PREFIX + "trace/OtelTracerProvider",
-              "INSTANCE",
-              TRACER_PROVIDER_DESCRIPTOR);
-          mv.visitInsn(Opcodes.ARETURN);
-          mv.visitEnd();
-          return null;
-        } else if ("getPropagators".equals(name)
-            && GET_PROPAGATORS_METHOD_DESCRIPTOR.equals(descriptor)) {
-          mv.visitCode();
-          mv.visitFieldInsn(
-              Opcodes.GETSTATIC,
-              SHIM_PACKAGE_PREFIX + "context/propagation/OtelContextPropagators",
-              "INSTANCE",
-              CONTEXT_PROPAGATORS_DESCRIPTOR);
-          mv.visitInsn(Opcodes.ARETURN);
-          mv.visitEnd();
-          return null;
-        } else if ("current".equals(name) && CURRENT_CONTEXT_METHOD_DESCRIPTOR.equals(descriptor)) {
-          mv.visitCode();
-          mv.visitMethodInsn(
-              Opcodes.INVOKESTATIC,
-              SHIM_PACKAGE_PREFIX + "context/OtelContext",
-              "current",
-              CURRENT_CONTEXT_METHOD_DESCRIPTOR,
-              false);
-          mv.visitInsn(Opcodes.ARETURN);
-          mv.visitEnd();
-          return null;
-        } else if ("root".equals(name) && ROOT_CONTEXT_METHOD_DESCRIPTOR.equals(descriptor)) {
-          mv.visitCode();
-          mv.visitFieldInsn(
-              Opcodes.GETSTATIC,
-              SHIM_PACKAGE_PREFIX + "context/OtelContext",
-              "ROOT",
-              CONTEXT_DESCRIPTOR);
-          mv.visitInsn(Opcodes.ARETURN);
-          mv.visitEnd();
-          return null;
-        } else {
-          return mv;
-        }
-      }
-    };
-  }
+    @Override
+    public ClassVisitor wrap(
+            final TypeDescription instrumentedType,
+            final ClassVisitor classVisitor,
+            final Implementation.Context implementationContext,
+            final TypePool typePool,
+            final FieldList<FieldDescription.InDefinedShape> fields,
+            final MethodList<?> methods,
+            final int writerFlags,
+            final int readerFlags) {
+        // for convenience use the same bytecode injector for each class of interest
+        // this is safe because the shim-injected methods don't overlap between them
+        return new ClassVisitor(Opcodes.ASM7, classVisitor) {
+            @Override
+            public MethodVisitor visitMethod(
+                    final int access,
+                    final String name,
+                    final String descriptor,
+                    final String signature,
+                    final String[] exceptions) {
+                MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
+                if ("getTracerProvider".equals(name) && GET_TRACER_PROVIDER_METHOD_DESCRIPTOR.equals(descriptor)) {
+                    mv.visitCode();
+                    mv.visitFieldInsn(
+                            Opcodes.GETSTATIC,
+                            SHIM_PACKAGE_PREFIX + "trace/OtelTracerProvider",
+                            "INSTANCE",
+                            TRACER_PROVIDER_DESCRIPTOR);
+                    mv.visitInsn(Opcodes.ARETURN);
+                    mv.visitEnd();
+                    return null;
+                } else if ("getPropagators".equals(name) && GET_PROPAGATORS_METHOD_DESCRIPTOR.equals(descriptor)) {
+                    mv.visitCode();
+                    mv.visitFieldInsn(
+                            Opcodes.GETSTATIC,
+                            SHIM_PACKAGE_PREFIX + "context/propagation/OtelContextPropagators",
+                            "INSTANCE",
+                            CONTEXT_PROPAGATORS_DESCRIPTOR);
+                    mv.visitInsn(Opcodes.ARETURN);
+                    mv.visitEnd();
+                    return null;
+                } else if ("current".equals(name) && CURRENT_CONTEXT_METHOD_DESCRIPTOR.equals(descriptor)) {
+                    mv.visitCode();
+                    mv.visitMethodInsn(
+                            Opcodes.INVOKESTATIC,
+                            SHIM_PACKAGE_PREFIX + "context/OtelContext",
+                            "current",
+                            CURRENT_CONTEXT_METHOD_DESCRIPTOR,
+                            false);
+                    mv.visitInsn(Opcodes.ARETURN);
+                    mv.visitEnd();
+                    return null;
+                } else if ("root".equals(name) && ROOT_CONTEXT_METHOD_DESCRIPTOR.equals(descriptor)) {
+                    mv.visitCode();
+                    mv.visitFieldInsn(
+                            Opcodes.GETSTATIC, SHIM_PACKAGE_PREFIX + "context/OtelContext", "ROOT", CONTEXT_DESCRIPTOR);
+                    mv.visitInsn(Opcodes.ARETURN);
+                    mv.visitEnd();
+                    return null;
+                } else {
+                    return mv;
+                }
+            }
+        };
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerController.java b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerController.java
index 413caa5ba17..133e20816da 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerController.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerController.java
@@ -27,31 +27,30 @@
 /** This is the implementation of the controller for DD profiler. */
 public final class DatadogProfilerController implements Controller {
 
-  private final DatadogProfiler datadogProfiler;
-
-  public static Controller instance(ConfigProvider configProvider) throws Throwable {
-    return new DatadogProfilerController(configProvider);
-  }
-
-  public DatadogProfilerController(ConfigProvider configProvider) {
-    this(DatadogProfiler.newInstance(configProvider));
-  }
-
-  DatadogProfilerController(DatadogProfiler datadogProfiler) {
-    this.datadogProfiler = datadogProfiler;
-  }
-
-  @Nonnull
-  @Override
-  public OngoingRecording createRecording(
-      @Nonnull String recordingName, ControllerContext.Snapshot context)
-      throws UnsupportedEnvironmentException {
-    return new DatadogProfilerOngoingRecording(datadogProfiler, recordingName);
-  }
-
-  @Override
-  public void configure(ControllerContext context) {
-    context.setDatadogProfilerEnabled(true);
-    context.setDatadogProfilingModes(EnumSet.copyOf(datadogProfiler.enabledModes()));
-  }
+    private final DatadogProfiler datadogProfiler;
+
+    public static Controller instance(ConfigProvider configProvider) throws Throwable {
+        return new DatadogProfilerController(configProvider);
+    }
+
+    public DatadogProfilerController(ConfigProvider configProvider) {
+        this(DatadogProfiler.newInstance(configProvider));
+    }
+
+    DatadogProfilerController(DatadogProfiler datadogProfiler) {
+        this.datadogProfiler = datadogProfiler;
+    }
+
+    @Nonnull
+    @Override
+    public OngoingRecording createRecording(@Nonnull String recordingName, ControllerContext.Snapshot context)
+            throws UnsupportedEnvironmentException {
+        return new DatadogProfilerOngoingRecording(datadogProfiler, recordingName);
+    }
+
+    @Override
+    public void configure(ControllerContext context) {
+        context.setDatadogProfilerEnabled(true);
+        context.setDatadogProfilingModes(EnumSet.copyOf(datadogProfiler.enabledModes()));
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecording.java b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecording.java
index 26ffc13e972..c6f9ebff921 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecording.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecording.java
@@ -28,50 +28,49 @@
 import org.slf4j.LoggerFactory;
 
 public class DatadogProfilerOngoingRecording implements OngoingRecording {
-  private static final Logger log = LoggerFactory.getLogger(DatadogProfilerOngoingRecording.class);
+    private static final Logger log = LoggerFactory.getLogger(DatadogProfilerOngoingRecording.class);
 
-  private final ProfilerSettingsSupport configMemento;
+    private final ProfilerSettingsSupport configMemento;
 
-  private final OngoingRecording recording;
-  private final Instant started = Instant.now();
+    private final OngoingRecording recording;
+    private final Instant started = Instant.now();
 
-  DatadogProfilerOngoingRecording(DatadogProfiler datadogProfiler, String recordingName)
-      throws UnsupportedEnvironmentException {
-    log.debug("Creating new recording: {}", recordingName);
-    recording = datadogProfiler.start();
-    if (recording == null) {
-      throw new UnsupportedEnvironmentException("Failed to start Datadog profiler");
+    DatadogProfilerOngoingRecording(DatadogProfiler datadogProfiler, String recordingName)
+            throws UnsupportedEnvironmentException {
+        log.debug("Creating new recording: {}", recordingName);
+        recording = datadogProfiler.start();
+        if (recording == null) {
+            throw new UnsupportedEnvironmentException("Failed to start Datadog profiler");
+        }
+        log.debug("Recording {} started", recordingName);
+        this.configMemento = JavaVirtualMachine.isJ9() ? new DatadogProfilerSettings(datadogProfiler) : null;
     }
-    log.debug("Recording {} started", recordingName);
-    this.configMemento =
-        JavaVirtualMachine.isJ9() ? new DatadogProfilerSettings(datadogProfiler) : null;
-  }
 
-  @Override
-  public RecordingData stop() {
-    publishConfig();
-    return recording.stop();
-  }
+    @Override
+    public RecordingData stop() {
+        publishConfig();
+        return recording.stop();
+    }
 
-  @VisibleForTesting
-  final RecordingData snapshot(final Instant start) {
-    return snapshot(start, ProfilingSnapshot.Kind.PERIODIC);
-  }
+    @VisibleForTesting
+    final RecordingData snapshot(final Instant start) {
+        return snapshot(start, ProfilingSnapshot.Kind.PERIODIC);
+    }
 
-  @Override
-  public RecordingData snapshot(final Instant start, ProfilingSnapshot.Kind kind) {
-    publishConfig();
-    return recording.snapshot(start, kind);
-  }
+    @Override
+    public RecordingData snapshot(final Instant start, ProfilingSnapshot.Kind kind) {
+        publishConfig();
+        return recording.snapshot(start, kind);
+    }
 
-  @Override
-  public void close() {
-    recording.close();
-  }
+    @Override
+    public void close() {
+        recording.close();
+    }
 
-  private void publishConfig() {
-    if (configMemento != null) {
-      configMemento.publish();
+    private void publishConfig() {
+        if (configMemento != null) {
+            configMemento.publish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerSettings.java b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerSettings.java
index b2746b82e5e..60f6ed5c64a 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerSettings.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerSettings.java
@@ -7,46 +7,44 @@
 
 public class DatadogProfilerSettings extends ProfilerSettingsSupport {
 
-  private final DatadogProfiler datadogProfiler;
+    private final DatadogProfiler datadogProfiler;
 
-  public DatadogProfilerSettings(DatadogProfiler datadogProfiler) {
-    super(ConfigProvider.getInstance(), null, false);
-    this.datadogProfiler = datadogProfiler;
-  }
-
-  public void publish() {
-    datadogProfiler.recordSetting(VERSION_KEY, VersionInfo.VERSION);
-    datadogProfiler.recordSetting(UPLOAD_PERIOD_KEY, String.valueOf(uploadPeriod), "seconds");
-    datadogProfiler.recordSetting(UPLOAD_TIMEOUT_KEY, String.valueOf(uploadTimeout), "seconds");
-    datadogProfiler.recordSetting(UPLOAD_COMPRESSION_KEY, uploadCompression);
-    datadogProfiler.recordSetting(
-        ALLOCATION_PROFILING_KEY, String.valueOf(allocationProfilingEnabled));
-    datadogProfiler.recordSetting(HEAP_PROFILING_KEY, String.valueOf(heapProfilingEnabled));
-    datadogProfiler.recordSetting(FORCE_START_FIRST_KEY, String.valueOf(startForceFirst));
-    datadogProfiler.recordSetting(HOTSPOTS_KEY, String.valueOf(hotspotsEnabled));
-    datadogProfiler.recordSetting(ENDPOINTS_KEY, String.valueOf(endpointsEnabled));
-    datadogProfiler.recordSetting(AUXILIARY_PROFILER_KEY, auxiliaryProfiler);
-    datadogProfiler.recordSetting(PERF_EVENTS_PARANOID_KEY, perfEventsParanoid);
-    datadogProfiler.recordSetting(NATIVE_STACKS_KEY, String.valueOf(hasNativeStacks));
-    datadogProfiler.recordSetting(JFR_IMPLEMENTATION_KEY, "ddprof");
-    datadogProfiler.recordSetting(
-        "ddprof " + STACK_DEPTH_KEY,
-        String.valueOf(requestedStackDepth)); // ddprof-java will accept the requested stack depth
-    datadogProfiler.recordSetting(SELINUX_STATUS_KEY, seLinuxStatus);
-    if (serviceInstrumentationType != null) {
-      datadogProfiler.recordSetting(SERVICE_INSTRUMENTATION_TYPE, serviceInstrumentationType);
+    public DatadogProfilerSettings(DatadogProfiler datadogProfiler) {
+        super(ConfigProvider.getInstance(), null, false);
+        this.datadogProfiler = datadogProfiler;
     }
-    if (serviceInjection != null) {
-      datadogProfiler.recordSetting(SERVICE_INJECTION, serviceInjection);
+
+    public void publish() {
+        datadogProfiler.recordSetting(VERSION_KEY, VersionInfo.VERSION);
+        datadogProfiler.recordSetting(UPLOAD_PERIOD_KEY, String.valueOf(uploadPeriod), "seconds");
+        datadogProfiler.recordSetting(UPLOAD_TIMEOUT_KEY, String.valueOf(uploadTimeout), "seconds");
+        datadogProfiler.recordSetting(UPLOAD_COMPRESSION_KEY, uploadCompression);
+        datadogProfiler.recordSetting(ALLOCATION_PROFILING_KEY, String.valueOf(allocationProfilingEnabled));
+        datadogProfiler.recordSetting(HEAP_PROFILING_KEY, String.valueOf(heapProfilingEnabled));
+        datadogProfiler.recordSetting(FORCE_START_FIRST_KEY, String.valueOf(startForceFirst));
+        datadogProfiler.recordSetting(HOTSPOTS_KEY, String.valueOf(hotspotsEnabled));
+        datadogProfiler.recordSetting(ENDPOINTS_KEY, String.valueOf(endpointsEnabled));
+        datadogProfiler.recordSetting(AUXILIARY_PROFILER_KEY, auxiliaryProfiler);
+        datadogProfiler.recordSetting(PERF_EVENTS_PARANOID_KEY, perfEventsParanoid);
+        datadogProfiler.recordSetting(NATIVE_STACKS_KEY, String.valueOf(hasNativeStacks));
+        datadogProfiler.recordSetting(JFR_IMPLEMENTATION_KEY, "ddprof");
+        datadogProfiler.recordSetting(
+                "ddprof " + STACK_DEPTH_KEY,
+                String.valueOf(requestedStackDepth)); // ddprof-java will accept the requested stack depth
+        datadogProfiler.recordSetting(SELINUX_STATUS_KEY, seLinuxStatus);
+        if (serviceInstrumentationType != null) {
+            datadogProfiler.recordSetting(SERVICE_INSTRUMENTATION_TYPE, serviceInstrumentationType);
+        }
+        if (serviceInjection != null) {
+            datadogProfiler.recordSetting(SERVICE_INJECTION, serviceInjection);
+        }
+        datadogProfiler.recordSetting(PROFILER_ACTIVATION, profilerActivationSetting.enablement.getAlias());
+        datadogProfiler.recordSetting(
+                SSI_MECHANISM, profilerActivationSetting.ssiMechanism.name().toLowerCase());
     }
-    datadogProfiler.recordSetting(
-        PROFILER_ACTIVATION, profilerActivationSetting.enablement.getAlias());
-    datadogProfiler.recordSetting(
-        SSI_MECHANISM, profilerActivationSetting.ssiMechanism.name().toLowerCase());
-  }
 
-  @Override
-  protected String profilerKind() {
-    return "datadog";
-  }
+    @Override
+    protected String profilerKind() {
+        return "datadog";
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerControllerTest.java b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerControllerTest.java
index 20bb760a357..d321b62ca4a 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerControllerTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerControllerTest.java
@@ -16,18 +16,19 @@
 @ExtendWith(MockitoExtension.class)
 public class DatadogProfilerControllerTest {
 
-  private static final String TEST_NAME = "recording name";
+    private static final String TEST_NAME = "recording name";
 
-  @Test
-  public void testCreateContinuousRecording() throws Exception {
-    Assumptions.assumeTrue(OperatingSystem.isLinux());
-    Properties props = new Properties();
-    props.put(PROFILING_AUXILIARY_TYPE, "ddprof");
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+    @Test
+    public void testCreateContinuousRecording() throws Exception {
+        Assumptions.assumeTrue(OperatingSystem.isLinux());
+        Properties props = new Properties();
+        props.put(PROFILING_AUXILIARY_TYPE, "ddprof");
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
 
-    DatadogProfilerController controller = new DatadogProfilerController(configProvider);
-    RecordingData data =
-        controller.createRecording(TEST_NAME, new ControllerContext().snapshot()).stop();
-    assertEquals("ddprof", data.getName());
-  }
+        DatadogProfilerController controller = new DatadogProfilerController(configProvider);
+        RecordingData data = controller
+                .createRecording(TEST_NAME, new ControllerContext().snapshot())
+                .stop();
+        assertEquals("ddprof", data.getName());
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecordingTest.java b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecordingTest.java
index a3032c7beb5..55890e3089c 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecordingTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecordingTest.java
@@ -23,48 +23,49 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 public class DatadogProfilerOngoingRecordingTest {
 
-  private static final String TEST_NAME = "recording name";
+    private static final String TEST_NAME = "recording name";
 
-  @Mock private Instant start;
-  @Mock private Instant end;
+    @Mock
+    private Instant start;
 
-  private DatadogProfilerOngoingRecording ongoingRecording;
+    @Mock
+    private Instant end;
 
-  @BeforeAll
-  public static void setupAll() {
-    // If the profiler couldn't be loaded, the reason why is saved.
-    // This test assumes the profiler could be loaded.
-    assertDoesNotThrow(
-        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
-  }
+    private DatadogProfilerOngoingRecording ongoingRecording;
 
-  @BeforeEach
-  public void setup() throws Exception {
-    ongoingRecording =
-        new DatadogProfilerOngoingRecording(DatadogProfiler.newInstance(), TEST_NAME);
-  }
+    @BeforeAll
+    public static void setupAll() {
+        // If the profiler couldn't be loaded, the reason why is saved.
+        // This test assumes the profiler could be loaded.
+        assertDoesNotThrow(() -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
+    }
 
-  @AfterEach
-  public void cleanup() {
-    ongoingRecording.stop();
-  }
+    @BeforeEach
+    public void setup() throws Exception {
+        ongoingRecording = new DatadogProfilerOngoingRecording(DatadogProfiler.newInstance(), TEST_NAME);
+    }
 
-  @Test
-  public void testStop() {
-    RecordingData data = ongoingRecording.stop();
-  }
+    @AfterEach
+    public void cleanup() {
+        ongoingRecording.stop();
+    }
 
-  @Test
-  public void testSnapshot() {
-    final RecordingData recordingData = ongoingRecording.snapshot(start);
-    assertEquals(start, recordingData.getStart());
+    @Test
+    public void testStop() {
+        RecordingData data = ongoingRecording.stop();
+    }
 
-    // We got real recording so we should clean it up
-    recordingData.release();
-  }
+    @Test
+    public void testSnapshot() {
+        final RecordingData recordingData = ongoingRecording.snapshot(start);
+        assertEquals(start, recordingData.getStart());
 
-  @Test
-  public void testClose() {
-    ongoingRecording.close();
-  }
+        // We got real recording so we should clean it up
+        recordingData.release();
+    }
+
+    @Test
+    public void testClose() {
+        ongoingRecording.close();
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/src/main/java/com/datadog/profiling/controller/jfr/SimpleJFRAccess.java b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/src/main/java/com/datadog/profiling/controller/jfr/SimpleJFRAccess.java
index df1bfdc359e..44a4dbef149 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/src/main/java/com/datadog/profiling/controller/jfr/SimpleJFRAccess.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/src/main/java/com/datadog/profiling/controller/jfr/SimpleJFRAccess.java
@@ -9,47 +9,47 @@
 import org.slf4j.LoggerFactory;
 
 public class SimpleJFRAccess extends JFRAccess {
-  private static final Logger log = LoggerFactory.getLogger(SimpleJFRAccess.class);
+    private static final Logger log = LoggerFactory.getLogger(SimpleJFRAccess.class);
 
-  public static class FactoryImpl implements JFRAccess.Factory {
-    @Override
-    public JFRAccess create(Instrumentation inst) {
-      if (JavaVirtualMachine.isJavaVersion(8)) {
-        // if running on Java 8 return either SimpleJFRAccess or NOOP
-        // J9 and Oracle JDK 8 do not contain the required classes and methods to set the stackdepth
-        // programmatically
-        return !JavaVirtualMachine.isJ9() && !JavaVirtualMachine.isOracleJDK8()
-            ? new SimpleJFRAccess()
-            : JFRAccess.NOOP;
-      }
-      return null;
+    public static class FactoryImpl implements JFRAccess.Factory {
+        @Override
+        public JFRAccess create(Instrumentation inst) {
+            if (JavaVirtualMachine.isJavaVersion(8)) {
+                // if running on Java 8 return either SimpleJFRAccess or NOOP
+                // J9 and Oracle JDK 8 do not contain the required classes and methods to set the stackdepth
+                // programmatically
+                return !JavaVirtualMachine.isJ9() && !JavaVirtualMachine.isOracleJDK8()
+                        ? new SimpleJFRAccess()
+                        : JFRAccess.NOOP;
+            }
+            return null;
+        }
     }
-  }
 
-  @Override
-  public boolean setStackDepth(int depth) {
-    JVM.getJVM().setStackDepth(depth);
-    return true;
-  }
+    @Override
+    public boolean setStackDepth(int depth) {
+        JVM.getJVM().setStackDepth(depth);
+        return true;
+    }
 
-  @Override
-  public boolean setBaseLocation(String location) {
-    try {
-      Repository.getRepository().setBasePath(new SecuritySupport.SafePath(location));
-    } catch (Exception e) {
-      log.warn("Failed to set JFR base location: {}", e.getMessage());
-      return false;
+    @Override
+    public boolean setBaseLocation(String location) {
+        try {
+            Repository.getRepository().setBasePath(new SecuritySupport.SafePath(location));
+        } catch (Exception e) {
+            log.warn("Failed to set JFR base location: {}", e.getMessage());
+            return false;
+        }
+        return true;
     }
-    return true;
-  }
 
-  @Override
-  public long timestamp() {
-    return JVM.counterTime();
-  }
+    @Override
+    public long timestamp() {
+        return JVM.counterTime();
+    }
 
-  @Override
-  public double toNanosConversionFactor() {
-    return JVM.getJVM().getTimeConversionFactor();
-  }
+    @Override
+    public double toNanosConversionFactor() {
+        return JVM.getJVM().getTimeConversionFactor();
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/src/main/java11/com/datadog/profiling/controller/jfr/JPMSJFRAccess.java b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/src/main/java11/com/datadog/profiling/controller/jfr/JPMSJFRAccess.java
index 927a337b667..b82d0019525 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/src/main/java11/com/datadog/profiling/controller/jfr/JPMSJFRAccess.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/src/main/java11/com/datadog/profiling/controller/jfr/JPMSJFRAccess.java
@@ -17,161 +17,157 @@
 import org.slf4j.LoggerFactory;
 
 public class JPMSJFRAccess extends JFRAccess {
-  private static final Logger log = LoggerFactory.getLogger(JPMSJFRAccess.class);
+    private static final Logger log = LoggerFactory.getLogger(JPMSJFRAccess.class);
+
+    public static final class FactoryImpl implements JFRAccess.Factory {
+        private static final Logger log = LoggerFactory.getLogger(FactoryImpl.class);
+
+        @Override
+        public JFRAccess create(Instrumentation inst) {
+            if (!JavaVirtualMachine.isJ9() && JavaVirtualMachine.isJavaVersionAtLeast(9)) {
+                try {
+                    return new JPMSJFRAccess(inst);
+                } catch (Exception e) {
+                    log.debug("Unable to obtain JFR internal access", e);
+                }
+            }
+            return null;
+        }
+    }
 
-  public static final class FactoryImpl implements JFRAccess.Factory {
-    private static final Logger log = LoggerFactory.getLogger(FactoryImpl.class);
+    private final Class<?> jvmClass;
+    private final Class<?> repositoryClass;
+    private final Class<?> safePathClass;
 
-    @Override
-    public JFRAccess create(Instrumentation inst) {
-      if (!JavaVirtualMachine.isJ9() && JavaVirtualMachine.isJavaVersionAtLeast(9)) {
+    // TODO consider refactoring to make these private static final
+    private final MethodHandle setStackDepthMH;
+    private final MethodHandle setRepositoryBaseMH;
+
+    private final MethodHandle counterTimeMH;
+    private final MethodHandle getTimeConversionFactorMH;
+
+    public JPMSJFRAccess(Instrumentation inst) throws Exception {
+        patchModuleAccess(inst);
+
+        jvmClass = JFRAccess.class.getClassLoader().loadClass("jdk.jfr.internal.JVM");
+        repositoryClass = JFRAccess.class.getClassLoader().loadClass("jdk.jfr.internal.Repository");
+        safePathClass = safePathClass();
+        Object jvm = getJvm();
+        setStackDepthMH = getJvmMethodHandle(jvm, "setStackDepth", int.class);
+        setRepositoryBaseMH = setRepositoryBaseMethodHandle();
+        counterTimeMH = getJvmMethodHandle(jvm, "counterTime");
+        getTimeConversionFactorMH = getJvmMethodHandle(jvm, "getTimeConversionFactor");
+    }
+
+    private static Class<?> safePathClass() {
         try {
-          return new JPMSJFRAccess(inst);
-        } catch (Exception e) {
-          log.debug("Unable to obtain JFR internal access", e);
+            return JFRAccess.class.getClassLoader().loadClass("jdk.jfr.internal.SecuritySupport$SafePath");
+        } catch (ClassNotFoundException e) {
+            return Path.class; // no SafePath with SecurityManager gone
         }
-      }
-      return null;
     }
-  }
-
-  private final Class<?> jvmClass;
-  private final Class<?> repositoryClass;
-  private final Class<?> safePathClass;
-
-  // TODO consider refactoring to make these private static final
-  private final MethodHandle setStackDepthMH;
-  private final MethodHandle setRepositoryBaseMH;
-
-  private final MethodHandle counterTimeMH;
-  private final MethodHandle getTimeConversionFactorMH;
-
-  public JPMSJFRAccess(Instrumentation inst) throws Exception {
-    patchModuleAccess(inst);
-
-    jvmClass = JFRAccess.class.getClassLoader().loadClass("jdk.jfr.internal.JVM");
-    repositoryClass = JFRAccess.class.getClassLoader().loadClass("jdk.jfr.internal.Repository");
-    safePathClass = safePathClass();
-    Object jvm = getJvm();
-    setStackDepthMH = getJvmMethodHandle(jvm, "setStackDepth", int.class);
-    setRepositoryBaseMH = setRepositoryBaseMethodHandle();
-    counterTimeMH = getJvmMethodHandle(jvm, "counterTime");
-    getTimeConversionFactorMH = getJvmMethodHandle(jvm, "getTimeConversionFactor");
-  }
-
-  private static Class<?> safePathClass() {
-    try {
-      return JFRAccess.class
-          .getClassLoader()
-          .loadClass("jdk.jfr.internal.SecuritySupport$SafePath");
-    } catch (ClassNotFoundException e) {
-      return Path.class; // no SafePath with SecurityManager gone
+
+    private Object getJvm() {
+        try {
+            return jvmClass.getMethod("getJVM").invoke(null);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
+        }
+        return null;
     }
-  }
 
-  private Object getJvm() {
-    try {
-      return jvmClass.getMethod("getJVM").invoke(null);
-    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
+    private MethodHandle getJvmMethodHandle(Object jvm, String method, Class... args)
+            throws NoSuchMethodException, IllegalAccessException {
+        Method m = jvmClass.getMethod(method, args);
+        m.setAccessible(true);
+        return unreflectAndBind(m, jvm);
     }
-    return null;
-  }
-
-  private MethodHandle getJvmMethodHandle(Object jvm, String method, Class... args)
-      throws NoSuchMethodException, IllegalAccessException {
-    Method m = jvmClass.getMethod(method, args);
-    m.setAccessible(true);
-    return unreflectAndBind(m, jvm);
-  }
-
-  private static MethodHandle unreflectAndBind(Method method, Object jvm)
-      throws IllegalAccessException {
-    MethodHandle mh = MethodHandles.publicLookup().unreflect(method);
-    if (!Modifier.isStatic(method.getModifiers())) {
-      mh = mh.bindTo(jvm);
+
+    private static MethodHandle unreflectAndBind(Method method, Object jvm) throws IllegalAccessException {
+        MethodHandle mh = MethodHandles.publicLookup().unreflect(method);
+        if (!Modifier.isStatic(method.getModifiers())) {
+            mh = mh.bindTo(jvm);
+        }
+        return mh;
     }
-    return mh;
-  }
-
-  private MethodHandle setRepositoryBaseMethodHandle()
-      throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
-    // the modules are patched in `patchModuleAccess` to allow reflective access to the internal
-    // classes
-    Method m = repositoryClass.getMethod("getRepository");
-    m.setAccessible(true);
-    Object repository = m.invoke(null);
-
-    m = repositoryClass.getMethod("setBasePath", safePathClass);
-    m.setAccessible(true);
-    MethodHandle mh = MethodHandles.publicLookup().unreflect(m);
-    mh = mh.bindTo(repository);
-    return mh;
-  }
-
-  private static void patchModuleAccess(Instrumentation inst) {
-    if (inst == null) {
-      // used in testing; we don't have instrumentation and will patch the module access in the test
-      // task
-      return;
+
+    private MethodHandle setRepositoryBaseMethodHandle()
+            throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+        // the modules are patched in `patchModuleAccess` to allow reflective access to the internal
+        // classes
+        Method m = repositoryClass.getMethod("getRepository");
+        m.setAccessible(true);
+        Object repository = m.invoke(null);
+
+        m = repositoryClass.getMethod("setBasePath", safePathClass);
+        m.setAccessible(true);
+        MethodHandle mh = MethodHandles.publicLookup().unreflect(m);
+        mh = mh.bindTo(repository);
+        return mh;
     }
-    Module unnamedModule = JFRAccess.class.getClassLoader().getUnnamedModule();
-    Module targetModule = Event.class.getModule();
-
-    Map<String, Set<Module>> extraOpens = Map.of("jdk.jfr.internal", Set.of(unnamedModule));
-
-    // Redefine the module
-    inst.redefineModule(
-        targetModule,
-        Collections.emptySet(),
-        extraOpens,
-        extraOpens,
-        Collections.emptySet(),
-        Collections.emptyMap());
-  }
-
-  @Override
-  public boolean setStackDepth(int depth) {
-    try {
-      setStackDepthMH.invokeExact(depth);
-      return true;
-    } catch (Throwable throwable) {
-      log.warn("Unable to set JFR stack depth", throwable);
+
+    private static void patchModuleAccess(Instrumentation inst) {
+        if (inst == null) {
+            // used in testing; we don't have instrumentation and will patch the module access in the test
+            // task
+            return;
+        }
+        Module unnamedModule = JFRAccess.class.getClassLoader().getUnnamedModule();
+        Module targetModule = Event.class.getModule();
+
+        Map<String, Set<Module>> extraOpens = Map.of("jdk.jfr.internal", Set.of(unnamedModule));
+
+        // Redefine the module
+        inst.redefineModule(
+                targetModule,
+                Collections.emptySet(),
+                extraOpens,
+                extraOpens,
+                Collections.emptySet(),
+                Collections.emptyMap());
     }
-    return false;
-  }
-
-  @Override
-  public boolean setBaseLocation(String location) {
-    try {
-      Object safePath =
-          Path.class.isAssignableFrom(safePathClass)
-              ? Paths.get(location)
-              : safePathClass.getConstructor(Path.class).newInstance(Paths.get(location));
-      setRepositoryBaseMH.invoke(safePath);
-      return true;
-    } catch (Throwable throwable) {
-      log.warn("Unable to set JFR repository base location", throwable);
+
+    @Override
+    public boolean setStackDepth(int depth) {
+        try {
+            setStackDepthMH.invokeExact(depth);
+            return true;
+        } catch (Throwable throwable) {
+            log.warn("Unable to set JFR stack depth", throwable);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean setBaseLocation(String location) {
+        try {
+            Object safePath = Path.class.isAssignableFrom(safePathClass)
+                    ? Paths.get(location)
+                    : safePathClass.getConstructor(Path.class).newInstance(Paths.get(location));
+            setRepositoryBaseMH.invoke(safePath);
+            return true;
+        } catch (Throwable throwable) {
+            log.warn("Unable to set JFR repository base location", throwable);
+        }
+        return false;
     }
-    return false;
-  }
-
-  @Override
-  public long timestamp() {
-    try {
-      return (long) counterTimeMH.invokeExact();
-    } catch (Throwable t) {
-      log.debug("Unable to get TSC from JFR", t);
+
+    @Override
+    public long timestamp() {
+        try {
+            return (long) counterTimeMH.invokeExact();
+        } catch (Throwable t) {
+            log.debug("Unable to get TSC from JFR", t);
+        }
+        return super.timestamp();
     }
-    return super.timestamp();
-  }
-
-  @Override
-  public double toNanosConversionFactor() {
-    try {
-      return (double) getTimeConversionFactorMH.invokeExact();
-    } catch (Throwable t) {
-      log.debug("Unable to get time conversion factor from JFR", t);
+
+    @Override
+    public double toNanosConversionFactor() {
+        try {
+            return (double) getTimeConversionFactorMH.invokeExact();
+        } catch (Throwable t) {
+            log.debug("Unable to get time conversion factor from JFR", t);
+        }
+        return super.toNanosConversionFactor();
     }
-    return super.toNanosConversionFactor();
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/src/test/java/com/datadog/profiling/controller/jfr/JFRAccessTest.java b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/src/test/java/com/datadog/profiling/controller/jfr/JFRAccessTest.java
index f15af6fe0db..fc4a30e83c4 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/src/test/java/com/datadog/profiling/controller/jfr/JFRAccessTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/src/test/java/com/datadog/profiling/controller/jfr/JFRAccessTest.java
@@ -11,38 +11,38 @@
 import org.junit.jupiter.api.Test;
 
 public class JFRAccessTest {
-  @Test
-  void testJava8JFRAccess() {
-    // For Java 9 and above, the JFR access requires instrumentation in order to patch the module
-    // access
-    assumeTrue(isJavaVersion(8) && !isJ9() && !isOracleJDK8());
-
-    // just do a sanity check that it is possible to instantiate the class and call
-    // 'setStackDepth()'
-    SimpleJFRAccess jfrAccess = new SimpleJFRAccess();
-    assertTrue(jfrAccess.setStackDepth(42));
-  }
-
-  @Test
-  void testJPMSJFRAccess() throws Exception {
-    // For Java 9 and above, the JFR access requires instrumentation in order to patch the module
-    // access
-    assumeTrue(isJavaVersionAtLeast(9) && !isJ9());
-
-    // just do a sanity check that it is possible to instantiate the class and call
-    // 'setStackDepth()'
-    JPMSJFRAccess jfrAccess = new JPMSJFRAccess(null);
-    assertTrue(jfrAccess.setStackDepth(42));
-  }
-
-  @Test
-  void testJ9JFRAccess() {
-    assumeTrue(isJ9());
-
-    // need to run a bogus setup first
-    JFRAccess.setup(null);
-    // make sure that an attempt to get the instance returns the NOOP implementation and does not
-    // throw exceptions
-    assertEquals(JFRAccess.NOOP, JFRAccess.instance());
-  }
+    @Test
+    void testJava8JFRAccess() {
+        // For Java 9 and above, the JFR access requires instrumentation in order to patch the module
+        // access
+        assumeTrue(isJavaVersion(8) && !isJ9() && !isOracleJDK8());
+
+        // just do a sanity check that it is possible to instantiate the class and call
+        // 'setStackDepth()'
+        SimpleJFRAccess jfrAccess = new SimpleJFRAccess();
+        assertTrue(jfrAccess.setStackDepth(42));
+    }
+
+    @Test
+    void testJPMSJFRAccess() throws Exception {
+        // For Java 9 and above, the JFR access requires instrumentation in order to patch the module
+        // access
+        assumeTrue(isJavaVersionAtLeast(9) && !isJ9());
+
+        // just do a sanity check that it is possible to instantiate the class and call
+        // 'setStackDepth()'
+        JPMSJFRAccess jfrAccess = new JPMSJFRAccess(null);
+        assertTrue(jfrAccess.setStackDepth(42));
+    }
+
+    @Test
+    void testJ9JFRAccess() {
+        assumeTrue(isJ9());
+
+        // need to run a bogus setup first
+        JFRAccess.setup(null);
+        // make sure that an attempt to get the instance returns the NOOP implementation and does not
+        // throw exceptions
+        assertEquals(JFRAccess.NOOP, JFRAccess.instance());
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/java/com/datadog/profiling/controller/jfr/JFRAccess.java b/dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/java/com/datadog/profiling/controller/jfr/JFRAccess.java
index 92f51a009ef..68e16668f4a 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/java/com/datadog/profiling/controller/jfr/JFRAccess.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/java/com/datadog/profiling/controller/jfr/JFRAccess.java
@@ -13,81 +13,80 @@
  * instrumentation in order to patch the module access.
  */
 public abstract class JFRAccess implements Timestamper {
-  private static final Logger log = LoggerFactory.getLogger(JFRAccess.class);
+    private static final Logger log = LoggerFactory.getLogger(JFRAccess.class);
 
-  /** No-op JFR access implementation. */
-  public static final JFRAccess NOOP =
-      new JFRAccess() {
+    /** No-op JFR access implementation. */
+    public static final JFRAccess NOOP = new JFRAccess() {
         @Override
         public boolean setStackDepth(int depth) {
-          return false;
+            return false;
         }
 
         @Override
         public boolean setBaseLocation(String location) {
-          return false;
+            return false;
         }
-      };
+    };
 
-  /**
-   * Factory for JFR access.<br>
-   * The factory is expected to return {@code null} if the JFR access is not available. The factory
-   * is to be registered in {@code
-   * META-INF/services/com.datadog.profiling.controller.jfr.JFRAccess$Factory} and will be
-   * discovered using {@link ServiceLoader}.
-   */
-  public interface Factory {
-    @Nullable
-    JFRAccess create(@Nullable Instrumentation inst);
-  }
+    /**
+     * Factory for JFR access.<br>
+     * The factory is expected to return {@code null} if the JFR access is not available. The factory
+     * is to be registered in {@code
+     * META-INF/services/com.datadog.profiling.controller.jfr.JFRAccess$Factory} and will be
+     * discovered using {@link ServiceLoader}.
+     */
+    public interface Factory {
+        @Nullable
+        JFRAccess create(@Nullable Instrumentation inst);
+    }
 
-  private static volatile JFRAccess INSTANCE = NOOP;
+    private static volatile JFRAccess INSTANCE = NOOP;
 
-  /**
-   * Returns the JFR access instance.
-   *
-   * @return the JFR access instance or {@link #NOOP} if the JFR access is not available
-   */
-  public static JFRAccess instance() {
-    return INSTANCE;
-  }
+    /**
+     * Returns the JFR access instance.
+     *
+     * @return the JFR access instance or {@link #NOOP} if the JFR access is not available
+     */
+    public static JFRAccess instance() {
+        return INSTANCE;
+    }
 
-  /**
-   * Sets up the JFR access.<br>
-   * The method is expected to be called once, before any other method of this class is called.
-   *
-   * @param inst the instrumentation instance, may be {@code null}
-   */
-  public static void setup(@Nullable Instrumentation inst) {
-    JFRAccess access = NOOP;
-    if (inst != null) {
-      for (Factory factory : ServiceLoader.load(Factory.class, JFRAccess.class.getClassLoader())) {
-        JFRAccess candidate = factory.create(inst);
-        if (candidate != null) {
-          access = candidate;
-          break;
+    /**
+     * Sets up the JFR access.<br>
+     * The method is expected to be called once, before any other method of this class is called.
+     *
+     * @param inst the instrumentation instance, may be {@code null}
+     */
+    public static void setup(@Nullable Instrumentation inst) {
+        JFRAccess access = NOOP;
+        if (inst != null) {
+            for (Factory factory : ServiceLoader.load(Factory.class, JFRAccess.class.getClassLoader())) {
+                JFRAccess candidate = factory.create(inst);
+                if (candidate != null) {
+                    access = candidate;
+                    break;
+                }
+            }
         }
-      }
+        log.debug("JFR access: {}", access.getClass().getName());
+        INSTANCE = access;
     }
-    log.debug("JFR access: {}", access.getClass().getName());
-    INSTANCE = access;
-  }
 
-  /**
-   * Sets the stack depth for the JFR recordings.<br>
-   * It needs to be called before the recording is started.
-   *
-   * @param depth the stack depth
-   * @return {@code true} if the stack depth was set successfully, {@code false} if not or it is not
-   *     possible to tell
-   */
-  public abstract boolean setStackDepth(int depth);
+    /**
+     * Sets the stack depth for the JFR recordings.<br>
+     * It needs to be called before the recording is started.
+     *
+     * @param depth the stack depth
+     * @return {@code true} if the stack depth was set successfully, {@code false} if not or it is not
+     *     possible to tell
+     */
+    public abstract boolean setStackDepth(int depth);
 
-  /**
-   * Sets the base location for JFR repository for the current VM
-   *
-   * @param location the location path to set
-   * @return {@code true} if the base location was set successfully, {@code false} if not
-   */
-  public abstract boolean setBaseLocation(String location);
+    /**
+     * Sets the base location for JFR repository for the current VM
+     *
+     * @param location the location path to set
+     * @return {@code true} if the base location was set successfully, {@code false} if not
+     */
+    public abstract boolean setBaseLocation(String location);
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/java/com/datadog/profiling/controller/jfr/JdkTypeIDs.java b/dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/java/com/datadog/profiling/controller/jfr/JdkTypeIDs.java
index a266886dc94..b02687f1ef0 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/java/com/datadog/profiling/controller/jfr/JdkTypeIDs.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/java/com/datadog/profiling/controller/jfr/JdkTypeIDs.java
@@ -2,163 +2,159 @@
 
 /** A list of JDK JFR event type IDs */
 public class JdkTypeIDs {
-  private static final String PREFIX = "jdk.";
-
-  public static final String CPU_LOAD = PREFIX + "CPULoad";
-  public static final String EXECUTION_SAMPLE = PREFIX + "ExecutionSample";
-  public static final String EXECUTION_SAMPLING_INFO_EVENT_ID = PREFIX + "ExecutionSampling";
-  public static final String NATIVE_METHOD_SAMPLE = PREFIX + "NativeMethodSample";
-  public static final String PROCESSES = PREFIX + "SystemProcess";
-  public static final String OS_MEMORY_SUMMARY = PREFIX + "PhysicalMemory";
-  public static final String OS_INFORMATION = PREFIX + "OSInformation";
-  public static final String CPU_INFORMATION = PREFIX + "CPUInformation";
-  public static final String THREAD_ALLOCATION_STATISTICS = PREFIX + "ThreadAllocationStatistics";
-  public static final String HEAP_CONF = PREFIX + "GCHeapConfiguration";
-  public static final String GC_CONF = PREFIX + "GCConfiguration";
-  public static final String HEAP_SUMMARY = PREFIX + "GCHeapSummary";
-  public static final String ALLOC_INSIDE_TLAB = PREFIX + "ObjectAllocationInNewTLAB";
-  public static final String ALLOC_OUTSIDE_TLAB = PREFIX + "ObjectAllocationOutsideTLAB";
-  public static final String VM_INFO = PREFIX + "JVMInformation";
-  public static final String CLASS_DEFINE = PREFIX + "ClassDefine";
-  public static final String CLASS_LOAD = PREFIX + "ClassLoad";
-  public static final String CLASS_UNLOAD = PREFIX + "ClassUnload";
-  public static final String CLASS_LOAD_STATISTICS = PREFIX + "ClassLoadingStatistics";
-  public static final String CLASS_LOADER_STATISTICS = PREFIX + "ClassLoaderStatistics";
-  public static final String COMPILATION = PREFIX + "Compilation";
-
-  public static final String FILE_WRITE = PREFIX + "FileWrite";
-  public static final String FILE_READ = PREFIX + "FileRead";
-  public static final String SOCKET_WRITE = PREFIX + "SocketWrite";
-  public static final String SOCKET_READ = PREFIX + "SocketRead";
-
-  public static final String THREAD_PARK = PREFIX + "ThreadPark";
-  public static final String THREAD_SLEEP = PREFIX + "ThreadSleep";
-  public static final String MONITOR_ENTER = PREFIX + "JavaMonitorEnter";
-  public static final String MONITOR_WAIT = PREFIX + "JavaMonitorWait";
-
-  public static final String METASPACE_OOM = PREFIX + "MetaspaceOOM";
-
-  public static final String CODE_CACHE_FULL = PREFIX + "CodeCacheFull";
-  public static final String CODE_CACHE_STATISTICS = PREFIX + "CodeCacheStatistics";
-  public static final String CODE_SWEEPER_STATISTICS = PREFIX + "CodeSweeperStatistics";
-  public static final String SWEEP_CODE_CACHE = PREFIX + "SweepCodeCache";
-  public static final String ENVIRONMENT_VARIABLE = PREFIX + "InitialEnvironmentVariable";
-  public static final String SYSTEM_PROPERTIES = PREFIX + "InitialSystemProperty";
-  public static final String OBJECT_COUNT = PREFIX + "ObjectCount";
-  public static final String GC_REFERENCE_STATISTICS = PREFIX + "GCReferenceStatistics";
-
-  public static final String OLD_OBJECT_SAMPLE = PREFIX + "OldObjectSample";
-
-  public static final String GC_PAUSE_L4 = PREFIX + "GCPhasePauseLevel4";
-  public static final String GC_PAUSE_L3 = PREFIX + "GCPhasePauseLevel3";
-  public static final String GC_PAUSE_L2 = PREFIX + "GCPhasePauseLevel2";
-  public static final String GC_PAUSE_L1 = PREFIX + "GCPhasePauseLevel1";
-  public static final String GC_PAUSE = PREFIX + "GCPhasePause";
-
-  public static final String METASPACE_SUMMARY = PREFIX + "MetaspaceSummary";
-  public static final String GARBAGE_COLLECTION = PREFIX + "GarbageCollection";
-  public static final String CONCURRENT_MODE_FAILURE = PREFIX + "ConcurrentModeFailure";
-
-  public static final String THROWABLES_STATISTICS = PREFIX + "ExceptionStatistics";
-  public static final String ERRORS_THROWN = PREFIX + "JavaErrorThrow";
-  /*
-   * NOTE: The parser filters all JavaExceptionThrow events created from the Error constructor to
-   * avoid duplicates, so this event type represents 'non error throwables' rather than
-   * exceptions. See note in SyntheticAttributeExtension which does the duplicate filtering.
-   */
-  public static final String EXCEPTIONS_THROWN = PREFIX + "JavaExceptionThrow";
-
-  public static final String COMPILER_STATS = PREFIX + "CompilerStatistics";
-  public static final String COMPILER_FAILURE = PREFIX + "CompilationFailure";
-
-  public static final String ULONG_FLAG = PREFIX + "UnsignedLongFlag";
-  public static final String BOOLEAN_FLAG = PREFIX + "BooleanFlag";
-  public static final String STRING_FLAG = PREFIX + "StringFlag";
-  public static final String DOUBLE_FLAG = PREFIX + "DoubleFlag";
-  public static final String LONG_FLAG = PREFIX + "LongFlag";
-  public static final String INT_FLAG = PREFIX + "IntFlag";
-  public static final String UINT_FLAG = PREFIX + "UnsignedIntFlag";
-
-  public static final String ULONG_FLAG_CHANGED = PREFIX + "UnsignedLongFlagChanged";
-  public static final String BOOLEAN_FLAG_CHANGED = PREFIX + "BooleanFlagChanged";
-  public static final String STRING_FLAG_CHANGED = PREFIX + "StringFlagChanged";
-  public static final String DOUBLE_FLAG_CHANGED = PREFIX + "DoubleFlagChanged";
-  public static final String LONG_FLAG_CHANGED = PREFIX + "LongFlagChanged";
-  public static final String INT_FLAG_CHANGED = PREFIX + "IntFlagChanged";
-  public static final String UINT_FLAG_CHANGED = PREFIX + "UnsignedIntFlagChanged";
-
-  public static final String TIME_CONVERSION = PREFIX + "CPUTimeStampCounter";
-  public static final String THREAD_DUMP = PREFIX + "ThreadDump";
-  public static final String JFR_DATA_LOST = PREFIX + "DataLoss";
-  public static final String DUMP_REASON = PREFIX + "DumpReason";
-
-  public static final String GC_CONF_YOUNG_GENERATION = PREFIX + "YoungGenerationConfiguration";
-  public static final String GC_CONF_SURVIVOR = PREFIX + "GCSurvivorConfiguration";
-  public static final String GC_CONF_TLAB = PREFIX + "GCTLABConfiguration";
-
-  public static final String JAVA_THREAD_START = PREFIX + "ThreadStart";
-  public static final String JAVA_THREAD_END = PREFIX + "ThreadEnd";
-
-  public static final String VM_OPERATIONS = PREFIX + "ExecuteVMOperation";
-  public static final String VM_SHUTDOWN = PREFIX + "Shutdown";
-
-  public static final String THREAD_STATISTICS = PREFIX + "JavaThreadStatistics";
-  public static final String CONTEXT_SWITCH_RATE = PREFIX + "ThreadContextSwitchRate";
-
-  public static final String COMPILER_CONFIG = PREFIX + "CompilerConfiguration";
-  public static final String CODE_CACHE_CONFIG = PREFIX + "CodeCacheConfiguration";
-  public static final String CODE_SWEEPER_CONFIG = PREFIX + "CodeSweeperConfiguration";
-  public static final String COMPILER_PHASE = PREFIX + "CompilerPhase";
-  public static final String GC_COLLECTOR_G1_GARBAGE_COLLECTION = PREFIX + "G1GarbageCollection";
-  public static final String GC_COLLECTOR_OLD_GARBAGE_COLLECTION = PREFIX + "OldGarbageCollection";
-  public static final String GC_COLLECTOR_PAROLD_GARBAGE_COLLECTION =
-      PREFIX + "ParallelOldGarbageCollection";
-  public static final String GC_COLLECTOR_YOUNG_GARBAGE_COLLECTION =
-      PREFIX + "YoungGarbageCollection";
-  public static final String GC_DETAILED_ALLOCATION_REQUIRING_GC = PREFIX + "AllocationRequiringGC";
-  public static final String GC_DETAILED_EVACUATION_FAILED = PREFIX + "EvacuationFailed";
-  public static final String GC_DETAILED_EVACUATION_INFO = PREFIX + "EvacuationInformation";
-  public static final String GC_DETAILED_OBJECT_COUNT_AFTER_GC = PREFIX + "ObjectCountAfterGC";
-  public static final String GC_DETAILED_PROMOTION_FAILED = PREFIX + "PromotionFailed";
-  public static final String GC_HEAP_PS_SUMMARY = PREFIX + "PSHeapSummary";
-  public static final String GC_METASPACE_ALLOCATION_FAILURE =
-      PREFIX + "MetaspaceAllocationFailure";
-  public static final String GC_METASPACE_CHUNK_FREE_LIST_SUMMARY =
-      PREFIX + "MetaspaceChunkFreeListSummary";
-  public static final String GC_METASPACE_GC_THRESHOLD = PREFIX + "MetaspaceGCThreshold";
-  public static final String GC_G1MMU = PREFIX + "G1MMU";
-  public static final String GC_G1_EVACUATION_YOUNG_STATS = PREFIX + "G1EvacuationYoungStatistics";
-  public static final String GC_G1_EVACUATION_OLD_STATS = PREFIX + "G1EvacuationOldStatistics";
-  public static final String GC_G1_BASIC_IHOP = PREFIX + "G1BasicIHOP";
-  public static final String GC_G1_HEAP_REGION_TYPE_CHANGE = PREFIX + "G1HeapRegionTypeChange";
-  public static final String GC_G1_HEAP_REGION_INFORMATION = PREFIX + "G1HeapRegionInformation";
-  public static final String BIASED_LOCK_SELF_REVOCATION = PREFIX + "BiasedLockSelfRevocation";
-  public static final String BIASED_LOCK_REVOCATION = PREFIX + "BiasedLockRevocation";
-  public static final String BIASED_LOCK_CLASS_REVOCATION = PREFIX + "BiasedLockClassRevocation";
-  public static final String GC_G1_ADAPTIVE_IHOP = PREFIX + "G1AdaptiveIHOP";
-
-  public static final String RECORDINGS = PREFIX + "ActiveRecording";
-  public static final String RECORDING_SETTING = PREFIX + "ActiveSetting";
-
-  // Safepointing begin
-  public static final String SAFEPOINT_BEGIN = PREFIX + "SafepointBegin";
-  // Synchronize run state of threads
-  public static final String SAFEPOINT_STATE_SYNC = PREFIX + "SafepointStateSynchronization";
-  // Safepointing begin waiting on running threads to block
-  public static final String SAFEPOINT_WAIT_BLOCKED = PREFIX + "SafepointWaitBlocked";
-  // Safepointing begin running cleanup (parent)
-  public static final String SAFEPOINT_CLEANUP = PREFIX + "SafepointCleanup";
-  // Safepointing begin running cleanup task, individual subtasks
-  public static final String SAFEPOINT_CLEANUP_TASK = PREFIX + "SafepointCleanupTask";
-  // Safepointing end
-  public static final String SAFEPOINT_END = PREFIX + "SafepointEnd";
-
-  public static final String MODULE_EXPORT = PREFIX + "ModuleExport";
-  public static final String MODULE_REQUIRE = PREFIX + "ModuleRequire";
-
-  public static final String NATIVE_LIBRARY = PREFIX + "NativeLibrary";
-
-  public static final String HEAP_DUMP = PREFIX + "HeapDump";
-
-  public static final String PROCESS_START = PREFIX + "ProcessStart";
+    private static final String PREFIX = "jdk.";
+
+    public static final String CPU_LOAD = PREFIX + "CPULoad";
+    public static final String EXECUTION_SAMPLE = PREFIX + "ExecutionSample";
+    public static final String EXECUTION_SAMPLING_INFO_EVENT_ID = PREFIX + "ExecutionSampling";
+    public static final String NATIVE_METHOD_SAMPLE = PREFIX + "NativeMethodSample";
+    public static final String PROCESSES = PREFIX + "SystemProcess";
+    public static final String OS_MEMORY_SUMMARY = PREFIX + "PhysicalMemory";
+    public static final String OS_INFORMATION = PREFIX + "OSInformation";
+    public static final String CPU_INFORMATION = PREFIX + "CPUInformation";
+    public static final String THREAD_ALLOCATION_STATISTICS = PREFIX + "ThreadAllocationStatistics";
+    public static final String HEAP_CONF = PREFIX + "GCHeapConfiguration";
+    public static final String GC_CONF = PREFIX + "GCConfiguration";
+    public static final String HEAP_SUMMARY = PREFIX + "GCHeapSummary";
+    public static final String ALLOC_INSIDE_TLAB = PREFIX + "ObjectAllocationInNewTLAB";
+    public static final String ALLOC_OUTSIDE_TLAB = PREFIX + "ObjectAllocationOutsideTLAB";
+    public static final String VM_INFO = PREFIX + "JVMInformation";
+    public static final String CLASS_DEFINE = PREFIX + "ClassDefine";
+    public static final String CLASS_LOAD = PREFIX + "ClassLoad";
+    public static final String CLASS_UNLOAD = PREFIX + "ClassUnload";
+    public static final String CLASS_LOAD_STATISTICS = PREFIX + "ClassLoadingStatistics";
+    public static final String CLASS_LOADER_STATISTICS = PREFIX + "ClassLoaderStatistics";
+    public static final String COMPILATION = PREFIX + "Compilation";
+
+    public static final String FILE_WRITE = PREFIX + "FileWrite";
+    public static final String FILE_READ = PREFIX + "FileRead";
+    public static final String SOCKET_WRITE = PREFIX + "SocketWrite";
+    public static final String SOCKET_READ = PREFIX + "SocketRead";
+
+    public static final String THREAD_PARK = PREFIX + "ThreadPark";
+    public static final String THREAD_SLEEP = PREFIX + "ThreadSleep";
+    public static final String MONITOR_ENTER = PREFIX + "JavaMonitorEnter";
+    public static final String MONITOR_WAIT = PREFIX + "JavaMonitorWait";
+
+    public static final String METASPACE_OOM = PREFIX + "MetaspaceOOM";
+
+    public static final String CODE_CACHE_FULL = PREFIX + "CodeCacheFull";
+    public static final String CODE_CACHE_STATISTICS = PREFIX + "CodeCacheStatistics";
+    public static final String CODE_SWEEPER_STATISTICS = PREFIX + "CodeSweeperStatistics";
+    public static final String SWEEP_CODE_CACHE = PREFIX + "SweepCodeCache";
+    public static final String ENVIRONMENT_VARIABLE = PREFIX + "InitialEnvironmentVariable";
+    public static final String SYSTEM_PROPERTIES = PREFIX + "InitialSystemProperty";
+    public static final String OBJECT_COUNT = PREFIX + "ObjectCount";
+    public static final String GC_REFERENCE_STATISTICS = PREFIX + "GCReferenceStatistics";
+
+    public static final String OLD_OBJECT_SAMPLE = PREFIX + "OldObjectSample";
+
+    public static final String GC_PAUSE_L4 = PREFIX + "GCPhasePauseLevel4";
+    public static final String GC_PAUSE_L3 = PREFIX + "GCPhasePauseLevel3";
+    public static final String GC_PAUSE_L2 = PREFIX + "GCPhasePauseLevel2";
+    public static final String GC_PAUSE_L1 = PREFIX + "GCPhasePauseLevel1";
+    public static final String GC_PAUSE = PREFIX + "GCPhasePause";
+
+    public static final String METASPACE_SUMMARY = PREFIX + "MetaspaceSummary";
+    public static final String GARBAGE_COLLECTION = PREFIX + "GarbageCollection";
+    public static final String CONCURRENT_MODE_FAILURE = PREFIX + "ConcurrentModeFailure";
+
+    public static final String THROWABLES_STATISTICS = PREFIX + "ExceptionStatistics";
+    public static final String ERRORS_THROWN = PREFIX + "JavaErrorThrow";
+    /*
+     * NOTE: The parser filters all JavaExceptionThrow events created from the Error constructor to
+     * avoid duplicates, so this event type represents 'non error throwables' rather than
+     * exceptions. See note in SyntheticAttributeExtension which does the duplicate filtering.
+     */
+    public static final String EXCEPTIONS_THROWN = PREFIX + "JavaExceptionThrow";
+
+    public static final String COMPILER_STATS = PREFIX + "CompilerStatistics";
+    public static final String COMPILER_FAILURE = PREFIX + "CompilationFailure";
+
+    public static final String ULONG_FLAG = PREFIX + "UnsignedLongFlag";
+    public static final String BOOLEAN_FLAG = PREFIX + "BooleanFlag";
+    public static final String STRING_FLAG = PREFIX + "StringFlag";
+    public static final String DOUBLE_FLAG = PREFIX + "DoubleFlag";
+    public static final String LONG_FLAG = PREFIX + "LongFlag";
+    public static final String INT_FLAG = PREFIX + "IntFlag";
+    public static final String UINT_FLAG = PREFIX + "UnsignedIntFlag";
+
+    public static final String ULONG_FLAG_CHANGED = PREFIX + "UnsignedLongFlagChanged";
+    public static final String BOOLEAN_FLAG_CHANGED = PREFIX + "BooleanFlagChanged";
+    public static final String STRING_FLAG_CHANGED = PREFIX + "StringFlagChanged";
+    public static final String DOUBLE_FLAG_CHANGED = PREFIX + "DoubleFlagChanged";
+    public static final String LONG_FLAG_CHANGED = PREFIX + "LongFlagChanged";
+    public static final String INT_FLAG_CHANGED = PREFIX + "IntFlagChanged";
+    public static final String UINT_FLAG_CHANGED = PREFIX + "UnsignedIntFlagChanged";
+
+    public static final String TIME_CONVERSION = PREFIX + "CPUTimeStampCounter";
+    public static final String THREAD_DUMP = PREFIX + "ThreadDump";
+    public static final String JFR_DATA_LOST = PREFIX + "DataLoss";
+    public static final String DUMP_REASON = PREFIX + "DumpReason";
+
+    public static final String GC_CONF_YOUNG_GENERATION = PREFIX + "YoungGenerationConfiguration";
+    public static final String GC_CONF_SURVIVOR = PREFIX + "GCSurvivorConfiguration";
+    public static final String GC_CONF_TLAB = PREFIX + "GCTLABConfiguration";
+
+    public static final String JAVA_THREAD_START = PREFIX + "ThreadStart";
+    public static final String JAVA_THREAD_END = PREFIX + "ThreadEnd";
+
+    public static final String VM_OPERATIONS = PREFIX + "ExecuteVMOperation";
+    public static final String VM_SHUTDOWN = PREFIX + "Shutdown";
+
+    public static final String THREAD_STATISTICS = PREFIX + "JavaThreadStatistics";
+    public static final String CONTEXT_SWITCH_RATE = PREFIX + "ThreadContextSwitchRate";
+
+    public static final String COMPILER_CONFIG = PREFIX + "CompilerConfiguration";
+    public static final String CODE_CACHE_CONFIG = PREFIX + "CodeCacheConfiguration";
+    public static final String CODE_SWEEPER_CONFIG = PREFIX + "CodeSweeperConfiguration";
+    public static final String COMPILER_PHASE = PREFIX + "CompilerPhase";
+    public static final String GC_COLLECTOR_G1_GARBAGE_COLLECTION = PREFIX + "G1GarbageCollection";
+    public static final String GC_COLLECTOR_OLD_GARBAGE_COLLECTION = PREFIX + "OldGarbageCollection";
+    public static final String GC_COLLECTOR_PAROLD_GARBAGE_COLLECTION = PREFIX + "ParallelOldGarbageCollection";
+    public static final String GC_COLLECTOR_YOUNG_GARBAGE_COLLECTION = PREFIX + "YoungGarbageCollection";
+    public static final String GC_DETAILED_ALLOCATION_REQUIRING_GC = PREFIX + "AllocationRequiringGC";
+    public static final String GC_DETAILED_EVACUATION_FAILED = PREFIX + "EvacuationFailed";
+    public static final String GC_DETAILED_EVACUATION_INFO = PREFIX + "EvacuationInformation";
+    public static final String GC_DETAILED_OBJECT_COUNT_AFTER_GC = PREFIX + "ObjectCountAfterGC";
+    public static final String GC_DETAILED_PROMOTION_FAILED = PREFIX + "PromotionFailed";
+    public static final String GC_HEAP_PS_SUMMARY = PREFIX + "PSHeapSummary";
+    public static final String GC_METASPACE_ALLOCATION_FAILURE = PREFIX + "MetaspaceAllocationFailure";
+    public static final String GC_METASPACE_CHUNK_FREE_LIST_SUMMARY = PREFIX + "MetaspaceChunkFreeListSummary";
+    public static final String GC_METASPACE_GC_THRESHOLD = PREFIX + "MetaspaceGCThreshold";
+    public static final String GC_G1MMU = PREFIX + "G1MMU";
+    public static final String GC_G1_EVACUATION_YOUNG_STATS = PREFIX + "G1EvacuationYoungStatistics";
+    public static final String GC_G1_EVACUATION_OLD_STATS = PREFIX + "G1EvacuationOldStatistics";
+    public static final String GC_G1_BASIC_IHOP = PREFIX + "G1BasicIHOP";
+    public static final String GC_G1_HEAP_REGION_TYPE_CHANGE = PREFIX + "G1HeapRegionTypeChange";
+    public static final String GC_G1_HEAP_REGION_INFORMATION = PREFIX + "G1HeapRegionInformation";
+    public static final String BIASED_LOCK_SELF_REVOCATION = PREFIX + "BiasedLockSelfRevocation";
+    public static final String BIASED_LOCK_REVOCATION = PREFIX + "BiasedLockRevocation";
+    public static final String BIASED_LOCK_CLASS_REVOCATION = PREFIX + "BiasedLockClassRevocation";
+    public static final String GC_G1_ADAPTIVE_IHOP = PREFIX + "G1AdaptiveIHOP";
+
+    public static final String RECORDINGS = PREFIX + "ActiveRecording";
+    public static final String RECORDING_SETTING = PREFIX + "ActiveSetting";
+
+    // Safepointing begin
+    public static final String SAFEPOINT_BEGIN = PREFIX + "SafepointBegin";
+    // Synchronize run state of threads
+    public static final String SAFEPOINT_STATE_SYNC = PREFIX + "SafepointStateSynchronization";
+    // Safepointing begin waiting on running threads to block
+    public static final String SAFEPOINT_WAIT_BLOCKED = PREFIX + "SafepointWaitBlocked";
+    // Safepointing begin running cleanup (parent)
+    public static final String SAFEPOINT_CLEANUP = PREFIX + "SafepointCleanup";
+    // Safepointing begin running cleanup task, individual subtasks
+    public static final String SAFEPOINT_CLEANUP_TASK = PREFIX + "SafepointCleanupTask";
+    // Safepointing end
+    public static final String SAFEPOINT_END = PREFIX + "SafepointEnd";
+
+    public static final String MODULE_EXPORT = PREFIX + "ModuleExport";
+    public static final String MODULE_REQUIRE = PREFIX + "ModuleRequire";
+
+    public static final String NATIVE_LIBRARY = PREFIX + "NativeLibrary";
+
+    public static final String HEAP_DUMP = PREFIX + "HeapDump";
+
+    public static final String PROCESS_START = PREFIX + "ProcessStart";
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/java/com/datadog/profiling/controller/jfr/JfpUtils.java b/dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/java/com/datadog/profiling/controller/jfr/JfpUtils.java
index 93a67948070..4d47d01ea91 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/java/com/datadog/profiling/controller/jfr/JfpUtils.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/src/main/java/com/datadog/profiling/controller/jfr/JfpUtils.java
@@ -32,60 +32,59 @@
  * parse XML.
  */
 public final class JfpUtils {
-  public static final String DEFAULT_JFP = "jfr/dd.jfp";
+    public static final String DEFAULT_JFP = "jfr/dd.jfp";
 
-  public static final String SAFEPOINTS_JFP = "jfr/safepoints.jfp";
-  private static final String OVERRIDES_PATH = "jfr/overrides/";
-  public static final String JFP_EXTENSION = ".jfp";
+    public static final String SAFEPOINTS_JFP = "jfr/safepoints.jfp";
+    private static final String OVERRIDES_PATH = "jfr/overrides/";
+    public static final String JFP_EXTENSION = ".jfp";
 
-  private JfpUtils() {
-    throw new UnsupportedOperationException("Toolkit!");
-  }
-
-  private static Map<String, String> readJfpFile(final InputStream stream) throws IOException {
-    if (stream == null) {
-      throw new IllegalArgumentException("Cannot read jfp file from empty stream!");
+    private JfpUtils() {
+        throw new UnsupportedOperationException("Toolkit!");
     }
-    final Properties props = new Properties();
-    props.load(stream);
-    final Map<String, String> map = new HashMap<>();
-    for (final Entry<Object, Object> o : props.entrySet()) {
-      map.put(String.valueOf(o.getKey()), String.valueOf(o.getValue()));
+
+    private static Map<String, String> readJfpFile(final InputStream stream) throws IOException {
+        if (stream == null) {
+            throw new IllegalArgumentException("Cannot read jfp file from empty stream!");
+        }
+        final Properties props = new Properties();
+        props.load(stream);
+        final Map<String, String> map = new HashMap<>();
+        for (final Entry<Object, Object> o : props.entrySet()) {
+            map.put(String.valueOf(o.getKey()), String.valueOf(o.getValue()));
+        }
+        return map;
     }
-    return map;
-  }
 
-  private static InputStream getNamedResource(final String name) {
-    return JfpUtils.class.getClassLoader().getResourceAsStream(name);
-  }
+    private static InputStream getNamedResource(final String name) {
+        return JfpUtils.class.getClassLoader().getResourceAsStream(name);
+    }
 
-  public static Map<String, String> readJfpResources(final String name, String overridesFileName)
-      throws IOException {
-    Map<String, String> result = readNamedJfpResource(name);
-    result.putAll(readOverrideJfpResource(overridesFileName));
-    return result;
-  }
+    public static Map<String, String> readJfpResources(final String name, String overridesFileName) throws IOException {
+        Map<String, String> result = readNamedJfpResource(name);
+        result.putAll(readOverrideJfpResource(overridesFileName));
+        return result;
+    }
 
-  public static Map<String, String> readNamedJfpResource(final String name) throws IOException {
-    try (final InputStream stream = getNamedResource(name)) {
-      return readJfpFile(stream);
+    public static Map<String, String> readNamedJfpResource(final String name) throws IOException {
+        try (final InputStream stream = getNamedResource(name)) {
+            return readJfpFile(stream);
+        }
     }
-  }
 
-  public static Map<String, String> readOverrideJfpResource(String name) throws IOException {
-    if (name != null) {
-      if (!name.toLowerCase(Locale.ROOT).endsWith(JFP_EXTENSION)) {
-        name = name + JFP_EXTENSION;
-      }
-      final File file = new File(name);
-      try (final InputStream stream =
-          file.exists() ? new FileInputStream(file) : getNamedResource(OVERRIDES_PATH + name)) {
-        if (stream == null) {
-          throw new IOException("Invalid override file " + name);
+    public static Map<String, String> readOverrideJfpResource(String name) throws IOException {
+        if (name != null) {
+            if (!name.toLowerCase(Locale.ROOT).endsWith(JFP_EXTENSION)) {
+                name = name + JFP_EXTENSION;
+            }
+            final File file = new File(name);
+            try (final InputStream stream =
+                    file.exists() ? new FileInputStream(file) : getNamedResource(OVERRIDES_PATH + name)) {
+                if (stream == null) {
+                    throw new IOException("Invalid override file " + name);
+                }
+                return readJfpFile(stream);
+            }
         }
-        return readJfpFile(stream);
-      }
+        return new HashMap<>();
     }
-    return new HashMap<>();
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/src/test/java/com/datadog/profiling/controller/jfr/JfpUtilsTest.java b/dd-java-agent/agent-profiling/profiling-controller-jfr/src/test/java/com/datadog/profiling/controller/jfr/JfpUtilsTest.java
index 9e4e7c4e5b9..a27f9bbb819 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-jfr/src/test/java/com/datadog/profiling/controller/jfr/JfpUtilsTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/src/test/java/com/datadog/profiling/controller/jfr/JfpUtilsTest.java
@@ -13,81 +13,76 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 public class JfpUtilsTest {
-  private static final String CONFIG_ENTRY = "jdk.ThreadAllocationStatistics#enabled";
-  private static final String CONFIG_OVERRIDE_ENTRY = "test.continuous.override#value";
+    private static final String CONFIG_ENTRY = "jdk.ThreadAllocationStatistics#enabled";
+    private static final String CONFIG_OVERRIDE_ENTRY = "test.continuous.override#value";
 
-  @Test
-  public void testLoadingInvalidOverride() throws IOException {
-    final String INVALID_OVERRIDE = "really_non_existent_file.jfp";
+    @Test
+    public void testLoadingInvalidOverride() throws IOException {
+        final String INVALID_OVERRIDE = "really_non_existent_file.jfp";
 
-    assertThrows(
-        IOException.class, () -> JfpUtils.readJfpResources(JfpUtils.DEFAULT_JFP, INVALID_OVERRIDE));
-  }
+        assertThrows(IOException.class, () -> JfpUtils.readJfpResources(JfpUtils.DEFAULT_JFP, INVALID_OVERRIDE));
+    }
 
-  @Test
-  public void testLoadingContinuousConfig() throws IOException {
-    final Map<String, String> config = JfpUtils.readJfpResources(JfpUtils.DEFAULT_JFP, null);
-    assertEquals("true", config.get(CONFIG_ENTRY));
-    assertNull(config.get(CONFIG_OVERRIDE_ENTRY));
-  }
+    @Test
+    public void testLoadingContinuousConfig() throws IOException {
+        final Map<String, String> config = JfpUtils.readJfpResources(JfpUtils.DEFAULT_JFP, null);
+        assertEquals("true", config.get(CONFIG_ENTRY));
+        assertNull(config.get(CONFIG_OVERRIDE_ENTRY));
+    }
 
-  @Test
-  public void testLoadingContinuousConfigWithOverride() throws IOException {
-    final Map<String, String> config =
-        JfpUtils.readJfpResources(JfpUtils.DEFAULT_JFP, JfpTestResources.overrides());
-    assertEquals("true", config.get(CONFIG_ENTRY));
-    assertEquals("200", config.get(CONFIG_OVERRIDE_ENTRY));
-  }
+    @Test
+    public void testLoadingContinuousConfigWithOverride() throws IOException {
+        final Map<String, String> config =
+                JfpUtils.readJfpResources(JfpUtils.DEFAULT_JFP, JfpTestResources.overrides());
+        assertEquals("true", config.get(CONFIG_ENTRY));
+        assertEquals("200", config.get(CONFIG_OVERRIDE_ENTRY));
+    }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"minimal", "minimal.jfp"})
-  public void testLoadingConfigMinimal(String override) throws IOException {
-    Map<String, String> config = JfpUtils.readJfpResources(JfpUtils.DEFAULT_JFP, override);
-    assertEquals("500 ms", config.get("jdk.ThreadSleep#threshold"));
-    assertEquals("false", config.get("jdk.OldObjectSample#enabled"));
-    assertEquals("false", config.get("jdk.ObjectAllocationInNewTLAB#enabled"));
-  }
+    @ParameterizedTest
+    @ValueSource(strings = {"minimal", "minimal.jfp"})
+    public void testLoadingConfigMinimal(String override) throws IOException {
+        Map<String, String> config = JfpUtils.readJfpResources(JfpUtils.DEFAULT_JFP, override);
+        assertEquals("500 ms", config.get("jdk.ThreadSleep#threshold"));
+        assertEquals("false", config.get("jdk.OldObjectSample#enabled"));
+        assertEquals("false", config.get("jdk.ObjectAllocationInNewTLAB#enabled"));
+    }
 
-  @ParameterizedTest
-  @ValueSource(strings = {SAFEPOINTS_JFP})
-  public void testLoadingConfigSafepoints(String safepoints) throws IOException {
-    Map<String, String> config = JfpUtils.readNamedJfpResource(safepoints);
-    assertEquals("true", config.get("jdk.SafepointStateSynchronization#enabled"));
-    assertEquals("true", config.get("jdk.SafepointBegin#enabled"));
-    assertEquals("true", config.get("jdk.SafepointEnd#enabled"));
-    assertEquals("false", config.get("jdk.SafepointWaitBlocked#enabled"));
-    assertEquals("false", config.get("jdk.SafepointCleanup#enabled"));
-    assertEquals("false", config.get("jdk.SafepointCleanupTask#enabled"));
-    assertEquals("true", config.get("jdk.ExecuteVMOperation#enabled"));
-    config
-        .keySet()
-        .forEach(
-            key ->
-                assertTrue(
-                    key.startsWith("jdk.Safepoint")
-                        || key.equals("jdk.ExecuteVMOperation#enabled")));
-  }
+    @ParameterizedTest
+    @ValueSource(strings = {SAFEPOINTS_JFP})
+    public void testLoadingConfigSafepoints(String safepoints) throws IOException {
+        Map<String, String> config = JfpUtils.readNamedJfpResource(safepoints);
+        assertEquals("true", config.get("jdk.SafepointStateSynchronization#enabled"));
+        assertEquals("true", config.get("jdk.SafepointBegin#enabled"));
+        assertEquals("true", config.get("jdk.SafepointEnd#enabled"));
+        assertEquals("false", config.get("jdk.SafepointWaitBlocked#enabled"));
+        assertEquals("false", config.get("jdk.SafepointCleanup#enabled"));
+        assertEquals("false", config.get("jdk.SafepointCleanupTask#enabled"));
+        assertEquals("true", config.get("jdk.ExecuteVMOperation#enabled"));
+        config.keySet()
+                .forEach(key ->
+                        assertTrue(key.startsWith("jdk.Safepoint") || key.equals("jdk.ExecuteVMOperation#enabled")));
+    }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"minimal", "minimal.jfp"})
-  public void testOverrideSafepointsConfig(String override) throws IOException {
-    Map<String, String> config = JfpUtils.readJfpResources(SAFEPOINTS_JFP, override);
-    assertEquals("true", config.get("jdk.SafepointStateSynchronization#enabled"));
-    assertEquals("true", config.get("jdk.SafepointBegin#enabled"));
-    assertEquals("true", config.get("jdk.SafepointEnd#enabled"));
-    assertEquals("false", config.get("jdk.SafepointWaitBlocked#enabled"));
-    assertEquals("false", config.get("jdk.SafepointCleanup#enabled"));
-    assertEquals("false", config.get("jdk.SafepointCleanupTask#enabled"));
-    assertEquals("true", config.get("jdk.ExecuteVMOperation#enabled"));
-    assertEquals("true", config.get("jdk.ThreadSleep#enabled"));
-  }
+    @ParameterizedTest
+    @ValueSource(strings = {"minimal", "minimal.jfp"})
+    public void testOverrideSafepointsConfig(String override) throws IOException {
+        Map<String, String> config = JfpUtils.readJfpResources(SAFEPOINTS_JFP, override);
+        assertEquals("true", config.get("jdk.SafepointStateSynchronization#enabled"));
+        assertEquals("true", config.get("jdk.SafepointBegin#enabled"));
+        assertEquals("true", config.get("jdk.SafepointEnd#enabled"));
+        assertEquals("false", config.get("jdk.SafepointWaitBlocked#enabled"));
+        assertEquals("false", config.get("jdk.SafepointCleanup#enabled"));
+        assertEquals("false", config.get("jdk.SafepointCleanupTask#enabled"));
+        assertEquals("true", config.get("jdk.ExecuteVMOperation#enabled"));
+        assertEquals("true", config.get("jdk.ThreadSleep#enabled"));
+    }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"comprehensive", "comprehensive.jfp"})
-  public void testLoadingConfigComprehensive(String override) throws IOException {
-    Map<String, String> config = JfpUtils.readJfpResources(JfpUtils.DEFAULT_JFP, override);
-    assertEquals("10 ms", config.get("jdk.ThreadSleep#threshold"));
-    assertEquals("true", config.get("jdk.OldObjectSample#enabled"));
-    assertEquals("true", config.get("jdk.ObjectAllocationInNewTLAB#enabled"));
-  }
+    @ParameterizedTest
+    @ValueSource(strings = {"comprehensive", "comprehensive.jfp"})
+    public void testLoadingConfigComprehensive(String override) throws IOException {
+        Map<String, String> config = JfpUtils.readJfpResources(JfpUtils.DEFAULT_JFP, override);
+        assertEquals("10 ms", config.get("jdk.ThreadSleep#threshold"));
+        assertEquals("true", config.get("jdk.OldObjectSample#enabled"));
+        assertEquals("true", config.get("jdk.ObjectAllocationInNewTLAB#enabled"));
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/src/test/java/com/datadog/profiling/controller/jfr/TestJfrRecorder.java b/dd-java-agent/agent-profiling/profiling-controller-jfr/src/test/java/com/datadog/profiling/controller/jfr/TestJfrRecorder.java
index cbf90124a2e..ec1d15c2c69 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-jfr/src/test/java/com/datadog/profiling/controller/jfr/TestJfrRecorder.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/src/test/java/com/datadog/profiling/controller/jfr/TestJfrRecorder.java
@@ -22,191 +22,174 @@
 
 /** An 'extended' JFR recorder adding the ability to use the Java JFR API to define event types. */
 public class TestJfrRecorder {
-  static final class AnnotationValueObject {
-    final Type annotationType;
-    final String annotationValue;
+    static final class AnnotationValueObject {
+        final Type annotationType;
+        final String annotationValue;
+
+        public AnnotationValueObject(Type annotationType, String value) {
+            this.annotationType = annotationType;
+            this.annotationValue = value;
+        }
+    }
+
+    private final Map<StackTraceElement, TypedValue> frameCache = new HashMap<>(16000);
+    private final Map<String, TypedValue> classLoaderCache = new HashMap<>(128);
+    private final Map<String, TypedValue> moduleCache = new HashMap<>(4096);
+    private final Recording recording;
 
-    public AnnotationValueObject(Type annotationType, String value) {
-      this.annotationType = annotationType;
-      this.annotationValue = value;
+    public TestJfrRecorder(Recording recording) {
+        this.recording = recording;
     }
-  }
-
-  private final Map<StackTraceElement, TypedValue> frameCache = new HashMap<>(16000);
-  private final Map<String, TypedValue> classLoaderCache = new HashMap<>(128);
-  private final Map<String, TypedValue> moduleCache = new HashMap<>(4096);
-  private final Recording recording;
-
-  public TestJfrRecorder(Recording recording) {
-    this.recording = recording;
-  }
-
-  public final Type registerEventType(Class<? extends Event> eventType) {
-    Types types = recording.getTypes();
-    /*
-     * JMC implementation is slightly mishandling some event types - not using the special call
-     * and rather registering all implicit fields by hand.
-     */
-    return recording.registerType(
-        getEventName(eventType),
-        "jdk.jfr.Event",
-        b -> {
-          Field[] fields = eventType.getDeclaredFields();
-          for (Field f : fields) {
-            if (Modifier.isTransient(f.getModifiers()) || Modifier.isStatic(f.getModifiers())) {
-              // skip static and transient fields
-              continue;
+
+    public final Type registerEventType(Class<? extends Event> eventType) {
+        Types types = recording.getTypes();
+        /*
+         * JMC implementation is slightly mishandling some event types - not using the special call
+         * and rather registering all implicit fields by hand.
+         */
+        return recording.registerType(getEventName(eventType), "jdk.jfr.Event", b -> {
+            Field[] fields = eventType.getDeclaredFields();
+            for (Field f : fields) {
+                if (Modifier.isTransient(f.getModifiers()) || Modifier.isStatic(f.getModifiers())) {
+                    // skip static and transient fields
+                    continue;
+                }
+                // Add field definition
+                Type fieldType = types.getType(f.getType().getName());
+                if (fieldType != null) {
+                    java.lang.annotation.Annotation[] as = f.getAnnotations();
+                    String fieldName = getFieldName(f);
+                    if (fieldName.equals("startTime")
+                            || fieldName.equals("eventThread")
+                            || fieldName.equals("stackTrace")) {
+                        // built-in fields; skip
+                        continue;
+                    }
+                    TypedFieldBuilder fieldTypeBuilder = types.fieldBuilder(fieldName, fieldType);
+
+                    for (java.lang.annotation.Annotation a : as) {
+                        AnnotationValueObject val = processAnnotation(types, a);
+                        if (val != null) {
+                            fieldTypeBuilder = val.annotationValue != null
+                                    ? fieldTypeBuilder.addAnnotation(val.annotationType, val.annotationValue)
+                                    : fieldTypeBuilder.addAnnotation(val.annotationType);
+                        }
+                    }
+                    b.addField(fieldTypeBuilder.build());
+                }
             }
-            // Add field definition
-            Type fieldType = types.getType(f.getType().getName());
-            if (fieldType != null) {
-              java.lang.annotation.Annotation[] as = f.getAnnotations();
-              String fieldName = getFieldName(f);
-              if (fieldName.equals("startTime")
-                  || fieldName.equals("eventThread")
-                  || fieldName.equals("stackTrace")) {
-                // built-in fields; skip
-                continue;
-              }
-              TypedFieldBuilder fieldTypeBuilder = types.fieldBuilder(fieldName, fieldType);
-
-              for (java.lang.annotation.Annotation a : as) {
+            // force 'startTime' field
+            b.addField(
+                    "startTime",
+                    Types.Builtin.LONG,
+                    field -> field.addAnnotation(Types.JDK.ANNOTATION_TIMESTAMP, "NANOSECONDS_SINCE_EPOCH"));
+            // force 'eventThread' field
+            b.addField("eventThread", Types.JDK.THREAD);
+
+            // force 'stackTrace' field if the event is collecting stacktraces
+            if (hasStackTrace(eventType)) {
+                b.addField("stackTrace", Types.JDK.STACK_TRACE);
+            }
+            for (java.lang.annotation.Annotation a : eventType.getAnnotations()) {
                 AnnotationValueObject val = processAnnotation(types, a);
                 if (val != null) {
-                  fieldTypeBuilder =
-                      val.annotationValue != null
-                          ? fieldTypeBuilder.addAnnotation(val.annotationType, val.annotationValue)
-                          : fieldTypeBuilder.addAnnotation(val.annotationType);
+                    b = val.annotationValue != null
+                            ? b.addAnnotation(val.annotationType, val.annotationValue)
+                            : b.addAnnotation(val.annotationType);
                 }
-              }
-              b.addField(fieldTypeBuilder.build());
             }
-          }
-          // force 'startTime' field
-          b.addField(
-              "startTime",
-              Types.Builtin.LONG,
-              field ->
-                  field.addAnnotation(Types.JDK.ANNOTATION_TIMESTAMP, "NANOSECONDS_SINCE_EPOCH"));
-          // force 'eventThread' field
-          b.addField("eventThread", Types.JDK.THREAD);
-
-          // force 'stackTrace' field if the event is collecting stacktraces
-          if (hasStackTrace(eventType)) {
-            b.addField("stackTrace", Types.JDK.STACK_TRACE);
-          }
-          for (java.lang.annotation.Annotation a : eventType.getAnnotations()) {
-            AnnotationValueObject val = processAnnotation(types, a);
-            if (val != null) {
-              b =
-                  val.annotationValue != null
-                      ? b.addAnnotation(val.annotationType, val.annotationValue)
-                      : b.addAnnotation(val.annotationType);
+        });
+    }
+
+    private AnnotationValueObject processAnnotation(Types types, java.lang.annotation.Annotation annotation) {
+        // skip non-JFR related annotations
+        if (!isJfrAnnotation(annotation)) {
+            return null;
+        }
+        if (annotation instanceof Name) {
+            // skip @Name annotation
+            return null;
+        }
+
+        String value = null;
+        try {
+            Method m = annotation.getClass().getMethod("value");
+            if (!String.class.isAssignableFrom(m.getReturnType())) {
+                // wrong value type
+                return null;
+            }
+            value = (String) m.invoke(annotation);
+        } catch (NoSuchMethodException ignored) {
+            // no-value annotations are also permitted
+        } catch (SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+            // error retrieving value attribute
+            return null;
+        }
+        String annotationValue = value;
+        String annotationTypeName = annotation.annotationType().getTypeName();
+        Type annotationType = types.getOrAdd(annotationTypeName, Annotation.ANNOTATION_SUPER_TYPE_NAME, builder -> {
+            if (annotationValue != null) {
+                builder.addField("value", Types.Builtin.STRING);
             }
-          }
         });
-  }
+        return new AnnotationValueObject(annotationType, annotationValue);
+    }
 
-  private AnnotationValueObject processAnnotation(
-      Types types, java.lang.annotation.Annotation annotation) {
-    // skip non-JFR related annotations
-    if (!isJfrAnnotation(annotation)) {
-      return null;
+    public final TestJfrRecorder writeEvent(Event event) {
+        registerEventType(event.getClass());
+        recording.writeEvent(createEventValue(event));
+        return this;
     }
-    if (annotation instanceof Name) {
-      // skip @Name annotation
-      return null;
+
+    public RecordingImpl writeEvent(TypedValue event) {
+        return recording.writeEvent(event);
     }
 
-    String value = null;
-    try {
-      Method m = annotation.getClass().getMethod("value");
-      if (!String.class.isAssignableFrom(m.getReturnType())) {
-        // wrong value type
-        return null;
-      }
-      value = (String) m.invoke(annotation);
-    } catch (NoSuchMethodException ignored) {
-      // no-value annotations are also permitted
-    } catch (SecurityException
-        | IllegalAccessException
-        | IllegalArgumentException
-        | InvocationTargetException e) {
-      // error retrieving value attribute
-      return null;
+    public Type registerEventType(String name) {
+        return recording.registerEventType(name);
     }
-    String annotationValue = value;
-    String annotationTypeName = annotation.annotationType().getTypeName();
-    Type annotationType =
-        types.getOrAdd(
-            annotationTypeName,
-            Annotation.ANNOTATION_SUPER_TYPE_NAME,
-            builder -> {
-              if (annotationValue != null) {
-                builder.addField("value", Types.Builtin.STRING);
-              }
-            });
-    return new AnnotationValueObject(annotationType, annotationValue);
-  }
-
-  public final TestJfrRecorder writeEvent(Event event) {
-    registerEventType(event.getClass());
-    recording.writeEvent(createEventValue(event));
-    return this;
-  }
-
-  public RecordingImpl writeEvent(TypedValue event) {
-    return recording.writeEvent(event);
-  }
-
-  public Type registerEventType(String name) {
-    return recording.registerEventType(name);
-  }
-
-  public Type registerEventType(String name, Consumer<TypeStructureBuilder> builderCallback) {
-    return recording.registerEventType(name, builderCallback);
-  }
-
-  public Type registerAnnotationType(String name) {
-    return recording.registerAnnotationType(name);
-  }
-
-  public Type registerAnnotationType(String name, Consumer<TypeStructureBuilder> builderCallback) {
-    return recording.registerAnnotationType(name, builderCallback);
-  }
-
-  public Type registerType(String name, Consumer<TypeStructureBuilder> builderCallback) {
-    return recording.registerType(name, builderCallback);
-  }
-
-  public Type registerType(
-      String name, String supertype, Consumer<TypeStructureBuilder> builderCallback) {
-    return recording.registerType(name, supertype, builderCallback);
-  }
-
-  public Type getType(Types.JDK type) {
-    return recording.getType(type);
-  }
-
-  public Type getType(String typeName) {
-    return recording.getType(typeName);
-  }
-
-  public Types getTypes() {
-    return recording.getTypes();
-  }
-
-  private TypedValue createEventValue(Event event) {
-    Type eventType = recording.getType(getEventName(event.getClass()));
-    Field[] fields = event.getClass().getDeclaredFields();
-
-    TypedValue typedValue =
-        eventType.asValue(
-            access -> {
-              boolean startTimeWritten = false;
-              boolean eventThreadWritten = false;
-              boolean stackTraceWritten = false;
-              for (Field f : fields) {
+
+    public Type registerEventType(String name, Consumer<TypeStructureBuilder> builderCallback) {
+        return recording.registerEventType(name, builderCallback);
+    }
+
+    public Type registerAnnotationType(String name) {
+        return recording.registerAnnotationType(name);
+    }
+
+    public Type registerAnnotationType(String name, Consumer<TypeStructureBuilder> builderCallback) {
+        return recording.registerAnnotationType(name, builderCallback);
+    }
+
+    public Type registerType(String name, Consumer<TypeStructureBuilder> builderCallback) {
+        return recording.registerType(name, builderCallback);
+    }
+
+    public Type registerType(String name, String supertype, Consumer<TypeStructureBuilder> builderCallback) {
+        return recording.registerType(name, supertype, builderCallback);
+    }
+
+    public Type getType(Types.JDK type) {
+        return recording.getType(type);
+    }
+
+    public Type getType(String typeName) {
+        return recording.getType(typeName);
+    }
+
+    public Types getTypes() {
+        return recording.getTypes();
+    }
+
+    private TypedValue createEventValue(Event event) {
+        Type eventType = recording.getType(getEventName(event.getClass()));
+        Field[] fields = event.getClass().getDeclaredFields();
+
+        TypedValue typedValue = eventType.asValue(access -> {
+            boolean startTimeWritten = false;
+            boolean eventThreadWritten = false;
+            boolean stackTraceWritten = false;
+            for (Field f : fields) {
                 f.setAccessible(true);
 
                 /*
@@ -220,270 +203,227 @@ private TypedValue createEventValue(Event event) {
                  */
                 // Transient and static fields are excluded
                 if (Modifier.isTransient(f.getModifiers()) || Modifier.isStatic(f.getModifiers())) {
-                  continue;
+                    continue;
                 }
 
                 String fldName = getFieldName(f);
                 if (fldName.equals("startTime")) {
-                  startTimeWritten = true;
+                    startTimeWritten = true;
                 } else if (fldName.equals("eventThread")) {
-                  eventThreadWritten = true;
+                    eventThreadWritten = true;
                 } else if (fldName.equals("stackTrace")) {
-                  stackTraceWritten = true;
+                    stackTraceWritten = true;
                 }
                 try {
-                  switch (f.getType().getName()) {
-                    case "byte":
-                      {
-                        byte byteValue = f.getByte(event);
-                        access.putField(fldName, byteValue);
-                        break;
-                      }
-                    case "char":
-                      {
-                        char charValue = f.getChar(event);
-                        access.putField(fldName, charValue);
-                        break;
-                      }
-                    case "short":
-                      {
-                        short shortValue = f.getShort(event);
-                        access.putField(fldName, shortValue);
-                        break;
-                      }
-                    case "int":
-                      {
-                        int intValue = f.getInt(event);
-                        access.putField(fldName, intValue);
-                        break;
-                      }
-                    case "long":
-                      {
-                        long longValue = f.getLong(event);
-                        access.putField(fldName, longValue);
-                        break;
-                      }
-                    case "float":
-                      {
-                        float floatValue = f.getFloat(event);
-                        access.putField(fldName, floatValue);
-                        break;
-                      }
-                    case "double":
-                      {
-                        double doubleValue = f.getDouble(event);
-                        access.putField(fldName, doubleValue);
-                        break;
-                      }
-                    case "boolean":
-                      {
-                        boolean booleanValue = f.getBoolean(event);
-                        access.putField(fldName, booleanValue);
-                        break;
-                      }
-                    case "java.lang.String":
-                      {
-                        String stringValue = (String) f.get(event);
-                        access.putField(fldName, stringValue);
-                        break;
-                      }
-                    case "java.lang.Class":
-                      {
-                        Class<?> clz = (Class<?>) f.get(event);
-                        access.putField(
-                            fldName,
-                            fldAccess -> {
-                              fldAccess
-                                  .putField(
-                                      "name",
-                                      nameAccess -> {
-                                        nameAccess.putField("string", clz.getSimpleName());
-                                      })
-                                  .putField("package", clz.getPackage().getName())
-                                  .putField("modifiers", clz.getModifiers());
+                    switch (f.getType().getName()) {
+                        case "byte": {
+                            byte byteValue = f.getByte(event);
+                            access.putField(fldName, byteValue);
+                            break;
+                        }
+                        case "char": {
+                            char charValue = f.getChar(event);
+                            access.putField(fldName, charValue);
+                            break;
+                        }
+                        case "short": {
+                            short shortValue = f.getShort(event);
+                            access.putField(fldName, shortValue);
+                            break;
+                        }
+                        case "int": {
+                            int intValue = f.getInt(event);
+                            access.putField(fldName, intValue);
+                            break;
+                        }
+                        case "long": {
+                            long longValue = f.getLong(event);
+                            access.putField(fldName, longValue);
+                            break;
+                        }
+                        case "float": {
+                            float floatValue = f.getFloat(event);
+                            access.putField(fldName, floatValue);
+                            break;
+                        }
+                        case "double": {
+                            double doubleValue = f.getDouble(event);
+                            access.putField(fldName, doubleValue);
+                            break;
+                        }
+                        case "boolean": {
+                            boolean booleanValue = f.getBoolean(event);
+                            access.putField(fldName, booleanValue);
+                            break;
+                        }
+                        case "java.lang.String": {
+                            String stringValue = (String) f.get(event);
+                            access.putField(fldName, stringValue);
+                            break;
+                        }
+                        case "java.lang.Class": {
+                            Class<?> clz = (Class<?>) f.get(event);
+                            access.putField(fldName, fldAccess -> {
+                                fldAccess
+                                        .putField("name", nameAccess -> {
+                                            nameAccess.putField("string", clz.getSimpleName());
+                                        })
+                                        .putField("package", clz.getPackage().getName())
+                                        .putField("modifiers", clz.getModifiers());
                             });
-                        break;
-                      }
-                    case "java.lang.Thread":
-                      {
-                        Thread thrd = (Thread) f.get(event);
-                        putThreadField(access, fldName, thrd);
-                        break;
-                      }
-                    case "java.lang.StackTraceElement[]":
-                      {
-                        StackTraceElement[] stackTrace = (StackTraceElement[]) f.get(event);
-                        putStackTraceField(access, fldName, stackTrace);
-                        break;
-                      }
-                    default:
-                      {
-                        // System.err.println("Cannot write type:" + f.getType().getName());
-                      }
-                  }
+                            break;
+                        }
+                        case "java.lang.Thread": {
+                            Thread thrd = (Thread) f.get(event);
+                            putThreadField(access, fldName, thrd);
+                            break;
+                        }
+                        case "java.lang.StackTraceElement[]": {
+                            StackTraceElement[] stackTrace = (StackTraceElement[]) f.get(event);
+                            putStackTraceField(access, fldName, stackTrace);
+                            break;
+                        }
+                        default: {
+                            // System.err.println("Cannot write type:" + f.getType().getName());
+                        }
+                    }
                 } catch (IllegalAccessException e) {
-                  throw new RuntimeException();
+                    throw new RuntimeException();
                 }
-              }
-              if (!startTimeWritten) {
+            }
+            if (!startTimeWritten) {
                 // default to 0
                 access.putField("startTime", 0L);
-              }
-              if (!eventThreadWritten) {
+            }
+            if (!eventThreadWritten) {
                 // default to current thread
                 putThreadField(access, "eventThread", Thread.currentThread());
-              }
-              if (!stackTraceWritten && hasStackTrace(event.getClass())) {
+            }
+            if (!stackTraceWritten && hasStackTrace(event.getClass())) {
                 putStackTraceField(access, "stackTrace", Thread.currentThread().getStackTrace());
-              }
-            });
+            }
+        });
 
-    return typedValue;
-  }
+        return typedValue;
+    }
+
+    private String getEventName(Class<? extends Event> eventType) {
+        Name nameAnnotation = eventType.getAnnotation(Name.class);
+        if (nameAnnotation != null) {
+            return nameAnnotation.value();
+        }
+        return eventType.getSimpleName();
+    }
+
+    private String getFieldName(Field fld) {
+        Name nameAnnotation = fld.getAnnotation(Name.class);
+        if (nameAnnotation != null) {
+            return nameAnnotation.value();
+        }
+        return fld.getName();
+    }
+
+    private boolean isJfrAnnotation(java.lang.annotation.Annotation target) {
+        String typeName = target.annotationType().getName();
+        if (typeName.startsWith("jdk.jfr.")) {
+            return true;
+        }
+        for (java.lang.annotation.Annotation annotation :
+                target.annotationType().getAnnotations()) {
+            if (isJfrAnnotation(annotation)) {
+                return true;
+            }
+        }
+        return false;
+    }
 
-  private String getEventName(Class<? extends Event> eventType) {
-    Name nameAnnotation = eventType.getAnnotation(Name.class);
-    if (nameAnnotation != null) {
-      return nameAnnotation.value();
+    private void putThreadField(TypedValueBuilder access, String fldName, Thread thread) {
+        access.putField(fldName, fldAccess -> {
+            fldAccess
+                    .putField("javaThreadId", thread.getId())
+                    .putField("osThreadId", thread.getId())
+                    .putField("javaName", thread.getName());
+        });
     }
-    return eventType.getSimpleName();
-  }
 
-  private String getFieldName(Field fld) {
-    Name nameAnnotation = fld.getAnnotation(Name.class);
-    if (nameAnnotation != null) {
-      return nameAnnotation.value();
+    private void putStackTraceField(TypedValueBuilder access, String fldName, StackTraceElement[] stackTrace) {
+        Types types = access.getType().getTypes();
+        TypedValue[] frames = new TypedValue[stackTrace.length];
+        boolean[] truncated = new boolean[] {false};
+        for (int i = 0; i < stackTrace.length; i++) {
+            frames[i] = asStackFrame(types, stackTrace[i]);
+            if (i >= 8192) {
+                truncated[0] = true;
+                break;
+            }
+        }
+        access.putField(fldName, p -> {
+            p.putField("frames", frames).putField("truncated", truncated[0]);
+        });
     }
-    return fld.getName();
-  }
 
-  private boolean isJfrAnnotation(java.lang.annotation.Annotation target) {
-    String typeName = target.annotationType().getName();
-    if (typeName.startsWith("jdk.jfr.")) {
-      return true;
+    private TypedValue asStackFrame(Types types, StackTraceElement element) {
+        return frameCache.computeIfAbsent(
+                element,
+                k -> types.getType(Types.JDK.STACK_FRAME).asValue(p -> {
+                    p.putField("method", methodValue(types, k))
+                            .putField("lineNumber", k.getLineNumber())
+                            .putField("bytecodeIndex", -1)
+                            .putField("type", k.isNativeMethod() ? "native" : "java");
+                }));
     }
-    for (java.lang.annotation.Annotation annotation : target.annotationType().getAnnotations()) {
-      if (isJfrAnnotation(annotation)) {
-        return true;
-      }
+
+    private TypedValue methodValue(Types types, StackTraceElement element) {
+        return types.getType(Types.JDK.METHOD).asValue(p -> {
+            p.putField("type", classValue(types, element)).putField("name", element.getMethodName());
+        });
     }
-    return false;
-  }
-
-  private void putThreadField(TypedValueBuilder access, String fldName, Thread thread) {
-    access.putField(
-        fldName,
-        fldAccess -> {
-          fldAccess
-              .putField("javaThreadId", thread.getId())
-              .putField("osThreadId", thread.getId())
-              .putField("javaName", thread.getName());
+
+    private TypedValue classValue(Types types, StackTraceElement element) {
+        return types.getType(Types.JDK.CLASS).asValue(p -> {
+            p.putField("name", getSimpleName(element.getClassName()));
         });
-  }
-
-  private void putStackTraceField(
-      TypedValueBuilder access, String fldName, StackTraceElement[] stackTrace) {
-    Types types = access.getType().getTypes();
-    TypedValue[] frames = new TypedValue[stackTrace.length];
-    boolean[] truncated = new boolean[] {false};
-    for (int i = 0; i < stackTrace.length; i++) {
-      frames[i] = asStackFrame(types, stackTrace[i]);
-      if (i >= 8192) {
-        truncated[0] = true;
-        break;
-      }
     }
-    access.putField(
-        fldName,
-        p -> {
-          p.putField("frames", frames).putField("truncated", truncated[0]);
+
+    private TypedValue classLoaderValue(Types types, String classLoaderName) {
+        return classLoaderCache.computeIfAbsent(
+                classLoaderName,
+                k -> types.getType(Types.JDK.CLASS_LOADER).asValue(p -> {
+                    p.putField("name", k);
+                }));
+    }
+
+    private TypedValue packageValue(Types types, String packageName, String module) {
+        return types.getType(Types.JDK.PACKAGE).asValue(p -> {
+            p.putField("name", packageName).putField("module", moduleValue(types, module));
         });
-  }
-
-  private TypedValue asStackFrame(Types types, StackTraceElement element) {
-    return frameCache.computeIfAbsent(
-        element,
-        k ->
-            types
-                .getType(Types.JDK.STACK_FRAME)
-                .asValue(
-                    p -> {
-                      p.putField("method", methodValue(types, k))
-                          .putField("lineNumber", k.getLineNumber())
-                          .putField("bytecodeIndex", -1)
-                          .putField("type", k.isNativeMethod() ? "native" : "java");
-                    }));
-  }
-
-  private TypedValue methodValue(Types types, StackTraceElement element) {
-    return types
-        .getType(Types.JDK.METHOD)
-        .asValue(
-            p -> {
-              p.putField("type", classValue(types, element))
-                  .putField("name", element.getMethodName());
-            });
-  }
-
-  private TypedValue classValue(Types types, StackTraceElement element) {
-    return types
-        .getType(Types.JDK.CLASS)
-        .asValue(
-            p -> {
-              p.putField("name", getSimpleName(element.getClassName()));
-            });
-  }
-
-  private TypedValue classLoaderValue(Types types, String classLoaderName) {
-    return classLoaderCache.computeIfAbsent(
-        classLoaderName,
-        k ->
-            types
-                .getType(Types.JDK.CLASS_LOADER)
-                .asValue(
-                    p -> {
-                      p.putField("name", k);
-                    }));
-  }
-
-  private TypedValue packageValue(Types types, String packageName, String module) {
-    return types
-        .getType(Types.JDK.PACKAGE)
-        .asValue(
-            p -> {
-              p.putField("name", packageName).putField("module", moduleValue(types, module));
-            });
-  }
-
-  private TypedValue moduleValue(Types types, String module) {
-    return moduleCache.computeIfAbsent(
-        module,
-        k ->
-            types
-                .getType(Types.JDK.MODULE)
-                .asValue(
-                    p -> {
-                      p.putField("name", k);
-                    }));
-  }
-
-  private String getSimpleName(String className) {
-    return className.substring(className.lastIndexOf('.') + 1);
-  }
-
-  private String getPackageName(String className) {
-    int idx = className.lastIndexOf('.');
-    if (idx > -1) {
-      return className.substring(0, idx);
     }
-    return "";
-  }
 
-  private boolean hasStackTrace(Class<? extends Event> eventType) {
-    StackTrace stAnnotation = eventType.getAnnotation(StackTrace.class);
-    if (stAnnotation != null) {
-      return stAnnotation.value();
+    private TypedValue moduleValue(Types types, String module) {
+        return moduleCache.computeIfAbsent(
+                module,
+                k -> types.getType(Types.JDK.MODULE).asValue(p -> {
+                    p.putField("name", k);
+                }));
+    }
+
+    private String getSimpleName(String className) {
+        return className.substring(className.lastIndexOf('.') + 1);
+    }
+
+    private String getPackageName(String className) {
+        int idx = className.lastIndexOf('.');
+        if (idx > -1) {
+            return className.substring(0, idx);
+        }
+        return "";
+    }
+
+    private boolean hasStackTrace(Class<? extends Event> eventType) {
+        StackTrace stAnnotation = eventType.getAnnotation(StackTrace.class);
+        if (stAnnotation != null) {
+            return stAnnotation.value();
+        }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/src/testFixtures/java/com/datadog/profiling/controller/jfr/JfpTestResources.java b/dd-java-agent/agent-profiling/profiling-controller-jfr/src/testFixtures/java/com/datadog/profiling/controller/jfr/JfpTestResources.java
index 88cd0b6bca7..91c6d6ef570 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-jfr/src/testFixtures/java/com/datadog/profiling/controller/jfr/JfpTestResources.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/src/testFixtures/java/com/datadog/profiling/controller/jfr/JfpTestResources.java
@@ -8,55 +8,53 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 public final class JfpTestResources {
-  private static final AtomicReference<String> overrides = new AtomicReference<>();
-  private static final AtomicReference<String> overridesOldObjectSample = new AtomicReference<>();
-  private static final AtomicReference<String> overridesObjectAllocation = new AtomicReference<>();
-  private static final AtomicReference<String> overridesNativeMethodSample =
-      new AtomicReference<>();
-
-  private JfpTestResources() {}
-
-  public static String overrides() {
-    return get(overrides, "overrides.jfp");
-  }
-
-  public static String overridesOldObjectSample() {
-    return get(overridesOldObjectSample, "overrides-oldobjectsample.jfp");
-  }
-
-  public static String overridesObjectAllocation() {
-    return get(overridesObjectAllocation, "overrides-objectallocation.jfp");
-  }
-
-  public static String overridesNativeMethodSample() {
-    return get(overridesNativeMethodSample, "overrides-nativemethodsample.jfp");
-  }
-
-  private static String get(AtomicReference<String> ref, String resourceName) {
-    String v = ref.get();
-    if (v != null) {
-      return v;
+    private static final AtomicReference<String> overrides = new AtomicReference<>();
+    private static final AtomicReference<String> overridesOldObjectSample = new AtomicReference<>();
+    private static final AtomicReference<String> overridesObjectAllocation = new AtomicReference<>();
+    private static final AtomicReference<String> overridesNativeMethodSample = new AtomicReference<>();
+
+    private JfpTestResources() {}
+
+    public static String overrides() {
+        return get(overrides, "overrides.jfp");
+    }
+
+    public static String overridesOldObjectSample() {
+        return get(overridesOldObjectSample, "overrides-oldobjectsample.jfp");
+    }
+
+    public static String overridesObjectAllocation() {
+        return get(overridesObjectAllocation, "overrides-objectallocation.jfp");
     }
-    String computed = extract(resourceName);
-    return ref.compareAndSet(null, computed) ? computed : ref.get();
-  }
-
-  // Resources packaged in the testFixtures jar are not directly accessible as filesystem paths.
-  // Extract to a temp file so callers can use the path with java.io.File.
-  private static String extract(String resourceName) {
-    try {
-      Path temp = Files.createTempFile(resourceName.replace('.', '_'), ".jfp");
-      temp.toFile().deleteOnExit();
-      try (InputStream is =
-          JfpTestResources.class.getClassLoader().getResourceAsStream(resourceName)) {
-        if (is == null) {
-          throw new IllegalStateException("Test resource not found on classpath: " + resourceName);
+
+    public static String overridesNativeMethodSample() {
+        return get(overridesNativeMethodSample, "overrides-nativemethodsample.jfp");
+    }
+
+    private static String get(AtomicReference<String> ref, String resourceName) {
+        String v = ref.get();
+        if (v != null) {
+            return v;
+        }
+        String computed = extract(resourceName);
+        return ref.compareAndSet(null, computed) ? computed : ref.get();
+    }
+
+    // Resources packaged in the testFixtures jar are not directly accessible as filesystem paths.
+    // Extract to a temp file so callers can use the path with java.io.File.
+    private static String extract(String resourceName) {
+        try {
+            Path temp = Files.createTempFile(resourceName.replace('.', '_'), ".jfp");
+            temp.toFile().deleteOnExit();
+            try (InputStream is = JfpTestResources.class.getClassLoader().getResourceAsStream(resourceName)) {
+                if (is == null) {
+                    throw new IllegalStateException("Test resource not found on classpath: " + resourceName);
+                }
+                Files.copy(is, temp, StandardCopyOption.REPLACE_EXISTING);
+            }
+            return temp.toAbsolutePath().toString();
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to extract test resource: " + resourceName, e);
         }
-        Files.copy(is, temp, StandardCopyOption.REPLACE_EXISTING);
-      }
-      return temp.toAbsolutePath().toString();
-    } catch (IOException e) {
-      throw new RuntimeException("Failed to extract test resource: " + resourceName, e);
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/JFREventContextIntegration.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/JFREventContextIntegration.java
index 999266980f8..c0b4092d6ec 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/JFREventContextIntegration.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/JFREventContextIntegration.java
@@ -17,78 +17,73 @@
 
 public class JFREventContextIntegration implements ProfilingContextIntegration {
 
-  public JFREventContextIntegration() {
-    ExcludedVersions.checkVersionExclusion();
-    // Note: Loading CheckpointEvent when JFRCheckpointer is loaded is important because it also
-    // loads JFR classes - which may not be present on some JVMs
-    EventType.getEventType(EndpointEvent.class);
-    isEndpointCollectionEnabled =
-        ConfigProvider.getInstance()
-            .getBoolean(
-                ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED,
-                ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED_DEFAULT);
-    isTimelineEventsEnabled =
-        ConfigProvider.getInstance()
-            .getBoolean(
-                ProfilingConfig.PROFILING_TIMELINE_EVENTS_ENABLED,
-                ProfilingConfig.PROFILING_TIMELINE_EVENTS_ENABLED_DEFAULT);
-    isQueueTimeEnabled =
-        ConfigProvider.getInstance()
-            .getBoolean(
-                ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED,
-                ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED_DEFAULT);
-  }
+    public JFREventContextIntegration() {
+        ExcludedVersions.checkVersionExclusion();
+        // Note: Loading CheckpointEvent when JFRCheckpointer is loaded is important because it also
+        // loads JFR classes - which may not be present on some JVMs
+        EventType.getEventType(EndpointEvent.class);
+        isEndpointCollectionEnabled = ConfigProvider.getInstance()
+                .getBoolean(
+                        ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED,
+                        ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED_DEFAULT);
+        isTimelineEventsEnabled = ConfigProvider.getInstance()
+                .getBoolean(
+                        ProfilingConfig.PROFILING_TIMELINE_EVENTS_ENABLED,
+                        ProfilingConfig.PROFILING_TIMELINE_EVENTS_ENABLED_DEFAULT);
+        isQueueTimeEnabled = ConfigProvider.getInstance()
+                .getBoolean(
+                        ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED,
+                        ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED_DEFAULT);
+    }
 
-  // native image process will enable context integration immediately - the value will get
-  // 'baked-in' during image build time
-  // java agent process will enable context integration when the agent is started and onStart is
-  // called
-  private volatile boolean isStarted = !Platform.isNativeImageBuilder();
-  private final boolean isEndpointCollectionEnabled;
-  private final boolean isTimelineEventsEnabled;
-  private final boolean isQueueTimeEnabled;
+    // native image process will enable context integration immediately - the value will get
+    // 'baked-in' during image build time
+    // java agent process will enable context integration when the agent is started and onStart is
+    // called
+    private volatile boolean isStarted = !Platform.isNativeImageBuilder();
+    private final boolean isEndpointCollectionEnabled;
+    private final boolean isTimelineEventsEnabled;
+    private final boolean isQueueTimeEnabled;
 
-  @Override
-  public void onStart() {
-    // avoid initialising JFR until called
-    isStarted = true;
-  }
+    @Override
+    public void onStart() {
+        // avoid initialising JFR until called
+        isStarted = true;
+    }
 
-  @Override
-  public Stateful newScopeState(ProfilerContext profilerContext) {
-    if (!isTimelineEventsEnabled || !isStarted) {
-      return Stateful.DEFAULT;
+    @Override
+    public Stateful newScopeState(ProfilerContext profilerContext) {
+        if (!isTimelineEventsEnabled || !isStarted) {
+            return Stateful.DEFAULT;
+        }
+        return new TimelineEvent(
+                profilerContext.getRootSpanId(),
+                profilerContext.getSpanId(),
+                String.valueOf(profilerContext.getOperationName()));
     }
-    return new TimelineEvent(
-        profilerContext.getRootSpanId(),
-        profilerContext.getSpanId(),
-        String.valueOf(profilerContext.getOperationName()));
-  }
 
-  @Override
-  public String name() {
-    return "jfr";
-  }
+    @Override
+    public String name() {
+        return "jfr";
+    }
 
-  @Override
-  public void onRootSpanFinished(AgentSpan rootSpan, EndpointTracker tracker) {
-    if (isEndpointCollectionEnabled && tracker != null) {
-      tracker.endpointWritten(rootSpan);
+    @Override
+    public void onRootSpanFinished(AgentSpan rootSpan, EndpointTracker tracker) {
+        if (isEndpointCollectionEnabled && tracker != null) {
+            tracker.endpointWritten(rootSpan);
+        }
     }
-  }
 
-  @Override
-  public EndpointTracker onRootSpanStarted(AgentSpan rootSpan) {
-    return isEndpointCollectionEnabled
-        ? new EndpointEvent(rootSpan.getSpanId())
-        : EndpointTracker.NO_OP;
-  }
+    @Override
+    public EndpointTracker onRootSpanStarted(AgentSpan rootSpan) {
+        return isEndpointCollectionEnabled ? new EndpointEvent(rootSpan.getSpanId()) : EndpointTracker.NO_OP;
+    }
 
-  @Override
-  public Timing start(TimerType type) {
-    if (isQueueTimeEnabled && type == TimerType.QUEUEING) {
-      return new QueueTimeEvent();
+    @Override
+    public Timing start(TimerType type) {
+        if (isQueueTimeEnabled && type == TimerType.QUEUEING) {
+            return new QueueTimeEvent();
+        }
+        return Timing.NoOp.INSTANCE;
     }
-    return Timing.NoOp.INSTANCE;
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/JfrProfilerSettings.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/JfrProfilerSettings.java
index f74d626909a..6e61ed75713 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/JfrProfilerSettings.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/JfrProfilerSettings.java
@@ -10,88 +10,75 @@
 
 /** Capture the profiler config first and allow emitting the setting events per each recording. */
 final class JfrProfilerSettings extends ProfilerSettingsSupport {
-  private static final String JFP_TEMPLATE_OVERRIDE_PROFILING_KEY =
-      "JFP Template Override Profiling";
-  private static final String EXCEPTION_SAMPLE_RATE_LIMIT_KEY = "Exception Sample Rate Limit";
-  private static final String EXCEPTION_HISTO_REPORT_LIMIT_KEY = "Exception Histo Report Limit";
-  private static final String EXCEPTION_HISTO_SIZE_LIMIT_KEY = "Exception Histo Size Limit";
-  private final String jfrImplementation;
-  private final boolean isDdprofActive;
+    private static final String JFP_TEMPLATE_OVERRIDE_PROFILING_KEY = "JFP Template Override Profiling";
+    private static final String EXCEPTION_SAMPLE_RATE_LIMIT_KEY = "Exception Sample Rate Limit";
+    private static final String EXCEPTION_HISTO_REPORT_LIMIT_KEY = "Exception Histo Report Limit";
+    private static final String EXCEPTION_HISTO_SIZE_LIMIT_KEY = "Exception Histo Size Limit";
+    private final String jfrImplementation;
+    private final boolean isDdprofActive;
 
-  public JfrProfilerSettings(
-      ConfigProvider configProvider,
-      ControllerContext.Snapshot context,
-      boolean hasJfrStackDepthApplied) {
-    super(configProvider, context.getDatadogProfilerUnavailableReason(), hasJfrStackDepthApplied);
-    this.jfrImplementation =
-        Platform.isNativeImage()
-            ? "native-image"
-            : (JavaVirtualMachine.isOracleJDK8() ? "oracle" : "openjdk");
-    this.isDdprofActive = context.isDatadogProfilerEnabled();
-  }
+    public JfrProfilerSettings(
+            ConfigProvider configProvider, ControllerContext.Snapshot context, boolean hasJfrStackDepthApplied) {
+        super(configProvider, context.getDatadogProfilerUnavailableReason(), hasJfrStackDepthApplied);
+        this.jfrImplementation =
+                Platform.isNativeImage() ? "native-image" : (JavaVirtualMachine.isOracleJDK8() ? "oracle" : "openjdk");
+        this.isDdprofActive = context.isDatadogProfilerEnabled();
+    }
 
-  public void publish() {
-    if (new ProfilerSettingEvent(null, null, null).isEnabled()) {
-      new ProfilerSettingEvent(VERSION_KEY, VersionInfo.VERSION).commit();
-      new ProfilerSettingEvent(UPLOAD_PERIOD_KEY, String.valueOf(uploadPeriod), "seconds").commit();
-      new ProfilerSettingEvent(UPLOAD_TIMEOUT_KEY, String.valueOf(uploadTimeout), "seconds")
-          .commit();
-      new ProfilerSettingEvent(UPLOAD_COMPRESSION_KEY, uploadCompression).commit();
-      new ProfilerSettingEvent(ALLOCATION_PROFILING_KEY, String.valueOf(allocationProfilingEnabled))
-          .commit();
-      new ProfilerSettingEvent(HEAP_PROFILING_KEY, String.valueOf(heapProfilingEnabled)).commit();
-      new ProfilerSettingEvent(FORCE_START_FIRST_KEY, String.valueOf(startForceFirst)).commit();
-      new ProfilerSettingEvent(
-              JFP_TEMPLATE_OVERRIDE_PROFILING_KEY, String.valueOf(templateOverride))
-          .commit();
-      new ProfilerSettingEvent(
-              EXCEPTION_SAMPLE_RATE_LIMIT_KEY,
-              String.valueOf(exceptionSampleLimit),
-              "exceptions/second")
-          .commit();
-      new ProfilerSettingEvent(
-              EXCEPTION_HISTO_REPORT_LIMIT_KEY, String.valueOf(exceptionHistogramTopItems))
-          .commit();
-      new ProfilerSettingEvent(
-              EXCEPTION_HISTO_SIZE_LIMIT_KEY, String.valueOf(exceptionHistogramMaxSize))
-          .commit();
-      new ProfilerSettingEvent(HOTSPOTS_KEY, String.valueOf(hotspotsEnabled)).commit();
-      new ProfilerSettingEvent(ENDPOINTS_KEY, String.valueOf(endpointsEnabled)).commit();
-      new ProfilerSettingEvent(AUXILIARY_PROFILER_KEY, auxiliaryProfiler).commit();
-      new ProfilerSettingEvent(PERF_EVENTS_PARANOID_KEY, perfEventsParanoid).commit();
-      new ProfilerSettingEvent(NATIVE_STACKS_KEY, String.valueOf(hasNativeStacks)).commit();
-      new ProfilerSettingEvent(JFR_IMPLEMENTATION_KEY, jfrImplementation).commit();
-      new ProfilerSettingEvent(
-              "JFR " + STACK_DEPTH_KEY,
-              String.valueOf(hasJfrStackDepthApplied ? requestedStackDepth : jfrStackDepth))
-          .commit();
-      if (isDdprofActive) {
-        // emit this setting only if datadog profiler is also active
-        new ProfilerSettingEvent(
-                "ddprof " + STACK_DEPTH_KEY,
-                String.valueOf(hasJfrStackDepthApplied ? requestedStackDepth : jfrStackDepth))
-            .commit();
-      }
-      new ProfilerSettingEvent(SELINUX_STATUS_KEY, seLinuxStatus).commit();
-      if (ddprofUnavailableReason != null) {
-        new ProfilerSettingEvent(DDPROF_UNAVAILABLE_REASON_KEY, ddprofUnavailableReason).commit();
-      }
-      if (serviceInstrumentationType != null) {
-        new ProfilerSettingEvent(SERVICE_INSTRUMENTATION_TYPE, serviceInstrumentationType).commit();
-      }
-      if (serviceInjection != null) {
-        new ProfilerSettingEvent(SERVICE_INJECTION, serviceInjection).commit();
-      }
-      new ProfilerSettingEvent(PROFILER_ACTIVATION, profilerActivationSetting.enablement.getAlias())
-          .commit();
-      new ProfilerSettingEvent(
-              SSI_MECHANISM, profilerActivationSetting.ssiMechanism.name().toLowerCase())
-          .commit();
+    public void publish() {
+        if (new ProfilerSettingEvent(null, null, null).isEnabled()) {
+            new ProfilerSettingEvent(VERSION_KEY, VersionInfo.VERSION).commit();
+            new ProfilerSettingEvent(UPLOAD_PERIOD_KEY, String.valueOf(uploadPeriod), "seconds").commit();
+            new ProfilerSettingEvent(UPLOAD_TIMEOUT_KEY, String.valueOf(uploadTimeout), "seconds").commit();
+            new ProfilerSettingEvent(UPLOAD_COMPRESSION_KEY, uploadCompression).commit();
+            new ProfilerSettingEvent(ALLOCATION_PROFILING_KEY, String.valueOf(allocationProfilingEnabled)).commit();
+            new ProfilerSettingEvent(HEAP_PROFILING_KEY, String.valueOf(heapProfilingEnabled)).commit();
+            new ProfilerSettingEvent(FORCE_START_FIRST_KEY, String.valueOf(startForceFirst)).commit();
+            new ProfilerSettingEvent(JFP_TEMPLATE_OVERRIDE_PROFILING_KEY, String.valueOf(templateOverride)).commit();
+            new ProfilerSettingEvent(
+                            EXCEPTION_SAMPLE_RATE_LIMIT_KEY, String.valueOf(exceptionSampleLimit), "exceptions/second")
+                    .commit();
+            new ProfilerSettingEvent(EXCEPTION_HISTO_REPORT_LIMIT_KEY, String.valueOf(exceptionHistogramTopItems))
+                    .commit();
+            new ProfilerSettingEvent(EXCEPTION_HISTO_SIZE_LIMIT_KEY, String.valueOf(exceptionHistogramMaxSize))
+                    .commit();
+            new ProfilerSettingEvent(HOTSPOTS_KEY, String.valueOf(hotspotsEnabled)).commit();
+            new ProfilerSettingEvent(ENDPOINTS_KEY, String.valueOf(endpointsEnabled)).commit();
+            new ProfilerSettingEvent(AUXILIARY_PROFILER_KEY, auxiliaryProfiler).commit();
+            new ProfilerSettingEvent(PERF_EVENTS_PARANOID_KEY, perfEventsParanoid).commit();
+            new ProfilerSettingEvent(NATIVE_STACKS_KEY, String.valueOf(hasNativeStacks)).commit();
+            new ProfilerSettingEvent(JFR_IMPLEMENTATION_KEY, jfrImplementation).commit();
+            new ProfilerSettingEvent(
+                            "JFR " + STACK_DEPTH_KEY,
+                            String.valueOf(hasJfrStackDepthApplied ? requestedStackDepth : jfrStackDepth))
+                    .commit();
+            if (isDdprofActive) {
+                // emit this setting only if datadog profiler is also active
+                new ProfilerSettingEvent(
+                                "ddprof " + STACK_DEPTH_KEY,
+                                String.valueOf(hasJfrStackDepthApplied ? requestedStackDepth : jfrStackDepth))
+                        .commit();
+            }
+            new ProfilerSettingEvent(SELINUX_STATUS_KEY, seLinuxStatus).commit();
+            if (ddprofUnavailableReason != null) {
+                new ProfilerSettingEvent(DDPROF_UNAVAILABLE_REASON_KEY, ddprofUnavailableReason).commit();
+            }
+            if (serviceInstrumentationType != null) {
+                new ProfilerSettingEvent(SERVICE_INSTRUMENTATION_TYPE, serviceInstrumentationType).commit();
+            }
+            if (serviceInjection != null) {
+                new ProfilerSettingEvent(SERVICE_INJECTION, serviceInjection).commit();
+            }
+            new ProfilerSettingEvent(PROFILER_ACTIVATION, profilerActivationSetting.enablement.getAlias()).commit();
+            new ProfilerSettingEvent(
+                            SSI_MECHANISM,
+                            profilerActivationSetting.ssiMechanism.name().toLowerCase())
+                    .commit();
+        }
     }
-  }
 
-  @Override
-  protected String profilerKind() {
-    return "jfr";
-  }
+    @Override
+    protected String profilerKind() {
+        return "jfr";
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkController.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkController.java
index 6f6bb01bef4..399749bf8f4 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkController.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkController.java
@@ -63,312 +63,291 @@
  * messier... ;)
  */
 public final class OpenJdkController implements Controller {
-  private static final Logger log = LoggerFactory.getLogger(OpenJdkController.class);
-
-  private static final String EXPLICITLY_DISABLED = "explicitly disabled by user";
-  private static final String EXPLICITLY_ENABLED = "explicitly enabled by user";
-  private static final String EXPENSIVE_ON_CURRENT_JVM =
-      "expensive on this version of the JVM (" + JavaVirtualMachine.getRuntimeVersion() + ")";
-  private static final String CPUTIME_SAMPLE_JDK25 = "Switching to CPUTimeSample on JDK 25+";
-
-  static final Duration RECORDING_MAX_AGE = Duration.ofMinutes(5);
-
-  private final ConfigProvider configProvider;
-  private final Map<String, String> recordingSettings;
-  private final boolean jfrStackDepthApplied;
-
-  public static Controller instance(ConfigProvider configProvider)
-      throws ConfigurationException, ClassNotFoundException {
-    return new OpenJdkController(configProvider);
-  }
-
-  /**
-   * Main constructor for OpenJDK profiling controller.
-   *
-   * <p>This has to be public because it is created via reflection
-   */
-  @SuppressForbidden
-  public OpenJdkController(final ConfigProvider configProvider)
-      throws ConfigurationException, ClassNotFoundException {
-    // configure the JFR stackdepth before we try to load any JFR classes
-    int requestedStackDepth = getConfiguredStackDepth(configProvider);
-    this.jfrStackDepthApplied = JFRAccess.instance().setStackDepth(requestedStackDepth);
-    String jfrRepositoryBase = getJfrRepositoryBase(configProvider);
-    JFRAccess.instance().setBaseLocation(jfrRepositoryBase);
-    // Make sure we can load JFR classes before declaring that we have successfully created
-    // factory and can use it.
-    Class.forName("jdk.jfr.Recording");
-    Class.forName("jdk.jfr.FlightRecorder");
-
-    this.configProvider = configProvider;
-
-    boolean ultraMinimal = configProvider.getBoolean(PROFILING_ULTRA_MINIMAL, false);
-
-    Map<String, String> recordingSettings;
-
-    try {
-      recordingSettings =
-          JfpUtils.readNamedJfpResource(
-              ultraMinimal ? JfpUtils.SAFEPOINTS_JFP : JfpUtils.DEFAULT_JFP);
-    } catch (final IOException e) {
-      throw new ConfigurationException(e);
-    }
-
-    // Toggle settings based on JDK version
-
-    if (!isOldObjectSampleAvailable()) {
-      disableEvent(recordingSettings, "jdk.OldObjectSample", EXPENSIVE_ON_CURRENT_JVM);
-    }
-
-    if (!isObjectAllocationSampleAvailable()) {
-      disableEvent(recordingSettings, "jdk.ObjectAllocationSample", EXPENSIVE_ON_CURRENT_JVM);
-    }
-
-    if (!isNativeMethodSampleAvailable()) {
-      disableEvent(recordingSettings, "jdk.NativeMethodSample", EXPENSIVE_ON_CURRENT_JVM);
-    }
-
-    if (!isJavaVersionAtLeast(17)) {
-      disableEvent(recordingSettings, "jdk.ClassLoaderStatistics", EXPENSIVE_ON_CURRENT_JVM);
-    }
-
-    if (!isFileWriteDurationCorrect()) {
-      disableEvent(recordingSettings, "jdk.FileWrite", EXPENSIVE_ON_CURRENT_JVM);
-    }
-
-    if (configProvider.getBoolean(
-        PROFILING_HEAP_HISTOGRAM_ENABLED, PROFILING_HEAP_HISTOGRAM_ENABLED_DEFAULT)) {
-      if (!isObjectCountParallelized()) {
-        log.warn(
-            "enabling Datadog heap histogram on JVM without an efficient implementation of the jdk.ObjectCount event. "
-                + "This may increase p99 latency. Consider upgrading to JDK 17.0.9+ or 21+ to reduce latency impact.");
-      }
-      String mode =
-          configProvider.getString(
-              PROFILING_HEAP_HISTOGRAM_MODE, PROFILING_HEAP_HISTOGRAM_MODE_DEFAULT);
-      if ("periodic".equalsIgnoreCase(mode)) {
-        enableEvent(recordingSettings, "jdk.ObjectCount", "user enabled histogram heap collection");
-      } else {
-        enableEvent(
-            recordingSettings, "jdk.ObjectCountAfterGC", "user enabled histogram heap collection");
-      }
-    }
-
-    if (configProvider.getBoolean(
-        PROFILING_QUEUEING_TIME_ENABLED, PROFILING_QUEUEING_TIME_ENABLED_DEFAULT)) {
-      long threshold =
-          configProvider.getLong(
-              PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS,
-              PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS_DEFAULT);
-      recordingSettings.put("datadog.QueueTime#threshold", threshold + " ms");
-    }
+    private static final Logger log = LoggerFactory.getLogger(OpenJdkController.class);
 
-    // Toggle settings from override file
+    private static final String EXPLICITLY_DISABLED = "explicitly disabled by user";
+    private static final String EXPLICITLY_ENABLED = "explicitly enabled by user";
+    private static final String EXPENSIVE_ON_CURRENT_JVM =
+            "expensive on this version of the JVM (" + JavaVirtualMachine.getRuntimeVersion() + ")";
+    private static final String CPUTIME_SAMPLE_JDK25 = "Switching to CPUTimeSample on JDK 25+";
 
-    try {
-      recordingSettings.putAll(
-          JfpUtils.readOverrideJfpResource(
-              configProvider.getString(ProfilingConfig.PROFILING_TEMPLATE_OVERRIDE_FILE)));
-    } catch (final IOException e) {
-      throw new ConfigurationException(e);
-    }
-
-    // switch to CPUTimeSample event on JDK 25 and Linux
-    if (JavaVirtualMachine.isJavaVersionAtLeast(25) && OperatingSystem.isLinux()) {
-      disableEvent(recordingSettings, "jdk.ExecutionSample", CPUTIME_SAMPLE_JDK25);
-      enableEvent(recordingSettings, "jdk.CPUTimeSample", CPUTIME_SAMPLE_JDK25);
-      enableEvent(recordingSettings, "jdk.CPUTimeSamplesLost", CPUTIME_SAMPLE_JDK25);
-    }
-
-    // Toggle settings from override args
-
-    String disabledEventsArgs = configProvider.getString(ProfilingConfig.PROFILING_DISABLED_EVENTS);
-    if (disabledEventsArgs != null && !disabledEventsArgs.isEmpty()) {
-      for (String disabledEvent : disabledEventsArgs.trim().split(",")) {
-        disableEvent(recordingSettings, disabledEvent, EXPLICITLY_DISABLED);
-      }
-    }
-
-    String enabledEventsArgs = configProvider.getString(ProfilingConfig.PROFILING_ENABLED_EVENTS);
-    if (enabledEventsArgs != null && !enabledEventsArgs.isEmpty()) {
-      for (String enabledEvent : enabledEventsArgs.trim().split(",")) {
-        enableEvent(recordingSettings, enabledEvent, EXPLICITLY_ENABLED);
-      }
-    }
+    static final Duration RECORDING_MAX_AGE = Duration.ofMinutes(5);
 
-    // Toggle settings from config
-
-    // Unified live heap (profiling.heap.enabled): when explicitly disabled, turn off
-    // OldObjectSample. When enabled (or default), if ddprof is likely handling live heap,
-    // proactively disable OldObjectSample to avoid double collection.
-    // disableOverriddenEvents() at recording start is the definitive safety net,
-    // but we disable here too so the settings map is consistent from the start.
-    if (!configProvider.getBoolean(
-        ProfilingConfig.PROFILING_HEAP_ENABLED, isLiveHeapProfilingSafe())) {
-      disableEvent(recordingSettings, "jdk.OldObjectSample", "live heap profiling is disabled");
-    } else {
-      // ddprof live heap requires Java 11+ (JVMTI Allocation Sampler)
-      // isJmethodIDSafe() matches ddprof's own default for liveheap: it only enables
-      // MEMLEAK mode by default on versions where jmethodID is safe.
-      boolean ddprofLikelyActive =
-          isJavaVersionAtLeast(11)
-              && configProvider.getBoolean(
-                  ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED, isJmethodIDSafe())
-              && configProvider.getBoolean(
-                  ProfilingConfig.PROFILING_DATADOG_PROFILER_ENABLED, true);
-      if (ddprofLikelyActive) {
-        disableEvent(
-            recordingSettings,
-            "jdk.OldObjectSample",
-            "ddprof live heap profiling is expected to handle live heap data");
-      } else if (isOldObjectSampleAvailable()) {
-        enableEvent(recordingSettings, "jdk.OldObjectSample", "heap profiling is enabled");
-      } else if (configProvider.getBoolean(ProfilingConfig.PROFILING_HEAP_ENABLED, false)) {
-        log.warn(
-            "Live heap profiling was explicitly requested but is not supported on this JVM version;"
-                + " no heap profiling data will be collected.");
-      }
-    }
+    private final ConfigProvider configProvider;
+    private final Map<String, String> recordingSettings;
+    private final boolean jfrStackDepthApplied;
 
-    if (configProvider.getBoolean(
-        ProfilingConfig.PROFILING_ALLOCATION_ENABLED, isObjectAllocationSampleAvailable())) {
-      // jdk.ObjectAllocationSample is available and enabled by default
-      if (!isObjectAllocationSampleAvailable()) {
-        log.debug(
-            "Enabling ObjectAllocationInNewTLAB and ObjectAllocationOutsideTLAB JFR events with the config.");
-        recordingSettings.put("jdk.ObjectAllocationInNewTLAB#enabled", "true");
-        recordingSettings.put("jdk.ObjectAllocationOutsideTLAB#enabled", "true");
-      }
-    } else {
-      // jdk.ObjectAllocationInNewTLAB and jdk.ObjectAllocationOutsideTLAB are disabled by default
-      if (isObjectAllocationSampleAvailable()) {
-        log.debug("Disabling ObjectAllocationSample JFR event with the config.");
-        recordingSettings.put("jdk.ObjectAllocationSample#enabled", "false");
-      }
+    public static Controller instance(ConfigProvider configProvider)
+            throws ConfigurationException, ClassNotFoundException {
+        return new OpenJdkController(configProvider);
     }
 
-    if (configProvider.getBoolean(
-        ProfilingConfig.PROFILING_SMAP_COLLECTION_ENABLED,
-        ProfilingConfig.PROFILING_SMAP_COLLECTION_ENABLED_DEFAULT)) {
-      enableEvent(
-          recordingSettings, "datadog.SmapEntry", "Smaps collection is enabled in the config");
-    } else {
-      disableEvent(
-          recordingSettings, "datadog.SmapEntry", "Smaps collection is disabled in the config");
-    }
-    if (configProvider.getBoolean(
-        ProfilingConfig.PROFILING_SMAP_AGGREGATION_ENABLED,
-        ProfilingConfig.PROFILING_SMAP_AGGREGATION_ENABLED_DEFAULT)) {
-      enableEvent(
-          recordingSettings,
-          "datadog.AggregatedSmapEntry",
-          "Aggregated smaps collection is enabled in the config");
-    } else {
-      disableEvent(
-          recordingSettings,
-          "datadog.AggregatedSmapEntry",
-          "Aggregated smaps collection is disabled in the config");
+    /**
+     * Main constructor for OpenJDK profiling controller.
+     *
+     * <p>This has to be public because it is created via reflection
+     */
+    @SuppressForbidden
+    public OpenJdkController(final ConfigProvider configProvider)
+            throws ConfigurationException, ClassNotFoundException {
+        // configure the JFR stackdepth before we try to load any JFR classes
+        int requestedStackDepth = getConfiguredStackDepth(configProvider);
+        this.jfrStackDepthApplied = JFRAccess.instance().setStackDepth(requestedStackDepth);
+        String jfrRepositoryBase = getJfrRepositoryBase(configProvider);
+        JFRAccess.instance().setBaseLocation(jfrRepositoryBase);
+        // Make sure we can load JFR classes before declaring that we have successfully created
+        // factory and can use it.
+        Class.forName("jdk.jfr.Recording");
+        Class.forName("jdk.jfr.FlightRecorder");
+
+        this.configProvider = configProvider;
+
+        boolean ultraMinimal = configProvider.getBoolean(PROFILING_ULTRA_MINIMAL, false);
+
+        Map<String, String> recordingSettings;
+
+        try {
+            recordingSettings =
+                    JfpUtils.readNamedJfpResource(ultraMinimal ? JfpUtils.SAFEPOINTS_JFP : JfpUtils.DEFAULT_JFP);
+        } catch (final IOException e) {
+            throw new ConfigurationException(e);
+        }
+
+        // Toggle settings based on JDK version
+
+        if (!isOldObjectSampleAvailable()) {
+            disableEvent(recordingSettings, "jdk.OldObjectSample", EXPENSIVE_ON_CURRENT_JVM);
+        }
+
+        if (!isObjectAllocationSampleAvailable()) {
+            disableEvent(recordingSettings, "jdk.ObjectAllocationSample", EXPENSIVE_ON_CURRENT_JVM);
+        }
+
+        if (!isNativeMethodSampleAvailable()) {
+            disableEvent(recordingSettings, "jdk.NativeMethodSample", EXPENSIVE_ON_CURRENT_JVM);
+        }
+
+        if (!isJavaVersionAtLeast(17)) {
+            disableEvent(recordingSettings, "jdk.ClassLoaderStatistics", EXPENSIVE_ON_CURRENT_JVM);
+        }
+
+        if (!isFileWriteDurationCorrect()) {
+            disableEvent(recordingSettings, "jdk.FileWrite", EXPENSIVE_ON_CURRENT_JVM);
+        }
+
+        if (configProvider.getBoolean(PROFILING_HEAP_HISTOGRAM_ENABLED, PROFILING_HEAP_HISTOGRAM_ENABLED_DEFAULT)) {
+            if (!isObjectCountParallelized()) {
+                log.warn(
+                        "enabling Datadog heap histogram on JVM without an efficient implementation of the jdk.ObjectCount event. "
+                                + "This may increase p99 latency. Consider upgrading to JDK 17.0.9+ or 21+ to reduce latency impact.");
+            }
+            String mode =
+                    configProvider.getString(PROFILING_HEAP_HISTOGRAM_MODE, PROFILING_HEAP_HISTOGRAM_MODE_DEFAULT);
+            if ("periodic".equalsIgnoreCase(mode)) {
+                enableEvent(recordingSettings, "jdk.ObjectCount", "user enabled histogram heap collection");
+            } else {
+                enableEvent(recordingSettings, "jdk.ObjectCountAfterGC", "user enabled histogram heap collection");
+            }
+        }
+
+        if (configProvider.getBoolean(PROFILING_QUEUEING_TIME_ENABLED, PROFILING_QUEUEING_TIME_ENABLED_DEFAULT)) {
+            long threshold = configProvider.getLong(
+                    PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS, PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS_DEFAULT);
+            recordingSettings.put("datadog.QueueTime#threshold", threshold + " ms");
+        }
+
+        // Toggle settings from override file
+
+        try {
+            recordingSettings.putAll(JfpUtils.readOverrideJfpResource(
+                    configProvider.getString(ProfilingConfig.PROFILING_TEMPLATE_OVERRIDE_FILE)));
+        } catch (final IOException e) {
+            throw new ConfigurationException(e);
+        }
+
+        // switch to CPUTimeSample event on JDK 25 and Linux
+        if (JavaVirtualMachine.isJavaVersionAtLeast(25) && OperatingSystem.isLinux()) {
+            disableEvent(recordingSettings, "jdk.ExecutionSample", CPUTIME_SAMPLE_JDK25);
+            enableEvent(recordingSettings, "jdk.CPUTimeSample", CPUTIME_SAMPLE_JDK25);
+            enableEvent(recordingSettings, "jdk.CPUTimeSamplesLost", CPUTIME_SAMPLE_JDK25);
+        }
+
+        // Toggle settings from override args
+
+        String disabledEventsArgs = configProvider.getString(ProfilingConfig.PROFILING_DISABLED_EVENTS);
+        if (disabledEventsArgs != null && !disabledEventsArgs.isEmpty()) {
+            for (String disabledEvent : disabledEventsArgs.trim().split(",")) {
+                disableEvent(recordingSettings, disabledEvent, EXPLICITLY_DISABLED);
+            }
+        }
+
+        String enabledEventsArgs = configProvider.getString(ProfilingConfig.PROFILING_ENABLED_EVENTS);
+        if (enabledEventsArgs != null && !enabledEventsArgs.isEmpty()) {
+            for (String enabledEvent : enabledEventsArgs.trim().split(",")) {
+                enableEvent(recordingSettings, enabledEvent, EXPLICITLY_ENABLED);
+            }
+        }
+
+        // Toggle settings from config
+
+        // Unified live heap (profiling.heap.enabled): when explicitly disabled, turn off
+        // OldObjectSample. When enabled (or default), if ddprof is likely handling live heap,
+        // proactively disable OldObjectSample to avoid double collection.
+        // disableOverriddenEvents() at recording start is the definitive safety net,
+        // but we disable here too so the settings map is consistent from the start.
+        if (!configProvider.getBoolean(ProfilingConfig.PROFILING_HEAP_ENABLED, isLiveHeapProfilingSafe())) {
+            disableEvent(recordingSettings, "jdk.OldObjectSample", "live heap profiling is disabled");
+        } else {
+            // ddprof live heap requires Java 11+ (JVMTI Allocation Sampler)
+            // isJmethodIDSafe() matches ddprof's own default for liveheap: it only enables
+            // MEMLEAK mode by default on versions where jmethodID is safe.
+            boolean ddprofLikelyActive = isJavaVersionAtLeast(11)
+                    && configProvider.getBoolean(
+                            ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED, isJmethodIDSafe())
+                    && configProvider.getBoolean(ProfilingConfig.PROFILING_DATADOG_PROFILER_ENABLED, true);
+            if (ddprofLikelyActive) {
+                disableEvent(
+                        recordingSettings,
+                        "jdk.OldObjectSample",
+                        "ddprof live heap profiling is expected to handle live heap data");
+            } else if (isOldObjectSampleAvailable()) {
+                enableEvent(recordingSettings, "jdk.OldObjectSample", "heap profiling is enabled");
+            } else if (configProvider.getBoolean(ProfilingConfig.PROFILING_HEAP_ENABLED, false)) {
+                log.warn("Live heap profiling was explicitly requested but is not supported on this JVM version;"
+                        + " no heap profiling data will be collected.");
+            }
+        }
+
+        if (configProvider.getBoolean(
+                ProfilingConfig.PROFILING_ALLOCATION_ENABLED, isObjectAllocationSampleAvailable())) {
+            // jdk.ObjectAllocationSample is available and enabled by default
+            if (!isObjectAllocationSampleAvailable()) {
+                log.debug(
+                        "Enabling ObjectAllocationInNewTLAB and ObjectAllocationOutsideTLAB JFR events with the config.");
+                recordingSettings.put("jdk.ObjectAllocationInNewTLAB#enabled", "true");
+                recordingSettings.put("jdk.ObjectAllocationOutsideTLAB#enabled", "true");
+            }
+        } else {
+            // jdk.ObjectAllocationInNewTLAB and jdk.ObjectAllocationOutsideTLAB are disabled by default
+            if (isObjectAllocationSampleAvailable()) {
+                log.debug("Disabling ObjectAllocationSample JFR event with the config.");
+                recordingSettings.put("jdk.ObjectAllocationSample#enabled", "false");
+            }
+        }
+
+        if (configProvider.getBoolean(
+                ProfilingConfig.PROFILING_SMAP_COLLECTION_ENABLED,
+                ProfilingConfig.PROFILING_SMAP_COLLECTION_ENABLED_DEFAULT)) {
+            enableEvent(recordingSettings, "datadog.SmapEntry", "Smaps collection is enabled in the config");
+        } else {
+            disableEvent(recordingSettings, "datadog.SmapEntry", "Smaps collection is disabled in the config");
+        }
+        if (configProvider.getBoolean(
+                ProfilingConfig.PROFILING_SMAP_AGGREGATION_ENABLED,
+                ProfilingConfig.PROFILING_SMAP_AGGREGATION_ENABLED_DEFAULT)) {
+            enableEvent(
+                    recordingSettings,
+                    "datadog.AggregatedSmapEntry",
+                    "Aggregated smaps collection is enabled in the config");
+        } else {
+            disableEvent(
+                    recordingSettings,
+                    "datadog.AggregatedSmapEntry",
+                    "Aggregated smaps collection is disabled in the config");
+        }
+
+        // Warn users for expensive events
+
+        if (!isOldObjectSampleAvailable() && isEventEnabled(recordingSettings, "jdk.OldObjectSample")) {
+            log.warn("JFR based live heap profiling is not supported for this JDK but is enabled.");
+        }
+
+        if (isEventEnabled(recordingSettings, "jdk.ObjectAllocationInNewTLAB")
+                || isEventEnabled(recordingSettings, "jdk.ObjectAllocationOutsideTLAB")) {
+            log.warn("Inexpensive allocation profiling is not supported for this JDK but is enabled.");
+        }
+
+        if (!isNativeMethodSampleAvailable() && isEventEnabled(recordingSettings, "jdk.NativeMethodSample")) {
+            log.warn("Inexpensive native profiling is not supported for this JDK but is enabled.");
+        }
+
+        this.recordingSettings = Collections.unmodifiableMap(recordingSettings);
+
+        if (isEventEnabled(this.recordingSettings, "datadog.ExceptionSample")) {
+            ExceptionProfiling.getInstance().start();
+        }
+
+        if (Config.get().isProfilingBackPressureSamplingEnabled()) {
+            BackpressureProfiling.getInstance().start();
+        }
+
+        // Register periodic events
+        AvailableProcessorCoresEvent.register();
+
+        log.debug("JFR Recording Settings: {}", recordingSettings);
     }
 
-    // Warn users for expensive events
-
-    if (!isOldObjectSampleAvailable() && isEventEnabled(recordingSettings, "jdk.OldObjectSample")) {
-      log.warn("JFR based live heap profiling is not supported for this JDK but is enabled.");
+    private static String getJfrRepositoryBase(ConfigProvider configProvider) {
+        String legacy = configProvider.getString(
+                ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE, ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE_DEFAULT);
+        if (!legacy.equals(ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE_DEFAULT)) {
+            log.warn(
+                    "The configuration key {} is deprecated. Please use {} instead.",
+                    ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE,
+                    ProfilingConfig.PROFILING_TEMP_DIR);
+        }
+        TempLocationManager tempLocationManager = TempLocationManager.getInstance();
+        Path repositoryPath = tempLocationManager.getTempDir().resolve("jfr");
+        if (!Files.exists(repositoryPath)) {
+            try {
+                Files.createDirectories(repositoryPath);
+            } catch (IOException e) {
+                log.error("Failed to create JFR repository directory: {}", repositoryPath, e);
+                throw new IllegalStateException("Failed to create JFR repository directory: " + repositoryPath, e);
+            }
+        }
+        return repositoryPath.toString();
     }
 
-    if (isEventEnabled(recordingSettings, "jdk.ObjectAllocationInNewTLAB")
-        || isEventEnabled(recordingSettings, "jdk.ObjectAllocationOutsideTLAB")) {
-      log.warn("Inexpensive allocation profiling is not supported for this JDK but is enabled.");
+    int getMaxSize() {
+        return ConfigProvider.getInstance()
+                .getInteger(
+                        ProfilingConfig.PROFILING_JFR_REPOSITORY_MAXSIZE,
+                        ProfilingConfig.PROFILING_JFR_REPOSITORY_MAXSIZE_DEFAULT);
     }
 
-    if (!isNativeMethodSampleAvailable()
-        && isEventEnabled(recordingSettings, "jdk.NativeMethodSample")) {
-      log.warn("Inexpensive native profiling is not supported for this JDK but is enabled.");
+    @Override
+    public OpenJdkOngoingRecording createRecording(final String recordingName, ControllerContext.Snapshot context) {
+        return new OpenJdkOngoingRecording(
+                recordingName,
+                recordingSettings,
+                getMaxSize(),
+                RECORDING_MAX_AGE,
+                configProvider,
+                context,
+                jfrStackDepthApplied);
     }
 
-    this.recordingSettings = Collections.unmodifiableMap(recordingSettings);
-
-    if (isEventEnabled(this.recordingSettings, "datadog.ExceptionSample")) {
-      ExceptionProfiling.getInstance().start();
+    private static void disableEvent(Map<String, String> recordingSettings, String event, String reason) {
+        String wasEnabled = recordingSettings.put(event + "#enabled", "false");
+        if (Boolean.parseBoolean(wasEnabled)) {
+            log.debug("Disabling JFR event {} because it is {}.", event, reason);
+        }
     }
 
-    if (Config.get().isProfilingBackPressureSamplingEnabled()) {
-      BackpressureProfiling.getInstance().start();
+    private static void enableEvent(Map<String, String> recordingSettings, String event, String reason) {
+        String wasEnabled = recordingSettings.put(event + "#enabled", "true");
+        if (!Boolean.parseBoolean(wasEnabled)) {
+            log.debug("Enabling JFR event {} because it is {}.", event, reason);
+        }
     }
 
-    // Register periodic events
-    AvailableProcessorCoresEvent.register();
-
-    log.debug("JFR Recording Settings: {}", recordingSettings);
-  }
-
-  private static String getJfrRepositoryBase(ConfigProvider configProvider) {
-    String legacy =
-        configProvider.getString(
-            ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE,
-            ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE_DEFAULT);
-    if (!legacy.equals(ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE_DEFAULT)) {
-      log.warn(
-          "The configuration key {} is deprecated. Please use {} instead.",
-          ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE,
-          ProfilingConfig.PROFILING_TEMP_DIR);
+    private static boolean isEventEnabled(Map<String, String> recordingSettings, String event) {
+        return Boolean.parseBoolean(recordingSettings.get(event + "#enabled"));
     }
-    TempLocationManager tempLocationManager = TempLocationManager.getInstance();
-    Path repositoryPath = tempLocationManager.getTempDir().resolve("jfr");
-    if (!Files.exists(repositoryPath)) {
-      try {
-        Files.createDirectories(repositoryPath);
-      } catch (IOException e) {
-        log.error("Failed to create JFR repository directory: {}", repositoryPath, e);
-        throw new IllegalStateException(
-            "Failed to create JFR repository directory: " + repositoryPath, e);
-      }
-    }
-    return repositoryPath.toString();
-  }
-
-  int getMaxSize() {
-    return ConfigProvider.getInstance()
-        .getInteger(
-            ProfilingConfig.PROFILING_JFR_REPOSITORY_MAXSIZE,
-            ProfilingConfig.PROFILING_JFR_REPOSITORY_MAXSIZE_DEFAULT);
-  }
-
-  @Override
-  public OpenJdkOngoingRecording createRecording(
-      final String recordingName, ControllerContext.Snapshot context) {
-    return new OpenJdkOngoingRecording(
-        recordingName,
-        recordingSettings,
-        getMaxSize(),
-        RECORDING_MAX_AGE,
-        configProvider,
-        context,
-        jfrStackDepthApplied);
-  }
-
-  private static void disableEvent(
-      Map<String, String> recordingSettings, String event, String reason) {
-    String wasEnabled = recordingSettings.put(event + "#enabled", "false");
-    if (Boolean.parseBoolean(wasEnabled)) {
-      log.debug("Disabling JFR event {} because it is {}.", event, reason);
-    }
-  }
 
-  private static void enableEvent(
-      Map<String, String> recordingSettings, String event, String reason) {
-    String wasEnabled = recordingSettings.put(event + "#enabled", "true");
-    if (!Boolean.parseBoolean(wasEnabled)) {
-      log.debug("Enabling JFR event {} because it is {}.", event, reason);
+    private int getConfiguredStackDepth(ConfigProvider configProvider) {
+        return configProvider.getInteger(
+                ProfilingConfig.PROFILING_STACKDEPTH, ProfilingConfig.PROFILING_STACKDEPTH_DEFAULT);
     }
-  }
-
-  private static boolean isEventEnabled(Map<String, String> recordingSettings, String event) {
-    return Boolean.parseBoolean(recordingSettings.get(event + "#enabled"));
-  }
-
-  private int getConfiguredStackDepth(ConfigProvider configProvider) {
-    return configProvider.getInteger(
-        ProfilingConfig.PROFILING_STACKDEPTH, ProfilingConfig.PROFILING_STACKDEPTH_DEFAULT);
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecording.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecording.java
index 4b9d71e3a26..94e21355b8c 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecording.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecording.java
@@ -18,148 +18,140 @@
 import org.slf4j.LoggerFactory;
 
 public class OpenJdkOngoingRecording implements OngoingRecording {
-  private static final Logger log = LoggerFactory.getLogger(OpenJdkOngoingRecording.class);
+    private static final Logger log = LoggerFactory.getLogger(OpenJdkOngoingRecording.class);
 
-  private final JfrProfilerSettings configMemento;
+    private final JfrProfilerSettings configMemento;
 
-  private final Recording recording;
+    private final Recording recording;
 
-  OpenJdkOngoingRecording(
-      String recordingName,
-      Map<String, String> settings,
-      int maxSize,
-      Duration maxAge,
-      ControllerContext.Snapshot context,
-      boolean jfrStackDepthSettingApplied) {
-    this(
-        recordingName,
-        settings,
-        maxSize,
-        maxAge,
-        ConfigProvider.getInstance(),
-        context,
-        jfrStackDepthSettingApplied);
-  }
-
-  OpenJdkOngoingRecording(
-      String recordingName,
-      Map<String, String> settings,
-      int maxSize,
-      Duration maxAge,
-      ConfigProvider configProvider,
-      ControllerContext.Snapshot context,
-      boolean jfrStackDepthSettingApplied) {
-    log.debug("Creating new recording: {}", recordingName);
-    recording = new Recording();
-    recording.setName(recordingName);
-    recording.setSettings(settings);
-    recording.setMaxSize(maxSize);
-    recording.setMaxAge(maxAge);
-    if (context.isDatadogProfilerEnabled()) {
-      disableOverriddenEvents(context);
+    OpenJdkOngoingRecording(
+            String recordingName,
+            Map<String, String> settings,
+            int maxSize,
+            Duration maxAge,
+            ControllerContext.Snapshot context,
+            boolean jfrStackDepthSettingApplied) {
+        this(
+                recordingName,
+                settings,
+                maxSize,
+                maxAge,
+                ConfigProvider.getInstance(),
+                context,
+                jfrStackDepthSettingApplied);
     }
-    recording.start();
-    log.debug("Recording {} started", recordingName);
-    this.configMemento =
-        new JfrProfilerSettings(configProvider, context, jfrStackDepthSettingApplied);
-  }
 
-  OpenJdkOngoingRecording(
-      Recording recording,
-      ControllerContext.Snapshot context,
-      boolean jfrStackDepthSettingApplied) {
-    this.recording = recording;
-    if (context.isDatadogProfilerEnabled()) {
-      disableOverriddenEvents(context);
+    OpenJdkOngoingRecording(
+            String recordingName,
+            Map<String, String> settings,
+            int maxSize,
+            Duration maxAge,
+            ConfigProvider configProvider,
+            ControllerContext.Snapshot context,
+            boolean jfrStackDepthSettingApplied) {
+        log.debug("Creating new recording: {}", recordingName);
+        recording = new Recording();
+        recording.setName(recordingName);
+        recording.setSettings(settings);
+        recording.setMaxSize(maxSize);
+        recording.setMaxAge(maxAge);
+        if (context.isDatadogProfilerEnabled()) {
+            disableOverriddenEvents(context);
+        }
+        recording.start();
+        log.debug("Recording {} started", recordingName);
+        this.configMemento = new JfrProfilerSettings(configProvider, context, jfrStackDepthSettingApplied);
     }
-    recording.start();
-    log.debug("Recording {} started", recording.getName());
-    this.configMemento =
-        new JfrProfilerSettings(ConfigProvider.getInstance(), context, jfrStackDepthSettingApplied);
-  }
 
-  private void disableOverriddenEvents(ControllerContext.Snapshot context) {
-    for (ProfilingMode mode : context.getDatadogProfilingModes()) {
-      switch (mode) {
-        case CPU:
-          {
-            // CPU execution profiling will take over these events, including
-            // jdk.CPUTimeSample (JEP 518, JDK 25+) which is enabled as a fallback
-            // when ddprof is unavailable
-            log.debug("Disabling built-in CPU profiling events");
-            recording.disable("jdk.ExecutionSample");
-            recording.disable("jdk.NativeMethodSample");
-            recording.disable("jdk.CPUTimeSample");
-            recording.disable("jdk.CPUTimeSamplesLost");
-            break;
-          }
-        case WALL:
-          {
-            // wall-time profiling will take over these events
-            log.debug("Disabling built-in wall-time tracing events");
-            recording.disable("jdk.JavaMonitorWait");
-            recording.disable("jdk.ThreadPark");
-            recording.disable("jdk.ThreadSleep");
-            break;
-          }
-        case ALLOCATION:
-          {
-            // allocation profiling will take over these events
-            log.debug("Disabling built-in allocation profiling events");
-            recording.disable("jdk.ObjectAllocationOutsideTLAB");
-            recording.disable("jdk.ObjectAllocationInNewTLAB");
-            recording.disable("jdk.ObjectAllocationSample");
-            break;
-          }
-        case MEMLEAK:
-          {
-            // memleak profiling will take over these events
-            log.debug("Disabling built-in memory leak profiling events");
-            recording.disable("jdk.OldObjectSample");
-            break;
-          }
-        default:
-          break;
-      }
+    OpenJdkOngoingRecording(
+            Recording recording, ControllerContext.Snapshot context, boolean jfrStackDepthSettingApplied) {
+        this.recording = recording;
+        if (context.isDatadogProfilerEnabled()) {
+            disableOverriddenEvents(context);
+        }
+        recording.start();
+        log.debug("Recording {} started", recording.getName());
+        this.configMemento =
+                new JfrProfilerSettings(ConfigProvider.getInstance(), context, jfrStackDepthSettingApplied);
     }
-  }
 
-  @Override
-  public RecordingData stop() {
-    if (recording.getState() != RecordingState.RUNNING) {
-      throw new IllegalStateException("Cannot stop recording that is not running");
+    private void disableOverriddenEvents(ControllerContext.Snapshot context) {
+        for (ProfilingMode mode : context.getDatadogProfilingModes()) {
+            switch (mode) {
+                case CPU: {
+                    // CPU execution profiling will take over these events, including
+                    // jdk.CPUTimeSample (JEP 518, JDK 25+) which is enabled as a fallback
+                    // when ddprof is unavailable
+                    log.debug("Disabling built-in CPU profiling events");
+                    recording.disable("jdk.ExecutionSample");
+                    recording.disable("jdk.NativeMethodSample");
+                    recording.disable("jdk.CPUTimeSample");
+                    recording.disable("jdk.CPUTimeSamplesLost");
+                    break;
+                }
+                case WALL: {
+                    // wall-time profiling will take over these events
+                    log.debug("Disabling built-in wall-time tracing events");
+                    recording.disable("jdk.JavaMonitorWait");
+                    recording.disable("jdk.ThreadPark");
+                    recording.disable("jdk.ThreadSleep");
+                    break;
+                }
+                case ALLOCATION: {
+                    // allocation profiling will take over these events
+                    log.debug("Disabling built-in allocation profiling events");
+                    recording.disable("jdk.ObjectAllocationOutsideTLAB");
+                    recording.disable("jdk.ObjectAllocationInNewTLAB");
+                    recording.disable("jdk.ObjectAllocationSample");
+                    break;
+                }
+                case MEMLEAK: {
+                    // memleak profiling will take over these events
+                    log.debug("Disabling built-in memory leak profiling events");
+                    recording.disable("jdk.OldObjectSample");
+                    break;
+                }
+                default:
+                    break;
+            }
+        }
     }
-    // dump the config to the current JFR recording
-    configMemento.publish();
 
-    recording.stop();
-    return new OpenJdkRecordingData(recording, ProfilingSnapshot.Kind.PERIODIC);
-  }
+    @Override
+    public RecordingData stop() {
+        if (recording.getState() != RecordingState.RUNNING) {
+            throw new IllegalStateException("Cannot stop recording that is not running");
+        }
+        // dump the config to the current JFR recording
+        configMemento.publish();
 
-  @VisibleForTesting
-  final RecordingData snapshot(@Nonnull final Instant start) {
-    return snapshot(start, ProfilingSnapshot.Kind.PERIODIC);
-  }
+        recording.stop();
+        return new OpenJdkRecordingData(recording, ProfilingSnapshot.Kind.PERIODIC);
+    }
 
-  @Override
-  public RecordingData snapshot(
-      @Nonnull final Instant start, @Nonnull ProfilingSnapshot.Kind kind) {
-    if (recording.getState() != RecordingState.RUNNING) {
-      throw new IllegalStateException("Cannot snapshot recording that is not running");
+    @VisibleForTesting
+    final RecordingData snapshot(@Nonnull final Instant start) {
+        return snapshot(start, ProfilingSnapshot.Kind.PERIODIC);
     }
 
-    // dump the config to the current JFR recording
-    configMemento.publish();
-    final Recording snapshot = FlightRecorder.getFlightRecorder().takeSnapshot();
-    snapshot.setName(recording.getName()); // Copy name from original recording
-    // Since we just requested a snapshot, the end time of the snapshot will be
-    // very close to now, so use that end time to minimize the risk of gaps or
-    // overlaps in the data.
-    return new OpenJdkRecordingData(snapshot, start, snapshot.getStopTime(), kind);
-  }
+    @Override
+    public RecordingData snapshot(@Nonnull final Instant start, @Nonnull ProfilingSnapshot.Kind kind) {
+        if (recording.getState() != RecordingState.RUNNING) {
+            throw new IllegalStateException("Cannot snapshot recording that is not running");
+        }
 
-  @Override
-  public void close() {
-    recording.close();
-  }
+        // dump the config to the current JFR recording
+        configMemento.publish();
+        final Recording snapshot = FlightRecorder.getFlightRecorder().takeSnapshot();
+        snapshot.setName(recording.getName()); // Copy name from original recording
+        // Since we just requested a snapshot, the end time of the snapshot will be
+        // very close to now, so use that end time to minimize the risk of gaps or
+        // overlaps in the data.
+        return new OpenJdkRecordingData(snapshot, start, snapshot.getStopTime(), kind);
+    }
+
+    @Override
+    public void close() {
+        recording.close();
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingData.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingData.java
index da022c226ed..1dc5ff13709 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingData.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingData.java
@@ -26,37 +26,36 @@
 /** Implementation for profiling recordings. */
 public class OpenJdkRecordingData extends RecordingData {
 
-  private final Recording recording;
-
-  OpenJdkRecordingData(final Recording recording, Kind kind) {
-    this(recording, recording.getStartTime(), recording.getStopTime(), kind);
-  }
-
-  OpenJdkRecordingData(
-      final Recording recording, final Instant start, final Instant end, Kind kind) {
-    super(start, end, kind);
-    this.recording = recording;
-  }
-
-  @Override
-  @Nonnull
-  public RecordingInputStream getStream() throws IOException {
-    return new RecordingInputStream(recording.getStream(start, end));
-  }
-
-  @Override
-  public void release() {
-    recording.close();
-  }
-
-  @Override
-  @Nonnull
-  public String getName() {
-    return recording.getName();
-  }
-
-  @VisibleForTesting
-  Recording getRecording() {
-    return recording;
-  }
+    private final Recording recording;
+
+    OpenJdkRecordingData(final Recording recording, Kind kind) {
+        this(recording, recording.getStartTime(), recording.getStopTime(), kind);
+    }
+
+    OpenJdkRecordingData(final Recording recording, final Instant start, final Instant end, Kind kind) {
+        super(start, end, kind);
+        this.recording = recording;
+    }
+
+    @Override
+    @Nonnull
+    public RecordingInputStream getStream() throws IOException {
+        return new RecordingInputStream(recording.getStream(start, end));
+    }
+
+    @Override
+    public void release() {
+        recording.close();
+    }
+
+    @Override
+    @Nonnull
+    public String getName() {
+        return recording.getName();
+    }
+
+    @VisibleForTesting
+    Recording getRecording() {
+        return recording;
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/AggregatedSmapEntryEvent.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/AggregatedSmapEntryEvent.java
index 151b0d09d70..feaad47cf88 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/AggregatedSmapEntryEvent.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/AggregatedSmapEntryEvent.java
@@ -17,26 +17,25 @@
 @Category("Datadog")
 @StackTrace(false)
 public class AggregatedSmapEntryEvent extends Event {
-  private static final EventType TYPE = EventType.getEventType(AggregatedSmapEntryEvent.class);
+    private static final EventType TYPE = EventType.getEventType(AggregatedSmapEntryEvent.class);
 
-  @Label("NMT Category")
-  private final String nmtCategory;
+    @Label("NMT Category")
+    private final String nmtCategory;
 
-  @Label("Resident Set Size")
-  @DataAmount
-  private final long rss;
+    @Label("Resident Set Size")
+    @DataAmount
+    private final long rss;
 
-  public AggregatedSmapEntryEvent(String nmtCategory, long rss) {
-    this.nmtCategory = nmtCategory;
-    this.rss = rss;
-  }
+    public AggregatedSmapEntryEvent(String nmtCategory, long rss) {
+        this.nmtCategory = nmtCategory;
+        this.rss = rss;
+    }
 
-  static void emit(List<SmapEntryEvent> events) {
-    if (TYPE.isEnabled()) {
-      events.stream()
-          .collect(Collectors.groupingBy(e -> e.nmtCategory, Collectors.summingLong(e -> e.rss)))
-          .forEach(
-              (category, totalRss) -> new AggregatedSmapEntryEvent(category, totalRss).commit());
+    static void emit(List<SmapEntryEvent> events) {
+        if (TYPE.isEnabled()) {
+            events.stream()
+                    .collect(Collectors.groupingBy(e -> e.nmtCategory, Collectors.summingLong(e -> e.rss)))
+                    .forEach((category, totalRss) -> new AggregatedSmapEntryEvent(category, totalRss).commit());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/AvailableProcessorCoresEvent.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/AvailableProcessorCoresEvent.java
index 7223243eb89..affc94f1a0f 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/AvailableProcessorCoresEvent.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/AvailableProcessorCoresEvent.java
@@ -17,25 +17,24 @@
 @Period("beginChunk")
 @Enabled
 public class AvailableProcessorCoresEvent extends Event {
-  private static final AtomicBoolean registered = new AtomicBoolean(false);
+    private static final AtomicBoolean registered = new AtomicBoolean(false);
 
-  @Label("Available Processor Cores")
-  @Description("The number of available processor cores as reported by the runtime")
-  private int availableProcessorCores;
+    @Label("Available Processor Cores")
+    @Description("The number of available processor cores as reported by the runtime")
+    private int availableProcessorCores;
 
-  private AvailableProcessorCoresEvent() {
-    this.availableProcessorCores = Runtime.getRuntime().availableProcessors();
-  }
+    private AvailableProcessorCoresEvent() {
+        this.availableProcessorCores = Runtime.getRuntime().availableProcessors();
+    }
 
-  public static void emit() {
-    new AvailableProcessorCoresEvent().commit();
-  }
+    public static void emit() {
+        new AvailableProcessorCoresEvent().commit();
+    }
 
-  public static void register() {
-    // Make sure the periodic event is registered only once
-    if (registered.compareAndSet(false, true)) {
-      JfrHelper.addPeriodicEvent(
-          AvailableProcessorCoresEvent.class, AvailableProcessorCoresEvent::emit);
+    public static void register() {
+        // Make sure the periodic event is registered only once
+        if (registered.compareAndSet(false, true)) {
+            JfrHelper.addPeriodicEvent(AvailableProcessorCoresEvent.class, AvailableProcessorCoresEvent::emit);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/DeadlockEvent.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/DeadlockEvent.java
index 2cee6b1afe9..ac61c2f483e 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/DeadlockEvent.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/DeadlockEvent.java
@@ -15,34 +15,34 @@
 @Period(value = "57 s")
 @Enabled
 public class DeadlockEvent extends Event {
-  private static final DeadlockEventFactory EVENT_FACTORY = new DeadlockEventFactory();
+    private static final DeadlockEventFactory EVENT_FACTORY = new DeadlockEventFactory();
 
-  @Label("Deadlock ID")
-  @Description("Referential index for data related to a particular deadlock")
-  private final long id;
+    @Label("Deadlock ID")
+    @Description("Referential index for data related to a particular deadlock")
+    private final long id;
 
-  @Label("Deadlocked Thread Count")
-  private final int threadCount;
+    @Label("Deadlocked Thread Count")
+    private final int threadCount;
 
-  DeadlockEvent() {
-    this.id = Long.MIN_VALUE;
-    this.threadCount = Integer.MIN_VALUE;
-  }
+    DeadlockEvent() {
+        this.id = Long.MIN_VALUE;
+        this.threadCount = Integer.MIN_VALUE;
+    }
 
-  public DeadlockEvent(long id, int threadCount) {
-    this.id = id;
-    this.threadCount = threadCount;
-  }
+    public DeadlockEvent(long id, int threadCount) {
+        this.id = id;
+        this.threadCount = threadCount;
+    }
 
-  public static void emit() {
-    EVENT_FACTORY.collectEvents().forEach(Event::commit);
-  }
+    public static void emit() {
+        EVENT_FACTORY.collectEvents().forEach(Event::commit);
+    }
 
-  long getId() {
-    return id;
-  }
+    long getId() {
+        return id;
+    }
 
-  int getThreadCount() {
-    return threadCount;
-  }
+    int getThreadCount() {
+        return threadCount;
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/DeadlockEventFactory.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/DeadlockEventFactory.java
index f6d0635c809..9d2a9b3e729 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/DeadlockEventFactory.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/DeadlockEventFactory.java
@@ -19,120 +19,112 @@
 import jdk.jfr.Event;
 
 public class DeadlockEventFactory {
-  private static final AtomicBoolean EVENTS_REGISTERED_FLAG = new AtomicBoolean();
+    private static final AtomicBoolean EVENTS_REGISTERED_FLAG = new AtomicBoolean();
 
-  private static final DeadlockEvent DEADLOCK_EVENT = new DeadlockEvent();
-  private static final DeadlockedThreadEvent DEADLOCKED_THREAD_EVENT = new DeadlockedThreadEvent();
+    private static final DeadlockEvent DEADLOCK_EVENT = new DeadlockEvent();
+    private static final DeadlockedThreadEvent DEADLOCKED_THREAD_EVENT = new DeadlockedThreadEvent();
 
-  private final ThreadMXBean threadMXBean;
-  private final AtomicLong deadlockCounter = new AtomicLong();
+    private final ThreadMXBean threadMXBean;
+    private final AtomicLong deadlockCounter = new AtomicLong();
 
-  public static void registerEvents() {
-    // prevent re-registration as that would cause JFR to throw an exception
-    if (EVENTS_REGISTERED_FLAG.compareAndSet(false, true)) {
-      JfrHelper.addPeriodicEvent(DeadlockEvent.class, DeadlockEvent::emit);
+    public static void registerEvents() {
+        // prevent re-registration as that would cause JFR to throw an exception
+        if (EVENTS_REGISTERED_FLAG.compareAndSet(false, true)) {
+            JfrHelper.addPeriodicEvent(DeadlockEvent.class, DeadlockEvent::emit);
+        }
     }
-  }
-
-  DeadlockEventFactory(ThreadMXBean threadMXBean) {
-    this.threadMXBean = threadMXBean;
-  }
 
-  DeadlockEventFactory() {
-    this(ManagementFactory.getThreadMXBean());
-  }
-
-  final List<? extends Event> collectEvents() {
-    if (!isDeadlockEventEnabled()) {
-      return Collections.emptyList();
+    DeadlockEventFactory(ThreadMXBean threadMXBean) {
+        this.threadMXBean = threadMXBean;
     }
 
-    long[] locked = threadMXBean.findDeadlockedThreads();
-    if (locked == null) {
-      return Collections.emptyList();
+    DeadlockEventFactory() {
+        this(ManagementFactory.getThreadMXBean());
     }
-    long id = deadlockCounter.getAndIncrement();
-
-    List<Event> events = new ArrayList<>();
-    DeadlockEvent event = new DeadlockEvent(id, locked.length);
-
-    events.add(event);
-    if (isDeadlockedThreadEventEnabled()) {
-      ThreadInfo[] lockedThreads = threadMXBean.getThreadInfo(locked, true, true);
-
-      Map<LockInfo, Set<StackTraceElement>> waitingFrames =
-          new TreeMap<>(Comparator.comparingLong(LockInfo::getIdentityHashCode));
-      for (ThreadInfo ti : lockedThreads) {
-        waitingFrames
-            .computeIfAbsent(ti.getLockInfo(), k -> new HashSet<>())
-            .add(ti.getStackTrace()[0]);
-      }
-
-      for (ThreadInfo ti : lockedThreads) {
-        processLockedMonitors(ti, id, waitingFrames, events);
-        processSynchronizables(ti, id, waitingFrames, events);
-      }
+
+    final List<? extends Event> collectEvents() {
+        if (!isDeadlockEventEnabled()) {
+            return Collections.emptyList();
+        }
+
+        long[] locked = threadMXBean.findDeadlockedThreads();
+        if (locked == null) {
+            return Collections.emptyList();
+        }
+        long id = deadlockCounter.getAndIncrement();
+
+        List<Event> events = new ArrayList<>();
+        DeadlockEvent event = new DeadlockEvent(id, locked.length);
+
+        events.add(event);
+        if (isDeadlockedThreadEventEnabled()) {
+            ThreadInfo[] lockedThreads = threadMXBean.getThreadInfo(locked, true, true);
+
+            Map<LockInfo, Set<StackTraceElement>> waitingFrames =
+                    new TreeMap<>(Comparator.comparingLong(LockInfo::getIdentityHashCode));
+            for (ThreadInfo ti : lockedThreads) {
+                waitingFrames
+                        .computeIfAbsent(ti.getLockInfo(), k -> new HashSet<>())
+                        .add(ti.getStackTrace()[0]);
+            }
+
+            for (ThreadInfo ti : lockedThreads) {
+                processLockedMonitors(ti, id, waitingFrames, events);
+                processSynchronizables(ti, id, waitingFrames, events);
+            }
+        }
+        return events;
     }
-    return events;
-  }
-
-  private void processSynchronizables(
-      ThreadInfo ti,
-      long id,
-      Map<LockInfo, Set<StackTraceElement>> waitingFrames,
-      List<Event> events) {
-    for (LockInfo li : ti.getLockedSynchronizers()) {
-      Set<StackTraceElement> waitingFramesSet = waitingFrames.get(li);
-      if (waitingFramesSet != null) {
-        for (StackTraceElement waitingFrame : waitingFramesSet) {
-          events.add(
-              new DeadlockedThreadEvent(
-                  id,
-                  ti.getThreadId(),
-                  ti.getThreadName(),
-                  ti.getLockOwnerId(),
-                  ti.getLockOwnerName(),
-                  ti.getLockName(),
-                  null,
-                  frameAsString(waitingFrame)));
+
+    private void processSynchronizables(
+            ThreadInfo ti, long id, Map<LockInfo, Set<StackTraceElement>> waitingFrames, List<Event> events) {
+        for (LockInfo li : ti.getLockedSynchronizers()) {
+            Set<StackTraceElement> waitingFramesSet = waitingFrames.get(li);
+            if (waitingFramesSet != null) {
+                for (StackTraceElement waitingFrame : waitingFramesSet) {
+                    events.add(new DeadlockedThreadEvent(
+                            id,
+                            ti.getThreadId(),
+                            ti.getThreadName(),
+                            ti.getLockOwnerId(),
+                            ti.getLockOwnerName(),
+                            ti.getLockName(),
+                            null,
+                            frameAsString(waitingFrame)));
+                }
+            }
         }
-      }
     }
-  }
-
-  private void processLockedMonitors(
-      ThreadInfo ti,
-      long id,
-      Map<LockInfo, Set<StackTraceElement>> waitingFrames,
-      List<Event> events) {
-    for (MonitorInfo mi : ti.getLockedMonitors()) {
-      Set<StackTraceElement> waitingFramesSet = waitingFrames.get(mi);
-      if (waitingFramesSet != null) {
-        for (StackTraceElement waitingFrame : waitingFramesSet) {
-          events.add(
-              new DeadlockedThreadEvent(
-                  id,
-                  ti.getThreadId(),
-                  ti.getThreadName(),
-                  ti.getLockOwnerId(),
-                  ti.getLockOwnerName(),
-                  ti.getLockName(),
-                  frameAsString(mi.getLockedStackFrame()),
-                  frameAsString(waitingFrame)));
+
+    private void processLockedMonitors(
+            ThreadInfo ti, long id, Map<LockInfo, Set<StackTraceElement>> waitingFrames, List<Event> events) {
+        for (MonitorInfo mi : ti.getLockedMonitors()) {
+            Set<StackTraceElement> waitingFramesSet = waitingFrames.get(mi);
+            if (waitingFramesSet != null) {
+                for (StackTraceElement waitingFrame : waitingFramesSet) {
+                    events.add(new DeadlockedThreadEvent(
+                            id,
+                            ti.getThreadId(),
+                            ti.getThreadName(),
+                            ti.getLockOwnerId(),
+                            ti.getLockOwnerName(),
+                            ti.getLockName(),
+                            frameAsString(mi.getLockedStackFrame()),
+                            frameAsString(waitingFrame)));
+                }
+            }
         }
-      }
     }
-  }
 
-  boolean isDeadlockEventEnabled() {
-    return DEADLOCK_EVENT.isEnabled() && DEADLOCK_EVENT.shouldCommit();
-  }
+    boolean isDeadlockEventEnabled() {
+        return DEADLOCK_EVENT.isEnabled() && DEADLOCK_EVENT.shouldCommit();
+    }
 
-  boolean isDeadlockedThreadEventEnabled() {
-    return DEADLOCKED_THREAD_EVENT.isEnabled() && DEADLOCKED_THREAD_EVENT.shouldCommit();
-  }
+    boolean isDeadlockedThreadEventEnabled() {
+        return DEADLOCKED_THREAD_EVENT.isEnabled() && DEADLOCKED_THREAD_EVENT.shouldCommit();
+    }
 
-  private static String frameAsString(StackTraceElement ste) {
-    return ste.getClassName() + "." + ste.getMethodName() + "#" + ste.getLineNumber();
-  }
+    private static String frameAsString(StackTraceElement ste) {
+        return ste.getClassName() + "." + ste.getMethodName() + "#" + ste.getLineNumber();
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/DeadlockedThreadEvent.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/DeadlockedThreadEvent.java
index 8b2f6fa7d42..c787e8bf519 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/DeadlockedThreadEvent.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/DeadlockedThreadEvent.java
@@ -13,82 +13,80 @@
 @Category("Datadog")
 @Enabled
 public class DeadlockedThreadEvent extends Event {
-  @Label("Deadlocked Thread ID")
-  private final long threadId;
-
-  @Label("Deadlocked Thread Name")
-  private final String threadName;
-
-  @Label("Lock name")
-  private final String lockName;
-
-  @Label("Lock Owner Thread Name")
-  private final String lockOwnerThreadName;
-
-  @Label("Lock Owner Thread ID")
-  private final long lockOwnerThreadId;
-
-  @Label("Locking Frame")
-  @Description(
-      "Textual representation of the frame locking the monitor. 'null' for java.util.concurrent locks.")
-  private final String lockingFrame;
-
-  @Label("Waiting Frame")
-  @Description(
-      "Textual representation of the frame awaiting to lock a monitor or java.util.concurrent lock.")
-  private final String waitingFrame;
-
-  @Label("Deadlock ID")
-  @Description("Referential index for data related to a particular deadlock")
-  private final long id;
-
-  DeadlockedThreadEvent() {
-    this.id = Long.MIN_VALUE;
-    this.threadId = Long.MIN_VALUE;
-    this.threadName = null;
-    this.lockOwnerThreadId = Long.MIN_VALUE;
-    this.lockOwnerThreadName = null;
-    this.lockName = null;
-    this.lockingFrame = null;
-    this.waitingFrame = null;
-  }
-
-  public DeadlockedThreadEvent(
-      long id,
-      long threadId,
-      String threadName,
-      long lockOwnerThreadId,
-      String lockOwnerThreadName,
-      String lockName,
-      String lockingFrame,
-      String waitingFrame) {
-    this.id = id;
-    this.threadId = threadId;
-    this.threadName = threadName;
-    this.lockOwnerThreadId = lockOwnerThreadId;
-    this.lockOwnerThreadName = lockOwnerThreadName;
-    this.lockName = lockName;
-    this.lockingFrame = lockingFrame;
-    this.waitingFrame = waitingFrame;
-  }
-
-  String getThreadName() {
-    return threadName;
-  }
-
-  String getLockOwnerThreadName() {
-    return lockOwnerThreadName;
-  }
-
-  String getLockingFrame() {
-    return lockingFrame;
-  }
-
-  String getWaitingFrame() {
-    return waitingFrame;
-  }
-
-  long getId() {
-    return id;
-  }
+    @Label("Deadlocked Thread ID")
+    private final long threadId;
+
+    @Label("Deadlocked Thread Name")
+    private final String threadName;
+
+    @Label("Lock name")
+    private final String lockName;
+
+    @Label("Lock Owner Thread Name")
+    private final String lockOwnerThreadName;
+
+    @Label("Lock Owner Thread ID")
+    private final long lockOwnerThreadId;
+
+    @Label("Locking Frame")
+    @Description("Textual representation of the frame locking the monitor. 'null' for java.util.concurrent locks.")
+    private final String lockingFrame;
+
+    @Label("Waiting Frame")
+    @Description("Textual representation of the frame awaiting to lock a monitor or java.util.concurrent lock.")
+    private final String waitingFrame;
+
+    @Label("Deadlock ID")
+    @Description("Referential index for data related to a particular deadlock")
+    private final long id;
+
+    DeadlockedThreadEvent() {
+        this.id = Long.MIN_VALUE;
+        this.threadId = Long.MIN_VALUE;
+        this.threadName = null;
+        this.lockOwnerThreadId = Long.MIN_VALUE;
+        this.lockOwnerThreadName = null;
+        this.lockName = null;
+        this.lockingFrame = null;
+        this.waitingFrame = null;
+    }
+
+    public DeadlockedThreadEvent(
+            long id,
+            long threadId,
+            String threadName,
+            long lockOwnerThreadId,
+            String lockOwnerThreadName,
+            String lockName,
+            String lockingFrame,
+            String waitingFrame) {
+        this.id = id;
+        this.threadId = threadId;
+        this.threadName = threadName;
+        this.lockOwnerThreadId = lockOwnerThreadId;
+        this.lockOwnerThreadName = lockOwnerThreadName;
+        this.lockName = lockName;
+        this.lockingFrame = lockingFrame;
+        this.waitingFrame = waitingFrame;
+    }
+
+    String getThreadName() {
+        return threadName;
+    }
+
+    String getLockOwnerThreadName() {
+        return lockOwnerThreadName;
+    }
+
+    String getLockingFrame() {
+        return lockingFrame;
+    }
+
+    String getWaitingFrame() {
+        return waitingFrame;
+    }
+
+    long getId() {
+        return id;
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/EndpointEvent.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/EndpointEvent.java
index d650e723d45..62dab53c53e 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/EndpointEvent.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/EndpointEvent.java
@@ -17,29 +17,29 @@
 @StackTrace(false)
 public class EndpointEvent extends Event implements EndpointTracker {
 
-  private static final long TEN_MILLISECONDS = TimeUnit.MILLISECONDS.toNanos(10);
+    private static final long TEN_MILLISECONDS = TimeUnit.MILLISECONDS.toNanos(10);
 
-  @Label("Endpoint")
-  private String endpoint = "unknown";
+    @Label("Endpoint")
+    private String endpoint = "unknown";
 
-  @Label("Operation")
-  private String operation = "unknown";
+    @Label("Operation")
+    private String operation = "unknown";
 
-  @Label("Local Root Span Id")
-  private final long localRootSpanId;
+    @Label("Local Root Span Id")
+    private final long localRootSpanId;
 
-  public EndpointEvent(long rootSpanId) {
-    this.localRootSpanId = rootSpanId;
-    begin();
-  }
+    public EndpointEvent(long rootSpanId) {
+        this.localRootSpanId = rootSpanId;
+        begin();
+    }
 
-  @Override
-  public void endpointWritten(AgentSpan span) {
-    if (span.getDurationNano() >= TEN_MILLISECONDS && shouldCommit()) {
-      end();
-      this.endpoint = span.getResourceName().toString();
-      this.operation = span.getOperationName().toString();
-      commit();
+    @Override
+    public void endpointWritten(AgentSpan span) {
+        if (span.getDurationNano() >= TEN_MILLISECONDS && shouldCommit()) {
+            end();
+            this.endpoint = span.getResourceName().toString();
+            this.operation = span.getOperationName().toString();
+            commit();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/ProfilerSettingEvent.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/ProfilerSettingEvent.java
index 9022f407bd4..748dd4dd338 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/ProfilerSettingEvent.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/ProfilerSettingEvent.java
@@ -13,22 +13,22 @@
 @Category("Datadog")
 @StackTrace(false)
 public class ProfilerSettingEvent extends Event {
-  @Label("Setting Name")
-  private final String name;
+    @Label("Setting Name")
+    private final String name;
 
-  @Label("Setting Value")
-  private final String value;
+    @Label("Setting Value")
+    private final String value;
 
-  @Label("Setting Unit")
-  private final String unit;
+    @Label("Setting Unit")
+    private final String unit;
 
-  public ProfilerSettingEvent(String name, String value) {
-    this(name, value, "");
-  }
+    public ProfilerSettingEvent(String name, String value) {
+        this(name, value, "");
+    }
 
-  public ProfilerSettingEvent(String name, String value, String unit) {
-    this.name = name;
-    this.value = value;
-    this.unit = unit;
-  }
+    public ProfilerSettingEvent(String name, String value, String unit) {
+        this.name = name;
+        this.value = value;
+        this.unit = unit;
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/QueueTimeEvent.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/QueueTimeEvent.java
index 54b4f09b55f..c81a66ebd83 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/QueueTimeEvent.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/QueueTimeEvent.java
@@ -18,66 +18,66 @@
 @StackTrace(false)
 public class QueueTimeEvent extends Event implements QueueTiming {
 
-  @Label("Local Root Span Id")
-  private long localRootSpanId;
+    @Label("Local Root Span Id")
+    private long localRootSpanId;
 
-  @Label("Span Id")
-  private long spanId;
+    @Label("Span Id")
+    private long spanId;
 
-  @Label("Origin")
-  private Thread origin;
+    @Label("Origin")
+    private Thread origin;
 
-  @Label("Task")
-  private Class<?> task;
+    @Label("Task")
+    private Class<?> task;
 
-  @Label("Scheduler")
-  private Class<?> scheduler;
+    @Label("Scheduler")
+    private Class<?> scheduler;
 
-  @Label("Queue")
-  private Class<?> queueType;
+    @Label("Queue")
+    private Class<?> queueType;
 
-  @Label("Queue Length on Entry")
-  private int queueLength;
+    @Label("Queue Length on Entry")
+    private int queueLength;
 
-  public QueueTimeEvent() {
-    this.origin = Thread.currentThread();
-    AgentSpan activeSpan = AgentTracer.activeSpan();
-    if (activeSpan != null) {
-      long spanId = activeSpan.getSpanId();
-      AgentSpan rootSpan = activeSpan.getLocalRootSpan();
-      this.localRootSpanId = rootSpan == null ? spanId : rootSpan.getSpanId();
-      this.spanId = spanId;
+    public QueueTimeEvent() {
+        this.origin = Thread.currentThread();
+        AgentSpan activeSpan = AgentTracer.activeSpan();
+        if (activeSpan != null) {
+            long spanId = activeSpan.getSpanId();
+            AgentSpan rootSpan = activeSpan.getLocalRootSpan();
+            this.localRootSpanId = rootSpan == null ? spanId : rootSpan.getSpanId();
+            this.spanId = spanId;
+        }
+        begin();
+    }
+
+    @Override
+    public void setTask(Object task) {
+        this.task = TaskWrapper.getUnwrappedType(task);
+    }
+
+    @Override
+    public void setScheduler(Class<?> scheduler) {
+        this.scheduler = scheduler;
+    }
+
+    @Override
+    public void setQueue(Class<?> queueType) {
+        this.queueType = queueType;
+    }
+
+    @Override
+    public void setQueueLength(int queueLength) {
+        this.queueLength = queueLength;
+    }
+
+    @Override
+    public void report() {
+        commit();
+    }
+
+    @Override
+    public boolean sample() {
+        return shouldCommit();
     }
-    begin();
-  }
-
-  @Override
-  public void setTask(Object task) {
-    this.task = TaskWrapper.getUnwrappedType(task);
-  }
-
-  @Override
-  public void setScheduler(Class<?> scheduler) {
-    this.scheduler = scheduler;
-  }
-
-  @Override
-  public void setQueue(Class<?> queueType) {
-    this.queueType = queueType;
-  }
-
-  @Override
-  public void setQueueLength(int queueLength) {
-    this.queueLength = queueLength;
-  }
-
-  @Override
-  public void report() {
-    commit();
-  }
-
-  @Override
-  public boolean sample() {
-    return shouldCommit();
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SimpleParser.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SimpleParser.java
index 10f0bb8167d..2e360f1c158 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SimpleParser.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SimpleParser.java
@@ -8,84 +8,84 @@
  * The implementation is minimalistic with the accent on reducing the number of allocations.
  */
 final class SimpleParser {
-  private final String line;
+    private final String line;
 
-  private int pos;
+    private int pos;
 
-  public SimpleParser(String line) {
-    this.line = line;
-    this.pos = 0;
-  }
-
-  void skipToNextValue(boolean acceptDash) {
-    int limit = line.length();
-    while (pos < limit && isDelimiter(line.charAt(pos), acceptDash)) {
-      pos++;
+    public SimpleParser(String line) {
+        this.line = line;
+        this.pos = 0;
     }
-  }
 
-  void skipValue(boolean acceptDash) {
-    int limit = line.length();
-    char c = 0;
-    while (pos < limit && !isDelimiter(line.charAt(pos), acceptDash)) {
-      pos++;
+    void skipToNextValue(boolean acceptDash) {
+        int limit = line.length();
+        while (pos < limit && isDelimiter(line.charAt(pos), acceptDash)) {
+            pos++;
+        }
     }
-  }
 
-  long nextLongValue(int base) {
-    if (base != 10 && base != 16) {
-      throw new UnsupportedOperationException("Unsupported base: " + base);
-    }
-    int limit = line.length();
-    skipToNextValue(true);
-    if (pos == limit) {
-      pos = -1;
-      return -1;
-    }
-    long val = 0;
-    char c = 0;
-    while (pos < limit && !isDelimiter(c = line.charAt(pos), true)) {
-      if (c < '0' || c > '9') {
-        if (base == 10 || (c < 'a' || c > 'f')) {
-          skipValue(true);
-          return -1;
+    void skipValue(boolean acceptDash) {
+        int limit = line.length();
+        char c = 0;
+        while (pos < limit && !isDelimiter(line.charAt(pos), acceptDash)) {
+            pos++;
         }
-      }
-      int digit = c >= 'a' ? 10 + (c - 'a') : (c - '0');
-      val = val * base + digit;
-      pos++;
     }
-    return val;
-  }
 
-  String nextStringValue() {
-    int limit = line.length();
-    skipToNextValue(false);
-    if (pos == limit) {
-      pos = -1;
-      return null;
+    long nextLongValue(int base) {
+        if (base != 10 && base != 16) {
+            throw new UnsupportedOperationException("Unsupported base: " + base);
+        }
+        int limit = line.length();
+        skipToNextValue(true);
+        if (pos == limit) {
+            pos = -1;
+            return -1;
+        }
+        long val = 0;
+        char c = 0;
+        while (pos < limit && !isDelimiter(c = line.charAt(pos), true)) {
+            if (c < '0' || c > '9') {
+                if (base == 10 || (c < 'a' || c > 'f')) {
+                    skipValue(true);
+                    return -1;
+                }
+            }
+            int digit = c >= 'a' ? 10 + (c - 'a') : (c - '0');
+            val = val * base + digit;
+            pos++;
+        }
+        return val;
     }
-    long val = 0;
-    StringBuilder sb = new StringBuilder();
-    char c = 0;
-    while (pos < limit && !isDelimiter(c = line.charAt(pos), false)) {
-      sb.append(c);
-      pos++;
+
+    String nextStringValue() {
+        int limit = line.length();
+        skipToNextValue(false);
+        if (pos == limit) {
+            pos = -1;
+            return null;
+        }
+        long val = 0;
+        StringBuilder sb = new StringBuilder();
+        char c = 0;
+        while (pos < limit && !isDelimiter(c = line.charAt(pos), false)) {
+            sb.append(c);
+            pos++;
+        }
+        return sb.toString();
     }
-    return sb.toString();
-  }
 
-  String slurpStringValue() {
-    int limit = line.length();
-    skipToNextValue(false);
-    if (pos == limit) {
-      pos = -1;
-      return null;
+    String slurpStringValue() {
+        int limit = line.length();
+        skipToNextValue(false);
+        if (pos == limit) {
+            pos = -1;
+            return null;
+        }
+        return line.substring(pos).trim();
     }
-    return line.substring(pos).trim();
-  }
 
-  private static boolean isDelimiter(char c, boolean acceptDash) {
-    return c == ' ' || (acceptDash && c == '-');
-  }
+    private static boolean isDelimiter(char c, boolean acceptDash) {
+        return c == ' ' || (acceptDash && c == '-');
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryCache.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryCache.java
index b890904a461..81a5d1eb18e 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryCache.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryCache.java
@@ -24,295 +24,294 @@
 import org.slf4j.LoggerFactory;
 
 final class SmapEntryCache {
-  static class AnnotatedRegion {
-    final long startAddress;
-    final String description;
+    static class AnnotatedRegion {
+        final long startAddress;
+        final String description;
 
-    AnnotatedRegion(long startAddress, String description) {
-      this.startAddress = startAddress;
-      this.description = description;
+        AnnotatedRegion(long startAddress, String description) {
+            this.startAddress = startAddress;
+            this.description = description;
+        }
     }
-  }
 
-  private static final Logger log = LoggerFactory.getLogger(SmapEntryCache.class);
+    private static final Logger log = LoggerFactory.getLogger(SmapEntryCache.class);
 
-  private static final long VSYSCALL_START_ADDRESS = 0xffffffffff600000L;
-  private static final String VSYSCALL_START_ADDRESS_STR = Long.toHexString(VSYSCALL_START_ADDRESS);
-  private static final Path SMAPS_PATH = Paths.get("/proc/self/smaps");
+    private static final long VSYSCALL_START_ADDRESS = 0xffffffffff600000L;
+    private static final String VSYSCALL_START_ADDRESS_STR = Long.toHexString(VSYSCALL_START_ADDRESS);
+    private static final Path SMAPS_PATH = Paths.get("/proc/self/smaps");
 
-  private final Object[] events = new Object[] {new ArrayList<>(), new ArrayList<>()};
+    private final Object[] events = new Object[] {new ArrayList<>(), new ArrayList<>()};
 
-  private volatile long lastTimestamp = 0L;
-  private volatile int index = 0;
-  private static final AtomicLongFieldUpdater<SmapEntryCache> UPDATER =
-      AtomicLongFieldUpdater.newUpdater(SmapEntryCache.class, "lastTimestamp");
-  private static final AtomicIntegerFieldUpdater<SmapEntryCache> INDEX_UPDATER =
-      AtomicIntegerFieldUpdater.newUpdater(SmapEntryCache.class, "index");
+    private volatile long lastTimestamp = 0L;
+    private volatile int index = 0;
+    private static final AtomicLongFieldUpdater<SmapEntryCache> UPDATER =
+            AtomicLongFieldUpdater.newUpdater(SmapEntryCache.class, "lastTimestamp");
+    private static final AtomicIntegerFieldUpdater<SmapEntryCache> INDEX_UPDATER =
+            AtomicIntegerFieldUpdater.newUpdater(SmapEntryCache.class, "index");
 
-  private final long ttl;
-  private final Path smapsPath;
+    private final long ttl;
+    private final Path smapsPath;
 
-  SmapEntryCache(Duration ttl) {
-    this(ttl, SMAPS_PATH);
-  }
+    SmapEntryCache(Duration ttl) {
+        this(ttl, SMAPS_PATH);
+    }
 
-  SmapEntryCache(Duration ttl, Path smapsPath) {
-    this.ttl = ttl.toNanos();
-    this.smapsPath = smapsPath;
-  }
+    SmapEntryCache(Duration ttl, Path smapsPath) {
+        this.ttl = ttl.toNanos();
+        this.smapsPath = smapsPath;
+    }
 
-  @VisibleForTesting
-  void invalidate() {
-    UPDATER.getAndSet(this, System.nanoTime() - (2 * ttl));
-  }
+    @VisibleForTesting
+    void invalidate() {
+        UPDATER.getAndSet(this, System.nanoTime() - (2 * ttl));
+    }
 
-  @SuppressWarnings("unchecked")
-  public List<SmapEntryEvent> getEvents() {
-    long prevTimestamp = lastTimestamp;
-    long thisTimestamp = System.nanoTime();
-    if (thisTimestamp - prevTimestamp > ttl) {
-      if (UPDATER.compareAndSet(this, prevTimestamp, thisTimestamp)) {
-        int currentIdx = INDEX_UPDATER.updateAndGet(this, x -> (x + 1) % 2);
-        List<SmapEntryEvent> eventList = (List<SmapEntryEvent>) events[currentIdx];
-        eventList.clear();
-        collectEvents(eventList);
-        return eventList;
-      }
+    @SuppressWarnings("unchecked")
+    public List<SmapEntryEvent> getEvents() {
+        long prevTimestamp = lastTimestamp;
+        long thisTimestamp = System.nanoTime();
+        if (thisTimestamp - prevTimestamp > ttl) {
+            if (UPDATER.compareAndSet(this, prevTimestamp, thisTimestamp)) {
+                int currentIdx = INDEX_UPDATER.updateAndGet(this, x -> (x + 1) % 2);
+                List<SmapEntryEvent> eventList = (List<SmapEntryEvent>) events[currentIdx];
+                eventList.clear();
+                collectEvents(eventList);
+                return eventList;
+            }
+        }
+        return (List<SmapEntryEvent>) events[index];
     }
-    return (List<SmapEntryEvent>) events[index];
-  }
 
-  @VisibleForTesting
-  static AnnotatedRegion fromAnnotatedEntry(String line, int javaVersion) {
-    boolean isRegion = line.startsWith("0x");
-    if (isRegion) {
-      int descIndex = javaVersion == 23 ? 5 : 8;
-      // Java 23
-      // 0x0000000420000000 - 0x000000043b000000   452984832  rw-p 00000000    JAVAHEAP
-      // ---
-      // Java 24-25
-      // 0x0000000448800000-0x000000049d800000   1426063360 rw-p   1425514496 0 4K com  JAVAHEAP
+    @VisibleForTesting
+    static AnnotatedRegion fromAnnotatedEntry(String line, int javaVersion) {
+        boolean isRegion = line.startsWith("0x");
+        if (isRegion) {
+            int descIndex = javaVersion == 23 ? 5 : 8;
+            // Java 23
+            // 0x0000000420000000 - 0x000000043b000000   452984832  rw-p 00000000    JAVAHEAP
+            // ---
+            // Java 24-25
+            // 0x0000000448800000-0x000000049d800000   1426063360 rw-p   1425514496 0 4K com  JAVAHEAP
 
-      // unify the format of address range for Java 23 and 24+
-      line = line.replace(" - ", "-");
-      boolean isVsyscall =
-          line.startsWith("0x" + VSYSCALL_START_ADDRESS_STR); // can't be parsed to Long safely(?)
-      long startAddress = -1;
-      int dashIndex = line.indexOf('-');
-      if (dashIndex > 0) {
-        startAddress = isVsyscall ? -0x1000 - 1 : Long.decode(line.substring(0, dashIndex));
-        String description = extractElement(line, descIndex, dashIndex + 1);
-        if (description == null || description.isEmpty() || "-".equals(description)) {
-          return new AnnotatedRegion(startAddress, "UNDEFINED");
-        } else if (description.startsWith("STACK")) {
-          return new AnnotatedRegion(startAddress, "STACK");
-        } else if (description.startsWith("[") || description.startsWith("/")) {
-          return new AnnotatedRegion(startAddress, "SYSTEM");
-        } else {
-          return new AnnotatedRegion(startAddress, description);
+            // unify the format of address range for Java 23 and 24+
+            line = line.replace(" - ", "-");
+            boolean isVsyscall =
+                    line.startsWith("0x" + VSYSCALL_START_ADDRESS_STR); // can't be parsed to Long safely(?)
+            long startAddress = -1;
+            int dashIndex = line.indexOf('-');
+            if (dashIndex > 0) {
+                startAddress = isVsyscall ? -0x1000 - 1 : Long.decode(line.substring(0, dashIndex));
+                String description = extractElement(line, descIndex, dashIndex + 1);
+                if (description == null || description.isEmpty() || "-".equals(description)) {
+                    return new AnnotatedRegion(startAddress, "UNDEFINED");
+                } else if (description.startsWith("STACK")) {
+                    return new AnnotatedRegion(startAddress, "STACK");
+                } else if (description.startsWith("[") || description.startsWith("/")) {
+                    return new AnnotatedRegion(startAddress, "SYSTEM");
+                } else {
+                    return new AnnotatedRegion(startAddress, description);
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
 
-  static String extractElement(String line, int index, int from) {
-    int wsCount = 0;
-    int wsIndex = line.indexOf(' ', from + 1);
-    int fromIndex = from;
-    int limit = line.length() - 1;
-    int tillIndex = line.length();
+    static String extractElement(String line, int index, int from) {
+        int wsCount = 0;
+        int wsIndex = line.indexOf(' ', from + 1);
+        int fromIndex = from;
+        int limit = line.length() - 1;
+        int tillIndex = line.length();
 
-    if (wsIndex > 0) {
-      wsCount++;
-      while (wsCount < index) {
-        while (line.charAt(++wsIndex) == ' ') {
-          if (wsIndex >= limit) {
-            return null;
-          }
+        if (wsIndex > 0) {
+            wsCount++;
+            while (wsCount < index) {
+                while (line.charAt(++wsIndex) == ' ') {
+                    if (wsIndex >= limit) {
+                        return null;
+                    }
+                }
+                fromIndex = wsIndex;
+                wsIndex = line.indexOf(' ', wsIndex + 1);
+                if (wsIndex <= 0) {
+                    tillIndex = line.length();
+                    break;
+                } else {
+                    tillIndex = wsIndex;
+                }
+                wsCount++;
+            }
         }
-        fromIndex = wsIndex;
-        wsIndex = line.indexOf(' ', wsIndex + 1);
-        if (wsIndex <= 0) {
-          tillIndex = line.length();
-          break;
-        } else {
-          tillIndex = wsIndex;
-        }
-        wsCount++;
-      }
+        return wsCount <= index ? line.substring(fromIndex, tillIndex).trim() : null;
     }
-    return wsCount <= index ? line.substring(fromIndex, tillIndex).trim() : null;
-  }
 
-  private static boolean isSmapHeader(String line) {
-    char firstChar = line.charAt(0);
-    return ((firstChar >= '0' && firstChar <= '9') || (firstChar >= 'a' && firstChar <= 'f'));
-  }
+    private static boolean isSmapHeader(String line) {
+        char firstChar = line.charAt(0);
+        return ((firstChar >= '0' && firstChar <= '9') || (firstChar >= 'a' && firstChar <= 'f'));
+    }
 
-  @VisibleForTesting
-  static void readEvents(BufferedReader br, List<SmapEntryEvent> events) throws IOException {
-    String line = br.readLine();
-    while (line != null) {
-      if (!isSmapHeader(line)) {
-        throw new IllegalStateException("Expected SMAP header line but got " + line);
-      }
-      SmapEntryEvent event = new SmapEntryEvent();
-      events.add(event);
-      SimpleParser parser = new SimpleParser(line);
-      // parse header
-      event.startAddress = parser.nextLongValue(16);
-      if (event.startAddress == VSYSCALL_START_ADDRESS) {
-        // vsyscall will always map to this region, but in case we ever do size calculations we
-        // make the start
-        // address 0x1000 less than the end address to keep relative sizing correct
-        event.startAddress = -0x1000 - 1;
-        event.endAddress = -1;
-        parser.skipToNextValue(false);
-      } else {
-        event.endAddress = parser.nextLongValue(16);
-      }
-      event.perms = parser.nextStringValue();
-      event.offset = parser.nextLongValue(16);
-      event.dev = parser.nextStringValue();
-      event.inodeID = (int) parser.nextLongValue(10);
-      String pathname = parser.nextStringValue();
-      event.pathname = pathname == null ? "" : pathname;
-      // content lines follow
-      while ((line = br.readLine()) != null) {
-        if (isSmapHeader(line)) {
-          // jump back to header parsing
-          break;
-        }
-        parser = new SimpleParser(line);
-        String key = parser.nextStringValue();
-        if (key == null) {
-          throw new IllegalStateException("Expected missing SMAP key in '" + line + "'");
+    @VisibleForTesting
+    static void readEvents(BufferedReader br, List<SmapEntryEvent> events) throws IOException {
+        String line = br.readLine();
+        while (line != null) {
+            if (!isSmapHeader(line)) {
+                throw new IllegalStateException("Expected SMAP header line but got " + line);
+            }
+            SmapEntryEvent event = new SmapEntryEvent();
+            events.add(event);
+            SimpleParser parser = new SimpleParser(line);
+            // parse header
+            event.startAddress = parser.nextLongValue(16);
+            if (event.startAddress == VSYSCALL_START_ADDRESS) {
+                // vsyscall will always map to this region, but in case we ever do size calculations we
+                // make the start
+                // address 0x1000 less than the end address to keep relative sizing correct
+                event.startAddress = -0x1000 - 1;
+                event.endAddress = -1;
+                parser.skipToNextValue(false);
+            } else {
+                event.endAddress = parser.nextLongValue(16);
+            }
+            event.perms = parser.nextStringValue();
+            event.offset = parser.nextLongValue(16);
+            event.dev = parser.nextStringValue();
+            event.inodeID = (int) parser.nextLongValue(10);
+            String pathname = parser.nextStringValue();
+            event.pathname = pathname == null ? "" : pathname;
+            // content lines follow
+            while ((line = br.readLine()) != null) {
+                if (isSmapHeader(line)) {
+                    // jump back to header parsing
+                    break;
+                }
+                parser = new SimpleParser(line);
+                String key = parser.nextStringValue();
+                if (key == null) {
+                    throw new IllegalStateException("Expected missing SMAP key in '" + line + "'");
+                }
+                switch (key) {
+                    case "Size:":
+                        event.size = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "KernelPageSize:":
+                        event.kernelPageSize = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "MMUPageSize:":
+                        event.mmuPageSize = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "Rss:":
+                        event.rss = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "Pss:":
+                        event.pss = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "Pss_Dirty:":
+                        event.pssDirty = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "Shared_Clean:":
+                        event.sharedClean = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "Shared_Dirty:":
+                        event.sharedDirty = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "Private_Clean:":
+                        event.privateClean = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "Private_Dirty:":
+                        event.privateDirty = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "Referenced:":
+                        event.referenced = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "Anonymous:":
+                        event.anonymous = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "KSM:":
+                        event.ksm = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "LazyFree:":
+                        event.lazyFree = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "AnonHugePages:":
+                        event.anonHugePages = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "ShmemPmdMapped:":
+                        event.shmemPmdMapped = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "FilePmdMapped:":
+                        event.filePmdMapped = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "Shared_Hugetlb:":
+                        event.sharedHugetlb = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "Private_Hugetlb:":
+                        event.privateHugetlb = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "Swap:":
+                        event.swap = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "SwapPss:":
+                        event.swapPss = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "Locked:":
+                        event.locked = parser.nextLongValue(10) * 1024;
+                        break;
+                    case "THPeligible:":
+                        event.thpEligible = parser.nextLongValue(10) == 1;
+                        break;
+                    case "VmFlags:":
+                        event.vmFlags = parser.slurpStringValue();
+                        break;
+                    default:
+                        event.encounteredForeignKeys = true;
+                        break;
+                }
+            }
         }
-        switch (key) {
-          case "Size:":
-            event.size = parser.nextLongValue(10) * 1024;
-            break;
-          case "KernelPageSize:":
-            event.kernelPageSize = parser.nextLongValue(10) * 1024;
-            break;
-          case "MMUPageSize:":
-            event.mmuPageSize = parser.nextLongValue(10) * 1024;
-            break;
-          case "Rss:":
-            event.rss = parser.nextLongValue(10) * 1024;
-            break;
-          case "Pss:":
-            event.pss = parser.nextLongValue(10) * 1024;
-            break;
-          case "Pss_Dirty:":
-            event.pssDirty = parser.nextLongValue(10) * 1024;
-            break;
-          case "Shared_Clean:":
-            event.sharedClean = parser.nextLongValue(10) * 1024;
-            break;
-          case "Shared_Dirty:":
-            event.sharedDirty = parser.nextLongValue(10) * 1024;
-            break;
-          case "Private_Clean:":
-            event.privateClean = parser.nextLongValue(10) * 1024;
-            break;
-          case "Private_Dirty:":
-            event.privateDirty = parser.nextLongValue(10) * 1024;
-            break;
-          case "Referenced:":
-            event.referenced = parser.nextLongValue(10) * 1024;
-            break;
-          case "Anonymous:":
-            event.anonymous = parser.nextLongValue(10) * 1024;
-            break;
-          case "KSM:":
-            event.ksm = parser.nextLongValue(10) * 1024;
-            break;
-          case "LazyFree:":
-            event.lazyFree = parser.nextLongValue(10) * 1024;
-            break;
-          case "AnonHugePages:":
-            event.anonHugePages = parser.nextLongValue(10) * 1024;
-            break;
-          case "ShmemPmdMapped:":
-            event.shmemPmdMapped = parser.nextLongValue(10) * 1024;
-            break;
-          case "FilePmdMapped:":
-            event.filePmdMapped = parser.nextLongValue(10) * 1024;
-            break;
-          case "Shared_Hugetlb:":
-            event.sharedHugetlb = parser.nextLongValue(10) * 1024;
-            break;
-          case "Private_Hugetlb:":
-            event.privateHugetlb = parser.nextLongValue(10) * 1024;
-            break;
-          case "Swap:":
-            event.swap = parser.nextLongValue(10) * 1024;
-            break;
-          case "SwapPss:":
-            event.swapPss = parser.nextLongValue(10) * 1024;
-            break;
-          case "Locked:":
-            event.locked = parser.nextLongValue(10) * 1024;
-            break;
-          case "THPeligible:":
-            event.thpEligible = parser.nextLongValue(10) == 1;
-            break;
-          case "VmFlags:":
-            event.vmFlags = parser.slurpStringValue();
-            break;
-          default:
-            event.encounteredForeignKeys = true;
-            break;
-        }
-      }
     }
-  }
 
-  @SuppressForbidden
-  private static Map<Long, String> getAnnotatedRegions() {
-    try {
-      ObjectName objectName = new ObjectName("com.sun.management:type=DiagnosticCommand");
-      MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+    @SuppressForbidden
+    private static Map<Long, String> getAnnotatedRegions() {
+        try {
+            ObjectName objectName = new ObjectName("com.sun.management:type=DiagnosticCommand");
+            MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
 
-      String[] emptyStringArgs = {};
-      Object[] dcmdArgs = {emptyStringArgs};
-      String[] signature = {String[].class.getName()};
+            String[] emptyStringArgs = {};
+            Object[] dcmdArgs = {emptyStringArgs};
+            String[] signature = {String[].class.getName()};
 
-      String[] lines =
-          ((String) mbs.invoke(objectName, "systemMap", dcmdArgs, signature)).split("\n");
-      Map<Long, String> annotatedRegions = new HashMap<>();
+            String[] lines = ((String) mbs.invoke(objectName, "systemMap", dcmdArgs, signature)).split("\n");
+            Map<Long, String> annotatedRegions = new HashMap<>();
 
-      // Java 24+ format is different from Java 23
-      int javaVersion = JavaVirtualMachine.isJavaVersionAtLeast(24) ? 24 : 23;
+            // Java 24+ format is different from Java 23
+            int javaVersion = JavaVirtualMachine.isJavaVersionAtLeast(24) ? 24 : 23;
 
-      for (String line : lines) {
-        AnnotatedRegion region = fromAnnotatedEntry(line, javaVersion);
-        if (region != null) {
-          annotatedRegions.put(region.startAddress, region.description);
+            for (String line : lines) {
+                AnnotatedRegion region = fromAnnotatedEntry(line, javaVersion);
+                if (region != null) {
+                    annotatedRegions.put(region.startAddress, region.description);
+                }
+            }
+            return annotatedRegions;
+        } catch (Exception e) {
+            log.debug("Failed to get annotated regions", e);
         }
-      }
-      return annotatedRegions;
-    } catch (Exception e) {
-      log.debug("Failed to get annotated regions", e);
+        return Collections.emptyMap();
     }
-    return Collections.emptyMap();
-  }
 
-  private void collectEvents(List<SmapEntryEvent> events) {
-    try (BufferedReader br =
-        new BufferedReader(new InputStreamReader(Files.newInputStream(smapsPath)), 64 * 1024)) {
-      readEvents(br, events);
-      Map<Long, String> regions = getAnnotatedRegions();
-      for (SmapEntryEvent e : events) {
-        e.nmtCategory = regions.getOrDefault(e.startAddress, "UNKNOWN");
-      }
-      log.debug("Collected {} smap entry events.", events.size());
-    } catch (IOException e) {
-      log.debug("Failed to read smap file", e);
-    } catch (Exception e) {
-      log.debug("Failed to parse smap file", e);
+    private void collectEvents(List<SmapEntryEvent> events) {
+        try (BufferedReader br =
+                new BufferedReader(new InputStreamReader(Files.newInputStream(smapsPath)), 64 * 1024)) {
+            readEvents(br, events);
+            Map<Long, String> regions = getAnnotatedRegions();
+            for (SmapEntryEvent e : events) {
+                e.nmtCategory = regions.getOrDefault(e.startAddress, "UNKNOWN");
+            }
+            log.debug("Collected {} smap entry events.", events.size());
+        } catch (IOException e) {
+            log.debug("Failed to read smap file", e);
+        } catch (Exception e) {
+            log.debug("Failed to parse smap file", e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryEvent.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryEvent.java
index c2db96f88d7..fb9d573cedd 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryEvent.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryEvent.java
@@ -18,240 +18,240 @@
 @Period("beginChunk")
 @StackTrace(false)
 public class SmapEntryEvent extends Event {
-  private static final EventType TYPE = EventType.getEventType(SmapEntryEvent.class);
+    private static final EventType TYPE = EventType.getEventType(SmapEntryEvent.class);
 
-  @Label("Region Start Address")
-  long startAddress;
+    @Label("Region Start Address")
+    long startAddress;
 
-  @Label("Region End Address")
-  long endAddress;
+    @Label("Region End Address")
+    long endAddress;
 
-  @Label("Region Permissions")
-  String perms;
+    @Label("Region Permissions")
+    String perms;
 
-  @Label("Offset into mapping")
-  long offset;
+    @Label("Offset into mapping")
+    long offset;
 
-  @Label("Device")
-  String dev;
+    @Label("Device")
+    String dev;
 
-  @Label("INode ID")
-  int inodeID;
+    @Label("INode ID")
+    int inodeID;
 
-  @Label("Path associated with mapping")
-  String pathname;
+    @Label("Path associated with mapping")
+    String pathname;
 
-  @Label("Mapping Size")
-  long size;
+    @Label("Mapping Size")
+    long size;
 
-  @Label("Page Size")
-  long kernelPageSize;
+    @Label("Page Size")
+    long kernelPageSize;
 
-  @Label("Memory Management Unit Page Size")
-  long mmuPageSize;
+    @Label("Memory Management Unit Page Size")
+    long mmuPageSize;
 
-  @Label("Resident Set Size")
-  @DataAmount
-  long rss;
+    @Label("Resident Set Size")
+    @DataAmount
+    long rss;
 
-  @Label("Proportional Set Size")
-  @DataAmount
-  long pss;
-
-  @Label("Dirty Proportional Set Size")
-  @DataAmount
-  long pssDirty;
-
-  @Label("Shared Clean Pages")
-  long sharedClean;
-
-  @Label("Shared Dirty Pages")
-  @DataAmount
-  long sharedDirty;
-
-  @Label("Private Clean Pages")
-  @DataAmount
-  long privateClean;
-
-  @Label("Private Dirty Pages")
-  @DataAmount
-  long privateDirty;
-
-  @Label("Referenced Memory")
-  long referenced;
-
-  @Label("Anonymous Memory")
-  @DataAmount
-  long anonymous;
-
-  @Label("Kernel Same-page Merging")
-  @DataAmount
-  long ksm;
-
-  @Label("Lazily Freed Memory")
-  @DataAmount
-  long lazyFree;
-
-  @Label("Anon Huge Pages")
-  @DataAmount
-  long anonHugePages;
-
-  @Label("Shared Memory Huge Pages")
-  @DataAmount
-  long shmemPmdMapped;
-
-  @Label("Page Cache Huge Pages")
-  @DataAmount
-  long filePmdMapped;
-
-  @Label("Shared Huge Pages")
-  @DataAmount
-  long sharedHugetlb;
-
-  @Label("Private Huge Pages")
-  @DataAmount
-  long privateHugetlb;
-
-  @Label("Swap Size")
-  @DataAmount
-  long swap;
-
-  @Label("Proportional Swap Size")
-  @DataAmount
-  long swapPss;
-
-  @Label("Locked Memory")
-  @DataAmount
-  long locked;
-
-  @Label("THP Eligible")
-  boolean thpEligible;
-
-  @Label("VM Flags")
-  String vmFlags;
-
-  @Label("Encountered foreign keys")
-  boolean encounteredForeignKeys;
-
-  @Label("NMT Category")
-  String nmtCategory;
-
-  public SmapEntryEvent() {
-    startAddress = 0;
-    endAddress = 0;
-    perms = "";
-    offset = 0;
-    dev = "";
-    inodeID = 0;
-    pathname = "";
-    size = 0;
-    kernelPageSize = 0;
-    mmuPageSize = 0;
-    rss = 0;
-    pss = 0;
-    pssDirty = 0;
-    sharedClean = 0;
-    sharedDirty = 0;
-    privateClean = 0;
-    privateDirty = 0;
-    referenced = 0;
-    anonymous = 0;
-    ksm = 0;
-    lazyFree = 0;
-    anonHugePages = 0;
-    shmemPmdMapped = 0;
-    filePmdMapped = 0;
-    sharedHugetlb = 0;
-    privateHugetlb = 0;
-    swap = 0;
-    swapPss = 0;
-    locked = 0;
-    thpEligible = false;
-    vmFlags = "";
-    encounteredForeignKeys = false;
-    nmtCategory = "";
-  }
-
-  public SmapEntryEvent(
-      long startAddress,
-      long endAddress,
-      String perms,
-      long offset,
-      String dev,
-      int inodeID,
-      String pathname,
-      long size,
-      long kernelPageSize,
-      long mmuPageSize,
-      long rss,
-      long pss,
-      long pssDirty,
-      long sharedClean,
-      long sharedDirty,
-      long privateClean,
-      long privateDirty,
-      long referenced,
-      long anonymous,
-      long ksm,
-      long lazyFree,
-      long anonHugePages,
-      long shmemPmdMapped,
-      long filePmdMapped,
-      long sharedHugetlb,
-      long privateHugetlb,
-      long swap,
-      long swapPss,
-      long locked,
-      boolean thpEligible,
-      String vmFlags,
-      boolean encounteredForeignKeys,
-      String nmtCategory) {
-    this.startAddress = startAddress;
-    this.endAddress = endAddress;
-    this.perms = perms;
-    this.offset = offset;
-    this.dev = dev;
-    this.inodeID = inodeID;
-    this.pathname = pathname;
-    this.size = size;
-    this.kernelPageSize = kernelPageSize;
-    this.mmuPageSize = mmuPageSize;
-    this.rss = rss;
-    this.pss = pss;
-    this.pssDirty = pssDirty;
-    this.sharedClean = sharedClean;
-    this.sharedDirty = sharedDirty;
-    this.privateClean = privateClean;
-    this.privateDirty = privateDirty;
-    this.referenced = referenced;
-    this.anonymous = anonymous;
-    this.ksm = ksm;
-    this.lazyFree = lazyFree;
-    this.anonHugePages = anonHugePages;
-    this.shmemPmdMapped = shmemPmdMapped;
-    this.filePmdMapped = filePmdMapped;
-    this.sharedHugetlb = sharedHugetlb;
-    this.privateHugetlb = privateHugetlb;
-    this.swap = swap;
-    this.swapPss = swapPss;
-    this.locked = locked;
-    this.thpEligible = thpEligible;
-    this.vmFlags = vmFlags;
-    this.encounteredForeignKeys = encounteredForeignKeys;
-    this.nmtCategory = nmtCategory;
-  }
-
-  public static void emit(Collection<SmapEntryEvent> events) {
-    if (TYPE.isEnabled()) {
-      events.forEach(SmapEntryEvent::commit);
+    @Label("Proportional Set Size")
+    @DataAmount
+    long pss;
+
+    @Label("Dirty Proportional Set Size")
+    @DataAmount
+    long pssDirty;
+
+    @Label("Shared Clean Pages")
+    long sharedClean;
+
+    @Label("Shared Dirty Pages")
+    @DataAmount
+    long sharedDirty;
+
+    @Label("Private Clean Pages")
+    @DataAmount
+    long privateClean;
+
+    @Label("Private Dirty Pages")
+    @DataAmount
+    long privateDirty;
+
+    @Label("Referenced Memory")
+    long referenced;
+
+    @Label("Anonymous Memory")
+    @DataAmount
+    long anonymous;
+
+    @Label("Kernel Same-page Merging")
+    @DataAmount
+    long ksm;
+
+    @Label("Lazily Freed Memory")
+    @DataAmount
+    long lazyFree;
+
+    @Label("Anon Huge Pages")
+    @DataAmount
+    long anonHugePages;
+
+    @Label("Shared Memory Huge Pages")
+    @DataAmount
+    long shmemPmdMapped;
+
+    @Label("Page Cache Huge Pages")
+    @DataAmount
+    long filePmdMapped;
+
+    @Label("Shared Huge Pages")
+    @DataAmount
+    long sharedHugetlb;
+
+    @Label("Private Huge Pages")
+    @DataAmount
+    long privateHugetlb;
+
+    @Label("Swap Size")
+    @DataAmount
+    long swap;
+
+    @Label("Proportional Swap Size")
+    @DataAmount
+    long swapPss;
+
+    @Label("Locked Memory")
+    @DataAmount
+    long locked;
+
+    @Label("THP Eligible")
+    boolean thpEligible;
+
+    @Label("VM Flags")
+    String vmFlags;
+
+    @Label("Encountered foreign keys")
+    boolean encounteredForeignKeys;
+
+    @Label("NMT Category")
+    String nmtCategory;
+
+    public SmapEntryEvent() {
+        startAddress = 0;
+        endAddress = 0;
+        perms = "";
+        offset = 0;
+        dev = "";
+        inodeID = 0;
+        pathname = "";
+        size = 0;
+        kernelPageSize = 0;
+        mmuPageSize = 0;
+        rss = 0;
+        pss = 0;
+        pssDirty = 0;
+        sharedClean = 0;
+        sharedDirty = 0;
+        privateClean = 0;
+        privateDirty = 0;
+        referenced = 0;
+        anonymous = 0;
+        ksm = 0;
+        lazyFree = 0;
+        anonHugePages = 0;
+        shmemPmdMapped = 0;
+        filePmdMapped = 0;
+        sharedHugetlb = 0;
+        privateHugetlb = 0;
+        swap = 0;
+        swapPss = 0;
+        locked = 0;
+        thpEligible = false;
+        vmFlags = "";
+        encounteredForeignKeys = false;
+        nmtCategory = "";
     }
-  }
 
-  public long getRss() {
-    return this.rss;
-  }
+    public SmapEntryEvent(
+            long startAddress,
+            long endAddress,
+            String perms,
+            long offset,
+            String dev,
+            int inodeID,
+            String pathname,
+            long size,
+            long kernelPageSize,
+            long mmuPageSize,
+            long rss,
+            long pss,
+            long pssDirty,
+            long sharedClean,
+            long sharedDirty,
+            long privateClean,
+            long privateDirty,
+            long referenced,
+            long anonymous,
+            long ksm,
+            long lazyFree,
+            long anonHugePages,
+            long shmemPmdMapped,
+            long filePmdMapped,
+            long sharedHugetlb,
+            long privateHugetlb,
+            long swap,
+            long swapPss,
+            long locked,
+            boolean thpEligible,
+            String vmFlags,
+            boolean encounteredForeignKeys,
+            String nmtCategory) {
+        this.startAddress = startAddress;
+        this.endAddress = endAddress;
+        this.perms = perms;
+        this.offset = offset;
+        this.dev = dev;
+        this.inodeID = inodeID;
+        this.pathname = pathname;
+        this.size = size;
+        this.kernelPageSize = kernelPageSize;
+        this.mmuPageSize = mmuPageSize;
+        this.rss = rss;
+        this.pss = pss;
+        this.pssDirty = pssDirty;
+        this.sharedClean = sharedClean;
+        this.sharedDirty = sharedDirty;
+        this.privateClean = privateClean;
+        this.privateDirty = privateDirty;
+        this.referenced = referenced;
+        this.anonymous = anonymous;
+        this.ksm = ksm;
+        this.lazyFree = lazyFree;
+        this.anonHugePages = anonHugePages;
+        this.shmemPmdMapped = shmemPmdMapped;
+        this.filePmdMapped = filePmdMapped;
+        this.sharedHugetlb = sharedHugetlb;
+        this.privateHugetlb = privateHugetlb;
+        this.swap = swap;
+        this.swapPss = swapPss;
+        this.locked = locked;
+        this.thpEligible = thpEligible;
+        this.vmFlags = vmFlags;
+        this.encounteredForeignKeys = encounteredForeignKeys;
+        this.nmtCategory = nmtCategory;
+    }
+
+    public static void emit(Collection<SmapEntryEvent> events) {
+        if (TYPE.isEnabled()) {
+            events.forEach(SmapEntryEvent::commit);
+        }
+    }
 
-  public String getNmtCategory() {
-    return this.nmtCategory;
-  }
+    public long getRss() {
+        return this.rss;
+    }
+
+    public String getNmtCategory() {
+        return this.nmtCategory;
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryFactory.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryFactory.java
index 68b3e063da6..10660ae7123 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryFactory.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryFactory.java
@@ -17,76 +17,75 @@
 
 public class SmapEntryFactory {
 
-  private static final Logger log = LoggerFactory.getLogger(SmapEntryFactory.class);
+    private static final Logger log = LoggerFactory.getLogger(SmapEntryFactory.class);
 
-  private static final AtomicBoolean REGISTERED = new AtomicBoolean();
+    private static final AtomicBoolean REGISTERED = new AtomicBoolean();
 
-  private static final EventType SMAP_ENTRY_EVENT_TYPE;
-  private static final EventType AGGREGATED_SMAP_ENTRY_EVENT_TYPE;
+    private static final EventType SMAP_ENTRY_EVENT_TYPE;
+    private static final EventType AGGREGATED_SMAP_ENTRY_EVENT_TYPE;
 
-  private static final SmapEntryCache SMAP_ENTRY_CACHE = new SmapEntryCache(Duration.ofMillis(500));
+    private static final SmapEntryCache SMAP_ENTRY_CACHE = new SmapEntryCache(Duration.ofMillis(500));
 
-  static {
-    if (!JavaVirtualMachine.isJ9() && !JavaVirtualMachine.isOracleJDK8()) {
-      SMAP_ENTRY_EVENT_TYPE = EventType.getEventType(SmapEntryEvent.class);
-      AGGREGATED_SMAP_ENTRY_EVENT_TYPE = EventType.getEventType(AggregatedSmapEntryEvent.class);
-    } else {
-      SMAP_ENTRY_EVENT_TYPE = null;
-      AGGREGATED_SMAP_ENTRY_EVENT_TYPE = null;
+    static {
+        if (!JavaVirtualMachine.isJ9() && !JavaVirtualMachine.isOracleJDK8()) {
+            SMAP_ENTRY_EVENT_TYPE = EventType.getEventType(SmapEntryEvent.class);
+            AGGREGATED_SMAP_ENTRY_EVENT_TYPE = EventType.getEventType(AggregatedSmapEntryEvent.class);
+        } else {
+            SMAP_ENTRY_EVENT_TYPE = null;
+            AGGREGATED_SMAP_ENTRY_EVENT_TYPE = null;
+        }
     }
-  }
 
-  public static void registerEvents() {
-    if (SMAP_ENTRY_EVENT_TYPE == null || AGGREGATED_SMAP_ENTRY_EVENT_TYPE == null) {
-      // JFR is not available
-      return;
-    }
+    public static void registerEvents() {
+        if (SMAP_ENTRY_EVENT_TYPE == null || AGGREGATED_SMAP_ENTRY_EVENT_TYPE == null) {
+            // JFR is not available
+            return;
+        }
 
-    // Make sure the periodic event is registered only once
-    if (REGISTERED.compareAndSet(false, true) && OperatingSystem.isLinux()) {
-      try {
-        ObjectName objectName = new ObjectName("com.sun.management:type=DiagnosticCommand");
-        MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+        // Make sure the periodic event is registered only once
+        if (REGISTERED.compareAndSet(false, true) && OperatingSystem.isLinux()) {
+            try {
+                ObjectName objectName = new ObjectName("com.sun.management:type=DiagnosticCommand");
+                MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
 
-        boolean annotatedMapsAvailable =
-            Arrays.stream(mbs.getMBeanInfo(objectName).getOperations())
-                .anyMatch(x -> x.getName().equals("systemMap"));
-        if (annotatedMapsAvailable) {
-          // Let's register the periodic SmapEntry event.
-          // The AggregatedSmapEntry event will be generated from the common logic, based on the
-          // peridicity settings of the SmapEntry event.
-          JfrHelper.addPeriodicEvent(SmapEntryEvent.class, SmapEntryFactory::emitSingleEvents);
-          JfrHelper.addPeriodicEvent(
-              AggregatedSmapEntryEvent.class, SmapEntryFactory::emitAggregatedEvents);
-          log.debug("Smap entry events registered successfully");
+                boolean annotatedMapsAvailable = Arrays.stream(
+                                mbs.getMBeanInfo(objectName).getOperations())
+                        .anyMatch(x -> x.getName().equals("systemMap"));
+                if (annotatedMapsAvailable) {
+                    // Let's register the periodic SmapEntry event.
+                    // The AggregatedSmapEntry event will be generated from the common logic, based on the
+                    // peridicity settings of the SmapEntry event.
+                    JfrHelper.addPeriodicEvent(SmapEntryEvent.class, SmapEntryFactory::emitSingleEvents);
+                    JfrHelper.addPeriodicEvent(AggregatedSmapEntryEvent.class, SmapEntryFactory::emitAggregatedEvents);
+                    log.debug("Smap entry events registered successfully");
+                }
+            } catch (Exception e) {
+                ProfilerFlareLogger.getInstance()
+                        .log("Smap entry events could not be registered due to missing systemMap operation", e);
+            }
         }
-      } catch (Exception e) {
-        ProfilerFlareLogger.getInstance()
-            .log("Smap entry events could not be registered due to missing systemMap operation", e);
-      }
     }
-  }
 
-  public static void emitSingleEvents() {
-    emitEvents(true, false);
-  }
+    public static void emitSingleEvents() {
+        emitEvents(true, false);
+    }
 
-  public static void emitAggregatedEvents() {
-    emitEvents(false, true);
-  }
+    public static void emitAggregatedEvents() {
+        emitEvents(false, true);
+    }
 
-  public static void emitEvents(boolean singleEvents, boolean aggregatedEvents) {
-    if (SMAP_ENTRY_EVENT_TYPE.isEnabled() || AGGREGATED_SMAP_ENTRY_EVENT_TYPE.isEnabled()) {
-      // first collect the smap entries - this data structure is shared between the two events
-      List<SmapEntryEvent> events = SMAP_ENTRY_CACHE.getEvents();
-      if (singleEvents && SMAP_ENTRY_EVENT_TYPE.isEnabled()) {
-        // emit the smap entry events
-        SmapEntryEvent.emit(events);
-      }
-      if (aggregatedEvents && AGGREGATED_SMAP_ENTRY_EVENT_TYPE.isEnabled()) {
-        // emit the aggregated smap entry events
-        AggregatedSmapEntryEvent.emit(events);
-      }
+    public static void emitEvents(boolean singleEvents, boolean aggregatedEvents) {
+        if (SMAP_ENTRY_EVENT_TYPE.isEnabled() || AGGREGATED_SMAP_ENTRY_EVENT_TYPE.isEnabled()) {
+            // first collect the smap entries - this data structure is shared between the two events
+            List<SmapEntryEvent> events = SMAP_ENTRY_CACHE.getEvents();
+            if (singleEvents && SMAP_ENTRY_EVENT_TYPE.isEnabled()) {
+                // emit the smap entry events
+                SmapEntryEvent.emit(events);
+            }
+            if (aggregatedEvents && AGGREGATED_SMAP_ENTRY_EVENT_TYPE.isEnabled()) {
+                // emit the aggregated smap entry events
+                AggregatedSmapEntryEvent.emit(events);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/TimelineEvent.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/TimelineEvent.java
index b7ac1615da8..f4d6ec20a05 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/TimelineEvent.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/TimelineEvent.java
@@ -15,33 +15,33 @@
 @StackTrace(false)
 public class TimelineEvent extends Event implements Stateful {
 
-  @Label("Local Root Span Id")
-  private final long localRootSpanId;
-
-  @Label("Span Id")
-  private final long spanId;
-
-  @Label("Span Name")
-  @Name("_dd.trace.operation")
-  private final String operation;
-
-  public TimelineEvent(long localRootSpanId, long spanId, String operation) {
-    this.localRootSpanId = localRootSpanId;
-    this.spanId = spanId;
-    this.operation = operation;
-    begin();
-  }
-
-  @Override
-  public void close() {
-    end();
-    if (shouldCommit()) {
-      commit();
+    @Label("Local Root Span Id")
+    private final long localRootSpanId;
+
+    @Label("Span Id")
+    private final long spanId;
+
+    @Label("Span Name")
+    @Name("_dd.trace.operation")
+    private final String operation;
+
+    public TimelineEvent(long localRootSpanId, long spanId, String operation) {
+        this.localRootSpanId = localRootSpanId;
+        this.spanId = spanId;
+        this.operation = operation;
+        begin();
     }
-  }
 
-  @Override
-  public void activate(Object context) {
-    // nothing to do, either we get an event or we don't
-  }
+    @Override
+    public void close() {
+        end();
+        if (shouldCommit()) {
+            commit();
+        }
+    }
+
+    @Override
+    public void activate(Object context) {
+        // nothing to do, either we get an event or we don't
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/InstantiationTest.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/InstantiationTest.java
index 1a604d71291..2e2f0621a43 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/InstantiationTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/InstantiationTest.java
@@ -13,31 +13,32 @@
 
 public class InstantiationTest {
 
-  /**
-   * We assume that tests for this module are run only on JVMs that support JFR. Ideally we would
-   * want to have a conditional annotation to this, but currently it is somewhat hard to do well,
-   * partially because jfr is available in some java8 versions and not others. Currently we just run
-   * tests with java11 that is guaranteed to have JFR.
-   */
-  @Test
-  public void testCreateController() throws UnsupportedEnvironmentException {
-    Controller controller =
-        CompositeController.build(ConfigProvider.getInstance(), new ControllerContext());
-    if (controller instanceof CompositeController) {
-      assertEquals(
-          1,
-          ((CompositeController) controller)
-              .getControllers().stream().filter(c -> c instanceof OpenJdkController).count());
-    } else {
-      assertInstanceOf(OpenJdkController.class, controller);
+    /**
+     * We assume that tests for this module are run only on JVMs that support JFR. Ideally we would
+     * want to have a conditional annotation to this, but currently it is somewhat hard to do well,
+     * partially because jfr is available in some java8 versions and not others. Currently we just run
+     * tests with java11 that is guaranteed to have JFR.
+     */
+    @Test
+    public void testCreateController() throws UnsupportedEnvironmentException {
+        Controller controller = CompositeController.build(ConfigProvider.getInstance(), new ControllerContext());
+        if (controller instanceof CompositeController) {
+            assertEquals(
+                    1,
+                    ((CompositeController) controller)
+                            .getControllers().stream()
+                                    .filter(c -> c instanceof OpenJdkController)
+                                    .count());
+        } else {
+            assertInstanceOf(OpenJdkController.class, controller);
+        }
     }
-  }
 
-  @Test
-  public void testConfigurationException() {
-    Properties props = new Properties();
-    props.put(PROFILING_TEMPLATE_OVERRIDE_FILE, "some-path-that-is-not-supposed-to-exist!!!");
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-    assertThrows(ConfigurationException.class, () -> OpenJdkController.instance(configProvider));
-  }
+    @Test
+    public void testConfigurationException() {
+        Properties props = new Properties();
+        props.put(PROFILING_TEMPLATE_OVERRIDE_FILE, "some-path-that-is-not-supposed-to-exist!!!");
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+        assertThrows(ConfigurationException.class, () -> OpenJdkController.instance(configProvider));
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkControllerTest.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkControllerTest.java
index eee7a2f9638..9b827513453 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkControllerTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkControllerTest.java
@@ -31,256 +31,250 @@
 @ExtendWith(MockitoExtension.class)
 public class OpenJdkControllerTest {
 
-  private static final String TEST_NAME = "recording name";
-
-  @BeforeAll
-  static void setupSpec() {
-    assumeFalse(JavaVirtualMachine.isJ9());
-  }
-
-  @Test
-  public void testCreateContinuousRecording() throws Exception {
-    Properties props = getConfigProperties();
-    props.put(PROFILING_DATADOG_PROFILER_ENABLED, "false");
-
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-
-    OpenJdkController controller = new OpenJdkController(configProvider);
-    RecordingData data =
-        controller.createRecording(TEST_NAME, new ControllerContext().snapshot()).stop();
-    assertTrue(data instanceof OpenJdkRecordingData);
-    try (final Recording recording = ((OpenJdkRecordingData) data).getRecording()) {
-      assertEquals(TEST_NAME, recording.getName());
-      assertEquals(controller.getMaxSize(), recording.getMaxSize());
-      assertEquals(OpenJdkController.RECORDING_MAX_AGE, recording.getMaxAge());
+    private static final String TEST_NAME = "recording name";
+
+    @BeforeAll
+    static void setupSpec() {
+        assumeFalse(JavaVirtualMachine.isJ9());
     }
-  }
-
-  @Test
-  public void testHeapProfilerIsDisabledOnUnsupportedVersion() throws Exception {
-    Properties props = getConfigProperties();
-
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-
-    OpenJdkController controller = new OpenJdkController(configProvider);
-    RecordingData data =
-        controller.createRecording(TEST_NAME, new ControllerContext().snapshot()).stop();
-    assertTrue(data instanceof OpenJdkRecordingData);
-    try (final Recording recording = ((OpenJdkRecordingData) data).getRecording()) {
-      assertEquals(
-          isOldObjectSampleAvailable(),
-          Boolean.parseBoolean(recording.getSettings().get("jdk.OldObjectSample#enabled")));
+
+    @Test
+    public void testCreateContinuousRecording() throws Exception {
+        Properties props = getConfigProperties();
+        props.put(PROFILING_DATADOG_PROFILER_ENABLED, "false");
+
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+
+        OpenJdkController controller = new OpenJdkController(configProvider);
+        RecordingData data = controller
+                .createRecording(TEST_NAME, new ControllerContext().snapshot())
+                .stop();
+        assertTrue(data instanceof OpenJdkRecordingData);
+        try (final Recording recording = ((OpenJdkRecordingData) data).getRecording()) {
+            assertEquals(TEST_NAME, recording.getName());
+            assertEquals(controller.getMaxSize(), recording.getMaxSize());
+            assertEquals(OpenJdkController.RECORDING_MAX_AGE, recording.getMaxAge());
+        }
     }
-  }
-
-  @Test
-  public void testHeapProfilerIsStillOverriddenOnUnsupportedVersion() throws Exception {
-    Properties props = getConfigProperties();
-    props.put(PROFILING_TEMPLATE_OVERRIDE_FILE, JfpTestResources.overridesOldObjectSample());
-
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-
-    OpenJdkController controller = new OpenJdkController(configProvider);
-    RecordingData data =
-        controller.createRecording(TEST_NAME, new ControllerContext().snapshot()).stop();
-    assertTrue(data instanceof OpenJdkRecordingData);
-    try (final Recording recording = ((OpenJdkRecordingData) data).getRecording()) {
-      if (!isOldObjectSampleAvailable()) {
-        assertEquals(
-            true, Boolean.parseBoolean(recording.getSettings().get("jdk.OldObjectSample#enabled")));
-      }
+
+    @Test
+    public void testHeapProfilerIsDisabledOnUnsupportedVersion() throws Exception {
+        Properties props = getConfigProperties();
+
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+
+        OpenJdkController controller = new OpenJdkController(configProvider);
+        RecordingData data = controller
+                .createRecording(TEST_NAME, new ControllerContext().snapshot())
+                .stop();
+        assertTrue(data instanceof OpenJdkRecordingData);
+        try (final Recording recording = ((OpenJdkRecordingData) data).getRecording()) {
+            assertEquals(
+                    isOldObjectSampleAvailable(),
+                    Boolean.parseBoolean(recording.getSettings().get("jdk.OldObjectSample#enabled")));
+        }
     }
-  }
-
-  @Test
-  public void testHeapProfilerIsStillOverriddenThroughConfig() throws Exception {
-    Properties props = getConfigProperties();
-    props.put(PROFILING_HEAP_ENABLED, "true");
-    // Disable ddprof so OldObjectSample is not proactively disabled
-    props.put(PROFILING_DATADOG_PROFILER_ENABLED, "false");
-
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-
-    OpenJdkController controller = new OpenJdkController(configProvider);
-    try (final Recording recording =
-        ((OpenJdkRecordingData)
-                controller.createRecording(TEST_NAME, new ControllerContext().snapshot()).stop())
-            .getRecording()) {
-      // On JVMs where OldObjectSample is not available (e.g. Java 8), explicitly enabling heap
-      // profiling has no effect — the event cannot be safely enabled.
-      assertEquals(
-          isOldObjectSampleAvailable(),
-          Boolean.parseBoolean(recording.getSettings().get("jdk.OldObjectSample#enabled")));
+
+    @Test
+    public void testHeapProfilerIsStillOverriddenOnUnsupportedVersion() throws Exception {
+        Properties props = getConfigProperties();
+        props.put(PROFILING_TEMPLATE_OVERRIDE_FILE, JfpTestResources.overridesOldObjectSample());
+
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+
+        OpenJdkController controller = new OpenJdkController(configProvider);
+        RecordingData data = controller
+                .createRecording(TEST_NAME, new ControllerContext().snapshot())
+                .stop();
+        assertTrue(data instanceof OpenJdkRecordingData);
+        try (final Recording recording = ((OpenJdkRecordingData) data).getRecording()) {
+            if (!isOldObjectSampleAvailable()) {
+                assertEquals(true, Boolean.parseBoolean(recording.getSettings().get("jdk.OldObjectSample#enabled")));
+            }
+        }
     }
-  }
-
-  @Test
-  public void testAllocationProfilerIsDisabledOnUnsupportedVersion() throws Exception {
-    Properties props = getConfigProperties();
-
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-
-    OpenJdkController controller = new OpenJdkController(configProvider);
-    RecordingData data =
-        controller.createRecording(TEST_NAME, new ControllerContext().snapshot()).stop();
-    assertTrue(data instanceof OpenJdkRecordingData);
-    try (final Recording recording = ((OpenJdkRecordingData) data).getRecording()) {
-      if (isObjectAllocationSampleAvailable()) {
-        assertEquals(
-            false,
-            Boolean.parseBoolean(
-                recording.getSettings().get("jdk.ObjectAllocationInNewTLAB#enabled")));
-        assertEquals(
-            false,
-            Boolean.parseBoolean(
-                recording.getSettings().get("jdk.ObjectAllocationOutsideTLAB#enabled")));
-        assertEquals(
-            true,
-            Boolean.parseBoolean(
-                recording.getSettings().get("jdk.ObjectAllocationSample#enabled")));
-      } else {
-        assertEquals(
-            false,
-            Boolean.parseBoolean(
-                recording.getSettings().get("jdk.ObjectAllocationInNewTLAB#enabled")));
-        assertEquals(
-            false,
-            Boolean.parseBoolean(
-                recording.getSettings().get("jdk.ObjectAllocationOutsideTLAB#enabled")));
-        assertEquals(
-            false,
-            Boolean.parseBoolean(
-                recording.getSettings().get("jdk.ObjectAllocationSample#enabled")));
-      }
+
+    @Test
+    public void testHeapProfilerIsStillOverriddenThroughConfig() throws Exception {
+        Properties props = getConfigProperties();
+        props.put(PROFILING_HEAP_ENABLED, "true");
+        // Disable ddprof so OldObjectSample is not proactively disabled
+        props.put(PROFILING_DATADOG_PROFILER_ENABLED, "false");
+
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+
+        OpenJdkController controller = new OpenJdkController(configProvider);
+        try (final Recording recording = ((OpenJdkRecordingData) controller
+                        .createRecording(TEST_NAME, new ControllerContext().snapshot())
+                        .stop())
+                .getRecording()) {
+            // On JVMs where OldObjectSample is not available (e.g. Java 8), explicitly enabling heap
+            // profiling has no effect — the event cannot be safely enabled.
+            assertEquals(
+                    isOldObjectSampleAvailable(),
+                    Boolean.parseBoolean(recording.getSettings().get("jdk.OldObjectSample#enabled")));
+        }
+    }
+
+    @Test
+    public void testAllocationProfilerIsDisabledOnUnsupportedVersion() throws Exception {
+        Properties props = getConfigProperties();
+
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+
+        OpenJdkController controller = new OpenJdkController(configProvider);
+        RecordingData data = controller
+                .createRecording(TEST_NAME, new ControllerContext().snapshot())
+                .stop();
+        assertTrue(data instanceof OpenJdkRecordingData);
+        try (final Recording recording = ((OpenJdkRecordingData) data).getRecording()) {
+            if (isObjectAllocationSampleAvailable()) {
+                assertEquals(
+                        false,
+                        Boolean.parseBoolean(recording.getSettings().get("jdk.ObjectAllocationInNewTLAB#enabled")));
+                assertEquals(
+                        false,
+                        Boolean.parseBoolean(recording.getSettings().get("jdk.ObjectAllocationOutsideTLAB#enabled")));
+                assertEquals(
+                        true, Boolean.parseBoolean(recording.getSettings().get("jdk.ObjectAllocationSample#enabled")));
+            } else {
+                assertEquals(
+                        false,
+                        Boolean.parseBoolean(recording.getSettings().get("jdk.ObjectAllocationInNewTLAB#enabled")));
+                assertEquals(
+                        false,
+                        Boolean.parseBoolean(recording.getSettings().get("jdk.ObjectAllocationOutsideTLAB#enabled")));
+                assertEquals(
+                        false, Boolean.parseBoolean(recording.getSettings().get("jdk.ObjectAllocationSample#enabled")));
+            }
+        }
     }
-  }
-
-  @Test
-  public void testAllocationProfilerIsStillOverriddenOnUnsupportedVersion() throws Exception {
-    Properties props = getConfigProperties();
-    props.put(PROFILING_TEMPLATE_OVERRIDE_FILE, JfpTestResources.overridesObjectAllocation());
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-
-    OpenJdkController controller = new OpenJdkController(configProvider);
-    RecordingData data =
-        controller.createRecording(TEST_NAME, new ControllerContext().snapshot()).stop();
-    assertTrue(data instanceof OpenJdkRecordingData);
-    try (final Recording recording = ((OpenJdkRecordingData) data).getRecording()) {
-      if (!isObjectAllocationSampleAvailable()) {
-        assertEquals(
-            true,
-            Boolean.parseBoolean(
-                recording.getSettings().get("jdk.ObjectAllocationInNewTLAB#enabled")));
-        assertEquals(
-            true,
-            Boolean.parseBoolean(
-                recording.getSettings().get("jdk.ObjectAllocationOutsideTLAB#enabled")));
-      }
+
+    @Test
+    public void testAllocationProfilerIsStillOverriddenOnUnsupportedVersion() throws Exception {
+        Properties props = getConfigProperties();
+        props.put(PROFILING_TEMPLATE_OVERRIDE_FILE, JfpTestResources.overridesObjectAllocation());
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+
+        OpenJdkController controller = new OpenJdkController(configProvider);
+        RecordingData data = controller
+                .createRecording(TEST_NAME, new ControllerContext().snapshot())
+                .stop();
+        assertTrue(data instanceof OpenJdkRecordingData);
+        try (final Recording recording = ((OpenJdkRecordingData) data).getRecording()) {
+            if (!isObjectAllocationSampleAvailable()) {
+                assertEquals(
+                        true,
+                        Boolean.parseBoolean(recording.getSettings().get("jdk.ObjectAllocationInNewTLAB#enabled")));
+                assertEquals(
+                        true,
+                        Boolean.parseBoolean(recording.getSettings().get("jdk.ObjectAllocationOutsideTLAB#enabled")));
+            }
+        }
     }
-  }
-
-  @Test
-  public void testAllocationProfilerIsStillOverriddenThroughConfig() throws Exception {
-    Properties props = getConfigProperties();
-    props.put(PROFILING_ALLOCATION_ENABLED, "true");
-
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-
-    OpenJdkController controller = new OpenJdkController(configProvider);
-    try (final Recording recording =
-        ((OpenJdkRecordingData)
-                controller.createRecording(TEST_NAME, new ControllerContext().snapshot()).stop())
-            .getRecording()) {
-      if (!isObjectAllocationSampleAvailable()) {
-        assertEquals(
-            true,
-            Boolean.parseBoolean(
-                recording.getSettings().get("jdk.ObjectAllocationInNewTLAB#enabled")));
-        assertEquals(
-            true,
-            Boolean.parseBoolean(
-                recording.getSettings().get("jdk.ObjectAllocationOutsideTLAB#enabled")));
-      }
+
+    @Test
+    public void testAllocationProfilerIsStillOverriddenThroughConfig() throws Exception {
+        Properties props = getConfigProperties();
+        props.put(PROFILING_ALLOCATION_ENABLED, "true");
+
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+
+        OpenJdkController controller = new OpenJdkController(configProvider);
+        try (final Recording recording = ((OpenJdkRecordingData) controller
+                        .createRecording(TEST_NAME, new ControllerContext().snapshot())
+                        .stop())
+                .getRecording()) {
+            if (!isObjectAllocationSampleAvailable()) {
+                assertEquals(
+                        true,
+                        Boolean.parseBoolean(recording.getSettings().get("jdk.ObjectAllocationInNewTLAB#enabled")));
+                assertEquals(
+                        true,
+                        Boolean.parseBoolean(recording.getSettings().get("jdk.ObjectAllocationOutsideTLAB#enabled")));
+            }
+        }
     }
-  }
-
-  @Test
-  public void testNativeProfilerIsDisabledOnUnsupportedVersion() throws Exception {
-    assumeFalse(isNativeMethodSampleAvailable());
-    Properties props = getConfigProperties();
-
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-
-    OpenJdkController controller = new OpenJdkController(configProvider);
-    RecordingData data =
-        controller.createRecording(TEST_NAME, new ControllerContext().snapshot()).stop();
-    assertTrue(data instanceof OpenJdkRecordingData);
-    try (final Recording recording = ((OpenJdkRecordingData) data).getRecording()) {
-      assertFalse(
-          Boolean.parseBoolean(recording.getSettings().get("jdk.NativeMethodSample#enabled")));
+
+    @Test
+    public void testNativeProfilerIsDisabledOnUnsupportedVersion() throws Exception {
+        assumeFalse(isNativeMethodSampleAvailable());
+        Properties props = getConfigProperties();
+
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+
+        OpenJdkController controller = new OpenJdkController(configProvider);
+        RecordingData data = controller
+                .createRecording(TEST_NAME, new ControllerContext().snapshot())
+                .stop();
+        assertTrue(data instanceof OpenJdkRecordingData);
+        try (final Recording recording = ((OpenJdkRecordingData) data).getRecording()) {
+            assertFalse(Boolean.parseBoolean(recording.getSettings().get("jdk.NativeMethodSample#enabled")));
+        }
     }
-  }
-
-  @Test
-  public void testNativeProfilerIsStillOverriddenOnUnsupportedVersion() throws Exception {
-    Properties props = getConfigProperties();
-
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-
-    OpenJdkController controller = new OpenJdkController(configProvider);
-    RecordingData data =
-        controller.createRecording(TEST_NAME, new ControllerContext().snapshot()).stop();
-    assertTrue(data instanceof OpenJdkRecordingData);
-    try (final Recording recording = ((OpenJdkRecordingData) data).getRecording()) {
-      if (!isNativeMethodSampleAvailable()) {
-        assertTrue(
-            Boolean.parseBoolean(recording.getSettings().get("jdk.NativeMethodSample#enabled")));
-      }
+
+    @Test
+    public void testNativeProfilerIsStillOverriddenOnUnsupportedVersion() throws Exception {
+        Properties props = getConfigProperties();
+
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+
+        OpenJdkController controller = new OpenJdkController(configProvider);
+        RecordingData data = controller
+                .createRecording(TEST_NAME, new ControllerContext().snapshot())
+                .stop();
+        assertTrue(data instanceof OpenJdkRecordingData);
+        try (final Recording recording = ((OpenJdkRecordingData) data).getRecording()) {
+            if (!isNativeMethodSampleAvailable()) {
+                assertTrue(Boolean.parseBoolean(recording.getSettings().get("jdk.NativeMethodSample#enabled")));
+            }
+        }
     }
-  }
 
-  @Test
-  public void testOldObjectSampleDisabledWhenDdprofMemleakActive() throws Exception {
-    Properties props = getConfigProperties();
-    props.put(PROFILING_DATADOG_PROFILER_ENABLED, "true");
+    @Test
+    public void testOldObjectSampleDisabledWhenDdprofMemleakActive() throws Exception {
+        Properties props = getConfigProperties();
+        props.put(PROFILING_DATADOG_PROFILER_ENABLED, "true");
 
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
 
-    ControllerContext context = new ControllerContext();
-    context.setDatadogProfilerEnabled(true);
-    context.setDatadogProfilingModes(EnumSet.of(ProfilingMode.MEMLEAK));
+        ControllerContext context = new ControllerContext();
+        context.setDatadogProfilerEnabled(true);
+        context.setDatadogProfilingModes(EnumSet.of(ProfilingMode.MEMLEAK));
 
-    OpenJdkController controller = new OpenJdkController(configProvider);
-    try (final Recording recording =
-        ((OpenJdkRecordingData) controller.createRecording(TEST_NAME, context.snapshot()).stop())
-            .getRecording()) {
-      assertFalse(Boolean.parseBoolean(recording.getSettings().get("jdk.OldObjectSample#enabled")));
+        OpenJdkController controller = new OpenJdkController(configProvider);
+        try (final Recording recording = ((OpenJdkRecordingData) controller
+                        .createRecording(TEST_NAME, context.snapshot())
+                        .stop())
+                .getRecording()) {
+            assertFalse(Boolean.parseBoolean(recording.getSettings().get("jdk.OldObjectSample#enabled")));
+        }
     }
-  }
-
-  @Test
-  public void testUnifiedFlagDisabledTurnsOffOldObjectSample() throws Exception {
-    Properties props = getConfigProperties();
-    props.put(PROFILING_HEAP_ENABLED, "false");
-
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-
-    OpenJdkController controller = new OpenJdkController(configProvider);
-    RecordingData data =
-        controller.createRecording(TEST_NAME, new ControllerContext().snapshot()).stop();
-    assertTrue(data instanceof OpenJdkRecordingData);
-    try (final Recording recording = ((OpenJdkRecordingData) data).getRecording()) {
-      assertFalse(
-          Boolean.parseBoolean(recording.getSettings().get("jdk.OldObjectSample#enabled")),
-          "OldObjectSample should be disabled when unified live heap flag is false");
+
+    @Test
+    public void testUnifiedFlagDisabledTurnsOffOldObjectSample() throws Exception {
+        Properties props = getConfigProperties();
+        props.put(PROFILING_HEAP_ENABLED, "false");
+
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+
+        OpenJdkController controller = new OpenJdkController(configProvider);
+        RecordingData data = controller
+                .createRecording(TEST_NAME, new ControllerContext().snapshot())
+                .stop();
+        assertTrue(data instanceof OpenJdkRecordingData);
+        try (final Recording recording = ((OpenJdkRecordingData) data).getRecording()) {
+            assertFalse(
+                    Boolean.parseBoolean(recording.getSettings().get("jdk.OldObjectSample#enabled")),
+                    "OldObjectSample should be disabled when unified live heap flag is false");
+        }
+    }
+
+    private static Properties getConfigProperties() {
+        Properties props = new Properties();
+        // make sure the async profiler is not force-enabled
+        props.put(PROFILING_AUXILIARY_TYPE, PROFILING_AUXILIARY_TYPE_DEFAULT);
+        props.put(PROFILING_DATADOG_PROFILER_ENABLED, "false");
+        return props;
     }
-  }
-
-  private static Properties getConfigProperties() {
-    Properties props = new Properties();
-    // make sure the async profiler is not force-enabled
-    props.put(PROFILING_AUXILIARY_TYPE, PROFILING_AUXILIARY_TYPE_DEFAULT);
-    props.put(PROFILING_DATADOG_PROFILER_ENABLED, "false");
-    return props;
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecordingTest.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecordingTest.java
index cc7f65aeb43..42556db1c67 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecordingTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecordingTest.java
@@ -29,83 +29,81 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 public class OpenJdkOngoingRecordingTest {
 
-  private static final String TEST_NAME = "recording name";
+    private static final String TEST_NAME = "recording name";
 
-  @Mock private Instant start;
-  @Mock private Instant end;
-  @Mock private Recording recording;
+    @Mock
+    private Instant start;
 
-  private OpenJdkOngoingRecording ongoingRecording;
+    @Mock
+    private Instant end;
 
-  @BeforeEach
-  public void setup() {
-    assumeFalse(JavaVirtualMachine.isJ9());
-    when(recording.getState()).thenReturn(RecordingState.RUNNING);
-    when(recording.getName()).thenReturn(TEST_NAME);
+    @Mock
+    private Recording recording;
 
-    ongoingRecording =
-        new OpenJdkOngoingRecording(recording, new ControllerContext().snapshot(), true);
-  }
+    private OpenJdkOngoingRecording ongoingRecording;
 
-  @Test
-  public void testStop() {
-    RecordingData data = ongoingRecording.stop();
-    assertTrue(data instanceof OpenJdkRecordingData);
-    assertEquals(recording, ((OpenJdkRecordingData) data).getRecording());
+    @BeforeEach
+    public void setup() {
+        assumeFalse(JavaVirtualMachine.isJ9());
+        when(recording.getState()).thenReturn(RecordingState.RUNNING);
+        when(recording.getName()).thenReturn(TEST_NAME);
 
-    verify(recording).stop();
-  }
+        ongoingRecording = new OpenJdkOngoingRecording(recording, new ControllerContext().snapshot(), true);
+    }
 
-  @Test
-  public void testStopOnStopped() {
-    when(recording.getState()).thenReturn(RecordingState.STOPPED);
+    @Test
+    public void testStop() {
+        RecordingData data = ongoingRecording.stop();
+        assertTrue(data instanceof OpenJdkRecordingData);
+        assertEquals(recording, ((OpenJdkRecordingData) data).getRecording());
 
-    assertThrows(
-        IllegalStateException.class,
-        () -> {
-          ongoingRecording.stop();
+        verify(recording).stop();
+    }
+
+    @Test
+    public void testStopOnStopped() {
+        when(recording.getState()).thenReturn(RecordingState.STOPPED);
+
+        assertThrows(IllegalStateException.class, () -> {
+            ongoingRecording.stop();
         });
 
-    verify(recording, never()).stop();
-  }
-
-  @Test
-  public void testSnapshot() {
-    final RecordingData recordingData = ongoingRecording.snapshot(start);
-    assertTrue(recordingData instanceof OpenJdkRecordingData);
-    assertEquals(TEST_NAME, recordingData.getName());
-    assertEquals(start, recordingData.getStart());
-    assertEquals(
-        ((OpenJdkRecordingData) recordingData).getRecording().getStopTime(),
-        recordingData.getEnd());
-    assertNotEquals(
-        recording,
-        ((OpenJdkRecordingData) recordingData).getRecording(),
-        "make sure we didn't get our mocked recording");
-
-    // We got real recording so we should clean it up
-    recordingData.release();
-
-    verify(recording, never()).stop();
-  }
-
-  @Test
-  public void testSnapshotOnStopped() {
-    when(recording.getState()).thenReturn(RecordingState.STOPPED);
-
-    assertThrows(
-        IllegalStateException.class,
-        () -> {
-          ongoingRecording.snapshot(start);
+        verify(recording, never()).stop();
+    }
+
+    @Test
+    public void testSnapshot() {
+        final RecordingData recordingData = ongoingRecording.snapshot(start);
+        assertTrue(recordingData instanceof OpenJdkRecordingData);
+        assertEquals(TEST_NAME, recordingData.getName());
+        assertEquals(start, recordingData.getStart());
+        assertEquals(((OpenJdkRecordingData) recordingData).getRecording().getStopTime(), recordingData.getEnd());
+        assertNotEquals(
+                recording,
+                ((OpenJdkRecordingData) recordingData).getRecording(),
+                "make sure we didn't get our mocked recording");
+
+        // We got real recording so we should clean it up
+        recordingData.release();
+
+        verify(recording, never()).stop();
+    }
+
+    @Test
+    public void testSnapshotOnStopped() {
+        when(recording.getState()).thenReturn(RecordingState.STOPPED);
+
+        assertThrows(IllegalStateException.class, () -> {
+            ongoingRecording.snapshot(start);
         });
 
-    verify(recording, never()).stop();
-  }
+        verify(recording, never()).stop();
+    }
 
-  @Test
-  public void testClose() {
-    ongoingRecording.close();
+    @Test
+    public void testClose() {
+        ongoingRecording.close();
 
-    verify(recording).close();
-  }
+        verify(recording).close();
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingDataTest.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingDataTest.java
index fc1e164245d..116eef5b87f 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingDataTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingDataTest.java
@@ -28,84 +28,96 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 public class OpenJdkRecordingDataTest {
 
-  private static final String TEST_NAME = "recording name";
-
-  @Mock Instant start;
-  @Mock Instant end;
-  @Mock Instant customStart;
-  @Mock Instant customEnd;
-  @Mock private InputStream stream;
-  @Mock private InputStream customStream;
-  @Mock private Recording recording;
-
-  private OpenJdkRecordingData recordingData;
-  private OpenJdkRecordingData customRecordingData;
-
-  @BeforeEach
-  public void setup() throws IOException {
-    assumeFalse(JavaVirtualMachine.isJ9());
-    when(recording.getStream(start, end)).thenReturn(stream);
-    when(recording.getStream(customStart, customEnd)).thenReturn(customStream);
-    when(recording.getStartTime()).thenReturn(start);
-    when(recording.getStopTime()).thenReturn(end);
-    when(recording.getName()).thenReturn(TEST_NAME);
-
-    recordingData = new OpenJdkRecordingData(recording, ProfilingSnapshot.Kind.PERIODIC);
-    customRecordingData =
-        new OpenJdkRecordingData(
-            recording, customStart, customEnd, ProfilingSnapshot.Kind.PERIODIC);
-  }
-
-  @Test
-  public void testGetStream() throws IOException {
-    assertNotNull(recordingData.getStream());
-    verify(recording, VerificationModeFactory.times(1)).getStream(start, end);
-  }
-
-  @Test
-  public void testRelease() {
-    recordingData.release();
-    verify(recording).close();
-  }
-
-  @Test
-  public void testGetName() {
-    assertEquals(TEST_NAME, recordingData.getName());
-  }
-
-  @Test
-  public void testToString() {
-    assertTrue(recordingData.toString().contains(TEST_NAME));
-  }
-
-  @Test
-  public void testGetStart() {
-    assertEquals(start, recordingData.getStart());
-  }
-
-  @Test
-  public void testGetEnd() {
-    assertEquals(end, recordingData.getEnd());
-  }
-
-  @Test
-  public void testCustomGetStream() throws IOException {
-    assertNotNull(customRecordingData.getStream());
-    verify(recording, VerificationModeFactory.times(1)).getStream(customStart, customEnd);
-  }
-
-  @Test
-  public void testCustomGetStart() {
-    assertEquals(customStart, customRecordingData.getStart());
-  }
-
-  @Test
-  public void testCustomGetEnd() {
-    assertEquals(customEnd, customRecordingData.getEnd());
-  }
-
-  @Test
-  public void getRecording() {
-    assertEquals(recording, recordingData.getRecording());
-  }
+    private static final String TEST_NAME = "recording name";
+
+    @Mock
+    Instant start;
+
+    @Mock
+    Instant end;
+
+    @Mock
+    Instant customStart;
+
+    @Mock
+    Instant customEnd;
+
+    @Mock
+    private InputStream stream;
+
+    @Mock
+    private InputStream customStream;
+
+    @Mock
+    private Recording recording;
+
+    private OpenJdkRecordingData recordingData;
+    private OpenJdkRecordingData customRecordingData;
+
+    @BeforeEach
+    public void setup() throws IOException {
+        assumeFalse(JavaVirtualMachine.isJ9());
+        when(recording.getStream(start, end)).thenReturn(stream);
+        when(recording.getStream(customStart, customEnd)).thenReturn(customStream);
+        when(recording.getStartTime()).thenReturn(start);
+        when(recording.getStopTime()).thenReturn(end);
+        when(recording.getName()).thenReturn(TEST_NAME);
+
+        recordingData = new OpenJdkRecordingData(recording, ProfilingSnapshot.Kind.PERIODIC);
+        customRecordingData =
+                new OpenJdkRecordingData(recording, customStart, customEnd, ProfilingSnapshot.Kind.PERIODIC);
+    }
+
+    @Test
+    public void testGetStream() throws IOException {
+        assertNotNull(recordingData.getStream());
+        verify(recording, VerificationModeFactory.times(1)).getStream(start, end);
+    }
+
+    @Test
+    public void testRelease() {
+        recordingData.release();
+        verify(recording).close();
+    }
+
+    @Test
+    public void testGetName() {
+        assertEquals(TEST_NAME, recordingData.getName());
+    }
+
+    @Test
+    public void testToString() {
+        assertTrue(recordingData.toString().contains(TEST_NAME));
+    }
+
+    @Test
+    public void testGetStart() {
+        assertEquals(start, recordingData.getStart());
+    }
+
+    @Test
+    public void testGetEnd() {
+        assertEquals(end, recordingData.getEnd());
+    }
+
+    @Test
+    public void testCustomGetStream() throws IOException {
+        assertNotNull(customRecordingData.getStream());
+        verify(recording, VerificationModeFactory.times(1)).getStream(customStart, customEnd);
+    }
+
+    @Test
+    public void testCustomGetStart() {
+        assertEquals(customStart, customRecordingData.getStart());
+    }
+
+    @Test
+    public void testCustomGetEnd() {
+        assertEquals(customEnd, customRecordingData.getEnd());
+    }
+
+    @Test
+    public void getRecording() {
+        assertEquals(recording, recordingData.getRecording());
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/SafeToLoadJFRCheckpointerTest.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/SafeToLoadJFRCheckpointerTest.java
index 549692cc25c..215d5779a18 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/SafeToLoadJFRCheckpointerTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/SafeToLoadJFRCheckpointerTest.java
@@ -8,9 +8,9 @@
 
 public class SafeToLoadJFRCheckpointerTest {
 
-  @Test
-  public void testSafeToLoad() {
-    Assumptions.assumeTrue(ExcludedVersions.isVersionExcluded());
-    assertThrows(IllegalArgumentException.class, JFREventContextIntegration::new);
-  }
+    @Test
+    public void testSafeToLoad() {
+        Assumptions.assumeTrue(ExcludedVersions.isVersionExcluded());
+        assertThrows(IllegalArgumentException.class, JFREventContextIntegration::new);
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/DeadlockEventFactoryTest.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/DeadlockEventFactoryTest.java
index e49b6daf00c..30e6ddacb02 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/DeadlockEventFactoryTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/DeadlockEventFactoryTest.java
@@ -19,260 +19,248 @@
 import org.junit.jupiter.api.Test;
 
 class DeadlockEventFactoryTest {
-  private DeadlockEventFactory eventFactory;
-  private DeadlockEventFactory disabledDetailsEventFactory;
-  private DeadlockEventFactory allDisabledEventFactory;
+    private DeadlockEventFactory eventFactory;
+    private DeadlockEventFactory disabledDetailsEventFactory;
+    private DeadlockEventFactory allDisabledEventFactory;
 
-  @BeforeEach
-  void setUp() {
-    eventFactory =
-        new DeadlockEventFactory() {
-          @Override
-          boolean isDeadlockEventEnabled() {
-            return true;
-          }
+    @BeforeEach
+    void setUp() {
+        eventFactory = new DeadlockEventFactory() {
+            @Override
+            boolean isDeadlockEventEnabled() {
+                return true;
+            }
 
-          @Override
-          boolean isDeadlockedThreadEventEnabled() {
-            return true;
-          }
+            @Override
+            boolean isDeadlockedThreadEventEnabled() {
+                return true;
+            }
         };
 
-    disabledDetailsEventFactory =
-        new DeadlockEventFactory() {
-          @Override
-          boolean isDeadlockEventEnabled() {
-            return true;
-          }
+        disabledDetailsEventFactory = new DeadlockEventFactory() {
+            @Override
+            boolean isDeadlockEventEnabled() {
+                return true;
+            }
 
-          @Override
-          boolean isDeadlockedThreadEventEnabled() {
-            return false;
-          }
+            @Override
+            boolean isDeadlockedThreadEventEnabled() {
+                return false;
+            }
         };
 
-    allDisabledEventFactory =
-        new DeadlockEventFactory() {
-          @Override
-          boolean isDeadlockEventEnabled() {
-            return false;
-          }
+        allDisabledEventFactory = new DeadlockEventFactory() {
+            @Override
+            boolean isDeadlockEventEnabled() {
+                return false;
+            }
 
-          @Override
-          boolean isDeadlockedThreadEventEnabled() {
-            return false;
-          }
+            @Override
+            boolean isDeadlockedThreadEventEnabled() {
+                return false;
+            }
         };
-  }
+    }
 
-  @Test
-  void collectEvents() throws Exception {
-    /*
-     * All test cases must be done within one test method since there is no way to terminate
-     * deadlocked threads and indeterminate execution of test case would be very problematic
-     * due to residual state of the previous test cases.
-     */
-    assertNoDeadlocks();
-    int deadlocked = setupMonitorDeadlock();
-    assertDeadlock(true, deadlocked);
-    deadlocked += setupSynchronizableDeadlock();
-    assertDeadlock(false, deadlocked);
+    @Test
+    void collectEvents() throws Exception {
+        /*
+         * All test cases must be done within one test method since there is no way to terminate
+         * deadlocked threads and indeterminate execution of test case would be very problematic
+         * due to residual state of the previous test cases.
+         */
+        assertNoDeadlocks();
+        int deadlocked = setupMonitorDeadlock();
+        assertDeadlock(true, deadlocked);
+        deadlocked += setupSynchronizableDeadlock();
+        assertDeadlock(false, deadlocked);
 
-    assertEquals(
-        1,
-        disabledDetailsEventFactory.collectEvents().stream()
-            .filter(e -> e instanceof DeadlockEvent)
-            .count());
-    assertTrue(allDisabledEventFactory.collectEvents().isEmpty());
-  }
+        assertEquals(
+                1,
+                disabledDetailsEventFactory.collectEvents().stream()
+                        .filter(e -> e instanceof DeadlockEvent)
+                        .count());
+        assertTrue(allDisabledEventFactory.collectEvents().isEmpty());
+    }
 
-  private void assertDeadlock(boolean isMonitor, int expected) throws InterruptedException {
-    String classifier = isMonitor ? "monitor" : "lock";
+    private void assertDeadlock(boolean isMonitor, int expected) throws InterruptedException {
+        String classifier = isMonitor ? "monitor" : "lock";
 
-    List<? extends Event> events =
-        eventFactory.collectEvents().stream()
-            .filter(
-                e -> {
-                  if (e instanceof DeadlockedThreadEvent) {
-                    return ((DeadlockedThreadEvent) e).getThreadName().contains(classifier);
-                  }
-                  return true;
+        List<? extends Event> events = eventFactory.collectEvents().stream()
+                .filter(e -> {
+                    if (e instanceof DeadlockedThreadEvent) {
+                        return ((DeadlockedThreadEvent) e).getThreadName().contains(classifier);
+                    }
+                    return true;
                 })
-            .sorted(
-                (e1, e2) -> {
-                  if (e1 instanceof DeadlockEvent) {
-                    return e2 instanceof DeadlockEvent ? 0 : -1;
-                  } else {
-                    if (e2 instanceof DeadlockEvent) {
-                      return 1;
+                .sorted((e1, e2) -> {
+                    if (e1 instanceof DeadlockEvent) {
+                        return e2 instanceof DeadlockEvent ? 0 : -1;
+                    } else {
+                        if (e2 instanceof DeadlockEvent) {
+                            return 1;
+                        }
                     }
-                  }
-                  if (e1 instanceof DeadlockedThreadEvent && e2 instanceof DeadlockedThreadEvent) {
-                    return ((DeadlockedThreadEvent) e1)
-                        .getThreadName()
-                        .compareTo(((DeadlockedThreadEvent) e2).getThreadName());
-                  }
-                  return 0;
+                    if (e1 instanceof DeadlockedThreadEvent && e2 instanceof DeadlockedThreadEvent) {
+                        return ((DeadlockedThreadEvent) e1)
+                                .getThreadName()
+                                .compareTo(((DeadlockedThreadEvent) e2).getThreadName());
+                    }
+                    return 0;
                 })
-            .collect(Collectors.toList());
+                .collect(Collectors.toList());
 
-    assertNotNull(events);
-    assertEquals(3, events.size()); // 1 deadlock event + 2 deadlocked thread events in that order
-    assertEquals(DeadlockEvent.class, events.get(0).getClass());
-    assertEquals(DeadlockedThreadEvent.class, events.get(1).getClass());
-    assertEquals(DeadlockedThreadEvent.class, events.get(2).getClass());
+        assertNotNull(events);
+        assertEquals(3, events.size()); // 1 deadlock event + 2 deadlocked thread events in that order
+        assertEquals(DeadlockEvent.class, events.get(0).getClass());
+        assertEquals(DeadlockedThreadEvent.class, events.get(1).getClass());
+        assertEquals(DeadlockedThreadEvent.class, events.get(2).getClass());
 
-    DeadlockEvent deadlockEvent = (DeadlockEvent) events.get(0);
-    assertNotEquals(Long.MIN_VALUE, deadlockEvent.getId());
-    assertEquals(expected, deadlockEvent.getThreadCount());
+        DeadlockEvent deadlockEvent = (DeadlockEvent) events.get(0);
+        assertNotEquals(Long.MIN_VALUE, deadlockEvent.getId());
+        assertEquals(expected, deadlockEvent.getThreadCount());
 
-    long eventId = deadlockEvent.getId();
+        long eventId = deadlockEvent.getId();
 
-    DeadlockedThreadEvent threadEvent1 = (DeadlockedThreadEvent) events.get(1);
-    DeadlockedThreadEvent threadEvent2 = (DeadlockedThreadEvent) events.get(2);
+        DeadlockedThreadEvent threadEvent1 = (DeadlockedThreadEvent) events.get(1);
+        DeadlockedThreadEvent threadEvent2 = (DeadlockedThreadEvent) events.get(2);
 
-    assertEquals(classifier + "-thread-A", threadEvent1.getThreadName());
-    assertEquals(classifier + "-thread-B", threadEvent1.getLockOwnerThreadName());
-    assertEquals(eventId, threadEvent1.getId());
-    assertEquals(threadEvent1.getLockOwnerThreadName(), threadEvent2.getThreadName());
-    if (isMonitor) {
-      assertNotNull(threadEvent1.getLockingFrame());
-    } else {
-      assertNull(threadEvent1.getLockingFrame());
-    }
-    assertNotNull(threadEvent1.getWaitingFrame());
+        assertEquals(classifier + "-thread-A", threadEvent1.getThreadName());
+        assertEquals(classifier + "-thread-B", threadEvent1.getLockOwnerThreadName());
+        assertEquals(eventId, threadEvent1.getId());
+        assertEquals(threadEvent1.getLockOwnerThreadName(), threadEvent2.getThreadName());
+        if (isMonitor) {
+            assertNotNull(threadEvent1.getLockingFrame());
+        } else {
+            assertNull(threadEvent1.getLockingFrame());
+        }
+        assertNotNull(threadEvent1.getWaitingFrame());
 
-    assertEquals(classifier + "-thread-B", threadEvent2.getThreadName());
-    assertEquals(classifier + "-thread-A", threadEvent2.getLockOwnerThreadName());
-    assertEquals(eventId, threadEvent2.getId());
-    assertEquals(threadEvent1.getLockOwnerThreadName(), threadEvent2.getThreadName());
-    if (isMonitor) {
-      assertNotNull(threadEvent2.getLockingFrame());
-    } else {
-      assertNull(threadEvent2.getLockingFrame());
+        assertEquals(classifier + "-thread-B", threadEvent2.getThreadName());
+        assertEquals(classifier + "-thread-A", threadEvent2.getLockOwnerThreadName());
+        assertEquals(eventId, threadEvent2.getId());
+        assertEquals(threadEvent1.getLockOwnerThreadName(), threadEvent2.getThreadName());
+        if (isMonitor) {
+            assertNotNull(threadEvent2.getLockingFrame());
+        } else {
+            assertNull(threadEvent2.getLockingFrame());
+        }
+        assertNotNull(threadEvent2.getWaitingFrame());
     }
-    assertNotNull(threadEvent2.getWaitingFrame());
-  }
 
-  private void assertNoDeadlocks() {
-    // no deadlocks
-    assertTrue(eventFactory.collectEvents().isEmpty());
-  }
+    private void assertNoDeadlocks() {
+        // no deadlocks
+        assertTrue(eventFactory.collectEvents().isEmpty());
+    }
 
-  private static int setupMonitorDeadlock() throws InterruptedException {
-    // it is much easier to provoke a deadlock than mock all the JMX machinery
-    Phaser phaser = new Phaser(3);
-    Object lockA = new Object();
-    Object lockB = new Object();
+    private static int setupMonitorDeadlock() throws InterruptedException {
+        // it is much easier to provoke a deadlock than mock all the JMX machinery
+        Phaser phaser = new Phaser(3);
+        Object lockA = new Object();
+        Object lockB = new Object();
 
-    Thread threadA =
-        new Thread(
-            () -> {
-              synchronized (lockA) {
-                phaser.arriveAndAwaitAdvance(); // sync such as cross-order locking is provoked
-                synchronized (lockB) {
-                  phaser.arriveAndDeregister(); // virtually unreachable
-                }
-              }
-            },
-            "monitor-thread-A");
-    Thread threadB =
-        new Thread(
-            () -> {
-              synchronized (lockB) {
-                phaser.arriveAndAwaitAdvance(); // sync such as cross-order locking is provoked
-                synchronized (lockA) {
-                  phaser.arriveAndDeregister(); // virtually unreachable
-                }
-              }
-            },
-            "monitor-thread-B");
-    threadA.setDaemon(true);
-    threadB.setDaemon(true);
+        Thread threadA = new Thread(
+                () -> {
+                    synchronized (lockA) {
+                        phaser.arriveAndAwaitAdvance(); // sync such as cross-order locking is provoked
+                        synchronized (lockB) {
+                            phaser.arriveAndDeregister(); // virtually unreachable
+                        }
+                    }
+                },
+                "monitor-thread-A");
+        Thread threadB = new Thread(
+                () -> {
+                    synchronized (lockB) {
+                        phaser.arriveAndAwaitAdvance(); // sync such as cross-order locking is provoked
+                        synchronized (lockA) {
+                            phaser.arriveAndDeregister(); // virtually unreachable
+                        }
+                    }
+                },
+                "monitor-thread-B");
+        threadA.setDaemon(true);
+        threadB.setDaemon(true);
 
-    CountDownLatch latch = new CountDownLatch(1);
-    Thread main =
-        new Thread(
-            () -> {
-              threadA.start();
-              threadB.start();
-              phaser.arriveAndAwaitAdvance(); // enter deadlock
-              phaser.arriveAndAwaitAdvance(); // unreachable if deadlock is present
-              latch.countDown();
-            },
-            "main-monitor-thread");
-    main.setDaemon(true);
+        CountDownLatch latch = new CountDownLatch(1);
+        Thread main = new Thread(
+                () -> {
+                    threadA.start();
+                    threadB.start();
+                    phaser.arriveAndAwaitAdvance(); // enter deadlock
+                    phaser.arriveAndAwaitAdvance(); // unreachable if deadlock is present
+                    latch.countDown();
+                },
+                "main-monitor-thread");
+        main.setDaemon(true);
 
-    main.start();
+        main.start();
 
-    if (latch.await(500, TimeUnit.MILLISECONDS)) {
-      fail("Unable to create deadlock");
+        if (latch.await(500, TimeUnit.MILLISECONDS)) {
+            fail("Unable to create deadlock");
+        }
+        return 2;
     }
-    return 2;
-  }
 
-  private static int setupSynchronizableDeadlock() throws InterruptedException {
-    // it is much easier to provoke a deadlock than mock all the JMX machinery
-    Phaser phaser = new Phaser(3);
-    Lock lockA = new ReentrantLock();
-    Lock lockB = new ReentrantLock();
+    private static int setupSynchronizableDeadlock() throws InterruptedException {
+        // it is much easier to provoke a deadlock than mock all the JMX machinery
+        Phaser phaser = new Phaser(3);
+        Lock lockA = new ReentrantLock();
+        Lock lockB = new ReentrantLock();
+
+        Thread threadA = new Thread(
+                () -> {
+                    lockA.lock();
+                    try {
+                        phaser.arriveAndAwaitAdvance(); // sync such as cross-order locking is provoked
+                        lockB.lock();
+                        try {
+                            phaser.arriveAndDeregister(); // virtually unreachable
+                        } finally {
+                            lockB.unlock();
+                        }
+                    } finally {
+                        lockA.unlock();
+                    }
+                },
+                "lock-thread-A");
+        Thread threadB = new Thread(
+                () -> {
+                    lockB.lock();
+                    try {
+                        phaser.arriveAndAwaitAdvance(); // sync such as cross-order locking is provoked
+                        lockA.lock();
+                        try {
+                            phaser.arriveAndDeregister(); // virtually unreachable
+                        } finally {
+                            lockA.unlock();
+                        }
+                    } finally {
+                        lockB.unlock();
+                    }
+                },
+                "lock-thread-B");
+        threadA.setDaemon(true);
+        threadB.setDaemon(true);
 
-    Thread threadA =
-        new Thread(
-            () -> {
-              lockA.lock();
-              try {
-                phaser.arriveAndAwaitAdvance(); // sync such as cross-order locking is provoked
-                lockB.lock();
-                try {
-                  phaser.arriveAndDeregister(); // virtually unreachable
-                } finally {
-                  lockB.unlock();
-                }
-              } finally {
-                lockA.unlock();
-              }
-            },
-            "lock-thread-A");
-    Thread threadB =
-        new Thread(
-            () -> {
-              lockB.lock();
-              try {
-                phaser.arriveAndAwaitAdvance(); // sync such as cross-order locking is provoked
-                lockA.lock();
-                try {
-                  phaser.arriveAndDeregister(); // virtually unreachable
-                } finally {
-                  lockA.unlock();
-                }
-              } finally {
-                lockB.unlock();
-              }
-            },
-            "lock-thread-B");
-    threadA.setDaemon(true);
-    threadB.setDaemon(true);
+        CountDownLatch latch = new CountDownLatch(1);
+        Thread main = new Thread(
+                () -> {
+                    threadA.start();
+                    threadB.start();
+                    phaser.arriveAndAwaitAdvance(); // enter deadlock
+                    phaser.arriveAndAwaitAdvance(); // unreachable if deadlock is present
+                    latch.countDown();
+                },
+                "main-lock-thread");
+        main.setDaemon(true);
 
-    CountDownLatch latch = new CountDownLatch(1);
-    Thread main =
-        new Thread(
-            () -> {
-              threadA.start();
-              threadB.start();
-              phaser.arriveAndAwaitAdvance(); // enter deadlock
-              phaser.arriveAndAwaitAdvance(); // unreachable if deadlock is present
-              latch.countDown();
-            },
-            "main-lock-thread");
-    main.setDaemon(true);
+        main.start();
 
-    main.start();
+        if (latch.await(500, TimeUnit.MILLISECONDS)) {
+            fail("Unable to create deadlock");
+        }
 
-    if (latch.await(500, TimeUnit.MILLISECONDS)) {
-      fail("Unable to create deadlock");
+        return 2;
     }
-
-    return 2;
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/SimpleParserTest.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/SimpleParserTest.java
index 96bbfef3998..a1406946366 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/SimpleParserTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/SimpleParserTest.java
@@ -7,30 +7,30 @@
 import org.junit.jupiter.api.Test;
 
 public class SimpleParserTest {
-  private SimpleParser parser;
+    private SimpleParser parser;
 
-  int val1 = 3232;
-  long val2 = 0xffffffffff600000L;
-  String str = "fsdag";
+    int val1 = 3232;
+    long val2 = 0xffffffffff600000L;
+    String str = "fsdag";
 
-  @BeforeEach
-  public void setUp() {
-    parser = new SimpleParser(val1 + " " + str + " " + Long.toHexString(val2));
-  }
+    @BeforeEach
+    public void setUp() {
+        parser = new SimpleParser(val1 + " " + str + " " + Long.toHexString(val2));
+    }
 
-  @Test
-  void testNextLongValue() throws Exception {
-    assertEquals(val1, parser.nextLongValue(10));
-    assertEquals(-1, parser.nextLongValue(10));
-    assertEquals(val2, parser.nextLongValue(16));
-    assertEquals(-1, parser.nextLongValue(10));
-  }
+    @Test
+    void testNextLongValue() throws Exception {
+        assertEquals(val1, parser.nextLongValue(10));
+        assertEquals(-1, parser.nextLongValue(10));
+        assertEquals(val2, parser.nextLongValue(16));
+        assertEquals(-1, parser.nextLongValue(10));
+    }
 
-  @Test
-  void testStringValue() throws Exception {
-    assertEquals(Long.toString(val1), parser.nextStringValue());
-    assertEquals(str, parser.nextStringValue());
-    assertEquals(Long.toHexString(val2), parser.nextStringValue());
-    assertNull(parser.nextStringValue());
-  }
+    @Test
+    void testStringValue() throws Exception {
+        assertEquals(Long.toString(val1), parser.nextStringValue());
+        assertEquals(str, parser.nextStringValue());
+        assertEquals(Long.toHexString(val2), parser.nextStringValue());
+        assertNull(parser.nextStringValue());
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/SmapEntryCacheTest.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/SmapEntryCacheTest.java
index 512a3c49cf0..477b5c57074 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/SmapEntryCacheTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/SmapEntryCacheTest.java
@@ -12,21 +12,21 @@
 
 class SmapEntryCacheTest {
 
-  @Test
-  void getEvents() throws Exception {
-    // SMAPs are only available on Linux
-    assumeTrue(OperatingSystem.isLinux());
-    // We need at least Java 22 for the annotated regions
-    assumeTrue(JavaVirtualMachine.isJavaVersionAtLeast(22));
-    SmapEntryCache smapEntryCache =
-        new SmapEntryCache(Duration.ofHours(1)); // set up a really long expiration duration
-    List<SmapEntryEvent> events1 = smapEntryCache.getEvents();
-    List<SmapEntryEvent> events2 = smapEntryCache.getEvents();
-    // the cache is using double buffered event list so we can use identity comparison
-    assertSame(events1, events2);
+    @Test
+    void getEvents() throws Exception {
+        // SMAPs are only available on Linux
+        assumeTrue(OperatingSystem.isLinux());
+        // We need at least Java 22 for the annotated regions
+        assumeTrue(JavaVirtualMachine.isJavaVersionAtLeast(22));
+        SmapEntryCache smapEntryCache =
+                new SmapEntryCache(Duration.ofHours(1)); // set up a really long expiration duration
+        List<SmapEntryEvent> events1 = smapEntryCache.getEvents();
+        List<SmapEntryEvent> events2 = smapEntryCache.getEvents();
+        // the cache is using double buffered event list so we can use identity comparison
+        assertSame(events1, events2);
 
-    smapEntryCache.invalidate(); // pretend expiring the cache
-    events1 = smapEntryCache.getEvents();
-    assertNotSame(events1, events2);
-  }
+        smapEntryCache.invalidate(); // pretend expiring the cache
+        events1 = smapEntryCache.getEvents();
+        assertNotSame(events1, events2);
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/SmapEntryFactoryTest.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/SmapEntryFactoryTest.java
index 61daba54326..cb54aefadd1 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/SmapEntryFactoryTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/SmapEntryFactoryTest.java
@@ -16,50 +16,42 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 public class SmapEntryFactoryTest {
-  @ParameterizedTest
-  @ValueSource(ints = {23, 24})
-  void testAnnotatedRegionsSanity(int javaVersion) throws Exception {
-    try (BufferedReader br =
-        new BufferedReader(
-            new InputStreamReader(
-                Objects.requireNonNull(
-                    SmapEntryFactory.class.getResourceAsStream(
-                        "/smap/annotated_regions_" + javaVersion + ".txt"))))) {
+    @ParameterizedTest
+    @ValueSource(ints = {23, 24})
+    void testAnnotatedRegionsSanity(int javaVersion) throws Exception {
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(Objects.requireNonNull(
+                SmapEntryFactory.class.getResourceAsStream("/smap/annotated_regions_" + javaVersion + ".txt"))))) {
 
-      long sentinel = 0x1000000420000000L;
-      String line = null;
-      Set<String> descs = new HashSet<>();
-      boolean sentinelFound = false;
+            long sentinel = 0x1000000420000000L;
+            String line = null;
+            Set<String> descs = new HashSet<>();
+            boolean sentinelFound = false;
 
-      while ((line = br.readLine()) != null) {
-        SmapEntryCache.AnnotatedRegion region =
-            SmapEntryCache.fromAnnotatedEntry(line, javaVersion);
-        if (line.startsWith("0x")) {
-          assertNotNull(region);
-          descs.add(region.description);
-          sentinelFound |= region.startAddress == sentinel;
+            while ((line = br.readLine()) != null) {
+                SmapEntryCache.AnnotatedRegion region = SmapEntryCache.fromAnnotatedEntry(line, javaVersion);
+                if (line.startsWith("0x")) {
+                    assertNotNull(region);
+                    descs.add(region.description);
+                    sentinelFound |= region.startAddress == sentinel;
+                }
+            }
+            assertTrue(sentinelFound, "Sentinel address not found");
+            assertTrue(descs.contains("JAVAHEAP"), "JAVAHEAP not found");
+            assertTrue(descs.contains("GC"), "GC not found");
+            assertTrue(descs.contains("META"), "META not found");
+            assertTrue(descs.contains("STACK"), "STACK not found");
+            assertTrue(descs.contains("UNDEFINED"), "UNDEFINED not found");
         }
-      }
-      assertTrue(sentinelFound, "Sentinel address not found");
-      assertTrue(descs.contains("JAVAHEAP"), "JAVAHEAP not found");
-      assertTrue(descs.contains("GC"), "GC not found");
-      assertTrue(descs.contains("META"), "META not found");
-      assertTrue(descs.contains("STACK"), "STACK not found");
-      assertTrue(descs.contains("UNDEFINED"), "UNDEFINED not found");
     }
-  }
 
-  @Test
-  void testSmapSanity() throws Exception {
-    try (BufferedReader br =
-        new BufferedReader(
-            new InputStreamReader(
-                Objects.requireNonNull(
-                    SmapEntryFactory.class.getResourceAsStream("/smap/smaps.txt"))))) {
-      List<SmapEntryEvent> events = new ArrayList<>();
-      SmapEntryCache.readEvents(br, events);
-      assertNotNull(events);
-      assertEquals(747, events.size());
+    @Test
+    void testSmapSanity() throws Exception {
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(
+                Objects.requireNonNull(SmapEntryFactory.class.getResourceAsStream("/smap/smaps.txt"))))) {
+            List<SmapEntryEvent> events = new ArrayList<>();
+            SmapEntryCache.readEvents(br, events);
+            assertNotNull(events);
+            assertEquals(747, events.size());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/JdkTypeIDs_Old.java b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/JdkTypeIDs_Old.java
index 96be6d44e8a..6aeb67c5622 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/JdkTypeIDs_Old.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/JdkTypeIDs_Old.java
@@ -4,587 +4,571 @@
 
 /** 'Old' (pre JDK-11) JFR event type IDs */
 final class JdkTypeIDs_Old {
-  /** The prefix used for JDK 11 and later */
-  private static final String PREFIX = "jdk.";
+    /** The prefix used for JDK 11 and later */
+    private static final String PREFIX = "jdk.";
 
-  /** The prefix used for JDK 9 and 10. */
-  private static final String PREFIX_9_10 = "com.oracle.jdk.";
+    /** The prefix used for JDK 9 and 10. */
+    private static final String PREFIX_9_10 = "com.oracle.jdk.";
 
-  /*
-   * Package scope producer id constants
-   */
-  private static final String EVENT_ID_ROOT = "http://www.oracle.com/hotspot/"; // $NON-NLS-1$
-  private static final String JVM_EVENT_ID_ROOT = EVENT_ID_ROOT + "jvm/"; // $NON-NLS-1$
-  private static final String JDK_EVENT_ID_ROOT = EVENT_ID_ROOT + "jdk/"; // $NON-NLS-1$
-  private static final String JFR_INFO_EVENT_ID_ROOT = EVENT_ID_ROOT + "jfr-info/"; // $NON-NLS-1$
+    /*
+     * Package scope producer id constants
+     */
+    private static final String EVENT_ID_ROOT = "http://www.oracle.com/hotspot/"; // $NON-NLS-1$
+    private static final String JVM_EVENT_ID_ROOT = EVENT_ID_ROOT + "jvm/"; // $NON-NLS-1$
+    private static final String JDK_EVENT_ID_ROOT = EVENT_ID_ROOT + "jdk/"; // $NON-NLS-1$
+    private static final String JFR_INFO_EVENT_ID_ROOT = EVENT_ID_ROOT + "jfr-info/"; // $NON-NLS-1$
 
-  /*
-   * Unused JDK9 constants
-   */
+    /*
+     * Unused JDK9 constants
+     */
 
-  // Runtime
-  /*
-   * FIXME: VMError is commented out since the build cannot handle warnings on lines containing
-   * the text 'error'. Restore when we are sure that the build works with it.
-   */
-  //	private final static String VMError = PREFIX_9_10 + "VMError"; // "vm.runtime.vm_error";
-  private static final String ClassLoaderStatistics =
-      PREFIX_9_10 + "ClassLoaderStatistics"; // "java.statistics.class_loaders";
+    // Runtime
+    /*
+     * FIXME: VMError is commented out since the build cannot handle warnings on lines containing
+     * the text 'error'. Restore when we are sure that the build works with it.
+     */
+    //	private final static String VMError = PREFIX_9_10 + "VMError"; // "vm.runtime.vm_error";
+    private static final String ClassLoaderStatistics =
+            PREFIX_9_10 + "ClassLoaderStatistics"; // "java.statistics.class_loaders";
 
-  // GC
-  private static final String G1HeapSummary =
-      PREFIX_9_10 + "G1HeapSummary"; // "vm.gc.heap.g1_summary";
-  private static final String GC_G1MMU = PREFIX_9_10 + "GCG1MMU"; // "vm.gc.detailed.g1_mmu_info";
-  private static final String PromoteObjectInNewPLAB =
-      PREFIX_9_10 + "PromoteObjectInNewPLAB"; // "vm.gc.detailed.object_promotion_in_new_PLAB";
-  private static final String PromoteObjectOutsidePLAB =
-      PREFIX_9_10 + "PromoteObjectOutsidePLAB"; // "vm.gc.detailed.object_promotion_outside_PLAB";
+    // GC
+    private static final String G1HeapSummary = PREFIX_9_10 + "G1HeapSummary"; // "vm.gc.heap.g1_summary";
+    private static final String GC_G1MMU = PREFIX_9_10 + "GCG1MMU"; // "vm.gc.detailed.g1_mmu_info";
+    private static final String PromoteObjectInNewPLAB =
+            PREFIX_9_10 + "PromoteObjectInNewPLAB"; // "vm.gc.detailed.object_promotion_in_new_PLAB";
+    private static final String PromoteObjectOutsidePLAB =
+            PREFIX_9_10 + "PromoteObjectOutsidePLAB"; // "vm.gc.detailed.object_promotion_outside_PLAB";
 
-  /*
-   * JDK8 constants
-   */
-  private static final String CPU_LOAD = JVM_EVENT_ID_ROOT + "os/processor/cpu_load";
-  private static final String EXECUTION_SAMPLE = JVM_EVENT_ID_ROOT + "vm/prof/execution_sample";
-  private static final String EXECUTION_SAMPLING_INFO_EVENT_ID =
-      JVM_EVENT_ID_ROOT + "vm/prof/execution_sampling_info";
-  private static final String PROCESSES = JVM_EVENT_ID_ROOT + "os/system_process";
-  private static final String OS_MEMORY_SUMMARY = JVM_EVENT_ID_ROOT + "os/memory/physical_memory";
-  private static final String OS_INFORMATION = JVM_EVENT_ID_ROOT + "os/information";
-  private static final String CPU_INFORMATION = JVM_EVENT_ID_ROOT + "os/processor/cpu_information";
-  private static final String THREAD_ALLOCATION_STATISTICS =
-      JVM_EVENT_ID_ROOT + "java/statistics/thread_allocation";
-  private static final String HEAP_CONF = JVM_EVENT_ID_ROOT + "vm/gc/configuration/heap";
-  private static final String GC_CONF = JVM_EVENT_ID_ROOT + "vm/gc/configuration/gc";
-  private static final String HEAP_SUMMARY = JVM_EVENT_ID_ROOT + "vm/gc/heap/summary";
-  static final String ALLOC_INSIDE_TLAB = JVM_EVENT_ID_ROOT + "java/object_alloc_in_new_TLAB";
-  static final String ALLOC_OUTSIDE_TLAB = JVM_EVENT_ID_ROOT + "java/object_alloc_outside_TLAB";
-  private static final String VM_INFO = JVM_EVENT_ID_ROOT + "vm/info";
-  private static final String CLASS_LOAD = JVM_EVENT_ID_ROOT + "vm/class/load";
-  private static final String CLASS_UNLOAD = JVM_EVENT_ID_ROOT + "vm/class/unload";
-  private static final String CLASS_LOAD_STATISTICS =
-      JVM_EVENT_ID_ROOT + "java/statistics/class_loading";
-  static final String COMPILATION = JVM_EVENT_ID_ROOT + "vm/compiler/compilation";
+    /*
+     * JDK8 constants
+     */
+    private static final String CPU_LOAD = JVM_EVENT_ID_ROOT + "os/processor/cpu_load";
+    private static final String EXECUTION_SAMPLE = JVM_EVENT_ID_ROOT + "vm/prof/execution_sample";
+    private static final String EXECUTION_SAMPLING_INFO_EVENT_ID =
+            JVM_EVENT_ID_ROOT + "vm/prof/execution_sampling_info";
+    private static final String PROCESSES = JVM_EVENT_ID_ROOT + "os/system_process";
+    private static final String OS_MEMORY_SUMMARY = JVM_EVENT_ID_ROOT + "os/memory/physical_memory";
+    private static final String OS_INFORMATION = JVM_EVENT_ID_ROOT + "os/information";
+    private static final String CPU_INFORMATION = JVM_EVENT_ID_ROOT + "os/processor/cpu_information";
+    private static final String THREAD_ALLOCATION_STATISTICS = JVM_EVENT_ID_ROOT + "java/statistics/thread_allocation";
+    private static final String HEAP_CONF = JVM_EVENT_ID_ROOT + "vm/gc/configuration/heap";
+    private static final String GC_CONF = JVM_EVENT_ID_ROOT + "vm/gc/configuration/gc";
+    private static final String HEAP_SUMMARY = JVM_EVENT_ID_ROOT + "vm/gc/heap/summary";
+    static final String ALLOC_INSIDE_TLAB = JVM_EVENT_ID_ROOT + "java/object_alloc_in_new_TLAB";
+    static final String ALLOC_OUTSIDE_TLAB = JVM_EVENT_ID_ROOT + "java/object_alloc_outside_TLAB";
+    private static final String VM_INFO = JVM_EVENT_ID_ROOT + "vm/info";
+    private static final String CLASS_LOAD = JVM_EVENT_ID_ROOT + "vm/class/load";
+    private static final String CLASS_UNLOAD = JVM_EVENT_ID_ROOT + "vm/class/unload";
+    private static final String CLASS_LOAD_STATISTICS = JVM_EVENT_ID_ROOT + "java/statistics/class_loading";
+    static final String COMPILATION = JVM_EVENT_ID_ROOT + "vm/compiler/compilation";
 
-  private static final String FILE_WRITE = JDK_EVENT_ID_ROOT + "java/file_write";
-  private static final String FILE_READ = JDK_EVENT_ID_ROOT + "java/file_read";
-  private static final String SOCKET_WRITE = JDK_EVENT_ID_ROOT + "java/socket_write";
-  private static final String SOCKET_READ = JDK_EVENT_ID_ROOT + "java/socket_read";
+    private static final String FILE_WRITE = JDK_EVENT_ID_ROOT + "java/file_write";
+    private static final String FILE_READ = JDK_EVENT_ID_ROOT + "java/file_read";
+    private static final String SOCKET_WRITE = JDK_EVENT_ID_ROOT + "java/socket_write";
+    private static final String SOCKET_READ = JDK_EVENT_ID_ROOT + "java/socket_read";
 
-  static final String THREAD_PARK = JVM_EVENT_ID_ROOT + "java/thread_park";
-  private static final String THREAD_SLEEP = JVM_EVENT_ID_ROOT + "java/thread_sleep";
-  static final String MONITOR_ENTER = JVM_EVENT_ID_ROOT + "java/monitor_enter";
-  static final String MONITOR_WAIT = JVM_EVENT_ID_ROOT + "java/monitor_wait";
+    static final String THREAD_PARK = JVM_EVENT_ID_ROOT + "java/thread_park";
+    private static final String THREAD_SLEEP = JVM_EVENT_ID_ROOT + "java/thread_sleep";
+    static final String MONITOR_ENTER = JVM_EVENT_ID_ROOT + "java/monitor_enter";
+    static final String MONITOR_WAIT = JVM_EVENT_ID_ROOT + "java/monitor_wait";
 
-  private static final String METASPACE_OOM = JVM_EVENT_ID_ROOT + "vm/gc/metaspace/out_of_memory";
+    private static final String METASPACE_OOM = JVM_EVENT_ID_ROOT + "vm/gc/metaspace/out_of_memory";
 
-  private static final String CODE_CACHE_FULL = JVM_EVENT_ID_ROOT + "vm/code_cache/full";
-  static final String CODE_CACHE_STATISTICS = JVM_EVENT_ID_ROOT + "vm/code_cache/stats";
+    private static final String CODE_CACHE_FULL = JVM_EVENT_ID_ROOT + "vm/code_cache/full";
+    static final String CODE_CACHE_STATISTICS = JVM_EVENT_ID_ROOT + "vm/code_cache/stats";
 
-  private static final String CODE_SWEEPER_STATISTICS = JVM_EVENT_ID_ROOT + "vm/code_sweeper/stats";
-  static final String SWEEP_CODE_CACHE = JVM_EVENT_ID_ROOT + "vm/code_sweeper/sweep";
+    private static final String CODE_SWEEPER_STATISTICS = JVM_EVENT_ID_ROOT + "vm/code_sweeper/stats";
+    static final String SWEEP_CODE_CACHE = JVM_EVENT_ID_ROOT + "vm/code_sweeper/sweep";
 
-  private static final String ENVIRONMENT_VARIABLE =
-      JVM_EVENT_ID_ROOT + "os/initial_environment_variable";
-  private static final String SYSTEM_PROPERTIES = JVM_EVENT_ID_ROOT + "vm/initial_system_property";
+    private static final String ENVIRONMENT_VARIABLE = JVM_EVENT_ID_ROOT + "os/initial_environment_variable";
+    private static final String SYSTEM_PROPERTIES = JVM_EVENT_ID_ROOT + "vm/initial_system_property";
 
-  static final String OBJECT_COUNT = JVM_EVENT_ID_ROOT + "vm/gc/detailed/object_count";
-  private static final String GC_REFERENCE_STATISTICS =
-      JVM_EVENT_ID_ROOT + "vm/gc/reference/statistics";
+    static final String OBJECT_COUNT = JVM_EVENT_ID_ROOT + "vm/gc/detailed/object_count";
+    private static final String GC_REFERENCE_STATISTICS = JVM_EVENT_ID_ROOT + "vm/gc/reference/statistics";
 
-  private static final String OLD_OBJECT_SAMPLE = JVM_EVENT_ID_ROOT + "java/old_object";
+    private static final String OLD_OBJECT_SAMPLE = JVM_EVENT_ID_ROOT + "java/old_object";
 
-  private static final String GC_PAUSE_L3 = JVM_EVENT_ID_ROOT + "vm/gc/phases/pause_level_3";
-  private static final String GC_PAUSE_L2 = JVM_EVENT_ID_ROOT + "vm/gc/phases/pause_level_2";
-  private static final String GC_PAUSE_L1 = JVM_EVENT_ID_ROOT + "vm/gc/phases/pause_level_1";
-  private static final String GC_PAUSE = JVM_EVENT_ID_ROOT + "vm/gc/phases/pause";
+    private static final String GC_PAUSE_L3 = JVM_EVENT_ID_ROOT + "vm/gc/phases/pause_level_3";
+    private static final String GC_PAUSE_L2 = JVM_EVENT_ID_ROOT + "vm/gc/phases/pause_level_2";
+    private static final String GC_PAUSE_L1 = JVM_EVENT_ID_ROOT + "vm/gc/phases/pause_level_1";
+    private static final String GC_PAUSE = JVM_EVENT_ID_ROOT + "vm/gc/phases/pause";
 
-  private static final String METASPACE_SUMMARY =
-      JVM_EVENT_ID_ROOT + "vm/gc/heap/metaspace_summary";
-  private static final String GARBAGE_COLLECTION =
-      JVM_EVENT_ID_ROOT + "vm/gc/collector/garbage_collection";
-  private static final String CONCURRENT_MODE_FAILURE =
-      JVM_EVENT_ID_ROOT + "vm/gc/detailed/concurrent_mode_failure";
+    private static final String METASPACE_SUMMARY = JVM_EVENT_ID_ROOT + "vm/gc/heap/metaspace_summary";
+    private static final String GARBAGE_COLLECTION = JVM_EVENT_ID_ROOT + "vm/gc/collector/garbage_collection";
+    private static final String CONCURRENT_MODE_FAILURE = JVM_EVENT_ID_ROOT + "vm/gc/detailed/concurrent_mode_failure";
 
-  private static final String THROWABLES_STATISTICS =
-      JDK_EVENT_ID_ROOT + "java/statistics/throwables";
-  private static final String ERRORS_THROWN = JDK_EVENT_ID_ROOT + "java/error_throw";
-  private static final String EXCEPTIONS_THROWN = JDK_EVENT_ID_ROOT + "java/exception_throw";
+    private static final String THROWABLES_STATISTICS = JDK_EVENT_ID_ROOT + "java/statistics/throwables";
+    private static final String ERRORS_THROWN = JDK_EVENT_ID_ROOT + "java/error_throw";
+    private static final String EXCEPTIONS_THROWN = JDK_EVENT_ID_ROOT + "java/exception_throw";
 
-  private static final String COMPILER_STATS = JVM_EVENT_ID_ROOT + "vm/compiler/stats";
-  static final String COMPILER_FAILURE = JVM_EVENT_ID_ROOT + "vm/compiler/failure";
+    private static final String COMPILER_STATS = JVM_EVENT_ID_ROOT + "vm/compiler/stats";
+    static final String COMPILER_FAILURE = JVM_EVENT_ID_ROOT + "vm/compiler/failure";
 
-  private static final String ULONG_FLAG = JVM_EVENT_ID_ROOT + "vm/flag/ulong";
-  private static final String BOOLEAN_FLAG = JVM_EVENT_ID_ROOT + "vm/flag/boolean";
-  private static final String STRING_FLAG = JVM_EVENT_ID_ROOT + "vm/flag/string";
-  private static final String DOUBLE_FLAG = JVM_EVENT_ID_ROOT + "vm/flag/double";
-  private static final String LONG_FLAG = JVM_EVENT_ID_ROOT + "vm/flag/long";
-  private static final String INT_FLAG = JVM_EVENT_ID_ROOT + "vm/flag/int";
-  private static final String UINT_FLAG = JVM_EVENT_ID_ROOT + "vm/flag/uint";
+    private static final String ULONG_FLAG = JVM_EVENT_ID_ROOT + "vm/flag/ulong";
+    private static final String BOOLEAN_FLAG = JVM_EVENT_ID_ROOT + "vm/flag/boolean";
+    private static final String STRING_FLAG = JVM_EVENT_ID_ROOT + "vm/flag/string";
+    private static final String DOUBLE_FLAG = JVM_EVENT_ID_ROOT + "vm/flag/double";
+    private static final String LONG_FLAG = JVM_EVENT_ID_ROOT + "vm/flag/long";
+    private static final String INT_FLAG = JVM_EVENT_ID_ROOT + "vm/flag/int";
+    private static final String UINT_FLAG = JVM_EVENT_ID_ROOT + "vm/flag/uint";
 
-  static final String ULONG_FLAG_CHANGED = JVM_EVENT_ID_ROOT + "vm/flag/ulong_changed";
-  static final String BOOLEAN_FLAG_CHANGED = JVM_EVENT_ID_ROOT + "vm/flag/boolean_changed";
-  static final String STRING_FLAG_CHANGED = JVM_EVENT_ID_ROOT + "vm/flag/string_changed";
-  static final String DOUBLE_FLAG_CHANGED = JVM_EVENT_ID_ROOT + "vm/flag/double_changed";
-  static final String LONG_FLAG_CHANGED = JVM_EVENT_ID_ROOT + "vm/flag/long_changed";
-  static final String INT_FLAG_CHANGED = JVM_EVENT_ID_ROOT + "vm/flag/int_changed";
-  static final String UINT_FLAG_CHANGED = JVM_EVENT_ID_ROOT + "vm/flag/uint_changed";
+    static final String ULONG_FLAG_CHANGED = JVM_EVENT_ID_ROOT + "vm/flag/ulong_changed";
+    static final String BOOLEAN_FLAG_CHANGED = JVM_EVENT_ID_ROOT + "vm/flag/boolean_changed";
+    static final String STRING_FLAG_CHANGED = JVM_EVENT_ID_ROOT + "vm/flag/string_changed";
+    static final String DOUBLE_FLAG_CHANGED = JVM_EVENT_ID_ROOT + "vm/flag/double_changed";
+    static final String LONG_FLAG_CHANGED = JVM_EVENT_ID_ROOT + "vm/flag/long_changed";
+    static final String INT_FLAG_CHANGED = JVM_EVENT_ID_ROOT + "vm/flag/int_changed";
+    static final String UINT_FLAG_CHANGED = JVM_EVENT_ID_ROOT + "vm/flag/uint_changed";
 
-  private static final String TIME_CONVERSION = JVM_EVENT_ID_ROOT + "os/processor/cpu_tsc";
-  private static final String THREAD_DUMP = JVM_EVENT_ID_ROOT + "vm/runtime/thread_dump";
+    private static final String TIME_CONVERSION = JVM_EVENT_ID_ROOT + "os/processor/cpu_tsc";
+    private static final String THREAD_DUMP = JVM_EVENT_ID_ROOT + "vm/runtime/thread_dump";
 
-  private static final String GC_CONF_YOUNG_GENERATION =
-      JVM_EVENT_ID_ROOT + "vm/gc/configuration/young_generation";
-  private static final String GC_CONF_SURVIVOR = JVM_EVENT_ID_ROOT + "vm/gc/configuration/survivor";
-  private static final String GC_CONF_TLAB = JVM_EVENT_ID_ROOT + "vm/gc/configuration/tlab";
+    private static final String GC_CONF_YOUNG_GENERATION = JVM_EVENT_ID_ROOT + "vm/gc/configuration/young_generation";
+    private static final String GC_CONF_SURVIVOR = JVM_EVENT_ID_ROOT + "vm/gc/configuration/survivor";
+    private static final String GC_CONF_TLAB = JVM_EVENT_ID_ROOT + "vm/gc/configuration/tlab";
 
-  private static final String JAVA_THREAD_START = JVM_EVENT_ID_ROOT + "java/thread_start";
-  private static final String JAVA_THREAD_END = JVM_EVENT_ID_ROOT + "java/thread_end";
-  private static final String VM_OPERATIONS = JVM_EVENT_ID_ROOT + "vm/runtime/execute_vm_operation";
+    private static final String JAVA_THREAD_START = JVM_EVENT_ID_ROOT + "java/thread_start";
+    private static final String JAVA_THREAD_END = JVM_EVENT_ID_ROOT + "java/thread_end";
+    private static final String VM_OPERATIONS = JVM_EVENT_ID_ROOT + "vm/runtime/execute_vm_operation";
 
-  private static final String THREAD_STATISTICS = JVM_EVENT_ID_ROOT + "java/statistics/threads";
-  private static final String CONTEXT_SWITCH_RATE =
-      JVM_EVENT_ID_ROOT + "os/processor/context_switch_rate";
+    private static final String THREAD_STATISTICS = JVM_EVENT_ID_ROOT + "java/statistics/threads";
+    private static final String CONTEXT_SWITCH_RATE = JVM_EVENT_ID_ROOT + "os/processor/context_switch_rate";
 
-  private static final String COMPILER_CONFIG = JVM_EVENT_ID_ROOT + "vm/compiler/config";
-  private static final String CODE_CACHE_CONFIG = JVM_EVENT_ID_ROOT + "vm/code_cache/config";
-  private static final String CODE_SWEEPER_CONFIG = JVM_EVENT_ID_ROOT + "vm/code_sweeper/config";
-  static final String COMPILER_PHASE = JVM_EVENT_ID_ROOT + "vm/compiler/phase";
-  private static final String GC_COLLECTOR_G1_GARBAGE_COLLECTION =
-      JVM_EVENT_ID_ROOT + "vm/gc/collector/g1_garbage_collection";
-  private static final String GC_COLLECTOR_OLD_GARBAGE_COLLECTION =
-      JVM_EVENT_ID_ROOT + "vm/gc/collector/old_garbage_collection";
-  private static final String GC_COLLECTOR_PAROLD_GARBAGE_COLLECTION =
-      JVM_EVENT_ID_ROOT + "vm/gc/collector/parold_garbage_collection";
-  private static final String GC_COLLECTOR_YOUNG_GARBAGE_COLLECTION =
-      JVM_EVENT_ID_ROOT + "vm/gc/collector/young_garbage_collection";
-  private static final String GC_DETAILED_ALLOCATION_REQUIRING_GC =
-      JVM_EVENT_ID_ROOT + "vm/gc/detailed/allocation_requiring_gc";
-  private static final String GC_DETAILED_EVACUATION_FAILED =
-      JVM_EVENT_ID_ROOT + "vm/gc/detailed/evacuation_failed";
-  static final String GC_DETAILED_EVACUATION_INFO =
-      JVM_EVENT_ID_ROOT + "vm/gc/detailed/evacuation_info";
-  static final String GC_DETAILED_OBJECT_COUNT_AFTER_GC =
-      JVM_EVENT_ID_ROOT + "vm/gc/detailed/object_count_after_gc";
-  private static final String GC_DETAILED_PROMOTION_FAILED =
-      JVM_EVENT_ID_ROOT + "vm/gc/detailed/promotion_failed";
-  private static final String GC_HEAP_PS_SUMMARY = JVM_EVENT_ID_ROOT + "vm/gc/heap/ps_summary";
-  private static final String GC_METASPACE_ALLOCATION_FAILURE =
-      JVM_EVENT_ID_ROOT + "vm/gc/metaspace/allocation_failure";
-  private static final String GC_METASPACE_CHUNK_FREE_LIST_SUMMARY =
-      JVM_EVENT_ID_ROOT + "vm/gc/metaspace/chunk_free_list_summary";
-  private static final String GC_METASPACE_GC_THRESHOLD =
-      JVM_EVENT_ID_ROOT + "vm/gc/metaspace/gc_threshold";
+    private static final String COMPILER_CONFIG = JVM_EVENT_ID_ROOT + "vm/compiler/config";
+    private static final String CODE_CACHE_CONFIG = JVM_EVENT_ID_ROOT + "vm/code_cache/config";
+    private static final String CODE_SWEEPER_CONFIG = JVM_EVENT_ID_ROOT + "vm/code_sweeper/config";
+    static final String COMPILER_PHASE = JVM_EVENT_ID_ROOT + "vm/compiler/phase";
+    private static final String GC_COLLECTOR_G1_GARBAGE_COLLECTION =
+            JVM_EVENT_ID_ROOT + "vm/gc/collector/g1_garbage_collection";
+    private static final String GC_COLLECTOR_OLD_GARBAGE_COLLECTION =
+            JVM_EVENT_ID_ROOT + "vm/gc/collector/old_garbage_collection";
+    private static final String GC_COLLECTOR_PAROLD_GARBAGE_COLLECTION =
+            JVM_EVENT_ID_ROOT + "vm/gc/collector/parold_garbage_collection";
+    private static final String GC_COLLECTOR_YOUNG_GARBAGE_COLLECTION =
+            JVM_EVENT_ID_ROOT + "vm/gc/collector/young_garbage_collection";
+    private static final String GC_DETAILED_ALLOCATION_REQUIRING_GC =
+            JVM_EVENT_ID_ROOT + "vm/gc/detailed/allocation_requiring_gc";
+    private static final String GC_DETAILED_EVACUATION_FAILED = JVM_EVENT_ID_ROOT + "vm/gc/detailed/evacuation_failed";
+    static final String GC_DETAILED_EVACUATION_INFO = JVM_EVENT_ID_ROOT + "vm/gc/detailed/evacuation_info";
+    static final String GC_DETAILED_OBJECT_COUNT_AFTER_GC = JVM_EVENT_ID_ROOT + "vm/gc/detailed/object_count_after_gc";
+    private static final String GC_DETAILED_PROMOTION_FAILED = JVM_EVENT_ID_ROOT + "vm/gc/detailed/promotion_failed";
+    private static final String GC_HEAP_PS_SUMMARY = JVM_EVENT_ID_ROOT + "vm/gc/heap/ps_summary";
+    private static final String GC_METASPACE_ALLOCATION_FAILURE =
+            JVM_EVENT_ID_ROOT + "vm/gc/metaspace/allocation_failure";
+    private static final String GC_METASPACE_CHUNK_FREE_LIST_SUMMARY =
+            JVM_EVENT_ID_ROOT + "vm/gc/metaspace/chunk_free_list_summary";
+    private static final String GC_METASPACE_GC_THRESHOLD = JVM_EVENT_ID_ROOT + "vm/gc/metaspace/gc_threshold";
 
-  static final String RECORDINGS = JFR_INFO_EVENT_ID_ROOT + "recordings/recording";
-  static final String RECORDING_SETTING = JFR_INFO_EVENT_ID_ROOT + "recordings/recording_setting";
-  static final String JDK9_RECORDING_SETTING = PREFIX_9_10 + "ActiveSetting";
+    static final String RECORDINGS = JFR_INFO_EVENT_ID_ROOT + "recordings/recording";
+    static final String RECORDING_SETTING = JFR_INFO_EVENT_ID_ROOT + "recordings/recording_setting";
+    static final String JDK9_RECORDING_SETTING = PREFIX_9_10 + "ActiveSetting";
 
-  static final String BUFFER_LOST_TYPE_ID = "org.openjdk.jmc.flightrecorder.bufferlosttypeid";
+    static final String BUFFER_LOST_TYPE_ID = "org.openjdk.jmc.flightrecorder.bufferlosttypeid";
 
-  /**
-   * Translate a pre-JDK 11 type id into a JDK 11 type id.
-   *
-   * @param typeId Pre-JDK 11 type id
-   * @return JDK 11 type id
-   */
-  public static String translateFrom(String typeId) {
-    if (typeId.startsWith(PREFIX_9_10)) {
-      if (typeId.endsWith("AllocationRequiringGc")) {
-        return JdkTypeIDs.GC_DETAILED_ALLOCATION_REQUIRING_GC;
-      }
-      if (typeId.endsWith("GCG1MMU")) {
-        return JdkTypeIDs.GC_G1MMU;
-      }
-      return PREFIX + typeId.substring(PREFIX_9_10.length());
+    /**
+     * Translate a pre-JDK 11 type id into a JDK 11 type id.
+     *
+     * @param typeId Pre-JDK 11 type id
+     * @return JDK 11 type id
+     */
+    public static String translateFrom(String typeId) {
+        if (typeId.startsWith(PREFIX_9_10)) {
+            if (typeId.endsWith("AllocationRequiringGc")) {
+                return JdkTypeIDs.GC_DETAILED_ALLOCATION_REQUIRING_GC;
+            }
+            if (typeId.endsWith("GCG1MMU")) {
+                return JdkTypeIDs.GC_G1MMU;
+            }
+            return PREFIX + typeId.substring(PREFIX_9_10.length());
+        }
+        switch (typeId) {
+            case CPU_LOAD:
+                return JdkTypeIDs.CPU_LOAD;
+            case EXECUTION_SAMPLE:
+                return JdkTypeIDs.EXECUTION_SAMPLE;
+            case EXECUTION_SAMPLING_INFO_EVENT_ID:
+                return JdkTypeIDs.EXECUTION_SAMPLING_INFO_EVENT_ID;
+            case PROCESSES:
+                return JdkTypeIDs.PROCESSES;
+            case OS_MEMORY_SUMMARY:
+                return JdkTypeIDs.OS_MEMORY_SUMMARY;
+            case OS_INFORMATION:
+                return JdkTypeIDs.OS_INFORMATION;
+            case CPU_INFORMATION:
+                return JdkTypeIDs.CPU_INFORMATION;
+            case THREAD_ALLOCATION_STATISTICS:
+                return JdkTypeIDs.THREAD_ALLOCATION_STATISTICS;
+            case HEAP_CONF:
+                return JdkTypeIDs.HEAP_CONF;
+            case GC_CONF:
+                return JdkTypeIDs.GC_CONF;
+            case HEAP_SUMMARY:
+                return JdkTypeIDs.HEAP_SUMMARY;
+            case ALLOC_INSIDE_TLAB:
+                return JdkTypeIDs.ALLOC_INSIDE_TLAB;
+            case ALLOC_OUTSIDE_TLAB:
+                return JdkTypeIDs.ALLOC_OUTSIDE_TLAB;
+            case VM_INFO:
+                return JdkTypeIDs.VM_INFO;
+            case CLASS_LOAD:
+                return JdkTypeIDs.CLASS_LOAD;
+            case CLASS_UNLOAD:
+                return JdkTypeIDs.CLASS_UNLOAD;
+            case CLASS_LOAD_STATISTICS:
+                return JdkTypeIDs.CLASS_LOAD_STATISTICS;
+            case COMPILATION:
+                return JdkTypeIDs.COMPILATION;
+            case FILE_WRITE:
+                return JdkTypeIDs.FILE_WRITE;
+            case FILE_READ:
+                return JdkTypeIDs.FILE_READ;
+            case SOCKET_WRITE:
+                return JdkTypeIDs.SOCKET_WRITE;
+            case SOCKET_READ:
+                return JdkTypeIDs.SOCKET_READ;
+            case THREAD_PARK:
+                return JdkTypeIDs.THREAD_PARK;
+            case THREAD_SLEEP:
+                return JdkTypeIDs.THREAD_SLEEP;
+            case MONITOR_ENTER:
+                return JdkTypeIDs.MONITOR_ENTER;
+            case MONITOR_WAIT:
+                return JdkTypeIDs.MONITOR_WAIT;
+            case METASPACE_OOM:
+                return JdkTypeIDs.METASPACE_OOM;
+            case CODE_CACHE_FULL:
+                return JdkTypeIDs.CODE_CACHE_FULL;
+            case CODE_CACHE_STATISTICS:
+                return JdkTypeIDs.CODE_CACHE_STATISTICS;
+            case CODE_SWEEPER_STATISTICS:
+                return JdkTypeIDs.CODE_SWEEPER_STATISTICS;
+            case SWEEP_CODE_CACHE:
+                return JdkTypeIDs.SWEEP_CODE_CACHE;
+            case ENVIRONMENT_VARIABLE:
+                return JdkTypeIDs.ENVIRONMENT_VARIABLE;
+            case SYSTEM_PROPERTIES:
+                return JdkTypeIDs.SYSTEM_PROPERTIES;
+            case OBJECT_COUNT:
+                return JdkTypeIDs.OBJECT_COUNT;
+            case GC_REFERENCE_STATISTICS:
+                return JdkTypeIDs.GC_REFERENCE_STATISTICS;
+            case OLD_OBJECT_SAMPLE:
+                return JdkTypeIDs.OLD_OBJECT_SAMPLE;
+            case GC_PAUSE_L3:
+                return JdkTypeIDs.GC_PAUSE_L3;
+            case GC_PAUSE_L2:
+                return JdkTypeIDs.GC_PAUSE_L2;
+            case GC_PAUSE_L1:
+                return JdkTypeIDs.GC_PAUSE_L1;
+            case GC_PAUSE:
+                return JdkTypeIDs.GC_PAUSE;
+            case METASPACE_SUMMARY:
+                return JdkTypeIDs.METASPACE_SUMMARY;
+            case GARBAGE_COLLECTION:
+                return JdkTypeIDs.GARBAGE_COLLECTION;
+            case CONCURRENT_MODE_FAILURE:
+                return JdkTypeIDs.CONCURRENT_MODE_FAILURE;
+            case THROWABLES_STATISTICS:
+                return JdkTypeIDs.THROWABLES_STATISTICS;
+            case ERRORS_THROWN:
+                return JdkTypeIDs.ERRORS_THROWN;
+            case EXCEPTIONS_THROWN:
+                return JdkTypeIDs.EXCEPTIONS_THROWN;
+            case COMPILER_STATS:
+                return JdkTypeIDs.COMPILER_STATS;
+            case COMPILER_FAILURE:
+                return JdkTypeIDs.COMPILER_FAILURE;
+            case ULONG_FLAG:
+                return JdkTypeIDs.ULONG_FLAG;
+            case BOOLEAN_FLAG:
+                return JdkTypeIDs.BOOLEAN_FLAG;
+            case STRING_FLAG:
+                return JdkTypeIDs.STRING_FLAG;
+            case DOUBLE_FLAG:
+                return JdkTypeIDs.DOUBLE_FLAG;
+            case LONG_FLAG:
+                return JdkTypeIDs.LONG_FLAG;
+            case INT_FLAG:
+                return JdkTypeIDs.INT_FLAG;
+            case UINT_FLAG:
+                return JdkTypeIDs.UINT_FLAG;
+            case ULONG_FLAG_CHANGED:
+                return JdkTypeIDs.ULONG_FLAG_CHANGED;
+            case BOOLEAN_FLAG_CHANGED:
+                return JdkTypeIDs.BOOLEAN_FLAG_CHANGED;
+            case STRING_FLAG_CHANGED:
+                return JdkTypeIDs.STRING_FLAG_CHANGED;
+            case DOUBLE_FLAG_CHANGED:
+                return JdkTypeIDs.DOUBLE_FLAG_CHANGED;
+            case LONG_FLAG_CHANGED:
+                return JdkTypeIDs.LONG_FLAG_CHANGED;
+            case INT_FLAG_CHANGED:
+                return JdkTypeIDs.INT_FLAG_CHANGED;
+            case UINT_FLAG_CHANGED:
+                return JdkTypeIDs.UINT_FLAG_CHANGED;
+            case TIME_CONVERSION:
+                return JdkTypeIDs.TIME_CONVERSION;
+            case THREAD_DUMP:
+                return JdkTypeIDs.THREAD_DUMP;
+            case BUFFER_LOST_TYPE_ID:
+                return JdkTypeIDs.JFR_DATA_LOST;
+            case GC_CONF_YOUNG_GENERATION:
+                return JdkTypeIDs.GC_CONF_YOUNG_GENERATION;
+            case GC_CONF_SURVIVOR:
+                return JdkTypeIDs.GC_CONF_SURVIVOR;
+            case GC_CONF_TLAB:
+                return JdkTypeIDs.GC_CONF_TLAB;
+            case JAVA_THREAD_START:
+                return JdkTypeIDs.JAVA_THREAD_START;
+            case JAVA_THREAD_END:
+                return JdkTypeIDs.JAVA_THREAD_END;
+            case VM_OPERATIONS:
+                return JdkTypeIDs.VM_OPERATIONS;
+            case THREAD_STATISTICS:
+                return JdkTypeIDs.THREAD_STATISTICS;
+            case CONTEXT_SWITCH_RATE:
+                return JdkTypeIDs.CONTEXT_SWITCH_RATE;
+            case COMPILER_CONFIG:
+                return JdkTypeIDs.COMPILER_CONFIG;
+            case CODE_CACHE_CONFIG:
+                return JdkTypeIDs.CODE_CACHE_CONFIG;
+            case CODE_SWEEPER_CONFIG:
+                return JdkTypeIDs.CODE_SWEEPER_CONFIG;
+            case COMPILER_PHASE:
+                return JdkTypeIDs.COMPILER_PHASE;
+            case GC_COLLECTOR_G1_GARBAGE_COLLECTION:
+                return JdkTypeIDs.GC_COLLECTOR_G1_GARBAGE_COLLECTION;
+            case GC_COLLECTOR_OLD_GARBAGE_COLLECTION:
+                return JdkTypeIDs.GC_COLLECTOR_OLD_GARBAGE_COLLECTION;
+            case GC_COLLECTOR_PAROLD_GARBAGE_COLLECTION:
+                return JdkTypeIDs.GC_COLLECTOR_PAROLD_GARBAGE_COLLECTION;
+            case GC_COLLECTOR_YOUNG_GARBAGE_COLLECTION:
+                return JdkTypeIDs.GC_COLLECTOR_YOUNG_GARBAGE_COLLECTION;
+            case GC_DETAILED_ALLOCATION_REQUIRING_GC:
+                return JdkTypeIDs.GC_DETAILED_ALLOCATION_REQUIRING_GC;
+            case GC_DETAILED_EVACUATION_FAILED:
+                return JdkTypeIDs.GC_DETAILED_EVACUATION_FAILED;
+            case GC_DETAILED_EVACUATION_INFO:
+                return JdkTypeIDs.GC_DETAILED_EVACUATION_INFO;
+            case GC_DETAILED_OBJECT_COUNT_AFTER_GC:
+                return JdkTypeIDs.GC_DETAILED_OBJECT_COUNT_AFTER_GC;
+            case GC_DETAILED_PROMOTION_FAILED:
+                return JdkTypeIDs.GC_DETAILED_PROMOTION_FAILED;
+            case GC_HEAP_PS_SUMMARY:
+                return JdkTypeIDs.GC_HEAP_PS_SUMMARY;
+            case GC_METASPACE_ALLOCATION_FAILURE:
+                return JdkTypeIDs.GC_METASPACE_ALLOCATION_FAILURE;
+            case GC_METASPACE_CHUNK_FREE_LIST_SUMMARY:
+                return JdkTypeIDs.GC_METASPACE_CHUNK_FREE_LIST_SUMMARY;
+            case GC_METASPACE_GC_THRESHOLD:
+                return JdkTypeIDs.GC_METASPACE_GC_THRESHOLD;
+            case RECORDING_SETTING:
+                return JdkTypeIDs.RECORDING_SETTING;
+            case RECORDINGS:
+                return JdkTypeIDs.RECORDINGS;
+            case GC_G1MMU:
+                return JdkTypeIDs.GC_G1MMU;
+            default:
+                return typeId;
+        }
     }
-    switch (typeId) {
-      case CPU_LOAD:
-        return JdkTypeIDs.CPU_LOAD;
-      case EXECUTION_SAMPLE:
-        return JdkTypeIDs.EXECUTION_SAMPLE;
-      case EXECUTION_SAMPLING_INFO_EVENT_ID:
-        return JdkTypeIDs.EXECUTION_SAMPLING_INFO_EVENT_ID;
-      case PROCESSES:
-        return JdkTypeIDs.PROCESSES;
-      case OS_MEMORY_SUMMARY:
-        return JdkTypeIDs.OS_MEMORY_SUMMARY;
-      case OS_INFORMATION:
-        return JdkTypeIDs.OS_INFORMATION;
-      case CPU_INFORMATION:
-        return JdkTypeIDs.CPU_INFORMATION;
-      case THREAD_ALLOCATION_STATISTICS:
-        return JdkTypeIDs.THREAD_ALLOCATION_STATISTICS;
-      case HEAP_CONF:
-        return JdkTypeIDs.HEAP_CONF;
-      case GC_CONF:
-        return JdkTypeIDs.GC_CONF;
-      case HEAP_SUMMARY:
-        return JdkTypeIDs.HEAP_SUMMARY;
-      case ALLOC_INSIDE_TLAB:
-        return JdkTypeIDs.ALLOC_INSIDE_TLAB;
-      case ALLOC_OUTSIDE_TLAB:
-        return JdkTypeIDs.ALLOC_OUTSIDE_TLAB;
-      case VM_INFO:
-        return JdkTypeIDs.VM_INFO;
-      case CLASS_LOAD:
-        return JdkTypeIDs.CLASS_LOAD;
-      case CLASS_UNLOAD:
-        return JdkTypeIDs.CLASS_UNLOAD;
-      case CLASS_LOAD_STATISTICS:
-        return JdkTypeIDs.CLASS_LOAD_STATISTICS;
-      case COMPILATION:
-        return JdkTypeIDs.COMPILATION;
-      case FILE_WRITE:
-        return JdkTypeIDs.FILE_WRITE;
-      case FILE_READ:
-        return JdkTypeIDs.FILE_READ;
-      case SOCKET_WRITE:
-        return JdkTypeIDs.SOCKET_WRITE;
-      case SOCKET_READ:
-        return JdkTypeIDs.SOCKET_READ;
-      case THREAD_PARK:
-        return JdkTypeIDs.THREAD_PARK;
-      case THREAD_SLEEP:
-        return JdkTypeIDs.THREAD_SLEEP;
-      case MONITOR_ENTER:
-        return JdkTypeIDs.MONITOR_ENTER;
-      case MONITOR_WAIT:
-        return JdkTypeIDs.MONITOR_WAIT;
-      case METASPACE_OOM:
-        return JdkTypeIDs.METASPACE_OOM;
-      case CODE_CACHE_FULL:
-        return JdkTypeIDs.CODE_CACHE_FULL;
-      case CODE_CACHE_STATISTICS:
-        return JdkTypeIDs.CODE_CACHE_STATISTICS;
-      case CODE_SWEEPER_STATISTICS:
-        return JdkTypeIDs.CODE_SWEEPER_STATISTICS;
-      case SWEEP_CODE_CACHE:
-        return JdkTypeIDs.SWEEP_CODE_CACHE;
-      case ENVIRONMENT_VARIABLE:
-        return JdkTypeIDs.ENVIRONMENT_VARIABLE;
-      case SYSTEM_PROPERTIES:
-        return JdkTypeIDs.SYSTEM_PROPERTIES;
-      case OBJECT_COUNT:
-        return JdkTypeIDs.OBJECT_COUNT;
-      case GC_REFERENCE_STATISTICS:
-        return JdkTypeIDs.GC_REFERENCE_STATISTICS;
-      case OLD_OBJECT_SAMPLE:
-        return JdkTypeIDs.OLD_OBJECT_SAMPLE;
-      case GC_PAUSE_L3:
-        return JdkTypeIDs.GC_PAUSE_L3;
-      case GC_PAUSE_L2:
-        return JdkTypeIDs.GC_PAUSE_L2;
-      case GC_PAUSE_L1:
-        return JdkTypeIDs.GC_PAUSE_L1;
-      case GC_PAUSE:
-        return JdkTypeIDs.GC_PAUSE;
-      case METASPACE_SUMMARY:
-        return JdkTypeIDs.METASPACE_SUMMARY;
-      case GARBAGE_COLLECTION:
-        return JdkTypeIDs.GARBAGE_COLLECTION;
-      case CONCURRENT_MODE_FAILURE:
-        return JdkTypeIDs.CONCURRENT_MODE_FAILURE;
-      case THROWABLES_STATISTICS:
-        return JdkTypeIDs.THROWABLES_STATISTICS;
-      case ERRORS_THROWN:
-        return JdkTypeIDs.ERRORS_THROWN;
-      case EXCEPTIONS_THROWN:
-        return JdkTypeIDs.EXCEPTIONS_THROWN;
-      case COMPILER_STATS:
-        return JdkTypeIDs.COMPILER_STATS;
-      case COMPILER_FAILURE:
-        return JdkTypeIDs.COMPILER_FAILURE;
-      case ULONG_FLAG:
-        return JdkTypeIDs.ULONG_FLAG;
-      case BOOLEAN_FLAG:
-        return JdkTypeIDs.BOOLEAN_FLAG;
-      case STRING_FLAG:
-        return JdkTypeIDs.STRING_FLAG;
-      case DOUBLE_FLAG:
-        return JdkTypeIDs.DOUBLE_FLAG;
-      case LONG_FLAG:
-        return JdkTypeIDs.LONG_FLAG;
-      case INT_FLAG:
-        return JdkTypeIDs.INT_FLAG;
-      case UINT_FLAG:
-        return JdkTypeIDs.UINT_FLAG;
-      case ULONG_FLAG_CHANGED:
-        return JdkTypeIDs.ULONG_FLAG_CHANGED;
-      case BOOLEAN_FLAG_CHANGED:
-        return JdkTypeIDs.BOOLEAN_FLAG_CHANGED;
-      case STRING_FLAG_CHANGED:
-        return JdkTypeIDs.STRING_FLAG_CHANGED;
-      case DOUBLE_FLAG_CHANGED:
-        return JdkTypeIDs.DOUBLE_FLAG_CHANGED;
-      case LONG_FLAG_CHANGED:
-        return JdkTypeIDs.LONG_FLAG_CHANGED;
-      case INT_FLAG_CHANGED:
-        return JdkTypeIDs.INT_FLAG_CHANGED;
-      case UINT_FLAG_CHANGED:
-        return JdkTypeIDs.UINT_FLAG_CHANGED;
-      case TIME_CONVERSION:
-        return JdkTypeIDs.TIME_CONVERSION;
-      case THREAD_DUMP:
-        return JdkTypeIDs.THREAD_DUMP;
-      case BUFFER_LOST_TYPE_ID:
-        return JdkTypeIDs.JFR_DATA_LOST;
-      case GC_CONF_YOUNG_GENERATION:
-        return JdkTypeIDs.GC_CONF_YOUNG_GENERATION;
-      case GC_CONF_SURVIVOR:
-        return JdkTypeIDs.GC_CONF_SURVIVOR;
-      case GC_CONF_TLAB:
-        return JdkTypeIDs.GC_CONF_TLAB;
-      case JAVA_THREAD_START:
-        return JdkTypeIDs.JAVA_THREAD_START;
-      case JAVA_THREAD_END:
-        return JdkTypeIDs.JAVA_THREAD_END;
-      case VM_OPERATIONS:
-        return JdkTypeIDs.VM_OPERATIONS;
-      case THREAD_STATISTICS:
-        return JdkTypeIDs.THREAD_STATISTICS;
-      case CONTEXT_SWITCH_RATE:
-        return JdkTypeIDs.CONTEXT_SWITCH_RATE;
-      case COMPILER_CONFIG:
-        return JdkTypeIDs.COMPILER_CONFIG;
-      case CODE_CACHE_CONFIG:
-        return JdkTypeIDs.CODE_CACHE_CONFIG;
-      case CODE_SWEEPER_CONFIG:
-        return JdkTypeIDs.CODE_SWEEPER_CONFIG;
-      case COMPILER_PHASE:
-        return JdkTypeIDs.COMPILER_PHASE;
-      case GC_COLLECTOR_G1_GARBAGE_COLLECTION:
-        return JdkTypeIDs.GC_COLLECTOR_G1_GARBAGE_COLLECTION;
-      case GC_COLLECTOR_OLD_GARBAGE_COLLECTION:
-        return JdkTypeIDs.GC_COLLECTOR_OLD_GARBAGE_COLLECTION;
-      case GC_COLLECTOR_PAROLD_GARBAGE_COLLECTION:
-        return JdkTypeIDs.GC_COLLECTOR_PAROLD_GARBAGE_COLLECTION;
-      case GC_COLLECTOR_YOUNG_GARBAGE_COLLECTION:
-        return JdkTypeIDs.GC_COLLECTOR_YOUNG_GARBAGE_COLLECTION;
-      case GC_DETAILED_ALLOCATION_REQUIRING_GC:
-        return JdkTypeIDs.GC_DETAILED_ALLOCATION_REQUIRING_GC;
-      case GC_DETAILED_EVACUATION_FAILED:
-        return JdkTypeIDs.GC_DETAILED_EVACUATION_FAILED;
-      case GC_DETAILED_EVACUATION_INFO:
-        return JdkTypeIDs.GC_DETAILED_EVACUATION_INFO;
-      case GC_DETAILED_OBJECT_COUNT_AFTER_GC:
-        return JdkTypeIDs.GC_DETAILED_OBJECT_COUNT_AFTER_GC;
-      case GC_DETAILED_PROMOTION_FAILED:
-        return JdkTypeIDs.GC_DETAILED_PROMOTION_FAILED;
-      case GC_HEAP_PS_SUMMARY:
-        return JdkTypeIDs.GC_HEAP_PS_SUMMARY;
-      case GC_METASPACE_ALLOCATION_FAILURE:
-        return JdkTypeIDs.GC_METASPACE_ALLOCATION_FAILURE;
-      case GC_METASPACE_CHUNK_FREE_LIST_SUMMARY:
-        return JdkTypeIDs.GC_METASPACE_CHUNK_FREE_LIST_SUMMARY;
-      case GC_METASPACE_GC_THRESHOLD:
-        return JdkTypeIDs.GC_METASPACE_GC_THRESHOLD;
-      case RECORDING_SETTING:
-        return JdkTypeIDs.RECORDING_SETTING;
-      case RECORDINGS:
-        return JdkTypeIDs.RECORDINGS;
-      case GC_G1MMU:
-        return JdkTypeIDs.GC_G1MMU;
-      default:
-        return typeId;
-    }
-  }
 
-  /**
-   * Translate a JDK 11 type id into a pre-JDK 11 type id.
-   *
-   * @param typeId JDK 11 type id
-   * @return Pre-JDK 11 type id
-   */
-  public static String translateTo(String typeId) {
-    switch (typeId) {
-      case JdkTypeIDs.CPU_LOAD:
-        return CPU_LOAD;
-      case JdkTypeIDs.EXECUTION_SAMPLE:
-        return EXECUTION_SAMPLE;
-      case JdkTypeIDs.EXECUTION_SAMPLING_INFO_EVENT_ID:
-        return EXECUTION_SAMPLING_INFO_EVENT_ID;
-      case JdkTypeIDs.PROCESSES:
-        return PROCESSES;
-      case JdkTypeIDs.OS_MEMORY_SUMMARY:
-        return OS_MEMORY_SUMMARY;
-      case JdkTypeIDs.OS_INFORMATION:
-        return OS_INFORMATION;
-      case JdkTypeIDs.CPU_INFORMATION:
-        return CPU_INFORMATION;
-      case JdkTypeIDs.THREAD_ALLOCATION_STATISTICS:
-        return THREAD_ALLOCATION_STATISTICS;
-      case JdkTypeIDs.HEAP_CONF:
-        return HEAP_CONF;
-      case JdkTypeIDs.GC_CONF:
-        return GC_CONF;
-      case JdkTypeIDs.HEAP_SUMMARY:
-        return HEAP_SUMMARY;
-      case JdkTypeIDs.ALLOC_INSIDE_TLAB:
-        return ALLOC_INSIDE_TLAB;
-      case JdkTypeIDs.ALLOC_OUTSIDE_TLAB:
-        return ALLOC_OUTSIDE_TLAB;
-      case JdkTypeIDs.VM_INFO:
-        return VM_INFO;
-      case JdkTypeIDs.CLASS_LOAD:
-        return CLASS_LOAD;
-      case JdkTypeIDs.CLASS_UNLOAD:
-        return CLASS_UNLOAD;
-      case JdkTypeIDs.CLASS_LOAD_STATISTICS:
-        return CLASS_LOAD_STATISTICS;
-      case JdkTypeIDs.COMPILATION:
-        return COMPILATION;
-      case JdkTypeIDs.FILE_WRITE:
-        return FILE_WRITE;
-      case JdkTypeIDs.FILE_READ:
-        return FILE_READ;
-      case JdkTypeIDs.SOCKET_WRITE:
-        return SOCKET_WRITE;
-      case JdkTypeIDs.SOCKET_READ:
-        return SOCKET_READ;
-      case JdkTypeIDs.THREAD_PARK:
-        return THREAD_PARK;
-      case JdkTypeIDs.THREAD_SLEEP:
-        return THREAD_SLEEP;
-      case JdkTypeIDs.MONITOR_ENTER:
-        return MONITOR_ENTER;
-      case JdkTypeIDs.MONITOR_WAIT:
-        return MONITOR_WAIT;
-      case JdkTypeIDs.METASPACE_OOM:
-        return METASPACE_OOM;
-      case JdkTypeIDs.CODE_CACHE_FULL:
-        return CODE_CACHE_FULL;
-      case JdkTypeIDs.CODE_CACHE_STATISTICS:
-        return CODE_CACHE_STATISTICS;
-      case JdkTypeIDs.CODE_SWEEPER_STATISTICS:
-        return CODE_SWEEPER_STATISTICS;
-      case JdkTypeIDs.SWEEP_CODE_CACHE:
-        return SWEEP_CODE_CACHE;
-      case JdkTypeIDs.ENVIRONMENT_VARIABLE:
-        return ENVIRONMENT_VARIABLE;
-      case JdkTypeIDs.SYSTEM_PROPERTIES:
-        return SYSTEM_PROPERTIES;
-      case JdkTypeIDs.OBJECT_COUNT:
-        return OBJECT_COUNT;
-      case JdkTypeIDs.GC_REFERENCE_STATISTICS:
-        return GC_REFERENCE_STATISTICS;
-      case JdkTypeIDs.OLD_OBJECT_SAMPLE:
-        return OLD_OBJECT_SAMPLE;
-      case JdkTypeIDs.GC_PAUSE_L3:
-        return GC_PAUSE_L3;
-      case JdkTypeIDs.GC_PAUSE_L2:
-        return GC_PAUSE_L2;
-      case JdkTypeIDs.GC_PAUSE_L1:
-        return GC_PAUSE_L1;
-      case JdkTypeIDs.GC_PAUSE:
-        return GC_PAUSE;
-      case JdkTypeIDs.METASPACE_SUMMARY:
-        return METASPACE_SUMMARY;
-      case JdkTypeIDs.GARBAGE_COLLECTION:
-        return GARBAGE_COLLECTION;
-      case JdkTypeIDs.CONCURRENT_MODE_FAILURE:
-        return CONCURRENT_MODE_FAILURE;
-      case JdkTypeIDs.THROWABLES_STATISTICS:
-        return THROWABLES_STATISTICS;
-      case JdkTypeIDs.ERRORS_THROWN:
-        return ERRORS_THROWN;
-      case JdkTypeIDs.EXCEPTIONS_THROWN:
-        return EXCEPTIONS_THROWN;
-      case JdkTypeIDs.COMPILER_STATS:
-        return COMPILER_STATS;
-      case JdkTypeIDs.COMPILER_FAILURE:
-        return COMPILER_FAILURE;
-      case JdkTypeIDs.ULONG_FLAG:
-        return ULONG_FLAG;
-      case JdkTypeIDs.BOOLEAN_FLAG:
-        return BOOLEAN_FLAG;
-      case JdkTypeIDs.STRING_FLAG:
-        return STRING_FLAG;
-      case JdkTypeIDs.DOUBLE_FLAG:
-        return DOUBLE_FLAG;
-      case JdkTypeIDs.LONG_FLAG:
-        return LONG_FLAG;
-      case JdkTypeIDs.INT_FLAG:
-        return INT_FLAG;
-      case JdkTypeIDs.UINT_FLAG:
-        return UINT_FLAG;
-      case JdkTypeIDs.ULONG_FLAG_CHANGED:
-        return ULONG_FLAG_CHANGED;
-      case JdkTypeIDs.BOOLEAN_FLAG_CHANGED:
-        return BOOLEAN_FLAG_CHANGED;
-      case JdkTypeIDs.STRING_FLAG_CHANGED:
-        return STRING_FLAG_CHANGED;
-      case JdkTypeIDs.DOUBLE_FLAG_CHANGED:
-        return DOUBLE_FLAG_CHANGED;
-      case JdkTypeIDs.LONG_FLAG_CHANGED:
-        return LONG_FLAG_CHANGED;
-      case JdkTypeIDs.INT_FLAG_CHANGED:
-        return INT_FLAG_CHANGED;
-      case JdkTypeIDs.UINT_FLAG_CHANGED:
-        return UINT_FLAG_CHANGED;
-      case JdkTypeIDs.TIME_CONVERSION:
-        return TIME_CONVERSION;
-      case JdkTypeIDs.THREAD_DUMP:
-        return THREAD_DUMP;
-      case JdkTypeIDs.JFR_DATA_LOST:
-        return BUFFER_LOST_TYPE_ID;
-      case JdkTypeIDs.GC_CONF_YOUNG_GENERATION:
-        return GC_CONF_YOUNG_GENERATION;
-      case JdkTypeIDs.GC_CONF_SURVIVOR:
-        return GC_CONF_SURVIVOR;
-      case JdkTypeIDs.GC_CONF_TLAB:
-        return GC_CONF_TLAB;
-      case JdkTypeIDs.JAVA_THREAD_START:
-        return JAVA_THREAD_START;
-      case JdkTypeIDs.JAVA_THREAD_END:
-        return JAVA_THREAD_END;
-      case JdkTypeIDs.VM_OPERATIONS:
-        return VM_OPERATIONS;
-      case JdkTypeIDs.THREAD_STATISTICS:
-        return THREAD_STATISTICS;
-      case JdkTypeIDs.CONTEXT_SWITCH_RATE:
-        return CONTEXT_SWITCH_RATE;
-      case JdkTypeIDs.COMPILER_CONFIG:
-        return COMPILER_CONFIG;
-      case JdkTypeIDs.CODE_CACHE_CONFIG:
-        return CODE_CACHE_CONFIG;
-      case JdkTypeIDs.CODE_SWEEPER_CONFIG:
-        return CODE_SWEEPER_CONFIG;
-      case JdkTypeIDs.COMPILER_PHASE:
-        return COMPILER_PHASE;
-      case JdkTypeIDs.GC_COLLECTOR_G1_GARBAGE_COLLECTION:
-        return GC_COLLECTOR_G1_GARBAGE_COLLECTION;
-      case JdkTypeIDs.GC_COLLECTOR_OLD_GARBAGE_COLLECTION:
-        return GC_COLLECTOR_OLD_GARBAGE_COLLECTION;
-      case JdkTypeIDs.GC_COLLECTOR_PAROLD_GARBAGE_COLLECTION:
-        return GC_COLLECTOR_PAROLD_GARBAGE_COLLECTION;
-      case JdkTypeIDs.GC_COLLECTOR_YOUNG_GARBAGE_COLLECTION:
-        return GC_COLLECTOR_YOUNG_GARBAGE_COLLECTION;
-      case JdkTypeIDs.GC_DETAILED_ALLOCATION_REQUIRING_GC:
-        return GC_DETAILED_ALLOCATION_REQUIRING_GC;
-      case JdkTypeIDs.GC_DETAILED_EVACUATION_FAILED:
-        return GC_DETAILED_EVACUATION_FAILED;
-      case JdkTypeIDs.GC_DETAILED_EVACUATION_INFO:
-        return GC_DETAILED_EVACUATION_INFO;
-      case JdkTypeIDs.GC_DETAILED_OBJECT_COUNT_AFTER_GC:
-        return GC_DETAILED_OBJECT_COUNT_AFTER_GC;
-      case JdkTypeIDs.GC_DETAILED_PROMOTION_FAILED:
-        return GC_DETAILED_PROMOTION_FAILED;
-      case JdkTypeIDs.GC_HEAP_PS_SUMMARY:
-        return GC_HEAP_PS_SUMMARY;
-      case JdkTypeIDs.GC_METASPACE_ALLOCATION_FAILURE:
-        return GC_METASPACE_ALLOCATION_FAILURE;
-      case JdkTypeIDs.GC_METASPACE_CHUNK_FREE_LIST_SUMMARY:
-        return GC_METASPACE_CHUNK_FREE_LIST_SUMMARY;
-      case JdkTypeIDs.GC_METASPACE_GC_THRESHOLD:
-        return GC_METASPACE_GC_THRESHOLD;
-      case JdkTypeIDs.RECORDING_SETTING:
-        return RECORDING_SETTING;
-      case JdkTypeIDs.RECORDINGS:
-        return RECORDINGS;
-      case JdkTypeIDs.GC_G1MMU:
-        return GC_G1MMU;
-      default:
-        return typeId;
+    /**
+     * Translate a JDK 11 type id into a pre-JDK 11 type id.
+     *
+     * @param typeId JDK 11 type id
+     * @return Pre-JDK 11 type id
+     */
+    public static String translateTo(String typeId) {
+        switch (typeId) {
+            case JdkTypeIDs.CPU_LOAD:
+                return CPU_LOAD;
+            case JdkTypeIDs.EXECUTION_SAMPLE:
+                return EXECUTION_SAMPLE;
+            case JdkTypeIDs.EXECUTION_SAMPLING_INFO_EVENT_ID:
+                return EXECUTION_SAMPLING_INFO_EVENT_ID;
+            case JdkTypeIDs.PROCESSES:
+                return PROCESSES;
+            case JdkTypeIDs.OS_MEMORY_SUMMARY:
+                return OS_MEMORY_SUMMARY;
+            case JdkTypeIDs.OS_INFORMATION:
+                return OS_INFORMATION;
+            case JdkTypeIDs.CPU_INFORMATION:
+                return CPU_INFORMATION;
+            case JdkTypeIDs.THREAD_ALLOCATION_STATISTICS:
+                return THREAD_ALLOCATION_STATISTICS;
+            case JdkTypeIDs.HEAP_CONF:
+                return HEAP_CONF;
+            case JdkTypeIDs.GC_CONF:
+                return GC_CONF;
+            case JdkTypeIDs.HEAP_SUMMARY:
+                return HEAP_SUMMARY;
+            case JdkTypeIDs.ALLOC_INSIDE_TLAB:
+                return ALLOC_INSIDE_TLAB;
+            case JdkTypeIDs.ALLOC_OUTSIDE_TLAB:
+                return ALLOC_OUTSIDE_TLAB;
+            case JdkTypeIDs.VM_INFO:
+                return VM_INFO;
+            case JdkTypeIDs.CLASS_LOAD:
+                return CLASS_LOAD;
+            case JdkTypeIDs.CLASS_UNLOAD:
+                return CLASS_UNLOAD;
+            case JdkTypeIDs.CLASS_LOAD_STATISTICS:
+                return CLASS_LOAD_STATISTICS;
+            case JdkTypeIDs.COMPILATION:
+                return COMPILATION;
+            case JdkTypeIDs.FILE_WRITE:
+                return FILE_WRITE;
+            case JdkTypeIDs.FILE_READ:
+                return FILE_READ;
+            case JdkTypeIDs.SOCKET_WRITE:
+                return SOCKET_WRITE;
+            case JdkTypeIDs.SOCKET_READ:
+                return SOCKET_READ;
+            case JdkTypeIDs.THREAD_PARK:
+                return THREAD_PARK;
+            case JdkTypeIDs.THREAD_SLEEP:
+                return THREAD_SLEEP;
+            case JdkTypeIDs.MONITOR_ENTER:
+                return MONITOR_ENTER;
+            case JdkTypeIDs.MONITOR_WAIT:
+                return MONITOR_WAIT;
+            case JdkTypeIDs.METASPACE_OOM:
+                return METASPACE_OOM;
+            case JdkTypeIDs.CODE_CACHE_FULL:
+                return CODE_CACHE_FULL;
+            case JdkTypeIDs.CODE_CACHE_STATISTICS:
+                return CODE_CACHE_STATISTICS;
+            case JdkTypeIDs.CODE_SWEEPER_STATISTICS:
+                return CODE_SWEEPER_STATISTICS;
+            case JdkTypeIDs.SWEEP_CODE_CACHE:
+                return SWEEP_CODE_CACHE;
+            case JdkTypeIDs.ENVIRONMENT_VARIABLE:
+                return ENVIRONMENT_VARIABLE;
+            case JdkTypeIDs.SYSTEM_PROPERTIES:
+                return SYSTEM_PROPERTIES;
+            case JdkTypeIDs.OBJECT_COUNT:
+                return OBJECT_COUNT;
+            case JdkTypeIDs.GC_REFERENCE_STATISTICS:
+                return GC_REFERENCE_STATISTICS;
+            case JdkTypeIDs.OLD_OBJECT_SAMPLE:
+                return OLD_OBJECT_SAMPLE;
+            case JdkTypeIDs.GC_PAUSE_L3:
+                return GC_PAUSE_L3;
+            case JdkTypeIDs.GC_PAUSE_L2:
+                return GC_PAUSE_L2;
+            case JdkTypeIDs.GC_PAUSE_L1:
+                return GC_PAUSE_L1;
+            case JdkTypeIDs.GC_PAUSE:
+                return GC_PAUSE;
+            case JdkTypeIDs.METASPACE_SUMMARY:
+                return METASPACE_SUMMARY;
+            case JdkTypeIDs.GARBAGE_COLLECTION:
+                return GARBAGE_COLLECTION;
+            case JdkTypeIDs.CONCURRENT_MODE_FAILURE:
+                return CONCURRENT_MODE_FAILURE;
+            case JdkTypeIDs.THROWABLES_STATISTICS:
+                return THROWABLES_STATISTICS;
+            case JdkTypeIDs.ERRORS_THROWN:
+                return ERRORS_THROWN;
+            case JdkTypeIDs.EXCEPTIONS_THROWN:
+                return EXCEPTIONS_THROWN;
+            case JdkTypeIDs.COMPILER_STATS:
+                return COMPILER_STATS;
+            case JdkTypeIDs.COMPILER_FAILURE:
+                return COMPILER_FAILURE;
+            case JdkTypeIDs.ULONG_FLAG:
+                return ULONG_FLAG;
+            case JdkTypeIDs.BOOLEAN_FLAG:
+                return BOOLEAN_FLAG;
+            case JdkTypeIDs.STRING_FLAG:
+                return STRING_FLAG;
+            case JdkTypeIDs.DOUBLE_FLAG:
+                return DOUBLE_FLAG;
+            case JdkTypeIDs.LONG_FLAG:
+                return LONG_FLAG;
+            case JdkTypeIDs.INT_FLAG:
+                return INT_FLAG;
+            case JdkTypeIDs.UINT_FLAG:
+                return UINT_FLAG;
+            case JdkTypeIDs.ULONG_FLAG_CHANGED:
+                return ULONG_FLAG_CHANGED;
+            case JdkTypeIDs.BOOLEAN_FLAG_CHANGED:
+                return BOOLEAN_FLAG_CHANGED;
+            case JdkTypeIDs.STRING_FLAG_CHANGED:
+                return STRING_FLAG_CHANGED;
+            case JdkTypeIDs.DOUBLE_FLAG_CHANGED:
+                return DOUBLE_FLAG_CHANGED;
+            case JdkTypeIDs.LONG_FLAG_CHANGED:
+                return LONG_FLAG_CHANGED;
+            case JdkTypeIDs.INT_FLAG_CHANGED:
+                return INT_FLAG_CHANGED;
+            case JdkTypeIDs.UINT_FLAG_CHANGED:
+                return UINT_FLAG_CHANGED;
+            case JdkTypeIDs.TIME_CONVERSION:
+                return TIME_CONVERSION;
+            case JdkTypeIDs.THREAD_DUMP:
+                return THREAD_DUMP;
+            case JdkTypeIDs.JFR_DATA_LOST:
+                return BUFFER_LOST_TYPE_ID;
+            case JdkTypeIDs.GC_CONF_YOUNG_GENERATION:
+                return GC_CONF_YOUNG_GENERATION;
+            case JdkTypeIDs.GC_CONF_SURVIVOR:
+                return GC_CONF_SURVIVOR;
+            case JdkTypeIDs.GC_CONF_TLAB:
+                return GC_CONF_TLAB;
+            case JdkTypeIDs.JAVA_THREAD_START:
+                return JAVA_THREAD_START;
+            case JdkTypeIDs.JAVA_THREAD_END:
+                return JAVA_THREAD_END;
+            case JdkTypeIDs.VM_OPERATIONS:
+                return VM_OPERATIONS;
+            case JdkTypeIDs.THREAD_STATISTICS:
+                return THREAD_STATISTICS;
+            case JdkTypeIDs.CONTEXT_SWITCH_RATE:
+                return CONTEXT_SWITCH_RATE;
+            case JdkTypeIDs.COMPILER_CONFIG:
+                return COMPILER_CONFIG;
+            case JdkTypeIDs.CODE_CACHE_CONFIG:
+                return CODE_CACHE_CONFIG;
+            case JdkTypeIDs.CODE_SWEEPER_CONFIG:
+                return CODE_SWEEPER_CONFIG;
+            case JdkTypeIDs.COMPILER_PHASE:
+                return COMPILER_PHASE;
+            case JdkTypeIDs.GC_COLLECTOR_G1_GARBAGE_COLLECTION:
+                return GC_COLLECTOR_G1_GARBAGE_COLLECTION;
+            case JdkTypeIDs.GC_COLLECTOR_OLD_GARBAGE_COLLECTION:
+                return GC_COLLECTOR_OLD_GARBAGE_COLLECTION;
+            case JdkTypeIDs.GC_COLLECTOR_PAROLD_GARBAGE_COLLECTION:
+                return GC_COLLECTOR_PAROLD_GARBAGE_COLLECTION;
+            case JdkTypeIDs.GC_COLLECTOR_YOUNG_GARBAGE_COLLECTION:
+                return GC_COLLECTOR_YOUNG_GARBAGE_COLLECTION;
+            case JdkTypeIDs.GC_DETAILED_ALLOCATION_REQUIRING_GC:
+                return GC_DETAILED_ALLOCATION_REQUIRING_GC;
+            case JdkTypeIDs.GC_DETAILED_EVACUATION_FAILED:
+                return GC_DETAILED_EVACUATION_FAILED;
+            case JdkTypeIDs.GC_DETAILED_EVACUATION_INFO:
+                return GC_DETAILED_EVACUATION_INFO;
+            case JdkTypeIDs.GC_DETAILED_OBJECT_COUNT_AFTER_GC:
+                return GC_DETAILED_OBJECT_COUNT_AFTER_GC;
+            case JdkTypeIDs.GC_DETAILED_PROMOTION_FAILED:
+                return GC_DETAILED_PROMOTION_FAILED;
+            case JdkTypeIDs.GC_HEAP_PS_SUMMARY:
+                return GC_HEAP_PS_SUMMARY;
+            case JdkTypeIDs.GC_METASPACE_ALLOCATION_FAILURE:
+                return GC_METASPACE_ALLOCATION_FAILURE;
+            case JdkTypeIDs.GC_METASPACE_CHUNK_FREE_LIST_SUMMARY:
+                return GC_METASPACE_CHUNK_FREE_LIST_SUMMARY;
+            case JdkTypeIDs.GC_METASPACE_GC_THRESHOLD:
+                return GC_METASPACE_GC_THRESHOLD;
+            case JdkTypeIDs.RECORDING_SETTING:
+                return RECORDING_SETTING;
+            case JdkTypeIDs.RECORDINGS:
+                return RECORDINGS;
+            case JdkTypeIDs.GC_G1MMU:
+                return GC_G1MMU;
+            default:
+                return typeId;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/JfrMBeanHelper.java b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/JfrMBeanHelper.java
index 95ce537484c..e49fbcd88a8 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/JfrMBeanHelper.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/JfrMBeanHelper.java
@@ -38,47 +38,44 @@
 
 final class JfrMBeanHelper {
 
-  private static final Logger log = LoggerFactory.getLogger(JfrMBeanHelper.class);
-
-  private static final Pattern WHITESPACE_SPLITTER = Pattern.compile("\\s+");
-  private static final Pattern HASHTAG_SPLITTER = Pattern.compile("#", Pattern.LITERAL);
-  private static final String MC_BEAN_CLASS = "com.sun.management.MissionControl";
-  private static final ObjectName MC_BEAN_NAME =
-      getObjectName("com.sun.management:type=MissionControl");
-  private static final ObjectName JFR_MBEAN_OBJECT_NAME =
-      getObjectName("com.oracle.jrockit:type=FlightRecorder");
-
-  // various MBean operations
-  private static final String OPERATION_REGISTER_MBEANS = "registerMBeans";
-  private static final String OPEN_STREAM = "openStream";
-  private static final String READ_STREAM = "readStream";
-  private static final String CLOSE_STREAM = "closeStream";
-  public static final String CLOSE = "close";
-  public static final String STOP = "stop";
-  public static final String CLONE_RECORDING = "cloneRecording";
-
-  // various MBean attributes
-  private static final String DATA_END_TIME = "DataEndTime";
-
-  // event settings attribute names
-  private static final String KEY_ID = "id";
-  private static final String KEY_THRESHOLD = "threshold";
-  private static final String KEY_STACKTRACE_SERVER = "stacktrace";
-  private static final String KEY_PERIOD_SERVER = "requestPeriod";
-  private static final String KEY_ENABLED = "enabled";
-
-  // recording settings attribute names
-  private static final String KEY_NAME = "name";
-  private static final String KEY_DURATION = "duration";
-  private static final String KEY_DESTINATION_FILE = "destinationFile";
-  private static final String KEY_DESTINATION_COMPRESSED = "destinationCompressed";
-  private static final String KEY_START_TIME = "startTime";
-  private static final String KEY_MAX_SIZE = "maxSize";
-  private static final String KEY_MAX_AGE = "maxAge";
-  private static final String KEY_TO_DISK = "toDisk";
-
-  private static final String[] SETTING_NAMES =
-      new String[] {
+    private static final Logger log = LoggerFactory.getLogger(JfrMBeanHelper.class);
+
+    private static final Pattern WHITESPACE_SPLITTER = Pattern.compile("\\s+");
+    private static final Pattern HASHTAG_SPLITTER = Pattern.compile("#", Pattern.LITERAL);
+    private static final String MC_BEAN_CLASS = "com.sun.management.MissionControl";
+    private static final ObjectName MC_BEAN_NAME = getObjectName("com.sun.management:type=MissionControl");
+    private static final ObjectName JFR_MBEAN_OBJECT_NAME = getObjectName("com.oracle.jrockit:type=FlightRecorder");
+
+    // various MBean operations
+    private static final String OPERATION_REGISTER_MBEANS = "registerMBeans";
+    private static final String OPEN_STREAM = "openStream";
+    private static final String READ_STREAM = "readStream";
+    private static final String CLOSE_STREAM = "closeStream";
+    public static final String CLOSE = "close";
+    public static final String STOP = "stop";
+    public static final String CLONE_RECORDING = "cloneRecording";
+
+    // various MBean attributes
+    private static final String DATA_END_TIME = "DataEndTime";
+
+    // event settings attribute names
+    private static final String KEY_ID = "id";
+    private static final String KEY_THRESHOLD = "threshold";
+    private static final String KEY_STACKTRACE_SERVER = "stacktrace";
+    private static final String KEY_PERIOD_SERVER = "requestPeriod";
+    private static final String KEY_ENABLED = "enabled";
+
+    // recording settings attribute names
+    private static final String KEY_NAME = "name";
+    private static final String KEY_DURATION = "duration";
+    private static final String KEY_DESTINATION_FILE = "destinationFile";
+    private static final String KEY_DESTINATION_COMPRESSED = "destinationCompressed";
+    private static final String KEY_START_TIME = "startTime";
+    private static final String KEY_MAX_SIZE = "maxSize";
+    private static final String KEY_MAX_AGE = "maxAge";
+    private static final String KEY_TO_DISK = "toDisk";
+
+    private static final String[] SETTING_NAMES = new String[] {
         KEY_NAME,
         KEY_TO_DISK,
         KEY_DURATION,
@@ -87,9 +84,8 @@ final class JfrMBeanHelper {
         KEY_DESTINATION_FILE,
         KEY_START_TIME,
         KEY_DESTINATION_COMPRESSED
-      };
-  private static final OpenType<?>[] SETTING_TYPES =
-      new OpenType[] {
+    };
+    private static final OpenType<?>[] SETTING_TYPES = new OpenType[] {
         SimpleType.STRING,
         SimpleType.BOOLEAN,
         SimpleType.LONG,
@@ -98,376 +94,353 @@ final class JfrMBeanHelper {
         SimpleType.STRING,
         SimpleType.DATE,
         SimpleType.BOOLEAN
-      };
-
-  private static final String[] OPTION_NAMES =
-      new String[] {KEY_ID, KEY_THRESHOLD, KEY_STACKTRACE_SERVER, KEY_PERIOD_SERVER, KEY_ENABLED};
-  private static final OpenType<?>[] OPTION_TYPES =
-      new OpenType[] {
-        SimpleType.INTEGER, SimpleType.LONG, SimpleType.BOOLEAN, SimpleType.LONG, SimpleType.BOOLEAN
-      };
-  private static final CompositeType OPTIONS_COMPOSITE_TYPE = generateOptionsType();
-  private static final CompositeType SETTINGS_COMPOSITE_TYPE = generateSettingsType();
-
-  private static final AtomicInteger initPhase =
-      new AtomicInteger(0); // 0 - not initialized, 1 - initializing, 2 - initialized
-
-  private final MBeanServer server;
-
-  private static void initialize() throws IOException {
-    log.debug("Initializing MBean helper");
-    if (initPhase.compareAndSet(0, 1)) {
-      registerMBeans();
-
-      initPhase.set(2);
-    } else {
-      // if the initialization is in progress (1) just do busy wait for it to finish (2)
-      while (initPhase.get() != 2) {
-        LockSupport.parkNanos(5_000L);
-      }
+    };
+
+    private static final String[] OPTION_NAMES =
+            new String[] {KEY_ID, KEY_THRESHOLD, KEY_STACKTRACE_SERVER, KEY_PERIOD_SERVER, KEY_ENABLED};
+    private static final OpenType<?>[] OPTION_TYPES =
+            new OpenType[] {SimpleType.INTEGER, SimpleType.LONG, SimpleType.BOOLEAN, SimpleType.LONG, SimpleType.BOOLEAN
+            };
+    private static final CompositeType OPTIONS_COMPOSITE_TYPE = generateOptionsType();
+    private static final CompositeType SETTINGS_COMPOSITE_TYPE = generateSettingsType();
+
+    private static final AtomicInteger initPhase =
+            new AtomicInteger(0); // 0 - not initialized, 1 - initializing, 2 - initialized
+
+    private final MBeanServer server;
+
+    private static void initialize() throws IOException {
+        log.debug("Initializing MBean helper");
+        if (initPhase.compareAndSet(0, 1)) {
+            registerMBeans();
+
+            initPhase.set(2);
+        } else {
+            // if the initialization is in progress (1) just do busy wait for it to finish (2)
+            while (initPhase.get() != 2) {
+                LockSupport.parkNanos(5_000L);
+            }
+        }
     }
-  }
-
-  private static void registerMBeans() throws IOException {
-    log.debug("Registering JFR MBeans");
-    MBeanServer server = ManagementFactory.getPlatformMBeanServer();
-    try {
-      try {
-        server.createMBean(MC_BEAN_CLASS, MC_BEAN_NAME);
-        log.debug("MissionControl MBean created");
-      } catch (InstanceAlreadyExistsException iaee) {
-        // Ok, it already exists.
-      } catch (MBeanException mbe) {
-        // This catch is a workaround for https://github.com/javaee/glassfish/issues/20686
-        if (!(mbe.getTargetException() instanceof InstanceAlreadyExistsException)) {
-          throw mbe;
+
+    private static void registerMBeans() throws IOException {
+        log.debug("Registering JFR MBeans");
+        MBeanServer server = ManagementFactory.getPlatformMBeanServer();
+        try {
+            try {
+                server.createMBean(MC_BEAN_CLASS, MC_BEAN_NAME);
+                log.debug("MissionControl MBean created");
+            } catch (InstanceAlreadyExistsException iaee) {
+                // Ok, it already exists.
+            } catch (MBeanException mbe) {
+                // This catch is a workaround for https://github.com/javaee/glassfish/issues/20686
+                if (!(mbe.getTargetException() instanceof InstanceAlreadyExistsException)) {
+                    throw mbe;
+                }
+            }
+            server.invoke(MC_BEAN_NAME, OPERATION_REGISTER_MBEANS, new Object[0], new String[0]);
+            log.debug("JFR MBeans have been registered");
+        } catch (JMException e) {
+            throw new IOException(e);
+        }
+    }
+
+    JfrMBeanHelper() throws IOException {
+        initialize();
+
+        if (JFR_MBEAN_OBJECT_NAME == null || MC_BEAN_NAME == null) {
+            throw new IOException("JFR is not available");
         }
-      }
-      server.invoke(MC_BEAN_NAME, OPERATION_REGISTER_MBEANS, new Object[0], new String[0]);
-      log.debug("JFR MBeans have been registered");
-    } catch (JMException e) {
-      throw new IOException(e);
+        this.server = ManagementFactory.getPlatformMBeanServer();
     }
-  }
 
-  JfrMBeanHelper() throws IOException {
-    initialize();
+    public Object getRecordingAttribute(ObjectName recording, String attribute) throws IOException {
+        try {
+            return server.getAttribute(recording, attribute);
+        } catch (RuntimeOperationsException
+                | MBeanException
+                | AttributeNotFoundException
+                | InstanceNotFoundException
+                | ReflectionException e) {
+            throw new IOException(e);
+        }
+    }
 
-    if (JFR_MBEAN_OBJECT_NAME == null || MC_BEAN_NAME == null) {
-      throw new IOException("JFR is not available");
+    public Object getJfrAttribute(String attribute) throws IOException {
+        try {
+            return server.getAttribute(JFR_MBEAN_OBJECT_NAME, attribute);
+        } catch (RuntimeOperationsException
+                | MBeanException
+                | AttributeNotFoundException
+                | InstanceNotFoundException
+                | ReflectionException e) {
+            throw new IOException(e);
+        }
     }
-    this.server = ManagementFactory.getPlatformMBeanServer();
-  }
-
-  public Object getRecordingAttribute(ObjectName recording, String attribute) throws IOException {
-    try {
-      return server.getAttribute(recording, attribute);
-    } catch (RuntimeOperationsException
-        | MBeanException
-        | AttributeNotFoundException
-        | InstanceNotFoundException
-        | ReflectionException e) {
-      throw new IOException(e);
+
+    public ObjectName newRecording(String name, long maxSize, Duration maxAge, Map<String, String> eventSettings)
+            throws IOException {
+        log.debug("Creating a new recording {} with maxSize={} and maxAge={}", name, maxSize, maxAge);
+        ObjectName recordingId = (ObjectName) invokeJfrOperation("createRecording", name);
+        invokeJfrOperation("setRecordingOptions", recordingId, encodeRecordingSettings(name, maxSize, maxAge));
+        invokeJfrOperation("updateEventSettings", recordingId, encodeEventSettings(eventSettings));
+
+        invokeJfrOperation("start", recordingId);
+
+        // make sure the recording has started
+        while (!(boolean) getRecordingAttribute(recordingId, "Running")) {
+            LockSupport.parkNanos(100L); // 100ns step
+        }
+        log.debug("Recording {} has been created", name);
+        return recordingId;
     }
-  }
-
-  public Object getJfrAttribute(String attribute) throws IOException {
-    try {
-      return server.getAttribute(JFR_MBEAN_OBJECT_NAME, attribute);
-    } catch (RuntimeOperationsException
-        | MBeanException
-        | AttributeNotFoundException
-        | InstanceNotFoundException
-        | ReflectionException e) {
-      throw new IOException(e);
+
+    public long openStream(ObjectName recordingId, Date start, Date end) throws IOException {
+        if ((boolean) getRecordingAttribute(recordingId, "Running")) {
+            throw new IOException(
+                    "Can not open a data stream for active recording " + recordingId.getKeyProperty("name"));
+        }
+        if (start == null) {
+            start = (Date) getRecordingAttribute(recordingId, "DataStartTime");
+        }
+        if (end == null) {
+            end = (Date) getRecordingAttribute(recordingId, "DataEndTime");
+        }
+        log.debug(
+                "Opening stream for recording {} and time range: {} - {}",
+                recordingId.getKeyProperty("name"),
+                start,
+                end);
+        return (long) invokeJfrOperation(OPEN_STREAM, recordingId, start, end);
     }
-  }
-
-  public ObjectName newRecording(
-      String name, long maxSize, Duration maxAge, Map<String, String> eventSettings)
-      throws IOException {
-    log.debug("Creating a new recording {} with maxSize={} and maxAge={}", name, maxSize, maxAge);
-    ObjectName recordingId = (ObjectName) invokeJfrOperation("createRecording", name);
-    invokeJfrOperation(
-        "setRecordingOptions", recordingId, encodeRecordingSettings(name, maxSize, maxAge));
-    invokeJfrOperation("updateEventSettings", recordingId, encodeEventSettings(eventSettings));
-
-    invokeJfrOperation("start", recordingId);
-
-    // make sure the recording has started
-    while (!(boolean) getRecordingAttribute(recordingId, "Running")) {
-      LockSupport.parkNanos(100L); // 100ns step
+
+    public void closeStream(long streamId) throws IOException {
+        log.debug("Closing stream {}", streamId);
+        invokeJfrOperation(CLOSE_STREAM, streamId);
     }
-    log.debug("Recording {} has been created", name);
-    return recordingId;
-  }
-
-  public long openStream(ObjectName recordingId, Date start, Date end) throws IOException {
-    if ((boolean) getRecordingAttribute(recordingId, "Running")) {
-      throw new IOException(
-          "Can not open a data stream for active recording " + recordingId.getKeyProperty("name"));
+
+    public byte[] readStream(long streamId) throws IOException {
+        log.debug("Reading data from stream {}", streamId);
+        byte[] data = (byte[]) invokeJfrOperation(READ_STREAM, streamId);
+        log.debug("Read next {} bytes from stream {}", data == null ? -1 : data.length, streamId);
+        return data;
     }
-    if (start == null) {
-      start = (Date) getRecordingAttribute(recordingId, "DataStartTime");
+
+    public void stopRecording(ObjectName recordingId) throws IOException {
+        log.debug("Stopping recording {}", recordingId.getKeyProperty("name"));
+        invokeJfrOperation(STOP, recordingId);
+        log.debug("Recording {} has been stopped", recordingId.getKeyProperty("name"));
     }
-    if (end == null) {
-      end = (Date) getRecordingAttribute(recordingId, "DataEndTime");
+
+    public void closeRecording(ObjectName recordingId) throws IOException {
+        log.debug("Closing recording {}", recordingId.getKeyProperty("name"));
+        invokeJfrOperation(CLOSE, recordingId);
+        log.debug("Recording {} has been closed", recordingId.getKeyProperty("name"));
     }
-    log.debug(
-        "Opening stream for recording {} and time range: {} - {}",
-        recordingId.getKeyProperty("name"),
-        start,
-        end);
-    return (long) invokeJfrOperation(OPEN_STREAM, recordingId, start, end);
-  }
-
-  public void closeStream(long streamId) throws IOException {
-    log.debug("Closing stream {}", streamId);
-    invokeJfrOperation(CLOSE_STREAM, streamId);
-  }
-
-  public byte[] readStream(long streamId) throws IOException {
-    log.debug("Reading data from stream {}", streamId);
-    byte[] data = (byte[]) invokeJfrOperation(READ_STREAM, streamId);
-    log.debug("Read next {} bytes from stream {}", data == null ? -1 : data.length, streamId);
-    return data;
-  }
-
-  public void stopRecording(ObjectName recordingId) throws IOException {
-    log.debug("Stopping recording {}", recordingId.getKeyProperty("name"));
-    invokeJfrOperation(STOP, recordingId);
-    log.debug("Recording {} has been stopped", recordingId.getKeyProperty("name"));
-  }
-
-  public void closeRecording(ObjectName recordingId) throws IOException {
-    log.debug("Closing recording {}", recordingId.getKeyProperty("name"));
-    invokeJfrOperation(CLOSE, recordingId);
-    log.debug("Recording {} has been closed", recordingId.getKeyProperty("name"));
-  }
-
-  public ObjectName cloneRecording(ObjectName recordingId) throws IOException {
-    log.debug("Cloning recording {}", recordingId.getKeyProperty("name"));
-    ObjectName cloned =
-        (ObjectName)
-            invokeJfrOperation(
-                CLONE_RECORDING,
-                recordingId,
-                "Clone of " + recordingId.getKeyProperty("name"),
-                Boolean.TRUE);
-    log.debug(
-        "Recording {} has been cloned to {}",
-        recordingId.getKeyProperty("name"),
-        cloned.getKeyProperty("name"));
-    return cloned;
-  }
-
-  public Instant getDataEndTime(ObjectName recordingId) throws IOException {
-    log.debug(
-        "Retrieving DataEndTime attribute from recording {}", recordingId.getKeyProperty("name"));
-    try {
-      Date endTime = (Date) server.getAttribute(recordingId, DATA_END_TIME);
-      return Instant.ofEpochMilli(endTime.getTime());
-    } catch (JMException e) {
-      throw new IOException(e);
+
+    public ObjectName cloneRecording(ObjectName recordingId) throws IOException {
+        log.debug("Cloning recording {}", recordingId.getKeyProperty("name"));
+        ObjectName cloned = (ObjectName) invokeJfrOperation(
+                CLONE_RECORDING, recordingId, "Clone of " + recordingId.getKeyProperty("name"), Boolean.TRUE);
+        log.debug(
+                "Recording {} has been cloned to {}",
+                recordingId.getKeyProperty("name"),
+                cloned.getKeyProperty("name"));
+        return cloned;
     }
-  }
 
-  private Object invokeJfrOperation(String name, Object... parameters) throws IOException {
-    try {
-      return invokeJfrOperation(JFR_MBEAN_OBJECT_NAME, name, parameters);
-    } catch (Throwable t) {
-      throw new IOException(t);
+    public Instant getDataEndTime(ObjectName recordingId) throws IOException {
+        log.debug("Retrieving DataEndTime attribute from recording {}", recordingId.getKeyProperty("name"));
+        try {
+            Date endTime = (Date) server.getAttribute(recordingId, DATA_END_TIME);
+            return Instant.ofEpochMilli(endTime.getTime());
+        } catch (JMException e) {
+            throw new IOException(e);
+        }
     }
-  }
-
-  private Object invokeJfrOperation(ObjectName on, String operation, Object... parameters)
-      throws JMException {
-    return server.invoke(on, operation, parameters, extractSignature(parameters));
-  }
-
-  List<CompositeData> encodeEventSettings(Map<String, String> settings) throws IOException {
-    try {
-      List<CompositeData> eventSettings = new ArrayList<>();
-      Map<String, Integer> typeIdMap = getEventIdKeyMap();
-      Map<Integer, Map<String, String>> eventSettingsMap = new HashMap<>();
-      for (Map.Entry<String, String> entry : settings.entrySet()) {
-        String[] nameAttr = HASHTAG_SPLITTER.split(entry.getKey());
-        String eventTypeName = JdkTypeIDs_Old.translateTo(nameAttr[0]);
-        Integer typeId = typeIdMap.get(eventTypeName);
-        if (typeId != null) {
-          eventSettingsMap
-              .computeIfAbsent(typeId, k -> new HashMap<>())
-              .put(nameAttr[1], entry.getValue());
+
+    private Object invokeJfrOperation(String name, Object... parameters) throws IOException {
+        try {
+            return invokeJfrOperation(JFR_MBEAN_OBJECT_NAME, name, parameters);
+        } catch (Throwable t) {
+            throw new IOException(t);
         }
-      }
-      for (Map.Entry<Integer, Map<String, String>> entry : eventSettingsMap.entrySet()) {
-        Object[] values = new Object[] {entry.getKey(), -1L, Boolean.FALSE, -1L, Boolean.FALSE};
-        for (Map.Entry<String, String> valueEntry : entry.getValue().entrySet()) {
-          switch (valueEntry.getKey()) {
-            case "threshold":
-              {
-                values[1] = parseDuration(valueEntry.getValue(), ChronoUnit.NANOS).toNanos();
-                break;
-              }
-            case "stackTrace":
-              {
-                values[2] = Boolean.parseBoolean(valueEntry.getValue());
-                break;
-              }
-            case "period":
-              {
-                String valueStr = valueEntry.getValue();
-                if (valueStr.contains("Chunk")) {
-                  values[3] = 0L; // magic number for 'everyChunk'
-                } else {
-                  values[3] = parseDuration(valueEntry.getValue(), ChronoUnit.MILLIS).toMillis();
+    }
+
+    private Object invokeJfrOperation(ObjectName on, String operation, Object... parameters) throws JMException {
+        return server.invoke(on, operation, parameters, extractSignature(parameters));
+    }
+
+    List<CompositeData> encodeEventSettings(Map<String, String> settings) throws IOException {
+        try {
+            List<CompositeData> eventSettings = new ArrayList<>();
+            Map<String, Integer> typeIdMap = getEventIdKeyMap();
+            Map<Integer, Map<String, String>> eventSettingsMap = new HashMap<>();
+            for (Map.Entry<String, String> entry : settings.entrySet()) {
+                String[] nameAttr = HASHTAG_SPLITTER.split(entry.getKey());
+                String eventTypeName = JdkTypeIDs_Old.translateTo(nameAttr[0]);
+                Integer typeId = typeIdMap.get(eventTypeName);
+                if (typeId != null) {
+                    eventSettingsMap
+                            .computeIfAbsent(typeId, k -> new HashMap<>())
+                            .put(nameAttr[1], entry.getValue());
                 }
-                break;
-              }
-            case "enabled":
-              {
-                values[4] = Boolean.parseBoolean(valueEntry.getValue());
-                break;
-              }
-            default:
-              {
-                log.warn("Unsupported setting name: {}. Skipping.", valueEntry.getKey());
-              }
-          }
+            }
+            for (Map.Entry<Integer, Map<String, String>> entry : eventSettingsMap.entrySet()) {
+                Object[] values = new Object[] {entry.getKey(), -1L, Boolean.FALSE, -1L, Boolean.FALSE};
+                for (Map.Entry<String, String> valueEntry : entry.getValue().entrySet()) {
+                    switch (valueEntry.getKey()) {
+                        case "threshold": {
+                            values[1] = parseDuration(valueEntry.getValue(), ChronoUnit.NANOS)
+                                    .toNanos();
+                            break;
+                        }
+                        case "stackTrace": {
+                            values[2] = Boolean.parseBoolean(valueEntry.getValue());
+                            break;
+                        }
+                        case "period": {
+                            String valueStr = valueEntry.getValue();
+                            if (valueStr.contains("Chunk")) {
+                                values[3] = 0L; // magic number for 'everyChunk'
+                            } else {
+                                values[3] = parseDuration(valueEntry.getValue(), ChronoUnit.MILLIS)
+                                        .toMillis();
+                            }
+                            break;
+                        }
+                        case "enabled": {
+                            values[4] = Boolean.parseBoolean(valueEntry.getValue());
+                            break;
+                        }
+                        default: {
+                            log.warn("Unsupported setting name: {}. Skipping.", valueEntry.getKey());
+                        }
+                    }
+                }
+                eventSettings.add(new CompositeDataSupport(OPTIONS_COMPOSITE_TYPE, OPTION_NAMES, values));
+            }
+            return eventSettings;
+        } catch (OpenDataException e) {
+            throw new IOException(e);
         }
-        eventSettings.add(new CompositeDataSupport(OPTIONS_COMPOSITE_TYPE, OPTION_NAMES, values));
-      }
-      return eventSettings;
-    } catch (OpenDataException e) {
-      throw new IOException(e);
     }
-  }
-
-  CompositeData encodeRecordingSettings(String name, long maxSize, Duration maxAge)
-      throws IOException {
-    try {
-      return new CompositeDataSupport(
-          SETTINGS_COMPOSITE_TYPE,
-          SETTING_NAMES,
-          new Object[] {name, false, 0L, maxSize, maxAge.toMillis(), null, new Date(), false});
-    } catch (OpenDataException e) {
-      throw new IOException(e);
+
+    CompositeData encodeRecordingSettings(String name, long maxSize, Duration maxAge) throws IOException {
+        try {
+            return new CompositeDataSupport(SETTINGS_COMPOSITE_TYPE, SETTING_NAMES, new Object[] {
+                name, false, 0L, maxSize, maxAge.toMillis(), null, new Date(), false
+            });
+        } catch (OpenDataException e) {
+            throw new IOException(e);
+        }
     }
-  }
 
-  @SuppressWarnings("unchecked")
-  Map<String, Integer> getEventIdKeyMap() throws IOException {
-    Map<String, Integer> map = new HashMap<>();
-    List<CompositeData> compositeList = (List<CompositeData>) getJfrAttribute("EventDescriptors");
+    @SuppressWarnings("unchecked")
+    Map<String, Integer> getEventIdKeyMap() throws IOException {
+        Map<String, Integer> map = new HashMap<>();
+        List<CompositeData> compositeList = (List<CompositeData>) getJfrAttribute("EventDescriptors");
 
-    for (CompositeData data : compositeList) {
-      String uri = (String) data.get("uri");
-      Integer id = (Integer) data.get("id");
-      map.put(uri, id);
+        for (CompositeData data : compositeList) {
+            String uri = (String) data.get("uri");
+            Integer id = (Integer) data.get("id");
+            map.put(uri, id);
+        }
+        return map;
     }
-    return map;
-  }
-
-  static Duration parseDuration(String timeUnitStr) {
-    return parseDuration(timeUnitStr, ChronoUnit.NANOS);
-  }
-
-  static Duration parseDuration(String timeUnitStr, TemporalUnit defaultTimeUnit) {
-    String[] valueUnit = WHITESPACE_SPLITTER.split(timeUnitStr);
-    long value = Long.parseLong(valueUnit[0]);
-    if (valueUnit.length == 1) {
-      return Duration.of(value, defaultTimeUnit);
+
+    static Duration parseDuration(String timeUnitStr) {
+        return parseDuration(timeUnitStr, ChronoUnit.NANOS);
     }
 
-    switch (valueUnit[1].toLowerCase(Locale.ROOT)) {
-      case "ns":
-        {
-          return Duration.of(value, ChronoUnit.NANOS);
-        }
-      case "us":
-        {
-          return Duration.of(value, ChronoUnit.MICROS);
+    static Duration parseDuration(String timeUnitStr, TemporalUnit defaultTimeUnit) {
+        String[] valueUnit = WHITESPACE_SPLITTER.split(timeUnitStr);
+        long value = Long.parseLong(valueUnit[0]);
+        if (valueUnit.length == 1) {
+            return Duration.of(value, defaultTimeUnit);
         }
-      case "ms":
-        {
-          return Duration.of(value, ChronoUnit.MILLIS);
-        }
-      case "s":
-        {
-          return Duration.of(value, ChronoUnit.SECONDS);
-        }
-      case "m":
-        {
-          return Duration.of(value, ChronoUnit.MINUTES);
+
+        switch (valueUnit[1].toLowerCase(Locale.ROOT)) {
+            case "ns": {
+                return Duration.of(value, ChronoUnit.NANOS);
+            }
+            case "us": {
+                return Duration.of(value, ChronoUnit.MICROS);
+            }
+            case "ms": {
+                return Duration.of(value, ChronoUnit.MILLIS);
+            }
+            case "s": {
+                return Duration.of(value, ChronoUnit.SECONDS);
+            }
+            case "m": {
+                return Duration.of(value, ChronoUnit.MINUTES);
+            }
+            default: {
+                log.debug("Unsupported time unit: {}. Assuming {}", valueUnit[1], defaultTimeUnit.toString());
+                return Duration.of(value, defaultTimeUnit);
+            }
         }
-      default:
-        {
-          log.debug(
-              "Unsupported time unit: {}. Assuming {}", valueUnit[1], defaultTimeUnit.toString());
-          return Duration.of(value, defaultTimeUnit);
+    }
+
+    private static CompositeType generateOptionsType() {
+        try {
+            return new CompositeType("EventOptions", "Event Options", OPTION_NAMES, OPTION_NAMES, OPTION_TYPES);
+        } catch (Exception e) {
+            // Will not ever happen!
         }
+        throw new RuntimeException();
     }
-  }
-
-  private static CompositeType generateOptionsType() {
-    try {
-      return new CompositeType(
-          "EventOptions", "Event Options", OPTION_NAMES, OPTION_NAMES, OPTION_TYPES);
-    } catch (Exception e) {
-      // Will not ever happen!
+
+    private static CompositeType generateSettingsType() {
+        try {
+            return new CompositeType(
+                    "RecordingOptions", "RecordingOptions", SETTING_NAMES, SETTING_NAMES, SETTING_TYPES);
+        } catch (Exception e) {
+            // Will not ever happen!
+        }
+        throw new RuntimeException();
     }
-    throw new RuntimeException();
-  }
-
-  private static CompositeType generateSettingsType() {
-    try {
-      return new CompositeType(
-          "RecordingOptions", "RecordingOptions", SETTING_NAMES, SETTING_NAMES, SETTING_TYPES);
-    } catch (Exception e) {
-      // Will not ever happen!
+
+    /**
+     * Automatically generates the signature to be used when invoking operations.
+     *
+     * @param param the parameters for which to get the signature.
+     * @return the signature matching the parameters.
+     */
+    private static String[] extractSignature(Object[] param) {
+        String[] sig = new String[param.length];
+        for (int i = 0; i < sig.length; i++) {
+            if (param[i].getClass() == Boolean.class) {
+                sig[i] = Boolean.TYPE.getName();
+            } else if (Number.class.isAssignableFrom(param[i].getClass())) {
+                try {
+                    sig[i] = ((Class<?>) param[i].getClass().getField("TYPE").get(param[i])).getName();
+                } catch (IllegalArgumentException
+                        | SecurityException
+                        | IllegalAccessException
+                        | NoSuchFieldException e) {
+                    throw new UndeclaredThrowableException(e);
+                }
+            } else if (CompositeData.class.isAssignableFrom(param[i].getClass())) {
+                sig[i] = CompositeData.class.getName();
+            } else if (TabularData.class.isAssignableFrom(param[i].getClass())) {
+                sig[i] = TabularData.class.getName();
+            } else if (List.class.isAssignableFrom(param[i].getClass())) {
+                sig[i] = List.class.getName();
+            } else {
+                sig[i] = param[i].getClass().getName();
+            }
+        }
+        return sig;
     }
-    throw new RuntimeException();
-  }
-
-  /**
-   * Automatically generates the signature to be used when invoking operations.
-   *
-   * @param param the parameters for which to get the signature.
-   * @return the signature matching the parameters.
-   */
-  private static String[] extractSignature(Object[] param) {
-    String[] sig = new String[param.length];
-    for (int i = 0; i < sig.length; i++) {
-      if (param[i].getClass() == Boolean.class) {
-        sig[i] = Boolean.TYPE.getName();
-      } else if (Number.class.isAssignableFrom(param[i].getClass())) {
+
+    private static ObjectName getObjectName(String objectName) {
         try {
-          sig[i] = ((Class<?>) param[i].getClass().getField("TYPE").get(param[i])).getName();
-        } catch (IllegalArgumentException
-            | SecurityException
-            | IllegalAccessException
-            | NoSuchFieldException e) {
-          throw new UndeclaredThrowableException(e);
+            return ObjectName.getInstance(objectName);
+        } catch (MalformedObjectNameException e) {
+            log.debug("Invalid object name: {}", objectName);
         }
-      } else if (CompositeData.class.isAssignableFrom(param[i].getClass())) {
-        sig[i] = CompositeData.class.getName();
-      } else if (TabularData.class.isAssignableFrom(param[i].getClass())) {
-        sig[i] = TabularData.class.getName();
-      } else if (List.class.isAssignableFrom(param[i].getClass())) {
-        sig[i] = List.class.getName();
-      } else {
-        sig[i] = param[i].getClass().getName();
-      }
-    }
-    return sig;
-  }
-
-  private static ObjectName getObjectName(String objectName) {
-    try {
-      return ObjectName.getInstance(objectName);
-    } catch (MalformedObjectNameException e) {
-      log.debug("Invalid object name: {}", objectName);
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkController.java b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkController.java
index c3478506bc4..a7b1d53fba8 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkController.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkController.java
@@ -20,48 +20,44 @@
  * and distributed by Oracle.
  */
 public final class OracleJdkController implements Controller {
-  private static final Logger log = LoggerFactory.getLogger(OracleJdkController.class);
-  static final int RECORDING_MAX_SIZE = 64 * 1024 * 1024; // 64 megs
-  static final Duration RECORDING_MAX_AGE = Duration.ofMinutes(5);
+    private static final Logger log = LoggerFactory.getLogger(OracleJdkController.class);
+    static final int RECORDING_MAX_SIZE = 64 * 1024 * 1024; // 64 megs
+    static final Duration RECORDING_MAX_AGE = Duration.ofMinutes(5);
 
-  private final Map<String, String> eventSettings;
-  private final JfrMBeanHelper helper;
+    private final Map<String, String> eventSettings;
+    private final JfrMBeanHelper helper;
 
-  public static Controller instance(ConfigProvider configProvider) throws ConfigurationException {
-    return new OracleJdkController(configProvider);
-  }
+    public static Controller instance(ConfigProvider configProvider) throws ConfigurationException {
+        return new OracleJdkController(configProvider);
+    }
 
-  /**
-   * Main constructor for Oracle JDK profiling controller.
-   *
-   * <p>This has to be public because it is created via reflection
-   */
-  public OracleJdkController(@Nonnull final ConfigProvider configProvider)
-      throws ConfigurationException {
-    try {
-      log.debug("Initializing Oracle JFR controller");
-      helper = new JfrMBeanHelper();
-      eventSettings =
-          Collections.unmodifiableMap(
-              JfpUtils.readJfpResources(
-                  JfpUtils.DEFAULT_JFP,
-                  configProvider.getString(ProfilingConfig.PROFILING_TEMPLATE_OVERRIDE_FILE)));
-    } catch (final IOException e) {
-      throw new ConfigurationException(e);
+    /**
+     * Main constructor for Oracle JDK profiling controller.
+     *
+     * <p>This has to be public because it is created via reflection
+     */
+    public OracleJdkController(@Nonnull final ConfigProvider configProvider) throws ConfigurationException {
+        try {
+            log.debug("Initializing Oracle JFR controller");
+            helper = new JfrMBeanHelper();
+            eventSettings = Collections.unmodifiableMap(JfpUtils.readJfpResources(
+                    JfpUtils.DEFAULT_JFP, configProvider.getString(ProfilingConfig.PROFILING_TEMPLATE_OVERRIDE_FILE)));
+        } catch (final IOException e) {
+            throw new ConfigurationException(e);
+        }
     }
-  }
 
-  @Override
-  @Nonnull
-  public OracleJdkOngoingRecording createRecording(
-      @Nonnull final String recordingName, ControllerContext.Snapshot context)
-      throws UnsupportedEnvironmentException {
-    try {
-      log.debug("Attempting to create a new recording with name '{}'", recordingName);
-      return new OracleJdkOngoingRecording(
-          helper, recordingName, RECORDING_MAX_SIZE, RECORDING_MAX_AGE, eventSettings);
-    } catch (final IOException e) {
-      throw new RuntimeException("Unable to create a new recording with name " + recordingName, e);
+    @Override
+    @Nonnull
+    public OracleJdkOngoingRecording createRecording(
+            @Nonnull final String recordingName, ControllerContext.Snapshot context)
+            throws UnsupportedEnvironmentException {
+        try {
+            log.debug("Attempting to create a new recording with name '{}'", recordingName);
+            return new OracleJdkOngoingRecording(
+                    helper, recordingName, RECORDING_MAX_SIZE, RECORDING_MAX_AGE, eventSettings);
+        } catch (final IOException e) {
+            throw new RuntimeException("Unable to create a new recording with name " + recordingName, e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkOngoingRecording.java b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkOngoingRecording.java
index 2edbc1a369e..66b34a4fb94 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkOngoingRecording.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkOngoingRecording.java
@@ -13,89 +13,86 @@
 import org.slf4j.LoggerFactory;
 
 public class OracleJdkOngoingRecording implements OngoingRecording {
-  private static final Logger log = LoggerFactory.getLogger(OracleJdkOngoingRecording.class);
-  private final String name;
-  private final JfrMBeanHelper helper;
-  private final ObjectName recordingId;
-  private final Instant start;
+    private static final Logger log = LoggerFactory.getLogger(OracleJdkOngoingRecording.class);
+    private final String name;
+    private final JfrMBeanHelper helper;
+    private final ObjectName recordingId;
+    private final Instant start;
 
-  OracleJdkOngoingRecording(
-      @Nonnull final JfrMBeanHelper helper,
-      @Nonnull String name,
-      long maxSize,
-      @Nonnull Duration maxAge,
-      @Nonnull Map<String, String> eventSettings)
-      throws IOException {
-    this.name = name;
-    this.helper = helper;
+    OracleJdkOngoingRecording(
+            @Nonnull final JfrMBeanHelper helper,
+            @Nonnull String name,
+            long maxSize,
+            @Nonnull Duration maxAge,
+            @Nonnull Map<String, String> eventSettings)
+            throws IOException {
+        this.name = name;
+        this.helper = helper;
 
-    recordingId = helper.newRecording(name, maxSize, maxAge, eventSettings);
-    start = Instant.now();
-  }
+        recordingId = helper.newRecording(name, maxSize, maxAge, eventSettings);
+        start = Instant.now();
+    }
 
-  @Override
-  public OracleJdkRecordingData stop() {
-    try {
-      log.debug("Stopping recording {}", name);
-      helper.stopRecording(recordingId);
-      OracleJdkRecordingData data =
-          new OracleJdkRecordingData(
-              name,
-              recordingId,
-              start,
-              getEndTime(helper, recordingId, Instant.now()),
-              ProfilingSnapshot.Kind.PERIODIC,
-              helper);
-      log.debug("Recording {} has been stopped and its data collected", name);
-      return data;
-    } catch (IOException e) {
-      throw new RuntimeException("Unable to stop recording " + name, e);
+    @Override
+    public OracleJdkRecordingData stop() {
+        try {
+            log.debug("Stopping recording {}", name);
+            helper.stopRecording(recordingId);
+            OracleJdkRecordingData data = new OracleJdkRecordingData(
+                    name,
+                    recordingId,
+                    start,
+                    getEndTime(helper, recordingId, Instant.now()),
+                    ProfilingSnapshot.Kind.PERIODIC,
+                    helper);
+            log.debug("Recording {} has been stopped and its data collected", name);
+            return data;
+        } catch (IOException e) {
+            throw new RuntimeException("Unable to stop recording " + name, e);
+        }
     }
-  }
 
-  @VisibleForTesting
-  final OracleJdkRecordingData snapshot(@Nonnull final Instant start) {
-    return snapshot(start, ProfilingSnapshot.Kind.PERIODIC);
-  }
+    @VisibleForTesting
+    final OracleJdkRecordingData snapshot(@Nonnull final Instant start) {
+        return snapshot(start, ProfilingSnapshot.Kind.PERIODIC);
+    }
 
-  @Override
-  @Nonnull
-  public OracleJdkRecordingData snapshot(
-      @Nonnull final Instant start, @Nonnull ProfilingSnapshot.Kind kind) {
-    log.debug("Taking recording snapshot for time range {} - {}", start, Instant.now());
-    ObjectName targetName = recordingId;
-    try {
-      if (!(boolean) helper.getRecordingAttribute(targetName, "Running")) {
-        throw new RuntimeException("Recording " + name + " is not active");
-      }
+    @Override
+    @Nonnull
+    public OracleJdkRecordingData snapshot(@Nonnull final Instant start, @Nonnull ProfilingSnapshot.Kind kind) {
+        log.debug("Taking recording snapshot for time range {} - {}", start, Instant.now());
+        ObjectName targetName = recordingId;
+        try {
+            if (!(boolean) helper.getRecordingAttribute(targetName, "Running")) {
+                throw new RuntimeException("Recording " + name + " is not active");
+            }
 
-      targetName = helper.cloneRecording(targetName);
-      return new OracleJdkRecordingData(
-          name, targetName, start, getEndTime(helper, targetName, Instant.now()), kind, helper);
-    } catch (IOException e) {
-      throw new RuntimeException("Unable to take snapshot for recording " + name, e);
+            targetName = helper.cloneRecording(targetName);
+            return new OracleJdkRecordingData(
+                    name, targetName, start, getEndTime(helper, targetName, Instant.now()), kind, helper);
+        } catch (IOException e) {
+            throw new RuntimeException("Unable to take snapshot for recording " + name, e);
+        }
     }
-  }
 
-  @Override
-  public void close() {
-    try {
-      helper.closeRecording(recordingId);
-    } catch (IOException e) {
-      log.debug("Unable to close recording {}", name, e);
+    @Override
+    public void close() {
+        try {
+            helper.closeRecording(recordingId);
+        } catch (IOException e) {
+            log.debug("Unable to close recording {}", name, e);
+        }
     }
-  }
 
-  private static Instant getEndTime(
-      JfrMBeanHelper helper, ObjectName recordingId, Instant defaultEndTime) {
-    try {
-      return helper.getDataEndTime(recordingId);
-    } catch (IOException e) {
-      log.debug(
-          "Unable to retrieve the data end time for recording {}. ({})",
-          recordingId.getKeyProperty("name"),
-          e.toString());
+    private static Instant getEndTime(JfrMBeanHelper helper, ObjectName recordingId, Instant defaultEndTime) {
+        try {
+            return helper.getDataEndTime(recordingId);
+        } catch (IOException e) {
+            log.debug(
+                    "Unable to retrieve the data end time for recording {}. ({})",
+                    recordingId.getKeyProperty("name"),
+                    e.toString());
+        }
+        return defaultEndTime;
     }
-    return defaultEndTime;
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkRecordingData.java b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkRecordingData.java
index 226e1b0f24d..237910b31ef 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkRecordingData.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkRecordingData.java
@@ -26,118 +26,116 @@
 
 /** Implementation for profiling recordings. */
 public class OracleJdkRecordingData extends RecordingData {
-  private final ObjectName recordingId;
-  private final String name;
+    private final ObjectName recordingId;
+    private final String name;
 
-  private final JfrMBeanHelper helper;
+    private final JfrMBeanHelper helper;
 
-  OracleJdkRecordingData(
-      @Nonnull String name,
-      @Nonnull ObjectName recordingId,
-      @Nonnull Instant start,
-      @Nonnull Instant end,
-      @Nonnull Kind kind,
-      @Nonnull JfrMBeanHelper helper) {
-    super(start, end, kind);
-    this.name = name;
-    this.recordingId = recordingId;
-    this.helper = helper;
-  }
+    OracleJdkRecordingData(
+            @Nonnull String name,
+            @Nonnull ObjectName recordingId,
+            @Nonnull Instant start,
+            @Nonnull Instant end,
+            @Nonnull Kind kind,
+            @Nonnull JfrMBeanHelper helper) {
+        super(start, end, kind);
+        this.name = name;
+        this.recordingId = recordingId;
+        this.helper = helper;
+    }
 
-  @Override
-  @Nonnull
-  public RecordingInputStream getStream() throws IOException {
-    return new RecordingInputStream(new JfrRecordingStream());
-  }
+    @Override
+    @Nonnull
+    public RecordingInputStream getStream() throws IOException {
+        return new RecordingInputStream(new JfrRecordingStream());
+    }
 
-  @Override
-  public void release() {
-    // noop
-  }
+    @Override
+    public void release() {
+        // noop
+    }
 
-  @Override
-  @Nonnull
-  public String getName() {
-    return name;
-  }
+    @Override
+    @Nonnull
+    public String getName() {
+        return name;
+    }
 
-  private class JfrRecordingStream extends InputStream {
-    private byte[] buf = new byte[0];
-    private int count = 0;
-    private int pos = 0;
-    private boolean closed = false;
-    private boolean endOfStream = false;
+    private class JfrRecordingStream extends InputStream {
+        private byte[] buf = new byte[0];
+        private int count = 0;
+        private int pos = 0;
+        private boolean closed = false;
+        private boolean endOfStream = false;
 
-    private long streamId = -1L;
+        private long streamId = -1L;
 
-    @Override
-    public synchronized int read() throws IOException {
-      ensureOpen();
-      if (pos >= buf.length) {
-        if (closed || endOfStream) {
-          return -1;
-        }
-        fill();
-        if (endOfStream) {
-          return -1;
+        @Override
+        public synchronized int read() throws IOException {
+            ensureOpen();
+            if (pos >= buf.length) {
+                if (closed || endOfStream) {
+                    return -1;
+                }
+                fill();
+                if (endOfStream) {
+                    return -1;
+                }
+            }
+            return buf[pos++] & 0xff;
         }
-      }
-      return buf[pos++] & 0xff;
-    }
-
-    private void ensureOpen() throws IOException {
-      if (closed) {
-        throw new IOException("Stream closed"); // $NON-NLS-1$
-      }
-    }
 
-    @Override
-    public synchronized int available() throws IOException {
-      ensureOpen();
-      if (pos >= buf.length) {
-        if (closed || endOfStream) {
-          return -1;
+        private void ensureOpen() throws IOException {
+            if (closed) {
+                throw new IOException("Stream closed"); // $NON-NLS-1$
+            }
         }
-        fill();
-        if (endOfStream) {
-          return -1;
+
+        @Override
+        public synchronized int available() throws IOException {
+            ensureOpen();
+            if (pos >= buf.length) {
+                if (closed || endOfStream) {
+                    return -1;
+                }
+                fill();
+                if (endOfStream) {
+                    return -1;
+                }
+            }
+            return count - pos;
         }
-      }
-      return count - pos;
-    }
 
-    @Override
-    public void close() throws IOException {
-      if (closed) {
-        return;
-      }
-      closed = true;
-      try {
-        if (streamId != -1) {
-          helper.closeStream(streamId);
+        @Override
+        public void close() throws IOException {
+            if (closed) {
+                return;
+            }
+            closed = true;
+            try {
+                if (streamId != -1) {
+                    helper.closeStream(streamId);
+                }
+                helper.closeRecording(recordingId);
+            } catch (Exception e) {
+                throw new IOException(e);
+            }
         }
-        helper.closeRecording(recordingId);
-      } catch (Exception e) {
-        throw new IOException(e);
-      }
-    }
 
-    private void fill() throws IOException {
-      if (streamId == -1L) {
-        streamId =
-            helper.openStream(
-                recordingId, new Date(start.toEpochMilli()), new Date(end.toEpochMilli()));
-      }
-      buf = helper.readStream(streamId);
-      if (buf != null) {
-        count += buf.length;
-        pos = 0;
-      } else {
-        pos = 0;
-        count = 0;
-        buf = new byte[0];
-        endOfStream = true;
-      }
+        private void fill() throws IOException {
+            if (streamId == -1L) {
+                streamId = helper.openStream(recordingId, new Date(start.toEpochMilli()), new Date(end.toEpochMilli()));
+            }
+            buf = helper.readStream(streamId);
+            if (buf != null) {
+                count += buf.length;
+                pos = 0;
+            } else {
+                pos = 0;
+                count = 0;
+                buf = new byte[0];
+                endOfStream = true;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/test/java/com/datadog/profiling/controller/oracle/JfrMBeanHelperTest.java b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/test/java/com/datadog/profiling/controller/oracle/JfrMBeanHelperTest.java
index 2913d950f66..b1b99d02da1 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/test/java/com/datadog/profiling/controller/oracle/JfrMBeanHelperTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/test/java/com/datadog/profiling/controller/oracle/JfrMBeanHelperTest.java
@@ -23,237 +23,232 @@
 import org.junit.jupiter.api.Test;
 
 class JfrMBeanHelperTest {
-  private static Map<String, String> eventSettings;
-  private JfrMBeanHelper instance;
-
-  @BeforeAll
-  static void setupStatic() throws Exception {
-    eventSettings = JfpUtils.readJfpResources(JfpUtils.DEFAULT_JFP, null);
-  }
-
-  @BeforeEach
-  void setup() throws IOException {
-    instance = new JfrMBeanHelper();
-  }
-
-  @Test
-  void testEventSettings() throws Exception {
-    List<CompositeData> data = instance.encodeEventSettings(eventSettings);
-    assertNotNull(data);
-    assertTrue(data.size() <= eventSettings.size());
-  }
-
-  @Test
-  void testNewRecording() throws Exception {
-    String recordingName = "test-recording";
-    long maxSize = 100000;
-    Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
-
-    ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
-    try {
-      assertNotNull(recordingId);
-
-      assertTrue((boolean) instance.getRecordingAttribute(recordingId, "Running"));
-      assertEquals(maxAge.toMillis(), instance.getRecordingAttribute(recordingId, "MaxAge"));
-      assertEquals(maxSize, instance.getRecordingAttribute(recordingId, "MaxSize"));
-    } finally {
-      instance.closeRecording(recordingId);
+    private static Map<String, String> eventSettings;
+    private JfrMBeanHelper instance;
+
+    @BeforeAll
+    static void setupStatic() throws Exception {
+        eventSettings = JfpUtils.readJfpResources(JfpUtils.DEFAULT_JFP, null);
     }
-  }
-
-  @Test
-  void testCloseRecording() throws Exception {
-    String recordingName = "test-recording";
-    long maxSize = 100000;
-    Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
-
-    ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
-    instance.closeRecording(recordingId);
-    assertThrows(IOException.class, () -> instance.getRecordingAttribute(recordingId, "Running"));
-  }
-
-  @Test
-  void testCloseRecordingDuplicate() throws Exception {
-    String recordingName = "test-recording";
-    long maxSize = 100000;
-    Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
-
-    ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
-    assertDoesNotThrow(() -> instance.closeRecording(recordingId));
-    assertThrows(IOException.class, () -> instance.closeRecording(recordingId));
-  }
-
-  @Test
-  void testStopRecording() throws Exception {
-    String recordingName = "test-recording";
-    long maxSize = 100000;
-    Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
-
-    ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
-    try {
-      instance.stopRecording(recordingId);
-      assertFalse((boolean) instance.getRecordingAttribute(recordingId, "Running"));
-      assertTrue((boolean) instance.getRecordingAttribute(recordingId, "Stopped"));
-    } finally {
-      instance.closeRecording(recordingId);
+
+    @BeforeEach
+    void setup() throws IOException {
+        instance = new JfrMBeanHelper();
     }
-  }
-
-  @Test
-  void testStopRecordingDouble() throws Exception {
-    String recordingName = "test-recording";
-    long maxSize = 100000;
-    Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
-
-    ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
-    try {
-      instance.stopRecording(recordingId);
-      assertDoesNotThrow(() -> instance.stopRecording(recordingId));
-    } finally {
-      instance.closeRecording(recordingId);
+
+    @Test
+    void testEventSettings() throws Exception {
+        List<CompositeData> data = instance.encodeEventSettings(eventSettings);
+        assertNotNull(data);
+        assertTrue(data.size() <= eventSettings.size());
     }
-  }
-
-  @Test
-  void testStopRecordingInvalid() throws Exception {
-    ObjectName recordingId =
-        ObjectName.getInstance("com.oracle.jrockit:type=FlightRecording,id=1,name=test-recording");
-    assertThrows(IOException.class, () -> instance.stopRecording(recordingId));
-  }
-
-  @Test
-  void testOpenStreamActive() throws Exception {
-    String recordingName = "test-recording";
-    long maxSize = 100000;
-    Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
-
-    Date start = new Date();
-    ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
-    try {
-      assertThrows(IOException.class, () -> instance.openStream(recordingId, start, new Date()));
-    } finally {
-      instance.closeRecording(recordingId);
+
+    @Test
+    void testNewRecording() throws Exception {
+        String recordingName = "test-recording";
+        long maxSize = 100000;
+        Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
+
+        ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
+        try {
+            assertNotNull(recordingId);
+
+            assertTrue((boolean) instance.getRecordingAttribute(recordingId, "Running"));
+            assertEquals(maxAge.toMillis(), instance.getRecordingAttribute(recordingId, "MaxAge"));
+            assertEquals(maxSize, instance.getRecordingAttribute(recordingId, "MaxSize"));
+        } finally {
+            instance.closeRecording(recordingId);
+        }
     }
-  }
-
-  @Test
-  void testOpenStreamStopped() throws Exception {
-    String recordingName = "test-recording";
-    long maxSize = 100000;
-    Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
-
-    Date start = new Date();
-    ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
-    try {
-      instance.stopRecording(recordingId);
-      assertDoesNotThrow(() -> instance.openStream(recordingId, start, new Date()));
-      assertDoesNotThrow(() -> instance.openStream(recordingId, null, null));
-    } finally {
-      instance.closeRecording(recordingId);
+
+    @Test
+    void testCloseRecording() throws Exception {
+        String recordingName = "test-recording";
+        long maxSize = 100000;
+        Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
+
+        ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
+        instance.closeRecording(recordingId);
+        assertThrows(IOException.class, () -> instance.getRecordingAttribute(recordingId, "Running"));
     }
-  }
-
-  @Test
-  void testCloseStream() throws Exception {
-    String recordingName = "test-recording";
-    long maxSize = 100000;
-    Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
-
-    ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
-    try {
-      instance.stopRecording(recordingId);
-      long streamId = instance.openStream(recordingId, null, null);
-
-      assertDoesNotThrow(() -> instance.closeStream(streamId));
-      assertThrows(IOException.class, () -> instance.closeStream(streamId));
-    } finally {
-      instance.closeRecording(recordingId);
+
+    @Test
+    void testCloseRecordingDuplicate() throws Exception {
+        String recordingName = "test-recording";
+        long maxSize = 100000;
+        Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
+
+        ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
+        assertDoesNotThrow(() -> instance.closeRecording(recordingId));
+        assertThrows(IOException.class, () -> instance.closeRecording(recordingId));
     }
-  }
-
-  @Test
-  void testCloseStreamInvalid() {
-    assertThrows(IOException.class, () -> instance.closeStream(-1));
-  }
-
-  @Test
-  void testReadStream() throws Exception {
-    String recordingName = "test-recording";
-    long maxSize = 100000;
-    Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
-
-    ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
-    try {
-      instance.stopRecording(recordingId);
-      long streamId = instance.openStream(recordingId, null, null);
-
-      int len = 0;
-      byte[] buffer = null;
-      while ((buffer = instance.readStream(streamId)) != null) {
-        len += buffer.length;
-      }
-      assertTrue(len > 0);
-    } finally {
-      instance.closeRecording(recordingId);
+
+    @Test
+    void testStopRecording() throws Exception {
+        String recordingName = "test-recording";
+        long maxSize = 100000;
+        Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
+
+        ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
+        try {
+            instance.stopRecording(recordingId);
+            assertFalse((boolean) instance.getRecordingAttribute(recordingId, "Running"));
+            assertTrue((boolean) instance.getRecordingAttribute(recordingId, "Stopped"));
+        } finally {
+            instance.closeRecording(recordingId);
+        }
+    }
+
+    @Test
+    void testStopRecordingDouble() throws Exception {
+        String recordingName = "test-recording";
+        long maxSize = 100000;
+        Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
+
+        ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
+        try {
+            instance.stopRecording(recordingId);
+            assertDoesNotThrow(() -> instance.stopRecording(recordingId));
+        } finally {
+            instance.closeRecording(recordingId);
+        }
     }
-  }
-
-  @Test
-  void testStreamInvalid() {
-    assertThrows(IOException.class, () -> instance.readStream(-1));
-  }
-
-  @Test
-  void testCloneRecordingInvalid() throws Exception {
-    ObjectName recordingId =
-        ObjectName.getInstance("com.oracle.jrockit:type=FlightRecording,id=1,name=test-recording");
-    assertThrows(IOException.class, () -> instance.cloneRecording(recordingId));
-  }
-
-  @Test
-  void testCloneRecording() throws Exception {
-    String recordingName = "test-recording";
-    long maxSize = 100000;
-    Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
-
-    ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
-    try {
-      ObjectName cloned = instance.cloneRecording(recordingId);
-      try {
-        assertNotEquals(recordingId, cloned);
-        assertTrue((boolean) instance.getRecordingAttribute(recordingId, "Running"));
-        assertFalse((boolean) instance.getRecordingAttribute(cloned, "Running"));
-      } finally {
-        instance.closeRecording(cloned);
-      }
-    } finally {
-      instance.closeRecording(recordingId);
+
+    @Test
+    void testStopRecordingInvalid() throws Exception {
+        ObjectName recordingId =
+                ObjectName.getInstance("com.oracle.jrockit:type=FlightRecording,id=1,name=test-recording");
+        assertThrows(IOException.class, () -> instance.stopRecording(recordingId));
     }
-  }
-
-  @Test
-  void testParseDuration() {
-    assertEquals(
-        Duration.of(10, ChronoUnit.SECONDS),
-        JfrMBeanHelper.parseDuration("10", ChronoUnit.SECONDS));
-    assertEquals(Duration.of(10, ChronoUnit.NANOS), JfrMBeanHelper.parseDuration("10"));
-    Map<String, ChronoUnit> mapping = new HashMap<>();
-    mapping.put("ns", ChronoUnit.NANOS);
-    mapping.put("us", ChronoUnit.MICROS);
-    mapping.put("ms", ChronoUnit.MILLIS);
-    mapping.put("s", ChronoUnit.SECONDS);
-    mapping.put("m", ChronoUnit.MINUTES);
-
-    long val = 5;
-    for (Map.Entry<String, ChronoUnit> entry : mapping.entrySet()) {
-      assertEquals(
-          Duration.of(val, entry.getValue()),
-          JfrMBeanHelper.parseDuration(val + " " + entry.getKey()));
-      assertEquals(
-          Duration.of(val, entry.getValue()),
-          JfrMBeanHelper.parseDuration(val + "\t     " + entry.getKey(), ChronoUnit.HOURS));
-      assertThrows(
-          NumberFormatException.class, () -> JfrMBeanHelper.parseDuration(val + entry.getKey()));
+
+    @Test
+    void testOpenStreamActive() throws Exception {
+        String recordingName = "test-recording";
+        long maxSize = 100000;
+        Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
+
+        Date start = new Date();
+        ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
+        try {
+            assertThrows(IOException.class, () -> instance.openStream(recordingId, start, new Date()));
+        } finally {
+            instance.closeRecording(recordingId);
+        }
+    }
+
+    @Test
+    void testOpenStreamStopped() throws Exception {
+        String recordingName = "test-recording";
+        long maxSize = 100000;
+        Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
+
+        Date start = new Date();
+        ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
+        try {
+            instance.stopRecording(recordingId);
+            assertDoesNotThrow(() -> instance.openStream(recordingId, start, new Date()));
+            assertDoesNotThrow(() -> instance.openStream(recordingId, null, null));
+        } finally {
+            instance.closeRecording(recordingId);
+        }
+    }
+
+    @Test
+    void testCloseStream() throws Exception {
+        String recordingName = "test-recording";
+        long maxSize = 100000;
+        Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
+
+        ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
+        try {
+            instance.stopRecording(recordingId);
+            long streamId = instance.openStream(recordingId, null, null);
+
+            assertDoesNotThrow(() -> instance.closeStream(streamId));
+            assertThrows(IOException.class, () -> instance.closeStream(streamId));
+        } finally {
+            instance.closeRecording(recordingId);
+        }
+    }
+
+    @Test
+    void testCloseStreamInvalid() {
+        assertThrows(IOException.class, () -> instance.closeStream(-1));
+    }
+
+    @Test
+    void testReadStream() throws Exception {
+        String recordingName = "test-recording";
+        long maxSize = 100000;
+        Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
+
+        ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
+        try {
+            instance.stopRecording(recordingId);
+            long streamId = instance.openStream(recordingId, null, null);
+
+            int len = 0;
+            byte[] buffer = null;
+            while ((buffer = instance.readStream(streamId)) != null) {
+                len += buffer.length;
+            }
+            assertTrue(len > 0);
+        } finally {
+            instance.closeRecording(recordingId);
+        }
+    }
+
+    @Test
+    void testStreamInvalid() {
+        assertThrows(IOException.class, () -> instance.readStream(-1));
+    }
+
+    @Test
+    void testCloneRecordingInvalid() throws Exception {
+        ObjectName recordingId =
+                ObjectName.getInstance("com.oracle.jrockit:type=FlightRecording,id=1,name=test-recording");
+        assertThrows(IOException.class, () -> instance.cloneRecording(recordingId));
+    }
+
+    @Test
+    void testCloneRecording() throws Exception {
+        String recordingName = "test-recording";
+        long maxSize = 100000;
+        Duration maxAge = Duration.of(30, ChronoUnit.SECONDS);
+
+        ObjectName recordingId = instance.newRecording(recordingName, maxSize, maxAge, eventSettings);
+        try {
+            ObjectName cloned = instance.cloneRecording(recordingId);
+            try {
+                assertNotEquals(recordingId, cloned);
+                assertTrue((boolean) instance.getRecordingAttribute(recordingId, "Running"));
+                assertFalse((boolean) instance.getRecordingAttribute(cloned, "Running"));
+            } finally {
+                instance.closeRecording(cloned);
+            }
+        } finally {
+            instance.closeRecording(recordingId);
+        }
+    }
+
+    @Test
+    void testParseDuration() {
+        assertEquals(Duration.of(10, ChronoUnit.SECONDS), JfrMBeanHelper.parseDuration("10", ChronoUnit.SECONDS));
+        assertEquals(Duration.of(10, ChronoUnit.NANOS), JfrMBeanHelper.parseDuration("10"));
+        Map<String, ChronoUnit> mapping = new HashMap<>();
+        mapping.put("ns", ChronoUnit.NANOS);
+        mapping.put("us", ChronoUnit.MICROS);
+        mapping.put("ms", ChronoUnit.MILLIS);
+        mapping.put("s", ChronoUnit.SECONDS);
+        mapping.put("m", ChronoUnit.MINUTES);
+
+        long val = 5;
+        for (Map.Entry<String, ChronoUnit> entry : mapping.entrySet()) {
+            assertEquals(Duration.of(val, entry.getValue()), JfrMBeanHelper.parseDuration(val + " " + entry.getKey()));
+            assertEquals(
+                    Duration.of(val, entry.getValue()),
+                    JfrMBeanHelper.parseDuration(val + "\t     " + entry.getKey(), ChronoUnit.HOURS));
+            assertThrows(NumberFormatException.class, () -> JfrMBeanHelper.parseDuration(val + entry.getKey()));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/test/java/com/datadog/profiling/controller/oracle/OracleJdkControllerTest.java b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/test/java/com/datadog/profiling/controller/oracle/OracleJdkControllerTest.java
index 1cb2ccd42d7..cd74b72c959 100644
--- a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/test/java/com/datadog/profiling/controller/oracle/OracleJdkControllerTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/test/java/com/datadog/profiling/controller/oracle/OracleJdkControllerTest.java
@@ -14,131 +14,130 @@
 import org.junit.jupiter.api.Test;
 
 class OracleJdkControllerTest {
-  private OracleJdkController instance;
+    private OracleJdkController instance;
 
-  @BeforeEach
-  void setup() throws Exception {
-    Properties props = new Properties();
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+    @BeforeEach
+    void setup() throws Exception {
+        Properties props = new Properties();
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
 
-    instance = new OracleJdkController(configProvider);
-  }
+        instance = new OracleJdkController(configProvider);
+    }
+
+    @Test
+    void createRecording() throws Exception {
+        try (OracleJdkOngoingRecording recording =
+                instance.createRecording("my_recording", new ControllerContext().snapshot())) {
+            assertNotNull(recording);
+        }
+    }
 
-  @Test
-  void createRecording() throws Exception {
-    try (OracleJdkOngoingRecording recording =
-        instance.createRecording("my_recording", new ControllerContext().snapshot())) {
-      assertNotNull(recording);
+    @Test
+    void createRecordingInvalid() {
+        assertThrows(Throwable.class, () -> instance.createRecording(null, new ControllerContext().snapshot()));
     }
-  }
-
-  @Test
-  void createRecordingInvalid() {
-    assertThrows(
-        Throwable.class, () -> instance.createRecording(null, new ControllerContext().snapshot()));
-  }
-
-  @Test
-  void getSnapshot() throws Exception {
-    String recordingName = "my_recording";
-    Instant start = Instant.now();
-    try (OracleJdkOngoingRecording recording =
-        instance.createRecording(recordingName, new ControllerContext().snapshot())) {
-      assertNotNull(recording);
-
-      // sleep a while to allow a few events to be collected
-      Thread.sleep(300);
-      Instant end = Instant.now();
-      OracleJdkRecordingData snapshot = recording.snapshot(start);
-
-      assertNotNull(snapshot);
-      assertEquals(start, snapshot.getStart());
-      assertTrue(snapshot.getEnd().compareTo(end) >= 0);
-      assertTrue(snapshot.getEnd().compareTo(Instant.now()) <= 0);
-      assertEquals(recordingName, snapshot.getName());
-
-      try (InputStream is = snapshot.getStream()) {
-        assertNotNull(is);
-
-        // make sure the stream can be read in whole and that it produces non-zero amount of data
-        assertTrue(is.available() > 0);
-        int len = 0;
-        byte[] buff = new byte[256];
-        while (is.read(buff) > -1) {
-          len += buff.length;
+
+    @Test
+    void getSnapshot() throws Exception {
+        String recordingName = "my_recording";
+        Instant start = Instant.now();
+        try (OracleJdkOngoingRecording recording =
+                instance.createRecording(recordingName, new ControllerContext().snapshot())) {
+            assertNotNull(recording);
+
+            // sleep a while to allow a few events to be collected
+            Thread.sleep(300);
+            Instant end = Instant.now();
+            OracleJdkRecordingData snapshot = recording.snapshot(start);
+
+            assertNotNull(snapshot);
+            assertEquals(start, snapshot.getStart());
+            assertTrue(snapshot.getEnd().compareTo(end) >= 0);
+            assertTrue(snapshot.getEnd().compareTo(Instant.now()) <= 0);
+            assertEquals(recordingName, snapshot.getName());
+
+            try (InputStream is = snapshot.getStream()) {
+                assertNotNull(is);
+
+                // make sure the stream can be read in whole and that it produces non-zero amount of data
+                assertTrue(is.available() > 0);
+                int len = 0;
+                byte[] buff = new byte[256];
+                while (is.read(buff) > -1) {
+                    len += buff.length;
+                }
+                assertTrue(len > 0);
+            }
         }
-        assertTrue(len > 0);
-      }
     }
-  }
-
-  @Test
-  void getSnapshotAfterClose() throws Exception {
-    String recordingName = "my_recording";
-    Instant start = Instant.now();
-    OracleJdkOngoingRecording recording =
-        instance.createRecording(recordingName, new ControllerContext().snapshot());
-    assertNotNull(recording);
-    recording.close();
-    assertThrows(Throwable.class, () -> recording.snapshot(start));
-  }
-
-  @Test
-  void getStopAndGetSnapshot() throws Exception {
-    String recordingName = "my_recording";
-    try (OracleJdkOngoingRecording recording =
-        instance.createRecording(recordingName, new ControllerContext().snapshot())) {
-      assertNotNull(recording);
-
-      // sleep a while to allow a few events to be collected
-      Thread.sleep(300);
-      OracleJdkRecordingData snapshot = recording.stop();
-
-      assertNotNull(snapshot);
-      assertEquals(recordingName, snapshot.getName());
-
-      try (InputStream is = snapshot.getStream()) {
-        assertNotNull(is);
-
-        // make sure the stream can be read in whole and that it produces non-zero amount of data
-        assertTrue(is.available() > 0);
-        int len = 0;
-        byte[] buff = new byte[256];
-        while (is.read(buff) > -1) {
-          len += buff.length;
+
+    @Test
+    void getSnapshotAfterClose() throws Exception {
+        String recordingName = "my_recording";
+        Instant start = Instant.now();
+        OracleJdkOngoingRecording recording =
+                instance.createRecording(recordingName, new ControllerContext().snapshot());
+        assertNotNull(recording);
+        recording.close();
+        assertThrows(Throwable.class, () -> recording.snapshot(start));
+    }
+
+    @Test
+    void getStopAndGetSnapshot() throws Exception {
+        String recordingName = "my_recording";
+        try (OracleJdkOngoingRecording recording =
+                instance.createRecording(recordingName, new ControllerContext().snapshot())) {
+            assertNotNull(recording);
+
+            // sleep a while to allow a few events to be collected
+            Thread.sleep(300);
+            OracleJdkRecordingData snapshot = recording.stop();
+
+            assertNotNull(snapshot);
+            assertEquals(recordingName, snapshot.getName());
+
+            try (InputStream is = snapshot.getStream()) {
+                assertNotNull(is);
+
+                // make sure the stream can be read in whole and that it produces non-zero amount of data
+                assertTrue(is.available() > 0);
+                int len = 0;
+                byte[] buff = new byte[256];
+                while (is.read(buff) > -1) {
+                    len += buff.length;
+                }
+                assertTrue(len > 0);
+            }
         }
-        assertTrue(len > 0);
-      }
     }
-  }
 
-  @Test
-  void getSnapshotAfterStop() throws Exception {
-    String recordingName = "my_recording";
-    Instant start = Instant.now();
-    try (OracleJdkOngoingRecording recording =
-        instance.createRecording(recordingName, new ControllerContext().snapshot())) {
-      assertNotNull(recording);
+    @Test
+    void getSnapshotAfterStop() throws Exception {
+        String recordingName = "my_recording";
+        Instant start = Instant.now();
+        try (OracleJdkOngoingRecording recording =
+                instance.createRecording(recordingName, new ControllerContext().snapshot())) {
+            assertNotNull(recording);
+
+            // sleep a while to allow a few events to be collected
+            Thread.sleep(300);
+            OracleJdkRecordingData snapshot = recording.stop();
 
-      // sleep a while to allow a few events to be collected
-      Thread.sleep(300);
-      OracleJdkRecordingData snapshot = recording.stop();
+            assertNotNull(snapshot);
+            assertEquals(recordingName, snapshot.getName());
+
+            assertThrows(Throwable.class, () -> recording.snapshot(start));
+        }
+    }
 
-      assertNotNull(snapshot);
-      assertEquals(recordingName, snapshot.getName());
+    @Test
+    void stopAfterClose() throws Exception {
+        String recordingName = "my_recording";
+        OracleJdkOngoingRecording recording =
+                instance.createRecording(recordingName, new ControllerContext().snapshot());
+        assertNotNull(recording);
 
-      assertThrows(Throwable.class, () -> recording.snapshot(start));
+        recording.close();
+        assertThrows(Throwable.class, recording::stop);
     }
-  }
-
-  @Test
-  void stopAfterClose() throws Exception {
-    String recordingName = "my_recording";
-    OracleJdkOngoingRecording recording =
-        instance.createRecording(recordingName, new ControllerContext().snapshot());
-    assertNotNull(recording);
-
-    recording.close();
-    assertThrows(Throwable.class, recording::stop);
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ConfigurationException.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ConfigurationException.java
index 4418601c465..14f740f3c31 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ConfigurationException.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ConfigurationException.java
@@ -17,13 +17,13 @@
 
 /** Exception thrown when the profiling system is badly configured. */
 public class ConfigurationException extends Exception {
-  private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-  public ConfigurationException(final Throwable cause) {
-    super(cause);
-  }
+    public ConfigurationException(final Throwable cause) {
+        super(cause);
+    }
 
-  public ConfigurationException(final String message) {
-    super(message);
-  }
+    public ConfigurationException(final String message) {
+        super(message);
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/Controller.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/Controller.java
index b4d00c5d902..8e5c87b6ba9 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/Controller.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/Controller.java
@@ -22,16 +22,15 @@
  * want to support multiple versions later.
  */
 public interface Controller {
-  /**
-   * Creates a continuous recording using the specified template.
-   *
-   * @param recordingName the name under which the recording will be known.
-   * @return the recording object created.
-   */
-  @Nonnull
-  OngoingRecording createRecording(
-      @Nonnull String recordingName, ControllerContext.Snapshot context)
-      throws UnsupportedEnvironmentException;
+    /**
+     * Creates a continuous recording using the specified template.
+     *
+     * @param recordingName the name under which the recording will be known.
+     * @return the recording object created.
+     */
+    @Nonnull
+    OngoingRecording createRecording(@Nonnull String recordingName, ControllerContext.Snapshot context)
+            throws UnsupportedEnvironmentException;
 
-  default void configure(ControllerContext context) {}
+    default void configure(ControllerContext context) {}
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ControllerContext.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ControllerContext.java
index 9b6c06a9dce..b495443eee8 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ControllerContext.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ControllerContext.java
@@ -12,66 +12,65 @@
  */
 public class ControllerContext {
 
-  private boolean isDatadogProfilerEnabled;
-  private String datadogProfilerUnavailableReason;
-  private Set<ProfilingMode> datadogProfilingModes = EnumSet.noneOf(ProfilingMode.class);
+    private boolean isDatadogProfilerEnabled;
+    private String datadogProfilerUnavailableReason;
+    private Set<ProfilingMode> datadogProfilingModes = EnumSet.noneOf(ProfilingMode.class);
 
-  public ControllerContext setDatadogProfilerEnabled(boolean datadogProfilerActive) {
-    isDatadogProfilerEnabled = datadogProfilerActive;
-    return this;
-  }
+    public ControllerContext setDatadogProfilerEnabled(boolean datadogProfilerActive) {
+        isDatadogProfilerEnabled = datadogProfilerActive;
+        return this;
+    }
 
-  public ControllerContext setDatadogProfilingModes(Set<ProfilingMode> datadogProfilingModes) {
-    this.datadogProfilingModes = datadogProfilingModes;
-    return this;
-  }
+    public ControllerContext setDatadogProfilingModes(Set<ProfilingMode> datadogProfilingModes) {
+        this.datadogProfilingModes = datadogProfilingModes;
+        return this;
+    }
 
-  public ControllerContext setDatadogProfilerUnavailableReason(
-      String datadogProfilerUnavailableReason) {
-    this.datadogProfilerUnavailableReason = datadogProfilerUnavailableReason;
-    return this;
-  }
+    public ControllerContext setDatadogProfilerUnavailableReason(String datadogProfilerUnavailableReason) {
+        this.datadogProfilerUnavailableReason = datadogProfilerUnavailableReason;
+        return this;
+    }
 
-  /**
-   * A snapshot is an immutable copy of the context (state shared between controllers)
-   *
-   * @return an immutable snapshot of the context
-   */
-  public Snapshot snapshot() {
-    return new Snapshot(this);
-  }
+    /**
+     * A snapshot is an immutable copy of the context (state shared between controllers)
+     *
+     * @return an immutable snapshot of the context
+     */
+    public Snapshot snapshot() {
+        return new Snapshot(this);
+    }
 
-  public static final class Snapshot {
-    private final boolean isDatadogProfilerEnabled;
-    private final String datadogProfilerUnavailableReason;
-    private final Set<ProfilingMode> datadogProfilingModes;
+    public static final class Snapshot {
+        private final boolean isDatadogProfilerEnabled;
+        private final String datadogProfilerUnavailableReason;
+        private final Set<ProfilingMode> datadogProfilingModes;
 
-    public Snapshot(ControllerContext context) {
-      this(
-          context.isDatadogProfilerEnabled,
-          EnumSet.copyOf(context.datadogProfilingModes),
-          context.datadogProfilerUnavailableReason);
-    }
+        public Snapshot(ControllerContext context) {
+            this(
+                    context.isDatadogProfilerEnabled,
+                    EnumSet.copyOf(context.datadogProfilingModes),
+                    context.datadogProfilerUnavailableReason);
+        }
 
-    private Snapshot(
-        boolean isDatadogProfilerEnabled,
-        Set<ProfilingMode> datadogProfilingModes,
-        String datadogProfilerFailureReason) {
-      this.isDatadogProfilerEnabled = isDatadogProfilerEnabled;
-      this.datadogProfilingModes = datadogProfilingModes;
-      this.datadogProfilerUnavailableReason = datadogProfilerFailureReason;
-    }
+        private Snapshot(
+                boolean isDatadogProfilerEnabled,
+                Set<ProfilingMode> datadogProfilingModes,
+                String datadogProfilerFailureReason) {
+            this.isDatadogProfilerEnabled = isDatadogProfilerEnabled;
+            this.datadogProfilingModes = datadogProfilingModes;
+            this.datadogProfilerUnavailableReason = datadogProfilerFailureReason;
+        }
 
-    public boolean isDatadogProfilerEnabled() {
-      return isDatadogProfilerEnabled;
-    }
+        public boolean isDatadogProfilerEnabled() {
+            return isDatadogProfilerEnabled;
+        }
 
-    public Set<ProfilingMode> getDatadogProfilingModes() {
-      return datadogProfilingModes;
-    }
+        public Set<ProfilingMode> getDatadogProfilingModes() {
+            return datadogProfilingModes;
+        }
 
-    public String getDatadogProfilerUnavailableReason() {
-      return datadogProfilerUnavailableReason;
+        public String getDatadogProfilerUnavailableReason() {
+            return datadogProfilerUnavailableReason;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/EnvironmentChecker.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/EnvironmentChecker.java
index 666aa0029f5..e04a3037590 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/EnvironmentChecker.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/EnvironmentChecker.java
@@ -20,247 +20,229 @@
 import java.util.jar.JarFile;
 
 public final class EnvironmentChecker {
-  private static void appendLine(String line, StringBuilder sb) {
-    sb.append(line).append(System.lineSeparator());
-  }
-
-  private static void appendLine(Supplier<StringBuilder> sbSupplier) {
-    sbSupplier.get().append(System.lineSeparator());
-  }
+    private static void appendLine(String line, StringBuilder sb) {
+        sb.append(line).append(System.lineSeparator());
+    }
 
-  @SuppressForbidden
-  public static boolean checkEnvironment(String temp, StringBuilder sb) {
-    if (!JavaVirtualMachine.isJavaVersionAtLeast(8)) {
-      appendLine("Profiler requires Java 8 or newer", sb);
-      return false;
+    private static void appendLine(Supplier<StringBuilder> sbSupplier) {
+        sbSupplier.get().append(System.lineSeparator());
     }
-    appendLine(
-        () ->
-            sb.append("Using Java version: ")
+
+    @SuppressForbidden
+    public static boolean checkEnvironment(String temp, StringBuilder sb) {
+        if (!JavaVirtualMachine.isJavaVersionAtLeast(8)) {
+            appendLine("Profiler requires Java 8 or newer", sb);
+            return false;
+        }
+        appendLine(() -> sb.append("Using Java version: ")
                 .append(JavaVirtualMachine.getRuntimeVersion())
                 .append(" (")
                 .append(SystemProperties.getOrDefault("java.home", "unknown"))
                 .append(")"));
-    appendLine(
-        () ->
-            sb.append("Running as user: ")
-                .append(SystemProperties.getOrDefault("user.name", "unknown")));
-    boolean result = false;
-    result |= checkJFR(sb);
-    result |= checkDdprof(sb);
-    if (!result) {
-      appendLine("Profiler is not supported on this JVM.", sb);
-      return false;
-    } else {
-      appendLine("Profiler is supported on this JVM.", sb);
-    }
-    sb.append(System.lineSeparator());
-    if (!checkTempLocation(temp, sb)) {
-      appendLine("Profiler will not work properly due to issues with temp directory location.", sb);
-      return false;
-    } else {
-      if (!temp.equals(SystemProperties.get("java.io.tmpdir"))) {
-        appendLine(
-            () ->
-                sb.append("! Make sure to add '-Ddd.profiling.tempdir=")
-                    .append(temp)
-                    .append("' to your JVM command line !"));
-      }
+        appendLine(() -> sb.append("Running as user: ").append(SystemProperties.getOrDefault("user.name", "unknown")));
+        boolean result = false;
+        result |= checkJFR(sb);
+        result |= checkDdprof(sb);
+        if (!result) {
+            appendLine("Profiler is not supported on this JVM.", sb);
+            return false;
+        } else {
+            appendLine("Profiler is supported on this JVM.", sb);
+        }
+        sb.append(System.lineSeparator());
+        if (!checkTempLocation(temp, sb)) {
+            appendLine("Profiler will not work properly due to issues with temp directory location.", sb);
+            return false;
+        } else {
+            if (!temp.equals(SystemProperties.get("java.io.tmpdir"))) {
+                appendLine(() -> sb.append("! Make sure to add '-Ddd.profiling.tempdir=")
+                        .append(temp)
+                        .append("' to your JVM command line !"));
+            }
+        }
+        appendLine("Profiler is ready to be used.", sb);
+        return true;
     }
-    appendLine("Profiler is ready to be used.", sb);
-    return true;
-  }
 
-  @SuppressForbidden
-  private static boolean checkJFR(StringBuilder sb) {
-    if (JavaVirtualMachine.isOracleJDK8()) {
-      appendLine(
-          "JFR is commercial feature in Oracle JDK 8. Make sure you have the right license.", sb);
-      return true;
-    } else if (JavaVirtualMachine.isJ9()) {
-      appendLine("JFR is not supported on J9 JVM.", sb);
-      return false;
-    } else {
-      appendLine(
-          () -> sb.append("JFR is supported on ").append(JavaVirtualMachine.getRuntimeVersion()));
-      return true;
+    @SuppressForbidden
+    private static boolean checkJFR(StringBuilder sb) {
+        if (JavaVirtualMachine.isOracleJDK8()) {
+            appendLine("JFR is commercial feature in Oracle JDK 8. Make sure you have the right license.", sb);
+            return true;
+        } else if (JavaVirtualMachine.isJ9()) {
+            appendLine("JFR is not supported on J9 JVM.", sb);
+            return false;
+        } else {
+            appendLine(() -> sb.append("JFR is supported on ").append(JavaVirtualMachine.getRuntimeVersion()));
+            return true;
+        }
     }
-  }
 
-  @SuppressForbidden
-  private static boolean checkDdprof(StringBuilder sb) {
-    if (!OperatingSystem.isLinux()) {
-      appendLine("Datadog profiler is only supported on Linux.", sb);
-      return false;
-    } else {
-      appendLine(
-          () ->
-              sb.append("Datadog profiler is supported on ")
-                  .append(JavaVirtualMachine.getRuntimeVersion()));
-      return true;
+    @SuppressForbidden
+    private static boolean checkDdprof(StringBuilder sb) {
+        if (!OperatingSystem.isLinux()) {
+            appendLine("Datadog profiler is only supported on Linux.", sb);
+            return false;
+        } else {
+            appendLine(() ->
+                    sb.append("Datadog profiler is supported on ").append(JavaVirtualMachine.getRuntimeVersion()));
+            return true;
+        }
     }
-  }
 
-  @SuppressForbidden
-  private static boolean checkTempLocation(String temp, StringBuilder sb) {
-    // Check if the temp directory is writable
-    if (temp == null || temp.isEmpty()) {
-      appendLine("Temp directory is not specified.", sb);
-      return false;
-    }
+    @SuppressForbidden
+    private static boolean checkTempLocation(String temp, StringBuilder sb) {
+        // Check if the temp directory is writable
+        if (temp == null || temp.isEmpty()) {
+            appendLine("Temp directory is not specified.", sb);
+            return false;
+        }
 
-    appendLine(() -> sb.append("Checking temporary directory: ").append(temp));
+        appendLine(() -> sb.append("Checking temporary directory: ").append(temp));
 
-    Path base = Paths.get(temp);
-    if (!Files.exists(base)) {
-      appendLine(() -> sb.append("Temporary directory does not exist: ").append(base));
-      return false;
-    }
-    Path target = base.resolve("dd-profiler").normalize();
-    boolean rslt = true;
-    Set<String> supportedViews = FileSystems.getDefault().supportedFileAttributeViews();
-    boolean isPosix = supportedViews.contains("posix");
-    try {
-      if (isPosix) {
-        Files.createDirectories(
-            target,
-            PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
-      } else {
-        // non-posix, eg. Windows - let's rely on the created folders being world-writable
-        Files.createDirectories(target);
-      }
-      appendLine(() -> sb.append("Temporary directory is writable: ").append(target));
-      rslt &= checkCreateTempFile(target, sb);
-      rslt &= checkLoadLibrary(target, sb);
-    } catch (Exception e) {
-      appendLine(() -> sb.append("Unable to create temp directory in location ").append(temp));
-      if (isPosix) {
-        appendLine(
-            () ->
-                sb.append("Base dir: ")
-                    .append(base)
-                    .append(" [")
-                    .append(getPermissionsStringSafe(base))
-                    .append("]"));
-      }
-      appendLine(() -> sb.append("Error: ").append(e));
-    } finally {
-      if (Files.exists(target)) {
+        Path base = Paths.get(temp);
+        if (!Files.exists(base)) {
+            appendLine(() -> sb.append("Temporary directory does not exist: ").append(base));
+            return false;
+        }
+        Path target = base.resolve("dd-profiler").normalize();
+        boolean rslt = true;
+        Set<String> supportedViews = FileSystems.getDefault().supportedFileAttributeViews();
+        boolean isPosix = supportedViews.contains("posix");
         try {
-          Files.walkFileTree(
-              target,
-              new FileVisitor<Path>() {
-                @Override
-                public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
-                    throws IOException {
-                  return FileVisitResult.CONTINUE;
-                }
-
-                @Override
-                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-                    throws IOException {
-                  Files.delete(file);
-                  return FileVisitResult.CONTINUE;
-                }
-
-                @Override
-                public FileVisitResult visitFileFailed(Path file, IOException exc)
-                    throws IOException {
-                  return FileVisitResult.CONTINUE;
-                }
-
-                @Override
-                public FileVisitResult postVisitDirectory(Path dir, IOException exc)
-                    throws IOException {
-                  Files.delete(dir);
-                  return FileVisitResult.CONTINUE;
+            if (isPosix) {
+                Files.createDirectories(
+                        target, PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
+            } else {
+                // non-posix, eg. Windows - let's rely on the created folders being world-writable
+                Files.createDirectories(target);
+            }
+            appendLine(() -> sb.append("Temporary directory is writable: ").append(target));
+            rslt &= checkCreateTempFile(target, sb);
+            rslt &= checkLoadLibrary(target, sb);
+        } catch (Exception e) {
+            appendLine(() ->
+                    sb.append("Unable to create temp directory in location ").append(temp));
+            if (isPosix) {
+                appendLine(() -> sb.append("Base dir: ")
+                        .append(base)
+                        .append(" [")
+                        .append(getPermissionsStringSafe(base))
+                        .append("]"));
+            }
+            appendLine(() -> sb.append("Error: ").append(e));
+        } finally {
+            if (Files.exists(target)) {
+                try {
+                    Files.walkFileTree(target, new FileVisitor<Path>() {
+                        @Override
+                        public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
+                                throws IOException {
+                            return FileVisitResult.CONTINUE;
+                        }
+
+                        @Override
+                        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                            Files.delete(file);
+                            return FileVisitResult.CONTINUE;
+                        }
+
+                        @Override
+                        public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
+                            return FileVisitResult.CONTINUE;
+                        }
+
+                        @Override
+                        public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                            Files.delete(dir);
+                            return FileVisitResult.CONTINUE;
+                        }
+                    });
+                } catch (IOException ignored) {
+                    // should never happen
                 }
-              });
-        } catch (IOException ignored) {
-          // should never happen
+            }
         }
-      }
+        return rslt;
     }
-    return rslt;
-  }
 
-  private static String getPermissionsStringSafe(Path file) {
-    try {
-      return PosixFilePermissions.toString(Files.getPosixFilePermissions(file));
-    } catch (IOException ignored) {
-      return "<unavailable>";
+    private static String getPermissionsStringSafe(Path file) {
+        try {
+            return PosixFilePermissions.toString(Files.getPosixFilePermissions(file));
+        } catch (IOException ignored) {
+            return "<unavailable>";
+        }
     }
-  }
 
-  @SuppressForbidden
-  private static boolean checkCreateTempFile(Path target, StringBuilder sb) {
-    // create a file to check if the directory is writable
-    try {
-      appendLine(() -> sb.append("Attempting to create a test file in: ").append(target));
-      Path testFile = target.resolve("testfile");
-      Files.createFile(testFile);
-      appendLine(() -> sb.append("Test file created: ").append(testFile));
-      return true;
-    } catch (Exception e) {
-      appendLine(() -> sb.append("Unable to create test file in temp directory ").append(target));
-      appendLine(() -> sb.append("Error: ").append(e));
+    @SuppressForbidden
+    private static boolean checkCreateTempFile(Path target, StringBuilder sb) {
+        // create a file to check if the directory is writable
+        try {
+            appendLine(() -> sb.append("Attempting to create a test file in: ").append(target));
+            Path testFile = target.resolve("testfile");
+            Files.createFile(testFile);
+            appendLine(() -> sb.append("Test file created: ").append(testFile));
+            return true;
+        } catch (Exception e) {
+            appendLine(() ->
+                    sb.append("Unable to create test file in temp directory ").append(target));
+            appendLine(() -> sb.append("Error: ").append(e));
+        }
+        return false;
     }
-    return false;
-  }
 
-  @SuppressForbidden
-  private static boolean checkLoadLibrary(Path target, StringBuilder sb) {
-    if (!OperatingSystem.isLinux()) {
-      // we are loading the native library only on linux
-      appendLine("Skipping native library check on non-linux platform", sb);
-      return true;
-    }
-    boolean rslt = true;
-    try {
-      rslt &= extractSoFromJar(target, sb);
-      if (rslt) {
-        Path libFile = target.resolve("libjavaProfiler.so");
-        appendLine(() -> sb.append("Attempting to load native library from: ").append(libFile));
-        System.load(libFile.toString());
-        appendLine("Native library loaded successfully", sb);
-      }
-      return true;
-    } catch (Throwable t) {
-      appendLine(
-          () -> sb.append("Unable to load native library in temp directory ").append(target));
-      appendLine(() -> sb.append("Error: ").append(t));
-      return false;
+    @SuppressForbidden
+    private static boolean checkLoadLibrary(Path target, StringBuilder sb) {
+        if (!OperatingSystem.isLinux()) {
+            // we are loading the native library only on linux
+            appendLine("Skipping native library check on non-linux platform", sb);
+            return true;
+        }
+        boolean rslt = true;
+        try {
+            rslt &= extractSoFromJar(target, sb);
+            if (rslt) {
+                Path libFile = target.resolve("libjavaProfiler.so");
+                appendLine(() ->
+                        sb.append("Attempting to load native library from: ").append(libFile));
+                System.load(libFile.toString());
+                appendLine("Native library loaded successfully", sb);
+            }
+            return true;
+        } catch (Throwable t) {
+            appendLine(() -> sb.append("Unable to load native library in temp directory ")
+                    .append(target));
+            appendLine(() -> sb.append("Error: ").append(t));
+            return false;
+        }
     }
-  }
 
-  @SuppressForbidden
-  private static boolean extractSoFromJar(Path target, StringBuilder sb) throws Exception {
-    URL jarUrl = EnvironmentChecker.class.getProtectionDomain().getCodeSource().getLocation();
-    String linuxArchFolder =
-        OperatingSystem.architecture().isArm64() ? "/linux-arm64/" : "/linux-x64/";
-    try (JarFile jarFile = new JarFile(new File(jarUrl.toURI()))) {
-      return jarFile.stream()
-          .filter(e -> e.getName().contains("libjavaProfiler.so"))
-          .filter(
-              e ->
-                  e.getName().contains(linuxArchFolder)
-                      && (!OperatingSystem.isMusl() || e.getName().contains("-musl")))
-          .findFirst()
-          .map(
-              e -> {
-                try {
-                  Path soFile = target.resolve("libjavaProfiler.so");
-                  Files.createDirectories(soFile.getParent());
-                  Files.copy(jarFile.getInputStream(e), soFile);
-                  appendLine(() -> sb.append("Native library extracted to: ").append(soFile));
-                  return true;
-                } catch (Throwable t) {
-                  appendLine("Failed to extract or load native library", sb);
-                  appendLine(() -> sb.append("Error: ").append(t));
-                }
-                return false;
-              })
-          .orElse(Boolean.FALSE);
+    @SuppressForbidden
+    private static boolean extractSoFromJar(Path target, StringBuilder sb) throws Exception {
+        URL jarUrl =
+                EnvironmentChecker.class.getProtectionDomain().getCodeSource().getLocation();
+        String linuxArchFolder = OperatingSystem.architecture().isArm64() ? "/linux-arm64/" : "/linux-x64/";
+        try (JarFile jarFile = new JarFile(new File(jarUrl.toURI()))) {
+            return jarFile.stream()
+                    .filter(e -> e.getName().contains("libjavaProfiler.so"))
+                    .filter(e -> e.getName().contains(linuxArchFolder)
+                            && (!OperatingSystem.isMusl() || e.getName().contains("-musl")))
+                    .findFirst()
+                    .map(e -> {
+                        try {
+                            Path soFile = target.resolve("libjavaProfiler.so");
+                            Files.createDirectories(soFile.getParent());
+                            Files.copy(jarFile.getInputStream(e), soFile);
+                            appendLine(() ->
+                                    sb.append("Native library extracted to: ").append(soFile));
+                            return true;
+                        } catch (Throwable t) {
+                            appendLine("Failed to extract or load native library", sb);
+                            appendLine(() -> sb.append("Error: ").append(t));
+                        }
+                        return false;
+                    })
+                    .orElse(Boolean.FALSE);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/OngoingRecording.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/OngoingRecording.java
index 767957adf3a..06ad2e46fa8 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/OngoingRecording.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/OngoingRecording.java
@@ -9,26 +9,26 @@
 /** Interface that represents ongoing recording in profiling system */
 public interface OngoingRecording extends Closeable {
 
-  /**
-   * Stop recording.
-   *
-   * @return {@link RecordingData} with current recording information
-   */
-  @Nonnull
-  RecordingData stop();
+    /**
+     * Stop recording.
+     *
+     * @return {@link RecordingData} with current recording information
+     */
+    @Nonnull
+    RecordingData stop();
 
-  /**
-   * Create snapshot from running recording. Note: recording continues to run after this method is
-   * called.
-   *
-   * @param start start time of the snapshot
-   * @param kind the snapshot reason
-   * @return {@link RecordingData} with snapshot information
-   */
-  @Nonnull
-  RecordingData snapshot(@Nonnull final Instant start, ProfilingSnapshot.Kind kind);
+    /**
+     * Create snapshot from running recording. Note: recording continues to run after this method is
+     * called.
+     *
+     * @param start start time of the snapshot
+     * @param kind the snapshot reason
+     * @return {@link RecordingData} with snapshot information
+     */
+    @Nonnull
+    RecordingData snapshot(@Nonnull final Instant start, ProfilingSnapshot.Kind kind);
 
-  /** Close recording without capturing any data */
-  @Override
-  void close();
+    /** Close recording without capturing any data */
+    @Override
+    void close();
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerFlareReporter.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerFlareReporter.java
index 5bbc9997f71..a306647e4b2 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerFlareReporter.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerFlareReporter.java
@@ -13,557 +13,512 @@
 import java.util.zip.ZipOutputStream;
 
 public final class ProfilerFlareReporter implements TracerFlare.Reporter {
-  private static final ProfilerFlareReporter INSTANCE = new ProfilerFlareReporter();
-  private volatile Exception profilerInitializationException;
-
-  public static void register() {
-    TracerFlare.addReporter(INSTANCE);
-  }
-
-  public static void reportInitializationException(Exception e) {
-    INSTANCE.profilerInitializationException = e;
-  }
-
-  @Override
-  public void addReportToFlare(ZipOutputStream zip) throws IOException {
-    TracerFlare.addText(zip, "profiler_config.txt", getProfilerConfig());
-    String templateOverrideFile = Config.get().getProfilingTemplateOverrideFile();
-    if (templateOverrideFile != null) {
-      try {
-        Path path = Paths.get(templateOverrideFile);
-        if (Files.exists(path)) {
-          String fileContents = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
-          TracerFlare.addText(zip, "profiling_template_override.jfp", fileContents);
-        }
-      } catch (IOException e) {
-        // no-op, ignore if we can't read the template override file
-      }
+    private static final ProfilerFlareReporter INSTANCE = new ProfilerFlareReporter();
+    private volatile Exception profilerInitializationException;
+
+    public static void register() {
+        TracerFlare.addReporter(INSTANCE);
     }
 
-    StringBuilder envCheck = new StringBuilder();
-    String tempDir = ConfigProvider.getInstance().getString(ProfilingConfig.PROFILING_TEMP_DIR);
-    EnvironmentChecker.checkEnvironment(
-        tempDir != null ? tempDir : System.getProperty("java.io.tmpdir"), envCheck);
-    TracerFlare.addText(zip, "profiler_env.txt", envCheck.toString());
-  }
-
-  private String getProfilerConfig() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("Profiler Configuration\n");
-    sb.append("======================\n\n");
-
-    ConfigProvider configProvider = ConfigProvider.getInstance();
-    Config config = Config.get();
-
-    sb.append("=== Profiler Initialization Status ===\n");
-    if (profilerInitializationException == null) {
-      sb.append("Profiler initialized successfully.\n");
-    } else {
-      sb.append("Profiler initialization failed due to: \n");
-      sb.append(profilerInitializationException.getMessage());
-      sb.append("\n");
+    public static void reportInitializationException(Exception e) {
+        INSTANCE.profilerInitializationException = e;
     }
 
-    sb.append("=== Core Settings ===\n");
-    appendConfig(
-        sb,
-        "Profiling Enabled",
-        config.isProfilingEnabled(),
-        ProfilingConfig.PROFILING_ENABLED_DEFAULT);
-    appendConfig(
-        sb,
-        "Agentless",
-        config.isProfilingAgentless(),
-        ProfilingConfig.PROFILING_AGENTLESS_DEFAULT);
-    appendConfig(
-        sb,
-        "Start Delay",
-        config.getProfilingStartDelay(),
-        ProfilingConfig.PROFILING_START_DELAY_DEFAULT,
-        " seconds");
-    appendConfig(
-        sb,
-        "Start Force First",
-        config.isProfilingStartForceFirst(),
-        ProfilingConfig.PROFILING_START_FORCE_FIRST_DEFAULT);
-    appendConfig(
-        sb,
-        "Ultra Minimal",
-        configProvider.getString(ProfilingConfig.PROFILING_ULTRA_MINIMAL),
-        null);
-    appendConfig(
-        sb,
-        "Detailed Debug Logging",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_DETAILED_DEBUG_LOGGING,
-            ProfilingConfig.PROFILING_DETAILED_DEBUG_LOGGING_DEFAULT),
-        ProfilingConfig.PROFILING_DETAILED_DEBUG_LOGGING_DEFAULT);
-
-    sb.append("\n=== Upload Settings ===\n");
-    appendConfig(
-        sb,
-        "Upload Period",
-        config.getProfilingUploadPeriod(),
-        ProfilingConfig.PROFILING_UPLOAD_PERIOD_DEFAULT,
-        " seconds");
-    appendConfig(
-        sb,
-        "Upload Timeout",
-        config.getProfilingUploadTimeout(),
-        ProfilingConfig.PROFILING_UPLOAD_TIMEOUT_DEFAULT,
-        " seconds");
-    appendConfig(
-        sb,
-        "Upload Compression",
-        config.getProfilingUploadCompression(),
-        ProfilingConfig.PROFILING_DEBUG_UPLOAD_COMPRESSION_DEFAULT);
-    appendConfig(
-        sb,
-        "Upload Summary on 413",
-        config.isProfilingUploadSummaryOn413Enabled(),
-        ProfilingConfig.PROFILING_UPLOAD_SUMMARY_ON_413_DEFAULT);
-
-    sb.append("\n=== Proxy Settings ===\n");
-    appendConfig(sb, "Proxy Host", config.getProfilingProxyHost(), null);
-    appendConfig(
-        sb,
-        "Proxy Port",
-        config.getProfilingProxyPort(),
-        ProfilingConfig.PROFILING_PROXY_PORT_DEFAULT);
-    appendConfig(sb, "Proxy Username", config.getProfilingProxyUsername(), null);
-    String proxyPassword = config.getProfilingProxyPassword();
-    sb.append("Proxy Password: ")
-        .append(proxyPassword != null ? "[REDACTED]" : null)
-        .append(" (default: null)\n");
-
-    sb.append("\n=== Allocation Profiling ===\n");
-    boolean allocDefault = ProfilingSupport.isObjectAllocationSampleAvailable();
-    boolean allocEnabled =
-        configProvider.getBoolean(ProfilingConfig.PROFILING_ALLOCATION_ENABLED, allocDefault);
-    sb.append("Allocation Profiling Enabled: ")
-        .append(allocEnabled)
-        .append(" (default: dynamic based on JVM)\n");
-    appendConfig(
-        sb,
-        "Direct Allocation Enabled",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_DIRECT_ALLOCATION_ENABLED,
-            ProfilingConfig.PROFILING_DIRECT_ALLOCATION_ENABLED_DEFAULT),
-        ProfilingConfig.PROFILING_DIRECT_ALLOCATION_ENABLED_DEFAULT);
-    appendConfig(
-        sb,
-        "Direct Allocation Sample Limit",
-        config.getProfilingDirectAllocationSampleLimit(),
-        ProfilingConfig.PROFILING_DIRECT_ALLOCATION_SAMPLE_LIMIT_DEFAULT);
-
-    sb.append("\n=== Heap Profiling ===\n");
-    boolean heapDefault = ProfilingSupport.isLiveHeapProfilingSafe();
-    appendConfig(
-        sb,
-        "Heap Profiling Enabled",
-        configProvider.getBoolean(ProfilingConfig.PROFILING_HEAP_ENABLED, heapDefault),
-        heapDefault);
-    appendConfig(
-        sb,
-        "DDProf Live Heap Enabled",
-        configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED),
-        null);
-    appendConfig(
-        sb, "JFR OldObjectSample Available", ProfilingSupport.isOldObjectSampleAvailable(), false);
-    appendConfig(
-        sb,
-        "Heap Histogram Enabled",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_HEAP_HISTOGRAM_ENABLED,
-            ProfilingConfig.PROFILING_HEAP_HISTOGRAM_ENABLED_DEFAULT),
-        ProfilingConfig.PROFILING_HEAP_HISTOGRAM_ENABLED_DEFAULT);
-    appendConfig(
-        sb,
-        "Heap Histogram Mode",
-        configProvider.getString(
-            ProfilingConfig.PROFILING_HEAP_HISTOGRAM_MODE,
-            ProfilingConfig.PROFILING_HEAP_HISTOGRAM_MODE_DEFAULT),
-        ProfilingConfig.PROFILING_HEAP_HISTOGRAM_MODE_DEFAULT);
-    appendConfig(
-        sb,
-        "Heap Track Generations",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_HEAP_TRACK_GENERATIONS,
-            ProfilingConfig.PROFILING_HEAP_TRACK_GENERATIONS_DEFAULT),
-        ProfilingConfig.PROFILING_HEAP_TRACK_GENERATIONS_DEFAULT);
-
-    sb.append("\n=== Exception Profiling ===\n");
-    appendConfig(
-        sb,
-        "Exception Sample Limit",
-        config.getProfilingExceptionSampleLimit(),
-        ProfilingConfig.PROFILING_EXCEPTION_SAMPLE_LIMIT_DEFAULT);
-    appendConfig(
-        sb,
-        "Exception Record Message",
-        config.isProfilingRecordExceptionMessage(),
-        ProfilingConfig.PROFILING_EXCEPTION_RECORD_MESSAGE_DEFAULT);
-    appendConfig(
-        sb,
-        "Exception Histogram Top Items",
-        config.getProfilingExceptionHistogramTopItems(),
-        ProfilingConfig.PROFILING_EXCEPTION_HISTOGRAM_TOP_ITEMS_DEFAULT);
-    appendConfig(
-        sb,
-        "Exception Histogram Max Collection Size",
-        config.getProfilingExceptionHistogramMaxCollectionSize(),
-        ProfilingConfig.PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE_DEFAULT);
-
-    sb.append("\n=== Backpressure Profiling ===\n");
-    appendConfig(
-        sb,
-        "Backpressure Sampling Enabled",
-        config.isProfilingBackPressureSamplingEnabled(),
-        ProfilingConfig.PROFILING_BACKPRESSURE_SAMPLING_ENABLED_DEFAULT);
-    appendConfig(
-        sb,
-        "Backpressure Sample Limit",
-        config.getProfilingBackPressureSampleLimit(),
-        ProfilingConfig.PROFILING_BACKPRESSURE_SAMPLE_LIMIT_DEFAULT);
-
-    sb.append("\n=== JFR Settings ===\n");
-    appendConfig(sb, "JFR Template Override File", config.getProfilingTemplateOverrideFile(), null);
-    appendConfig(
-        sb,
-        "JFR Repository Base",
-        configProvider.getString(
-            ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE,
-            ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE_DEFAULT),
-        ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE_DEFAULT);
-    appendConfig(
-        sb,
-        "JFR Repository Max Size",
-        configProvider.getInteger(
-            ProfilingConfig.PROFILING_JFR_REPOSITORY_MAXSIZE,
-            ProfilingConfig.PROFILING_JFR_REPOSITORY_MAXSIZE_DEFAULT),
-        ProfilingConfig.PROFILING_JFR_REPOSITORY_MAXSIZE_DEFAULT,
-        " bytes");
-    appendConfig(
-        sb,
-        "Debug JFR Disabled",
-        configProvider.getString(ProfilingConfig.PROFILING_DEBUG_JFR_DISABLED),
-        null);
-    appendConfig(
-        sb,
-        "Disabled Events",
-        configProvider.getString(ProfilingConfig.PROFILING_DISABLED_EVENTS),
-        null);
-    appendConfig(
-        sb,
-        "Enabled Events",
-        configProvider.getString(ProfilingConfig.PROFILING_ENABLED_EVENTS),
-        null);
-
-    sb.append("\n=== DDProf Settings ===\n");
-    appendConfig(sb, "DDProf Enabled", config.isDatadogProfilerEnabled(), false);
-    appendConfig(
-        sb,
-        "DDProf Scratch",
-        configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_SCRATCH),
-        null);
-    appendConfig(
-        sb,
-        "DDProf Lib Path",
-        configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIBPATH),
-        null);
-    appendConfig(
-        sb,
-        "DDProf Log Level",
-        configProvider.getString(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_LOG_LEVEL,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_LOG_LEVEL_DEFAULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_LOG_LEVEL_DEFAULT);
-    appendConfig(
-        sb,
-        "DDProf Safe Mode",
-        configProvider.getInteger(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_SAFEMODE,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_SAFEMODE_DEFAULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_SAFEMODE_DEFAULT);
-    appendConfig(
-        sb,
-        "DDProf Line Numbers",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_LINE_NUMBERS,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_LINE_NUMBERS_DEFAULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_LINE_NUMBERS_DEFAULT);
-    appendConfig(
-        sb,
-        "DDProf Stack Depth",
-        configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_STACKDEPTH),
-        null);
-    appendConfig(
-        sb,
-        "DDProf C-Stack",
-        configProvider.getString(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_CSTACK,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_CSTACK_DEFAULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_CSTACK_DEFAULT);
-
-    sb.append("\n=== DDProf CPU Profiling ===\n");
-    appendConfig(
-        sb,
-        "DDProf CPU Enabled",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_ENABLED,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_ENABLED_DEFAULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_ENABLED_DEFAULT);
-    appendConfig(
-        sb,
-        "DDProf CPU Interval",
-        configProvider.getInteger(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_INTERVAL,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_INTERVAL_DEFAULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_INTERVAL_DEFAULT,
-        " ms");
-
-    sb.append("\n=== DDProf Wall Profiling ===\n");
-    appendConfig(
-        sb,
-        "DDProf Wall Enabled",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED_DEFAULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED_DEFAULT);
-    appendConfig(
-        sb,
-        "DDProf Wall Interval",
-        configProvider.getInteger(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_INTERVAL,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_INTERVAL_DEFAULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_INTERVAL_DEFAULT,
-        " ms");
-    appendConfig(
-        sb,
-        "DDProf Wall Collapsing",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_COLLAPSING,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_COLLAPSING_DEFAULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_COLLAPSING_DEFAULT);
-    appendConfig(
-        sb,
-        "DDProf Wall Context Filter",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER_DEFAULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER_DEFAULT);
-    appendConfig(
-        sb,
-        "DDProf Force Preload jmethodIDs",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_JMETHODID_OPTIM_ENABLED,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_JMETHODID_OPTIM_ENABLED_DEFAULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_JMETHODID_OPTIM_ENABLED_DEFAULT);
-    sb.append("\n=== DDProf Allocation Profiling ===\n");
-    appendConfig(
-        sb,
-        "DDProf Alloc Enabled",
-        configProvider.getBoolean(ProfilingConfig.PROFILING_DATADOG_PROFILER_ALLOC_ENABLED, false),
-        false);
-    appendConfig(
-        sb,
-        "DDProf Alloc Interval",
-        configProvider.getInteger(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_ALLOC_INTERVAL,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_ALLOC_INTERVAL_DEFAULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_ALLOC_INTERVAL_DEFAULT,
-        " bytes");
-
-    sb.append("\n=== DDProf Live Heap Profiling ===\n");
-    appendConfig(
-        sb,
-        "DDProf Live Heap Enabled",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED_DEFAULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED_DEFAULT);
-    appendConfig(
-        sb,
-        "DDProf Live Heap Interval",
-        configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_INTERVAL),
-        null);
-    appendConfig(
-        sb,
-        "DDProf Live Heap Capacity",
-        configProvider.getInteger(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_CAPACITY,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_CAPACITY_DEFAULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_CAPACITY_DEFAULT);
-    appendConfig(
-        sb,
-        "DDProf Live Heap Track Size",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE_DEFAFULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE_DEFAFULT);
-    appendConfig(
-        sb,
-        "DDProf Live Heap Sample Percent",
-        configProvider.getInteger(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT_DEFAULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT_DEFAULT,
-        "%");
-
-    sb.append("\n=== DDProf Scheduling ===\n");
-    appendConfig(
-        sb,
-        "DDProf Scheduling Event",
-        configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_SCHEDULING_EVENT),
-        null);
-    appendConfig(
-        sb,
-        "DDProf Scheduling Event Interval",
-        configProvider.getString(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_SCHEDULING_EVENT_INTERVAL),
-        null);
-
-    sb.append("\n=== Context & Timeline Settings ===\n");
-    appendConfig(
-        sb,
-        "Context Attributes",
-        configProvider.getString(ProfilingConfig.PROFILING_CONTEXT_ATTRIBUTES),
-        null);
-    appendConfig(
-        sb,
-        "Context Attributes Span Name Enabled",
-        configProvider.getString(ProfilingConfig.PROFILING_CONTEXT_ATTRIBUTES_SPAN_NAME_ENABLED),
-        null);
-    appendConfig(
-        sb,
-        "Context Attributes Resource Name Enabled",
-        configProvider.getString(
-            ProfilingConfig.PROFILING_CONTEXT_ATTRIBUTES_RESOURCE_NAME_ENABLED),
-        null);
-    appendConfig(
-        sb,
-        "Timeline Events Enabled",
-        config.isProfilingTimelineEventsEnabled(),
-        ProfilingConfig.PROFILING_TIMELINE_EVENTS_ENABLED_DEFAULT);
-
-    sb.append("\n=== Queueing Time Settings ===\n");
-    appendConfig(
-        sb,
-        "Queueing Time Enabled",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED,
-            ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED_DEFAULT),
-        ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED_DEFAULT);
-    appendConfig(
-        sb,
-        "Queueing Time Threshold",
-        configProvider.getLong(
-            ProfilingConfig.PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS,
-            ProfilingConfig.PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS_DEFAULT),
-        ProfilingConfig.PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS_DEFAULT,
-        " ms");
-
-    sb.append("\n=== SMAP Settings ===\n");
-    appendConfig(
-        sb,
-        "SMAP Collection Enabled",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_SMAP_COLLECTION_ENABLED,
-            ProfilingConfig.PROFILING_SMAP_COLLECTION_ENABLED_DEFAULT),
-        ProfilingConfig.PROFILING_SMAP_COLLECTION_ENABLED_DEFAULT);
-    appendConfig(
-        sb,
-        "SMAP Aggregation Enabled",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_SMAP_AGGREGATION_ENABLED,
-            ProfilingConfig.PROFILING_SMAP_AGGREGATION_ENABLED_DEFAULT),
-        ProfilingConfig.PROFILING_SMAP_AGGREGATION_ENABLED_DEFAULT);
-
-    sb.append("\n=== Miscellaneous Settings ===\n");
-    appendConfig(
-        sb,
-        "Stack Depth",
-        configProvider.getInteger(
-            ProfilingConfig.PROFILING_STACKDEPTH, ProfilingConfig.PROFILING_STACKDEPTH_DEFAULT),
-        ProfilingConfig.PROFILING_STACKDEPTH_DEFAULT);
-    appendConfig(
-        sb,
-        "Auxiliary Profiler",
-        configProvider.getString(
-            ProfilingConfig.PROFILING_AUXILIARY_TYPE,
-            ProfilingConfig.PROFILING_AUXILIARY_TYPE_DEFAULT),
-        ProfilingConfig.PROFILING_AUXILIARY_TYPE_DEFAULT);
-    appendConfig(sb, "Exclude Agent Threads", config.isProfilingExcludeAgentThreads(), false);
-    appendConfig(
-        sb,
-        "Hotspots Enabled",
-        configProvider.getBoolean(ProfilingConfig.PROFILING_HOTSPOTS_ENABLED, false),
-        false);
-    appendConfig(
-        sb,
-        "Endpoint Collection Enabled",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED,
-            ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED_DEFAULT),
-        ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED_DEFAULT);
-    appendConfig(
-        sb,
-        "Temp Directory",
-        configProvider.getString(
-            ProfilingConfig.PROFILING_TEMP_DIR, ProfilingConfig.PROFILING_TEMP_DIR_DEFAULT),
-        ProfilingConfig.PROFILING_TEMP_DIR_DEFAULT);
-    appendConfig(
-        sb,
-        "Debug Dump Path",
-        configProvider.getString(ProfilingConfig.PROFILING_DEBUG_DUMP_PATH),
-        null);
-
-    sb.append("Profiling Tags: ");
-    Map<String, String> tags = config.getMergedProfilingTags();
-    if (tags != null && !tags.isEmpty()) {
-      sb.append(tags);
-    } else {
-      sb.append("null");
+    @Override
+    public void addReportToFlare(ZipOutputStream zip) throws IOException {
+        TracerFlare.addText(zip, "profiler_config.txt", getProfilerConfig());
+        String templateOverrideFile = Config.get().getProfilingTemplateOverrideFile();
+        if (templateOverrideFile != null) {
+            try {
+                Path path = Paths.get(templateOverrideFile);
+                if (Files.exists(path)) {
+                    String fileContents = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
+                    TracerFlare.addText(zip, "profiling_template_override.jfp", fileContents);
+                }
+            } catch (IOException e) {
+                // no-op, ignore if we can't read the template override file
+            }
+        }
+
+        StringBuilder envCheck = new StringBuilder();
+        String tempDir = ConfigProvider.getInstance().getString(ProfilingConfig.PROFILING_TEMP_DIR);
+        EnvironmentChecker.checkEnvironment(tempDir != null ? tempDir : System.getProperty("java.io.tmpdir"), envCheck);
+        TracerFlare.addText(zip, "profiler_env.txt", envCheck.toString());
     }
-    sb.append(" (default: null)\n");
-
-    sb.append("Final Profiling URL: ")
-        .append(config.getFinalProfilingUrl())
-        .append(" (default: varies)\n");
-
-    return sb.toString();
-  }
-
-  private void appendConfig(StringBuilder sb, String name, Object value, Object defaultValue) {
-    // The suffix is there for showing time units & the like; ideally we'd derive this
-    // programmatically
-    // from the different config sources.
-    appendConfig(sb, name, value, defaultValue, "");
-  }
-
-  private void appendConfig(
-      StringBuilder sb, String name, Object value, Object defaultValue, String suffix) {
-    sb.append(name).append(": ");
-
-    if (value != null) {
-      sb.append(value);
-      if (!suffix.isEmpty()) {
-        sb.append(" ");
-        sb.append(suffix);
-      }
-    } else {
-      sb.append("null");
+
+    private String getProfilerConfig() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Profiler Configuration\n");
+        sb.append("======================\n\n");
+
+        ConfigProvider configProvider = ConfigProvider.getInstance();
+        Config config = Config.get();
+
+        sb.append("=== Profiler Initialization Status ===\n");
+        if (profilerInitializationException == null) {
+            sb.append("Profiler initialized successfully.\n");
+        } else {
+            sb.append("Profiler initialization failed due to: \n");
+            sb.append(profilerInitializationException.getMessage());
+            sb.append("\n");
+        }
+
+        sb.append("=== Core Settings ===\n");
+        appendConfig(sb, "Profiling Enabled", config.isProfilingEnabled(), ProfilingConfig.PROFILING_ENABLED_DEFAULT);
+        appendConfig(sb, "Agentless", config.isProfilingAgentless(), ProfilingConfig.PROFILING_AGENTLESS_DEFAULT);
+        appendConfig(
+                sb,
+                "Start Delay",
+                config.getProfilingStartDelay(),
+                ProfilingConfig.PROFILING_START_DELAY_DEFAULT,
+                " seconds");
+        appendConfig(
+                sb,
+                "Start Force First",
+                config.isProfilingStartForceFirst(),
+                ProfilingConfig.PROFILING_START_FORCE_FIRST_DEFAULT);
+        appendConfig(sb, "Ultra Minimal", configProvider.getString(ProfilingConfig.PROFILING_ULTRA_MINIMAL), null);
+        appendConfig(
+                sb,
+                "Detailed Debug Logging",
+                configProvider.getBoolean(
+                        ProfilingConfig.PROFILING_DETAILED_DEBUG_LOGGING,
+                        ProfilingConfig.PROFILING_DETAILED_DEBUG_LOGGING_DEFAULT),
+                ProfilingConfig.PROFILING_DETAILED_DEBUG_LOGGING_DEFAULT);
+
+        sb.append("\n=== Upload Settings ===\n");
+        appendConfig(
+                sb,
+                "Upload Period",
+                config.getProfilingUploadPeriod(),
+                ProfilingConfig.PROFILING_UPLOAD_PERIOD_DEFAULT,
+                " seconds");
+        appendConfig(
+                sb,
+                "Upload Timeout",
+                config.getProfilingUploadTimeout(),
+                ProfilingConfig.PROFILING_UPLOAD_TIMEOUT_DEFAULT,
+                " seconds");
+        appendConfig(
+                sb,
+                "Upload Compression",
+                config.getProfilingUploadCompression(),
+                ProfilingConfig.PROFILING_DEBUG_UPLOAD_COMPRESSION_DEFAULT);
+        appendConfig(
+                sb,
+                "Upload Summary on 413",
+                config.isProfilingUploadSummaryOn413Enabled(),
+                ProfilingConfig.PROFILING_UPLOAD_SUMMARY_ON_413_DEFAULT);
+
+        sb.append("\n=== Proxy Settings ===\n");
+        appendConfig(sb, "Proxy Host", config.getProfilingProxyHost(), null);
+        appendConfig(sb, "Proxy Port", config.getProfilingProxyPort(), ProfilingConfig.PROFILING_PROXY_PORT_DEFAULT);
+        appendConfig(sb, "Proxy Username", config.getProfilingProxyUsername(), null);
+        String proxyPassword = config.getProfilingProxyPassword();
+        sb.append("Proxy Password: ")
+                .append(proxyPassword != null ? "[REDACTED]" : null)
+                .append(" (default: null)\n");
+
+        sb.append("\n=== Allocation Profiling ===\n");
+        boolean allocDefault = ProfilingSupport.isObjectAllocationSampleAvailable();
+        boolean allocEnabled = configProvider.getBoolean(ProfilingConfig.PROFILING_ALLOCATION_ENABLED, allocDefault);
+        sb.append("Allocation Profiling Enabled: ").append(allocEnabled).append(" (default: dynamic based on JVM)\n");
+        appendConfig(
+                sb,
+                "Direct Allocation Enabled",
+                configProvider.getBoolean(
+                        ProfilingConfig.PROFILING_DIRECT_ALLOCATION_ENABLED,
+                        ProfilingConfig.PROFILING_DIRECT_ALLOCATION_ENABLED_DEFAULT),
+                ProfilingConfig.PROFILING_DIRECT_ALLOCATION_ENABLED_DEFAULT);
+        appendConfig(
+                sb,
+                "Direct Allocation Sample Limit",
+                config.getProfilingDirectAllocationSampleLimit(),
+                ProfilingConfig.PROFILING_DIRECT_ALLOCATION_SAMPLE_LIMIT_DEFAULT);
+
+        sb.append("\n=== Heap Profiling ===\n");
+        boolean heapDefault = ProfilingSupport.isLiveHeapProfilingSafe();
+        appendConfig(
+                sb,
+                "Heap Profiling Enabled",
+                configProvider.getBoolean(ProfilingConfig.PROFILING_HEAP_ENABLED, heapDefault),
+                heapDefault);
+        appendConfig(
+                sb,
+                "DDProf Live Heap Enabled",
+                configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED),
+                null);
+        appendConfig(sb, "JFR OldObjectSample Available", ProfilingSupport.isOldObjectSampleAvailable(), false);
+        appendConfig(
+                sb,
+                "Heap Histogram Enabled",
+                configProvider.getBoolean(
+                        ProfilingConfig.PROFILING_HEAP_HISTOGRAM_ENABLED,
+                        ProfilingConfig.PROFILING_HEAP_HISTOGRAM_ENABLED_DEFAULT),
+                ProfilingConfig.PROFILING_HEAP_HISTOGRAM_ENABLED_DEFAULT);
+        appendConfig(
+                sb,
+                "Heap Histogram Mode",
+                configProvider.getString(
+                        ProfilingConfig.PROFILING_HEAP_HISTOGRAM_MODE,
+                        ProfilingConfig.PROFILING_HEAP_HISTOGRAM_MODE_DEFAULT),
+                ProfilingConfig.PROFILING_HEAP_HISTOGRAM_MODE_DEFAULT);
+        appendConfig(
+                sb,
+                "Heap Track Generations",
+                configProvider.getBoolean(
+                        ProfilingConfig.PROFILING_HEAP_TRACK_GENERATIONS,
+                        ProfilingConfig.PROFILING_HEAP_TRACK_GENERATIONS_DEFAULT),
+                ProfilingConfig.PROFILING_HEAP_TRACK_GENERATIONS_DEFAULT);
+
+        sb.append("\n=== Exception Profiling ===\n");
+        appendConfig(
+                sb,
+                "Exception Sample Limit",
+                config.getProfilingExceptionSampleLimit(),
+                ProfilingConfig.PROFILING_EXCEPTION_SAMPLE_LIMIT_DEFAULT);
+        appendConfig(
+                sb,
+                "Exception Record Message",
+                config.isProfilingRecordExceptionMessage(),
+                ProfilingConfig.PROFILING_EXCEPTION_RECORD_MESSAGE_DEFAULT);
+        appendConfig(
+                sb,
+                "Exception Histogram Top Items",
+                config.getProfilingExceptionHistogramTopItems(),
+                ProfilingConfig.PROFILING_EXCEPTION_HISTOGRAM_TOP_ITEMS_DEFAULT);
+        appendConfig(
+                sb,
+                "Exception Histogram Max Collection Size",
+                config.getProfilingExceptionHistogramMaxCollectionSize(),
+                ProfilingConfig.PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE_DEFAULT);
+
+        sb.append("\n=== Backpressure Profiling ===\n");
+        appendConfig(
+                sb,
+                "Backpressure Sampling Enabled",
+                config.isProfilingBackPressureSamplingEnabled(),
+                ProfilingConfig.PROFILING_BACKPRESSURE_SAMPLING_ENABLED_DEFAULT);
+        appendConfig(
+                sb,
+                "Backpressure Sample Limit",
+                config.getProfilingBackPressureSampleLimit(),
+                ProfilingConfig.PROFILING_BACKPRESSURE_SAMPLE_LIMIT_DEFAULT);
+
+        sb.append("\n=== JFR Settings ===\n");
+        appendConfig(sb, "JFR Template Override File", config.getProfilingTemplateOverrideFile(), null);
+        appendConfig(
+                sb,
+                "JFR Repository Base",
+                configProvider.getString(
+                        ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE,
+                        ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE_DEFAULT),
+                ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE_DEFAULT);
+        appendConfig(
+                sb,
+                "JFR Repository Max Size",
+                configProvider.getInteger(
+                        ProfilingConfig.PROFILING_JFR_REPOSITORY_MAXSIZE,
+                        ProfilingConfig.PROFILING_JFR_REPOSITORY_MAXSIZE_DEFAULT),
+                ProfilingConfig.PROFILING_JFR_REPOSITORY_MAXSIZE_DEFAULT,
+                " bytes");
+        appendConfig(
+                sb, "Debug JFR Disabled", configProvider.getString(ProfilingConfig.PROFILING_DEBUG_JFR_DISABLED), null);
+        appendConfig(sb, "Disabled Events", configProvider.getString(ProfilingConfig.PROFILING_DISABLED_EVENTS), null);
+        appendConfig(sb, "Enabled Events", configProvider.getString(ProfilingConfig.PROFILING_ENABLED_EVENTS), null);
+
+        sb.append("\n=== DDProf Settings ===\n");
+        appendConfig(sb, "DDProf Enabled", config.isDatadogProfilerEnabled(), false);
+        appendConfig(
+                sb,
+                "DDProf Scratch",
+                configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_SCRATCH),
+                null);
+        appendConfig(
+                sb,
+                "DDProf Lib Path",
+                configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIBPATH),
+                null);
+        appendConfig(
+                sb,
+                "DDProf Log Level",
+                configProvider.getString(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_LOG_LEVEL,
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_LOG_LEVEL_DEFAULT),
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_LOG_LEVEL_DEFAULT);
+        appendConfig(
+                sb,
+                "DDProf Safe Mode",
+                configProvider.getInteger(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_SAFEMODE,
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_SAFEMODE_DEFAULT),
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_SAFEMODE_DEFAULT);
+        appendConfig(
+                sb,
+                "DDProf Line Numbers",
+                configProvider.getBoolean(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_LINE_NUMBERS,
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_LINE_NUMBERS_DEFAULT),
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_LINE_NUMBERS_DEFAULT);
+        appendConfig(
+                sb,
+                "DDProf Stack Depth",
+                configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_STACKDEPTH),
+                null);
+        appendConfig(
+                sb,
+                "DDProf C-Stack",
+                configProvider.getString(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_CSTACK,
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_CSTACK_DEFAULT),
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_CSTACK_DEFAULT);
+
+        sb.append("\n=== DDProf CPU Profiling ===\n");
+        appendConfig(
+                sb,
+                "DDProf CPU Enabled",
+                configProvider.getBoolean(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_ENABLED,
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_ENABLED_DEFAULT),
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_ENABLED_DEFAULT);
+        appendConfig(
+                sb,
+                "DDProf CPU Interval",
+                configProvider.getInteger(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_INTERVAL,
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_INTERVAL_DEFAULT),
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_INTERVAL_DEFAULT,
+                " ms");
+
+        sb.append("\n=== DDProf Wall Profiling ===\n");
+        appendConfig(
+                sb,
+                "DDProf Wall Enabled",
+                configProvider.getBoolean(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED,
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED_DEFAULT),
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED_DEFAULT);
+        appendConfig(
+                sb,
+                "DDProf Wall Interval",
+                configProvider.getInteger(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_INTERVAL,
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_INTERVAL_DEFAULT),
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_INTERVAL_DEFAULT,
+                " ms");
+        appendConfig(
+                sb,
+                "DDProf Wall Collapsing",
+                configProvider.getBoolean(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_COLLAPSING,
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_COLLAPSING_DEFAULT),
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_COLLAPSING_DEFAULT);
+        appendConfig(
+                sb,
+                "DDProf Wall Context Filter",
+                configProvider.getBoolean(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER,
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER_DEFAULT),
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER_DEFAULT);
+        appendConfig(
+                sb,
+                "DDProf Force Preload jmethodIDs",
+                configProvider.getBoolean(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_JMETHODID_OPTIM_ENABLED,
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_JMETHODID_OPTIM_ENABLED_DEFAULT),
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_JMETHODID_OPTIM_ENABLED_DEFAULT);
+        sb.append("\n=== DDProf Allocation Profiling ===\n");
+        appendConfig(
+                sb,
+                "DDProf Alloc Enabled",
+                configProvider.getBoolean(ProfilingConfig.PROFILING_DATADOG_PROFILER_ALLOC_ENABLED, false),
+                false);
+        appendConfig(
+                sb,
+                "DDProf Alloc Interval",
+                configProvider.getInteger(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_ALLOC_INTERVAL,
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_ALLOC_INTERVAL_DEFAULT),
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_ALLOC_INTERVAL_DEFAULT,
+                " bytes");
+
+        sb.append("\n=== DDProf Live Heap Profiling ===\n");
+        appendConfig(
+                sb,
+                "DDProf Live Heap Enabled",
+                configProvider.getBoolean(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED,
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED_DEFAULT),
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED_DEFAULT);
+        appendConfig(
+                sb,
+                "DDProf Live Heap Interval",
+                configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_INTERVAL),
+                null);
+        appendConfig(
+                sb,
+                "DDProf Live Heap Capacity",
+                configProvider.getInteger(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_CAPACITY,
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_CAPACITY_DEFAULT),
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_CAPACITY_DEFAULT);
+        appendConfig(
+                sb,
+                "DDProf Live Heap Track Size",
+                configProvider.getBoolean(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE,
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE_DEFAFULT),
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE_DEFAFULT);
+        appendConfig(
+                sb,
+                "DDProf Live Heap Sample Percent",
+                configProvider.getInteger(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT,
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT_DEFAULT),
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT_DEFAULT,
+                "%");
+
+        sb.append("\n=== DDProf Scheduling ===\n");
+        appendConfig(
+                sb,
+                "DDProf Scheduling Event",
+                configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_SCHEDULING_EVENT),
+                null);
+        appendConfig(
+                sb,
+                "DDProf Scheduling Event Interval",
+                configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_SCHEDULING_EVENT_INTERVAL),
+                null);
+
+        sb.append("\n=== Context & Timeline Settings ===\n");
+        appendConfig(
+                sb, "Context Attributes", configProvider.getString(ProfilingConfig.PROFILING_CONTEXT_ATTRIBUTES), null);
+        appendConfig(
+                sb,
+                "Context Attributes Span Name Enabled",
+                configProvider.getString(ProfilingConfig.PROFILING_CONTEXT_ATTRIBUTES_SPAN_NAME_ENABLED),
+                null);
+        appendConfig(
+                sb,
+                "Context Attributes Resource Name Enabled",
+                configProvider.getString(ProfilingConfig.PROFILING_CONTEXT_ATTRIBUTES_RESOURCE_NAME_ENABLED),
+                null);
+        appendConfig(
+                sb,
+                "Timeline Events Enabled",
+                config.isProfilingTimelineEventsEnabled(),
+                ProfilingConfig.PROFILING_TIMELINE_EVENTS_ENABLED_DEFAULT);
+
+        sb.append("\n=== Queueing Time Settings ===\n");
+        appendConfig(
+                sb,
+                "Queueing Time Enabled",
+                configProvider.getBoolean(
+                        ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED,
+                        ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED_DEFAULT),
+                ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED_DEFAULT);
+        appendConfig(
+                sb,
+                "Queueing Time Threshold",
+                configProvider.getLong(
+                        ProfilingConfig.PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS,
+                        ProfilingConfig.PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS_DEFAULT),
+                ProfilingConfig.PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS_DEFAULT,
+                " ms");
+
+        sb.append("\n=== SMAP Settings ===\n");
+        appendConfig(
+                sb,
+                "SMAP Collection Enabled",
+                configProvider.getBoolean(
+                        ProfilingConfig.PROFILING_SMAP_COLLECTION_ENABLED,
+                        ProfilingConfig.PROFILING_SMAP_COLLECTION_ENABLED_DEFAULT),
+                ProfilingConfig.PROFILING_SMAP_COLLECTION_ENABLED_DEFAULT);
+        appendConfig(
+                sb,
+                "SMAP Aggregation Enabled",
+                configProvider.getBoolean(
+                        ProfilingConfig.PROFILING_SMAP_AGGREGATION_ENABLED,
+                        ProfilingConfig.PROFILING_SMAP_AGGREGATION_ENABLED_DEFAULT),
+                ProfilingConfig.PROFILING_SMAP_AGGREGATION_ENABLED_DEFAULT);
+
+        sb.append("\n=== Miscellaneous Settings ===\n");
+        appendConfig(
+                sb,
+                "Stack Depth",
+                configProvider.getInteger(
+                        ProfilingConfig.PROFILING_STACKDEPTH, ProfilingConfig.PROFILING_STACKDEPTH_DEFAULT),
+                ProfilingConfig.PROFILING_STACKDEPTH_DEFAULT);
+        appendConfig(
+                sb,
+                "Auxiliary Profiler",
+                configProvider.getString(
+                        ProfilingConfig.PROFILING_AUXILIARY_TYPE, ProfilingConfig.PROFILING_AUXILIARY_TYPE_DEFAULT),
+                ProfilingConfig.PROFILING_AUXILIARY_TYPE_DEFAULT);
+        appendConfig(sb, "Exclude Agent Threads", config.isProfilingExcludeAgentThreads(), false);
+        appendConfig(
+                sb,
+                "Hotspots Enabled",
+                configProvider.getBoolean(ProfilingConfig.PROFILING_HOTSPOTS_ENABLED, false),
+                false);
+        appendConfig(
+                sb,
+                "Endpoint Collection Enabled",
+                configProvider.getBoolean(
+                        ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED,
+                        ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED_DEFAULT),
+                ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED_DEFAULT);
+        appendConfig(
+                sb,
+                "Temp Directory",
+                configProvider.getString(
+                        ProfilingConfig.PROFILING_TEMP_DIR, ProfilingConfig.PROFILING_TEMP_DIR_DEFAULT),
+                ProfilingConfig.PROFILING_TEMP_DIR_DEFAULT);
+        appendConfig(sb, "Debug Dump Path", configProvider.getString(ProfilingConfig.PROFILING_DEBUG_DUMP_PATH), null);
+
+        sb.append("Profiling Tags: ");
+        Map<String, String> tags = config.getMergedProfilingTags();
+        if (tags != null && !tags.isEmpty()) {
+            sb.append(tags);
+        } else {
+            sb.append("null");
+        }
+        sb.append(" (default: null)\n");
+
+        sb.append("Final Profiling URL: ").append(config.getFinalProfilingUrl()).append(" (default: varies)\n");
+
+        return sb.toString();
+    }
+
+    private void appendConfig(StringBuilder sb, String name, Object value, Object defaultValue) {
+        // The suffix is there for showing time units & the like; ideally we'd derive this
+        // programmatically
+        // from the different config sources.
+        appendConfig(sb, name, value, defaultValue, "");
     }
 
-    sb.append(" (default: ");
-    if (defaultValue != null) {
-      sb.append(defaultValue);
-      if (!suffix.isEmpty() && !"null".equals(defaultValue.toString())) {
-        sb.append(suffix.trim());
-      }
-    } else {
-      sb.append("null");
+    private void appendConfig(StringBuilder sb, String name, Object value, Object defaultValue, String suffix) {
+        sb.append(name).append(": ");
+
+        if (value != null) {
+            sb.append(value);
+            if (!suffix.isEmpty()) {
+                sb.append(" ");
+                sb.append(suffix);
+            }
+        } else {
+            sb.append("null");
+        }
+
+        sb.append(" (default: ");
+        if (defaultValue != null) {
+            sb.append(defaultValue);
+            if (!suffix.isEmpty() && !"null".equals(defaultValue.toString())) {
+                sb.append(suffix.trim());
+            }
+        } else {
+            sb.append("null");
+        }
+        sb.append(")\n");
     }
-    sb.append(")\n");
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerSettingsSupport.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerSettingsSupport.java
index a60e6b8f1dc..0e087d98a26 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerSettingsSupport.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerSettingsSupport.java
@@ -24,268 +24,238 @@
 
 /** Capture the profiler config first and allow emitting the setting events per each recording. */
 public abstract class ProfilerSettingsSupport {
-  private static final Logger logger = LoggerFactory.getLogger(ProfilerSettingsSupport.class);
-  private static final String STACKDEPTH_KEY = "stackdepth=";
-  private static final int DEFAULT_JFR_STACKDEPTH = 64;
+    private static final Logger logger = LoggerFactory.getLogger(ProfilerSettingsSupport.class);
+    private static final String STACKDEPTH_KEY = "stackdepth=";
+    private static final int DEFAULT_JFR_STACKDEPTH = 64;
 
-  protected static final class ProfilerActivationSetting {
-    public enum Ssi {
-      INJECTED_AGENT,
-      NONE
-    }
+    protected static final class ProfilerActivationSetting {
+        public enum Ssi {
+            INJECTED_AGENT,
+            NONE
+        }
 
-    public final ProfilingEnablement enablement;
-    public final Ssi ssiMechanism;
+        public final ProfilingEnablement enablement;
+        public final Ssi ssiMechanism;
 
-    public ProfilerActivationSetting(ProfilingEnablement enablement, Ssi ssiMechanism) {
-      this.enablement = enablement;
-      this.ssiMechanism = ssiMechanism;
-    }
+        public ProfilerActivationSetting(ProfilingEnablement enablement, Ssi ssiMechanism) {
+            this.enablement = enablement;
+            this.ssiMechanism = ssiMechanism;
+        }
 
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      ProfilerActivationSetting that = (ProfilerActivationSetting) o;
-      return enablement == that.enablement && ssiMechanism == that.ssiMechanism;
-    }
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            ProfilerActivationSetting that = (ProfilerActivationSetting) o;
+            return enablement == that.enablement && ssiMechanism == that.ssiMechanism;
+        }
 
-    @Override
-    public int hashCode() {
-      return Objects.hash(enablement, ssiMechanism);
-    }
+        @Override
+        public int hashCode() {
+            return Objects.hash(enablement, ssiMechanism);
+        }
 
-    @Override
-    public String toString() {
-      return "ProfilerActivationSetting{"
-          + "enablement="
-          + enablement
-          + ", ssiMechanism="
-          + ssiMechanism
-          + '}';
+        @Override
+        public String toString() {
+            return "ProfilerActivationSetting{" + "enablement=" + enablement + ", ssiMechanism=" + ssiMechanism + '}';
+        }
     }
-  }
 
-  protected static final String VERSION_KEY = "Java Agent Version";
-  protected static final String JFR_IMPLEMENTATION_KEY = "JFR Implementation";
-  protected static final String UPLOAD_PERIOD_KEY = "Upload Period";
-  protected static final String UPLOAD_TIMEOUT_KEY = "Upload Timeout";
-  protected static final String UPLOAD_COMPRESSION_KEY = "Upload Compression";
-  protected static final String ALLOCATION_PROFILING_KEY = "Allocation Profiling";
-  protected static final String HEAP_PROFILING_KEY = "Heap Profiling";
-  protected static final String FORCE_START_FIRST_KEY = "Force Start-First";
-  protected static final String HOTSPOTS_KEY = "Hotspots";
-  protected static final String ENDPOINTS_KEY = "Endpoints";
-  protected static final String AUXILIARY_PROFILER_KEY = "Auxiliary Profiler";
-  protected static final String PERF_EVENTS_PARANOID_KEY = "perf_events_paranoid";
-  protected static final String NATIVE_STACKS_KEY = "Native Stacks";
-  protected static final String STACK_DEPTH_KEY = "Stack Depth";
-  protected static final String SELINUX_STATUS_KEY = "SELinux Status";
+    protected static final String VERSION_KEY = "Java Agent Version";
+    protected static final String JFR_IMPLEMENTATION_KEY = "JFR Implementation";
+    protected static final String UPLOAD_PERIOD_KEY = "Upload Period";
+    protected static final String UPLOAD_TIMEOUT_KEY = "Upload Timeout";
+    protected static final String UPLOAD_COMPRESSION_KEY = "Upload Compression";
+    protected static final String ALLOCATION_PROFILING_KEY = "Allocation Profiling";
+    protected static final String HEAP_PROFILING_KEY = "Heap Profiling";
+    protected static final String FORCE_START_FIRST_KEY = "Force Start-First";
+    protected static final String HOTSPOTS_KEY = "Hotspots";
+    protected static final String ENDPOINTS_KEY = "Endpoints";
+    protected static final String AUXILIARY_PROFILER_KEY = "Auxiliary Profiler";
+    protected static final String PERF_EVENTS_PARANOID_KEY = "perf_events_paranoid";
+    protected static final String NATIVE_STACKS_KEY = "Native Stacks";
+    protected static final String STACK_DEPTH_KEY = "Stack Depth";
+    protected static final String SELINUX_STATUS_KEY = "SELinux Status";
 
-  protected static final String DDPROF_UNAVAILABLE_REASON_KEY = "DDProf Unavailable Reason";
+    protected static final String DDPROF_UNAVAILABLE_REASON_KEY = "DDProf Unavailable Reason";
 
-  protected static final String SERVICE_INSTRUMENTATION_TYPE = "Service Instrumentation Type";
-  protected static final String SERVICE_INJECTION = "Service Injection";
-  protected static final String PROFILER_ACTIVATION = "Profiler Activation";
-  protected static final String SSI_MECHANISM = "SSI Mechanism";
+    protected static final String SERVICE_INSTRUMENTATION_TYPE = "Service Instrumentation Type";
+    protected static final String SERVICE_INJECTION = "Service Injection";
+    protected static final String PROFILER_ACTIVATION = "Profiler Activation";
+    protected static final String SSI_MECHANISM = "SSI Mechanism";
 
-  protected final int uploadPeriod;
-  protected final int uploadTimeout;
-  protected final String uploadCompression;
-  protected final boolean allocationProfilingEnabled;
-  protected final boolean heapProfilingEnabled;
-  protected final boolean startForceFirst;
-  protected final String templateOverride;
-  protected final int exceptionSampleLimit;
-  protected final int exceptionHistogramTopItems;
-  protected final int exceptionHistogramMaxSize;
-  protected final boolean hotspotsEnabled;
-  protected final boolean endpointsEnabled;
-  protected final String auxiliaryProfiler;
-  protected final String perfEventsParanoid;
-  protected final boolean hasNativeStacks;
-  protected final String seLinuxStatus;
-  protected final String serviceInstrumentationType;
-  protected final String serviceInjection;
+    protected final int uploadPeriod;
+    protected final int uploadTimeout;
+    protected final String uploadCompression;
+    protected final boolean allocationProfilingEnabled;
+    protected final boolean heapProfilingEnabled;
+    protected final boolean startForceFirst;
+    protected final String templateOverride;
+    protected final int exceptionSampleLimit;
+    protected final int exceptionHistogramTopItems;
+    protected final int exceptionHistogramMaxSize;
+    protected final boolean hotspotsEnabled;
+    protected final boolean endpointsEnabled;
+    protected final String auxiliaryProfiler;
+    protected final String perfEventsParanoid;
+    protected final boolean hasNativeStacks;
+    protected final String seLinuxStatus;
+    protected final String serviceInstrumentationType;
+    protected final String serviceInjection;
 
-  protected final String ddprofUnavailableReason;
+    protected final String ddprofUnavailableReason;
 
-  protected final ProfilerActivationSetting profilerActivationSetting;
+    protected final ProfilerActivationSetting profilerActivationSetting;
 
-  protected final int jfrStackDepth;
-  protected final int requestedStackDepth;
-  protected final boolean hasJfrStackDepthApplied;
+    protected final int jfrStackDepth;
+    protected final int requestedStackDepth;
+    protected final boolean hasJfrStackDepthApplied;
 
-  protected ProfilerSettingsSupport(
-      ConfigProvider configProvider,
-      String ddprofUnavailableReason,
-      boolean hasJfrStackDepthApplied) {
-    uploadPeriod =
-        configProvider.getInteger(
-            ProfilingConfig.PROFILING_UPLOAD_PERIOD,
-            ProfilingConfig.PROFILING_UPLOAD_PERIOD_DEFAULT);
-    uploadTimeout =
-        configProvider.getInteger(
-            ProfilingConfig.PROFILING_UPLOAD_TIMEOUT,
-            ProfilingConfig.PROFILING_UPLOAD_TIMEOUT_DEFAULT);
-    // First try the new debug upload compression property, and fall back to the deprecated one
-    uploadCompression =
-        configProvider.getString(
-            ProfilingConfig.PROFILING_DEBUG_UPLOAD_COMPRESSION,
-            ProfilingConfig.PROFILING_DEBUG_UPLOAD_COMPRESSION_DEFAULT,
-            ProfilingConfig.PROFILING_UPLOAD_COMPRESSION);
-    allocationProfilingEnabled =
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_ALLOCATION_ENABLED,
-            ProfilingSupport.isObjectAllocationSampleAvailable());
-    heapProfilingEnabled =
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_HEAP_ENABLED, ProfilingSupport.isLiveHeapProfilingSafe());
-    startForceFirst =
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_START_FORCE_FIRST,
-            ProfilingConfig.PROFILING_START_FORCE_FIRST_DEFAULT);
-    templateOverride = configProvider.getString(ProfilingConfig.PROFILING_TEMPLATE_OVERRIDE_FILE);
-    exceptionSampleLimit =
-        configProvider.getInteger(
-            ProfilingConfig.PROFILING_EXCEPTION_SAMPLE_LIMIT,
-            ProfilingConfig.PROFILING_EXCEPTION_SAMPLE_LIMIT_DEFAULT);
-    exceptionHistogramTopItems =
-        configProvider.getInteger(
-            ProfilingConfig.PROFILING_EXCEPTION_HISTOGRAM_TOP_ITEMS,
-            ProfilingConfig.PROFILING_EXCEPTION_HISTOGRAM_TOP_ITEMS_DEFAULT);
-    exceptionHistogramMaxSize =
-        configProvider.getInteger(
-            ProfilingConfig.PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE,
-            ProfilingConfig.PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE_DEFAULT);
-    hotspotsEnabled = configProvider.getBoolean(ProfilingConfig.PROFILING_HOTSPOTS_ENABLED, false);
-    endpointsEnabled =
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED,
-            ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED_DEFAULT);
-    auxiliaryProfiler =
-        configProvider.getString(
-            ProfilingConfig.PROFILING_AUXILIARY_TYPE, getDefaultAuxiliaryProfiler());
-    perfEventsParanoid = readPerfEventsParanoidSetting();
-    hasNativeStacks =
-        !"no"
-            .equalsIgnoreCase(
-                configProvider.getString(
-                    ProfilingConfig.PROFILING_DATADOG_PROFILER_CSTACK,
-                    configProvider.getString(
-                        "profiling.async.cstack",
-                        ProfilingConfig.PROFILING_DATADOG_PROFILER_CSTACK_DEFAULT)));
-    requestedStackDepth =
-        configProvider.getInteger(
-            ProfilingConfig.PROFILING_STACKDEPTH, ProfilingConfig.PROFILING_STACKDEPTH_DEFAULT);
-    jfrStackDepth = getStackDepth();
+    protected ProfilerSettingsSupport(
+            ConfigProvider configProvider, String ddprofUnavailableReason, boolean hasJfrStackDepthApplied) {
+        uploadPeriod = configProvider.getInteger(
+                ProfilingConfig.PROFILING_UPLOAD_PERIOD, ProfilingConfig.PROFILING_UPLOAD_PERIOD_DEFAULT);
+        uploadTimeout = configProvider.getInteger(
+                ProfilingConfig.PROFILING_UPLOAD_TIMEOUT, ProfilingConfig.PROFILING_UPLOAD_TIMEOUT_DEFAULT);
+        // First try the new debug upload compression property, and fall back to the deprecated one
+        uploadCompression = configProvider.getString(
+                ProfilingConfig.PROFILING_DEBUG_UPLOAD_COMPRESSION,
+                ProfilingConfig.PROFILING_DEBUG_UPLOAD_COMPRESSION_DEFAULT,
+                ProfilingConfig.PROFILING_UPLOAD_COMPRESSION);
+        allocationProfilingEnabled = configProvider.getBoolean(
+                ProfilingConfig.PROFILING_ALLOCATION_ENABLED, ProfilingSupport.isObjectAllocationSampleAvailable());
+        heapProfilingEnabled = configProvider.getBoolean(
+                ProfilingConfig.PROFILING_HEAP_ENABLED, ProfilingSupport.isLiveHeapProfilingSafe());
+        startForceFirst = configProvider.getBoolean(
+                ProfilingConfig.PROFILING_START_FORCE_FIRST, ProfilingConfig.PROFILING_START_FORCE_FIRST_DEFAULT);
+        templateOverride = configProvider.getString(ProfilingConfig.PROFILING_TEMPLATE_OVERRIDE_FILE);
+        exceptionSampleLimit = configProvider.getInteger(
+                ProfilingConfig.PROFILING_EXCEPTION_SAMPLE_LIMIT,
+                ProfilingConfig.PROFILING_EXCEPTION_SAMPLE_LIMIT_DEFAULT);
+        exceptionHistogramTopItems = configProvider.getInteger(
+                ProfilingConfig.PROFILING_EXCEPTION_HISTOGRAM_TOP_ITEMS,
+                ProfilingConfig.PROFILING_EXCEPTION_HISTOGRAM_TOP_ITEMS_DEFAULT);
+        exceptionHistogramMaxSize = configProvider.getInteger(
+                ProfilingConfig.PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE,
+                ProfilingConfig.PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE_DEFAULT);
+        hotspotsEnabled = configProvider.getBoolean(ProfilingConfig.PROFILING_HOTSPOTS_ENABLED, false);
+        endpointsEnabled = configProvider.getBoolean(
+                ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED,
+                ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED_DEFAULT);
+        auxiliaryProfiler =
+                configProvider.getString(ProfilingConfig.PROFILING_AUXILIARY_TYPE, getDefaultAuxiliaryProfiler());
+        perfEventsParanoid = readPerfEventsParanoidSetting();
+        hasNativeStacks = !"no"
+                .equalsIgnoreCase(configProvider.getString(
+                        ProfilingConfig.PROFILING_DATADOG_PROFILER_CSTACK,
+                        configProvider.getString(
+                                "profiling.async.cstack", ProfilingConfig.PROFILING_DATADOG_PROFILER_CSTACK_DEFAULT)));
+        requestedStackDepth = configProvider.getInteger(
+                ProfilingConfig.PROFILING_STACKDEPTH, ProfilingConfig.PROFILING_STACKDEPTH_DEFAULT);
+        jfrStackDepth = getStackDepth();
 
-    seLinuxStatus = getSELinuxStatus();
-    this.ddprofUnavailableReason = ddprofUnavailableReason;
-    this.hasJfrStackDepthApplied = hasJfrStackDepthApplied;
+        seLinuxStatus = getSELinuxStatus();
+        this.ddprofUnavailableReason = ddprofUnavailableReason;
+        this.hasJfrStackDepthApplied = hasJfrStackDepthApplied;
 
-    serviceInjection = getServiceInjection(configProvider);
-    serviceInstrumentationType =
-        // usually set via DD_INSTRUMENTATION_INSTALL_TYPE env var
-        configProvider.getString("instrumentation.install.type");
-    this.profilerActivationSetting = getProfilerActivation(configProvider);
-  }
+        serviceInjection = getServiceInjection(configProvider);
+        serviceInstrumentationType =
+                // usually set via DD_INSTRUMENTATION_INSTALL_TYPE env var
+                configProvider.getString("instrumentation.install.type");
+        this.profilerActivationSetting = getProfilerActivation(configProvider);
+    }
 
-  private static int getStackDepth() {
-    String value =
-        JavaVirtualMachine.getVmOptions().stream()
-            .filter(o -> o.startsWith("-XX:FlightRecorderOptions"))
-            .findFirst()
-            .orElse(null);
-    if (value != null) {
-      int start = value.indexOf(STACKDEPTH_KEY);
-      if (start != -1) {
-        start += STACKDEPTH_KEY.length();
-        int end = value.indexOf(',', start);
-        if (end == -1) {
-          end = value.length();
-        }
-        try {
-          return Integer.parseInt(value.substring(start, end));
-        } catch (NumberFormatException e) {
-          logger.debug(SEND_TELEMETRY, "Failed to parse stack depth from JFR options");
+    private static int getStackDepth() {
+        String value = JavaVirtualMachine.getVmOptions().stream()
+                .filter(o -> o.startsWith("-XX:FlightRecorderOptions"))
+                .findFirst()
+                .orElse(null);
+        if (value != null) {
+            int start = value.indexOf(STACKDEPTH_KEY);
+            if (start != -1) {
+                start += STACKDEPTH_KEY.length();
+                int end = value.indexOf(',', start);
+                if (end == -1) {
+                    end = value.length();
+                }
+                try {
+                    return Integer.parseInt(value.substring(start, end));
+                } catch (NumberFormatException e) {
+                    logger.debug(SEND_TELEMETRY, "Failed to parse stack depth from JFR options");
+                }
+            }
         }
-      }
+        return DEFAULT_JFR_STACKDEPTH; // default stack depth if not set in JFR options
     }
-    return DEFAULT_JFR_STACKDEPTH; // default stack depth if not set in JFR options
-  }
 
-  private static String getServiceInjection(ConfigProvider configProvider) {
-    // usually set via DD_INJECTION_ENABLED env var
-    return configProvider.getString("injection.enabled");
-  }
+    private static String getServiceInjection(ConfigProvider configProvider) {
+        // usually set via DD_INJECTION_ENABLED env var
+        return configProvider.getString("injection.enabled");
+    }
 
-  static ProfilerActivationSetting getProfilerActivation(ConfigProvider configProvider) {
-    return new ProfilerActivationSetting(
-        ProfilingEnablement.from(configProvider),
-        getServiceInjection(configProvider) != null
-            ? ProfilerActivationSetting.Ssi.INJECTED_AGENT
-            : ProfilerActivationSetting.Ssi.NONE);
-  }
+    static ProfilerActivationSetting getProfilerActivation(ConfigProvider configProvider) {
+        return new ProfilerActivationSetting(
+                ProfilingEnablement.from(configProvider),
+                getServiceInjection(configProvider) != null
+                        ? ProfilerActivationSetting.Ssi.INJECTED_AGENT
+                        : ProfilerActivationSetting.Ssi.NONE);
+    }
 
-  private String getSELinuxStatus() {
-    String value = "Not present";
-    if (OperatingSystem.isLinux()) {
-      try (final TraceScope scope = AgentTracer.get().muteTracing()) {
-        ProcessBuilder pb = new ProcessBuilder("getenforce");
-        Process process = pb.start();
-        // wait for at most 500ms for the process to finish
-        // if it takes longer, assume SELinux is not present
-        // if the exit value is not 0, assume SELinux is not present
-        if (process.waitFor(500, TimeUnit.MILLISECONDS) && process.exitValue() == 0) {
-          // we are expecting just a single line output from `getenforce`, so we can avoid draining
-          // stdout/stderr asynchronously
-          try (BufferedReader reader =
-              new BufferedReader(new InputStreamReader(process.getInputStream()))) {
-            String line = reader.readLine();
+    private String getSELinuxStatus() {
+        String value = "Not present";
+        if (OperatingSystem.isLinux()) {
+            try (final TraceScope scope = AgentTracer.get().muteTracing()) {
+                ProcessBuilder pb = new ProcessBuilder("getenforce");
+                Process process = pb.start();
+                // wait for at most 500ms for the process to finish
+                // if it takes longer, assume SELinux is not present
+                // if the exit value is not 0, assume SELinux is not present
+                if (process.waitFor(500, TimeUnit.MILLISECONDS) && process.exitValue() == 0) {
+                    // we are expecting just a single line output from `getenforce`, so we can avoid draining
+                    // stdout/stderr asynchronously
+                    try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+                        String line = reader.readLine();
 
-            if (line != null) {
-              value = line.trim();
+                        if (line != null) {
+                            value = line.trim();
+                        }
+                    }
+                }
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            } catch (IOException ignored) {
+                // nothing to do here, can not execute `getenforce`, let's assume SELinux is not present
             }
-          }
         }
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      } catch (IOException ignored) {
-        // nothing to do here, can not execute `getenforce`, let's assume SELinux is not present
-      }
+        return value;
     }
-    return value;
-  }
 
-  private static String getDefaultAuxiliaryProfiler() {
-    return Config.get().isDatadogProfilerEnabled()
-        ? "ddprof"
-        : ProfilingConfig.PROFILING_AUXILIARY_TYPE_DEFAULT;
-  }
+    private static String getDefaultAuxiliaryProfiler() {
+        return Config.get().isDatadogProfilerEnabled() ? "ddprof" : ProfilingConfig.PROFILING_AUXILIARY_TYPE_DEFAULT;
+    }
 
-  /** To be defined in controller specific way. Eg. one could emit JFR events. */
-  public abstract void publish();
+    /** To be defined in controller specific way. Eg. one could emit JFR events. */
+    public abstract void publish();
 
-  protected abstract String profilerKind();
+    protected abstract String profilerKind();
 
-  private static String readPerfEventsParanoidSetting() {
-    String value = "unknown";
-    if (OperatingSystem.isLinux()) {
-      Path perfEventsParanoid = Paths.get("/proc/sys/kernel/perf_event_paranoid");
-      try {
-        if (Files.exists(perfEventsParanoid)) {
-          value = new String(Files.readAllBytes(perfEventsParanoid), StandardCharsets.UTF_8).trim();
+    private static String readPerfEventsParanoidSetting() {
+        String value = "unknown";
+        if (OperatingSystem.isLinux()) {
+            Path perfEventsParanoid = Paths.get("/proc/sys/kernel/perf_event_paranoid");
+            try {
+                if (Files.exists(perfEventsParanoid)) {
+                    value = new String(Files.readAllBytes(perfEventsParanoid), StandardCharsets.UTF_8).trim();
+                }
+            } catch (Exception ignore) {
+            }
         }
-      } catch (Exception ignore) {
-      }
+        return value;
     }
-    return value;
-  }
 
-  @Override
-  public String toString() {
-    // spotless:off
+    @Override
+    public String toString() {
+        // spotless:off
     return "{"
         + "kind='" + profilerKind() + '\''
         + ", uploadPeriod=" + uploadPeriod
@@ -313,5 +283,5 @@ public String toString() {
         + ", hasJfrStackDepthApplied=" + hasJfrStackDepthApplied
         + '}';
     // spotless:on
-  }
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilingSupport.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilingSupport.java
index fc1a480795f..34fdba9f7a9 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilingSupport.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilingSupport.java
@@ -8,75 +8,72 @@
 
 public class ProfilingSupport {
 
-  /**
-   * Checks whether jmethodID handling is safe on the current JVM version. Unsafe versions can cause
-   * crashes due to <a href="https://bugs.openjdk.org/browse/JDK-8313816">JDK-8313816</a>.
-   */
-  public static boolean isJmethodIDSafe() {
-    if (isJavaVersionAtLeast(22)) {
-      return true;
+    /**
+     * Checks whether jmethodID handling is safe on the current JVM version. Unsafe versions can cause
+     * crashes due to <a href="https://bugs.openjdk.org/browse/JDK-8313816">JDK-8313816</a>.
+     */
+    public static boolean isJmethodIDSafe() {
+        if (isJavaVersionAtLeast(22)) {
+            return true;
+        }
+        switch (JavaVirtualMachine.getLangVersion()) {
+            case "8":
+                return true;
+            case "11":
+                return isJavaVersionAtLeast(11, 0, 23);
+            case "17":
+                return isJavaVersionAtLeast(17, 0, 11);
+            case "21":
+                return isJavaVersionAtLeast(21, 0, 3);
+            default:
+                return false;
+        }
     }
-    switch (JavaVirtualMachine.getLangVersion()) {
-      case "8":
-        return true;
-      case "11":
-        return isJavaVersionAtLeast(11, 0, 23);
-      case "17":
-        return isJavaVersionAtLeast(17, 0, 11);
-      case "21":
-        return isJavaVersionAtLeast(21, 0, 3);
-      default:
-        return false;
+
+    /**
+     * Checks whether any live heap profiling mechanism is safe to enable on the current platform.
+     * Returns true if at least one of ddprof native (jmethodID safe) or JFR OldObjectSample is
+     * available.
+     */
+    public static boolean isLiveHeapProfilingSafe() {
+        return isJmethodIDSafe() || isOldObjectSampleAvailable();
     }
-  }
 
-  /**
-   * Checks whether any live heap profiling mechanism is safe to enable on the current platform.
-   * Returns true if at least one of ddprof native (jmethodID safe) or JFR OldObjectSample is
-   * available.
-   */
-  public static boolean isLiveHeapProfilingSafe() {
-    return isJmethodIDSafe() || isOldObjectSampleAvailable();
-  }
+    public static boolean isOldObjectSampleAvailable() {
+        if (isOracleJDK8()) {
+            return false;
+        }
 
-  public static boolean isOldObjectSampleAvailable() {
-    if (isOracleJDK8()) {
-      return false;
+        return (isJavaVersion(11) && isJavaVersionAtLeast(11, 0, 12))
+                || (isJavaVersion(15) && isJavaVersionAtLeast(15, 0, 4))
+                || (isJavaVersion(16) && isJavaVersionAtLeast(16, 0, 2))
+                || (isJavaVersion(17) && isJavaVersionAtLeast(17, 0, 3))
+                || isJavaVersionAtLeast(18);
     }
 
-    return (isJavaVersion(11) && isJavaVersionAtLeast(11, 0, 12))
-        || (isJavaVersion(15) && isJavaVersionAtLeast(15, 0, 4))
-        || (isJavaVersion(16) && isJavaVersionAtLeast(16, 0, 2))
-        || (isJavaVersion(17) && isJavaVersionAtLeast(17, 0, 3))
-        || isJavaVersionAtLeast(18);
-  }
+    public static boolean isObjectAllocationSampleAvailable() {
+        if (isOracleJDK8()) {
+            return false;
+        }
 
-  public static boolean isObjectAllocationSampleAvailable() {
-    if (isOracleJDK8()) {
-      return false;
+        return isJavaVersionAtLeast(16);
     }
 
-    return isJavaVersionAtLeast(16);
-  }
+    public static boolean isObjectCountParallelized() {
+        // parallelized jdk.ObjectCount implemented in JDK21 and backported to JDK17
+        // https://bugs.openjdk.org/browse/JDK-8307348
+        return (isJavaVersion(17) && isJavaVersionAtLeast(17, 0, 9)) || isJavaVersionAtLeast(21);
+    }
 
-  public static boolean isObjectCountParallelized() {
-    // parallelized jdk.ObjectCount implemented in JDK21 and backported to JDK17
-    // https://bugs.openjdk.org/browse/JDK-8307348
-    return (isJavaVersion(17) && isJavaVersionAtLeast(17, 0, 9)) || isJavaVersionAtLeast(21);
-  }
+    public static boolean isNativeMethodSampleAvailable() {
+        if (isOracleJDK8()) {
+            return false;
+        }
 
-  public static boolean isNativeMethodSampleAvailable() {
-    if (isOracleJDK8()) {
-      return false;
+        return (isJavaVersion(8) && isJavaVersionAtLeast(8, 0, 302)) || isJavaVersionAtLeast(11);
     }
 
-    return (isJavaVersion(8) && isJavaVersionAtLeast(8, 0, 302)) || isJavaVersionAtLeast(11);
-  }
-
-  public static boolean isFileWriteDurationCorrect() {
-    return isJavaVersion(8)
-        || isJavaVersion(11)
-        || isJavaVersionAtLeast(17, 0, 6)
-        || isJavaVersionAtLeast(19);
-  }
+    public static boolean isFileWriteDurationCorrect() {
+        return isJavaVersion(8) || isJavaVersion(11) || isJavaVersionAtLeast(17, 0, 6) || isJavaVersionAtLeast(19);
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilingSystem.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilingSystem.java
index bfb3df0f333..20e2162f217 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilingSystem.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilingSystem.java
@@ -39,264 +39,260 @@
 
 /** Sets up the profiling strategy and schedules the profiling recordings. */
 public final class ProfilingSystem {
-  private static final Logger log = LoggerFactory.getLogger(ProfilingSystem.class);
-  static final String RECORDING_NAME = "dd-profiling";
+    private static final Logger log = LoggerFactory.getLogger(ProfilingSystem.class);
+    static final String RECORDING_NAME = "dd-profiling";
 
-  private static final long TERMINATION_TIMEOUT = 10;
+    private static final long TERMINATION_TIMEOUT = 10;
 
-  private final AgentTaskScheduler scheduler;
-  private final ConfigProvider configProvider;
-  private final Controller controller;
-  private final ControllerContext.Snapshot context;
-  // For now only support one callback. Multiplex as needed.
-  private final RecordingDataListener dataListener;
+    private final AgentTaskScheduler scheduler;
+    private final ConfigProvider configProvider;
+    private final Controller controller;
+    private final ControllerContext.Snapshot context;
+    // For now only support one callback. Multiplex as needed.
+    private final RecordingDataListener dataListener;
 
-  private final Duration startupDelay;
-  private final Duration uploadPeriod;
-  private final boolean isStartingFirst;
+    private final Duration startupDelay;
+    private final Duration uploadPeriod;
+    private final boolean isStartingFirst;
 
-  private OngoingRecording recording;
-  private SnapshotRecording snapshotRecording;
-  private volatile boolean started = false;
+    private OngoingRecording recording;
+    private SnapshotRecording snapshotRecording;
+    private volatile boolean started = false;
 
-  /**
-   * Constructor.
-   *
-   * @param controller implementation specific controller of profiling machinery
-   * @param dataListener the listener for data being produced
-   * @param startupDelay delay before starting jfr
-   * @param startupDelayRandomRange randomization range for startup delay
-   * @param uploadPeriod how often to upload data
-   * @param isStartingFirst starting profiling before other tools
-   * @throws ConfigurationException if the configuration information was bad.
-   */
-  public ProfilingSystem(
-      final ConfigProvider configProvider,
-      final Controller controller,
-      final ControllerContext.Snapshot context,
-      final RecordingDataListener dataListener,
-      final Duration startupDelay,
-      final Duration startupDelayRandomRange,
-      final Duration uploadPeriod,
-      final boolean isStartingFirst)
-      throws ConfigurationException {
-    this(
-        configProvider,
-        controller,
-        context,
-        dataListener,
-        startupDelay,
-        startupDelayRandomRange,
-        uploadPeriod,
-        isStartingFirst,
-        new AgentTaskScheduler(PROFILER_RECORDING_SCHEDULER),
-        ThreadLocalRandom.current());
-  }
-
-  ProfilingSystem(
-      final ConfigProvider configProvider,
-      final Controller controller,
-      final ControllerContext.Snapshot context,
-      final RecordingDataListener dataListener,
-      final Duration baseStartupDelay,
-      final Duration startupDelayRandomRange,
-      final Duration uploadPeriod,
-      final boolean isStartingFirst,
-      final AgentTaskScheduler scheduler,
-      final ThreadLocalRandom threadLocalRandom)
-      throws ConfigurationException {
-    this.configProvider = configProvider;
-    this.controller = controller;
-    this.context = context;
-    this.dataListener = dataListener;
-    this.uploadPeriod = uploadPeriod;
-    this.isStartingFirst = isStartingFirst;
-    this.scheduler = scheduler;
-
-    if (baseStartupDelay.isNegative()) {
-      throw new ConfigurationException("Startup delay must not be negative.");
+    /**
+     * Constructor.
+     *
+     * @param controller implementation specific controller of profiling machinery
+     * @param dataListener the listener for data being produced
+     * @param startupDelay delay before starting jfr
+     * @param startupDelayRandomRange randomization range for startup delay
+     * @param uploadPeriod how often to upload data
+     * @param isStartingFirst starting profiling before other tools
+     * @throws ConfigurationException if the configuration information was bad.
+     */
+    public ProfilingSystem(
+            final ConfigProvider configProvider,
+            final Controller controller,
+            final ControllerContext.Snapshot context,
+            final RecordingDataListener dataListener,
+            final Duration startupDelay,
+            final Duration startupDelayRandomRange,
+            final Duration uploadPeriod,
+            final boolean isStartingFirst)
+            throws ConfigurationException {
+        this(
+                configProvider,
+                controller,
+                context,
+                dataListener,
+                startupDelay,
+                startupDelayRandomRange,
+                uploadPeriod,
+                isStartingFirst,
+                new AgentTaskScheduler(PROFILER_RECORDING_SCHEDULER),
+                ThreadLocalRandom.current());
     }
 
-    if (startupDelayRandomRange.isNegative()) {
-      throw new ConfigurationException("Startup delay random range must not be negative.");
-    }
+    ProfilingSystem(
+            final ConfigProvider configProvider,
+            final Controller controller,
+            final ControllerContext.Snapshot context,
+            final RecordingDataListener dataListener,
+            final Duration baseStartupDelay,
+            final Duration startupDelayRandomRange,
+            final Duration uploadPeriod,
+            final boolean isStartingFirst,
+            final AgentTaskScheduler scheduler,
+            final ThreadLocalRandom threadLocalRandom)
+            throws ConfigurationException {
+        this.configProvider = configProvider;
+        this.controller = controller;
+        this.context = context;
+        this.dataListener = dataListener;
+        this.uploadPeriod = uploadPeriod;
+        this.isStartingFirst = isStartingFirst;
+        this.scheduler = scheduler;
 
-    if (uploadPeriod.isNegative() || uploadPeriod.isZero()) {
-      throw new ConfigurationException("Upload period must be positive.");
-    }
+        if (baseStartupDelay.isNegative()) {
+            throw new ConfigurationException("Startup delay must not be negative.");
+        }
 
-    // Note: it is important to not keep reference to the threadLocalRandom beyond the
-    // constructor
-    // since it is expected to be thread local.
-    startupDelay = randomizeDuration(threadLocalRandom, baseStartupDelay, startupDelayRandomRange);
-  }
+        if (startupDelayRandomRange.isNegative()) {
+            throw new ConfigurationException("Startup delay random range must not be negative.");
+        }
 
-  public final void start() {
-    log.debug(
-        "Starting profiling system: startupDelay={}ms, uploadPeriod={}ms, isStartingFirst={}",
-        startupDelay.toMillis(),
-        uploadPeriod.toMillis(),
-        isStartingFirst);
+        if (uploadPeriod.isNegative() || uploadPeriod.isZero()) {
+            throw new ConfigurationException("Upload period must be positive.");
+        }
 
-    if (isStartingFirst) {
-      startProfilingRecording();
-    } else {
-      // Delay JFR initialization. This code is run from 'premain' and there is a known bug in JVM
-      // which makes it crash if JFR is run before 'main' starts.
-      // See https://bugs.openjdk.java.net/browse/JDK-8227011 and
-      // https://bugs.openjdk.java.net/browse/JDK-8233197.
-      scheduler.schedule(
-          ProfilingSystem::startProfilingRecording,
-          this,
-          startupDelay.toMillis(),
-          TimeUnit.MILLISECONDS);
+        // Note: it is important to not keep reference to the threadLocalRandom beyond the
+        // constructor
+        // since it is expected to be thread local.
+        startupDelay = randomizeDuration(threadLocalRandom, baseStartupDelay, startupDelayRandomRange);
     }
-  }
 
-  private void startProfilingRecording() {
-    try {
-      final Instant now = Instant.now();
-      recording = controller.createRecording(RECORDING_NAME, context);
-      scheduler.scheduleAtFixedRate(
-          SnapshotRecording::snapshot,
-          snapshotRecording = createSnapshotRecording(now),
-          uploadPeriod.toMillis(),
-          uploadPeriod.toMillis(),
-          TimeUnit.MILLISECONDS);
-      started = true;
-    } catch (UnsupportedEnvironmentException unsupported) {
-      ProfilerFlareLogger.getInstance()
-          .log(
-              "Datadog Profiling was enabled on an unsupported JVM, will not profile application. "
-                  + "(OS: {}, JVM: lang={}, runtime={}, vendor={}) See {} for more details about supported JVMs.",
-              isLinux() ? "Linux" : isWindows() ? "Windows" : isMacOs() ? "MacOS" : "Other",
-              JavaVirtualMachine.getLangVersion(),
-              JavaVirtualMachine.getRuntimeVersion(),
-              JavaVirtualMachine.getRuntimeVendor(),
-              "https://docs.datadoghq.com/profiler/enabling/java/?tab=commandarguments#requirements",
-              unsupported);
-    } catch (Throwable t) {
-      if (t instanceof RuntimeException) {
-        // Possibly a wrapped exception related to Oracle JDK 8 JFR MX beans
-        Throwable inspecting = t.getCause();
-        while (inspecting != null) {
-          String msg = inspecting.getMessage();
-          if (msg != null && msg.contains("com.oracle.jrockit:type=FlightRecorder")) {
-            // Yes, the commercial JFR is not enabled
-            String logMsg =
-                "You're running Oracle JDK 8. Datadog Continuous Profiler for Java depends on Java Flight Recorder, which requires a paid license in Oracle JDK 8. If you have one, please add the following `java` command line args: ‘-XX:+UnlockCommercialFeatures -XX:+FlightRecorder’. Alternatively, you can use a different Java 8 distribution like OpenJDK, where Java Flight Recorder is free.";
-            ProfilerFlareLogger.getInstance().log(logMsg, t);
-            log.warn(logMsg);
-            // Do not log the underlying exception
-            t = null;
-            break;
-          }
-          inspecting = inspecting.getCause();
-        }
-      }
-      if (t != null) {
-        if (t instanceof IllegalStateException && "Shutdown in progress".equals(t.getMessage())) {
-          ProfilerFlareLogger.getInstance().log("Shutdown in progress, cannot start profiling");
-        } else {
-          ProfilerFlareLogger.getInstance().log("Failed to start profiling", t);
+    public final void start() {
+        log.debug(
+                "Starting profiling system: startupDelay={}ms, uploadPeriod={}ms, isStartingFirst={}",
+                startupDelay.toMillis(),
+                uploadPeriod.toMillis(),
+                isStartingFirst);
 
-          throw t instanceof RuntimeException ? (RuntimeException) t : new RuntimeException(t);
+        if (isStartingFirst) {
+            startProfilingRecording();
+        } else {
+            // Delay JFR initialization. This code is run from 'premain' and there is a known bug in JVM
+            // which makes it crash if JFR is run before 'main' starts.
+            // See https://bugs.openjdk.java.net/browse/JDK-8227011 and
+            // https://bugs.openjdk.java.net/browse/JDK-8233197.
+            scheduler.schedule(
+                    ProfilingSystem::startProfilingRecording, this, startupDelay.toMillis(), TimeUnit.MILLISECONDS);
         }
-      }
     }
-  }
 
-  // Used for mocking
-  SnapshotRecording createSnapshotRecording(Instant now) {
-    return new SnapshotRecording(now);
-  }
-
-  void shutdown() {
-    shutdown(false);
-  }
-
-  /** Shuts down the profiling system. */
-  public final void shutdown(boolean snapshot) {
-    scheduler.shutdown(TERMINATION_TIMEOUT, TimeUnit.SECONDS);
+    private void startProfilingRecording() {
+        try {
+            final Instant now = Instant.now();
+            recording = controller.createRecording(RECORDING_NAME, context);
+            scheduler.scheduleAtFixedRate(
+                    SnapshotRecording::snapshot,
+                    snapshotRecording = createSnapshotRecording(now),
+                    uploadPeriod.toMillis(),
+                    uploadPeriod.toMillis(),
+                    TimeUnit.MILLISECONDS);
+            started = true;
+        } catch (UnsupportedEnvironmentException unsupported) {
+            ProfilerFlareLogger.getInstance()
+                    .log(
+                            "Datadog Profiling was enabled on an unsupported JVM, will not profile application. "
+                                    + "(OS: {}, JVM: lang={}, runtime={}, vendor={}) See {} for more details about supported JVMs.",
+                            isLinux() ? "Linux" : isWindows() ? "Windows" : isMacOs() ? "MacOS" : "Other",
+                            JavaVirtualMachine.getLangVersion(),
+                            JavaVirtualMachine.getRuntimeVersion(),
+                            JavaVirtualMachine.getRuntimeVendor(),
+                            "https://docs.datadoghq.com/profiler/enabling/java/?tab=commandarguments#requirements",
+                            unsupported);
+        } catch (Throwable t) {
+            if (t instanceof RuntimeException) {
+                // Possibly a wrapped exception related to Oracle JDK 8 JFR MX beans
+                Throwable inspecting = t.getCause();
+                while (inspecting != null) {
+                    String msg = inspecting.getMessage();
+                    if (msg != null && msg.contains("com.oracle.jrockit:type=FlightRecorder")) {
+                        // Yes, the commercial JFR is not enabled
+                        String logMsg =
+                                "You're running Oracle JDK 8. Datadog Continuous Profiler for Java depends on Java Flight Recorder, which requires a paid license in Oracle JDK 8. If you have one, please add the following `java` command line args: ‘-XX:+UnlockCommercialFeatures -XX:+FlightRecorder’. Alternatively, you can use a different Java 8 distribution like OpenJDK, where Java Flight Recorder is free.";
+                        ProfilerFlareLogger.getInstance().log(logMsg, t);
+                        log.warn(logMsg);
+                        // Do not log the underlying exception
+                        t = null;
+                        break;
+                    }
+                    inspecting = inspecting.getCause();
+                }
+            }
+            if (t != null) {
+                if (t instanceof IllegalStateException && "Shutdown in progress".equals(t.getMessage())) {
+                    ProfilerFlareLogger.getInstance().log("Shutdown in progress, cannot start profiling");
+                } else {
+                    ProfilerFlareLogger.getInstance().log("Failed to start profiling", t);
 
-    if (snapshotRecording != null) {
-      if (snapshot) {
-        snapshotRecording.snapshot(true);
-      }
-      snapshotRecording = null;
+                    throw t instanceof RuntimeException ? (RuntimeException) t : new RuntimeException(t);
+                }
+            }
+        }
     }
 
-    // Here we assume that all other threads have been shutdown and we can close running
-    // recording
-    if (recording != null) {
-      recording.close();
+    // Used for mocking
+    SnapshotRecording createSnapshotRecording(Instant now) {
+        return new SnapshotRecording(now);
     }
 
-    started = false;
-  }
+    void shutdown() {
+        shutdown(false);
+    }
 
-  public boolean isStarted() {
-    return started;
-  }
+    /** Shuts down the profiling system. */
+    public final void shutdown(boolean snapshot) {
+        scheduler.shutdown(TERMINATION_TIMEOUT, TimeUnit.SECONDS);
 
-  @VisibleForTesting
-  final Duration getStartupDelay() {
-    return startupDelay;
-  }
+        if (snapshotRecording != null) {
+            if (snapshot) {
+                snapshotRecording.snapshot(true);
+            }
+            snapshotRecording = null;
+        }
 
-  private static Duration randomizeDuration(
-      final ThreadLocalRandom random, final Duration duration, final Duration range) {
-    return duration.plus(Duration.ofMillis(random.nextLong(range.toMillis())));
-  }
+        // Here we assume that all other threads have been shutdown and we can close running
+        // recording
+        if (recording != null) {
+            recording.close();
+        }
 
-  final class SnapshotRecording {
-    private final Duration ONE_NANO = Duration.ofNanos(1);
+        started = false;
+    }
 
-    private Instant lastSnapshot;
+    public boolean isStarted() {
+        return started;
+    }
 
-    SnapshotRecording(final Instant startTime) {
-      lastSnapshot = startTime;
+    @VisibleForTesting
+    final Duration getStartupDelay() {
+        return startupDelay;
     }
 
-    public void snapshot() {
-      snapshot(false);
+    private static Duration randomizeDuration(
+            final ThreadLocalRandom random, final Duration duration, final Duration range) {
+        return duration.plus(Duration.ofMillis(random.nextLong(range.toMillis())));
     }
 
-    public void snapshot(boolean onShutdown) {
-      final RecordingType recordingType = RecordingType.CONTINUOUS;
-      try {
-        log.debug("Creating profiler snapshot");
-        final RecordingData recordingData =
-            recording.snapshot(
-                lastSnapshot,
-                onShutdown ? ProfilingSnapshot.Kind.ON_SHUTDOWN : ProfilingSnapshot.Kind.PERIODIC);
-        log.debug("Snapshot created: {}", recordingData);
-        if (recordingData != null) {
-          // To make sure that we don't get data twice, we say that the next start should be
-          // the last recording end time plus one nano second. The reason for this is that when
-          // JFR is filtering the stream it will only discard earlier chunks that have an end
-          // time that is before (not before or equal to) the requested start time of the filter.
-          lastSnapshot = recordingData.getEnd().plus(ONE_NANO);
-          dataListener.onNewData(recordingType, recordingData, onShutdown);
-        } else {
-          lastSnapshot = Instant.now();
+    final class SnapshotRecording {
+        private final Duration ONE_NANO = Duration.ofNanos(1);
+
+        private Instant lastSnapshot;
+
+        SnapshotRecording(final Instant startTime) {
+            lastSnapshot = startTime;
         }
-      } catch (final Exception e) {
-        log.error(SEND_TELEMETRY, "Exception in profiling thread, continuing", e);
-      } catch (final Throwable t) {
-        /*
-        Try to continue even after fatal exception. It seems to be useful to attempt to store profile when this happens.
-        For example JVM maybe out of heap and throwing OutOfMemoryError - we probably still would want to continue and
-        try to save profile later.
-        Another reason is that it may be bad to stop profiling if the rest of the app is continuing.
-         */
-        try {
-          log.error(SEND_TELEMETRY, "Fatal exception in profiling thread, trying to continue", t);
-        } catch (final Throwable t2) {
-          // This should almost never happen and there is not much we can do here in cases like
-          // OutOfMemoryError, so we will just ignore this.
+
+        public void snapshot() {
+            snapshot(false);
+        }
+
+        public void snapshot(boolean onShutdown) {
+            final RecordingType recordingType = RecordingType.CONTINUOUS;
+            try {
+                log.debug("Creating profiler snapshot");
+                final RecordingData recordingData = recording.snapshot(
+                        lastSnapshot,
+                        onShutdown ? ProfilingSnapshot.Kind.ON_SHUTDOWN : ProfilingSnapshot.Kind.PERIODIC);
+                log.debug("Snapshot created: {}", recordingData);
+                if (recordingData != null) {
+                    // To make sure that we don't get data twice, we say that the next start should be
+                    // the last recording end time plus one nano second. The reason for this is that when
+                    // JFR is filtering the stream it will only discard earlier chunks that have an end
+                    // time that is before (not before or equal to) the requested start time of the filter.
+                    lastSnapshot = recordingData.getEnd().plus(ONE_NANO);
+                    dataListener.onNewData(recordingType, recordingData, onShutdown);
+                } else {
+                    lastSnapshot = Instant.now();
+                }
+            } catch (final Exception e) {
+                log.error(SEND_TELEMETRY, "Exception in profiling thread, continuing", e);
+            } catch (final Throwable t) {
+                /*
+                Try to continue even after fatal exception. It seems to be useful to attempt to store profile when this happens.
+                For example JVM maybe out of heap and throwing OutOfMemoryError - we probably still would want to continue and
+                try to save profile later.
+                Another reason is that it may be bad to stop profiling if the rest of the app is continuing.
+                 */
+                try {
+                    log.error(SEND_TELEMETRY, "Fatal exception in profiling thread, trying to continue", t);
+                } catch (final Throwable t2) {
+                    // This should almost never happen and there is not much we can do here in cases like
+                    // OutOfMemoryError, so we will just ignore this.
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/UnsupportedEnvironmentException.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/UnsupportedEnvironmentException.java
index 8390c6b9c48..fdb08782bba 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/UnsupportedEnvironmentException.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/UnsupportedEnvironmentException.java
@@ -17,13 +17,13 @@
 
 /** Exception thrown when the environment does not support a {@link Controller}. */
 public final class UnsupportedEnvironmentException extends Exception {
-  private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-  public UnsupportedEnvironmentException(final String message) {
-    super(message);
-  }
+    public UnsupportedEnvironmentException(final String message) {
+        super(message);
+    }
 
-  public UnsupportedEnvironmentException(final String message, final Throwable cause) {
-    super(message, cause);
-  }
+    public UnsupportedEnvironmentException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ConfigurationExceptionTest.java b/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ConfigurationExceptionTest.java
index a15792313d2..b1ff013095c 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ConfigurationExceptionTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ConfigurationExceptionTest.java
@@ -7,17 +7,17 @@
 
 public class ConfigurationExceptionTest {
 
-  private static final String MESSAGE = "message";
+    private static final String MESSAGE = "message";
 
-  @Test
-  public void testMessageConstructor() {
-    assertEquals(MESSAGE, new ConfigurationException(MESSAGE).getMessage());
-  }
+    @Test
+    public void testMessageConstructor() {
+        assertEquals(MESSAGE, new ConfigurationException(MESSAGE).getMessage());
+    }
 
-  @Test
-  public void testCauseConstructor() {
-    final Throwable cause = new RuntimeException();
-    final Exception exception = new ConfigurationException(cause);
-    assertSame(cause, exception.getCause());
-  }
+    @Test
+    public void testCauseConstructor() {
+        final Throwable cause = new RuntimeException();
+        final Exception exception = new ConfigurationException(cause);
+        assertSame(cause, exception.getCause());
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ProfilerSettingsSupportTest.java b/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ProfilerSettingsSupportTest.java
index 9cf5dcc44a4..89917efd711 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ProfilerSettingsSupportTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ProfilerSettingsSupportTest.java
@@ -14,49 +14,43 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 public class ProfilerSettingsSupportTest {
-  @ParameterizedTest
-  @MethodSource("activationSettings")
-  void testActivation(
-      String enabledSetting, String injectSetting, ProfilerActivationSetting expected) {
-    Properties props = new Properties();
-    if (enabledSetting != null) {
-      props.put(ProfilingConfig.PROFILING_ENABLED, enabledSetting);
-    }
-    if (injectSetting != null) {
-      props.put("injection.enabled", injectSetting);
-    }
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+    @ParameterizedTest
+    @MethodSource("activationSettings")
+    void testActivation(String enabledSetting, String injectSetting, ProfilerActivationSetting expected) {
+        Properties props = new Properties();
+        if (enabledSetting != null) {
+            props.put(ProfilingConfig.PROFILING_ENABLED, enabledSetting);
+        }
+        if (injectSetting != null) {
+            props.put("injection.enabled", injectSetting);
+        }
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
 
-    ProfilerActivationSetting setting =
-        ProfilerSettingsSupport.getProfilerActivation(configProvider);
-    assertEquals(expected, setting);
-  }
+        ProfilerActivationSetting setting = ProfilerSettingsSupport.getProfilerActivation(configProvider);
+        assertEquals(expected, setting);
+    }
 
-  private static Stream<Arguments> activationSettings() {
-    return Stream.of(
-        Arguments.of(
-            "true", null, new ProfilerActivationSetting(ProfilingEnablement.ENABLED, Ssi.NONE)),
-        Arguments.of(
-            "true",
-            "tracer",
-            new ProfilerActivationSetting(ProfilingEnablement.ENABLED, Ssi.INJECTED_AGENT)),
-        Arguments.of(
-            "auto", null, new ProfilerActivationSetting(ProfilingEnablement.AUTO, Ssi.NONE)),
-        Arguments.of(
-            "auto",
-            "tracer",
-            new ProfilerActivationSetting(ProfilingEnablement.AUTO, Ssi.INJECTED_AGENT)),
-        Arguments.of(
-            null,
-            "profiler,tracer",
-            new ProfilerActivationSetting(ProfilingEnablement.INJECTED, Ssi.INJECTED_AGENT)),
-        Arguments.of(
-            "true",
-            "profiler,tracer",
-            new ProfilerActivationSetting(ProfilingEnablement.ENABLED, Ssi.INJECTED_AGENT)),
-        Arguments.of(
-            "auto",
-            "profiler,tracer",
-            new ProfilerActivationSetting(ProfilingEnablement.AUTO, Ssi.INJECTED_AGENT)));
-  }
+    private static Stream<Arguments> activationSettings() {
+        return Stream.of(
+                Arguments.of("true", null, new ProfilerActivationSetting(ProfilingEnablement.ENABLED, Ssi.NONE)),
+                Arguments.of(
+                        "true",
+                        "tracer",
+                        new ProfilerActivationSetting(ProfilingEnablement.ENABLED, Ssi.INJECTED_AGENT)),
+                Arguments.of("auto", null, new ProfilerActivationSetting(ProfilingEnablement.AUTO, Ssi.NONE)),
+                Arguments.of(
+                        "auto", "tracer", new ProfilerActivationSetting(ProfilingEnablement.AUTO, Ssi.INJECTED_AGENT)),
+                Arguments.of(
+                        null,
+                        "profiler,tracer",
+                        new ProfilerActivationSetting(ProfilingEnablement.INJECTED, Ssi.INJECTED_AGENT)),
+                Arguments.of(
+                        "true",
+                        "profiler,tracer",
+                        new ProfilerActivationSetting(ProfilingEnablement.ENABLED, Ssi.INJECTED_AGENT)),
+                Arguments.of(
+                        "auto",
+                        "profiler,tracer",
+                        new ProfilerActivationSetting(ProfilingEnablement.AUTO, Ssi.INJECTED_AGENT)));
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ProfilingSystemTest.java b/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ProfilingSystemTest.java
index 324b9944bc0..0eb12897897 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ProfilingSystemTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ProfilingSystemTest.java
@@ -73,168 +73,171 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 public class ProfilingSystemTest {
 
-  // Time in milliseconds when all things should have been done by
-  // Should be noticeably bigger than one recording iteration
-  private static final long REASONABLE_TIMEOUT = 5000;
-
-  private final AgentTaskScheduler scheduler = new AgentTaskScheduler(PROFILER_RECORDING_SCHEDULER);
-
-  @Mock private ThreadLocalRandom threadLocalRandom;
-  @Mock private ConfigProvider configProvider;
-  @Mock private Controller controller;
-
-  @Mock private ControllerContext.Snapshot context;
-  @Mock private OngoingRecording recording;
-  @Mock private RecordingData recordingData;
-  @Mock private RecordingDataListener listener;
-
-  private Appender<ILoggingEvent> mockedAppender;
-
-  @SuppressWarnings("unchecked")
-  @BeforeEach
-  public void setup() throws Exception {
-    assumeFalse(
-        JavaVirtualMachine.isOracleJDK8(),
-        "Oracle JDK 1.8 did not merge the fix in JDK-8058322, leading to the JVM failing to correctly "
-            + "extract method parameters without args, when the code is compiled on a later JDK (targeting 8). "
-            + "This can manifest when creating mocks.");
-
-    when(controller.createRecording(ProfilingSystem.RECORDING_NAME, context)).thenReturn(recording);
-    when(threadLocalRandom.nextInt(eq(1), anyInt())).thenReturn(1);
-    when(recordingData.getEnd()).thenAnswer(mockInvocation -> Instant.now());
-
-    mockedAppender = (Appender<ILoggingEvent>) Mockito.mock(Appender.class);
-    ((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME))
-        .addAppender(mockedAppender);
-  }
-
-  @AfterEach
-  public void tearDown() {
-    scheduler.shutdown(5, SECONDS);
-    ((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME))
-        .detachAppender(mockedAppender);
-  }
-
-  private void assertLog(Level level, String message) {
-    ArgumentCaptor<ILoggingEvent> argumentCaptor = ArgumentCaptor.forClass(ILoggingEvent.class);
-    Mockito.verify(mockedAppender, VerificationModeFactory.atLeastOnce())
-        .doAppend(argumentCaptor.capture());
-
-    for (ILoggingEvent event : argumentCaptor.getAllValues()) {
-      if (message.contains(event.getFormattedMessage()) && level.equals(event.getLevel())) {
-        return;
-      }
+    // Time in milliseconds when all things should have been done by
+    // Should be noticeably bigger than one recording iteration
+    private static final long REASONABLE_TIMEOUT = 5000;
+
+    private final AgentTaskScheduler scheduler = new AgentTaskScheduler(PROFILER_RECORDING_SCHEDULER);
+
+    @Mock
+    private ThreadLocalRandom threadLocalRandom;
+
+    @Mock
+    private ConfigProvider configProvider;
+
+    @Mock
+    private Controller controller;
+
+    @Mock
+    private ControllerContext.Snapshot context;
+
+    @Mock
+    private OngoingRecording recording;
+
+    @Mock
+    private RecordingData recordingData;
+
+    @Mock
+    private RecordingDataListener listener;
+
+    private Appender<ILoggingEvent> mockedAppender;
+
+    @SuppressWarnings("unchecked")
+    @BeforeEach
+    public void setup() throws Exception {
+        assumeFalse(
+                JavaVirtualMachine.isOracleJDK8(),
+                "Oracle JDK 1.8 did not merge the fix in JDK-8058322, leading to the JVM failing to correctly "
+                        + "extract method parameters without args, when the code is compiled on a later JDK (targeting 8). "
+                        + "This can manifest when creating mocks.");
+
+        when(controller.createRecording(ProfilingSystem.RECORDING_NAME, context))
+                .thenReturn(recording);
+        when(threadLocalRandom.nextInt(eq(1), anyInt())).thenReturn(1);
+        when(recordingData.getEnd()).thenAnswer(mockInvocation -> Instant.now());
+
+        mockedAppender = (Appender<ILoggingEvent>) Mockito.mock(Appender.class);
+        ((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME)).addAppender(mockedAppender);
     }
-    fail("Log does not contain the expected message '" + message + "' at level '" + level + "'");
-  }
-
-  @Test
-  void testInvalidOracleJdk() throws Exception {
-    // Simulate the message part
-    when(controller.createRecording(ProfilingSystem.RECORDING_NAME, context))
-        .thenThrow(
-            new RuntimeException(new RuntimeException("com.oracle.jrockit:type=FlightRecorder")));
-    final ProfilingSystem system =
-        new ProfilingSystem(
-            configProvider,
-            controller,
-            context,
-            listener,
-            Duration.ofMillis(10),
-            Duration.ofMillis(5),
-            Duration.ofMillis(1),
-            true);
-    system.start();
-    assertLog(
-        Level.WARN,
-        "You're running Oracle JDK 8. Datadog Continuous Profiler for Java depends on Java Flight Recorder, which requires a paid license in Oracle JDK 8. If you have one, please add the following `java` command line args: ‘-XX:+UnlockCommercialFeatures -XX:+FlightRecorder’. Alternatively, you can use a different Java 8 distribution like OpenJDK, where Java Flight Recorder is free.");
-  }
-
-  @Test
-  void testRuntimeException() throws Exception {
-    // Simulate the message part
-    when(controller.createRecording(ProfilingSystem.RECORDING_NAME, context))
-        .thenThrow(new RuntimeException(new RuntimeException()));
-    final ProfilingSystem system =
-        new ProfilingSystem(
-            configProvider,
-            controller,
-            context,
-            listener,
-            Duration.ofMillis(10),
-            Duration.ofMillis(5),
-            Duration.ofMillis(1),
-            true);
-    assertThrows(RuntimeException.class, () -> system.start());
-  }
-
-  @Test
-  void testOtherException() throws Exception {
-    // Simulate the message part
-    when(controller.createRecording(ProfilingSystem.RECORDING_NAME, context))
-        .thenThrow(new IllegalArgumentException());
-    final ProfilingSystem system =
-        new ProfilingSystem(
-            configProvider,
-            controller,
-            context,
-            listener,
-            Duration.ofMillis(10),
-            Duration.ofMillis(5),
-            Duration.ofMillis(1),
-            true);
-    assertThrows(IllegalArgumentException.class, () -> system.start());
-  }
-
-  @Test
-  public void testShutdown() throws Exception {
-    final ProfilingSystem system =
-        new ProfilingSystem(
-            configProvider,
-            controller,
-            context,
-            listener,
-            Duration.ofMillis(10),
-            Duration.ZERO,
-            Duration.ofMillis(300),
-            false,
-            scheduler,
-            threadLocalRandom);
-    startProfilingSystem(system);
-    verify(controller).createRecording(any(), any());
-    system.shutdown();
-
-    verify(recording).close();
-    assertTrue(scheduler.isShutdown());
-  }
-
-  @Test
-  public void testShutdownWithRunningProfilingRecording() throws Exception {
-    final ProfilingSystem system =
-        new ProfilingSystem(
-            configProvider,
-            controller,
-            context,
-            listener,
-            Duration.ofMillis(10),
-            Duration.ZERO,
-            Duration.ofMillis(300),
-            false,
-            scheduler,
-            threadLocalRandom);
-    startProfilingSystem(system);
-    verify(controller).createRecording(any(), any());
-    system.shutdown();
-
-    verify(recording).close();
-    assertTrue(scheduler.isShutdown());
-  }
-
-  @Test
-  public void testShutdownWithSnapshotOnShutdown() throws Exception {
-    final ProfilingSystem system =
-        spy(
-            new ProfilingSystem(
+
+    @AfterEach
+    public void tearDown() {
+        scheduler.shutdown(5, SECONDS);
+        ((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME))
+                .detachAppender(mockedAppender);
+    }
+
+    private void assertLog(Level level, String message) {
+        ArgumentCaptor<ILoggingEvent> argumentCaptor = ArgumentCaptor.forClass(ILoggingEvent.class);
+        Mockito.verify(mockedAppender, VerificationModeFactory.atLeastOnce()).doAppend(argumentCaptor.capture());
+
+        for (ILoggingEvent event : argumentCaptor.getAllValues()) {
+            if (message.contains(event.getFormattedMessage()) && level.equals(event.getLevel())) {
+                return;
+            }
+        }
+        fail("Log does not contain the expected message '" + message + "' at level '" + level + "'");
+    }
+
+    @Test
+    void testInvalidOracleJdk() throws Exception {
+        // Simulate the message part
+        when(controller.createRecording(ProfilingSystem.RECORDING_NAME, context))
+                .thenThrow(new RuntimeException(new RuntimeException("com.oracle.jrockit:type=FlightRecorder")));
+        final ProfilingSystem system = new ProfilingSystem(
+                configProvider,
+                controller,
+                context,
+                listener,
+                Duration.ofMillis(10),
+                Duration.ofMillis(5),
+                Duration.ofMillis(1),
+                true);
+        system.start();
+        assertLog(
+                Level.WARN,
+                "You're running Oracle JDK 8. Datadog Continuous Profiler for Java depends on Java Flight Recorder, which requires a paid license in Oracle JDK 8. If you have one, please add the following `java` command line args: ‘-XX:+UnlockCommercialFeatures -XX:+FlightRecorder’. Alternatively, you can use a different Java 8 distribution like OpenJDK, where Java Flight Recorder is free.");
+    }
+
+    @Test
+    void testRuntimeException() throws Exception {
+        // Simulate the message part
+        when(controller.createRecording(ProfilingSystem.RECORDING_NAME, context))
+                .thenThrow(new RuntimeException(new RuntimeException()));
+        final ProfilingSystem system = new ProfilingSystem(
+                configProvider,
+                controller,
+                context,
+                listener,
+                Duration.ofMillis(10),
+                Duration.ofMillis(5),
+                Duration.ofMillis(1),
+                true);
+        assertThrows(RuntimeException.class, () -> system.start());
+    }
+
+    @Test
+    void testOtherException() throws Exception {
+        // Simulate the message part
+        when(controller.createRecording(ProfilingSystem.RECORDING_NAME, context))
+                .thenThrow(new IllegalArgumentException());
+        final ProfilingSystem system = new ProfilingSystem(
+                configProvider,
+                controller,
+                context,
+                listener,
+                Duration.ofMillis(10),
+                Duration.ofMillis(5),
+                Duration.ofMillis(1),
+                true);
+        assertThrows(IllegalArgumentException.class, () -> system.start());
+    }
+
+    @Test
+    public void testShutdown() throws Exception {
+        final ProfilingSystem system = new ProfilingSystem(
+                configProvider,
+                controller,
+                context,
+                listener,
+                Duration.ofMillis(10),
+                Duration.ZERO,
+                Duration.ofMillis(300),
+                false,
+                scheduler,
+                threadLocalRandom);
+        startProfilingSystem(system);
+        verify(controller).createRecording(any(), any());
+        system.shutdown();
+
+        verify(recording).close();
+        assertTrue(scheduler.isShutdown());
+    }
+
+    @Test
+    public void testShutdownWithRunningProfilingRecording() throws Exception {
+        final ProfilingSystem system = new ProfilingSystem(
+                configProvider,
+                controller,
+                context,
+                listener,
+                Duration.ofMillis(10),
+                Duration.ZERO,
+                Duration.ofMillis(300),
+                false,
+                scheduler,
+                threadLocalRandom);
+        startProfilingSystem(system);
+        verify(controller).createRecording(any(), any());
+        system.shutdown();
+
+        verify(recording).close();
+        assertTrue(scheduler.isShutdown());
+    }
+
+    @Test
+    public void testShutdownWithSnapshotOnShutdown() throws Exception {
+        final ProfilingSystem system = spy(new ProfilingSystem(
                 configProvider,
                 controller,
                 context,
@@ -245,331 +248,311 @@ public void testShutdownWithSnapshotOnShutdown() throws Exception {
                 false,
                 scheduler,
                 threadLocalRandom));
-    final ProfilingSystem.SnapshotRecording snapshotRecording =
-        spy(system.createSnapshotRecording(Instant.now()));
-
-    when(system.createSnapshotRecording(any())).thenReturn(snapshotRecording);
-    startProfilingSystem(system);
-    verify(controller).createRecording(any(), any());
-    system.shutdown(true);
-
-    verify(snapshotRecording).snapshot(true);
-    verify(recording).close();
-    assertTrue(scheduler.isShutdown());
-  }
-
-  @Test
-  public void testForceEarlySTartup() throws Exception {
-    final ProfilingSystem system =
-        new ProfilingSystem(
-            configProvider,
-            controller,
-            context,
-            listener,
-            Duration.ofMillis(10),
-            Duration.ZERO,
-            Duration.ofMillis(300),
-            true,
-            scheduler,
-            threadLocalRandom);
-    system.start();
-    assertTrue(system.isStarted());
-    verify(controller).createRecording(any(), any());
-  }
-
-  @Test
-  public void testShutdownInterruption() throws Exception {
-    final Thread mainThread = Thread.currentThread();
-    doAnswer(
-            (InvocationOnMock invocation) -> {
-              while (!scheduler.isShutdown()) {
-                try {
-                  Thread.sleep(100);
-                } catch (final InterruptedException e) {
-                  // Ignore InterruptedException to make sure this threads lives through executor
-                  // shutdown
-                }
-              }
-              // Interrupting main thread to make sure this is handled properly
-              mainThread.interrupt();
-              return null;
-            })
-        .when(listener)
-        .onNewData(any(), any(), anyBoolean());
-    final ProfilingSystem system =
-        new ProfilingSystem(
-            configProvider,
-            controller,
-            context,
-            listener,
-            Duration.ofMillis(10),
-            Duration.ofMillis(5),
-            Duration.ofMillis(100),
-            false,
-            scheduler,
-            threadLocalRandom);
-    startProfilingSystem(system);
-    // Make sure we actually started the recording before terminating
-    verify(controller, timeout(300)).createRecording(any(), any());
-    system.shutdown();
-    assertTrue(true, "Shutdown exited cleanly after interruption");
-  }
-
-  @Test
-  public void testCanShutDownWithoutStarting() throws ConfigurationException {
-    final ProfilingSystem system =
-        new ProfilingSystem(
-            configProvider,
-            controller,
-            context,
-            listener,
-            Duration.ofMillis(10),
-            Duration.ofMillis(5),
-            Duration.ofMillis(300),
-            false,
-            scheduler,
-            threadLocalRandom);
-    system.shutdown();
-    assertTrue(scheduler.isShutdown());
-  }
-
-  @Test
-  public void testDoesntSendDataIfNotStarted() throws Exception {
-    final ProfilingSystem system =
-        new ProfilingSystem(
-            configProvider,
-            controller,
-            context,
-            listener,
-            Duration.ofMillis(10),
-            Duration.ofMillis(5),
-            Duration.ofMillis(1),
-            false);
-    Thread.sleep(50);
-    system.shutdown();
-    verify(controller, never()).createRecording(any(), any());
-    verify(listener, never()).onNewData(any(), any(), anyBoolean());
-  }
-
-  @Test
-  public void testDoesntSendPeriodicRecordingIfPeriodicRecordingIsDisabled()
-      throws InterruptedException, ConfigurationException {
-    when(recording.snapshot(any(), any())).thenReturn(recordingData);
-    final ProfilingSystem system =
-        new ProfilingSystem(
-            configProvider,
-            controller,
-            context,
-            listener,
-            Duration.ofMillis(10),
-            Duration.ofMillis(5),
-            Duration.ofMillis(10),
-            false);
-    startProfilingSystem(system);
-    Thread.sleep(200);
-    system.shutdown();
-    verify(listener, atLeastOnce()).onNewData(CONTINUOUS, recordingData, false);
-  }
-
-  @Test
-  public void testProfilingSystemNegativeStartupDelay() {
-    assertThrows(
-        ConfigurationException.class,
-        () -> {
-          new ProfilingSystem(
-              configProvider,
-              controller,
-              context,
-              listener,
-              Duration.ofMillis(-10),
-              Duration.ZERO,
-              Duration.ofMillis(200),
-              false);
+        final ProfilingSystem.SnapshotRecording snapshotRecording = spy(system.createSnapshotRecording(Instant.now()));
+
+        when(system.createSnapshotRecording(any())).thenReturn(snapshotRecording);
+        startProfilingSystem(system);
+        verify(controller).createRecording(any(), any());
+        system.shutdown(true);
+
+        verify(snapshotRecording).snapshot(true);
+        verify(recording).close();
+        assertTrue(scheduler.isShutdown());
+    }
+
+    @Test
+    public void testForceEarlySTartup() throws Exception {
+        final ProfilingSystem system = new ProfilingSystem(
+                configProvider,
+                controller,
+                context,
+                listener,
+                Duration.ofMillis(10),
+                Duration.ZERO,
+                Duration.ofMillis(300),
+                true,
+                scheduler,
+                threadLocalRandom);
+        system.start();
+        assertTrue(system.isStarted());
+        verify(controller).createRecording(any(), any());
+    }
+
+    @Test
+    public void testShutdownInterruption() throws Exception {
+        final Thread mainThread = Thread.currentThread();
+        doAnswer((InvocationOnMock invocation) -> {
+                    while (!scheduler.isShutdown()) {
+                        try {
+                            Thread.sleep(100);
+                        } catch (final InterruptedException e) {
+                            // Ignore InterruptedException to make sure this threads lives through executor
+                            // shutdown
+                        }
+                    }
+                    // Interrupting main thread to make sure this is handled properly
+                    mainThread.interrupt();
+                    return null;
+                })
+                .when(listener)
+                .onNewData(any(), any(), anyBoolean());
+        final ProfilingSystem system = new ProfilingSystem(
+                configProvider,
+                controller,
+                context,
+                listener,
+                Duration.ofMillis(10),
+                Duration.ofMillis(5),
+                Duration.ofMillis(100),
+                false,
+                scheduler,
+                threadLocalRandom);
+        startProfilingSystem(system);
+        // Make sure we actually started the recording before terminating
+        verify(controller, timeout(300)).createRecording(any(), any());
+        system.shutdown();
+        assertTrue(true, "Shutdown exited cleanly after interruption");
+    }
+
+    @Test
+    public void testCanShutDownWithoutStarting() throws ConfigurationException {
+        final ProfilingSystem system = new ProfilingSystem(
+                configProvider,
+                controller,
+                context,
+                listener,
+                Duration.ofMillis(10),
+                Duration.ofMillis(5),
+                Duration.ofMillis(300),
+                false,
+                scheduler,
+                threadLocalRandom);
+        system.shutdown();
+        assertTrue(scheduler.isShutdown());
+    }
+
+    @Test
+    public void testDoesntSendDataIfNotStarted() throws Exception {
+        final ProfilingSystem system = new ProfilingSystem(
+                configProvider,
+                controller,
+                context,
+                listener,
+                Duration.ofMillis(10),
+                Duration.ofMillis(5),
+                Duration.ofMillis(1),
+                false);
+        Thread.sleep(50);
+        system.shutdown();
+        verify(controller, never()).createRecording(any(), any());
+        verify(listener, never()).onNewData(any(), any(), anyBoolean());
+    }
+
+    @Test
+    public void testDoesntSendPeriodicRecordingIfPeriodicRecordingIsDisabled()
+            throws InterruptedException, ConfigurationException {
+        when(recording.snapshot(any(), any())).thenReturn(recordingData);
+        final ProfilingSystem system = new ProfilingSystem(
+                configProvider,
+                controller,
+                context,
+                listener,
+                Duration.ofMillis(10),
+                Duration.ofMillis(5),
+                Duration.ofMillis(10),
+                false);
+        startProfilingSystem(system);
+        Thread.sleep(200);
+        system.shutdown();
+        verify(listener, atLeastOnce()).onNewData(CONTINUOUS, recordingData, false);
+    }
+
+    @Test
+    public void testProfilingSystemNegativeStartupDelay() {
+        assertThrows(ConfigurationException.class, () -> {
+            new ProfilingSystem(
+                    configProvider,
+                    controller,
+                    context,
+                    listener,
+                    Duration.ofMillis(-10),
+                    Duration.ZERO,
+                    Duration.ofMillis(200),
+                    false);
         });
-  }
-
-  @Test
-  public void testProfilingSystemNegativeStartupRandomRangeDelay() {
-    assertThrows(
-        ConfigurationException.class,
-        () -> {
-          new ProfilingSystem(
-              configProvider,
-              controller,
-              context,
-              listener,
-              Duration.ofMillis(10),
-              Duration.ofMillis(-20),
-              Duration.ofMillis(200),
-              false);
+    }
+
+    @Test
+    public void testProfilingSystemNegativeStartupRandomRangeDelay() {
+        assertThrows(ConfigurationException.class, () -> {
+            new ProfilingSystem(
+                    configProvider,
+                    controller,
+                    context,
+                    listener,
+                    Duration.ofMillis(10),
+                    Duration.ofMillis(-20),
+                    Duration.ofMillis(200),
+                    false);
         });
-  }
-
-  @Test
-  public void testProfilingSystemNegativeUploadPeriod() {
-    assertThrows(
-        ConfigurationException.class,
-        () -> {
-          new ProfilingSystem(
-              configProvider,
-              controller,
-              context,
-              listener,
-              Duration.ofMillis(10),
-              Duration.ofMillis(20),
-              Duration.ofMillis(-200),
-              false);
+    }
+
+    @Test
+    public void testProfilingSystemNegativeUploadPeriod() {
+        assertThrows(ConfigurationException.class, () -> {
+            new ProfilingSystem(
+                    configProvider,
+                    controller,
+                    context,
+                    listener,
+                    Duration.ofMillis(10),
+                    Duration.ofMillis(20),
+                    Duration.ofMillis(-200),
+                    false);
         });
-  }
-
-  /** Ensure that we continue recording after one recording fails to get created */
-  @Test
-  public void testRecordingSnapshotError() throws ConfigurationException {
-    final Duration uploadPeriod = Duration.ofMillis(300);
-    final List<RecordingData> generatedRecordingData = new ArrayList<>();
-    when(recording.snapshot(any(), any()))
-        .thenThrow(new RuntimeException("Test"))
-        .thenAnswer(generateMockRecordingData(generatedRecordingData));
-
-    final ProfilingSystem system =
-        new ProfilingSystem(
-            configProvider,
-            controller,
-            context,
-            listener,
-            Duration.ofMillis(10),
-            Duration.ofMillis(5),
-            uploadPeriod,
-            false,
-            scheduler,
-            threadLocalRandom);
-    startProfilingSystem(system);
-
-    final ArgumentCaptor<RecordingData> captor = ArgumentCaptor.forClass(RecordingData.class);
-    verify(listener, timeout(REASONABLE_TIMEOUT).atLeast(2))
-        .onNewData(eq(CONTINUOUS), captor.capture(), anyBoolean());
-    assertEquals(generatedRecordingData, captor.getAllValues());
-
-    system.shutdown();
-  }
-
-  @Test
-  public void testRecordingSnapshotNoData() throws ConfigurationException {
-    final Duration uploadPeriod = Duration.ofMillis(300);
-    final List<RecordingData> generatedRecordingData = new ArrayList<>();
-    when(recording.snapshot(any(), any()))
-        .thenReturn(null)
-        .thenAnswer(generateMockRecordingData(generatedRecordingData));
-
-    final ProfilingSystem system =
-        new ProfilingSystem(
-            configProvider,
-            controller,
-            context,
-            listener,
-            Duration.ofMillis(10),
-            Duration.ofMillis(5),
-            uploadPeriod,
-            false,
-            scheduler,
-            threadLocalRandom);
-    startProfilingSystem(system);
-
-    final ArgumentCaptor<RecordingData> captor = ArgumentCaptor.forClass(RecordingData.class);
-    verify(listener, timeout(REASONABLE_TIMEOUT).times(2))
-        .onNewData(eq(CONTINUOUS), captor.capture(), anyBoolean());
-    assertEquals(generatedRecordingData, captor.getAllValues());
-
-    system.shutdown();
-  }
-
-  @Test
-  public void testRandomizedStartupDelay() throws ConfigurationException {
-    final Duration startupDelay = Duration.ofMillis(100);
-    final Duration startupDelayRandomRange = Duration.ofMillis(500);
-    final Duration additionalRandomDelay = Duration.ofMillis(300);
-
-    when(threadLocalRandom.nextLong(startupDelayRandomRange.toMillis()))
-        .thenReturn(additionalRandomDelay.toMillis());
-
-    final ProfilingSystem system =
-        new ProfilingSystem(
-            configProvider,
-            controller,
-            context,
-            listener,
-            startupDelay,
-            startupDelayRandomRange,
-            Duration.ofMillis(100),
-            false,
-            scheduler,
-            threadLocalRandom);
-
-    final Duration randomizedDelay = system.getStartupDelay();
-
-    assertEquals(startupDelay.plus(additionalRandomDelay), randomizedDelay);
-  }
-
-  @Test
-  public void testFixedStartupDelay() throws ConfigurationException {
-    final Duration startupDelay = Duration.ofMillis(100);
-
-    final ProfilingSystem system =
-        new ProfilingSystem(
-            configProvider,
-            controller,
-            context,
-            listener,
-            startupDelay,
-            Duration.ZERO,
-            Duration.ofMillis(100),
-            false,
-            scheduler,
-            threadLocalRandom);
-
-    assertEquals(startupDelay, system.getStartupDelay());
-  }
-
-  @Test
-  public void testEarlyShutdownException() throws Exception {
-    when(controller.createRecording(any(), any()))
-        .thenThrow(new IllegalStateException("Shutdown in progress"));
-
-    final Duration startupDelay = Duration.ofMillis(1);
-
-    final ProfilingSystem system =
-        new ProfilingSystem(
-            configProvider,
-            controller,
-            context,
-            listener,
-            startupDelay,
-            Duration.ZERO,
-            Duration.ofMillis(100),
-            false,
-            scheduler,
-            threadLocalRandom);
-
-    system.start();
-    Thread.sleep(200);
-    // start will be aborted, but the IllegalStateException won't bubble up
-    assertFalse(system.isStarted());
-    system.shutdown();
-  }
-
-  private Answer<Object> generateMockRecordingData(
-      final List<RecordingData> generatedRecordingData) {
-    return (InvocationOnMock invocation) -> {
-      final RecordingData recordingData = mock(RecordingData.class);
-      when(recordingData.getStart()).thenReturn(invocation.getArgument(0, Instant.class));
-      when(recordingData.getEnd()).thenAnswer(mockInvocation -> Instant.now());
-      generatedRecordingData.add(recordingData);
-      return recordingData;
-    };
-  }
-
-  private void startProfilingSystem(final ProfilingSystem system) {
-    system.start();
-    await().until(system::isStarted);
-  }
+    }
+
+    /** Ensure that we continue recording after one recording fails to get created */
+    @Test
+    public void testRecordingSnapshotError() throws ConfigurationException {
+        final Duration uploadPeriod = Duration.ofMillis(300);
+        final List<RecordingData> generatedRecordingData = new ArrayList<>();
+        when(recording.snapshot(any(), any()))
+                .thenThrow(new RuntimeException("Test"))
+                .thenAnswer(generateMockRecordingData(generatedRecordingData));
+
+        final ProfilingSystem system = new ProfilingSystem(
+                configProvider,
+                controller,
+                context,
+                listener,
+                Duration.ofMillis(10),
+                Duration.ofMillis(5),
+                uploadPeriod,
+                false,
+                scheduler,
+                threadLocalRandom);
+        startProfilingSystem(system);
+
+        final ArgumentCaptor<RecordingData> captor = ArgumentCaptor.forClass(RecordingData.class);
+        verify(listener, timeout(REASONABLE_TIMEOUT).atLeast(2))
+                .onNewData(eq(CONTINUOUS), captor.capture(), anyBoolean());
+        assertEquals(generatedRecordingData, captor.getAllValues());
+
+        system.shutdown();
+    }
+
+    @Test
+    public void testRecordingSnapshotNoData() throws ConfigurationException {
+        final Duration uploadPeriod = Duration.ofMillis(300);
+        final List<RecordingData> generatedRecordingData = new ArrayList<>();
+        when(recording.snapshot(any(), any()))
+                .thenReturn(null)
+                .thenAnswer(generateMockRecordingData(generatedRecordingData));
+
+        final ProfilingSystem system = new ProfilingSystem(
+                configProvider,
+                controller,
+                context,
+                listener,
+                Duration.ofMillis(10),
+                Duration.ofMillis(5),
+                uploadPeriod,
+                false,
+                scheduler,
+                threadLocalRandom);
+        startProfilingSystem(system);
+
+        final ArgumentCaptor<RecordingData> captor = ArgumentCaptor.forClass(RecordingData.class);
+        verify(listener, timeout(REASONABLE_TIMEOUT).times(2))
+                .onNewData(eq(CONTINUOUS), captor.capture(), anyBoolean());
+        assertEquals(generatedRecordingData, captor.getAllValues());
+
+        system.shutdown();
+    }
+
+    @Test
+    public void testRandomizedStartupDelay() throws ConfigurationException {
+        final Duration startupDelay = Duration.ofMillis(100);
+        final Duration startupDelayRandomRange = Duration.ofMillis(500);
+        final Duration additionalRandomDelay = Duration.ofMillis(300);
+
+        when(threadLocalRandom.nextLong(startupDelayRandomRange.toMillis()))
+                .thenReturn(additionalRandomDelay.toMillis());
+
+        final ProfilingSystem system = new ProfilingSystem(
+                configProvider,
+                controller,
+                context,
+                listener,
+                startupDelay,
+                startupDelayRandomRange,
+                Duration.ofMillis(100),
+                false,
+                scheduler,
+                threadLocalRandom);
+
+        final Duration randomizedDelay = system.getStartupDelay();
+
+        assertEquals(startupDelay.plus(additionalRandomDelay), randomizedDelay);
+    }
+
+    @Test
+    public void testFixedStartupDelay() throws ConfigurationException {
+        final Duration startupDelay = Duration.ofMillis(100);
+
+        final ProfilingSystem system = new ProfilingSystem(
+                configProvider,
+                controller,
+                context,
+                listener,
+                startupDelay,
+                Duration.ZERO,
+                Duration.ofMillis(100),
+                false,
+                scheduler,
+                threadLocalRandom);
+
+        assertEquals(startupDelay, system.getStartupDelay());
+    }
+
+    @Test
+    public void testEarlyShutdownException() throws Exception {
+        when(controller.createRecording(any(), any())).thenThrow(new IllegalStateException("Shutdown in progress"));
+
+        final Duration startupDelay = Duration.ofMillis(1);
+
+        final ProfilingSystem system = new ProfilingSystem(
+                configProvider,
+                controller,
+                context,
+                listener,
+                startupDelay,
+                Duration.ZERO,
+                Duration.ofMillis(100),
+                false,
+                scheduler,
+                threadLocalRandom);
+
+        system.start();
+        Thread.sleep(200);
+        // start will be aborted, but the IllegalStateException won't bubble up
+        assertFalse(system.isStarted());
+        system.shutdown();
+    }
+
+    private Answer<Object> generateMockRecordingData(final List<RecordingData> generatedRecordingData) {
+        return (InvocationOnMock invocation) -> {
+            final RecordingData recordingData = mock(RecordingData.class);
+            when(recordingData.getStart()).thenReturn(invocation.getArgument(0, Instant.class));
+            when(recordingData.getEnd()).thenAnswer(mockInvocation -> Instant.now());
+            generatedRecordingData.add(recordingData);
+            return recordingData;
+        };
+    }
+
+    private void startProfilingSystem(final ProfilingSystem system) {
+        system.start();
+        await().until(system::isStarted);
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/UnsupportedEnvironmentExceptionTest.java b/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/UnsupportedEnvironmentExceptionTest.java
index de8a703af98..285fe8ec53b 100644
--- a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/UnsupportedEnvironmentExceptionTest.java
+++ b/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/UnsupportedEnvironmentExceptionTest.java
@@ -7,18 +7,18 @@
 
 public class UnsupportedEnvironmentExceptionTest {
 
-  private static final String MESSAGE = "message";
+    private static final String MESSAGE = "message";
 
-  @Test
-  public void testMessageConstructor() {
-    assertEquals(MESSAGE, new UnsupportedEnvironmentException(MESSAGE).getMessage());
-  }
+    @Test
+    public void testMessageConstructor() {
+        assertEquals(MESSAGE, new UnsupportedEnvironmentException(MESSAGE).getMessage());
+    }
 
-  @Test
-  public void testMessageCauseConstructor() {
-    final Throwable cause = new RuntimeException();
-    final Exception exception = new UnsupportedEnvironmentException(MESSAGE, cause);
-    assertEquals(MESSAGE, exception.getMessage());
-    assertSame(cause, exception.getCause());
-  }
+    @Test
+    public void testMessageCauseConstructor() {
+        final Throwable cause = new RuntimeException();
+        final Exception exception = new UnsupportedEnvironmentException(MESSAGE, cause);
+        assertEquals(MESSAGE, exception.getMessage());
+        assertSame(cause, exception.getCause());
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/jmh/java/com/datadog/profiling/ddprof/AppContextSnapshotBenchmark.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/jmh/java/com/datadog/profiling/ddprof/AppContextSnapshotBenchmark.java
index 683f8ed2484..eb6637cd24e 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/jmh/java/com/datadog/profiling/ddprof/AppContextSnapshotBenchmark.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/jmh/java/com/datadog/profiling/ddprof/AppContextSnapshotBenchmark.java
@@ -34,52 +34,52 @@
 @State(Scope.Thread)
 public class AppContextSnapshotBenchmark {
 
-  @Param({"2", "8"})
-  int attrCount;
+    @Param({"2", "8"})
+    int attrCount;
 
-  /**
-   * Stack depth for the deepStack benchmark — 16 forces one resize past the default 8-slot pool.
-   */
-  @Param({"8", "16"})
-  int stackDepth;
+    /**
+     * Stack depth for the deepStack benchmark — 16 forces one resize past the default 8-slot pool.
+     */
+    @Param({"8", "16"})
+    int stackDepth;
 
-  private DatadogProfiler.AppContextSnapshot source;
-  private DatadogProfiler.AppContextSnapshot slot;
-  private DatadogProfiler.ScopeStack stack;
+    private DatadogProfiler.AppContextSnapshot source;
+    private DatadogProfiler.AppContextSnapshot slot;
+    private DatadogProfiler.ScopeStack stack;
 
-  @Setup
-  public void setup() {
-    source = new DatadogProfiler.AppContextSnapshot(attrCount);
-    for (int i = 0; i < attrCount; i++) {
-      source.record(i, "value-" + i);
+    @Setup
+    public void setup() {
+        source = new DatadogProfiler.AppContextSnapshot(attrCount);
+        for (int i = 0; i < attrCount; i++) {
+            source.record(i, "value-" + i);
+        }
+        slot = new DatadogProfiler.AppContextSnapshot(attrCount);
+        stack = new DatadogProfiler.ScopeStack(attrCount);
     }
-    slot = new DatadogProfiler.AppContextSnapshot(attrCount);
-    stack = new DatadogProfiler.ScopeStack(attrCount);
-  }
 
-  /** ScopeStack save: copies current snapshot into a pre-allocated pool slot (zero alloc). */
-  @Benchmark
-  public void save() {
-    slot.copyFrom(source);
-  }
-
-  /** ScopeStack restore: copies pool slot back into the live snapshot (zero alloc). */
-  @Benchmark
-  public void restore() {
-    source.copyFrom(slot);
-  }
+    /** ScopeStack save: copies current snapshot into a pre-allocated pool slot (zero alloc). */
+    @Benchmark
+    public void save() {
+        slot.copyFrom(source);
+    }
 
-  /**
-   * Borrow {@code stackDepth} slots then release them all. At {@code stackDepth=16} the pool
-   * resizes during warmup; steady-state measurement confirms zero allocation after growth.
-   */
-  @Benchmark
-  public void deepStack() {
-    for (int i = 0; i < stackDepth; i++) {
-      stack.borrow().copyFrom(source);
+    /** ScopeStack restore: copies pool slot back into the live snapshot (zero alloc). */
+    @Benchmark
+    public void restore() {
+        source.copyFrom(slot);
     }
-    for (int i = 0; i < stackDepth; i++) {
-      stack.release();
+
+    /**
+     * Borrow {@code stackDepth} slots then release them all. At {@code stackDepth=16} the pool
+     * resizes during warmup; steady-state measurement confirms zero allocation after growth.
+     */
+    @Benchmark
+    public void deepStack() {
+        for (int i = 0; i < stackDepth; i++) {
+            stack.borrow().copyFrom(source);
+        }
+        for (int i = 0; i < stackDepth; i++) {
+            stack.release();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java
index c1305763464..6e0a8136098 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java
@@ -70,774 +70,761 @@
  * JFR, so that it can be installed before tracing starts.
  */
 public final class DatadogProfiler {
-  private static final Logger log = LoggerFactory.getLogger(DatadogProfiler.class);
-
-  private static final int[] EMPTY = new int[0];
-
-  private static final String OPERATION = "_dd.trace.operation";
-  private static final String RESOURCE = "_dd.trace.resource";
-
-  private static final int MAX_NUM_ENDPOINTS = 8192;
-
-  private final boolean detailedDebugLogging;
-
-  /**
-   * Creates a profiler API with default configuration, may result in loading the profiler native
-   * library if that has not already happened, but this will not happen more than once. Applying
-   * default configuration will not prevent overloading any setting that would not require reloading
-   * the native library.
-   *
-   * @return a profiler with default configuration.
-   */
-  public static DatadogProfiler newInstance() {
-    return newInstance(ConfigProvider.getInstance());
-  }
+    private static final Logger log = LoggerFactory.getLogger(DatadogProfiler.class);
+
+    private static final int[] EMPTY = new int[0];
+
+    private static final String OPERATION = "_dd.trace.operation";
+    private static final String RESOURCE = "_dd.trace.resource";
+
+    private static final int MAX_NUM_ENDPOINTS = 8192;
+
+    private final boolean detailedDebugLogging;
+
+    /**
+     * Creates a profiler API with default configuration, may result in loading the profiler native
+     * library if that has not already happened, but this will not happen more than once. Applying
+     * default configuration will not prevent overloading any setting that would not require reloading
+     * the native library.
+     *
+     * @return a profiler with default configuration.
+     */
+    public static DatadogProfiler newInstance() {
+        return newInstance(ConfigProvider.getInstance());
+    }
+
+    /**
+     * Creates a new instance of the Datadog profiler API, may result in loading the profiler native
+     * library if that has not already happened, but this will not happen more than once. The
+     * underlying configuration for where to load the library from cannot be overridden by providing
+     * config here, but all other properties can be changed.
+     *
+     * @param configProvider config
+     * @return a profiler with the configuration applied.
+     */
+    public static DatadogProfiler newInstance(ConfigProvider configProvider) {
+        return new DatadogProfiler(configProvider);
+    }
+
+    private final AtomicBoolean recordingFlag = new AtomicBoolean(false);
+    private final ConfigProvider configProvider;
+    private final JavaProfiler profiler;
+    private final Set<ProfilingMode> profilingModes = EnumSet.noneOf(ProfilingMode.class);
+
+    private final ContextSetter contextSetter;
+
+    private final List<String> orderedContextAttributes;
+
+    // True for each attribute slot that was configured by the application (e.g. foo, bar).
+    // setTraceContext/clearTraceContext reset all custom slots; these app-owned slots are
+    // re-applied afterwards via reapplyAppContext().
+    private final boolean[] isAppOffset;
+
+    private final boolean hasAppContext;
+
+    /**
+     * Per-thread snapshot of application attribute values. Lazily allocated; only threads that call
+     * setContextValue for an app attribute ever allocate. Holds the String value for each slot;
+     * reapply resolves each value's encoding through the process-wide value cache.
+     */
+    private final ThreadLocal<AppContextSnapshot> appContextValues = new ThreadLocal<>();
+
+    private final ThreadLocal<ScopeStack> scopeStack = new ThreadLocal<>();
+
+    /** Per-thread stack of pre-allocated save slots for {@link DatadogProfilingScope}. */
+    static final class ScopeStack {
+        private final int attrCount;
+        AppContextSnapshot[] slots;
+        int depth;
+
+        ScopeStack(int attrCount) {
+            this.attrCount = attrCount;
+            slots = new AppContextSnapshot[8];
+            for (int i = 0; i < slots.length; i++) {
+                slots[i] = new AppContextSnapshot(attrCount);
+            }
+        }
 
-  /**
-   * Creates a new instance of the Datadog profiler API, may result in loading the profiler native
-   * library if that has not already happened, but this will not happen more than once. The
-   * underlying configuration for where to load the library from cannot be overridden by providing
-   * config here, but all other properties can be changed.
-   *
-   * @param configProvider config
-   * @return a profiler with the configuration applied.
-   */
-  public static DatadogProfiler newInstance(ConfigProvider configProvider) {
-    return new DatadogProfiler(configProvider);
-  }
+        AppContextSnapshot borrow() {
+            if (depth >= slots.length) {
+                AppContextSnapshot[] grown = new AppContextSnapshot[slots.length * 2];
+                System.arraycopy(slots, 0, grown, 0, slots.length);
+                // Eagerly fill the newly added slots so every index is non-null.
+                for (int i = slots.length; i < grown.length; i++) {
+                    grown[i] = new AppContextSnapshot(attrCount);
+                }
+                slots = grown;
+            }
+            return slots[depth++];
+        }
 
-  private final AtomicBoolean recordingFlag = new AtomicBoolean(false);
-  private final ConfigProvider configProvider;
-  private final JavaProfiler profiler;
-  private final Set<ProfilingMode> profilingModes = EnumSet.noneOf(ProfilingMode.class);
+        void release() {
+            if (depth > 0) slots[--depth].reset();
+        }
+    }
 
-  private final ContextSetter contextSetter;
+    // Package-private so DatadogProfilingScope can hold a typed reference for save/restore.
+    static final class AppContextSnapshot {
+        // App-managed attribute values, indexed by slot. A value is written via
+        // JavaProfiler.setContextValue, which resolves it through the process-wide value cache, so the
+        // snapshot only needs the String value.
+        private final String[] strings;
+        // Count of slots with a non-null value; allows O(1) isEmpty().
+        private int nonZeroCount;
 
-  private final List<String> orderedContextAttributes;
+        AppContextSnapshot(int size) {
+            strings = new String[size];
+        }
 
-  // True for each attribute slot that was configured by the application (e.g. foo, bar).
-  // setTraceContext/clearTraceContext reset all custom slots; these app-owned slots are
-  // re-applied afterwards via reapplyAppContext().
-  private final boolean[] isAppOffset;
+        void record(int offset, String value) {
+            if (strings[offset] == null && value != null) {
+                nonZeroCount++;
+            } else if (strings[offset] != null && value == null) {
+                nonZeroCount--;
+            }
+            strings[offset] = value;
+        }
 
-  private final boolean hasAppContext;
+        void clear(int offset) {
+            if (strings[offset] != null) nonZeroCount--;
+            strings[offset] = null;
+        }
 
-  /**
-   * Per-thread snapshot of application attribute values. Lazily allocated; only threads that call
-   * setContextValue for an app attribute ever allocate. Holds the String value for each slot;
-   * reapply resolves each value's encoding through the process-wide value cache.
-   */
-  private final ThreadLocal<AppContextSnapshot> appContextValues = new ThreadLocal<>();
+        boolean isEmpty() {
+            return nonZeroCount == 0;
+        }
 
-  private final ThreadLocal<ScopeStack> scopeStack = new ThreadLocal<>();
+        int nonZeroCount() {
+            return nonZeroCount;
+        }
+
+        String stringAt(int offset) {
+            return strings[offset];
+        }
 
-  /** Per-thread stack of pre-allocated save slots for {@link DatadogProfilingScope}. */
-  static final class ScopeStack {
-    private final int attrCount;
-    AppContextSnapshot[] slots;
-    int depth;
+        void copyFrom(AppContextSnapshot src) {
+            System.arraycopy(src.strings, 0, strings, 0, strings.length);
+            nonZeroCount = src.nonZeroCount;
+        }
 
-    ScopeStack(int attrCount) {
-      this.attrCount = attrCount;
-      slots = new AppContextSnapshot[8];
-      for (int i = 0; i < slots.length; i++) {
-        slots[i] = new AppContextSnapshot(attrCount);
-      }
+        void reset() {
+            Arrays.fill(strings, null);
+            nonZeroCount = 0;
+        }
     }
 
-    AppContextSnapshot borrow() {
-      if (depth >= slots.length) {
-        AppContextSnapshot[] grown = new AppContextSnapshot[slots.length * 2];
-        System.arraycopy(slots, 0, grown, 0, slots.length);
-        // Eagerly fill the newly added slots so every index is non-null.
-        for (int i = slots.length; i < grown.length; i++) {
-          grown[i] = new AppContextSnapshot(attrCount);
+    private final long queueTimeThresholdMillis;
+
+    private final Path recordingsPath;
+
+    private DatadogProfiler(ConfigProvider configProvider) {
+        this.configProvider = configProvider;
+        this.profiler = DdprofLibraryLoader.javaProfiler().getComponent();
+        this.detailedDebugLogging =
+                configProvider.getBoolean(PROFILING_DETAILED_DEBUG_LOGGING, PROFILING_DETAILED_DEBUG_LOGGING_DEFAULT);
+        Throwable reasonNotLoaded = DdprofLibraryLoader.javaProfiler().getReasonNotLoaded();
+        if (reasonNotLoaded != null) {
+            throw new UnsupportedOperationException("Unable to instantiate datadog profiler", reasonNotLoaded);
+        }
+
+        // TODO enable/disable events by name (e.g. datadog.ExecutionSample), not flag, so configuration
+        //  can be consistent with JFR event control
+        if (isAllocationProfilingEnabled(configProvider)) {
+            profilingModes.add(ALLOCATION);
+        }
+        if (isMemoryLeakProfilingEnabled(configProvider)) {
+            profilingModes.add(MEMLEAK);
+        }
+        if (isCpuProfilerEnabled(configProvider)) {
+            profilingModes.add(CPU);
+        }
+        if (isWallClockProfilerEnabled(configProvider)) {
+            profilingModes.add(WALL);
+        }
+        if (isNativeMemoryProfilingEnabled(configProvider)) {
+            profilingModes.add(NATIVEMEM);
+        }
+        if (isNativeSocketProfilingEnabled(configProvider)) {
+            profilingModes.add(NATIVESOCKET);
+        }
+        Set<String> contextAttributes = getContextAttributes(configProvider);
+        this.orderedContextAttributes = getOrderedContextAttributes(contextAttributes, configProvider);
+        this.contextSetter = new ContextSetter(profiler, orderedContextAttributes);
+        // ContextSetter deduplicates and truncates to 10 internally; size arrays to its actual size.
+        // size() and offsetOf are pure-Java; they are the only ContextSetter methods this bridge uses.
+        int contextSize = contextSetter.size();
+        boolean[] appOffsets = new boolean[contextSize];
+        boolean anyApp = false;
+        for (String attribute : contextAttributes) {
+            int idx = contextSetter.offsetOf(attribute);
+            if (idx >= 0) {
+                appOffsets[idx] = true;
+                anyApp = true;
+            }
+        }
+        this.isAppOffset = appOffsets;
+        this.hasAppContext = anyApp;
+        this.queueTimeThresholdMillis = configProvider.getLong(
+                PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS, PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS_DEFAULT);
+
+        this.recordingsPath = TempLocationManager.getInstance().getTempDir().resolve("recordings");
+        if (!Files.exists(recordingsPath)) {
+            try {
+                Files.createDirectories(
+                        recordingsPath,
+                        PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
+            } catch (IOException e) {
+                log.warn("Failed to create recordings directory: {}", recordingsPath, e);
+                throw new IllegalStateException("Failed to create recordings directory: " + recordingsPath, e);
+            }
         }
-        slots = grown;
-      }
-      return slots[depth++];
     }
 
-    void release() {
-      if (depth > 0) slots[--depth].reset();
+    /**
+     * Computes the ordered context-attribute list (base attributes from config, then the optional
+     * span-name and resource-name attributes) in the exact order used for the per-thread {@link
+     * ContextSetter} and the native profiler's {@code attributes=} argument. Exposed so the OTel
+     * process context can publish the same {@code attribute_key_map} before the profiler starts.
+     */
+    public static List<String> getOrderedContextAttributes(ConfigProvider configProvider) {
+        return getOrderedContextAttributes(getContextAttributes(configProvider), configProvider);
     }
-  }
 
-  // Package-private so DatadogProfilingScope can hold a typed reference for save/restore.
-  static final class AppContextSnapshot {
-    // App-managed attribute values, indexed by slot. A value is written via
-    // JavaProfiler.setContextValue, which resolves it through the process-wide value cache, so the
-    // snapshot only needs the String value.
-    private final String[] strings;
-    // Count of slots with a non-null value; allows O(1) isEmpty().
-    private int nonZeroCount;
+    private static List<String> getOrderedContextAttributes(
+            Set<String> contextAttributes, ConfigProvider configProvider) {
+        List<String> ordered = new ArrayList<>(contextAttributes);
+        if (isSpanNameContextAttributeEnabled(configProvider)) {
+            ordered.add(OPERATION);
+        }
+        if (isResourceNameContextAttributeEnabled(configProvider)) {
+            ordered.add(RESOURCE);
+        }
+        return ordered;
+    }
 
-    AppContextSnapshot(int size) {
-      strings = new String[size];
-    }
-
-    void record(int offset, String value) {
-      if (strings[offset] == null && value != null) {
-        nonZeroCount++;
-      } else if (strings[offset] != null && value == null) {
-        nonZeroCount--;
-      }
-      strings[offset] = value;
-    }
-
-    void clear(int offset) {
-      if (strings[offset] != null) nonZeroCount--;
-      strings[offset] = null;
-    }
-
-    boolean isEmpty() {
-      return nonZeroCount == 0;
-    }
-
-    int nonZeroCount() {
-      return nonZeroCount;
-    }
-
-    String stringAt(int offset) {
-      return strings[offset];
-    }
-
-    void copyFrom(AppContextSnapshot src) {
-      System.arraycopy(src.strings, 0, strings, 0, strings.length);
-      nonZeroCount = src.nonZeroCount;
+    void addThread() {
+        profiler.addThread();
     }
 
-    void reset() {
-      Arrays.fill(strings, null);
-      nonZeroCount = 0;
+    void removeThread() {
+        profiler.removeThread();
     }
-  }
 
-  private final long queueTimeThresholdMillis;
+    public String getVersion() {
+        return profiler.getVersion();
+    }
 
-  private final Path recordingsPath;
-
-  private DatadogProfiler(ConfigProvider configProvider) {
-    this.configProvider = configProvider;
-    this.profiler = DdprofLibraryLoader.javaProfiler().getComponent();
-    this.detailedDebugLogging =
-        configProvider.getBoolean(
-            PROFILING_DETAILED_DEBUG_LOGGING, PROFILING_DETAILED_DEBUG_LOGGING_DEFAULT);
-    Throwable reasonNotLoaded = DdprofLibraryLoader.javaProfiler().getReasonNotLoaded();
-    if (reasonNotLoaded != null) {
-      throw new UnsupportedOperationException(
-          "Unable to instantiate datadog profiler", reasonNotLoaded);
-    }
-
-    // TODO enable/disable events by name (e.g. datadog.ExecutionSample), not flag, so configuration
-    //  can be consistent with JFR event control
-    if (isAllocationProfilingEnabled(configProvider)) {
-      profilingModes.add(ALLOCATION);
-    }
-    if (isMemoryLeakProfilingEnabled(configProvider)) {
-      profilingModes.add(MEMLEAK);
-    }
-    if (isCpuProfilerEnabled(configProvider)) {
-      profilingModes.add(CPU);
-    }
-    if (isWallClockProfilerEnabled(configProvider)) {
-      profilingModes.add(WALL);
-    }
-    if (isNativeMemoryProfilingEnabled(configProvider)) {
-      profilingModes.add(NATIVEMEM);
-    }
-    if (isNativeSocketProfilingEnabled(configProvider)) {
-      profilingModes.add(NATIVESOCKET);
-    }
-    Set<String> contextAttributes = getContextAttributes(configProvider);
-    this.orderedContextAttributes = getOrderedContextAttributes(contextAttributes, configProvider);
-    this.contextSetter = new ContextSetter(profiler, orderedContextAttributes);
-    // ContextSetter deduplicates and truncates to 10 internally; size arrays to its actual size.
-    // size() and offsetOf are pure-Java; they are the only ContextSetter methods this bridge uses.
-    int contextSize = contextSetter.size();
-    boolean[] appOffsets = new boolean[contextSize];
-    boolean anyApp = false;
-    for (String attribute : contextAttributes) {
-      int idx = contextSetter.offsetOf(attribute);
-      if (idx >= 0) {
-        appOffsets[idx] = true;
-        anyApp = true;
-      }
-    }
-    this.isAppOffset = appOffsets;
-    this.hasAppContext = anyApp;
-    this.queueTimeThresholdMillis =
-        configProvider.getLong(
-            PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS,
-            PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS_DEFAULT);
-
-    this.recordingsPath = TempLocationManager.getInstance().getTempDir().resolve("recordings");
-    if (!Files.exists(recordingsPath)) {
-      try {
-        Files.createDirectories(
-            recordingsPath,
-            PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
-      } catch (IOException e) {
-        log.warn("Failed to create recordings directory: {}", recordingsPath, e);
-        throw new IllegalStateException(
-            "Failed to create recordings directory: " + recordingsPath, e);
-      }
-    }
-  }
-
-  /**
-   * Computes the ordered context-attribute list (base attributes from config, then the optional
-   * span-name and resource-name attributes) in the exact order used for the per-thread {@link
-   * ContextSetter} and the native profiler's {@code attributes=} argument. Exposed so the OTel
-   * process context can publish the same {@code attribute_key_map} before the profiler starts.
-   */
-  public static List<String> getOrderedContextAttributes(ConfigProvider configProvider) {
-    return getOrderedContextAttributes(getContextAttributes(configProvider), configProvider);
-  }
-
-  private static List<String> getOrderedContextAttributes(
-      Set<String> contextAttributes, ConfigProvider configProvider) {
-    List<String> ordered = new ArrayList<>(contextAttributes);
-    if (isSpanNameContextAttributeEnabled(configProvider)) {
-      ordered.add(OPERATION);
-    }
-    if (isResourceNameContextAttributeEnabled(configProvider)) {
-      ordered.add(RESOURCE);
-    }
-    return ordered;
-  }
-
-  void addThread() {
-    profiler.addThread();
-  }
-
-  void removeThread() {
-    profiler.removeThread();
-  }
-
-  public String getVersion() {
-    return profiler.getVersion();
-  }
-
-  @Nullable
-  public OngoingRecording start() {
-    log.debug("Starting profiling");
-    try {
-      return new DatadogProfilerRecording(this);
-    } catch (IOException | IllegalStateException e) {
-      log.debug("Failed to start Datadog profiler recording", e);
-      return null;
-    }
-  }
-
-  @Nullable
-  public RecordingData stop(OngoingRecording recording) {
-    log.debug("Stopping profiling");
-    return recording.stop();
-  }
-
-  /** A call-back from {@linkplain DatadogProfilerRecording#stop()} */
-  void stopProfiler() {
-    if (recordingFlag.compareAndSet(true, false)) {
-      profiler.stop();
-      if (isActive()) {
-        log.debug("Profiling is still active. Waiting to stop.");
-        while (isActive()) {
-          LockSupport.parkNanos(10_000_000L);
-        }
-      }
-    }
-  }
-
-  public Set<ProfilingMode> enabledModes() {
-    return profilingModes;
-  }
-
-  public boolean isActive() {
-    try {
-      String status = executeProfilerCmd("status");
-      log.debug("Datadog Profiler Status = {}", status);
-      return !status.contains("not active");
-    } catch (IOException ignored) {
-    }
-    return false;
-  }
-
-  String executeProfilerCmd(String cmd) throws IOException {
-    return profiler.execute(cmd);
-  }
-
-  Path newSnapshotFile() throws IOException {
-    return Files.createTempFile(recordingsPath, "dd-profiler-snapshot-", ".jfr");
-  }
-
-  Path newRecording() throws IOException, IllegalStateException {
-    if (recordingFlag.compareAndSet(false, true)) {
-      Path recFile = Files.createTempFile(recordingsPath, "dd-profiler-", ".jfr");
-      String cmd = cmdStartProfiling(recFile);
-      try {
-        String rslt = executeProfilerCmd(cmd);
-        log.debug("DatadogProfiler.execute({}) = {}", cmd, rslt);
-      } catch (IOException | IllegalStateException e) {
-        if (log.isDebugEnabled()) {
-          log.warn("Unable to start Datadog profiler recording", e);
-        } else {
-          log.warn("Unable to start Datadog profiler recording: {}", e.getMessage());
-        }
-        recordingFlag.set(false);
-        throw e;
-      }
-      return recFile;
-    }
-    throw new IllegalStateException("Datadog profiler session has already been started");
-  }
-
-  void dump(Path path) {
-    profiler.dump(path);
-  }
-
-  String cmdStartProfiling(Path file) throws IllegalStateException {
-    // 'start' = start, 'jfr=7' = store in JFR format ready for concatenation
-    int safemode = getSafeMode(configProvider);
-    if (safemode != ProfilingConfig.PROFILING_DATADOG_PROFILER_SAFEMODE_DEFAULT) {
-      // be very vocal about messing around with the profiler safemode as it may induce crashes
-      log.warn(
-          "Datadog profiler safemode is enabled with overridden value {}. "
-              + "This is not recommended and may cause instability and crashes.",
-          safemode);
-    }
-    StringBuilder cmd = new StringBuilder("start,jfr");
-    cmd.append(",file=").append(file.toAbsolutePath());
-    cmd.append(",loglevel=").append(getLogLevel(configProvider));
-    cmd.append(",jstackdepth=").append(getStackDepth(configProvider));
-    cmd.append(",cstack=").append(getCStack(configProvider));
-    cmd.append(",safemode=").append(getSafeMode(configProvider));
-    cmd.append(",attributes=").append(String.join(";", orderedContextAttributes));
-    cmd.append(",generations=").append(isTrackingGenerations(configProvider));
-    if (omitLineNumbers(configProvider)) {
-      cmd.append(",linenumbers=f");
-    }
-
-    // Default is true
-    if (enableJMethodIDOptim(configProvider)) {
-      cmd.append(",fjmethodid=false");
-    }
-
-    if (profilingModes.contains(CPU)) {
-      // cpu profiling is enabled.
-      String schedulingEvent = getSchedulingEvent(configProvider);
-      if (schedulingEvent != null && !schedulingEvent.isEmpty()) {
-        // using a user-specified event, e.g. L1-dcache-load-misses
-        cmd.append(",event=").append(schedulingEvent);
-        int interval = getSchedulingEventInterval(configProvider);
-        if (interval > 0) {
-          cmd.append(",interval=").append(interval);
-        }
-      } else {
-        // using cpu time schedule
-        int interval = getCpuInterval();
-        if (JavaVirtualMachine.isJ9())
-          interval =
-              interval == ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_INTERVAL_DEFAULT
-                  ? ProfilingConfig.PROFILING_DATADOG_PROFILER_J9_CPU_INTERVAL_DEFAULT
-                  : interval;
-        cmd.append(",cpu=").append(interval).append('m');
-      }
-    }
-    if (profilingModes.contains(WALL)) {
-      // wall profiling is enabled.
-      cmd.append(",wall=");
-      if (getWallCollapsing(configProvider)) {
-        cmd.append('~');
-      }
-      cmd.append(getWallInterval(configProvider)).append('m');
-      // ddprof quirk: if filter parameter is omitted, it defaults to "0" (enabled),
-      // not empty string (disabled). When enabled without tracing, no threads are added
-      // to the filter, resulting in zero samples. We must explicitly pass filter= (empty)
-      // to disable filtering and sample all threads.
-      if (getWallContextFilter(configProvider)) {
-        cmd.append(",filter=0");
-      } else {
-        cmd.append(",filter=");
-      }
-    }
-    cmd.append(",loglevel=").append(getLogLevel(configProvider));
-    if (profilingModes.contains(ALLOCATION) || profilingModes.contains(MEMLEAK)) {
-      // allocation profiling or live heap profiling is enabled
-      cmd.append(",memory=").append(getAllocationInterval(configProvider)).append('b');
-      cmd.append(':');
-      if (profilingModes.contains(ALLOCATION)) {
-        cmd.append('a');
-      }
-      if (profilingModes.contains(MEMLEAK)) {
-        cmd.append(isLiveHeapSizeTrackingEnabled(configProvider) ? 'L' : 'l');
-        cmd.append(':')
-            .append(String.format("%.2f", getLiveHeapSamplePercent(configProvider) / 100.0d));
-      }
-    }
-    if (profilingModes.contains(NATIVEMEM)) {
-      // native memory (malloc) profiling is enabled
-      cmd.append(",nativemem=").append(getNativeMemoryInterval(configProvider));
-    }
-    if (profilingModes.contains(NATIVESOCKET)) {
-      // native socket I/O profiling is enabled
-      String interval = getNativeSocketInterval(configProvider);
-      cmd.append(",natsock");
-      if (interval != null && !interval.isEmpty()) {
-        cmd.append('=').append(interval);
-      }
-    }
-    String cmdString = cmd.toString();
-    log.debug("Datadog profiler command line: {}", cmdString);
-    return cmdString;
-  }
-
-  public void recordTraceRoot(long rootSpanId, String endpoint, String operation) {
-    if (!profiler.recordTraceRoot(rootSpanId, endpoint, operation, MAX_NUM_ENDPOINTS)) {
-      log.debug(
-          "Endpoint event not written because more than {} distinct endpoints have been encountered."
-              + " This avoids excessive memory overhead.",
-          MAX_NUM_ENDPOINTS);
-    }
-  }
-
-  public int operationNameOffset() {
-    return offsetOf(OPERATION);
-  }
-
-  public int resourceNameOffset() {
-    return offsetOf(RESOURCE);
-  }
-
-  public int offsetOf(String attribute) {
-    return contextSetter.offsetOf(attribute);
-  }
-
-  /**
-   * Combined per-activation write: full trace/span context plus the span-derived operation and
-   * resource attributes, in a single native call, followed by a reapply of app-managed attributes
-   * (the native call resets all custom slots). A negative attribute offset (or null value) skips
-   * that attribute.
-   */
-  public void setTraceContext(
-      long rootSpanId,
-      long spanId,
-      long traceIdHigh,
-      long traceIdLow,
-      int operationOffset,
-      CharSequence operationName,
-      int resourceOffset,
-      CharSequence resourceName) {
-    if (spanId == 0) {
-      // The native setTraceContext is the activation path and rejects a zero span with
-      // IllegalArgumentException — which the catch below would swallow, leaving the previous
-      // span's context stale on this thread. Span ids are non-zero by construction
-      // (IdGenerationStrategy never returns 0; DDSpanId.ZERO means "no span"), so a zero here is
-      // not expected; degrade to a clean clear rather than a silently-swallowed throw over stale
-      // state.
-      clearTraceContext();
-      return;
-    }
-    debugLogging(rootSpanId);
-    try {
-      profiler.setTraceContext(
-          rootSpanId,
-          spanId,
-          traceIdHigh,
-          traceIdLow,
-          operationOffset,
-          operationName,
-          resourceOffset,
-          resourceName);
-    } catch (Throwable e) {
-      log.debug("Failed to set trace context", e);
-    }
-    // Skip operationOffset/resourceOffset: setTraceContext just wrote the span-derived values
-    // there natively. If profiling.context.attributes also names _dd.trace.operation/resource,
-    // that offset is app-owned too (see isAppOffset); reapplying it here would immediately
-    // overwrite the fresh span-derived value with a stale app-recorded one.
-    reapplyAppContext(operationOffset, resourceOffset);
-  }
-
-  /** Per-deactivation clear; reapplies app-managed attributes afterwards (see setTraceContext). */
-  public void clearTraceContext() {
-    debugLogging(0L);
-    try {
-      profiler.clearTraceContext();
-    } catch (Throwable e) {
-      log.debug("Failed to clear trace context", e);
-    }
-    reapplyAppContext();
-  }
-
-  public void setSpanContext(long rootSpanId, long spanId, long traceIdHigh, long traceIdLow) {
-    setTraceContext(rootSpanId, spanId, traceIdHigh, traceIdLow, -1, null, -1, null);
-  }
-
-  public void clearSpanContext() {
-    clearTraceContext();
-  }
-
-  public boolean setContextValue(int offset, String value) {
-    if (offset >= 0 && value != null) {
-      try {
-        // Native call first; snapshot updated only on success so Java and ddprof state stay in
-        // sync.
-        if (profiler.setContextValue(offset, value)) {
-          recordAppContextValue(offset, value);
-          return true;
-        }
-        // Rejected (e.g. >255-byte UTF-8, dictionary full): the native call already cleared this
-        // slot. Restore it from the still-current Java snapshot so a rejected write doesn't blank
-        // the attribute until the next span boundary.
+    @Nullable
+    public OngoingRecording start() {
+        log.debug("Starting profiling");
+        try {
+            return new DatadogProfilerRecording(this);
+        } catch (IOException | IllegalStateException e) {
+            log.debug("Failed to start Datadog profiler recording", e);
+            return null;
+        }
+    }
+
+    @Nullable
+    public RecordingData stop(OngoingRecording recording) {
+        log.debug("Stopping profiling");
+        return recording.stop();
+    }
+
+    /** A call-back from {@linkplain DatadogProfilerRecording#stop()} */
+    void stopProfiler() {
+        if (recordingFlag.compareAndSet(true, false)) {
+            profiler.stop();
+            if (isActive()) {
+                log.debug("Profiling is still active. Waiting to stop.");
+                while (isActive()) {
+                    LockSupport.parkNanos(10_000_000L);
+                }
+            }
+        }
+    }
+
+    public Set<ProfilingMode> enabledModes() {
+        return profilingModes;
+    }
+
+    public boolean isActive() {
+        try {
+            String status = executeProfilerCmd("status");
+            log.debug("Datadog Profiler Status = {}", status);
+            return !status.contains("not active");
+        } catch (IOException ignored) {
+        }
+        return false;
+    }
+
+    String executeProfilerCmd(String cmd) throws IOException {
+        return profiler.execute(cmd);
+    }
+
+    Path newSnapshotFile() throws IOException {
+        return Files.createTempFile(recordingsPath, "dd-profiler-snapshot-", ".jfr");
+    }
+
+    Path newRecording() throws IOException, IllegalStateException {
+        if (recordingFlag.compareAndSet(false, true)) {
+            Path recFile = Files.createTempFile(recordingsPath, "dd-profiler-", ".jfr");
+            String cmd = cmdStartProfiling(recFile);
+            try {
+                String rslt = executeProfilerCmd(cmd);
+                log.debug("DatadogProfiler.execute({}) = {}", cmd, rslt);
+            } catch (IOException | IllegalStateException e) {
+                if (log.isDebugEnabled()) {
+                    log.warn("Unable to start Datadog profiler recording", e);
+                } else {
+                    log.warn("Unable to start Datadog profiler recording: {}", e.getMessage());
+                }
+                recordingFlag.set(false);
+                throw e;
+            }
+            return recFile;
+        }
+        throw new IllegalStateException("Datadog profiler session has already been started");
+    }
+
+    void dump(Path path) {
+        profiler.dump(path);
+    }
+
+    String cmdStartProfiling(Path file) throws IllegalStateException {
+        // 'start' = start, 'jfr=7' = store in JFR format ready for concatenation
+        int safemode = getSafeMode(configProvider);
+        if (safemode != ProfilingConfig.PROFILING_DATADOG_PROFILER_SAFEMODE_DEFAULT) {
+            // be very vocal about messing around with the profiler safemode as it may induce crashes
+            log.warn(
+                    "Datadog profiler safemode is enabled with overridden value {}. "
+                            + "This is not recommended and may cause instability and crashes.",
+                    safemode);
+        }
+        StringBuilder cmd = new StringBuilder("start,jfr");
+        cmd.append(",file=").append(file.toAbsolutePath());
+        cmd.append(",loglevel=").append(getLogLevel(configProvider));
+        cmd.append(",jstackdepth=").append(getStackDepth(configProvider));
+        cmd.append(",cstack=").append(getCStack(configProvider));
+        cmd.append(",safemode=").append(getSafeMode(configProvider));
+        cmd.append(",attributes=").append(String.join(";", orderedContextAttributes));
+        cmd.append(",generations=").append(isTrackingGenerations(configProvider));
+        if (omitLineNumbers(configProvider)) {
+            cmd.append(",linenumbers=f");
+        }
+
+        // Default is true
+        if (enableJMethodIDOptim(configProvider)) {
+            cmd.append(",fjmethodid=false");
+        }
+
+        if (profilingModes.contains(CPU)) {
+            // cpu profiling is enabled.
+            String schedulingEvent = getSchedulingEvent(configProvider);
+            if (schedulingEvent != null && !schedulingEvent.isEmpty()) {
+                // using a user-specified event, e.g. L1-dcache-load-misses
+                cmd.append(",event=").append(schedulingEvent);
+                int interval = getSchedulingEventInterval(configProvider);
+                if (interval > 0) {
+                    cmd.append(",interval=").append(interval);
+                }
+            } else {
+                // using cpu time schedule
+                int interval = getCpuInterval();
+                if (JavaVirtualMachine.isJ9())
+                    interval = interval == ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_INTERVAL_DEFAULT
+                            ? ProfilingConfig.PROFILING_DATADOG_PROFILER_J9_CPU_INTERVAL_DEFAULT
+                            : interval;
+                cmd.append(",cpu=").append(interval).append('m');
+            }
+        }
+        if (profilingModes.contains(WALL)) {
+            // wall profiling is enabled.
+            cmd.append(",wall=");
+            if (getWallCollapsing(configProvider)) {
+                cmd.append('~');
+            }
+            cmd.append(getWallInterval(configProvider)).append('m');
+            // ddprof quirk: if filter parameter is omitted, it defaults to "0" (enabled),
+            // not empty string (disabled). When enabled without tracing, no threads are added
+            // to the filter, resulting in zero samples. We must explicitly pass filter= (empty)
+            // to disable filtering and sample all threads.
+            if (getWallContextFilter(configProvider)) {
+                cmd.append(",filter=0");
+            } else {
+                cmd.append(",filter=");
+            }
+        }
+        cmd.append(",loglevel=").append(getLogLevel(configProvider));
+        if (profilingModes.contains(ALLOCATION) || profilingModes.contains(MEMLEAK)) {
+            // allocation profiling or live heap profiling is enabled
+            cmd.append(",memory=").append(getAllocationInterval(configProvider)).append('b');
+            cmd.append(':');
+            if (profilingModes.contains(ALLOCATION)) {
+                cmd.append('a');
+            }
+            if (profilingModes.contains(MEMLEAK)) {
+                cmd.append(isLiveHeapSizeTrackingEnabled(configProvider) ? 'L' : 'l');
+                cmd.append(':').append(String.format("%.2f", getLiveHeapSamplePercent(configProvider) / 100.0d));
+            }
+        }
+        if (profilingModes.contains(NATIVEMEM)) {
+            // native memory (malloc) profiling is enabled
+            cmd.append(",nativemem=").append(getNativeMemoryInterval(configProvider));
+        }
+        if (profilingModes.contains(NATIVESOCKET)) {
+            // native socket I/O profiling is enabled
+            String interval = getNativeSocketInterval(configProvider);
+            cmd.append(",natsock");
+            if (interval != null && !interval.isEmpty()) {
+                cmd.append('=').append(interval);
+            }
+        }
+        String cmdString = cmd.toString();
+        log.debug("Datadog profiler command line: {}", cmdString);
+        return cmdString;
+    }
+
+    public void recordTraceRoot(long rootSpanId, String endpoint, String operation) {
+        if (!profiler.recordTraceRoot(rootSpanId, endpoint, operation, MAX_NUM_ENDPOINTS)) {
+            log.debug(
+                    "Endpoint event not written because more than {} distinct endpoints have been encountered."
+                            + " This avoids excessive memory overhead.",
+                    MAX_NUM_ENDPOINTS);
+        }
+    }
+
+    public int operationNameOffset() {
+        return offsetOf(OPERATION);
+    }
+
+    public int resourceNameOffset() {
+        return offsetOf(RESOURCE);
+    }
+
+    public int offsetOf(String attribute) {
+        return contextSetter.offsetOf(attribute);
+    }
+
+    /**
+     * Combined per-activation write: full trace/span context plus the span-derived operation and
+     * resource attributes, in a single native call, followed by a reapply of app-managed attributes
+     * (the native call resets all custom slots). A negative attribute offset (or null value) skips
+     * that attribute.
+     */
+    public void setTraceContext(
+            long rootSpanId,
+            long spanId,
+            long traceIdHigh,
+            long traceIdLow,
+            int operationOffset,
+            CharSequence operationName,
+            int resourceOffset,
+            CharSequence resourceName) {
+        if (spanId == 0) {
+            // The native setTraceContext is the activation path and rejects a zero span with
+            // IllegalArgumentException — which the catch below would swallow, leaving the previous
+            // span's context stale on this thread. Span ids are non-zero by construction
+            // (IdGenerationStrategy never returns 0; DDSpanId.ZERO means "no span"), so a zero here is
+            // not expected; degrade to a clean clear rather than a silently-swallowed throw over stale
+            // state.
+            clearTraceContext();
+            return;
+        }
+        debugLogging(rootSpanId);
+        try {
+            profiler.setTraceContext(
+                    rootSpanId,
+                    spanId,
+                    traceIdHigh,
+                    traceIdLow,
+                    operationOffset,
+                    operationName,
+                    resourceOffset,
+                    resourceName);
+        } catch (Throwable e) {
+            log.debug("Failed to set trace context", e);
+        }
+        // Skip operationOffset/resourceOffset: setTraceContext just wrote the span-derived values
+        // there natively. If profiling.context.attributes also names _dd.trace.operation/resource,
+        // that offset is app-owned too (see isAppOffset); reapplying it here would immediately
+        // overwrite the fresh span-derived value with a stale app-recorded one.
+        reapplyAppContext(operationOffset, resourceOffset);
+    }
+
+    /** Per-deactivation clear; reapplies app-managed attributes afterwards (see setTraceContext). */
+    public void clearTraceContext() {
+        debugLogging(0L);
+        try {
+            profiler.clearTraceContext();
+        } catch (Throwable e) {
+            log.debug("Failed to clear trace context", e);
+        }
         reapplyAppContext();
-      } catch (Throwable e) {
-        log.debug("Failed to set context value", e);
-      }
-    }
-    return false;
-  }
-
-  public boolean setContextValue(String attribute, String value) {
-    if (contextSetter != null) {
-      return setContextValue(contextSetter.offsetOf(attribute), value);
-    }
-    return false;
-  }
-
-  public boolean clearContextValue(String attribute) {
-    if (contextSetter != null) {
-      return clearContextValue(contextSetter.offsetOf(attribute));
-    }
-    return false;
-  }
-
-  /**
-   * Clears the app-managed context attribute at {@code offset} on this thread (native slot plus the
-   * per-thread snapshot). The underlying native {@code clearContextValue} is best-effort and
-   * returns no status. No caller currently consumes the result; it is kept for symmetry with {@link
-   * #setContextValue(int, String)} and to signal an unconfigured/failed clear.
-   *
-   * @param offset the app-managed context-attribute slot to clear; a negative value (an
-   *     unconfigured attribute) is a no-op
-   * @return {@code true} if a valid, non-negative {@code offset} was cleared without error; {@code
-   *     false} if {@code offset} is negative or the native clear threw
-   */
-  public boolean clearContextValue(int offset) {
-    if (offset >= 0) {
-      try {
-        // Native call first; snapshot updated only after it returns so a throw leaves both sides
-        // consistent.
-        profiler.clearContextValue(offset);
-        recordAppContextValue(offset, null);
-        return true;
-      } catch (Throwable t) {
-        log.debug("Failed to clear context value", t);
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Re-applies this thread's application-managed context attributes after a span activation or
-   * deactivation. The native {@code setTraceContext}/{@code clearTraceContext} clears all custom
-   * attribute slots; this restores the app-owned ones so they remain visible during the new span's
-   * lifetime — or after the last span closes, since native {@code setContextValue} publishes the
-   * record (valid=1) even with no active span. No-op when no application attributes are configured
-   * or none have been set on this thread.
-   *
-   * <p>Per-slot native {@code setContextValue} calls (each resolved through the process-wide value
-   * cache, so no re-encoding on a hit). A single-JNI-call batch is a possible future optimization
-   * (java-profiler PROF-15361); per-slot is adequate for the typical small app-attribute count.
-   */
-  public void reapplyAppContext() {
-    reapplyAppContext(-1, -1);
-  }
-
-  /**
-   * Same as {@link #reapplyAppContext()}, but leaves {@code operationOffset}/{@code resourceOffset}
-   * alone. Used by {@link #setTraceContext} to avoid clobbering the operation/resource offsets it
-   * just wrote natively, in the edge case where those offsets are also app-owned (see {@link
-   * #isAppOffset}). Pass -1 for either argument to skip nothing.
-   */
-  private void reapplyAppContext(int operationOffset, int resourceOffset) {
-    if (!hasAppContext) {
-      return;
-    }
-    AppContextSnapshot snapshot = appContextValues.get();
-    if (snapshot == null) {
-      return;
-    }
-    try {
-      int remaining = snapshot.nonZeroCount();
-      for (int i = 0; i < isAppOffset.length && remaining > 0; i++) {
-        if (i == operationOffset || i == resourceOffset) {
-          continue;
-        }
-        String s = snapshot.stringAt(i);
-        if (s != null) {
-          profiler.setContextValue(i, s);
-          remaining--;
-        }
-      }
-    } catch (Throwable e) {
-      log.debug("Failed to reapply context", e);
-    }
-  }
-
-  /** Clears the per-thread app-context snapshot. Used in tests and internally. */
-  void clearAppContextSnapshot() {
-    appContextValues.remove();
-    scopeStack.remove();
-  }
-
-  /**
-   * Immediately writes {@code snapshot} into the ddprof native slots for every app-context offset,
-   * clearing any offset not present in the snapshot. Reads the restored state from the per-thread
-   * {@code appContextValues} TL (already updated by {@link #restoreAppContext}) rather than from
-   * the saved slot directly, because {@link ScopeStack#release()} resets the slot before this
-   * method is called. Called by {@link DatadogProfilingScope#close} so that native state matches
-   * the restored Java-side snapshot right away, without waiting for the next span activation.
-   */
-  void syncNativeAppContext() {
-    if (!hasAppContext) {
-      return;
-    }
-    AppContextSnapshot snapshot = appContextValues.get();
-    try {
-      for (int i = 0; i < isAppOffset.length; i++) {
-        if (!isAppOffset[i]) {
-          continue;
-        }
-        String value = snapshot != null ? snapshot.stringAt(i) : null;
-        if (value != null) {
-          profiler.setContextValue(i, value);
-        } else {
-          profiler.clearContextValue(i);
-        }
-      }
-    } catch (Throwable e) {
-      log.debug("Failed to sync native app context on scope close", e);
-    }
-  }
-
-  /**
-   * Returns a copy of the current app-context snapshot for later restoration, or {@code null} if
-   * nothing is set. Called by {@link DatadogProfilingScope} on construction to implement
-   * save/restore across scope boundaries.
-   */
-  AppContextSnapshot saveAppContext() {
-    AppContextSnapshot current = appContextValues.get();
-    if (current == null || current.isEmpty()) {
-      return null;
-    }
-    ScopeStack stack = scopeStack.get();
-    if (stack == null) {
-      stack = new ScopeStack(isAppOffset.length);
-      scopeStack.set(stack);
-    }
-    AppContextSnapshot slot = stack.borrow();
-    slot.copyFrom(current);
-    return slot;
-  }
-
-  /**
-   * Restores a previously saved app-context snapshot. If {@code saved} is {@code null} the
-   * ThreadLocal is removed, otherwise the current snapshot is overwritten with {@code saved}.
-   * Called by {@link DatadogProfilingScope#close()}.
-   */
-  void restoreAppContext(AppContextSnapshot saved) {
-    if (saved == null) {
-      appContextValues.remove();
-    } else {
-      AppContextSnapshot current = appContextValues.get();
-      if (current == null) {
-        current = new AppContextSnapshot(isAppOffset.length);
-        appContextValues.set(current);
-      }
-      current.copyFrom(saved);
-      ScopeStack stack = scopeStack.get();
-      if (stack != null) {
-        stack.release();
-      }
-    }
-  }
-
-  private void recordAppContextValue(int offset, String value) {
-    if (!hasAppContext || offset < 0 || offset >= isAppOffset.length || !isAppOffset[offset]) {
-      return;
-    }
-    AppContextSnapshot snapshot = appContextValues.get();
-    if (value == null) {
-      if (snapshot == null) {
-        return;
-      }
-      snapshot.clear(offset);
-      if (snapshot.isEmpty()) {
+    }
+
+    public void setSpanContext(long rootSpanId, long spanId, long traceIdHigh, long traceIdLow) {
+        setTraceContext(rootSpanId, spanId, traceIdHigh, traceIdLow, -1, null, -1, null);
+    }
+
+    public void clearSpanContext() {
+        clearTraceContext();
+    }
+
+    public boolean setContextValue(int offset, String value) {
+        if (offset >= 0 && value != null) {
+            try {
+                // Native call first; snapshot updated only on success so Java and ddprof state stay in
+                // sync.
+                if (profiler.setContextValue(offset, value)) {
+                    recordAppContextValue(offset, value);
+                    return true;
+                }
+                // Rejected (e.g. >255-byte UTF-8, dictionary full): the native call already cleared this
+                // slot. Restore it from the still-current Java snapshot so a rejected write doesn't blank
+                // the attribute until the next span boundary.
+                reapplyAppContext();
+            } catch (Throwable e) {
+                log.debug("Failed to set context value", e);
+            }
+        }
+        return false;
+    }
+
+    public boolean setContextValue(String attribute, String value) {
+        if (contextSetter != null) {
+            return setContextValue(contextSetter.offsetOf(attribute), value);
+        }
+        return false;
+    }
+
+    public boolean clearContextValue(String attribute) {
+        if (contextSetter != null) {
+            return clearContextValue(contextSetter.offsetOf(attribute));
+        }
+        return false;
+    }
+
+    /**
+     * Clears the app-managed context attribute at {@code offset} on this thread (native slot plus the
+     * per-thread snapshot). The underlying native {@code clearContextValue} is best-effort and
+     * returns no status. No caller currently consumes the result; it is kept for symmetry with {@link
+     * #setContextValue(int, String)} and to signal an unconfigured/failed clear.
+     *
+     * @param offset the app-managed context-attribute slot to clear; a negative value (an
+     *     unconfigured attribute) is a no-op
+     * @return {@code true} if a valid, non-negative {@code offset} was cleared without error; {@code
+     *     false} if {@code offset} is negative or the native clear threw
+     */
+    public boolean clearContextValue(int offset) {
+        if (offset >= 0) {
+            try {
+                // Native call first; snapshot updated only after it returns so a throw leaves both sides
+                // consistent.
+                profiler.clearContextValue(offset);
+                recordAppContextValue(offset, null);
+                return true;
+            } catch (Throwable t) {
+                log.debug("Failed to clear context value", t);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Re-applies this thread's application-managed context attributes after a span activation or
+     * deactivation. The native {@code setTraceContext}/{@code clearTraceContext} clears all custom
+     * attribute slots; this restores the app-owned ones so they remain visible during the new span's
+     * lifetime — or after the last span closes, since native {@code setContextValue} publishes the
+     * record (valid=1) even with no active span. No-op when no application attributes are configured
+     * or none have been set on this thread.
+     *
+     * <p>Per-slot native {@code setContextValue} calls (each resolved through the process-wide value
+     * cache, so no re-encoding on a hit). A single-JNI-call batch is a possible future optimization
+     * (java-profiler PROF-15361); per-slot is adequate for the typical small app-attribute count.
+     */
+    public void reapplyAppContext() {
+        reapplyAppContext(-1, -1);
+    }
+
+    /**
+     * Same as {@link #reapplyAppContext()}, but leaves {@code operationOffset}/{@code resourceOffset}
+     * alone. Used by {@link #setTraceContext} to avoid clobbering the operation/resource offsets it
+     * just wrote natively, in the edge case where those offsets are also app-owned (see {@link
+     * #isAppOffset}). Pass -1 for either argument to skip nothing.
+     */
+    private void reapplyAppContext(int operationOffset, int resourceOffset) {
+        if (!hasAppContext) {
+            return;
+        }
+        AppContextSnapshot snapshot = appContextValues.get();
+        if (snapshot == null) {
+            return;
+        }
+        try {
+            int remaining = snapshot.nonZeroCount();
+            for (int i = 0; i < isAppOffset.length && remaining > 0; i++) {
+                if (i == operationOffset || i == resourceOffset) {
+                    continue;
+                }
+                String s = snapshot.stringAt(i);
+                if (s != null) {
+                    profiler.setContextValue(i, s);
+                    remaining--;
+                }
+            }
+        } catch (Throwable e) {
+            log.debug("Failed to reapply context", e);
+        }
+    }
+
+    /** Clears the per-thread app-context snapshot. Used in tests and internally. */
+    void clearAppContextSnapshot() {
         appContextValues.remove();
-      }
-      return;
-    }
-    if (snapshot == null) {
-      snapshot = new AppContextSnapshot(isAppOffset.length);
-      appContextValues.set(snapshot);
-    }
-    // Reapply resolves the value → encoding via the process-wide cache, so the snapshot only needs
-    // the String value.
-    if (!value.equals(snapshot.stringAt(offset))) {
-      snapshot.record(offset, value);
-    }
-  }
-
-  private void debugLogging(long localRootSpanId) {
-    if (detailedDebugLogging && log.isDebugEnabled()) {
-      log.debug("localRootSpanId={}", localRootSpanId, new Throwable());
-    }
-  }
-
-  public int[] snapshot() {
-    int n = isAppOffset.length;
-    if (n == 0) {
-      return EMPTY;
-    }
-    // Native read of the current thread's sidecar tag encodings; does not reset the record.
-    int[] tags = new int[n];
-    profiler.copyContextTags(tags);
-    return tags;
-  }
-
-  public void recordSetting(String name, String value) {
-    profiler.recordSetting(name, value);
-  }
-
-  public void recordSetting(String name, String value, String unit) {
-    profiler.recordSetting(name, value, unit);
-  }
-
-  public QueueTimeTracker newQueueTimeTracker() {
-    return new QueueTimeTracker(this, profiler.getCurrentTicks());
-  }
-
-  boolean shouldRecordQueueTimeEvent(long startMillis) {
-    return System.currentTimeMillis() - startMillis >= queueTimeThresholdMillis;
-  }
-
-  void recordQueueTimeEvent(
-      long startTicks,
-      Object task,
-      Class<?> scheduler,
-      Class<?> queueType,
-      int queueLength,
-      Thread origin) {
-    if (profiler != null) {
-      // note: because this type traversal can update secondary_super_cache (see JDK-8180450)
-      // we avoid doing this unless we are absolutely certain we will record the event
-      Class<?> taskType = TaskWrapper.getUnwrappedType(task);
-      if (taskType != null) {
-        long endTicks = profiler.getCurrentTicks();
-        profiler.recordQueueTime(
-            startTicks, endTicks, taskType, scheduler, queueType, queueLength, origin);
-      }
-    }
-  }
+        scopeStack.remove();
+    }
+
+    /**
+     * Immediately writes {@code snapshot} into the ddprof native slots for every app-context offset,
+     * clearing any offset not present in the snapshot. Reads the restored state from the per-thread
+     * {@code appContextValues} TL (already updated by {@link #restoreAppContext}) rather than from
+     * the saved slot directly, because {@link ScopeStack#release()} resets the slot before this
+     * method is called. Called by {@link DatadogProfilingScope#close} so that native state matches
+     * the restored Java-side snapshot right away, without waiting for the next span activation.
+     */
+    void syncNativeAppContext() {
+        if (!hasAppContext) {
+            return;
+        }
+        AppContextSnapshot snapshot = appContextValues.get();
+        try {
+            for (int i = 0; i < isAppOffset.length; i++) {
+                if (!isAppOffset[i]) {
+                    continue;
+                }
+                String value = snapshot != null ? snapshot.stringAt(i) : null;
+                if (value != null) {
+                    profiler.setContextValue(i, value);
+                } else {
+                    profiler.clearContextValue(i);
+                }
+            }
+        } catch (Throwable e) {
+            log.debug("Failed to sync native app context on scope close", e);
+        }
+    }
+
+    /**
+     * Returns a copy of the current app-context snapshot for later restoration, or {@code null} if
+     * nothing is set. Called by {@link DatadogProfilingScope} on construction to implement
+     * save/restore across scope boundaries.
+     */
+    AppContextSnapshot saveAppContext() {
+        AppContextSnapshot current = appContextValues.get();
+        if (current == null || current.isEmpty()) {
+            return null;
+        }
+        ScopeStack stack = scopeStack.get();
+        if (stack == null) {
+            stack = new ScopeStack(isAppOffset.length);
+            scopeStack.set(stack);
+        }
+        AppContextSnapshot slot = stack.borrow();
+        slot.copyFrom(current);
+        return slot;
+    }
+
+    /**
+     * Restores a previously saved app-context snapshot. If {@code saved} is {@code null} the
+     * ThreadLocal is removed, otherwise the current snapshot is overwritten with {@code saved}.
+     * Called by {@link DatadogProfilingScope#close()}.
+     */
+    void restoreAppContext(AppContextSnapshot saved) {
+        if (saved == null) {
+            appContextValues.remove();
+        } else {
+            AppContextSnapshot current = appContextValues.get();
+            if (current == null) {
+                current = new AppContextSnapshot(isAppOffset.length);
+                appContextValues.set(current);
+            }
+            current.copyFrom(saved);
+            ScopeStack stack = scopeStack.get();
+            if (stack != null) {
+                stack.release();
+            }
+        }
+    }
+
+    private void recordAppContextValue(int offset, String value) {
+        if (!hasAppContext || offset < 0 || offset >= isAppOffset.length || !isAppOffset[offset]) {
+            return;
+        }
+        AppContextSnapshot snapshot = appContextValues.get();
+        if (value == null) {
+            if (snapshot == null) {
+                return;
+            }
+            snapshot.clear(offset);
+            if (snapshot.isEmpty()) {
+                appContextValues.remove();
+            }
+            return;
+        }
+        if (snapshot == null) {
+            snapshot = new AppContextSnapshot(isAppOffset.length);
+            appContextValues.set(snapshot);
+        }
+        // Reapply resolves the value → encoding via the process-wide cache, so the snapshot only needs
+        // the String value.
+        if (!value.equals(snapshot.stringAt(offset))) {
+            snapshot.record(offset, value);
+        }
+    }
+
+    private void debugLogging(long localRootSpanId) {
+        if (detailedDebugLogging && log.isDebugEnabled()) {
+            log.debug("localRootSpanId={}", localRootSpanId, new Throwable());
+        }
+    }
+
+    public int[] snapshot() {
+        int n = isAppOffset.length;
+        if (n == 0) {
+            return EMPTY;
+        }
+        // Native read of the current thread's sidecar tag encodings; does not reset the record.
+        int[] tags = new int[n];
+        profiler.copyContextTags(tags);
+        return tags;
+    }
+
+    public void recordSetting(String name, String value) {
+        profiler.recordSetting(name, value);
+    }
+
+    public void recordSetting(String name, String value, String unit) {
+        profiler.recordSetting(name, value, unit);
+    }
+
+    public QueueTimeTracker newQueueTimeTracker() {
+        return new QueueTimeTracker(this, profiler.getCurrentTicks());
+    }
+
+    boolean shouldRecordQueueTimeEvent(long startMillis) {
+        return System.currentTimeMillis() - startMillis >= queueTimeThresholdMillis;
+    }
+
+    void recordQueueTimeEvent(
+            long startTicks, Object task, Class<?> scheduler, Class<?> queueType, int queueLength, Thread origin) {
+        if (profiler != null) {
+            // note: because this type traversal can update secondary_super_cache (see JDK-8180450)
+            // we avoid doing this unless we are absolutely certain we will record the event
+            Class<?> taskType = TaskWrapper.getUnwrappedType(task);
+            if (taskType != null) {
+                long endTicks = profiler.getCurrentTicks();
+                profiler.recordQueueTime(startTicks, endTicks, taskType, scheduler, queueType, queueLength, origin);
+            }
+        }
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerConfig.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerConfig.java
index b54b069fe55..05577301c1a 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerConfig.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerConfig.java
@@ -73,435 +73,406 @@
 import org.slf4j.LoggerFactory;
 
 public class DatadogProfilerConfig {
-  private static final Logger log = LoggerFactory.getLogger(DatadogProfilerConfig.class);
-
-  public static boolean isCpuProfilerEnabled(ConfigProvider configProvider) {
-    return getBoolean(
-        configProvider,
-        PROFILING_DATADOG_PROFILER_CPU_ENABLED,
-        PROFILING_DATADOG_PROFILER_CPU_ENABLED_DEFAULT);
-  }
-
-  public static String getLibPath(ConfigProvider configProvider) {
-    return getString(configProvider, PROFILING_DATADOG_PROFILER_LIBPATH);
-  }
-
-  public static String getLibPath() {
-    return getLibPath(ConfigProvider.getInstance());
-  }
-
-  public static boolean isCpuProfilerEnabled() {
-    return isCpuProfilerEnabled(ConfigProvider.getInstance());
-  }
-
-  public static int getCpuInterval(ConfigProvider configProvider) {
-    return getInteger(
-        configProvider,
-        PROFILING_DATADOG_PROFILER_CPU_INTERVAL,
-        PROFILING_DATADOG_PROFILER_CPU_INTERVAL_DEFAULT);
-  }
-
-  public static int getCpuInterval() {
-    return getCpuInterval(ConfigProvider.getInstance());
-  }
-
-  public static String getSchedulingEvent(ConfigProvider configProvider) {
-    return getString(configProvider, PROFILING_DATADOG_PROFILER_SCHEDULING_EVENT);
-  }
-
-  public static String getSchedulingEvent() {
-    return getSchedulingEvent(ConfigProvider.getInstance());
-  }
-
-  public static int getSchedulingEventInterval(ConfigProvider configProvider) {
-    return getInteger(configProvider, PROFILING_DATADOG_PROFILER_SCHEDULING_EVENT_INTERVAL);
-  }
-
-  public static int getSchedulingEventInterval() {
-    return getSchedulingEventInterval(ConfigProvider.getInstance());
-  }
-
-  public static boolean isWallClockProfilerEnabled() {
-    return isWallClockProfilerEnabled(ConfigProvider.getInstance());
-  }
-
-  public static boolean isWallClockProfilerEnabled(ConfigProvider configProvider) {
-    boolean isUltraMinimal = getBoolean(configProvider, PROFILING_ULTRA_MINIMAL, false);
-    boolean isTracingEnabled = configProvider.getBoolean(TRACE_ENABLED, true);
-    boolean disableUnlessOptedIn = isUltraMinimal || !isTracingEnabled || isJ9();
-    boolean enabledByDefault = !disableUnlessOptedIn;
-    return getBoolean(configProvider, PROFILING_DATADOG_PROFILER_WALL_ENABLED, enabledByDefault);
-  }
-
-  public static int getWallInterval(ConfigProvider configProvider) {
-    return getInteger(
-        configProvider,
-        PROFILING_DATADOG_PROFILER_WALL_INTERVAL,
-        PROFILING_DATADOG_PROFILER_WALL_INTERVAL_DEFAULT);
-  }
-
-  public static int getWallInterval() {
-    return getWallInterval(ConfigProvider.getInstance());
-  }
-
-  public static boolean getWallCollapsing(ConfigProvider configProvider) {
-    return getBoolean(
-        configProvider,
-        PROFILING_DATADOG_PROFILER_WALL_COLLAPSING,
-        PROFILING_DATADOG_PROFILER_WALL_COLLAPSING_DEFAULT);
-  }
-
-  /**
-   * Checks whether the wall-clock context filter should be used.<br>
-   * The context filter will make wall-clock profiler to pick candidate threads only from threads
-   * with attached tracing context.<br>
-   * If context filter is not used (this method returns {@literal false}) all threads will be
-   * considered for wallclock sampling.
-   *
-   * @param configProvider the associated config provider
-   * @return {@literal true} if the wallclock sampler should use context filtering, {@literal false}
-   *     otherwise
-   */
-  public static boolean getWallContextFilter(ConfigProvider configProvider) {
-    // Context filtering requires tracing to be enabled - without tracing,
-    // there are no span contexts to filter on, so threads would never be added
-    // to the filter, resulting in no walltime samples.
-    boolean isTracingEnabled = configProvider.getBoolean(TRACE_ENABLED, true);
-    if (!isTracingEnabled) {
-      return false;
-    }
-    return getBoolean(
-        configProvider,
-        PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER,
-        PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER_DEFAULT);
-  }
-
-  static boolean isJmethodIDSafe() {
-    return ProfilingSupport.isJmethodIDSafe();
-  }
-
-  static boolean isMemoryLeakProfilingSafe() {
-    return ProfilingSupport.isLiveHeapProfilingSafe();
-  }
-
-  public static boolean isAllocationProfilingEnabled(ConfigProvider configProvider) {
-    // JVMTI Allocation Sampler is available since Java 11
-    if (JavaVirtualMachine.isJavaVersionAtLeast(11)) {
-      boolean dflt = isJmethodIDSafe();
-      boolean enableDdprofAlloc =
-          getBoolean(
-              configProvider,
-              PROFILING_ALLOCATION_ENABLED,
-              dflt,
-              PROFILING_DATADOG_PROFILER_ALLOC_ENABLED);
-
-      if (!dflt && enableDdprofAlloc) {
-        log.warn(
-            "Allocation profiling was enabled although it is not considered stable on this JVM version.");
-      }
-      return enableDdprofAlloc;
-    }
-    return false;
-  }
-
-  public static boolean isAllocationProfilingEnabled() {
-    return isAllocationProfilingEnabled(ConfigProvider.getInstance());
-  }
-
-  public static int getAllocationInterval(ConfigProvider configProvider) {
-    return getInteger(
-        configProvider,
-        PROFILING_DATADOG_PROFILER_ALLOC_INTERVAL,
-        PROFILING_DATADOG_PROFILER_ALLOC_INTERVAL_DEFAULT);
-  }
-
-  public static int getAllocationInterval() {
-    return getAllocationInterval(ConfigProvider.getInstance());
-  }
-
-  public static boolean isMemoryLeakProfilingEnabled(ConfigProvider configProvider) {
-    boolean unifiedEnabled =
-        configProvider.getBoolean(PROFILING_HEAP_ENABLED, isMemoryLeakProfilingSafe());
-    if (!unifiedEnabled) {
-      return false;
-    }
-    // JVMTI Allocation Sampler is required for ddprof live heap and is available since Java 11.
-    // isJmethodIDSafe() alone is not sufficient — Java 8 is jmethodID-safe but lacks the sampler.
-    boolean isSafe = JavaVirtualMachine.isJavaVersionAtLeast(11) && isJmethodIDSafe();
-    boolean enableDdprofMemleak =
-        getBoolean(
-            configProvider,
-            PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED,
-            isSafe,
-            PROFILING_DATADOG_PROFILER_MEMLEAK_ENABLED);
-    if (!isSafe && enableDdprofMemleak) {
-      log.warn(
-          "Live heap profiling (ddprof) was enabled although it is not considered stable"
-              + " on this JVM version.");
-    }
-    if (!enableDdprofMemleak && !isOldObjectSampleAvailable()) {
-      log.warn(
-          "ddprof live heap profiling is disabled and JFR OldObjectSample is not available"
-              + " on this JVM. Live heap profiling will be inactive.");
-    }
-    return enableDdprofMemleak;
-  }
-
-  public static boolean isMemoryLeakProfilingEnabled() {
-    return isMemoryLeakProfilingEnabled(ConfigProvider.getInstance());
-  }
-
-  public static boolean isLiveHeapSizeTrackingEnabled(ConfigProvider configProvider) {
-    return getBoolean(
-        configProvider,
-        PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE,
-        PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE_DEFAFULT);
-  }
-
-  public static int getLiveHeapSamplePercent(ConfigProvider configProvider) {
-    return getInteger(
-        configProvider,
-        PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT,
-        PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT_DEFAULT);
-  }
-
-  public static long getMemleakInterval(ConfigProvider configProvider) {
-    long maxheap = ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax();
-    long memleakIntervalDefault =
-        maxheap <= 0 ? 1024 * 1024 : maxheap / Math.max(1, getMemleakCapacity());
-    return getLong(
-        configProvider,
-        PROFILING_DATADOG_PROFILER_LIVEHEAP_INTERVAL,
-        memleakIntervalDefault,
-        PROFILING_DATADOG_PROFILER_MEMLEAK_INTERVAL);
-  }
-
-  public static long getMemleakInterval() {
-    return getMemleakInterval(ConfigProvider.getInstance());
-  }
-
-  public static int getMemleakCapacity(ConfigProvider configProvider) {
-    return clamp(
-        0,
-        // see
-        // https://github.com/DataDog/java-profiler/blob/main/ddprof-lib/src/main/cpp/livenessTracker.h#L54
-        8192,
-        getInteger(
-            configProvider,
-            PROFILING_DATADOG_PROFILER_LIVEHEAP_CAPACITY,
-            PROFILING_DATADOG_PROFILER_LIVEHEAP_CAPACITY_DEFAULT,
-            PROFILING_DATADOG_PROFILER_MEMLEAK_CAPACITY));
-  }
-
-  public static int getMemleakCapacity() {
-    return getMemleakCapacity(ConfigProvider.getInstance());
-  }
-
-  public static boolean isNativeMemoryProfilingEnabled(ConfigProvider configProvider) {
-    // nativemem never shipped under the legacy '.async.' naming, so it has no async-translated
-    // form to fall back to — call the provider directly instead of the ddprof->async helper.
-    return configProvider.getBoolean(
-        PROFILING_DATADOG_PROFILER_NATIVEMEM_ENABLED,
-        PROFILING_DATADOG_PROFILER_NATIVEMEM_ENABLED_DEFAULT);
-  }
-
-  public static boolean isNativeMemoryProfilingEnabled() {
-    return isNativeMemoryProfilingEnabled(ConfigProvider.getInstance());
-  }
-
-  public static int getNativeMemoryInterval(ConfigProvider configProvider) {
-    // nativemem never shipped under the legacy '.async.' naming, so it has no async-translated
-    // form to fall back to — call the provider directly instead of the ddprof->async helper.
-    return configProvider.getInteger(
-        PROFILING_DATADOG_PROFILER_NATIVEMEM_INTERVAL,
-        PROFILING_DATADOG_PROFILER_NATIVEMEM_INTERVAL_DEFAULT);
-  }
-
-  public static int getNativeMemoryInterval() {
-    return getNativeMemoryInterval(ConfigProvider.getInstance());
-  }
-
-  public static boolean isNativeSocketProfilingEnabled(ConfigProvider configProvider) {
-    // natsock never shipped under the legacy '.async.' naming, so it has no async-translated
-    // form to fall back to — call the provider directly instead of the ddprof->async helper.
-    return configProvider.getBoolean(
-        PROFILING_DATADOG_PROFILER_NATIVESOCKET_ENABLED,
-        PROFILING_DATADOG_PROFILER_NATIVESOCKET_ENABLED_DEFAULT);
-  }
-
-  public static boolean isNativeSocketProfilingEnabled() {
-    return isNativeSocketProfilingEnabled(ConfigProvider.getInstance());
-  }
-
-  public static String getNativeSocketInterval(ConfigProvider configProvider) {
-    // natsock never shipped under the legacy '.async.' naming, so it has no async-translated
-    // form to fall back to — call the provider directly instead of the ddprof->async helper.
-    return configProvider.getString(PROFILING_DATADOG_PROFILER_NATIVESOCKET_INTERVAL);
-  }
-
-  public static String getNativeSocketInterval() {
-    return getNativeSocketInterval(ConfigProvider.getInstance());
-  }
-
-  public static int getStackDepth(ConfigProvider configProvider) {
-    return getInteger(
-        configProvider,
-        PROFILING_STACKDEPTH,
-        PROFILING_STACKDEPTH_DEFAULT,
-        PROFILING_DATADOG_PROFILER_STACKDEPTH);
-  }
-
-  public static int getStackDepth() {
-    return getStackDepth(ConfigProvider.getInstance());
-  }
-
-  public static int getSafeMode(ConfigProvider configProvider) {
-    return getInteger(
-        configProvider,
-        PROFILING_DATADOG_PROFILER_SAFEMODE,
-        PROFILING_DATADOG_PROFILER_SAFEMODE_DEFAULT);
-  }
-
-  public static int getSafeMode() {
-    return getSafeMode(ConfigProvider.getInstance());
-  }
-
-  public static String getCStack(ConfigProvider configProvider) {
-    String cstack =
-        getString(
-            configProvider,
-            PROFILING_DATADOG_PROFILER_CSTACK,
-            PROFILING_DATADOG_PROFILER_CSTACK_DEFAULT);
-    if (cstack.startsWith("vm") && !(JavaVirtualMachine.isHotspot())) {
-      // can't use the VM stackwalking on non-hotspot VMs
-      // fall-back to 'dwarf' unwinding
-      cstack = "dwarf";
-    }
-    return cstack;
-  }
-
-  public static boolean isEndpointTrackingEnabled() {
-    return isEndpointTrackingEnabled(ConfigProvider.getInstance());
-  }
-
-  public static boolean isEndpointTrackingEnabled(ConfigProvider configProvider) {
-    return getBoolean(
-        configProvider,
-        ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED,
-        ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED_DEFAULT);
-  }
-
-  public static boolean isQueueTimeEnabled() {
-    return isQueueTimeEnabled(ConfigProvider.getInstance());
-  }
-
-  public static boolean isQueueTimeEnabled(ConfigProvider configProvider) {
-    return getBoolean(
-        configProvider, PROFILING_QUEUEING_TIME_ENABLED, PROFILING_QUEUEING_TIME_ENABLED_DEFAULT);
-  }
-
-  public static String getCStack() {
-    return getCStack(ConfigProvider.getInstance());
-  }
-
-  public static boolean omitLineNumbers(ConfigProvider configProvider) {
-    return !getBoolean(
-        configProvider,
-        PROFILING_DATADOG_PROFILER_LINE_NUMBERS,
-        PROFILING_DATADOG_PROFILER_LINE_NUMBERS_DEFAULT);
-  }
-
-  private static int clamp(int min, int max, int value) {
-    return Math.max(min, Math.min(max, value));
-  }
-
-  public static String getLogLevel(ConfigProvider configProvider) {
-    return getString(
-        configProvider,
-        PROFILING_DATADOG_PROFILER_LOG_LEVEL,
-        PROFILING_DATADOG_PROFILER_LOG_LEVEL_DEFAULT);
-  }
-
-  public static String getLogLevel() {
-    return getLogLevel(ConfigProvider.getInstance());
-  }
-
-  public static Set<String> getContextAttributes(ConfigProvider configProvider) {
-    return configProvider.getSet(PROFILING_CONTEXT_ATTRIBUTES, Collections.emptySet());
-  }
-
-  public static boolean isQueueingTimeEnabled() {
-    return isQueueingTimeEnabled(ConfigProvider.getInstance());
-  }
-
-  public static boolean isQueueingTimeEnabled(ConfigProvider configProvider) {
-    return configProvider.getBoolean(
-        PROFILING_QUEUEING_TIME_ENABLED, PROFILING_QUEUEING_TIME_ENABLED_DEFAULT);
-  }
-
-  public static boolean isSpanNameContextAttributeEnabled() {
-    return isSpanNameContextAttributeEnabled(ConfigProvider.getInstance());
-  }
-
-  public static boolean isSpanNameContextAttributeEnabled(ConfigProvider configProvider) {
-    return configProvider.getBoolean(PROFILING_CONTEXT_ATTRIBUTES_SPAN_NAME_ENABLED, true);
-  }
-
-  public static boolean isResourceNameContextAttributeEnabled(ConfigProvider configProvider) {
-    return configProvider.getBoolean(PROFILING_CONTEXT_ATTRIBUTES_RESOURCE_NAME_ENABLED, false);
-  }
-
-  public static boolean isTrackingGenerations(ConfigProvider configProvider) {
-    return getBoolean(
-        configProvider, PROFILING_HEAP_TRACK_GENERATIONS, PROFILING_HEAP_TRACK_GENERATIONS_DEFAULT);
-  }
-
-  public static String getString(ConfigProvider configProvider, String key, String defaultValue) {
-    return configProvider.getString(key, configProvider.getString(normalizeKey(key), defaultValue));
-  }
-
-  public static String getString(ConfigProvider configProvider, String key) {
-    return configProvider.getString(key, configProvider.getString(normalizeKey(key)));
-  }
-
-  public static boolean getBoolean(
-      ConfigProvider configProvider, String key, boolean defaultValue, String... aliases) {
-    return configProvider.getBoolean(
-        key, configProvider.getBoolean(normalizeKey(key), defaultValue), aliases);
-  }
-
-  public static boolean getBoolean(ConfigProvider configProvider, String key) {
-    return configProvider.getBoolean(key, configProvider.getBoolean(normalizeKey(key), false));
-  }
-
-  public static int getInteger(
-      ConfigProvider configProvider, String key, int defaultValue, String... aliases) {
-    return configProvider.getInteger(
-        key, configProvider.getInteger(normalizeKey(key), defaultValue), aliases);
-  }
-
-  public static int getInteger(ConfigProvider configProvider, String key) {
-    return configProvider.getInteger(key, configProvider.getInteger(normalizeKey(key), -1));
-  }
-
-  public static long getLong(
-      ConfigProvider configProvider, String key, long defaultValue, String... aliases) {
-    return configProvider.getLong(
-        key, configProvider.getLong(normalizeKey(key), defaultValue), aliases);
-  }
-
-  public static long getLong(ConfigProvider configProvider, String key) {
-    return configProvider.getLong(key, configProvider.getLong(normalizeKey(key), -1));
-  }
-
-  public static boolean enableJMethodIDOptim(ConfigProvider configProvider) {
-    return getBoolean(
-        configProvider,
-        PROFILING_DATADOG_PROFILER_JMETHODID_OPTIM_ENABLED,
-        PROFILING_DATADOG_PROFILER_JMETHODID_OPTIM_ENABLED_DEFAULT);
-  }
-
-  private static String normalizeKey(String key) {
-    return key.replace(".ddprof.", ".async.");
-  }
+    private static final Logger log = LoggerFactory.getLogger(DatadogProfilerConfig.class);
+
+    public static boolean isCpuProfilerEnabled(ConfigProvider configProvider) {
+        return getBoolean(
+                configProvider, PROFILING_DATADOG_PROFILER_CPU_ENABLED, PROFILING_DATADOG_PROFILER_CPU_ENABLED_DEFAULT);
+    }
+
+    public static String getLibPath(ConfigProvider configProvider) {
+        return getString(configProvider, PROFILING_DATADOG_PROFILER_LIBPATH);
+    }
+
+    public static String getLibPath() {
+        return getLibPath(ConfigProvider.getInstance());
+    }
+
+    public static boolean isCpuProfilerEnabled() {
+        return isCpuProfilerEnabled(ConfigProvider.getInstance());
+    }
+
+    public static int getCpuInterval(ConfigProvider configProvider) {
+        return getInteger(
+                configProvider,
+                PROFILING_DATADOG_PROFILER_CPU_INTERVAL,
+                PROFILING_DATADOG_PROFILER_CPU_INTERVAL_DEFAULT);
+    }
+
+    public static int getCpuInterval() {
+        return getCpuInterval(ConfigProvider.getInstance());
+    }
+
+    public static String getSchedulingEvent(ConfigProvider configProvider) {
+        return getString(configProvider, PROFILING_DATADOG_PROFILER_SCHEDULING_EVENT);
+    }
+
+    public static String getSchedulingEvent() {
+        return getSchedulingEvent(ConfigProvider.getInstance());
+    }
+
+    public static int getSchedulingEventInterval(ConfigProvider configProvider) {
+        return getInteger(configProvider, PROFILING_DATADOG_PROFILER_SCHEDULING_EVENT_INTERVAL);
+    }
+
+    public static int getSchedulingEventInterval() {
+        return getSchedulingEventInterval(ConfigProvider.getInstance());
+    }
+
+    public static boolean isWallClockProfilerEnabled() {
+        return isWallClockProfilerEnabled(ConfigProvider.getInstance());
+    }
+
+    public static boolean isWallClockProfilerEnabled(ConfigProvider configProvider) {
+        boolean isUltraMinimal = getBoolean(configProvider, PROFILING_ULTRA_MINIMAL, false);
+        boolean isTracingEnabled = configProvider.getBoolean(TRACE_ENABLED, true);
+        boolean disableUnlessOptedIn = isUltraMinimal || !isTracingEnabled || isJ9();
+        boolean enabledByDefault = !disableUnlessOptedIn;
+        return getBoolean(configProvider, PROFILING_DATADOG_PROFILER_WALL_ENABLED, enabledByDefault);
+    }
+
+    public static int getWallInterval(ConfigProvider configProvider) {
+        return getInteger(
+                configProvider,
+                PROFILING_DATADOG_PROFILER_WALL_INTERVAL,
+                PROFILING_DATADOG_PROFILER_WALL_INTERVAL_DEFAULT);
+    }
+
+    public static int getWallInterval() {
+        return getWallInterval(ConfigProvider.getInstance());
+    }
+
+    public static boolean getWallCollapsing(ConfigProvider configProvider) {
+        return getBoolean(
+                configProvider,
+                PROFILING_DATADOG_PROFILER_WALL_COLLAPSING,
+                PROFILING_DATADOG_PROFILER_WALL_COLLAPSING_DEFAULT);
+    }
+
+    /**
+     * Checks whether the wall-clock context filter should be used.<br>
+     * The context filter will make wall-clock profiler to pick candidate threads only from threads
+     * with attached tracing context.<br>
+     * If context filter is not used (this method returns {@literal false}) all threads will be
+     * considered for wallclock sampling.
+     *
+     * @param configProvider the associated config provider
+     * @return {@literal true} if the wallclock sampler should use context filtering, {@literal false}
+     *     otherwise
+     */
+    public static boolean getWallContextFilter(ConfigProvider configProvider) {
+        // Context filtering requires tracing to be enabled - without tracing,
+        // there are no span contexts to filter on, so threads would never be added
+        // to the filter, resulting in no walltime samples.
+        boolean isTracingEnabled = configProvider.getBoolean(TRACE_ENABLED, true);
+        if (!isTracingEnabled) {
+            return false;
+        }
+        return getBoolean(
+                configProvider,
+                PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER,
+                PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER_DEFAULT);
+    }
+
+    static boolean isJmethodIDSafe() {
+        return ProfilingSupport.isJmethodIDSafe();
+    }
+
+    static boolean isMemoryLeakProfilingSafe() {
+        return ProfilingSupport.isLiveHeapProfilingSafe();
+    }
+
+    public static boolean isAllocationProfilingEnabled(ConfigProvider configProvider) {
+        // JVMTI Allocation Sampler is available since Java 11
+        if (JavaVirtualMachine.isJavaVersionAtLeast(11)) {
+            boolean dflt = isJmethodIDSafe();
+            boolean enableDdprofAlloc = getBoolean(
+                    configProvider, PROFILING_ALLOCATION_ENABLED, dflt, PROFILING_DATADOG_PROFILER_ALLOC_ENABLED);
+
+            if (!dflt && enableDdprofAlloc) {
+                log.warn("Allocation profiling was enabled although it is not considered stable on this JVM version.");
+            }
+            return enableDdprofAlloc;
+        }
+        return false;
+    }
+
+    public static boolean isAllocationProfilingEnabled() {
+        return isAllocationProfilingEnabled(ConfigProvider.getInstance());
+    }
+
+    public static int getAllocationInterval(ConfigProvider configProvider) {
+        return getInteger(
+                configProvider,
+                PROFILING_DATADOG_PROFILER_ALLOC_INTERVAL,
+                PROFILING_DATADOG_PROFILER_ALLOC_INTERVAL_DEFAULT);
+    }
+
+    public static int getAllocationInterval() {
+        return getAllocationInterval(ConfigProvider.getInstance());
+    }
+
+    public static boolean isMemoryLeakProfilingEnabled(ConfigProvider configProvider) {
+        boolean unifiedEnabled = configProvider.getBoolean(PROFILING_HEAP_ENABLED, isMemoryLeakProfilingSafe());
+        if (!unifiedEnabled) {
+            return false;
+        }
+        // JVMTI Allocation Sampler is required for ddprof live heap and is available since Java 11.
+        // isJmethodIDSafe() alone is not sufficient — Java 8 is jmethodID-safe but lacks the sampler.
+        boolean isSafe = JavaVirtualMachine.isJavaVersionAtLeast(11) && isJmethodIDSafe();
+        boolean enableDdprofMemleak = getBoolean(
+                configProvider,
+                PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED,
+                isSafe,
+                PROFILING_DATADOG_PROFILER_MEMLEAK_ENABLED);
+        if (!isSafe && enableDdprofMemleak) {
+            log.warn("Live heap profiling (ddprof) was enabled although it is not considered stable"
+                    + " on this JVM version.");
+        }
+        if (!enableDdprofMemleak && !isOldObjectSampleAvailable()) {
+            log.warn("ddprof live heap profiling is disabled and JFR OldObjectSample is not available"
+                    + " on this JVM. Live heap profiling will be inactive.");
+        }
+        return enableDdprofMemleak;
+    }
+
+    public static boolean isMemoryLeakProfilingEnabled() {
+        return isMemoryLeakProfilingEnabled(ConfigProvider.getInstance());
+    }
+
+    public static boolean isLiveHeapSizeTrackingEnabled(ConfigProvider configProvider) {
+        return getBoolean(
+                configProvider,
+                PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE,
+                PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE_DEFAFULT);
+    }
+
+    public static int getLiveHeapSamplePercent(ConfigProvider configProvider) {
+        return getInteger(
+                configProvider,
+                PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT,
+                PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT_DEFAULT);
+    }
+
+    public static long getMemleakInterval(ConfigProvider configProvider) {
+        long maxheap = ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax();
+        long memleakIntervalDefault = maxheap <= 0 ? 1024 * 1024 : maxheap / Math.max(1, getMemleakCapacity());
+        return getLong(
+                configProvider,
+                PROFILING_DATADOG_PROFILER_LIVEHEAP_INTERVAL,
+                memleakIntervalDefault,
+                PROFILING_DATADOG_PROFILER_MEMLEAK_INTERVAL);
+    }
+
+    public static long getMemleakInterval() {
+        return getMemleakInterval(ConfigProvider.getInstance());
+    }
+
+    public static int getMemleakCapacity(ConfigProvider configProvider) {
+        return clamp(
+                0,
+                // see
+                // https://github.com/DataDog/java-profiler/blob/main/ddprof-lib/src/main/cpp/livenessTracker.h#L54
+                8192,
+                getInteger(
+                        configProvider,
+                        PROFILING_DATADOG_PROFILER_LIVEHEAP_CAPACITY,
+                        PROFILING_DATADOG_PROFILER_LIVEHEAP_CAPACITY_DEFAULT,
+                        PROFILING_DATADOG_PROFILER_MEMLEAK_CAPACITY));
+    }
+
+    public static int getMemleakCapacity() {
+        return getMemleakCapacity(ConfigProvider.getInstance());
+    }
+
+    public static boolean isNativeMemoryProfilingEnabled(ConfigProvider configProvider) {
+        // nativemem never shipped under the legacy '.async.' naming, so it has no async-translated
+        // form to fall back to — call the provider directly instead of the ddprof->async helper.
+        return configProvider.getBoolean(
+                PROFILING_DATADOG_PROFILER_NATIVEMEM_ENABLED, PROFILING_DATADOG_PROFILER_NATIVEMEM_ENABLED_DEFAULT);
+    }
+
+    public static boolean isNativeMemoryProfilingEnabled() {
+        return isNativeMemoryProfilingEnabled(ConfigProvider.getInstance());
+    }
+
+    public static int getNativeMemoryInterval(ConfigProvider configProvider) {
+        // nativemem never shipped under the legacy '.async.' naming, so it has no async-translated
+        // form to fall back to — call the provider directly instead of the ddprof->async helper.
+        return configProvider.getInteger(
+                PROFILING_DATADOG_PROFILER_NATIVEMEM_INTERVAL, PROFILING_DATADOG_PROFILER_NATIVEMEM_INTERVAL_DEFAULT);
+    }
+
+    public static int getNativeMemoryInterval() {
+        return getNativeMemoryInterval(ConfigProvider.getInstance());
+    }
+
+    public static boolean isNativeSocketProfilingEnabled(ConfigProvider configProvider) {
+        // natsock never shipped under the legacy '.async.' naming, so it has no async-translated
+        // form to fall back to — call the provider directly instead of the ddprof->async helper.
+        return configProvider.getBoolean(
+                PROFILING_DATADOG_PROFILER_NATIVESOCKET_ENABLED,
+                PROFILING_DATADOG_PROFILER_NATIVESOCKET_ENABLED_DEFAULT);
+    }
+
+    public static boolean isNativeSocketProfilingEnabled() {
+        return isNativeSocketProfilingEnabled(ConfigProvider.getInstance());
+    }
+
+    public static String getNativeSocketInterval(ConfigProvider configProvider) {
+        // natsock never shipped under the legacy '.async.' naming, so it has no async-translated
+        // form to fall back to — call the provider directly instead of the ddprof->async helper.
+        return configProvider.getString(PROFILING_DATADOG_PROFILER_NATIVESOCKET_INTERVAL);
+    }
+
+    public static String getNativeSocketInterval() {
+        return getNativeSocketInterval(ConfigProvider.getInstance());
+    }
+
+    public static int getStackDepth(ConfigProvider configProvider) {
+        return getInteger(
+                configProvider,
+                PROFILING_STACKDEPTH,
+                PROFILING_STACKDEPTH_DEFAULT,
+                PROFILING_DATADOG_PROFILER_STACKDEPTH);
+    }
+
+    public static int getStackDepth() {
+        return getStackDepth(ConfigProvider.getInstance());
+    }
+
+    public static int getSafeMode(ConfigProvider configProvider) {
+        return getInteger(
+                configProvider, PROFILING_DATADOG_PROFILER_SAFEMODE, PROFILING_DATADOG_PROFILER_SAFEMODE_DEFAULT);
+    }
+
+    public static int getSafeMode() {
+        return getSafeMode(ConfigProvider.getInstance());
+    }
+
+    public static String getCStack(ConfigProvider configProvider) {
+        String cstack =
+                getString(configProvider, PROFILING_DATADOG_PROFILER_CSTACK, PROFILING_DATADOG_PROFILER_CSTACK_DEFAULT);
+        if (cstack.startsWith("vm") && !(JavaVirtualMachine.isHotspot())) {
+            // can't use the VM stackwalking on non-hotspot VMs
+            // fall-back to 'dwarf' unwinding
+            cstack = "dwarf";
+        }
+        return cstack;
+    }
+
+    public static boolean isEndpointTrackingEnabled() {
+        return isEndpointTrackingEnabled(ConfigProvider.getInstance());
+    }
+
+    public static boolean isEndpointTrackingEnabled(ConfigProvider configProvider) {
+        return getBoolean(
+                configProvider,
+                ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED,
+                ProfilingConfig.PROFILING_ENDPOINT_COLLECTION_ENABLED_DEFAULT);
+    }
+
+    public static boolean isQueueTimeEnabled() {
+        return isQueueTimeEnabled(ConfigProvider.getInstance());
+    }
+
+    public static boolean isQueueTimeEnabled(ConfigProvider configProvider) {
+        return getBoolean(configProvider, PROFILING_QUEUEING_TIME_ENABLED, PROFILING_QUEUEING_TIME_ENABLED_DEFAULT);
+    }
+
+    public static String getCStack() {
+        return getCStack(ConfigProvider.getInstance());
+    }
+
+    public static boolean omitLineNumbers(ConfigProvider configProvider) {
+        return !getBoolean(
+                configProvider,
+                PROFILING_DATADOG_PROFILER_LINE_NUMBERS,
+                PROFILING_DATADOG_PROFILER_LINE_NUMBERS_DEFAULT);
+    }
+
+    private static int clamp(int min, int max, int value) {
+        return Math.max(min, Math.min(max, value));
+    }
+
+    public static String getLogLevel(ConfigProvider configProvider) {
+        return getString(
+                configProvider, PROFILING_DATADOG_PROFILER_LOG_LEVEL, PROFILING_DATADOG_PROFILER_LOG_LEVEL_DEFAULT);
+    }
+
+    public static String getLogLevel() {
+        return getLogLevel(ConfigProvider.getInstance());
+    }
+
+    public static Set<String> getContextAttributes(ConfigProvider configProvider) {
+        return configProvider.getSet(PROFILING_CONTEXT_ATTRIBUTES, Collections.emptySet());
+    }
+
+    public static boolean isQueueingTimeEnabled() {
+        return isQueueingTimeEnabled(ConfigProvider.getInstance());
+    }
+
+    public static boolean isQueueingTimeEnabled(ConfigProvider configProvider) {
+        return configProvider.getBoolean(PROFILING_QUEUEING_TIME_ENABLED, PROFILING_QUEUEING_TIME_ENABLED_DEFAULT);
+    }
+
+    public static boolean isSpanNameContextAttributeEnabled() {
+        return isSpanNameContextAttributeEnabled(ConfigProvider.getInstance());
+    }
+
+    public static boolean isSpanNameContextAttributeEnabled(ConfigProvider configProvider) {
+        return configProvider.getBoolean(PROFILING_CONTEXT_ATTRIBUTES_SPAN_NAME_ENABLED, true);
+    }
+
+    public static boolean isResourceNameContextAttributeEnabled(ConfigProvider configProvider) {
+        return configProvider.getBoolean(PROFILING_CONTEXT_ATTRIBUTES_RESOURCE_NAME_ENABLED, false);
+    }
+
+    public static boolean isTrackingGenerations(ConfigProvider configProvider) {
+        return getBoolean(configProvider, PROFILING_HEAP_TRACK_GENERATIONS, PROFILING_HEAP_TRACK_GENERATIONS_DEFAULT);
+    }
+
+    public static String getString(ConfigProvider configProvider, String key, String defaultValue) {
+        return configProvider.getString(key, configProvider.getString(normalizeKey(key), defaultValue));
+    }
+
+    public static String getString(ConfigProvider configProvider, String key) {
+        return configProvider.getString(key, configProvider.getString(normalizeKey(key)));
+    }
+
+    public static boolean getBoolean(
+            ConfigProvider configProvider, String key, boolean defaultValue, String... aliases) {
+        return configProvider.getBoolean(key, configProvider.getBoolean(normalizeKey(key), defaultValue), aliases);
+    }
+
+    public static boolean getBoolean(ConfigProvider configProvider, String key) {
+        return configProvider.getBoolean(key, configProvider.getBoolean(normalizeKey(key), false));
+    }
+
+    public static int getInteger(ConfigProvider configProvider, String key, int defaultValue, String... aliases) {
+        return configProvider.getInteger(key, configProvider.getInteger(normalizeKey(key), defaultValue), aliases);
+    }
+
+    public static int getInteger(ConfigProvider configProvider, String key) {
+        return configProvider.getInteger(key, configProvider.getInteger(normalizeKey(key), -1));
+    }
+
+    public static long getLong(ConfigProvider configProvider, String key, long defaultValue, String... aliases) {
+        return configProvider.getLong(key, configProvider.getLong(normalizeKey(key), defaultValue), aliases);
+    }
+
+    public static long getLong(ConfigProvider configProvider, String key) {
+        return configProvider.getLong(key, configProvider.getLong(normalizeKey(key), -1));
+    }
+
+    public static boolean enableJMethodIDOptim(ConfigProvider configProvider) {
+        return getBoolean(
+                configProvider,
+                PROFILING_DATADOG_PROFILER_JMETHODID_OPTIM_ENABLED,
+                PROFILING_DATADOG_PROFILER_JMETHODID_OPTIM_ENABLED_DEFAULT);
+    }
+
+    private static String normalizeKey(String key) {
+        return key.replace(".ddprof.", ".async.");
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerContextSetter.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerContextSetter.java
index 4bde713bcb6..74b4b42dd9d 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerContextSetter.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerContextSetter.java
@@ -1,21 +1,20 @@
 package com.datadog.profiling.ddprof;
 
-public class DatadogProfilerContextSetter
-    implements datadog.trace.api.profiling.ProfilingContextAttribute {
+public class DatadogProfilerContextSetter implements datadog.trace.api.profiling.ProfilingContextAttribute {
 
-  private final int offset;
-  private final DatadogProfiler profiler;
+    private final int offset;
+    private final DatadogProfiler profiler;
 
-  public DatadogProfilerContextSetter(String attribute, DatadogProfiler profiler) {
-    this.offset = profiler.offsetOf(attribute);
-    this.profiler = profiler;
-  }
+    public DatadogProfilerContextSetter(String attribute, DatadogProfiler profiler) {
+        this.offset = profiler.offsetOf(attribute);
+        this.profiler = profiler;
+    }
 
-  public void set(String value) {
-    profiler.setContextValue(offset, value);
-  }
+    public void set(String value) {
+        profiler.setContextValue(offset, value);
+    }
 
-  public void clear() {
-    profiler.clearContextValue(offset);
-  }
+    public void clear() {
+        profiler.clearContextValue(offset);
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecording.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecording.java
index ef2b9ee3a26..78a78102b34 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecording.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecording.java
@@ -13,58 +13,58 @@
 import org.slf4j.LoggerFactory;
 
 final class DatadogProfilerRecording implements OngoingRecording {
-  private static final Logger log = LoggerFactory.getLogger(DatadogProfilerRecording.class);
+    private static final Logger log = LoggerFactory.getLogger(DatadogProfilerRecording.class);
 
-  private final DatadogProfiler profiler;
-  private volatile Path recordingFile;
-  private final Instant started = Instant.now();
+    private final DatadogProfiler profiler;
+    private volatile Path recordingFile;
+    private final Instant started = Instant.now();
 
-  /**
-   * Do not use this constructor directly. Rather use {@linkplain DatadogProfiler#start()}
-   *
-   * @param profiler the associated profiler
-   * @throws IOException
-   */
-  DatadogProfilerRecording(DatadogProfiler profiler) throws IOException {
-    this.profiler = profiler;
-    this.recordingFile = profiler.newRecording();
-  }
+    /**
+     * Do not use this constructor directly. Rather use {@linkplain DatadogProfiler#start()}
+     *
+     * @param profiler the associated profiler
+     * @throws IOException
+     */
+    DatadogProfilerRecording(DatadogProfiler profiler) throws IOException {
+        this.profiler = profiler;
+        this.recordingFile = profiler.newRecording();
+    }
 
-  @Nonnull
-  @Override
-  public RecordingData stop() {
-    profiler.stopProfiler();
-    return new DatadogProfilerRecordingData(
-        recordingFile, started, Instant.now(), ProfilingSnapshot.Kind.ON_SHUTDOWN);
-  }
+    @Nonnull
+    @Override
+    public RecordingData stop() {
+        profiler.stopProfiler();
+        return new DatadogProfilerRecordingData(
+                recordingFile, started, Instant.now(), ProfilingSnapshot.Kind.ON_SHUTDOWN);
+    }
 
-  @VisibleForTesting
-  final RecordingData snapshot(@Nonnull Instant start) {
-    return snapshot(start, ProfilingSnapshot.Kind.PERIODIC);
-  }
+    @VisibleForTesting
+    final RecordingData snapshot(@Nonnull Instant start) {
+        return snapshot(start, ProfilingSnapshot.Kind.PERIODIC);
+    }
 
-  @Nonnull
-  @Override
-  public RecordingData snapshot(@Nonnull Instant start, @Nonnull ProfilingSnapshot.Kind kind) {
-    try {
-      Path recFile = profiler.newSnapshotFile();
-      profiler.dump(recFile);
-      return new DatadogProfilerRecordingData(recFile, start, Instant.now(), kind);
-    } catch (Throwable t) {
-      throw new RuntimeException(t);
+    @Nonnull
+    @Override
+    public RecordingData snapshot(@Nonnull Instant start, @Nonnull ProfilingSnapshot.Kind kind) {
+        try {
+            Path recFile = profiler.newSnapshotFile();
+            profiler.dump(recFile);
+            return new DatadogProfilerRecordingData(recFile, start, Instant.now(), kind);
+        } catch (Throwable t) {
+            throw new RuntimeException(t);
+        }
     }
-  }
 
-  @Override
-  public void close() {
-    try {
-      Files.deleteIfExists(recordingFile);
-    } catch (IOException ignored) {
+    @Override
+    public void close() {
+        try {
+            Files.deleteIfExists(recordingFile);
+        } catch (IOException ignored) {
+        }
     }
-  }
 
-  @VisibleForTesting
-  Path getRecordingFile() {
-    return recordingFile;
-  }
+    @VisibleForTesting
+    Path getRecordingFile() {
+        return recordingFile;
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingData.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingData.java
index b1a6c7eea41..1ede947b4b8 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingData.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingData.java
@@ -10,37 +10,37 @@
 import javax.annotation.Nullable;
 
 final class DatadogProfilerRecordingData extends RecordingData {
-  private final Path recordingFile;
+    private final Path recordingFile;
 
-  public DatadogProfilerRecordingData(Path recordingFile, Instant start, Instant end, Kind kind) {
-    super(start, end, kind);
-    this.recordingFile = recordingFile;
-  }
+    public DatadogProfilerRecordingData(Path recordingFile, Instant start, Instant end, Kind kind) {
+        super(start, end, kind);
+        this.recordingFile = recordingFile;
+    }
 
-  @Nonnull
-  @Override
-  public RecordingInputStream getStream() throws IOException {
-    return new RecordingInputStream(Files.newInputStream(recordingFile));
-  }
+    @Nonnull
+    @Override
+    public RecordingInputStream getStream() throws IOException {
+        return new RecordingInputStream(Files.newInputStream(recordingFile));
+    }
 
-  @Override
-  public void release() {
-    try {
-      Files.deleteIfExists(recordingFile);
-    } catch (IOException e) {
-      e.printStackTrace();
+    @Override
+    public void release() {
+        try {
+            Files.deleteIfExists(recordingFile);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
-  }
 
-  @Nonnull
-  @Override
-  public String getName() {
-    return "ddprof";
-  }
+    @Nonnull
+    @Override
+    public String getName() {
+        return "ddprof";
+    }
 
-  @Nullable
-  @Override
-  public Path getPath() {
-    return recordingFile;
-  }
+    @Nullable
+    @Override
+    public Path getPath() {
+        return recordingFile;
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingIntegration.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingIntegration.java
index 8b8d87c16ff..1833ce6a03e 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingIntegration.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingIntegration.java
@@ -16,135 +16,130 @@
  */
 public class DatadogProfilingIntegration implements ProfilingContextIntegration {
 
-  private static final DatadogProfiler DDPROF = DatadogProfiler.newInstance();
-  private static final int SPAN_NAME_INDEX = DDPROF.operationNameOffset();
-  private static final int RESOURCE_NAME_INDEX = DDPROF.resourceNameOffset();
-  private static final boolean WALLCLOCK_ENABLED =
-      DatadogProfilerConfig.isWallClockProfilerEnabled();
+    private static final DatadogProfiler DDPROF = DatadogProfiler.newInstance();
+    private static final int SPAN_NAME_INDEX = DDPROF.operationNameOffset();
+    private static final int RESOURCE_NAME_INDEX = DDPROF.resourceNameOffset();
+    private static final boolean WALLCLOCK_ENABLED = DatadogProfilerConfig.isWallClockProfilerEnabled();
 
-  private static final boolean IS_ENDPOINT_COLLECTION_ENABLED =
-      DatadogProfilerConfig.isEndpointTrackingEnabled();
+    private static final boolean IS_ENDPOINT_COLLECTION_ENABLED = DatadogProfilerConfig.isEndpointTrackingEnabled();
 
-  // don't use Config because it may use ThreadPoolExecutor to initialize itself
-  private static final boolean IS_PROFILING_QUEUEING_TIME_ENABLED =
-      DatadogProfilerConfig.isQueueTimeEnabled();
+    // don't use Config because it may use ThreadPoolExecutor to initialize itself
+    private static final boolean IS_PROFILING_QUEUEING_TIME_ENABLED = DatadogProfilerConfig.isQueueTimeEnabled();
 
-  private final Stateful contextManager =
-      new Stateful() {
+    private final Stateful contextManager = new Stateful() {
         @Override
         public void close() {
-          // clearTraceContext wipes all custom slots (incl. operation/resource) and reapplies
-          // app-managed context, so no separate clearContextValue calls are needed.
-          DDPROF.clearTraceContext();
+            // clearTraceContext wipes all custom slots (incl. operation/resource) and reapplies
+            // app-managed context, so no separate clearContextValue calls are needed.
+            DDPROF.clearTraceContext();
         }
 
         @Override
         public void activate(Object context) {
-          if (context instanceof ProfilerContext) {
-            ProfilerContext profilerContext = (ProfilerContext) context;
-            // One native call: trace/span context + operation and resource attributes, then
-            // reapply of app-managed context (setTraceContext resets custom slots).
-            DDPROF.setTraceContext(
-                profilerContext.getRootSpanId(),
-                profilerContext.getSpanId(),
-                profilerContext.getTraceIdHigh(),
-                profilerContext.getTraceIdLow(),
-                SPAN_NAME_INDEX,
-                profilerContext.getOperationName(),
-                RESOURCE_NAME_INDEX,
-                profilerContext.getResourceName());
-          }
+            if (context instanceof ProfilerContext) {
+                ProfilerContext profilerContext = (ProfilerContext) context;
+                // One native call: trace/span context + operation and resource attributes, then
+                // reapply of app-managed context (setTraceContext resets custom slots).
+                DDPROF.setTraceContext(
+                        profilerContext.getRootSpanId(),
+                        profilerContext.getSpanId(),
+                        profilerContext.getTraceIdHigh(),
+                        profilerContext.getTraceIdLow(),
+                        SPAN_NAME_INDEX,
+                        profilerContext.getOperationName(),
+                        RESOURCE_NAME_INDEX,
+                        profilerContext.getResourceName());
+            }
         }
-      };
+    };
 
-  @Override
-  public Stateful newScopeState(ProfilerContext profilerContext) {
-    return contextManager;
-  }
+    @Override
+    public Stateful newScopeState(ProfilerContext profilerContext) {
+        return contextManager;
+    }
 
-  @Override
-  public void onAttach() {
-    if (WALLCLOCK_ENABLED) {
-      DDPROF.addThread();
+    @Override
+    public void onAttach() {
+        if (WALLCLOCK_ENABLED) {
+            DDPROF.addThread();
+        }
     }
-  }
 
-  @Override
-  public void onDetach() {
-    if (WALLCLOCK_ENABLED) {
-      DDPROF.removeThread();
+    @Override
+    public void onDetach() {
+        if (WALLCLOCK_ENABLED) {
+            DDPROF.removeThread();
+        }
     }
-  }
-
-  @Override
-  public String name() {
-    return "ddprof";
-  }
-
-  /** Rebinds ddprof's carrier-thread context to the span contained in {@code context}. */
-  @Override
-  public void setContext(Context context) {
-    AgentSpan span = AgentSpan.fromContext(context);
-    if (span != null) {
-      contextManager.activate(span.spanContext());
-    } else {
-      clearContext();
+
+    @Override
+    public String name() {
+        return "ddprof";
     }
-  }
-
-  @Override
-  public boolean isThreadContextBindingRequired() {
-    return true;
-  }
-
-  private void clearContext() {
-    contextManager.close();
-  }
-
-  @Override
-  public ProfilingContextAttribute createContextAttribute(String attribute) {
-    return new DatadogProfilerContextSetter(attribute, DDPROF);
-  }
-
-  @Override
-  public ProfilingScope newScope() {
-    return new DatadogProfilingScope(DDPROF);
-  }
-
-  @Override
-  public void onRootSpanFinished(AgentSpan rootSpan, EndpointTracker tracker) {
-    if (IS_ENDPOINT_COLLECTION_ENABLED && rootSpan != null) {
-      CharSequence resourceName = rootSpan.getResourceName();
-      CharSequence operationName = rootSpan.getOperationName();
-      if (resourceName != null && operationName != null) {
-        DDPROF.recordTraceRoot(
-            rootSpan.getSpanId(), resourceName.toString(), operationName.toString());
-      }
+
+    /** Rebinds ddprof's carrier-thread context to the span contained in {@code context}. */
+    @Override
+    public void setContext(Context context) {
+        AgentSpan span = AgentSpan.fromContext(context);
+        if (span != null) {
+            contextManager.activate(span.spanContext());
+        } else {
+            clearContext();
+        }
     }
-  }
 
-  @Override
-  public EndpointTracker onRootSpanStarted(AgentSpan rootSpan) {
-    return NoOpEndpointTracker.INSTANCE;
-  }
+    @Override
+    public boolean isThreadContextBindingRequired() {
+        return true;
+    }
 
-  @Override
-  public Timing start(TimerType type) {
-    if (IS_PROFILING_QUEUEING_TIME_ENABLED && type == TimerType.QUEUEING) {
-      return DDPROF.newQueueTimeTracker();
+    private void clearContext() {
+        contextManager.close();
     }
-    return Timing.NoOp.INSTANCE;
-  }
 
-  /**
-   * This implementation is actually stateless, so we don't actually need a tracker object, but
-   * we'll create a singleton to avoid returning null and risking NPEs elsewhere.
-   */
-  private static final class NoOpEndpointTracker implements EndpointTracker {
+    @Override
+    public ProfilingContextAttribute createContextAttribute(String attribute) {
+        return new DatadogProfilerContextSetter(attribute, DDPROF);
+    }
 
-    public static final NoOpEndpointTracker INSTANCE = new NoOpEndpointTracker();
+    @Override
+    public ProfilingScope newScope() {
+        return new DatadogProfilingScope(DDPROF);
+    }
+
+    @Override
+    public void onRootSpanFinished(AgentSpan rootSpan, EndpointTracker tracker) {
+        if (IS_ENDPOINT_COLLECTION_ENABLED && rootSpan != null) {
+            CharSequence resourceName = rootSpan.getResourceName();
+            CharSequence operationName = rootSpan.getOperationName();
+            if (resourceName != null && operationName != null) {
+                DDPROF.recordTraceRoot(rootSpan.getSpanId(), resourceName.toString(), operationName.toString());
+            }
+        }
+    }
+
+    @Override
+    public EndpointTracker onRootSpanStarted(AgentSpan rootSpan) {
+        return NoOpEndpointTracker.INSTANCE;
+    }
 
     @Override
-    public void endpointWritten(AgentSpan span) {}
-  }
+    public Timing start(TimerType type) {
+        if (IS_PROFILING_QUEUEING_TIME_ENABLED && type == TimerType.QUEUEING) {
+            return DDPROF.newQueueTimeTracker();
+        }
+        return Timing.NoOp.INSTANCE;
+    }
+
+    /**
+     * This implementation is actually stateless, so we don't actually need a tracker object, but
+     * we'll create a singleton to avoid returning null and risking NPEs elsewhere.
+     */
+    private static final class NoOpEndpointTracker implements EndpointTracker {
+
+        public static final NoOpEndpointTracker INSTANCE = new NoOpEndpointTracker();
+
+        @Override
+        public void endpointWritten(AgentSpan span) {}
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingScope.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingScope.java
index eda276416ac..50b499005b1 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingScope.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingScope.java
@@ -4,49 +4,49 @@
 import datadog.trace.api.profiling.ProfilingScope;
 
 public class DatadogProfilingScope implements ProfilingScope {
-  private final DatadogProfiler profiler;
-  // Snapshot of the app-managed context slots at scope creation (those registered via
-  // ProfilingContextAttribute). Restored on close() so ambient values set before this
-  // scope are not lost when the scope exits.
-  // Span context slots (managed by DatadogProfilingIntegration) are not snapshotted
-  // here; their lifecycle is controlled by the tracer's activate/deactivate path.
-  private final DatadogProfiler.AppContextSnapshot savedAppContext;
-
-  public DatadogProfilingScope(DatadogProfiler profiler) {
-    this.profiler = profiler;
-    this.savedAppContext = profiler.saveAppContext();
-  }
-
-  @Override
-  public void setContextValue(String attribute, String value) {
-    profiler.setContextValue(attribute, value);
-  }
-
-  @Override
-  public void setContextValue(ProfilingContextAttribute attribute, String value) {
-    if (attribute instanceof DatadogProfilerContextSetter) {
-      ((DatadogProfilerContextSetter) attribute).set(value);
+    private final DatadogProfiler profiler;
+    // Snapshot of the app-managed context slots at scope creation (those registered via
+    // ProfilingContextAttribute). Restored on close() so ambient values set before this
+    // scope are not lost when the scope exits.
+    // Span context slots (managed by DatadogProfilingIntegration) are not snapshotted
+    // here; their lifecycle is controlled by the tracer's activate/deactivate path.
+    private final DatadogProfiler.AppContextSnapshot savedAppContext;
+
+    public DatadogProfilingScope(DatadogProfiler profiler) {
+        this.profiler = profiler;
+        this.savedAppContext = profiler.saveAppContext();
     }
-  }
 
-  @Override
-  public void clearContextValue(String attribute) {
-    profiler.clearContextValue(attribute);
-  }
+    @Override
+    public void setContextValue(String attribute, String value) {
+        profiler.setContextValue(attribute, value);
+    }
+
+    @Override
+    public void setContextValue(ProfilingContextAttribute attribute, String value) {
+        if (attribute instanceof DatadogProfilerContextSetter) {
+            ((DatadogProfilerContextSetter) attribute).set(value);
+        }
+    }
+
+    @Override
+    public void clearContextValue(String attribute) {
+        profiler.clearContextValue(attribute);
+    }
+
+    @Override
+    public void clearContextValue(ProfilingContextAttribute attribute) {
+        if (attribute instanceof DatadogProfilerContextSetter) {
+            ((DatadogProfilerContextSetter) attribute).clear();
+        }
+    }
 
-  @Override
-  public void clearContextValue(ProfilingContextAttribute attribute) {
-    if (attribute instanceof DatadogProfilerContextSetter) {
-      ((DatadogProfilerContextSetter) attribute).clear();
+    @Override
+    public void close() {
+        // Restores the app-managed context slots that were active when this scope opened.
+        // Span context slots are NOT touched here; they are managed independently by the
+        // tracer via DatadogProfilingIntegration.activate()/close().
+        profiler.restoreAppContext(savedAppContext);
+        profiler.syncNativeAppContext();
     }
-  }
-
-  @Override
-  public void close() {
-    // Restores the app-managed context slots that were active when this scope opened.
-    // Span context slots are NOT touched here; they are managed independently by the
-    // tracer via DatadogProfilingIntegration.activate()/close().
-    profiler.restoreAppContext(savedAppContext);
-    profiler.syncNativeAppContext();
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/QueueTimeTracker.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/QueueTimeTracker.java
index e76a3dd5561..3c3c0539443 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/QueueTimeTracker.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/QueueTimeTracker.java
@@ -5,56 +5,56 @@
 
 public class QueueTimeTracker implements QueueTiming {
 
-  private final DatadogProfiler profiler;
-  private final Thread origin;
-  private final long startTicks;
-  private final long startMillis;
-  private WeakReference<Object> weakTask;
-  // FIXME this can be eliminated by altering the instrumentation
-  //  since it is known when the item is polled from the queue
-  private Class<?> scheduler;
-  private Class<?> queue;
-  private int queueLength;
-
-  public QueueTimeTracker(DatadogProfiler profiler, long startTicks) {
-    this.profiler = profiler;
-    this.origin = Thread.currentThread();
-    this.startTicks = startTicks;
-    this.startMillis = System.currentTimeMillis();
-  }
-
-  @Override
-  public void setTask(Object task) {
-    this.weakTask = new WeakReference<>(task);
-  }
-
-  @Override
-  public void setScheduler(Class<?> scheduler) {
-    this.scheduler = scheduler;
-  }
-
-  @Override
-  public void setQueue(Class<?> queue) {
-    this.queue = queue;
-  }
-
-  @Override
-  public void setQueueLength(int queueLength) {
-    this.queueLength = queueLength;
-  }
-
-  @Override
-  public void report() {
-    assert weakTask != null && scheduler != null;
-    Object task = this.weakTask.get();
-    if (task != null) {
-      // indirection reduces shallow size of the tracker instance
-      profiler.recordQueueTimeEvent(startTicks, task, scheduler, queue, queueLength, origin);
+    private final DatadogProfiler profiler;
+    private final Thread origin;
+    private final long startTicks;
+    private final long startMillis;
+    private WeakReference<Object> weakTask;
+    // FIXME this can be eliminated by altering the instrumentation
+    //  since it is known when the item is polled from the queue
+    private Class<?> scheduler;
+    private Class<?> queue;
+    private int queueLength;
+
+    public QueueTimeTracker(DatadogProfiler profiler, long startTicks) {
+        this.profiler = profiler;
+        this.origin = Thread.currentThread();
+        this.startTicks = startTicks;
+        this.startMillis = System.currentTimeMillis();
     }
-  }
 
-  @Override
-  public boolean sample() {
-    return profiler.shouldRecordQueueTimeEvent(startMillis);
-  }
+    @Override
+    public void setTask(Object task) {
+        this.weakTask = new WeakReference<>(task);
+    }
+
+    @Override
+    public void setScheduler(Class<?> scheduler) {
+        this.scheduler = scheduler;
+    }
+
+    @Override
+    public void setQueue(Class<?> queue) {
+        this.queue = queue;
+    }
+
+    @Override
+    public void setQueueLength(int queueLength) {
+        this.queueLength = queueLength;
+    }
+
+    @Override
+    public void report() {
+        assert weakTask != null && scheduler != null;
+        Object task = this.weakTask.get();
+        if (task != null) {
+            // indirection reduces shallow size of the tracker instance
+            profiler.recordQueueTimeEvent(startTicks, task, scheduler, queue, queueLength, origin);
+        }
+    }
+
+    @Override
+    public boolean sample() {
+        return profiler.shouldRecordQueueTimeEvent(startMillis);
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerConfigTest.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerConfigTest.java
index ed4b4476606..3462c459de0 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerConfigTest.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerConfigTest.java
@@ -18,183 +18,183 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 class DatadogProfilerConfigTest {
-  private String originalVmName;
-
-  @BeforeEach
-  void setUp() {
-    originalVmName = System.getProperty("java.vm.name");
-  }
-
-  @AfterEach
-  void tearDown() {
-    if (originalVmName != null) {
-      System.setProperty("java.vm.name", originalVmName);
-    } else {
-      System.clearProperty("java.vm.name");
+    private String originalVmName;
+
+    @BeforeEach
+    void setUp() {
+        originalVmName = System.getProperty("java.vm.name");
+    }
+
+    @AfterEach
+    void tearDown() {
+        if (originalVmName != null) {
+            System.setProperty("java.vm.name", originalVmName);
+        } else {
+            System.clearProperty("java.vm.name");
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("j9StackwalkerTestCases")
+    void testGetCStackWithJ9(String configuredStackwalker, String expectedStackwalker) {
+        System.setProperty("java.vm.name", "Eclipse OpenJ9 VM");
+
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_CSTACK, configuredStackwalker);
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+
+        String result = DatadogProfilerConfig.getCStack(configProvider);
+
+        assertEquals(
+                expectedStackwalker,
+                result,
+                "J9 JVM with configured stackwalker '"
+                        + configuredStackwalker
+                        + "' should return '"
+                        + expectedStackwalker
+                        + "'");
+    }
+
+    @ParameterizedTest
+    @MethodSource("zingStackwalkerTestCases")
+    void testGetCStackWithZing(String configuredStackwalker, String expectedStackwalker) {
+        System.setProperty("java.vm.name", "Zing 64-Bit Tiered VM");
+
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_CSTACK, configuredStackwalker);
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+
+        String result = DatadogProfilerConfig.getCStack(configProvider);
+
+        assertEquals(
+                expectedStackwalker,
+                result,
+                "Zing JVM with configured stackwalker '"
+                        + configuredStackwalker
+                        + "' should return '"
+                        + expectedStackwalker
+                        + "'");
+    }
+
+    @ParameterizedTest
+    @MethodSource("hotspotStackwalkerTestCases")
+    void testGetCStackWithHotspot(String configuredStackwalker, String expectedStackwalker) {
+        System.setProperty("java.vm.name", "Java HotSpot(TM) 64-Bit Server VM");
+
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_CSTACK, configuredStackwalker);
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+
+        String result = DatadogProfilerConfig.getCStack(configProvider);
+
+        assertEquals(
+                expectedStackwalker,
+                result,
+                "HotSpot JVM with configured stackwalker '"
+                        + configuredStackwalker
+                        + "' should return '"
+                        + expectedStackwalker
+                        + "'");
+    }
+
+    private static Stream<Arguments> j9StackwalkerTestCases() {
+        return Stream.of(
+                // Unsupported stackwalkers - should fall back to dwarf
+                Arguments.of("vm", "dwarf"),
+                Arguments.of("vmx", "dwarf"),
+                // Supported stackwalkers - should pass through
+                Arguments.of("dwarf", "dwarf"),
+                Arguments.of("fp", "fp"),
+                Arguments.of("lbr", "lbr"),
+                Arguments.of("no", "no"));
+    }
+
+    private static Stream<Arguments> zingStackwalkerTestCases() {
+        return Stream.of(
+                // Unsupported stackwalkers - should fall back to dwarf
+                Arguments.of("vm", "dwarf"),
+                Arguments.of("vmx", "dwarf"),
+                // Supported stackwalkers - should pass through
+                Arguments.of("dwarf", "dwarf"),
+                Arguments.of("fp", "fp"),
+                Arguments.of("lbr", "lbr"),
+                Arguments.of("no", "no"));
+    }
+
+    private static Stream<Arguments> hotspotStackwalkerTestCases() {
+        return Stream.of(
+                // All stackwalkers should pass through unchanged
+                Arguments.of("vm", "vm"),
+                Arguments.of("vmx", "vmx"),
+                Arguments.of("dwarf", "dwarf"),
+                Arguments.of("fp", "fp"),
+                Arguments.of("lbr", "lbr"),
+                Arguments.of("no", "no"));
+    }
+
+    @Test
+    void isMemoryLeakProfilingSafeConsistentWithComponentChecks() {
+        boolean expected = DatadogProfilerConfig.isJmethodIDSafe() || isOldObjectSampleAvailable();
+        assertEquals(expected, DatadogProfilerConfig.isMemoryLeakProfilingSafe());
+    }
+
+    @Test
+    void unifiedFlagEnabledDdprofKeyDefaultReflectsSafety() {
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_HEAP_ENABLED, "true");
+        ConfigProvider config = ConfigProvider.withPropertiesOverride(props);
+        // ddprof live heap requires Java 11+ (JVMTI Allocation Sampler) AND jmethodID safety
+        boolean expectedDefault =
+                JavaVirtualMachine.isJavaVersionAtLeast(11) && DatadogProfilerConfig.isJmethodIDSafe();
+        assertEquals(expectedDefault, DatadogProfilerConfig.isMemoryLeakProfilingEnabled(config));
+    }
+
+    @Test
+    void unifiedFlagDisabledOverridesDdprof() {
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_HEAP_ENABLED, "false");
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED, "true");
+        ConfigProvider config = ConfigProvider.withPropertiesOverride(props);
+        assertFalse(DatadogProfilerConfig.isMemoryLeakProfilingEnabled(config));
+    }
+
+    @Test
+    void unifiedFlagEnabledDdprofKeyDisabledReturnsFalse() {
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_HEAP_ENABLED, "true");
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED, "false");
+        ConfigProvider config = ConfigProvider.withPropertiesOverride(props);
+        assertFalse(DatadogProfilerConfig.isMemoryLeakProfilingEnabled(config));
+    }
+
+    @Test
+    void unifiedFlagEnabledDdprofKeyEnabledReturnsTrue() {
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_HEAP_ENABLED, "true");
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED, "true");
+        ConfigProvider config = ConfigProvider.withPropertiesOverride(props);
+        assertTrue(DatadogProfilerConfig.isMemoryLeakProfilingEnabled(config));
+    }
+
+    @Test
+    void oldMemleakAliasStillWorks() {
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_HEAP_ENABLED, "true");
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_MEMLEAK_ENABLED, "true");
+        ConfigProvider config = ConfigProvider.withPropertiesOverride(props);
+        assertTrue(DatadogProfilerConfig.isMemoryLeakProfilingEnabled(config));
+    }
+
+    @Test
+    void defaultBehaviorNoFlagsSetUsesAutoDetection() {
+        Properties props = new Properties();
+        ConfigProvider config = ConfigProvider.withPropertiesOverride(props);
+        // With no flags set:
+        // unified default = isMemoryLeakProfilingSafe()
+        // ddprof default = Java 11+ && isJmethodIDSafe()
+        // result = isMemoryLeakProfilingSafe() && (Java 11+ && isJmethodIDSafe())
+        boolean expectedDefault =
+                JavaVirtualMachine.isJavaVersionAtLeast(11) && DatadogProfilerConfig.isJmethodIDSafe();
+        assertEquals(expectedDefault, DatadogProfilerConfig.isMemoryLeakProfilingEnabled(config));
     }
-  }
-
-  @ParameterizedTest
-  @MethodSource("j9StackwalkerTestCases")
-  void testGetCStackWithJ9(String configuredStackwalker, String expectedStackwalker) {
-    System.setProperty("java.vm.name", "Eclipse OpenJ9 VM");
-
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_CSTACK, configuredStackwalker);
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-
-    String result = DatadogProfilerConfig.getCStack(configProvider);
-
-    assertEquals(
-        expectedStackwalker,
-        result,
-        "J9 JVM with configured stackwalker '"
-            + configuredStackwalker
-            + "' should return '"
-            + expectedStackwalker
-            + "'");
-  }
-
-  @ParameterizedTest
-  @MethodSource("zingStackwalkerTestCases")
-  void testGetCStackWithZing(String configuredStackwalker, String expectedStackwalker) {
-    System.setProperty("java.vm.name", "Zing 64-Bit Tiered VM");
-
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_CSTACK, configuredStackwalker);
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-
-    String result = DatadogProfilerConfig.getCStack(configProvider);
-
-    assertEquals(
-        expectedStackwalker,
-        result,
-        "Zing JVM with configured stackwalker '"
-            + configuredStackwalker
-            + "' should return '"
-            + expectedStackwalker
-            + "'");
-  }
-
-  @ParameterizedTest
-  @MethodSource("hotspotStackwalkerTestCases")
-  void testGetCStackWithHotspot(String configuredStackwalker, String expectedStackwalker) {
-    System.setProperty("java.vm.name", "Java HotSpot(TM) 64-Bit Server VM");
-
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_CSTACK, configuredStackwalker);
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-
-    String result = DatadogProfilerConfig.getCStack(configProvider);
-
-    assertEquals(
-        expectedStackwalker,
-        result,
-        "HotSpot JVM with configured stackwalker '"
-            + configuredStackwalker
-            + "' should return '"
-            + expectedStackwalker
-            + "'");
-  }
-
-  private static Stream<Arguments> j9StackwalkerTestCases() {
-    return Stream.of(
-        // Unsupported stackwalkers - should fall back to dwarf
-        Arguments.of("vm", "dwarf"),
-        Arguments.of("vmx", "dwarf"),
-        // Supported stackwalkers - should pass through
-        Arguments.of("dwarf", "dwarf"),
-        Arguments.of("fp", "fp"),
-        Arguments.of("lbr", "lbr"),
-        Arguments.of("no", "no"));
-  }
-
-  private static Stream<Arguments> zingStackwalkerTestCases() {
-    return Stream.of(
-        // Unsupported stackwalkers - should fall back to dwarf
-        Arguments.of("vm", "dwarf"),
-        Arguments.of("vmx", "dwarf"),
-        // Supported stackwalkers - should pass through
-        Arguments.of("dwarf", "dwarf"),
-        Arguments.of("fp", "fp"),
-        Arguments.of("lbr", "lbr"),
-        Arguments.of("no", "no"));
-  }
-
-  private static Stream<Arguments> hotspotStackwalkerTestCases() {
-    return Stream.of(
-        // All stackwalkers should pass through unchanged
-        Arguments.of("vm", "vm"),
-        Arguments.of("vmx", "vmx"),
-        Arguments.of("dwarf", "dwarf"),
-        Arguments.of("fp", "fp"),
-        Arguments.of("lbr", "lbr"),
-        Arguments.of("no", "no"));
-  }
-
-  @Test
-  void isMemoryLeakProfilingSafeConsistentWithComponentChecks() {
-    boolean expected = DatadogProfilerConfig.isJmethodIDSafe() || isOldObjectSampleAvailable();
-    assertEquals(expected, DatadogProfilerConfig.isMemoryLeakProfilingSafe());
-  }
-
-  @Test
-  void unifiedFlagEnabledDdprofKeyDefaultReflectsSafety() {
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_HEAP_ENABLED, "true");
-    ConfigProvider config = ConfigProvider.withPropertiesOverride(props);
-    // ddprof live heap requires Java 11+ (JVMTI Allocation Sampler) AND jmethodID safety
-    boolean expectedDefault =
-        JavaVirtualMachine.isJavaVersionAtLeast(11) && DatadogProfilerConfig.isJmethodIDSafe();
-    assertEquals(expectedDefault, DatadogProfilerConfig.isMemoryLeakProfilingEnabled(config));
-  }
-
-  @Test
-  void unifiedFlagDisabledOverridesDdprof() {
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_HEAP_ENABLED, "false");
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED, "true");
-    ConfigProvider config = ConfigProvider.withPropertiesOverride(props);
-    assertFalse(DatadogProfilerConfig.isMemoryLeakProfilingEnabled(config));
-  }
-
-  @Test
-  void unifiedFlagEnabledDdprofKeyDisabledReturnsFalse() {
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_HEAP_ENABLED, "true");
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED, "false");
-    ConfigProvider config = ConfigProvider.withPropertiesOverride(props);
-    assertFalse(DatadogProfilerConfig.isMemoryLeakProfilingEnabled(config));
-  }
-
-  @Test
-  void unifiedFlagEnabledDdprofKeyEnabledReturnsTrue() {
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_HEAP_ENABLED, "true");
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED, "true");
-    ConfigProvider config = ConfigProvider.withPropertiesOverride(props);
-    assertTrue(DatadogProfilerConfig.isMemoryLeakProfilingEnabled(config));
-  }
-
-  @Test
-  void oldMemleakAliasStillWorks() {
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_HEAP_ENABLED, "true");
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_MEMLEAK_ENABLED, "true");
-    ConfigProvider config = ConfigProvider.withPropertiesOverride(props);
-    assertTrue(DatadogProfilerConfig.isMemoryLeakProfilingEnabled(config));
-  }
-
-  @Test
-  void defaultBehaviorNoFlagsSetUsesAutoDetection() {
-    Properties props = new Properties();
-    ConfigProvider config = ConfigProvider.withPropertiesOverride(props);
-    // With no flags set:
-    // unified default = isMemoryLeakProfilingSafe()
-    // ddprof default = Java 11+ && isJmethodIDSafe()
-    // result = isMemoryLeakProfilingSafe() && (Java 11+ && isJmethodIDSafe())
-    boolean expectedDefault =
-        JavaVirtualMachine.isJavaVersionAtLeast(11) && DatadogProfilerConfig.isJmethodIDSafe();
-    assertEquals(expectedDefault, DatadogProfilerConfig.isMemoryLeakProfilingEnabled(config));
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingTest.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingTest.java
index 69a612e78e0..0a3dcc2159b 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingTest.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingTest.java
@@ -21,59 +21,55 @@
 
 class DatadogProfilerRecordingTest {
 
-  private DatadogProfiler profiler;
-  private DatadogProfilerRecording recording;
+    private DatadogProfiler profiler;
+    private DatadogProfilerRecording recording;
 
-  @BeforeEach
-  void setup() throws Exception {
-    assumeTrue(OperatingSystem.isLinux());
-    assertDoesNotThrow(
-        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
-    profiler = DatadogProfiler.newInstance(ConfigProvider.getInstance());
-    Assumptions.assumeFalse(profiler.isActive());
-    recording = (DatadogProfilerRecording) profiler.start();
-    assumeTrue(recording != null);
-  }
+    @BeforeEach
+    void setup() throws Exception {
+        assumeTrue(OperatingSystem.isLinux());
+        assertDoesNotThrow(() -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
+        profiler = DatadogProfiler.newInstance(ConfigProvider.getInstance());
+        Assumptions.assumeFalse(profiler.isActive());
+        recording = (DatadogProfilerRecording) profiler.start();
+        assumeTrue(recording != null);
+    }
 
-  @AfterEach
-  void shutdown() {
-    // Apparently, failed 'assume' does not prevent shutdown from running
-    // Do a sanity check before invoking profiler methods
-    if (profiler != null && recording != null) {
-      profiler.stop(recording);
+    @AfterEach
+    void shutdown() {
+        // Apparently, failed 'assume' does not prevent shutdown from running
+        // Do a sanity check before invoking profiler methods
+        if (profiler != null && recording != null) {
+            profiler.stop(recording);
+        }
     }
-  }
 
-  @Test
-  void testClose() throws Exception {
-    assertDoesNotThrow(
-        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
-    assertTrue(Files.exists(recording.getRecordingFile()));
-    recording.close();
-    assertFalse(Files.exists(recording.getRecordingFile()));
-  }
+    @Test
+    void testClose() throws Exception {
+        assertDoesNotThrow(() -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
+        assertTrue(Files.exists(recording.getRecordingFile()));
+        recording.close();
+        assertFalse(Files.exists(recording.getRecordingFile()));
+    }
 
-  @Test
-  void testStop() throws Exception {
-    assertDoesNotThrow(
-        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
-    RecordingData data = recording.stop();
-    assertNotNull(data);
-    assertTrue(Files.exists(recording.getRecordingFile()));
-  }
+    @Test
+    void testStop() throws Exception {
+        assertDoesNotThrow(() -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
+        RecordingData data = recording.stop();
+        assertNotNull(data);
+        assertTrue(Files.exists(recording.getRecordingFile()));
+    }
 
-  @Test
-  void testSnapshot() throws Exception {
-    assertDoesNotThrow(
-        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
-    RecordingData data = recording.snapshot(Instant.now());
-    assertNotNull(data);
-    assertTrue(Files.exists(recording.getRecordingFile()));
-    InputStream inputStream = data.getStream();
-    assertNotNull(inputStream);
-    assertTrue(inputStream.available() > 0);
-    // Snapshot files must live under the same recordings dir as start (SCP-1361).
-    assertNotNull(data.getPath());
-    assertEquals(recording.getRecordingFile().getParent(), data.getPath().getParent());
-  }
+    @Test
+    void testSnapshot() throws Exception {
+        assertDoesNotThrow(() -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
+        RecordingData data = recording.snapshot(Instant.now());
+        assertNotNull(data);
+        assertTrue(Files.exists(recording.getRecordingFile()));
+        InputStream inputStream = data.getStream();
+        assertNotNull(inputStream);
+        assertTrue(inputStream.available() > 0);
+        // Snapshot files must live under the same recordings dir as start (SCP-1361).
+        assertNotNull(data.getPath());
+        assertEquals(recording.getRecordingFile().getParent(), data.getPath().getParent());
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java
index c09e6ce8fb9..7863c64a448 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java
@@ -36,575 +36,539 @@
 import org.slf4j.LoggerFactory;
 
 class DatadogProfilerTest {
-  private static final Logger log = LoggerFactory.getLogger(DatadogProfilerTest.class);
-
-  @BeforeEach
-  public void setup() {
-    Assumptions.assumeTrue(OperatingSystem.isLinux());
-  }
-
-  @Test
-  void test() throws Exception {
-    assertDoesNotThrow(
-        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
-    DatadogProfiler profiler = DatadogProfiler.newInstance(ConfigProvider.getInstance());
-    assertFalse(profiler.enabledModes().isEmpty());
-
-    if (profiler.isActive()) {
-      // apparently the CI is already running with Datadog profiler attached (?)
-      log.warn("Datadog profiler is already running. Skipping the test.");
-      return;
+    private static final Logger log = LoggerFactory.getLogger(DatadogProfilerTest.class);
+
+    @BeforeEach
+    public void setup() {
+        Assumptions.assumeTrue(OperatingSystem.isLinux());
     }
 
-    OngoingRecording recording = profiler.start();
-    if (recording != null) {
-      try {
-        long cumulative = 0L;
-        for (int i = 0; i < 5000; i++) {
-          cumulative ^= UUID.randomUUID().getLeastSignificantBits();
+    @Test
+    void test() throws Exception {
+        assertDoesNotThrow(() -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
+        DatadogProfiler profiler = DatadogProfiler.newInstance(ConfigProvider.getInstance());
+        assertFalse(profiler.enabledModes().isEmpty());
+
+        if (profiler.isActive()) {
+            // apparently the CI is already running with Datadog profiler attached (?)
+            log.warn("Datadog profiler is already running. Skipping the test.");
+            return;
+        }
+
+        OngoingRecording recording = profiler.start();
+        if (recording != null) {
+            try {
+                long cumulative = 0L;
+                for (int i = 0; i < 5000; i++) {
+                    cumulative ^= UUID.randomUUID().getLeastSignificantBits();
+                }
+                log.info("calculated: {}", cumulative);
+                RecordingData data = profiler.stop(recording);
+                assertNotNull(data);
+                IItemCollection events = JfrLoaderToolkit.loadEvents(data.getStream());
+                assertTrue(events.hasItems());
+            } finally {
+                recording.stop();
+            }
+        } else {
+            log.warn("Datadog Profiler is not available. Skipping test.");
         }
-        log.info("calculated: {}", cumulative);
-        RecordingData data = profiler.stop(recording);
-        assertNotNull(data);
-        IItemCollection events = JfrLoaderToolkit.loadEvents(data.getStream());
-        assertTrue(events.hasItems());
-      } finally {
-        recording.stop();
-      }
-    } else {
-      log.warn("Datadog Profiler is not available. Skipping test.");
     }
-  }
 
-  @ParameterizedTest
-  @MethodSource("profilingModes")
-  void testStartCmd(boolean cpu, boolean wall, boolean alloc, boolean memleak) throws Exception {
-    assertDoesNotThrow(
-        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
-    DatadogProfiler profiler =
-        DatadogProfiler.newInstance(configProvider(cpu, wall, alloc, memleak));
+    @ParameterizedTest
+    @MethodSource("profilingModes")
+    void testStartCmd(boolean cpu, boolean wall, boolean alloc, boolean memleak) throws Exception {
+        assertDoesNotThrow(() -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
+        DatadogProfiler profiler = DatadogProfiler.newInstance(configProvider(cpu, wall, alloc, memleak));
 
-    Path targetFile = Paths.get("/tmp/target.jfr");
-    String cmd = profiler.cmdStartProfiling(targetFile);
+        Path targetFile = Paths.get("/tmp/target.jfr");
+        String cmd = profiler.cmdStartProfiling(targetFile);
 
-    if (profiler.enabledModes().contains(ProfilingMode.CPU)) {
-      assertTrue(cmd.contains("cpu="), cmd);
-    }
-    if (profiler.enabledModes().contains(ProfilingMode.WALL)) {
-      assertTrue(cmd.contains("wall="), cmd);
+        if (profiler.enabledModes().contains(ProfilingMode.CPU)) {
+            assertTrue(cmd.contains("cpu="), cmd);
+        }
+        if (profiler.enabledModes().contains(ProfilingMode.WALL)) {
+            assertTrue(cmd.contains("wall="), cmd);
+        }
+        if (profiler.enabledModes().contains(ProfilingMode.ALLOCATION)) {
+            assertTrue(cmd.matches(".*?memory=[0-9]+b?:.*?a.*"), cmd);
+        }
+        if (profiler.enabledModes().contains(ProfilingMode.MEMLEAK)) {
+            assertTrue(cmd.matches(".*?memory=[0-9]+b?:.*?[lL].*"), cmd);
+        }
     }
-    if (profiler.enabledModes().contains(ProfilingMode.ALLOCATION)) {
-      assertTrue(cmd.matches(".*?memory=[0-9]+b?:.*?a.*"), cmd);
+
+    private static Stream<Arguments> profilingModes() {
+        return IntStream.range(0, 1 << 4)
+                .mapToObj(x -> Arguments.of((x & 0x1000) != 0, (x & 0x100) != 0, (x & 0x10) != 0, (x & 0x1) != 0));
     }
-    if (profiler.enabledModes().contains(ProfilingMode.MEMLEAK)) {
-      assertTrue(cmd.matches(".*?memory=[0-9]+b?:.*?[lL].*"), cmd);
+
+    @Test
+    void testStartCmdEnableJMethodIDOptim() throws Exception {
+        assertDoesNotThrow(() -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
+
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_JMETHODID_OPTIM_ENABLED, "true");
+        DatadogProfiler profiler = DatadogProfiler.newInstance(ConfigProvider.withPropertiesOverride(props));
+
+        assertTrue(startCmd(profiler).contains(",fjmethodid=false"));
     }
-  }
-
-  private static Stream<Arguments> profilingModes() {
-    return IntStream.range(0, 1 << 4)
-        .mapToObj(
-            x ->
-                Arguments.of((x & 0x1000) != 0, (x & 0x100) != 0, (x & 0x10) != 0, (x & 0x1) != 0));
-  }
-
-  @Test
-  void testStartCmdEnableJMethodIDOptim() throws Exception {
-    assertDoesNotThrow(
-        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
-
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_JMETHODID_OPTIM_ENABLED, "true");
-    DatadogProfiler profiler =
-        DatadogProfiler.newInstance(ConfigProvider.withPropertiesOverride(props));
-
-    assertTrue(startCmd(profiler).contains(",fjmethodid=false"));
-  }
-
-  @Test
-  void testStartCmdNativeMemDisabledByDefault() throws Exception {
-    assertDoesNotThrow(
-        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
-
-    DatadogProfiler profiler = DatadogProfiler.newInstance(ConfigProvider.getInstance());
-    assertFalse(profiler.enabledModes().contains(ProfilingMode.NATIVEMEM));
-
-    assertFalse(startCmd(profiler).contains(",nativemem="));
-  }
-
-  @Test
-  void testStartCmdNativeMemEnabled() throws Exception {
-    assertDoesNotThrow(
-        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
-
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_NATIVEMEM_ENABLED, "true");
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_NATIVEMEM_INTERVAL, "131072");
-    DatadogProfiler profiler =
-        DatadogProfiler.newInstance(ConfigProvider.withPropertiesOverride(props));
-    assertTrue(profiler.enabledModes().contains(ProfilingMode.NATIVEMEM));
-
-    assertTrue(startCmd(profiler).contains(",nativemem=131072"));
-  }
-
-  @Test
-  void testStartCmdNativeSocketDisabledByDefault() throws Exception {
-    assertDoesNotThrow(
-        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
-
-    DatadogProfiler profiler = DatadogProfiler.newInstance(ConfigProvider.getInstance());
-    assertFalse(profiler.enabledModes().contains(ProfilingMode.NATIVESOCKET));
-
-    assertFalse(startCmd(profiler).contains(",natsock"));
-  }
-
-  @Test
-  void testStartCmdNativeSocketEnabledWithoutInterval() throws Exception {
-    assertDoesNotThrow(
-        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
-
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_NATIVESOCKET_ENABLED, "true");
-    DatadogProfiler profiler =
-        DatadogProfiler.newInstance(ConfigProvider.withPropertiesOverride(props));
-    assertTrue(profiler.enabledModes().contains(ProfilingMode.NATIVESOCKET));
-
-    String cmd = startCmd(profiler);
-    assertTrue(cmd.contains(",natsock"));
-    assertFalse(cmd.contains(",natsock="));
-  }
-
-  @Test
-  void testStartCmdNativeSocketEnabledWithInterval() throws Exception {
-    assertDoesNotThrow(
-        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
-
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_NATIVESOCKET_ENABLED, "true");
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_NATIVESOCKET_INTERVAL, "100us");
-    DatadogProfiler profiler =
-        DatadogProfiler.newInstance(ConfigProvider.withPropertiesOverride(props));
-    assertTrue(profiler.enabledModes().contains(ProfilingMode.NATIVESOCKET));
-
-    assertTrue(startCmd(profiler).contains(",natsock=100us"));
-  }
-
-  private static String startCmd(DatadogProfiler profiler) throws Exception {
-    Path targetFile = Files.createTempFile(Paths.get("/tmp"), "target_", ".jfr");
-    return profiler.cmdStartProfiling(targetFile);
-  }
-
-  @ParameterizedTest
-  @MethodSource("wallContextFilterModes")
-  void testWallContextFilter(boolean tracingEnabled, boolean contextFilterEnabled)
-      throws Exception {
-    // Skip test if profiler native library is not available (e.g., on macOS)
-    try {
-      Throwable reason = DdprofLibraryLoader.jvmAccess().getReasonNotLoaded();
-      if (reason != null) {
-        Assumptions.assumeTrue(false, "Profiler not available: " + reason.getMessage());
-      }
-    } catch (Throwable e) {
-      Assumptions.assumeTrue(false, "Profiler not available: " + e.getMessage());
+
+    @Test
+    void testStartCmdNativeMemDisabledByDefault() throws Exception {
+        assertDoesNotThrow(() -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
+
+        DatadogProfiler profiler = DatadogProfiler.newInstance(ConfigProvider.getInstance());
+        assertFalse(profiler.enabledModes().contains(ProfilingMode.NATIVEMEM));
+
+        assertFalse(startCmd(profiler).contains(",nativemem="));
     }
 
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED, "true");
-    props.put(TraceInstrumentationConfig.TRACE_ENABLED, Boolean.toString(tracingEnabled));
-    props.put(
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER,
-        Boolean.toString(contextFilterEnabled));
-
-    DatadogProfiler profiler =
-        DatadogProfiler.newInstance(ConfigProvider.withPropertiesOverride(props));
-
-    Path targetFile = Paths.get("/tmp/target.jfr");
-    String cmd = profiler.cmdStartProfiling(targetFile);
-
-    assertTrue(cmd.contains("wall="), "Command should contain wall profiling: " + cmd);
-
-    if (tracingEnabled && contextFilterEnabled) {
-      assertTrue(
-          cmd.contains(",filter=0"),
-          "Command should contain ',filter=0' when tracing and context filter are enabled: " + cmd);
-    } else {
-      assertTrue(
-          cmd.contains(",filter="),
-          "Command should contain ',filter=' when tracing is disabled or context filter is disabled: "
-              + cmd);
-      if (cmd.contains(",filter=0")) {
-        throw new AssertionError(
-            "Command should not contain ',filter=0' when tracing is disabled or context filter is disabled: "
-                + cmd);
-      }
+    @Test
+    void testStartCmdNativeMemEnabled() throws Exception {
+        assertDoesNotThrow(() -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
+
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_NATIVEMEM_ENABLED, "true");
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_NATIVEMEM_INTERVAL, "131072");
+        DatadogProfiler profiler = DatadogProfiler.newInstance(ConfigProvider.withPropertiesOverride(props));
+        assertTrue(profiler.enabledModes().contains(ProfilingMode.NATIVEMEM));
+
+        assertTrue(startCmd(profiler).contains(",nativemem=131072"));
     }
-  }
-
-  private static Stream<Arguments> wallContextFilterModes() {
-    return Stream.of(
-        Arguments.of(true, true), // tracing enabled, context filter enabled -> filter=0
-        Arguments.of(true, false), // tracing enabled, context filter disabled -> filter=
-        Arguments.of(
-            false, true), // tracing disabled, context filter enabled -> filter= (tracing disabled
-        // overrides)
-        Arguments.of(false, false) // tracing disabled, context filter disabled -> filter=
-        );
-  }
-
-  @Test
-  public void testContextRegistration() {
-    // warning - the profiler is a process wide singleton and can't be reinitialised
-    // so there is only one shot to test it here, 'foo,bar' need to be kept in the same
-    // order whether in the list or the enum, and any other test which tries to register
-    // context attributes will fail
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_ENABLED, "true");
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED, "true");
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_ALLOC_ENABLED, "true");
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED, "true");
-    props.put(ProfilingConfig.PROFILING_CONTEXT_ATTRIBUTES, "foo,bar");
-    DatadogProfiler profiler =
-        DatadogProfiler.newInstance(ConfigProvider.withPropertiesOverride(props));
-    assertTrue(profiler.setContextValue("foo", "abc"));
-    assertTrue(profiler.setContextValue("bar", "abc"));
-    assertTrue(profiler.setContextValue("foo", "xyz"));
-    assertFalse(profiler.setContextValue("xyz", "foo"));
-
-    DatadogProfilerContextSetter fooSetter = new DatadogProfilerContextSetter("foo", profiler);
-    DatadogProfilerContextSetter barSetter = new DatadogProfilerContextSetter("bar", profiler);
-    try (ProfilingScope ignored = new DatadogProfilingScope(profiler)) {
-      fooSetter.set("foo0");
-      barSetter.set("bar0");
-      int[] snapshot1 = profiler.snapshot();
-      try (ProfilingScope inner = new DatadogProfilingScope(profiler)) {
-        fooSetter.set("foo1");
-        barSetter.set("bar1");
-        assertFalse(Arrays.equals(snapshot1, profiler.snapshot()));
-        int[] snapshot2 = profiler.snapshot();
-        inner.setContextValue("foo", "foo2");
-        inner.setContextValue("bar", "bar2");
-        assertFalse(Arrays.equals(snapshot2, profiler.snapshot()));
-      }
+
+    @Test
+    void testStartCmdNativeSocketDisabledByDefault() throws Exception {
+        assertDoesNotThrow(() -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
+
+        DatadogProfiler profiler = DatadogProfiler.newInstance(ConfigProvider.getInstance());
+        assertFalse(profiler.enabledModes().contains(ProfilingMode.NATIVESOCKET));
+
+        assertFalse(startCmd(profiler).contains(",natsock"));
     }
 
-    // setSpanContext wipes all custom slots and automatically calls reapplyAppContext() to restore
-    // them.
-    int fooOffset = profiler.offsetOf("foo");
-    fooSetter.set("reapply-me");
-    assertNotEquals(0, profiler.snapshot()[fooOffset]);
-
-    profiler.setSpanContext(1L, 1L, 0L, 1L);
-    assertNotEquals(0, profiler.snapshot()[fooOffset]);
-
-    profiler.reapplyAppContext();
-    assertNotEquals(0, profiler.snapshot()[fooOffset]);
-
-    // Scenario A: clearContextValue must clear the snapshot so reapply has nothing to restore
-    profiler.clearContextValue("foo");
-    assertEquals(0, profiler.snapshot()[fooOffset], "clearContextValue must clear ddprof slot");
-    profiler.reapplyAppContext();
-    assertEquals(
-        0,
-        profiler.snapshot()[fooOffset],
-        "after clearContextValue, reapplyAppContext must not restore foo");
-
-    // Scenario B: scope opened when snapshot is null — close() restores null (pre-scope state)
-    {
-      DatadogProfilingScope scope = new DatadogProfilingScope(profiler);
-      scope.setContextValue("foo", "scope-val");
-      assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live inside scope");
-      scope.close();
+    @Test
+    void testStartCmdNativeSocketEnabledWithoutInterval() throws Exception {
+        assertDoesNotThrow(() -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
+
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_NATIVESOCKET_ENABLED, "true");
+        DatadogProfiler profiler = DatadogProfiler.newInstance(ConfigProvider.withPropertiesOverride(props));
+        assertTrue(profiler.enabledModes().contains(ProfilingMode.NATIVESOCKET));
+
+        String cmd = startCmd(profiler);
+        assertTrue(cmd.contains(",natsock"));
+        assertFalse(cmd.contains(",natsock="));
     }
-    profiler.setSpanContext(1L, 1L, 0L, 1L);
-    profiler.reapplyAppContext();
-    assertEquals(
-        0,
-        profiler.snapshot()[fooOffset],
-        "scope.close() restores pre-scope snapshot (null here), so reapply has nothing to restore");
-
-    // Scenario B2: scope.close() immediately clears native slot — no span re-activation needed
-    {
-      DatadogProfilingScope scope = new DatadogProfilingScope(profiler);
-      scope.setContextValue("foo", "immediate-clear-val");
-      assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live inside scope");
-      scope.close();
-      assertEquals(
-          0,
-          profiler.snapshot()[fooOffset],
-          "scope.close() must immediately clear native slot without waiting for reapplyAppContext");
+
+    @Test
+    void testStartCmdNativeSocketEnabledWithInterval() throws Exception {
+        assertDoesNotThrow(() -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
+
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_NATIVESOCKET_ENABLED, "true");
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_NATIVESOCKET_INTERVAL, "100us");
+        DatadogProfiler profiler = DatadogProfiler.newInstance(ConfigProvider.withPropertiesOverride(props));
+        assertTrue(profiler.enabledModes().contains(ProfilingMode.NATIVESOCKET));
+
+        assertTrue(startCmd(profiler).contains(",natsock=100us"));
     }
 
-    // Scenario B3: scope.close() immediately restores prior context to native slot
-    fooSetter.set("outer-val");
-    int outerEncoding = profiler.snapshot()[fooOffset];
-    assertNotEquals(0, outerEncoding, "outer foo must be live before inner scope");
-    {
-      DatadogProfilingScope scope = new DatadogProfilingScope(profiler);
-      scope.setContextValue("foo", "inner-val");
-      int innerEncoding = profiler.snapshot()[fooOffset];
-      assertNotEquals(outerEncoding, innerEncoding, "inner scope must change native slot");
-      scope.close();
-      assertEquals(
-          outerEncoding,
-          profiler.snapshot()[fooOffset],
-          "scope.close() must immediately restore prior native slot value");
+    private static String startCmd(DatadogProfiler profiler) throws Exception {
+        Path targetFile = Files.createTempFile(Paths.get("/tmp"), "target_", ".jfr");
+        return profiler.cmdStartProfiling(targetFile);
     }
-    profiler.clearContextValue("foo");
-
-    // Scenario C: reapplyAppContext is idempotent
-    fooSetter.set("idempotent-value");
-    profiler.setSpanContext(1L, 1L, 0L, 1L);
-    profiler.reapplyAppContext();
-    int afterFirst = profiler.snapshot()[fooOffset];
-    assertNotEquals(0, afterFirst, "reapplyAppContext must restore foo");
-    profiler.reapplyAppContext();
-    assertEquals(
-        afterFirst,
-        profiler.snapshot()[fooOffset],
-        "calling reapplyAppContext twice must produce the same result");
-
-    // Scenario D: re-activation after child activation restores app attr
-    int parentEncoding = profiler.snapshot()[fooOffset];
-    assertNotEquals(0, parentEncoding, "foo must be set before child activation");
-    profiler.setSpanContext(2L, 2L, 0L, 2L);
-    assertEquals(
-        parentEncoding,
-        profiler.snapshot()[fooOffset],
-        "setSpanContext auto-reapplies app context on child activation");
-    profiler.setSpanContext(1L, 1L, 0L, 1L);
-    profiler.reapplyAppContext();
-    assertEquals(
-        parentEncoding,
-        profiler.snapshot()[fooOffset],
-        "re-activation + reapply must restore parent app attr");
-
-    // Scenario E: app attr set in child survives into next activation
-    profiler.setSpanContext(2L, 2L, 0L, 2L);
-    fooSetter.set("child-val");
-    int childEncoding = profiler.snapshot()[fooOffset];
-    assertNotEquals(0, childEncoding, "foo must be set in child context");
-    profiler.setSpanContext(1L, 1L, 0L, 1L);
-    assertEquals(
-        childEncoding,
-        profiler.snapshot()[fooOffset],
-        "setSpanContext auto-reapplies app context (child-val) on re-activation");
-    profiler.reapplyAppContext();
-    assertEquals(
-        childEncoding,
-        profiler.snapshot()[fooOffset],
-        "ThreadLocal ambient value must survive into the next activation");
-
-    // Scenario F: app attributes are visible after the last span scope closes.
-    // clearSpanContext() wipes all custom slots and automatically calls reapplyAppContext(),
-    // restoring app attrs immediately.
-    fooSetter.set("pre-close-val");
-    assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live before clearSpanContext");
-    profiler.clearSpanContext();
-    assertNotEquals(
-        0, profiler.snapshot()[fooOffset], "clearSpanContext must auto-reapply app context");
-    profiler.reapplyAppContext();
-    assertNotEquals(
-        0,
-        profiler.snapshot()[fooOffset],
-        "reapplyAppContext after clearSpanContext must restore foo");
-
-    // Scenario G: no app value set — clearSpanContext + reapplyAppContext leaves slot empty
-    profiler.clearContextValue("foo");
-    profiler.clearAppContextSnapshot();
-    profiler.clearSpanContext();
-    profiler.reapplyAppContext();
-    assertEquals(
-        0,
-        profiler.snapshot()[fooOffset],
-        "reapplyAppContext with no snapshot must leave foo at 0");
-
-    // Scenario H: scope.close() restores ambient context set before scope was opened
-    fooSetter.set("ambient-val");
-    // Activate a span so reapplyAppContext can write the value (validOffset=1 after
-    // setSpanContext).
-    profiler.setSpanContext(1L, 1L, 0L, 1L);
-    profiler.reapplyAppContext();
-    int ambientEncoding = profiler.snapshot()[fooOffset];
-    assertNotEquals(0, ambientEncoding, "ambient foo must be live");
-    {
-      DatadogProfilingScope scope = new DatadogProfilingScope(profiler);
-      scope.setContextValue("foo", "scope-override");
-      assertNotEquals(
-          ambientEncoding, profiler.snapshot()[fooOffset], "scope must override ambient");
-      scope.close(); // must restore ambient snapshot, not nuke it
+
+    @ParameterizedTest
+    @MethodSource("wallContextFilterModes")
+    void testWallContextFilter(boolean tracingEnabled, boolean contextFilterEnabled) throws Exception {
+        // Skip test if profiler native library is not available (e.g., on macOS)
+        try {
+            Throwable reason = DdprofLibraryLoader.jvmAccess().getReasonNotLoaded();
+            if (reason != null) {
+                Assumptions.assumeTrue(false, "Profiler not available: " + reason.getMessage());
+            }
+        } catch (Throwable e) {
+            Assumptions.assumeTrue(false, "Profiler not available: " + e.getMessage());
+        }
+
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED, "true");
+        props.put(TraceInstrumentationConfig.TRACE_ENABLED, Boolean.toString(tracingEnabled));
+        props.put(
+                ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER, Boolean.toString(contextFilterEnabled));
+
+        DatadogProfiler profiler = DatadogProfiler.newInstance(ConfigProvider.withPropertiesOverride(props));
+
+        Path targetFile = Paths.get("/tmp/target.jfr");
+        String cmd = profiler.cmdStartProfiling(targetFile);
+
+        assertTrue(cmd.contains("wall="), "Command should contain wall profiling: " + cmd);
+
+        if (tracingEnabled && contextFilterEnabled) {
+            assertTrue(
+                    cmd.contains(",filter=0"),
+                    "Command should contain ',filter=0' when tracing and context filter are enabled: " + cmd);
+        } else {
+            assertTrue(
+                    cmd.contains(",filter="),
+                    "Command should contain ',filter=' when tracing is disabled or context filter is disabled: " + cmd);
+            if (cmd.contains(",filter=0")) {
+                throw new AssertionError(
+                        "Command should not contain ',filter=0' when tracing is disabled or context filter is disabled: "
+                                + cmd);
+            }
+        }
     }
-    profiler.setSpanContext(1L, 1L, 0L, 1L);
-    profiler.reapplyAppContext();
-    assertEquals(
-        ambientEncoding,
-        profiler.snapshot()[fooOffset],
-        "scope.close() must restore ambient context, not clear it");
-
-    // Clean up after Scenario H so Acceptance tests start from a neutral state.
-    profiler.clearContextValue("foo");
-    profiler.clearSpanContext();
-
-    // Acceptance 1: reapply happens automatically inside setSpanContext — no manual call needed.
-    fooSetter.set("auto-reapply-val");
-    assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live before setSpanContext");
-    profiler.setSpanContext(1L, 1L, 0L, 1L);
-    // Deliberately NO profiler.reapplyAppContext() here.
-    assertNotEquals(
-        0,
-        profiler.snapshot()[fooOffset],
-        "Acceptance 1: setSpanContext must auto-restore app slot without explicit reapplyAppContext");
-    profiler.clearContextValue("foo");
-
-    // Acceptance 2: reapply happens automatically inside clearSpanContext — no manual call needed.
-    fooSetter.set("clear-reapply-val");
-    assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live before clearSpanContext");
-    profiler.clearSpanContext();
-    // Deliberately NO profiler.reapplyAppContext() here.
-    assertNotEquals(
-        0,
-        profiler.snapshot()[fooOffset],
-        "Acceptance 2: clearSpanContext must auto-restore app slot without explicit reapplyAppContext");
-    profiler.clearContextValue("foo");
-
-    // Acceptance 3: no app value set — clearSpanContext leaves slot empty.
-    profiler.clearContextValue("foo");
-    profiler.clearAppContextSnapshot();
-    profiler.clearSpanContext();
-    // Deliberately NO profiler.reapplyAppContext() here.
-    assertEquals(
-        0,
-        profiler.snapshot()[fooOffset],
-        "Acceptance 3: clearSpanContext with no app value must leave foo at 0");
-
-    // Acceptance 4: nonZeroCount accuracy — cleared snapshot is considered empty so a new
-    // scope's save/restore does not leak a stale entry.
-    fooSetter.set("v1");
-    assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live after set");
-    profiler.clearContextValue("foo");
-    assertEquals(0, profiler.snapshot()[fooOffset], "foo must be 0 after clearContextValue");
-    {
-      DatadogProfilingScope scope4 = new DatadogProfilingScope(profiler);
-      scope4.setContextValue("foo", "v2");
-      assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live inside scope4");
-      scope4.close();
+
+    private static Stream<Arguments> wallContextFilterModes() {
+        return Stream.of(
+                Arguments.of(true, true), // tracing enabled, context filter enabled -> filter=0
+                Arguments.of(true, false), // tracing enabled, context filter disabled -> filter=
+                Arguments.of(false, true), // tracing disabled, context filter enabled -> filter= (tracing disabled
+                // overrides)
+                Arguments.of(false, false) // tracing disabled, context filter disabled -> filter=
+                );
     }
-    assertEquals(
-        0,
-        profiler.snapshot()[fooOffset],
-        "Acceptance 4: scope.close() must restore pre-scope empty state; nonZeroCount must not drift");
-
-    // Acceptance 5: clearAppContextSnapshot() fully resets per-thread state so no stale value
-    // leaks through.
-    fooSetter.set("leak-check");
-    assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live before reset");
-    profiler.clearContextValue("foo");
-    profiler.clearAppContextSnapshot();
-    {
-      DatadogProfilingScope scope5 = new DatadogProfilingScope(profiler);
-      scope5.setContextValue("foo", "after-reset");
-      assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live inside scope5");
-      scope5.close();
+
+    @Test
+    public void testContextRegistration() {
+        // warning - the profiler is a process wide singleton and can't be reinitialised
+        // so there is only one shot to test it here, 'foo,bar' need to be kept in the same
+        // order whether in the list or the enum, and any other test which tries to register
+        // context attributes will fail
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_ENABLED, "true");
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED, "true");
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_ALLOC_ENABLED, "true");
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED, "true");
+        props.put(ProfilingConfig.PROFILING_CONTEXT_ATTRIBUTES, "foo,bar");
+        DatadogProfiler profiler = DatadogProfiler.newInstance(ConfigProvider.withPropertiesOverride(props));
+        assertTrue(profiler.setContextValue("foo", "abc"));
+        assertTrue(profiler.setContextValue("bar", "abc"));
+        assertTrue(profiler.setContextValue("foo", "xyz"));
+        assertFalse(profiler.setContextValue("xyz", "foo"));
+
+        DatadogProfilerContextSetter fooSetter = new DatadogProfilerContextSetter("foo", profiler);
+        DatadogProfilerContextSetter barSetter = new DatadogProfilerContextSetter("bar", profiler);
+        try (ProfilingScope ignored = new DatadogProfilingScope(profiler)) {
+            fooSetter.set("foo0");
+            barSetter.set("bar0");
+            int[] snapshot1 = profiler.snapshot();
+            try (ProfilingScope inner = new DatadogProfilingScope(profiler)) {
+                fooSetter.set("foo1");
+                barSetter.set("bar1");
+                assertFalse(Arrays.equals(snapshot1, profiler.snapshot()));
+                int[] snapshot2 = profiler.snapshot();
+                inner.setContextValue("foo", "foo2");
+                inner.setContextValue("bar", "bar2");
+                assertFalse(Arrays.equals(snapshot2, profiler.snapshot()));
+            }
+        }
+
+        // setSpanContext wipes all custom slots and automatically calls reapplyAppContext() to restore
+        // them.
+        int fooOffset = profiler.offsetOf("foo");
+        fooSetter.set("reapply-me");
+        assertNotEquals(0, profiler.snapshot()[fooOffset]);
+
+        profiler.setSpanContext(1L, 1L, 0L, 1L);
+        assertNotEquals(0, profiler.snapshot()[fooOffset]);
+
+        profiler.reapplyAppContext();
+        assertNotEquals(0, profiler.snapshot()[fooOffset]);
+
+        // Scenario A: clearContextValue must clear the snapshot so reapply has nothing to restore
+        profiler.clearContextValue("foo");
+        assertEquals(0, profiler.snapshot()[fooOffset], "clearContextValue must clear ddprof slot");
+        profiler.reapplyAppContext();
+        assertEquals(
+                0, profiler.snapshot()[fooOffset], "after clearContextValue, reapplyAppContext must not restore foo");
+
+        // Scenario B: scope opened when snapshot is null — close() restores null (pre-scope state)
+        {
+            DatadogProfilingScope scope = new DatadogProfilingScope(profiler);
+            scope.setContextValue("foo", "scope-val");
+            assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live inside scope");
+            scope.close();
+        }
+        profiler.setSpanContext(1L, 1L, 0L, 1L);
+        profiler.reapplyAppContext();
+        assertEquals(
+                0,
+                profiler.snapshot()[fooOffset],
+                "scope.close() restores pre-scope snapshot (null here), so reapply has nothing to restore");
+
+        // Scenario B2: scope.close() immediately clears native slot — no span re-activation needed
+        {
+            DatadogProfilingScope scope = new DatadogProfilingScope(profiler);
+            scope.setContextValue("foo", "immediate-clear-val");
+            assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live inside scope");
+            scope.close();
+            assertEquals(
+                    0,
+                    profiler.snapshot()[fooOffset],
+                    "scope.close() must immediately clear native slot without waiting for reapplyAppContext");
+        }
+
+        // Scenario B3: scope.close() immediately restores prior context to native slot
+        fooSetter.set("outer-val");
+        int outerEncoding = profiler.snapshot()[fooOffset];
+        assertNotEquals(0, outerEncoding, "outer foo must be live before inner scope");
+        {
+            DatadogProfilingScope scope = new DatadogProfilingScope(profiler);
+            scope.setContextValue("foo", "inner-val");
+            int innerEncoding = profiler.snapshot()[fooOffset];
+            assertNotEquals(outerEncoding, innerEncoding, "inner scope must change native slot");
+            scope.close();
+            assertEquals(
+                    outerEncoding,
+                    profiler.snapshot()[fooOffset],
+                    "scope.close() must immediately restore prior native slot value");
+        }
+        profiler.clearContextValue("foo");
+
+        // Scenario C: reapplyAppContext is idempotent
+        fooSetter.set("idempotent-value");
+        profiler.setSpanContext(1L, 1L, 0L, 1L);
+        profiler.reapplyAppContext();
+        int afterFirst = profiler.snapshot()[fooOffset];
+        assertNotEquals(0, afterFirst, "reapplyAppContext must restore foo");
+        profiler.reapplyAppContext();
+        assertEquals(
+                afterFirst,
+                profiler.snapshot()[fooOffset],
+                "calling reapplyAppContext twice must produce the same result");
+
+        // Scenario D: re-activation after child activation restores app attr
+        int parentEncoding = profiler.snapshot()[fooOffset];
+        assertNotEquals(0, parentEncoding, "foo must be set before child activation");
+        profiler.setSpanContext(2L, 2L, 0L, 2L);
+        assertEquals(
+                parentEncoding,
+                profiler.snapshot()[fooOffset],
+                "setSpanContext auto-reapplies app context on child activation");
+        profiler.setSpanContext(1L, 1L, 0L, 1L);
+        profiler.reapplyAppContext();
+        assertEquals(
+                parentEncoding, profiler.snapshot()[fooOffset], "re-activation + reapply must restore parent app attr");
+
+        // Scenario E: app attr set in child survives into next activation
+        profiler.setSpanContext(2L, 2L, 0L, 2L);
+        fooSetter.set("child-val");
+        int childEncoding = profiler.snapshot()[fooOffset];
+        assertNotEquals(0, childEncoding, "foo must be set in child context");
+        profiler.setSpanContext(1L, 1L, 0L, 1L);
+        assertEquals(
+                childEncoding,
+                profiler.snapshot()[fooOffset],
+                "setSpanContext auto-reapplies app context (child-val) on re-activation");
+        profiler.reapplyAppContext();
+        assertEquals(
+                childEncoding,
+                profiler.snapshot()[fooOffset],
+                "ThreadLocal ambient value must survive into the next activation");
+
+        // Scenario F: app attributes are visible after the last span scope closes.
+        // clearSpanContext() wipes all custom slots and automatically calls reapplyAppContext(),
+        // restoring app attrs immediately.
+        fooSetter.set("pre-close-val");
+        assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live before clearSpanContext");
+        profiler.clearSpanContext();
+        assertNotEquals(0, profiler.snapshot()[fooOffset], "clearSpanContext must auto-reapply app context");
+        profiler.reapplyAppContext();
+        assertNotEquals(0, profiler.snapshot()[fooOffset], "reapplyAppContext after clearSpanContext must restore foo");
+
+        // Scenario G: no app value set — clearSpanContext + reapplyAppContext leaves slot empty
+        profiler.clearContextValue("foo");
+        profiler.clearAppContextSnapshot();
+        profiler.clearSpanContext();
+        profiler.reapplyAppContext();
+        assertEquals(0, profiler.snapshot()[fooOffset], "reapplyAppContext with no snapshot must leave foo at 0");
+
+        // Scenario H: scope.close() restores ambient context set before scope was opened
+        fooSetter.set("ambient-val");
+        // Activate a span so reapplyAppContext can write the value (validOffset=1 after
+        // setSpanContext).
+        profiler.setSpanContext(1L, 1L, 0L, 1L);
+        profiler.reapplyAppContext();
+        int ambientEncoding = profiler.snapshot()[fooOffset];
+        assertNotEquals(0, ambientEncoding, "ambient foo must be live");
+        {
+            DatadogProfilingScope scope = new DatadogProfilingScope(profiler);
+            scope.setContextValue("foo", "scope-override");
+            assertNotEquals(ambientEncoding, profiler.snapshot()[fooOffset], "scope must override ambient");
+            scope.close(); // must restore ambient snapshot, not nuke it
+        }
+        profiler.setSpanContext(1L, 1L, 0L, 1L);
+        profiler.reapplyAppContext();
+        assertEquals(
+                ambientEncoding,
+                profiler.snapshot()[fooOffset],
+                "scope.close() must restore ambient context, not clear it");
+
+        // Clean up after Scenario H so Acceptance tests start from a neutral state.
+        profiler.clearContextValue("foo");
+        profiler.clearSpanContext();
+
+        // Acceptance 1: reapply happens automatically inside setSpanContext — no manual call needed.
+        fooSetter.set("auto-reapply-val");
+        assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live before setSpanContext");
+        profiler.setSpanContext(1L, 1L, 0L, 1L);
+        // Deliberately NO profiler.reapplyAppContext() here.
+        assertNotEquals(
+                0,
+                profiler.snapshot()[fooOffset],
+                "Acceptance 1: setSpanContext must auto-restore app slot without explicit reapplyAppContext");
+        profiler.clearContextValue("foo");
+
+        // Acceptance 2: reapply happens automatically inside clearSpanContext — no manual call needed.
+        fooSetter.set("clear-reapply-val");
+        assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live before clearSpanContext");
+        profiler.clearSpanContext();
+        // Deliberately NO profiler.reapplyAppContext() here.
+        assertNotEquals(
+                0,
+                profiler.snapshot()[fooOffset],
+                "Acceptance 2: clearSpanContext must auto-restore app slot without explicit reapplyAppContext");
+        profiler.clearContextValue("foo");
+
+        // Acceptance 3: no app value set — clearSpanContext leaves slot empty.
+        profiler.clearContextValue("foo");
+        profiler.clearAppContextSnapshot();
+        profiler.clearSpanContext();
+        // Deliberately NO profiler.reapplyAppContext() here.
+        assertEquals(
+                0,
+                profiler.snapshot()[fooOffset],
+                "Acceptance 3: clearSpanContext with no app value must leave foo at 0");
+
+        // Acceptance 4: nonZeroCount accuracy — cleared snapshot is considered empty so a new
+        // scope's save/restore does not leak a stale entry.
+        fooSetter.set("v1");
+        assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live after set");
+        profiler.clearContextValue("foo");
+        assertEquals(0, profiler.snapshot()[fooOffset], "foo must be 0 after clearContextValue");
+        {
+            DatadogProfilingScope scope4 = new DatadogProfilingScope(profiler);
+            scope4.setContextValue("foo", "v2");
+            assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live inside scope4");
+            scope4.close();
+        }
+        assertEquals(
+                0,
+                profiler.snapshot()[fooOffset],
+                "Acceptance 4: scope.close() must restore pre-scope empty state; nonZeroCount must not drift");
+
+        // Acceptance 5: clearAppContextSnapshot() fully resets per-thread state so no stale value
+        // leaks through.
+        fooSetter.set("leak-check");
+        assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live before reset");
+        profiler.clearContextValue("foo");
+        profiler.clearAppContextSnapshot();
+        {
+            DatadogProfilingScope scope5 = new DatadogProfilingScope(profiler);
+            scope5.setContextValue("foo", "after-reset");
+            assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live inside scope5");
+            scope5.close();
+        }
+        profiler.setSpanContext(1L, 1L, 0L, 1L);
+        // Deliberately NO profiler.reapplyAppContext() here — fold-in suffices.
+        assertEquals(
+                0,
+                profiler.snapshot()[fooOffset],
+                "Acceptance 5: after clearAppContextSnapshot, scope.close() restores empty state; no stale value leaks");
+
+        // Acceptance 6: restoreAppContext does not throw when scope stack is absent on the restoring
+        // thread. The guard is verified by the absence of an exception on the normal close path.
+        profiler.clearSpanContext();
+        profiler.clearContextValue("foo");
+        profiler.clearAppContextSnapshot();
+        assertDoesNotThrow(
+                () -> {
+                    DatadogProfilingScope scope6 = new DatadogProfilingScope(profiler);
+                    scope6.setContextValue("foo", "guard-val");
+                    scope6.close();
+                },
+                "Acceptance 6: DatadogProfilingScope.close() must not throw even when scopeStack is absent");
+
+        // Guard: a zero span id must not throw and must degrade to a clean clear that still reapplies
+        // app context. The native setTraceContext rejects spanId==0 (IllegalArgumentException); the
+        // bridge routes a zero span to clearTraceContext rather than letting that throw be swallowed
+        // over stale context. Span ids are non-zero by construction, so this only exercises the
+        // defensive path. Note: the clean-clear-vs-stale distinction lives in the trace/span and
+        // operation/resource slots, which this fixture does not expose (operation/resource context
+        // attributes are not configured here, and snapshot() reads only custom app-attribute
+        // encodings); so this locks the observable contract — no throw, app context preserved.
+        profiler.clearSpanContext();
+        profiler.clearContextValue("foo");
+        profiler.clearAppContextSnapshot();
+        fooSetter.set("zero-span-guard");
+        assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live before the zero-span activation");
+        assertDoesNotThrow(
+                () -> profiler.setSpanContext(1L, 0L, 0L, 1L),
+                "Guard: a zero span id must not throw (routed to clearTraceContext, not a swallowed IAE)");
+        assertNotEquals(
+                0,
+                profiler.snapshot()[fooOffset],
+                "Guard: zero-span activation must degrade to a clean clear that still reapplies app context");
+        profiler.clearContextValue("foo");
+
+        // Regression: a native setContextValue rejection (e.g. an oversized value, >255 UTF-8 bytes)
+        // clears the native slot; the prior value must be resynced immediately instead of only
+        // reappearing on the next span boundary (a flicker the pre-migration DBB path never had,
+        // since it retained the prior value continuously).
+        fooSetter.set("valid-before-reject");
+        int validEncoding = profiler.snapshot()[fooOffset];
+        assertNotEquals(0, validEncoding, "foo must be live before the rejected write");
+        StringBuilder oversized = new StringBuilder();
+        for (int i = 0; i < 300; i++) {
+            oversized.append('x');
+        }
+        assertFalse(
+                profiler.setContextValue("foo", oversized.toString()),
+                "an oversized (>255 UTF-8 bytes) value must be rejected");
+        assertEquals(
+                validEncoding,
+                profiler.snapshot()[fooOffset],
+                "a rejected write must not blank the slot; the prior value must stay visible immediately");
+        profiler.clearContextValue("foo");
+
+        // Regression: setTraceContext's trailing reapplyAppContext must not clobber the span-derived
+        // value it just wrote natively to operationOffset/resourceOffset, even when that offset is
+        // also app-owned (e.g. profiling.context.attributes names _dd.trace.operation/resource while
+        // span-name/resource-name context is enabled). Reuses the "foo" app-owned offset as a stand-in
+        // operationOffset — the profiler is a process-wide singleton and its context attributes can't
+        // be reconfigured to register the real _dd.trace.operation/resource offsets here.
+        profiler.setContextValue(fooOffset, "span-derived-value");
+        int spanDerivedEncoding = profiler.snapshot()[fooOffset];
+        assertNotEquals(0, spanDerivedEncoding, "fixture sanity: span-derived value must be live");
+        profiler.clearContextValue("foo");
+
+        fooSetter.set("stale-app-value");
+        int appEncoding = profiler.snapshot()[fooOffset];
+        assertNotEquals(0, appEncoding, "foo app value must be recorded before the trace-context call");
+        assertNotEquals(
+                spanDerivedEncoding,
+                appEncoding,
+                "fixture sanity: span-derived and app values must have distinct encodings");
+
+        profiler.setTraceContext(1L, 1L, 0L, 1L, fooOffset, "span-derived-value", -1, null);
+        assertEquals(
+                spanDerivedEncoding,
+                profiler.snapshot()[fooOffset],
+                "setTraceContext's trailing reapplyAppContext must skip operationOffset/resourceOffset so"
+                        + " it doesn't overwrite the span-derived value just written to an app-owned offset");
+        profiler.clearSpanContext();
+        profiler.clearContextValue("foo");
     }
-    profiler.setSpanContext(1L, 1L, 0L, 1L);
-    // Deliberately NO profiler.reapplyAppContext() here — fold-in suffices.
-    assertEquals(
-        0,
-        profiler.snapshot()[fooOffset],
-        "Acceptance 5: after clearAppContextSnapshot, scope.close() restores empty state; no stale value leaks");
-
-    // Acceptance 6: restoreAppContext does not throw when scope stack is absent on the restoring
-    // thread. The guard is verified by the absence of an exception on the normal close path.
-    profiler.clearSpanContext();
-    profiler.clearContextValue("foo");
-    profiler.clearAppContextSnapshot();
-    assertDoesNotThrow(
-        () -> {
-          DatadogProfilingScope scope6 = new DatadogProfilingScope(profiler);
-          scope6.setContextValue("foo", "guard-val");
-          scope6.close();
-        },
-        "Acceptance 6: DatadogProfilingScope.close() must not throw even when scopeStack is absent");
-
-    // Guard: a zero span id must not throw and must degrade to a clean clear that still reapplies
-    // app context. The native setTraceContext rejects spanId==0 (IllegalArgumentException); the
-    // bridge routes a zero span to clearTraceContext rather than letting that throw be swallowed
-    // over stale context. Span ids are non-zero by construction, so this only exercises the
-    // defensive path. Note: the clean-clear-vs-stale distinction lives in the trace/span and
-    // operation/resource slots, which this fixture does not expose (operation/resource context
-    // attributes are not configured here, and snapshot() reads only custom app-attribute
-    // encodings); so this locks the observable contract — no throw, app context preserved.
-    profiler.clearSpanContext();
-    profiler.clearContextValue("foo");
-    profiler.clearAppContextSnapshot();
-    fooSetter.set("zero-span-guard");
-    assertNotEquals(
-        0, profiler.snapshot()[fooOffset], "foo must be live before the zero-span activation");
-    assertDoesNotThrow(
-        () -> profiler.setSpanContext(1L, 0L, 0L, 1L),
-        "Guard: a zero span id must not throw (routed to clearTraceContext, not a swallowed IAE)");
-    assertNotEquals(
-        0,
-        profiler.snapshot()[fooOffset],
-        "Guard: zero-span activation must degrade to a clean clear that still reapplies app context");
-    profiler.clearContextValue("foo");
-
-    // Regression: a native setContextValue rejection (e.g. an oversized value, >255 UTF-8 bytes)
-    // clears the native slot; the prior value must be resynced immediately instead of only
-    // reappearing on the next span boundary (a flicker the pre-migration DBB path never had,
-    // since it retained the prior value continuously).
-    fooSetter.set("valid-before-reject");
-    int validEncoding = profiler.snapshot()[fooOffset];
-    assertNotEquals(0, validEncoding, "foo must be live before the rejected write");
-    StringBuilder oversized = new StringBuilder();
-    for (int i = 0; i < 300; i++) {
-      oversized.append('x');
+
+    private static ConfigProvider configProvider(boolean cpu, boolean wall, boolean alloc, boolean memleak) {
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_ENABLED, Boolean.toString(cpu));
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED, Boolean.toString(wall));
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_ALLOC_ENABLED, Boolean.toString(alloc));
+        props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED, Boolean.toString(memleak));
+        return ConfigProvider.withPropertiesOverride(props);
     }
-    assertFalse(
-        profiler.setContextValue("foo", oversized.toString()),
-        "an oversized (>255 UTF-8 bytes) value must be rejected");
-    assertEquals(
-        validEncoding,
-        profiler.snapshot()[fooOffset],
-        "a rejected write must not blank the slot; the prior value must stay visible immediately");
-    profiler.clearContextValue("foo");
-
-    // Regression: setTraceContext's trailing reapplyAppContext must not clobber the span-derived
-    // value it just wrote natively to operationOffset/resourceOffset, even when that offset is
-    // also app-owned (e.g. profiling.context.attributes names _dd.trace.operation/resource while
-    // span-name/resource-name context is enabled). Reuses the "foo" app-owned offset as a stand-in
-    // operationOffset — the profiler is a process-wide singleton and its context attributes can't
-    // be reconfigured to register the real _dd.trace.operation/resource offsets here.
-    profiler.setContextValue(fooOffset, "span-derived-value");
-    int spanDerivedEncoding = profiler.snapshot()[fooOffset];
-    assertNotEquals(0, spanDerivedEncoding, "fixture sanity: span-derived value must be live");
-    profiler.clearContextValue("foo");
-
-    fooSetter.set("stale-app-value");
-    int appEncoding = profiler.snapshot()[fooOffset];
-    assertNotEquals(0, appEncoding, "foo app value must be recorded before the trace-context call");
-    assertNotEquals(
-        spanDerivedEncoding,
-        appEncoding,
-        "fixture sanity: span-derived and app values must have distinct encodings");
-
-    profiler.setTraceContext(1L, 1L, 0L, 1L, fooOffset, "span-derived-value", -1, null);
-    assertEquals(
-        spanDerivedEncoding,
-        profiler.snapshot()[fooOffset],
-        "setTraceContext's trailing reapplyAppContext must skip operationOffset/resourceOffset so"
-            + " it doesn't overwrite the span-derived value just written to an app-owned offset");
-    profiler.clearSpanContext();
-    profiler.clearContextValue("foo");
-  }
-
-  private static ConfigProvider configProvider(
-      boolean cpu, boolean wall, boolean alloc, boolean memleak) {
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_ENABLED, Boolean.toString(cpu));
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED, Boolean.toString(wall));
-    props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_ALLOC_ENABLED, Boolean.toString(alloc));
-    props.put(
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED, Boolean.toString(memleak));
-    return ConfigProvider.withPropertiesOverride(props);
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilingIntegrationTest.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilingIntegrationTest.java
index 1407dd5a540..94eee1bc5c2 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilingIntegrationTest.java
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilingIntegrationTest.java
@@ -16,36 +16,36 @@
 import org.mockito.MockedStatic;
 
 class DatadogProfilingIntegrationTest {
-  @Test
-  void rebindsSpanContextAndClearsRootContext() {
-    DatadogProfiler profiler = mock(DatadogProfiler.class);
-    when(profiler.operationNameOffset()).thenReturn(5);
-    when(profiler.resourceNameOffset()).thenReturn(6);
-
-    try (MockedStatic<DatadogProfiler> profilerFactory = mockStatic(DatadogProfiler.class)) {
-      profilerFactory.when(DatadogProfiler::newInstance).thenReturn(profiler);
-
-      AgentSpanContext spanContext =
-          mock(AgentSpanContext.class, withSettings().extraInterfaces(ProfilerContext.class));
-      ProfilerContext profilerContext = (ProfilerContext) spanContext;
-      when(profilerContext.getRootSpanId()).thenReturn(11L);
-      when(profilerContext.getSpanId()).thenReturn(22L);
-      when(profilerContext.getTraceIdHigh()).thenReturn(33L);
-      when(profilerContext.getTraceIdLow()).thenReturn(44L);
-      when(profilerContext.getOperationName()).thenReturn("operation");
-      when(profilerContext.getResourceName()).thenReturn("resource");
-
-      AgentSpan span = mock(AgentSpan.class, CALLS_REAL_METHODS);
-      when(span.spanContext()).thenReturn(spanContext);
-
-      DatadogProfilingIntegration integration = new DatadogProfilingIntegration();
-      assertTrue(integration.isThreadContextBindingRequired());
-
-      integration.setContext(span);
-      verify(profiler).setTraceContext(11L, 22L, 33L, 44L, 5, "operation", 6, "resource");
-
-      integration.setContext(Context.root());
-      verify(profiler).clearTraceContext();
+    @Test
+    void rebindsSpanContextAndClearsRootContext() {
+        DatadogProfiler profiler = mock(DatadogProfiler.class);
+        when(profiler.operationNameOffset()).thenReturn(5);
+        when(profiler.resourceNameOffset()).thenReturn(6);
+
+        try (MockedStatic<DatadogProfiler> profilerFactory = mockStatic(DatadogProfiler.class)) {
+            profilerFactory.when(DatadogProfiler::newInstance).thenReturn(profiler);
+
+            AgentSpanContext spanContext =
+                    mock(AgentSpanContext.class, withSettings().extraInterfaces(ProfilerContext.class));
+            ProfilerContext profilerContext = (ProfilerContext) spanContext;
+            when(profilerContext.getRootSpanId()).thenReturn(11L);
+            when(profilerContext.getSpanId()).thenReturn(22L);
+            when(profilerContext.getTraceIdHigh()).thenReturn(33L);
+            when(profilerContext.getTraceIdLow()).thenReturn(44L);
+            when(profilerContext.getOperationName()).thenReturn("operation");
+            when(profilerContext.getResourceName()).thenReturn("resource");
+
+            AgentSpan span = mock(AgentSpan.class, CALLS_REAL_METHODS);
+            when(span.spanContext()).thenReturn(spanContext);
+
+            DatadogProfilingIntegration integration = new DatadogProfilingIntegration();
+            assertTrue(integration.isThreadContextBindingRequired());
+
+            integration.setContext(span);
+            verify(profiler).setTraceContext(11L, 22L, 33L, 44L, 5, "operation", 6, "resource");
+
+            integration.setContext(Context.root());
+            verify(profiler).clearTraceContext();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-scrubber/src/main/java/com/datadog/profiling/scrubber/DefaultScrubDefinition.java b/dd-java-agent/agent-profiling/profiling-scrubber/src/main/java/com/datadog/profiling/scrubber/DefaultScrubDefinition.java
index a625041150f..ea132b43acd 100644
--- a/dd-java-agent/agent-profiling/profiling-scrubber/src/main/java/com/datadog/profiling/scrubber/DefaultScrubDefinition.java
+++ b/dd-java-agent/agent-profiling/profiling-scrubber/src/main/java/com/datadog/profiling/scrubber/DefaultScrubDefinition.java
@@ -11,43 +11,39 @@
 /** Provides the default scrub definition targeting sensitive JFR event fields. */
 public final class DefaultScrubDefinition {
 
-  private static final Map<String, Scrubber.ScrubField> DEFAULT_SCRUB_FIELDS;
+    private static final Map<String, Scrubber.ScrubField> DEFAULT_SCRUB_FIELDS;
 
-  static {
-    Map<String, Scrubber.ScrubField> fields = new HashMap<>();
-    // ScrubField(keyField, valueField, predicate): null keyField = scrub all values unconditionally
-    // System properties may contain API keys, passwords
-    fields.put("jdk.InitialSystemProperty", new Scrubber.ScrubField(null, "value", (k, v) -> true));
-    // JVM args may contain credentials in -D flags
-    fields.put("jdk.JVMInformation", new Scrubber.ScrubField(null, "jvmArguments", (k, v) -> true));
-    // Env vars may contain secrets
-    fields.put(
-        "jdk.InitialEnvironmentVariable", new Scrubber.ScrubField(null, "value", (k, v) -> true));
-    // Process command lines may reveal infrastructure
-    fields.put("jdk.SystemProcess", new Scrubber.ScrubField(null, "commandLine", (k, v) -> true));
-    DEFAULT_SCRUB_FIELDS = Collections.unmodifiableMap(fields);
-  }
+    static {
+        Map<String, Scrubber.ScrubField> fields = new HashMap<>();
+        // ScrubField(keyField, valueField, predicate): null keyField = scrub all values unconditionally
+        // System properties may contain API keys, passwords
+        fields.put("jdk.InitialSystemProperty", new Scrubber.ScrubField(null, "value", (k, v) -> true));
+        // JVM args may contain credentials in -D flags
+        fields.put("jdk.JVMInformation", new Scrubber.ScrubField(null, "jvmArguments", (k, v) -> true));
+        // Env vars may contain secrets
+        fields.put("jdk.InitialEnvironmentVariable", new Scrubber.ScrubField(null, "value", (k, v) -> true));
+        // Process command lines may reveal infrastructure
+        fields.put("jdk.SystemProcess", new Scrubber.ScrubField(null, "commandLine", (k, v) -> true));
+        DEFAULT_SCRUB_FIELDS = Collections.unmodifiableMap(fields);
+    }
 
-  /**
-   * Creates a scrubber with the default scrub definition.
-   *
-   * @param excludeEventTypes list of event type names to exclude from scrubbing, or null for none
-   * @return a configured {@link JfrScrubber}
-   */
-  public static JfrScrubber create(List<String> excludeEventTypes) {
-    Set<String> excludeSet =
-        excludeEventTypes != null
-            ? new HashSet<>(excludeEventTypes)
-            : Collections.<String>emptySet();
+    /**
+     * Creates a scrubber with the default scrub definition.
+     *
+     * @param excludeEventTypes list of event type names to exclude from scrubbing, or null for none
+     * @return a configured {@link JfrScrubber}
+     */
+    public static JfrScrubber create(List<String> excludeEventTypes) {
+        Set<String> excludeSet =
+                excludeEventTypes != null ? new HashSet<>(excludeEventTypes) : Collections.<String>emptySet();
 
-    return new JfrScrubber(
-        eventTypeName -> {
-          if (excludeSet.contains(eventTypeName)) {
-            return null;
-          }
-          return DEFAULT_SCRUB_FIELDS.get(eventTypeName);
+        return new JfrScrubber(eventTypeName -> {
+            if (excludeSet.contains(eventTypeName)) {
+                return null;
+            }
+            return DEFAULT_SCRUB_FIELDS.get(eventTypeName);
         });
-  }
+    }
 
-  private DefaultScrubDefinition() {}
+    private DefaultScrubDefinition() {}
 }
diff --git a/dd-java-agent/agent-profiling/profiling-scrubber/src/main/java/com/datadog/profiling/scrubber/JfrScrubber.java b/dd-java-agent/agent-profiling/profiling-scrubber/src/main/java/com/datadog/profiling/scrubber/JfrScrubber.java
index db6ea640ef4..15c3f4f6326 100644
--- a/dd-java-agent/agent-profiling/profiling-scrubber/src/main/java/com/datadog/profiling/scrubber/JfrScrubber.java
+++ b/dd-java-agent/agent-profiling/profiling-scrubber/src/main/java/com/datadog/profiling/scrubber/JfrScrubber.java
@@ -10,21 +10,21 @@
  */
 public final class JfrScrubber {
 
-  private final Function<String, Scrubber.ScrubField> scrubDefinition;
+    private final Function<String, Scrubber.ScrubField> scrubDefinition;
 
-  /** Package-private: use {@link DefaultScrubDefinition#create} to obtain an instance. */
-  JfrScrubber(Function<String, Scrubber.ScrubField> scrubDefinition) {
-    this.scrubDefinition = scrubDefinition;
-  }
+    /** Package-private: use {@link DefaultScrubDefinition#create} to obtain an instance. */
+    JfrScrubber(Function<String, Scrubber.ScrubField> scrubDefinition) {
+        this.scrubDefinition = scrubDefinition;
+    }
 
-  /**
-   * Scrub the given file by replacing targeted field values with 'x' bytes.
-   *
-   * @param input the input file to scrub
-   * @param output the output file to write the scrubbed content to
-   * @throws Exception if an error occurs during parsing or writing
-   */
-  public void scrubFile(Path input, Path output) throws Exception {
-    Scrubber.scrubFile(input, output, scrubDefinition);
-  }
+    /**
+     * Scrub the given file by replacing targeted field values with 'x' bytes.
+     *
+     * @param input the input file to scrub
+     * @param output the output file to write the scrubbed content to
+     * @throws Exception if an error occurs during parsing or writing
+     */
+    public void scrubFile(Path input, Path output) throws Exception {
+        Scrubber.scrubFile(input, output, scrubDefinition);
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-scrubber/src/test/java/com/datadog/profiling/scrubber/JfrScrubberTest.java b/dd-java-agent/agent-profiling/profiling-scrubber/src/test/java/com/datadog/profiling/scrubber/JfrScrubberTest.java
index 00503c71251..9f93193ae6d 100644
--- a/dd-java-agent/agent-profiling/profiling-scrubber/src/test/java/com/datadog/profiling/scrubber/JfrScrubberTest.java
+++ b/dd-java-agent/agent-profiling/profiling-scrubber/src/test/java/com/datadog/profiling/scrubber/JfrScrubberTest.java
@@ -24,93 +24,90 @@
 
 class JfrScrubberTest {
 
-  @TempDir Path tempDir;
-
-  private Path inputFile;
-
-  @BeforeEach
-  void setUp() throws IOException {
-    inputFile = tempDir.resolve("input.jfr");
-    try (InputStream is = getClass().getResourceAsStream("/test-recording.jfr")) {
-      if (is == null) {
-        throw new IllegalStateException("test-recording.jfr not found in test resources");
-      }
-      Files.copy(is, inputFile, StandardCopyOption.REPLACE_EXISTING);
+    @TempDir
+    Path tempDir;
+
+    private Path inputFile;
+
+    @BeforeEach
+    void setUp() throws IOException {
+        inputFile = tempDir.resolve("input.jfr");
+        try (InputStream is = getClass().getResourceAsStream("/test-recording.jfr")) {
+            if (is == null) {
+                throw new IllegalStateException("test-recording.jfr not found in test resources");
+            }
+            Files.copy(is, inputFile, StandardCopyOption.REPLACE_EXISTING);
+        }
     }
-  }
-
-  @Test
-  void scrubInitialSystemPropertyValues() throws Exception {
-    JfrScrubber scrubber = DefaultScrubDefinition.create(null);
-    Path outputFile = tempDir.resolve("output.jfr");
-    scrubber.scrubFile(inputFile, outputFile);
-
-    assertTrue(Files.exists(outputFile));
-    assertTrue(Files.size(outputFile) > 0, "Scrubbed file should not be empty");
-
-    // Verify scrubbed values contain only 'x' characters
-    IItemCollection events = JfrLoaderToolkit.loadEvents(outputFile.toFile());
-    IItemCollection systemPropertyEvents =
-        events.apply(ItemFilters.type("jdk.InitialSystemProperty"));
-    assertTrue(systemPropertyEvents.hasItems(), "Expected jdk.InitialSystemProperty events");
-
-    IAttribute<String> valueAttr = attr("value", "value", "value", PLAIN_TEXT);
-    for (IItemIterable itemIterable : systemPropertyEvents) {
-      IMemberAccessor<String, IItem> accessor = valueAttr.getAccessor(itemIterable.getType());
-      for (IItem item : itemIterable) {
-        String value = accessor.getMember(item);
-        if (value != null && !value.isEmpty()) {
-          assertTrue(
-              value.chars().allMatch(c -> c == 'x'),
-              "System property value should be scrubbed: " + value);
+
+    @Test
+    void scrubInitialSystemPropertyValues() throws Exception {
+        JfrScrubber scrubber = DefaultScrubDefinition.create(null);
+        Path outputFile = tempDir.resolve("output.jfr");
+        scrubber.scrubFile(inputFile, outputFile);
+
+        assertTrue(Files.exists(outputFile));
+        assertTrue(Files.size(outputFile) > 0, "Scrubbed file should not be empty");
+
+        // Verify scrubbed values contain only 'x' characters
+        IItemCollection events = JfrLoaderToolkit.loadEvents(outputFile.toFile());
+        IItemCollection systemPropertyEvents = events.apply(ItemFilters.type("jdk.InitialSystemProperty"));
+        assertTrue(systemPropertyEvents.hasItems(), "Expected jdk.InitialSystemProperty events");
+
+        IAttribute<String> valueAttr = attr("value", "value", "value", PLAIN_TEXT);
+        for (IItemIterable itemIterable : systemPropertyEvents) {
+            IMemberAccessor<String, IItem> accessor = valueAttr.getAccessor(itemIterable.getType());
+            for (IItem item : itemIterable) {
+                String value = accessor.getMember(item);
+                if (value != null && !value.isEmpty()) {
+                    assertTrue(
+                            value.chars().allMatch(c -> c == 'x'),
+                            "System property value should be scrubbed: " + value);
+                }
+            }
         }
-      }
     }
-  }
-
-  @Test
-  void scrubWithNoMatchingEvents() throws Exception {
-    // Scrubber with all default events excluded — nothing matches
-    JfrScrubber scrubber = new JfrScrubber(name -> null);
-    Path outputFile = tempDir.resolve("output.jfr");
-    scrubber.scrubFile(inputFile, outputFile);
-
-    // Output should be identical to input when no events match
-    assertEquals(Files.size(inputFile), Files.size(outputFile));
-  }
-
-  @Test
-  void scrubWithExcludedEventType() throws Exception {
-    // Exclude jdk.InitialSystemProperty from scrubbing
-    JfrScrubber scrubber =
-        DefaultScrubDefinition.create(Collections.singletonList("jdk.InitialSystemProperty"));
-    Path outputFile = tempDir.resolve("output.jfr");
-    scrubber.scrubFile(inputFile, outputFile);
-
-    assertTrue(Files.exists(outputFile));
-    assertTrue(Files.size(outputFile) > 0);
-
-    // Verify excluded event type values are preserved (not scrubbed to 'x')
-    IItemCollection events = JfrLoaderToolkit.loadEvents(outputFile.toFile());
-    IItemCollection systemPropertyEvents =
-        events.apply(ItemFilters.type("jdk.InitialSystemProperty"));
-    assertTrue(systemPropertyEvents.hasItems(), "Expected jdk.InitialSystemProperty events");
-
-    IAttribute<String> valueAttr = attr("value", "value", "value", PLAIN_TEXT);
-    boolean foundNonTrivialValue = false;
-    for (IItemIterable itemIterable : systemPropertyEvents) {
-      IMemberAccessor<String, IItem> accessor = valueAttr.getAccessor(itemIterable.getType());
-      for (IItem item : itemIterable) {
-        String value = accessor.getMember(item);
-        if (value != null && !value.isEmpty()) {
-          // At least one value should NOT be all-x (proving exclusion worked)
-          if (!value.chars().allMatch(c -> c == 'x')) {
-            foundNonTrivialValue = true;
-          }
+
+    @Test
+    void scrubWithNoMatchingEvents() throws Exception {
+        // Scrubber with all default events excluded — nothing matches
+        JfrScrubber scrubber = new JfrScrubber(name -> null);
+        Path outputFile = tempDir.resolve("output.jfr");
+        scrubber.scrubFile(inputFile, outputFile);
+
+        // Output should be identical to input when no events match
+        assertEquals(Files.size(inputFile), Files.size(outputFile));
+    }
+
+    @Test
+    void scrubWithExcludedEventType() throws Exception {
+        // Exclude jdk.InitialSystemProperty from scrubbing
+        JfrScrubber scrubber = DefaultScrubDefinition.create(Collections.singletonList("jdk.InitialSystemProperty"));
+        Path outputFile = tempDir.resolve("output.jfr");
+        scrubber.scrubFile(inputFile, outputFile);
+
+        assertTrue(Files.exists(outputFile));
+        assertTrue(Files.size(outputFile) > 0);
+
+        // Verify excluded event type values are preserved (not scrubbed to 'x')
+        IItemCollection events = JfrLoaderToolkit.loadEvents(outputFile.toFile());
+        IItemCollection systemPropertyEvents = events.apply(ItemFilters.type("jdk.InitialSystemProperty"));
+        assertTrue(systemPropertyEvents.hasItems(), "Expected jdk.InitialSystemProperty events");
+
+        IAttribute<String> valueAttr = attr("value", "value", "value", PLAIN_TEXT);
+        boolean foundNonTrivialValue = false;
+        for (IItemIterable itemIterable : systemPropertyEvents) {
+            IMemberAccessor<String, IItem> accessor = valueAttr.getAccessor(itemIterable.getType());
+            for (IItem item : itemIterable) {
+                String value = accessor.getMember(item);
+                if (value != null && !value.isEmpty()) {
+                    // At least one value should NOT be all-x (proving exclusion worked)
+                    if (!value.chars().allMatch(c -> c == 'x')) {
+                        foundNonTrivialValue = true;
+                    }
+                }
+            }
         }
-      }
+        assertTrue(foundNonTrivialValue, "Excluded event type values should be preserved, not scrubbed");
     }
-    assertTrue(
-        foundNonTrivialValue, "Excluded event type values should be preserved, not scrubbed");
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-testing/src/main/java/com/datadog/profiling/testing/ProfilingTestUtils.java b/dd-java-agent/agent-profiling/profiling-testing/src/main/java/com/datadog/profiling/testing/ProfilingTestUtils.java
index 6ad32081c38..d1142a35b8a 100644
--- a/dd-java-agent/agent-profiling/profiling-testing/src/main/java/com/datadog/profiling/testing/ProfilingTestUtils.java
+++ b/dd-java-agent/agent-profiling/profiling-testing/src/main/java/com/datadog/profiling/testing/ProfilingTestUtils.java
@@ -12,28 +12,23 @@
 
 public final class ProfilingTestUtils {
 
-  private static final MediaType OCTET_STREAM = MediaType.parse("application/octet-stream");
+    private static final MediaType OCTET_STREAM = MediaType.parse("application/octet-stream");
 
-  public static Multimap<String, Object> parseProfilingRequestParameters(
-      final RecordedRequest request) {
-    return FileUpload.parse(request.getBody().readByteArray(), request.getHeader("Content-Type"))
-        .stream()
-        .collect(
-            ImmutableMultimap::<String, Object>builder,
-            (builder, value) ->
-                builder.put(
-                    value.getFieldName(),
-                    OCTET_STREAM.toString().equals(value.getContentType())
-                        ? value.get()
-                        : value.getString()),
-            (builder1, builder2) -> builder1.putAll(builder2.build()))
-        .build();
-  }
+    public static Multimap<String, Object> parseProfilingRequestParameters(final RecordedRequest request) {
+        return FileUpload.parse(request.getBody().readByteArray(), request.getHeader("Content-Type")).stream()
+                .collect(
+                        ImmutableMultimap::<String, Object>builder,
+                        (builder, value) -> builder.put(
+                                value.getFieldName(),
+                                OCTET_STREAM.toString().equals(value.getContentType())
+                                        ? value.get()
+                                        : value.getString()),
+                        (builder1, builder2) -> builder1.putAll(builder2.build()))
+                .build();
+    }
 
-  @SuppressForbidden
-  public static Map<String, String> parseTags(final Collection<Object> params) {
-    return params.stream()
-        .map(p -> ((String) p).split(":", 2))
-        .collect(Collectors.toMap(p -> p[0], p -> p[1]));
-  }
+    @SuppressForbidden
+    public static Map<String, String> parseTags(final Collection<Object> params) {
+        return params.stream().map(p -> ((String) p).split(":", 2)).collect(Collectors.toMap(p -> p[0], p -> p[1]));
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ByteCountingInputStream.java b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ByteCountingInputStream.java
index 32ba88bee90..2b05d9f543b 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ByteCountingInputStream.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ByteCountingInputStream.java
@@ -4,73 +4,73 @@
 import java.io.InputStream;
 
 final class ByteCountingInputStream extends InputStream {
-  private final InputStream source;
-  private long readBytes = 0;
-  private long mark = -1;
+    private final InputStream source;
+    private long readBytes = 0;
+    private long mark = -1;
 
-  ByteCountingInputStream(InputStream source) {
-    this.source = source;
-  }
+    ByteCountingInputStream(InputStream source) {
+        this.source = source;
+    }
 
-  @Override
-  public int read() throws IOException {
-    int data = source.read();
-    if (data >= 0) {
-      readBytes++;
+    @Override
+    public int read() throws IOException {
+        int data = source.read();
+        if (data >= 0) {
+            readBytes++;
+        }
+        return data;
     }
-    return data;
-  }
 
-  @Override
-  public int read(byte[] b) throws IOException {
-    return this.read(b, 0, b.length);
-  }
+    @Override
+    public int read(byte[] b) throws IOException {
+        return this.read(b, 0, b.length);
+    }
 
-  @Override
-  public int read(byte[] b, int off, int len) throws IOException {
-    int read = source.read(b, off, len);
-    if (read > 0) {
-      readBytes += read;
+    @Override
+    public int read(byte[] b, int off, int len) throws IOException {
+        int read = source.read(b, off, len);
+        if (read > 0) {
+            readBytes += read;
+        }
+        return read;
     }
-    return read;
-  }
 
-  @Override
-  public long skip(long n) throws IOException {
-    return source.skip(n);
-  }
+    @Override
+    public long skip(long n) throws IOException {
+        return source.skip(n);
+    }
 
-  @Override
-  public int available() throws IOException {
-    return source.available();
-  }
+    @Override
+    public int available() throws IOException {
+        return source.available();
+    }
 
-  @Override
-  public void close() throws IOException {
-    source.close();
-  }
+    @Override
+    public void close() throws IOException {
+        source.close();
+    }
 
-  @Override
-  public void mark(int readlimit) {
-    mark = readBytes;
-    source.mark(readlimit);
-  }
+    @Override
+    public void mark(int readlimit) {
+        mark = readBytes;
+        source.mark(readlimit);
+    }
 
-  @Override
-  public void reset() throws IOException {
-    source.reset();
-    if (mark > -1) {
-      readBytes = mark;
-      mark = -1;
+    @Override
+    public void reset() throws IOException {
+        source.reset();
+        if (mark > -1) {
+            readBytes = mark;
+            mark = -1;
+        }
     }
-  }
 
-  @Override
-  public boolean markSupported() {
-    return source.markSupported();
-  }
+    @Override
+    public boolean markSupported() {
+        return source.markSupported();
+    }
 
-  long getReadBytes() {
-    return readBytes;
-  }
+    long getReadBytes() {
+        return readBytes;
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ByteCountingOutputStream.java b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ByteCountingOutputStream.java
index 66fcef98431..dd7be7c8e16 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ByteCountingOutputStream.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ByteCountingOutputStream.java
@@ -4,41 +4,41 @@
 import java.io.OutputStream;
 
 final class ByteCountingOutputStream extends OutputStream {
-  private final OutputStream dest;
-  private long writtenBytes = 0;
-
-  ByteCountingOutputStream(OutputStream dest) {
-    this.dest = dest;
-  }
-
-  @Override
-  public void write(int i) throws IOException {
-    dest.write(i);
-    writtenBytes++;
-  }
-
-  @Override
-  public void write(byte[] b) throws IOException {
-    this.write(b, 0, b.length);
-  }
-
-  @Override
-  public void write(byte[] b, int off, int len) throws IOException {
-    dest.write(b, off, len);
-    writtenBytes += len;
-  }
-
-  @Override
-  public void flush() throws IOException {
-    dest.flush();
-  }
-
-  @Override
-  public void close() throws IOException {
-    dest.close();
-  }
-
-  long getWrittenBytes() {
-    return writtenBytes;
-  }
+    private final OutputStream dest;
+    private long writtenBytes = 0;
+
+    ByteCountingOutputStream(OutputStream dest) {
+        this.dest = dest;
+    }
+
+    @Override
+    public void write(int i) throws IOException {
+        dest.write(i);
+        writtenBytes++;
+    }
+
+    @Override
+    public void write(byte[] b) throws IOException {
+        this.write(b, 0, b.length);
+    }
+
+    @Override
+    public void write(byte[] b, int off, int len) throws IOException {
+        dest.write(b, off, len);
+        writtenBytes += len;
+    }
+
+    @Override
+    public void flush() throws IOException {
+        dest.flush();
+    }
+
+    @Override
+    public void close() throws IOException {
+        dest.close();
+    }
+
+    long getWrittenBytes() {
+        return writtenBytes;
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/CompressingRequestBody.java b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/CompressingRequestBody.java
index ec4458ed070..62c8605f50d 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/CompressingRequestBody.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/CompressingRequestBody.java
@@ -25,382 +25,368 @@
  */
 final class CompressingRequestBody extends RequestBody {
 
-  /*
-   * LZ4 is not available in native image.
-   * LZ4Factory is using reflection heavily and since we are shading the lz4 classes for the usage in profiler
-   * it seems to be impossible to configure the native-image generation such as to make the reflection work.
-   *
-   * For now, we are disabling the lz4 compression in native image.
-   */
-  private static final LZ4Factory LZ4_FACTORY =
-      Platform.isNativeImage() ? null : LZ4Factory.fastestJavaInstance();
-  private static final XXHashFactory XXHASH_FACTORY =
-      Platform.isNativeImage() ? null : XXHashFactory.fastestJavaInstance();
-
-  static final class MissingInputException extends IOException {
-    public MissingInputException(String message) {
-      super(message);
+    /*
+     * LZ4 is not available in native image.
+     * LZ4Factory is using reflection heavily and since we are shading the lz4 classes for the usage in profiler
+     * it seems to be impossible to configure the native-image generation such as to make the reflection work.
+     *
+     * For now, we are disabling the lz4 compression in native image.
+     */
+    private static final LZ4Factory LZ4_FACTORY = Platform.isNativeImage() ? null : LZ4Factory.fastestJavaInstance();
+    private static final XXHashFactory XXHASH_FACTORY =
+            Platform.isNativeImage() ? null : XXHashFactory.fastestJavaInstance();
+
+    static final class MissingInputException extends IOException {
+        public MissingInputException(String message) {
+            super(message);
+        }
     }
-  }
-
-  /** A simple functional supplier throwing an {@linkplain IOException} */
-  @FunctionalInterface
-  interface InputStreamSupplier {
-    RecordingInputStream get() throws IOException;
-  }
-
-  /** A simple functional mapper allowing to throw {@linkplain IOException} */
-  @FunctionalInterface
-  interface OutputStreamMappingFunction {
-    OutputStream apply(OutputStream param) throws IOException;
-  }
-
-  /**
-   * A data upload retry policy. By using this policy it is possible to customize how many times the
-   * data upload will be reattempted if the input data stream is unavailable.
-   */
-  @FunctionalInterface
-  interface RetryPolicy {
+
+    /** A simple functional supplier throwing an {@linkplain IOException} */
+    @FunctionalInterface
+    interface InputStreamSupplier {
+        RecordingInputStream get() throws IOException;
+    }
+
+    /** A simple functional mapper allowing to throw {@linkplain IOException} */
+    @FunctionalInterface
+    interface OutputStreamMappingFunction {
+        OutputStream apply(OutputStream param) throws IOException;
+    }
+
     /**
-     * @param ordinal number of data upload attempts so far
-     * @return {@literal true} if the data upload should be retried
+     * A data upload retry policy. By using this policy it is possible to customize how many times the
+     * data upload will be reattempted if the input data stream is unavailable.
      */
-    boolean shouldRetry(int ordinal);
-  }
-
-  /**
-   * A data upload retry backoff policy. This policy will be used to obtain the delay before the
-   * next retry.
-   */
-  @FunctionalInterface
-  interface RetryBackoff {
+    @FunctionalInterface
+    interface RetryPolicy {
+        /**
+         * @param ordinal number of data upload attempts so far
+         * @return {@literal true} if the data upload should be retried
+         */
+        boolean shouldRetry(int ordinal);
+    }
+
     /**
-     * @param ordinal number of data upload attempts so far
-     * @return the required delay in milliscenods before next retry
+     * A data upload retry backoff policy. This policy will be used to obtain the delay before the
+     * next retry.
      */
-    int backoff(int ordinal);
-  }
-
-  static final MediaType OCTET_STREAM = MediaType.parse("application/octet-stream");
-
-  // https://github.com/lz4/lz4/blob/dev/doc/lz4_Frame_format.md#general-structure-of-lz4-frame-format
-  private static final int[] LZ4_MAGIC = new int[] {0x04, 0x22, 0x4D, 0x18};
-  private static final int[] ZIP_MAGIC = new int[] {80, 75, 3, 4};
-  private static final int[] GZ_MAGIC = new int[] {31, 139};
-  private static final int[] ZSTD_MAGIC = new int[] {0x28, 0xB5, 0x2F, 0xFD};
-
-  private final InputStreamSupplier inputStreamSupplier;
-  private final OutputStreamMappingFunction outputStreamMapper;
-  private final RetryPolicy retryPolicy;
-  private final RetryBackoff retryBackoff;
-
-  private long readBytes = 0;
-  private long writtenBytes = 0;
-
-  /**
-   * Create a new instance configured with 1 retry and constant 10ms backoff delay.
-   *
-   * @param compressionType {@linkplain CompressionType} value
-   * @param inputStreamSupplier supplier of the data input stream
-   */
-  CompressingRequestBody(
-      @Nonnull CompressionType compressionType, @Nonnull InputStreamSupplier inputStreamSupplier) {
-    this(compressionType, inputStreamSupplier, r -> r <= 1, r -> 10);
-  }
-
-  /**
-   * Create a new instance configured with constant 10ms backoff delay.
-   *
-   * @param compressionType {@linkplain CompressionType} value
-   * @param inputStreamSupplier supplier of the data input stream
-   * @param retryPolicy {@linkplain RetryPolicy} instance
-   */
-  CompressingRequestBody(
-      @Nonnull CompressionType compressionType,
-      @Nonnull InputStreamSupplier inputStreamSupplier,
-      @Nonnull RetryPolicy retryPolicy) {
-    this(compressionType, inputStreamSupplier, retryPolicy, r -> 10);
-  }
-
-  /**
-   * Create a new instance.
-   *
-   * @param compressionType {@linkplain CompressionType} value
-   * @param inputStreamSupplier supplier of the data input stream
-   * @param retryPolicy {@linkplain RetryPolicy} instance
-   * @param retryBackoff {@linkplain RetryBackoff} instance
-   */
-  CompressingRequestBody(
-      @Nonnull CompressionType compressionType,
-      @Nonnull InputStreamSupplier inputStreamSupplier,
-      @Nonnull RetryPolicy retryPolicy,
-      @Nonnull RetryBackoff retryBackoff) {
-    this.inputStreamSupplier = inputStreamSupplier;
-    this.outputStreamMapper = getOutputStreamMapper(compressionType);
-    this.retryPolicy = retryPolicy;
-    this.retryBackoff = retryBackoff;
-  }
-
-  @Override
-  public long contentLength() throws IOException {
-    // uploading chunked streaming data -> the length is unknown
-    return -1;
-  }
-
-  @Nullable
-  @Override
-  public MediaType contentType() {
-    return OCTET_STREAM;
-  }
-
-  @Override
-  public void writeTo(BufferedSink bufferedSink) throws IOException {
-    Throwable lastException = null;
-    boolean shouldRetry = false;
-    int retry = 1;
-    do {
-      /*
-       * Here we do attempt a simple retry functionality in case the input stream can not be obtained -
-       * which is usually caused by the JFR recording being not finalized on disk in our case.
-       * The number of times this should be re-attempted as well as the backoff between the attempts
-       * can be defined per CompressingRequestBody instance.
-       *
-       * However, the failures in reading the input stream and writing the data out to the Okio sink
-       * will not be retried because doing so can result in corrupted data uploads. Instead, the client
-       * should use the OkHttpClient callback to get notified about failed requests and handle the retries
-       * at the request level.
-       */
-      try (RecordingInputStream recordingInputStream = inputStreamSupplier.get()) {
-        if (recordingInputStream.isEmpty()) {
-          // The recording stream appears to be empty.
-          // Simply fail the request - there is 0% chance that it suddenly becomes non-empty.
-          throw new MissingInputException("Empty recording");
-        }
-        ByteCountingInputStream inputStream = new ByteCountingInputStream(recordingInputStream);
-        // Got the input stream so clear the 'lastException'
-        lastException = null;
-        try {
-          ByteCountingOutputStream outputStream =
-              new ByteCountingOutputStream(bufferedSink.outputStream());
-          attemptWrite(inputStream, outputStream);
-          readBytes = inputStream.getReadBytes();
-          writtenBytes = outputStream.getWrittenBytes();
-        } catch (Throwable t) {
-          // Only the failures while obtaining the input stream are retriable.
-          // Any failure during reading that input stream must make this write to fail as well.
-          lastException = t;
-          shouldRetry = false;
-        }
-      } catch (MissingInputException e) {
-        // The recording is empty - just re-throw
-        throw e;
-      } catch (Throwable t) {
-        // Only the failures while obtaining the input stream are retriable.
-        lastException = t;
-        shouldRetry = true;
-      }
-      if (shouldRetry && retryPolicy.shouldRetry(retry)) {
-        long backoffMs = retryBackoff.backoff(retry);
-        try {
-          Thread.sleep(backoffMs);
-        } catch (InterruptedException e) {
-          Thread.currentThread().interrupt();
-          throw new IOException(e);
-        }
-        retry++;
-      } else {
-        shouldRetry = false;
-      }
-    } while (shouldRetry);
-    if (lastException != null) {
-      throw lastException instanceof IOException
-          ? (IOException) lastException
-          : new IOException(lastException);
+    @FunctionalInterface
+    interface RetryBackoff {
+        /**
+         * @param ordinal number of data upload attempts so far
+         * @return the required delay in milliscenods before next retry
+         */
+        int backoff(int ordinal);
     }
-  }
-
-  long getReadBytes() {
-    return readBytes;
-  }
-
-  long getWrittenBytes() {
-    return writtenBytes;
-  }
-
-  private void attemptWrite(@Nonnull InputStream inputStream, @Nonnull OutputStream outputStream)
-      throws IOException {
-    try (OutputStream sinkStream =
-        isCompressed(inputStream)
-            ? new BufferedOutputStream(outputStream) {
-              @Override
-              public void close() throws IOException {
-                // Do not propagate close; call 'flush()' instead.
-                // Compression streams must be 'closed' because they finalize the
-                // compression
-                // in that method.
-                flush();
-              }
+
+    static final MediaType OCTET_STREAM = MediaType.parse("application/octet-stream");
+
+    // https://github.com/lz4/lz4/blob/dev/doc/lz4_Frame_format.md#general-structure-of-lz4-frame-format
+    private static final int[] LZ4_MAGIC = new int[] {0x04, 0x22, 0x4D, 0x18};
+    private static final int[] ZIP_MAGIC = new int[] {80, 75, 3, 4};
+    private static final int[] GZ_MAGIC = new int[] {31, 139};
+    private static final int[] ZSTD_MAGIC = new int[] {0x28, 0xB5, 0x2F, 0xFD};
+
+    private final InputStreamSupplier inputStreamSupplier;
+    private final OutputStreamMappingFunction outputStreamMapper;
+    private final RetryPolicy retryPolicy;
+    private final RetryBackoff retryBackoff;
+
+    private long readBytes = 0;
+    private long writtenBytes = 0;
+
+    /**
+     * Create a new instance configured with 1 retry and constant 10ms backoff delay.
+     *
+     * @param compressionType {@linkplain CompressionType} value
+     * @param inputStreamSupplier supplier of the data input stream
+     */
+    CompressingRequestBody(@Nonnull CompressionType compressionType, @Nonnull InputStreamSupplier inputStreamSupplier) {
+        this(compressionType, inputStreamSupplier, r -> r <= 1, r -> 10);
+    }
+
+    /**
+     * Create a new instance configured with constant 10ms backoff delay.
+     *
+     * @param compressionType {@linkplain CompressionType} value
+     * @param inputStreamSupplier supplier of the data input stream
+     * @param retryPolicy {@linkplain RetryPolicy} instance
+     */
+    CompressingRequestBody(
+            @Nonnull CompressionType compressionType,
+            @Nonnull InputStreamSupplier inputStreamSupplier,
+            @Nonnull RetryPolicy retryPolicy) {
+        this(compressionType, inputStreamSupplier, retryPolicy, r -> 10);
+    }
+
+    /**
+     * Create a new instance.
+     *
+     * @param compressionType {@linkplain CompressionType} value
+     * @param inputStreamSupplier supplier of the data input stream
+     * @param retryPolicy {@linkplain RetryPolicy} instance
+     * @param retryBackoff {@linkplain RetryBackoff} instance
+     */
+    CompressingRequestBody(
+            @Nonnull CompressionType compressionType,
+            @Nonnull InputStreamSupplier inputStreamSupplier,
+            @Nonnull RetryPolicy retryPolicy,
+            @Nonnull RetryBackoff retryBackoff) {
+        this.inputStreamSupplier = inputStreamSupplier;
+        this.outputStreamMapper = getOutputStreamMapper(compressionType);
+        this.retryPolicy = retryPolicy;
+        this.retryBackoff = retryBackoff;
+    }
+
+    @Override
+    public long contentLength() throws IOException {
+        // uploading chunked streaming data -> the length is unknown
+        return -1;
+    }
+
+    @Nullable
+    @Override
+    public MediaType contentType() {
+        return OCTET_STREAM;
+    }
+
+    @Override
+    public void writeTo(BufferedSink bufferedSink) throws IOException {
+        Throwable lastException = null;
+        boolean shouldRetry = false;
+        int retry = 1;
+        do {
+            /*
+             * Here we do attempt a simple retry functionality in case the input stream can not be obtained -
+             * which is usually caused by the JFR recording being not finalized on disk in our case.
+             * The number of times this should be re-attempted as well as the backoff between the attempts
+             * can be defined per CompressingRequestBody instance.
+             *
+             * However, the failures in reading the input stream and writing the data out to the Okio sink
+             * will not be retried because doing so can result in corrupted data uploads. Instead, the client
+             * should use the OkHttpClient callback to get notified about failed requests and handle the retries
+             * at the request level.
+             */
+            try (RecordingInputStream recordingInputStream = inputStreamSupplier.get()) {
+                if (recordingInputStream.isEmpty()) {
+                    // The recording stream appears to be empty.
+                    // Simply fail the request - there is 0% chance that it suddenly becomes non-empty.
+                    throw new MissingInputException("Empty recording");
+                }
+                ByteCountingInputStream inputStream = new ByteCountingInputStream(recordingInputStream);
+                // Got the input stream so clear the 'lastException'
+                lastException = null;
+                try {
+                    ByteCountingOutputStream outputStream = new ByteCountingOutputStream(bufferedSink.outputStream());
+                    attemptWrite(inputStream, outputStream);
+                    readBytes = inputStream.getReadBytes();
+                    writtenBytes = outputStream.getWrittenBytes();
+                } catch (Throwable t) {
+                    // Only the failures while obtaining the input stream are retriable.
+                    // Any failure during reading that input stream must make this write to fail as well.
+                    lastException = t;
+                    shouldRetry = false;
+                }
+            } catch (MissingInputException e) {
+                // The recording is empty - just re-throw
+                throw e;
+            } catch (Throwable t) {
+                // Only the failures while obtaining the input stream are retriable.
+                lastException = t;
+                shouldRetry = true;
             }
-            : new BufferedOutputStream(
-                outputStreamMapper.apply(
-                    new BufferedOutputStream(outputStream) {
-                      @Override
-                      public void close() throws IOException {
+            if (shouldRetry && retryPolicy.shouldRetry(retry)) {
+                long backoffMs = retryBackoff.backoff(retry);
+                try {
+                    Thread.sleep(backoffMs);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    throw new IOException(e);
+                }
+                retry++;
+            } else {
+                shouldRetry = false;
+            }
+        } while (shouldRetry);
+        if (lastException != null) {
+            throw lastException instanceof IOException ? (IOException) lastException : new IOException(lastException);
+        }
+    }
+
+    long getReadBytes() {
+        return readBytes;
+    }
+
+    long getWrittenBytes() {
+        return writtenBytes;
+    }
+
+    private void attemptWrite(@Nonnull InputStream inputStream, @Nonnull OutputStream outputStream) throws IOException {
+        try (OutputStream sinkStream = isCompressed(inputStream)
+                ? new BufferedOutputStream(outputStream) {
+                    @Override
+                    public void close() throws IOException {
+                        // Do not propagate close; call 'flush()' instead.
+                        // Compression streams must be 'closed' because they finalize the
+                        // compression
+                        // in that method.
+                        flush();
+                    }
+                }
+                : new BufferedOutputStream(outputStreamMapper.apply(new BufferedOutputStream(outputStream) {
+                    @Override
+                    public void close() throws IOException {
                         // Do not propagate close; call 'flush()' instead.
                         // Compression streams must be 'closed' because they finalize the
                         // compression in that method.
                         flush();
-                      }
-                    }))) {
-      BufferedSink sink = Okio.buffer(Okio.sink(sinkStream));
-      try (Source source = Okio.buffer(Okio.source(inputStream))) {
-        sink.writeAll(source);
-      }
-      // a bit of cargo-culting to make sure that all writes have really-really been flushed
-      sink.emit();
-      sink.flush();
-    }
-  }
-
-  /**
-   * Check whether the stream is compressed using a supported format
-   *
-   * @param is input stream; must support {@linkplain InputStream#mark(int)}
-   * @return {@literal true} if the stream is compressed in a supported format
-   * @throws IOException
-   */
-  static boolean isCompressed(@Nonnull final InputStream is) throws IOException {
-    checkMarkSupported(is);
-    return isGzip(is) || isLz4(is) || isZip(is) || isZstd(is);
-  }
-
-  /**
-   * Check whether the stream represents ZSTD data
-   *
-   * @param is input stream; must support {@linkplain InputStream#mark(int)}
-   * @return {@literal true} if the stream represents ZSTD data
-   * @throws IOException
-   */
-  static boolean isZstd(@Nonnull final InputStream is) throws IOException {
-    checkMarkSupported(is);
-    is.mark(ZSTD_MAGIC.length);
-    try {
-      return hasMagic(is, ZSTD_MAGIC);
-    } finally {
-      is.reset();
-    }
-  }
-
-  /**
-   * Check whether the stream represents GZip data
-   *
-   * @param is input stream; must support {@linkplain InputStream#mark(int)}
-   * @return {@literal true} if the stream represents GZip data
-   * @throws IOException
-   */
-  static boolean isGzip(@Nonnull final InputStream is) throws IOException {
-    checkMarkSupported(is);
-    is.mark(GZ_MAGIC.length);
-    try {
-      return hasMagic(is, GZ_MAGIC);
-    } finally {
-      is.reset();
+                    }
+                }))) {
+            BufferedSink sink = Okio.buffer(Okio.sink(sinkStream));
+            try (Source source = Okio.buffer(Okio.source(inputStream))) {
+                sink.writeAll(source);
+            }
+            // a bit of cargo-culting to make sure that all writes have really-really been flushed
+            sink.emit();
+            sink.flush();
+        }
     }
-  }
-
-  /**
-   * Check whether the stream represents Zip data
-   *
-   * @param is input stream; must support {@linkplain InputStream#mark(int)}
-   * @return {@literal true} if the stream represents Zip data
-   * @throws IOException
-   */
-  private static boolean isZip(@Nonnull final InputStream is) throws IOException {
-    checkMarkSupported(is);
-    is.mark(ZIP_MAGIC.length);
-    try {
-      return hasMagic(is, ZIP_MAGIC);
-    } finally {
-      is.reset();
+
+    /**
+     * Check whether the stream is compressed using a supported format
+     *
+     * @param is input stream; must support {@linkplain InputStream#mark(int)}
+     * @return {@literal true} if the stream is compressed in a supported format
+     * @throws IOException
+     */
+    static boolean isCompressed(@Nonnull final InputStream is) throws IOException {
+        checkMarkSupported(is);
+        return isGzip(is) || isLz4(is) || isZip(is) || isZstd(is);
     }
-  }
-
-  /**
-   * Check whether the stream represents LZ4 data
-   *
-   * @param is input stream; must support {@linkplain InputStream#mark(int)}
-   * @return {@literal true} if the stream represents LZ4 data
-   * @throws IOException
-   */
-  static boolean isLz4(@Nonnull final InputStream is) throws IOException {
-    checkMarkSupported(is);
-    is.mark(LZ4_MAGIC.length);
-    try {
-      return hasMagic(is, LZ4_MAGIC);
-    } finally {
-      is.reset();
+
+    /**
+     * Check whether the stream represents ZSTD data
+     *
+     * @param is input stream; must support {@linkplain InputStream#mark(int)}
+     * @return {@literal true} if the stream represents ZSTD data
+     * @throws IOException
+     */
+    static boolean isZstd(@Nonnull final InputStream is) throws IOException {
+        checkMarkSupported(is);
+        is.mark(ZSTD_MAGIC.length);
+        try {
+            return hasMagic(is, ZSTD_MAGIC);
+        } finally {
+            is.reset();
+        }
     }
-  }
 
-  private static void checkMarkSupported(@Nonnull final InputStream is) throws IOException {
-    if (!is.markSupported()) {
-      throw new IOException("Can not check headers on streams not supporting mark() method");
+    /**
+     * Check whether the stream represents GZip data
+     *
+     * @param is input stream; must support {@linkplain InputStream#mark(int)}
+     * @return {@literal true} if the stream represents GZip data
+     * @throws IOException
+     */
+    static boolean isGzip(@Nonnull final InputStream is) throws IOException {
+        checkMarkSupported(is);
+        is.mark(GZ_MAGIC.length);
+        try {
+            return hasMagic(is, GZ_MAGIC);
+        } finally {
+            is.reset();
+        }
     }
-  }
 
-  private static OutputStreamMappingFunction getOutputStreamMapper(
-      @Nonnull CompressionType compressionType) {
-    // Handle native image compatibility
-    if (Platform.isNativeImage() && compressionType != CompressionType.OFF) {
-      compressionType = CompressionType.GZIP;
+    /**
+     * Check whether the stream represents Zip data
+     *
+     * @param is input stream; must support {@linkplain InputStream#mark(int)}
+     * @return {@literal true} if the stream represents Zip data
+     * @throws IOException
+     */
+    private static boolean isZip(@Nonnull final InputStream is) throws IOException {
+        checkMarkSupported(is);
+        is.mark(ZIP_MAGIC.length);
+        try {
+            return hasMagic(is, ZIP_MAGIC);
+        } finally {
+            is.reset();
+        }
     }
 
-    switch (compressionType) {
-      case GZIP:
-        {
-          return GZIPOutputStream::new;
+    /**
+     * Check whether the stream represents LZ4 data
+     *
+     * @param is input stream; must support {@linkplain InputStream#mark(int)}
+     * @return {@literal true} if the stream represents LZ4 data
+     * @throws IOException
+     */
+    static boolean isLz4(@Nonnull final InputStream is) throws IOException {
+        checkMarkSupported(is);
+        is.mark(LZ4_MAGIC.length);
+        try {
+            return hasMagic(is, LZ4_MAGIC);
+        } finally {
+            is.reset();
         }
-      case OFF:
-        {
-          return out -> out;
+    }
+
+    private static void checkMarkSupported(@Nonnull final InputStream is) throws IOException {
+        if (!is.markSupported()) {
+            throw new IOException("Can not check headers on streams not supporting mark() method");
         }
-      case LZ4:
-        {
-          return CompressingRequestBody::toLz4Stream;
+    }
+
+    private static OutputStreamMappingFunction getOutputStreamMapper(@Nonnull CompressionType compressionType) {
+        // Handle native image compatibility
+        if (Platform.isNativeImage() && compressionType != CompressionType.OFF) {
+            compressionType = CompressionType.GZIP;
         }
-      case ON:
-      case ZSTD:
-      default:
-        {
-          return CompressingRequestBody::toZstdStream;
+
+        switch (compressionType) {
+            case GZIP: {
+                return GZIPOutputStream::new;
+            }
+            case OFF: {
+                return out -> out;
+            }
+            case LZ4: {
+                return CompressingRequestBody::toLz4Stream;
+            }
+            case ON:
+            case ZSTD:
+            default: {
+                return CompressingRequestBody::toZstdStream;
+            }
         }
     }
-  }
-
-  private static OutputStream toZstdStream(@Nonnull OutputStream os) throws IOException {
-    // Default compression level is 3 which provides a good balance between performance and
-    // compression ratio
-    return new ZstdOutputStream(os);
-  }
-
-  private static OutputStream toLz4Stream(@Nonnull OutputStream os) throws IOException {
-    return new LZ4FrameOutputStream(
-        os,
-        LZ4FrameOutputStream.BLOCKSIZE.SIZE_64KB,
-        -1L,
-        LZ4_FACTORY.fastCompressor(),
-        XXHASH_FACTORY.hash32(),
-        // copy of the default flag(s) used by LZ4FrameOutputStream
-        LZ4FrameOutputStream.FLG.Bits.BLOCK_INDEPENDENCE);
-  }
-
-  private static boolean hasMagic(InputStream is, int[] magic) throws IOException {
-    for (int element : magic) {
-      int b = is.read();
-      if (b != element) {
-        return false;
-      }
+
+    private static OutputStream toZstdStream(@Nonnull OutputStream os) throws IOException {
+        // Default compression level is 3 which provides a good balance between performance and
+        // compression ratio
+        return new ZstdOutputStream(os);
+    }
+
+    private static OutputStream toLz4Stream(@Nonnull OutputStream os) throws IOException {
+        return new LZ4FrameOutputStream(
+                os,
+                LZ4FrameOutputStream.BLOCKSIZE.SIZE_64KB,
+                -1L,
+                LZ4_FACTORY.fastCompressor(),
+                XXHASH_FACTORY.hash32(),
+                // copy of the default flag(s) used by LZ4FrameOutputStream
+                LZ4FrameOutputStream.FLG.Bits.BLOCK_INDEPENDENCE);
+    }
+
+    private static boolean hasMagic(InputStream is, int[] magic) throws IOException {
+        for (int element : magic) {
+            int b = is.read();
+            if (b != element) {
+                return false;
+            }
+        }
+        return true;
     }
-    return true;
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/CompressionType.java b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/CompressionType.java
index 1aa48261a0a..f4a4fbbe3f9 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/CompressionType.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/CompressionType.java
@@ -5,38 +5,38 @@
 import org.slf4j.LoggerFactory;
 
 enum CompressionType {
-  /** No compression */
-  OFF,
-  /** Default compression */
-  ON,
-  /** Lower compression ratio with less CPU overhead * */
-  LZ4,
-  /** Better compression ratio for the price of higher CPU usage * */
-  GZIP,
-  /** High compression ratio with reasonable CPU usage * */
-  ZSTD;
+    /** No compression */
+    OFF,
+    /** Default compression */
+    ON,
+    /** Lower compression ratio with less CPU overhead * */
+    LZ4,
+    /** Better compression ratio for the price of higher CPU usage * */
+    GZIP,
+    /** High compression ratio with reasonable CPU usage * */
+    ZSTD;
 
-  private static final Logger log = LoggerFactory.getLogger(CompressionType.class);
+    private static final Logger log = LoggerFactory.getLogger(CompressionType.class);
 
-  static CompressionType of(String type) {
-    if (type == null) {
-      type = "";
-    }
+    static CompressionType of(String type) {
+        if (type == null) {
+            type = "";
+        }
 
-    switch (type.toLowerCase(Locale.ROOT)) {
-      case "off":
-        return OFF;
-      case "on":
-        return ON;
-      case "lz4":
-        return LZ4;
-      case "gzip":
-        return GZIP;
-      case "zstd":
-        return ZSTD;
-      default:
-        log.warn("Unrecognizable compression type: {}. Defaulting to '{}'.", type, ZSTD);
-        return ON;
+        switch (type.toLowerCase(Locale.ROOT)) {
+            case "off":
+                return OFF;
+            case "on":
+                return ON;
+            case "lz4":
+                return LZ4;
+            case "gzip":
+                return GZIP;
+            case "zstd":
+                return ZSTD;
+            default:
+                log.warn("Unrecognizable compression type: {}. Defaulting to '{}'.", type, ZSTD);
+                return ON;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ProfileUploader.java b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ProfileUploader.java
index 86ea3f6e3e0..f5bba53c0f1 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ProfileUploader.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ProfileUploader.java
@@ -74,418 +74,398 @@
 /** The class for uploading profiles to the backend. */
 public final class ProfileUploader {
 
-  private static final Logger log = LoggerFactory.getLogger(ProfileUploader.class);
-  private static final MediaType APPLICATION_JSON = MediaType.get("application/json");
-  private static final int TERMINATION_TIMEOUT_SEC = 5;
-
-  static final int MAX_RUNNING_REQUESTS = 10;
-  static final int MAX_ENQUEUED_REQUESTS = 20;
-
-  // V2.4 format
-  static final String V4_PROFILE_TAGS_PARAM = "tags_profiler";
-  static final String V4_PROFILE_START_PARAM = "start";
-  static final String V4_PROFILE_END_PARAM = "end";
-  static final String V4_VERSION = "4";
-  static final String V4_FAMILY = "java";
-
-  static final String V4_EVENT_NAME = "event";
-  static final String V4_EVENT_FILENAME = V4_EVENT_NAME + ".json";
-  static final String V4_ATTACHMENT_NAME = "main";
-  static final String V4_ATTACHMENT_FILENAME = V4_ATTACHMENT_NAME + ".jfr";
-
-  // Header names and values
-  private static final String HEADER_DD_EVP_ORIGIN = "DD-EVP-ORIGIN";
-  private static final String HEADER_DD_EVP_ORIGIN_VERSION = "DD-EVP-ORIGIN-VERSION";
-
-  private static final String JAVA_TRACING_LIBRARY = "dd-trace-java";
-
-  private static final Headers EVENT_HEADER =
-      Headers.of(
-          "Content-Disposition",
-          "form-data; name=\"" + V4_EVENT_NAME + "\"; filename=\"" + V4_EVENT_FILENAME + "\"");
-
-  private static final Headers V4_DATA_HEADERS =
-      Headers.of(
-          "Content-Disposition",
-          "form-data; name=\""
-              + V4_ATTACHMENT_NAME
-              + "\"; filename=\""
-              + V4_ATTACHMENT_FILENAME
-              + "\"");
-
-  static final String SERVELESS_TAG = "functionname";
-
-  private final Config config;
-  private final ConfigProvider configProvider;
-
-  private final ExecutorService okHttpExecutorService;
-  private final OkHttpClient client;
-  private final IOLogger ioLogger;
-  private final boolean agentless;
-  private final boolean summaryOn413;
-  private final HttpUrl url;
-  private final int terminationTimeout;
-  private final CompressionType compressionType;
-
-  private final RecordingDataAdapter jsonAdapter;
-
-  private final Duration uploadTimeout;
-
-  public ProfileUploader(final Config config, final ConfigProvider configProvider) {
-    this(config, configProvider, new IOLogger(log), TERMINATION_TIMEOUT_SEC);
-  }
-
-  @VisibleForTesting
-  ProfileUploader(
-      final Config config,
-      final ConfigProvider configProvider,
-      final IOLogger ioLogger,
-      final int terminationTimeout) {
-    this.config = config;
-    this.configProvider = configProvider;
-    this.ioLogger = ioLogger;
-    this.terminationTimeout = terminationTimeout;
-
-    url = HttpUrl.get(config.getFinalProfilingUrl());
-    agentless = config.isProfilingAgentless();
-    summaryOn413 = config.isProfilingUploadSummaryOn413Enabled();
-
-    log.debug("Started ProfileUploader with target url {}", url);
-    /*
-    FIXME: currently `Config` class cannot get access to some pieces of information we need here:
-    * PID (see PidHelper for details),
-    * Profiler version
-    Since Config returns unmodifiable map we have to do copy here.
-    Ideally we should improve this logic and avoid copy, but performance impact is very limited
-    since we are doing this once on startup only.
-    */
-    final Map<String, String> tagsMap = new HashMap<>(config.getMergedProfilingTags());
-    tagsMap.put(VersionInfo.PROFILER_VERSION_TAG, VersionInfo.VERSION);
-    tagsMap.put(VersionInfo.LIBRARY_VERSION_TAG, VersionInfo.VERSION);
-    // PID can be empty if we cannot find it out from the system
-    if (!PidHelper.getPid().isEmpty()) {
-      tagsMap.put(DDTags.PID_TAG, PidHelper.getPid());
+    private static final Logger log = LoggerFactory.getLogger(ProfileUploader.class);
+    private static final MediaType APPLICATION_JSON = MediaType.get("application/json");
+    private static final int TERMINATION_TIMEOUT_SEC = 5;
+
+    static final int MAX_RUNNING_REQUESTS = 10;
+    static final int MAX_ENQUEUED_REQUESTS = 20;
+
+    // V2.4 format
+    static final String V4_PROFILE_TAGS_PARAM = "tags_profiler";
+    static final String V4_PROFILE_START_PARAM = "start";
+    static final String V4_PROFILE_END_PARAM = "end";
+    static final String V4_VERSION = "4";
+    static final String V4_FAMILY = "java";
+
+    static final String V4_EVENT_NAME = "event";
+    static final String V4_EVENT_FILENAME = V4_EVENT_NAME + ".json";
+    static final String V4_ATTACHMENT_NAME = "main";
+    static final String V4_ATTACHMENT_FILENAME = V4_ATTACHMENT_NAME + ".jfr";
+
+    // Header names and values
+    private static final String HEADER_DD_EVP_ORIGIN = "DD-EVP-ORIGIN";
+    private static final String HEADER_DD_EVP_ORIGIN_VERSION = "DD-EVP-ORIGIN-VERSION";
+
+    private static final String JAVA_TRACING_LIBRARY = "dd-trace-java";
+
+    private static final Headers EVENT_HEADER = Headers.of(
+            "Content-Disposition", "form-data; name=\"" + V4_EVENT_NAME + "\"; filename=\"" + V4_EVENT_FILENAME + "\"");
+
+    private static final Headers V4_DATA_HEADERS = Headers.of(
+            "Content-Disposition",
+            "form-data; name=\"" + V4_ATTACHMENT_NAME + "\"; filename=\"" + V4_ATTACHMENT_FILENAME + "\"");
+
+    static final String SERVELESS_TAG = "functionname";
+
+    private final Config config;
+    private final ConfigProvider configProvider;
+
+    private final ExecutorService okHttpExecutorService;
+    private final OkHttpClient client;
+    private final IOLogger ioLogger;
+    private final boolean agentless;
+    private final boolean summaryOn413;
+    private final HttpUrl url;
+    private final int terminationTimeout;
+    private final CompressionType compressionType;
+
+    private final RecordingDataAdapter jsonAdapter;
+
+    private final Duration uploadTimeout;
+
+    public ProfileUploader(final Config config, final ConfigProvider configProvider) {
+        this(config, configProvider, new IOLogger(log), TERMINATION_TIMEOUT_SEC);
     }
 
-    if (config.isTraceGitMetadataEnabled()) {
-      GitInfo gitInfo = GitInfoProvider.INSTANCE.getGitInfo();
-      tagsMap.put(Tags.GIT_REPOSITORY_URL, gitInfo.getRepositoryURL());
-      tagsMap.put(Tags.GIT_COMMIT_SHA, gitInfo.getCommit().getSha());
+    @VisibleForTesting
+    ProfileUploader(
+            final Config config,
+            final ConfigProvider configProvider,
+            final IOLogger ioLogger,
+            final int terminationTimeout) {
+        this.config = config;
+        this.configProvider = configProvider;
+        this.ioLogger = ioLogger;
+        this.terminationTimeout = terminationTimeout;
+
+        url = HttpUrl.get(config.getFinalProfilingUrl());
+        agentless = config.isProfilingAgentless();
+        summaryOn413 = config.isProfilingUploadSummaryOn413Enabled();
+
+        log.debug("Started ProfileUploader with target url {}", url);
+        /*
+        FIXME: currently `Config` class cannot get access to some pieces of information we need here:
+        * PID (see PidHelper for details),
+        * Profiler version
+        Since Config returns unmodifiable map we have to do copy here.
+        Ideally we should improve this logic and avoid copy, but performance impact is very limited
+        since we are doing this once on startup only.
+        */
+        final Map<String, String> tagsMap = new HashMap<>(config.getMergedProfilingTags());
+        tagsMap.put(VersionInfo.PROFILER_VERSION_TAG, VersionInfo.VERSION);
+        tagsMap.put(VersionInfo.LIBRARY_VERSION_TAG, VersionInfo.VERSION);
+        // PID can be empty if we cannot find it out from the system
+        if (!PidHelper.getPid().isEmpty()) {
+            tagsMap.put(DDTags.PID_TAG, PidHelper.getPid());
+        }
+
+        if (config.isTraceGitMetadataEnabled()) {
+            GitInfo gitInfo = GitInfoProvider.INSTANCE.getGitInfo();
+            tagsMap.put(Tags.GIT_REPOSITORY_URL, gitInfo.getRepositoryURL());
+            tagsMap.put(Tags.GIT_COMMIT_SHA, gitInfo.getCommit().getSha());
+        }
+        if (Platform.isNativeImage()) {
+            tagsMap.put(DDTags.RUNTIME_VERSION_TAG, tagsMap.get(DDTags.RUNTIME_VERSION_TAG) + "-aot");
+        }
+        if (ServerlessInfo.get().isRunningInServerlessEnvironment()) {
+            tagsMap.put(SERVELESS_TAG, ServerlessInfo.get().getFunctionName());
+        }
+
+        // Comma separated tags string for V2.4 format
+        Pattern quotes = Pattern.compile("\"");
+        jsonAdapter = new RecordingDataAdapter(
+                quotes.matcher(String.join(",", tagsToList(tagsMap))).replaceAll(""));
+        uploadTimeout = Duration.ofSeconds(config.getProfilingUploadTimeout());
+
+        // This is the same thing OkHttp Dispatcher is doing except thread naming and daemonization
+        okHttpExecutorService = new ThreadPoolExecutor(
+                0,
+                Integer.MAX_VALUE,
+                60,
+                TimeUnit.SECONDS,
+                new SynchronousQueue<>(),
+                new AgentThreadFactory(PROFILER_HTTP_DISPATCHER));
+
+        client = OkHttpUtils.buildHttpClient(
+                config,
+                new Dispatcher(okHttpExecutorService),
+                url,
+                true,
+                MAX_RUNNING_REQUESTS,
+                config.getProfilingProxyHost(),
+                config.getProfilingProxyPort(),
+                config.getProfilingProxyUsername(),
+                config.getProfilingProxyPassword(),
+                uploadTimeout.toMillis());
+
+        compressionType = CompressionType.of(config.getProfilingUploadCompression());
     }
-    if (Platform.isNativeImage()) {
-      tagsMap.put(DDTags.RUNTIME_VERSION_TAG, tagsMap.get(DDTags.RUNTIME_VERSION_TAG) + "-aot");
+
+    /**
+     * Enqueue an upload request. Do not receive any notification when the upload has been completed.
+     *
+     * @param type {@link RecordingType recording type}
+     * @param data {@link RecordingData recording data}
+     */
+    public void upload(final RecordingType type, final RecordingData data) {
+        upload(type, data, false);
     }
-    if (ServerlessInfo.get().isRunningInServerlessEnvironment()) {
-      tagsMap.put(SERVELESS_TAG, ServerlessInfo.get().getFunctionName());
+
+    /**
+     * Enqueue an upload request. Do not receive any notification when the upload has been completed.
+     *
+     * @param type {@link RecordingType recording type}
+     * @param data {@link RecordingData recording data}
+     * @param sync {@link boolean uploading synchronously}
+     */
+    public void upload(final RecordingType type, final RecordingData data, final boolean sync) {
+        upload(type, data, sync, () -> {});
     }
 
-    // Comma separated tags string for V2.4 format
-    Pattern quotes = Pattern.compile("\"");
-    jsonAdapter =
-        new RecordingDataAdapter(
-            quotes.matcher(String.join(",", tagsToList(tagsMap))).replaceAll(""));
-    uploadTimeout = Duration.ofSeconds(config.getProfilingUploadTimeout());
-
-    // This is the same thing OkHttp Dispatcher is doing except thread naming and daemonization
-    okHttpExecutorService =
-        new ThreadPoolExecutor(
-            0,
-            Integer.MAX_VALUE,
-            60,
-            TimeUnit.SECONDS,
-            new SynchronousQueue<>(),
-            new AgentThreadFactory(PROFILER_HTTP_DISPATCHER));
-
-    client =
-        OkHttpUtils.buildHttpClient(
-            config,
-            new Dispatcher(okHttpExecutorService),
-            url,
-            true,
-            MAX_RUNNING_REQUESTS,
-            config.getProfilingProxyHost(),
-            config.getProfilingProxyPort(),
-            config.getProfilingProxyUsername(),
-            config.getProfilingProxyPassword(),
-            uploadTimeout.toMillis());
-
-    compressionType = CompressionType.of(config.getProfilingUploadCompression());
-  }
-
-  /**
-   * Enqueue an upload request. Do not receive any notification when the upload has been completed.
-   *
-   * @param type {@link RecordingType recording type}
-   * @param data {@link RecordingData recording data}
-   */
-  public void upload(final RecordingType type, final RecordingData data) {
-    upload(type, data, false);
-  }
-
-  /**
-   * Enqueue an upload request. Do not receive any notification when the upload has been completed.
-   *
-   * @param type {@link RecordingType recording type}
-   * @param data {@link RecordingData recording data}
-   * @param sync {@link boolean uploading synchronously}
-   */
-  public void upload(final RecordingType type, final RecordingData data, final boolean sync) {
-    upload(type, data, sync, () -> {});
-  }
-
-  /**
-   * Enqueue an upload request and run the provided hook when that request is completed
-   * (successfully or failing).
-   *
-   * @param type {@link RecordingType recording type}
-   * @param data {@link RecordingData recording data}
-   * @param onCompletion call-back to execute once the request is completed (successfully or
-   *     failing)
-   */
-  public void upload(
-      final RecordingType type, final RecordingData data, @Nonnull final Runnable onCompletion) {
-    upload(type, data, false, onCompletion);
-  }
-
-  /**
-   * Enqueue an upload request and run the provided hook when that request is completed
-   * (successfully or failing).
-   *
-   * @param type {@link RecordingType recording type}
-   * @param data {@link RecordingData recording data}
-   * @param sync {@link boolean uploading synchronously}
-   * @param onCompletion call-back to execute once the request is completed (successfully or
-   *     failing)
-   */
-  public void upload(
-      final RecordingType type,
-      final RecordingData data,
-      final boolean sync,
-      @Nonnull final Runnable onCompletion) {
-    if (!canEnqueueMoreRequests()) {
-      log.warn("Cannot upload profile data: too many enqueued requests!");
-      // the request was not made; release the recording data
-      data.release();
-      return;
+    /**
+     * Enqueue an upload request and run the provided hook when that request is completed
+     * (successfully or failing).
+     *
+     * @param type {@link RecordingType recording type}
+     * @param data {@link RecordingData recording data}
+     * @param onCompletion call-back to execute once the request is completed (successfully or
+     *     failing)
+     */
+    public void upload(final RecordingType type, final RecordingData data, @Nonnull final Runnable onCompletion) {
+        upload(type, data, false, onCompletion);
     }
 
-    Call call = makeRequest(type, data);
-    CountDownLatch latch = new CountDownLatch(sync ? 1 : 0);
-    AtomicBoolean handled = new AtomicBoolean(false);
-
-    call.enqueue(
-        new Callback() {
-          @Override
-          public void onResponse(final Call call, final Response response) throws IOException {
-            if (handled.compareAndSet(false, true)) {
-              handleResponse(call, response, data, onCompletion);
-              latch.countDown();
+    /**
+     * Enqueue an upload request and run the provided hook when that request is completed
+     * (successfully or failing).
+     *
+     * @param type {@link RecordingType recording type}
+     * @param data {@link RecordingData recording data}
+     * @param sync {@link boolean uploading synchronously}
+     * @param onCompletion call-back to execute once the request is completed (successfully or
+     *     failing)
+     */
+    public void upload(
+            final RecordingType type,
+            final RecordingData data,
+            final boolean sync,
+            @Nonnull final Runnable onCompletion) {
+        if (!canEnqueueMoreRequests()) {
+            log.warn("Cannot upload profile data: too many enqueued requests!");
+            // the request was not made; release the recording data
+            data.release();
+            return;
+        }
+
+        Call call = makeRequest(type, data);
+        CountDownLatch latch = new CountDownLatch(sync ? 1 : 0);
+        AtomicBoolean handled = new AtomicBoolean(false);
+
+        call.enqueue(new Callback() {
+            @Override
+            public void onResponse(final Call call, final Response response) throws IOException {
+                if (handled.compareAndSet(false, true)) {
+                    handleResponse(call, response, data, onCompletion);
+                    latch.countDown();
+                }
             }
-          }
 
-          @Override
-          public void onFailure(final Call call, final IOException e) {
-            if (handled.compareAndSet(false, true)) {
-              handleFailure(call, e, data, onCompletion);
-              latch.countDown();
+            @Override
+            public void onFailure(final Call call, final IOException e) {
+                if (handled.compareAndSet(false, true)) {
+                    handleFailure(call, e, data, onCompletion);
+                    latch.countDown();
+                }
             }
-          }
         });
-    if (sync) {
-      try {
-        log.debug("Waiting at most {} seconds for upload to finish", uploadTimeout.plusSeconds(1));
-        if (!latch.await(uploadTimeout.plusSeconds(1).toMillis(), TimeUnit.MILLISECONDS)) {
-          // Usually this should not happen and timeouts should be handled by the client.
-          // But, in any case, we have this safety-break in place to prevent blocking finishing the
-          // sync request to a misbehaving server.
-          if (handled.compareAndSet(false, true)) {
-            handleFailure(call, null, data, onCompletion);
-          }
+        if (sync) {
+            try {
+                log.debug("Waiting at most {} seconds for upload to finish", uploadTimeout.plusSeconds(1));
+                if (!latch.await(uploadTimeout.plusSeconds(1).toMillis(), TimeUnit.MILLISECONDS)) {
+                    // Usually this should not happen and timeouts should be handled by the client.
+                    // But, in any case, we have this safety-break in place to prevent blocking finishing the
+                    // sync request to a misbehaving server.
+                    if (handled.compareAndSet(false, true)) {
+                        handleFailure(call, null, data, onCompletion);
+                    }
+                }
+            } catch (InterruptedException e) {
+                if (handled.compareAndSet(false, true)) {
+                    handleFailure(call, e, data, onCompletion);
+                }
+                // reset the interrupted flag
+                Thread.currentThread().interrupt();
+            }
+        }
+    }
+
+    private void handleFailure(
+            final Call call, final Exception e, final RecordingData data, @Nonnull final Runnable onCompletion) {
+        if (isEmptyReplyFromServer(e)) {
+            ioLogger.error("Failed to upload profile, received empty reply from "
+                    + call.request().url()
+                    + " after uploading profile");
+        } else {
+            ioLogger.error("Failed to upload profile to " + call.request().url(), e);
+        }
+
+        data.release();
+        onCompletion.run();
+    }
+
+    private void handleResponse(
+            final Call call, final Response response, final RecordingData data, @Nonnull final Runnable onCompletion)
+            throws IOException {
+        if (response.isSuccessful()) {
+            ioLogger.success("Upload done");
+        } else {
+            final String apiKey = call.request().header("DD-API-KEY");
+            if (response.code() == 404 && apiKey == null) {
+                // if no API key and not found error we assume we're sending to the agent
+                ioLogger.error(
+                        "Failed to upload profile. Datadog Agent is not accepting profiles. Agent-based profiling deployments require Datadog Agent >= 7.20");
+            } else if (response.code() == 413 && summaryOn413) {
+                ioLogger.error("Failed to upload profile, it's too big. Dumping information about the profile");
+                JfrCliHelper.invokeOn(data, ioLogger);
+            } else {
+                ioLogger.error("Failed to upload profile", getLoggerResponse(response));
+            }
         }
-      } catch (InterruptedException e) {
-        if (handled.compareAndSet(false, true)) {
-          handleFailure(call, e, data, onCompletion);
+
+        // Note: this whole callback never touches body and would be perfectly happy even if
+        // server never sends it.
+        response.close();
+
+        data.release();
+        onCompletion.run();
+    }
+
+    @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
+    private IOLogger.Response getLoggerResponse(final okhttp3.Response response) {
+        if (response != null) {
+            try {
+                final ResponseBody body = response.body();
+                return new IOLogger.Response(
+                        response.code(),
+                        response.message(),
+                        body == null ? "<null>" : body.string().trim());
+            } catch (final NullPointerException | IOException ignored) {
+            }
         }
-        // reset the interrupted flag
-        Thread.currentThread().interrupt();
-      }
+        return null;
     }
-  }
-
-  private void handleFailure(
-      final Call call,
-      final Exception e,
-      final RecordingData data,
-      @Nonnull final Runnable onCompletion) {
-    if (isEmptyReplyFromServer(e)) {
-      ioLogger.error(
-          "Failed to upload profile, received empty reply from "
-              + call.request().url()
-              + " after uploading profile");
-    } else {
-      ioLogger.error("Failed to upload profile to " + call.request().url(), e);
+
+    private static boolean isEmptyReplyFromServer(final Exception e) {
+        // The server in datadog-agent triggers 'unexpected end of stream' caused by
+        // EOFException.
+        // The MockWebServer in tests triggers an InterruptedIOException with SocketPolicy
+        // NO_RESPONSE. This is because in tests we can't cleanly terminate the connection
+        // on the
+        // server side without resetting.
+        return e != null
+                && ((e instanceof InterruptedIOException)
+                        || (e.getCause() != null && e.getCause() instanceof java.io.EOFException));
     }
 
-    data.release();
-    onCompletion.run();
-  }
-
-  private void handleResponse(
-      final Call call,
-      final Response response,
-      final RecordingData data,
-      @Nonnull final Runnable onCompletion)
-      throws IOException {
-    if (response.isSuccessful()) {
-      ioLogger.success("Upload done");
-    } else {
-      final String apiKey = call.request().header("DD-API-KEY");
-      if (response.code() == 404 && apiKey == null) {
-        // if no API key and not found error we assume we're sending to the agent
-        ioLogger.error(
-            "Failed to upload profile. Datadog Agent is not accepting profiles. Agent-based profiling deployments require Datadog Agent >= 7.20");
-      } else if (response.code() == 413 && summaryOn413) {
-        ioLogger.error(
-            "Failed to upload profile, it's too big. Dumping information about the profile");
-        JfrCliHelper.invokeOn(data, ioLogger);
-      } else {
-        ioLogger.error("Failed to upload profile", getLoggerResponse(response));
-      }
+    public void shutdown() {
+        okHttpExecutorService.shutdownNow();
+        try {
+            okHttpExecutorService.awaitTermination(terminationTimeout, TimeUnit.SECONDS);
+        } catch (final InterruptedException e) {
+            // Note: this should only happen in main thread right before exiting, so eating up interrupted
+            // state should be fine.
+            log.debug("Wait for executor shutdown interrupted");
+        }
+        client.connectionPool().evictAll();
     }
 
-    // Note: this whole callback never touches body and would be perfectly happy even if
-    // server never sends it.
-    response.close();
-
-    data.release();
-    onCompletion.run();
-  }
-
-  @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
-  private IOLogger.Response getLoggerResponse(final okhttp3.Response response) {
-    if (response != null) {
-      try {
-        final ResponseBody body = response.body();
-        return new IOLogger.Response(
-            response.code(), response.message(), body == null ? "<null>" : body.string().trim());
-      } catch (final NullPointerException | IOException ignored) {
-      }
+    private byte[] createEvent(@Nonnull final RecordingData data) {
+        return jsonAdapter.toJson(data).getBytes(StandardCharsets.UTF_8);
     }
-    return null;
-  }
-
-  private static boolean isEmptyReplyFromServer(final Exception e) {
-    // The server in datadog-agent triggers 'unexpected end of stream' caused by
-    // EOFException.
-    // The MockWebServer in tests triggers an InterruptedIOException with SocketPolicy
-    // NO_RESPONSE. This is because in tests we can't cleanly terminate the connection
-    // on the
-    // server side without resetting.
-    return e != null
-        && ((e instanceof InterruptedIOException)
-            || (e.getCause() != null && e.getCause() instanceof java.io.EOFException));
-  }
-
-  public void shutdown() {
-    okHttpExecutorService.shutdownNow();
-    try {
-      okHttpExecutorService.awaitTermination(terminationTimeout, TimeUnit.SECONDS);
-    } catch (final InterruptedException e) {
-      // Note: this should only happen in main thread right before exiting, so eating up interrupted
-      // state should be fine.
-      log.debug("Wait for executor shutdown interrupted");
+
+    private MultipartBody makeRequestBody(@Nonnull final RecordingData data, final CompressingRequestBody body) {
+        final MultipartBody.Builder bodyBuilder = new MultipartBody.Builder().setType(MultipartBody.FORM);
+
+        final byte[] event = createEvent(data);
+        final RequestBody eventBody = RequestBody.create(APPLICATION_JSON, event);
+        bodyBuilder.addPart(EVENT_HEADER, eventBody);
+        bodyBuilder.addPart(V4_DATA_HEADERS, body);
+        return bodyBuilder.build();
     }
-    client.connectionPool().evictAll();
-  }
-
-  private byte[] createEvent(@Nonnull final RecordingData data) {
-    return jsonAdapter.toJson(data).getBytes(StandardCharsets.UTF_8);
-  }
-
-  private MultipartBody makeRequestBody(
-      @Nonnull final RecordingData data, final CompressingRequestBody body) {
-    final MultipartBody.Builder bodyBuilder =
-        new MultipartBody.Builder().setType(MultipartBody.FORM);
-
-    final byte[] event = createEvent(data);
-    final RequestBody eventBody = RequestBody.create(APPLICATION_JSON, event);
-    bodyBuilder.addPart(EVENT_HEADER, eventBody);
-    bodyBuilder.addPart(V4_DATA_HEADERS, body);
-    return bodyBuilder.build();
-  }
-
-  private Call makeRequest(@Nonnull final RecordingType type, @Nonnull final RecordingData data) {
-
-    final CompressingRequestBody body =
-        new CompressingRequestBody(compressionType, data::getStream);
-    final RequestBody requestBody = makeRequestBody(data, body);
-
-    final Map<String, String> headers = new HashMap<>();
-    // Set chunked transfer
-    headers.put("Transfer-Encoding", "chunked");
-    headers.put(HEADER_DD_EVP_ORIGIN, JAVA_TRACING_LIBRARY);
-    headers.put(HEADER_DD_EVP_ORIGIN_VERSION, VersionInfo.VERSION);
-
-    return client.newCall(
-        OkHttpUtils.prepareRequest(url, headers, config, agentless).post(requestBody).build());
-  }
-
-  private boolean canEnqueueMoreRequests() {
-    return client.dispatcher().queuedCallsCount() < MAX_ENQUEUED_REQUESTS;
-  }
-
-  private List<String> tagsToList(final Map<String, String> tags) {
-    return tags.entrySet().stream()
-        .filter(e -> e.getValue() != null && !e.getValue().isEmpty())
-        .map(e -> e.getKey() + ":" + e.getValue())
-        .collect(Collectors.toList());
-  }
-
-  @VisibleForTesting
-  OkHttpClient getClient() {
-    return client;
-  }
-
-  private static final class RecordingDataAdapter extends JsonAdapter<RecordingData> {
-
-    private final String tags;
-
-    private RecordingDataAdapter(String tags) {
-      this.tags = tags;
+
+    private Call makeRequest(@Nonnull final RecordingType type, @Nonnull final RecordingData data) {
+
+        final CompressingRequestBody body = new CompressingRequestBody(compressionType, data::getStream);
+        final RequestBody requestBody = makeRequestBody(data, body);
+
+        final Map<String, String> headers = new HashMap<>();
+        // Set chunked transfer
+        headers.put("Transfer-Encoding", "chunked");
+        headers.put(HEADER_DD_EVP_ORIGIN, JAVA_TRACING_LIBRARY);
+        headers.put(HEADER_DD_EVP_ORIGIN_VERSION, VersionInfo.VERSION);
+
+        return client.newCall(OkHttpUtils.prepareRequest(url, headers, config, agentless)
+                .post(requestBody)
+                .build());
+    }
+
+    private boolean canEnqueueMoreRequests() {
+        return client.dispatcher().queuedCallsCount() < MAX_ENQUEUED_REQUESTS;
     }
 
-    @Nullable
-    @Override
-    public RecordingData fromJson(JsonReader jsonReader) {
-      throw new IllegalStateException();
+    private List<String> tagsToList(final Map<String, String> tags) {
+        return tags.entrySet().stream()
+                .filter(e -> e.getValue() != null && !e.getValue().isEmpty())
+                .map(e -> e.getKey() + ":" + e.getValue())
+                .collect(Collectors.toList());
     }
 
-    @Override
-    public void toJson(JsonWriter writer, RecordingData recordingData) throws IOException {
-      if (recordingData == null) {
-        return;
-      }
-      final CharSequence processTags = ProcessTags.getTagsForSerialization();
-      writer.beginObject();
-      writer.name("attachments");
-      writer.beginArray();
-      writer.value(V4_ATTACHMENT_FILENAME);
-      writer.endArray();
-      writer.name(V4_PROFILE_TAGS_PARAM);
-      writer.value(tags + ",snapshot:" + recordingData.getKind().name().toLowerCase(Locale.ROOT));
-      if (processTags != null) {
-        writer.name("process_tags");
-        writer.value(processTags.toString());
-      }
-      writer.name(V4_PROFILE_START_PARAM);
-      writer.value(recordingData.getStart().toString());
-      writer.name(V4_PROFILE_END_PARAM);
-      writer.value(recordingData.getEnd().toString());
-      writer.name("family");
-      writer.value(V4_FAMILY);
-      writer.name("version");
-      writer.value(V4_VERSION);
-      writer.endObject();
+    @VisibleForTesting
+    OkHttpClient getClient() {
+        return client;
+    }
+
+    private static final class RecordingDataAdapter extends JsonAdapter<RecordingData> {
+
+        private final String tags;
+
+        private RecordingDataAdapter(String tags) {
+            this.tags = tags;
+        }
+
+        @Nullable
+        @Override
+        public RecordingData fromJson(JsonReader jsonReader) {
+            throw new IllegalStateException();
+        }
+
+        @Override
+        public void toJson(JsonWriter writer, RecordingData recordingData) throws IOException {
+            if (recordingData == null) {
+                return;
+            }
+            final CharSequence processTags = ProcessTags.getTagsForSerialization();
+            writer.beginObject();
+            writer.name("attachments");
+            writer.beginArray();
+            writer.value(V4_ATTACHMENT_FILENAME);
+            writer.endArray();
+            writer.name(V4_PROFILE_TAGS_PARAM);
+            writer.value(tags + ",snapshot:" + recordingData.getKind().name().toLowerCase(Locale.ROOT));
+            if (processTags != null) {
+                writer.name("process_tags");
+                writer.value(processTags.toString());
+            }
+            writer.name(V4_PROFILE_START_PARAM);
+            writer.value(recordingData.getStart().toString());
+            writer.name(V4_PROFILE_END_PARAM);
+            writer.value(recordingData.getEnd().toString());
+            writer.name("family");
+            writer.value(V4_FAMILY);
+            writer.name("version");
+            writer.value(V4_VERSION);
+            writer.endObject();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/util/JfrCliHelper.java b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/util/JfrCliHelper.java
index 1348c5b2dea..aa007b76af6 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/util/JfrCliHelper.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/util/JfrCliHelper.java
@@ -28,158 +28,153 @@
 /** Call the `jfr` cli on the given recording */
 public class JfrCliHelper {
 
-  private static final Path JFR_CLI_SUBDIR = Paths.get("jfr-cli");
-
-  private static ExecutorService executorService =
-      new ThreadPoolExecutor(
-          0,
-          Integer.MAX_VALUE,
-          60,
-          TimeUnit.SECONDS,
-          new SynchronousQueue<>(),
-          new AgentThreadFactory(PROFILER_HTTP_DISPATCHER));
-
-  private static Pattern lineSeparatorRegex = Pattern.compile(System.lineSeparator());
-  private static Pattern metadataSeparatorRegex = Pattern.compile("^=+$");
-  private static Pattern columnSeparatorRegex = Pattern.compile("\\s+");
-
-  public static void invokeOn(final RecordingData data, final IOLogger ioLogger) {
-    Path tmp = null;
-    try {
-      Path jfr = Paths.get(SystemProperties.get("java.home"), "bin", "jfr");
-      if (JavaVirtualMachine.isJ9() || !Files.exists(jfr)) {
-        ioLogger.error("Failed to gather information on recording, can't find `jfr`");
-        return;
-      }
-
-      Path tempDir = TempLocationManager.getInstance().getTempDir(JFR_CLI_SUBDIR);
-      tmp = Files.createTempFile(tempDir, "recording-", ".jfr");
-
-      // Save recording to temporary file
-      InputStream in = data.getStream();
-      try (OutputStream out = Files.newOutputStream(tmp)) {
-        redirect(in, out);
-      }
-
-      String[] stdout;
-
-      // Launch `jfr` on temporary file and get stdout
-      ProcessBuilder builder =
-          new ProcessBuilder(jfr.toString(), "summary", tmp.toAbsolutePath().toString());
-      builder.redirectInput(ProcessBuilder.Redirect.INHERIT);
-      builder.redirectOutput(ProcessBuilder.Redirect.PIPE); // we'll want to read stdout
-      builder.redirectError(ProcessBuilder.Redirect.INHERIT);
-
-      Process process = builder.start();
-
-      try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-        Future<?> asyncRedirect =
-            executorService.submit(
-                () -> {
-                  redirect(process.getInputStream(), out);
-                  return true;
+    private static final Path JFR_CLI_SUBDIR = Paths.get("jfr-cli");
+
+    private static ExecutorService executorService = new ThreadPoolExecutor(
+            0,
+            Integer.MAX_VALUE,
+            60,
+            TimeUnit.SECONDS,
+            new SynchronousQueue<>(),
+            new AgentThreadFactory(PROFILER_HTTP_DISPATCHER));
+
+    private static Pattern lineSeparatorRegex = Pattern.compile(System.lineSeparator());
+    private static Pattern metadataSeparatorRegex = Pattern.compile("^=+$");
+    private static Pattern columnSeparatorRegex = Pattern.compile("\\s+");
+
+    public static void invokeOn(final RecordingData data, final IOLogger ioLogger) {
+        Path tmp = null;
+        try {
+            Path jfr = Paths.get(SystemProperties.get("java.home"), "bin", "jfr");
+            if (JavaVirtualMachine.isJ9() || !Files.exists(jfr)) {
+                ioLogger.error("Failed to gather information on recording, can't find `jfr`");
+                return;
+            }
+
+            Path tempDir = TempLocationManager.getInstance().getTempDir(JFR_CLI_SUBDIR);
+            tmp = Files.createTempFile(tempDir, "recording-", ".jfr");
+
+            // Save recording to temporary file
+            InputStream in = data.getStream();
+            try (OutputStream out = Files.newOutputStream(tmp)) {
+                redirect(in, out);
+            }
+
+            String[] stdout;
+
+            // Launch `jfr` on temporary file and get stdout
+            ProcessBuilder builder = new ProcessBuilder(
+                    jfr.toString(), "summary", tmp.toAbsolutePath().toString());
+            builder.redirectInput(ProcessBuilder.Redirect.INHERIT);
+            builder.redirectOutput(ProcessBuilder.Redirect.PIPE); // we'll want to read stdout
+            builder.redirectError(ProcessBuilder.Redirect.INHERIT);
+
+            Process process = builder.start();
+
+            try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+                Future<?> asyncRedirect = executorService.submit(() -> {
+                    redirect(process.getInputStream(), out);
+                    return true;
                 });
 
-        if (!process.waitFor(30, TimeUnit.SECONDS)) {
-          ioLogger.error("Failed to gather information on recording, `jfr` never finished");
-          asyncRedirect.cancel(true);
-          return;
-        }
-
-        asyncRedirect.get();
-
-        stdout = lineSeparatorRegex.split(out.toString());
-      } finally {
-        process.destroy();
-      }
-
-      // Skip metadata from stdout
-      int i = 0;
-      for (; i < stdout.length; i++) {
-        String line = stdout[i];
-        if (metadataSeparatorRegex.matcher(line).matches()) {
-          // we reached the separation line between the metadata and the data
-          i += 1;
-          break;
-        }
-      }
-
-      // Extract list of events from stdout
-      List<Event> events = new ArrayList<Event>();
-      for (; i < stdout.length; i++) {
-        String line = stdout[i];
-        if (line.isEmpty()) {
-          break;
-        }
-
-        String[] columns = columnSeparatorRegex.split(line.trim(), 3);
-        if (columns.length < 3) {
-          ioLogger.error("Failed to gather information on recording, line format is unexpected");
-          return;
-        }
-
-        String type = columns[0];
-        int count = Integer.parseInt(columns[1]);
-        int size = Integer.parseInt(columns[2]);
-
-        events.add(new Event(type, count, size));
-      }
-
-      // Log top 10 biggest events by size
-      events.stream()
-          .sorted(Comparator.comparing(Event::getSize).reversed())
-          .limit(10)
-          .forEach(
-              event -> {
-                ioLogger.error(
-                    String.format(
-                        "Event: %s, size = %d, count = %d",
-                        event.getType(), event.getSize(), event.getCount()));
-              });
-    } catch (Exception e) {
-      ioLogger.error("Failed to gather information on recording", e);
-      return;
-    } finally {
-      if (tmp != null) {
-        try {
-          Files.deleteIfExists(tmp);
-        } catch (IOException ignored) {
+                if (!process.waitFor(30, TimeUnit.SECONDS)) {
+                    ioLogger.error("Failed to gather information on recording, `jfr` never finished");
+                    asyncRedirect.cancel(true);
+                    return;
+                }
+
+                asyncRedirect.get();
+
+                stdout = lineSeparatorRegex.split(out.toString());
+            } finally {
+                process.destroy();
+            }
+
+            // Skip metadata from stdout
+            int i = 0;
+            for (; i < stdout.length; i++) {
+                String line = stdout[i];
+                if (metadataSeparatorRegex.matcher(line).matches()) {
+                    // we reached the separation line between the metadata and the data
+                    i += 1;
+                    break;
+                }
+            }
+
+            // Extract list of events from stdout
+            List<Event> events = new ArrayList<Event>();
+            for (; i < stdout.length; i++) {
+                String line = stdout[i];
+                if (line.isEmpty()) {
+                    break;
+                }
+
+                String[] columns = columnSeparatorRegex.split(line.trim(), 3);
+                if (columns.length < 3) {
+                    ioLogger.error("Failed to gather information on recording, line format is unexpected");
+                    return;
+                }
+
+                String type = columns[0];
+                int count = Integer.parseInt(columns[1]);
+                int size = Integer.parseInt(columns[2]);
+
+                events.add(new Event(type, count, size));
+            }
+
+            // Log top 10 biggest events by size
+            events.stream()
+                    .sorted(Comparator.comparing(Event::getSize).reversed())
+                    .limit(10)
+                    .forEach(event -> {
+                        ioLogger.error(String.format(
+                                "Event: %s, size = %d, count = %d",
+                                event.getType(), event.getSize(), event.getCount()));
+                    });
+        } catch (Exception e) {
+            ioLogger.error("Failed to gather information on recording", e);
+            return;
+        } finally {
+            if (tmp != null) {
+                try {
+                    Files.deleteIfExists(tmp);
+                } catch (IOException ignored) {
+                }
+            }
         }
-      }
     }
-  }
 
-  private static final int BUFFER_SIZE = 8192;
+    private static final int BUFFER_SIZE = 8192;
 
-  private static void redirect(InputStream in, OutputStream out) throws IOException {
-    byte[] buffer = new byte[BUFFER_SIZE];
-    int read;
-    while ((read = in.read(buffer, 0, BUFFER_SIZE)) >= 0) {
-      out.write(buffer, 0, read);
+    private static void redirect(InputStream in, OutputStream out) throws IOException {
+        byte[] buffer = new byte[BUFFER_SIZE];
+        int read;
+        while ((read = in.read(buffer, 0, BUFFER_SIZE)) >= 0) {
+            out.write(buffer, 0, read);
+        }
     }
-  }
 
-  private static class Event {
-    private final String type;
-    private final int count;
-    private final int size;
+    private static class Event {
+        private final String type;
+        private final int count;
+        private final int size;
 
-    Event(String type, int count, int size) {
-      this.type = type;
-      this.count = count;
-      this.size = size;
-    }
+        Event(String type, int count, int size) {
+            this.type = type;
+            this.count = count;
+            this.size = size;
+        }
 
-    public String getType() {
-      return type;
-    }
+        public String getType() {
+            return type;
+        }
 
-    public int getCount() {
-      return count;
-    }
+        public int getCount() {
+            return count;
+        }
 
-    public int getSize() {
-      return size;
+        public int getSize() {
+            return size;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ByteCountingInputStreamTest.java b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ByteCountingInputStreamTest.java
index a8bfc727112..52db5b63cc1 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ByteCountingInputStreamTest.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ByteCountingInputStreamTest.java
@@ -8,19 +8,19 @@
 
 public class ByteCountingInputStreamTest {
 
-  @Test
-  public void testDoesNotCountAfterEof() throws IOException {
-    byte[] data = {1, 2, 3};
+    @Test
+    public void testDoesNotCountAfterEof() throws IOException {
+        byte[] data = {1, 2, 3};
 
-    ByteCountingInputStream in = new ByteCountingInputStream(new ByteArrayInputStream(data));
-    for (byte datum : data) {
-      int b = in.read();
-      assertEquals(datum, b);
-    }
-    assertEquals(data.length, (int) in.getReadBytes());
+        ByteCountingInputStream in = new ByteCountingInputStream(new ByteArrayInputStream(data));
+        for (byte datum : data) {
+            int b = in.read();
+            assertEquals(datum, b);
+        }
+        assertEquals(data.length, (int) in.getReadBytes());
 
-    // read past EOF
-    assertEquals(-1, in.read());
-    assertEquals(data.length, (int) in.getReadBytes());
-  }
+        // read past EOF
+        assertEquals(-1, in.read());
+        assertEquals(data.length, (int) in.getReadBytes());
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/CompressingRequestBodyTest.java b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/CompressingRequestBodyTest.java
index 952a73a44af..e74bdb4e932 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/CompressingRequestBodyTest.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/CompressingRequestBodyTest.java
@@ -36,229 +36,203 @@
 import org.mockito.stubbing.Answer;
 
 class CompressingRequestBodyTest {
-  private static byte[] recordingData;
+    private static byte[] recordingData;
 
-  @BeforeAll
-  static void setupAll() throws Exception {
-    InputStream dataStream = testRecordingStream();
-    recordingData = new byte[dataStream.available()];
-    IOUtils.readFully(dataStream, recordingData);
-  }
-
-  @ParameterizedTest
-  @EnumSource(CompressionType.class)
-  void contentLength(CompressionType compressionType) throws Exception {
-    CompressingRequestBody instance =
-        new CompressingRequestBody(
-            compressionType, mock(CompressingRequestBody.InputStreamSupplier.class));
-    assertEquals(-1, instance.contentLength());
-  }
-
-  @ParameterizedTest
-  @EnumSource(CompressionType.class)
-  void contentType(CompressionType compressionType) {
-    CompressingRequestBody instance =
-        new CompressingRequestBody(
-            compressionType, mock(CompressingRequestBody.InputStreamSupplier.class));
-    assertEquals(CompressingRequestBody.OCTET_STREAM, instance.contentType());
-  }
-
-  @Test
-  void writeToRetryRecoverable() throws Exception {
-    int expectedRetries = 1;
-
-    assertWriteToRecoverable(faultySupplier(expectedRetries), expectedRetries);
-  }
+    @BeforeAll
+    static void setupAll() throws Exception {
+        InputStream dataStream = testRecordingStream();
+        recordingData = new byte[dataStream.available()];
+        IOUtils.readFully(dataStream, recordingData);
+    }
 
-  @Test
-  void writeToRetryIrrecoverable() throws Exception {
-    int expectedRetries = 1;
+    @ParameterizedTest
+    @EnumSource(CompressionType.class)
+    void contentLength(CompressionType compressionType) throws Exception {
+        CompressingRequestBody instance =
+                new CompressingRequestBody(compressionType, mock(CompressingRequestBody.InputStreamSupplier.class));
+        assertEquals(-1, instance.contentLength());
+    }
 
-    assertWriteToRetryIrrecoverable(faultySupplier(expectedRetries + 1), expectedRetries);
-    assertWriteToRetryIrrecoverable(
-        faultyStreamSupplier(expectedRetries), 0); // faulty stream is not retried
-  }
+    @ParameterizedTest
+    @EnumSource(CompressionType.class)
+    void contentType(CompressionType compressionType) {
+        CompressingRequestBody instance =
+                new CompressingRequestBody(compressionType, mock(CompressingRequestBody.InputStreamSupplier.class));
+        assertEquals(CompressingRequestBody.OCTET_STREAM, instance.contentType());
+    }
 
-  private void assertWriteToRecoverable(
-      CompressingRequestBody.InputStreamSupplier faultySupplier, int expectedRetries)
-      throws Exception {
-    CompressingRequestBody instance =
-        new CompressingRequestBody(CompressionType.OFF, faultySupplier, r -> r <= expectedRetries);
-    byte[] compressed = instanceWriteAsBytes(instance);
-    assertArrayEquals(recordingData, compressed);
+    @Test
+    void writeToRetryRecoverable() throws Exception {
+        int expectedRetries = 1;
 
-    verify(faultySupplier, VerificationModeFactory.times(expectedRetries + 1)).get();
-    assertEquals(recordingData.length, instance.getReadBytes());
-    assertEquals(recordingData.length, instance.getWrittenBytes());
-  }
+        assertWriteToRecoverable(faultySupplier(expectedRetries), expectedRetries);
+    }
 
-  private void assertWriteToRetryIrrecoverable(
-      CompressingRequestBody.InputStreamSupplier faultySupplier, int expectedRetries)
-      throws Exception {
-    CompressingRequestBody instance =
-        new CompressingRequestBody(CompressionType.OFF, faultySupplier, r -> r <= expectedRetries);
-    assertThrows(IOException.class, () -> instanceWriteAsBytes(instance));
+    @Test
+    void writeToRetryIrrecoverable() throws Exception {
+        int expectedRetries = 1;
 
-    verify(faultySupplier, VerificationModeFactory.times(expectedRetries + 1)).get();
-    assertEquals(0, instance.getReadBytes());
-    assertEquals(0, instance.getWrittenBytes());
-  }
+        assertWriteToRetryIrrecoverable(faultySupplier(expectedRetries + 1), expectedRetries);
+        assertWriteToRetryIrrecoverable(faultyStreamSupplier(expectedRetries), 0); // faulty stream is not retried
+    }
 
-  private CompressingRequestBody.InputStreamSupplier faultySupplier(int failingAttempts)
-      throws Exception {
-    CompressingRequestBody.InputStreamSupplier supplier =
-        mock(CompressingRequestBody.InputStreamSupplier.class);
-    AtomicInteger invocationCounter = new AtomicInteger(failingAttempts);
-    when(supplier.get())
-        .then(
-            (Answer<InputStream>)
-                invocation -> {
-                  if (invocationCounter.getAndDecrement() > 0) {
-                    throw new IllegalStateException();
-                  }
-                  return testRecordingStream();
-                });
-    return supplier;
-  }
+    private void assertWriteToRecoverable(
+            CompressingRequestBody.InputStreamSupplier faultySupplier, int expectedRetries) throws Exception {
+        CompressingRequestBody instance =
+                new CompressingRequestBody(CompressionType.OFF, faultySupplier, r -> r <= expectedRetries);
+        byte[] compressed = instanceWriteAsBytes(instance);
+        assertArrayEquals(recordingData, compressed);
+
+        verify(faultySupplier, VerificationModeFactory.times(expectedRetries + 1))
+                .get();
+        assertEquals(recordingData.length, instance.getReadBytes());
+        assertEquals(recordingData.length, instance.getWrittenBytes());
+    }
 
-  private CompressingRequestBody.InputStreamSupplier faultyStreamSupplier(int failingAttempts)
-      throws Exception {
-    CompressingRequestBody.InputStreamSupplier supplier =
-        mock(CompressingRequestBody.InputStreamSupplier.class);
-    AtomicInteger invocationCounter = new AtomicInteger(failingAttempts);
+    private void assertWriteToRetryIrrecoverable(
+            CompressingRequestBody.InputStreamSupplier faultySupplier, int expectedRetries) throws Exception {
+        CompressingRequestBody instance =
+                new CompressingRequestBody(CompressionType.OFF, faultySupplier, r -> r <= expectedRetries);
+        assertThrows(IOException.class, () -> instanceWriteAsBytes(instance));
 
-    when(supplier.get())
-        .then(
-            (Answer<InputStream>)
-                invocation ->
-                    new BufferedInputStream(testRecordingStream()) {
-                      int byteCounter = 300; // read first 300 bytes without error
+        verify(faultySupplier, VerificationModeFactory.times(expectedRetries + 1))
+                .get();
+        assertEquals(0, instance.getReadBytes());
+        assertEquals(0, instance.getWrittenBytes());
+    }
 
-                      @Override
-                      public synchronized int read() throws IOException {
-                        if (--byteCounter <= 0 && invocationCounter.getAndDecrement() > 0) {
-                          throw new IllegalStateException();
-                        }
-                        return super.read();
-                      }
+    private CompressingRequestBody.InputStreamSupplier faultySupplier(int failingAttempts) throws Exception {
+        CompressingRequestBody.InputStreamSupplier supplier = mock(CompressingRequestBody.InputStreamSupplier.class);
+        AtomicInteger invocationCounter = new AtomicInteger(failingAttempts);
+        when(supplier.get()).then((Answer<InputStream>) invocation -> {
+            if (invocationCounter.getAndDecrement() > 0) {
+                throw new IllegalStateException();
+            }
+            return testRecordingStream();
+        });
+        return supplier;
+    }
 
-                      @Override
-                      public synchronized int read(byte[] b, int off, int len) throws IOException {
-                        byteCounter -= len;
-                        if (byteCounter <= 0 && invocationCounter.getAndDecrement() > 0) {
-                          throw new IllegalStateException();
-                        }
-                        return super.read(b, off, len);
-                      }
-                    });
-    return supplier;
-  }
+    private CompressingRequestBody.InputStreamSupplier faultyStreamSupplier(int failingAttempts) throws Exception {
+        CompressingRequestBody.InputStreamSupplier supplier = mock(CompressingRequestBody.InputStreamSupplier.class);
+        AtomicInteger invocationCounter = new AtomicInteger(failingAttempts);
 
-  @ParameterizedTest
-  @EnumSource(CompressionType.class)
-  void writeTo(CompressionType compressionType) throws IOException {
-    CompressingRequestBody instance =
-        new CompressingRequestBody(
-            compressionType, CompressingRequestBodyTest::testRecordingStream);
+        when(supplier.get()).then((Answer<InputStream>) invocation -> new BufferedInputStream(testRecordingStream()) {
+            int byteCounter = 300; // read first 300 bytes without error
 
-    byte[] compressed = instanceWriteAsBytes(instance);
-    BufferedInputStream compressedStream =
-        new BufferedInputStream(new ByteArrayInputStream(compressed));
+            @Override
+            public synchronized int read() throws IOException {
+                if (--byteCounter <= 0 && invocationCounter.getAndDecrement() > 0) {
+                    throw new IllegalStateException();
+                }
+                return super.read();
+            }
+
+            @Override
+            public synchronized int read(byte[] b, int off, int len) throws IOException {
+                byteCounter -= len;
+                if (byteCounter <= 0 && invocationCounter.getAndDecrement() > 0) {
+                    throw new IllegalStateException();
+                }
+                return super.read(b, off, len);
+            }
+        });
+        return supplier;
+    }
 
-    switch (compressionType) {
-      case OFF:
-        {
-          assertFalse(CompressingRequestBody.isCompressed(compressedStream));
-          assertArrayEquals(recordingData, compressed);
-          assertEquals(recordingData.length, instance.getReadBytes());
-          assertEquals(recordingData.length, instance.getWrittenBytes());
-          break;
-        }
-      case LZ4:
-        {
-          assertTrue(CompressingRequestBody.isLz4(compressedStream));
-          byte[] uncompressed = IOUtils.toByteArray(new LZ4FrameInputStream(compressedStream));
-          assertArrayEquals(recordingData, uncompressed);
-          assertEquals(recordingData.length, instance.getReadBytes());
-          assertEquals(compressed.length, instance.getWrittenBytes());
-          break;
-        }
-      case GZIP:
-        {
-          assertTrue(CompressingRequestBody.isGzip(compressedStream));
-          byte[] uncompressed = IOUtils.toByteArray(new GZIPInputStream(compressedStream));
-          assertArrayEquals(recordingData, uncompressed);
-          assertEquals(recordingData.length, instance.getReadBytes());
-          assertEquals(compressed.length, instance.getWrittenBytes());
-          break;
-        }
-      case ON:
-      case ZSTD:
-        {
-          assertTrue(CompressingRequestBody.isZstd(compressedStream));
-          byte[] uncompressed = IOUtils.toByteArray(new ZstdInputStream(compressedStream));
-          assertArrayEquals(recordingData, uncompressed);
-          assertEquals(recordingData.length, instance.getReadBytes());
-          assertEquals(compressed.length, instance.getWrittenBytes());
-          break;
+    @ParameterizedTest
+    @EnumSource(CompressionType.class)
+    void writeTo(CompressionType compressionType) throws IOException {
+        CompressingRequestBody instance =
+                new CompressingRequestBody(compressionType, CompressingRequestBodyTest::testRecordingStream);
+
+        byte[] compressed = instanceWriteAsBytes(instance);
+        BufferedInputStream compressedStream = new BufferedInputStream(new ByteArrayInputStream(compressed));
+
+        switch (compressionType) {
+            case OFF: {
+                assertFalse(CompressingRequestBody.isCompressed(compressedStream));
+                assertArrayEquals(recordingData, compressed);
+                assertEquals(recordingData.length, instance.getReadBytes());
+                assertEquals(recordingData.length, instance.getWrittenBytes());
+                break;
+            }
+            case LZ4: {
+                assertTrue(CompressingRequestBody.isLz4(compressedStream));
+                byte[] uncompressed = IOUtils.toByteArray(new LZ4FrameInputStream(compressedStream));
+                assertArrayEquals(recordingData, uncompressed);
+                assertEquals(recordingData.length, instance.getReadBytes());
+                assertEquals(compressed.length, instance.getWrittenBytes());
+                break;
+            }
+            case GZIP: {
+                assertTrue(CompressingRequestBody.isGzip(compressedStream));
+                byte[] uncompressed = IOUtils.toByteArray(new GZIPInputStream(compressedStream));
+                assertArrayEquals(recordingData, uncompressed);
+                assertEquals(recordingData.length, instance.getReadBytes());
+                assertEquals(compressed.length, instance.getWrittenBytes());
+                break;
+            }
+            case ON:
+            case ZSTD: {
+                assertTrue(CompressingRequestBody.isZstd(compressedStream));
+                byte[] uncompressed = IOUtils.toByteArray(new ZstdInputStream(compressedStream));
+                assertArrayEquals(recordingData, uncompressed);
+                assertEquals(recordingData.length, instance.getReadBytes());
+                assertEquals(compressed.length, instance.getWrittenBytes());
+                break;
+            }
         }
     }
-  }
-
-  @ParameterizedTest
-  @EnumSource(CompressionType.class)
-  void writeToRecompression(CompressionType targetType) throws IOException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    OutputStream compressedStream = null;
-    for (CompressionType type : EnumSet.allOf(CompressionType.class)) {
-      if (type == CompressionType.OFF) {
-        continue;
-      }
-      switch (type) {
-        case LZ4:
-        case ON:
-          {
-            compressedStream = new LZ4FrameOutputStream(baos);
-            break;
-          }
-        case GZIP:
-          {
-            compressedStream = new GZIPOutputStream(baos);
-            break;
-          }
-        case ZSTD:
-          {
-            compressedStream = new ZstdOutputStream(baos);
-            break;
-          }
-      }
-      assertNotNull(compressedStream);
 
-      IOUtils.copy(new ByteArrayInputStream(recordingData), compressedStream);
-      compressedStream.close();
-
-      byte[] compressedInput = baos.toByteArray();
-
-      CompressingRequestBody instance =
-          new CompressingRequestBody(
-              targetType,
-              () -> new RecordingInputStream(new ByteArrayInputStream(compressedInput)));
-      byte[] compressedOutput = instanceWriteAsBytes(instance);
-
-      assertArrayEquals(compressedInput, compressedOutput);
+    @ParameterizedTest
+    @EnumSource(CompressionType.class)
+    void writeToRecompression(CompressionType targetType) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        OutputStream compressedStream = null;
+        for (CompressionType type : EnumSet.allOf(CompressionType.class)) {
+            if (type == CompressionType.OFF) {
+                continue;
+            }
+            switch (type) {
+                case LZ4:
+                case ON: {
+                    compressedStream = new LZ4FrameOutputStream(baos);
+                    break;
+                }
+                case GZIP: {
+                    compressedStream = new GZIPOutputStream(baos);
+                    break;
+                }
+                case ZSTD: {
+                    compressedStream = new ZstdOutputStream(baos);
+                    break;
+                }
+            }
+            assertNotNull(compressedStream);
+
+            IOUtils.copy(new ByteArrayInputStream(recordingData), compressedStream);
+            compressedStream.close();
+
+            byte[] compressedInput = baos.toByteArray();
+
+            CompressingRequestBody instance = new CompressingRequestBody(
+                    targetType, () -> new RecordingInputStream(new ByteArrayInputStream(compressedInput)));
+            byte[] compressedOutput = instanceWriteAsBytes(instance);
+
+            assertArrayEquals(compressedInput, compressedOutput);
+        }
     }
-  }
 
-  private static byte[] instanceWriteAsBytes(CompressingRequestBody instance) throws IOException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    try (BufferedSink sink = Okio.buffer(Okio.sink(baos))) {
-      instance.writeTo(sink);
+    private static byte[] instanceWriteAsBytes(CompressingRequestBody instance) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (BufferedSink sink = Okio.buffer(Okio.sink(baos))) {
+            instance.writeTo(sink);
+        }
+        return baos.toByteArray();
     }
-    return baos.toByteArray();
-  }
 
-  private static RecordingInputStream testRecordingStream() {
-    return new RecordingInputStream(
-        CompressingRequestBodyTest.class.getResourceAsStream("/test-recording.jfr"));
-  }
+    private static RecordingInputStream testRecordingStream() {
+        return new RecordingInputStream(CompressingRequestBodyTest.class.getResourceAsStream("/test-recording.jfr"));
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/CompressionTypeTest.java b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/CompressionTypeTest.java
index 4b58450045f..b935c4ed863 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/CompressionTypeTest.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/CompressionTypeTest.java
@@ -10,44 +10,43 @@
 
 class CompressionTypeTest {
 
-  @Test
-  void testEmpty() {
-    assertEquals(CompressionType.ON, CompressionType.of(""));
-  }
-
-  @Test
-  void testNull() {
-    assertEquals(CompressionType.ON, CompressionType.of(null));
-  }
-
-  @ParameterizedTest
-  @EnumSource(CompressionType.class)
-  void testOn(final CompressionType type) {
-    for (final String checkType : permutateCase(type.name())) {
-      assertEquals(type, CompressionType.of(checkType));
+    @Test
+    void testEmpty() {
+        assertEquals(CompressionType.ON, CompressionType.of(""));
     }
-  }
-
-  private static List<String> permutateCase(String input) {
-    final List<String> output = new ArrayList<>();
-    input = input.toLowerCase();
-    // fast track for all-upper and all-lower
-    output.add(input);
-    output.add(input.toUpperCase());
-
-    // use bit operations to generate permutations
-    long mask = 0L;
-    for (int i = 0; i < input.length(); i++) {
-      final StringBuilder sb = new StringBuilder(input.length());
-      mask += 1;
-      long check = mask;
-      for (int j = 0; j < input.length(); j++) {
-        sb.append(
-            ((check & 0x1) == 0x1) ? Character.toUpperCase(input.charAt(j)) : input.charAt(j));
-        check = check >> 1;
-      }
-      output.add(sb.toString());
+
+    @Test
+    void testNull() {
+        assertEquals(CompressionType.ON, CompressionType.of(null));
+    }
+
+    @ParameterizedTest
+    @EnumSource(CompressionType.class)
+    void testOn(final CompressionType type) {
+        for (final String checkType : permutateCase(type.name())) {
+            assertEquals(type, CompressionType.of(checkType));
+        }
+    }
+
+    private static List<String> permutateCase(String input) {
+        final List<String> output = new ArrayList<>();
+        input = input.toLowerCase();
+        // fast track for all-upper and all-lower
+        output.add(input);
+        output.add(input.toUpperCase());
+
+        // use bit operations to generate permutations
+        long mask = 0L;
+        for (int i = 0; i < input.length(); i++) {
+            final StringBuilder sb = new StringBuilder(input.length());
+            mask += 1;
+            long check = mask;
+            for (int j = 0; j < input.length(); j++) {
+                sb.append(((check & 0x1) == 0x1) ? Character.toUpperCase(input.charAt(j)) : input.charAt(j));
+                check = check >> 1;
+            }
+            output.add(sb.toString());
+        }
+        return output;
     }
-    return output;
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java
index f29d3186e9b..036907aa839 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java
@@ -101,819 +101,786 @@
 @ExtendWith(MockitoExtension.class)
 public class ProfileUploaderTest {
 
-  private static final String API_KEY_VALUE = "testkey";
-  private static final String URL_PATH = "/lalala";
-  private static final String RECORDING_RESOURCE = "/test-recording.jfr";
-  private static final String RECORDING_NAME_PREFIX = "test-recording-";
-  private static final RecordingType RECORDING_TYPE = RecordingType.CONTINUOUS;
-
-  private static final Map<String, String> TAGS;
-
-  private static final String FUNCTION_NAME = "my_function";
-
-  static {
-    // Not using Guava's ImmutableMap because we want to test null value
-    final Map<String, String> tags = new HashMap<>();
-    tags.put("foo", "bar");
-    tags.put("baz", "123");
-    tags.put("null", null);
-    tags.put("empty", "");
-    tags.put("quoted", "\"quoted\"");
-    TAGS = tags;
-  }
-
-  // We sort tags to have expected parameters to have expected result
-  private static final Map<String, String> EXPECTED_TAGS =
-      new ImmutableMap.Builder<String, String>()
-          .put("baz", "123")
-          .put("foo", "bar")
-          .put(SERVELESS_TAG, FUNCTION_NAME)
-          .put("quoted", "quoted")
-          .put(DDTags.PID_TAG, PidHelper.getPid())
-          .put(VersionInfo.PROFILER_VERSION_TAG, VersionInfo.VERSION)
-          .put(VersionInfo.LIBRARY_VERSION_TAG, VersionInfo.VERSION)
-          .build();
-
-  private static final int SEQUENCE_NUMBER = 123;
-  private static final int PROFILE_START = 1000;
-  private static final int PROFILE_END = 1100;
-
-  // TODO: Add a test to verify overall request timeout rather than IO timeout
-  private final Duration REQUEST_TIMEOUT = Duration.ofSeconds(10);
-  private final Duration REQUEST_IO_OPERATION_TIMEOUT = Duration.ofSeconds(5);
-
-  // Termination timeout has to be longer than request timeout to make sure that all callbacks are
-  // called before the termination.
-  private final Duration TERMINATION_TIMEOUT = REQUEST_TIMEOUT.plus(Duration.ofSeconds(5));
-
-  private final Duration FOREVER_REQUEST_TIMEOUT = Duration.ofSeconds(1000);
-
-  @Mock private Config config;
-  @Mock private ConfigProvider configProvider;
-  @Mock private IOLogger ioLogger;
-
-  private final MockWebServer server = new MockWebServer();
-  private HttpUrl url;
-
-  private ProfileUploader uploader;
-
-  @SuppressWarnings("unused")
-  private static final ControllableEnvironmentVariables ENV =
-      ControllableEnvironmentVariables.setup("AWS_LAMBDA_FUNCTION_NAME", FUNCTION_NAME);
-
-  @BeforeEach
-  public void setup() throws IOException {
-    server.start();
-    url = server.url(URL_PATH);
-
-    when(config.getFinalProfilingUrl()).thenReturn(server.url(URL_PATH).toString());
-    when(config.isProfilingAgentless()).thenReturn(false);
-    when(config.getMergedProfilingTags()).thenReturn(TAGS);
-    when(config.getProfilingUploadTimeout()).thenReturn((int) REQUEST_TIMEOUT.getSeconds());
-    when(config.isProfilingUploadSummaryOn413Enabled()).thenReturn(true);
-
-    uploader =
-        new ProfileUploader(
-            config, configProvider, ioLogger, (int) TERMINATION_TIMEOUT.getSeconds());
-  }
-
-  @AfterEach
-  public void tearDown() {
-    uploader.shutdown();
-    try {
-      server.shutdown();
-    } catch (final IOException e) {
-      // Looks like this happens for some unclear reason, but should not affect tests
-    }
-  }
-
-  @ParameterizedTest
-  @EnumSource(ProfilingSnapshot.Kind.class)
-  public void testHappyPath(ProfilingSnapshot.Kind kind) throws Exception {
-    // Given
-    when(config.getProfilingUploadTimeout()).thenReturn(500000);
-
-    // When
-    uploader = new ProfileUploader(config, configProvider);
-    server.enqueue(new MockResponse().setResponseCode(200));
-    uploadAndWait(RECORDING_TYPE, mockRecordingData(true, kind));
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-
-    // Then
-    assertEquals(url, recordedRequest.getRequestUrl());
-
-    final List<FileItem> multiPartItems =
-        FileUpload.parse(
-            recordedRequest.getBody().readByteArray(), recordedRequest.getHeader("Content-Type"));
-
-    final FileItem rawEvent = multiPartItems.get(0);
-    assertEquals(ProfileUploader.V4_EVENT_NAME, rawEvent.getFieldName());
-    assertEquals(ProfileUploader.V4_EVENT_FILENAME, rawEvent.getName());
-    assertEquals("application/json", rawEvent.getContentType());
-
-    final FileItem rawJfr = multiPartItems.get(1);
-    assertEquals(ProfileUploader.V4_ATTACHMENT_NAME, rawJfr.getFieldName());
-    assertEquals(ProfileUploader.V4_ATTACHMENT_FILENAME, rawJfr.getName());
-    assertEquals("application/octet-stream", rawJfr.getContentType());
-
-    final byte[] expectedBytes = ByteStreams.toByteArray(recordingStream(true));
-    assertArrayEquals(expectedBytes, rawJfr.get());
-
-    // Event checks
-    final ObjectMapper mapper = new ObjectMapper();
-    final JsonNode event = mapper.readTree(rawEvent.getString());
-
-    assertEquals(ProfileUploader.V4_ATTACHMENT_FILENAME, event.get("attachments").get(0).asText());
-    assertEquals(ProfileUploader.V4_FAMILY, event.get("family").asText());
-    assertEquals(ProfileUploader.V4_VERSION, event.get("version").asText());
-    assertEquals(
-        Instant.ofEpochSecond(PROFILE_START).toString(),
-        event.get(V4_PROFILE_START_PARAM).asText());
-    assertEquals(
-        Instant.ofEpochSecond(PROFILE_END).toString(), event.get(V4_PROFILE_END_PARAM).asText());
-    Map<String, String> expectedTags = new TreeMap<>(EXPECTED_TAGS);
-    expectedTags.put("snapshot", kind.name().toLowerCase());
-    assertEquals(
-        expectedTags,
-        ProfilingTestUtils.parseTags(
-            Arrays.asList(event.get("tags_profiler").asText().split(","))));
-  }
-
-  @ParameterizedTest
-  @EnumSource(ProfilingSnapshot.Kind.class)
-  public void testHappyPathSync(ProfilingSnapshot.Kind kind) throws Exception {
-    // Given
-    when(config.getProfilingUploadTimeout()).thenReturn(500000);
-
-    // When
-    uploader = new ProfileUploader(config, configProvider);
-    server.enqueue(new MockResponse().setResponseCode(200));
-    // upload synchronously
-    uploader.upload(RECORDING_TYPE, mockRecordingData(true, kind), true);
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-
-    // Then
-    assertEquals(url, recordedRequest.getRequestUrl());
-
-    final List<FileItem> multiPartItems =
-        FileUpload.parse(
-            recordedRequest.getBody().readByteArray(), recordedRequest.getHeader("Content-Type"));
-
-    final FileItem rawEvent = multiPartItems.get(0);
-    assertEquals(ProfileUploader.V4_EVENT_NAME, rawEvent.getFieldName());
-    assertEquals(ProfileUploader.V4_EVENT_FILENAME, rawEvent.getName());
-    assertEquals("application/json", rawEvent.getContentType());
-
-    final FileItem rawJfr = multiPartItems.get(1);
-    assertEquals(ProfileUploader.V4_ATTACHMENT_NAME, rawJfr.getFieldName());
-    assertEquals(ProfileUploader.V4_ATTACHMENT_FILENAME, rawJfr.getName());
-    assertEquals("application/octet-stream", rawJfr.getContentType());
-
-    final byte[] expectedBytes = ByteStreams.toByteArray(recordingStream(true));
-    assertArrayEquals(expectedBytes, rawJfr.get());
-
-    // Event checks
-    final ObjectMapper mapper = new ObjectMapper();
-    final JsonNode event = mapper.readTree(rawEvent.getString());
-
-    assertEquals(ProfileUploader.V4_ATTACHMENT_FILENAME, event.get("attachments").get(0).asText());
-    assertEquals(ProfileUploader.V4_FAMILY, event.get("family").asText());
-    assertEquals(ProfileUploader.V4_VERSION, event.get("version").asText());
-    assertEquals(
-        Instant.ofEpochSecond(PROFILE_START).toString(),
-        event.get(V4_PROFILE_START_PARAM).asText());
-    assertEquals(
-        Instant.ofEpochSecond(PROFILE_END).toString(), event.get(V4_PROFILE_END_PARAM).asText());
-    Map<String, String> expectedTags = new TreeMap<>(EXPECTED_TAGS);
-    expectedTags.put("snapshot", kind.name().toLowerCase());
-    assertEquals(
-        expectedTags,
-        ProfilingTestUtils.parseTags(
-            Arrays.asList(event.get("tags_profiler").asText().split(","))));
-  }
-
-  @Test
-  public void testZippedInput() throws Exception {
-    when(config.getApiKey()).thenReturn(null);
-    when(config.getProfilingUploadCompression()).thenReturn("on");
-    when(config.getProfilingUploadTimeout()).thenReturn(500000);
-    uploader = new ProfileUploader(config, configProvider);
-
-    server.enqueue(new MockResponse().setResponseCode(200));
-
-    uploadAndWait(RECORDING_TYPE, mockRecordingData(true));
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    assertEquals(url, recordedRequest.getRequestUrl());
-
-    assertNull(recordedRequest.getHeader("DD-API-KEY"));
-
-    final List<FileItem> multiPartItems =
-        FileUpload.parse(
-            recordedRequest.getBody().readByteArray(), recordedRequest.getHeader("Content-Type"));
-
-    final FileItem rawEvent = multiPartItems.get(0);
-    assertEquals(ProfileUploader.V4_EVENT_NAME, rawEvent.getFieldName());
-    assertEquals(ProfileUploader.V4_EVENT_FILENAME, rawEvent.getName());
-    assertEquals("application/json", rawEvent.getContentType());
-
-    final FileItem rawJfr = multiPartItems.get(1);
-    assertEquals(ProfileUploader.V4_ATTACHMENT_NAME, rawJfr.getFieldName());
-    assertEquals(ProfileUploader.V4_ATTACHMENT_FILENAME, rawJfr.getName());
-    assertEquals("application/octet-stream", rawJfr.getContentType());
-
-    // data which are originally zipped will not be recompressed
-    final byte[] expectedBytes = ByteStreams.toByteArray(recordingStream(true));
-    assertArrayEquals(expectedBytes, rawJfr.get());
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"on", "lz4", "gzip", "zstd", "off", "invalid"})
-  public void testCompression(final String compression) throws Exception {
-    when(config.getApiKey()).thenReturn(null);
-    when(config.getProfilingUploadCompression()).thenReturn(compression);
-    when(config.getProfilingUploadTimeout()).thenReturn(500000);
-    uploader = new ProfileUploader(config, configProvider);
-
-    server.enqueue(new MockResponse().setResponseCode(200));
-
-    uploadAndWait(RECORDING_TYPE, mockRecordingData());
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    assertEquals(url, recordedRequest.getRequestUrl());
-
-    assertNull(recordedRequest.getHeader("DD-API-KEY"));
-
-    final List<FileItem> multiPartItems =
-        FileUpload.parse(
-            recordedRequest.getBody().readByteArray(), recordedRequest.getHeader("Content-Type"));
-
-    final FileItem rawEvent = multiPartItems.get(0);
-    assertEquals(ProfileUploader.V4_EVENT_NAME, rawEvent.getFieldName());
-    assertEquals(ProfileUploader.V4_EVENT_FILENAME, rawEvent.getName());
-    assertEquals("application/json", rawEvent.getContentType());
-
-    final FileItem rawJfr = multiPartItems.get(1);
-    assertEquals(ProfileUploader.V4_ATTACHMENT_NAME, rawJfr.getFieldName());
-    assertEquals(ProfileUploader.V4_ATTACHMENT_FILENAME, rawJfr.getName());
-    assertEquals("application/octet-stream", rawJfr.getContentType());
-
-    final byte[] expectedBytes = ByteStreams.toByteArray(recordingStream(false));
-
-    byte[] uploadedBytes = rawJfr.get();
-    if (compression.equals("gzip")) {
-      uploadedBytes = unGzip(uploadedBytes);
-    } else if (compression.equals("zstd")
-        || compression.equals("on")
-        || compression.equals("invalid")) {
-      uploadedBytes = unZstd(uploadedBytes);
-    } else if (compression.equals("lz4")) {
-      uploadedBytes = unLz4(uploadedBytes);
-    }
-    assertArrayEquals(expectedBytes, uploadedBytes);
-  }
-
-  @Test
-  public void testRequestWithContainerId() throws Exception {
-    uploader =
-        new ProfileUploader(
-            config, configProvider, ioLogger, (int) TERMINATION_TIMEOUT.getSeconds());
-
-    server.enqueue(new MockResponse().setResponseCode(200));
-    uploadAndWait(RECORDING_TYPE, mockRecordingData());
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    assertNotNull(recordedRequest);
-  }
-
-  @Test
-  public void testAgentRequestWithApiKey() throws Exception {
-    when(config.getApiKey()).thenReturn(API_KEY_VALUE);
-
-    uploader = new ProfileUploader(config, configProvider);
-    server.enqueue(new MockResponse().setResponseCode(200));
-    uploadAndWait(RECORDING_TYPE, mockRecordingData());
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    assertNotNull(recordedRequest);
-    assertNull(recordedRequest.getHeader("DD-API-KEY"));
-  }
-
-  @Test
-  public void testAgentlessRequest() throws Exception {
-    when(config.getApiKey()).thenReturn(API_KEY_VALUE);
-    when(config.isProfilingAgentless()).thenReturn(true);
-
-    uploader = new ProfileUploader(config, configProvider);
-    server.enqueue(new MockResponse().setResponseCode(200));
-    uploadAndWait(RECORDING_TYPE, mockRecordingData());
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    assertNotNull(recordedRequest);
-    assertEquals(API_KEY_VALUE, recordedRequest.getHeader("DD-API-KEY"));
-  }
-
-  @Test
-  public void test404() throws Exception {
-    // test added to get the coverage checks to pass since we log conditionally in this case
-    when(config.getApiKey()).thenReturn(null);
-
-    uploader = new ProfileUploader(config, configProvider);
-    server.enqueue(new MockResponse().setResponseCode(404));
-    uploadAndWait(RECORDING_TYPE, mockRecordingData());
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    assertNotNull(recordedRequest);
-    assertNull(recordedRequest.getHeader("DD-API-KEY"));
-    // it would be nice if the test asserted the log line was written out, but it's not essential
-  }
-
-  @Test
-  public void test404Agentless() throws Exception {
-    // test added to get the coverage checks to pass since we log conditionally in this case
-    when(config.getApiKey()).thenReturn(API_KEY_VALUE);
-    when(config.isProfilingAgentless()).thenReturn(true);
-
-    uploader = new ProfileUploader(config, configProvider);
-    server.enqueue(new MockResponse().setResponseCode(404));
-    uploadAndWait(RECORDING_TYPE, mockRecordingData());
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    assertNotNull(recordedRequest);
-    assertEquals(API_KEY_VALUE, recordedRequest.getHeader("DD-API-KEY"));
-  }
-
-  @Test
-  public void testRequestWithProxy() throws Exception {
-    final String backendHost = "intake.profiling.datadoghq.com:1234";
-    final String backendUrl = "http://intake.profiling.datadoghq.com:1234" + URL_PATH;
-    when(config.getFinalProfilingUrl())
-        .thenReturn("http://intake.profiling.datadoghq.com:1234" + URL_PATH);
-    when(config.getProfilingProxyHost()).thenReturn(server.url("").host());
-    when(config.getProfilingProxyPort()).thenReturn(server.url("").port());
-    when(config.getProfilingProxyUsername()).thenReturn("username");
-    when(config.getProfilingProxyPassword()).thenReturn("password");
-
-    uploader = new ProfileUploader(config, configProvider);
-
-    server.enqueue(new MockResponse().setResponseCode(407).addHeader("Proxy-Authenticate: Basic"));
-    server.enqueue(new MockResponse().setResponseCode(200));
-
-    uploadAndWait(RECORDING_TYPE, mockRecordingData());
-
-    final RecordedRequest recordedFirstRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    assertEquals(server.url(""), recordedFirstRequest.getRequestUrl());
-    assertNull(recordedFirstRequest.getHeader("Proxy-Authorization"));
-    assertEquals(backendHost, recordedFirstRequest.getHeader("Host"));
-    assertEquals(
-        String.format("POST %s HTTP/1.1", backendUrl), recordedFirstRequest.getRequestLine());
-
-    final RecordedRequest recordedSecondRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    assertEquals(server.url(""), recordedSecondRequest.getRequestUrl());
-    assertEquals(
-        Credentials.basic("username", "password"),
-        recordedSecondRequest.getHeader("Proxy-Authorization"));
-    assertEquals(backendHost, recordedSecondRequest.getHeader("Host"));
-    assertEquals(
-        String.format("POST %s HTTP/1.1", backendUrl), recordedSecondRequest.getRequestLine());
-  }
-
-  @Test
-  public void testRequestWithProxyDefaultPassword() throws Exception {
-    final String backendUrl = "http://intake.profiling.datadoghq.com:1234" + URL_PATH;
-    when(config.getFinalProfilingUrl())
-        .thenReturn("http://intake.profiling.datadoghq.com:1234" + URL_PATH);
-    when(config.getProfilingProxyHost()).thenReturn(server.url("").host());
-    when(config.getProfilingProxyPort()).thenReturn(server.url("").port());
-    when(config.getProfilingProxyUsername()).thenReturn("username");
-
-    uploader = new ProfileUploader(config, configProvider);
-
-    server.enqueue(new MockResponse().setResponseCode(407).addHeader("Proxy-Authenticate: Basic"));
-    server.enqueue(new MockResponse().setResponseCode(200));
-
-    uploadAndWait(RECORDING_TYPE, mockRecordingData());
-
-    final RecordedRequest recordedFirstRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    final RecordedRequest recordedSecondRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    assertEquals(
-        Credentials.basic("username", ""), recordedSecondRequest.getHeader("Proxy-Authorization"));
-  }
-
-  @Test
-  void testOkHttpClientForcesCleartextConnspecWhenNotUsingTLS() {
-    when(config.getFinalProfilingUrl()).thenReturn("http://example.com");
-
-    uploader = new ProfileUploader(config, configProvider);
-
-    final List<ConnectionSpec> connectionSpecs = uploader.getClient().connectionSpecs();
-    assertEquals(connectionSpecs.size(), 1);
-    assertTrue(connectionSpecs.contains(ConnectionSpec.CLEARTEXT));
-  }
-
-  @Test
-  void testOkHttpClientUsesDefaultConnspecsOverTLS() {
-    when(config.getFinalProfilingUrl()).thenReturn("https://example.com");
-
-    uploader = new ProfileUploader(config, configProvider);
-
-    final List<ConnectionSpec> connectionSpecs = uploader.getClient().connectionSpecs();
-    assertEquals(connectionSpecs.size(), 2);
-    assertTrue(connectionSpecs.contains(ConnectionSpec.MODERN_TLS));
-    assertTrue(connectionSpecs.contains(ConnectionSpec.CLEARTEXT));
-  }
-
-  @Test
-  public void testRecordingClosed() throws Exception {
-    server.enqueue(new MockResponse().setResponseCode(200));
-
-    final RecordingData recording = mockRecordingData();
-    uploadAndWait(RECORDING_TYPE, recording);
-
-    verify(recording).release();
-  }
-
-  @Test
-  public void test500Response() throws Exception {
-    server.enqueue(new MockResponse().setResponseCode(500));
-
-    final RecordingData recording = mockRecordingData();
-    uploadAndWait(RECORDING_TYPE, recording);
-
-    assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
-
-    verify(recording).release();
-  }
-
-  @Test
-  public void test413Response() throws Exception {
-    server.enqueue(new MockResponse().setResponseCode(413));
-
-    final RecordingData recording = mockRecordingData();
-    uploadAndWait(RECORDING_TYPE, recording);
-
-    assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
-
-    verify(recording).release();
-
-    // J9 has 'almost' implemented JFR, but not really
-    // we need to skip this part for J9
-    if (!JavaVirtualMachine.isJ9()
-        && Files.exists(Paths.get(System.getProperty("java.home"), "bin", "jfr"))) {
-      verify(ioLogger)
-          .error(
-              eq("Failed to upload profile, it's too big. Dumping information about the profile"));
-      verify(ioLogger, times(10)).error(matches("Event: .*, size = [0-9]+, count = [0-9]+"));
-    } else {
-      verify(ioLogger).error(eq("Failed to gather information on recording, can't find `jfr`"));
-    }
-  }
-
-  @Test
-  public void testConnectionRefused() throws Exception {
-    server.shutdown();
-
-    final RecordingData recording = mockRecordingData();
-    uploadAndWait(RECORDING_TYPE, recording);
-
-    verify(recording).release();
-
-    // Shutting down uploader ensures all callbacks are called on http client
-    uploader.shutdown();
-    verify(ioLogger).error(eq("Failed to upload profile to " + url), any(ConnectException.class));
-  }
-
-  @Test
-  public void testConnectionRefusedSync() throws Exception {
-    server.shutdown();
-
-    final RecordingData recording = mockRecordingData();
-    uploader.upload(RECORDING_TYPE, recording, true);
-
-    verify(recording).release();
-
-    // Shutting down uploader ensures all callbacks are called on http client
-    uploader.shutdown();
-    verify(ioLogger).error(eq("Failed to upload profile to " + url), any(ConnectException.class));
-  }
-
-  @Test
-  public void testNoReplyFromServer() throws Exception {
-    server.enqueue(new MockResponse().setSocketPolicy(SocketPolicy.NO_RESPONSE));
-    final RecordingData recording = mockRecordingData();
-    uploadAndWait(RECORDING_TYPE, recording);
-
-    // Wait longer than request timeout
-    assertNotNull(server.takeRequest(REQUEST_TIMEOUT.getSeconds() + 1, TimeUnit.SECONDS));
-
-    // Shutting down uploader ensures all callbacks are called on http client
-    uploader.shutdown();
-    verify(recording).release();
-    verify(ioLogger)
-        .error(
-            eq(
-                "Failed to upload profile, received empty reply from "
-                    + url
-                    + " after uploading profile"));
-  }
-
-  @Test
-  public void testNoReplyFromServerSync() throws Exception {
-    server.enqueue(new MockResponse().setSocketPolicy(SocketPolicy.NO_RESPONSE));
-    final RecordingData recording = mockRecordingData();
-    uploader.upload(RECORDING_TYPE, recording, true);
-
-    // Wait longer than request timeout
-    assertNotNull(server.takeRequest(REQUEST_TIMEOUT.getSeconds() + 1, TimeUnit.SECONDS));
-
-    // Shutting down uploader ensures all callbacks are called on http client
-    uploader.shutdown();
-    verify(recording).release();
-    verify(ioLogger)
-        .error(
-            eq(
-                "Failed to upload profile, received empty reply from "
-                    + url
-                    + " after uploading profile"));
-  }
-
-  @Test
-  public void testSyncDoesNotStayBlocked() throws Exception {
-    // We need to muck around with the 'uploadTimeout' field to actually force
-    // the uploader to take the 'safety-break' route. Otherwise, the request
-    // will always fail first on socket timeouts.
-    Field fld = ProfileUploader.class.getDeclaredField("uploadTimeout");
-    fld.setAccessible(true);
-    fld.set(uploader, Duration.ofSeconds(1)); // TODO: JEP 500 - avoid mutating final fields
-    // ---
-
-    server.enqueue(new MockResponse().setSocketPolicy(SocketPolicy.STALL_SOCKET_AT_START));
-    final RecordingData recording = mockRecordingData();
-    uploader.upload(RECORDING_TYPE, recording, true);
-
-    // Wait longer than termination timeout
-    assertNotNull(server.takeRequest(REQUEST_TIMEOUT.getSeconds() + 1, TimeUnit.SECONDS));
-
-    // Shutting down uploader ensures all callbacks are called on http client
-    uploader.shutdown();
-    verify(recording).release();
-    verify(ioLogger).error(eq("Failed to upload profile to " + url), (Exception) isNull());
-  }
-
-  @Test
-  public void testTimeout() throws Exception {
-    server.enqueue(
-        new MockResponse()
-            .setHeadersDelay(
-                REQUEST_IO_OPERATION_TIMEOUT.plus(Duration.ofSeconds(1)).toMillis(),
-                TimeUnit.MILLISECONDS));
-
-    final RecordingData recording = mockRecordingData();
-    uploadAndWait(RECORDING_TYPE, recording);
-
-    // Wait longer than request timeout
-    assertNotNull(
-        server.takeRequest(REQUEST_IO_OPERATION_TIMEOUT.getSeconds() + 2, TimeUnit.SECONDS));
-
-    // Shutting down uploader ensures all callbacks are called on http client
-    uploader.shutdown();
-    verify(recording).release();
-    // This seems to be a weird behaviour on okHttp side: it considers request to be a success even
-    // if it didn't get headers before the timeout
-    verify(ioLogger).success(eq("Upload done"));
-  }
-
-  @Test
-  public void testTimeoutSync() throws Exception {
-    server.enqueue(
-        new MockResponse()
-            .setHeadersDelay(
-                REQUEST_IO_OPERATION_TIMEOUT.plus(Duration.ofSeconds(1)).toMillis(),
-                TimeUnit.MILLISECONDS));
-
-    final RecordingData recording = mockRecordingData();
-    uploader.upload(RECORDING_TYPE, recording, true);
-
-    // Wait longer than request timeout
-    assertNotNull(
-        server.takeRequest(REQUEST_IO_OPERATION_TIMEOUT.getSeconds() + 10, TimeUnit.SECONDS));
-
-    // Shutting down uploader ensures all callbacks are called on http client
-    uploader.shutdown();
-    verify(recording).release();
-    // This seems to be a weird behaviour on okHttp side: it considers request to be a success even
-    // if it didn't get headers before the timeout
-    verify(ioLogger).success(eq("Upload done"));
-  }
-
-  @Test
-  public void testUnfinishedRecording() throws Exception {
-    final RecordingData recording = mockRecordingData();
-    when(recording.getStream()).thenThrow(new IllegalStateException("test exception"));
-    uploadAndWait(RECORDING_TYPE, recording);
-
-    verify(recording).release();
-    verify(recording, times(2)).getStream();
-  }
-
-  @Test
-  public void testEmptyRecording() throws Exception {
-    final RecordingData recording = mockRecordingData();
-    when(recording.getStream())
-        .then(
-            (Answer<RecordingInputStream>)
+    private static final String API_KEY_VALUE = "testkey";
+    private static final String URL_PATH = "/lalala";
+    private static final String RECORDING_RESOURCE = "/test-recording.jfr";
+    private static final String RECORDING_NAME_PREFIX = "test-recording-";
+    private static final RecordingType RECORDING_TYPE = RecordingType.CONTINUOUS;
+
+    private static final Map<String, String> TAGS;
+
+    private static final String FUNCTION_NAME = "my_function";
+
+    static {
+        // Not using Guava's ImmutableMap because we want to test null value
+        final Map<String, String> tags = new HashMap<>();
+        tags.put("foo", "bar");
+        tags.put("baz", "123");
+        tags.put("null", null);
+        tags.put("empty", "");
+        tags.put("quoted", "\"quoted\"");
+        TAGS = tags;
+    }
+
+    // We sort tags to have expected parameters to have expected result
+    private static final Map<String, String> EXPECTED_TAGS = new ImmutableMap.Builder<String, String>()
+            .put("baz", "123")
+            .put("foo", "bar")
+            .put(SERVELESS_TAG, FUNCTION_NAME)
+            .put("quoted", "quoted")
+            .put(DDTags.PID_TAG, PidHelper.getPid())
+            .put(VersionInfo.PROFILER_VERSION_TAG, VersionInfo.VERSION)
+            .put(VersionInfo.LIBRARY_VERSION_TAG, VersionInfo.VERSION)
+            .build();
+
+    private static final int SEQUENCE_NUMBER = 123;
+    private static final int PROFILE_START = 1000;
+    private static final int PROFILE_END = 1100;
+
+    // TODO: Add a test to verify overall request timeout rather than IO timeout
+    private final Duration REQUEST_TIMEOUT = Duration.ofSeconds(10);
+    private final Duration REQUEST_IO_OPERATION_TIMEOUT = Duration.ofSeconds(5);
+
+    // Termination timeout has to be longer than request timeout to make sure that all callbacks are
+    // called before the termination.
+    private final Duration TERMINATION_TIMEOUT = REQUEST_TIMEOUT.plus(Duration.ofSeconds(5));
+
+    private final Duration FOREVER_REQUEST_TIMEOUT = Duration.ofSeconds(1000);
+
+    @Mock
+    private Config config;
+
+    @Mock
+    private ConfigProvider configProvider;
+
+    @Mock
+    private IOLogger ioLogger;
+
+    private final MockWebServer server = new MockWebServer();
+    private HttpUrl url;
+
+    private ProfileUploader uploader;
+
+    @SuppressWarnings("unused")
+    private static final ControllableEnvironmentVariables ENV =
+            ControllableEnvironmentVariables.setup("AWS_LAMBDA_FUNCTION_NAME", FUNCTION_NAME);
+
+    @BeforeEach
+    public void setup() throws IOException {
+        server.start();
+        url = server.url(URL_PATH);
+
+        when(config.getFinalProfilingUrl()).thenReturn(server.url(URL_PATH).toString());
+        when(config.isProfilingAgentless()).thenReturn(false);
+        when(config.getMergedProfilingTags()).thenReturn(TAGS);
+        when(config.getProfilingUploadTimeout()).thenReturn((int) REQUEST_TIMEOUT.getSeconds());
+        when(config.isProfilingUploadSummaryOn413Enabled()).thenReturn(true);
+
+        uploader = new ProfileUploader(config, configProvider, ioLogger, (int) TERMINATION_TIMEOUT.getSeconds());
+    }
+
+    @AfterEach
+    public void tearDown() {
+        uploader.shutdown();
+        try {
+            server.shutdown();
+        } catch (final IOException e) {
+            // Looks like this happens for some unclear reason, but should not affect tests
+        }
+    }
+
+    @ParameterizedTest
+    @EnumSource(ProfilingSnapshot.Kind.class)
+    public void testHappyPath(ProfilingSnapshot.Kind kind) throws Exception {
+        // Given
+        when(config.getProfilingUploadTimeout()).thenReturn(500000);
+
+        // When
+        uploader = new ProfileUploader(config, configProvider);
+        server.enqueue(new MockResponse().setResponseCode(200));
+        uploadAndWait(RECORDING_TYPE, mockRecordingData(true, kind));
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+
+        // Then
+        assertEquals(url, recordedRequest.getRequestUrl());
+
+        final List<FileItem> multiPartItems =
+                FileUpload.parse(recordedRequest.getBody().readByteArray(), recordedRequest.getHeader("Content-Type"));
+
+        final FileItem rawEvent = multiPartItems.get(0);
+        assertEquals(ProfileUploader.V4_EVENT_NAME, rawEvent.getFieldName());
+        assertEquals(ProfileUploader.V4_EVENT_FILENAME, rawEvent.getName());
+        assertEquals("application/json", rawEvent.getContentType());
+
+        final FileItem rawJfr = multiPartItems.get(1);
+        assertEquals(ProfileUploader.V4_ATTACHMENT_NAME, rawJfr.getFieldName());
+        assertEquals(ProfileUploader.V4_ATTACHMENT_FILENAME, rawJfr.getName());
+        assertEquals("application/octet-stream", rawJfr.getContentType());
+
+        final byte[] expectedBytes = ByteStreams.toByteArray(recordingStream(true));
+        assertArrayEquals(expectedBytes, rawJfr.get());
+
+        // Event checks
+        final ObjectMapper mapper = new ObjectMapper();
+        final JsonNode event = mapper.readTree(rawEvent.getString());
+
+        assertEquals(
+                ProfileUploader.V4_ATTACHMENT_FILENAME,
+                event.get("attachments").get(0).asText());
+        assertEquals(ProfileUploader.V4_FAMILY, event.get("family").asText());
+        assertEquals(ProfileUploader.V4_VERSION, event.get("version").asText());
+        assertEquals(
+                Instant.ofEpochSecond(PROFILE_START).toString(),
+                event.get(V4_PROFILE_START_PARAM).asText());
+        assertEquals(
+                Instant.ofEpochSecond(PROFILE_END).toString(),
+                event.get(V4_PROFILE_END_PARAM).asText());
+        Map<String, String> expectedTags = new TreeMap<>(EXPECTED_TAGS);
+        expectedTags.put("snapshot", kind.name().toLowerCase());
+        assertEquals(
+                expectedTags,
+                ProfilingTestUtils.parseTags(
+                        Arrays.asList(event.get("tags_profiler").asText().split(","))));
+    }
+
+    @ParameterizedTest
+    @EnumSource(ProfilingSnapshot.Kind.class)
+    public void testHappyPathSync(ProfilingSnapshot.Kind kind) throws Exception {
+        // Given
+        when(config.getProfilingUploadTimeout()).thenReturn(500000);
+
+        // When
+        uploader = new ProfileUploader(config, configProvider);
+        server.enqueue(new MockResponse().setResponseCode(200));
+        // upload synchronously
+        uploader.upload(RECORDING_TYPE, mockRecordingData(true, kind), true);
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+
+        // Then
+        assertEquals(url, recordedRequest.getRequestUrl());
+
+        final List<FileItem> multiPartItems =
+                FileUpload.parse(recordedRequest.getBody().readByteArray(), recordedRequest.getHeader("Content-Type"));
+
+        final FileItem rawEvent = multiPartItems.get(0);
+        assertEquals(ProfileUploader.V4_EVENT_NAME, rawEvent.getFieldName());
+        assertEquals(ProfileUploader.V4_EVENT_FILENAME, rawEvent.getName());
+        assertEquals("application/json", rawEvent.getContentType());
+
+        final FileItem rawJfr = multiPartItems.get(1);
+        assertEquals(ProfileUploader.V4_ATTACHMENT_NAME, rawJfr.getFieldName());
+        assertEquals(ProfileUploader.V4_ATTACHMENT_FILENAME, rawJfr.getName());
+        assertEquals("application/octet-stream", rawJfr.getContentType());
+
+        final byte[] expectedBytes = ByteStreams.toByteArray(recordingStream(true));
+        assertArrayEquals(expectedBytes, rawJfr.get());
+
+        // Event checks
+        final ObjectMapper mapper = new ObjectMapper();
+        final JsonNode event = mapper.readTree(rawEvent.getString());
+
+        assertEquals(
+                ProfileUploader.V4_ATTACHMENT_FILENAME,
+                event.get("attachments").get(0).asText());
+        assertEquals(ProfileUploader.V4_FAMILY, event.get("family").asText());
+        assertEquals(ProfileUploader.V4_VERSION, event.get("version").asText());
+        assertEquals(
+                Instant.ofEpochSecond(PROFILE_START).toString(),
+                event.get(V4_PROFILE_START_PARAM).asText());
+        assertEquals(
+                Instant.ofEpochSecond(PROFILE_END).toString(),
+                event.get(V4_PROFILE_END_PARAM).asText());
+        Map<String, String> expectedTags = new TreeMap<>(EXPECTED_TAGS);
+        expectedTags.put("snapshot", kind.name().toLowerCase());
+        assertEquals(
+                expectedTags,
+                ProfilingTestUtils.parseTags(
+                        Arrays.asList(event.get("tags_profiler").asText().split(","))));
+    }
+
+    @Test
+    public void testZippedInput() throws Exception {
+        when(config.getApiKey()).thenReturn(null);
+        when(config.getProfilingUploadCompression()).thenReturn("on");
+        when(config.getProfilingUploadTimeout()).thenReturn(500000);
+        uploader = new ProfileUploader(config, configProvider);
+
+        server.enqueue(new MockResponse().setResponseCode(200));
+
+        uploadAndWait(RECORDING_TYPE, mockRecordingData(true));
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        assertEquals(url, recordedRequest.getRequestUrl());
+
+        assertNull(recordedRequest.getHeader("DD-API-KEY"));
+
+        final List<FileItem> multiPartItems =
+                FileUpload.parse(recordedRequest.getBody().readByteArray(), recordedRequest.getHeader("Content-Type"));
+
+        final FileItem rawEvent = multiPartItems.get(0);
+        assertEquals(ProfileUploader.V4_EVENT_NAME, rawEvent.getFieldName());
+        assertEquals(ProfileUploader.V4_EVENT_FILENAME, rawEvent.getName());
+        assertEquals("application/json", rawEvent.getContentType());
+
+        final FileItem rawJfr = multiPartItems.get(1);
+        assertEquals(ProfileUploader.V4_ATTACHMENT_NAME, rawJfr.getFieldName());
+        assertEquals(ProfileUploader.V4_ATTACHMENT_FILENAME, rawJfr.getName());
+        assertEquals("application/octet-stream", rawJfr.getContentType());
+
+        // data which are originally zipped will not be recompressed
+        final byte[] expectedBytes = ByteStreams.toByteArray(recordingStream(true));
+        assertArrayEquals(expectedBytes, rawJfr.get());
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"on", "lz4", "gzip", "zstd", "off", "invalid"})
+    public void testCompression(final String compression) throws Exception {
+        when(config.getApiKey()).thenReturn(null);
+        when(config.getProfilingUploadCompression()).thenReturn(compression);
+        when(config.getProfilingUploadTimeout()).thenReturn(500000);
+        uploader = new ProfileUploader(config, configProvider);
+
+        server.enqueue(new MockResponse().setResponseCode(200));
+
+        uploadAndWait(RECORDING_TYPE, mockRecordingData());
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        assertEquals(url, recordedRequest.getRequestUrl());
+
+        assertNull(recordedRequest.getHeader("DD-API-KEY"));
+
+        final List<FileItem> multiPartItems =
+                FileUpload.parse(recordedRequest.getBody().readByteArray(), recordedRequest.getHeader("Content-Type"));
+
+        final FileItem rawEvent = multiPartItems.get(0);
+        assertEquals(ProfileUploader.V4_EVENT_NAME, rawEvent.getFieldName());
+        assertEquals(ProfileUploader.V4_EVENT_FILENAME, rawEvent.getName());
+        assertEquals("application/json", rawEvent.getContentType());
+
+        final FileItem rawJfr = multiPartItems.get(1);
+        assertEquals(ProfileUploader.V4_ATTACHMENT_NAME, rawJfr.getFieldName());
+        assertEquals(ProfileUploader.V4_ATTACHMENT_FILENAME, rawJfr.getName());
+        assertEquals("application/octet-stream", rawJfr.getContentType());
+
+        final byte[] expectedBytes = ByteStreams.toByteArray(recordingStream(false));
+
+        byte[] uploadedBytes = rawJfr.get();
+        if (compression.equals("gzip")) {
+            uploadedBytes = unGzip(uploadedBytes);
+        } else if (compression.equals("zstd") || compression.equals("on") || compression.equals("invalid")) {
+            uploadedBytes = unZstd(uploadedBytes);
+        } else if (compression.equals("lz4")) {
+            uploadedBytes = unLz4(uploadedBytes);
+        }
+        assertArrayEquals(expectedBytes, uploadedBytes);
+    }
+
+    @Test
+    public void testRequestWithContainerId() throws Exception {
+        uploader = new ProfileUploader(config, configProvider, ioLogger, (int) TERMINATION_TIMEOUT.getSeconds());
+
+        server.enqueue(new MockResponse().setResponseCode(200));
+        uploadAndWait(RECORDING_TYPE, mockRecordingData());
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        assertNotNull(recordedRequest);
+    }
+
+    @Test
+    public void testAgentRequestWithApiKey() throws Exception {
+        when(config.getApiKey()).thenReturn(API_KEY_VALUE);
+
+        uploader = new ProfileUploader(config, configProvider);
+        server.enqueue(new MockResponse().setResponseCode(200));
+        uploadAndWait(RECORDING_TYPE, mockRecordingData());
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        assertNotNull(recordedRequest);
+        assertNull(recordedRequest.getHeader("DD-API-KEY"));
+    }
+
+    @Test
+    public void testAgentlessRequest() throws Exception {
+        when(config.getApiKey()).thenReturn(API_KEY_VALUE);
+        when(config.isProfilingAgentless()).thenReturn(true);
+
+        uploader = new ProfileUploader(config, configProvider);
+        server.enqueue(new MockResponse().setResponseCode(200));
+        uploadAndWait(RECORDING_TYPE, mockRecordingData());
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        assertNotNull(recordedRequest);
+        assertEquals(API_KEY_VALUE, recordedRequest.getHeader("DD-API-KEY"));
+    }
+
+    @Test
+    public void test404() throws Exception {
+        // test added to get the coverage checks to pass since we log conditionally in this case
+        when(config.getApiKey()).thenReturn(null);
+
+        uploader = new ProfileUploader(config, configProvider);
+        server.enqueue(new MockResponse().setResponseCode(404));
+        uploadAndWait(RECORDING_TYPE, mockRecordingData());
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        assertNotNull(recordedRequest);
+        assertNull(recordedRequest.getHeader("DD-API-KEY"));
+        // it would be nice if the test asserted the log line was written out, but it's not essential
+    }
+
+    @Test
+    public void test404Agentless() throws Exception {
+        // test added to get the coverage checks to pass since we log conditionally in this case
+        when(config.getApiKey()).thenReturn(API_KEY_VALUE);
+        when(config.isProfilingAgentless()).thenReturn(true);
+
+        uploader = new ProfileUploader(config, configProvider);
+        server.enqueue(new MockResponse().setResponseCode(404));
+        uploadAndWait(RECORDING_TYPE, mockRecordingData());
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        assertNotNull(recordedRequest);
+        assertEquals(API_KEY_VALUE, recordedRequest.getHeader("DD-API-KEY"));
+    }
+
+    @Test
+    public void testRequestWithProxy() throws Exception {
+        final String backendHost = "intake.profiling.datadoghq.com:1234";
+        final String backendUrl = "http://intake.profiling.datadoghq.com:1234" + URL_PATH;
+        when(config.getFinalProfilingUrl()).thenReturn("http://intake.profiling.datadoghq.com:1234" + URL_PATH);
+        when(config.getProfilingProxyHost()).thenReturn(server.url("").host());
+        when(config.getProfilingProxyPort()).thenReturn(server.url("").port());
+        when(config.getProfilingProxyUsername()).thenReturn("username");
+        when(config.getProfilingProxyPassword()).thenReturn("password");
+
+        uploader = new ProfileUploader(config, configProvider);
+
+        server.enqueue(new MockResponse().setResponseCode(407).addHeader("Proxy-Authenticate: Basic"));
+        server.enqueue(new MockResponse().setResponseCode(200));
+
+        uploadAndWait(RECORDING_TYPE, mockRecordingData());
+
+        final RecordedRequest recordedFirstRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        assertEquals(server.url(""), recordedFirstRequest.getRequestUrl());
+        assertNull(recordedFirstRequest.getHeader("Proxy-Authorization"));
+        assertEquals(backendHost, recordedFirstRequest.getHeader("Host"));
+        assertEquals(String.format("POST %s HTTP/1.1", backendUrl), recordedFirstRequest.getRequestLine());
+
+        final RecordedRequest recordedSecondRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        assertEquals(server.url(""), recordedSecondRequest.getRequestUrl());
+        assertEquals(Credentials.basic("username", "password"), recordedSecondRequest.getHeader("Proxy-Authorization"));
+        assertEquals(backendHost, recordedSecondRequest.getHeader("Host"));
+        assertEquals(String.format("POST %s HTTP/1.1", backendUrl), recordedSecondRequest.getRequestLine());
+    }
+
+    @Test
+    public void testRequestWithProxyDefaultPassword() throws Exception {
+        final String backendUrl = "http://intake.profiling.datadoghq.com:1234" + URL_PATH;
+        when(config.getFinalProfilingUrl()).thenReturn("http://intake.profiling.datadoghq.com:1234" + URL_PATH);
+        when(config.getProfilingProxyHost()).thenReturn(server.url("").host());
+        when(config.getProfilingProxyPort()).thenReturn(server.url("").port());
+        when(config.getProfilingProxyUsername()).thenReturn("username");
+
+        uploader = new ProfileUploader(config, configProvider);
+
+        server.enqueue(new MockResponse().setResponseCode(407).addHeader("Proxy-Authenticate: Basic"));
+        server.enqueue(new MockResponse().setResponseCode(200));
+
+        uploadAndWait(RECORDING_TYPE, mockRecordingData());
+
+        final RecordedRequest recordedFirstRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        final RecordedRequest recordedSecondRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        assertEquals(Credentials.basic("username", ""), recordedSecondRequest.getHeader("Proxy-Authorization"));
+    }
+
+    @Test
+    void testOkHttpClientForcesCleartextConnspecWhenNotUsingTLS() {
+        when(config.getFinalProfilingUrl()).thenReturn("http://example.com");
+
+        uploader = new ProfileUploader(config, configProvider);
+
+        final List<ConnectionSpec> connectionSpecs = uploader.getClient().connectionSpecs();
+        assertEquals(connectionSpecs.size(), 1);
+        assertTrue(connectionSpecs.contains(ConnectionSpec.CLEARTEXT));
+    }
+
+    @Test
+    void testOkHttpClientUsesDefaultConnspecsOverTLS() {
+        when(config.getFinalProfilingUrl()).thenReturn("https://example.com");
+
+        uploader = new ProfileUploader(config, configProvider);
+
+        final List<ConnectionSpec> connectionSpecs = uploader.getClient().connectionSpecs();
+        assertEquals(connectionSpecs.size(), 2);
+        assertTrue(connectionSpecs.contains(ConnectionSpec.MODERN_TLS));
+        assertTrue(connectionSpecs.contains(ConnectionSpec.CLEARTEXT));
+    }
+
+    @Test
+    public void testRecordingClosed() throws Exception {
+        server.enqueue(new MockResponse().setResponseCode(200));
+
+        final RecordingData recording = mockRecordingData();
+        uploadAndWait(RECORDING_TYPE, recording);
+
+        verify(recording).release();
+    }
+
+    @Test
+    public void test500Response() throws Exception {
+        server.enqueue(new MockResponse().setResponseCode(500));
+
+        final RecordingData recording = mockRecordingData();
+        uploadAndWait(RECORDING_TYPE, recording);
+
+        assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+
+        verify(recording).release();
+    }
+
+    @Test
+    public void test413Response() throws Exception {
+        server.enqueue(new MockResponse().setResponseCode(413));
+
+        final RecordingData recording = mockRecordingData();
+        uploadAndWait(RECORDING_TYPE, recording);
+
+        assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+
+        verify(recording).release();
+
+        // J9 has 'almost' implemented JFR, but not really
+        // we need to skip this part for J9
+        if (!JavaVirtualMachine.isJ9() && Files.exists(Paths.get(System.getProperty("java.home"), "bin", "jfr"))) {
+            verify(ioLogger).error(eq("Failed to upload profile, it's too big. Dumping information about the profile"));
+            verify(ioLogger, times(10)).error(matches("Event: .*, size = [0-9]+, count = [0-9]+"));
+        } else {
+            verify(ioLogger).error(eq("Failed to gather information on recording, can't find `jfr`"));
+        }
+    }
+
+    @Test
+    public void testConnectionRefused() throws Exception {
+        server.shutdown();
+
+        final RecordingData recording = mockRecordingData();
+        uploadAndWait(RECORDING_TYPE, recording);
+
+        verify(recording).release();
+
+        // Shutting down uploader ensures all callbacks are called on http client
+        uploader.shutdown();
+        verify(ioLogger).error(eq("Failed to upload profile to " + url), any(ConnectException.class));
+    }
+
+    @Test
+    public void testConnectionRefusedSync() throws Exception {
+        server.shutdown();
+
+        final RecordingData recording = mockRecordingData();
+        uploader.upload(RECORDING_TYPE, recording, true);
+
+        verify(recording).release();
+
+        // Shutting down uploader ensures all callbacks are called on http client
+        uploader.shutdown();
+        verify(ioLogger).error(eq("Failed to upload profile to " + url), any(ConnectException.class));
+    }
+
+    @Test
+    public void testNoReplyFromServer() throws Exception {
+        server.enqueue(new MockResponse().setSocketPolicy(SocketPolicy.NO_RESPONSE));
+        final RecordingData recording = mockRecordingData();
+        uploadAndWait(RECORDING_TYPE, recording);
+
+        // Wait longer than request timeout
+        assertNotNull(server.takeRequest(REQUEST_TIMEOUT.getSeconds() + 1, TimeUnit.SECONDS));
+
+        // Shutting down uploader ensures all callbacks are called on http client
+        uploader.shutdown();
+        verify(recording).release();
+        verify(ioLogger)
+                .error(eq("Failed to upload profile, received empty reply from " + url + " after uploading profile"));
+    }
+
+    @Test
+    public void testNoReplyFromServerSync() throws Exception {
+        server.enqueue(new MockResponse().setSocketPolicy(SocketPolicy.NO_RESPONSE));
+        final RecordingData recording = mockRecordingData();
+        uploader.upload(RECORDING_TYPE, recording, true);
+
+        // Wait longer than request timeout
+        assertNotNull(server.takeRequest(REQUEST_TIMEOUT.getSeconds() + 1, TimeUnit.SECONDS));
+
+        // Shutting down uploader ensures all callbacks are called on http client
+        uploader.shutdown();
+        verify(recording).release();
+        verify(ioLogger)
+                .error(eq("Failed to upload profile, received empty reply from " + url + " after uploading profile"));
+    }
+
+    @Test
+    public void testSyncDoesNotStayBlocked() throws Exception {
+        // We need to muck around with the 'uploadTimeout' field to actually force
+        // the uploader to take the 'safety-break' route. Otherwise, the request
+        // will always fail first on socket timeouts.
+        Field fld = ProfileUploader.class.getDeclaredField("uploadTimeout");
+        fld.setAccessible(true);
+        fld.set(uploader, Duration.ofSeconds(1)); // TODO: JEP 500 - avoid mutating final fields
+        // ---
+
+        server.enqueue(new MockResponse().setSocketPolicy(SocketPolicy.STALL_SOCKET_AT_START));
+        final RecordingData recording = mockRecordingData();
+        uploader.upload(RECORDING_TYPE, recording, true);
+
+        // Wait longer than termination timeout
+        assertNotNull(server.takeRequest(REQUEST_TIMEOUT.getSeconds() + 1, TimeUnit.SECONDS));
+
+        // Shutting down uploader ensures all callbacks are called on http client
+        uploader.shutdown();
+        verify(recording).release();
+        verify(ioLogger).error(eq("Failed to upload profile to " + url), (Exception) isNull());
+    }
+
+    @Test
+    public void testTimeout() throws Exception {
+        server.enqueue(new MockResponse()
+                .setHeadersDelay(
+                        REQUEST_IO_OPERATION_TIMEOUT.plus(Duration.ofSeconds(1)).toMillis(), TimeUnit.MILLISECONDS));
+
+        final RecordingData recording = mockRecordingData();
+        uploadAndWait(RECORDING_TYPE, recording);
+
+        // Wait longer than request timeout
+        assertNotNull(server.takeRequest(REQUEST_IO_OPERATION_TIMEOUT.getSeconds() + 2, TimeUnit.SECONDS));
+
+        // Shutting down uploader ensures all callbacks are called on http client
+        uploader.shutdown();
+        verify(recording).release();
+        // This seems to be a weird behaviour on okHttp side: it considers request to be a success even
+        // if it didn't get headers before the timeout
+        verify(ioLogger).success(eq("Upload done"));
+    }
+
+    @Test
+    public void testTimeoutSync() throws Exception {
+        server.enqueue(new MockResponse()
+                .setHeadersDelay(
+                        REQUEST_IO_OPERATION_TIMEOUT.plus(Duration.ofSeconds(1)).toMillis(), TimeUnit.MILLISECONDS));
+
+        final RecordingData recording = mockRecordingData();
+        uploader.upload(RECORDING_TYPE, recording, true);
+
+        // Wait longer than request timeout
+        assertNotNull(server.takeRequest(REQUEST_IO_OPERATION_TIMEOUT.getSeconds() + 10, TimeUnit.SECONDS));
+
+        // Shutting down uploader ensures all callbacks are called on http client
+        uploader.shutdown();
+        verify(recording).release();
+        // This seems to be a weird behaviour on okHttp side: it considers request to be a success even
+        // if it didn't get headers before the timeout
+        verify(ioLogger).success(eq("Upload done"));
+    }
+
+    @Test
+    public void testUnfinishedRecording() throws Exception {
+        final RecordingData recording = mockRecordingData();
+        when(recording.getStream()).thenThrow(new IllegalStateException("test exception"));
+        uploadAndWait(RECORDING_TYPE, recording);
+
+        verify(recording).release();
+        verify(recording, times(2)).getStream();
+    }
+
+    @Test
+    public void testEmptyRecording() throws Exception {
+        final RecordingData recording = mockRecordingData();
+        when(recording.getStream()).then((Answer<RecordingInputStream>)
                 instance -> new RecordingInputStream(new ByteArrayInputStream(new byte[0])));
-    server.enqueue(new MockResponse().setResponseCode(200));
-    uploadAndWait(RECORDING_TYPE, recording);
+        server.enqueue(new MockResponse().setResponseCode(200));
+        uploadAndWait(RECORDING_TYPE, recording);
+
+        final RecordedRequest recordedRequest = server.takeRequest(500, TimeUnit.MILLISECONDS);
+        assertNull(recordedRequest);
+    }
+
+    @Test
+    public void testEnqueuedRequestsExecuted() throws Exception {
+        // We have to block all parallel requests to make sure queue is kept full
+        for (int i = 0; i < ProfileUploader.MAX_RUNNING_REQUESTS; i++) {
+            server.enqueue(new MockResponse()
+                    .setHeadersDelay(
+                            // 1 second should be enough to schedule all requests and not hit timeout
+                            Duration.ofSeconds(1).toMillis(), TimeUnit.MILLISECONDS)
+                    .setResponseCode(200));
+        }
+        server.enqueue(new MockResponse().setResponseCode(200));
+
+        for (int i = 0; i < ProfileUploader.MAX_RUNNING_REQUESTS; i++) {
+            final RecordingData recording = mockRecordingData();
+            uploadAndWait(RECORDING_TYPE, recording);
+        }
+
+        final RecordingData additionalRecording = mockRecordingData();
+        uploadAndWait(RECORDING_TYPE, additionalRecording);
+
+        // Make sure all expected requests happened
+        for (int i = 0; i < ProfileUploader.MAX_RUNNING_REQUESTS; i++) {
+            assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+        }
+
+        assertNotNull(server.takeRequest(2000, TimeUnit.MILLISECONDS), "Got enqueued request");
+
+        verify(additionalRecording).release();
+    }
+
+    @Test
+    public void testTooManyRequests() throws Exception {
+        // We need to make sure that initial requests that fill up the queue hang to the duration of the
+        // test. So we specify insanely large timeout here.
+        when(config.getProfilingUploadTimeout()).thenReturn((int) FOREVER_REQUEST_TIMEOUT.getSeconds());
+        uploader = new ProfileUploader(config, configProvider);
+
+        // We have to block all parallel requests to make sure queue is kept full
+        for (int i = 0; i < ProfileUploader.MAX_RUNNING_REQUESTS; i++) {
+            server.enqueue(new MockResponse()
+                    .setHeadersDelay(FOREVER_REQUEST_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS)
+                    .setResponseCode(200));
+        }
+        server.enqueue(new MockResponse().setResponseCode(200));
+
+        final List<RecordingData> inflightRecordings = new ArrayList<>();
+        for (int i = 0; i < ProfileUploader.MAX_RUNNING_REQUESTS; i++) {
+            final RecordingData recording = mockRecordingData();
+            inflightRecordings.add(recording);
+            uploader.upload(RECORDING_TYPE, recording);
+        }
+
+        for (int i = 0; i < ProfileUploader.MAX_ENQUEUED_REQUESTS; i++) {
+            final RecordingData recording = mockRecordingData();
+            inflightRecordings.add(recording);
+            uploader.upload(RECORDING_TYPE, recording);
+        }
+
+        // We schedule one additional request to check case when request would be rejected immediately
+        // rather than added to the queue.
+        final RecordingData rejectedRecording = mockRecordingData();
+        uploader.upload(RECORDING_TYPE, rejectedRecording);
+
+        // Make sure all expected requests happened
+        for (int i = 0; i < ProfileUploader.MAX_RUNNING_REQUESTS; i++) {
+            assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+        }
+        // Recordings after RecordingUploader.MAX_RUNNING_REQUESTS will not be executed because number
+        // or parallel requests has been reached.
+        assertNull(server.takeRequest(100, TimeUnit.MILLISECONDS), "No more requests");
+
+        // the hung-up running requests and the enqueued requests can not have the recording data
+        // released
+        for (final RecordingData data : inflightRecordings) {
+            verify(data, VerificationModeFactory.times(0)).release();
+        }
+        // however, the rejected recording should have the recording data released
+        verify(rejectedRecording).release();
+    }
+
+    @Test
+    public void testShutdown() throws Exception {
+        uploader.shutdown();
+
+        final RecordingData recording = mockRecordingData();
+        uploadAndWait(RECORDING_TYPE, recording);
+
+        assertNull(server.takeRequest(100, TimeUnit.MILLISECONDS), "No more requests");
+
+        verify(recording).release();
+    }
 
-    final RecordedRequest recordedRequest = server.takeRequest(500, TimeUnit.MILLISECONDS);
-    assertNull(recordedRequest);
-  }
+    @ParameterizedTest(name = "process tags enabled ''{0}''")
+    @ValueSource(booleans = {true, false})
+    public void testRequestWithProcessTags(boolean processTagsEnabled) throws Exception {
+        when(config.isExperimentalPropagateProcessTagsEnabled()).thenReturn(processTagsEnabled);
+        if (processTagsEnabled) {
+            when(config.isServiceNameSetByUser()).thenReturn(true);
+        }
+        ProcessTags.reset(config);
+        uploader = new ProfileUploader(config, configProvider, ioLogger, (int) TERMINATION_TIMEOUT.getSeconds());
+
+        server.enqueue(new MockResponse().setResponseCode(200));
+        uploadAndWait(RECORDING_TYPE, mockRecordingData());
+
+        final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+        assertNotNull(recordedRequest);
+        final List<FileItem> multiPartItems =
+                FileUpload.parse(recordedRequest.getBody().readByteArray(), recordedRequest.getHeader("Content-Type"));
+
+        final FileItem rawEvent = multiPartItems.get(0);
+        final Map<String, ?> parsed = new ObjectMapper().readValue(rawEvent.get(), Map.class);
+        if (processTagsEnabled) {
+            assertNotNull(ProcessTags.getTagsForSerialization());
+            assertEquals(ProcessTags.getTagsForSerialization().toString(), parsed.get("process_tags"));
+        } else {
+            assertNull(parsed.get("process_tags"));
+        }
+    }
 
-  @Test
-  public void testEnqueuedRequestsExecuted() throws Exception {
-    // We have to block all parallel requests to make sure queue is kept full
-    for (int i = 0; i < ProfileUploader.MAX_RUNNING_REQUESTS; i++) {
-      server.enqueue(
-          new MockResponse()
-              .setHeadersDelay(
-                  // 1 second should be enough to schedule all requests and not hit timeout
-                  Duration.ofSeconds(1).toMillis(), TimeUnit.MILLISECONDS)
-              .setResponseCode(200));
+    private RecordingData mockRecordingData() throws IOException {
+        return mockRecordingData(false, ProfilingSnapshot.Kind.PERIODIC);
     }
-    server.enqueue(new MockResponse().setResponseCode(200));
 
-    for (int i = 0; i < ProfileUploader.MAX_RUNNING_REQUESTS; i++) {
-      final RecordingData recording = mockRecordingData();
-      uploadAndWait(RECORDING_TYPE, recording);
+    private RecordingData mockRecordingData(final boolean zip) throws IOException {
+        return mockRecordingData(zip, ProfilingSnapshot.Kind.PERIODIC);
     }
 
-    final RecordingData additionalRecording = mockRecordingData();
-    uploadAndWait(RECORDING_TYPE, additionalRecording);
-
-    // Make sure all expected requests happened
-    for (int i = 0; i < ProfileUploader.MAX_RUNNING_REQUESTS; i++) {
-      assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+    private RecordingData mockRecordingData(final boolean zip, ProfilingSnapshot.Kind kind) throws IOException {
+        final RecordingData recordingData =
+                mock(RecordingData.class, withSettings().lenient());
+        when(recordingData.getStream())
+                .then((Answer<InputStream>) invocation -> spy(new RecordingInputStream(recordingStream(zip))));
+        when(recordingData.getName()).thenReturn(RECORDING_NAME_PREFIX + SEQUENCE_NUMBER);
+        when(recordingData.getStart()).thenReturn(Instant.ofEpochSecond(PROFILE_START));
+        when(recordingData.getEnd()).thenReturn(Instant.ofEpochSecond(PROFILE_END));
+        when(recordingData.getKind()).thenReturn(kind);
+        return recordingData;
     }
 
-    assertNotNull(server.takeRequest(2000, TimeUnit.MILLISECONDS), "Got enqueued request");
+    private static byte[] unGzip(final byte[] compressed) throws IOException {
+        final InputStream stream = new GZIPInputStream(new ByteArrayInputStream(compressed));
+        final ByteArrayOutputStream result = new ByteArrayOutputStream();
+        ByteStreams.copy(stream, result);
+        return result.toByteArray();
+    }
 
-    verify(additionalRecording).release();
-  }
+    private static byte[] unLz4(final byte[] compressed) throws IOException {
+        final InputStream stream = new LZ4FrameInputStream(new ByteArrayInputStream(compressed));
+        final ByteArrayOutputStream result = new ByteArrayOutputStream();
+        ByteStreams.copy(stream, result);
+        return result.toByteArray();
+    }
 
-  @Test
-  public void testTooManyRequests() throws Exception {
-    // We need to make sure that initial requests that fill up the queue hang to the duration of the
-    // test. So we specify insanely large timeout here.
-    when(config.getProfilingUploadTimeout()).thenReturn((int) FOREVER_REQUEST_TIMEOUT.getSeconds());
-    uploader = new ProfileUploader(config, configProvider);
-
-    // We have to block all parallel requests to make sure queue is kept full
-    for (int i = 0; i < ProfileUploader.MAX_RUNNING_REQUESTS; i++) {
-      server.enqueue(
-          new MockResponse()
-              .setHeadersDelay(FOREVER_REQUEST_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS)
-              .setResponseCode(200));
-    }
-    server.enqueue(new MockResponse().setResponseCode(200));
-
-    final List<RecordingData> inflightRecordings = new ArrayList<>();
-    for (int i = 0; i < ProfileUploader.MAX_RUNNING_REQUESTS; i++) {
-      final RecordingData recording = mockRecordingData();
-      inflightRecordings.add(recording);
-      uploader.upload(RECORDING_TYPE, recording);
-    }
-
-    for (int i = 0; i < ProfileUploader.MAX_ENQUEUED_REQUESTS; i++) {
-      final RecordingData recording = mockRecordingData();
-      inflightRecordings.add(recording);
-      uploader.upload(RECORDING_TYPE, recording);
-    }
-
-    // We schedule one additional request to check case when request would be rejected immediately
-    // rather than added to the queue.
-    final RecordingData rejectedRecording = mockRecordingData();
-    uploader.upload(RECORDING_TYPE, rejectedRecording);
-
-    // Make sure all expected requests happened
-    for (int i = 0; i < ProfileUploader.MAX_RUNNING_REQUESTS; i++) {
-      assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
-    }
-    // Recordings after RecordingUploader.MAX_RUNNING_REQUESTS will not be executed because number
-    // or parallel requests has been reached.
-    assertNull(server.takeRequest(100, TimeUnit.MILLISECONDS), "No more requests");
-
-    // the hung-up running requests and the enqueued requests can not have the recording data
-    // released
-    for (final RecordingData data : inflightRecordings) {
-      verify(data, VerificationModeFactory.times(0)).release();
-    }
-    // however, the rejected recording should have the recording data released
-    verify(rejectedRecording).release();
-  }
-
-  @Test
-  public void testShutdown() throws Exception {
-    uploader.shutdown();
-
-    final RecordingData recording = mockRecordingData();
-    uploadAndWait(RECORDING_TYPE, recording);
-
-    assertNull(server.takeRequest(100, TimeUnit.MILLISECONDS), "No more requests");
-
-    verify(recording).release();
-  }
-
-  @ParameterizedTest(name = "process tags enabled ''{0}''")
-  @ValueSource(booleans = {true, false})
-  public void testRequestWithProcessTags(boolean processTagsEnabled) throws Exception {
-    when(config.isExperimentalPropagateProcessTagsEnabled()).thenReturn(processTagsEnabled);
-    if (processTagsEnabled) {
-      when(config.isServiceNameSetByUser()).thenReturn(true);
-    }
-    ProcessTags.reset(config);
-    uploader =
-        new ProfileUploader(
-            config, configProvider, ioLogger, (int) TERMINATION_TIMEOUT.getSeconds());
-
-    server.enqueue(new MockResponse().setResponseCode(200));
-    uploadAndWait(RECORDING_TYPE, mockRecordingData());
-
-    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-    assertNotNull(recordedRequest);
-    final List<FileItem> multiPartItems =
-        FileUpload.parse(
-            recordedRequest.getBody().readByteArray(), recordedRequest.getHeader("Content-Type"));
-
-    final FileItem rawEvent = multiPartItems.get(0);
-    final Map<String, ?> parsed = new ObjectMapper().readValue(rawEvent.get(), Map.class);
-    if (processTagsEnabled) {
-      assertNotNull(ProcessTags.getTagsForSerialization());
-      assertEquals(ProcessTags.getTagsForSerialization().toString(), parsed.get("process_tags"));
-    } else {
-      assertNull(parsed.get("process_tags"));
-    }
-  }
-
-  private RecordingData mockRecordingData() throws IOException {
-    return mockRecordingData(false, ProfilingSnapshot.Kind.PERIODIC);
-  }
-
-  private RecordingData mockRecordingData(final boolean zip) throws IOException {
-    return mockRecordingData(zip, ProfilingSnapshot.Kind.PERIODIC);
-  }
-
-  private RecordingData mockRecordingData(final boolean zip, ProfilingSnapshot.Kind kind)
-      throws IOException {
-    final RecordingData recordingData = mock(RecordingData.class, withSettings().lenient());
-    when(recordingData.getStream())
-        .then(
-            (Answer<InputStream>)
-                invocation -> spy(new RecordingInputStream(recordingStream(zip))));
-    when(recordingData.getName()).thenReturn(RECORDING_NAME_PREFIX + SEQUENCE_NUMBER);
-    when(recordingData.getStart()).thenReturn(Instant.ofEpochSecond(PROFILE_START));
-    when(recordingData.getEnd()).thenReturn(Instant.ofEpochSecond(PROFILE_END));
-    when(recordingData.getKind()).thenReturn(kind);
-    return recordingData;
-  }
-
-  private static byte[] unGzip(final byte[] compressed) throws IOException {
-    final InputStream stream = new GZIPInputStream(new ByteArrayInputStream(compressed));
-    final ByteArrayOutputStream result = new ByteArrayOutputStream();
-    ByteStreams.copy(stream, result);
-    return result.toByteArray();
-  }
-
-  private static byte[] unLz4(final byte[] compressed) throws IOException {
-    final InputStream stream = new LZ4FrameInputStream(new ByteArrayInputStream(compressed));
-    final ByteArrayOutputStream result = new ByteArrayOutputStream();
-    ByteStreams.copy(stream, result);
-    return result.toByteArray();
-  }
-
-  private static byte[] unZstd(final byte[] compressed) throws IOException {
-    final InputStream stream = new ZstdInputStream(new ByteArrayInputStream(compressed));
-    final ByteArrayOutputStream result = new ByteArrayOutputStream();
-    ByteStreams.copy(stream, result);
-    return result.toByteArray();
-  }
-
-  private void uploadAndWait(final RecordingType recordingType, final RecordingData data)
-      throws InterruptedException {
-    final CountDownLatch latch = new CountDownLatch(1);
-    uploader.upload(recordingType, data, latch::countDown);
-    latch.await();
-  }
-
-  private static InputStream recordingStream(final boolean gzip) throws IOException {
-    InputStream dataStream = ProfileUploader.class.getResourceAsStream(RECORDING_RESOURCE);
-    if (gzip) {
-      final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      try (final GZIPOutputStream zos = new GZIPOutputStream(baos)) {
-        IOUtils.copy(dataStream, zos);
-      }
-      dataStream = new ByteArrayInputStream(baos.toByteArray());
-    }
-    return new BufferedInputStream(dataStream);
-  }
+    private static byte[] unZstd(final byte[] compressed) throws IOException {
+        final InputStream stream = new ZstdInputStream(new ByteArrayInputStream(compressed));
+        final ByteArrayOutputStream result = new ByteArrayOutputStream();
+        ByteStreams.copy(stream, result);
+        return result.toByteArray();
+    }
+
+    private void uploadAndWait(final RecordingType recordingType, final RecordingData data)
+            throws InterruptedException {
+        final CountDownLatch latch = new CountDownLatch(1);
+        uploader.upload(recordingType, data, latch::countDown);
+        latch.await();
+    }
+
+    private static InputStream recordingStream(final boolean gzip) throws IOException {
+        InputStream dataStream = ProfileUploader.class.getResourceAsStream(RECORDING_RESOURCE);
+        if (gzip) {
+            final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try (final GZIPOutputStream zos = new GZIPOutputStream(baos)) {
+                IOUtils.copy(dataStream, zos);
+            }
+            dataStream = new ByteArrayInputStream(baos.toByteArray());
+        }
+        return new BufferedInputStream(dataStream);
+    }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/util/JfrCliHelperTest.java b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/util/JfrCliHelperTest.java
index fb94c5490e1..cb0a63771dd 100644
--- a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/util/JfrCliHelperTest.java
+++ b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/util/JfrCliHelperTest.java
@@ -36,74 +36,73 @@
 @ExtendWith(MockitoExtension.class)
 public class JfrCliHelperTest {
 
-  private static final String RECORDING_RESOURCE = "/test-recording.jfr";
-  private static final String RECODING_NAME_PREFIX = "test-recording-";
+    private static final String RECORDING_RESOURCE = "/test-recording.jfr";
+    private static final String RECODING_NAME_PREFIX = "test-recording-";
 
-  private static final int SEQUENCE_NUMBER = 123;
-  private static final int PROFILE_START = 1000;
-  private static final int PROFILE_END = 1100;
+    private static final int SEQUENCE_NUMBER = 123;
+    private static final int PROFILE_START = 1000;
+    private static final int PROFILE_END = 1100;
 
-  @Mock private IOLogger ioLogger;
+    @Mock
+    private IOLogger ioLogger;
 
-  @Test
-  public void testInvokeOn() throws Exception {
-    // J9 may have 'jfr' command present but it requires additional setup
-    // Currently we don't support J9 JFR so we can safely skip this test
-    Assumptions.assumeFalse(JavaVirtualMachine.isJ9());
-    final RecordingData recording = mockRecordingData();
+    @Test
+    public void testInvokeOn() throws Exception {
+        // J9 may have 'jfr' command present but it requires additional setup
+        // Currently we don't support J9 JFR so we can safely skip this test
+        Assumptions.assumeFalse(JavaVirtualMachine.isJ9());
+        final RecordingData recording = mockRecordingData();
 
-    JfrCliHelper.invokeOn(recording, ioLogger);
+        JfrCliHelper.invokeOn(recording, ioLogger);
 
-    if (!hasJfr()) {
-      verify(ioLogger).error(eq("Failed to gather information on recording, can't find `jfr`"));
-    } else {
-      Set<String> messages = new HashSet<String>();
-      messages.add("Event: jdk.Metadata, size = 208257, count = 3");
-      messages.add("Event: jdk.ClassLoad, size = 140225, count = 6679");
-      messages.add("Event: jdk.SystemProcess, size = 132771, count = 1389");
-      messages.add("Event: jdk.NativeLibrary, size = 83591, count = 927");
-      messages.add("Event: jdk.ClassDefine, size = 78876, count = 4624");
-      messages.add("Event: jdk.BooleanFlag, size = 66249, count = 1935");
-      messages.add("Event: jdk.ActiveSetting, size = 48732, count = 1470");
-      messages.add("Event: jdk.JavaMonitorWait, size = 35170, count = 1232");
-      messages.add("Event: jdk.InitialSystemProperty, size = 31164, count = 81");
+        if (!hasJfr()) {
+            verify(ioLogger).error(eq("Failed to gather information on recording, can't find `jfr`"));
+        } else {
+            Set<String> messages = new HashSet<String>();
+            messages.add("Event: jdk.Metadata, size = 208257, count = 3");
+            messages.add("Event: jdk.ClassLoad, size = 140225, count = 6679");
+            messages.add("Event: jdk.SystemProcess, size = 132771, count = 1389");
+            messages.add("Event: jdk.NativeLibrary, size = 83591, count = 927");
+            messages.add("Event: jdk.ClassDefine, size = 78876, count = 4624");
+            messages.add("Event: jdk.BooleanFlag, size = 66249, count = 1935");
+            messages.add("Event: jdk.ActiveSetting, size = 48732, count = 1470");
+            messages.add("Event: jdk.JavaMonitorWait, size = 35170, count = 1232");
+            messages.add("Event: jdk.InitialSystemProperty, size = 31164, count = 81");
 
-      // tried using `messages.remove(message)` to guarantee we are not duplicating
-      // the calls but Mockito complained for some reasons
-      verify(ioLogger, times(messages.size()))
-          .error(argThat(message -> messages.contains(message)));
+            // tried using `messages.remove(message)` to guarantee we are not duplicating
+            // the calls but Mockito complained for some reasons
+            verify(ioLogger, times(messages.size())).error(argThat(message -> messages.contains(message)));
+        }
     }
-  }
 
-  private boolean hasJfr() {
-    return Files.exists(Paths.get(SystemProperties.get("java.home"), "bin", "jfr"));
-  }
+    private boolean hasJfr() {
+        return Files.exists(Paths.get(SystemProperties.get("java.home"), "bin", "jfr"));
+    }
 
-  private RecordingData mockRecordingData() throws IOException {
-    return mockRecordingData(false);
-  }
+    private RecordingData mockRecordingData() throws IOException {
+        return mockRecordingData(false);
+    }
 
-  private RecordingData mockRecordingData(boolean zip) throws IOException {
-    final RecordingData recordingData = mock(RecordingData.class, withSettings().lenient());
-    when(recordingData.getStream())
-        .then(
-            (Answer<InputStream>)
-                invocation -> spy(new RecordingInputStream(recordingStream(zip))));
-    when(recordingData.getName()).thenReturn(RECODING_NAME_PREFIX + SEQUENCE_NUMBER);
-    when(recordingData.getStart()).thenReturn(Instant.ofEpochSecond(PROFILE_START));
-    when(recordingData.getEnd()).thenReturn(Instant.ofEpochSecond(PROFILE_END));
-    return recordingData;
-  }
+    private RecordingData mockRecordingData(boolean zip) throws IOException {
+        final RecordingData recordingData =
+                mock(RecordingData.class, withSettings().lenient());
+        when(recordingData.getStream())
+                .then((Answer<InputStream>) invocation -> spy(new RecordingInputStream(recordingStream(zip))));
+        when(recordingData.getName()).thenReturn(RECODING_NAME_PREFIX + SEQUENCE_NUMBER);
+        when(recordingData.getStart()).thenReturn(Instant.ofEpochSecond(PROFILE_START));
+        when(recordingData.getEnd()).thenReturn(Instant.ofEpochSecond(PROFILE_END));
+        return recordingData;
+    }
 
-  private static InputStream recordingStream(boolean gzip) throws IOException {
-    InputStream dataStream = JfrCliHelper.class.getResourceAsStream(RECORDING_RESOURCE);
-    if (gzip) {
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      try (GZIPOutputStream zos = new GZIPOutputStream(baos)) {
-        IOUtils.copy(dataStream, zos);
-      }
-      dataStream = new ByteArrayInputStream(baos.toByteArray());
+    private static InputStream recordingStream(boolean gzip) throws IOException {
+        InputStream dataStream = JfrCliHelper.class.getResourceAsStream(RECORDING_RESOURCE);
+        if (gzip) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try (GZIPOutputStream zos = new GZIPOutputStream(baos)) {
+                IOUtils.copy(dataStream, zos);
+            }
+            dataStream = new ByteArrayInputStream(baos.toByteArray());
+        }
+        return new BufferedInputStream(dataStream);
     }
-    return new BufferedInputStream(dataStream);
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-utils/src/main/java/com/datadog/profiling/utils/ExcludedVersions.java b/dd-java-agent/agent-profiling/profiling-utils/src/main/java/com/datadog/profiling/utils/ExcludedVersions.java
index 30e5567eb21..73094cf5f4e 100644
--- a/dd-java-agent/agent-profiling/profiling-utils/src/main/java/com/datadog/profiling/utils/ExcludedVersions.java
+++ b/dd-java-agent/agent-profiling/profiling-utils/src/main/java/com/datadog/profiling/utils/ExcludedVersions.java
@@ -6,20 +6,20 @@
 
 public class ExcludedVersions {
 
-  public static void checkVersionExclusion() throws IllegalStateException {
-    if (isVersionExcluded()) {
-      throw new IllegalStateException("Excluded java version: " + getRuntimeVersion());
+    public static void checkVersionExclusion() throws IllegalStateException {
+        if (isVersionExcluded()) {
+            throw new IllegalStateException("Excluded java version: " + getRuntimeVersion());
+        }
     }
-  }
 
-  public static boolean isVersionExcluded() {
-    // Java 9 and 10 throw seg fault on MacOS if events are used in premain.
-    // Since these versions are not LTS we just disable profiling events for them.
-    if (isJavaVersion(9) || isJavaVersion(10)) {
-      return true;
+    public static boolean isVersionExcluded() {
+        // Java 9 and 10 throw seg fault on MacOS if events are used in premain.
+        // Since these versions are not LTS we just disable profiling events for them.
+        if (isJavaVersion(9) || isJavaVersion(10)) {
+            return true;
+        }
+        // Exclude <1.8.0_262, 1.8.0_282) due to https://bugs.openjdk.java.net/browse/JDK-8252904 (fixed
+        // in 8u282)
+        return isJavaVersionBetween(8, 0, 262, 8, 0, 282);
     }
-    // Exclude <1.8.0_262, 1.8.0_282) due to https://bugs.openjdk.java.net/browse/JDK-8252904 (fixed
-    // in 8u282)
-    return isJavaVersionBetween(8, 0, 262, 8, 0, 282);
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-utils/src/main/java/com/datadog/profiling/utils/ProfilingMode.java b/dd-java-agent/agent-profiling/profiling-utils/src/main/java/com/datadog/profiling/utils/ProfilingMode.java
index 114ab8a6124..c97837cbff2 100644
--- a/dd-java-agent/agent-profiling/profiling-utils/src/main/java/com/datadog/profiling/utils/ProfilingMode.java
+++ b/dd-java-agent/agent-profiling/profiling-utils/src/main/java/com/datadog/profiling/utils/ProfilingMode.java
@@ -4,24 +4,24 @@
 
 /** Various profiling modes that can be supported by Datadog profiler */
 public enum ProfilingMode {
-  CPU(1 << 0),
-  WALL(1 << 1),
-  ALLOCATION(1 << 2),
-  MEMLEAK(1 << 3),
-  NATIVEMEM(1 << 4),
-  NATIVESOCKET(1 << 5);
+    CPU(1 << 0),
+    WALL(1 << 1),
+    ALLOCATION(1 << 2),
+    MEMLEAK(1 << 3),
+    NATIVEMEM(1 << 4),
+    NATIVESOCKET(1 << 5);
 
-  public final int bitmask;
+    public final int bitmask;
 
-  ProfilingMode(int bitmask) {
-    this.bitmask = bitmask;
-  }
+    ProfilingMode(int bitmask) {
+        this.bitmask = bitmask;
+    }
 
-  public static int mask(Set<ProfilingMode> modes) {
-    int mask = 0;
-    for (ProfilingMode mode : modes) {
-      mask |= mode.bitmask;
+    public static int mask(Set<ProfilingMode> modes) {
+        int mask = 0;
+        for (ProfilingMode mode : modes) {
+            mask |= mode.bitmask;
+        }
+        return mask;
     }
-    return mask;
-  }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-utils/src/main/java/com/datadog/profiling/utils/Timestamper.java b/dd-java-agent/agent-profiling/profiling-utils/src/main/java/com/datadog/profiling/utils/Timestamper.java
index 8f7fafeb415..2b01aba1e13 100644
--- a/dd-java-agent/agent-profiling/profiling-utils/src/main/java/com/datadog/profiling/utils/Timestamper.java
+++ b/dd-java-agent/agent-profiling/profiling-utils/src/main/java/com/datadog/profiling/utils/Timestamper.java
@@ -5,46 +5,45 @@
 
 public interface Timestamper {
 
-  Timestamper DEFAULT = new Timestamper() {};
-
-  default long timestamp() {
-    return System.nanoTime();
-  }
-
-  default double toNanosConversionFactor() {
-    return 1D;
-  }
-
-  final class Registration {
-    volatile Timestamper pending = Timestamper.DEFAULT;
-    private static final AtomicReferenceFieldUpdater<Registration, Timestamper> UPDATER =
-        AtomicReferenceFieldUpdater.newUpdater(Registration.class, Timestamper.class, "pending");
-
-    private static final Registration INSTANCE = new Registration();
-  }
-
-  /**
-   * One shot chance to override the timestamper, which allows delayed initialisation of the
-   * timestamp source.
-   *
-   * @return whether override was successful
-   */
-  static boolean override(Timestamper timestamper) {
-    return Registration.UPDATER.compareAndSet(
-        Registration.INSTANCE, Timestamper.DEFAULT, timestamper);
-  }
-
-  @SuppressFBWarnings("SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR")
-  final class Singleton {
-    //
-    static final Timestamper TIMESTAMPER = Registration.INSTANCE.pending;
-  }
-
-  /**
-   * Gets the registered timestamper (e.g. using JFR) if one has been registered, otherwise uses the
-   * default timer.
-   */
-  static Timestamper timestamper() {
-    return Singleton.TIMESTAMPER;
-  }
+    Timestamper DEFAULT = new Timestamper() {};
+
+    default long timestamp() {
+        return System.nanoTime();
+    }
+
+    default double toNanosConversionFactor() {
+        return 1D;
+    }
+
+    final class Registration {
+        volatile Timestamper pending = Timestamper.DEFAULT;
+        private static final AtomicReferenceFieldUpdater<Registration, Timestamper> UPDATER =
+                AtomicReferenceFieldUpdater.newUpdater(Registration.class, Timestamper.class, "pending");
+
+        private static final Registration INSTANCE = new Registration();
+    }
+
+    /**
+     * One shot chance to override the timestamper, which allows delayed initialisation of the
+     * timestamp source.
+     *
+     * @return whether override was successful
+     */
+    static boolean override(Timestamper timestamper) {
+        return Registration.UPDATER.compareAndSet(Registration.INSTANCE, Timestamper.DEFAULT, timestamper);
+    }
+
+    @SuppressFBWarnings("SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR")
+    final class Singleton {
+        //
+        static final Timestamper TIMESTAMPER = Registration.INSTANCE.pending;
+    }
+
+    /**
+     * Gets the registered timestamper (e.g. using JFR) if one has been registered, otherwise uses the
+     * default timer.
+     */
+    static Timestamper timestamper() {
+        return Singleton.TIMESTAMPER;
+    }
 }
diff --git a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/CompositeController.java b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/CompositeController.java
index 236bf52b1ae..8f704e67075 100644
--- a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/CompositeController.java
+++ b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/CompositeController.java
@@ -42,224 +42,218 @@
  */
 public class CompositeController implements Controller {
 
-  private static final Logger log = LoggerFactory.getLogger(CompositeController.class);
+    private static final Logger log = LoggerFactory.getLogger(CompositeController.class);
 
-  private final List<Controller> controllers;
+    private final List<Controller> controllers;
 
-  public CompositeController(List<Controller> controllers) {
-    assert !controllers.isEmpty() : "no controllers created";
-    this.controllers = controllers;
-  }
-
-  @VisibleForTesting
-  public List<Controller> getControllers() {
-    return Collections.unmodifiableList(controllers);
-  }
-
-  @Nonnull
-  @Override
-  public OngoingRecording createRecording(
-      @Nonnull String recordingName, ControllerContext.Snapshot context)
-      throws UnsupportedEnvironmentException {
-    List<OngoingRecording> recordings = new ArrayList<>(controllers.size());
-    for (Controller controller : controllers) {
-      recordings.add(controller.createRecording(recordingName, context));
+    public CompositeController(List<Controller> controllers) {
+        assert !controllers.isEmpty() : "no controllers created";
+        this.controllers = controllers;
     }
-    return new CompositeOngoingRecording(recordings);
-  }
-
-  private static class CompositeOngoingRecording implements OngoingRecording {
 
-    private final List<OngoingRecording> recordings;
-
-    private CompositeOngoingRecording(List<OngoingRecording> recordings) {
-      this.recordings = recordings;
+    @VisibleForTesting
+    public List<Controller> getControllers() {
+        return Collections.unmodifiableList(controllers);
     }
 
     @Nonnull
     @Override
-    public RecordingData stop() {
-      return compose(OngoingRecording::stop);
+    public OngoingRecording createRecording(@Nonnull String recordingName, ControllerContext.Snapshot context)
+            throws UnsupportedEnvironmentException {
+        List<OngoingRecording> recordings = new ArrayList<>(controllers.size());
+        for (Controller controller : controllers) {
+            recordings.add(controller.createRecording(recordingName, context));
+        }
+        return new CompositeOngoingRecording(recordings);
     }
 
-    @Nonnull
-    @Override
-    public RecordingData snapshot(@Nonnull Instant start, ProfilingSnapshot.Kind kind) {
-      return compose(recording -> recording.snapshot(start, kind));
-    }
+    private static class CompositeOngoingRecording implements OngoingRecording {
 
-    @Override
-    public void close() {
-      recordings.forEach(OngoingRecording::close);
-    }
+        private final List<OngoingRecording> recordings;
 
-    private RecordingData compose(Function<OngoingRecording, RecordingData> recorder) {
-      return new CompositeRecordingData(
-          recordings.stream().map(recorder).collect(Collectors.toList()));
-    }
-  }
+        private CompositeOngoingRecording(List<OngoingRecording> recordings) {
+            this.recordings = recordings;
+        }
 
-  private static class CompositeRecordingData extends RecordingData {
-    private final List<RecordingData> data;
+        @Nonnull
+        @Override
+        public RecordingData stop() {
+            return compose(OngoingRecording::stop);
+        }
 
-    public CompositeRecordingData(List<RecordingData> data) {
-      super(first(data).getStart(), first(data).getEnd(), first(data).getKind());
-      this.data = data;
-    }
+        @Nonnull
+        @Override
+        public RecordingData snapshot(@Nonnull Instant start, ProfilingSnapshot.Kind kind) {
+            return compose(recording -> recording.snapshot(start, kind));
+        }
 
-    @Nonnull
-    @Override
-    public RecordingInputStream getStream() throws IOException {
-      List<RecordingInputStream> streams = new ArrayList<>(data.size());
-      for (RecordingData item : data) {
-        streams.add(item.getStream());
-      }
-      return new RecordingInputStream(new SequenceInputStream(Collections.enumeration(streams)));
-    }
+        @Override
+        public void close() {
+            recordings.forEach(OngoingRecording::close);
+        }
 
-    @Override
-    public void release() {
-      for (RecordingData data : data) {
-        data.release();
-      }
+        private RecordingData compose(Function<OngoingRecording, RecordingData> recorder) {
+            return new CompositeRecordingData(recordings.stream().map(recorder).collect(Collectors.toList()));
+        }
     }
 
-    @Nonnull
-    @Override
-    public String getName() {
-      return first(data).getName();
-    }
+    private static class CompositeRecordingData extends RecordingData {
+        private final List<RecordingData> data;
 
-    private static <T> T first(List<T> list) {
-      return list.get(0);
-    }
-  }
+        public CompositeRecordingData(List<RecordingData> data) {
+            super(first(data).getStart(), first(data).getEnd(), first(data).getKind());
+            this.data = data;
+        }
 
-  /**
-   * Selects which profiler implementations are relevant for the given environment.
-   *
-   * @param provider
-   * @return a controller
-   */
-  @SuppressForbidden
-  public static Controller build(ConfigProvider provider, ControllerContext context)
-      throws UnsupportedEnvironmentException {
-    List<Controller> controllers = new ArrayList<>();
-    boolean isOracleJDK8 = JavaVirtualMachine.isOracleJDK8();
-    boolean isDatadogProfilerEnabled = Config.get().isDatadogProfilerEnabled();
-    boolean isJfrEnabled =
-        !provider.getBoolean(ProfilingConfig.PROFILING_DEBUG_JFR_DISABLED, false);
-    if (!isJfrEnabled) {
-      log.warn(SEND_TELEMETRY, "JFR is disabled by configuration");
-    } else {
-      if (isOracleJDK8 && !isDatadogProfilerEnabled) {
-        try {
-          Class.forName("com.oracle.jrockit.jfr.Producer");
-          controllers.add(OracleJdkController.instance(provider));
-        } catch (Throwable t) {
-          ProfilerFlareLogger.getInstance().log("Failed to load oracle profiler", t);
+        @Nonnull
+        @Override
+        public RecordingInputStream getStream() throws IOException {
+            List<RecordingInputStream> streams = new ArrayList<>(data.size());
+            for (RecordingData item : data) {
+                streams.add(item.getStream());
+            }
+            return new RecordingInputStream(new SequenceInputStream(Collections.enumeration(streams)));
         }
-      }
-      if (!isOracleJDK8) {
-        try {
-          if (Platform.hasJfr()) {
-            controllers.add(OpenJdkController.instance(provider));
-          } else {
-            ProfilerFlareLogger.getInstance()
-                .log(
-                    "JFR is not available on this platform: {}, {}",
-                    OperatingSystem.type(),
-                    OperatingSystem.architecture());
-          }
-        } catch (Throwable t) {
-          ProfilerFlareLogger.getInstance().log("Failed to load openjdk profiler", t);
+
+        @Override
+        public void release() {
+            for (RecordingData data : data) {
+                data.release();
+            }
+        }
+
+        @Nonnull
+        @Override
+        public String getName() {
+            return first(data).getName();
+        }
+
+        private static <T> T first(List<T> list) {
+            return list.get(0);
         }
-      }
     }
-    // Datadog profiler is not supported in native-image mode or on Windows, so don't try to
-    // instantiate it
-    if ((isLinux() || isMacOs())
-        && isDatadogProfilerEnabled
-        && !(Platform.isNativeImageBuilder() || Platform.isNativeImage())) {
-      try {
-        controllers.add(DatadogProfilerController.instance(provider));
-      } catch (Throwable error) {
-        Throwable rootCause = error.getCause() == null ? error : error.getCause();
-        context.setDatadogProfilerUnavailableReason(rootCause.getMessage());
-        if (!isLinux()) {
-          ProfilerFlareLogger.getInstance()
-              .log("Datadog profiler only supported on Linux", rootCause);
+
+    /**
+     * Selects which profiler implementations are relevant for the given environment.
+     *
+     * @param provider
+     * @return a controller
+     */
+    @SuppressForbidden
+    public static Controller build(ConfigProvider provider, ControllerContext context)
+            throws UnsupportedEnvironmentException {
+        List<Controller> controllers = new ArrayList<>();
+        boolean isOracleJDK8 = JavaVirtualMachine.isOracleJDK8();
+        boolean isDatadogProfilerEnabled = Config.get().isDatadogProfilerEnabled();
+        boolean isJfrEnabled = !provider.getBoolean(ProfilingConfig.PROFILING_DEBUG_JFR_DISABLED, false);
+        if (!isJfrEnabled) {
+            log.warn(SEND_TELEMETRY, "JFR is disabled by configuration");
         } else {
-          ProfilerFlareLogger.getInstance()
-              .log(
-                  "Failed to instantiate Datadog profiler on {} {}",
-                  OperatingSystem.type(),
-                  OperatingSystem.architecture(),
-                  rootCause);
+            if (isOracleJDK8 && !isDatadogProfilerEnabled) {
+                try {
+                    Class.forName("com.oracle.jrockit.jfr.Producer");
+                    controllers.add(OracleJdkController.instance(provider));
+                } catch (Throwable t) {
+                    ProfilerFlareLogger.getInstance().log("Failed to load oracle profiler", t);
+                }
+            }
+            if (!isOracleJDK8) {
+                try {
+                    if (Platform.hasJfr()) {
+                        controllers.add(OpenJdkController.instance(provider));
+                    } else {
+                        ProfilerFlareLogger.getInstance()
+                                .log(
+                                        "JFR is not available on this platform: {}, {}",
+                                        OperatingSystem.type(),
+                                        OperatingSystem.architecture());
+                    }
+                } catch (Throwable t) {
+                    ProfilerFlareLogger.getInstance().log("Failed to load openjdk profiler", t);
+                }
+            }
         }
-      }
-    } else {
-      if (!(isLinux() || isMacOs())) {
-        context.setDatadogProfilerUnavailableReason("unavailable on OS");
-      } else if (Platform.isNativeImageBuilder() || Platform.isNativeImage()) {
-        context.setDatadogProfilerUnavailableReason("unavailable on GraalVM");
-      } else if (!isDatadogProfilerEnabled) {
-        if (!Config.isDatadogProfilerSafeInCurrentEnvironment()) {
-          context.setDatadogProfilerUnavailableReason("not safe in current environment");
+        // Datadog profiler is not supported in native-image mode or on Windows, so don't try to
+        // instantiate it
+        if ((isLinux() || isMacOs())
+                && isDatadogProfilerEnabled
+                && !(Platform.isNativeImageBuilder() || Platform.isNativeImage())) {
+            try {
+                controllers.add(DatadogProfilerController.instance(provider));
+            } catch (Throwable error) {
+                Throwable rootCause = error.getCause() == null ? error : error.getCause();
+                context.setDatadogProfilerUnavailableReason(rootCause.getMessage());
+                if (!isLinux()) {
+                    ProfilerFlareLogger.getInstance().log("Datadog profiler only supported on Linux", rootCause);
+                } else {
+                    ProfilerFlareLogger.getInstance()
+                            .log(
+                                    "Failed to instantiate Datadog profiler on {} {}",
+                                    OperatingSystem.type(),
+                                    OperatingSystem.architecture(),
+                                    rootCause);
+                }
+            }
         } else {
-          context.setDatadogProfilerUnavailableReason("disabled");
+            if (!(isLinux() || isMacOs())) {
+                context.setDatadogProfilerUnavailableReason("unavailable on OS");
+            } else if (Platform.isNativeImageBuilder() || Platform.isNativeImage()) {
+                context.setDatadogProfilerUnavailableReason("unavailable on GraalVM");
+            } else if (!isDatadogProfilerEnabled) {
+                if (!Config.isDatadogProfilerSafeInCurrentEnvironment()) {
+                    context.setDatadogProfilerUnavailableReason("not safe in current environment");
+                } else {
+                    context.setDatadogProfilerUnavailableReason("disabled");
+                }
+            }
         }
-      }
-    }
-    controllers.forEach(controller -> controller.configure(context));
-    if (controllers.isEmpty()) {
-      throw new UnsupportedEnvironmentException(
-          getFixProposalMessage(isDatadogProfilerEnabled, isJfrEnabled));
-    } else if (controllers.size() == 1) {
-      return controllers.get(0);
+        controllers.forEach(controller -> controller.configure(context));
+        if (controllers.isEmpty()) {
+            throw new UnsupportedEnvironmentException(getFixProposalMessage(isDatadogProfilerEnabled, isJfrEnabled));
+        } else if (controllers.size() == 1) {
+            return controllers.get(0);
+        }
+        return new CompositeController(controllers);
     }
-    return new CompositeController(controllers);
-  }
 
-  private static String getFixProposalMessage(boolean datadogProfilerEnabled, boolean jfrEnabled) {
-    if (!datadogProfilerEnabled && !jfrEnabled) {
-      return "Profiling is disabled by configuration. Please, make sure that your configuration is correct.";
-    }
-    final String javaVendor = SystemProperties.getOrDefault("java.vendor", "unknown");
-    final String javaVersion = SystemProperties.getOrDefault("java.version", "unknown");
-    final String javaRuntimeName = SystemProperties.getOrDefault("java.runtime.name", "unknown");
-    final String message =
-        "Not enabling profiling for vendor="
-            + javaVendor
-            + ", version="
-            + javaVersion
-            + ", runtimeName="
-            + javaRuntimeName;
-    try {
-      if (javaVersion == null) {
-        return message;
-      }
-      if (javaVersion.startsWith("1.8")) {
-        if (javaVendor.startsWith("Azul Systems")) {
-          return message + "; it requires Zulu Java 8 (1.8.0_212+).";
+    private static String getFixProposalMessage(boolean datadogProfilerEnabled, boolean jfrEnabled) {
+        if (!datadogProfilerEnabled && !jfrEnabled) {
+            return "Profiling is disabled by configuration. Please, make sure that your configuration is correct.";
         }
-        if (javaVendor.startsWith("Oracle")) {
-          if (javaRuntimeName.startsWith("OpenJDK")) {
-            // this is a upstream build from openjdk docker repository for example
-            return message + "; it requires 1.8.0_272+ OpenJDK builds (upstream)";
-          } else {
-            // this is a proprietary Oracle JRE/JDK 8
-            return message + "; it requires Oracle JRE/JDK 8u40+";
-          }
-        }
-        if (javaRuntimeName.startsWith("OpenJDK")) {
-          return message
-              + "; it requires 1.8.0_272+ OpenJDK builds from the following vendors: AdoptOpenJDK, Eclipse Temurin, Amazon Corretto, Azul Zulu, BellSoft Liberica.";
+        final String javaVendor = SystemProperties.getOrDefault("java.vendor", "unknown");
+        final String javaVersion = SystemProperties.getOrDefault("java.version", "unknown");
+        final String javaRuntimeName = SystemProperties.getOrDefault("java.runtime.name", "unknown");
+        final String message = "Not enabling profiling for vendor="
+                + javaVendor
+                + ", version="
+                + javaVersion
+                + ", runtimeName="
+                + javaRuntimeName;
+        try {
+            if (javaVersion == null) {
+                return message;
+            }
+            if (javaVersion.startsWith("1.8")) {
+                if (javaVendor.startsWith("Azul Systems")) {
+                    return message + "; it requires Zulu Java 8 (1.8.0_212+).";
+                }
+                if (javaVendor.startsWith("Oracle")) {
+                    if (javaRuntimeName.startsWith("OpenJDK")) {
+                        // this is a upstream build from openjdk docker repository for example
+                        return message + "; it requires 1.8.0_272+ OpenJDK builds (upstream)";
+                    } else {
+                        // this is a proprietary Oracle JRE/JDK 8
+                        return message + "; it requires Oracle JRE/JDK 8u40+";
+                    }
+                }
+                if (javaRuntimeName.startsWith("OpenJDK")) {
+                    return message
+                            + "; it requires 1.8.0_272+ OpenJDK builds from the following vendors: AdoptOpenJDK, Eclipse Temurin, Amazon Corretto, Azul Zulu, BellSoft Liberica.";
+                }
+            }
+            return message + "; it requires OpenJDK 11+, Oracle Java 11+, or Zulu Java 8 (1.8.0_212+).";
+        } catch (final Exception ex) {
+            return message;
         }
-      }
-      return message + "; it requires OpenJDK 11+, Oracle Java 11+, or Zulu Java 8 (1.8.0_212+).";
-    } catch (final Exception ex) {
-      return message;
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProcessContext.java b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProcessContext.java
index cb8fa303ad7..275f85c68f0 100644
--- a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProcessContext.java
+++ b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProcessContext.java
@@ -10,35 +10,34 @@
 import org.slf4j.LoggerFactory;
 
 public final class ProcessContext {
-  private static final Logger log = LoggerFactory.getLogger(ProcessContext.class.getName());
+    private static final Logger log = LoggerFactory.getLogger(ProcessContext.class.getName());
 
-  public static void register(ConfigProvider configProvider) {
-    if (configProvider.getBoolean(
-        ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED,
-        ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED_DEFAULT)) {
-      log.info("Registering process context for OTel profiler");
-      DdprofLibraryLoader.OTelContextHolder holder = DdprofLibraryLoader.otelContext();
-      Throwable err = holder.getReasonNotLoaded();
-      if (err == null) {
-        Config cfg = Config.get();
-        // Publish the thread-context attribute keys together with the process context so the
-        // very first published context already carries the attribute_key_map. The order must
-        // match what DatadogProfiler passes to the native attributes= argument and the
-        // per-thread ContextSetter, so external readers can decode the thread-local record.
-        List<String> attributeKeys = DatadogProfiler.getOrderedContextAttributes(configProvider);
-        holder
-            .getComponent()
-            .initializeAllContext(
-                cfg.getEnv(),
-                cfg.getHostName(),
-                cfg.getRuntimeId(),
-                cfg.getServiceName(),
-                cfg.getRuntimeVersion(),
-                cfg.getVersion(),
-                attributeKeys.toArray(new String[0]));
-      } else {
-        log.warn("Failed to register process context for OTel profiler", err);
-      }
+    public static void register(ConfigProvider configProvider) {
+        if (configProvider.getBoolean(
+                ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED,
+                ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED_DEFAULT)) {
+            log.info("Registering process context for OTel profiler");
+            DdprofLibraryLoader.OTelContextHolder holder = DdprofLibraryLoader.otelContext();
+            Throwable err = holder.getReasonNotLoaded();
+            if (err == null) {
+                Config cfg = Config.get();
+                // Publish the thread-context attribute keys together with the process context so the
+                // very first published context already carries the attribute_key_map. The order must
+                // match what DatadogProfiler passes to the native attributes= argument and the
+                // per-thread ContextSetter, so external readers can decode the thread-local record.
+                List<String> attributeKeys = DatadogProfiler.getOrderedContextAttributes(configProvider);
+                holder.getComponent()
+                        .initializeAllContext(
+                                cfg.getEnv(),
+                                cfg.getHostName(),
+                                cfg.getRuntimeId(),
+                                cfg.getServiceName(),
+                                cfg.getRuntimeVersion(),
+                                cfg.getVersion(),
+                                attributeKeys.toArray(new String[0]));
+            } else {
+                log.warn("Failed to register process context for OTel profiler", err);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java
index 9175e0bc40f..da70d5c4f05 100644
--- a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java
+++ b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java
@@ -48,220 +48,213 @@
 /** Profiling agent implementation */
 public class ProfilingAgent {
 
-  private static final Logger log = LoggerFactory.getLogger(ProfilingAgent.class);
-
-  private static final Predicate<String> API_KEY_REGEX =
-      Pattern.compile("^[0-9a-fA-F]{32}$").asPredicate();
-
-  private static volatile ProfilingSystem profiler;
-  private static volatile ProfileUploader uploader;
-
-  private static class DataDumper implements RecordingDataListener {
-    private final Path path;
+    private static final Logger log = LoggerFactory.getLogger(ProfilingAgent.class);
+
+    private static final Predicate<String> API_KEY_REGEX =
+            Pattern.compile("^[0-9a-fA-F]{32}$").asPredicate();
+
+    private static volatile ProfilingSystem profiler;
+    private static volatile ProfileUploader uploader;
+
+    private static class DataDumper implements RecordingDataListener {
+        private final Path path;
+
+        DataDumper(Path path) {
+            if (Files.notExists(path)) {
+                try {
+                    Files.createDirectories(path);
+                } catch (IOException e) {
+                    log.warn("Unable to crate the debug profile dump directory", e);
+                    this.path = null;
+                    return;
+                }
+            }
+            if (!Files.isDirectory(path)) {
+                log.warn("Profiler debug dump path must be an existing directory");
+                this.path = null;
+            } else {
+                this.path = path;
+            }
+        }
 
-    DataDumper(Path path) {
-      if (Files.notExists(path)) {
-        try {
-          Files.createDirectories(path);
-        } catch (IOException e) {
-          log.warn("Unable to crate the debug profile dump directory", e);
-          this.path = null;
-          return;
+        @Override
+        public void onNewData(RecordingType type, RecordingData data, boolean handleSynchronously) {
+            if (path == null) {
+                return;
+            }
+            try {
+                Path tmp = Files.createTempFile(path, "dd-profiler-debug-", ".jfr");
+                Files.copy(data.getStream(), tmp, StandardCopyOption.REPLACE_EXISTING);
+                log.debug("Debug profile stored as {}", tmp);
+            } catch (IOException e) {
+                log.debug("Unable to write debug profile dump", e);
+            }
         }
-      }
-      if (!Files.isDirectory(path)) {
-        log.warn("Profiler debug dump path must be an existing directory");
-        this.path = null;
-      } else {
-        this.path = path;
-      }
     }
 
-    @Override
-    public void onNewData(RecordingType type, RecordingData data, boolean handleSynchronously) {
-      if (path == null) {
-        return;
-      }
-      try {
-        Path tmp = Files.createTempFile(path, "dd-profiler-debug-", ".jfr");
-        Files.copy(data.getStream(), tmp, StandardCopyOption.REPLACE_EXISTING);
-        log.debug("Debug profile stored as {}", tmp);
-      } catch (IOException e) {
-        log.debug("Unable to write debug profile dump", e);
-      }
-    }
-  }
-
-  /**
-   * Main entry point into profiling Note: this must be reentrant because we may want to start
-   * profiling before any other tool, and then attempt to start it again at normal time
-   */
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification =
-          "Agent-internal class; Class object does not escape to app code and lock only guards reentrant one-time profiler startup.")
-  public static synchronized boolean run(final boolean earlyStart, Instrumentation inst)
-      throws IllegalArgumentException, IOException {
-    if (profiler == null) {
-      final Config config = Config.get();
-      final ConfigProvider configProvider = ConfigProvider.getInstance();
-
-      // Register the profiler flare before we start the profiling system, but early during the
-      // profiler lifecycle
-      ProfilerFlareReporter.register();
-      ProcessContext.register(configProvider);
-
-      boolean startForceFirst =
-          Platform.isNativeImage()
-              || configProvider.getBoolean(
-                  PROFILING_START_FORCE_FIRST, PROFILING_START_FORCE_FIRST_DEFAULT);
-
-      if (!isStartForceFirstSafe()) {
-        log.debug(
-            "Starting profiling in premain can lead to crashes in this JDK. Delaying the startup.");
-        startForceFirst = false;
-      }
-
-      if (earlyStart && !startForceFirst) {
-        log.debug("Profiling: not starting first");
-        // early startup is disabled;
-        return true;
-      }
-      if (!config.isProfilingEnabled()) {
-        log.debug(SEND_TELEMETRY, "Profiling: disabled");
-        return false;
-      }
-      if (config.getApiKey() != null && !API_KEY_REGEX.test(config.getApiKey())) {
-        log.info(
-            "Profiling: API key doesn't match expected format, expected to get a 32 character hex string. Profiling is disabled.");
-        return false;
-      }
-
-      try {
-        JFRAccess.setup(inst);
-        Timestamper.override(JFRAccess.instance());
-        ControllerContext context = new ControllerContext();
-        final Controller controller = CompositeController.build(configProvider, context);
-
-        String dumpPath = configProvider.getString(ProfilingConfig.PROFILING_DEBUG_DUMP_PATH);
-        DataDumper dumper = dumpPath != null ? new DataDumper(Paths.get(dumpPath)) : null;
-
-        uploader = new ProfileUploader(config, configProvider);
-
-        RecordingDataListener listener = uploader::upload;
-        if (dumper != null) {
-          RecordingDataListener upload = listener;
-          listener =
-              (type, data, sync) -> {
-                dumper.onNewData(type, data, sync);
-                upload.onNewData(type, data, sync);
-              };
-        }
-        // Scrubber wraps the combined dumper+uploader so debug dumps also contain scrubbed data
-        // Oracle JDK 8 JFR format has quirks that make scrubbing unreliable — skip it to avoid
-        // corrupting customer data
-        if (configProvider.getBoolean(PROFILING_SCRUB_ENABLED, PROFILING_SCRUB_ENABLED_DEFAULT)
-            && !isOracleJDK8()) {
-          List<String> excludeEventTypes =
-              configProvider.getList(ProfilingConfig.PROFILING_SCRUB_EXCLUDE_EVENTS);
-          boolean failOpen =
-              configProvider.getBoolean(
-                  PROFILING_SCRUB_FAIL_OPEN, PROFILING_SCRUB_FAIL_OPEN_DEFAULT);
-          listener = wrapWithScrubber(listener, excludeEventTypes, failOpen);
+    /**
+     * Main entry point into profiling Note: this must be reentrant because we may want to start
+     * profiling before any other tool, and then attempt to start it again at normal time
+     */
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification =
+                    "Agent-internal class; Class object does not escape to app code and lock only guards reentrant one-time profiler startup.")
+    public static synchronized boolean run(final boolean earlyStart, Instrumentation inst)
+            throws IllegalArgumentException, IOException {
+        if (profiler == null) {
+            final Config config = Config.get();
+            final ConfigProvider configProvider = ConfigProvider.getInstance();
+
+            // Register the profiler flare before we start the profiling system, but early during the
+            // profiler lifecycle
+            ProfilerFlareReporter.register();
+            ProcessContext.register(configProvider);
+
+            boolean startForceFirst = Platform.isNativeImage()
+                    || configProvider.getBoolean(PROFILING_START_FORCE_FIRST, PROFILING_START_FORCE_FIRST_DEFAULT);
+
+            if (!isStartForceFirstSafe()) {
+                log.debug("Starting profiling in premain can lead to crashes in this JDK. Delaying the startup.");
+                startForceFirst = false;
+            }
+
+            if (earlyStart && !startForceFirst) {
+                log.debug("Profiling: not starting first");
+                // early startup is disabled;
+                return true;
+            }
+            if (!config.isProfilingEnabled()) {
+                log.debug(SEND_TELEMETRY, "Profiling: disabled");
+                return false;
+            }
+            if (config.getApiKey() != null && !API_KEY_REGEX.test(config.getApiKey())) {
+                log.info(
+                        "Profiling: API key doesn't match expected format, expected to get a 32 character hex string. Profiling is disabled.");
+                return false;
+            }
+
+            try {
+                JFRAccess.setup(inst);
+                Timestamper.override(JFRAccess.instance());
+                ControllerContext context = new ControllerContext();
+                final Controller controller = CompositeController.build(configProvider, context);
+
+                String dumpPath = configProvider.getString(ProfilingConfig.PROFILING_DEBUG_DUMP_PATH);
+                DataDumper dumper = dumpPath != null ? new DataDumper(Paths.get(dumpPath)) : null;
+
+                uploader = new ProfileUploader(config, configProvider);
+
+                RecordingDataListener listener = uploader::upload;
+                if (dumper != null) {
+                    RecordingDataListener upload = listener;
+                    listener = (type, data, sync) -> {
+                        dumper.onNewData(type, data, sync);
+                        upload.onNewData(type, data, sync);
+                    };
+                }
+                // Scrubber wraps the combined dumper+uploader so debug dumps also contain scrubbed data
+                // Oracle JDK 8 JFR format has quirks that make scrubbing unreliable — skip it to avoid
+                // corrupting customer data
+                if (configProvider.getBoolean(PROFILING_SCRUB_ENABLED, PROFILING_SCRUB_ENABLED_DEFAULT)
+                        && !isOracleJDK8()) {
+                    List<String> excludeEventTypes =
+                            configProvider.getList(ProfilingConfig.PROFILING_SCRUB_EXCLUDE_EVENTS);
+                    boolean failOpen =
+                            configProvider.getBoolean(PROFILING_SCRUB_FAIL_OPEN, PROFILING_SCRUB_FAIL_OPEN_DEFAULT);
+                    listener = wrapWithScrubber(listener, excludeEventTypes, failOpen);
+                }
+
+                final Duration startupDelay = Duration.ofSeconds(config.getProfilingStartDelay());
+                final Duration uploadPeriod = Duration.ofSeconds(config.getProfilingUploadPeriod());
+
+                // Randomize startup delay for up to one upload period. Consider having separate setting for
+                // this in the future
+                final Duration startupDelayRandomRange = uploadPeriod;
+
+                profiler = new ProfilingSystem(
+                        configProvider,
+                        controller,
+                        context.snapshot(),
+                        listener,
+                        startupDelay,
+                        startupDelayRandomRange,
+                        uploadPeriod,
+                        startForceFirst);
+                profiler.start();
+                log.debug("Profiling has started");
+
+                try {
+                    /*
+                    Note: shutdown hooks are tricky because JVM holds reference for them forever preventing
+                    GC for anything that is reachable from it.
+                    This means that if/when we implement functionality to manually shutdown profiler we would
+                    need to not forget to add code that removes this shutdown hook from JVM.
+                     */
+                    Runtime.getRuntime().addShutdownHook(new ShutdownHook(profiler, uploader));
+                } catch (final IllegalStateException ex) {
+                    // The JVM is already shutting down.
+                }
+            } catch (final UnsupportedEnvironmentException | ConfigurationException e) {
+                ProfilerFlareLogger.getInstance().log("Failed to initialize profiling agent!", e);
+                ProfilerFlareReporter.reportInitializationException(e);
+            }
         }
+        return false;
+    }
 
-        final Duration startupDelay = Duration.ofSeconds(config.getProfilingStartDelay());
-        final Duration uploadPeriod = Duration.ofSeconds(config.getProfilingUploadPeriod());
-
-        // Randomize startup delay for up to one upload period. Consider having separate setting for
-        // this in the future
-        final Duration startupDelayRandomRange = uploadPeriod;
-
-        profiler =
-            new ProfilingSystem(
-                configProvider,
-                controller,
-                context.snapshot(),
-                listener,
-                startupDelay,
-                startupDelayRandomRange,
-                uploadPeriod,
-                startForceFirst);
-        profiler.start();
-        log.debug("Profiling has started");
-
+    private static RecordingDataListener wrapWithScrubber(
+            RecordingDataListener listener, List<String> excludeEventTypes, boolean failOpen) {
         try {
-          /*
-          Note: shutdown hooks are tricky because JVM holds reference for them forever preventing
-          GC for anything that is reachable from it.
-          This means that if/when we implement functionality to manually shutdown profiler we would
-          need to not forget to add code that removes this shutdown hook from JVM.
-           */
-          Runtime.getRuntime().addShutdownHook(new ShutdownHook(profiler, uploader));
-        } catch (final IllegalStateException ex) {
-          // The JVM is already shutting down.
+            return ScrubRecordingDataListener.wrap(listener, excludeEventTypes, failOpen);
+        } catch (Exception e) {
+            log.warn(SEND_TELEMETRY, "Failed to initialize JFR scrubber", e);
+            return listener;
         }
-      } catch (final UnsupportedEnvironmentException | ConfigurationException e) {
-        ProfilerFlareLogger.getInstance().log("Failed to initialize profiling agent!", e);
-        ProfilerFlareReporter.reportInitializationException(e);
-      }
     }
-    return false;
-  }
-
-  private static RecordingDataListener wrapWithScrubber(
-      RecordingDataListener listener, List<String> excludeEventTypes, boolean failOpen) {
-    try {
-      return ScrubRecordingDataListener.wrap(listener, excludeEventTypes, failOpen);
-    } catch (Exception e) {
-      log.warn(SEND_TELEMETRY, "Failed to initialize JFR scrubber", e);
-      return listener;
+
+    private static boolean isStartForceFirstSafe() {
+        return isJavaVersionAtLeast(14)
+                || (isJavaVersion(13) && isJavaVersionAtLeast(13, 0, 4))
+                || (isJavaVersion(11) && isJavaVersionAtLeast(11, 0, 8));
+    }
+
+    public static void shutdown() {
+        shutdown(profiler, uploader, false);
     }
-  }
-
-  private static boolean isStartForceFirstSafe() {
-    return isJavaVersionAtLeast(14)
-        || (isJavaVersion(13) && isJavaVersionAtLeast(13, 0, 4))
-        || (isJavaVersion(11) && isJavaVersionAtLeast(11, 0, 8));
-  }
-
-  public static void shutdown() {
-    shutdown(profiler, uploader, false);
-  }
-
-  public static void shutdown(boolean snapshot) {
-    shutdown(profiler, uploader, snapshot);
-  }
-
-  private static final AtomicBoolean shutDownFlag = new AtomicBoolean();
-
-  private static void shutdown(
-      ProfilingSystem profiler, ProfileUploader uploader, boolean snapshot) {
-    if (shutDownFlag.compareAndSet(false, true)) {
-      if (profiler != null) {
-        profiler.shutdown(snapshot);
-      }
-
-      if (uploader != null) {
-        uploader.shutdown();
-      }
+
+    public static void shutdown(boolean snapshot) {
+        shutdown(profiler, uploader, snapshot);
     }
-  }
 
-  private static class ShutdownHook extends Thread {
+    private static final AtomicBoolean shutDownFlag = new AtomicBoolean();
 
-    private final WeakReference<ProfilingSystem> profilerRef;
-    private final WeakReference<ProfileUploader> uploaderRef;
+    private static void shutdown(ProfilingSystem profiler, ProfileUploader uploader, boolean snapshot) {
+        if (shutDownFlag.compareAndSet(false, true)) {
+            if (profiler != null) {
+                profiler.shutdown(snapshot);
+            }
 
-    private ShutdownHook(final ProfilingSystem profiler, final ProfileUploader uploader) {
-      super(AGENT_THREAD_GROUP, "dd-profiler-shutdown-hook");
-      profilerRef = new WeakReference<>(profiler);
-      uploaderRef = new WeakReference<>(uploader);
+            if (uploader != null) {
+                uploader.shutdown();
+            }
+        }
     }
 
-    @Override
-    public void run() {
-      shutdown(profilerRef.get(), uploaderRef.get(), false);
+    private static class ShutdownHook extends Thread {
+
+        private final WeakReference<ProfilingSystem> profilerRef;
+        private final WeakReference<ProfileUploader> uploaderRef;
+
+        private ShutdownHook(final ProfilingSystem profiler, final ProfileUploader uploader) {
+            super(AGENT_THREAD_GROUP, "dd-profiler-shutdown-hook");
+            profilerRef = new WeakReference<>(profiler);
+            uploaderRef = new WeakReference<>(uploader);
+        }
+
+        @Override
+        public void run() {
+            shutdown(profilerRef.get(), uploaderRef.get(), false);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ScrubRecordingDataListener.java b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ScrubRecordingDataListener.java
index 211d0e23c64..5097bde3571 100644
--- a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ScrubRecordingDataListener.java
+++ b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ScrubRecordingDataListener.java
@@ -26,136 +26,133 @@
  * ddprof), the existing file is used directly as scrub input to avoid stream materialization.
  */
 final class ScrubRecordingDataListener implements RecordingDataListener {
-  private static final Logger log = LoggerFactory.getLogger(ScrubRecordingDataListener.class);
-  private static final Path SCRUB_SUBDIR = Paths.get("scrub");
-
-  private final RecordingDataListener delegate;
-  private final JfrScrubber scrubber;
-  private final boolean failOpen;
-  private final Path tempDirOverride;
-
-  /** Wraps {@code delegate} with a scrubbing listener. Called from {@link ProfilingAgent}. */
-  static RecordingDataListener wrap(
-      RecordingDataListener delegate, List<String> excludeEventTypes, boolean failOpen) {
-    return new ScrubRecordingDataListener(
-        delegate, DefaultScrubDefinition.create(excludeEventTypes), failOpen);
-  }
-
-  ScrubRecordingDataListener(
-      RecordingDataListener delegate, JfrScrubber scrubber, boolean failOpen) {
-    this(delegate, scrubber, failOpen, null);
-  }
-
-  @VisibleForTesting
-  ScrubRecordingDataListener(
-      RecordingDataListener delegate, JfrScrubber scrubber, boolean failOpen, Path tempDir) {
-    this.delegate = delegate;
-    this.scrubber = scrubber;
-    this.failOpen = failOpen;
-    this.tempDirOverride = tempDir;
-  }
-
-  private Path getTempDir() {
-    if (tempDirOverride != null) {
-      return tempDirOverride;
+    private static final Logger log = LoggerFactory.getLogger(ScrubRecordingDataListener.class);
+    private static final Path SCRUB_SUBDIR = Paths.get("scrub");
+
+    private final RecordingDataListener delegate;
+    private final JfrScrubber scrubber;
+    private final boolean failOpen;
+    private final Path tempDirOverride;
+
+    /** Wraps {@code delegate} with a scrubbing listener. Called from {@link ProfilingAgent}. */
+    static RecordingDataListener wrap(
+            RecordingDataListener delegate, List<String> excludeEventTypes, boolean failOpen) {
+        return new ScrubRecordingDataListener(delegate, DefaultScrubDefinition.create(excludeEventTypes), failOpen);
     }
-    return TempLocationManager.getInstance().getTempDir(SCRUB_SUBDIR);
-  }
-
-  @Override
-  public void onNewData(RecordingType type, RecordingData data, boolean handleSynchronously) {
-    Path tempInput = null;
-    Path tempOutput = null;
-    try {
-      Path tempDir = getTempDir();
-      // Use the existing file path when available (eg. ddprof), otherwise materialize the stream
-      Path inputPath = data.getPath();
-
-      if (inputPath == null) {
-        tempInput = Files.createTempFile(tempDir, "dd-scrub-in-", ".jfr");
-        try (RecordingInputStream in = data.getStream()) {
-          Files.copy(in, tempInput, StandardCopyOption.REPLACE_EXISTING);
-        }
-        inputPath = tempInput;
-      }
-
-      tempOutput = Files.createTempFile(tempDir, "dd-scrub-out-", ".jfr");
-      scrubber.scrubFile(inputPath, tempOutput);
-
-      if (tempInput != null) {
-        Files.deleteIfExists(tempInput);
-        tempInput = null;
-      }
-
-      ScrubbedRecordingData scrubbed = new ScrubbedRecordingData(data, tempOutput);
-      tempOutput = null; // ownership transferred to ScrubbedRecordingData
-      // Release the original recording eagerly — the scrubbed copy is now the source of truth.
-      // The delegate will call release() on ScrubbedRecordingData to clean up the output file.
-      data.release();
-      data = null; // prevent fail-open from passing released data to delegate
-      delegate.onNewData(type, scrubbed, handleSynchronously);
-    } catch (Exception e) {
-      cleanupQuietly(tempInput);
-      cleanupQuietly(tempOutput);
-      if (data == null) {
-        // Original data was already released and delegate was invoked — this is a delegate failure.
-        // Nothing more we can do; rethrow so the caller sees it.
-        throw e instanceof RuntimeException ? (RuntimeException) e : new RuntimeException(e);
-      } else if (failOpen) {
-        log.warn(SEND_TELEMETRY, "JFR scrubbing failed, uploading unscrubbed data", e);
-        delegate.onNewData(type, data, handleSynchronously);
-      } else {
-        log.error(SEND_TELEMETRY, "JFR scrubbing failed, skipping upload", e);
-        data.release();
-      }
-    }
-  }
-
-  private static void cleanupQuietly(Path path) {
-    if (path != null) {
-      try {
-        Files.deleteIfExists(path);
-      } catch (IOException ignored) {
-        // best effort
-      }
-    }
-  }
 
-  /** File-backed {@link RecordingData} wrapping a scrubbed output file. */
-  static final class ScrubbedRecordingData extends RecordingData {
-    private final String name;
-    private final Path scrubbedFile;
+    ScrubRecordingDataListener(RecordingDataListener delegate, JfrScrubber scrubber, boolean failOpen) {
+        this(delegate, scrubber, failOpen, null);
+    }
 
-    ScrubbedRecordingData(RecordingData original, Path scrubbedFile) {
-      super(original.getStart(), original.getEnd(), original.getKind());
-      this.name = original.getName();
-      this.scrubbedFile = scrubbedFile;
+    @VisibleForTesting
+    ScrubRecordingDataListener(RecordingDataListener delegate, JfrScrubber scrubber, boolean failOpen, Path tempDir) {
+        this.delegate = delegate;
+        this.scrubber = scrubber;
+        this.failOpen = failOpen;
+        this.tempDirOverride = tempDir;
     }
 
-    @Nonnull
-    @Override
-    public RecordingInputStream getStream() throws IOException {
-      return new RecordingInputStream(Files.newInputStream(scrubbedFile));
+    private Path getTempDir() {
+        if (tempDirOverride != null) {
+            return tempDirOverride;
+        }
+        return TempLocationManager.getInstance().getTempDir(SCRUB_SUBDIR);
     }
 
     @Override
-    public void release() {
-      try {
-        Files.deleteIfExists(scrubbedFile);
-      } catch (IOException e) {
-        log.debug("Failed to clean up scrubbed recording file: {}", scrubbedFile, e);
-      }
+    public void onNewData(RecordingType type, RecordingData data, boolean handleSynchronously) {
+        Path tempInput = null;
+        Path tempOutput = null;
+        try {
+            Path tempDir = getTempDir();
+            // Use the existing file path when available (eg. ddprof), otherwise materialize the stream
+            Path inputPath = data.getPath();
+
+            if (inputPath == null) {
+                tempInput = Files.createTempFile(tempDir, "dd-scrub-in-", ".jfr");
+                try (RecordingInputStream in = data.getStream()) {
+                    Files.copy(in, tempInput, StandardCopyOption.REPLACE_EXISTING);
+                }
+                inputPath = tempInput;
+            }
+
+            tempOutput = Files.createTempFile(tempDir, "dd-scrub-out-", ".jfr");
+            scrubber.scrubFile(inputPath, tempOutput);
+
+            if (tempInput != null) {
+                Files.deleteIfExists(tempInput);
+                tempInput = null;
+            }
+
+            ScrubbedRecordingData scrubbed = new ScrubbedRecordingData(data, tempOutput);
+            tempOutput = null; // ownership transferred to ScrubbedRecordingData
+            // Release the original recording eagerly — the scrubbed copy is now the source of truth.
+            // The delegate will call release() on ScrubbedRecordingData to clean up the output file.
+            data.release();
+            data = null; // prevent fail-open from passing released data to delegate
+            delegate.onNewData(type, scrubbed, handleSynchronously);
+        } catch (Exception e) {
+            cleanupQuietly(tempInput);
+            cleanupQuietly(tempOutput);
+            if (data == null) {
+                // Original data was already released and delegate was invoked — this is a delegate failure.
+                // Nothing more we can do; rethrow so the caller sees it.
+                throw e instanceof RuntimeException ? (RuntimeException) e : new RuntimeException(e);
+            } else if (failOpen) {
+                log.warn(SEND_TELEMETRY, "JFR scrubbing failed, uploading unscrubbed data", e);
+                delegate.onNewData(type, data, handleSynchronously);
+            } else {
+                log.error(SEND_TELEMETRY, "JFR scrubbing failed, skipping upload", e);
+                data.release();
+            }
+        }
     }
 
-    @Nonnull
-    @Override
-    public String getName() {
-      return name;
+    private static void cleanupQuietly(Path path) {
+        if (path != null) {
+            try {
+                Files.deleteIfExists(path);
+            } catch (IOException ignored) {
+                // best effort
+            }
+        }
     }
 
-    @Override
-    public Path getPath() {
-      return scrubbedFile;
+    /** File-backed {@link RecordingData} wrapping a scrubbed output file. */
+    static final class ScrubbedRecordingData extends RecordingData {
+        private final String name;
+        private final Path scrubbedFile;
+
+        ScrubbedRecordingData(RecordingData original, Path scrubbedFile) {
+            super(original.getStart(), original.getEnd(), original.getKind());
+            this.name = original.getName();
+            this.scrubbedFile = scrubbedFile;
+        }
+
+        @Nonnull
+        @Override
+        public RecordingInputStream getStream() throws IOException {
+            return new RecordingInputStream(Files.newInputStream(scrubbedFile));
+        }
+
+        @Override
+        public void release() {
+            try {
+                Files.deleteIfExists(scrubbedFile);
+            } catch (IOException e) {
+                log.debug("Failed to clean up scrubbed recording file: {}", scrubbedFile, e);
+            }
+        }
+
+        @Nonnull
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        @Override
+        public Path getPath() {
+            return scrubbedFile;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/src/test/java/com/datadog/profiling/agent/CompositeControllerTest.java b/dd-java-agent/agent-profiling/src/test/java/com/datadog/profiling/agent/CompositeControllerTest.java
index 2be200296ab..7b0704ad3f2 100644
--- a/dd-java-agent/agent-profiling/src/test/java/com/datadog/profiling/agent/CompositeControllerTest.java
+++ b/dd-java-agent/agent-profiling/src/test/java/com/datadog/profiling/agent/CompositeControllerTest.java
@@ -10,44 +10,43 @@
 /** Note: some additional tests for this class are located in profiling-controller-openjdk module */
 public class CompositeControllerTest {
 
-  @Test
-  public void smokeTest() {
-    UnsupportedEnvironmentException unsupportedEnvironmentException = null;
-    try {
-      CompositeController.build(ConfigProvider.getInstance(), new ControllerContext());
-      // successfully created controller, return
-      return;
-    } catch (UnsupportedEnvironmentException e) {
-      unsupportedEnvironmentException = e;
+    @Test
+    public void smokeTest() {
+        UnsupportedEnvironmentException unsupportedEnvironmentException = null;
+        try {
+            CompositeController.build(ConfigProvider.getInstance(), new ControllerContext());
+            // successfully created controller, return
+            return;
+        } catch (UnsupportedEnvironmentException e) {
+            unsupportedEnvironmentException = e;
+        }
+        final String javaVendor = System.getProperty("java.vendor");
+        final String javaRuntimeName = System.getProperty("java.runtime.name");
+        final String javaVersion = System.getProperty("java.version");
+        String expected = "Not enabling profiling for vendor="
+                + javaVendor
+                + ", version="
+                + javaVersion
+                + ", runtimeName="
+                + javaRuntimeName
+                + "; it requires ";
+        if (javaVendor.equals("Azul Systems, Inc.")) {
+            expected += "Zulu Java 8 (1.8.0_212+).";
+        } else if (javaVendor.equals("Oracle Corporation") && !javaRuntimeName.startsWith("OpenJDK")) {
+            // condition for Oracle JDK 8 (with proprietary JFR inside)
+            expected += "Oracle JRE/JDK 8u40+";
+        } else if (javaVendor.equals("Oracle Corporation") && javaRuntimeName.startsWith("OpenJDK")) {
+            // condition for Oracle OpenJDK 8 (with open JFR inside)
+            expected += "1.8.0_272+ OpenJDK builds (upstream)";
+        } else if (javaRuntimeName.startsWith("OpenJDK")) {
+            expected +=
+                    "1.8.0_272+ OpenJDK builds from the following vendors: AdoptOpenJDK, Eclipse Temurin, Amazon Corretto, Azul Zulu, BellSoft Liberica.";
+        } else {
+            expected += "OpenJDK 11+, Oracle Java 11+, or Zulu Java 8 (1.8.0_212+).";
+        }
+        assertEquals(
+                expected,
+                unsupportedEnvironmentException.getMessage(),
+                "'" + javaRuntimeName + "' / '" + javaVendor + "' / '" + javaVersion + "'");
     }
-    final String javaVendor = System.getProperty("java.vendor");
-    final String javaRuntimeName = System.getProperty("java.runtime.name");
-    final String javaVersion = System.getProperty("java.version");
-    String expected =
-        "Not enabling profiling for vendor="
-            + javaVendor
-            + ", version="
-            + javaVersion
-            + ", runtimeName="
-            + javaRuntimeName
-            + "; it requires ";
-    if (javaVendor.equals("Azul Systems, Inc.")) {
-      expected += "Zulu Java 8 (1.8.0_212+).";
-    } else if (javaVendor.equals("Oracle Corporation") && !javaRuntimeName.startsWith("OpenJDK")) {
-      // condition for Oracle JDK 8 (with proprietary JFR inside)
-      expected += "Oracle JRE/JDK 8u40+";
-    } else if (javaVendor.equals("Oracle Corporation") && javaRuntimeName.startsWith("OpenJDK")) {
-      // condition for Oracle OpenJDK 8 (with open JFR inside)
-      expected += "1.8.0_272+ OpenJDK builds (upstream)";
-    } else if (javaRuntimeName.startsWith("OpenJDK")) {
-      expected +=
-          "1.8.0_272+ OpenJDK builds from the following vendors: AdoptOpenJDK, Eclipse Temurin, Amazon Corretto, Azul Zulu, BellSoft Liberica.";
-    } else {
-      expected += "OpenJDK 11+, Oracle Java 11+, or Zulu Java 8 (1.8.0_212+).";
-    }
-    assertEquals(
-        expected,
-        unsupportedEnvironmentException.getMessage(),
-        "'" + javaRuntimeName + "' / '" + javaVendor + "' / '" + javaVersion + "'");
-  }
 }
diff --git a/dd-java-agent/agent-profiling/src/test/java/com/datadog/profiling/agent/ProcessContextTest.java b/dd-java-agent/agent-profiling/src/test/java/com/datadog/profiling/agent/ProcessContextTest.java
index 9e5013831e2..a95e2485784 100644
--- a/dd-java-agent/agent-profiling/src/test/java/com/datadog/profiling/agent/ProcessContextTest.java
+++ b/dd-java-agent/agent-profiling/src/test/java/com/datadog/profiling/agent/ProcessContextTest.java
@@ -35,169 +35,165 @@
  */
 class ProcessContextTest {
 
-  @Test
-  void testRegisterSetsProcessContextValues() {
-    ConfigProvider configProvider = mock(ConfigProvider.class);
-    when(configProvider.getBoolean(
-            eq(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED),
-            eq(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED_DEFAULT)))
-        .thenReturn(true);
-    when(configProvider.getSet(eq(ProfilingConfig.PROFILING_CONTEXT_ATTRIBUTES), any()))
-        .thenReturn(new LinkedHashSet<>(Arrays.asList("http.route", "db.system")));
-
-    Config config = mock(Config.class);
-    when(config.getEnv()).thenReturn("test-env");
-    when(config.getHostName()).thenReturn("test-host");
-    when(config.getRuntimeId()).thenReturn("test-runtime-id");
-    when(config.getServiceName()).thenReturn("test-service");
-    when(config.getRuntimeVersion()).thenReturn("test-runtime-version");
-    when(config.getVersion()).thenReturn("test-version");
-
-    OTelContext otelContext = mock(OTelContext.class);
-    DdprofLibraryLoader.OTelContextHolder holder =
-        mock(DdprofLibraryLoader.OTelContextHolder.class);
-    when(holder.getReasonNotLoaded()).thenReturn(null);
-    when(holder.getComponent()).thenReturn(otelContext);
-
-    try (MockedStatic<Config> configMock = mockStatic(Config.class);
-        MockedStatic<DdprofLibraryLoader> ddprofMock = mockStatic(DdprofLibraryLoader.class)) {
-
-      configMock.when(Config::get).thenReturn(config);
-      ddprofMock.when(DdprofLibraryLoader::otelContext).thenReturn(holder);
-
-      ProcessContext.register(configProvider);
-
-      verify(otelContext)
-          .initializeAllContext(
-              eq("test-env"),
-              eq("test-host"),
-              eq("test-runtime-id"),
-              eq("test-service"),
-              eq("test-runtime-version"),
-              eq("test-version"),
-              aryEq(new String[] {"http.route", "db.system"}));
+    @Test
+    void testRegisterSetsProcessContextValues() {
+        ConfigProvider configProvider = mock(ConfigProvider.class);
+        when(configProvider.getBoolean(
+                        eq(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED),
+                        eq(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED_DEFAULT)))
+                .thenReturn(true);
+        when(configProvider.getSet(eq(ProfilingConfig.PROFILING_CONTEXT_ATTRIBUTES), any()))
+                .thenReturn(new LinkedHashSet<>(Arrays.asList("http.route", "db.system")));
+
+        Config config = mock(Config.class);
+        when(config.getEnv()).thenReturn("test-env");
+        when(config.getHostName()).thenReturn("test-host");
+        when(config.getRuntimeId()).thenReturn("test-runtime-id");
+        when(config.getServiceName()).thenReturn("test-service");
+        when(config.getRuntimeVersion()).thenReturn("test-runtime-version");
+        when(config.getVersion()).thenReturn("test-version");
+
+        OTelContext otelContext = mock(OTelContext.class);
+        DdprofLibraryLoader.OTelContextHolder holder = mock(DdprofLibraryLoader.OTelContextHolder.class);
+        when(holder.getReasonNotLoaded()).thenReturn(null);
+        when(holder.getComponent()).thenReturn(otelContext);
+
+        try (MockedStatic<Config> configMock = mockStatic(Config.class);
+                MockedStatic<DdprofLibraryLoader> ddprofMock = mockStatic(DdprofLibraryLoader.class)) {
+
+            configMock.when(Config::get).thenReturn(config);
+            ddprofMock.when(DdprofLibraryLoader::otelContext).thenReturn(holder);
+
+            ProcessContext.register(configProvider);
+
+            verify(otelContext)
+                    .initializeAllContext(
+                            eq("test-env"),
+                            eq("test-host"),
+                            eq("test-runtime-id"),
+                            eq("test-service"),
+                            eq("test-runtime-version"),
+                            eq("test-version"),
+                            aryEq(new String[] {"http.route", "db.system"}));
+        }
     }
-  }
 
-  @Test
-  void testRegisterSkipsWhenDisabled() {
-    ConfigProvider configProvider = mock(ConfigProvider.class);
-    when(configProvider.getBoolean(
-            eq(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED),
-            eq(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED_DEFAULT)))
-        .thenReturn(false);
+    @Test
+    void testRegisterSkipsWhenDisabled() {
+        ConfigProvider configProvider = mock(ConfigProvider.class);
+        when(configProvider.getBoolean(
+                        eq(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED),
+                        eq(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED_DEFAULT)))
+                .thenReturn(false);
 
-    DdprofLibraryLoader.OTelContextHolder holder =
-        mock(DdprofLibraryLoader.OTelContextHolder.class);
+        DdprofLibraryLoader.OTelContextHolder holder = mock(DdprofLibraryLoader.OTelContextHolder.class);
 
-    try (MockedStatic<DdprofLibraryLoader> ddprofMock = mockStatic(DdprofLibraryLoader.class)) {
-      ddprofMock.when(DdprofLibraryLoader::otelContext).thenReturn(holder);
+        try (MockedStatic<DdprofLibraryLoader> ddprofMock = mockStatic(DdprofLibraryLoader.class)) {
+            ddprofMock.when(DdprofLibraryLoader::otelContext).thenReturn(holder);
 
-      ProcessContext.register(configProvider);
+            ProcessContext.register(configProvider);
 
-      verify(holder, org.mockito.Mockito.never()).getReasonNotLoaded();
-      verify(holder, org.mockito.Mockito.never()).getComponent();
+            verify(holder, org.mockito.Mockito.never()).getReasonNotLoaded();
+            verify(holder, org.mockito.Mockito.never()).getComponent();
+        }
     }
-  }
-
-  @Test
-  void testEnabledByDefault() {
-    assertTrue(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED_DEFAULT);
-  }
-
-  /**
-   * Covers the call path introduced for AppSec-only deployments: {@code
-   * Agent.createProfilingContextIntegration()} reflectively calls {@code register(ConfigProvider)}
-   * when OTel context exposure is enabled, even though {@code profiling.enabled} is {@code false}
-   * and {@code ProfilingAgent.run()} is therefore never executed.
-   *
-   * <p>The process context gate is {@code profiling.process.context.enabled} alone: {@code
-   * register} never reads {@code Config#isProfilingEnabled()}, so it is already profiling-agnostic.
-   * This test pins that property by stubbing {@code isProfilingEnabled()} to {@code false} and
-   * asserting the native context is still fully initialized, so a future change that made process
-   * context depend on the profiler being enabled would break the new caller here rather than
-   * silently in production.
-   */
-  @Test
-  void testRegisterWorksIndependentlyOfProfilingEnabledState() {
-    ConfigProvider configProvider = mock(ConfigProvider.class);
-    when(configProvider.getBoolean(
-            eq(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED),
-            eq(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED_DEFAULT)))
-        .thenReturn(true);
-    when(configProvider.getSet(eq(ProfilingConfig.PROFILING_CONTEXT_ATTRIBUTES), any()))
-        .thenReturn(new LinkedHashSet<>(Collections.singletonList("http.route")));
-
-    Config config = mock(Config.class);
-    when(config.isProfilingEnabled()).thenReturn(false);
-    when(config.getEnv()).thenReturn("appsec-env");
-    when(config.getHostName()).thenReturn("appsec-host");
-    when(config.getRuntimeId()).thenReturn("appsec-runtime-id");
-    when(config.getServiceName()).thenReturn("appsec-service");
-    when(config.getRuntimeVersion()).thenReturn("appsec-runtime-version");
-    when(config.getVersion()).thenReturn("appsec-version");
-
-    OTelContext otelContext = mock(OTelContext.class);
-    DdprofLibraryLoader.OTelContextHolder holder =
-        mock(DdprofLibraryLoader.OTelContextHolder.class);
-    when(holder.getReasonNotLoaded()).thenReturn(null);
-    when(holder.getComponent()).thenReturn(otelContext);
-
-    try (MockedStatic<Config> configMock = mockStatic(Config.class);
-        MockedStatic<DdprofLibraryLoader> ddprofMock = mockStatic(DdprofLibraryLoader.class)) {
-
-      configMock.when(Config::get).thenReturn(config);
-      ddprofMock.when(DdprofLibraryLoader::otelContext).thenReturn(holder);
-
-      ProcessContext.register(configProvider);
-
-      verify(otelContext)
-          .initializeAllContext(
-              eq("appsec-env"),
-              eq("appsec-host"),
-              eq("appsec-runtime-id"),
-              eq("appsec-service"),
-              eq("appsec-runtime-version"),
-              eq("appsec-version"),
-              aryEq(new String[] {"http.route"}));
+
+    @Test
+    void testEnabledByDefault() {
+        assertTrue(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED_DEFAULT);
+    }
+
+    /**
+     * Covers the call path introduced for AppSec-only deployments: {@code
+     * Agent.createProfilingContextIntegration()} reflectively calls {@code register(ConfigProvider)}
+     * when OTel context exposure is enabled, even though {@code profiling.enabled} is {@code false}
+     * and {@code ProfilingAgent.run()} is therefore never executed.
+     *
+     * <p>The process context gate is {@code profiling.process.context.enabled} alone: {@code
+     * register} never reads {@code Config#isProfilingEnabled()}, so it is already profiling-agnostic.
+     * This test pins that property by stubbing {@code isProfilingEnabled()} to {@code false} and
+     * asserting the native context is still fully initialized, so a future change that made process
+     * context depend on the profiler being enabled would break the new caller here rather than
+     * silently in production.
+     */
+    @Test
+    void testRegisterWorksIndependentlyOfProfilingEnabledState() {
+        ConfigProvider configProvider = mock(ConfigProvider.class);
+        when(configProvider.getBoolean(
+                        eq(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED),
+                        eq(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED_DEFAULT)))
+                .thenReturn(true);
+        when(configProvider.getSet(eq(ProfilingConfig.PROFILING_CONTEXT_ATTRIBUTES), any()))
+                .thenReturn(new LinkedHashSet<>(Collections.singletonList("http.route")));
+
+        Config config = mock(Config.class);
+        when(config.isProfilingEnabled()).thenReturn(false);
+        when(config.getEnv()).thenReturn("appsec-env");
+        when(config.getHostName()).thenReturn("appsec-host");
+        when(config.getRuntimeId()).thenReturn("appsec-runtime-id");
+        when(config.getServiceName()).thenReturn("appsec-service");
+        when(config.getRuntimeVersion()).thenReturn("appsec-runtime-version");
+        when(config.getVersion()).thenReturn("appsec-version");
+
+        OTelContext otelContext = mock(OTelContext.class);
+        DdprofLibraryLoader.OTelContextHolder holder = mock(DdprofLibraryLoader.OTelContextHolder.class);
+        when(holder.getReasonNotLoaded()).thenReturn(null);
+        when(holder.getComponent()).thenReturn(otelContext);
+
+        try (MockedStatic<Config> configMock = mockStatic(Config.class);
+                MockedStatic<DdprofLibraryLoader> ddprofMock = mockStatic(DdprofLibraryLoader.class)) {
+
+            configMock.when(Config::get).thenReturn(config);
+            ddprofMock.when(DdprofLibraryLoader::otelContext).thenReturn(holder);
+
+            ProcessContext.register(configProvider);
+
+            verify(otelContext)
+                    .initializeAllContext(
+                            eq("appsec-env"),
+                            eq("appsec-host"),
+                            eq("appsec-runtime-id"),
+                            eq("appsec-service"),
+                            eq("appsec-runtime-version"),
+                            eq("appsec-version"),
+                            aryEq(new String[] {"http.route"}));
+        }
+    }
+
+    /**
+     * The reflective call site in {@code Agent.createProfilingContextIntegration()} looks up {@code
+     * register} by the exact signature {@code register(ConfigProvider)} and is unable to fail at
+     * compile time if that signature changes. The same signature is pinned by a GraalVM
+     * {@code @Substitute}. This test fails fast if the method is renamed or its parameter type
+     * changes.
+     */
+    @Test
+    void testRegisterSignatureIsStableForReflectiveLookup() throws NoSuchMethodException {
+        Method register = ProcessContext.class.getMethod("register", ConfigProvider.class);
+
+        assertTrue(Modifier.isStatic(register.getModifiers()));
+        assertTrue(Modifier.isPublic(register.getModifiers()));
     }
-  }
-
-  /**
-   * The reflective call site in {@code Agent.createProfilingContextIntegration()} looks up {@code
-   * register} by the exact signature {@code register(ConfigProvider)} and is unable to fail at
-   * compile time if that signature changes. The same signature is pinned by a GraalVM
-   * {@code @Substitute}. This test fails fast if the method is renamed or its parameter type
-   * changes.
-   */
-  @Test
-  void testRegisterSignatureIsStableForReflectiveLookup() throws NoSuchMethodException {
-    Method register = ProcessContext.class.getMethod("register", ConfigProvider.class);
-
-    assertTrue(Modifier.isStatic(register.getModifiers()));
-    assertTrue(Modifier.isPublic(register.getModifiers()));
-  }
-
-  @Test
-  void testRegisterHandlesLibraryLoadFailure() {
-    ConfigProvider configProvider = mock(ConfigProvider.class);
-    when(configProvider.getBoolean(
-            eq(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED),
-            eq(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED_DEFAULT)))
-        .thenReturn(true);
-
-    Throwable loadError = new RuntimeException("Library load failed");
-    DdprofLibraryLoader.OTelContextHolder holder =
-        mock(DdprofLibraryLoader.OTelContextHolder.class);
-    when(holder.getReasonNotLoaded()).thenReturn(loadError);
-
-    try (MockedStatic<DdprofLibraryLoader> ddprofMock = mockStatic(DdprofLibraryLoader.class)) {
-      ddprofMock.when(DdprofLibraryLoader::otelContext).thenReturn(holder);
-
-      ProcessContext.register(configProvider);
-
-      verify(holder).getReasonNotLoaded();
-      verify(holder, org.mockito.Mockito.never()).getComponent();
+
+    @Test
+    void testRegisterHandlesLibraryLoadFailure() {
+        ConfigProvider configProvider = mock(ConfigProvider.class);
+        when(configProvider.getBoolean(
+                        eq(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED),
+                        eq(ProfilingConfig.PROFILING_PROCESS_CONTEXT_ENABLED_DEFAULT)))
+                .thenReturn(true);
+
+        Throwable loadError = new RuntimeException("Library load failed");
+        DdprofLibraryLoader.OTelContextHolder holder = mock(DdprofLibraryLoader.OTelContextHolder.class);
+        when(holder.getReasonNotLoaded()).thenReturn(loadError);
+
+        try (MockedStatic<DdprofLibraryLoader> ddprofMock = mockStatic(DdprofLibraryLoader.class)) {
+            ddprofMock.when(DdprofLibraryLoader::otelContext).thenReturn(holder);
+
+            ProcessContext.register(configProvider);
+
+            verify(holder).getReasonNotLoaded();
+            verify(holder, org.mockito.Mockito.never()).getComponent();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-profiling/src/test/java/com/datadog/profiling/agent/ScrubRecordingDataListenerTest.java b/dd-java-agent/agent-profiling/src/test/java/com/datadog/profiling/agent/ScrubRecordingDataListenerTest.java
index 8c054dc217e..57f0fd19f7e 100644
--- a/dd-java-agent/agent-profiling/src/test/java/com/datadog/profiling/agent/ScrubRecordingDataListenerTest.java
+++ b/dd-java-agent/agent-profiling/src/test/java/com/datadog/profiling/agent/ScrubRecordingDataListenerTest.java
@@ -29,100 +29,92 @@
 
 class ScrubRecordingDataListenerTest {
 
-  @TempDir Path tempDir;
-
-  private RecordingDataListener delegate;
-  private JfrScrubber scrubber;
-  private RecordingData mockData;
-
-  @BeforeEach
-  void setUp() throws IOException {
-    delegate = mock(RecordingDataListener.class);
-    scrubber = mock(JfrScrubber.class);
-    mockData = mock(RecordingData.class);
-    when(mockData.getStart()).thenReturn(Instant.now());
-    when(mockData.getEnd()).thenReturn(Instant.now());
-    when(mockData.getKind()).thenReturn(ProfilingSnapshot.Kind.PERIODIC);
-    when(mockData.getName()).thenReturn("test");
-    when(mockData.getStream())
-        .thenReturn(new RecordingInputStream(new ByteArrayInputStream(new byte[] {1, 2, 3})));
-  }
-
-  @Test
-  void delegatesScrubbedData() throws Exception {
-    ScrubRecordingDataListener listener =
-        new ScrubRecordingDataListener(delegate, scrubber, false, tempDir);
-
-    listener.onNewData(RecordingType.CONTINUOUS, mockData, false);
-
-    ArgumentCaptor<RecordingData> captor = ArgumentCaptor.forClass(RecordingData.class);
-    verify(delegate).onNewData(eq(RecordingType.CONTINUOUS), captor.capture(), eq(false));
-    assertTrue(
-        captor.getValue() instanceof ScrubRecordingDataListener.ScrubbedRecordingData,
-        "Delegate should receive ScrubbedRecordingData");
-    verify(mockData).release();
-  }
-
-  @Test
-  void usesExistingFilePathWhenAvailable() throws Exception {
-    // Simulate a file-backed recording (like ddprof)
-    Path existingFile = tempDir.resolve("existing.jfr");
-    Files.write(existingFile, new byte[] {1, 2, 3});
-    when(mockData.getPath()).thenReturn(existingFile);
-
-    ScrubRecordingDataListener listener =
-        new ScrubRecordingDataListener(delegate, scrubber, false, tempDir);
-
-    listener.onNewData(RecordingType.CONTINUOUS, mockData, false);
-
-    // Scrubber should be called with the existing file path, not a temp file
-    ArgumentCaptor<Path> inputCaptor = ArgumentCaptor.forClass(Path.class);
-    ArgumentCaptor<Path> outputCaptor = ArgumentCaptor.forClass(Path.class);
-    verify(scrubber).scrubFile(inputCaptor.capture(), outputCaptor.capture());
-    assertEquals(
-        existingFile, inputCaptor.getValue(), "Should use existing file path as scrub input");
-    verify(delegate).onNewData(eq(RecordingType.CONTINUOUS), any(RecordingData.class), eq(false));
-  }
-
-  @Test
-  void failClosedSkipsUpload() throws Exception {
-    doThrow(new RuntimeException("scrub failed"))
-        .when(scrubber)
-        .scrubFile(any(Path.class), any(Path.class));
-
-    ScrubRecordingDataListener listener =
-        new ScrubRecordingDataListener(delegate, scrubber, false, tempDir);
-
-    listener.onNewData(RecordingType.CONTINUOUS, mockData, false);
-
-    verify(delegate, never()).onNewData(any(), any(), anyBoolean());
-    verify(mockData).release();
-  }
-
-  @Test
-  void failOpenDelegatesOriginalData() throws Exception {
-    doThrow(new RuntimeException("scrub failed"))
-        .when(scrubber)
-        .scrubFile(any(Path.class), any(Path.class));
-
-    ScrubRecordingDataListener listener =
-        new ScrubRecordingDataListener(delegate, scrubber, true, tempDir);
-
-    listener.onNewData(RecordingType.CONTINUOUS, mockData, false);
-
-    verify(delegate).onNewData(eq(RecordingType.CONTINUOUS), eq(mockData), eq(false));
-    verify(mockData, never()).release();
-  }
-
-  @Test
-  void cleansTempFilesOnSuccess() throws Exception {
-    ScrubRecordingDataListener listener =
-        new ScrubRecordingDataListener(delegate, scrubber, false, tempDir);
-
-    listener.onNewData(RecordingType.CONTINUOUS, mockData, false);
-
-    // After success, temp input should be cleaned up, only scrubbed output remains
-    long jfrCount = Files.list(tempDir).filter(p -> p.toString().contains("dd-scrub-in-")).count();
-    assertEquals(0L, jfrCount, "Temp input files should be cleaned up");
-  }
+    @TempDir
+    Path tempDir;
+
+    private RecordingDataListener delegate;
+    private JfrScrubber scrubber;
+    private RecordingData mockData;
+
+    @BeforeEach
+    void setUp() throws IOException {
+        delegate = mock(RecordingDataListener.class);
+        scrubber = mock(JfrScrubber.class);
+        mockData = mock(RecordingData.class);
+        when(mockData.getStart()).thenReturn(Instant.now());
+        when(mockData.getEnd()).thenReturn(Instant.now());
+        when(mockData.getKind()).thenReturn(ProfilingSnapshot.Kind.PERIODIC);
+        when(mockData.getName()).thenReturn("test");
+        when(mockData.getStream()).thenReturn(new RecordingInputStream(new ByteArrayInputStream(new byte[] {1, 2, 3})));
+    }
+
+    @Test
+    void delegatesScrubbedData() throws Exception {
+        ScrubRecordingDataListener listener = new ScrubRecordingDataListener(delegate, scrubber, false, tempDir);
+
+        listener.onNewData(RecordingType.CONTINUOUS, mockData, false);
+
+        ArgumentCaptor<RecordingData> captor = ArgumentCaptor.forClass(RecordingData.class);
+        verify(delegate).onNewData(eq(RecordingType.CONTINUOUS), captor.capture(), eq(false));
+        assertTrue(
+                captor.getValue() instanceof ScrubRecordingDataListener.ScrubbedRecordingData,
+                "Delegate should receive ScrubbedRecordingData");
+        verify(mockData).release();
+    }
+
+    @Test
+    void usesExistingFilePathWhenAvailable() throws Exception {
+        // Simulate a file-backed recording (like ddprof)
+        Path existingFile = tempDir.resolve("existing.jfr");
+        Files.write(existingFile, new byte[] {1, 2, 3});
+        when(mockData.getPath()).thenReturn(existingFile);
+
+        ScrubRecordingDataListener listener = new ScrubRecordingDataListener(delegate, scrubber, false, tempDir);
+
+        listener.onNewData(RecordingType.CONTINUOUS, mockData, false);
+
+        // Scrubber should be called with the existing file path, not a temp file
+        ArgumentCaptor<Path> inputCaptor = ArgumentCaptor.forClass(Path.class);
+        ArgumentCaptor<Path> outputCaptor = ArgumentCaptor.forClass(Path.class);
+        verify(scrubber).scrubFile(inputCaptor.capture(), outputCaptor.capture());
+        assertEquals(existingFile, inputCaptor.getValue(), "Should use existing file path as scrub input");
+        verify(delegate).onNewData(eq(RecordingType.CONTINUOUS), any(RecordingData.class), eq(false));
+    }
+
+    @Test
+    void failClosedSkipsUpload() throws Exception {
+        doThrow(new RuntimeException("scrub failed")).when(scrubber).scrubFile(any(Path.class), any(Path.class));
+
+        ScrubRecordingDataListener listener = new ScrubRecordingDataListener(delegate, scrubber, false, tempDir);
+
+        listener.onNewData(RecordingType.CONTINUOUS, mockData, false);
+
+        verify(delegate, never()).onNewData(any(), any(), anyBoolean());
+        verify(mockData).release();
+    }
+
+    @Test
+    void failOpenDelegatesOriginalData() throws Exception {
+        doThrow(new RuntimeException("scrub failed")).when(scrubber).scrubFile(any(Path.class), any(Path.class));
+
+        ScrubRecordingDataListener listener = new ScrubRecordingDataListener(delegate, scrubber, true, tempDir);
+
+        listener.onNewData(RecordingType.CONTINUOUS, mockData, false);
+
+        verify(delegate).onNewData(eq(RecordingType.CONTINUOUS), eq(mockData), eq(false));
+        verify(mockData, never()).release();
+    }
+
+    @Test
+    void cleansTempFilesOnSuccess() throws Exception {
+        ScrubRecordingDataListener listener = new ScrubRecordingDataListener(delegate, scrubber, false, tempDir);
+
+        listener.onNewData(RecordingType.CONTINUOUS, mockData, false);
+
+        // After success, temp input should be cleaned up, only scrubbed output remains
+        long jfrCount = Files.list(tempDir)
+                .filter(p -> p.toString().contains("dd-scrub-in-"))
+                .count();
+        assertEquals(0L, jfrCount, "Temp input files should be cleaned up");
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/ProxyIgnoreBenchmark.java b/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/ProxyIgnoreBenchmark.java
index d248d21afbe..9cd18eb962b 100644
--- a/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/ProxyIgnoreBenchmark.java
+++ b/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/ProxyIgnoreBenchmark.java
@@ -32,55 +32,55 @@
 @Warmup(iterations = 1)
 @Fork(value = 1)
 public class ProxyIgnoreBenchmark {
-  @Param({
-    "org.springframework.util.ConcurrentReferenceHashMap$4",
-    "java.lang.invoke.LambdaForm$DMH/0x00007fe9f0388000",
-    "org.springframework.core.annotation.RepeatableContainers$StandardRepeatableContainers$$Lambda$315/0x00007fe9f03adc70",
-    // worst case for trie based
-    "datadog.test.package.redis.RedisTemplateProvider$$TestCGLIB$$FastClass$$0"
-  })
-  public String className;
+    @Param({
+        "org.springframework.util.ConcurrentReferenceHashMap$4",
+        "java.lang.invoke.LambdaForm$DMH/0x00007fe9f0388000",
+        "org.springframework.core.annotation.RepeatableContainers$StandardRepeatableContainers$$Lambda$315/0x00007fe9f03adc70",
+        // worst case for trie based
+        "datadog.test.package.redis.RedisTemplateProvider$$TestCGLIB$$FastClass$$0"
+    })
+    public String className;
 
-  @Benchmark
-  public void useContains(Blackhole bh) {
-    if (className.indexOf('$') > -1) {
-      if (className.contains("$JaxbAccessor")
-          || className.contains("CGLIB$$")
-          || className.contains("$__sisu")
-          || className.contains("$$EnhancerByGuice$$")
-          || className.contains("$$EnhancerByProxool$$")
-          || className.contains("$$$view")
-          || className.contains("$$$endpoint") // jboss mdb proxies
-          || className.contains("$$_Weld")
-          || className.contains("_$$_jvst")) {
-        bh.consume(true);
-      }
+    @Benchmark
+    public void useContains(Blackhole bh) {
+        if (className.indexOf('$') > -1) {
+            if (className.contains("$JaxbAccessor")
+                    || className.contains("CGLIB$$")
+                    || className.contains("$__sisu")
+                    || className.contains("$$EnhancerByGuice$$")
+                    || className.contains("$$EnhancerByProxool$$")
+                    || className.contains("$$$view")
+                    || className.contains("$$$endpoint") // jboss mdb proxies
+                    || className.contains("$$_Weld")
+                    || className.contains("_$$_jvst")) {
+                bh.consume(true);
+            }
+        }
     }
-  }
 
-  @Benchmark
-  public void useTrie(Blackhole bh) {
-    int last = -1;
-    int idx;
-    while (true) {
-      idx = className.indexOf('$', last + 1);
-      if (idx < 0) {
-        break;
-      }
-      if (last < 0 && className.contains("CGLIB$$")) {
-        break;
-      }
-      if (idx == last + 1) {
-        // skip the trie if consecutive $$ since, to be efficient, we can match prefixes from the
-        // first dollar
-        last = idx;
-        continue;
-      }
-      last = idx;
-      if (ProxyIgnoredClassNameTrie.apply(className, idx) >= 0) {
-        return;
-      }
+    @Benchmark
+    public void useTrie(Blackhole bh) {
+        int last = -1;
+        int idx;
+        while (true) {
+            idx = className.indexOf('$', last + 1);
+            if (idx < 0) {
+                break;
+            }
+            if (last < 0 && className.contains("CGLIB$$")) {
+                break;
+            }
+            if (idx == last + 1) {
+                // skip the trie if consecutive $$ since, to be efficient, we can match prefixes from the
+                // first dollar
+                last = idx;
+                continue;
+            }
+            last = idx;
+            if (ProxyIgnoredClassNameTrie.apply(className, idx) >= 0) {
+                return;
+            }
+        }
+        bh.consume(true);
     }
-    bh.consume(true);
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteBenchmark.java b/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteBenchmark.java
index 38151b6c307..80fa895e27a 100644
--- a/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteBenchmark.java
+++ b/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteBenchmark.java
@@ -24,66 +24,66 @@
 @Fork(value = 10)
 public class CallSiteBenchmark {
 
-  private Instrumentation instrumentation;
+    private Instrumentation instrumentation;
 
-  @Setup(Level.Trial)
-  public void setUp() {
-    instrumentation = ByteBuddyAgent.install();
-  }
+    @Setup(Level.Trial)
+    public void setUp() {
+        instrumentation = ByteBuddyAgent.install();
+    }
 
-  @Benchmark
-  public void none() throws Exception {
-    runBenchmark(Type.NONE);
-  }
+    @Benchmark
+    public void none() throws Exception {
+        runBenchmark(Type.NONE);
+    }
 
-  @Benchmark
-  public void callee() throws Exception {
-    runBenchmark(Type.CALLEE);
-  }
+    @Benchmark
+    public void callee() throws Exception {
+        runBenchmark(Type.CALLEE);
+    }
 
-  @Benchmark
-  public void callSite() throws Exception {
-    runBenchmark(Type.CALL_SITE);
-  }
+    @Benchmark
+    public void callSite() throws Exception {
+        runBenchmark(Type.CALL_SITE);
+    }
 
-  private void runBenchmark(final Type type) throws Exception {
-    type.apply(instrumentation);
-    final Class<?> server = Class.forName("foo.bar.DummyApplication");
-    try (ConfigurableApplicationContext context = SpringApplication.run(server)) {
-      final RestTemplate template = new RestTemplate();
-      final String url = "http://localhost:8080/benchmark?param=Hello!";
-      final String response = template.getForObject(url, String.class);
-      type.validate(response);
+    private void runBenchmark(final Type type) throws Exception {
+        type.apply(instrumentation);
+        final Class<?> server = Class.forName("foo.bar.DummyApplication");
+        try (ConfigurableApplicationContext context = SpringApplication.run(server)) {
+            final RestTemplate template = new RestTemplate();
+            final String url = "http://localhost:8080/benchmark?param=Hello!";
+            final String response = template.getForObject(url, String.class);
+            type.validate(response);
+        }
     }
-  }
 
-  enum Type {
-    NONE(null),
-    CALL_SITE("callSite"),
-    CALLEE("callee");
+    enum Type {
+        NONE(null),
+        CALL_SITE("callSite"),
+        CALLEE("callee");
 
-    private final String instrumentation;
+        private final String instrumentation;
 
-    Type(final String instrumentation) {
-      this.instrumentation = instrumentation;
-    }
+        Type(final String instrumentation) {
+            this.instrumentation = instrumentation;
+        }
 
-    public void apply(final Instrumentation instrumentation) {
-      if (this.instrumentation != null) {
-        System.setProperty("dd.benchmark.instrumentation", this.instrumentation);
-        AgentInstaller.installBytebuddyAgent(instrumentation);
-      }
-    }
+        public void apply(final Instrumentation instrumentation) {
+            if (this.instrumentation != null) {
+                System.setProperty("dd.benchmark.instrumentation", this.instrumentation);
+                AgentInstaller.installBytebuddyAgent(instrumentation);
+            }
+        }
 
-    public void validate(final String response) {
-      if (response == null) {
-        throw new RuntimeException("Empty response received");
-      }
-      String expected = instrumentation == null ? "Hello!" : "Hello! [Transformed]";
-      if (!expected.equals(response)) {
-        throw new RuntimeException(
-            String.format("Wrong response, expected '%s' but received '%s'", expected, response));
-      }
+        public void validate(final String response) {
+            if (response == null) {
+                throw new RuntimeException("Empty response received");
+            }
+            String expected = instrumentation == null ? "Hello!" : "Hello! [Transformed]";
+            if (!expected.equals(response)) {
+                throw new RuntimeException(
+                        String.format("Wrong response, expected '%s' but received '%s'", expected, response));
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteBenchmarkHelper.java b/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteBenchmarkHelper.java
index 362c8b391bb..5b925ff3b81 100644
--- a/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteBenchmarkHelper.java
+++ b/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteBenchmarkHelper.java
@@ -5,13 +5,13 @@
 
 public class CallSiteBenchmarkHelper {
 
-  @Advice.OnMethodExit
-  public static void adviceCallee(@Advice.Return(readOnly = false) String result) {
-    final String currentValue = result;
-    result = currentValue + " [Transformed]";
-  }
+    @Advice.OnMethodExit
+    public static void adviceCallee(@Advice.Return(readOnly = false) String result) {
+        final String currentValue = result;
+        result = currentValue + " [Transformed]";
+    }
 
-  public static String adviceCallSite(final ServletRequest request, final String parameter) {
-    return request.getParameter(parameter) + " [Transformed]";
-  }
+    public static String adviceCallSite(final ServletRequest request, final String parameter) {
+        return request.getParameter(parameter) + " [Transformed]";
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteBenchmarkInstrumentation.java b/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteBenchmarkInstrumentation.java
index 4796b15f4eb..f71b4a57e67 100644
--- a/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteBenchmarkInstrumentation.java
+++ b/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteBenchmarkInstrumentation.java
@@ -13,69 +13,65 @@
 
 public class CallSiteBenchmarkInstrumentation extends CallSiteInstrumentation {
 
-  public CallSiteBenchmarkInstrumentation() {
-    super("call-site");
-  }
+    public CallSiteBenchmarkInstrumentation() {
+        super("call-site");
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> callerType() {
-    return CallSiteMatcher.INSTANCE;
-  }
+    @Override
+    public ElementMatcher<TypeDescription> callerType() {
+        return CallSiteMatcher.INSTANCE;
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return "callSite".equals(System.getProperty("dd.benchmark.instrumentation", ""));
-  }
+    @Override
+    public boolean isEnabled() {
+        return "callSite".equals(System.getProperty("dd.benchmark.instrumentation", ""));
+    }
 
-  @Override
-  public boolean isApplicable(final Set<TargetSystem> enabledSystems) {
-    return true;
-  }
+    @Override
+    public boolean isApplicable(final Set<TargetSystem> enabledSystems) {
+        return true;
+    }
 
-  @Override
-  protected CallSiteSupplier callSites() {
-    return BenchmarkCallSites.INSTANCE;
-  }
+    @Override
+    protected CallSiteSupplier callSites() {
+        return BenchmarkCallSites.INSTANCE;
+    }
 
-  public static class BenchmarkCallSites implements CallSiteSupplier {
+    public static class BenchmarkCallSites implements CallSiteSupplier {
 
-    public static final CallSiteSupplier INSTANCE = new BenchmarkCallSites();
+        public static final CallSiteSupplier INSTANCE = new BenchmarkCallSites();
 
-    @Override
-    public Iterable<CallSites> get() {
-      return Collections.singletonList(
-          (container -> {
-            container.addAdvice(
-                AROUND,
-                "javax/servlet/ServletRequest",
-                "getParameter",
-                "(Ljava/lang/String;)Ljava/lang/String;",
-                getParameterAdvice());
-            container.addHelpers(
-                "datadog.trace.agent.tooling.bytebuddy.csi.CallSiteBenchmarkHelper");
-          }));
-    }
+        @Override
+        public Iterable<CallSites> get() {
+            return Collections.singletonList((container -> {
+                container.addAdvice(
+                        AROUND,
+                        "javax/servlet/ServletRequest",
+                        "getParameter",
+                        "(Ljava/lang/String;)Ljava/lang/String;",
+                        getParameterAdvice());
+                container.addHelpers("datadog.trace.agent.tooling.bytebuddy.csi.CallSiteBenchmarkHelper");
+            }));
+        }
 
-    public InvokeAdvice getParameterAdvice() {
-      return (handler, opcode, owner, name, descriptor, isInterface) ->
-          handler.method(
-              Opcodes.INVOKESTATIC,
-              "datadog/trace/agent/tooling/bytebuddy/csi/CallSiteBenchmarkHelper",
-              "adviceCallSite",
-              "(Ljavax/servlet/ServletRequest;Ljava/lang/String;)Ljava/lang/String;",
-              false);
+        public InvokeAdvice getParameterAdvice() {
+            return (handler, opcode, owner, name, descriptor, isInterface) -> handler.method(
+                    Opcodes.INVOKESTATIC,
+                    "datadog/trace/agent/tooling/bytebuddy/csi/CallSiteBenchmarkHelper",
+                    "adviceCallSite",
+                    "(Ljavax/servlet/ServletRequest;Ljava/lang/String;)Ljava/lang/String;",
+                    false);
+        }
     }
-  }
 
-  public static final class CallSiteMatcher
-      extends ElementMatcher.Junction.ForNonNullValues<TypeDescription> {
-    public static final CallSiteMatcher INSTANCE = new CallSiteMatcher();
+    public static final class CallSiteMatcher extends ElementMatcher.Junction.ForNonNullValues<TypeDescription> {
+        public static final CallSiteMatcher INSTANCE = new CallSiteMatcher();
 
-    @Override
-    protected boolean doMatch(TypeDescription target) {
-      return CallSiteTrie.apply(target.getName()) != 1;
+        @Override
+        protected boolean doMatch(TypeDescription target) {
+            return CallSiteTrie.apply(target.getName()) != 1;
+        }
     }
-  }
 
-  public static class Muzzle extends ReferenceMatcher {}
+    public static class Muzzle extends ReferenceMatcher {}
 }
diff --git a/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/bytebuddy/csi/CalleeBenchmarkInstrumentation.java b/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/bytebuddy/csi/CalleeBenchmarkInstrumentation.java
index b8805a3f3ae..90faacbf493 100644
--- a/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/bytebuddy/csi/CalleeBenchmarkInstrumentation.java
+++ b/dd-java-agent/agent-tooling/src/jmh/java/datadog/trace/agent/tooling/bytebuddy/csi/CalleeBenchmarkInstrumentation.java
@@ -10,38 +10,38 @@
 import java.util.Set;
 
 public class CalleeBenchmarkInstrumentation extends InstrumenterModule
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public CalleeBenchmarkInstrumentation() {
-    super("callee");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.catalina.connector.Request";
-  }
-
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getParameter").and(takesArguments(String.class)).and(returns(String.class)),
-        CallSiteBenchmarkHelper.class.getName());
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {CallSiteBenchmarkHelper.class.getName()};
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return "callee".equals(System.getProperty("dd.benchmark.instrumentation", ""));
-  }
-
-  @Override
-  public boolean isApplicable(final Set<TargetSystem> enabledSystems) {
-    return true;
-  }
-
-  public static class Muzzle extends ReferenceMatcher {}
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public CalleeBenchmarkInstrumentation() {
+        super("callee");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.apache.catalina.connector.Request";
+    }
+
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getParameter").and(takesArguments(String.class)).and(returns(String.class)),
+                CallSiteBenchmarkHelper.class.getName());
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {CallSiteBenchmarkHelper.class.getName()};
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return "callee".equals(System.getProperty("dd.benchmark.instrumentation", ""));
+    }
+
+    @Override
+    public boolean isApplicable(final Set<TargetSystem> enabledSystems) {
+        return true;
+    }
+
+    public static class Muzzle extends ReferenceMatcher {}
 }
diff --git a/dd-java-agent/agent-tooling/src/jmh/java/foo/bar/DummyController.java b/dd-java-agent/agent-tooling/src/jmh/java/foo/bar/DummyController.java
index 4ad78536707..d66c3e92023 100644
--- a/dd-java-agent/agent-tooling/src/jmh/java/foo/bar/DummyController.java
+++ b/dd-java-agent/agent-tooling/src/jmh/java/foo/bar/DummyController.java
@@ -7,8 +7,8 @@
 @RestController
 public class DummyController {
 
-  @GetMapping("/benchmark")
-  public String index(final ServletRequest request) {
-    return request.getParameter("param");
-  }
+    @GetMapping("/benchmark")
+    public String index(final ServletRequest request) {
+        return request.getParameter("param");
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AdviceAppliesOnScanner.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AdviceAppliesOnScanner.java
index 779d3c508e3..298c301f3eb 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AdviceAppliesOnScanner.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AdviceAppliesOnScanner.java
@@ -22,87 +22,89 @@
  * datadog.trace.agent.tooling.annotation.AppliesOn} annotation in any advices that are applied.
  */
 public final class AdviceAppliesOnScanner {
-  private static final Logger log = LoggerFactory.getLogger(AdviceAppliesOnScanner.class);
+    private static final Logger log = LoggerFactory.getLogger(AdviceAppliesOnScanner.class);
 
-  private static final String APPLIESON_ANNOTATION_DESC =
-      "Ldatadog/trace/agent/tooling/annotation/AppliesOn;";
+    private static final String APPLIESON_ANNOTATION_DESC = "Ldatadog/trace/agent/tooling/annotation/AppliesOn;";
 
-  public static Map<String, Set<InstrumenterModule.TargetSystem>> extractTargetSystemOverrides(
-      Instrumenter instrumenter) throws IOException {
-    if (!(instrumenter instanceof Instrumenter.HasMethodAdvice)) {
-      return emptyMap();
-    }
-    final String instrumenterClassName = instrumenter.getClass().getName();
-    log.debug("Processing instrumenter class: {}", instrumenterClassName);
-    final Map<String, Set<InstrumenterModule.TargetSystem>> map = new HashMap<>();
-    final Set<InstrumenterModule.TargetSystem> overriddenTargetSystems =
-        EnumSet.noneOf(InstrumenterModule.TargetSystem.class);
-    // collect the advices
-    final Set<String> adviceClassNames = new HashSet<>();
-    ((Instrumenter.HasMethodAdvice) instrumenter)
-        .methodAdvice(
-            (matcher, adviceClass, additionalClasses) -> {
-              adviceClassNames.add(adviceClass);
-              if (additionalClasses != null) {
+    public static Map<String, Set<InstrumenterModule.TargetSystem>> extractTargetSystemOverrides(
+            Instrumenter instrumenter) throws IOException {
+        if (!(instrumenter instanceof Instrumenter.HasMethodAdvice)) {
+            return emptyMap();
+        }
+        final String instrumenterClassName = instrumenter.getClass().getName();
+        log.debug("Processing instrumenter class: {}", instrumenterClassName);
+        final Map<String, Set<InstrumenterModule.TargetSystem>> map = new HashMap<>();
+        final Set<InstrumenterModule.TargetSystem> overriddenTargetSystems =
+                EnumSet.noneOf(InstrumenterModule.TargetSystem.class);
+        // collect the advices
+        final Set<String> adviceClassNames = new HashSet<>();
+        ((Instrumenter.HasMethodAdvice) instrumenter).methodAdvice((matcher, adviceClass, additionalClasses) -> {
+            adviceClassNames.add(adviceClass);
+            if (additionalClasses != null) {
                 adviceClassNames.addAll(asList(additionalClasses));
-              }
-            });
-    for (String adviceClassName : adviceClassNames) {
-      // process each advice
-      new ClassReader(adviceClassName)
-          .accept(
-              new ClassVisitor(Opcodes.ASM8) {
-                private String className;
+            }
+        });
+        for (String adviceClassName : adviceClassNames) {
+            // process each advice
+            new ClassReader(adviceClassName)
+                    .accept(
+                            new ClassVisitor(Opcodes.ASM8) {
+                                private String className;
 
-                @Override
-                public void visit(
-                    int version,
-                    int access,
-                    String name,
-                    String signature,
-                    String superName,
-                    String[] interfaces) {
-                  className = name.replace('/', '.');
-                }
+                                @Override
+                                public void visit(
+                                        int version,
+                                        int access,
+                                        String name,
+                                        String signature,
+                                        String superName,
+                                        String[] interfaces) {
+                                    className = name.replace('/', '.');
+                                }
 
-                @Override
-                public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
-                  if (APPLIESON_ANNOTATION_DESC.equals(descriptor)) {
-                    return new AnnotationVisitor(Opcodes.ASM8) {
+                                @Override
+                                public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
+                                    if (APPLIESON_ANNOTATION_DESC.equals(descriptor)) {
+                                        return new AnnotationVisitor(Opcodes.ASM8) {
 
-                      @Override
-                      public AnnotationVisitor visitArray(String name) {
-                        if ("value".equals(name)) {
-                          return new AnnotationVisitor(Opcodes.ASM8) {
-                            @Override
-                            public void visitEnum(String name, String descriptor, String value) {
-                              try {
-                                overriddenTargetSystems.add(
-                                    InstrumenterModule.TargetSystem.valueOf(value));
-                              } catch (IllegalArgumentException e) {
-                                log.warn("Unknown target system: {}", value);
-                              }
-                            }
-                          };
-                        }
-                        return null;
-                      }
+                                            @Override
+                                            public AnnotationVisitor visitArray(String name) {
+                                                if ("value".equals(name)) {
+                                                    return new AnnotationVisitor(Opcodes.ASM8) {
+                                                        @Override
+                                                        public void visitEnum(
+                                                                String name, String descriptor, String value) {
+                                                            try {
+                                                                overriddenTargetSystems.add(
+                                                                        InstrumenterModule.TargetSystem.valueOf(value));
+                                                            } catch (IllegalArgumentException e) {
+                                                                log.warn("Unknown target system: {}", value);
+                                                            }
+                                                        }
+                                                    };
+                                                }
+                                                return null;
+                                            }
 
-                      @Override
-                      public void visitEnd() {
-                        if (!overriddenTargetSystems.isEmpty()) {
-                          log.debug(
-                              "Found @AppliesOn on {} → {}", className, overriddenTargetSystems);
-                          map.put(Strings.getSimpleName(adviceClassName), overriddenTargetSystems);
-                        }
-                      }
-                    };
-                  }
-                  return null;
-                }
-              },
-              ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
+                                            @Override
+                                            public void visitEnd() {
+                                                if (!overriddenTargetSystems.isEmpty()) {
+                                                    log.debug(
+                                                            "Found @AppliesOn on {} → {}",
+                                                            className,
+                                                            overriddenTargetSystems);
+                                                    map.put(
+                                                            Strings.getSimpleName(adviceClassName),
+                                                            overriddenTargetSystems);
+                                                }
+                                            }
+                                        };
+                                    }
+                                    return null;
+                                }
+                            },
+                            ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
+        }
+        return map;
     }
-    return map;
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AdviceShader.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AdviceShader.java
index 07b4426767d..b96d8a5bb62 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AdviceShader.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AdviceShader.java
@@ -16,160 +16,160 @@
 
 /** Shades advice bytecode by applying relocations to all references. */
 public final class AdviceShader {
-  private final Map<String, String> relocations;
-  private final List<String> helperNames;
-
-  private volatile Remapper remapper;
-
-  /**
-   * Used when installing {@link InstrumenterModule}s. Ensures any injected helpers have unique
-   * names so the original and relocated modules can inject helpers into the same class-loader.
-   */
-  public static AdviceShader with(InstrumenterModule module) {
-    if (module.adviceShading() != null) {
-      return new AdviceShader(module.adviceShading(), asList(module.helperClassNames()));
+    private final Map<String, String> relocations;
+    private final List<String> helperNames;
+
+    private volatile Remapper remapper;
+
+    /**
+     * Used when installing {@link InstrumenterModule}s. Ensures any injected helpers have unique
+     * names so the original and relocated modules can inject helpers into the same class-loader.
+     */
+    public static AdviceShader with(InstrumenterModule module) {
+        if (module.adviceShading() != null) {
+            return new AdviceShader(module.adviceShading(), asList(module.helperClassNames()));
+        }
+        return null;
     }
-    return null;
-  }
 
-  /** Used to generate and check muzzle references. Only applies relocations declared in modules. */
-  public static AdviceShader with(Map<String, String> relocations) {
-    if (relocations != null) {
-      return new AdviceShader(relocations, emptyList());
+    /** Used to generate and check muzzle references. Only applies relocations declared in modules. */
+    public static AdviceShader with(Map<String, String> relocations) {
+        if (relocations != null) {
+            return new AdviceShader(relocations, emptyList());
+        }
+        return null;
     }
-    return null;
-  }
-
-  private AdviceShader(Map<String, String> relocations, List<String> helperNames) {
-    this.relocations = relocations;
-    this.helperNames = helperNames;
-  }
-
-  /** Applies shading before calling the given {@link ClassVisitor}. */
-  public ClassVisitor shadeClass(ClassVisitor cv) {
-    return new ClassRemapper(cv, remapper());
-  }
-
-  /** Applies advice relocation rules to a binary class name. */
-  public String shadeClassName(String className) {
-    return remapper().mapType(className.replace('.', '/')).replace('/', '.');
-  }
-
-  /** Applies advice relocation rules to a field/type descriptor. */
-  public String shadeTypeDescriptor(String descriptor) {
-    return remapper().mapDesc(descriptor);
-  }
-
-  /** Applies advice relocation rules to a method descriptor. */
-  public String shadeMethodDescriptor(String descriptor) {
-    return remapper().mapMethodDesc(descriptor);
-  }
-
-  private Remapper remapper() {
-    if (null == remapper) {
-      remapper = new AdviceMapper();
+
+    private AdviceShader(Map<String, String> relocations, List<String> helperNames) {
+        this.relocations = relocations;
+        this.helperNames = helperNames;
     }
-    return remapper;
-  }
-
-  /** Returns the result of shading the given bytecode. */
-  public byte[] shadeClass(byte[] bytecode) {
-    ClassReader cr = new ClassReader(bytecode);
-    ClassWriter cw = new ClassWriter(null, 0);
-    cr.accept(shadeClass(cw), 0);
-    return cw.toByteArray();
-  }
-
-  /** Generates a unique shaded name for the given helper. */
-  public String uniqueHelper(String dottedName) {
-    int packageEnd = dottedName.lastIndexOf('.');
-    if (packageEnd > 0) {
-      return dottedName.substring(0, packageEnd + 1)
-          + "shaded"
-          + relocations.hashCode()
-          + dottedName.substring(packageEnd);
+
+    /** Applies shading before calling the given {@link ClassVisitor}. */
+    public ClassVisitor shadeClass(ClassVisitor cv) {
+        return new ClassRemapper(cv, remapper());
     }
-    return dottedName;
-  }
-
-  final class AdviceMapper extends Remapper {
-    private final DDCache<String, String> mappingCache = DDCaches.newFixedSizeCache(64);
-
-    /** Flattened sequence of old-prefix, new-prefix relocations. */
-    private final String[] prefixes;
-
-    private final Map<String, String> helperMapping;
-
-    AdviceMapper() {
-      // record the unique names that we've given to injected helpers
-      this.helperMapping = new HashMap<>(helperNames.size() + 1, 1f);
-      for (String h : helperNames) {
-        this.helperMapping.put(h.replace('.', '/'), uniqueHelper(h).replace('.', '/'));
-      }
-      // convert relocations to a flattened sequence: old-prefix, new-prefix, etc.
-      this.prefixes = new String[relocations.size() * 2];
-      int i = 0;
-      for (Map.Entry<String, String> e : relocations.entrySet()) {
-        String oldPrefix = e.getKey();
-        String newPrefix = e.getValue();
-        if (oldPrefix.indexOf('.') > 0) {
-          // accept dotted prefixes, but store them in their internal form
-          this.prefixes[i++] = oldPrefix.replace('.', '/');
-          this.prefixes[i++] = newPrefix.replace('.', '/');
-        } else {
-          this.prefixes[i++] = oldPrefix;
-          this.prefixes[i++] = newPrefix;
-        }
-      }
+
+    /** Applies advice relocation rules to a binary class name. */
+    public String shadeClassName(String className) {
+        return remapper().mapType(className.replace('.', '/')).replace('/', '.');
+    }
+
+    /** Applies advice relocation rules to a field/type descriptor. */
+    public String shadeTypeDescriptor(String descriptor) {
+        return remapper().mapDesc(descriptor);
     }
 
-    @Override
-    public String map(String internalName) {
-      String uniqueName = helperMapping.get(internalName);
-      if (uniqueName != null) {
-        return uniqueName;
-      }
-      if (internalName.startsWith("java/")
-          || internalName.startsWith("datadog/")
-          || internalName.startsWith("net/bytebuddy/")) {
-        return internalName; // never shade these references
-      }
-      return mappingCache.computeIfAbsent(internalName, this::shadeInternalName);
+    /** Applies advice relocation rules to a method descriptor. */
+    public String shadeMethodDescriptor(String descriptor) {
+        return remapper().mapMethodDesc(descriptor);
     }
 
-    @Override
-    public Object mapValue(Object value) {
-      if (value instanceof String) {
-        String text = (String) value;
-        if (text.isEmpty()) {
-          return text;
-        } else if (text.indexOf('.') > 0) {
-          return shadeDottedName(text);
-        } else {
-          return shadeInternalName(text);
+    private Remapper remapper() {
+        if (null == remapper) {
+            remapper = new AdviceMapper();
         }
-      } else {
-        return super.mapValue(value);
-      }
+        return remapper;
+    }
+
+    /** Returns the result of shading the given bytecode. */
+    public byte[] shadeClass(byte[] bytecode) {
+        ClassReader cr = new ClassReader(bytecode);
+        ClassWriter cw = new ClassWriter(null, 0);
+        cr.accept(shadeClass(cw), 0);
+        return cw.toByteArray();
     }
 
-    private String shadeInternalName(String internalName) {
-      for (int i = 0; i < prefixes.length; i += 2) {
-        if (internalName.startsWith(prefixes[i])) {
-          return prefixes[i + 1] + internalName.substring(prefixes[i].length());
+    /** Generates a unique shaded name for the given helper. */
+    public String uniqueHelper(String dottedName) {
+        int packageEnd = dottedName.lastIndexOf('.');
+        if (packageEnd > 0) {
+            return dottedName.substring(0, packageEnd + 1)
+                    + "shaded"
+                    + relocations.hashCode()
+                    + dottedName.substring(packageEnd);
         }
-      }
-      return internalName;
+        return dottedName;
     }
 
-    private String shadeDottedName(String name) {
-      String internalName = name.replace('.', '/');
-      for (int i = 0; i < prefixes.length; i += 2) {
-        if (internalName.startsWith(prefixes[i])) {
-          return prefixes[i + 1].replace('/', '.') + name.substring(prefixes[i].length());
+    final class AdviceMapper extends Remapper {
+        private final DDCache<String, String> mappingCache = DDCaches.newFixedSizeCache(64);
+
+        /** Flattened sequence of old-prefix, new-prefix relocations. */
+        private final String[] prefixes;
+
+        private final Map<String, String> helperMapping;
+
+        AdviceMapper() {
+            // record the unique names that we've given to injected helpers
+            this.helperMapping = new HashMap<>(helperNames.size() + 1, 1f);
+            for (String h : helperNames) {
+                this.helperMapping.put(h.replace('.', '/'), uniqueHelper(h).replace('.', '/'));
+            }
+            // convert relocations to a flattened sequence: old-prefix, new-prefix, etc.
+            this.prefixes = new String[relocations.size() * 2];
+            int i = 0;
+            for (Map.Entry<String, String> e : relocations.entrySet()) {
+                String oldPrefix = e.getKey();
+                String newPrefix = e.getValue();
+                if (oldPrefix.indexOf('.') > 0) {
+                    // accept dotted prefixes, but store them in their internal form
+                    this.prefixes[i++] = oldPrefix.replace('.', '/');
+                    this.prefixes[i++] = newPrefix.replace('.', '/');
+                } else {
+                    this.prefixes[i++] = oldPrefix;
+                    this.prefixes[i++] = newPrefix;
+                }
+            }
+        }
+
+        @Override
+        public String map(String internalName) {
+            String uniqueName = helperMapping.get(internalName);
+            if (uniqueName != null) {
+                return uniqueName;
+            }
+            if (internalName.startsWith("java/")
+                    || internalName.startsWith("datadog/")
+                    || internalName.startsWith("net/bytebuddy/")) {
+                return internalName; // never shade these references
+            }
+            return mappingCache.computeIfAbsent(internalName, this::shadeInternalName);
+        }
+
+        @Override
+        public Object mapValue(Object value) {
+            if (value instanceof String) {
+                String text = (String) value;
+                if (text.isEmpty()) {
+                    return text;
+                } else if (text.indexOf('.') > 0) {
+                    return shadeDottedName(text);
+                } else {
+                    return shadeInternalName(text);
+                }
+            } else {
+                return super.mapValue(value);
+            }
+        }
+
+        private String shadeInternalName(String internalName) {
+            for (int i = 0; i < prefixes.length; i += 2) {
+                if (internalName.startsWith(prefixes[i])) {
+                    return prefixes[i + 1] + internalName.substring(prefixes[i].length());
+                }
+            }
+            return internalName;
+        }
+
+        private String shadeDottedName(String name) {
+            String internalName = name.replace('.', '/');
+            for (int i = 0; i < prefixes.length; i += 2) {
+                if (internalName.startsWith(prefixes[i])) {
+                    return prefixes[i + 1].replace('/', '.') + name.substring(prefixes[i].length());
+                }
+            }
+            return name;
         }
-      }
-      return name;
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExcludeFilterProvider.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExcludeFilterProvider.java
index d2c6a06b26f..a64853cb9cc 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExcludeFilterProvider.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExcludeFilterProvider.java
@@ -14,9 +14,9 @@
  */
 public interface ExcludeFilterProvider {
 
-  /**
-   * @return A mapping from {@link ExcludeType} -> {@link Set<String>} for the class names that
-   *     should be excluded from broad instrumentations like {@link Runnable}
-   */
-  Map<ExcludeType, ? extends Collection<String>> excludedClasses();
+    /**
+     * @return A mapping from {@link ExcludeType} -> {@link Set<String>} for the class names that
+     *     should be excluded from broad instrumentations like {@link Runnable}
+     */
+    Map<ExcludeType, ? extends Collection<String>> excludedClasses();
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExtensionHandler.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExtensionHandler.java
index 3f05fe5ac82..5de4db882dd 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExtensionHandler.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExtensionHandler.java
@@ -20,125 +20,121 @@
 /** Accesses content from the extension, mapping classes and resources as necessary. */
 public class ExtensionHandler {
 
-  /** Handler for loading externally built Datadog extensions. */
-  public static final ExtensionHandler DATADOG = new ExtensionHandler();
-
-  /** Provides necessary mappings to load externally built Datadog extensions */
-  private static final Function<ClassVisitor, ClassVisitor> DATADOG_MAPPING =
-      cv ->
-          new ClassRemapper(
-              cv,
-              new Remapper() {
+    /** Handler for loading externally built Datadog extensions. */
+    public static final ExtensionHandler DATADOG = new ExtensionHandler();
+
+    /** Provides necessary mappings to load externally built Datadog extensions */
+    private static final Function<ClassVisitor, ClassVisitor> DATADOG_MAPPING =
+            cv -> new ClassRemapper(cv, new Remapper() {
                 @Override
                 public String map(String internalName) {
-                  return MAP_LOGGING.apply(internalName);
+                    return MAP_LOGGING.apply(internalName);
                 }
-              });
-
-  /** Override this to map filenames to alternative entries in the extension. */
-  public JarEntry mapEntry(JarFile jar, String file) {
-    return jar.getJarEntry(file);
-  }
-
-  /** Override this to map URLs to alternative/mapped content in the extension. */
-  public URLConnection mapContent(URL url, JarFile jar, JarEntry entry) {
-    if (entry.getName().endsWith(".class")) {
-      return new ClassMappingConnection(url, jar, entry, DATADOG_MAPPING);
-    } else {
-      return new JarFileConnection(url, jar, entry);
+            });
+
+    /** Override this to map filenames to alternative entries in the extension. */
+    public JarEntry mapEntry(JarFile jar, String file) {
+        return jar.getJarEntry(file);
     }
-  }
 
-  /** Provides access to original content from the extension. */
-  protected static class JarFileConnection extends URLConnection {
-    private final JarFile jar;
-    private final JarEntry entry;
+    /** Override this to map URLs to alternative/mapped content in the extension. */
+    public URLConnection mapContent(URL url, JarFile jar, JarEntry entry) {
+        if (entry.getName().endsWith(".class")) {
+            return new ClassMappingConnection(url, jar, entry, DATADOG_MAPPING);
+        } else {
+            return new JarFileConnection(url, jar, entry);
+        }
+    }
 
-    public JarFileConnection(URL url, JarFile jar, JarEntry entry) {
-      super(url);
+    /** Provides access to original content from the extension. */
+    protected static class JarFileConnection extends URLConnection {
+        private final JarFile jar;
+        private final JarEntry entry;
 
-      this.jar = jar;
-      this.entry = entry;
-    }
+        public JarFileConnection(URL url, JarFile jar, JarEntry entry) {
+            super(url);
 
-    @Override
-    public void connect() {
-      connected = true;
-    }
+            this.jar = jar;
+            this.entry = entry;
+        }
 
-    @Override
-    public InputStream getInputStream() throws IOException {
-      return jar.getInputStream(entry);
-    }
+        @Override
+        public void connect() {
+            connected = true;
+        }
+
+        @Override
+        public InputStream getInputStream() throws IOException {
+            return jar.getInputStream(entry);
+        }
 
-    @Override
-    public long getContentLengthLong() {
-      return entry.getSize();
+        @Override
+        public long getContentLengthLong() {
+            return entry.getSize();
+        }
     }
-  }
 
-  /** Provides access to bytecode mapped from the extension. */
-  protected static class ClassMappingConnection extends JarFileConnection {
-    private static final DDCache<String, byte[]> BYTECODE_CACHE = DDCaches.newFixedSizeCache(32);
+    /** Provides access to bytecode mapped from the extension. */
+    protected static class ClassMappingConnection extends JarFileConnection {
+        private static final DDCache<String, byte[]> BYTECODE_CACHE = DDCaches.newFixedSizeCache(32);
 
-    private final Function<ClassVisitor, ClassVisitor> mapping;
+        private final Function<ClassVisitor, ClassVisitor> mapping;
 
-    public ClassMappingConnection(
-        URL url, JarFile jar, JarEntry entry, Function<ClassVisitor, ClassVisitor> mapping) {
-      super(url, jar, entry);
-      this.mapping = mapping;
-    }
+        public ClassMappingConnection(
+                URL url, JarFile jar, JarEntry entry, Function<ClassVisitor, ClassVisitor> mapping) {
+            super(url, jar, entry);
+            this.mapping = mapping;
+        }
 
-    @Override
-    public InputStream getInputStream() throws IOException {
-      try {
-        return new ByteArrayInputStream(mapBytecode());
-      } catch (UncheckedIOException e) {
-        throw e.getCause();
-      }
-    }
+        @Override
+        public InputStream getInputStream() throws IOException {
+            try {
+                return new ByteArrayInputStream(mapBytecode());
+            } catch (UncheckedIOException e) {
+                throw e.getCause();
+            }
+        }
 
-    @Override
-    public long getContentLengthLong() {
-      try {
-        return mapBytecode().length;
-      } catch (UncheckedIOException e) {
-        return -1;
-      }
-    }
+        @Override
+        public long getContentLengthLong() {
+            try {
+                return mapBytecode().length;
+            } catch (UncheckedIOException e) {
+                return -1;
+            }
+        }
 
-    private byte[] mapBytecode() {
-      return BYTECODE_CACHE.computeIfAbsent(url.getFile(), this::doMapBytecode);
-    }
+        private byte[] mapBytecode() {
+            return BYTECODE_CACHE.computeIfAbsent(url.getFile(), this::doMapBytecode);
+        }
 
-    protected byte[] doMapBytecode(String unused) {
-      try (InputStream in = super.getInputStream()) {
-        ClassReader cr = new ClassReader(in);
-        ClassWriter cw = new ClassWriter(cr, 0);
-        cr.accept(mapping.apply(cw), 0);
-        return cw.toByteArray();
-      } catch (IOException e) {
-        throw new UncheckedIOException(e);
-      }
+        protected byte[] doMapBytecode(String unused) {
+            try (InputStream in = super.getInputStream()) {
+                ClassReader cr = new ClassReader(in);
+                ClassWriter cw = new ClassWriter(cr, 0);
+                cr.accept(mapping.apply(cw), 0);
+                return cw.toByteArray();
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
     }
-  }
 
-  /** Maps logging references in the extension to use the tracer's embedded logger. */
-  public static final Function<String, String> MAP_LOGGING =
-      new Function<String, String>() {
+    /** Maps logging references in the extension to use the tracer's embedded logger. */
+    public static final Function<String, String> MAP_LOGGING = new Function<String, String>() {
         // we want to keep this package unchanged so it matches against any unshaded extensions
         // dropped in at runtime; use replace to stop it being transformed by the shadow plugin
         private final String ORG_SLF4J = "org|slf4j|".replace('|', '/');
 
         @Override
         public String apply(String internalName) {
-          if (internalName.equals("java/util/logging/Logger")) {
-            return "datadog/trace/bootstrap/PatchLogger";
-          }
-          if (internalName.startsWith(ORG_SLF4J)) {
-            return "datadog/slf4j/" + internalName.substring(10);
-          }
-          return internalName;
+            if (internalName.equals("java/util/logging/Logger")) {
+                return "datadog/trace/bootstrap/PatchLogger";
+            }
+            if (internalName.startsWith(ORG_SLF4J)) {
+                return "datadog/slf4j/" + internalName.substring(10);
+            }
+            return internalName;
         }
-      };
+    };
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperGenerationProcessor.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperGenerationProcessor.java
index 8c10b22ddd0..16ac03ed980 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperGenerationProcessor.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperGenerationProcessor.java
@@ -24,85 +24,82 @@
 
 /** Resolves injectable helpers and generates {@code helperClassNames()} when none are declared. */
 public final class HelperGenerationProcessor {
-  private static final String MUZZLE_REFERENCE_PREFIX = Reference.class.getName();
+    private static final String MUZZLE_REFERENCE_PREFIX = Reference.class.getName();
 
-  public String[] resolveHelpers(AdviceScanResult scanResult, InstrumenterModule module) {
-    String[] declaredHelpers = module.helperClassNames();
-    if (declaredHelpers.length > 0) {
-      return declaredHelpers;
-    }
+    public String[] resolveHelpers(AdviceScanResult scanResult, InstrumenterModule module) {
+        String[] declaredHelpers = module.helperClassNames();
+        if (declaredHelpers.length > 0) {
+            return declaredHelpers;
+        }
 
-    Set<String> adviceRoots = new HashSet<>(scanResult.getAdviceRoots());
-    Set<String> helpers = new LinkedHashSet<>();
-    for (ClassInfo info : scanResult.getClasses().values()) {
-      if (info.isScanned()
-          && info.isReachableFromAdvice()
-          && !adviceRoots.contains(info.getClassName())
-          && isHelperClass(info.getClassName(), info.isFromModuleOutput(), module)
-          && !isBuildTimeOnly(info)) {
-        helpers.add(info.getClassName());
-      }
-    }
+        Set<String> adviceRoots = new HashSet<>(scanResult.getAdviceRoots());
+        Set<String> helpers = new LinkedHashSet<>();
+        for (ClassInfo info : scanResult.getClasses().values()) {
+            if (info.isScanned()
+                    && info.isReachableFromAdvice()
+                    && !adviceRoots.contains(info.getClassName())
+                    && isHelperClass(info.getClassName(), info.isFromModuleOutput(), module)
+                    && !isBuildTimeOnly(info)) {
+                helpers.add(info.getClassName());
+            }
+        }
 
-    List<String> ordered = new ArrayList<>(helpers.size());
-    Set<String> visited = new HashSet<>();
-    for (String helper : helpers) {
-      addInDependencyOrder(helper, helpers, scanResult, visited, ordered);
+        List<String> ordered = new ArrayList<>(helpers.size());
+        Set<String> visited = new HashSet<>();
+        for (String helper : helpers) {
+            addInDependencyOrder(helper, helpers, scanResult, visited, ordered);
+        }
+        return ordered.toArray(new String[0]);
     }
-    return ordered.toArray(new String[0]);
-  }
 
-  public DynamicType.Builder<?> transform(
-      DynamicType.Builder<?> builder, String[] helpers, InstrumenterModule module) {
-    if (helpers.length == 0 || module.helperClassNames().length > 0) {
-      return builder;
-    }
-    List<StackManipulation> values = new ArrayList<>(helpers.length);
-    for (String helper : helpers) {
-      values.add(new TextConstant(helper));
+    public DynamicType.Builder<?> transform(
+            DynamicType.Builder<?> builder, String[] helpers, InstrumenterModule module) {
+        if (helpers.length == 0 || module.helperClassNames().length > 0) {
+            return builder;
+        }
+        List<StackManipulation> values = new ArrayList<>(helpers.length);
+        for (String helper : helpers) {
+            values.add(new TextConstant(helper));
+        }
+        return builder.method(named("helperClassNames").and(takesArguments(0)).and(returns(String[].class)))
+                .intercept(new Implementation.Simple(
+                        ArrayFactory.forType(new TypeDescription.ForLoadedType(String.class).asGenericType())
+                                .withValues(values),
+                        MethodReturn.REFERENCE));
     }
-    return builder
-        .method(named("helperClassNames").and(takesArguments(0)).and(returns(String[].class)))
-        .intercept(
-            new Implementation.Simple(
-                ArrayFactory.forType(
-                        new TypeDescription.ForLoadedType(String.class).asGenericType())
-                    .withValues(values),
-                MethodReturn.REFERENCE));
-  }
 
-  private static boolean isBuildTimeOnly(ClassInfo info) {
-    for (String dependency : info.getRequiredDependencies()) {
-      if (dependency.startsWith(MUZZLE_REFERENCE_PREFIX)) {
-        return true;
-      }
+    private static boolean isBuildTimeOnly(ClassInfo info) {
+        for (String dependency : info.getRequiredDependencies()) {
+            if (dependency.startsWith(MUZZLE_REFERENCE_PREFIX)) {
+                return true;
+            }
+        }
+        // Some muzzle helpers only construct references inside methods, without implementing a
+        // provider.
+        for (Usage usage : info.getUsages()) {
+            String owner = usage.getOwner();
+            if (owner != null && owner.startsWith(MUZZLE_REFERENCE_PREFIX)) {
+                return true;
+            }
+        }
+        return false;
     }
-    // Some muzzle helpers only construct references inside methods, without implementing a
-    // provider.
-    for (Usage usage : info.getUsages()) {
-      String owner = usage.getOwner();
-      if (owner != null && owner.startsWith(MUZZLE_REFERENCE_PREFIX)) {
-        return true;
-      }
-    }
-    return false;
-  }
 
-  private static void addInDependencyOrder(
-      String className,
-      Set<String> helpers,
-      AdviceScanResult scanResult,
-      Set<String> visited,
-      List<String> ordered) {
-    if (!visited.add(className)) {
-      return;
-    }
-    ClassInfo info = scanResult.getClassInfo(className);
-    for (String dependency : info.getRequiredDependencies()) {
-      if (helpers.contains(dependency)) {
-        addInDependencyOrder(dependency, helpers, scanResult, visited, ordered);
-      }
+    private static void addInDependencyOrder(
+            String className,
+            Set<String> helpers,
+            AdviceScanResult scanResult,
+            Set<String> visited,
+            List<String> ordered) {
+        if (!visited.add(className)) {
+            return;
+        }
+        ClassInfo info = scanResult.getClassInfo(className);
+        for (String dependency : info.getRequiredDependencies()) {
+            if (helpers.contains(dependency)) {
+                addInDependencyOrder(dependency, helpers, scanResult, visited, ordered);
+            }
+        }
+        ordered.add(className);
     }
-    ordered.add(className);
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java
index 4cf3d26a925..aa544b1543b 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java
@@ -30,206 +30,198 @@
 
 /** Injects instrumentation helper classes into the user's classloader. */
 public class HelperInjector implements Instrumenter.TransformingAdvice {
-  private static final Logger log = LoggerFactory.getLogger(HelperInjector.class);
-
-  private static final ClassFileLocator classFileLocator =
-      ClassFileLocator.ForClassLoader.of(Utils.getExtendedClassLoader());
-
-  private static final boolean unsafeClassInjection =
-      InstrumenterConfig.get().isUnsafeClassInjection();
-
-  private final boolean useAgentCodeSource;
-  private final AdviceShader adviceShader;
-  private final String requestingName;
-
-  private final Set<String> helperClassNames;
-  private final Map<String, byte[]> dynamicTypeMap = new LinkedHashMap<>();
-
-  private final Map<ClassLoader, Boolean> injectedClassLoaders =
-      Collections.synchronizedMap(new WeakHashMap<>());
-
-  private final List<WeakReference<AnnotatedElement>> helperModules = new CopyOnWriteArrayList<>();
-
-  /**
-   * Construct HelperInjector.
-   *
-   * @param useAgentCodeSource whether helper classes should be injected with the agent's {@link
-   *     CodeSource}.
-   * @param helperClassNames binary names of the helper classes to inject. These class names must be
-   *     resolvable by the classloader returned by
-   *     datadog.trace.agent.tooling.Utils#getAgentClassLoader(). Classes are injected in the order
-   *     provided. This is important if there is interdependency between helper classes that
-   *     requires them to be injected in a specific order.
-   */
-  public HelperInjector(
-      final boolean useAgentCodeSource,
-      final String requestingName,
-      final String... helperClassNames) {
-    this(useAgentCodeSource, null, requestingName, helperClassNames);
-  }
-
-  public HelperInjector(
-      final boolean useAgentCodeSource,
-      final AdviceShader adviceShader,
-      final String requestingName,
-      final String... helperClassNames) {
-    this.useAgentCodeSource = useAgentCodeSource;
-    this.requestingName = requestingName;
-    this.adviceShader = adviceShader;
-
-    this.helperClassNames = new LinkedHashSet<>(asList(helperClassNames));
-  }
-
-  public HelperInjector(
-      final boolean useAgentCodeSource,
-      final String requestingName,
-      final Map<String, byte[]> helperMap) {
-    this.useAgentCodeSource = useAgentCodeSource;
-    this.requestingName = requestingName;
-    this.adviceShader = null;
-
-    helperClassNames = helperMap.keySet();
-    dynamicTypeMap.putAll(helperMap);
-  }
-
-  private Map<String, byte[]> getHelperMap() throws IOException {
-    if (dynamicTypeMap.isEmpty()) {
-      final Map<String, byte[]> classnameToBytes = new LinkedHashMap<>();
-      for (String helperName : helperClassNames) {
-        byte[] classBytes = classFileLocator.locate(helperName).resolve();
-        if (adviceShader != null) {
-          classBytes = adviceShader.shadeClass(classBytes);
-          helperName = adviceShader.uniqueHelper(helperName);
-        }
-        classnameToBytes.put(helperName, classBytes);
-      }
+    private static final Logger log = LoggerFactory.getLogger(HelperInjector.class);
+
+    private static final ClassFileLocator classFileLocator =
+            ClassFileLocator.ForClassLoader.of(Utils.getExtendedClassLoader());
+
+    private static final boolean unsafeClassInjection = InstrumenterConfig.get().isUnsafeClassInjection();
+
+    private final boolean useAgentCodeSource;
+    private final AdviceShader adviceShader;
+    private final String requestingName;
+
+    private final Set<String> helperClassNames;
+    private final Map<String, byte[]> dynamicTypeMap = new LinkedHashMap<>();
+
+    private final Map<ClassLoader, Boolean> injectedClassLoaders = Collections.synchronizedMap(new WeakHashMap<>());
+
+    private final List<WeakReference<AnnotatedElement>> helperModules = new CopyOnWriteArrayList<>();
+
+    /**
+     * Construct HelperInjector.
+     *
+     * @param useAgentCodeSource whether helper classes should be injected with the agent's {@link
+     *     CodeSource}.
+     * @param helperClassNames binary names of the helper classes to inject. These class names must be
+     *     resolvable by the classloader returned by
+     *     datadog.trace.agent.tooling.Utils#getAgentClassLoader(). Classes are injected in the order
+     *     provided. This is important if there is interdependency between helper classes that
+     *     requires them to be injected in a specific order.
+     */
+    public HelperInjector(
+            final boolean useAgentCodeSource, final String requestingName, final String... helperClassNames) {
+        this(useAgentCodeSource, null, requestingName, helperClassNames);
+    }
 
-      return classnameToBytes;
-    } else {
-      return dynamicTypeMap;
+    public HelperInjector(
+            final boolean useAgentCodeSource,
+            final AdviceShader adviceShader,
+            final String requestingName,
+            final String... helperClassNames) {
+        this.useAgentCodeSource = useAgentCodeSource;
+        this.requestingName = requestingName;
+        this.adviceShader = adviceShader;
+
+        this.helperClassNames = new LinkedHashSet<>(asList(helperClassNames));
     }
-  }
-
-  @Override
-  public DynamicType.Builder<?> transform(
-      final DynamicType.Builder<?> builder,
-      final TypeDescription typeDescription,
-      ClassLoader classLoader,
-      final JavaModule module,
-      final ProtectionDomain pd) {
-    if (!helperClassNames.isEmpty()) {
-      if (classLoader == null) {
-        throw new UnsupportedOperationException(
-            "Cannot inject helper classes onto boot-class-path; move "
-                + String.join(",", helperClassNames)
-                + " to agent-bootstrap");
-      }
-
-      if (!injectedClassLoaders.containsKey(classLoader)) {
-        try {
-          if (log.isDebugEnabled()) {
-            log.debug(
-                "Injecting helper classes - instrumentation.class={} instrumentation.target.classloader={} instrumentation.helper_classes=[{}]",
-                requestingName,
-                classLoader,
-                String.join(",", helperClassNames));
-          }
-
-          final Map<String, byte[]> classnameToBytes = getHelperMap();
-          final Collection<Class<?>> classes = injectClassLoader(classLoader, classnameToBytes);
-
-          // all datadog helper classes are in the unnamed module
-          // and there's exactly one unnamed module per classloader
-          if (JavaModule.isSupported()) {
-            helperModules.add(new WeakReference<>(JDK9ModuleAccess.getUnnamedModule(classLoader)));
-          }
-
-          // forcibly initialize any eager helpers
-          for (Class<?> clazz : classes) {
-            if (EagerHelper.class.isAssignableFrom(clazz)) {
-              try {
-                clazz.getMethod("init").invoke(null);
-              } catch (Throwable e) {
-                log.debug("Problem initializing {}", clazz, e);
-              }
-            }
-          }
-
-        } catch (final Exception e) {
-          if (log.isErrorEnabled()) {
-            // requestingName is concatenated to ensure it is sent to telemetry
-            log.error(
-                "Failed to inject helper classes - instrumentation.class={} instrumentation.target.classloader={} instrumentation.target.class={}",
-                requestingName,
-                classLoader,
-                typeDescription,
-                e);
-          }
-          throw new RuntimeException(e);
-        }
 
-        injectedClassLoaders.put(classLoader, true);
-      }
+    public HelperInjector(
+            final boolean useAgentCodeSource, final String requestingName, final Map<String, byte[]> helperMap) {
+        this.useAgentCodeSource = useAgentCodeSource;
+        this.requestingName = requestingName;
+        this.adviceShader = null;
 
-      ensureModuleCanReadHelperModules(module);
+        helperClassNames = helperMap.keySet();
+        dynamicTypeMap.putAll(helperMap);
     }
-    return builder;
-  }
-
-  private Collection<Class<?>> injectClassLoader(
-      final ClassLoader classLoader, final Map<String, byte[]> classnameToBytes) {
-    INJECTING_HELPERS.begin();
-    try {
-      if (useAgentCodeSource) {
-        ProtectionDomain protectionDomain = createProtectionDomain(classLoader);
-        if (unsafeClassInjection) {
-          return new net.bytebuddy.dynamic.loading.ClassInjector.UsingReflection(
-                  classLoader, protectionDomain)
-              .injectRaw(classnameToBytes)
-              .values();
+
+    private Map<String, byte[]> getHelperMap() throws IOException {
+        if (dynamicTypeMap.isEmpty()) {
+            final Map<String, byte[]> classnameToBytes = new LinkedHashMap<>();
+            for (String helperName : helperClassNames) {
+                byte[] classBytes = classFileLocator.locate(helperName).resolve();
+                if (adviceShader != null) {
+                    classBytes = adviceShader.shadeClass(classBytes);
+                    helperName = adviceShader.uniqueHelper(helperName);
+                }
+                classnameToBytes.put(helperName, classBytes);
+            }
+
+            return classnameToBytes;
         } else {
-          return datadog.instrument.classinject.ClassInjector.injectClasses(
-              classnameToBytes, protectionDomain);
+            return dynamicTypeMap;
         }
-      } else {
-        if (unsafeClassInjection) {
-          return new net.bytebuddy.dynamic.loading.ClassInjector.UsingReflection(classLoader)
-              .injectRaw(classnameToBytes)
-              .values();
-        } else {
-          return datadog.instrument.classinject.ClassInjector.injectClasses(
-              classnameToBytes, classLoader);
+    }
+
+    @Override
+    public DynamicType.Builder<?> transform(
+            final DynamicType.Builder<?> builder,
+            final TypeDescription typeDescription,
+            ClassLoader classLoader,
+            final JavaModule module,
+            final ProtectionDomain pd) {
+        if (!helperClassNames.isEmpty()) {
+            if (classLoader == null) {
+                throw new UnsupportedOperationException("Cannot inject helper classes onto boot-class-path; move "
+                        + String.join(",", helperClassNames)
+                        + " to agent-bootstrap");
+            }
+
+            if (!injectedClassLoaders.containsKey(classLoader)) {
+                try {
+                    if (log.isDebugEnabled()) {
+                        log.debug(
+                                "Injecting helper classes - instrumentation.class={} instrumentation.target.classloader={} instrumentation.helper_classes=[{}]",
+                                requestingName,
+                                classLoader,
+                                String.join(",", helperClassNames));
+                    }
+
+                    final Map<String, byte[]> classnameToBytes = getHelperMap();
+                    final Collection<Class<?>> classes = injectClassLoader(classLoader, classnameToBytes);
+
+                    // all datadog helper classes are in the unnamed module
+                    // and there's exactly one unnamed module per classloader
+                    if (JavaModule.isSupported()) {
+                        helperModules.add(new WeakReference<>(JDK9ModuleAccess.getUnnamedModule(classLoader)));
+                    }
+
+                    // forcibly initialize any eager helpers
+                    for (Class<?> clazz : classes) {
+                        if (EagerHelper.class.isAssignableFrom(clazz)) {
+                            try {
+                                clazz.getMethod("init").invoke(null);
+                            } catch (Throwable e) {
+                                log.debug("Problem initializing {}", clazz, e);
+                            }
+                        }
+                    }
+
+                } catch (final Exception e) {
+                    if (log.isErrorEnabled()) {
+                        // requestingName is concatenated to ensure it is sent to telemetry
+                        log.error(
+                                "Failed to inject helper classes - instrumentation.class={} instrumentation.target.classloader={} instrumentation.target.class={}",
+                                requestingName,
+                                classLoader,
+                                typeDescription,
+                                e);
+                    }
+                    throw new RuntimeException(e);
+                }
+
+                injectedClassLoaders.put(classLoader, true);
+            }
+
+            ensureModuleCanReadHelperModules(module);
+        }
+        return builder;
+    }
+
+    private Collection<Class<?>> injectClassLoader(
+            final ClassLoader classLoader, final Map<String, byte[]> classnameToBytes) {
+        INJECTING_HELPERS.begin();
+        try {
+            if (useAgentCodeSource) {
+                ProtectionDomain protectionDomain = createProtectionDomain(classLoader);
+                if (unsafeClassInjection) {
+                    return new net.bytebuddy.dynamic.loading.ClassInjector.UsingReflection(
+                                    classLoader, protectionDomain)
+                            .injectRaw(classnameToBytes)
+                            .values();
+                } else {
+                    return datadog.instrument.classinject.ClassInjector.injectClasses(
+                            classnameToBytes, protectionDomain);
+                }
+            } else {
+                if (unsafeClassInjection) {
+                    return new net.bytebuddy.dynamic.loading.ClassInjector.UsingReflection(classLoader)
+                            .injectRaw(classnameToBytes)
+                            .values();
+                } else {
+                    return datadog.instrument.classinject.ClassInjector.injectClasses(classnameToBytes, classLoader);
+                }
+            }
+        } finally {
+            INJECTING_HELPERS.end();
         }
-      }
-    } finally {
-      INJECTING_HELPERS.end();
     }
-  }
-
-  private ProtectionDomain createProtectionDomain(final ClassLoader classLoader) {
-    CodeSource codeSource = HelperInjector.class.getProtectionDomain().getCodeSource();
-    return new ProtectionDomain(codeSource, null, classLoader, null);
-  }
-
-  private void ensureModuleCanReadHelperModules(final JavaModule target) {
-    if (JavaModule.isSupported() && target != JavaModule.UNSUPPORTED && target.isNamed()) {
-      AnnotatedElement targetModule = (AnnotatedElement) target.unwrap();
-      Set<AnnotatedElement> extraReads = null;
-      for (final WeakReference<AnnotatedElement> helperModuleReference : helperModules) {
-        final AnnotatedElement helperModule = helperModuleReference.get();
-        if (helperModule != null) {
-          if (!JDK9ModuleAccess.canRead(targetModule, helperModule)) {
-            if (extraReads == null) {
-              extraReads = new HashSet<>();
+
+    private ProtectionDomain createProtectionDomain(final ClassLoader classLoader) {
+        CodeSource codeSource = HelperInjector.class.getProtectionDomain().getCodeSource();
+        return new ProtectionDomain(codeSource, null, classLoader, null);
+    }
+
+    private void ensureModuleCanReadHelperModules(final JavaModule target) {
+        if (JavaModule.isSupported() && target != JavaModule.UNSUPPORTED && target.isNamed()) {
+            AnnotatedElement targetModule = (AnnotatedElement) target.unwrap();
+            Set<AnnotatedElement> extraReads = null;
+            for (final WeakReference<AnnotatedElement> helperModuleReference : helperModules) {
+                final AnnotatedElement helperModule = helperModuleReference.get();
+                if (helperModule != null) {
+                    if (!JDK9ModuleAccess.canRead(targetModule, helperModule)) {
+                        if (extraReads == null) {
+                            extraReads = new HashSet<>();
+                        }
+                        extraReads.add(helperModule);
+                    }
+                }
+            }
+            if (extraReads != null) {
+                log.debug("Adding module reads from {} to {}", targetModule, extraReads);
+                JDK9ModuleAccess.addModuleReads(Utils.getInstrumentation(), targetModule, extraReads);
             }
-            extraReads.add(helperModule);
-          }
         }
-      }
-      if (extraReads != null) {
-        log.debug("Adding module reads from {} to {}", targetModule, extraReads);
-        JDK9ModuleAccess.addModuleReads(Utils.getInstrumentation(), targetModule, extraReads);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperScanner.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperScanner.java
index 96579df0225..e4c95455356 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperScanner.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperScanner.java
@@ -22,315 +22,303 @@
 
 /** Scans helper classes to find what classes they depend on and what order to load them. */
 public final class HelperScanner extends ClassVisitor {
-  static final int READER_OPTIONS = ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES;
+    static final int READER_OPTIONS = ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES;
 
-  private static final String[] SHARED_HELPER_PREFIXES = {
-    "datadog.opentelemetry.shim.",
-    "datadog.trace.agent.tooling.iast.",
-    "datadog.trace.agent.tooling.nativeimage."
-  };
+    private static final String[] SHARED_HELPER_PREFIXES = {
+        "datadog.opentelemetry.shim.", "datadog.trace.agent.tooling.iast.", "datadog.trace.agent.tooling.nativeimage."
+    };
 
-  static final ClassFileLocator locator =
-      ClassFileLocator.ForClassLoader.of(Utils.getAgentClassLoader());
+    static final ClassFileLocator locator = ClassFileLocator.ForClassLoader.of(Utils.getAgentClassLoader());
 
-  final MethodScanner methodScanner = new MethodScanner();
+    final MethodScanner methodScanner = new MethodScanner();
 
-  final Consumer<String> REQUIRES = this::requiresClass;
-  final Consumer<String> USES = this::usesClass;
+    final Consumer<String> REQUIRES = this::requiresClass;
+    final Consumer<String> USES = this::usesClass;
 
-  final Map<String, Set<String>> classGraph = new LinkedHashMap<>();
-  final Set<String> search = new HashSet<>();
-  final Set<String> visited = new HashSet<>();
+    final Map<String, Set<String>> classGraph = new LinkedHashMap<>();
+    final Set<String> search = new HashSet<>();
+    final Set<String> visited = new HashSet<>();
 
-  String className;
-  Set<String> requires;
-  Set<String> uses;
+    String className;
+    Set<String> requires;
+    Set<String> uses;
 
-  HelperScanner() {
-    super(Opcodes.ASM7, null);
-  }
-
-  /** Expands helper class names to include any non-bootstrap classes they depend on. */
-  public static String[] withClassDependencies(String... helperClassNames) {
-    return new HelperScanner().simulateClassLoading(helperClassNames);
-  }
-
-  /** Whether a class can be injected as an instrumentation helper. */
-  public static boolean isHelperClass(
-      String className, boolean fromModuleOutput, InstrumenterModule module) {
-    if (isBootstrapClass(className)) {
-      return false;
-    }
-    if (fromModuleOutput) {
-      return true;
+    HelperScanner() {
+        super(Opcodes.ASM7, null);
     }
-    for (String prefix : SHARED_HELPER_PREFIXES) {
-      if (className.startsWith(prefix)) {
-        return true;
-      }
+
+    /** Expands helper class names to include any non-bootstrap classes they depend on. */
+    public static String[] withClassDependencies(String... helperClassNames) {
+        return new HelperScanner().simulateClassLoading(helperClassNames);
     }
-    return module.isHelperClass(className);
-  }
-
-  /**
-   * Simulates class-loading by finding all classes required to load the helper classes as well as
-   * optional classes used in method instructions that may be needed later when invoking the method.
-   * Classes are arranged in order of loading to satisfy the constraints of {@link HelperInjector}.
-   *
-   * <p>Bootstrap types are not included in the list.
-   */
-  String[] simulateClassLoading(String... helperClassNames) {
-    Deque<String> workQueue = new ArrayDeque<>();
-
-    for (String className : helperClassNames) {
-      workQueue.addLast(className);
-      // keep root names in the final list even if they're not loadable at this point
-      classGraph.put(className, Collections.emptySet());
+
+    /** Whether a class can be injected as an instrumentation helper. */
+    public static boolean isHelperClass(String className, boolean fromModuleOutput, InstrumenterModule module) {
+        if (isBootstrapClass(className)) {
+            return false;
+        }
+        if (fromModuleOutput) {
+            return true;
+        }
+        for (String prefix : SHARED_HELPER_PREFIXES) {
+            if (className.startsWith(prefix)) {
+                return true;
+            }
+        }
+        return module.isHelperClass(className);
     }
 
-    // scan each class in turn, adding new types to the work queue
-    while ((className = workQueue.pollFirst()) != null) {
-      if (visited.add(className)) {
-        try {
-          byte[] bytecode = locator.locate(className).resolve();
+    /**
+     * Simulates class-loading by finding all classes required to load the helper classes as well as
+     * optional classes used in method instructions that may be needed later when invoking the method.
+     * Classes are arranged in order of loading to satisfy the constraints of {@link HelperInjector}.
+     *
+     * <p>Bootstrap types are not included in the list.
+     */
+    String[] simulateClassLoading(String... helperClassNames) {
+        Deque<String> workQueue = new ArrayDeque<>();
+
+        for (String className : helperClassNames) {
+            workQueue.addLast(className);
+            // keep root names in the final list even if they're not loadable at this point
+            classGraph.put(className, Collections.emptySet());
+        }
 
-          requires = new LinkedHashSet<>();
-          uses = new LinkedHashSet<>();
+        // scan each class in turn, adding new types to the work queue
+        while ((className = workQueue.pollFirst()) != null) {
+            if (visited.add(className)) {
+                try {
+                    byte[] bytecode = locator.locate(className).resolve();
 
-          new ClassReader(bytecode).accept(this, READER_OPTIONS);
+                    requires = new LinkedHashSet<>();
+                    uses = new LinkedHashSet<>();
 
-          classGraph.put(className, requires);
-          uses.removeAll(visited);
-          workQueue.addAll(uses);
-        } catch (Throwable ignore) {
+                    new ClassReader(bytecode).accept(this, READER_OPTIONS);
+
+                    classGraph.put(className, requires);
+                    uses.removeAll(visited);
+                    workQueue.addAll(uses);
+                } catch (Throwable ignore) {
+                }
+            }
         }
-      }
-    }
 
-    visited.clear();
-    for (String className : classGraph.keySet()) {
-      removeCycles(className);
-    }
+        visited.clear();
+        for (String className : classGraph.keySet()) {
+            removeCycles(className);
+        }
 
-    // load types without any dependencies, then load those satisfied by what's loaded so far...
-    // (this assumes that the class graph has had cycles removed and is a directed acyclic graph)
-    Set<String> loaded = new LinkedHashSet<>();
-    while (!classGraph.isEmpty()) {
-      boolean unchanged = true;
-      Iterator<Map.Entry<String, Set<String>>> itr = classGraph.entrySet().iterator();
-      while (itr.hasNext()) {
-        Map.Entry<String, Set<String>> node = itr.next();
-        if (loaded.containsAll(node.getValue())) {
-          loaded.add(node.getKey());
-          itr.remove();
-          unchanged = false;
+        // load types without any dependencies, then load those satisfied by what's loaded so far...
+        // (this assumes that the class graph has had cycles removed and is a directed acyclic graph)
+        Set<String> loaded = new LinkedHashSet<>();
+        while (!classGraph.isEmpty()) {
+            boolean unchanged = true;
+            Iterator<Map.Entry<String, Set<String>>> itr = classGraph.entrySet().iterator();
+            while (itr.hasNext()) {
+                Map.Entry<String, Set<String>> node = itr.next();
+                if (loaded.containsAll(node.getValue())) {
+                    loaded.add(node.getKey());
+                    itr.remove();
+                    unchanged = false;
+                }
+            }
+            if (unchanged) {
+                throw new IllegalStateException("Unable to resolve load order for: " + classGraph);
+            }
         }
-      }
-      if (unchanged) {
-        throw new IllegalStateException("Unable to resolve load order for: " + classGraph);
-      }
+        return loaded.toArray(new String[0]);
     }
-    return loaded.toArray(new String[0]);
-  }
-
-  /** Simple depth-first search to make sure we end up with a directed acyclic graph. */
-  void removeCycles(String className) {
-    if (visited.add(className)) {
-      search.add(className);
-      Iterator<String> itr = classGraph.get(className).iterator();
-      while (itr.hasNext()) {
-        String nextName = itr.next();
-        if (search.contains(nextName) // cycle detected, remove link to break it
-            || !classGraph.containsKey(nextName) // remove any non-loadable types
-            || nextName.startsWith(className + "$")) { // skip links to inner types
-          itr.remove();
-        } else {
-          removeCycles(nextName);
+
+    /** Simple depth-first search to make sure we end up with a directed acyclic graph. */
+    void removeCycles(String className) {
+        if (visited.add(className)) {
+            search.add(className);
+            Iterator<String> itr = classGraph.get(className).iterator();
+            while (itr.hasNext()) {
+                String nextName = itr.next();
+                if (search.contains(nextName) // cycle detected, remove link to break it
+                        || !classGraph.containsKey(nextName) // remove any non-loadable types
+                        || nextName.startsWith(className + "$")) { // skip links to inner types
+                    itr.remove();
+                } else {
+                    removeCycles(nextName);
+                }
+            }
+            search.remove(className);
         }
-      }
-      search.remove(className);
-    }
-  }
-
-  /** Types that contribute to the helper class shape/hierarchy are required at load-time. */
-  @Override
-  public void visit(
-      final int version,
-      final int access,
-      final String name,
-      final String signature,
-      final String superName,
-      final String[] interfaces) {
-    record(superName, REQUIRES);
-    record(interfaces, REQUIRES);
-  }
-
-  @Override
-  public void visitInnerClass(String name, String outerName, String innerName, int access) {
-    if (this.className.equals(name)) {
-      record(outerName, REQUIRES);
-    }
-  }
-
-  @Override
-  public FieldVisitor visitField(
-      final int access,
-      final String name,
-      final String descriptor,
-      final String signature,
-      final Object value) {
-    // Field types are resolved lazily by the JVM, not during defineClass.
-    // Using USES (not REQUIRES) avoids false dependency cycles that can break
-    // topological sort ordering for superclass/interface relationships.
-    record(Type.getType(descriptor), USES);
-    return null;
-  }
-
-  @Override
-  public MethodVisitor visitMethod(
-      final int access,
-      final String name,
-      final String descriptor,
-      final String signature,
-      final String[] exceptions) {
-    // Method parameter/return types and declared exceptions are resolved lazily
-    // by the JVM, not during defineClass. Only superclass and interfaces are
-    // eagerly resolved, which are handled by visit().
-    record(Type.getMethodType(descriptor), USES);
-    record(exceptions, USES);
-    return methodScanner;
-  }
-
-  /** Attempts to find all types used in method instructions by the helper class. */
-  class MethodScanner extends MethodVisitor {
-    MethodScanner() {
-      super(Opcodes.ASM7, null);
     }
 
+    /** Types that contribute to the helper class shape/hierarchy are required at load-time. */
     @Override
-    public void visitFieldInsn(
-        final int opcode, final String owner, final String name, final String descriptor) {
-      record(Type.getObjectType(owner), USES);
-      record(Type.getType(descriptor), USES);
+    public void visit(
+            final int version,
+            final int access,
+            final String name,
+            final String signature,
+            final String superName,
+            final String[] interfaces) {
+        record(superName, REQUIRES);
+        record(interfaces, REQUIRES);
     }
 
     @Override
-    public void visitMethodInsn(
-        final int opcode,
-        final String owner,
-        final String name,
-        final String descriptor,
-        final boolean isInterface) {
-      record(Type.getObjectType(owner), USES);
-      record(Type.getMethodType(descriptor), USES);
+    public void visitInnerClass(String name, String outerName, String innerName, int access) {
+        if (this.className.equals(name)) {
+            record(outerName, REQUIRES);
+        }
     }
 
     @Override
-    public void visitTypeInsn(final int opcode, final String type) {
-      record(Type.getObjectType(type), USES);
+    public FieldVisitor visitField(
+            final int access, final String name, final String descriptor, final String signature, final Object value) {
+        // Field types are resolved lazily by the JVM, not during defineClass.
+        // Using USES (not REQUIRES) avoids false dependency cycles that can break
+        // topological sort ordering for superclass/interface relationships.
+        record(Type.getType(descriptor), USES);
+        return null;
     }
 
     @Override
-    public void visitInvokeDynamicInsn(
-        String name,
-        String descriptor,
-        Handle bootstrapMethodHandle,
-        Object... bootstrapMethodArguments) {
-      record(Type.getType(descriptor), USES);
-      record(bootstrapMethodHandle, USES);
-      for (Object value : bootstrapMethodArguments) {
-        if (value instanceof Type) {
-          record((Type) value, USES);
-        } else if (value instanceof Handle) {
-          record((Handle) value, USES);
+    public MethodVisitor visitMethod(
+            final int access,
+            final String name,
+            final String descriptor,
+            final String signature,
+            final String[] exceptions) {
+        // Method parameter/return types and declared exceptions are resolved lazily
+        // by the JVM, not during defineClass. Only superclass and interfaces are
+        // eagerly resolved, which are handled by visit().
+        record(Type.getMethodType(descriptor), USES);
+        record(exceptions, USES);
+        return methodScanner;
+    }
+
+    /** Attempts to find all types used in method instructions by the helper class. */
+    class MethodScanner extends MethodVisitor {
+        MethodScanner() {
+            super(Opcodes.ASM7, null);
+        }
+
+        @Override
+        public void visitFieldInsn(final int opcode, final String owner, final String name, final String descriptor) {
+            record(Type.getObjectType(owner), USES);
+            record(Type.getType(descriptor), USES);
+        }
+
+        @Override
+        public void visitMethodInsn(
+                final int opcode,
+                final String owner,
+                final String name,
+                final String descriptor,
+                final boolean isInterface) {
+            record(Type.getObjectType(owner), USES);
+            record(Type.getMethodType(descriptor), USES);
+        }
+
+        @Override
+        public void visitTypeInsn(final int opcode, final String type) {
+            record(Type.getObjectType(type), USES);
+        }
+
+        @Override
+        public void visitInvokeDynamicInsn(
+                String name, String descriptor, Handle bootstrapMethodHandle, Object... bootstrapMethodArguments) {
+            record(Type.getType(descriptor), USES);
+            record(bootstrapMethodHandle, USES);
+            for (Object value : bootstrapMethodArguments) {
+                if (value instanceof Type) {
+                    record((Type) value, USES);
+                } else if (value instanceof Handle) {
+                    record((Handle) value, USES);
+                }
+            }
+        }
+
+        @Override
+        public void visitLdcInsn(final Object value) {
+            if (value instanceof Type) {
+                record((Type) value, USES);
+            } else if (value instanceof Handle) {
+                record((Handle) value, USES);
+            }
         }
-      }
     }
 
-    @Override
-    public void visitLdcInsn(final Object value) {
-      if (value instanceof Type) {
-        record((Type) value, USES);
-      } else if (value instanceof Handle) {
-        record((Handle) value, USES);
-      }
+    /** Marks a class as required; the helper won't load if this class hasn't been loaded first. */
+    void requiresClass(String className) {
+        requires.add(className);
+        uses.add(className);
     }
-  }
-
-  /** Marks a class as required; the helper won't load if this class hasn't been loaded first. */
-  void requiresClass(String className) {
-    requires.add(className);
-    uses.add(className);
-  }
-
-  /** Marks a class as used; the helper doesn't need it at load time but may use it when called. */
-  void usesClass(String className) {
-    uses.add(className);
-  }
-
-  void record(Type type, Consumer<String> action) {
-    if (null != type) {
-      while (type.getSort() == Type.ARRAY) {
-        type = type.getElementType();
-      }
-      if (type.getSort() == Type.METHOD) {
-        record(type.getArgumentTypes(), action);
-        record(type.getReturnType(), action);
-      } else if (type.getSort() == Type.OBJECT) {
-        String className = type.getClassName();
-        // ignore types that we expect to be on the boot-class-path
-        if (this.className.equals(className) || isBootstrapClass(className)) {
-          return;
-        }
-        action.accept(className);
-      }
+
+    /** Marks a class as used; the helper doesn't need it at load time but may use it when called. */
+    void usesClass(String className) {
+        uses.add(className);
     }
-  }
-
-  private static boolean isBootstrapClass(String className) {
-    if (className.startsWith("java.")
-        || className.startsWith("javax.")
-        || className.startsWith("jdk.")
-        || className.startsWith("com.sun.")
-        || className.startsWith("sun.")
-        || className.startsWith("org.slf4j.")
-        || className.startsWith("datadog.slf4j.")) {
-      return true;
+
+    void record(Type type, Consumer<String> action) {
+        if (null != type) {
+            while (type.getSort() == Type.ARRAY) {
+                type = type.getElementType();
+            }
+            if (type.getSort() == Type.METHOD) {
+                record(type.getArgumentTypes(), action);
+                record(type.getReturnType(), action);
+            } else if (type.getSort() == Type.OBJECT) {
+                String className = type.getClassName();
+                // ignore types that we expect to be on the boot-class-path
+                if (this.className.equals(className) || isBootstrapClass(className)) {
+                    return;
+                }
+                action.accept(className);
+            }
+        }
     }
-    for (String prefix : Constants.BOOTSTRAP_PACKAGE_PREFIXES) {
-      if (className.startsWith(prefix)) {
-        return true;
-      }
+
+    private static boolean isBootstrapClass(String className) {
+        if (className.startsWith("java.")
+                || className.startsWith("javax.")
+                || className.startsWith("jdk.")
+                || className.startsWith("com.sun.")
+                || className.startsWith("sun.")
+                || className.startsWith("org.slf4j.")
+                || className.startsWith("datadog.slf4j.")) {
+            return true;
+        }
+        for (String prefix : Constants.BOOTSTRAP_PACKAGE_PREFIXES) {
+            if (className.startsWith(prefix)) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
-
-  void record(Type[] types, Consumer<String> action) {
-    if (null != types) {
-      for (Type t : types) {
-        record(t, action);
-      }
+
+    void record(Type[] types, Consumer<String> action) {
+        if (null != types) {
+            for (Type t : types) {
+                record(t, action);
+            }
+        }
     }
-  }
 
-  void record(Handle handle, Consumer<String> action) {
-    if (null != handle) {
-      record(Type.getObjectType(handle.getOwner()), action);
-      record(Type.getType(handle.getDesc()), action);
+    void record(Handle handle, Consumer<String> action) {
+        if (null != handle) {
+            record(Type.getObjectType(handle.getOwner()), action);
+            record(Type.getType(handle.getDesc()), action);
+        }
     }
-  }
 
-  void record(String internalName, Consumer<String> action) {
-    if (null != internalName) {
-      record(Type.getObjectType(internalName), action);
+    void record(String internalName, Consumer<String> action) {
+        if (null != internalName) {
+            record(Type.getObjectType(internalName), action);
+        }
     }
-  }
 
-  void record(String[] internalNames, Consumer<String> action) {
-    if (null != internalNames) {
-      for (String n : internalNames) {
-        record(Type.getObjectType(n), action);
-      }
+    void record(String[] internalNames, Consumer<String> action) {
+        if (null != internalNames) {
+            for (String n : internalNames) {
+                record(Type.getObjectType(n), action);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java
index 8f53ccd4775..5904a4697b6 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java
@@ -15,130 +15,129 @@
 /** Declares bytebuddy-based type instrumentation for the datadog javaagent. */
 public interface Instrumenter {
 
-  /** Instrumentation that only matches a single named type. */
-  interface ForSingleType {
-    String instrumentedType();
-  }
-
-  /** Instrumentation that can match a series of named types. */
-  interface ForKnownTypes {
-    String[] knownMatchingTypes();
-  }
-
-  /** Instrumentation that matches based on the type hierarchy. */
-  interface ForTypeHierarchy {
-    /** Hint that class-loaders without this type can skip this hierarchy matcher. */
-    String hierarchyMarkerType();
-
-    ElementMatcher<TypeDescription> hierarchyMatcher();
-  }
-
-  /** Instrumentation that transforms types on the bootstrap class-path. */
-  interface ForBootstrap {}
-
-  /**
-   * Instrumentation that matches a series of types configured at runtime. This is used for last
-   * minute additions in the field such as testing a new JDBC driver that is not yet in the allowed
-   * list and to provide a workaround until the next release. The ForKnownTypes interface is more
-   * appropriate when you know the series of types at build-time.
-   */
-  interface ForConfiguredTypes {
-    Collection<String> configuredMatchingTypes();
-  }
-
-  /**
-   * Instrumentation that matches an optional type configured at runtime. This is used for last
-   * minute additions in the field such as testing a new JDBC driver that is not yet in the allowed
-   * list and to provide a workaround until the next release. The ForSingleType interface is more
-   * appropriate when you know the type at build-time.
-   */
-  interface ForConfiguredType extends ForConfiguredTypes {
-    @Override
-    default Collection<String> configuredMatchingTypes() {
-      String type = configuredMatchingType();
-      if (null != type && !type.isEmpty()) {
-        return singletonList(type);
-      } else {
-        return emptyList();
-      }
+    /** Instrumentation that only matches a single named type. */
+    interface ForSingleType {
+        String instrumentedType();
     }
 
-    String configuredMatchingType();
-  }
-
-  /** Instrumentation that matches based on the caller of an instruction. */
-  interface ForCallSite {
-    ElementMatcher<TypeDescription> callerType();
-  }
-
-  /** Instrumentation that can optionally widen matching to consider the type hierarchy. */
-  interface CanShortcutTypeMatching extends ForKnownTypes, ForTypeHierarchy {
-    boolean onlyMatchKnownTypes();
-  }
-
-  /** Instrumentation that wants to apply additional structure checks after type matching. */
-  interface WithTypeStructure {
-    ElementMatcher<TypeDescription> structureMatcher();
-  }
-
-  /**
-   * Instrumentation whose type advice adds fields, methods, or interfaces to the original type.
-   *
-   * <p>Note: {@link #typeAdvice} must not rely on injected helper classes or context-stores; those
-   * features are limited to bytecode inserted by {@link HasMethodAdvice#methodAdvice}.
-   */
-  interface WithStructuralChange extends HasTypeAdvice {
-    /** The marker interface added by the structural change, used to detect already-loaded types. */
-    Class<?> structuralChangeMarker();
-  }
-
-  /** Instrumentation that provides advice which affects the whole type. */
-  interface HasTypeAdvice extends Instrumenter {
+    /** Instrumentation that can match a series of named types. */
+    interface ForKnownTypes {
+        String[] knownMatchingTypes();
+    }
+
+    /** Instrumentation that matches based on the type hierarchy. */
+    interface ForTypeHierarchy {
+        /** Hint that class-loaders without this type can skip this hierarchy matcher. */
+        String hierarchyMarkerType();
+
+        ElementMatcher<TypeDescription> hierarchyMatcher();
+    }
+
+    /** Instrumentation that transforms types on the bootstrap class-path. */
+    interface ForBootstrap {}
+
     /**
-     * Instrumenters should register the full type advice with {@link
-     * TypeTransformer#applyAdvice(TransformingAdvice)}.
+     * Instrumentation that matches a series of types configured at runtime. This is used for last
+     * minute additions in the field such as testing a new JDBC driver that is not yet in the allowed
+     * list and to provide a workaround until the next release. The ForKnownTypes interface is more
+     * appropriate when you know the series of types at build-time.
      */
-    void typeAdvice(TypeTransformer transformer);
-  }
+    interface ForConfiguredTypes {
+        Collection<String> configuredMatchingTypes();
+    }
+
+    /**
+     * Instrumentation that matches an optional type configured at runtime. This is used for last
+     * minute additions in the field such as testing a new JDBC driver that is not yet in the allowed
+     * list and to provide a workaround until the next release. The ForSingleType interface is more
+     * appropriate when you know the type at build-time.
+     */
+    interface ForConfiguredType extends ForConfiguredTypes {
+        @Override
+        default Collection<String> configuredMatchingTypes() {
+            String type = configuredMatchingType();
+            if (null != type && !type.isEmpty()) {
+                return singletonList(type);
+            } else {
+                return emptyList();
+            }
+        }
+
+        String configuredMatchingType();
+    }
+
+    /** Instrumentation that matches based on the caller of an instruction. */
+    interface ForCallSite {
+        ElementMatcher<TypeDescription> callerType();
+    }
+
+    /** Instrumentation that can optionally widen matching to consider the type hierarchy. */
+    interface CanShortcutTypeMatching extends ForKnownTypes, ForTypeHierarchy {
+        boolean onlyMatchKnownTypes();
+    }
+
+    /** Instrumentation that wants to apply additional structure checks after type matching. */
+    interface WithTypeStructure {
+        ElementMatcher<TypeDescription> structureMatcher();
+    }
 
-  /** Instrumentation that provides advice specific to one or more methods. */
-  interface HasMethodAdvice extends Instrumenter {
     /**
-     * Instrumenters should register each method advice with {@link
-     * MethodTransformer#applyAdvice(ElementMatcher, String)}.
+     * Instrumentation whose type advice adds fields, methods, or interfaces to the original type.
+     *
+     * <p>Note: {@link #typeAdvice} must not rely on injected helper classes or context-stores; those
+     * features are limited to bytecode inserted by {@link HasMethodAdvice#methodAdvice}.
      */
-    void methodAdvice(MethodTransformer transformer);
-  }
+    interface WithStructuralChange extends HasTypeAdvice {
+        /** The marker interface added by the structural change, used to detect already-loaded types. */
+        Class<?> structuralChangeMarker();
+    }
 
-  /** Applies type advice from an instrumentation that {@link HasTypeAdvice}. */
-  interface TypeTransformer {
-    void applyAdvice(TransformingAdvice typeAdvice);
+    /** Instrumentation that provides advice which affects the whole type. */
+    interface HasTypeAdvice extends Instrumenter {
+        /**
+         * Instrumenters should register the full type advice with {@link
+         * TypeTransformer#applyAdvice(TransformingAdvice)}.
+         */
+        void typeAdvice(TypeTransformer transformer);
+    }
+
+    /** Instrumentation that provides advice specific to one or more methods. */
+    interface HasMethodAdvice extends Instrumenter {
+        /**
+         * Instrumenters should register each method advice with {@link
+         * MethodTransformer#applyAdvice(ElementMatcher, String)}.
+         */
+        void methodAdvice(MethodTransformer transformer);
+    }
 
-    default void applyAdvice(AsmVisitorWrapper typeVisitor) {
-      applyAdvice(new VisitingAdvice(typeVisitor));
+    /** Applies type advice from an instrumentation that {@link HasTypeAdvice}. */
+    interface TypeTransformer {
+        void applyAdvice(TransformingAdvice typeAdvice);
+
+        default void applyAdvice(AsmVisitorWrapper typeVisitor) {
+            applyAdvice(new VisitingAdvice(typeVisitor));
+        }
     }
-  }
 
-  /** Applies method advice from an instrumentation that {@link HasMethodAdvice}. */
-  interface MethodTransformer {
-    default void applyAdvice(
-        ElementMatcher<? super MethodDescription> matcher, String adviceClass) {
-      applyAdvices(matcher, adviceClass, (String[]) null);
+    /** Applies method advice from an instrumentation that {@link HasMethodAdvice}. */
+    interface MethodTransformer {
+        default void applyAdvice(ElementMatcher<? super MethodDescription> matcher, String adviceClass) {
+            applyAdvices(matcher, adviceClass, (String[]) null);
+        }
+
+        void applyAdvices(
+                ElementMatcher<? super MethodDescription> matcher,
+                String adviceClass,
+                String... additionalAdviceClasses);
     }
 
-    void applyAdvices(
-        ElementMatcher<? super MethodDescription> matcher,
-        String adviceClass,
-        String... additionalAdviceClasses);
-  }
-
-  /** Contributes a transformation step to the dynamic type builder. */
-  interface TransformingAdvice {
-    DynamicType.Builder<?> transform(
-        DynamicType.Builder<?> builder,
-        TypeDescription typeDescription,
-        ClassLoader classLoader,
-        JavaModule module,
-        ProtectionDomain pd);
-  }
+    /** Contributes a transformation step to the dynamic type builder. */
+    interface TransformingAdvice {
+        DynamicType.Builder<?> transform(
+                DynamicType.Builder<?> builder,
+                TypeDescription typeDescription,
+                ClassLoader classLoader,
+                JavaModule module,
+                ProtectionDomain pd);
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterFlare.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterFlare.java
index 284ae40dc7e..d74dfe79a2c 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterFlare.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterFlare.java
@@ -8,73 +8,71 @@
 import java.util.zip.ZipOutputStream;
 
 public final class InstrumenterFlare implements TracerFlare.Reporter {
-  private static final InstrumenterFlare INSTANCE = new InstrumenterFlare();
-  private static final int MAX_TRANSFORMATION_ERRORS = 64;
-  private static final int MAX_ERROR_LENGTH = 4096;
+    private static final InstrumenterFlare INSTANCE = new InstrumenterFlare();
+    private static final int MAX_TRANSFORMATION_ERRORS = 64;
+    private static final int MAX_ERROR_LENGTH = 4096;
 
-  // Debug-only entries may contain application class and method names of any size, so bound both
-  // the number and length of entries retained for an explicitly requested tracer flare.
-  private final Map<String, Integer> transformationErrors = new LinkedHashMap<>();
-  private long droppedTransformationErrors;
+    // Debug-only entries may contain application class and method names of any size, so bound both
+    // the number and length of entries retained for an explicitly requested tracer flare.
+    private final Map<String, Integer> transformationErrors = new LinkedHashMap<>();
+    private long droppedTransformationErrors;
 
-  public static void register() {
-    TracerFlare.addReporter(INSTANCE);
-  }
-
-  @Override
-  public void addReportToFlare(ZipOutputStream zip) throws IOException {
-    TracerFlare.addText(zip, "instrumenter_state.txt", InstrumenterState.summary());
-    TracerFlare.addText(zip, "instrumenter_metrics.txt", InstrumenterMetrics.summary());
-    String errors = transformationErrors();
-    if (!errors.isEmpty()) {
-      TracerFlare.addText(zip, "instrumenter_errors.txt", errors);
+    public static void register() {
+        TracerFlare.addReporter(INSTANCE);
     }
-  }
 
-  static void recordTransformationError(String error) {
-    if (error.length() > MAX_ERROR_LENGTH) {
-      error = error.substring(0, MAX_ERROR_LENGTH) + "...";
+    @Override
+    public void addReportToFlare(ZipOutputStream zip) throws IOException {
+        TracerFlare.addText(zip, "instrumenter_state.txt", InstrumenterState.summary());
+        TracerFlare.addText(zip, "instrumenter_metrics.txt", InstrumenterMetrics.summary());
+        String errors = transformationErrors();
+        if (!errors.isEmpty()) {
+            TracerFlare.addText(zip, "instrumenter_errors.txt", errors);
+        }
     }
-    synchronized (INSTANCE.transformationErrors) {
-      Integer count = INSTANCE.transformationErrors.get(error);
-      if (count != null) {
-        if (count < Integer.MAX_VALUE) {
-          INSTANCE.transformationErrors.put(error, count + 1);
+
+    static void recordTransformationError(String error) {
+        if (error.length() > MAX_ERROR_LENGTH) {
+            error = error.substring(0, MAX_ERROR_LENGTH) + "...";
+        }
+        synchronized (INSTANCE.transformationErrors) {
+            Integer count = INSTANCE.transformationErrors.get(error);
+            if (count != null) {
+                if (count < Integer.MAX_VALUE) {
+                    INSTANCE.transformationErrors.put(error, count + 1);
+                }
+            } else if (INSTANCE.transformationErrors.size() < MAX_TRANSFORMATION_ERRORS) {
+                INSTANCE.transformationErrors.put(error, 1);
+            } else {
+                INSTANCE.droppedTransformationErrors++;
+            }
         }
-      } else if (INSTANCE.transformationErrors.size() < MAX_TRANSFORMATION_ERRORS) {
-        INSTANCE.transformationErrors.put(error, 1);
-      } else {
-        INSTANCE.droppedTransformationErrors++;
-      }
     }
-  }
 
-  static String transformationErrors() {
-    synchronized (INSTANCE.transformationErrors) {
-      StringBuilder summary = new StringBuilder();
-      for (Map.Entry<String, Integer> error : INSTANCE.transformationErrors.entrySet()) {
-        summary
-            .append("count=")
-            .append(error.getValue())
-            .append(" detail=")
-            .append(error.getKey())
-            .append('\n');
-      }
-      if (INSTANCE.droppedTransformationErrors > 0) {
-        summary
-            .append("dropped_error_count=")
-            .append(INSTANCE.droppedTransformationErrors)
-            .append('\n');
-      }
-      return summary.toString();
+    static String transformationErrors() {
+        synchronized (INSTANCE.transformationErrors) {
+            StringBuilder summary = new StringBuilder();
+            for (Map.Entry<String, Integer> error : INSTANCE.transformationErrors.entrySet()) {
+                summary.append("count=")
+                        .append(error.getValue())
+                        .append(" detail=")
+                        .append(error.getKey())
+                        .append('\n');
+            }
+            if (INSTANCE.droppedTransformationErrors > 0) {
+                summary.append("dropped_error_count=")
+                        .append(INSTANCE.droppedTransformationErrors)
+                        .append('\n');
+            }
+            return summary.toString();
+        }
     }
-  }
 
-  @VisibleForTesting
-  static void resetTransformationErrors() {
-    synchronized (INSTANCE.transformationErrors) {
-      INSTANCE.transformationErrors.clear();
-      INSTANCE.droppedTransformationErrors = 0;
+    @VisibleForTesting
+    static void resetTransformationErrors() {
+        synchronized (INSTANCE.transformationErrors) {
+            INSTANCE.transformationErrors.clear();
+            INSTANCE.droppedTransformationErrors = 0;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterIndex.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterIndex.java
index 2bdc12abf7c..4b156ca3560 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterIndex.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterIndex.java
@@ -47,503 +47,494 @@
  * TargetSystem values.
  */
 final class InstrumenterIndex {
-  private static final Logger log = LoggerFactory.getLogger(InstrumenterIndex.class);
-
-  private static final String INSTRUMENTER_INDEX_NAME = "instrumenter.index";
-
-  // Special memberCount that indicates a module contains itself as a transformation
-  private static final int SELF_MEMBERSHIP = 0xFF;
-
-  /** Bit to signal that the encoded item has target system overrides */
-  private static final int HAS_TARGET_SYSTEMS_OVERRIDES_FLAG = 0x01;
-
-  /**
-   * Bit to signal that the module needs to be early loaded regardless its applicability (i.e. it is
-   * instance of <code>ExcludeFilterProvider</code> or <code>JavaModuleOpenProvider</code>)
-   */
-  private static final int NEEDS_EARLY_LOAD_FLAG = 0x02;
-
-  static final ClassLoader instrumenterClassLoader = Instrumenter.class.getClassLoader();
-
-  private final int instrumentationCount;
-  private final int transformationCount;
-
-  private final InstrumenterModule[] modules;
-
-  // packed sequence of module type names and their expected member names:
-  // module1, targetSystems, flags, memberCount, memberA, memberB, (targetSystemOverrides), module2,
-  // memberCount, memberC, ...
-  // (each string is encoded as its length plus that number of ASCII bytes)
-  private final byte[] packedNames;
-  private int nameIndex;
-
-  // current module details
-  private int instrumentationId = -1;
-  private String moduleName;
-  private int memberCount;
-  private boolean hasTargetSystemOverrides;
-
-  // current member details
-  private int transformationId = -1;
-  private String memberName;
-  private Map<String, Set<InstrumenterModule.TargetSystem>> memberAdviceTargetSystemOverrides;
-
-  private InstrumenterIndex(int instrumentationCount, int transformationCount, byte[] packedNames) {
-    this.modules = new InstrumenterModule[instrumentationCount];
-    this.instrumentationCount = instrumentationCount;
-    this.transformationCount = transformationCount;
-    this.packedNames = packedNames;
-  }
-
-  /**
-   * Queries the index to select modules that either belong to the enabled targetSystems or that
-   * provide an ExcludeFilter
-   *
-   * @param enabledSystems the enabled target systems
-   * @return an iterable of modules that apply.
-   */
-  public Iterable<InstrumenterModule> modules(
-      final Set<InstrumenterModule.TargetSystem> enabledSystems) {
-    return modules(forTargetSystemsOrNeedToEarlyLoad(enabledSystems));
-  }
-
-  public Iterable<InstrumenterModule> modules() {
-    return modules(ALL_MODULES);
-  }
-
-  public Iterable<InstrumenterModule> modules(final InstrumenterModuleFilter filter) {
-    return () -> new ModuleIterator(filter);
-  }
-
-  final class ModuleIterator implements Iterator<InstrumenterModule> {
-    private final InstrumenterModuleFilter filter;
-    private InstrumenterModule module;
-
-    ModuleIterator(final InstrumenterModuleFilter filter) {
-      this.filter = filter;
-      restart();
-    }
-
-    @Override
-    public boolean hasNext() {
-      while (null == module && hasNextModule()) {
-        module = nextModule(filter);
-      }
-      return null != module;
-    }
-
-    @Override
-    public InstrumenterModule next() {
-      if (hasNext()) {
-        InstrumenterModule result = module;
-        module = null;
-        return result;
-      } else {
-        throw new NoSuchElementException();
-      }
-    }
-  }
-
-  /** Maximum known count of {@link InstrumenterModule} instrumentations. */
-  public int instrumentationCount() {
-    return instrumentationCount;
-  }
-
-  /** Maximum known count of {@link Instrumenter} transformations. */
-  public int transformationCount() {
-    return transformationCount;
-  }
-
-  /** Returns the id allocated to the instrumentation; {@code -1} if unknown. */
-  public int instrumentationId(InstrumenterModule module) {
-    if (module.getClass().getName().equals(moduleName)) {
-      return instrumentationId;
-    }
-    return -1;
-  }
-
-  /** Returns the id allocated to the transformation; {@code -1} if unknown. */
-  public int transformationId(Instrumenter member) {
-    if (null == memberName && memberCount > 0) {
-      nextMember(); // move through expected members as transformations are applied
-    }
-    if (null != memberName && member.getClass().getName().endsWith(memberName)) {
-      memberName = null; // mark member as used for this iteration
-      return transformationId;
-    }
-    // reset back the overrides
-    memberAdviceTargetSystemOverrides = null;
-    return -1;
-  }
-
-  public boolean isAdviceEnabled(
-      String adviceClass, Set<InstrumenterModule.TargetSystem> enabledSystems) {
-    if (memberAdviceTargetSystemOverrides == null) {
-      return true;
-    }
-    Set<InstrumenterModule.TargetSystem> targetSystemOverrides =
-        memberAdviceTargetSystemOverrides.get(Strings.getSimpleName(adviceClass));
-    return null == targetSystemOverrides || !disjoint(targetSystemOverrides, enabledSystems);
-  }
-
-  /** Resets the iteration to the start of the index. */
-  void restart() {
-    nameIndex = 0;
-    instrumentationId = -1;
-    transformationId = -1;
-    memberCount = 0;
-    memberAdviceTargetSystemOverrides = null;
-    hasTargetSystemOverrides = false;
-  }
-
-  /** Is there another known {@link InstrumenterModule} left in the index? */
-  boolean hasNextModule() {
-    return instrumentationCount - instrumentationId > 1;
-  }
-
-  /** Returns the next {@link InstrumenterModule} in the index. */
-  InstrumenterModule nextModule(InstrumenterModuleFilter filter) {
-    while (memberCount > 0) {
-      skipMember(); // skip past unmatched members from previous module
-    }
-    InstrumenterModule module = modules[++instrumentationId];
-    if (null != module) {
-      // use data from previously loaded module
-      moduleName = module.getClass().getName();
-      skipName();
-    } else {
-      moduleName = readName();
-    }
-    // global module target systems
-    final short systems = readShort();
-    final Set<InstrumenterModule.TargetSystem> moduleTargetSystems = decodeTargetSystems(systems);
-    // flags
-    final byte flags = (byte) readNumber();
-    final boolean needsEarlyLoad = decodeModuleNeedsEarlyLoad(flags);
-    hasTargetSystemOverrides = decodeModuleHasTargetSystemOverrides(flags);
-    memberAdviceTargetSystemOverrides = null;
-    memberCount = readNumber();
-    if (SELF_MEMBERSHIP == memberCount) {
-      transformationId++;
-      memberName = moduleName;
-      memberCount = 0;
-      decodeTargetSystemOverrides();
-    } else {
-      memberName = null;
-    }
-    if (filter.test(moduleName, moduleTargetSystems, needsEarlyLoad)) {
-      if (module == null) {
-        module = buildModule();
-        modules[instrumentationId] = module;
-      }
-      return module;
-    } else {
-      log.debug("Skipping module {} as it is excluded", moduleName);
-    }
-    return null;
-  }
-
-  private InstrumenterModule buildModule() {
-    try {
-      @SuppressWarnings({"rawtypes", "unchecked"})
-      Class<InstrumenterModule> nextType = (Class) instrumenterClassLoader.loadClass(moduleName);
-      return nextType.getConstructor().newInstance();
-    } catch (Throwable e) {
-      log.error("Failed to build instrumentation module {}", moduleName, e);
-      return null;
-    }
-  }
-
-  /** Moves onto the next member in the expected sequence. */
-  private void nextMember() {
-    memberCount--;
-    transformationId++;
-    memberName = readName();
-    decodeTargetSystemOverrides();
-  }
-
-  private void decodeTargetSystemOverrides() {
-    if (hasTargetSystemOverrides) {
-      int overrideCount = readNumber();
-      if (overrideCount > 0) {
-        memberAdviceTargetSystemOverrides = new HashMap<>(overrideCount * 4 / 3, 0.75f);
-        for (int i = 0; i < overrideCount; i++) {
-          memberAdviceTargetSystemOverrides.put(readName(), decodeTargetSystems(readShort()));
+    private static final Logger log = LoggerFactory.getLogger(InstrumenterIndex.class);
+
+    private static final String INSTRUMENTER_INDEX_NAME = "instrumenter.index";
+
+    // Special memberCount that indicates a module contains itself as a transformation
+    private static final int SELF_MEMBERSHIP = 0xFF;
+
+    /** Bit to signal that the encoded item has target system overrides */
+    private static final int HAS_TARGET_SYSTEMS_OVERRIDES_FLAG = 0x01;
+
+    /**
+     * Bit to signal that the module needs to be early loaded regardless its applicability (i.e. it is
+     * instance of <code>ExcludeFilterProvider</code> or <code>JavaModuleOpenProvider</code>)
+     */
+    private static final int NEEDS_EARLY_LOAD_FLAG = 0x02;
+
+    static final ClassLoader instrumenterClassLoader = Instrumenter.class.getClassLoader();
+
+    private final int instrumentationCount;
+    private final int transformationCount;
+
+    private final InstrumenterModule[] modules;
+
+    // packed sequence of module type names and their expected member names:
+    // module1, targetSystems, flags, memberCount, memberA, memberB, (targetSystemOverrides), module2,
+    // memberCount, memberC, ...
+    // (each string is encoded as its length plus that number of ASCII bytes)
+    private final byte[] packedNames;
+    private int nameIndex;
+
+    // current module details
+    private int instrumentationId = -1;
+    private String moduleName;
+    private int memberCount;
+    private boolean hasTargetSystemOverrides;
+
+    // current member details
+    private int transformationId = -1;
+    private String memberName;
+    private Map<String, Set<InstrumenterModule.TargetSystem>> memberAdviceTargetSystemOverrides;
+
+    private InstrumenterIndex(int instrumentationCount, int transformationCount, byte[] packedNames) {
+        this.modules = new InstrumenterModule[instrumentationCount];
+        this.instrumentationCount = instrumentationCount;
+        this.transformationCount = transformationCount;
+        this.packedNames = packedNames;
+    }
+
+    /**
+     * Queries the index to select modules that either belong to the enabled targetSystems or that
+     * provide an ExcludeFilter
+     *
+     * @param enabledSystems the enabled target systems
+     * @return an iterable of modules that apply.
+     */
+    public Iterable<InstrumenterModule> modules(final Set<InstrumenterModule.TargetSystem> enabledSystems) {
+        return modules(forTargetSystemsOrNeedToEarlyLoad(enabledSystems));
+    }
+
+    public Iterable<InstrumenterModule> modules() {
+        return modules(ALL_MODULES);
+    }
+
+    public Iterable<InstrumenterModule> modules(final InstrumenterModuleFilter filter) {
+        return () -> new ModuleIterator(filter);
+    }
+
+    final class ModuleIterator implements Iterator<InstrumenterModule> {
+        private final InstrumenterModuleFilter filter;
+        private InstrumenterModule module;
+
+        ModuleIterator(final InstrumenterModuleFilter filter) {
+            this.filter = filter;
+            restart();
+        }
+
+        @Override
+        public boolean hasNext() {
+            while (null == module && hasNextModule()) {
+                module = nextModule(filter);
+            }
+            return null != module;
+        }
+
+        @Override
+        public InstrumenterModule next() {
+            if (hasNext()) {
+                InstrumenterModule result = module;
+                module = null;
+                return result;
+            } else {
+                throw new NoSuchElementException();
+            }
+        }
+    }
+
+    /** Maximum known count of {@link InstrumenterModule} instrumentations. */
+    public int instrumentationCount() {
+        return instrumentationCount;
+    }
+
+    /** Maximum known count of {@link Instrumenter} transformations. */
+    public int transformationCount() {
+        return transformationCount;
+    }
+
+    /** Returns the id allocated to the instrumentation; {@code -1} if unknown. */
+    public int instrumentationId(InstrumenterModule module) {
+        if (module.getClass().getName().equals(moduleName)) {
+            return instrumentationId;
+        }
+        return -1;
+    }
+
+    /** Returns the id allocated to the transformation; {@code -1} if unknown. */
+    public int transformationId(Instrumenter member) {
+        if (null == memberName && memberCount > 0) {
+            nextMember(); // move through expected members as transformations are applied
+        }
+        if (null != memberName && member.getClass().getName().endsWith(memberName)) {
+            memberName = null; // mark member as used for this iteration
+            return transformationId;
         }
-      } else {
+        // reset back the overrides
         memberAdviceTargetSystemOverrides = null;
-      }
-    }
-  }
-
-  /** Skips past the next member in the expected sequence. */
-  private void skipMember() {
-    memberCount--;
-    transformationId++;
-    skipName();
-    if (hasTargetSystemOverrides) {
-      // skip next N custom overrides
-      for (int i = 0, overrideCount = readNumber(); i < overrideCount; i++) {
-        skipName();
-        // skip the target system short
-        this.nameIndex += 2;
-      }
-    }
-  }
-
-  /** Reads a single-byte-encoded string from the packed name sequence. */
-  private String readName() {
-    int length = readNumber();
-    String name = new String(packedNames, nameIndex, length, ISO_8859_1);
-    nameIndex += length;
-    return name;
-  }
-
-  /** Skips a single-byte-encoded string from the packed name sequence. */
-  private void skipName() {
-    int length = readNumber();
-    nameIndex += length;
-  }
-
-  /** Reads an unsigned byte from the packed name sequence. */
-  private int readNumber() {
-    return 0xFF & (int) packedNames[nameIndex++];
-  }
-
-  private short readShort() {
-    return (short) ((packedNames[nameIndex++] << 8) + (packedNames[nameIndex++] & 0xFF));
-  }
-
-  public static InstrumenterIndex readIndex() {
-    URL indexResource = instrumenterClassLoader.getResource(INSTRUMENTER_INDEX_NAME);
-    if (null != indexResource) {
-      try (DataInputStream in =
-          new DataInputStream(new BufferedInputStream(indexResource.openStream()))) {
-        int instrumentationCount = in.readInt();
-        int transformationCount = in.readInt();
-        int packedNamesLength = in.readInt();
-        byte[] packedNames = new byte[packedNamesLength];
-        in.readFully(packedNames);
-        return new InstrumenterIndex(instrumentationCount, transformationCount, packedNames);
-      } catch (Throwable e) {
-        log.error("Problem reading {}", INSTRUMENTER_INDEX_NAME, e);
-      }
-    }
-    return buildIndex(); // fallback to runtime generation when testing
-  }
-
-  public static InstrumenterIndex buildIndex() {
-    IndexGenerator indexGenerator = new IndexGenerator();
-    indexGenerator.buildIndex();
-    // bypass writing to file, convert into structure expected at runtime
-    return new InstrumenterIndex(
-        indexGenerator.instrumentationCount,
-        indexGenerator.transformationCount,
-        indexGenerator.packedNames.toByteArray());
-  }
-
-  /** Loads instrumentation modules annotated with {@code @AutoService}. */
-  static List<InstrumenterModule> loadModules(ClassLoader loader) throws IOException {
-    List<InstrumenterModule> modules = new ArrayList<>();
-    for (String moduleName : loadModuleNames(loader)) {
-      try {
-        @SuppressWarnings({"rawtypes", "unchecked"})
-        Class<InstrumenterModule> moduleType = (Class) loader.loadClass(moduleName);
-        modules.add(moduleType.getConstructor().newInstance());
-      } catch (Throwable e) {
-        log.error("Failed to load instrumentation module {}", moduleName, e);
-      }
-    }
-    // enforce module ordering (lowest-value first) before indexing
-    modules.sort(Comparator.comparingInt(InstrumenterModule::order));
-    return modules;
-  }
-
-  /** Loads the type names of instrumentation modules annotated with {@code @AutoService}. */
-  private static String[] loadModuleNames(ClassLoader loader) throws IOException {
-    Set<String> lines = new LinkedHashSet<>();
-    Enumeration<URL> urls =
-        loader.getResources("META-INF/services/datadog.trace.agent.tooling.InstrumenterModule");
-    while (urls.hasMoreElements()) {
-      try (BufferedReader reader =
-          new BufferedReader(new InputStreamReader(urls.nextElement().openStream(), UTF_8))) {
-        String line = reader.readLine();
-        while (line != null) {
-          lines.add(line);
-          line = reader.readLine();
+        return -1;
+    }
+
+    public boolean isAdviceEnabled(String adviceClass, Set<InstrumenterModule.TargetSystem> enabledSystems) {
+        if (memberAdviceTargetSystemOverrides == null) {
+            return true;
         }
-      }
-    }
-    return lines.toArray(new String[0]);
-  }
-
-  static byte encodeModuleFlags(final InstrumenterModule module, final boolean hasCustomOverrides) {
-    byte ret = (byte) (hasCustomOverrides ? HAS_TARGET_SYSTEMS_OVERRIDES_FLAG : 0);
-    if (module instanceof ExcludeFilterProvider || module instanceof JavaModuleOpenProvider) {
-      ret |= (byte) NEEDS_EARLY_LOAD_FLAG;
-    }
-    return ret;
-  }
-
-  static boolean decodeModuleNeedsEarlyLoad(byte flags) {
-    return (flags & NEEDS_EARLY_LOAD_FLAG) != 0;
-  }
-
-  static boolean decodeModuleHasTargetSystemOverrides(byte flags) {
-    return (flags & HAS_TARGET_SYSTEMS_OVERRIDES_FLAG) != 0;
-  }
-
-  static short encodeTargetSystems(Set<InstrumenterModule.TargetSystem> targetSystems) {
-    final int allTargetSystemsCount = InstrumenterModule.TargetSystem.values().length;
-    // Safety check to ensure we don’t overflow the index if additional TargetSystem enums are added
-    if (allTargetSystemsCount > 16) {
-      throw new IllegalStateException(
-          "Using a short will only allow encoding 16 different target systems, but found "
-              + allTargetSystemsCount
-              + ". Please use a larger data type for encoding/decoding this field.");
-    }
-    short ret = 0;
-    for (InstrumenterModule.TargetSystem ts : targetSystems) {
-      ret |= (short) (1 << ts.ordinal());
-    }
-    return ret;
-  }
-
-  static Set<InstrumenterModule.TargetSystem> decodeTargetSystems(final short targetSystems) {
-    final Set<InstrumenterModule.TargetSystem> ret =
-        EnumSet.noneOf(InstrumenterModule.TargetSystem.class);
-    short i = 1;
-    for (InstrumenterModule.TargetSystem targetSystem : InstrumenterModule.TargetSystem.values()) {
-      if ((targetSystems & i) != 0) {
-        ret.add(targetSystem);
-      }
-      i <<= 1;
-    }
-    return ret;
-  }
-
-  static Set<InstrumenterModule.TargetSystem> findModuleTargetSystems(
-      final InstrumenterModule module) {
-    final Set<InstrumenterModule.TargetSystem> ret =
-        EnumSet.noneOf(InstrumenterModule.TargetSystem.class);
-    for (InstrumenterModule.TargetSystem targetSystem : InstrumenterModule.TargetSystem.values()) {
-      if (module.isApplicable(singleton(targetSystem))) {
-        ret.add(targetSystem);
-      }
-    }
-    return ret;
-  }
-
-  static void writeAdviceOverrides(
-      final DataOutputStream out,
-      Instrumenter instrumenter,
-      Map<Instrumenter, Map<String, Set<InstrumenterModule.TargetSystem>>> allModuleOverrides)
-      throws IOException {
-    if (allModuleOverrides.isEmpty()) {
-      return;
-    }
-    final Map<String, Set<InstrumenterModule.TargetSystem>> overrides =
-        allModuleOverrides.get(instrumenter);
-    if (overrides == null) {
-      out.writeByte(0);
-      return;
-    }
-    out.writeByte(overrides.size());
-    for (Map.Entry<String, Set<InstrumenterModule.TargetSystem>> entry : overrides.entrySet()) {
-      // pack target system and advice name
-      out.writeByte(entry.getKey().length());
-      out.writeBytes(entry.getKey());
-      out.writeShort(encodeTargetSystems(entry.getValue()));
-    }
-  }
-
-  /** Generates an index from known {@link InstrumenterModule}s on the build class-path. */
-  static final class IndexGenerator {
-    final ByteArrayOutputStream packedNames = new ByteArrayOutputStream();
-
-    int instrumentationCount = 0;
-    int transformationCount = 0;
-
-    public void buildIndex() {
-      log.debug("Generating InstrumenterIndex");
-      try (DataOutputStream out = new DataOutputStream(packedNames)) {
-        for (InstrumenterModule module : loadModules(instrumenterClassLoader)) {
-          String moduleName = module.getClass().getName();
-          instrumentationCount++;
-          // scan the advices to find overrides
-          Map<Instrumenter, Map<String, Set<InstrumenterModule.TargetSystem>>> adviceOverrides =
-              new HashMap<>();
-          final Set<InstrumenterModule.TargetSystem> moduleTargetSystems =
-              findModuleTargetSystems(module);
-          for (Instrumenter instrumenter : module.typeInstrumentations()) {
-            final Map<String, Set<InstrumenterModule.TargetSystem>> overrides =
-                AdviceAppliesOnScanner.extractTargetSystemOverrides(instrumenter);
-            overrides.forEach((ignored, systems) -> moduleTargetSystems.addAll(systems));
-            if (!overrides.isEmpty()) {
-              adviceOverrides.put(instrumenter, overrides);
+        Set<InstrumenterModule.TargetSystem> targetSystemOverrides =
+                memberAdviceTargetSystemOverrides.get(Strings.getSimpleName(adviceClass));
+        return null == targetSystemOverrides || !disjoint(targetSystemOverrides, enabledSystems);
+    }
+
+    /** Resets the iteration to the start of the index. */
+    void restart() {
+        nameIndex = 0;
+        instrumentationId = -1;
+        transformationId = -1;
+        memberCount = 0;
+        memberAdviceTargetSystemOverrides = null;
+        hasTargetSystemOverrides = false;
+    }
+
+    /** Is there another known {@link InstrumenterModule} left in the index? */
+    boolean hasNextModule() {
+        return instrumentationCount - instrumentationId > 1;
+    }
+
+    /** Returns the next {@link InstrumenterModule} in the index. */
+    InstrumenterModule nextModule(InstrumenterModuleFilter filter) {
+        while (memberCount > 0) {
+            skipMember(); // skip past unmatched members from previous module
+        }
+        InstrumenterModule module = modules[++instrumentationId];
+        if (null != module) {
+            // use data from previously loaded module
+            moduleName = module.getClass().getName();
+            skipName();
+        } else {
+            moduleName = readName();
+        }
+        // global module target systems
+        final short systems = readShort();
+        final Set<InstrumenterModule.TargetSystem> moduleTargetSystems = decodeTargetSystems(systems);
+        // flags
+        final byte flags = (byte) readNumber();
+        final boolean needsEarlyLoad = decodeModuleNeedsEarlyLoad(flags);
+        hasTargetSystemOverrides = decodeModuleHasTargetSystemOverrides(flags);
+        memberAdviceTargetSystemOverrides = null;
+        memberCount = readNumber();
+        if (SELF_MEMBERSHIP == memberCount) {
+            transformationId++;
+            memberName = moduleName;
+            memberCount = 0;
+            decodeTargetSystemOverrides();
+        } else {
+            memberName = null;
+        }
+        if (filter.test(moduleName, moduleTargetSystems, needsEarlyLoad)) {
+            if (module == null) {
+                module = buildModule();
+                modules[instrumentationId] = module;
             }
-          }
-          // merge all the overrides to have the largest condition for this module
-          out.writeByte(moduleName.length());
-          out.writeBytes(moduleName);
-          // write the global target systems for the module
-          out.writeShort(encodeTargetSystems(moduleTargetSystems));
-          // write flags
-          out.writeByte(encodeModuleFlags(module, !adviceOverrides.isEmpty()));
-          try {
-            List<Instrumenter> members = module.typeInstrumentations();
-            if (members.equals(singletonList(module))) {
-              transformationCount++;
-              out.writeByte(SELF_MEMBERSHIP);
-              writeAdviceOverrides(out, module, adviceOverrides);
+            return module;
+        } else {
+            log.debug("Skipping module {} as it is excluded", moduleName);
+        }
+        return null;
+    }
 
+    private InstrumenterModule buildModule() {
+        try {
+            @SuppressWarnings({"rawtypes", "unchecked"})
+            Class<InstrumenterModule> nextType = (Class) instrumenterClassLoader.loadClass(moduleName);
+            return nextType.getConstructor().newInstance();
+        } catch (Throwable e) {
+            log.error("Failed to build instrumentation module {}", moduleName, e);
+            return null;
+        }
+    }
+
+    /** Moves onto the next member in the expected sequence. */
+    private void nextMember() {
+        memberCount--;
+        transformationId++;
+        memberName = readName();
+        decodeTargetSystemOverrides();
+    }
+
+    private void decodeTargetSystemOverrides() {
+        if (hasTargetSystemOverrides) {
+            int overrideCount = readNumber();
+            if (overrideCount > 0) {
+                memberAdviceTargetSystemOverrides = new HashMap<>(overrideCount * 4 / 3, 0.75f);
+                for (int i = 0; i < overrideCount; i++) {
+                    memberAdviceTargetSystemOverrides.put(readName(), decodeTargetSystems(readShort()));
+                }
             } else {
-              out.writeByte(members.size());
-              for (Instrumenter member : members) {
-                // we only need the simple name for matching purposes
-                String memberName = member.getClass().getSimpleName();
-                transformationCount++;
-                out.writeByte(memberName.length());
-                out.writeBytes(memberName);
-                writeAdviceOverrides(out, member, adviceOverrides);
-              }
+                memberAdviceTargetSystemOverrides = null;
             }
-          } catch (Throwable e) {
-            log.error("Failed to index instrumentation module {}", moduleName, e);
-          }
         }
-      } catch (IOException e) {
-        throw new UncheckedIOException("Problem generating InstrumenterIndex", e);
-      }
     }
 
-    public void writeIndex(Path indexFile) throws IOException {
-      try (DataOutputStream out =
-          new DataOutputStream(new BufferedOutputStream(Files.newOutputStream(indexFile)))) {
-        out.writeInt(instrumentationCount);
-        out.writeInt(transformationCount);
-        out.writeInt(packedNames.size());
-        out.write(packedNames.toByteArray());
-      }
+    /** Skips past the next member in the expected sequence. */
+    private void skipMember() {
+        memberCount--;
+        transformationId++;
+        skipName();
+        if (hasTargetSystemOverrides) {
+            // skip next N custom overrides
+            for (int i = 0, overrideCount = readNumber(); i < overrideCount; i++) {
+                skipName();
+                // skip the target system short
+                this.nameIndex += 2;
+            }
+        }
     }
 
-    /**
-     * Called from 'generateInstrumenterIndex' task in 'dd-java-agent/instrumentation/build.gradle'.
-     */
-    public static void main(String[] args) throws IOException {
-      if (args.length < 1) {
-        throw new IllegalArgumentException("Expected: index-dir");
-      }
+    /** Reads a single-byte-encoded string from the packed name sequence. */
+    private String readName() {
+        int length = readNumber();
+        String name = new String(packedNames, nameIndex, length, ISO_8859_1);
+        nameIndex += length;
+        return name;
+    }
+
+    /** Skips a single-byte-encoded string from the packed name sequence. */
+    private void skipName() {
+        int length = readNumber();
+        nameIndex += length;
+    }
+
+    /** Reads an unsigned byte from the packed name sequence. */
+    private int readNumber() {
+        return 0xFF & (int) packedNames[nameIndex++];
+    }
 
-      Path indexDir = Paths.get(args[0]).toAbsolutePath();
+    private short readShort() {
+        return (short) ((packedNames[nameIndex++] << 8) + (packedNames[nameIndex++] & 0xFF));
+    }
+
+    public static InstrumenterIndex readIndex() {
+        URL indexResource = instrumenterClassLoader.getResource(INSTRUMENTER_INDEX_NAME);
+        if (null != indexResource) {
+            try (DataInputStream in = new DataInputStream(new BufferedInputStream(indexResource.openStream()))) {
+                int instrumentationCount = in.readInt();
+                int transformationCount = in.readInt();
+                int packedNamesLength = in.readInt();
+                byte[] packedNames = new byte[packedNamesLength];
+                in.readFully(packedNames);
+                return new InstrumenterIndex(instrumentationCount, transformationCount, packedNames);
+            } catch (Throwable e) {
+                log.error("Problem reading {}", INSTRUMENTER_INDEX_NAME, e);
+            }
+        }
+        return buildIndex(); // fallback to runtime generation when testing
+    }
+
+    public static InstrumenterIndex buildIndex() {
+        IndexGenerator indexGenerator = new IndexGenerator();
+        indexGenerator.buildIndex();
+        // bypass writing to file, convert into structure expected at runtime
+        return new InstrumenterIndex(
+                indexGenerator.instrumentationCount,
+                indexGenerator.transformationCount,
+                indexGenerator.packedNames.toByteArray());
+    }
 
-      // satisfy some instrumenters that cache matchers in initializers
-      HierarchyMatchers.registerIfAbsent(HierarchyMatchers.simpleChecks());
-      SharedTypePools.registerIfAbsent(SharedTypePools.simpleCache());
+    /** Loads instrumentation modules annotated with {@code @AutoService}. */
+    static List<InstrumenterModule> loadModules(ClassLoader loader) throws IOException {
+        List<InstrumenterModule> modules = new ArrayList<>();
+        for (String moduleName : loadModuleNames(loader)) {
+            try {
+                @SuppressWarnings({"rawtypes", "unchecked"})
+                Class<InstrumenterModule> moduleType = (Class) loader.loadClass(moduleName);
+                modules.add(moduleType.getConstructor().newInstance());
+            } catch (Throwable e) {
+                log.error("Failed to load instrumentation module {}", moduleName, e);
+            }
+        }
+        // enforce module ordering (lowest-value first) before indexing
+        modules.sort(Comparator.comparingInt(InstrumenterModule::order));
+        return modules;
+    }
+
+    /** Loads the type names of instrumentation modules annotated with {@code @AutoService}. */
+    private static String[] loadModuleNames(ClassLoader loader) throws IOException {
+        Set<String> lines = new LinkedHashSet<>();
+        Enumeration<URL> urls = loader.getResources("META-INF/services/datadog.trace.agent.tooling.InstrumenterModule");
+        while (urls.hasMoreElements()) {
+            try (BufferedReader reader =
+                    new BufferedReader(new InputStreamReader(urls.nextElement().openStream(), UTF_8))) {
+                String line = reader.readLine();
+                while (line != null) {
+                    lines.add(line);
+                    line = reader.readLine();
+                }
+            }
+        }
+        return lines.toArray(new String[0]);
+    }
+
+    static byte encodeModuleFlags(final InstrumenterModule module, final boolean hasCustomOverrides) {
+        byte ret = (byte) (hasCustomOverrides ? HAS_TARGET_SYSTEMS_OVERRIDES_FLAG : 0);
+        if (module instanceof ExcludeFilterProvider || module instanceof JavaModuleOpenProvider) {
+            ret |= (byte) NEEDS_EARLY_LOAD_FLAG;
+        }
+        return ret;
+    }
+
+    static boolean decodeModuleNeedsEarlyLoad(byte flags) {
+        return (flags & NEEDS_EARLY_LOAD_FLAG) != 0;
+    }
+
+    static boolean decodeModuleHasTargetSystemOverrides(byte flags) {
+        return (flags & HAS_TARGET_SYSTEMS_OVERRIDES_FLAG) != 0;
+    }
 
-      IndexGenerator indexGenerator = new IndexGenerator();
-      indexGenerator.buildIndex();
-      indexGenerator.writeIndex(indexDir.resolve(INSTRUMENTER_INDEX_NAME));
+    static short encodeTargetSystems(Set<InstrumenterModule.TargetSystem> targetSystems) {
+        final int allTargetSystemsCount = InstrumenterModule.TargetSystem.values().length;
+        // Safety check to ensure we don’t overflow the index if additional TargetSystem enums are added
+        if (allTargetSystemsCount > 16) {
+            throw new IllegalStateException(
+                    "Using a short will only allow encoding 16 different target systems, but found "
+                            + allTargetSystemsCount
+                            + ". Please use a larger data type for encoding/decoding this field.");
+        }
+        short ret = 0;
+        for (InstrumenterModule.TargetSystem ts : targetSystems) {
+            ret |= (short) (1 << ts.ordinal());
+        }
+        return ret;
+    }
+
+    static Set<InstrumenterModule.TargetSystem> decodeTargetSystems(final short targetSystems) {
+        final Set<InstrumenterModule.TargetSystem> ret = EnumSet.noneOf(InstrumenterModule.TargetSystem.class);
+        short i = 1;
+        for (InstrumenterModule.TargetSystem targetSystem : InstrumenterModule.TargetSystem.values()) {
+            if ((targetSystems & i) != 0) {
+                ret.add(targetSystem);
+            }
+            i <<= 1;
+        }
+        return ret;
+    }
+
+    static Set<InstrumenterModule.TargetSystem> findModuleTargetSystems(final InstrumenterModule module) {
+        final Set<InstrumenterModule.TargetSystem> ret = EnumSet.noneOf(InstrumenterModule.TargetSystem.class);
+        for (InstrumenterModule.TargetSystem targetSystem : InstrumenterModule.TargetSystem.values()) {
+            if (module.isApplicable(singleton(targetSystem))) {
+                ret.add(targetSystem);
+            }
+        }
+        return ret;
+    }
+
+    static void writeAdviceOverrides(
+            final DataOutputStream out,
+            Instrumenter instrumenter,
+            Map<Instrumenter, Map<String, Set<InstrumenterModule.TargetSystem>>> allModuleOverrides)
+            throws IOException {
+        if (allModuleOverrides.isEmpty()) {
+            return;
+        }
+        final Map<String, Set<InstrumenterModule.TargetSystem>> overrides = allModuleOverrides.get(instrumenter);
+        if (overrides == null) {
+            out.writeByte(0);
+            return;
+        }
+        out.writeByte(overrides.size());
+        for (Map.Entry<String, Set<InstrumenterModule.TargetSystem>> entry : overrides.entrySet()) {
+            // pack target system and advice name
+            out.writeByte(entry.getKey().length());
+            out.writeBytes(entry.getKey());
+            out.writeShort(encodeTargetSystems(entry.getValue()));
+        }
+    }
+
+    /** Generates an index from known {@link InstrumenterModule}s on the build class-path. */
+    static final class IndexGenerator {
+        final ByteArrayOutputStream packedNames = new ByteArrayOutputStream();
+
+        int instrumentationCount = 0;
+        int transformationCount = 0;
+
+        public void buildIndex() {
+            log.debug("Generating InstrumenterIndex");
+            try (DataOutputStream out = new DataOutputStream(packedNames)) {
+                for (InstrumenterModule module : loadModules(instrumenterClassLoader)) {
+                    String moduleName = module.getClass().getName();
+                    instrumentationCount++;
+                    // scan the advices to find overrides
+                    Map<Instrumenter, Map<String, Set<InstrumenterModule.TargetSystem>>> adviceOverrides =
+                            new HashMap<>();
+                    final Set<InstrumenterModule.TargetSystem> moduleTargetSystems = findModuleTargetSystems(module);
+                    for (Instrumenter instrumenter : module.typeInstrumentations()) {
+                        final Map<String, Set<InstrumenterModule.TargetSystem>> overrides =
+                                AdviceAppliesOnScanner.extractTargetSystemOverrides(instrumenter);
+                        overrides.forEach((ignored, systems) -> moduleTargetSystems.addAll(systems));
+                        if (!overrides.isEmpty()) {
+                            adviceOverrides.put(instrumenter, overrides);
+                        }
+                    }
+                    // merge all the overrides to have the largest condition for this module
+                    out.writeByte(moduleName.length());
+                    out.writeBytes(moduleName);
+                    // write the global target systems for the module
+                    out.writeShort(encodeTargetSystems(moduleTargetSystems));
+                    // write flags
+                    out.writeByte(encodeModuleFlags(module, !adviceOverrides.isEmpty()));
+                    try {
+                        List<Instrumenter> members = module.typeInstrumentations();
+                        if (members.equals(singletonList(module))) {
+                            transformationCount++;
+                            out.writeByte(SELF_MEMBERSHIP);
+                            writeAdviceOverrides(out, module, adviceOverrides);
+
+                        } else {
+                            out.writeByte(members.size());
+                            for (Instrumenter member : members) {
+                                // we only need the simple name for matching purposes
+                                String memberName = member.getClass().getSimpleName();
+                                transformationCount++;
+                                out.writeByte(memberName.length());
+                                out.writeBytes(memberName);
+                                writeAdviceOverrides(out, member, adviceOverrides);
+                            }
+                        }
+                    } catch (Throwable e) {
+                        log.error("Failed to index instrumentation module {}", moduleName, e);
+                    }
+                }
+            } catch (IOException e) {
+                throw new UncheckedIOException("Problem generating InstrumenterIndex", e);
+            }
+        }
+
+        public void writeIndex(Path indexFile) throws IOException {
+            try (DataOutputStream out =
+                    new DataOutputStream(new BufferedOutputStream(Files.newOutputStream(indexFile)))) {
+                out.writeInt(instrumentationCount);
+                out.writeInt(transformationCount);
+                out.writeInt(packedNames.size());
+                out.write(packedNames.toByteArray());
+            }
+        }
+
+        /**
+         * Called from 'generateInstrumenterIndex' task in 'dd-java-agent/instrumentation/build.gradle'.
+         */
+        public static void main(String[] args) throws IOException {
+            if (args.length < 1) {
+                throw new IllegalArgumentException("Expected: index-dir");
+            }
+
+            Path indexDir = Paths.get(args[0]).toAbsolutePath();
+
+            // satisfy some instrumenters that cache matchers in initializers
+            HierarchyMatchers.registerIfAbsent(HierarchyMatchers.simpleChecks());
+            SharedTypePools.registerIfAbsent(SharedTypePools.simpleCache());
+
+            IndexGenerator indexGenerator = new IndexGenerator();
+            indexGenerator.buildIndex();
+            indexGenerator.writeIndex(indexDir.resolve(INSTRUMENTER_INDEX_NAME));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterMetrics.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterMetrics.java
index bc54ebf5777..75a5e9db952 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterMetrics.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterMetrics.java
@@ -5,209 +5,209 @@
 
 public final class InstrumenterMetrics {
 
-  // split long into count (max ~32 million) and elapsed (max ~9 minutes)
-  private static final int COUNT_SHIFT = 39;
-  private static final long COUNT_BIT = 1L << COUNT_SHIFT;
-  private static final long NANOS_MASK = COUNT_BIT - 1;
-
-  static final class Stats {
-    static final AtomicLong matching = new AtomicLong();
-    static final AtomicLong transforming = new AtomicLong();
-    static final AtomicLong knownTypeHit = new AtomicLong();
-    static final AtomicLong knownTypeMiss = new AtomicLong();
-    static final AtomicLong typeHierarchyHit = new AtomicLong();
-    static final AtomicLong typeHierarchyMiss = new AtomicLong();
-    static final AtomicLong contextStoreHit = new AtomicLong();
-    static final AtomicLong contextStoreMiss = new AtomicLong();
-    static final AtomicLong narrowLocationHit = new AtomicLong();
-    static final AtomicLong narrowLocationMiss = new AtomicLong();
-    static final AtomicLong narrowTypeHit = new AtomicLong();
-    static final AtomicLong narrowTypeMiss = new AtomicLong();
-    static final AtomicLong buildTypeMemo = new AtomicLong();
-    static final AtomicLong reuseTypeMemo = new AtomicLong();
-    static final AtomicLong buildTypeOutline = new AtomicLong();
-    static final AtomicLong reuseTypeOutline = new AtomicLong();
-    static final AtomicLong buildFullType = new AtomicLong();
-    static final AtomicLong reuseFullType = new AtomicLong();
-    static final AtomicLong resolveClassFile = new AtomicLong();
-    static final AtomicLong missingClassFile = new AtomicLong();
-  }
-
-  private static final boolean ENABLED = InstrumenterConfig.get().isTriageEnabled();
-
-  public static long tick() {
-    if (ENABLED) {
-      return System.nanoTime();
-    } else {
-      return 0;
+    // split long into count (max ~32 million) and elapsed (max ~9 minutes)
+    private static final int COUNT_SHIFT = 39;
+    private static final long COUNT_BIT = 1L << COUNT_SHIFT;
+    private static final long NANOS_MASK = COUNT_BIT - 1;
+
+    static final class Stats {
+        static final AtomicLong matching = new AtomicLong();
+        static final AtomicLong transforming = new AtomicLong();
+        static final AtomicLong knownTypeHit = new AtomicLong();
+        static final AtomicLong knownTypeMiss = new AtomicLong();
+        static final AtomicLong typeHierarchyHit = new AtomicLong();
+        static final AtomicLong typeHierarchyMiss = new AtomicLong();
+        static final AtomicLong contextStoreHit = new AtomicLong();
+        static final AtomicLong contextStoreMiss = new AtomicLong();
+        static final AtomicLong narrowLocationHit = new AtomicLong();
+        static final AtomicLong narrowLocationMiss = new AtomicLong();
+        static final AtomicLong narrowTypeHit = new AtomicLong();
+        static final AtomicLong narrowTypeMiss = new AtomicLong();
+        static final AtomicLong buildTypeMemo = new AtomicLong();
+        static final AtomicLong reuseTypeMemo = new AtomicLong();
+        static final AtomicLong buildTypeOutline = new AtomicLong();
+        static final AtomicLong reuseTypeOutline = new AtomicLong();
+        static final AtomicLong buildFullType = new AtomicLong();
+        static final AtomicLong reuseFullType = new AtomicLong();
+        static final AtomicLong resolveClassFile = new AtomicLong();
+        static final AtomicLong missingClassFile = new AtomicLong();
+    }
+
+    private static final boolean ENABLED = InstrumenterConfig.get().isTriageEnabled();
+
+    public static long tick() {
+        if (ENABLED) {
+            return System.nanoTime();
+        } else {
+            return 0;
+        }
     }
-  }
 
-  private static void record(AtomicLong stat, long fromTick) {
-    if (ENABLED) {
-      long oldValue, newValue;
-      do {
-        oldValue = stat.get();
-        newValue = oldValue;
-        if ((newValue | NANOS_MASK) != -1) {
-          newValue += COUNT_BIT;
-        }
-        if ((newValue | ~NANOS_MASK) != -1) {
-          newValue += Math.min(System.nanoTime() - fromTick, NANOS_MASK - (newValue & NANOS_MASK));
+    private static void record(AtomicLong stat, long fromTick) {
+        if (ENABLED) {
+            long oldValue, newValue;
+            do {
+                oldValue = stat.get();
+                newValue = oldValue;
+                if ((newValue | NANOS_MASK) != -1) {
+                    newValue += COUNT_BIT;
+                }
+                if ((newValue | ~NANOS_MASK) != -1) {
+                    newValue += Math.min(System.nanoTime() - fromTick, NANOS_MASK - (newValue & NANOS_MASK));
+                }
+            } while (!stat.compareAndSet(oldValue, newValue));
         }
-      } while (!stat.compareAndSet(oldValue, newValue));
     }
-  }
 
-  public static void matchType(long fromTick) {
-    if (ENABLED) {
-      record(Stats.matching, fromTick);
+    public static void matchType(long fromTick) {
+        if (ENABLED) {
+            record(Stats.matching, fromTick);
+        }
     }
-  }
 
-  public static void transformType(long fromTick) {
-    if (ENABLED) {
-      record(Stats.transforming, fromTick);
+    public static void transformType(long fromTick) {
+        if (ENABLED) {
+            record(Stats.transforming, fromTick);
+        }
     }
-  }
 
-  public static void knownTypeHit(long fromTick) {
-    if (ENABLED) {
-      record(Stats.knownTypeHit, fromTick);
+    public static void knownTypeHit(long fromTick) {
+        if (ENABLED) {
+            record(Stats.knownTypeHit, fromTick);
+        }
     }
-  }
 
-  public static void knownTypeMiss(long fromTick) {
-    if (ENABLED) {
-      record(Stats.knownTypeMiss, fromTick);
+    public static void knownTypeMiss(long fromTick) {
+        if (ENABLED) {
+            record(Stats.knownTypeMiss, fromTick);
+        }
     }
-  }
 
-  public static void typeHierarchyHit(long fromTick) {
-    if (ENABLED) {
-      record(Stats.typeHierarchyHit, fromTick);
+    public static void typeHierarchyHit(long fromTick) {
+        if (ENABLED) {
+            record(Stats.typeHierarchyHit, fromTick);
+        }
     }
-  }
 
-  public static void typeHierarchyMiss(long fromTick) {
-    if (ENABLED) {
-      record(Stats.typeHierarchyMiss, fromTick);
+    public static void typeHierarchyMiss(long fromTick) {
+        if (ENABLED) {
+            record(Stats.typeHierarchyMiss, fromTick);
+        }
     }
-  }
 
-  public static void contextStoreHit(long fromTick) {
-    if (ENABLED) {
-      record(Stats.contextStoreHit, fromTick);
+    public static void contextStoreHit(long fromTick) {
+        if (ENABLED) {
+            record(Stats.contextStoreHit, fromTick);
+        }
     }
-  }
 
-  public static void contextStoreMiss(long fromTick) {
-    if (ENABLED) {
-      record(Stats.contextStoreMiss, fromTick);
+    public static void contextStoreMiss(long fromTick) {
+        if (ENABLED) {
+            record(Stats.contextStoreMiss, fromTick);
+        }
     }
-  }
-
-  public static void narrowLocationHit(long fromTick) {
-    if (ENABLED) {
-      record(Stats.narrowLocationHit, fromTick);
-    }
-  }
 
-  public static void narrowLocationMiss(long fromTick) {
-    if (ENABLED) {
-      record(Stats.narrowLocationMiss, fromTick);
+    public static void narrowLocationHit(long fromTick) {
+        if (ENABLED) {
+            record(Stats.narrowLocationHit, fromTick);
+        }
     }
-  }
 
-  public static void narrowTypeHit(long fromTick) {
-    if (ENABLED) {
-      record(Stats.narrowTypeHit, fromTick);
+    public static void narrowLocationMiss(long fromTick) {
+        if (ENABLED) {
+            record(Stats.narrowLocationMiss, fromTick);
+        }
     }
-  }
 
-  public static void narrowTypeMiss(long fromTick) {
-    if (ENABLED) {
-      record(Stats.narrowTypeMiss, fromTick);
+    public static void narrowTypeHit(long fromTick) {
+        if (ENABLED) {
+            record(Stats.narrowTypeHit, fromTick);
+        }
     }
-  }
 
-  public static void buildTypeMemo(long fromTick) {
-    if (ENABLED) {
-      record(Stats.buildTypeMemo, fromTick);
+    public static void narrowTypeMiss(long fromTick) {
+        if (ENABLED) {
+            record(Stats.narrowTypeMiss, fromTick);
+        }
     }
-  }
 
-  public static void reuseTypeMemo(long fromTick) {
-    if (ENABLED) {
-      record(Stats.reuseTypeMemo, fromTick);
+    public static void buildTypeMemo(long fromTick) {
+        if (ENABLED) {
+            record(Stats.buildTypeMemo, fromTick);
+        }
     }
-  }
 
-  public static void buildTypeDescription(long fromTick, boolean isOutline) {
-    if (ENABLED) {
-      record(isOutline ? Stats.buildTypeOutline : Stats.buildFullType, fromTick);
+    public static void reuseTypeMemo(long fromTick) {
+        if (ENABLED) {
+            record(Stats.reuseTypeMemo, fromTick);
+        }
     }
-  }
 
-  public static void reuseTypeDescription(long fromTick, boolean isOutline) {
-    if (ENABLED) {
-      record(isOutline ? Stats.reuseTypeOutline : Stats.reuseFullType, fromTick);
+    public static void buildTypeDescription(long fromTick, boolean isOutline) {
+        if (ENABLED) {
+            record(isOutline ? Stats.buildTypeOutline : Stats.buildFullType, fromTick);
+        }
     }
-  }
 
-  public static void resolveClassFile(long fromTick) {
-    if (ENABLED) {
-      record(Stats.resolveClassFile, fromTick);
+    public static void reuseTypeDescription(long fromTick, boolean isOutline) {
+        if (ENABLED) {
+            record(isOutline ? Stats.reuseTypeOutline : Stats.reuseFullType, fromTick);
+        }
     }
-  }
 
-  public static void missingClassFile(long fromTick) {
-    if (ENABLED) {
-      record(Stats.missingClassFile, fromTick);
+    public static void resolveClassFile(long fromTick) {
+        if (ENABLED) {
+            record(Stats.resolveClassFile, fromTick);
+        }
     }
-  }
 
-  public static String summary() {
-    if (!ENABLED) {
-      return "Set DD_TRACE_TRIAGE=true to collect instrumenter metrics during startup";
+    public static void missingClassFile(long fromTick) {
+        if (ENABLED) {
+            record(Stats.missingClassFile, fromTick);
+        }
     }
 
-    StringBuilder buf = new StringBuilder();
-
-    buf.append("----------------------------------------------------------------\n");
-    summarize(buf, "Matching:              ", Stats.matching);
-    summarize(buf, "Transforming:          ", Stats.transforming);
-    buf.append("----------------------------------------------------------------\n");
-    summarize(buf, "Known type hit:        ", Stats.knownTypeHit);
-    summarize(buf, "Known type miss:       ", Stats.knownTypeMiss);
-    summarize(buf, "Type hierarchy hit:    ", Stats.typeHierarchyHit);
-    summarize(buf, "Type hierarchy miss:   ", Stats.typeHierarchyMiss);
-    summarize(buf, "Context store hit:     ", Stats.contextStoreHit);
-    summarize(buf, "Context store miss:    ", Stats.contextStoreMiss);
-    summarize(buf, "Narrow location hit:   ", Stats.narrowLocationHit);
-    summarize(buf, "Narrow location miss:  ", Stats.narrowLocationMiss);
-    summarize(buf, "Narrow type hit:       ", Stats.narrowTypeHit);
-    summarize(buf, "Narrow type miss:      ", Stats.narrowTypeMiss);
-    buf.append("----------------------------------------------------------------\n");
-    summarize(buf, "Build type-memo:       ", Stats.buildTypeMemo);
-    summarize(buf, "Reuse type-memo:       ", Stats.reuseTypeMemo);
-    summarize(buf, "Build type-outline:    ", Stats.buildTypeOutline);
-    summarize(buf, "Reuse type-outline:    ", Stats.reuseTypeOutline);
-    summarize(buf, "Build full-type:       ", Stats.buildFullType);
-    summarize(buf, "Reuse full-type:       ", Stats.reuseFullType);
-    summarize(buf, "Resolve class-file:    ", Stats.resolveClassFile);
-    summarize(buf, "Missing class-file:    ", Stats.missingClassFile);
-    buf.append("----------------------------------------------------------------");
-
-    return buf.toString();
-  }
+    public static String summary() {
+        if (!ENABLED) {
+            return "Set DD_TRACE_TRIAGE=true to collect instrumenter metrics during startup";
+        }
 
-  private static void summarize(StringBuilder buf, String prefix, AtomicLong stat) {
-    long value = stat.get();
-    buf.append(prefix)
-        .append(String.format("%-12d", value >>> COUNT_SHIFT))
-        .append(' ')
-        .append(String.format("%.1f", (value & NANOS_MASK) / 1_000_000.0))
-        .append(" ms\n");
-  }
+        StringBuilder buf = new StringBuilder();
+
+        buf.append("----------------------------------------------------------------\n");
+        summarize(buf, "Matching:              ", Stats.matching);
+        summarize(buf, "Transforming:          ", Stats.transforming);
+        buf.append("----------------------------------------------------------------\n");
+        summarize(buf, "Known type hit:        ", Stats.knownTypeHit);
+        summarize(buf, "Known type miss:       ", Stats.knownTypeMiss);
+        summarize(buf, "Type hierarchy hit:    ", Stats.typeHierarchyHit);
+        summarize(buf, "Type hierarchy miss:   ", Stats.typeHierarchyMiss);
+        summarize(buf, "Context store hit:     ", Stats.contextStoreHit);
+        summarize(buf, "Context store miss:    ", Stats.contextStoreMiss);
+        summarize(buf, "Narrow location hit:   ", Stats.narrowLocationHit);
+        summarize(buf, "Narrow location miss:  ", Stats.narrowLocationMiss);
+        summarize(buf, "Narrow type hit:       ", Stats.narrowTypeHit);
+        summarize(buf, "Narrow type miss:      ", Stats.narrowTypeMiss);
+        buf.append("----------------------------------------------------------------\n");
+        summarize(buf, "Build type-memo:       ", Stats.buildTypeMemo);
+        summarize(buf, "Reuse type-memo:       ", Stats.reuseTypeMemo);
+        summarize(buf, "Build type-outline:    ", Stats.buildTypeOutline);
+        summarize(buf, "Reuse type-outline:    ", Stats.reuseTypeOutline);
+        summarize(buf, "Build full-type:       ", Stats.buildFullType);
+        summarize(buf, "Reuse full-type:       ", Stats.reuseFullType);
+        summarize(buf, "Resolve class-file:    ", Stats.resolveClassFile);
+        summarize(buf, "Missing class-file:    ", Stats.missingClassFile);
+        buf.append("----------------------------------------------------------------");
+
+        return buf.toString();
+    }
+
+    private static void summarize(StringBuilder buf, String prefix, AtomicLong stat) {
+        long value = stat.get();
+        buf.append(prefix)
+                .append(String.format("%-12d", value >>> COUNT_SHIFT))
+                .append(' ')
+                .append(String.format("%.1f", (value & NANOS_MASK) / 1_000_000.0))
+                .append(" ms\n");
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModule.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModule.java
index 6baeca12b62..5e7093ab454 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModule.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModule.java
@@ -30,339 +30,338 @@
 
 public abstract class InstrumenterModule implements Instrumenter {
 
-  /**
-   * Since several systems share the same instrumentation infrastructure in order to enable only the
-   * applicable {@link Instrumenter instrumenters} on startup each {@linkplain InstrumenterModule}
-   * must declare its target system. The systems currently supported include:
-   *
-   * <ul>
-   *   <li>{@link TargetSystem#TRACING tracing}
-   *   <li>{@link TargetSystem#PROFILING profiling}
-   *   <li>{@link TargetSystem#APPSEC appsec}
-   *   <li>{@link TargetSystem#IAST iast}
-   *   <li>{@link TargetSystem#CIVISIBILITY ci-visibility}
-   *   <li>{@link TargetSystem#USM usm}
-   *   <li>{@link TargetSystem#CONTEXT_TRACKING context-tracking}
-   *   <li>{@link TargetSystem#RASP rasp}
-   * </ul>
-   */
-  public enum TargetSystem {
-    TRACING,
-    PROFILING,
-    APPSEC,
-    IAST,
-    CIVISIBILITY,
-    USM,
-    LLMOBS,
-    CONTEXT_TRACKING,
-    RASP,
-  }
-
-  private static final Logger log = LoggerFactory.getLogger(InstrumenterModule.class);
-
-  protected static final String[] NO_HELPERS = {};
-
-  private final List<String> instrumentationNames;
-  private final String instrumentationPrimaryName;
-  private final boolean enabled;
-
-  protected final String packageName = Strings.getPackageName(getClass().getName());
-
-  public InstrumenterModule(final String instrumentationName, final String... additionalNames) {
-    instrumentationNames = new ArrayList<>(1 + additionalNames.length);
-    instrumentationNames.add(instrumentationName);
-    addAll(instrumentationNames, additionalNames);
-    instrumentationPrimaryName = instrumentationName;
-
-    enabled = InstrumenterConfig.get().isIntegrationEnabled(instrumentationNames, defaultEnabled());
-  }
-
-  public String name() {
-    return instrumentationPrimaryName;
-  }
-
-  public Iterable<String> names() {
-    return instrumentationNames;
-  }
-
-  /** Modules with higher order values are applied <i>after</i> those with lower values. */
-  public int order() {
-    return 0;
-  }
-
-  public List<Instrumenter> typeInstrumentations() {
-    preloadClasses();
-    return singletonList(this);
-  }
-
-  public final ReferenceMatcher getInstrumentationMuzzle() {
-    return loadStaticMuzzleReferences(getClass().getClassLoader(), getClass().getName())
-        .withReferenceProvider(runtimeMuzzleReferences());
-  }
-
-  public static ReferenceMatcher loadStaticMuzzleReferences(
-      ClassLoader classLoader, String instrumentationClass) {
-    String muzzleClass = instrumentationClass + "$Muzzle";
-    try {
-      // Muzzle class contains static references captured at build-time
-      // see datadog.trace.agent.tooling.muzzle.MuzzleGenerationProcessor
-      return (ReferenceMatcher) classLoader.loadClass(muzzleClass).getMethod("create").invoke(null);
-    } catch (Throwable e) {
-      log.warn("Failed to load - muzzle.class={}", muzzleClass, e);
-      return ReferenceMatcher.NO_REFERENCES;
-    }
-  }
-
-  /**
-   * @return Class names of helpers to inject into the user's classloader. A non-empty list is used
-   *     exactly as declared; an empty list means helpers will be inferred from method advice at
-   *     build-time by following bytecode references. Helpers loaded only through reflection or
-   *     class name strings may not be discovered. Modules needing these undiscoverable helpers must
-   *     declare the complete helper list - declared and inferred helpers are not merged.
-   *     <p><b>NOTE:</b> The order of the returned helper classes matters. If a muzzle check fails
-   *     with a NoClassDefFoundError, as logged in build/reports/muzzle-*.txt, it is likely that one
-   *     helper class depends on another that appears later in the list. In this case, the returned
-   *     list must be reordered so that the referred helper class appears before the one that refers
-   *     to it.
-   */
-  public String[] helperClassNames() {
-    return NO_HELPERS;
-  }
-
-  /** Override this to claim classes from other sources as helpers. */
-  public boolean isHelperClass(String className) {
-    return false;
-  }
-
-  /**
-   * @return {@code true} if helper classes should be injected with the agent's {@link CodeSource}
-   */
-  public boolean useAgentCodeSource() {
-    return false;
-  }
-
-  /** Override this to automatically inject all (non-bootstrap) helper dependencies. */
-  public boolean injectHelperDependencies() {
-    return false;
-  }
-
-  /** Classes that the muzzle plugin assumes will be injected */
-  public String[] muzzleIgnoredClassNames() {
-    return helperClassNames();
-  }
-
-  /** Override this to supply additional Muzzle references at build time. */
-  public Reference[] additionalMuzzleReferences() {
-    return null;
-  }
-
-  /** Override this to supply additional Muzzle references during startup. */
-  public ReferenceProvider runtimeMuzzleReferences() {
-    return null;
-  }
-
-  /** Override this to validate against a specific named MuzzleDirective. */
-  public String muzzleDirective() {
-    return null;
-  }
-
-  /** Override this to supply additional class-loader requirements. */
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return ANY_CLASS_LOADER;
-  }
-
-  /**
-   * @return A type matcher used to ignore some methods when applying transformation.
-   */
-  public ElementMatcher<? super MethodDescription> methodIgnoreMatcher() {
-    // By default ByteBuddy will skip all methods that are synthetic at the top level, but since
-    // we need to instrument some synthetic methods in Scala and changed that, we make the default
-    // here to ignore synthetic methods to not change the behavior for unaware instrumentations
-    return isSynthetic();
-  }
-
-  /** Override this to apply shading to method advice and injected helpers. */
-  public Map<String, String> adviceShading() {
-    return null;
-  }
-
-  /** Override this to post-process the operand stack of any transformed methods. */
-  public Advice.PostProcessor.Factory postProcessor() {
-    return null;
-  }
-
-  /**
-   * Context stores to define for this instrumentation. Are added to matching class loaders.
-   *
-   * <p>A map of {class-name -> context-class-name}. Keys (and their subclasses) will be associated
-   * with a context of the value.
-   */
-  public Map<String, String> contextStore() {
-    return emptyMap();
-  }
-
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isIntegrationsEnabled();
-  }
-
-  public boolean isEnabled() {
-    return enabled;
-  }
-
-  /**
-   * Indicates the applicability of an {@linkplain InstrumenterModule} to the given system.<br>
-   *
-   * @param enabledSystems a set of all the enabled target systems
-   * @return {@literal true} if the set of enabled systems contains all the ones required by this
-   *     particular {@linkplain InstrumenterModule}
-   */
-  public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    return false;
-  }
-
-  protected final boolean isShortcutMatchingEnabled(boolean defaultToShortcut) {
-    return InstrumenterConfig.get()
-        .isIntegrationShortcutMatchingEnabled(singletonList(name()), defaultToShortcut);
-  }
-
-  /**
-   * Force loading of classes that need to be instrumented, but are using during instrumentation.
-   */
-  @SuppressForbidden // allow this use of Class.forName()
-  protected void preloadClasses() {
-    String[] list = preloadClassNames();
-    if (list != null) {
-      for (String clazz : list) {
+    /**
+     * Since several systems share the same instrumentation infrastructure in order to enable only the
+     * applicable {@link Instrumenter instrumenters} on startup each {@linkplain InstrumenterModule}
+     * must declare its target system. The systems currently supported include:
+     *
+     * <ul>
+     *   <li>{@link TargetSystem#TRACING tracing}
+     *   <li>{@link TargetSystem#PROFILING profiling}
+     *   <li>{@link TargetSystem#APPSEC appsec}
+     *   <li>{@link TargetSystem#IAST iast}
+     *   <li>{@link TargetSystem#CIVISIBILITY ci-visibility}
+     *   <li>{@link TargetSystem#USM usm}
+     *   <li>{@link TargetSystem#CONTEXT_TRACKING context-tracking}
+     *   <li>{@link TargetSystem#RASP rasp}
+     * </ul>
+     */
+    public enum TargetSystem {
+        TRACING,
+        PROFILING,
+        APPSEC,
+        IAST,
+        CIVISIBILITY,
+        USM,
+        LLMOBS,
+        CONTEXT_TRACKING,
+        RASP,
+    }
+
+    private static final Logger log = LoggerFactory.getLogger(InstrumenterModule.class);
+
+    protected static final String[] NO_HELPERS = {};
+
+    private final List<String> instrumentationNames;
+    private final String instrumentationPrimaryName;
+    private final boolean enabled;
+
+    protected final String packageName = Strings.getPackageName(getClass().getName());
+
+    public InstrumenterModule(final String instrumentationName, final String... additionalNames) {
+        instrumentationNames = new ArrayList<>(1 + additionalNames.length);
+        instrumentationNames.add(instrumentationName);
+        addAll(instrumentationNames, additionalNames);
+        instrumentationPrimaryName = instrumentationName;
+
+        enabled = InstrumenterConfig.get().isIntegrationEnabled(instrumentationNames, defaultEnabled());
+    }
+
+    public String name() {
+        return instrumentationPrimaryName;
+    }
+
+    public Iterable<String> names() {
+        return instrumentationNames;
+    }
+
+    /** Modules with higher order values are applied <i>after</i> those with lower values. */
+    public int order() {
+        return 0;
+    }
+
+    public List<Instrumenter> typeInstrumentations() {
+        preloadClasses();
+        return singletonList(this);
+    }
+
+    public final ReferenceMatcher getInstrumentationMuzzle() {
+        return loadStaticMuzzleReferences(
+                        getClass().getClassLoader(), getClass().getName())
+                .withReferenceProvider(runtimeMuzzleReferences());
+    }
+
+    public static ReferenceMatcher loadStaticMuzzleReferences(ClassLoader classLoader, String instrumentationClass) {
+        String muzzleClass = instrumentationClass + "$Muzzle";
         try {
-          Class.forName(clazz);
-        } catch (Throwable t) {
-          log.debug("Error force loading {} class", clazz);
+            // Muzzle class contains static references captured at build-time
+            // see datadog.trace.agent.tooling.muzzle.MuzzleGenerationProcessor
+            return (ReferenceMatcher)
+                    classLoader.loadClass(muzzleClass).getMethod("create").invoke(null);
+        } catch (Throwable e) {
+            log.warn("Failed to load - muzzle.class={}", muzzleClass, e);
+            return ReferenceMatcher.NO_REFERENCES;
         }
-      }
     }
-  }
 
-  /** Get classes to force load */
-  public String[] preloadClassNames() {
-    return null;
-  }
+    /**
+     * @return Class names of helpers to inject into the user's classloader. A non-empty list is used
+     *     exactly as declared; an empty list means helpers will be inferred from method advice at
+     *     build-time by following bytecode references. Helpers loaded only through reflection or
+     *     class name strings may not be discovered. Modules needing these undiscoverable helpers must
+     *     declare the complete helper list - declared and inferred helpers are not merged.
+     *     <p><b>NOTE:</b> The order of the returned helper classes matters. If a muzzle check fails
+     *     with a NoClassDefFoundError, as logged in build/reports/muzzle-*.txt, it is likely that one
+     *     helper class depends on another that appears later in the list. In this case, the returned
+     *     list must be reordered so that the referred helper class appears before the one that refers
+     *     to it.
+     */
+    public String[] helperClassNames() {
+        return NO_HELPERS;
+    }
 
-  /** Parent class for all tracing related instrumentations */
-  public abstract static class Tracing extends InstrumenterModule {
-    public Tracing(String instrumentationName, String... additionalNames) {
-      super(instrumentationName, additionalNames);
+    /** Override this to claim classes from other sources as helpers. */
+    public boolean isHelperClass(String className) {
+        return false;
     }
 
-    @Override
-    public final boolean isApplicable(Set<TargetSystem> enabledSystems) {
-      return enabledSystems.contains(TargetSystem.TRACING);
+    /**
+     * @return {@code true} if helper classes should be injected with the agent's {@link CodeSource}
+     */
+    public boolean useAgentCodeSource() {
+        return false;
     }
-  }
 
-  /** Parent class for all profiling related instrumentations */
-  public abstract static class Profiling extends InstrumenterModule {
-    public Profiling(String instrumentationName, String... additionalNames) {
-      super(instrumentationName, additionalNames);
+    /** Override this to automatically inject all (non-bootstrap) helper dependencies. */
+    public boolean injectHelperDependencies() {
+        return false;
     }
 
-    @Override
-    public final boolean isApplicable(Set<TargetSystem> enabledSystems) {
-      return enabledSystems.contains(TargetSystem.PROFILING);
+    /** Classes that the muzzle plugin assumes will be injected */
+    public String[] muzzleIgnoredClassNames() {
+        return helperClassNames();
     }
 
-    @Override
-    public boolean isEnabled() {
-      return super.isEnabled()
-          && !ConfigProvider.getInstance()
-              .getBoolean(ProfilingConfig.PROFILING_ULTRA_MINIMAL, false);
+    /** Override this to supply additional Muzzle references at build time. */
+    public Reference[] additionalMuzzleReferences() {
+        return null;
     }
-  }
 
-  /** Parent class for all AppSec related instrumentations */
-  public abstract static class AppSec extends InstrumenterModule {
-    public AppSec(String instrumentationName, String... additionalNames) {
-      super(instrumentationName, additionalNames);
+    /** Override this to supply additional Muzzle references during startup. */
+    public ReferenceProvider runtimeMuzzleReferences() {
+        return null;
     }
 
-    @Override
-    public final boolean isApplicable(Set<TargetSystem> enabledSystems) {
-      return enabledSystems.contains(TargetSystem.APPSEC);
+    /** Override this to validate against a specific named MuzzleDirective. */
+    public String muzzleDirective() {
+        return null;
     }
-  }
 
-  /** Parent class for all IAST related instrumentations */
-  public abstract static class Iast extends InstrumenterModule {
-    public Iast(String instrumentationName, String... additionalNames) {
-      super(instrumentationName, additionalNames);
+    /** Override this to supply additional class-loader requirements. */
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return ANY_CLASS_LOADER;
     }
 
-    @Override
-    public final boolean isApplicable(Set<TargetSystem> enabledSystems) {
-      if (enabledSystems.contains(TargetSystem.IAST)) {
-        return true;
-      }
-      final InstrumenterConfig cfg = InstrumenterConfig.get();
-      if (!isOptOutEnabled() || cfg.isIastFullyDisabled()) {
-        return false;
-      }
-      return cfg.getAppSecActivation() == ProductActivation.FULLY_ENABLED;
+    /**
+     * @return A type matcher used to ignore some methods when applying transformation.
+     */
+    public ElementMatcher<? super MethodDescription> methodIgnoreMatcher() {
+        // By default ByteBuddy will skip all methods that are synthetic at the top level, but since
+        // we need to instrument some synthetic methods in Scala and changed that, we make the default
+        // here to ignore synthetic methods to not change the behavior for unaware instrumentations
+        return isSynthetic();
+    }
+
+    /** Override this to apply shading to method advice and injected helpers. */
+    public Map<String, String> adviceShading() {
+        return null;
     }
 
-    @Override
+    /** Override this to post-process the operand stack of any transformed methods. */
     public Advice.PostProcessor.Factory postProcessor() {
-      return IastPostProcessorFactory.INSTANCE;
+        return null;
+    }
+
+    /**
+     * Context stores to define for this instrumentation. Are added to matching class loaders.
+     *
+     * <p>A map of {class-name -> context-class-name}. Keys (and their subclasses) will be associated
+     * with a context of the value.
+     */
+    public Map<String, String> contextStore() {
+        return emptyMap();
+    }
+
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isIntegrationsEnabled();
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    /**
+     * Indicates the applicability of an {@linkplain InstrumenterModule} to the given system.<br>
+     *
+     * @param enabledSystems a set of all the enabled target systems
+     * @return {@literal true} if the set of enabled systems contains all the ones required by this
+     *     particular {@linkplain InstrumenterModule}
+     */
+    public boolean isApplicable(Set<TargetSystem> enabledSystems) {
+        return false;
     }
 
-    protected boolean isOptOutEnabled() {
-      return false;
+    protected final boolean isShortcutMatchingEnabled(boolean defaultToShortcut) {
+        return InstrumenterConfig.get().isIntegrationShortcutMatchingEnabled(singletonList(name()), defaultToShortcut);
     }
-  }
 
-  /** Parent class for IAST instrumentations that restructure classes to add {@link Taintable}. */
-  public abstract static class TaintableIast extends Iast implements WithStructuralChange {
-    public TaintableIast(String instrumentationName, String... additionalNames) {
-      super(instrumentationName, additionalNames);
+    /**
+     * Force loading of classes that need to be instrumented, but are using during instrumentation.
+     */
+    @SuppressForbidden // allow this use of Class.forName()
+    protected void preloadClasses() {
+        String[] list = preloadClassNames();
+        if (list != null) {
+            for (String clazz : list) {
+                try {
+                    Class.forName(clazz);
+                } catch (Throwable t) {
+                    log.debug("Error force loading {} class", clazz);
+                }
+            }
+        }
+    }
+
+    /** Get classes to force load */
+    public String[] preloadClassNames() {
+        return null;
+    }
+
+    /** Parent class for all tracing related instrumentations */
+    public abstract static class Tracing extends InstrumenterModule {
+        public Tracing(String instrumentationName, String... additionalNames) {
+            super(instrumentationName, additionalNames);
+        }
+
+        @Override
+        public final boolean isApplicable(Set<TargetSystem> enabledSystems) {
+            return enabledSystems.contains(TargetSystem.TRACING);
+        }
     }
 
-    @Override
-    public final Class<?> structuralChangeMarker() {
-      return Taintable.class;
+    /** Parent class for all profiling related instrumentations */
+    public abstract static class Profiling extends InstrumenterModule {
+        public Profiling(String instrumentationName, String... additionalNames) {
+            super(instrumentationName, additionalNames);
+        }
+
+        @Override
+        public final boolean isApplicable(Set<TargetSystem> enabledSystems) {
+            return enabledSystems.contains(TargetSystem.PROFILING);
+        }
+
+        @Override
+        public boolean isEnabled() {
+            return super.isEnabled()
+                    && !ConfigProvider.getInstance().getBoolean(ProfilingConfig.PROFILING_ULTRA_MINIMAL, false);
+        }
     }
-  }
 
-  /** Parent class for all USM related instrumentations */
-  public abstract static class Usm extends InstrumenterModule {
-    public Usm(String instrumentationName, String... additionalNames) {
-      super(instrumentationName, additionalNames);
+    /** Parent class for all AppSec related instrumentations */
+    public abstract static class AppSec extends InstrumenterModule {
+        public AppSec(String instrumentationName, String... additionalNames) {
+            super(instrumentationName, additionalNames);
+        }
+
+        @Override
+        public final boolean isApplicable(Set<TargetSystem> enabledSystems) {
+            return enabledSystems.contains(TargetSystem.APPSEC);
+        }
     }
 
-    @Override
-    public final boolean isApplicable(Set<TargetSystem> enabledSystems) {
-      return enabledSystems.contains(TargetSystem.USM);
+    /** Parent class for all IAST related instrumentations */
+    public abstract static class Iast extends InstrumenterModule {
+        public Iast(String instrumentationName, String... additionalNames) {
+            super(instrumentationName, additionalNames);
+        }
+
+        @Override
+        public final boolean isApplicable(Set<TargetSystem> enabledSystems) {
+            if (enabledSystems.contains(TargetSystem.IAST)) {
+                return true;
+            }
+            final InstrumenterConfig cfg = InstrumenterConfig.get();
+            if (!isOptOutEnabled() || cfg.isIastFullyDisabled()) {
+                return false;
+            }
+            return cfg.getAppSecActivation() == ProductActivation.FULLY_ENABLED;
+        }
+
+        @Override
+        public Advice.PostProcessor.Factory postProcessor() {
+            return IastPostProcessorFactory.INSTANCE;
+        }
+
+        protected boolean isOptOutEnabled() {
+            return false;
+        }
     }
-  }
 
-  /** Parent class for all CI related instrumentations */
-  public abstract static class CiVisibility extends InstrumenterModule {
-    public CiVisibility(String instrumentationName, String... additionalNames) {
-      super(instrumentationName, additionalNames);
+    /** Parent class for IAST instrumentations that restructure classes to add {@link Taintable}. */
+    public abstract static class TaintableIast extends Iast implements WithStructuralChange {
+        public TaintableIast(String instrumentationName, String... additionalNames) {
+            super(instrumentationName, additionalNames);
+        }
+
+        @Override
+        public final Class<?> structuralChangeMarker() {
+            return Taintable.class;
+        }
     }
 
-    @Override
-    public final boolean isApplicable(Set<TargetSystem> enabledSystems) {
-      return enabledSystems.contains(TargetSystem.CIVISIBILITY);
+    /** Parent class for all USM related instrumentations */
+    public abstract static class Usm extends InstrumenterModule {
+        public Usm(String instrumentationName, String... additionalNames) {
+            super(instrumentationName, additionalNames);
+        }
+
+        @Override
+        public final boolean isApplicable(Set<TargetSystem> enabledSystems) {
+            return enabledSystems.contains(TargetSystem.USM);
+        }
     }
-  }
 
-  /** Parent class for all the context tracking instrumentations */
-  public abstract static class ContextTracking extends InstrumenterModule {
-    public ContextTracking(String instrumentationName, String... additionalNames) {
-      super(instrumentationName, additionalNames);
+    /** Parent class for all CI related instrumentations */
+    public abstract static class CiVisibility extends InstrumenterModule {
+        public CiVisibility(String instrumentationName, String... additionalNames) {
+            super(instrumentationName, additionalNames);
+        }
+
+        @Override
+        public final boolean isApplicable(Set<TargetSystem> enabledSystems) {
+            return enabledSystems.contains(TargetSystem.CIVISIBILITY);
+        }
     }
 
-    @Override
-    public final boolean isApplicable(Set<TargetSystem> enabledSystems) {
-      return enabledSystems.contains(TargetSystem.CONTEXT_TRACKING);
+    /** Parent class for all the context tracking instrumentations */
+    public abstract static class ContextTracking extends InstrumenterModule {
+        public ContextTracking(String instrumentationName, String... additionalNames) {
+            super(instrumentationName, additionalNames);
+        }
+
+        @Override
+        public final boolean isApplicable(Set<TargetSystem> enabledSystems) {
+            return enabledSystems.contains(TargetSystem.CONTEXT_TRACKING);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModuleFilter.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModuleFilter.java
index d5896be9406..f93f04e1eca 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModuleFilter.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModuleFilter.java
@@ -6,16 +6,14 @@
 
 @FunctionalInterface
 public interface InstrumenterModuleFilter {
-  InstrumenterModuleFilter ALL_MODULES = (name, systems, needsEarlyLoad) -> true;
+    InstrumenterModuleFilter ALL_MODULES = (name, systems, needsEarlyLoad) -> true;
 
-  static InstrumenterModuleFilter forTargetSystemsOrNeedToEarlyLoad(
-      final Set<InstrumenterModule.TargetSystem> enabledSystems) {
-    return (instrumenterModuleName, targetSystems, needsEarlyLoad) ->
-        needsEarlyLoad || !disjoint(enabledSystems, targetSystems);
-  }
+    static InstrumenterModuleFilter forTargetSystemsOrNeedToEarlyLoad(
+            final Set<InstrumenterModule.TargetSystem> enabledSystems) {
+        return (instrumenterModuleName, targetSystems, needsEarlyLoad) ->
+                needsEarlyLoad || !disjoint(enabledSystems, targetSystems);
+    }
 
-  boolean test(
-      String instrumenterModuleName,
-      Set<InstrumenterModule.TargetSystem> targetSystems,
-      boolean needsEarlyLoad);
+    boolean test(
+            String instrumenterModuleName, Set<InstrumenterModule.TargetSystem> targetSystems, boolean needsEarlyLoad);
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterState.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterState.java
index d5f56ae383f..220a559d912 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterState.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterState.java
@@ -15,193 +15,189 @@
  * instrumentation per-class-loader, for example if {@code MuzzleCheck} detects an incompatibility.
  */
 public final class InstrumenterState {
-  private static final Logger log = LoggerFactory.getLogger(InstrumenterState.class);
+    private static final Logger log = LoggerFactory.getLogger(InstrumenterState.class);
 
-  public interface Observer {
-    void applied(Iterable<String> instrumentationNames);
-  }
+    public interface Observer {
+        void applied(Iterable<String> instrumentationNames);
+    }
 
-  // constants for representing a bitset as a series of words
-  private static final int ADDRESS_BITS_PER_WORD = 6;
-  private static final int BITS_PER_WORD = 1 << ADDRESS_BITS_PER_WORD;
-  private static final int BIT_INDEX_MASK = BITS_PER_WORD - 1;
+    // constants for representing a bitset as a series of words
+    private static final int ADDRESS_BITS_PER_WORD = 6;
+    private static final int BITS_PER_WORD = 1 << ADDRESS_BITS_PER_WORD;
+    private static final int BIT_INDEX_MASK = BITS_PER_WORD - 1;
 
-  // represent each status as 2 adjacent bits
-  private static final int BLOCKED = 0b01;
-  private static final int APPLIED = 0b10;
+    // represent each status as 2 adjacent bits
+    private static final int BLOCKED = 0b01;
+    private static final int APPLIED = 0b10;
 
-  private static final int STATUS_BITS = 0b11;
+    private static final int STATUS_BITS = 0b11;
 
-  private static Iterable<String>[] instrumentationNames = new Iterable[0];
-  private static String[] instrumentationClasses = new String[0];
+    private static Iterable<String>[] instrumentationNames = new Iterable[0];
+    private static String[] instrumentationClasses = new String[0];
 
-  private static long[] defaultState = {};
+    private static long[] defaultState = {};
 
-  /** Tracks which instrumentations were applied (per-class-loader) and which were blocked. */
-  private static final ClassLoaderValue<AtomicLongArray> classLoaderStates =
-      new ClassLoaderValue<AtomicLongArray>() {
+    /** Tracks which instrumentations were applied (per-class-loader) and which were blocked. */
+    private static final ClassLoaderValue<AtomicLongArray> classLoaderStates = new ClassLoaderValue<AtomicLongArray>() {
         @Override
         protected AtomicLongArray computeValue(ClassLoader cl) {
-          return new AtomicLongArray(defaultState);
+            return new AtomicLongArray(defaultState);
+        }
+    };
+
+    private static Observer observer;
+
+    private InstrumenterState() {}
+
+    /** Pre-sizes internal structures to accommodate the highest expected id. */
+    public static void initialize(int instrumentationCount) {
+        instrumentationNames = Arrays.copyOf(instrumentationNames, instrumentationCount);
+        instrumentationClasses = Arrays.copyOf(instrumentationClasses, instrumentationNames.length);
+    }
+
+    /** Registers an instrumentation's details. */
+    public static void registerInstrumentation(InstrumenterModule module, int instrumentationId) {
+        if (instrumentationId >= instrumentationNames.length) {
+            // note: the 'initialize' method pre-sizes these arrays to avoid repeated allocations here
+            instrumentationNames = Arrays.copyOf(instrumentationNames, instrumentationId + 16);
+            instrumentationClasses = Arrays.copyOf(instrumentationClasses, instrumentationNames.length);
         }
-      };
-
-  private static Observer observer;
-
-  private InstrumenterState() {}
-
-  /** Pre-sizes internal structures to accommodate the highest expected id. */
-  public static void initialize(int instrumentationCount) {
-    instrumentationNames = Arrays.copyOf(instrumentationNames, instrumentationCount);
-    instrumentationClasses = Arrays.copyOf(instrumentationClasses, instrumentationNames.length);
-  }
-
-  /** Registers an instrumentation's details. */
-  public static void registerInstrumentation(InstrumenterModule module, int instrumentationId) {
-    if (instrumentationId >= instrumentationNames.length) {
-      // note: the 'initialize' method pre-sizes these arrays to avoid repeated allocations here
-      instrumentationNames = Arrays.copyOf(instrumentationNames, instrumentationId + 16);
-      instrumentationClasses = Arrays.copyOf(instrumentationClasses, instrumentationNames.length);
-    }
-    instrumentationNames[instrumentationId] = module.names();
-    instrumentationClasses[instrumentationId] = module.getClass().getName();
-  }
-
-  /** Registers an observer to be notified whenever an instrumentation is applied. */
-  public static void setObserver(Observer observer) {
-    InstrumenterState.observer = observer;
-  }
-
-  /** Resets the default instrumentation state so nothing is blocked or applied. */
-  public static void resetDefaultState() {
-    int instrumentationCount = instrumentationNames.length;
-
-    int wordsPerClassLoaderState =
-        ((instrumentationCount << 1) + BITS_PER_WORD - 1) >> ADDRESS_BITS_PER_WORD;
-
-    if (defaultState.length > 0) { // optimization: skip clear if there's no old state
-      classLoaderStates.clear();
-    }
-
-    defaultState = new long[wordsPerClassLoaderState];
-  }
-
-  /**
-   * Does the instrumentation apply to the given class-loader?
-   *
-   * @return {@code null} if checks such as muzzle are still pending
-   */
-  public static Boolean isApplicable(ClassLoader classLoader, int instrumentationId) {
-    int status = currentState(classLoader, instrumentationId);
-    return status == 0 ? null : status == APPLIED;
-  }
-
-  /** Records that the instrumentation was applied to the given class-loader. */
-  public static void applyInstrumentation(ClassLoader classLoader, int instrumentationId) {
-    updateState(classLoader, instrumentationId, APPLIED);
-    if (log.isDebugEnabled()) {
-      log.debug(
-          "Instrumentation applied - {} instrumentation.target.classloader={}",
-          describe(instrumentationId),
-          classLoader);
-    }
-    if (null != observer) {
-      observer.applied(instrumentationNames[instrumentationId]);
-    }
-  }
-
-  /** Records that the instrumentation is blocked for the given class-loader. */
-  public static void blockInstrumentation(ClassLoader classLoader, int instrumentationId) {
-    updateState(classLoader, instrumentationId, BLOCKED);
-    if (log.isDebugEnabled()) {
-      log.debug(
-          "Instrumentation blocked - {} instrumentation.target.classloader={}",
-          describe(instrumentationId),
-          classLoader);
-    }
-  }
-
-  /** Records that the instrumentation is blocked by default. */
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_ACCESSIBLE_OBJECT_SYNCHRONIZATION",
-      justification =
-          "resetDefaultState() runs before installing Byte Buddy, so defaultState is never reassigned while this method can run.")
-  public static void blockInstrumentation(int instrumentationId) {
-    int bitIndex = instrumentationId << 1;
-    int wordIndex = bitIndex >> ADDRESS_BITS_PER_WORD;
-    long bitsToSet = ((long) BLOCKED) << (bitIndex & BIT_INDEX_MASK);
-    synchronized (defaultState) {
-      defaultState[wordIndex] |= bitsToSet;
-    }
-  }
-
-  public static String describe(int instrumentationId) {
-    if (instrumentationId >= 0 && instrumentationId < instrumentationNames.length) {
-      return "instrumentation.names=["
-          + String.join(",", instrumentationNames[instrumentationId])
-          + "] instrumentation.class="
-          + instrumentationClasses[instrumentationId];
-    } else {
-      return "<unknown instrumentation>";
-    }
-  }
-
-  private static int currentState(ClassLoader classLoader, int instrumentationId) {
-    return currentState(classLoaderState(classLoader), instrumentationId << 1);
-  }
-
-  private static void updateState(ClassLoader classLoader, int instrumentationId, int status) {
-    updateState(classLoaderState(classLoader), instrumentationId << 1, status);
-  }
-
-  private static AtomicLongArray classLoaderState(ClassLoader classLoader) {
-    return classLoaderStates.get(classLoader);
-  }
-
-  private static int currentState(AtomicLongArray state, int bitIndex) {
-    int wordIndex = bitIndex >> ADDRESS_BITS_PER_WORD;
-    return STATUS_BITS & (int) (state.get(wordIndex) >> (bitIndex & BIT_INDEX_MASK));
-  }
-
-  private static void updateState(AtomicLongArray state, int bitIndex, int status) {
-    int wordIndex = bitIndex >> ADDRESS_BITS_PER_WORD;
-    long bitsToSet = ((long) status) << (bitIndex & BIT_INDEX_MASK);
-    long wordState = state.get(wordIndex);
-    while (!state.compareAndSet(wordIndex, wordState, wordState | bitsToSet)) {
-      wordState = state.get(wordIndex);
-    }
-  }
-
-  public static String summary() {
-    StringBuilder summary = new StringBuilder();
-    classLoaderStates.visit(
-        (loader, state) -> {
-          summary.append(loader != null ? loader.getClass().getName() : "<bootstrap>");
-          summarizeState(summary, state);
-          summary.append("\n\n");
+        instrumentationNames[instrumentationId] = module.names();
+        instrumentationClasses[instrumentationId] = module.getClass().getName();
+    }
+
+    /** Registers an observer to be notified whenever an instrumentation is applied. */
+    public static void setObserver(Observer observer) {
+        InstrumenterState.observer = observer;
+    }
+
+    /** Resets the default instrumentation state so nothing is blocked or applied. */
+    public static void resetDefaultState() {
+        int instrumentationCount = instrumentationNames.length;
+
+        int wordsPerClassLoaderState = ((instrumentationCount << 1) + BITS_PER_WORD - 1) >> ADDRESS_BITS_PER_WORD;
+
+        if (defaultState.length > 0) { // optimization: skip clear if there's no old state
+            classLoaderStates.clear();
+        }
+
+        defaultState = new long[wordsPerClassLoaderState];
+    }
+
+    /**
+     * Does the instrumentation apply to the given class-loader?
+     *
+     * @return {@code null} if checks such as muzzle are still pending
+     */
+    public static Boolean isApplicable(ClassLoader classLoader, int instrumentationId) {
+        int status = currentState(classLoader, instrumentationId);
+        return status == 0 ? null : status == APPLIED;
+    }
+
+    /** Records that the instrumentation was applied to the given class-loader. */
+    public static void applyInstrumentation(ClassLoader classLoader, int instrumentationId) {
+        updateState(classLoader, instrumentationId, APPLIED);
+        if (log.isDebugEnabled()) {
+            log.debug(
+                    "Instrumentation applied - {} instrumentation.target.classloader={}",
+                    describe(instrumentationId),
+                    classLoader);
+        }
+        if (null != observer) {
+            observer.applied(instrumentationNames[instrumentationId]);
+        }
+    }
+
+    /** Records that the instrumentation is blocked for the given class-loader. */
+    public static void blockInstrumentation(ClassLoader classLoader, int instrumentationId) {
+        updateState(classLoader, instrumentationId, BLOCKED);
+        if (log.isDebugEnabled()) {
+            log.debug(
+                    "Instrumentation blocked - {} instrumentation.target.classloader={}",
+                    describe(instrumentationId),
+                    classLoader);
+        }
+    }
+
+    /** Records that the instrumentation is blocked by default. */
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_ACCESSIBLE_OBJECT_SYNCHRONIZATION",
+            justification =
+                    "resetDefaultState() runs before installing Byte Buddy, so defaultState is never reassigned while this method can run.")
+    public static void blockInstrumentation(int instrumentationId) {
+        int bitIndex = instrumentationId << 1;
+        int wordIndex = bitIndex >> ADDRESS_BITS_PER_WORD;
+        long bitsToSet = ((long) BLOCKED) << (bitIndex & BIT_INDEX_MASK);
+        synchronized (defaultState) {
+            defaultState[wordIndex] |= bitsToSet;
+        }
+    }
+
+    public static String describe(int instrumentationId) {
+        if (instrumentationId >= 0 && instrumentationId < instrumentationNames.length) {
+            return "instrumentation.names=["
+                    + String.join(",", instrumentationNames[instrumentationId])
+                    + "] instrumentation.class="
+                    + instrumentationClasses[instrumentationId];
+        } else {
+            return "<unknown instrumentation>";
+        }
+    }
+
+    private static int currentState(ClassLoader classLoader, int instrumentationId) {
+        return currentState(classLoaderState(classLoader), instrumentationId << 1);
+    }
+
+    private static void updateState(ClassLoader classLoader, int instrumentationId, int status) {
+        updateState(classLoaderState(classLoader), instrumentationId << 1, status);
+    }
+
+    private static AtomicLongArray classLoaderState(ClassLoader classLoader) {
+        return classLoaderStates.get(classLoader);
+    }
+
+    private static int currentState(AtomicLongArray state, int bitIndex) {
+        int wordIndex = bitIndex >> ADDRESS_BITS_PER_WORD;
+        return STATUS_BITS & (int) (state.get(wordIndex) >> (bitIndex & BIT_INDEX_MASK));
+    }
+
+    private static void updateState(AtomicLongArray state, int bitIndex, int status) {
+        int wordIndex = bitIndex >> ADDRESS_BITS_PER_WORD;
+        long bitsToSet = ((long) status) << (bitIndex & BIT_INDEX_MASK);
+        long wordState = state.get(wordIndex);
+        while (!state.compareAndSet(wordIndex, wordState, wordState | bitsToSet)) {
+            wordState = state.get(wordIndex);
+        }
+    }
+
+    public static String summary() {
+        StringBuilder summary = new StringBuilder();
+        classLoaderStates.visit((loader, state) -> {
+            summary.append(loader != null ? loader.getClass().getName() : "<bootstrap>");
+            summarizeState(summary, state);
+            summary.append("\n\n");
         });
-    return summary.toString();
-  }
-
-  private static void summarizeState(StringBuilder summary, AtomicLongArray state) {
-    for (int wordIndex = 0; wordIndex < state.length(); wordIndex++) {
-      int instrumentationId = wordIndex * (BITS_PER_WORD >> 1); // 2 bits per status
-      long wordState = state.get(wordIndex);
-      while (wordState != 0) {
-        if ((wordState & STATUS_BITS) != 0) {
-          if ((wordState & APPLIED) != 0) {
-            summary.append("\n    APPLIED  ");
-          } else {
-            summary.append("\n    BLOCKED  ");
-          }
-          summary
-              .append(instrumentationClasses[instrumentationId])
-              .append("  ")
-              .append(instrumentationNames[instrumentationId]);
+        return summary.toString();
+    }
+
+    private static void summarizeState(StringBuilder summary, AtomicLongArray state) {
+        for (int wordIndex = 0; wordIndex < state.length(); wordIndex++) {
+            int instrumentationId = wordIndex * (BITS_PER_WORD >> 1); // 2 bits per status
+            long wordState = state.get(wordIndex);
+            while (wordState != 0) {
+                if ((wordState & STATUS_BITS) != 0) {
+                    if ((wordState & APPLIED) != 0) {
+                        summary.append("\n    APPLIED  ");
+                    } else {
+                        summary.append("\n    BLOCKED  ");
+                    }
+                    summary.append(instrumentationClasses[instrumentationId])
+                            .append("  ")
+                            .append(instrumentationNames[instrumentationId]);
+                }
+                instrumentationId++;
+                wordState >>>= 2; // move onto next 2 status bits
+            }
         }
-        instrumentationId++;
-        wordState >>>= 2; // move onto next 2 status bits
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/JavaModuleOpenProvider.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/JavaModuleOpenProvider.java
index 142164d7aff..9440316fd89 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/JavaModuleOpenProvider.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/JavaModuleOpenProvider.java
@@ -10,6 +10,6 @@
  * that the host application has permitted them.
  */
 public interface JavaModuleOpenProvider {
-  /** Classes whose constructors trigger the one-time module open when first instantiated. */
-  Collection<String> triggerClasses();
+    /** Classes whose constructors trigger the one-time module open when first instantiated. */
+    Collection<String> triggerClasses();
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/KnownTypesIndex.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/KnownTypesIndex.java
index 434430fad42..08051beef59 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/KnownTypesIndex.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/KnownTypesIndex.java
@@ -20,152 +20,150 @@
 
 /** Maintains an index from known instrumented class names to transformation id(s). */
 public final class KnownTypesIndex {
-  private static final Logger log = LoggerFactory.getLogger(KnownTypesIndex.class);
+    private static final Logger log = LoggerFactory.getLogger(KnownTypesIndex.class);
 
-  private static final String KNOWN_TYPES_INDEX_NAME = "known-types.index";
+    private static final String KNOWN_TYPES_INDEX_NAME = "known-types.index";
 
-  // marks results that match multiple transformations
-  private static final int MULTIPLE_ID_MARKER = 0x1000;
+    // marks results that match multiple transformations
+    private static final int MULTIPLE_ID_MARKER = 0x1000;
 
-  // lookup table of multiple-id results
-  private final int[][] multipleIdTable;
+    // lookup table of multiple-id results
+    private final int[][] multipleIdTable;
 
-  private final ClassNameTrie knownTypesTrie;
+    private final ClassNameTrie knownTypesTrie;
 
-  private KnownTypesIndex(int[][] multipleIdTable, ClassNameTrie knownTypesTrie) {
-    this.multipleIdTable = multipleIdTable;
-    this.knownTypesTrie = knownTypesTrie;
-  }
+    private KnownTypesIndex(int[][] multipleIdTable, ClassNameTrie knownTypesTrie) {
+        this.multipleIdTable = multipleIdTable;
+        this.knownTypesTrie = knownTypesTrie;
+    }
 
-  public void apply(String name, BitSet mask, BitSet transformationIds) {
-    int result = knownTypesTrie.apply(name);
-    if (result >= 0) {
-      if ((result & MULTIPLE_ID_MARKER) != 0) {
-        for (int id : multipleIdTable[result & ~MULTIPLE_ID_MARKER]) {
-          if (mask.get(id)) {
-            transformationIds.set(id);
-          }
+    public void apply(String name, BitSet mask, BitSet transformationIds) {
+        int result = knownTypesTrie.apply(name);
+        if (result >= 0) {
+            if ((result & MULTIPLE_ID_MARKER) != 0) {
+                for (int id : multipleIdTable[result & ~MULTIPLE_ID_MARKER]) {
+                    if (mask.get(id)) {
+                        transformationIds.set(id);
+                    }
+                }
+            } else if (mask.get(result)) {
+                transformationIds.set(result);
+            }
         }
-      } else if (mask.get(result)) {
-        transformationIds.set(result);
-      }
     }
-  }
-
-  public static KnownTypesIndex readIndex() {
-    ClassLoader instrumenterClassLoader = Instrumenter.class.getClassLoader();
-    URL indexResource = instrumenterClassLoader.getResource(KNOWN_TYPES_INDEX_NAME);
-    if (null != indexResource) {
-      try (DataInputStream in =
-          new DataInputStream(new BufferedInputStream(indexResource.openStream()))) {
-        int multipleIdCount = in.readInt();
-        int[][] multipleIdTable = new int[multipleIdCount][];
-        for (int i = 0; i < multipleIdCount; i++) {
-          int idCount = in.readInt();
-          int[] ids = new int[idCount];
-          for (int j = 0; j < idCount; j++) {
-            ids[j] = in.readInt();
-          }
-          multipleIdTable[i] = ids;
+
+    public static KnownTypesIndex readIndex() {
+        ClassLoader instrumenterClassLoader = Instrumenter.class.getClassLoader();
+        URL indexResource = instrumenterClassLoader.getResource(KNOWN_TYPES_INDEX_NAME);
+        if (null != indexResource) {
+            try (DataInputStream in = new DataInputStream(new BufferedInputStream(indexResource.openStream()))) {
+                int multipleIdCount = in.readInt();
+                int[][] multipleIdTable = new int[multipleIdCount][];
+                for (int i = 0; i < multipleIdCount; i++) {
+                    int idCount = in.readInt();
+                    int[] ids = new int[idCount];
+                    for (int j = 0; j < idCount; j++) {
+                        ids[j] = in.readInt();
+                    }
+                    multipleIdTable[i] = ids;
+                }
+                return new KnownTypesIndex(multipleIdTable, ClassNameTrie.readFrom(in));
+            } catch (Throwable e) {
+                log.error("Problem reading {}", KNOWN_TYPES_INDEX_NAME, e);
+            }
         }
-        return new KnownTypesIndex(multipleIdTable, ClassNameTrie.readFrom(in));
-      } catch (Throwable e) {
-        log.error("Problem reading {}", KNOWN_TYPES_INDEX_NAME, e);
-      }
+        return buildIndex(); // fallback to runtime generation when testing
     }
-    return buildIndex(); // fallback to runtime generation when testing
-  }
-
-  public static KnownTypesIndex buildIndex() {
-    IndexGenerator indexGenerator = new IndexGenerator();
-    indexGenerator.buildIndex();
-    // bypass writing to file, convert into structure expected at runtime
-    int[][] multipleIdTable = new int[indexGenerator.multipleIdTable.size()][];
-    for (int i = 0; i < multipleIdTable.length; i++) {
-      multipleIdTable[i] = indexGenerator.multipleIdTable.get(i).stream().toArray();
+
+    public static KnownTypesIndex buildIndex() {
+        IndexGenerator indexGenerator = new IndexGenerator();
+        indexGenerator.buildIndex();
+        // bypass writing to file, convert into structure expected at runtime
+        int[][] multipleIdTable = new int[indexGenerator.multipleIdTable.size()][];
+        for (int i = 0; i < multipleIdTable.length; i++) {
+            multipleIdTable[i] = indexGenerator.multipleIdTable.get(i).stream().toArray();
+        }
+        return new KnownTypesIndex(multipleIdTable, indexGenerator.knownTypesTrie.buildTrie());
     }
-    return new KnownTypesIndex(multipleIdTable, indexGenerator.knownTypesTrie.buildTrie());
-  }
-
-  /** Generates an index from known instrumented types referenced by {@link Instrumenter}s. */
-  static class IndexGenerator {
-    final ClassNameTrie.Builder knownTypesTrie = new ClassNameTrie.Builder();
-    final List<BitSet> multipleIdTable = new ArrayList<>();
-
-    public void buildIndex() {
-      log.debug("Generating KnownTypesIndex");
-      InstrumenterIndex instrumenterIndex = InstrumenterIndex.readIndex();
-      for (InstrumenterModule module : instrumenterIndex.modules()) {
-        for (Instrumenter member : module.typeInstrumentations()) {
-          int transformationId = instrumenterIndex.transformationId(member);
-          if (member instanceof Instrumenter.ForSingleType) {
-            String type = ((Instrumenter.ForSingleType) member).instrumentedType();
-            indexKnownType(member, type, transformationId);
-          } else if (member instanceof Instrumenter.ForKnownTypes) {
-            for (String type : ((Instrumenter.ForKnownTypes) member).knownMatchingTypes()) {
-              indexKnownType(member, type, transformationId);
+
+    /** Generates an index from known instrumented types referenced by {@link Instrumenter}s. */
+    static class IndexGenerator {
+        final ClassNameTrie.Builder knownTypesTrie = new ClassNameTrie.Builder();
+        final List<BitSet> multipleIdTable = new ArrayList<>();
+
+        public void buildIndex() {
+            log.debug("Generating KnownTypesIndex");
+            InstrumenterIndex instrumenterIndex = InstrumenterIndex.readIndex();
+            for (InstrumenterModule module : instrumenterIndex.modules()) {
+                for (Instrumenter member : module.typeInstrumentations()) {
+                    int transformationId = instrumenterIndex.transformationId(member);
+                    if (member instanceof Instrumenter.ForSingleType) {
+                        String type = ((Instrumenter.ForSingleType) member).instrumentedType();
+                        indexKnownType(member, type, transformationId);
+                    } else if (member instanceof Instrumenter.ForKnownTypes) {
+                        for (String type : ((Instrumenter.ForKnownTypes) member).knownMatchingTypes()) {
+                            indexKnownType(member, type, transformationId);
+                        }
+                    }
+                }
             }
-          }
         }
-      }
-    }
 
-    /** Indexes a single match from known-type to transformation-id. */
-    private void indexKnownType(Instrumenter instrumenter, String knownType, int transformationId) {
-      if (null == knownType || knownType.isEmpty()) {
-        throw new IllegalArgumentException(
-            instrumenter.getClass() + " declares a null or empty known-type");
-      }
-      int existingId = knownTypesTrie.apply(knownType);
-      if (existingId < 0) {
-        knownTypesTrie.put(knownType, transformationId);
-      } else {
-        BitSet transformationIds;
-        if ((existingId & MULTIPLE_ID_MARKER) != 0) {
-          // add new transformation-id to existing table entry, no need to update trie
-          transformationIds = multipleIdTable.get(existingId & ~MULTIPLE_ID_MARKER);
-        } else {
-          // create new table entry to hold multiple ids and update trie with its offset
-          knownTypesTrie.put(knownType, multipleIdTable.size() | MULTIPLE_ID_MARKER);
-          transformationIds = new BitSet();
-          multipleIdTable.add(transformationIds);
-          transformationIds.set(existingId);
+        /** Indexes a single match from known-type to transformation-id. */
+        private void indexKnownType(Instrumenter instrumenter, String knownType, int transformationId) {
+            if (null == knownType || knownType.isEmpty()) {
+                throw new IllegalArgumentException(instrumenter.getClass() + " declares a null or empty known-type");
+            }
+            int existingId = knownTypesTrie.apply(knownType);
+            if (existingId < 0) {
+                knownTypesTrie.put(knownType, transformationId);
+            } else {
+                BitSet transformationIds;
+                if ((existingId & MULTIPLE_ID_MARKER) != 0) {
+                    // add new transformation-id to existing table entry, no need to update trie
+                    transformationIds = multipleIdTable.get(existingId & ~MULTIPLE_ID_MARKER);
+                } else {
+                    // create new table entry to hold multiple ids and update trie with its offset
+                    knownTypesTrie.put(knownType, multipleIdTable.size() | MULTIPLE_ID_MARKER);
+                    transformationIds = new BitSet();
+                    multipleIdTable.add(transformationIds);
+                    transformationIds.set(existingId);
+                }
+                transformationIds.set(transformationId);
+            }
         }
-        transformationIds.set(transformationId);
-      }
-    }
 
-    public void writeIndex(Path indexFile) throws IOException {
-      try (DataOutputStream out =
-          new DataOutputStream(new BufferedOutputStream(Files.newOutputStream(indexFile)))) {
-        out.writeInt(multipleIdTable.size());
-        for (BitSet ids : multipleIdTable) {
-          out.writeInt(ids.cardinality());
-          for (int id = ids.nextSetBit(0); id >= 0; id = ids.nextSetBit(id + 1)) {
-            out.writeInt(id);
-          }
+        public void writeIndex(Path indexFile) throws IOException {
+            try (DataOutputStream out =
+                    new DataOutputStream(new BufferedOutputStream(Files.newOutputStream(indexFile)))) {
+                out.writeInt(multipleIdTable.size());
+                for (BitSet ids : multipleIdTable) {
+                    out.writeInt(ids.cardinality());
+                    for (int id = ids.nextSetBit(0); id >= 0; id = ids.nextSetBit(id + 1)) {
+                        out.writeInt(id);
+                    }
+                }
+                knownTypesTrie.writeTo(out);
+            }
         }
-        knownTypesTrie.writeTo(out);
-      }
-    }
 
-    /**
-     * Called from 'generateKnownTypesIndex' task in 'dd-java-agent/instrumentation/build.gradle'.
-     */
-    public static void main(String[] args) throws IOException {
-      if (args.length < 1) {
-        throw new IllegalArgumentException("Expected: index-dir");
-      }
+        /**
+         * Called from 'generateKnownTypesIndex' task in 'dd-java-agent/instrumentation/build.gradle'.
+         */
+        public static void main(String[] args) throws IOException {
+            if (args.length < 1) {
+                throw new IllegalArgumentException("Expected: index-dir");
+            }
 
-      Path indexDir = Paths.get(args[0]).toAbsolutePath();
+            Path indexDir = Paths.get(args[0]).toAbsolutePath();
 
-      // satisfy some instrumenters that cache matchers in initializers
-      HierarchyMatchers.registerIfAbsent(HierarchyMatchers.simpleChecks());
-      SharedTypePools.registerIfAbsent(SharedTypePools.simpleCache());
+            // satisfy some instrumenters that cache matchers in initializers
+            HierarchyMatchers.registerIfAbsent(HierarchyMatchers.simpleChecks());
+            SharedTypePools.registerIfAbsent(SharedTypePools.simpleCache());
 
-      IndexGenerator indexGenerator = new IndexGenerator();
-      indexGenerator.buildIndex();
-      indexGenerator.writeIndex(indexDir.resolve(KNOWN_TYPES_INDEX_NAME));
+            IndexGenerator indexGenerator = new IndexGenerator();
+            indexGenerator.buildIndex();
+            indexGenerator.writeIndex(indexDir.resolve(KNOWN_TYPES_INDEX_NAME));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Utils.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Utils.java
index a277dff23e8..2a74f46c18c 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Utils.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Utils.java
@@ -5,41 +5,41 @@
 
 public class Utils {
 
-  /** Return a classloader which can be used to look up bootstrap resources. */
-  public static ClassLoader getBootstrapProxy() {
-    return BootstrapProxy.INSTANCE;
-  }
-
-  /** Return the classloader the core agent is running on. */
-  public static ClassLoader getAgentClassLoader() {
-    return Instrumenter.class.getClassLoader();
-  }
-
-  /** Return a classloader covering the core agent plus any runtime extensions. */
-  public static ClassLoader getExtendedClassLoader() {
-    return Utils.extendedClassLoader;
-  }
-
-  /** Return access to the current JVM instrumentation services. */
-  public static Instrumentation getInstrumentation() {
-    return Utils.instrumentation;
-  }
-
-  private static volatile ClassLoader extendedClassLoader = getAgentClassLoader();
-
-  public static void setExtendedClassLoader(ClassLoader extendedClassLoader) {
-    if (getAgentClassLoader() == Utils.extendedClassLoader) {
-      Utils.extendedClassLoader = extendedClassLoader;
+    /** Return a classloader which can be used to look up bootstrap resources. */
+    public static ClassLoader getBootstrapProxy() {
+        return BootstrapProxy.INSTANCE;
     }
-  }
 
-  private static volatile Instrumentation instrumentation;
+    /** Return the classloader the core agent is running on. */
+    public static ClassLoader getAgentClassLoader() {
+        return Instrumenter.class.getClassLoader();
+    }
+
+    /** Return a classloader covering the core agent plus any runtime extensions. */
+    public static ClassLoader getExtendedClassLoader() {
+        return Utils.extendedClassLoader;
+    }
+
+    /** Return access to the current JVM instrumentation services. */
+    public static Instrumentation getInstrumentation() {
+        return Utils.instrumentation;
+    }
+
+    private static volatile ClassLoader extendedClassLoader = getAgentClassLoader();
+
+    public static void setExtendedClassLoader(ClassLoader extendedClassLoader) {
+        if (getAgentClassLoader() == Utils.extendedClassLoader) {
+            Utils.extendedClassLoader = extendedClassLoader;
+        }
+    }
+
+    private static volatile Instrumentation instrumentation;
 
-  public static void setInstrumentation(Instrumentation instrumentation) {
-    if (null == Utils.instrumentation) {
-      Utils.instrumentation = instrumentation;
+    public static void setInstrumentation(Instrumentation instrumentation) {
+        if (null == Utils.instrumentation) {
+            Utils.instrumentation = instrumentation;
+        }
     }
-  }
 
-  private Utils() {}
+    private Utils() {}
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/VisitingAdvice.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/VisitingAdvice.java
index 2c33e288c90..3c6119d3980 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/VisitingAdvice.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/VisitingAdvice.java
@@ -8,19 +8,19 @@
 
 /** {@link AsmVisitorWrapper} type advice. */
 final class VisitingAdvice implements Instrumenter.TransformingAdvice {
-  private final AsmVisitorWrapper visitor;
+    private final AsmVisitorWrapper visitor;
 
-  VisitingAdvice(AsmVisitorWrapper visitor) {
-    this.visitor = visitor;
-  }
+    VisitingAdvice(AsmVisitorWrapper visitor) {
+        this.visitor = visitor;
+    }
 
-  @Override
-  public DynamicType.Builder<?> transform(
-      DynamicType.Builder<?> builder,
-      TypeDescription typeDescription,
-      ClassLoader classLoader,
-      JavaModule module,
-      ProtectionDomain pd) {
-    return builder.visit(visitor);
-  }
+    @Override
+    public DynamicType.Builder<?> transform(
+            DynamicType.Builder<?> builder,
+            TypeDescription typeDescription,
+            ClassLoader classLoader,
+            JavaModule module,
+            ProtectionDomain pd) {
+        return builder.visit(visitor);
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/WeakMaps.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/WeakMaps.java
index 90f39205b6a..7d740ff2538 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/WeakMaps.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/WeakMaps.java
@@ -9,98 +9,97 @@
 import java.util.function.Function;
 
 public class WeakMaps {
-  private static final long CLEAN_FREQUENCY_SECONDS = 1;
-
-  public static <K, V> WeakMap<K, V> newWeakMap() {
-    final WeakConcurrentMap<K, V> map = new WeakConcurrentMap<>(false, true);
-    if (!Platform.isNativeImageBuilder()) {
-      AgentTaskScheduler.get()
-          .weakScheduleAtFixedRate(
-              MapCleaningTask.INSTANCE,
-              map,
-              CLEAN_FREQUENCY_SECONDS,
-              CLEAN_FREQUENCY_SECONDS,
-              TimeUnit.SECONDS);
+    private static final long CLEAN_FREQUENCY_SECONDS = 1;
+
+    public static <K, V> WeakMap<K, V> newWeakMap() {
+        final WeakConcurrentMap<K, V> map = new WeakConcurrentMap<>(false, true);
+        if (!Platform.isNativeImageBuilder()) {
+            AgentTaskScheduler.get()
+                    .weakScheduleAtFixedRate(
+                            MapCleaningTask.INSTANCE,
+                            map,
+                            CLEAN_FREQUENCY_SECONDS,
+                            CLEAN_FREQUENCY_SECONDS,
+                            TimeUnit.SECONDS);
+        }
+        return new Adapter<>(map);
     }
-    return new Adapter<>(map);
-  }
-
-  private WeakMaps() {}
-
-  public static void registerAsSupplier() {
-    WeakMap.Supplier.registerIfAbsent(
-        new WeakMap.Supplier() {
-          @Override
-          protected <K, V> WeakMap<K, V> get() {
-            return WeakMaps.newWeakMap();
-          }
-        });
-  }
 
-  // Important to use explicit class to avoid implicit hard references to target
-  private static class MapCleaningTask implements Task<WeakConcurrentMap<?, ?>> {
-    static final MapCleaningTask INSTANCE = new MapCleaningTask();
+    private WeakMaps() {}
 
-    @Override
-    public void run(final WeakConcurrentMap<?, ?> target) {
-      target.expungeStaleEntries();
+    public static void registerAsSupplier() {
+        WeakMap.Supplier.registerIfAbsent(new WeakMap.Supplier() {
+            @Override
+            protected <K, V> WeakMap<K, V> get() {
+                return WeakMaps.newWeakMap();
+            }
+        });
     }
-  }
 
-  private static class Adapter<K, V> implements WeakMap<K, V> {
-    private final WeakConcurrentMap<K, V> map;
+    // Important to use explicit class to avoid implicit hard references to target
+    private static class MapCleaningTask implements Task<WeakConcurrentMap<?, ?>> {
+        static final MapCleaningTask INSTANCE = new MapCleaningTask();
 
-    private Adapter(final WeakConcurrentMap<K, V> map) {
-      this.map = map;
+        @Override
+        public void run(final WeakConcurrentMap<?, ?> target) {
+            target.expungeStaleEntries();
+        }
     }
 
-    @Override
-    public int size() {
-      return map.approximateSize();
-    }
+    private static class Adapter<K, V> implements WeakMap<K, V> {
+        private final WeakConcurrentMap<K, V> map;
 
-    @Override
-    public boolean containsKey(final K key) {
-      return map.containsKey(key);
-    }
+        private Adapter(final WeakConcurrentMap<K, V> map) {
+            this.map = map;
+        }
 
-    @Override
-    public V get(final K key) {
-      return map.get(key);
-    }
+        @Override
+        public int size() {
+            return map.approximateSize();
+        }
 
-    @Override
-    public void put(final K key, final V value) {
-      if (null != value) {
-        map.put(key, value);
-      } else {
-        map.remove(key); // WeakConcurrentMap doesn't accept null values
-      }
-    }
+        @Override
+        public boolean containsKey(final K key) {
+            return map.containsKey(key);
+        }
 
-    @Override
-    public void putIfAbsent(final K key, final V value) {
-      map.putIfAbsent(key, value);
-    }
+        @Override
+        public V get(final K key) {
+            return map.get(key);
+        }
 
-    @Override
-    public V computeIfAbsent(final K key, final Function<? super K, ? extends V> supplier) {
-      V value = map.get(key);
-      if (null == value) {
-        synchronized (this) {
-          value = map.get(key);
-          if (null == value) {
-            value = supplier.apply(key);
-            map.put(key, value);
-          }
+        @Override
+        public void put(final K key, final V value) {
+            if (null != value) {
+                map.put(key, value);
+            } else {
+                map.remove(key); // WeakConcurrentMap doesn't accept null values
+            }
         }
-      }
-      return value;
-    }
 
-    @Override
-    public V remove(K key) {
-      return map.remove(key);
+        @Override
+        public void putIfAbsent(final K key, final V value) {
+            map.putIfAbsent(key, value);
+        }
+
+        @Override
+        public V computeIfAbsent(final K key, final Function<? super K, ? extends V> supplier) {
+            V value = map.get(key);
+            if (null == value) {
+                synchronized (this) {
+                    value = map.get(key);
+                    if (null == value) {
+                        value = supplier.apply(key);
+                        map.put(key, value);
+                    }
+                }
+            }
+            return value;
+        }
+
+        @Override
+        public V remove(K key) {
+            return map.remove(key);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceProcessor.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceProcessor.java
index 4b66762b99b..165beca16e9 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceProcessor.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceProcessor.java
@@ -2,5 +2,5 @@
 
 /** Ordered build-time consumer of a reusable {@link AdviceScanResult}. */
 public interface AdviceProcessor {
-  void process(AdviceScanResult scanResult, AdviceProcessorContext context);
+    void process(AdviceScanResult scanResult, AdviceProcessorContext context);
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceProcessorContext.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceProcessorContext.java
index 00777681c4b..48c154a719b 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceProcessorContext.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceProcessorContext.java
@@ -5,26 +5,25 @@
 
 /** Module, output directory, and resolved helpers shared by advice processors. */
 public final class AdviceProcessorContext {
-  private final InstrumenterModule module;
-  private final File targetDirectory;
-  private final String[] helperClassNames;
+    private final InstrumenterModule module;
+    private final File targetDirectory;
+    private final String[] helperClassNames;
 
-  AdviceProcessorContext(
-      InstrumenterModule module, File targetDirectory, String[] helperClassNames) {
-    this.module = module;
-    this.targetDirectory = targetDirectory;
-    this.helperClassNames = helperClassNames;
-  }
+    AdviceProcessorContext(InstrumenterModule module, File targetDirectory, String[] helperClassNames) {
+        this.module = module;
+        this.targetDirectory = targetDirectory;
+        this.helperClassNames = helperClassNames;
+    }
 
-  public InstrumenterModule getModule() {
-    return module;
-  }
+    public InstrumenterModule getModule() {
+        return module;
+    }
 
-  public File getTargetDirectory() {
-    return targetDirectory;
-  }
+    public File getTargetDirectory() {
+        return targetDirectory;
+    }
 
-  public String[] getHelperClassNames() {
-    return helperClassNames;
-  }
+    public String[] getHelperClassNames() {
+        return helperClassNames;
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceScanResult.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceScanResult.java
index 57426d38960..53df3942754 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceScanResult.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceScanResult.java
@@ -9,235 +9,235 @@
 
 /** Immutable, neutral result of scanning a module's method advice. */
 public final class AdviceScanResult {
-  private static final String INSTRUMENTATION_PACKAGE = "datadog.trace.instrumentation.";
-
-  public enum UsageKind {
-    TYPE,
-    FIELD,
-    METHOD,
-    HANDLE,
-    INVOKEDYNAMIC
-  }
-
-  /** Source location of a bytecode use. */
-  public static final class SourceLocation {
-    private final String className;
-    private final String sourceFile;
-    private final int line;
-
-    SourceLocation(String className, String sourceFile, int line) {
-      this.className = className;
-      this.sourceFile = sourceFile;
-      this.line = line;
-    }
-
-    public String getClassName() {
-      return className;
-    }
-
-    /** Source filename, falling back to the binary class name when unavailable. */
-    public String getSourceFile() {
-      return sourceFile;
-    }
-
-    public int getLine() {
-      return line;
-    }
-  }
-
-  /** A method-handle target without an ASM dependency in the public model. */
-  public static final class HandleUse {
-    private final int tag;
-    private final String owner;
-    private final String name;
-    private final String descriptor;
-    private final boolean interfaceOwner;
-
-    HandleUse(int tag, String owner, String name, String descriptor, boolean interfaceOwner) {
-      this.tag = tag;
-      this.owner = owner;
-      this.name = name;
-      this.descriptor = descriptor;
-      this.interfaceOwner = interfaceOwner;
-    }
-
-    public int getTag() {
-      return tag;
-    }
-
-    public String getOwner() {
-      return owner;
-    }
-
-    public String getName() {
-      return name;
-    }
-
-    public String getDescriptor() {
-      return descriptor;
-    }
-
-    public boolean isInterfaceOwner() {
-      return interfaceOwner;
-    }
-  }
-
-  /** One ordered bytecode use made by a scanned class. */
-  public static final class Usage {
-    private final UsageKind kind;
-    private final SourceLocation source;
-    private final int opcode;
-    private final String owner;
-    private final String name;
-    private final String descriptor;
-    private final boolean interfaceOwner;
-    private final boolean implementedInterface;
-    private final List<HandleUse> handles;
-
-    Usage(
-        UsageKind kind,
-        SourceLocation source,
-        int opcode,
-        String owner,
-        String name,
-        String descriptor,
-        boolean interfaceOwner,
-        boolean implementedInterface,
-        List<HandleUse> handles) {
-      this.kind = kind;
-      this.source = source;
-      this.opcode = opcode;
-      this.owner = owner;
-      this.name = name;
-      this.descriptor = descriptor;
-      this.interfaceOwner = interfaceOwner;
-      this.implementedInterface = implementedInterface;
-      this.handles = immutableCopy(handles);
-    }
-
-    public UsageKind getKind() {
-      return kind;
-    }
+    private static final String INSTRUMENTATION_PACKAGE = "datadog.trace.instrumentation.";
+
+    public enum UsageKind {
+        TYPE,
+        FIELD,
+        METHOD,
+        HANDLE,
+        INVOKEDYNAMIC
+    }
+
+    /** Source location of a bytecode use. */
+    public static final class SourceLocation {
+        private final String className;
+        private final String sourceFile;
+        private final int line;
+
+        SourceLocation(String className, String sourceFile, int line) {
+            this.className = className;
+            this.sourceFile = sourceFile;
+            this.line = line;
+        }
+
+        public String getClassName() {
+            return className;
+        }
+
+        /** Source filename, falling back to the binary class name when unavailable. */
+        public String getSourceFile() {
+            return sourceFile;
+        }
+
+        public int getLine() {
+            return line;
+        }
+    }
+
+    /** A method-handle target without an ASM dependency in the public model. */
+    public static final class HandleUse {
+        private final int tag;
+        private final String owner;
+        private final String name;
+        private final String descriptor;
+        private final boolean interfaceOwner;
+
+        HandleUse(int tag, String owner, String name, String descriptor, boolean interfaceOwner) {
+            this.tag = tag;
+            this.owner = owner;
+            this.name = name;
+            this.descriptor = descriptor;
+            this.interfaceOwner = interfaceOwner;
+        }
+
+        public int getTag() {
+            return tag;
+        }
+
+        public String getOwner() {
+            return owner;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getDescriptor() {
+            return descriptor;
+        }
+
+        public boolean isInterfaceOwner() {
+            return interfaceOwner;
+        }
+    }
+
+    /** One ordered bytecode use made by a scanned class. */
+    public static final class Usage {
+        private final UsageKind kind;
+        private final SourceLocation source;
+        private final int opcode;
+        private final String owner;
+        private final String name;
+        private final String descriptor;
+        private final boolean interfaceOwner;
+        private final boolean implementedInterface;
+        private final List<HandleUse> handles;
+
+        Usage(
+                UsageKind kind,
+                SourceLocation source,
+                int opcode,
+                String owner,
+                String name,
+                String descriptor,
+                boolean interfaceOwner,
+                boolean implementedInterface,
+                List<HandleUse> handles) {
+            this.kind = kind;
+            this.source = source;
+            this.opcode = opcode;
+            this.owner = owner;
+            this.name = name;
+            this.descriptor = descriptor;
+            this.interfaceOwner = interfaceOwner;
+            this.implementedInterface = implementedInterface;
+            this.handles = immutableCopy(handles);
+        }
+
+        public UsageKind getKind() {
+            return kind;
+        }
+
+        public SourceLocation getSource() {
+            return source;
+        }
+
+        public int getOpcode() {
+            return opcode;
+        }
+
+        /** Binary name of the used type or member owner. */
+        public String getOwner() {
+            return owner;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getDescriptor() {
+            return descriptor;
+        }
+
+        public boolean isInterfaceOwner() {
+            return interfaceOwner;
+        }
+
+        public boolean isImplementedInterface() {
+            return implementedInterface;
+        }
+
+        public List<HandleUse> getHandles() {
+            return handles;
+        }
+    }
+
+    /** One discovered class. External leaves have no scanned bytecode. */
+    public static final class ClassInfo {
+        private final String className;
+        private final boolean fromModuleOutput;
+        private final boolean scanned;
+        private final boolean reachableFromAdvice;
+        private final List<String> requiredDependencies;
+        private final List<Usage> usages;
+
+        ClassInfo(
+                String className,
+                boolean fromModuleOutput,
+                boolean scanned,
+                boolean reachableFromAdvice,
+                Collection<String> requiredDependencies,
+                List<Usage> usages) {
+            this.className = className;
+            this.fromModuleOutput = fromModuleOutput;
+            this.scanned = scanned;
+            this.reachableFromAdvice = reachableFromAdvice;
+            this.requiredDependencies = immutableCopy(requiredDependencies);
+            this.usages = immutableCopy(usages);
+        }
+
+        public String getClassName() {
+            return className;
+        }
+
+        public boolean isScanned() {
+            return scanned;
+        }
+
+        public boolean isFromModuleOutput() {
+            return fromModuleOutput;
+        }
+
+        /**
+         * Whether an advice root reaches this class through dependencies (i.e. not nested enumeration).
+         */
+        public boolean isReachableFromAdvice() {
+            return reachableFromAdvice;
+        }
+
+        public boolean isInstrumentationClass() {
+            return AdviceScanResult.isInstrumentationClass(className);
+        }
 
-    public SourceLocation getSource() {
-      return source;
-    }
-
-    public int getOpcode() {
-      return opcode;
-    }
+        public List<Usage> getUsages() {
+            return usages;
+        }
 
-    /** Binary name of the used type or member owner. */
-    public String getOwner() {
-      return owner;
+        public List<String> getRequiredDependencies() {
+            return requiredDependencies;
+        }
     }
 
-    public String getName() {
-      return name;
-    }
-
-    public String getDescriptor() {
-      return descriptor;
-    }
+    private final List<String> adviceRoots;
+    private final Map<String, ClassInfo> classes;
 
-    public boolean isInterfaceOwner() {
-      return interfaceOwner;
-    }
-
-    public boolean isImplementedInterface() {
-      return implementedInterface;
-    }
-
-    public List<HandleUse> getHandles() {
-      return handles;
-    }
-  }
-
-  /** One discovered class. External leaves have no scanned bytecode. */
-  public static final class ClassInfo {
-    private final String className;
-    private final boolean fromModuleOutput;
-    private final boolean scanned;
-    private final boolean reachableFromAdvice;
-    private final List<String> requiredDependencies;
-    private final List<Usage> usages;
-
-    ClassInfo(
-        String className,
-        boolean fromModuleOutput,
-        boolean scanned,
-        boolean reachableFromAdvice,
-        Collection<String> requiredDependencies,
-        List<Usage> usages) {
-      this.className = className;
-      this.fromModuleOutput = fromModuleOutput;
-      this.scanned = scanned;
-      this.reachableFromAdvice = reachableFromAdvice;
-      this.requiredDependencies = immutableCopy(requiredDependencies);
-      this.usages = immutableCopy(usages);
+    AdviceScanResult(Collection<String> adviceRoots, Map<String, ClassInfo> classes) {
+        this.adviceRoots = immutableCopy(adviceRoots);
+        this.classes = immutableCopy(classes);
     }
 
-    public String getClassName() {
-      return className;
+    public List<String> getAdviceRoots() {
+        return adviceRoots;
     }
 
-    public boolean isScanned() {
-      return scanned;
+    public Map<String, ClassInfo> getClasses() {
+        return classes;
     }
 
-    public boolean isFromModuleOutput() {
-      return fromModuleOutput;
+    public ClassInfo getClassInfo(String className) {
+        return classes.get(className);
     }
 
-    /**
-     * Whether an advice root reaches this class through dependencies (i.e. not nested enumeration).
-     */
-    public boolean isReachableFromAdvice() {
-      return reachableFromAdvice;
+    static boolean isInstrumentationClass(String className) {
+        return className.startsWith(INSTRUMENTATION_PACKAGE);
     }
 
-    public boolean isInstrumentationClass() {
-      return AdviceScanResult.isInstrumentationClass(className);
+    private static <T> List<T> immutableCopy(Collection<T> values) {
+        return Collections.unmodifiableList(new ArrayList<>(values));
     }
 
-    public List<Usage> getUsages() {
-      return usages;
+    private static <K, V> Map<K, V> immutableCopy(Map<K, V> values) {
+        return Collections.unmodifiableMap(new LinkedHashMap<>(values));
     }
-
-    public List<String> getRequiredDependencies() {
-      return requiredDependencies;
-    }
-  }
-
-  private final List<String> adviceRoots;
-  private final Map<String, ClassInfo> classes;
-
-  AdviceScanResult(Collection<String> adviceRoots, Map<String, ClassInfo> classes) {
-    this.adviceRoots = immutableCopy(adviceRoots);
-    this.classes = immutableCopy(classes);
-  }
-
-  public List<String> getAdviceRoots() {
-    return adviceRoots;
-  }
-
-  public Map<String, ClassInfo> getClasses() {
-    return classes;
-  }
-
-  public ClassInfo getClassInfo(String className) {
-    return classes.get(className);
-  }
-
-  static boolean isInstrumentationClass(String className) {
-    return className.startsWith(INSTRUMENTATION_PACKAGE);
-  }
-
-  private static <T> List<T> immutableCopy(Collection<T> values) {
-    return Collections.unmodifiableList(new ArrayList<>(values));
-  }
-
-  private static <K, V> Map<K, V> immutableCopy(Map<K, V> values) {
-    return Collections.unmodifiableMap(new LinkedHashMap<>(values));
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceScanner.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceScanner.java
index aad87cb62f9..2e39b423f4e 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceScanner.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceScanner.java
@@ -44,558 +44,530 @@
 
 /** Scans all advice and reachable instrumentation bytecode for one instrumenter module. */
 public final class AdviceScanner {
-  private static final int UNDEFINED_LINE = -1;
-  private static final String CLASS_FILE_SUFFIX = ".class";
-
-  private final InstrumenterModule module;
-  private final ClassFileLocator classFileLocator;
-  private final Set<String> moduleOutputClasses;
-  private final LinkedHashSet<String> adviceRoots = new LinkedHashSet<>();
-  private final LinkedHashMap<String, MutableClassInfo> classes = new LinkedHashMap<>();
-  private final Deque<String> scanQueue = new ArrayDeque<>();
-  private final Set<String> visited = new HashSet<>();
-
-  private AdviceScanner(InstrumenterModule module, ClassFileLocator classFileLocator) {
-    this.module = module;
-    this.classFileLocator = classFileLocator;
-    moduleOutputClasses = findModuleOutputClasses(module);
-  }
-
-  public static AdviceScanResult scan(InstrumenterModule module) {
-    return scan(module, Thread.currentThread().getContextClassLoader());
-  }
-
-  public static AdviceScanResult scan(InstrumenterModule module, ClassLoader classLoader) {
-    return scan(module, ClassFileLocator.ForClassLoader.of(classLoader));
-  }
-
-  static AdviceScanResult scan(InstrumenterModule module, ClassFileLocator classFileLocator) {
-    return new AdviceScanner(module, classFileLocator).scan();
-  }
-
-  private AdviceScanResult scan() {
-    collectAdviceRoots();
-    for (String adviceRoot : adviceRoots) {
-      MutableClassInfo info = discover(adviceRoot, adviceRoot);
-      enqueue(info, true);
-    }
+    private static final int UNDEFINED_LINE = -1;
+    private static final String CLASS_FILE_SUFFIX = ".class";
 
-    String className;
-    while ((className = scanQueue.pollFirst()) != null) {
-      scanClass(classes.get(className));
-    }
-    markReachableClasses();
+    private final InstrumenterModule module;
+    private final ClassFileLocator classFileLocator;
+    private final Set<String> moduleOutputClasses;
+    private final LinkedHashSet<String> adviceRoots = new LinkedHashSet<>();
+    private final LinkedHashMap<String, MutableClassInfo> classes = new LinkedHashMap<>();
+    private final Deque<String> scanQueue = new ArrayDeque<>();
+    private final Set<String> visited = new HashSet<>();
 
-    Map<String, ClassInfo> frozenClasses = new LinkedHashMap<>();
-    for (Map.Entry<String, MutableClassInfo> entry : classes.entrySet()) {
-      frozenClasses.put(entry.getKey(), entry.getValue().freeze());
-    }
-    return new AdviceScanResult(adviceRoots, frozenClasses);
-  }
-
-  private void markReachableClasses() {
-    Deque<String> pending = new ArrayDeque<>(adviceRoots);
-    String className;
-    while ((className = pending.pollFirst()) != null) {
-      MutableClassInfo info = classes.get(className);
-      if (info != null && !info.reachableFromAdvice) {
-        info.reachableFromAdvice = true;
-        pending.addAll(info.dependencies);
-      }
+    private AdviceScanner(InstrumenterModule module, ClassFileLocator classFileLocator) {
+        this.module = module;
+        this.classFileLocator = classFileLocator;
+        moduleOutputClasses = findModuleOutputClasses(module);
     }
-  }
-
-  private void collectAdviceRoots() {
-    List<Instrumenter> instrumenters = module.typeInstrumentations();
-    for (Instrumenter instrumenter : instrumenters) {
-      if (instrumenter instanceof Instrumenter.HasMethodAdvice) {
-        ((Instrumenter.HasMethodAdvice) instrumenter)
-            .methodAdvice(
-                (matcher, adviceClass, additionalClasses) -> {
-                  adviceRoots.add(adviceClass);
-                  if (additionalClasses != null) {
-                    addAll(adviceRoots, additionalClasses);
-                  }
-                });
-      }
-    }
-  }
 
-  private MutableClassInfo discover(String className, String adviceRoot) {
-    if (className == null) {
-      return null;
-    }
-    MutableClassInfo existing = classes.get(className);
-    if (existing != null) {
-      if (adviceRoot != null && existing.adviceRoot == null) {
-        existing.adviceRoot = adviceRoot;
-      }
-      return existing;
+    public static AdviceScanResult scan(InstrumenterModule module) {
+        return scan(module, Thread.currentThread().getContextClassLoader());
     }
-    MutableClassInfo created =
-        new MutableClassInfo(className, adviceRoot, moduleOutputClasses.contains(className));
-    classes.put(className, created);
-    return created;
-  }
-
-  private void enqueue(MutableClassInfo info, boolean adviceRoot) {
-    if (info == null) {
-      return;
+
+    public static AdviceScanResult scan(InstrumenterModule module, ClassLoader classLoader) {
+        return scan(module, ClassFileLocator.ForClassLoader.of(classLoader));
     }
-    if ((adviceRoot
-            || AdviceScanResult.isInstrumentationClass(info.className)
-            || isHelperClass(info.className, info.fromModuleOutput, module))
-        && visited.add(info.className)) {
-      scanQueue.addLast(info.className);
-      if (!adviceRoot && info.fromModuleOutput) {
-        enqueueNestedClasses(info);
-      }
+
+    static AdviceScanResult scan(InstrumenterModule module, ClassFileLocator classFileLocator) {
+        return new AdviceScanner(module, classFileLocator).scan();
     }
-  }
 
-  private void enqueueNestedClasses(MutableClassInfo owner) {
-    String prefix = owner.className + "$";
-    for (String className : moduleOutputClasses) {
-      if (className.startsWith(prefix)) {
-        MutableClassInfo nested = discover(className, owner.adviceRoot);
-        if (visited.add(className)) {
-          scanQueue.addLast(className);
+    private AdviceScanResult scan() {
+        collectAdviceRoots();
+        for (String adviceRoot : adviceRoots) {
+            MutableClassInfo info = discover(adviceRoot, adviceRoot);
+            enqueue(info, true);
         }
-      }
-    }
-  }
 
-  private void addDependency(MutableClassInfo from, String className) {
-    addDependency(from, className, true);
-  }
+        String className;
+        while ((className = scanQueue.pollFirst()) != null) {
+            scanClass(classes.get(className));
+        }
+        markReachableClasses();
 
-  private void addDependency(MutableClassInfo from, String className, boolean trackReachability) {
-    if (className == null || className.equals(from.className)) {
-      return;
-    }
-    if (className.startsWith("[")) {
-      addTypeDependency(from, Type.getType(className.substring(1)), trackReachability);
-      return;
-    }
-    if (trackReachability) {
-      from.dependencies.add(className);
-    }
-    MutableClassInfo target = discover(className, from.adviceRoot);
-    // Muzzle also needs bytecode excluded from helper reachability, such as advice superclasses.
-    enqueue(target, false);
-  }
-
-  private void addRequiredDependency(MutableClassInfo from, String className) {
-    if (className != null && !className.equals(from.className)) {
-      from.requiredDependencies.add(className);
-      addDependency(from, className);
+        Map<String, ClassInfo> frozenClasses = new LinkedHashMap<>();
+        for (Map.Entry<String, MutableClassInfo> entry : classes.entrySet()) {
+            frozenClasses.put(entry.getKey(), entry.getValue().freeze());
+        }
+        return new AdviceScanResult(adviceRoots, frozenClasses);
+    }
+
+    private void markReachableClasses() {
+        Deque<String> pending = new ArrayDeque<>(adviceRoots);
+        String className;
+        while ((className = pending.pollFirst()) != null) {
+            MutableClassInfo info = classes.get(className);
+            if (info != null && !info.reachableFromAdvice) {
+                info.reachableFromAdvice = true;
+                pending.addAll(info.dependencies);
+            }
+        }
     }
-  }
 
-  private void addTypeDependency(MutableClassInfo from, Type type, boolean trackReachability) {
-    if (type == null) {
-      return;
-    }
-    type = underlyingType(type);
-    if (type.getSort() == Type.METHOD) {
-      for (Type argument : type.getArgumentTypes()) {
-        addTypeDependency(from, argument, trackReachability);
-      }
-      addTypeDependency(from, type.getReturnType(), trackReachability);
-    } else if (type.getSort() == Type.OBJECT) {
-      addDependency(from, type.getClassName(), trackReachability);
-    }
-  }
-
-  private void addHandleDependencies(
-      MutableClassInfo from, Handle handle, boolean trackReachability) {
-    addDependency(from, binaryName(handle.getOwner()), trackReachability);
-    addTypeDependency(from, Type.getType(handle.getDesc()), trackReachability);
-  }
-
-  private static Set<String> findModuleOutputClasses(InstrumenterModule module) {
-    CodeSource codeSource = module.getClass().getProtectionDomain().getCodeSource();
-    if (codeSource == null || codeSource.getLocation() == null) {
-      throw new IllegalStateException(
-          "Cannot locate compiled output for " + module.getClass().getName());
-    }
-    Path root;
-    try {
-      root = Paths.get(codeSource.getLocation().toURI());
-    } catch (URISyntaxException error) {
-      throw new IllegalStateException(
-          "Cannot resolve compiled output for " + module.getClass().getName(), error);
-    }
-    if (!Files.isDirectory(root)) {
-      return emptySet();
-    }
-    try (Stream<Path> files = Files.walk(root)) {
-      return files
-          .filter(Files::isRegularFile)
-          .map(root::relativize)
-          .map(Path::toString)
-          .filter(name -> name.endsWith(CLASS_FILE_SUFFIX))
-          .map(name -> name.substring(0, name.length() - CLASS_FILE_SUFFIX.length()))
-          .map(name -> name.replace('/', '.').replace('\\', '.'))
-          .sorted()
-          .collect(toCollection(LinkedHashSet::new));
-    } catch (IOException error) {
-      throw new IllegalStateException(
-          "Cannot inspect compiled output for " + module.getClass().getName(), error);
-    }
-  }
-
-  @SuppressForbidden
-  private void scanClass(MutableClassInfo info) {
-    String resource = info.className.replace('.', '/') + CLASS_FILE_SUFFIX;
-    ClassFileLocator.Resolution resolution;
-    try {
-      resolution = classFileLocator.locate(info.className);
-    } catch (Throwable error) {
-      throw scanFailure(
-          info.className, owningAdvice(info.className), "cannot read class bytecode", error);
+    private void collectAdviceRoots() {
+        List<Instrumenter> instrumenters = module.typeInstrumentations();
+        for (Instrumenter instrumenter : instrumenters) {
+            if (instrumenter instanceof Instrumenter.HasMethodAdvice) {
+                ((Instrumenter.HasMethodAdvice) instrumenter)
+                        .methodAdvice((matcher, adviceClass, additionalClasses) -> {
+                            adviceRoots.add(adviceClass);
+                            if (additionalClasses != null) {
+                                addAll(adviceRoots, additionalClasses);
+                            }
+                        });
+            }
+        }
     }
-    if (!resolution.isResolved()) {
-      if (adviceRoots.contains(info.className) || info.fromModuleOutput) {
-        throw scanFailure(
-            info.className,
-            owningAdvice(info.className),
-            adviceRoots.contains(info.className)
-                ? "advice class is missing"
-                : "helper class from module output is missing",
-            null);
-      }
-      System.err.println(resource + " not found, skipping");
-      return;
+
+    private MutableClassInfo discover(String className, String adviceRoot) {
+        if (className == null) {
+            return null;
+        }
+        MutableClassInfo existing = classes.get(className);
+        if (existing != null) {
+            if (adviceRoot != null && existing.adviceRoot == null) {
+                existing.adviceRoot = adviceRoot;
+            }
+            return existing;
+        }
+        MutableClassInfo created = new MutableClassInfo(className, adviceRoot, moduleOutputClasses.contains(className));
+        classes.put(className, created);
+        return created;
     }
-    try {
-      new ClassReader(resolution.resolve())
-          .accept(new ScanningVisitor(info), ClassReader.SKIP_FRAMES);
-      info.scanned = true;
-    } catch (Throwable error) {
-      throw scanFailure(
-          info.className, owningAdvice(info.className), "cannot parse class bytecode", error);
+
+    private void enqueue(MutableClassInfo info, boolean adviceRoot) {
+        if (info == null) {
+            return;
+        }
+        if ((adviceRoot
+                        || AdviceScanResult.isInstrumentationClass(info.className)
+                        || isHelperClass(info.className, info.fromModuleOutput, module))
+                && visited.add(info.className)) {
+            scanQueue.addLast(info.className);
+            if (!adviceRoot && info.fromModuleOutput) {
+                enqueueNestedClasses(info);
+            }
+        }
     }
-  }
-
-  private String owningAdvice(String className) {
-    MutableClassInfo info = classes.get(className);
-    return info == null || info.adviceRoot == null ? "<none>" : info.adviceRoot;
-  }
-
-  private IllegalStateException scanFailure(
-      String className, String adviceRoot, String detail, Throwable cause) {
-    String message =
-        "Advice scan failed for module "
-            + module.getClass().getName()
-            + ", advice "
-            + adviceRoot
-            + ", class "
-            + className
-            + ": "
-            + detail;
-    return new IllegalStateException(message, cause);
-  }
-
-  private static String binaryName(String internalName) {
-    return internalName.replace('/', '.');
-  }
-
-  private static Type underlyingType(Type type) {
-    while (type.getSort() == Type.ARRAY) {
-      type = type.getElementType();
+
+    private void enqueueNestedClasses(MutableClassInfo owner) {
+        String prefix = owner.className + "$";
+        for (String className : moduleOutputClasses) {
+            if (className.startsWith(prefix)) {
+                MutableClassInfo nested = discover(className, owner.adviceRoot);
+                if (visited.add(className)) {
+                    scanQueue.addLast(className);
+                }
+            }
+        }
     }
-    return type;
-  }
-
-  private static Usage createUsage(
-      MutableClassInfo source,
-      UsageKind kind,
-      int line,
-      int opcode,
-      String owner,
-      String name,
-      String descriptor,
-      boolean interfaceOwner,
-      boolean implementedInterface,
-      List<HandleUse> handles) {
-    return new Usage(
-        kind,
-        new SourceLocation(source.className, source.sourceFile, line),
-        opcode,
-        owner,
-        name,
-        descriptor,
-        interfaceOwner,
-        implementedInterface,
-        handles);
-  }
-
-  private final class ScanningVisitor extends ClassVisitor {
-    private final MutableClassInfo info;
-    private String[] interfaces;
-
-    private ScanningVisitor(MutableClassInfo info) {
-      super(ASM_API);
-      this.info = info;
+
+    private void addDependency(MutableClassInfo from, String className) {
+        addDependency(from, className, true);
     }
 
-    @Override
-    public void visit(
-        int version,
-        int access,
-        String name,
-        String signature,
-        String superName,
-        String[] interfaces) {
-      this.interfaces = interfaces;
-      if (interfaces != null) {
-        for (String interfaceName : interfaces) {
-          addHierarchyDependency(interfaceName);
-        }
-      }
-      // Record the hierarchy for helper ordering. Muzzle's superclass reference remains captured
-      // by the invokespecial instruction in each constructor.
-      if (superName != null) {
-        addHierarchyDependency(superName);
-      }
+    private void addDependency(MutableClassInfo from, String className, boolean trackReachability) {
+        if (className == null || className.equals(from.className)) {
+            return;
+        }
+        if (className.startsWith("[")) {
+            addTypeDependency(from, Type.getType(className.substring(1)), trackReachability);
+            return;
+        }
+        if (trackReachability) {
+            from.dependencies.add(className);
+        }
+        MutableClassInfo target = discover(className, from.adviceRoot);
+        // Muzzle also needs bytecode excluded from helper reachability, such as advice superclasses.
+        enqueue(target, false);
     }
 
-    private void addHierarchyDependency(String internalName) {
-      String className = binaryName(internalName);
-      if (adviceRoots.contains(info.className)) {
-        addDependency(info, className, false);
-      } else {
-        addRequiredDependency(info, className);
-      }
+    private void addRequiredDependency(MutableClassInfo from, String className) {
+        if (className != null && !className.equals(from.className)) {
+            from.requiredDependencies.add(className);
+            addDependency(from, className);
+        }
     }
 
-    @Override
-    public void visitSource(String source, String debug) {
-      if (source != null) {
-        info.sourceFile = source;
-      }
+    private void addTypeDependency(MutableClassInfo from, Type type, boolean trackReachability) {
+        if (type == null) {
+            return;
+        }
+        type = underlyingType(type);
+        if (type.getSort() == Type.METHOD) {
+            for (Type argument : type.getArgumentTypes()) {
+                addTypeDependency(from, argument, trackReachability);
+            }
+            addTypeDependency(from, type.getReturnType(), trackReachability);
+        } else if (type.getSort() == Type.OBJECT) {
+            addDependency(from, type.getClassName(), trackReachability);
+        }
     }
 
-    @Override
-    public void visitEnd() {
-      // SourceFile follows the class header. Prepend header usages once its filename is known.
-      if (interfaces != null) {
-        int index = 0;
-        for (String interfaceName : interfaces) {
-          info.usages.add(
-              index++,
-              createUsage(
-                  info,
-                  UsageKind.TYPE,
-                  UNDEFINED_LINE,
-                  -1,
-                  binaryName(interfaceName),
-                  null,
-                  null,
-                  true,
-                  true,
-                  emptyList()));
-        }
-      }
+    private void addHandleDependencies(MutableClassInfo from, Handle handle, boolean trackReachability) {
+        addDependency(from, binaryName(handle.getOwner()), trackReachability);
+        addTypeDependency(from, Type.getType(handle.getDesc()), trackReachability);
     }
 
-    @Override
-    public void visitInnerClass(String name, String outerName, String innerName, int access) {
-      if (outerName != null && info.className.equals(binaryName(name))) {
-        addEnclosingClass(outerName);
-      }
+    private static Set<String> findModuleOutputClasses(InstrumenterModule module) {
+        CodeSource codeSource = module.getClass().getProtectionDomain().getCodeSource();
+        if (codeSource == null || codeSource.getLocation() == null) {
+            throw new IllegalStateException(
+                    "Cannot locate compiled output for " + module.getClass().getName());
+        }
+        Path root;
+        try {
+            root = Paths.get(codeSource.getLocation().toURI());
+        } catch (URISyntaxException error) {
+            throw new IllegalStateException(
+                    "Cannot resolve compiled output for " + module.getClass().getName(), error);
+        }
+        if (!Files.isDirectory(root)) {
+            return emptySet();
+        }
+        try (Stream<Path> files = Files.walk(root)) {
+            return files.filter(Files::isRegularFile)
+                    .map(root::relativize)
+                    .map(Path::toString)
+                    .filter(name -> name.endsWith(CLASS_FILE_SUFFIX))
+                    .map(name -> name.substring(0, name.length() - CLASS_FILE_SUFFIX.length()))
+                    .map(name -> name.replace('/', '.').replace('\\', '.'))
+                    .sorted()
+                    .collect(toCollection(LinkedHashSet::new));
+        } catch (IOException error) {
+            throw new IllegalStateException(
+                    "Cannot inspect compiled output for " + module.getClass().getName(), error);
+        }
     }
 
-    @Override
-    public void visitOuterClass(String owner, String name, String descriptor) {
-      addEnclosingClass(owner);
+    @SuppressForbidden
+    private void scanClass(MutableClassInfo info) {
+        String resource = info.className.replace('.', '/') + CLASS_FILE_SUFFIX;
+        ClassFileLocator.Resolution resolution;
+        try {
+            resolution = classFileLocator.locate(info.className);
+        } catch (Throwable error) {
+            throw scanFailure(info.className, owningAdvice(info.className), "cannot read class bytecode", error);
+        }
+        if (!resolution.isResolved()) {
+            if (adviceRoots.contains(info.className) || info.fromModuleOutput) {
+                throw scanFailure(
+                        info.className,
+                        owningAdvice(info.className),
+                        adviceRoots.contains(info.className)
+                                ? "advice class is missing"
+                                : "helper class from module output is missing",
+                        null);
+            }
+            System.err.println(resource + " not found, skipping");
+            return;
+        }
+        try {
+            new ClassReader(resolution.resolve()).accept(new ScanningVisitor(info), ClassReader.SKIP_FRAMES);
+            info.scanned = true;
+        } catch (Throwable error) {
+            throw scanFailure(info.className, owningAdvice(info.className), "cannot parse class bytecode", error);
+        }
     }
 
-    private void addEnclosingClass(String owner) {
-      // Advice is inlined; its enclosing instrumentation class does not need injection.
-      if (!adviceRoots.contains(info.className)) {
-        String enclosingClass = binaryName(owner);
-        // Enclosure affects ordering, but does not itself make the owner an injectable helper.
-        info.requiredDependencies.add(enclosingClass);
-        addDependency(info, enclosingClass, false);
-      }
+    private String owningAdvice(String className) {
+        MutableClassInfo info = classes.get(className);
+        return info == null || info.adviceRoot == null ? "<none>" : info.adviceRoot;
     }
 
-    @Override
-    public FieldVisitor visitField(
-        int access, String name, String descriptor, String signature, Object value) {
-      addTypeDependency(info, Type.getType(descriptor), !adviceRoots.contains(info.className));
-      return null;
+    private IllegalStateException scanFailure(String className, String adviceRoot, String detail, Throwable cause) {
+        String message = "Advice scan failed for module "
+                + module.getClass().getName()
+                + ", advice "
+                + adviceRoot
+                + ", class "
+                + className
+                + ": "
+                + detail;
+        return new IllegalStateException(message, cause);
     }
 
-    @Override
-    public MethodVisitor visitMethod(
-        int access, String name, String descriptor, String signature, String[] exceptions) {
-      boolean adviceRoot = adviceRoots.contains(info.className);
-      addTypeDependency(info, Type.getMethodType(descriptor), !adviceRoot);
-      if (exceptions != null) {
-        for (String exception : exceptions) {
-          addDependency(info, binaryName(exception), !adviceRoot);
-        }
-      }
-      return new ScanningMethodVisitor(info, !adviceRoot || !"<init>".equals(name));
+    private static String binaryName(String internalName) {
+        return internalName.replace('/', '.');
     }
-  }
 
-  private final class ScanningMethodVisitor extends MethodVisitor {
-    private final MutableClassInfo info;
-    private final boolean trackReachability;
-    private int line = UNDEFINED_LINE;
+    private static Type underlyingType(Type type) {
+        while (type.getSort() == Type.ARRAY) {
+            type = type.getElementType();
+        }
+        return type;
+    }
+
+    private static Usage createUsage(
+            MutableClassInfo source,
+            UsageKind kind,
+            int line,
+            int opcode,
+            String owner,
+            String name,
+            String descriptor,
+            boolean interfaceOwner,
+            boolean implementedInterface,
+            List<HandleUse> handles) {
+        return new Usage(
+                kind,
+                new SourceLocation(source.className, source.sourceFile, line),
+                opcode,
+                owner,
+                name,
+                descriptor,
+                interfaceOwner,
+                implementedInterface,
+                handles);
+    }
+
+    private final class ScanningVisitor extends ClassVisitor {
+        private final MutableClassInfo info;
+        private String[] interfaces;
+
+        private ScanningVisitor(MutableClassInfo info) {
+            super(ASM_API);
+            this.info = info;
+        }
 
-    private ScanningMethodVisitor(MutableClassInfo info, boolean trackReachability) {
-      super(ASM_API);
-      this.info = info;
-      this.trackReachability = trackReachability;
-    }
+        @Override
+        public void visit(
+                int version, int access, String name, String signature, String superName, String[] interfaces) {
+            this.interfaces = interfaces;
+            if (interfaces != null) {
+                for (String interfaceName : interfaces) {
+                    addHierarchyDependency(interfaceName);
+                }
+            }
+            // Record the hierarchy for helper ordering. Muzzle's superclass reference remains captured
+            // by the invokespecial instruction in each constructor.
+            if (superName != null) {
+                addHierarchyDependency(superName);
+            }
+        }
 
-    @Override
-    public void visitLineNumber(int line, Label start) {
-      this.line = line;
-    }
+        private void addHierarchyDependency(String internalName) {
+            String className = binaryName(internalName);
+            if (adviceRoots.contains(info.className)) {
+                addDependency(info, className, false);
+            } else {
+                addRequiredDependency(info, className);
+            }
+        }
 
-    @Override
-    public void visitTryCatchBlock(Label start, Label end, Label handler, String type) {
-      if (type != null) {
-        addDependency(info, binaryName(type), trackReachability);
-      }
-    }
+        @Override
+        public void visitSource(String source, String debug) {
+            if (source != null) {
+                info.sourceFile = source;
+            }
+        }
 
-    @Override
-    public void visitFieldInsn(int opcode, String owner, String name, String descriptor) {
-      String binaryOwner = binaryName(owner);
-      addDependency(info, binaryOwner, trackReachability);
-      addTypeDependency(info, Type.getType(descriptor), trackReachability);
-      info.usages.add(
-          usage(UsageKind.FIELD, opcode, binaryOwner, name, descriptor, false, emptyList()));
-    }
+        @Override
+        public void visitEnd() {
+            // SourceFile follows the class header. Prepend header usages once its filename is known.
+            if (interfaces != null) {
+                int index = 0;
+                for (String interfaceName : interfaces) {
+                    info.usages.add(
+                            index++,
+                            createUsage(
+                                    info,
+                                    UsageKind.TYPE,
+                                    UNDEFINED_LINE,
+                                    -1,
+                                    binaryName(interfaceName),
+                                    null,
+                                    null,
+                                    true,
+                                    true,
+                                    emptyList()));
+                }
+            }
+        }
 
-    @Override
-    public void visitMethodInsn(
-        int opcode, String owner, String name, String descriptor, boolean isInterface) {
-      String binaryOwner = binaryName(owner);
-      addDependency(info, binaryOwner, trackReachability);
-      addTypeDependency(info, Type.getMethodType(descriptor), trackReachability);
-      info.usages.add(
-          usage(UsageKind.METHOD, opcode, binaryOwner, name, descriptor, isInterface, emptyList()));
-    }
+        @Override
+        public void visitInnerClass(String name, String outerName, String innerName, int access) {
+            if (outerName != null && info.className.equals(binaryName(name))) {
+                addEnclosingClass(outerName);
+            }
+        }
 
-    @Override
-    public void visitTypeInsn(int opcode, String typeName) {
-      addTypeUsage(Type.getObjectType(typeName), opcode, null);
-    }
+        @Override
+        public void visitOuterClass(String owner, String name, String descriptor) {
+            addEnclosingClass(owner);
+        }
 
-    @Override
-    public void visitMultiANewArrayInsn(String descriptor, int dimensions) {
-      addTypeUsage(Type.getType(descriptor), Opcodes.MULTIANEWARRAY, descriptor);
-    }
+        private void addEnclosingClass(String owner) {
+            // Advice is inlined; its enclosing instrumentation class does not need injection.
+            if (!adviceRoots.contains(info.className)) {
+                String enclosingClass = binaryName(owner);
+                // Enclosure affects ordering, but does not itself make the owner an injectable helper.
+                info.requiredDependencies.add(enclosingClass);
+                addDependency(info, enclosingClass, false);
+            }
+        }
 
-    @Override
-    public void visitInvokeDynamicInsn(
-        String name, String descriptor, Handle bootstrapMethodHandle, Object... arguments) {
-      addTypeDependency(info, Type.getMethodType(descriptor), trackReachability);
-      List<HandleUse> handles = new ArrayList<>();
-      addHandle(handles, bootstrapMethodHandle);
-      for (Object argument : arguments) {
-        if (argument instanceof Handle) {
-          addHandle(handles, (Handle) argument);
-        } else if (argument instanceof Type) {
-          addTypeDependency(info, (Type) argument, trackReachability);
-        }
-      }
-      info.usages.add(
-          usage(
-              UsageKind.INVOKEDYNAMIC,
-              Opcodes.INVOKEDYNAMIC,
-              null,
-              name,
-              descriptor,
-              false,
-              handles));
-    }
+        @Override
+        public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
+            addTypeDependency(info, Type.getType(descriptor), !adviceRoots.contains(info.className));
+            return null;
+        }
 
-    @Override
-    public void visitLdcInsn(Object value) {
-      if (value instanceof Type) {
-        addTypeUsage((Type) value, Opcodes.LDC, null);
-      } else if (value instanceof Handle) {
-        Handle handle = (Handle) value;
-        addHandleDependencies(info, handle, trackReachability);
-        info.usages.add(
-            usage(
-                UsageKind.HANDLE,
-                Opcodes.LDC,
-                binaryName(handle.getOwner()),
-                handle.getName(),
-                handle.getDesc(),
-                handle.isInterface(),
-                singletonList(toHandleUse(handle))));
-      }
+        @Override
+        public MethodVisitor visitMethod(
+                int access, String name, String descriptor, String signature, String[] exceptions) {
+            boolean adviceRoot = adviceRoots.contains(info.className);
+            addTypeDependency(info, Type.getMethodType(descriptor), !adviceRoot);
+            if (exceptions != null) {
+                for (String exception : exceptions) {
+                    addDependency(info, binaryName(exception), !adviceRoot);
+                }
+            }
+            return new ScanningMethodVisitor(info, !adviceRoot || !"<init>".equals(name));
+        }
     }
 
-    private void addTypeUsage(Type type, int opcode, String descriptor) {
-      type = underlyingType(type);
-      if (type.getSort() == Type.OBJECT) {
-        String binaryType = type.getClassName();
-        addDependency(info, binaryType, trackReachability);
-        info.usages.add(
-            usage(UsageKind.TYPE, opcode, binaryType, null, descriptor, false, emptyList()));
-      }
-    }
+    private final class ScanningMethodVisitor extends MethodVisitor {
+        private final MutableClassInfo info;
+        private final boolean trackReachability;
+        private int line = UNDEFINED_LINE;
 
-    private void addHandle(List<HandleUse> handles, Handle handle) {
-      addHandleDependencies(info, handle, trackReachability);
-      handles.add(toHandleUse(handle));
-    }
+        private ScanningMethodVisitor(MutableClassInfo info, boolean trackReachability) {
+            super(ASM_API);
+            this.info = info;
+            this.trackReachability = trackReachability;
+        }
 
-    private Usage usage(
-        UsageKind kind,
-        int opcode,
-        String owner,
-        String name,
-        String descriptor,
-        boolean interfaceOwner,
-        List<HandleUse> handles) {
-      return createUsage(
-          info, kind, line, opcode, owner, name, descriptor, interfaceOwner, false, handles);
-    }
-  }
-
-  private static HandleUse toHandleUse(Handle handle) {
-    return new HandleUse(
-        handle.getTag(),
-        binaryName(handle.getOwner()),
-        handle.getName(),
-        handle.getDesc(),
-        handle.isInterface());
-  }
-
-  private static final class MutableClassInfo {
-    final String className;
-    final boolean fromModuleOutput;
-    String adviceRoot;
-    String sourceFile;
-    boolean scanned;
-    boolean reachableFromAdvice;
-    final Set<String> dependencies = new LinkedHashSet<>();
-    final Set<String> requiredDependencies = new LinkedHashSet<>();
-    final List<Usage> usages = new ArrayList<>();
-
-    MutableClassInfo(String className, String adviceRoot, boolean fromModuleOutput) {
-      this.className = className;
-      this.fromModuleOutput = fromModuleOutput;
-      this.adviceRoot = adviceRoot;
-      this.sourceFile = className;
+        @Override
+        public void visitLineNumber(int line, Label start) {
+            this.line = line;
+        }
+
+        @Override
+        public void visitTryCatchBlock(Label start, Label end, Label handler, String type) {
+            if (type != null) {
+                addDependency(info, binaryName(type), trackReachability);
+            }
+        }
+
+        @Override
+        public void visitFieldInsn(int opcode, String owner, String name, String descriptor) {
+            String binaryOwner = binaryName(owner);
+            addDependency(info, binaryOwner, trackReachability);
+            addTypeDependency(info, Type.getType(descriptor), trackReachability);
+            info.usages.add(usage(UsageKind.FIELD, opcode, binaryOwner, name, descriptor, false, emptyList()));
+        }
+
+        @Override
+        public void visitMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) {
+            String binaryOwner = binaryName(owner);
+            addDependency(info, binaryOwner, trackReachability);
+            addTypeDependency(info, Type.getMethodType(descriptor), trackReachability);
+            info.usages.add(usage(UsageKind.METHOD, opcode, binaryOwner, name, descriptor, isInterface, emptyList()));
+        }
+
+        @Override
+        public void visitTypeInsn(int opcode, String typeName) {
+            addTypeUsage(Type.getObjectType(typeName), opcode, null);
+        }
+
+        @Override
+        public void visitMultiANewArrayInsn(String descriptor, int dimensions) {
+            addTypeUsage(Type.getType(descriptor), Opcodes.MULTIANEWARRAY, descriptor);
+        }
+
+        @Override
+        public void visitInvokeDynamicInsn(
+                String name, String descriptor, Handle bootstrapMethodHandle, Object... arguments) {
+            addTypeDependency(info, Type.getMethodType(descriptor), trackReachability);
+            List<HandleUse> handles = new ArrayList<>();
+            addHandle(handles, bootstrapMethodHandle);
+            for (Object argument : arguments) {
+                if (argument instanceof Handle) {
+                    addHandle(handles, (Handle) argument);
+                } else if (argument instanceof Type) {
+                    addTypeDependency(info, (Type) argument, trackReachability);
+                }
+            }
+            info.usages.add(
+                    usage(UsageKind.INVOKEDYNAMIC, Opcodes.INVOKEDYNAMIC, null, name, descriptor, false, handles));
+        }
+
+        @Override
+        public void visitLdcInsn(Object value) {
+            if (value instanceof Type) {
+                addTypeUsage((Type) value, Opcodes.LDC, null);
+            } else if (value instanceof Handle) {
+                Handle handle = (Handle) value;
+                addHandleDependencies(info, handle, trackReachability);
+                info.usages.add(usage(
+                        UsageKind.HANDLE,
+                        Opcodes.LDC,
+                        binaryName(handle.getOwner()),
+                        handle.getName(),
+                        handle.getDesc(),
+                        handle.isInterface(),
+                        singletonList(toHandleUse(handle))));
+            }
+        }
+
+        private void addTypeUsage(Type type, int opcode, String descriptor) {
+            type = underlyingType(type);
+            if (type.getSort() == Type.OBJECT) {
+                String binaryType = type.getClassName();
+                addDependency(info, binaryType, trackReachability);
+                info.usages.add(usage(UsageKind.TYPE, opcode, binaryType, null, descriptor, false, emptyList()));
+            }
+        }
+
+        private void addHandle(List<HandleUse> handles, Handle handle) {
+            addHandleDependencies(info, handle, trackReachability);
+            handles.add(toHandleUse(handle));
+        }
+
+        private Usage usage(
+                UsageKind kind,
+                int opcode,
+                String owner,
+                String name,
+                String descriptor,
+                boolean interfaceOwner,
+                List<HandleUse> handles) {
+            return createUsage(info, kind, line, opcode, owner, name, descriptor, interfaceOwner, false, handles);
+        }
     }
 
-    ClassInfo freeze() {
-      return new ClassInfo(
-          className, fromModuleOutput, scanned, reachableFromAdvice, requiredDependencies, usages);
+    private static HandleUse toHandleUse(Handle handle) {
+        return new HandleUse(
+                handle.getTag(),
+                binaryName(handle.getOwner()),
+                handle.getName(),
+                handle.getDesc(),
+                handle.isInterface());
+    }
+
+    private static final class MutableClassInfo {
+        final String className;
+        final boolean fromModuleOutput;
+        String adviceRoot;
+        String sourceFile;
+        boolean scanned;
+        boolean reachableFromAdvice;
+        final Set<String> dependencies = new LinkedHashSet<>();
+        final Set<String> requiredDependencies = new LinkedHashSet<>();
+        final List<Usage> usages = new ArrayList<>();
+
+        MutableClassInfo(String className, String adviceRoot, boolean fromModuleOutput) {
+            this.className = className;
+            this.fromModuleOutput = fromModuleOutput;
+            this.adviceRoot = adviceRoot;
+            this.sourceFile = className;
+        }
+
+        ClassInfo freeze() {
+            return new ClassInfo(
+                    className, fromModuleOutput, scanned, reachableFromAdvice, requiredDependencies, usages);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceScanningGradlePlugin.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceScanningGradlePlugin.java
index 082365e87f0..16e57a9b73e 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceScanningGradlePlugin.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/advice/AdviceScanningGradlePlugin.java
@@ -20,51 +20,48 @@
 
 /** Build-time plugin that scans each module once and runs ordered scan consumers. */
 public class AdviceScanningGradlePlugin extends Plugin.ForElementMatcher {
-  static {
-    SharedTypePools.registerIfAbsent(SharedTypePools.simpleCache());
-    HierarchyMatchers.registerIfAbsent(HierarchyMatchers.simpleChecks());
-  }
-
-  private final File targetDirectory;
-  private final HelperGenerationProcessor helperProcessor = new HelperGenerationProcessor();
-  private final List<AdviceProcessor> processors;
+    static {
+        SharedTypePools.registerIfAbsent(SharedTypePools.simpleCache());
+        HierarchyMatchers.registerIfAbsent(HierarchyMatchers.simpleChecks());
+    }
 
-  public AdviceScanningGradlePlugin(File targetDirectory) {
-    this(targetDirectory, singletonList(new MuzzleGenerationProcessor()));
-  }
+    private final File targetDirectory;
+    private final HelperGenerationProcessor helperProcessor = new HelperGenerationProcessor();
+    private final List<AdviceProcessor> processors;
 
-  AdviceScanningGradlePlugin(File targetDirectory, List<AdviceProcessor> processors) {
-    super(concreteClass().and(extendsClass(named(InstrumenterModule.class.getName()))));
-    this.targetDirectory = targetDirectory;
-    this.processors = processors;
-  }
+    public AdviceScanningGradlePlugin(File targetDirectory) {
+        this(targetDirectory, singletonList(new MuzzleGenerationProcessor()));
+    }
 
-  @Override
-  public DynamicType.Builder<?> apply(
-      DynamicType.Builder<?> builder,
-      TypeDescription typeDescription,
-      ClassFileLocator classFileLocator) {
-    ClassLoader loader = Thread.currentThread().getContextClassLoader();
-    InstrumenterModule module;
-    try {
-      // The module instance is shared by scanning and every processor.
-      module =
-          (InstrumenterModule)
-              loader.loadClass(typeDescription.getName()).getConstructor().newInstance();
-    } catch (ReflectiveOperationException error) {
-      throw new IllegalStateException(
-          "Cannot instantiate instrumenter module " + typeDescription.getName(), error);
+    AdviceScanningGradlePlugin(File targetDirectory, List<AdviceProcessor> processors) {
+        super(concreteClass().and(extendsClass(named(InstrumenterModule.class.getName()))));
+        this.targetDirectory = targetDirectory;
+        this.processors = processors;
     }
 
-    AdviceScanResult scanResult = AdviceScanner.scan(module, classFileLocator);
-    String[] helpers = helperProcessor.resolveHelpers(scanResult, module);
-    AdviceProcessorContext context = new AdviceProcessorContext(module, targetDirectory, helpers);
-    for (AdviceProcessor processor : processors) {
-      processor.process(scanResult, context);
+    @Override
+    public DynamicType.Builder<?> apply(
+            DynamicType.Builder<?> builder, TypeDescription typeDescription, ClassFileLocator classFileLocator) {
+        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        InstrumenterModule module;
+        try {
+            // The module instance is shared by scanning and every processor.
+            module = (InstrumenterModule)
+                    loader.loadClass(typeDescription.getName()).getConstructor().newInstance();
+        } catch (ReflectiveOperationException error) {
+            throw new IllegalStateException(
+                    "Cannot instantiate instrumenter module " + typeDescription.getName(), error);
+        }
+
+        AdviceScanResult scanResult = AdviceScanner.scan(module, classFileLocator);
+        String[] helpers = helperProcessor.resolveHelpers(scanResult, module);
+        AdviceProcessorContext context = new AdviceProcessorContext(module, targetDirectory, helpers);
+        for (AdviceProcessor processor : processors) {
+            processor.process(scanResult, context);
+        }
+        return helperProcessor.transform(builder, helpers, module);
     }
-    return helperProcessor.transform(builder, helpers, module);
-  }
 
-  @Override
-  public void close() throws IOException {}
+    @Override
+    public void close() throws IOException {}
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/annotation/AppliesOn.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/annotation/AppliesOn.java
index 547feb3b79d..d7fa0531cf6 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/annotation/AppliesOn.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/annotation/AppliesOn.java
@@ -22,14 +22,14 @@
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.TYPE)
 public @interface AppliesOn {
-  /**
-   * The target systems for which this advice is applied.
-   *
-   * <p>The advice will only be applied if at least one of the specified target systems is enabled.
-   * If multiple target systems are specified, the advice applies when any of them are enabled (OR
-   * logic).
-   *
-   * @return the target systems this advice applies to
-   */
-  InstrumenterModule.TargetSystem[] value();
+    /**
+     * The target systems for which this advice is applied.
+     *
+     * <p>The advice will only be applied if at least one of the specified target systems is enabled.
+     * If multiple target systems are specified, the advice applies when any of them are enabled (OR
+     * logic).
+     *
+     * @return the target systems this advice applies to
+     */
+    InstrumenterModule.TargetSystem[] value();
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/ClassFileLocators.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/ClassFileLocators.java
index 7ddc923075f..0a74348fb27 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/ClassFileLocators.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/ClassFileLocators.java
@@ -22,133 +22,131 @@
  * cannot find the desired resource, check up the classloader hierarchy until a resource is found.
  */
 public final class ClassFileLocators {
-  private static final ClassLoaderValue<DDClassFileLocator> classFileLocators =
-      new ClassLoaderValue<DDClassFileLocator>() {
-        @Override
-        protected DDClassFileLocator computeValue(ClassLoader cl) {
-          return new DDClassFileLocator(cl);
-        }
-      };
-
-  private static final ClassFileLocator bootClassFileLocator =
-      new ClassFileLocator() {
+    private static final ClassLoaderValue<DDClassFileLocator> classFileLocators =
+            new ClassLoaderValue<DDClassFileLocator>() {
+                @Override
+                protected DDClassFileLocator computeValue(ClassLoader cl) {
+                    return new DDClassFileLocator(cl);
+                }
+            };
+
+    private static final ClassFileLocator bootClassFileLocator = new ClassFileLocator() {
         @Override
         public Resolution locate(String className) throws IOException {
-          String resourceName = getResourceName(className);
-          long fromTick = InstrumenterMetrics.tick();
-          Resolution resolution = loadClassResource(Utils.getBootstrapProxy(), resourceName);
-          if (resolution != null) {
-            InstrumenterMetrics.resolveClassFile(fromTick);
-            return resolution;
-          } else {
-            InstrumenterMetrics.missingClassFile(fromTick);
-            return new Resolution.Illegal(className);
-          }
+            String resourceName = getResourceName(className);
+            long fromTick = InstrumenterMetrics.tick();
+            Resolution resolution = loadClassResource(Utils.getBootstrapProxy(), resourceName);
+            if (resolution != null) {
+                InstrumenterMetrics.resolveClassFile(fromTick);
+                return resolution;
+            } else {
+                InstrumenterMetrics.missingClassFile(fromTick);
+                return new Resolution.Illegal(className);
+            }
         }
 
         @Override
         public void close() {
-          // nothing to close
+            // nothing to close
         }
-      };
+    };
 
-  public static ClassFileLocator classFileLocator(final ClassLoader classLoader) {
-    return null != classLoader ? classFileLocators.get(classLoader) : bootClassFileLocator;
-  }
+    public static ClassFileLocator classFileLocator(final ClassLoader classLoader) {
+        return null != classLoader ? classFileLocators.get(classLoader) : bootClassFileLocator;
+    }
 
-  static final class DDClassFileLocator extends WeakReference<ClassLoader>
-      implements ClassFileLocator {
+    static final class DDClassFileLocator extends WeakReference<ClassLoader> implements ClassFileLocator {
 
-    private static final boolean NO_CLASSLOADER_EXCLUDES =
-        InstrumenterConfig.get().getExcludedClassLoaders().isEmpty();
+        private static final boolean NO_CLASSLOADER_EXCLUDES =
+                InstrumenterConfig.get().getExcludedClassLoaders().isEmpty();
 
-    public DDClassFileLocator(final ClassLoader classLoader) {
-      super(classLoader);
-    }
+        public DDClassFileLocator(final ClassLoader classLoader) {
+            super(classLoader);
+        }
+
+        @Override
+        public Resolution locate(final String className) throws IOException {
+            String resourceName = getResourceName(className);
+            long fromTick = InstrumenterMetrics.tick();
 
-    @Override
-    public Resolution locate(final String className) throws IOException {
-      String resourceName = getResourceName(className);
-      long fromTick = InstrumenterMetrics.tick();
-
-      // try bootstrap first
-      Resolution resolution = loadClassResource(Utils.getBootstrapProxy(), resourceName);
-      if (null != resolution) {
-        InstrumenterMetrics.resolveClassFile(fromTick);
-        return resolution;
-      }
-
-      LOCATING_CLASS.begin();
-      try {
-        // now go up the classloader hierarchy
-        for (ClassLoader cl = get(); null != cl; cl = cl.getParent()) {
-          if (NO_CLASSLOADER_EXCLUDES
-              || !InstrumenterConfig.get()
-                  .getExcludedClassLoaders()
-                  .contains(cl.getClass().getName())) {
-            resolution = loadClassResource(cl, resourceName);
+            // try bootstrap first
+            Resolution resolution = loadClassResource(Utils.getBootstrapProxy(), resourceName);
             if (null != resolution) {
-              InstrumenterMetrics.resolveClassFile(fromTick);
-              return resolution;
+                InstrumenterMetrics.resolveClassFile(fromTick);
+                return resolution;
             }
-          }
+
+            LOCATING_CLASS.begin();
+            try {
+                // now go up the classloader hierarchy
+                for (ClassLoader cl = get(); null != cl; cl = cl.getParent()) {
+                    if (NO_CLASSLOADER_EXCLUDES
+                            || !InstrumenterConfig.get()
+                                    .getExcludedClassLoaders()
+                                    .contains(cl.getClass().getName())) {
+                        resolution = loadClassResource(cl, resourceName);
+                        if (null != resolution) {
+                            InstrumenterMetrics.resolveClassFile(fromTick);
+                            return resolution;
+                        }
+                    }
+                }
+            } finally {
+                LOCATING_CLASS.end();
+            }
+
+            InstrumenterMetrics.missingClassFile(fromTick);
+            return new Resolution.Illegal(className);
         }
-      } finally {
-        LOCATING_CLASS.end();
-      }
 
-      InstrumenterMetrics.missingClassFile(fromTick);
-      return new Resolution.Illegal(className);
+        @Override
+        public void close() {
+            // nothing to close
+        }
     }
 
-    @Override
-    public void close() {
-      // nothing to close
+    static Resolution loadClassResource(ClassLoader classLoader, String resourceName) {
+        URL url = classLoader.getResource(resourceName);
+        return null != url ? new LazyResolution(url) : null;
     }
-  }
 
-  static Resolution loadClassResource(ClassLoader classLoader, String resourceName) {
-    URL url = classLoader.getResource(resourceName);
-    return null != url ? new LazyResolution(url) : null;
-  }
+    private ClassFileLocators() {}
 
-  private ClassFileLocators() {}
+    public static final class LazyResolution implements Resolution {
+        private static final Boolean USE_URL_CACHES = InstrumenterConfig.get().isResolverUseUrlCaches();
 
-  public static final class LazyResolution implements Resolution {
-    private static final Boolean USE_URL_CACHES = InstrumenterConfig.get().isResolverUseUrlCaches();
+        private final URL url;
+        private byte[] bytecode;
 
-    private final URL url;
-    private byte[] bytecode;
-
-    LazyResolution(URL url) {
-      this.url = url;
-    }
+        LazyResolution(URL url) {
+            this.url = url;
+        }
 
-    public URL url() {
-      return url;
-    }
+        public URL url() {
+            return url;
+        }
 
-    @Override
-    public boolean isResolved() {
-      return true;
-    }
+        @Override
+        public boolean isResolved() {
+            return true;
+        }
 
-    @Override
-    public byte[] resolve() {
-      if (null == bytecode) {
-        try {
-          URLConnection uc = url.openConnection();
-          if (null != USE_URL_CACHES) {
-            uc.setUseCaches(USE_URL_CACHES);
-          }
-          try (InputStream in = uc.getInputStream()) {
-            bytecode = StreamDrainer.DEFAULT.drain(in);
-          }
-        } catch (IOException e) {
-          throw new IllegalStateException("Error while reading class file", e);
+        @Override
+        public byte[] resolve() {
+            if (null == bytecode) {
+                try {
+                    URLConnection uc = url.openConnection();
+                    if (null != USE_URL_CACHES) {
+                        uc.setUseCaches(USE_URL_CACHES);
+                    }
+                    try (InputStream in = uc.getInputStream()) {
+                        bytecode = StreamDrainer.DEFAULT.drain(in);
+                    }
+                } catch (IOException e) {
+                    throw new IllegalStateException("Error while reading class file", e);
+                }
+            }
+            return bytecode;
         }
-      }
-      return bytecode;
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/ExceptionHandlers.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/ExceptionHandlers.java
index 5de9c8630ca..378dcdd0b43 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/ExceptionHandlers.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/ExceptionHandlers.java
@@ -16,160 +16,156 @@
 import org.slf4j.LoggerFactory;
 
 public class ExceptionHandlers {
-  private static final String LOG_FACTORY_NAME = LoggerFactory.class.getName().replace('.', '/');
-  private static final String LOGGER_NAME = Logger.class.getName().replace('.', '/');
-  // Bootstrap ExceptionHandler.class will always be resolvable, so we'll use it in the log name
-  private static final String HANDLER_NAME = ExceptionLogger.class.getName().replace('.', '/');
-
-  // Shared bytecode that turns the [throwable, adviceName] stack left by the TextConstant
-  // prefix into a logged + optionally swallowed exception.
-  private static final StackManipulation EXCEPTION_STACK_MANIPULATION =
-      new StackManipulation() {
+    private static final String LOG_FACTORY_NAME = LoggerFactory.class.getName().replace('.', '/');
+    private static final String LOGGER_NAME = Logger.class.getName().replace('.', '/');
+    // Bootstrap ExceptionHandler.class will always be resolvable, so we'll use it in the log name
+    private static final String HANDLER_NAME = ExceptionLogger.class.getName().replace('.', '/');
+
+    // Shared bytecode that turns the [throwable, adviceName] stack left by the TextConstant
+    // prefix into a logged + optionally swallowed exception.
+    private static final StackManipulation EXCEPTION_STACK_MANIPULATION = new StackManipulation() {
         // Pops the throwable and the advice-name String off the stack.
         // Peak growth above the pair on entry is +2 (during message-building LDCs).
         private final Size size = new StackManipulation.Size(-2, 2);
         private final boolean appSecEnabled =
-            InstrumenterConfig.get().getAppSecActivation() != ProductActivation.FULLY_DISABLED;
-        private final boolean detailedErrors =
-            InstrumenterConfig.get().isDetailedInstrumentationErrors();
+                InstrumenterConfig.get().getAppSecActivation() != ProductActivation.FULLY_DISABLED;
+        private final boolean detailedErrors = InstrumenterConfig.get().isDetailedInstrumentationErrors();
 
         @Override
         public boolean isValid() {
-          return true;
+            return true;
         }
 
         @Override
         public Size apply(final MethodVisitor mv, final Implementation.Context context) {
-          final String instrumentedTypeName = context.getInstrumentedType().getName();
-          final boolean exitOnFailure = InstrumenterConfig.get().isInternalExitOnFailure();
-          final String logMethod = exitOnFailure ? "error" : "debug";
-
-          // On entry the stack is: (bottom) throwable, adviceName (top)
-          // — adviceName was pushed by the preceding TextConstant.
-          //
-          // Emits the following Java-equivalent code when exitOnFailure is false:
-          //
-          // BlockingExceptionHandler.rethrowIfBlockingException(t);
-          // try {
-          //   InstrumentationErrors.recordError();
-          //   org.slf4j.LoggerFactory.getLogger((Class) ExceptionLogger.class)
-          //     .debug("Failed to handle exception in instrumentation for <type> (" + adviceName +
-          // ")", t);
-          // } catch (Throwable t2) {
-          // }
-          //
-          // and the same with .error(...) followed by System.exit(1) when exitOnFailure is true.
-          final Label logStart = new Label();
-          final Label logEnd = new Label();
-          final Label eatException = new Label();
-          final Label handlerExit = new Label();
-
-          // Frames are only meaningful for class files in version 6 or later.
-          final boolean frames = context.getClassFileVersion().isAtLeast(ClassFileVersion.JAVA_V6);
-
-          if (appSecEnabled) {
-            // Need throwable on top for rethrowIfBlockingException.
-            // stack: (top) adviceName, throwable -> top throwable
+            final String instrumentedTypeName = context.getInstrumentedType().getName();
+            final boolean exitOnFailure = InstrumenterConfig.get().isInternalExitOnFailure();
+            final String logMethod = exitOnFailure ? "error" : "debug";
+
+            // On entry the stack is: (bottom) throwable, adviceName (top)
+            // — adviceName was pushed by the preceding TextConstant.
+            //
+            // Emits the following Java-equivalent code when exitOnFailure is false:
+            //
+            // BlockingExceptionHandler.rethrowIfBlockingException(t);
+            // try {
+            //   InstrumentationErrors.recordError();
+            //   org.slf4j.LoggerFactory.getLogger((Class) ExceptionLogger.class)
+            //     .debug("Failed to handle exception in instrumentation for <type> (" + adviceName +
+            // ")", t);
+            // } catch (Throwable t2) {
+            // }
+            //
+            // and the same with .error(...) followed by System.exit(1) when exitOnFailure is true.
+            final Label logStart = new Label();
+            final Label logEnd = new Label();
+            final Label eatException = new Label();
+            final Label handlerExit = new Label();
+
+            // Frames are only meaningful for class files in version 6 or later.
+            final boolean frames = context.getClassFileVersion().isAtLeast(ClassFileVersion.JAVA_V6);
+
+            if (appSecEnabled) {
+                // Need throwable on top for rethrowIfBlockingException.
+                // stack: (top) adviceName, throwable -> top throwable
+                mv.visitInsn(Opcodes.SWAP);
+                mv.visitMethodInsn(
+                        Opcodes.INVOKESTATIC,
+                        "datadog/trace/bootstrap/blocking/BlockingExceptionHandler",
+                        "rethrowIfBlockingException",
+                        "(Ljava/lang/Throwable;)Ljava/lang/Throwable;",
+                        false);
+                // restore: (top) throwable, adviceName -> top adviceName
+                mv.visitInsn(Opcodes.SWAP);
+            }
+
+            mv.visitTryCatchBlock(logStart, logEnd, eatException, "java/lang/Throwable");
+            mv.visitLabel(logStart);
+            // record instrumentation error
+            if (detailedErrors) {
+                // recordError(Throwable) needs throwable on top, then we restore.
+                mv.visitInsn(Opcodes.SWAP);
+                mv.visitMethodInsn(
+                        Opcodes.INVOKESTATIC,
+                        "datadog/trace/bootstrap/InstrumentationErrors",
+                        "recordError",
+                        "(Ljava/lang/Throwable;)Ljava/lang/Throwable;",
+                        false);
+                mv.visitInsn(Opcodes.SWAP);
+            } else {
+                mv.visitMethodInsn(
+                        Opcodes.INVOKESTATIC,
+                        "datadog/trace/bootstrap/InstrumentationErrors",
+                        "recordError",
+                        "()V",
+                        false);
+            }
+
+            // Build the log message:
+            //   "Failed to handle exception in instrumentation for <type> - " + adviceName
+            // <type> is a generation-time constant baked into the prefix LDC.
+            // stack: (top) adviceName, throwable
+            mv.visitLdcInsn("Failed to handle exception in instrumentation for " + instrumentedTypeName + " - ");
+            // stack: prefix (top), adviceName, throwable
             mv.visitInsn(Opcodes.SWAP);
+            // stack: adviceName (top), prefix, throwable
             mv.visitMethodInsn(
-                Opcodes.INVOKESTATIC,
-                "datadog/trace/bootstrap/blocking/BlockingExceptionHandler",
-                "rethrowIfBlockingException",
-                "(Ljava/lang/Throwable;)Ljava/lang/Throwable;",
-                false);
-            // restore: (top) throwable, adviceName -> top adviceName
+                    Opcodes.INVOKEVIRTUAL,
+                    "java/lang/String",
+                    "concat",
+                    "(Ljava/lang/String;)Ljava/lang/String;",
+                    false);
+            // stack: message (top), throwable
             mv.visitInsn(Opcodes.SWAP);
-          }
+            // stack: throwable(top), message
 
-          mv.visitTryCatchBlock(logStart, logEnd, eatException, "java/lang/Throwable");
-          mv.visitLabel(logStart);
-          // record instrumentation error
-          if (detailedErrors) {
-            // recordError(Throwable) needs throwable on top, then we restore.
-            mv.visitInsn(Opcodes.SWAP);
+            mv.visitLdcInsn(Type.getType("L" + HANDLER_NAME + ";"));
             mv.visitMethodInsn(
-                Opcodes.INVOKESTATIC,
-                "datadog/trace/bootstrap/InstrumentationErrors",
-                "recordError",
-                "(Ljava/lang/Throwable;)Ljava/lang/Throwable;",
-                false);
-            mv.visitInsn(Opcodes.SWAP);
-          } else {
+                    Opcodes.INVOKESTATIC,
+                    LOG_FACTORY_NAME,
+                    "getLogger",
+                    "(Ljava/lang/Class;)L" + LOGGER_NAME + ";",
+                    false);
+            // stack: logger (top), throwable, message
+            mv.visitInsn(Opcodes.DUP_X2);
+            // stack: logger (top), throwable, message, logger
+            mv.visitInsn(Opcodes.POP);
+            // stack: throwable (top), message, logger
             mv.visitMethodInsn(
-                Opcodes.INVOKESTATIC,
-                "datadog/trace/bootstrap/InstrumentationErrors",
-                "recordError",
-                "()V",
-                false);
-          }
-
-          // Build the log message:
-          //   "Failed to handle exception in instrumentation for <type> - " + adviceName
-          // <type> is a generation-time constant baked into the prefix LDC.
-          // stack: (top) adviceName, throwable
-          mv.visitLdcInsn(
-              "Failed to handle exception in instrumentation for " + instrumentedTypeName + " - ");
-          // stack: prefix (top), adviceName, throwable
-          mv.visitInsn(Opcodes.SWAP);
-          // stack: adviceName (top), prefix, throwable
-          mv.visitMethodInsn(
-              Opcodes.INVOKEVIRTUAL,
-              "java/lang/String",
-              "concat",
-              "(Ljava/lang/String;)Ljava/lang/String;",
-              false);
-          // stack: message (top), throwable
-          mv.visitInsn(Opcodes.SWAP);
-          // stack: throwable(top), message
-
-          mv.visitLdcInsn(Type.getType("L" + HANDLER_NAME + ";"));
-          mv.visitMethodInsn(
-              Opcodes.INVOKESTATIC,
-              LOG_FACTORY_NAME,
-              "getLogger",
-              "(Ljava/lang/Class;)L" + LOGGER_NAME + ";",
-              false);
-          // stack: logger (top), throwable, message
-          mv.visitInsn(Opcodes.DUP_X2);
-          // stack: logger (top), throwable, message, logger
-          mv.visitInsn(Opcodes.POP);
-          // stack: throwable (top), message, logger
-          mv.visitMethodInsn(
-              Opcodes.INVOKEINTERFACE,
-              LOGGER_NAME,
-              logMethod,
-              "(Ljava/lang/String;Ljava/lang/Throwable;)V",
-              true);
-
-          if (exitOnFailure) {
-            mv.visitInsn(Opcodes.ICONST_1);
-            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/System", "exit", "(I)V", false);
-          }
-          mv.visitLabel(logEnd);
-          mv.visitJumpInsn(Opcodes.GOTO, handlerExit);
-
-          // if the runtime can't reach our ExceptionHandler or logger,
-          //   silently eat the exception
-          mv.visitLabel(eatException);
-          if (frames) {
-            mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] {"java/lang/Throwable"});
-          }
-          mv.visitInsn(Opcodes.POP);
-          // mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Throwable",
-          //    "printStackTrace", "()V", false);
-
-          mv.visitLabel(handlerExit);
-          if (frames) {
-            mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
-          }
-
-          return size;
+                    Opcodes.INVOKEINTERFACE,
+                    LOGGER_NAME,
+                    logMethod,
+                    "(Ljava/lang/String;Ljava/lang/Throwable;)V",
+                    true);
+
+            if (exitOnFailure) {
+                mv.visitInsn(Opcodes.ICONST_1);
+                mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/System", "exit", "(I)V", false);
+            }
+            mv.visitLabel(logEnd);
+            mv.visitJumpInsn(Opcodes.GOTO, handlerExit);
+
+            // if the runtime can't reach our ExceptionHandler or logger,
+            //   silently eat the exception
+            mv.visitLabel(eatException);
+            if (frames) {
+                mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] {"java/lang/Throwable"});
+            }
+            mv.visitInsn(Opcodes.POP);
+            // mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Throwable",
+            //    "printStackTrace", "()V", false);
+
+            mv.visitLabel(handlerExit);
+            if (frames) {
+                mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
+            }
+
+            return size;
         }
-      };
+    };
 
-  public static ExceptionHandler exceptionHandlerFor(final String adviceClassName) {
-    return new ExceptionHandler.Simple(
-        new StackManipulation.Compound(
-            new TextConstant(adviceClassName), EXCEPTION_STACK_MANIPULATION));
-  }
+    public static ExceptionHandler exceptionHandlerFor(final String adviceClassName) {
+        return new ExceptionHandler.Simple(
+                new StackManipulation.Compound(new TextConstant(adviceClassName), EXCEPTION_STACK_MANIPULATION));
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/NewTaskForGradlePlugin.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/NewTaskForGradlePlugin.java
index 2a4a6cf2f8e..2bbb2f21ceb 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/NewTaskForGradlePlugin.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/NewTaskForGradlePlugin.java
@@ -22,21 +22,21 @@
  * @see datadog.gradle.plugin.instrument.BuildTimeInstrumentationPlugin
  */
 public class NewTaskForGradlePlugin extends Plugin.ForElementMatcher {
-  private final File targetDir;
+    private final File targetDir;
 
-  public NewTaskForGradlePlugin(File targetDir) {
-    super(nameEndsWith("$NewTaskFor"));
-    this.targetDir = targetDir;
-  }
+    public NewTaskForGradlePlugin(File targetDir) {
+        super(nameEndsWith("$NewTaskFor"));
+        this.targetDir = targetDir;
+    }
 
-  @Override
-  public DynamicType.Builder<?> apply(
-      final DynamicType.Builder<?> builder,
-      final TypeDescription typeDescription,
-      final ClassFileLocator classFileLocator) {
-    return builder.visit(NewTaskForRewritingVisitor.INSTANCE);
-  }
+    @Override
+    public DynamicType.Builder<?> apply(
+            final DynamicType.Builder<?> builder,
+            final TypeDescription typeDescription,
+            final ClassFileLocator classFileLocator) {
+        return builder.visit(NewTaskForRewritingVisitor.INSTANCE);
+    }
 
-  @Override
-  public void close() throws IOException {}
+    @Override
+    public void close() throws IOException {}
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/NewTaskForRewritingVisitor.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/NewTaskForRewritingVisitor.java
index da91f64ef79..f55ef6c3715 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/NewTaskForRewritingVisitor.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/NewTaskForRewritingVisitor.java
@@ -21,75 +21,70 @@
  * ASM visitor which rewrites placeholder 'newTaskFor' calls at build time to use the real method.
  */
 public final class NewTaskForRewritingVisitor implements AsmVisitorWrapper {
-  static final NewTaskForRewritingVisitor INSTANCE = new NewTaskForRewritingVisitor();
+    static final NewTaskForRewritingVisitor INSTANCE = new NewTaskForRewritingVisitor();
 
-  static final String NEW_TASK_FOR_PLACEHOLDER_CLASS =
-      getInternalName(NewTaskForPlaceholder.class.getName());
+    static final String NEW_TASK_FOR_PLACEHOLDER_CLASS = getInternalName(NewTaskForPlaceholder.class.getName());
 
-  static final String ABSTRACT_EXECUTOR_SERVICE_CLASS =
-      "java/util/concurrent/AbstractExecutorService";
+    static final String ABSTRACT_EXECUTOR_SERVICE_CLASS = "java/util/concurrent/AbstractExecutorService";
 
-  static final String NEW_TASK_FOR_METHOD = "newTaskFor";
+    static final String NEW_TASK_FOR_METHOD = "newTaskFor";
 
-  static final String NEW_TASK_FOR_METHOD_DESCRIPTOR =
-      Type.getMethodDescriptor(
-          Type.getType(RunnableFuture.class),
-          Type.getType(Runnable.class),
-          Type.getType(Object.class));
+    static final String NEW_TASK_FOR_METHOD_DESCRIPTOR = Type.getMethodDescriptor(
+            Type.getType(RunnableFuture.class), Type.getType(Runnable.class), Type.getType(Object.class));
 
-  @Override
-  public int mergeWriter(final int flags) {
-    return flags | ClassWriter.COMPUTE_MAXS;
-  }
+    @Override
+    public int mergeWriter(final int flags) {
+        return flags | ClassWriter.COMPUTE_MAXS;
+    }
 
-  @Override
-  public int mergeReader(final int flags) {
-    return flags;
-  }
+    @Override
+    public int mergeReader(final int flags) {
+        return flags;
+    }
 
-  @Override
-  public ClassVisitor wrap(
-      final TypeDescription instrumentedType,
-      final ClassVisitor classVisitor,
-      final Implementation.Context implementationContext,
-      final TypePool typePool,
-      final FieldList<FieldDescription.InDefinedShape> fields,
-      final MethodList<?> methods,
-      final int writerFlags,
-      final int readerFlags) {
-    return new ClassVisitor(Opcodes.ASM7, classVisitor) {
-      @Override
-      public MethodVisitor visitMethod(
-          final int access,
-          final String name,
-          final String descriptor,
-          final String signature,
-          final String[] exceptions) {
-        final MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
-        return new MethodVisitor(Opcodes.ASM7, mv) {
-          @Override
-          public void visitMethodInsn(
-              final int opcode,
-              final String owner,
-              final String name,
-              final String descriptor,
-              final boolean isInterface) {
-            // NewTaskForPlaceholder.newTaskFor(e,task,value) -> e.newTaskFor(task,value)
-            if (Opcodes.INVOKESTATIC == opcode
-                && NEW_TASK_FOR_PLACEHOLDER_CLASS.equals(owner)
-                && NEW_TASK_FOR_METHOD.equals(name)) {
-              mv.visitMethodInsn(
-                  Opcodes.INVOKEVIRTUAL,
-                  ABSTRACT_EXECUTOR_SERVICE_CLASS,
-                  NEW_TASK_FOR_METHOD,
-                  NEW_TASK_FOR_METHOD_DESCRIPTOR,
-                  false);
-            } else {
-              super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+    @Override
+    public ClassVisitor wrap(
+            final TypeDescription instrumentedType,
+            final ClassVisitor classVisitor,
+            final Implementation.Context implementationContext,
+            final TypePool typePool,
+            final FieldList<FieldDescription.InDefinedShape> fields,
+            final MethodList<?> methods,
+            final int writerFlags,
+            final int readerFlags) {
+        return new ClassVisitor(Opcodes.ASM7, classVisitor) {
+            @Override
+            public MethodVisitor visitMethod(
+                    final int access,
+                    final String name,
+                    final String descriptor,
+                    final String signature,
+                    final String[] exceptions) {
+                final MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
+                return new MethodVisitor(Opcodes.ASM7, mv) {
+                    @Override
+                    public void visitMethodInsn(
+                            final int opcode,
+                            final String owner,
+                            final String name,
+                            final String descriptor,
+                            final boolean isInterface) {
+                        // NewTaskForPlaceholder.newTaskFor(e,task,value) -> e.newTaskFor(task,value)
+                        if (Opcodes.INVOKESTATIC == opcode
+                                && NEW_TASK_FOR_PLACEHOLDER_CLASS.equals(owner)
+                                && NEW_TASK_FOR_METHOD.equals(name)) {
+                            mv.visitMethodInsn(
+                                    Opcodes.INVOKEVIRTUAL,
+                                    ABSTRACT_EXECUTOR_SERVICE_CLASS,
+                                    NEW_TASK_FOR_METHOD,
+                                    NEW_TASK_FOR_METHOD_DESCRIPTOR,
+                                    false);
+                        } else {
+                            super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+                        }
+                    }
+                };
             }
-          }
         };
-      }
-    };
-  }
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/SharedTypePools.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/SharedTypePools.java
index f6029fc8f97..e56568fd24c 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/SharedTypePools.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/SharedTypePools.java
@@ -8,86 +8,86 @@
 
 /** Pluggable {@link TypePool}s for use with instrumentation matching and muzzle checks. */
 public final class SharedTypePools {
-  private static volatile Supplier SUPPLIER;
-
-  /** Retrieves the shared type-pool for the given class-loader. */
-  public static TypePool typePool(ClassLoader classLoader) {
-    return SUPPLIER.typePool(classLoader);
-  }
-
-  /** Hints that the given annotation is of interest and should be proactively cached. */
-  public static void annotationOfInterest(String name) {
-    SUPPLIER.annotationOfInterest(name);
-  }
-
-  /** Hints that the given annotations are of interest and should be proactively cached. */
-  public static void annotationsOfInterest(Iterable<String> names) {
-    for (String name : names) {
-      SUPPLIER.annotationOfInterest(name);
-    }
-  }
-
-  /** Hints that the javaagent has finished installing as a {@link ClassFileTransformer}. */
-  public static void endInstall() {
-    SUPPLIER.endInstall();
-  }
-
-  /** Hints that the javaagent has finished calling {@link ClassFileTransformer#transform}. */
-  public static void endTransform() {
-    SUPPLIER.endTransform();
-  }
-
-  public static void clear() {
-    SUPPLIER.clear();
-  }
-
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification =
-          "Agent-internal holder; Class object does not escape to app code and lock only guards one-time supplier registration.")
-  public static synchronized void registerIfAbsent(Supplier supplier) {
-    if (null == SUPPLIER) {
-      SUPPLIER = supplier;
-    }
-  }
+    private static volatile Supplier SUPPLIER;
 
-  public interface Supplier {
     /** Retrieves the shared type-pool for the given class-loader. */
-    TypePool typePool(ClassLoader classLoader);
+    public static TypePool typePool(ClassLoader classLoader) {
+        return SUPPLIER.typePool(classLoader);
+    }
 
     /** Hints that the given annotation is of interest and should be proactively cached. */
-    void annotationOfInterest(String name);
+    public static void annotationOfInterest(String name) {
+        SUPPLIER.annotationOfInterest(name);
+    }
+
+    /** Hints that the given annotations are of interest and should be proactively cached. */
+    public static void annotationsOfInterest(Iterable<String> names) {
+        for (String name : names) {
+            SUPPLIER.annotationOfInterest(name);
+        }
+    }
 
     /** Hints that the javaagent has finished installing as a {@link ClassFileTransformer}. */
-    void endInstall();
+    public static void endInstall() {
+        SUPPLIER.endInstall();
+    }
 
     /** Hints that the javaagent has finished calling {@link ClassFileTransformer#transform}. */
-    void endTransform();
+    public static void endTransform() {
+        SUPPLIER.endTransform();
+    }
+
+    public static void clear() {
+        SUPPLIER.clear();
+    }
+
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification =
+                    "Agent-internal holder; Class object does not escape to app code and lock only guards one-time supplier registration.")
+    public static synchronized void registerIfAbsent(Supplier supplier) {
+        if (null == SUPPLIER) {
+            SUPPLIER = supplier;
+        }
+    }
 
-    void clear();
-  }
+    public interface Supplier {
+        /** Retrieves the shared type-pool for the given class-loader. */
+        TypePool typePool(ClassLoader classLoader);
 
-  /** Simple cache for use during the build when testing or validating muzzle ranges. */
-  public static Supplier simpleCache() {
-    return new SharedTypePools.Supplier() {
-      @Override
-      public TypePool typePool(ClassLoader classLoader) {
-        return TypePool.Default.WithLazyResolution.of(classFileLocator(classLoader));
-      }
+        /** Hints that the given annotation is of interest and should be proactively cached. */
+        void annotationOfInterest(String name);
 
-      @Override
-      public void annotationOfInterest(String name) {}
+        /** Hints that the javaagent has finished installing as a {@link ClassFileTransformer}. */
+        void endInstall();
 
-      @Override
-      public void endInstall() {}
+        /** Hints that the javaagent has finished calling {@link ClassFileTransformer#transform}. */
+        void endTransform();
+
+        void clear();
+    }
 
-      @Override
-      public void endTransform() {}
+    /** Simple cache for use during the build when testing or validating muzzle ranges. */
+    public static Supplier simpleCache() {
+        return new SharedTypePools.Supplier() {
+            @Override
+            public TypePool typePool(ClassLoader classLoader) {
+                return TypePool.Default.WithLazyResolution.of(classFileLocator(classLoader));
+            }
 
-      @Override
-      public void clear() {}
-    };
-  }
+            @Override
+            public void annotationOfInterest(String name) {}
+
+            @Override
+            public void endInstall() {}
+
+            @Override
+            public void endTransform() {}
+
+            @Override
+            public void clear() {}
+        };
+    }
 
-  private SharedTypePools() {}
+    private SharedTypePools() {}
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/TypeInfoCache.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/TypeInfoCache.java
index 0f0d820bffe..91e0e51670b 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/TypeInfoCache.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/TypeInfoCache.java
@@ -6,155 +6,155 @@
 
 /** Shares type information using a single cache across multiple classloaders. */
 public final class TypeInfoCache<T> {
-  public static final URL UNKNOWN_CLASS_FILE = null;
+    public static final URL UNKNOWN_CLASS_FILE = null;
 
-  // limit allowed capacities as descriptions are not small
-  private static final int MAX_CAPACITY = 1 << 16;
-  private static final int MIN_CAPACITY = 1 << 4;
+    // limit allowed capacities as descriptions are not small
+    private static final int MAX_CAPACITY = 1 << 16;
+    private static final int MIN_CAPACITY = 1 << 4;
 
-  private static final int MAX_HASH_ATTEMPTS = 5;
+    private static final int MAX_HASH_ATTEMPTS = 5;
 
-  private final boolean namesAreUnique;
-  private final SharedTypeInfo<T>[] sharedTypeInfo;
-  private final int slotMask;
+    private final boolean namesAreUnique;
+    private final SharedTypeInfo<T>[] sharedTypeInfo;
+    private final int slotMask;
 
-  public TypeInfoCache(int capacity) {
-    this(capacity, false);
-  }
-
-  @SuppressWarnings("unchecked")
-  public TypeInfoCache(int capacity, boolean namesAreUnique) {
-    this.namesAreUnique = namesAreUnique;
-    if (capacity < MIN_CAPACITY) {
-      capacity = MIN_CAPACITY;
-    } else if (capacity > MAX_CAPACITY) {
-      capacity = MAX_CAPACITY;
-    }
-    // choose enough slot bits to cover the chosen capacity
-    this.slotMask = 0xFFFFFFFF >>> Integer.numberOfLeadingZeros(capacity - 1);
-    this.sharedTypeInfo = new SharedTypeInfo[slotMask + 1];
-  }
-
-  /**
-   * Finds the most recently shared information for the named type.
-   *
-   * <p>When multiple types exist with the same name only one type will be cached at a time. Callers
-   * can compare the originating classloader and class file resource to help disambiguate results.
-   */
-  public SharedTypeInfo<T> find(String className) {
-    int nameHash = className.hashCode();
-    for (int i = 1; true; i++) {
-      SharedTypeInfo<T> value = sharedTypeInfo[slotMask & nameHash];
-      if (null == value) {
-        return null;
-      } else if (className.equals(value.className)) {
-        value.lastUsed = System.currentTimeMillis();
-        return value;
-      } else if (i == MAX_HASH_ATTEMPTS) {
-        return null;
-      }
-      nameHash = rehash(nameHash);
-    }
-  }
-
-  /**
-   * Shares information for the named type, replacing any previously shared details.
-   *
-   * @return previously shared information for the named type
-   */
-  public SharedTypeInfo<T> share(String className, int classLoaderId, URL classFile, T typeInfo) {
-    SharedTypeInfo<T> newValue;
-    if (namesAreUnique) {
-      newValue = new SharedTypeInfo<>(className, typeInfo);
-    } else {
-      newValue = new DisambiguatingTypeInfo<>(className, typeInfo, classLoaderId, classFile);
+    public TypeInfoCache(int capacity) {
+        this(capacity, false);
     }
 
-    int nameHash = className.hashCode();
-    int slot = slotMask & nameHash;
-
-    long leastUsedTime = Long.MAX_VALUE;
-    int leastUsedSlot = slot;
-
-    for (int i = 1; true; i++) {
-      SharedTypeInfo<T> oldValue = sharedTypeInfo[slot];
-      if (null == oldValue || className.equals(oldValue.className)) {
-        sharedTypeInfo[slot] = newValue;
-        return oldValue;
-      } else if (i == MAX_HASH_ATTEMPTS) {
-        sharedTypeInfo[leastUsedSlot] = newValue; // overwrite least-recently used
-        return null;
-      } else if (oldValue.lastUsed < leastUsedTime) {
-        leastUsedTime = oldValue.lastUsed;
-        leastUsedSlot = slot;
-      }
-      nameHash = rehash(nameHash);
-      slot = slotMask & nameHash;
+    @SuppressWarnings("unchecked")
+    public TypeInfoCache(int capacity, boolean namesAreUnique) {
+        this.namesAreUnique = namesAreUnique;
+        if (capacity < MIN_CAPACITY) {
+            capacity = MIN_CAPACITY;
+        } else if (capacity > MAX_CAPACITY) {
+            capacity = MAX_CAPACITY;
+        }
+        // choose enough slot bits to cover the chosen capacity
+        this.slotMask = 0xFFFFFFFF >>> Integer.numberOfLeadingZeros(capacity - 1);
+        this.sharedTypeInfo = new SharedTypeInfo[slotMask + 1];
     }
-  }
-
-  /** Clears all type information from the shared cache. */
-  public void clear() {
-    Arrays.fill(sharedTypeInfo, null);
-  }
-
-  private static int rehash(int oldHash) {
-    return Integer.reverseBytes(oldHash * 0x9e3775cd) * 0x9e3775cd;
-  }
-
-  /** Wraps type information with the name of the class it originated from. */
-  public static class SharedTypeInfo<T> {
-    final String className;
-    private final T typeInfo;
 
-    long lastUsed = System.currentTimeMillis();
-
-    SharedTypeInfo(String className, T typeInfo) {
-      this.className = className;
-      this.typeInfo = typeInfo;
+    /**
+     * Finds the most recently shared information for the named type.
+     *
+     * <p>When multiple types exist with the same name only one type will be cached at a time. Callers
+     * can compare the originating classloader and class file resource to help disambiguate results.
+     */
+    public SharedTypeInfo<T> find(String className) {
+        int nameHash = className.hashCode();
+        for (int i = 1; true; i++) {
+            SharedTypeInfo<T> value = sharedTypeInfo[slotMask & nameHash];
+            if (null == value) {
+                return null;
+            } else if (className.equals(value.className)) {
+                value.lastUsed = System.currentTimeMillis();
+                return value;
+            } else if (i == MAX_HASH_ATTEMPTS) {
+                return null;
+            }
+            nameHash = rehash(nameHash);
+        }
     }
 
-    public boolean sameClassLoader(int classLoaderId) {
-      return true;
+    /**
+     * Shares information for the named type, replacing any previously shared details.
+     *
+     * @return previously shared information for the named type
+     */
+    public SharedTypeInfo<T> share(String className, int classLoaderId, URL classFile, T typeInfo) {
+        SharedTypeInfo<T> newValue;
+        if (namesAreUnique) {
+            newValue = new SharedTypeInfo<>(className, typeInfo);
+        } else {
+            newValue = new DisambiguatingTypeInfo<>(className, typeInfo, classLoaderId, classFile);
+        }
+
+        int nameHash = className.hashCode();
+        int slot = slotMask & nameHash;
+
+        long leastUsedTime = Long.MAX_VALUE;
+        int leastUsedSlot = slot;
+
+        for (int i = 1; true; i++) {
+            SharedTypeInfo<T> oldValue = sharedTypeInfo[slot];
+            if (null == oldValue || className.equals(oldValue.className)) {
+                sharedTypeInfo[slot] = newValue;
+                return oldValue;
+            } else if (i == MAX_HASH_ATTEMPTS) {
+                sharedTypeInfo[leastUsedSlot] = newValue; // overwrite least-recently used
+                return null;
+            } else if (oldValue.lastUsed < leastUsedTime) {
+                leastUsedTime = oldValue.lastUsed;
+                leastUsedSlot = slot;
+            }
+            nameHash = rehash(nameHash);
+            slot = slotMask & nameHash;
+        }
     }
 
-    public boolean sameClassFile(URL classFile) {
-      return true;
+    /** Clears all type information from the shared cache. */
+    public void clear() {
+        Arrays.fill(sharedTypeInfo, null);
     }
 
-    public final T get() {
-      return typeInfo;
+    private static int rehash(int oldHash) {
+        return Integer.reverseBytes(oldHash * 0x9e3775cd) * 0x9e3775cd;
     }
-  }
 
-  /** Includes the classloader and class file resource it originated from. */
-  static final class DisambiguatingTypeInfo<T> extends SharedTypeInfo<T> {
-    private final int classLoaderId;
-    private final URL classFile;
+    /** Wraps type information with the name of the class it originated from. */
+    public static class SharedTypeInfo<T> {
+        final String className;
+        private final T typeInfo;
 
-    DisambiguatingTypeInfo(String className, T typeInfo, int classLoaderId, URL classFile) {
-      super(className, typeInfo);
-      this.classLoaderId = classLoaderId;
-      this.classFile = classFile;
-    }
+        long lastUsed = System.currentTimeMillis();
 
-    @Override
-    public boolean sameClassLoader(int classLoaderId) {
-      return this.classLoaderId == classLoaderId;
-    }
+        SharedTypeInfo(String className, T typeInfo) {
+            this.className = className;
+            this.typeInfo = typeInfo;
+        }
+
+        public boolean sameClassLoader(int classLoaderId) {
+            return true;
+        }
+
+        public boolean sameClassFile(URL classFile) {
+            return true;
+        }
 
-    public boolean sameClassFile(URL classFile) {
-      return UNKNOWN_CLASS_FILE != classFile
-          && UNKNOWN_CLASS_FILE != this.classFile
-          && sameClassFile(this.classFile, classFile);
+        public final T get() {
+            return typeInfo;
+        }
     }
 
-    /** Matches class file resources without triggering network lookups. */
-    private static boolean sameClassFile(URL lhs, URL rhs) {
-      return Objects.equals(lhs.getFile(), rhs.getFile())
-          && Objects.equals(lhs.getRef(), rhs.getRef())
-          && Objects.equals(lhs.getAuthority(), rhs.getAuthority())
-          && Objects.equals(lhs.getProtocol(), rhs.getProtocol());
+    /** Includes the classloader and class file resource it originated from. */
+    static final class DisambiguatingTypeInfo<T> extends SharedTypeInfo<T> {
+        private final int classLoaderId;
+        private final URL classFile;
+
+        DisambiguatingTypeInfo(String className, T typeInfo, int classLoaderId, URL classFile) {
+            super(className, typeInfo);
+            this.classLoaderId = classLoaderId;
+            this.classFile = classFile;
+        }
+
+        @Override
+        public boolean sameClassLoader(int classLoaderId) {
+            return this.classLoaderId == classLoaderId;
+        }
+
+        public boolean sameClassFile(URL classFile) {
+            return UNKNOWN_CLASS_FILE != classFile
+                    && UNKNOWN_CLASS_FILE != this.classFile
+                    && sameClassFile(this.classFile, classFile);
+        }
+
+        /** Matches class file resources without triggering network lookups. */
+        private static boolean sameClassFile(URL lhs, URL rhs) {
+            return Objects.equals(lhs.getFile(), rhs.getFile())
+                    && Objects.equals(lhs.getRef(), rhs.getRef())
+                    && Objects.equals(lhs.getAuthority(), rhs.getAuthority())
+                    && Objects.equals(lhs.getProtocol(), rhs.getProtocol());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/Advices.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/Advices.java
index 58cbe2eb856..a9670d6b4bb 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/Advices.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/Advices.java
@@ -30,407 +30,387 @@
  */
 public class Advices {
 
-  private static final Logger LOG = LoggerFactory.getLogger(Advices.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Advices.class);
 
-  public static final Advices EMPTY =
-      new Advices(
-          Collections.emptyMap(),
-          new String[0],
-          AdviceIntrospector.NoOpAdviceInstrospector.INSTANCE) {
-        @Override
-        public boolean isEmpty() {
-          return true;
-        }
-      };
-
-  private static final Field BUILDER_CLASS_LOCATOR_FIELD = resolveClassFileLocatorField();
-
-  private final Map<String, Map<String, Map<String, CallSiteAdvice>>> advices;
-
-  private final String[] helpers;
-
-  private final AdviceIntrospector introspector;
-
-  private final Listener[] listeners;
-
-  private Advices(
-      final Map<String, Map<String, Map<String, CallSiteAdvice>>> advices,
-      final String[] helpers,
-      final AdviceIntrospector introspector,
-      final Listener... listeners) {
-    this.advices = Collections.unmodifiableMap(advices);
-    this.helpers = helpers;
-    this.introspector = introspector;
-    this.listeners = listeners;
-  }
-
-  public static Advices fromCallSites(@Nonnull final CallSites... callSites) {
-    return fromCallSites(Arrays.asList(callSites));
-  }
-
-  public static Advices fromCallSites(
-      @Nonnull final Iterable<CallSites> callSites, final Listener... listeners) {
-    return fromCallSites(
-        callSites, AdviceIntrospector.ConstantPoolInstrospector.INSTANCE, listeners);
-  }
-
-  public static Advices fromCallSites(
-      @Nonnull final Iterable<CallSites> callSites,
-      @Nonnull final AdviceIntrospector introspector,
-      final Listener... listeners) {
-    final AdviceContainer container = new AdviceContainer();
-    for (final CallSites entry : callSites) {
-      if (isCallSitesEnabled(entry)) {
-        entry.accept(container);
-      }
-    }
-    return container.advices.isEmpty()
-        ? EMPTY
-        : new Advices(
-            container.advices, container.helpers.toArray(new String[0]), introspector, listeners);
-  }
-
-  /**
-   * The method will try to discover the {@link CallSiteAdvice} that should be applied to a specific
-   * type by using the assigned {@link AdviceIntrospector}
-   */
-  public Advices findAdvices(
-      @Nonnull final DynamicType.Builder<?> builder,
-      @Nonnull final TypeDescription type,
-      final ClassLoader loader) {
-    if (advices.isEmpty()) {
-      return this;
-    }
-    return introspector.findAdvices(this, builder, type, loader, listeners);
-  }
+    public static final Advices EMPTY =
+            new Advices(Collections.emptyMap(), new String[0], AdviceIntrospector.NoOpAdviceInstrospector.INSTANCE) {
+                @Override
+                public boolean isEmpty() {
+                    return true;
+                }
+            };
 
-  private static boolean isCallSitesEnabled(final CallSites callSites) {
-    if (!(callSites instanceof CallSites.HasEnabledProperty)) {
-      return true;
-    }
-    final CallSites.HasEnabledProperty hasEnabledProperty =
-        (CallSites.HasEnabledProperty) callSites;
-    return hasEnabledProperty.isEnabled();
-  }
-
-  public CallSiteAdvice findAdvice(@Nonnull final Handle handle) {
-    return findAdvice(handle.getOwner(), handle.getName(), handle.getDesc());
-  }
-
-  /**
-   * The method tries to find the configured advice for the specific method call
-   *
-   * @param callee type owning the method
-   * @param method method name
-   * @param descriptor descriptor of the method
-   * @return the advice or {@code null} if none found
-   */
-  public CallSiteAdvice findAdvice(
-      @Nonnull final String callee,
-      @Nonnull final String method,
-      @Nonnull final String descriptor) {
-    if (advices.isEmpty()) {
-      return null;
-    }
-    final Map<String, Map<String, CallSiteAdvice>> typeAdvices = advices.get(callee);
-    if (typeAdvices == null) {
-      return null;
-    }
-    final Map<String, CallSiteAdvice> methodAdvices = typeAdvices.get(method);
-    if (methodAdvices == null) {
-      return null;
-    }
-    return methodAdvices.get(descriptor);
-  }
-
-  /** Gets the type of advice we are dealing with */
-  public byte typeOf(final CallSiteAdvice advice) {
-    return ((TypedAdvice) advice).getType();
-  }
-
-  public String[] getHelpers() {
-    return helpers;
-  }
-
-  public boolean isEmpty() {
-    return advices.isEmpty();
-  }
-
-  private static Field resolveClassFileLocatorField() {
-    Field field;
-    try {
-      field = AbstractInliningDynamicTypeBuilder.class.getDeclaredField("classFileLocator");
-      field.setAccessible(true);
-      return field;
-    } catch (Throwable e) {
-      LOG.error(
-          "Failed to resolve field \"classFileLocator\" in {}",
-          AbstractInliningDynamicTypeBuilder.class,
-          e);
-    }
-    return null;
-  }
+    private static final Field BUILDER_CLASS_LOCATOR_FIELD = resolveClassFileLocatorField();
+
+    private final Map<String, Map<String, Map<String, CallSiteAdvice>>> advices;
+
+    private final String[] helpers;
 
-  private static class AdviceContainer implements CallSites.Container {
-    private final Map<String, Map<String, Map<String, CallSiteAdvice>>> advices = new HashMap<>();
+    private final AdviceIntrospector introspector;
 
-    private final Set<String> helpers = new HashSet<>();
+    private final Listener[] listeners;
 
-    @Override
-    public void addHelpers(final String... helperClassNames) {
-      Collections.addAll(helpers, helperClassNames);
+    private Advices(
+            final Map<String, Map<String, Map<String, CallSiteAdvice>>> advices,
+            final String[] helpers,
+            final AdviceIntrospector introspector,
+            final Listener... listeners) {
+        this.advices = Collections.unmodifiableMap(advices);
+        this.helpers = helpers;
+        this.introspector = introspector;
+        this.listeners = listeners;
     }
 
-    @Override
-    public void addAdvice(
-        final byte type,
-        final String owner,
-        final String method,
-        final String descriptor,
-        final CallSiteAdvice advice) {
-      final Map<String, Map<String, CallSiteAdvice>> typeAdvices =
-          advices.computeIfAbsent(owner, k -> new HashMap<>());
-      final Map<String, CallSiteAdvice> methodAdvices =
-          typeAdvices.computeIfAbsent(method, k -> new HashMap<>());
-      final CallSiteAdvice oldAdvice =
-          methodAdvices.put(descriptor, TypedAdvice.withType(advice, type));
-      if (oldAdvice != null) {
-        throw new UnsupportedOperationException(
-            String.format(
-                "Advice %s and %s match the same pointcut, this is not yet supported",
-                oldAdvice, advice));
-      }
+    public static Advices fromCallSites(@Nonnull final CallSites... callSites) {
+        return fromCallSites(Arrays.asList(callSites));
     }
-  }
-
-  /**
-   * Instance of this class will try to discover the advices required to instrument a class before
-   * visiting it
-   */
-  public interface AdviceIntrospector {
-
-    @Nonnull
-    Advices findAdvices(
-        @Nonnull Advices advices,
-        @Nonnull DynamicType.Builder<?> builder,
-        @Nonnull TypeDescription type,
-        ClassLoader loader,
-        Listener... listeners);
-
-    class NoOpAdviceInstrospector implements AdviceIntrospector {
-
-      public static final AdviceIntrospector INSTANCE = new NoOpAdviceInstrospector();
-
-      @Override
-      public @Nonnull Advices findAdvices(
-          final @Nonnull Advices advices,
-          final @Nonnull DynamicType.Builder<?> builder,
-          @Nonnull final TypeDescription type,
-          final ClassLoader loader,
-          final Listener... listeners) {
-        return advices;
-      }
+
+    public static Advices fromCallSites(@Nonnull final Iterable<CallSites> callSites, final Listener... listeners) {
+        return fromCallSites(callSites, AdviceIntrospector.ConstantPoolInstrospector.INSTANCE, listeners);
+    }
+
+    public static Advices fromCallSites(
+            @Nonnull final Iterable<CallSites> callSites,
+            @Nonnull final AdviceIntrospector introspector,
+            final Listener... listeners) {
+        final AdviceContainer container = new AdviceContainer();
+        for (final CallSites entry : callSites) {
+            if (isCallSitesEnabled(entry)) {
+                entry.accept(container);
+            }
+        }
+        return container.advices.isEmpty()
+                ? EMPTY
+                : new Advices(container.advices, container.helpers.toArray(new String[0]), introspector, listeners);
     }
 
     /**
-     * This class will try to parse the constant pool of the class in order to discover if any
-     * configured advices should be applied.
+     * The method will try to discover the {@link CallSiteAdvice} that should be applied to a specific
+     * type by using the assigned {@link AdviceIntrospector}
      */
-    class ConstantPoolInstrospector implements AdviceIntrospector {
-
-      public static final AdviceIntrospector INSTANCE = new ConstantPoolInstrospector();
-
-      private static final Map<Integer, ConstantPoolHandler> CP_HANDLERS;
-
-      static {
-        final Map<Integer, ConstantPoolHandler> handlers = new HashMap<>(4);
-        final ConstantPoolHandler methodRefHandler = new MethodRefHandler();
-        handlers.put(CONSTANT_METHODREF_TAG, methodRefHandler);
-        handlers.put(CONSTANT_INTERFACE_METHODREF_TAG, methodRefHandler);
-        CP_HANDLERS = Collections.unmodifiableMap(handlers);
-      }
-
-      @Override
-      public @Nonnull Advices findAdvices(
-          final @Nonnull Advices advices,
-          final @Nonnull DynamicType.Builder<?> builder,
-          @Nonnull final TypeDescription type,
-          final ClassLoader loader,
-          final Listener... listeners) {
-        byte[] classFile = resolveFromBuilder(type, builder);
-        if (classFile == null) {
-          classFile = resolveFromLoader(type, loader);
+    public Advices findAdvices(
+            @Nonnull final DynamicType.Builder<?> builder,
+            @Nonnull final TypeDescription type,
+            final ClassLoader loader) {
+        if (advices.isEmpty()) {
+            return this;
         }
-        if (classFile == null) {
-          return advices; // do not do any filtering if we don't have access to the class file
-          // buffer
+        return introspector.findAdvices(this, builder, type, loader, listeners);
+    }
+
+    private static boolean isCallSitesEnabled(final CallSites callSites) {
+        if (!(callSites instanceof CallSites.HasEnabledProperty)) {
+            return true;
         }
-        final ConstantPool cp = new ConstantPool(classFile);
-        for (final Listener listener : listeners) {
-          try {
-            listener.onConstantPool(type, cp, classFile);
-          } catch (final Throwable e) {
-            LOG.debug("Failed to apply advice listener {}", listener, e);
-          }
+        final CallSites.HasEnabledProperty hasEnabledProperty = (CallSites.HasEnabledProperty) callSites;
+        return hasEnabledProperty.isEnabled();
+    }
+
+    public CallSiteAdvice findAdvice(@Nonnull final Handle handle) {
+        return findAdvice(handle.getOwner(), handle.getName(), handle.getDesc());
+    }
+
+    /**
+     * The method tries to find the configured advice for the specific method call
+     *
+     * @param callee type owning the method
+     * @param method method name
+     * @param descriptor descriptor of the method
+     * @return the advice or {@code null} if none found
+     */
+    public CallSiteAdvice findAdvice(
+            @Nonnull final String callee, @Nonnull final String method, @Nonnull final String descriptor) {
+        if (advices.isEmpty()) {
+            return null;
         }
-        for (int index = 1; index < cp.getCount(); index++) {
-          final int referenceType = cp.getType(index);
-          final ConstantPoolHandler handler = CP_HANDLERS.get(referenceType);
-          // short circuit when any advice is found
-          if (handler != null && handler.findAdvice(advices, cp, index) != null) {
-            return advices;
-          }
+        final Map<String, Map<String, CallSiteAdvice>> typeAdvices = advices.get(callee);
+        if (typeAdvices == null) {
+            return null;
         }
-        return EMPTY;
-      }
-
-      /** Handler for a particular type of constant pool type (MethodRef, InvokeDynamic, ...) */
-      private interface ConstantPoolHandler {
-        CallSiteAdvice findAdvice(@Nonnull Advices advices, @Nonnull ConstantPool cp, int index);
-      }
-
-      /**
-       * + * Try to fetch the class file buffer from the actual builder via introspection to improve
-       * + * performance +
-       */
-      private byte[] resolveFromBuilder(
-          @Nonnull final TypeDescription type, @Nonnull final DynamicType.Builder<?> builder) {
-        if (builder instanceof AbstractInliningDynamicTypeBuilder
-            && BUILDER_CLASS_LOCATOR_FIELD != null) {
-          try {
-            final ClassFileLocator locator =
-                (ClassFileLocator) BUILDER_CLASS_LOCATOR_FIELD.get(builder);
-            final ClassFileLocator.Resolution resolution = locator.locate(type.getName());
-            return resolution.isResolved() ? resolution.resolve() : null;
-          } catch (Throwable e) {
-            if (LOG.isWarnEnabled()) {
-              LOG.warn("Failed to fetch type {} from builder", type.getName(), e);
-            }
-          }
+        final Map<String, CallSiteAdvice> methodAdvices = typeAdvices.get(method);
+        if (methodAdvices == null) {
+            return null;
         }
-        return null;
-      }
-
-      /** Use the default class loader strategy to resolve the class file buffer */
-      private byte[] resolveFromLoader(
-          @Nonnull final TypeDescription type, final ClassLoader loader) {
-        try (final ClassFileLocator locator = ClassFileLocators.classFileLocator(loader)) {
-          final ClassFileLocator.Resolution resolution = locator.locate(type.getName());
-          return resolution.isResolved() ? resolution.resolve() : null;
+        return methodAdvices.get(descriptor);
+    }
+
+    /** Gets the type of advice we are dealing with */
+    public byte typeOf(final CallSiteAdvice advice) {
+        return ((TypedAdvice) advice).getType();
+    }
+
+    public String[] getHelpers() {
+        return helpers;
+    }
+
+    public boolean isEmpty() {
+        return advices.isEmpty();
+    }
+
+    private static Field resolveClassFileLocatorField() {
+        Field field;
+        try {
+            field = AbstractInliningDynamicTypeBuilder.class.getDeclaredField("classFileLocator");
+            field.setAccessible(true);
+            return field;
         } catch (Throwable e) {
-          if (LOG.isWarnEnabled()) {
-            LOG.warn("Failed to fetch type {} from class loader", type.getName(), e);
-          }
+            LOG.error(
+                    "Failed to resolve field \"classFileLocator\" in {}", AbstractInliningDynamicTypeBuilder.class, e);
         }
         return null;
-      }
+    }
+
+    private static class AdviceContainer implements CallSites.Container {
+        private final Map<String, Map<String, Map<String, CallSiteAdvice>>> advices = new HashMap<>();
 
-      /**
-       * Extracts advices by looking at method refs in the constant pool
-       *
-       * @see <a
-       *     href="https://docs.oracle.com/javase/specs/jvms/se15/html/jvms-4.html#jvms-4.4.2">Methodref_info</a>
-       */
-      private static class MethodRefHandler implements ConstantPoolHandler {
+        private final Set<String> helpers = new HashSet<>();
 
         @Override
-        public CallSiteAdvice findAdvice(
-            @Nonnull final Advices advices, @Nonnull final ConstantPool cp, final int index) {
-          final int offset = cp.getOffset(index);
-
-          // u2 class_index;
-          final int classIndex = cp.readUnsignedShort(offset);
-          final int classNameIndex = cp.readUnsignedShort(cp.getOffset(classIndex));
-          final String className = cp.readUTF8(cp.getOffset(classNameIndex));
-          final Map<String, Map<String, CallSiteAdvice>> calleeAdvices =
-              advices.advices.get(className);
-          if (calleeAdvices == null) {
-            return null;
-          }
-
-          // u2 name_and_type_index;
-          final int nameAndTypeIndex = cp.readUnsignedShort(offset + 2);
-          final int nameAndTypeOffset = cp.getOffset(nameAndTypeIndex);
-          final int nameIndex = cp.readUnsignedShort(nameAndTypeOffset);
-          final String name = cp.readUTF8(cp.getOffset(nameIndex));
-          final Map<String, CallSiteAdvice> methodAdvices = calleeAdvices.get(name);
-          if (methodAdvices == null) {
-            return null;
-          }
-          final int descriptorIndex = cp.readUnsignedShort(nameAndTypeOffset + 2);
-          final String descriptor = cp.readUTF8(cp.getOffset(descriptorIndex));
-          return methodAdvices.get(descriptor);
+        public void addHelpers(final String... helperClassNames) {
+            Collections.addAll(helpers, helperClassNames);
+        }
+
+        @Override
+        public void addAdvice(
+                final byte type,
+                final String owner,
+                final String method,
+                final String descriptor,
+                final CallSiteAdvice advice) {
+            final Map<String, Map<String, CallSiteAdvice>> typeAdvices =
+                    advices.computeIfAbsent(owner, k -> new HashMap<>());
+            final Map<String, CallSiteAdvice> methodAdvices = typeAdvices.computeIfAbsent(method, k -> new HashMap<>());
+            final CallSiteAdvice oldAdvice = methodAdvices.put(descriptor, TypedAdvice.withType(advice, type));
+            if (oldAdvice != null) {
+                throw new UnsupportedOperationException(String.format(
+                        "Advice %s and %s match the same pointcut, this is not yet supported", oldAdvice, advice));
+            }
         }
-      }
-    }
-  }
-
-  public interface Listener {
-    void onConstantPool(
-        @Nonnull TypeDescription type, @Nonnull ConstantPool pool, final byte[] classFile);
-  }
-
-  // Kept public only for testing
-  public interface TypedAdvice {
-    byte getType();
-
-    static CallSiteAdvice withType(final CallSiteAdvice advice, final byte type) {
-      if (advice instanceof InvokeAdvice) {
-        return new InvokeWithType((InvokeAdvice) advice, type);
-      } else {
-        return new InvokeDynamicWithType((InvokeDynamicAdvice) advice, type);
-      }
     }
-  }
 
-  private static class InvokeWithType implements InvokeAdvice, TypedAdvice {
-    private final InvokeAdvice advice;
-    private final byte type;
+    /**
+     * Instance of this class will try to discover the advices required to instrument a class before
+     * visiting it
+     */
+    public interface AdviceIntrospector {
+
+        @Nonnull
+        Advices findAdvices(
+                @Nonnull Advices advices,
+                @Nonnull DynamicType.Builder<?> builder,
+                @Nonnull TypeDescription type,
+                ClassLoader loader,
+                Listener... listeners);
+
+        class NoOpAdviceInstrospector implements AdviceIntrospector {
+
+            public static final AdviceIntrospector INSTANCE = new NoOpAdviceInstrospector();
+
+            @Override
+            public @Nonnull Advices findAdvices(
+                    final @Nonnull Advices advices,
+                    final @Nonnull DynamicType.Builder<?> builder,
+                    @Nonnull final TypeDescription type,
+                    final ClassLoader loader,
+                    final Listener... listeners) {
+                return advices;
+            }
+        }
 
-    private InvokeWithType(InvokeAdvice advice, byte type) {
-      this.advice = advice;
-      this.type = type;
-    }
+        /**
+         * This class will try to parse the constant pool of the class in order to discover if any
+         * configured advices should be applied.
+         */
+        class ConstantPoolInstrospector implements AdviceIntrospector {
+
+            public static final AdviceIntrospector INSTANCE = new ConstantPoolInstrospector();
+
+            private static final Map<Integer, ConstantPoolHandler> CP_HANDLERS;
+
+            static {
+                final Map<Integer, ConstantPoolHandler> handlers = new HashMap<>(4);
+                final ConstantPoolHandler methodRefHandler = new MethodRefHandler();
+                handlers.put(CONSTANT_METHODREF_TAG, methodRefHandler);
+                handlers.put(CONSTANT_INTERFACE_METHODREF_TAG, methodRefHandler);
+                CP_HANDLERS = Collections.unmodifiableMap(handlers);
+            }
+
+            @Override
+            public @Nonnull Advices findAdvices(
+                    final @Nonnull Advices advices,
+                    final @Nonnull DynamicType.Builder<?> builder,
+                    @Nonnull final TypeDescription type,
+                    final ClassLoader loader,
+                    final Listener... listeners) {
+                byte[] classFile = resolveFromBuilder(type, builder);
+                if (classFile == null) {
+                    classFile = resolveFromLoader(type, loader);
+                }
+                if (classFile == null) {
+                    return advices; // do not do any filtering if we don't have access to the class file
+                    // buffer
+                }
+                final ConstantPool cp = new ConstantPool(classFile);
+                for (final Listener listener : listeners) {
+                    try {
+                        listener.onConstantPool(type, cp, classFile);
+                    } catch (final Throwable e) {
+                        LOG.debug("Failed to apply advice listener {}", listener, e);
+                    }
+                }
+                for (int index = 1; index < cp.getCount(); index++) {
+                    final int referenceType = cp.getType(index);
+                    final ConstantPoolHandler handler = CP_HANDLERS.get(referenceType);
+                    // short circuit when any advice is found
+                    if (handler != null && handler.findAdvice(advices, cp, index) != null) {
+                        return advices;
+                    }
+                }
+                return EMPTY;
+            }
+
+            /** Handler for a particular type of constant pool type (MethodRef, InvokeDynamic, ...) */
+            private interface ConstantPoolHandler {
+                CallSiteAdvice findAdvice(@Nonnull Advices advices, @Nonnull ConstantPool cp, int index);
+            }
+
+            /**
+             * + * Try to fetch the class file buffer from the actual builder via introspection to improve
+             * + * performance +
+             */
+            private byte[] resolveFromBuilder(
+                    @Nonnull final TypeDescription type, @Nonnull final DynamicType.Builder<?> builder) {
+                if (builder instanceof AbstractInliningDynamicTypeBuilder && BUILDER_CLASS_LOCATOR_FIELD != null) {
+                    try {
+                        final ClassFileLocator locator = (ClassFileLocator) BUILDER_CLASS_LOCATOR_FIELD.get(builder);
+                        final ClassFileLocator.Resolution resolution = locator.locate(type.getName());
+                        return resolution.isResolved() ? resolution.resolve() : null;
+                    } catch (Throwable e) {
+                        if (LOG.isWarnEnabled()) {
+                            LOG.warn("Failed to fetch type {} from builder", type.getName(), e);
+                        }
+                    }
+                }
+                return null;
+            }
+
+            /** Use the default class loader strategy to resolve the class file buffer */
+            private byte[] resolveFromLoader(@Nonnull final TypeDescription type, final ClassLoader loader) {
+                try (final ClassFileLocator locator = ClassFileLocators.classFileLocator(loader)) {
+                    final ClassFileLocator.Resolution resolution = locator.locate(type.getName());
+                    return resolution.isResolved() ? resolution.resolve() : null;
+                } catch (Throwable e) {
+                    if (LOG.isWarnEnabled()) {
+                        LOG.warn("Failed to fetch type {} from class loader", type.getName(), e);
+                    }
+                }
+                return null;
+            }
 
-    @Override
-    public byte getType() {
-      return type;
+            /**
+             * Extracts advices by looking at method refs in the constant pool
+             *
+             * @see <a
+             *     href="https://docs.oracle.com/javase/specs/jvms/se15/html/jvms-4.html#jvms-4.4.2">Methodref_info</a>
+             */
+            private static class MethodRefHandler implements ConstantPoolHandler {
+
+                @Override
+                public CallSiteAdvice findAdvice(
+                        @Nonnull final Advices advices, @Nonnull final ConstantPool cp, final int index) {
+                    final int offset = cp.getOffset(index);
+
+                    // u2 class_index;
+                    final int classIndex = cp.readUnsignedShort(offset);
+                    final int classNameIndex = cp.readUnsignedShort(cp.getOffset(classIndex));
+                    final String className = cp.readUTF8(cp.getOffset(classNameIndex));
+                    final Map<String, Map<String, CallSiteAdvice>> calleeAdvices = advices.advices.get(className);
+                    if (calleeAdvices == null) {
+                        return null;
+                    }
+
+                    // u2 name_and_type_index;
+                    final int nameAndTypeIndex = cp.readUnsignedShort(offset + 2);
+                    final int nameAndTypeOffset = cp.getOffset(nameAndTypeIndex);
+                    final int nameIndex = cp.readUnsignedShort(nameAndTypeOffset);
+                    final String name = cp.readUTF8(cp.getOffset(nameIndex));
+                    final Map<String, CallSiteAdvice> methodAdvices = calleeAdvices.get(name);
+                    if (methodAdvices == null) {
+                        return null;
+                    }
+                    final int descriptorIndex = cp.readUnsignedShort(nameAndTypeOffset + 2);
+                    final String descriptor = cp.readUTF8(cp.getOffset(descriptorIndex));
+                    return methodAdvices.get(descriptor);
+                }
+            }
+        }
     }
 
-    @Override
-    public void apply(
-        final MethodHandler handler,
-        final int opcode,
-        final String owner,
-        final String name,
-        final String descriptor,
-        final boolean isInterface) {
-      advice.apply(handler, opcode, owner, name, descriptor, isInterface);
+    public interface Listener {
+        void onConstantPool(@Nonnull TypeDescription type, @Nonnull ConstantPool pool, final byte[] classFile);
     }
-  }
 
-  private static class InvokeDynamicWithType implements InvokeDynamicAdvice, TypedAdvice {
-    private final InvokeDynamicAdvice advice;
-    private final byte type;
+    // Kept public only for testing
+    public interface TypedAdvice {
+        byte getType();
 
-    private InvokeDynamicWithType(final InvokeDynamicAdvice advice, final byte type) {
-      this.advice = advice;
-      this.type = type;
+        static CallSiteAdvice withType(final CallSiteAdvice advice, final byte type) {
+            if (advice instanceof InvokeAdvice) {
+                return new InvokeWithType((InvokeAdvice) advice, type);
+            } else {
+                return new InvokeDynamicWithType((InvokeDynamicAdvice) advice, type);
+            }
+        }
     }
 
-    @Override
-    public byte getType() {
-      return type;
+    private static class InvokeWithType implements InvokeAdvice, TypedAdvice {
+        private final InvokeAdvice advice;
+        private final byte type;
+
+        private InvokeWithType(InvokeAdvice advice, byte type) {
+            this.advice = advice;
+            this.type = type;
+        }
+
+        @Override
+        public byte getType() {
+            return type;
+        }
+
+        @Override
+        public void apply(
+                final MethodHandler handler,
+                final int opcode,
+                final String owner,
+                final String name,
+                final String descriptor,
+                final boolean isInterface) {
+            advice.apply(handler, opcode, owner, name, descriptor, isInterface);
+        }
     }
 
-    @Override
-    public void apply(
-        final MethodHandler handler,
-        final String name,
-        final String descriptor,
-        final Handle bootstrapMethodHandle,
-        final Object... bootstrapMethodArguments) {
-      advice.apply(handler, name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
+    private static class InvokeDynamicWithType implements InvokeDynamicAdvice, TypedAdvice {
+        private final InvokeDynamicAdvice advice;
+        private final byte type;
+
+        private InvokeDynamicWithType(final InvokeDynamicAdvice advice, final byte type) {
+            this.advice = advice;
+            this.type = type;
+        }
+
+        @Override
+        public byte getType() {
+            return type;
+        }
+
+        @Override
+        public void apply(
+                final MethodHandler handler,
+                final String name,
+                final String descriptor,
+                final Handle bootstrapMethodHandle,
+                final Object... bootstrapMethodArguments) {
+            advice.apply(handler, name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteInstrumentation.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteInstrumentation.java
index 8b7ad6029d8..1fd3381a669 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteInstrumentation.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteInstrumentation.java
@@ -12,31 +12,30 @@
  * CallSiteAdvice} implementations.
  */
 public abstract class CallSiteInstrumentation extends InstrumenterModule
-    implements Instrumenter.ForCallSite, Instrumenter.HasTypeAdvice {
+        implements Instrumenter.ForCallSite, Instrumenter.HasTypeAdvice {
 
-  private Advices advices;
+    private Advices advices;
 
-  public CallSiteInstrumentation(
-      @Nonnull final String name, @Nonnull final String... additionalNames) {
-    super(name, additionalNames);
-  }
+    public CallSiteInstrumentation(@Nonnull final String name, @Nonnull final String... additionalNames) {
+        super(name, additionalNames);
+    }
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new CallSiteTransformer(name(), advices()));
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new CallSiteTransformer(name(), advices()));
+    }
 
-  /** Utility to be able to tune the advices in subclasses */
-  protected Advices buildAdvices(final Iterable<CallSites> callSites) {
-    return Advices.fromCallSites(callSites);
-  }
+    /** Utility to be able to tune the advices in subclasses */
+    protected Advices buildAdvices(final Iterable<CallSites> callSites) {
+        return Advices.fromCallSites(callSites);
+    }
 
-  protected abstract CallSiteSupplier callSites();
+    protected abstract CallSiteSupplier callSites();
 
-  private Advices advices() {
-    if (null == advices) {
-      advices = buildAdvices(callSites().get());
+    private Advices advices() {
+        if (null == advices) {
+            advices = buildAdvices(callSites().get());
+        }
+        return advices;
     }
-    return advices;
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteTransformer.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteTransformer.java
index 8d4eaa72f27..7c0d4a6b288 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteTransformer.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteTransformer.java
@@ -34,461 +34,445 @@
 
 public class CallSiteTransformer implements Instrumenter.TransformingAdvice {
 
-  private static Logger LOGGER = LoggerFactory.getLogger(CallSiteTransformer.class);
-
-  private static final Instrumenter.TransformingAdvice NO_OP =
-      (builder, typeDescription, classLoader, module, pd) -> builder;
-
-  public static final int ASM_API = Opcodes.ASM8;
-
-  private final Advices advices;
-
-  private final Instrumenter.TransformingAdvice helperInjector;
-
-  public CallSiteTransformer(@Nonnull final Advices advices) {
-    this("call-site-transformer", advices);
-  }
-
-  public CallSiteTransformer(@Nonnull final String name, @Nonnull final Advices advices) {
-    this.advices = advices;
-    final String[] helpers = advices.getHelpers();
-    this.helperInjector =
-        helpers == null || helpers.length == 0
-            ? NO_OP
-            : new HelperInjector(false, name, advices.getHelpers());
-  }
-
-  @Override
-  public @Nonnull DynamicType.Builder<?> transform(
-      @Nonnull final DynamicType.Builder<?> builder,
-      @Nonnull final TypeDescription type,
-      final ClassLoader classLoader,
-      final JavaModule module,
-      final ProtectionDomain pd) {
-    Advices discovered = advices.findAdvices(builder, type, classLoader);
-    if (discovered.isEmpty()) {
-      return builder;
-    }
-    final DynamicType.Builder<?> withHelpers =
-        helperInjector.transform(builder, type, classLoader, module, pd);
-    return withHelpers.visit(new CallSiteVisitorWrapper(discovered));
-  }
+    private static Logger LOGGER = LoggerFactory.getLogger(CallSiteTransformer.class);
+
+    private static final Instrumenter.TransformingAdvice NO_OP =
+            (builder, typeDescription, classLoader, module, pd) -> builder;
 
-  private static class CallSiteVisitorWrapper extends AsmVisitorWrapper.AbstractBase {
+    public static final int ASM_API = Opcodes.ASM8;
 
     private final Advices advices;
 
-    private CallSiteVisitorWrapper(@Nonnull final Advices advices) {
-      this.advices = advices;
+    private final Instrumenter.TransformingAdvice helperInjector;
+
+    public CallSiteTransformer(@Nonnull final Advices advices) {
+        this("call-site-transformer", advices);
     }
 
-    @Override
-    public int mergeWriter(final int flags) {
-      return flags | COMPUTE_MAXS;
+    public CallSiteTransformer(@Nonnull final String name, @Nonnull final Advices advices) {
+        this.advices = advices;
+        final String[] helpers = advices.getHelpers();
+        this.helperInjector =
+                helpers == null || helpers.length == 0 ? NO_OP : new HelperInjector(false, name, advices.getHelpers());
     }
 
     @Override
-    public @Nonnull ClassVisitor wrap(
-        @Nonnull final TypeDescription instrumentedType,
-        @Nonnull final ClassVisitor classVisitor,
-        @Nonnull final Implementation.Context implementationContext,
-        @Nonnull final TypePool typePool,
-        @Nonnull final FieldList<FieldDescription.InDefinedShape> fields,
-        @Nonnull final MethodList<?> methods,
-        final int writerFlags,
-        final int readerFlags) {
-      return new CallSiteClassVisitor(advices, classVisitor);
+    public @Nonnull DynamicType.Builder<?> transform(
+            @Nonnull final DynamicType.Builder<?> builder,
+            @Nonnull final TypeDescription type,
+            final ClassLoader classLoader,
+            final JavaModule module,
+            final ProtectionDomain pd) {
+        Advices discovered = advices.findAdvices(builder, type, classLoader);
+        if (discovered.isEmpty()) {
+            return builder;
+        }
+        final DynamicType.Builder<?> withHelpers = helperInjector.transform(builder, type, classLoader, module, pd);
+        return withHelpers.visit(new CallSiteVisitorWrapper(discovered));
     }
-  }
 
-  private static class CallSiteClassVisitor extends ClassVisitor {
+    private static class CallSiteVisitorWrapper extends AsmVisitorWrapper.AbstractBase {
 
-    private final Advices advices;
+        private final Advices advices;
 
-    private CallSiteClassVisitor(
-        @Nonnull final Advices advices, @Nonnull final ClassVisitor delegated) {
-      super(ASM_API, delegated);
-      this.advices = advices;
-    }
+        private CallSiteVisitorWrapper(@Nonnull final Advices advices) {
+            this.advices = advices;
+        }
 
-    @Override
-    public MethodVisitor visitMethod(
-        final int access,
-        final String name,
-        final String descriptor,
-        final String signature,
-        final String[] exceptions) {
-      final MethodVisitor delegated =
-          super.visitMethod(access, name, descriptor, signature, exceptions);
-      return "<init>".equals(name)
-          ? new CallSiteCtorMethodVisitor(advices, delegated)
-          : new CallSiteMethodVisitor(advices, delegated);
-    }
-  }
-
-  private static class CallSiteMethodVisitor extends MethodVisitor
-      implements CallSiteAdvice.MethodHandler {
-    protected final Advices advices;
-    protected int lastOpcode;
-    protected boolean newFollowedByDup;
-
-    private CallSiteMethodVisitor(
-        @Nonnull final Advices advices, @Nonnull final MethodVisitor delegated) {
-      super(ASM_API, delegated);
-      this.advices = advices;
-    }
+        @Override
+        public int mergeWriter(final int flags) {
+            return flags | COMPUTE_MAXS;
+        }
 
-    @Override
-    public void visitTypeInsn(int opcode, String type) {
-      lastOpcode = opcode;
-      if (opcode == Opcodes.NEW) {
-        newFollowedByDup = false;
-      }
-      super.visitTypeInsn(opcode, type);
+        @Override
+        public @Nonnull ClassVisitor wrap(
+                @Nonnull final TypeDescription instrumentedType,
+                @Nonnull final ClassVisitor classVisitor,
+                @Nonnull final Implementation.Context implementationContext,
+                @Nonnull final TypePool typePool,
+                @Nonnull final FieldList<FieldDescription.InDefinedShape> fields,
+                @Nonnull final MethodList<?> methods,
+                final int writerFlags,
+                final int readerFlags) {
+            return new CallSiteClassVisitor(advices, classVisitor);
+        }
     }
 
-    @Override
-    public void visitInsn(final int opcode) {
-      if (opcode == Opcodes.DUP) {
-        newFollowedByDup = lastOpcode == Opcodes.NEW;
-      }
-      lastOpcode = opcode;
-      super.visitInsn(opcode);
-    }
+    private static class CallSiteClassVisitor extends ClassVisitor {
 
-    @Override
-    public void visitMethodInsn(
-        final int opcode,
-        final String owner,
-        final String name,
-        final String descriptor,
-        final boolean isInterface) {
-      lastOpcode = opcode;
-      CallSiteAdvice advice = advices.findAdvice(owner, name, descriptor);
-      if (applyInvokeAdvice(advice, name, descriptor)) {
-        invokeAdvice((InvokeAdvice) advice, opcode, owner, name, descriptor, isInterface);
-      } else {
-        mv.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-      }
-    }
+        private final Advices advices;
 
-    protected void invokeAdvice(
-        final InvokeAdvice advice,
-        final int opcode,
-        final String owner,
-        final String name,
-        final String descriptor,
-        final boolean isInterface) {
-      advice.apply(this, opcode, owner, name, descriptor, isInterface);
-    }
+        private CallSiteClassVisitor(@Nonnull final Advices advices, @Nonnull final ClassVisitor delegated) {
+            super(ASM_API, delegated);
+            this.advices = advices;
+        }
 
-    @Override
-    public void visitInvokeDynamicInsn(
-        final String name,
-        final String descriptor,
-        final Handle bootstrapMethodHandle,
-        final Object... bootstrapMethodArguments) {
-      lastOpcode = Opcodes.INVOKEDYNAMIC;
-      CallSiteAdvice advice = advices.findAdvice(bootstrapMethodHandle);
-      if (advice instanceof InvokeDynamicAdvice) {
-        invokeDynamicAdvice(
-            (InvokeDynamicAdvice) advice,
-            name,
-            descriptor,
-            bootstrapMethodHandle,
-            bootstrapMethodArguments);
-      } else {
-        mv.visitInvokeDynamicInsn(
-            name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
-      }
+        @Override
+        public MethodVisitor visitMethod(
+                final int access,
+                final String name,
+                final String descriptor,
+                final String signature,
+                final String[] exceptions) {
+            final MethodVisitor delegated = super.visitMethod(access, name, descriptor, signature, exceptions);
+            return "<init>".equals(name)
+                    ? new CallSiteCtorMethodVisitor(advices, delegated)
+                    : new CallSiteMethodVisitor(advices, delegated);
+        }
     }
 
-    protected void invokeDynamicAdvice(
-        final InvokeDynamicAdvice advice,
-        final String name,
-        final String descriptor,
-        final Handle bootstrapMethodHandle,
-        final Object... bootstrapMethodArguments) {
-      advice.apply(this, name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
-    }
+    private static class CallSiteMethodVisitor extends MethodVisitor implements CallSiteAdvice.MethodHandler {
+        protected final Advices advices;
+        protected int lastOpcode;
+        protected boolean newFollowedByDup;
 
-    @Override
-    public void instruction(final int opcode) {
-      mv.visitInsn(opcode);
-    }
+        private CallSiteMethodVisitor(@Nonnull final Advices advices, @Nonnull final MethodVisitor delegated) {
+            super(ASM_API, delegated);
+            this.advices = advices;
+        }
 
-    @Override
-    public void instruction(final int opcode, final int parameter) {
-      mv.visitIntInsn(opcode, parameter);
-    }
+        @Override
+        public void visitTypeInsn(int opcode, String type) {
+            lastOpcode = opcode;
+            if (opcode == Opcodes.NEW) {
+                newFollowedByDup = false;
+            }
+            super.visitTypeInsn(opcode, type);
+        }
 
-    @Override
-    public void instruction(final int opcode, final String type) {
-      mv.visitTypeInsn(opcode, type);
-    }
+        @Override
+        public void visitInsn(final int opcode) {
+            if (opcode == Opcodes.DUP) {
+                newFollowedByDup = lastOpcode == Opcodes.NEW;
+            }
+            lastOpcode = opcode;
+            super.visitInsn(opcode);
+        }
 
-    @Override
-    public void loadConstant(final Object constant) {
-      mv.visitLdcInsn(constant);
-    }
+        @Override
+        public void visitMethodInsn(
+                final int opcode,
+                final String owner,
+                final String name,
+                final String descriptor,
+                final boolean isInterface) {
+            lastOpcode = opcode;
+            CallSiteAdvice advice = advices.findAdvice(owner, name, descriptor);
+            if (applyInvokeAdvice(advice, name, descriptor)) {
+                invokeAdvice((InvokeAdvice) advice, opcode, owner, name, descriptor, isInterface);
+            } else {
+                mv.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+            }
+        }
 
-    @Override
-    public void loadConstantArray(final Object[] array) {
-      CallSiteUtils.pushConstantArray(mv, array);
-    }
+        protected void invokeAdvice(
+                final InvokeAdvice advice,
+                final int opcode,
+                final String owner,
+                final String name,
+                final String descriptor,
+                final boolean isInterface) {
+            advice.apply(this, opcode, owner, name, descriptor, isInterface);
+        }
 
-    @Override
-    public void field(
-        final int opcode, final String owner, final String field, final String descriptor) {
-      mv.visitFieldInsn(opcode, owner, field, descriptor);
-    }
+        @Override
+        public void visitInvokeDynamicInsn(
+                final String name,
+                final String descriptor,
+                final Handle bootstrapMethodHandle,
+                final Object... bootstrapMethodArguments) {
+            lastOpcode = Opcodes.INVOKEDYNAMIC;
+            CallSiteAdvice advice = advices.findAdvice(bootstrapMethodHandle);
+            if (advice instanceof InvokeDynamicAdvice) {
+                invokeDynamicAdvice(
+                        (InvokeDynamicAdvice) advice,
+                        name,
+                        descriptor,
+                        bootstrapMethodHandle,
+                        bootstrapMethodArguments);
+            } else {
+                mv.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
+            }
+        }
 
-    @Override
-    public void method(
-        final int opcode,
-        final String owner,
-        final String name,
-        final String descriptor,
-        final boolean isInterface) {
-      mv.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-    }
+        protected void invokeDynamicAdvice(
+                final InvokeDynamicAdvice advice,
+                final String name,
+                final String descriptor,
+                final Handle bootstrapMethodHandle,
+                final Object... bootstrapMethodArguments) {
+            advice.apply(this, name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
+        }
 
-    @Override
-    public void advice(String owner, String name, String descriptor) {
-      mv.visitMethodInsn(Opcodes.INVOKESTATIC, owner, name, descriptor, false);
-    }
+        @Override
+        public void instruction(final int opcode) {
+            mv.visitInsn(opcode);
+        }
 
-    @Override
-    public void invokeDynamic(
-        final String name,
-        final String descriptor,
-        final Handle bootstrapMethodHandle,
-        final Object... bootstrapMethodArguments) {
-      mv.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
-    }
+        @Override
+        public void instruction(final int opcode, final int parameter) {
+            mv.visitIntInsn(opcode, parameter);
+        }
 
-    @Override
-    public void dupParameters(final String methodDescriptor, final StackDupMode mode) {
-      final Type method = Type.getMethodType(methodDescriptor);
-      if (method.getArgumentTypes().length == 0) {
-        return;
-      }
-      CallSiteUtils.dup(mv, method.getArgumentTypes(), mode);
-    }
+        @Override
+        public void instruction(final int opcode, final String type) {
+            mv.visitTypeInsn(opcode, type);
+        }
 
-    @Override
-    public void dupParameters(final String methodDescriptor, int[] indices, String owner) {
-      final Type method = Type.getMethodType(methodDescriptor);
-      Type[] stackArgTypes;
-      if (owner != null) {
-        stackArgTypes = methodParamTypesWithThis(owner, methodDescriptor);
-        int[] newIndices = new int[indices.length];
-        for (int i = 0; i < indices.length; i++) {
-          newIndices[i] = indices[i] + 1;
-        }
-        indices = newIndices;
-      } else {
-        stackArgTypes = method.getArgumentTypes();
-      }
-      CallSiteUtils.dup(mv, stackArgTypes, indices);
-    }
+        @Override
+        public void loadConstant(final Object constant) {
+            mv.visitLdcInsn(constant);
+        }
 
-    @Override
-    public void dupInvoke(
-        final String owner, final String methodDescriptor, final StackDupMode mode) {
-      final Type[] parameters = methodParamTypesWithThis(owner, methodDescriptor);
-      CallSiteUtils.dup(mv, parameters, mode);
-    }
+        @Override
+        public void loadConstantArray(final Object[] array) {
+            CallSiteUtils.pushConstantArray(mv, array);
+        }
 
-    @Override
-    public void dupInvoke(String owner, String methodDescriptor, int[] parameterIndices) {
-      final Type[] methodParameterTypesWithThis = methodParamTypesWithThis(owner, methodDescriptor);
-
-      int[] parameterIndicesWithThis = new int[parameterIndices.length + 1];
-      parameterIndicesWithThis[0] = 0;
-      for (int i = 0; i < parameterIndices.length; i++) {
-        parameterIndicesWithThis[i + 1] = parameterIndices[i] + 1;
-      }
-      CallSiteUtils.dup(mv, methodParameterTypesWithThis, parameterIndicesWithThis);
-    }
+        @Override
+        public void field(final int opcode, final String owner, final String field, final String descriptor) {
+            mv.visitFieldInsn(opcode, owner, field, descriptor);
+        }
 
-    private Type[] methodParamTypesWithThis(String owner, String methodDescriptor) {
-      final Type method = Type.getMethodType(methodDescriptor);
-      Type ownerType = Type.getType("L" + owner + ";");
-      final Type[] methodParameterTypesWithThis = new Type[method.getArgumentTypes().length + 1];
-      methodParameterTypesWithThis[0] = ownerType;
-      System.arraycopy(
-          method.getArgumentTypes(),
-          0,
-          methodParameterTypesWithThis,
-          1,
-          methodParameterTypesWithThis.length - 1);
-      return methodParameterTypesWithThis;
-    }
+        @Override
+        public void method(
+                final int opcode,
+                final String owner,
+                final String name,
+                final String descriptor,
+                final boolean isInterface) {
+            mv.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+        }
 
-    protected boolean applyInvokeAdvice(
-        final CallSiteAdvice advice, final String methodName, final String methodDescriptor) {
-      if (!(advice instanceof InvokeAdvice)) {
-        return false;
-      }
-      if (!"<init>".equals(methodName)) {
-        return true;
-      }
-      // TODO: do not ignore ctors where there is no DUP after NEW
-      return newFollowedByDup;
-    }
+        @Override
+        public void advice(String owner, String name, String descriptor) {
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, owner, name, descriptor, false);
+        }
 
-    // Keep track of the latest opcode to match a DUP with its previous NEW
-    @Override
-    public void visitIntInsn(final int opcode, final int operand) {
-      lastOpcode = opcode;
-      super.visitIntInsn(opcode, operand);
-    }
+        @Override
+        public void invokeDynamic(
+                final String name,
+                final String descriptor,
+                final Handle bootstrapMethodHandle,
+                final Object... bootstrapMethodArguments) {
+            mv.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
+        }
 
-    @Override
-    public void visitVarInsn(final int opcode, final int var) {
-      lastOpcode = opcode;
-      super.visitVarInsn(opcode, var);
-    }
+        @Override
+        public void dupParameters(final String methodDescriptor, final StackDupMode mode) {
+            final Type method = Type.getMethodType(methodDescriptor);
+            if (method.getArgumentTypes().length == 0) {
+                return;
+            }
+            CallSiteUtils.dup(mv, method.getArgumentTypes(), mode);
+        }
 
-    @Override
-    public void visitFieldInsn(
-        final int opcode, final String owner, final String name, final String descriptor) {
-      lastOpcode = opcode;
-      super.visitFieldInsn(opcode, owner, name, descriptor);
-    }
+        @Override
+        public void dupParameters(final String methodDescriptor, int[] indices, String owner) {
+            final Type method = Type.getMethodType(methodDescriptor);
+            Type[] stackArgTypes;
+            if (owner != null) {
+                stackArgTypes = methodParamTypesWithThis(owner, methodDescriptor);
+                int[] newIndices = new int[indices.length];
+                for (int i = 0; i < indices.length; i++) {
+                    newIndices[i] = indices[i] + 1;
+                }
+                indices = newIndices;
+            } else {
+                stackArgTypes = method.getArgumentTypes();
+            }
+            CallSiteUtils.dup(mv, stackArgTypes, indices);
+        }
 
-    @Override
-    public void visitJumpInsn(final int opcode, final Label label) {
-      lastOpcode = opcode;
-      super.visitJumpInsn(opcode, label);
-    }
+        @Override
+        public void dupInvoke(final String owner, final String methodDescriptor, final StackDupMode mode) {
+            final Type[] parameters = methodParamTypesWithThis(owner, methodDescriptor);
+            CallSiteUtils.dup(mv, parameters, mode);
+        }
 
-    @Override
-    public void visitLdcInsn(final Object value) {
-      lastOpcode = Opcodes.LDC;
-      super.visitLdcInsn(value);
-    }
+        @Override
+        public void dupInvoke(String owner, String methodDescriptor, int[] parameterIndices) {
+            final Type[] methodParameterTypesWithThis = methodParamTypesWithThis(owner, methodDescriptor);
 
-    @Override
-    public void visitIincInsn(final int var, final int increment) {
-      lastOpcode = Opcodes.IINC;
-      super.visitIincInsn(var, increment);
-    }
+            int[] parameterIndicesWithThis = new int[parameterIndices.length + 1];
+            parameterIndicesWithThis[0] = 0;
+            for (int i = 0; i < parameterIndices.length; i++) {
+                parameterIndicesWithThis[i + 1] = parameterIndices[i] + 1;
+            }
+            CallSiteUtils.dup(mv, methodParameterTypesWithThis, parameterIndicesWithThis);
+        }
 
-    @Override
-    public void visitTableSwitchInsn(
-        final int min, final int max, final Label dflt, final Label... labels) {
-      lastOpcode = Opcodes.TABLESWITCH;
-      super.visitTableSwitchInsn(min, max, dflt, labels);
-    }
+        private Type[] methodParamTypesWithThis(String owner, String methodDescriptor) {
+            final Type method = Type.getMethodType(methodDescriptor);
+            Type ownerType = Type.getType("L" + owner + ";");
+            final Type[] methodParameterTypesWithThis = new Type[method.getArgumentTypes().length + 1];
+            methodParameterTypesWithThis[0] = ownerType;
+            System.arraycopy(
+                    method.getArgumentTypes(),
+                    0,
+                    methodParameterTypesWithThis,
+                    1,
+                    methodParameterTypesWithThis.length - 1);
+            return methodParameterTypesWithThis;
+        }
 
-    @Override
-    public void visitLookupSwitchInsn(final Label dflt, final int[] keys, final Label[] labels) {
-      lastOpcode = Opcodes.LOOKUPSWITCH;
-      super.visitLookupSwitchInsn(dflt, keys, labels);
-    }
+        protected boolean applyInvokeAdvice(
+                final CallSiteAdvice advice, final String methodName, final String methodDescriptor) {
+            if (!(advice instanceof InvokeAdvice)) {
+                return false;
+            }
+            if (!"<init>".equals(methodName)) {
+                return true;
+            }
+            // TODO: do not ignore ctors where there is no DUP after NEW
+            return newFollowedByDup;
+        }
 
-    @Override
-    public void visitMultiANewArrayInsn(final String descriptor, final int numDimensions) {
-      lastOpcode = Opcodes.MULTIANEWARRAY;
-      super.visitMultiANewArrayInsn(descriptor, numDimensions);
-    }
-  }
+        // Keep track of the latest opcode to match a DUP with its previous NEW
+        @Override
+        public void visitIntInsn(final int opcode, final int operand) {
+            lastOpcode = opcode;
+            super.visitIntInsn(opcode, operand);
+        }
 
-  private static class CallSiteCtorMethodVisitor extends CallSiteMethodVisitor {
+        @Override
+        public void visitVarInsn(final int opcode, final int var) {
+            lastOpcode = opcode;
+            super.visitVarInsn(opcode, var);
+        }
 
-    private final Deque<String> newInvocations = new LinkedList<>();
-    private boolean isSuperCall = false;
+        @Override
+        public void visitFieldInsn(final int opcode, final String owner, final String name, final String descriptor) {
+            lastOpcode = opcode;
+            super.visitFieldInsn(opcode, owner, name, descriptor);
+        }
 
-    private CallSiteCtorMethodVisitor(
-        @Nonnull final Advices advices, @Nonnull final MethodVisitor delegated) {
-      super(advices, delegated);
-    }
+        @Override
+        public void visitJumpInsn(final int opcode, final Label label) {
+            lastOpcode = opcode;
+            super.visitJumpInsn(opcode, label);
+        }
 
-    @Override
-    public void visitEnd() {
-      super.visitEnd();
-      if (!newInvocations.isEmpty()) {
-        LOGGER.debug(
-            SEND_TELEMETRY,
-            "There is an issue handling NEW bytecodes, remaining types {}",
-            newInvocations);
-      }
-    }
+        @Override
+        public void visitLdcInsn(final Object value) {
+            lastOpcode = Opcodes.LDC;
+            super.visitLdcInsn(value);
+        }
 
-    @Override
-    public void visitTypeInsn(final int opcode, final String type) {
-      if (opcode == Opcodes.NEW) {
-        newInvocations.addLast(type);
-      }
-      super.visitTypeInsn(opcode, type);
-    }
+        @Override
+        public void visitIincInsn(final int var, final int increment) {
+            lastOpcode = Opcodes.IINC;
+            super.visitIincInsn(var, increment);
+        }
 
-    @Override
-    public void visitMethodInsn(
-        final int opcode,
-        final String owner,
-        final String name,
-        final String descriptor,
-        final boolean isInterface) {
-      try {
-        if (opcode == Opcodes.INVOKESPECIAL && "<init>".equals(name)) {
-          if (owner.equals(newInvocations.peekLast())) {
-            newInvocations.removeLast();
-            isSuperCall = false;
-          } else {
-            // no new before call to <init>
-            isSuperCall = true;
-          }
-        }
-        super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-      } finally {
-        isSuperCall = false;
-      }
-    }
+        @Override
+        public void visitTableSwitchInsn(final int min, final int max, final Label dflt, final Label... labels) {
+            lastOpcode = Opcodes.TABLESWITCH;
+            super.visitTableSwitchInsn(min, max, dflt, labels);
+        }
 
-    @Override
-    public void advice(final String owner, final String name, final String descriptor) {
-      if (isSuperCall) {
-        mv.visitIntInsn(Opcodes.ALOAD, 0); // append this to the stack after super call
-        mv.visitMethodInsn(Opcodes.INVOKESTATIC, owner, name, descriptor, false);
-        mv.visitInsn(Opcodes.POP); // pop the result of the advice call
-      } else {
-        mv.visitMethodInsn(Opcodes.INVOKESTATIC, owner, name, descriptor, false);
-      }
-    }
+        @Override
+        public void visitLookupSwitchInsn(final Label dflt, final int[] keys, final Label[] labels) {
+            lastOpcode = Opcodes.LOOKUPSWITCH;
+            super.visitLookupSwitchInsn(dflt, keys, labels);
+        }
 
-    @Override
-    public void dupParameters(final String methodDescriptor, final StackDupMode mode) {
-      super.dupParameters(
-          methodDescriptor, isSuperCall ? StackDupMode.PREPEND_ARRAY_SUPER_CTOR : mode);
+        @Override
+        public void visitMultiANewArrayInsn(final String descriptor, final int numDimensions) {
+            lastOpcode = Opcodes.MULTIANEWARRAY;
+            super.visitMultiANewArrayInsn(descriptor, numDimensions);
+        }
     }
 
-    @Override
-    protected void invokeAdvice(
-        final InvokeAdvice advice,
-        final int opcode,
-        final String owner,
-        final String name,
-        final String descriptor,
-        final boolean isInterface) {
-      if (isSuperCall && advices.typeOf(advice) != AFTER) {
-        // TODO APPSEC-57009 calls to super are only instrumented by after call sites
-        // just ignore the advice and keep on
-        mv.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-      } else {
-        super.invokeAdvice(advice, opcode, owner, name, descriptor, isInterface);
-      }
-    }
+    private static class CallSiteCtorMethodVisitor extends CallSiteMethodVisitor {
 
-    @Override
-    protected boolean applyInvokeAdvice(
-        final CallSiteAdvice advice, final String methodName, final String descriptor) {
-      if (isSuperCall) {
-        return advice instanceof InvokeAdvice && "<init>".equals(methodName);
-      }
-      return super.applyInvokeAdvice(advice, methodName, descriptor);
+        private final Deque<String> newInvocations = new LinkedList<>();
+        private boolean isSuperCall = false;
+
+        private CallSiteCtorMethodVisitor(@Nonnull final Advices advices, @Nonnull final MethodVisitor delegated) {
+            super(advices, delegated);
+        }
+
+        @Override
+        public void visitEnd() {
+            super.visitEnd();
+            if (!newInvocations.isEmpty()) {
+                LOGGER.debug(
+                        SEND_TELEMETRY, "There is an issue handling NEW bytecodes, remaining types {}", newInvocations);
+            }
+        }
+
+        @Override
+        public void visitTypeInsn(final int opcode, final String type) {
+            if (opcode == Opcodes.NEW) {
+                newInvocations.addLast(type);
+            }
+            super.visitTypeInsn(opcode, type);
+        }
+
+        @Override
+        public void visitMethodInsn(
+                final int opcode,
+                final String owner,
+                final String name,
+                final String descriptor,
+                final boolean isInterface) {
+            try {
+                if (opcode == Opcodes.INVOKESPECIAL && "<init>".equals(name)) {
+                    if (owner.equals(newInvocations.peekLast())) {
+                        newInvocations.removeLast();
+                        isSuperCall = false;
+                    } else {
+                        // no new before call to <init>
+                        isSuperCall = true;
+                    }
+                }
+                super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+            } finally {
+                isSuperCall = false;
+            }
+        }
+
+        @Override
+        public void advice(final String owner, final String name, final String descriptor) {
+            if (isSuperCall) {
+                mv.visitIntInsn(Opcodes.ALOAD, 0); // append this to the stack after super call
+                mv.visitMethodInsn(Opcodes.INVOKESTATIC, owner, name, descriptor, false);
+                mv.visitInsn(Opcodes.POP); // pop the result of the advice call
+            } else {
+                mv.visitMethodInsn(Opcodes.INVOKESTATIC, owner, name, descriptor, false);
+            }
+        }
+
+        @Override
+        public void dupParameters(final String methodDescriptor, final StackDupMode mode) {
+            super.dupParameters(methodDescriptor, isSuperCall ? StackDupMode.PREPEND_ARRAY_SUPER_CTOR : mode);
+        }
+
+        @Override
+        protected void invokeAdvice(
+                final InvokeAdvice advice,
+                final int opcode,
+                final String owner,
+                final String name,
+                final String descriptor,
+                final boolean isInterface) {
+            if (isSuperCall && advices.typeOf(advice) != AFTER) {
+                // TODO APPSEC-57009 calls to super are only instrumented by after call sites
+                // just ignore the advice and keep on
+                mv.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+            } else {
+                super.invokeAdvice(advice, opcode, owner, name, descriptor, isInterface);
+            }
+        }
+
+        @Override
+        protected boolean applyInvokeAdvice(
+                final CallSiteAdvice advice, final String methodName, final String descriptor) {
+            if (isSuperCall) {
+                return advice instanceof InvokeAdvice && "<init>".equals(methodName);
+            }
+            return super.applyInvokeAdvice(advice, methodName, descriptor);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteUtils.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteUtils.java
index 39511a60a76..2941429652a 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteUtils.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteUtils.java
@@ -35,401 +35,391 @@
 
 public abstract class CallSiteUtils {
 
-  public static final String OBJET_TYPE = "java/lang/Object";
-  private static final BoxingHandler[] BOX_HANDLERS = new BoxingHandler[Type.METHOD + 1];
-  private static final Map<String, int[]> STACK_MANIP_TABLE = new HashMap<>();
-
-  static {
-    BOX_HANDLERS[Type.BOOLEAN] = new JdkBoxingHandler("java/lang/Boolean", "Z", "booleanValue");
-    BOX_HANDLERS[Type.CHAR] = new JdkBoxingHandler("java/lang/Character", "C", "charValue");
-    BOX_HANDLERS[Type.BYTE] = new JdkBoxingHandler("java/lang/Byte", "B", "byteValue");
-    BOX_HANDLERS[Type.SHORT] = new JdkBoxingHandler("java/lang/Short", "S", "shortValue");
-    BOX_HANDLERS[Type.INT] = new JdkBoxingHandler("java/lang/Integer", "I", "intValue");
-    BOX_HANDLERS[Type.FLOAT] = new JdkBoxingHandler("java/lang/Float", "F", "floatValue");
-    BOX_HANDLERS[Type.LONG] = new JdkBoxingHandler("java/lang/Long", "J", "longValue");
-    BOX_HANDLERS[Type.DOUBLE] = new JdkBoxingHandler("java/lang/Double", "D", "doubleValue");
-
-    STACK_MANIP_TABLE.put("12|1", new int[] {SWAP, DUP_X1});
-    STACK_MANIP_TABLE.put("12L|1", new int[] {DUP2_X1, POP2, DUP_X2});
-    STACK_MANIP_TABLE.put("1L2|1L", new int[] {DUP_X2, POP, DUP2_X1});
-    STACK_MANIP_TABLE.put("1L2L|1L", new int[] {DUP2_X2, POP2, DUP2_X2});
-    STACK_MANIP_TABLE.put("123|1", new int[] {DUP2_X1, POP2, DUP_X2});
-    STACK_MANIP_TABLE.put("123L|1", new int[] {DUP2_X2, POP2, DUP2_X2, POP});
-    STACK_MANIP_TABLE.put("1L23|1L", new int[] {DUP2_X2, POP2, DUP2_X2});
-    STACK_MANIP_TABLE.put("123|12", new int[] {DUP_X2, POP, DUP2_X1});
-    STACK_MANIP_TABLE.put("123L|12", new int[] {DUP2_X2, POP2, DUP2_X2});
-    STACK_MANIP_TABLE.put(
-        "1L23|1L2", new int[] {DUP2_X2, POP2, DUP2_X2, DUP2_X2, POP2, DUP2_X2, POP});
-    STACK_MANIP_TABLE.put("123|13", new int[] {DUP2_X1, POP2, DUP_X2, SWAP, DUP_X1});
-    STACK_MANIP_TABLE.put(
-        "123L|13L", new int[] {DUP2_X2, POP2, DUP2_X2, POP, DUP_X2, POP, DUP2_X1});
-    STACK_MANIP_TABLE.put("1L23|1L3", new int[] {DUP2_X2, POP2, DUP2_X2, DUP2_X1, POP2, DUP_X2});
-    STACK_MANIP_TABLE.put("1234|1", new int[] {DUP2_X2, POP2, DUP2_X2, POP});
-    STACK_MANIP_TABLE.put("1234|12", new int[] {DUP2_X2, POP2, DUP2_X2});
-    STACK_MANIP_TABLE.put("1234|13", new int[] {SWAP, DUP2_X2, POP2, DUP2_X2, POP, SWAP, DUP_X2});
-    STACK_MANIP_TABLE.put("1234|14", new int[] {DUP2_X2, POP2, DUP2_X2, POP, SWAP, DUP_X1});
-    STACK_MANIP_TABLE.put("1234|124", new int[] {DUP2_X2, POP2, DUP2_X2, DUP2_X1, POP2, DUP_X2});
-    STACK_MANIP_TABLE.put(
-        "1234|134", new int[] {DUP2_X2, POP2, DUP2_X2, POP, DUP_X2, POP, DUP2_X1});
-  }
-
-  private CallSiteUtils() {}
-
-  public static void swap(final MethodVisitor mv, final int secondToLastSize, final int lastSize) {
-    if (secondToLastSize == 1 && lastSize == 1) {
-      mv.visitInsn(SWAP);
-    } else if (secondToLastSize == 2 && lastSize == 2) {
-      mv.visitInsn(DUP2_X2);
-      mv.visitInsn(POP2);
-    } else if (lastSize == 1) {
-      mv.visitInsn(DUP_X2);
-      mv.visitInsn(POP);
-    } else {
-      mv.visitInsn(DUP2_X1);
-      mv.visitInsn(POP2);
+    public static final String OBJET_TYPE = "java/lang/Object";
+    private static final BoxingHandler[] BOX_HANDLERS = new BoxingHandler[Type.METHOD + 1];
+    private static final Map<String, int[]> STACK_MANIP_TABLE = new HashMap<>();
+
+    static {
+        BOX_HANDLERS[Type.BOOLEAN] = new JdkBoxingHandler("java/lang/Boolean", "Z", "booleanValue");
+        BOX_HANDLERS[Type.CHAR] = new JdkBoxingHandler("java/lang/Character", "C", "charValue");
+        BOX_HANDLERS[Type.BYTE] = new JdkBoxingHandler("java/lang/Byte", "B", "byteValue");
+        BOX_HANDLERS[Type.SHORT] = new JdkBoxingHandler("java/lang/Short", "S", "shortValue");
+        BOX_HANDLERS[Type.INT] = new JdkBoxingHandler("java/lang/Integer", "I", "intValue");
+        BOX_HANDLERS[Type.FLOAT] = new JdkBoxingHandler("java/lang/Float", "F", "floatValue");
+        BOX_HANDLERS[Type.LONG] = new JdkBoxingHandler("java/lang/Long", "J", "longValue");
+        BOX_HANDLERS[Type.DOUBLE] = new JdkBoxingHandler("java/lang/Double", "D", "doubleValue");
+
+        STACK_MANIP_TABLE.put("12|1", new int[] {SWAP, DUP_X1});
+        STACK_MANIP_TABLE.put("12L|1", new int[] {DUP2_X1, POP2, DUP_X2});
+        STACK_MANIP_TABLE.put("1L2|1L", new int[] {DUP_X2, POP, DUP2_X1});
+        STACK_MANIP_TABLE.put("1L2L|1L", new int[] {DUP2_X2, POP2, DUP2_X2});
+        STACK_MANIP_TABLE.put("123|1", new int[] {DUP2_X1, POP2, DUP_X2});
+        STACK_MANIP_TABLE.put("123L|1", new int[] {DUP2_X2, POP2, DUP2_X2, POP});
+        STACK_MANIP_TABLE.put("1L23|1L", new int[] {DUP2_X2, POP2, DUP2_X2});
+        STACK_MANIP_TABLE.put("123|12", new int[] {DUP_X2, POP, DUP2_X1});
+        STACK_MANIP_TABLE.put("123L|12", new int[] {DUP2_X2, POP2, DUP2_X2});
+        STACK_MANIP_TABLE.put("1L23|1L2", new int[] {DUP2_X2, POP2, DUP2_X2, DUP2_X2, POP2, DUP2_X2, POP});
+        STACK_MANIP_TABLE.put("123|13", new int[] {DUP2_X1, POP2, DUP_X2, SWAP, DUP_X1});
+        STACK_MANIP_TABLE.put("123L|13L", new int[] {DUP2_X2, POP2, DUP2_X2, POP, DUP_X2, POP, DUP2_X1});
+        STACK_MANIP_TABLE.put("1L23|1L3", new int[] {DUP2_X2, POP2, DUP2_X2, DUP2_X1, POP2, DUP_X2});
+        STACK_MANIP_TABLE.put("1234|1", new int[] {DUP2_X2, POP2, DUP2_X2, POP});
+        STACK_MANIP_TABLE.put("1234|12", new int[] {DUP2_X2, POP2, DUP2_X2});
+        STACK_MANIP_TABLE.put("1234|13", new int[] {SWAP, DUP2_X2, POP2, DUP2_X2, POP, SWAP, DUP_X2});
+        STACK_MANIP_TABLE.put("1234|14", new int[] {DUP2_X2, POP2, DUP2_X2, POP, SWAP, DUP_X1});
+        STACK_MANIP_TABLE.put("1234|124", new int[] {DUP2_X2, POP2, DUP2_X2, DUP2_X1, POP2, DUP_X2});
+        STACK_MANIP_TABLE.put("1234|134", new int[] {DUP2_X2, POP2, DUP2_X2, POP, DUP_X2, POP, DUP2_X1});
     }
-  }
-
-  public static void pushInteger(final MethodVisitor mv, final int value) {
-    switch (value) {
-      case -1:
-        mv.visitInsn(ICONST_M1);
-        break;
-      case 0:
-        mv.visitInsn(ICONST_0);
-        break;
-      case 1:
-        mv.visitInsn(ICONST_1);
-        break;
-      case 2:
-        mv.visitInsn(ICONST_2);
-        break;
-      case 3:
-        mv.visitInsn(ICONST_3);
-        break;
-      case 4:
-        mv.visitInsn(ICONST_4);
-        break;
-      case 5:
-        mv.visitInsn(ICONST_5);
-        break;
-      default:
-        if (value < Short.MIN_VALUE || value > Short.MAX_VALUE) {
-          mv.visitLdcInsn(value);
-        } else if (value < Byte.MIN_VALUE || value > Byte.MAX_VALUE) {
-          mv.visitIntInsn(SIPUSH, value);
+
+    private CallSiteUtils() {}
+
+    public static void swap(final MethodVisitor mv, final int secondToLastSize, final int lastSize) {
+        if (secondToLastSize == 1 && lastSize == 1) {
+            mv.visitInsn(SWAP);
+        } else if (secondToLastSize == 2 && lastSize == 2) {
+            mv.visitInsn(DUP2_X2);
+            mv.visitInsn(POP2);
+        } else if (lastSize == 1) {
+            mv.visitInsn(DUP_X2);
+            mv.visitInsn(POP);
         } else {
-          mv.visitIntInsn(BIPUSH, value);
+            mv.visitInsn(DUP2_X1);
+            mv.visitInsn(POP2);
         }
-        break;
     }
-  }
 
-  public static void pushConstantArray(final MethodVisitor mv, final Object[] constants) {
-    if (constants == null) {
-      mv.visitInsn(Opcodes.ACONST_NULL);
-      return;
-    }
-    pushInteger(mv, constants.length);
-    mv.visitTypeInsn(ANEWARRAY, OBJET_TYPE);
-    for (int i = 0; i < constants.length; i++) {
-      final Object constant = constants[i];
-      if (constant != null) {
-        mv.visitInsn(DUP);
-        pushInteger(mv, i);
-        mv.visitLdcInsn(constant);
-        box(mv, Type.getType(constant.getClass()));
-        mv.visitInsn(AASTORE);
-      }
+    public static void pushInteger(final MethodVisitor mv, final int value) {
+        switch (value) {
+            case -1:
+                mv.visitInsn(ICONST_M1);
+                break;
+            case 0:
+                mv.visitInsn(ICONST_0);
+                break;
+            case 1:
+                mv.visitInsn(ICONST_1);
+                break;
+            case 2:
+                mv.visitInsn(ICONST_2);
+                break;
+            case 3:
+                mv.visitInsn(ICONST_3);
+                break;
+            case 4:
+                mv.visitInsn(ICONST_4);
+                break;
+            case 5:
+                mv.visitInsn(ICONST_5);
+                break;
+            default:
+                if (value < Short.MIN_VALUE || value > Short.MAX_VALUE) {
+                    mv.visitLdcInsn(value);
+                } else if (value < Byte.MIN_VALUE || value > Byte.MAX_VALUE) {
+                    mv.visitIntInsn(SIPUSH, value);
+                } else {
+                    mv.visitIntInsn(BIPUSH, value);
+                }
+                break;
+        }
     }
-  }
-
-  public static void dup(final MethodVisitor mv, final Type[] parameters, final StackDupMode mode) {
-    switch (mode) {
-      case COPY:
-        dup(mv, parameters);
-        break;
-      case PREPEND_ARRAY:
-      case PREPEND_ARRAY_CTOR:
-      case PREPEND_ARRAY_SUPER_CTOR:
-      case APPEND_ARRAY:
-        dupN(mv, parameters, mode);
-        break;
+
+    public static void pushConstantArray(final MethodVisitor mv, final Object[] constants) {
+        if (constants == null) {
+            mv.visitInsn(Opcodes.ACONST_NULL);
+            return;
+        }
+        pushInteger(mv, constants.length);
+        mv.visitTypeInsn(ANEWARRAY, OBJET_TYPE);
+        for (int i = 0; i < constants.length; i++) {
+            final Object constant = constants[i];
+            if (constant != null) {
+                mv.visitInsn(DUP);
+                pushInteger(mv, i);
+                mv.visitLdcInsn(constant);
+                box(mv, Type.getType(constant.getClass()));
+                mv.visitInsn(AASTORE);
+            }
+        }
     }
-  }
 
-  private static void dup(final MethodVisitor mv, final Type[] parameters) {
-    int stackSize = 0;
-    for (final Type param : parameters) {
-      stackSize += param.getSize();
+    public static void dup(final MethodVisitor mv, final Type[] parameters, final StackDupMode mode) {
+        switch (mode) {
+            case COPY:
+                dup(mv, parameters);
+                break;
+            case PREPEND_ARRAY:
+            case PREPEND_ARRAY_CTOR:
+            case PREPEND_ARRAY_SUPER_CTOR:
+            case APPEND_ARRAY:
+                dupN(mv, parameters, mode);
+                break;
+        }
     }
-    switch (stackSize) {
-      case 0:
-        break;
-      case 1:
-        mv.visitInsn(DUP);
-        break;
-      case 2:
-        mv.visitInsn(DUP2);
-        break;
-      case 3:
-        if (parameters.length == 3 || parameters[0].getSize() == 2) {
-          dup3(mv);
-        } else {
-          dup3_C1_C2(mv);
+
+    private static void dup(final MethodVisitor mv, final Type[] parameters) {
+        int stackSize = 0;
+        for (final Type param : parameters) {
+            stackSize += param.getSize();
         }
-        break;
-      case 4:
-        if (parameters.length != 3 || parameters[1].getSize() == 1) {
-          dup4(mv);
-        } else {
-          // the case [C1, C2, C1] cannot be solved with regular stack operations
-          dupN(mv, parameters, COPY);
+        switch (stackSize) {
+            case 0:
+                break;
+            case 1:
+                mv.visitInsn(DUP);
+                break;
+            case 2:
+                mv.visitInsn(DUP2);
+                break;
+            case 3:
+                if (parameters.length == 3 || parameters[0].getSize() == 2) {
+                    dup3(mv);
+                } else {
+                    dup3_C1_C2(mv);
+                }
+                break;
+            case 4:
+                if (parameters.length != 3 || parameters[1].getSize() == 1) {
+                    dup4(mv);
+                } else {
+                    // the case [C1, C2, C1] cannot be solved with regular stack operations
+                    dupN(mv, parameters, COPY);
+                }
+                break;
+            default:
+                dupN(mv, parameters, COPY);
+                break;
         }
-        break;
-      default:
-        dupN(mv, parameters, COPY);
-        break;
     }
-  }
-
-  public static void dup(MethodVisitor mv, Type[] argumentTypes, int[] indices) {
-    int[] opcodes = lookupParamDupOpcodes(argumentTypes, indices);
-    if (opcodes == null) {
-      pushArray(mv, argumentTypes.length, argumentTypes);
-      loadArray(mv, argumentTypes.length, argumentTypes);
-      loadArray(mv, argumentTypes, indices);
-      mv.visitInsn(POP); // pop out array
-    } else {
-      for (int opcode : opcodes) {
-        mv.visitInsn(opcode);
-      }
+
+    public static void dup(MethodVisitor mv, Type[] argumentTypes, int[] indices) {
+        int[] opcodes = lookupParamDupOpcodes(argumentTypes, indices);
+        if (opcodes == null) {
+            pushArray(mv, argumentTypes.length, argumentTypes);
+            loadArray(mv, argumentTypes.length, argumentTypes);
+            loadArray(mv, argumentTypes, indices);
+            mv.visitInsn(POP); // pop out array
+        } else {
+            for (int opcode : opcodes) {
+                mv.visitInsn(opcode);
+            }
+        }
     }
-  }
 
-  private static int[] lookupParamDupOpcodes(Type[] argumentTypes, int[] indices) {
-    if (indices.length == 0) {
-      return null;
+    private static int[] lookupParamDupOpcodes(Type[] argumentTypes, int[] indices) {
+        if (indices.length == 0) {
+            return null;
+        }
+
+        // if we don't use index 0, we can reduce the stack manipulation to that
+        // of one where there are fewer arguments in the stack
+        int minIdx = Integer.MAX_VALUE;
+        for (int index : indices) {
+            minIdx = Math.min(minIdx, index);
+        }
+
+        StringBuilder sb = new StringBuilder();
+        for (int i = minIdx; i < argumentTypes.length; i++) {
+            sb.append(i + 1 - minIdx);
+            Type type = argumentTypes[i];
+            if (type == Type.LONG_TYPE || type == Type.DOUBLE_TYPE) {
+                sb.append('L');
+            }
+        }
+        sb.append('|');
+        for (int index : indices) {
+            Type type = argumentTypes[index];
+            sb.append(index + 1 - minIdx);
+            if (type == Type.LONG_TYPE || type == Type.DOUBLE_TYPE) {
+                sb.append('L');
+            }
+        }
+
+        return STACK_MANIP_TABLE.get(sb.toString());
     }
 
-    // if we don't use index 0, we can reduce the stack manipulation to that
-    // of one where there are fewer arguments in the stack
-    int minIdx = Integer.MAX_VALUE;
-    for (int index : indices) {
-      minIdx = Math.min(minIdx, index);
+    private static void dup3(final MethodVisitor mv) {
+        mv.visitInsn(DUP);
+        mv.visitInsn(DUP2_X2);
+        mv.visitInsn(POP2);
+        mv.visitInsn(DUP2_X2);
+        mv.visitInsn(DUP2_X1);
+        mv.visitInsn(POP2);
     }
 
-    StringBuilder sb = new StringBuilder();
-    for (int i = minIdx; i < argumentTypes.length; i++) {
-      sb.append(i + 1 - minIdx);
-      Type type = argumentTypes[i];
-      if (type == Type.LONG_TYPE || type == Type.DOUBLE_TYPE) {
-        sb.append('L');
-      }
+    private static void dup3_C1_C2(final MethodVisitor mv) {
+        mv.visitInsn(DUP2_X1);
+        mv.visitInsn(POP2);
+        mv.visitInsn(DUP);
+        mv.visitInsn(DUP2_X2);
+        mv.visitInsn(POP2);
+        mv.visitInsn(DUP2_X1);
     }
-    sb.append('|');
-    for (int index : indices) {
-      Type type = argumentTypes[index];
-      sb.append(index + 1 - minIdx);
-      if (type == Type.LONG_TYPE || type == Type.DOUBLE_TYPE) {
-        sb.append('L');
-      }
+
+    private static void dup4(final MethodVisitor mv) {
+        mv.visitInsn(DUP2_X2);
+        mv.visitInsn(POP2);
+        mv.visitInsn(DUP2_X2);
+        mv.visitInsn(DUP2_X2);
+        mv.visitInsn(POP2);
+        mv.visitInsn(DUP2_X2);
     }
 
-    return STACK_MANIP_TABLE.get(sb.toString());
-  }
-
-  private static void dup3(final MethodVisitor mv) {
-    mv.visitInsn(DUP);
-    mv.visitInsn(DUP2_X2);
-    mv.visitInsn(POP2);
-    mv.visitInsn(DUP2_X2);
-    mv.visitInsn(DUP2_X1);
-    mv.visitInsn(POP2);
-  }
-
-  private static void dup3_C1_C2(final MethodVisitor mv) {
-    mv.visitInsn(DUP2_X1);
-    mv.visitInsn(POP2);
-    mv.visitInsn(DUP);
-    mv.visitInsn(DUP2_X2);
-    mv.visitInsn(POP2);
-    mv.visitInsn(DUP2_X1);
-  }
-
-  private static void dup4(final MethodVisitor mv) {
-    mv.visitInsn(DUP2_X2);
-    mv.visitInsn(POP2);
-    mv.visitInsn(DUP2_X2);
-    mv.visitInsn(DUP2_X2);
-    mv.visitInsn(POP2);
-    mv.visitInsn(DUP2_X2);
-  }
-
-  /**
-   * This method duplicates the parameters in the stack by using a temporal array that will only
-   * live in the stack
-   */
-  private static void dupN(
-      final MethodVisitor mv, final Type[] parameters, final StackDupMode mode) {
-    final int arraySize = parameters.length;
-    pushArray(mv, arraySize, parameters);
-    switch (mode) {
-      case PREPEND_ARRAY:
-        mv.visitInsn(DUP);
-        loadArray(mv, arraySize, parameters);
-        mv.visitInsn(POP);
-        break;
-      case PREPEND_ARRAY_CTOR:
-        // move the array before the uninitialized entry created by NEW and DUP
-        // stack start = [uninitialized, uninitialized, arg_0, ..., arg_n]
-        // stack   end = [array, uninitialized, uninitialized, arg_0, ..., arg_n]
-        mv.visitInsn(DUP_X2);
-        loadArray(mv, arraySize, parameters);
-        mv.visitInsn(POP);
-        break;
-      case PREPEND_ARRAY_SUPER_CTOR:
-        // move the array before the uninitialized entry
-        // stack start = [uninitialized, arg_0, ..., arg_n]
-        // stack   end = [array, uninitialized, arg_0, ..., arg_n]
-        mv.visitInsn(DUP_X1);
-        loadArray(mv, arraySize, parameters);
-        mv.visitInsn(POP);
-        break;
-      case APPEND_ARRAY:
-        loadArray(mv, arraySize, parameters);
-        break;
-      case COPY:
-        loadArray(mv, arraySize, parameters);
-        loadArray(mv, arraySize, parameters);
-        mv.visitInsn(POP);
-        break;
+    /**
+     * This method duplicates the parameters in the stack by using a temporal array that will only
+     * live in the stack
+     */
+    private static void dupN(final MethodVisitor mv, final Type[] parameters, final StackDupMode mode) {
+        final int arraySize = parameters.length;
+        pushArray(mv, arraySize, parameters);
+        switch (mode) {
+            case PREPEND_ARRAY:
+                mv.visitInsn(DUP);
+                loadArray(mv, arraySize, parameters);
+                mv.visitInsn(POP);
+                break;
+            case PREPEND_ARRAY_CTOR:
+                // move the array before the uninitialized entry created by NEW and DUP
+                // stack start = [uninitialized, uninitialized, arg_0, ..., arg_n]
+                // stack   end = [array, uninitialized, uninitialized, arg_0, ..., arg_n]
+                mv.visitInsn(DUP_X2);
+                loadArray(mv, arraySize, parameters);
+                mv.visitInsn(POP);
+                break;
+            case PREPEND_ARRAY_SUPER_CTOR:
+                // move the array before the uninitialized entry
+                // stack start = [uninitialized, arg_0, ..., arg_n]
+                // stack   end = [array, uninitialized, arg_0, ..., arg_n]
+                mv.visitInsn(DUP_X1);
+                loadArray(mv, arraySize, parameters);
+                mv.visitInsn(POP);
+                break;
+            case APPEND_ARRAY:
+                loadArray(mv, arraySize, parameters);
+                break;
+            case COPY:
+                loadArray(mv, arraySize, parameters);
+                loadArray(mv, arraySize, parameters);
+                mv.visitInsn(POP);
+                break;
+        }
     }
-  }
-
-  private static void pushArray(
-      final MethodVisitor mv, final int arraySize, final Type[] parameters) {
-    pushInteger(mv, arraySize);
-    mv.visitTypeInsn(ANEWARRAY, OBJET_TYPE);
-    for (int i = parameters.length - 1; i >= 0; i--) {
-      final Type param = parameters[i];
-      final int stackObjectSize = param.getSize();
-      // 1. duplicate the array
-      mv.visitInsn(stackObjectSize == 1 ? DUP_X1 : DUP_X2);
-      swap(mv, stackObjectSize, 1); // [..., STACK_OBJECT, ARRAY]
-      // 2. store the index in the array
-      mv.visitIntInsn(BIPUSH, i);
-      swap(mv, stackObjectSize, 1); // [..., STACK_OBJECT, INDEX]
-      // 3. add the element to the array
-      box(mv, param);
-      mv.visitInsn(AASTORE);
+
+    private static void pushArray(final MethodVisitor mv, final int arraySize, final Type[] parameters) {
+        pushInteger(mv, arraySize);
+        mv.visitTypeInsn(ANEWARRAY, OBJET_TYPE);
+        for (int i = parameters.length - 1; i >= 0; i--) {
+            final Type param = parameters[i];
+            final int stackObjectSize = param.getSize();
+            // 1. duplicate the array
+            mv.visitInsn(stackObjectSize == 1 ? DUP_X1 : DUP_X2);
+            swap(mv, stackObjectSize, 1); // [..., STACK_OBJECT, ARRAY]
+            // 2. store the index in the array
+            mv.visitIntInsn(BIPUSH, i);
+            swap(mv, stackObjectSize, 1); // [..., STACK_OBJECT, INDEX]
+            // 3. add the element to the array
+            box(mv, param);
+            mv.visitInsn(AASTORE);
+        }
     }
-  }
 
-  private static void loadArray(
-      final MethodVisitor mv, final int arraySize, final Type[] parameters) {
-    for (int i = 0; i < arraySize; i++) {
-      final Type type = parameters[i];
-      loadNthArgFromArray(mv, type, i);
+    private static void loadArray(final MethodVisitor mv, final int arraySize, final Type[] parameters) {
+        for (int i = 0; i < arraySize; i++) {
+            final Type type = parameters[i];
+            loadNthArgFromArray(mv, type, i);
+        }
     }
-  }
 
-  private static void loadArray(MethodVisitor mv, Type[] methodArgumentTypes, int[] indices) {
-    for (int idx : indices) {
-      final Type type = methodArgumentTypes[idx];
-      loadNthArgFromArray(mv, type, idx);
+    private static void loadArray(MethodVisitor mv, Type[] methodArgumentTypes, int[] indices) {
+        for (int idx : indices) {
+            final Type type = methodArgumentTypes[idx];
+            loadNthArgFromArray(mv, type, idx);
+        }
     }
-  }
-
-  private static void loadNthArgFromArray(MethodVisitor mv, Type type, int argIdx) {
-    final int stackObjectSize = type.getSize();
-    // 1. duplicate the array
-    mv.visitInsn(DUP);
-    // 2. load the element from the array
-    pushInteger(mv, argIdx);
-    mv.visitInsn(AALOAD);
-    // 3. cast it to the proper value
-    if (!OBJET_TYPE.equals(type.getInternalName())) {
-      checkCast(mv, type);
-      unbox(mv, type);
+
+    private static void loadNthArgFromArray(MethodVisitor mv, Type type, int argIdx) {
+        final int stackObjectSize = type.getSize();
+        // 1. duplicate the array
+        mv.visitInsn(DUP);
+        // 2. load the element from the array
+        pushInteger(mv, argIdx);
+        mv.visitInsn(AALOAD);
+        // 3. cast it to the proper value
+        if (!OBJET_TYPE.equals(type.getInternalName())) {
+            checkCast(mv, type);
+            unbox(mv, type);
+        }
+        // 4. move the array to the end of the stack
+        swap(mv, 1, stackObjectSize); // [..., ARRAY, STACK_OBJECT]
     }
-    // 4. move the array to the end of the stack
-    swap(mv, 1, stackObjectSize); // [..., ARRAY, STACK_OBJECT]
-  }
-
-  private static void checkCast(final MethodVisitor mv, final Type parameter) {
-    if (parameter.getSort() == Type.OBJECT || parameter.getSort() == Type.ARRAY) {
-      mv.visitTypeInsn(CHECKCAST, parameter.getInternalName());
-    } else {
-      final BoxingHandler handler = BOX_HANDLERS[parameter.getSort()];
-      if (handler != null) {
-        mv.visitTypeInsn(CHECKCAST, handler.getBoxedType());
-      } else {
-        throw new IllegalArgumentException("Invalid type for 'CHECKCAST' operation: " + parameter);
-      }
+
+    private static void checkCast(final MethodVisitor mv, final Type parameter) {
+        if (parameter.getSort() == Type.OBJECT || parameter.getSort() == Type.ARRAY) {
+            mv.visitTypeInsn(CHECKCAST, parameter.getInternalName());
+        } else {
+            final BoxingHandler handler = BOX_HANDLERS[parameter.getSort()];
+            if (handler != null) {
+                mv.visitTypeInsn(CHECKCAST, handler.getBoxedType());
+            } else {
+                throw new IllegalArgumentException("Invalid type for 'CHECKCAST' operation: " + parameter);
+            }
+        }
     }
-  }
 
-  private static void box(final MethodVisitor mv, final Type parameter) {
-    final BoxingHandler handler = BOX_HANDLERS[parameter.getSort()];
-    if (handler != null) {
-      handler.box(mv);
+    private static void box(final MethodVisitor mv, final Type parameter) {
+        final BoxingHandler handler = BOX_HANDLERS[parameter.getSort()];
+        if (handler != null) {
+            handler.box(mv);
+        }
     }
-  }
 
-  private static void unbox(final MethodVisitor mv, final Type parameter) {
-    final BoxingHandler handler = BOX_HANDLERS[parameter.getSort()];
-    if (handler != null) {
-      handler.unbox(mv);
+    private static void unbox(final MethodVisitor mv, final Type parameter) {
+        final BoxingHandler handler = BOX_HANDLERS[parameter.getSort()];
+        if (handler != null) {
+            handler.unbox(mv);
+        }
     }
-  }
 
-  private interface BoxingHandler {
-    void box(MethodVisitor mv);
+    private interface BoxingHandler {
+        void box(MethodVisitor mv);
 
-    void unbox(MethodVisitor mv);
+        void unbox(MethodVisitor mv);
 
-    String getBoxedType();
-  }
+        String getBoxedType();
+    }
 
-  private static class JdkBoxingHandler implements BoxingHandler {
-    private final String boxedType;
-    private final String boxMethod;
-    private final String unboxMethod;
+    private static class JdkBoxingHandler implements BoxingHandler {
+        private final String boxedType;
+        private final String boxMethod;
+        private final String unboxMethod;
 
-    private final String boxDescriptor;
-    private final String unboxDescriptor;
+        private final String boxDescriptor;
+        private final String unboxDescriptor;
 
-    private JdkBoxingHandler(
-        final String boxedType, final String primitiveType, final String unboxMethod) {
-      this(boxedType, primitiveType, "valueOf", unboxMethod);
-    }
+        private JdkBoxingHandler(final String boxedType, final String primitiveType, final String unboxMethod) {
+            this(boxedType, primitiveType, "valueOf", unboxMethod);
+        }
 
-    private JdkBoxingHandler(
-        final String boxedType,
-        final String primitiveType,
-        final String boxMethod,
-        final String unboxMethod) {
-      this.boxedType = boxedType;
-      this.boxMethod = boxMethod;
-      this.unboxMethod = unboxMethod;
-      this.boxDescriptor = "(" + primitiveType + ")L" + boxedType + ";";
-      this.unboxDescriptor = "()" + primitiveType;
-    }
+        private JdkBoxingHandler(
+                final String boxedType, final String primitiveType, final String boxMethod, final String unboxMethod) {
+            this.boxedType = boxedType;
+            this.boxMethod = boxMethod;
+            this.unboxMethod = unboxMethod;
+            this.boxDescriptor = "(" + primitiveType + ")L" + boxedType + ";";
+            this.unboxDescriptor = "()" + primitiveType;
+        }
 
-    @Override
-    public void box(final MethodVisitor mv) {
-      mv.visitMethodInsn(INVOKESTATIC, boxedType, boxMethod, boxDescriptor, false);
-    }
+        @Override
+        public void box(final MethodVisitor mv) {
+            mv.visitMethodInsn(INVOKESTATIC, boxedType, boxMethod, boxDescriptor, false);
+        }
 
-    @Override
-    public void unbox(final MethodVisitor mv) {
-      mv.visitMethodInsn(INVOKEVIRTUAL, boxedType, unboxMethod, unboxDescriptor, false);
-    }
+        @Override
+        public void unbox(final MethodVisitor mv) {
+            mv.visitMethodInsn(INVOKEVIRTUAL, boxedType, unboxMethod, unboxDescriptor, false);
+        }
 
-    @Override
-    public String getBoxedType() {
-      return boxedType;
+        @Override
+        public String getBoxedType() {
+            return boxedType;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/ConstantPool.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/ConstantPool.java
index ed4f74e4595..94678fd40d2 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/ConstantPool.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/ConstantPool.java
@@ -4,128 +4,125 @@
 
 public class ConstantPool {
 
-  public static final int CONSTANT_CLASS_TAG = 7;
-  public static final int CONSTANT_FIELDREF_TAG = 9;
-  public static final int CONSTANT_METHODREF_TAG = 10;
-  public static final int CONSTANT_INTERFACE_METHODREF_TAG = 11;
-  public static final int CONSTANT_STRING_TAG = 8;
-  public static final int CONSTANT_INTEGER_TAG = 3;
-  public static final int CONSTANT_FLOAT_TAG = 4;
-  public static final int CONSTANT_LONG_TAG = 5;
-  public static final int CONSTANT_DOUBLE_TAG = 6;
-  public static final int CONSTANT_NAME_AND_TYPE_TAG = 12;
-  public static final int CONSTANT_UTF8_TAG = 1;
-  public static final int CONSTANT_METHOD_HANDLE_TAG = 15;
-  public static final int CONSTANT_METHOD_TYPE_TAG = 16;
-  public static final int CONSTANT_DYNAMIC_TAG = 17;
-  public static final int CONSTANT_INVOKE_DYNAMIC_TAG = 18;
-  public static final int CONSTANT_MODULE_TAG = 19;
-  public static final int CONSTANT_PACKAGE_TAG = 20;
+    public static final int CONSTANT_CLASS_TAG = 7;
+    public static final int CONSTANT_FIELDREF_TAG = 9;
+    public static final int CONSTANT_METHODREF_TAG = 10;
+    public static final int CONSTANT_INTERFACE_METHODREF_TAG = 11;
+    public static final int CONSTANT_STRING_TAG = 8;
+    public static final int CONSTANT_INTEGER_TAG = 3;
+    public static final int CONSTANT_FLOAT_TAG = 4;
+    public static final int CONSTANT_LONG_TAG = 5;
+    public static final int CONSTANT_DOUBLE_TAG = 6;
+    public static final int CONSTANT_NAME_AND_TYPE_TAG = 12;
+    public static final int CONSTANT_UTF8_TAG = 1;
+    public static final int CONSTANT_METHOD_HANDLE_TAG = 15;
+    public static final int CONSTANT_METHOD_TYPE_TAG = 16;
+    public static final int CONSTANT_DYNAMIC_TAG = 17;
+    public static final int CONSTANT_INVOKE_DYNAMIC_TAG = 18;
+    public static final int CONSTANT_MODULE_TAG = 19;
+    public static final int CONSTANT_PACKAGE_TAG = 20;
 
-  private static final int CONSTANT_POOL_START = 8;
+    private static final int CONSTANT_POOL_START = 8;
 
-  private final byte[] classBuffer;
-  private final int[] offsets;
-  private final int count;
-  private final char[] charBuffer;
+    private final byte[] classBuffer;
+    private final int[] offsets;
+    private final int count;
+    private final char[] charBuffer;
 
-  public ConstantPool(@Nonnull final byte[] classBuffer) {
-    this.classBuffer = classBuffer;
-    count = readUnsignedShort(CONSTANT_POOL_START);
-    offsets = new int[count];
-    final int maxStringLength = initConstantPool(count);
-    charBuffer = new char[maxStringLength];
-  }
+    public ConstantPool(@Nonnull final byte[] classBuffer) {
+        this.classBuffer = classBuffer;
+        count = readUnsignedShort(CONSTANT_POOL_START);
+        offsets = new int[count];
+        final int maxStringLength = initConstantPool(count);
+        charBuffer = new char[maxStringLength];
+    }
 
-  private int initConstantPool(final int cpInfoCount) {
-    int cpInfoOffset = CONSTANT_POOL_START + 2;
-    int cpInfoIndex = 1;
-    int maxStringLength = 0;
-    while (cpInfoIndex < cpInfoCount) {
-      final int type = classBuffer[cpInfoOffset++];
-      offsets[cpInfoIndex] = cpInfoOffset;
-      cpInfoIndex += 1;
-      switch (type) {
-        case CONSTANT_LONG_TAG:
-        case CONSTANT_DOUBLE_TAG:
-          cpInfoOffset += 8;
-          cpInfoIndex += 1;
-          break;
-        case CONSTANT_METHODREF_TAG:
-        case CONSTANT_INTERFACE_METHODREF_TAG:
-        case CONSTANT_FIELDREF_TAG:
-        case CONSTANT_INTEGER_TAG:
-        case CONSTANT_FLOAT_TAG:
-        case CONSTANT_NAME_AND_TYPE_TAG:
-        case CONSTANT_DYNAMIC_TAG:
-        case CONSTANT_INVOKE_DYNAMIC_TAG:
-          cpInfoOffset += 4;
-          break;
-        case CONSTANT_UTF8_TAG:
-          final int strSize = readUnsignedShort(cpInfoOffset);
-          cpInfoOffset += 2;
-          cpInfoOffset += strSize;
-          if (strSize > maxStringLength) {
-            maxStringLength = strSize;
-          }
-          break;
-        case CONSTANT_METHOD_HANDLE_TAG:
-          cpInfoOffset += 3;
-          break;
-        case CONSTANT_CLASS_TAG:
-        case CONSTANT_STRING_TAG:
-        case CONSTANT_METHOD_TYPE_TAG:
-        case CONSTANT_PACKAGE_TAG:
-        case CONSTANT_MODULE_TAG:
-          cpInfoOffset += 2;
-          break;
-        default:
-          throw new IllegalArgumentException();
-      }
+    private int initConstantPool(final int cpInfoCount) {
+        int cpInfoOffset = CONSTANT_POOL_START + 2;
+        int cpInfoIndex = 1;
+        int maxStringLength = 0;
+        while (cpInfoIndex < cpInfoCount) {
+            final int type = classBuffer[cpInfoOffset++];
+            offsets[cpInfoIndex] = cpInfoOffset;
+            cpInfoIndex += 1;
+            switch (type) {
+                case CONSTANT_LONG_TAG:
+                case CONSTANT_DOUBLE_TAG:
+                    cpInfoOffset += 8;
+                    cpInfoIndex += 1;
+                    break;
+                case CONSTANT_METHODREF_TAG:
+                case CONSTANT_INTERFACE_METHODREF_TAG:
+                case CONSTANT_FIELDREF_TAG:
+                case CONSTANT_INTEGER_TAG:
+                case CONSTANT_FLOAT_TAG:
+                case CONSTANT_NAME_AND_TYPE_TAG:
+                case CONSTANT_DYNAMIC_TAG:
+                case CONSTANT_INVOKE_DYNAMIC_TAG:
+                    cpInfoOffset += 4;
+                    break;
+                case CONSTANT_UTF8_TAG:
+                    final int strSize = readUnsignedShort(cpInfoOffset);
+                    cpInfoOffset += 2;
+                    cpInfoOffset += strSize;
+                    if (strSize > maxStringLength) {
+                        maxStringLength = strSize;
+                    }
+                    break;
+                case CONSTANT_METHOD_HANDLE_TAG:
+                    cpInfoOffset += 3;
+                    break;
+                case CONSTANT_CLASS_TAG:
+                case CONSTANT_STRING_TAG:
+                case CONSTANT_METHOD_TYPE_TAG:
+                case CONSTANT_PACKAGE_TAG:
+                case CONSTANT_MODULE_TAG:
+                    cpInfoOffset += 2;
+                    break;
+                default:
+                    throw new IllegalArgumentException();
+            }
+        }
+        return maxStringLength;
     }
-    return maxStringLength;
-  }
 
-  public int getCount() {
-    return count;
-  }
+    public int getCount() {
+        return count;
+    }
 
-  public int getType(final int index) {
-    final int offset = offsets[index] - 1;
-    if (offset < 0) {
-      return -1; // can happen for long and double (they take two spots in the constant pool)
+    public int getType(final int index) {
+        final int offset = offsets[index] - 1;
+        if (offset < 0) {
+            return -1; // can happen for long and double (they take two spots in the constant pool)
+        }
+        return classBuffer[offset];
     }
-    return classBuffer[offset];
-  }
 
-  public int getOffset(final int index) {
-    return offsets[index];
-  }
+    public int getOffset(final int index) {
+        return offsets[index];
+    }
 
-  public int readUnsignedShort(final int offset) {
-    return ((classBuffer[offset] & 0xFF) << 8) | (classBuffer[offset + 1] & 0xFF);
-  }
+    public int readUnsignedShort(final int offset) {
+        return ((classBuffer[offset] & 0xFF) << 8) | (classBuffer[offset + 1] & 0xFF);
+    }
 
-  public String readUTF8(final int offset) {
-    final int length = readUnsignedShort(offset);
-    int currentOffset = offset + 2;
-    int endOffset = currentOffset + length;
-    int strLength = 0;
-    while (currentOffset < endOffset) {
-      int currentByte = classBuffer[currentOffset++];
-      if ((currentByte & 0x80) == 0) {
-        charBuffer[strLength++] = (char) (currentByte & 0x7F);
-      } else if ((currentByte & 0xE0) == 0xC0) {
-        charBuffer[strLength++] =
-            (char) (((currentByte & 0x1F) << 6) + (classBuffer[currentOffset++] & 0x3F));
-      } else {
-        charBuffer[strLength++] =
-            (char)
-                (((currentByte & 0xF) << 12)
-                    + ((classBuffer[currentOffset++] & 0x3F) << 6)
-                    + (classBuffer[currentOffset++] & 0x3F));
-      }
+    public String readUTF8(final int offset) {
+        final int length = readUnsignedShort(offset);
+        int currentOffset = offset + 2;
+        int endOffset = currentOffset + length;
+        int strLength = 0;
+        while (currentOffset < endOffset) {
+            int currentByte = classBuffer[currentOffset++];
+            if ((currentByte & 0x80) == 0) {
+                charBuffer[strLength++] = (char) (currentByte & 0x7F);
+            } else if ((currentByte & 0xE0) == 0xC0) {
+                charBuffer[strLength++] = (char) (((currentByte & 0x1F) << 6) + (classBuffer[currentOffset++] & 0x3F));
+            } else {
+                charBuffer[strLength++] = (char) (((currentByte & 0xF) << 12)
+                        + ((classBuffer[currentOffset++] & 0x3F) << 6)
+                        + (classBuffer[currentOffset++] & 0x3F));
+            }
+        }
+        return new String(charBuffer, 0, strLength);
     }
-    return new String(charBuffer, 0, strLength);
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/iast/TaintableVisitor.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/iast/TaintableVisitor.java
index 916907afdc6..04a058d22e5 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/iast/TaintableVisitor.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/iast/TaintableVisitor.java
@@ -23,141 +23,138 @@
 
 public class TaintableVisitor implements AsmVisitorWrapper {
 
-  public static volatile boolean DEBUG = false;
-
-  private static final String TAINTABLE = "datadog/trace/api/iast/Taintable";
-  private static final String SOURCE_CLASS_NAME = "L" + TAINTABLE + "$Source;";
-  private static final String FIELD_NAME = "$$DD$source";
-  private static final String GETTER_NAME = "$$DD$getSource";
-  private static final String SETTER_NAME = "$$DD$setSource";
-
-  private final Set<String> types;
-
-  public TaintableVisitor(final String... classNames) {
-    types = new HashSet<>(Arrays.asList(classNames));
-  }
-
-  @Override
-  public int mergeWriter(final int flags) {
-    return flags;
-  }
-
-  @Override
-  public int mergeReader(int flags) {
-    return flags;
-  }
-
-  @Override
-  public ClassVisitor wrap(
-      final TypeDescription instrumentedType,
-      final ClassVisitor classVisitor,
-      final Implementation.Context implementationContext,
-      final TypePool typePool,
-      final FieldList<FieldDescription.InDefinedShape> fields,
-      final MethodList<?> methods,
-      final int writerFlags,
-      final int readerFlags) {
-    return types.contains(instrumentedType.getName())
-        ? new AddTaintableInterfaceVisitor(classVisitor)
-        : classVisitor;
-  }
-
-  private static class AddTaintableInterfaceVisitor extends ClassVisitor {
-
-    private String owner;
-
-    private boolean addTaintable = false;
-
-    protected AddTaintableInterfaceVisitor(final ClassVisitor classVisitor) {
-      super(OpenedClassReader.ASM_API, classVisitor);
+    public static volatile boolean DEBUG = false;
+
+    private static final String TAINTABLE = "datadog/trace/api/iast/Taintable";
+    private static final String SOURCE_CLASS_NAME = "L" + TAINTABLE + "$Source;";
+    private static final String FIELD_NAME = "$$DD$source";
+    private static final String GETTER_NAME = "$$DD$getSource";
+    private static final String SETTER_NAME = "$$DD$setSource";
+
+    private final Set<String> types;
+
+    public TaintableVisitor(final String... classNames) {
+        types = new HashSet<>(Arrays.asList(classNames));
     }
 
     @Override
-    public void visit(
-        final int version,
-        final int access,
-        final String name,
-        String signature,
-        final String superName,
-        String[] interfaces) {
-      owner = name;
-      if (!arrayContains(interfaces, TAINTABLE)) {
-        interfaces = appendToArray(interfaces, TAINTABLE);
-        if (signature != null) {
-          signature += 'L' + TAINTABLE + ';';
-        }
-        addTaintable = true;
-      }
-      super.visit(version, access, name, signature, superName, interfaces);
+    public int mergeWriter(final int flags) {
+        return flags;
     }
 
     @Override
-    public void visitEnd() {
-      if (addTaintable) {
-        addField();
-        addGetter();
-        if (!DEBUG) {
-          addSetter();
-        } else {
-          addSetterDebug();
-        }
-      }
+    public int mergeReader(int flags) {
+        return flags;
     }
 
-    private void addField() {
-      final FieldVisitor fv =
-          cv.visitField(
-              Opcodes.ACC_PRIVATE | Opcodes.ACC_TRANSIENT | Opcodes.ACC_VOLATILE,
-              FIELD_NAME,
-              SOURCE_CLASS_NAME,
-              null,
-              null);
-      fv.visitEnd();
+    @Override
+    public ClassVisitor wrap(
+            final TypeDescription instrumentedType,
+            final ClassVisitor classVisitor,
+            final Implementation.Context implementationContext,
+            final TypePool typePool,
+            final FieldList<FieldDescription.InDefinedShape> fields,
+            final MethodList<?> methods,
+            final int writerFlags,
+            final int readerFlags) {
+        return types.contains(instrumentedType.getName())
+                ? new AddTaintableInterfaceVisitor(classVisitor)
+                : classVisitor;
     }
 
-    private void addGetter() {
-      final MethodVisitor mv =
-          cv.visitMethod(Opcodes.ACC_PUBLIC, GETTER_NAME, "()" + SOURCE_CLASS_NAME, null, null);
-      mv.visitCode();
-      mv.visitVarInsn(Opcodes.ALOAD, 0);
-      mv.visitFieldInsn(Opcodes.GETFIELD, owner, FIELD_NAME, SOURCE_CLASS_NAME);
-      mv.visitInsn(Opcodes.ARETURN);
-      mv.visitMaxs(1, 1);
-      mv.visitEnd();
-    }
+    private static class AddTaintableInterfaceVisitor extends ClassVisitor {
 
-    private void addSetter() {
-      final MethodVisitor mv =
-          cv.visitMethod(
-              Opcodes.ACC_PUBLIC, SETTER_NAME, "(" + SOURCE_CLASS_NAME + ")V", null, null);
-      mv.visitCode();
-      mv.visitVarInsn(Opcodes.ALOAD, 0);
-      mv.visitVarInsn(Opcodes.ALOAD, 1);
-      mv.visitFieldInsn(Opcodes.PUTFIELD, owner, FIELD_NAME, SOURCE_CLASS_NAME);
-      mv.visitInsn(Opcodes.RETURN);
-      mv.visitMaxs(2, 2);
-      mv.visitEnd();
-    }
+        private String owner;
+
+        private boolean addTaintable = false;
+
+        protected AddTaintableInterfaceVisitor(final ClassVisitor classVisitor) {
+            super(OpenedClassReader.ASM_API, classVisitor);
+        }
 
-    private void addSetterDebug() {
-      final MethodVisitor mv =
-          cv.visitMethod(
-              Opcodes.ACC_PUBLIC, SETTER_NAME, "(" + SOURCE_CLASS_NAME + ")V", null, null);
-      mv.visitCode();
-      mv.visitVarInsn(Opcodes.ALOAD, 0);
-      mv.visitVarInsn(Opcodes.ALOAD, 1);
-      mv.visitFieldInsn(Opcodes.PUTFIELD, owner, FIELD_NAME, SOURCE_CLASS_NAME);
-
-      mv.visitVarInsn(Opcodes.ALOAD, 0);
-      mv.visitMethodInsn(
-          Opcodes.INVOKESTATIC,
-          Type.getInternalName(Taintable.DebugLogger.class),
-          "logTaint",
-          "(Ldatadog/trace/api/iast/Taintable;)V",
-          false);
-      mv.visitInsn(Opcodes.RETURN);
-      mv.visitMaxs(2, 2);
-      mv.visitEnd();
+        @Override
+        public void visit(
+                final int version,
+                final int access,
+                final String name,
+                String signature,
+                final String superName,
+                String[] interfaces) {
+            owner = name;
+            if (!arrayContains(interfaces, TAINTABLE)) {
+                interfaces = appendToArray(interfaces, TAINTABLE);
+                if (signature != null) {
+                    signature += 'L' + TAINTABLE + ';';
+                }
+                addTaintable = true;
+            }
+            super.visit(version, access, name, signature, superName, interfaces);
+        }
+
+        @Override
+        public void visitEnd() {
+            if (addTaintable) {
+                addField();
+                addGetter();
+                if (!DEBUG) {
+                    addSetter();
+                } else {
+                    addSetterDebug();
+                }
+            }
+        }
+
+        private void addField() {
+            final FieldVisitor fv = cv.visitField(
+                    Opcodes.ACC_PRIVATE | Opcodes.ACC_TRANSIENT | Opcodes.ACC_VOLATILE,
+                    FIELD_NAME,
+                    SOURCE_CLASS_NAME,
+                    null,
+                    null);
+            fv.visitEnd();
+        }
+
+        private void addGetter() {
+            final MethodVisitor mv =
+                    cv.visitMethod(Opcodes.ACC_PUBLIC, GETTER_NAME, "()" + SOURCE_CLASS_NAME, null, null);
+            mv.visitCode();
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitFieldInsn(Opcodes.GETFIELD, owner, FIELD_NAME, SOURCE_CLASS_NAME);
+            mv.visitInsn(Opcodes.ARETURN);
+            mv.visitMaxs(1, 1);
+            mv.visitEnd();
+        }
+
+        private void addSetter() {
+            final MethodVisitor mv =
+                    cv.visitMethod(Opcodes.ACC_PUBLIC, SETTER_NAME, "(" + SOURCE_CLASS_NAME + ")V", null, null);
+            mv.visitCode();
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitVarInsn(Opcodes.ALOAD, 1);
+            mv.visitFieldInsn(Opcodes.PUTFIELD, owner, FIELD_NAME, SOURCE_CLASS_NAME);
+            mv.visitInsn(Opcodes.RETURN);
+            mv.visitMaxs(2, 2);
+            mv.visitEnd();
+        }
+
+        private void addSetterDebug() {
+            final MethodVisitor mv =
+                    cv.visitMethod(Opcodes.ACC_PUBLIC, SETTER_NAME, "(" + SOURCE_CLASS_NAME + ")V", null, null);
+            mv.visitCode();
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitVarInsn(Opcodes.ALOAD, 1);
+            mv.visitFieldInsn(Opcodes.PUTFIELD, owner, FIELD_NAME, SOURCE_CLASS_NAME);
+
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitMethodInsn(
+                    Opcodes.INVOKESTATIC,
+                    Type.getInternalName(Taintable.DebugLogger.class),
+                    "logTaint",
+                    "(Ldatadog/trace/api/iast/Taintable;)V",
+                    false);
+            mv.visitInsn(Opcodes.RETURN);
+            mv.visitMaxs(2, 2);
+            mv.visitEnd();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ClassLoaderMatchers.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ClassLoaderMatchers.java
index bf0b9ab62c5..9b1048ca9cd 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ClassLoaderMatchers.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ClassLoaderMatchers.java
@@ -19,186 +19,183 @@
 import org.slf4j.LoggerFactory;
 
 public final class ClassLoaderMatchers {
-  private static final Logger log = LoggerFactory.getLogger(ClassLoaderMatchers.class);
-
-  public static final ElementMatcher.Junction<ClassLoader> ANY_CLASS_LOADER = any();
-
-  private static final ClassLoader BOOTSTRAP_CLASSLOADER = null;
-
-  private static final Set<String> EXCLUDED_CLASSLOADER_NAMES =
-      InstrumenterConfig.get().getExcludedClassLoaders();
-
-  private static final boolean CHECK_EXCLUDES = !EXCLUDED_CLASSLOADER_NAMES.isEmpty();
-
-  /** A private constructor that must not be invoked. */
-  private ClassLoaderMatchers() {
-    throw new UnsupportedOperationException();
-  }
-
-  public static boolean canSkipClassLoaderByName(final ClassLoader loader) {
-    String classLoaderName = loader.getClass().getName();
-    switch (classLoaderName) {
-      case "org.codehaus.groovy.runtime.callsite.CallSiteClassLoader":
-      case "sun.reflect.DelegatingClassLoader":
-      case "jdk.internal.reflect.DelegatingClassLoader":
-      case "org.jvnet.hk2.internal.DelegatingClassLoader":
-      case "clojure.lang.DynamicClassLoader":
-      case "org.apache.cxf.common.util.ASMHelper$TypeHelperClassLoader":
-      case "com.ibm.xml.xlxp2.jaxb.codegen.AbstractGeneratedStubFactory$RootStubClassLoader":
-      case "sun.misc.Launcher$ExtClassLoader":
-      case "org.springframework.context.support.ContextTypeMatchClassLoader$ContextOverridingClassLoader":
-      case "org.openjdk.nashorn.internal.runtime.ScriptLoader":
-      case "jdk.nashorn.internal.runtime.ScriptLoader":
-      case "org.codehaus.janino.ByteArrayClassLoader":
-      case "org.eclipse.persistence.internal.jaxb.JaxbClassLoader":
-      case "com.alibaba.fastjson.util.ASMClassLoader":
-      case "datadog.trace.bootstrap.DatadogClassLoader":
-      case "datadog.trace.bootstrap.InstrumentationClassLoader":
-      // drools
-      case "org.drools.core.rule.PackageClassLoader":
-      case "org.drools.wiring.dynamic.PackageClassLoader":
-      case "org.drools.core.rule.JavaDialectRuntimeData$PackageClassLoader":
-      case "org.drools.wiring.dynamic.DynamicProjectClassLoader$DefaultInternalTypesClassLoader":
-        return true;
+    private static final Logger log = LoggerFactory.getLogger(ClassLoaderMatchers.class);
+
+    public static final ElementMatcher.Junction<ClassLoader> ANY_CLASS_LOADER = any();
+
+    private static final ClassLoader BOOTSTRAP_CLASSLOADER = null;
+
+    private static final Set<String> EXCLUDED_CLASSLOADER_NAMES =
+            InstrumenterConfig.get().getExcludedClassLoaders();
+
+    private static final boolean CHECK_EXCLUDES = !EXCLUDED_CLASSLOADER_NAMES.isEmpty();
+
+    /** A private constructor that must not be invoked. */
+    private ClassLoaderMatchers() {
+        throw new UnsupportedOperationException();
     }
-    if (CHECK_EXCLUDES) {
-      return EXCLUDED_CLASSLOADER_NAMES.contains(classLoaderName);
+
+    public static boolean canSkipClassLoaderByName(final ClassLoader loader) {
+        String classLoaderName = loader.getClass().getName();
+        switch (classLoaderName) {
+            case "org.codehaus.groovy.runtime.callsite.CallSiteClassLoader":
+            case "sun.reflect.DelegatingClassLoader":
+            case "jdk.internal.reflect.DelegatingClassLoader":
+            case "org.jvnet.hk2.internal.DelegatingClassLoader":
+            case "clojure.lang.DynamicClassLoader":
+            case "org.apache.cxf.common.util.ASMHelper$TypeHelperClassLoader":
+            case "com.ibm.xml.xlxp2.jaxb.codegen.AbstractGeneratedStubFactory$RootStubClassLoader":
+            case "sun.misc.Launcher$ExtClassLoader":
+            case "org.springframework.context.support.ContextTypeMatchClassLoader$ContextOverridingClassLoader":
+            case "org.openjdk.nashorn.internal.runtime.ScriptLoader":
+            case "jdk.nashorn.internal.runtime.ScriptLoader":
+            case "org.codehaus.janino.ByteArrayClassLoader":
+            case "org.eclipse.persistence.internal.jaxb.JaxbClassLoader":
+            case "com.alibaba.fastjson.util.ASMClassLoader":
+            case "datadog.trace.bootstrap.DatadogClassLoader":
+            case "datadog.trace.bootstrap.InstrumentationClassLoader":
+            // drools
+            case "org.drools.core.rule.PackageClassLoader":
+            case "org.drools.wiring.dynamic.PackageClassLoader":
+            case "org.drools.core.rule.JavaDialectRuntimeData$PackageClassLoader":
+            case "org.drools.wiring.dynamic.DynamicProjectClassLoader$DefaultInternalTypesClassLoader":
+                return true;
+        }
+        if (CHECK_EXCLUDES) {
+            return EXCLUDED_CLASSLOADER_NAMES.contains(classLoaderName);
+        }
+        return false;
     }
-    return false;
-  }
-
-  public static boolean incompatibleClassLoader(final ClassLoader loader) {
-    return loader != BOOTSTRAP_CLASSLOADER && hasClassMask(loader) == INCOMPATIBLE_CLASS_LOADER;
-    // note: must use '==' to distinguish INCOMPATIBLE_CLASS_LOADER from NO_CLASS_NAME_MATCHES
-  }
-
-  /**
-   * NOTICE: Does not match the bootstrap classpath. Don't use with classes expected to be on the
-   * bootstrap.
-   *
-   * @param className the className to match.
-   * @return true if class is available as a resource, not on the bootstrap classloader.
-   */
-  public static ElementMatcher.Junction<ClassLoader> hasClassNamed(String className) {
-    ElementMatcher.Junction<ClassLoader> matcher = hasClassMatchers.get(className);
-    if (null == matcher) {
-      // each matcher is given an id based on where to find its resource-name in the sequence
-      hasClassMatchers.put(className, matcher = new HasClassMatcher(hasClassResourceNames.size()));
-      hasClassResourceNames.add(Strings.getResourceName(className));
+
+    public static boolean incompatibleClassLoader(final ClassLoader loader) {
+        return loader != BOOTSTRAP_CLASSLOADER && hasClassMask(loader) == INCOMPATIBLE_CLASS_LOADER;
+        // note: must use '==' to distinguish INCOMPATIBLE_CLASS_LOADER from NO_CLASS_NAME_MATCHES
     }
-    return matcher;
-  }
-
-  /**
-   * NOTICE: Does not match the bootstrap classpath. Don't use with classes expected to be on the
-   * bootstrap.
-   *
-   * @param classNames the classNames to match.
-   * @return true if any class is available as a resource and not the bootstrap classloader.
-   */
-  public static ElementMatcher.Junction<ClassLoader> hasClassNamedOneOf(
-      final String... classNames) {
-    ElementMatcher<ClassLoader>[] matchers = new ElementMatcher[classNames.length];
-    for (int i = 0; i < matchers.length; i++) {
-      matchers[i] = hasClassNamed(classNames[i]);
+
+    /**
+     * NOTICE: Does not match the bootstrap classpath. Don't use with classes expected to be on the
+     * bootstrap.
+     *
+     * @param className the className to match.
+     * @return true if class is available as a resource, not on the bootstrap classloader.
+     */
+    public static ElementMatcher.Junction<ClassLoader> hasClassNamed(String className) {
+        ElementMatcher.Junction<ClassLoader> matcher = hasClassMatchers.get(className);
+        if (null == matcher) {
+            // each matcher is given an id based on where to find its resource-name in the sequence
+            hasClassMatchers.put(className, matcher = new HasClassMatcher(hasClassResourceNames.size()));
+            hasClassResourceNames.add(Strings.getResourceName(className));
+        }
+        return matcher;
     }
-    return new ElementMatcher.Junction.Disjunction<>(matchers);
-  }
-
-  public static void resetState() {
-    hasClassCache.clear();
-  }
-
-  /**
-   * TODO: this turns out to be useless with OSGi: {@code
-   * org.eclipse.osgi.internal.loader.BundleLoader#isRequestFromVM} returns {@code true} when class
-   * loading is issued from this check and {@code false} for 'real' class loads. We should come up
-   * with some sort of hack to avoid this problem.
-   */
-  private static boolean delegatesToBootstrap(final ClassLoader loader) {
-    boolean delegates = true;
-    if (!loadsExpectedClass(loader, Tracer.class)) {
-      log.debug("Loader {} failed to delegate to bootstrap dd-trace-api class", loader);
-      delegates = false;
+
+    /**
+     * NOTICE: Does not match the bootstrap classpath. Don't use with classes expected to be on the
+     * bootstrap.
+     *
+     * @param classNames the classNames to match.
+     * @return true if any class is available as a resource and not the bootstrap classloader.
+     */
+    public static ElementMatcher.Junction<ClassLoader> hasClassNamedOneOf(final String... classNames) {
+        ElementMatcher<ClassLoader>[] matchers = new ElementMatcher[classNames.length];
+        for (int i = 0; i < matchers.length; i++) {
+            matchers[i] = hasClassNamed(classNames[i]);
+        }
+        return new ElementMatcher.Junction.Disjunction<>(matchers);
+    }
+
+    public static void resetState() {
+        hasClassCache.clear();
     }
-    if (!loadsExpectedClass(loader, PatchLogger.class)) {
-      log.debug("Loader {} failed to delegate to bootstrap agent-bootstrap class", loader);
-      delegates = false;
+
+    /**
+     * TODO: this turns out to be useless with OSGi: {@code
+     * org.eclipse.osgi.internal.loader.BundleLoader#isRequestFromVM} returns {@code true} when class
+     * loading is issued from this check and {@code false} for 'real' class loads. We should come up
+     * with some sort of hack to avoid this problem.
+     */
+    private static boolean delegatesToBootstrap(final ClassLoader loader) {
+        boolean delegates = true;
+        if (!loadsExpectedClass(loader, Tracer.class)) {
+            log.debug("Loader {} failed to delegate to bootstrap dd-trace-api class", loader);
+            delegates = false;
+        }
+        if (!loadsExpectedClass(loader, PatchLogger.class)) {
+            log.debug("Loader {} failed to delegate to bootstrap agent-bootstrap class", loader);
+            delegates = false;
+        }
+        return delegates;
     }
-    return delegates;
-  }
-
-  private static boolean loadsExpectedClass(
-      final ClassLoader loader, final Class<?> expectedClass) {
-    try {
-      return loader.loadClass(expectedClass.getName()) == expectedClass;
-    } catch (final Throwable ignored) {
-      return false;
+
+    private static boolean loadsExpectedClass(final ClassLoader loader, final Class<?> expectedClass) {
+        try {
+            return loader.loadClass(expectedClass.getName()) == expectedClass;
+        } catch (final Throwable ignored) {
+            return false;
+        }
     }
-  }
 
-  /** Mapping of class-name to has-class matcher. */
-  static final Map<String, ElementMatcher.Junction<ClassLoader>> hasClassMatchers = new HashMap<>();
+    /** Mapping of class-name to has-class matcher. */
+    static final Map<String, ElementMatcher.Junction<ClassLoader>> hasClassMatchers = new HashMap<>();
 
-  /** Sequence of class resource-names, in order of assigned hasClassId. */
-  static final List<String> hasClassResourceNames = new ArrayList<>();
+    /** Sequence of class resource-names, in order of assigned hasClassId. */
+    static final List<String> hasClassResourceNames = new ArrayList<>();
 
-  /** Cache of classloader-instance -> has-class mask. */
-  static final ClassLoaderValue<BitSet> hasClassCache =
-      new ClassLoaderValue<BitSet>() {
+    /** Cache of classloader-instance -> has-class mask. */
+    static final ClassLoaderValue<BitSet> hasClassCache = new ClassLoaderValue<BitSet>() {
         @Override
         protected BitSet computeValue(ClassLoader cl) {
-          return buildHasClassMask(cl);
+            return buildHasClassMask(cl);
         }
-      };
-
-  /** Distinct result used to mark an incompatible classloader that the tracer should skip. */
-  static final BitSet INCOMPATIBLE_CLASS_LOADER = new BitSet();
+    };
 
-  static final BitSet NO_CLASS_NAME_MATCHES = new BitSet();
+    /** Distinct result used to mark an incompatible classloader that the tracer should skip. */
+    static final BitSet INCOMPATIBLE_CLASS_LOADER = new BitSet();
 
-  static BitSet hasClassMask(ClassLoader loader) {
-    return hasClassCache.get(loader);
-  }
+    static final BitSet NO_CLASS_NAME_MATCHES = new BitSet();
 
-  static BitSet buildHasClassMask(ClassLoader loader) {
-    if (!delegatesToBootstrap(loader)) {
-      // when ClassloadingInstrumentation is active this check is not strictly required,
-      // because that instrumentation forces all class loaders to load classes covered by
-      // Constants.BOOTSTRAP_PACKAGE_PREFIXES directly from the bootstrap class loader
-      return INCOMPATIBLE_CLASS_LOADER;
+    static BitSet hasClassMask(ClassLoader loader) {
+        return hasClassCache.get(loader);
     }
-    PROBING_CLASSLOADER.begin();
-    try {
-      BitSet hasClassMask = NO_CLASS_NAME_MATCHES;
-      for (int hasClassId = hasClassResourceNames.size() - 1; hasClassId >= 0; hasClassId--) {
+
+    static BitSet buildHasClassMask(ClassLoader loader) {
+        if (!delegatesToBootstrap(loader)) {
+            // when ClassloadingInstrumentation is active this check is not strictly required,
+            // because that instrumentation forces all class loaders to load classes covered by
+            // Constants.BOOTSTRAP_PACKAGE_PREFIXES directly from the bootstrap class loader
+            return INCOMPATIBLE_CLASS_LOADER;
+        }
+        PROBING_CLASSLOADER.begin();
         try {
-          if (loader.getResource(hasClassResourceNames.get(hasClassId)) != null) {
-            if (hasClassMask.isEmpty()) {
-              hasClassMask = new BitSet(hasClassId + 1);
+            BitSet hasClassMask = NO_CLASS_NAME_MATCHES;
+            for (int hasClassId = hasClassResourceNames.size() - 1; hasClassId >= 0; hasClassId--) {
+                try {
+                    if (loader.getResource(hasClassResourceNames.get(hasClassId)) != null) {
+                        if (hasClassMask.isEmpty()) {
+                            hasClassMask = new BitSet(hasClassId + 1);
+                        }
+                        hasClassMask.set(hasClassId);
+                    }
+                } catch (final Throwable ignored) {
+                    // continue to next check
+                }
             }
-            hasClassMask.set(hasClassId);
-          }
-        } catch (final Throwable ignored) {
-          // continue to next check
+            return hasClassMask;
+        } finally {
+            PROBING_CLASSLOADER.end();
         }
-      }
-      return hasClassMask;
-    } finally {
-      PROBING_CLASSLOADER.end();
     }
-  }
 
-  static final class HasClassMatcher extends ElementMatcher.Junction.ForNonNullValues<ClassLoader> {
-    private final int hasClassId;
+    static final class HasClassMatcher extends ElementMatcher.Junction.ForNonNullValues<ClassLoader> {
+        private final int hasClassId;
 
-    private HasClassMatcher(int hasClassId) {
-      this.hasClassId = hasClassId;
-    }
+        private HasClassMatcher(int hasClassId) {
+            this.hasClassId = hasClassId;
+        }
 
-    @Override
-    protected boolean doMatch(final ClassLoader loader) {
-      return hasClassMask(loader).get(hasClassId);
+        @Override
+        protected boolean doMatch(final ClassLoader loader) {
+            return hasClassMask(loader).get(hasClassId);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/CodeSourceExcludes.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/CodeSourceExcludes.java
index 50bf22f061e..29a69babcd7 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/CodeSourceExcludes.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/CodeSourceExcludes.java
@@ -14,39 +14,37 @@
  * <p>Matches any code source location that contains one of the configured strings.
  */
 public class CodeSourceExcludes {
-  private CodeSourceExcludes() {}
+    private CodeSourceExcludes() {}
 
-  static final List<String> excludes = InstrumenterConfig.get().getExcludedCodeSources();
+    static final List<String> excludes = InstrumenterConfig.get().getExcludedCodeSources();
 
-  private static final DDCache<String, Boolean> excludedCodeSources;
+    private static final DDCache<String, Boolean> excludedCodeSources;
 
-  static {
-    if (!excludes.isEmpty()) {
-      excludedCodeSources = DDCaches.newFixedSizeCache(64);
-    } else {
-      excludedCodeSources = null;
+    static {
+        if (!excludes.isEmpty()) {
+            excludedCodeSources = DDCaches.newFixedSizeCache(64);
+        } else {
+            excludedCodeSources = null;
+        }
     }
-  }
 
-  public static boolean isExcluded(ProtectionDomain protectionDomain) {
-    if (null != excludedCodeSources && null != protectionDomain) {
-      CodeSource codeSource = protectionDomain.getCodeSource();
-      if (null != codeSource) {
-        // avoid hashing on the URL because that can be a blocking operation
-        URL location = codeSource.getLocation();
-        return null != location
-            && excludedCodeSources.computeIfAbsent(
-                location.getPath(),
-                path -> {
-                  for (String name : excludes) {
-                    if (path.contains(name)) {
-                      return true;
-                    }
-                  }
-                  return false;
-                });
-      }
+    public static boolean isExcluded(ProtectionDomain protectionDomain) {
+        if (null != excludedCodeSources && null != protectionDomain) {
+            CodeSource codeSource = protectionDomain.getCodeSource();
+            if (null != codeSource) {
+                // avoid hashing on the URL because that can be a blocking operation
+                URL location = codeSource.getLocation();
+                return null != location
+                        && excludedCodeSources.computeIfAbsent(location.getPath(), path -> {
+                            for (String name : excludes) {
+                                if (path.contains(name)) {
+                                    return true;
+                                }
+                            }
+                            return false;
+                        });
+            }
+        }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/CustomExcludes.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/CustomExcludes.java
index 96fecc57591..e82bd6135a2 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/CustomExcludes.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/CustomExcludes.java
@@ -9,34 +9,34 @@
 
 /** Custom class/package excludes configured by the user. */
 public class CustomExcludes {
-  private static final Logger log = LoggerFactory.getLogger(CustomExcludes.class);
+    private static final Logger log = LoggerFactory.getLogger(CustomExcludes.class);
 
-  private CustomExcludes() {}
+    private CustomExcludes() {}
 
-  private static final ClassNameTrie excludes;
+    private static final ClassNameTrie excludes;
 
-  static {
-    List<String> excludedClasses = InstrumenterConfig.get().getExcludedClasses();
-    if (excludedClasses.isEmpty()) {
-      excludes = null;
-    } else {
-      ClassNameTrie.Builder builder = new ClassNameTrie.Builder();
-      for (String name : excludedClasses) {
-        builder.put(name, 1);
-      }
-      String excludedClassesFile = InstrumenterConfig.get().getExcludedClassesFile();
-      if (null != excludedClassesFile) {
-        try {
-          builder.readClassNameMapping(Paths.get(excludedClassesFile));
-        } catch (Exception e) {
-          log.warn("Problem reading class excludes from {}", excludedClassesFile, e);
+    static {
+        List<String> excludedClasses = InstrumenterConfig.get().getExcludedClasses();
+        if (excludedClasses.isEmpty()) {
+            excludes = null;
+        } else {
+            ClassNameTrie.Builder builder = new ClassNameTrie.Builder();
+            for (String name : excludedClasses) {
+                builder.put(name, 1);
+            }
+            String excludedClassesFile = InstrumenterConfig.get().getExcludedClassesFile();
+            if (null != excludedClassesFile) {
+                try {
+                    builder.readClassNameMapping(Paths.get(excludedClassesFile));
+                } catch (Exception e) {
+                    log.warn("Problem reading class excludes from {}", excludedClassesFile, e);
+                }
+            }
+            excludes = builder.buildTrie();
         }
-      }
-      excludes = builder.buildTrie();
     }
-  }
 
-  public static boolean isExcluded(String name) {
-    return excludes != null && excludes.apply(name) > 0;
-  }
+    public static boolean isExcluded(String name) {
+        return excludes != null && excludes.apply(name) > 0;
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/GlobalIgnores.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/GlobalIgnores.java
index bc1bee78cbb..baebe6195c6 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/GlobalIgnores.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/GlobalIgnores.java
@@ -12,28 +12,28 @@
  * </ul>
  */
 public class GlobalIgnores {
-  private GlobalIgnores() {}
+    private GlobalIgnores() {}
 
-  public static boolean isIgnored(String name, boolean skipAdditionalIgnores) {
-    // ignored classes/packages are now maintained in the 'ignored_class_name.trie' resource
-    switch (IgnoredClassNameTrie.apply(name)) {
-      case 0:
-        return false; // global allow
-      case 1:
-        return true; // system-level ignore
-      case 2:
-        return !skipAdditionalIgnores;
-      case 3:
-        return name.endsWith("Proxy");
-      case 4:
-        return !name.endsWith("HttpMessageConverter");
-      default:
-        break;
+    public static boolean isIgnored(String name, boolean skipAdditionalIgnores) {
+        // ignored classes/packages are now maintained in the 'ignored_class_name.trie' resource
+        switch (IgnoredClassNameTrie.apply(name)) {
+            case 0:
+                return false; // global allow
+            case 1:
+                return true; // system-level ignore
+            case 2:
+                return !skipAdditionalIgnores;
+            case 3:
+                return name.endsWith("Proxy");
+            case 4:
+                return !name.endsWith("HttpMessageConverter");
+            default:
+                break;
+        }
+        return false;
     }
-    return false;
-  }
 
-  public static boolean isAdditionallyIgnored(String name) {
-    return !isIgnored(name, true) && isIgnored(name, false);
-  }
+    public static boolean isAdditionallyIgnored(String name) {
+        return !isIgnored(name, true) && isIgnored(name, false);
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/HierarchyMatchers.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/HierarchyMatchers.java
index 079e80d49d0..d0bc5b7b3fe 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/HierarchyMatchers.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/HierarchyMatchers.java
@@ -17,202 +17,193 @@
 
 /** Pluggable hierarchy matchers for use with instrumentation matching and muzzle checks. */
 public final class HierarchyMatchers {
-  private static volatile Supplier SUPPLIER;
-
-  public static ElementMatcher.Junction<TypeDescription> declaresAnnotation(
-      NameMatchers.Named<? super NamedElement> matcher) {
-    SharedTypePools.annotationOfInterest(matcher.name);
-    return SUPPLIER.declaresAnnotation(matcher);
-  }
-
-  public static ElementMatcher.Junction<TypeDescription> declaresAnnotation(
-      NameMatchers.OneOf<? super NamedElement> matcher) {
-    SharedTypePools.annotationsOfInterest(matcher.names);
-    return SUPPLIER.declaresAnnotation(matcher);
-  }
-
-  public static ElementMatcher.Junction<TypeDescription> declaresField(
-      ElementMatcher<? super FieldDescription> matcher) {
-    return SUPPLIER.declaresField(matcher);
-  }
-
-  public static ElementMatcher.Junction<TypeDescription> declaresMethod(
-      ElementMatcher<? super MethodDescription> matcher) {
-    return SUPPLIER.declaresMethod(matcher);
-  }
-
-  public static ElementMatcher.Junction<TypeDescription> concreteClass() {
-    return SUPPLIER.concreteClass();
-  }
-
-  public static ElementMatcher.Junction<TypeDescription> extendsClass(
-      ElementMatcher<? super TypeDescription> matcher) {
-    return SUPPLIER.extendsClass(matcher);
-  }
-
-  public static ElementMatcher.Junction<TypeDescription> implementsInterface(
-      ElementMatcher<? super TypeDescription> matcher) {
-    return SUPPLIER.implementsInterface(matcher);
-  }
-
-  /**
-   * Like {@link #implementsInterface} but also matches when the target type is an interface.
-   *
-   * <p>Use this when matching return or parameter types that could be classes or interfaces.
-   */
-  public static ElementMatcher.Junction<TypeDescription> hasInterface(
-      ElementMatcher<? super TypeDescription> matcher) {
-    return SUPPLIER.hasInterface(matcher);
-  }
-
-  /** Considers both interfaces and super-classes when matching the target type's hierarchy. */
-  public static ElementMatcher.Junction<TypeDescription> hasSuperType(
-      ElementMatcher<? super TypeDescription> matcher) {
-    return SUPPLIER.hasSuperType(matcher);
-  }
-
-  /** Targets methods whose declaring class has a super-type that declares a matching method. */
-  public static ElementMatcher.Junction<MethodDescription> hasSuperMethod(
-      ElementMatcher<? super MethodDescription> matcher) {
-    return SUPPLIER.hasSuperMethod(matcher);
-  }
-
-  /** Matches classes that should have a field injected for the specified context-store. */
-  public static ElementMatcher.Junction<TypeDescription> declaresContextField(
-      String keyClassName, String contextClassName) {
-    return SUPPLIER.declaresContextField(keyClassName, contextClassName);
-  }
-
-  /** Use this to match annotated fields, methods, or method parameters. */
-  @SuppressForbidden
-  public static <T extends AnnotationSource & ByteCodeElement.TypeDependant<?, ?>>
-      ElementMatcher.Junction<T> isAnnotatedWith(NameMatchers.Named<? super NamedElement> matcher) {
-    SharedTypePools.annotationOfInterest(matcher.name);
-    return ElementMatchers.isAnnotatedWith(matcher);
-  }
-
-  /** Use this to match annotated fields, methods, or method parameters. */
-  @SuppressForbidden
-  public static <T extends AnnotationSource & ByteCodeElement.TypeDependant<?, ?>>
-      ElementMatcher.Junction<T> isAnnotatedWith(NameMatchers.OneOf<? super NamedElement> matcher) {
-    SharedTypePools.annotationsOfInterest(matcher.names);
-    return ElementMatchers.isAnnotatedWith(matcher);
-  }
-
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification =
-          "Agent-internal holder; Class object does not escape to app code and lock only guards one-time supplier registration.")
-  public static synchronized void registerIfAbsent(Supplier supplier) {
-    if (null == SUPPLIER) {
-      SUPPLIER = supplier;
-    }
-  }
-
-  public interface Supplier {
-    ElementMatcher.Junction<TypeDescription> declaresAnnotation(
-        ElementMatcher<? super NamedElement> matcher);
-
-    ElementMatcher.Junction<TypeDescription> declaresField(
-        ElementMatcher<? super FieldDescription> matcher);
-
-    ElementMatcher.Junction<TypeDescription> declaresMethod(
-        ElementMatcher<? super MethodDescription> matcher);
-
-    ElementMatcher.Junction<TypeDescription> concreteClass();
-
-    ElementMatcher.Junction<TypeDescription> extendsClass(
-        ElementMatcher<? super TypeDescription> matcher);
-
-    ElementMatcher.Junction<TypeDescription> implementsInterface(
-        ElementMatcher<? super TypeDescription> matcher);
-
-    ElementMatcher.Junction<TypeDescription> hasInterface(
-        ElementMatcher<? super TypeDescription> matcher);
-
-    ElementMatcher.Junction<TypeDescription> hasSuperType(
-        ElementMatcher<? super TypeDescription> matcher);
-
-    ElementMatcher.Junction<MethodDescription> hasSuperMethod(
-        ElementMatcher<? super MethodDescription> matcher);
-
-    ElementMatcher.Junction<TypeDescription> declaresContextField(
-        String keyClassName, String contextClassName);
-  }
-
-  /** Simple hierarchy checks for use during the build when testing or validating muzzle ranges. */
-  public static HierarchyMatchers.Supplier simpleChecks() {
-    return new HierarchyMatchers.Supplier() {
-      @Override
-      @SuppressForbidden
-      public ElementMatcher.Junction<TypeDescription> declaresAnnotation(
-          ElementMatcher<? super NamedElement> matcher) {
+    private static volatile Supplier SUPPLIER;
+
+    public static ElementMatcher.Junction<TypeDescription> declaresAnnotation(
+            NameMatchers.Named<? super NamedElement> matcher) {
+        SharedTypePools.annotationOfInterest(matcher.name);
+        return SUPPLIER.declaresAnnotation(matcher);
+    }
+
+    public static ElementMatcher.Junction<TypeDescription> declaresAnnotation(
+            NameMatchers.OneOf<? super NamedElement> matcher) {
+        SharedTypePools.annotationsOfInterest(matcher.names);
+        return SUPPLIER.declaresAnnotation(matcher);
+    }
+
+    public static ElementMatcher.Junction<TypeDescription> declaresField(
+            ElementMatcher<? super FieldDescription> matcher) {
+        return SUPPLIER.declaresField(matcher);
+    }
+
+    public static ElementMatcher.Junction<TypeDescription> declaresMethod(
+            ElementMatcher<? super MethodDescription> matcher) {
+        return SUPPLIER.declaresMethod(matcher);
+    }
+
+    public static ElementMatcher.Junction<TypeDescription> concreteClass() {
+        return SUPPLIER.concreteClass();
+    }
+
+    public static ElementMatcher.Junction<TypeDescription> extendsClass(
+            ElementMatcher<? super TypeDescription> matcher) {
+        return SUPPLIER.extendsClass(matcher);
+    }
+
+    public static ElementMatcher.Junction<TypeDescription> implementsInterface(
+            ElementMatcher<? super TypeDescription> matcher) {
+        return SUPPLIER.implementsInterface(matcher);
+    }
+
+    /**
+     * Like {@link #implementsInterface} but also matches when the target type is an interface.
+     *
+     * <p>Use this when matching return or parameter types that could be classes or interfaces.
+     */
+    public static ElementMatcher.Junction<TypeDescription> hasInterface(
+            ElementMatcher<? super TypeDescription> matcher) {
+        return SUPPLIER.hasInterface(matcher);
+    }
+
+    /** Considers both interfaces and super-classes when matching the target type's hierarchy. */
+    public static ElementMatcher.Junction<TypeDescription> hasSuperType(
+            ElementMatcher<? super TypeDescription> matcher) {
+        return SUPPLIER.hasSuperType(matcher);
+    }
+
+    /** Targets methods whose declaring class has a super-type that declares a matching method. */
+    public static ElementMatcher.Junction<MethodDescription> hasSuperMethod(
+            ElementMatcher<? super MethodDescription> matcher) {
+        return SUPPLIER.hasSuperMethod(matcher);
+    }
+
+    /** Matches classes that should have a field injected for the specified context-store. */
+    public static ElementMatcher.Junction<TypeDescription> declaresContextField(
+            String keyClassName, String contextClassName) {
+        return SUPPLIER.declaresContextField(keyClassName, contextClassName);
+    }
+
+    /** Use this to match annotated fields, methods, or method parameters. */
+    @SuppressForbidden
+    public static <T extends AnnotationSource & ByteCodeElement.TypeDependant<?, ?>>
+            ElementMatcher.Junction<T> isAnnotatedWith(NameMatchers.Named<? super NamedElement> matcher) {
+        SharedTypePools.annotationOfInterest(matcher.name);
+        return ElementMatchers.isAnnotatedWith(matcher);
+    }
+
+    /** Use this to match annotated fields, methods, or method parameters. */
+    @SuppressForbidden
+    public static <T extends AnnotationSource & ByteCodeElement.TypeDependant<?, ?>>
+            ElementMatcher.Junction<T> isAnnotatedWith(NameMatchers.OneOf<? super NamedElement> matcher) {
+        SharedTypePools.annotationsOfInterest(matcher.names);
         return ElementMatchers.isAnnotatedWith(matcher);
-      }
-
-      @Override
-      @SuppressForbidden
-      public ElementMatcher.Junction<TypeDescription> declaresField(
-          ElementMatcher<? super FieldDescription> matcher) {
-        return ElementMatchers.declaresField(matcher);
-      }
-
-      @Override
-      @SuppressForbidden
-      public ElementMatcher.Junction<TypeDescription> declaresMethod(
-          ElementMatcher<? super MethodDescription> matcher) {
-        return ElementMatchers.declaresMethod(matcher);
-      }
-
-      @Override
-      @SuppressForbidden
-      public ElementMatcher.Junction<TypeDescription> concreteClass() {
-        return not(ElementMatchers.isAbstract());
-      }
-
-      @Override
-      @SuppressForbidden
-      public ElementMatcher.Junction<TypeDescription> extendsClass(
-          ElementMatcher<? super TypeDescription> matcher) {
-        return ElementMatchers.hasSuperClass(matcher);
-      }
-
-      @Override
-      @SuppressForbidden
-      public ElementMatcher.Junction<TypeDescription> implementsInterface(
-          ElementMatcher<? super TypeDescription> matcher) {
-        return ElementMatchers.hasSuperType(matcher);
-      }
-
-      @Override
-      @SuppressForbidden
-      public ElementMatcher.Junction<TypeDescription> hasInterface(
-          ElementMatcher<? super TypeDescription> matcher) {
-        return ElementMatchers.hasSuperType(matcher);
-      }
-
-      @Override
-      @SuppressForbidden
-      public ElementMatcher.Junction<TypeDescription> hasSuperType(
-          ElementMatcher<? super TypeDescription> matcher) {
-        return ElementMatchers.hasSuperType(matcher);
-      }
-
-      @Override
-      @SuppressForbidden
-      public ElementMatcher.Junction<MethodDescription> hasSuperMethod(
-          ElementMatcher<? super MethodDescription> matcher) {
-        return ElementMatchers.isDeclaredBy(
-            ElementMatchers.hasSuperType(ElementMatchers.declaresMethod(matcher)));
-      }
-
-      @Override
-      public ElementMatcher.Junction<TypeDescription> declaresContextField(
-          String keyClassName, String contextClassName) {
-        return none(); // unused during build
-      }
-    };
-  }
-
-  private HierarchyMatchers() {}
+    }
+
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification =
+                    "Agent-internal holder; Class object does not escape to app code and lock only guards one-time supplier registration.")
+    public static synchronized void registerIfAbsent(Supplier supplier) {
+        if (null == SUPPLIER) {
+            SUPPLIER = supplier;
+        }
+    }
+
+    public interface Supplier {
+        ElementMatcher.Junction<TypeDescription> declaresAnnotation(ElementMatcher<? super NamedElement> matcher);
+
+        ElementMatcher.Junction<TypeDescription> declaresField(ElementMatcher<? super FieldDescription> matcher);
+
+        ElementMatcher.Junction<TypeDescription> declaresMethod(ElementMatcher<? super MethodDescription> matcher);
+
+        ElementMatcher.Junction<TypeDescription> concreteClass();
+
+        ElementMatcher.Junction<TypeDescription> extendsClass(ElementMatcher<? super TypeDescription> matcher);
+
+        ElementMatcher.Junction<TypeDescription> implementsInterface(ElementMatcher<? super TypeDescription> matcher);
+
+        ElementMatcher.Junction<TypeDescription> hasInterface(ElementMatcher<? super TypeDescription> matcher);
+
+        ElementMatcher.Junction<TypeDescription> hasSuperType(ElementMatcher<? super TypeDescription> matcher);
+
+        ElementMatcher.Junction<MethodDescription> hasSuperMethod(ElementMatcher<? super MethodDescription> matcher);
+
+        ElementMatcher.Junction<TypeDescription> declaresContextField(String keyClassName, String contextClassName);
+    }
+
+    /** Simple hierarchy checks for use during the build when testing or validating muzzle ranges. */
+    public static HierarchyMatchers.Supplier simpleChecks() {
+        return new HierarchyMatchers.Supplier() {
+            @Override
+            @SuppressForbidden
+            public ElementMatcher.Junction<TypeDescription> declaresAnnotation(
+                    ElementMatcher<? super NamedElement> matcher) {
+                return ElementMatchers.isAnnotatedWith(matcher);
+            }
+
+            @Override
+            @SuppressForbidden
+            public ElementMatcher.Junction<TypeDescription> declaresField(
+                    ElementMatcher<? super FieldDescription> matcher) {
+                return ElementMatchers.declaresField(matcher);
+            }
+
+            @Override
+            @SuppressForbidden
+            public ElementMatcher.Junction<TypeDescription> declaresMethod(
+                    ElementMatcher<? super MethodDescription> matcher) {
+                return ElementMatchers.declaresMethod(matcher);
+            }
+
+            @Override
+            @SuppressForbidden
+            public ElementMatcher.Junction<TypeDescription> concreteClass() {
+                return not(ElementMatchers.isAbstract());
+            }
+
+            @Override
+            @SuppressForbidden
+            public ElementMatcher.Junction<TypeDescription> extendsClass(
+                    ElementMatcher<? super TypeDescription> matcher) {
+                return ElementMatchers.hasSuperClass(matcher);
+            }
+
+            @Override
+            @SuppressForbidden
+            public ElementMatcher.Junction<TypeDescription> implementsInterface(
+                    ElementMatcher<? super TypeDescription> matcher) {
+                return ElementMatchers.hasSuperType(matcher);
+            }
+
+            @Override
+            @SuppressForbidden
+            public ElementMatcher.Junction<TypeDescription> hasInterface(
+                    ElementMatcher<? super TypeDescription> matcher) {
+                return ElementMatchers.hasSuperType(matcher);
+            }
+
+            @Override
+            @SuppressForbidden
+            public ElementMatcher.Junction<TypeDescription> hasSuperType(
+                    ElementMatcher<? super TypeDescription> matcher) {
+                return ElementMatchers.hasSuperType(matcher);
+            }
+
+            @Override
+            @SuppressForbidden
+            public ElementMatcher.Junction<MethodDescription> hasSuperMethod(
+                    ElementMatcher<? super MethodDescription> matcher) {
+                return ElementMatchers.isDeclaredBy(
+                        ElementMatchers.hasSuperType(ElementMatchers.declaresMethod(matcher)));
+            }
+
+            @Override
+            public ElementMatcher.Junction<TypeDescription> declaresContextField(
+                    String keyClassName, String contextClassName) {
+                return none(); // unused during build
+            }
+        };
+    }
+
+    private HierarchyMatchers() {}
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/NameMatchers.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/NameMatchers.java
index a1e4221a23c..85229f19049 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/NameMatchers.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/NameMatchers.java
@@ -14,177 +14,170 @@
 
 public final class NameMatchers {
 
-  /**
-   * Matches a {@link NamedElement} for its exact name.
-   *
-   * @param name The expected name.
-   * @param <T> The type of the matched object.
-   * @return An element matcher for a named element's exact name.
-   */
-  @SuppressWarnings("unchecked")
-  public static <T extends NamedElement> Named<T> named(String name) {
-    return namedCache.computeIfAbsent(name, newNamedMatcher);
-  }
-
-  /**
-   * Matches a {@link NamedElement} for its exact name's membership of a set.
-   *
-   * @param names The expected names.
-   * @param <T> The type of the matched object.
-   * @return An element matcher checking if an element's exact name is a member of a set.
-   */
-  public static <T extends NamedElement> OneOf<T> namedOneOf(String... names) {
-    return namedOneOf(Arrays.asList(names));
-  }
-
-  /**
-   * Matches a {@link NamedElement} for its exact name's membership of a set.
-   *
-   * @param names The expected names.
-   * @param <T> The type of the matched object.
-   * @return An element matcher checking if an element's exact name is a member of a set.
-   */
-  public static <T extends NamedElement> OneOf<T> namedOneOf(Collection<String> names) {
-    return new OneOf<>(tryMakeImmutableSet(names));
-  }
-
-  /**
-   * Matches a {@link NamedElement} for its exact name's absence from a set.
-   *
-   * @param names The expected names.
-   * @param <T> The type of the matched object.
-   * @return An element matcher checking if an element's exact name is absent from a set.
-   */
-  public static <T extends NamedElement> NoneOf<T> namedNoneOf(String... names) {
-    return new NoneOf<>(tryMakeImmutableSet(Arrays.asList(names)));
-  }
-
-  /**
-   * Matches a {@link NamedElement} for its name's prefix.
-   *
-   * @param prefix The expected name's prefix.
-   * @param <T> The type of the matched object.
-   * @return An element matcher for a named element's name's prefix.
-   */
-  public static <T extends NamedElement> StartsWith<T> nameStartsWith(String prefix) {
-    return new StartsWith<>(prefix);
-  }
-
-  /**
-   * Matches a {@link NamedElement} for its name's suffix.
-   *
-   * @param suffix The expected name's suffix.
-   * @param <T> The type of the matched object.
-   * @return An element matcher for a named element's name's suffix.
-   */
-  public static <T extends NamedElement> EndsWith<T> nameEndsWith(String suffix) {
-    return new EndsWith<>(suffix);
-  }
-
-  /**
-   * Matches a {@link NamedElement} for its name not being in an exclusion set.
-   *
-   * @param type The type of exclusion to apply
-   * @param <T> The type of the matched object.
-   * @return An element matcher checking if an element's exact name is a member of a set.
-   */
-  public static <T extends NamedElement> NotExcluded<T> notExcludedByName(
-      ExcludeFilter.ExcludeType type) {
-    return new NotExcluded<>(type);
-  }
-
-  @SuppressWarnings("rawtypes")
-  private static final DDCache<String, Named> namedCache = DDCaches.newFixedSizeCache(256);
-
-  @SuppressWarnings("rawtypes")
-  private static final Function<String, Named> newNamedMatcher = Named::new;
-
-  public static final class Named<T extends NamedElement>
-      extends ElementMatcher.Junction.ForNonNullValues<T> {
-    final String name;
-
-    Named(String name) {
-      this.name = name;
+    /**
+     * Matches a {@link NamedElement} for its exact name.
+     *
+     * @param name The expected name.
+     * @param <T> The type of the matched object.
+     * @return An element matcher for a named element's exact name.
+     */
+    @SuppressWarnings("unchecked")
+    public static <T extends NamedElement> Named<T> named(String name) {
+        return namedCache.computeIfAbsent(name, newNamedMatcher);
     }
 
-    @Override
-    protected boolean doMatch(NamedElement target) {
-      return name.equals(target.getActualName());
+    /**
+     * Matches a {@link NamedElement} for its exact name's membership of a set.
+     *
+     * @param names The expected names.
+     * @param <T> The type of the matched object.
+     * @return An element matcher checking if an element's exact name is a member of a set.
+     */
+    public static <T extends NamedElement> OneOf<T> namedOneOf(String... names) {
+        return namedOneOf(Arrays.asList(names));
     }
 
-    @Override
-    public String toString() {
-      return "named(" + name + ")";
+    /**
+     * Matches a {@link NamedElement} for its exact name's membership of a set.
+     *
+     * @param names The expected names.
+     * @param <T> The type of the matched object.
+     * @return An element matcher checking if an element's exact name is a member of a set.
+     */
+    public static <T extends NamedElement> OneOf<T> namedOneOf(Collection<String> names) {
+        return new OneOf<>(tryMakeImmutableSet(names));
     }
-  }
 
-  public static final class StartsWith<T extends NamedElement>
-      extends ElementMatcher.Junction.ForNonNullValues<T> {
-    private final String name;
-
-    StartsWith(String name) {
-      this.name = name;
+    /**
+     * Matches a {@link NamedElement} for its exact name's absence from a set.
+     *
+     * @param names The expected names.
+     * @param <T> The type of the matched object.
+     * @return An element matcher checking if an element's exact name is absent from a set.
+     */
+    public static <T extends NamedElement> NoneOf<T> namedNoneOf(String... names) {
+        return new NoneOf<>(tryMakeImmutableSet(Arrays.asList(names)));
     }
 
-    @Override
-    protected boolean doMatch(NamedElement target) {
-      return target.getActualName().startsWith(name);
+    /**
+     * Matches a {@link NamedElement} for its name's prefix.
+     *
+     * @param prefix The expected name's prefix.
+     * @param <T> The type of the matched object.
+     * @return An element matcher for a named element's name's prefix.
+     */
+    public static <T extends NamedElement> StartsWith<T> nameStartsWith(String prefix) {
+        return new StartsWith<>(prefix);
     }
-  }
-
-  public static final class EndsWith<T extends NamedElement>
-      extends ElementMatcher.Junction.ForNonNullValues<T> {
-    private final String name;
 
-    EndsWith(String name) {
-      this.name = name;
+    /**
+     * Matches a {@link NamedElement} for its name's suffix.
+     *
+     * @param suffix The expected name's suffix.
+     * @param <T> The type of the matched object.
+     * @return An element matcher for a named element's name's suffix.
+     */
+    public static <T extends NamedElement> EndsWith<T> nameEndsWith(String suffix) {
+        return new EndsWith<>(suffix);
     }
 
-    @Override
-    protected boolean doMatch(NamedElement target) {
-      return target.getActualName().endsWith(name);
+    /**
+     * Matches a {@link NamedElement} for its name not being in an exclusion set.
+     *
+     * @param type The type of exclusion to apply
+     * @param <T> The type of the matched object.
+     * @return An element matcher checking if an element's exact name is a member of a set.
+     */
+    public static <T extends NamedElement> NotExcluded<T> notExcludedByName(ExcludeFilter.ExcludeType type) {
+        return new NotExcluded<>(type);
     }
-  }
 
-  public static final class OneOf<T extends NamedElement>
-      extends ElementMatcher.Junction.ForNonNullValues<T> {
-    final Set<String> names;
+    @SuppressWarnings("rawtypes")
+    private static final DDCache<String, Named> namedCache = DDCaches.newFixedSizeCache(256);
+
+    @SuppressWarnings("rawtypes")
+    private static final Function<String, Named> newNamedMatcher = Named::new;
+
+    public static final class Named<T extends NamedElement> extends ElementMatcher.Junction.ForNonNullValues<T> {
+        final String name;
 
-    OneOf(Set<String> names) {
-      this.names = names;
+        Named(String name) {
+            this.name = name;
+        }
+
+        @Override
+        protected boolean doMatch(NamedElement target) {
+            return name.equals(target.getActualName());
+        }
+
+        @Override
+        public String toString() {
+            return "named(" + name + ")";
+        }
     }
 
-    @Override
-    protected boolean doMatch(NamedElement target) {
-      return names.contains(target.getActualName());
+    public static final class StartsWith<T extends NamedElement> extends ElementMatcher.Junction.ForNonNullValues<T> {
+        private final String name;
+
+        StartsWith(String name) {
+            this.name = name;
+        }
+
+        @Override
+        protected boolean doMatch(NamedElement target) {
+            return target.getActualName().startsWith(name);
+        }
     }
-  }
 
-  public static final class NoneOf<T extends NamedElement>
-      extends ElementMatcher.Junction.ForNonNullValues<T> {
-    private final Set<String> names;
+    public static final class EndsWith<T extends NamedElement> extends ElementMatcher.Junction.ForNonNullValues<T> {
+        private final String name;
+
+        EndsWith(String name) {
+            this.name = name;
+        }
 
-    NoneOf(Set<String> names) {
-      this.names = names;
+        @Override
+        protected boolean doMatch(NamedElement target) {
+            return target.getActualName().endsWith(name);
+        }
     }
 
-    @Override
-    protected boolean doMatch(NamedElement target) {
-      return !names.contains(target.getActualName());
+    public static final class OneOf<T extends NamedElement> extends ElementMatcher.Junction.ForNonNullValues<T> {
+        final Set<String> names;
+
+        OneOf(Set<String> names) {
+            this.names = names;
+        }
+
+        @Override
+        protected boolean doMatch(NamedElement target) {
+            return names.contains(target.getActualName());
+        }
     }
-  }
 
-  public static final class NotExcluded<T extends NamedElement>
-      extends ElementMatcher.Junction.ForNonNullValues<T> {
-    private final ExcludeFilter.ExcludeType excludeType;
+    public static final class NoneOf<T extends NamedElement> extends ElementMatcher.Junction.ForNonNullValues<T> {
+        private final Set<String> names;
 
-    NotExcluded(ExcludeFilter.ExcludeType excludeType) {
-      this.excludeType = excludeType;
+        NoneOf(Set<String> names) {
+            this.names = names;
+        }
+
+        @Override
+        protected boolean doMatch(NamedElement target) {
+            return !names.contains(target.getActualName());
+        }
     }
 
-    @Override
-    protected boolean doMatch(NamedElement target) {
-      return !ExcludeFilter.exclude(excludeType, target.getActualName());
+    public static final class NotExcluded<T extends NamedElement> extends ElementMatcher.Junction.ForNonNullValues<T> {
+        private final ExcludeFilter.ExcludeType excludeType;
+
+        NotExcluded(ExcludeFilter.ExcludeType excludeType) {
+            this.excludeType = excludeType;
+        }
+
+        @Override
+        protected boolean doMatch(NamedElement target) {
+            return !ExcludeFilter.exclude(excludeType, target.getActualName());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ProxyClassIgnores.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ProxyClassIgnores.java
index 30c00e5af37..3fee5040593 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ProxyClassIgnores.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ProxyClassIgnores.java
@@ -2,23 +2,23 @@
 
 /** Ignores various generated proxies based on well-known markers in their class names. */
 public class ProxyClassIgnores {
-  private ProxyClassIgnores() {}
+    private ProxyClassIgnores() {}
 
-  public static boolean isIgnored(String name) {
-    for (int last = -1, idx; (idx = name.indexOf('$', last + 1)) >= 0; last = idx) {
-      if (last < 0 && name.contains("CGLIB$$")) {
-        // check this once
-        return true;
-      }
-      if (idx == last + 1) {
-        // skip the trie if consecutive $$ since, to be efficient, we can match prefixes from the
-        // first dollar
-        continue;
-      }
-      if (ProxyIgnoredClassNameTrie.apply(name, idx) == 1) {
-        return true;
-      }
+    public static boolean isIgnored(String name) {
+        for (int last = -1, idx; (idx = name.indexOf('$', last + 1)) >= 0; last = idx) {
+            if (last < 0 && name.contains("CGLIB$$")) {
+                // check this once
+                return true;
+            }
+            if (idx == last + 1) {
+                // skip the trie if consecutive $$ since, to be efficient, we can match prefixes from the
+                // first dollar
+                continue;
+            }
+            if (ProxyIgnoredClassNameTrie.apply(name, idx) == 1) {
+                return true;
+            }
+        }
+        return name.contains("javassist") || name.contains(".asm.");
     }
-    return name.contains("javassist") || name.contains(".asm.");
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ScalaTraitMatchers.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ScalaTraitMatchers.java
index 51464848f33..ad5586bbb03 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ScalaTraitMatchers.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ScalaTraitMatchers.java
@@ -13,32 +13,30 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class ScalaTraitMatchers {
-  public static ElementMatcher.Junction<MethodDescription> isTraitMethod(
-      String traitName, String name, Object... argumentTypes) {
+    public static ElementMatcher.Junction<MethodDescription> isTraitMethod(
+            String traitName, String name, Object... argumentTypes) {
 
-    ElementMatcher.Junction<MethodDescription> scalaOldArgs =
-        isStatic()
-            .and(takesArguments(argumentTypes.length + 1))
-            .and(takesArgument(0, named(traitName)));
-    ElementMatcher.Junction<MethodDescription> scalaNewArgs =
-        not(isStatic()).and(takesArguments(argumentTypes.length));
+        ElementMatcher.Junction<MethodDescription> scalaOldArgs =
+                isStatic().and(takesArguments(argumentTypes.length + 1)).and(takesArgument(0, named(traitName)));
+        ElementMatcher.Junction<MethodDescription> scalaNewArgs =
+                not(isStatic()).and(takesArguments(argumentTypes.length));
 
-    for (int i = 0; i < argumentTypes.length; i++) {
-      Object argumentType = argumentTypes[i];
-      ElementMatcher<? super TypeDescription> matcher;
-      if (argumentType instanceof ElementMatcher) {
-        matcher = (ElementMatcher<? super TypeDescription>) argumentType;
-      } else if (argumentType instanceof String) {
-        matcher = named((String) argumentType);
-      } else if (argumentType instanceof Class) {
-        matcher = is((Class<?>) argumentType);
-      } else {
-        throw new IllegalArgumentException("Unexpected type for argument type specification");
-      }
-      scalaOldArgs = scalaOldArgs.and(takesArgument(i + 1, matcher));
-      scalaNewArgs = scalaNewArgs.and(takesArgument(i, matcher));
-    }
+        for (int i = 0; i < argumentTypes.length; i++) {
+            Object argumentType = argumentTypes[i];
+            ElementMatcher<? super TypeDescription> matcher;
+            if (argumentType instanceof ElementMatcher) {
+                matcher = (ElementMatcher<? super TypeDescription>) argumentType;
+            } else if (argumentType instanceof String) {
+                matcher = named((String) argumentType);
+            } else if (argumentType instanceof Class) {
+                matcher = is((Class<?>) argumentType);
+            } else {
+                throw new IllegalArgumentException("Unexpected type for argument type specification");
+            }
+            scalaOldArgs = scalaOldArgs.and(takesArgument(i + 1, matcher));
+            scalaNewArgs = scalaNewArgs.and(takesArgument(i, matcher));
+        }
 
-    return isMethod().and(named(name)).and(scalaOldArgs.or(scalaNewArgs));
-  }
+        return isMethod().and(named(name)).and(scalaOldArgs.or(scalaNewArgs));
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/HasContextField.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/HasContextField.java
index 33b5d66c039..2c9af445b01 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/HasContextField.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/HasContextField.java
@@ -7,55 +7,54 @@
 
 /** Matches types that should have context-store fields injected. */
 final class HasContextField extends ElementMatcher.Junction.ForNonNullValues<TypeDescription> {
-  private final ElementMatcher<TypeDescription> storeMatcher;
-  private final ElementMatcher<TypeDescription> skipMatcher;
-  private final BitSet skippableStoreIds = new BitSet();
-
-  HasContextField(ElementMatcher<TypeDescription> storeMatcher) {
-    this(storeMatcher, null);
-  }
-
-  HasContextField(
-      ElementMatcher<TypeDescription> storeMatcher, ElementMatcher<TypeDescription> skipMatcher) {
-    this.storeMatcher = storeMatcher;
-    this.skipMatcher = skipMatcher;
-  }
-
-  @Override
-  protected boolean doMatch(TypeDescription target) {
-    // match first type in the hierarchy which injects this store, that isn't skipped
-    return storeMatcher.matches(target)
-        && (null == skipMatcher || !skipMatcher.matches(target))
-        && (!storeMatcher.matches(target.getSuperClass().asErasure()));
-  }
-
-  void maybeSkip(int contextStoreId) {
-    skippableStoreIds.set(contextStoreId);
-  }
-
-  boolean hasSuperStore(TypeDescription target, BitSet weakStoreIds) {
-    TypeDescription superTarget = target.getSuperClass().asErasure();
-    boolean hasSuperStore = storeMatcher.matches(superTarget);
-    if (hasSuperStore) {
-      // report if super-class was skipped from field-injection
-      if (null != skipMatcher && skipMatcher.matches(superTarget)) {
-        weakStoreIds.or(skippableStoreIds);
-      }
-    }
-    return hasSuperStore;
-  }
+    private final ElementMatcher<TypeDescription> storeMatcher;
+    private final ElementMatcher<TypeDescription> skipMatcher;
+    private final BitSet skippableStoreIds = new BitSet();
 
-  /** Matches types that would have had fields injected, but were explicitly excluded. */
-  static final class Skip extends ElementMatcher.Junction.ForNonNullValues<TypeDescription> {
-    private final ExcludeFilter.ExcludeType excludeType;
+    HasContextField(ElementMatcher<TypeDescription> storeMatcher) {
+        this(storeMatcher, null);
+    }
 
-    Skip(ExcludeFilter.ExcludeType excludeType) {
-      this.excludeType = excludeType;
+    HasContextField(ElementMatcher<TypeDescription> storeMatcher, ElementMatcher<TypeDescription> skipMatcher) {
+        this.storeMatcher = storeMatcher;
+        this.skipMatcher = skipMatcher;
     }
 
     @Override
     protected boolean doMatch(TypeDescription target) {
-      return ExcludeFilter.exclude(excludeType, target.getName());
+        // match first type in the hierarchy which injects this store, that isn't skipped
+        return storeMatcher.matches(target)
+                && (null == skipMatcher || !skipMatcher.matches(target))
+                && (!storeMatcher.matches(target.getSuperClass().asErasure()));
+    }
+
+    void maybeSkip(int contextStoreId) {
+        skippableStoreIds.set(contextStoreId);
+    }
+
+    boolean hasSuperStore(TypeDescription target, BitSet weakStoreIds) {
+        TypeDescription superTarget = target.getSuperClass().asErasure();
+        boolean hasSuperStore = storeMatcher.matches(superTarget);
+        if (hasSuperStore) {
+            // report if super-class was skipped from field-injection
+            if (null != skipMatcher && skipMatcher.matches(superTarget)) {
+                weakStoreIds.or(skippableStoreIds);
+            }
+        }
+        return hasSuperStore;
+    }
+
+    /** Matches types that would have had fields injected, but were explicitly excluded. */
+    static final class Skip extends ElementMatcher.Junction.ForNonNullValues<TypeDescription> {
+        private final ExcludeFilter.ExcludeType excludeType;
+
+        Skip(ExcludeFilter.ExcludeType excludeType) {
+            this.excludeType = excludeType;
+        }
+
+        @Override
+        protected boolean doMatch(TypeDescription target) {
+            return ExcludeFilter.exclude(excludeType, target.getName());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/HasSuperMethod.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/HasSuperMethod.java
index 5d408072b9c..47ed5afb3ae 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/HasSuperMethod.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/HasSuperMethod.java
@@ -15,69 +15,66 @@
  * signature that matches. Uses a memoized type matcher to reduce the potential search space.
  */
 final class HasSuperMethod extends ElementMatcher.Junction.ForNonNullValues<MethodDescription> {
-  private final ElementMatcher<TypeDescription> typeMatcher;
-  private final ElementMatcher<? super MethodDescription> methodMatcher;
+    private final ElementMatcher<TypeDescription> typeMatcher;
+    private final ElementMatcher<? super MethodDescription> methodMatcher;
 
-  HasSuperMethod(
-      ElementMatcher<TypeDescription> typeMatcher,
-      ElementMatcher<? super MethodDescription> methodMatcher) {
-    this.typeMatcher = typeMatcher;
-    this.methodMatcher = methodMatcher;
-  }
-
-  @Override
-  protected boolean doMatch(MethodDescription target) {
-    if (target.isConstructor()) {
-      return false;
+    HasSuperMethod(
+            ElementMatcher<TypeDescription> typeMatcher, ElementMatcher<? super MethodDescription> methodMatcher) {
+        this.typeMatcher = typeMatcher;
+        this.methodMatcher = methodMatcher;
     }
 
-    TypeDefinition type = target.getDeclaringType();
-    if (!typeMatcher.matches(type.asErasure())) {
-      return false; // no further matches recorded in hierarchy
-    } else if (methodMatcher.matches(target)) {
-      return true; // direct match, no need to check hierarchy
-    }
+    @Override
+    protected boolean doMatch(MethodDescription target) {
+        if (target.isConstructor()) {
+            return false;
+        }
 
-    // need to search hierarchy; use expected signature to filter candidate methods
-    ElementMatcher<MethodDescription> signatureMatcher = hasSignature(target.asSignatureToken());
-    Set<String> visited = new HashSet<>();
+        TypeDefinition type = target.getDeclaringType();
+        if (!typeMatcher.matches(type.asErasure())) {
+            return false; // no further matches recorded in hierarchy
+        } else if (methodMatcher.matches(target)) {
+            return true; // direct match, no need to check hierarchy
+        }
 
-    if (interfaceMatches(type.getInterfaces(), signatureMatcher, visited)) {
-      return true;
-    }
+        // need to search hierarchy; use expected signature to filter candidate methods
+        ElementMatcher<MethodDescription> signatureMatcher = hasSignature(target.asSignatureToken());
+        Set<String> visited = new HashSet<>();
+
+        if (interfaceMatches(type.getInterfaces(), signatureMatcher, visited)) {
+            return true;
+        }
 
-    type = type.getSuperClass();
-    while (null != type && typeMatcher.matches(type.asErasure())) {
-      for (MethodDescription method : type.getDeclaredMethods()) {
-        if (signatureMatcher.matches(method) && methodMatcher.matches(method)) {
-          return true;
+        type = type.getSuperClass();
+        while (null != type && typeMatcher.matches(type.asErasure())) {
+            for (MethodDescription method : type.getDeclaredMethods()) {
+                if (signatureMatcher.matches(method) && methodMatcher.matches(method)) {
+                    return true;
+                }
+            }
+            if (interfaceMatches(type.getInterfaces(), signatureMatcher, visited)) {
+                return true;
+            }
+            type = type.getSuperClass();
         }
-      }
-      if (interfaceMatches(type.getInterfaces(), signatureMatcher, visited)) {
-        return true;
-      }
-      type = type.getSuperClass();
+        return false;
     }
-    return false;
-  }
 
-  private boolean interfaceMatches(
-      TypeList.Generic interfaces,
-      ElementMatcher<MethodDescription> signatureMatcher,
-      Set<String> visited) {
-    for (TypeDefinition type : interfaces) {
-      if (!visited.add(type.getTypeName()) || !typeMatcher.matches(type.asErasure())) {
-        continue; // skip if already visited or that part of the hierarchy doesn't match
-      }
-      for (MethodDescription method : type.getDeclaredMethods()) {
-        if (signatureMatcher.matches(method) && methodMatcher.matches(method)) {
-          return true;
+    private boolean interfaceMatches(
+            TypeList.Generic interfaces, ElementMatcher<MethodDescription> signatureMatcher, Set<String> visited) {
+        for (TypeDefinition type : interfaces) {
+            if (!visited.add(type.getTypeName()) || !typeMatcher.matches(type.asErasure())) {
+                continue; // skip if already visited or that part of the hierarchy doesn't match
+            }
+            for (MethodDescription method : type.getDeclaredMethods()) {
+                if (signatureMatcher.matches(method) && methodMatcher.matches(method)) {
+                    return true;
+                }
+            }
+            if (interfaceMatches(type.getInterfaces(), signatureMatcher, visited)) {
+                return true;
+            }
         }
-      }
-      if (interfaceMatches(type.getInterfaces(), signatureMatcher, visited)) {
-        return true;
-      }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/MemoizedMatchers.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/MemoizedMatchers.java
index 0cdffbcc854..998c0b34db0 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/MemoizedMatchers.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/MemoizedMatchers.java
@@ -22,110 +22,103 @@
 
 /** Supplies memoized matchers. */
 public final class MemoizedMatchers implements HierarchyMatchers.Supplier {
-  public static void registerAsSupplier() {
-    PreloadHierarchy.observeClassDefinitions();
-    HierarchyMatchers.registerIfAbsent(new MemoizedMatchers());
-    Memoizer.resetState();
-  }
-
-  @Override
-  public ElementMatcher.Junction<TypeDescription> declaresAnnotation(
-      ElementMatcher<? super NamedElement> matcher) {
-    return Memoizer.prepare(ANNOTATION, matcher, false);
-  }
-
-  @Override
-  public ElementMatcher.Junction<TypeDescription> declaresField(
-      ElementMatcher<? super FieldDescription> matcher) {
-    return Memoizer.prepare(FIELD, matcher, false);
-  }
-
-  @Override
-  public ElementMatcher.Junction<TypeDescription> declaresMethod(
-      ElementMatcher<? super MethodDescription> matcher) {
-    return Memoizer.prepare(METHOD, matcher, false);
-  }
-
-  @Override
-  public ElementMatcher.Junction<TypeDescription> concreteClass() {
-    return Memoizer.isConcrete;
-  }
-
-  @Override
-  public ElementMatcher.Junction<TypeDescription> extendsClass(
-      ElementMatcher<? super TypeDescription> matcher) {
-    return Memoizer.prepare(CLASS, matcher, true);
-  }
-
-  @Override
-  public ElementMatcher.Junction<TypeDescription> implementsInterface(
-      ElementMatcher<? super TypeDescription> matcher) {
-    return Memoizer.isClass.and(Memoizer.prepare(INTERFACE, matcher, true));
-  }
-
-  @Override
-  public ElementMatcher.Junction<TypeDescription> hasInterface(
-      ElementMatcher<? super TypeDescription> matcher) {
-    return Memoizer.prepare(INTERFACE, matcher, true);
-  }
-
-  @Override
-  public ElementMatcher.Junction<TypeDescription> hasSuperType(
-      ElementMatcher<? super TypeDescription> matcher) {
-    return Memoizer.isClass.and(Memoizer.prepare(TYPE, matcher, true));
-  }
-
-  @Override
-  public ElementMatcher.Junction<MethodDescription> hasSuperMethod(
-      ElementMatcher<? super MethodDescription> matcher) {
-    return new HasSuperMethod(Memoizer.prepare(METHOD, matcher, true), matcher);
-  }
-
-  /** Keeps track of which context-field matchers we've supplied so far. */
-  private static final Map<String, HasContextField> contextFields = new HashMap<>();
-
-  @Override
-  public ElementMatcher.Junction<TypeDescription> declaresContextField(
-      String keyType, String contextType) {
-
-    // is there a chance a type might match, but be excluded (skipped) from field-injection?
-    ExcludeFilter.ExcludeType excludeType = ExcludeFilter.ExcludeType.fromFieldType(keyType);
-
-    HasContextField contextField = contextFields.get(keyType);
-    if (null == contextField) {
-      ElementMatcher<TypeDescription> storeMatcher = hasSuperType(named(keyType));
-      if (null != excludeType) {
-        ElementMatcher<TypeDescription> skipMatcher =
-            Memoizer.prepare(CLASS, new HasContextField.Skip(excludeType), true);
-        contextField = new HasContextField(storeMatcher, skipMatcher);
-      } else {
-        contextField = new HasContextField(storeMatcher);
-      }
-      contextFields.put(keyType, contextField);
+    public static void registerAsSupplier() {
+        PreloadHierarchy.observeClassDefinitions();
+        HierarchyMatchers.registerIfAbsent(new MemoizedMatchers());
+        Memoizer.resetState();
     }
 
-    if (null != excludeType) {
-      // record that this store may be skipped from field-injection
-      contextField.maybeSkip(getContextStoreId(keyType, contextType));
+    @Override
+    public ElementMatcher.Junction<TypeDescription> declaresAnnotation(ElementMatcher<? super NamedElement> matcher) {
+        return Memoizer.prepare(ANNOTATION, matcher, false);
     }
 
-    return contextField;
-  }
-
-  /**
-   * Returns {@code true} if ancestors of the given type have any context-stores.
-   *
-   * <p>Stores which were skipped from field-injection in the super-class hierarchy are recorded in
-   * {@code weakStoreIds} so the appropriate weak-map delegation can be applied when injecting code
-   * to handle context-store requests.
-   */
-  public static boolean hasSuperStores(TypeDescription target, BitSet weakStoreIds) {
-    boolean hasSuperStores = false;
-    for (HasContextField contextField : contextFields.values()) {
-      if (contextField.hasSuperStore(target, weakStoreIds)) {
-        hasSuperStores = true;
-      }
+    @Override
+    public ElementMatcher.Junction<TypeDescription> declaresField(ElementMatcher<? super FieldDescription> matcher) {
+        return Memoizer.prepare(FIELD, matcher, false);
+    }
+
+    @Override
+    public ElementMatcher.Junction<TypeDescription> declaresMethod(ElementMatcher<? super MethodDescription> matcher) {
+        return Memoizer.prepare(METHOD, matcher, false);
+    }
+
+    @Override
+    public ElementMatcher.Junction<TypeDescription> concreteClass() {
+        return Memoizer.isConcrete;
+    }
+
+    @Override
+    public ElementMatcher.Junction<TypeDescription> extendsClass(ElementMatcher<? super TypeDescription> matcher) {
+        return Memoizer.prepare(CLASS, matcher, true);
+    }
+
+    @Override
+    public ElementMatcher.Junction<TypeDescription> implementsInterface(
+            ElementMatcher<? super TypeDescription> matcher) {
+        return Memoizer.isClass.and(Memoizer.prepare(INTERFACE, matcher, true));
+    }
+
+    @Override
+    public ElementMatcher.Junction<TypeDescription> hasInterface(ElementMatcher<? super TypeDescription> matcher) {
+        return Memoizer.prepare(INTERFACE, matcher, true);
+    }
+
+    @Override
+    public ElementMatcher.Junction<TypeDescription> hasSuperType(ElementMatcher<? super TypeDescription> matcher) {
+        return Memoizer.isClass.and(Memoizer.prepare(TYPE, matcher, true));
+    }
+
+    @Override
+    public ElementMatcher.Junction<MethodDescription> hasSuperMethod(
+            ElementMatcher<? super MethodDescription> matcher) {
+        return new HasSuperMethod(Memoizer.prepare(METHOD, matcher, true), matcher);
+    }
+
+    /** Keeps track of which context-field matchers we've supplied so far. */
+    private static final Map<String, HasContextField> contextFields = new HashMap<>();
+
+    @Override
+    public ElementMatcher.Junction<TypeDescription> declaresContextField(String keyType, String contextType) {
+
+        // is there a chance a type might match, but be excluded (skipped) from field-injection?
+        ExcludeFilter.ExcludeType excludeType = ExcludeFilter.ExcludeType.fromFieldType(keyType);
+
+        HasContextField contextField = contextFields.get(keyType);
+        if (null == contextField) {
+            ElementMatcher<TypeDescription> storeMatcher = hasSuperType(named(keyType));
+            if (null != excludeType) {
+                ElementMatcher<TypeDescription> skipMatcher =
+                        Memoizer.prepare(CLASS, new HasContextField.Skip(excludeType), true);
+                contextField = new HasContextField(storeMatcher, skipMatcher);
+            } else {
+                contextField = new HasContextField(storeMatcher);
+            }
+            contextFields.put(keyType, contextField);
+        }
+
+        if (null != excludeType) {
+            // record that this store may be skipped from field-injection
+            contextField.maybeSkip(getContextStoreId(keyType, contextType));
+        }
+
+        return contextField;
+    }
+
+    /**
+     * Returns {@code true} if ancestors of the given type have any context-stores.
+     *
+     * <p>Stores which were skipped from field-injection in the super-class hierarchy are recorded in
+     * {@code weakStoreIds} so the appropriate weak-map delegation can be applied when injecting code
+     * to handle context-store requests.
+     */
+    public static boolean hasSuperStores(TypeDescription target, BitSet weakStoreIds) {
+        boolean hasSuperStores = false;
+        for (HasContextField contextField : contextFields.values()) {
+            if (contextField.hasSuperStore(target, weakStoreIds)) {
+                hasSuperStores = true;
+            }
+        }
+        return hasSuperStores;
     }
-    return hasSuperStores;
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/Memoizer.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/Memoizer.java
index 6c8d01152ca..23a2187917b 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/Memoizer.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/Memoizer.java
@@ -29,257 +29,246 @@
 @SuppressForbidden
 @SuppressWarnings("rawtypes")
 public final class Memoizer {
-  private static final Logger log = LoggerFactory.getLogger(Memoizer.class);
-
-  enum MatcherKind {
-    ANNOTATION,
-    FIELD,
-    METHOD,
-    CLASS,
-    INTERFACE,
-    TYPE // i.e. class or interface
-  }
+    private static final Logger log = LoggerFactory.getLogger(Memoizer.class);
+
+    enum MatcherKind {
+        ANNOTATION,
+        FIELD,
+        METHOD,
+        CLASS,
+        INTERFACE,
+        TYPE // i.e. class or interface
+    }
 
-  private static final BitSet NO_MATCH = new BitSet(0);
+    private static final BitSet NO_MATCH = new BitSet(0);
 
-  private static final int SIZE_HINT = 320; // estimated number of matchers
+    private static final int SIZE_HINT = 320; // estimated number of matchers
 
-  // records the kind of matcher and whether matches should be inherited
-  private static final BitSet annotationMatcherIds = new BitSet(SIZE_HINT);
-  private static final BitSet fieldMatcherIds = new BitSet(SIZE_HINT);
-  private static final BitSet methodMatcherIds = new BitSet(SIZE_HINT);
-  private static final BitSet classMatcherIds = new BitSet(SIZE_HINT);
-  private static final BitSet interfaceMatcherIds = new BitSet(SIZE_HINT);
-  private static final BitSet inheritedMatcherIds = new BitSet(SIZE_HINT);
+    // records the kind of matcher and whether matches should be inherited
+    private static final BitSet annotationMatcherIds = new BitSet(SIZE_HINT);
+    private static final BitSet fieldMatcherIds = new BitSet(SIZE_HINT);
+    private static final BitSet methodMatcherIds = new BitSet(SIZE_HINT);
+    private static final BitSet classMatcherIds = new BitSet(SIZE_HINT);
+    private static final BitSet interfaceMatcherIds = new BitSet(SIZE_HINT);
+    private static final BitSet inheritedMatcherIds = new BitSet(SIZE_HINT);
 
-  // matchers that are ready for memoization
-  static final List<ElementMatcher> matchers = new ArrayList<>();
+    // matchers that are ready for memoization
+    static final List<ElementMatcher> matchers = new ArrayList<>();
 
-  // small cache to de-duplicate memoization requests
-  private static final DDCache<ElementMatcher, MemoizingMatcher> memoizingMatcherCache =
-      DDCaches.newFixedSizeIdentityCache(8);
+    // small cache to de-duplicate memoization requests
+    private static final DDCache<ElementMatcher, MemoizingMatcher> memoizingMatcherCache =
+            DDCaches.newFixedSizeIdentityCache(8);
 
-  private static final boolean namesAreUnique = InstrumenterConfig.get().isResolverNamesAreUnique();
+    private static final boolean namesAreUnique = InstrumenterConfig.get().isResolverNamesAreUnique();
 
-  // compact filter recording uninteresting types
-  private static final ClassNameFilter noMatchFilter = NoMatchFilter.build();
+    // compact filter recording uninteresting types
+    private static final ClassNameFilter noMatchFilter = NoMatchFilter.build();
 
-  // caches positive memoized matches
-  private static final TypeInfoCache<BitSet> memos =
-      new TypeInfoCache<>(InstrumenterConfig.get().getResolverMemoPoolSize(), namesAreUnique);
+    // caches positive memoized matches
+    private static final TypeInfoCache<BitSet> memos =
+            new TypeInfoCache<>(InstrumenterConfig.get().getResolverMemoPoolSize(), namesAreUnique);
 
-  // local memoized results, used to detect circular references
-  static final ThreadLocal<Map<String, BitSet>> localMemosHolder =
-      ThreadLocal.withInitial(HashMap::new);
+    // local memoized results, used to detect circular references
+    static final ThreadLocal<Map<String, BitSet>> localMemosHolder = ThreadLocal.withInitial(HashMap::new);
 
-  private static final int INTERNAL_MATCHERS = 3; // isClass, isConcrete, isPartial
+    private static final int INTERNAL_MATCHERS = 3; // isClass, isConcrete, isPartial
 
-  // memoize whether the type is a class
-  static final MemoizingMatcher isClass = prepare(MatcherKind.CLASS, ElementMatchers.any(), true);
+    // memoize whether the type is a class
+    static final MemoizingMatcher isClass = prepare(MatcherKind.CLASS, ElementMatchers.any(), true);
 
-  // memoize whether the type is a concrete class, i.e. no abstract methods
-  static final MemoizingMatcher isConcrete =
-      prepare(MatcherKind.CLASS, not(ElementMatchers.isAbstract()), false);
+    // memoize whether the type is a concrete class, i.e. no abstract methods
+    static final MemoizingMatcher isConcrete = prepare(MatcherKind.CLASS, not(ElementMatchers.isAbstract()), false);
 
-  // memoize whether this is based on partial information due to missing types
-  static final MemoizingMatcher isPartial = prepare(MatcherKind.TYPE, ElementMatchers.none(), true);
+    // memoize whether this is based on partial information due to missing types
+    static final MemoizingMatcher isPartial = prepare(MatcherKind.TYPE, ElementMatchers.none(), true);
 
-  public static void resetState() {
-    // no need to reset the state if we haven't added any external matchers
-    if (matchers.size() > INTERNAL_MATCHERS) {
-      noMatchFilter.clear();
-      Memoizer.clear();
+    public static void resetState() {
+        // no need to reset the state if we haven't added any external matchers
+        if (matchers.size() > INTERNAL_MATCHERS) {
+            noMatchFilter.clear();
+            Memoizer.clear();
+        }
     }
-  }
-
-  public static void clear() {
-    memos.clear();
-  }
-
-  static MemoizingMatcher withMatcherId(ElementMatcher matcher) {
-    return new MemoizingMatcher(matchers.size());
-  }
 
-  /** Prepares a matcher for memoization. */
-  static <T> MemoizingMatcher prepare(
-      MatcherKind kind, ElementMatcher<T> matcher, boolean inherited) {
-
-    MemoizingMatcher memoizingMatcher =
-        memoizingMatcherCache.computeIfAbsent(matcher, Memoizer::withMatcherId);
-
-    int matcherId = memoizingMatcher.matcherId;
-    if (matcherId < matchers.size()) {
-      return memoizingMatcher; // de-duplicated matcher
-    } else {
-      matchers.add(matcher);
+    public static void clear() {
+        memos.clear();
     }
 
-    switch (kind) {
-      case ANNOTATION:
-        annotationMatcherIds.set(matcherId);
-        break;
-      case FIELD:
-        fieldMatcherIds.set(matcherId);
-        break;
-      case METHOD:
-        methodMatcherIds.set(matcherId);
-        break;
-      case CLASS:
-        classMatcherIds.set(matcherId);
-        break;
-      case INTERFACE:
-        interfaceMatcherIds.set(matcherId);
-        break;
-      case TYPE:
-        classMatcherIds.set(matcherId);
-        interfaceMatcherIds.set(matcherId);
-        break;
+    static MemoizingMatcher withMatcherId(ElementMatcher matcher) {
+        return new MemoizingMatcher(matchers.size());
     }
 
-    if (inherited) {
-      inheritedMatcherIds.set(matcherId);
+    /** Prepares a matcher for memoization. */
+    static <T> MemoizingMatcher prepare(MatcherKind kind, ElementMatcher<T> matcher, boolean inherited) {
+
+        MemoizingMatcher memoizingMatcher = memoizingMatcherCache.computeIfAbsent(matcher, Memoizer::withMatcherId);
+
+        int matcherId = memoizingMatcher.matcherId;
+        if (matcherId < matchers.size()) {
+            return memoizingMatcher; // de-duplicated matcher
+        } else {
+            matchers.add(matcher);
+        }
+
+        switch (kind) {
+            case ANNOTATION:
+                annotationMatcherIds.set(matcherId);
+                break;
+            case FIELD:
+                fieldMatcherIds.set(matcherId);
+                break;
+            case METHOD:
+                methodMatcherIds.set(matcherId);
+                break;
+            case CLASS:
+                classMatcherIds.set(matcherId);
+                break;
+            case INTERFACE:
+                interfaceMatcherIds.set(matcherId);
+                break;
+            case TYPE:
+                classMatcherIds.set(matcherId);
+                interfaceMatcherIds.set(matcherId);
+                break;
+        }
+
+        if (inherited) {
+            inheritedMatcherIds.set(matcherId);
+        }
+
+        return memoizingMatcher;
     }
 
-    return memoizingMatcher;
-  }
-
-  /** Matcher wrapper that triggers memoization on request. */
-  static final class MemoizingMatcher
-      extends ElementMatcher.Junction.ForNonNullValues<TypeDescription> {
-    final int matcherId;
-
-    MemoizingMatcher(int matcherId) {
-      this.matcherId = matcherId;
+    /** Matcher wrapper that triggers memoization on request. */
+    static final class MemoizingMatcher extends ElementMatcher.Junction.ForNonNullValues<TypeDescription> {
+        final int matcherId;
+
+        MemoizingMatcher(int matcherId) {
+            this.matcherId = matcherId;
+        }
+
+        @Override
+        protected boolean doMatch(TypeDescription target) {
+            String targetName = target.getName();
+            if (noMatchFilter.contains(targetName) || "java.lang.Object".equals(targetName) || target.isPrimitive()) {
+                return false;
+            } else {
+                return doMemoize(target, localMemosHolder.get()).get(matcherId);
+            }
+        }
     }
 
-    @Override
-    protected boolean doMatch(TypeDescription target) {
-      String targetName = target.getName();
-      if (noMatchFilter.contains(targetName)
-          || "java.lang.Object".equals(targetName)
-          || target.isPrimitive()) {
-        return false;
-      } else {
-        return doMemoize(target, localMemosHolder.get()).get(matcherId);
-      }
+    static BitSet memoizeHierarchy(TypeDescription type, Map<String, BitSet> localMemos) {
+        if (noMatchFilter.contains(type.getName())) {
+            return NO_MATCH;
+        } else {
+            return doMemoize(type, localMemos);
+        }
     }
-  }
 
-  static BitSet memoizeHierarchy(TypeDescription type, Map<String, BitSet> localMemos) {
-    if (noMatchFilter.contains(type.getName())) {
-      return NO_MATCH;
-    } else {
-      return doMemoize(type, localMemos);
+    static BitSet doMemoize(TypeDescription type, Map<String, BitSet> localMemos) {
+
+        String name = type.getName();
+        BitSet memo = localMemos.get(name);
+        if (null != memo) {
+            return memo; // short-circuit circular references
+        }
+
+        long fromTick = InstrumenterMetrics.tick();
+        SharedTypeInfo<BitSet> sharedMemo = memos.find(name);
+        if (null != sharedMemo) {
+            if (namesAreUnique || name.startsWith("java.") || sameOrigin(type, sharedMemo)) {
+                InstrumenterMetrics.reuseTypeMemo(fromTick);
+                return sharedMemo.get();
+            }
+        }
+
+        localMemos.put(name, memo = new BitSet(matchers.size()));
+        boolean wasFullParsing = TypePoolFacade.disableFullDescriptions(); // only need outlines here
+        try {
+            TypeDescription.Generic superType = type.getSuperClass();
+            long superTick = InstrumenterMetrics.tick();
+            if (null != superType && !"java.lang.Object".equals(superType.getTypeName())) {
+                inherit(memoizeHierarchy(superType.asErasure(), localMemos), memo);
+            }
+            for (TypeDescription.Generic intf : type.getInterfaces()) {
+                inherit(memoizeHierarchy(intf.asErasure(), localMemos), memo);
+            }
+            fromTick += (InstrumenterMetrics.tick() - superTick); // adjust to exclude super-type ticks
+            for (AnnotationDescription ann : type.getDeclaredAnnotations()) {
+                record(annotationMatcherIds, ann.getAnnotationType(), memo);
+            }
+            for (FieldDescription field : type.getDeclaredFields()) {
+                record(fieldMatcherIds, field, memo);
+            }
+            for (MethodDescription method : type.getDeclaredMethods()) {
+                record(methodMatcherIds, method, memo);
+            }
+            record(type.isInterface() ? interfaceMatcherIds : classMatcherIds, type, memo);
+        } catch (Throwable e) {
+            // we're missing some type information so record the result as partial
+            memo.set(isPartial.matcherId);
+            if (log.isDebugEnabled()) {
+                log.debug("{} recording matches for type {}: {}", e.getClass().getSimpleName(), name, e.getMessage());
+            }
+        } finally {
+            localMemos.remove(name);
+            if (wasFullParsing) {
+                TypePoolFacade.enableFullDescriptions();
+            }
+        }
+
+        InstrumenterMetrics.buildTypeMemo(fromTick);
+
+        // update no-match filter if there's no interesting matches and result is complete
+        if (memo.nextSetBit(INTERNAL_MATCHERS) < 0 && !memo.get(isPartial.matcherId)) {
+            noMatchFilter.add(name);
+            return NO_MATCH;
+        }
+
+        // otherwise share result for this location (other locations may have different results)
+        if (namesAreUnique || name.startsWith("java.") || !(type instanceof WithLocation)) {
+            memos.share(name, 0, null, memo);
+        } else {
+            WithLocation origin = (WithLocation) type;
+            memos.share(name, origin.getClassLoaderId(), origin.getClassFile(), memo);
+        }
+
+        return memo;
     }
-  }
 
-  static BitSet doMemoize(TypeDescription type, Map<String, BitSet> localMemos) {
-
-    String name = type.getName();
-    BitSet memo = localMemos.get(name);
-    if (null != memo) {
-      return memo; // short-circuit circular references
-    }
-
-    long fromTick = InstrumenterMetrics.tick();
-    SharedTypeInfo<BitSet> sharedMemo = memos.find(name);
-    if (null != sharedMemo) {
-      if (namesAreUnique || name.startsWith("java.") || sameOrigin(type, sharedMemo)) {
-        InstrumenterMetrics.reuseTypeMemo(fromTick);
-        return sharedMemo.get();
-      }
+    /** Any type not recorded as a definite "no-match" is a potential match. */
+    static boolean potentialMatch(String name) {
+        return !noMatchFilter.contains(name);
     }
 
-    localMemos.put(name, memo = new BitSet(matchers.size()));
-    boolean wasFullParsing = TypePoolFacade.disableFullDescriptions(); // only need outlines here
-    try {
-      TypeDescription.Generic superType = type.getSuperClass();
-      long superTick = InstrumenterMetrics.tick();
-      if (null != superType && !"java.lang.Object".equals(superType.getTypeName())) {
-        inherit(memoizeHierarchy(superType.asErasure(), localMemos), memo);
-      }
-      for (TypeDescription.Generic intf : type.getInterfaces()) {
-        inherit(memoizeHierarchy(intf.asErasure(), localMemos), memo);
-      }
-      fromTick += (InstrumenterMetrics.tick() - superTick); // adjust to exclude super-type ticks
-      for (AnnotationDescription ann : type.getDeclaredAnnotations()) {
-        record(annotationMatcherIds, ann.getAnnotationType(), memo);
-      }
-      for (FieldDescription field : type.getDeclaredFields()) {
-        record(fieldMatcherIds, field, memo);
-      }
-      for (MethodDescription method : type.getDeclaredMethods()) {
-        record(methodMatcherIds, method, memo);
-      }
-      record(type.isInterface() ? interfaceMatcherIds : classMatcherIds, type, memo);
-    } catch (Throwable e) {
-      // we're missing some type information so record the result as partial
-      memo.set(isPartial.matcherId);
-      if (log.isDebugEnabled()) {
-        log.debug(
-            "{} recording matches for type {}: {}",
-            e.getClass().getSimpleName(),
-            name,
-            e.getMessage());
-      }
-    } finally {
-      localMemos.remove(name);
-      if (wasFullParsing) {
-        TypePoolFacade.enableFullDescriptions();
-      }
+    private static boolean sameOrigin(TypeDescription type, SharedTypeInfo<BitSet> sharedMemo) {
+        return !(type instanceof WithLocation)
+                || sharedMemo.sameClassLoader(((WithLocation) type).getClassLoaderId())
+                || sharedMemo.sameClassFile(((WithLocation) type).getClassFile());
     }
 
-    InstrumenterMetrics.buildTypeMemo(fromTick);
-
-    // update no-match filter if there's no interesting matches and result is complete
-    if (memo.nextSetBit(INTERNAL_MATCHERS) < 0 && !memo.get(isPartial.matcherId)) {
-      noMatchFilter.add(name);
-      return NO_MATCH;
+    /** Inherit positive matches from a super-class or interface. */
+    private static void inherit(BitSet superMemo, BitSet memo) {
+        int matcherId = superMemo.nextSetBit(0);
+        while (matcherId >= 0) {
+            if (inheritedMatcherIds.get(matcherId)) {
+                memo.set(matcherId);
+            }
+            matcherId = superMemo.nextSetBit(matcherId + 1);
+        }
     }
 
-    // otherwise share result for this location (other locations may have different results)
-    if (namesAreUnique || name.startsWith("java.") || !(type instanceof WithLocation)) {
-      memos.share(name, 0, null, memo);
-    } else {
-      WithLocation origin = (WithLocation) type;
-      memos.share(name, origin.getClassLoaderId(), origin.getClassFile(), memo);
-    }
-
-    return memo;
-  }
-
-  /** Any type not recorded as a definite "no-match" is a potential match. */
-  static boolean potentialMatch(String name) {
-    return !noMatchFilter.contains(name);
-  }
-
-  private static boolean sameOrigin(TypeDescription type, SharedTypeInfo<BitSet> sharedMemo) {
-    return !(type instanceof WithLocation)
-        || sharedMemo.sameClassLoader(((WithLocation) type).getClassLoaderId())
-        || sharedMemo.sameClassFile(((WithLocation) type).getClassFile());
-  }
-
-  /** Inherit positive matches from a super-class or interface. */
-  private static void inherit(BitSet superMemo, BitSet memo) {
-    int matcherId = superMemo.nextSetBit(0);
-    while (matcherId >= 0) {
-      if (inheritedMatcherIds.get(matcherId)) {
-        memo.set(matcherId);
-      }
-      matcherId = superMemo.nextSetBit(matcherId + 1);
-    }
-  }
-
-  /** Run a series of memoized matchers and record positive matches. */
-  @SuppressWarnings("unchecked")
-  private static void record(BitSet matcherIds, Object type, BitSet memo) {
-    int matcherId = matcherIds.nextSetBit(0);
-    while (matcherId >= 0) {
-      // can skip match if we've already inherited a positive result
-      if (!memo.get(matcherId) && matchers.get(matcherId).matches(type)) {
-        memo.set(matcherId);
-      }
-      matcherId = matcherIds.nextSetBit(matcherId + 1);
+    /** Run a series of memoized matchers and record positive matches. */
+    @SuppressWarnings("unchecked")
+    private static void record(BitSet matcherIds, Object type, BitSet memo) {
+        int matcherId = matcherIds.nextSetBit(0);
+        while (matcherId >= 0) {
+            // can skip match if we've already inherited a positive result
+            if (!memo.get(matcherId) && matchers.get(matcherId).matches(type)) {
+                memo.set(matcherId);
+            }
+            matcherId = matcherIds.nextSetBit(matcherId + 1);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/NoMatchFilter.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/NoMatchFilter.java
index ca87baa876d..8ea2ccb2349 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/NoMatchFilter.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/NoMatchFilter.java
@@ -21,119 +21,117 @@
 
 /** Builds a persistable compact filter that records uninteresting types. */
 final class NoMatchFilter {
-  private static final Logger log = LoggerFactory.getLogger(NoMatchFilter.class);
-
-  private static final String TRACER_VERSION_HEADER = "dd-java-agent";
-  private static final String NO_MATCH_FILTER_HEADER = "NoMatchFilter";
-
-  private NoMatchFilter() {}
-
-  public static ClassNameFilter build() {
-    Path noMatchFile = discoverNoMatchFile();
-    if (null != noMatchFile) {
-      // support persisting/restoring no-match results
-      try {
-        if (Files.exists(noMatchFile)) {
-          // restore existing filter with previously collected results
-          return seedNoMatchFilter(noMatchFile);
-        } else {
-          // populate filter from current run and persist at shutdown
-          ClassNameFilter filter = emptyNoMatchFilter();
-          Runtime.getRuntime().addShutdownHook(new ShutdownHook(noMatchFile, filter));
-          return filter;
+    private static final Logger log = LoggerFactory.getLogger(NoMatchFilter.class);
+
+    private static final String TRACER_VERSION_HEADER = "dd-java-agent";
+    private static final String NO_MATCH_FILTER_HEADER = "NoMatchFilter";
+
+    private NoMatchFilter() {}
+
+    public static ClassNameFilter build() {
+        Path noMatchFile = discoverNoMatchFile();
+        if (null != noMatchFile) {
+            // support persisting/restoring no-match results
+            try {
+                if (Files.exists(noMatchFile)) {
+                    // restore existing filter with previously collected results
+                    return seedNoMatchFilter(noMatchFile);
+                } else {
+                    // populate filter from current run and persist at shutdown
+                    ClassNameFilter filter = emptyNoMatchFilter();
+                    Runtime.getRuntime().addShutdownHook(new ShutdownHook(noMatchFile, filter));
+                    return filter;
+                }
+            } catch (Throwable e) {
+                log.debug("Unable to use NoMatchFilter at {}", noMatchFile, e);
+            }
         }
-      } catch (Throwable e) {
-        log.debug("Unable to use NoMatchFilter at {}", noMatchFile, e);
-      }
+        return emptyNoMatchFilter();
     }
-    return emptyNoMatchFilter();
-  }
 
-  private static Path discoverNoMatchFile() {
-    String cacheDir = InstrumenterConfig.get().getResolverCacheDir();
-    if (null == cacheDir) {
-      return null;
+    private static Path discoverNoMatchFile() {
+        String cacheDir = InstrumenterConfig.get().getResolverCacheDir();
+        if (null == cacheDir) {
+            return null;
+        }
+
+        // use different file for each tracer + service combination
+        String filterKey = DDTraceApiInfo.VERSION
+                + "/"
+                + Config.get().getServiceName()
+                + "/"
+                + Config.get().getVersion();
+
+        String noMatchFilterName =
+                UUID.nameUUIDFromBytes(filterKey.getBytes(StandardCharsets.UTF_8)) + "-nomatch.filter";
+
+        return Paths.get(cacheDir, noMatchFilterName);
+    }
+
+    private static ClassNameFilter emptyNoMatchFilter() {
+        return new ClassNameFilter(InstrumenterConfig.get().getResolverNoMatchesSize());
     }
 
-    // use different file for each tracer + service combination
-    String filterKey =
-        DDTraceApiInfo.VERSION
-            + "/"
-            + Config.get().getServiceName()
-            + "/"
-            + Config.get().getVersion();
-
-    String noMatchFilterName =
-        UUID.nameUUIDFromBytes(filterKey.getBytes(StandardCharsets.UTF_8)) + "-nomatch.filter";
-
-    return Paths.get(cacheDir, noMatchFilterName);
-  }
-
-  private static ClassNameFilter emptyNoMatchFilter() {
-    return new ClassNameFilter(InstrumenterConfig.get().getResolverNoMatchesSize());
-  }
-
-  private static ClassNameFilter seedNoMatchFilter(Path noMatchFile) {
-    log.debug("Seeding NoMatchFilter from {}", noMatchFile);
-    try (DataInputStream in =
-        new DataInputStream(new BufferedInputStream(Files.newInputStream(noMatchFile)))) {
-      while (true) {
-        switch (in.readUTF()) {
-          case TRACER_VERSION_HEADER:
-            expectVersion(in, DDTraceApiInfo.VERSION);
-            break;
-          case NO_MATCH_FILTER_HEADER:
-            return ClassNameFilter.readFrom(in);
-          default:
-            throw new IOException("unexpected content");
+    private static ClassNameFilter seedNoMatchFilter(Path noMatchFile) {
+        log.debug("Seeding NoMatchFilter from {}", noMatchFile);
+        try (DataInputStream in = new DataInputStream(new BufferedInputStream(Files.newInputStream(noMatchFile)))) {
+            while (true) {
+                switch (in.readUTF()) {
+                    case TRACER_VERSION_HEADER:
+                        expectVersion(in, DDTraceApiInfo.VERSION);
+                        break;
+                    case NO_MATCH_FILTER_HEADER:
+                        return ClassNameFilter.readFrom(in);
+                    default:
+                        throw new IOException("unexpected content");
+                }
+            }
+        } catch (Throwable e) {
+            if (log.isDebugEnabled()) {
+                log.info("Unable to seed NoMatchFilter from {}", noMatchFile, e);
+            } else {
+                log.info("Unable to seed NoMatchFilter from {}: {}", noMatchFile, e.getMessage());
+            }
+            return emptyNoMatchFilter();
         }
-      }
-    } catch (Throwable e) {
-      if (log.isDebugEnabled()) {
-        log.info("Unable to seed NoMatchFilter from {}", noMatchFile, e);
-      } else {
-        log.info("Unable to seed NoMatchFilter from {}: {}", noMatchFile, e.getMessage());
-      }
-      return emptyNoMatchFilter();
     }
-  }
 
-  private static void expectVersion(DataInputStream in, String version) throws IOException {
-    if (!version.equals(in.readUTF())) {
-      throw new IOException("version mismatch");
+    private static void expectVersion(DataInputStream in, String version) throws IOException {
+        if (!version.equals(in.readUTF())) {
+            throw new IOException("version mismatch");
+        }
     }
-  }
-
-  static void persistNoMatchFilter(Path noMatchFile, ClassNameFilter filter) {
-    log.debug("Persisting NoMatchFilter to {}", noMatchFile);
-    try (DataOutputStream out =
-        new DataOutputStream(new BufferedOutputStream(Files.newOutputStream(noMatchFile)))) {
-      out.writeUTF(TRACER_VERSION_HEADER);
-      out.writeUTF(DDTraceApiInfo.VERSION);
-      out.writeUTF(NO_MATCH_FILTER_HEADER);
-      filter.writeTo(out);
-    } catch (IOException e) {
-      if (log.isDebugEnabled()) {
-        log.info("Unable to persist NoMatchFilter to {}", noMatchFile, e);
-      } else {
-        log.info("Unable to persist NoMatchFilter to {}: {}", noMatchFile, e.getMessage());
-      }
+
+    static void persistNoMatchFilter(Path noMatchFile, ClassNameFilter filter) {
+        log.debug("Persisting NoMatchFilter to {}", noMatchFile);
+        try (DataOutputStream out =
+                new DataOutputStream(new BufferedOutputStream(Files.newOutputStream(noMatchFile)))) {
+            out.writeUTF(TRACER_VERSION_HEADER);
+            out.writeUTF(DDTraceApiInfo.VERSION);
+            out.writeUTF(NO_MATCH_FILTER_HEADER);
+            filter.writeTo(out);
+        } catch (IOException e) {
+            if (log.isDebugEnabled()) {
+                log.info("Unable to persist NoMatchFilter to {}", noMatchFile, e);
+            } else {
+                log.info("Unable to persist NoMatchFilter to {}: {}", noMatchFile, e.getMessage());
+            }
+        }
     }
-  }
 
-  private static final class ShutdownHook extends Thread {
-    private final Path noMatchFile;
-    private final ClassNameFilter filter;
+    private static final class ShutdownHook extends Thread {
+        private final Path noMatchFile;
+        private final ClassNameFilter filter;
 
-    ShutdownHook(Path noMatchFile, ClassNameFilter filter) {
-      super(AGENT_THREAD_GROUP, "dd-NoMatchFilter-persist-hook");
-      this.noMatchFile = noMatchFile;
-      this.filter = filter;
-    }
+        ShutdownHook(Path noMatchFile, ClassNameFilter filter) {
+            super(AGENT_THREAD_GROUP, "dd-NoMatchFilter-persist-hook");
+            this.noMatchFile = noMatchFile;
+            this.filter = filter;
+        }
 
-    @Override
-    public void run() {
-      persistNoMatchFilter(noMatchFile, filter);
+        @Override
+        public void run() {
+            persistNoMatchFilter(noMatchFile, filter);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/PreloadHierarchy.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/PreloadHierarchy.java
index 134eb0e156f..7722e3792ec 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/PreloadHierarchy.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/memoize/PreloadHierarchy.java
@@ -6,46 +6,46 @@
 
 /** Ensures superclasses and interfaces are loaded before classes that extend/implement them. */
 final class PreloadHierarchy implements ClassDefining.Observer {
-  private static final PreloadHierarchy PRELOADER = new PreloadHierarchy();
+    private static final PreloadHierarchy PRELOADER = new PreloadHierarchy();
 
-  static void observeClassDefinitions() {
-    ClassDefining.observe(PRELOADER);
-  }
+    static void observeClassDefinitions() {
+        ClassDefining.observe(PRELOADER);
+    }
 
-  private static final int RECENTLY_CHECKED_MASK = (1 << 5) - 1;
-  private final String[] recentlyChecked = new String[RECENTLY_CHECKED_MASK + 1];
+    private static final int RECENTLY_CHECKED_MASK = (1 << 5) - 1;
+    private final String[] recentlyChecked = new String[RECENTLY_CHECKED_MASK + 1];
 
-  @Override
-  public void beforeDefineClass(ClassLoader loader, byte[] bytecode, int offset, int length) {
-    try {
-      // check first byte matches the standard class header
-      if (bytecode[offset] != (byte) 0xCA) {
-        return; // ignore non-standard formats like J9 ROMs
-      }
-      // minimal parsing of bytecode to get name of superclass and any interfaces
-      ClassHeader header = ClassFile.header(bytecode, offset);
-      String superName = header.superName;
-      if (null != superName && !"java/lang/Object".equals(superName)) {
-        preload(loader, superName);
-      }
-      for (String interfaceName : header.interfaces) {
-        preload(loader, interfaceName);
-      }
-    } catch (Throwable ignore) {
-      // stop preloading as soon as we encounter any issue
+    @Override
+    public void beforeDefineClass(ClassLoader loader, byte[] bytecode, int offset, int length) {
+        try {
+            // check first byte matches the standard class header
+            if (bytecode[offset] != (byte) 0xCA) {
+                return; // ignore non-standard formats like J9 ROMs
+            }
+            // minimal parsing of bytecode to get name of superclass and any interfaces
+            ClassHeader header = ClassFile.header(bytecode, offset);
+            String superName = header.superName;
+            if (null != superName && !"java/lang/Object".equals(superName)) {
+                preload(loader, superName);
+            }
+            for (String interfaceName : header.interfaces) {
+                preload(loader, interfaceName);
+            }
+        } catch (Throwable ignore) {
+            // stop preloading as soon as we encounter any issue
+        }
     }
-  }
 
-  /** Attempts to preload the named class using same class-loader as the original request. */
-  private void preload(ClassLoader loader, String internalName) throws ClassNotFoundException {
-    int slot = internalName.hashCode() & RECENTLY_CHECKED_MASK;
-    if (!internalName.equals(recentlyChecked[slot])) {
-      recentlyChecked[slot] = internalName;
-      String name = internalName.replace('/', '.');
-      // avoid preloading known uninteresting classes
-      if (Memoizer.potentialMatch(name)) {
-        loader.loadClass(name);
-      }
+    /** Attempts to preload the named class using same class-loader as the original request. */
+    private void preload(ClassLoader loader, String internalName) throws ClassNotFoundException {
+        int slot = internalName.hashCode() & RECENTLY_CHECKED_MASK;
+        if (!internalName.equals(recentlyChecked[slot])) {
+            recentlyChecked[slot] = internalName;
+            String name = internalName.replace('/', '.');
+            // avoid preloading known uninteresting classes
+            if (Memoizer.potentialMatch(name)) {
+                loader.loadClass(name);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/AnnotationOutline.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/AnnotationOutline.java
index f4fc833f549..a8f4682f7db 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/AnnotationOutline.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/AnnotationOutline.java
@@ -15,84 +15,84 @@
 /** Annotation outline that just describes the type-name. */
 final class AnnotationOutline extends WithName implements AnnotationDescription {
 
-  private static final Map<String, AnnotationDescription> annotationOutlines = new HashMap<>();
-
-  static void prepareAnnotationOutline(String name) {
-    String internalName = name.replace('.', '/');
-    // flag that we want to parse this annotation
-    ClassFile.annotationOfInterest(internalName);
-    // only a few annotation outlines get prepared - we register them under
-    // both their internal name and descriptor to support different callers
-    AnnotationOutline annotationOutline = new AnnotationOutline(name);
-    annotationOutlines.put('L' + internalName + ';', annotationOutline);
-    annotationOutlines.put(internalName, annotationOutline);
-  }
-
-  /** Only provide outlines of annotations of interest used for matching. */
-  static AnnotationDescription annotationOutline(String internalNameOrDescriptor) {
-    return annotationOutlines.get(internalNameOrDescriptor);
-  }
-
-  private AnnotationOutline(String name) {
-    super(name);
-  }
-
-  @Override
-  public TypeDescription getAnnotationType() {
-    return this;
-  }
-
-  @Override
-  protected TypeDescription delegate() {
-    return unavailable();
-  }
-
-  @Override
-  public AnnotationValue<?, ?> getValue(String property) {
-    return unavailable();
-  }
-
-  @Override
-  public AnnotationValue<?, ?> getValue(MethodDescription.InDefinedShape property) {
-    return unavailable();
-  }
-
-  @Override
-  public <T extends Annotation> Loadable<T> prepare(Class<T> annotationType) {
-    return unavailable();
-  }
-
-  @Override
-  public RetentionPolicy getRetention() {
-    return unavailable();
-  }
-
-  @Override
-  public Set<ElementType> getElementTypes() {
-    return unavailable();
-  }
-
-  @Override
-  public boolean isSupportedOn(ElementType elementType) {
-    return unavailable();
-  }
-
-  @Override
-  public boolean isSupportedOn(String elementType) {
-    return unavailable();
-  }
-
-  @Override
-  public boolean isInherited() {
-    return unavailable();
-  }
-
-  @Override
-  public boolean isDocumented() {
-    return unavailable();
-  }
-
-  private <T> T unavailable() {
-    throw new IllegalStateException("Not available in outline for " + name);
-  }
+    private static final Map<String, AnnotationDescription> annotationOutlines = new HashMap<>();
+
+    static void prepareAnnotationOutline(String name) {
+        String internalName = name.replace('.', '/');
+        // flag that we want to parse this annotation
+        ClassFile.annotationOfInterest(internalName);
+        // only a few annotation outlines get prepared - we register them under
+        // both their internal name and descriptor to support different callers
+        AnnotationOutline annotationOutline = new AnnotationOutline(name);
+        annotationOutlines.put('L' + internalName + ';', annotationOutline);
+        annotationOutlines.put(internalName, annotationOutline);
+    }
+
+    /** Only provide outlines of annotations of interest used for matching. */
+    static AnnotationDescription annotationOutline(String internalNameOrDescriptor) {
+        return annotationOutlines.get(internalNameOrDescriptor);
+    }
+
+    private AnnotationOutline(String name) {
+        super(name);
+    }
+
+    @Override
+    public TypeDescription getAnnotationType() {
+        return this;
+    }
+
+    @Override
+    protected TypeDescription delegate() {
+        return unavailable();
+    }
+
+    @Override
+    public AnnotationValue<?, ?> getValue(String property) {
+        return unavailable();
+    }
+
+    @Override
+    public AnnotationValue<?, ?> getValue(MethodDescription.InDefinedShape property) {
+        return unavailable();
+    }
+
+    @Override
+    public <T extends Annotation> Loadable<T> prepare(Class<T> annotationType) {
+        return unavailable();
+    }
+
+    @Override
+    public RetentionPolicy getRetention() {
+        return unavailable();
+    }
+
+    @Override
+    public Set<ElementType> getElementTypes() {
+        return unavailable();
+    }
+
+    @Override
+    public boolean isSupportedOn(ElementType elementType) {
+        return unavailable();
+    }
+
+    @Override
+    public boolean isSupportedOn(String elementType) {
+        return unavailable();
+    }
+
+    @Override
+    public boolean isInherited() {
+        return unavailable();
+    }
+
+    @Override
+    public boolean isDocumented() {
+        return unavailable();
+    }
+
+    private <T> T unavailable() {
+        throw new IllegalStateException("Not available in outline for " + name);
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/CachingType.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/CachingType.java
index 2dafee81d28..f56da51766d 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/CachingType.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/CachingType.java
@@ -11,76 +11,74 @@
 /** Type description that lazily caches expensive results. */
 final class CachingType extends WithName {
 
-  // non-null sentinels for fields that can legitimately be null
-  private static final Generic UNSET_SUPER_CLASS =
-      Generic.OfNonGenericType.ForLoadedType.of(void.class);
-  private static final TypeDescription UNSET_DECLARING_TYPE =
-      TypeDescription.ForLoadedType.of(void.class);
+    // non-null sentinels for fields that can legitimately be null
+    private static final Generic UNSET_SUPER_CLASS = Generic.OfNonGenericType.ForLoadedType.of(void.class);
+    private static final TypeDescription UNSET_DECLARING_TYPE = TypeDescription.ForLoadedType.of(void.class);
 
-  private final TypeDescription delegate;
+    private final TypeDescription delegate;
 
-  private Generic superClass = UNSET_SUPER_CLASS;
-  private TypeList.Generic interfaces;
-  private TypeDescription declaringType = UNSET_DECLARING_TYPE;
-  private AnnotationList annotations;
-  private FieldList<FieldDescription.InDefinedShape> fields;
-  private MethodList<MethodDescription.InDefinedShape> methods;
+    private Generic superClass = UNSET_SUPER_CLASS;
+    private TypeList.Generic interfaces;
+    private TypeDescription declaringType = UNSET_DECLARING_TYPE;
+    private AnnotationList annotations;
+    private FieldList<FieldDescription.InDefinedShape> fields;
+    private MethodList<MethodDescription.InDefinedShape> methods;
 
-  CachingType(TypeDescription delegate) {
-    super(delegate.getName());
-    this.delegate = delegate;
-  }
+    CachingType(TypeDescription delegate) {
+        super(delegate.getName());
+        this.delegate = delegate;
+    }
 
-  @Override
-  protected TypeDescription delegate() {
-    return delegate;
-  }
+    @Override
+    protected TypeDescription delegate() {
+        return delegate;
+    }
 
-  @Override
-  public Generic getSuperClass() {
-    if (superClass == UNSET_SUPER_CLASS) {
-      superClass = delegate.getSuperClass();
+    @Override
+    public Generic getSuperClass() {
+        if (superClass == UNSET_SUPER_CLASS) {
+            superClass = delegate.getSuperClass();
+        }
+        return superClass;
     }
-    return superClass;
-  }
 
-  @Override
-  public TypeList.Generic getInterfaces() {
-    if (interfaces == null) {
-      interfaces = delegate.getInterfaces();
+    @Override
+    public TypeList.Generic getInterfaces() {
+        if (interfaces == null) {
+            interfaces = delegate.getInterfaces();
+        }
+        return interfaces;
     }
-    return interfaces;
-  }
 
-  @Override
-  public TypeDescription getDeclaringType() {
-    if (declaringType == UNSET_DECLARING_TYPE) {
-      declaringType = delegate.getDeclaringType();
+    @Override
+    public TypeDescription getDeclaringType() {
+        if (declaringType == UNSET_DECLARING_TYPE) {
+            declaringType = delegate.getDeclaringType();
+        }
+        return declaringType;
     }
-    return declaringType;
-  }
 
-  @Override
-  public AnnotationList getDeclaredAnnotations() {
-    if (annotations == null) {
-      annotations = delegate.getDeclaredAnnotations();
+    @Override
+    public AnnotationList getDeclaredAnnotations() {
+        if (annotations == null) {
+            annotations = delegate.getDeclaredAnnotations();
+        }
+        return annotations;
     }
-    return annotations;
-  }
 
-  @Override
-  public FieldList<FieldDescription.InDefinedShape> getDeclaredFields() {
-    if (fields == null) {
-      fields = delegate.getDeclaredFields();
+    @Override
+    public FieldList<FieldDescription.InDefinedShape> getDeclaredFields() {
+        if (fields == null) {
+            fields = delegate.getDeclaredFields();
+        }
+        return fields;
     }
-    return fields;
-  }
 
-  @Override
-  public MethodList<MethodDescription.InDefinedShape> getDeclaredMethods() {
-    if (methods == null) {
-      methods = delegate.getDeclaredMethods();
+    @Override
+    public MethodList<MethodDescription.InDefinedShape> getDeclaredMethods() {
+        if (methods == null) {
+            methods = delegate.getDeclaredMethods();
+        }
+        return methods;
     }
-    return methods;
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/FieldOutline.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/FieldOutline.java
index 5c0d1d1f106..f521ee81dfe 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/FieldOutline.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/FieldOutline.java
@@ -12,61 +12,59 @@
 
 /** Provides an outline of a field; its name, descriptor, and modifiers. */
 final class FieldOutline extends FieldDescription.InDefinedShape.AbstractBase {
-  private static final int ALLOWED_FIELD_MODIFIERS = 0x0000ffff;
+    private static final int ALLOWED_FIELD_MODIFIERS = 0x0000ffff;
 
-  private final TypeDescription declaringType;
+    private final TypeDescription declaringType;
 
-  private final int modifiers;
-  private final String name;
-  private final String descriptor;
+    private final int modifiers;
+    private final String name;
+    private final String descriptor;
 
-  private List<AnnotationDescription> declaredAnnotations;
+    private List<AnnotationDescription> declaredAnnotations;
 
-  FieldOutline(TypeDescription declaringType, int access, String name, String descriptor) {
-    this.declaringType = declaringType;
-    this.modifiers = access & ALLOWED_FIELD_MODIFIERS;
-    this.name = name;
-    this.descriptor = descriptor;
-  }
+    FieldOutline(TypeDescription declaringType, int access, String name, String descriptor) {
+        this.declaringType = declaringType;
+        this.modifiers = access & ALLOWED_FIELD_MODIFIERS;
+        this.name = name;
+        this.descriptor = descriptor;
+    }
 
-  @Override
-  public TypeDescription getDeclaringType() {
-    return declaringType;
-  }
+    @Override
+    public TypeDescription getDeclaringType() {
+        return declaringType;
+    }
 
-  @Override
-  public int getModifiers() {
-    return modifiers;
-  }
+    @Override
+    public int getModifiers() {
+        return modifiers;
+    }
 
-  @Override
-  public String getName() {
-    return name;
-  }
+    @Override
+    public String getName() {
+        return name;
+    }
 
-  @Override
-  public String getDescriptor() {
-    return descriptor;
-  }
+    @Override
+    public String getDescriptor() {
+        return descriptor;
+    }
 
-  @Override
-  public TypeDescription.Generic getType() {
-    return findDescriptor(descriptor).asGenericType();
-  }
+    @Override
+    public TypeDescription.Generic getType() {
+        return findDescriptor(descriptor).asGenericType();
+    }
 
-  @Override
-  public AnnotationList getDeclaredAnnotations() {
-    return null == declaredAnnotations
-        ? NO_ANNOTATIONS
-        : new AnnotationList.Explicit(declaredAnnotations);
-  }
+    @Override
+    public AnnotationList getDeclaredAnnotations() {
+        return null == declaredAnnotations ? NO_ANNOTATIONS : new AnnotationList.Explicit(declaredAnnotations);
+    }
 
-  void declare(AnnotationDescription annotation) {
-    if (null != annotation) {
-      if (null == declaredAnnotations) {
-        declaredAnnotations = new ArrayList<>();
-      }
-      declaredAnnotations.add(annotation);
+    void declare(AnnotationDescription annotation) {
+        if (null != annotation) {
+            if (null == declaredAnnotations) {
+                declaredAnnotations = new ArrayList<>();
+            }
+            declaredAnnotations.add(annotation);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/FullTypeParser.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/FullTypeParser.java
index fd1acb3d8db..cc46b61f5b4 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/FullTypeParser.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/FullTypeParser.java
@@ -14,41 +14,41 @@
 /** Provides access to byte-buddy's full type parser, so we can use it with our outline approach. */
 final class FullTypeParser extends TypePool.Default implements TypeParser {
 
-  FullTypeParser() {
-    super(CacheProvider.NoOp.INSTANCE, ClassFileLocator.NoOp.INSTANCE, ReaderMode.FAST);
-  }
-
-  @Override
-  public TypeDescription parse(byte[] bytecode) {
-    ClassReader classReader = OpenedClassReader.of(bytecode);
-    CustomTypeExtractor typeExtractor = new CustomTypeExtractor();
-    classReader.accept(typeExtractor, SKIP_CODE | SKIP_DEBUG);
-    return typeExtractor.toTypeDescription();
-  }
-
-  @Override
-  public TypeDescription parse(Class<?> loadedType) {
-    return TypeDescription.ForLoadedType.of(loadedType);
-  }
-
-  @Override
-  public Resolution describe(String name) {
-    // describe elements as deferred types, lazily evaluated using the current context
-    TypeDescription type = name.charAt(0) == '[' ? findDescriptor(name) : findType(name);
-    if (type instanceof TypeFactory.LazyType) {
-      return new TypeFactory.LazyResolution((TypeFactory.LazyType) type);
+    FullTypeParser() {
+        super(CacheProvider.NoOp.INSTANCE, ClassFileLocator.NoOp.INSTANCE, ReaderMode.FAST);
     }
-    return new Resolution.Simple(type);
-  }
 
-  @Override
-  public void clear() {}
+    @Override
+    public TypeDescription parse(byte[] bytecode) {
+        ClassReader classReader = OpenedClassReader.of(bytecode);
+        CustomTypeExtractor typeExtractor = new CustomTypeExtractor();
+        classReader.accept(typeExtractor, SKIP_CODE | SKIP_DEBUG);
+        return typeExtractor.toTypeDescription();
+    }
+
+    @Override
+    public TypeDescription parse(Class<?> loadedType) {
+        return TypeDescription.ForLoadedType.of(loadedType);
+    }
+
+    @Override
+    public Resolution describe(String name) {
+        // describe elements as deferred types, lazily evaluated using the current context
+        TypeDescription type = name.charAt(0) == '[' ? findDescriptor(name) : findType(name);
+        if (type instanceof TypeFactory.LazyType) {
+            return new TypeFactory.LazyResolution((TypeFactory.LazyType) type);
+        }
+        return new Resolution.Simple(type);
+    }
 
-  /** Subclass to make 'toTypeDescription' visible. */
-  final class CustomTypeExtractor extends TypeExtractor {
     @Override
-    public TypeDescription toTypeDescription() {
-      return super.toTypeDescription();
+    public void clear() {}
+
+    /** Subclass to make 'toTypeDescription' visible. */
+    final class CustomTypeExtractor extends TypeExtractor {
+        @Override
+        public TypeDescription toTypeDescription() {
+            return super.toTypeDescription();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/MethodOutline.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/MethodOutline.java
index 1d03ef8e3e2..ce81b751be6 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/MethodOutline.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/MethodOutline.java
@@ -17,143 +17,142 @@
 
 /** Provides an outline of a method; its name, descriptor, and modifiers. */
 final class MethodOutline extends MethodDescription.InDefinedShape.AbstractBase {
-  private static final int ALLOWED_METHOD_MODIFIERS = 0x0000ffff;
-
-  private static final ParameterList<ParameterDescription.InDefinedShape> NO_PARAMETERS =
-      new ParameterList.Empty<>();
-
-  private final TypeDescription declaringType;
-
-  private final String descriptor;
-  private final int modifiers;
-  private final String name;
-
-  private List<AnnotationDescription> declaredAnnotations;
-
-  MethodOutline(TypeDescription declaringType, int access, String name, String descriptor) {
-    this.declaringType = declaringType;
-    this.modifiers = access & ALLOWED_METHOD_MODIFIERS;
-    this.name = name;
-    this.descriptor = descriptor;
-  }
-
-  @Override
-  public TypeDescription getDeclaringType() {
-    return declaringType;
-  }
-
-  @Override
-  public String getDescriptor() {
-    return descriptor;
-  }
-
-  @Override
-  public ParameterList<ParameterDescription.InDefinedShape> getParameters() {
-    int parameterCount = 0;
-    int parameterStart = 1;
-    if (descriptor.charAt(parameterStart) == ')') {
-      return NO_PARAMETERS;
-    }
-    List<ParameterDescription.InDefinedShape> outlines = new ArrayList<>();
-    while (descriptor.charAt(parameterStart) != ')') {
-      int parameterEnd = parameterStart;
-      while (descriptor.charAt(parameterEnd) == '[') {
-        parameterEnd++;
-      }
-      if (descriptor.charAt(parameterEnd) == 'L') {
-        parameterEnd = Math.max(parameterEnd, descriptor.indexOf(';', parameterEnd));
-      }
-      outlines.add(new ParameterOutline(parameterCount++, parameterStart, ++parameterEnd));
-      parameterStart = parameterEnd;
+    private static final int ALLOWED_METHOD_MODIFIERS = 0x0000ffff;
+
+    private static final ParameterList<ParameterDescription.InDefinedShape> NO_PARAMETERS = new ParameterList.Empty<>();
+
+    private final TypeDescription declaringType;
+
+    private final String descriptor;
+    private final int modifiers;
+    private final String name;
+
+    private List<AnnotationDescription> declaredAnnotations;
+
+    MethodOutline(TypeDescription declaringType, int access, String name, String descriptor) {
+        this.declaringType = declaringType;
+        this.modifiers = access & ALLOWED_METHOD_MODIFIERS;
+        this.name = name;
+        this.descriptor = descriptor;
     }
-    return new ParameterList.Explicit<>(outlines);
-  }
-
-  @Override
-  public TypeDescription.Generic getReturnType() {
-    return findDescriptor(descriptor.substring(descriptor.lastIndexOf(')') + 1)).asGenericType();
-  }
-
-  @Override
-  public AnnotationValue<?, ?> getDefaultValue() {
-    return AnnotationValue.UNDEFINED;
-  }
-
-  @Override
-  public String getInternalName() {
-    return name;
-  }
-
-  @Override
-  public TypeList.Generic getTypeVariables() {
-    return NO_TYPES;
-  }
-
-  @Override
-  public int getModifiers() {
-    return modifiers;
-  }
-
-  @Override
-  public AnnotationList getDeclaredAnnotations() {
-    return null == declaredAnnotations
-        ? NO_ANNOTATIONS
-        : new AnnotationList.Explicit(declaredAnnotations);
-  }
-
-  @Override
-  public TypeList.Generic getExceptionTypes() {
-    return NO_TYPES;
-  }
-
-  void declare(AnnotationDescription annotation) {
-    if (null != annotation) {
-      if (null == declaredAnnotations) {
-        declaredAnnotations = new ArrayList<>();
-      }
-      declaredAnnotations.add(annotation);
+
+    @Override
+    public TypeDescription getDeclaringType() {
+        return declaringType;
     }
-  }
 
-  class ParameterOutline extends ParameterDescription.InDefinedShape.AbstractBase {
-    private final int index;
-    private final int parameterStart;
-    private final int parameterEnd;
+    @Override
+    public String getDescriptor() {
+        return descriptor;
+    }
 
-    ParameterOutline(int index, int parameterStart, int parameterEnd) {
-      this.index = index;
-      this.parameterStart = parameterStart;
-      this.parameterEnd = parameterEnd;
+    @Override
+    public ParameterList<ParameterDescription.InDefinedShape> getParameters() {
+        int parameterCount = 0;
+        int parameterStart = 1;
+        if (descriptor.charAt(parameterStart) == ')') {
+            return NO_PARAMETERS;
+        }
+        List<ParameterDescription.InDefinedShape> outlines = new ArrayList<>();
+        while (descriptor.charAt(parameterStart) != ')') {
+            int parameterEnd = parameterStart;
+            while (descriptor.charAt(parameterEnd) == '[') {
+                parameterEnd++;
+            }
+            if (descriptor.charAt(parameterEnd) == 'L') {
+                parameterEnd = Math.max(parameterEnd, descriptor.indexOf(';', parameterEnd));
+            }
+            outlines.add(new ParameterOutline(parameterCount++, parameterStart, ++parameterEnd));
+            parameterStart = parameterEnd;
+        }
+        return new ParameterList.Explicit<>(outlines);
     }
 
     @Override
-    public int getIndex() {
-      return index;
+    public TypeDescription.Generic getReturnType() {
+        return findDescriptor(descriptor.substring(descriptor.lastIndexOf(')') + 1))
+                .asGenericType();
     }
 
     @Override
-    public TypeDescription.Generic getType() {
-      return findDescriptor(descriptor.substring(parameterStart, parameterEnd)).asGenericType();
+    public AnnotationValue<?, ?> getDefaultValue() {
+        return AnnotationValue.UNDEFINED;
     }
 
     @Override
-    public MethodDescription.InDefinedShape getDeclaringMethod() {
-      return MethodOutline.this;
+    public String getInternalName() {
+        return name;
     }
 
     @Override
-    public boolean hasModifiers() {
-      return false;
+    public TypeList.Generic getTypeVariables() {
+        return NO_TYPES;
     }
 
     @Override
-    public boolean isNamed() {
-      return false;
+    public int getModifiers() {
+        return modifiers;
     }
 
     @Override
     public AnnotationList getDeclaredAnnotations() {
-      return NO_ANNOTATIONS;
+        return null == declaredAnnotations ? NO_ANNOTATIONS : new AnnotationList.Explicit(declaredAnnotations);
+    }
+
+    @Override
+    public TypeList.Generic getExceptionTypes() {
+        return NO_TYPES;
+    }
+
+    void declare(AnnotationDescription annotation) {
+        if (null != annotation) {
+            if (null == declaredAnnotations) {
+                declaredAnnotations = new ArrayList<>();
+            }
+            declaredAnnotations.add(annotation);
+        }
+    }
+
+    class ParameterOutline extends ParameterDescription.InDefinedShape.AbstractBase {
+        private final int index;
+        private final int parameterStart;
+        private final int parameterEnd;
+
+        ParameterOutline(int index, int parameterStart, int parameterEnd) {
+            this.index = index;
+            this.parameterStart = parameterStart;
+            this.parameterEnd = parameterEnd;
+        }
+
+        @Override
+        public int getIndex() {
+            return index;
+        }
+
+        @Override
+        public TypeDescription.Generic getType() {
+            return findDescriptor(descriptor.substring(parameterStart, parameterEnd))
+                    .asGenericType();
+        }
+
+        @Override
+        public MethodDescription.InDefinedShape getDeclaringMethod() {
+            return MethodOutline.this;
+        }
+
+        @Override
+        public boolean hasModifiers() {
+            return false;
+        }
+
+        @Override
+        public boolean isNamed() {
+            return false;
+        }
+
+        @Override
+        public AnnotationList getDeclaredAnnotations() {
+            return NO_ANNOTATIONS;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/OutlineTypeParser.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/OutlineTypeParser.java
index 3ef94925364..03f974751af 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/OutlineTypeParser.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/OutlineTypeParser.java
@@ -20,132 +20,114 @@
 
 /** Attempts a minimal parse of just the named elements we need for matching. */
 final class OutlineTypeParser implements TypeParser {
-  private static final boolean visitorClassParsing =
-      InstrumenterConfig.get().isVisitorClassParsing();
-
-  @Override
-  public TypeDescription parse(byte[] bytecode) {
-    if (visitorClassParsing) {
-      ClassReader classReader = OpenedClassReader.of(bytecode);
-      OutlineTypeExtractor typeExtractor = new OutlineTypeExtractor();
-      classReader.accept(typeExtractor, SKIP_CODE | SKIP_DEBUG);
-      return typeExtractor.typeOutline;
-    } else {
-      return new TypeOutline(ClassFile.outline(bytecode));
-    }
-  }
-
-  @Override
-  public TypeDescription parse(Class<?> loadedType) {
-    Class<?> superClass = loadedType.getSuperclass();
-
-    TypeOutline typeOutline =
-        new TypeOutline(
-            loadedType.getModifiers(),
-            loadedType.getName(),
-            null != superClass ? superClass.getName() : null,
-            extractTypeNames(loadedType.getInterfaces()));
+    private static final boolean visitorClassParsing = InstrumenterConfig.get().isVisitorClassParsing();
 
-    for (Annotation a : loadedType.getDeclaredAnnotations()) {
-      typeOutline.declare(annotationOutline(Type.getInternalName(a.annotationType())));
-    }
-
-    for (Field field : loadedType.getDeclaredFields()) {
-      FieldOutline fieldOutline =
-          new FieldOutline(
-              typeOutline,
-              field.getModifiers(),
-              field.getName(),
-              Type.getDescriptor(field.getType()));
-      for (Annotation a : field.getDeclaredAnnotations()) {
-        fieldOutline.declare(annotationOutline(Type.getInternalName(a.annotationType())));
-      }
-      typeOutline.declare(fieldOutline);
-    }
-
-    for (Method method : loadedType.getDeclaredMethods()) {
-      MethodOutline methodOutline =
-          new MethodOutline(
-              typeOutline,
-              method.getModifiers(),
-              method.getName(),
-              Type.getMethodDescriptor(method));
-      for (Annotation a : method.getDeclaredAnnotations()) {
-        methodOutline.declare(annotationOutline(Type.getInternalName(a.annotationType())));
-      }
-      typeOutline.declare(methodOutline);
+    @Override
+    public TypeDescription parse(byte[] bytecode) {
+        if (visitorClassParsing) {
+            ClassReader classReader = OpenedClassReader.of(bytecode);
+            OutlineTypeExtractor typeExtractor = new OutlineTypeExtractor();
+            classReader.accept(typeExtractor, SKIP_CODE | SKIP_DEBUG);
+            return typeExtractor.typeOutline;
+        } else {
+            return new TypeOutline(ClassFile.outline(bytecode));
+        }
     }
 
-    return typeOutline;
-  }
-
-  private static String[] extractTypeNames(Class[] types) {
-    String[] typeNames = new String[types.length];
-    for (int i = 0; i < types.length; i++) {
-      typeNames[i] = types[i].getName();
+    @Override
+    public TypeDescription parse(Class<?> loadedType) {
+        Class<?> superClass = loadedType.getSuperclass();
+
+        TypeOutline typeOutline = new TypeOutline(
+                loadedType.getModifiers(),
+                loadedType.getName(),
+                null != superClass ? superClass.getName() : null,
+                extractTypeNames(loadedType.getInterfaces()));
+
+        for (Annotation a : loadedType.getDeclaredAnnotations()) {
+            typeOutline.declare(annotationOutline(Type.getInternalName(a.annotationType())));
+        }
+
+        for (Field field : loadedType.getDeclaredFields()) {
+            FieldOutline fieldOutline = new FieldOutline(
+                    typeOutline, field.getModifiers(), field.getName(), Type.getDescriptor(field.getType()));
+            for (Annotation a : field.getDeclaredAnnotations()) {
+                fieldOutline.declare(annotationOutline(Type.getInternalName(a.annotationType())));
+            }
+            typeOutline.declare(fieldOutline);
+        }
+
+        for (Method method : loadedType.getDeclaredMethods()) {
+            MethodOutline methodOutline = new MethodOutline(
+                    typeOutline, method.getModifiers(), method.getName(), Type.getMethodDescriptor(method));
+            for (Annotation a : method.getDeclaredAnnotations()) {
+                methodOutline.declare(annotationOutline(Type.getInternalName(a.annotationType())));
+            }
+            typeOutline.declare(methodOutline);
+        }
+
+        return typeOutline;
     }
-    return typeNames;
-  }
-
-  static final class OutlineTypeExtractor extends ClassVisitor {
 
-    TypeOutline typeOutline;
-    FieldOutline fieldOutline;
-    MethodOutline methodOutline;
-
-    OutlineTypeExtractor() {
-      super(OpenedClassReader.ASM_API);
+    private static String[] extractTypeNames(Class[] types) {
+        String[] typeNames = new String[types.length];
+        for (int i = 0; i < types.length; i++) {
+            typeNames[i] = types[i].getName();
+        }
+        return typeNames;
     }
 
-    @Override
-    public void visit(
-        int version,
-        int access,
-        String name,
-        String signature,
-        String superName,
-        String[] interfaces) {
-      typeOutline = new TypeOutline(access, name, superName, interfaces);
-    }
+    static final class OutlineTypeExtractor extends ClassVisitor {
 
-    @Override
-    public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
-      typeOutline.declare(annotationOutline(descriptor));
-      return null;
-    }
+        TypeOutline typeOutline;
+        FieldOutline fieldOutline;
+        MethodOutline methodOutline;
 
-    @Override
-    public FieldVisitor visitField(
-        int access, String name, String descriptor, String signature, Object value) {
-      fieldOutline = new FieldOutline(typeOutline, access, name, descriptor);
-      typeOutline.declare(fieldOutline);
-      return fieldAnnotationExtractor;
-    }
+        OutlineTypeExtractor() {
+            super(OpenedClassReader.ASM_API);
+        }
 
-    @Override
-    public MethodVisitor visitMethod(
-        int access, String name, String descriptor, String signature, String[] exceptions) {
-      methodOutline = new MethodOutline(typeOutline, access, name, descriptor);
-      typeOutline.declare(methodOutline);
-      return methodAnnotationExtractor;
-    }
+        @Override
+        public void visit(
+                int version, int access, String name, String signature, String superName, String[] interfaces) {
+            typeOutline = new TypeOutline(access, name, superName, interfaces);
+        }
 
-    private final FieldVisitor fieldAnnotationExtractor =
-        new FieldVisitor(OpenedClassReader.ASM_API) {
-          @Override
-          public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
-            fieldOutline.declare(annotationOutline(descriptor));
+        @Override
+        public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
+            typeOutline.declare(annotationOutline(descriptor));
             return null;
-          }
+        }
+
+        @Override
+        public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
+            fieldOutline = new FieldOutline(typeOutline, access, name, descriptor);
+            typeOutline.declare(fieldOutline);
+            return fieldAnnotationExtractor;
+        }
+
+        @Override
+        public MethodVisitor visitMethod(
+                int access, String name, String descriptor, String signature, String[] exceptions) {
+            methodOutline = new MethodOutline(typeOutline, access, name, descriptor);
+            typeOutline.declare(methodOutline);
+            return methodAnnotationExtractor;
+        }
+
+        private final FieldVisitor fieldAnnotationExtractor = new FieldVisitor(OpenedClassReader.ASM_API) {
+            @Override
+            public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
+                fieldOutline.declare(annotationOutline(descriptor));
+                return null;
+            }
         };
 
-    private final MethodVisitor methodAnnotationExtractor =
-        new MethodVisitor(OpenedClassReader.ASM_API) {
-          @Override
-          public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
-            methodOutline.declare(annotationOutline(descriptor));
-            return null;
-          }
+        private final MethodVisitor methodAnnotationExtractor = new MethodVisitor(OpenedClassReader.ASM_API) {
+            @Override
+            public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
+                methodOutline.declare(annotationOutline(descriptor));
+                return null;
+            }
         };
-  }
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeFactory.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeFactory.java
index 51650b3d2b2..4e091489d29 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeFactory.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeFactory.java
@@ -38,417 +38,411 @@
  * enabled, once we know we're really transforming the type.
  */
 final class TypeFactory {
-  private static final Logger log = LoggerFactory.getLogger(TypeFactory.class);
-
-  /** Maintain a reusable type factory for each thread involved in class-loading. */
-  static final ThreadLocal<TypeFactory> typeFactory = ThreadLocal.withInitial(TypeFactory::new);
-
-  private static final boolean fallBackToLoadClass =
-      InstrumenterConfig.get().isResolverUseLoadClass();
-
-  private static final Map<Character, TypeDescription> primitiveDescriptorTypes = new HashMap<>();
-
-  private static final Map<String, TypeDescription> primitiveTypes = new HashMap<>();
-
-  static {
-    for (Class<?> primitive :
-        new Class<?>[] {
-          boolean.class,
-          byte.class,
-          short.class,
-          char.class,
-          int.class,
-          long.class,
-          float.class,
-          double.class,
-          void.class
+    private static final Logger log = LoggerFactory.getLogger(TypeFactory.class);
+
+    /** Maintain a reusable type factory for each thread involved in class-loading. */
+    static final ThreadLocal<TypeFactory> typeFactory = ThreadLocal.withInitial(TypeFactory::new);
+
+    private static final boolean fallBackToLoadClass = InstrumenterConfig.get().isResolverUseLoadClass();
+
+    private static final Map<Character, TypeDescription> primitiveDescriptorTypes = new HashMap<>();
+
+    private static final Map<String, TypeDescription> primitiveTypes = new HashMap<>();
+
+    static {
+        for (Class<?> primitive : new Class<?>[] {
+            boolean.class,
+            byte.class,
+            short.class,
+            char.class,
+            int.class,
+            long.class,
+            float.class,
+            double.class,
+            void.class
         }) {
-      TypeDescription primitiveType = TypeDescription.ForLoadedType.of(primitive);
-      primitiveDescriptorTypes.put(primitiveType.getDescriptor().charAt(0), primitiveType);
-      primitiveTypes.put(primitive.getName(), primitiveType);
+            TypeDescription primitiveType = TypeDescription.ForLoadedType.of(primitive);
+            primitiveDescriptorTypes.put(primitiveType.getDescriptor().charAt(0), primitiveType);
+            primitiveTypes.put(primitive.getName(), primitiveType);
+        }
     }
-  }
 
-  private static final boolean OUTLINING_ENABLED =
-      InstrumenterConfig.get().isResolverOutliningEnabled();
+    private static final boolean OUTLINING_ENABLED = InstrumenterConfig.get().isResolverOutliningEnabled();
 
-  private static final boolean MEMOIZING_ENABLED =
-      InstrumenterConfig.get().isResolverMemoizingEnabled();
+    private static final boolean MEMOIZING_ENABLED = InstrumenterConfig.get().isResolverMemoizingEnabled();
 
-  private static final TypeParser outlineTypeParser = new OutlineTypeParser();
+    private static final TypeParser outlineTypeParser = new OutlineTypeParser();
 
-  private static final TypeParser fullTypeParser = new FullTypeParser();
+    private static final TypeParser fullTypeParser = new FullTypeParser();
 
-  private static final TypeDescription objectOutline =
-      new CachingType(outlineTypeParser.parse(Object.class));
+    private static final TypeDescription objectOutline = new CachingType(outlineTypeParser.parse(Object.class));
 
-  private static final TypeInfoCache<TypeDescription> outlineTypes =
-      new TypeInfoCache<>(InstrumenterConfig.get().getResolverOutlinePoolSize());
+    private static final TypeInfoCache<TypeDescription> outlineTypes =
+            new TypeInfoCache<>(InstrumenterConfig.get().getResolverOutlinePoolSize());
 
-  private static final TypeInfoCache<TypeDescription> fullTypes =
-      new TypeInfoCache<>(InstrumenterConfig.get().getResolverTypePoolSize());
+    private static final TypeInfoCache<TypeDescription> fullTypes =
+            new TypeInfoCache<>(InstrumenterConfig.get().getResolverTypePoolSize());
 
-  static final ClassNameFilter isPublicFilter =
-      new ClassNameFilter(InstrumenterConfig.get().getResolverVisibilitySize());
+    static final ClassNameFilter isPublicFilter =
+            new ClassNameFilter(InstrumenterConfig.get().getResolverVisibilitySize());
 
-  /** Small local cache to help deduplicate lookups when matching/transforming. */
-  private final DDCache<String, LazyType> deferredTypes = DDCaches.newFixedSizeCache(16);
+    /** Small local cache to help deduplicate lookups when matching/transforming. */
+    private final DDCache<String, LazyType> deferredTypes = DDCaches.newFixedSizeCache(16);
 
-  private final Function<String, LazyType> deferType = LazyType::new;
+    private final Function<String, LazyType> deferType = LazyType::new;
 
-  boolean installing = false;
+    boolean installing = false;
 
-  boolean createOutlines = OUTLINING_ENABLED;
+    boolean createOutlines = OUTLINING_ENABLED;
 
-  ClassLoader originalClassLoader;
+    ClassLoader originalClassLoader;
 
-  ClassLoader currentClassLoader;
+    ClassLoader currentClassLoader;
 
-  int currentClassLoaderId;
+    int currentClassLoaderId;
 
-  ClassFileLocator classFileLocator;
+    ClassFileLocator classFileLocator;
 
-  String targetName;
+    String targetName;
 
-  byte[] targetBytecode;
+    byte[] targetBytecode;
 
-  /** Sets the current class-loader context of this type-factory. */
-  void switchContext(ClassLoader classLoader) {
-    if (currentClassLoader != classLoader || null == classFileLocator) {
-      currentClassLoader = classLoader;
-      currentClassLoaderId = -1; // lazily computed
-      classFileLocator = classFileLocator(classLoader);
-      // clear local type cache whenever the class-loader context changes
-      deferredTypes.clear();
-    }
-  }
-
-  ClassLoader currentContext() {
-    return currentClassLoader;
-  }
-
-  void beginInstall() {
-    installing = true;
-  }
-
-  void endInstall() {
-    installing = false;
-    originalClassLoader = null;
-    clearReferences();
-  }
-
-  static void clear() {
-    outlineTypes.clear();
-    fullTypes.clear();
-  }
-
-  /**
-   * New transform request; begins with type matching that only requires outline descriptions.
-   *
-   * <p>Byte-buddy's circularity lock makes sure we won't have any nested transform calls, but we
-   * may be asked to transform support types while deciding which loaded types need re-transforming
-   * when first installing the agent. If that happens then we need to remember the original context
-   * used for matching and restore it afterwards.
-   */
-  void beginTransform(String name, byte[] bytecode) {
-    targetName = name;
-    targetBytecode = bytecode;
-
-    if (installing) {
-      originalClassLoader = currentClassLoader;
-    }
-  }
-
-  /** Once matching is complete we need full descriptions for the actual transformation. */
-  void enableFullDescriptions() {
-    createOutlines = false;
-  }
-
-  /** Temporarily turn off full description parsing; returns {@code true} if it was enabled. */
-  boolean disableFullDescriptions() {
-    boolean wasEnabled = !createOutlines;
-    createOutlines = OUTLINING_ENABLED;
-    return wasEnabled;
-  }
-
-  /** Cleans-up local caches to minimise memory use once we're done with the type-factory. */
-  void endTransform() {
-    if (null == targetName) {
-      return; // transformation didn't reach resolve step
+    /** Sets the current class-loader context of this type-factory. */
+    void switchContext(ClassLoader classLoader) {
+        if (currentClassLoader != classLoader || null == classFileLocator) {
+            currentClassLoader = classLoader;
+            currentClassLoaderId = -1; // lazily computed
+            classFileLocator = classFileLocator(classLoader);
+            // clear local type cache whenever the class-loader context changes
+            deferredTypes.clear();
+        }
     }
 
-    if (installing) {
-      // just finished transforming a support type, restore the original matching context
-      switchContext(originalClassLoader);
-    } else {
-      clearReferences();
+    ClassLoader currentContext() {
+        return currentClassLoader;
     }
 
-    targetName = null;
-    targetBytecode = null;
-    createOutlines = OUTLINING_ENABLED;
-  }
-
-  private void clearReferences() {
-    if (null != classFileLocator) {
-      currentClassLoader = null;
-      currentClassLoaderId = -1;
-      classFileLocator = null;
-      deferredTypes.clear();
+    void beginInstall() {
+        installing = true;
     }
-  }
-
-  static TypeDescription findDescriptor(String descriptor) {
-    TypeDescription type;
-    int arity = 0;
-    char c = descriptor.charAt(arity);
-    while (c == '[') {
-      c = descriptor.charAt(++arity);
-    }
-    if (c == 'L') {
-      // discard leading 'L' and trailing ';'
-      type = findType(descriptor.substring(arity + 1, descriptor.length() - 1).replace('/', '.'));
-    } else {
-      type = primitiveDescriptorTypes.get(c);
-    }
-    if (arity > 0 && null != type) {
-      type = TypeDescription.ArrayProjection.of(type, arity);
+
+    void endInstall() {
+        installing = false;
+        originalClassLoader = null;
+        clearReferences();
     }
-    return type;
-  }
 
-  static TypeDescription findType(String name) {
-    if (name.length() < 8) { // possible primitive name
-      TypeDescription type = primitiveTypes.get(name);
-      if (null != type) {
-        return type;
-      }
+    static void clear() {
+        outlineTypes.clear();
+        fullTypes.clear();
     }
-    return typeFactory.get().deferTypeResolution(name);
-  }
-
-  private TypeDescription deferTypeResolution(String name) {
-    return deferredTypes.computeIfAbsent(name, deferType);
-  }
-
-  /** Attempts to resolve the named type using the current context. */
-  TypeDescription resolveType(LazyType request) {
-    if (null != classFileLocator) {
-      TypeDescription result;
-      if (createOutlines) {
-        if ("java.lang.Object".equals(request.name)) {
-          return objectOutline;
+
+    /**
+     * New transform request; begins with type matching that only requires outline descriptions.
+     *
+     * <p>Byte-buddy's circularity lock makes sure we won't have any nested transform calls, but we
+     * may be asked to transform support types while deciding which loaded types need re-transforming
+     * when first installing the agent. If that happens then we need to remember the original context
+     * used for matching and restore it afterwards.
+     */
+    void beginTransform(String name, byte[] bytecode) {
+        targetName = name;
+        targetBytecode = bytecode;
+
+        if (installing) {
+            originalClassLoader = currentClassLoader;
         }
-        result = lookupType(request, outlineTypes, outlineTypeParser);
-      } else {
-        result = lookupType(request, fullTypes, fullTypeParser);
-      }
-      if (null != result) {
-        return new CachingType(result);
-      }
     }
-    return null;
-  }
-
-  /** Looks up the type in the current context before falling back to parsing the class-file. */
-  private TypeDescription lookupType(
-      LazyType request, TypeInfoCache<TypeDescription> types, TypeParser typeParser) {
-    String name = request.name;
-    int classLoaderId = request.getClassLoaderId();
-    boolean isOutline = typeParser == outlineTypeParser;
-    long fromTick = InstrumenterMetrics.tick();
-
-    // existing type description from same classloader?
-    SharedTypeInfo<TypeDescription> sharedType = types.find(name);
-    if (null != sharedType
-        && (name.startsWith("java.") || sharedType.sameClassLoader(classLoaderId))) {
-      InstrumenterMetrics.reuseTypeDescription(fromTick, isOutline);
-      return sharedType.get();
-    }
-
-    URL classFile = request.getClassFile();
 
-    // existing type description from same class file?
-    if (null != sharedType && sharedType.sameClassFile(classFile)) {
-      InstrumenterMetrics.reuseTypeDescription(fromTick, isOutline);
-      return sharedType.get();
+    /** Once matching is complete we need full descriptions for the actual transformation. */
+    void enableFullDescriptions() {
+        createOutlines = false;
     }
 
-    TypeDescription type = null;
-
-    // try to parse the original bytecode
-    byte[] bytecode = request.getBytecode();
-    if (null != bytecode) {
-      type = typeParser.parse(bytecode);
-    } else if (fallBackToLoadClass) {
-      type = loadType(name, typeParser);
+    /** Temporarily turn off full description parsing; returns {@code true} if it was enabled. */
+    boolean disableFullDescriptions() {
+        boolean wasEnabled = !createOutlines;
+        createOutlines = OUTLINING_ENABLED;
+        return wasEnabled;
     }
 
-    InstrumenterMetrics.buildTypeDescription(fromTick, isOutline);
+    /** Cleans-up local caches to minimise memory use once we're done with the type-factory. */
+    void endTransform() {
+        if (null == targetName) {
+            return; // transformation didn't reach resolve step
+        }
 
-    if (MEMOIZING_ENABLED && null != type) {
-      if (type.isPublic()) {
-        isPublicFilter.add(name);
-      }
-    }
+        if (installing) {
+            // just finished transforming a support type, restore the original matching context
+            switchContext(originalClassLoader);
+        } else {
+            clearReferences();
+        }
 
-    // share result, whether we found it or not
-    types.share(name, classLoaderId, classFile, type);
-
-    return type;
-  }
-
-  /** Falls back to loading the class directly; note this will bypass transformation. */
-  private TypeDescription loadType(String name, TypeParser typeParser) {
-    LOCATING_CLASS.begin();
-    try {
-      Class<?> loadedType;
-      if (BOOTSTRAP_LOADER == currentClassLoader) {
-        loadedType = Class.forName(name, false, BOOTSTRAP_LOADER);
-      } else if (skipLoadClass(currentClassLoader.getClass().getName())) {
-        return null; // avoid known problematic class-loaders
-      } else {
-        loadedType = currentClassLoader.loadClass(name);
-      }
-      log.debug(
-          "Direct loadClass type resolution of {} from class loader {} bypasses transformation",
-          name,
-          currentClassLoader);
-      return typeParser.parse(loadedType);
-    } catch (Throwable ignored) {
-      return null;
-    } finally {
-      LOCATING_CLASS.end();
-    }
-  }
-
-  private static boolean skipLoadClass(String loaderClassName) {
-    // avoid due to https://issues.apache.org/jira/browse/GROOVY-9742
-    return loaderClassName.startsWith("groovy.lang.GroovyClassLoader")
-        || loaderClassName.equals("org.apache.jasper.servlet.JasperLoader");
-  }
-
-  /** Type description that begins with a name and provides more details on-demand. */
-  final class LazyType extends WithName implements WithLocation {
-    private ClassFileLocator.Resolution location;
-    private TypeDescription delegate;
-    private boolean isOutline;
-
-    LazyType(String name) {
-      super(name);
+        targetName = null;
+        targetBytecode = null;
+        createOutlines = OUTLINING_ENABLED;
     }
 
-    @Override
-    public int getClassLoaderId() {
-      if (currentClassLoaderId < 0) {
-        currentClassLoaderId = ClassLoaderIndex.getClassLoaderKeyId(currentClassLoader);
-      }
-      return currentClassLoaderId;
+    private void clearReferences() {
+        if (null != classFileLocator) {
+            currentClassLoader = null;
+            currentClassLoaderId = -1;
+            classFileLocator = null;
+            deferredTypes.clear();
+        }
     }
 
-    @Override
-    public URL getClassFile() {
-      if (null == location) {
-        location = locateClassFile();
-      }
-      if (location instanceof ClassFileLocators.LazyResolution) {
-        return ((ClassFileLocators.LazyResolution) location).url();
-      }
-      return UNKNOWN_CLASS_FILE;
+    static TypeDescription findDescriptor(String descriptor) {
+        TypeDescription type;
+        int arity = 0;
+        char c = descriptor.charAt(arity);
+        while (c == '[') {
+            c = descriptor.charAt(++arity);
+        }
+        if (c == 'L') {
+            // discard leading 'L' and trailing ';'
+            type = findType(
+                    descriptor.substring(arity + 1, descriptor.length() - 1).replace('/', '.'));
+        } else {
+            type = primitiveDescriptorTypes.get(c);
+        }
+        if (arity > 0 && null != type) {
+            type = TypeDescription.ArrayProjection.of(type, arity);
+        }
+        return type;
     }
 
-    @Override
-    public byte[] getBytecode() {
-      if (null == location) {
-        location = locateClassFile();
-      }
-      if (location.isResolved()) {
-        return location.resolve();
-      }
-      return null;
+    static TypeDescription findType(String name) {
+        if (name.length() < 8) { // possible primitive name
+            TypeDescription type = primitiveTypes.get(name);
+            if (null != type) {
+                return type;
+            }
+        }
+        return typeFactory.get().deferTypeResolution(name);
     }
 
-    private ClassFileLocator.Resolution locateClassFile() {
-      if (name.equals(targetName)) {
-        return new ClassFileLocator.Resolution.Explicit(targetBytecode);
-      }
-      try {
-        return classFileLocator.locate(name);
-      } catch (Throwable ignored) {
-        return new ClassFileLocator.Resolution.Illegal(name);
-      }
+    private TypeDescription deferTypeResolution(String name) {
+        return deferredTypes.computeIfAbsent(name, deferType);
     }
 
-    @Override
-    public int getModifiers() {
-      return outline().getModifiers();
+    /** Attempts to resolve the named type using the current context. */
+    TypeDescription resolveType(LazyType request) {
+        if (null != classFileLocator) {
+            TypeDescription result;
+            if (createOutlines) {
+                if ("java.lang.Object".equals(request.name)) {
+                    return objectOutline;
+                }
+                result = lookupType(request, outlineTypes, outlineTypeParser);
+            } else {
+                result = lookupType(request, fullTypes, fullTypeParser);
+            }
+            if (null != result) {
+                return new CachingType(result);
+            }
+        }
+        return null;
     }
 
-    @Override
-    public Generic getSuperClass() {
-      return outline().getSuperClass();
-    }
+    /** Looks up the type in the current context before falling back to parsing the class-file. */
+    private TypeDescription lookupType(LazyType request, TypeInfoCache<TypeDescription> types, TypeParser typeParser) {
+        String name = request.name;
+        int classLoaderId = request.getClassLoaderId();
+        boolean isOutline = typeParser == outlineTypeParser;
+        long fromTick = InstrumenterMetrics.tick();
+
+        // existing type description from same classloader?
+        SharedTypeInfo<TypeDescription> sharedType = types.find(name);
+        if (null != sharedType && (name.startsWith("java.") || sharedType.sameClassLoader(classLoaderId))) {
+            InstrumenterMetrics.reuseTypeDescription(fromTick, isOutline);
+            return sharedType.get();
+        }
 
-    @Override
-    public TypeList.Generic getInterfaces() {
-      return outline().getInterfaces();
-    }
+        URL classFile = request.getClassFile();
+
+        // existing type description from same class file?
+        if (null != sharedType && sharedType.sameClassFile(classFile)) {
+            InstrumenterMetrics.reuseTypeDescription(fromTick, isOutline);
+            return sharedType.get();
+        }
+
+        TypeDescription type = null;
+
+        // try to parse the original bytecode
+        byte[] bytecode = request.getBytecode();
+        if (null != bytecode) {
+            type = typeParser.parse(bytecode);
+        } else if (fallBackToLoadClass) {
+            type = loadType(name, typeParser);
+        }
+
+        InstrumenterMetrics.buildTypeDescription(fromTick, isOutline);
+
+        if (MEMOIZING_ENABLED && null != type) {
+            if (type.isPublic()) {
+                isPublicFilter.add(name);
+            }
+        }
+
+        // share result, whether we found it or not
+        types.share(name, classLoaderId, classFile, type);
 
-    @Override
-    public boolean isPublic() {
-      return isPublicFilter.contains(name) || super.isPublic();
+        return type;
     }
 
-    private TypeDescription outline() {
-      if (null != delegate) {
-        return delegate; // will be at least an outline, no need to re-resolve
-      }
-      if (createOutlines) {
-        return doResolve(true);
-      }
-      // temporarily switch to generating (fast) outlines as that's all we need
-      createOutlines = OUTLINING_ENABLED;
-      try {
-        return doResolve(true);
-      } finally {
-        createOutlines = false;
-      }
+    /** Falls back to loading the class directly; note this will bypass transformation. */
+    private TypeDescription loadType(String name, TypeParser typeParser) {
+        LOCATING_CLASS.begin();
+        try {
+            Class<?> loadedType;
+            if (BOOTSTRAP_LOADER == currentClassLoader) {
+                loadedType = Class.forName(name, false, BOOTSTRAP_LOADER);
+            } else if (skipLoadClass(currentClassLoader.getClass().getName())) {
+                return null; // avoid known problematic class-loaders
+            } else {
+                loadedType = currentClassLoader.loadClass(name);
+            }
+            log.debug(
+                    "Direct loadClass type resolution of {} from class loader {} bypasses transformation",
+                    name,
+                    currentClassLoader);
+            return typeParser.parse(loadedType);
+        } catch (Throwable ignored) {
+            return null;
+        } finally {
+            LOCATING_CLASS.end();
+        }
     }
 
-    @Override
-    protected TypeDescription delegate() {
-      return doResolve(true);
+    private static boolean skipLoadClass(String loaderClassName) {
+        // avoid due to https://issues.apache.org/jira/browse/GROOVY-9742
+        return loaderClassName.startsWith("groovy.lang.GroovyClassLoader")
+                || loaderClassName.equals("org.apache.jasper.servlet.JasperLoader");
     }
 
-    TypeDescription doResolve(boolean throwIfMissing) {
-      // re-resolve type when switching to full descriptions
-      if (null == delegate || (isOutline && !createOutlines)) {
-        delegate = resolveType(this);
-        isOutline = createOutlines;
-        if (throwIfMissing && null == delegate) {
-          throw new TypePool.Resolution.NoSuchTypeException(name);
+    /** Type description that begins with a name and provides more details on-demand. */
+    final class LazyType extends WithName implements WithLocation {
+        private ClassFileLocator.Resolution location;
+        private TypeDescription delegate;
+        private boolean isOutline;
+
+        LazyType(String name) {
+            super(name);
         }
-      }
-      return delegate;
-    }
-  }
 
-  /** Type resolution that provides more details on-demand. */
-  static final class LazyResolution implements TypePool.Resolution {
-    private final LazyType type;
+        @Override
+        public int getClassLoaderId() {
+            if (currentClassLoaderId < 0) {
+                currentClassLoaderId = ClassLoaderIndex.getClassLoaderKeyId(currentClassLoader);
+            }
+            return currentClassLoaderId;
+        }
 
-    LazyResolution(LazyType type) {
-      this.type = type;
-    }
+        @Override
+        public URL getClassFile() {
+            if (null == location) {
+                location = locateClassFile();
+            }
+            if (location instanceof ClassFileLocators.LazyResolution) {
+                return ((ClassFileLocators.LazyResolution) location).url();
+            }
+            return UNKNOWN_CLASS_FILE;
+        }
+
+        @Override
+        public byte[] getBytecode() {
+            if (null == location) {
+                location = locateClassFile();
+            }
+            if (location.isResolved()) {
+                return location.resolve();
+            }
+            return null;
+        }
+
+        private ClassFileLocator.Resolution locateClassFile() {
+            if (name.equals(targetName)) {
+                return new ClassFileLocator.Resolution.Explicit(targetBytecode);
+            }
+            try {
+                return classFileLocator.locate(name);
+            } catch (Throwable ignored) {
+                return new ClassFileLocator.Resolution.Illegal(name);
+            }
+        }
+
+        @Override
+        public int getModifiers() {
+            return outline().getModifiers();
+        }
+
+        @Override
+        public Generic getSuperClass() {
+            return outline().getSuperClass();
+        }
+
+        @Override
+        public TypeList.Generic getInterfaces() {
+            return outline().getInterfaces();
+        }
+
+        @Override
+        public boolean isPublic() {
+            return isPublicFilter.contains(name) || super.isPublic();
+        }
+
+        private TypeDescription outline() {
+            if (null != delegate) {
+                return delegate; // will be at least an outline, no need to re-resolve
+            }
+            if (createOutlines) {
+                return doResolve(true);
+            }
+            // temporarily switch to generating (fast) outlines as that's all we need
+            createOutlines = OUTLINING_ENABLED;
+            try {
+                return doResolve(true);
+            } finally {
+                createOutlines = false;
+            }
+        }
 
-    @Override
-    public boolean isResolved() {
-      return null != type.doResolve(false);
+        @Override
+        protected TypeDescription delegate() {
+            return doResolve(true);
+        }
+
+        TypeDescription doResolve(boolean throwIfMissing) {
+            // re-resolve type when switching to full descriptions
+            if (null == delegate || (isOutline && !createOutlines)) {
+                delegate = resolveType(this);
+                isOutline = createOutlines;
+                if (throwIfMissing && null == delegate) {
+                    throw new TypePool.Resolution.NoSuchTypeException(name);
+                }
+            }
+            return delegate;
+        }
     }
 
-    @Override
-    public TypeDescription resolve() {
-      return type;
+    /** Type resolution that provides more details on-demand. */
+    static final class LazyResolution implements TypePool.Resolution {
+        private final LazyType type;
+
+        LazyResolution(LazyType type) {
+            this.type = type;
+        }
+
+        @Override
+        public boolean isResolved() {
+            return null != type.doResolve(false);
+        }
+
+        @Override
+        public TypeDescription resolve() {
+            return type;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeOutline.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeOutline.java
index 294d9939a59..1c8d08fe7b6 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeOutline.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeOutline.java
@@ -18,145 +18,141 @@
 
 /** Provides an outline of a type; i.e. the named elements making up its structure. */
 final class TypeOutline extends WithName {
-  private static final int ALLOWED_TYPE_MODIFIERS = 0x0000ffdf; // excludes ACC_SUPER
+    private static final int ALLOWED_TYPE_MODIFIERS = 0x0000ffdf; // excludes ACC_SUPER
 
-  static final TypeList.Generic NO_TYPES = new TypeList.Generic.Empty();
-  static final AnnotationList NO_ANNOTATIONS = new AnnotationList.Empty();
+    static final TypeList.Generic NO_TYPES = new TypeList.Generic.Empty();
+    static final AnnotationList NO_ANNOTATIONS = new AnnotationList.Empty();
 
-  private static final FieldList<FieldDescription.InDefinedShape> NO_FIELDS =
-      new FieldList.Empty<>();
-  private static final MethodList<MethodDescription.InDefinedShape> NO_METHODS =
-      new MethodList.Empty<>();
-
-  private final int modifiers;
-  private final String superName;
-  private final String[] interfaces;
-
-  private List<AnnotationDescription> declaredAnnotations;
-
-  private final List<FieldDescription.InDefinedShape> declaredFields = new ArrayList<>();
-  private final List<MethodDescription.InDefinedShape> declaredMethods = new ArrayList<>();
-
-  TypeOutline(int access, String internalName, String superName, String[] interfaces) {
-    super(internalName.replace('/', '.'));
-    this.modifiers = access & ALLOWED_TYPE_MODIFIERS;
-    this.superName = superName;
-    this.interfaces = interfaces;
-  }
-
-  /** Adapts simpler {@link ClassOutline} structure to existing {@link TypeOutline}. */
-  public TypeOutline(ClassOutline outline) {
-    super(outline.className.replace('/', '.'));
-    this.modifiers = outline.access & ALLOWED_TYPE_MODIFIERS;
-    this.superName = outline.superName;
-    this.interfaces = outline.interfaces;
-
-    for (String annotation : outline.annotations) {
-      declare(annotationOutline(annotation));
-    }
-
-    for (datadog.instrument.classmatch.FieldOutline f : outline.fields) {
-      declare(new FieldOutline(this, f.access, f.fieldName, f.descriptor));
-    }
-
-    for (datadog.instrument.classmatch.MethodOutline m : outline.methods) {
-      MethodOutline method = new MethodOutline(this, m.access, m.methodName, m.descriptor);
-      for (String annotation : m.annotations) {
-        method.declare(annotationOutline(annotation));
-      }
-      declare(method);
-    }
-  }
-
-  @Override
-  protected TypeDescription delegate() {
-    throw new IllegalStateException("Not available in outline for " + name);
-  }
-
-  @Override
-  public Generic getSuperClass() {
-    if (null != superName) {
-      return findType(superName.replace('/', '.')).asGenericType();
-    }
-    return null;
-  }
-
-  @Override
-  public TypeList.Generic getInterfaces() {
-    if (interfaces.length == 0) {
-      return NO_TYPES;
-    }
-    List<Generic> outlines = new ArrayList<>(interfaces.length);
-    for (final String iface : interfaces) {
-      outlines.add(findType(iface.replace('/', '.')).asGenericType());
-    }
-    return new TypeList.Generic.Explicit(outlines);
-  }
-
-  @Override
-  public int getModifiers() {
-    return modifiers;
-  }
-
-  @Override
-  public boolean isAbstract() {
-    return matchesMask(Opcodes.ACC_ABSTRACT);
-  }
-
-  @Override
-  public boolean isEnum() {
-    return matchesMask(Opcodes.ACC_ENUM);
-  }
-
-  @Override
-  public boolean isInterface() {
-    return matchesMask(Opcodes.ACC_INTERFACE);
-  }
-
-  @Override
-  public boolean isAnnotation() {
-    return matchesMask(Opcodes.ACC_ANNOTATION);
-  }
-
-  private boolean matchesMask(int mask) {
-    return (this.getModifiers() & mask) == mask;
-  }
-
-  @Override
-  public AnnotationList getDeclaredAnnotations() {
-    return null == declaredAnnotations
-        ? NO_ANNOTATIONS
-        : new AnnotationList.Explicit(declaredAnnotations);
-  }
-
-  @Override
-  public FieldList<FieldDescription.InDefinedShape> getDeclaredFields() {
-    return declaredFields.isEmpty() ? NO_FIELDS : new FieldList.Explicit<>(declaredFields);
-  }
-
-  @Override
-  public MethodList<MethodDescription.InDefinedShape> getDeclaredMethods() {
-    return declaredMethods.isEmpty() ? NO_METHODS : new MethodList.Explicit<>(declaredMethods);
-  }
-
-  void declare(AnnotationDescription annotation) {
-    if (null != annotation) {
-      if (null == declaredAnnotations) {
-        declaredAnnotations = new ArrayList<>();
-      }
-      declaredAnnotations.add(annotation);
-    }
-  }
-
-  void declare(FieldDescription.InDefinedShape field) {
-    if (null != field) {
-      declaredFields.add(field);
-    }
-  }
+    private static final FieldList<FieldDescription.InDefinedShape> NO_FIELDS = new FieldList.Empty<>();
+    private static final MethodList<MethodDescription.InDefinedShape> NO_METHODS = new MethodList.Empty<>();
 
-  void declare(MethodDescription.InDefinedShape method) {
-    if (null != method) {
-      declaredMethods.add(method);
-    }
-  }
+    private final int modifiers;
+    private final String superName;
+    private final String[] interfaces;
+
+    private List<AnnotationDescription> declaredAnnotations;
+
+    private final List<FieldDescription.InDefinedShape> declaredFields = new ArrayList<>();
+    private final List<MethodDescription.InDefinedShape> declaredMethods = new ArrayList<>();
+
+    TypeOutline(int access, String internalName, String superName, String[] interfaces) {
+        super(internalName.replace('/', '.'));
+        this.modifiers = access & ALLOWED_TYPE_MODIFIERS;
+        this.superName = superName;
+        this.interfaces = interfaces;
+    }
+
+    /** Adapts simpler {@link ClassOutline} structure to existing {@link TypeOutline}. */
+    public TypeOutline(ClassOutline outline) {
+        super(outline.className.replace('/', '.'));
+        this.modifiers = outline.access & ALLOWED_TYPE_MODIFIERS;
+        this.superName = outline.superName;
+        this.interfaces = outline.interfaces;
+
+        for (String annotation : outline.annotations) {
+            declare(annotationOutline(annotation));
+        }
+
+        for (datadog.instrument.classmatch.FieldOutline f : outline.fields) {
+            declare(new FieldOutline(this, f.access, f.fieldName, f.descriptor));
+        }
+
+        for (datadog.instrument.classmatch.MethodOutline m : outline.methods) {
+            MethodOutline method = new MethodOutline(this, m.access, m.methodName, m.descriptor);
+            for (String annotation : m.annotations) {
+                method.declare(annotationOutline(annotation));
+            }
+            declare(method);
+        }
+    }
+
+    @Override
+    protected TypeDescription delegate() {
+        throw new IllegalStateException("Not available in outline for " + name);
+    }
+
+    @Override
+    public Generic getSuperClass() {
+        if (null != superName) {
+            return findType(superName.replace('/', '.')).asGenericType();
+        }
+        return null;
+    }
+
+    @Override
+    public TypeList.Generic getInterfaces() {
+        if (interfaces.length == 0) {
+            return NO_TYPES;
+        }
+        List<Generic> outlines = new ArrayList<>(interfaces.length);
+        for (final String iface : interfaces) {
+            outlines.add(findType(iface.replace('/', '.')).asGenericType());
+        }
+        return new TypeList.Generic.Explicit(outlines);
+    }
+
+    @Override
+    public int getModifiers() {
+        return modifiers;
+    }
+
+    @Override
+    public boolean isAbstract() {
+        return matchesMask(Opcodes.ACC_ABSTRACT);
+    }
+
+    @Override
+    public boolean isEnum() {
+        return matchesMask(Opcodes.ACC_ENUM);
+    }
+
+    @Override
+    public boolean isInterface() {
+        return matchesMask(Opcodes.ACC_INTERFACE);
+    }
+
+    @Override
+    public boolean isAnnotation() {
+        return matchesMask(Opcodes.ACC_ANNOTATION);
+    }
+
+    private boolean matchesMask(int mask) {
+        return (this.getModifiers() & mask) == mask;
+    }
+
+    @Override
+    public AnnotationList getDeclaredAnnotations() {
+        return null == declaredAnnotations ? NO_ANNOTATIONS : new AnnotationList.Explicit(declaredAnnotations);
+    }
+
+    @Override
+    public FieldList<FieldDescription.InDefinedShape> getDeclaredFields() {
+        return declaredFields.isEmpty() ? NO_FIELDS : new FieldList.Explicit<>(declaredFields);
+    }
+
+    @Override
+    public MethodList<MethodDescription.InDefinedShape> getDeclaredMethods() {
+        return declaredMethods.isEmpty() ? NO_METHODS : new MethodList.Explicit<>(declaredMethods);
+    }
+
+    void declare(AnnotationDescription annotation) {
+        if (null != annotation) {
+            if (null == declaredAnnotations) {
+                declaredAnnotations = new ArrayList<>();
+            }
+            declaredAnnotations.add(annotation);
+        }
+    }
+
+    void declare(FieldDescription.InDefinedShape field) {
+        if (null != field) {
+            declaredFields.add(field);
+        }
+    }
+
+    void declare(MethodDescription.InDefinedShape method) {
+        if (null != method) {
+            declaredMethods.add(method);
+        }
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeParser.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeParser.java
index 9af91e349d7..89d4deadfc3 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeParser.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeParser.java
@@ -5,7 +5,7 @@
 /** Parses bytecode or loaded types into descriptions. */
 interface TypeParser {
 
-  TypeDescription parse(byte[] bytecode);
+    TypeDescription parse(byte[] bytecode);
 
-  TypeDescription parse(Class<?> loadedType);
+    TypeDescription parse(Class<?> loadedType);
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypePoolFacade.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypePoolFacade.java
index b5b2e3b39a8..0e0d9884e8d 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypePoolFacade.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypePoolFacade.java
@@ -12,73 +12,73 @@
 
 /** {@link TypePool} facade that looks up types using the active thread's {@link TypeFactory}. */
 public final class TypePoolFacade implements TypePool, SharedTypePools.Supplier {
-  public static final TypePoolFacade INSTANCE = new TypePoolFacade();
+    public static final TypePoolFacade INSTANCE = new TypePoolFacade();
 
-  public static void registerAsSupplier() {
-    SharedTypePools.registerIfAbsent(INSTANCE);
-    typeFactory.get().beginInstall();
-  }
+    public static void registerAsSupplier() {
+        SharedTypePools.registerIfAbsent(INSTANCE);
+        typeFactory.get().beginInstall();
+    }
 
-  @Override
-  public TypePool typePool(ClassLoader classLoader) {
-    switchContext(classLoader);
-    return INSTANCE;
-  }
+    @Override
+    public TypePool typePool(ClassLoader classLoader) {
+        switchContext(classLoader);
+        return INSTANCE;
+    }
 
-  /** Switches the active thread's context to use the given class-loader. */
-  public static void switchContext(ClassLoader classLoader) {
-    typeFactory.get().switchContext(classLoader);
-  }
+    /** Switches the active thread's context to use the given class-loader. */
+    public static void switchContext(ClassLoader classLoader) {
+        typeFactory.get().switchContext(classLoader);
+    }
 
-  public static ClassLoader currentContext() {
-    return typeFactory.get().currentContext();
-  }
+    public static ClassLoader currentContext() {
+        return typeFactory.get().currentContext();
+    }
 
-  @Override
-  public void annotationOfInterest(String name) {
-    AnnotationOutline.prepareAnnotationOutline(name);
-  }
+    @Override
+    public void annotationOfInterest(String name) {
+        AnnotationOutline.prepareAnnotationOutline(name);
+    }
 
-  @Override
-  public void endInstall() {
-    typeFactory.get().endInstall();
-  }
+    @Override
+    public void endInstall() {
+        typeFactory.get().endInstall();
+    }
 
-  /** Record a new transform request for the named class-file. */
-  public static void beginTransform(String name, byte[] bytecode) {
-    typeFactory.get().beginTransform(name, bytecode);
-  }
+    /** Record a new transform request for the named class-file. */
+    public static void beginTransform(String name, byte[] bytecode) {
+        typeFactory.get().beginTransform(name, bytecode);
+    }
 
-  /** Switch to full descriptions, needed for the actual class transformation. */
-  public static void enableFullDescriptions() {
-    typeFactory.get().enableFullDescriptions();
-  }
+    /** Switch to full descriptions, needed for the actual class transformation. */
+    public static void enableFullDescriptions() {
+        typeFactory.get().enableFullDescriptions();
+    }
 
-  /** Temporarily switch back to outlines, e.g. for last-minute memoization. */
-  public static boolean disableFullDescriptions() {
-    return typeFactory.get().disableFullDescriptions();
-  }
+    /** Temporarily switch back to outlines, e.g. for last-minute memoization. */
+    public static boolean disableFullDescriptions() {
+        return typeFactory.get().disableFullDescriptions();
+    }
 
-  @Override
-  public void endTransform() {
-    typeFactory.get().endTransform();
-  }
+    @Override
+    public void endTransform() {
+        typeFactory.get().endTransform();
+    }
 
-  @Override
-  public void clear() {
-    if (InstrumenterConfig.get().isResolverMemoizingEnabled()) {
-      Memoizer.clear();
+    @Override
+    public void clear() {
+        if (InstrumenterConfig.get().isResolverMemoizingEnabled()) {
+            Memoizer.clear();
+        }
+        TypeFactory.clear();
     }
-    TypeFactory.clear();
-  }
 
-  @Override
-  public Resolution describe(String name) {
-    // describe elements as deferred types, lazily evaluated using the current context
-    TypeDescription type = name.charAt(0) == '[' ? findDescriptor(name) : findType(name);
-    if (type instanceof TypeFactory.LazyType) {
-      return new TypeFactory.LazyResolution((TypeFactory.LazyType) type);
+    @Override
+    public Resolution describe(String name) {
+        // describe elements as deferred types, lazily evaluated using the current context
+        TypeDescription type = name.charAt(0) == '[' ? findDescriptor(name) : findType(name);
+        if (type instanceof TypeFactory.LazyType) {
+            return new TypeFactory.LazyResolution((TypeFactory.LazyType) type);
+        }
+        return new Resolution.Simple(type);
     }
-    return new Resolution.Simple(type);
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/WithLocation.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/WithLocation.java
index 55bde94f0ba..be007a38159 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/WithLocation.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/WithLocation.java
@@ -4,9 +4,9 @@
 
 /** Provides details of where the resolved type was defined. */
 public interface WithLocation {
-  int getClassLoaderId();
+    int getClassLoaderId();
 
-  URL getClassFile();
+    URL getClassFile();
 
-  byte[] getBytecode();
+    byte[] getBytecode();
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/WithName.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/WithName.java
index 0c622bdc74c..dc1132aa1f3 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/WithName.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/WithName.java
@@ -4,33 +4,33 @@
 
 /** Provide as much detail as we can from just a type-name. */
 abstract class WithName extends TypeDescription.AbstractBase.OfSimpleType.WithDelegation {
-  final String name;
+    final String name;
 
-  WithName(String name) {
-    this.name = name;
-  }
+    WithName(String name) {
+        this.name = name;
+    }
 
-  @Override
-  public final String getName() {
-    return name;
-  }
+    @Override
+    public final String getName() {
+        return name;
+    }
 
-  @Override
-  public final String getActualName() {
-    return name;
-  }
+    @Override
+    public final String getActualName() {
+        return name;
+    }
 
-  @Override
-  public final String getTypeName() {
-    return name;
-  }
+    @Override
+    public final String getTypeName() {
+        return name;
+    }
 
-  @Override
-  public final String getSimpleName() {
-    int afterLastDot = name.lastIndexOf('.') + 1;
-    if (name.indexOf('$', afterLastDot) < 0) {
-      return name.substring(afterLastDot);
+    @Override
+    public final String getSimpleName() {
+        int afterLastDot = name.lastIndexOf('.') + 1;
+        if (name.indexOf('$', afterLastDot) < 0) {
+            return name.substring(afterLastDot);
+        }
+        return super.getSimpleName(); // names with $ require the enclosing type to verify
     }
-    return super.getSimpleName(); // names with $ require the enclosing type to verify
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/profiling/UnwrappingVisitor.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/profiling/UnwrappingVisitor.java
index 54b03196444..2a0375f43d7 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/profiling/UnwrappingVisitor.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/profiling/UnwrappingVisitor.java
@@ -20,113 +20,102 @@
 
 public class UnwrappingVisitor implements AsmVisitorWrapper {
 
-  private final Map<String, String> classNameToDelegateFieldNames;
-
-  public UnwrappingVisitor(String... classAndDelegateFieldNames) {
-    assert classAndDelegateFieldNames.length % 2 == 0;
-    classNameToDelegateFieldNames = new HashMap<>(classAndDelegateFieldNames.length);
-    for (int i = 0; i < classAndDelegateFieldNames.length; i += 2) {
-      classNameToDelegateFieldNames.put(
-          classAndDelegateFieldNames[i], classAndDelegateFieldNames[i + 1]);
-    }
-  }
-
-  @Override
-  public int mergeWriter(int flags) {
-    return flags;
-  }
-
-  @Override
-  public int mergeReader(int flags) {
-    return flags;
-  }
-
-  @Override
-  public ClassVisitor wrap(
-      TypeDescription instrumentedType,
-      ClassVisitor classVisitor,
-      Implementation.Context implementationContext,
-      TypePool typePool,
-      FieldList<FieldDescription.InDefinedShape> fields,
-      MethodList<?> methods,
-      int writerFlags,
-      int readerFlags) {
-    String fieldName = classNameToDelegateFieldNames.get(instrumentedType.getName());
-    return fieldName == null
-        ? classVisitor
-        : new ImplementTaskWrapperClassVisitor(
-            classVisitor, instrumentedType.getInternalName(), fieldName);
-  }
-
-  static class ImplementTaskWrapperClassVisitor extends ClassVisitor {
-
-    private static final String TASK_WRAPPER =
-        "datadog/trace/bootstrap/instrumentation/api/TaskWrapper";
-
-    private final String className;
-    private final String fieldName;
-    private boolean modify = false;
-    private String descriptor;
-
-    protected ImplementTaskWrapperClassVisitor(
-        ClassVisitor classVisitor, String className, String fieldName) {
-      super(OpenedClassReader.ASM_API, classVisitor);
-      this.className = className;
-      this.fieldName = fieldName;
+    private final Map<String, String> classNameToDelegateFieldNames;
+
+    public UnwrappingVisitor(String... classAndDelegateFieldNames) {
+        assert classAndDelegateFieldNames.length % 2 == 0;
+        classNameToDelegateFieldNames = new HashMap<>(classAndDelegateFieldNames.length);
+        for (int i = 0; i < classAndDelegateFieldNames.length; i += 2) {
+            classNameToDelegateFieldNames.put(classAndDelegateFieldNames[i], classAndDelegateFieldNames[i + 1]);
+        }
     }
 
     @Override
-    public void visit(
-        int version,
-        int access,
-        String name,
-        String signature,
-        String superName,
-        String[] interfaces) {
-      if (!arrayContains(interfaces, TASK_WRAPPER)) {
-        interfaces = appendToArray(interfaces, TASK_WRAPPER);
-        if (signature != null) {
-          signature += 'L' + TASK_WRAPPER + ';';
-        }
-        modify = true;
-      }
-      super.visit(version, access, name, signature, superName, interfaces);
+    public int mergeWriter(int flags) {
+        return flags;
     }
 
     @Override
-    public FieldVisitor visitField(
-        int access, String name, String descriptor, String signature, Object value) {
-      if (fieldName.equals(name)) {
-        this.descriptor = descriptor;
-      }
-      return super.visitField(access, name, descriptor, signature, value);
+    public int mergeReader(int flags) {
+        return flags;
     }
 
     @Override
-    public void visitEnd() {
-      if (modify) {
-        addUnwrap();
-      }
+    public ClassVisitor wrap(
+            TypeDescription instrumentedType,
+            ClassVisitor classVisitor,
+            Implementation.Context implementationContext,
+            TypePool typePool,
+            FieldList<FieldDescription.InDefinedShape> fields,
+            MethodList<?> methods,
+            int writerFlags,
+            int readerFlags) {
+        String fieldName = classNameToDelegateFieldNames.get(instrumentedType.getName());
+        return fieldName == null
+                ? classVisitor
+                : new ImplementTaskWrapperClassVisitor(classVisitor, instrumentedType.getInternalName(), fieldName);
     }
 
-    private void addUnwrap() {
-      MethodVisitor mv =
-          cv.visitMethod(Opcodes.ACC_PUBLIC, "$$DD$$__unwrap", "()Ljava/lang/Object;", null, null);
-      mv.visitCode();
-      if (descriptor != null) {
-        // we found the field so can return it
-        mv.visitVarInsn(Opcodes.ALOAD, 0);
-        mv.visitFieldInsn(Opcodes.GETFIELD, className, fieldName, descriptor);
-        mv.visitInsn(Opcodes.ARETURN);
-        mv.visitMaxs(1, 1);
-      } else {
-        // we've added the interface but haven't found the field we wanted to unwrap,
-        // so we have to generate the method, so just return null
-        mv.visitInsn(Opcodes.ACONST_NULL);
-        mv.visitInsn(Opcodes.ARETURN);
-        mv.visitMaxs(1, 1);
-      }
-      mv.visitEnd();
+    static class ImplementTaskWrapperClassVisitor extends ClassVisitor {
+
+        private static final String TASK_WRAPPER = "datadog/trace/bootstrap/instrumentation/api/TaskWrapper";
+
+        private final String className;
+        private final String fieldName;
+        private boolean modify = false;
+        private String descriptor;
+
+        protected ImplementTaskWrapperClassVisitor(ClassVisitor classVisitor, String className, String fieldName) {
+            super(OpenedClassReader.ASM_API, classVisitor);
+            this.className = className;
+            this.fieldName = fieldName;
+        }
+
+        @Override
+        public void visit(
+                int version, int access, String name, String signature, String superName, String[] interfaces) {
+            if (!arrayContains(interfaces, TASK_WRAPPER)) {
+                interfaces = appendToArray(interfaces, TASK_WRAPPER);
+                if (signature != null) {
+                    signature += 'L' + TASK_WRAPPER + ';';
+                }
+                modify = true;
+            }
+            super.visit(version, access, name, signature, superName, interfaces);
+        }
+
+        @Override
+        public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
+            if (fieldName.equals(name)) {
+                this.descriptor = descriptor;
+            }
+            return super.visitField(access, name, descriptor, signature, value);
+        }
+
+        @Override
+        public void visitEnd() {
+            if (modify) {
+                addUnwrap();
+            }
+        }
+
+        private void addUnwrap() {
+            MethodVisitor mv = cv.visitMethod(Opcodes.ACC_PUBLIC, "$$DD$$__unwrap", "()Ljava/lang/Object;", null, null);
+            mv.visitCode();
+            if (descriptor != null) {
+                // we found the field so can return it
+                mv.visitVarInsn(Opcodes.ALOAD, 0);
+                mv.visitFieldInsn(Opcodes.GETFIELD, className, fieldName, descriptor);
+                mv.visitInsn(Opcodes.ARETURN);
+                mv.visitMaxs(1, 1);
+            } else {
+                // we've added the interface but haven't found the field we wanted to unwrap,
+                // so we have to generate the method, so just return null
+                mv.visitInsn(Opcodes.ACONST_NULL);
+                mv.visitInsn(Opcodes.ARETURN);
+                mv.visitMaxs(1, 1);
+            }
+            mv.visitEnd();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/reqctx/InjectRequestContextVisitor.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/reqctx/InjectRequestContextVisitor.java
index 305a44a3546..34714f9f11e 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/reqctx/InjectRequestContextVisitor.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/reqctx/InjectRequestContextVisitor.java
@@ -36,429 +36,411 @@
  * exit advices.
  */
 public class InjectRequestContextVisitor extends ClassVisitor {
-  private static final String REQUEST_CONTEXT_DESCRIPTOR = Type.getDescriptor(RequestContext.class);
-
-  private final List<MethodDescription> methods;
-  private final AdviceContent adviceContent;
-  private final RequestContextSlot slot;
-
-  public static ClassVisitor createVisitor(
-      ClassVisitor cv, MethodList<?> methods, RequestContextSlot slot) {
-    List<MethodDescription> methodList = new ArrayList<>();
-    boolean hasOnEnter = false, hasOnExit = false;
-    for (MethodDescription method : methods) {
-      AnnotationList annotations = method.getDeclaredAnnotations();
-      if (annotations.isAnnotationPresent(Advice.OnMethodEnter.class)) {
-        hasOnEnter = true;
-        methodList.add(method);
-      } else if (annotations.isAnnotationPresent(Advice.OnMethodExit.class)) {
-        hasOnExit = true;
-        methodList.add(method);
-      }
-    }
+    private static final String REQUEST_CONTEXT_DESCRIPTOR = Type.getDescriptor(RequestContext.class);
+
+    private final List<MethodDescription> methods;
+    private final AdviceContent adviceContent;
+    private final RequestContextSlot slot;
+
+    public static ClassVisitor createVisitor(ClassVisitor cv, MethodList<?> methods, RequestContextSlot slot) {
+        List<MethodDescription> methodList = new ArrayList<>();
+        boolean hasOnEnter = false, hasOnExit = false;
+        for (MethodDescription method : methods) {
+            AnnotationList annotations = method.getDeclaredAnnotations();
+            if (annotations.isAnnotationPresent(Advice.OnMethodEnter.class)) {
+                hasOnEnter = true;
+                methodList.add(method);
+            } else if (annotations.isAnnotationPresent(Advice.OnMethodExit.class)) {
+                hasOnExit = true;
+                methodList.add(method);
+            }
+        }
 
-    if (!hasOnEnter && !hasOnExit) {
-      return cv;
-    }
+        if (!hasOnEnter && !hasOnExit) {
+            return cv;
+        }
 
-    return new InjectRequestContextVisitor(cv, methodList, hasOnEnter, hasOnExit, slot);
-  }
-
-  public InjectRequestContextVisitor(
-      ClassVisitor cv,
-      List<MethodDescription> methodList,
-      boolean hasOnEnter,
-      boolean hasOnExit,
-      RequestContextSlot slot) {
-    super(OpenedClassReader.ASM_API, cv);
-    if (hasOnEnter && hasOnExit) {
-      this.adviceContent = AdviceContent.HAS_BOTH;
-    } else if (hasOnEnter) {
-      this.adviceContent = AdviceContent.HAS_ENTER;
-    } else {
-      this.adviceContent = AdviceContent.HAS_EXIT;
+        return new InjectRequestContextVisitor(cv, methodList, hasOnEnter, hasOnExit, slot);
     }
-    this.methods = methodList;
-    this.slot = slot;
-  }
-
-  private MethodDescription getMethodDescription(String name, String descriptor) {
-    for (MethodDescription method : this.methods) {
-      if (method.getName().equals(name) && method.getDescriptor().equals(descriptor)) {
-        return method;
-      }
-    }
-    return null;
-  }
-
-  @Override
-  public MethodVisitor visitMethod(
-      int access, String name, String descriptor, String signature, String[] exceptions) {
-    MethodDescription methodDescription = getMethodDescription(name, descriptor);
-    if (methodDescription == null) {
-      return super.visitMethod(access, name, descriptor, signature, exceptions);
+
+    public InjectRequestContextVisitor(
+            ClassVisitor cv,
+            List<MethodDescription> methodList,
+            boolean hasOnEnter,
+            boolean hasOnExit,
+            RequestContextSlot slot) {
+        super(OpenedClassReader.ASM_API, cv);
+        if (hasOnEnter && hasOnExit) {
+            this.adviceContent = AdviceContent.HAS_BOTH;
+        } else if (hasOnEnter) {
+            this.adviceContent = AdviceContent.HAS_ENTER;
+        } else {
+            this.adviceContent = AdviceContent.HAS_EXIT;
+        }
+        this.methods = methodList;
+        this.slot = slot;
     }
-    // method is relevant
-
-    // already has a parameter annotated with ActiveRequestContext?
-    // otherwise, we need to add a parameter
-    boolean hasActiveReqCtxParam = hasActiveReqCtxParam(methodDescription);
-    String newDescriptor = descriptor;
-    String newSignature = signature;
-    if (!hasActiveReqCtxParam) {
-      int posClosingBracket = descriptor.indexOf(')');
-      newDescriptor =
-          descriptor.substring(0, posClosingBracket)
-              + REQUEST_CONTEXT_DESCRIPTOR
-              + descriptor.substring(posClosingBracket);
-      if (signature != null) {
-        newSignature = newMethodSignature(signature);
-      }
+
+    private MethodDescription getMethodDescription(String name, String descriptor) {
+        for (MethodDescription method : this.methods) {
+            if (method.getName().equals(name) && method.getDescriptor().equals(descriptor)) {
+                return method;
+            }
+        }
+        return null;
     }
 
-    MethodVisitor mv = super.visitMethod(access, name, newDescriptor, newSignature, exceptions);
-    if (!hasActiveReqCtxParam) {
-      mv = new LocalVariablesSorter(Opcodes.ACC_STATIC, descriptor, mv);
+    @Override
+    public MethodVisitor visitMethod(
+            int access, String name, String descriptor, String signature, String[] exceptions) {
+        MethodDescription methodDescription = getMethodDescription(name, descriptor);
+        if (methodDescription == null) {
+            return super.visitMethod(access, name, descriptor, signature, exceptions);
+        }
+        // method is relevant
+
+        // already has a parameter annotated with ActiveRequestContext?
+        // otherwise, we need to add a parameter
+        boolean hasActiveReqCtxParam = hasActiveReqCtxParam(methodDescription);
+        String newDescriptor = descriptor;
+        String newSignature = signature;
+        if (!hasActiveReqCtxParam) {
+            int posClosingBracket = descriptor.indexOf(')');
+            newDescriptor = descriptor.substring(0, posClosingBracket)
+                    + REQUEST_CONTEXT_DESCRIPTOR
+                    + descriptor.substring(posClosingBracket);
+            if (signature != null) {
+                newSignature = newMethodSignature(signature);
+            }
+        }
+
+        MethodVisitor mv = super.visitMethod(access, name, newDescriptor, newSignature, exceptions);
+        if (!hasActiveReqCtxParam) {
+            mv = new LocalVariablesSorter(Opcodes.ACC_STATIC, descriptor, mv);
+        }
+        return new AdviceMethodVisitor(this.api, methodDescription, this.adviceContent, mv, this.slot);
     }
-    return new AdviceMethodVisitor(this.api, methodDescription, this.adviceContent, mv, this.slot);
-  }
-
-  private String newMethodSignature(String originalSignature) {
-    SignatureReader signatureReader = new SignatureReader(originalSignature);
-    SignatureWriter signatureWriter =
-        new SignatureWriter() {
-          @Override
-          public SignatureVisitor visitReturnType() {
-            visitParameterType().visitClassType(Type.getInternalName(RequestContext.class));
-            visitEnd();
-            return super.visitReturnType();
-          }
+
+    private String newMethodSignature(String originalSignature) {
+        SignatureReader signatureReader = new SignatureReader(originalSignature);
+        SignatureWriter signatureWriter = new SignatureWriter() {
+            @Override
+            public SignatureVisitor visitReturnType() {
+                visitParameterType().visitClassType(Type.getInternalName(RequestContext.class));
+                visitEnd();
+                return super.visitReturnType();
+            }
         };
-    signatureReader.accept(signatureWriter);
-    return signatureWriter.toString();
-  }
-
-  private boolean hasActiveReqCtxParam(MethodDescription methodDescription) {
-    for (ParameterDescription parameter : methodDescription.getParameters()) {
-      if (parameter.getDeclaredAnnotations().isAnnotationPresent(ActiveRequestContext.class)) {
-        return true;
-      }
+        signatureReader.accept(signatureWriter);
+        return signatureWriter.toString();
+    }
+
+    private boolean hasActiveReqCtxParam(MethodDescription methodDescription) {
+        for (ParameterDescription parameter : methodDescription.getParameters()) {
+            if (parameter.getDeclaredAnnotations().isAnnotationPresent(ActiveRequestContext.class)) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 }
 
 enum AdviceContent {
-  HAS_ENTER,
-  HAS_EXIT,
-  HAS_BOTH,
+    HAS_ENTER,
+    HAS_EXIT,
+    HAS_BOTH,
 }
 
 class AdviceMethodVisitor extends MethodVisitor {
-  private static final String ACTIVE_REQUEST_CONTEXT_DESCRIPTOR =
-      net.bytebuddy.jar.asm.Type.getDescriptor(ActiveRequestContext.class);
-  private static final String ADVICE_LOCAL_DESCRIPTOR =
-      net.bytebuddy.jar.asm.Type.getDescriptor(Advice.Local.class);
-
-  private final boolean isEnter;
-  private final AdviceContent adviceContent;
-  private final MethodDescription methodDescription;
-  private final int reqCtxParamIdx;
-  private final Label beginLabel = new Label();
-  private final Label popBeforeEpilogue = new Label();
-  private final Label epilogueLabel = new Label();
-  private final boolean addReqCtxParam;
-  private final List<ParameterLocalVariable> paramLocalVars = new ArrayList<>();
-  private final RequestContextSlot slot;
-
-  AdviceMethodVisitor(
-      int api,
-      MethodDescription methodDescription,
-      AdviceContent adviceContent,
-      MethodVisitor methodVisitor,
-      RequestContextSlot slot) {
-    super(api, methodVisitor);
-    this.methodDescription = methodDescription;
-    this.adviceContent = adviceContent;
-
-    this.isEnter =
-        methodDescription.getDeclaredAnnotations().isAnnotationPresent(Advice.OnMethodEnter.class);
-
-    int reqCtxParamIdx = -1;
-    this.addReqCtxParam = mv instanceof LocalVariablesSorter;
-    if (addReqCtxParam) {
-      // if we're adding a new parameter, we need to remap the slots for the
-      // existing local variables (add 1). We rely on the LocalVariablesSorter for this
-      reqCtxParamIdx = methodDescription.getParameters().size();
-      ((LocalVariablesSorter) mv)
-          .newLocal(net.bytebuddy.jar.asm.Type.getType(RequestContext.class));
-    } else {
-      // else we just need to get the index for the current annotated parameter
-      for (ParameterDescription p : methodDescription.getParameters()) {
-        if (p.getDeclaredAnnotations().isAnnotationPresent(ActiveRequestContext.class)) {
-          reqCtxParamIdx = p.getIndex();
+    private static final String ACTIVE_REQUEST_CONTEXT_DESCRIPTOR =
+            net.bytebuddy.jar.asm.Type.getDescriptor(ActiveRequestContext.class);
+    private static final String ADVICE_LOCAL_DESCRIPTOR = net.bytebuddy.jar.asm.Type.getDescriptor(Advice.Local.class);
+
+    private final boolean isEnter;
+    private final AdviceContent adviceContent;
+    private final MethodDescription methodDescription;
+    private final int reqCtxParamIdx;
+    private final Label beginLabel = new Label();
+    private final Label popBeforeEpilogue = new Label();
+    private final Label epilogueLabel = new Label();
+    private final boolean addReqCtxParam;
+    private final List<ParameterLocalVariable> paramLocalVars = new ArrayList<>();
+    private final RequestContextSlot slot;
+
+    AdviceMethodVisitor(
+            int api,
+            MethodDescription methodDescription,
+            AdviceContent adviceContent,
+            MethodVisitor methodVisitor,
+            RequestContextSlot slot) {
+        super(api, methodVisitor);
+        this.methodDescription = methodDescription;
+        this.adviceContent = adviceContent;
+
+        this.isEnter = methodDescription.getDeclaredAnnotations().isAnnotationPresent(Advice.OnMethodEnter.class);
+
+        int reqCtxParamIdx = -1;
+        this.addReqCtxParam = mv instanceof LocalVariablesSorter;
+        if (addReqCtxParam) {
+            // if we're adding a new parameter, we need to remap the slots for the
+            // existing local variables (add 1). We rely on the LocalVariablesSorter for this
+            reqCtxParamIdx = methodDescription.getParameters().size();
+            ((LocalVariablesSorter) mv).newLocal(net.bytebuddy.jar.asm.Type.getType(RequestContext.class));
+        } else {
+            // else we just need to get the index for the current annotated parameter
+            for (ParameterDescription p : methodDescription.getParameters()) {
+                if (p.getDeclaredAnnotations().isAnnotationPresent(ActiveRequestContext.class)) {
+                    reqCtxParamIdx = p.getIndex();
+                }
+            }
         }
-      }
-    }
-    if (reqCtxParamIdx == -1) {
-      throw new IllegalStateException();
+        if (reqCtxParamIdx == -1) {
+            throw new IllegalStateException();
+        }
+        this.reqCtxParamIdx = reqCtxParamIdx;
+        this.slot = slot;
     }
-    this.reqCtxParamIdx = reqCtxParamIdx;
-    this.slot = slot;
-  }
-
-  @Override
-  public AnnotationVisitor visitParameterAnnotation(
-      int parameter, String descriptor, boolean visible) {
-    if (!descriptor.equals(ACTIVE_REQUEST_CONTEXT_DESCRIPTOR)) {
-      return super.visitParameterAnnotation(parameter, descriptor, visible);
+
+    @Override
+    public AnnotationVisitor visitParameterAnnotation(int parameter, String descriptor, boolean visible) {
+        if (!descriptor.equals(ACTIVE_REQUEST_CONTEXT_DESCRIPTOR)) {
+            return super.visitParameterAnnotation(parameter, descriptor, visible);
+        }
+
+        // transform @ActiveRequestContext into @Advice.Local
+        annotateReqCtxParam(parameter);
+        return null;
     }
 
-    // transform @ActiveRequestContext into @Advice.Local
-    annotateReqCtxParam(parameter);
-    return null;
-  }
-
-  @Override
-  public void visitAnnotableParameterCount(int parameterCount, boolean visible) {
-    if (!visible) {
-      super.visitAnnotableParameterCount(parameterCount, false);
-    } else {
-      super.visitAnnotableParameterCount(
-          this.addReqCtxParam ? parameterCount + 1 : parameterCount, true);
+    @Override
+    public void visitAnnotableParameterCount(int parameterCount, boolean visible) {
+        if (!visible) {
+            super.visitAnnotableParameterCount(parameterCount, false);
+        } else {
+            super.visitAnnotableParameterCount(this.addReqCtxParam ? parameterCount + 1 : parameterCount, true);
+        }
     }
-  }
-
-  private void annotateReqCtxParam(int parameter) {
-    AnnotationVisitor annotationVisitor =
-        super.visitParameterAnnotation(parameter, ADVICE_LOCAL_DESCRIPTOR, true);
-    annotationVisitor.visit("value", "reqCtx");
-    annotationVisitor.visitEnd();
-  }
-
-  @Override
-  public void visitCode() {
-    if (this.addReqCtxParam) {
-      suppressSorter(
-          new Runnable() {
-            @Override
-            public void run() {
-              AdviceMethodVisitor.this.annotateReqCtxParam(AdviceMethodVisitor.this.reqCtxParamIdx);
-            }
-          });
+
+    private void annotateReqCtxParam(int parameter) {
+        AnnotationVisitor annotationVisitor = super.visitParameterAnnotation(parameter, ADVICE_LOCAL_DESCRIPTOR, true);
+        annotationVisitor.visit("value", "reqCtx");
+        annotationVisitor.visitEnd();
     }
 
-    super.visitCode();
-    super.visitLabel(this.beginLabel);
-    if (shouldFetchReqContext()) {
-      super.visitMethodInsn(
-          Opcodes.INVOKESTATIC,
-          Type.getInternalName(AgentTracer.class),
-          "activeSpan",
-          "()" + Type.getDescriptor(AgentSpan.class),
-          false);
-      super.visitInsn(Opcodes.DUP);
-      super.visitJumpInsn(Opcodes.IFNULL, this.popBeforeEpilogue);
-      super.visitMethodInsn(
-          Opcodes.INVOKEINTERFACE,
-          Type.getInternalName(AgentSpan.class),
-          "getRequestContext",
-          "()" + Type.getDescriptor(RequestContext.class),
-          true);
-      super.visitInsn(Opcodes.DUP);
-      super.visitJumpInsn(Opcodes.IFNULL, this.popBeforeEpilogue);
-
-      super.visitInsn(Opcodes.DUP);
-      super.visitFieldInsn(
-          Opcodes.GETSTATIC,
-          Type.getInternalName(RequestContextSlot.class),
-          this.slot.name(),
-          Type.getDescriptor(RequestContextSlot.class));
-      super.visitMethodInsn(
-          Opcodes.INVOKEINTERFACE,
-          Type.getInternalName(RequestContext.class),
-          "getData",
-          "(" + Type.getDescriptor(RequestContextSlot.class) + ")Ljava/lang/Object;",
-          true);
-      super.visitJumpInsn(Opcodes.IFNULL, this.popBeforeEpilogue);
-      suppressSorter(
-          new Runnable() {
-            @Override
-            public void run() {
-              AdviceMethodVisitor.super.visitVarInsn(
-                  Opcodes.ASTORE, AdviceMethodVisitor.this.reqCtxParamIdx);
-            }
-          });
-    } else {
-      suppressSorter(
-          new Runnable() {
-            @Override
-            public void run() {
-              AdviceMethodVisitor.super.visitVarInsn(
-                  Opcodes.ALOAD, AdviceMethodVisitor.this.reqCtxParamIdx);
-            }
-          });
-      super.visitJumpInsn(Opcodes.IFNULL, this.epilogueLabel);
+    @Override
+    public void visitCode() {
+        if (this.addReqCtxParam) {
+            suppressSorter(new Runnable() {
+                @Override
+                public void run() {
+                    AdviceMethodVisitor.this.annotateReqCtxParam(AdviceMethodVisitor.this.reqCtxParamIdx);
+                }
+            });
+        }
+
+        super.visitCode();
+        super.visitLabel(this.beginLabel);
+        if (shouldFetchReqContext()) {
+            super.visitMethodInsn(
+                    Opcodes.INVOKESTATIC,
+                    Type.getInternalName(AgentTracer.class),
+                    "activeSpan",
+                    "()" + Type.getDescriptor(AgentSpan.class),
+                    false);
+            super.visitInsn(Opcodes.DUP);
+            super.visitJumpInsn(Opcodes.IFNULL, this.popBeforeEpilogue);
+            super.visitMethodInsn(
+                    Opcodes.INVOKEINTERFACE,
+                    Type.getInternalName(AgentSpan.class),
+                    "getRequestContext",
+                    "()" + Type.getDescriptor(RequestContext.class),
+                    true);
+            super.visitInsn(Opcodes.DUP);
+            super.visitJumpInsn(Opcodes.IFNULL, this.popBeforeEpilogue);
+
+            super.visitInsn(Opcodes.DUP);
+            super.visitFieldInsn(
+                    Opcodes.GETSTATIC,
+                    Type.getInternalName(RequestContextSlot.class),
+                    this.slot.name(),
+                    Type.getDescriptor(RequestContextSlot.class));
+            super.visitMethodInsn(
+                    Opcodes.INVOKEINTERFACE,
+                    Type.getInternalName(RequestContext.class),
+                    "getData",
+                    "(" + Type.getDescriptor(RequestContextSlot.class) + ")Ljava/lang/Object;",
+                    true);
+            super.visitJumpInsn(Opcodes.IFNULL, this.popBeforeEpilogue);
+            suppressSorter(new Runnable() {
+                @Override
+                public void run() {
+                    AdviceMethodVisitor.super.visitVarInsn(Opcodes.ASTORE, AdviceMethodVisitor.this.reqCtxParamIdx);
+                }
+            });
+        } else {
+            suppressSorter(new Runnable() {
+                @Override
+                public void run() {
+                    AdviceMethodVisitor.super.visitVarInsn(Opcodes.ALOAD, AdviceMethodVisitor.this.reqCtxParamIdx);
+                }
+            });
+            super.visitJumpInsn(Opcodes.IFNULL, this.epilogueLabel);
+        }
     }
-  }
-
-  @Override
-  public void visitLocalVariable(
-      String name, String descriptor, String signature, Label start, Label end, int index) {
-    if (index < this.methodDescription.getParameters().size()) {
-      // is a slot for an original parameter
-      // save it so we can add it at the end and extend the instructions covered
-      // bytebuddy expects advice classes to have the parameter locals cover the full function
-      paramLocalVars.add(new ParameterLocalVariable(name, descriptor, signature, index));
-    } else {
-      super.visitLocalVariable(name, descriptor, signature, start, end, index);
+
+    @Override
+    public void visitLocalVariable(
+            String name, String descriptor, String signature, Label start, Label end, int index) {
+        if (index < this.methodDescription.getParameters().size()) {
+            // is a slot for an original parameter
+            // save it so we can add it at the end and extend the instructions covered
+            // bytebuddy expects advice classes to have the parameter locals cover the full function
+            paramLocalVars.add(new ParameterLocalVariable(name, descriptor, signature, index));
+        } else {
+            super.visitLocalVariable(name, descriptor, signature, start, end, index);
+        }
     }
-  }
-
-  @Override
-  public void visitEnd() {
-    if (shouldFetchReqContext()) {
-      super.visitLabel(this.popBeforeEpilogue);
-      suppressSorter(
-          new Runnable() {
+
+    @Override
+    public void visitEnd() {
+        if (shouldFetchReqContext()) {
+            super.visitLabel(this.popBeforeEpilogue);
+            suppressSorter(new Runnable() {
+                @Override
+                public void run() {
+                    buildParameterFrame(new Object[] {Type.getInternalName(Object.class)});
+                }
+            });
+            super.visitInsn(Opcodes.POP);
+        }
+
+        super.visitLabel(this.epilogueLabel);
+
+        TypeDescription.Generic returnType = methodDescription.getReturnType();
+        // add a frame with nothing in the stack and only the parameters as locals
+        suppressSorter(new Runnable() {
             @Override
             public void run() {
-              buildParameterFrame(new Object[] {Type.getInternalName(Object.class)});
+                buildParameterFrame(new Object[0]);
             }
-          });
-      super.visitInsn(Opcodes.POP);
-    }
-
-    super.visitLabel(this.epilogueLabel);
-
-    TypeDescription.Generic returnType = methodDescription.getReturnType();
-    // add a frame with nothing in the stack and only the parameters as locals
-    suppressSorter(
-        new Runnable() {
-          @Override
-          public void run() {
-            buildParameterFrame(new Object[0]);
-          }
         });
 
-    addDefaultReturn(returnType);
+        addDefaultReturn(returnType);
 
-    final Label endLabel = new Label();
-    super.visitLabel(endLabel);
+        final Label endLabel = new Label();
+        super.visitLabel(endLabel);
 
-    for (ParameterLocalVariable p : this.paramLocalVars) {
-      super.visitLocalVariable(
-          p.name, p.descriptor, p.signature, this.beginLabel, endLabel, p.index);
-    }
-    if (this.addReqCtxParam) {
-      suppressSorter(
-          new Runnable() {
-            @Override
-            public void run() {
-              AdviceMethodVisitor.super.visitLocalVariable(
-                  "reqCtx",
-                  Type.getType(RequestContext.class).getDescriptor(),
-                  null,
-                  AdviceMethodVisitor.this.beginLabel,
-                  endLabel,
-                  AdviceMethodVisitor.this.reqCtxParamIdx);
-            }
-          });
+        for (ParameterLocalVariable p : this.paramLocalVars) {
+            super.visitLocalVariable(p.name, p.descriptor, p.signature, this.beginLabel, endLabel, p.index);
+        }
+        if (this.addReqCtxParam) {
+            suppressSorter(new Runnable() {
+                @Override
+                public void run() {
+                    AdviceMethodVisitor.super.visitLocalVariable(
+                            "reqCtx",
+                            Type.getType(RequestContext.class).getDescriptor(),
+                            null,
+                            AdviceMethodVisitor.this.beginLabel,
+                            endLabel,
+                            AdviceMethodVisitor.this.reqCtxParamIdx);
+                }
+            });
+        }
+
+        super.visitEnd();
     }
 
-    super.visitEnd();
-  }
-
-  @Override
-  public void visitMaxs(int maxStack, int maxLocals) {
-    int usedStack = shouldFetchReqContext() ? 2 : 1;
-    super.visitMaxs(Math.max(usedStack, maxStack), maxLocals);
-  }
-
-  private void addDefaultReturn(TypeDescription.Generic returnType) {
-    if (returnType.represents(void.class)) {
-      super.visitInsn(Opcodes.RETURN);
-    } else if (returnType.represents(int.class)
-        || returnType.represents(boolean.class)
-        || returnType.represents(byte.class)
-        || returnType.represents(char.class)
-        || returnType.represents(short.class)) {
-      super.visitInsn(Opcodes.ICONST_0);
-      super.visitInsn(Opcodes.IRETURN);
-    } else if (returnType.represents(long.class)) {
-      super.visitInsn(Opcodes.LCONST_0);
-      super.visitInsn(Opcodes.LRETURN);
-    } else if (returnType.represents(float.class)) {
-      super.visitInsn(Opcodes.FCONST_0);
-      super.visitInsn(Opcodes.FRETURN);
-    } else if (returnType.represents(double.class)) {
-      super.visitInsn(Opcodes.DCONST_0);
-      super.visitInsn(Opcodes.DRETURN);
-    } else {
-      super.visitInsn(Opcodes.ACONST_NULL);
-      super.visitInsn(Opcodes.ARETURN);
+    @Override
+    public void visitMaxs(int maxStack, int maxLocals) {
+        int usedStack = shouldFetchReqContext() ? 2 : 1;
+        super.visitMaxs(Math.max(usedStack, maxStack), maxLocals);
     }
-  }
-
-  private boolean shouldFetchReqContext() {
-    // we need to fetch if we're in @OnMethodEnter, or we're in an @OnMethodExit
-    // in an advice class without an @OnMethodEnter.
-    return this.isEnter || this.adviceContent == AdviceContent.HAS_EXIT;
-  }
-
-  private void suppressSorter(Runnable r) {
-    MethodVisitor origMv = this.mv;
-    if (!(origMv instanceof LocalVariablesSorter)) {
-      r.run();
-      return;
+
+    private void addDefaultReturn(TypeDescription.Generic returnType) {
+        if (returnType.represents(void.class)) {
+            super.visitInsn(Opcodes.RETURN);
+        } else if (returnType.represents(int.class)
+                || returnType.represents(boolean.class)
+                || returnType.represents(byte.class)
+                || returnType.represents(char.class)
+                || returnType.represents(short.class)) {
+            super.visitInsn(Opcodes.ICONST_0);
+            super.visitInsn(Opcodes.IRETURN);
+        } else if (returnType.represents(long.class)) {
+            super.visitInsn(Opcodes.LCONST_0);
+            super.visitInsn(Opcodes.LRETURN);
+        } else if (returnType.represents(float.class)) {
+            super.visitInsn(Opcodes.FCONST_0);
+            super.visitInsn(Opcodes.FRETURN);
+        } else if (returnType.represents(double.class)) {
+            super.visitInsn(Opcodes.DCONST_0);
+            super.visitInsn(Opcodes.DRETURN);
+        } else {
+            super.visitInsn(Opcodes.ACONST_NULL);
+            super.visitInsn(Opcodes.ARETURN);
+        }
     }
 
-    this.mv = ((LocalVariablesSorter) origMv).getWrappedMv();
-    try {
-      r.run();
-    } finally {
-      this.mv = origMv;
+    private boolean shouldFetchReqContext() {
+        // we need to fetch if we're in @OnMethodEnter, or we're in an @OnMethodExit
+        // in an advice class without an @OnMethodEnter.
+        return this.isEnter || this.adviceContent == AdviceContent.HAS_EXIT;
     }
-  }
-
-  private void buildParameterFrame(Object[] stack) {
-    ParameterList<?> parameters = this.methodDescription.getParameters();
-    Object[] frame = new Object[parameters.size() + (this.addReqCtxParam ? 1 : 0)];
-    for (int index = 0; index < parameters.size(); index++) {
-      TypeDefinition typeDefinition = parameters.get(index).getType();
-      if (typeDefinition.represents(boolean.class)
-          || typeDefinition.represents(byte.class)
-          || typeDefinition.represents(short.class)
-          || typeDefinition.represents(char.class)
-          || typeDefinition.represents(int.class)) {
-        frame[index] = Opcodes.INTEGER;
-      } else if (typeDefinition.represents(long.class)) {
-        frame[index] = Opcodes.LONG;
-      } else if (typeDefinition.represents(float.class)) {
-        frame[index] = Opcodes.FLOAT;
-      } else if (typeDefinition.represents(double.class)) {
-        frame[index] = Opcodes.DOUBLE;
-      } else {
-        frame[index] = typeDefinition.asErasure().getInternalName();
-      }
+
+    private void suppressSorter(Runnable r) {
+        MethodVisitor origMv = this.mv;
+        if (!(origMv instanceof LocalVariablesSorter)) {
+            r.run();
+            return;
+        }
+
+        this.mv = ((LocalVariablesSorter) origMv).getWrappedMv();
+        try {
+            r.run();
+        } finally {
+            this.mv = origMv;
+        }
     }
-    if (this.addReqCtxParam) {
-      frame[parameters.size()] = RequestContext.class.getName().replace('.', '/');
+
+    private void buildParameterFrame(Object[] stack) {
+        ParameterList<?> parameters = this.methodDescription.getParameters();
+        Object[] frame = new Object[parameters.size() + (this.addReqCtxParam ? 1 : 0)];
+        for (int index = 0; index < parameters.size(); index++) {
+            TypeDefinition typeDefinition = parameters.get(index).getType();
+            if (typeDefinition.represents(boolean.class)
+                    || typeDefinition.represents(byte.class)
+                    || typeDefinition.represents(short.class)
+                    || typeDefinition.represents(char.class)
+                    || typeDefinition.represents(int.class)) {
+                frame[index] = Opcodes.INTEGER;
+            } else if (typeDefinition.represents(long.class)) {
+                frame[index] = Opcodes.LONG;
+            } else if (typeDefinition.represents(float.class)) {
+                frame[index] = Opcodes.FLOAT;
+            } else if (typeDefinition.represents(double.class)) {
+                frame[index] = Opcodes.DOUBLE;
+            } else {
+                frame[index] = typeDefinition.asErasure().getInternalName();
+            }
+        }
+        if (this.addReqCtxParam) {
+            frame[parameters.size()] = RequestContext.class.getName().replace('.', '/');
+        }
+        super.visitFrame(Opcodes.F_NEW, frame.length, frame, stack.length, stack);
     }
-    super.visitFrame(Opcodes.F_NEW, frame.length, frame, stack.length, stack);
-  }
 }
 
 class ParameterLocalVariable {
-  final String name;
-  final String descriptor;
-  final String signature;
-  final int index;
-
-  ParameterLocalVariable(String name, String descriptor, String signature, int index) {
-    this.name = name;
-    this.descriptor = descriptor;
-    this.signature = signature;
-    this.index = index;
-  }
+    final String name;
+    final String descriptor;
+    final String signature;
+    final int index;
+
+    ParameterLocalVariable(String name, String descriptor, String signature, int index) {
+        this.name = name;
+        this.descriptor = descriptor;
+        this.signature = signature;
+        this.index = index;
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/reqctx/InjectRequestContextVisitorWrapper.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/reqctx/InjectRequestContextVisitorWrapper.java
index 023361af89e..0f1e4180d0c 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/reqctx/InjectRequestContextVisitorWrapper.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/reqctx/InjectRequestContextVisitorWrapper.java
@@ -15,30 +15,29 @@
 import net.bytebuddy.pool.TypePool;
 
 public class InjectRequestContextVisitorWrapper implements AsmVisitorWrapper {
-  @Override
-  public int mergeWriter(int flags) {
-    return flags;
-  }
+    @Override
+    public int mergeWriter(int flags) {
+        return flags;
+    }
 
-  @Override
-  public int mergeReader(int flags) {
-    return flags | ClassReader.EXPAND_FRAMES;
-  }
+    @Override
+    public int mergeReader(int flags) {
+        return flags | ClassReader.EXPAND_FRAMES;
+    }
 
-  @Override
-  public ClassVisitor wrap(
-      TypeDescription instrumentedType,
-      ClassVisitor classVisitor,
-      Implementation.Context implementationContext,
-      TypePool typePool,
-      FieldList<FieldDescription.InDefinedShape> fields,
-      MethodList<?> methods,
-      int writerFlags,
-      int readerFlags) {
-    AnnotationList annotations = instrumentedType.getDeclaredAnnotations();
-    AnnotationDescription.Loadable<RequiresRequestContext> rrc =
-        annotations.ofType(RequiresRequestContext.class);
-    RequestContextSlot slot = rrc.load().value();
-    return InjectRequestContextVisitor.createVisitor(classVisitor, methods, slot);
-  }
+    @Override
+    public ClassVisitor wrap(
+            TypeDescription instrumentedType,
+            ClassVisitor classVisitor,
+            Implementation.Context implementationContext,
+            TypePool typePool,
+            FieldList<FieldDescription.InDefinedShape> fields,
+            MethodList<?> methods,
+            int writerFlags,
+            int readerFlags) {
+        AnnotationList annotations = instrumentedType.getDeclaredAnnotations();
+        AnnotationDescription.Loadable<RequiresRequestContext> rrc = annotations.ofType(RequiresRequestContext.class);
+        RequestContextSlot slot = rrc.load().value();
+        return InjectRequestContextVisitor.createVisitor(classVisitor, methods, slot);
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/reqctx/LocalVariablesSorter.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/reqctx/LocalVariablesSorter.java
index 7ddf0e0facc..9ca3a321bcb 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/reqctx/LocalVariablesSorter.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/reqctx/LocalVariablesSorter.java
@@ -50,307 +50,295 @@
 @SuppressFBWarnings("RC_REF_COMPARISON_BAD_PRACTICE")
 public class LocalVariablesSorter extends MethodVisitor {
 
-  private static final Type OBJECT_TYPE = Type.getObjectType("java/lang/Object");
-
-  /**
-   * Mapping from old to new local variable indexes. A local variable at index i of size 1 is
-   * remapped to 'mapping[2*i]', while a local variable at index i of size 2 is remapped to
-   * 'mapping[2*i+1]'.
-   */
-  private int[] mapping = new int[40];
-
-  /** Array used to store stack map local variable types after remapping. */
-  private Object[] newLocals = new Object[20];
-
-  /** Index of the first local variable, after formal parameters. */
-  protected final int firstLocal;
-
-  /** Index of the next local variable to be created by {@link #newLocal}. */
-  protected int nextLocal;
-
-  /**
-   * Creates a new {@link LocalVariablesSorter}. <i>Subclasses must not use this constructor</i>.
-   * Instead, they must use the {@link #LocalVariablesSorter(int, int, String, MethodVisitor)}
-   * version.
-   *
-   * @param access access flags of the adapted method.
-   * @param desc the method's descriptor (see {@link Type Type}).
-   * @param mv the method visitor to which this adapter delegates calls.
-   * @throws IllegalStateException If a subclass calls this constructor.
-   */
-  public LocalVariablesSorter(final int access, final String desc, final MethodVisitor mv) {
-    this(Opcodes.ASM6, access, desc, mv);
-    if (getClass() != LocalVariablesSorter.class) {
-      throw new IllegalStateException();
+    private static final Type OBJECT_TYPE = Type.getObjectType("java/lang/Object");
+
+    /**
+     * Mapping from old to new local variable indexes. A local variable at index i of size 1 is
+     * remapped to 'mapping[2*i]', while a local variable at index i of size 2 is remapped to
+     * 'mapping[2*i+1]'.
+     */
+    private int[] mapping = new int[40];
+
+    /** Array used to store stack map local variable types after remapping. */
+    private Object[] newLocals = new Object[20];
+
+    /** Index of the first local variable, after formal parameters. */
+    protected final int firstLocal;
+
+    /** Index of the next local variable to be created by {@link #newLocal}. */
+    protected int nextLocal;
+
+    /**
+     * Creates a new {@link LocalVariablesSorter}. <i>Subclasses must not use this constructor</i>.
+     * Instead, they must use the {@link #LocalVariablesSorter(int, int, String, MethodVisitor)}
+     * version.
+     *
+     * @param access access flags of the adapted method.
+     * @param desc the method's descriptor (see {@link Type Type}).
+     * @param mv the method visitor to which this adapter delegates calls.
+     * @throws IllegalStateException If a subclass calls this constructor.
+     */
+    public LocalVariablesSorter(final int access, final String desc, final MethodVisitor mv) {
+        this(Opcodes.ASM6, access, desc, mv);
+        if (getClass() != LocalVariablesSorter.class) {
+            throw new IllegalStateException();
+        }
     }
-  }
-
-  /**
-   * Creates a new {@link LocalVariablesSorter}.
-   *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5} or {@link Opcodes#ASM6}.
-   * @param access access flags of the adapted method.
-   * @param desc the method's descriptor (see {@link Type Type}).
-   * @param mv the method visitor to which this adapter delegates calls.
-   */
-  protected LocalVariablesSorter(
-      final int api, final int access, final String desc, final MethodVisitor mv) {
-    super(api, mv);
-    Type[] args = Type.getArgumentTypes(desc);
-    nextLocal = (Opcodes.ACC_STATIC & access) == 0 ? 1 : 0;
-    for (int i = 0; i < args.length; i++) {
-      nextLocal += args[i].getSize();
+
+    /**
+     * Creates a new {@link LocalVariablesSorter}.
+     *
+     * @param api the ASM API version implemented by this visitor. Must be one of {@link
+     *     Opcodes#ASM4}, {@link Opcodes#ASM5} or {@link Opcodes#ASM6}.
+     * @param access access flags of the adapted method.
+     * @param desc the method's descriptor (see {@link Type Type}).
+     * @param mv the method visitor to which this adapter delegates calls.
+     */
+    protected LocalVariablesSorter(final int api, final int access, final String desc, final MethodVisitor mv) {
+        super(api, mv);
+        Type[] args = Type.getArgumentTypes(desc);
+        nextLocal = (Opcodes.ACC_STATIC & access) == 0 ? 1 : 0;
+        for (int i = 0; i < args.length; i++) {
+            nextLocal += args[i].getSize();
+        }
+        firstLocal = nextLocal;
     }
-    firstLocal = nextLocal;
-  }
-
-  public MethodVisitor getWrappedMv() {
-    return this.mv;
-  }
-
-  @Override
-  public void visitVarInsn(final int opcode, final int var) {
-    Type type;
-    switch (opcode) {
-      case Opcodes.LLOAD:
-      case Opcodes.LSTORE:
-        type = Type.LONG_TYPE;
-        break;
-
-      case Opcodes.DLOAD:
-      case Opcodes.DSTORE:
-        type = Type.DOUBLE_TYPE;
-        break;
-
-      case Opcodes.FLOAD:
-      case Opcodes.FSTORE:
-        type = Type.FLOAT_TYPE;
-        break;
-
-      case Opcodes.ILOAD:
-      case Opcodes.ISTORE:
-        type = Type.INT_TYPE;
-        break;
-
-      default:
-        // case Opcodes.ALOAD:
-        // case Opcodes.ASTORE:
-        // case RET:
-        type = OBJECT_TYPE;
-        break;
+
+    public MethodVisitor getWrappedMv() {
+        return this.mv;
     }
-    mv.visitVarInsn(opcode, remap(var, type));
-  }
-
-  @Override
-  public void visitIincInsn(final int var, final int increment) {
-    mv.visitIincInsn(remap(var, Type.INT_TYPE), increment);
-  }
-
-  @Override
-  public void visitMaxs(final int maxStack, final int maxLocals) {
-    mv.visitMaxs(maxStack, nextLocal);
-  }
-
-  @Override
-  public void visitLocalVariable(
-      final String name,
-      final String desc,
-      final String signature,
-      final Label start,
-      final Label end,
-      final int index) {
-    int newIndex = remap(index, Type.getType(desc));
-    mv.visitLocalVariable(name, desc, signature, start, end, newIndex);
-  }
-
-  @Override
-  public AnnotationVisitor visitLocalVariableAnnotation(
-      int typeRef,
-      TypePath typePath,
-      Label[] start,
-      Label[] end,
-      int[] index,
-      String desc,
-      boolean visible) {
-    Type t = Type.getType(desc);
-    int[] newIndex = new int[index.length];
-    for (int i = 0; i < newIndex.length; ++i) {
-      newIndex[i] = remap(index[i], t);
+
+    @Override
+    public void visitVarInsn(final int opcode, final int var) {
+        Type type;
+        switch (opcode) {
+            case Opcodes.LLOAD:
+            case Opcodes.LSTORE:
+                type = Type.LONG_TYPE;
+                break;
+
+            case Opcodes.DLOAD:
+            case Opcodes.DSTORE:
+                type = Type.DOUBLE_TYPE;
+                break;
+
+            case Opcodes.FLOAD:
+            case Opcodes.FSTORE:
+                type = Type.FLOAT_TYPE;
+                break;
+
+            case Opcodes.ILOAD:
+            case Opcodes.ISTORE:
+                type = Type.INT_TYPE;
+                break;
+
+            default:
+                // case Opcodes.ALOAD:
+                // case Opcodes.ASTORE:
+                // case RET:
+                type = OBJECT_TYPE;
+                break;
+        }
+        mv.visitVarInsn(opcode, remap(var, type));
     }
-    return mv.visitLocalVariableAnnotation(typeRef, typePath, start, end, newIndex, desc, visible);
-  }
-
-  @Override
-  public void visitFrame(
-      final int type,
-      final int nLocal,
-      final Object[] local,
-      final int nStack,
-      final Object[] stack) {
-    if (type != Opcodes.F_NEW) { // uncompressed frame
-      throw new IllegalStateException(
-          "ClassReader.accept() should be called with EXPAND_FRAMES flag");
+
+    @Override
+    public void visitIincInsn(final int var, final int increment) {
+        mv.visitIincInsn(remap(var, Type.INT_TYPE), increment);
     }
 
-    // creates a copy of newLocals
-    Object[] oldLocals = new Object[newLocals.length];
-    System.arraycopy(newLocals, 0, oldLocals, 0, oldLocals.length);
-
-    updateNewLocals(newLocals);
-
-    // copies types from 'local' to 'newLocals'
-    // 'newLocals' already contains the variables added with 'newLocal'
-
-    int index = 0; // old local variable index
-    int number = 0; // old local variable number
-    for (; number < nLocal; ++number) {
-      Object t = local[number];
-      int size = t == Opcodes.LONG || t == Opcodes.DOUBLE ? 2 : 1;
-      if (t != Opcodes.TOP) {
-        Type typ = OBJECT_TYPE;
-        if (t == Opcodes.INTEGER) {
-          typ = Type.INT_TYPE;
-        } else if (t == Opcodes.FLOAT) {
-          typ = Type.FLOAT_TYPE;
-        } else if (t == Opcodes.LONG) {
-          typ = Type.LONG_TYPE;
-        } else if (t == Opcodes.DOUBLE) {
-          typ = Type.DOUBLE_TYPE;
-        } else if (t instanceof String) {
-          typ = Type.getObjectType((String) t);
-        }
-        setFrameLocal(remap(index, typ), t);
-      }
-      index += size;
+    @Override
+    public void visitMaxs(final int maxStack, final int maxLocals) {
+        mv.visitMaxs(maxStack, nextLocal);
+    }
+
+    @Override
+    public void visitLocalVariable(
+            final String name,
+            final String desc,
+            final String signature,
+            final Label start,
+            final Label end,
+            final int index) {
+        int newIndex = remap(index, Type.getType(desc));
+        mv.visitLocalVariable(name, desc, signature, start, end, newIndex);
     }
 
-    // removes TOP after long and double types as well as trailing TOPs
-
-    index = 0;
-    number = 0;
-    for (int i = 0; index < newLocals.length; ++i) {
-      Object t = newLocals[index++];
-      if (t != null && t != Opcodes.TOP) {
-        newLocals[i] = t;
-        number = i + 1;
-        if (t == Opcodes.LONG || t == Opcodes.DOUBLE) {
-          index += 1;
+    @Override
+    public AnnotationVisitor visitLocalVariableAnnotation(
+            int typeRef, TypePath typePath, Label[] start, Label[] end, int[] index, String desc, boolean visible) {
+        Type t = Type.getType(desc);
+        int[] newIndex = new int[index.length];
+        for (int i = 0; i < newIndex.length; ++i) {
+            newIndex[i] = remap(index[i], t);
         }
-      } else {
-        newLocals[i] = Opcodes.TOP;
-      }
+        return mv.visitLocalVariableAnnotation(typeRef, typePath, start, end, newIndex, desc, visible);
     }
 
-    // visits remapped frame
-    mv.visitFrame(type, number, newLocals, nStack, stack);
-
-    // restores original value of 'newLocals'
-    newLocals = oldLocals;
-  }
-
-  // -------------
-
-  /**
-   * Creates a new local variable of the given type.
-   *
-   * @param type the type of the local variable to be created.
-   * @return the identifier of the newly created local variable.
-   */
-  public int newLocal(final Type type) {
-    Object t;
-    switch (type.getSort()) {
-      case Type.BOOLEAN:
-      case Type.CHAR:
-      case Type.BYTE:
-      case Type.SHORT:
-      case Type.INT:
-        t = Opcodes.INTEGER;
-        break;
-      case Type.FLOAT:
-        t = Opcodes.FLOAT;
-        break;
-      case Type.LONG:
-        t = Opcodes.LONG;
-        break;
-      case Type.DOUBLE:
-        t = Opcodes.DOUBLE;
-        break;
-      case Type.ARRAY:
-        t = type.getDescriptor();
-        break;
-      // case Type.OBJECT:
-      default:
-        t = type.getInternalName();
-        break;
+    @Override
+    public void visitFrame(
+            final int type, final int nLocal, final Object[] local, final int nStack, final Object[] stack) {
+        if (type != Opcodes.F_NEW) { // uncompressed frame
+            throw new IllegalStateException("ClassReader.accept() should be called with EXPAND_FRAMES flag");
+        }
+
+        // creates a copy of newLocals
+        Object[] oldLocals = new Object[newLocals.length];
+        System.arraycopy(newLocals, 0, oldLocals, 0, oldLocals.length);
+
+        updateNewLocals(newLocals);
+
+        // copies types from 'local' to 'newLocals'
+        // 'newLocals' already contains the variables added with 'newLocal'
+
+        int index = 0; // old local variable index
+        int number = 0; // old local variable number
+        for (; number < nLocal; ++number) {
+            Object t = local[number];
+            int size = t == Opcodes.LONG || t == Opcodes.DOUBLE ? 2 : 1;
+            if (t != Opcodes.TOP) {
+                Type typ = OBJECT_TYPE;
+                if (t == Opcodes.INTEGER) {
+                    typ = Type.INT_TYPE;
+                } else if (t == Opcodes.FLOAT) {
+                    typ = Type.FLOAT_TYPE;
+                } else if (t == Opcodes.LONG) {
+                    typ = Type.LONG_TYPE;
+                } else if (t == Opcodes.DOUBLE) {
+                    typ = Type.DOUBLE_TYPE;
+                } else if (t instanceof String) {
+                    typ = Type.getObjectType((String) t);
+                }
+                setFrameLocal(remap(index, typ), t);
+            }
+            index += size;
+        }
+
+        // removes TOP after long and double types as well as trailing TOPs
+
+        index = 0;
+        number = 0;
+        for (int i = 0; index < newLocals.length; ++i) {
+            Object t = newLocals[index++];
+            if (t != null && t != Opcodes.TOP) {
+                newLocals[i] = t;
+                number = i + 1;
+                if (t == Opcodes.LONG || t == Opcodes.DOUBLE) {
+                    index += 1;
+                }
+            } else {
+                newLocals[i] = Opcodes.TOP;
+            }
+        }
+
+        // visits remapped frame
+        mv.visitFrame(type, number, newLocals, nStack, stack);
+
+        // restores original value of 'newLocals'
+        newLocals = oldLocals;
     }
-    int local = newLocalMapping(type);
-    setLocalType(local, type);
-    setFrameLocal(local, t);
-    return local;
-  }
-
-  /**
-   * Notifies subclasses that a new stack map frame is being visited. The array argument contains
-   * the stack map frame types corresponding to the local variables added with {@link #newLocal}.
-   * This method can update these types in place for the stack map frame being visited. The default
-   * implementation of this method does nothing, i.e. a local variable added with {@link #newLocal}
-   * will have the same type in all stack map frames. But this behavior is not always the desired
-   * one, for instance if a local variable is added in the middle of a try/catch block: the frame
-   * for the exception handler should have a TOP type for this new local.
-   *
-   * @param newLocals the stack map frame types corresponding to the local variables added with
-   *     {@link #newLocal} (and null for the others). The format of this array is the same as in
-   *     {@link MethodVisitor#visitFrame}, except that long and double types use two slots. The
-   *     types for the current stack map frame must be updated in place in this array.
-   */
-  protected void updateNewLocals(Object[] newLocals) {}
-
-  /**
-   * Notifies subclasses that a local variable has been added or remapped. The default
-   * implementation of this method does nothing.
-   *
-   * @param local a local variable identifier, as returned by {@link #newLocal newLocal()}.
-   * @param type the type of the value being stored in the local variable.
-   */
-  protected void setLocalType(final int local, final Type type) {}
-
-  private void setFrameLocal(final int local, final Object type) {
-    int l = newLocals.length;
-    if (local >= l) {
-      Object[] a = new Object[Math.max(2 * l, local + 1)];
-      System.arraycopy(newLocals, 0, a, 0, l);
-      newLocals = a;
+
+    // -------------
+
+    /**
+     * Creates a new local variable of the given type.
+     *
+     * @param type the type of the local variable to be created.
+     * @return the identifier of the newly created local variable.
+     */
+    public int newLocal(final Type type) {
+        Object t;
+        switch (type.getSort()) {
+            case Type.BOOLEAN:
+            case Type.CHAR:
+            case Type.BYTE:
+            case Type.SHORT:
+            case Type.INT:
+                t = Opcodes.INTEGER;
+                break;
+            case Type.FLOAT:
+                t = Opcodes.FLOAT;
+                break;
+            case Type.LONG:
+                t = Opcodes.LONG;
+                break;
+            case Type.DOUBLE:
+                t = Opcodes.DOUBLE;
+                break;
+            case Type.ARRAY:
+                t = type.getDescriptor();
+                break;
+            // case Type.OBJECT:
+            default:
+                t = type.getInternalName();
+                break;
+        }
+        int local = newLocalMapping(type);
+        setLocalType(local, type);
+        setFrameLocal(local, t);
+        return local;
     }
-    newLocals[local] = type;
-  }
 
-  private int remap(final int var, final Type type) {
-    if (var + type.getSize() <= firstLocal) {
-      return var;
+    /**
+     * Notifies subclasses that a new stack map frame is being visited. The array argument contains
+     * the stack map frame types corresponding to the local variables added with {@link #newLocal}.
+     * This method can update these types in place for the stack map frame being visited. The default
+     * implementation of this method does nothing, i.e. a local variable added with {@link #newLocal}
+     * will have the same type in all stack map frames. But this behavior is not always the desired
+     * one, for instance if a local variable is added in the middle of a try/catch block: the frame
+     * for the exception handler should have a TOP type for this new local.
+     *
+     * @param newLocals the stack map frame types corresponding to the local variables added with
+     *     {@link #newLocal} (and null for the others). The format of this array is the same as in
+     *     {@link MethodVisitor#visitFrame}, except that long and double types use two slots. The
+     *     types for the current stack map frame must be updated in place in this array.
+     */
+    protected void updateNewLocals(Object[] newLocals) {}
+
+    /**
+     * Notifies subclasses that a local variable has been added or remapped. The default
+     * implementation of this method does nothing.
+     *
+     * @param local a local variable identifier, as returned by {@link #newLocal newLocal()}.
+     * @param type the type of the value being stored in the local variable.
+     */
+    protected void setLocalType(final int local, final Type type) {}
+
+    private void setFrameLocal(final int local, final Object type) {
+        int l = newLocals.length;
+        if (local >= l) {
+            Object[] a = new Object[Math.max(2 * l, local + 1)];
+            System.arraycopy(newLocals, 0, a, 0, l);
+            newLocals = a;
+        }
+        newLocals[local] = type;
     }
-    int key = 2 * var + type.getSize() - 1;
-    int size = mapping.length;
-    if (key >= size) {
-      int[] newMapping = new int[Math.max(2 * size, key + 1)];
-      System.arraycopy(mapping, 0, newMapping, 0, size);
-      mapping = newMapping;
+
+    private int remap(final int var, final Type type) {
+        if (var + type.getSize() <= firstLocal) {
+            return var;
+        }
+        int key = 2 * var + type.getSize() - 1;
+        int size = mapping.length;
+        if (key >= size) {
+            int[] newMapping = new int[Math.max(2 * size, key + 1)];
+            System.arraycopy(mapping, 0, newMapping, 0, size);
+            mapping = newMapping;
+        }
+        int value = mapping[key];
+        if (value == 0) {
+            value = newLocalMapping(type);
+            setLocalType(value, type);
+            mapping[key] = value + 1;
+        } else {
+            value--;
+        }
+        return value;
     }
-    int value = mapping[key];
-    if (value == 0) {
-      value = newLocalMapping(type);
-      setLocalType(value, type);
-      mapping[key] = value + 1;
-    } else {
-      value--;
+
+    protected int newLocalMapping(final Type type) {
+        int local = nextLocal;
+        nextLocal += type.getSize();
+        return local;
     }
-    return value;
-  }
-
-  protected int newLocalMapping(final Type type) {
-    int local = nextLocal;
-    nextLocal += type.getSize();
-    return local;
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/reqctx/RewriteRequestContextAdvicePlugin.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/reqctx/RewriteRequestContextAdvicePlugin.java
index 4c86b5db07f..0d599f3bea6 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/reqctx/RewriteRequestContextAdvicePlugin.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/reqctx/RewriteRequestContextAdvicePlugin.java
@@ -16,18 +16,18 @@
  * @see datadog.gradle.plugin.instrument.BuildTimeInstrumentationPlugin
  */
 public class RewriteRequestContextAdvicePlugin extends Plugin.ForElementMatcher {
-  public RewriteRequestContextAdvicePlugin(File targetDir) {
-    super(ElementMatchers.isAnnotatedWith(RequiresRequestContext.class));
-  }
+    public RewriteRequestContextAdvicePlugin(File targetDir) {
+        super(ElementMatchers.isAnnotatedWith(RequiresRequestContext.class));
+    }
 
-  @Override
-  public DynamicType.Builder<?> apply(
-      final DynamicType.Builder<?> builder,
-      final TypeDescription typeDescription,
-      final ClassFileLocator classFileLocator) {
-    return builder.visit(new InjectRequestContextVisitorWrapper());
-  }
+    @Override
+    public DynamicType.Builder<?> apply(
+            final DynamicType.Builder<?> builder,
+            final TypeDescription typeDescription,
+            final ClassFileLocator classFileLocator) {
+        return builder.visit(new InjectRequestContextVisitorWrapper());
+    }
 
-  @Override
-  public void close() throws IOException {}
+    @Override
+    public void close() throws IOException {}
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextInjector.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextInjector.java
index 9f3b0a51dce..007633645ff 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextInjector.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextInjector.java
@@ -34,498 +34,476 @@
 /** Injects fields and accessors so the class can act as a surrogate {@link ContextStore}. */
 public final class FieldBackedContextInjector implements AsmVisitorWrapper {
 
-  private static final Logger log = LoggerFactory.getLogger(FieldBackedContextInjector.class);
+    private static final Logger log = LoggerFactory.getLogger(FieldBackedContextInjector.class);
 
-  static final String FIELD_BACKED_CONTEXT_ACCESSOR_CLASS =
-      getInternalName(FieldBackedContextAccessor.class.getName());
-
-  static final String CONTEXT_STORE_ACCESS_PREFIX = "__datadogContext$";
-
-  static final String GETTER_METHOD = "$get$" + CONTEXT_STORE_ACCESS_PREFIX;
-  static final String GETTER_METHOD_DESCRIPTOR =
-      Type.getMethodDescriptor(Type.getType(Object.class), Type.INT_TYPE);
-
-  static final String PUTTER_METHOD = "$put$" + CONTEXT_STORE_ACCESS_PREFIX;
-  static final String PUTTER_METHOD_DESCRIPTOR =
-      Type.getMethodDescriptor(Type.VOID_TYPE, Type.INT_TYPE, Type.getType(Object.class));
-
-  static final String WEAK_REDIRECT_CLASS =
-      getInternalName(
-          (InstrumenterConfig.get().isRuntimeContextMapPerStore()
-                  ? WeakMapPerStore.class
-                  : GlobalObjectStore.class)
-              .getName());
-
-  static final String WEAK_GET_METHOD_DESCRIPTOR =
-      Type.getMethodDescriptor(
-          Type.getType(Object.class), Type.getType(Object.class), Type.INT_TYPE);
-
-  static final String WEAK_PUT_METHOD_DESCRIPTOR =
-      Type.getMethodDescriptor(
-          Type.VOID_TYPE, Type.getType(Object.class), Type.INT_TYPE, Type.getType(Object.class));
-
-  static final String IS_ASSIGNABLE_FROM_METHOD = "isAssignableFrom";
-  static final String IS_ASSIGNABLE_FROM_METHOD_DESCRIPTOR =
-      Type.getMethodDescriptor(Type.BOOLEAN_TYPE, Type.getType(Class.class));
-
-  static final String OBJECT_DESCRIPTOR = Type.getDescriptor(Object.class);
-
-  public static final Type EXPECTED_SUPER_STORE_TYPE =
-      Type.getType(FieldBackedContextAccessor.class);
-
-  /** Keeps track of injection requests for the class being transformed by the current thread. */
-  static final ThreadLocal<Pair<String, BitSet>> INJECTED_STORE_IDS = new ThreadLocal<>();
-
-  final boolean serialVersionUIDFieldInjection =
-      InstrumenterConfig.get().isSerialVersionUIDFieldInjection();
-
-  final boolean isMemoizingEnabled = InstrumenterConfig.get().isResolverMemoizingEnabled();
-
-  final String keyClassName;
-  final String contextClassName;
-
-  public FieldBackedContextInjector(final String keyClassName, final String contextClassName) {
-    this.keyClassName = keyClassName;
-    this.contextClassName = contextClassName;
-  }
-
-  @Override
-  public int mergeWriter(final int flags) {
-    return flags | ClassWriter.COMPUTE_MAXS;
-  }
-
-  @Override
-  public int mergeReader(final int flags) {
-    return flags;
-  }
-
-  @Override
-  public ClassVisitor wrap(
-      final TypeDescription instrumentedType,
-      final ClassVisitor classVisitor,
-      final Implementation.Context implementationContext,
-      final TypePool typePool,
-      final FieldList<FieldDescription.InDefinedShape> fields,
-      final MethodList<?> methods,
-      final int writerFlags,
-      final int readerFlags) {
-    return new ClassVisitor(Opcodes.ASM9, classVisitor) {
-
-      private final boolean frames =
-          implementationContext.getClassFileVersion().isAtLeast(ClassFileVersion.JAVA_V6);
-
-      private String storeFieldName;
-
-      private boolean foundField;
-      private boolean foundGetter;
-      private boolean foundPutter;
-
-      private SerialVersionUIDInjector serialVersionUIDInjector;
-
-      @Override
-      public void visit(
-          final int version,
-          final int access,
-          final String name,
-          String signature,
-          final String superName,
-          String[] interfaces) {
-
-        // keep track of all injection requests for the class currently being transformed
-        // because we need to switch between them in the generated getter/putter methods
-        int storeId = injectContextStore(name, keyClassName, contextClassName);
-        storeFieldName = CONTEXT_STORE_ACCESS_PREFIX + storeId;
+    static final String FIELD_BACKED_CONTEXT_ACCESSOR_CLASS =
+            getInternalName(FieldBackedContextAccessor.class.getName());
 
-        if (interfaces == null) {
-          interfaces = new String[] {};
-        }
+    static final String CONTEXT_STORE_ACCESS_PREFIX = "__datadogContext$";
 
-        if (!Arrays.asList(interfaces).contains(FIELD_BACKED_CONTEXT_ACCESSOR_CLASS)) {
-          if (serialVersionUIDFieldInjection
-              && instrumentedType.isAssignableTo(Serializable.class)) {
-            serialVersionUIDInjector = new SerialVersionUIDInjector();
-            serialVersionUIDInjector.visit(version, access, name, signature, superName, interfaces);
-          }
+    static final String GETTER_METHOD = "$get$" + CONTEXT_STORE_ACCESS_PREFIX;
+    static final String GETTER_METHOD_DESCRIPTOR = Type.getMethodDescriptor(Type.getType(Object.class), Type.INT_TYPE);
 
-          if (signature != null) {
-            signature += 'L' + FIELD_BACKED_CONTEXT_ACCESSOR_CLASS + ';';
-          }
+    static final String PUTTER_METHOD = "$put$" + CONTEXT_STORE_ACCESS_PREFIX;
+    static final String PUTTER_METHOD_DESCRIPTOR =
+            Type.getMethodDescriptor(Type.VOID_TYPE, Type.INT_TYPE, Type.getType(Object.class));
 
-          interfaces = Arrays.copyOf(interfaces, interfaces.length + 1);
-          interfaces[interfaces.length - 1] = FIELD_BACKED_CONTEXT_ACCESSOR_CLASS;
-        }
+    static final String WEAK_REDIRECT_CLASS = getInternalName(
+            (InstrumenterConfig.get().isRuntimeContextMapPerStore() ? WeakMapPerStore.class : GlobalObjectStore.class)
+                    .getName());
 
-        super.visit(version, access, name, signature, superName, interfaces);
-      }
-
-      @Override
-      public FieldVisitor visitField(
-          final int access,
-          final String name,
-          final String descriptor,
-          final String signature,
-          final Object value) {
-        if (name.startsWith(CONTEXT_STORE_ACCESS_PREFIX)) {
-          if (storeFieldName.equals(name)) {
-            foundField = true;
-          }
-        } else if (serialVersionUIDInjector != null) {
-          serialVersionUIDInjector.visitField(access, name, descriptor, signature, value);
-        }
-        return super.visitField(access, name, descriptor, signature, value);
-      }
-
-      @Override
-      public MethodVisitor visitMethod(
-          final int access,
-          final String name,
-          final String descriptor,
-          final String signature,
-          final String[] exceptions) {
-        if (name.equals(GETTER_METHOD)) {
-          foundGetter = true;
-        } else if (name.equals(PUTTER_METHOD)) {
-          foundPutter = true;
-        } else if (serialVersionUIDInjector != null) {
-          serialVersionUIDInjector.visitMethod(access, name, descriptor, signature, exceptions);
-        }
-        return super.visitMethod(access, name, descriptor, signature, exceptions);
-      }
-
-      @Override
-      public void visitInnerClass(
-          final String name, final String outerName, final String innerName, final int access) {
-        if (serialVersionUIDInjector != null) {
-          serialVersionUIDInjector.visitInnerClass(name, outerName, innerName, access);
-        }
-        super.visitInnerClass(name, outerName, innerName, access);
-      }
+    static final String WEAK_GET_METHOD_DESCRIPTOR =
+            Type.getMethodDescriptor(Type.getType(Object.class), Type.getType(Object.class), Type.INT_TYPE);
 
-      @Override
-      public void visitEnd() {
-        if (!foundField) {
-          addStoreField();
-        }
-        // first injector to reach here is responsible for adding the generated getter and setter
-        // for the class - at this point all the other injectors will have recorded their requests
-        final BitSet injectedStoreIds = getInjectedContextStores();
-        if (null != injectedStoreIds) {
-          if (!foundGetter || !foundPutter) {
-            BitSet weakStoreIds = new BitSet();
-
-            // check hierarchy to see if we might need to delegate to the superclass
-            boolean hasSuperStores;
-            if (isMemoizingEnabled) {
-              hasSuperStores = MemoizedMatchers.hasSuperStores(instrumentedType, weakStoreIds);
-            } else {
-              hasSuperStores =
-                  ShouldInjectFieldsState.hasInjectedField(
-                      instrumentedType.getSuperClass(), weakStoreIds);
+    static final String WEAK_PUT_METHOD_DESCRIPTOR = Type.getMethodDescriptor(
+            Type.VOID_TYPE, Type.getType(Object.class), Type.INT_TYPE, Type.getType(Object.class));
+
+    static final String IS_ASSIGNABLE_FROM_METHOD = "isAssignableFrom";
+    static final String IS_ASSIGNABLE_FROM_METHOD_DESCRIPTOR =
+            Type.getMethodDescriptor(Type.BOOLEAN_TYPE, Type.getType(Class.class));
+
+    static final String OBJECT_DESCRIPTOR = Type.getDescriptor(Object.class);
+
+    public static final Type EXPECTED_SUPER_STORE_TYPE = Type.getType(FieldBackedContextAccessor.class);
+
+    /** Keeps track of injection requests for the class being transformed by the current thread. */
+    static final ThreadLocal<Pair<String, BitSet>> INJECTED_STORE_IDS = new ThreadLocal<>();
+
+    final boolean serialVersionUIDFieldInjection = InstrumenterConfig.get().isSerialVersionUIDFieldInjection();
+
+    final boolean isMemoizingEnabled = InstrumenterConfig.get().isResolverMemoizingEnabled();
+
+    final String keyClassName;
+    final String contextClassName;
+
+    public FieldBackedContextInjector(final String keyClassName, final String contextClassName) {
+        this.keyClassName = keyClassName;
+        this.contextClassName = contextClassName;
+    }
+
+    @Override
+    public int mergeWriter(final int flags) {
+        return flags | ClassWriter.COMPUTE_MAXS;
+    }
+
+    @Override
+    public int mergeReader(final int flags) {
+        return flags;
+    }
+
+    @Override
+    public ClassVisitor wrap(
+            final TypeDescription instrumentedType,
+            final ClassVisitor classVisitor,
+            final Implementation.Context implementationContext,
+            final TypePool typePool,
+            final FieldList<FieldDescription.InDefinedShape> fields,
+            final MethodList<?> methods,
+            final int writerFlags,
+            final int readerFlags) {
+        return new ClassVisitor(Opcodes.ASM9, classVisitor) {
+
+            private final boolean frames =
+                    implementationContext.getClassFileVersion().isAtLeast(ClassFileVersion.JAVA_V6);
+
+            private String storeFieldName;
+
+            private boolean foundField;
+            private boolean foundGetter;
+            private boolean foundPutter;
+
+            private SerialVersionUIDInjector serialVersionUIDInjector;
+
+            @Override
+            public void visit(
+                    final int version,
+                    final int access,
+                    final String name,
+                    String signature,
+                    final String superName,
+                    String[] interfaces) {
+
+                // keep track of all injection requests for the class currently being transformed
+                // because we need to switch between them in the generated getter/putter methods
+                int storeId = injectContextStore(name, keyClassName, contextClassName);
+                storeFieldName = CONTEXT_STORE_ACCESS_PREFIX + storeId;
+
+                if (interfaces == null) {
+                    interfaces = new String[] {};
+                }
+
+                if (!Arrays.asList(interfaces).contains(FIELD_BACKED_CONTEXT_ACCESSOR_CLASS)) {
+                    if (serialVersionUIDFieldInjection && instrumentedType.isAssignableTo(Serializable.class)) {
+                        serialVersionUIDInjector = new SerialVersionUIDInjector();
+                        serialVersionUIDInjector.visit(version, access, name, signature, superName, interfaces);
+                    }
+
+                    if (signature != null) {
+                        signature += 'L' + FIELD_BACKED_CONTEXT_ACCESSOR_CLASS + ';';
+                    }
+
+                    interfaces = Arrays.copyOf(interfaces, interfaces.length + 1);
+                    interfaces[interfaces.length - 1] = FIELD_BACKED_CONTEXT_ACCESSOR_CLASS;
+                }
+
+                super.visit(version, access, name, signature, superName, interfaces);
             }
 
-            if (!foundGetter) {
-              addStoreGetter(injectedStoreIds, hasSuperStores, weakStoreIds);
+            @Override
+            public FieldVisitor visitField(
+                    final int access,
+                    final String name,
+                    final String descriptor,
+                    final String signature,
+                    final Object value) {
+                if (name.startsWith(CONTEXT_STORE_ACCESS_PREFIX)) {
+                    if (storeFieldName.equals(name)) {
+                        foundField = true;
+                    }
+                } else if (serialVersionUIDInjector != null) {
+                    serialVersionUIDInjector.visitField(access, name, descriptor, signature, value);
+                }
+                return super.visitField(access, name, descriptor, signature, value);
             }
-            if (!foundPutter) {
-              addStorePutter(injectedStoreIds, hasSuperStores, weakStoreIds);
+
+            @Override
+            public MethodVisitor visitMethod(
+                    final int access,
+                    final String name,
+                    final String descriptor,
+                    final String signature,
+                    final String[] exceptions) {
+                if (name.equals(GETTER_METHOD)) {
+                    foundGetter = true;
+                } else if (name.equals(PUTTER_METHOD)) {
+                    foundPutter = true;
+                } else if (serialVersionUIDInjector != null) {
+                    serialVersionUIDInjector.visitMethod(access, name, descriptor, signature, exceptions);
+                }
+                return super.visitMethod(access, name, descriptor, signature, exceptions);
             }
-          }
-        }
 
-        if (serialVersionUIDInjector != null) {
-          serialVersionUIDInjector.injectSerialVersionUID(instrumentedType, cv);
-          serialVersionUIDInjector = null;
-        }
+            @Override
+            public void visitInnerClass(
+                    final String name, final String outerName, final String innerName, final int access) {
+                if (serialVersionUIDInjector != null) {
+                    serialVersionUIDInjector.visitInnerClass(name, outerName, innerName, access);
+                }
+                super.visitInnerClass(name, outerName, innerName, access);
+            }
 
-        storeFieldName = null;
+            @Override
+            public void visitEnd() {
+                if (!foundField) {
+                    addStoreField();
+                }
+                // first injector to reach here is responsible for adding the generated getter and setter
+                // for the class - at this point all the other injectors will have recorded their requests
+                final BitSet injectedStoreIds = getInjectedContextStores();
+                if (null != injectedStoreIds) {
+                    if (!foundGetter || !foundPutter) {
+                        BitSet weakStoreIds = new BitSet();
+
+                        // check hierarchy to see if we might need to delegate to the superclass
+                        boolean hasSuperStores;
+                        if (isMemoizingEnabled) {
+                            hasSuperStores = MemoizedMatchers.hasSuperStores(instrumentedType, weakStoreIds);
+                        } else {
+                            hasSuperStores = ShouldInjectFieldsState.hasInjectedField(
+                                    instrumentedType.getSuperClass(), weakStoreIds);
+                        }
+
+                        if (!foundGetter) {
+                            addStoreGetter(injectedStoreIds, hasSuperStores, weakStoreIds);
+                        }
+                        if (!foundPutter) {
+                            addStorePutter(injectedStoreIds, hasSuperStores, weakStoreIds);
+                        }
+                    }
+                }
+
+                if (serialVersionUIDInjector != null) {
+                    serialVersionUIDInjector.injectSerialVersionUID(instrumentedType, cv);
+                    serialVersionUIDInjector = null;
+                }
+
+                storeFieldName = null;
+
+                foundField = false;
+                foundGetter = false;
+                foundPutter = false;
+
+                super.visitEnd();
+            }
 
-        foundField = false;
-        foundGetter = false;
-        foundPutter = false;
+            private void addStoreField() {
+                cv.visitField(
+                        Opcodes.ACC_PRIVATE | Opcodes.ACC_TRANSIENT, storeFieldName, OBJECT_DESCRIPTOR, null, null);
+            }
 
-        super.visitEnd();
-      }
+            private void addStoreGetter(
+                    final BitSet injectedStoreIds, final boolean hasSuperStores, final BitSet weakStoreIds) {
+                final MethodVisitor mv =
+                        cv.visitMethod(Opcodes.ACC_PUBLIC, GETTER_METHOD, GETTER_METHOD_DESCRIPTOR, null, null);
 
-      private void addStoreField() {
-        cv.visitField(
-            Opcodes.ACC_PRIVATE | Opcodes.ACC_TRANSIENT,
-            storeFieldName,
-            OBJECT_DESCRIPTOR,
-            null,
-            null);
-      }
+                mv.visitCode();
 
-      private void addStoreGetter(
-          final BitSet injectedStoreIds, final boolean hasSuperStores, final BitSet weakStoreIds) {
-        final MethodVisitor mv =
-            cv.visitMethod(Opcodes.ACC_PUBLIC, GETTER_METHOD, GETTER_METHOD_DESCRIPTOR, null, null);
+                String instrumentedName = instrumentedType.getInternalName();
+                boolean hasMoreStores = hasSuperStores || !weakStoreIds.isEmpty();
 
-        mv.visitCode();
+                // if...else... blocks for stores injected into this class
+                int injectedStoreId = injectedStoreIds.nextSetBit(0);
+                while (injectedStoreId >= 0) {
+                    int nextStoreId = injectedStoreIds.nextSetBit(injectedStoreId + 1);
 
-        String instrumentedName = instrumentedType.getInternalName();
-        boolean hasMoreStores = hasSuperStores || !weakStoreIds.isEmpty();
+                    // optimization: if we know the superclass hierarchy doesn't have any context store
+                    // (injected or weak-map) then we can skip the id check and go straight to the field
+                    Label nextStoreLabel = null;
+                    if (hasMoreStores || nextStoreId >= 0) {
+                        nextStoreLabel = compareStoreId(mv, injectedStoreId);
+                    }
 
-        // if...else... blocks for stores injected into this class
-        int injectedStoreId = injectedStoreIds.nextSetBit(0);
-        while (injectedStoreId >= 0) {
-          int nextStoreId = injectedStoreIds.nextSetBit(injectedStoreId + 1);
+                    getStoreField(mv, instrumentedName, injectedStoreId);
 
-          // optimization: if we know the superclass hierarchy doesn't have any context store
-          // (injected or weak-map) then we can skip the id check and go straight to the field
-          Label nextStoreLabel = null;
-          if (hasMoreStores || nextStoreId >= 0) {
-            nextStoreLabel = compareStoreId(mv, injectedStoreId);
-          }
+                    if (null != nextStoreLabel) {
+                        beginNextStore(mv, nextStoreLabel);
+                    }
+                    injectedStoreId = nextStoreId;
+                }
 
-          getStoreField(mv, instrumentedName, injectedStoreId);
+                // if...else... blocks for weak stores between this class and last injected superclass
+                int weakStoreId = weakStoreIds.nextSetBit(0);
+                while (weakStoreId >= 0) {
+                    int nextStoreId = weakStoreIds.nextSetBit(weakStoreId + 1);
+                    Label nextStoreLabel = compareStoreId(mv, weakStoreId);
 
-          if (null != nextStoreLabel) {
-            beginNextStore(mv, nextStoreLabel);
-          }
-          injectedStoreId = nextStoreId;
-        }
+                    invokeWeakGet(mv);
 
-        // if...else... blocks for weak stores between this class and last injected superclass
-        int weakStoreId = weakStoreIds.nextSetBit(0);
-        while (weakStoreId >= 0) {
-          int nextStoreId = weakStoreIds.nextSetBit(weakStoreId + 1);
-          Label nextStoreLabel = compareStoreId(mv, weakStoreId);
+                    beginNextStore(mv, nextStoreLabel);
+                    weakStoreId = nextStoreId;
+                }
 
-          invokeWeakGet(mv);
+                // else... delegate to superclass - but be prepared to fall back to weak-map
+                if (hasMoreStores) {
+                    Label fallbackStoreLabel = new Label();
 
-          beginNextStore(mv, nextStoreLabel);
-          weakStoreId = nextStoreId;
-        }
+                    String superName =
+                            instrumentedType.getSuperClass().asErasure().getInternalName();
+
+                    // check superclass has expected type before calling
+                    mv.visitLdcInsn(EXPECTED_SUPER_STORE_TYPE);
+                    mv.visitLdcInsn(Type.getObjectType(superName));
+                    mv.visitMethodInsn(
+                            Opcodes.INVOKEVIRTUAL,
+                            "java/lang/Class",
+                            IS_ASSIGNABLE_FROM_METHOD,
+                            IS_ASSIGNABLE_FROM_METHOD_DESCRIPTOR,
+                            false);
+                    mv.visitJumpInsn(Opcodes.IFEQ, fallbackStoreLabel);
 
-        // else... delegate to superclass - but be prepared to fall back to weak-map
-        if (hasMoreStores) {
-          Label fallbackStoreLabel = new Label();
+                    invokeSuperGet(mv, superName);
 
-          String superName = instrumentedType.getSuperClass().asErasure().getInternalName();
+                    // superclass has not been field-injected, fall back to weak-map
+                    beginNextStore(mv, fallbackStoreLabel);
 
-          // check superclass has expected type before calling
-          mv.visitLdcInsn(EXPECTED_SUPER_STORE_TYPE);
-          mv.visitLdcInsn(Type.getObjectType(superName));
-          mv.visitMethodInsn(
-              Opcodes.INVOKEVIRTUAL,
-              "java/lang/Class",
-              IS_ASSIGNABLE_FROM_METHOD,
-              IS_ASSIGNABLE_FROM_METHOD_DESCRIPTOR,
-              false);
-          mv.visitJumpInsn(Opcodes.IFEQ, fallbackStoreLabel);
+                    invokeWeakGet(mv);
+                }
 
-          invokeSuperGet(mv, superName);
+                mv.visitMaxs(0, 0);
+                mv.visitEnd();
+            }
 
-          // superclass has not been field-injected, fall back to weak-map
-          beginNextStore(mv, fallbackStoreLabel);
+            private void addStorePutter(
+                    final BitSet injectedStoreIds, final boolean hasSuperStores, final BitSet weakStoreIds) {
+                final MethodVisitor mv =
+                        cv.visitMethod(Opcodes.ACC_PUBLIC, PUTTER_METHOD, PUTTER_METHOD_DESCRIPTOR, null, null);
 
-          invokeWeakGet(mv);
-        }
+                mv.visitCode();
 
-        mv.visitMaxs(0, 0);
-        mv.visitEnd();
-      }
+                String instrumentedName = instrumentedType.getInternalName();
+                boolean hasMoreStores = hasSuperStores || !weakStoreIds.isEmpty();
 
-      private void addStorePutter(
-          final BitSet injectedStoreIds, final boolean hasSuperStores, final BitSet weakStoreIds) {
-        final MethodVisitor mv =
-            cv.visitMethod(Opcodes.ACC_PUBLIC, PUTTER_METHOD, PUTTER_METHOD_DESCRIPTOR, null, null);
+                // if...else... blocks for stores injected into this class
+                int injectedStoreId = injectedStoreIds.nextSetBit(0);
+                while (injectedStoreId >= 0) {
+                    int nextStoreId = injectedStoreIds.nextSetBit(injectedStoreId + 1);
 
-        mv.visitCode();
+                    // optimization: if we know the superclass hierarchy doesn't have any context store
+                    // (injected or weak-map) then we can skip the id check and go straight to the field
+                    Label nextStoreLabel = null;
+                    if (hasMoreStores || nextStoreId >= 0) {
+                        nextStoreLabel = compareStoreId(mv, injectedStoreId);
+                    }
 
-        String instrumentedName = instrumentedType.getInternalName();
-        boolean hasMoreStores = hasSuperStores || !weakStoreIds.isEmpty();
+                    putStoreField(mv, instrumentedName, injectedStoreId);
 
-        // if...else... blocks for stores injected into this class
-        int injectedStoreId = injectedStoreIds.nextSetBit(0);
-        while (injectedStoreId >= 0) {
-          int nextStoreId = injectedStoreIds.nextSetBit(injectedStoreId + 1);
+                    if (null != nextStoreLabel) {
+                        beginNextStore(mv, nextStoreLabel);
+                    }
+                    injectedStoreId = nextStoreId;
+                }
 
-          // optimization: if we know the superclass hierarchy doesn't have any context store
-          // (injected or weak-map) then we can skip the id check and go straight to the field
-          Label nextStoreLabel = null;
-          if (hasMoreStores || nextStoreId >= 0) {
-            nextStoreLabel = compareStoreId(mv, injectedStoreId);
-          }
+                // if...else... blocks for weak stores between this class and last injected superclass
+                int weakStoreId = weakStoreIds.nextSetBit(0);
+                while (weakStoreId >= 0) {
+                    int nextStoreId = weakStoreIds.nextSetBit(weakStoreId + 1);
+                    Label nextStoreLabel = compareStoreId(mv, weakStoreId);
 
-          putStoreField(mv, instrumentedName, injectedStoreId);
+                    invokeWeakPut(mv);
 
-          if (null != nextStoreLabel) {
-            beginNextStore(mv, nextStoreLabel);
-          }
-          injectedStoreId = nextStoreId;
-        }
+                    beginNextStore(mv, nextStoreLabel);
+                    weakStoreId = nextStoreId;
+                }
 
-        // if...else... blocks for weak stores between this class and last injected superclass
-        int weakStoreId = weakStoreIds.nextSetBit(0);
-        while (weakStoreId >= 0) {
-          int nextStoreId = weakStoreIds.nextSetBit(weakStoreId + 1);
-          Label nextStoreLabel = compareStoreId(mv, weakStoreId);
+                // else... delegate to superclass - but be prepared to fall back to weak-map
+                if (hasMoreStores) {
+                    Label fallbackStoreLabel = new Label();
 
-          invokeWeakPut(mv);
+                    String superName =
+                            instrumentedType.getSuperClass().asErasure().getInternalName();
 
-          beginNextStore(mv, nextStoreLabel);
-          weakStoreId = nextStoreId;
-        }
+                    // check superclass has expected type before calling
+                    mv.visitLdcInsn(EXPECTED_SUPER_STORE_TYPE);
+                    mv.visitLdcInsn(Type.getObjectType(superName));
+                    mv.visitMethodInsn(
+                            Opcodes.INVOKEVIRTUAL,
+                            "java/lang/Class",
+                            IS_ASSIGNABLE_FROM_METHOD,
+                            IS_ASSIGNABLE_FROM_METHOD_DESCRIPTOR,
+                            false);
+                    mv.visitJumpInsn(Opcodes.IFEQ, fallbackStoreLabel);
 
-        // else... delegate to superclass - but be prepared to fall back to weak-map
-        if (hasMoreStores) {
-          Label fallbackStoreLabel = new Label();
+                    invokeSuperPut(mv, superName);
 
-          String superName = instrumentedType.getSuperClass().asErasure().getInternalName();
+                    // superclass has not been field-injected, fall back to weak-map
+                    beginNextStore(mv, fallbackStoreLabel);
 
-          // check superclass has expected type before calling
-          mv.visitLdcInsn(EXPECTED_SUPER_STORE_TYPE);
-          mv.visitLdcInsn(Type.getObjectType(superName));
-          mv.visitMethodInsn(
-              Opcodes.INVOKEVIRTUAL,
-              "java/lang/Class",
-              IS_ASSIGNABLE_FROM_METHOD,
-              IS_ASSIGNABLE_FROM_METHOD_DESCRIPTOR,
-              false);
-          mv.visitJumpInsn(Opcodes.IFEQ, fallbackStoreLabel);
+                    invokeWeakPut(mv);
+                }
 
-          invokeSuperPut(mv, superName);
+                mv.visitMaxs(0, 0);
+                mv.visitEnd();
+            }
 
-          // superclass has not been field-injected, fall back to weak-map
-          beginNextStore(mv, fallbackStoreLabel);
+            private Label compareStoreId(final MethodVisitor mv, final int storeId) {
+                mv.visitIntInsn(Opcodes.ILOAD, 1);
+                Label nextStoreLabel = new Label();
+                if (storeId == 0) {
+                    mv.visitJumpInsn(Opcodes.IFNE, nextStoreLabel);
+                } else {
+                    if (storeId >= 0 && storeId <= 5) {
+                        mv.visitInsn(Opcodes.ICONST_0 + storeId);
+                    } else {
+                        mv.visitLdcInsn(storeId);
+                    }
+                    mv.visitJumpInsn(Opcodes.IF_ICMPNE, nextStoreLabel);
+                }
+                return nextStoreLabel;
+            }
 
-          invokeWeakPut(mv);
-        }
+            private void beginNextStore(final MethodVisitor mv, final Label nextStoreLabel) {
+                mv.visitLabel(nextStoreLabel);
+                if (frames) {
+                    mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
+                }
+            }
 
-        mv.visitMaxs(0, 0);
-        mv.visitEnd();
-      }
+            private void getStoreField(
+                    final MethodVisitor mv, final String instrumentedName, final int injectedStoreId) {
+                mv.visitIntInsn(Opcodes.ALOAD, 0);
+                mv.visitFieldInsn(
+                        Opcodes.GETFIELD,
+                        instrumentedName,
+                        CONTEXT_STORE_ACCESS_PREFIX + injectedStoreId,
+                        OBJECT_DESCRIPTOR);
+                mv.visitInsn(Opcodes.ARETURN);
+            }
 
-      private Label compareStoreId(final MethodVisitor mv, final int storeId) {
-        mv.visitIntInsn(Opcodes.ILOAD, 1);
-        Label nextStoreLabel = new Label();
-        if (storeId == 0) {
-          mv.visitJumpInsn(Opcodes.IFNE, nextStoreLabel);
-        } else {
-          if (storeId >= 0 && storeId <= 5) {
-            mv.visitInsn(Opcodes.ICONST_0 + storeId);
-          } else {
-            mv.visitLdcInsn(storeId);
-          }
-          mv.visitJumpInsn(Opcodes.IF_ICMPNE, nextStoreLabel);
-        }
-        return nextStoreLabel;
-      }
+            private void putStoreField(
+                    final MethodVisitor mv, final String instrumentedName, final int injectedStoreId) {
+                mv.visitIntInsn(Opcodes.ALOAD, 0);
+                mv.visitIntInsn(Opcodes.ALOAD, 2);
+                mv.visitFieldInsn(
+                        Opcodes.PUTFIELD,
+                        instrumentedName,
+                        CONTEXT_STORE_ACCESS_PREFIX + injectedStoreId,
+                        OBJECT_DESCRIPTOR);
+                mv.visitInsn(Opcodes.RETURN);
+            }
 
-      private void beginNextStore(final MethodVisitor mv, final Label nextStoreLabel) {
-        mv.visitLabel(nextStoreLabel);
-        if (frames) {
-          mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
-        }
-      }
-
-      private void getStoreField(
-          final MethodVisitor mv, final String instrumentedName, final int injectedStoreId) {
-        mv.visitIntInsn(Opcodes.ALOAD, 0);
-        mv.visitFieldInsn(
-            Opcodes.GETFIELD,
-            instrumentedName,
-            CONTEXT_STORE_ACCESS_PREFIX + injectedStoreId,
-            OBJECT_DESCRIPTOR);
-        mv.visitInsn(Opcodes.ARETURN);
-      }
-
-      private void putStoreField(
-          final MethodVisitor mv, final String instrumentedName, final int injectedStoreId) {
-        mv.visitIntInsn(Opcodes.ALOAD, 0);
-        mv.visitIntInsn(Opcodes.ALOAD, 2);
-        mv.visitFieldInsn(
-            Opcodes.PUTFIELD,
-            instrumentedName,
-            CONTEXT_STORE_ACCESS_PREFIX + injectedStoreId,
-            OBJECT_DESCRIPTOR);
-        mv.visitInsn(Opcodes.RETURN);
-      }
-
-      private void invokeWeakGet(final MethodVisitor mv) {
-        mv.visitIntInsn(Opcodes.ALOAD, 0);
-        mv.visitIntInsn(Opcodes.ILOAD, 1);
-        mv.visitMethodInsn(
-            Opcodes.INVOKESTATIC, WEAK_REDIRECT_CLASS, "get", WEAK_GET_METHOD_DESCRIPTOR, false);
-        mv.visitInsn(Opcodes.ARETURN);
-      }
-
-      private void invokeWeakPut(final MethodVisitor mv) {
-        mv.visitIntInsn(Opcodes.ALOAD, 0);
-        mv.visitIntInsn(Opcodes.ILOAD, 1);
-        mv.visitIntInsn(Opcodes.ALOAD, 2);
-        mv.visitMethodInsn(
-            Opcodes.INVOKESTATIC, WEAK_REDIRECT_CLASS, "put", WEAK_PUT_METHOD_DESCRIPTOR, false);
-        mv.visitInsn(Opcodes.RETURN);
-      }
-
-      private void invokeSuperGet(final MethodVisitor mv, final String superName) {
-        mv.visitIntInsn(Opcodes.ALOAD, 0);
-        mv.visitIntInsn(Opcodes.ILOAD, 1);
-        mv.visitMethodInsn(
-            Opcodes.INVOKESPECIAL, superName, GETTER_METHOD, GETTER_METHOD_DESCRIPTOR, false);
-        mv.visitInsn(Opcodes.ARETURN);
-      }
-
-      private void invokeSuperPut(final MethodVisitor mv, final String superName) {
-        mv.visitIntInsn(Opcodes.ALOAD, 0);
-        mv.visitIntInsn(Opcodes.ILOAD, 1);
-        mv.visitIntInsn(Opcodes.ALOAD, 2);
-        mv.visitMethodInsn(
-            Opcodes.INVOKESPECIAL, superName, PUTTER_METHOD, PUTTER_METHOD_DESCRIPTOR, false);
-        mv.visitInsn(Opcodes.RETURN);
-      }
-    };
-  }
-
-  /** Requests injection of a context store for a key and context. */
-  static int injectContextStore(
-      final String target, final String keyClassName, final String contextClassName) {
-    int storeId = getContextStoreId(keyClassName, contextClassName);
-
-    // collect a new set of store ids every time we see a new target
-    Pair<String, BitSet> injectedStoreIds = INJECTED_STORE_IDS.get();
-    if (null == injectedStoreIds || !target.equals(injectedStoreIds.getLeft())) {
-      injectedStoreIds = Pair.of(target, new BitSet());
-      INJECTED_STORE_IDS.set(injectedStoreIds);
+            private void invokeWeakGet(final MethodVisitor mv) {
+                mv.visitIntInsn(Opcodes.ALOAD, 0);
+                mv.visitIntInsn(Opcodes.ILOAD, 1);
+                mv.visitMethodInsn(Opcodes.INVOKESTATIC, WEAK_REDIRECT_CLASS, "get", WEAK_GET_METHOD_DESCRIPTOR, false);
+                mv.visitInsn(Opcodes.ARETURN);
+            }
+
+            private void invokeWeakPut(final MethodVisitor mv) {
+                mv.visitIntInsn(Opcodes.ALOAD, 0);
+                mv.visitIntInsn(Opcodes.ILOAD, 1);
+                mv.visitIntInsn(Opcodes.ALOAD, 2);
+                mv.visitMethodInsn(Opcodes.INVOKESTATIC, WEAK_REDIRECT_CLASS, "put", WEAK_PUT_METHOD_DESCRIPTOR, false);
+                mv.visitInsn(Opcodes.RETURN);
+            }
+
+            private void invokeSuperGet(final MethodVisitor mv, final String superName) {
+                mv.visitIntInsn(Opcodes.ALOAD, 0);
+                mv.visitIntInsn(Opcodes.ILOAD, 1);
+                mv.visitMethodInsn(Opcodes.INVOKESPECIAL, superName, GETTER_METHOD, GETTER_METHOD_DESCRIPTOR, false);
+                mv.visitInsn(Opcodes.ARETURN);
+            }
+
+            private void invokeSuperPut(final MethodVisitor mv, final String superName) {
+                mv.visitIntInsn(Opcodes.ALOAD, 0);
+                mv.visitIntInsn(Opcodes.ILOAD, 1);
+                mv.visitIntInsn(Opcodes.ALOAD, 2);
+                mv.visitMethodInsn(Opcodes.INVOKESPECIAL, superName, PUTTER_METHOD, PUTTER_METHOD_DESCRIPTOR, false);
+                mv.visitInsn(Opcodes.RETURN);
+            }
+        };
     }
-    injectedStoreIds.getRight().set(storeId);
-
-    return storeId;
-  }
-
-  /** Returns all context store injection requests for the class being transformed. */
-  static BitSet getInjectedContextStores() {
-    Pair<String, BitSet> injectedStoreIds = INJECTED_STORE_IDS.get();
-    if (null != injectedStoreIds) {
-      INJECTED_STORE_IDS.remove();
-      return injectedStoreIds.getRight();
-    } else {
-      return null;
+
+    /** Requests injection of a context store for a key and context. */
+    static int injectContextStore(final String target, final String keyClassName, final String contextClassName) {
+        int storeId = getContextStoreId(keyClassName, contextClassName);
+
+        // collect a new set of store ids every time we see a new target
+        Pair<String, BitSet> injectedStoreIds = INJECTED_STORE_IDS.get();
+        if (null == injectedStoreIds || !target.equals(injectedStoreIds.getLeft())) {
+            injectedStoreIds = Pair.of(target, new BitSet());
+            INJECTED_STORE_IDS.set(injectedStoreIds);
+        }
+        injectedStoreIds.getRight().set(storeId);
+
+        return storeId;
     }
-  }
 
-  private static final class SerialVersionUIDInjector
-      extends datadog.trace.agent.tooling.context.asm.SerialVersionUIDAdder {
-    public SerialVersionUIDInjector() {
-      super(Opcodes.ASM8, null);
+    /** Returns all context store injection requests for the class being transformed. */
+    static BitSet getInjectedContextStores() {
+        Pair<String, BitSet> injectedStoreIds = INJECTED_STORE_IDS.get();
+        if (null != injectedStoreIds) {
+            INJECTED_STORE_IDS.remove();
+            return injectedStoreIds.getRight();
+        } else {
+            return null;
+        }
     }
 
-    public void injectSerialVersionUID(
-        final TypeDescription instrumentedType, final ClassVisitor transformer) {
-      if (!hasSVUID()) {
-        try {
-          transformer.visitField(
-              Opcodes.ACC_FINAL | Opcodes.ACC_STATIC,
-              "serialVersionUID",
-              "J",
-              null,
-              computeSVUID());
-        } catch (final Exception e) {
-          log.debug("Failed to add serialVersionUID to {}", instrumentedType.getName(), e);
+    private static final class SerialVersionUIDInjector
+            extends datadog.trace.agent.tooling.context.asm.SerialVersionUIDAdder {
+        public SerialVersionUIDInjector() {
+            super(Opcodes.ASM8, null);
+        }
+
+        public void injectSerialVersionUID(final TypeDescription instrumentedType, final ClassVisitor transformer) {
+            if (!hasSVUID()) {
+                try {
+                    transformer.visitField(
+                            Opcodes.ACC_FINAL | Opcodes.ACC_STATIC, "serialVersionUID", "J", null, computeSVUID());
+                } catch (final Exception e) {
+                    log.debug("Failed to add serialVersionUID to {}", instrumentedType.getName(), e);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextMatcher.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextMatcher.java
index 86e3cfa039b..19842f012dc 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextMatcher.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextMatcher.java
@@ -9,67 +9,66 @@
 import org.slf4j.LoggerFactory;
 
 public final class FieldBackedContextMatcher {
-  private static final Logger log = LoggerFactory.getLogger(FieldBackedContextMatcher.class);
+    private static final Logger log = LoggerFactory.getLogger(FieldBackedContextMatcher.class);
 
-  private final String keyType;
-  private final String valueType;
+    private final String keyType;
+    private final String valueType;
 
-  private final ElementMatcher<TypeDescription> shouldInjectContextField;
+    private final ElementMatcher<TypeDescription> shouldInjectContextField;
 
-  public FieldBackedContextMatcher(String keyType, String valueType) {
-    this.keyType = keyType;
-    this.valueType = valueType;
+    public FieldBackedContextMatcher(String keyType, String valueType) {
+        this.keyType = keyType;
+        this.valueType = valueType;
 
-    this.shouldInjectContextField = declaresContextField(keyType, valueType);
-  }
+        this.shouldInjectContextField = declaresContextField(keyType, valueType);
+    }
 
-  public boolean matches(TypeDescription target, Class<?> classBeingRedefined) {
+    public boolean matches(TypeDescription target, Class<?> classBeingRedefined) {
 
-    /*
-     * The idea here is that we can add fields if class is just being loaded
-     * (classBeingRedefined == null) and we have to add same fields again if
-     * the class we added fields to before is being transformed again.
-     */
-    boolean canInject =
-        classBeingRedefined == null || implementsContextAccessor(classBeingRedefined);
+        /*
+         * The idea here is that we can add fields if class is just being loaded
+         * (classBeingRedefined == null) and we have to add same fields again if
+         * the class we added fields to before is being transformed again.
+         */
+        boolean canInject = classBeingRedefined == null || implementsContextAccessor(classBeingRedefined);
 
-    boolean injectContextField = canInject && shouldInjectContextField.matches(target);
+        boolean injectContextField = canInject && shouldInjectContextField.matches(target);
 
-    if (log.isDebugEnabled()) {
-      if (injectContextField) {
-        log.debug(
-            "Added context-store field - instrumentation.target.class={} instrumentation.target.context={}->{}",
-            target.getName(),
-            keyType,
-            valueType);
-      } else if (!canInject && shouldInjectContextField.matches(target)) {
-        // must be a re-define of a class that we weren't able to field-inject on startup
-        // - make sure we'd have field-injected (if we'd had the chance) before reporting
-        log.debug(
-            "Failed to add context-store field - instrumentation.target.class={} instrumentation.target.context={}->{}",
-            target.getName(),
-            keyType,
-            valueType);
-      }
-    }
+        if (log.isDebugEnabled()) {
+            if (injectContextField) {
+                log.debug(
+                        "Added context-store field - instrumentation.target.class={} instrumentation.target.context={}->{}",
+                        target.getName(),
+                        keyType,
+                        valueType);
+            } else if (!canInject && shouldInjectContextField.matches(target)) {
+                // must be a re-define of a class that we weren't able to field-inject on startup
+                // - make sure we'd have field-injected (if we'd had the chance) before reporting
+                log.debug(
+                        "Failed to add context-store field - instrumentation.target.class={} instrumentation.target.context={}->{}",
+                        target.getName(),
+                        keyType,
+                        valueType);
+            }
+        }
 
-    return injectContextField;
-  }
+        return injectContextField;
+    }
 
-  public String describe() {
-    return "contextStore(" + keyType + "," + valueType + ")";
-  }
+    public String describe() {
+        return "contextStore(" + keyType + "," + valueType + ")";
+    }
 
-  /**
-   * Assumes that {@link Class#getInterfaces()} returns list of interfaces defined immediately on a
-   * given class, not inherited from its parents.
-   */
-  private static boolean implementsContextAccessor(Class<?> classBeingRedefined) {
-    for (Class<?> intf : classBeingRedefined.getInterfaces()) {
-      if (FieldBackedContextAccessor.class.equals(intf)) {
-        return true;
-      }
+    /**
+     * Assumes that {@link Class#getInterfaces()} returns list of interfaces defined immediately on a
+     * given class, not inherited from its parents.
+     */
+    private static boolean implementsContextAccessor(Class<?> classBeingRedefined) {
+        for (Class<?> intf : classBeingRedefined.getInterfaces()) {
+            if (FieldBackedContextAccessor.class.equals(intf)) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextRequestRewriter.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextRequestRewriter.java
index 08d52f9bd57..c40b76cd740 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextRequestRewriter.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextRequestRewriter.java
@@ -29,158 +29,150 @@
  */
 public final class FieldBackedContextRequestRewriter implements AsmVisitorWrapper {
 
-  private static final Logger log =
-      LoggerFactory.getLogger(FieldBackedContextRequestRewriter.class);
-
-  static final String INSTRUMENTATION_CONTEXT_CLASS =
-      getInternalName(InstrumentationContext.class.getName());
-
-  static final String FIELD_BACKED_CONTEXT_STORES_CLASS =
-      getInternalName(FieldBackedContextStores.class.getName());
-
-  static final String GET_METHOD = "get";
-  static final String GET_METHOD_DESCRIPTOR =
-      Type.getMethodDescriptor(
-          Type.getType(ContextStore.class), Type.getType(Class.class), Type.getType(Class.class));
-  static final String GET_METHOD_DESCRIPTOR_2 =
-      Type.getMethodDescriptor(
-          Type.getType(ContextStore.class), Type.getType(String.class), Type.getType(String.class));
-
-  static final String GET_CONTENT_STORE_METHOD = "getContextStore";
-  static final String GET_CONTENT_STORE_METHOD_DESCRIPTOR =
-      Type.getMethodDescriptor(Type.getType(FieldBackedContextStore.class), Type.INT_TYPE);
-
-  static final String FIELD_BACKED_CONTENT_STORE_DESCRIPTOR =
-      Type.getDescriptor(FieldBackedContextStore.class);
-
-  static final String FAST_CONTENT_STORE_PREFIX = "contextStore";
-
-  final Map<String, String> contextStore;
-  final String instrumenterClassName;
-
-  public FieldBackedContextRequestRewriter(
-      final Map<String, String> contextStore, final String instrumenterClassName) {
-    this.contextStore = contextStore;
-    this.instrumenterClassName = instrumenterClassName;
-  }
-
-  @Override
-  public int mergeWriter(final int flags) {
-    return flags | ClassWriter.COMPUTE_MAXS;
-  }
-
-  @Override
-  public int mergeReader(final int flags) {
-    return flags;
-  }
-
-  @Override
-  public ClassVisitor wrap(
-      final TypeDescription instrumentedType,
-      final ClassVisitor classVisitor,
-      final Implementation.Context implementationContext,
-      final TypePool typePool,
-      final FieldList<FieldDescription.InDefinedShape> fields,
-      final MethodList<?> methods,
-      final int writerFlags,
-      final int readerFlags) {
-    return new ClassVisitor(Opcodes.ASM9, classVisitor) {
-      @Override
-      public MethodVisitor visitMethod(
-          final int access,
-          final String name,
-          final String descriptor,
-          final String signature,
-          final String[] exceptions) {
-        final MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
-        return new MethodVisitor(api, mv) {
-          /** The last two constants pushed onto the stack. */
-          private Object constant1, constant2;
-
-          @Override
-          public void visitLdcInsn(final Object value) {
-            // 'first' constant gets moved over once 'second' one comes in
-            constant1 = constant2;
-            constant2 = value;
-            super.visitLdcInsn(value);
-          }
-
-          @Override
-          public void visitMethodInsn(
-              final int opcode,
-              final String owner,
-              final String name,
-              final String descriptor,
-              final boolean isInterface) {
-            // Look for any calls to `InstrumentationContext.get(K.class, C.class)`
-            if (Opcodes.INVOKESTATIC == opcode
-                && INSTRUMENTATION_CONTEXT_CLASS.equals(owner)
-                && GET_METHOD.equals(name)
-                && (GET_METHOD_DESCRIPTOR.equals(descriptor)
-                    || GET_METHOD_DESCRIPTOR_2.equals(descriptor))) {
-              log.debug(
-                  "Found context-store access - instrumentation.class={}", instrumenterClassName);
-              // We track the last two constants pushed onto the stack to make sure they match
-              // the expected key and context types. Matching calls are rewritten to call the
-              // dynamically injected context store implementation instead.
-              String keyClassName = null;
-              String contextClassName = null;
-              if (constant1 instanceof Type && constant2 instanceof Type) {
-                keyClassName = ((Type) constant1).getClassName();
-                contextClassName = ((Type) constant2).getClassName();
-              } else if (constant1 instanceof String && constant2 instanceof String) {
-                keyClassName = (String) constant1;
-                contextClassName = (String) constant2;
-              }
-              if (null != keyClassName && null != contextClassName) {
-                if (log.isDebugEnabled()) {
-                  log.debug(
-                      "Rewriting context-store map fetch - instrumentation.class={} instrumentation.target.context={}->{}",
-                      instrumenterClassName,
-                      keyClassName,
-                      contextClassName);
-                }
-                if (!contextClassName.equals(contextStore.get(keyClassName))) {
-                  throw new IllegalStateException(
-                      String.format(
-                          "Incorrect Context Api Usage detected. Incorrect context class %s, expected %s for instrumentation %s",
-                          contextClassName, contextStore.get(keyClassName), instrumenterClassName));
-                }
-                // discard original parameters so we can use numeric id instead
-                mv.visitInsn(Opcodes.POP2);
-
-                int storeId = getContextStoreId(keyClassName, contextClassName);
-                // use fast direct field access for a small number of stores
-                if (storeId < FieldBackedContextStores.FAST_STORE_ID_LIMIT) {
-                  mv.visitFieldInsn(
-                      Opcodes.GETSTATIC,
-                      FIELD_BACKED_CONTEXT_STORES_CLASS,
-                      FAST_CONTENT_STORE_PREFIX + storeId,
-                      FIELD_BACKED_CONTENT_STORE_DESCRIPTOR);
-                } else {
-                  mv.visitLdcInsn(storeId);
-                  mv.visitMethodInsn(
-                      Opcodes.INVOKESTATIC,
-                      FIELD_BACKED_CONTEXT_STORES_CLASS,
-                      GET_CONTENT_STORE_METHOD,
-                      GET_CONTENT_STORE_METHOD_DESCRIPTOR,
-                      false);
-                }
-              } else {
-                throw new IllegalStateException(
-                    "Incorrect Context Api Usage detected. Key and context class must be class-literals. "
-                        + "Example of correct usage: InstrumentationContext.get(Runnable.class, RunnableContext.class)");
-              }
-            } else {
-              super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+    private static final Logger log = LoggerFactory.getLogger(FieldBackedContextRequestRewriter.class);
+
+    static final String INSTRUMENTATION_CONTEXT_CLASS = getInternalName(InstrumentationContext.class.getName());
+
+    static final String FIELD_BACKED_CONTEXT_STORES_CLASS = getInternalName(FieldBackedContextStores.class.getName());
+
+    static final String GET_METHOD = "get";
+    static final String GET_METHOD_DESCRIPTOR = Type.getMethodDescriptor(
+            Type.getType(ContextStore.class), Type.getType(Class.class), Type.getType(Class.class));
+    static final String GET_METHOD_DESCRIPTOR_2 = Type.getMethodDescriptor(
+            Type.getType(ContextStore.class), Type.getType(String.class), Type.getType(String.class));
+
+    static final String GET_CONTENT_STORE_METHOD = "getContextStore";
+    static final String GET_CONTENT_STORE_METHOD_DESCRIPTOR =
+            Type.getMethodDescriptor(Type.getType(FieldBackedContextStore.class), Type.INT_TYPE);
+
+    static final String FIELD_BACKED_CONTENT_STORE_DESCRIPTOR = Type.getDescriptor(FieldBackedContextStore.class);
+
+    static final String FAST_CONTENT_STORE_PREFIX = "contextStore";
+
+    final Map<String, String> contextStore;
+    final String instrumenterClassName;
+
+    public FieldBackedContextRequestRewriter(
+            final Map<String, String> contextStore, final String instrumenterClassName) {
+        this.contextStore = contextStore;
+        this.instrumenterClassName = instrumenterClassName;
+    }
+
+    @Override
+    public int mergeWriter(final int flags) {
+        return flags | ClassWriter.COMPUTE_MAXS;
+    }
+
+    @Override
+    public int mergeReader(final int flags) {
+        return flags;
+    }
+
+    @Override
+    public ClassVisitor wrap(
+            final TypeDescription instrumentedType,
+            final ClassVisitor classVisitor,
+            final Implementation.Context implementationContext,
+            final TypePool typePool,
+            final FieldList<FieldDescription.InDefinedShape> fields,
+            final MethodList<?> methods,
+            final int writerFlags,
+            final int readerFlags) {
+        return new ClassVisitor(Opcodes.ASM9, classVisitor) {
+            @Override
+            public MethodVisitor visitMethod(
+                    final int access,
+                    final String name,
+                    final String descriptor,
+                    final String signature,
+                    final String[] exceptions) {
+                final MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
+                return new MethodVisitor(api, mv) {
+                    /** The last two constants pushed onto the stack. */
+                    private Object constant1, constant2;
+
+                    @Override
+                    public void visitLdcInsn(final Object value) {
+                        // 'first' constant gets moved over once 'second' one comes in
+                        constant1 = constant2;
+                        constant2 = value;
+                        super.visitLdcInsn(value);
+                    }
+
+                    @Override
+                    public void visitMethodInsn(
+                            final int opcode,
+                            final String owner,
+                            final String name,
+                            final String descriptor,
+                            final boolean isInterface) {
+                        // Look for any calls to `InstrumentationContext.get(K.class, C.class)`
+                        if (Opcodes.INVOKESTATIC == opcode
+                                && INSTRUMENTATION_CONTEXT_CLASS.equals(owner)
+                                && GET_METHOD.equals(name)
+                                && (GET_METHOD_DESCRIPTOR.equals(descriptor)
+                                        || GET_METHOD_DESCRIPTOR_2.equals(descriptor))) {
+                            log.debug("Found context-store access - instrumentation.class={}", instrumenterClassName);
+                            // We track the last two constants pushed onto the stack to make sure they match
+                            // the expected key and context types. Matching calls are rewritten to call the
+                            // dynamically injected context store implementation instead.
+                            String keyClassName = null;
+                            String contextClassName = null;
+                            if (constant1 instanceof Type && constant2 instanceof Type) {
+                                keyClassName = ((Type) constant1).getClassName();
+                                contextClassName = ((Type) constant2).getClassName();
+                            } else if (constant1 instanceof String && constant2 instanceof String) {
+                                keyClassName = (String) constant1;
+                                contextClassName = (String) constant2;
+                            }
+                            if (null != keyClassName && null != contextClassName) {
+                                if (log.isDebugEnabled()) {
+                                    log.debug(
+                                            "Rewriting context-store map fetch - instrumentation.class={} instrumentation.target.context={}->{}",
+                                            instrumenterClassName,
+                                            keyClassName,
+                                            contextClassName);
+                                }
+                                if (!contextClassName.equals(contextStore.get(keyClassName))) {
+                                    throw new IllegalStateException(String.format(
+                                            "Incorrect Context Api Usage detected. Incorrect context class %s, expected %s for instrumentation %s",
+                                            contextClassName, contextStore.get(keyClassName), instrumenterClassName));
+                                }
+                                // discard original parameters so we can use numeric id instead
+                                mv.visitInsn(Opcodes.POP2);
+
+                                int storeId = getContextStoreId(keyClassName, contextClassName);
+                                // use fast direct field access for a small number of stores
+                                if (storeId < FieldBackedContextStores.FAST_STORE_ID_LIMIT) {
+                                    mv.visitFieldInsn(
+                                            Opcodes.GETSTATIC,
+                                            FIELD_BACKED_CONTEXT_STORES_CLASS,
+                                            FAST_CONTENT_STORE_PREFIX + storeId,
+                                            FIELD_BACKED_CONTENT_STORE_DESCRIPTOR);
+                                } else {
+                                    mv.visitLdcInsn(storeId);
+                                    mv.visitMethodInsn(
+                                            Opcodes.INVOKESTATIC,
+                                            FIELD_BACKED_CONTEXT_STORES_CLASS,
+                                            GET_CONTENT_STORE_METHOD,
+                                            GET_CONTENT_STORE_METHOD_DESCRIPTOR,
+                                            false);
+                                }
+                            } else {
+                                throw new IllegalStateException(
+                                        "Incorrect Context Api Usage detected. Key and context class must be class-literals. "
+                                                + "Example of correct usage: InstrumentationContext.get(Runnable.class, RunnableContext.class)");
+                            }
+                        } else {
+                            super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+                        }
+
+                        // reset constants for next method check
+                        constant1 = null;
+                        constant2 = null;
+                    }
+                };
             }
-
-            // reset constants for next method check
-            constant1 = null;
-            constant2 = null;
-          }
         };
-      }
-    };
-  }
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/ShouldInjectFieldsMatcher.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/ShouldInjectFieldsMatcher.java
index 3b8610dcddd..9a08e15752a 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/ShouldInjectFieldsMatcher.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/ShouldInjectFieldsMatcher.java
@@ -11,64 +11,63 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public final class ShouldInjectFieldsMatcher
-    extends ElementMatcher.Junction.ForNonNullValues<TypeDescription> {
-  private static final Logger log = LoggerFactory.getLogger(ShouldInjectFieldsMatcher.class);
+public final class ShouldInjectFieldsMatcher extends ElementMatcher.Junction.ForNonNullValues<TypeDescription> {
+    private static final Logger log = LoggerFactory.getLogger(ShouldInjectFieldsMatcher.class);
 
-  private final String keyType;
-  private final String valueType;
-  private final ElementMatcher<TypeDescription> subclassOfKey;
-  private final ExcludeFilter.ExcludeType skipType;
+    private final String keyType;
+    private final String valueType;
+    private final ElementMatcher<TypeDescription> subclassOfKey;
+    private final ExcludeFilter.ExcludeType skipType;
 
-  public ShouldInjectFieldsMatcher(String keyType, String valueType) {
-    this.keyType = keyType;
-    this.valueType = valueType;
-    this.subclassOfKey = hasSuperType(named(keyType));
-    this.skipType = ExcludeFilter.ExcludeType.fromFieldType(keyType);
-  }
-
-  @Override
-  protected boolean doMatch(TypeDescription typeDescription) {
-    if (!subclassOfKey.matches(typeDescription)) {
-      return false; // ignore types that are completely unrelated to the key
+    public ShouldInjectFieldsMatcher(String keyType, String valueType) {
+        this.keyType = keyType;
+        this.valueType = valueType;
+        this.subclassOfKey = hasSuperType(named(keyType));
+        this.skipType = ExcludeFilter.ExcludeType.fromFieldType(keyType);
     }
 
-    String matchedType = typeDescription.getName();
+    @Override
+    protected boolean doMatch(TypeDescription typeDescription) {
+        if (!subclassOfKey.matches(typeDescription)) {
+            return false; // ignore types that are completely unrelated to the key
+        }
 
-    // First check if we should skip injecting the field based on the key type
-    if (skipType != null && ExcludeFilter.exclude(skipType, matchedType)) {
-      excludeInjectedField(matchedType, keyType, valueType);
-      if (log.isDebugEnabled()) {
-        log.debug(
-            "Skipping context-store field - instrumentation.target.class={} instrumentation.target.context={}->{}",
-            matchedType,
-            keyType,
-            valueType);
-      }
-      return false;
-    }
-    String injectionTarget = null;
-    // we will always inject the key type if it's a class - if this isn't the key class we need to
-    // find the last super class that implements the key type, if it is an interface. This could be
-    // streamlined slightly if we knew whether the key type were an interface or a class, but can be
-    // figured out as we go along
-    boolean shouldInject;
-    if (keyType.equals(matchedType)) {
-      shouldInject = true;
-    } else {
-      injectionTarget = findInjectionTarget(typeDescription, keyType);
-      shouldInject = matchedType.equals(injectionTarget);
-    }
-    if (log.isDebugEnabled()) {
-      if (!shouldInject && null != injectionTarget) {
-        log.debug(
-            "Will not add context-store field, alternate target found {} - instrumentation.target.class={} instrumentation.target.context={}->{}",
-            injectionTarget,
-            matchedType,
-            keyType,
-            valueType);
-      }
+        String matchedType = typeDescription.getName();
+
+        // First check if we should skip injecting the field based on the key type
+        if (skipType != null && ExcludeFilter.exclude(skipType, matchedType)) {
+            excludeInjectedField(matchedType, keyType, valueType);
+            if (log.isDebugEnabled()) {
+                log.debug(
+                        "Skipping context-store field - instrumentation.target.class={} instrumentation.target.context={}->{}",
+                        matchedType,
+                        keyType,
+                        valueType);
+            }
+            return false;
+        }
+        String injectionTarget = null;
+        // we will always inject the key type if it's a class - if this isn't the key class we need to
+        // find the last super class that implements the key type, if it is an interface. This could be
+        // streamlined slightly if we knew whether the key type were an interface or a class, but can be
+        // figured out as we go along
+        boolean shouldInject;
+        if (keyType.equals(matchedType)) {
+            shouldInject = true;
+        } else {
+            injectionTarget = findInjectionTarget(typeDescription, keyType);
+            shouldInject = matchedType.equals(injectionTarget);
+        }
+        if (log.isDebugEnabled()) {
+            if (!shouldInject && null != injectionTarget) {
+                log.debug(
+                        "Will not add context-store field, alternate target found {} - instrumentation.target.class={} instrumentation.target.context={}->{}",
+                        injectionTarget,
+                        matchedType,
+                        keyType,
+                        valueType);
+            }
+        }
+        return shouldInject;
     }
-    return shouldInject;
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/ShouldInjectFieldsState.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/ShouldInjectFieldsState.java
index 3e6f04d7ef3..224ada2f276 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/ShouldInjectFieldsState.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/ShouldInjectFieldsState.java
@@ -14,147 +14,144 @@
 /** Manages the persistent state associated with {@link ShouldInjectFieldsMatcher}. */
 class ShouldInjectFieldsState {
 
-  // this map will contain as many entries as there are unique
-  // context store keys, so can't get very big
-  private static final ConcurrentHashMap<String, Boolean> KEY_TYPE_IS_CLASS =
-      new ConcurrentHashMap<>();
+    // this map will contain as many entries as there are unique
+    // context store keys, so can't get very big
+    private static final ConcurrentHashMap<String, Boolean> KEY_TYPE_IS_CLASS = new ConcurrentHashMap<>();
 
-  // this map will contain entries for any root type that we wanted to field-inject
-  // but were not able to - either because it was explicitly excluded, or because we
-  // failed to field-inject as the type was already loaded
-  private static final ConcurrentHashMap<String, BitSet> WEAK_STORE_IDS_BY_TYPE =
-      new ConcurrentHashMap<String, BitSet>();
+    // this map will contain entries for any root type that we wanted to field-inject
+    // but were not able to - either because it was explicitly excluded, or because we
+    // failed to field-inject as the type was already loaded
+    private static final ConcurrentHashMap<String, BitSet> WEAK_STORE_IDS_BY_TYPE =
+            new ConcurrentHashMap<String, BitSet>();
 
-  private ShouldInjectFieldsState() {}
+    private ShouldInjectFieldsState() {}
 
-  /**
-   * Searches for the earliest class in the hierarchy to have fields injected under the given key.
-   */
-  public static String findInjectionTarget(TypeDescription typeDescription, String keyType) {
-    // precondition: typeDescription must be a subtype of the key class
-    // (checked in ShouldInjectContextFieldMatcher before calling here)
+    /**
+     * Searches for the earliest class in the hierarchy to have fields injected under the given key.
+     */
+    public static String findInjectionTarget(TypeDescription typeDescription, String keyType) {
+        // precondition: typeDescription must be a subtype of the key class
+        // (checked in ShouldInjectContextFieldMatcher before calling here)
 
-    // The flag takes 3 values:
-    // true: the key type is a class, so should be the injection target
-    // false: the key type is an interface, so we need to find the class
-    // closest to java.lang.Object which implements the key type
-    // null: we don't know yet because we haven't seen the key type before
-    Boolean keyTypeIsClass = KEY_TYPE_IS_CLASS.get(keyType);
-    if (null != keyTypeIsClass && keyTypeIsClass) {
-      // if we already know the key type is a class,
-      // we must inject into that class.
-      return keyType;
-    }
-    // then we don't know it's a class so need to
-    // follow the type's ancestry to find out
-    TypeDefinition superClass = typeDescription.getSuperClass();
-    String implementingClass = typeDescription.getName();
-    Map<String, Boolean> visitedInterfaces = new HashMap<>();
-    while (null != superClass) {
-      String superClassName = superClass.asErasure().getName();
-      if (null == keyTypeIsClass && keyType.equals(superClassName)) {
-        // short circuit the search with this key type next time
-        KEY_TYPE_IS_CLASS.put(keyType, true);
-        return keyType;
-      }
-      if (hasKeyInterface(superClass, keyType, visitedInterfaces)) {
-        // then the key type must be an interface
-        if (null == keyTypeIsClass) {
-          KEY_TYPE_IS_CLASS.put(keyType, false);
-          keyTypeIsClass = false;
+        // The flag takes 3 values:
+        // true: the key type is a class, so should be the injection target
+        // false: the key type is an interface, so we need to find the class
+        // closest to java.lang.Object which implements the key type
+        // null: we don't know yet because we haven't seen the key type before
+        Boolean keyTypeIsClass = KEY_TYPE_IS_CLASS.get(keyType);
+        if (null != keyTypeIsClass && keyTypeIsClass) {
+            // if we already know the key type is a class,
+            // we must inject into that class.
+            return keyType;
+        }
+        // then we don't know it's a class so need to
+        // follow the type's ancestry to find out
+        TypeDefinition superClass = typeDescription.getSuperClass();
+        String implementingClass = typeDescription.getName();
+        Map<String, Boolean> visitedInterfaces = new HashMap<>();
+        while (null != superClass) {
+            String superClassName = superClass.asErasure().getName();
+            if (null == keyTypeIsClass && keyType.equals(superClassName)) {
+                // short circuit the search with this key type next time
+                KEY_TYPE_IS_CLASS.put(keyType, true);
+                return keyType;
+            }
+            if (hasKeyInterface(superClass, keyType, visitedInterfaces)) {
+                // then the key type must be an interface
+                if (null == keyTypeIsClass) {
+                    KEY_TYPE_IS_CLASS.put(keyType, false);
+                    keyTypeIsClass = false;
+                }
+                implementingClass = superClassName;
+            }
+            superClass = superClass.getSuperClass();
         }
-        implementingClass = superClassName;
-      }
-      superClass = superClass.getSuperClass();
+        return implementingClass;
     }
-    return implementingClass;
-  }
 
-  private static boolean hasKeyInterface(
-      TypeDefinition typeDefinition, String keyType, Map<String, Boolean> visitedInterfaces) {
-    for (TypeDefinition iface : typeDefinition.getInterfaces()) {
-      String interfaceName = iface.asErasure().getName();
-      if (keyType.equals(interfaceName)) {
-        return true;
-      }
-      Boolean foundKeyInterface = visitedInterfaces.get(interfaceName);
-      if (Boolean.TRUE.equals(foundKeyInterface)) {
-        return true; // already know this will lead to the key
-      }
-      if (null == foundKeyInterface) {
-        // avoid cycle issues by assuming we won't find the key
-        visitedInterfaces.put(interfaceName, false);
-        if (hasKeyInterface(iface, keyType, visitedInterfaces)) {
-          visitedInterfaces.put(interfaceName, true); // update assumption
-          return true;
+    private static boolean hasKeyInterface(
+            TypeDefinition typeDefinition, String keyType, Map<String, Boolean> visitedInterfaces) {
+        for (TypeDefinition iface : typeDefinition.getInterfaces()) {
+            String interfaceName = iface.asErasure().getName();
+            if (keyType.equals(interfaceName)) {
+                return true;
+            }
+            Boolean foundKeyInterface = visitedInterfaces.get(interfaceName);
+            if (Boolean.TRUE.equals(foundKeyInterface)) {
+                return true; // already know this will lead to the key
+            }
+            if (null == foundKeyInterface) {
+                // avoid cycle issues by assuming we won't find the key
+                visitedInterfaces.put(interfaceName, false);
+                if (hasKeyInterface(iface, keyType, visitedInterfaces)) {
+                    visitedInterfaces.put(interfaceName, true); // update assumption
+                    return true;
+                }
+            }
         }
-      }
+        return false;
     }
-    return false;
-  }
 
-  /**
-   * Keep track of stores (per-type) where field-injection was explicitly excluded, or we failed to
-   * field-inject them. This is used to decide when to apply store optimizations ahead of loading.
-   */
-  public static void excludeInjectedField(
-      String instrumentedType, String keyType, String valueType) {
-    int storeId = getContextStoreId(keyType, valueType);
-    BitSet weakStoreIdsForType = WEAK_STORE_IDS_BY_TYPE.get(instrumentedType);
-    if (null == weakStoreIdsForType) {
-      BitSet tempStoreIds = new BitSet();
-      tempStoreIds.set(storeId);
-      weakStoreIdsForType = WEAK_STORE_IDS_BY_TYPE.putIfAbsent(instrumentedType, tempStoreIds);
-    }
-    // if we didn't get there first then add this store to the existing set
-    if (null != weakStoreIdsForType) {
-      synchronized (weakStoreIdsForType) {
-        weakStoreIdsForType.set(storeId);
-      }
+    /**
+     * Keep track of stores (per-type) where field-injection was explicitly excluded, or we failed to
+     * field-inject them. This is used to decide when to apply store optimizations ahead of loading.
+     */
+    public static void excludeInjectedField(String instrumentedType, String keyType, String valueType) {
+        int storeId = getContextStoreId(keyType, valueType);
+        BitSet weakStoreIdsForType = WEAK_STORE_IDS_BY_TYPE.get(instrumentedType);
+        if (null == weakStoreIdsForType) {
+            BitSet tempStoreIds = new BitSet();
+            tempStoreIds.set(storeId);
+            weakStoreIdsForType = WEAK_STORE_IDS_BY_TYPE.putIfAbsent(instrumentedType, tempStoreIds);
+        }
+        // if we didn't get there first then add this store to the existing set
+        if (null != weakStoreIdsForType) {
+            synchronized (weakStoreIdsForType) {
+                weakStoreIdsForType.set(storeId);
+            }
+        }
     }
-  }
 
-  /**
-   * Scans the class hierarchy to see if it matches any known context-key types which implies it has
-   * an injected field somewhere. This avoids having to record successful field-injections which can
-   * add up to a lot of entries. Unfortunately we can't check for the marker interface because the
-   * type won't have that at this point.
-   *
-   * <p>At the same time we collect which context stores failed to be field-injected in the class
-   * hierarchy. This tells us when to redirect store requests to the weak-map vs delegating to the
-   * superclass.
-   *
-   * <p>Assumes the type has already been processed by ShouldInjectFieldsMatcher.
-   */
-  public static boolean hasInjectedField(TypeDefinition typeDefinition, BitSet weakStoreIds) {
-    Set<String> visitedInterfaces = new HashSet<>();
-    while (null != typeDefinition) {
-      String className = typeDefinition.asErasure().getName();
-      BitSet weakStoreIdsForType = WEAK_STORE_IDS_BY_TYPE.get(className);
-      if (null != weakStoreIdsForType) {
-        synchronized (weakStoreIdsForType) {
-          weakStoreIds.or(weakStoreIdsForType);
+    /**
+     * Scans the class hierarchy to see if it matches any known context-key types which implies it has
+     * an injected field somewhere. This avoids having to record successful field-injections which can
+     * add up to a lot of entries. Unfortunately we can't check for the marker interface because the
+     * type won't have that at this point.
+     *
+     * <p>At the same time we collect which context stores failed to be field-injected in the class
+     * hierarchy. This tells us when to redirect store requests to the weak-map vs delegating to the
+     * superclass.
+     *
+     * <p>Assumes the type has already been processed by ShouldInjectFieldsMatcher.
+     */
+    public static boolean hasInjectedField(TypeDefinition typeDefinition, BitSet weakStoreIds) {
+        Set<String> visitedInterfaces = new HashSet<>();
+        while (null != typeDefinition) {
+            String className = typeDefinition.asErasure().getName();
+            BitSet weakStoreIdsForType = WEAK_STORE_IDS_BY_TYPE.get(className);
+            if (null != weakStoreIdsForType) {
+                synchronized (weakStoreIdsForType) {
+                    weakStoreIds.or(weakStoreIdsForType);
+                }
+            } else if (KEY_TYPE_IS_CLASS.containsKey(className)
+                    || impliesInjectedField(typeDefinition, visitedInterfaces)) {
+                return true;
+            }
+            typeDefinition = typeDefinition.getSuperClass();
         }
-      } else if (KEY_TYPE_IS_CLASS.containsKey(className)
-          || impliesInjectedField(typeDefinition, visitedInterfaces)) {
-        return true;
-      }
-      typeDefinition = typeDefinition.getSuperClass();
+        return false;
     }
-    return false;
-  }
 
-  /** Scans transitive interfaces to see if any match known context-key types. */
-  private static boolean impliesInjectedField(
-      final TypeDefinition typeDefinition, final Set<String> visitedInterfaces) {
-    for (TypeDefinition iface : typeDefinition.getInterfaces()) {
-      String interfaceName = iface.asErasure().getName();
-      if (KEY_TYPE_IS_CLASS.containsKey(interfaceName)
-          || (visitedInterfaces.add(interfaceName)
-              && impliesInjectedField(iface, visitedInterfaces))) {
-        return true;
-      }
+    /** Scans transitive interfaces to see if any match known context-key types. */
+    private static boolean impliesInjectedField(
+            final TypeDefinition typeDefinition, final Set<String> visitedInterfaces) {
+        for (TypeDefinition iface : typeDefinition.getInterfaces()) {
+            String interfaceName = iface.asErasure().getName();
+            if (KEY_TYPE_IS_CLASS.containsKey(interfaceName)
+                    || (visitedInterfaces.add(interfaceName) && impliesInjectedField(iface, visitedInterfaces))) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/asm/SerialVersionUIDAdder.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/asm/SerialVersionUIDAdder.java
index 037d3770407..29d79b4bbca 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/asm/SerialVersionUIDAdder.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/asm/SerialVersionUIDAdder.java
@@ -111,382 +111,364 @@
 // DontCheck(AbbreviationAsWordInName): can't be renamed (for backward binary compatibility).
 public class SerialVersionUIDAdder extends ClassVisitor {
 
-  /** The JVM name of static initializer methods. */
-  private static final String CLINIT = "<clinit>";
+    /** The JVM name of static initializer methods. */
+    private static final String CLINIT = "<clinit>";
 
-  /** A flag that indicates if we need to compute SVUID. */
-  private boolean computeSvuid;
+    /** A flag that indicates if we need to compute SVUID. */
+    private boolean computeSvuid;
 
-  /** Whether the class already has a SVUID. */
-  private boolean hasSvuid;
+    /** Whether the class already has a SVUID. */
+    private boolean hasSvuid;
 
-  /** The class access flags. */
-  private int access;
+    /** The class access flags. */
+    private int access;
 
-  /** The internal name of the class. */
-  private String name;
+    /** The internal name of the class. */
+    private String name;
 
-  /** The interfaces implemented by the class. */
-  private String[] interfaces;
+    /** The interfaces implemented by the class. */
+    private String[] interfaces;
 
-  /** The fields of the class that are needed to compute the SVUID. */
-  private Collection<Item> svuidFields;
+    /** The fields of the class that are needed to compute the SVUID. */
+    private Collection<Item> svuidFields;
 
-  /** Whether the class has a static initializer. */
-  private boolean hasStaticInitializer;
+    /** Whether the class has a static initializer. */
+    private boolean hasStaticInitializer;
 
-  /** The constructors of the class that are needed to compute the SVUID. */
-  private Collection<Item> svuidConstructors;
+    /** The constructors of the class that are needed to compute the SVUID. */
+    private Collection<Item> svuidConstructors;
 
-  /** The methods of the class that are needed to compute the SVUID. */
-  private Collection<Item> svuidMethods;
+    /** The methods of the class that are needed to compute the SVUID. */
+    private Collection<Item> svuidMethods;
 
-  /**
-   * Constructs a new {@link SerialVersionUIDAdder}. <i>Subclasses must not use this
-   * constructor</i>. Instead, they must use the {@link #SerialVersionUIDAdder(int, ClassVisitor)}
-   * version.
-   *
-   * @param classVisitor a {@link ClassVisitor} to which this visitor will delegate calls.
-   * @throws IllegalStateException If a subclass calls this constructor.
-   */
-  public SerialVersionUIDAdder(final ClassVisitor classVisitor) {
-    this(/* latest api = */ Opcodes.ASM9, classVisitor);
-    if (getClass() != SerialVersionUIDAdder.class) {
-      throw new IllegalStateException();
+    /**
+     * Constructs a new {@link SerialVersionUIDAdder}. <i>Subclasses must not use this
+     * constructor</i>. Instead, they must use the {@link #SerialVersionUIDAdder(int, ClassVisitor)}
+     * version.
+     *
+     * @param classVisitor a {@link ClassVisitor} to which this visitor will delegate calls.
+     * @throws IllegalStateException If a subclass calls this constructor.
+     */
+    public SerialVersionUIDAdder(final ClassVisitor classVisitor) {
+        this(/* latest api = */ Opcodes.ASM9, classVisitor);
+        if (getClass() != SerialVersionUIDAdder.class) {
+            throw new IllegalStateException();
+        }
     }
-  }
-
-  /**
-   * Constructs a new {@link SerialVersionUIDAdder}.
-   *
-   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
-   *     ASM}<i>x</i> values in {@link Opcodes}.
-   * @param classVisitor a {@link ClassVisitor} to which this visitor will delegate calls.
-   */
-  protected SerialVersionUIDAdder(final int api, final ClassVisitor classVisitor) {
-    super(api, classVisitor);
-  }
-
-  // -----------------------------------------------------------------------------------------------
-  // Overridden methods
-  // -----------------------------------------------------------------------------------------------
-
-  @Override
-  public void visit(
-      final int version,
-      final int access,
-      final String name,
-      final String signature,
-      final String superName,
-      final String[] interfaces) {
-    // Get the class name, access flags, and interfaces information (step 1, 2 and 3) for SVUID
-    // computation.
-    computeSvuid = name != null && (access & Opcodes.ACC_ENUM) == 0;
-
-    if (computeSvuid) {
-      this.name = name;
-      this.access = access;
-      this.interfaces = interfaces.clone();
-      this.svuidFields = new ArrayList<>();
-      this.svuidConstructors = new ArrayList<>();
-      this.svuidMethods = new ArrayList<>();
+
+    /**
+     * Constructs a new {@link SerialVersionUIDAdder}.
+     *
+     * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+     *     ASM}<i>x</i> values in {@link Opcodes}.
+     * @param classVisitor a {@link ClassVisitor} to which this visitor will delegate calls.
+     */
+    protected SerialVersionUIDAdder(final int api, final ClassVisitor classVisitor) {
+        super(api, classVisitor);
     }
 
-    super.visit(version, access, name, signature, superName, interfaces);
-  }
-
-  @Override
-  public MethodVisitor visitMethod(
-      final int access,
-      final String name,
-      final String descriptor,
-      final String signature,
-      final String[] exceptions) {
-    // Get constructor and method information (step 5 and 7). Also determine if there is a class
-    // initializer (step 6).
-    if (computeSvuid) {
-      if (CLINIT.equals(name)) {
-        hasStaticInitializer = true;
-      }
-      // Collect the non private constructors and methods. Only the ACC_PUBLIC, ACC_PRIVATE,
-      // ACC_PROTECTED, ACC_STATIC, ACC_FINAL, ACC_SYNCHRONIZED, ACC_NATIVE, ACC_ABSTRACT and
-      // ACC_STRICT flags are used.
-      int mods =
-          access
-              & (Opcodes.ACC_PUBLIC
-                  | Opcodes.ACC_PRIVATE
-                  | Opcodes.ACC_PROTECTED
-                  | Opcodes.ACC_STATIC
-                  | Opcodes.ACC_FINAL
-                  | Opcodes.ACC_SYNCHRONIZED
-                  | Opcodes.ACC_NATIVE
-                  | Opcodes.ACC_ABSTRACT
-                  | Opcodes.ACC_STRICT);
-
-      if ((access & Opcodes.ACC_PRIVATE) == 0) {
-        if ("<init>".equals(name)) {
-          svuidConstructors.add(new Item(name, mods, descriptor));
-        } else if (!CLINIT.equals(name)) {
-          svuidMethods.add(new Item(name, mods, descriptor));
+    // -----------------------------------------------------------------------------------------------
+    // Overridden methods
+    // -----------------------------------------------------------------------------------------------
+
+    @Override
+    public void visit(
+            final int version,
+            final int access,
+            final String name,
+            final String signature,
+            final String superName,
+            final String[] interfaces) {
+        // Get the class name, access flags, and interfaces information (step 1, 2 and 3) for SVUID
+        // computation.
+        computeSvuid = name != null && (access & Opcodes.ACC_ENUM) == 0;
+
+        if (computeSvuid) {
+            this.name = name;
+            this.access = access;
+            this.interfaces = interfaces.clone();
+            this.svuidFields = new ArrayList<>();
+            this.svuidConstructors = new ArrayList<>();
+            this.svuidMethods = new ArrayList<>();
         }
-      }
-    }
 
-    return super.visitMethod(access, name, descriptor, signature, exceptions);
-  }
-
-  @Override
-  public FieldVisitor visitField(
-      final int access,
-      final String name,
-      final String desc,
-      final String signature,
-      final Object value) {
-    // Get the class field information for step 4 of the algorithm. Also determine if the class
-    // already has a SVUID.
-    if (computeSvuid) {
-      if ("serialVersionUID".equals(name)) {
-        // Since the class already has SVUID, we won't be computing it.
-        computeSvuid = false;
-        hasSvuid = true;
-      }
-      // Collect the non private fields. Only the ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED,
-      // ACC_STATIC, ACC_FINAL, ACC_VOLATILE, and ACC_TRANSIENT flags are used when computing
-      // serialVersionUID values.
-      if ((access & Opcodes.ACC_PRIVATE) == 0
-          || (access & (Opcodes.ACC_STATIC | Opcodes.ACC_TRANSIENT)) == 0) {
-        int mods =
-            access
-                & (Opcodes.ACC_PUBLIC
-                    | Opcodes.ACC_PRIVATE
-                    | Opcodes.ACC_PROTECTED
-                    | Opcodes.ACC_STATIC
-                    | Opcodes.ACC_FINAL
-                    | Opcodes.ACC_VOLATILE
-                    | Opcodes.ACC_TRANSIENT);
-        svuidFields.add(new Item(name, mods, desc));
-      }
+        super.visit(version, access, name, signature, superName, interfaces);
     }
 
-    return super.visitField(access, name, desc, signature, value);
-  }
-
-  @Override
-  public void visitInnerClass(
-      final String innerClassName,
-      final String outerName,
-      final String innerName,
-      final int innerClassAccess) {
-    // Handles a bizarre special case. Nested classes (static classes declared inside another class)
-    // that are protected have their access bit set to public in their class files to deal with some
-    // odd reflection situation. Our SVUID computation must do as the JVM does and ignore access
-    // bits in the class file in favor of the access bits of the InnerClass attribute.
-    if ((name != null) && name.equals(innerClassName)) {
-      this.access = innerClassAccess;
-    }
-    super.visitInnerClass(innerClassName, outerName, innerName, innerClassAccess);
-  }
-
-  @Override
-  public void visitEnd() {
-    // Add the SVUID field to the class if it doesn't have one.
-    if (computeSvuid && !hasSvuid) {
-      try {
-        addSVUID(computeSVUID());
-      } catch (IOException e) {
-        throw new IllegalStateException("Error while computing SVUID for " + name, e);
-      }
-    }
+    @Override
+    public MethodVisitor visitMethod(
+            final int access,
+            final String name,
+            final String descriptor,
+            final String signature,
+            final String[] exceptions) {
+        // Get constructor and method information (step 5 and 7). Also determine if there is a class
+        // initializer (step 6).
+        if (computeSvuid) {
+            if (CLINIT.equals(name)) {
+                hasStaticInitializer = true;
+            }
+            // Collect the non private constructors and methods. Only the ACC_PUBLIC, ACC_PRIVATE,
+            // ACC_PROTECTED, ACC_STATIC, ACC_FINAL, ACC_SYNCHRONIZED, ACC_NATIVE, ACC_ABSTRACT and
+            // ACC_STRICT flags are used.
+            int mods = access
+                    & (Opcodes.ACC_PUBLIC
+                            | Opcodes.ACC_PRIVATE
+                            | Opcodes.ACC_PROTECTED
+                            | Opcodes.ACC_STATIC
+                            | Opcodes.ACC_FINAL
+                            | Opcodes.ACC_SYNCHRONIZED
+                            | Opcodes.ACC_NATIVE
+                            | Opcodes.ACC_ABSTRACT
+                            | Opcodes.ACC_STRICT);
+
+            if ((access & Opcodes.ACC_PRIVATE) == 0) {
+                if ("<init>".equals(name)) {
+                    svuidConstructors.add(new Item(name, mods, descriptor));
+                } else if (!CLINIT.equals(name)) {
+                    svuidMethods.add(new Item(name, mods, descriptor));
+                }
+            }
+        }
 
-    super.visitEnd();
-  }
-
-  // -----------------------------------------------------------------------------------------------
-  // Utility methods
-  // -----------------------------------------------------------------------------------------------
-
-  /**
-   * Returns true if the class already has a SVUID field. The result of this method is only valid
-   * when visitEnd has been called.
-   *
-   * @return true if the class already has a SVUID field.
-   */
-  // DontCheck(AbbreviationAsWordInName): can't be renamed (for backward binary compatibility).
-  public boolean hasSVUID() {
-    return hasSvuid;
-  }
-
-  /**
-   * Adds a final static serialVersionUID field to the class, with the given value.
-   *
-   * @param svuid the serialVersionUID field value.
-   */
-  // DontCheck(AbbreviationAsWordInName): can't be renamed (for backward binary compatibility).
-  protected void addSVUID(final long svuid) {
-    FieldVisitor fieldVisitor =
-        super.visitField(
-            Opcodes.ACC_FINAL + Opcodes.ACC_STATIC, "serialVersionUID", "J", null, svuid);
-    if (fieldVisitor != null) {
-      fieldVisitor.visitEnd();
+        return super.visitMethod(access, name, descriptor, signature, exceptions);
     }
-  }
-
-  /**
-   * Computes and returns the value of SVUID.
-   *
-   * @return the serial version UID.
-   * @throws IOException if an I/O error occurs.
-   */
-  // DontCheck(AbbreviationAsWordInName): can't be renamed (for backward binary compatibility).
-  protected long computeSVUID() throws IOException {
-    long svuid = 0;
-
-    try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream)) {
-
-      // 1. The class name written using UTF encoding.
-      dataOutputStream.writeUTF(name.replace('/', '.'));
-
-      // 2. The class modifiers written as a 32-bit integer.
-      int mods = access;
-      if ((mods & Opcodes.ACC_INTERFACE) != 0) {
-        mods =
-            svuidMethods.isEmpty() ? (mods & ~Opcodes.ACC_ABSTRACT) : (mods | Opcodes.ACC_ABSTRACT);
-      }
-      dataOutputStream.writeInt(
-          mods
-              & (Opcodes.ACC_PUBLIC
-                  | Opcodes.ACC_FINAL
-                  | Opcodes.ACC_INTERFACE
-                  | Opcodes.ACC_ABSTRACT));
-
-      // 3. The name of each interface sorted by name written using UTF encoding.
-      Arrays.sort(interfaces);
-      for (String interfaceName : interfaces) {
-        dataOutputStream.writeUTF(interfaceName.replace('/', '.'));
-      }
-
-      // 4. For each field of the class sorted by field name (except private static and private
-      // transient fields):
-      //   1. The name of the field in UTF encoding.
-      //   2. The modifiers of the field written as a 32-bit integer.
-      //   3. The descriptor of the field in UTF encoding.
-      // Note that field signatures are not dot separated. Method and constructor signatures are dot
-      // separated. Go figure...
-      writeItems(svuidFields, dataOutputStream, false);
-
-      // 5. If a class initializer exists, write out the following:
-      //   1. The name of the method, <clinit>, in UTF encoding.
-      //   2. The modifier of the method, ACC_STATIC, written as a 32-bit integer.
-      //   3. The descriptor of the method, ()V, in UTF encoding.
-      if (hasStaticInitializer) {
-        dataOutputStream.writeUTF(CLINIT);
-        dataOutputStream.writeInt(Opcodes.ACC_STATIC);
-        dataOutputStream.writeUTF("()V");
-      }
-
-      // 6. For each non-private constructor sorted by method name and signature:
-      //   1. The name of the method, <init>, in UTF encoding.
-      //   2. The modifiers of the method written as a 32-bit integer.
-      //   3. The descriptor of the method in UTF encoding.
-      writeItems(svuidConstructors, dataOutputStream, true);
-
-      // 7. For each non-private method sorted by method name and signature:
-      //   1. The name of the method in UTF encoding.
-      //   2. The modifiers of the method written as a 32-bit integer.
-      //   3. The descriptor of the method in UTF encoding.
-      writeItems(svuidMethods, dataOutputStream, true);
-
-      dataOutputStream.flush();
-
-      // 8. The SHA-1 algorithm is executed on the stream of bytes produced by DataOutputStream and
-      // produces five 32-bit values sha[0..4].
-      byte[] hashBytes = computeSHAdigest(byteArrayOutputStream.toByteArray());
-
-      // 9. The hash value is assembled from the first and second 32-bit values of the SHA-1 message
-      // digest. If the result of the message digest, the five 32-bit words H0 H1 H2 H3 H4, is in an
-      // array of five int values named sha, the hash value would be computed as follows:
-      for (int i = Math.min(hashBytes.length, 8) - 1; i >= 0; i--) {
-        svuid = (svuid << 8) | (hashBytes[i] & 0xFF);
-      }
+
+    @Override
+    public FieldVisitor visitField(
+            final int access, final String name, final String desc, final String signature, final Object value) {
+        // Get the class field information for step 4 of the algorithm. Also determine if the class
+        // already has a SVUID.
+        if (computeSvuid) {
+            if ("serialVersionUID".equals(name)) {
+                // Since the class already has SVUID, we won't be computing it.
+                computeSvuid = false;
+                hasSvuid = true;
+            }
+            // Collect the non private fields. Only the ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED,
+            // ACC_STATIC, ACC_FINAL, ACC_VOLATILE, and ACC_TRANSIENT flags are used when computing
+            // serialVersionUID values.
+            if ((access & Opcodes.ACC_PRIVATE) == 0 || (access & (Opcodes.ACC_STATIC | Opcodes.ACC_TRANSIENT)) == 0) {
+                int mods = access
+                        & (Opcodes.ACC_PUBLIC
+                                | Opcodes.ACC_PRIVATE
+                                | Opcodes.ACC_PROTECTED
+                                | Opcodes.ACC_STATIC
+                                | Opcodes.ACC_FINAL
+                                | Opcodes.ACC_VOLATILE
+                                | Opcodes.ACC_TRANSIENT);
+                svuidFields.add(new Item(name, mods, desc));
+            }
+        }
+
+        return super.visitField(access, name, desc, signature, value);
     }
 
-    return svuid;
-  }
-
-  /**
-   * Returns the SHA-1 message digest of the given value.
-   *
-   * @param value the value whose SHA message digest must be computed.
-   * @return the SHA-1 message digest of the given value.
-   */
-  // DontCheck(AbbreviationAsWordInName): can't be renamed (for backward binary compatibility).
-  protected byte[] computeSHAdigest(final byte[] value) {
-    try {
-      return MessageDigest.getInstance("SHA-1").digest(value);
-    } catch (NoSuchAlgorithmException e) {
-      throw new UnsupportedOperationException(e);
+    @Override
+    public void visitInnerClass(
+            final String innerClassName, final String outerName, final String innerName, final int innerClassAccess) {
+        // Handles a bizarre special case. Nested classes (static classes declared inside another class)
+        // that are protected have their access bit set to public in their class files to deal with some
+        // odd reflection situation. Our SVUID computation must do as the JVM does and ignore access
+        // bits in the class file in favor of the access bits of the InnerClass attribute.
+        if ((name != null) && name.equals(innerClassName)) {
+            this.access = innerClassAccess;
+        }
+        super.visitInnerClass(innerClassName, outerName, innerName, innerClassAccess);
     }
-  }
-
-  /**
-   * Sorts the items in the collection and writes it to the given output stream.
-   *
-   * @param itemCollection a collection of items.
-   * @param dataOutputStream where the items must be written.
-   * @param dotted whether package names must use dots, instead of slashes.
-   * @exception IOException if an error occurs.
-   */
-  private static void writeItems(
-      final Collection<Item> itemCollection,
-      final DataOutput dataOutputStream,
-      final boolean dotted)
-      throws IOException {
-    Item[] items = itemCollection.toArray(new Item[0]);
-    Arrays.sort(items);
-    for (Item item : items) {
-      dataOutputStream.writeUTF(item.name);
-      dataOutputStream.writeInt(item.access);
-      dataOutputStream.writeUTF(dotted ? item.descriptor.replace('/', '.') : item.descriptor);
+
+    @Override
+    public void visitEnd() {
+        // Add the SVUID field to the class if it doesn't have one.
+        if (computeSvuid && !hasSvuid) {
+            try {
+                addSVUID(computeSVUID());
+            } catch (IOException e) {
+                throw new IllegalStateException("Error while computing SVUID for " + name, e);
+            }
+        }
+
+        super.visitEnd();
     }
-  }
 
-  // -----------------------------------------------------------------------------------------------
-  // Inner classes
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Utility methods
+    // -----------------------------------------------------------------------------------------------
+
+    /**
+     * Returns true if the class already has a SVUID field. The result of this method is only valid
+     * when visitEnd has been called.
+     *
+     * @return true if the class already has a SVUID field.
+     */
+    // DontCheck(AbbreviationAsWordInName): can't be renamed (for backward binary compatibility).
+    public boolean hasSVUID() {
+        return hasSvuid;
+    }
 
-  private static final class Item implements Comparable<Item> {
+    /**
+     * Adds a final static serialVersionUID field to the class, with the given value.
+     *
+     * @param svuid the serialVersionUID field value.
+     */
+    // DontCheck(AbbreviationAsWordInName): can't be renamed (for backward binary compatibility).
+    protected void addSVUID(final long svuid) {
+        FieldVisitor fieldVisitor =
+                super.visitField(Opcodes.ACC_FINAL + Opcodes.ACC_STATIC, "serialVersionUID", "J", null, svuid);
+        if (fieldVisitor != null) {
+            fieldVisitor.visitEnd();
+        }
+    }
 
-    final String name;
-    final int access;
-    final String descriptor;
+    /**
+     * Computes and returns the value of SVUID.
+     *
+     * @return the serial version UID.
+     * @throws IOException if an I/O error occurs.
+     */
+    // DontCheck(AbbreviationAsWordInName): can't be renamed (for backward binary compatibility).
+    protected long computeSVUID() throws IOException {
+        long svuid = 0;
+
+        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+                DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream)) {
+
+            // 1. The class name written using UTF encoding.
+            dataOutputStream.writeUTF(name.replace('/', '.'));
+
+            // 2. The class modifiers written as a 32-bit integer.
+            int mods = access;
+            if ((mods & Opcodes.ACC_INTERFACE) != 0) {
+                mods = svuidMethods.isEmpty() ? (mods & ~Opcodes.ACC_ABSTRACT) : (mods | Opcodes.ACC_ABSTRACT);
+            }
+            dataOutputStream.writeInt(
+                    mods & (Opcodes.ACC_PUBLIC | Opcodes.ACC_FINAL | Opcodes.ACC_INTERFACE | Opcodes.ACC_ABSTRACT));
+
+            // 3. The name of each interface sorted by name written using UTF encoding.
+            Arrays.sort(interfaces);
+            for (String interfaceName : interfaces) {
+                dataOutputStream.writeUTF(interfaceName.replace('/', '.'));
+            }
+
+            // 4. For each field of the class sorted by field name (except private static and private
+            // transient fields):
+            //   1. The name of the field in UTF encoding.
+            //   2. The modifiers of the field written as a 32-bit integer.
+            //   3. The descriptor of the field in UTF encoding.
+            // Note that field signatures are not dot separated. Method and constructor signatures are dot
+            // separated. Go figure...
+            writeItems(svuidFields, dataOutputStream, false);
+
+            // 5. If a class initializer exists, write out the following:
+            //   1. The name of the method, <clinit>, in UTF encoding.
+            //   2. The modifier of the method, ACC_STATIC, written as a 32-bit integer.
+            //   3. The descriptor of the method, ()V, in UTF encoding.
+            if (hasStaticInitializer) {
+                dataOutputStream.writeUTF(CLINIT);
+                dataOutputStream.writeInt(Opcodes.ACC_STATIC);
+                dataOutputStream.writeUTF("()V");
+            }
+
+            // 6. For each non-private constructor sorted by method name and signature:
+            //   1. The name of the method, <init>, in UTF encoding.
+            //   2. The modifiers of the method written as a 32-bit integer.
+            //   3. The descriptor of the method in UTF encoding.
+            writeItems(svuidConstructors, dataOutputStream, true);
+
+            // 7. For each non-private method sorted by method name and signature:
+            //   1. The name of the method in UTF encoding.
+            //   2. The modifiers of the method written as a 32-bit integer.
+            //   3. The descriptor of the method in UTF encoding.
+            writeItems(svuidMethods, dataOutputStream, true);
+
+            dataOutputStream.flush();
+
+            // 8. The SHA-1 algorithm is executed on the stream of bytes produced by DataOutputStream and
+            // produces five 32-bit values sha[0..4].
+            byte[] hashBytes = computeSHAdigest(byteArrayOutputStream.toByteArray());
+
+            // 9. The hash value is assembled from the first and second 32-bit values of the SHA-1 message
+            // digest. If the result of the message digest, the five 32-bit words H0 H1 H2 H3 H4, is in an
+            // array of five int values named sha, the hash value would be computed as follows:
+            for (int i = Math.min(hashBytes.length, 8) - 1; i >= 0; i--) {
+                svuid = (svuid << 8) | (hashBytes[i] & 0xFF);
+            }
+        }
 
-    Item(final String name, final int access, final String descriptor) {
-      this.name = name;
-      this.access = access;
-      this.descriptor = descriptor;
+        return svuid;
     }
 
-    @Override
-    public int compareTo(final Item item) {
-      int result = name.compareTo(item.name);
-      if (result == 0) {
-        result = descriptor.compareTo(item.descriptor);
-      }
-      return result;
+    /**
+     * Returns the SHA-1 message digest of the given value.
+     *
+     * @param value the value whose SHA message digest must be computed.
+     * @return the SHA-1 message digest of the given value.
+     */
+    // DontCheck(AbbreviationAsWordInName): can't be renamed (for backward binary compatibility).
+    protected byte[] computeSHAdigest(final byte[] value) {
+        try {
+            return MessageDigest.getInstance("SHA-1").digest(value);
+        } catch (NoSuchAlgorithmException e) {
+            throw new UnsupportedOperationException(e);
+        }
     }
 
-    @Override
-    public boolean equals(final Object other) {
-      if (other instanceof Item) {
-        return compareTo((Item) other) == 0;
-      }
-      return false;
+    /**
+     * Sorts the items in the collection and writes it to the given output stream.
+     *
+     * @param itemCollection a collection of items.
+     * @param dataOutputStream where the items must be written.
+     * @param dotted whether package names must use dots, instead of slashes.
+     * @exception IOException if an error occurs.
+     */
+    private static void writeItems(
+            final Collection<Item> itemCollection, final DataOutput dataOutputStream, final boolean dotted)
+            throws IOException {
+        Item[] items = itemCollection.toArray(new Item[0]);
+        Arrays.sort(items);
+        for (Item item : items) {
+            dataOutputStream.writeUTF(item.name);
+            dataOutputStream.writeInt(item.access);
+            dataOutputStream.writeUTF(dotted ? item.descriptor.replace('/', '.') : item.descriptor);
+        }
     }
 
-    @Override
-    public int hashCode() {
-      return name.hashCode() ^ descriptor.hashCode();
+    // -----------------------------------------------------------------------------------------------
+    // Inner classes
+    // -----------------------------------------------------------------------------------------------
+
+    private static final class Item implements Comparable<Item> {
+
+        final String name;
+        final int access;
+        final String descriptor;
+
+        Item(final String name, final int access, final String descriptor) {
+            this.name = name;
+            this.access = access;
+            this.descriptor = descriptor;
+        }
+
+        @Override
+        public int compareTo(final Item item) {
+            int result = name.compareTo(item.name);
+            if (result == 0) {
+                result = descriptor.compareTo(item.descriptor);
+            }
+            return result;
+        }
+
+        @Override
+        public boolean equals(final Object other) {
+            if (other instanceof Item) {
+                return compareTo((Item) other) == 0;
+            }
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return name.hashCode() ^ descriptor.hashCode();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/CallSite.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/CallSite.java
index 9900fe5a573..06f4fbe90e1 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/CallSite.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/CallSite.java
@@ -10,93 +10,93 @@
 @Retention(RetentionPolicy.CLASS)
 public @interface CallSite {
 
-  /** Interfaces to be used for SPI injection */
-  Class<?>[] spi();
-
-  /** Enable or disable the call site: (fully qualified name, method name and arguments) */
-  String[] enabled() default {};
-
-  /** Helper classes for the advice */
-  Class<?>[] helpers() default {};
-
-  @Target(ElementType.METHOD)
-  @Retention(RetentionPolicy.CLASS)
-  @Repeatable(AfterArray.class)
-  @interface After {
-    /**
-     * Pointcut expression for the advice (e.g. {@code java.lang.StringBuilder
-     * java.lang.StringBuilder.append(java.lang.String)})
-     */
-    String value();
-
-    boolean invokeDynamic() default false;
-  }
-
-  @Target(ElementType.METHOD)
-  @Retention(RetentionPolicy.CLASS)
-  @interface AfterArray {
-    After[] value();
-  }
-
-  @Target(ElementType.METHOD)
-  @Retention(RetentionPolicy.CLASS)
-  @Repeatable(AroundArray.class)
-  @interface Around {
-    /**
-     * Pointcut expression for the advice (e.g. {@code java.lang.StringBuilder
-     * java.lang.StringBuilder.append(java.lang.String)})
-     */
-    String value();
-
-    boolean invokeDynamic() default false;
-  }
-
-  @Target(ElementType.METHOD)
-  @Retention(RetentionPolicy.CLASS)
-  @interface AroundArray {
-    Around[] value();
-  }
-
-  @Target(ElementType.METHOD)
-  @Retention(RetentionPolicy.CLASS)
-  @Repeatable(BeforeArray.class)
-  @interface Before {
-    /**
-     * Pointcut expression for the advice (e.g. {@code java.lang.StringBuilder
-     * java.lang.StringBuilder.append(java.lang.String)})
-     */
-    String value();
-
-    boolean invokeDynamic() default false;
-  }
-
-  @Target(ElementType.METHOD)
-  @Retention(RetentionPolicy.CLASS)
-  @interface BeforeArray {
-    Before[] value();
-  }
-
-  @Target(ElementType.PARAMETER)
-  @Retention(RetentionPolicy.CLASS)
-  @interface This {}
-
-  @Target(ElementType.PARAMETER)
-  @Retention(RetentionPolicy.CLASS)
-  @interface Argument {
-    int value() default -1;
-  }
-
-  @Target(ElementType.PARAMETER)
-  @Retention(RetentionPolicy.CLASS)
-  @interface AllArguments {
-    boolean includeThis() default false;
-  }
-
-  @Target(ElementType.PARAMETER)
-  @Retention(RetentionPolicy.CLASS)
-  @interface InvokeDynamicConstants {}
-
-  @Target(ElementType.PARAMETER)
-  @Retention(RetentionPolicy.CLASS)
-  @interface Return {}
+    /** Interfaces to be used for SPI injection */
+    Class<?>[] spi();
+
+    /** Enable or disable the call site: (fully qualified name, method name and arguments) */
+    String[] enabled() default {};
+
+    /** Helper classes for the advice */
+    Class<?>[] helpers() default {};
+
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.CLASS)
+    @Repeatable(AfterArray.class)
+    @interface After {
+        /**
+         * Pointcut expression for the advice (e.g. {@code java.lang.StringBuilder
+         * java.lang.StringBuilder.append(java.lang.String)})
+         */
+        String value();
+
+        boolean invokeDynamic() default false;
+    }
+
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.CLASS)
+    @interface AfterArray {
+        After[] value();
+    }
+
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.CLASS)
+    @Repeatable(AroundArray.class)
+    @interface Around {
+        /**
+         * Pointcut expression for the advice (e.g. {@code java.lang.StringBuilder
+         * java.lang.StringBuilder.append(java.lang.String)})
+         */
+        String value();
+
+        boolean invokeDynamic() default false;
+    }
+
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.CLASS)
+    @interface AroundArray {
+        Around[] value();
+    }
+
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.CLASS)
+    @Repeatable(BeforeArray.class)
+    @interface Before {
+        /**
+         * Pointcut expression for the advice (e.g. {@code java.lang.StringBuilder
+         * java.lang.StringBuilder.append(java.lang.String)})
+         */
+        String value();
+
+        boolean invokeDynamic() default false;
+    }
+
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.CLASS)
+    @interface BeforeArray {
+        Before[] value();
+    }
+
+    @Target(ElementType.PARAMETER)
+    @Retention(RetentionPolicy.CLASS)
+    @interface This {}
+
+    @Target(ElementType.PARAMETER)
+    @Retention(RetentionPolicy.CLASS)
+    @interface Argument {
+        int value() default -1;
+    }
+
+    @Target(ElementType.PARAMETER)
+    @Retention(RetentionPolicy.CLASS)
+    @interface AllArguments {
+        boolean includeThis() default false;
+    }
+
+    @Target(ElementType.PARAMETER)
+    @Retention(RetentionPolicy.CLASS)
+    @interface InvokeDynamicConstants {}
+
+    @Target(ElementType.PARAMETER)
+    @Retention(RetentionPolicy.CLASS)
+    @interface Return {}
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/CallSiteAdvice.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/CallSiteAdvice.java
index dbe925c7b8a..3ae10444969 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/CallSiteAdvice.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/CallSiteAdvice.java
@@ -4,81 +4,78 @@
 
 public interface CallSiteAdvice {
 
-  interface MethodHandler {
-
-    /** Executes an instruction without parameters */
-    void instruction(int opcode);
-
-    /** Executes an instruction with an int parameter */
-    void instruction(final int opcode, final int parameter);
-
-    /** Executes an instruction with a type parameter */
-    void instruction(int opcode, String type);
-
-    /** Loads a constant into the stack */
-    void loadConstant(Object constant);
-
-    /** Loads an array of constants into the stack as a reference of type <code>Object[]</code> */
-    void loadConstantArray(Object[] array);
-
-    /** Performs a field access invocation (static, special, virtual, interface...) */
-    void field(int opcode, String owner, String field, String descriptor);
-
-    /** Performs a method invocation (static, special, virtual, interface...) */
-    void method(int opcode, String owner, String name, String descriptor, boolean isInterface);
-
-    /** Performs an advice invocation (always static) */
-    void advice(String owner, String name, String descriptor);
-
-    /** Performs a dynamic method invocation */
-    void invokeDynamic(
-        String name,
-        String descriptor,
-        Handle bootstrapMethodHandle,
-        Object... bootstrapMethodArguments);
-
-    /** Duplicates all the method parameters in the stack just before the method is invoked. */
-    void dupParameters(String methodDescriptor, StackDupMode mode);
-
-    /**
-     * Duplicates the specified method parameters in the stack just before the method is invoked.
-     *
-     * @param owner if this is an instance method (but the advice method doesn't have any parameter
-     *     annotated with @This), then the owner of the method invocation. Otherwise <code>null
-     *     </code>.
-     */
-    void dupParameters(String methodDescriptor, int[] indexes, String owner);
-
-    /**
-     * Duplicates the <code>this</code> reference and all the method parameters in the stack just
-     * before the method is invoked (only for instance methods for obvious reasons).
-     */
-    void dupInvoke(String owner, String methodDescriptor, StackDupMode mode);
-
-    /** Variant taking positional (partial or non-sequential) argument injection. */
-    void dupInvoke(String owner, String methodDescriptor, int[] parameterIndices);
-  }
-
-  /** This enumeration describes how to duplicate the parameters in the stack */
-  enum StackDupMode {
-    /** Create a 1-1 copy of the parameters */
-    COPY,
-    /** Copies the parameters in an array and prepends it */
-    PREPEND_ARRAY,
-    /** Copies the parameters in an array and adds it between NEW and DUP opcodes */
-    PREPEND_ARRAY_CTOR,
-    /** Copies the parameters in an array and adds it before the uninitialized instance in a ctor */
-    PREPEND_ARRAY_SUPER_CTOR,
-    /** Copies the parameters in an array and appends it */
-    APPEND_ARRAY
-  }
-
-  abstract class AdviceType {
-
-    private AdviceType() {}
-
-    public static final byte BEFORE = -1;
-    public static final byte AROUND = 0;
-    public static final byte AFTER = 1;
-  }
+    interface MethodHandler {
+
+        /** Executes an instruction without parameters */
+        void instruction(int opcode);
+
+        /** Executes an instruction with an int parameter */
+        void instruction(final int opcode, final int parameter);
+
+        /** Executes an instruction with a type parameter */
+        void instruction(int opcode, String type);
+
+        /** Loads a constant into the stack */
+        void loadConstant(Object constant);
+
+        /** Loads an array of constants into the stack as a reference of type <code>Object[]</code> */
+        void loadConstantArray(Object[] array);
+
+        /** Performs a field access invocation (static, special, virtual, interface...) */
+        void field(int opcode, String owner, String field, String descriptor);
+
+        /** Performs a method invocation (static, special, virtual, interface...) */
+        void method(int opcode, String owner, String name, String descriptor, boolean isInterface);
+
+        /** Performs an advice invocation (always static) */
+        void advice(String owner, String name, String descriptor);
+
+        /** Performs a dynamic method invocation */
+        void invokeDynamic(
+                String name, String descriptor, Handle bootstrapMethodHandle, Object... bootstrapMethodArguments);
+
+        /** Duplicates all the method parameters in the stack just before the method is invoked. */
+        void dupParameters(String methodDescriptor, StackDupMode mode);
+
+        /**
+         * Duplicates the specified method parameters in the stack just before the method is invoked.
+         *
+         * @param owner if this is an instance method (but the advice method doesn't have any parameter
+         *     annotated with @This), then the owner of the method invocation. Otherwise <code>null
+         *     </code>.
+         */
+        void dupParameters(String methodDescriptor, int[] indexes, String owner);
+
+        /**
+         * Duplicates the <code>this</code> reference and all the method parameters in the stack just
+         * before the method is invoked (only for instance methods for obvious reasons).
+         */
+        void dupInvoke(String owner, String methodDescriptor, StackDupMode mode);
+
+        /** Variant taking positional (partial or non-sequential) argument injection. */
+        void dupInvoke(String owner, String methodDescriptor, int[] parameterIndices);
+    }
+
+    /** This enumeration describes how to duplicate the parameters in the stack */
+    enum StackDupMode {
+        /** Create a 1-1 copy of the parameters */
+        COPY,
+        /** Copies the parameters in an array and prepends it */
+        PREPEND_ARRAY,
+        /** Copies the parameters in an array and adds it between NEW and DUP opcodes */
+        PREPEND_ARRAY_CTOR,
+        /** Copies the parameters in an array and adds it before the uninitialized instance in a ctor */
+        PREPEND_ARRAY_SUPER_CTOR,
+        /** Copies the parameters in an array and appends it */
+        APPEND_ARRAY
+    }
+
+    abstract class AdviceType {
+
+        private AdviceType() {}
+
+        public static final byte BEFORE = -1;
+        public static final byte AROUND = 0;
+        public static final byte AFTER = 1;
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/CallSites.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/CallSites.java
index 6bb36ff7773..32afc229e9c 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/CallSites.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/CallSites.java
@@ -4,32 +4,31 @@
 
 public interface CallSites extends Consumer<CallSites.Container> {
 
-  interface Container {
-    default void addAdvice(
-        final byte type,
-        final String owner,
-        final String method,
-        final String descriptor,
-        final InvokeAdvice advice) {
-      addAdvice(type, owner, method, descriptor, (CallSiteAdvice) advice);
-    }
+    interface Container {
+        default void addAdvice(
+                final byte type,
+                final String owner,
+                final String method,
+                final String descriptor,
+                final InvokeAdvice advice) {
+            addAdvice(type, owner, method, descriptor, (CallSiteAdvice) advice);
+        }
 
-    default void addAdvice(
-        final byte type,
-        final String owner,
-        final String method,
-        final String descriptor,
-        final InvokeDynamicAdvice advice) {
-      addAdvice(type, owner, method, descriptor, (CallSiteAdvice) advice);
-    }
+        default void addAdvice(
+                final byte type,
+                final String owner,
+                final String method,
+                final String descriptor,
+                final InvokeDynamicAdvice advice) {
+            addAdvice(type, owner, method, descriptor, (CallSiteAdvice) advice);
+        }
 
-    void addAdvice(
-        byte kind, String owner, String method, String descriptor, CallSiteAdvice advice);
+        void addAdvice(byte kind, String owner, String method, String descriptor, CallSiteAdvice advice);
 
-    void addHelpers(String... helperClassNames);
-  }
+        void addHelpers(String... helperClassNames);
+    }
 
-  interface HasEnabledProperty {
-    boolean isEnabled();
-  }
+    interface HasEnabledProperty {
+        boolean isEnabled();
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/InvokeAdvice.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/InvokeAdvice.java
index 18e7121e739..b8231938e55 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/InvokeAdvice.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/InvokeAdvice.java
@@ -6,11 +6,5 @@
  */
 public interface InvokeAdvice extends CallSiteAdvice {
 
-  void apply(
-      MethodHandler handler,
-      int opcode,
-      String owner,
-      String name,
-      String descriptor,
-      boolean isInterface);
+    void apply(MethodHandler handler, int opcode, String owner, String name, String descriptor, boolean isInterface);
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/InvokeDynamicAdvice.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/InvokeDynamicAdvice.java
index 83ccbf04a82..2e0c92dc281 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/InvokeDynamicAdvice.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/InvokeDynamicAdvice.java
@@ -9,10 +9,10 @@
  */
 public interface InvokeDynamicAdvice extends CallSiteAdvice {
 
-  void apply(
-      MethodHandler handler,
-      String name,
-      String descriptor,
-      Handle bootstrapMethodHandle,
-      Object... bootstrapMethodArguments);
+    void apply(
+            MethodHandler handler,
+            String name,
+            String descriptor,
+            Handle bootstrapMethodHandle,
+            Object... bootstrapMethodArguments);
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/IastPostProcessorFactory.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/IastPostProcessorFactory.java
index 13b1f4eda4a..b87e165434f 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/IastPostProcessorFactory.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/IastPostProcessorFactory.java
@@ -37,141 +37,139 @@
 
 public class IastPostProcessorFactory implements Advice.PostProcessor.Factory {
 
-  public static final Advice.PostProcessor.Factory INSTANCE;
-
-  static {
-    final Verbosity verbosity = Config.get().getIastTelemetryVerbosity();
-    INSTANCE = verbosity == Verbosity.OFF ? null : new IastPostProcessorFactory(verbosity);
-  }
-
-  private static final String IAST_ANNOTATIONS_PKG = Sink.class.getPackage().getName();
-  private static final String SINK_NAME = Sink.class.getSimpleName();
-  private static final String PROPAGATION_NAME = Propagation.class.getSimpleName();
-  private static final String SOURCE_NAME = Source.class.getSimpleName();
-
-  private static final String COLLECTOR_INTERNAL_NAME =
-      Type.getType(IastMetricCollector.class).getInternalName();
-  private static final String METRIC_INTERNAL_NAME =
-      Type.getType(IastMetric.class).getInternalName();
-  private static final String METRIC_DESCRIPTOR = "L" + METRIC_INTERNAL_NAME + ";";
-  private static final String ADD_DESCRIPTOR = "(" + METRIC_DESCRIPTOR + "I)V";
-  private static final String ADD_WITH_TAG_DESCRIPTOR = "(" + METRIC_DESCRIPTOR + "BI)V";
-
-  private final Verbosity verbosity;
-
-  public IastPostProcessorFactory(final Verbosity verbosity) {
-    this.verbosity = verbosity;
-  }
-
-  @Override
-  public @Nonnull Advice.PostProcessor make(
-      List<? extends AnnotationDescription> annotations, TypeDescription returnType, boolean exit) {
-    for (final AnnotationDescription annotation : annotations) {
-      final TypeDescription typeDescr = annotation.getAnnotationType();
-      final PackageDescription pkgDescr = typeDescr.getPackage();
-      if (pkgDescr != null && IAST_ANNOTATIONS_PKG.equals(pkgDescr.getName())) {
-        final String typeName = typeDescr.getSimpleName();
-        if (SINK_NAME.equals(typeName)) {
-          final AnnotationValue<?, ?> tag = annotation.getValue("value");
-          return createPostProcessor(INSTRUMENTED_SINK, EXECUTED_SINK, tag.resolve(Byte.class));
-        } else if (SOURCE_NAME.equals(typeName)) {
-          final AnnotationValue<?, ?> tag = annotation.getValue("value");
-          return createPostProcessor(INSTRUMENTED_SOURCE, EXECUTED_SOURCE, tag.resolve(Byte.class));
-        } else if (PROPAGATION_NAME.equals(typeName)) {
-          return createPostProcessor(INSTRUMENTED_PROPAGATION, EXECUTED_PROPAGATION, null);
-        }
-      }
-    }
-    return Advice.PostProcessor.NoOp.INSTANCE;
-  }
+    public static final Advice.PostProcessor.Factory INSTANCE;
 
-  private PostProcessor createPostProcessor(
-      final IastMetric instrumented, final IastMetric executed, final Byte tagValue) {
-    if (!executed.isEnabled(verbosity)) {
-      return new PostProcessor(instrumented, null, tagValue);
+    static {
+        final Verbosity verbosity = Config.get().getIastTelemetryVerbosity();
+        INSTANCE = verbosity == Verbosity.OFF ? null : new IastPostProcessorFactory(verbosity);
     }
-    return new PostProcessor(instrumented, executed, tagValue);
-  }
 
-  private static class PostProcessor implements Advice.PostProcessor {
+    private static final String IAST_ANNOTATIONS_PKG = Sink.class.getPackage().getName();
+    private static final String SINK_NAME = Sink.class.getSimpleName();
+    private static final String PROPAGATION_NAME = Propagation.class.getSimpleName();
+    private static final String SOURCE_NAME = Source.class.getSimpleName();
+
+    private static final String COLLECTOR_INTERNAL_NAME =
+            Type.getType(IastMetricCollector.class).getInternalName();
+    private static final String METRIC_INTERNAL_NAME =
+            Type.getType(IastMetric.class).getInternalName();
+    private static final String METRIC_DESCRIPTOR = "L" + METRIC_INTERNAL_NAME + ";";
+    private static final String ADD_DESCRIPTOR = "(" + METRIC_DESCRIPTOR + "I)V";
+    private static final String ADD_WITH_TAG_DESCRIPTOR = "(" + METRIC_DESCRIPTOR + "BI)V";
 
-    private final IastMetric instrumentation;
-    private final IastMetric runtime;
-    private final Byte tagValue;
+    private final Verbosity verbosity;
 
-    private PostProcessor(
-        final IastMetric instrumentation, final IastMetric runtime, final Byte tagValue) {
-      this.instrumentation = instrumentation;
-      this.runtime = runtime;
-      this.tagValue = tagValue;
+    public IastPostProcessorFactory(final Verbosity verbosity) {
+        this.verbosity = verbosity;
     }
 
     @Override
-    public @Nonnull StackManipulation resolve(
-        @Nonnull final TypeDescription instrumentedType,
-        @Nonnull final MethodDescription instrumentedMethod,
-        @Nonnull final Assigner assigner,
-        @Nonnull final Advice.ArgumentHandler argumentHandler,
-        @Nonnull final Advice.StackMapFrameHandler.ForPostProcessor stackMapFrameHandler,
-        @Nonnull final StackManipulation exceptionHandler) {
-      if (tagValue == null) {
-        IastMetricCollector.add(instrumentation, 1);
-      } else {
-        IastMetricCollector.add(instrumentation, (byte) tagValue, 1);
-      }
-      return runtime == null
-          ? StackManipulation.Trivial.INSTANCE
-          : new TelemetryStackManipulation(stackMapFrameHandler, runtime.name(), tagValue);
+    public @Nonnull Advice.PostProcessor make(
+            List<? extends AnnotationDescription> annotations, TypeDescription returnType, boolean exit) {
+        for (final AnnotationDescription annotation : annotations) {
+            final TypeDescription typeDescr = annotation.getAnnotationType();
+            final PackageDescription pkgDescr = typeDescr.getPackage();
+            if (pkgDescr != null && IAST_ANNOTATIONS_PKG.equals(pkgDescr.getName())) {
+                final String typeName = typeDescr.getSimpleName();
+                if (SINK_NAME.equals(typeName)) {
+                    final AnnotationValue<?, ?> tag = annotation.getValue("value");
+                    return createPostProcessor(INSTRUMENTED_SINK, EXECUTED_SINK, tag.resolve(Byte.class));
+                } else if (SOURCE_NAME.equals(typeName)) {
+                    final AnnotationValue<?, ?> tag = annotation.getValue("value");
+                    return createPostProcessor(INSTRUMENTED_SOURCE, EXECUTED_SOURCE, tag.resolve(Byte.class));
+                } else if (PROPAGATION_NAME.equals(typeName)) {
+                    return createPostProcessor(INSTRUMENTED_PROPAGATION, EXECUTED_PROPAGATION, null);
+                }
+            }
+        }
+        return Advice.PostProcessor.NoOp.INSTANCE;
     }
-  }
-
-  private static class TelemetryStackManipulation extends StackManipulation.AbstractBase {
-    private final Advice.StackMapFrameHandler.ForAdvice.ForPostProcessor stackMapFrameHandler;
-    private final String metricName;
-    private final Byte tagValue;
-
-    private TelemetryStackManipulation(
-        final Advice.StackMapFrameHandler.ForPostProcessor stackMapFrameHandler,
-        final String metricName,
-        final Byte tagValue) {
-      this.stackMapFrameHandler = stackMapFrameHandler;
-      this.metricName = metricName;
-      this.tagValue = tagValue;
+
+    private PostProcessor createPostProcessor(
+            final IastMetric instrumented, final IastMetric executed, final Byte tagValue) {
+        if (!executed.isEnabled(verbosity)) {
+            return new PostProcessor(instrumented, null, tagValue);
+        }
+        return new PostProcessor(instrumented, executed, tagValue);
     }
 
-    @Override
-    public @Nonnull Size apply(
-        @Nonnull final MethodVisitor mv, @Nonnull final Implementation.Context ctx) {
-      stackMapFrameHandler.injectIntermediateFrame(mv, Collections.emptyList());
-      mv.visitFieldInsn(GETSTATIC, METRIC_INTERNAL_NAME, metricName, METRIC_DESCRIPTOR);
-      final String descriptor;
-      if (tagValue != null) {
-        visitTag(mv, tagValue);
-        descriptor = ADD_WITH_TAG_DESCRIPTOR;
-      } else {
-        descriptor = ADD_DESCRIPTOR;
-      }
-      mv.visitInsn(ICONST_1);
-      mv.visitMethodInsn(INVOKESTATIC, COLLECTOR_INTERNAL_NAME, "add", descriptor, false);
-      return new Size(0, tagValue != null ? 3 : 2);
+    private static class PostProcessor implements Advice.PostProcessor {
+
+        private final IastMetric instrumentation;
+        private final IastMetric runtime;
+        private final Byte tagValue;
+
+        private PostProcessor(final IastMetric instrumentation, final IastMetric runtime, final Byte tagValue) {
+            this.instrumentation = instrumentation;
+            this.runtime = runtime;
+            this.tagValue = tagValue;
+        }
+
+        @Override
+        public @Nonnull StackManipulation resolve(
+                @Nonnull final TypeDescription instrumentedType,
+                @Nonnull final MethodDescription instrumentedMethod,
+                @Nonnull final Assigner assigner,
+                @Nonnull final Advice.ArgumentHandler argumentHandler,
+                @Nonnull final Advice.StackMapFrameHandler.ForPostProcessor stackMapFrameHandler,
+                @Nonnull final StackManipulation exceptionHandler) {
+            if (tagValue == null) {
+                IastMetricCollector.add(instrumentation, 1);
+            } else {
+                IastMetricCollector.add(instrumentation, (byte) tagValue, 1);
+            }
+            return runtime == null
+                    ? StackManipulation.Trivial.INSTANCE
+                    : new TelemetryStackManipulation(stackMapFrameHandler, runtime.name(), tagValue);
+        }
     }
 
-    private void visitTag(final MethodVisitor mv, final byte tagValue) {
-      switch (tagValue) {
-        case -1:
-          mv.visitInsn(ICONST_M1);
-          break;
-        case 0:
-        case 1:
-        case 2:
-        case 3:
-        case 4:
-        case 5:
-          mv.visitInsn(ICONST_0 + tagValue);
-          break;
-        default:
-          mv.visitIntInsn(BIPUSH, tagValue);
-      }
+    private static class TelemetryStackManipulation extends StackManipulation.AbstractBase {
+        private final Advice.StackMapFrameHandler.ForAdvice.ForPostProcessor stackMapFrameHandler;
+        private final String metricName;
+        private final Byte tagValue;
+
+        private TelemetryStackManipulation(
+                final Advice.StackMapFrameHandler.ForPostProcessor stackMapFrameHandler,
+                final String metricName,
+                final Byte tagValue) {
+            this.stackMapFrameHandler = stackMapFrameHandler;
+            this.metricName = metricName;
+            this.tagValue = tagValue;
+        }
+
+        @Override
+        public @Nonnull Size apply(@Nonnull final MethodVisitor mv, @Nonnull final Implementation.Context ctx) {
+            stackMapFrameHandler.injectIntermediateFrame(mv, Collections.emptyList());
+            mv.visitFieldInsn(GETSTATIC, METRIC_INTERNAL_NAME, metricName, METRIC_DESCRIPTOR);
+            final String descriptor;
+            if (tagValue != null) {
+                visitTag(mv, tagValue);
+                descriptor = ADD_WITH_TAG_DESCRIPTOR;
+            } else {
+                descriptor = ADD_DESCRIPTOR;
+            }
+            mv.visitInsn(ICONST_1);
+            mv.visitMethodInsn(INVOKESTATIC, COLLECTOR_INTERNAL_NAME, "add", descriptor, false);
+            return new Size(0, tagValue != null ? 3 : 2);
+        }
+
+        private void visitTag(final MethodVisitor mv, final byte tagValue) {
+            switch (tagValue) {
+                case -1:
+                    mv.visitInsn(ICONST_M1);
+                    break;
+                case 0:
+                case 1:
+                case 2:
+                case 3:
+                case 4:
+                case 5:
+                    mv.visitInsn(ICONST_0 + tagValue);
+                    break;
+                default:
+                    mv.visitIntInsn(BIPUSH, tagValue);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/IastSecretClassReader.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/IastSecretClassReader.java
index b0e072d6f62..97e74680b93 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/IastSecretClassReader.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/IastSecretClassReader.java
@@ -7,14 +7,12 @@
 
 public class IastSecretClassReader {
 
-  public static final IastSecretClassReader INSTANCE = new IastSecretClassReader();
+    public static final IastSecretClassReader INSTANCE = new IastSecretClassReader();
 
-  public void readClass(
-      final Map<String, String> secrets,
-      final @Nonnull byte[] classFile,
-      @Nonnull TriConsumer consumer) {
-    ClassReader classReader = new ClassReader(classFile);
-    IastSecretVisitor classVisitor = new IastSecretVisitor(secrets, consumer);
-    classReader.accept(classVisitor, 0);
-  }
+    public void readClass(
+            final Map<String, String> secrets, final @Nonnull byte[] classFile, @Nonnull TriConsumer consumer) {
+        ClassReader classReader = new ClassReader(classFile);
+        IastSecretVisitor classVisitor = new IastSecretVisitor(secrets, consumer);
+        classReader.accept(classVisitor, 0);
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/IastSecretVisitor.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/IastSecretVisitor.java
index 9c19fa33783..b320cc77511 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/IastSecretVisitor.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/IastSecretVisitor.java
@@ -11,55 +11,54 @@
 
 public class IastSecretVisitor extends ClassVisitor {
 
-  private final Map<String, String> secrets;
-  private final TriConsumer consumer;
-
-  public IastSecretVisitor(final Map<String, String> secrets, final TriConsumer consumer) {
-    super(ASM_API);
-    this.secrets = secrets;
-    this.consumer = consumer;
-  }
-
-  @Override
-  public MethodVisitor visitMethod(
-      int access, final String methodName, String desc, String signature, String[] exceptions) {
-    return new IastMethodVisitor(secrets, methodName, consumer);
-  }
-
-  static class IastMethodVisitor extends MethodVisitor {
-
     private final Map<String, String> secrets;
     private final TriConsumer consumer;
 
-    private final String method;
-
-    private int currentLine;
-
-    public IastMethodVisitor(
-        final Map<String, String> secrets, final String method, final TriConsumer consumer) {
-      super(ASM_API);
-      this.secrets = secrets;
-      this.consumer = consumer;
-      this.method = method;
+    public IastSecretVisitor(final Map<String, String> secrets, final TriConsumer consumer) {
+        super(ASM_API);
+        this.secrets = secrets;
+        this.consumer = consumer;
     }
 
     @Override
-    public void visitLineNumber(int line, Label start) {
-      currentLine = line;
+    public MethodVisitor visitMethod(
+            int access, final String methodName, String desc, String signature, String[] exceptions) {
+        return new IastMethodVisitor(secrets, methodName, consumer);
     }
 
-    @Override
-    public void visitLdcInsn(Object cst) {
-      if (cst instanceof String) {
-        String literal = ((String) cst);
-        if (literal.length() < HardcodedSecretMatcher.MIN_SECRET_LENGTH) {
-          return;
+    static class IastMethodVisitor extends MethodVisitor {
+
+        private final Map<String, String> secrets;
+        private final TriConsumer consumer;
+
+        private final String method;
+
+        private int currentLine;
+
+        public IastMethodVisitor(final Map<String, String> secrets, final String method, final TriConsumer consumer) {
+            super(ASM_API);
+            this.secrets = secrets;
+            this.consumer = consumer;
+            this.method = method;
         }
-        String value = secrets.get(literal);
-        if (value != null) {
-          consumer.accept(method, value, currentLine);
+
+        @Override
+        public void visitLineNumber(int line, Label start) {
+            currentLine = line;
+        }
+
+        @Override
+        public void visitLdcInsn(Object cst) {
+            if (cst instanceof String) {
+                String literal = ((String) cst);
+                if (literal.length() < HardcodedSecretMatcher.MIN_SECRET_LENGTH) {
+                    return;
+                }
+                String value = secrets.get(literal);
+                if (value != null) {
+                    consumer.accept(method, value, currentLine);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/TaintableEnumeration.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/TaintableEnumeration.java
index bf53c00c341..ce8bf94ee69 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/TaintableEnumeration.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/TaintableEnumeration.java
@@ -9,88 +9,88 @@
 
 public class TaintableEnumeration implements Enumeration<String> {
 
-  private static final String CLASS_NAME = TaintableEnumeration.class.getName();
-
-  private final IastContext context;
-
-  private final PropagationModule module;
-
-  private final byte origin;
-
-  private final CharSequence name;
-
-  private final boolean useValueAsName;
-
-  private final Enumeration<String> delegate;
-
-  private TaintableEnumeration(
-      final IastContext ctx,
-      @Nonnull final Enumeration<String> delegate,
-      @Nonnull final PropagationModule module,
-      final byte origin,
-      @Nullable final CharSequence name,
-      final boolean useValueAsName) {
-    this.context = ctx;
-    this.delegate = delegate;
-    this.module = module;
-    this.origin = origin;
-    this.name = name;
-    this.useValueAsName = useValueAsName;
-  }
-
-  @Override
-  public boolean hasMoreElements() {
-    try {
-      return delegate.hasMoreElements();
-    } catch (Throwable e) {
-      StackUtils.filterFirst(e, TaintableEnumeration::nonTaintableEnumerationStack);
-      throw e;
+    private static final String CLASS_NAME = TaintableEnumeration.class.getName();
+
+    private final IastContext context;
+
+    private final PropagationModule module;
+
+    private final byte origin;
+
+    private final CharSequence name;
+
+    private final boolean useValueAsName;
+
+    private final Enumeration<String> delegate;
+
+    private TaintableEnumeration(
+            final IastContext ctx,
+            @Nonnull final Enumeration<String> delegate,
+            @Nonnull final PropagationModule module,
+            final byte origin,
+            @Nullable final CharSequence name,
+            final boolean useValueAsName) {
+        this.context = ctx;
+        this.delegate = delegate;
+        this.module = module;
+        this.origin = origin;
+        this.name = name;
+        this.useValueAsName = useValueAsName;
     }
-  }
-
-  @Override
-  public String nextElement() {
-    final String next;
-    try {
-      next = delegate.nextElement();
-    } catch (Throwable e) {
-      StackUtils.filterFirst(e, TaintableEnumeration::nonTaintableEnumerationStack);
-      throw e;
+
+    @Override
+    public boolean hasMoreElements() {
+        try {
+            return delegate.hasMoreElements();
+        } catch (Throwable e) {
+            StackUtils.filterFirst(e, TaintableEnumeration::nonTaintableEnumerationStack);
+            throw e;
+        }
     }
-    try {
-      module.taintString(context, next, origin, name(next));
-    } catch (final Throwable e) {
-      module.onUnexpectedException("Failed to taint enumeration", e);
+
+    @Override
+    public String nextElement() {
+        final String next;
+        try {
+            next = delegate.nextElement();
+        } catch (Throwable e) {
+            StackUtils.filterFirst(e, TaintableEnumeration::nonTaintableEnumerationStack);
+            throw e;
+        }
+        try {
+            module.taintString(context, next, origin, name(next));
+        } catch (final Throwable e) {
+            module.onUnexpectedException("Failed to taint enumeration", e);
+        }
+        return next;
+    }
+
+    private CharSequence name(final String value) {
+        if (name != null) {
+            return name;
+        }
+        return useValueAsName ? value : null;
+    }
+
+    private static boolean nonTaintableEnumerationStack(final StackTraceElement element) {
+        return !CLASS_NAME.equals(element.getClassName());
+    }
+
+    public static Enumeration<String> wrap(
+            final IastContext ctx,
+            @Nonnull final Enumeration<String> delegate,
+            @Nonnull final PropagationModule module,
+            final byte origin,
+            @Nullable final CharSequence name) {
+        return new TaintableEnumeration(ctx, delegate, module, origin, name, false);
     }
-    return next;
-  }
 
-  private CharSequence name(final String value) {
-    if (name != null) {
-      return name;
+    public static Enumeration<String> wrap(
+            final IastContext ctx,
+            @Nonnull final Enumeration<String> delegate,
+            @Nonnull final PropagationModule module,
+            final byte origin,
+            boolean useValueAsName) {
+        return new TaintableEnumeration(ctx, delegate, module, origin, null, useValueAsName);
     }
-    return useValueAsName ? value : null;
-  }
-
-  private static boolean nonTaintableEnumerationStack(final StackTraceElement element) {
-    return !CLASS_NAME.equals(element.getClassName());
-  }
-
-  public static Enumeration<String> wrap(
-      final IastContext ctx,
-      @Nonnull final Enumeration<String> delegate,
-      @Nonnull final PropagationModule module,
-      final byte origin,
-      @Nullable final CharSequence name) {
-    return new TaintableEnumeration(ctx, delegate, module, origin, name, false);
-  }
-
-  public static Enumeration<String> wrap(
-      final IastContext ctx,
-      @Nonnull final Enumeration<String> delegate,
-      @Nonnull final PropagationModule module,
-      final byte origin,
-      boolean useValueAsName) {
-    return new TaintableEnumeration(ctx, delegate, module, origin, null, useValueAsName);
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleCheck.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleCheck.java
index 2544e2732c8..0e77c111104 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleCheck.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleCheck.java
@@ -9,56 +9,53 @@
 import org.slf4j.LoggerFactory;
 
 public class MuzzleCheck implements ElementMatcher<ClassLoader> {
-  private static final Logger log = LoggerFactory.getLogger(MuzzleCheck.class);
+    private static final Logger log = LoggerFactory.getLogger(MuzzleCheck.class);
 
-  private final int instrumentationId;
-  private final String instrumentationClass;
-  private final ReferenceProvider runtimeMuzzleReferences;
+    private final int instrumentationId;
+    private final String instrumentationClass;
+    private final ReferenceProvider runtimeMuzzleReferences;
 
-  private ReferenceMatcher muzzle;
+    private ReferenceMatcher muzzle;
 
-  public MuzzleCheck(InstrumenterModule module, int instrumentationId) {
-    this.instrumentationId = instrumentationId;
-    this.instrumentationClass = module.getClass().getName();
-    this.runtimeMuzzleReferences = module.runtimeMuzzleReferences();
-  }
-
-  public boolean matches(ClassLoader classLoader) {
-    Boolean applicable = InstrumenterState.isApplicable(classLoader, instrumentationId);
-    if (null != applicable) {
-      return applicable;
+    public MuzzleCheck(InstrumenterModule module, int instrumentationId) {
+        this.instrumentationId = instrumentationId;
+        this.instrumentationClass = module.getClass().getName();
+        this.runtimeMuzzleReferences = module.runtimeMuzzleReferences();
     }
-    boolean muzzleMatches = muzzle().matches(classLoader);
-    if (muzzleMatches) {
-      InstrumenterState.applyInstrumentation(classLoader, instrumentationId);
-    } else {
-      InstrumenterState.blockInstrumentation(classLoader, instrumentationId);
-      if (log.isDebugEnabled()) {
-        final List<Reference.Mismatch> mismatches =
-            muzzle.getMismatchedReferenceSources(classLoader);
-        log.debug(
-            "Muzzled - {} instrumentation.target.classloader={}",
-            InstrumenterState.describe(instrumentationId),
-            classLoader);
-        for (final Reference.Mismatch mismatch : mismatches) {
-          log.debug(
-              "Muzzled mismatch - {} instrumentation.target.classloader={} muzzle.mismatch=\"{}\"",
-              InstrumenterState.describe(instrumentationId),
-              classLoader,
-              mismatch);
+
+    public boolean matches(ClassLoader classLoader) {
+        Boolean applicable = InstrumenterState.isApplicable(classLoader, instrumentationId);
+        if (null != applicable) {
+            return applicable;
         }
-      }
+        boolean muzzleMatches = muzzle().matches(classLoader);
+        if (muzzleMatches) {
+            InstrumenterState.applyInstrumentation(classLoader, instrumentationId);
+        } else {
+            InstrumenterState.blockInstrumentation(classLoader, instrumentationId);
+            if (log.isDebugEnabled()) {
+                final List<Reference.Mismatch> mismatches = muzzle.getMismatchedReferenceSources(classLoader);
+                log.debug(
+                        "Muzzled - {} instrumentation.target.classloader={}",
+                        InstrumenterState.describe(instrumentationId),
+                        classLoader);
+                for (final Reference.Mismatch mismatch : mismatches) {
+                    log.debug(
+                            "Muzzled mismatch - {} instrumentation.target.classloader={} muzzle.mismatch=\"{}\"",
+                            InstrumenterState.describe(instrumentationId),
+                            classLoader,
+                            mismatch);
+                }
+            }
+        }
+        return muzzleMatches;
     }
-    return muzzleMatches;
-  }
 
-  private ReferenceMatcher muzzle() {
-    if (null == muzzle) {
-      muzzle =
-          InstrumenterModule.loadStaticMuzzleReferences(
-                  Utils.getExtendedClassLoader(), instrumentationClass)
-              .withReferenceProvider(runtimeMuzzleReferences);
+    private ReferenceMatcher muzzle() {
+        if (null == muzzle) {
+            muzzle = InstrumenterModule.loadStaticMuzzleReferences(Utils.getExtendedClassLoader(), instrumentationClass)
+                    .withReferenceProvider(runtimeMuzzleReferences);
+        }
+        return muzzle;
     }
-    return muzzle;
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleGenerationProcessor.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleGenerationProcessor.java
index d046d62180d..f0ed7be0aba 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleGenerationProcessor.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleGenerationProcessor.java
@@ -16,20 +16,20 @@
  * Converts a neutral advice scan to references and emits the existing {@code $Muzzle} side class.
  */
 public final class MuzzleGenerationProcessor implements AdviceProcessor {
-  @Override
-  public void process(AdviceScanResult scanResult, AdviceProcessorContext context) {
-    InstrumenterModule module = context.getModule();
+    @Override
+    public void process(AdviceScanResult scanResult, AdviceProcessorContext context) {
+        InstrumenterModule module = context.getModule();
 
-    Set<String> ignoredClasses = new HashSet<>(asList(module.muzzleIgnoredClassNames()));
-    addAll(ignoredClasses, context.getHelperClassNames());
-    AdviceShader shader = AdviceShader.with(module.adviceShading());
-    List<Reference> references = ReferenceCreator.createReferences(scanResult, shader);
-    references.removeIf(reference -> ignoredClasses.contains(reference.className));
-    Reference[] additionalReferences = module.additionalMuzzleReferences();
-    if (additionalReferences != null) {
-      addAll(references, additionalReferences);
-    }
+        Set<String> ignoredClasses = new HashSet<>(asList(module.muzzleIgnoredClassNames()));
+        addAll(ignoredClasses, context.getHelperClassNames());
+        AdviceShader shader = AdviceShader.with(module.adviceShading());
+        List<Reference> references = ReferenceCreator.createReferences(scanResult, shader);
+        references.removeIf(reference -> ignoredClasses.contains(reference.className));
+        Reference[] additionalReferences = module.additionalMuzzleReferences();
+        if (additionalReferences != null) {
+            addAll(references, additionalReferences);
+        }
 
-    MuzzleGenerator.generate(context.getTargetDirectory(), module, references);
-  }
+        MuzzleGenerator.generate(context.getTargetDirectory(), module, references);
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleGenerator.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleGenerator.java
index 70fa5a7d1dc..50013035f78 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleGenerator.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleGenerator.java
@@ -12,177 +12,174 @@
 
 /** Generates a {@code $Muzzle} side class from resolved references. */
 final class MuzzleGenerator {
-  private MuzzleGenerator() {}
-
-  static void generate(
-      File targetDirectory, InstrumenterModule module, List<Reference> references) {
-    File muzzleClass =
-        new File(targetDirectory, Type.getInternalName(module.getClass()) + "$Muzzle.class");
-    try {
-      muzzleClass.getParentFile().mkdirs();
-      Files.write(muzzleClass.toPath(), generateMuzzleClass(module, references));
-    } catch (IOException error) {
-      throw new IllegalStateException(
-          "Cannot write muzzle class for " + module.getClass().getName(), error);
+    private MuzzleGenerator() {}
+
+    static void generate(File targetDirectory, InstrumenterModule module, List<Reference> references) {
+        File muzzleClass = new File(targetDirectory, Type.getInternalName(module.getClass()) + "$Muzzle.class");
+        try {
+            muzzleClass.getParentFile().mkdirs();
+            Files.write(muzzleClass.toPath(), generateMuzzleClass(module, references));
+        } catch (IOException error) {
+            throw new IllegalStateException(
+                    "Cannot write muzzle class for " + module.getClass().getName(), error);
+        }
     }
-  }
-
-  private static byte[] generateMuzzleClass(InstrumenterModule module, List<Reference> references) {
-    ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
-    cw.visit(
-        Opcodes.V1_8,
-        Opcodes.ACC_PUBLIC | Opcodes.ACC_FINAL,
-        Type.getInternalName(module.getClass()) + "$Muzzle",
-        null,
-        "java/lang/Object",
-        null);
-
-    MethodVisitor mv =
-        cw.visitMethod(
-            Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC,
-            "create",
-            "()Ldatadog/trace/agent/tooling/muzzle/ReferenceMatcher;",
-            null,
-            null);
-    mv.visitCode();
-
-    mv.visitTypeInsn(Opcodes.NEW, "datadog/trace/agent/tooling/muzzle/ReferenceMatcher");
-    mv.visitInsn(Opcodes.DUP);
-
-    mv.visitLdcInsn(references.size());
-    mv.visitTypeInsn(Opcodes.ANEWARRAY, "datadog/trace/agent/tooling/muzzle/Reference");
-
-    int i = 0;
-    for (Reference reference : references) {
-      mv.visitInsn(Opcodes.DUP);
-      mv.visitLdcInsn(i++);
-      writeReference(mv, reference);
-      mv.visitInsn(Opcodes.AASTORE);
-    }
-
-    mv.visitMethodInsn(
-        Opcodes.INVOKESPECIAL,
-        "datadog/trace/agent/tooling/muzzle/ReferenceMatcher",
-        "<init>",
-        "([Ldatadog/trace/agent/tooling/muzzle/Reference;)V",
-        false);
-    mv.visitInsn(Opcodes.ARETURN);
-
-    mv.visitMaxs(0, 0);
-    mv.visitEnd();
 
-    return cw.toByteArray();
-  }
+    private static byte[] generateMuzzleClass(InstrumenterModule module, List<Reference> references) {
+        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
+        cw.visit(
+                Opcodes.V1_8,
+                Opcodes.ACC_PUBLIC | Opcodes.ACC_FINAL,
+                Type.getInternalName(module.getClass()) + "$Muzzle",
+                null,
+                "java/lang/Object",
+                null);
+
+        MethodVisitor mv = cw.visitMethod(
+                Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC,
+                "create",
+                "()Ldatadog/trace/agent/tooling/muzzle/ReferenceMatcher;",
+                null,
+                null);
+        mv.visitCode();
+
+        mv.visitTypeInsn(Opcodes.NEW, "datadog/trace/agent/tooling/muzzle/ReferenceMatcher");
+        mv.visitInsn(Opcodes.DUP);
 
-  private static void writeReference(MethodVisitor mv, Reference reference) {
-    if (reference instanceof OrReference) {
-      mv.visitTypeInsn(Opcodes.NEW, "datadog/trace/agent/tooling/muzzle/OrReference");
-      mv.visitInsn(Opcodes.DUP);
+        mv.visitLdcInsn(references.size());
+        mv.visitTypeInsn(Opcodes.ANEWARRAY, "datadog/trace/agent/tooling/muzzle/Reference");
+
+        int i = 0;
+        for (Reference reference : references) {
+            mv.visitInsn(Opcodes.DUP);
+            mv.visitLdcInsn(i++);
+            writeReference(mv, reference);
+            mv.visitInsn(Opcodes.AASTORE);
+        }
+
+        mv.visitMethodInsn(
+                Opcodes.INVOKESPECIAL,
+                "datadog/trace/agent/tooling/muzzle/ReferenceMatcher",
+                "<init>",
+                "([Ldatadog/trace/agent/tooling/muzzle/Reference;)V",
+                false);
+        mv.visitInsn(Opcodes.ARETURN);
+
+        mv.visitMaxs(0, 0);
+        mv.visitEnd();
+
+        return cw.toByteArray();
     }
 
-    mv.visitTypeInsn(Opcodes.NEW, "datadog/trace/agent/tooling/muzzle/Reference");
-    mv.visitInsn(Opcodes.DUP);
+    private static void writeReference(MethodVisitor mv, Reference reference) {
+        if (reference instanceof OrReference) {
+            mv.visitTypeInsn(Opcodes.NEW, "datadog/trace/agent/tooling/muzzle/OrReference");
+            mv.visitInsn(Opcodes.DUP);
+        }
 
-    writeStrings(mv, reference.sources);
-    mv.visitLdcInsn(reference.flags);
-    mv.visitLdcInsn(reference.className);
-    if (null != reference.superName) {
-      mv.visitLdcInsn(reference.superName);
-    } else {
-      mv.visitInsn(Opcodes.ACONST_NULL);
-    }
-    writeStrings(mv, reference.interfaces);
-    writeFields(mv, reference.fields);
-    writeMethods(mv, reference.methods);
-
-    mv.visitMethodInsn(
-        Opcodes.INVOKESPECIAL,
-        "datadog/trace/agent/tooling/muzzle/Reference",
-        "<init>",
-        "([Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;[Ljava/lang/String;"
-            + "[Ldatadog/trace/agent/tooling/muzzle/Reference$Field;"
-            + "[Ldatadog/trace/agent/tooling/muzzle/Reference$Method;)V",
-        false);
-
-    if (reference instanceof OrReference) {
-      Reference[] ors = ((OrReference) reference).ors;
-
-      mv.visitLdcInsn(ors.length);
-      mv.visitTypeInsn(Opcodes.ANEWARRAY, "datadog/trace/agent/tooling/muzzle/Reference");
-
-      int i = 0;
-      for (Reference or : ors) {
+        mv.visitTypeInsn(Opcodes.NEW, "datadog/trace/agent/tooling/muzzle/Reference");
         mv.visitInsn(Opcodes.DUP);
-        mv.visitLdcInsn(i++);
-        writeReference(mv, or);
-        mv.visitInsn(Opcodes.AASTORE);
-      }
-
-      mv.visitMethodInsn(
-          Opcodes.INVOKESPECIAL,
-          "datadog/trace/agent/tooling/muzzle/OrReference",
-          "<init>",
-          "(Ldatadog/trace/agent/tooling/muzzle/Reference;"
-              + "[Ldatadog/trace/agent/tooling/muzzle/Reference;)V",
-          false);
+
+        writeStrings(mv, reference.sources);
+        mv.visitLdcInsn(reference.flags);
+        mv.visitLdcInsn(reference.className);
+        if (null != reference.superName) {
+            mv.visitLdcInsn(reference.superName);
+        } else {
+            mv.visitInsn(Opcodes.ACONST_NULL);
+        }
+        writeStrings(mv, reference.interfaces);
+        writeFields(mv, reference.fields);
+        writeMethods(mv, reference.methods);
+
+        mv.visitMethodInsn(
+                Opcodes.INVOKESPECIAL,
+                "datadog/trace/agent/tooling/muzzle/Reference",
+                "<init>",
+                "([Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;[Ljava/lang/String;"
+                        + "[Ldatadog/trace/agent/tooling/muzzle/Reference$Field;"
+                        + "[Ldatadog/trace/agent/tooling/muzzle/Reference$Method;)V",
+                false);
+
+        if (reference instanceof OrReference) {
+            Reference[] ors = ((OrReference) reference).ors;
+
+            mv.visitLdcInsn(ors.length);
+            mv.visitTypeInsn(Opcodes.ANEWARRAY, "datadog/trace/agent/tooling/muzzle/Reference");
+
+            int i = 0;
+            for (Reference or : ors) {
+                mv.visitInsn(Opcodes.DUP);
+                mv.visitLdcInsn(i++);
+                writeReference(mv, or);
+                mv.visitInsn(Opcodes.AASTORE);
+            }
+
+            mv.visitMethodInsn(
+                    Opcodes.INVOKESPECIAL,
+                    "datadog/trace/agent/tooling/muzzle/OrReference",
+                    "<init>",
+                    "(Ldatadog/trace/agent/tooling/muzzle/Reference;"
+                            + "[Ldatadog/trace/agent/tooling/muzzle/Reference;)V",
+                    false);
+        }
     }
-  }
-
-  private static void writeStrings(MethodVisitor mv, String[] strings) {
-    mv.visitLdcInsn(strings.length);
-    mv.visitTypeInsn(Opcodes.ANEWARRAY, "java/lang/String");
-    int i = 0;
-    for (String string : strings) {
-      mv.visitInsn(Opcodes.DUP);
-      mv.visitLdcInsn(i++);
-      mv.visitLdcInsn(string);
-      mv.visitInsn(Opcodes.AASTORE);
+
+    private static void writeStrings(MethodVisitor mv, String[] strings) {
+        mv.visitLdcInsn(strings.length);
+        mv.visitTypeInsn(Opcodes.ANEWARRAY, "java/lang/String");
+        int i = 0;
+        for (String string : strings) {
+            mv.visitInsn(Opcodes.DUP);
+            mv.visitLdcInsn(i++);
+            mv.visitLdcInsn(string);
+            mv.visitInsn(Opcodes.AASTORE);
+        }
     }
-  }
-
-  private static void writeFields(MethodVisitor mv, Reference.Field[] fields) {
-    mv.visitLdcInsn(fields.length);
-    mv.visitTypeInsn(Opcodes.ANEWARRAY, "datadog/trace/agent/tooling/muzzle/Reference$Field");
-    int i = 0;
-    for (Reference.Field field : fields) {
-      mv.visitInsn(Opcodes.DUP);
-      mv.visitLdcInsn(i++);
-      mv.visitTypeInsn(Opcodes.NEW, "datadog/trace/agent/tooling/muzzle/Reference$Field");
-      mv.visitInsn(Opcodes.DUP);
-      writeStrings(mv, field.sources);
-      mv.visitLdcInsn(field.flags);
-      mv.visitLdcInsn(field.name);
-      mv.visitLdcInsn(field.fieldType);
-      mv.visitMethodInsn(
-          Opcodes.INVOKESPECIAL,
-          "datadog/trace/agent/tooling/muzzle/Reference$Field",
-          "<init>",
-          "([Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V",
-          false);
-      mv.visitInsn(Opcodes.AASTORE);
+
+    private static void writeFields(MethodVisitor mv, Reference.Field[] fields) {
+        mv.visitLdcInsn(fields.length);
+        mv.visitTypeInsn(Opcodes.ANEWARRAY, "datadog/trace/agent/tooling/muzzle/Reference$Field");
+        int i = 0;
+        for (Reference.Field field : fields) {
+            mv.visitInsn(Opcodes.DUP);
+            mv.visitLdcInsn(i++);
+            mv.visitTypeInsn(Opcodes.NEW, "datadog/trace/agent/tooling/muzzle/Reference$Field");
+            mv.visitInsn(Opcodes.DUP);
+            writeStrings(mv, field.sources);
+            mv.visitLdcInsn(field.flags);
+            mv.visitLdcInsn(field.name);
+            mv.visitLdcInsn(field.fieldType);
+            mv.visitMethodInsn(
+                    Opcodes.INVOKESPECIAL,
+                    "datadog/trace/agent/tooling/muzzle/Reference$Field",
+                    "<init>",
+                    "([Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V",
+                    false);
+            mv.visitInsn(Opcodes.AASTORE);
+        }
     }
-  }
-
-  private static void writeMethods(MethodVisitor mv, Reference.Method[] methods) {
-    mv.visitLdcInsn(methods.length);
-    mv.visitTypeInsn(Opcodes.ANEWARRAY, "datadog/trace/agent/tooling/muzzle/Reference$Method");
-    int i = 0;
-    for (Reference.Method method : methods) {
-      mv.visitInsn(Opcodes.DUP);
-      mv.visitLdcInsn(i++);
-      mv.visitTypeInsn(Opcodes.NEW, "datadog/trace/agent/tooling/muzzle/Reference$Method");
-      mv.visitInsn(Opcodes.DUP);
-      writeStrings(mv, method.sources);
-      mv.visitLdcInsn(method.flags);
-      mv.visitLdcInsn(method.name);
-      mv.visitLdcInsn(method.methodType);
-      mv.visitMethodInsn(
-          Opcodes.INVOKESPECIAL,
-          "datadog/trace/agent/tooling/muzzle/Reference$Method",
-          "<init>",
-          "([Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V",
-          false);
-      mv.visitInsn(Opcodes.AASTORE);
+
+    private static void writeMethods(MethodVisitor mv, Reference.Method[] methods) {
+        mv.visitLdcInsn(methods.length);
+        mv.visitTypeInsn(Opcodes.ANEWARRAY, "datadog/trace/agent/tooling/muzzle/Reference$Method");
+        int i = 0;
+        for (Reference.Method method : methods) {
+            mv.visitInsn(Opcodes.DUP);
+            mv.visitLdcInsn(i++);
+            mv.visitTypeInsn(Opcodes.NEW, "datadog/trace/agent/tooling/muzzle/Reference$Method");
+            mv.visitInsn(Opcodes.DUP);
+            writeStrings(mv, method.sources);
+            mv.visitLdcInsn(method.flags);
+            mv.visitLdcInsn(method.name);
+            mv.visitLdcInsn(method.methodType);
+            mv.visitMethodInsn(
+                    Opcodes.INVOKESPECIAL,
+                    "datadog/trace/agent/tooling/muzzle/Reference$Method",
+                    "<init>",
+                    "([Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V",
+                    false);
+            mv.visitInsn(Opcodes.AASTORE);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java
index 9ecbb4f40cb..1a01d58fda9 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java
@@ -29,209 +29,200 @@
  * <p>Additionally, after a successful muzzle validation run each module's helper injector.
  */
 public class MuzzleVersionScanPlugin {
-  static {
-    SharedTypePools.registerIfAbsent(SharedTypePools.simpleCache());
-    HierarchyMatchers.registerIfAbsent(HierarchyMatchers.simpleChecks());
-  }
-
-  @SuppressForbidden
-  public static void assertInstrumentationMuzzled(
-      final ClassLoader instrumentationLoader,
-      final ClassLoader testApplicationLoader,
-      final boolean assertPass,
-      final String muzzleDirective)
-      throws Exception {
-    List<InstrumenterModule> toBeTested = toBeTested(instrumentationLoader, muzzleDirective);
-    for (InstrumenterModule module : toBeTested) {
-
-      // verify muzzle result matches expectation
-      final ReferenceMatcher muzzle = module.getInstrumentationMuzzle();
-      final List<Reference.Mismatch> mismatches =
-          muzzle.getMismatchedReferenceSources(testApplicationLoader);
-
-      ClassLoaderMatchers.resetState();
-
-      final boolean classLoaderMatch = module.classLoaderMatcher().matches(testApplicationLoader);
-
-      final boolean passed = mismatches.isEmpty() && classLoaderMatch;
-      if (passed && !assertPass) {
-        System.err.println(
-            "MUZZLE PASSED " + module.getClass().getSimpleName() + " BUT FAILURE WAS EXPECTED");
-        throw new RuntimeException("Instrumentation unexpectedly passed Muzzle validation");
-      } else if (!passed && assertPass) {
-        System.err.println(
-            "FAILED MUZZLE VALIDATION: " + module.getClass().getName() + " mismatches:");
-        if (!classLoaderMatch) {
-          System.err.println("-- classloader mismatch");
-        }
-        for (final Reference.Mismatch mismatch : mismatches) {
-          System.err.println("-- " + mismatch);
-        }
-        throw new RuntimeException("Instrumentation failed Muzzle validation");
-      }
+    static {
+        SharedTypePools.registerIfAbsent(SharedTypePools.simpleCache());
+        HierarchyMatchers.registerIfAbsent(HierarchyMatchers.simpleChecks());
     }
 
-    if (assertPass) {
-      for (InstrumenterModule module : toBeTested) {
-        try {
-          // verify helper consistency
-          final String[] helperClassNames = module.helperClassNames();
-          if (helperClassNames.length > 0) {
-            BiConsumer<String, byte[]> injectClassHelper = injectClassHelper(testApplicationLoader);
-            for (Map.Entry<String, byte[]> helper : createHelperMap(module).entrySet()) {
-              injectClassHelper.accept(helper.getKey(), helper.getValue());
+    @SuppressForbidden
+    public static void assertInstrumentationMuzzled(
+            final ClassLoader instrumentationLoader,
+            final ClassLoader testApplicationLoader,
+            final boolean assertPass,
+            final String muzzleDirective)
+            throws Exception {
+        List<InstrumenterModule> toBeTested = toBeTested(instrumentationLoader, muzzleDirective);
+        for (InstrumenterModule module : toBeTested) {
+
+            // verify muzzle result matches expectation
+            final ReferenceMatcher muzzle = module.getInstrumentationMuzzle();
+            final List<Reference.Mismatch> mismatches = muzzle.getMismatchedReferenceSources(testApplicationLoader);
+
+            ClassLoaderMatchers.resetState();
+
+            final boolean classLoaderMatch = module.classLoaderMatcher().matches(testApplicationLoader);
+
+            final boolean passed = mismatches.isEmpty() && classLoaderMatch;
+            if (passed && !assertPass) {
+                System.err.println("MUZZLE PASSED " + module.getClass().getSimpleName() + " BUT FAILURE WAS EXPECTED");
+                throw new RuntimeException("Instrumentation unexpectedly passed Muzzle validation");
+            } else if (!passed && assertPass) {
+                System.err.println(
+                        "FAILED MUZZLE VALIDATION: " + module.getClass().getName() + " mismatches:");
+                if (!classLoaderMatch) {
+                    System.err.println("-- classloader mismatch");
+                }
+                for (final Reference.Mismatch mismatch : mismatches) {
+                    System.err.println("-- " + mismatch);
+                }
+                throw new RuntimeException("Instrumentation failed Muzzle validation");
+            }
+        }
+
+        if (assertPass) {
+            for (InstrumenterModule module : toBeTested) {
+                try {
+                    // verify helper consistency
+                    final String[] helperClassNames = module.helperClassNames();
+                    if (helperClassNames.length > 0) {
+                        BiConsumer<String, byte[]> injectClassHelper = injectClassHelper(testApplicationLoader);
+                        for (Map.Entry<String, byte[]> helper :
+                                createHelperMap(module).entrySet()) {
+                            injectClassHelper.accept(helper.getKey(), helper.getValue());
+                        }
+                    }
+                } catch (final Throwable e) {
+                    System.err.println("FAILED HELPER INJECTION. Are Helpers being injected in the correct order?");
+                    System.err.println(e.getMessage());
+                    throw e;
+                }
             }
-          }
-        } catch (final Throwable e) {
-          System.err.println(
-              "FAILED HELPER INJECTION. Are Helpers being injected in the correct order?");
-          System.err.println(e.getMessage());
-          throw e;
         }
-      }
     }
-  }
-
-  /** Simulates instrumentation-based access to defineClass feature. */
-  private static BiConsumer<String, byte[]> injectClassHelper(ClassLoader cl) {
-    try {
-      Method findLoadedClass = ClassLoader.class.getDeclaredMethod("findLoadedClass", String.class);
-      Method defineClass =
-          ClassLoader.class.getDeclaredMethod(
-              "defineClass", String.class, byte[].class, int.class, int.class);
-      findLoadedClass.setAccessible(true);
-      defineClass.setAccessible(true);
-      return (name, bytes) -> {
+
+    /** Simulates instrumentation-based access to defineClass feature. */
+    private static BiConsumer<String, byte[]> injectClassHelper(ClassLoader cl) {
         try {
-          if (findLoadedClass.invoke(cl, name) == null) {
-            defineClass.invoke(cl, name, bytes, 0, bytes.length);
-          }
+            Method findLoadedClass = ClassLoader.class.getDeclaredMethod("findLoadedClass", String.class);
+            Method defineClass = ClassLoader.class.getDeclaredMethod(
+                    "defineClass", String.class, byte[].class, int.class, int.class);
+            findLoadedClass.setAccessible(true);
+            defineClass.setAccessible(true);
+            return (name, bytes) -> {
+                try {
+                    if (findLoadedClass.invoke(cl, name) == null) {
+                        defineClass.invoke(cl, name, bytes, 0, bytes.length);
+                    }
+                } catch (ReflectiveOperationException e) {
+                    throw new RuntimeException(e);
+                }
+            };
         } catch (ReflectiveOperationException e) {
-          throw new RuntimeException(e);
+            return new HelperClassLoader(cl)::injectClass;
         }
-      };
-    } catch (ReflectiveOperationException e) {
-      return new HelperClassLoader(cl)::injectClass;
-    }
-  }
-
-  // build modules to test while single-threaded to match installer assumptions
-  private static synchronized List<InstrumenterModule> toBeTested(
-      ClassLoader instrumentationLoader, String muzzleDirective) {
-    List<InstrumenterModule> toBeTested = new ArrayList<>();
-    for (InstrumenterModule module :
-        ServiceLoader.load(InstrumenterModule.class, instrumentationLoader)) {
-      String directiveToTest = module.muzzleDirective();
-      if (null == directiveToTest || directiveToTest.equals(muzzleDirective)) {
-        // pre-build class-loader matcher while single-threaded
-        module.classLoaderMatcher();
-        toBeTested.add(module);
-      } // this module wants to validate against a different named directive
-    }
-    return toBeTested;
-  }
-
-  // Exposes ClassLoader.defineClass() to test helper consistency
-  // without requiring java.lang.instrument.Instrumentation agent
-  static final class HelperClassLoader extends ClassLoader {
-    HelperClassLoader(ClassLoader parent) {
-      super(parent);
     }
 
-    public void injectClass(String name, byte[] bytecode) {
-      if (findLoadedClass(name) == null) {
-        defineClass(name, bytecode, 0, bytecode.length);
-      }
+    // build modules to test while single-threaded to match installer assumptions
+    private static synchronized List<InstrumenterModule> toBeTested(
+            ClassLoader instrumentationLoader, String muzzleDirective) {
+        List<InstrumenterModule> toBeTested = new ArrayList<>();
+        for (InstrumenterModule module : ServiceLoader.load(InstrumenterModule.class, instrumentationLoader)) {
+            String directiveToTest = module.muzzleDirective();
+            if (null == directiveToTest || directiveToTest.equals(muzzleDirective)) {
+                // pre-build class-loader matcher while single-threaded
+                module.classLoaderMatcher();
+                toBeTested.add(module);
+            } // this module wants to validate against a different named directive
+        }
+        return toBeTested;
     }
-  }
-
-  private static Map<String, byte[]> createHelperMap(final InstrumenterModule module)
-      throws IOException {
-    String[] helperClasses = module.helperClassNames();
-    final Map<String, byte[]> helperMap = new LinkedHashMap<>(helperClasses.length);
-    Set<String> helperClassNames = new HashSet<>(Arrays.asList(helperClasses));
-    AdviceShader adviceShader = AdviceShader.with(module.adviceShading());
-    for (final String helperName : helperClasses) {
-      int nestedClassIndex = helperName.lastIndexOf('$');
-      if (nestedClassIndex > 0) {
-        final int scalaParentIndex = helperName.indexOf("$anonfun$");
-        if (scalaParentIndex > 0) {
-          nestedClassIndex = scalaParentIndex;
+
+    // Exposes ClassLoader.defineClass() to test helper consistency
+    // without requiring java.lang.instrument.Instrumentation agent
+    static final class HelperClassLoader extends ClassLoader {
+        HelperClassLoader(ClassLoader parent) {
+            super(parent);
         }
-        final String parent = helperName.substring(0, nestedClassIndex);
-        if (!helperClassNames.contains(parent)) {
-          throw new IllegalArgumentException(
-              "Nested helper "
-                  + helperName
-                  + " must have the parent class "
-                  + parent
-                  + " also defined as a helper");
+
+        public void injectClass(String name, byte[] bytecode) {
+            if (findLoadedClass(name) == null) {
+                defineClass(name, bytecode, 0, bytecode.length);
+            }
         }
-      }
-      final ClassFileLocator locator =
-          ClassFileLocator.ForClassLoader.of(module.getClass().getClassLoader());
-      byte[] classBytes = locator.locate(helperName).resolve();
-      if (null != adviceShader) {
-        classBytes = adviceShader.shadeClass(classBytes);
-      }
-      helperMap.put(helperName, classBytes);
-    }
-    return helperMap;
-  }
-
-  @SuppressForbidden
-  public static void printMuzzleReferences(
-      final ClassLoader instrumentationLoader, final PrintWriter out) {
-    for (InstrumenterModule module :
-        ServiceLoader.load(InstrumenterModule.class, instrumentationLoader)) {
-      final ReferenceMatcher muzzle = module.getInstrumentationMuzzle();
-      out.println(module.getClass().getName());
-      for (final Reference ref : muzzle.getReferences()) {
-        out.println(prettyPrint("  ", ref));
-      }
     }
-  }
 
-  public static Set<String> listInstrumentationNames(
-      final ClassLoader instrumentationLoader, String directive) {
-    final Set<String> ret = new HashSet<>();
-    for (final InstrumenterModule module : toBeTested(instrumentationLoader, directive)) {
-      ret.add(module.name());
-    }
-    return ret;
-  }
-
-  private static String prettyPrint(final String prefix, final Reference ref) {
-    final StringBuilder builder = new StringBuilder(prefix);
-    builder.append(Reference.prettyPrint(ref.flags));
-    builder.append(ref.className);
-    if (ref.superName != null) {
-      builder.append(" extends<").append(ref.superName).append('>');
-    }
-    if (ref.interfaces.length > 0) {
-      builder.append(" implements ");
-      for (final String iface : ref.interfaces) {
-        builder.append(" <").append(iface).append('>');
-      }
+    private static Map<String, byte[]> createHelperMap(final InstrumenterModule module) throws IOException {
+        String[] helperClasses = module.helperClassNames();
+        final Map<String, byte[]> helperMap = new LinkedHashMap<>(helperClasses.length);
+        Set<String> helperClassNames = new HashSet<>(Arrays.asList(helperClasses));
+        AdviceShader adviceShader = AdviceShader.with(module.adviceShading());
+        for (final String helperName : helperClasses) {
+            int nestedClassIndex = helperName.lastIndexOf('$');
+            if (nestedClassIndex > 0) {
+                final int scalaParentIndex = helperName.indexOf("$anonfun$");
+                if (scalaParentIndex > 0) {
+                    nestedClassIndex = scalaParentIndex;
+                }
+                final String parent = helperName.substring(0, nestedClassIndex);
+                if (!helperClassNames.contains(parent)) {
+                    throw new IllegalArgumentException("Nested helper "
+                            + helperName
+                            + " must have the parent class "
+                            + parent
+                            + " also defined as a helper");
+                }
+            }
+            final ClassFileLocator locator =
+                    ClassFileLocator.ForClassLoader.of(module.getClass().getClassLoader());
+            byte[] classBytes = locator.locate(helperName).resolve();
+            if (null != adviceShader) {
+                classBytes = adviceShader.shadeClass(classBytes);
+            }
+            helperMap.put(helperName, classBytes);
+        }
+        return helperMap;
     }
-    for (final String source : ref.sources) {
-      builder.append('\n').append(prefix).append(prefix);
-      builder.append("Source: ").append(source);
+
+    @SuppressForbidden
+    public static void printMuzzleReferences(final ClassLoader instrumentationLoader, final PrintWriter out) {
+        for (InstrumenterModule module : ServiceLoader.load(InstrumenterModule.class, instrumentationLoader)) {
+            final ReferenceMatcher muzzle = module.getInstrumentationMuzzle();
+            out.println(module.getClass().getName());
+            for (final Reference ref : muzzle.getReferences()) {
+                out.println(prettyPrint("  ", ref));
+            }
+        }
     }
-    for (final Reference.Field field : ref.fields) {
-      builder.append('\n').append(prefix).append(prefix);
-      builder.append("Field: ");
-      builder.append(Reference.prettyPrint(field.flags));
-      builder.append(field);
+
+    public static Set<String> listInstrumentationNames(final ClassLoader instrumentationLoader, String directive) {
+        final Set<String> ret = new HashSet<>();
+        for (final InstrumenterModule module : toBeTested(instrumentationLoader, directive)) {
+            ret.add(module.name());
+        }
+        return ret;
     }
-    for (final Reference.Method method : ref.methods) {
-      builder.append('\n').append(prefix).append(prefix);
-      builder.append("Method: ");
-      builder.append(Reference.prettyPrint(method.flags));
-      builder.append(method);
+
+    private static String prettyPrint(final String prefix, final Reference ref) {
+        final StringBuilder builder = new StringBuilder(prefix);
+        builder.append(Reference.prettyPrint(ref.flags));
+        builder.append(ref.className);
+        if (ref.superName != null) {
+            builder.append(" extends<").append(ref.superName).append('>');
+        }
+        if (ref.interfaces.length > 0) {
+            builder.append(" implements ");
+            for (final String iface : ref.interfaces) {
+                builder.append(" <").append(iface).append('>');
+            }
+        }
+        for (final String source : ref.sources) {
+            builder.append('\n').append(prefix).append(prefix);
+            builder.append("Source: ").append(source);
+        }
+        for (final Reference.Field field : ref.fields) {
+            builder.append('\n').append(prefix).append(prefix);
+            builder.append("Field: ");
+            builder.append(Reference.prettyPrint(field.flags));
+            builder.append(field);
+        }
+        for (final Reference.Method method : ref.methods) {
+            builder.append('\n').append(prefix).append(prefix);
+            builder.append("Method: ");
+            builder.append(Reference.prettyPrint(method.flags));
+            builder.append(method);
+        }
+        return builder.toString();
     }
-    return builder.toString();
-  }
 
-  private MuzzleVersionScanPlugin() {}
+    private MuzzleVersionScanPlugin() {}
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/OrReference.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/OrReference.java
index 92d409d79bc..26bb8dbcb62 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/OrReference.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/OrReference.java
@@ -2,17 +2,17 @@
 
 /** A reference that checks an alternative spec if the first doesn't match. */
 public class OrReference extends Reference {
-  public final Reference[] ors;
+    public final Reference[] ors;
 
-  public OrReference(Reference either, Reference[] ors) {
-    super(
-        either.sources,
-        either.flags,
-        either.className,
-        either.superName,
-        either.interfaces,
-        either.fields,
-        either.methods);
-    this.ors = ors;
-  }
+    public OrReference(Reference either, Reference[] ors) {
+        super(
+                either.sources,
+                either.flags,
+                either.className,
+                either.superName,
+                either.interfaces,
+                either.fields,
+                either.methods);
+        this.ors = ors;
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/Reference.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/Reference.java
index f427d0b2882..38d94800a42 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/Reference.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/Reference.java
@@ -16,525 +16,507 @@
 
 /** An immutable reference to a jvm class. */
 public class Reference {
-  public final String[] sources;
-  public final int flags;
-  public final String className;
-  public final String superName;
-  public final String[] interfaces;
-  public final Field[] fields;
-  public final Method[] methods;
-
-  public Reference(
-      final String[] sources,
-      final int flags,
-      final String className,
-      final String superName,
-      final String[] interfaces,
-      final Field[] fields,
-      final Method[] methods) {
-    this.sources = sources;
-    this.flags = flags;
-    this.className = className;
-    this.superName = superName;
-    this.interfaces = interfaces;
-    this.methods = methods;
-    this.fields = fields;
-  }
-
-  /**
-   * Create a new reference which combines this reference with another reference of the same type.
-   *
-   * @param anotherReference A reference to the same class
-   * @return a new Reference which merges the two references
-   */
-  public Reference merge(final Reference anotherReference) {
-    if (!anotherReference.className.equals(className)) {
-      throw new IllegalStateException("illegal merge " + this + " != " + anotherReference);
-    }
-    return new Reference(
-        Reference.merge(sources, anotherReference.sources),
-        mergeFlags(flags, anotherReference.flags),
-        className,
-        null != this.superName ? this.superName : anotherReference.superName,
-        Reference.merge(interfaces, anotherReference.interfaces),
-        mergeFields(fields, anotherReference.fields),
-        mergeMethods(methods, anotherReference.methods));
-  }
-
-  @Override
-  public String toString() {
-    return "Reference<" + className + ">";
-  }
-
-  public static final int EXPECTS_PUBLIC = 1;
-  public static final int EXPECTS_PUBLIC_OR_PROTECTED = 2;
-  public static final int EXPECTS_NON_PRIVATE = 4;
-  public static final int EXPECTS_STATIC = 8;
-  public static final int EXPECTS_NON_STATIC = 16;
-  public static final int EXPECTS_INTERFACE = 32;
-  public static final int EXPECTS_NON_INTERFACE = 64;
-  public static final int EXPECTS_NON_FINAL = 128;
-
-  public static boolean matches(int flags, int modifiers) {
-    if ((flags & EXPECTS_PUBLIC) != 0 && (modifiers & Opcodes.ACC_PUBLIC) == 0) {
-      return false;
-    } else if ((flags & EXPECTS_PUBLIC_OR_PROTECTED) != 0
-        && (modifiers & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PROTECTED)) == 0) {
-      return false;
-    } else if ((flags & EXPECTS_NON_PRIVATE) != 0 && (modifiers & Opcodes.ACC_PRIVATE) != 0) {
-      return false;
-    } else if ((flags & EXPECTS_STATIC) != 0 && (modifiers & Opcodes.ACC_STATIC) == 0) {
-      return false;
-    } else if ((flags & EXPECTS_NON_STATIC) != 0 && (modifiers & Opcodes.ACC_STATIC) != 0) {
-      return false;
-    } else if ((flags & EXPECTS_INTERFACE) != 0 && (modifiers & Opcodes.ACC_INTERFACE) == 0) {
-      return false;
-    } else if ((flags & EXPECTS_NON_INTERFACE) != 0 && (modifiers & Opcodes.ACC_INTERFACE) != 0) {
-      return false;
-    } else if ((flags & EXPECTS_NON_FINAL) != 0 && (modifiers & Opcodes.ACC_FINAL) != 0) {
-      return false;
-    }
-    return true;
-  }
-
-  public static class Field {
     public final String[] sources;
     public final int flags;
-    public final String name;
-    public final String fieldType;
-
-    public Field(
-        final String[] sources, final int flags, final String name, final String fieldType) {
-      this.sources = sources;
-      this.flags = flags;
-      this.name = name;
-      this.fieldType = fieldType;
-    }
-
-    public Field merge(final Field anotherField) {
-      // consider both name and type when merging...
-      if (!name.equals(anotherField.name) || !fieldType.equals(anotherField.fieldType)) {
-        throw new IllegalStateException("illegal merge " + this + " != " + anotherField);
-      }
-      return new Field(
-          Reference.merge(sources, anotherField.sources),
-          mergeFlags(flags, anotherField.flags),
-          name,
-          fieldType);
-    }
-
-    @Override
-    public String toString() {
-      return name + fieldType;
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-      if (o instanceof Field) {
-        final Field other = (Field) o;
-        return name.equals(other.name);
-      }
-      return false;
-    }
-
-    @Override
-    public int hashCode() {
-      return name.hashCode();
-    }
-  }
-
-  public static class Method {
-    public final String[] sources;
-    public final int flags;
-    public final String name;
-    public final String methodType;
-
-    public Method(
-        final String[] sources, final int flags, final String name, final String methodType) {
-      this.sources = sources;
-      this.flags = flags;
-      this.name = name;
-      this.methodType = methodType;
-    }
-
-    public Method merge(final Method anotherMethod) {
-      if (!equals(anotherMethod)) {
-        throw new IllegalStateException("illegal merge " + this + " != " + anotherMethod);
-      }
-      return new Method(
-          Reference.merge(sources, anotherMethod.sources),
-          mergeFlags(flags, anotherMethod.flags),
-          name,
-          methodType);
-    }
-
-    @Override
-    public String toString() {
-      return name + methodType;
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-      if (o instanceof Method) {
-        final Method m = (Method) o;
-        return name.equals(m.name) && methodType.equals(m.methodType);
-      }
-      return false;
-    }
-
-    @Override
-    public int hashCode() {
-      return toString().hashCode();
-    }
-  }
-
-  /**
-   * A mismatch between a Reference and a runtime class.
-   *
-   * <p>This class' toString returns a human-readable description of the mismatch along with
-   * source-code locations of the instrumentation which caused the mismatch.
-   */
-  public abstract static class Mismatch {
-    /** Instrumentation sources which caused the mismatch. */
-    private final String[] mismatchSources;
-
-    Mismatch(final String[] mismatchSources) {
-      this.mismatchSources = mismatchSources;
-    }
-
-    @Override
-    public String toString() {
-      if (mismatchSources.length > 0) {
-        return mismatchSources[0] + " " + getMismatchDetails();
-      } else {
-        return "<no-source> " + getMismatchDetails();
-      }
-    }
-
-    /** Human-readable string describing the mismatch. */
-    abstract String getMismatchDetails();
-
-    public static class MissingClass extends Mismatch {
-      private final String className;
-
-      public MissingClass(final String[] sources, final String className) {
-        super(sources);
-        this.className = className;
-      }
-
-      @Override
-      String getMismatchDetails() {
-        return "Missing class " + className;
-      }
-    }
-
-    public static class MissingFlag extends Mismatch {
-      private final int expectedFlag;
-      private final String classMethodOrFieldDesc;
-      private final int foundAccess;
-
-      public MissingFlag(
-          final String[] sources,
-          final String classMethodOrFieldDesc,
-          final int expectedFlag,
-          final int foundAccess) {
-        super(sources);
-        this.classMethodOrFieldDesc = classMethodOrFieldDesc;
-        this.expectedFlag = expectedFlag;
-        this.foundAccess = foundAccess;
-      }
-
-      @Override
-      String getMismatchDetails() {
-        return classMethodOrFieldDesc
-            + " expected "
-            + prettyPrint(expectedFlag)
-            + " found "
-            + Modifier.toString(foundAccess);
-      }
-    }
-
-    public static class MissingField extends Mismatch {
-      private final String className;
-      private final String fieldName;
-      private final String fieldDesc;
-
-      public MissingField(
-          final String[] sources,
-          final String className,
-          final String fieldName,
-          final String fieldDesc) {
-        super(sources);
+    public final String className;
+    public final String superName;
+    public final String[] interfaces;
+    public final Field[] fields;
+    public final Method[] methods;
+
+    public Reference(
+            final String[] sources,
+            final int flags,
+            final String className,
+            final String superName,
+            final String[] interfaces,
+            final Field[] fields,
+            final Method[] methods) {
+        this.sources = sources;
+        this.flags = flags;
         this.className = className;
-        this.fieldName = fieldName;
-        this.fieldDesc = fieldDesc;
-      }
-
-      @Override
-      String getMismatchDetails() {
-        return "Missing field " + className + "#" + fieldName + fieldDesc;
-      }
-    }
-
-    public static class MissingMethod extends Mismatch {
-      private final String className;
-      private final String method;
-      private final String methodType;
-
-      public MissingMethod(
-          final String[] sources,
-          final String className,
-          final String method,
-          final String methodType) {
-        super(sources);
-        this.className = className;
-        this.method = method;
-        this.methodType = methodType;
-      }
-
-      @Override
-      String getMismatchDetails() {
-        return "Missing method " + className + "#" + method + methodType;
-      }
-    }
-
-    /** Fallback mismatch in case an unexpected exception occurs during reference checking. */
-    public static class ReferenceCheckError extends Mismatch {
-      private final Exception referenceCheckException;
-      private final Reference referenceBeingChecked;
-      private final String location;
-
-      public ReferenceCheckError(
-          final Exception referenceCheckException,
-          final Reference referenceBeingChecked,
-          final String location) {
-        super(new String[0]);
-        this.referenceCheckException = referenceCheckException;
-        this.referenceBeingChecked = referenceBeingChecked;
-        this.location = location;
-      }
-
-      @Override
-      String getMismatchDetails() {
-        final StringWriter sw = new StringWriter();
-        sw.write("Failed to generate reference check for: ");
-        sw.write(referenceBeingChecked.toString());
-        sw.write(" at ");
-        sw.write(location);
-        sw.write("\n");
-        // add exception message and stack trace
-        final PrintWriter pw = new PrintWriter(sw);
-        referenceCheckException.printStackTrace(pw);
-        return sw.toString();
-      }
-    }
-  }
-
-  public static class Builder {
-    private final Set<String> sources = new LinkedHashSet<>();
-    private int flags = 0;
-    private final String className;
-    private String superName = null;
-    private final Set<String> interfaces = new LinkedHashSet<>();
-    private final List<Field> fields = new ArrayList<>();
-    private final List<Method> methods = new ArrayList<>();
-
-    public Builder(final String className) {
-      this.className = className;
-    }
-
-    public Builder withSuperName(final String superName) {
-      this.superName = superName;
-      return this;
-    }
-
-    public Builder withInterface(final String interfaceName) {
-      interfaces.add(interfaceName);
-      return this;
-    }
-
-    public Builder withSource(final String sourceName, final int line) {
-      sources.add(sourceName + ":" + line);
-      return this;
-    }
-
-    public Builder withFlag(final int flag) {
-      flags |= flag;
-      return this;
-    }
-
-    public Builder withField(
-        final String[] sources,
-        final int fieldFlags,
-        final String fieldName,
-        final Type fieldType) {
-      return withField(sources, fieldFlags, fieldName, getDescriptor(fieldType));
-    }
-
-    public Builder withField(
-        final String[] sources,
-        final int fieldFlags,
-        final String fieldName,
-        final String fieldType) {
-      final Field field = new Field(sources, fieldFlags, fieldName, fieldType);
-      final int existingIndex = fields.indexOf(field);
-      if (existingIndex == -1) {
-        fields.add(field);
-      } else {
-        fields.set(existingIndex, field.merge(fields.get(existingIndex)));
-      }
-      return this;
-    }
-
-    public Builder withMethod(
-        final String[] sources,
-        final int methodFlags,
-        final String methodName,
-        final Type returnType,
-        final Type... parameterTypes) {
-      return withMethod(
-          sources,
-          methodFlags,
-          methodName,
-          getDescriptor(returnType),
-          getDescriptors(parameterTypes));
-    }
-
-    public Builder withMethod(
-        final String[] sources,
-        final int methodFlags,
-        final String methodName,
-        final String returnType,
-        final String... parameterTypes) {
-      StringBuilder methodType = new StringBuilder().append('(');
-      for (String parameterType : parameterTypes) {
-        methodType.append(parameterType);
-      }
-      methodType.append(')').append(returnType);
-      final Method method = new Method(sources, methodFlags, methodName, methodType.toString());
-      final int existingIndex = methods.indexOf(method);
-      if (existingIndex == -1) {
-        methods.add(method);
-      } else {
-        methods.set(existingIndex, method.merge(methods.get(existingIndex)));
-      }
-      return this;
-    }
-
-    public Reference build() {
-      return new Reference(
-          sources.toArray(new String[sources.size()]),
-          flags,
-          Strings.getClassName(className),
-          null != superName ? Strings.getClassName(superName) : null,
-          interfaces.toArray(new String[interfaces.size()]),
-          fields.toArray(new Field[fields.size()]),
-          methods.toArray(new Method[methods.size()]));
-    }
-
-    /** Builds a reference that checks the next spec if the current spec doesn't match. */
-    public Builder or() {
-      return new OrBuilder(build());
-    }
-  }
-
-  static class OrBuilder extends Builder {
-    private final Reference either;
-    private final List<Reference> ors;
-
-    OrBuilder(Reference either) {
-      super(either.className);
-      this.either = either;
-      this.ors = new ArrayList<>();
+        this.superName = superName;
+        this.interfaces = interfaces;
+        this.methods = methods;
+        this.fields = fields;
+    }
+
+    /**
+     * Create a new reference which combines this reference with another reference of the same type.
+     *
+     * @param anotherReference A reference to the same class
+     * @return a new Reference which merges the two references
+     */
+    public Reference merge(final Reference anotherReference) {
+        if (!anotherReference.className.equals(className)) {
+            throw new IllegalStateException("illegal merge " + this + " != " + anotherReference);
+        }
+        return new Reference(
+                Reference.merge(sources, anotherReference.sources),
+                mergeFlags(flags, anotherReference.flags),
+                className,
+                null != this.superName ? this.superName : anotherReference.superName,
+                Reference.merge(interfaces, anotherReference.interfaces),
+                mergeFields(fields, anotherReference.fields),
+                mergeMethods(methods, anotherReference.methods));
     }
 
     @Override
-    public Reference build() {
-      ors.add(super.build());
-      return new OrReference(either, ors.toArray(new Reference[ors.size()]));
-    }
-
-    @Override
-    public Builder or() {
-      ors.add(super.build());
-      return this;
-    }
-  }
-
-  private static <E> E[] merge(final E[] array1, final E[] array2) {
-    final Set<E> set = new LinkedHashSet<>((array1.length + array2.length) * 4 / 3);
-    set.addAll(asList(array1));
-    set.addAll(asList(array2));
-    return set.toArray((E[]) Array.newInstance(array1.getClass().getComponentType(), set.size()));
-  }
-
-  private static int mergeFlags(final int flags1, final int flags2) {
-    // TODO: Assert flags are non-contradictory and resolve
-    // public > protected > package-private > private
-    return flags1 | flags2;
-  }
-
-  private static Field[] mergeFields(final Field[] fields1, final Field[] fields2) {
-    final List<Field> merged = new ArrayList<>(asList(fields1));
-    for (final Field field : fields2) {
-      final int i = merged.indexOf(field);
-      if (i == -1) {
-        merged.add(field);
-      } else {
-        merged.set(i, merged.get(i).merge(field));
-      }
-    }
-    return merged.toArray(new Field[merged.size()]);
-  }
-
-  private static Method[] mergeMethods(final Method[] methods1, final Method[] methods2) {
-    final List<Method> merged = new ArrayList<>(asList(methods1));
-    for (final Method method : methods2) {
-      final int i = merged.indexOf(method);
-      if (i == -1) {
-        merged.add(method);
-      } else {
-        merged.set(i, merged.get(i).merge(method));
-      }
-    }
-    return merged.toArray(new Method[merged.size()]);
-  }
-
-  private static String getDescriptor(Type type) {
-    return type.getDescriptor();
-  }
-
-  private static String[] getDescriptors(Type[] types) {
-    String[] descriptors = new String[types.length];
-    for (int i = 0; i < types.length; i++) {
-      descriptors[i] = types[i].getDescriptor();
-    }
-    return descriptors;
-  }
-
-  static String prettyPrint(int flags) {
-    StringBuilder buf = new StringBuilder();
-    if ((flags & EXPECTS_PUBLIC) != 0) {
-      buf.append("public ");
-    }
-    if ((flags & EXPECTS_PUBLIC_OR_PROTECTED) != 0) {
-      buf.append("public_or_protected ");
-    }
-    if ((flags & EXPECTS_NON_PRIVATE) != 0) {
-      buf.append("non_private ");
-    }
-    if ((flags & EXPECTS_STATIC) != 0) {
-      buf.append("static ");
-    }
-    if ((flags & EXPECTS_NON_STATIC) != 0) {
-      buf.append("non_static ");
-    }
-    if ((flags & EXPECTS_INTERFACE) != 0) {
-      buf.append("interface ");
-    }
-    if ((flags & EXPECTS_NON_INTERFACE) != 0) {
-      buf.append("non_interface ");
+    public String toString() {
+        return "Reference<" + className + ">";
+    }
+
+    public static final int EXPECTS_PUBLIC = 1;
+    public static final int EXPECTS_PUBLIC_OR_PROTECTED = 2;
+    public static final int EXPECTS_NON_PRIVATE = 4;
+    public static final int EXPECTS_STATIC = 8;
+    public static final int EXPECTS_NON_STATIC = 16;
+    public static final int EXPECTS_INTERFACE = 32;
+    public static final int EXPECTS_NON_INTERFACE = 64;
+    public static final int EXPECTS_NON_FINAL = 128;
+
+    public static boolean matches(int flags, int modifiers) {
+        if ((flags & EXPECTS_PUBLIC) != 0 && (modifiers & Opcodes.ACC_PUBLIC) == 0) {
+            return false;
+        } else if ((flags & EXPECTS_PUBLIC_OR_PROTECTED) != 0
+                && (modifiers & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PROTECTED)) == 0) {
+            return false;
+        } else if ((flags & EXPECTS_NON_PRIVATE) != 0 && (modifiers & Opcodes.ACC_PRIVATE) != 0) {
+            return false;
+        } else if ((flags & EXPECTS_STATIC) != 0 && (modifiers & Opcodes.ACC_STATIC) == 0) {
+            return false;
+        } else if ((flags & EXPECTS_NON_STATIC) != 0 && (modifiers & Opcodes.ACC_STATIC) != 0) {
+            return false;
+        } else if ((flags & EXPECTS_INTERFACE) != 0 && (modifiers & Opcodes.ACC_INTERFACE) == 0) {
+            return false;
+        } else if ((flags & EXPECTS_NON_INTERFACE) != 0 && (modifiers & Opcodes.ACC_INTERFACE) != 0) {
+            return false;
+        } else if ((flags & EXPECTS_NON_FINAL) != 0 && (modifiers & Opcodes.ACC_FINAL) != 0) {
+            return false;
+        }
+        return true;
+    }
+
+    public static class Field {
+        public final String[] sources;
+        public final int flags;
+        public final String name;
+        public final String fieldType;
+
+        public Field(final String[] sources, final int flags, final String name, final String fieldType) {
+            this.sources = sources;
+            this.flags = flags;
+            this.name = name;
+            this.fieldType = fieldType;
+        }
+
+        public Field merge(final Field anotherField) {
+            // consider both name and type when merging...
+            if (!name.equals(anotherField.name) || !fieldType.equals(anotherField.fieldType)) {
+                throw new IllegalStateException("illegal merge " + this + " != " + anotherField);
+            }
+            return new Field(
+                    Reference.merge(sources, anotherField.sources),
+                    mergeFlags(flags, anotherField.flags),
+                    name,
+                    fieldType);
+        }
+
+        @Override
+        public String toString() {
+            return name + fieldType;
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (o instanceof Field) {
+                final Field other = (Field) o;
+                return name.equals(other.name);
+            }
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return name.hashCode();
+        }
+    }
+
+    public static class Method {
+        public final String[] sources;
+        public final int flags;
+        public final String name;
+        public final String methodType;
+
+        public Method(final String[] sources, final int flags, final String name, final String methodType) {
+            this.sources = sources;
+            this.flags = flags;
+            this.name = name;
+            this.methodType = methodType;
+        }
+
+        public Method merge(final Method anotherMethod) {
+            if (!equals(anotherMethod)) {
+                throw new IllegalStateException("illegal merge " + this + " != " + anotherMethod);
+            }
+            return new Method(
+                    Reference.merge(sources, anotherMethod.sources),
+                    mergeFlags(flags, anotherMethod.flags),
+                    name,
+                    methodType);
+        }
+
+        @Override
+        public String toString() {
+            return name + methodType;
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (o instanceof Method) {
+                final Method m = (Method) o;
+                return name.equals(m.name) && methodType.equals(m.methodType);
+            }
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return toString().hashCode();
+        }
+    }
+
+    /**
+     * A mismatch between a Reference and a runtime class.
+     *
+     * <p>This class' toString returns a human-readable description of the mismatch along with
+     * source-code locations of the instrumentation which caused the mismatch.
+     */
+    public abstract static class Mismatch {
+        /** Instrumentation sources which caused the mismatch. */
+        private final String[] mismatchSources;
+
+        Mismatch(final String[] mismatchSources) {
+            this.mismatchSources = mismatchSources;
+        }
+
+        @Override
+        public String toString() {
+            if (mismatchSources.length > 0) {
+                return mismatchSources[0] + " " + getMismatchDetails();
+            } else {
+                return "<no-source> " + getMismatchDetails();
+            }
+        }
+
+        /** Human-readable string describing the mismatch. */
+        abstract String getMismatchDetails();
+
+        public static class MissingClass extends Mismatch {
+            private final String className;
+
+            public MissingClass(final String[] sources, final String className) {
+                super(sources);
+                this.className = className;
+            }
+
+            @Override
+            String getMismatchDetails() {
+                return "Missing class " + className;
+            }
+        }
+
+        public static class MissingFlag extends Mismatch {
+            private final int expectedFlag;
+            private final String classMethodOrFieldDesc;
+            private final int foundAccess;
+
+            public MissingFlag(
+                    final String[] sources,
+                    final String classMethodOrFieldDesc,
+                    final int expectedFlag,
+                    final int foundAccess) {
+                super(sources);
+                this.classMethodOrFieldDesc = classMethodOrFieldDesc;
+                this.expectedFlag = expectedFlag;
+                this.foundAccess = foundAccess;
+            }
+
+            @Override
+            String getMismatchDetails() {
+                return classMethodOrFieldDesc
+                        + " expected "
+                        + prettyPrint(expectedFlag)
+                        + " found "
+                        + Modifier.toString(foundAccess);
+            }
+        }
+
+        public static class MissingField extends Mismatch {
+            private final String className;
+            private final String fieldName;
+            private final String fieldDesc;
+
+            public MissingField(
+                    final String[] sources, final String className, final String fieldName, final String fieldDesc) {
+                super(sources);
+                this.className = className;
+                this.fieldName = fieldName;
+                this.fieldDesc = fieldDesc;
+            }
+
+            @Override
+            String getMismatchDetails() {
+                return "Missing field " + className + "#" + fieldName + fieldDesc;
+            }
+        }
+
+        public static class MissingMethod extends Mismatch {
+            private final String className;
+            private final String method;
+            private final String methodType;
+
+            public MissingMethod(
+                    final String[] sources, final String className, final String method, final String methodType) {
+                super(sources);
+                this.className = className;
+                this.method = method;
+                this.methodType = methodType;
+            }
+
+            @Override
+            String getMismatchDetails() {
+                return "Missing method " + className + "#" + method + methodType;
+            }
+        }
+
+        /** Fallback mismatch in case an unexpected exception occurs during reference checking. */
+        public static class ReferenceCheckError extends Mismatch {
+            private final Exception referenceCheckException;
+            private final Reference referenceBeingChecked;
+            private final String location;
+
+            public ReferenceCheckError(
+                    final Exception referenceCheckException,
+                    final Reference referenceBeingChecked,
+                    final String location) {
+                super(new String[0]);
+                this.referenceCheckException = referenceCheckException;
+                this.referenceBeingChecked = referenceBeingChecked;
+                this.location = location;
+            }
+
+            @Override
+            String getMismatchDetails() {
+                final StringWriter sw = new StringWriter();
+                sw.write("Failed to generate reference check for: ");
+                sw.write(referenceBeingChecked.toString());
+                sw.write(" at ");
+                sw.write(location);
+                sw.write("\n");
+                // add exception message and stack trace
+                final PrintWriter pw = new PrintWriter(sw);
+                referenceCheckException.printStackTrace(pw);
+                return sw.toString();
+            }
+        }
+    }
+
+    public static class Builder {
+        private final Set<String> sources = new LinkedHashSet<>();
+        private int flags = 0;
+        private final String className;
+        private String superName = null;
+        private final Set<String> interfaces = new LinkedHashSet<>();
+        private final List<Field> fields = new ArrayList<>();
+        private final List<Method> methods = new ArrayList<>();
+
+        public Builder(final String className) {
+            this.className = className;
+        }
+
+        public Builder withSuperName(final String superName) {
+            this.superName = superName;
+            return this;
+        }
+
+        public Builder withInterface(final String interfaceName) {
+            interfaces.add(interfaceName);
+            return this;
+        }
+
+        public Builder withSource(final String sourceName, final int line) {
+            sources.add(sourceName + ":" + line);
+            return this;
+        }
+
+        public Builder withFlag(final int flag) {
+            flags |= flag;
+            return this;
+        }
+
+        public Builder withField(
+                final String[] sources, final int fieldFlags, final String fieldName, final Type fieldType) {
+            return withField(sources, fieldFlags, fieldName, getDescriptor(fieldType));
+        }
+
+        public Builder withField(
+                final String[] sources, final int fieldFlags, final String fieldName, final String fieldType) {
+            final Field field = new Field(sources, fieldFlags, fieldName, fieldType);
+            final int existingIndex = fields.indexOf(field);
+            if (existingIndex == -1) {
+                fields.add(field);
+            } else {
+                fields.set(existingIndex, field.merge(fields.get(existingIndex)));
+            }
+            return this;
+        }
+
+        public Builder withMethod(
+                final String[] sources,
+                final int methodFlags,
+                final String methodName,
+                final Type returnType,
+                final Type... parameterTypes) {
+            return withMethod(
+                    sources, methodFlags, methodName, getDescriptor(returnType), getDescriptors(parameterTypes));
+        }
+
+        public Builder withMethod(
+                final String[] sources,
+                final int methodFlags,
+                final String methodName,
+                final String returnType,
+                final String... parameterTypes) {
+            StringBuilder methodType = new StringBuilder().append('(');
+            for (String parameterType : parameterTypes) {
+                methodType.append(parameterType);
+            }
+            methodType.append(')').append(returnType);
+            final Method method = new Method(sources, methodFlags, methodName, methodType.toString());
+            final int existingIndex = methods.indexOf(method);
+            if (existingIndex == -1) {
+                methods.add(method);
+            } else {
+                methods.set(existingIndex, method.merge(methods.get(existingIndex)));
+            }
+            return this;
+        }
+
+        public Reference build() {
+            return new Reference(
+                    sources.toArray(new String[sources.size()]),
+                    flags,
+                    Strings.getClassName(className),
+                    null != superName ? Strings.getClassName(superName) : null,
+                    interfaces.toArray(new String[interfaces.size()]),
+                    fields.toArray(new Field[fields.size()]),
+                    methods.toArray(new Method[methods.size()]));
+        }
+
+        /** Builds a reference that checks the next spec if the current spec doesn't match. */
+        public Builder or() {
+            return new OrBuilder(build());
+        }
+    }
+
+    static class OrBuilder extends Builder {
+        private final Reference either;
+        private final List<Reference> ors;
+
+        OrBuilder(Reference either) {
+            super(either.className);
+            this.either = either;
+            this.ors = new ArrayList<>();
+        }
+
+        @Override
+        public Reference build() {
+            ors.add(super.build());
+            return new OrReference(either, ors.toArray(new Reference[ors.size()]));
+        }
+
+        @Override
+        public Builder or() {
+            ors.add(super.build());
+            return this;
+        }
+    }
+
+    private static <E> E[] merge(final E[] array1, final E[] array2) {
+        final Set<E> set = new LinkedHashSet<>((array1.length + array2.length) * 4 / 3);
+        set.addAll(asList(array1));
+        set.addAll(asList(array2));
+        return set.toArray((E[]) Array.newInstance(array1.getClass().getComponentType(), set.size()));
+    }
+
+    private static int mergeFlags(final int flags1, final int flags2) {
+        // TODO: Assert flags are non-contradictory and resolve
+        // public > protected > package-private > private
+        return flags1 | flags2;
+    }
+
+    private static Field[] mergeFields(final Field[] fields1, final Field[] fields2) {
+        final List<Field> merged = new ArrayList<>(asList(fields1));
+        for (final Field field : fields2) {
+            final int i = merged.indexOf(field);
+            if (i == -1) {
+                merged.add(field);
+            } else {
+                merged.set(i, merged.get(i).merge(field));
+            }
+        }
+        return merged.toArray(new Field[merged.size()]);
+    }
+
+    private static Method[] mergeMethods(final Method[] methods1, final Method[] methods2) {
+        final List<Method> merged = new ArrayList<>(asList(methods1));
+        for (final Method method : methods2) {
+            final int i = merged.indexOf(method);
+            if (i == -1) {
+                merged.add(method);
+            } else {
+                merged.set(i, merged.get(i).merge(method));
+            }
+        }
+        return merged.toArray(new Method[merged.size()]);
+    }
+
+    private static String getDescriptor(Type type) {
+        return type.getDescriptor();
+    }
+
+    private static String[] getDescriptors(Type[] types) {
+        String[] descriptors = new String[types.length];
+        for (int i = 0; i < types.length; i++) {
+            descriptors[i] = types[i].getDescriptor();
+        }
+        return descriptors;
+    }
+
+    static String prettyPrint(int flags) {
+        StringBuilder buf = new StringBuilder();
+        if ((flags & EXPECTS_PUBLIC) != 0) {
+            buf.append("public ");
+        }
+        if ((flags & EXPECTS_PUBLIC_OR_PROTECTED) != 0) {
+            buf.append("public_or_protected ");
+        }
+        if ((flags & EXPECTS_NON_PRIVATE) != 0) {
+            buf.append("non_private ");
+        }
+        if ((flags & EXPECTS_STATIC) != 0) {
+            buf.append("static ");
+        }
+        if ((flags & EXPECTS_NON_STATIC) != 0) {
+            buf.append("non_static ");
+        }
+        if ((flags & EXPECTS_INTERFACE) != 0) {
+            buf.append("interface ");
+        }
+        if ((flags & EXPECTS_NON_INTERFACE) != 0) {
+            buf.append("non_interface ");
+        }
+        return buf.toString();
     }
-    return buf.toString();
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceCreator.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceCreator.java
index 04a24c95c9b..d036ee81526 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceCreator.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceCreator.java
@@ -21,302 +21,297 @@
 
 /** Converts neutral advice uses into the existing member-level muzzle reference model. */
 public final class ReferenceCreator {
-  private static final Set<String> OBJECT_METHODS = new HashSet<>();
+    private static final Set<String> OBJECT_METHODS = new HashSet<>();
 
-  static {
-    for (Method method : Object.class.getMethods()) {
-      OBJECT_METHODS.add(methodSig(method.getName(), Type.getMethodDescriptor(method)));
+    static {
+        for (Method method : Object.class.getMethods()) {
+            OBJECT_METHODS.add(methodSig(method.getName(), Type.getMethodDescriptor(method)));
+        }
     }
-  }
-
-  private final AdviceScanResult scanResult;
-  private final AdviceShader shader;
-  private final Map<String, Reference> references = new LinkedHashMap<>();
-  private final Queue<String> sources = new ArrayDeque<>();
-  private final Set<String> visitedSources = new HashSet<>();
 
-  private ReferenceCreator(AdviceScanResult scanResult, AdviceShader shader) {
-    this.scanResult = scanResult;
-    this.shader = shader;
-  }
+    private final AdviceScanResult scanResult;
+    private final AdviceShader shader;
+    private final Map<String, Reference> references = new LinkedHashMap<>();
+    private final Queue<String> sources = new ArrayDeque<>();
+    private final Set<String> visitedSources = new HashSet<>();
 
-  static List<Reference> createReferences(AdviceScanResult scanResult, AdviceShader shader) {
-    ReferenceCreator creator = new ReferenceCreator(scanResult, shader);
-    creator.sources.addAll(scanResult.getAdviceRoots());
-    creator.createReferences();
-    return new ArrayList<>(creator.references.values());
-  }
+    private ReferenceCreator(AdviceScanResult scanResult, AdviceShader shader) {
+        this.scanResult = scanResult;
+        this.shader = shader;
+    }
 
-  private void createReferences() {
-    String sourceClass;
-    while ((sourceClass = sources.poll()) != null) {
-      if (!visitedSources.add(sourceClass)) {
-        continue;
-      }
-      ClassInfo info = scanResult.getClassInfo(sourceClass);
-      if (info != null && info.isScanned()) {
-        for (Usage usage : info.getUsages()) {
-          add(usage);
-        }
-      }
+    static List<Reference> createReferences(AdviceScanResult scanResult, AdviceShader shader) {
+        ReferenceCreator creator = new ReferenceCreator(scanResult, shader);
+        creator.sources.addAll(scanResult.getAdviceRoots());
+        creator.createReferences();
+        return new ArrayList<>(creator.references.values());
     }
-  }
 
-  private void add(Usage usage) {
-    switch (usage.getKind()) {
-      case TYPE:
-        // ReferenceCreator did not visit MULTIANEWARRAY instructions.
-        if (usage.getOpcode() != Opcodes.MULTIANEWARRAY) {
-          addTypeReference(usage.getOwner(), usage.getSource(), usage.isImplementedInterface());
+    private void createReferences() {
+        String sourceClass;
+        while ((sourceClass = sources.poll()) != null) {
+            if (!visitedSources.add(sourceClass)) {
+                continue;
+            }
+            ClassInfo info = scanResult.getClassInfo(sourceClass);
+            if (info != null && info.isScanned()) {
+                for (Usage usage : info.getUsages()) {
+                    add(usage);
+                }
+            }
         }
-        break;
-      case FIELD:
-        addFieldReference(usage);
-        break;
-      case METHOD:
-        addMethodReference(usage);
-        break;
-      case HANDLE:
-        // ReferenceCreator did not treat method handles loaded with ldc as muzzle references.
-        break;
-      case INVOKEDYNAMIC:
-        addInvokeDynamicReferences(usage.getHandles(), usage.getSource());
-        break;
-      default:
-        throw new IllegalStateException("Unhandled advice usage " + usage.getKind());
     }
-  }
 
-  private void addFieldReference(Usage usage) {
-    String owner = underlyingClassName(usage.getOwner());
-    if (owner == null) {
-      return;
-    }
-    String shadedOwner = shade(owner);
-    if (ignoreReference(shadedOwner)) {
-      return;
+    private void add(Usage usage) {
+        switch (usage.getKind()) {
+            case TYPE:
+                // ReferenceCreator did not visit MULTIANEWARRAY instructions.
+                if (usage.getOpcode() != Opcodes.MULTIANEWARRAY) {
+                    addTypeReference(usage.getOwner(), usage.getSource(), usage.isImplementedInterface());
+                }
+                break;
+            case FIELD:
+                addFieldReference(usage);
+                break;
+            case METHOD:
+                addMethodReference(usage);
+                break;
+            case HANDLE:
+                // ReferenceCreator did not treat method handles loaded with ldc as muzzle references.
+                break;
+            case INVOKEDYNAMIC:
+                addInvokeDynamicReferences(usage.getHandles(), usage.getSource());
+                break;
+            default:
+                throw new IllegalStateException("Unhandled advice usage " + usage.getKind());
+        }
     }
-    String source = shade(usage.getSource().getClassName());
-    String sourceInternal = internalName(source);
-    String ownerInternal = internalName(shadedOwner);
-    int fieldFlags = computeMinimumFieldAccess(sourceInternal, ownerInternal);
-    fieldFlags |=
-        usage.getOpcode() == Opcodes.GETSTATIC || usage.getOpcode() == Opcodes.PUTSTATIC
-            ? Reference.EXPECTS_STATIC
-            : Reference.EXPECTS_NON_STATIC;
-    merge(
-        owner,
-        new Reference.Builder(ownerInternal)
-            .withSource(source, usage.getSource().getLine())
-            .withFlag(computeMinimumClassAccess(sourceInternal, ownerInternal))
-            .withField(
-                new String[] {source + ":" + usage.getSource().getLine()},
-                fieldFlags,
-                usage.getName(),
-                shadeTypeDescriptor(usage.getDescriptor()))
-            .build());
-    addDescriptorType(Type.getType(usage.getDescriptor()), usage.getSource());
-  }
 
-  private void addMethodReference(Usage usage) {
-    String owner = underlyingClassName(usage.getOwner());
-    if (owner == null) {
-      return;
-    }
-    String shadedOwner = shade(owner);
-    String descriptor = shadeMethodDescriptor(usage.getDescriptor());
-    if (ignoreReference(shadedOwner) || ignoreObjectMethod(usage.getName(), descriptor)) {
-      return;
+    private void addFieldReference(Usage usage) {
+        String owner = underlyingClassName(usage.getOwner());
+        if (owner == null) {
+            return;
+        }
+        String shadedOwner = shade(owner);
+        if (ignoreReference(shadedOwner)) {
+            return;
+        }
+        String source = shade(usage.getSource().getClassName());
+        String sourceInternal = internalName(source);
+        String ownerInternal = internalName(shadedOwner);
+        int fieldFlags = computeMinimumFieldAccess(sourceInternal, ownerInternal);
+        fieldFlags |= usage.getOpcode() == Opcodes.GETSTATIC || usage.getOpcode() == Opcodes.PUTSTATIC
+                ? Reference.EXPECTS_STATIC
+                : Reference.EXPECTS_NON_STATIC;
+        merge(
+                owner,
+                new Reference.Builder(ownerInternal)
+                        .withSource(source, usage.getSource().getLine())
+                        .withFlag(computeMinimumClassAccess(sourceInternal, ownerInternal))
+                        .withField(
+                                new String[] {source + ":" + usage.getSource().getLine()},
+                                fieldFlags,
+                                usage.getName(),
+                                shadeTypeDescriptor(usage.getDescriptor()))
+                        .build());
+        addDescriptorType(Type.getType(usage.getDescriptor()), usage.getSource());
     }
 
-    Type originalMethodType = Type.getMethodType(usage.getDescriptor());
-    addDescriptorType(originalMethodType.getReturnType(), usage.getSource());
-    for (Type argument : originalMethodType.getArgumentTypes()) {
-      addDescriptorType(argument, usage.getSource());
-    }
+    private void addMethodReference(Usage usage) {
+        String owner = underlyingClassName(usage.getOwner());
+        if (owner == null) {
+            return;
+        }
+        String shadedOwner = shade(owner);
+        String descriptor = shadeMethodDescriptor(usage.getDescriptor());
+        if (ignoreReference(shadedOwner) || ignoreObjectMethod(usage.getName(), descriptor)) {
+            return;
+        }
 
-    String source = shade(usage.getSource().getClassName());
-    String sourceInternal = internalName(source);
-    String ownerInternal = internalName(shadedOwner);
-    int methodFlags = computeMinimumMethodAccess(sourceInternal, ownerInternal);
-    methodFlags |=
-        usage.getOpcode() == Opcodes.INVOKESTATIC
-            ? Reference.EXPECTS_STATIC
-            : Reference.EXPECTS_NON_STATIC;
-    Type methodType = Type.getMethodType(descriptor);
-    merge(
-        owner,
-        new Reference.Builder(ownerInternal)
-            .withSource(source, usage.getSource().getLine())
-            .withFlag(
-                usage.isInterfaceOwner()
-                    ? Reference.EXPECTS_INTERFACE
-                    : Reference.EXPECTS_NON_INTERFACE)
-            .withFlag(computeMinimumClassAccess(sourceInternal, ownerInternal))
-            .withMethod(
-                new String[] {source + ":" + usage.getSource().getLine()},
-                methodFlags,
-                usage.getName(),
-                methodType.getReturnType(),
-                methodType.getArgumentTypes())
-            .build());
-  }
+        Type originalMethodType = Type.getMethodType(usage.getDescriptor());
+        addDescriptorType(originalMethodType.getReturnType(), usage.getSource());
+        for (Type argument : originalMethodType.getArgumentTypes()) {
+            addDescriptorType(argument, usage.getSource());
+        }
 
-  private void addInvokeDynamicReferences(List<HandleUse> handles, SourceLocation source) {
-    for (HandleUse handle : handles) {
-      String className = handle.getOwner();
-      String shadedClass = shade(className);
-      if (shadedClass.startsWith("java.")) {
-        continue;
-      }
-      String shadedSource = shade(source.getClassName());
-      String sourceInternal = internalName(shadedSource);
-      String classInternal = internalName(shadedClass);
-      merge(
-          className,
-          new Reference.Builder(classInternal)
-              .withSource(shadedSource, source.getLine())
-              .withFlag(computeMinimumClassAccess(sourceInternal, classInternal))
-              .build());
+        String source = shade(usage.getSource().getClassName());
+        String sourceInternal = internalName(source);
+        String ownerInternal = internalName(shadedOwner);
+        int methodFlags = computeMinimumMethodAccess(sourceInternal, ownerInternal);
+        methodFlags |=
+                usage.getOpcode() == Opcodes.INVOKESTATIC ? Reference.EXPECTS_STATIC : Reference.EXPECTS_NON_STATIC;
+        Type methodType = Type.getMethodType(descriptor);
+        merge(
+                owner,
+                new Reference.Builder(ownerInternal)
+                        .withSource(source, usage.getSource().getLine())
+                        .withFlag(
+                                usage.isInterfaceOwner()
+                                        ? Reference.EXPECTS_INTERFACE
+                                        : Reference.EXPECTS_NON_INTERFACE)
+                        .withFlag(computeMinimumClassAccess(sourceInternal, ownerInternal))
+                        .withMethod(
+                                new String[] {source + ":" + usage.getSource().getLine()},
+                                methodFlags,
+                                usage.getName(),
+                                methodType.getReturnType(),
+                                methodType.getArgumentTypes())
+                        .build());
     }
-  }
 
-  private void addDescriptorType(Type type, SourceLocation source) {
-    while (type.getSort() == Type.ARRAY) {
-      type = type.getElementType();
-    }
-    if (type.getSort() == Type.OBJECT) {
-      addTypeReference(type.getClassName(), source, false);
+    private void addInvokeDynamicReferences(List<HandleUse> handles, SourceLocation source) {
+        for (HandleUse handle : handles) {
+            String className = handle.getOwner();
+            String shadedClass = shade(className);
+            if (shadedClass.startsWith("java.")) {
+                continue;
+            }
+            String shadedSource = shade(source.getClassName());
+            String sourceInternal = internalName(shadedSource);
+            String classInternal = internalName(shadedClass);
+            merge(
+                    className,
+                    new Reference.Builder(classInternal)
+                            .withSource(shadedSource, source.getLine())
+                            .withFlag(computeMinimumClassAccess(sourceInternal, classInternal))
+                            .build());
+        }
     }
-  }
 
-  private void addTypeReference(
-      String className, SourceLocation source, boolean implementedInterface) {
-    String shadedClass = shade(className);
-    if (ignoreReference(shadedClass)) {
-      return;
+    private void addDescriptorType(Type type, SourceLocation source) {
+        while (type.getSort() == Type.ARRAY) {
+            type = type.getElementType();
+        }
+        if (type.getSort() == Type.OBJECT) {
+            addTypeReference(type.getClassName(), source, false);
+        }
     }
-    String shadedSource = shade(source.getClassName());
-    String sourceInternal = internalName(shadedSource);
-    String classInternal = internalName(shadedClass);
-    int flags =
-        implementedInterface
-            ? Reference.EXPECTS_PUBLIC
-            : computeMinimumClassAccess(sourceInternal, classInternal);
-    merge(
-        className,
-        new Reference.Builder(classInternal)
-            .withSource(shadedSource, source.getLine())
-            .withFlag(flags)
-            .build());
-  }
 
-  private void merge(String unshadedClassName, Reference reference) {
-    Reference previous = references.get(reference.className);
-    references.put(reference.className, previous == null ? reference : previous.merge(reference));
-    ClassInfo info = scanResult.getClassInfo(unshadedClassName);
-    if (info != null && info.isScanned() && info.isInstrumentationClass()) {
-      sources.add(unshadedClassName);
+    private void addTypeReference(String className, SourceLocation source, boolean implementedInterface) {
+        String shadedClass = shade(className);
+        if (ignoreReference(shadedClass)) {
+            return;
+        }
+        String shadedSource = shade(source.getClassName());
+        String sourceInternal = internalName(shadedSource);
+        String classInternal = internalName(shadedClass);
+        int flags = implementedInterface
+                ? Reference.EXPECTS_PUBLIC
+                : computeMinimumClassAccess(sourceInternal, classInternal);
+        merge(
+                className,
+                new Reference.Builder(classInternal)
+                        .withSource(shadedSource, source.getLine())
+                        .withFlag(flags)
+                        .build());
     }
-  }
-
-  private String shade(String className) {
-    return shader == null ? className : shader.shadeClassName(className);
-  }
-
-  private String shadeTypeDescriptor(String descriptor) {
-    return shader == null ? descriptor : shader.shadeTypeDescriptor(descriptor);
-  }
 
-  private String shadeMethodDescriptor(String descriptor) {
-    return shader == null ? descriptor : shader.shadeMethodDescriptor(descriptor);
-  }
-
-  /** Returns the minimum access required for {@code from} to access class {@code to}. */
-  private static int computeMinimumClassAccess(String from, String to) {
-    if (from.equalsIgnoreCase(to)) {
-      return 0;
-    } else if (samePackage(from, to)) {
-      return Reference.EXPECTS_NON_PRIVATE;
-    } else {
-      return Reference.EXPECTS_PUBLIC;
+    private void merge(String unshadedClassName, Reference reference) {
+        Reference previous = references.get(reference.className);
+        references.put(reference.className, previous == null ? reference : previous.merge(reference));
+        ClassInfo info = scanResult.getClassInfo(unshadedClassName);
+        if (info != null && info.isScanned() && info.isInstrumentationClass()) {
+            sources.add(unshadedClassName);
+        }
     }
-  }
 
-  /** Returns the minimum access required for {@code from} to access a field on {@code to}. */
-  private static int computeMinimumFieldAccess(String from, String to) {
-    if (from.equalsIgnoreCase(to)) {
-      return 0;
-    } else if (samePackage(from, to)) {
-      return Reference.EXPECTS_NON_PRIVATE;
-    } else {
-      // Checking the type hierarchy of FROM would distinguish public from protected.
-      return Reference.EXPECTS_PUBLIC_OR_PROTECTED;
+    private String shade(String className) {
+        return shader == null ? className : shader.shadeClassName(className);
     }
-  }
 
-  /** Returns the minimum access required for {@code from} to access a method on {@code to}. */
-  private static int computeMinimumMethodAccess(String from, String to) {
-    if (from.equalsIgnoreCase(to)) {
-      return 0;
+    private String shadeTypeDescriptor(String descriptor) {
+        return shader == null ? descriptor : shader.shadeTypeDescriptor(descriptor);
     }
-    // Checking the type hierarchy of FROM would distinguish public from protected.
-    return Reference.EXPECTS_PUBLIC_OR_PROTECTED;
-  }
 
-  private static boolean samePackage(String from, String to) {
-    int fromLength = from.lastIndexOf('/');
-    int toLength = to.lastIndexOf('/');
-    return fromLength == toLength && from.regionMatches(0, to, 0, fromLength + 1);
-  }
+    private String shadeMethodDescriptor(String descriptor) {
+        return shader == null ? descriptor : shader.shadeMethodDescriptor(descriptor);
+    }
 
-  /** Returns whether this class is always available and does not require a muzzle check. */
-  private static boolean ignoreReference(String name) {
-    String dottedName = name.replace('/', '.');
-    // Drop any array prefix so the component type can be checked.
-    if (dottedName.startsWith("[")) {
-      int componentMarker = dottedName.lastIndexOf("[L");
-      if (componentMarker < 0) {
-        // Primitive array references never require muzzle checks.
-        return true;
-      }
-      dottedName = dottedName.substring(componentMarker + 2);
+    /** Returns the minimum access required for {@code from} to access class {@code to}. */
+    private static int computeMinimumClassAccess(String from, String to) {
+        if (from.equalsIgnoreCase(to)) {
+            return 0;
+        } else if (samePackage(from, to)) {
+            return Reference.EXPECTS_NON_PRIVATE;
+        } else {
+            return Reference.EXPECTS_PUBLIC;
+        }
     }
-    if (dottedName.startsWith("java.")) {
-      return true;
+
+    /** Returns the minimum access required for {@code from} to access a field on {@code to}. */
+    private static int computeMinimumFieldAccess(String from, String to) {
+        if (from.equalsIgnoreCase(to)) {
+            return 0;
+        } else if (samePackage(from, to)) {
+            return Reference.EXPECTS_NON_PRIVATE;
+        } else {
+            // Checking the type hierarchy of FROM would distinguish public from protected.
+            return Reference.EXPECTS_PUBLIC_OR_PROTECTED;
+        }
     }
-    // SLF4J references are relocated to datadog.slf4j in the final agent jar.
-    if (dottedName.startsWith("org.slf4j.")) {
-      return true;
+
+    /** Returns the minimum access required for {@code from} to access a method on {@code to}. */
+    private static int computeMinimumMethodAccess(String from, String to) {
+        if (from.equalsIgnoreCase(to)) {
+            return 0;
+        }
+        // Checking the type hierarchy of FROM would distinguish public from protected.
+        return Reference.EXPECTS_PUBLIC_OR_PROTECTED;
     }
-    for (String prefix : Constants.BOOTSTRAP_PACKAGE_PREFIXES) {
-      if (dottedName.startsWith(prefix)) {
-        return true;
-      }
+
+    private static boolean samePackage(String from, String to) {
+        int fromLength = from.lastIndexOf('/');
+        int toLength = to.lastIndexOf('/');
+        return fromLength == toLength && from.regionMatches(0, to, 0, fromLength + 1);
     }
-    return false;
-  }
 
-  private static boolean ignoreObjectMethod(String methodName, String methodDescriptor) {
-    return OBJECT_METHODS.contains(methodSig(methodName, methodDescriptor));
-  }
+    /** Returns whether this class is always available and does not require a muzzle check. */
+    private static boolean ignoreReference(String name) {
+        String dottedName = name.replace('/', '.');
+        // Drop any array prefix so the component type can be checked.
+        if (dottedName.startsWith("[")) {
+            int componentMarker = dottedName.lastIndexOf("[L");
+            if (componentMarker < 0) {
+                // Primitive array references never require muzzle checks.
+                return true;
+            }
+            dottedName = dottedName.substring(componentMarker + 2);
+        }
+        if (dottedName.startsWith("java.")) {
+            return true;
+        }
+        // SLF4J references are relocated to datadog.slf4j in the final agent jar.
+        if (dottedName.startsWith("org.slf4j.")) {
+            return true;
+        }
+        for (String prefix : Constants.BOOTSTRAP_PACKAGE_PREFIXES) {
+            if (dottedName.startsWith(prefix)) {
+                return true;
+            }
+        }
+        return false;
+    }
 
-  private static String methodSig(String methodName, String methodDescriptor) {
-    return methodName + methodDescriptor;
-  }
+    private static boolean ignoreObjectMethod(String methodName, String methodDescriptor) {
+        return OBJECT_METHODS.contains(methodSig(methodName, methodDescriptor));
+    }
 
-  private static String internalName(String className) {
-    return className.replace('.', '/');
-  }
+    private static String methodSig(String methodName, String methodDescriptor) {
+        return methodName + methodDescriptor;
+    }
 
-  private static String underlyingClassName(String className) {
-    if (!className.startsWith("[")) {
-      return className;
+    private static String internalName(String className) {
+        return className.replace('.', '/');
     }
-    Type type = Type.getType(internalName(className));
-    while (type.getSort() == Type.ARRAY) {
-      type = type.getElementType();
+
+    private static String underlyingClassName(String className) {
+        if (!className.startsWith("[")) {
+            return className;
+        }
+        Type type = Type.getType(internalName(className));
+        while (type.getSort() == Type.ARRAY) {
+            type = type.getElementType();
+        }
+        return type.getSort() == Type.OBJECT ? type.getClassName() : null;
     }
-    return type.getSort() == Type.OBJECT ? type.getClassName() : null;
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceMatcher.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceMatcher.java
index beb32415609..4b2f75b79c1 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceMatcher.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceMatcher.java
@@ -17,286 +17,267 @@
 
 /** Matches a set of references against a classloader. */
 public class ReferenceMatcher {
-  public static final ReferenceMatcher NO_REFERENCES = new ReferenceMatcher();
+    public static final ReferenceMatcher NO_REFERENCES = new ReferenceMatcher();
 
-  private final Reference[] references;
+    private final Reference[] references;
 
-  private ReferenceProvider referenceProvider;
+    private ReferenceProvider referenceProvider;
 
-  public ReferenceMatcher(final Reference... references) {
-    this.references = references;
-  }
-
-  public ReferenceMatcher withReferenceProvider(ReferenceProvider referenceProvider) {
-    if (this != NO_REFERENCES) {
-      this.referenceProvider = referenceProvider;
+    public ReferenceMatcher(final Reference... references) {
+        this.references = references;
     }
-    return this;
-  }
-
-  public Reference[] getReferences() {
-    return references;
-  }
 
-  /**
-   * Matcher used by ByteBuddy, fails-fast at first mismatch found.
-   *
-   * @param loader Classloader to validate against (or null for bootstrap)
-   * @return true if all references match the classpath of loader
-   */
-  public boolean matches(ClassLoader loader) {
-    List<Mismatch> mismatches = new ArrayList<>();
-    TypePool typePool = SharedTypePools.typePool(loader);
-    for (Reference reference : references) {
-      if (!checkReference(typePool, reference, loader, mismatches)) {
-        return false;
-      }
-    }
-    if (null != referenceProvider) {
-      for (Reference reference : referenceProvider.buildReferences(typePool)) {
-        if (!checkReference(typePool, reference, loader, mismatches)) {
-          return false;
+    public ReferenceMatcher withReferenceProvider(ReferenceProvider referenceProvider) {
+        if (this != NO_REFERENCES) {
+            this.referenceProvider = referenceProvider;
         }
-      }
+        return this;
     }
-    return true;
-  }
 
-  /**
-   * Loads the full list of mismatches. Used in debug contexts only
-   *
-   * @param loader Classloader to validate against (or null for bootstrap)
-   * @return A list of all mismatches between this ReferenceMatcher and loader's classpath.
-   */
-  public List<Reference.Mismatch> getMismatchedReferenceSources(ClassLoader loader) {
-    List<Mismatch> mismatches = new ArrayList<>();
-    TypePool typePool = SharedTypePools.typePool(loader);
-    for (Reference reference : references) {
-      checkReference(typePool, reference, loader, mismatches);
+    public Reference[] getReferences() {
+        return references;
     }
-    if (null != referenceProvider) {
-      for (Reference reference : referenceProvider.buildReferences(typePool)) {
-        checkReference(typePool, reference, loader, mismatches);
-      }
-    }
-    return mismatches;
-  }
 
-  /**
-   * Check a reference against a classloader's classpath.
-   *
-   * @return A list of mismatched sources. A list of size 0 means the reference matches the class.
-   */
-  private static boolean checkReference(
-      TypePool typePool, Reference reference, ClassLoader loader, List<Mismatch> mismatches) {
-    int previousMismatchCount = mismatches.size();
-    if (checkMatch(typePool, reference, loader, mismatches)) {
-      return true;
+    /**
+     * Matcher used by ByteBuddy, fails-fast at first mismatch found.
+     *
+     * @param loader Classloader to validate against (or null for bootstrap)
+     * @return true if all references match the classpath of loader
+     */
+    public boolean matches(ClassLoader loader) {
+        List<Mismatch> mismatches = new ArrayList<>();
+        TypePool typePool = SharedTypePools.typePool(loader);
+        for (Reference reference : references) {
+            if (!checkReference(typePool, reference, loader, mismatches)) {
+                return false;
+            }
+        }
+        if (null != referenceProvider) {
+            for (Reference reference : referenceProvider.buildReferences(typePool)) {
+                if (!checkReference(typePool, reference, loader, mismatches)) {
+                    return false;
+                }
+            }
+        }
+        return true;
     }
-    if (reference instanceof OrReference) {
-      for (Reference or : ((OrReference) reference).ors) {
-        if (checkReference(typePool, or, loader, mismatches)) {
-          // alternative spec matched, remove the original spec's mismatches
-          mismatches.subList(previousMismatchCount, mismatches.size()).clear();
-          return true;
+
+    /**
+     * Loads the full list of mismatches. Used in debug contexts only
+     *
+     * @param loader Classloader to validate against (or null for bootstrap)
+     * @return A list of all mismatches between this ReferenceMatcher and loader's classpath.
+     */
+    public List<Reference.Mismatch> getMismatchedReferenceSources(ClassLoader loader) {
+        List<Mismatch> mismatches = new ArrayList<>();
+        TypePool typePool = SharedTypePools.typePool(loader);
+        for (Reference reference : references) {
+            checkReference(typePool, reference, loader, mismatches);
+        }
+        if (null != referenceProvider) {
+            for (Reference reference : referenceProvider.buildReferences(typePool)) {
+                checkReference(typePool, reference, loader, mismatches);
+            }
         }
-      }
+        return mismatches;
     }
-    return false;
-  }
 
-  @SuppressForbidden
-  private static boolean checkMatch(
-      TypePool typePool, Reference reference, ClassLoader loader, List<Mismatch> mismatches) {
-    try {
-      final TypePool.Resolution resolution = typePool.describe(reference.className);
-      if (!resolution.isResolved()) {
-        mismatches.add(new Mismatch.MissingClass(reference.sources, reference.className));
+    /**
+     * Check a reference against a classloader's classpath.
+     *
+     * @return A list of mismatched sources. A list of size 0 means the reference matches the class.
+     */
+    private static boolean checkReference(
+            TypePool typePool, Reference reference, ClassLoader loader, List<Mismatch> mismatches) {
+        int previousMismatchCount = mismatches.size();
+        if (checkMatch(typePool, reference, loader, mismatches)) {
+            return true;
+        }
+        if (reference instanceof OrReference) {
+            for (Reference or : ((OrReference) reference).ors) {
+                if (checkReference(typePool, or, loader, mismatches)) {
+                    // alternative spec matched, remove the original spec's mismatches
+                    mismatches.subList(previousMismatchCount, mismatches.size()).clear();
+                    return true;
+                }
+            }
+        }
         return false;
-      }
-      return checkMatch(reference, resolution.resolve(), mismatches);
-    } catch (final Exception e) {
-      String message = e.getMessage();
-      if (message != null && message.startsWith("Cannot resolve type description for ")) {
-        // bytebuddy throws an illegal state exception with this message if it cannot resolve types
-        // TODO: handle missing type resolutions without catching bytebuddy's exceptions
-        final String className = message.replace("Cannot resolve type description for ", "");
-        mismatches.add(new Mismatch.MissingClass(reference.sources, className));
-      } else {
-        // Shouldn't happen. Fail the reference check and add a mismatch for debug logging.
-        mismatches.add(
-            new Mismatch.ReferenceCheckError(
-                e, reference, null != loader ? loader.toString() : "<bootstrap>"));
-      }
-      return false;
     }
-  }
 
-  public static boolean checkMatch(
-      final Reference reference,
-      final TypeDescription typeOnClasspath,
-      final List<Mismatch> mismatches) {
-    int previousMismatchCount = mismatches.size();
-
-    if (!Reference.matches(reference.flags, typeOnClasspath.getModifiers())) {
-      final String desc = reference.className;
-      mismatches.add(
-          new Mismatch.MissingFlag(
-              reference.sources, desc, reference.flags, typeOnClasspath.getModifiers()));
+    @SuppressForbidden
+    private static boolean checkMatch(
+            TypePool typePool, Reference reference, ClassLoader loader, List<Mismatch> mismatches) {
+        try {
+            final TypePool.Resolution resolution = typePool.describe(reference.className);
+            if (!resolution.isResolved()) {
+                mismatches.add(new Mismatch.MissingClass(reference.sources, reference.className));
+                return false;
+            }
+            return checkMatch(reference, resolution.resolve(), mismatches);
+        } catch (final Exception e) {
+            String message = e.getMessage();
+            if (message != null && message.startsWith("Cannot resolve type description for ")) {
+                // bytebuddy throws an illegal state exception with this message if it cannot resolve types
+                // TODO: handle missing type resolutions without catching bytebuddy's exceptions
+                final String className = message.replace("Cannot resolve type description for ", "");
+                mismatches.add(new Mismatch.MissingClass(reference.sources, className));
+            } else {
+                // Shouldn't happen. Fail the reference check and add a mismatch for debug logging.
+                mismatches.add(new Mismatch.ReferenceCheckError(
+                        e, reference, null != loader ? loader.toString() : "<bootstrap>"));
+            }
+            return false;
+        }
     }
 
-    // we match the fields and methods we are looking for by name, type or descriptor, and flags.
-    // So that we don't have to check every field/method on every type we visit against every
-    // field/method we're looking for, we index them by name and type/descriptor first.
-    // When we find a possible match, we'll remove the item, so stop looking for it,
-    // but will check the flags there and add a mismatch there and then.
-    // Once every field/method in a type is checked, if there is a super class, we visit it,
-    // and check each field/type there, and continue recursively. As soon as either map is empty,
-    // we stop looking for elements (fields/methods) of that type, otherwise every concrete type
-    // in the hierarchy is visited. Finally, once concrete types have been checked,
-    // since the base type implements any supertype's interfaces too,
-    // if we have entries in indexedMethods (i.e. there are still some missing methods),
-    // the interfaces will be checked once. If either map is non empty by the end, mismatches are
-    // constructed.
-    //
-    // This means:
-    // * each field/method in the type hierarchy will be checked at most once
-    // * each type in the hierarchy will be visited at most once
-    Map<Pair<String, String>, Reference.Method> indexedMethods = indexMethods(reference.methods);
-    Map<Pair<String, String>, Reference.Field> indexedFields = indexFields(reference.fields);
-    traverseHierarchy(reference, typeOnClasspath, indexedMethods, indexedFields, mismatches);
-    if (!indexedMethods.isEmpty()) {
-      findInterfaceMethods(
-          reference, typeOnClasspath, indexedMethods, mismatches, new HashSet<TypeDescription>());
-    }
+    public static boolean checkMatch(
+            final Reference reference, final TypeDescription typeOnClasspath, final List<Mismatch> mismatches) {
+        int previousMismatchCount = mismatches.size();
 
-    for (Reference.Field missingField : indexedFields.values()) {
-      mismatches.add(
-          new Reference.Mismatch.MissingField(
-              missingField.sources,
-              reference.className,
-              missingField.name,
-              missingField.fieldType));
-    }
-    for (Reference.Method missingMethod : indexedMethods.values()) {
-      mismatches.add(
-          new Reference.Mismatch.MissingMethod(
-              missingMethod.sources,
-              reference.className,
-              missingMethod.name,
-              missingMethod.methodType));
-    }
+        if (!Reference.matches(reference.flags, typeOnClasspath.getModifiers())) {
+            final String desc = reference.className;
+            mismatches.add(
+                    new Mismatch.MissingFlag(reference.sources, desc, reference.flags, typeOnClasspath.getModifiers()));
+        }
 
-    return previousMismatchCount == mismatches.size();
-  }
+        // we match the fields and methods we are looking for by name, type or descriptor, and flags.
+        // So that we don't have to check every field/method on every type we visit against every
+        // field/method we're looking for, we index them by name and type/descriptor first.
+        // When we find a possible match, we'll remove the item, so stop looking for it,
+        // but will check the flags there and add a mismatch there and then.
+        // Once every field/method in a type is checked, if there is a super class, we visit it,
+        // and check each field/type there, and continue recursively. As soon as either map is empty,
+        // we stop looking for elements (fields/methods) of that type, otherwise every concrete type
+        // in the hierarchy is visited. Finally, once concrete types have been checked,
+        // since the base type implements any supertype's interfaces too,
+        // if we have entries in indexedMethods (i.e. there are still some missing methods),
+        // the interfaces will be checked once. If either map is non empty by the end, mismatches are
+        // constructed.
+        //
+        // This means:
+        // * each field/method in the type hierarchy will be checked at most once
+        // * each type in the hierarchy will be visited at most once
+        Map<Pair<String, String>, Reference.Method> indexedMethods = indexMethods(reference.methods);
+        Map<Pair<String, String>, Reference.Field> indexedFields = indexFields(reference.fields);
+        traverseHierarchy(reference, typeOnClasspath, indexedMethods, indexedFields, mismatches);
+        if (!indexedMethods.isEmpty()) {
+            findInterfaceMethods(
+                    reference, typeOnClasspath, indexedMethods, mismatches, new HashSet<TypeDescription>());
+        }
 
-  private static Map<Pair<String, String>, Reference.Field> indexFields(
-      final Reference.Field[] fields) {
-    Map<Pair<String, String>, Reference.Field> map = new HashMap<>(fields.length * 4 / 3);
-    for (Reference.Field field : fields) {
-      map.put(Pair.of(field.name, field.fieldType), field);
-    }
-    return map;
-  }
+        for (Reference.Field missingField : indexedFields.values()) {
+            mismatches.add(new Reference.Mismatch.MissingField(
+                    missingField.sources, reference.className, missingField.name, missingField.fieldType));
+        }
+        for (Reference.Method missingMethod : indexedMethods.values()) {
+            mismatches.add(new Reference.Mismatch.MissingMethod(
+                    missingMethod.sources, reference.className, missingMethod.name, missingMethod.methodType));
+        }
 
-  private static Map<Pair<String, String>, Reference.Method> indexMethods(
-      final Reference.Method[] methods) {
-    Map<Pair<String, String>, Reference.Method> map = new HashMap<>(methods.length * 4 / 3);
-    for (Reference.Method method : methods) {
-      map.put(Pair.of(method.name, method.methodType), method);
+        return previousMismatchCount == mismatches.size();
     }
-    return map;
-  }
 
-  private static void traverseHierarchy(
-      final Reference reference,
-      final TypeDescription typeOnClasspath,
-      Map<Pair<String, String>, Reference.Method> methodsToFind,
-      Map<Pair<String, String>, Reference.Field> fieldsToFind,
-      final List<Reference.Mismatch> flagMismatches) {
-    findFieldsForType(reference, typeOnClasspath, fieldsToFind, flagMismatches);
-    findMethodsForType(reference, typeOnClasspath, methodsToFind, flagMismatches);
-    if (!fieldsToFind.isEmpty() || !methodsToFind.isEmpty()) {
-      TypeDescription.Generic superClass = typeOnClasspath.getSuperClass();
-      if (superClass != null) {
-        traverseHierarchy(
-            reference, superClass.asErasure(), methodsToFind, fieldsToFind, flagMismatches);
-      }
+    private static Map<Pair<String, String>, Reference.Field> indexFields(final Reference.Field[] fields) {
+        Map<Pair<String, String>, Reference.Field> map = new HashMap<>(fields.length * 4 / 3);
+        for (Reference.Field field : fields) {
+            map.put(Pair.of(field.name, field.fieldType), field);
+        }
+        return map;
     }
-  }
 
-  private static void findFieldsForType(
-      final Reference reference,
-      final TypeDescription typeOnClasspath,
-      final Map<Pair<String, String>, Reference.Field> fieldsToFind,
-      final List<Reference.Mismatch> flagMismatches) {
-    if (!fieldsToFind.isEmpty()) {
-      for (final FieldDescription.InDefinedShape fieldType : typeOnClasspath.getDeclaredFields()) {
-        String descriptor = fieldType.getType().asErasure().getDescriptor();
-        Pair<String, String> key = Pair.of(fieldType.getInternalName(), descriptor);
-        Reference.Field found = fieldsToFind.remove(key);
-        if (null != found) {
-          if (!Reference.matches(found.flags, fieldType.getModifiers())) {
-            final String desc = reference.className + "#" + found.name + found.fieldType;
-            flagMismatches.add(
-                new Mismatch.MissingFlag(
-                    found.sources, desc, found.flags, fieldType.getModifiers()));
-            break;
-          }
-        }
-        if (fieldsToFind.isEmpty()) {
-          break;
+    private static Map<Pair<String, String>, Reference.Method> indexMethods(final Reference.Method[] methods) {
+        Map<Pair<String, String>, Reference.Method> map = new HashMap<>(methods.length * 4 / 3);
+        for (Reference.Method method : methods) {
+            map.put(Pair.of(method.name, method.methodType), method);
         }
-      }
+        return map;
     }
-  }
 
-  private static void findInterfaceMethods(
-      final Reference reference,
-      final TypeDescription typeOnClasspath,
-      final Map<Pair<String, String>, Reference.Method> methodsToFind,
-      final List<Reference.Mismatch> flagMismatches,
-      final Set<TypeDescription> visitedInterfaces) {
-    if (!methodsToFind.isEmpty()) {
-      for (final TypeDescription.Generic interfaceType : typeOnClasspath.getInterfaces()) {
-        TypeDescription erasureType = interfaceType.asErasure();
-        findMethodsForType(reference, erasureType, methodsToFind, flagMismatches);
-        if (methodsToFind.isEmpty()) {
-          break;
+    private static void traverseHierarchy(
+            final Reference reference,
+            final TypeDescription typeOnClasspath,
+            Map<Pair<String, String>, Reference.Method> methodsToFind,
+            Map<Pair<String, String>, Reference.Field> fieldsToFind,
+            final List<Reference.Mismatch> flagMismatches) {
+        findFieldsForType(reference, typeOnClasspath, fieldsToFind, flagMismatches);
+        findMethodsForType(reference, typeOnClasspath, methodsToFind, flagMismatches);
+        if (!fieldsToFind.isEmpty() || !methodsToFind.isEmpty()) {
+            TypeDescription.Generic superClass = typeOnClasspath.getSuperClass();
+            if (superClass != null) {
+                traverseHierarchy(reference, superClass.asErasure(), methodsToFind, fieldsToFind, flagMismatches);
+            }
         }
-        if (visitedInterfaces.add(erasureType)) {
-          findInterfaceMethods(
-              reference, erasureType, methodsToFind, flagMismatches, visitedInterfaces);
+    }
+
+    private static void findFieldsForType(
+            final Reference reference,
+            final TypeDescription typeOnClasspath,
+            final Map<Pair<String, String>, Reference.Field> fieldsToFind,
+            final List<Reference.Mismatch> flagMismatches) {
+        if (!fieldsToFind.isEmpty()) {
+            for (final FieldDescription.InDefinedShape fieldType : typeOnClasspath.getDeclaredFields()) {
+                String descriptor = fieldType.getType().asErasure().getDescriptor();
+                Pair<String, String> key = Pair.of(fieldType.getInternalName(), descriptor);
+                Reference.Field found = fieldsToFind.remove(key);
+                if (null != found) {
+                    if (!Reference.matches(found.flags, fieldType.getModifiers())) {
+                        final String desc = reference.className + "#" + found.name + found.fieldType;
+                        flagMismatches.add(
+                                new Mismatch.MissingFlag(found.sources, desc, found.flags, fieldType.getModifiers()));
+                        break;
+                    }
+                }
+                if (fieldsToFind.isEmpty()) {
+                    break;
+                }
+            }
         }
-      }
     }
-  }
 
-  private static void findMethodsForType(
-      final Reference reference,
-      final TypeDescription typeOnClasspath,
-      final Map<Pair<String, String>, Reference.Method> methodsToFind,
-      final List<Reference.Mismatch> flagMismatches) {
-    if (!methodsToFind.isEmpty()) {
-      for (final MethodDescription.InDefinedShape methodDescription :
-          typeOnClasspath.getDeclaredMethods()) {
-        Pair<String, String> key =
-            Pair.of(methodDescription.getInternalName(), methodDescription.getDescriptor());
-        Reference.Method found = methodsToFind.remove(key);
-        if (null != found) {
-          // will stop looking for this one now, but check it has the right flags
-          if (!Reference.matches(found.flags, methodDescription.getModifiers())) {
-            final String desc = reference.className + "#" + found.name + found.methodType;
-            flagMismatches.add(
-                new Mismatch.MissingFlag(
-                    found.sources, desc, found.flags, methodDescription.getModifiers()));
-            break;
-          }
+    private static void findInterfaceMethods(
+            final Reference reference,
+            final TypeDescription typeOnClasspath,
+            final Map<Pair<String, String>, Reference.Method> methodsToFind,
+            final List<Reference.Mismatch> flagMismatches,
+            final Set<TypeDescription> visitedInterfaces) {
+        if (!methodsToFind.isEmpty()) {
+            for (final TypeDescription.Generic interfaceType : typeOnClasspath.getInterfaces()) {
+                TypeDescription erasureType = interfaceType.asErasure();
+                findMethodsForType(reference, erasureType, methodsToFind, flagMismatches);
+                if (methodsToFind.isEmpty()) {
+                    break;
+                }
+                if (visitedInterfaces.add(erasureType)) {
+                    findInterfaceMethods(reference, erasureType, methodsToFind, flagMismatches, visitedInterfaces);
+                }
+            }
         }
-        if (methodsToFind.isEmpty()) {
-          break;
+    }
+
+    private static void findMethodsForType(
+            final Reference reference,
+            final TypeDescription typeOnClasspath,
+            final Map<Pair<String, String>, Reference.Method> methodsToFind,
+            final List<Reference.Mismatch> flagMismatches) {
+        if (!methodsToFind.isEmpty()) {
+            for (final MethodDescription.InDefinedShape methodDescription : typeOnClasspath.getDeclaredMethods()) {
+                Pair<String, String> key =
+                        Pair.of(methodDescription.getInternalName(), methodDescription.getDescriptor());
+                Reference.Method found = methodsToFind.remove(key);
+                if (null != found) {
+                    // will stop looking for this one now, but check it has the right flags
+                    if (!Reference.matches(found.flags, methodDescription.getModifiers())) {
+                        final String desc = reference.className + "#" + found.name + found.methodType;
+                        flagMismatches.add(new Mismatch.MissingFlag(
+                                found.sources, desc, found.flags, methodDescription.getModifiers()));
+                        break;
+                    }
+                }
+                if (methodsToFind.isEmpty()) {
+                    break;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceProvider.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceProvider.java
index ac8ca5e1efa..35e069a996f 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceProvider.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceProvider.java
@@ -4,5 +4,5 @@
 
 /** Provides additional muzzle references at runtime based on available types. */
 public interface ReferenceProvider {
-  Iterable<Reference> buildReferences(TypePool typePool);
+    Iterable<Reference> buildReferences(TypePool typePool);
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/AbstractStratum.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/AbstractStratum.java
index 9e7848143af..ad98bb59bce 100755
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/AbstractStratum.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/AbstractStratum.java
@@ -1,17 +1,17 @@
 package datadog.trace.agent.tooling.stratum;
 
 public abstract class AbstractStratum {
-  private String name;
+    private String name;
 
-  public AbstractStratum(final String name) {
-    this.name = name;
-  }
+    public AbstractStratum(final String name) {
+        this.name = name;
+    }
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 
-  public void setName(final String name) {
-    this.name = name;
-  }
+    public void setName(final String name) {
+        this.name = name;
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/EmbeddedStratum.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/EmbeddedStratum.java
index 23f2e5db950..14998d88982 100755
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/EmbeddedStratum.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/EmbeddedStratum.java
@@ -4,17 +4,17 @@
 import java.util.List;
 
 public class EmbeddedStratum extends AbstractStratum {
-  private final List<SourceMap> sourceMapList = new ArrayList<>();
+    private final List<SourceMap> sourceMapList = new ArrayList<>();
 
-  public EmbeddedStratum() {
-    this("");
-  }
+    public EmbeddedStratum() {
+        this("");
+    }
 
-  public EmbeddedStratum(final String name) {
-    super(name);
-  }
+    public EmbeddedStratum(final String name) {
+        super(name);
+    }
 
-  public List<SourceMap> getSourceMapList() {
-    return sourceMapList;
-  }
+    public List<SourceMap> getSourceMapList() {
+        return sourceMapList;
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/FileInfo.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/FileInfo.java
index 3a9ab802397..397cf3036c9 100755
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/FileInfo.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/FileInfo.java
@@ -5,41 +5,41 @@
  * href="https://jakarta.ee/specifications/debugging/2.0/jdsol-spec-2.0#filesection">...</a>
  */
 public class FileInfo {
-  private final String fileId;
+    private final String fileId;
 
-  private final String inputFileName;
+    private final String inputFileName;
 
-  private final String inputFilePath;
+    private final String inputFilePath;
 
-  public FileInfo(String fileId, String inputFileName, String inputFilePath) {
-    this.fileId = fileId;
-    this.inputFileName = inputFileName;
-    this.inputFilePath = inputFilePath;
-  }
+    public FileInfo(String fileId, String inputFileName, String inputFilePath) {
+        this.fileId = fileId;
+        this.inputFileName = inputFileName;
+        this.inputFilePath = inputFilePath;
+    }
 
-  public String getFileId() {
-    return fileId;
-  }
+    public String getFileId() {
+        return fileId;
+    }
 
-  public String getInputFileName() {
-    return inputFileName;
-  }
+    public String getInputFileName() {
+        return inputFileName;
+    }
+
+    public String getInputFilePath() {
+        if (inputFilePath == null) {
+            return inputFileName;
+        }
+        return inputFilePath;
+    }
 
-  public String getInputFilePath() {
-    if (inputFilePath == null) {
-      return inputFileName;
+    @Override
+    public String toString() {
+        return "FileInfo [fileId="
+                + fileId
+                + ", inputFileName="
+                + inputFileName
+                + ", inputFilePath="
+                + inputFilePath
+                + "]";
     }
-    return inputFilePath;
-  }
-
-  @Override
-  public String toString() {
-    return "FileInfo [fileId="
-        + fileId
-        + ", inputFileName="
-        + inputFileName
-        + ", inputFilePath="
-        + inputFilePath
-        + "]";
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/LineInfo.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/LineInfo.java
index 817dcc0e752..b69d8c152bd 100755
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/LineInfo.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/LineInfo.java
@@ -16,87 +16,78 @@
  * href="https://jakarta.ee/specifications/debugging/2.0/jdsol-spec-2.0#stratumsection">...</a>
  */
 public class LineInfo {
-  private String fileId;
-
-  final int inputStartLine;
-
-  final int repeatCount;
-
-  final int outputStartLine;
-
-  final int outputLineIncrement;
-
-  private FileInfo fileInfo;
-
-  public LineInfo(
-      String fileId,
-      int inputStartLine,
-      int repeatCount,
-      int outputStartLine,
-      int outputLineIncrement) {
-    this.fileId = fileId;
-    fileInfo = null;
-    this.inputStartLine = inputStartLine;
-    this.repeatCount = repeatCount;
-    this.outputStartLine = outputStartLine;
-    this.outputLineIncrement = outputLineIncrement;
-  }
-
-  public LineInfo(
-      FileInfo fileInfo,
-      int inputStartLine,
-      int repeatCount,
-      int outputStartLine,
-      int outputLineIncrement) {
-    this.fileInfo = fileInfo;
-    this.inputStartLine = inputStartLine;
-    this.repeatCount = repeatCount;
-    this.outputStartLine = outputStartLine;
-    this.outputLineIncrement = outputLineIncrement;
-  }
-
-  public String getFileId() {
-    return fileId;
-  }
-
-  public int getInputStartLine() {
-    return inputStartLine;
-  }
-
-  public int getRepeatCount() {
-    return repeatCount;
-  }
-
-  public int getOutputStartLine() {
-    return outputStartLine;
-  }
-
-  public int getOutputLineIncrement() {
-    return outputLineIncrement;
-  }
-
-  public FileInfo getFileInfo() {
-    return fileInfo;
-  }
-
-  public void setFileInfo(final FileInfo fileInfo) {
-    this.fileInfo = fileInfo;
-  }
-
-  @Override
-  public String toString() {
-    return "LineInfo [fileId="
-        + fileId
-        + ", inputStartLine="
-        + inputStartLine
-        + ", repeatCount="
-        + repeatCount
-        + ", outputStartLine="
-        + outputStartLine
-        + ", outputLineIncrement="
-        + outputLineIncrement
-        + ", fileInfo="
-        + fileInfo
-        + "]\n";
-  }
+    private String fileId;
+
+    final int inputStartLine;
+
+    final int repeatCount;
+
+    final int outputStartLine;
+
+    final int outputLineIncrement;
+
+    private FileInfo fileInfo;
+
+    public LineInfo(String fileId, int inputStartLine, int repeatCount, int outputStartLine, int outputLineIncrement) {
+        this.fileId = fileId;
+        fileInfo = null;
+        this.inputStartLine = inputStartLine;
+        this.repeatCount = repeatCount;
+        this.outputStartLine = outputStartLine;
+        this.outputLineIncrement = outputLineIncrement;
+    }
+
+    public LineInfo(
+            FileInfo fileInfo, int inputStartLine, int repeatCount, int outputStartLine, int outputLineIncrement) {
+        this.fileInfo = fileInfo;
+        this.inputStartLine = inputStartLine;
+        this.repeatCount = repeatCount;
+        this.outputStartLine = outputStartLine;
+        this.outputLineIncrement = outputLineIncrement;
+    }
+
+    public String getFileId() {
+        return fileId;
+    }
+
+    public int getInputStartLine() {
+        return inputStartLine;
+    }
+
+    public int getRepeatCount() {
+        return repeatCount;
+    }
+
+    public int getOutputStartLine() {
+        return outputStartLine;
+    }
+
+    public int getOutputLineIncrement() {
+        return outputLineIncrement;
+    }
+
+    public FileInfo getFileInfo() {
+        return fileInfo;
+    }
+
+    public void setFileInfo(final FileInfo fileInfo) {
+        this.fileInfo = fileInfo;
+    }
+
+    @Override
+    public String toString() {
+        return "LineInfo [fileId="
+                + fileId
+                + ", inputStartLine="
+                + inputStartLine
+                + ", repeatCount="
+                + repeatCount
+                + ", outputStartLine="
+                + outputStartLine
+                + ", outputLineIncrement="
+                + outputLineIncrement
+                + ", fileInfo="
+                + fileInfo
+                + "]\n";
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/Location.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/Location.java
index 91a4d7e0984..0c5427cd3b6 100755
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/Location.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/Location.java
@@ -1,20 +1,20 @@
 package datadog.trace.agent.tooling.stratum;
 
 public class Location {
-  private final FileInfo fileInfo;
+    private final FileInfo fileInfo;
 
-  private final int lineNum;
+    private final int lineNum;
 
-  public Location(final FileInfo fileInfo, final int lineNum) {
-    this.fileInfo = fileInfo;
-    this.lineNum = lineNum;
-  }
+    public Location(final FileInfo fileInfo, final int lineNum) {
+        this.fileInfo = fileInfo;
+        this.lineNum = lineNum;
+    }
 
-  public FileInfo getFileInfo() {
-    return fileInfo;
-  }
+    public FileInfo getFileInfo() {
+        return fileInfo;
+    }
 
-  public int getLineNum() {
-    return lineNum;
-  }
+    public int getLineNum() {
+        return lineNum;
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/Resolver.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/Resolver.java
index b5e2092105b..b1075b14f5d 100755
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/Resolver.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/Resolver.java
@@ -4,175 +4,166 @@
 import java.util.List;
 
 public class Resolver {
-  public static SourceMap resolve(final SourceMap sourceMap) {
-    for (EmbeddedStratum stratum : sourceMap.getEmbeddedStratumList()) {
-      StratumExt outerStratum = sourceMap.getStratum(stratum.getName());
-      if (outerStratum != null) {
-        for (SourceMap embeddedSourceMap : stratum.getSourceMapList()) {
-          SourceMap resolvedEmbeddedSourceMap = resolve(embeddedSourceMap);
-          String outerFileName = resolvedEmbeddedSourceMap.getOutputFileName();
-          for (StratumExt embeddedStratum : resolvedEmbeddedSourceMap.getStratumList()) {
-            StratumExt resolvedStratum = sourceMap.getStratum(embeddedStratum.getName());
-            if (resolvedStratum == null) {
-              resolvedStratum = new StratumExt(embeddedStratum.getName());
-              sourceMap.getStratumList().add(resolvedStratum);
+    public static SourceMap resolve(final SourceMap sourceMap) {
+        for (EmbeddedStratum stratum : sourceMap.getEmbeddedStratumList()) {
+            StratumExt outerStratum = sourceMap.getStratum(stratum.getName());
+            if (outerStratum != null) {
+                for (SourceMap embeddedSourceMap : stratum.getSourceMapList()) {
+                    SourceMap resolvedEmbeddedSourceMap = resolve(embeddedSourceMap);
+                    String outerFileName = resolvedEmbeddedSourceMap.getOutputFileName();
+                    for (StratumExt embeddedStratum : resolvedEmbeddedSourceMap.getStratumList()) {
+                        StratumExt resolvedStratum = sourceMap.getStratum(embeddedStratum.getName());
+                        if (resolvedStratum == null) {
+                            resolvedStratum = new StratumExt(embeddedStratum.getName());
+                            sourceMap.getStratumList().add(resolvedStratum);
+                        }
+                        resolve(new Context(outerStratum, outerFileName, resolvedStratum, embeddedStratum));
+                    }
+                }
             }
-            resolve(new Context(outerStratum, outerFileName, resolvedStratum, embeddedStratum));
-          }
         }
-      }
+        sourceMap.getEmbeddedStratumList().clear();
+        return sourceMap;
     }
-    sourceMap.getEmbeddedStratumList().clear();
-    return sourceMap;
-  }
 
-  private static void resolve(final Context context) {
-    for (LineInfo eli : context.embeddedStratum.getLineInfo()) {
-      resolve(context, eli);
+    private static void resolve(final Context context) {
+        for (LineInfo eli : context.embeddedStratum.getLineInfo()) {
+            resolve(context, eli);
+        }
     }
-  }
-
-  private static void resolve(final Context context, final LineInfo eli) {
-    Iterator<LineInfo> iter;
-    if (eli.getRepeatCount() > 0) {
-      for (iter = context.outerStratum.getLineInfo().iterator(); iter.hasNext(); ) {
-        LineInfo oli = iter.next();
-        if (oli.getFileInfo().getInputFileName().equals(context.outerFileName)) {
-          if (oli.getInputStartLine() <= eli.getOutputStartLine()
-              && eli.getOutputStartLine() < oli.getInputStartLine() + oli.getRepeatCount()) {
-            int difference = eli.getOutputStartLine() - oli.getInputStartLine();
-            int available = oli.getRepeatCount() - difference;
-            int completeCount =
-                Math.min(available / eli.getOutputLineIncrement(), eli.getRepeatCount());
-
-            FileInfo fileInfo =
-                getByPath(
-                    context.resolvedStratum.getFileInfo(), eli.getFileInfo().getInputFilePath());
-            if (fileInfo == null) {
-              fileInfo = eli.getFileInfo();
-              context.resolvedStratum.getFileInfo().add(fileInfo);
-            }
-            if (completeCount > 0) {
-              LineInfo rli =
-                  new LineInfo(
-                      fileInfo,
-                      eli.getInputStartLine(),
-                      completeCount,
-                      oli.getOutputStartLine() + difference * oli.getOutputLineIncrement(),
-                      eli.getOutputLineIncrement() * oli.getOutputLineIncrement());
-
-              context.resolvedStratum.addLineInfo(rli);
-              LineInfo neli =
-                  new LineInfo(
-                      fileInfo,
-                      eli.getInputStartLine() + completeCount,
-                      eli.getRepeatCount() - completeCount,
-                      eli.getOutputStartLine() + completeCount * eli.getOutputLineIncrement(),
-                      eli.getOutputLineIncrement());
-
-              resolve(context, neli);
-            } else {
-              LineInfo rli =
-                  new LineInfo(
-                      fileInfo,
-                      eli.getInputStartLine(),
-                      1,
-                      oli.getOutputStartLine() + difference * oli.getOutputLineIncrement(),
-                      available);
-
-              context.resolvedStratum.addLineInfo(rli);
-              LineInfo neli =
-                  new LineInfo(
-                      fileInfo,
-                      eli.getInputStartLine(),
-                      1,
-                      eli.getOutputStartLine() + available,
-                      eli.getOutputLineIncrement() - available);
-
-              resolve(context, neli);
-              neli =
-                  new LineInfo(
-                      fileInfo,
-                      eli.getInputStartLine() + 1,
-                      eli.getRepeatCount() - 1,
-                      eli.getOutputStartLine() + eli.getOutputLineIncrement(),
-                      eli.getOutputLineIncrement());
-
-              resolve(context, neli);
+
+    private static void resolve(final Context context, final LineInfo eli) {
+        Iterator<LineInfo> iter;
+        if (eli.getRepeatCount() > 0) {
+            for (iter = context.outerStratum.getLineInfo().iterator(); iter.hasNext(); ) {
+                LineInfo oli = iter.next();
+                if (oli.getFileInfo().getInputFileName().equals(context.outerFileName)) {
+                    if (oli.getInputStartLine() <= eli.getOutputStartLine()
+                            && eli.getOutputStartLine() < oli.getInputStartLine() + oli.getRepeatCount()) {
+                        int difference = eli.getOutputStartLine() - oli.getInputStartLine();
+                        int available = oli.getRepeatCount() - difference;
+                        int completeCount = Math.min(available / eli.getOutputLineIncrement(), eli.getRepeatCount());
+
+                        FileInfo fileInfo = getByPath(
+                                context.resolvedStratum.getFileInfo(),
+                                eli.getFileInfo().getInputFilePath());
+                        if (fileInfo == null) {
+                            fileInfo = eli.getFileInfo();
+                            context.resolvedStratum.getFileInfo().add(fileInfo);
+                        }
+                        if (completeCount > 0) {
+                            LineInfo rli = new LineInfo(
+                                    fileInfo,
+                                    eli.getInputStartLine(),
+                                    completeCount,
+                                    oli.getOutputStartLine() + difference * oli.getOutputLineIncrement(),
+                                    eli.getOutputLineIncrement() * oli.getOutputLineIncrement());
+
+                            context.resolvedStratum.addLineInfo(rli);
+                            LineInfo neli = new LineInfo(
+                                    fileInfo,
+                                    eli.getInputStartLine() + completeCount,
+                                    eli.getRepeatCount() - completeCount,
+                                    eli.getOutputStartLine() + completeCount * eli.getOutputLineIncrement(),
+                                    eli.getOutputLineIncrement());
+
+                            resolve(context, neli);
+                        } else {
+                            LineInfo rli = new LineInfo(
+                                    fileInfo,
+                                    eli.getInputStartLine(),
+                                    1,
+                                    oli.getOutputStartLine() + difference * oli.getOutputLineIncrement(),
+                                    available);
+
+                            context.resolvedStratum.addLineInfo(rli);
+                            LineInfo neli = new LineInfo(
+                                    fileInfo,
+                                    eli.getInputStartLine(),
+                                    1,
+                                    eli.getOutputStartLine() + available,
+                                    eli.getOutputLineIncrement() - available);
+
+                            resolve(context, neli);
+                            neli = new LineInfo(
+                                    fileInfo,
+                                    eli.getInputStartLine() + 1,
+                                    eli.getRepeatCount() - 1,
+                                    eli.getOutputStartLine() + eli.getOutputLineIncrement(),
+                                    eli.getOutputLineIncrement());
+
+                            resolve(context, neli);
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 
-  private static FileInfo getByPath(final List<FileInfo> list, final String filePath) {
-    for (FileInfo fileInfo : list) {
-      if (fileInfo.getInputFilePath().compareTo(filePath) == 0) {
-        return fileInfo;
-      }
+    private static FileInfo getByPath(final List<FileInfo> list, final String filePath) {
+        for (FileInfo fileInfo : list) {
+            if (fileInfo.getInputFilePath().compareTo(filePath) == 0) {
+                return fileInfo;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  private static class Context {
+    private static class Context {
 
-    StratumExt outerStratum;
+        StratumExt outerStratum;
 
-    String outerFileName;
+        String outerFileName;
 
-    StratumExt resolvedStratum;
+        StratumExt resolvedStratum;
 
-    StratumExt embeddedStratum;
+        StratumExt embeddedStratum;
 
-    public Context(
-        final StratumExt outerStratum,
-        final String outerFileName,
-        final StratumExt resolvedStratum,
-        final StratumExt embeddedStratum) {
-      this.outerStratum = outerStratum;
-      this.outerFileName = outerFileName;
-      this.resolvedStratum = resolvedStratum;
-      this.embeddedStratum = embeddedStratum;
+        public Context(
+                final StratumExt outerStratum,
+                final String outerFileName,
+                final StratumExt resolvedStratum,
+                final StratumExt embeddedStratum) {
+            this.outerStratum = outerStratum;
+            this.outerFileName = outerFileName;
+            this.resolvedStratum = resolvedStratum;
+            this.embeddedStratum = embeddedStratum;
+        }
     }
-  }
 
-  public Location resolve(final SourceMap sourceMap, final String stratumName, final int lineNum) {
-    SourceMap resolvedSourceMap = resolve(sourceMap);
-    StratumExt stratum = resolvedSourceMap.getStratum(stratumName);
-    if (stratum == null) {
-      return new Location(null, lineNum);
-    }
-    LineInfo bestFitLineInfo = null;
-    int bestFitLineNum = lineNum;
-    int bfOutputStartLine = Integer.MIN_VALUE;
-    int bfOutputEndLine = Integer.MAX_VALUE;
-    for (Iterator<LineInfo> iter = stratum.getLineInfo().iterator(); iter.hasNext(); ) {
-      LineInfo lineInfo = iter.next();
-      for (int i = 0; i < lineInfo.getRepeatCount(); i++) {
-        int outputStartLine = lineInfo.getOutputStartLine() + i * lineInfo.getOutputLineIncrement();
-        int outputEndLine =
-            Math.max(outputStartLine, outputStartLine + lineInfo.getOutputLineIncrement() - 1);
-        if (outputStartLine <= lineNum && lineNum <= outputEndLine) {
-          if (lineInfo.getOutputLineIncrement() == 1) {
-            return new Location(lineInfo.getFileInfo(), lineInfo.getInputStartLine() + i);
-          }
-          if (bfOutputStartLine <= outputStartLine && outputEndLine <= bfOutputEndLine) {
-            bestFitLineInfo = lineInfo;
-            bestFitLineNum = lineInfo.getInputStartLine() + i;
-            bfOutputStartLine =
-                bestFitLineInfo.getOutputStartLine() + i * bestFitLineInfo.getOutputLineIncrement();
-            bfOutputEndLine =
-                Math.max(
-                    bfOutputStartLine,
-                    bfOutputStartLine + bestFitLineInfo.getOutputLineIncrement() - 1);
-          }
+    public Location resolve(final SourceMap sourceMap, final String stratumName, final int lineNum) {
+        SourceMap resolvedSourceMap = resolve(sourceMap);
+        StratumExt stratum = resolvedSourceMap.getStratum(stratumName);
+        if (stratum == null) {
+            return new Location(null, lineNum);
         }
-      }
-    }
-    if (bestFitLineInfo != null) {
-      return new Location(bestFitLineInfo.getFileInfo(), bestFitLineNum);
+        LineInfo bestFitLineInfo = null;
+        int bestFitLineNum = lineNum;
+        int bfOutputStartLine = Integer.MIN_VALUE;
+        int bfOutputEndLine = Integer.MAX_VALUE;
+        for (Iterator<LineInfo> iter = stratum.getLineInfo().iterator(); iter.hasNext(); ) {
+            LineInfo lineInfo = iter.next();
+            for (int i = 0; i < lineInfo.getRepeatCount(); i++) {
+                int outputStartLine = lineInfo.getOutputStartLine() + i * lineInfo.getOutputLineIncrement();
+                int outputEndLine = Math.max(outputStartLine, outputStartLine + lineInfo.getOutputLineIncrement() - 1);
+                if (outputStartLine <= lineNum && lineNum <= outputEndLine) {
+                    if (lineInfo.getOutputLineIncrement() == 1) {
+                        return new Location(lineInfo.getFileInfo(), lineInfo.getInputStartLine() + i);
+                    }
+                    if (bfOutputStartLine <= outputStartLine && outputEndLine <= bfOutputEndLine) {
+                        bestFitLineInfo = lineInfo;
+                        bestFitLineNum = lineInfo.getInputStartLine() + i;
+                        bfOutputStartLine =
+                                bestFitLineInfo.getOutputStartLine() + i * bestFitLineInfo.getOutputLineIncrement();
+                        bfOutputEndLine = Math.max(
+                                bfOutputStartLine, bfOutputStartLine + bestFitLineInfo.getOutputLineIncrement() - 1);
+                    }
+                }
+            }
+        }
+        if (bestFitLineInfo != null) {
+            return new Location(bestFitLineInfo.getFileInfo(), bestFitLineNum);
+        }
+        return new Location(null, lineNum);
     }
-    return new Location(null, lineNum);
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/SourceMap.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/SourceMap.java
index f1e5ae943e2..8894c07a52c 100755
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/SourceMap.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/SourceMap.java
@@ -4,45 +4,45 @@
 import java.util.List;
 
 public class SourceMap {
-  private final String outputFileName;
+    private final String outputFileName;
 
-  private final String defaultStratumName;
+    private final String defaultStratumName;
 
-  private final List<StratumExt> stratumList = new ArrayList<>();
+    private final List<StratumExt> stratumList = new ArrayList<>();
 
-  private final List<EmbeddedStratum> embeddedStratumList = new ArrayList<>();
+    private final List<EmbeddedStratum> embeddedStratumList = new ArrayList<>();
 
-  public SourceMap(final String outputFileName, final String defaultStratumName) {
-    this.outputFileName = outputFileName;
-    this.defaultStratumName = defaultStratumName;
-  }
+    public SourceMap(final String outputFileName, final String defaultStratumName) {
+        this.outputFileName = outputFileName;
+        this.defaultStratumName = defaultStratumName;
+    }
 
-  public boolean isResolved() {
-    return embeddedStratumList.isEmpty();
-  }
+    public boolean isResolved() {
+        return embeddedStratumList.isEmpty();
+    }
 
-  public String getOutputFileName() {
-    return outputFileName;
-  }
+    public String getOutputFileName() {
+        return outputFileName;
+    }
 
-  public String getDefaultStratumName() {
-    return defaultStratumName;
-  }
+    public String getDefaultStratumName() {
+        return defaultStratumName;
+    }
 
-  public List<StratumExt> getStratumList() {
-    return stratumList;
-  }
+    public List<StratumExt> getStratumList() {
+        return stratumList;
+    }
 
-  public List<EmbeddedStratum> getEmbeddedStratumList() {
-    return embeddedStratumList;
-  }
+    public List<EmbeddedStratum> getEmbeddedStratumList() {
+        return embeddedStratumList;
+    }
 
-  public StratumExt getStratum(final String stratumName) {
-    for (StratumExt stratum : stratumList) {
-      if (stratum.getName().compareTo(stratumName) == 0) {
-        return stratum;
-      }
+    public StratumExt getStratum(final String stratumName) {
+        for (StratumExt stratum : stratumList) {
+            if (stratum.getName().compareTo(stratumName) == 0) {
+                return stratum;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/Stratum.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/Stratum.java
index 24464da12bc..45928094f66 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/Stratum.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/Stratum.java
@@ -4,13 +4,13 @@
 
 public interface Stratum {
 
-  /**
-   * Returns the input line number and the input file id for the given output line number.
-   *
-   * @param outputLineNumber the class line number
-   */
-  Pair<String, Integer> getInputLine(int outputLineNumber);
+    /**
+     * Returns the input line number and the input file id for the given output line number.
+     *
+     * @param outputLineNumber the class line number
+     */
+    Pair<String, Integer> getInputLine(int outputLineNumber);
 
-  /** Returns the source file for the given file id. */
-  String getSourceFile(String fileId);
+    /** Returns the source file for the given file id. */
+    String getSourceFile(String fileId);
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/StratumExt.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/StratumExt.java
index c24a7d3db39..c37ced9ac5c 100755
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/StratumExt.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/StratumExt.java
@@ -11,104 +11,104 @@
 import org.slf4j.LoggerFactory;
 
 public class StratumExt extends AbstractStratum implements Stratum {
-  private final List<FileInfo> fileInfo = new ArrayList<>();
-  private Map<String, FileInfo> fileInfoMap;
+    private final List<FileInfo> fileInfo = new ArrayList<>();
+    private Map<String, FileInfo> fileInfoMap;
 
-  private int[] lineStart = null;
+    private int[] lineStart = null;
 
-  private final List<LineInfo> lineInfo = new ArrayList<>();
+    private final List<LineInfo> lineInfo = new ArrayList<>();
 
-  private static final Logger LOG = LoggerFactory.getLogger(StratumExt.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StratumExt.class);
 
-  public StratumExt(final String name) {
-    super(name);
-  }
+    public StratumExt(final String name) {
+        super(name);
+    }
 
-  @Override
-  public Pair<String, Integer> getInputLine(final int outputLineNumber) {
-    try {
-      List<LineInfo> info = getLineInfo();
-      int startPoint = Arrays.binarySearch(getLineStart(), outputLineNumber);
-      if (startPoint < 0) {
-        if (startPoint == -1) {
-          startPoint = 0;
-        } else {
-          startPoint = Math.abs(startPoint) - 2;
-        }
-      }
-      int size = info.size();
-      for (int i = startPoint; i < size; i++) {
-        LineInfo li = info.get(i);
-        final int start = li.outputStartLine;
-        if (outputLineNumber >= start) {
-          int offset = li.repeatCount * li.outputLineIncrement - 1;
-          int stop = li.outputStartLine + offset;
-          if (outputLineNumber <= stop) {
-            int rc = (outputLineNumber - li.outputStartLine) / li.outputLineIncrement;
-            return Pair.of(li.getFileId(), li.inputStartLine + rc);
-          }
+    @Override
+    public Pair<String, Integer> getInputLine(final int outputLineNumber) {
+        try {
+            List<LineInfo> info = getLineInfo();
+            int startPoint = Arrays.binarySearch(getLineStart(), outputLineNumber);
+            if (startPoint < 0) {
+                if (startPoint == -1) {
+                    startPoint = 0;
+                } else {
+                    startPoint = Math.abs(startPoint) - 2;
+                }
+            }
+            int size = info.size();
+            for (int i = startPoint; i < size; i++) {
+                LineInfo li = info.get(i);
+                final int start = li.outputStartLine;
+                if (outputLineNumber >= start) {
+                    int offset = li.repeatCount * li.outputLineIncrement - 1;
+                    int stop = li.outputStartLine + offset;
+                    if (outputLineNumber <= stop) {
+                        int rc = (outputLineNumber - li.outputStartLine) / li.outputLineIncrement;
+                        return Pair.of(li.getFileId(), li.inputStartLine + rc);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            LOG.debug("Could not get input line number from stratum", e);
         }
-      }
-    } catch (Exception e) {
-      LOG.debug("Could not get input line number from stratum", e);
+        return null;
     }
-    return null;
-  }
 
-  @Override
-  public String getSourceFile(String fileId) {
-    if (fileInfo.isEmpty()) {
-      return null;
+    @Override
+    public String getSourceFile(String fileId) {
+        if (fileInfo.isEmpty()) {
+            return null;
+        }
+        populateFileInfoMap();
+        FileInfo fileInfo = fileInfoMap.get(fileId);
+        return fileInfo != null ? fileInfo.getInputFilePath() : null;
     }
-    populateFileInfoMap();
-    FileInfo fileInfo = fileInfoMap.get(fileId);
-    return fileInfo != null ? fileInfo.getInputFilePath() : null;
-  }
 
-  public String getSourceFileName(String fileId) {
-    if (fileInfo.isEmpty()) {
-      return null;
+    public String getSourceFileName(String fileId) {
+        if (fileInfo.isEmpty()) {
+            return null;
+        }
+        populateFileInfoMap();
+        FileInfo fileInfo = fileInfoMap.get(fileId);
+        return fileInfo != null ? fileInfo.getInputFileName() : null;
     }
-    populateFileInfoMap();
-    FileInfo fileInfo = fileInfoMap.get(fileId);
-    return fileInfo != null ? fileInfo.getInputFileName() : null;
-  }
 
-  private void populateFileInfoMap() {
-    if (fileInfoMap != null) {
-      return;
-    }
-    fileInfoMap = new HashMap<>();
-    for (FileInfo fileInfo : fileInfo) {
-      fileInfoMap.put(fileInfo.getFileId(), fileInfo);
+    private void populateFileInfoMap() {
+        if (fileInfoMap != null) {
+            return;
+        }
+        fileInfoMap = new HashMap<>();
+        for (FileInfo fileInfo : fileInfo) {
+            fileInfoMap.put(fileInfo.getFileId(), fileInfo);
+        }
     }
-  }
 
-  public List<FileInfo> getFileInfo() {
-    return fileInfo;
-  }
+    public List<FileInfo> getFileInfo() {
+        return fileInfo;
+    }
 
-  public List<LineInfo> getLineInfo() {
-    return lineInfo;
-  }
+    public List<LineInfo> getLineInfo() {
+        return lineInfo;
+    }
 
-  public void addLineInfo(final LineInfo info) {
-    lineInfo.add(info);
-    lineInfo.sort(Comparator.comparingInt(LineInfo::getOutputStartLine));
-  }
+    public void addLineInfo(final LineInfo info) {
+        lineInfo.add(info);
+        lineInfo.sort(Comparator.comparingInt(LineInfo::getOutputStartLine));
+    }
 
-  public int[] getLineStart() {
-    if (lineStart == null) {
-      lineStart = new int[lineInfo.size()];
-      for (int i = 0; i < lineStart.length; i++) {
-        lineStart[i] = lineInfo.get(i).getOutputStartLine();
-      }
+    public int[] getLineStart() {
+        if (lineStart == null) {
+            lineStart = new int[lineInfo.size()];
+            for (int i = 0; i < lineStart.length; i++) {
+                lineStart[i] = lineInfo.get(i).getOutputStartLine();
+            }
+        }
+        return lineStart;
     }
-    return lineStart;
-  }
 
-  @Override
-  public String toString() {
-    return "Stratum [fileInfoList=" + fileInfo + ", lineInfoList=" + lineInfo + "]";
-  }
+    @Override
+    public String toString() {
+        return "Stratum [fileInfoList=" + fileInfo + ", lineInfoList=" + lineInfo + "]";
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/StratumManager.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/StratumManager.java
index a38813c3e8d..3f337cf4a19 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/StratumManager.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/StratumManager.java
@@ -17,137 +17,135 @@
  */
 public class StratumManager {
 
-  private static final Logger LOG = LoggerFactory.getLogger(StratumManager.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StratumManager.class);
 
-  private static volatile StratumManager INSTANCE;
+    private static volatile StratumManager INSTANCE;
 
-  private final LimitedConcurrentHashMap map;
+    private final LimitedConcurrentHashMap map;
 
-  public static StratumManager init(int sourceMappingLimit, IntConsumer limitReachedCallback) {
-    INSTANCE = new StratumManager(sourceMappingLimit, limitReachedCallback);
-    return INSTANCE;
-  }
-
-  public static StratumManager getInstance() {
-    return INSTANCE;
-  }
+    public static StratumManager init(int sourceMappingLimit, IntConsumer limitReachedCallback) {
+        INSTANCE = new StratumManager(sourceMappingLimit, limitReachedCallback);
+        return INSTANCE;
+    }
 
-  private StratumManager(int sourceMappingLimit, IntConsumer limitReachedCallback) {
-    this.map = new LimitedConcurrentHashMap(sourceMappingLimit, limitReachedCallback);
-  }
+    public static StratumManager getInstance() {
+        return INSTANCE;
+    }
 
-  public void analyzeClass(final byte[] bytes) {
-    if (map.isLimitReached()) {
-      return;
+    private StratumManager(int sourceMappingLimit, IntConsumer limitReachedCallback) {
+        this.map = new LimitedConcurrentHashMap(sourceMappingLimit, limitReachedCallback);
     }
-    StratumExt s = getDefaultStratum(bytes);
-    if (s != null) {
-      map.put(s.getName(), s);
+
+    public void analyzeClass(final byte[] bytes) {
+        if (map.isLimitReached()) {
+            return;
+        }
+        StratumExt s = getDefaultStratum(bytes);
+        if (s != null) {
+            map.put(s.getName(), s);
+        }
     }
-  }
-
-  public Stratum get(final String classname) {
-    return map.get(classname);
-  }
-
-  private SourceMap getResolvedSmap(final String smap) {
-    try {
-      List<SourceMap> sourceMaps = Parser.parse(smap);
-
-      SourceMap result = Resolver.resolve(sourceMaps.get(0));
-      // clean result object to minimize memory usage
-      result
-          .getStratumList()
-          .forEach(stratum -> stratum.getLineInfo().forEach(li -> li.setFileInfo(null)));
-      return result;
-    } catch (Exception e) {
-      LOG.debug("Could not get resolved source map from smap", e);
+
+    public Stratum get(final String classname) {
+        return map.get(classname);
     }
-    return null;
-  }
 
-  private StratumExt getDefaultStratum(final byte[] bytes) {
-    try {
-      String[] classData = extractSourceDebugExtensionASM(bytes);
-      if (classData[1] == null) {
-        return null;
-      }
-      SourceMap smap = getResolvedSmap(classData[1]);
-      StratumExt stratum = smap != null ? smap.getStratum(smap.getDefaultStratumName()) : null;
+    private SourceMap getResolvedSmap(final String smap) {
+        try {
+            List<SourceMap> sourceMaps = Parser.parse(smap);
 
-      if (stratum == null) {
+            SourceMap result = Resolver.resolve(sourceMaps.get(0));
+            // clean result object to minimize memory usage
+            result.getStratumList().forEach(stratum -> stratum.getLineInfo().forEach(li -> li.setFileInfo(null)));
+            return result;
+        } catch (Exception e) {
+            LOG.debug("Could not get resolved source map from smap", e);
+        }
         return null;
-      }
+    }
 
-      stratum.setName(classData[0]);
-      return stratum;
-    } catch (Exception e) {
-      LOG.debug("Could not get default stratum from byte array", e);
+    private StratumExt getDefaultStratum(final byte[] bytes) {
+        try {
+            String[] classData = extractSourceDebugExtensionASM(bytes);
+            if (classData[1] == null) {
+                return null;
+            }
+            SourceMap smap = getResolvedSmap(classData[1]);
+            StratumExt stratum = smap != null ? smap.getStratum(smap.getDefaultStratumName()) : null;
+
+            if (stratum == null) {
+                return null;
+            }
+
+            stratum.setName(classData[0]);
+            return stratum;
+        } catch (Exception e) {
+            LOG.debug("Could not get default stratum from byte array", e);
+        }
+        return null;
     }
-    return null;
-  }
-
-  /** Get name and debug info */
-  private String[] extractSourceDebugExtensionASM(final byte[] classBytes) {
-    ClassReader cr = new ClassReader(classBytes);
-    final String[] result = new String[2];
-    cr.accept(
-        new ClassVisitor(OpenedClassReader.ASM_API) {
-          @Override
-          public void visit(
-              final int version,
-              final int access,
-              final String name,
-              final String signature,
-              final String superName,
-              final String[] interfaces) {
-            result[0] = name.replace('/', '.');
-          }
-
-          @Override
-          public void visitSource(final String source, final String debug) {
-            result[1] = debug;
-          }
-        },
-        ClassReader.SKIP_CODE | ClassReader.SKIP_FRAMES);
-
-    return result;
-  }
-
-  static class LimitedConcurrentHashMap {
-    private final int maxSize;
-    private final IntConsumer limitReachedCallback;
-    private volatile boolean limitReached = false;
-    private final Map<String, StratumExt> map = new ConcurrentHashMap<>();
-
-    public LimitedConcurrentHashMap(int maxSize, IntConsumer limitReachedCallback) {
-      this.maxSize = maxSize;
-      this.limitReachedCallback = limitReachedCallback;
+
+    /** Get name and debug info */
+    private String[] extractSourceDebugExtensionASM(final byte[] classBytes) {
+        ClassReader cr = new ClassReader(classBytes);
+        final String[] result = new String[2];
+        cr.accept(
+                new ClassVisitor(OpenedClassReader.ASM_API) {
+                    @Override
+                    public void visit(
+                            final int version,
+                            final int access,
+                            final String name,
+                            final String signature,
+                            final String superName,
+                            final String[] interfaces) {
+                        result[0] = name.replace('/', '.');
+                    }
+
+                    @Override
+                    public void visitSource(final String source, final String debug) {
+                        result[1] = debug;
+                    }
+                },
+                ClassReader.SKIP_CODE | ClassReader.SKIP_FRAMES);
+
+        return result;
     }
 
-    public void put(String className, StratumExt value) {
-      synchronized (this) {
-        if (limitReached) {
-          return;
+    static class LimitedConcurrentHashMap {
+        private final int maxSize;
+        private final IntConsumer limitReachedCallback;
+        private volatile boolean limitReached = false;
+        private final Map<String, StratumExt> map = new ConcurrentHashMap<>();
+
+        public LimitedConcurrentHashMap(int maxSize, IntConsumer limitReachedCallback) {
+            this.maxSize = maxSize;
+            this.limitReachedCallback = limitReachedCallback;
         }
-        map.put(className, value);
-        if (this.size() >= maxSize) {
-          limitReachedCallback.accept(maxSize);
-          limitReached = true;
+
+        public void put(String className, StratumExt value) {
+            synchronized (this) {
+                if (limitReached) {
+                    return;
+                }
+                map.put(className, value);
+                if (this.size() >= maxSize) {
+                    limitReachedCallback.accept(maxSize);
+                    limitReached = true;
+                }
+            }
         }
-      }
-    }
 
-    public int size() {
-      return map.size();
-    }
+        public int size() {
+            return map.size();
+        }
 
-    public boolean isLimitReached() {
-      return limitReached;
-    }
+        public boolean isLimitReached() {
+            return limitReached;
+        }
 
-    public StratumExt get(String classname) {
-      return map.get(classname);
+        public StratumExt get(String classname) {
+            return map.get(classname);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/parser/Builder.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/parser/Builder.java
index 3d52126b4d3..537429c27bb 100755
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/parser/Builder.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/parser/Builder.java
@@ -14,150 +14,150 @@
  * https://jakarta.ee/specifications/debugging/2.0/jdsol-spec-2.0#smap-syntax
  */
 enum Builder {
-  CLOSE_STRATUM {
-    @Override
-    public void build(State state, List<String> lines) {
-      String[] tokens = SPACE_PATTERN.split(lines.get(0), 2);
-      if (tokens.length < 2 || tokens[1].equals("")) {
-        throw new IllegalArgumentException("Stratum name expected");
-      }
-      EmbeddedStratum embeddedStratum = new EmbeddedStratum(tokens[1]);
-      state.pop(embeddedStratum);
-    }
-  },
-  END_SOURCE {
-    @Override
-    public void build(final State state, final List<String> lines) {
-      state.endSourceMap();
-    }
-  },
-  FILE_INFO {
-    @Override
-    public void build(final State state, final List<String> lines) {
-      if (!state.getStratum().getFileInfo().isEmpty()) {
-        throw new IllegalArgumentException("Only one file section allowed");
-      }
-      for (int i = 1; i < lines.size(); ) {
-        String s = lines.get(i++);
-        String fileId;
-        String fileName;
-        String filePath;
-        if (s.startsWith("+")) {
-          String[] tokens = SPACE_PATTERN.split(s, 3);
-          fileId = tokens[1];
-          fileName = tokens[2];
-          if (i == lines.size()) {
-            throw new IllegalStateException("File path expected");
-          }
-          filePath = lines.get(i++);
-        } else {
-          String[] tokens = SPACE_PATTERN.split(s, 2);
-          fileId = tokens[0];
-          fileName = tokens[1];
-          filePath = fileName;
+    CLOSE_STRATUM {
+        @Override
+        public void build(State state, List<String> lines) {
+            String[] tokens = SPACE_PATTERN.split(lines.get(0), 2);
+            if (tokens.length < 2 || tokens[1].equals("")) {
+                throw new IllegalArgumentException("Stratum name expected");
+            }
+            EmbeddedStratum embeddedStratum = new EmbeddedStratum(tokens[1]);
+            state.pop(embeddedStratum);
         }
-        state.getStratum().getFileInfo().add(new FileInfo(fileId, fileName, filePath));
-      }
-    }
-  },
-  LINE_INFO {
-    @Override
-    public void build(final State state, final List<String> lines) {
-      if (!state.getStratum().getLineInfo().isEmpty()) {
-        throw new IllegalStateException("Only one line section allowed");
-      }
-      String fileId = "0"; // spec says default is zero
-      for (int i = 1; i < lines.size(); i++) {
-        int inputStartLine = 1;
-        int repeatCount = 1;
-        int outputStartLine = 1;
-        int outputLineIncrement = 1;
-        Matcher m = LINE_INFO_PATTERN.matcher(lines.get(i));
-        if (!m.matches()) {
-          throw new IllegalArgumentException("Invalid line info: " + lines.get(i));
+    },
+    END_SOURCE {
+        @Override
+        public void build(final State state, final List<String> lines) {
+            state.endSourceMap();
         }
-        try {
-          inputStartLine = Integer.parseInt(m.group(1));
-          if (m.group(3) != null) {
-            fileId = m.group(3);
-          }
-          if (m.group(5) != null) {
-            repeatCount = Integer.parseInt(m.group(5));
-          }
-          outputStartLine = Integer.parseInt(m.group(6));
-          if (m.group(8) != null) {
-            outputLineIncrement = Integer.parseInt(m.group(8));
-          }
-        } catch (NumberFormatException nfe) {
-          throw new IllegalArgumentException("Invalid line info: " + lines.get(i));
+    },
+    FILE_INFO {
+        @Override
+        public void build(final State state, final List<String> lines) {
+            if (!state.getStratum().getFileInfo().isEmpty()) {
+                throw new IllegalArgumentException("Only one file section allowed");
+            }
+            for (int i = 1; i < lines.size(); ) {
+                String s = lines.get(i++);
+                String fileId;
+                String fileName;
+                String filePath;
+                if (s.startsWith("+")) {
+                    String[] tokens = SPACE_PATTERN.split(s, 3);
+                    fileId = tokens[1];
+                    fileName = tokens[2];
+                    if (i == lines.size()) {
+                        throw new IllegalStateException("File path expected");
+                    }
+                    filePath = lines.get(i++);
+                } else {
+                    String[] tokens = SPACE_PATTERN.split(s, 2);
+                    fileId = tokens[0];
+                    fileName = tokens[1];
+                    filePath = fileName;
+                }
+                state.getStratum().getFileInfo().add(new FileInfo(fileId, fileName, filePath));
+            }
         }
-        LineInfo lineInfo =
-            new LineInfo(fileId, inputStartLine, repeatCount, outputStartLine, outputLineIncrement);
-        state.getStratum().addLineInfo(lineInfo);
-      }
-    }
-  },
-  SOURCE_MAP {
-    @Override
-    public void build(final State state, final List<String> lines) {
-      if (lines.size() < 3) {
-        throw new IllegalStateException("Source map information expected");
-      }
-      SourceMap sourceMap = new SourceMap(lines.get(1), lines.get(2));
-      state.getParentStratum().getSourceMapList().add(sourceMap);
-      state.setSourceMap(sourceMap);
-    }
-  },
-  OPEN_EMBEDDED_STRATUM {
-    @Override
-    public void build(final State state, final List<String> lines) {
-      String[] tokens = SPACE_PATTERN.split(lines.get(0), 2);
-      if (tokens.length < 2 || tokens[1].equals("")) {
-        throw new IllegalStateException("Stratum name expected");
-      }
-      EmbeddedStratum embeddedStratum = new EmbeddedStratum(tokens[1]);
-      state.getSourceMap().getEmbeddedStratumList().add(embeddedStratum);
-      state.push(embeddedStratum);
-    }
-  },
-  STRATUM {
-    @Override
-    public void build(final State state, final List<String> lines) {
-      String[] tokens = SPACE_PATTERN.split(lines.get(0), 2);
-      if (tokens.length < 2 || tokens[1].isEmpty()) {
-        throw new IllegalStateException("Stratum name expected");
-      }
-      StratumExt stratum = new StratumExt(tokens[1]);
-      state.getSourceMap().getStratumList().add(stratum);
-      state.setStratum(stratum);
-    }
-  };
+    },
+    LINE_INFO {
+        @Override
+        public void build(final State state, final List<String> lines) {
+            if (!state.getStratum().getLineInfo().isEmpty()) {
+                throw new IllegalStateException("Only one line section allowed");
+            }
+            String fileId = "0"; // spec says default is zero
+            for (int i = 1; i < lines.size(); i++) {
+                int inputStartLine = 1;
+                int repeatCount = 1;
+                int outputStartLine = 1;
+                int outputLineIncrement = 1;
+                Matcher m = LINE_INFO_PATTERN.matcher(lines.get(i));
+                if (!m.matches()) {
+                    throw new IllegalArgumentException("Invalid line info: " + lines.get(i));
+                }
+                try {
+                    inputStartLine = Integer.parseInt(m.group(1));
+                    if (m.group(3) != null) {
+                        fileId = m.group(3);
+                    }
+                    if (m.group(5) != null) {
+                        repeatCount = Integer.parseInt(m.group(5));
+                    }
+                    outputStartLine = Integer.parseInt(m.group(6));
+                    if (m.group(8) != null) {
+                        outputLineIncrement = Integer.parseInt(m.group(8));
+                    }
+                } catch (NumberFormatException nfe) {
+                    throw new IllegalArgumentException("Invalid line info: " + lines.get(i));
+                }
+                LineInfo lineInfo =
+                        new LineInfo(fileId, inputStartLine, repeatCount, outputStartLine, outputLineIncrement);
+                state.getStratum().addLineInfo(lineInfo);
+            }
+        }
+    },
+    SOURCE_MAP {
+        @Override
+        public void build(final State state, final List<String> lines) {
+            if (lines.size() < 3) {
+                throw new IllegalStateException("Source map information expected");
+            }
+            SourceMap sourceMap = new SourceMap(lines.get(1), lines.get(2));
+            state.getParentStratum().getSourceMapList().add(sourceMap);
+            state.setSourceMap(sourceMap);
+        }
+    },
+    OPEN_EMBEDDED_STRATUM {
+        @Override
+        public void build(final State state, final List<String> lines) {
+            String[] tokens = SPACE_PATTERN.split(lines.get(0), 2);
+            if (tokens.length < 2 || tokens[1].equals("")) {
+                throw new IllegalStateException("Stratum name expected");
+            }
+            EmbeddedStratum embeddedStratum = new EmbeddedStratum(tokens[1]);
+            state.getSourceMap().getEmbeddedStratumList().add(embeddedStratum);
+            state.push(embeddedStratum);
+        }
+    },
+    STRATUM {
+        @Override
+        public void build(final State state, final List<String> lines) {
+            String[] tokens = SPACE_PATTERN.split(lines.get(0), 2);
+            if (tokens.length < 2 || tokens[1].isEmpty()) {
+                throw new IllegalStateException("Stratum name expected");
+            }
+            StratumExt stratum = new StratumExt(tokens[1]);
+            state.getSourceMap().getStratumList().add(stratum);
+            state.setStratum(stratum);
+        }
+    };
 
-  private static final Pattern LINE_INFO_PATTERN =
-      Pattern.compile("(\\d++)(#(\\d++))?(,(\\d++))?:(\\d++)(,(\\d++))?($)");
+    private static final Pattern LINE_INFO_PATTERN =
+            Pattern.compile("(\\d++)(#(\\d++))?(,(\\d++))?:(\\d++)(,(\\d++))?($)");
 
-  static final Pattern SPACE_PATTERN = Pattern.compile(" ");
+    static final Pattern SPACE_PATTERN = Pattern.compile(" ");
 
-  abstract void build(State paramState, List<String> lines);
+    abstract void build(State paramState, List<String> lines);
 
-  public static Builder get(String sectionName) {
-    switch (sectionName) {
-      case "C":
-        return CLOSE_STRATUM;
-      case "E":
-        return END_SOURCE;
-      case "F":
-        return FILE_INFO;
-      case "L":
-        return LINE_INFO;
-      case "SMAP":
-        return SOURCE_MAP;
-      case "O":
-        return OPEN_EMBEDDED_STRATUM;
-      case "S":
-        return STRATUM;
-      default:
-        throw new IllegalArgumentException("Invalid section name: " + sectionName);
+    public static Builder get(String sectionName) {
+        switch (sectionName) {
+            case "C":
+                return CLOSE_STRATUM;
+            case "E":
+                return END_SOURCE;
+            case "F":
+                return FILE_INFO;
+            case "L":
+                return LINE_INFO;
+            case "SMAP":
+                return SOURCE_MAP;
+            case "O":
+                return OPEN_EMBEDDED_STRATUM;
+            case "S":
+                return STRATUM;
+            default:
+                throw new IllegalArgumentException("Invalid section name: " + sectionName);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/parser/Parser.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/parser/Parser.java
index 465a034797b..d76e9ead02a 100755
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/parser/Parser.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/parser/Parser.java
@@ -12,91 +12,91 @@
 import java.util.regex.Pattern;
 
 public class Parser {
-  private static final Pattern END_OF_LINE_PATTERN = Pattern.compile("\r\n|\r|\n");
+    private static final Pattern END_OF_LINE_PATTERN = Pattern.compile("\r\n|\r|\n");
 
-  private static List<SourceMap> parseDone(State state) {
-    EmbeddedStratum result = state.done();
-    resolveLineFileInfo(result);
-    return result.getSourceMapList();
-  }
-
-  private static void resolveLineFileInfo(final EmbeddedStratum embeddedStratum) {
-    for (SourceMap sourceMap : embeddedStratum.getSourceMapList()) {
-      resolveLineFileInfo(sourceMap);
+    private static List<SourceMap> parseDone(State state) {
+        EmbeddedStratum result = state.done();
+        resolveLineFileInfo(result);
+        return result.getSourceMapList();
     }
-  }
 
-  private static void resolveLineFileInfo(final SourceMap sourceMap) {
-    for (StratumExt stratum : sourceMap.getStratumList()) {
-      resolveLineFileInfo(stratum);
-    }
-    for (EmbeddedStratum stratum : sourceMap.getEmbeddedStratumList()) {
-      resolveLineFileInfo(stratum);
+    private static void resolveLineFileInfo(final EmbeddedStratum embeddedStratum) {
+        for (SourceMap sourceMap : embeddedStratum.getSourceMapList()) {
+            resolveLineFileInfo(sourceMap);
+        }
     }
-  }
 
-  private static void resolveLineFileInfo(final StratumExt stratum) {
-    for (LineInfo lineInfo : stratum.getLineInfo()) {
-      FileInfo fileInfo = get(stratum.getFileInfo(), lineInfo.getFileId());
-      if (fileInfo == null) {
-        throw new IllegalArgumentException("Invalid file id: " + lineInfo.getFileId());
-      }
-      lineInfo.setFileInfo(fileInfo);
+    private static void resolveLineFileInfo(final SourceMap sourceMap) {
+        for (StratumExt stratum : sourceMap.getStratumList()) {
+            resolveLineFileInfo(stratum);
+        }
+        for (EmbeddedStratum stratum : sourceMap.getEmbeddedStratumList()) {
+            resolveLineFileInfo(stratum);
+        }
     }
-  }
 
-  public static FileInfo get(final List<FileInfo> list, String fileId) {
-    for (FileInfo fileInfo : list) {
-      if (fileInfo.getFileId().equals(fileId)) {
-        return fileInfo;
-      }
+    private static void resolveLineFileInfo(final StratumExt stratum) {
+        for (LineInfo lineInfo : stratum.getLineInfo()) {
+            FileInfo fileInfo = get(stratum.getFileInfo(), lineInfo.getFileId());
+            if (fileInfo == null) {
+                throw new IllegalArgumentException("Invalid file id: " + lineInfo.getFileId());
+            }
+            lineInfo.setFileInfo(fileInfo);
+        }
     }
-    return null;
-  }
 
-  private static Builder getBuilder(List<String> lines) {
-    if (lines.isEmpty()) {
-      return null;
-    }
-    String sectionName = lines.get(0);
-    String[] tokens = SPACE_PATTERN.split(lines.get(0), 2);
-    if (tokens.length > 1) {
-      sectionName = tokens[0].trim();
+    public static FileInfo get(final List<FileInfo> list, String fileId) {
+        for (FileInfo fileInfo : list) {
+            if (fileInfo.getFileId().equals(fileId)) {
+                return fileInfo;
+            }
+        }
+        return null;
     }
-    if (sectionName.startsWith("*")) {
-      sectionName = sectionName.substring("*".length());
+
+    private static Builder getBuilder(List<String> lines) {
+        if (lines.isEmpty()) {
+            return null;
+        }
+        String sectionName = lines.get(0);
+        String[] tokens = SPACE_PATTERN.split(lines.get(0), 2);
+        if (tokens.length > 1) {
+            sectionName = tokens[0].trim();
+        }
+        if (sectionName.startsWith("*")) {
+            sectionName = sectionName.substring("*".length());
+        }
+        return Builder.get(sectionName);
     }
-    return Builder.get(sectionName);
-  }
 
-  private static void parseSection(State state, List<String> lines) {
-    Builder builder = getBuilder(lines);
-    if (builder != null) {
-      builder.build(state, lines);
+    private static void parseSection(State state, List<String> lines) {
+        Builder builder = getBuilder(lines);
+        if (builder != null) {
+            builder.build(state, lines);
+        }
     }
-  }
 
-  public static List<SourceMap> parse(String source) {
-    State state = new State();
-    String line = null;
-    try {
-      String[] lines = END_OF_LINE_PATTERN.split(source);
-      boolean isSectionLine = true;
-      List<String> sectionLines = new ArrayList<>();
-      for (int i = 0; i < lines.length; i++) {
-        line = lines[i];
-        state.lineNumber += 1;
-        if (line.startsWith("*") || isSectionLine && line.equals("SMAP")) {
-          parseSection(state, sectionLines);
-          sectionLines.clear();
+    public static List<SourceMap> parse(String source) {
+        State state = new State();
+        String line = null;
+        try {
+            String[] lines = END_OF_LINE_PATTERN.split(source);
+            boolean isSectionLine = true;
+            List<String> sectionLines = new ArrayList<>();
+            for (int i = 0; i < lines.length; i++) {
+                line = lines[i];
+                state.lineNumber += 1;
+                if (line.startsWith("*") || isSectionLine && line.equals("SMAP")) {
+                    parseSection(state, sectionLines);
+                    sectionLines.clear();
+                }
+                isSectionLine = line.startsWith("*");
+                sectionLines.add(line);
+            }
+            parseSection(state, sectionLines);
+            return parseDone(state);
+        } catch (Exception sme) {
+            throw new RuntimeException(sme.getMessage() + ":" + state.lineNumber + ":" + line, sme);
         }
-        isSectionLine = line.startsWith("*");
-        sectionLines.add(line);
-      }
-      parseSection(state, sectionLines);
-      return parseDone(state);
-    } catch (Exception sme) {
-      throw new RuntimeException(sme.getMessage() + ":" + state.lineNumber + ":" + line, sme);
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/parser/State.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/parser/State.java
index b846bf86efb..64dcf22147c 100755
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/parser/State.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/stratum/parser/State.java
@@ -7,89 +7,88 @@
 import java.util.Deque;
 
 class State {
-  private SourceMap sourceMap;
+    private SourceMap sourceMap;
 
-  private StratumExt stratum;
+    private StratumExt stratum;
 
-  private EmbeddedStratum parentStratum = new EmbeddedStratum();
+    private EmbeddedStratum parentStratum = new EmbeddedStratum();
 
-  private final Deque<StackItem> stateStack = new ArrayDeque<>();
+    private final Deque<StackItem> stateStack = new ArrayDeque<>();
 
-  int lineNumber;
+    int lineNumber;
 
-  public EmbeddedStratum done() {
-    if (!stateStack.isEmpty()) {
-      throw new IllegalStateException("Unbalanced source map");
+    public EmbeddedStratum done() {
+        if (!stateStack.isEmpty()) {
+            throw new IllegalStateException("Unbalanced source map");
+        }
+        return parentStratum;
     }
-    return parentStratum;
-  }
 
-  public SourceMap getSourceMap() {
-    return sourceMap;
-  }
+    public SourceMap getSourceMap() {
+        return sourceMap;
+    }
+
+    void setSourceMap(final SourceMap sourceMap) {
+        if (this.sourceMap != null) {
+            throw new IllegalStateException("End of source map expected");
+        }
+        this.sourceMap = sourceMap;
+        stratum = null;
+    }
 
-  void setSourceMap(final SourceMap sourceMap) {
-    if (this.sourceMap != null) {
-      throw new IllegalStateException("End of source map expected");
+    void endSourceMap() {
+        if (sourceMap == null) {
+            throw new IllegalStateException("Unexpected end of source map");
+        }
+        sourceMap = null;
+        stratum = null;
     }
-    this.sourceMap = sourceMap;
-    stratum = null;
-  }
 
-  void endSourceMap() {
-    if (sourceMap == null) {
-      throw new IllegalStateException("Unexpected end of source map");
+    public StratumExt getStratum() {
+        if (stratum == null) {
+            throw new IllegalStateException("Stratum expected");
+        }
+        return stratum;
     }
-    sourceMap = null;
-    stratum = null;
-  }
 
-  public StratumExt getStratum() {
-    if (stratum == null) {
-      throw new IllegalStateException("Stratum expected");
+    void setStratum(final StratumExt stratum) {
+        if (sourceMap == null) {
+            throw new IllegalStateException("Source map expected");
+        }
+        this.stratum = stratum;
     }
-    return stratum;
-  }
 
-  void setStratum(final StratumExt stratum) {
-    if (sourceMap == null) {
-      throw new IllegalStateException("Source map expected");
+    void push(final EmbeddedStratum embeddedStratum) {
+        stateStack.push(new StackItem(sourceMap, parentStratum));
+        endSourceMap();
+        setParentStratum(embeddedStratum);
     }
-    this.stratum = stratum;
-  }
-
-  void push(final EmbeddedStratum embeddedStratum) {
-    stateStack.push(new StackItem(sourceMap, parentStratum));
-    endSourceMap();
-    setParentStratum(embeddedStratum);
-  }
-
-  void pop(final EmbeddedStratum embeddedStratum) {
-    if (!parentStratum.getName().equals(embeddedStratum.getName())) {
-      throw new IllegalArgumentException(
-          "Invalid closing embedded stratum: " + embeddedStratum.getName());
+
+    void pop(final EmbeddedStratum embeddedStratum) {
+        if (!parentStratum.getName().equals(embeddedStratum.getName())) {
+            throw new IllegalArgumentException("Invalid closing embedded stratum: " + embeddedStratum.getName());
+        }
+        StackItem item = stateStack.pop();
+        setSourceMap(item.sourceMap);
+        setParentStratum(item.parentStratum);
     }
-    StackItem item = stateStack.pop();
-    setSourceMap(item.sourceMap);
-    setParentStratum(item.parentStratum);
-  }
 
-  public EmbeddedStratum getParentStratum() {
-    return parentStratum;
-  }
+    public EmbeddedStratum getParentStratum() {
+        return parentStratum;
+    }
 
-  private void setParentStratum(final EmbeddedStratum parentStratum) {
-    this.parentStratum = parentStratum;
-  }
+    private void setParentStratum(final EmbeddedStratum parentStratum) {
+        this.parentStratum = parentStratum;
+    }
 
-  private class StackItem {
-    SourceMap sourceMap;
+    private class StackItem {
+        SourceMap sourceMap;
 
-    EmbeddedStratum parentStratum;
+        EmbeddedStratum parentStratum;
 
-    public StackItem(final SourceMap sourceMap, final EmbeddedStratum parentStratum) {
-      this.sourceMap = sourceMap;
-      this.parentStratum = parentStratum;
+        public StackItem(final SourceMap sourceMap, final EmbeddedStratum parentStratum) {
+            this.sourceMap = sourceMap;
+            this.parentStratum = parentStratum;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/muzzle/AddableClassLoader.java b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/muzzle/AddableClassLoader.java
index d2e63d23c03..0bd09899baa 100644
--- a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/muzzle/AddableClassLoader.java
+++ b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/muzzle/AddableClassLoader.java
@@ -13,51 +13,51 @@
 
 public class AddableClassLoader extends SecureClassLoader {
 
-  private final Set<String> toDelegate = new HashSet<>();
-  private final Map<String, URL> classResources = new HashMap<>();
-
-  protected AddableClassLoader(Class<?>... inheritedClasses) {
-    super(null); // delegate to bootstrap
-    for (Class<?> clazz : inheritedClasses) {
-      addDelegateClass(clazz);
+    private final Set<String> toDelegate = new HashSet<>();
+    private final Map<String, URL> classResources = new HashMap<>();
+
+    protected AddableClassLoader(Class<?>... inheritedClasses) {
+        super(null); // delegate to bootstrap
+        for (Class<?> clazz : inheritedClasses) {
+            addDelegateClass(clazz);
+        }
     }
-  }
 
-  protected void addDelegateClass(Class<?> delegate) {
-    toDelegate.add(delegate.getName());
-  }
+    protected void addDelegateClass(Class<?> delegate) {
+        toDelegate.add(delegate.getName());
+    }
 
-  @Override
-  protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-    if (toDelegate.contains(name)) {
-      return getSystemClassLoader().loadClass(name);
+    @Override
+    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+        if (toDelegate.contains(name)) {
+            return getSystemClassLoader().loadClass(name);
+        }
+        return super.loadClass(name, resolve);
     }
-    return super.loadClass(name, resolve);
-  }
-
-  @Override
-  public URL getResource(String name) {
-    URL classResource = classResources.get(name);
-    if (classResource == null) {
-      return super.getResource(name);
+
+    @Override
+    public URL getResource(String name) {
+        URL classResource = classResources.get(name);
+        if (classResource == null) {
+            return super.getResource(name);
+        }
+        return classResource;
     }
-    return classResource;
-  }
-
-  public void addClass(Class<?> existingClass) throws IOException {
-    String name = existingClass.getName();
-    String resourceName = Strings.getResourceName(name);
-    URL classResource = existingClass.getResource("/" + resourceName);
-    classResources.put(resourceName, classResource);
-    InputStream classStream = classResource.openStream();
-    assert classStream != null;
-    ByteArrayOutputStream outputStream = new ByteArrayOutputStream(classStream.available());
-    final byte[] buffer = new byte[classStream.available()];
-    int n;
-    while (-1 != (n = classStream.read(buffer))) {
-      outputStream.write(buffer, 0, n);
+
+    public void addClass(Class<?> existingClass) throws IOException {
+        String name = existingClass.getName();
+        String resourceName = Strings.getResourceName(name);
+        URL classResource = existingClass.getResource("/" + resourceName);
+        classResources.put(resourceName, classResource);
+        InputStream classStream = classResource.openStream();
+        assert classStream != null;
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream(classStream.available());
+        final byte[] buffer = new byte[classStream.available()];
+        int n;
+        while (-1 != (n = classStream.read(buffer))) {
+            outputStream.write(buffer, 0, n);
+        }
+        byte[] bytes = outputStream.toByteArray();
+        defineClass(name, bytes, 0, bytes.length);
     }
-    byte[] bytes = outputStream.toByteArray();
-    defineClass(name, bytes, 0, bytes.length);
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/muzzle/ServiceEnabledClassLoader.java b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/muzzle/ServiceEnabledClassLoader.java
index 8066dc527fa..b4aab7296ef 100644
--- a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/muzzle/ServiceEnabledClassLoader.java
+++ b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/muzzle/ServiceEnabledClassLoader.java
@@ -12,48 +12,47 @@
 import java.util.Enumeration;
 
 public class ServiceEnabledClassLoader extends AddableClassLoader {
-  private static final String PREFIX = "META-INF/services/";
-  private final Class<?> serviceClass;
-  private final String serviceResource;
-  private final File serviceRegistry;
+    private static final String PREFIX = "META-INF/services/";
+    private final Class<?> serviceClass;
+    private final String serviceResource;
+    private final File serviceRegistry;
 
-  protected ServiceEnabledClassLoader(Class<?> serviceClass, Class<?>... inheritedClasses)
-      throws IOException {
-    super(inheritedClasses);
-    super.addDelegateClass(serviceClass);
-    this.serviceClass = serviceClass;
-    serviceResource = PREFIX + serviceClass.getName();
-    serviceRegistry = File.createTempFile(serviceClass.getSimpleName() + "-registry.", ".txt");
-    serviceRegistry.deleteOnExit();
-    serviceRegistry.createNewFile();
-    for (Class<?> clazz : inheritedClasses) {
-      registerClass(clazz);
+    protected ServiceEnabledClassLoader(Class<?> serviceClass, Class<?>... inheritedClasses) throws IOException {
+        super(inheritedClasses);
+        super.addDelegateClass(serviceClass);
+        this.serviceClass = serviceClass;
+        serviceResource = PREFIX + serviceClass.getName();
+        serviceRegistry = File.createTempFile(serviceClass.getSimpleName() + "-registry.", ".txt");
+        serviceRegistry.deleteOnExit();
+        serviceRegistry.createNewFile();
+        for (Class<?> clazz : inheritedClasses) {
+            registerClass(clazz);
+        }
     }
-  }
 
-  @Override
-  public void addClass(Class<?> existingClass) throws IOException {
-    super.addClass(existingClass);
-    registerClass(existingClass);
-  }
+    @Override
+    public void addClass(Class<?> existingClass) throws IOException {
+        super.addClass(existingClass);
+        registerClass(existingClass);
+    }
 
-  private void registerClass(Class<?> existingClass) throws IOException {
-    if (serviceClass != existingClass
-        && !Modifier.isAbstract(existingClass.getModifiers())
-        && serviceClass.isAssignableFrom(existingClass)) {
-      FileWriter fw = new FileWriter(serviceRegistry, true);
-      BufferedWriter bw = new BufferedWriter(fw);
-      bw.write(existingClass.getName());
-      bw.newLine();
-      bw.close();
+    private void registerClass(Class<?> existingClass) throws IOException {
+        if (serviceClass != existingClass
+                && !Modifier.isAbstract(existingClass.getModifiers())
+                && serviceClass.isAssignableFrom(existingClass)) {
+            FileWriter fw = new FileWriter(serviceRegistry, true);
+            BufferedWriter bw = new BufferedWriter(fw);
+            bw.write(existingClass.getName());
+            bw.newLine();
+            bw.close();
+        }
     }
-  }
 
-  @Override
-  public Enumeration<URL> getResources(String name) throws IOException {
-    if (!serviceResource.equals(name)) {
-      return super.getResources(name);
+    @Override
+    public Enumeration<URL> getResources(String name) throws IOException {
+        if (!serviceResource.equals(name)) {
+            return super.getResources(name);
+        }
+        return enumeration(singletonList(serviceRegistry.toURI().toURL()));
     }
-    return enumeration(singletonList(serviceRegistry.toURI().toURL()));
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BadAdvice.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BadAdvice.java
index 49f2ff715b8..f160b770b5c 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BadAdvice.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BadAdvice.java
@@ -3,16 +3,16 @@
 import net.bytebuddy.asm.Advice;
 
 public class BadAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void throwAnException(@Advice.Return(readOnly = false) boolean returnVal) {
-    returnVal = true;
-    throw new RuntimeException("Test Exception");
-  }
-
-  public static class NoOpAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void doNothing() {
-      System.currentTimeMillis();
+    public static void throwAnException(@Advice.Return(readOnly = false) boolean returnVal) {
+        returnVal = true;
+        throw new RuntimeException("Test Exception");
+    }
+
+    public static class NoOpAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void doNothing() {
+            System.currentTimeMillis();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BlockingExceptionAdvice.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BlockingExceptionAdvice.java
index 18c47efaef0..740902d1940 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BlockingExceptionAdvice.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BlockingExceptionAdvice.java
@@ -5,8 +5,8 @@
 
 public class BlockingExceptionAdvice {
 
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void throwAnException() {
-    throw new BlockingException("You are blocked");
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void throwAnException() {
+        throw new BlockingException("You are blocked");
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BlockingTestClassLoader.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BlockingTestClassLoader.java
index ef1a69a086a..ce8b20b33b0 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BlockingTestClassLoader.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BlockingTestClassLoader.java
@@ -12,18 +12,18 @@
  */
 final class BlockingTestClassLoader extends URLClassLoader {
 
-  BlockingTestClassLoader(URL[] classpath) {
-    super(classpath, null, null);
-  }
-
-  @Override
-  public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-    if (name.equals(BlockingExceptionHandler.class.getName())) {
-      return BlockingExceptionHandler.class;
+    BlockingTestClassLoader(URL[] classpath) {
+        super(classpath, null, null);
     }
-    if (name.equals(BlockingException.class.getName())) {
-      return BlockingException.class;
+
+    @Override
+    public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+        if (name.equals(BlockingExceptionHandler.class.getName())) {
+            return BlockingExceptionHandler.class;
+        }
+        if (name.equals(BlockingException.class.getName())) {
+            return BlockingException.class;
+        }
+        return super.loadClass(name, resolve);
     }
-    return super.loadClass(name, resolve);
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/EnclosedClasses.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/EnclosedClasses.java
index f316d669e4b..dba504e6536 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/EnclosedClasses.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/EnclosedClasses.java
@@ -4,56 +4,55 @@
 
 public class EnclosedClasses {
 
-  static {
-    String id =
-        new Supplier<String>() {
-          @Override
-          public String get() {
-            return Long.toString(System.currentTimeMillis());
-          }
+    static {
+        String id = new Supplier<String>() {
+            @Override
+            public String get() {
+                return Long.toString(System.currentTimeMillis());
+            }
         }.get();
-    assert id != null;
-  }
-
-  @Override
-  public String toString() {
-    return new Supplier<String>() {
-      @Override
-      public String get() {
-        return EnclosedClasses.class + "@" + System.identityHashCode(this);
-      }
-    }.get();
-  }
-
-  public static class InnerStatic {
+        assert id != null;
+    }
+
     @Override
     public String toString() {
-      return new Supplier<String>() {
+        return new Supplier<String>() {
+            @Override
+            public String get() {
+                return EnclosedClasses.class + "@" + System.identityHashCode(this);
+            }
+        }.get();
+    }
+
+    public static class InnerStatic {
         @Override
-        public String get() {
-          return InnerStatic.class + "@" + System.identityHashCode(this);
+        public String toString() {
+            return new Supplier<String>() {
+                @Override
+                public String get() {
+                    return InnerStatic.class + "@" + System.identityHashCode(this);
+                }
+            }.get();
         }
-      }.get();
     }
-  }
 
-  public static class Inner {
-    @Override
-    public String toString() {
-      return new Supplier<String>() {
+    public static class Inner {
         @Override
-        public String get() {
-          return Inner.class + "@" + System.identityHashCode(this);
+        public String toString() {
+            return new Supplier<String>() {
+                @Override
+                public String get() {
+                    return Inner.class + "@" + System.identityHashCode(this);
+                }
+            }.get();
         }
-      }.get();
     }
-  }
 
-  public interface Interface {}
+    public interface Interface {}
 
-  public abstract static class Abstract {}
+    public abstract static class Abstract {}
 
-  public @interface Annotation {}
+    public @interface Annotation {}
 
-  public enum Enum {}
+    public enum Enum {}
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestIndexFirstModule.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestIndexFirstModule.java
index 3e7cc562bf0..b64120334a7 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestIndexFirstModule.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestIndexFirstModule.java
@@ -3,12 +3,12 @@
 import datadog.trace.agent.tooling.InstrumenterModule;
 
 public class TestIndexFirstModule extends InstrumenterModule {
-  public TestIndexFirstModule() {
-    super("test-index-priority");
-  }
+    public TestIndexFirstModule() {
+        super("test-index-priority");
+    }
 
-  @Override
-  public int order() {
-    return -100; // lower-values applied first
-  }
+    @Override
+    public int order() {
+        return -100; // lower-values applied first
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestIndexLastModule.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestIndexLastModule.java
index 1b72b63ce2a..2cc8046a89c 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestIndexLastModule.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestIndexLastModule.java
@@ -3,12 +3,12 @@
 import datadog.trace.agent.tooling.InstrumenterModule;
 
 public class TestIndexLastModule extends InstrumenterModule {
-  public TestIndexLastModule() {
-    super("test-index-priority");
-  }
+    public TestIndexLastModule() {
+        super("test-index-priority");
+    }
 
-  @Override
-  public int order() {
-    return 100; // higher-values applied last
-  }
+    @Override
+    public int order() {
+        return 100; // higher-values applied last
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestIndexMultiModule.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestIndexMultiModule.java
index 2fcc2071d2f..38b357f9e0b 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestIndexMultiModule.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestIndexMultiModule.java
@@ -7,27 +7,27 @@
 import java.util.List;
 
 public class TestIndexMultiModule extends InstrumenterModule {
-  public TestIndexMultiModule() {
-    super("test-index-multi");
-  }
+    public TestIndexMultiModule() {
+        super("test-index-multi");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(
-        new InstrumenterA(),
-        new InstrumenterB(),
-        new InstrumenterC(),
-        new InstrumenterD(),
-        new InstrumenterE());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(
+                new InstrumenterA(),
+                new InstrumenterB(),
+                new InstrumenterC(),
+                new InstrumenterD(),
+                new InstrumenterE());
+    }
 
-  static class InstrumenterA implements Instrumenter {}
+    static class InstrumenterA implements Instrumenter {}
 
-  static class InstrumenterB implements Instrumenter {}
+    static class InstrumenterB implements Instrumenter {}
 
-  static class InstrumenterC implements Instrumenter {}
+    static class InstrumenterC implements Instrumenter {}
 
-  static class InstrumenterD implements Instrumenter {}
+    static class InstrumenterD implements Instrumenter {}
 
-  static class InstrumenterE implements Instrumenter {}
+    static class InstrumenterE implements Instrumenter {}
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestIndexSelfModule.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestIndexSelfModule.java
index 6940de61c0a..1eb853beb35 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestIndexSelfModule.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestIndexSelfModule.java
@@ -3,7 +3,7 @@
 import datadog.trace.agent.tooling.InstrumenterModule;
 
 public class TestIndexSelfModule extends InstrumenterModule {
-  public TestIndexSelfModule() {
-    super("test-index-self");
-  }
+    public TestIndexSelfModule() {
+        super("test-index-self");
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/HelperScannerTest.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/HelperScannerTest.java
index 741545437e6..4e0e6d00e5e 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/HelperScannerTest.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/HelperScannerTest.java
@@ -7,44 +7,42 @@
 import org.junit.jupiter.api.Test;
 
 class HelperScannerTest {
-  private static final String SHADED_CLASS = "datadog.trace.agent.tooling.shaded.somelib.Client";
+    private static final String SHADED_CLASS = "datadog.trace.agent.tooling.shaded.somelib.Client";
 
-  private static final InstrumenterModule DEFAULT_MODULE =
-      new InstrumenterModule("helper-scanner-test") {};
+    private static final InstrumenterModule DEFAULT_MODULE = new InstrumenterModule("helper-scanner-test") {};
 
-  /** Mirrors a real module claiming third-party code shaded into its own package. */
-  private static final InstrumenterModule CLAIMING_MODULE =
-      new InstrumenterModule("helper-scanner-test-claiming") {
+    /** Mirrors a real module claiming third-party code shaded into its own package. */
+    private static final InstrumenterModule CLAIMING_MODULE = new InstrumenterModule("helper-scanner-test-claiming") {
         @Override
         public boolean isHelperClass(String className) {
-          return className.startsWith(packageName + ".shaded.");
+            return className.startsWith(packageName + ".shaded.");
         }
-      };
-
-  @Test
-  void neverTreatsBootstrapClassesAsHelpers() {
-    assertFalse(isHelperClass("java.util.ArrayList", true, CLAIMING_MODULE));
-    assertFalse(isHelperClass("org.slf4j.Logger", true, CLAIMING_MODULE));
-  }
-
-  @Test
-  void treatsModuleOutputClassesAsHelpers() {
-    assertTrue(isHelperClass("some.instrumentation.Advice", true, DEFAULT_MODULE));
-  }
-
-  @Test
-  void treatsSharedHelperPackagesAsHelpers() {
-    assertTrue(isHelperClass("datadog.trace.agent.tooling.iast.Sink", false, DEFAULT_MODULE));
-  }
-
-  @Test
-  void defersToModuleWhenNotOtherwiseRecognized() {
-    assertFalse(isHelperClass(SHADED_CLASS, false, DEFAULT_MODULE));
-    assertTrue(isHelperClass(SHADED_CLASS, false, CLAIMING_MODULE));
-  }
-
-  @Test
-  void defaultModuleImplementationClaimsNoHelpers() {
-    assertFalse(DEFAULT_MODULE.isHelperClass(SHADED_CLASS));
-  }
+    };
+
+    @Test
+    void neverTreatsBootstrapClassesAsHelpers() {
+        assertFalse(isHelperClass("java.util.ArrayList", true, CLAIMING_MODULE));
+        assertFalse(isHelperClass("org.slf4j.Logger", true, CLAIMING_MODULE));
+    }
+
+    @Test
+    void treatsModuleOutputClassesAsHelpers() {
+        assertTrue(isHelperClass("some.instrumentation.Advice", true, DEFAULT_MODULE));
+    }
+
+    @Test
+    void treatsSharedHelperPackagesAsHelpers() {
+        assertTrue(isHelperClass("datadog.trace.agent.tooling.iast.Sink", false, DEFAULT_MODULE));
+    }
+
+    @Test
+    void defersToModuleWhenNotOtherwiseRecognized() {
+        assertFalse(isHelperClass(SHADED_CLASS, false, DEFAULT_MODULE));
+        assertTrue(isHelperClass(SHADED_CLASS, false, CLAIMING_MODULE));
+    }
+
+    @Test
+    void defaultModuleImplementationClaimsNoHelpers() {
+        assertFalse(DEFAULT_MODULE.isHelperClass(SHADED_CLASS));
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/InstrumenterFlareTest.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/InstrumenterFlareTest.java
index 4ea607d0d4b..cd6b709fb15 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/InstrumenterFlareTest.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/InstrumenterFlareTest.java
@@ -19,62 +19,62 @@
 
 class InstrumenterFlareTest {
 
-  @AfterEach
-  void cleanup() {
-    InstrumenterFlare.resetTransformationErrors();
-  }
-
-  @Test
-  void addsBoundedDeduplicatedTransformationErrors() throws IOException {
-    InstrumenterFlare.recordTransformationError("repeated error");
-    InstrumenterFlare.recordTransformationError("repeated error");
-    for (int error = 0; error < 63; error++) {
-      InstrumenterFlare.recordTransformationError("unique error " + error);
+    @AfterEach
+    void cleanup() {
+        InstrumenterFlare.resetTransformationErrors();
     }
-    InstrumenterFlare.recordTransformationError("overflow error");
 
-    InstrumenterFlare.register();
-    ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-    try (ZipOutputStream zip = new ZipOutputStream(bytes)) {
-      TracerFlare.addReportsToFlare(zip);
-    }
+    @Test
+    void addsBoundedDeduplicatedTransformationErrors() throws IOException {
+        InstrumenterFlare.recordTransformationError("repeated error");
+        InstrumenterFlare.recordTransformationError("repeated error");
+        for (int error = 0; error < 63; error++) {
+            InstrumenterFlare.recordTransformationError("unique error " + error);
+        }
+        InstrumenterFlare.recordTransformationError("overflow error");
 
-    String errors = readEntry(bytes.toByteArray(), "instrumenter_errors.txt");
-    assertNotNull(errors);
-    assertTrue(errors.contains("count=2 detail=repeated error"));
-    assertTrue(errors.contains("count=1 detail=unique error 62"));
-    assertFalse(errors.contains("overflow error"));
-    assertTrue(errors.contains("dropped_error_count=1"));
-  }
+        InstrumenterFlare.register();
+        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+        try (ZipOutputStream zip = new ZipOutputStream(bytes)) {
+            TracerFlare.addReportsToFlare(zip);
+        }
 
-  @Test
-  void truncatesTransformationErrorDetails() {
-    char[] detail = new char[5000];
-    Arrays.fill(detail, 'x');
+        String errors = readEntry(bytes.toByteArray(), "instrumenter_errors.txt");
+        assertNotNull(errors);
+        assertTrue(errors.contains("count=2 detail=repeated error"));
+        assertTrue(errors.contains("count=1 detail=unique error 62"));
+        assertFalse(errors.contains("overflow error"));
+        assertTrue(errors.contains("dropped_error_count=1"));
+    }
+
+    @Test
+    void truncatesTransformationErrorDetails() {
+        char[] detail = new char[5000];
+        Arrays.fill(detail, 'x');
 
-    InstrumenterFlare.recordTransformationError(new String(detail));
+        InstrumenterFlare.recordTransformationError(new String(detail));
 
-    String errors = InstrumenterFlare.transformationErrors();
-    assertTrue(errors.startsWith("count=1 detail="));
-    assertTrue(errors.endsWith("...\n"));
-    assertEquals("count=1 detail=".length() + 4096 + "...\n".length(), errors.length());
-  }
+        String errors = InstrumenterFlare.transformationErrors();
+        assertTrue(errors.startsWith("count=1 detail="));
+        assertTrue(errors.endsWith("...\n"));
+        assertEquals("count=1 detail=".length() + 4096 + "...\n".length(), errors.length());
+    }
 
-  private static String readEntry(byte[] zipBytes, String entryName) throws IOException {
-    try (ZipInputStream zip = new ZipInputStream(new ByteArrayInputStream(zipBytes))) {
-      ZipEntry entry;
-      byte[] buffer = new byte[1024];
-      while ((entry = zip.getNextEntry()) != null) {
-        if (entryName.equals(entry.getName())) {
-          ByteArrayOutputStream contents = new ByteArrayOutputStream();
-          int read;
-          while ((read = zip.read(buffer)) >= 0) {
-            contents.write(buffer, 0, read);
-          }
-          return new String(contents.toByteArray(), StandardCharsets.UTF_8);
+    private static String readEntry(byte[] zipBytes, String entryName) throws IOException {
+        try (ZipInputStream zip = new ZipInputStream(new ByteArrayInputStream(zipBytes))) {
+            ZipEntry entry;
+            byte[] buffer = new byte[1024];
+            while ((entry = zip.getNextEntry()) != null) {
+                if (entryName.equals(entry.getName())) {
+                    ByteArrayOutputStream contents = new ByteArrayOutputStream();
+                    int read;
+                    while ((read = zip.read(buffer)) >= 0) {
+                        contents.write(buffer, 0, read);
+                    }
+                    return new String(contents.toByteArray(), StandardCharsets.UTF_8);
+                }
+            }
+            return null;
         }
-      }
-      return null;
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/AdviceProcessorPipelineTest.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/AdviceProcessorPipelineTest.java
index 322343ad53d..a5f953ad0e4 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/AdviceProcessorPipelineTest.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/AdviceProcessorPipelineTest.java
@@ -37,217 +37,188 @@
 import org.junit.jupiter.api.io.TempDir;
 
 class AdviceProcessorPipelineTest {
-  @Test
-  void oneScanFeedsMuzzleAndAdditionalProcessor(@TempDir Path temp) throws Exception {
-    PipelineModule.instances = 0;
-    ScanModule.adviceRegistrations = 0;
-    CapturingProcessor additional = new CapturingProcessor();
-    AdviceScanningGradlePlugin plugin =
-        new AdviceScanningGradlePlugin(
-            temp.toFile(), asList(new MuzzleGenerationProcessor(), additional));
-    TypeDescription description = new TypeDescription.ForLoadedType(PipelineModule.class);
-    DynamicType.Builder<?> transformed =
-        plugin.apply(
-            new ByteBuddy().redefine(PipelineModule.class),
-            description,
-            ClassFileLocator.ForClassLoader.of(getClass().getClassLoader()));
-    String muzzleClassName = PipelineModule.class.getName() + "$Muzzle";
-    Path muzzleClass = temp.resolve(muzzleClassName.replace('.', '/') + ".class");
-
-    assertEquals(1, PipelineModule.instances);
-    assertEquals(1, ScanModule.adviceRegistrations);
-    assertNotNull(additional.scanResult);
-    assertArrayEquals(
-        new String[] {
-          AdviceScanningHelper.class.getName(),
-          Dependency.class.getName(),
-          AdviceScanningHelper.anonymousClass().getName(),
-          AdviceScanningHelper.localClass().getName()
-        },
-        additional.helpers);
-    Class<?> generatedModule =
-        transformed
-            .make()
-            .load(getClass().getClassLoader(), ClassLoadingStrategy.Default.CHILD_FIRST)
-            .getLoaded();
-    assertArrayEquals(
-        additional.helpers,
-        (String[])
-            generatedModule
+    @Test
+    void oneScanFeedsMuzzleAndAdditionalProcessor(@TempDir Path temp) throws Exception {
+        PipelineModule.instances = 0;
+        ScanModule.adviceRegistrations = 0;
+        CapturingProcessor additional = new CapturingProcessor();
+        AdviceScanningGradlePlugin plugin =
+                new AdviceScanningGradlePlugin(temp.toFile(), asList(new MuzzleGenerationProcessor(), additional));
+        TypeDescription description = new TypeDescription.ForLoadedType(PipelineModule.class);
+        DynamicType.Builder<?> transformed = plugin.apply(
+                new ByteBuddy().redefine(PipelineModule.class),
+                description,
+                ClassFileLocator.ForClassLoader.of(getClass().getClassLoader()));
+        String muzzleClassName = PipelineModule.class.getName() + "$Muzzle";
+        Path muzzleClass = temp.resolve(muzzleClassName.replace('.', '/') + ".class");
+
+        assertEquals(1, PipelineModule.instances);
+        assertEquals(1, ScanModule.adviceRegistrations);
+        assertNotNull(additional.scanResult);
+        assertArrayEquals(
+                new String[] {
+                    AdviceScanningHelper.class.getName(),
+                    Dependency.class.getName(),
+                    AdviceScanningHelper.anonymousClass().getName(),
+                    AdviceScanningHelper.localClass().getName()
+                },
+                additional.helpers);
+        Class<?> generatedModule = transformed
+                .make()
+                .load(getClass().getClassLoader(), ClassLoadingStrategy.Default.CHILD_FIRST)
+                .getLoaded();
+        assertArrayEquals(additional.helpers, (String[]) generatedModule
                 .getMethod("helperClassNames")
                 .invoke(generatedModule.getConstructor().newInstance()));
-    assertTrue(Files.isRegularFile(muzzleClass));
-
-    Reference[] muzzle;
-    try (URLClassLoader loader =
-        new URLClassLoader(new URL[] {temp.toUri().toURL()}, getClass().getClassLoader())) {
-      ReferenceMatcher matcher =
-          (ReferenceMatcher) loader.loadClass(muzzleClassName).getMethod("create").invoke(null);
-      muzzle = matcher.getReferences();
-    }
-    assertTrue(
-        Stream.of(muzzle)
-            .anyMatch(reference -> reference.className.equals("extra.AddedReference")));
-    assertTrue(
-        Stream.of(muzzle)
-            .noneMatch(
-                reference -> reference.className.equals("net.bytebuddy.jar.asm.ClassReader")));
-    assertTrue(
-        Stream.of(muzzle)
-            .noneMatch(
-                reference -> reference.className.equals("net.bytebuddy.jar.asm.ClassWriter")));
-    assertTrue(
-        Stream.of(muzzle)
-            .noneMatch(reference -> asList(additional.helpers).contains(reference.className)));
-  }
-
-  @Test
-  void retainsAdviceHierarchyMuzzleChecksWithoutInjectingHierarchy(@TempDir Path temp)
-      throws Exception {
-    HierarchyModule module = new HierarchyModule();
-    AdviceScanResult scan = AdviceScanner.scan(module);
-    String[] helpers = new HelperGenerationProcessor().resolveHelpers(scan, module);
-
-    assertArrayEquals(new String[0], helpers);
-    for (Class<?> type :
-        new Class<?>[] {AdviceHierarchy.Superclass.class, AdviceHierarchy.Interface.class}) {
-      assertTrue(scan.getClassInfo(type.getName()).isFromModuleOutput());
-      assertTrue(scan.getClassInfo(type.getName()).isScanned());
-      assertFalse(scan.getClassInfo(type.getName()).isReachableFromAdvice());
+        assertTrue(Files.isRegularFile(muzzleClass));
+
+        Reference[] muzzle;
+        try (URLClassLoader loader =
+                new URLClassLoader(new URL[] {temp.toUri().toURL()}, getClass().getClassLoader())) {
+            ReferenceMatcher matcher = (ReferenceMatcher)
+                    loader.loadClass(muzzleClassName).getMethod("create").invoke(null);
+            muzzle = matcher.getReferences();
+        }
+        assertTrue(Stream.of(muzzle).anyMatch(reference -> reference.className.equals("extra.AddedReference")));
+        assertTrue(Stream.of(muzzle)
+                .noneMatch(reference -> reference.className.equals("net.bytebuddy.jar.asm.ClassReader")));
+        assertTrue(Stream.of(muzzle)
+                .noneMatch(reference -> reference.className.equals("net.bytebuddy.jar.asm.ClassWriter")));
+        assertTrue(Stream.of(muzzle)
+                .noneMatch(reference -> asList(additional.helpers).contains(reference.className)));
     }
 
-    new MuzzleGenerationProcessor()
-        .process(scan, new AdviceProcessorContext(module, temp.toFile(), helpers));
-    try (URLClassLoader loader =
-        new URLClassLoader(new URL[] {temp.toUri().toURL()}, getClass().getClassLoader())) {
-      ReferenceMatcher matcher =
-          (ReferenceMatcher)
-              loader
-                  .loadClass(HierarchyModule.class.getName() + "$Muzzle")
-                  .getMethod("create")
-                  .invoke(null);
-      assertTrue(
-          Stream.of(matcher.getReferences())
-              .filter(reference -> reference.className.equals("net.bytebuddy.jar.asm.ClassReader"))
-              .flatMap(reference -> Stream.of(reference.methods))
-              .anyMatch(
-                  method -> method.name.equals("getAccess") && method.methodType.equals("()I")));
-      assertTrue(
-          Stream.of(matcher.getReferences())
-              .filter(reference -> reference.className.equals("net.bytebuddy.jar.asm.ClassWriter"))
-              .flatMap(reference -> Stream.of(reference.methods))
-              .anyMatch(
-                  method ->
-                      method.name.equals("newUTF8")
-                          && method.methodType.equals("(Ljava/lang/String;)I")));
+    @Test
+    void retainsAdviceHierarchyMuzzleChecksWithoutInjectingHierarchy(@TempDir Path temp) throws Exception {
+        HierarchyModule module = new HierarchyModule();
+        AdviceScanResult scan = AdviceScanner.scan(module);
+        String[] helpers = new HelperGenerationProcessor().resolveHelpers(scan, module);
+
+        assertArrayEquals(new String[0], helpers);
+        for (Class<?> type : new Class<?>[] {AdviceHierarchy.Superclass.class, AdviceHierarchy.Interface.class}) {
+            assertTrue(scan.getClassInfo(type.getName()).isFromModuleOutput());
+            assertTrue(scan.getClassInfo(type.getName()).isScanned());
+            assertFalse(scan.getClassInfo(type.getName()).isReachableFromAdvice());
+        }
+
+        new MuzzleGenerationProcessor().process(scan, new AdviceProcessorContext(module, temp.toFile(), helpers));
+        try (URLClassLoader loader =
+                new URLClassLoader(new URL[] {temp.toUri().toURL()}, getClass().getClassLoader())) {
+            ReferenceMatcher matcher = (ReferenceMatcher) loader.loadClass(HierarchyModule.class.getName() + "$Muzzle")
+                    .getMethod("create")
+                    .invoke(null);
+            assertTrue(Stream.of(matcher.getReferences())
+                    .filter(reference -> reference.className.equals("net.bytebuddy.jar.asm.ClassReader"))
+                    .flatMap(reference -> Stream.of(reference.methods))
+                    .anyMatch(method -> method.name.equals("getAccess") && method.methodType.equals("()I")));
+            assertTrue(Stream.of(matcher.getReferences())
+                    .filter(reference -> reference.className.equals("net.bytebuddy.jar.asm.ClassWriter"))
+                    .flatMap(reference -> Stream.of(reference.methods))
+                    .anyMatch(method ->
+                            method.name.equals("newUTF8") && method.methodType.equals("(Ljava/lang/String;)I")));
+        }
     }
-  }
-
-  @Test
-  void excludesMuzzleHelpersReferencedOnlyByMethodBodiesOrInterfaces() {
-    ScanModule module = new ScanModule();
-    AdviceScanResult scan = AdviceScanner.scan(module);
-    String[] helpers = new HelperGenerationProcessor().resolveHelpers(scan, module);
-
-    for (Class<?> muzzleHelper :
-        new Class<?>[] {
-          AdviceScanningHelper.MuzzleHelper.class,
-          AdviceScanningHelper.MuzzleReferenceProvider.class
+
+    @Test
+    void excludesMuzzleHelpersReferencedOnlyByMethodBodiesOrInterfaces() {
+        ScanModule module = new ScanModule();
+        AdviceScanResult scan = AdviceScanner.scan(module);
+        String[] helpers = new HelperGenerationProcessor().resolveHelpers(scan, module);
+
+        for (Class<?> muzzleHelper : new Class<?>[] {
+            AdviceScanningHelper.MuzzleHelper.class, AdviceScanningHelper.MuzzleReferenceProvider.class
         }) {
-      assertTrue(scan.getClassInfo(muzzleHelper.getName()).isScanned());
-      assertTrue(scan.getClassInfo(muzzleHelper.getName()).isReachableFromAdvice());
-      assertFalse(asList(helpers).contains(muzzleHelper.getName()));
+            assertTrue(scan.getClassInfo(muzzleHelper.getName()).isScanned());
+            assertTrue(scan.getClassInfo(muzzleHelper.getName()).isReachableFromAdvice());
+            assertFalse(asList(helpers).contains(muzzleHelper.getName()));
+        }
+        assertTrue(asList(helpers).contains(Dependency.class.getName()));
     }
-    assertTrue(asList(helpers).contains(Dependency.class.getName()));
-  }
-
-  @Test
-  void generatesCatchOnlyHelpersThatLoadInIsolation(@TempDir Path temp) throws Exception {
-    ClassFileLocator locator = ClassFileLocator.ForClassLoader.of(getClass().getClassLoader());
-    Class<?> generatedModule =
-        new AdviceScanningGradlePlugin(temp.toFile())
-            .apply(
-                new ByteBuddy().redefine(CatchModule.class),
-                new TypeDescription.ForLoadedType(CatchModule.class),
-                locator)
-            .make()
-            .load(getClass().getClassLoader(), ClassLoadingStrategy.Default.CHILD_FIRST)
-            .getLoaded();
-    String[] helpers =
-        ((InstrumenterModule) generatedModule.getConstructor().newInstance()).helperClassNames();
-    Map<String, byte[]> helperClasses = new LinkedHashMap<>();
-    for (String helper : helpers) {
-      helperClasses.put(helper, locator.locate(helper).resolve());
+
+    @Test
+    void generatesCatchOnlyHelpersThatLoadInIsolation(@TempDir Path temp) throws Exception {
+        ClassFileLocator locator = ClassFileLocator.ForClassLoader.of(getClass().getClassLoader());
+        Class<?> generatedModule = new AdviceScanningGradlePlugin(temp.toFile())
+                .apply(
+                        new ByteBuddy().redefine(CatchModule.class),
+                        new TypeDescription.ForLoadedType(CatchModule.class),
+                        locator)
+                .make()
+                .load(getClass().getClassLoader(), ClassLoadingStrategy.Default.CHILD_FIRST)
+                .getLoaded();
+        String[] helpers =
+                ((InstrumenterModule) generatedModule.getConstructor().newInstance()).helperClassNames();
+        Map<String, byte[]> helperClasses = new LinkedHashMap<>();
+        for (String helper : helpers) {
+            helperClasses.put(helper, locator.locate(helper).resolve());
+        }
+
+        ClassLoader isolated = new ByteArrayClassLoader(null, helperClasses);
+        Class<?> helper = isolated.loadClass(CatchOnlyHelper.class.getName());
+        assertSame(isolated, helper.getClassLoader());
+        helper.getMethod("run").invoke(null);
+        assertTrue(asList(helpers).contains(CatchOnlyException.class.getName()));
     }
 
-    ClassLoader isolated = new ByteArrayClassLoader(null, helperClasses);
-    Class<?> helper = isolated.loadClass(CatchOnlyHelper.class.getName());
-    assertSame(isolated, helper.getClassLoader());
-    helper.getMethod("run").invoke(null);
-    assertTrue(asList(helpers).contains(CatchOnlyException.class.getName()));
-  }
-
-  @Test
-  void nestedHelperLoadsWithoutItsEnclosingModule() throws Exception {
-    NestedHelperModule module = new NestedHelperModule();
-    AdviceScanResult scan = AdviceScanner.scan(module);
-    String[] helpers = new HelperGenerationProcessor().resolveHelpers(scan, module);
-
-    assertArrayEquals(new String[] {NestedHelperModule.Helper.class.getName()}, helpers);
-    assertFalse(scan.getClassInfo(NestedHelperModule.class.getName()).isReachableFromAdvice());
-    ClassFileLocator locator = ClassFileLocator.ForClassLoader.of(getClass().getClassLoader());
-    Map<String, byte[]> helperClasses = new LinkedHashMap<>();
-    for (String helper : helpers) {
-      helperClasses.put(helper, locator.locate(helper).resolve());
+    @Test
+    void nestedHelperLoadsWithoutItsEnclosingModule() throws Exception {
+        NestedHelperModule module = new NestedHelperModule();
+        AdviceScanResult scan = AdviceScanner.scan(module);
+        String[] helpers = new HelperGenerationProcessor().resolveHelpers(scan, module);
+
+        assertArrayEquals(new String[] {NestedHelperModule.Helper.class.getName()}, helpers);
+        assertFalse(scan.getClassInfo(NestedHelperModule.class.getName()).isReachableFromAdvice());
+        ClassFileLocator locator = ClassFileLocator.ForClassLoader.of(getClass().getClassLoader());
+        Map<String, byte[]> helperClasses = new LinkedHashMap<>();
+        for (String helper : helpers) {
+            helperClasses.put(helper, locator.locate(helper).resolve());
+        }
+
+        ClassLoader isolated = new ByteArrayClassLoader(null, helperClasses);
+        Class<?> helper = isolated.loadClass(NestedHelperModule.Helper.class.getName());
+        assertSame(isolated, helper.getClassLoader());
+        assertEquals("nested helper", helper.getMethod("run").invoke(null));
     }
 
-    ClassLoader isolated = new ByteArrayClassLoader(null, helperClasses);
-    Class<?> helper = isolated.loadClass(NestedHelperModule.Helper.class.getName());
-    assertSame(isolated, helper.getClassLoader());
-    assertEquals("nested helper", helper.getMethod("run").invoke(null));
-  }
-
-  @Test
-  void excludesEnumerationOnlyNestedClassesAndTheirDependencies() {
-    ScanModule module = new ScanModule();
-    AdviceScanResult scan = AdviceScanner.scan(module);
-    String[] helpers = new HelperGenerationProcessor().resolveHelpers(scan, module);
-
-    for (Class<?> unused :
-        new Class<?>[] {
-          AdviceScanningHelper.DiagnosticPrinter.class,
-          AdviceScanningHelper.DiagnosticDependency.class
+    @Test
+    void excludesEnumerationOnlyNestedClassesAndTheirDependencies() {
+        ScanModule module = new ScanModule();
+        AdviceScanResult scan = AdviceScanner.scan(module);
+        String[] helpers = new HelperGenerationProcessor().resolveHelpers(scan, module);
+
+        for (Class<?> unused : new Class<?>[] {
+            AdviceScanningHelper.DiagnosticPrinter.class, AdviceScanningHelper.DiagnosticDependency.class
         }) {
-      assertTrue(scan.getClassInfo(unused.getName()).isScanned());
-      assertFalse(scan.getClassInfo(unused.getName()).isReachableFromAdvice());
-      assertFalse(asList(helpers).contains(unused.getName()));
-    }
-    assertTrue(asList(helpers).contains(Dependency.class.getName()));
-  }
-
-  @Test
-  void manualHelperListIsNotMerged() {
-    class ManualModule extends ScanModule {
-      @Override
-      public String[] helperClassNames() {
-        return new String[] {"manual.Helper"};
-      }
+            assertTrue(scan.getClassInfo(unused.getName()).isScanned());
+            assertFalse(scan.getClassInfo(unused.getName()).isReachableFromAdvice());
+            assertFalse(asList(helpers).contains(unused.getName()));
+        }
+        assertTrue(asList(helpers).contains(Dependency.class.getName()));
     }
-    ManualModule module = new ManualModule();
-    AdviceScanResult scanResult = AdviceScanner.scan(module);
-    String[] helpers = new HelperGenerationProcessor().resolveHelpers(scanResult, module);
 
-    assertArrayEquals(new String[] {"manual.Helper"}, helpers);
-  }
+    @Test
+    void manualHelperListIsNotMerged() {
+        class ManualModule extends ScanModule {
+            @Override
+            public String[] helperClassNames() {
+                return new String[] {"manual.Helper"};
+            }
+        }
+        ManualModule module = new ManualModule();
+        AdviceScanResult scanResult = AdviceScanner.scan(module);
+        String[] helpers = new HelperGenerationProcessor().resolveHelpers(scanResult, module);
+
+        assertArrayEquals(new String[] {"manual.Helper"}, helpers);
+    }
 
-  private static final class CapturingProcessor implements AdviceProcessor {
-    private AdviceScanResult scanResult;
-    private String[] helpers;
+    private static final class CapturingProcessor implements AdviceProcessor {
+        private AdviceScanResult scanResult;
+        private String[] helpers;
 
-    @Override
-    public void process(AdviceScanResult scanResult, AdviceProcessorContext context) {
-      this.scanResult = scanResult;
-      this.helpers = context.getHelperClassNames();
+        @Override
+        public void process(AdviceScanResult scanResult, AdviceProcessorContext context) {
+            this.scanResult = scanResult;
+            this.helpers = context.getHelperClassNames();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/AdviceScannerTest.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/AdviceScannerTest.java
index af22854e3bf..13c506486c6 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/AdviceScannerTest.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/AdviceScannerTest.java
@@ -34,330 +34,310 @@
 import org.junit.jupiter.api.Test;
 
 class AdviceScannerTest {
-  @Test
-  void scansNeutralUsesAndAdditionalClasses() {
-    int registrationsBefore = ScanModule.adviceRegistrations;
-    AdviceScanResult result = AdviceScanner.scan(new ScanModule());
-
-    assertEquals(registrationsBefore + 1, ScanModule.adviceRegistrations);
-    assertEquals(
-        Arrays.asList(AdviceRoot.class.getName(), AdditionalAdvice.class.getName()),
-        result.getAdviceRoots());
-    ClassInfo root = result.getClassInfo(AdviceRoot.class.getName());
-    assertTrue(root.isScanned());
-    assertTrue(hasUsage(root, UsageKind.FIELD, "field"));
-    assertTrue(hasUsage(root, UsageKind.METHOD, "<init>"));
-    assertTrue(hasUsage(root, UsageKind.METHOD, "method"));
-    assertTrue(hasUsage(root, UsageKind.TYPE, null));
-
-    Usage invokeDynamic = firstUsage(root, UsageKind.INVOKEDYNAMIC);
-    assertNotNull(invokeDynamic);
-    assertFalse(invokeDynamic.getHandles().isEmpty());
-    List<Usage> typeUsages =
-        root.getUsages().stream()
-            .filter(
-                use ->
-                    use.getKind() == UsageKind.TYPE
-                        && use.getOwner().equals(Dependency.class.getName()))
-            .collect(toList());
-    assertEquals(
-        Arrays.asList(Opcodes.NEW, Opcodes.ANEWARRAY, Opcodes.MULTIANEWARRAY, Opcodes.LDC),
-        typeUsages.stream().map(Usage::getOpcode).collect(toList()));
-    assertEquals(
-        Arrays.asList(null, null, Type.getDescriptor(Dependency[][].class), null),
-        typeUsages.stream().map(Usage::getDescriptor).collect(toList()));
-    assertTrue(
-        typeUsages.stream()
-            .allMatch(
-                use ->
-                    use.getSource().getClassName().equals(AdviceRoot.class.getName())
+    @Test
+    void scansNeutralUsesAndAdditionalClasses() {
+        int registrationsBefore = ScanModule.adviceRegistrations;
+        AdviceScanResult result = AdviceScanner.scan(new ScanModule());
+
+        assertEquals(registrationsBefore + 1, ScanModule.adviceRegistrations);
+        assertEquals(
+                Arrays.asList(AdviceRoot.class.getName(), AdditionalAdvice.class.getName()), result.getAdviceRoots());
+        ClassInfo root = result.getClassInfo(AdviceRoot.class.getName());
+        assertTrue(root.isScanned());
+        assertTrue(hasUsage(root, UsageKind.FIELD, "field"));
+        assertTrue(hasUsage(root, UsageKind.METHOD, "<init>"));
+        assertTrue(hasUsage(root, UsageKind.METHOD, "method"));
+        assertTrue(hasUsage(root, UsageKind.TYPE, null));
+
+        Usage invokeDynamic = firstUsage(root, UsageKind.INVOKEDYNAMIC);
+        assertNotNull(invokeDynamic);
+        assertFalse(invokeDynamic.getHandles().isEmpty());
+        List<Usage> typeUsages = root.getUsages().stream()
+                .filter(use -> use.getKind() == UsageKind.TYPE && use.getOwner().equals(Dependency.class.getName()))
+                .collect(toList());
+        assertEquals(
+                Arrays.asList(Opcodes.NEW, Opcodes.ANEWARRAY, Opcodes.MULTIANEWARRAY, Opcodes.LDC),
+                typeUsages.stream().map(Usage::getOpcode).collect(toList()));
+        assertEquals(
+                Arrays.asList(null, null, Type.getDescriptor(Dependency[][].class), null),
+                typeUsages.stream().map(Usage::getDescriptor).collect(toList()));
+        assertTrue(typeUsages.stream()
+                .allMatch(use -> use.getSource().getClassName().equals(AdviceRoot.class.getName())
                         && use.getSource().getSourceFile().equals("AdviceScanningFixtures.java")
                         && use.getSource().getLine() > 0));
 
-    assertFalse(result.getClassInfo(ClassReader.class.getName()).isScanned());
-    assertFalse(result.getClassInfo(String.class.getName()).isScanned());
-    assertTrue(result.getClassInfo(Dependency.class.getName()).isScanned());
-    assertTrue(result.getClassInfo(AdditionalAdvice.class.getName()).isScanned());
-    assertTrue(result.getClassInfo(ExternalHelper.class.getName()).isScanned());
-  }
-
-  @Test
-  void onlyMarksEnclosingHelpersReachable() {
-    AdviceScanResult result = AdviceScanner.scan(new ScanModule());
-    String enclosingHelper = AdviceScanningHelper.class.getName();
-
-    assertTrue(result.getClassInfo(enclosingHelper).isScanned());
-    assertTrue(result.getClassInfo(enclosingHelper).isReachableFromAdvice());
-    for (Class<?> nested :
-        new Class<?>[] {
-          Dependency.class, AdviceScanningHelper.localClass(), AdviceScanningHelper.anonymousClass()
+        assertFalse(result.getClassInfo(ClassReader.class.getName()).isScanned());
+        assertFalse(result.getClassInfo(String.class.getName()).isScanned());
+        assertTrue(result.getClassInfo(Dependency.class.getName()).isScanned());
+        assertTrue(result.getClassInfo(AdditionalAdvice.class.getName()).isScanned());
+        assertTrue(result.getClassInfo(ExternalHelper.class.getName()).isScanned());
+    }
+
+    @Test
+    void onlyMarksEnclosingHelpersReachable() {
+        AdviceScanResult result = AdviceScanner.scan(new ScanModule());
+        String enclosingHelper = AdviceScanningHelper.class.getName();
+
+        assertTrue(result.getClassInfo(enclosingHelper).isScanned());
+        assertTrue(result.getClassInfo(enclosingHelper).isReachableFromAdvice());
+        for (Class<?> nested : new Class<?>[] {
+            Dependency.class, AdviceScanningHelper.localClass(), AdviceScanningHelper.anonymousClass()
         }) {
-      assertTrue(result.getClassInfo(nested.getName()).isReachableFromAdvice());
-      assertTrue(
-          result
-              .getClassInfo(nested.getName())
-              .getRequiredDependencies()
-              .contains(enclosingHelper));
+            assertTrue(result.getClassInfo(nested.getName()).isReachableFromAdvice());
+            assertTrue(result.getClassInfo(nested.getName())
+                    .getRequiredDependencies()
+                    .contains(enclosingHelper));
+        }
+        assertFalse(result.getClassInfo(AdviceScanningFixtures.class.getName()).isReachableFromAdvice());
+    }
+
+    @Test
+    void producesDeterministicResults() {
+        AdviceScanResult first = AdviceScanner.scan(new ScanModule());
+        AdviceScanResult second = AdviceScanner.scan(new ScanModule());
+
+        assertEquals(first.getClasses().keySet(), second.getClasses().keySet());
+        assertEquals(first.getAdviceRoots(), second.getAdviceRoots());
     }
-    assertFalse(
-        result.getClassInfo(AdviceScanningFixtures.class.getName()).isReachableFromAdvice());
-  }
-
-  @Test
-  void producesDeterministicResults() {
-    AdviceScanResult first = AdviceScanner.scan(new ScanModule());
-    AdviceScanResult second = AdviceScanner.scan(new ScanModule());
-
-    assertEquals(first.getClasses().keySet(), second.getClasses().keySet());
-    assertEquals(first.getAdviceRoots(), second.getAdviceRoots());
-  }
-
-  @Test
-  void discoversBytecodeOnlyDependencies() {
-    AdviceScanResult result = scanGeneratedAdvice(null);
-
-    for (String dependency :
-        Arrays.asList(
-            "callsite.Only",
-            "bootstrap.Only",
-            "bootstrapArgument.Only",
-            "handle.Only",
-            "array.Only",
-            "multidimensional.Only",
-            "field.Only",
-            "fieldHandle.Only",
-            "catch.Only")) {
-      assertNotNull(result.getClassInfo(dependency), dependency);
+
+    @Test
+    void discoversBytecodeOnlyDependencies() {
+        AdviceScanResult result = scanGeneratedAdvice(null);
+
+        for (String dependency : Arrays.asList(
+                "callsite.Only",
+                "bootstrap.Only",
+                "bootstrapArgument.Only",
+                "handle.Only",
+                "array.Only",
+                "multidimensional.Only",
+                "field.Only",
+                "fieldHandle.Only",
+                "catch.Only")) {
+            assertNotNull(result.getClassInfo(dependency), dependency);
+        }
+        assertFalse(result.getClasses().keySet().stream().anyMatch(name -> name.startsWith("[")));
+        assertFalse(result.getClasses().containsKey("int"));
     }
-    assertFalse(result.getClasses().keySet().stream().anyMatch(name -> name.startsWith("[")));
-    assertFalse(result.getClasses().containsKey("int"));
-  }
-
-  @Test
-  void recordsSourceFilesForHeaderAndMethodUsages() {
-    ClassInfo advice =
-        scanGeneratedAdvice("DifferentSource.groovy").getClassInfo("generated.Advice");
-
-    assertTrue(advice.getUsages().get(0).isImplementedInterface());
-    for (Usage usage : advice.getUsages()) {
-      assertEquals("generated.Advice", usage.getSource().getClassName());
-      assertEquals("DifferentSource.groovy", usage.getSource().getSourceFile());
-      assertEquals(usage.isImplementedInterface() ? -1 : 42, usage.getSource().getLine());
+
+    @Test
+    void recordsSourceFilesForHeaderAndMethodUsages() {
+        ClassInfo advice = scanGeneratedAdvice("DifferentSource.groovy").getClassInfo("generated.Advice");
+
+        assertTrue(advice.getUsages().get(0).isImplementedInterface());
+        for (Usage usage : advice.getUsages()) {
+            assertEquals("generated.Advice", usage.getSource().getClassName());
+            assertEquals("DifferentSource.groovy", usage.getSource().getSourceFile());
+            assertEquals(
+                    usage.isImplementedInterface() ? -1 : 42, usage.getSource().getLine());
+        }
     }
-  }
 
-  @Test
-  void fallsBackToClassNameWhenSourceFileIsMissing() {
-    ClassInfo advice = scanGeneratedAdvice(null).getClassInfo("generated.Advice");
+    @Test
+    void fallsBackToClassNameWhenSourceFileIsMissing() {
+        ClassInfo advice = scanGeneratedAdvice(null).getClassInfo("generated.Advice");
 
-    assertFalse(advice.getUsages().isEmpty());
-    for (Usage usage : advice.getUsages()) {
-      assertEquals("generated.Advice", usage.getSource().getSourceFile());
+        assertFalse(advice.getUsages().isEmpty());
+        for (Usage usage : advice.getUsages()) {
+            assertEquals("generated.Advice", usage.getSource().getSourceFile());
+        }
     }
-  }
-
-  @Test
-  void usesProvidedClassLoader() {
-    List<String> resources = new ArrayList<>();
-    ClassLoader loader =
-        new ClassLoader(getClass().getClassLoader()) {
-          @Override
-          public InputStream getResourceAsStream(String name) {
-            resources.add(name);
-            return super.getResourceAsStream(name);
-          }
+
+    @Test
+    void usesProvidedClassLoader() {
+        List<String> resources = new ArrayList<>();
+        ClassLoader loader = new ClassLoader(getClass().getClassLoader()) {
+            @Override
+            public InputStream getResourceAsStream(String name) {
+                resources.add(name);
+                return super.getResourceAsStream(name);
+            }
         };
 
-    AdviceScanResult result = AdviceScanner.scan(new ScanModule(), loader);
+        AdviceScanResult result = AdviceScanner.scan(new ScanModule(), loader);
 
-    assertTrue(result.getClassInfo(AdviceRoot.class.getName()).isScanned());
-    assertTrue(resources.contains(AdviceRoot.class.getName().replace('.', '/') + ".class"));
-  }
+        assertTrue(result.getClassInfo(AdviceRoot.class.getName()).isScanned());
+        assertTrue(resources.contains(AdviceRoot.class.getName().replace('.', '/') + ".class"));
+    }
 
-  @Test
-  void retainsNonObjectSuperclassConstructorRequirements() {
-    AdviceScanResult result = AdviceScanner.scan(new ScanModule());
-    ClassInfo root = result.getClassInfo(AdviceRoot.class.getName());
+    @Test
+    void retainsNonObjectSuperclassConstructorRequirements() {
+        AdviceScanResult result = AdviceScanner.scan(new ScanModule());
+        ClassInfo root = result.getClassInfo(AdviceRoot.class.getName());
 
-    assertTrue(result.getClassInfo(AdviceSuperclass.class.getName()).isScanned());
-    assertFalse(result.getClassInfo(AdviceSuperclass.class.getName()).isReachableFromAdvice());
-    assertTrue(
-        root.getUsages().stream()
-            .anyMatch(
-                usage ->
-                    usage.getKind() == UsageKind.METHOD
+        assertTrue(result.getClassInfo(AdviceSuperclass.class.getName()).isScanned());
+        assertFalse(result.getClassInfo(AdviceSuperclass.class.getName()).isReachableFromAdvice());
+        assertTrue(root.getUsages().stream()
+                .anyMatch(usage -> usage.getKind() == UsageKind.METHOD
                         && usage.getOpcode() == Opcodes.INVOKESPECIAL
                         && usage.getOwner().equals(AdviceSuperclass.class.getName())
                         && usage.getName().equals("<init>")
                         && usage.getDescriptor().equals("(Ljava/lang/String;)V")));
-  }
-
-  @Test
-  void returnsImmutableResults() {
-    AdviceScanResult result = AdviceScanner.scan(new ScanModule());
-
-    assertThrows(UnsupportedOperationException.class, () -> result.getClasses().clear());
-    assertThrows(UnsupportedOperationException.class, () -> result.getAdviceRoots().clear());
-    assertThrows(
-        UnsupportedOperationException.class,
-        () -> result.getClassInfo(AdviceRoot.class.getName()).getUsages().clear());
-  }
-
-  @Test
-  void skipsMissingTransitiveInstrumentationClasses() {
-    ClassFileLocator delegate = ClassFileLocator.ForClassLoader.of(getClass().getClassLoader());
-    ClassFileLocator locator =
-        new ClassFileLocator() {
-          @Override
-          public Resolution locate(String name) throws IOException {
-            return ExternalHelper.class.getName().equals(name)
-                ? new Resolution.Illegal(name)
-                : delegate.locate(name);
-          }
-
-          @Override
-          public void close() {}
+    }
+
+    @Test
+    void returnsImmutableResults() {
+        AdviceScanResult result = AdviceScanner.scan(new ScanModule());
+
+        assertThrows(
+                UnsupportedOperationException.class, () -> result.getClasses().clear());
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> result.getAdviceRoots().clear());
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> result.getClassInfo(AdviceRoot.class.getName())
+                        .getUsages()
+                        .clear());
+    }
+
+    @Test
+    void skipsMissingTransitiveInstrumentationClasses() {
+        ClassFileLocator delegate =
+                ClassFileLocator.ForClassLoader.of(getClass().getClassLoader());
+        ClassFileLocator locator = new ClassFileLocator() {
+            @Override
+            public Resolution locate(String name) throws IOException {
+                return ExternalHelper.class.getName().equals(name)
+                        ? new Resolution.Illegal(name)
+                        : delegate.locate(name);
+            }
+
+            @Override
+            public void close() {}
         };
-    AdviceScanResult result = AdviceScanner.scan(new ScanModule(), locator);
-
-    ClassInfo root = result.getClassInfo(AdviceRoot.class.getName());
-    assertTrue(root.isScanned());
-    assertTrue(hasUsage(root, UsageKind.METHOD, "method"));
-    assertTrue(result.getClassInfo(Dependency.class.getName()).isScanned());
-    ClassInfo helper = result.getClassInfo(ExternalHelper.class.getName());
-    assertFalse(helper.isScanned());
-  }
-
-  @Test
-  void failsWhenModuleOutputHelperIsMissing() {
-    ClassFileLocator delegate = ClassFileLocator.ForClassLoader.of(getClass().getClassLoader());
-    ClassFileLocator locator =
-        new ClassFileLocator() {
-          @Override
-          public Resolution locate(String name) throws IOException {
-            return Dependency.class.getName().equals(name)
-                ? new Resolution.Illegal(name)
-                : delegate.locate(name);
-          }
-
-          @Override
-          public void close() {}
+        AdviceScanResult result = AdviceScanner.scan(new ScanModule(), locator);
+
+        ClassInfo root = result.getClassInfo(AdviceRoot.class.getName());
+        assertTrue(root.isScanned());
+        assertTrue(hasUsage(root, UsageKind.METHOD, "method"));
+        assertTrue(result.getClassInfo(Dependency.class.getName()).isScanned());
+        ClassInfo helper = result.getClassInfo(ExternalHelper.class.getName());
+        assertFalse(helper.isScanned());
+    }
+
+    @Test
+    void failsWhenModuleOutputHelperIsMissing() {
+        ClassFileLocator delegate =
+                ClassFileLocator.ForClassLoader.of(getClass().getClassLoader());
+        ClassFileLocator locator = new ClassFileLocator() {
+            @Override
+            public Resolution locate(String name) throws IOException {
+                return Dependency.class.getName().equals(name) ? new Resolution.Illegal(name) : delegate.locate(name);
+            }
+
+            @Override
+            public void close() {}
         };
-    IllegalStateException error =
-        assertThrows(
-            IllegalStateException.class, () -> AdviceScanner.scan(new ScanModule(), locator));
-
-    assertTrue(error.getMessage().endsWith("helper class from module output is missing"));
-  }
-
-  @Test
-  void failsWhenAdviceRootIsMissing() {
-    class MissingAdviceModule extends InstrumenterModule implements Instrumenter.HasMethodAdvice {
-      MissingAdviceModule() {
-        super("missing-advice");
-      }
-
-      @Override
-      public void methodAdvice(MethodTransformer transformer) {
-        transformer.applyAdvice(null, "missing.Advice");
-      }
+        IllegalStateException error =
+                assertThrows(IllegalStateException.class, () -> AdviceScanner.scan(new ScanModule(), locator));
+
+        assertTrue(error.getMessage().endsWith("helper class from module output is missing"));
     }
 
-    IllegalStateException error =
-        assertThrows(
-            IllegalStateException.class, () -> AdviceScanner.scan(new MissingAdviceModule()));
-    assertEquals(
-        "Advice scan failed for module "
-            + MissingAdviceModule.class.getName()
-            + ", advice missing.Advice, class missing.Advice: advice class is missing",
-        error.getMessage());
-  }
-
-  private static boolean hasUsage(ClassInfo info, UsageKind kind, String name) {
-    return info.getUsages().stream()
-        .anyMatch(use -> use.getKind() == kind && (name == null || name.equals(use.getName())));
-  }
-
-  private static Usage firstUsage(ClassInfo info, UsageKind kind) {
-    return info.getUsages().stream().filter(use -> use.getKind() == kind).findFirst().orElse(null);
-  }
-
-  private static AdviceScanResult scanGeneratedAdvice(String sourceFile) {
-    String adviceClass = "generated.Advice";
-    class GeneratedAdviceModule extends InstrumenterModule implements Instrumenter.HasMethodAdvice {
-      GeneratedAdviceModule() {
-        super("generated-advice");
-      }
-
-      @Override
-      public void methodAdvice(MethodTransformer transformer) {
-        transformer.applyAdvice(null, adviceClass);
-      }
+    @Test
+    void failsWhenAdviceRootIsMissing() {
+        class MissingAdviceModule extends InstrumenterModule implements Instrumenter.HasMethodAdvice {
+            MissingAdviceModule() {
+                super("missing-advice");
+            }
+
+            @Override
+            public void methodAdvice(MethodTransformer transformer) {
+                transformer.applyAdvice(null, "missing.Advice");
+            }
+        }
+
+        IllegalStateException error =
+                assertThrows(IllegalStateException.class, () -> AdviceScanner.scan(new MissingAdviceModule()));
+        assertEquals(
+                "Advice scan failed for module "
+                        + MissingAdviceModule.class.getName()
+                        + ", advice missing.Advice, class missing.Advice: advice class is missing",
+                error.getMessage());
+    }
+
+    private static boolean hasUsage(ClassInfo info, UsageKind kind, String name) {
+        return info.getUsages().stream()
+                .anyMatch(use -> use.getKind() == kind && (name == null || name.equals(use.getName())));
+    }
+
+    private static Usage firstUsage(ClassInfo info, UsageKind kind) {
+        return info.getUsages().stream()
+                .filter(use -> use.getKind() == kind)
+                .findFirst()
+                .orElse(null);
+    }
+
+    private static AdviceScanResult scanGeneratedAdvice(String sourceFile) {
+        String adviceClass = "generated.Advice";
+        class GeneratedAdviceModule extends InstrumenterModule implements Instrumenter.HasMethodAdvice {
+            GeneratedAdviceModule() {
+                super("generated-advice");
+            }
+
+            @Override
+            public void methodAdvice(MethodTransformer transformer) {
+                transformer.applyAdvice(null, adviceClass);
+            }
+        }
+
+        return AdviceScanner.scan(
+                new GeneratedAdviceModule(),
+                ClassFileLocator.Simple.of(adviceClass, generatedAdvice(adviceClass, sourceFile)));
     }
 
-    return AdviceScanner.scan(
-        new GeneratedAdviceModule(),
-        ClassFileLocator.Simple.of(adviceClass, generatedAdvice(adviceClass, sourceFile)));
-  }
-
-  private static byte[] generatedAdvice(String className, String sourceFile) {
-    ClassWriter writer = new ClassWriter(0);
-    writer.visit(
-        Opcodes.V17,
-        Opcodes.ACC_PUBLIC,
-        className.replace('.', '/'),
-        null,
-        "java/lang/Object",
-        new String[] {"declared/Contract"});
-    if (sourceFile != null) {
-      writer.visitSource(sourceFile, null);
+    private static byte[] generatedAdvice(String className, String sourceFile) {
+        ClassWriter writer = new ClassWriter(0);
+        writer.visit(
+                Opcodes.V17, Opcodes.ACC_PUBLIC, className.replace('.', '/'), null, "java/lang/Object", new String[] {
+                    "declared/Contract"
+                });
+        if (sourceFile != null) {
+            writer.visitSource(sourceFile, null);
+        }
+        writer.visitPermittedSubclass("generated/Subclass");
+
+        MethodVisitor method = writer.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "apply", "()V", null, null);
+        Label start = new Label();
+        Label end = new Label();
+        Label handler = new Label();
+        Label done = new Label();
+        method.visitTryCatchBlock(start, end, handler, "catch/Only");
+        method.visitCode();
+        method.visitLabel(start);
+        method.visitLineNumber(42, start);
+        method.visitInvokeDynamicInsn(
+                "apply",
+                "()Lcallsite/Only;",
+                new Handle(Opcodes.H_INVOKESTATIC, "bootstrap/Owner", "bootstrap", "(Lbootstrap/Only;)V", false),
+                Type.getMethodType("()LbootstrapArgument/Only;"),
+                new Handle(Opcodes.H_INVOKESTATIC, "handle/Owner", "apply", "(Lhandle/Only;)V", false));
+        method.visitInsn(Opcodes.POP);
+        method.visitInsn(Opcodes.ACONST_NULL);
+        method.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "[Larray/Only;", "clone", "()Ljava/lang/Object;", false);
+        method.visitInsn(Opcodes.POP);
+        method.visitInsn(Opcodes.ACONST_NULL);
+        method.visitMethodInsn(
+                Opcodes.INVOKEVIRTUAL, "[[Lmultidimensional/Only;", "clone", "()Ljava/lang/Object;", false);
+        method.visitInsn(Opcodes.POP);
+        method.visitInsn(Opcodes.ACONST_NULL);
+        method.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "[I", "clone", "()Ljava/lang/Object;", false);
+        method.visitInsn(Opcodes.POP);
+        method.visitFieldInsn(Opcodes.GETSTATIC, "field/Owner", "value", "[[Lfield/Only;");
+        method.visitInsn(Opcodes.POP);
+        method.visitLdcInsn(
+                new Handle(Opcodes.H_GETSTATIC, "fieldHandle/Owner", "value", "[[LfieldHandle/Only;", false));
+        method.visitInsn(Opcodes.POP);
+        method.visitLabel(end);
+        method.visitJumpInsn(Opcodes.GOTO, done);
+        method.visitLabel(handler);
+        method.visitInsn(Opcodes.POP);
+        method.visitLabel(done);
+        method.visitInsn(Opcodes.RETURN);
+        method.visitMaxs(1, 0);
+        method.visitEnd();
+        writer.visitEnd();
+        return writer.toByteArray();
     }
-    writer.visitPermittedSubclass("generated/Subclass");
-
-    MethodVisitor method =
-        writer.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "apply", "()V", null, null);
-    Label start = new Label();
-    Label end = new Label();
-    Label handler = new Label();
-    Label done = new Label();
-    method.visitTryCatchBlock(start, end, handler, "catch/Only");
-    method.visitCode();
-    method.visitLabel(start);
-    method.visitLineNumber(42, start);
-    method.visitInvokeDynamicInsn(
-        "apply",
-        "()Lcallsite/Only;",
-        new Handle(
-            Opcodes.H_INVOKESTATIC, "bootstrap/Owner", "bootstrap", "(Lbootstrap/Only;)V", false),
-        Type.getMethodType("()LbootstrapArgument/Only;"),
-        new Handle(Opcodes.H_INVOKESTATIC, "handle/Owner", "apply", "(Lhandle/Only;)V", false));
-    method.visitInsn(Opcodes.POP);
-    method.visitInsn(Opcodes.ACONST_NULL);
-    method.visitMethodInsn(
-        Opcodes.INVOKEVIRTUAL, "[Larray/Only;", "clone", "()Ljava/lang/Object;", false);
-    method.visitInsn(Opcodes.POP);
-    method.visitInsn(Opcodes.ACONST_NULL);
-    method.visitMethodInsn(
-        Opcodes.INVOKEVIRTUAL, "[[Lmultidimensional/Only;", "clone", "()Ljava/lang/Object;", false);
-    method.visitInsn(Opcodes.POP);
-    method.visitInsn(Opcodes.ACONST_NULL);
-    method.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "[I", "clone", "()Ljava/lang/Object;", false);
-    method.visitInsn(Opcodes.POP);
-    method.visitFieldInsn(Opcodes.GETSTATIC, "field/Owner", "value", "[[Lfield/Only;");
-    method.visitInsn(Opcodes.POP);
-    method.visitLdcInsn(
-        new Handle(
-            Opcodes.H_GETSTATIC, "fieldHandle/Owner", "value", "[[LfieldHandle/Only;", false));
-    method.visitInsn(Opcodes.POP);
-    method.visitLabel(end);
-    method.visitJumpInsn(Opcodes.GOTO, done);
-    method.visitLabel(handler);
-    method.visitInsn(Opcodes.POP);
-    method.visitLabel(done);
-    method.visitInsn(Opcodes.RETURN);
-    method.visitMaxs(1, 0);
-    method.visitEnd();
-    writer.visitEnd();
-    return writer.toByteArray();
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/AdviceScanningFixtures.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/AdviceScanningFixtures.java
index 085f547367b..819659b2974 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/AdviceScanningFixtures.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/AdviceScanningFixtures.java
@@ -12,118 +12,115 @@
 import net.bytebuddy.jar.asm.ClassReader;
 
 final class AdviceScanningFixtures {
-  private AdviceScanningFixtures() {}
+    private AdviceScanningFixtures() {}
 
-  static class AdviceSuperclass {
-    AdviceSuperclass(String value) {}
-  }
-
-  static class AdviceRoot extends AdviceSuperclass {
-    AdviceRoot() {
-      super("advice");
+    static class AdviceSuperclass {
+        AdviceSuperclass(String value) {}
     }
 
-    static String apply(String value) {
-      Dependency.field = value;
-      Dependency dependency = new Dependency();
-      Dependency[] array = new Dependency[1];
-      Dependency[][] matrix = new Dependency[1][1];
-      Class<?> type = Dependency.class;
-      Supplier<Dependency> constructor = Dependency::new;
-      List<String> library = new ArrayList<>();
-      Class<?> externalLibrary = ClassReader.class;
-      return dependency.method(
-          array.length
-              + matrix.length
-              + type.getName()
-              + constructor.get()
-              + library
-              + externalLibrary
-              + AdviceScanningHelper.localClass()
-              + ExternalHelper.typeName());
+    static class AdviceRoot extends AdviceSuperclass {
+        AdviceRoot() {
+            super("advice");
+        }
+
+        static String apply(String value) {
+            Dependency.field = value;
+            Dependency dependency = new Dependency();
+            Dependency[] array = new Dependency[1];
+            Dependency[][] matrix = new Dependency[1][1];
+            Class<?> type = Dependency.class;
+            Supplier<Dependency> constructor = Dependency::new;
+            List<String> library = new ArrayList<>();
+            Class<?> externalLibrary = ClassReader.class;
+            return dependency.method(array.length
+                    + matrix.length
+                    + type.getName()
+                    + constructor.get()
+                    + library
+                    + externalLibrary
+                    + AdviceScanningHelper.localClass()
+                    + ExternalHelper.typeName());
+        }
     }
-  }
 
-  static class AdditionalAdvice {
-    static void apply() {
-      new Dependency();
+    static class AdditionalAdvice {
+        static void apply() {
+            new Dependency();
+        }
     }
-  }
 
-  static class CatchAdvice {
-    static void apply() {
-      CatchOnlyHelper.run();
+    static class CatchAdvice {
+        static void apply() {
+            CatchOnlyHelper.run();
+        }
     }
-  }
-
-  static class HierarchyAdvice extends AdviceHierarchy.Superclass
-      implements AdviceHierarchy.Interface {
-    static void apply() {}
-  }
 
-  public static final class HierarchyModule extends ScanModule {
-    @Override
-    public void methodAdvice(MethodTransformer transformer) {
-      transformer.applyAdvice(null, HierarchyAdvice.class.getName());
+    static class HierarchyAdvice extends AdviceHierarchy.Superclass implements AdviceHierarchy.Interface {
+        static void apply() {}
     }
-  }
 
-  public static final class CatchModule extends ScanModule {
-    @Override
-    public void methodAdvice(MethodTransformer transformer) {
-      transformer.applyAdvice(null, CatchAdvice.class.getName());
+    public static final class HierarchyModule extends ScanModule {
+        @Override
+        public void methodAdvice(MethodTransformer transformer) {
+            transformer.applyAdvice(null, HierarchyAdvice.class.getName());
+        }
     }
-  }
 
-  public static final class NestedHelperModule extends ScanModule {
-    @Override
-    public void methodAdvice(MethodTransformer transformer) {
-      transformer.applyAdvice(null, NestedAdvice.class.getName());
+    public static final class CatchModule extends ScanModule {
+        @Override
+        public void methodAdvice(MethodTransformer transformer) {
+            transformer.applyAdvice(null, CatchAdvice.class.getName());
+        }
     }
 
-    static class NestedAdvice {
-      static String apply() {
-        return Helper.run();
-      }
+    public static final class NestedHelperModule extends ScanModule {
+        @Override
+        public void methodAdvice(MethodTransformer transformer) {
+            transformer.applyAdvice(null, NestedAdvice.class.getName());
+        }
+
+        static class NestedAdvice {
+            static String apply() {
+                return Helper.run();
+            }
+        }
+
+        public static class Helper {
+            public static String run() {
+                return "nested helper";
+            }
+        }
     }
 
-    public static class Helper {
-      public static String run() {
-        return "nested helper";
-      }
-    }
-  }
+    public static class ScanModule extends InstrumenterModule implements Instrumenter.HasMethodAdvice {
+        static int adviceRegistrations;
 
-  public static class ScanModule extends InstrumenterModule
-      implements Instrumenter.HasMethodAdvice {
-    static int adviceRegistrations;
+        public ScanModule() {
+            super("advice-scan-test");
+        }
 
-    public ScanModule() {
-      super("advice-scan-test");
+        @Override
+        public void methodAdvice(MethodTransformer transformer) {
+            adviceRegistrations++;
+            transformer.applyAdvices(null, AdviceRoot.class.getName(), AdditionalAdvice.class.getName());
+        }
     }
 
-    @Override
-    public void methodAdvice(MethodTransformer transformer) {
-      adviceRegistrations++;
-      transformer.applyAdvices(null, AdviceRoot.class.getName(), AdditionalAdvice.class.getName());
-    }
-  }
+    public static final class PipelineModule extends ScanModule {
+        static int instances;
 
-  public static final class PipelineModule extends ScanModule {
-    static int instances;
+        public PipelineModule() {
+            instances++;
+        }
 
-    public PipelineModule() {
-      instances++;
-    }
-
-    @Override
-    public String[] muzzleIgnoredClassNames() {
-      return new String[] {ClassReader.class.getName()};
-    }
+        @Override
+        public String[] muzzleIgnoredClassNames() {
+            return new String[] {ClassReader.class.getName()};
+        }
 
-    @Override
-    public Reference[] additionalMuzzleReferences() {
-      return new Reference[] {new Reference.Builder("extra/AddedReference").build()};
+        @Override
+        public Reference[] additionalMuzzleReferences() {
+            return new Reference[] {new Reference.Builder("extra/AddedReference").build()};
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/AdviceScanningHelper.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/AdviceScanningHelper.java
index ab2088cf9f3..fab48778662 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/AdviceScanningHelper.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/AdviceScanningHelper.java
@@ -9,51 +9,51 @@
 import net.bytebuddy.pool.TypePool;
 
 final class AdviceScanningHelper {
-  static final class Dependency {
-    static String field;
+    static final class Dependency {
+        static String field;
 
-    Dependency() {}
+        Dependency() {}
 
-    String method(String value) {
-      return value;
+        String method(String value) {
+            return value;
+        }
     }
-  }
 
-  static final class MuzzleHelper {
-    static Collection<? extends Reference> compileReferences() {
-      return singletonList(new Reference.Builder("library.Type").build());
+    static final class MuzzleHelper {
+        static Collection<? extends Reference> compileReferences() {
+            return singletonList(new Reference.Builder("library.Type").build());
+        }
     }
-  }
 
-  static final class MuzzleReferenceProvider implements ReferenceProvider {
-    @Override
-    public Iterable<Reference> buildReferences(TypePool typePool) {
-      return emptyList();
+    static final class MuzzleReferenceProvider implements ReferenceProvider {
+        @Override
+        public Iterable<Reference> buildReferences(TypePool typePool) {
+            return emptyList();
+        }
     }
-  }
 
-  static Class<?>[] muzzleHelpers() {
-    return new Class<?>[] {MuzzleHelper.class, MuzzleReferenceProvider.class};
-  }
+    static Class<?>[] muzzleHelpers() {
+        return new Class<?>[] {MuzzleHelper.class, MuzzleReferenceProvider.class};
+    }
 
-  static final class DiagnosticPrinter {
-    static Class<?> dependency() {
-      return DiagnosticDependency.class;
+    static final class DiagnosticPrinter {
+        static Class<?> dependency() {
+            return DiagnosticDependency.class;
+        }
     }
-  }
 
-  static final class DiagnosticDependency {
-    static Class<?> dependency() {
-      return DiagnosticPrinter.class;
+    static final class DiagnosticDependency {
+        static Class<?> dependency() {
+            return DiagnosticPrinter.class;
+        }
     }
-  }
 
-  static Class<?> localClass() {
-    class Local {}
-    return Local.class;
-  }
+    static Class<?> localClass() {
+        class Local {}
+        return Local.class;
+    }
 
-  static Class<?> anonymousClass() {
-    return new Object() {}.getClass();
-  }
+    static Class<?> anonymousClass() {
+        return new Object() {}.getClass();
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/CatchOnlyHelper.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/CatchOnlyHelper.java
index 077cf61ef8f..b289646a268 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/CatchOnlyHelper.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/advice/CatchOnlyHelper.java
@@ -1,12 +1,12 @@
 package datadog.trace.agent.tooling.advice;
 
 public final class CatchOnlyHelper {
-  public static void run() {
-    try {
-      System.nanoTime();
-    } catch (CatchOnlyException ignored) {
-    } finally {
-      System.nanoTime();
+    public static void run() {
+        try {
+            System.nanoTime();
+        } catch (CatchOnlyException ignored) {
+        } finally {
+            System.nanoTime();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/CallSiteWithArraysExample.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/CallSiteWithArraysExample.java
index fae317df07a..fd2c0a4bfff 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/CallSiteWithArraysExample.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/CallSiteWithArraysExample.java
@@ -4,8 +4,8 @@
 
 public class CallSiteWithArraysExample implements TriFunction<String, Integer, Integer, String> {
 
-  @Override
-  public String apply(final String text, final Integer offset, final Integer length) {
-    return new StringBuilder().insert(0, text.toCharArray(), offset, length).toString();
-  }
+    @Override
+    public String apply(final String text, final Integer offset, final Integer length) {
+        return new StringBuilder().insert(0, text.toCharArray(), offset, length).toString();
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringBuilderSetLengthCallSite.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringBuilderSetLengthCallSite.java
index fb10143fbea..94ee990f861 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringBuilderSetLengthCallSite.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringBuilderSetLengthCallSite.java
@@ -2,9 +2,9 @@
 
 public class StringBuilderSetLengthCallSite {
 
-  public static volatile Object[] LAST_CALL;
+    public static volatile Object[] LAST_CALL;
 
-  public static void after(final StringBuilder builder, int length) {
-    LAST_CALL = new Object[] {builder, length};
-  }
+    public static void after(final StringBuilder builder, int length) {
+        LAST_CALL = new Object[] {builder, length};
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringBuilderSetLengthExample.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringBuilderSetLengthExample.java
index 90bdc0dc606..556e4cf79c9 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringBuilderSetLengthExample.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringBuilderSetLengthExample.java
@@ -6,11 +6,11 @@
 
 public class StringBuilderSetLengthExample implements BiConsumer<StringBuilder, Integer> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(StringBuilderSetLengthExample.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StringBuilderSetLengthExample.class);
 
-  public void accept(final StringBuilder builder, final Integer length) {
-    LOGGER.debug("Before apply {} {}", builder, length);
-    builder.setLength(length);
-    LOGGER.debug("After apply {} {}", builder, length);
-  }
+    public void accept(final StringBuilder builder, final Integer length) {
+        LOGGER.debug("Before apply {} {}", builder, length);
+        builder.setLength(length);
+        LOGGER.debug("After apply {} {}", builder, length);
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringConcatCategory2Example.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringConcatCategory2Example.java
index a7c4806ba7c..a6ed021eb8e 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringConcatCategory2Example.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringConcatCategory2Example.java
@@ -6,12 +6,12 @@
 
 public class StringConcatCategory2Example implements BiFunction<String, String, String> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(StringConcatCategory2Example.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StringConcatCategory2Example.class);
 
-  public String apply(final String first, final String second) {
-    LOGGER.debug("Before apply : {}", System.currentTimeMillis() / 1000L);
-    final String result = first.concat(second);
-    LOGGER.debug("After apply : {}", System.currentTimeMillis() / 1000L);
-    return result;
-  }
+    public String apply(final String first, final String second) {
+        LOGGER.debug("Before apply : {}", System.currentTimeMillis() / 1000L);
+        final String result = first.concat(second);
+        LOGGER.debug("After apply : {}", System.currentTimeMillis() / 1000L);
+        return result;
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringConcatExample.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringConcatExample.java
index facd9ce4ab9..e02f2fb5c72 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringConcatExample.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/StringConcatExample.java
@@ -6,12 +6,12 @@
 
 public class StringConcatExample implements BiFunction<String, String, String> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(StringConcatExample.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StringConcatExample.class);
 
-  public String apply(final String first, final String second) {
-    LOGGER.debug("Before apply");
-    final String result = first.concat(second);
-    LOGGER.debug("After apply {}", result);
-    return result;
-  }
+    public String apply(final String first, final String second) {
+        LOGGER.debug("Before apply");
+        final String result = first.concat(second);
+        LOGGER.debug("After apply {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/SuperInCtorExample.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/SuperInCtorExample.java
index 76a4d71eaf4..6da6c3367c9 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/SuperInCtorExample.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/SuperInCtorExample.java
@@ -4,16 +4,16 @@
 
 public class SuperInCtorExample extends StringReader {
 
-  public SuperInCtorExample(String s) {
-    // triggers APPSEC-55918
-    super(s + new StringReader(s + "Test" + new StringBuilder("another test")));
-  }
+    public SuperInCtorExample(String s) {
+        // triggers APPSEC-55918
+        super(s + new StringReader(s + "Test" + new StringBuilder("another test")));
+    }
 
-  public SuperInCtorExample(StringBuilder s) {
-    super(s.toString());
-    // triggers APPSEC-58131
-    if (s.length() == 0) {
-      throw new IllegalArgumentException();
+    public SuperInCtorExample(StringBuilder s) {
+        super(s.toString());
+        // triggers APPSEC-58131
+        if (s.length() == 0) {
+            throw new IllegalArgumentException();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/iast/IastAnnotatedAdvice.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/iast/IastAnnotatedAdvice.java
index bed2f532fcb..742165f6955 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/iast/IastAnnotatedAdvice.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/iast/IastAnnotatedAdvice.java
@@ -5,7 +5,7 @@
 import net.bytebuddy.asm.Advice;
 
 public class IastAnnotatedAdvice {
-  @Advice.OnMethodExit
-  @Sink(VulnerabilityTypes.SQL_INJECTION)
-  static void exit() {}
+    @Advice.OnMethodExit
+    @Sink(VulnerabilityTypes.SQL_INJECTION)
+    static void exit() {}
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/iast/WithHardcodedSecret.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/iast/WithHardcodedSecret.java
index c66dfd928e0..db158a24d8e 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/iast/WithHardcodedSecret.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/iast/WithHardcodedSecret.java
@@ -2,14 +2,14 @@
 
 public class WithHardcodedSecret {
 
-  private static final int NUMBER = 1;
-  private static final String FOO = "foo";
+    private static final int NUMBER = 1;
+    private static final String FOO = "foo";
 
-  public static String getSecret() {
-    return "AGE-SECRET-KEY-1QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ";
-  }
+    public static String getSecret() {
+        return "AGE-SECRET-KEY-1QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ";
+    }
 
-  public static String getSecret2() {
-    return "ghu_39GyMbaIlk2UMGTkC9WCDlpe9AjRNZa1WZQW";
-  }
+    public static String getSecret2() {
+        return "ghu_39GyMbaIlk2UMGTkC9WCDlpe9AjRNZa1WZQW";
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/HelperClass.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/HelperClass.java
index 5810c59db0d..563f3483030 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/HelperClass.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/HelperClass.java
@@ -2,5 +2,5 @@
 
 /** Used by {@link MuzzleVersionScanPluginTest} */
 public class HelperClass {
-  public static class NestedHelperClass {}
+    public static class NestedHelperClass {}
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/MuzzleWeakReferenceTest.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/MuzzleWeakReferenceTest.java
index e5cc688e96e..79e1468d344 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/MuzzleWeakReferenceTest.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/MuzzleWeakReferenceTest.java
@@ -6,22 +6,21 @@
 import java.net.URLClassLoader;
 
 public class MuzzleWeakReferenceTest {
-  /*
-   * Spock holds strong references to all local variables. For weak reference testing we must create our strong references away from Spock in this java class.
-   *
-   * Even returning a WeakReference<ClassLoader> is enough for spock to create a strong ref.
-   */
-  public static boolean classLoaderRefIsGarbageCollected() throws InterruptedException {
-    ClassLoader loader = new URLClassLoader(new URL[0], null);
-    final WeakReference<ClassLoader> clRef = new WeakReference<>(loader);
-    final Reference[] refs =
-        ReferenceCreatorTestSupport.referencesFrom(TestAdviceClasses.MethodBodyAdvice.class)
-            .values()
-            .toArray(new Reference[0]);
-    final ReferenceMatcher refMatcher = new ReferenceMatcher(refs);
-    refMatcher.getMismatchedReferenceSources(loader);
-    loader = null;
-    GCUtils.awaitGC(clRef);
-    return clRef.get() == null;
-  }
+    /*
+     * Spock holds strong references to all local variables. For weak reference testing we must create our strong references away from Spock in this java class.
+     *
+     * Even returning a WeakReference<ClassLoader> is enough for spock to create a strong ref.
+     */
+    public static boolean classLoaderRefIsGarbageCollected() throws InterruptedException {
+        ClassLoader loader = new URLClassLoader(new URL[0], null);
+        final WeakReference<ClassLoader> clRef = new WeakReference<>(loader);
+        final Reference[] refs = ReferenceCreatorTestSupport.referencesFrom(TestAdviceClasses.MethodBodyAdvice.class)
+                .values()
+                .toArray(new Reference[0]);
+        final ReferenceMatcher refMatcher = new ReferenceMatcher(refs);
+        refMatcher.getMismatchedReferenceSources(loader);
+        loader = null;
+        GCUtils.awaitGC(clRef);
+        return clRef.get() == null;
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/ReferenceCreatorConversionTest.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/ReferenceCreatorConversionTest.java
index 52371aca05d..6469e462c06 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/ReferenceCreatorConversionTest.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/ReferenceCreatorConversionTest.java
@@ -19,86 +19,81 @@
 import org.junit.jupiter.api.TestInfo;
 
 class ReferenceCreatorConversionTest {
-  @Test
-  void preservesTransitiveReferencesThroughArrayOwners() {
-    for (Class<?> advice :
-        new Class<?>[] {ArrayCloneAdvice.class, MultidimensionalArrayCloneAdvice.class}) {
-      Map<String, Reference> references = ReferenceCreatorTestSupport.referencesFrom(advice);
+    @Test
+    void preservesTransitiveReferencesThroughArrayOwners() {
+        for (Class<?> advice : new Class<?>[] {ArrayCloneAdvice.class, MultidimensionalArrayCloneAdvice.class}) {
+            Map<String, Reference> references = ReferenceCreatorTestSupport.referencesFrom(advice);
 
-      Reference type = references.get(Type.class.getName());
-      assertNotNull(type, advice.getName());
-      assertTrue(
-          Stream.of(type.methods)
-              .anyMatch(
-                  method ->
-                      method.name.equals("getType")
-                          && method.methodType.equals(
-                              "(Ljava/lang/Class;)Lnet/bytebuddy/jar/asm/Type;")),
-          advice.getName());
-      assertFalse(references.keySet().stream().anyMatch(name -> name.startsWith("[")));
+            Reference type = references.get(Type.class.getName());
+            assertNotNull(type, advice.getName());
+            assertTrue(
+                    Stream.of(type.methods)
+                            .anyMatch(method -> method.name.equals("getType")
+                                    && method.methodType.equals("(Ljava/lang/Class;)Lnet/bytebuddy/jar/asm/Type;")),
+                    advice.getName());
+            assertFalse(references.keySet().stream().anyMatch(name -> name.startsWith("[")));
+        }
     }
-  }
 
-  @Test
-  void ignoresPrimitiveArrayOwners() {
-    assertTrue(
-        ReferenceCreatorTestSupport.referencesFrom(PrimitiveArrayCloneAdvice.class).isEmpty());
-  }
-
-  @Test
-  void appliesAdviceShadingOnlyDuringConversion() {
-    ShadingModule module = new ShadingModule();
-    AdviceScanResult scan = AdviceScanner.scan(module);
-    AdviceShader shader = AdviceShader.with(module.adviceShading());
+    @Test
+    void ignoresPrimitiveArrayOwners() {
+        assertTrue(ReferenceCreatorTestSupport.referencesFrom(PrimitiveArrayCloneAdvice.class)
+                .isEmpty());
+    }
 
-    List<Reference> converted = ReferenceCreator.createReferences(scan, shader);
-    Map<String, Reference> references = ReferenceCreatorTestSupport.byName(converted);
+    @Test
+    void appliesAdviceShadingOnlyDuringConversion() {
+        ShadingModule module = new ShadingModule();
+        AdviceScanResult scan = AdviceScanner.scan(module);
+        AdviceShader shader = AdviceShader.with(module.adviceShading());
 
-    assertTrue(references.containsKey("relocated.library.TestInfo"));
-    assertFalse(references.containsKey(TestInfo.class.getName()));
-    assertFalse(references.keySet().stream().anyMatch(name -> name.startsWith("[")));
-    assertNotNull(scan.getClassInfo(TestInfo.class.getName()));
-  }
+        List<Reference> converted = ReferenceCreator.createReferences(scan, shader);
+        Map<String, Reference> references = ReferenceCreatorTestSupport.byName(converted);
 
-  public static final class ShadingModule extends InstrumenterModule
-      implements Instrumenter.HasMethodAdvice {
-    public ShadingModule() {
-      super("muzzle-shading");
+        assertTrue(references.containsKey("relocated.library.TestInfo"));
+        assertFalse(references.containsKey(TestInfo.class.getName()));
+        assertFalse(references.keySet().stream().anyMatch(name -> name.startsWith("[")));
+        assertNotNull(scan.getClassInfo(TestInfo.class.getName()));
     }
 
-    @Override
-    public void methodAdvice(MethodTransformer transformer) {
-      transformer.applyAdvice(null, ShadingAdvice.class.getName());
-    }
+    public static final class ShadingModule extends InstrumenterModule implements Instrumenter.HasMethodAdvice {
+        public ShadingModule() {
+            super("muzzle-shading");
+        }
+
+        @Override
+        public void methodAdvice(MethodTransformer transformer) {
+            transformer.applyAdvice(null, ShadingAdvice.class.getName());
+        }
 
-    @Override
-    public Map<String, String> adviceShading() {
-      return Collections.singletonMap("org.junit.jupiter.api", "relocated.library");
+        @Override
+        public Map<String, String> adviceShading() {
+            return Collections.singletonMap("org.junit.jupiter.api", "relocated.library");
+        }
     }
-  }
 
-  static final class ArrayCloneAdvice {
-    static Object apply(ExternalHelper[] helpers) {
-      return helpers.clone();
+    static final class ArrayCloneAdvice {
+        static Object apply(ExternalHelper[] helpers) {
+            return helpers.clone();
+        }
     }
-  }
 
-  static final class MultidimensionalArrayCloneAdvice {
-    static Object apply(ExternalHelper[][] helpers) {
-      return helpers.clone();
+    static final class MultidimensionalArrayCloneAdvice {
+        static Object apply(ExternalHelper[][] helpers) {
+            return helpers.clone();
+        }
     }
-  }
 
-  static final class PrimitiveArrayCloneAdvice {
-    static Object apply(int[] values) {
-      return values.clone();
+    static final class PrimitiveArrayCloneAdvice {
+        static Object apply(int[] values) {
+            return values.clone();
+        }
     }
-  }
 
-  static final class ShadingAdvice {
-    static String apply(TestInfo testInfo) {
-      TestInfo[] testInfos = {testInfo};
-      return testInfos.clone()[0].getDisplayName();
+    static final class ShadingAdvice {
+        static String apply(TestInfo testInfo) {
+            TestInfo[] testInfos = {testInfo};
+            return testInfos.clone()[0].getDisplayName();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/ReferenceCreatorTestSupport.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/ReferenceCreatorTestSupport.java
index 874a5cec23e..450811d6cc5 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/ReferenceCreatorTestSupport.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/ReferenceCreatorTestSupport.java
@@ -9,33 +9,32 @@
 import java.util.Map;
 
 public final class ReferenceCreatorTestSupport {
-  private ReferenceCreatorTestSupport() {}
+    private ReferenceCreatorTestSupport() {}
 
-  public static Map<String, Reference> referencesFrom(Class<?> adviceClass) {
-    AdviceScanResult scanResult = AdviceScanner.scan(new AdviceModule(adviceClass.getName()));
-    return byName(ReferenceCreator.createReferences(scanResult, null));
-  }
+    public static Map<String, Reference> referencesFrom(Class<?> adviceClass) {
+        AdviceScanResult scanResult = AdviceScanner.scan(new AdviceModule(adviceClass.getName()));
+        return byName(ReferenceCreator.createReferences(scanResult, null));
+    }
 
-  static Map<String, Reference> byName(Collection<Reference> references) {
-    Map<String, Reference> referencesByName = new LinkedHashMap<>();
-    for (Reference reference : references) {
-      referencesByName.put(reference.className, reference);
+    static Map<String, Reference> byName(Collection<Reference> references) {
+        Map<String, Reference> referencesByName = new LinkedHashMap<>();
+        for (Reference reference : references) {
+            referencesByName.put(reference.className, reference);
+        }
+        return referencesByName;
     }
-    return referencesByName;
-  }
 
-  private static final class AdviceModule extends InstrumenterModule
-      implements Instrumenter.HasMethodAdvice {
-    private final String adviceClass;
+    private static final class AdviceModule extends InstrumenterModule implements Instrumenter.HasMethodAdvice {
+        private final String adviceClass;
 
-    private AdviceModule(String adviceClass) {
-      super("jdbc");
-      this.adviceClass = adviceClass;
-    }
+        private AdviceModule(String adviceClass) {
+            super("jdbc");
+            this.adviceClass = adviceClass;
+        }
 
-    @Override
-    public void methodAdvice(MethodTransformer transformer) {
-      transformer.applyAdvice(null, adviceClass);
+        @Override
+        public void methodAdvice(MethodTransformer transformer) {
+            transformer.applyAdvice(null, adviceClass);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/TestAdviceClasses.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/TestAdviceClasses.java
index 5bb7b23d986..265f8e652df 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/TestAdviceClasses.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/TestAdviceClasses.java
@@ -4,103 +4,103 @@
 
 public class TestAdviceClasses {
 
-  public static class MethodBodyAdvice {
-    @Advice.OnMethodEnter
-    public static void methodBodyAdvice() {
-      final A a = new A();
-      final SomeInterface inter = new SomeImplementation();
-      Object o = inter.requiredMethod();
-      inter.someMethod();
-      a.b.aMethod("foo");
-      a.b.aMethodWithPrimitives(false);
-      a.b.aMethodWithArrays(new String[0]);
-      B.aStaticMethod();
-      A.staticB.aMethod("bar");
-      Object barr = new byte[0];
-      if (barr instanceof byte[]) {
-        barr = null;
-      }
+    public static class MethodBodyAdvice {
+        @Advice.OnMethodEnter
+        public static void methodBodyAdvice() {
+            final A a = new A();
+            final SomeInterface inter = new SomeImplementation();
+            Object o = inter.requiredMethod();
+            inter.someMethod();
+            a.b.aMethod("foo");
+            a.b.aMethodWithPrimitives(false);
+            a.b.aMethodWithArrays(new String[0]);
+            B.aStaticMethod();
+            A.staticB.aMethod("bar");
+            Object barr = new byte[0];
+            if (barr instanceof byte[]) {
+                barr = null;
+            }
+        }
+
+        public static class A {
+            public B b = new B();
+            protected Object protectedField = null;
+            private final Object privateField = null;
+            public static B staticB = new B();
+        }
+
+        public static class B {
+            public String aMethod(final String s) {
+                return s;
+            }
+
+            public void aMethodWithPrimitives(final boolean b) {}
+
+            public Object[] aMethodWithArrays(final String[] s) {
+                return s;
+            }
+
+            private void privateStuff() {}
+
+            protected void protectedMethod() {}
+
+            public static void aStaticMethod() {}
+        }
+
+        public static class B2 extends B {
+            public void stuff() {
+                final B b = new B();
+                b.protectedMethod();
+            }
+        }
+
+        public static class A2 extends A {}
+
+        public interface HasMethod {
+            Object requiredMethod();
+        }
+
+        public interface SkipLevel extends HasMethod {}
+
+        public interface SomeInterface extends SkipLevel {
+            void someMethod();
+        }
+
+        public static class SomeImplementation implements SomeInterface {
+            @Override
+            public void someMethod() {}
+
+            @Override
+            public Object requiredMethod() {
+                return null;
+            }
+        }
+
+        public static class SomeClassWithFields {
+            public int instanceField = 0;
+            public static int staticField = 0;
+            public final int finalField = 0;
+        }
+
+        public interface AnotherInterface extends SomeInterface {}
     }
 
-    public static class A {
-      public B b = new B();
-      protected Object protectedField = null;
-      private final Object privateField = null;
-      public static B staticB = new B();
+    public static class LdcAdvice {
+        public static void ldcMethod() {
+            MethodBodyAdvice.A.class.getName();
+        }
     }
 
-    public static class B {
-      public String aMethod(final String s) {
-        return s;
-      }
-
-      public void aMethodWithPrimitives(final boolean b) {}
-
-      public Object[] aMethodWithArrays(final String[] s) {
-        return s;
-      }
-
-      private void privateStuff() {}
-
-      protected void protectedMethod() {}
-
-      public static void aStaticMethod() {}
-    }
-
-    public static class B2 extends B {
-      public void stuff() {
-        final B b = new B();
-        b.protectedMethod();
-      }
-    }
-
-    public static class A2 extends A {}
-
-    public interface HasMethod {
-      Object requiredMethod();
-    }
-
-    public interface SkipLevel extends HasMethod {}
-
-    public interface SomeInterface extends SkipLevel {
-      void someMethod();
-    }
-
-    public static class SomeImplementation implements SomeInterface {
-      @Override
-      public void someMethod() {}
-
-      @Override
-      public Object requiredMethod() {
-        return null;
-      }
-    }
-
-    public static class SomeClassWithFields {
-      public int instanceField = 0;
-      public static int staticField = 0;
-      public final int finalField = 0;
-    }
-
-    public interface AnotherInterface extends SomeInterface {}
-  }
-
-  public static class LdcAdvice {
-    public static void ldcMethod() {
-      MethodBodyAdvice.A.class.getName();
-    }
-  }
-
-  public static class InstanceofAdvice {
-    public static boolean instanceofMethod(final Object a) {
-      return a instanceof MethodBodyAdvice.A;
+    public static class InstanceofAdvice {
+        public static boolean instanceofMethod(final Object a) {
+            return a instanceof MethodBodyAdvice.A;
+        }
     }
-  }
 
-  public static class InDyAdvice {
-    public static MethodBodyAdvice.HasMethod indyMethod(final MethodBodyAdvice.HasMethod a) {
-      Runnable aStaticMethod = MethodBodyAdvice.B::aStaticMethod;
-      return a::requiredMethod;
+    public static class InDyAdvice {
+        public static MethodBodyAdvice.HasMethod indyMethod(final MethodBodyAdvice.HasMethod a) {
+            Runnable aStaticMethod = MethodBodyAdvice.B::aStaticMethod;
+            return a::requiredMethod;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/TestInstrumentationClasses.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/TestInstrumentationClasses.java
index a841619685d..c86841b20dc 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/TestInstrumentationClasses.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/TestInstrumentationClasses.java
@@ -5,121 +5,119 @@
 import java.util.Map;
 
 public abstract class TestInstrumentationClasses {
-  static final Reference[] SOME_ADVICE_REFS;
+    static final Reference[] SOME_ADVICE_REFS;
 
-  static {
-    Map<String, Reference> references =
-        ReferenceCreatorTestSupport.referencesFrom(SomeAdvice.class);
-    SOME_ADVICE_REFS = references.values().toArray(new Reference[0]);
-  }
-
-  public abstract static class BaseInst extends InstrumenterModule
-      implements Instrumenter.HasMethodAdvice {
-
-    public BaseInst() {
-      super("test");
+    static {
+        Map<String, Reference> references = ReferenceCreatorTestSupport.referencesFrom(SomeAdvice.class);
+        SOME_ADVICE_REFS = references.values().toArray(new Reference[0]);
     }
 
-    @Override
-    public void methodAdvice(MethodTransformer transformer) {}
-  }
+    public abstract static class BaseInst extends InstrumenterModule implements Instrumenter.HasMethodAdvice {
 
-  public static class EmptyInst extends BaseInst {
-    public static class Muzzle {
-      public static ReferenceMatcher create() {
-        return ReferenceMatcher.NO_REFERENCES;
-      }
-    }
-  }
-
-  public static class ValidHelperInst extends BaseInst {
-    @Override
-    public String[] helperClassNames() {
-      return new String[] {
-        HelperClass.class.getName(), HelperClass.NestedHelperClass.class.getName(),
-      };
-    }
+        public BaseInst() {
+            super("test");
+        }
 
-    public static class Muzzle {
-      public static ReferenceMatcher create() {
-        return ReferenceMatcher.NO_REFERENCES;
-      }
-    }
-  }
-
-  public static class InvalidOrderHelperInst extends BaseInst {
-    @Override
-    public String[] helperClassNames() {
-      return new String[] {
-        HelperClass.NestedHelperClass.class.getName(), HelperClass.class.getName(),
-      };
+        @Override
+        public void methodAdvice(MethodTransformer transformer) {}
     }
 
-    public static class Muzzle {
-      public static ReferenceMatcher create() {
-        return ReferenceMatcher.NO_REFERENCES;
-      }
+    public static class EmptyInst extends BaseInst {
+        public static class Muzzle {
+            public static ReferenceMatcher create() {
+                return ReferenceMatcher.NO_REFERENCES;
+            }
+        }
     }
-  }
-
-  public static class InvalidMissingHelperInst extends BaseInst {
-    @Override
-    public String[] helperClassNames() {
-      return new String[] {
-        HelperClass.NestedHelperClass.class.getName(),
-      };
+
+    public static class ValidHelperInst extends BaseInst {
+        @Override
+        public String[] helperClassNames() {
+            return new String[] {
+                HelperClass.class.getName(), HelperClass.NestedHelperClass.class.getName(),
+            };
+        }
+
+        public static class Muzzle {
+            public static ReferenceMatcher create() {
+                return ReferenceMatcher.NO_REFERENCES;
+            }
+        }
     }
 
-    public static class Muzzle {
-      public static ReferenceMatcher create() {
-        return ReferenceMatcher.NO_REFERENCES;
-      }
+    public static class InvalidOrderHelperInst extends BaseInst {
+        @Override
+        public String[] helperClassNames() {
+            return new String[] {
+                HelperClass.NestedHelperClass.class.getName(), HelperClass.class.getName(),
+            };
+        }
+
+        public static class Muzzle {
+            public static ReferenceMatcher create() {
+                return ReferenceMatcher.NO_REFERENCES;
+            }
+        }
     }
-  }
 
-  public static class BasicInst extends BaseInst {
-    public static class Muzzle {
-      public static ReferenceMatcher create() {
-        return new ReferenceMatcher(SOME_ADVICE_REFS);
-      }
+    public static class InvalidMissingHelperInst extends BaseInst {
+        @Override
+        public String[] helperClassNames() {
+            return new String[] {
+                HelperClass.NestedHelperClass.class.getName(),
+            };
+        }
+
+        public static class Muzzle {
+            public static ReferenceMatcher create() {
+                return ReferenceMatcher.NO_REFERENCES;
+            }
+        }
     }
-  }
-
-  public static class HelperInst extends BaseInst {
-    @Override
-    public String[] helperClassNames() {
-      return new String[] {
-        AdviceParameter.class.getName(),
-        AdviceMethodReturn.class.getName(),
-        AdviceReference.class.getName(),
-        AdviceStaticReference.class.getName(),
-      };
+
+    public static class BasicInst extends BaseInst {
+        public static class Muzzle {
+            public static ReferenceMatcher create() {
+                return new ReferenceMatcher(SOME_ADVICE_REFS);
+            }
+        }
     }
 
-    public static class Muzzle {
-      public static ReferenceMatcher create() {
-        return new ReferenceMatcher(SOME_ADVICE_REFS);
-      }
+    public static class HelperInst extends BaseInst {
+        @Override
+        public String[] helperClassNames() {
+            return new String[] {
+                AdviceParameter.class.getName(),
+                AdviceMethodReturn.class.getName(),
+                AdviceReference.class.getName(),
+                AdviceStaticReference.class.getName(),
+            };
+        }
+
+        public static class Muzzle {
+            public static ReferenceMatcher create() {
+                return new ReferenceMatcher(SOME_ADVICE_REFS);
+            }
+        }
     }
-  }
 
-  public static class SomeAdvice {
-    private AdviceMethodReturn test(AdviceParameter param) {
-      new AdviceReference().doSomething();
-      AdviceStaticReference.doSomething();
-      return null;
+    public static class SomeAdvice {
+        private AdviceMethodReturn test(AdviceParameter param) {
+            new AdviceReference().doSomething();
+            AdviceStaticReference.doSomething();
+            return null;
+        }
     }
-  }
 
-  public interface AdviceParameter {}
+    public interface AdviceParameter {}
 
-  public interface AdviceMethodReturn {}
+    public interface AdviceMethodReturn {}
 
-  public static class AdviceReference {
-    public void doSomething() {}
-  }
+    public static class AdviceReference {
+        public void doSomething() {}
+    }
 
-  public static class AdviceStaticReference {
-    public static void doSomething() {}
-  }
+    public static class AdviceStaticReference {
+        public static void doSomething() {}
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/instrumentation/testing/AdviceHierarchy.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/instrumentation/testing/AdviceHierarchy.java
index 0075b2316cc..2380dddd51a 100644
--- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/instrumentation/testing/AdviceHierarchy.java
+++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/instrumentation/testing/AdviceHierarchy.java
@@ -4,17 +4,17 @@
 import net.bytebuddy.jar.asm.ClassWriter;
 
 public final class AdviceHierarchy {
-  private AdviceHierarchy() {}
+    private AdviceHierarchy() {}
 
-  public static class Superclass {
-    public static int muzzleCheck(ClassReader reader) {
-      return reader.getAccess();
+    public static class Superclass {
+        public static int muzzleCheck(ClassReader reader) {
+            return reader.getAccess();
+        }
     }
-  }
 
-  public interface Interface {
-    default int muzzleCheck(ClassWriter writer) {
-      return writer.newUTF8("muzzle");
+    public interface Interface {
+        default int muzzleCheck(ClassWriter writer) {
+            return writer.newUTF8("muzzle");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/StringPlusConstantsExample.java b/dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/StringPlusConstantsExample.java
index a71e58609a0..311a29fceed 100644
--- a/dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/StringPlusConstantsExample.java
+++ b/dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/StringPlusConstantsExample.java
@@ -6,12 +6,12 @@
 
 public class StringPlusConstantsExample implements TriFunction<String, String, String, String> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(StringPlusConstantsExample.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StringPlusConstantsExample.class);
 
-  public String apply(final String first, final String second, final String third) {
-    LOGGER.debug("Before apply");
-    final String result = first + " " + second + " " + third;
-    LOGGER.debug("After apply {}", result);
-    return result;
-  }
+    public String apply(final String first, final String second, final String third) {
+        LOGGER.debug("Before apply");
+        final String result = first + " " + second + " " + third;
+        LOGGER.debug("After apply {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/StringPlusExample.java b/dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/StringPlusExample.java
index 0a15d1e9fe4..679f760eb51 100644
--- a/dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/StringPlusExample.java
+++ b/dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/StringPlusExample.java
@@ -6,12 +6,12 @@
 
 public class StringPlusExample implements TriFunction<String, String, String, String> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(StringPlusExample.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StringPlusExample.class);
 
-  public String apply(final String first, final String second, final String third) {
-    LOGGER.debug("Before apply");
-    final String result = first + second + third;
-    LOGGER.debug("After apply {}", result);
-    return result;
-  }
+    public String apply(final String first, final String second, final String third) {
+        LOGGER.debug("Before apply");
+        final String result = first + second + third;
+        LOGGER.debug("After apply {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/StringPlusLoadWithTagsExample.java b/dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/StringPlusLoadWithTagsExample.java
index 4852b27d12b..6fe3e2ce66a 100644
--- a/dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/StringPlusLoadWithTagsExample.java
+++ b/dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/StringPlusLoadWithTagsExample.java
@@ -6,12 +6,12 @@
 
 public class StringPlusLoadWithTagsExample implements TriFunction<String, String, String, String> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(StringPlusLoadWithTagsExample.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StringPlusLoadWithTagsExample.class);
 
-  public String apply(final String first, final String second, final String third) {
-    LOGGER.debug("Before apply");
-    final String result = first + " \u0002 " + second + " \u0001 " + third;
-    LOGGER.debug("After apply {}", result);
-    return result;
-  }
+    public String apply(final String first, final String second, final String third) {
+        LOGGER.debug("Before apply");
+        final String result = first + " \u0002 " + second + " \u0001 " + third;
+        LOGGER.debug("After apply {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/UnknownArityExample.java b/dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/UnknownArityExample.java
index 4e1a38865d6..00cf3f72b4d 100644
--- a/dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/UnknownArityExample.java
+++ b/dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/UnknownArityExample.java
@@ -5,20 +5,20 @@
 
 public class UnknownArityExample implements Supplier<String> {
 
-  @Override
-  public String get() {
-    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);
-    return "My name is "
-        + name
-        + ", I'm "
-        + age
-        + " years old, "
-        + height
-        + " cm tall and I weight "
-        + weight
-        + " kg";
-  }
+    @Override
+    public String get() {
+        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);
+        return "My name is "
+                + name
+                + ", I'm "
+                + age
+                + " years old, "
+                + height
+                + " cm tall and I weight "
+                + weight
+                + " kg";
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java21/datadog/trace/agent/tooling/muzzle/CompiledWithInvokeinterfaceForObjectMethods.java b/dd-java-agent/agent-tooling/src/test/java21/datadog/trace/agent/tooling/muzzle/CompiledWithInvokeinterfaceForObjectMethods.java
index fa5fdb00c16..3eeaee93de3 100644
--- a/dd-java-agent/agent-tooling/src/test/java21/datadog/trace/agent/tooling/muzzle/CompiledWithInvokeinterfaceForObjectMethods.java
+++ b/dd-java-agent/agent-tooling/src/test/java21/datadog/trace/agent/tooling/muzzle/CompiledWithInvokeinterfaceForObjectMethods.java
@@ -1,11 +1,11 @@
 package datadog.trace.agent.tooling.muzzle;
 
 public class CompiledWithInvokeinterfaceForObjectMethods {
-  interface DatadogInterface {}
+    interface DatadogInterface {}
 
-  public void doSomething(DatadogInterface itf) {
-    itf.hashCode();
-    itf.equals(new Object());
-    itf.getClass();
-  }
+    public void doSomething(DatadogInterface itf) {
+        itf.hashCode();
+        itf.equals(new Object());
+        itf.getClass();
+    }
 }
diff --git a/dd-java-agent/agent-tooling/src/testFixtures/java/datadog/trace/instrumentation/testing/ExternalHelper.java b/dd-java-agent/agent-tooling/src/testFixtures/java/datadog/trace/instrumentation/testing/ExternalHelper.java
index 76778dd53cf..6b8c84db876 100644
--- a/dd-java-agent/agent-tooling/src/testFixtures/java/datadog/trace/instrumentation/testing/ExternalHelper.java
+++ b/dd-java-agent/agent-tooling/src/testFixtures/java/datadog/trace/instrumentation/testing/ExternalHelper.java
@@ -3,9 +3,9 @@
 import net.bytebuddy.jar.asm.Type;
 
 public final class ExternalHelper {
-  private ExternalHelper() {}
+    private ExternalHelper() {}
 
-  public static String typeName() {
-    return Type.getType(Object.class).getClassName();
-  }
+    public static String typeName() {
+        return Type.getType(Object.class).getClassName();
+    }
 }
diff --git a/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/AppSecBenchmark.java b/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/AppSecBenchmark.java
index 3238723bf51..64d0f09a560 100644
--- a/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/AppSecBenchmark.java
+++ b/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/AppSecBenchmark.java
@@ -53,217 +53,215 @@
 @Fork(value = 3)
 public class AppSecBenchmark {
 
-  static {
-    BenchmarkUtil.disableLogging();
-  }
-
-  private InstrumentationGateway gw;
-  private CallbackProvider cbp;
-  private SubscriptionService ss;
-  private String method = "GET";
-  private URIDataAdapter uri;
-  private String ip = "0.0.0.0";
-  private int port = 5555;
-
-  @Setup(Level.Trial)
-  public void setUp() throws URISyntaxException {
-    gw = new InstrumentationGateway();
-    cbp = gw.getCallbackProvider(RequestContextSlot.APPSEC);
-    ss = gw.getSubscriptionService(RequestContextSlot.APPSEC);
-    SharedCommunicationObjects sharedCommunicationObjects = new SharedCommunicationObjects();
-    sharedCommunicationObjects.monitoring = Monitoring.DISABLED;
-    sharedCommunicationObjects.agentHttpClient = new StubOkHttpClient();
-    sharedCommunicationObjects.setFeaturesDiscovery(
-        new StubDDAgentFeaturesDiscovery(sharedCommunicationObjects.agentHttpClient));
-
-    AppSecSystem.start(ss, sharedCommunicationObjects);
-    uri = new URIDefaultDataAdapter(new URI("http://localhost:8080/test"));
-  }
-
-  private void maliciousRequest() throws Exception {
-    RequestContext context =
-        new Context(cbp.getCallback(EVENTS.requestStarted()).get().getResult());
-    cbp.getCallback(EVENTS.requestMethodUriRaw()).apply(context, method, uri);
-    cbp.getCallback(EVENTS.requestClientSocketAddress()).apply(context, ip, port);
-    cbp.getCallback(EVENTS.requestHeader()).accept(context, "User-Agent", "Arachni/v1");
-    Flow<?> flow = cbp.getCallback(EVENTS.requestHeaderDone()).apply(context);
-    if (!flow.getAction().isBlocking()) {
-      throw new Exception("Request should be blocked");
+    static {
+        BenchmarkUtil.disableLogging();
     }
-    cbp.getCallback(EVENTS.requestEnded()).apply(context, null);
-  }
-
-  @Benchmark
-  public void maliciousRequestDefault() throws Exception {
-    maliciousRequest();
-  }
-
-  @Benchmark
-  @Fork(jvmArgsAppend = "-DPOWERWAF_ENABLE_BYTE_BUFFERS=false")
-  public void maliciousRequestNoByteBuffers() throws Exception {
-    maliciousRequest();
-  }
-
-  private void normalRequest() {
-    RequestContext context =
-        new Context(cbp.getCallback(EVENTS.requestStarted()).get().getResult());
-    cbp.getCallback(EVENTS.requestMethodUriRaw()).apply(context, method, uri);
-    cbp.getCallback(EVENTS.requestClientSocketAddress()).apply(context, ip, port);
-    cbp.getCallback(EVENTS.requestHeader()).accept(context, "User-Agent", "Mozilla/5.0");
-    Flow<?> flow = cbp.getCallback(EVENTS.requestHeaderDone()).apply(context);
-    cbp.getCallback(EVENTS.requestEnded()).apply(context, null);
-  }
-
-  @Benchmark
-  public void normalRequestDefault() throws Exception {
-    normalRequest();
-  }
-
-  @Fork(jvmArgsAppend = "-Ddd.appsec.waf.metrics=false")
-  @Benchmark
-  public void normalRequestNoWafMetrics() {
-    normalRequest();
-  }
-
-  static class StubOkHttpClient extends OkHttpClient {
-    @Override
-    public Call newCall(final Request request) {
-      final Response response =
-          new Response.Builder()
-              .request(request)
-              .protocol(Protocol.HTTP_1_0)
-              .code(200)
-              .message("OK")
-              .build();
-
-      return new Call() {
-        @Override
-        public Request request() {
-          return request;
+
+    private InstrumentationGateway gw;
+    private CallbackProvider cbp;
+    private SubscriptionService ss;
+    private String method = "GET";
+    private URIDataAdapter uri;
+    private String ip = "0.0.0.0";
+    private int port = 5555;
+
+    @Setup(Level.Trial)
+    public void setUp() throws URISyntaxException {
+        gw = new InstrumentationGateway();
+        cbp = gw.getCallbackProvider(RequestContextSlot.APPSEC);
+        ss = gw.getSubscriptionService(RequestContextSlot.APPSEC);
+        SharedCommunicationObjects sharedCommunicationObjects = new SharedCommunicationObjects();
+        sharedCommunicationObjects.monitoring = Monitoring.DISABLED;
+        sharedCommunicationObjects.agentHttpClient = new StubOkHttpClient();
+        sharedCommunicationObjects.setFeaturesDiscovery(
+                new StubDDAgentFeaturesDiscovery(sharedCommunicationObjects.agentHttpClient));
+
+        AppSecSystem.start(ss, sharedCommunicationObjects);
+        uri = new URIDefaultDataAdapter(new URI("http://localhost:8080/test"));
+    }
+
+    private void maliciousRequest() throws Exception {
+        RequestContext context =
+                new Context(cbp.getCallback(EVENTS.requestStarted()).get().getResult());
+        cbp.getCallback(EVENTS.requestMethodUriRaw()).apply(context, method, uri);
+        cbp.getCallback(EVENTS.requestClientSocketAddress()).apply(context, ip, port);
+        cbp.getCallback(EVENTS.requestHeader()).accept(context, "User-Agent", "Arachni/v1");
+        Flow<?> flow = cbp.getCallback(EVENTS.requestHeaderDone()).apply(context);
+        if (!flow.getAction().isBlocking()) {
+            throw new Exception("Request should be blocked");
         }
+        cbp.getCallback(EVENTS.requestEnded()).apply(context, null);
+    }
+
+    @Benchmark
+    public void maliciousRequestDefault() throws Exception {
+        maliciousRequest();
+    }
+
+    @Benchmark
+    @Fork(jvmArgsAppend = "-DPOWERWAF_ENABLE_BYTE_BUFFERS=false")
+    public void maliciousRequestNoByteBuffers() throws Exception {
+        maliciousRequest();
+    }
+
+    private void normalRequest() {
+        RequestContext context =
+                new Context(cbp.getCallback(EVENTS.requestStarted()).get().getResult());
+        cbp.getCallback(EVENTS.requestMethodUriRaw()).apply(context, method, uri);
+        cbp.getCallback(EVENTS.requestClientSocketAddress()).apply(context, ip, port);
+        cbp.getCallback(EVENTS.requestHeader()).accept(context, "User-Agent", "Mozilla/5.0");
+        Flow<?> flow = cbp.getCallback(EVENTS.requestHeaderDone()).apply(context);
+        cbp.getCallback(EVENTS.requestEnded()).apply(context, null);
+    }
+
+    @Benchmark
+    public void normalRequestDefault() throws Exception {
+        normalRequest();
+    }
 
+    @Fork(jvmArgsAppend = "-Ddd.appsec.waf.metrics=false")
+    @Benchmark
+    public void normalRequestNoWafMetrics() {
+        normalRequest();
+    }
+
+    static class StubOkHttpClient extends OkHttpClient {
         @Override
-        public Response execute() throws IOException {
-          return response;
+        public Call newCall(final Request request) {
+            final Response response = new Response.Builder()
+                    .request(request)
+                    .protocol(Protocol.HTTP_1_0)
+                    .code(200)
+                    .message("OK")
+                    .build();
+
+            return new Call() {
+                @Override
+                public Request request() {
+                    return request;
+                }
+
+                @Override
+                public Response execute() throws IOException {
+                    return response;
+                }
+
+                @Override
+                public void enqueue(Callback responseCallback) {
+                    final Call thiz = this;
+                    new Thread(() -> {
+                                try {
+                                    responseCallback.onResponse(thiz, response);
+                                } catch (IOException e) {
+                                    throw new UndeclaredThrowableException(e);
+                                }
+                            })
+                            .start();
+                }
+
+                @Override
+                public void cancel() {}
+
+                @Override
+                public boolean isExecuted() {
+                    return true;
+                }
+
+                @Override
+                public boolean isCanceled() {
+                    return false;
+                }
+
+                @Override
+                public Timeout timeout() {
+                    return Timeout.NONE;
+                }
+
+                @Override
+                public Call clone() {
+                    throw new UnsupportedOperationException();
+                }
+            };
         }
+    }
 
-        @Override
-        public void enqueue(Callback responseCallback) {
-          final Call thiz = this;
-          new Thread(
-                  () -> {
-                    try {
-                      responseCallback.onResponse(thiz, response);
-                    } catch (IOException e) {
-                      throw new UndeclaredThrowableException(e);
-                    }
-                  })
-              .start();
+    static class StubDDAgentFeaturesDiscovery extends DDAgentFeaturesDiscovery {
+        public StubDDAgentFeaturesDiscovery(OkHttpClient client) {
+            super(client, Monitoring.DISABLED, HttpUrl.get("http://localhost:8080/"), V0_4, false, false);
         }
 
         @Override
-        public void cancel() {}
+        public void discover() {}
 
         @Override
-        public boolean isExecuted() {
-          return true;
+        public boolean supportsMetrics() {
+            return false;
         }
 
         @Override
-        public boolean isCanceled() {
-          return false;
+        public String getMetricsEndpoint() {
+            return null;
         }
 
         @Override
-        public Timeout timeout() {
-          return Timeout.NONE;
+        public String getTraceEndpoint() {
+            return "http://localhost:8080/";
         }
 
         @Override
-        public Call clone() {
-          throw new UnsupportedOperationException();
+        public String state() {
+            return "";
         }
-      };
-    }
-  }
-
-  static class StubDDAgentFeaturesDiscovery extends DDAgentFeaturesDiscovery {
-    public StubDDAgentFeaturesDiscovery(OkHttpClient client) {
-      super(client, Monitoring.DISABLED, HttpUrl.get("http://localhost:8080/"), V0_4, false, false);
-    }
-
-    @Override
-    public void discover() {}
-
-    @Override
-    public boolean supportsMetrics() {
-      return false;
-    }
-
-    @Override
-    public String getMetricsEndpoint() {
-      return null;
-    }
 
-    @Override
-    public String getTraceEndpoint() {
-      return "http://localhost:8080/";
+        @Override
+        public boolean active() {
+            return false;
+        }
     }
 
-    @Override
-    public String state() {
-      return "";
-    }
+    static class Context implements RequestContext {
+        private final Object data;
 
-    @Override
-    public boolean active() {
-      return false;
-    }
-  }
-
-  static class Context implements RequestContext {
-    private final Object data;
+        public Context(Object data) {
+            this.data = data;
+        }
 
-    public Context(Object data) {
-      this.data = data;
-    }
+        @Override
+        public Object getData(RequestContextSlot slot) {
+            if (slot == RequestContextSlot.APPSEC) {
+                return data;
+            } else {
+                return null;
+            }
+        }
 
-    @Override
-    public Object getData(RequestContextSlot slot) {
-      if (slot == RequestContextSlot.APPSEC) {
-        return data;
-      } else {
-        return null;
-      }
-    }
+        @Override
+        public TraceSegment getTraceSegment() {
+            return TraceSegment.NoOp.INSTANCE;
+        }
 
-    @Override
-    public TraceSegment getTraceSegment() {
-      return TraceSegment.NoOp.INSTANCE;
-    }
+        @Override
+        public void setBlockResponseFunction(BlockResponseFunction blockResponseFunction) {}
 
-    @Override
-    public void setBlockResponseFunction(BlockResponseFunction blockResponseFunction) {}
+        @Override
+        public BlockResponseFunction getBlockResponseFunction() {
+            return null;
+        }
 
-    @Override
-    public BlockResponseFunction getBlockResponseFunction() {
-      return null;
-    }
+        @Override
+        public <T> T getOrCreateMetaStructTop(String key, Function<String, T> defaultValue) {
+            return null;
+        }
 
-    @Override
-    public <T> T getOrCreateMetaStructTop(String key, Function<String, T> defaultValue) {
-      return null;
-    }
+        @Override
+        public void setClientIpAddressData(ClientIpAddressData clientIpAddressData) {}
 
-    @Override
-    public void setClientIpAddressData(ClientIpAddressData clientIpAddressData) {}
+        @Override
+        public ClientIpAddressData getClientIpAddressData() {
+            return null;
+        }
 
-    @Override
-    public ClientIpAddressData getClientIpAddressData() {
-      return null;
+        @Override
+        public void close() throws IOException {}
     }
-
-    @Override
-    public void close() throws IOException {}
-  }
 }
diff --git a/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/BenchmarkUtil.java b/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/BenchmarkUtil.java
index 2456edd352f..23fd86a7fea 100644
--- a/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/BenchmarkUtil.java
+++ b/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/BenchmarkUtil.java
@@ -8,21 +8,21 @@
 import org.slf4j.LoggerFactory;
 
 public class BenchmarkUtil {
-  public static void disableLogging() {
-    org.slf4j.Logger root = LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
-    if (root instanceof Logger) {
-      Logger logBackRoot = (Logger) LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
-      logBackRoot.setLevel(ch.qos.logback.classic.Level.OFF);
+    public static void disableLogging() {
+        org.slf4j.Logger root = LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
+        if (root instanceof Logger) {
+            Logger logBackRoot = (Logger) LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
+            logBackRoot.setLevel(ch.qos.logback.classic.Level.OFF);
+        }
     }
-  }
 
-  public static void initializeWaf() {
-    try {
-      Waf.initialize(false);
-    } catch (AbstractWafException e) {
-      throw new UndeclaredThrowableException(e);
-    } catch (UnsupportedVMException e) {
-      throw new UndeclaredThrowableException(e);
+    public static void initializeWaf() {
+        try {
+            Waf.initialize(false);
+        } catch (AbstractWafException e) {
+            throw new UndeclaredThrowableException(e);
+        } catch (UnsupportedVMException e) {
+            throw new UndeclaredThrowableException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/EventDispatcherBenchmark.java b/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/EventDispatcherBenchmark.java
index 2375c3fb1f4..49afed319c8 100644
--- a/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/EventDispatcherBenchmark.java
+++ b/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/EventDispatcherBenchmark.java
@@ -32,78 +32,71 @@
 @OutputTimeUnit(MICROSECONDS)
 public class EventDispatcherBenchmark {
 
-  @State(Scope.Benchmark)
-  public static class DispatcherState {
-    public static final OrderedCallback.Priority[] PRIORITY_VALUES =
-        OrderedCallback.Priority.values();
-
-    @Param({"5", "50", "500"})
-    int numUsedSubscribers;
-
-    @Param({"5", "5000"})
-    int numUnusedSubscribers;
-
-    Address<?>[] usedAddresses =
-        new Address<?>[] {
-          KnownAddresses.REQUEST_BODY_RAW,
-          KnownAddresses.REQUEST_COOKIES,
-          KnownAddresses.REQUEST_QUERY
-        };
+    @State(Scope.Benchmark)
+    public static class DispatcherState {
+        public static final OrderedCallback.Priority[] PRIORITY_VALUES = OrderedCallback.Priority.values();
 
-    Address<?> unusedAddress = KnownAddresses.HEADERS_NO_COOKIES;
+        @Param({"5", "50", "500"})
+        int numUsedSubscribers;
 
-    EventDispatcher dispatcher = new EventDispatcher();
+        @Param({"5", "5000"})
+        int numUnusedSubscribers;
 
-    @Setup
-    public void create() {
-      int iUsed = 0, iUnused = 0, iTotal = 0;
-      int usedAddressIdx = 0;
+        Address<?>[] usedAddresses = new Address<?>[] {
+            KnownAddresses.REQUEST_BODY_RAW, KnownAddresses.REQUEST_COOKIES, KnownAddresses.REQUEST_QUERY
+        };
 
-      EventDispatcher.DataSubscriptionSet subsSet = new EventDispatcher.DataSubscriptionSet();
-      while (iUsed < numUsedSubscribers || iUnused < numUnusedSubscribers) {
-        if (iUsed < numUsedSubscribers) {
-          iUsed++;
-          int i = iTotal++;
-          Address<?> usedAddress = usedAddresses[usedAddressIdx++ % usedAddresses.length];
-          doSubscribe(subsSet, usedAddress, i);
-        }
-        if (iUnused < numUnusedSubscribers) {
-          iUnused++;
-          int i = iTotal++;
-          doSubscribe(subsSet, unusedAddress, i);
+        Address<?> unusedAddress = KnownAddresses.HEADERS_NO_COOKIES;
+
+        EventDispatcher dispatcher = new EventDispatcher();
+
+        @Setup
+        public void create() {
+            int iUsed = 0, iUnused = 0, iTotal = 0;
+            int usedAddressIdx = 0;
+
+            EventDispatcher.DataSubscriptionSet subsSet = new EventDispatcher.DataSubscriptionSet();
+            while (iUsed < numUsedSubscribers || iUnused < numUnusedSubscribers) {
+                if (iUsed < numUsedSubscribers) {
+                    iUsed++;
+                    int i = iTotal++;
+                    Address<?> usedAddress = usedAddresses[usedAddressIdx++ % usedAddresses.length];
+                    doSubscribe(subsSet, usedAddress, i);
+                }
+                if (iUnused < numUnusedSubscribers) {
+                    iUnused++;
+                    int i = iTotal++;
+                    doSubscribe(subsSet, unusedAddress, i);
+                }
+            }
+
+            dispatcher.subscribeDataAvailable(subsSet);
         }
-      }
 
-      dispatcher.subscribeDataAvailable(subsSet);
-    }
+        private void doSubscribe(EventDispatcher.DataSubscriptionSet subsSet, Address<?> address, int i) {
+            final OrderedCallback.Priority priority = PRIORITY_VALUES[i % 4];
+            subsSet.addSubscription(Collections.singletonList(address), new DataListener() {
+                @Override
+                public void onDataAvailable(
+                        ChangeableFlow flow,
+                        AppSecRequestContext context,
+                        DataBundle dataBundle,
+                        GatewayContext gatewayContext) {}
+
+                @Override
+                public Priority getPriority() {
+                    return priority;
+                }
+            });
+        }
 
-    private void doSubscribe(
-        EventDispatcher.DataSubscriptionSet subsSet, Address<?> address, int i) {
-      final OrderedCallback.Priority priority = PRIORITY_VALUES[i % 4];
-      subsSet.addSubscription(
-          Collections.singletonList(address),
-          new DataListener() {
-            @Override
-            public void onDataAvailable(
-                ChangeableFlow flow,
-                AppSecRequestContext context,
-                DataBundle dataBundle,
-                GatewayContext gatewayContext) {}
-
-            @Override
-            public Priority getPriority() {
-              return priority;
-            }
-          });
+        void run() {
+            dispatcher.getDataSubscribers();
+        }
     }
 
-    void run() {
-      dispatcher.getDataSubscribers();
+    @Benchmark
+    public void getDataSubscribers(DispatcherState state) {
+        state.run();
     }
-  }
-
-  @Benchmark
-  public void getDataSubscribers(DispatcherState state) {
-    state.run();
-  }
 }
diff --git a/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/NumericConversionBenchmark.java b/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/NumericConversionBenchmark.java
index 9d4568ff74a..e577b1311db 100644
--- a/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/NumericConversionBenchmark.java
+++ b/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/NumericConversionBenchmark.java
@@ -37,185 +37,182 @@
 @Fork(value = 3)
 public class NumericConversionBenchmark {
 
-  static {
-    BenchmarkUtil.disableLogging();
-  }
-
-  private AppSecRequestContext context;
-  private TraceSegment mockTraceSegment;
-
-  @Setup(Level.Iteration)
-  public void setUp() {
-    context = new AppSecRequestContext();
-    // Use NoOp TraceSegment to minimize overhead
-    mockTraceSegment = TraceSegment.NoOp.INSTANCE;
-  }
-
-  @Benchmark
-  public void validInteger(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "42")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  @Benchmark
-  public void validIntegerNegative(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "-12345")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  @Benchmark
-  public void validIntegerWithSign(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "+999")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  @Benchmark
-  public void validDecimal(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "3.14")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  @Benchmark
-  public void validDecimalNegative(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "-99.5")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  @Benchmark
-  public void validLargeNumber(Blackhole blackhole) {
-    context.reportDerivatives(
-        singletonMap("test_attr", singletonMap("value", "9223372036854775807")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  // Invalid inputs - these should show the biggest improvement (no exceptions thrown)
-  @Benchmark
-  public void invalidAlphabetic(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "not_a_number")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  @Benchmark
-  public void invalidAlphanumeric(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "12x34")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  @Benchmark
-  public void invalidMultipleDecimals(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "3.14.15")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  @Benchmark
-  public void invalidHexFormat(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "0x10")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  @Benchmark
-  public void invalidScientific(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "1e10")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  @Benchmark
-  public void invalidSpecialChars(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "$100")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  // Whitespace handling - now works correctly after optimization (issue #10494)
-  @Benchmark
-  public void whitespaceLeading(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", " 42")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  @Benchmark
-  public void whitespaceTrailing(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "42 ")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  @Benchmark
-  public void whitespaceBoth(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", " 42 ")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  @Benchmark
-  public void whitespaceTabNewline(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "\t100\n")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  // Empty/null - fast rejection
-  @Benchmark
-  public void emptyString(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  @Benchmark
-  public void whitespaceOnly(Blackhole blackhole) {
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "   ")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  // Overflow cases - should handle gracefully without exceptions
-  @Benchmark
-  public void overflowLongMax(Blackhole blackhole) {
-    context.reportDerivatives(
-        singletonMap("test_attr", singletonMap("value", "9223372036854775808")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  @Benchmark
-  public void overflowVeryLarge(Blackhole blackhole) {
-    context.reportDerivatives(
-        singletonMap("test_attr", singletonMap("value", "99999999999999999999999")));
-    boolean result = context.commitDerivatives(mockTraceSegment);
-    blackhole.consume(result);
-  }
-
-  // Mixed workload - realistic scenario with 80% invalid, 20% valid
-  @Benchmark
-  public void mixedWorkload(Blackhole blackhole) {
-    // Invalid (80%)
-    context.reportDerivatives(singletonMap("attr1", singletonMap("value", "invalid")));
-    blackhole.consume(context.commitDerivatives(mockTraceSegment));
-
-    context.reportDerivatives(singletonMap("attr2", singletonMap("value", "abc123")));
-    blackhole.consume(context.commitDerivatives(mockTraceSegment));
-
-    context.reportDerivatives(singletonMap("attr3", singletonMap("value", "0x10")));
-    blackhole.consume(context.commitDerivatives(mockTraceSegment));
-
-    context.reportDerivatives(singletonMap("attr4", singletonMap("value", "")));
-    blackhole.consume(context.commitDerivatives(mockTraceSegment));
-
-    // Valid (20%)
-    context.reportDerivatives(singletonMap("attr5", singletonMap("value", "42")));
-    blackhole.consume(context.commitDerivatives(mockTraceSegment));
-  }
+    static {
+        BenchmarkUtil.disableLogging();
+    }
+
+    private AppSecRequestContext context;
+    private TraceSegment mockTraceSegment;
+
+    @Setup(Level.Iteration)
+    public void setUp() {
+        context = new AppSecRequestContext();
+        // Use NoOp TraceSegment to minimize overhead
+        mockTraceSegment = TraceSegment.NoOp.INSTANCE;
+    }
+
+    @Benchmark
+    public void validInteger(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "42")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    public void validIntegerNegative(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "-12345")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    public void validIntegerWithSign(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "+999")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    public void validDecimal(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "3.14")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    public void validDecimalNegative(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "-99.5")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    public void validLargeNumber(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "9223372036854775807")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    // Invalid inputs - these should show the biggest improvement (no exceptions thrown)
+    @Benchmark
+    public void invalidAlphabetic(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "not_a_number")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    public void invalidAlphanumeric(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "12x34")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    public void invalidMultipleDecimals(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "3.14.15")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    public void invalidHexFormat(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "0x10")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    public void invalidScientific(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "1e10")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    public void invalidSpecialChars(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "$100")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    // Whitespace handling - now works correctly after optimization (issue #10494)
+    @Benchmark
+    public void whitespaceLeading(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", " 42")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    public void whitespaceTrailing(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "42 ")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    public void whitespaceBoth(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", " 42 ")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    public void whitespaceTabNewline(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "\t100\n")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    // Empty/null - fast rejection
+    @Benchmark
+    public void emptyString(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    public void whitespaceOnly(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "   ")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    // Overflow cases - should handle gracefully without exceptions
+    @Benchmark
+    public void overflowLongMax(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "9223372036854775808")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    public void overflowVeryLarge(Blackhole blackhole) {
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "99999999999999999999999")));
+        boolean result = context.commitDerivatives(mockTraceSegment);
+        blackhole.consume(result);
+    }
+
+    // Mixed workload - realistic scenario with 80% invalid, 20% valid
+    @Benchmark
+    public void mixedWorkload(Blackhole blackhole) {
+        // Invalid (80%)
+        context.reportDerivatives(singletonMap("attr1", singletonMap("value", "invalid")));
+        blackhole.consume(context.commitDerivatives(mockTraceSegment));
+
+        context.reportDerivatives(singletonMap("attr2", singletonMap("value", "abc123")));
+        blackhole.consume(context.commitDerivatives(mockTraceSegment));
+
+        context.reportDerivatives(singletonMap("attr3", singletonMap("value", "0x10")));
+        blackhole.consume(context.commitDerivatives(mockTraceSegment));
+
+        context.reportDerivatives(singletonMap("attr4", singletonMap("value", "")));
+        blackhole.consume(context.commitDerivatives(mockTraceSegment));
+
+        // Valid (20%)
+        context.reportDerivatives(singletonMap("attr5", singletonMap("value", "42")));
+        blackhole.consume(context.commitDerivatives(mockTraceSegment));
+    }
 }
diff --git a/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/WafBenchmark.java b/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/WafBenchmark.java
index df43839203e..5a1d485d9c5 100644
--- a/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/WafBenchmark.java
+++ b/dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/WafBenchmark.java
@@ -41,92 +41,87 @@
 @OutputTimeUnit(MICROSECONDS)
 @Fork(value = 3)
 public class WafBenchmark {
-  private static final JsonAdapter<Map<String, Object>> ADAPTER =
-      new Moshi.Builder()
-          .build()
-          .adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
+    private static final JsonAdapter<Map<String, Object>> ADAPTER =
+            new Moshi.Builder().build().adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
 
-  static {
-    BenchmarkUtil.disableLogging();
-    BenchmarkUtil.initializeWaf();
-  }
+    static {
+        BenchmarkUtil.disableLogging();
+        BenchmarkUtil.initializeWaf();
+    }
 
-  WafBuilder wafBuilder;
-  WafHandle wafHandle;
-  WafContext wafContext;
-  Map<String, Object> wafData = new HashMap<>();
-  Waf.Limits limits = new Waf.Limits(50, 500, 1000, 5000000, 5000000);
+    WafBuilder wafBuilder;
+    WafHandle wafHandle;
+    WafContext wafContext;
+    Map<String, Object> wafData = new HashMap<>();
+    Waf.Limits limits = new Waf.Limits(50, 500, 1000, 5000000, 5000000);
 
-  @Benchmark
-  public void withMetrics() throws Exception {
-    WafMetrics metricsCollector = new WafMetrics();
-    wafContext = new WafContext(wafHandle);
-    try {
-      wafContext.run(wafData, limits, metricsCollector);
-    } finally {
-      wafContext.close();
+    @Benchmark
+    public void withMetrics() throws Exception {
+        WafMetrics metricsCollector = new WafMetrics();
+        wafContext = new WafContext(wafHandle);
+        try {
+            wafContext.run(wafData, limits, metricsCollector);
+        } finally {
+            wafContext.close();
+        }
     }
-  }
 
-  @Benchmark
-  public void withoutMetrics() throws Exception {
-    wafContext = new WafContext(wafHandle);
-    try {
-      wafContext.run(wafData, limits, null);
-    } finally {
-      wafContext.close();
+    @Benchmark
+    public void withoutMetrics() throws Exception {
+        wafContext = new WafContext(wafHandle);
+        try {
+            wafContext.run(wafData, limits, null);
+        } finally {
+            wafContext.close();
+        }
     }
-  }
-
-  @Setup(Level.Trial)
-  public void setUp() throws AbstractWafException, IOException {
-    wafBuilder = new WafBuilder();
-    InputStream stream = getClass().getClassLoader().getResourceAsStream("test_multi_config.json");
-    wafBuilder.addOrUpdateConfig("waf", ADAPTER.fromJson(Okio.buffer(Okio.source(stream))));
-    wafHandle = wafBuilder.buildWafHandleInstance();
-    wafData.put(KnownAddresses.REQUEST_METHOD.getKey(), "POST");
-    wafData.put(
-        KnownAddresses.REQUEST_URI_RAW.getKey(), "/foo/bar?foo=bar&foo=xpto&foo=%3cscript%3e");
-    Map<String, String> headers = new HashMap<>();
-    headers.put("host", "localhost:8080");
-    headers.put("connection", "keep-alive");
-    headers.put("accept-language", "pt,en-US;q=0.9,en;q=0.8");
-    headers.put("cache-control", "max-age=0");
-    headers.put("upgrade-insecure-requests", "1");
-    headers.put(
-        "accept",
-        "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8");
-    headers.put("dnt", "1");
-    headers.put("accept-encoding", "gzip, deflate, br");
-    wafData.put(KnownAddresses.RESPONSE_HEADERS_NO_COOKIES.getKey(), headers);
 
-    Map<String, List<String>> query = new HashMap<>();
-    List<String> fooValues = new ArrayList<>();
-    fooValues.add("bar");
-    fooValues.add("xpto");
-    fooValues.add("<script>");
-    query.put("foo", fooValues);
-    wafData.put(KnownAddresses.REQUEST_QUERY.getKey(), headers);
+    @Setup(Level.Trial)
+    public void setUp() throws AbstractWafException, IOException {
+        wafBuilder = new WafBuilder();
+        InputStream stream = getClass().getClassLoader().getResourceAsStream("test_multi_config.json");
+        wafBuilder.addOrUpdateConfig("waf", ADAPTER.fromJson(Okio.buffer(Okio.source(stream))));
+        wafHandle = wafBuilder.buildWafHandleInstance();
+        wafData.put(KnownAddresses.REQUEST_METHOD.getKey(), "POST");
+        wafData.put(KnownAddresses.REQUEST_URI_RAW.getKey(), "/foo/bar?foo=bar&foo=xpto&foo=%3cscript%3e");
+        Map<String, String> headers = new HashMap<>();
+        headers.put("host", "localhost:8080");
+        headers.put("connection", "keep-alive");
+        headers.put("accept-language", "pt,en-US;q=0.9,en;q=0.8");
+        headers.put("cache-control", "max-age=0");
+        headers.put("upgrade-insecure-requests", "1");
+        headers.put("accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8");
+        headers.put("dnt", "1");
+        headers.put("accept-encoding", "gzip, deflate, br");
+        wafData.put(KnownAddresses.RESPONSE_HEADERS_NO_COOKIES.getKey(), headers);
 
-    Map<String, List<String>> cookies = new HashMap<>();
-    cookies.put(
-        "color_mode",
-        Collections.singletonList(
-            "=%7B%22color_mode%22%3A%22light%22%2C%22light_theme%22%3A%7B%22name%22%3A%22light%22%2C%22color_mode%22%3A%22light%22%7D%2C%22dark_theme%22%3A%7B%22name%22%3A%22dark%22%2C%22color_mode%22%3A%22dark%22%7D%7D"));
-    cookies.put("tz", Collections.singletonList("Europe/Lisbon"));
-    wafData.put(KnownAddresses.REQUEST_COOKIES.getKey(), cookies);
-  }
+        Map<String, List<String>> query = new HashMap<>();
+        List<String> fooValues = new ArrayList<>();
+        fooValues.add("bar");
+        fooValues.add("xpto");
+        fooValues.add("<script>");
+        query.put("foo", fooValues);
+        wafData.put(KnownAddresses.REQUEST_QUERY.getKey(), headers);
 
-  @TearDown(Level.Trial)
-  public void teardown() {
-    if (wafHandle != null && wafHandle.isOnline()) {
-      wafHandle.close();
+        Map<String, List<String>> cookies = new HashMap<>();
+        cookies.put(
+                "color_mode",
+                Collections.singletonList(
+                        "=%7B%22color_mode%22%3A%22light%22%2C%22light_theme%22%3A%7B%22name%22%3A%22light%22%2C%22color_mode%22%3A%22light%22%7D%2C%22dark_theme%22%3A%7B%22name%22%3A%22dark%22%2C%22color_mode%22%3A%22dark%22%7D%7D"));
+        cookies.put("tz", Collections.singletonList("Europe/Lisbon"));
+        wafData.put(KnownAddresses.REQUEST_COOKIES.getKey(), cookies);
     }
-    if (wafContext != null && wafContext.isOnline()) {
-      wafContext.close();
-    }
-    if (wafBuilder != null && wafBuilder.isOnline()) {
-      wafBuilder.close();
+
+    @TearDown(Level.Trial)
+    public void teardown() {
+        if (wafHandle != null && wafHandle.isOnline()) {
+            wafHandle.close();
+        }
+        if (wafContext != null && wafContext.isOnline()) {
+            wafContext.close();
+        }
+        if (wafBuilder != null && wafBuilder.isOnline()) {
+            wafBuilder.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/AppSecModule.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/AppSecModule.java
index ab458b3442c..875202abdea 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/AppSecModule.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/AppSecModule.java
@@ -7,46 +7,46 @@
 import java.util.Collection;
 
 public interface AppSecModule {
-  void config(AppSecModuleConfigurer appSecConfigService) throws AppSecModuleActivationException;
+    void config(AppSecModuleConfigurer appSecConfigService) throws AppSecModuleActivationException;
 
-  void setWafBuilder(WafBuilder wafBuilder);
+    void setWafBuilder(WafBuilder wafBuilder);
 
-  void setRuleVersion(String rulesetVersion);
+    void setRuleVersion(String rulesetVersion);
 
-  String getName();
+    String getName();
 
-  String getInfo();
+    String getInfo();
 
-  Collection<DataSubscription> getDataSubscriptions();
+    Collection<DataSubscription> getDataSubscriptions();
 
-  boolean isWafBuilderSet();
+    boolean isWafBuilderSet();
 
-  abstract class DataSubscription implements DataListener {
-    private final Collection<Address<?>> subscribedAddresses;
-    private final Priority priority;
+    abstract class DataSubscription implements DataListener {
+        private final Collection<Address<?>> subscribedAddresses;
+        private final Priority priority;
 
-    protected DataSubscription(Collection<Address<?>> subscribedAddresses, Priority priority) {
-      this.subscribedAddresses = subscribedAddresses;
-      this.priority = priority;
-    }
+        protected DataSubscription(Collection<Address<?>> subscribedAddresses, Priority priority) {
+            this.subscribedAddresses = subscribedAddresses;
+            this.priority = priority;
+        }
 
-    @Override
-    public Priority getPriority() {
-      return priority;
-    }
+        @Override
+        public Priority getPriority() {
+            return priority;
+        }
 
-    public Collection<Address<?>> getSubscribedAddresses() {
-      return subscribedAddresses;
+        public Collection<Address<?>> getSubscribedAddresses() {
+            return subscribedAddresses;
+        }
     }
-  }
 
-  class AppSecModuleActivationException extends Exception {
-    public AppSecModuleActivationException(String message) {
-      super(message);
-    }
+    class AppSecModuleActivationException extends Exception {
+        public AppSecModuleActivationException(String message) {
+            super(message);
+        }
 
-    public AppSecModuleActivationException(String message, Throwable cause) {
-      super(message, cause);
+        public AppSecModuleActivationException(String message, Throwable cause) {
+            super(message, cause);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/AppSecSystem.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/AppSecSystem.java
index d7d780123ea..28a602b33d9 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/AppSecSystem.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/AppSecSystem.java
@@ -36,215 +36,210 @@
 
 public class AppSecSystem {
 
-  private static final Logger log = LoggerFactory.getLogger(AppSecSystem.class);
-  private static final AtomicBoolean STARTED = new AtomicBoolean();
-  private static final Map<AppSecModule, String> STARTED_MODULES_INFO = new HashMap<>();
-  private static AppSecConfigServiceImpl APP_SEC_CONFIG_SERVICE;
-  private static ReplaceableEventProducerService REPLACEABLE_EVENT_PRODUCER; // testing
-  private static Runnable STOP_SUBSCRIPTION_SERVICE;
-  private static Runnable RESET_SUBSCRIPTION_SERVICE;
-  private static volatile GatewayBridge GATEWAY_BRIDGE;
-  private static final AtomicBoolean API_SECURITY_INITIALIZED = new AtomicBoolean(false);
-  private static volatile ApiSecuritySampler API_SECURITY_SAMPLER = new ApiSecuritySampler.NoOp();
-
-  public static void start(SubscriptionService gw, SharedCommunicationObjects sco) {
-    try {
-      doStart(gw, sco);
-    } catch (AbortStartupException ase) {
-      throw ase;
-    } catch (RuntimeException | Error e) {
-      StandardizedLogging.appSecStartupError(log, e);
-      setActive(false);
-      throw new AbortStartupException(e);
-    }
-  }
-
-  private static void doStart(SubscriptionService gw, SharedCommunicationObjects sco) {
-    final Config config = Config.get();
-    ProductActivation appSecEnabledConfig = config.getAppSecActivation();
-    if (appSecEnabledConfig == ProductActivation.FULLY_DISABLED) {
-      log.debug("AppSec: disabled");
-      return;
-    }
-    log.debug("AppSec is starting ({})", appSecEnabledConfig);
-
-    REPLACEABLE_EVENT_PRODUCER = new ReplaceableEventProducerService();
-    EventDispatcher eventDispatcher = new EventDispatcher();
-    REPLACEABLE_EVENT_PRODUCER.replaceEventProducerService(eventDispatcher);
-
-    ConfigurationPoller configurationPoller = sco.configurationPoller(config);
-    // may throw and abort startup
-    APP_SEC_CONFIG_SERVICE =
-        new AppSecConfigServiceImpl(
-            config, configurationPoller, () -> reloadSubscriptions(REPLACEABLE_EVENT_PRODUCER));
-    if (appSecEnabledConfig == ProductActivation.FULLY_ENABLED) {
-      APP_SEC_CONFIG_SERVICE.init();
+    private static final Logger log = LoggerFactory.getLogger(AppSecSystem.class);
+    private static final AtomicBoolean STARTED = new AtomicBoolean();
+    private static final Map<AppSecModule, String> STARTED_MODULES_INFO = new HashMap<>();
+    private static AppSecConfigServiceImpl APP_SEC_CONFIG_SERVICE;
+    private static ReplaceableEventProducerService REPLACEABLE_EVENT_PRODUCER; // testing
+    private static Runnable STOP_SUBSCRIPTION_SERVICE;
+    private static Runnable RESET_SUBSCRIPTION_SERVICE;
+    private static volatile GatewayBridge GATEWAY_BRIDGE;
+    private static final AtomicBoolean API_SECURITY_INITIALIZED = new AtomicBoolean(false);
+    private static volatile ApiSecuritySampler API_SECURITY_SAMPLER = new ApiSecuritySampler.NoOp();
+
+    public static void start(SubscriptionService gw, SharedCommunicationObjects sco) {
+        try {
+            doStart(gw, sco);
+        } catch (AbortStartupException ase) {
+            throw ase;
+        } catch (RuntimeException | Error e) {
+            StandardizedLogging.appSecStartupError(log, e);
+            setActive(false);
+            throw new AbortStartupException(e);
+        }
     }
-    sco.createRemaining(config);
 
-    GatewayBridge gatewayBridge =
-        new GatewayBridge(
-            gw,
-            REPLACEABLE_EVENT_PRODUCER,
-            () -> API_SECURITY_SAMPLER,
-            APP_SEC_CONFIG_SERVICE.getTraceSegmentPostProcessors());
+    private static void doStart(SubscriptionService gw, SharedCommunicationObjects sco) {
+        final Config config = Config.get();
+        ProductActivation appSecEnabledConfig = config.getAppSecActivation();
+        if (appSecEnabledConfig == ProductActivation.FULLY_DISABLED) {
+            log.debug("AppSec: disabled");
+            return;
+        }
+        log.debug("AppSec is starting ({})", appSecEnabledConfig);
+
+        REPLACEABLE_EVENT_PRODUCER = new ReplaceableEventProducerService();
+        EventDispatcher eventDispatcher = new EventDispatcher();
+        REPLACEABLE_EVENT_PRODUCER.replaceEventProducerService(eventDispatcher);
+
+        ConfigurationPoller configurationPoller = sco.configurationPoller(config);
+        // may throw and abort startup
+        APP_SEC_CONFIG_SERVICE = new AppSecConfigServiceImpl(
+                config, configurationPoller, () -> reloadSubscriptions(REPLACEABLE_EVENT_PRODUCER));
+        if (appSecEnabledConfig == ProductActivation.FULLY_ENABLED) {
+            APP_SEC_CONFIG_SERVICE.init();
+        }
+        sco.createRemaining(config);
+
+        GatewayBridge gatewayBridge = new GatewayBridge(
+                gw,
+                REPLACEABLE_EVENT_PRODUCER,
+                () -> API_SECURITY_SAMPLER,
+                APP_SEC_CONFIG_SERVICE.getTraceSegmentPostProcessors());
 
-    loadModules(
-        eventDispatcher, sco.monitoring, appSecEnabledConfig == ProductActivation.FULLY_ENABLED);
+        loadModules(eventDispatcher, sco.monitoring, appSecEnabledConfig == ProductActivation.FULLY_ENABLED);
 
-    gatewayBridge.init();
-    GATEWAY_BRIDGE = gatewayBridge;
-    STOP_SUBSCRIPTION_SERVICE = gatewayBridge::stop;
-    RESET_SUBSCRIPTION_SERVICE = gatewayBridge::reset;
+        gatewayBridge.init();
+        GATEWAY_BRIDGE = gatewayBridge;
+        STOP_SUBSCRIPTION_SERVICE = gatewayBridge::stop;
+        RESET_SUBSCRIPTION_SERVICE = gatewayBridge::reset;
 
-    setActive(appSecEnabledConfig == ProductActivation.FULLY_ENABLED);
+        setActive(appSecEnabledConfig == ProductActivation.FULLY_ENABLED);
 
-    APP_SEC_CONFIG_SERVICE.maybeSubscribeConfigPolling();
+        APP_SEC_CONFIG_SERVICE.maybeSubscribeConfigPolling();
 
-    Blocking.setBlockingService(new BlockingServiceImpl(REPLACEABLE_EVENT_PRODUCER));
+        Blocking.setBlockingService(new BlockingServiceImpl(REPLACEABLE_EVENT_PRODUCER));
 
-    STARTED.set(true);
+        STARTED.set(true);
 
-    String startedAppSecModules = String.join(", ", STARTED_MODULES_INFO.values());
-    if (appSecEnabledConfig == ProductActivation.FULLY_ENABLED) {
-      log.info("AppSec is {} with {}", appSecEnabledConfig, startedAppSecModules);
-    } else {
-      log.debug("AppSec is {} with {}", appSecEnabledConfig, startedAppSecModules);
+        String startedAppSecModules = String.join(", ", STARTED_MODULES_INFO.values());
+        if (appSecEnabledConfig == ProductActivation.FULLY_ENABLED) {
+            log.info("AppSec is {} with {}", appSecEnabledConfig, startedAppSecModules);
+        } else {
+            log.debug("AppSec is {} with {}", appSecEnabledConfig, startedAppSecModules);
+        }
     }
-  }
-
-  public static boolean isActive() {
-    return ActiveSubsystems.APPSEC_ACTIVE;
-  }
-
-  public static void setActive(boolean status) {
-    ActiveSubsystems.APPSEC_ACTIVE = status;
-    // Report to the product change via telemetry
-    log.debug("AppSec is now {}", status ? "active" : "inactive");
-    ProductChangeCollector.get()
-        .update(new ProductChange().productType(ProductChange.ProductType.APPSEC).enabled(status));
-    if (status) {
-      maybeInitializeApiSecurity();
+
+    public static boolean isActive() {
+        return ActiveSubsystems.APPSEC_ACTIVE;
     }
-  }
 
-  public static void stop() {
-    if (!STARTED.getAndSet(false)) {
-      return;
+    public static void setActive(boolean status) {
+        ActiveSubsystems.APPSEC_ACTIVE = status;
+        // Report to the product change via telemetry
+        log.debug("AppSec is now {}", status ? "active" : "inactive");
+        ProductChangeCollector.get()
+                .update(new ProductChange()
+                        .productType(ProductChange.ProductType.APPSEC)
+                        .enabled(status));
+        if (status) {
+            maybeInitializeApiSecurity();
+        }
     }
-    REPLACEABLE_EVENT_PRODUCER = null;
-    final Runnable stop = STOP_SUBSCRIPTION_SERVICE;
-    if (stop != null) {
-      stop.run();
-      STOP_SUBSCRIPTION_SERVICE = null;
-      RESET_SUBSCRIPTION_SERVICE = null;
+
+    public static void stop() {
+        if (!STARTED.getAndSet(false)) {
+            return;
+        }
+        REPLACEABLE_EVENT_PRODUCER = null;
+        final Runnable stop = STOP_SUBSCRIPTION_SERVICE;
+        if (stop != null) {
+            stop.run();
+            STOP_SUBSCRIPTION_SERVICE = null;
+            RESET_SUBSCRIPTION_SERVICE = null;
+        }
+        GATEWAY_BRIDGE = null;
+        Blocking.setBlockingService(BlockingService.NOOP);
+        APP_SEC_CONFIG_SERVICE.close();
     }
-    GATEWAY_BRIDGE = null;
-    Blocking.setBlockingService(BlockingService.NOOP);
-    APP_SEC_CONFIG_SERVICE.close();
-  }
-
-  private static void loadModules(
-      EventDispatcher eventDispatcher, Monitoring monitoring, boolean appSecEnabledConfig) {
-    EventDispatcher.DataSubscriptionSet dataSubscriptionSet =
-        new EventDispatcher.DataSubscriptionSet();
-
-    final List<AppSecModule> modules = Collections.singletonList(new WAFModule(monitoring));
-    APP_SEC_CONFIG_SERVICE.modulesToUpdateVersionIn(modules);
-    for (AppSecModule module : modules) {
-      log.debug("Starting appsec module {}", module.getName());
-      try {
-        AppSecConfigService.TransactionalAppSecModuleConfigurer cfgObject =
-            APP_SEC_CONFIG_SERVICE.createAppSecModuleConfigurer();
-        module.setRuleVersion(APP_SEC_CONFIG_SERVICE.getCurrentRuleVersion());
-        if (appSecEnabledConfig) {
-          module.setWafBuilder(APP_SEC_CONFIG_SERVICE.getWafBuilder());
+
+    private static void loadModules(
+            EventDispatcher eventDispatcher, Monitoring monitoring, boolean appSecEnabledConfig) {
+        EventDispatcher.DataSubscriptionSet dataSubscriptionSet = new EventDispatcher.DataSubscriptionSet();
+
+        final List<AppSecModule> modules = Collections.singletonList(new WAFModule(monitoring));
+        APP_SEC_CONFIG_SERVICE.modulesToUpdateVersionIn(modules);
+        for (AppSecModule module : modules) {
+            log.debug("Starting appsec module {}", module.getName());
+            try {
+                AppSecConfigService.TransactionalAppSecModuleConfigurer cfgObject =
+                        APP_SEC_CONFIG_SERVICE.createAppSecModuleConfigurer();
+                module.setRuleVersion(APP_SEC_CONFIG_SERVICE.getCurrentRuleVersion());
+                if (appSecEnabledConfig) {
+                    module.setWafBuilder(APP_SEC_CONFIG_SERVICE.getWafBuilder());
+                }
+                module.config(cfgObject);
+                cfgObject.commit();
+            } catch (RuntimeException | AppSecModule.AppSecModuleActivationException t) {
+                log.error("Startup of appsec module {} failed", module.getName(), t);
+                continue;
+            }
+
+            for (AppSecModule.DataSubscription sub : module.getDataSubscriptions()) {
+                dataSubscriptionSet.addSubscription(sub.getSubscribedAddresses(), sub);
+            }
+
+            STARTED_MODULES_INFO.put(module, module.getInfo());
         }
-        module.config(cfgObject);
-        cfgObject.commit();
-      } catch (RuntimeException | AppSecModule.AppSecModuleActivationException t) {
-        log.error("Startup of appsec module {} failed", module.getName(), t);
-        continue;
-      }
-
-      for (AppSecModule.DataSubscription sub : module.getDataSubscriptions()) {
-        dataSubscriptionSet.addSubscription(sub.getSubscribedAddresses(), sub);
-      }
-
-      STARTED_MODULES_INFO.put(module, module.getInfo());
+
+        eventDispatcher.subscribeDataAvailable(dataSubscriptionSet);
     }
 
-    eventDispatcher.subscribeDataAvailable(dataSubscriptionSet);
-  }
+    private static void reloadSubscriptions(ReplaceableEventProducerService replaceableEventProducerService) {
+        EventDispatcher.DataSubscriptionSet dataSubscriptionSet = new EventDispatcher.DataSubscriptionSet();
 
-  private static void reloadSubscriptions(
-      ReplaceableEventProducerService replaceableEventProducerService) {
-    EventDispatcher.DataSubscriptionSet dataSubscriptionSet =
-        new EventDispatcher.DataSubscriptionSet();
+        EventDispatcher newEd = new EventDispatcher();
+        for (AppSecModule module : STARTED_MODULES_INFO.keySet()) {
+            module.setRuleVersion(APP_SEC_CONFIG_SERVICE.getCurrentRuleVersion());
+            for (AppSecModule.DataSubscription sub : module.getDataSubscriptions()) {
+                dataSubscriptionSet.addSubscription(sub.getSubscribedAddresses(), sub);
+            }
+        }
 
-    EventDispatcher newEd = new EventDispatcher();
-    for (AppSecModule module : STARTED_MODULES_INFO.keySet()) {
-      module.setRuleVersion(APP_SEC_CONFIG_SERVICE.getCurrentRuleVersion());
-      for (AppSecModule.DataSubscription sub : module.getDataSubscriptions()) {
-        dataSubscriptionSet.addSubscription(sub.getSubscribedAddresses(), sub);
-      }
-    }
+        newEd.subscribeDataAvailable(dataSubscriptionSet);
+
+        replaceableEventProducerService.replaceEventProducerService(newEd);
+
+        // The new ruleset may require IG events that were not needed when the bridge was initialized,
+        // so the conditionally registered callbacks have to be re-evaluated against the new state.
+        // Kept in its own try/catch so a failure here cannot prevent the rest of the reload from
+        // completing.
+        final GatewayBridge gatewayBridge = GATEWAY_BRIDGE;
+        if (gatewayBridge != null) {
+            try {
+                gatewayBridge.registerAdditionalIGCallbacksIfNeeded(GatewayBridge.additionalIGEventTypes(
+                        replaceableEventProducerService.allSubscribedDataAddresses()));
+            } catch (RuntimeException e) {
+                log.warn("Error registering additional instrumentation gateway callbacks", e);
+            }
+        }
 
-    newEd.subscribeDataAvailable(dataSubscriptionSet);
-
-    replaceableEventProducerService.replaceEventProducerService(newEd);
-
-    // The new ruleset may require IG events that were not needed when the bridge was initialized,
-    // so the conditionally registered callbacks have to be re-evaluated against the new state.
-    // Kept in its own try/catch so a failure here cannot prevent the rest of the reload from
-    // completing.
-    final GatewayBridge gatewayBridge = GATEWAY_BRIDGE;
-    if (gatewayBridge != null) {
-      try {
-        gatewayBridge.registerAdditionalIGCallbacksIfNeeded(
-            GatewayBridge.additionalIGEventTypes(
-                replaceableEventProducerService.allSubscribedDataAddresses()));
-      } catch (RuntimeException e) {
-        log.warn("Error registering additional instrumentation gateway callbacks", e);
-      }
+        final Runnable reset = RESET_SUBSCRIPTION_SERVICE;
+        if (reset != null) {
+            reset.run();
+        }
     }
 
-    final Runnable reset = RESET_SUBSCRIPTION_SERVICE;
-    if (reset != null) {
-      reset.run();
+    private static void maybeInitializeApiSecurity() {
+        if (!Config.get().isApiSecurityEnabled()) {
+            return;
+        }
+        if (!ActiveSubsystems.APPSEC_ACTIVE) {
+            return;
+        }
+        // We initialize API Security the first time AppSec becomes active.
+        // We never de-initialize it, as that could lead to a leak of open WAF contexts in-flight.
+        if (API_SECURITY_INITIALIZED.compareAndSet(false, true)) {
+            if (SpanPostProcessor.Holder.INSTANCE == SpanPostProcessor.Holder.NOOP) {
+                ApiSecuritySampler requestSampler = new ApiSecuritySamplerImpl();
+                SpanPostProcessor.Holder.INSTANCE =
+                        new AppSecSpanPostProcessor(requestSampler, REPLACEABLE_EVENT_PRODUCER);
+                API_SECURITY_SAMPLER = requestSampler;
+            }
+        }
     }
-  }
 
-  private static void maybeInitializeApiSecurity() {
-    if (!Config.get().isApiSecurityEnabled()) {
-      return;
-    }
-    if (!ActiveSubsystems.APPSEC_ACTIVE) {
-      return;
+    public static boolean isStarted() {
+        return STARTED.get();
     }
-    // We initialize API Security the first time AppSec becomes active.
-    // We never de-initialize it, as that could lead to a leak of open WAF contexts in-flight.
-    if (API_SECURITY_INITIALIZED.compareAndSet(false, true)) {
-      if (SpanPostProcessor.Holder.INSTANCE == SpanPostProcessor.Holder.NOOP) {
-        ApiSecuritySampler requestSampler = new ApiSecuritySamplerImpl();
-        SpanPostProcessor.Holder.INSTANCE =
-            new AppSecSpanPostProcessor(requestSampler, REPLACEABLE_EVENT_PRODUCER);
-        API_SECURITY_SAMPLER = requestSampler;
-      }
-    }
-  }
-
-  public static boolean isStarted() {
-    return STARTED.get();
-  }
-
-  public static Set<String> getStartedModulesInfo() {
-    if (isStarted()) {
-      return STARTED_MODULES_INFO.keySet().stream()
-          .map(AppSecModule::getName)
-          .collect(Collectors.toSet());
-    } else {
-      return Collections.emptySet();
+
+    public static Set<String> getStartedModulesInfo() {
+        if (isStarted()) {
+            return STARTED_MODULES_INFO.keySet().stream()
+                    .map(AppSecModule::getName)
+                    .collect(Collectors.toSet());
+        } else {
+            return Collections.emptySet();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/ApiSecurityDownstreamSampler.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/ApiSecurityDownstreamSampler.java
index eece1eba06b..42a2c0c17a2 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/ApiSecurityDownstreamSampler.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/ApiSecurityDownstreamSampler.java
@@ -4,22 +4,22 @@
 
 public interface ApiSecurityDownstreamSampler {
 
-  boolean sampleHttpClientRequest(AppSecRequestContext ctx, long requestId);
+    boolean sampleHttpClientRequest(AppSecRequestContext ctx, long requestId);
 
-  boolean isSampled(AppSecRequestContext ctx, long requestId);
+    boolean isSampled(AppSecRequestContext ctx, long requestId);
 
-  class NoOp implements ApiSecurityDownstreamSampler {
+    class NoOp implements ApiSecurityDownstreamSampler {
 
-    public static final NoOp INSTANCE = new NoOp();
+        public static final NoOp INSTANCE = new NoOp();
 
-    @Override
-    public boolean sampleHttpClientRequest(AppSecRequestContext ctx, long requestId) {
-      return false;
-    }
+        @Override
+        public boolean sampleHttpClientRequest(AppSecRequestContext ctx, long requestId) {
+            return false;
+        }
 
-    @Override
-    public boolean isSampled(AppSecRequestContext ctx, long requestId) {
-      return false;
+        @Override
+        public boolean isSampled(AppSecRequestContext ctx, long requestId) {
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/ApiSecurityDownstreamSamplerImpl.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/ApiSecurityDownstreamSamplerImpl.java
index d6666ef8db1..d64900a2a0f 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/ApiSecurityDownstreamSamplerImpl.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/ApiSecurityDownstreamSamplerImpl.java
@@ -6,49 +6,49 @@
 
 public class ApiSecurityDownstreamSamplerImpl implements ApiSecurityDownstreamSampler {
 
-  private static final long KNUTH_FACTOR = 1111111111111111111L;
-  private final AtomicLong globalRequestCount;
-  private final double threshold;
-
-  public ApiSecurityDownstreamSamplerImpl() {
-    this(Config.get().getApiSecurityDownstreamRequestBodyAnalysisSampleRate());
-  }
-
-  public ApiSecurityDownstreamSamplerImpl(final double rate) {
-    threshold = samplingCutoff(rate < 0.0 ? 0 : (rate > 1.0 ? 1 : rate));
-    globalRequestCount = new AtomicLong(0);
-  }
-
-  private static double samplingCutoff(final double rate) {
-    final double max = Math.pow(2, 64) - 1;
-    if (rate < 0.5) {
-      return (long) (rate * max) + Long.MIN_VALUE;
+    private static final long KNUTH_FACTOR = 1111111111111111111L;
+    private final AtomicLong globalRequestCount;
+    private final double threshold;
+
+    public ApiSecurityDownstreamSamplerImpl() {
+        this(Config.get().getApiSecurityDownstreamRequestBodyAnalysisSampleRate());
     }
-    if (rate < 1.0) {
-      return (long) ((rate * max) + Long.MIN_VALUE);
+
+    public ApiSecurityDownstreamSamplerImpl(final double rate) {
+        threshold = samplingCutoff(rate < 0.0 ? 0 : (rate > 1.0 ? 1 : rate));
+        globalRequestCount = new AtomicLong(0);
     }
-    return Long.MAX_VALUE;
-  }
-
-  /**
-   * First sample the request to ensure we randomize the request and then check if the current
-   * server request has budget to analyze the downstream request.
-   */
-  @Override
-  public boolean sampleHttpClientRequest(final AppSecRequestContext ctx, final long requestId) {
-    final long counter = updateRequestCount();
-    if (counter * KNUTH_FACTOR + Long.MIN_VALUE > threshold) {
-      return false;
+
+    private static double samplingCutoff(final double rate) {
+        final double max = Math.pow(2, 64) - 1;
+        if (rate < 0.5) {
+            return (long) (rate * max) + Long.MIN_VALUE;
+        }
+        if (rate < 1.0) {
+            return (long) ((rate * max) + Long.MIN_VALUE);
+        }
+        return Long.MAX_VALUE;
     }
-    return ctx.sampleHttpClientRequest(requestId);
-  }
 
-  @Override
-  public boolean isSampled(final AppSecRequestContext ctx, final long requestId) {
-    return ctx.isHttpClientRequestSampled(requestId);
-  }
+    /**
+     * First sample the request to ensure we randomize the request and then check if the current
+     * server request has budget to analyze the downstream request.
+     */
+    @Override
+    public boolean sampleHttpClientRequest(final AppSecRequestContext ctx, final long requestId) {
+        final long counter = updateRequestCount();
+        if (counter * KNUTH_FACTOR + Long.MIN_VALUE > threshold) {
+            return false;
+        }
+        return ctx.sampleHttpClientRequest(requestId);
+    }
 
-  private long updateRequestCount() {
-    return globalRequestCount.updateAndGet(cur -> (cur == Long.MAX_VALUE) ? 0L : cur + 1L);
-  }
+    @Override
+    public boolean isSampled(final AppSecRequestContext ctx, final long requestId) {
+        return ctx.isHttpClientRequestSampled(requestId);
+    }
+
+    private long updateRequestCount() {
+        return globalRequestCount.updateAndGet(cur -> (cur == Long.MAX_VALUE) ? 0L : cur + 1L);
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/ApiSecuritySampler.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/ApiSecuritySampler.java
index 3ac6813fbd8..cf820fb9adc 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/ApiSecuritySampler.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/ApiSecuritySampler.java
@@ -4,35 +4,35 @@
 import javax.annotation.Nonnull;
 
 public interface ApiSecuritySampler {
-  /**
-   * Prepare a request context for later sampling decision. This method should be called at request
-   * end, and is thread-safe. If a request can potentially be sampled, this method will return true.
-   * If this method returns true, the caller MUST call {@link #releaseOne()} once the context is not
-   * needed anymore.
-   *
-   * @param ctx the request context
-   * @param framework the web framework handling the request, may be {@code null}
-   */
-  boolean preSampleRequest(final @Nonnull AppSecRequestContext ctx, final String framework);
+    /**
+     * Prepare a request context for later sampling decision. This method should be called at request
+     * end, and is thread-safe. If a request can potentially be sampled, this method will return true.
+     * If this method returns true, the caller MUST call {@link #releaseOne()} once the context is not
+     * needed anymore.
+     *
+     * @param ctx the request context
+     * @param framework the web framework handling the request, may be {@code null}
+     */
+    boolean preSampleRequest(final @Nonnull AppSecRequestContext ctx, final String framework);
 
-  /** Get the final sampling decision. This method is NOT required to be thread-safe. */
-  boolean sampleRequest(AppSecRequestContext ctx);
+    /** Get the final sampling decision. This method is NOT required to be thread-safe. */
+    boolean sampleRequest(AppSecRequestContext ctx);
 
-  /** Release one permit for the sampler. This must be called after processing a span. */
-  void releaseOne();
+    /** Release one permit for the sampler. This must be called after processing a span. */
+    void releaseOne();
 
-  final class NoOp implements ApiSecuritySampler {
-    @Override
-    public boolean preSampleRequest(@Nonnull AppSecRequestContext ctx, String framework) {
-      return false;
-    }
+    final class NoOp implements ApiSecuritySampler {
+        @Override
+        public boolean preSampleRequest(@Nonnull AppSecRequestContext ctx, String framework) {
+            return false;
+        }
 
-    @Override
-    public boolean sampleRequest(AppSecRequestContext ctx) {
-      return false;
-    }
+        @Override
+        public boolean sampleRequest(AppSecRequestContext ctx) {
+            return false;
+        }
 
-    @Override
-    public void releaseOne() {}
-  }
+        @Override
+        public void releaseOne() {}
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/ApiSecuritySamplerImpl.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/ApiSecuritySamplerImpl.java
index eec0baccbad..2892fa22ae5 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/ApiSecuritySamplerImpl.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/ApiSecuritySamplerImpl.java
@@ -17,206 +17,201 @@
 
 public class ApiSecuritySamplerImpl implements ApiSecuritySampler {
 
-  private static final Logger log = LoggerFactory.getLogger(ApiSecuritySamplerImpl.class);
-
-  /**
-   * A maximum number of request contexts we'll keep open past the end of request at any given time.
-   * This will avoid excessive memory usage in case of a high number of concurrent requests, and
-   * should also prevent memory leaks.
-   */
-  private static final int MAX_POST_PROCESSING_TASKS = 4;
-
-  /** Maximum number of entries in the access map. */
-  private static final int MAX_SIZE = 4096;
-
-  /** Mapping from endpoint hash to last access timestamp in millis. */
-  private final ConcurrentHashMap<Long, Long> accessMap;
-
-  /** Deque of endpoint hashes ordered by access time. Oldest is always first. */
-  private final Deque<Long> accessDeque;
-
-  private final long expirationTimeInMs;
-  private final int capacity;
-  private final TimeSource timeSource;
-  private final Semaphore counter = new Semaphore(MAX_POST_PROCESSING_TASKS);
-
-  public ApiSecuritySamplerImpl() {
-    this(
-        MAX_SIZE,
-        (long) (Config.get().getApiSecuritySampleDelay() * 1_000),
-        SystemTimeSource.INSTANCE);
-  }
-
-  public ApiSecuritySamplerImpl(
-      int capacity, long expirationTimeInMs, @Nonnull TimeSource timeSource) {
-    this.capacity = capacity;
-    this.expirationTimeInMs = expirationTimeInMs;
-    this.accessMap = new ConcurrentHashMap<>();
-    this.accessDeque = new ConcurrentLinkedDeque<>();
-    this.timeSource = timeSource;
-  }
-
-  @Override
-  public boolean preSampleRequest(final @Nonnull AppSecRequestContext ctx, final String framework) {
-    String route = ctx.getRoute();
-
-    // If route is absent, use http.endpoint as fallback (RFC-1076)
-    if (route == null) {
-      // Don't sample blocked requests - they represent attacks, not valid API endpoints
-      if (ctx.isWafBlocked()) {
-        return false;
-      }
-      final int statusCode = ctx.getResponseStatus();
-      // Don't use endpoint for 404 responses as a failsafe
-      if (statusCode == 404) {
-        return false;
-      }
-      // Try to get or compute the endpoint
-      route = ctx.getOrComputeEndpoint();
-      if (route == null) {
-        WafMetricCollector.get().apiSecurityMissingRoute(framework);
-        return false;
-      }
-    }
+    private static final Logger log = LoggerFactory.getLogger(ApiSecuritySamplerImpl.class);
+
+    /**
+     * A maximum number of request contexts we'll keep open past the end of request at any given time.
+     * This will avoid excessive memory usage in case of a high number of concurrent requests, and
+     * should also prevent memory leaks.
+     */
+    private static final int MAX_POST_PROCESSING_TASKS = 4;
+
+    /** Maximum number of entries in the access map. */
+    private static final int MAX_SIZE = 4096;
+
+    /** Mapping from endpoint hash to last access timestamp in millis. */
+    private final ConcurrentHashMap<Long, Long> accessMap;
+
+    /** Deque of endpoint hashes ordered by access time. Oldest is always first. */
+    private final Deque<Long> accessDeque;
+
+    private final long expirationTimeInMs;
+    private final int capacity;
+    private final TimeSource timeSource;
+    private final Semaphore counter = new Semaphore(MAX_POST_PROCESSING_TASKS);
 
-    final String method = ctx.getMethod();
-    if (method == null) {
-      return false;
+    public ApiSecuritySamplerImpl() {
+        this(MAX_SIZE, (long) (Config.get().getApiSecuritySampleDelay() * 1_000), SystemTimeSource.INSTANCE);
     }
-    final int statusCode = ctx.getResponseStatus();
-    if (statusCode <= 0) {
-      return false;
+
+    public ApiSecuritySamplerImpl(int capacity, long expirationTimeInMs, @Nonnull TimeSource timeSource) {
+        this.capacity = capacity;
+        this.expirationTimeInMs = expirationTimeInMs;
+        this.accessMap = new ConcurrentHashMap<>();
+        this.accessDeque = new ConcurrentLinkedDeque<>();
+        this.timeSource = timeSource;
     }
-    long hash = computeApiHash(route, method, statusCode);
-    ctx.setApiSecurityEndpointHash(hash);
-    if (!isApiAccessExpired(hash)) {
-      return false;
+
+    @Override
+    public boolean preSampleRequest(final @Nonnull AppSecRequestContext ctx, final String framework) {
+        String route = ctx.getRoute();
+
+        // If route is absent, use http.endpoint as fallback (RFC-1076)
+        if (route == null) {
+            // Don't sample blocked requests - they represent attacks, not valid API endpoints
+            if (ctx.isWafBlocked()) {
+                return false;
+            }
+            final int statusCode = ctx.getResponseStatus();
+            // Don't use endpoint for 404 responses as a failsafe
+            if (statusCode == 404) {
+                return false;
+            }
+            // Try to get or compute the endpoint
+            route = ctx.getOrComputeEndpoint();
+            if (route == null) {
+                WafMetricCollector.get().apiSecurityMissingRoute(framework);
+                return false;
+            }
+        }
+
+        final String method = ctx.getMethod();
+        if (method == null) {
+            return false;
+        }
+        final int statusCode = ctx.getResponseStatus();
+        if (statusCode <= 0) {
+            return false;
+        }
+        long hash = computeApiHash(route, method, statusCode);
+        ctx.setApiSecurityEndpointHash(hash);
+        if (!isApiAccessExpired(hash)) {
+            return false;
+        }
+        if (counter.tryAcquire()) {
+            ctx.setApiSecurityFramework(framework);
+            ctx.setKeepOpenForApiSecurityPostProcessing(true);
+            if (!Config.get().isApmTracingEnabled()) {
+                boolean sampled = updateApiAccessIfExpired(hash);
+                if (sampled) {
+                    logSamplingDecision("preSampleRequest", hash);
+                }
+                return sampled;
+            }
+            logSamplingDecision("preSampleRequest", hash);
+            return true;
+        }
+        return false;
     }
-    if (counter.tryAcquire()) {
-      ctx.setApiSecurityFramework(framework);
-      ctx.setKeepOpenForApiSecurityPostProcessing(true);
-      if (!Config.get().isApmTracingEnabled()) {
-        boolean sampled = updateApiAccessIfExpired(hash);
+
+    /** Get the final sampling decision. This method is NOT thread-safe. */
+    @Override
+    public boolean sampleRequest(AppSecRequestContext ctx) {
+        if (ctx == null) {
+            return false;
+        }
+        final Long hash = ctx.getApiSecurityEndpointHash();
+        if (hash == null) {
+            // This should never happen, it should have been short-circuited before.
+            return false;
+        }
+        boolean sampled = Config.get().isApmTracingEnabled() ? updateApiAccessIfExpired(hash) : true;
         if (sampled) {
-          logSamplingDecision("preSampleRequest", hash);
+            logSamplingDecision("sampleRequest", hash);
         }
         return sampled;
-      }
-      logSamplingDecision("preSampleRequest", hash);
-      return true;
-    }
-    return false;
-  }
-
-  /** Get the final sampling decision. This method is NOT thread-safe. */
-  @Override
-  public boolean sampleRequest(AppSecRequestContext ctx) {
-    if (ctx == null) {
-      return false;
     }
-    final Long hash = ctx.getApiSecurityEndpointHash();
-    if (hash == null) {
-      // This should never happen, it should have been short-circuited before.
-      return false;
-    }
-    boolean sampled = Config.get().isApmTracingEnabled() ? updateApiAccessIfExpired(hash) : true;
-    if (sampled) {
-      logSamplingDecision("sampleRequest", hash);
+
+    @Override
+    public void releaseOne() {
+        counter.release();
     }
-    return sampled;
-  }
 
-  @Override
-  public void releaseOne() {
-    counter.release();
-  }
+    private boolean updateApiAccessIfExpired(final long hash) {
+        final long currentTime = timeSource.getCurrentTimeMillis();
 
-  private boolean updateApiAccessIfExpired(final long hash) {
-    final long currentTime = timeSource.getCurrentTimeMillis();
+        Long lastAccess = accessMap.get(hash);
+        if (lastAccess != null && currentTime - lastAccess < expirationTimeInMs) {
+            return false;
+        }
 
-    Long lastAccess = accessMap.get(hash);
-    if (lastAccess != null && currentTime - lastAccess < expirationTimeInMs) {
-      return false;
-    }
+        if (accessMap.put(hash, currentTime) == null) {
+            accessDeque.addLast(hash);
+            // If we added a new entry, we perform purging.
+            cleanupExpiredEntries(currentTime);
+        } else {
+            // This is now the most recently accessed entry.
+            accessDeque.remove(hash);
+            accessDeque.addLast(hash);
+        }
 
-    if (accessMap.put(hash, currentTime) == null) {
-      accessDeque.addLast(hash);
-      // If we added a new entry, we perform purging.
-      cleanupExpiredEntries(currentTime);
-    } else {
-      // This is now the most recently accessed entry.
-      accessDeque.remove(hash);
-      accessDeque.addLast(hash);
+        return true;
     }
 
-    return true;
-  }
-
-  private boolean isApiAccessExpired(final long hash) {
-    final long currentTime = timeSource.getCurrentTimeMillis();
-    final Long lastAccess = accessMap.get(hash);
-    return lastAccess == null || currentTime - lastAccess >= expirationTimeInMs;
-  }
-
-  private void cleanupExpiredEntries(final long currentTime) {
-    // Purge all expired entries.
-    while (!accessDeque.isEmpty()) {
-      final Long oldestHash = accessDeque.peekFirst();
-      if (oldestHash == null) {
-        // Should never happen
-        continue;
-      }
-
-      final Long lastAccessTime = accessMap.get(oldestHash);
-      if (lastAccessTime == null) {
-        // Should never  happen
-        continue;
-      }
-
-      if (currentTime - lastAccessTime < expirationTimeInMs) {
-        // The oldest hash is up-to-date, so stop here.
-        break;
-      }
-
-      accessDeque.pollFirst();
-      accessMap.remove(oldestHash);
+    private boolean isApiAccessExpired(final long hash) {
+        final long currentTime = timeSource.getCurrentTimeMillis();
+        final Long lastAccess = accessMap.get(hash);
+        return lastAccess == null || currentTime - lastAccess >= expirationTimeInMs;
     }
 
-    // If we went over capacity, remove the oldest entries until we are within the limit.
-    // This should never be more than 1.
-    final int toRemove = accessMap.size() - this.capacity;
-    for (int i = 0; i < toRemove; i++) {
-      Long oldestHash = accessDeque.pollFirst();
-      if (oldestHash != null) {
-        accessMap.remove(oldestHash);
-      }
+    private void cleanupExpiredEntries(final long currentTime) {
+        // Purge all expired entries.
+        while (!accessDeque.isEmpty()) {
+            final Long oldestHash = accessDeque.peekFirst();
+            if (oldestHash == null) {
+                // Should never happen
+                continue;
+            }
+
+            final Long lastAccessTime = accessMap.get(oldestHash);
+            if (lastAccessTime == null) {
+                // Should never  happen
+                continue;
+            }
+
+            if (currentTime - lastAccessTime < expirationTimeInMs) {
+                // The oldest hash is up-to-date, so stop here.
+                break;
+            }
+
+            accessDeque.pollFirst();
+            accessMap.remove(oldestHash);
+        }
+
+        // If we went over capacity, remove the oldest entries until we are within the limit.
+        // This should never be more than 1.
+        final int toRemove = accessMap.size() - this.capacity;
+        for (int i = 0; i < toRemove; i++) {
+            Long oldestHash = accessDeque.pollFirst();
+            if (oldestHash != null) {
+                accessMap.remove(oldestHash);
+            }
+        }
     }
-  }
-
-  private long computeApiHash(final String route, final String method, final int statusCode) {
-    long result = 17;
-    result = 31 * result + route.hashCode();
-    result = 31 * result + method.hashCode();
-    result = 31 * result + statusCode;
-    return result;
-  }
-
-  private void logSamplingDecision(final String method, final long hash) {
-    if (!log.isDebugEnabled()) {
-      return;
+
+    private long computeApiHash(final String route, final String method, final int statusCode) {
+        long result = 17;
+        result = 31 * result + route.hashCode();
+        result = 31 * result + method.hashCode();
+        result = 31 * result + statusCode;
+        return result;
     }
-    AgentSpan activeSpan = AgentTracer.get().activeSpan();
-
-    if (activeSpan != null) {
-      log.debug(
-          "API security sampling decision in {}: hash={}, traceId={}, spanId={}",
-          method,
-          hash,
-          activeSpan.getTraceId(),
-          activeSpan.getSpanId());
-    } else {
-      log.debug(
-          "API security sampling decision in {}: hash={}, traceId=null, spanId=null", method, hash);
+
+    private void logSamplingDecision(final String method, final long hash) {
+        if (!log.isDebugEnabled()) {
+            return;
+        }
+        AgentSpan activeSpan = AgentTracer.get().activeSpan();
+
+        if (activeSpan != null) {
+            log.debug(
+                    "API security sampling decision in {}: hash={}, traceId={}, spanId={}",
+                    method,
+                    hash,
+                    activeSpan.getTraceId(),
+                    activeSpan.getSpanId());
+        } else {
+            log.debug("API security sampling decision in {}: hash={}, traceId=null, spanId=null", method, hash);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/AppSecSpanPostProcessor.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/AppSecSpanPostProcessor.java
index b55df0f2e85..3209c6b70f6 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/AppSecSpanPostProcessor.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/AppSecSpanPostProcessor.java
@@ -21,81 +21,80 @@
 
 public class AppSecSpanPostProcessor implements SpanPostProcessor {
 
-  private static final Logger log = LoggerFactory.getLogger(AppSecSpanPostProcessor.class);
-  private static final String SCHEMA_DERIVATIVE_PREFIX = "_dd.appsec.s.";
-  private final ApiSecuritySampler sampler;
-  private final EventProducerService producerService;
+    private static final Logger log = LoggerFactory.getLogger(AppSecSpanPostProcessor.class);
+    private static final String SCHEMA_DERIVATIVE_PREFIX = "_dd.appsec.s.";
+    private final ApiSecuritySampler sampler;
+    private final EventProducerService producerService;
 
-  public AppSecSpanPostProcessor(ApiSecuritySampler sampler, EventProducerService producerService) {
-    this.sampler = sampler;
-    this.producerService = producerService;
-  }
-
-  @Override
-  public void process(@Nonnull AgentSpan span, @Nonnull BooleanSupplier timeoutCheck) {
-    final RequestContext ctx_ = span.getRequestContext();
-    if (ctx_ == null) {
-      return;
-    }
-    final AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return;
+    public AppSecSpanPostProcessor(ApiSecuritySampler sampler, EventProducerService producerService) {
+        this.sampler = sampler;
+        this.producerService = producerService;
     }
 
-    if (!ctx.isKeepOpenForApiSecurityPostProcessing()) {
-      return;
-    }
+    @Override
+    public void process(@Nonnull AgentSpan span, @Nonnull BooleanSupplier timeoutCheck) {
+        final RequestContext ctx_ = span.getRequestContext();
+        if (ctx_ == null) {
+            return;
+        }
+        final AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return;
+        }
 
-    try {
-      if (timeoutCheck.getAsBoolean()) {
-        log.debug("Timeout detected, skipping API security post-processing");
-        return;
-      }
-      if (!sampler.sampleRequest(ctx)) {
-        log.debug("Request not sampled, skipping API security post-processing");
-        return;
-      }
-      log.debug("Request sampled, processing API security post-processing");
-      extractSchemas(ctx, ctx_.getTraceSegment(), ctx.getApiSecurityFramework());
-    } finally {
-      ctx.setKeepOpenForApiSecurityPostProcessing(false);
-      try {
-        // XXX: Close the additive first. This is not strictly needed, but it'll prevent getting it
-        // detected as a
-        // missed request-ended event.
-        ctx.closeWafContext();
-        ctx.close();
-      } catch (Exception e) {
-        log.debug("Error closing AppSecRequestContext", e);
-      }
-      sampler.releaseOne();
-    }
-  }
+        if (!ctx.isKeepOpenForApiSecurityPostProcessing()) {
+            return;
+        }
 
-  private void extractSchemas(
-      final AppSecRequestContext ctx, final TraceSegment traceSegment, final String framework) {
-    final EventProducerService.DataSubscriberInfo sub =
-        producerService.getDataSubscribers(KnownAddresses.WAF_CONTEXT_PROCESSOR);
-    if (sub == null || sub.isEmpty()) {
-      log.debug("No subscribers for schema extraction");
-      return;
+        try {
+            if (timeoutCheck.getAsBoolean()) {
+                log.debug("Timeout detected, skipping API security post-processing");
+                return;
+            }
+            if (!sampler.sampleRequest(ctx)) {
+                log.debug("Request not sampled, skipping API security post-processing");
+                return;
+            }
+            log.debug("Request sampled, processing API security post-processing");
+            extractSchemas(ctx, ctx_.getTraceSegment(), ctx.getApiSecurityFramework());
+        } finally {
+            ctx.setKeepOpenForApiSecurityPostProcessing(false);
+            try {
+                // XXX: Close the additive first. This is not strictly needed, but it'll prevent getting it
+                // detected as a
+                // missed request-ended event.
+                ctx.closeWafContext();
+                ctx.close();
+            } catch (Exception e) {
+                log.debug("Error closing AppSecRequestContext", e);
+            }
+            sampler.releaseOne();
+        }
     }
 
-    final DataBundle bundle =
-        new SingletonDataBundle<>(
-            KnownAddresses.WAF_CONTEXT_PROCESSOR, Collections.singletonMap("extract-schema", true));
-    try {
-      GatewayContext gwCtx = new GatewayContext(false);
-      producerService.publishDataEvent(sub, ctx, bundle, gwCtx);
-      // NOTE: must be checked before committing derivatives, as that clears the derivatives map
-      if (ctx.hasDerivativeKeyStartingWith(SCHEMA_DERIVATIVE_PREFIX)) {
-        WafMetricCollector.get().apiSecurityRequestSchema(framework);
-      } else {
-        WafMetricCollector.get().apiSecurityRequestNoSchema(framework);
-      }
-      ctx.commitDerivatives(traceSegment);
-    } catch (ExpiredSubscriberInfoException e) {
-      log.debug("Subscriber info expired", e);
+    private void extractSchemas(
+            final AppSecRequestContext ctx, final TraceSegment traceSegment, final String framework) {
+        final EventProducerService.DataSubscriberInfo sub =
+                producerService.getDataSubscribers(KnownAddresses.WAF_CONTEXT_PROCESSOR);
+        if (sub == null || sub.isEmpty()) {
+            log.debug("No subscribers for schema extraction");
+            return;
+        }
+
+        final DataBundle bundle = new SingletonDataBundle<>(
+                KnownAddresses.WAF_CONTEXT_PROCESSOR, Collections.singletonMap("extract-schema", true));
+        try {
+            GatewayContext gwCtx = new GatewayContext(false);
+            producerService.publishDataEvent(sub, ctx, bundle, gwCtx);
+            // NOTE: must be checked before committing derivatives, as that clears the derivatives map
+            if (ctx.hasDerivativeKeyStartingWith(SCHEMA_DERIVATIVE_PREFIX)) {
+                WafMetricCollector.get().apiSecurityRequestSchema(framework);
+            } else {
+                WafMetricCollector.get().apiSecurityRequestNoSchema(framework);
+            }
+            ctx.commitDerivatives(traceSegment);
+        } catch (ExpiredSubscriberInfoException e) {
+            log.debug("Subscriber info expired", e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/blocking/BlockingServiceImpl.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/blocking/BlockingServiceImpl.java
index 827e436b6c8..65559e0de82 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/blocking/BlockingServiceImpl.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/blocking/BlockingServiceImpl.java
@@ -22,104 +22,100 @@
 import org.slf4j.LoggerFactory;
 
 public class BlockingServiceImpl implements BlockingService {
-  private static final Logger log = LoggerFactory.getLogger(BlockingServiceImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(BlockingServiceImpl.class);
 
-  private final EventProducerService eventProducer;
-  private volatile EventProducerService.DataSubscriberInfo subInfo;
+    private final EventProducerService eventProducer;
+    private volatile EventProducerService.DataSubscriberInfo subInfo;
 
-  public BlockingServiceImpl(EventProducerService eventProducer) {
-    this.eventProducer = eventProducer;
-  }
-
-  @Override
-  public BlockingDetails shouldBlockUser(@Nonnull String userId) {
-    AppSecRequestContext reqCtx = getAppSecRequestContext();
-    if (reqCtx == null) {
-      log.debug("No request context to determine if user should be blocked");
-      return null;
+    public BlockingServiceImpl(EventProducerService eventProducer) {
+        this.eventProducer = eventProducer;
     }
 
-    Flow<Void> flow;
-    while (true) {
-      if (subInfo == null) {
-        subInfo = eventProducer.getDataSubscribers(KnownAddresses.USER_ID);
-      }
-      SingletonDataBundle<String> db = new SingletonDataBundle<>(KnownAddresses.USER_ID, userId);
-      try {
-        GatewayContext gwCtx = new GatewayContext(true);
-        flow = eventProducer.publishDataEvent(subInfo, reqCtx, db, gwCtx);
-        break;
-      } catch (ExpiredSubscriberInfoException e) {
-        subInfo = null;
-      }
-    }
+    @Override
+    public BlockingDetails shouldBlockUser(@Nonnull String userId) {
+        AppSecRequestContext reqCtx = getAppSecRequestContext();
+        if (reqCtx == null) {
+            log.debug("No request context to determine if user should be blocked");
+            return null;
+        }
 
-    Flow.Action action = flow.getAction();
-    log.debug("Result of checking if user should be blocked: action={}", action);
+        Flow<Void> flow;
+        while (true) {
+            if (subInfo == null) {
+                subInfo = eventProducer.getDataSubscribers(KnownAddresses.USER_ID);
+            }
+            SingletonDataBundle<String> db = new SingletonDataBundle<>(KnownAddresses.USER_ID, userId);
+            try {
+                GatewayContext gwCtx = new GatewayContext(true);
+                flow = eventProducer.publishDataEvent(subInfo, reqCtx, db, gwCtx);
+                break;
+            } catch (ExpiredSubscriberInfoException e) {
+                subInfo = null;
+            }
+        }
 
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      return new BlockingDetails(
-          rba.getStatusCode(), rba.getBlockingContentType(), rba.getExtraHeaders());
-    }
-    return null;
-  }
+        Flow.Action action = flow.getAction();
+        log.debug("Result of checking if user should be blocked: action={}", action);
 
-  @Override
-  public boolean tryCommitBlockingResponse(
-      int statusCode,
-      @Nonnull BlockingContentType templateType,
-      @Nonnull Map<String, String> extraHeaders) {
-    log.info(
-        "Will try to commit blocking response statusCode={} templateType={} extraHeaders={}",
-        statusCode,
-        templateType,
-        extraHeaders);
-    RequestContext reqCtx = getRequestContext();
-    if (reqCtx == null) {
-      return false;
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            return new BlockingDetails(rba.getStatusCode(), rba.getBlockingContentType(), rba.getExtraHeaders());
+        }
+        return null;
     }
 
-    BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-    if (blockResponseFunction == null) {
-      log.warn("Do not know how to commit blocking response for this server");
-      return false;
-    }
+    @Override
+    public boolean tryCommitBlockingResponse(
+            int statusCode, @Nonnull BlockingContentType templateType, @Nonnull Map<String, String> extraHeaders) {
+        log.info(
+                "Will try to commit blocking response statusCode={} templateType={} extraHeaders={}",
+                statusCode,
+                templateType,
+                extraHeaders);
+        RequestContext reqCtx = getRequestContext();
+        if (reqCtx == null) {
+            return false;
+        }
 
-    log.debug("About to call block response function: {}", blockResponseFunction);
-    boolean res =
-        blockResponseFunction.tryCommitBlockingResponse(
-            reqCtx.getTraceSegment(), statusCode, templateType, extraHeaders, null);
-    if (res) {
-      TraceSegment traceSegment = reqCtx.getTraceSegment();
-      if (traceSegment != null) {
-        traceSegment.effectivelyBlocked();
-      }
-    }
-    return res;
-  }
+        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+        if (blockResponseFunction == null) {
+            log.warn("Do not know how to commit blocking response for this server");
+            return false;
+        }
 
-  private static RequestContext getRequestContext() {
-    AgentSpan agentSpan = AgentTracer.get().activeSpan();
-    if (agentSpan == null) {
-      log.warn("Cannot block (no active span)");
-      return null;
+        log.debug("About to call block response function: {}", blockResponseFunction);
+        boolean res = blockResponseFunction.tryCommitBlockingResponse(
+                reqCtx.getTraceSegment(), statusCode, templateType, extraHeaders, null);
+        if (res) {
+            TraceSegment traceSegment = reqCtx.getTraceSegment();
+            if (traceSegment != null) {
+                traceSegment.effectivelyBlocked();
+            }
+        }
+        return res;
     }
 
-    return agentSpan.getRequestContext();
-  }
+    private static RequestContext getRequestContext() {
+        AgentSpan agentSpan = AgentTracer.get().activeSpan();
+        if (agentSpan == null) {
+            log.warn("Cannot block (no active span)");
+            return null;
+        }
 
-  private AppSecRequestContext getAppSecRequestContext() {
-    AppSecRequestContext ctx = null;
-    RequestContext reqCtx = getRequestContext();
-    if (reqCtx != null) {
-      ctx = reqCtx.getData(RequestContextSlot.APPSEC);
+        return agentSpan.getRequestContext();
     }
 
-    if (ctx == null) {
-      log.warn("No AppSec request context. Not an http request or AppSec inactive?");
-      return null;
+    private AppSecRequestContext getAppSecRequestContext() {
+        AppSecRequestContext ctx = null;
+        RequestContext reqCtx = getRequestContext();
+        if (reqCtx != null) {
+            ctx = reqCtx.getData(RequestContextSlot.APPSEC);
+        }
+
+        if (ctx == null) {
+            log.warn("No AppSec request context. Not an http request or AppSec inactive?");
+            return null;
+        }
+        return ctx;
     }
-    return ctx;
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigService.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigService.java
index c5f0688cddf..0656ce3bd2c 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigService.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigService.java
@@ -3,13 +3,13 @@
 import java.io.Closeable;
 
 public interface AppSecConfigService extends Closeable {
-  void init();
+    void init();
 
-  void close();
+    void close();
 
-  TransactionalAppSecModuleConfigurer createAppSecModuleConfigurer();
+    TransactionalAppSecModuleConfigurer createAppSecModuleConfigurer();
 
-  interface TransactionalAppSecModuleConfigurer extends AppSecModuleConfigurer {
-    void commit();
-  }
+    interface TransactionalAppSecModuleConfigurer extends AppSecModuleConfigurer {
+        void commit();
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java
index dc450baeff1..d1e295a7f3f 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java
@@ -75,564 +75,541 @@
 
 public class AppSecConfigServiceImpl implements AppSecConfigService {
 
-  private static final Logger log = LoggerFactory.getLogger(AppSecConfigServiceImpl.class);
-
-  private static final String DEFAULT_CONFIG_LOCATION = "default_config.json";
-
-  private final ConfigurationPoller configurationPoller;
-  private WafBuilder wafBuilder;
-
-  private final MergedAsmFeatures mergedAsmFeatures = new MergedAsmFeatures();
-
-  private final ConcurrentHashMap<String, SubconfigListener> subconfigListeners =
-      new ConcurrentHashMap<>();
-  private final Config tracerConfig;
-  private final List<TraceSegmentPostProcessor> traceSegmentPostProcessors = new ArrayList<>();
-  private final AppSecModuleConfigurer.Reconfiguration reconfiguration;
-
-  private final ConfigurationEndListener applyRemoteConfigListener =
-      this::applyRemoteConfigListener;
-  private final WAFInitializationResultReporter initReporter =
-      new WAFInitializationResultReporter();
-  private final WAFStatsReporter statsReporter = new WAFStatsReporter();
-
-  private static final JsonAdapter<Map<String, Object>> ADAPTER =
-      new Moshi.Builder()
-          .build()
-          .adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
-
-  @SuppressFBWarnings(
-      value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
-      justification =
-          "The variable is only read and written by the single configuration-poller thread.")
-  private boolean hasUserWafConfig;
-
-  @SuppressFBWarnings(
-      value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
-      justification =
-          "The variable is only read and written by the single configuration-poller thread.")
-  private boolean defaultConfigActivated;
-
-  private final AtomicBoolean subscribedToRulesAndData = new AtomicBoolean();
-  private final Set<String> usedDDWafConfigKeys =
-      Collections.newSetFromMap(new ConcurrentHashMap<>());
-  private final Set<String> ignoredConfigKeys =
-      Collections.newSetFromMap(new ConcurrentHashMap<>());
-  private final String DEFAULT_WAF_CONFIG_RULE = "ASM_DD/default";
-  private String currentRuleVersion;
-  private List<AppSecModule> modulesToUpdateVersionIn;
-
-  public AppSecConfigServiceImpl(
-      Config tracerConfig,
-      ConfigurationPoller configurationPoller,
-      AppSecModuleConfigurer.Reconfiguration reconfig) {
-    this.tracerConfig = tracerConfig;
-    this.configurationPoller = configurationPoller;
-    this.reconfiguration = reconfig;
-    traceSegmentPostProcessors.add(initReporter);
-    if (tracerConfig.isAppSecWafMetrics()) {
-      traceSegmentPostProcessors.add(statsReporter);
+    private static final Logger log = LoggerFactory.getLogger(AppSecConfigServiceImpl.class);
+
+    private static final String DEFAULT_CONFIG_LOCATION = "default_config.json";
+
+    private final ConfigurationPoller configurationPoller;
+    private WafBuilder wafBuilder;
+
+    private final MergedAsmFeatures mergedAsmFeatures = new MergedAsmFeatures();
+
+    private final ConcurrentHashMap<String, SubconfigListener> subconfigListeners = new ConcurrentHashMap<>();
+    private final Config tracerConfig;
+    private final List<TraceSegmentPostProcessor> traceSegmentPostProcessors = new ArrayList<>();
+    private final AppSecModuleConfigurer.Reconfiguration reconfiguration;
+
+    private final ConfigurationEndListener applyRemoteConfigListener = this::applyRemoteConfigListener;
+    private final WAFInitializationResultReporter initReporter = new WAFInitializationResultReporter();
+    private final WAFStatsReporter statsReporter = new WAFStatsReporter();
+
+    private static final JsonAdapter<Map<String, Object>> ADAPTER =
+            new Moshi.Builder().build().adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
+
+    @SuppressFBWarnings(
+            value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
+            justification = "The variable is only read and written by the single configuration-poller thread.")
+    private boolean hasUserWafConfig;
+
+    @SuppressFBWarnings(
+            value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
+            justification = "The variable is only read and written by the single configuration-poller thread.")
+    private boolean defaultConfigActivated;
+
+    private final AtomicBoolean subscribedToRulesAndData = new AtomicBoolean();
+    private final Set<String> usedDDWafConfigKeys = Collections.newSetFromMap(new ConcurrentHashMap<>());
+    private final Set<String> ignoredConfigKeys = Collections.newSetFromMap(new ConcurrentHashMap<>());
+    private final String DEFAULT_WAF_CONFIG_RULE = "ASM_DD/default";
+    private String currentRuleVersion;
+    private List<AppSecModule> modulesToUpdateVersionIn;
+
+    public AppSecConfigServiceImpl(
+            Config tracerConfig,
+            ConfigurationPoller configurationPoller,
+            AppSecModuleConfigurer.Reconfiguration reconfig) {
+        this.tracerConfig = tracerConfig;
+        this.configurationPoller = configurationPoller;
+        this.reconfiguration = reconfig;
+        traceSegmentPostProcessors.add(initReporter);
+        if (tracerConfig.isAppSecWafMetrics()) {
+            traceSegmentPostProcessors.add(statsReporter);
+        }
     }
-  }
 
-  private void subscribeConfigurationPoller() {
-    // see also close() method
-    subscribeAsmFeatures();
+    private void subscribeConfigurationPoller() {
+        // see also close() method
+        subscribeAsmFeatures();
 
-    if (!hasUserWafConfig) {
-      updateRulesAndDataSubscription();
-    } else {
-      log.debug("Will not subscribe to ASM, ASM_DD and ASM_DATA (AppSec custom rules in use)");
-    }
+        if (!hasUserWafConfig) {
+            updateRulesAndDataSubscription();
+        } else {
+            log.debug("Will not subscribe to ASM, ASM_DD and ASM_DATA (AppSec custom rules in use)");
+        }
 
-    this.configurationPoller.addConfigurationEndListener(applyRemoteConfigListener);
-  }
-
-  private long getRulesAndDataCapabilities() {
-    long capabilities =
-        CAPABILITY_ASM_DD_RULES
-            | CAPABILITY_ASM_DD_MULTICONFIG
-            | CAPABILITY_ASM_IP_BLOCKING
-            | CAPABILITY_ASM_EXCLUSIONS
-            | CAPABILITY_ASM_EXCLUSION_DATA
-            | CAPABILITY_ASM_REQUEST_BLOCKING
-            | CAPABILITY_ASM_USER_BLOCKING
-            | CAPABILITY_ASM_CUSTOM_RULES
-            | CAPABILITY_ASM_CUSTOM_BLOCKING_RESPONSE
-            | CAPABILITY_ASM_TRUSTED_IPS
-            | CAPABILITY_ASM_PROCESSOR_OVERRIDES
-            | CAPABILITY_ASM_CUSTOM_DATA_SCANNERS
-            | CAPABILITY_ENDPOINT_FINGERPRINT
-            | CAPABILITY_ASM_SESSION_FINGERPRINT
-            | CAPABILITY_ASM_NETWORK_FINGERPRINT
-            | CAPABILITY_ASM_HEADER_FINGERPRINT
-            | CAPABILITY_ASM_TRACE_TAGGING_RULES
-            | CAPABILITY_ASM_EXTENDED_DATA_COLLECTION;
-    if (tracerConfig.isAppSecRaspEnabled()) {
-      capabilities |= CAPABILITY_ASM_RASP_SQLI;
-      capabilities |= CAPABILITY_ASM_RASP_SSRF;
-      capabilities |= CAPABILITY_ASM_RASP_CMDI;
-      capabilities |= CAPABILITY_ASM_RASP_SHI;
-      // RASP LFI is only available in fully enabled mode as it's implemented using callsite
-      // instrumentation
-      if (tracerConfig.getAppSecActivation() == ProductActivation.FULLY_ENABLED) {
-        capabilities |= CAPABILITY_ASM_RASP_LFI;
-      }
+        this.configurationPoller.addConfigurationEndListener(applyRemoteConfigListener);
+    }
+
+    private long getRulesAndDataCapabilities() {
+        long capabilities = CAPABILITY_ASM_DD_RULES
+                | CAPABILITY_ASM_DD_MULTICONFIG
+                | CAPABILITY_ASM_IP_BLOCKING
+                | CAPABILITY_ASM_EXCLUSIONS
+                | CAPABILITY_ASM_EXCLUSION_DATA
+                | CAPABILITY_ASM_REQUEST_BLOCKING
+                | CAPABILITY_ASM_USER_BLOCKING
+                | CAPABILITY_ASM_CUSTOM_RULES
+                | CAPABILITY_ASM_CUSTOM_BLOCKING_RESPONSE
+                | CAPABILITY_ASM_TRUSTED_IPS
+                | CAPABILITY_ASM_PROCESSOR_OVERRIDES
+                | CAPABILITY_ASM_CUSTOM_DATA_SCANNERS
+                | CAPABILITY_ENDPOINT_FINGERPRINT
+                | CAPABILITY_ASM_SESSION_FINGERPRINT
+                | CAPABILITY_ASM_NETWORK_FINGERPRINT
+                | CAPABILITY_ASM_HEADER_FINGERPRINT
+                | CAPABILITY_ASM_TRACE_TAGGING_RULES
+                | CAPABILITY_ASM_EXTENDED_DATA_COLLECTION;
+        if (tracerConfig.isAppSecRaspEnabled()) {
+            capabilities |= CAPABILITY_ASM_RASP_SQLI;
+            capabilities |= CAPABILITY_ASM_RASP_SSRF;
+            capabilities |= CAPABILITY_ASM_RASP_CMDI;
+            capabilities |= CAPABILITY_ASM_RASP_SHI;
+            // RASP LFI is only available in fully enabled mode as it's implemented using callsite
+            // instrumentation
+            if (tracerConfig.getAppSecActivation() == ProductActivation.FULLY_ENABLED) {
+                capabilities |= CAPABILITY_ASM_RASP_LFI;
+            }
+        }
+        return capabilities;
     }
-    return capabilities;
-  }
 
-  private void updateRulesAndDataSubscription() {
-    if (hasUserWafConfig) {
-      return; // do nothing if the customer has custom rules
-    }
-    if (AppSecSystem.isActive()) {
-      subscribeRulesAndData();
-    } else {
-      unsubscribeRulesAndData();
+    private void updateRulesAndDataSubscription() {
+        if (hasUserWafConfig) {
+            return; // do nothing if the customer has custom rules
+        }
+        if (AppSecSystem.isActive()) {
+            subscribeRulesAndData();
+        } else {
+            unsubscribeRulesAndData();
+        }
     }
-  }
-
-  private void subscribeRulesAndData() {
-    if (subscribedToRulesAndData.compareAndSet(false, true)) {
-      this.configurationPoller.addListener(Product.ASM_DD, new AppSecConfigChangesDDListener());
-      this.configurationPoller.addListener(Product.ASM_DATA, new AppSecConfigChangesListener());
-      this.configurationPoller.addListener(Product.ASM, new AppSecConfigChangesListener());
-      this.configurationPoller.addCapabilities(getRulesAndDataCapabilities());
+
+    private void subscribeRulesAndData() {
+        if (subscribedToRulesAndData.compareAndSet(false, true)) {
+            this.configurationPoller.addListener(Product.ASM_DD, new AppSecConfigChangesDDListener());
+            this.configurationPoller.addListener(Product.ASM_DATA, new AppSecConfigChangesListener());
+            this.configurationPoller.addListener(Product.ASM, new AppSecConfigChangesListener());
+            this.configurationPoller.addCapabilities(getRulesAndDataCapabilities());
+        }
     }
-  }
-
-  private void unsubscribeRulesAndData() {
-    if (subscribedToRulesAndData.compareAndSet(true, false)) {
-      this.configurationPoller.removeListeners(Product.ASM_DD);
-      this.configurationPoller.removeListeners(Product.ASM_DATA);
-      this.configurationPoller.removeListeners(Product.ASM);
-      this.configurationPoller.removeCapabilities(getRulesAndDataCapabilities());
+
+    private void unsubscribeRulesAndData() {
+        if (subscribedToRulesAndData.compareAndSet(true, false)) {
+            this.configurationPoller.removeListeners(Product.ASM_DD);
+            this.configurationPoller.removeListeners(Product.ASM_DATA);
+            this.configurationPoller.removeListeners(Product.ASM);
+            this.configurationPoller.removeCapabilities(getRulesAndDataCapabilities());
+        }
     }
-  }
 
-  public void modulesToUpdateVersionIn(List<AppSecModule> modules) {
-    this.modulesToUpdateVersionIn = modules;
-  }
+    public void modulesToUpdateVersionIn(List<AppSecModule> modules) {
+        this.modulesToUpdateVersionIn = modules;
+    }
+
+    public String getCurrentRuleVersion() {
+        return currentRuleVersion;
+    }
+
+    private class AppSecConfigChangesListener implements ProductListener {
+        @Override
+        public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollingRateHinter)
+                throws IOException {
+            if (content == null) {
+                remove(configKey, pollingRateHinter);
+                return;
+            }
+            final String key = configKey.toString();
+            Map<String, Object> contentMap =
+                    (Map<String, Object>) ADAPTER.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
+            if (contentMap == null || contentMap.isEmpty()) {
+                ignoredConfigKeys.add(key);
+            } else {
+                ignoredConfigKeys.remove(key);
+                try {
+                    beforeApply(key, contentMap);
+                    maybeInitializeDefaultConfig();
+                    handleWafUpdateResultReport(key, contentMap);
+                } catch (AppSecModule.AppSecModuleActivationException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
 
-  public String getCurrentRuleVersion() {
-    return currentRuleVersion;
-  }
+        @Override
+        public void remove(ConfigKey configKey, PollingRateHinter pollingRateHinter) throws IOException {
+            final String key = configKey.toString();
+            if (ignoredConfigKeys.remove(key)) {
+                return;
+            }
+            try {
+                maybeInitializeDefaultConfig();
+                wafBuilder.removeConfig(key);
+                afterRemove(key);
+            } catch (UnclassifiedWafException e) {
+                throw new RuntimeException(e);
+            }
+        }
 
-  private class AppSecConfigChangesListener implements ProductListener {
-    @Override
-    public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollingRateHinter)
-        throws IOException {
-      if (content == null) {
-        remove(configKey, pollingRateHinter);
-        return;
-      }
-      final String key = configKey.toString();
-      Map<String, Object> contentMap =
-          (Map<String, Object>)
-              ADAPTER.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
-      if (contentMap == null || contentMap.isEmpty()) {
-        ignoredConfigKeys.add(key);
-      } else {
-        ignoredConfigKeys.remove(key);
-        try {
-          beforeApply(key, contentMap);
-          maybeInitializeDefaultConfig();
-          handleWafUpdateResultReport(key, contentMap);
-        } catch (AppSecModule.AppSecModuleActivationException e) {
-          throw new RuntimeException(e);
+        @Override
+        public void commit(PollingRateHinter pollingRateHinter) {
+            // no action needed
         }
-      }
-    }
 
-    @Override
-    public void remove(ConfigKey configKey, PollingRateHinter pollingRateHinter)
-        throws IOException {
-      final String key = configKey.toString();
-      if (ignoredConfigKeys.remove(key)) {
-        return;
-      }
-      try {
-        maybeInitializeDefaultConfig();
-        wafBuilder.removeConfig(key);
-        afterRemove(key);
-      } catch (UnclassifiedWafException e) {
-        throw new RuntimeException(e);
-      }
-    }
+        protected void beforeApply(final String key, final Map<String, Object> contentMap) {}
 
-    @Override
-    public void commit(PollingRateHinter pollingRateHinter) {
-      // no action needed
+        protected void afterRemove(final String key) {}
     }
 
-    protected void beforeApply(final String key, final Map<String, Object> contentMap) {}
+    private class AppSecConfigChangesDDListener extends AppSecConfigChangesListener {
+        @Override
+        protected void beforeApply(final String key, final Map<String, Object> config) {
+            if (defaultConfigActivated) { // if we get any config, remove the default one
+                log.debug("Removing default config ASM_DD/default");
+                try {
+                    wafBuilder.removeConfig(DEFAULT_WAF_CONFIG_RULE);
+                } catch (UnclassifiedWafException e) {
+                    throw new RuntimeException(e);
+                }
+                defaultConfigActivated = false;
+            }
+            usedDDWafConfigKeys.add(key);
+        }
 
-    protected void afterRemove(final String key) {}
-  }
+        @Override
+        protected void afterRemove(final String key) {
+            usedDDWafConfigKeys.remove(key);
+        }
+    }
 
-  private class AppSecConfigChangesDDListener extends AppSecConfigChangesListener {
-    @Override
-    protected void beforeApply(final String key, final Map<String, Object> config) {
-      if (defaultConfigActivated) { // if we get any config, remove the default one
-        log.debug("Removing default config ASM_DD/default");
+    private void handleWafUpdateResultReport(String configKey, Map<String, Object> rawConfig)
+            throws AppSecModule.AppSecModuleActivationException {
+        wafBuilder = getWafBuilder();
+        if (modulesToUpdateVersionIn != null
+                && !modulesToUpdateVersionIn.isEmpty()
+                && !modulesToUpdateVersionIn.stream().findFirst().get().isWafBuilderSet()) {
+            modulesToUpdateVersionIn.forEach(module -> module.setWafBuilder(wafBuilder));
+        }
         try {
-          wafBuilder.removeConfig(DEFAULT_WAF_CONFIG_RULE);
+            WafDiagnostics wafDiagnostics = wafBuilder.addOrUpdateConfig(configKey, rawConfig);
+            if (log.isInfoEnabled()) {
+                StandardizedLogging.numLoadedRules(log, configKey, countRules(rawConfig));
+            }
+
+            // TODO: Send diagnostics via telemetry
+
+            initReporter.setReportForPublication(wafDiagnostics);
+            if (wafDiagnostics.rulesetVersion != null
+                    && !wafDiagnostics.rulesetVersion.isEmpty()
+                    && !wafDiagnostics.rules.getLoaded().isEmpty()
+                    && (!defaultConfigActivated || currentRuleVersion == null)) {
+                currentRuleVersion = wafDiagnostics.rulesetVersion;
+                statsReporter.setRulesVersion(currentRuleVersion);
+                if (modulesToUpdateVersionIn != null) {
+                    modulesToUpdateVersionIn.forEach(module -> module.setRuleVersion(currentRuleVersion));
+                }
+            }
+        } catch (InvalidRuleSetException e) {
+            log.warn("Invalid rule during waf config update for config key {}: {}", configKey, e.wafDiagnostics);
+            if (e.wafDiagnostics.getNumConfigError() > 0) {
+                WafMetricCollector.get().addWafConfigError(e.wafDiagnostics.getNumConfigError());
+            }
+            // TODO: Propagate diagnostics back to remote config apply_error
+            if (e.wafDiagnostics.rulesetVersion != null
+                    && !e.wafDiagnostics.rulesetVersion.isEmpty()
+                    && (!defaultConfigActivated || currentRuleVersion == null)) {
+                currentRuleVersion = e.wafDiagnostics.rulesetVersion;
+                if (!e.wafDiagnostics.rules.getLoaded().isEmpty()) {
+                    statsReporter.setRulesVersion(currentRuleVersion);
+                }
+                if (modulesToUpdateVersionIn != null) {
+                    modulesToUpdateVersionIn.forEach(module -> module.setRuleVersion(currentRuleVersion));
+                }
+            }
+            initReporter.setReportForPublication(e.wafDiagnostics);
+            throw new RuntimeException(e);
         } catch (UnclassifiedWafException e) {
-          throw new RuntimeException(e);
+            log.debug("Error during waf config update for config key {}: {}", configKey, e.getMessage());
+            throw new RuntimeException(e);
         }
-        defaultConfigActivated = false;
-      }
-      usedDDWafConfigKeys.add(key);
     }
 
-    @Override
-    protected void afterRemove(final String key) {
-      usedDDWafConfigKeys.remove(key);
-    }
-  }
-
-  private void handleWafUpdateResultReport(String configKey, Map<String, Object> rawConfig)
-      throws AppSecModule.AppSecModuleActivationException {
-    wafBuilder = getWafBuilder();
-    if (modulesToUpdateVersionIn != null
-        && !modulesToUpdateVersionIn.isEmpty()
-        && !modulesToUpdateVersionIn.stream().findFirst().get().isWafBuilderSet()) {
-      modulesToUpdateVersionIn.forEach(module -> module.setWafBuilder(wafBuilder));
-    }
-    try {
-      WafDiagnostics wafDiagnostics = wafBuilder.addOrUpdateConfig(configKey, rawConfig);
-      if (log.isInfoEnabled()) {
-        StandardizedLogging.numLoadedRules(log, configKey, countRules(rawConfig));
-      }
-
-      // TODO: Send diagnostics via telemetry
-
-      initReporter.setReportForPublication(wafDiagnostics);
-      if (wafDiagnostics.rulesetVersion != null
-          && !wafDiagnostics.rulesetVersion.isEmpty()
-          && !wafDiagnostics.rules.getLoaded().isEmpty()
-          && (!defaultConfigActivated || currentRuleVersion == null)) {
-        currentRuleVersion = wafDiagnostics.rulesetVersion;
-        statsReporter.setRulesVersion(currentRuleVersion);
-        if (modulesToUpdateVersionIn != null) {
-          modulesToUpdateVersionIn.forEach(module -> module.setRuleVersion(currentRuleVersion));
-        }
-      }
-    } catch (InvalidRuleSetException e) {
-      log.warn(
-          "Invalid rule during waf config update for config key {}: {}",
-          configKey,
-          e.wafDiagnostics);
-      if (e.wafDiagnostics.getNumConfigError() > 0) {
-        WafMetricCollector.get().addWafConfigError(e.wafDiagnostics.getNumConfigError());
-      }
-      // TODO: Propagate diagnostics back to remote config apply_error
-      if (e.wafDiagnostics.rulesetVersion != null
-          && !e.wafDiagnostics.rulesetVersion.isEmpty()
-          && (!defaultConfigActivated || currentRuleVersion == null)) {
-        currentRuleVersion = e.wafDiagnostics.rulesetVersion;
-        if (!e.wafDiagnostics.rules.getLoaded().isEmpty()) {
-          statsReporter.setRulesVersion(currentRuleVersion);
-        }
-        if (modulesToUpdateVersionIn != null) {
-          modulesToUpdateVersionIn.forEach(module -> module.setRuleVersion(currentRuleVersion));
-        }
-      }
-      initReporter.setReportForPublication(e.wafDiagnostics);
-      throw new RuntimeException(e);
-    } catch (UnclassifiedWafException e) {
-      log.debug("Error during waf config update for config key {}: {}", configKey, e.getMessage());
-      throw new RuntimeException(e);
-    }
-  }
-
-  private void subscribeAsmFeatures() {
-    this.configurationPoller.addListener(
-        Product.ASM_FEATURES,
-        AppSecFeaturesDeserializer.INSTANCE,
-        (configKey, newConfig, hinter) -> {
-          if (newConfig == null) {
-            mergedAsmFeatures.removeConfig(configKey);
-          } else {
-            mergedAsmFeatures.addConfig(configKey, newConfig);
-          }
-        });
-    if (tracerConfig.getAppSecActivation() == ProductActivation.ENABLED_INACTIVE) {
-      this.configurationPoller.addCapabilities(CAPABILITY_ASM_ACTIVATION);
-    } else {
-      log.debug("Will not subscribe report CAPABILITY_ASM_ACTIVATION (AppSec explicitly enabled)");
-    }
-    this.configurationPoller.addCapabilities(CAPABILITY_ASM_AUTO_USER_INSTRUM_MODE);
-  }
-
-  private void distributeSubConfigurations(
-      String key, AppSecModuleConfigurer.Reconfiguration reconfiguration) {
-    maybeInitializeDefaultConfig();
-    for (Map.Entry<String, SubconfigListener> entry : subconfigListeners.entrySet()) {
-      SubconfigListener listener = entry.getValue();
-      try {
-        listener.onNewSubconfig(key, reconfiguration);
-        reconfiguration.reloadSubscriptions();
-      } catch (Exception rte) {
-        log.warn("Error updating configuration of app sec module listening on key {}", key, rte);
-      }
+    private void subscribeAsmFeatures() {
+        this.configurationPoller.addListener(
+                Product.ASM_FEATURES, AppSecFeaturesDeserializer.INSTANCE, (configKey, newConfig, hinter) -> {
+                    if (newConfig == null) {
+                        mergedAsmFeatures.removeConfig(configKey);
+                    } else {
+                        mergedAsmFeatures.addConfig(configKey, newConfig);
+                    }
+                });
+        if (tracerConfig.getAppSecActivation() == ProductActivation.ENABLED_INACTIVE) {
+            this.configurationPoller.addCapabilities(CAPABILITY_ASM_ACTIVATION);
+        } else {
+            log.debug("Will not subscribe report CAPABILITY_ASM_ACTIVATION (AppSec explicitly enabled)");
+        }
+        this.configurationPoller.addCapabilities(CAPABILITY_ASM_AUTO_USER_INSTRUM_MODE);
     }
-  }
 
-  private void maybeInitializeDefaultConfig() {
-    if (usedDDWafConfigKeys.isEmpty() && !hasUserWafConfig && !defaultConfigActivated) {
-      // no config left in the WAF builder, add the default config
-      init();
-    }
-  }
-
-  @Override
-  public void init() {
-    Map<String, Object> wafConfig;
-    hasUserWafConfig = false;
-    try {
-      wafConfig = loadUserWafConfig(tracerConfig);
-    } catch (Exception e) {
-      log.error("Error loading user-provided config", e);
-      throw new AbortStartupException("Error loading user-provided config", e);
-    }
-    if (wafConfig == null) {
-      try {
-        wafConfig = loadDefaultWafConfig();
-        defaultConfigActivated = true;
-      } catch (IOException e) {
-        log.error("Error loading default config", e);
-        throw new AbortStartupException("Error loading default config", e);
-      }
-    } else {
-      hasUserWafConfig = true;
+    private void distributeSubConfigurations(String key, AppSecModuleConfigurer.Reconfiguration reconfiguration) {
+        maybeInitializeDefaultConfig();
+        for (Map.Entry<String, SubconfigListener> entry : subconfigListeners.entrySet()) {
+            SubconfigListener listener = entry.getValue();
+            try {
+                listener.onNewSubconfig(key, reconfiguration);
+                reconfiguration.reloadSubscriptions();
+            } catch (Exception rte) {
+                log.warn("Error updating configuration of app sec module listening on key {}", key, rte);
+            }
+        }
     }
 
-    if (wafConfig.isEmpty()) {
-      throw new IllegalStateException("Expected default waf config to be available");
+    private void maybeInitializeDefaultConfig() {
+        if (usedDDWafConfigKeys.isEmpty() && !hasUserWafConfig && !defaultConfigActivated) {
+            // no config left in the WAF builder, add the default config
+            init();
+        }
     }
-    try {
-      handleWafUpdateResultReport(DEFAULT_WAF_CONFIG_RULE, wafConfig);
-    } catch (AppSecModule.AppSecModuleActivationException e) {
-      throw new RuntimeException(e);
+
+    @Override
+    public void init() {
+        Map<String, Object> wafConfig;
+        hasUserWafConfig = false;
+        try {
+            wafConfig = loadUserWafConfig(tracerConfig);
+        } catch (Exception e) {
+            log.error("Error loading user-provided config", e);
+            throw new AbortStartupException("Error loading user-provided config", e);
+        }
+        if (wafConfig == null) {
+            try {
+                wafConfig = loadDefaultWafConfig();
+                defaultConfigActivated = true;
+            } catch (IOException e) {
+                log.error("Error loading default config", e);
+                throw new AbortStartupException("Error loading default config", e);
+            }
+        } else {
+            hasUserWafConfig = true;
+        }
+
+        if (wafConfig.isEmpty()) {
+            throw new IllegalStateException("Expected default waf config to be available");
+        }
+        try {
+            handleWafUpdateResultReport(DEFAULT_WAF_CONFIG_RULE, wafConfig);
+        } catch (AppSecModule.AppSecModuleActivationException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  public void maybeSubscribeConfigPolling() {
-    final ProductActivation appSecActivation = tracerConfig.getAppSecActivation();
-    if (appSecActivation == ProductActivation.FULLY_DISABLED) {
-      return; // shouldn't happen but just in case.
+    public void maybeSubscribeConfigPolling() {
+        final ProductActivation appSecActivation = tracerConfig.getAppSecActivation();
+        if (appSecActivation == ProductActivation.FULLY_DISABLED) {
+            return; // shouldn't happen but just in case.
+        }
+        if (this.configurationPoller != null) {
+            if (hasUserWafConfig && appSecActivation == ProductActivation.FULLY_ENABLED) {
+                log.info("AppSec will not use remote config because "
+                        + "there is a custom user configuration and AppSec is explicitly enabled");
+            } else {
+                subscribeConfigurationPoller();
+            }
+        } else if (!tracerConfig.isAwsServerless()) {
+            log.info("Remote config is disabled; AppSec will not be able to use it");
+        }
     }
-    if (this.configurationPoller != null) {
-      if (hasUserWafConfig && appSecActivation == ProductActivation.FULLY_ENABLED) {
-        log.info(
-            "AppSec will not use remote config because "
-                + "there is a custom user configuration and AppSec is explicitly enabled");
-      } else {
-        subscribeConfigurationPoller();
-      }
-    } else if (!tracerConfig.isAwsServerless()) {
-      log.info("Remote config is disabled; AppSec will not be able to use it");
+
+    public List<TraceSegmentPostProcessor> getTraceSegmentPostProcessors() {
+        return traceSegmentPostProcessors;
     }
-  }
 
-  public List<TraceSegmentPostProcessor> getTraceSegmentPostProcessors() {
-    return traceSegmentPostProcessors;
-  }
+    public WafBuilder getWafBuilder() throws AppSecModule.AppSecModuleActivationException {
+        if (!WafInitialization.ONLINE) {
+            log.debug("In-app WAF initialization failed. See previous log entries");
+            throw new AppSecModule.AppSecModuleActivationException(
+                    "In-app WAF initialization failed. See previous log entries");
+        }
+        if (this.wafBuilder == null || !this.wafBuilder.isOnline()) {
+            this.wafBuilder = new WafBuilder(createWafConfig(Config.get()));
+        }
+        return this.wafBuilder;
+    }
+
+    /**
+     * Implementation of {@link AppSecModuleConfigurer} that solves two problems: - Avoids the
+     * submodules receiving configuration changes before their initial config is completed. - Avoid
+     * submodules being (partially) subscribed to configuration changes even if their initial config
+     * failed.
+     */
+    private class TransactionalAppSecModuleConfigurerImpl implements TransactionalAppSecModuleConfigurer {
+        private final Map<String, SubconfigListener> listenerMap = new HashMap<>();
+        private final List<TraceSegmentPostProcessor> postProcessors = new ArrayList<>();
+
+        @Override
+        public void addSubConfigListener(String key, SubconfigListener listener) {
+            listenerMap.put(key, listener);
+        }
 
-  public WafBuilder getWafBuilder() throws AppSecModule.AppSecModuleActivationException {
-    if (!WafInitialization.ONLINE) {
-      log.debug("In-app WAF initialization failed. See previous log entries");
-      throw new AppSecModule.AppSecModuleActivationException(
-          "In-app WAF initialization failed. See previous log entries");
-    }
-    if (this.wafBuilder == null || !this.wafBuilder.isOnline()) {
-      this.wafBuilder = new WafBuilder(createWafConfig(Config.get()));
-    }
-    return this.wafBuilder;
-  }
-
-  /**
-   * Implementation of {@link AppSecModuleConfigurer} that solves two problems: - Avoids the
-   * submodules receiving configuration changes before their initial config is completed. - Avoid
-   * submodules being (partially) subscribed to configuration changes even if their initial config
-   * failed.
-   */
-  private class TransactionalAppSecModuleConfigurerImpl
-      implements TransactionalAppSecModuleConfigurer {
-    private final Map<String, SubconfigListener> listenerMap = new HashMap<>();
-    private final List<TraceSegmentPostProcessor> postProcessors = new ArrayList<>();
+        @Override
+        public void addTraceSegmentPostProcessor(TraceSegmentPostProcessor interceptor) {
+            postProcessors.add(interceptor);
+        }
 
-    @Override
-    public void addSubConfigListener(String key, SubconfigListener listener) {
-      listenerMap.put(key, listener);
+        public void commit() {
+            AppSecConfigServiceImpl.this.subconfigListeners.putAll(listenerMap);
+            AppSecConfigServiceImpl.this.traceSegmentPostProcessors.addAll(postProcessors);
+        }
     }
 
     @Override
-    public void addTraceSegmentPostProcessor(TraceSegmentPostProcessor interceptor) {
-      postProcessors.add(interceptor);
+    public TransactionalAppSecModuleConfigurer createAppSecModuleConfigurer() {
+        return new TransactionalAppSecModuleConfigurerImpl();
     }
 
-    public void commit() {
-      AppSecConfigServiceImpl.this.subconfigListeners.putAll(listenerMap);
-      AppSecConfigServiceImpl.this.traceSegmentPostProcessors.addAll(postProcessors);
-    }
-  }
-
-  @Override
-  public TransactionalAppSecModuleConfigurer createAppSecModuleConfigurer() {
-    return new TransactionalAppSecModuleConfigurerImpl();
-  }
-
-  private static Map<String, Object> loadDefaultWafConfig() throws IOException {
-    log.debug("Loading default waf config");
-    try (InputStream is =
-        AppSecConfigServiceImpl.class
-            .getClassLoader()
-            .getResourceAsStream(DEFAULT_CONFIG_LOCATION)) {
-      if (is == null) {
-        throw new IOException("Resource " + DEFAULT_CONFIG_LOCATION + " not found");
-      }
-
-      Map<String, Object> ret = ADAPTER.fromJson(Okio.buffer(Okio.source(is)));
-
-      StandardizedLogging._initialConfigSourceAndLibddwafVersion(log, "<bundled config>");
-      if (log.isInfoEnabled()) {
-        StandardizedLogging.numLoadedRules(log, "<bundled config>", countRules(ret));
-      }
-      return ret;
-    }
-  }
+    private static Map<String, Object> loadDefaultWafConfig() throws IOException {
+        log.debug("Loading default waf config");
+        try (InputStream is =
+                AppSecConfigServiceImpl.class.getClassLoader().getResourceAsStream(DEFAULT_CONFIG_LOCATION)) {
+            if (is == null) {
+                throw new IOException("Resource " + DEFAULT_CONFIG_LOCATION + " not found");
+            }
 
-  private static Map<String, Object> loadUserWafConfig(Config tracerConfig) throws IOException {
-    log.debug("Loading user waf config");
-    String filename = tracerConfig.getAppSecRulesFile();
-    if (filename == null) {
-      return null;
-    }
-    try (InputStream is = new FileInputStream(filename)) {
-      Map<String, Object> ret = ADAPTER.fromJson(Okio.buffer(Okio.source(is)));
-
-      StandardizedLogging._initialConfigSourceAndLibddwafVersion(log, filename);
-      if (log.isInfoEnabled()) {
-        StandardizedLogging.numLoadedRules(log, filename, countRules(ret));
-      }
-
-      return ret;
-    } catch (FileNotFoundException fnfe) {
-      StandardizedLogging.rulesFileNotFound(log, filename);
-      throw fnfe;
-    } catch (IOException ioe) {
-      StandardizedLogging.rulesFileInvalid(log, filename, INVALID_JSON_FILE);
-      throw ioe;
+            Map<String, Object> ret = ADAPTER.fromJson(Okio.buffer(Okio.source(is)));
+
+            StandardizedLogging._initialConfigSourceAndLibddwafVersion(log, "<bundled config>");
+            if (log.isInfoEnabled()) {
+                StandardizedLogging.numLoadedRules(log, "<bundled config>", countRules(ret));
+            }
+            return ret;
+        }
     }
-  }
 
-  private static int countRules(Map<String, Object> config) {
-    return ((List<?>) config.getOrDefault("rules", Collections.emptyList())).size();
-  }
+    private static Map<String, Object> loadUserWafConfig(Config tracerConfig) throws IOException {
+        log.debug("Loading user waf config");
+        String filename = tracerConfig.getAppSecRulesFile();
+        if (filename == null) {
+            return null;
+        }
+        try (InputStream is = new FileInputStream(filename)) {
+            Map<String, Object> ret = ADAPTER.fromJson(Okio.buffer(Okio.source(is)));
+
+            StandardizedLogging._initialConfigSourceAndLibddwafVersion(log, filename);
+            if (log.isInfoEnabled()) {
+                StandardizedLogging.numLoadedRules(log, filename, countRules(ret));
+            }
+
+            return ret;
+        } catch (FileNotFoundException fnfe) {
+            StandardizedLogging.rulesFileNotFound(log, filename);
+            throw fnfe;
+        } catch (IOException ioe) {
+            StandardizedLogging.rulesFileInvalid(log, filename, INVALID_JSON_FILE);
+            throw ioe;
+        }
+    }
 
-  @Override
-  public void close() {
-    if (this.configurationPoller == null) {
-      return;
+    private static int countRules(Map<String, Object> config) {
+        return ((List<?>) config.getOrDefault("rules", Collections.emptyList())).size();
     }
-    this.configurationPoller.removeCapabilities(
-        CAPABILITY_ASM_ACTIVATION
-            | CAPABILITY_ASM_DD_RULES
-            | CAPABILITY_ASM_DD_MULTICONFIG
-            | CAPABILITY_ASM_IP_BLOCKING
-            | CAPABILITY_ASM_EXCLUSIONS
-            | CAPABILITY_ASM_EXCLUSION_DATA
-            | CAPABILITY_ASM_REQUEST_BLOCKING
-            | CAPABILITY_ASM_USER_BLOCKING
-            | CAPABILITY_ASM_CUSTOM_RULES
-            | CAPABILITY_ASM_CUSTOM_BLOCKING_RESPONSE
-            | CAPABILITY_ASM_TRUSTED_IPS
-            | CAPABILITY_ASM_PROCESSOR_OVERRIDES
-            | CAPABILITY_ASM_CUSTOM_DATA_SCANNERS
-            | CAPABILITY_ASM_RASP_SQLI
-            | CAPABILITY_ASM_RASP_SSRF
-            | CAPABILITY_ASM_RASP_LFI
-            | CAPABILITY_ASM_RASP_CMDI
-            | CAPABILITY_ASM_RASP_SHI
-            | CAPABILITY_ASM_AUTO_USER_INSTRUM_MODE
-            | CAPABILITY_ENDPOINT_FINGERPRINT
-            | CAPABILITY_ASM_SESSION_FINGERPRINT
-            | CAPABILITY_ASM_NETWORK_FINGERPRINT
-            | CAPABILITY_ASM_HEADER_FINGERPRINT
-            | CAPABILITY_ASM_TRACE_TAGGING_RULES
-            | CAPABILITY_ASM_EXTENDED_DATA_COLLECTION);
-    this.configurationPoller.removeListeners(Product.ASM_DD);
-    this.configurationPoller.removeListeners(Product.ASM_DATA);
-    this.configurationPoller.removeListeners(Product.ASM);
-    this.configurationPoller.removeListeners(Product.ASM_FEATURES);
-    this.configurationPoller.removeConfigurationEndListener(applyRemoteConfigListener);
-    this.subscribedToRulesAndData.set(false);
-    this.configurationPoller.stop();
-    if (this.wafBuilder != null) {
-      this.wafBuilder.close();
-      this.wafBuilder = null;
+
+    @Override
+    public void close() {
+        if (this.configurationPoller == null) {
+            return;
+        }
+        this.configurationPoller.removeCapabilities(CAPABILITY_ASM_ACTIVATION
+                | CAPABILITY_ASM_DD_RULES
+                | CAPABILITY_ASM_DD_MULTICONFIG
+                | CAPABILITY_ASM_IP_BLOCKING
+                | CAPABILITY_ASM_EXCLUSIONS
+                | CAPABILITY_ASM_EXCLUSION_DATA
+                | CAPABILITY_ASM_REQUEST_BLOCKING
+                | CAPABILITY_ASM_USER_BLOCKING
+                | CAPABILITY_ASM_CUSTOM_RULES
+                | CAPABILITY_ASM_CUSTOM_BLOCKING_RESPONSE
+                | CAPABILITY_ASM_TRUSTED_IPS
+                | CAPABILITY_ASM_PROCESSOR_OVERRIDES
+                | CAPABILITY_ASM_CUSTOM_DATA_SCANNERS
+                | CAPABILITY_ASM_RASP_SQLI
+                | CAPABILITY_ASM_RASP_SSRF
+                | CAPABILITY_ASM_RASP_LFI
+                | CAPABILITY_ASM_RASP_CMDI
+                | CAPABILITY_ASM_RASP_SHI
+                | CAPABILITY_ASM_AUTO_USER_INSTRUM_MODE
+                | CAPABILITY_ENDPOINT_FINGERPRINT
+                | CAPABILITY_ASM_SESSION_FINGERPRINT
+                | CAPABILITY_ASM_NETWORK_FINGERPRINT
+                | CAPABILITY_ASM_HEADER_FINGERPRINT
+                | CAPABILITY_ASM_TRACE_TAGGING_RULES
+                | CAPABILITY_ASM_EXTENDED_DATA_COLLECTION);
+        this.configurationPoller.removeListeners(Product.ASM_DD);
+        this.configurationPoller.removeListeners(Product.ASM_DATA);
+        this.configurationPoller.removeListeners(Product.ASM);
+        this.configurationPoller.removeListeners(Product.ASM_FEATURES);
+        this.configurationPoller.removeConfigurationEndListener(applyRemoteConfigListener);
+        this.subscribedToRulesAndData.set(false);
+        this.configurationPoller.stop();
+        if (this.wafBuilder != null) {
+            this.wafBuilder.close();
+            this.wafBuilder = null;
+        }
     }
-  }
 
-  private void applyRemoteConfigListener() {
-    // apply ASM_FEATURES configuration first as they might enable AppSec
-    final AppSecFeatures features = mergedAsmFeatures.getMergedData();
-    setAppSecActivation(features.asm);
-    setUserIdCollectionMode(features.autoUserInstrum);
+    private void applyRemoteConfigListener() {
+        // apply ASM_FEATURES configuration first as they might enable AppSec
+        final AppSecFeatures features = mergedAsmFeatures.getMergedData();
+        setAppSecActivation(features.asm);
+        setUserIdCollectionMode(features.autoUserInstrum);
 
-    if (!AppSecSystem.isActive()) {
-      return;
-    }
+        if (!AppSecSystem.isActive()) {
+            return;
+        }
 
-    distributeSubConfigurations("waf", reconfiguration);
-  }
-
-  private void setAppSecActivation(final AppSecFeatures.Asm asm) {
-    final boolean newState;
-    if (asm == null) {
-      newState = tracerConfig.getAppSecActivation() == ProductActivation.FULLY_ENABLED;
-    } else {
-      newState = asm.enabled;
-      // Report AppSec activation change via telemetry when modified via remote config
-      ConfigCollector.get().putRemote(APPSEC_ENABLED, asm.enabled);
-    }
-    if (AppSecSystem.isActive() != newState) {
-      log.info("AppSec {} (runtime)", newState ? "enabled" : "disabled");
-      AppSecSystem.setActive(newState);
-      updateRulesAndDataSubscription();
+        distributeSubConfigurations("waf", reconfiguration);
     }
-  }
-
-  private void setUserIdCollectionMode(final AppSecFeatures.AutoUserInstrum autoUserInstrum) {
-    UserIdCollectionMode current = UserIdCollectionMode.get();
-    UserIdCollectionMode newMode;
-    if (autoUserInstrum == null) {
-      newMode = tracerConfig.getAppSecUserIdCollectionMode();
-    } else {
-      newMode = UserIdCollectionMode.fromRemoteConfig(autoUserInstrum.mode);
-    }
-    if (newMode != current) {
-      log.info("User ID collection mode changed via remote-config: {} -> {}", current, newMode);
+
+    private void setAppSecActivation(final AppSecFeatures.Asm asm) {
+        final boolean newState;
+        if (asm == null) {
+            newState = tracerConfig.getAppSecActivation() == ProductActivation.FULLY_ENABLED;
+        } else {
+            newState = asm.enabled;
+            // Report AppSec activation change via telemetry when modified via remote config
+            ConfigCollector.get().putRemote(APPSEC_ENABLED, asm.enabled);
+        }
+        if (AppSecSystem.isActive() != newState) {
+            log.info("AppSec {} (runtime)", newState ? "enabled" : "disabled");
+            AppSecSystem.setActive(newState);
+            updateRulesAndDataSubscription();
+        }
     }
-  }
-
-  private static WafConfig createWafConfig(Config config) {
-    WafConfig wafConfig = new WafConfig();
-    String keyRegexp = config.getAppSecObfuscationParameterKeyRegexp();
-    if (keyRegexp != null) {
-      wafConfig.obfuscatorKeyRegex = keyRegexp;
-    } else { // reset
-      wafConfig.obfuscatorKeyRegex = WafConfig.DEFAULT_KEY_REGEX;
+
+    private void setUserIdCollectionMode(final AppSecFeatures.AutoUserInstrum autoUserInstrum) {
+        UserIdCollectionMode current = UserIdCollectionMode.get();
+        UserIdCollectionMode newMode;
+        if (autoUserInstrum == null) {
+            newMode = tracerConfig.getAppSecUserIdCollectionMode();
+        } else {
+            newMode = UserIdCollectionMode.fromRemoteConfig(autoUserInstrum.mode);
+        }
+        if (newMode != current) {
+            log.info("User ID collection mode changed via remote-config: {} -> {}", current, newMode);
+        }
     }
-    String valueRegexp = config.getAppSecObfuscationParameterValueRegexp();
-    if (valueRegexp != null) {
-      wafConfig.obfuscatorValueRegex = valueRegexp;
-    } else { // reset
-      wafConfig.obfuscatorValueRegex = WafConfig.DEFAULT_VALUE_REGEX;
+
+    private static WafConfig createWafConfig(Config config) {
+        WafConfig wafConfig = new WafConfig();
+        String keyRegexp = config.getAppSecObfuscationParameterKeyRegexp();
+        if (keyRegexp != null) {
+            wafConfig.obfuscatorKeyRegex = keyRegexp;
+        } else { // reset
+            wafConfig.obfuscatorKeyRegex = WafConfig.DEFAULT_KEY_REGEX;
+        }
+        String valueRegexp = config.getAppSecObfuscationParameterValueRegexp();
+        if (valueRegexp != null) {
+            wafConfig.obfuscatorValueRegex = valueRegexp;
+        } else { // reset
+            wafConfig.obfuscatorValueRegex = WafConfig.DEFAULT_VALUE_REGEX;
+        }
+        return wafConfig;
     }
-    return wafConfig;
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecFeatures.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecFeatures.java
index eac1b761a3a..ecff8170c2f 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecFeatures.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecFeatures.java
@@ -1,31 +1,31 @@
 package com.datadog.appsec.config;
 
 public class AppSecFeatures {
-  public Asm asm;
+    public Asm asm;
 
-  @com.squareup.moshi.Json(name = "auto_user_instrum")
-  public AutoUserInstrum autoUserInstrum;
+    @com.squareup.moshi.Json(name = "auto_user_instrum")
+    public AutoUserInstrum autoUserInstrum;
 
-  public static class Asm {
-    public Boolean enabled;
+    public static class Asm {
+        public Boolean enabled;
 
-    @Override
-    public String toString() {
-      return "Asm{" + "enabled=" + enabled + '}';
+        @Override
+        public String toString() {
+            return "Asm{" + "enabled=" + enabled + '}';
+        }
     }
-  }
 
-  public static class AutoUserInstrum {
-    public String mode;
+    public static class AutoUserInstrum {
+        public String mode;
+
+        @Override
+        public String toString() {
+            return "AutoUserInstrum{" + "mode=" + mode + '}';
+        }
+    }
 
     @Override
     public String toString() {
-      return "AutoUserInstrum{" + "mode=" + mode + '}';
+        return "AppSecFeatures{" + "asm=" + asm + ", autoUserInstrum=" + autoUserInstrum + '}';
     }
-  }
-
-  @Override
-  public String toString() {
-    return "AppSecFeatures{" + "asm=" + asm + ", autoUserInstrum=" + autoUserInstrum + '}';
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecFeaturesDeserializer.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecFeaturesDeserializer.java
index 2b9317bb25e..7ced8f43309 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecFeaturesDeserializer.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecFeaturesDeserializer.java
@@ -8,15 +8,15 @@
 import okio.Okio;
 
 public class AppSecFeaturesDeserializer implements ConfigurationDeserializer<AppSecFeatures> {
-  public static final AppSecFeaturesDeserializer INSTANCE = new AppSecFeaturesDeserializer();
+    public static final AppSecFeaturesDeserializer INSTANCE = new AppSecFeaturesDeserializer();
 
-  private static final JsonAdapter<AppSecFeatures> ADAPTER =
-      new Moshi.Builder().build().adapter(AppSecFeatures.class);
+    private static final JsonAdapter<AppSecFeatures> ADAPTER =
+            new Moshi.Builder().build().adapter(AppSecFeatures.class);
 
-  private AppSecFeaturesDeserializer() {}
+    private AppSecFeaturesDeserializer() {}
 
-  @Override
-  public AppSecFeatures deserialize(byte[] content) throws IOException {
-    return ADAPTER.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
-  }
+    @Override
+    public AppSecFeatures deserialize(byte[] content) throws IOException {
+        return ADAPTER.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecModuleConfigurer.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecModuleConfigurer.java
index e2a0c2d8b19..7d7f0e58a16 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecModuleConfigurer.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecModuleConfigurer.java
@@ -4,18 +4,18 @@
 import com.datadog.ddwaf.exception.AbstractWafException;
 
 public interface AppSecModuleConfigurer {
-  void addSubConfigListener(String key, SubconfigListener listener);
+    void addSubConfigListener(String key, SubconfigListener listener);
 
-  interface SubconfigListener {
-    void onNewSubconfig(Object newConfig, Reconfiguration reconfiguration)
-        throws AppSecModule.AppSecModuleActivationException, AbstractWafException;
-  }
+    interface SubconfigListener {
+        void onNewSubconfig(Object newConfig, Reconfiguration reconfiguration)
+                throws AppSecModule.AppSecModuleActivationException, AbstractWafException;
+    }
 
-  void addTraceSegmentPostProcessor(TraceSegmentPostProcessor interceptor);
+    void addTraceSegmentPostProcessor(TraceSegmentPostProcessor interceptor);
 
-  interface Reconfiguration {
-    Reconfiguration NOOP = () -> {};
+    interface Reconfiguration {
+        Reconfiguration NOOP = () -> {};
 
-    void reloadSubscriptions();
-  }
+        void reloadSubscriptions();
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/MergedAsmFeatures.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/MergedAsmFeatures.java
index 070c6056b1e..d4d151a7338 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/MergedAsmFeatures.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/MergedAsmFeatures.java
@@ -5,53 +5,52 @@
 
 public class MergedAsmFeatures {
 
-  private final Map<String, AppSecFeatures> configs = new ConcurrentHashMap<>();
-  private volatile AppSecFeatures mergedData;
-
-  public void addConfig(final String cfgKey, final AppSecFeatures features) {
-    this.configs.put(cfgKey, features);
-    this.mergedData = null;
-  }
-
-  public void removeConfig(final String cfgKey) {
-    this.configs.remove(cfgKey);
-    this.mergedData = null;
-  }
-
-  public AppSecFeatures getMergedData() {
-    if (mergedData == null) {
-      synchronized (this) {
+    private final Map<String, AppSecFeatures> configs = new ConcurrentHashMap<>();
+    private volatile AppSecFeatures mergedData;
+
+    public void addConfig(final String cfgKey, final AppSecFeatures features) {
+        this.configs.put(cfgKey, features);
+        this.mergedData = null;
+    }
+
+    public void removeConfig(final String cfgKey) {
+        this.configs.remove(cfgKey);
+        this.mergedData = null;
+    }
+
+    public AppSecFeatures getMergedData() {
         if (mergedData == null) {
-          mergedData = configs.values().stream().reduce(new AppSecFeatures(), this::merge);
+            synchronized (this) {
+                if (mergedData == null) {
+                    mergedData = configs.values().stream().reduce(new AppSecFeatures(), this::merge);
+                }
+            }
         }
-      }
+        return this.mergedData;
     }
-    return this.mergedData;
-  }
-
-  private AppSecFeatures merge(final AppSecFeatures target, final AppSecFeatures newFeatures) {
-    mergeAsm(target, newFeatures.asm);
-    mergeAutoUserInstrum(target, newFeatures.autoUserInstrum);
-    return target;
-  }
-
-  private void mergeAsm(final AppSecFeatures target, final AppSecFeatures.Asm newValue) {
-    if (newValue == null || newValue.enabled == null) {
-      return;
+
+    private AppSecFeatures merge(final AppSecFeatures target, final AppSecFeatures newFeatures) {
+        mergeAsm(target, newFeatures.asm);
+        mergeAutoUserInstrum(target, newFeatures.autoUserInstrum);
+        return target;
     }
-    target.asm = newValue;
-  }
 
-  private void mergeAutoUserInstrum(
-      final AppSecFeatures target, final AppSecFeatures.AutoUserInstrum newValue) {
-    if (newValue == null || newValue.mode == null) {
-      return;
+    private void mergeAsm(final AppSecFeatures target, final AppSecFeatures.Asm newValue) {
+        if (newValue == null || newValue.enabled == null) {
+            return;
+        }
+        target.asm = newValue;
     }
-    target.autoUserInstrum = newValue;
-  }
 
-  public void clear() {
-    mergedData = null;
-    configs.clear();
-  }
+    private void mergeAutoUserInstrum(final AppSecFeatures target, final AppSecFeatures.AutoUserInstrum newValue) {
+        if (newValue == null || newValue.mode == null) {
+            return;
+        }
+        target.autoUserInstrum = newValue;
+    }
+
+    public void clear() {
+        mergedData = null;
+        configs.clear();
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/TraceSegmentPostProcessor.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/TraceSegmentPostProcessor.java
index a6440c6d6ea..eb872560eef 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/TraceSegmentPostProcessor.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/TraceSegmentPostProcessor.java
@@ -6,6 +6,5 @@
 import java.util.Collection;
 
 public interface TraceSegmentPostProcessor {
-  void processTraceSegment(
-      TraceSegment segment, AppSecRequestContext ctx, Collection<AppSecEvent> collectedEvents);
+    void processTraceSegment(TraceSegment segment, AppSecRequestContext ctx, Collection<AppSecEvent> collectedEvents);
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFInitializationResultReporter.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFInitializationResultReporter.java
index c6587d167c6..d70504f565e 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFInitializationResultReporter.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFInitializationResultReporter.java
@@ -16,40 +16,38 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 public class WAFInitializationResultReporter implements TraceSegmentPostProcessor {
-  private static final String WAF_VERSION = "_dd.appsec.waf.version";
-  private static final String RULE_ERRORS = "_dd.appsec.event_rules.errors";
-  private static final String RULES_LOADED = "_dd.appsec.event_rules.loaded";
-  private static final String RULE_ERROR_COUNT = "_dd.appsec.event_rules.error_count";
-
-  private static final JsonAdapter<Map<String, List<String>>> RULES_ERRORS_ADAPTER =
-      new Moshi.Builder()
-          .build()
-          .adapter(
-              Types.newParameterizedType(
-                  Map.class, String.class, Types.newParameterizedType(List.class, String.class)));
-  private final AtomicReference<WafDiagnostics> pendingReportRef = new AtomicReference<>();
-
-  public void setReportForPublication(WafDiagnostics report) {
-    this.pendingReportRef.set(report);
-  }
-
-  @Override
-  public void processTraceSegment(
-      TraceSegment segment, AppSecRequestContext ctx, Collection<AppSecEvent> collectedEvents) {
-    WafDiagnostics report = pendingReportRef.get();
-    if (report == null) {
-      return;
+    private static final String WAF_VERSION = "_dd.appsec.waf.version";
+    private static final String RULE_ERRORS = "_dd.appsec.event_rules.errors";
+    private static final String RULES_LOADED = "_dd.appsec.event_rules.loaded";
+    private static final String RULE_ERROR_COUNT = "_dd.appsec.event_rules.error_count";
+
+    private static final JsonAdapter<Map<String, List<String>>> RULES_ERRORS_ADAPTER = new Moshi.Builder()
+            .build()
+            .adapter(Types.newParameterizedType(
+                    Map.class, String.class, Types.newParameterizedType(List.class, String.class)));
+    private final AtomicReference<WafDiagnostics> pendingReportRef = new AtomicReference<>();
+
+    public void setReportForPublication(WafDiagnostics report) {
+        this.pendingReportRef.set(report);
     }
 
-    if (!pendingReportRef.compareAndSet(report, null)) {
-      return;
-    }
+    @Override
+    public void processTraceSegment(
+            TraceSegment segment, AppSecRequestContext ctx, Collection<AppSecEvent> collectedEvents) {
+        WafDiagnostics report = pendingReportRef.get();
+        if (report == null) {
+            return;
+        }
+
+        if (!pendingReportRef.compareAndSet(report, null)) {
+            return;
+        }
 
-    segment.setTagTop(RULE_ERRORS, RULES_ERRORS_ADAPTER.toJson(report.getAllErrors()));
-    segment.setTagTop(RULES_LOADED, report.getNumConfigOK());
-    segment.setTagTop(RULE_ERROR_COUNT, report.getNumConfigError());
-    segment.setTagTop(WAF_VERSION, Waf.LIB_VERSION);
+        segment.setTagTop(RULE_ERRORS, RULES_ERRORS_ADAPTER.toJson(report.getAllErrors()));
+        segment.setTagTop(RULES_LOADED, report.getNumConfigOK());
+        segment.setTagTop(RULE_ERROR_COUNT, report.getNumConfigError());
+        segment.setTagTop(WAF_VERSION, Waf.LIB_VERSION);
 
-    segment.setTagTop(Tags.ASM_KEEP, true);
-  }
+        segment.setTagTop(Tags.ASM_KEEP, true);
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFModule.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFModule.java
index 16affc8ac59..6a7c20041c1 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFModule.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFModule.java
@@ -66,741 +66,720 @@
 import org.slf4j.LoggerFactory;
 
 public class WAFModule implements AppSecModule {
-  private static final Logger log = LoggerFactory.getLogger(WAFModule.class);
-
-  public static final int MAX_DEPTH = 20;
-  public static final int MAX_ELEMENTS = 256;
-  public static final int MAX_STRING_SIZE = 4096;
-  private static volatile Waf.Limits LIMITS;
-  private static final Class<?> PROXY_CLASS =
-      Proxy.getProxyClass(WAFModule.class.getClassLoader(), Set.class);
-  private static final Constructor<?> PROXY_CLASS_CONSTRUCTOR;
-
-  private static final JsonAdapter<List<WAFResultData>> RES_JSON_ADAPTER;
-
-  private static final String EXPLOIT_DETECTED_MSG = "Exploit detected";
-  private boolean init = true;
-  private String rulesetVersion;
-  private WafBuilder wafBuilder;
-
-  private static class ActionInfo {
-    final String type;
-    final Map<String, Object> parameters;
-
-    private ActionInfo(String type, Map<String, Object> parameters) {
-      this.type = type;
-      this.parameters = parameters;
+    private static final Logger log = LoggerFactory.getLogger(WAFModule.class);
+
+    public static final int MAX_DEPTH = 20;
+    public static final int MAX_ELEMENTS = 256;
+    public static final int MAX_STRING_SIZE = 4096;
+    private static volatile Waf.Limits LIMITS;
+    private static final Class<?> PROXY_CLASS = Proxy.getProxyClass(WAFModule.class.getClassLoader(), Set.class);
+    private static final Constructor<?> PROXY_CLASS_CONSTRUCTOR;
+
+    private static final JsonAdapter<List<WAFResultData>> RES_JSON_ADAPTER;
+
+    private static final String EXPLOIT_DETECTED_MSG = "Exploit detected";
+    private boolean init = true;
+    private String rulesetVersion;
+    private WafBuilder wafBuilder;
+
+    private static class ActionInfo {
+        final String type;
+        final Map<String, Object> parameters;
+
+        private ActionInfo(String type, Map<String, Object> parameters) {
+            this.type = type;
+            this.parameters = parameters;
+        }
     }
-  }
 
-  private static class CtxAndAddresses {
-    final Collection<Address<?>> addressesOfInterest;
-    final WafHandle ctx;
+    private static class CtxAndAddresses {
+        final Collection<Address<?>> addressesOfInterest;
+        final WafHandle ctx;
 
-    private CtxAndAddresses(Collection<Address<?>> addressesOfInterest, WafHandle ctx) {
-      this.addressesOfInterest = addressesOfInterest;
-      this.ctx = ctx;
+        private CtxAndAddresses(Collection<Address<?>> addressesOfInterest, WafHandle ctx) {
+            this.addressesOfInterest = addressesOfInterest;
+            this.ctx = ctx;
+        }
     }
-  }
 
-  static {
-    try {
-      PROXY_CLASS_CONSTRUCTOR = PROXY_CLASS.getConstructor(InvocationHandler.class);
-    } catch (NoSuchMethodException e) {
-      throw new UndeclaredThrowableException(e);
+    static {
+        try {
+            PROXY_CLASS_CONSTRUCTOR = PROXY_CLASS.getConstructor(InvocationHandler.class);
+        } catch (NoSuchMethodException e) {
+            throw new UndeclaredThrowableException(e);
+        }
+
+        Moshi moshi = new Moshi.Builder().build();
+        RES_JSON_ADAPTER = moshi.adapter(Types.newParameterizedType(List.class, WAFResultData.class));
+
+        createLimitsObject();
     }
 
-    Moshi moshi = new Moshi.Builder().build();
-    RES_JSON_ADAPTER = moshi.adapter(Types.newParameterizedType(List.class, WAFResultData.class));
-
-    createLimitsObject();
-  }
-
-  // used in testing
-  static void createLimitsObject() {
-    LIMITS =
-        new Waf.Limits(
-            MAX_DEPTH,
-            MAX_ELEMENTS,
-            MAX_STRING_SIZE,
-            /* set effectively infinite budgets. Don't use Long.MAX_VALUE, because
-             * traditionally ddwaf has had problems with too large budgets */
-            ((long) Integer.MAX_VALUE) * 1000,
-            Config.get().getAppSecWafTimeout());
-  }
-
-  private final boolean wafMetricsEnabled =
-      Config.get().isAppSecWafMetrics(); // could be static if not for tests
-  private final AtomicReference<CtxAndAddresses> ctxAndAddresses = new AtomicReference<>();
-  private final RateLimiter rateLimiter;
-
-  public WAFModule() {
-    this(null);
-  }
-
-  public WAFModule(Monitoring monitoring) {
-    this.rateLimiter = getRateLimiter(monitoring);
-  }
-
-  @Override
-  public void config(AppSecModuleConfigurer appSecConfigService)
-      throws AppSecModuleActivationException {
-    appSecConfigService.addSubConfigListener("waf", (key, reconf) -> applyConfig(reconf));
-
-    ProductActivation appSecEnabledConfig = Config.get().getAppSecActivation();
-    if (appSecEnabledConfig == ProductActivation.FULLY_ENABLED) {
-      try {
-        applyConfig(AppSecModuleConfigurer.Reconfiguration.NOOP);
-      } catch (ClassCastException e) {
-        throw new AppSecModuleActivationException("Config expected to be a map", e);
-      } catch (AbstractWafException e) {
-        throw new AppSecModuleActivationException("Could not apply config", e);
-      }
+    // used in testing
+    static void createLimitsObject() {
+        LIMITS = new Waf.Limits(
+                MAX_DEPTH,
+                MAX_ELEMENTS,
+                MAX_STRING_SIZE,
+                /* set effectively infinite budgets. Don't use Long.MAX_VALUE, because
+                 * traditionally ddwaf has had problems with too large budgets */
+                ((long) Integer.MAX_VALUE) * 1000,
+                Config.get().getAppSecWafTimeout());
     }
-  }
-
-  @Override
-  public void setWafBuilder(WafBuilder wafBuilder) {
-    this.wafBuilder = wafBuilder;
-  }
-
-  // this function is called from one thread in the beginning that's different
-  // from the RC thread that calls it later on
-  private void applyConfig(AppSecModuleConfigurer.Reconfiguration reconf)
-      throws AppSecModuleActivationException, AbstractWafException {
-    boolean success = false;
-    if (init) {
-      log.debug("Initializing WAF");
-    } else {
-      log.debug("Updating WAF");
+
+    private final boolean wafMetricsEnabled = Config.get().isAppSecWafMetrics(); // could be static if not for tests
+    private final AtomicReference<CtxAndAddresses> ctxAndAddresses = new AtomicReference<>();
+    private final RateLimiter rateLimiter;
+
+    public WAFModule() {
+        this(null);
     }
-    try {
-      initOrUpdateWafHandle(reconf);
-      success = true;
-    } catch (Exception e) {
-      throw new AppSecModuleActivationException("Could not initialize waf handle", e);
-    } finally {
-      if (init) {
-        WafMetricCollector.get().wafInit(Waf.LIB_VERSION, rulesetVersion, success);
-        init = false;
-      } else {
-        WafMetricCollector.get().wafUpdates(rulesetVersion, success);
-      }
+
+    public WAFModule(Monitoring monitoring) {
+        this.rateLimiter = getRateLimiter(monitoring);
     }
-  }
-
-  private void initOrUpdateWafHandle(AppSecModuleConfigurer.Reconfiguration reconf)
-      throws AppSecModuleActivationException {
-    CtxAndAddresses prevContextAndAddresses = this.ctxAndAddresses.get();
-    WafHandle newHandle;
-    try {
-      newHandle = wafBuilder.buildWafHandleInstance();
-    } catch (AbstractWafException e) {
-      throw new AppSecModuleActivationException(
-          "Could not initialize waf handle, no rules were added!", e);
+
+    @Override
+    public void config(AppSecModuleConfigurer appSecConfigService) throws AppSecModuleActivationException {
+        appSecConfigService.addSubConfigListener("waf", (key, reconf) -> applyConfig(reconf));
+
+        ProductActivation appSecEnabledConfig = Config.get().getAppSecActivation();
+        if (appSecEnabledConfig == ProductActivation.FULLY_ENABLED) {
+            try {
+                applyConfig(AppSecModuleConfigurer.Reconfiguration.NOOP);
+            } catch (ClassCastException e) {
+                throw new AppSecModuleActivationException("Config expected to be a map", e);
+            } catch (AbstractWafException e) {
+                throw new AppSecModuleActivationException("Could not apply config", e);
+            }
+        }
     }
 
-    Collection<Address<?>> addresses = getUsedAddresses(newHandle);
-    CtxAndAddresses newContextAndAddresses = new CtxAndAddresses(addresses, newHandle);
-    if (!this.ctxAndAddresses.compareAndSet(prevContextAndAddresses, newContextAndAddresses)) {
-      newHandle.close();
-      throw new AppSecModuleActivationException("Concurrent update of WAF configuration");
+    @Override
+    public void setWafBuilder(WafBuilder wafBuilder) {
+        this.wafBuilder = wafBuilder;
     }
 
-    if (prevContextAndAddresses != null) {
-      prevContextAndAddresses.ctx.close();
+    // this function is called from one thread in the beginning that's different
+    // from the RC thread that calls it later on
+    private void applyConfig(AppSecModuleConfigurer.Reconfiguration reconf)
+            throws AppSecModuleActivationException, AbstractWafException {
+        boolean success = false;
+        if (init) {
+            log.debug("Initializing WAF");
+        } else {
+            log.debug("Updating WAF");
+        }
+        try {
+            initOrUpdateWafHandle(reconf);
+            success = true;
+        } catch (Exception e) {
+            throw new AppSecModuleActivationException("Could not initialize waf handle", e);
+        } finally {
+            if (init) {
+                WafMetricCollector.get().wafInit(Waf.LIB_VERSION, rulesetVersion, success);
+                init = false;
+            } else {
+                WafMetricCollector.get().wafUpdates(rulesetVersion, success);
+            }
+        }
     }
 
-    reconf.reloadSubscriptions();
-  }
+    private void initOrUpdateWafHandle(AppSecModuleConfigurer.Reconfiguration reconf)
+            throws AppSecModuleActivationException {
+        CtxAndAddresses prevContextAndAddresses = this.ctxAndAddresses.get();
+        WafHandle newHandle;
+        try {
+            newHandle = wafBuilder.buildWafHandleInstance();
+        } catch (AbstractWafException e) {
+            throw new AppSecModuleActivationException("Could not initialize waf handle, no rules were added!", e);
+        }
+
+        Collection<Address<?>> addresses = getUsedAddresses(newHandle);
+        CtxAndAddresses newContextAndAddresses = new CtxAndAddresses(addresses, newHandle);
+        if (!this.ctxAndAddresses.compareAndSet(prevContextAndAddresses, newContextAndAddresses)) {
+            newHandle.close();
+            throw new AppSecModuleActivationException("Concurrent update of WAF configuration");
+        }
 
-  private static RateLimiter getRateLimiter(Monitoring monitoring) {
-    if (monitoring == null) {
-      return null;
-    }
-    RateLimiter rateLimiter = null;
-    int appSecTraceRateLimit = Config.get().getAppSecTraceRateLimit();
-    if (appSecTraceRateLimit > 0) {
-      Counter counter = monitoring.newCounter("_dd.java.appsec.rate_limit.dropped_traces");
-      rateLimiter =
-          new RateLimiter(
-              appSecTraceRateLimit, SystemTimeSource.INSTANCE, () -> counter.increment(1));
-    }
-    return rateLimiter;
-  }
-
-  @Override
-  public void setRuleVersion(String rulesetVersion) {
-    this.rulesetVersion = rulesetVersion;
-  }
-
-  @Override
-  public String getName() {
-    return "ddwaf";
-  }
-
-  @Override
-  public String getInfo() {
-    CtxAndAddresses ctxAndAddresses = this.ctxAndAddresses.get();
-    if (ctxAndAddresses == null) {
-      return "ddwaf(libddwaf: " + Waf.LIB_VERSION + ") no rules loaded";
-    }
+        if (prevContextAndAddresses != null) {
+            prevContextAndAddresses.ctx.close();
+        }
 
-    return "ddwaf(libddwaf: " + Waf.LIB_VERSION + ") loaded";
-  }
+        reconf.reloadSubscriptions();
+    }
 
-  @Override
-  public Collection<DataSubscription> getDataSubscriptions() {
-    if (this.ctxAndAddresses.get() == null) {
-      return Collections.emptyList();
+    private static RateLimiter getRateLimiter(Monitoring monitoring) {
+        if (monitoring == null) {
+            return null;
+        }
+        RateLimiter rateLimiter = null;
+        int appSecTraceRateLimit = Config.get().getAppSecTraceRateLimit();
+        if (appSecTraceRateLimit > 0) {
+            Counter counter = monitoring.newCounter("_dd.java.appsec.rate_limit.dropped_traces");
+            rateLimiter = new RateLimiter(appSecTraceRateLimit, SystemTimeSource.INSTANCE, () -> counter.increment(1));
+        }
+        return rateLimiter;
     }
-    return singletonList(new WAFDataCallback());
-  }
-
-  @Override
-  public boolean isWafBuilderSet() {
-    return wafBuilder != null;
-  }
-
-  private static Collection<Address<?>> getUsedAddresses(WafHandle wafHandle) {
-    String[] usedAddresses = wafHandle.getKnownAddresses();
-    Set<Address<?>> addressList = new HashSet<>(usedAddresses.length);
-    for (String addrKey : usedAddresses) {
-      Address<?> address = KnownAddresses.forName(addrKey);
-      if (address != null) {
-        addressList.add(address);
-      }
+
+    @Override
+    public void setRuleVersion(String rulesetVersion) {
+        this.rulesetVersion = rulesetVersion;
     }
-    return addressList;
-  }
 
-  private class WAFDataCallback extends DataSubscription {
-    public WAFDataCallback() {
-      super(ctxAndAddresses.get().addressesOfInterest, Priority.DEFAULT);
+    @Override
+    public String getName() {
+        return "ddwaf";
     }
 
     @Override
-    public void onDataAvailable(
-        ChangeableFlow flow,
-        AppSecRequestContext reqCtx,
-        DataBundle newData,
-        GatewayContext gwCtx) {
-      Waf.ResultWithData resultWithData;
-      CtxAndAddresses ctxAndAddr = ctxAndAddresses.get();
-      if (ctxAndAddr == null) {
-        log.debug("Skipped; the WAF is not configured");
-        return;
-      }
-      if (reqCtx.isWafContextClosed()) {
-        log.debug("Skipped; the WAF context is closed");
-        if (gwCtx.isRasp) {
-          WafMetricCollector.get().raspRuleSkipped(gwCtx.raspRuleType);
-        }
-        return;
-      }
-
-      StandardizedLogging.executingWAF(log);
-      long start = 0L;
-      if (log.isDebugEnabled()) {
-        start = System.currentTimeMillis();
-      }
-
-      if (gwCtx.isRasp) {
-        WafMetricCollector.get().raspRuleEval(gwCtx.raspRuleType);
-      }
-
-      try {
-        resultWithData = doRunWaf(reqCtx, newData, ctxAndAddr, gwCtx);
-        if (resultWithData == null) {
-          // WAF context closed concurrently between the fast-path check and context creation; skip
-          // (APPSEC-69085). raspRuleEval() was already counted above, so don't also count
-          // raspRuleSkipped() here - that counter is reserved for calls that never attempted eval.
-          log.debug("Skipped; the WAF context was closed concurrently");
-          WafMetricCollector.get().wafContextClosedRace();
-          return;
-        }
-      } catch (TimeoutWafException tpe) {
-        if (gwCtx.isRasp) {
-          reqCtx.increaseRaspTimeouts();
-          WafMetricCollector.get().raspTimeout(gwCtx.raspRuleType);
-        } else {
-          reqCtx.increaseWafTimeouts();
-          log.debug(LogCollector.EXCLUDE_TELEMETRY, "Timeout calling the WAF", tpe);
-        }
-        return;
-      } catch (UnclassifiedWafException e) {
-        if (reqCtx.isWafContextClosed()) {
-          // The context was closed concurrently between getOrCreateWafContext() and this run()
-          // call (APPSEC-69085) - the same benign race already tracked below via
-          // wafContextClosedRace(); avoid double-counting it as a real WAF error.
-          log.debug("Skipped; the WAF context was closed concurrently");
-          WafMetricCollector.get().wafContextClosedRace();
-        } else {
-          log.error("Error calling WAF", e);
-          incrementErrorCodeMetric(reqCtx, gwCtx, e.code);
-        }
-        return;
-      } catch (AbstractWafException e) {
-        incrementErrorCodeMetric(reqCtx, gwCtx, e.code);
-        return;
-      } finally {
-        if (log.isDebugEnabled()) {
-          long elapsed = System.currentTimeMillis() - start;
-          StandardizedLogging.finishedExecutionWAF(log, elapsed);
-        }
-        if (!gwCtx.isRasp) {
-          WafMetrics wafMetrics = reqCtx.getWafMetrics();
-          if (wafMetrics != null) {
-            final long stringTooLong = wafMetrics.getTruncatedStringTooLongCount();
-            final long listMapTooLarge = wafMetrics.getTruncatedListMapTooLargeCount();
-            final long objectTooDeep = wafMetrics.getTruncatedObjectTooDeepCount();
-
-            if (stringTooLong > 0 || listMapTooLarge > 0 || objectTooDeep > 0) {
-              reqCtx.setWafTruncated();
-              WafMetricCollector.get()
-                  .wafInputTruncated(stringTooLong > 0, listMapTooLarge > 0, objectTooDeep > 0);
-            }
-          }
+    public String getInfo() {
+        CtxAndAddresses ctxAndAddresses = this.ctxAndAddresses.get();
+        if (ctxAndAddresses == null) {
+            return "ddwaf(libddwaf: " + Waf.LIB_VERSION + ") no rules loaded";
         }
-      }
 
-      StandardizedLogging.inAppWafReturn(log, resultWithData);
+        return "ddwaf(libddwaf: " + Waf.LIB_VERSION + ") loaded";
+    }
 
-      if (resultWithData.result != Waf.Result.OK) {
-        if (log.isDebugEnabled()) {
-          log.warn("WAF signalled result {}: {}", resultWithData.result, resultWithData.data);
+    @Override
+    public Collection<DataSubscription> getDataSubscriptions() {
+        if (this.ctxAndAddresses.get() == null) {
+            return Collections.emptyList();
         }
+        return singletonList(new WAFDataCallback());
+    }
 
-        if (gwCtx.isRasp) {
-          reqCtx.setRaspMatched(true);
+    @Override
+    public boolean isWafBuilderSet() {
+        return wafBuilder != null;
+    }
+
+    private static Collection<Address<?>> getUsedAddresses(WafHandle wafHandle) {
+        String[] usedAddresses = wafHandle.getKnownAddresses();
+        Set<Address<?>> addressList = new HashSet<>(usedAddresses.length);
+        for (String addrKey : usedAddresses) {
+            Address<?> address = KnownAddresses.forName(addrKey);
+            if (address != null) {
+                addressList.add(address);
+            }
         }
+        return addressList;
+    }
 
-        String securityResponseId = null;
-        for (Map.Entry<String, Map<String, Object>> action : resultWithData.actions.entrySet()) {
-          String actionType = action.getKey();
-          Map<String, Object> actionParams = action.getValue();
+    private class WAFDataCallback extends DataSubscription {
+        public WAFDataCallback() {
+            super(ctxAndAddresses.get().addressesOfInterest, Priority.DEFAULT);
+        }
 
-          ActionInfo actionInfo = new ActionInfo(actionType, actionParams);
+        @Override
+        public void onDataAvailable(
+                ChangeableFlow flow, AppSecRequestContext reqCtx, DataBundle newData, GatewayContext gwCtx) {
+            Waf.ResultWithData resultWithData;
+            CtxAndAddresses ctxAndAddr = ctxAndAddresses.get();
+            if (ctxAndAddr == null) {
+                log.debug("Skipped; the WAF is not configured");
+                return;
+            }
+            if (reqCtx.isWafContextClosed()) {
+                log.debug("Skipped; the WAF context is closed");
+                if (gwCtx.isRasp) {
+                    WafMetricCollector.get().raspRuleSkipped(gwCtx.raspRuleType);
+                }
+                return;
+            }
 
-          if ("block_request".equals(actionInfo.type)) {
-            // Extract security_response_id from action parameters for use in triggers
-            securityResponseId = (String) actionInfo.parameters.get("security_response_id");
-            Flow.Action.RequestBlockingAction rba =
-                createBlockRequestAction(actionInfo, reqCtx, gwCtx.isRasp, securityResponseId);
-            if (rba != null) {
-              flow.setAction(rba);
+            StandardizedLogging.executingWAF(log);
+            long start = 0L;
+            if (log.isDebugEnabled()) {
+                start = System.currentTimeMillis();
             }
-          } else if ("redirect_request".equals(actionInfo.type)) {
-            // Extract security_response_id from action parameters for use in triggers
-            securityResponseId = (String) actionInfo.parameters.get("security_response_id");
-            Flow.Action.RequestBlockingAction rba =
-                createRedirectRequestAction(actionInfo, reqCtx, gwCtx.isRasp, securityResponseId);
-            if (rba != null) {
-              flow.setAction(rba);
+
+            if (gwCtx.isRasp) {
+                WafMetricCollector.get().raspRuleEval(gwCtx.raspRuleType);
             }
-          } else if ("generate_stack".equals(actionInfo.type)) {
-            if (Config.get().isAppSecStackTraceEnabled()) {
-              String stackId = (String) actionInfo.parameters.get("stack_id");
-              StackTraceEvent stackTraceEvent = createExploitStackTraceEvent(stackId);
-              reqCtx.reportStackTrace(stackTraceEvent);
-            } else {
-              log.debug("Ignoring action with type generate_stack (disabled by config)");
+
+            try {
+                resultWithData = doRunWaf(reqCtx, newData, ctxAndAddr, gwCtx);
+                if (resultWithData == null) {
+                    // WAF context closed concurrently between the fast-path check and context creation; skip
+                    // (APPSEC-69085). raspRuleEval() was already counted above, so don't also count
+                    // raspRuleSkipped() here - that counter is reserved for calls that never attempted eval.
+                    log.debug("Skipped; the WAF context was closed concurrently");
+                    WafMetricCollector.get().wafContextClosedRace();
+                    return;
+                }
+            } catch (TimeoutWafException tpe) {
+                if (gwCtx.isRasp) {
+                    reqCtx.increaseRaspTimeouts();
+                    WafMetricCollector.get().raspTimeout(gwCtx.raspRuleType);
+                } else {
+                    reqCtx.increaseWafTimeouts();
+                    log.debug(LogCollector.EXCLUDE_TELEMETRY, "Timeout calling the WAF", tpe);
+                }
+                return;
+            } catch (UnclassifiedWafException e) {
+                if (reqCtx.isWafContextClosed()) {
+                    // The context was closed concurrently between getOrCreateWafContext() and this run()
+                    // call (APPSEC-69085) - the same benign race already tracked below via
+                    // wafContextClosedRace(); avoid double-counting it as a real WAF error.
+                    log.debug("Skipped; the WAF context was closed concurrently");
+                    WafMetricCollector.get().wafContextClosedRace();
+                } else {
+                    log.error("Error calling WAF", e);
+                    incrementErrorCodeMetric(reqCtx, gwCtx, e.code);
+                }
+                return;
+            } catch (AbstractWafException e) {
+                incrementErrorCodeMetric(reqCtx, gwCtx, e.code);
+                return;
+            } finally {
+                if (log.isDebugEnabled()) {
+                    long elapsed = System.currentTimeMillis() - start;
+                    StandardizedLogging.finishedExecutionWAF(log, elapsed);
+                }
+                if (!gwCtx.isRasp) {
+                    WafMetrics wafMetrics = reqCtx.getWafMetrics();
+                    if (wafMetrics != null) {
+                        final long stringTooLong = wafMetrics.getTruncatedStringTooLongCount();
+                        final long listMapTooLarge = wafMetrics.getTruncatedListMapTooLargeCount();
+                        final long objectTooDeep = wafMetrics.getTruncatedObjectTooDeepCount();
+
+                        if (stringTooLong > 0 || listMapTooLarge > 0 || objectTooDeep > 0) {
+                            reqCtx.setWafTruncated();
+                            WafMetricCollector.get()
+                                    .wafInputTruncated(stringTooLong > 0, listMapTooLarge > 0, objectTooDeep > 0);
+                        }
+                    }
+                }
             }
-          } else if ("extended_data_collection".equals(actionInfo.type)) {
-            // Extended data collection is handled by the GatewayBridge
-            reqCtx.setExtendedDataCollection(true);
-            // Handle max_collected_headers parameter which can come as Number or String
-            // representation of a number
-            int maxHeaders = AppSecRequestContext.DEFAULT_EXTENDED_DATA_COLLECTION_MAX_HEADERS;
-            Object maxHeadersParam =
-                actionInfo.parameters.getOrDefault(
-                    "max_collected_headers",
-                    AppSecRequestContext.DEFAULT_EXTENDED_DATA_COLLECTION_MAX_HEADERS);
-            if (maxHeadersParam instanceof Number) {
-              maxHeaders = ((Number) maxHeadersParam).intValue();
-            } else if (maxHeadersParam instanceof String) {
-              try {
-                maxHeaders = Integer.parseInt((String) maxHeadersParam);
-              } catch (NumberFormatException e) {
-                log.debug("Failed to parse max_collected_headers value: {}", maxHeadersParam);
-              }
+
+            StandardizedLogging.inAppWafReturn(log, resultWithData);
+
+            if (resultWithData.result != Waf.Result.OK) {
+                if (log.isDebugEnabled()) {
+                    log.warn("WAF signalled result {}: {}", resultWithData.result, resultWithData.data);
+                }
+
+                if (gwCtx.isRasp) {
+                    reqCtx.setRaspMatched(true);
+                }
+
+                String securityResponseId = null;
+                for (Map.Entry<String, Map<String, Object>> action : resultWithData.actions.entrySet()) {
+                    String actionType = action.getKey();
+                    Map<String, Object> actionParams = action.getValue();
+
+                    ActionInfo actionInfo = new ActionInfo(actionType, actionParams);
+
+                    if ("block_request".equals(actionInfo.type)) {
+                        // Extract security_response_id from action parameters for use in triggers
+                        securityResponseId = (String) actionInfo.parameters.get("security_response_id");
+                        Flow.Action.RequestBlockingAction rba =
+                                createBlockRequestAction(actionInfo, reqCtx, gwCtx.isRasp, securityResponseId);
+                        if (rba != null) {
+                            flow.setAction(rba);
+                        }
+                    } else if ("redirect_request".equals(actionInfo.type)) {
+                        // Extract security_response_id from action parameters for use in triggers
+                        securityResponseId = (String) actionInfo.parameters.get("security_response_id");
+                        Flow.Action.RequestBlockingAction rba =
+                                createRedirectRequestAction(actionInfo, reqCtx, gwCtx.isRasp, securityResponseId);
+                        if (rba != null) {
+                            flow.setAction(rba);
+                        }
+                    } else if ("generate_stack".equals(actionInfo.type)) {
+                        if (Config.get().isAppSecStackTraceEnabled()) {
+                            String stackId = (String) actionInfo.parameters.get("stack_id");
+                            StackTraceEvent stackTraceEvent = createExploitStackTraceEvent(stackId);
+                            reqCtx.reportStackTrace(stackTraceEvent);
+                        } else {
+                            log.debug("Ignoring action with type generate_stack (disabled by config)");
+                        }
+                    } else if ("extended_data_collection".equals(actionInfo.type)) {
+                        // Extended data collection is handled by the GatewayBridge
+                        reqCtx.setExtendedDataCollection(true);
+                        // Handle max_collected_headers parameter which can come as Number or String
+                        // representation of a number
+                        int maxHeaders = AppSecRequestContext.DEFAULT_EXTENDED_DATA_COLLECTION_MAX_HEADERS;
+                        Object maxHeadersParam = actionInfo.parameters.getOrDefault(
+                                "max_collected_headers",
+                                AppSecRequestContext.DEFAULT_EXTENDED_DATA_COLLECTION_MAX_HEADERS);
+                        if (maxHeadersParam instanceof Number) {
+                            maxHeaders = ((Number) maxHeadersParam).intValue();
+                        } else if (maxHeadersParam instanceof String) {
+                            try {
+                                maxHeaders = Integer.parseInt((String) maxHeadersParam);
+                            } catch (NumberFormatException e) {
+                                log.debug("Failed to parse max_collected_headers value: {}", maxHeadersParam);
+                            }
+                        }
+                        reqCtx.setExtendedDataCollectionMaxHeaders(maxHeaders);
+                    } else {
+                        log.info("Ignoring action with type {}", actionInfo.type);
+                        if (!gwCtx.isRasp) {
+                            reqCtx.setWafRequestBlockFailure();
+                        }
+                    }
+                }
+                if (gwCtx.isRasp) {
+                    WafMetricCollector.get().raspRuleMatch(gwCtx.raspRuleType, flow.isBlocking());
+                }
+                Collection<AppSecEvent> events = buildEvents(resultWithData, securityResponseId);
+                // The limiter gates force-keeping the trace, not WAF execution or event reporting.
+                if (resultWithData.keep) {
+                    boolean isThrottled = reqCtx.isThrottled(rateLimiter);
+                    if (!isThrottled) {
+                        reqCtx.setManuallyKept(true);
+                        AgentSpan activeSpan = AgentTracer.get().activeSpan();
+                        if (activeSpan != null) {
+                            log.debug("Setting force-keep tag and manual keep tag on the current span");
+                            // Keep event related span, because it could be ignored in case of
+                            // reduced datadog sampling rate.
+                            activeSpan.getLocalRootSpan().setTag(Tags.ASM_KEEP, true);
+                            // If APM is disabled, inform downstream services that the current
+                            // distributed trace contains at least one ASM event and must inherit
+                            // the given force-keep priority
+                            activeSpan.getLocalRootSpan().setTag(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
+                        }
+                    } else {
+                        log.debug("Rate limited AppSec trace");
+                        if (!gwCtx.isRasp) {
+                            reqCtx.setWafRateLimited();
+                        }
+                    }
+                }
+
+                if (flow.isBlocking()) {
+                    if (!gwCtx.isRasp) {
+                        reqCtx.setWafBlocked();
+                    }
+                }
+                // report is still done even without keep, in case sampler_keep is desired
+                if (resultWithData.events) {
+                    reqCtx.reportEvents(events);
+                }
             }
-            reqCtx.setExtendedDataCollectionMaxHeaders(maxHeaders);
-          } else {
-            log.info("Ignoring action with type {}", actionInfo.type);
-            if (!gwCtx.isRasp) {
-              reqCtx.setWafRequestBlockFailure();
+
+            if (resultWithData.attributes != null && !resultWithData.attributes.isEmpty()) {
+                reqCtx.reportDerivatives(resultWithData.attributes);
             }
-          }
         }
-        if (gwCtx.isRasp) {
-          WafMetricCollector.get().raspRuleMatch(gwCtx.raspRuleType, flow.isBlocking());
-        }
-        Collection<AppSecEvent> events = buildEvents(resultWithData, securityResponseId);
-        // The limiter gates force-keeping the trace, not WAF execution or event reporting.
-        if (resultWithData.keep) {
-          boolean isThrottled = reqCtx.isThrottled(rateLimiter);
-          if (!isThrottled) {
-            reqCtx.setManuallyKept(true);
-            AgentSpan activeSpan = AgentTracer.get().activeSpan();
-            if (activeSpan != null) {
-              log.debug("Setting force-keep tag and manual keep tag on the current span");
-              // Keep event related span, because it could be ignored in case of
-              // reduced datadog sampling rate.
-              activeSpan.getLocalRootSpan().setTag(Tags.ASM_KEEP, true);
-              // If APM is disabled, inform downstream services that the current
-              // distributed trace contains at least one ASM event and must inherit
-              // the given force-keep priority
-              activeSpan
-                  .getLocalRootSpan()
-                  .setTag(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
-            }
-          } else {
-            log.debug("Rate limited AppSec trace");
-            if (!gwCtx.isRasp) {
-              reqCtx.setWafRateLimited();
+
+        private Flow.Action.RequestBlockingAction createBlockRequestAction(
+                final ActionInfo actionInfo,
+                final AppSecRequestContext reqCtx,
+                final boolean isRasp,
+                final String securityResponseId) {
+            try {
+                int statusCode;
+                Object statusCodeObj = actionInfo.parameters.get("status_code");
+                if (statusCodeObj instanceof Number) {
+                    statusCode = ((Number) statusCodeObj).intValue();
+                } else if (statusCodeObj instanceof String) {
+                    statusCode = Integer.parseInt((String) statusCodeObj);
+                } else {
+                    statusCode = 403;
+                }
+                String contentType = (String) actionInfo.parameters.getOrDefault("type", "auto");
+                BlockingContentType blockingContentType = BlockingContentType.AUTO;
+                try {
+                    blockingContentType = BlockingContentType.valueOf(contentType.toUpperCase(Locale.ROOT));
+                } catch (IllegalArgumentException iae) {
+                    log.warn("Unknown content type: {}; using auto", contentType);
+                }
+                return new Flow.Action.RequestBlockingAction(
+                        statusCode, blockingContentType, Collections.emptyMap(), securityResponseId);
+            } catch (RuntimeException cce) {
+                log.warn("Invalid blocking action data", cce);
+                if (!isRasp) {
+                    reqCtx.setWafRequestBlockFailure();
+                }
+                return null;
             }
-          }
         }
 
-        if (flow.isBlocking()) {
-          if (!gwCtx.isRasp) {
-            reqCtx.setWafBlocked();
-          }
+        private Flow.Action.RequestBlockingAction createRedirectRequestAction(
+                final ActionInfo actionInfo,
+                final AppSecRequestContext reqCtx,
+                final boolean isRasp,
+                final String securityResponseId) {
+            try {
+                int statusCode;
+                Object statusCodeObj = actionInfo.parameters.get("status_code");
+                if (statusCodeObj instanceof Number) {
+                    statusCode = ((Number) statusCodeObj).intValue();
+                } else if (statusCodeObj instanceof String) {
+                    statusCode = Integer.parseInt((String) statusCodeObj);
+                } else {
+                    statusCode = 303;
+                }
+                if (statusCode < 300 || statusCode > 399) {
+                    statusCode = 303;
+                }
+                String location = (String) actionInfo.parameters.get("location");
+                if (location == null) {
+                    throw new RuntimeException("redirect_request action has no location");
+                }
+                if (securityResponseId != null && !securityResponseId.isEmpty()) {
+                    // For custom redirects, only replace [security_response_id] placeholder if present in the
+                    // URL.
+                    // The client decides whether to include security_response_id by adding the placeholder.
+                    // We don't automatically append security_response_id as a URL parameter.
+                    if (location.contains("[security_response_id]")) {
+                        location = location.replace("[security_response_id]", securityResponseId);
+                    }
+                }
+                return Flow.Action.RequestBlockingAction.forRedirect(statusCode, location, securityResponseId);
+            } catch (RuntimeException cce) {
+                log.warn("Invalid blocking action data", cce);
+                if (!isRasp) {
+                    reqCtx.setWafRequestBlockFailure();
+                }
+                return null;
+            }
         }
-        // report is still done even without keep, in case sampler_keep is desired
-        if (resultWithData.events) {
-          reqCtx.reportEvents(events);
+
+        private StackTraceEvent createExploitStackTraceEvent(String stackId) {
+            if (stackId == null || stackId.isEmpty()) {
+                return null;
+            }
+            List<StackTraceFrame> result = StackUtils.generateUserCodeStackTrace();
+            return new StackTraceEvent(result, DEFAULT_LANGUAGE, stackId, EXPLOIT_DETECTED_MSG);
         }
-      }
 
-      if (resultWithData.attributes != null && !resultWithData.attributes.isEmpty()) {
-        reqCtx.reportDerivatives(resultWithData.attributes);
-      }
-    }
+        private Waf.ResultWithData doRunWaf(
+                AppSecRequestContext reqCtx, DataBundle newData, CtxAndAddresses ctxAndAddr, GatewayContext gwCtx)
+                throws AbstractWafException {
+            WafContext wafContext = reqCtx.getOrCreateWafContext(ctxAndAddr.ctx, wafMetricsEnabled, gwCtx.isRasp);
+            if (wafContext == null) {
+                // Context closed concurrently with the isWafContextClosed() check in onDataAvailable; skip
+                // (APPSEC-69085).
+                return null;
+            }
+            WafMetrics metrics;
+            if (gwCtx.isRasp) {
+                metrics = reqCtx.getRaspMetrics();
+                reqCtx.getRaspMetricsCounter().incrementAndGet();
+            } else {
+                metrics = reqCtx.getWafMetrics();
+            }
 
-    private Flow.Action.RequestBlockingAction createBlockRequestAction(
-        final ActionInfo actionInfo,
-        final AppSecRequestContext reqCtx,
-        final boolean isRasp,
-        final String securityResponseId) {
-      try {
-        int statusCode;
-        Object statusCodeObj = actionInfo.parameters.get("status_code");
-        if (statusCodeObj instanceof Number) {
-          statusCode = ((Number) statusCodeObj).intValue();
-        } else if (statusCodeObj instanceof String) {
-          statusCode = Integer.parseInt((String) statusCodeObj);
-        } else {
-          statusCode = 403;
+            if (gwCtx.isTransient) {
+                return runWafTransient(wafContext, metrics, newData, ctxAndAddr);
+            } else {
+                return runWafContext(wafContext, metrics, newData, ctxAndAddr);
+            }
+        }
+
+        private Waf.ResultWithData runWafContext(
+                WafContext wafContext, WafMetrics metrics, DataBundle newData, CtxAndAddresses ctxAndAddr)
+                throws AbstractWafException {
+            return wafContext.run(new DataBundleMapWrapper(ctxAndAddr.addressesOfInterest, newData), LIMITS, metrics);
         }
-        String contentType = (String) actionInfo.parameters.getOrDefault("type", "auto");
-        BlockingContentType blockingContentType = BlockingContentType.AUTO;
-        try {
-          blockingContentType = BlockingContentType.valueOf(contentType.toUpperCase(Locale.ROOT));
-        } catch (IllegalArgumentException iae) {
-          log.warn("Unknown content type: {}; using auto", contentType);
-        }
-        return new Flow.Action.RequestBlockingAction(
-            statusCode, blockingContentType, Collections.emptyMap(), securityResponseId);
-      } catch (RuntimeException cce) {
-        log.warn("Invalid blocking action data", cce);
-        if (!isRasp) {
-          reqCtx.setWafRequestBlockFailure();
-        }
-        return null;
-      }
     }
 
-    private Flow.Action.RequestBlockingAction createRedirectRequestAction(
-        final ActionInfo actionInfo,
-        final AppSecRequestContext reqCtx,
-        final boolean isRasp,
-        final String securityResponseId) {
-      try {
-        int statusCode;
-        Object statusCodeObj = actionInfo.parameters.get("status_code");
-        if (statusCodeObj instanceof Number) {
-          statusCode = ((Number) statusCodeObj).intValue();
-        } else if (statusCodeObj instanceof String) {
-          statusCode = Integer.parseInt((String) statusCodeObj);
+    private static void incrementErrorCodeMetric(AppSecRequestContext reqCtx, GatewayContext gwCtx, int code) {
+        if (gwCtx.isRasp) {
+            WafMetricCollector.get().raspErrorCode(gwCtx.raspRuleType, code);
         } else {
-          statusCode = 303;
-        }
-        if (statusCode < 300 || statusCode > 399) {
-          statusCode = 303;
-        }
-        String location = (String) actionInfo.parameters.get("location");
-        if (location == null) {
-          throw new RuntimeException("redirect_request action has no location");
-        }
-        if (securityResponseId != null && !securityResponseId.isEmpty()) {
-          // For custom redirects, only replace [security_response_id] placeholder if present in the
-          // URL.
-          // The client decides whether to include security_response_id by adding the placeholder.
-          // We don't automatically append security_response_id as a URL parameter.
-          if (location.contains("[security_response_id]")) {
-            location = location.replace("[security_response_id]", securityResponseId);
-          }
-        }
-        return Flow.Action.RequestBlockingAction.forRedirect(
-            statusCode, location, securityResponseId);
-      } catch (RuntimeException cce) {
-        log.warn("Invalid blocking action data", cce);
-        if (!isRasp) {
-          reqCtx.setWafRequestBlockFailure();
-        }
-        return null;
-      }
+            WafMetricCollector.get().wafErrorCode(code);
+            reqCtx.setWafErrors();
+        }
     }
 
-    private StackTraceEvent createExploitStackTraceEvent(String stackId) {
-      if (stackId == null || stackId.isEmpty()) {
-        return null;
-      }
-      List<StackTraceFrame> result = StackUtils.generateUserCodeStackTrace();
-      return new StackTraceEvent(result, DEFAULT_LANGUAGE, stackId, EXPLOIT_DETECTED_MSG);
+    private Waf.ResultWithData runWafTransient(
+            WafContext wafContext, WafMetrics metrics, DataBundle newData, CtxAndAddresses ctxAndAddr)
+            throws AbstractWafException {
+        return wafContext.runEphemeral(
+                new DataBundleMapWrapper(ctxAndAddr.addressesOfInterest, newData), LIMITS, metrics);
     }
 
-    private Waf.ResultWithData doRunWaf(
-        AppSecRequestContext reqCtx,
-        DataBundle newData,
-        CtxAndAddresses ctxAndAddr,
-        GatewayContext gwCtx)
-        throws AbstractWafException {
-      WafContext wafContext =
-          reqCtx.getOrCreateWafContext(ctxAndAddr.ctx, wafMetricsEnabled, gwCtx.isRasp);
-      if (wafContext == null) {
-        // Context closed concurrently with the isWafContextClosed() check in onDataAvailable; skip
-        // (APPSEC-69085).
-        return null;
-      }
-      WafMetrics metrics;
-      if (gwCtx.isRasp) {
-        metrics = reqCtx.getRaspMetrics();
-        reqCtx.getRaspMetricsCounter().incrementAndGet();
-      } else {
-        metrics = reqCtx.getWafMetrics();
-      }
-
-      if (gwCtx.isTransient) {
-        return runWafTransient(wafContext, metrics, newData, ctxAndAddr);
-      } else {
-        return runWafContext(wafContext, metrics, newData, ctxAndAddr);
-      }
-    }
+    private Collection<AppSecEvent> buildEvents(Waf.ResultWithData actionWithData, String securityResponseId) {
+        if (actionWithData.data == null) {
+            // Since ruleset 1.14.1, fingerprint processors evaluate unconditionally, so the WAF
+            // returns MATCH with no data (no real rule/event) on every ordinary request, not just on
+            // attacks. This is expected and no longer worth logging (dd-trace-py/dd-trace-go don't log
+            // here either: both gate their equivalent log on non-empty events, not on the return code).
+            return Collections.emptyList();
+        }
+        Collection<WAFResultData> listResults;
+        try {
+            if (actionWithData.data == null || actionWithData.data.isEmpty()) {
+                log.debug("WAF returned no data");
+                return emptyList();
+            }
+            listResults = RES_JSON_ADAPTER.fromJson(actionWithData.data);
+        } catch (IOException e) {
+            throw new UndeclaredThrowableException(e);
+        }
 
-    private Waf.ResultWithData runWafContext(
-        WafContext wafContext, WafMetrics metrics, DataBundle newData, CtxAndAddresses ctxAndAddr)
-        throws AbstractWafException {
-      return wafContext.run(
-          new DataBundleMapWrapper(ctxAndAddr.addressesOfInterest, newData), LIMITS, metrics);
-    }
-  }
-
-  private static void incrementErrorCodeMetric(
-      AppSecRequestContext reqCtx, GatewayContext gwCtx, int code) {
-    if (gwCtx.isRasp) {
-      WafMetricCollector.get().raspErrorCode(gwCtx.raspRuleType, code);
-    } else {
-      WafMetricCollector.get().wafErrorCode(code);
-      reqCtx.setWafErrors();
-    }
-  }
-
-  private Waf.ResultWithData runWafTransient(
-      WafContext wafContext, WafMetrics metrics, DataBundle newData, CtxAndAddresses ctxAndAddr)
-      throws AbstractWafException {
-    return wafContext.runEphemeral(
-        new DataBundleMapWrapper(ctxAndAddr.addressesOfInterest, newData), LIMITS, metrics);
-  }
-
-  private Collection<AppSecEvent> buildEvents(
-      Waf.ResultWithData actionWithData, String securityResponseId) {
-    if (actionWithData.data == null) {
-      // Since ruleset 1.14.1, fingerprint processors evaluate unconditionally, so the WAF
-      // returns MATCH with no data (no real rule/event) on every ordinary request, not just on
-      // attacks. This is expected and no longer worth logging (dd-trace-py/dd-trace-go don't log
-      // here either: both gate their equivalent log on non-empty events, not on the return code).
-      return Collections.emptyList();
-    }
-    Collection<WAFResultData> listResults;
-    try {
-      if (actionWithData.data == null || actionWithData.data.isEmpty()) {
-        log.debug("WAF returned no data");
+        if (listResults != null && !listResults.isEmpty()) {
+            return listResults.stream()
+                    .map(wafResult -> buildEvent(wafResult, securityResponseId))
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
+        }
         return emptyList();
-      }
-      listResults = RES_JSON_ADAPTER.fromJson(actionWithData.data);
-    } catch (IOException e) {
-      throw new UndeclaredThrowableException(e);
-    }
-
-    if (listResults != null && !listResults.isEmpty()) {
-      return listResults.stream()
-          .map(wafResult -> buildEvent(wafResult, securityResponseId))
-          .filter(Objects::nonNull)
-          .collect(Collectors.toList());
     }
-    return emptyList();
-  }
 
-  private AppSecEvent buildEvent(WAFResultData wafResult, String securityResponseId) {
+    private AppSecEvent buildEvent(WAFResultData wafResult, String securityResponseId) {
 
-    if (wafResult == null || wafResult.rule == null || wafResult.rule_matches == null) {
-      log.warn("WAF result is empty: {}", wafResult);
-      return null;
-    }
+        if (wafResult == null || wafResult.rule == null || wafResult.rule_matches == null) {
+            log.warn("WAF result is empty: {}", wafResult);
+            return null;
+        }
 
-    Long spanId = null;
-    AgentSpan agentSpan = AgentTracer.get().activeSpan();
-    if (agentSpan != null) {
-      spanId = agentSpan.getSpanId();
-    }
+        Long spanId = null;
+        AgentSpan agentSpan = AgentTracer.get().activeSpan();
+        if (agentSpan != null) {
+            spanId = agentSpan.getSpanId();
+        }
 
-    return new AppSecEvent.Builder()
-        .withRule(wafResult.rule)
-        .withRuleMatches(wafResult.rule_matches)
-        .withSpanId(spanId)
-        .withStackId(wafResult.stack_id)
-        .withSecurityResponseId(securityResponseId)
-        .build();
-  }
-
-  private static final class DataBundleMapWrapper implements Map<String, Object> {
-    private final Collection<Address<?>> addressesOfInterest;
-    private final DataBundle dataBundle;
-
-    private DataBundleMapWrapper(
-        Collection<Address<?>> addressesOfInterest, DataBundle dataBundle) {
-      this.addressesOfInterest = addressesOfInterest;
-      this.dataBundle = dataBundle;
+        return new AppSecEvent.Builder()
+                .withRule(wafResult.rule)
+                .withRuleMatches(wafResult.rule_matches)
+                .withSpanId(spanId)
+                .withStackId(wafResult.stack_id)
+                .withSecurityResponseId(securityResponseId)
+                .build();
     }
 
-    // ddwaf only calls entrySet().iterator() and size()
-    @Nonnull
-    @Override
-    public Set<Entry<String, Object>> entrySet() {
-      try {
-        return (Set<Entry<String, Object>>)
-            PROXY_CLASS_CONSTRUCTOR.newInstance(new SetIteratorInvocationHandler());
-      } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
-        throw new UndeclaredThrowableException(e);
-      }
-    }
+    private static final class DataBundleMapWrapper implements Map<String, Object> {
+        private final Collection<Address<?>> addressesOfInterest;
+        private final DataBundle dataBundle;
 
-    private class SetIteratorInvocationHandler implements InvocationHandler {
-      @Override
-      public Object invoke(Object proxy, Method method, Object[] args) {
-        if (!method.getName().equals("iterator")) {
-          throw new UnsupportedOperationException(
-              "Only supported method is 'iterator'; got " + method.getName());
+        private DataBundleMapWrapper(Collection<Address<?>> addressesOfInterest, DataBundle dataBundle) {
+            this.addressesOfInterest = addressesOfInterest;
+            this.dataBundle = dataBundle;
         }
 
-        final Iterator<Address<?>> addrIterator = dataBundle.getAllAddresses().iterator();
-        final MutableEntry entry = new MutableEntry();
-
-        return new Iterator<Entry<String, Object>>() {
-          private Address<?> next = computeNextAddress();
-
-          private Address<?> computeNextAddress() {
-            return addrIterator.hasNext() ? addrIterator.next() : null;
-          }
-
-          @Override
-          public boolean hasNext() {
-            return next != null;
-          }
+        // ddwaf only calls entrySet().iterator() and size()
+        @Nonnull
+        @Override
+        public Set<Entry<String, Object>> entrySet() {
+            try {
+                return (Set<Entry<String, Object>>)
+                        PROXY_CLASS_CONSTRUCTOR.newInstance(new SetIteratorInvocationHandler());
+            } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+                throw new UndeclaredThrowableException(e);
+            }
+        }
 
-          @Override
-          public Entry<String, Object> next() {
-            if (next == null) {
-              throw new NoSuchElementException();
+        private class SetIteratorInvocationHandler implements InvocationHandler {
+            @Override
+            public Object invoke(Object proxy, Method method, Object[] args) {
+                if (!method.getName().equals("iterator")) {
+                    throw new UnsupportedOperationException(
+                            "Only supported method is 'iterator'; got " + method.getName());
+                }
+
+                final Iterator<Address<?>> addrIterator =
+                        dataBundle.getAllAddresses().iterator();
+                final MutableEntry entry = new MutableEntry();
+
+                return new Iterator<Entry<String, Object>>() {
+                    private Address<?> next = computeNextAddress();
+
+                    private Address<?> computeNextAddress() {
+                        return addrIterator.hasNext() ? addrIterator.next() : null;
+                    }
+
+                    @Override
+                    public boolean hasNext() {
+                        return next != null;
+                    }
+
+                    @Override
+                    public Entry<String, Object> next() {
+                        if (next == null) {
+                            throw new NoSuchElementException();
+                        }
+                        // the usage pattern in ddwaf allows object recycling here
+                        entry.key = next.getKey();
+                        entry.value =
+                                addressesOfInterest.contains(next) ? dataBundle.get(next) : Collections.emptyMap();
+                        next = computeNextAddress();
+                        return entry;
+                    }
+                };
             }
-            // the usage pattern in ddwaf allows object recycling here
-            entry.key = next.getKey();
-            entry.value =
-                addressesOfInterest.contains(next) ? dataBundle.get(next) : Collections.emptyMap();
-            next = computeNextAddress();
-            return entry;
-          }
-        };
-      }
-    }
+        }
 
-    @Override
-    public int size() {
-      return dataBundle.size();
-    }
+        @Override
+        public int size() {
+            return dataBundle.size();
+        }
 
-    /* unimplemented map methods */
-    @Override
-    public boolean isEmpty() {
-      throw new UnsupportedOperationException();
-    }
+        /* unimplemented map methods */
+        @Override
+        public boolean isEmpty() {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public boolean containsKey(Object key) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public boolean containsKey(Object key) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public boolean containsValue(Object value) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public boolean containsValue(Object value) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public Object get(Object key) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public Object get(Object key) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public Object put(String key, Object value) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public Object put(String key, Object value) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public Object remove(Object key) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public Object remove(Object key) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public void putAll(@Nonnull Map<? extends String, ?> m) {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public void putAll(@Nonnull Map<? extends String, ?> m) {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public void clear() {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public void clear() {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public Set<String> keySet() {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        public Set<String> keySet() {
+            throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public Collection<Object> values() {
-      throw new UnsupportedOperationException();
+        @Override
+        public Collection<Object> values() {
+            throw new UnsupportedOperationException();
+        }
     }
-  }
 
-  private static final class MutableEntry implements Map.Entry<String, Object> {
-    String key;
-    Object value;
+    private static final class MutableEntry implements Map.Entry<String, Object> {
+        String key;
+        Object value;
 
-    @Override
-    public String getKey() {
-      return key;
-    }
+        @Override
+        public String getKey() {
+            return key;
+        }
 
-    @Override
-    public Object getValue() {
-      return value;
-    }
+        @Override
+        public Object getValue() {
+            return value;
+        }
 
-    @Override
-    public Object setValue(Object value) {
-      throw new UnsupportedOperationException();
+        @Override
+        public Object setValue(Object value) {
+            throw new UnsupportedOperationException();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFResultData.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFResultData.java
index faf5216d2e4..971662b307f 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFResultData.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFResultData.java
@@ -15,63 +15,63 @@
  * constructor without also declaring a no-arg one removes it.
  */
 public class WAFResultData {
-  Rule rule;
-  List<RuleMatch> rule_matches;
-  String stack_id;
+    Rule rule;
+    List<RuleMatch> rule_matches;
+    String stack_id;
 
-  public static class RuleMatch {
-    String operator;
-    String operator_value;
-    List<Parameter> parameters;
+    public static class RuleMatch {
+        String operator;
+        String operator_value;
+        List<Parameter> parameters;
 
-    RuleMatch() {}
+        RuleMatch() {}
 
-    public RuleMatch(String operator, String operator_value, List<Parameter> parameters) {
-      this.operator = operator;
-      this.operator_value = operator_value;
-      this.parameters = parameters;
+        public RuleMatch(String operator, String operator_value, List<Parameter> parameters) {
+            this.operator = operator;
+            this.operator_value = operator_value;
+            this.parameters = parameters;
+        }
     }
-  }
 
-  public static class Rule {
-    public String id; // expose for log message
-    String name;
-    Map<String, String> tags;
+    public static class Rule {
+        public String id; // expose for log message
+        String name;
+        Map<String, String> tags;
 
-    Rule() {}
+        Rule() {}
 
-    public Rule(String id, String name, Map<String, String> tags) {
-      this.id = id;
-      this.name = name;
-      this.tags = tags;
+        public Rule(String id, String name, Map<String, String> tags) {
+            this.id = id;
+            this.name = name;
+            this.tags = tags;
+        }
     }
-  }
 
-  public static class Parameter extends MatchInfo {
-    MatchInfo resource;
-    MatchInfo params;
-    MatchInfo db_type;
-    List<String> highlight;
+    public static class Parameter extends MatchInfo {
+        MatchInfo resource;
+        MatchInfo params;
+        MatchInfo db_type;
+        List<String> highlight;
 
-    Parameter() {}
+        Parameter() {}
 
-    public Parameter(String address, List<Object> key_path, String value, List<String> highlight) {
-      super(address, key_path, value);
-      this.highlight = highlight;
+        public Parameter(String address, List<Object> key_path, String value, List<String> highlight) {
+            super(address, key_path, value);
+            this.highlight = highlight;
+        }
     }
-  }
 
-  public static class MatchInfo {
-    String address;
-    List<Object> key_path;
-    String value;
+    public static class MatchInfo {
+        String address;
+        List<Object> key_path;
+        String value;
 
-    MatchInfo() {}
+        MatchInfo() {}
 
-    public MatchInfo(String address, List<Object> key_path, String value) {
-      this.address = address;
-      this.key_path = key_path;
-      this.value = value;
+        public MatchInfo(String address, List<Object> key_path, String value) {
+            this.address = address;
+            this.key_path = key_path;
+            this.value = value;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFStatsReporter.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFStatsReporter.java
index 408a6b36a08..556087e4cc8 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFStatsReporter.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFStatsReporter.java
@@ -8,54 +8,52 @@
 import java.util.Collection;
 
 public class WAFStatsReporter implements TraceSegmentPostProcessor {
-  private static final String WAF_TOTAL_DURATION_US_TAG = "_dd.appsec.waf.duration_ext";
-  private static final String WAF_TOTAL_DDWAF_RUN_DURATION_US_TAG = "_dd.appsec.waf.duration";
-  private static final String RASP_TOTAL_DURATION_US_TAG = "_dd.appsec.rasp.duration_ext";
-  private static final String RASP_TOTAL_DDWAF_RUN_DURATION_US_TAG = "_dd.appsec.rasp.duration";
-  private static final String RASP_RULE_EVAL = "_dd.appsec.rasp.rule.eval";
-  private static final String RULE_FILE_VERSION = "_dd.appsec.event_rules.version";
-  public static final String WAF_TIMEOUTS_TAG = "_dd.appsec.waf.timeouts";
-  public static final String RASP_TIMEOUT_TAG = "_dd.appsec.rasp.timeout";
-
-  // XXX: if config is updated, this may not match the actual version run during this request
-  // However, as of this point, we don't update rules at runtime.
-  private volatile String rulesVersion;
-
-  @Override
-  public void processTraceSegment(
-      TraceSegment segment, AppSecRequestContext ctx, Collection<AppSecEvent> collectedEvents) {
-    WafMetrics wafMetrics = ctx.getWafMetrics();
-    if (wafMetrics != null) {
-      segment.setTagTop(WAF_TOTAL_DURATION_US_TAG, wafMetrics.getTotalRunTimeNs() / 1000L);
-      segment.setTagTop(
-          WAF_TOTAL_DDWAF_RUN_DURATION_US_TAG, wafMetrics.getTotalDdwafRunTimeNs() / 1000L);
+    private static final String WAF_TOTAL_DURATION_US_TAG = "_dd.appsec.waf.duration_ext";
+    private static final String WAF_TOTAL_DDWAF_RUN_DURATION_US_TAG = "_dd.appsec.waf.duration";
+    private static final String RASP_TOTAL_DURATION_US_TAG = "_dd.appsec.rasp.duration_ext";
+    private static final String RASP_TOTAL_DDWAF_RUN_DURATION_US_TAG = "_dd.appsec.rasp.duration";
+    private static final String RASP_RULE_EVAL = "_dd.appsec.rasp.rule.eval";
+    private static final String RULE_FILE_VERSION = "_dd.appsec.event_rules.version";
+    public static final String WAF_TIMEOUTS_TAG = "_dd.appsec.waf.timeouts";
+    public static final String RASP_TIMEOUT_TAG = "_dd.appsec.rasp.timeout";
+
+    // XXX: if config is updated, this may not match the actual version run during this request
+    // However, as of this point, we don't update rules at runtime.
+    private volatile String rulesVersion;
+
+    @Override
+    public void processTraceSegment(
+            TraceSegment segment, AppSecRequestContext ctx, Collection<AppSecEvent> collectedEvents) {
+        WafMetrics wafMetrics = ctx.getWafMetrics();
+        if (wafMetrics != null) {
+            segment.setTagTop(WAF_TOTAL_DURATION_US_TAG, wafMetrics.getTotalRunTimeNs() / 1000L);
+            segment.setTagTop(WAF_TOTAL_DDWAF_RUN_DURATION_US_TAG, wafMetrics.getTotalDdwafRunTimeNs() / 1000L);
+        }
+
+        WafMetrics raspMetrics = ctx.getRaspMetrics();
+        if (raspMetrics != null) {
+            segment.setTagTop(RASP_TOTAL_DURATION_US_TAG, raspMetrics.getTotalRunTimeNs() / 1000L);
+            segment.setTagTop(RASP_TOTAL_DDWAF_RUN_DURATION_US_TAG, raspMetrics.getTotalDdwafRunTimeNs() / 1000L);
+            final int raspCount = ctx.getRaspMetricsCounter().get();
+            if (raspCount > 0) {
+                segment.setTagTop(RASP_RULE_EVAL, raspCount);
+            }
+        }
+
+        if (this.rulesVersion != null) {
+            segment.setTagTop(RULE_FILE_VERSION, rulesVersion);
+        }
+
+        if (ctx.getWafTimeouts() > 0) {
+            segment.setTagTop(WAF_TIMEOUTS_TAG, ctx.getWafTimeouts());
+        }
+
+        if (ctx.getRaspTimeouts() > 0) {
+            segment.setTagTop(RASP_TIMEOUT_TAG, ctx.getRaspTimeouts());
+        }
     }
 
-    WafMetrics raspMetrics = ctx.getRaspMetrics();
-    if (raspMetrics != null) {
-      segment.setTagTop(RASP_TOTAL_DURATION_US_TAG, raspMetrics.getTotalRunTimeNs() / 1000L);
-      segment.setTagTop(
-          RASP_TOTAL_DDWAF_RUN_DURATION_US_TAG, raspMetrics.getTotalDdwafRunTimeNs() / 1000L);
-      final int raspCount = ctx.getRaspMetricsCounter().get();
-      if (raspCount > 0) {
-        segment.setTagTop(RASP_RULE_EVAL, raspCount);
-      }
+    public void setRulesVersion(String rulesetVersion) {
+        this.rulesVersion = rulesetVersion;
     }
-
-    if (this.rulesVersion != null) {
-      segment.setTagTop(RULE_FILE_VERSION, rulesVersion);
-    }
-
-    if (ctx.getWafTimeouts() > 0) {
-      segment.setTagTop(WAF_TIMEOUTS_TAG, ctx.getWafTimeouts());
-    }
-
-    if (ctx.getRaspTimeouts() > 0) {
-      segment.setTagTop(RASP_TIMEOUT_TAG, ctx.getRaspTimeouts());
-    }
-  }
-
-  public void setRulesVersion(String rulesetVersion) {
-    this.rulesVersion = rulesetVersion;
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WafInitialization.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WafInitialization.java
index 484921c7d3c..0c1da8e65a6 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WafInitialization.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WafInitialization.java
@@ -10,39 +10,39 @@
 import org.slf4j.LoggerFactory;
 
 public class WafInitialization {
-  public static final boolean ONLINE = initWAF();
+    public static final boolean ONLINE = initWAF();
 
-  private static boolean initWAF() {
-    try {
-      boolean simpleLoad = SystemProperties.get("POWERWAF_SIMPLE_LOAD") != null;
-      Waf.initialize(simpleLoad);
-    } catch (Throwable e) {
-      Logger logger = LoggerFactory.getLogger(WafInitialization.class);
-      logger.warn("Error initializing WAF library", e);
-      StandardizedLogging.libddwafCannotBeLoaded(logger, getLibc());
-      return false;
-    }
+    private static boolean initWAF() {
+        try {
+            boolean simpleLoad = SystemProperties.get("POWERWAF_SIMPLE_LOAD") != null;
+            Waf.initialize(simpleLoad);
+        } catch (Throwable e) {
+            Logger logger = LoggerFactory.getLogger(WafInitialization.class);
+            logger.warn("Error initializing WAF library", e);
+            StandardizedLogging.libddwafCannotBeLoaded(logger, getLibc());
+            return false;
+        }
 
-    return true;
-  }
+        return true;
+    }
 
-  private static String getLibc() {
-    String os = SystemProperties.get("os.name");
-    if ("Linux".equals(os)) {
-      File file = new File("/proc/self/maps");
-      try (Scanner sc = new Scanner(file, "ISO-8859-1")) {
-        while (sc.hasNextLine()) {
-          String module = sc.nextLine();
-          if (module.contains("libc.musl-") || module.contains("ld-musl-")) {
-            return "musl";
-          } else if (module.contains("-linux-gnu") || module.contains("libc-")) {
-            return "libc";
-          }
+    private static String getLibc() {
+        String os = SystemProperties.get("os.name");
+        if ("Linux".equals(os)) {
+            File file = new File("/proc/self/maps");
+            try (Scanner sc = new Scanner(file, "ISO-8859-1")) {
+                while (sc.hasNextLine()) {
+                    String module = sc.nextLine();
+                    if (module.contains("libc.musl-") || module.contains("ld-musl-")) {
+                        return "musl";
+                    } else if (module.contains("-linux-gnu") || module.contains("libc-")) {
+                        return "libc";
+                    }
+                }
+            } catch (IOException e) {
+                // purposefully left blank
+            }
         }
-      } catch (IOException e) {
-        // purposefully left blank
-      }
+        return "unknown";
     }
-    return "unknown";
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/ChangeableFlow.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/ChangeableFlow.java
index bb6b123fcd4..d036a1f8f7a 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/ChangeableFlow.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/ChangeableFlow.java
@@ -3,23 +3,23 @@
 import datadog.trace.api.gateway.Flow;
 
 public class ChangeableFlow implements Flow<Void> {
-  Action action = Action.Noop.INSTANCE;
+    Action action = Action.Noop.INSTANCE;
 
-  public boolean isBlocking() {
-    return action.isBlocking();
-  }
+    public boolean isBlocking() {
+        return action.isBlocking();
+    }
 
-  public void setAction(Action blockingAction) {
-    this.action = blockingAction;
-  }
+    public void setAction(Action blockingAction) {
+        this.action = blockingAction;
+    }
 
-  @Override
-  public Action getAction() {
-    return action;
-  }
+    @Override
+    public Action getAction() {
+        return action;
+    }
 
-  @Override
-  public Void getResult() {
-    return null;
-  }
+    @Override
+    public Void getResult() {
+        return null;
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/DataListener.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/DataListener.java
index cba2b80044c..bb923d17677 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/DataListener.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/DataListener.java
@@ -5,9 +5,6 @@
 import com.datadog.appsec.gateway.GatewayContext;
 
 public interface DataListener extends OrderedCallback {
-  void onDataAvailable(
-      ChangeableFlow flow,
-      AppSecRequestContext context,
-      DataBundle dataBundle,
-      GatewayContext gatewayContext);
+    void onDataAvailable(
+            ChangeableFlow flow, AppSecRequestContext context, DataBundle dataBundle, GatewayContext gatewayContext);
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/EventDispatcher.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/EventDispatcher.java
index de29df3d52b..b7d5b6c5586 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/EventDispatcher.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/EventDispatcher.java
@@ -18,164 +18,160 @@
 import org.slf4j.LoggerFactory;
 
 public class EventDispatcher implements EventProducerService {
-  private static final Logger log = LoggerFactory.getLogger(EventDispatcher.class);
-  private static final char[] EMPTY_CHAR_ARRAY = new char[0];
-
-  // indexes are the ids we successively attribute to listeners
-  // we support up to 2^16 listeners in total
-  // The listeners are ordered by priority (from highest to lowest)
-  private List<DataListener> dataListenersIdx;
-  // index: address.serial; values: ordered array of listener idx
-  private List<char[]> dataListenerSubs;
-  private Set<Address<?>> allSubscribedAddresses;
-
-  public EventDispatcher() {
-    KnownAddresses.HEADERS_NO_COOKIES.getKey(); // force class initialization
-
-    final int addressCount = Address.instanceCount();
-    dataListenerSubs = new ArrayList<>(addressCount);
-    for (int i = 0; i < addressCount; i++) {
-      dataListenerSubs.add(EMPTY_CHAR_ARRAY);
-    }
-  }
-
-  public static class DataSubscriptionSet {
-    private final Map<DataListener, Integer> indexes = new HashMap<>();
-    // index: addr.serial
-    private final List<List<DataListener>> addrSubs;
-    private final Set<Address<?>> allAddresses = new HashSet<>();
-
-    public DataSubscriptionSet() {
-      final int addressCount = Address.instanceCount();
-      addrSubs = new ArrayList<>(addressCount);
-      for (int i = 0; i < addressCount; i++) {
-        addrSubs.add(new ArrayList<>());
-      }
+    private static final Logger log = LoggerFactory.getLogger(EventDispatcher.class);
+    private static final char[] EMPTY_CHAR_ARRAY = new char[0];
+
+    // indexes are the ids we successively attribute to listeners
+    // we support up to 2^16 listeners in total
+    // The listeners are ordered by priority (from highest to lowest)
+    private List<DataListener> dataListenersIdx;
+    // index: address.serial; values: ordered array of listener idx
+    private List<char[]> dataListenerSubs;
+    private Set<Address<?>> allSubscribedAddresses;
+
+    public EventDispatcher() {
+        KnownAddresses.HEADERS_NO_COOKIES.getKey(); // force class initialization
+
+        final int addressCount = Address.instanceCount();
+        dataListenerSubs = new ArrayList<>(addressCount);
+        for (int i = 0; i < addressCount; i++) {
+            dataListenerSubs.add(EMPTY_CHAR_ARRAY);
+        }
     }
 
-    public void addSubscription(
-        Collection<Address<?>> anyOfTheseAddresses, DataListener dataListener) {
-      indexes.put(dataListener, indexes.size());
+    public static class DataSubscriptionSet {
+        private final Map<DataListener, Integer> indexes = new HashMap<>();
+        // index: addr.serial
+        private final List<List<DataListener>> addrSubs;
+        private final Set<Address<?>> allAddresses = new HashSet<>();
+
+        public DataSubscriptionSet() {
+            final int addressCount = Address.instanceCount();
+            addrSubs = new ArrayList<>(addressCount);
+            for (int i = 0; i < addressCount; i++) {
+                addrSubs.add(new ArrayList<>());
+            }
+        }
 
-      for (Address<?> addr : anyOfTheseAddresses) {
-        int serial = addr.getSerial();
-        List<DataListener> dataListeners = addrSubs.get(serial);
-        dataListeners.add(dataListener);
-      }
+        public void addSubscription(Collection<Address<?>> anyOfTheseAddresses, DataListener dataListener) {
+            indexes.put(dataListener, indexes.size());
 
-      allAddresses.addAll(anyOfTheseAddresses);
-    }
-  }
+            for (Address<?> addr : anyOfTheseAddresses) {
+                int serial = addr.getSerial();
+                List<DataListener> dataListeners = addrSubs.get(serial);
+                dataListeners.add(dataListener);
+            }
 
-  public void subscribeDataAvailable(DataSubscriptionSet subSet) {
-    int numListeners = subSet.indexes.size();
-    List<DataListener> newDataListenersIdx = new ArrayList<>(subSet.indexes.keySet());
-    newDataListenersIdx.sort(OrderedCallback.CallbackPriorityComparator.INSTANCE);
-
-    for (int i = 0; i < numListeners; i++) {
-      DataListener listener = newDataListenersIdx.get(i);
-      subSet.indexes.put(listener, i); // update index on subSet argument directly
+            allAddresses.addAll(anyOfTheseAddresses);
+        }
     }
 
-    int addressCount = Address.instanceCount();
-    ArrayList<char[]> newDataListenerSubs = new ArrayList<>(addressCount);
+    public void subscribeDataAvailable(DataSubscriptionSet subSet) {
+        int numListeners = subSet.indexes.size();
+        List<DataListener> newDataListenersIdx = new ArrayList<>(subSet.indexes.keySet());
+        newDataListenersIdx.sort(OrderedCallback.CallbackPriorityComparator.INSTANCE);
 
-    for (int addrSerial = 0; addrSerial < addressCount; addrSerial++) {
-      List<DataListener> listenersList = subSet.addrSubs.get(addrSerial);
-      listenersList.sort(OrderedCallback.CallbackPriorityComparator.INSTANCE);
+        for (int i = 0; i < numListeners; i++) {
+            DataListener listener = newDataListenersIdx.get(i);
+            subSet.indexes.put(listener, i); // update index on subSet argument directly
+        }
 
-      // convert list of listeners to char array of their indexes + priority
-      char[] newArray = new char[listenersList.size()];
-      for (int i = 0; i < newArray.length; i++) {
-        DataListener listener = listenersList.get(i);
-        newArray[i] = (char) subSet.indexes.get(listener).intValue();
-      }
+        int addressCount = Address.instanceCount();
+        ArrayList<char[]> newDataListenerSubs = new ArrayList<>(addressCount);
 
-      newDataListenerSubs.add(newArray);
-    }
+        for (int addrSerial = 0; addrSerial < addressCount; addrSerial++) {
+            List<DataListener> listenersList = subSet.addrSubs.get(addrSerial);
+            listenersList.sort(OrderedCallback.CallbackPriorityComparator.INSTANCE);
 
-    dataListenersIdx = newDataListenersIdx;
-    dataListenerSubs = newDataListenerSubs;
-    allSubscribedAddresses = subSet.allAddresses;
-  }
-
-  @Override
-  public DataSubscriberInfo getDataSubscribers(Address<?>... newAddresses) {
-    if (newAddresses.length == 1) {
-      // fast path
-      Address<?> addr = newAddresses[0];
-      char[] ids = dataListenerSubs.get(addr.getSerial());
-      return new DataSubscriberInfoImpl(ids);
-    } else {
-      // calculate union of listeners
-      int numDataListeners = dataListenersIdx.size();
-      BitSet bitSet = new BitSet(numDataListeners);
-      for (Address<?> addr : newAddresses) {
-        char[] subs = dataListenerSubs.get(addr.getSerial());
-        for (int sub : subs) {
-          bitSet.set(sub);
-        }
-      }
-      char[] subsIds = new char[bitSet.cardinality()];
+            // convert list of listeners to char array of their indexes + priority
+            char[] newArray = new char[listenersList.size()];
+            for (int i = 0; i < newArray.length; i++) {
+                DataListener listener = listenersList.get(i);
+                newArray[i] = (char) subSet.indexes.get(listener).intValue();
+            }
 
-      // Copy bits into the array
-      for (int bit = bitSet.nextSetBit(0), i = 0; bit >= 0; bit = bitSet.nextSetBit(bit + 1)) {
-        // operate on index i here
-        subsIds[i++] = (char) bit;
-      }
+            newDataListenerSubs.add(newArray);
+        }
 
-      return new DataSubscriberInfoImpl(subsIds);
-    }
-  }
-
-  @Override
-  public Flow publishDataEvent(
-      DataSubscriberInfo subscribers,
-      AppSecRequestContext ctx,
-      DataBundle newData,
-      GatewayContext gwCtx)
-      throws ExpiredSubscriberInfoException {
-    if (!((DataSubscriberInfoImpl) subscribers).isEventDispatcher(this)) {
-      throw new ExpiredSubscriberInfoException();
+        dataListenersIdx = newDataListenersIdx;
+        dataListenerSubs = newDataListenerSubs;
+        allSubscribedAddresses = subSet.allAddresses;
     }
 
-    if (!gwCtx.isTransient) {
-      ctx.addAll(newData);
-    }
-    ChangeableFlow flow = new ChangeableFlow();
-    for (int idx : ((DataSubscriberInfoImpl) subscribers).listenerIndices) {
-      try {
-        dataListenersIdx.get(idx).onDataAvailable(flow, ctx, newData, gwCtx);
-      } catch (RuntimeException rte) {
-        log.warn("AppSec callback exception", rte);
-      }
-      if (flow.isBlocking()) {
-        break;
-      }
+    @Override
+    public DataSubscriberInfo getDataSubscribers(Address<?>... newAddresses) {
+        if (newAddresses.length == 1) {
+            // fast path
+            Address<?> addr = newAddresses[0];
+            char[] ids = dataListenerSubs.get(addr.getSerial());
+            return new DataSubscriberInfoImpl(ids);
+        } else {
+            // calculate union of listeners
+            int numDataListeners = dataListenersIdx.size();
+            BitSet bitSet = new BitSet(numDataListeners);
+            for (Address<?> addr : newAddresses) {
+                char[] subs = dataListenerSubs.get(addr.getSerial());
+                for (int sub : subs) {
+                    bitSet.set(sub);
+                }
+            }
+            char[] subsIds = new char[bitSet.cardinality()];
+
+            // Copy bits into the array
+            for (int bit = bitSet.nextSetBit(0), i = 0; bit >= 0; bit = bitSet.nextSetBit(bit + 1)) {
+                // operate on index i here
+                subsIds[i++] = (char) bit;
+            }
+
+            return new DataSubscriberInfoImpl(subsIds);
+        }
     }
 
-    return flow;
-  }
-
-  @Override
-  public Collection<Address<?>> allSubscribedDataAddresses() {
-    return allSubscribedAddresses;
-  }
+    @Override
+    public Flow publishDataEvent(
+            DataSubscriberInfo subscribers, AppSecRequestContext ctx, DataBundle newData, GatewayContext gwCtx)
+            throws ExpiredSubscriberInfoException {
+        if (!((DataSubscriberInfoImpl) subscribers).isEventDispatcher(this)) {
+            throw new ExpiredSubscriberInfoException();
+        }
 
-  private class DataSubscriberInfoImpl implements DataSubscriberInfo {
-    final char[] listenerIndices;
+        if (!gwCtx.isTransient) {
+            ctx.addAll(newData);
+        }
+        ChangeableFlow flow = new ChangeableFlow();
+        for (int idx : ((DataSubscriberInfoImpl) subscribers).listenerIndices) {
+            try {
+                dataListenersIdx.get(idx).onDataAvailable(flow, ctx, newData, gwCtx);
+            } catch (RuntimeException rte) {
+                log.warn("AppSec callback exception", rte);
+            }
+            if (flow.isBlocking()) {
+                break;
+            }
+        }
 
-    private DataSubscriberInfoImpl(char[] listenerIndices) {
-      this.listenerIndices = listenerIndices;
+        return flow;
     }
 
     @Override
-    public boolean isEmpty() {
-      return listenerIndices.length == 0;
+    public Collection<Address<?>> allSubscribedDataAddresses() {
+        return allSubscribedAddresses;
     }
 
-    boolean isEventDispatcher(EventDispatcher ed) {
-      return ed == EventDispatcher.this;
+    private class DataSubscriberInfoImpl implements DataSubscriberInfo {
+        final char[] listenerIndices;
+
+        private DataSubscriberInfoImpl(char[] listenerIndices) {
+            this.listenerIndices = listenerIndices;
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return listenerIndices.length == 0;
+        }
+
+        boolean isEventDispatcher(EventDispatcher ed) {
+            return ed == EventDispatcher.this;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/EventProducerService.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/EventProducerService.java
index 9b0cd760320..fee5e72c189 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/EventProducerService.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/EventProducerService.java
@@ -9,39 +9,39 @@
 
 public interface EventProducerService {
 
-  /**
-   * Determines the data callbacks for the given addresses. The return value can be cached if it's
-   * guaranteed that no modifications to the subscriptions will be made between usages, and that the
-   * set of addresses is identical.
-   *
-   * <p>The return value is to be passed to {@link #publishDataEvent(DataSubscriberInfo,
-   * AppSecRequestContext, DataBundle, GatewayContext)}.
-   *
-   * @param newAddresses the addresses contained in the {@link DataBundle} that is to be passed to
-   *     <code>publishDataEvent()</code>.
-   * @return an object describing the callbacks
-   */
-  DataSubscriberInfo getDataSubscribers(Address<?>... newAddresses);
+    /**
+     * Determines the data callbacks for the given addresses. The return value can be cached if it's
+     * guaranteed that no modifications to the subscriptions will be made between usages, and that the
+     * set of addresses is identical.
+     *
+     * <p>The return value is to be passed to {@link #publishDataEvent(DataSubscriberInfo,
+     * AppSecRequestContext, DataBundle, GatewayContext)}.
+     *
+     * @param newAddresses the addresses contained in the {@link DataBundle} that is to be passed to
+     *     <code>publishDataEvent()</code>.
+     * @return an object describing the callbacks
+     */
+    DataSubscriberInfo getDataSubscribers(Address<?>... newAddresses);
 
-  /**
-   * Runs the data callbacks for the given data. The subscribers must have been previously obtained
-   * with {@link #getDataSubscribers(Address[])}.
-   *
-   * <p>This method does not throw. If one of the callbacks throws, the exception is caught and the
-   * processing continues.
-   *
-   * @return the resulting action
-   */
-  Flow<Void> publishDataEvent(
-      DataSubscriberInfo subscribers,
-      AppSecRequestContext appSecRequestContext,
-      DataBundle newData,
-      GatewayContext gatewayContext)
-      throws ExpiredSubscriberInfoException;
+    /**
+     * Runs the data callbacks for the given data. The subscribers must have been previously obtained
+     * with {@link #getDataSubscribers(Address[])}.
+     *
+     * <p>This method does not throw. If one of the callbacks throws, the exception is caught and the
+     * processing continues.
+     *
+     * @return the resulting action
+     */
+    Flow<Void> publishDataEvent(
+            DataSubscriberInfo subscribers,
+            AppSecRequestContext appSecRequestContext,
+            DataBundle newData,
+            GatewayContext gatewayContext)
+            throws ExpiredSubscriberInfoException;
 
-  interface DataSubscriberInfo {
-    boolean isEmpty();
-  }
+    interface DataSubscriberInfo {
+        boolean isEmpty();
+    }
 
-  Collection<Address<?>> allSubscribedDataAddresses();
+    Collection<Address<?>> allSubscribedDataAddresses();
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/OrderedCallback.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/OrderedCallback.java
index 6a60b65432d..2d927d92a4f 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/OrderedCallback.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/OrderedCallback.java
@@ -3,36 +3,36 @@
 import java.util.Comparator;
 
 public interface OrderedCallback {
-  enum Priority {
-    // ordinal is important
-    // do not add more because EventDispatcher relies on ordinals
-    // fitting into 2 bits
-    HIGHEST,
-    HIGH,
-    DEFAULT,
-    LOW
-  }
+    enum Priority {
+        // ordinal is important
+        // do not add more because EventDispatcher relies on ordinals
+        // fitting into 2 bits
+        HIGHEST,
+        HIGH,
+        DEFAULT,
+        LOW
+    }
 
-  Priority getPriority();
+    Priority getPriority();
 
-  /* Note: not consistent with equals(). */
-  final class CallbackPriorityComparator implements Comparator<OrderedCallback> {
-    private CallbackPriorityComparator() {}
+    /* Note: not consistent with equals(). */
+    final class CallbackPriorityComparator implements Comparator<OrderedCallback> {
+        private CallbackPriorityComparator() {}
 
-    public static final CallbackPriorityComparator INSTANCE = new CallbackPriorityComparator();
+        public static final CallbackPriorityComparator INSTANCE = new CallbackPriorityComparator();
 
-    @Override
-    public int compare(OrderedCallback o1, OrderedCallback o2) {
-      int p1 = o1.getPriority().ordinal();
-      int p2 = o2.getPriority().ordinal();
+        @Override
+        public int compare(OrderedCallback o1, OrderedCallback o2) {
+            int p1 = o1.getPriority().ordinal();
+            int p2 = o2.getPriority().ordinal();
 
-      if (p1 < p2) {
-        return -1;
-      } else if (p1 == p2) {
-        return 0;
-      } else {
-        return 1;
-      }
+            if (p1 < p2) {
+                return -1;
+            } else if (p1 == p2) {
+                return 0;
+            } else {
+                return 1;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/ReplaceableEventProducerService.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/ReplaceableEventProducerService.java
index f0562fb56c2..c5c98d0b10c 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/ReplaceableEventProducerService.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/ReplaceableEventProducerService.java
@@ -8,29 +8,26 @@
 import java.util.Collection;
 
 public class ReplaceableEventProducerService implements EventProducerService {
-  private volatile EventProducerService cur;
+    private volatile EventProducerService cur;
 
-  public void replaceEventProducerService(EventProducerService ed) {
-    this.cur = ed;
-  }
+    public void replaceEventProducerService(EventProducerService ed) {
+        this.cur = ed;
+    }
 
-  @Override
-  public DataSubscriberInfo getDataSubscribers(Address<?>... newAddresses) {
-    return cur.getDataSubscribers(newAddresses);
-  }
+    @Override
+    public DataSubscriberInfo getDataSubscribers(Address<?>... newAddresses) {
+        return cur.getDataSubscribers(newAddresses);
+    }
 
-  @Override
-  public Flow<Void> publishDataEvent(
-      DataSubscriberInfo subscribers,
-      AppSecRequestContext reqCtx,
-      DataBundle newData,
-      GatewayContext gwCtx)
-      throws ExpiredSubscriberInfoException {
-    return cur.publishDataEvent(subscribers, reqCtx, newData, gwCtx);
-  }
+    @Override
+    public Flow<Void> publishDataEvent(
+            DataSubscriberInfo subscribers, AppSecRequestContext reqCtx, DataBundle newData, GatewayContext gwCtx)
+            throws ExpiredSubscriberInfoException {
+        return cur.publishDataEvent(subscribers, reqCtx, newData, gwCtx);
+    }
 
-  @Override
-  public Collection<Address<?>> allSubscribedDataAddresses() {
-    return cur.allSubscribedDataAddresses();
-  }
+    @Override
+    public Collection<Address<?>> allSubscribedDataAddresses() {
+        return cur.allSubscribedDataAddresses();
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/Address.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/Address.java
index c97624afac2..481a34c103e 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/Address.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/Address.java
@@ -6,39 +6,39 @@
  * @param <T> the type of data associated with the address
  */
 public final class Address<T> {
-  private static final int MAX_SERIAL = 0x3FFF;
-  private static final AtomicInteger NEXT_SERIAL = new AtomicInteger();
-
-  private final String key;
-  private final int serial;
-
-  // instances are created in KnownAddresses
-  Address(String key) {
-    this.key = key;
-    this.serial = NEXT_SERIAL.getAndIncrement();
-    assert (this.serial <= MAX_SERIAL);
-  }
-
-  public static int instanceCount() {
-    return NEXT_SERIAL.get();
-  }
-
-  public String getKey() {
-    return key;
-  }
-
-  public int getSerial() {
-    return serial;
-  }
-
-  // do not replace equals/hashcode
-  // equality is identity
-
-  @Override
-  public String toString() {
-    final StringBuilder sb = new StringBuilder("Address{");
-    sb.append("key='").append(key).append('\'');
-    sb.append('}');
-    return sb.toString();
-  }
+    private static final int MAX_SERIAL = 0x3FFF;
+    private static final AtomicInteger NEXT_SERIAL = new AtomicInteger();
+
+    private final String key;
+    private final int serial;
+
+    // instances are created in KnownAddresses
+    Address(String key) {
+        this.key = key;
+        this.serial = NEXT_SERIAL.getAndIncrement();
+        assert (this.serial <= MAX_SERIAL);
+    }
+
+    public static int instanceCount() {
+        return NEXT_SERIAL.get();
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public int getSerial() {
+        return serial;
+    }
+
+    // do not replace equals/hashcode
+    // equality is identity
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder("Address{");
+        sb.append("key='").append(key).append('\'');
+        sb.append('}');
+        return sb.toString();
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/CaseInsensitiveMap.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/CaseInsensitiveMap.java
index e4973ae36ac..b0e1cf41850 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/CaseInsensitiveMap.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/CaseInsensitiveMap.java
@@ -7,80 +7,80 @@
 import java.util.Set;
 
 public class CaseInsensitiveMap<V> implements Map<String, V> {
-  private final Map<String, V> delegate;
-
-  public CaseInsensitiveMap() {
-    this.delegate = new HashMap();
-  }
-
-  public CaseInsensitiveMap(Map<String, V> mapToCopy) {
-    this();
-    putAll(mapToCopy);
-  }
-
-  private static String lower(final Object key) {
-    return key == null ? null : key.toString().toLowerCase(Locale.ROOT);
-  }
-
-  @Override
-  public V get(final Object key) {
-    return this.delegate.get(lower(key));
-  }
-
-  @Override
-  public int size() {
-    return this.delegate.size();
-  }
-
-  @Override
-  public boolean isEmpty() {
-    return this.delegate.isEmpty();
-  }
-
-  @Override
-  public boolean containsKey(final Object key) {
-    return this.delegate.containsKey(lower(key));
-  }
-
-  @Override
-  public boolean containsValue(Object value) {
-    return this.delegate.containsValue(value);
-  }
-
-  @Override
-  public V put(final String key, final V value) {
-    return this.delegate.put(lower(key), value);
-  }
-
-  @Override
-  public void putAll(final Map<? extends String, ? extends V> map) {
-    for (Entry<? extends String, ? extends V> entry : map.entrySet()) {
-      put(entry.getKey(), entry.getValue());
+    private final Map<String, V> delegate;
+
+    public CaseInsensitiveMap() {
+        this.delegate = new HashMap();
+    }
+
+    public CaseInsensitiveMap(Map<String, V> mapToCopy) {
+        this();
+        putAll(mapToCopy);
+    }
+
+    private static String lower(final Object key) {
+        return key == null ? null : key.toString().toLowerCase(Locale.ROOT);
+    }
+
+    @Override
+    public V get(final Object key) {
+        return this.delegate.get(lower(key));
+    }
+
+    @Override
+    public int size() {
+        return this.delegate.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return this.delegate.isEmpty();
+    }
+
+    @Override
+    public boolean containsKey(final Object key) {
+        return this.delegate.containsKey(lower(key));
+    }
+
+    @Override
+    public boolean containsValue(Object value) {
+        return this.delegate.containsValue(value);
+    }
+
+    @Override
+    public V put(final String key, final V value) {
+        return this.delegate.put(lower(key), value);
+    }
+
+    @Override
+    public void putAll(final Map<? extends String, ? extends V> map) {
+        for (Entry<? extends String, ? extends V> entry : map.entrySet()) {
+            put(entry.getKey(), entry.getValue());
+        }
+    }
+
+    @Override
+    public void clear() {
+        this.delegate.clear();
+    }
+
+    @Override
+    public Set<String> keySet() {
+        return this.delegate.keySet();
+    }
+
+    @Override
+    public Collection<V> values() {
+        return this.delegate.values();
+    }
+
+    @Override
+    public Set<Entry<String, V>> entrySet() {
+        return this.delegate.entrySet();
+    }
+
+    @Override
+    public V remove(final Object object) {
+        return this.delegate.remove(lower(object));
     }
-  }
-
-  @Override
-  public void clear() {
-    this.delegate.clear();
-  }
-
-  @Override
-  public Set<String> keySet() {
-    return this.delegate.keySet();
-  }
-
-  @Override
-  public Collection<V> values() {
-    return this.delegate.values();
-  }
-
-  @Override
-  public Set<Entry<String, V>> entrySet() {
-    return this.delegate.entrySet();
-  }
-
-  @Override
-  public V remove(final Object object) {
-    return this.delegate.remove(lower(object));
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/DataBundle.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/DataBundle.java
index 3e3333be031..bac6b19c4f3 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/DataBundle.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/DataBundle.java
@@ -7,83 +7,83 @@
 import java.util.stream.Stream;
 
 public interface DataBundle extends Iterable<Map.Entry<Address<?>, Object>> {
-  boolean hasAddress(Address<?> addr);
+    boolean hasAddress(Address<?> addr);
 
-  Collection<Address<?>> getAllAddresses();
+    Collection<Address<?>> getAllAddresses();
 
-  int size();
+    int size();
 
-  // nonnull iif hasAddress(addr) is true
-  <T> T get(Address<T> addr);
+    // nonnull iif hasAddress(addr) is true
+    <T> T get(Address<T> addr);
 
-  static DataBundle unionOf(DataBundle db1, DataBundle db2) {
-    return new UnionBundle(db1, db2);
-  }
-
-  class UnionBundle implements DataBundle {
-    private final DataBundle db1;
-    private final DataBundle db2;
-
-    private UnionBundle(DataBundle db1, DataBundle db2) {
-      this.db1 = db1;
-      this.db2 = db2;
+    static DataBundle unionOf(DataBundle db1, DataBundle db2) {
+        return new UnionBundle(db1, db2);
     }
 
-    @Override
-    public boolean hasAddress(Address<?> addr) {
-      return db1.hasAddress(addr) || db2.hasAddress(addr);
-    }
+    class UnionBundle implements DataBundle {
+        private final DataBundle db1;
+        private final DataBundle db2;
 
-    @Override
-    public Collection<Address<?>> getAllAddresses() {
-      return Stream.concat(db1.getAllAddresses().stream(), db2.getAllAddresses().stream())
-          .collect(Collectors.toList());
-    }
-
-    @Override
-    public int size() {
-      return db1.size() + db2.size();
-    }
+        private UnionBundle(DataBundle db1, DataBundle db2) {
+            this.db1 = db1;
+            this.db2 = db2;
+        }
 
-    @Override
-    public <T> T get(Address<T> addr) {
-      T t = db1.get(addr);
-      if (t != null) {
-        return t;
-      }
-      return db2.get(addr);
-    }
+        @Override
+        public boolean hasAddress(Address<?> addr) {
+            return db1.hasAddress(addr) || db2.hasAddress(addr);
+        }
 
-    @Override
-    public Iterator<Map.Entry<Address<?>, Object>> iterator() {
-      return new UnionIterator<>(db1.iterator(), db2.iterator());
-    }
+        @Override
+        public Collection<Address<?>> getAllAddresses() {
+            return Stream.concat(db1.getAllAddresses().stream(), db2.getAllAddresses().stream())
+                    .collect(Collectors.toList());
+        }
 
-    private static class UnionIterator<T> implements Iterator<T> {
-      private Iterator<? extends T> activeIterator;
-      private final Iterator<? extends T> it2;
+        @Override
+        public int size() {
+            return db1.size() + db2.size();
+        }
 
-      private UnionIterator(Iterator<? extends T> it1, Iterator<? extends T> it2) {
-        this.activeIterator = it1;
-        this.it2 = it2;
-      }
+        @Override
+        public <T> T get(Address<T> addr) {
+            T t = db1.get(addr);
+            if (t != null) {
+                return t;
+            }
+            return db2.get(addr);
+        }
 
-      @Override
-      public boolean hasNext() {
-        if (activeIterator.hasNext()) {
-          return true;
+        @Override
+        public Iterator<Map.Entry<Address<?>, Object>> iterator() {
+            return new UnionIterator<>(db1.iterator(), db2.iterator());
         }
-        if (activeIterator == it2) {
-          return false;
+
+        private static class UnionIterator<T> implements Iterator<T> {
+            private Iterator<? extends T> activeIterator;
+            private final Iterator<? extends T> it2;
+
+            private UnionIterator(Iterator<? extends T> it1, Iterator<? extends T> it2) {
+                this.activeIterator = it1;
+                this.it2 = it2;
+            }
+
+            @Override
+            public boolean hasNext() {
+                if (activeIterator.hasNext()) {
+                    return true;
+                }
+                if (activeIterator == it2) {
+                    return false;
+                }
+                activeIterator = it2;
+                return it2.hasNext();
+            }
+
+            @Override
+            public T next() {
+                return activeIterator.next();
+            }
         }
-        activeIterator = it2;
-        return it2.hasNext();
-      }
-
-      @Override
-      public T next() {
-        return activeIterator.next();
-      }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/KnownAddresses.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/KnownAddresses.java
index f8a5638ccb4..2dbc376ddd8 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/KnownAddresses.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/KnownAddresses.java
@@ -5,273 +5,266 @@
 import java.util.Map;
 
 public interface KnownAddresses {
-  /** Body, as parsed by the server/framework. */
-  Address<Object> REQUEST_BODY_OBJECT = new Address<>("server.request.body");
-
-  /** The first characters of the raw HTTP body */
-  Address<CharSequence> REQUEST_BODY_RAW = new Address<>("server.request.body.raw");
-
-  /** The scheme used (e.g. http/https) */
-  Address<String> REQUEST_SCHEME = new Address<>("_server.request.scheme");
-
-  /** The unparsed request uri, incl. the query string. */
-  Address<String> REQUEST_URI_RAW = new Address<>("server.request.uri.raw");
-
-  /** The socket IP address of the client. */
-  Address<String> REQUEST_CLIENT_IP = new Address<>("server.request.client_ip");
+    /** Body, as parsed by the server/framework. */
+    Address<Object> REQUEST_BODY_OBJECT = new Address<>("server.request.body");
 
-  /** The peer port */
-  Address<Integer> REQUEST_CLIENT_PORT = new Address<>("_server.request.client_port");
+    /** The first characters of the raw HTTP body */
+    Address<CharSequence> REQUEST_BODY_RAW = new Address<>("server.request.body.raw");
 
-  /** The inferred IP address of the client */
-  Address<String> REQUEST_INFERRED_CLIENT_IP = new Address<>("http.client_ip");
+    /** The scheme used (e.g. http/https) */
+    Address<String> REQUEST_SCHEME = new Address<>("_server.request.scheme");
 
-  /** The verb of the HTTP request. */
-  Address<String> REQUEST_METHOD = new Address<>("server.request.method");
+    /** The unparsed request uri, incl. the query string. */
+    Address<String> REQUEST_URI_RAW = new Address<>("server.request.uri.raw");
 
-  /**
-   * incoming url parameters as parsed by the framework (e.g /foo/:id gives a id param that is not
-   * part of the query
-   */
-  Address<Map<String, ?>> REQUEST_PATH_PARAMS = new Address<>("server.request.path_params");
+    /** The socket IP address of the client. */
+    Address<String> REQUEST_CLIENT_IP = new Address<>("server.request.client_ip");
 
-  /** Cookies as parsed by the server */
-  Address<Map<String, ? extends Collection<String>>> REQUEST_COOKIES =
-      new Address<>("server.request.cookies");
+    /** The peer port */
+    Address<Integer> REQUEST_CLIENT_PORT = new Address<>("_server.request.client_port");
 
-  /** Same as server transport related field. */
-  Address<String> REQUEST_TRANSPORT = new Address<>("server.request.transport");
+    /** The inferred IP address of the client */
+    Address<String> REQUEST_INFERRED_CLIENT_IP = new Address<>("http.client_ip");
 
-  /** status code of HTTP response */
-  Address<String> RESPONSE_STATUS = new Address<>("server.response.status");
+    /** The verb of the HTTP request. */
+    Address<String> REQUEST_METHOD = new Address<>("server.request.method");
 
-  Address<Object> RESPONSE_BODY_OBJECT = new Address<>("server.response.body");
+    /**
+     * incoming url parameters as parsed by the framework (e.g /foo/:id gives a id param that is not
+     * part of the query
+     */
+    Address<Map<String, ?>> REQUEST_PATH_PARAMS = new Address<>("server.request.path_params");
 
-  /** First chars of HTTP response body */
-  Address<String> RESPONSE_BODY_RAW = new Address<>("server.response.body.raw");
+    /** Cookies as parsed by the server */
+    Address<Map<String, ? extends Collection<String>>> REQUEST_COOKIES = new Address<>("server.request.cookies");
 
-  /** Reponse headers excluding cookies */
-  Address<Map<String, List<String>>> RESPONSE_HEADERS_NO_COOKIES =
-      new Address<>("server.response.headers.no_cookies");
+    /** Same as server transport related field. */
+    Address<String> REQUEST_TRANSPORT = new Address<>("server.request.transport");
 
-  /**
-   * Contains a list of form fields that were used for file upload. Available only on inspected
-   * multipart/form-data requests
-   */
-  Address<List<String>> REQUEST_FILES_FIELD_NAMES =
-      new Address<>("server.request.body.files_field_names");
+    /** status code of HTTP response */
+    Address<String> RESPONSE_STATUS = new Address<>("server.response.status");
 
-  /**
-   * Contains the list of every uploaded filename from this request. The filename is the one from
-   * the user's filesystem
-   */
-  Address<List<String>> REQUEST_FILES_FILENAMES = new Address<>("server.request.body.filenames");
+    Address<Object> RESPONSE_BODY_OBJECT = new Address<>("server.response.body");
 
-  /**
-   * Contains the total size of the files transported in request body. Available only on inspected
-   * multipart/form-data requests.
-   */
-  Address<Long> REQUEST_COMBINED_FILE_SIZE =
-      new Address<>("server.request.body.combined_file_size");
+    /** First chars of HTTP response body */
+    Address<String> RESPONSE_BODY_RAW = new Address<>("server.response.body.raw");
 
-  /**
-   * Contains the content of each uploaded file in a multipart/form-data request. Content is
-   * truncated per file and only the first files are inspected. Available only on inspected
-   * multipart/form-data requests.
-   */
-  Address<List<String>> REQUEST_FILES_CONTENT = new Address<>("server.request.body.files_content");
+    /** Reponse headers excluding cookies */
+    Address<Map<String, List<String>>> RESPONSE_HEADERS_NO_COOKIES =
+            new Address<>("server.response.headers.no_cookies");
 
-  /**
-   * The parsed query string.
-   *
-   * <p><b>WILLFUL spec violation</b>. Spec says: This is the URL querystring as parsed by the
-   * framework (into a key-value-like object, possibly with multiple values)
-   *
-   * <p>In servlet, it's not possible to get the servlet parsed parameters, because that would imply
-   * consuming the post data as well. So we fetch the query string and parse it ourselves. This may
-   * not correspond to the same parsing the framework will do.
-   *
-   * <p>TODO: It will be possible to satisfy the spec with other servers. So this parsing should
-   * then be moved to the Servlet HttpContext impl.
-   */
-  Address<Map<String, List<String>>> REQUEST_QUERY = new Address<>("server.request.query");
+    /**
+     * Contains a list of form fields that were used for file upload. Available only on inspected
+     * multipart/form-data requests
+     */
+    Address<List<String>> REQUEST_FILES_FIELD_NAMES = new Address<>("server.request.body.files_field_names");
 
-  /** Headers with the cookie fields excluded. */
-  Address<CaseInsensitiveMap<List<String>>> HEADERS_NO_COOKIES =
-      new Address<>("server.request.headers.no_cookies");
-
-  Address<Object> GRPC_SERVER_METHOD = new Address<>("grpc.server.method");
-
-  Address<Object> GRPC_SERVER_REQUEST_MESSAGE = new Address<>("grpc.server.request.message");
-
-  // XXX: Not really used yet, but it's a known address and we should not treat it as unknown.
-  Address<Object> GRPC_SERVER_REQUEST_METADATA = new Address<>("grpc.server.request.metadata");
-
-  // XXX: Not really used yet, but it's a known address and we should not treat it as unknown.
-  Address<Object> GRAPHQL_SERVER_ALL_RESOLVERS = new Address<>("graphql.server.all_resolvers");
-
-  // XXX: Not really used yet, but it's a known address and we should not treat it as unknown.
-  Address<Object> GRAPHQL_SERVER_RESOLVER = new Address<>("graphql.server.resolver");
-
-  Address<Map<String, ?>> SERVER_GRAPHQL_ALL_RESOLVERS =
-      new Address<>("server.graphql.all_resolvers");
-
-  Address<String> USER_ID = new Address<>("usr.id");
-
-  Address<String> USER_LOGIN = new Address<>("usr.login");
-
-  Address<String> SESSION_ID = new Address<>("usr.session_id");
-
-  /** The URL of a network resource being requested (outgoing request) */
-  Address<String> IO_NET_URL = new Address<>("server.io.net.url");
-
-  /** The headers of a network resource being requested (outgoing request) */
-  Address<Map<String, List<String>>> IO_NET_REQUEST_HEADERS =
-      new Address<>("server.io.net.request.headers");
-
-  /** The method of a network resource being requested (outgoing request) */
-  Address<String> IO_NET_REQUEST_METHOD = new Address<>("server.io.net.request.method");
-
-  /** The body of a network resource being requested (outgoing request) */
-  Address<Object> IO_NET_REQUEST_BODY = new Address<>("server.io.net.request.body");
-
-  /** The status of a network resource being requested (outgoing request) */
-  Address<String> IO_NET_RESPONSE_STATUS = new Address<>("server.io.net.response.status");
-
-  /** The response headers of a network resource being requested (outgoing request) */
-  Address<Map<String, List<String>>> IO_NET_RESPONSE_HEADERS =
-      new Address<>("server.io.net.response.headers");
-
-  /** The response body of a network resource being requested (outgoing request) */
-  Address<Object> IO_NET_RESPONSE_BODY = new Address<>("server.io.net.response.body");
-
-  /** The representation of opened file on the filesystem */
-  Address<String> IO_FS_FILE = new Address<>("server.io.fs.file");
-
-  /** The representation of a file being written on the filesystem */
-  Address<String> IO_FS_FILE_WRITE = new Address<>("server.io.fs.file_write");
-
-  /** The database type (ex: mysql, postgresql, sqlite) */
-  Address<String> DB_TYPE = new Address<>("server.db.system");
-
-  /** The SQL query being executed */
-  Address<String> DB_SQL_QUERY = new Address<>("server.db.statement");
-
-  /** Login failure business event */
-  Address<String> LOGIN_FAILURE = new Address<>("server.business_logic.users.login.failure");
-
-  /** Login success business event */
-  Address<String> LOGIN_SUCCESS = new Address<>("server.business_logic.users.login.success");
-
-  /** Signup business event */
-  Address<String> SIGN_UP = new Address<>("server.business_logic.users.signup");
-
-  /** The Exec command being executed */
-  Address<String> EXEC_CMD = new Address<>("server.sys.exec.cmd");
-
-  /** The Shell command being executed */
-  Address<String> SHELL_CMD = new Address<>("server.sys.shell.cmd");
-
-  Address<Map<String, Object>> WAF_CONTEXT_PROCESSOR = new Address<>("waf.context.processor");
-
-  static Address<?> forName(String name) {
-    switch (name) {
-      case "server.request.body":
-        return REQUEST_BODY_OBJECT;
-      case "server.request.body.raw":
-        return REQUEST_BODY_RAW;
-      case "_server.request.scheme":
-        return REQUEST_SCHEME;
-      case "server.request.uri.raw":
-        return REQUEST_URI_RAW;
-      case "server.request.client_ip":
-        return REQUEST_CLIENT_IP;
-      case "_server.request.client_port":
-        return REQUEST_CLIENT_PORT;
-      case "http.client_ip":
-        return REQUEST_INFERRED_CLIENT_IP;
-      case "server.request.method":
-        return REQUEST_METHOD;
-      case "server.request.path_params":
-        return REQUEST_PATH_PARAMS;
-      case "server.request.cookies":
-        return REQUEST_COOKIES;
-      case "server.request.transport":
-        return REQUEST_TRANSPORT;
-      case "server.response.status":
-        return RESPONSE_STATUS;
-      case "server.response.body":
-        return RESPONSE_BODY_OBJECT;
-      case "server.response.body.raw":
-        return RESPONSE_BODY_RAW;
-      case "server.response.headers.no_cookies":
-        return RESPONSE_HEADERS_NO_COOKIES;
-      case "server.request.body.files_field_names":
-        return REQUEST_FILES_FIELD_NAMES;
-      case "server.request.body.filenames":
-        return REQUEST_FILES_FILENAMES;
-      case "server.request.body.combined_file_size":
-        return REQUEST_COMBINED_FILE_SIZE;
-      case "server.request.body.files_content":
-        return REQUEST_FILES_CONTENT;
-      case "server.request.query":
-        return REQUEST_QUERY;
-      case "server.request.headers.no_cookies":
-        return HEADERS_NO_COOKIES;
-      case "grpc.server.method":
-        return GRPC_SERVER_METHOD;
-      case "grpc.server.request.message":
-        return GRPC_SERVER_REQUEST_MESSAGE;
-      case "grpc.server.request.metadata":
-        return GRPC_SERVER_REQUEST_METADATA;
-      case "graphql.server.all_resolvers":
-        return GRAPHQL_SERVER_ALL_RESOLVERS;
-      case "graphql.server.resolver":
-        return GRAPHQL_SERVER_RESOLVER;
-      case "server.graphql.all_resolvers":
-        return SERVER_GRAPHQL_ALL_RESOLVERS;
-      case "usr.id":
-        return USER_ID;
-      case "usr.login":
-        return USER_LOGIN;
-      case "usr.session_id":
-        return SESSION_ID;
-      case "server.io.net.url":
-        return IO_NET_URL;
-      case "server.io.net.request.headers":
-        return IO_NET_REQUEST_HEADERS;
-      case "server.io.net.request.method":
-        return IO_NET_REQUEST_METHOD;
-      case "server.io.net.request.body":
-        return IO_NET_REQUEST_BODY;
-      case "server.io.net.response.status":
-        return IO_NET_RESPONSE_STATUS;
-      case "server.io.net.response.headers":
-        return IO_NET_RESPONSE_HEADERS;
-      case "server.io.net.response.body":
-        return IO_NET_RESPONSE_BODY;
-      case "server.io.fs.file":
-        return IO_FS_FILE;
-      case "server.io.fs.file_write":
-        return IO_FS_FILE_WRITE;
-      case "server.db.system":
-        return DB_TYPE;
-      case "server.db.statement":
-        return DB_SQL_QUERY;
-      case "waf.context.processor":
-        return WAF_CONTEXT_PROCESSOR;
-      case "server.business_logic.users.login.success":
-        return LOGIN_SUCCESS;
-      case "server.business_logic.users.login.failure":
-        return LOGIN_FAILURE;
-      case "server.business_logic.users.signup":
-        return SIGN_UP;
-      case "server.sys.exec.cmd":
-        return EXEC_CMD;
-      case "server.sys.shell.cmd":
-        return SHELL_CMD;
-      default:
-        return null;
+    /**
+     * Contains the list of every uploaded filename from this request. The filename is the one from
+     * the user's filesystem
+     */
+    Address<List<String>> REQUEST_FILES_FILENAMES = new Address<>("server.request.body.filenames");
+
+    /**
+     * Contains the total size of the files transported in request body. Available only on inspected
+     * multipart/form-data requests.
+     */
+    Address<Long> REQUEST_COMBINED_FILE_SIZE = new Address<>("server.request.body.combined_file_size");
+
+    /**
+     * Contains the content of each uploaded file in a multipart/form-data request. Content is
+     * truncated per file and only the first files are inspected. Available only on inspected
+     * multipart/form-data requests.
+     */
+    Address<List<String>> REQUEST_FILES_CONTENT = new Address<>("server.request.body.files_content");
+
+    /**
+     * The parsed query string.
+     *
+     * <p><b>WILLFUL spec violation</b>. Spec says: This is the URL querystring as parsed by the
+     * framework (into a key-value-like object, possibly with multiple values)
+     *
+     * <p>In servlet, it's not possible to get the servlet parsed parameters, because that would imply
+     * consuming the post data as well. So we fetch the query string and parse it ourselves. This may
+     * not correspond to the same parsing the framework will do.
+     *
+     * <p>TODO: It will be possible to satisfy the spec with other servers. So this parsing should
+     * then be moved to the Servlet HttpContext impl.
+     */
+    Address<Map<String, List<String>>> REQUEST_QUERY = new Address<>("server.request.query");
+
+    /** Headers with the cookie fields excluded. */
+    Address<CaseInsensitiveMap<List<String>>> HEADERS_NO_COOKIES = new Address<>("server.request.headers.no_cookies");
+
+    Address<Object> GRPC_SERVER_METHOD = new Address<>("grpc.server.method");
+
+    Address<Object> GRPC_SERVER_REQUEST_MESSAGE = new Address<>("grpc.server.request.message");
+
+    // XXX: Not really used yet, but it's a known address and we should not treat it as unknown.
+    Address<Object> GRPC_SERVER_REQUEST_METADATA = new Address<>("grpc.server.request.metadata");
+
+    // XXX: Not really used yet, but it's a known address and we should not treat it as unknown.
+    Address<Object> GRAPHQL_SERVER_ALL_RESOLVERS = new Address<>("graphql.server.all_resolvers");
+
+    // XXX: Not really used yet, but it's a known address and we should not treat it as unknown.
+    Address<Object> GRAPHQL_SERVER_RESOLVER = new Address<>("graphql.server.resolver");
+
+    Address<Map<String, ?>> SERVER_GRAPHQL_ALL_RESOLVERS = new Address<>("server.graphql.all_resolvers");
+
+    Address<String> USER_ID = new Address<>("usr.id");
+
+    Address<String> USER_LOGIN = new Address<>("usr.login");
+
+    Address<String> SESSION_ID = new Address<>("usr.session_id");
+
+    /** The URL of a network resource being requested (outgoing request) */
+    Address<String> IO_NET_URL = new Address<>("server.io.net.url");
+
+    /** The headers of a network resource being requested (outgoing request) */
+    Address<Map<String, List<String>>> IO_NET_REQUEST_HEADERS = new Address<>("server.io.net.request.headers");
+
+    /** The method of a network resource being requested (outgoing request) */
+    Address<String> IO_NET_REQUEST_METHOD = new Address<>("server.io.net.request.method");
+
+    /** The body of a network resource being requested (outgoing request) */
+    Address<Object> IO_NET_REQUEST_BODY = new Address<>("server.io.net.request.body");
+
+    /** The status of a network resource being requested (outgoing request) */
+    Address<String> IO_NET_RESPONSE_STATUS = new Address<>("server.io.net.response.status");
+
+    /** The response headers of a network resource being requested (outgoing request) */
+    Address<Map<String, List<String>>> IO_NET_RESPONSE_HEADERS = new Address<>("server.io.net.response.headers");
+
+    /** The response body of a network resource being requested (outgoing request) */
+    Address<Object> IO_NET_RESPONSE_BODY = new Address<>("server.io.net.response.body");
+
+    /** The representation of opened file on the filesystem */
+    Address<String> IO_FS_FILE = new Address<>("server.io.fs.file");
+
+    /** The representation of a file being written on the filesystem */
+    Address<String> IO_FS_FILE_WRITE = new Address<>("server.io.fs.file_write");
+
+    /** The database type (ex: mysql, postgresql, sqlite) */
+    Address<String> DB_TYPE = new Address<>("server.db.system");
+
+    /** The SQL query being executed */
+    Address<String> DB_SQL_QUERY = new Address<>("server.db.statement");
+
+    /** Login failure business event */
+    Address<String> LOGIN_FAILURE = new Address<>("server.business_logic.users.login.failure");
+
+    /** Login success business event */
+    Address<String> LOGIN_SUCCESS = new Address<>("server.business_logic.users.login.success");
+
+    /** Signup business event */
+    Address<String> SIGN_UP = new Address<>("server.business_logic.users.signup");
+
+    /** The Exec command being executed */
+    Address<String> EXEC_CMD = new Address<>("server.sys.exec.cmd");
+
+    /** The Shell command being executed */
+    Address<String> SHELL_CMD = new Address<>("server.sys.shell.cmd");
+
+    Address<Map<String, Object>> WAF_CONTEXT_PROCESSOR = new Address<>("waf.context.processor");
+
+    static Address<?> forName(String name) {
+        switch (name) {
+            case "server.request.body":
+                return REQUEST_BODY_OBJECT;
+            case "server.request.body.raw":
+                return REQUEST_BODY_RAW;
+            case "_server.request.scheme":
+                return REQUEST_SCHEME;
+            case "server.request.uri.raw":
+                return REQUEST_URI_RAW;
+            case "server.request.client_ip":
+                return REQUEST_CLIENT_IP;
+            case "_server.request.client_port":
+                return REQUEST_CLIENT_PORT;
+            case "http.client_ip":
+                return REQUEST_INFERRED_CLIENT_IP;
+            case "server.request.method":
+                return REQUEST_METHOD;
+            case "server.request.path_params":
+                return REQUEST_PATH_PARAMS;
+            case "server.request.cookies":
+                return REQUEST_COOKIES;
+            case "server.request.transport":
+                return REQUEST_TRANSPORT;
+            case "server.response.status":
+                return RESPONSE_STATUS;
+            case "server.response.body":
+                return RESPONSE_BODY_OBJECT;
+            case "server.response.body.raw":
+                return RESPONSE_BODY_RAW;
+            case "server.response.headers.no_cookies":
+                return RESPONSE_HEADERS_NO_COOKIES;
+            case "server.request.body.files_field_names":
+                return REQUEST_FILES_FIELD_NAMES;
+            case "server.request.body.filenames":
+                return REQUEST_FILES_FILENAMES;
+            case "server.request.body.combined_file_size":
+                return REQUEST_COMBINED_FILE_SIZE;
+            case "server.request.body.files_content":
+                return REQUEST_FILES_CONTENT;
+            case "server.request.query":
+                return REQUEST_QUERY;
+            case "server.request.headers.no_cookies":
+                return HEADERS_NO_COOKIES;
+            case "grpc.server.method":
+                return GRPC_SERVER_METHOD;
+            case "grpc.server.request.message":
+                return GRPC_SERVER_REQUEST_MESSAGE;
+            case "grpc.server.request.metadata":
+                return GRPC_SERVER_REQUEST_METADATA;
+            case "graphql.server.all_resolvers":
+                return GRAPHQL_SERVER_ALL_RESOLVERS;
+            case "graphql.server.resolver":
+                return GRAPHQL_SERVER_RESOLVER;
+            case "server.graphql.all_resolvers":
+                return SERVER_GRAPHQL_ALL_RESOLVERS;
+            case "usr.id":
+                return USER_ID;
+            case "usr.login":
+                return USER_LOGIN;
+            case "usr.session_id":
+                return SESSION_ID;
+            case "server.io.net.url":
+                return IO_NET_URL;
+            case "server.io.net.request.headers":
+                return IO_NET_REQUEST_HEADERS;
+            case "server.io.net.request.method":
+                return IO_NET_REQUEST_METHOD;
+            case "server.io.net.request.body":
+                return IO_NET_REQUEST_BODY;
+            case "server.io.net.response.status":
+                return IO_NET_RESPONSE_STATUS;
+            case "server.io.net.response.headers":
+                return IO_NET_RESPONSE_HEADERS;
+            case "server.io.net.response.body":
+                return IO_NET_RESPONSE_BODY;
+            case "server.io.fs.file":
+                return IO_FS_FILE;
+            case "server.io.fs.file_write":
+                return IO_FS_FILE_WRITE;
+            case "server.db.system":
+                return DB_TYPE;
+            case "server.db.statement":
+                return DB_SQL_QUERY;
+            case "waf.context.processor":
+                return WAF_CONTEXT_PROCESSOR;
+            case "server.business_logic.users.login.success":
+                return LOGIN_SUCCESS;
+            case "server.business_logic.users.login.failure":
+                return LOGIN_FAILURE;
+            case "server.business_logic.users.signup":
+                return SIGN_UP;
+            case "server.sys.exec.cmd":
+                return EXEC_CMD;
+            case "server.sys.shell.cmd":
+                return SHELL_CMD;
+            default:
+                return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/MapDataBundle.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/MapDataBundle.java
index db10dcd5a8b..20ec3eca7b5 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/MapDataBundle.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/MapDataBundle.java
@@ -7,89 +7,89 @@
 import java.util.Map;
 
 public class MapDataBundle implements DataBundle {
-  private final Map<Address<?>, Object> map;
-
-  private MapDataBundle(Map<Address<?>, Object> map) {
-    this.map = map;
-  }
-
-  public static MapDataBundle ofDelegate(Map<Address<?>, Object> delegate) {
-    return new MapDataBundle(delegate);
-  }
-
-  public static <T> MapDataBundle of(Address<T> addr, T value) {
-    return new MapDataBundle(Collections.singletonMap(addr, value));
-  }
-
-  public static <T, U> MapDataBundle of(Address<T> addr1, T value1, Address<U> addr2, U value2) {
-    Map<Address<?>, Object> map = new IdentityHashMap<>(4);
-    map.put(addr1, value1);
-    map.put(addr2, value2);
-    return new MapDataBundle(map);
-  }
-
-  public static <T, U, V> MapDataBundle of(
-      Address<T> addr1, T value1, Address<U> addr2, U value2, Address<V> addr3, V value3) {
-    Map<Address<?>, Object> map = new IdentityHashMap<>(8);
-    map.put(addr1, value1);
-    map.put(addr2, value2);
-    map.put(addr3, value3);
-    return new MapDataBundle(map);
-  }
-
-  @Override
-  public boolean hasAddress(Address<?> addr) {
-    return map.containsKey(addr);
-  }
-
-  @Override
-  public Collection<Address<?>> getAllAddresses() {
-    return map.keySet();
-  }
-
-  @Override
-  public int size() {
-    return map.size();
-  }
-
-  @Override
-  public <T> T get(Address<T> addr) {
-    return (T) map.get(addr);
-  }
-
-  @Override
-  public Iterator<Map.Entry<Address<?>, Object>> iterator() {
-    return map.entrySet().iterator();
-  }
-
-  public static class Builder {
-
     private final Map<Address<?>, Object> map;
 
-    public static final int CAPACITY_0_2 = 4;
-    public static final int CAPACITY_3_4 = 8;
-    public static final int CAPACITY_6_10 = 16;
-    public static final int CAPACITY_11_21 = 32;
-    public static final int CAPACITY_22_42 = 64;
-
-    /**
-     * @param capacity 2^ceil(log2(ceil(expected_elements 3/2)))
-     */
-    public Builder(int capacity) {
-      map = new IdentityHashMap<>(capacity);
+    private MapDataBundle(Map<Address<?>, Object> map) {
+        this.map = map;
+    }
+
+    public static MapDataBundle ofDelegate(Map<Address<?>, Object> delegate) {
+        return new MapDataBundle(delegate);
+    }
+
+    public static <T> MapDataBundle of(Address<T> addr, T value) {
+        return new MapDataBundle(Collections.singletonMap(addr, value));
+    }
+
+    public static <T, U> MapDataBundle of(Address<T> addr1, T value1, Address<U> addr2, U value2) {
+        Map<Address<?>, Object> map = new IdentityHashMap<>(4);
+        map.put(addr1, value1);
+        map.put(addr2, value2);
+        return new MapDataBundle(map);
+    }
+
+    public static <T, U, V> MapDataBundle of(
+            Address<T> addr1, T value1, Address<U> addr2, U value2, Address<V> addr3, V value3) {
+        Map<Address<?>, Object> map = new IdentityHashMap<>(8);
+        map.put(addr1, value1);
+        map.put(addr2, value2);
+        map.put(addr3, value3);
+        return new MapDataBundle(map);
+    }
+
+    @Override
+    public boolean hasAddress(Address<?> addr) {
+        return map.containsKey(addr);
     }
 
-    public <A extends Address<?>, V> Builder add(A address, V value) {
-      if (address == null || value == null) return this;
-      if (value instanceof Collection && ((Collection<?>) value).isEmpty()) return this;
-      if (value instanceof Map && ((Map<?, ?>) value).isEmpty()) return this;
+    @Override
+    public Collection<Address<?>> getAllAddresses() {
+        return map.keySet();
+    }
+
+    @Override
+    public int size() {
+        return map.size();
+    }
 
-      map.put(address, value);
-      return this;
+    @Override
+    public <T> T get(Address<T> addr) {
+        return (T) map.get(addr);
     }
 
-    public MapDataBundle build() {
-      return new MapDataBundle(map);
+    @Override
+    public Iterator<Map.Entry<Address<?>, Object>> iterator() {
+        return map.entrySet().iterator();
+    }
+
+    public static class Builder {
+
+        private final Map<Address<?>, Object> map;
+
+        public static final int CAPACITY_0_2 = 4;
+        public static final int CAPACITY_3_4 = 8;
+        public static final int CAPACITY_6_10 = 16;
+        public static final int CAPACITY_11_21 = 32;
+        public static final int CAPACITY_22_42 = 64;
+
+        /**
+         * @param capacity 2^ceil(log2(ceil(expected_elements 3/2)))
+         */
+        public Builder(int capacity) {
+            map = new IdentityHashMap<>(capacity);
+        }
+
+        public <A extends Address<?>, V> Builder add(A address, V value) {
+            if (address == null || value == null) return this;
+            if (value instanceof Collection && ((Collection<?>) value).isEmpty()) return this;
+            if (value instanceof Map && ((Map<?, ?>) value).isEmpty()) return this;
+
+            map.put(address, value);
+            return this;
+        }
+
+        public MapDataBundle build() {
+            return new MapDataBundle(map);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/ObjectIntrospection.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/ObjectIntrospection.java
index 92d19e0a848..9844077de26 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/ObjectIntrospection.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/ObjectIntrospection.java
@@ -26,468 +26,464 @@
 
 public final class ObjectIntrospection {
 
-  private static final Logger log = LoggerFactory.getLogger(ObjectIntrospection.class);
-
-  private static final Method trySetAccessible;
-
-  static {
-    // Method AccessibleObject.trySetAccessible introduced in Java 9
-    Method method = null;
-    if (JavaVirtualMachine.isJavaVersionAtLeast(9)) {
-      try {
-        method = Field.class.getMethod("trySetAccessible");
-      } catch (NoSuchMethodException e) {
-        log.error("Can't get method 'Field.trySetAccessible'", e);
-      }
-    }
-    trySetAccessible = method;
-  }
-
-  private ObjectIntrospection() {}
-
-  /**
-   * Listener interface for optional per-call truncation logic. Single-method invoked when any
-   * truncation occurs, receiving only the request context.
-   */
-  @FunctionalInterface
-  public interface TruncationListener {
-    /** Called after default truncation handling if any truncation occurred. */
-    void onTruncation();
-  }
-
-  /**
-   * Converts arbitrary objects compatible with ddwaf_object. Possible types in the result are:
-   *
-   * <ul>
-   *   <li>Null
-   *   <li>Strings
-   *   <li>Boolean
-   *   <li>Byte, Short, Integer, Long (will be serialized as int64)
-   *   <li>Float, Double (will be serialized as float64)
-   *   <li>Maps with string keys
-   *   <li>Lists
-   * </ul>
-   *
-   * This serves two purposes:
-   *
-   * <ul>
-   *   <li>The objects can be inspected by the appsec subsystem and passed to the WAF.
-   *   <li>>By creating new containers and not transforming only immutable objects like strings, the
-   *       new object can be safely manipulated by the appsec subsystem without worrying about
-   *       modifications in other threads.
-   * </ul>
-   *
-   * <p>Certain instance fields are excluded. Right now, this includes metaClass fields in Groovy
-   * objects and this$0 fields in inner classes.
-   *
-   * @param obj an arbitrary object
-   * @param requestContext the request context
-   * @return the converted object
-   */
-  public static Object convert(Object obj, AppSecRequestContext requestContext) {
-    return convert(obj, requestContext, null);
-  }
-
-  /**
-   * Core conversion method with an optional per-call truncation listener. Always applies default
-   * truncation logic, then invokes listener if provided.
-   */
-  public static Object convert(
-      Object obj, AppSecRequestContext requestContext, TruncationListener listener) {
-    State state = new State(requestContext);
-    Object converted = guardedConversion(obj, 0, state);
-    if (state.stringTooLong || state.listMapTooLarge || state.objectTooDeep) {
-      // Default truncation handling: always run
-      requestContext.setWafTruncated();
-      WafMetricCollector.get()
-          .wafInputTruncated(state.stringTooLong, state.listMapTooLarge, state.objectTooDeep);
-      // Optional extra per-call logic: only requestContext is passed
-      if (listener != null) {
-        listener.onTruncation();
-      }
-    }
-    return converted;
-  }
-
-  private static class State {
-    int elemsLeft = MAX_ELEMENTS;
-    int invalidKeyId;
-    boolean objectTooDeep = false;
-    boolean listMapTooLarge = false;
-    boolean stringTooLong = false;
-    AppSecRequestContext requestContext;
-
-    private State(AppSecRequestContext requestContext) {
-      this.requestContext = requestContext;
-    }
-  }
-
-  private static Object guardedConversion(Object obj, int depth, State state) {
-    try {
-      return doConversion(obj, depth, state);
-    } catch (Throwable t) {
-      // TODO: Use invalid object
-      return "error:" + t.getMessage();
-    }
-  }
-
-  private static String keyConversion(Object key, State state) {
-    state.elemsLeft--;
-    if (state.elemsLeft <= 0) {
-      return null;
-    }
-    if (key == null) {
-      return "null";
-    }
-    if (key instanceof String) {
-      return checkStringLength((String) key, state);
-    }
-    if (key instanceof Number
-        || key instanceof Boolean
-        || key instanceof Character
-        || key instanceof CharSequence) {
-      return checkStringLength(key.toString(), state);
+    private static final Logger log = LoggerFactory.getLogger(ObjectIntrospection.class);
+
+    private static final Method trySetAccessible;
+
+    static {
+        // Method AccessibleObject.trySetAccessible introduced in Java 9
+        Method method = null;
+        if (JavaVirtualMachine.isJavaVersionAtLeast(9)) {
+            try {
+                method = Field.class.getMethod("trySetAccessible");
+            } catch (NoSuchMethodException e) {
+                log.error("Can't get method 'Field.trySetAccessible'", e);
+            }
+        }
+        trySetAccessible = method;
+    }
+
+    private ObjectIntrospection() {}
+
+    /**
+     * Listener interface for optional per-call truncation logic. Single-method invoked when any
+     * truncation occurs, receiving only the request context.
+     */
+    @FunctionalInterface
+    public interface TruncationListener {
+        /** Called after default truncation handling if any truncation occurred. */
+        void onTruncation();
+    }
+
+    /**
+     * Converts arbitrary objects compatible with ddwaf_object. Possible types in the result are:
+     *
+     * <ul>
+     *   <li>Null
+     *   <li>Strings
+     *   <li>Boolean
+     *   <li>Byte, Short, Integer, Long (will be serialized as int64)
+     *   <li>Float, Double (will be serialized as float64)
+     *   <li>Maps with string keys
+     *   <li>Lists
+     * </ul>
+     *
+     * This serves two purposes:
+     *
+     * <ul>
+     *   <li>The objects can be inspected by the appsec subsystem and passed to the WAF.
+     *   <li>>By creating new containers and not transforming only immutable objects like strings, the
+     *       new object can be safely manipulated by the appsec subsystem without worrying about
+     *       modifications in other threads.
+     * </ul>
+     *
+     * <p>Certain instance fields are excluded. Right now, this includes metaClass fields in Groovy
+     * objects and this$0 fields in inner classes.
+     *
+     * @param obj an arbitrary object
+     * @param requestContext the request context
+     * @return the converted object
+     */
+    public static Object convert(Object obj, AppSecRequestContext requestContext) {
+        return convert(obj, requestContext, null);
+    }
+
+    /**
+     * Core conversion method with an optional per-call truncation listener. Always applies default
+     * truncation logic, then invokes listener if provided.
+     */
+    public static Object convert(Object obj, AppSecRequestContext requestContext, TruncationListener listener) {
+        State state = new State(requestContext);
+        Object converted = guardedConversion(obj, 0, state);
+        if (state.stringTooLong || state.listMapTooLarge || state.objectTooDeep) {
+            // Default truncation handling: always run
+            requestContext.setWafTruncated();
+            WafMetricCollector.get().wafInputTruncated(state.stringTooLong, state.listMapTooLarge, state.objectTooDeep);
+            // Optional extra per-call logic: only requestContext is passed
+            if (listener != null) {
+                listener.onTruncation();
+            }
+        }
+        return converted;
     }
-    return "invalid_key:" + (++state.invalidKeyId);
-  }
 
-  private static Object doConversion(Object obj, int depth, State state) {
-    if (obj == null) {
-      return null;
-    }
-    state.elemsLeft--;
-    if (state.elemsLeft <= 0) {
-      state.listMapTooLarge = true;
-      return null;
-    }
+    private static class State {
+        int elemsLeft = MAX_ELEMENTS;
+        int invalidKeyId;
+        boolean objectTooDeep = false;
+        boolean listMapTooLarge = false;
+        boolean stringTooLong = false;
+        AppSecRequestContext requestContext;
 
-    if (depth > MAX_DEPTH) {
-      state.objectTooDeep = true;
-      return null;
+        private State(AppSecRequestContext requestContext) {
+            this.requestContext = requestContext;
+        }
     }
 
-    // booleans and numbers are preserved
-    if (obj instanceof Boolean || obj instanceof Number) {
-      return obj;
+    private static Object guardedConversion(Object obj, int depth, State state) {
+        try {
+            return doConversion(obj, depth, state);
+        } catch (Throwable t) {
+            // TODO: Use invalid object
+            return "error:" + t.getMessage();
+        }
     }
 
-    // strings are preserved, but we need to check the length
-    if (obj instanceof String) {
-      return checkStringLength((String) obj, state);
+    private static String keyConversion(Object key, State state) {
+        state.elemsLeft--;
+        if (state.elemsLeft <= 0) {
+            return null;
+        }
+        if (key == null) {
+            return "null";
+        }
+        if (key instanceof String) {
+            return checkStringLength((String) key, state);
+        }
+        if (key instanceof Number
+                || key instanceof Boolean
+                || key instanceof Character
+                || key instanceof CharSequence) {
+            return checkStringLength(key.toString(), state);
+        }
+        return "invalid_key:" + (++state.invalidKeyId);
     }
 
-    // char sequences are transformed just in case they are not immutable,
-    if (obj instanceof CharSequence) {
-      return checkStringLength(obj.toString(), state);
-    }
-    // single char sequences are transformed to strings for ddwaf compatibility.
-    if (obj instanceof Character) {
-      return obj.toString();
-    }
+    private static Object doConversion(Object obj, int depth, State state) {
+        if (obj == null) {
+            return null;
+        }
+        state.elemsLeft--;
+        if (state.elemsLeft <= 0) {
+            state.listMapTooLarge = true;
+            return null;
+        }
 
-    // Date objects - avoid accessing private fastTime field
-    if (obj instanceof Date) {
-      return ((Date) obj).getTime();
-    }
+        if (depth > MAX_DEPTH) {
+            state.objectTooDeep = true;
+            return null;
+        }
 
-    // Jackson databind nodes (via reflection)
-    Class<?> clazz = obj.getClass();
-    if (clazz.getName().startsWith("com.fasterxml.jackson.databind.node.")) {
-      try {
-        return doConversionJacksonNode(
-            new JacksonContext(clazz.getClassLoader()), obj, depth, state);
-      } catch (Throwable e) {
-        // in case of failure let default conversion run
-        log.debug("Error handling jackson node {}", clazz, e);
-        return null;
-      }
-    }
+        // booleans and numbers are preserved
+        if (obj instanceof Boolean || obj instanceof Number) {
+            return obj;
+        }
 
-    // maps
-    if (obj instanceof Map) {
-      Map<Object, Object> newMap = new HashMap<>((int) Math.ceil(((Map) obj).size() / .75));
-      for (Map.Entry<?, ?> e : ((Map<?, ?>) obj).entrySet()) {
-        Object key = e.getKey();
-        Object newKey = keyConversion(e.getKey(), state);
-        if (newKey == null && key != null) {
-          // probably we're out of elements anyway
-          continue;
-        }
-        newMap.put(newKey, guardedConversion(e.getValue(), depth + 1, state));
-      }
-      return newMap;
-    }
+        // strings are preserved, but we need to check the length
+        if (obj instanceof String) {
+            return checkStringLength((String) obj, state);
+        }
 
-    // iterables
-    if (obj instanceof Iterable) {
-      final Iterator<?> it = ((Iterable<?>) obj).iterator();
-      final boolean isMap = it.hasNext() && it.next() instanceof Map.Entry;
-      // some json libraries implement objects as Iterable<Map.Entry>
-      if (isMap) {
-        Map<Object, Object> newMap;
-        if (obj instanceof Collection) {
-          newMap = new HashMap<>(((Collection<?>) obj).size());
-        } else {
-          newMap = new HashMap<>();
-        }
-        for (Map.Entry<?, ?> e : ((Iterable<Map.Entry<?, ?>>) obj)) {
-          Object key = e.getKey();
-          Object newKey = keyConversion(e.getKey(), state);
-          if (newKey == null && key != null) {
-            // probably we're out of elements anyway
-            continue;
-          }
-          newMap.put(newKey, guardedConversion(e.getValue(), depth + 1, state));
+        // char sequences are transformed just in case they are not immutable,
+        if (obj instanceof CharSequence) {
+            return checkStringLength(obj.toString(), state);
         }
-        return newMap;
-      } else {
-        List<Object> newList;
-        if (obj instanceof Collection) {
-          newList = new ArrayList<>(((Collection<?>) obj).size());
-        } else {
-          newList = new ArrayList<>();
-        }
-        for (Object o : ((Iterable<?>) obj)) {
-          if (state.elemsLeft <= 0) {
-            state.listMapTooLarge = true;
-            break;
-          }
-          newList.add(guardedConversion(o, depth + 1, state));
+        // single char sequences are transformed to strings for ddwaf compatibility.
+        if (obj instanceof Character) {
+            return obj.toString();
         }
-        return newList;
-      }
-    }
 
-    // arrays
-    if (clazz.isArray()) {
-      int length = Array.getLength(obj);
-      List<Object> newList = new ArrayList<>(length);
-      for (int i = 0; i < length && state.elemsLeft > 0; i++) {
-        newList.add(guardedConversion(Array.get(obj, i), depth + 1, state));
-      }
-      return newList;
-    }
+        // Date objects - avoid accessing private fastTime field
+        if (obj instanceof Date) {
+            return ((Date) obj).getTime();
+        }
 
-    // else general objects
-    Map<String, Object> newMap = new HashMap<>();
-    List<Field[]> allFields = new ArrayList<>();
-    for (Class<?> classToLook = clazz;
-        classToLook != null && classToLook != Object.class;
-        classToLook = classToLook.getSuperclass()) {
-      allFields.add(classToLook.getDeclaredFields());
-    }
+        // Jackson databind nodes (via reflection)
+        Class<?> clazz = obj.getClass();
+        if (clazz.getName().startsWith("com.fasterxml.jackson.databind.node.")) {
+            try {
+                return doConversionJacksonNode(new JacksonContext(clazz.getClassLoader()), obj, depth, state);
+            } catch (Throwable e) {
+                // in case of failure let default conversion run
+                log.debug("Error handling jackson node {}", clazz, e);
+                return null;
+            }
+        }
 
-    outer:
-    for (Field[] fields : allFields) {
-      for (Field f : fields) {
-        if (state.elemsLeft <= 0) {
-          state.listMapTooLarge = true;
-          break outer;
+        // maps
+        if (obj instanceof Map) {
+            Map<Object, Object> newMap = new HashMap<>((int) Math.ceil(((Map) obj).size() / .75));
+            for (Map.Entry<?, ?> e : ((Map<?, ?>) obj).entrySet()) {
+                Object key = e.getKey();
+                Object newKey = keyConversion(e.getKey(), state);
+                if (newKey == null && key != null) {
+                    // probably we're out of elements anyway
+                    continue;
+                }
+                newMap.put(newKey, guardedConversion(e.getValue(), depth + 1, state));
+            }
+            return newMap;
         }
-        if (Modifier.isStatic(f.getModifiers())) {
-          continue;
+
+        // iterables
+        if (obj instanceof Iterable) {
+            final Iterator<?> it = ((Iterable<?>) obj).iterator();
+            final boolean isMap = it.hasNext() && it.next() instanceof Map.Entry;
+            // some json libraries implement objects as Iterable<Map.Entry>
+            if (isMap) {
+                Map<Object, Object> newMap;
+                if (obj instanceof Collection) {
+                    newMap = new HashMap<>(((Collection<?>) obj).size());
+                } else {
+                    newMap = new HashMap<>();
+                }
+                for (Map.Entry<?, ?> e : ((Iterable<Map.Entry<?, ?>>) obj)) {
+                    Object key = e.getKey();
+                    Object newKey = keyConversion(e.getKey(), state);
+                    if (newKey == null && key != null) {
+                        // probably we're out of elements anyway
+                        continue;
+                    }
+                    newMap.put(newKey, guardedConversion(e.getValue(), depth + 1, state));
+                }
+                return newMap;
+            } else {
+                List<Object> newList;
+                if (obj instanceof Collection) {
+                    newList = new ArrayList<>(((Collection<?>) obj).size());
+                } else {
+                    newList = new ArrayList<>();
+                }
+                for (Object o : ((Iterable<?>) obj)) {
+                    if (state.elemsLeft <= 0) {
+                        state.listMapTooLarge = true;
+                        break;
+                    }
+                    newList.add(guardedConversion(o, depth + 1, state));
+                }
+                return newList;
+            }
         }
-        if (IntrospectionExcludedTypesTrie.apply(f.getType().getName()) >= 1) {
-          continue;
+
+        // arrays
+        if (clazz.isArray()) {
+            int length = Array.getLength(obj);
+            List<Object> newList = new ArrayList<>(length);
+            for (int i = 0; i < length && state.elemsLeft > 0; i++) {
+                newList.add(guardedConversion(Array.get(obj, i), depth + 1, state));
+            }
+            return newList;
         }
-        String name = f.getName();
-        if (ignoredFieldName(name)) {
-          continue;
+
+        // else general objects
+        Map<String, Object> newMap = new HashMap<>();
+        List<Field[]> allFields = new ArrayList<>();
+        for (Class<?> classToLook = clazz;
+                classToLook != null && classToLook != Object.class;
+                classToLook = classToLook.getSuperclass()) {
+            allFields.add(classToLook.getDeclaredFields());
         }
 
-        if (setAccessible(f)) {
-          try {
-            newMap.put(f.getName(), guardedConversion(f.get(obj), depth + 1, state));
-          } catch (IllegalAccessException e) {
-            log.error("Unable to get field value", e);
-            // TODO: Use invalid object
-          }
-        }
-        // This field is inaccessible (Strongly Encapsulated Internal class on Java 9+).
-        // Skip it and continue with the remaining fields — other accessible fields on the
-        // same object may still contain useful data for WAF inspection. Do NOT call
-        // obj.toString() here: JDK internal toString() representations (e.g.
-        // "class java.lang.Object") can match legitimate WAF phrase_match rules and
-        // produce false positives (e.g. crs-944-130 java_code_injection).
-      }
-    }
+        outer:
+        for (Field[] fields : allFields) {
+            for (Field f : fields) {
+                if (state.elemsLeft <= 0) {
+                    state.listMapTooLarge = true;
+                    break outer;
+                }
+                if (Modifier.isStatic(f.getModifiers())) {
+                    continue;
+                }
+                if (IntrospectionExcludedTypesTrie.apply(f.getType().getName()) >= 1) {
+                    continue;
+                }
+                String name = f.getName();
+                if (ignoredFieldName(name)) {
+                    continue;
+                }
+
+                if (setAccessible(f)) {
+                    try {
+                        newMap.put(f.getName(), guardedConversion(f.get(obj), depth + 1, state));
+                    } catch (IllegalAccessException e) {
+                        log.error("Unable to get field value", e);
+                        // TODO: Use invalid object
+                    }
+                }
+                // This field is inaccessible (Strongly Encapsulated Internal class on Java 9+).
+                // Skip it and continue with the remaining fields — other accessible fields on the
+                // same object may still contain useful data for WAF inspection. Do NOT call
+                // obj.toString() here: JDK internal toString() representations (e.g.
+                // "class java.lang.Object") can match legitimate WAF phrase_match rules and
+                // produce false positives (e.g. crs-944-130 java_code_injection).
+            }
+        }
 
-    return newMap;
-  }
-
-  private static boolean ignoredFieldName(final String name) {
-    switch (name) {
-      case "this$0":
-      case "memoizedHashCode":
-      case "memoizedSize":
-        return true;
-      default:
-        return false;
-    }
-  }
-
-  /**
-   * Try to make field accessible
-   *
-   * @param field
-   * @return
-   */
-  private static boolean setAccessible(Field field) {
-    try {
-      if (trySetAccessible != null) {
-        return (boolean) trySetAccessible.invoke(field);
-      }
-      field.setAccessible(true);
-      return true;
-    } catch (RuntimeException | IllegalAccessException | InvocationTargetException e) {
-      log.error("Unable to make field accessible", e);
-      return false;
+        return newMap;
     }
-  }
 
-  private static String checkStringLength(final String str, final State state) {
-    if (str == null) {
-      return null;
-    }
-    if (str.length() > MAX_STRING_SIZE) {
-      state.stringTooLong = true;
-      return str.substring(0, MAX_STRING_SIZE);
-    }
-    return str;
-  }
-
-  /**
-   * Converts Jackson databind JsonNode objects to WAF-compatible data structures using reflection.
-   *
-   * <p>Jackson databind objects ({@link com.fasterxml.jackson.databind.JsonNode}) implement
-   * iterable interfaces which interferes with the standard object introspection logic. This method
-   * bypasses that by using reflection to directly access JsonNode internals and convert them to
-   * appropriate data types.
-   *
-   * <p>Supported JsonNode types and their conversions:
-   *
-   * <ul>
-   *   <li>{@code OBJECT} - Converted to {@link HashMap} with string keys and recursively converted
-   *       values
-   *   <li>{@code ARRAY} - Converted to {@link ArrayList} with recursively converted elements
-   *   <li>{@code STRING} - Extracted as {@link String}, subject to length truncation
-   *   <li>{@code NUMBER} - Extracted as the appropriate {@link Number} subtype (Integer, Long,
-   *       Double, etc.)
-   *   <li>{@code BOOLEAN} - Extracted as {@link Boolean}
-   *   <li>{@code NULL}, {@code MISSING}, {@code BINARY}, {@code POJO} - Converted to {@code null}
-   * </ul>
-   *
-   * <p>The method applies the same truncation limits as the main conversion logic:
-   */
-  private static Object doConversionJacksonNode(
-      final JacksonContext ctx, final Object node, final int depth, final State state)
-      throws Throwable {
-    if (node == null) {
-      return null;
-    }
-    state.elemsLeft--;
-    if (state.elemsLeft <= 0) {
-      state.listMapTooLarge = true;
-      return null;
-    }
-    if (depth > MAX_DEPTH) {
-      state.objectTooDeep = true;
-      return null;
+    private static boolean ignoredFieldName(final String name) {
+        switch (name) {
+            case "this$0":
+            case "memoizedHashCode":
+            case "memoizedSize":
+                return true;
+            default:
+                return false;
+        }
     }
-    final String type = ctx.getNodeType(node);
-    if (type == null) {
-      return null;
+
+    /**
+     * Try to make field accessible
+     *
+     * @param field
+     * @return
+     */
+    private static boolean setAccessible(Field field) {
+        try {
+            if (trySetAccessible != null) {
+                return (boolean) trySetAccessible.invoke(field);
+            }
+            field.setAccessible(true);
+            return true;
+        } catch (RuntimeException | IllegalAccessException | InvocationTargetException e) {
+            log.error("Unable to make field accessible", e);
+            return false;
+        }
     }
-    switch (type) {
-      case "OBJECT":
-        final Map<Object, Object> newMap = new HashMap<>(ctx.getSize(node));
-        for (Iterator<String> names = ctx.getFieldNames(node); names.hasNext(); ) {
-          final String key = names.next();
-          final Object newKey = keyConversion(key, state);
-          if (newKey == null && key != null) {
-            // probably we're out of elements anyway
-            continue;
-          }
-          final Object value = ctx.getField(node, key);
-          newMap.put(newKey, doConversionJacksonNode(ctx, value, depth + 1, state));
+
+    private static String checkStringLength(final String str, final State state) {
+        if (str == null) {
+            return null;
         }
-        return newMap;
-      case "ARRAY":
-        final List<Object> newList = new ArrayList<>(ctx.getSize(node));
-        for (Object o : ((Iterable<?>) node)) {
-          if (state.elemsLeft <= 0) {
+        if (str.length() > MAX_STRING_SIZE) {
+            state.stringTooLong = true;
+            return str.substring(0, MAX_STRING_SIZE);
+        }
+        return str;
+    }
+
+    /**
+     * Converts Jackson databind JsonNode objects to WAF-compatible data structures using reflection.
+     *
+     * <p>Jackson databind objects ({@link com.fasterxml.jackson.databind.JsonNode}) implement
+     * iterable interfaces which interferes with the standard object introspection logic. This method
+     * bypasses that by using reflection to directly access JsonNode internals and convert them to
+     * appropriate data types.
+     *
+     * <p>Supported JsonNode types and their conversions:
+     *
+     * <ul>
+     *   <li>{@code OBJECT} - Converted to {@link HashMap} with string keys and recursively converted
+     *       values
+     *   <li>{@code ARRAY} - Converted to {@link ArrayList} with recursively converted elements
+     *   <li>{@code STRING} - Extracted as {@link String}, subject to length truncation
+     *   <li>{@code NUMBER} - Extracted as the appropriate {@link Number} subtype (Integer, Long,
+     *       Double, etc.)
+     *   <li>{@code BOOLEAN} - Extracted as {@link Boolean}
+     *   <li>{@code NULL}, {@code MISSING}, {@code BINARY}, {@code POJO} - Converted to {@code null}
+     * </ul>
+     *
+     * <p>The method applies the same truncation limits as the main conversion logic:
+     */
+    private static Object doConversionJacksonNode(
+            final JacksonContext ctx, final Object node, final int depth, final State state) throws Throwable {
+        if (node == null) {
+            return null;
+        }
+        state.elemsLeft--;
+        if (state.elemsLeft <= 0) {
             state.listMapTooLarge = true;
-            break;
-          }
-          newList.add(doConversionJacksonNode(ctx, o, depth + 1, state));
-        }
-        return newList;
-      case "BOOLEAN":
-        return ctx.getBooleanValue(node);
-      case "NUMBER":
-        return ctx.getNumberValue(node);
-      case "STRING":
-        return checkStringLength(ctx.getTextValue(node), state);
-      default:
-        // return null for the rest
-        return null;
-    }
-  }
-
-  /**
-   * Context class used to cache method resolutions while converting a top level json node class.
-   */
-  private static class JacksonContext {
-    private final MethodHandles handles;
-    private final Class<?> jsonNode;
-    private MethodHandle nodeType;
-    private MethodHandle size;
-    private MethodHandle fieldNames;
-    private MethodHandle fieldValue;
-    private MethodHandle textValue;
-    private MethodHandle booleanValue;
-    private MethodHandle numberValue;
-
-    private JacksonContext(final ClassLoader cl) throws ClassNotFoundException {
-      handles = new MethodHandles(cl);
-      jsonNode = cl.loadClass("com.fasterxml.jackson.databind.JsonNode");
+            return null;
+        }
+        if (depth > MAX_DEPTH) {
+            state.objectTooDeep = true;
+            return null;
+        }
+        final String type = ctx.getNodeType(node);
+        if (type == null) {
+            return null;
+        }
+        switch (type) {
+            case "OBJECT":
+                final Map<Object, Object> newMap = new HashMap<>(ctx.getSize(node));
+                for (Iterator<String> names = ctx.getFieldNames(node); names.hasNext(); ) {
+                    final String key = names.next();
+                    final Object newKey = keyConversion(key, state);
+                    if (newKey == null && key != null) {
+                        // probably we're out of elements anyway
+                        continue;
+                    }
+                    final Object value = ctx.getField(node, key);
+                    newMap.put(newKey, doConversionJacksonNode(ctx, value, depth + 1, state));
+                }
+                return newMap;
+            case "ARRAY":
+                final List<Object> newList = new ArrayList<>(ctx.getSize(node));
+                for (Object o : ((Iterable<?>) node)) {
+                    if (state.elemsLeft <= 0) {
+                        state.listMapTooLarge = true;
+                        break;
+                    }
+                    newList.add(doConversionJacksonNode(ctx, o, depth + 1, state));
+                }
+                return newList;
+            case "BOOLEAN":
+                return ctx.getBooleanValue(node);
+            case "NUMBER":
+                return ctx.getNumberValue(node);
+            case "STRING":
+                return checkStringLength(ctx.getTextValue(node), state);
+            default:
+                // return null for the rest
+                return null;
+        }
     }
 
-    private String getNodeType(final Object node) throws Throwable {
-      nodeType = nodeType == null ? handles.method(jsonNode, "getNodeType") : nodeType;
-      final Enum<?> type = (Enum<?>) nodeType.invoke(node);
-      return type == null ? null : type.name();
-    }
+    /**
+     * Context class used to cache method resolutions while converting a top level json node class.
+     */
+    private static class JacksonContext {
+        private final MethodHandles handles;
+        private final Class<?> jsonNode;
+        private MethodHandle nodeType;
+        private MethodHandle size;
+        private MethodHandle fieldNames;
+        private MethodHandle fieldValue;
+        private MethodHandle textValue;
+        private MethodHandle booleanValue;
+        private MethodHandle numberValue;
+
+        private JacksonContext(final ClassLoader cl) throws ClassNotFoundException {
+            handles = new MethodHandles(cl);
+            jsonNode = cl.loadClass("com.fasterxml.jackson.databind.JsonNode");
+        }
 
-    private int getSize(final Object node) throws Throwable {
-      size = size == null ? handles.method(jsonNode, "size") : size;
-      return (int) size.invoke(node);
-    }
+        private String getNodeType(final Object node) throws Throwable {
+            nodeType = nodeType == null ? handles.method(jsonNode, "getNodeType") : nodeType;
+            final Enum<?> type = (Enum<?>) nodeType.invoke(node);
+            return type == null ? null : type.name();
+        }
 
-    @SuppressWarnings("unchecked")
-    private Iterator<String> getFieldNames(final Object node) throws Throwable {
-      fieldNames = fieldNames == null ? handles.method(jsonNode, "fieldNames") : fieldNames;
-      return (Iterator<String>) fieldNames.invoke(node);
-    }
+        private int getSize(final Object node) throws Throwable {
+            size = size == null ? handles.method(jsonNode, "size") : size;
+            return (int) size.invoke(node);
+        }
 
-    private Object getField(final Object node, final String name) throws Throwable {
-      fieldValue = fieldValue == null ? handles.method(jsonNode, "get", String.class) : fieldValue;
-      return fieldValue.invoke(node, name);
-    }
+        @SuppressWarnings("unchecked")
+        private Iterator<String> getFieldNames(final Object node) throws Throwable {
+            fieldNames = fieldNames == null ? handles.method(jsonNode, "fieldNames") : fieldNames;
+            return (Iterator<String>) fieldNames.invoke(node);
+        }
 
-    private String getTextValue(final Object node) throws Throwable {
-      textValue = textValue == null ? handles.method(jsonNode, "textValue") : textValue;
-      return (String) textValue.invoke(node);
-    }
+        private Object getField(final Object node, final String name) throws Throwable {
+            fieldValue = fieldValue == null ? handles.method(jsonNode, "get", String.class) : fieldValue;
+            return fieldValue.invoke(node, name);
+        }
 
-    private Number getNumberValue(final Object node) throws Throwable {
-      numberValue = numberValue == null ? handles.method(jsonNode, "numberValue") : numberValue;
-      return (Number) numberValue.invoke(node);
-    }
+        private String getTextValue(final Object node) throws Throwable {
+            textValue = textValue == null ? handles.method(jsonNode, "textValue") : textValue;
+            return (String) textValue.invoke(node);
+        }
 
-    private Boolean getBooleanValue(final Object node) throws Throwable {
-      booleanValue = booleanValue == null ? handles.method(jsonNode, "booleanValue") : booleanValue;
-      return (Boolean) booleanValue.invoke(node);
+        private Number getNumberValue(final Object node) throws Throwable {
+            numberValue = numberValue == null ? handles.method(jsonNode, "numberValue") : numberValue;
+            return (Number) numberValue.invoke(node);
+        }
+
+        private Boolean getBooleanValue(final Object node) throws Throwable {
+            booleanValue = booleanValue == null ? handles.method(jsonNode, "booleanValue") : booleanValue;
+            return (Boolean) booleanValue.invoke(node);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/SingletonDataBundle.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/SingletonDataBundle.java
index 96ce9f7c20c..b63ffad6531 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/SingletonDataBundle.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/SingletonDataBundle.java
@@ -7,74 +7,74 @@
 import java.util.NoSuchElementException;
 
 public class SingletonDataBundle<T> implements DataBundle {
-  private final Address<T> address;
-  private final T data;
+    private final Address<T> address;
+    private final T data;
 
-  public SingletonDataBundle(Address<T> address, T data) {
-    this.address = address;
-    this.data = data;
-  }
-
-  @Override
-  public boolean hasAddress(Address<?> addr) {
-    return addr.equals(this.address);
-  }
-
-  @Override
-  public Collection<Address<?>> getAllAddresses() {
-    return Collections.singletonList(address);
-  }
-
-  @Override
-  public int size() {
-    return 1;
-  }
-
-  @Override
-  public <T> T get(Address<T> addr) {
-    if (addr.equals(this.address)) {
-      return (T) data;
+    public SingletonDataBundle(Address<T> address, T data) {
+        this.address = address;
+        this.data = data;
     }
-    return null;
-  }
-
-  @Override
-  public Iterator<Map.Entry<Address<?>, Object>> iterator() {
-    return new SingletonIterator();
-  }
-
-  public class SingletonIterator implements Iterator<Map.Entry<Address<?>, Object>> {
-    private boolean hasNext = true;
 
     @Override
-    public boolean hasNext() {
-      return hasNext;
+    public boolean hasAddress(Address<?> addr) {
+        return addr.equals(this.address);
     }
 
     @Override
-    public Map.Entry<Address<?>, Object> next() {
-      if (hasNext) {
-        hasNext = false;
-        return new SingletonEntry();
-      }
-      throw new NoSuchElementException();
+    public Collection<Address<?>> getAllAddresses() {
+        return Collections.singletonList(address);
     }
-  }
 
-  public class SingletonEntry implements Map.Entry<Address<?>, Object> {
     @Override
-    public Address<?> getKey() {
-      return address;
+    public int size() {
+        return 1;
     }
 
     @Override
-    public Object getValue() {
-      return data;
+    public <T> T get(Address<T> addr) {
+        if (addr.equals(this.address)) {
+            return (T) data;
+        }
+        return null;
     }
 
     @Override
-    public Object setValue(Object value) {
-      throw new UnsupportedOperationException();
+    public Iterator<Map.Entry<Address<?>, Object>> iterator() {
+        return new SingletonIterator();
+    }
+
+    public class SingletonIterator implements Iterator<Map.Entry<Address<?>, Object>> {
+        private boolean hasNext = true;
+
+        @Override
+        public boolean hasNext() {
+            return hasNext;
+        }
+
+        @Override
+        public Map.Entry<Address<?>, Object> next() {
+            if (hasNext) {
+                hasNext = false;
+                return new SingletonEntry();
+            }
+            throw new NoSuchElementException();
+        }
+    }
+
+    public class SingletonEntry implements Map.Entry<Address<?>, Object> {
+        @Override
+        public Address<?> getKey() {
+            return address;
+        }
+
+        @Override
+        public Object getValue() {
+            return data;
+        }
+
+        @Override
+        public Object setValue(Object value) {
+            throw new UnsupportedOperationException();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java
index af817f7eca7..1e726d90e3c 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java
@@ -49,1122 +49,1112 @@
 // or at least create separate interfaces
 @SuppressFBWarnings("AT_STALE_THREAD_WRITE_OF_PRIMITIVE")
 public class AppSecRequestContext implements DataBundle, Closeable, AppSecContext {
-  private static final Logger log = LoggerFactory.getLogger(AppSecRequestContext.class);
-
-  public static final int DEFAULT_EXTENDED_DATA_COLLECTION_MAX_HEADERS = 50;
-
-  // Values MUST be lowercase! Lookup with Ignore Case
-  // was removed due performance reason
-  // request headers that will always be set when appsec is enabled
-  public static final Set<String> DEFAULT_REQUEST_HEADERS_ALLOW_LIST =
-      new TreeSet<>(
-          Arrays.asList(
-              "content-type",
-              "user-agent",
-              "accept",
-              "x-amzn-trace-id",
-              "cloudfront-viewer-ja3-fingerprint",
-              "cf-ray",
-              "x-cloud-trace-context",
-              "x-appgw-trace-id",
-              "x-sigsci-requestid",
-              "x-sigsci-tags",
-              "akamai-user-risk"));
-
-  // request headers when there are security events
-  public static final Set<String> REQUEST_HEADERS_ALLOW_LIST =
-      new TreeSet<>(
-          Arrays.asList(
-              "x-forwarded-for",
-              "x-real-ip",
-              "true-client-ip",
-              "x-client-ip",
-              "x-forwarded",
-              "forwarded-for",
-              "x-cluster-client-ip",
-              "fastly-client-ip",
-              "cf-connecting-ip",
-              "cf-connecting-ipv6",
-              "forwarded",
-              "via",
-              "content-length",
-              "content-encoding",
-              "content-language",
-              "host",
-              "accept-encoding",
-              "accept-language"));
-
-  // response headers when there are security events
-  public static final Set<String> RESPONSE_HEADERS_ALLOW_LIST =
-      new TreeSet<>(
-          Arrays.asList("content-length", "content-type", "content-encoding", "content-language"));
-
-  // headers related with authorization
-  public static final Set<String> AUTHORIZATION_HEADERS =
-      new TreeSet<>(
-          Arrays.asList(
-              "authorization",
-              "proxy-authorization",
-              "www-authenticate",
-              "proxy-authenticate",
-              "authentication-info",
-              "proxy-authentication-info",
-              "cookie",
-              "set-cookie"));
-
-  static {
-    REQUEST_HEADERS_ALLOW_LIST.addAll(DEFAULT_REQUEST_HEADERS_ALLOW_LIST);
-  }
-
-  private final ConcurrentHashMap<Address<?>, Object> persistentData = new ConcurrentHashMap<>();
-  private volatile Queue<AppSecEvent> appSecEvents;
-  private volatile Queue<StackTraceEvent> stackTraceEvents;
-
-  // assume these will always be written and read by the same thread
-  private String scheme;
-  private String method;
-  private String savedRawURI;
-  private String route;
-  private String httpUrl;
-  private String apiSecurityFramework;
-  private String endpoint;
-  private boolean endpointComputed = false;
-  // Handed out live to readers that may run on the trace-processing thread (API Security schema
-  // extraction), so close() must release these by nulling the reference, never by clearing the map:
-  // mutating a snapshot mid-iteration corrupts it (APPSEC-70134). Volatile because that release can
-  // happen on a different thread than the header writes.
-  //
-  // null also means "no header seen yet", so an untouched context allocates nothing. Only
-  // addRequestHeader/addResponseHeader materialize, which assumes the single writer the plain
-  // LinkedHashMap already assumes; the getters null-coalesce so no reader allocates.
-  private volatile Map<String, List<String>> requestHeaders;
-  private volatile Map<String, List<String>> responseHeaders;
-  private volatile Map<String, List<String>> collectedCookies;
-  private boolean finishedRequestHeaders;
-  private boolean finishedResponseHeaders;
-  private String peerAddress;
-  private int peerPort;
-  private String inferredClientIp;
-
-  private boolean extendedDataCollection = false;
-  private int extendedDataCollectionMaxHeaders = DEFAULT_EXTENDED_DATA_COLLECTION_MAX_HEADERS;
-
-  private volatile StoredBodySupplier storedRequestBodySupplier;
-  private String dbType;
-
-  private int responseStatus;
-
-  private boolean reqDataPublished;
-  private boolean rawReqBodyPublished;
-  private boolean convertedReqBodyPublished;
-  private boolean responseBodyPublished;
-  private boolean respDataPublished;
-  private boolean pathParamsPublished;
-
-  /**
-   * WAF-reported attributes, published copy-on-write: writers publish a fresh unmodifiable copy
-   * instead of mutating in place, so a reader can keep the instance it read without
-   * synchronization. Mutating a published map would break readers running on the trace-processing
-   * thread (APPSEC-70134).
-   */
-  private final AtomicReference<Map<String, Object>> derivatives = new AtomicReference<>();
-
-  private final AtomicBoolean rateLimited = new AtomicBoolean(false);
-  private volatile boolean throttled;
-
-  // should be guarded by this
-  private volatile WafContext wafContext;
-  private volatile boolean wafContextClosed;
-  // set after wafContext is set
-  private volatile WafMetrics wafMetrics;
-  private volatile WafMetrics raspMetrics;
-  private final AtomicInteger raspMetricsCounter = new AtomicInteger(0);
-
-  private volatile boolean wafBlocked;
-  private volatile String blockingResponseContentType;
-  private volatile Integer blockingResponseContentLength;
-  private volatile boolean wafErrors;
-  private volatile boolean wafTruncated;
-  private volatile boolean wafRequestBlockFailure;
-  private volatile boolean wafRateLimited;
-  private volatile boolean wafRequestExcluded;
-
-  private volatile int wafTimeouts;
-  private volatile int raspTimeouts;
-
-  private volatile Object processedRequestBody;
-  private volatile boolean processedResponseBodySizeExceeded;
-  private volatile boolean raspMatched;
-
-  // keep a reference to the last published usr.id
-  private volatile String userId;
-  // keep a reference to the last published usr.login
-  private volatile String userLogin;
-  // keep a reference to the last published usr.session_id
-  private volatile String sessionId;
-
-  // Used to detect missing request-end event at close.
-  private volatile boolean requestEndCalled;
-
-  private volatile boolean keepOpenForApiSecurityPostProcessing;
-  private volatile Long apiSecurityEndpointHash;
-
-  private final AtomicInteger httpClientRequestCount = new AtomicInteger(0);
-  private final Set<Long> sampledHttpClientRequests = new HashSet<>();
-
-  private static final AtomicIntegerFieldUpdater<AppSecRequestContext> WAF_TIMEOUTS_UPDATER =
-      AtomicIntegerFieldUpdater.newUpdater(AppSecRequestContext.class, "wafTimeouts");
-  private static final AtomicIntegerFieldUpdater<AppSecRequestContext> RASP_TIMEOUTS_UPDATER =
-      AtomicIntegerFieldUpdater.newUpdater(AppSecRequestContext.class, "raspTimeouts");
-  private boolean manuallyKept = false;
-
-  // to be called by the Event Dispatcher
-  public void addAll(DataBundle newData) {
-    for (Map.Entry<Address<?>, Object> entry : newData) {
-      Address<?> address = entry.getKey();
-      Object value = entry.getValue();
-      if (value == null) {
-        log.debug(SEND_TELEMETRY, "Address {} ignored, because contains null value.", address);
-        continue;
-      }
-      Object prev = persistentData.putIfAbsent(address, value);
-      if (prev == value || value.equals(prev)) {
-        continue;
-      } else if (prev != null) {
-        log.debug(SEND_TELEMETRY, "Attempt to replace context value for {}", address);
-      }
-      if (log.isDebugEnabled()) {
-        StandardizedLogging.addressPushed(log, address);
-      }
-    }
-  }
-
-  public WafMetrics getWafMetrics() {
-    return wafMetrics;
-  }
-
-  public WafMetrics getRaspMetrics() {
-    return raspMetrics;
-  }
-
-  public AtomicInteger getRaspMetricsCounter() {
-    return raspMetricsCounter;
-  }
-
-  public void setWafBlocked() {
-    this.wafBlocked = true;
-  }
-
-  public boolean isWafBlocked() {
-    return wafBlocked;
-  }
-
-  public void setBlockingResponseContentType(String contentType) {
-    this.blockingResponseContentType = contentType;
-  }
-
-  public String getBlockingResponseContentType() {
-    return blockingResponseContentType;
-  }
-
-  public void setBlockingResponseContentLength(Integer contentLength) {
-    this.blockingResponseContentLength = contentLength;
-  }
-
-  public Integer getBlockingResponseContentLength() {
-    return blockingResponseContentLength;
-  }
-
-  public void setWafErrors() {
-    this.wafErrors = true;
-  }
-
-  public boolean hasWafErrors() {
-    return wafErrors;
-  }
-
-  public void setWafTruncated() {
-    this.wafTruncated = true;
-  }
-
-  public boolean isWafTruncated() {
-    return wafTruncated;
-  }
-
-  public void setWafRequestBlockFailure() {
-    this.wafRequestBlockFailure = true;
-  }
-
-  public boolean isWafRequestBlockFailure() {
-    return wafRequestBlockFailure;
-  }
-
-  @Override
-  public void reportBlockFailure() {
-    setWafRequestBlockFailure();
-  }
-
-  public void setWafRateLimited() {
-    this.wafRateLimited = true;
-  }
-
-  public boolean isWafRateLimited() {
-    return wafRateLimited;
-  }
-
-  // placeholder: libddwaf does not yet expose exclusion filter results
-  public void setWafRequestExcluded() {
-    wafRequestExcluded = true;
-  }
-
-  public boolean isWafRequestExcluded() {
-    return wafRequestExcluded;
-  }
-
-  public void increaseWafTimeouts() {
-    WAF_TIMEOUTS_UPDATER.incrementAndGet(this);
-  }
-
-  public void increaseRaspTimeouts() {
-    RASP_TIMEOUTS_UPDATER.incrementAndGet(this);
-  }
-
-  public boolean sampleHttpClientRequest(final long id) {
-    httpClientRequestCount.incrementAndGet();
-    synchronized (sampledHttpClientRequests) {
-      if (sampledHttpClientRequests.contains(id)) {
-        return true;
-      }
-      if (sampledHttpClientRequests.size()
-          < Config.get().getApiSecurityMaxDownstreamRequestBodyAnalysis()) {
-        sampledHttpClientRequests.add(id);
-        return true;
-      }
-    }
-    return false;
-  }
-
-  public boolean isHttpClientRequestSampled(final long id) {
-    return sampledHttpClientRequests.contains(id);
-  }
-
-  public int getHttpClientRequestCount() {
-    return httpClientRequestCount.get();
-  }
-
-  public int getWafTimeouts() {
-    return wafTimeouts;
-  }
-
-  public int getRaspTimeouts() {
-    return raspTimeouts;
-  }
-
-  public boolean isExtendedDataCollection() {
-    return extendedDataCollection;
-  }
-
-  public void setExtendedDataCollection(boolean extendedDataCollection) {
-    this.extendedDataCollection = extendedDataCollection;
-  }
-
-  public int getExtendedDataCollectionMaxHeaders() {
-    return extendedDataCollectionMaxHeaders;
-  }
-
-  public void setExtendedDataCollectionMaxHeaders(int extendedDataCollectionMaxHeaders) {
-    this.extendedDataCollectionMaxHeaders = extendedDataCollectionMaxHeaders;
-  }
-
-  /**
-   * Returns the request's {@link WafContext}, creating it on first use.
-   *
-   * <p>Returns {@code null} when the context has already been closed (see {@link
-   * #closeWafContext()}). Callers MUST treat a {@code null} return as "the WAF must not run for
-   * this request" and skip the evaluation. This prevents a late/async data event (e.g. a RASP
-   * callback on a driver or event-loop thread) from resurrecting a brand-new native {@code
-   * ddwaf_context} on an already-finished request, which would never be closed and would leak
-   * off-heap memory (APPSEC-69085).
-   */
-  public WafContext getOrCreateWafContext(
-      WafHandle wafHandle, boolean createMetrics, boolean isRasp) {
-    synchronized (this) {
-      // Atomic with respect to closeWafContext(): both run under this monitor.
-      if (wafContextClosed) {
-        return null;
-      }
-      if (createMetrics) {
-        if (wafMetrics == null) {
-          this.wafMetrics = new WafMetrics();
+    private static final Logger log = LoggerFactory.getLogger(AppSecRequestContext.class);
+
+    public static final int DEFAULT_EXTENDED_DATA_COLLECTION_MAX_HEADERS = 50;
+
+    // Values MUST be lowercase! Lookup with Ignore Case
+    // was removed due performance reason
+    // request headers that will always be set when appsec is enabled
+    public static final Set<String> DEFAULT_REQUEST_HEADERS_ALLOW_LIST = new TreeSet<>(Arrays.asList(
+            "content-type",
+            "user-agent",
+            "accept",
+            "x-amzn-trace-id",
+            "cloudfront-viewer-ja3-fingerprint",
+            "cf-ray",
+            "x-cloud-trace-context",
+            "x-appgw-trace-id",
+            "x-sigsci-requestid",
+            "x-sigsci-tags",
+            "akamai-user-risk"));
+
+    // request headers when there are security events
+    public static final Set<String> REQUEST_HEADERS_ALLOW_LIST = new TreeSet<>(Arrays.asList(
+            "x-forwarded-for",
+            "x-real-ip",
+            "true-client-ip",
+            "x-client-ip",
+            "x-forwarded",
+            "forwarded-for",
+            "x-cluster-client-ip",
+            "fastly-client-ip",
+            "cf-connecting-ip",
+            "cf-connecting-ipv6",
+            "forwarded",
+            "via",
+            "content-length",
+            "content-encoding",
+            "content-language",
+            "host",
+            "accept-encoding",
+            "accept-language"));
+
+    // response headers when there are security events
+    public static final Set<String> RESPONSE_HEADERS_ALLOW_LIST =
+            new TreeSet<>(Arrays.asList("content-length", "content-type", "content-encoding", "content-language"));
+
+    // headers related with authorization
+    public static final Set<String> AUTHORIZATION_HEADERS = new TreeSet<>(Arrays.asList(
+            "authorization",
+            "proxy-authorization",
+            "www-authenticate",
+            "proxy-authenticate",
+            "authentication-info",
+            "proxy-authentication-info",
+            "cookie",
+            "set-cookie"));
+
+    static {
+        REQUEST_HEADERS_ALLOW_LIST.addAll(DEFAULT_REQUEST_HEADERS_ALLOW_LIST);
+    }
+
+    private final ConcurrentHashMap<Address<?>, Object> persistentData = new ConcurrentHashMap<>();
+    private volatile Queue<AppSecEvent> appSecEvents;
+    private volatile Queue<StackTraceEvent> stackTraceEvents;
+
+    // assume these will always be written and read by the same thread
+    private String scheme;
+    private String method;
+    private String savedRawURI;
+    private String route;
+    private String httpUrl;
+    private String apiSecurityFramework;
+    private String endpoint;
+    private boolean endpointComputed = false;
+    // Handed out live to readers that may run on the trace-processing thread (API Security schema
+    // extraction), so close() must release these by nulling the reference, never by clearing the map:
+    // mutating a snapshot mid-iteration corrupts it (APPSEC-70134). Volatile because that release can
+    // happen on a different thread than the header writes.
+    //
+    // null also means "no header seen yet", so an untouched context allocates nothing. Only
+    // addRequestHeader/addResponseHeader materialize, which assumes the single writer the plain
+    // LinkedHashMap already assumes; the getters null-coalesce so no reader allocates.
+    private volatile Map<String, List<String>> requestHeaders;
+    private volatile Map<String, List<String>> responseHeaders;
+    private volatile Map<String, List<String>> collectedCookies;
+    private boolean finishedRequestHeaders;
+    private boolean finishedResponseHeaders;
+    private String peerAddress;
+    private int peerPort;
+    private String inferredClientIp;
+
+    private boolean extendedDataCollection = false;
+    private int extendedDataCollectionMaxHeaders = DEFAULT_EXTENDED_DATA_COLLECTION_MAX_HEADERS;
+
+    private volatile StoredBodySupplier storedRequestBodySupplier;
+    private String dbType;
+
+    private int responseStatus;
+
+    private boolean reqDataPublished;
+    private boolean rawReqBodyPublished;
+    private boolean convertedReqBodyPublished;
+    private boolean responseBodyPublished;
+    private boolean respDataPublished;
+    private boolean pathParamsPublished;
+
+    /**
+     * WAF-reported attributes, published copy-on-write: writers publish a fresh unmodifiable copy
+     * instead of mutating in place, so a reader can keep the instance it read without
+     * synchronization. Mutating a published map would break readers running on the trace-processing
+     * thread (APPSEC-70134).
+     */
+    private final AtomicReference<Map<String, Object>> derivatives = new AtomicReference<>();
+
+    private final AtomicBoolean rateLimited = new AtomicBoolean(false);
+    private volatile boolean throttled;
+
+    // should be guarded by this
+    private volatile WafContext wafContext;
+    private volatile boolean wafContextClosed;
+    // set after wafContext is set
+    private volatile WafMetrics wafMetrics;
+    private volatile WafMetrics raspMetrics;
+    private final AtomicInteger raspMetricsCounter = new AtomicInteger(0);
+
+    private volatile boolean wafBlocked;
+    private volatile String blockingResponseContentType;
+    private volatile Integer blockingResponseContentLength;
+    private volatile boolean wafErrors;
+    private volatile boolean wafTruncated;
+    private volatile boolean wafRequestBlockFailure;
+    private volatile boolean wafRateLimited;
+    private volatile boolean wafRequestExcluded;
+
+    private volatile int wafTimeouts;
+    private volatile int raspTimeouts;
+
+    private volatile Object processedRequestBody;
+    private volatile boolean processedResponseBodySizeExceeded;
+    private volatile boolean raspMatched;
+
+    // keep a reference to the last published usr.id
+    private volatile String userId;
+    // keep a reference to the last published usr.login
+    private volatile String userLogin;
+    // keep a reference to the last published usr.session_id
+    private volatile String sessionId;
+
+    // Used to detect missing request-end event at close.
+    private volatile boolean requestEndCalled;
+
+    private volatile boolean keepOpenForApiSecurityPostProcessing;
+    private volatile Long apiSecurityEndpointHash;
+
+    private final AtomicInteger httpClientRequestCount = new AtomicInteger(0);
+    private final Set<Long> sampledHttpClientRequests = new HashSet<>();
+
+    private static final AtomicIntegerFieldUpdater<AppSecRequestContext> WAF_TIMEOUTS_UPDATER =
+            AtomicIntegerFieldUpdater.newUpdater(AppSecRequestContext.class, "wafTimeouts");
+    private static final AtomicIntegerFieldUpdater<AppSecRequestContext> RASP_TIMEOUTS_UPDATER =
+            AtomicIntegerFieldUpdater.newUpdater(AppSecRequestContext.class, "raspTimeouts");
+    private boolean manuallyKept = false;
+
+    // to be called by the Event Dispatcher
+    public void addAll(DataBundle newData) {
+        for (Map.Entry<Address<?>, Object> entry : newData) {
+            Address<?> address = entry.getKey();
+            Object value = entry.getValue();
+            if (value == null) {
+                log.debug(SEND_TELEMETRY, "Address {} ignored, because contains null value.", address);
+                continue;
+            }
+            Object prev = persistentData.putIfAbsent(address, value);
+            if (prev == value || value.equals(prev)) {
+                continue;
+            } else if (prev != null) {
+                log.debug(SEND_TELEMETRY, "Attempt to replace context value for {}", address);
+            }
+            if (log.isDebugEnabled()) {
+                StandardizedLogging.addressPushed(log, address);
+            }
         }
-        if (isRasp && raspMetrics == null) {
-          this.raspMetrics = new WafMetrics();
+    }
+
+    public WafMetrics getWafMetrics() {
+        return wafMetrics;
+    }
+
+    public WafMetrics getRaspMetrics() {
+        return raspMetrics;
+    }
+
+    public AtomicInteger getRaspMetricsCounter() {
+        return raspMetricsCounter;
+    }
+
+    public void setWafBlocked() {
+        this.wafBlocked = true;
+    }
+
+    public boolean isWafBlocked() {
+        return wafBlocked;
+    }
+
+    public void setBlockingResponseContentType(String contentType) {
+        this.blockingResponseContentType = contentType;
+    }
+
+    public String getBlockingResponseContentType() {
+        return blockingResponseContentType;
+    }
+
+    public void setBlockingResponseContentLength(Integer contentLength) {
+        this.blockingResponseContentLength = contentLength;
+    }
+
+    public Integer getBlockingResponseContentLength() {
+        return blockingResponseContentLength;
+    }
+
+    public void setWafErrors() {
+        this.wafErrors = true;
+    }
+
+    public boolean hasWafErrors() {
+        return wafErrors;
+    }
+
+    public void setWafTruncated() {
+        this.wafTruncated = true;
+    }
+
+    public boolean isWafTruncated() {
+        return wafTruncated;
+    }
+
+    public void setWafRequestBlockFailure() {
+        this.wafRequestBlockFailure = true;
+    }
+
+    public boolean isWafRequestBlockFailure() {
+        return wafRequestBlockFailure;
+    }
+
+    @Override
+    public void reportBlockFailure() {
+        setWafRequestBlockFailure();
+    }
+
+    public void setWafRateLimited() {
+        this.wafRateLimited = true;
+    }
+
+    public boolean isWafRateLimited() {
+        return wafRateLimited;
+    }
+
+    // placeholder: libddwaf does not yet expose exclusion filter results
+    public void setWafRequestExcluded() {
+        wafRequestExcluded = true;
+    }
+
+    public boolean isWafRequestExcluded() {
+        return wafRequestExcluded;
+    }
+
+    public void increaseWafTimeouts() {
+        WAF_TIMEOUTS_UPDATER.incrementAndGet(this);
+    }
+
+    public void increaseRaspTimeouts() {
+        RASP_TIMEOUTS_UPDATER.incrementAndGet(this);
+    }
+
+    public boolean sampleHttpClientRequest(final long id) {
+        httpClientRequestCount.incrementAndGet();
+        synchronized (sampledHttpClientRequests) {
+            if (sampledHttpClientRequests.contains(id)) {
+                return true;
+            }
+            if (sampledHttpClientRequests.size() < Config.get().getApiSecurityMaxDownstreamRequestBodyAnalysis()) {
+                sampledHttpClientRequests.add(id);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean isHttpClientRequestSampled(final long id) {
+        return sampledHttpClientRequests.contains(id);
+    }
+
+    public int getHttpClientRequestCount() {
+        return httpClientRequestCount.get();
+    }
+
+    public int getWafTimeouts() {
+        return wafTimeouts;
+    }
+
+    public int getRaspTimeouts() {
+        return raspTimeouts;
+    }
+
+    public boolean isExtendedDataCollection() {
+        return extendedDataCollection;
+    }
+
+    public void setExtendedDataCollection(boolean extendedDataCollection) {
+        this.extendedDataCollection = extendedDataCollection;
+    }
+
+    public int getExtendedDataCollectionMaxHeaders() {
+        return extendedDataCollectionMaxHeaders;
+    }
+
+    public void setExtendedDataCollectionMaxHeaders(int extendedDataCollectionMaxHeaders) {
+        this.extendedDataCollectionMaxHeaders = extendedDataCollectionMaxHeaders;
+    }
+
+    /**
+     * Returns the request's {@link WafContext}, creating it on first use.
+     *
+     * <p>Returns {@code null} when the context has already been closed (see {@link
+     * #closeWafContext()}). Callers MUST treat a {@code null} return as "the WAF must not run for
+     * this request" and skip the evaluation. This prevents a late/async data event (e.g. a RASP
+     * callback on a driver or event-loop thread) from resurrecting a brand-new native {@code
+     * ddwaf_context} on an already-finished request, which would never be closed and would leak
+     * off-heap memory (APPSEC-69085).
+     */
+    public WafContext getOrCreateWafContext(WafHandle wafHandle, boolean createMetrics, boolean isRasp) {
+        synchronized (this) {
+            // Atomic with respect to closeWafContext(): both run under this monitor.
+            if (wafContextClosed) {
+                return null;
+            }
+            if (createMetrics) {
+                if (wafMetrics == null) {
+                    this.wafMetrics = new WafMetrics();
+                }
+                if (isRasp && raspMetrics == null) {
+                    this.raspMetrics = new WafMetrics();
+                }
+            }
+            if (this.wafContext != null) {
+                return this.wafContext;
+            }
+            WafContext curWafContext = new WafContext(wafHandle);
+            this.wafContext = curWafContext;
+            return curWafContext;
         }
-      }
-      if (this.wafContext != null) {
-        return this.wafContext;
-      }
-      WafContext curWafContext = new WafContext(wafHandle);
-      this.wafContext = curWafContext;
-      return curWafContext;
-    }
-  }
-
-  public void closeWafContext() {
-    if (wafContextClosed) {
-      // Fast path for the common case of redundant close() calls (e.g. the generic fallback
-      // close() running after GatewayBridge#onRequestEnded already closed it).
-      return;
-    }
-    synchronized (this) {
-      // Must be set unconditionally, even if the WAF never ran for this request: a late/async
-      // caller of getOrCreateWafContext() must not resurrect a context after close (APPSEC-69085).
-      wafContextClosed = true;
-      if (wafContext != null) {
-        try {
-          wafContext.close();
-        } finally {
-          wafContext = null;
+    }
+
+    public void closeWafContext() {
+        if (wafContextClosed) {
+            // Fast path for the common case of redundant close() calls (e.g. the generic fallback
+            // close() running after GatewayBridge#onRequestEnded already closed it).
+            return;
         }
-      }
-    }
-  }
-
-  /* Implementation of DataBundle */
-
-  @Override
-  public boolean hasAddress(Address<?> addr) {
-    return persistentData.containsKey(addr);
-  }
-
-  @Override
-  public Collection<Address<?>> getAllAddresses() {
-    return persistentData.keySet();
-  }
-
-  @Override
-  public int size() {
-    return persistentData.size();
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public <T> T get(Address<T> addr) {
-    return (T) persistentData.get(addr);
-  }
-
-  @Override
-  public Iterator<Map.Entry<Address<?>, Object>> iterator() {
-    return persistentData.entrySet().iterator();
-  }
-
-  /* Interface for use of GatewayBridge */
-
-  String getScheme() {
-    return scheme;
-  }
-
-  void setScheme(String scheme) {
-    this.scheme = scheme;
-  }
-
-  public String getMethod() {
-    return method;
-  }
-
-  void setMethod(String method) {
-    this.method = method;
-  }
-
-  String getSavedRawURI() {
-    return savedRawURI;
-  }
-
-  void setRawURI(String savedRawURI) {
-    if (this.savedRawURI == null) {
-      this.savedRawURI = savedRawURI;
-    }
-  }
-
-  public String getRoute() {
-    return route;
-  }
-
-  public void setRoute(String route) {
-    this.route = route;
-  }
-
-  /**
-   * The web framework component (e.g. netty, tomcat) captured at request-end, when the request was
-   * sampled for API Security schema extraction. Read by the deferred post-processing step instead
-   * of the span's local root, since the local root can be an inferred-proxy span (e.g.
-   * aws-apigateway) rather than the actual web framework.
-   */
-  public String getApiSecurityFramework() {
-    return apiSecurityFramework;
-  }
-
-  public void setApiSecurityFramework(String apiSecurityFramework) {
-    this.apiSecurityFramework = apiSecurityFramework;
-  }
-
-  public String getHttpUrl() {
-    return httpUrl;
-  }
-
-  public void setHttpUrl(String httpUrl) {
-    this.httpUrl = httpUrl;
-  }
-
-  /**
-   * Gets or computes the http.endpoint for this request. The endpoint is computed lazily on first
-   * access and cached to avoid recomputation.
-   *
-   * @return the http.endpoint value, or null if it cannot be computed
-   */
-  public String getOrComputeEndpoint() {
-    if (!endpointComputed) {
-      if (httpUrl != null && !httpUrl.isEmpty()) {
-        try {
-          endpoint = EndpointResolver.computeEndpoint(httpUrl);
-        } catch (Exception e) {
-          endpoint = null;
+        synchronized (this) {
+            // Must be set unconditionally, even if the WAF never ran for this request: a late/async
+            // caller of getOrCreateWafContext() must not resurrect a context after close (APPSEC-69085).
+            wafContextClosed = true;
+            if (wafContext != null) {
+                try {
+                    wafContext.close();
+                } finally {
+                    wafContext = null;
+                }
+            }
         }
-      }
-      endpointComputed = true;
     }
-    return endpoint;
-  }
 
-  /**
-   * Sets the endpoint directly without computing it. This is useful when the endpoint has already
-   * been computed elsewhere.
-   *
-   * @param endpoint the endpoint value to set
-   */
-  public void setEndpoint(String endpoint) {
-    this.endpoint = endpoint;
-    this.endpointComputed = true;
-  }
+    /* Implementation of DataBundle */
 
-  public void setKeepOpenForApiSecurityPostProcessing(final boolean flag) {
-    this.keepOpenForApiSecurityPostProcessing = flag;
-  }
+    @Override
+    public boolean hasAddress(Address<?> addr) {
+        return persistentData.containsKey(addr);
+    }
 
-  public boolean isKeepOpenForApiSecurityPostProcessing() {
-    return this.keepOpenForApiSecurityPostProcessing;
-  }
+    @Override
+    public Collection<Address<?>> getAllAddresses() {
+        return persistentData.keySet();
+    }
 
-  public void setApiSecurityEndpointHash(long hash) {
-    this.apiSecurityEndpointHash = hash;
-  }
+    @Override
+    public int size() {
+        return persistentData.size();
+    }
 
-  public Long getApiSecurityEndpointHash() {
-    return this.apiSecurityEndpointHash;
-  }
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T get(Address<T> addr) {
+        return (T) persistentData.get(addr);
+    }
 
-  void addRequestHeader(String name, String value) {
-    if (finishedRequestHeaders) {
-      throw new IllegalStateException("Request headers were said to be finished before");
+    @Override
+    public Iterator<Map.Entry<Address<?>, Object>> iterator() {
+        return persistentData.entrySet().iterator();
     }
 
-    if (name == null || value == null) {
-      return;
+    /* Interface for use of GatewayBridge */
+
+    String getScheme() {
+        return scheme;
     }
 
-    Map<String, List<String>> headers = requestHeaders;
-    if (headers == null) {
-      headers = new LinkedHashMap<>();
-      requestHeaders = headers;
+    void setScheme(String scheme) {
+        this.scheme = scheme;
     }
-    headers.computeIfAbsent(name.toLowerCase(Locale.ROOT), h -> new ArrayList<>(1)).add(value);
-  }
 
-  void finishRequestHeaders() {
-    this.finishedRequestHeaders = true;
-  }
+    public String getMethod() {
+        return method;
+    }
 
-  boolean isFinishedRequestHeaders() {
-    return finishedRequestHeaders;
-  }
+    void setMethod(String method) {
+        this.method = method;
+    }
 
-  Map<String, List<String>> getRequestHeaders() {
-    Map<String, List<String>> headers = requestHeaders;
-    return headers != null ? headers : emptyMap();
-  }
+    String getSavedRawURI() {
+        return savedRawURI;
+    }
 
-  void addResponseHeader(String name, String value) {
-    if (finishedResponseHeaders) {
-      throw new IllegalStateException("Response headers were said to be finished before");
+    void setRawURI(String savedRawURI) {
+        if (this.savedRawURI == null) {
+            this.savedRawURI = savedRawURI;
+        }
     }
 
-    if (name == null || value == null) {
-      return;
+    public String getRoute() {
+        return route;
     }
 
-    Map<String, List<String>> headers = responseHeaders;
-    if (headers == null) {
-      headers = new LinkedHashMap<>();
-      responseHeaders = headers;
+    public void setRoute(String route) {
+        this.route = route;
     }
-    headers.computeIfAbsent(name.toLowerCase(Locale.ROOT), h -> new ArrayList<>(1)).add(value);
-  }
 
-  public void finishResponseHeaders() {
-    this.finishedResponseHeaders = true;
-  }
+    /**
+     * The web framework component (e.g. netty, tomcat) captured at request-end, when the request was
+     * sampled for API Security schema extraction. Read by the deferred post-processing step instead
+     * of the span's local root, since the local root can be an inferred-proxy span (e.g.
+     * aws-apigateway) rather than the actual web framework.
+     */
+    public String getApiSecurityFramework() {
+        return apiSecurityFramework;
+    }
 
-  public boolean isFinishedResponseHeaders() {
-    return finishedResponseHeaders;
-  }
+    public void setApiSecurityFramework(String apiSecurityFramework) {
+        this.apiSecurityFramework = apiSecurityFramework;
+    }
 
-  Map<String, List<String>> getResponseHeaders() {
-    Map<String, List<String>> headers = responseHeaders;
-    return headers != null ? headers : emptyMap();
-  }
+    public String getHttpUrl() {
+        return httpUrl;
+    }
 
-  void addCookies(Map<String, List<String>> cookies) {
-    if (finishedRequestHeaders) {
-      throw new IllegalStateException("Request headers were said to be finished before");
+    public void setHttpUrl(String httpUrl) {
+        this.httpUrl = httpUrl;
     }
-    if (collectedCookies == null) {
-      collectedCookies = cookies;
-    } else {
-      collectedCookies.putAll(cookies);
+
+    /**
+     * Gets or computes the http.endpoint for this request. The endpoint is computed lazily on first
+     * access and cached to avoid recomputation.
+     *
+     * @return the http.endpoint value, or null if it cannot be computed
+     */
+    public String getOrComputeEndpoint() {
+        if (!endpointComputed) {
+            if (httpUrl != null && !httpUrl.isEmpty()) {
+                try {
+                    endpoint = EndpointResolver.computeEndpoint(httpUrl);
+                } catch (Exception e) {
+                    endpoint = null;
+                }
+            }
+            endpointComputed = true;
+        }
+        return endpoint;
     }
-  }
 
-  Map<String, ? extends Collection<String>> getCookies() {
-    return collectedCookies != null ? collectedCookies : Collections.emptyMap();
-  }
+    /**
+     * Sets the endpoint directly without computing it. This is useful when the endpoint has already
+     * been computed elsewhere.
+     *
+     * @param endpoint the endpoint value to set
+     */
+    public void setEndpoint(String endpoint) {
+        this.endpoint = endpoint;
+        this.endpointComputed = true;
+    }
 
-  String getPeerAddress() {
-    return peerAddress;
-  }
+    public void setKeepOpenForApiSecurityPostProcessing(final boolean flag) {
+        this.keepOpenForApiSecurityPostProcessing = flag;
+    }
 
-  void setPeerAddress(String peerAddress) {
-    this.peerAddress = peerAddress;
-  }
+    public boolean isKeepOpenForApiSecurityPostProcessing() {
+        return this.keepOpenForApiSecurityPostProcessing;
+    }
 
-  public int getPeerPort() {
-    return peerPort;
-  }
+    public void setApiSecurityEndpointHash(long hash) {
+        this.apiSecurityEndpointHash = hash;
+    }
 
-  public void setPeerPort(int peerPort) {
-    this.peerPort = peerPort;
-  }
+    public Long getApiSecurityEndpointHash() {
+        return this.apiSecurityEndpointHash;
+    }
 
-  void setInferredClientIp(String ipAddress) {
-    this.inferredClientIp = ipAddress;
-  }
+    void addRequestHeader(String name, String value) {
+        if (finishedRequestHeaders) {
+            throw new IllegalStateException("Request headers were said to be finished before");
+        }
 
-  String getInferredClientIp() {
-    return inferredClientIp;
-  }
+        if (name == null || value == null) {
+            return;
+        }
 
-  void setStoredRequestBodySupplier(StoredBodySupplier storedRequestBodySupplier) {
-    this.storedRequestBodySupplier = storedRequestBodySupplier;
-  }
+        Map<String, List<String>> headers = requestHeaders;
+        if (headers == null) {
+            headers = new LinkedHashMap<>();
+            requestHeaders = headers;
+        }
+        headers.computeIfAbsent(name.toLowerCase(Locale.ROOT), h -> new ArrayList<>(1))
+                .add(value);
+    }
 
-  public String getDbType() {
-    return dbType;
-  }
-
-  public void setDbType(String dbType) {
-    this.dbType = dbType;
-  }
-
-  public int getResponseStatus() {
-    return responseStatus;
-  }
-
-  public void setResponseStatus(int responseStatus) {
-    this.responseStatus = responseStatus;
-  }
-
-  public boolean isReqDataPublished() {
-    return reqDataPublished;
-  }
-
-  public void setReqDataPublished(boolean reqDataPublished) {
-    this.reqDataPublished = reqDataPublished;
-  }
-
-  public boolean isPathParamsPublished() {
-    return pathParamsPublished;
-  }
-
-  public void setPathParamsPublished(boolean pathParamsPublished) {
-    this.pathParamsPublished = pathParamsPublished;
-  }
-
-  public boolean isRawReqBodyPublished() {
-    return rawReqBodyPublished;
-  }
-
-  public void setRawReqBodyPublished(boolean rawReqBodyPublished) {
-    this.rawReqBodyPublished = rawReqBodyPublished;
-  }
-
-  public boolean isConvertedReqBodyPublished() {
-    return convertedReqBodyPublished;
-  }
-
-  public void setConvertedReqBodyPublished(boolean convertedReqBodyPublished) {
-    this.convertedReqBodyPublished = convertedReqBodyPublished;
-  }
-
-  public boolean isResponseBodyPublished() {
-    return responseBodyPublished;
-  }
-
-  public void setResponseBodyPublished(final boolean responseBodyPublished) {
-    this.responseBodyPublished = responseBodyPublished;
-  }
-
-  public boolean isRespDataPublished() {
-    return respDataPublished;
-  }
-
-  public void setRespDataPublished(boolean respDataPublished) {
-    this.respDataPublished = respDataPublished;
-  }
-
-  /**
-   * Updates the current used usr.id
-   *
-   * @return {@code false} if the user id has not been updated
-   */
-  public boolean updateUserId(String userId) {
-    if (Objects.equals(this.userId, userId)) {
-      return false;
-    }
-    this.userId = userId;
-    return true;
-  }
-
-  /**
-   * Updates current used usr.login
-   *
-   * @return {@code false} if the user login has not been updated
-   */
-  public boolean updateUserLogin(String userLogin) {
-    if (Objects.equals(this.userLogin, userLogin)) {
-      return false;
-    }
-    this.userLogin = userLogin;
-    return true;
-  }
-
-  public void setSessionId(String sessionId) {
-    this.sessionId = sessionId;
-  }
-
-  public String getSessionId() {
-    return sessionId;
-  }
-
-  /**
-   * Close the context and release all resources. This method is idempotent and can be called
-   * multiple times. For each root span, this method is always called from
-   * CoreTracer#onRootSpanPublished.
-   */
-  @Override
-  public void close() {
-    if (!requestEndCalled) {
-      log.debug(SEND_TELEMETRY, "Request end event was not called before close");
-    }
-    // For API Security, we sometimes keep contexts open for late processing. In that case, this
-    // flag needs to be
-    // later reset by the API Security post-processor and close must be called again.
-    if (!keepOpenForApiSecurityPostProcessing) {
-      if (wafContext != null) {
-        log.debug(
-            SEND_TELEMETRY, "WAF object had not been closed (probably missed request-end event)");
-      }
-      // Always close, even if the WAF never ran for this request: wafContextClosed must be set so
-      // a late/async caller of getOrCreateWafContext() cannot resurrect a context (APPSEC-69085).
-      closeWafContext();
-      collectedCookies = null;
-      persistentData.clear();
-      // Null the reference, never clear in place (APPSEC-70134): see the field declarations.
-      this.requestHeaders = null;
-      this.responseHeaders = null;
-      this.derivatives.set(null);
-    }
-  }
-
-  /**
-   * @return the portion of the body read so far, if any
-   */
-  public CharSequence getStoredRequestBody() {
-    StoredBodySupplier storedRequestBodySupplier = this.storedRequestBodySupplier;
-    if (storedRequestBodySupplier == null) {
-      return null;
-    }
-    return storedRequestBodySupplier.get();
-  }
-
-  public void reportEvents(Collection<AppSecEvent> appSecEvents) {
-    for (AppSecEvent event : appSecEvents) {
-      StandardizedLogging.attackDetected(log, event);
-    }
-    if (this.appSecEvents == null) {
-      synchronized (this) {
-        if (this.appSecEvents == null) {
-          this.appSecEvents = new ConcurrentLinkedQueue<>();
+    void finishRequestHeaders() {
+        this.finishedRequestHeaders = true;
+    }
+
+    boolean isFinishedRequestHeaders() {
+        return finishedRequestHeaders;
+    }
+
+    Map<String, List<String>> getRequestHeaders() {
+        Map<String, List<String>> headers = requestHeaders;
+        return headers != null ? headers : emptyMap();
+    }
+
+    void addResponseHeader(String name, String value) {
+        if (finishedResponseHeaders) {
+            throw new IllegalStateException("Response headers were said to be finished before");
+        }
+
+        if (name == null || value == null) {
+            return;
         }
-      }
+
+        Map<String, List<String>> headers = responseHeaders;
+        if (headers == null) {
+            headers = new LinkedHashMap<>();
+            responseHeaders = headers;
+        }
+        headers.computeIfAbsent(name.toLowerCase(Locale.ROOT), h -> new ArrayList<>(1))
+                .add(value);
     }
-    this.appSecEvents.addAll(appSecEvents);
-  }
 
-  public void reportStackTrace(StackTraceEvent stackTraceEvent) {
-    if (this.stackTraceEvents == null) {
-      synchronized (this) {
-        if (this.stackTraceEvents == null) {
-          this.stackTraceEvents = new ConcurrentLinkedQueue<>();
+    public void finishResponseHeaders() {
+        this.finishedResponseHeaders = true;
+    }
+
+    public boolean isFinishedResponseHeaders() {
+        return finishedResponseHeaders;
+    }
+
+    Map<String, List<String>> getResponseHeaders() {
+        Map<String, List<String>> headers = responseHeaders;
+        return headers != null ? headers : emptyMap();
+    }
+
+    void addCookies(Map<String, List<String>> cookies) {
+        if (finishedRequestHeaders) {
+            throw new IllegalStateException("Request headers were said to be finished before");
         }
-      }
+        if (collectedCookies == null) {
+            collectedCookies = cookies;
+        } else {
+            collectedCookies.putAll(cookies);
+        }
+    }
+
+    Map<String, ? extends Collection<String>> getCookies() {
+        return collectedCookies != null ? collectedCookies : Collections.emptyMap();
+    }
+
+    String getPeerAddress() {
+        return peerAddress;
+    }
+
+    void setPeerAddress(String peerAddress) {
+        this.peerAddress = peerAddress;
     }
-    if (stackTraceEvents.size() <= Config.get().getAppSecMaxStackTraces()) {
-      this.stackTraceEvents.add(stackTraceEvent);
+
+    public int getPeerPort() {
+        return peerPort;
+    }
+
+    public void setPeerPort(int peerPort) {
+        this.peerPort = peerPort;
+    }
+
+    void setInferredClientIp(String ipAddress) {
+        this.inferredClientIp = ipAddress;
+    }
+
+    String getInferredClientIp() {
+        return inferredClientIp;
+    }
+
+    void setStoredRequestBodySupplier(StoredBodySupplier storedRequestBodySupplier) {
+        this.storedRequestBodySupplier = storedRequestBodySupplier;
     }
-  }
 
-  Collection<AppSecEvent> transferCollectedEvents() {
-    if (this.appSecEvents == null) {
-      return Collections.emptyList();
+    public String getDbType() {
+        return dbType;
     }
 
-    Collection<AppSecEvent> events = new ArrayList<>();
-    AppSecEvent item;
-    while ((item = this.appSecEvents.poll()) != null) {
-      events.add(item);
+    public void setDbType(String dbType) {
+        this.dbType = dbType;
     }
 
-    return events;
-  }
+    public int getResponseStatus() {
+        return responseStatus;
+    }
 
-  List<StackTraceEvent> getStackTraces() {
-    if (this.stackTraceEvents == null) {
-      return null;
+    public void setResponseStatus(int responseStatus) {
+        this.responseStatus = responseStatus;
     }
-    List<StackTraceEvent> stackTraces = new ArrayList<>();
-    StackTraceEvent item;
-    while ((item = this.stackTraceEvents.poll()) != null) {
-      stackTraces.add(item);
+
+    public boolean isReqDataPublished() {
+        return reqDataPublished;
     }
-    return stackTraces;
-  }
 
-  public void reportDerivatives(Map<String, Object> data) {
-    log.debug("Reporting derivatives: {}", data);
-    if (data == null || data.isEmpty()) return;
+    public void setReqDataPublished(boolean reqDataPublished) {
+        this.reqDataPublished = reqDataPublished;
+    }
 
-    // Initialize or update derivatives atomically
-    derivatives.updateAndGet(
-        current -> {
-          Map<String, Object> updated = current != null ? new HashMap<>(current) : new HashMap<>();
+    public boolean isPathParamsPublished() {
+        return pathParamsPublished;
+    }
 
-          // Process each attribute according to the specification
-          for (Map.Entry<String, Object> entry : data.entrySet()) {
-            String attributeKey = entry.getKey();
-            Object attributeConfig = entry.getValue();
+    public void setPathParamsPublished(boolean pathParamsPublished) {
+        this.pathParamsPublished = pathParamsPublished;
+    }
+
+    public boolean isRawReqBodyPublished() {
+        return rawReqBodyPublished;
+    }
 
-            if (attributeConfig instanceof Map) {
-              @SuppressWarnings("unchecked")
-              Map<String, Object> config = (Map<String, Object>) attributeConfig;
+    public void setRawReqBodyPublished(boolean rawReqBodyPublished) {
+        this.rawReqBodyPublished = rawReqBodyPublished;
+    }
 
-              // Check if it's a literal value schema
-              if (config.containsKey("value")) {
-                Object literalValue = config.get("value");
-                if (literalValue != null) {
-                  // Preserve the original type - don't convert to string
-                  updated.put(attributeKey, literalValue);
-                  log.debug(
-                      "Added literal attribute: {} = {} (type: {})",
-                      attributeKey,
-                      literalValue,
-                      literalValue.getClass().getSimpleName());
+    public boolean isConvertedReqBodyPublished() {
+        return convertedReqBodyPublished;
+    }
+
+    public void setConvertedReqBodyPublished(boolean convertedReqBodyPublished) {
+        this.convertedReqBodyPublished = convertedReqBodyPublished;
+    }
+
+    public boolean isResponseBodyPublished() {
+        return responseBodyPublished;
+    }
+
+    public void setResponseBodyPublished(final boolean responseBodyPublished) {
+        this.responseBodyPublished = responseBodyPublished;
+    }
+
+    public boolean isRespDataPublished() {
+        return respDataPublished;
+    }
+
+    public void setRespDataPublished(boolean respDataPublished) {
+        this.respDataPublished = respDataPublished;
+    }
+
+    /**
+     * Updates the current used usr.id
+     *
+     * @return {@code false} if the user id has not been updated
+     */
+    public boolean updateUserId(String userId) {
+        if (Objects.equals(this.userId, userId)) {
+            return false;
+        }
+        this.userId = userId;
+        return true;
+    }
+
+    /**
+     * Updates current used usr.login
+     *
+     * @return {@code false} if the user login has not been updated
+     */
+    public boolean updateUserLogin(String userLogin) {
+        if (Objects.equals(this.userLogin, userLogin)) {
+            return false;
+        }
+        this.userLogin = userLogin;
+        return true;
+    }
+
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    /**
+     * Close the context and release all resources. This method is idempotent and can be called
+     * multiple times. For each root span, this method is always called from
+     * CoreTracer#onRootSpanPublished.
+     */
+    @Override
+    public void close() {
+        if (!requestEndCalled) {
+            log.debug(SEND_TELEMETRY, "Request end event was not called before close");
+        }
+        // For API Security, we sometimes keep contexts open for late processing. In that case, this
+        // flag needs to be
+        // later reset by the API Security post-processor and close must be called again.
+        if (!keepOpenForApiSecurityPostProcessing) {
+            if (wafContext != null) {
+                log.debug(SEND_TELEMETRY, "WAF object had not been closed (probably missed request-end event)");
+            }
+            // Always close, even if the WAF never ran for this request: wafContextClosed must be set so
+            // a late/async caller of getOrCreateWafContext() cannot resurrect a context (APPSEC-69085).
+            closeWafContext();
+            collectedCookies = null;
+            persistentData.clear();
+            // Null the reference, never clear in place (APPSEC-70134): see the field declarations.
+            this.requestHeaders = null;
+            this.responseHeaders = null;
+            this.derivatives.set(null);
+        }
+    }
+
+    /**
+     * @return the portion of the body read so far, if any
+     */
+    public CharSequence getStoredRequestBody() {
+        StoredBodySupplier storedRequestBodySupplier = this.storedRequestBodySupplier;
+        if (storedRequestBodySupplier == null) {
+            return null;
+        }
+        return storedRequestBodySupplier.get();
+    }
+
+    public void reportEvents(Collection<AppSecEvent> appSecEvents) {
+        for (AppSecEvent event : appSecEvents) {
+            StandardizedLogging.attackDetected(log, event);
+        }
+        if (this.appSecEvents == null) {
+            synchronized (this) {
+                if (this.appSecEvents == null) {
+                    this.appSecEvents = new ConcurrentLinkedQueue<>();
                 }
-              }
-              // Check if it's a request data schema
-              else if (config.containsKey("address")) {
-                String address = (String) config.get("address");
-                @SuppressWarnings("unchecked")
-                List<String> keyPath = (List<String>) config.get("key_path");
-                @SuppressWarnings("unchecked")
-                List<String> transformers = (List<String>) config.get("transformers");
+            }
+        }
+        this.appSecEvents.addAll(appSecEvents);
+    }
 
-                Object extractedValue = extractValueFromRequestData(address, keyPath, transformers);
-                if (extractedValue != null) {
-                  // For extracted values, convert to string as they come from request data
-                  updated.put(attributeKey, extractedValue.toString());
-                  log.debug("Added extracted attribute: {} = {}", attributeKey, extractedValue);
+    public void reportStackTrace(StackTraceEvent stackTraceEvent) {
+        if (this.stackTraceEvents == null) {
+            synchronized (this) {
+                if (this.stackTraceEvents == null) {
+                    this.stackTraceEvents = new ConcurrentLinkedQueue<>();
+                }
+            }
+        }
+        if (stackTraceEvents.size() <= Config.get().getAppSecMaxStackTraces()) {
+            this.stackTraceEvents.add(stackTraceEvent);
+        }
+    }
+
+    Collection<AppSecEvent> transferCollectedEvents() {
+        if (this.appSecEvents == null) {
+            return Collections.emptyList();
+        }
+
+        Collection<AppSecEvent> events = new ArrayList<>();
+        AppSecEvent item;
+        while ((item = this.appSecEvents.poll()) != null) {
+            events.add(item);
+        }
+
+        return events;
+    }
+
+    List<StackTraceEvent> getStackTraces() {
+        if (this.stackTraceEvents == null) {
+            return null;
+        }
+        List<StackTraceEvent> stackTraces = new ArrayList<>();
+        StackTraceEvent item;
+        while ((item = this.stackTraceEvents.poll()) != null) {
+            stackTraces.add(item);
+        }
+        return stackTraces;
+    }
+
+    public void reportDerivatives(Map<String, Object> data) {
+        log.debug("Reporting derivatives: {}", data);
+        if (data == null || data.isEmpty()) return;
+
+        // Initialize or update derivatives atomically
+        derivatives.updateAndGet(current -> {
+            Map<String, Object> updated = current != null ? new HashMap<>(current) : new HashMap<>();
+
+            // Process each attribute according to the specification
+            for (Map.Entry<String, Object> entry : data.entrySet()) {
+                String attributeKey = entry.getKey();
+                Object attributeConfig = entry.getValue();
+
+                if (attributeConfig instanceof Map) {
+                    @SuppressWarnings("unchecked")
+                    Map<String, Object> config = (Map<String, Object>) attributeConfig;
+
+                    // Check if it's a literal value schema
+                    if (config.containsKey("value")) {
+                        Object literalValue = config.get("value");
+                        if (literalValue != null) {
+                            // Preserve the original type - don't convert to string
+                            updated.put(attributeKey, literalValue);
+                            log.debug(
+                                    "Added literal attribute: {} = {} (type: {})",
+                                    attributeKey,
+                                    literalValue,
+                                    literalValue.getClass().getSimpleName());
+                        }
+                    }
+                    // Check if it's a request data schema
+                    else if (config.containsKey("address")) {
+                        String address = (String) config.get("address");
+                        @SuppressWarnings("unchecked")
+                        List<String> keyPath = (List<String>) config.get("key_path");
+                        @SuppressWarnings("unchecked")
+                        List<String> transformers = (List<String>) config.get("transformers");
+
+                        Object extractedValue = extractValueFromRequestData(address, keyPath, transformers);
+                        if (extractedValue != null) {
+                            // For extracted values, convert to string as they come from request data
+                            updated.put(attributeKey, extractedValue.toString());
+                            log.debug("Added extracted attribute: {} = {}", attributeKey, extractedValue);
+                        }
+                    }
+                } else {
+                    // Handle plain string/numeric values
+                    updated.put(attributeKey, attributeConfig);
+                    log.debug("Added direct attribute: {} = {}", attributeKey, attributeConfig);
                 }
-              }
-            } else {
-              // Handle plain string/numeric values
-              updated.put(attributeKey, attributeConfig);
-              log.debug("Added direct attribute: {} = {}", attributeKey, attributeConfig);
             }
-          }
 
-          // Unmodifiable: readers may hold this instance indefinitely.
-          return unmodifiableMap(updated);
+            // Unmodifiable: readers may hold this instance indefinitely.
+            return unmodifiableMap(updated);
         });
-  }
-
-  /**
-   * Extracts a value from request data based on address, key path, and transformers.
-   *
-   * @param address The address to extract from (e.g., "server.request.headers")
-   * @param keyPath Optional key path to navigate the data structure
-   * @param transformers Optional list of transformers to apply
-   * @return The extracted value, or null if not found
-   */
-  private Object extractValueFromRequestData(
-      String address, List<String> keyPath, List<String> transformers) {
-    // Get the data from the address
-    Object data = getDataForAddress(address);
-    if (data == null) {
-      log.debug("No data found for address: {}", address);
-      return null;
-    }
-
-    // Navigate through the key path
-    Object currentValue = data;
-    if (keyPath != null && !keyPath.isEmpty()) {
-      currentValue = navigateKeyPath(currentValue, keyPath);
-      if (currentValue == null) {
-        log.debug("Could not navigate key path {} for address {}", keyPath, address);
-        return null;
-      }
-    }
-
-    // Apply transformers if specified
-    if (transformers != null && !transformers.isEmpty()) {
-      currentValue = applyTransformers(currentValue, transformers);
-    }
-
-    return currentValue;
-  }
-
-  /** Gets data for a specific address from the request context. */
-  private Object getDataForAddress(String address) {
-    // Map common addresses to our data structures
-    switch (address) {
-      case "server.request.headers":
-        return getRequestHeaders();
-      case "server.response.headers":
-        return getResponseHeaders();
-      case "server.request.cookies":
-        return collectedCookies;
-      case "server.request.uri.raw":
-        return savedRawURI;
-      case "server.request.method":
-        return method;
-      case "server.request.scheme":
-        return scheme;
-      case "server.request.route":
-        return route;
-      case "server.response.status":
-        return responseStatus;
-      case "server.request.body":
-        return getStoredRequestBody();
-      case "usr.id":
-        return userId;
-      case "usr.login":
-        return userLogin;
-      case "usr.session_id":
-        return sessionId;
-      default:
-        log.debug("Unknown address: {}", address);
-        return null;
-    }
-  }
-
-  /** Navigates through a data structure using a key path. */
-  private Object navigateKeyPath(Object data, List<String> keyPath) {
-    Object current = data;
-
-    for (String key : keyPath) {
-      if (current instanceof Map) {
-        @SuppressWarnings("unchecked")
-        Map<String, Object> map = (Map<String, Object>) current;
-        current = map.get(key);
-      } else if (current instanceof List) {
-        try {
-          int index = Integer.parseInt(key);
-          @SuppressWarnings("unchecked")
-          List<Object> list = (List<Object>) current;
-          if (index >= 0 && index < list.size()) {
-            current = list.get(index);
-          } else {
+    }
+
+    /**
+     * Extracts a value from request data based on address, key path, and transformers.
+     *
+     * @param address The address to extract from (e.g., "server.request.headers")
+     * @param keyPath Optional key path to navigate the data structure
+     * @param transformers Optional list of transformers to apply
+     * @return The extracted value, or null if not found
+     */
+    private Object extractValueFromRequestData(String address, List<String> keyPath, List<String> transformers) {
+        // Get the data from the address
+        Object data = getDataForAddress(address);
+        if (data == null) {
+            log.debug("No data found for address: {}", address);
             return null;
-          }
-        } catch (NumberFormatException e) {
-          log.debug("Invalid list index: {}", key);
-          return null;
         }
-      } else {
-        log.debug("Cannot navigate key {} in data type: {}", key, current.getClass());
-        return null;
-      }
-
-      if (current == null) {
-        return null;
-      }
-    }
-
-    return current;
-  }
-
-  /** Applies transformers to a value. */
-  private Object applyTransformers(Object value, List<String> transformers) {
-    Object current = value;
-
-    for (String transformer : transformers) {
-      switch (transformer) {
-        case "lowercase":
-          if (current instanceof String) {
-            current = ((String) current).toLowerCase(Locale.ROOT);
-          }
-          break;
-        case "uppercase":
-          if (current instanceof String) {
-            current = ((String) current).toUpperCase(Locale.ROOT);
-          }
-          break;
-        case "trim":
-          if (current instanceof String) {
-            current = ((String) current).trim();
-          }
-          break;
-        case "length":
-          if (current instanceof String) {
-            current = ((String) current).length();
-          } else if (current instanceof Collection) {
-            current = ((Collection<?>) current).size();
-          } else if (current instanceof Map) {
-            current = ((Map<?, ?>) current).size();
-          }
-          break;
-        default:
-          log.debug("Unknown transformer: {}", transformer);
-          break;
-      }
-    }
-
-    return current;
-  }
-
-  public boolean commitDerivatives(TraceSegment traceSegment) {
-    if (traceSegment == null) {
-      return false;
-    }
-
-    // Get and clear derivatives atomically
-    Map<String, Object> derivativesToCommit = derivatives.getAndSet(null);
-    log.debug("Committing derivatives: {} for {}", derivativesToCommit, traceSegment);
-
-    // Process and commit derivatives directly
-    if (derivativesToCommit != null && !derivativesToCommit.isEmpty()) {
-      for (Map.Entry<String, Object> entry : derivativesToCommit.entrySet()) {
-        String key = entry.getKey();
-        Object value = entry.getValue();
-
-        // Handle different value types
-        if (value instanceof Number) {
-          traceSegment.setTagTop(key, (Number) value);
-        } else if (value instanceof String) {
-          // Try to parse as numeric, otherwise use as string
-          Number parsedNumber = Numbers.parseNumber((String) value);
-          if (parsedNumber != null) {
-            traceSegment.setTagTop(key, parsedNumber);
-          } else {
-            traceSegment.setTagTop(key, value);
-          }
-        } else if (value instanceof Boolean) {
-          traceSegment.setTagTop(key, value);
-        } else {
-          // Convert other types to string
-          traceSegment.setTagTop(key, value.toString());
+
+        // Navigate through the key path
+        Object currentValue = data;
+        if (keyPath != null && !keyPath.isEmpty()) {
+            currentValue = navigateKeyPath(currentValue, keyPath);
+            if (currentValue == null) {
+                log.debug("Could not navigate key path {} for address {}", keyPath, address);
+                return null;
+            }
         }
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Mainly used for testing and debug logging. The published map is unmodifiable, so its key set is
-   * returned directly as a stable view.
-   */
-  public Set<String> getDerivativeKeys() {
-    Map<String, Object> current = derivatives.get();
-    return current == null ? emptySet() : current.keySet();
-  }
-
-  /**
-   * Whether any currently reported derivative key starts with the given prefix. Must be called
-   * before {@link #commitDerivatives(TraceSegment)}, which detaches the derivatives map.
-   */
-  public boolean hasDerivativeKeyStartingWith(final String prefix) {
-    for (String key : getDerivativeKeys()) {
-      if (key != null && key.startsWith(prefix)) {
+
+        // Apply transformers if specified
+        if (transformers != null && !transformers.isEmpty()) {
+            currentValue = applyTransformers(currentValue, transformers);
+        }
+
+        return currentValue;
+    }
+
+    /** Gets data for a specific address from the request context. */
+    private Object getDataForAddress(String address) {
+        // Map common addresses to our data structures
+        switch (address) {
+            case "server.request.headers":
+                return getRequestHeaders();
+            case "server.response.headers":
+                return getResponseHeaders();
+            case "server.request.cookies":
+                return collectedCookies;
+            case "server.request.uri.raw":
+                return savedRawURI;
+            case "server.request.method":
+                return method;
+            case "server.request.scheme":
+                return scheme;
+            case "server.request.route":
+                return route;
+            case "server.response.status":
+                return responseStatus;
+            case "server.request.body":
+                return getStoredRequestBody();
+            case "usr.id":
+                return userId;
+            case "usr.login":
+                return userLogin;
+            case "usr.session_id":
+                return sessionId;
+            default:
+                log.debug("Unknown address: {}", address);
+                return null;
+        }
+    }
+
+    /** Navigates through a data structure using a key path. */
+    private Object navigateKeyPath(Object data, List<String> keyPath) {
+        Object current = data;
+
+        for (String key : keyPath) {
+            if (current instanceof Map) {
+                @SuppressWarnings("unchecked")
+                Map<String, Object> map = (Map<String, Object>) current;
+                current = map.get(key);
+            } else if (current instanceof List) {
+                try {
+                    int index = Integer.parseInt(key);
+                    @SuppressWarnings("unchecked")
+                    List<Object> list = (List<Object>) current;
+                    if (index >= 0 && index < list.size()) {
+                        current = list.get(index);
+                    } else {
+                        return null;
+                    }
+                } catch (NumberFormatException e) {
+                    log.debug("Invalid list index: {}", key);
+                    return null;
+                }
+            } else {
+                log.debug("Cannot navigate key {} in data type: {}", key, current.getClass());
+                return null;
+            }
+
+            if (current == null) {
+                return null;
+            }
+        }
+
+        return current;
+    }
+
+    /** Applies transformers to a value. */
+    private Object applyTransformers(Object value, List<String> transformers) {
+        Object current = value;
+
+        for (String transformer : transformers) {
+            switch (transformer) {
+                case "lowercase":
+                    if (current instanceof String) {
+                        current = ((String) current).toLowerCase(Locale.ROOT);
+                    }
+                    break;
+                case "uppercase":
+                    if (current instanceof String) {
+                        current = ((String) current).toUpperCase(Locale.ROOT);
+                    }
+                    break;
+                case "trim":
+                    if (current instanceof String) {
+                        current = ((String) current).trim();
+                    }
+                    break;
+                case "length":
+                    if (current instanceof String) {
+                        current = ((String) current).length();
+                    } else if (current instanceof Collection) {
+                        current = ((Collection<?>) current).size();
+                    } else if (current instanceof Map) {
+                        current = ((Map<?, ?>) current).size();
+                    }
+                    break;
+                default:
+                    log.debug("Unknown transformer: {}", transformer);
+                    break;
+            }
+        }
+
+        return current;
+    }
+
+    public boolean commitDerivatives(TraceSegment traceSegment) {
+        if (traceSegment == null) {
+            return false;
+        }
+
+        // Get and clear derivatives atomically
+        Map<String, Object> derivativesToCommit = derivatives.getAndSet(null);
+        log.debug("Committing derivatives: {} for {}", derivativesToCommit, traceSegment);
+
+        // Process and commit derivatives directly
+        if (derivativesToCommit != null && !derivativesToCommit.isEmpty()) {
+            for (Map.Entry<String, Object> entry : derivativesToCommit.entrySet()) {
+                String key = entry.getKey();
+                Object value = entry.getValue();
+
+                // Handle different value types
+                if (value instanceof Number) {
+                    traceSegment.setTagTop(key, (Number) value);
+                } else if (value instanceof String) {
+                    // Try to parse as numeric, otherwise use as string
+                    Number parsedNumber = Numbers.parseNumber((String) value);
+                    if (parsedNumber != null) {
+                        traceSegment.setTagTop(key, parsedNumber);
+                    } else {
+                        traceSegment.setTagTop(key, value);
+                    }
+                } else if (value instanceof Boolean) {
+                    traceSegment.setTagTop(key, value);
+                } else {
+                    // Convert other types to string
+                    traceSegment.setTagTop(key, value.toString());
+                }
+            }
+        }
+
         return true;
-      }
     }
-    return false;
-  }
 
-  public boolean isThrottled(RateLimiter rateLimiter) {
-    if (rateLimiter != null && rateLimited.compareAndSet(false, true)) {
-      throttled = rateLimiter.isThrottled();
+    /**
+     * Mainly used for testing and debug logging. The published map is unmodifiable, so its key set is
+     * returned directly as a stable view.
+     */
+    public Set<String> getDerivativeKeys() {
+        Map<String, Object> current = derivatives.get();
+        return current == null ? emptySet() : current.keySet();
     }
-    return throttled;
-  }
 
-  public boolean isWafContextClosed() {
-    return wafContextClosed;
-  }
+    /**
+     * Whether any currently reported derivative key starts with the given prefix. Must be called
+     * before {@link #commitDerivatives(TraceSegment)}, which detaches the derivatives map.
+     */
+    public boolean hasDerivativeKeyStartingWith(final String prefix) {
+        for (String key : getDerivativeKeys()) {
+            if (key != null && key.startsWith(prefix)) {
+                return true;
+            }
+        }
+        return false;
+    }
 
-  /** Must be called during request end event processing. */
-  void setRequestEndCalled() {
-    requestEndCalled = true;
-  }
+    public boolean isThrottled(RateLimiter rateLimiter) {
+        if (rateLimiter != null && rateLimited.compareAndSet(false, true)) {
+            throttled = rateLimiter.isThrottled();
+        }
+        return throttled;
+    }
 
-  public void setProcessedRequestBody(Object processedRequestBody) {
-    this.processedRequestBody = processedRequestBody;
-  }
+    public boolean isWafContextClosed() {
+        return wafContextClosed;
+    }
 
-  public Object getProcessedRequestBody() {
-    return processedRequestBody;
-  }
+    /** Must be called during request end event processing. */
+    void setRequestEndCalled() {
+        requestEndCalled = true;
+    }
 
-  public boolean isProcessedResponseBodySizeExceeded() {
-    return processedResponseBodySizeExceeded;
-  }
+    public void setProcessedRequestBody(Object processedRequestBody) {
+        this.processedRequestBody = processedRequestBody;
+    }
 
-  public void setProcessedResponseBodySizeExceeded(boolean processedResponseBodySizeExceeded) {
-    this.processedResponseBodySizeExceeded = processedResponseBodySizeExceeded;
-  }
+    public Object getProcessedRequestBody() {
+        return processedRequestBody;
+    }
 
-  public boolean isRaspMatched() {
-    return raspMatched;
-  }
+    public boolean isProcessedResponseBodySizeExceeded() {
+        return processedResponseBodySizeExceeded;
+    }
+
+    public void setProcessedResponseBodySizeExceeded(boolean processedResponseBodySizeExceeded) {
+        this.processedResponseBodySizeExceeded = processedResponseBodySizeExceeded;
+    }
+
+    public boolean isRaspMatched() {
+        return raspMatched;
+    }
 
-  public void setRaspMatched(boolean raspMatched) {
-    this.raspMatched = raspMatched;
-  }
+    public void setRaspMatched(boolean raspMatched) {
+        this.raspMatched = raspMatched;
+    }
 
-  public boolean isManuallyKept() {
-    return manuallyKept;
-  }
+    public boolean isManuallyKept() {
+        return manuallyKept;
+    }
 
-  public void setManuallyKept(boolean manuallyKept) {
-    this.manuallyKept = manuallyKept;
-  }
+    public void setManuallyKept(boolean manuallyKept) {
+        this.manuallyKept = manuallyKept;
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/CookieCutter.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/CookieCutter.java
index 9a7cb8b1ca1..40693f197ab 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/CookieCutter.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/CookieCutter.java
@@ -26,205 +26,205 @@
 
 /* From Jetty's CookieCutter */
 public class CookieCutter {
-  private CookieCutter() {}
+    private CookieCutter() {}
 
-  // should not throw
-  public static Map<String, List<String>> parseCookieHeader(String f) {
-    if (f == null) {
-      return Collections.emptyMap();
-    }
-    f = f.trim();
-    if (f.length() == 0) {
-      return Collections.emptyMap();
-    }
-    Map<String, List<String>> pairs = new HashMap<>(4);
-    parseHeaderValue(pairs, f);
-    return pairs;
-  }
-
-  private static void parseHeaderValue(Map<String, List<String>> cookies, String hdr) {
-    // Parse the header
-    String name = null;
-    String value = null;
-
-    boolean invalue = false;
-    boolean quoted = false;
-    boolean escaped = false;
-    int tokenstart = -1;
-    int tokenend = -1;
-    for (int i = 0, length = hdr.length(), last = length - 1; i < length; i++) {
-      char c = hdr.charAt(i);
-
-      // Handle quoted values for name or value
-      if (quoted) {
-        if (escaped) {
-          escaped = false;
-          continue;
+    // should not throw
+    public static Map<String, List<String>> parseCookieHeader(String f) {
+        if (f == null) {
+            return Collections.emptyMap();
+        }
+        f = f.trim();
+        if (f.length() == 0) {
+            return Collections.emptyMap();
         }
+        Map<String, List<String>> pairs = new HashMap<>(4);
+        parseHeaderValue(pairs, f);
+        return pairs;
+    }
 
-        switch (c) {
-          case '"':
-            tokenend = i;
-            quoted = false;
-
-            // handle quote as last character specially
-            if (i == last) {
-              if (invalue) value = hdr.substring(tokenstart, tokenend + 1);
-              else {
-                name = hdr.substring(tokenstart, tokenend + 1);
-                value = "";
-              }
+    private static void parseHeaderValue(Map<String, List<String>> cookies, String hdr) {
+        // Parse the header
+        String name = null;
+        String value = null;
+
+        boolean invalue = false;
+        boolean quoted = false;
+        boolean escaped = false;
+        int tokenstart = -1;
+        int tokenend = -1;
+        for (int i = 0, length = hdr.length(), last = length - 1; i < length; i++) {
+            char c = hdr.charAt(i);
+
+            // Handle quoted values for name or value
+            if (quoted) {
+                if (escaped) {
+                    escaped = false;
+                    continue;
+                }
+
+                switch (c) {
+                    case '"':
+                        tokenend = i;
+                        quoted = false;
+
+                        // handle quote as last character specially
+                        if (i == last) {
+                            if (invalue) value = hdr.substring(tokenstart, tokenend + 1);
+                            else {
+                                name = hdr.substring(tokenstart, tokenend + 1);
+                                value = "";
+                            }
+                        }
+                        break;
+
+                    case '\\':
+                        escaped = true;
+                        continue;
+                    default:
+                        continue;
+                }
+            } else {
+                // Handle name and value state machines
+                if (invalue) {
+                    // parse the value
+                    switch (c) {
+                        case ' ':
+                        case '\t':
+                            continue;
+
+                        case '"':
+                            if (tokenstart < 0) {
+                                quoted = true;
+                                tokenstart = i;
+                            }
+                            tokenend = i;
+                            if (i == last) {
+                                value = hdr.substring(tokenstart, tokenend + 1);
+                                break;
+                            }
+                            continue;
+
+                        case ';':
+                            if (tokenstart >= 0) value = hdr.substring(tokenstart, tokenend + 1);
+                            else value = "";
+                            tokenstart = -1;
+                            invalue = false;
+                            break;
+
+                        default:
+                            if (tokenstart < 0) tokenstart = i;
+                            tokenend = i;
+                            if (i == last) {
+                                value = hdr.substring(tokenstart, tokenend + 1);
+                                break;
+                            }
+                            continue;
+                    }
+                } else {
+                    // parse the name
+                    switch (c) {
+                        case ' ':
+                        case '\t':
+                            continue;
+
+                        case '"':
+                            if (tokenstart < 0) {
+                                quoted = true;
+                                tokenstart = i;
+                            }
+                            tokenend = i;
+                            if (i == last) {
+                                name = hdr.substring(tokenstart, tokenend + 1);
+                                value = "";
+                                break;
+                            }
+                            continue;
+
+                        case ';':
+                            if (tokenstart >= 0) {
+                                name = hdr.substring(tokenstart, tokenend + 1);
+                                value = "";
+                            }
+                            tokenstart = -1;
+                            break;
+
+                        case '=':
+                            if (tokenstart >= 0) name = hdr.substring(tokenstart, tokenend + 1);
+                            tokenstart = -1;
+                            invalue = true;
+                            continue;
+
+                        default:
+                            if (tokenstart < 0) tokenstart = i;
+                            tokenend = i;
+                            if (i == last) {
+                                name = hdr.substring(tokenstart, tokenend + 1);
+                                value = "";
+                                break;
+                            }
+                            continue;
+                    }
+                }
             }
-            break;
 
-          case '\\':
-            escaped = true;
-            continue;
-          default:
-            continue;
-        }
-      } else {
-        // Handle name and value state machines
-        if (invalue) {
-          // parse the value
-          switch (c) {
-            case ' ':
-            case '\t':
-              continue;
-
-            case '"':
-              if (tokenstart < 0) {
-                quoted = true;
-                tokenstart = i;
-              }
-              tokenend = i;
-              if (i == last) {
-                value = hdr.substring(tokenstart, tokenend + 1);
-                break;
-              }
-              continue;
-
-            case ';':
-              if (tokenstart >= 0) value = hdr.substring(tokenstart, tokenend + 1);
-              else value = "";
-              tokenstart = -1;
-              invalue = false;
-              break;
-
-            default:
-              if (tokenstart < 0) tokenstart = i;
-              tokenend = i;
-              if (i == last) {
-                value = hdr.substring(tokenstart, tokenend + 1);
-                break;
-              }
-              continue;
-          }
-        } else {
-          // parse the name
-          switch (c) {
-            case ' ':
-            case '\t':
-              continue;
-
-            case '"':
-              if (tokenstart < 0) {
-                quoted = true;
-                tokenstart = i;
-              }
-              tokenend = i;
-              if (i == last) {
-                name = hdr.substring(tokenstart, tokenend + 1);
-                value = "";
-                break;
-              }
-              continue;
-
-            case ';':
-              if (tokenstart >= 0) {
-                name = hdr.substring(tokenstart, tokenend + 1);
-                value = "";
-              }
-              tokenstart = -1;
-              break;
-
-            case '=':
-              if (tokenstart >= 0) name = hdr.substring(tokenstart, tokenend + 1);
-              tokenstart = -1;
-              invalue = true;
-              continue;
-
-            default:
-              if (tokenstart < 0) tokenstart = i;
-              tokenend = i;
-              if (i == last) {
-                name = hdr.substring(tokenstart, tokenend + 1);
-                value = "";
-                break;
-              }
-              continue;
-          }
+            // If after processing the current character we have a value and a name, then it is a cookie
+            if (value != null && name != null) {
+                name = unquoteOnly(name);
+                value = unquoteOnly(value);
+
+                if (!name.startsWith("$")) {
+                    Object o = cookies.get(name);
+                    if (o == null) {
+                        cookies.put(name, Collections.singletonList(value));
+                    } else {
+                        if (((List<?>) o).size() == 1) {
+                            List l = new ArrayList<>(2);
+                            l.add(((List<?>) o).get(0));
+                            l.add(value);
+                            cookies.put(name, l);
+                        } else {
+                            ((List<String>) o).add(value);
+                        }
+                    }
+                }
+
+                name = null;
+                value = null;
+            }
         }
-      }
-
-      // If after processing the current character we have a value and a name, then it is a cookie
-      if (value != null && name != null) {
-        name = unquoteOnly(name);
-        value = unquoteOnly(value);
-
-        if (!name.startsWith("$")) {
-          Object o = cookies.get(name);
-          if (o == null) {
-            cookies.put(name, Collections.singletonList(value));
-          } else {
-            if (((List<?>) o).size() == 1) {
-              List l = new ArrayList<>(2);
-              l.add(((List<?>) o).get(0));
-              l.add(value);
-              cookies.put(name, l);
+    }
+
+    /* ------------------------------------------------------------ */
+
+    /**
+     * Unquote a string, NOT converting unicode sequences
+     *
+     * @param s The string to unquote.
+     * @return quoted string
+     */
+    public static String unquoteOnly(String s) {
+        if (s == null) return null;
+        if (s.length() < 2) return s;
+
+        char first = s.charAt(0);
+        char last = s.charAt(s.length() - 1);
+        if (first != last || (first != '"' && first != '\'')) return s;
+
+        StringBuilder b = new StringBuilder(s.length() - 2);
+        boolean escape = false;
+        for (int i = 1; i < s.length() - 1; i++) {
+            char c = s.charAt(i);
+
+            if (escape) {
+                escape = false;
+                b.append(c);
+            } else if (c == '\\') {
+                escape = true;
             } else {
-              ((List<String>) o).add(value);
+                b.append(c);
             }
-          }
         }
 
-        name = null;
-        value = null;
-      }
+        return b.toString();
     }
-  }
-
-  /* ------------------------------------------------------------ */
-
-  /**
-   * Unquote a string, NOT converting unicode sequences
-   *
-   * @param s The string to unquote.
-   * @return quoted string
-   */
-  public static String unquoteOnly(String s) {
-    if (s == null) return null;
-    if (s.length() < 2) return s;
-
-    char first = s.charAt(0);
-    char last = s.charAt(s.length() - 1);
-    if (first != last || (first != '"' && first != '\'')) return s;
-
-    StringBuilder b = new StringBuilder(s.length() - 2);
-    boolean escape = false;
-    for (int i = 1; i < s.length() - 1; i++) {
-      char c = s.charAt(i);
-
-      if (escape) {
-        escape = false;
-        b.append(c);
-      } else if (c == '\\') {
-        escape = true;
-      } else {
-        b.append(c);
-      }
-    }
-
-    return b.toString();
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java
index e5aa16cb6f0..38f2c812a87 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java
@@ -75,1493 +75,1422 @@
 
 /** Bridges the instrumentation gateway and the reactive engine. */
 public class GatewayBridge {
-  private static final Events<AppSecRequestContext> EVENTS = Events.get();
-
-  private static final Logger log = LoggerFactory.getLogger(GatewayBridge.class);
-
-  private static final Pattern QUERY_PARAM_VALUE_SPLITTER = Pattern.compile("=");
-  private static final Pattern QUERY_PARAM_SPLITTER = Pattern.compile("&");
-  private static final Map<String, List<String>> EMPTY_QUERY_PARAMS = Collections.emptyMap();
-
-  /** User tracking tags that will force the collection of request headers */
-  private static final String[] USER_TRACKING_TAGS = {
-    "appsec.events.users.login.success.track",
-    "appsec.events.users.login.failure.track",
-    "appsec.events.users.signup.track"
-  };
-
-  private static final String USER_COLLECTION_MODE_TAG = "_dd.appsec.user.collection_mode";
-
-  private static final Map<LoginEvent, Address<?>> EVENT_MAPPINGS = new EnumMap<>(LoginEvent.class);
-  private static final String METASTRUCT_REQUEST_BODY = "http.request.body";
-
-  static {
-    EVENT_MAPPINGS.put(LoginEvent.LOGIN_SUCCESS, KnownAddresses.LOGIN_SUCCESS);
-    EVENT_MAPPINGS.put(LoginEvent.LOGIN_FAILURE, KnownAddresses.LOGIN_FAILURE);
-    EVENT_MAPPINGS.put(LoginEvent.SIGN_UP, KnownAddresses.SIGN_UP);
-  }
-
-  private static final String METASTRUCT_EXPLOIT = "exploit";
-
-  private final SubscriptionService subscriptionService;
-  private final EventProducerService producerService;
-  private final Supplier<ApiSecuritySampler> requestSamplerSupplier;
-  private final List<TraceSegmentPostProcessor> traceSegmentPostProcessors;
-  private volatile ApiSecurityDownstreamSampler downstreamSampler;
-
-  // subscriber cache
-  private volatile DataSubscriberInfo initialReqDataSubInfo;
-  private volatile DataSubscriberInfo rawRequestBodySubInfo;
-  private volatile DataSubscriberInfo requestBodySubInfo;
-  private volatile DataSubscriberInfo responseBodySubInfo;
-  private volatile DataSubscriberInfo pathParamsSubInfo;
-  private volatile DataSubscriberInfo respDataSubInfo;
-  private volatile DataSubscriberInfo grpcServerMethodSubInfo;
-  private volatile DataSubscriberInfo grpcServerRequestMsgSubInfo;
-  private volatile DataSubscriberInfo graphqlServerRequestMsgSubInfo;
-  private volatile DataSubscriberInfo requestEndSubInfo;
-  private volatile DataSubscriberInfo dbSqlQuerySubInfo;
-  private volatile DataSubscriberInfo httpClientRequestSubInfo;
-  private volatile DataSubscriberInfo httpClientResponseSubInfo;
-  private volatile DataSubscriberInfo ioFileSubInfo;
-  private volatile DataSubscriberInfo ioFileWriteSubInfo;
-  private volatile DataSubscriberInfo sessionIdSubInfo;
-  private volatile DataSubscriberInfo userIdSubInfo;
-  private final ConcurrentHashMap<String, DataSubscriberInfo> loginEventSubInfo =
-      new ConcurrentHashMap<>();
-  private volatile DataSubscriberInfo execCmdSubInfo;
-  private volatile DataSubscriberInfo shellCmdSubInfo;
-  private volatile DataSubscriberInfo requestFilesFilenamesSubInfo;
-  private volatile DataSubscriberInfo requestFilesContentSubInfo;
-
-  // handles for the conditionally registered IG callbacks; a non-null value means the callback is
-  // already registered, which makes the registration idempotent across configuration reloads
-  private volatile Subscription pathParamsSubscription;
-  private volatile Subscription bodyProcessedSubscription;
-  private volatile Subscription filesFilenamesSubscription;
-  private volatile Subscription filesContentSubscription;
-
-  public GatewayBridge(
-      SubscriptionService subscriptionService,
-      EventProducerService producerService,
-      @Nonnull Supplier<ApiSecuritySampler> requestSamplerSupplier,
-      List<TraceSegmentPostProcessor> traceSegmentPostProcessors) {
-    this(
-        subscriptionService,
-        producerService,
-        requestSamplerSupplier,
-        null,
-        traceSegmentPostProcessors);
-  }
-
-  GatewayBridge(
-      SubscriptionService subscriptionService,
-      EventProducerService producerService,
-      @Nonnull Supplier<ApiSecuritySampler> requestSamplerSupplier,
-      ApiSecurityDownstreamSampler downstreamSampler,
-      List<TraceSegmentPostProcessor> traceSegmentPostProcessors) {
-    this.subscriptionService = subscriptionService;
-    this.producerService = producerService;
-    this.requestSamplerSupplier = requestSamplerSupplier;
-    this.downstreamSampler = downstreamSampler;
-    this.traceSegmentPostProcessors = traceSegmentPostProcessors;
-  }
-
-  public void init() {
-    Collection<datadog.trace.api.gateway.EventType<?>> additionalIGEvents =
-        IGAppSecEventDependencies.additionalIGEventTypes(
-            producerService.allSubscribedDataAddresses());
-
-    subscriptionService.registerCallback(EVENTS.requestStarted(), this::onRequestStarted);
-    subscriptionService.registerCallback(EVENTS.requestEnded(), this::onRequestEnded);
-    subscriptionService.registerCallback(EVENTS.requestHeader(), this::onRequestHeader);
-    subscriptionService.registerCallback(EVENTS.requestHeaderDone(), this::onRequestHeadersDone);
-    subscriptionService.registerCallback(EVENTS.requestMethodUriRaw(), this::onRequestMethodUriRaw);
-    subscriptionService.registerCallback(EVENTS.requestBodyStart(), this::onRequestBodyStart);
-    subscriptionService.registerCallback(EVENTS.requestBodyDone(), this::onRequestBodyDone);
-    subscriptionService.registerCallback(EVENTS.responseBody(), this::onResponseBody);
-    subscriptionService.registerCallback(
-        EVENTS.requestClientSocketAddress(), this::onRequestClientSocketAddress);
-    subscriptionService.registerCallback(
-        EVENTS.requestInferredClientAddress(), this::onRequestInferredClientAddress);
-    subscriptionService.registerCallback(EVENTS.responseStarted(), this::onResponseStarted);
-    subscriptionService.registerCallback(EVENTS.responseHeader(), this::onResponseHeader);
-    subscriptionService.registerCallback(EVENTS.responseHeaderDone(), this::onResponseHeaderDone);
-    subscriptionService.registerCallback(EVENTS.grpcServerMethod(), this::onGrpcServerMethod);
-    subscriptionService.registerCallback(
-        EVENTS.grpcServerRequestMessage(), this::onGrpcServerRequestMessage);
-    subscriptionService.registerCallback(
-        EVENTS.graphqlServerRequestMessage(), this::onGraphqlServerRequestMessage);
-    subscriptionService.registerCallback(EVENTS.databaseConnection(), this::onDatabaseConnection);
-    subscriptionService.registerCallback(EVENTS.databaseSqlQuery(), this::onDatabaseSqlQuery);
-    subscriptionService.registerCallback(EVENTS.httpClientSampling(), this::onHttpClientSampling);
-    subscriptionService.registerCallback(EVENTS.httpClientRequest(), this::onHttpClientRequest);
-    subscriptionService.registerCallback(EVENTS.httpClientResponse(), this::onHttpClientResponse);
-    subscriptionService.registerCallback(EVENTS.fileLoaded(), this::onFileLoaded);
-    subscriptionService.registerCallback(EVENTS.fileWritten(), this::onFileWritten);
-    subscriptionService.registerCallback(EVENTS.requestSession(), this::onRequestSession);
-    subscriptionService.registerCallback(EVENTS.execCmd(), this::onExecCmd);
-    subscriptionService.registerCallback(EVENTS.shellCmd(), this::onShellCmd);
-    subscriptionService.registerCallback(EVENTS.user(), this::onUser);
-    subscriptionService.registerCallback(EVENTS.loginEvent(), this::onLoginEvent);
-    subscriptionService.registerCallback(EVENTS.httpRoute(), this::onHttpRoute);
-
-    registerAdditionalIGCallbacksIfNeeded(additionalIGEvents);
-  }
-
-  /**
-   * Computes the additional IG event types required by the given subscribed data addresses.
-   *
-   * <p>This is a pure function: it is safe to call it repeatedly, in particular on every Remote
-   * Config reload, to recompute the set of conditionally registered callbacks.
-   *
-   * @param addresses the currently subscribed data addresses
-   * @return the additional IG event types required by those addresses
-   */
-  public static Collection<datadog.trace.api.gateway.EventType<?>> additionalIGEventTypes(
-      Collection<Address<?>> addresses) {
-    return IGAppSecEventDependencies.additionalIGEventTypes(addresses);
-  }
-
-  /**
-   * Registers the IG callbacks that are only needed when the current configuration subscribes to
-   * the matching addresses.
-   *
-   * <p>Each registration is idempotent, so this method is intended to be called both from {@link
-   * #init()} at startup and from {@code AppSecSystem} on every Remote Config reload, when a new
-   * ruleset may start requiring addresses that were not subscribed at startup.
-   *
-   * @param additionalIGEvents the already computed set of additional IG event types
-   */
-  public void registerAdditionalIGCallbacksIfNeeded(
-      Collection<datadog.trace.api.gateway.EventType<?>> additionalIGEvents) {
-    if (pathParamsSubscription == null && additionalIGEvents.contains(EVENTS.requestPathParams())) {
-      pathParamsSubscription =
-          subscriptionService.registerCallback(
-              EVENTS.requestPathParams(), this::onRequestPathParams);
-    }
-    if (bodyProcessedSubscription == null
-        && additionalIGEvents.contains(EVENTS.requestBodyProcessed())) {
-      bodyProcessedSubscription =
-          subscriptionService.registerCallback(
-              EVENTS.requestBodyProcessed(), this::onRequestBodyProcessed);
-    }
-    if (filesFilenamesSubscription == null
-        && additionalIGEvents.contains(EVENTS.requestFilesFilenames())) {
-      filesFilenamesSubscription =
-          subscriptionService.registerCallback(
-              EVENTS.requestFilesFilenames(), this::onRequestFilesFilenames);
-    }
-    if (filesContentSubscription == null
-        && additionalIGEvents.contains(EVENTS.requestFilesContent())) {
-      filesContentSubscription =
-          subscriptionService.registerCallback(
-              EVENTS.requestFilesContent(), this::onRequestFilesContent);
-    }
-  }
-
-  /**
-   * This method clears all the cached subscriptions, should be used everytime the configuration
-   * changes and new addresses might appear or disappear from the config.
-   */
-  public void reset() {
-    initialReqDataSubInfo = null;
-    rawRequestBodySubInfo = null;
-    requestBodySubInfo = null;
-    responseBodySubInfo = null;
-    pathParamsSubInfo = null;
-    respDataSubInfo = null;
-    grpcServerMethodSubInfo = null;
-    grpcServerRequestMsgSubInfo = null;
-    graphqlServerRequestMsgSubInfo = null;
-    requestEndSubInfo = null;
-    dbSqlQuerySubInfo = null;
-    httpClientRequestSubInfo = null;
-    httpClientResponseSubInfo = null;
-    ioFileSubInfo = null;
-    sessionIdSubInfo = null;
-    userIdSubInfo = null;
-    loginEventSubInfo.clear();
-    execCmdSubInfo = null;
-    shellCmdSubInfo = null;
-    requestFilesFilenamesSubInfo = null;
-    requestFilesContentSubInfo = null;
-  }
-
-  private Flow<Void> onUser(final RequestContext ctx_, final String user) {
-    final AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return NoopFlow.INSTANCE;
-    }
+    private static final Events<AppSecRequestContext> EVENTS = Events.get();
 
-    // update current context with new user id
-    if (!ctx.updateUserId(user)) {
-      return NoopFlow.INSTANCE;
-    }
+    private static final Logger log = LoggerFactory.getLogger(GatewayBridge.class);
 
-    // call waf if we have a new user id
-    while (true) {
-      DataSubscriberInfo subInfo = userIdSubInfo;
-      if (subInfo == null) {
-        subInfo = producerService.getDataSubscribers(KnownAddresses.USER_ID);
-        userIdSubInfo = subInfo;
-      }
-      if (subInfo == null || subInfo.isEmpty()) {
-        return NoopFlow.INSTANCE;
-      }
-      DataBundle bundle =
-          new MapDataBundle.Builder(CAPACITY_0_2).add(KnownAddresses.USER_ID, user).build();
-      try {
-        GatewayContext gwCtx = new GatewayContext(false);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        userIdSubInfo = null;
-      }
-    }
-  }
+    private static final Pattern QUERY_PARAM_VALUE_SPLITTER = Pattern.compile("=");
+    private static final Pattern QUERY_PARAM_SPLITTER = Pattern.compile("&");
+    private static final Map<String, List<String>> EMPTY_QUERY_PARAMS = Collections.emptyMap();
 
-  private void onHttpRoute(final RequestContext ctx_, final String route) {
-    final AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return;
-    }
-    ctx.setRoute(route);
-  }
-
-  private Flow<Void> onLoginEvent(
-      final RequestContext ctx_, final LoginEvent event, final String login) {
-    final AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return NoopFlow.INSTANCE;
-    }
+    /** User tracking tags that will force the collection of request headers */
+    private static final String[] USER_TRACKING_TAGS = {
+        "appsec.events.users.login.success.track",
+        "appsec.events.users.login.failure.track",
+        "appsec.events.users.signup.track"
+    };
 
-    // update current context with new user login
-    if (!ctx.updateUserLogin(login)) {
-      return NoopFlow.INSTANCE;
-    }
+    private static final String USER_COLLECTION_MODE_TAG = "_dd.appsec.user.collection_mode";
 
-    // call waf if we have a new user login
-    final List<Address<?>> addresses = new ArrayList<>(2);
-    final MapDataBundle.Builder bundleBuilder = new MapDataBundle.Builder(CAPACITY_0_2);
-    addresses.add(KnownAddresses.USER_LOGIN);
-    bundleBuilder.add(KnownAddresses.USER_LOGIN, login);
-
-    // parse the event
-    Address<?> address = EVENT_MAPPINGS.get(event);
-    if (address != null) {
-      addresses.add(address);
-      // we don't support null values for the address so we use an invalid placeholder here
-      bundleBuilder.add(address, "invalid");
-    }
-    final DataBundle bundle = bundleBuilder.build();
-    final String subInfoKey =
-        addresses.stream().map(Address::getKey).collect(Collectors.joining("|"));
-    while (true) {
-      DataSubscriberInfo subInfo =
-          loginEventSubInfo.computeIfAbsent(
-              subInfoKey,
-              t -> producerService.getDataSubscribers(addresses.toArray(new Address[0])));
-      if (subInfo == null || subInfo.isEmpty()) {
-        return NoopFlow.INSTANCE;
-      }
-      try {
-        GatewayContext gwCtx = new GatewayContext(false);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        loginEventSubInfo.remove(subInfoKey);
-      }
-    }
-  }
+    private static final Map<LoginEvent, Address<?>> EVENT_MAPPINGS = new EnumMap<>(LoginEvent.class);
+    private static final String METASTRUCT_REQUEST_BODY = "http.request.body";
 
-  private Flow<Void> onRequestSession(final RequestContext ctx_, final String sessionId) {
-    final AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (sessionId == null || ctx == null) {
-      return NoopFlow.INSTANCE;
-    }
-    if (sessionId.equals(ctx.getSessionId())) {
-      return NoopFlow.INSTANCE;
+    static {
+        EVENT_MAPPINGS.put(LoginEvent.LOGIN_SUCCESS, KnownAddresses.LOGIN_SUCCESS);
+        EVENT_MAPPINGS.put(LoginEvent.LOGIN_FAILURE, KnownAddresses.LOGIN_FAILURE);
+        EVENT_MAPPINGS.put(LoginEvent.SIGN_UP, KnownAddresses.SIGN_UP);
+    }
+
+    private static final String METASTRUCT_EXPLOIT = "exploit";
+
+    private final SubscriptionService subscriptionService;
+    private final EventProducerService producerService;
+    private final Supplier<ApiSecuritySampler> requestSamplerSupplier;
+    private final List<TraceSegmentPostProcessor> traceSegmentPostProcessors;
+    private volatile ApiSecurityDownstreamSampler downstreamSampler;
+
+    // subscriber cache
+    private volatile DataSubscriberInfo initialReqDataSubInfo;
+    private volatile DataSubscriberInfo rawRequestBodySubInfo;
+    private volatile DataSubscriberInfo requestBodySubInfo;
+    private volatile DataSubscriberInfo responseBodySubInfo;
+    private volatile DataSubscriberInfo pathParamsSubInfo;
+    private volatile DataSubscriberInfo respDataSubInfo;
+    private volatile DataSubscriberInfo grpcServerMethodSubInfo;
+    private volatile DataSubscriberInfo grpcServerRequestMsgSubInfo;
+    private volatile DataSubscriberInfo graphqlServerRequestMsgSubInfo;
+    private volatile DataSubscriberInfo requestEndSubInfo;
+    private volatile DataSubscriberInfo dbSqlQuerySubInfo;
+    private volatile DataSubscriberInfo httpClientRequestSubInfo;
+    private volatile DataSubscriberInfo httpClientResponseSubInfo;
+    private volatile DataSubscriberInfo ioFileSubInfo;
+    private volatile DataSubscriberInfo ioFileWriteSubInfo;
+    private volatile DataSubscriberInfo sessionIdSubInfo;
+    private volatile DataSubscriberInfo userIdSubInfo;
+    private final ConcurrentHashMap<String, DataSubscriberInfo> loginEventSubInfo = new ConcurrentHashMap<>();
+    private volatile DataSubscriberInfo execCmdSubInfo;
+    private volatile DataSubscriberInfo shellCmdSubInfo;
+    private volatile DataSubscriberInfo requestFilesFilenamesSubInfo;
+    private volatile DataSubscriberInfo requestFilesContentSubInfo;
+
+    // handles for the conditionally registered IG callbacks; a non-null value means the callback is
+    // already registered, which makes the registration idempotent across configuration reloads
+    private volatile Subscription pathParamsSubscription;
+    private volatile Subscription bodyProcessedSubscription;
+    private volatile Subscription filesFilenamesSubscription;
+    private volatile Subscription filesContentSubscription;
+
+    public GatewayBridge(
+            SubscriptionService subscriptionService,
+            EventProducerService producerService,
+            @Nonnull Supplier<ApiSecuritySampler> requestSamplerSupplier,
+            List<TraceSegmentPostProcessor> traceSegmentPostProcessors) {
+        this(subscriptionService, producerService, requestSamplerSupplier, null, traceSegmentPostProcessors);
+    }
+
+    GatewayBridge(
+            SubscriptionService subscriptionService,
+            EventProducerService producerService,
+            @Nonnull Supplier<ApiSecuritySampler> requestSamplerSupplier,
+            ApiSecurityDownstreamSampler downstreamSampler,
+            List<TraceSegmentPostProcessor> traceSegmentPostProcessors) {
+        this.subscriptionService = subscriptionService;
+        this.producerService = producerService;
+        this.requestSamplerSupplier = requestSamplerSupplier;
+        this.downstreamSampler = downstreamSampler;
+        this.traceSegmentPostProcessors = traceSegmentPostProcessors;
+    }
+
+    public void init() {
+        Collection<datadog.trace.api.gateway.EventType<?>> additionalIGEvents =
+                IGAppSecEventDependencies.additionalIGEventTypes(producerService.allSubscribedDataAddresses());
+
+        subscriptionService.registerCallback(EVENTS.requestStarted(), this::onRequestStarted);
+        subscriptionService.registerCallback(EVENTS.requestEnded(), this::onRequestEnded);
+        subscriptionService.registerCallback(EVENTS.requestHeader(), this::onRequestHeader);
+        subscriptionService.registerCallback(EVENTS.requestHeaderDone(), this::onRequestHeadersDone);
+        subscriptionService.registerCallback(EVENTS.requestMethodUriRaw(), this::onRequestMethodUriRaw);
+        subscriptionService.registerCallback(EVENTS.requestBodyStart(), this::onRequestBodyStart);
+        subscriptionService.registerCallback(EVENTS.requestBodyDone(), this::onRequestBodyDone);
+        subscriptionService.registerCallback(EVENTS.responseBody(), this::onResponseBody);
+        subscriptionService.registerCallback(EVENTS.requestClientSocketAddress(), this::onRequestClientSocketAddress);
+        subscriptionService.registerCallback(
+                EVENTS.requestInferredClientAddress(), this::onRequestInferredClientAddress);
+        subscriptionService.registerCallback(EVENTS.responseStarted(), this::onResponseStarted);
+        subscriptionService.registerCallback(EVENTS.responseHeader(), this::onResponseHeader);
+        subscriptionService.registerCallback(EVENTS.responseHeaderDone(), this::onResponseHeaderDone);
+        subscriptionService.registerCallback(EVENTS.grpcServerMethod(), this::onGrpcServerMethod);
+        subscriptionService.registerCallback(EVENTS.grpcServerRequestMessage(), this::onGrpcServerRequestMessage);
+        subscriptionService.registerCallback(EVENTS.graphqlServerRequestMessage(), this::onGraphqlServerRequestMessage);
+        subscriptionService.registerCallback(EVENTS.databaseConnection(), this::onDatabaseConnection);
+        subscriptionService.registerCallback(EVENTS.databaseSqlQuery(), this::onDatabaseSqlQuery);
+        subscriptionService.registerCallback(EVENTS.httpClientSampling(), this::onHttpClientSampling);
+        subscriptionService.registerCallback(EVENTS.httpClientRequest(), this::onHttpClientRequest);
+        subscriptionService.registerCallback(EVENTS.httpClientResponse(), this::onHttpClientResponse);
+        subscriptionService.registerCallback(EVENTS.fileLoaded(), this::onFileLoaded);
+        subscriptionService.registerCallback(EVENTS.fileWritten(), this::onFileWritten);
+        subscriptionService.registerCallback(EVENTS.requestSession(), this::onRequestSession);
+        subscriptionService.registerCallback(EVENTS.execCmd(), this::onExecCmd);
+        subscriptionService.registerCallback(EVENTS.shellCmd(), this::onShellCmd);
+        subscriptionService.registerCallback(EVENTS.user(), this::onUser);
+        subscriptionService.registerCallback(EVENTS.loginEvent(), this::onLoginEvent);
+        subscriptionService.registerCallback(EVENTS.httpRoute(), this::onHttpRoute);
+
+        registerAdditionalIGCallbacksIfNeeded(additionalIGEvents);
+    }
+
+    /**
+     * Computes the additional IG event types required by the given subscribed data addresses.
+     *
+     * <p>This is a pure function: it is safe to call it repeatedly, in particular on every Remote
+     * Config reload, to recompute the set of conditionally registered callbacks.
+     *
+     * @param addresses the currently subscribed data addresses
+     * @return the additional IG event types required by those addresses
+     */
+    public static Collection<datadog.trace.api.gateway.EventType<?>> additionalIGEventTypes(
+            Collection<Address<?>> addresses) {
+        return IGAppSecEventDependencies.additionalIGEventTypes(addresses);
+    }
+
+    /**
+     * Registers the IG callbacks that are only needed when the current configuration subscribes to
+     * the matching addresses.
+     *
+     * <p>Each registration is idempotent, so this method is intended to be called both from {@link
+     * #init()} at startup and from {@code AppSecSystem} on every Remote Config reload, when a new
+     * ruleset may start requiring addresses that were not subscribed at startup.
+     *
+     * @param additionalIGEvents the already computed set of additional IG event types
+     */
+    public void registerAdditionalIGCallbacksIfNeeded(
+            Collection<datadog.trace.api.gateway.EventType<?>> additionalIGEvents) {
+        if (pathParamsSubscription == null && additionalIGEvents.contains(EVENTS.requestPathParams())) {
+            pathParamsSubscription =
+                    subscriptionService.registerCallback(EVENTS.requestPathParams(), this::onRequestPathParams);
+        }
+        if (bodyProcessedSubscription == null && additionalIGEvents.contains(EVENTS.requestBodyProcessed())) {
+            bodyProcessedSubscription =
+                    subscriptionService.registerCallback(EVENTS.requestBodyProcessed(), this::onRequestBodyProcessed);
+        }
+        if (filesFilenamesSubscription == null && additionalIGEvents.contains(EVENTS.requestFilesFilenames())) {
+            filesFilenamesSubscription =
+                    subscriptionService.registerCallback(EVENTS.requestFilesFilenames(), this::onRequestFilesFilenames);
+        }
+        if (filesContentSubscription == null && additionalIGEvents.contains(EVENTS.requestFilesContent())) {
+            filesContentSubscription =
+                    subscriptionService.registerCallback(EVENTS.requestFilesContent(), this::onRequestFilesContent);
+        }
     }
-    // unlikely that multiple threads will update the value at the same time
-    ctx.setSessionId(sessionId);
-    while (true) {
-      DataSubscriberInfo subInfo = sessionIdSubInfo;
-      if (subInfo == null) {
-        subInfo = producerService.getDataSubscribers(KnownAddresses.SESSION_ID);
-        sessionIdSubInfo = subInfo;
-      }
-      if (subInfo == null || subInfo.isEmpty()) {
-        return NoopFlow.INSTANCE;
-      }
-      DataBundle bundle =
-          new MapDataBundle.Builder(CAPACITY_0_2).add(KnownAddresses.SESSION_ID, sessionId).build();
-      try {
-        GatewayContext gwCtx = new GatewayContext(false);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
+
+    /**
+     * This method clears all the cached subscriptions, should be used everytime the configuration
+     * changes and new addresses might appear or disappear from the config.
+     */
+    public void reset() {
+        initialReqDataSubInfo = null;
+        rawRequestBodySubInfo = null;
+        requestBodySubInfo = null;
+        responseBodySubInfo = null;
+        pathParamsSubInfo = null;
+        respDataSubInfo = null;
+        grpcServerMethodSubInfo = null;
+        grpcServerRequestMsgSubInfo = null;
+        graphqlServerRequestMsgSubInfo = null;
+        requestEndSubInfo = null;
+        dbSqlQuerySubInfo = null;
+        httpClientRequestSubInfo = null;
+        httpClientResponseSubInfo = null;
+        ioFileSubInfo = null;
         sessionIdSubInfo = null;
-      }
+        userIdSubInfo = null;
+        loginEventSubInfo.clear();
+        execCmdSubInfo = null;
+        shellCmdSubInfo = null;
+        requestFilesFilenamesSubInfo = null;
+        requestFilesContentSubInfo = null;
     }
-  }
 
-  private Flow<Boolean> onHttpClientSampling(RequestContext ctx_, final long requestId) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return new Flow.ResultFlow<>(false);
-    }
-    return new Flow.ResultFlow<>(downstreamSampler().sampleHttpClientRequest(ctx, requestId));
-  }
+    private Flow<Void> onUser(final RequestContext ctx_, final String user) {
+        final AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return NoopFlow.INSTANCE;
+        }
 
-  private Flow<Void> onHttpClientRequest(RequestContext ctx_, HttpClientRequest request) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return NoopFlow.INSTANCE;
-    }
+        // update current context with new user id
+        if (!ctx.updateUserId(user)) {
+            return NoopFlow.INSTANCE;
+        }
 
-    final MapDataBundle.Builder bundleBuilder =
-        new MapDataBundle.Builder(CAPACITY_3_4)
-            .add(KnownAddresses.IO_NET_URL, request.getUrl())
-            .add(KnownAddresses.IO_NET_REQUEST_METHOD, request.getMethod())
-            .add(KnownAddresses.IO_NET_REQUEST_HEADERS, toLowerCaseHeaders(request.getHeaders()));
-
-    if (downstreamSampler().isSampled(ctx, request.getRequestId())) {
-      final Object body = parseHttpClientBody(ctx, request);
-      if (body != null) {
-        bundleBuilder.add(KnownAddresses.IO_NET_REQUEST_BODY, body);
-      }
-    }
-    final DataBundle bundle = bundleBuilder.build();
-
-    while (true) {
-      DataSubscriberInfo subInfo = httpClientRequestSubInfo;
-      if (subInfo == null) {
-        subInfo =
-            producerService.getDataSubscribers(
-                KnownAddresses.IO_NET_URL,
-                KnownAddresses.IO_NET_REQUEST_METHOD,
-                KnownAddresses.IO_NET_REQUEST_HEADERS,
-                KnownAddresses.IO_NET_REQUEST_BODY);
-        httpClientRequestSubInfo = subInfo;
-      }
-      try {
-        final boolean raspActive = Config.get().isAppSecRaspEnabled();
-        GatewayContext gwCtx = new GatewayContext(true, raspActive ? RuleType.SSRF_REQUEST : null);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        httpClientRequestSubInfo = null;
-      }
+        // call waf if we have a new user id
+        while (true) {
+            DataSubscriberInfo subInfo = userIdSubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(KnownAddresses.USER_ID);
+                userIdSubInfo = subInfo;
+            }
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
+            DataBundle bundle = new MapDataBundle.Builder(CAPACITY_0_2)
+                    .add(KnownAddresses.USER_ID, user)
+                    .build();
+            try {
+                GatewayContext gwCtx = new GatewayContext(false);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                userIdSubInfo = null;
+            }
+        }
     }
-  }
 
-  private Flow<Void> onHttpClientResponse(RequestContext ctx_, HttpClientResponse response) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return NoopFlow.INSTANCE;
+    private void onHttpRoute(final RequestContext ctx_, final String route) {
+        final AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return;
+        }
+        ctx.setRoute(route);
     }
 
-    final MapDataBundle.Builder bundleBuilder =
-        new MapDataBundle.Builder(CAPACITY_3_4)
-            .add(KnownAddresses.IO_NET_RESPONSE_STATUS, Integer.toString(response.getStatus()))
-            .add(KnownAddresses.IO_NET_RESPONSE_HEADERS, toLowerCaseHeaders(response.getHeaders()));
-    // ignore the response if not sampled
-    if (downstreamSampler().isSampled(ctx, response.getRequestId())) {
-      final Object body = parseHttpClientBody(ctx, response);
-      if (body != null) {
-        bundleBuilder.add(KnownAddresses.IO_NET_RESPONSE_BODY, body);
-      }
-    }
+    private Flow<Void> onLoginEvent(final RequestContext ctx_, final LoginEvent event, final String login) {
+        final AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return NoopFlow.INSTANCE;
+        }
 
-    final DataBundle bundle = bundleBuilder.build();
-
-    while (true) {
-      DataSubscriberInfo subInfo = httpClientResponseSubInfo;
-      if (subInfo == null) {
-        subInfo =
-            producerService.getDataSubscribers(
-                KnownAddresses.IO_NET_RESPONSE_STATUS,
-                KnownAddresses.IO_NET_RESPONSE_HEADERS,
-                KnownAddresses.IO_NET_RESPONSE_BODY);
-        httpClientResponseSubInfo = subInfo;
-      }
-      try {
-        final boolean raspActive = Config.get().isAppSecRaspEnabled();
-        GatewayContext gwCtx = new GatewayContext(true, raspActive ? RuleType.SSRF_RESPONSE : null);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        httpClientResponseSubInfo = null;
-      }
-    }
-  }
+        // update current context with new user login
+        if (!ctx.updateUserLogin(login)) {
+            return NoopFlow.INSTANCE;
+        }
 
-  private Map<String, List<String>> toLowerCaseHeaders(final Map<String, List<String>> headers) {
-    if (headers == null || headers.isEmpty()) {
-      return headers;
-    }
-    final Map<String, List<String>> result = new HashMap<>(headers.size());
-    for (final Map.Entry<String, List<String>> entry : headers.entrySet()) {
-      final String key = entry.getKey();
-      final List<String> value = entry.getValue();
-      result.put(key == null ? null : key.toLowerCase(Locale.ROOT), value);
+        // call waf if we have a new user login
+        final List<Address<?>> addresses = new ArrayList<>(2);
+        final MapDataBundle.Builder bundleBuilder = new MapDataBundle.Builder(CAPACITY_0_2);
+        addresses.add(KnownAddresses.USER_LOGIN);
+        bundleBuilder.add(KnownAddresses.USER_LOGIN, login);
+
+        // parse the event
+        Address<?> address = EVENT_MAPPINGS.get(event);
+        if (address != null) {
+            addresses.add(address);
+            // we don't support null values for the address so we use an invalid placeholder here
+            bundleBuilder.add(address, "invalid");
+        }
+        final DataBundle bundle = bundleBuilder.build();
+        final String subInfoKey = addresses.stream().map(Address::getKey).collect(Collectors.joining("|"));
+        while (true) {
+            DataSubscriberInfo subInfo = loginEventSubInfo.computeIfAbsent(
+                    subInfoKey, t -> producerService.getDataSubscribers(addresses.toArray(new Address[0])));
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
+            try {
+                GatewayContext gwCtx = new GatewayContext(false);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                loginEventSubInfo.remove(subInfoKey);
+            }
+        }
     }
-    return result;
-  }
 
-  private Object parseHttpClientBody(
-      final AppSecRequestContext ctx, final HttpClientPayload payload) {
-    if (payload.getContentType() == null || payload.getBody() == null) {
-      return null;
+    private Flow<Void> onRequestSession(final RequestContext ctx_, final String sessionId) {
+        final AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (sessionId == null || ctx == null) {
+            return NoopFlow.INSTANCE;
+        }
+        if (sessionId.equals(ctx.getSessionId())) {
+            return NoopFlow.INSTANCE;
+        }
+        // unlikely that multiple threads will update the value at the same time
+        ctx.setSessionId(sessionId);
+        while (true) {
+            DataSubscriberInfo subInfo = sessionIdSubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(KnownAddresses.SESSION_ID);
+                sessionIdSubInfo = subInfo;
+            }
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
+            DataBundle bundle = new MapDataBundle.Builder(CAPACITY_0_2)
+                    .add(KnownAddresses.SESSION_ID, sessionId)
+                    .build();
+            try {
+                GatewayContext gwCtx = new GatewayContext(false);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                sessionIdSubInfo = null;
+            }
+        }
     }
 
-    final BodyParser parser = BodyParser.forMediaType(payload.getContentType());
-    if (parser == null) {
-      log.debug(SEND_TELEMETRY, "Received non parseable content type {}", payload.getContentType());
-      return null;
-    }
-    final BodyParser.State state = new BodyParser.State();
-    final Object result = parser.parse(state, payload.getBody());
-    if (state.stringTooLong || state.listMapTooLarge || state.objectTooDeep) {
-      ctx.setWafTruncated();
-      WafMetricCollector.get()
-          .wafInputTruncated(state.stringTooLong, state.listMapTooLarge, state.objectTooDeep);
+    private Flow<Boolean> onHttpClientSampling(RequestContext ctx_, final long requestId) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return new Flow.ResultFlow<>(false);
+        }
+        return new Flow.ResultFlow<>(downstreamSampler().sampleHttpClientRequest(ctx, requestId));
     }
-    return result;
-  }
 
-  private Flow<Void> onExecCmd(RequestContext ctx_, String[] command) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return NoopFlow.INSTANCE;
-    }
-    while (true) {
-      DataSubscriberInfo subInfo = execCmdSubInfo;
-      if (subInfo == null) {
-        subInfo = producerService.getDataSubscribers(KnownAddresses.EXEC_CMD);
-        execCmdSubInfo = subInfo;
-      }
-      if (subInfo == null || subInfo.isEmpty()) {
-        return NoopFlow.INSTANCE;
-      }
-      DataBundle bundle =
-          new MapDataBundle.Builder(CAPACITY_0_2).add(KnownAddresses.EXEC_CMD, command).build();
-      try {
-        GatewayContext gwCtx = new GatewayContext(true, RuleType.COMMAND_INJECTION);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        execCmdSubInfo = null;
-      }
-    }
-  }
+    private Flow<Void> onHttpClientRequest(RequestContext ctx_, HttpClientRequest request) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return NoopFlow.INSTANCE;
+        }
+
+        final MapDataBundle.Builder bundleBuilder = new MapDataBundle.Builder(CAPACITY_3_4)
+                .add(KnownAddresses.IO_NET_URL, request.getUrl())
+                .add(KnownAddresses.IO_NET_REQUEST_METHOD, request.getMethod())
+                .add(KnownAddresses.IO_NET_REQUEST_HEADERS, toLowerCaseHeaders(request.getHeaders()));
 
-  private Flow<Void> onShellCmd(RequestContext ctx_, String command) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return NoopFlow.INSTANCE;
+        if (downstreamSampler().isSampled(ctx, request.getRequestId())) {
+            final Object body = parseHttpClientBody(ctx, request);
+            if (body != null) {
+                bundleBuilder.add(KnownAddresses.IO_NET_REQUEST_BODY, body);
+            }
+        }
+        final DataBundle bundle = bundleBuilder.build();
+
+        while (true) {
+            DataSubscriberInfo subInfo = httpClientRequestSubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(
+                        KnownAddresses.IO_NET_URL,
+                        KnownAddresses.IO_NET_REQUEST_METHOD,
+                        KnownAddresses.IO_NET_REQUEST_HEADERS,
+                        KnownAddresses.IO_NET_REQUEST_BODY);
+                httpClientRequestSubInfo = subInfo;
+            }
+            try {
+                final boolean raspActive = Config.get().isAppSecRaspEnabled();
+                GatewayContext gwCtx = new GatewayContext(true, raspActive ? RuleType.SSRF_REQUEST : null);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                httpClientRequestSubInfo = null;
+            }
+        }
     }
-    while (true) {
-      DataSubscriberInfo subInfo = shellCmdSubInfo;
-      if (subInfo == null) {
-        subInfo = producerService.getDataSubscribers(KnownAddresses.SHELL_CMD);
-        shellCmdSubInfo = subInfo;
-      }
-      if (subInfo == null || subInfo.isEmpty()) {
-        return NoopFlow.INSTANCE;
-      }
-      DataBundle bundle =
-          new MapDataBundle.Builder(CAPACITY_0_2).add(KnownAddresses.SHELL_CMD, command).build();
-      try {
-        GatewayContext gwCtx = new GatewayContext(true, RuleType.SHELL_INJECTION);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        shellCmdSubInfo = null;
-      }
+
+    private Flow<Void> onHttpClientResponse(RequestContext ctx_, HttpClientResponse response) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return NoopFlow.INSTANCE;
+        }
+
+        final MapDataBundle.Builder bundleBuilder = new MapDataBundle.Builder(CAPACITY_3_4)
+                .add(KnownAddresses.IO_NET_RESPONSE_STATUS, Integer.toString(response.getStatus()))
+                .add(KnownAddresses.IO_NET_RESPONSE_HEADERS, toLowerCaseHeaders(response.getHeaders()));
+        // ignore the response if not sampled
+        if (downstreamSampler().isSampled(ctx, response.getRequestId())) {
+            final Object body = parseHttpClientBody(ctx, response);
+            if (body != null) {
+                bundleBuilder.add(KnownAddresses.IO_NET_RESPONSE_BODY, body);
+            }
+        }
+
+        final DataBundle bundle = bundleBuilder.build();
+
+        while (true) {
+            DataSubscriberInfo subInfo = httpClientResponseSubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(
+                        KnownAddresses.IO_NET_RESPONSE_STATUS,
+                        KnownAddresses.IO_NET_RESPONSE_HEADERS,
+                        KnownAddresses.IO_NET_RESPONSE_BODY);
+                httpClientResponseSubInfo = subInfo;
+            }
+            try {
+                final boolean raspActive = Config.get().isAppSecRaspEnabled();
+                GatewayContext gwCtx = new GatewayContext(true, raspActive ? RuleType.SSRF_RESPONSE : null);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                httpClientResponseSubInfo = null;
+            }
+        }
     }
-  }
 
-  private Flow<Void> onFileLoaded(RequestContext ctx_, String path) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return NoopFlow.INSTANCE;
+    private Map<String, List<String>> toLowerCaseHeaders(final Map<String, List<String>> headers) {
+        if (headers == null || headers.isEmpty()) {
+            return headers;
+        }
+        final Map<String, List<String>> result = new HashMap<>(headers.size());
+        for (final Map.Entry<String, List<String>> entry : headers.entrySet()) {
+            final String key = entry.getKey();
+            final List<String> value = entry.getValue();
+            result.put(key == null ? null : key.toLowerCase(Locale.ROOT), value);
+        }
+        return result;
     }
-    while (true) {
-      DataSubscriberInfo subInfo = ioFileSubInfo;
-      if (subInfo == null) {
-        subInfo = producerService.getDataSubscribers(KnownAddresses.IO_FS_FILE);
-        ioFileSubInfo = subInfo;
-      }
-      if (subInfo == null || subInfo.isEmpty()) {
-        return NoopFlow.INSTANCE;
-      }
-      DataBundle bundle =
-          new MapDataBundle.Builder(CAPACITY_0_2).add(KnownAddresses.IO_FS_FILE, path).build();
-      try {
-        GatewayContext gwCtx = new GatewayContext(true, RuleType.LFI);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        ioFileSubInfo = null;
-      }
+
+    private Object parseHttpClientBody(final AppSecRequestContext ctx, final HttpClientPayload payload) {
+        if (payload.getContentType() == null || payload.getBody() == null) {
+            return null;
+        }
+
+        final BodyParser parser = BodyParser.forMediaType(payload.getContentType());
+        if (parser == null) {
+            log.debug(SEND_TELEMETRY, "Received non parseable content type {}", payload.getContentType());
+            return null;
+        }
+        final BodyParser.State state = new BodyParser.State();
+        final Object result = parser.parse(state, payload.getBody());
+        if (state.stringTooLong || state.listMapTooLarge || state.objectTooDeep) {
+            ctx.setWafTruncated();
+            WafMetricCollector.get().wafInputTruncated(state.stringTooLong, state.listMapTooLarge, state.objectTooDeep);
+        }
+        return result;
     }
-  }
 
-  private Flow<Void> onFileWritten(RequestContext ctx_, String path) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return NoopFlow.INSTANCE;
+    private Flow<Void> onExecCmd(RequestContext ctx_, String[] command) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return NoopFlow.INSTANCE;
+        }
+        while (true) {
+            DataSubscriberInfo subInfo = execCmdSubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(KnownAddresses.EXEC_CMD);
+                execCmdSubInfo = subInfo;
+            }
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
+            DataBundle bundle = new MapDataBundle.Builder(CAPACITY_0_2)
+                    .add(KnownAddresses.EXEC_CMD, command)
+                    .build();
+            try {
+                GatewayContext gwCtx = new GatewayContext(true, RuleType.COMMAND_INJECTION);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                execCmdSubInfo = null;
+            }
+        }
     }
-    while (true) {
-      DataSubscriberInfo subInfo = ioFileWriteSubInfo;
-      if (subInfo == null) {
-        subInfo =
-            producerService.getDataSubscribers(
-                KnownAddresses.IO_FS_FILE, KnownAddresses.IO_FS_FILE_WRITE);
-        ioFileWriteSubInfo = subInfo;
-      }
-      if (subInfo == null || subInfo.isEmpty()) {
-        return NoopFlow.INSTANCE;
-      }
-      DataBundle bundle =
-          new MapDataBundle.Builder(CAPACITY_0_2)
-              .add(KnownAddresses.IO_FS_FILE, path)
-              .add(KnownAddresses.IO_FS_FILE_WRITE, path)
-              .build();
-      try {
-        GatewayContext gwCtx = new GatewayContext(true, RuleType.LFI);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        ioFileWriteSubInfo = null;
-      }
+
+    private Flow<Void> onShellCmd(RequestContext ctx_, String command) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return NoopFlow.INSTANCE;
+        }
+        while (true) {
+            DataSubscriberInfo subInfo = shellCmdSubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(KnownAddresses.SHELL_CMD);
+                shellCmdSubInfo = subInfo;
+            }
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
+            DataBundle bundle = new MapDataBundle.Builder(CAPACITY_0_2)
+                    .add(KnownAddresses.SHELL_CMD, command)
+                    .build();
+            try {
+                GatewayContext gwCtx = new GatewayContext(true, RuleType.SHELL_INJECTION);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                shellCmdSubInfo = null;
+            }
+        }
     }
-  }
 
-  private Flow<Void> onRequestFilesFilenames(RequestContext ctx_, List<String> filenames) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null || filenames == null || filenames.isEmpty()) {
-      return NoopFlow.INSTANCE;
+    private Flow<Void> onFileLoaded(RequestContext ctx_, String path) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return NoopFlow.INSTANCE;
+        }
+        while (true) {
+            DataSubscriberInfo subInfo = ioFileSubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(KnownAddresses.IO_FS_FILE);
+                ioFileSubInfo = subInfo;
+            }
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
+            DataBundle bundle = new MapDataBundle.Builder(CAPACITY_0_2)
+                    .add(KnownAddresses.IO_FS_FILE, path)
+                    .build();
+            try {
+                GatewayContext gwCtx = new GatewayContext(true, RuleType.LFI);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                ioFileSubInfo = null;
+            }
+        }
     }
-    while (true) {
-      DataSubscriberInfo subInfo = requestFilesFilenamesSubInfo;
-      if (subInfo == null) {
-        subInfo = producerService.getDataSubscribers(KnownAddresses.REQUEST_FILES_FILENAMES);
-        requestFilesFilenamesSubInfo = subInfo;
-      }
-      if (subInfo == null || subInfo.isEmpty()) {
-        return NoopFlow.INSTANCE;
-      }
-      DataBundle bundle =
-          new SingletonDataBundle<>(KnownAddresses.REQUEST_FILES_FILENAMES, filenames);
-      try {
-        GatewayContext gwCtx = new GatewayContext(false);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        requestFilesFilenamesSubInfo = null;
-      }
+
+    private Flow<Void> onFileWritten(RequestContext ctx_, String path) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return NoopFlow.INSTANCE;
+        }
+        while (true) {
+            DataSubscriberInfo subInfo = ioFileWriteSubInfo;
+            if (subInfo == null) {
+                subInfo =
+                        producerService.getDataSubscribers(KnownAddresses.IO_FS_FILE, KnownAddresses.IO_FS_FILE_WRITE);
+                ioFileWriteSubInfo = subInfo;
+            }
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
+            DataBundle bundle = new MapDataBundle.Builder(CAPACITY_0_2)
+                    .add(KnownAddresses.IO_FS_FILE, path)
+                    .add(KnownAddresses.IO_FS_FILE_WRITE, path)
+                    .build();
+            try {
+                GatewayContext gwCtx = new GatewayContext(true, RuleType.LFI);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                ioFileWriteSubInfo = null;
+            }
+        }
     }
-  }
 
-  private Flow<Void> onRequestFilesContent(RequestContext ctx_, List<String> filesContent) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null || filesContent == null || filesContent.isEmpty()) {
-      return NoopFlow.INSTANCE;
+    private Flow<Void> onRequestFilesFilenames(RequestContext ctx_, List<String> filenames) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null || filenames == null || filenames.isEmpty()) {
+            return NoopFlow.INSTANCE;
+        }
+        while (true) {
+            DataSubscriberInfo subInfo = requestFilesFilenamesSubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(KnownAddresses.REQUEST_FILES_FILENAMES);
+                requestFilesFilenamesSubInfo = subInfo;
+            }
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
+            DataBundle bundle = new SingletonDataBundle<>(KnownAddresses.REQUEST_FILES_FILENAMES, filenames);
+            try {
+                GatewayContext gwCtx = new GatewayContext(false);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                requestFilesFilenamesSubInfo = null;
+            }
+        }
     }
-    while (true) {
-      DataSubscriberInfo subInfo = requestFilesContentSubInfo;
-      if (subInfo == null) {
-        subInfo = producerService.getDataSubscribers(KnownAddresses.REQUEST_FILES_CONTENT);
-        requestFilesContentSubInfo = subInfo;
-      }
-      if (subInfo == null || subInfo.isEmpty()) {
-        return NoopFlow.INSTANCE;
-      }
-      DataBundle bundle =
-          new SingletonDataBundle<>(KnownAddresses.REQUEST_FILES_CONTENT, filesContent);
-      try {
-        GatewayContext gwCtx = new GatewayContext(false);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        requestFilesContentSubInfo = null;
-      }
+
+    private Flow<Void> onRequestFilesContent(RequestContext ctx_, List<String> filesContent) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null || filesContent == null || filesContent.isEmpty()) {
+            return NoopFlow.INSTANCE;
+        }
+        while (true) {
+            DataSubscriberInfo subInfo = requestFilesContentSubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(KnownAddresses.REQUEST_FILES_CONTENT);
+                requestFilesContentSubInfo = subInfo;
+            }
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
+            DataBundle bundle = new SingletonDataBundle<>(KnownAddresses.REQUEST_FILES_CONTENT, filesContent);
+            try {
+                GatewayContext gwCtx = new GatewayContext(false);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                requestFilesContentSubInfo = null;
+            }
+        }
     }
-  }
 
-  private Flow<Void> onDatabaseSqlQuery(RequestContext ctx_, String sql) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return NoopFlow.INSTANCE;
+    private Flow<Void> onDatabaseSqlQuery(RequestContext ctx_, String sql) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return NoopFlow.INSTANCE;
+        }
+        while (true) {
+            DataSubscriberInfo subInfo = dbSqlQuerySubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(KnownAddresses.DB_TYPE, KnownAddresses.DB_SQL_QUERY);
+                dbSqlQuerySubInfo = subInfo;
+            }
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
+            DataBundle bundle = new MapDataBundle.Builder(CAPACITY_0_2)
+                    .add(KnownAddresses.DB_TYPE, ctx.getDbType())
+                    .add(KnownAddresses.DB_SQL_QUERY, sql)
+                    .build();
+            try {
+                GatewayContext gwCtx = new GatewayContext(true, RuleType.SQL_INJECTION);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                dbSqlQuerySubInfo = null;
+            }
+        }
     }
-    while (true) {
-      DataSubscriberInfo subInfo = dbSqlQuerySubInfo;
-      if (subInfo == null) {
-        subInfo =
-            producerService.getDataSubscribers(KnownAddresses.DB_TYPE, KnownAddresses.DB_SQL_QUERY);
-        dbSqlQuerySubInfo = subInfo;
-      }
-      if (subInfo == null || subInfo.isEmpty()) {
-        return NoopFlow.INSTANCE;
-      }
-      DataBundle bundle =
-          new MapDataBundle.Builder(CAPACITY_0_2)
-              .add(KnownAddresses.DB_TYPE, ctx.getDbType())
-              .add(KnownAddresses.DB_SQL_QUERY, sql)
-              .build();
-      try {
-        GatewayContext gwCtx = new GatewayContext(true, RuleType.SQL_INJECTION);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        dbSqlQuerySubInfo = null;
-      }
+
+    private void onDatabaseConnection(RequestContext ctx_, String dbType) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return;
+        }
+        ctx.setDbType(dbType);
     }
-  }
 
-  private void onDatabaseConnection(RequestContext ctx_, String dbType) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return;
+    private Flow<Void> onGraphqlServerRequestMessage(RequestContext ctx_, Map<String, ?> data) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return NoopFlow.INSTANCE;
+        }
+        while (true) {
+            DataSubscriberInfo subInfo = graphqlServerRequestMsgSubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(KnownAddresses.GRAPHQL_SERVER_ALL_RESOLVERS);
+                graphqlServerRequestMsgSubInfo = subInfo;
+            }
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
+            DataBundle bundle = new SingletonDataBundle<>(KnownAddresses.GRAPHQL_SERVER_ALL_RESOLVERS, data);
+            try {
+                GatewayContext gwCtx = new GatewayContext(true);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                graphqlServerRequestMsgSubInfo = null;
+            }
+        }
     }
-    ctx.setDbType(dbType);
-  }
 
-  private Flow<Void> onGraphqlServerRequestMessage(RequestContext ctx_, Map<String, ?> data) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return NoopFlow.INSTANCE;
+    private Flow<Void> onGrpcServerRequestMessage(RequestContext ctx_, Object obj) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return NoopFlow.INSTANCE;
+        }
+        while (true) {
+            DataSubscriberInfo subInfo = grpcServerRequestMsgSubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(KnownAddresses.GRPC_SERVER_REQUEST_MESSAGE);
+                grpcServerRequestMsgSubInfo = subInfo;
+            }
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
+            Object convObj = ObjectIntrospection.convert(obj, ctx);
+            DataBundle bundle = new SingletonDataBundle<>(KnownAddresses.GRPC_SERVER_REQUEST_MESSAGE, convObj);
+            try {
+                GatewayContext gwCtx = new GatewayContext(true);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                grpcServerRequestMsgSubInfo = null;
+            }
+        }
     }
-    while (true) {
-      DataSubscriberInfo subInfo = graphqlServerRequestMsgSubInfo;
-      if (subInfo == null) {
-        subInfo = producerService.getDataSubscribers(KnownAddresses.GRAPHQL_SERVER_ALL_RESOLVERS);
-        graphqlServerRequestMsgSubInfo = subInfo;
-      }
-      if (subInfo == null || subInfo.isEmpty()) {
-        return NoopFlow.INSTANCE;
-      }
-      DataBundle bundle =
-          new SingletonDataBundle<>(KnownAddresses.GRAPHQL_SERVER_ALL_RESOLVERS, data);
-      try {
-        GatewayContext gwCtx = new GatewayContext(true);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        graphqlServerRequestMsgSubInfo = null;
-      }
+
+    private Flow<Void> onGrpcServerMethod(RequestContext ctx_, String method) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null || method == null || method.isEmpty()) {
+            return NoopFlow.INSTANCE;
+        }
+        while (true) {
+            DataSubscriberInfo subInfo = grpcServerMethodSubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(KnownAddresses.GRPC_SERVER_METHOD);
+                grpcServerMethodSubInfo = subInfo;
+            }
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
+            DataBundle bundle = new SingletonDataBundle<>(KnownAddresses.GRPC_SERVER_METHOD, method);
+            try {
+                GatewayContext gwCtx = new GatewayContext(true);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                grpcServerMethodSubInfo = null;
+            }
+        }
     }
-  }
 
-  private Flow<Void> onGrpcServerRequestMessage(RequestContext ctx_, Object obj) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return NoopFlow.INSTANCE;
+    private Flow<Void> onResponseHeaderDone(RequestContext ctx_) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null || ctx.isRespDataPublished()) {
+            return NoopFlow.INSTANCE;
+        }
+        ctx.finishResponseHeaders();
+        return maybePublishResponseData(ctx);
     }
-    while (true) {
-      DataSubscriberInfo subInfo = grpcServerRequestMsgSubInfo;
-      if (subInfo == null) {
-        subInfo = producerService.getDataSubscribers(KnownAddresses.GRPC_SERVER_REQUEST_MESSAGE);
-        grpcServerRequestMsgSubInfo = subInfo;
-      }
-      if (subInfo == null || subInfo.isEmpty()) {
-        return NoopFlow.INSTANCE;
-      }
-      Object convObj = ObjectIntrospection.convert(obj, ctx);
-      DataBundle bundle =
-          new SingletonDataBundle<>(KnownAddresses.GRPC_SERVER_REQUEST_MESSAGE, convObj);
-      try {
-        GatewayContext gwCtx = new GatewayContext(true);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        grpcServerRequestMsgSubInfo = null;
-      }
+
+    private void onResponseHeader(RequestContext ctx_, String name, String value) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx != null) {
+            ctx.addResponseHeader(name, value);
+        }
     }
-  }
 
-  private Flow<Void> onGrpcServerMethod(RequestContext ctx_, String method) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null || method == null || method.isEmpty()) {
-      return NoopFlow.INSTANCE;
+    private Flow<Void> onResponseStarted(RequestContext ctx_, Integer status) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null || ctx.isRespDataPublished()) {
+            return NoopFlow.INSTANCE;
+        }
+        ctx.setResponseStatus(status);
+        return maybePublishResponseData(ctx);
     }
-    while (true) {
-      DataSubscriberInfo subInfo = grpcServerMethodSubInfo;
-      if (subInfo == null) {
-        subInfo = producerService.getDataSubscribers(KnownAddresses.GRPC_SERVER_METHOD);
-        grpcServerMethodSubInfo = subInfo;
-      }
-      if (subInfo == null || subInfo.isEmpty()) {
+
+    private NoopFlow onRequestInferredClientAddress(RequestContext ctx_, String ip) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx != null) {
+            ctx.setInferredClientIp(ip);
+        }
         return NoopFlow.INSTANCE;
-      }
-      DataBundle bundle = new SingletonDataBundle<>(KnownAddresses.GRPC_SERVER_METHOD, method);
-      try {
-        GatewayContext gwCtx = new GatewayContext(true);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        grpcServerMethodSubInfo = null;
-      }
     }
-  }
 
-  private Flow<Void> onResponseHeaderDone(RequestContext ctx_) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null || ctx.isRespDataPublished()) {
-      return NoopFlow.INSTANCE;
-    }
-    ctx.finishResponseHeaders();
-    return maybePublishResponseData(ctx);
-  }
-
-  private void onResponseHeader(RequestContext ctx_, String name, String value) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx != null) {
-      ctx.addResponseHeader(name, value);
+    private Flow<Void> onRequestClientSocketAddress(RequestContext ctx_, String ip, Integer port) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null || ctx.isReqDataPublished()) {
+            return NoopFlow.INSTANCE;
+        }
+        ctx.setPeerAddress(ip);
+        ctx.setPeerPort(port);
+        return maybePublishRequestData(ctx);
     }
-  }
 
-  private Flow<Void> onResponseStarted(RequestContext ctx_, Integer status) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null || ctx.isRespDataPublished()) {
-      return NoopFlow.INSTANCE;
-    }
-    ctx.setResponseStatus(status);
-    return maybePublishResponseData(ctx);
-  }
-
-  private NoopFlow onRequestInferredClientAddress(RequestContext ctx_, String ip) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx != null) {
-      ctx.setInferredClientIp(ip);
-    }
-    return NoopFlow.INSTANCE;
-  }
+    private Flow<Void> onRequestBodyProcessed(RequestContext ctx_, Object obj) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return NoopFlow.INSTANCE;
+        }
 
-  private Flow<Void> onRequestClientSocketAddress(RequestContext ctx_, String ip, Integer port) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null || ctx.isReqDataPublished()) {
-      return NoopFlow.INSTANCE;
-    }
-    ctx.setPeerAddress(ip);
-    ctx.setPeerPort(port);
-    return maybePublishRequestData(ctx);
-  }
-
-  private Flow<Void> onRequestBodyProcessed(RequestContext ctx_, Object obj) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return NoopFlow.INSTANCE;
-    }
+        if (ctx.isConvertedReqBodyPublished()) {
+            log.debug("Request body already published; will ignore new value of type {}", obj.getClass());
+            return NoopFlow.INSTANCE;
+        }
+        ctx.setConvertedReqBodyPublished(true);
 
-    if (ctx.isConvertedReqBodyPublished()) {
-      log.debug("Request body already published; will ignore new value of type {}", obj.getClass());
-      return NoopFlow.INSTANCE;
-    }
-    ctx.setConvertedReqBodyPublished(true);
-
-    while (true) {
-      DataSubscriberInfo subInfo = requestBodySubInfo;
-      if (subInfo == null) {
-        subInfo = producerService.getDataSubscribers(KnownAddresses.REQUEST_BODY_OBJECT);
-        requestBodySubInfo = subInfo;
-      }
-      if (subInfo == null || subInfo.isEmpty()) {
-        return NoopFlow.INSTANCE;
-      }
-      Object converted =
-          ObjectIntrospection.convert(
-              obj,
-              ctx,
-              () -> {
+        while (true) {
+            DataSubscriberInfo subInfo = requestBodySubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(KnownAddresses.REQUEST_BODY_OBJECT);
+                requestBodySubInfo = subInfo;
+            }
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
+            Object converted = ObjectIntrospection.convert(obj, ctx, () -> {
                 ctx.setProcessedResponseBodySizeExceeded(true);
-              });
-      ctx.setProcessedRequestBody(converted);
-      DataBundle bundle = new SingletonDataBundle<>(KnownAddresses.REQUEST_BODY_OBJECT, converted);
-      try {
-        GatewayContext gwCtx = new GatewayContext(false);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        requestBodySubInfo = null;
-      }
+            });
+            ctx.setProcessedRequestBody(converted);
+            DataBundle bundle = new SingletonDataBundle<>(KnownAddresses.REQUEST_BODY_OBJECT, converted);
+            try {
+                GatewayContext gwCtx = new GatewayContext(false);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                requestBodySubInfo = null;
+            }
+        }
     }
-  }
 
-  private Flow<Void> onRequestBodyDone(RequestContext ctx_, StoredBodySupplier supplier) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null || ctx.isRawReqBodyPublished()) {
-      return NoopFlow.INSTANCE;
-    }
-    ctx.setRawReqBodyPublished(true);
-
-    while (true) {
-      DataSubscriberInfo subInfo = rawRequestBodySubInfo;
-      if (subInfo == null) {
-        subInfo = producerService.getDataSubscribers(KnownAddresses.REQUEST_BODY_RAW);
-        rawRequestBodySubInfo = subInfo;
-      }
-      if (subInfo == null || subInfo.isEmpty()) {
-        return NoopFlow.INSTANCE;
-      }
+    private Flow<Void> onRequestBodyDone(RequestContext ctx_, StoredBodySupplier supplier) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null || ctx.isRawReqBodyPublished()) {
+            return NoopFlow.INSTANCE;
+        }
+        ctx.setRawReqBodyPublished(true);
 
-      CharSequence bodyContent = supplier.get();
-      if (bodyContent == null || bodyContent.length() == 0) {
-        return NoopFlow.INSTANCE;
-      }
-      DataBundle bundle = new SingletonDataBundle<>(KnownAddresses.REQUEST_BODY_RAW, bodyContent);
-      try {
-        GatewayContext gwCtx = new GatewayContext(false);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        rawRequestBodySubInfo = null;
-      }
-    }
-  }
+        while (true) {
+            DataSubscriberInfo subInfo = rawRequestBodySubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(KnownAddresses.REQUEST_BODY_RAW);
+                rawRequestBodySubInfo = subInfo;
+            }
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
 
-  private Flow<Void> onResponseBody(RequestContext ctx_, Object obj) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return NoopFlow.INSTANCE;
+            CharSequence bodyContent = supplier.get();
+            if (bodyContent == null || bodyContent.length() == 0) {
+                return NoopFlow.INSTANCE;
+            }
+            DataBundle bundle = new SingletonDataBundle<>(KnownAddresses.REQUEST_BODY_RAW, bodyContent);
+            try {
+                GatewayContext gwCtx = new GatewayContext(false);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                rawRequestBodySubInfo = null;
+            }
+        }
     }
 
-    if (ctx.isResponseBodyPublished()) {
-      log.debug(
-          "Response body already published; will ignore new value of type {}", obj.getClass());
-      return NoopFlow.INSTANCE;
-    }
-    ctx.setResponseBodyPublished(true);
-
-    while (true) {
-      DataSubscriberInfo subInfo = responseBodySubInfo;
-      if (subInfo == null) {
-        subInfo = producerService.getDataSubscribers(KnownAddresses.RESPONSE_BODY_OBJECT);
-        responseBodySubInfo = subInfo;
-      }
-      if (subInfo == null || subInfo.isEmpty()) {
-        return NoopFlow.INSTANCE;
-      }
-      Object converted = ObjectIntrospection.convert(obj, ctx);
-      DataBundle bundle = new SingletonDataBundle<>(KnownAddresses.RESPONSE_BODY_OBJECT, converted);
-      try {
-        GatewayContext gwCtx = new GatewayContext(false);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        responseBodySubInfo = null;
-      }
-    }
-  }
+    private Flow<Void> onResponseBody(RequestContext ctx_, Object obj) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return NoopFlow.INSTANCE;
+        }
 
-  private Flow<Void> onRequestPathParams(RequestContext ctx_, Map<String, ?> data) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null || ctx.isPathParamsPublished()) {
-      return NoopFlow.INSTANCE;
-    }
-    ctx.setPathParamsPublished(true);
-
-    while (true) {
-      DataSubscriberInfo subInfo = pathParamsSubInfo;
-      if (subInfo == null) {
-        subInfo = producerService.getDataSubscribers(KnownAddresses.REQUEST_PATH_PARAMS);
-        pathParamsSubInfo = subInfo;
-      }
-      if (subInfo == null || subInfo.isEmpty()) {
-        return NoopFlow.INSTANCE;
-      }
-      DataBundle bundle = new SingletonDataBundle<>(KnownAddresses.REQUEST_PATH_PARAMS, data);
-      try {
-        GatewayContext gwCtx = new GatewayContext(false);
-        return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-      } catch (ExpiredSubscriberInfoException e) {
-        pathParamsSubInfo = null;
-      }
-    }
-  }
+        if (ctx.isResponseBodyPublished()) {
+            log.debug("Response body already published; will ignore new value of type {}", obj.getClass());
+            return NoopFlow.INSTANCE;
+        }
+        ctx.setResponseBodyPublished(true);
 
-  private Void onRequestBodyStart(RequestContext ctx_, StoredBodySupplier supplier) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return null;
+        while (true) {
+            DataSubscriberInfo subInfo = responseBodySubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(KnownAddresses.RESPONSE_BODY_OBJECT);
+                responseBodySubInfo = subInfo;
+            }
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
+            Object converted = ObjectIntrospection.convert(obj, ctx);
+            DataBundle bundle = new SingletonDataBundle<>(KnownAddresses.RESPONSE_BODY_OBJECT, converted);
+            try {
+                GatewayContext gwCtx = new GatewayContext(false);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                responseBodySubInfo = null;
+            }
+        }
     }
 
-    ctx.setStoredRequestBodySupplier(supplier);
-    return null;
-  }
+    private Flow<Void> onRequestPathParams(RequestContext ctx_, Map<String, ?> data) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null || ctx.isPathParamsPublished()) {
+            return NoopFlow.INSTANCE;
+        }
+        ctx.setPathParamsPublished(true);
 
-  private Flow<AppSecRequestContext> onRequestStarted() {
-    if (!AppSecSystem.isActive()) {
-      return RequestContextSupplier.EMPTY;
+        while (true) {
+            DataSubscriberInfo subInfo = pathParamsSubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(KnownAddresses.REQUEST_PATH_PARAMS);
+                pathParamsSubInfo = subInfo;
+            }
+            if (subInfo == null || subInfo.isEmpty()) {
+                return NoopFlow.INSTANCE;
+            }
+            DataBundle bundle = new SingletonDataBundle<>(KnownAddresses.REQUEST_PATH_PARAMS, data);
+            try {
+                GatewayContext gwCtx = new GatewayContext(false);
+                return producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+            } catch (ExpiredSubscriberInfoException e) {
+                pathParamsSubInfo = null;
+            }
+        }
     }
-    return new RequestContextSupplier();
-  }
 
-  private NoopFlow onRequestEnded(RequestContext ctx_, IGSpanInfo spanInfo) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return NoopFlow.INSTANCE;
-    }
-    ctx.setRequestEndCalled();
-
-    AgentSpan span = (AgentSpan) spanInfo;
-    TraceSegment traceSeg = ctx_.getTraceSegment();
-    Map<String, Object> tags = spanInfo.getTags();
-
-    if (maybeSampleForApiSecurity(ctx, spanInfo, tags)) {
-      if (!Config.get().isApmTracingEnabled()) {
-        traceSeg.setTagTop(Tags.ASM_KEEP, true);
-        traceSeg.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
-      }
-    } else {
-      ctx.closeWafContext();
-    }
+    private Void onRequestBodyStart(RequestContext ctx_, StoredBodySupplier supplier) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return null;
+        }
 
-    // AppSec report metric and events for web span only
-    if (traceSeg != null) {
-      // Set AppSec tags on the service-entry span (where detection occurs).
-      // When an inferred proxy span is present, InferredProxySpan.finish() will copy
-      // these tags to the inferred proxy span as required by RFC-1081.
-      span.setMetric("_dd.appsec.enabled", 1);
-      span.setTag("_dd.runtime_family", "jvm");
-
-      Collection<AppSecEvent> collectedEvents = ctx.transferCollectedEvents();
-
-      for (TraceSegmentPostProcessor pp : this.traceSegmentPostProcessors) {
-        pp.processTraceSegment(traceSeg, ctx, collectedEvents);
-      }
-
-      final int clientRequests = ctx.getHttpClientRequestCount();
-      if (clientRequests > 0) {
-        traceSeg.setTagTop("_dd.appsec.downstream_request", clientRequests);
-      }
-
-      // If detected any events - mark span at appsec.event
-      if (!collectedEvents.isEmpty()) {
-        if (ctx.isManuallyKept()) {
-          // Set asm keep in case that root span was not available when events are detected
-          traceSeg.setTagTop(Tags.ASM_KEEP, true);
-          traceSeg.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
-        }
-
-        span.setTag("appsec.event", true);
-
-        // Reflect client_ip as actor.ip for backward compatibility
-        Object clientIp = tags.get(Tags.HTTP_CLIENT_IP);
-        if (clientIp != null) {
-          span.setTag("actor.ip", clientIp.toString());
-        }
-
-        // Report AppSec events on the service-entry span; also stored in meta_struct on the
-        // root span via setDataTop for agent processing
-        AppSecEventWrapper wrapper = new AppSecEventWrapper(collectedEvents);
-        span.setTag("_dd.appsec.json", wrapper);
-        traceSeg.setDataTop("appsec", wrapper);
-
-        // Report collected request and response headers based on allow list
-        boolean collectAll = ctx.isExtendedDataCollection();
-        writeRequestHeaders(
-            ctx, traceSeg, REQUEST_HEADERS_ALLOW_LIST, ctx.getRequestHeaders(), collectAll);
-        writeResponseHeaders(
-            ctx, traceSeg, RESPONSE_HEADERS_ALLOW_LIST, ctx.getResponseHeaders(), collectAll);
-
-        // Report collected stack traces
-        List<StackTraceEvent> stackTraces = ctx.getStackTraces();
-        if (stackTraces != null && !stackTraces.isEmpty()) {
-          StackUtils.addStacktraceEventsToMetaStruct(ctx_, METASTRUCT_EXPLOIT, stackTraces);
-        }
-
-        if (ctx.isExtendedDataCollection() && ctx.getProcessedRequestBody() != null) {
-          ctx_.getOrCreateMetaStructTop(
-              METASTRUCT_REQUEST_BODY, k -> ctx.getProcessedRequestBody());
-          if (ctx.isProcessedResponseBodySizeExceeded()) {
-            traceSeg.setTagTop("_dd.appsec.request_body_size.exceeded", true);
-          }
-        }
-
-      } else if (hasUserInfo(traceSeg)) {
-        // Report all collected request headers on user tracking event
-        writeRequestHeaders(
-            ctx, traceSeg, REQUEST_HEADERS_ALLOW_LIST, ctx.getRequestHeaders(), false);
-        writeResponseHeaders(
-            ctx, traceSeg, RESPONSE_HEADERS_ALLOW_LIST, ctx.getResponseHeaders(), false);
-      } else {
-        // Report minimum set of collected request headers
-        writeRequestHeaders(
-            ctx, traceSeg, DEFAULT_REQUEST_HEADERS_ALLOW_LIST, ctx.getRequestHeaders(), false);
-        writeResponseHeaders(
-            ctx, traceSeg, RESPONSE_HEADERS_ALLOW_LIST, ctx.getResponseHeaders(), false);
-      }
-      // For blocking responses the normal response-header collection is bypassed; write the
-      // content-type and content-length that were determined when the blocking action was raised.
-      String blockingContentType = ctx.getBlockingResponseContentType();
-      if (blockingContentType != null) {
-        traceSeg.setTagTop("http.response.headers.content-type", blockingContentType);
-        Integer blockingContentLength = ctx.getBlockingResponseContentLength();
-        if (blockingContentLength != null) {
-          traceSeg.setTagTop(
-              "http.response.headers.content-length", String.valueOf(blockingContentLength));
-        }
-      }
-
-      // If extracted any derivatives - commit them
-      if (!ctx.commitDerivatives(traceSeg)) {
-        log.debug("Unable to commit, derivatives will be skipped {}", ctx.getDerivativeKeys());
-      }
-
-      WafMetricCollector.get()
-          .wafRequest(
-              !collectedEvents.isEmpty(), // ruleTriggered
-              ctx.isWafBlocked(), // requestBlocked
-              ctx.hasWafErrors(), // wafError
-              ctx.getWafTimeouts() > 0, // wafTimeout,
-              ctx.isWafRequestBlockFailure(), // blockFailure,
-              ctx.isWafRateLimited(), // rateLimited,
-              ctx.isWafTruncated(), // inputTruncated
-              ctx.isWafRequestExcluded() // requestExcluded
-              );
+        ctx.setStoredRequestBodySupplier(supplier);
+        return null;
     }
 
-    ctx.close();
-    return NoopFlow.INSTANCE;
-  }
-
-  private boolean maybeSampleForApiSecurity(
-      AppSecRequestContext ctx, IGSpanInfo spanInfo, Map<String, Object> tags) {
-    log.debug("Checking API Security for end of request handler on span: {}", spanInfo.getSpanId());
-    // API Security sampling requires http.route tag or http.url for endpoint inference.
-    final Object route = tags.get(Tags.HTTP_ROUTE);
-    if (route != null) {
-      ctx.setRoute(route.toString());
-    }
-    // Pass http.url to enable endpoint inference when route is absent
-    final Object url = tags.get(Tags.HTTP_URL);
-    if (url != null) {
-      ctx.setHttpUrl(url.toString());
-    }
-    final Object component = tags.get(Tags.COMPONENT);
-    final String framework = component != null ? component.toString() : null;
-    ApiSecuritySampler requestSampler = requestSamplerSupplier.get();
-    return requestSampler.preSampleRequest(ctx, framework);
-  }
-
-  private Flow<Void> onRequestHeadersDone(RequestContext ctx_) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null || ctx.isReqDataPublished()) {
-      return NoopFlow.INSTANCE;
-    }
-    ctx.finishRequestHeaders();
-    return maybePublishRequestData(ctx);
-  }
-
-  private Flow<Void> onRequestMethodUriRaw(RequestContext ctx_, String method, URIDataAdapter uri) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return NoopFlow.INSTANCE;
+    private Flow<AppSecRequestContext> onRequestStarted() {
+        if (!AppSecSystem.isActive()) {
+            return RequestContextSupplier.EMPTY;
+        }
+        return new RequestContextSupplier();
     }
 
-    if (ctx.isReqDataPublished()) {
-      log.debug(
-          "Request method and URI already published; will ignore new values {}, {}", method, uri);
-      return NoopFlow.INSTANCE;
-    }
-    ctx.setMethod(method);
-    ctx.setScheme(uri.scheme());
-    if (ctx.getSavedRawURI() == null) {
-      if (uri.supportsRaw()) {
-        ctx.setRawURI(uri.raw());
-      } else {
-        try {
-          URI encodedUri = new URI(null, null, uri.path(), uri.query(), null);
-          String q = encodedUri.getRawQuery();
-          StringBuilder encoded = new StringBuilder();
-          encoded.append(encodedUri.getRawPath());
-          if (null != q && !q.isEmpty()) {
-            encoded.append('?').append(q);
-          }
-          ctx.setRawURI(encoded.toString());
-        } catch (URISyntaxException e) {
-          log.debug("Failed to encode URI '{}{}'", uri.path(), uri.query());
-        }
-      }
-    } else {
-      log.debug(
-          SEND_TELEMETRY,
-          "Raw URI already set to '{}'; ignoring new URI callback",
-          ctx.getSavedRawURI());
-    }
-    return maybePublishRequestData(ctx);
-  }
+    private NoopFlow onRequestEnded(RequestContext ctx_, IGSpanInfo spanInfo) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return NoopFlow.INSTANCE;
+        }
+        ctx.setRequestEndCalled();
 
-  private void onRequestHeader(RequestContext ctx_, String name, String value) {
-    AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
-    if (ctx == null) {
-      return;
-    }
+        AgentSpan span = (AgentSpan) spanInfo;
+        TraceSegment traceSeg = ctx_.getTraceSegment();
+        Map<String, Object> tags = spanInfo.getTags();
 
-    if (name.equalsIgnoreCase("cookie")) {
-      Map<String, List<String>> cookies = CookieCutter.parseCookieHeader(value);
-      ctx.addCookies(cookies);
-    } else {
-      ctx.addRequestHeader(name, value);
-    }
-  }
-
-  public void stop() {
-    subscriptionService.reset();
-    pathParamsSubscription = null;
-    bodyProcessedSubscription = null;
-    filesFilenamesSubscription = null;
-    filesContentSubscription = null;
-  }
-
-  private static boolean hasUserInfo(final TraceSegment traceSegment) {
-    return hasUserTrackingEvent(traceSegment) || hasUserCollectionEvent(traceSegment);
-  }
-
-  private static boolean hasUserTrackingEvent(final TraceSegment traceSeg) {
-    for (String tagName : USER_TRACKING_TAGS) {
-      final Object value = traceSeg.getTagTop(tagName);
-      if (value != null && "true".equalsIgnoreCase(value.toString())) {
-        return true;
-      }
+        if (maybeSampleForApiSecurity(ctx, spanInfo, tags)) {
+            if (!Config.get().isApmTracingEnabled()) {
+                traceSeg.setTagTop(Tags.ASM_KEEP, true);
+                traceSeg.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
+            }
+        } else {
+            ctx.closeWafContext();
+        }
+
+        // AppSec report metric and events for web span only
+        if (traceSeg != null) {
+            // Set AppSec tags on the service-entry span (where detection occurs).
+            // When an inferred proxy span is present, InferredProxySpan.finish() will copy
+            // these tags to the inferred proxy span as required by RFC-1081.
+            span.setMetric("_dd.appsec.enabled", 1);
+            span.setTag("_dd.runtime_family", "jvm");
+
+            Collection<AppSecEvent> collectedEvents = ctx.transferCollectedEvents();
+
+            for (TraceSegmentPostProcessor pp : this.traceSegmentPostProcessors) {
+                pp.processTraceSegment(traceSeg, ctx, collectedEvents);
+            }
+
+            final int clientRequests = ctx.getHttpClientRequestCount();
+            if (clientRequests > 0) {
+                traceSeg.setTagTop("_dd.appsec.downstream_request", clientRequests);
+            }
+
+            // If detected any events - mark span at appsec.event
+            if (!collectedEvents.isEmpty()) {
+                if (ctx.isManuallyKept()) {
+                    // Set asm keep in case that root span was not available when events are detected
+                    traceSeg.setTagTop(Tags.ASM_KEEP, true);
+                    traceSeg.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
+                }
+
+                span.setTag("appsec.event", true);
+
+                // Reflect client_ip as actor.ip for backward compatibility
+                Object clientIp = tags.get(Tags.HTTP_CLIENT_IP);
+                if (clientIp != null) {
+                    span.setTag("actor.ip", clientIp.toString());
+                }
+
+                // Report AppSec events on the service-entry span; also stored in meta_struct on the
+                // root span via setDataTop for agent processing
+                AppSecEventWrapper wrapper = new AppSecEventWrapper(collectedEvents);
+                span.setTag("_dd.appsec.json", wrapper);
+                traceSeg.setDataTop("appsec", wrapper);
+
+                // Report collected request and response headers based on allow list
+                boolean collectAll = ctx.isExtendedDataCollection();
+                writeRequestHeaders(ctx, traceSeg, REQUEST_HEADERS_ALLOW_LIST, ctx.getRequestHeaders(), collectAll);
+                writeResponseHeaders(ctx, traceSeg, RESPONSE_HEADERS_ALLOW_LIST, ctx.getResponseHeaders(), collectAll);
+
+                // Report collected stack traces
+                List<StackTraceEvent> stackTraces = ctx.getStackTraces();
+                if (stackTraces != null && !stackTraces.isEmpty()) {
+                    StackUtils.addStacktraceEventsToMetaStruct(ctx_, METASTRUCT_EXPLOIT, stackTraces);
+                }
+
+                if (ctx.isExtendedDataCollection() && ctx.getProcessedRequestBody() != null) {
+                    ctx_.getOrCreateMetaStructTop(METASTRUCT_REQUEST_BODY, k -> ctx.getProcessedRequestBody());
+                    if (ctx.isProcessedResponseBodySizeExceeded()) {
+                        traceSeg.setTagTop("_dd.appsec.request_body_size.exceeded", true);
+                    }
+                }
+
+            } else if (hasUserInfo(traceSeg)) {
+                // Report all collected request headers on user tracking event
+                writeRequestHeaders(ctx, traceSeg, REQUEST_HEADERS_ALLOW_LIST, ctx.getRequestHeaders(), false);
+                writeResponseHeaders(ctx, traceSeg, RESPONSE_HEADERS_ALLOW_LIST, ctx.getResponseHeaders(), false);
+            } else {
+                // Report minimum set of collected request headers
+                writeRequestHeaders(ctx, traceSeg, DEFAULT_REQUEST_HEADERS_ALLOW_LIST, ctx.getRequestHeaders(), false);
+                writeResponseHeaders(ctx, traceSeg, RESPONSE_HEADERS_ALLOW_LIST, ctx.getResponseHeaders(), false);
+            }
+            // For blocking responses the normal response-header collection is bypassed; write the
+            // content-type and content-length that were determined when the blocking action was raised.
+            String blockingContentType = ctx.getBlockingResponseContentType();
+            if (blockingContentType != null) {
+                traceSeg.setTagTop("http.response.headers.content-type", blockingContentType);
+                Integer blockingContentLength = ctx.getBlockingResponseContentLength();
+                if (blockingContentLength != null) {
+                    traceSeg.setTagTop("http.response.headers.content-length", String.valueOf(blockingContentLength));
+                }
+            }
+
+            // If extracted any derivatives - commit them
+            if (!ctx.commitDerivatives(traceSeg)) {
+                log.debug("Unable to commit, derivatives will be skipped {}", ctx.getDerivativeKeys());
+            }
+
+            WafMetricCollector.get()
+                    .wafRequest(
+                            !collectedEvents.isEmpty(), // ruleTriggered
+                            ctx.isWafBlocked(), // requestBlocked
+                            ctx.hasWafErrors(), // wafError
+                            ctx.getWafTimeouts() > 0, // wafTimeout,
+                            ctx.isWafRequestBlockFailure(), // blockFailure,
+                            ctx.isWafRateLimited(), // rateLimited,
+                            ctx.isWafTruncated(), // inputTruncated
+                            ctx.isWafRequestExcluded() // requestExcluded
+                            );
+        }
+
+        ctx.close();
+        return NoopFlow.INSTANCE;
     }
-    return false;
-  }
-
-  private static boolean hasUserCollectionEvent(final TraceSegment traceSeg) {
-    return traceSeg.getTagTop(USER_COLLECTION_MODE_TAG) != null;
-  }
-
-  private static void writeRequestHeaders(
-      AppSecRequestContext ctx,
-      final TraceSegment traceSeg,
-      final Set<String> allowed,
-      final Map<String, List<String>> headers,
-      final boolean collectAll) {
-    writeHeaders(
-        ctx,
-        traceSeg,
-        "http.request.headers.",
-        "_dd.appsec.request.",
-        allowed,
-        headers,
-        collectAll,
-        true);
-  }
-
-  private static void writeResponseHeaders(
-      AppSecRequestContext ctx,
-      final TraceSegment traceSeg,
-      final Set<String> allowed,
-      final Map<String, List<String>> headers,
-      final boolean collectAll) {
-    writeHeaders(
-        ctx,
-        traceSeg,
-        "http.response.headers.",
-        "_dd.appsec.response.",
-        allowed,
-        headers,
-        collectAll,
-        false);
-  }
-
-  private static void writeHeaders(
-      AppSecRequestContext ctx,
-      final TraceSegment traceSeg,
-      final String prefix,
-      final String discardedPrefix,
-      final Set<String> allowed,
-      final Map<String, List<String>> headers,
-      final boolean collectAll,
-      final boolean checkCookie) {
-
-    if (headers == null || headers.isEmpty()) {
-      return;
+
+    private boolean maybeSampleForApiSecurity(AppSecRequestContext ctx, IGSpanInfo spanInfo, Map<String, Object> tags) {
+        log.debug("Checking API Security for end of request handler on span: {}", spanInfo.getSpanId());
+        // API Security sampling requires http.route tag or http.url for endpoint inference.
+        final Object route = tags.get(Tags.HTTP_ROUTE);
+        if (route != null) {
+            ctx.setRoute(route.toString());
+        }
+        // Pass http.url to enable endpoint inference when route is absent
+        final Object url = tags.get(Tags.HTTP_URL);
+        if (url != null) {
+            ctx.setHttpUrl(url.toString());
+        }
+        final Object component = tags.get(Tags.COMPONENT);
+        final String framework = component != null ? component.toString() : null;
+        ApiSecuritySampler requestSampler = requestSamplerSupplier.get();
+        return requestSampler.preSampleRequest(ctx, framework);
     }
 
-    final int headerLimit = ctx.getExtendedDataCollectionMaxHeaders();
-    final Set<String> added = new HashSet<>();
-    int excluded = 0;
-
-    // Try to add allowed headers (prioritized)
-    for (String name : allowed) {
-      if (collectAll && added.size() >= headerLimit) {
-        break;
-      }
-      List<String> values = headers.get(name);
-      if (values != null) {
-        String joined = String.join(",", values);
-        if (!joined.isEmpty()) {
-          traceSeg.setTagTop(prefix + name, joined);
-          added.add(name);
-        }
-      }
+    private Flow<Void> onRequestHeadersDone(RequestContext ctx_) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null || ctx.isReqDataPublished()) {
+            return NoopFlow.INSTANCE;
+        }
+        ctx.finishRequestHeaders();
+        return maybePublishRequestData(ctx);
     }
 
-    if (collectAll) {
-      // Add other headers (non-allowed) until total reaches the limit
-      for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
-        String name = entry.getKey();
-        if (added.contains(name)) {
-          continue;
+    private Flow<Void> onRequestMethodUriRaw(RequestContext ctx_, String method, URIDataAdapter uri) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return NoopFlow.INSTANCE;
         }
 
-        if (added.size() >= headerLimit) {
-          excluded++;
-          continue;
+        if (ctx.isReqDataPublished()) {
+            log.debug("Request method and URI already published; will ignore new values {}, {}", method, uri);
+            return NoopFlow.INSTANCE;
         }
-        String joined;
-        if (AUTHORIZATION_HEADERS.contains(name)) {
-          joined = String.join(",", "<redacted>");
+        ctx.setMethod(method);
+        ctx.setScheme(uri.scheme());
+        if (ctx.getSavedRawURI() == null) {
+            if (uri.supportsRaw()) {
+                ctx.setRawURI(uri.raw());
+            } else {
+                try {
+                    URI encodedUri = new URI(null, null, uri.path(), uri.query(), null);
+                    String q = encodedUri.getRawQuery();
+                    StringBuilder encoded = new StringBuilder();
+                    encoded.append(encodedUri.getRawPath());
+                    if (null != q && !q.isEmpty()) {
+                        encoded.append('?').append(q);
+                    }
+                    ctx.setRawURI(encoded.toString());
+                } catch (URISyntaxException e) {
+                    log.debug("Failed to encode URI '{}{}'", uri.path(), uri.query());
+                }
+            }
         } else {
-          joined = String.join(",", entry.getValue());
-        }
-        if (!joined.isEmpty()) {
-          traceSeg.setTagTop(prefix + name, joined);
-          added.add(name);
+            log.debug(SEND_TELEMETRY, "Raw URI already set to '{}'; ignoring new URI callback", ctx.getSavedRawURI());
         }
-      }
-      if (checkCookie && !ctx.getCookies().isEmpty()) {
-        traceSeg.setTagTop(prefix + "cookie", "<redacted>");
-      }
-
-      if (excluded > 0) {
-        traceSeg.setTagTop(discardedPrefix + "header_collection.discarded", excluded);
-      }
+        return maybePublishRequestData(ctx);
     }
-  }
-
-  private static class RequestContextSupplier implements Flow<AppSecRequestContext> {
-    private static final Flow<AppSecRequestContext> EMPTY = new RequestContextSupplier(null);
 
-    private final AppSecRequestContext appSecRequestContext;
+    private void onRequestHeader(RequestContext ctx_, String name, String value) {
+        AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC);
+        if (ctx == null) {
+            return;
+        }
 
-    public RequestContextSupplier() {
-      this(new AppSecRequestContext());
+        if (name.equalsIgnoreCase("cookie")) {
+            Map<String, List<String>> cookies = CookieCutter.parseCookieHeader(value);
+            ctx.addCookies(cookies);
+        } else {
+            ctx.addRequestHeader(name, value);
+        }
     }
 
-    public RequestContextSupplier(AppSecRequestContext ctx) {
-      appSecRequestContext = ctx;
+    public void stop() {
+        subscriptionService.reset();
+        pathParamsSubscription = null;
+        bodyProcessedSubscription = null;
+        filesFilenamesSubscription = null;
+        filesContentSubscription = null;
     }
 
-    @Override
-    public Action getAction() {
-      return Action.Noop.INSTANCE;
+    private static boolean hasUserInfo(final TraceSegment traceSegment) {
+        return hasUserTrackingEvent(traceSegment) || hasUserCollectionEvent(traceSegment);
     }
 
-    @Override
-    public AppSecRequestContext getResult() {
-      return appSecRequestContext;
+    private static boolean hasUserTrackingEvent(final TraceSegment traceSeg) {
+        for (String tagName : USER_TRACKING_TAGS) {
+            final Object value = traceSeg.getTagTop(tagName);
+            if (value != null && "true".equalsIgnoreCase(value.toString())) {
+                return true;
+            }
+        }
+        return false;
     }
-  }
 
-  private Flow<Void> maybePublishRequestData(AppSecRequestContext ctx) {
-    String savedRawURI = ctx.getSavedRawURI();
-    if (savedRawURI == null || !ctx.isFinishedRequestHeaders() || ctx.getPeerAddress() == null) {
-      return NoopFlow.INSTANCE;
+    private static boolean hasUserCollectionEvent(final TraceSegment traceSeg) {
+        return traceSeg.getTagTop(USER_COLLECTION_MODE_TAG) != null;
     }
 
-    Map<String, List<String>> queryParams = EMPTY_QUERY_PARAMS;
-    int i = savedRawURI.indexOf('?');
-    if (i != -1) {
-      String qs = savedRawURI.substring(i + 1);
-      // ideally we'd have the query string as parsed by the server
-      // or at the very least the encoding used by the server
-      queryParams = parseQueryStringParams(qs, StandardCharsets.UTF_8);
+    private static void writeRequestHeaders(
+            AppSecRequestContext ctx,
+            final TraceSegment traceSeg,
+            final Set<String> allowed,
+            final Map<String, List<String>> headers,
+            final boolean collectAll) {
+        writeHeaders(ctx, traceSeg, "http.request.headers.", "_dd.appsec.request.", allowed, headers, collectAll, true);
     }
 
-    String scheme = ctx.getScheme();
-    if (scheme == null) {
-      scheme = "http";
+    private static void writeResponseHeaders(
+            AppSecRequestContext ctx,
+            final TraceSegment traceSeg,
+            final Set<String> allowed,
+            final Map<String, List<String>> headers,
+            final boolean collectAll) {
+        writeHeaders(
+                ctx, traceSeg, "http.response.headers.", "_dd.appsec.response.", allowed, headers, collectAll, false);
     }
 
-    ctx.setReqDataPublished(true);
-
-    MapDataBundle bundle =
-        new MapDataBundle.Builder(CAPACITY_6_10)
-            .add(KnownAddresses.HEADERS_NO_COOKIES, ctx.getRequestHeaders())
-            .add(KnownAddresses.REQUEST_COOKIES, ctx.getCookies())
-            .add(KnownAddresses.REQUEST_SCHEME, scheme)
-            .add(KnownAddresses.REQUEST_METHOD, ctx.getMethod())
-            .add(KnownAddresses.REQUEST_URI_RAW, savedRawURI)
-            .add(KnownAddresses.REQUEST_QUERY, queryParams)
-            .add(KnownAddresses.REQUEST_CLIENT_IP, ctx.getPeerAddress())
-            .add(KnownAddresses.REQUEST_CLIENT_PORT, ctx.getPeerPort())
-            .add(KnownAddresses.REQUEST_INFERRED_CLIENT_IP, ctx.getInferredClientIp())
-            .build();
-
-    while (true) {
-      DataSubscriberInfo subInfo = this.initialReqDataSubInfo;
-      if (subInfo == null) {
-        subInfo =
-            producerService.getDataSubscribers(
-                KnownAddresses.HEADERS_NO_COOKIES,
-                KnownAddresses.REQUEST_COOKIES,
-                KnownAddresses.REQUEST_SCHEME,
-                KnownAddresses.REQUEST_METHOD,
-                KnownAddresses.REQUEST_URI_RAW,
-                KnownAddresses.REQUEST_QUERY,
-                KnownAddresses.REQUEST_CLIENT_IP,
-                KnownAddresses.REQUEST_CLIENT_PORT,
-                KnownAddresses.REQUEST_INFERRED_CLIENT_IP);
-        initialReqDataSubInfo = subInfo;
-      }
-
-      try {
-        GatewayContext gwCtx = new GatewayContext(false);
-        Flow<Void> flow = producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-        maybeRecordBlockingContentType(ctx, flow);
-        return flow;
-      } catch (ExpiredSubscriberInfoException e) {
-        this.initialReqDataSubInfo = null;
-      }
-    }
-  }
+    private static void writeHeaders(
+            AppSecRequestContext ctx,
+            final TraceSegment traceSeg,
+            final String prefix,
+            final String discardedPrefix,
+            final Set<String> allowed,
+            final Map<String, List<String>> headers,
+            final boolean collectAll,
+            final boolean checkCookie) {
 
-  private Flow<Void> maybePublishResponseData(AppSecRequestContext ctx) {
+        if (headers == null || headers.isEmpty()) {
+            return;
+        }
 
-    int status = ctx.getResponseStatus();
+        final int headerLimit = ctx.getExtendedDataCollectionMaxHeaders();
+        final Set<String> added = new HashSet<>();
+        int excluded = 0;
 
-    if (status == 0 || !ctx.isFinishedResponseHeaders()) {
-      return NoopFlow.INSTANCE;
-    }
+        // Try to add allowed headers (prioritized)
+        for (String name : allowed) {
+            if (collectAll && added.size() >= headerLimit) {
+                break;
+            }
+            List<String> values = headers.get(name);
+            if (values != null) {
+                String joined = String.join(",", values);
+                if (!joined.isEmpty()) {
+                    traceSeg.setTagTop(prefix + name, joined);
+                    added.add(name);
+                }
+            }
+        }
 
-    ctx.setRespDataPublished(true);
-
-    MapDataBundle bundle =
-        MapDataBundle.of(
-            KnownAddresses.RESPONSE_STATUS, String.valueOf(ctx.getResponseStatus()),
-            KnownAddresses.RESPONSE_HEADERS_NO_COOKIES, ctx.getResponseHeaders());
-
-    while (true) {
-      DataSubscriberInfo subInfo = respDataSubInfo;
-      if (subInfo == null) {
-        subInfo =
-            producerService.getDataSubscribers(
-                KnownAddresses.RESPONSE_STATUS, KnownAddresses.RESPONSE_HEADERS_NO_COOKIES);
-        respDataSubInfo = subInfo;
-      }
-
-      try {
-        GatewayContext gwCtx = new GatewayContext(false);
-        Flow<Void> flow = producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
-        maybeRecordBlockingContentType(ctx, flow);
-        return flow;
-      } catch (ExpiredSubscriberInfoException e) {
-        respDataSubInfo = null;
-      }
-    }
-  }
+        if (collectAll) {
+            // Add other headers (non-allowed) until total reaches the limit
+            for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+                String name = entry.getKey();
+                if (added.contains(name)) {
+                    continue;
+                }
+
+                if (added.size() >= headerLimit) {
+                    excluded++;
+                    continue;
+                }
+                String joined;
+                if (AUTHORIZATION_HEADERS.contains(name)) {
+                    joined = String.join(",", "<redacted>");
+                } else {
+                    joined = String.join(",", entry.getValue());
+                }
+                if (!joined.isEmpty()) {
+                    traceSeg.setTagTop(prefix + name, joined);
+                    added.add(name);
+                }
+            }
+            if (checkCookie && !ctx.getCookies().isEmpty()) {
+                traceSeg.setTagTop(prefix + "cookie", "<redacted>");
+            }
 
-  private ApiSecurityDownstreamSampler downstreamSampler() {
-    if (downstreamSampler == null) {
-      downstreamSampler = new ApiSecurityDownstreamSamplerImpl();
+            if (excluded > 0) {
+                traceSeg.setTagTop(discardedPrefix + "header_collection.discarded", excluded);
+            }
+        }
     }
-    return downstreamSampler;
-  }
 
-  private static void maybeRecordBlockingContentType(AppSecRequestContext ctx, Flow<?> flow) {
-    Flow.Action action = flow.getAction();
-    if (!(action instanceof Flow.Action.RequestBlockingAction)) {
-      return;
-    }
-    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-    BlockingContentType bct = rba.getBlockingContentType();
-    if (bct == BlockingContentType.NONE) {
-      return; // redirect — no response body
-    }
-    List<String> acceptValues = ctx.getRequestHeaders().get("accept");
-    String acceptHeader =
-        (acceptValues == null || acceptValues.isEmpty()) ? null : acceptValues.get(0);
-    BlockingActionHelper.TemplateType tt =
-        BlockingActionHelper.determineTemplateType(bct, acceptHeader);
-    byte[] template = BlockingActionHelper.getTemplate(tt, rba.getSecurityResponseId());
-    ctx.setBlockingResponseContentType(BlockingActionHelper.getContentType(tt));
-    ctx.setBlockingResponseContentLength(template.length);
-  }
-
-  private static Map<String, List<String>> parseQueryStringParams(
-      String queryString, Charset uriEncoding) {
-    if (queryString == null) {
-      return Collections.emptyMap();
-    }
+    private static class RequestContextSupplier implements Flow<AppSecRequestContext> {
+        private static final Flow<AppSecRequestContext> EMPTY = new RequestContextSupplier(null);
+
+        private final AppSecRequestContext appSecRequestContext;
+
+        public RequestContextSupplier() {
+            this(new AppSecRequestContext());
+        }
 
-    Map<String, List<String>> result = new HashMap<>();
+        public RequestContextSupplier(AppSecRequestContext ctx) {
+            appSecRequestContext = ctx;
+        }
 
-    String[] keyValues = QUERY_PARAM_SPLITTER.split(queryString);
+        @Override
+        public Action getAction() {
+            return Action.Noop.INSTANCE;
+        }
 
-    for (String keyValue : keyValues) {
-      String[] kv = QUERY_PARAM_VALUE_SPLITTER.split(keyValue, 2);
-      String value = kv.length > 1 ? urlDecode(kv[1], uriEncoding, true) : "";
-      String key = urlDecode(kv[0], uriEncoding, true);
-      List<String> strings = result.computeIfAbsent(key, k -> new ArrayList<>(1));
-      strings.add(value);
+        @Override
+        public AppSecRequestContext getResult() {
+            return appSecRequestContext;
+        }
     }
 
-    return result;
-  }
-
-  private static String urlDecode(String str, Charset charset, boolean queryString) {
-    return decodeString(str, charset, queryString, Integer.MAX_VALUE);
-  }
-
-  private static String decodeString(String str, Charset charset, boolean queryString, int limit) {
-    byte[] bytes = str.getBytes(charset);
-    int j = 0;
-    for (int i = 0; i < bytes.length && j < limit; i++, j++) {
-      int b = bytes[i];
-      if (b == 0x25 /* % */) {
-        if (i + 2 < bytes.length) {
-          int val = byteToDigit(bytes[i + 2]);
-          if (val >= 0) {
-            val += 16 * byteToDigit(bytes[i + 1]);
-            if (val >= 0) {
-              i += 2;
-              bytes[j] = (byte) val;
-              continue;
-            }
-          }
-        }
-      } else if (b == 0x2b /* + */ && queryString) {
-        bytes[j] = ' ';
-        continue;
-      }
-      bytes[j] = (byte) b;
+    private Flow<Void> maybePublishRequestData(AppSecRequestContext ctx) {
+        String savedRawURI = ctx.getSavedRawURI();
+        if (savedRawURI == null || !ctx.isFinishedRequestHeaders() || ctx.getPeerAddress() == null) {
+            return NoopFlow.INSTANCE;
+        }
+
+        Map<String, List<String>> queryParams = EMPTY_QUERY_PARAMS;
+        int i = savedRawURI.indexOf('?');
+        if (i != -1) {
+            String qs = savedRawURI.substring(i + 1);
+            // ideally we'd have the query string as parsed by the server
+            // or at the very least the encoding used by the server
+            queryParams = parseQueryStringParams(qs, StandardCharsets.UTF_8);
+        }
+
+        String scheme = ctx.getScheme();
+        if (scheme == null) {
+            scheme = "http";
+        }
+
+        ctx.setReqDataPublished(true);
+
+        MapDataBundle bundle = new MapDataBundle.Builder(CAPACITY_6_10)
+                .add(KnownAddresses.HEADERS_NO_COOKIES, ctx.getRequestHeaders())
+                .add(KnownAddresses.REQUEST_COOKIES, ctx.getCookies())
+                .add(KnownAddresses.REQUEST_SCHEME, scheme)
+                .add(KnownAddresses.REQUEST_METHOD, ctx.getMethod())
+                .add(KnownAddresses.REQUEST_URI_RAW, savedRawURI)
+                .add(KnownAddresses.REQUEST_QUERY, queryParams)
+                .add(KnownAddresses.REQUEST_CLIENT_IP, ctx.getPeerAddress())
+                .add(KnownAddresses.REQUEST_CLIENT_PORT, ctx.getPeerPort())
+                .add(KnownAddresses.REQUEST_INFERRED_CLIENT_IP, ctx.getInferredClientIp())
+                .build();
+
+        while (true) {
+            DataSubscriberInfo subInfo = this.initialReqDataSubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(
+                        KnownAddresses.HEADERS_NO_COOKIES,
+                        KnownAddresses.REQUEST_COOKIES,
+                        KnownAddresses.REQUEST_SCHEME,
+                        KnownAddresses.REQUEST_METHOD,
+                        KnownAddresses.REQUEST_URI_RAW,
+                        KnownAddresses.REQUEST_QUERY,
+                        KnownAddresses.REQUEST_CLIENT_IP,
+                        KnownAddresses.REQUEST_CLIENT_PORT,
+                        KnownAddresses.REQUEST_INFERRED_CLIENT_IP);
+                initialReqDataSubInfo = subInfo;
+            }
+
+            try {
+                GatewayContext gwCtx = new GatewayContext(false);
+                Flow<Void> flow = producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+                maybeRecordBlockingContentType(ctx, flow);
+                return flow;
+            } catch (ExpiredSubscriberInfoException e) {
+                this.initialReqDataSubInfo = null;
+            }
+        }
     }
 
-    return new String(bytes, 0, j, charset);
-  }
+    private Flow<Void> maybePublishResponseData(AppSecRequestContext ctx) {
+
+        int status = ctx.getResponseStatus();
+
+        if (status == 0 || !ctx.isFinishedResponseHeaders()) {
+            return NoopFlow.INSTANCE;
+        }
+
+        ctx.setRespDataPublished(true);
+
+        MapDataBundle bundle = MapDataBundle.of(
+                KnownAddresses.RESPONSE_STATUS, String.valueOf(ctx.getResponseStatus()),
+                KnownAddresses.RESPONSE_HEADERS_NO_COOKIES, ctx.getResponseHeaders());
+
+        while (true) {
+            DataSubscriberInfo subInfo = respDataSubInfo;
+            if (subInfo == null) {
+                subInfo = producerService.getDataSubscribers(
+                        KnownAddresses.RESPONSE_STATUS, KnownAddresses.RESPONSE_HEADERS_NO_COOKIES);
+                respDataSubInfo = subInfo;
+            }
 
-  private static int byteToDigit(byte b) {
-    if (b >= 0x30 /* 0 */ && b <= 0x39 /* 9 */) {
-      return b - 0x30;
+            try {
+                GatewayContext gwCtx = new GatewayContext(false);
+                Flow<Void> flow = producerService.publishDataEvent(subInfo, ctx, bundle, gwCtx);
+                maybeRecordBlockingContentType(ctx, flow);
+                return flow;
+            } catch (ExpiredSubscriberInfoException e) {
+                respDataSubInfo = null;
+            }
+        }
     }
-    if (b >= 0x41 /* A */ && b <= 0x46 /* F */) {
-      return 10 + (b - 0x41);
+
+    private ApiSecurityDownstreamSampler downstreamSampler() {
+        if (downstreamSampler == null) {
+            downstreamSampler = new ApiSecurityDownstreamSamplerImpl();
+        }
+        return downstreamSampler;
     }
-    if (b >= 0x61 /* a */ && b <= 0x66 /* f */) {
-      return 10 + (b - 0x61);
+
+    private static void maybeRecordBlockingContentType(AppSecRequestContext ctx, Flow<?> flow) {
+        Flow.Action action = flow.getAction();
+        if (!(action instanceof Flow.Action.RequestBlockingAction)) {
+            return;
+        }
+        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+        BlockingContentType bct = rba.getBlockingContentType();
+        if (bct == BlockingContentType.NONE) {
+            return; // redirect — no response body
+        }
+        List<String> acceptValues = ctx.getRequestHeaders().get("accept");
+        String acceptHeader = (acceptValues == null || acceptValues.isEmpty()) ? null : acceptValues.get(0);
+        BlockingActionHelper.TemplateType tt = BlockingActionHelper.determineTemplateType(bct, acceptHeader);
+        byte[] template = BlockingActionHelper.getTemplate(tt, rba.getSecurityResponseId());
+        ctx.setBlockingResponseContentType(BlockingActionHelper.getContentType(tt));
+        ctx.setBlockingResponseContentLength(template.length);
     }
-    return -1;
-  }
 
-  private static class IGAppSecEventDependencies {
+    private static Map<String, List<String>> parseQueryStringParams(String queryString, Charset uriEncoding) {
+        if (queryString == null) {
+            return Collections.emptyMap();
+        }
 
-    private static final Map<Address<?>, Collection<datadog.trace.api.gateway.EventType<?>>>
-        DATA_DEPENDENCIES = new HashMap<>(4);
+        Map<String, List<String>> result = new HashMap<>();
 
-    static {
-      DATA_DEPENDENCIES.put(
-          KnownAddresses.REQUEST_BODY_RAW, l(EVENTS.requestBodyStart(), EVENTS.requestBodyDone()));
-      DATA_DEPENDENCIES.put(KnownAddresses.REQUEST_PATH_PARAMS, l(EVENTS.requestPathParams()));
-      DATA_DEPENDENCIES.put(KnownAddresses.REQUEST_BODY_OBJECT, l(EVENTS.requestBodyProcessed()));
-      DATA_DEPENDENCIES.put(
-          KnownAddresses.REQUEST_FILES_FILENAMES, l(EVENTS.requestFilesFilenames()));
-      DATA_DEPENDENCIES.put(KnownAddresses.REQUEST_FILES_CONTENT, l(EVENTS.requestFilesContent()));
+        String[] keyValues = QUERY_PARAM_SPLITTER.split(queryString);
+
+        for (String keyValue : keyValues) {
+            String[] kv = QUERY_PARAM_VALUE_SPLITTER.split(keyValue, 2);
+            String value = kv.length > 1 ? urlDecode(kv[1], uriEncoding, true) : "";
+            String key = urlDecode(kv[0], uriEncoding, true);
+            List<String> strings = result.computeIfAbsent(key, k -> new ArrayList<>(1));
+            strings.add(value);
+        }
+
+        return result;
+    }
+
+    private static String urlDecode(String str, Charset charset, boolean queryString) {
+        return decodeString(str, charset, queryString, Integer.MAX_VALUE);
+    }
+
+    private static String decodeString(String str, Charset charset, boolean queryString, int limit) {
+        byte[] bytes = str.getBytes(charset);
+        int j = 0;
+        for (int i = 0; i < bytes.length && j < limit; i++, j++) {
+            int b = bytes[i];
+            if (b == 0x25 /* % */) {
+                if (i + 2 < bytes.length) {
+                    int val = byteToDigit(bytes[i + 2]);
+                    if (val >= 0) {
+                        val += 16 * byteToDigit(bytes[i + 1]);
+                        if (val >= 0) {
+                            i += 2;
+                            bytes[j] = (byte) val;
+                            continue;
+                        }
+                    }
+                }
+            } else if (b == 0x2b /* + */ && queryString) {
+                bytes[j] = ' ';
+                continue;
+            }
+            bytes[j] = (byte) b;
+        }
+
+        return new String(bytes, 0, j, charset);
     }
 
-    private static Collection<datadog.trace.api.gateway.EventType<?>> l(
-        datadog.trace.api.gateway.EventType<?>... events) {
-      return Arrays.asList(events);
+    private static int byteToDigit(byte b) {
+        if (b >= 0x30 /* 0 */ && b <= 0x39 /* 9 */) {
+            return b - 0x30;
+        }
+        if (b >= 0x41 /* A */ && b <= 0x46 /* F */) {
+            return 10 + (b - 0x41);
+        }
+        if (b >= 0x61 /* a */ && b <= 0x66 /* f */) {
+            return 10 + (b - 0x61);
+        }
+        return -1;
     }
 
-    static Collection<datadog.trace.api.gateway.EventType<?>> additionalIGEventTypes(
-        Collection<Address<?>> addresses) {
-      Set<datadog.trace.api.gateway.EventType<?>> res = new HashSet<>();
-      for (Address<?> address : addresses) {
-        Collection<datadog.trace.api.gateway.EventType<?>> c = DATA_DEPENDENCIES.get(address);
-        if (c != null) {
-          res.addAll(c);
+    private static class IGAppSecEventDependencies {
+
+        private static final Map<Address<?>, Collection<datadog.trace.api.gateway.EventType<?>>> DATA_DEPENDENCIES =
+                new HashMap<>(4);
+
+        static {
+            DATA_DEPENDENCIES.put(
+                    KnownAddresses.REQUEST_BODY_RAW, l(EVENTS.requestBodyStart(), EVENTS.requestBodyDone()));
+            DATA_DEPENDENCIES.put(KnownAddresses.REQUEST_PATH_PARAMS, l(EVENTS.requestPathParams()));
+            DATA_DEPENDENCIES.put(KnownAddresses.REQUEST_BODY_OBJECT, l(EVENTS.requestBodyProcessed()));
+            DATA_DEPENDENCIES.put(KnownAddresses.REQUEST_FILES_FILENAMES, l(EVENTS.requestFilesFilenames()));
+            DATA_DEPENDENCIES.put(KnownAddresses.REQUEST_FILES_CONTENT, l(EVENTS.requestFilesContent()));
+        }
+
+        private static Collection<datadog.trace.api.gateway.EventType<?>> l(
+                datadog.trace.api.gateway.EventType<?>... events) {
+            return Arrays.asList(events);
+        }
+
+        static Collection<datadog.trace.api.gateway.EventType<?>> additionalIGEventTypes(
+                Collection<Address<?>> addresses) {
+            Set<datadog.trace.api.gateway.EventType<?>> res = new HashSet<>();
+            for (Address<?> address : addresses) {
+                Collection<datadog.trace.api.gateway.EventType<?>> c = DATA_DEPENDENCIES.get(address);
+                if (c != null) {
+                    res.addAll(c);
+                }
+            }
+            return res;
         }
-      }
-      return res;
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayContext.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayContext.java
index 3cf3bb117ec..6da4c4e561a 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayContext.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayContext.java
@@ -3,18 +3,18 @@
 import datadog.trace.api.telemetry.RuleType;
 
 public class GatewayContext {
-  public final boolean isTransient;
-  public final boolean isRasp;
+    public final boolean isTransient;
+    public final boolean isRasp;
 
-  public final RuleType raspRuleType;
+    public final RuleType raspRuleType;
 
-  public GatewayContext(final boolean isTransient) {
-    this(isTransient, null);
-  }
+    public GatewayContext(final boolean isTransient) {
+        this(isTransient, null);
+    }
 
-  public GatewayContext(final boolean isTransient, final RuleType raspRuleType) {
-    this.isTransient = isTransient;
-    this.isRasp = raspRuleType != null;
-    this.raspRuleType = raspRuleType;
-  }
+    public GatewayContext(final boolean isTransient, final RuleType raspRuleType) {
+        this.isTransient = isTransient;
+        this.isRasp = raspRuleType != null;
+        this.raspRuleType = raspRuleType;
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/NoopFlow.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/NoopFlow.java
index 77af95407d5..bb46a174021 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/NoopFlow.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/NoopFlow.java
@@ -3,17 +3,17 @@
 import datadog.trace.api.gateway.Flow;
 
 public final class NoopFlow implements Flow<Void> {
-  private NoopFlow() {}
+    private NoopFlow() {}
 
-  public static final NoopFlow INSTANCE = new NoopFlow();
+    public static final NoopFlow INSTANCE = new NoopFlow();
 
-  @Override
-  public Action getAction() {
-    return Action.Noop.INSTANCE;
-  }
+    @Override
+    public Action getAction() {
+        return Action.Noop.INSTANCE;
+    }
 
-  @Override
-  public Void getResult() {
-    return null;
-  }
+    @Override
+    public Void getResult() {
+        return null;
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/RateLimiter.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/RateLimiter.java
index a04b9c162f2..4665b9e6470 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/RateLimiter.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/RateLimiter.java
@@ -22,99 +22,91 @@
  * same time span.
  */
 public class RateLimiter {
-  private static final long MASK_COUNT_CUR_SEC = 0xFFFFFL;
-  private static final long MASK_COUNT_PREV_SEC = 0xFFFFF00000L;
-  private static final int SHIFT_COUNT_PREV_SEC = 20;
-  private static final int SHIFT_CUR_SEC = 40;
-  private static final int MAX_LIMIT = 0xFFFFF; // 2^20 -1
-  private static final int TIME_RING_MASK = 0xFFFFFF; // 24 bits
+    private static final long MASK_COUNT_CUR_SEC = 0xFFFFFL;
+    private static final long MASK_COUNT_PREV_SEC = 0xFFFFF00000L;
+    private static final int SHIFT_COUNT_PREV_SEC = 20;
+    private static final int SHIFT_CUR_SEC = 40;
+    private static final int MAX_LIMIT = 0xFFFFF; // 2^20 -1
+    private static final int TIME_RING_MASK = 0xFFFFFF; // 24 bits
 
-  private final TimeSource timeSource;
-  private final ThrottledCallback throttledCb;
+    private final TimeSource timeSource;
+    private final ThrottledCallback throttledCb;
 
-  public interface ThrottledCallback {
-    void onThrottled();
+    public interface ThrottledCallback {
+        void onThrottled();
 
-    ThrottledCallback NOOP = () -> {};
-  }
+        ThrottledCallback NOOP = () -> {};
+    }
 
-  private final int limitPerSec;
-  private final AtomicLong state = new AtomicLong();
+    private final int limitPerSec;
+    private final AtomicLong state = new AtomicLong();
 
-  public RateLimiter(int limitPerSec, TimeSource timeSource, ThrottledCallback cb) {
-    this.limitPerSec = Math.min(Math.max(limitPerSec, 0), MAX_LIMIT);
-    this.timeSource = timeSource;
-    this.throttledCb = cb;
-  }
+    public RateLimiter(int limitPerSec, TimeSource timeSource, ThrottledCallback cb) {
+        this.limitPerSec = Math.min(Math.max(limitPerSec, 0), MAX_LIMIT);
+        this.timeSource = timeSource;
+        this.throttledCb = cb;
+    }
 
-  public boolean isThrottled() {
-    long curSec = this.timeSource.getNanoTicks();
-    long storedState;
-    long newState;
+    public boolean isThrottled() {
+        long curSec = this.timeSource.getNanoTicks();
+        long storedState;
+        long newState;
 
-    do {
-      storedState = this.state.get();
-      int storedCurCount = (int) (storedState & MASK_COUNT_CUR_SEC);
-      int storedPrevCount = (int) ((storedState & MASK_COUNT_PREV_SEC) >> SHIFT_COUNT_PREV_SEC);
-      int storedCurSec24 = (int) (storedState >>> SHIFT_CUR_SEC);
+        do {
+            storedState = this.state.get();
+            int storedCurCount = (int) (storedState & MASK_COUNT_CUR_SEC);
+            int storedPrevCount = (int) ((storedState & MASK_COUNT_PREV_SEC) >> SHIFT_COUNT_PREV_SEC);
+            int storedCurSec24 = (int) (storedState >>> SHIFT_CUR_SEC);
 
-      int curSec24 = curSecond24bit(curSec);
-      int diff = (curSec24 - storedCurSec24) & TIME_RING_MASK;
-      while (true) {
-        switch (diff) {
-          case 0:
-            {
-              int count =
-                  storedCurCount
-                      + (int)
-                          (storedPrevCount
-                              * (1.0f - (float) (curSec % 1000000000L) / 1000000000.0f));
-              if (count >= limitPerSec) {
-                this.throttledCb.onThrottled();
-                return true;
-              }
-              newState = storedState + 1;
-              break;
+            int curSec24 = curSecond24bit(curSec);
+            int diff = (curSec24 - storedCurSec24) & TIME_RING_MASK;
+            while (true) {
+                switch (diff) {
+                    case 0: {
+                        int count = storedCurCount
+                                + (int) (storedPrevCount * (1.0f - (float) (curSec % 1000000000L) / 1000000000.0f));
+                        if (count >= limitPerSec) {
+                            this.throttledCb.onThrottled();
+                            return true;
+                        }
+                        newState = storedState + 1;
+                        break;
+                    }
+                    case 1: {
+                        int count = (int) (storedCurCount * (1.0f - (float) (curSec % 1000000000L) / 1000000000.0f));
+                        if (count >= limitPerSec) {
+                            // this is very unlikely to happen because the 2nd factor above must be 1
+                            // (we effectively round down when we cast to int)
+                            this.throttledCb.onThrottled();
+                            return true;
+                        }
+                        newState = ((long) curSec24 << SHIFT_CUR_SEC)
+                                | (((long) storedCurCount) << SHIFT_COUNT_PREV_SEC)
+                                | 1L;
+                        break;
+                    }
+                    case 0xFFFFFF: {
+                        // we fell 1 second behind the current second (mod 0x1000000)
+                        curSec = this.timeSource.getNanoTicks();
+                        curSec24 = curSecond24bit(curSec);
+                        diff = (curSec24 - storedCurSec24) & TIME_RING_MASK;
+                        if (diff != 0xFFFFFF) {
+                            continue; // reevaluate switch
+                        }
+                        // else we're still behind, so we likely wrapped around since the last write
+                        // in that case, fall to default case
+                    }
+                    default:
+                        newState = ((long) curSec24 << SHIFT_CUR_SEC) | 1L;
+                }
+                break; // while (true)
             }
-          case 1:
-            {
-              int count =
-                  (int) (storedCurCount * (1.0f - (float) (curSec % 1000000000L) / 1000000000.0f));
-              if (count >= limitPerSec) {
-                // this is very unlikely to happen because the 2nd factor above must be 1
-                // (we effectively round down when we cast to int)
-                this.throttledCb.onThrottled();
-                return true;
-              }
-              newState =
-                  ((long) curSec24 << SHIFT_CUR_SEC)
-                      | (((long) storedCurCount) << SHIFT_COUNT_PREV_SEC)
-                      | 1L;
-              break;
-            }
-          case 0xFFFFFF:
-            {
-              // we fell 1 second behind the current second (mod 0x1000000)
-              curSec = this.timeSource.getNanoTicks();
-              curSec24 = curSecond24bit(curSec);
-              diff = (curSec24 - storedCurSec24) & TIME_RING_MASK;
-              if (diff != 0xFFFFFF) {
-                continue; // reevaluate switch
-              }
-              // else we're still behind, so we likely wrapped around since the last write
-              // in that case, fall to default case
-            }
-          default:
-            newState = ((long) curSec24 << SHIFT_CUR_SEC) | 1L;
-        }
-        break; // while (true)
-      }
-    } while (!state.compareAndSet(storedState, newState));
-    return false;
-  }
+        } while (!state.compareAndSet(storedState, newState));
+        return false;
+    }
 
-  private static int curSecond24bit(long nanoTime) {
-    long secs = nanoTime / 1000000000L;
-    return (int) (secs & TIME_RING_MASK);
-  }
+    private static int curSecond24bit(long nanoTime) {
+        long secs = nanoTime / 1000000000L;
+        return (int) (secs & TIME_RING_MASK);
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/AppSecEvent.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/AppSecEvent.java
index 51e36d2d191..d416d6151e6 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/AppSecEvent.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/AppSecEvent.java
@@ -9,141 +9,139 @@
 
 public class AppSecEvent {
 
-  @com.squareup.moshi.Json(name = "rule")
-  private Rule rule;
-
-  @com.squareup.moshi.Json(name = "rule_matches")
-  private List<RuleMatch> ruleMatches = new ArrayList<>();
-
-  @com.squareup.moshi.Json(name = "span_id")
-  private Long spanId;
-
-  @com.squareup.moshi.Json(name = "stack_id")
-  private String stackId;
-
-  @com.squareup.moshi.Json(name = "security_response_id")
-  private String securityResponseId;
-
-  public Rule getRule() {
-    return rule;
-  }
-
-  public List<RuleMatch> getRuleMatches() {
-    return ruleMatches;
-  }
-
-  public Long getSpanId() {
-    return spanId;
-  }
-
-  public String getStackId() {
-    return stackId;
-  }
-
-  public String getSecurityResponseId() {
-    return securityResponseId;
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append(AppSecEvent.class.getName())
-        .append('@')
-        .append(Integer.toHexString(System.identityHashCode(this)))
-        .append('[');
-    sb.append("rule");
-    sb.append('=');
-    sb.append(((this.rule == null) ? "<null>" : this.rule));
-    sb.append(',');
-    sb.append("ruleMatches");
-    sb.append('=');
-    sb.append(((this.ruleMatches == null) ? "<null>" : this.ruleMatches));
-    sb.append(',');
-    sb.append("spanId");
-    sb.append('=');
-    sb.append(((this.spanId == null) ? "<null>" : this.spanId));
-    sb.append("stackId");
-    sb.append('=');
-    sb.append(((this.stackId == null) ? "<null>" : this.stackId));
-    sb.append(',');
-    sb.append("securityResponseId");
-    sb.append('=');
-    sb.append(((this.securityResponseId == null) ? "<null>" : this.securityResponseId));
-    if (sb.charAt((sb.length() - 1)) == ',') {
-      sb.setCharAt((sb.length() - 1), ']');
-    } else {
-      sb.append(']');
-    }
-    return sb.toString();
-  }
-
-  @Override
-  public int hashCode() {
-    int result = 1;
-    result = ((result * 31) + ((this.rule == null) ? 0 : this.rule.hashCode()));
-    result = ((result * 31) + ((this.ruleMatches == null) ? 0 : this.ruleMatches.hashCode()));
-    result = ((result * 31) + ((this.spanId == null) ? 0 : this.spanId.hashCode()));
-    result = ((result * 31) + ((this.stackId == null) ? 0 : this.stackId.hashCode()));
-    result =
-        ((result * 31)
-            + ((this.securityResponseId == null) ? 0 : this.securityResponseId.hashCode()));
-    return result;
-  }
-
-  @Override
-  public boolean equals(Object other) {
-    if (other == this) {
-      return true;
-    }
-    if (!(other instanceof AppSecEvent)) {
-      return false;
-    }
-    AppSecEvent rhs = ((AppSecEvent) other);
-    return ((Objects.equals(this.rule, rhs.rule))
-        && (Objects.equals(this.ruleMatches, rhs.ruleMatches))
-        && (Objects.equals(this.spanId, rhs.spanId))
-        && (Objects.equals(this.stackId, rhs.stackId))
-        && (Objects.equals(this.securityResponseId, rhs.securityResponseId)));
-  }
+    @com.squareup.moshi.Json(name = "rule")
+    private Rule rule;
+
+    @com.squareup.moshi.Json(name = "rule_matches")
+    private List<RuleMatch> ruleMatches = new ArrayList<>();
+
+    @com.squareup.moshi.Json(name = "span_id")
+    private Long spanId;
 
-  public static class Builder {
+    @com.squareup.moshi.Json(name = "stack_id")
+    private String stackId;
 
-    protected AppSecEvent instance;
+    @com.squareup.moshi.Json(name = "security_response_id")
+    private String securityResponseId;
+
+    public Rule getRule() {
+        return rule;
+    }
+
+    public List<RuleMatch> getRuleMatches() {
+        return ruleMatches;
+    }
 
-    public Builder() {
-      this.instance = new AppSecEvent();
+    public Long getSpanId() {
+        return spanId;
     }
 
-    public AppSecEvent build() {
-      AppSecEvent result;
-      result = this.instance;
-      this.instance = null;
-      return result;
+    public String getStackId() {
+        return stackId;
     }
 
-    public Builder withRule(Rule rule) {
-      this.instance.rule = rule;
-      return this;
+    public String getSecurityResponseId() {
+        return securityResponseId;
     }
 
-    public Builder withRuleMatches(List<RuleMatch> ruleMatches) {
-      this.instance.ruleMatches = ruleMatches;
-      return this;
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(AppSecEvent.class.getName())
+                .append('@')
+                .append(Integer.toHexString(System.identityHashCode(this)))
+                .append('[');
+        sb.append("rule");
+        sb.append('=');
+        sb.append(((this.rule == null) ? "<null>" : this.rule));
+        sb.append(',');
+        sb.append("ruleMatches");
+        sb.append('=');
+        sb.append(((this.ruleMatches == null) ? "<null>" : this.ruleMatches));
+        sb.append(',');
+        sb.append("spanId");
+        sb.append('=');
+        sb.append(((this.spanId == null) ? "<null>" : this.spanId));
+        sb.append("stackId");
+        sb.append('=');
+        sb.append(((this.stackId == null) ? "<null>" : this.stackId));
+        sb.append(',');
+        sb.append("securityResponseId");
+        sb.append('=');
+        sb.append(((this.securityResponseId == null) ? "<null>" : this.securityResponseId));
+        if (sb.charAt((sb.length() - 1)) == ',') {
+            sb.setCharAt((sb.length() - 1), ']');
+        } else {
+            sb.append(']');
+        }
+        return sb.toString();
     }
 
-    public Builder withSpanId(Long spanId) {
-      this.instance.spanId = spanId;
-      return this;
+    @Override
+    public int hashCode() {
+        int result = 1;
+        result = ((result * 31) + ((this.rule == null) ? 0 : this.rule.hashCode()));
+        result = ((result * 31) + ((this.ruleMatches == null) ? 0 : this.ruleMatches.hashCode()));
+        result = ((result * 31) + ((this.spanId == null) ? 0 : this.spanId.hashCode()));
+        result = ((result * 31) + ((this.stackId == null) ? 0 : this.stackId.hashCode()));
+        result = ((result * 31) + ((this.securityResponseId == null) ? 0 : this.securityResponseId.hashCode()));
+        return result;
     }
 
-    public Builder withStackId(String stackId) {
-      this.instance.stackId = stackId;
-      return this;
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if (!(other instanceof AppSecEvent)) {
+            return false;
+        }
+        AppSecEvent rhs = ((AppSecEvent) other);
+        return ((Objects.equals(this.rule, rhs.rule))
+                && (Objects.equals(this.ruleMatches, rhs.ruleMatches))
+                && (Objects.equals(this.spanId, rhs.spanId))
+                && (Objects.equals(this.stackId, rhs.stackId))
+                && (Objects.equals(this.securityResponseId, rhs.securityResponseId)));
     }
 
-    public Builder withSecurityResponseId(String securityResponseId) {
-      this.instance.securityResponseId = securityResponseId;
-      return this;
+    public static class Builder {
+
+        protected AppSecEvent instance;
+
+        public Builder() {
+            this.instance = new AppSecEvent();
+        }
+
+        public AppSecEvent build() {
+            AppSecEvent result;
+            result = this.instance;
+            this.instance = null;
+            return result;
+        }
+
+        public Builder withRule(Rule rule) {
+            this.instance.rule = rule;
+            return this;
+        }
+
+        public Builder withRuleMatches(List<RuleMatch> ruleMatches) {
+            this.instance.ruleMatches = ruleMatches;
+            return this;
+        }
+
+        public Builder withSpanId(Long spanId) {
+            this.instance.spanId = spanId;
+            return this;
+        }
+
+        public Builder withStackId(String stackId) {
+            this.instance.stackId = stackId;
+            return this;
+        }
+
+        public Builder withSecurityResponseId(String securityResponseId) {
+            this.instance.securityResponseId = securityResponseId;
+            return this;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/AppSecEventWrapper.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/AppSecEventWrapper.java
index a7b994f5b9f..05c2da8bb9d 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/AppSecEventWrapper.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/AppSecEventWrapper.java
@@ -11,71 +11,70 @@
 
 public class AppSecEventWrapper {
 
-  private static final JsonAdapter<AppSecEventWrapper> ADAPTER =
-      new Moshi.Builder()
-          .add(Double.class, new IntegralDoubleJsonAdapter())
-          .build()
-          .adapter(AppSecEventWrapper.class);
+    private static final JsonAdapter<AppSecEventWrapper> ADAPTER = new Moshi.Builder()
+            .add(Double.class, new IntegralDoubleJsonAdapter())
+            .build()
+            .adapter(AppSecEventWrapper.class);
 
-  // Writes whole-number Doubles (e.g. key_path array indices) without a trailing ".0".
+    // Writes whole-number Doubles (e.g. key_path array indices) without a trailing ".0".
 
-  private static final class IntegralDoubleJsonAdapter extends JsonAdapter<Double> {
-    @Override
-    public Double fromJson(JsonReader reader) throws IOException {
-      return reader.nextDouble();
-    }
+    private static final class IntegralDoubleJsonAdapter extends JsonAdapter<Double> {
+        @Override
+        public Double fromJson(JsonReader reader) throws IOException {
+            return reader.nextDouble();
+        }
 
-    @Override
-    public void toJson(JsonWriter writer, Double value) throws IOException {
-      if (value == null) {
-        writer.nullValue();
-      } else if (!value.isInfinite() && !value.isNaN() && value == Math.rint(value)) {
-        writer.value(value.longValue());
-      } else {
-        writer.value(value);
-      }
+        @Override
+        public void toJson(JsonWriter writer, Double value) throws IOException {
+            if (value == null) {
+                writer.nullValue();
+            } else if (!value.isInfinite() && !value.isNaN() && value == Math.rint(value)) {
+                writer.value(value.longValue());
+            } else {
+                writer.value(value);
+            }
+        }
     }
-  }
 
-  private final Collection<AppSecEvent> triggers;
-  private String json;
+    private final Collection<AppSecEvent> triggers;
+    private String json;
 
-  /**
-   * Required by the Moshi reflective adapter above. The adapter is only ever used to serialize, but
-   * Moshi resolves the instantiation strategy when the adapter is built, not when it is used: with
-   * no declared no-arg constructor it falls back to {@code sun.misc.Unsafe}, and on a runtime that
-   * does not resolve the {@code jdk.unsupported} module building the adapter throws.
-   */
-  private AppSecEventWrapper() {
-    this.triggers = Collections.emptyList();
-  }
+    /**
+     * Required by the Moshi reflective adapter above. The adapter is only ever used to serialize, but
+     * Moshi resolves the instantiation strategy when the adapter is built, not when it is used: with
+     * no declared no-arg constructor it falls back to {@code sun.misc.Unsafe}, and on a runtime that
+     * does not resolve the {@code jdk.unsupported} module building the adapter throws.
+     */
+    private AppSecEventWrapper() {
+        this.triggers = Collections.emptyList();
+    }
 
-  public AppSecEventWrapper(Collection<AppSecEvent> events) {
-    this.triggers = events;
-  }
+    public AppSecEventWrapper(Collection<AppSecEvent> events) {
+        this.triggers = events;
+    }
 
-  public Collection<AppSecEvent> getTriggers() {
-    return triggers;
-  }
+    public Collection<AppSecEvent> getTriggers() {
+        return triggers;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    AppSecEventWrapper that = (AppSecEventWrapper) o;
-    return Objects.equals(triggers, that.triggers);
-  }
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        AppSecEventWrapper that = (AppSecEventWrapper) o;
+        return Objects.equals(triggers, that.triggers);
+    }
 
-  @Override
-  public int hashCode() {
-    return triggers.hashCode();
-  }
+    @Override
+    public int hashCode() {
+        return triggers.hashCode();
+    }
 
-  @Override
-  public String toString() {
-    if (json == null) {
-      json = ADAPTER.toJson(this);
+    @Override
+    public String toString() {
+        if (json == null) {
+            json = ADAPTER.toJson(this);
+        }
+        return json;
     }
-    return json;
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaCveDatabase.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaCveDatabase.java
index 2c0446e888d..9fe9d0e67b3 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaCveDatabase.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaCveDatabase.java
@@ -28,159 +28,159 @@
  */
 public final class ScaCveDatabase {
 
-  private static final Logger log = LoggerFactory.getLogger(ScaCveDatabase.class);
-  private static final String RESOURCE_PATH = "/sca_cves.json";
-  private static final int READ_BUFFER_SIZE = 8192;
-
-  private final Map<String, List<ScaEntry>> index;
-
-  private ScaCveDatabase(Map<String, List<ScaEntry>> index) {
-    this.index = index;
-  }
-
-  /**
-   * Loads and parses {@code sca_cves.json} from the classpath.
-   *
-   * @return a populated database, or an empty one if the resource is missing or malformed
-   */
-  public static ScaCveDatabase load() {
-    InputStream stream = ScaCveDatabase.class.getResourceAsStream(RESOURCE_PATH);
-    if (stream == null) {
-      log.info(
-          "SCA Reachability: {} not found on classpath - no vulnerabilities will be tracked",
-          RESOURCE_PATH);
-      return new ScaCveDatabase(Collections.emptyMap());
+    private static final Logger log = LoggerFactory.getLogger(ScaCveDatabase.class);
+    private static final String RESOURCE_PATH = "/sca_cves.json";
+    private static final int READ_BUFFER_SIZE = 8192;
+
+    private final Map<String, List<ScaEntry>> index;
+
+    private ScaCveDatabase(Map<String, List<ScaEntry>> index) {
+        this.index = index;
     }
-    // "UTF-8" string literal - java.nio.* is forbidden during premain
-    try (InputStreamReader reader = new InputStreamReader(stream, "UTF-8")) {
-      return parse(reader);
-    } catch (Exception e) {
-      log.error(
-          "SCA Reachability: failed to parse {} - no vulnerabilities will be tracked",
-          RESOURCE_PATH,
-          e);
-      return new ScaCveDatabase(Collections.emptyMap());
+
+    /**
+     * Loads and parses {@code sca_cves.json} from the classpath.
+     *
+     * @return a populated database, or an empty one if the resource is missing or malformed
+     */
+    public static ScaCveDatabase load() {
+        InputStream stream = ScaCveDatabase.class.getResourceAsStream(RESOURCE_PATH);
+        if (stream == null) {
+            log.info("SCA Reachability: {} not found on classpath - no vulnerabilities will be tracked", RESOURCE_PATH);
+            return new ScaCveDatabase(Collections.emptyMap());
+        }
+        // "UTF-8" string literal - java.nio.* is forbidden during premain
+        try (InputStreamReader reader = new InputStreamReader(stream, "UTF-8")) {
+            return parse(reader);
+        } catch (Exception e) {
+            log.error("SCA Reachability: failed to parse {} - no vulnerabilities will be tracked", RESOURCE_PATH, e);
+            return new ScaCveDatabase(Collections.emptyMap());
+        }
     }
-  }
 
-  static ScaCveDatabase parse(Reader reader) throws IOException {
-    Moshi moshi = new Moshi.Builder().build();
-    JsonAdapter<DatabaseJson> adapter = moshi.adapter(DatabaseJson.class);
+    static ScaCveDatabase parse(Reader reader) throws IOException {
+        Moshi moshi = new Moshi.Builder().build();
+        JsonAdapter<DatabaseJson> adapter = moshi.adapter(DatabaseJson.class);
 
-    String content = readAll(reader);
-    DatabaseJson root = adapter.fromJson(content);
-    if (root == null || root.entries == null) {
-      return new ScaCveDatabase(Collections.emptyMap());
+        String content = readAll(reader);
+        DatabaseJson root = adapter.fromJson(content);
+        if (root == null || root.entries == null) {
+            return new ScaCveDatabase(Collections.emptyMap());
+        }
+
+        Map<String, List<ScaEntry>> index = new HashMap<>();
+        int entryCount = 0;
+
+        for (EntryJson e : root.entries) {
+            ScaEntry entry = toScaEntry(e);
+            if (entry == null) {
+                continue;
+            }
+            entryCount++;
+            // Index once per unique class name: an entry with multiple symbols for the same class
+            // (e.g. Yaml.load + Yaml.loadAll) must appear only once in the list, otherwise
+            // processClass iterates it twice and injects duplicate bytecode callbacks.
+            Set<String> seen = new HashSet<>();
+            for (ScaSymbol symbol : entry.symbols()) {
+                if (seen.add(symbol.className())) {
+                    index.computeIfAbsent(symbol.className(), k -> new ArrayList<>())
+                            .add(entry);
+                }
+            }
+        }
+
+        log.debug("SCA Reachability: loaded {} entries, {} unique class symbols", entryCount, index.size());
+        return new ScaCveDatabase(Collections.unmodifiableMap(index));
     }
 
-    Map<String, List<ScaEntry>> index = new HashMap<>();
-    int entryCount = 0;
-
-    for (EntryJson e : root.entries) {
-      ScaEntry entry = toScaEntry(e);
-      if (entry == null) {
-        continue;
-      }
-      entryCount++;
-      // Index once per unique class name: an entry with multiple symbols for the same class
-      // (e.g. Yaml.load + Yaml.loadAll) must appear only once in the list, otherwise
-      // processClass iterates it twice and injects duplicate bytecode callbacks.
-      Set<String> seen = new HashSet<>();
-      for (ScaSymbol symbol : entry.symbols()) {
-        if (seen.add(symbol.className())) {
-          index.computeIfAbsent(symbol.className(), k -> new ArrayList<>()).add(entry);
+    @Nullable
+    private static ScaEntry toScaEntry(EntryJson e) {
+        if (e.vulnId == null || e.artifact == null || e.versionRanges == null || e.symbols == null) {
+            log.debug("SCA Reachability: skipping malformed entry: {}", e);
+            return null;
+        }
+        List<ScaSymbol> symbols = new ArrayList<>(e.symbols.size());
+        for (SymbolJson s : e.symbols) {
+            if (s.className == null) {
+                continue;
+            }
+            if (s.method == null) {
+                log.debug("SCA Reachability: skipping symbol with null method in entry {}", e.vulnId);
+                continue;
+            }
+            symbols.add(new ScaSymbol(s.className, s.method));
         }
-      }
+        if (symbols.isEmpty()) return null;
+        return new ScaEntry(e.vulnId, e.artifact, e.versionRanges, symbols);
     }
 
-    log.debug(
-        "SCA Reachability: loaded {} entries, {} unique class symbols", entryCount, index.size());
-    return new ScaCveDatabase(Collections.unmodifiableMap(index));
-  }
+    /**
+     * Returns the entries associated with the given JVM internal class name, or null if none.
+     *
+     * <p>TODO: consider replacing this HashMap with a trie (e.g. {@code ClassNameTrie.Builder}) if
+     * the database grows significantly. {@code HashMap} lookup for {@code String} keys is O(length)
+     * on the first call for a new instance because {@code String.hashCode()} is not yet cached; a
+     * trie is also O(length) but can exit early on a prefix mismatch, which is the common case (most
+     * loaded classes are not in the CVE database). The project already has a runtime-constructable
+     * {@code ClassNameTrie.Builder} used by the debugger, so the infrastructure exists. Note that the
+     * current trie infrastructure uses prefix/glob patterns, so exact-match semantics would need to
+     * be verified before adopting it here.
+     */
+    public List<ScaEntry> entriesForClass(String internalClassName) {
+        return index.get(internalClassName);
+    }
 
-  @Nullable
-  private static ScaEntry toScaEntry(EntryJson e) {
-    if (e.vulnId == null || e.artifact == null || e.versionRanges == null || e.symbols == null) {
-      log.debug("SCA Reachability: skipping malformed entry: {}", e);
-      return null;
+    public boolean isEmpty() {
+        return index.isEmpty();
     }
-    List<ScaSymbol> symbols = new ArrayList<>(e.symbols.size());
-    for (SymbolJson s : e.symbols) {
-      if (s.className == null) {
-        continue;
-      }
-      if (s.method == null) {
-        log.debug("SCA Reachability: skipping symbol with null method in entry {}", e.vulnId);
-        continue;
-      }
-      symbols.add(new ScaSymbol(s.className, s.method));
+
+    public int size() {
+        return index.size();
     }
-    if (symbols.isEmpty()) return null;
-    return new ScaEntry(e.vulnId, e.artifact, e.versionRanges, symbols);
-  }
-
-  /**
-   * Returns the entries associated with the given JVM internal class name, or null if none.
-   *
-   * <p>TODO: consider replacing this HashMap with a trie (e.g. {@code ClassNameTrie.Builder}) if
-   * the database grows significantly. {@code HashMap} lookup for {@code String} keys is O(length)
-   * on the first call for a new instance because {@code String.hashCode()} is not yet cached; a
-   * trie is also O(length) but can exit early on a prefix mismatch, which is the common case (most
-   * loaded classes are not in the CVE database). The project already has a runtime-constructable
-   * {@code ClassNameTrie.Builder} used by the debugger, so the infrastructure exists. Note that the
-   * current trie infrastructure uses prefix/glob patterns, so exact-match semantics would need to
-   * be verified before adopting it here.
-   */
-  public List<ScaEntry> entriesForClass(String internalClassName) {
-    return index.get(internalClassName);
-  }
-
-  public boolean isEmpty() {
-    return index.isEmpty();
-  }
-
-  public int size() {
-    return index.size();
-  }
-
-  private static String readAll(Reader reader) throws IOException {
-    StringBuilder sb = new StringBuilder();
-    char[] buf = new char[READ_BUFFER_SIZE];
-    int n;
-    while ((n = reader.read(buf)) != -1) {
-      sb.append(buf, 0, n);
+
+    private static String readAll(Reader reader) throws IOException {
+        StringBuilder sb = new StringBuilder();
+        char[] buf = new char[READ_BUFFER_SIZE];
+        int n;
+        while ((n = reader.read(buf)) != -1) {
+            sb.append(buf, 0, n);
+        }
+        return sb.toString();
     }
-    return sb.toString();
-  }
 
-  // ---------------------------------------------------------------------------
-  // JSON DTOs - only used during parsing, never exposed outside this class
-  // ---------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------
+    // JSON DTOs - only used during parsing, never exposed outside this class
+    // ---------------------------------------------------------------------------
 
-  static final class DatabaseJson {
-    int version;
-    @Nullable List<EntryJson> entries;
-  }
+    static final class DatabaseJson {
+        int version;
 
-  static final class EntryJson {
-    @Json(name = "vuln_id")
-    @Nullable
-    String vulnId;
+        @Nullable
+        List<EntryJson> entries;
+    }
 
-    @Nullable String artifact;
+    static final class EntryJson {
+        @Json(name = "vuln_id")
+        @Nullable
+        String vulnId;
 
-    @Json(name = "version_ranges")
-    @Nullable
-    List<String> versionRanges;
+        @Nullable
+        String artifact;
 
-    @Nullable List<SymbolJson> symbols;
-  }
+        @Json(name = "version_ranges")
+        @Nullable
+        List<String> versionRanges;
 
-  static final class SymbolJson {
-    @Json(name = "class")
-    @Nullable
-    String className;
+        @Nullable
+        List<SymbolJson> symbols;
+    }
 
-    @Nullable String method;
-  }
+    static final class SymbolJson {
+        @Json(name = "class")
+        @Nullable
+        String className;
+
+        @Nullable
+        String method;
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaEntry.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaEntry.java
index f1fc2382640..f105d219cc7 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaEntry.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaEntry.java
@@ -6,42 +6,41 @@
 /** One entry from sca_cves.json: a vulnerability affecting a specific Maven artifact. */
 public final class ScaEntry {
 
-  private final String vulnId;
-  private final String artifact;
-  private final List<String> versionRanges;
-  private final List<ScaSymbol> symbols;
-
-  public ScaEntry(
-      String vulnId, String artifact, List<String> versionRanges, List<ScaSymbol> symbols) {
-    this.vulnId = vulnId;
-    this.artifact = artifact;
-    this.versionRanges = Collections.unmodifiableList(versionRanges);
-    this.symbols = Collections.unmodifiableList(symbols);
-  }
-
-  /** GHSA identifier, e.g. {@code "GHSA-645p-88qh-w398"}. */
-  public String vulnId() {
-    return vulnId;
-  }
-
-  /** Maven coordinate, e.g. {@code "com.fasterxml.jackson.core:jackson-databind"}. */
-  public String artifact() {
-    return artifact;
-  }
-
-  /**
-   * Version range strings from sca_cves.json, e.g. {@code ["< 2.6.7.3", ">= 2.7.0, < 2.7.9.5"]}.
-   */
-  public List<String> versionRanges() {
-    return versionRanges;
-  }
-
-  public List<ScaSymbol> symbols() {
-    return symbols;
-  }
-
-  /** Returns true if the given version falls within any of this entry's version ranges. */
-  public boolean isVersionVulnerable(String version) {
-    return VersionRangeParser.matchesAny(version, versionRanges);
-  }
+    private final String vulnId;
+    private final String artifact;
+    private final List<String> versionRanges;
+    private final List<ScaSymbol> symbols;
+
+    public ScaEntry(String vulnId, String artifact, List<String> versionRanges, List<ScaSymbol> symbols) {
+        this.vulnId = vulnId;
+        this.artifact = artifact;
+        this.versionRanges = Collections.unmodifiableList(versionRanges);
+        this.symbols = Collections.unmodifiableList(symbols);
+    }
+
+    /** GHSA identifier, e.g. {@code "GHSA-645p-88qh-w398"}. */
+    public String vulnId() {
+        return vulnId;
+    }
+
+    /** Maven coordinate, e.g. {@code "com.fasterxml.jackson.core:jackson-databind"}. */
+    public String artifact() {
+        return artifact;
+    }
+
+    /**
+     * Version range strings from sca_cves.json, e.g. {@code ["< 2.6.7.3", ">= 2.7.0, < 2.7.9.5"]}.
+     */
+    public List<String> versionRanges() {
+        return versionRanges;
+    }
+
+    public List<ScaSymbol> symbols() {
+        return symbols;
+    }
+
+    /** Returns true if the given version falls within any of this entry's version ranges. */
+    public boolean isVersionVulnerable(String version) {
+        return VersionRangeParser.matchesAny(version, versionRanges);
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaMethodCallbackInjector.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaMethodCallbackInjector.java
index f7e9859e8e8..46a5d757383 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaMethodCallbackInjector.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaMethodCallbackInjector.java
@@ -20,187 +20,177 @@
  */
 final class ScaMethodCallbackInjector {
 
-  private static final String CALLBACK_OWNER =
-      "datadog/trace/bootstrap/appsec/sca/ScaReachabilityCallback";
-  private static final String CALLBACK_METHOD = "onMethodHit";
-  private static final String CALLBACK_DESC =
-      "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V";
-
-  private ScaMethodCallbackInjector() {}
-
-  @VisibleForTesting
-  static byte[] inject(
-      byte[] classfileBuffer, Map<String, List<MethodCallbackSpec>> callbacksPerMethod) {
-    ClassReader cr = new ClassReader(classfileBuffer);
-    ClassWriter cw = new ClassWriter(cr, ClassWriter.COMPUTE_MAXS);
-    cr.accept(new MethodCallbackClassVisitor(cw, callbacksPerMethod), ClassReader.EXPAND_FRAMES);
-    return cw.toByteArray();
-  }
-
-  private static class MethodCallbackClassVisitor extends ClassVisitor {
-    private final Map<String, List<MethodCallbackSpec>> callbacksPerMethod;
-
-    MethodCallbackClassVisitor(
-        ClassVisitor cv, Map<String, List<MethodCallbackSpec>> callbacksPerMethod) {
-      super(OpenedClassReader.ASM_API, cv);
-      this.callbacksPerMethod = callbacksPerMethod;
+    private static final String CALLBACK_OWNER = "datadog/trace/bootstrap/appsec/sca/ScaReachabilityCallback";
+    private static final String CALLBACK_METHOD = "onMethodHit";
+    private static final String CALLBACK_DESC =
+            "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V";
+
+    private ScaMethodCallbackInjector() {}
+
+    @VisibleForTesting
+    static byte[] inject(byte[] classfileBuffer, Map<String, List<MethodCallbackSpec>> callbacksPerMethod) {
+        ClassReader cr = new ClassReader(classfileBuffer);
+        ClassWriter cw = new ClassWriter(cr, ClassWriter.COMPUTE_MAXS);
+        cr.accept(new MethodCallbackClassVisitor(cw, callbacksPerMethod), ClassReader.EXPAND_FRAMES);
+        return cw.toByteArray();
+    }
+
+    private static class MethodCallbackClassVisitor extends ClassVisitor {
+        private final Map<String, List<MethodCallbackSpec>> callbacksPerMethod;
+
+        MethodCallbackClassVisitor(ClassVisitor cv, Map<String, List<MethodCallbackSpec>> callbacksPerMethod) {
+            super(OpenedClassReader.ASM_API, cv);
+            this.callbacksPerMethod = callbacksPerMethod;
+        }
+
+        @Override
+        public MethodVisitor visitMethod(
+                int access, String name, String descriptor, String signature, String[] exceptions) {
+            MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
+            List<MethodCallbackSpec> specs = callbacksPerMethod.get(name);
+            if (specs == null || specs.isEmpty()) {
+                return mv;
+            }
+            return new MethodEntryInjector(mv, specs);
+        }
+    }
+
+    private static class MethodEntryInjector extends MethodVisitor {
+        private final List<MethodCallbackSpec> specs;
+        private boolean injected = false;
+
+        MethodEntryInjector(MethodVisitor mv, List<MethodCallbackSpec> specs) {
+            super(OpenedClassReader.ASM_API, mv);
+            this.specs = specs;
+        }
+
+        @Override
+        public void visitLineNumber(int line, Label start) {
+            if (!injected) {
+                injected = true;
+                injectCallbacks(line);
+            }
+            super.visitLineNumber(line, start);
+        }
+
+        @Override
+        public void visitInsn(int opcode) {
+            ensureInjected();
+            super.visitInsn(opcode);
+        }
+
+        @Override
+        public void visitVarInsn(int opcode, int varIndex) {
+            ensureInjected();
+            super.visitVarInsn(opcode, varIndex);
+        }
+
+        @Override
+        public void visitMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) {
+            ensureInjected();
+            super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+        }
+
+        @Override
+        public void visitFieldInsn(int opcode, String owner, String name, String descriptor) {
+            ensureInjected();
+            super.visitFieldInsn(opcode, owner, name, descriptor);
+        }
+
+        @Override
+        public void visitTypeInsn(int opcode, String type) {
+            ensureInjected();
+            super.visitTypeInsn(opcode, type);
+        }
+
+        @Override
+        public void visitIntInsn(int opcode, int operand) {
+            ensureInjected();
+            super.visitIntInsn(opcode, operand);
+        }
+
+        @Override
+        public void visitLdcInsn(Object value) {
+            ensureInjected();
+            super.visitLdcInsn(value);
+        }
+
+        @Override
+        public void visitJumpInsn(int opcode, Label label) {
+            ensureInjected();
+            super.visitJumpInsn(opcode, label);
+        }
+
+        @Override
+        public void visitIincInsn(int varIndex, int increment) {
+            ensureInjected();
+            super.visitIincInsn(varIndex, increment);
+        }
+
+        @Override
+        public void visitTableSwitchInsn(int min, int max, Label dflt, Label... labels) {
+            ensureInjected();
+            super.visitTableSwitchInsn(min, max, dflt, labels);
+        }
+
+        @Override
+        public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
+            ensureInjected();
+            super.visitLookupSwitchInsn(dflt, keys, labels);
+        }
+
+        @Override
+        public void visitMultiANewArrayInsn(String descriptor, int numDimensions) {
+            ensureInjected();
+            super.visitMultiANewArrayInsn(descriptor, numDimensions);
+        }
+
+        @Override
+        public void visitInvokeDynamicInsn(
+                String name, String descriptor, Handle bootstrapMethodHandle, Object... bootstrapMethodArguments) {
+            ensureInjected();
+            super.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
+        }
+
+        private void ensureInjected() {
+            if (!injected) {
+                injected = true;
+                injectCallbacks(1); // no debug info — use line 1 as placeholder
+            }
+        }
+
+        private void injectCallbacks(int line) {
+            // No dedup check here: retransformClasses() always starts from the original class bytes,
+            // so the callback must be re-injected on every transformation pass. Deduplication of
+            // actual runtime reports is handled by ScaReachabilityCallback.reported (bootstrap-side),
+            // which persists across retransformations and prevents duplicate hits regardless of how
+            // many times the class is retransformed.
+            for (MethodCallbackSpec spec : specs) {
+                mv.visitLdcInsn(spec.vulnId);
+                mv.visitLdcInsn(spec.artifact);
+                mv.visitLdcInsn(spec.version);
+                mv.visitLdcInsn(spec.dotClassName);
+                mv.visitLdcInsn(spec.methodName);
+                mv.visitLdcInsn(line); // LDC handles the full int range; SIPUSH is limited to -32768..32767
+                mv.visitMethodInsn(Opcodes.INVOKESTATIC, CALLBACK_OWNER, CALLBACK_METHOD, CALLBACK_DESC, false);
+            }
+        }
+    }
+
+    /** Immutable spec for a single method-level callback to inject. */
+    static final class MethodCallbackSpec {
+        final String vulnId;
+        final String artifact;
+        final String version;
+        final String dotClassName;
+        final String methodName;
+
+        MethodCallbackSpec(String vulnId, String artifact, String version, String dotClassName, String methodName) {
+            this.vulnId = vulnId;
+            this.artifact = artifact;
+            this.version = version;
+            this.dotClassName = dotClassName;
+            this.methodName = methodName;
+        }
     }
-
-    @Override
-    public MethodVisitor visitMethod(
-        int access, String name, String descriptor, String signature, String[] exceptions) {
-      MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
-      List<MethodCallbackSpec> specs = callbacksPerMethod.get(name);
-      if (specs == null || specs.isEmpty()) {
-        return mv;
-      }
-      return new MethodEntryInjector(mv, specs);
-    }
-  }
-
-  private static class MethodEntryInjector extends MethodVisitor {
-    private final List<MethodCallbackSpec> specs;
-    private boolean injected = false;
-
-    MethodEntryInjector(MethodVisitor mv, List<MethodCallbackSpec> specs) {
-      super(OpenedClassReader.ASM_API, mv);
-      this.specs = specs;
-    }
-
-    @Override
-    public void visitLineNumber(int line, Label start) {
-      if (!injected) {
-        injected = true;
-        injectCallbacks(line);
-      }
-      super.visitLineNumber(line, start);
-    }
-
-    @Override
-    public void visitInsn(int opcode) {
-      ensureInjected();
-      super.visitInsn(opcode);
-    }
-
-    @Override
-    public void visitVarInsn(int opcode, int varIndex) {
-      ensureInjected();
-      super.visitVarInsn(opcode, varIndex);
-    }
-
-    @Override
-    public void visitMethodInsn(
-        int opcode, String owner, String name, String descriptor, boolean isInterface) {
-      ensureInjected();
-      super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-    }
-
-    @Override
-    public void visitFieldInsn(int opcode, String owner, String name, String descriptor) {
-      ensureInjected();
-      super.visitFieldInsn(opcode, owner, name, descriptor);
-    }
-
-    @Override
-    public void visitTypeInsn(int opcode, String type) {
-      ensureInjected();
-      super.visitTypeInsn(opcode, type);
-    }
-
-    @Override
-    public void visitIntInsn(int opcode, int operand) {
-      ensureInjected();
-      super.visitIntInsn(opcode, operand);
-    }
-
-    @Override
-    public void visitLdcInsn(Object value) {
-      ensureInjected();
-      super.visitLdcInsn(value);
-    }
-
-    @Override
-    public void visitJumpInsn(int opcode, Label label) {
-      ensureInjected();
-      super.visitJumpInsn(opcode, label);
-    }
-
-    @Override
-    public void visitIincInsn(int varIndex, int increment) {
-      ensureInjected();
-      super.visitIincInsn(varIndex, increment);
-    }
-
-    @Override
-    public void visitTableSwitchInsn(int min, int max, Label dflt, Label... labels) {
-      ensureInjected();
-      super.visitTableSwitchInsn(min, max, dflt, labels);
-    }
-
-    @Override
-    public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
-      ensureInjected();
-      super.visitLookupSwitchInsn(dflt, keys, labels);
-    }
-
-    @Override
-    public void visitMultiANewArrayInsn(String descriptor, int numDimensions) {
-      ensureInjected();
-      super.visitMultiANewArrayInsn(descriptor, numDimensions);
-    }
-
-    @Override
-    public void visitInvokeDynamicInsn(
-        String name,
-        String descriptor,
-        Handle bootstrapMethodHandle,
-        Object... bootstrapMethodArguments) {
-      ensureInjected();
-      super.visitInvokeDynamicInsn(
-          name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
-    }
-
-    private void ensureInjected() {
-      if (!injected) {
-        injected = true;
-        injectCallbacks(1); // no debug info — use line 1 as placeholder
-      }
-    }
-
-    private void injectCallbacks(int line) {
-      // No dedup check here: retransformClasses() always starts from the original class bytes,
-      // so the callback must be re-injected on every transformation pass. Deduplication of
-      // actual runtime reports is handled by ScaReachabilityCallback.reported (bootstrap-side),
-      // which persists across retransformations and prevents duplicate hits regardless of how
-      // many times the class is retransformed.
-      for (MethodCallbackSpec spec : specs) {
-        mv.visitLdcInsn(spec.vulnId);
-        mv.visitLdcInsn(spec.artifact);
-        mv.visitLdcInsn(spec.version);
-        mv.visitLdcInsn(spec.dotClassName);
-        mv.visitLdcInsn(spec.methodName);
-        mv.visitLdcInsn(line); // LDC handles the full int range; SIPUSH is limited to -32768..32767
-        mv.visitMethodInsn(
-            Opcodes.INVOKESTATIC, CALLBACK_OWNER, CALLBACK_METHOD, CALLBACK_DESC, false);
-      }
-    }
-  }
-
-  /** Immutable spec for a single method-level callback to inject. */
-  static final class MethodCallbackSpec {
-    final String vulnId;
-    final String artifact;
-    final String version;
-    final String dotClassName;
-    final String methodName;
-
-    MethodCallbackSpec(
-        String vulnId, String artifact, String version, String dotClassName, String methodName) {
-      this.vulnId = vulnId;
-      this.artifact = artifact;
-      this.version = version;
-      this.dotClassName = dotClassName;
-      this.methodName = methodName;
-    }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaReachabilitySystem.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaReachabilitySystem.java
index 28a7fe176e6..8edba63580e 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaReachabilitySystem.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaReachabilitySystem.java
@@ -25,125 +25,117 @@
  */
 public final class ScaReachabilitySystem {
 
-  private static final Logger log = LoggerFactory.getLogger(ScaReachabilitySystem.class);
+    private static final Logger log = LoggerFactory.getLogger(ScaReachabilitySystem.class);
 
-  private ScaReachabilitySystem() {}
+    private ScaReachabilitySystem() {}
 
-  /**
-   * Starts the SCA Reachability subsystem.
-   *
-   * <p>Called by reflection from {@code Agent.maybeStartScaReachability()} - the method signature
-   * must remain {@code public static void start(Instrumentation)}.
-   */
-  public static void start(Instrumentation instrumentation) {
-    ScaCveDatabase database = ScaCveDatabase.load();
-    if (database.isEmpty()) {
-      log.info("SCA Reachability: no vulnerability data found - subsystem inactive");
-      return;
-    }
-    log.info("SCA Reachability: loaded {} vulnerable class symbols", database.size());
+    /**
+     * Starts the SCA Reachability subsystem.
+     *
+     * <p>Called by reflection from {@code Agent.maybeStartScaReachability()} - the method signature
+     * must remain {@code public static void start(Instrumentation)}.
+     */
+    public static void start(Instrumentation instrumentation) {
+        ScaCveDatabase database = ScaCveDatabase.load();
+        if (database.isEmpty()) {
+            log.info("SCA Reachability: no vulnerability data found - subsystem inactive");
+            return;
+        }
+        log.info("SCA Reachability: loaded {} vulnerable class symbols", database.size());
 
-    // Register the method-level callback. When called synchronously from the injected bytecode,
-    // the current thread stack still contains the full call chain:
-    //   this handler lambda
-    //   ScaReachabilityCallback.onMethodHit
-    //   <vulnerable method> (dotClassName.methodName)
-    //   [optional intermediate library frames]
-    //   <application callsite>  ← what we report
-    // Agent frames are filtered by AbstractStackWalker.isNotDatadogTraceStackElement; intermediate
-    // library frames are filtered by ScaStackExclusionTrie so we skip past them to client code.
-    ScaReachabilityCallback.register(
-        (vulnId, artifact, version, dotClassName, methodName, line) -> {
-          StackTraceElement callsite = findCallsite(dotClassName);
-          if (callsite != null) {
-            ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-                artifact,
-                version,
-                vulnId,
-                callsite.getClassName(),
-                callsite.getMethodName(),
-                callsite.getLineNumber());
-          } else {
-            // Fallback: no application frame found - report the vulnerable symbol so the
-            // backend at least knows the method was reached.
-            ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-                artifact, version, vulnId, dotClassName, methodName, line);
-          }
+        // Register the method-level callback. When called synchronously from the injected bytecode,
+        // the current thread stack still contains the full call chain:
+        //   this handler lambda
+        //   ScaReachabilityCallback.onMethodHit
+        //   <vulnerable method> (dotClassName.methodName)
+        //   [optional intermediate library frames]
+        //   <application callsite>  ← what we report
+        // Agent frames are filtered by AbstractStackWalker.isNotDatadogTraceStackElement; intermediate
+        // library frames are filtered by ScaStackExclusionTrie so we skip past them to client code.
+        ScaReachabilityCallback.register((vulnId, artifact, version, dotClassName, methodName, line) -> {
+            StackTraceElement callsite = findCallsite(dotClassName);
+            if (callsite != null) {
+                ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                        artifact,
+                        version,
+                        vulnId,
+                        callsite.getClassName(),
+                        callsite.getMethodName(),
+                        callsite.getLineNumber());
+            } else {
+                // Fallback: no application frame found - report the vulnerable symbol so the
+                // backend at least knows the method was reached.
+                ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                        artifact, version, vulnId, dotClassName, methodName, line);
+            }
         });
 
-    ScaReachabilityTransformer transformer =
-        new ScaReachabilityTransformer(database, instrumentation);
+        ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(database, instrumentation);
 
-    // canRetransform=true is required so that already-loaded classes can be retransformed to inject
-    // method-level callbacks when they were loaded before the agent started.
-    instrumentation.addTransformer(transformer, true);
+        // canRetransform=true is required so that already-loaded classes can be retransformed to inject
+        // method-level callbacks when they were loaded before the agent started.
+        instrumentation.addTransformer(transformer, true);
 
-    transformer.checkAlreadyLoadedClasses();
-    log.debug("SCA Reachability: startup scan complete");
+        transformer.checkAlreadyLoadedClasses();
+        log.debug("SCA Reachability: startup scan complete");
 
-    // performPendingRetransforms injects method-level callbacks into classes whose names were
-    // added to pendingRetransformNames by transform() on first load or by processClass() when
-    // version resolution previously failed and needs a retry.
-    ScaReachabilityDependencyRegistry.INSTANCE.setPeriodicWorkCallback(
-        transformer::performPendingRetransforms);
-  }
+        // performPendingRetransforms injects method-level callbacks into classes whose names were
+        // added to pendingRetransformNames by transform() on first load or by processClass() when
+        // version resolution previously failed and needs a retry.
+        ScaReachabilityDependencyRegistry.INSTANCE.setPeriodicWorkCallback(transformer::performPendingRetransforms);
+    }
 
-  /**
-   * Walks the current thread stack to find the first application frame that called the vulnerable
-   * method. Uses {@link StackWalkerFactory#INSTANCE} for lazy stack evaluation on JDK9+ (avoids
-   * materializing the full stack array). Agent frames are pre-filtered by the walker; intermediate
-   * library frames are skipped via {@link ScaStackExclusionTrie}.
-   *
-   * <p>The stack at call time is:
-   *
-   * <pre>
-   *   ScaReachabilitySystem handler lambda  (skip - agent, filtered by walker)
-   *   ScaReachabilityCallback.onMethodHit   (skip - agent, filtered by walker)
-   *   &lt;vulnerableClass&gt;.&lt;method&gt;           (skip - the instrumented library class)
-   *   [intermediate library frames]         (skip - trie-excluded)
-   *   &lt;application callsite&gt;               ← return this
-   * </pre>
-   *
-   * @param vulnerableClass dot-notation FQN of the instrumented class
-   * @return first application callsite frame, or {@code null} if not found
-   */
-  static StackTraceElement findCallsite(String vulnerableClass) {
-    return StackWalkerFactory.INSTANCE.walk(
-        stream -> findCallsiteInStream(vulnerableClass, stream));
-  }
+    /**
+     * Walks the current thread stack to find the first application frame that called the vulnerable
+     * method. Uses {@link StackWalkerFactory#INSTANCE} for lazy stack evaluation on JDK9+ (avoids
+     * materializing the full stack array). Agent frames are pre-filtered by the walker; intermediate
+     * library frames are skipped via {@link ScaStackExclusionTrie}.
+     *
+     * <p>The stack at call time is:
+     *
+     * <pre>
+     *   ScaReachabilitySystem handler lambda  (skip - agent, filtered by walker)
+     *   ScaReachabilityCallback.onMethodHit   (skip - agent, filtered by walker)
+     *   &lt;vulnerableClass&gt;.&lt;method&gt;           (skip - the instrumented library class)
+     *   [intermediate library frames]         (skip - trie-excluded)
+     *   &lt;application callsite&gt;               ← return this
+     * </pre>
+     *
+     * @param vulnerableClass dot-notation FQN of the instrumented class
+     * @return first application callsite frame, or {@code null} if not found
+     */
+    static StackTraceElement findCallsite(String vulnerableClass) {
+        return StackWalkerFactory.INSTANCE.walk(stream -> findCallsiteInStream(vulnerableClass, stream));
+    }
 
-  /**
-   * Overload that accepts an explicit stack for testing.
-   *
-   * @see #findCallsite(String)
-   */
-  static StackTraceElement findCallsite(String vulnerableClass, StackTraceElement[] stack) {
-    return findCallsiteInStream(
-        vulnerableClass,
-        Arrays.stream(stack).filter(AbstractStackWalker::isNotDatadogTraceStackElement));
-  }
+    /**
+     * Overload that accepts an explicit stack for testing.
+     *
+     * @see #findCallsite(String)
+     */
+    static StackTraceElement findCallsite(String vulnerableClass, StackTraceElement[] stack) {
+        return findCallsiteInStream(
+                vulnerableClass, Arrays.stream(stack).filter(AbstractStackWalker::isNotDatadogTraceStackElement));
+    }
 
-  private static StackTraceElement findCallsiteInStream(
-      String vulnerableClass, Stream<StackTraceElement> stream) {
-    boolean[] pastVulnerableClass = {false};
-    return stream
-        .filter(
-            frame -> {
-              String cls = frame.getClassName();
-              if (!pastVulnerableClass[0]) {
-                if (cls.equals(vulnerableClass)) {
-                  pastVulnerableClass[0] = true;
-                }
-                return false;
-              }
-              // Skip remaining frames from the vulnerable class itself
-              if (cls.equals(vulnerableClass)) {
-                return false;
-              }
-              // Skip intermediate library frames so we report client code, not a wrapper library
-              return ScaStackExclusionTrie.apply(cls) < 1;
-            })
-        .findFirst()
-        .orElse(null);
-  }
+    private static StackTraceElement findCallsiteInStream(String vulnerableClass, Stream<StackTraceElement> stream) {
+        boolean[] pastVulnerableClass = {false};
+        return stream.filter(frame -> {
+                    String cls = frame.getClassName();
+                    if (!pastVulnerableClass[0]) {
+                        if (cls.equals(vulnerableClass)) {
+                            pastVulnerableClass[0] = true;
+                        }
+                        return false;
+                    }
+                    // Skip remaining frames from the vulnerable class itself
+                    if (cls.equals(vulnerableClass)) {
+                        return false;
+                    }
+                    // Skip intermediate library frames so we report client code, not a wrapper library
+                    return ScaStackExclusionTrie.apply(cls) < 1;
+                })
+                .findFirst()
+                .orElse(null);
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaReachabilityTransformer.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaReachabilityTransformer.java
index 397bd9f3027..d86354e2b8b 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaReachabilityTransformer.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaReachabilityTransformer.java
@@ -52,597 +52,590 @@
  */
 public final class ScaReachabilityTransformer implements ClassFileTransformer {
 
-  private static final Logger log = LoggerFactory.getLogger(ScaReachabilityTransformer.class);
-  private static final Pattern PATH_SEPARATOR = Pattern.compile(Pattern.quote(File.pathSeparator));
-
-  /**
-   * Maximum number of retransform attempts for a class whose watched artifact never resolves as a
-   * dependency. Beyond this cap the class is given up on, so that a permanently unresolvable
-   * artifact (e.g. embedded Tomcat) cannot re-queue itself forever and cause unbounded {@link
-   * Instrumentation#retransformClasses} calls. See APPSEC-69734.
-   */
-  @VisibleForTesting static final int MAX_UNRESOLVED_RETRIES = 5;
-
-  private final ScaCveDatabase database;
-  private final Instrumentation instrumentation;
-
-  /**
-   * Cache: JAR URI → resolved dependencies. URI is used instead of URL to avoid DNS lookups in
-   * equals/hashCode (DMI_COLLECTION_OF_URLS). Only non-empty results are cached to allow retries.
-   */
-  @VisibleForTesting
-  final ConcurrentHashMap<URI, List<Dependency>> jarCache = new ConcurrentHashMap<>();
-
-  /**
-   * Cache: artifact name → classpath-resolved {@link Dependency}. Stores the full dependency (name
-   * + version) so that the resolved {@code dep.name} — which may be an artifactId-only name like
-   * {@code "junrar"} for JARs without pom.properties — is propagated to {@code registerCve} and
-   * kept consistent with the name that {@link datadog.telemetry.dependency.DependencyService} will
-   * report. Only non-null results are cached; null means "not yet found" and will be retried on the
-   * next periodic retransform.
-   */
-  @VisibleForTesting
-  final ConcurrentHashMap<String, Dependency> classpathArtifactCache = new ConcurrentHashMap<>();
-
-  /**
-   * Batches of classes whose bytecode needs (re)transformation for method-level symbol injection:
-   *
-   * <ul>
-   *   <li>Classes already loaded at startup before this transformer was registered (queued as a
-   *       single shared batch by {@link #checkAlreadyLoadedClasses()}).
-   *   <li>Batches that failed {@code retransformClasses()} and were bisected into halves (see
-   *       {@link #performPendingRetransforms()}).
-   * </ul>
-   *
-   * <p>Each element is retransformed via its own {@code retransformClasses()} call, independently
-   * of the other batches, so an unrelated failure in one batch never affects another. Drained and
-   * processed by {@link #performPendingRetransforms()} on each telemetry heartbeat.
-   */
-  @VisibleForTesting
-  final ConcurrentLinkedQueue<List<Class<?>>> pendingRetransform = new ConcurrentLinkedQueue<>();
-
-  /** Class names (internal format) queued for deferred retransformation by name lookup. */
-  @VisibleForTesting final Set<String> pendingRetransformNames = ConcurrentHashMap.newKeySet();
-
-  /**
-   * Class name (internal format) → number of retransform attempts already spent on a class whose
-   * watched artifact could not be resolved. Capped by {@link #MAX_UNRESOLVED_RETRIES}.
-   *
-   * <p>Known limitation: keyed only by class name, never reset. If a class name exhausts the cap
-   * during one class-load lifecycle (e.g. a classloader that is later discarded) and the same name
-   * is loaded again later (redeploy, new classloader instance) with a classpath that would now
-   * resolve the artifact, the new load inherits the exhausted count and gives up immediately
-   * instead of getting its own {@value #MAX_UNRESOLVED_RETRIES} attempts. Accepted: this requires
-   * the same class name to be reloaded within the same JVM process after already exhausting the
-   * cap, which is rare, and the map's unbounded lifetime is otherwise fine (bounded by the number
-   * of distinct watched classes).
-   */
-  @VisibleForTesting
-  final ConcurrentHashMap<String, Integer> unresolvedAttemptCounts = new ConcurrentHashMap<>();
-
-  /**
-   * Class names (internal format) whose unresolved-retry attempt has already been counted during
-   * the current heartbeat. A single {@link #performPendingRetransforms()} call retransforms every
-   * loaded {@code Class<?>} sharing the same name (e.g. one copy per Spring Boot {@code
-   * LaunchedURLClassLoader}), each triggering its own {@code processClass()} invocation; this set
-   * makes them count as one attempt instead of N. Cleared at the start of every heartbeat.
-   *
-   * <p>Plain {@link HashSet}: {@link #performPendingRetransforms()} runs single-threaded and never
-   * concurrently with itself, and {@code processClass()} is invoked synchronously from within its
-   * {@code retransformClasses()} calls.
-   */
-  @VisibleForTesting final Set<String> countedThisHeartbeat = new HashSet<>();
-
-  public ScaReachabilityTransformer(ScaCveDatabase database, Instrumentation instrumentation) {
-    this.database = database;
-    this.instrumentation = instrumentation;
-  }
-
-  // ---------------------------------------------------------------------------
-  // ClassFileTransformer
-  // ---------------------------------------------------------------------------
-
-  @Override
-  public byte[] transform(
-      ClassLoader loader,
-      String className,
-      Class<?> classBeingRedefined,
-      ProtectionDomain protectionDomain,
-      byte[] classfileBuffer) {
-    try {
-      // Filter array types (e.g. "[Ljava/sql/PreparedStatement;").
-      if (className == null || className.charAt(0) == '[') {
-        return null;
-      }
+    private static final Logger log = LoggerFactory.getLogger(ScaReachabilityTransformer.class);
+    private static final Pattern PATH_SEPARATOR = Pattern.compile(Pattern.quote(File.pathSeparator));
+
+    /**
+     * Maximum number of retransform attempts for a class whose watched artifact never resolves as a
+     * dependency. Beyond this cap the class is given up on, so that a permanently unresolvable
+     * artifact (e.g. embedded Tomcat) cannot re-queue itself forever and cause unbounded {@link
+     * Instrumentation#retransformClasses} calls. See APPSEC-69734.
+     */
+    @VisibleForTesting
+    static final int MAX_UNRESOLVED_RETRIES = 5;
+
+    private final ScaCveDatabase database;
+    private final Instrumentation instrumentation;
+
+    /**
+     * Cache: JAR URI → resolved dependencies. URI is used instead of URL to avoid DNS lookups in
+     * equals/hashCode (DMI_COLLECTION_OF_URLS). Only non-empty results are cached to allow retries.
+     */
+    @VisibleForTesting
+    final ConcurrentHashMap<URI, List<Dependency>> jarCache = new ConcurrentHashMap<>();
+
+    /**
+     * Cache: artifact name → classpath-resolved {@link Dependency}. Stores the full dependency (name
+     * + version) so that the resolved {@code dep.name} — which may be an artifactId-only name like
+     * {@code "junrar"} for JARs without pom.properties — is propagated to {@code registerCve} and
+     * kept consistent with the name that {@link datadog.telemetry.dependency.DependencyService} will
+     * report. Only non-null results are cached; null means "not yet found" and will be retried on the
+     * next periodic retransform.
+     */
+    @VisibleForTesting
+    final ConcurrentHashMap<String, Dependency> classpathArtifactCache = new ConcurrentHashMap<>();
+
+    /**
+     * Batches of classes whose bytecode needs (re)transformation for method-level symbol injection:
+     *
+     * <ul>
+     *   <li>Classes already loaded at startup before this transformer was registered (queued as a
+     *       single shared batch by {@link #checkAlreadyLoadedClasses()}).
+     *   <li>Batches that failed {@code retransformClasses()} and were bisected into halves (see
+     *       {@link #performPendingRetransforms()}).
+     * </ul>
+     *
+     * <p>Each element is retransformed via its own {@code retransformClasses()} call, independently
+     * of the other batches, so an unrelated failure in one batch never affects another. Drained and
+     * processed by {@link #performPendingRetransforms()} on each telemetry heartbeat.
+     */
+    @VisibleForTesting
+    final ConcurrentLinkedQueue<List<Class<?>>> pendingRetransform = new ConcurrentLinkedQueue<>();
+
+    /** Class names (internal format) queued for deferred retransformation by name lookup. */
+    @VisibleForTesting
+    final Set<String> pendingRetransformNames = ConcurrentHashMap.newKeySet();
+
+    /**
+     * Class name (internal format) → number of retransform attempts already spent on a class whose
+     * watched artifact could not be resolved. Capped by {@link #MAX_UNRESOLVED_RETRIES}.
+     *
+     * <p>Known limitation: keyed only by class name, never reset. If a class name exhausts the cap
+     * during one class-load lifecycle (e.g. a classloader that is later discarded) and the same name
+     * is loaded again later (redeploy, new classloader instance) with a classpath that would now
+     * resolve the artifact, the new load inherits the exhausted count and gives up immediately
+     * instead of getting its own {@value #MAX_UNRESOLVED_RETRIES} attempts. Accepted: this requires
+     * the same class name to be reloaded within the same JVM process after already exhausting the
+     * cap, which is rare, and the map's unbounded lifetime is otherwise fine (bounded by the number
+     * of distinct watched classes).
+     */
+    @VisibleForTesting
+    final ConcurrentHashMap<String, Integer> unresolvedAttemptCounts = new ConcurrentHashMap<>();
+
+    /**
+     * Class names (internal format) whose unresolved-retry attempt has already been counted during
+     * the current heartbeat. A single {@link #performPendingRetransforms()} call retransforms every
+     * loaded {@code Class<?>} sharing the same name (e.g. one copy per Spring Boot {@code
+     * LaunchedURLClassLoader}), each triggering its own {@code processClass()} invocation; this set
+     * makes them count as one attempt instead of N. Cleared at the start of every heartbeat.
+     *
+     * <p>Plain {@link HashSet}: {@link #performPendingRetransforms()} runs single-threaded and never
+     * concurrently with itself, and {@code processClass()} is invoked synchronously from within its
+     * {@code retransformClasses()} calls.
+     */
+    @VisibleForTesting
+    final Set<String> countedThisHeartbeat = new HashSet<>();
+
+    public ScaReachabilityTransformer(ScaCveDatabase database, Instrumentation instrumentation) {
+        this.database = database;
+        this.instrumentation = instrumentation;
+    }
 
-      // JDK/bootstrap classes (protectionDomain == null) are skipped - they are loaded regardless
-      // of which library is present and are not reliable reachability indicators.
-      if (protectionDomain == null) {
+    // ---------------------------------------------------------------------------
+    // ClassFileTransformer
+    // ---------------------------------------------------------------------------
+
+    @Override
+    public byte[] transform(
+            ClassLoader loader,
+            String className,
+            Class<?> classBeingRedefined,
+            ProtectionDomain protectionDomain,
+            byte[] classfileBuffer) {
+        try {
+            // Filter array types (e.g. "[Ljava/sql/PreparedStatement;").
+            if (className == null || className.charAt(0) == '[') {
+                return null;
+            }
+
+            // JDK/bootstrap classes (protectionDomain == null) are skipped - they are loaded regardless
+            // of which library is present and are not reliable reachability indicators.
+            if (protectionDomain == null) {
+                return null;
+            }
+
+            List<ScaEntry> entries = database.entriesForClass(className);
+            if (entries == null) {
+                return null;
+            }
+
+            CodeSource codeSource = protectionDomain.getCodeSource();
+            if (codeSource == null) {
+                return null; // runtime-generated class (dynamic proxy, lambda, etc.)
+            }
+            URL location = codeSource.getLocation();
+            if (location == null) {
+                return null;
+            }
+
+            if (classBeingRedefined == null) {
+                // First load: schedule a retransform for the next telemetry heartbeat so that JAR I/O
+                // (DependencyResolver.resolve) does not run on the class-loading thread.
+                pendingRetransformNames.add(className);
+                return null;
+            }
+
+            // Retransform triggered by performPendingRetransforms() after version resolution succeeds:
+            // inject method-level callbacks into the bytecode and return the modified bytes.
+            return processClass(className, location, entries, classfileBuffer);
+        } catch (Throwable t) {
+            // Never propagate from transform() - it would break the class being loaded.
+            log.debug("SCA Reachability: error processing class {}", className, t);
+        }
         return null;
-      }
+    }
 
-      List<ScaEntry> entries = database.entriesForClass(className);
-      if (entries == null) {
-        return null;
-      }
-
-      CodeSource codeSource = protectionDomain.getCodeSource();
-      if (codeSource == null) {
-        return null; // runtime-generated class (dynamic proxy, lambda, etc.)
-      }
-      URL location = codeSource.getLocation();
-      if (location == null) {
-        return null;
-      }
+    /**
+     * Injects method-level callbacks into the bytecode of a class being retransformed.
+     *
+     * <p>Called only on retransformation ({@code classBeingRedefined != null}), triggered by {@link
+     * #performPendingRetransforms}.
+     *
+     * <p>Returns modified bytecode if method-level callbacks were injected, or {@code null} if
+     * version resolution failed (no bytecode change needed; will be retried on the next heartbeat).
+     */
+    private byte[] processClass(String className, URL jarUrl, List<ScaEntry> entries, byte[] classfileBuffer) {
+        // Cache-only: processClass() runs under JVM retransform locks; no fresh JAR I/O here.
+        List<Dependency> classJarDeps = resolveDependenciesFromCache(jarUrl);
+
+        // Collect method-level callbacks to inject, keyed by method name
+        Map<String, List<MethodCallbackSpec>> methodCallbacks = new HashMap<>();
+        boolean hasUnresolvedMethodLevelSymbols = false;
+        // Computed lazily: only needed for method-level symbol injection.
+        String dotClassName = null;
+
+        for (ScaEntry entry : entries) {
+            // Resolve the dependency for this artifact: first check the class's own JAR, then fall back
+            // to a full classpath scan. The fallback handles aggregator/starter POM artifacts whose
+            // watched classes actually live in a transitive dependency JAR (e.g., spring-boot-starter-web
+            // watches @Controller, but @Controller is in spring-context.jar).
+            //
+            // We use the resolved dep's name (not entry.artifact()) for registerCve and
+            // MethodCallbackSpec
+            // to ensure that the registry key matches the name that DependencyService will later report.
+            // For JARs without pom.properties, DependencyResolver.guessFallbackNoPom produces an
+            // artifactId-only name (e.g. "junrar" instead of "com.github.junrar:junrar"). Using
+            // entry.artifact() as the registry key would cause a mismatch with DependencyService's name,
+            // causing the CVE telemetry event to lose its source/hash or appear under the wrong name.
+            Dependency resolvedDep = resolveArtifactDep(entry.artifact(), classJarDeps);
+            if (resolvedDep == null) {
+                hasUnresolvedMethodLevelSymbols = true;
+                continue;
+            }
+            String version = resolvedDep.version;
+            String depName = resolvedDep.name != null ? resolvedDep.name : entry.artifact();
+
+            if (!entry.isVersionVulnerable(version)) {
+                continue;
+            }
+
+            for (ScaSymbol symbol : entry.symbols()) {
+                if (!symbol.className().equals(className)) {
+                    continue;
+                }
+                // Register the CVE now (at class load time) with reached=[] so the next heartbeat
+                // signals the backend that SCA is monitoring this CVE. The callsite will be added
+                // later when the method is actually called (via ScaReachabilityCallback).
+                ScaReachabilityDependencyRegistry.INSTANCE.registerCve(depName, version, entry.vulnId());
+                if (dotClassName == null) {
+                    dotClassName = Strings.getClassName(className);
+                }
+                methodCallbacks
+                        .computeIfAbsent(symbol.method(), k -> new ArrayList<>())
+                        .add(new MethodCallbackSpec(entry.vulnId(), depName, version, dotClassName, symbol.method()));
+            }
+        }
 
-      if (classBeingRedefined == null) {
-        // First load: schedule a retransform for the next telemetry heartbeat so that JAR I/O
-        // (DependencyResolver.resolve) does not run on the class-loading thread.
-        pendingRetransformNames.add(className);
-        return null;
-      }
-
-      // Retransform triggered by performPendingRetransforms() after version resolution succeeds:
-      // inject method-level callbacks into the bytecode and return the modified bytes.
-      return processClass(className, location, entries, classfileBuffer);
-    } catch (Throwable t) {
-      // Never propagate from transform() - it would break the class being loaded.
-      log.debug("SCA Reachability: error processing class {}", className, t);
-    }
-    return null;
-  }
-
-  /**
-   * Injects method-level callbacks into the bytecode of a class being retransformed.
-   *
-   * <p>Called only on retransformation ({@code classBeingRedefined != null}), triggered by {@link
-   * #performPendingRetransforms}.
-   *
-   * <p>Returns modified bytecode if method-level callbacks were injected, or {@code null} if
-   * version resolution failed (no bytecode change needed; will be retried on the next heartbeat).
-   */
-  private byte[] processClass(
-      String className, URL jarUrl, List<ScaEntry> entries, byte[] classfileBuffer) {
-    // Cache-only: processClass() runs under JVM retransform locks; no fresh JAR I/O here.
-    List<Dependency> classJarDeps = resolveDependenciesFromCache(jarUrl);
-
-    // Collect method-level callbacks to inject, keyed by method name
-    Map<String, List<MethodCallbackSpec>> methodCallbacks = new HashMap<>();
-    boolean hasUnresolvedMethodLevelSymbols = false;
-    // Computed lazily: only needed for method-level symbol injection.
-    String dotClassName = null;
-
-    for (ScaEntry entry : entries) {
-      // Resolve the dependency for this artifact: first check the class's own JAR, then fall back
-      // to a full classpath scan. The fallback handles aggregator/starter POM artifacts whose
-      // watched classes actually live in a transitive dependency JAR (e.g., spring-boot-starter-web
-      // watches @Controller, but @Controller is in spring-context.jar).
-      //
-      // We use the resolved dep's name (not entry.artifact()) for registerCve and
-      // MethodCallbackSpec
-      // to ensure that the registry key matches the name that DependencyService will later report.
-      // For JARs without pom.properties, DependencyResolver.guessFallbackNoPom produces an
-      // artifactId-only name (e.g. "junrar" instead of "com.github.junrar:junrar"). Using
-      // entry.artifact() as the registry key would cause a mismatch with DependencyService's name,
-      // causing the CVE telemetry event to lose its source/hash or appear under the wrong name.
-      Dependency resolvedDep = resolveArtifactDep(entry.artifact(), classJarDeps);
-      if (resolvedDep == null) {
-        hasUnresolvedMethodLevelSymbols = true;
-        continue;
-      }
-      String version = resolvedDep.version;
-      String depName = resolvedDep.name != null ? resolvedDep.name : entry.artifact();
-
-      if (!entry.isVersionVulnerable(version)) {
-        continue;
-      }
-
-      for (ScaSymbol symbol : entry.symbols()) {
-        if (!symbol.className().equals(className)) {
-          continue;
+        if (hasUnresolvedMethodLevelSymbols) {
+            // Schedule retransformation for a later attempt. In transform(), classBeingRedefined is
+            // null (first class load), so we don't have a Class<?> handle to put directly into
+            // pendingRetransform. Instead we queue the internal class name; performPendingRetransforms()
+            // will resolve it back to a Class<?> via instrumentation.getAllLoadedClasses() and
+            // retransform.
+            //
+            // The retry is capped (APPSEC-69734): some watched artifacts can never resolve (e.g. an
+            // embedded-Tomcat app that only ships tomcat-embed-core will never resolve tomcat or
+            // tomcat-coyote), and an uncapped re-queue means one retransformClasses() call per heartbeat
+            // forever, with a permanent stop-the-world / metaspace cost even though the bytecode never
+            // changes. The cap is uniform: it does not matter which resolution path failed.
+            boolean firstThisHeartbeat = countedThisHeartbeat.add(className);
+            int attempts;
+            if (firstThisHeartbeat) {
+                attempts = unresolvedAttemptCounts.merge(className, 1, Integer::sum);
+            } else {
+                // Another classloader's copy of the same class already counted this heartbeat: reuse the
+                // current count instead of counting the same heartbeat twice.
+                attempts = unresolvedAttemptCounts.getOrDefault(className, 0);
+            }
+            if (attempts < MAX_UNRESOLVED_RETRIES) {
+                pendingRetransformNames.add(className);
+            } else if (firstThisHeartbeat) {
+                // Reached only on the transition from "allowed" to "capped": once given up, the class is
+                // never re-queued, so this logs at most once per class.
+                log.debug(
+                        "SCA Reachability: giving up resolving unresolved artifact(s) for class {} after {}"
+                                + " heartbeats",
+                        className,
+                        attempts);
+            }
         }
-        // Register the CVE now (at class load time) with reached=[] so the next heartbeat
-        // signals the backend that SCA is monitoring this CVE. The callsite will be added
-        // later when the method is actually called (via ScaReachabilityCallback).
-        ScaReachabilityDependencyRegistry.INSTANCE.registerCve(depName, version, entry.vulnId());
-        if (dotClassName == null) {
-          dotClassName = Strings.getClassName(className);
+
+        if (methodCallbacks.isEmpty()) {
+            return null;
         }
-        methodCallbacks
-            .computeIfAbsent(symbol.method(), k -> new ArrayList<>())
-            .add(
-                new MethodCallbackSpec(
-                    entry.vulnId(), depName, version, dotClassName, symbol.method()));
-      }
+        return ScaMethodCallbackInjector.inject(classfileBuffer, methodCallbacks);
     }
 
-    if (hasUnresolvedMethodLevelSymbols) {
-      // Schedule retransformation for a later attempt. In transform(), classBeingRedefined is
-      // null (first class load), so we don't have a Class<?> handle to put directly into
-      // pendingRetransform. Instead we queue the internal class name; performPendingRetransforms()
-      // will resolve it back to a Class<?> via instrumentation.getAllLoadedClasses() and
-      // retransform.
-      //
-      // The retry is capped (APPSEC-69734): some watched artifacts can never resolve (e.g. an
-      // embedded-Tomcat app that only ships tomcat-embed-core will never resolve tomcat or
-      // tomcat-coyote), and an uncapped re-queue means one retransformClasses() call per heartbeat
-      // forever, with a permanent stop-the-world / metaspace cost even though the bytecode never
-      // changes. The cap is uniform: it does not matter which resolution path failed.
-      boolean firstThisHeartbeat = countedThisHeartbeat.add(className);
-      int attempts;
-      if (firstThisHeartbeat) {
-        attempts = unresolvedAttemptCounts.merge(className, 1, Integer::sum);
-      } else {
-        // Another classloader's copy of the same class already counted this heartbeat: reuse the
-        // current count instead of counting the same heartbeat twice.
-        attempts = unresolvedAttemptCounts.getOrDefault(className, 0);
-      }
-      if (attempts < MAX_UNRESOLVED_RETRIES) {
-        pendingRetransformNames.add(className);
-      } else if (firstThisHeartbeat) {
-        // Reached only on the transition from "allowed" to "capped": once given up, the class is
-        // never re-queued, so this logs at most once per class.
-        log.debug(
-            "SCA Reachability: giving up resolving unresolved artifact(s) for class {} after {}"
-                + " heartbeats",
-            className,
-            attempts);
-      }
+    // ---------------------------------------------------------------------------
+    // Startup scan for already-loaded classes
+    // ---------------------------------------------------------------------------
+
+    /**
+     * Checks classes already loaded before this transformer was registered.
+     *
+     * <p>Only processes 3rd-party classes (non-null {@link ProtectionDomain} with a code source). JDK
+     * classes are skipped: they are always loaded regardless of which library is in the classpath and
+     * would produce false positives if used as reachability proxies. See APPSEC-62260.
+     */
+    public void checkAlreadyLoadedClasses() {
+        List<Class<?>> toRetransform = new ArrayList<>();
+        for (Class<?> clazz : instrumentation.getAllLoadedClasses()) {
+            if (clazz == null) {
+                continue;
+            }
+            String internalName = clazz.getName().replace('.', '/');
+            if (internalName.charAt(0) == '[') {
+                continue;
+            }
+            List<ScaEntry> entries = database.entriesForClass(internalName);
+            if (entries == null) {
+                continue;
+            }
+
+            ProtectionDomain pd = clazz.getProtectionDomain();
+            URL location = locationOf(pd);
+            if (location == null) {
+                // JDK/bootstrap class (no code source): skip - false positive, see class Javadoc.
+                continue;
+            }
+            // All symbols are method-level: always schedule retransformation so the bytecode
+            // callback can be injected. We can't modify bytecode during the startup scan; deferred
+            // to performPendingRetransforms().
+            toRetransform.add(clazz);
+        }
+        if (!toRetransform.isEmpty()) {
+            // Queued as a single shared batch: the common case is that all of these classes retransform
+            // successfully together, so this keeps the startup scan to one retransformClasses() call
+            // instead of one per already-loaded class. If the batch does fail,
+            // performPendingRetransforms()
+            // bisects it on the next heartbeat like any other batch.
+            pendingRetransform.add(toRetransform);
+        }
     }
 
-    if (methodCallbacks.isEmpty()) {
-      return null;
-    }
-    return ScaMethodCallbackInjector.inject(classfileBuffer, methodCallbacks);
-  }
-
-  // ---------------------------------------------------------------------------
-  // Startup scan for already-loaded classes
-  // ---------------------------------------------------------------------------
-
-  /**
-   * Checks classes already loaded before this transformer was registered.
-   *
-   * <p>Only processes 3rd-party classes (non-null {@link ProtectionDomain} with a code source). JDK
-   * classes are skipped: they are always loaded regardless of which library is in the classpath and
-   * would produce false positives if used as reachability proxies. See APPSEC-62260.
-   */
-  public void checkAlreadyLoadedClasses() {
-    List<Class<?>> toRetransform = new ArrayList<>();
-    for (Class<?> clazz : instrumentation.getAllLoadedClasses()) {
-      if (clazz == null) {
-        continue;
-      }
-      String internalName = clazz.getName().replace('.', '/');
-      if (internalName.charAt(0) == '[') {
-        continue;
-      }
-      List<ScaEntry> entries = database.entriesForClass(internalName);
-      if (entries == null) {
-        continue;
-      }
-
-      ProtectionDomain pd = clazz.getProtectionDomain();
-      URL location = locationOf(pd);
-      if (location == null) {
-        // JDK/bootstrap class (no code source): skip - false positive, see class Javadoc.
-        continue;
-      }
-      // All symbols are method-level: always schedule retransformation so the bytecode
-      // callback can be injected. We can't modify bytecode during the startup scan; deferred
-      // to performPendingRetransforms().
-      toRetransform.add(clazz);
-    }
-    if (!toRetransform.isEmpty()) {
-      // Queued as a single shared batch: the common case is that all of these classes retransform
-      // successfully together, so this keeps the startup scan to one retransformClasses() call
-      // instead of one per already-loaded class. If the batch does fail,
-      // performPendingRetransforms()
-      // bisects it on the next heartbeat like any other batch.
-      pendingRetransform.add(toRetransform);
-    }
-  }
-
-  /**
-   * Retransforms classes scheduled for method-level bytecode injection:
-   *
-   * <ol>
-   *   <li>Classes detected on first load ({@link #transform} adds them to {@link
-   *       #pendingRetransformNames}).
-   *   <li>Classes already loaded before the transformer was registered ({@link
-   *       #checkAlreadyLoadedClasses}).
-   *   <li>Classes whose JAR version could not be resolved (will be retried).
-   * </ol>
-   *
-   * <p>Called by {@code ScaReachabilityPeriodicAction} on each telemetry heartbeat via the {@code
-   * periodicWorkCallback} registered in {@link ScaReachabilityDependencyRegistry}.
-   */
-  public void performPendingRetransforms() {
-    // Start a fresh heartbeat: unresolved-retry attempts are counted at most once per class name
-    // per heartbeat, no matter how many classloaders loaded that same class.
-    countedThisHeartbeat.clear();
-
-    if (instrumentation == null) {
-      return; // no-op when instrumentation is unavailable (e.g. in unit tests)
-    }
-    // Drain the batch queue (from checkAlreadyLoadedClasses and prior bisections), dropping any
-    // classes that are no longer modifiable from within each batch while preserving the rest of
-    // that batch's grouping.
-    List<List<Class<?>>> batches = new ArrayList<>();
-    List<Class<?>> batch;
-    while ((batch = pendingRetransform.poll()) != null) {
-      batch.removeIf(c -> !instrumentation.isModifiableClass(c));
-      if (!batch.isEmpty()) {
-        batches.add(batch);
-      }
-    }
+    /**
+     * Retransforms classes scheduled for method-level bytecode injection:
+     *
+     * <ol>
+     *   <li>Classes detected on first load ({@link #transform} adds them to {@link
+     *       #pendingRetransformNames}).
+     *   <li>Classes already loaded before the transformer was registered ({@link
+     *       #checkAlreadyLoadedClasses}).
+     *   <li>Classes whose JAR version could not be resolved (will be retried).
+     * </ol>
+     *
+     * <p>Called by {@code ScaReachabilityPeriodicAction} on each telemetry heartbeat via the {@code
+     * periodicWorkCallback} registered in {@link ScaReachabilityDependencyRegistry}.
+     */
+    public void performPendingRetransforms() {
+        // Start a fresh heartbeat: unresolved-retry attempts are counted at most once per class name
+        // per heartbeat, no matter how many classloaders loaded that same class.
+        countedThisHeartbeat.clear();
+
+        if (instrumentation == null) {
+            return; // no-op when instrumentation is unavailable (e.g. in unit tests)
+        }
+        // Drain the batch queue (from checkAlreadyLoadedClasses and prior bisections), dropping any
+        // classes that are no longer modifiable from within each batch while preserving the rest of
+        // that batch's grouping.
+        List<List<Class<?>>> batches = new ArrayList<>();
+        List<Class<?>> batch;
+        while ((batch = pendingRetransform.poll()) != null) {
+            batch.removeIf(c -> !instrumentation.isModifiableClass(c));
+            if (!batch.isEmpty()) {
+                batches.add(batch);
+            }
+        }
 
-    // Resolve any classes queued by name (from processClass timing failures) into their own
-    // batch. Use contains+removeAll instead of remove inside the loop: the same class may be
-    // loaded by multiple classloaders (e.g. Spring Boot LaunchedURLClassLoader creates more than
-    // one instance), and we must retransform ALL of them, not just the first one found.
-    if (!pendingRetransformNames.isEmpty()) {
-      Set<String> matched = new HashSet<>();
-      List<Class<?>> resolved = new ArrayList<>();
-      for (Class<?> loaded : instrumentation.getAllLoadedClasses()) {
-        if (loaded == null) {
-          continue;
+        // Resolve any classes queued by name (from processClass timing failures) into their own
+        // batch. Use contains+removeAll instead of remove inside the loop: the same class may be
+        // loaded by multiple classloaders (e.g. Spring Boot LaunchedURLClassLoader creates more than
+        // one instance), and we must retransform ALL of them, not just the first one found.
+        if (!pendingRetransformNames.isEmpty()) {
+            Set<String> matched = new HashSet<>();
+            List<Class<?>> resolved = new ArrayList<>();
+            for (Class<?> loaded : instrumentation.getAllLoadedClasses()) {
+                if (loaded == null) {
+                    continue;
+                }
+                String name = loaded.getName().replace('.', '/');
+                if (pendingRetransformNames.contains(name)) {
+                    // Always add to matched to drain the pending set; only retransform if modifiable.
+                    matched.add(name);
+                    if (instrumentation.isModifiableClass(loaded)) {
+                        resolved.add(loaded);
+                    }
+                }
+            }
+            pendingRetransformNames.removeAll(matched);
+            if (!resolved.isEmpty()) {
+                batches.add(resolved);
+            }
         }
-        String name = loaded.getName().replace('.', '/');
-        if (pendingRetransformNames.contains(name)) {
-          // Always add to matched to drain the pending set; only retransform if modifiable.
-          matched.add(name);
-          if (instrumentation.isModifiableClass(loaded)) {
-            resolved.add(loaded);
-          }
+
+        if (batches.isEmpty()) {
+            return;
+        }
+
+        // Pre-warm caches before retransformClasses() acquires JVM locks — no JAR I/O inside the
+        // callback.
+        // Two paths in processClass() can trigger fresh JAR I/O under locks:
+        //   1. resolveDependenciesFromCache() — safe only if jarCache is already populated.
+        //   2. resolveArtifactDep() → findArtifactInClasspath() for aggregator artifacts (e.g.,
+        //      spring-boot-starter-web) whose pom.properties is not in the class's own JAR.
+        //      Without pre-warming classpathArtifactCache, this scans all java.class.path JARs via
+        //      resolveDependencies() under JVM locks, reintroducing the snakeyaml deadlock.
+        for (List<Class<?>> b : batches) {
+            for (Class<?> c : b) {
+                ProtectionDomain pd = c.getProtectionDomain();
+                if (pd == null) {
+                    continue;
+                }
+                CodeSource cs = pd.getCodeSource();
+                if (cs == null) {
+                    continue;
+                }
+                URL loc = cs.getLocation();
+                if (loc == null) {
+                    continue;
+                }
+                resolveDependencies(loc);
+                String internalName = c.getName().replace('.', '/');
+                List<ScaEntry> dbEntries = database.entriesForClass(internalName);
+                if (dbEntries != null) {
+                    List<Dependency> classJarDeps = resolveDependenciesFromCache(loc);
+                    for (ScaEntry entry : dbEntries) {
+                        resolveVersionForArtifact(entry.artifact(), classJarDeps);
+                    }
+                }
+            }
         }
-      }
-      pendingRetransformNames.removeAll(matched);
-      if (!resolved.isEmpty()) {
-        batches.add(resolved);
-      }
-    }
 
-    if (batches.isEmpty()) {
-      return;
+        // Each batch is retransformed independently: a failure in one batch never affects another,
+        // and a failing multi-class batch is bisected rather than dropped as a whole.
+        for (List<Class<?>> b : batches) {
+            retransformBatch(b);
+        }
     }
 
-    // Pre-warm caches before retransformClasses() acquires JVM locks — no JAR I/O inside the
-    // callback.
-    // Two paths in processClass() can trigger fresh JAR I/O under locks:
-    //   1. resolveDependenciesFromCache() — safe only if jarCache is already populated.
-    //   2. resolveArtifactDep() → findArtifactInClasspath() for aggregator artifacts (e.g.,
-    //      spring-boot-starter-web) whose pom.properties is not in the class's own JAR.
-    //      Without pre-warming classpathArtifactCache, this scans all java.class.path JARs via
-    //      resolveDependencies() under JVM locks, reintroducing the snakeyaml deadlock.
-    for (List<Class<?>> b : batches) {
-      for (Class<?> c : b) {
-        ProtectionDomain pd = c.getProtectionDomain();
-        if (pd == null) {
-          continue;
+    /**
+     * Attempts {@code retransformClasses()} for a single batch. On failure, a multi-class batch is
+     * bisected into two halves that are re-queued as independent batches for the next heartbeat —
+     * never retried within this same call — so that a healthy class is progressively isolated from an
+     * unrelated, permanently-failing batch-mate instead of being dropped alongside it. Once a batch
+     * is down to a single class, a further failure of that class means it has already been proven to
+     * be the actual cause (or, for a class that started as a singleton, that its very first attempt
+     * failed): it is dropped immediately rather than retried, so it never leaks its {@code Class<?>}
+     * (and {@code ClassLoader}) in Metaspace. See APPSEC-69201 for the trade-off this implies.
+     */
+    private void retransformBatch(List<Class<?>> batch) {
+        try {
+            instrumentation.retransformClasses(batch.toArray(new Class<?>[0]));
+            log.debug("SCA Reachability: retransformed {} class(es) for method-level detection", batch.size());
+        } catch (Throwable t) {
+            log.debug("SCA Reachability: retransformClasses failed for a batch of {} class(es)", batch.size(), t);
+            if (batch.size() == 1) {
+                log.debug(
+                        "SCA Reachability: giving up retransforming {} after a failed attempt as a singleton"
+                                + " batch",
+                        batch.get(0).getName());
+            } else {
+                int mid = batch.size() / 2;
+                pendingRetransform.add(new ArrayList<>(batch.subList(0, mid)));
+                pendingRetransform.add(new ArrayList<>(batch.subList(mid, batch.size())));
+                log.debug(
+                        "SCA Reachability: bisecting failing batch of {} class(es) into two halves for the"
+                                + " next heartbeat",
+                        batch.size());
+            }
         }
-        CodeSource cs = pd.getCodeSource();
-        if (cs == null) {
-          continue;
+    }
+
+    // ---------------------------------------------------------------------------
+    // Internal matching logic
+    // ---------------------------------------------------------------------------
+
+    /**
+     * Resolves the {@link Dependency} for {@code artifactName} (groupId:artifactId format), returning
+     * the matched dependency object — which may have an artifactId-only {@code name} for JARs without
+     * {@code pom.properties}. Returns {@code null} if the artifact cannot be found.
+     *
+     * <p>Use this method (not {@link #resolveVersionForArtifact}) whenever the resolved dependency
+     * name needs to be propagated (e.g., for {@code registerCve} and {@code MethodCallbackSpec}), so
+     * that registry keys stay consistent with the names that {@link
+     * datadog.telemetry.dependency.DependencyService} will report.
+     */
+    @VisibleForTesting
+    Dependency resolveArtifactDep(String artifactName, List<Dependency> classJarDeps) {
+        Dependency dep = matchDep(artifactName, classJarDeps);
+        if (dep != null) {
+            return dep;
         }
-        URL loc = cs.getLocation();
-        if (loc == null) {
-          continue;
+        // Classpath fallback: check cache first, then scan.
+        Dependency cached = classpathArtifactCache.get(artifactName);
+        if (cached != null) {
+            return cached;
         }
-        resolveDependencies(loc);
-        String internalName = c.getName().replace('.', '/');
-        List<ScaEntry> dbEntries = database.entriesForClass(internalName);
-        if (dbEntries != null) {
-          List<Dependency> classJarDeps = resolveDependenciesFromCache(loc);
-          for (ScaEntry entry : dbEntries) {
-            resolveVersionForArtifact(entry.artifact(), classJarDeps);
-          }
+        dep = findArtifactInClasspath(artifactName);
+        if (dep != null) {
+            classpathArtifactCache.put(artifactName, dep); // only cache hits; misses are retried
         }
-      }
+        return dep;
     }
 
-    // Each batch is retransformed independently: a failure in one batch never affects another,
-    // and a failing multi-class batch is bisected rather than dropped as a whole.
-    for (List<Class<?>> b : batches) {
-      retransformBatch(b);
-    }
-  }
-
-  /**
-   * Attempts {@code retransformClasses()} for a single batch. On failure, a multi-class batch is
-   * bisected into two halves that are re-queued as independent batches for the next heartbeat —
-   * never retried within this same call — so that a healthy class is progressively isolated from an
-   * unrelated, permanently-failing batch-mate instead of being dropped alongside it. Once a batch
-   * is down to a single class, a further failure of that class means it has already been proven to
-   * be the actual cause (or, for a class that started as a singleton, that its very first attempt
-   * failed): it is dropped immediately rather than retried, so it never leaks its {@code Class<?>}
-   * (and {@code ClassLoader}) in Metaspace. See APPSEC-69201 for the trade-off this implies.
-   */
-  private void retransformBatch(List<Class<?>> batch) {
-    try {
-      instrumentation.retransformClasses(batch.toArray(new Class<?>[0]));
-      log.debug(
-          "SCA Reachability: retransformed {} class(es) for method-level detection", batch.size());
-    } catch (Throwable t) {
-      log.debug(
-          "SCA Reachability: retransformClasses failed for a batch of {} class(es)",
-          batch.size(),
-          t);
-      if (batch.size() == 1) {
-        log.debug(
-            "SCA Reachability: giving up retransforming {} after a failed attempt as a singleton"
-                + " batch",
-            batch.get(0).getName());
-      } else {
-        int mid = batch.size() / 2;
-        pendingRetransform.add(new ArrayList<>(batch.subList(0, mid)));
-        pendingRetransform.add(new ArrayList<>(batch.subList(mid, batch.size())));
-        log.debug(
-            "SCA Reachability: bisecting failing batch of {} class(es) into two halves for the"
-                + " next heartbeat",
-            batch.size());
-      }
-    }
-  }
-
-  // ---------------------------------------------------------------------------
-  // Internal matching logic
-  // ---------------------------------------------------------------------------
-
-  /**
-   * Resolves the {@link Dependency} for {@code artifactName} (groupId:artifactId format), returning
-   * the matched dependency object — which may have an artifactId-only {@code name} for JARs without
-   * {@code pom.properties}. Returns {@code null} if the artifact cannot be found.
-   *
-   * <p>Use this method (not {@link #resolveVersionForArtifact}) whenever the resolved dependency
-   * name needs to be propagated (e.g., for {@code registerCve} and {@code MethodCallbackSpec}), so
-   * that registry keys stay consistent with the names that {@link
-   * datadog.telemetry.dependency.DependencyService} will report.
-   */
-  @VisibleForTesting
-  Dependency resolveArtifactDep(String artifactName, List<Dependency> classJarDeps) {
-    Dependency dep = matchDep(artifactName, classJarDeps);
-    if (dep != null) {
-      return dep;
-    }
-    // Classpath fallback: check cache first, then scan.
-    Dependency cached = classpathArtifactCache.get(artifactName);
-    if (cached != null) {
-      return cached;
+    @VisibleForTesting
+    String resolveVersionForArtifact(String artifactName, List<Dependency> classJarDeps) {
+        Dependency dep = resolveArtifactDep(artifactName, classJarDeps);
+        return dep != null ? dep.version : null;
     }
-    dep = findArtifactInClasspath(artifactName);
-    if (dep != null) {
-      classpathArtifactCache.put(artifactName, dep); // only cache hits; misses are retried
+
+    /**
+     * Matches {@code artifactName} (groupId:artifactId format) against a list of dependencies,
+     * returning the matched {@link Dependency} object (not just the version).
+     *
+     * <p>First tries an exact name match. If that fails, falls back to matching by artifact ID only.
+     * The fallback handles JARs without {@code pom.properties}: {@code Dependency.guessFallbackNoPom}
+     * can only extract the artifact ID from the filename (no group ID), producing names like {@code
+     * "junrar"} for {@code com.github.junrar:junrar}. The returned dependency's {@code name} reflects
+     * what {@link datadog.telemetry.dependency.DependencyService} will report for that JAR.
+     */
+    @VisibleForTesting
+    static Dependency matchDep(String artifactName, List<Dependency> deps) {
+        for (Dependency dep : deps) {
+            if (artifactName.equals(dep.name)) {
+                return dep;
+            }
+        }
+        int colonIdx = artifactName.lastIndexOf(':');
+        if (colonIdx < 0) {
+            return null;
+        }
+        String artifactId = artifactName.substring(colonIdx + 1);
+        for (Dependency dep : deps) {
+            if (dep.name != null && !dep.name.contains(":") && artifactId.equals(dep.name) && dep.version != null) {
+                return dep;
+            }
+        }
+        return null;
     }
-    return dep;
-  }
-
-  @VisibleForTesting
-  String resolveVersionForArtifact(String artifactName, List<Dependency> classJarDeps) {
-    Dependency dep = resolveArtifactDep(artifactName, classJarDeps);
-    return dep != null ? dep.version : null;
-  }
-
-  /**
-   * Matches {@code artifactName} (groupId:artifactId format) against a list of dependencies,
-   * returning the matched {@link Dependency} object (not just the version).
-   *
-   * <p>First tries an exact name match. If that fails, falls back to matching by artifact ID only.
-   * The fallback handles JARs without {@code pom.properties}: {@code Dependency.guessFallbackNoPom}
-   * can only extract the artifact ID from the filename (no group ID), producing names like {@code
-   * "junrar"} for {@code com.github.junrar:junrar}. The returned dependency's {@code name} reflects
-   * what {@link datadog.telemetry.dependency.DependencyService} will report for that JAR.
-   */
-  @VisibleForTesting
-  static Dependency matchDep(String artifactName, List<Dependency> deps) {
-    for (Dependency dep : deps) {
-      if (artifactName.equals(dep.name)) {
-        return dep;
-      }
+
+    /**
+     * Matches {@code artifactName} against a list of dependencies, returning the resolved version
+     * string. Delegates to {@link #matchDep} — use that method when the full dependency object is
+     * needed.
+     */
+    @VisibleForTesting
+    static String matchVersion(String artifactName, List<Dependency> deps) {
+        Dependency dep = matchDep(artifactName, deps);
+        return dep != null ? dep.version : null;
     }
-    int colonIdx = artifactName.lastIndexOf(':');
-    if (colonIdx < 0) {
-      return null;
+
+    private Dependency findArtifactInClasspath(String artifactName) {
+        // Use URI (not URL) to avoid DNS lookups in equals/hashCode (DMI_COLLECTION_OF_URLS)
+        Set<URI> scanned = new HashSet<>();
+
+        // AgentThreadFactory sets context classloader to null on agent threads, so a URLClassLoader
+        // chain walk would never execute here. Scan java.class.path directly — this covers both Java 8
+        // and Java 9+ for standard deployments. OSGi / multi-tenant apps and Spring Boot fat JARs with
+        // dynamically loaded bundle classloaders are a known limitation: version resolution for
+        // aggregator artifacts may fail in those environments, falling back to retrying on the next
+        // heartbeat.
+        String classpath = System.getProperty("java.class.path", "");
+        for (String entry : PATH_SEPARATOR.split(classpath)) {
+            if (entry.isEmpty()) {
+                continue;
+            }
+            try {
+                URI uri = new File(entry).toURI();
+                if (scanned.add(uri)) {
+                    Dependency dep = matchDep(artifactName, resolveDependencies(uri.toURL()));
+                    if (dep != null) {
+                        return dep;
+                    }
+                }
+            } catch (Exception e) {
+                log.debug("SCA Reachability: could not scan classpath entry {}", entry, e);
+            }
+        }
+        return null;
     }
-    String artifactId = artifactName.substring(colonIdx + 1);
-    for (Dependency dep : deps) {
-      if (dep.name != null
-          && !dep.name.contains(":")
-          && artifactId.equals(dep.name)
-          && dep.version != null) {
-        return dep;
-      }
+
+    @VisibleForTesting
+    String findArtifactVersionInClasspath(String artifactName) {
+        Dependency dep = findArtifactInClasspath(artifactName);
+        return dep != null ? dep.version : null;
     }
-    return null;
-  }
-
-  /**
-   * Matches {@code artifactName} against a list of dependencies, returning the resolved version
-   * string. Delegates to {@link #matchDep} — use that method when the full dependency object is
-   * needed.
-   */
-  @VisibleForTesting
-  static String matchVersion(String artifactName, List<Dependency> deps) {
-    Dependency dep = matchDep(artifactName, deps);
-    return dep != null ? dep.version : null;
-  }
-
-  private Dependency findArtifactInClasspath(String artifactName) {
-    // Use URI (not URL) to avoid DNS lookups in equals/hashCode (DMI_COLLECTION_OF_URLS)
-    Set<URI> scanned = new HashSet<>();
-
-    // AgentThreadFactory sets context classloader to null on agent threads, so a URLClassLoader
-    // chain walk would never execute here. Scan java.class.path directly — this covers both Java 8
-    // and Java 9+ for standard deployments. OSGi / multi-tenant apps and Spring Boot fat JARs with
-    // dynamically loaded bundle classloaders are a known limitation: version resolution for
-    // aggregator artifacts may fail in those environments, falling back to retrying on the next
-    // heartbeat.
-    String classpath = System.getProperty("java.class.path", "");
-    for (String entry : PATH_SEPARATOR.split(classpath)) {
-      if (entry.isEmpty()) {
-        continue;
-      }
-      try {
-        URI uri = new File(entry).toURI();
-        if (scanned.add(uri)) {
-          Dependency dep = matchDep(artifactName, resolveDependencies(uri.toURL()));
-          if (dep != null) {
-            return dep;
-          }
+
+    private List<Dependency> resolveDependenciesFromCache(URL url) {
+        try {
+            List<Dependency> cached = jarCache.get(url.toURI());
+            return cached != null ? cached : Collections.emptyList();
+        } catch (Exception e) {
+            // URISyntaxException from url.toURI() — should not happen for JAR URLs from protection domain
+            log.debug("SCA Reachability: could not read jarCache for {}", url, e);
+            return Collections.emptyList();
         }
-      } catch (Exception e) {
-        log.debug("SCA Reachability: could not scan classpath entry {}", entry, e);
-      }
     }
-    return null;
-  }
-
-  @VisibleForTesting
-  String findArtifactVersionInClasspath(String artifactName) {
-    Dependency dep = findArtifactInClasspath(artifactName);
-    return dep != null ? dep.version : null;
-  }
-
-  private List<Dependency> resolveDependenciesFromCache(URL url) {
-    try {
-      List<Dependency> cached = jarCache.get(url.toURI());
-      return cached != null ? cached : Collections.emptyList();
-    } catch (Exception e) {
-      // URISyntaxException from url.toURI() — should not happen for JAR URLs from protection domain
-      log.debug("SCA Reachability: could not read jarCache for {}", url, e);
-      return Collections.emptyList();
+
+    @VisibleForTesting
+    List<Dependency> resolveDependencies(URL url) {
+        try {
+            URI uri = url.toURI();
+            List<Dependency> cached = jarCache.get(uri);
+            if (cached != null) {
+                return cached;
+            }
+            List<Dependency> resolved = DependencyResolver.resolve(uri);
+            if (resolved == null) {
+                resolved = Collections.emptyList();
+            }
+            // Only cache non-empty results: empty means the JAR had no pom.properties, which may be
+            // a transient failure. Not caching allows the periodic retransform to retry successfully.
+            if (!resolved.isEmpty()) {
+                List<Dependency> existing = jarCache.putIfAbsent(uri, resolved);
+                return existing != null ? existing : resolved;
+            }
+            return resolved;
+        } catch (Exception e) {
+            log.debug("SCA Reachability: could not resolve {}", url, e);
+            return Collections.emptyList();
+        }
     }
-  }
-
-  @VisibleForTesting
-  List<Dependency> resolveDependencies(URL url) {
-    try {
-      URI uri = url.toURI();
-      List<Dependency> cached = jarCache.get(uri);
-      if (cached != null) {
-        return cached;
-      }
-      List<Dependency> resolved = DependencyResolver.resolve(uri);
-      if (resolved == null) {
-        resolved = Collections.emptyList();
-      }
-      // Only cache non-empty results: empty means the JAR had no pom.properties, which may be
-      // a transient failure. Not caching allows the periodic retransform to retry successfully.
-      if (!resolved.isEmpty()) {
-        List<Dependency> existing = jarCache.putIfAbsent(uri, resolved);
-        return existing != null ? existing : resolved;
-      }
-      return resolved;
-    } catch (Exception e) {
-      log.debug("SCA Reachability: could not resolve {}", url, e);
-      return Collections.emptyList();
+
+    private static URL locationOf(ProtectionDomain pd) {
+        if (pd == null) return null;
+        CodeSource cs = pd.getCodeSource();
+        if (cs == null) return null;
+        return cs.getLocation();
     }
-  }
-
-  private static URL locationOf(ProtectionDomain pd) {
-    if (pd == null) return null;
-    CodeSource cs = pd.getCodeSource();
-    if (cs == null) return null;
-    return cs.getLocation();
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaSymbol.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaSymbol.java
index e2185125118..974df5f3839 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaSymbol.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaSymbol.java
@@ -3,21 +3,21 @@
 /** A single method-level symbol from sca_cves.json: a class and method to watch for. */
 public final class ScaSymbol {
 
-  private final String className; // JVM internal format: "com/foo/Bar"
-  private final String method;
+    private final String className; // JVM internal format: "com/foo/Bar"
+    private final String method;
 
-  public ScaSymbol(String className, String method) {
-    this.className = className;
-    this.method = method;
-  }
+    public ScaSymbol(String className, String method) {
+        this.className = className;
+        this.method = method;
+    }
 
-  /** JVM internal class name with slashes, e.g. {@code "com/foo/Bar"}. */
-  public String className() {
-    return className;
-  }
+    /** JVM internal class name with slashes, e.g. {@code "com/foo/Bar"}. */
+    public String className() {
+        return className;
+    }
 
-  /** Method name for method-level tracking, e.g. {@code "readValue"}. */
-  public String method() {
-    return method;
-  }
+    /** Method name for method-level tracking, e.g. {@code "readValue"}. */
+    public String method() {
+        return method;
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/VersionRangeParser.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/VersionRangeParser.java
index f95e11d6064..88690aaef30 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/VersionRangeParser.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/VersionRangeParser.java
@@ -26,60 +26,70 @@
  */
 public final class VersionRangeParser {
 
-  private static final Pattern COMMA = Pattern.compile(",");
+    private static final Pattern COMMA = Pattern.compile(",");
 
-  private VersionRangeParser() {}
+    private VersionRangeParser() {}
 
-  /**
-   * Returns true if {@code version} matches at least one of the provided range strings.
-   *
-   * @param version the version to test (e.g. {@code "2.8.5"} or {@code "5.2.19.RELEASE"})
-   * @param versionRanges list of range strings from sca_cves.json
-   * @return true if the version falls within any range
-   */
-  public static boolean matchesAny(String version, List<String> versionRanges) {
-    if (version == null || version.isEmpty() || versionRanges == null || versionRanges.isEmpty()) {
-      return false;
-    }
-    ComparableVersion v = new ComparableVersion(version);
-    for (String range : versionRanges) {
-      if (matchesRange(v, range)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Returns true if {@code version} matches a single range string. Multiple conditions within a
-   * single string (comma-separated) are evaluated as AND.
-   */
-  static boolean matchesRange(ComparableVersion version, String versionRange) {
-    String[] conditions = COMMA.split(versionRange);
-    for (String condition : conditions) {
-      if (!matchesCondition(version, condition.trim())) {
+    /**
+     * Returns true if {@code version} matches at least one of the provided range strings.
+     *
+     * @param version the version to test (e.g. {@code "2.8.5"} or {@code "5.2.19.RELEASE"})
+     * @param versionRanges list of range strings from sca_cves.json
+     * @return true if the version falls within any range
+     */
+    public static boolean matchesAny(String version, List<String> versionRanges) {
+        if (version == null || version.isEmpty() || versionRanges == null || versionRanges.isEmpty()) {
+            return false;
+        }
+        ComparableVersion v = new ComparableVersion(version);
+        for (String range : versionRanges) {
+            if (matchesRange(v, range)) {
+                return true;
+            }
+        }
         return false;
-      }
     }
-    return true;
-  }
 
-  private static boolean matchesCondition(ComparableVersion version, String condition) {
-    if (condition.startsWith(">=")) {
-      return version.compareTo(new ComparableVersion(condition.substring(2).trim())) >= 0;
-    }
-    if (condition.startsWith("<=")) {
-      return version.compareTo(new ComparableVersion(condition.substring(2).trim())) <= 0;
-    }
-    if (condition.startsWith(">")) {
-      return version.compareTo(new ComparableVersion(condition.substring(1).trim())) > 0;
-    }
-    if (condition.startsWith("<")) {
-      return version.compareTo(new ComparableVersion(condition.substring(1).trim())) < 0;
+    /**
+     * Returns true if {@code version} matches a single range string. Multiple conditions within a
+     * single string (comma-separated) are evaluated as AND.
+     */
+    static boolean matchesRange(ComparableVersion version, String versionRange) {
+        String[] conditions = COMMA.split(versionRange);
+        for (String condition : conditions) {
+            if (!matchesCondition(version, condition.trim())) {
+                return false;
+            }
+        }
+        return true;
     }
-    if (condition.startsWith("=")) {
-      return version.compareTo(new ComparableVersion(condition.substring(1).trim())) == 0;
+
+    private static boolean matchesCondition(ComparableVersion version, String condition) {
+        if (condition.startsWith(">=")) {
+            return version.compareTo(
+                            new ComparableVersion(condition.substring(2).trim()))
+                    >= 0;
+        }
+        if (condition.startsWith("<=")) {
+            return version.compareTo(
+                            new ComparableVersion(condition.substring(2).trim()))
+                    <= 0;
+        }
+        if (condition.startsWith(">")) {
+            return version.compareTo(
+                            new ComparableVersion(condition.substring(1).trim()))
+                    > 0;
+        }
+        if (condition.startsWith("<")) {
+            return version.compareTo(
+                            new ComparableVersion(condition.substring(1).trim()))
+                    < 0;
+        }
+        if (condition.startsWith("=")) {
+            return version.compareTo(
+                            new ComparableVersion(condition.substring(1).trim()))
+                    == 0;
+        }
+        throw new IllegalArgumentException("Unrecognised version condition: '" + condition + "'");
     }
-    throw new IllegalArgumentException("Unrecognised version condition: '" + condition + "'");
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/AbortStartupException.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/AbortStartupException.java
index da85e4e8737..3cc5e17e9bd 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/AbortStartupException.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/AbortStartupException.java
@@ -1,11 +1,11 @@
 package com.datadog.appsec.util;
 
 public class AbortStartupException extends RuntimeException {
-  public AbortStartupException(String message, Throwable cause) {
-    super(message, cause);
-  }
+    public AbortStartupException(String message, Throwable cause) {
+        super(message, cause);
+    }
 
-  public AbortStartupException(Throwable cause) {
-    super(cause);
-  }
+    public AbortStartupException(Throwable cause) {
+        super(cause);
+    }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/AppSecVersion.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/AppSecVersion.java
index 8e2b9577014..903c362dcc7 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/AppSecVersion.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/AppSecVersion.java
@@ -7,30 +7,25 @@
 import java.io.InputStreamReader;
 
 public class AppSecVersion {
-  public static final String JAVA_VERSION =
-      SystemProperties.getOrDefault("java.version", "unknown");
-  public static final String JAVA_VM_NAME =
-      SystemProperties.getOrDefault("java.vm.name", "unknown");
-  public static final String JAVA_VM_VENDOR =
-      SystemProperties.getOrDefault("java.vm.vendor", "unknown");
-  public static final String VERSION;
+    public static final String JAVA_VERSION = SystemProperties.getOrDefault("java.version", "unknown");
+    public static final String JAVA_VM_NAME = SystemProperties.getOrDefault("java.vm.name", "unknown");
+    public static final String JAVA_VM_VENDOR = SystemProperties.getOrDefault("java.vm.vendor", "unknown");
+    public static final String VERSION;
 
-  static {
-    String v;
-    try (final BufferedReader br =
-        new BufferedReader(
-            new InputStreamReader(
-                AppSecVersion.class.getResourceAsStream("/appsec.version"), UTF_8))) {
-      final StringBuilder sb = new StringBuilder();
+    static {
+        String v;
+        try (final BufferedReader br = new BufferedReader(
+                new InputStreamReader(AppSecVersion.class.getResourceAsStream("/appsec.version"), UTF_8))) {
+            final StringBuilder sb = new StringBuilder();
 
-      for (int c = br.read(); c != -1; c = br.read()) {
-        sb.append((char) c);
-      }
+            for (int c = br.read(); c != -1; c = br.read()) {
+                sb.append((char) c);
+            }
 
-      v = sb.toString().trim();
-    } catch (final Exception e) {
-      v = "unknown";
+            v = sb.toString().trim();
+        } catch (final Exception e) {
+            v = "unknown";
+        }
+        VERSION = v;
     }
-    VERSION = v;
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/BodyParser.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/BodyParser.java
index f7f8a4ce668..20f61b4a557 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/BodyParser.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/BodyParser.java
@@ -20,126 +20,125 @@
 
 public interface BodyParser {
 
-  Object parse(State state, InputStream inputStream);
+    Object parse(State state, InputStream inputStream);
 
-  static BodyParser forJson() {
-    return JsonParser.INSTANCE;
-  }
+    static BodyParser forJson() {
+        return JsonParser.INSTANCE;
+    }
 
-  static BodyParser forMediaType(final MediaType type) {
-    if (type.isJson()) {
-      return JsonParser.INSTANCE;
+    static BodyParser forMediaType(final MediaType type) {
+        if (type.isJson()) {
+            return JsonParser.INSTANCE;
+        }
+        return null;
     }
-    return null;
-  }
-
-  static BodyParser forMediaType(final String type) {
-    return forMediaType(MediaType.parse(type));
-  }
-
-  class State {
-    private int elemsLeft = MAX_ELEMENTS;
-    public boolean objectTooDeep = false;
-    public boolean listMapTooLarge = false;
-    public boolean stringTooLong = false;
-  }
-
-  class JsonParser implements BodyParser {
-
-    private static final BodyParser INSTANCE = new JsonParser();
-
-    @Override
-    public Object parse(final State state, final InputStream inputStream) {
-      try {
-        final JsonAdapter<Object> adapter = new BoundedObjectAdapter(state);
-        return adapter.fromJson(Okio.buffer(Okio.source(inputStream)));
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
+
+    static BodyParser forMediaType(final String type) {
+        return forMediaType(MediaType.parse(type));
     }
 
-    private static final class BoundedObjectAdapter extends JsonAdapter<Object> {
+    class State {
+        private int elemsLeft = MAX_ELEMENTS;
+        public boolean objectTooDeep = false;
+        public boolean listMapTooLarge = false;
+        public boolean stringTooLong = false;
+    }
 
-      private final State state;
+    class JsonParser implements BodyParser {
 
-      public BoundedObjectAdapter(final State state) {
-        this.state = state;
-      }
+        private static final BodyParser INSTANCE = new JsonParser();
 
-      @Generated
-      @Override
-      public void toJson(final JsonWriter writer, @Nullable final Object value) throws IOException {
-        throw new UnsupportedOperationException("Parsing-only adapter");
-      }
+        @Override
+        public Object parse(final State state, final InputStream inputStream) {
+            try {
+                final JsonAdapter<Object> adapter = new BoundedObjectAdapter(state);
+                return adapter.fromJson(Okio.buffer(Okio.source(inputStream)));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
 
-      @Override
-      public Object fromJson(final JsonReader reader) throws IOException {
-        return readValue(reader, 0);
-      }
+        private static final class BoundedObjectAdapter extends JsonAdapter<Object> {
 
-      private Object readValue(final JsonReader r, final int depth) throws IOException {
-        if (depth >= MAX_DEPTH) {
-          state.objectTooDeep = true;
-          r.skipValue();
-          return null;
-        }
+            private final State state;
 
-        if (state.elemsLeft-- == 0) {
-          state.listMapTooLarge = true;
-          r.skipValue();
-          return null;
-        }
+            public BoundedObjectAdapter(final State state) {
+                this.state = state;
+            }
 
-        switch (r.peek()) {
-          case BEGIN_OBJECT:
-            return readObject(r, depth);
-          case BEGIN_ARRAY:
-            return readArray(r, depth);
-          case STRING:
-            String value = r.nextString();
-            if (value.length() > MAX_STRING_SIZE) {
-              state.stringTooLong = true;
-              value = value.substring(0, MAX_STRING_SIZE);
+            @Generated
+            @Override
+            public void toJson(final JsonWriter writer, @Nullable final Object value) throws IOException {
+                throw new UnsupportedOperationException("Parsing-only adapter");
+            }
+
+            @Override
+            public Object fromJson(final JsonReader reader) throws IOException {
+                return readValue(reader, 0);
+            }
+
+            private Object readValue(final JsonReader r, final int depth) throws IOException {
+                if (depth >= MAX_DEPTH) {
+                    state.objectTooDeep = true;
+                    r.skipValue();
+                    return null;
+                }
+
+                if (state.elemsLeft-- == 0) {
+                    state.listMapTooLarge = true;
+                    r.skipValue();
+                    return null;
+                }
+
+                switch (r.peek()) {
+                    case BEGIN_OBJECT:
+                        return readObject(r, depth);
+                    case BEGIN_ARRAY:
+                        return readArray(r, depth);
+                    case STRING:
+                        String value = r.nextString();
+                        if (value.length() > MAX_STRING_SIZE) {
+                            state.stringTooLong = true;
+                            value = value.substring(0, MAX_STRING_SIZE);
+                        }
+                        return value;
+                    case NUMBER:
+                        return r.nextDouble();
+                    case BOOLEAN:
+                        return r.nextBoolean();
+                    case NULL:
+                        return r.nextNull();
+                    default:
+                        throw new JsonDataException("Unexpected token at value boundary: " + r.peek());
+                }
+            }
+
+            private Map<String, Object> readObject(final JsonReader r, final int depth) throws IOException {
+                Map<String, Object> map = new LinkedHashMap<>();
+                r.beginObject();
+                while (r.hasNext()) {
+                    String name = r.nextName();
+                    Object val = readValue(r, depth + 1);
+                    if (!state.listMapTooLarge) {
+                        map.put(name, val);
+                    }
+                }
+                r.endObject();
+                return map;
+            }
+
+            private List<Object> readArray(final JsonReader r, final int depth) throws IOException {
+                List<Object> list = new ArrayList<>();
+                r.beginArray();
+                while (r.hasNext()) {
+                    Object value = readValue(r, depth + 1);
+                    if (!state.listMapTooLarge) {
+                        list.add(value);
+                    }
+                }
+                r.endArray();
+                return list;
             }
-            return value;
-          case NUMBER:
-            return r.nextDouble();
-          case BOOLEAN:
-            return r.nextBoolean();
-          case NULL:
-            return r.nextNull();
-          default:
-            throw new JsonDataException("Unexpected token at value boundary: " + r.peek());
-        }
-      }
-
-      private Map<String, Object> readObject(final JsonReader r, final int depth)
-          throws IOException {
-        Map<String, Object> map = new LinkedHashMap<>();
-        r.beginObject();
-        while (r.hasNext()) {
-          String name = r.nextName();
-          Object val = readValue(r, depth + 1);
-          if (!state.listMapTooLarge) {
-            map.put(name, val);
-          }
-        }
-        r.endObject();
-        return map;
-      }
-
-      private List<Object> readArray(final JsonReader r, final int depth) throws IOException {
-        List<Object> list = new ArrayList<>();
-        r.beginArray();
-        while (r.hasNext()) {
-          Object value = readValue(r, depth + 1);
-          if (!state.listMapTooLarge) {
-            list.add(value);
-          }
         }
-        r.endArray();
-        return list;
-      }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/StandardizedLogging.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/StandardizedLogging.java
index 73374f113d2..8b0cb4568a5 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/StandardizedLogging.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/StandardizedLogging.java
@@ -12,235 +12,234 @@
 
 public class StandardizedLogging {
 
-  private static final Marker CRITICAL = MarkerFactory.getMarker("CRITICAL");
-
-  public static void appSecStartupError(Logger logger, Throwable t) { // C1
-    logger.error(
-        CRITICAL,
-        "AppSec could not start because of an unexpected error. "
-            + "No security activities will be collected. Please contact support at "
-            + "https://docs.datadoghq.com/help/ for help.",
-        t);
-  }
-
-  /*
-   * C2: AppSec could not start because the current environment is not supported.
-   *    No security activities will be collected. Please contact support at
-   *    https://docs.datadoghq.com/help/ for help.
-   *    Host information: { operating_system: <OS, e.g. win 32 bits>,
-   *    libc: <libc e.g. musl>, arch: <e.g. arm>,
-   *    runtime_infos: <arbitrary string about the runtime, e.g. openJdk-vX.Y> }"
-   *
-   * This cannot be fully implemented inside the appsec module because some failures
-   * may be due to incompatible JVM (e.g. running on Java 7).
-   */
-
-  // C3
-  public static void libddwafCannotBeLoaded(Logger logger, String libc) {
-    logger.error(
-        CRITICAL,
-        "AppSec could not load libddwaf native library, as a result, "
-            + "AppSec could not start. No security activities will be collected. "
-            + "Please contact support at https://docs.datadoghq.com/help/ for help. "
-            + "Host information: operating_system: {}, libc: {}, arch: {}, runtime: {} {}",
-        SystemProperties.get("os.name"),
-        libc,
-        SystemProperties.get("os.arch"),
-        SystemProperties.get("java.vm.vendor"),
-        SystemProperties.get("java.version"));
-  }
-
-  // C4:
-  public static void rulesFileNotFound(Logger logger, String filename) {
-    logger.error(
-        CRITICAL,
-        "AppSec could not find the rules file in path {}. "
-            + "AppSec will not run any protections in this application. No security activities will be collected.",
-        filename);
-  }
-
-  public enum RulesInvalidReason {
-    INVALID_JSON_FILE {
-      @Override
-      public String toString() {
-        return "invalid JSON file";
-      }
-    };
-
-    //   ALL_RULES_INVALID {
-    //      @Override
-    //      public String toString() {
-    //        return "all the rules are invalid";
-    //      }
-    //    }
-
-    public abstract String toString();
-  }
-
-  /* C5: Cannot be fully implemented: notice that all rules are invalid needs cooperation from libddwaf */
-  public static void rulesFileInvalid(Logger logger, String filename, RulesInvalidReason reason) {
-    logger.error(
-        CRITICAL,
-        "AppSec could not read the rule file {} as it was invalid: {}. "
-            + "AppSec will not run any protections in this application.",
-        filename,
-        reason);
-  }
-
-  /*
-   * E1: Some rules are invalid in <path_to_rules_file>:
-   *     <for (ruleName, invalidReason) in invalid_rules:>
-   *       <ruleName>: <invalidReason>"
-   *
-   * Cannot be implemented without cooperation from libddwaf
-   */
-
-  /*
-   * D1: Loaded rules:
-   *     <for (ruleName,ruleAddresses) in valid_rules:>
-   *       <ruleName> on addresses <ruleAddresses>"
-   *
-   * Cannot be implemented without cooperation from libddwaf
-   */
-
-  /*
-   * D2: Pushing address <address_name> to the Instrumentation Gateway.
-   *
-   * Not implemented literally; IG doesn't push addresses in Java.
-   */
-  public static void addressPushed(Logger logger, Address<?> address) {
-    logger.debug("Address {} pushed into request context", address.getKey());
-  }
-
-  /*
-   * D3: Available addresses <available_addresses> match needs for rules <rules_names>
-   *
-   * Cannot be implemented without cooperation from libddwaf. At the AppSec level,
-   * addresses match listeners, not rules: e.g. the WAF has a whole matches a set
-   * of addresses, not individual WAF rules.
-   */
-
-  /*
-   * D4: Executing AppSec In-App WAF with parameters: <Parameters_passed_to_the_lib>
-   *
-   * Not implemented: traversing the parameters may have side effects. We could
-   * dump the parameters after the conversion, but the conversion happens inside
-   * the binding, not on this module.
-   */
-
-  // D5
-  public static void inAppWafReturn(Logger logger, Waf.ResultWithData resultWithData) {
-    logger.debug("AppSec In-App WAF returned: {}", resultWithData);
-  }
-
-  // D6, I5
-  public static void attackDetected(Logger logger, AppSecEvent event) {
-    String ruleId = "unknown rule";
-    Rule rule = event.getRule();
-    if (rule != null) {
-      ruleId = rule.id;
+    private static final Marker CRITICAL = MarkerFactory.getMarker("CRITICAL");
+
+    public static void appSecStartupError(Logger logger, Throwable t) { // C1
+        logger.error(
+                CRITICAL,
+                "AppSec could not start because of an unexpected error. "
+                        + "No security activities will be collected. Please contact support at "
+                        + "https://docs.datadoghq.com/help/ for help.",
+                t);
     }
 
-    if (logger.isDebugEnabled()) {
-      logger.info("Detecting an attack from rule {}", ruleId);
+    /*
+     * C2: AppSec could not start because the current environment is not supported.
+     *    No security activities will be collected. Please contact support at
+     *    https://docs.datadoghq.com/help/ for help.
+     *    Host information: { operating_system: <OS, e.g. win 32 bits>,
+     *    libc: <libc e.g. musl>, arch: <e.g. arm>,
+     *    runtime_infos: <arbitrary string about the runtime, e.g. openJdk-vX.Y> }"
+     *
+     * This cannot be fully implemented inside the appsec module because some failures
+     * may be due to incompatible JVM (e.g. running on Java 7).
+     */
+
+    // C3
+    public static void libddwafCannotBeLoaded(Logger logger, String libc) {
+        logger.error(
+                CRITICAL,
+                "AppSec could not load libddwaf native library, as a result, "
+                        + "AppSec could not start. No security activities will be collected. "
+                        + "Please contact support at https://docs.datadoghq.com/help/ for help. "
+                        + "Host information: operating_system: {}, libc: {}, arch: {}, runtime: {} {}",
+                SystemProperties.get("os.name"),
+                libc,
+                SystemProperties.get("os.arch"),
+                SystemProperties.get("java.vm.vendor"),
+                SystemProperties.get("java.version"));
     }
-    logger.debug("Detecting an attack from rule {}: {}", ruleId, event.getRuleMatches());
-  }
-
-  /*
-   * D7: Rule <rule_name> failed. Error details: ${Error message and stack trace} "
-   *
-   * Cannot implement: rules are currently only known by libddwaf
-   */
-
-  /*
-   * D8: AppSec Error. Error details: ${Error message and stack trace}
-   *
-   * Seems to be a catch-all for errors not covered by other entries.
-   * The AppSec module is entered through the following points:
-   *   - initialization — covered by other messages
-   *   - IG — the instrumentation gateway already catches exceptions that
-   *     propagate from its callbacks, which shouldn't happen anyway.
-   *   - Attack reporting thread — covered by other messages.
-   *   - Fleet management thread (currently unused)
-   *
-   * Not currently used. It could be used for internal callback errors:
-   * events/data event callbacks. But these are reported at higher logging
-   * levels, since they ought not to occur. In general, it's difficult to
-   * imagine a situation where this should be used rather than a more
-   * serious logging entry.
-   */
-
-  // E1
-  public static void attackReportingFailed(Logger logger, Throwable t) {
-    logger.warn("AppSec failed to report AppSec events to the agent.", t);
-  }
-
-  /* I1: AppSec starting with the following configuration: {
-   *       rules_file_path: <path_to_rule_files>, libddwaf_version: <libbddwaf version>
-   *     }
-   *
-   * Not implemented because configuration and starting are different events.
-   * Configuration can happen after starting (through fleet service).
-   * The following nonstandard alternative was instead chosen.
-   */
-  public static void _initialConfigSourceAndLibddwafVersion(Logger logger, String source) {
-    if (logger.isDebugEnabled()) {
-      logger.info(
-          "AppSec initial configuration from {}, libddwaf version: {}", source, Waf.LIB_VERSION);
+
+    // C4:
+    public static void rulesFileNotFound(Logger logger, String filename) {
+        logger.error(
+                CRITICAL,
+                "AppSec could not find the rules file in path {}. "
+                        + "AppSec will not run any protections in this application. No security activities will be collected.",
+                filename);
+    }
+
+    public enum RulesInvalidReason {
+        INVALID_JSON_FILE {
+            @Override
+            public String toString() {
+                return "invalid JSON file";
+            }
+        };
+
+        //   ALL_RULES_INVALID {
+        //      @Override
+        //      public String toString() {
+        //        return "all the rules are invalid";
+        //      }
+        //    }
+
+        public abstract String toString();
+    }
+
+    /* C5: Cannot be fully implemented: notice that all rules are invalid needs cooperation from libddwaf */
+    public static void rulesFileInvalid(Logger logger, String filename, RulesInvalidReason reason) {
+        logger.error(
+                CRITICAL,
+                "AppSec could not read the rule file {} as it was invalid: {}. "
+                        + "AppSec will not run any protections in this application.",
+                filename,
+                reason);
+    }
+
+    /*
+     * E1: Some rules are invalid in <path_to_rules_file>:
+     *     <for (ruleName, invalidReason) in invalid_rules:>
+     *       <ruleName>: <invalidReason>"
+     *
+     * Cannot be implemented without cooperation from libddwaf
+     */
+
+    /*
+     * D1: Loaded rules:
+     *     <for (ruleName,ruleAddresses) in valid_rules:>
+     *       <ruleName> on addresses <ruleAddresses>"
+     *
+     * Cannot be implemented without cooperation from libddwaf
+     */
+
+    /*
+     * D2: Pushing address <address_name> to the Instrumentation Gateway.
+     *
+     * Not implemented literally; IG doesn't push addresses in Java.
+     */
+    public static void addressPushed(Logger logger, Address<?> address) {
+        logger.debug("Address {} pushed into request context", address.getKey());
+    }
+
+    /*
+     * D3: Available addresses <available_addresses> match needs for rules <rules_names>
+     *
+     * Cannot be implemented without cooperation from libddwaf. At the AppSec level,
+     * addresses match listeners, not rules: e.g. the WAF has a whole matches a set
+     * of addresses, not individual WAF rules.
+     */
+
+    /*
+     * D4: Executing AppSec In-App WAF with parameters: <Parameters_passed_to_the_lib>
+     *
+     * Not implemented: traversing the parameters may have side effects. We could
+     * dump the parameters after the conversion, but the conversion happens inside
+     * the binding, not on this module.
+     */
+
+    // D5
+    public static void inAppWafReturn(Logger logger, Waf.ResultWithData resultWithData) {
+        logger.debug("AppSec In-App WAF returned: {}", resultWithData);
+    }
+
+    // D6, I5
+    public static void attackDetected(Logger logger, AppSecEvent event) {
+        String ruleId = "unknown rule";
+        Rule rule = event.getRule();
+        if (rule != null) {
+            ruleId = rule.id;
+        }
+
+        if (logger.isDebugEnabled()) {
+            logger.info("Detecting an attack from rule {}", ruleId);
+        }
+        logger.debug("Detecting an attack from rule {}: {}", ruleId, event.getRuleMatches());
+    }
+
+    /*
+     * D7: Rule <rule_name> failed. Error details: ${Error message and stack trace} "
+     *
+     * Cannot implement: rules are currently only known by libddwaf
+     */
+
+    /*
+     * D8: AppSec Error. Error details: ${Error message and stack trace}
+     *
+     * Seems to be a catch-all for errors not covered by other entries.
+     * The AppSec module is entered through the following points:
+     *   - initialization — covered by other messages
+     *   - IG — the instrumentation gateway already catches exceptions that
+     *     propagate from its callbacks, which shouldn't happen anyway.
+     *   - Attack reporting thread — covered by other messages.
+     *   - Fleet management thread (currently unused)
+     *
+     * Not currently used. It could be used for internal callback errors:
+     * events/data event callbacks. But these are reported at higher logging
+     * levels, since they ought not to occur. In general, it's difficult to
+     * imagine a situation where this should be used rather than a more
+     * serious logging entry.
+     */
+
+    // E1
+    public static void attackReportingFailed(Logger logger, Throwable t) {
+        logger.warn("AppSec failed to report AppSec events to the agent.", t);
     }
-  }
 
-  // I2
-  public static void numLoadedRules(Logger logger, String source, int numRules) {
-    if (logger.isDebugEnabled()) {
-      logger.info("AppSec loaded {} rules from file {}", numRules, source);
+    /* I1: AppSec starting with the following configuration: {
+     *       rules_file_path: <path_to_rule_files>, libddwaf_version: <libbddwaf version>
+     *     }
+     *
+     * Not implemented because configuration and starting are different events.
+     * Configuration can happen after starting (through fleet service).
+     * The following nonstandard alternative was instead chosen.
+     */
+    public static void _initialConfigSourceAndLibddwafVersion(Logger logger, String source) {
+        if (logger.isDebugEnabled()) {
+            logger.info("AppSec initial configuration from {}, libddwaf version: {}", source, Waf.LIB_VERSION);
+        }
     }
-  }
-
-  // I3: high volume; should really not be at info level
-  // wilful spec violation: moved to debug level
-  public static void executingWAF(Logger logger) {
-    logger.debug("Executing AppSec In-App WAF");
-  }
-
-  // I4: high volume; should really not be at info level
-  // wilful spec violation: moved to debug level
-  public static void finishedExecutionWAF(Logger logger, long elapsedMs) {
-    logger.debug("Executing AppSec In-App WAF finished. Took {} ms.", elapsedMs);
-  }
-
-  // I5 implemented together with D6
-
-  /**
-   * I6: Blocking current transaction (rule: <rule_name>)
-   *
-   * <p>Not implemented: blocking no implemented
-   */
-
-  // I7
-  public static void attackQueued(Logger logger) {
-    // the message is vague or misleading
-    logger.info("Pushing new attack to AppSec events");
-  }
-
-  // I8
-  public static void sendingAttackBatch(Logger logger, int batchSize) {
-    logger.info("Sending {} AppSec events to the agent", batchSize);
-  }
-
-  /* I9: Dropping <nb_events> AppSec events because <REASON>
-   * REASON in (sending batch is full)
-   *
-   * Not implemented because dropping happens at a level that doesn't know
-   * about batches and the number of events they contain.
-   * AppSecApi includes a warning about such an event though.
-   */
-
-  /* I10: Reporting AppSec event batch because of process shutdown.
-   *
-   * Cannot currently be implemented. Would require shutdown hooks to flush the
-   * attacks. The submission would also have to bypass the usual reporting thread,
-   * as it will shutdown upon process shutdown, requiring changes in AppSecApi.
-   */
+
+    // I2
+    public static void numLoadedRules(Logger logger, String source, int numRules) {
+        if (logger.isDebugEnabled()) {
+            logger.info("AppSec loaded {} rules from file {}", numRules, source);
+        }
+    }
+
+    // I3: high volume; should really not be at info level
+    // wilful spec violation: moved to debug level
+    public static void executingWAF(Logger logger) {
+        logger.debug("Executing AppSec In-App WAF");
+    }
+
+    // I4: high volume; should really not be at info level
+    // wilful spec violation: moved to debug level
+    public static void finishedExecutionWAF(Logger logger, long elapsedMs) {
+        logger.debug("Executing AppSec In-App WAF finished. Took {} ms.", elapsedMs);
+    }
+
+    // I5 implemented together with D6
+
+    /**
+     * I6: Blocking current transaction (rule: <rule_name>)
+     *
+     * <p>Not implemented: blocking no implemented
+     */
+
+    // I7
+    public static void attackQueued(Logger logger) {
+        // the message is vague or misleading
+        logger.info("Pushing new attack to AppSec events");
+    }
+
+    // I8
+    public static void sendingAttackBatch(Logger logger, int batchSize) {
+        logger.info("Sending {} AppSec events to the agent", batchSize);
+    }
+
+    /* I9: Dropping <nb_events> AppSec events because <REASON>
+     * REASON in (sending batch is full)
+     *
+     * Not implemented because dropping happens at a level that doesn't know
+     * about batches and the number of events they contain.
+     * AppSecApi includes a warning about such an event though.
+     */
+
+    /* I10: Reporting AppSec event batch because of process shutdown.
+     *
+     * Cannot currently be implemented. Would require shutdown hooks to flush the
+     * attacks. The submission would also have to bypass the usual reporting thread,
+     * as it will shutdown upon process shutdown, requiring changes in AppSecApi.
+     */
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/AppSecSystemReloadRegistrationTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/AppSecSystemReloadRegistrationTest.java
index d48d6475a73..10bab0614b3 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/AppSecSystemReloadRegistrationTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/AppSecSystemReloadRegistrationTest.java
@@ -42,82 +42,75 @@
  */
 class AppSecSystemReloadRegistrationTest {
 
-  private static final String RULE_REQUIRING_PATH_PARAMS =
-      "{"
-          + "\"version\": \"2.1\","
-          + "\"rules\": [{"
-          + "  \"id\": \"path-params-rule\","
-          + "  \"name\": \"path-params-rule\","
-          + "  \"conditions\": [{"
-          + "    \"operator\": \"match_regex\","
-          + "    \"parameters\": {"
-          + "      \"inputs\": [{\"address\": \"server.request.path_params\"}],"
-          + "      \"regex\": \"foo\""
-          + "    }"
-          + "  }],"
-          + "  \"tags\": {\"type\": \"t\", \"category\": \"c\"},"
-          + "  \"action\": \"record\""
-          + "}]"
-          + "}";
+    private static final String RULE_REQUIRING_PATH_PARAMS = "{"
+            + "\"version\": \"2.1\","
+            + "\"rules\": [{"
+            + "  \"id\": \"path-params-rule\","
+            + "  \"name\": \"path-params-rule\","
+            + "  \"conditions\": [{"
+            + "    \"operator\": \"match_regex\","
+            + "    \"parameters\": {"
+            + "      \"inputs\": [{\"address\": \"server.request.path_params\"}],"
+            + "      \"regex\": \"foo\""
+            + "    }"
+            + "  }],"
+            + "  \"tags\": {\"type\": \"t\", \"category\": \"c\"},"
+            + "  \"action\": \"record\""
+            + "}]"
+            + "}";
 
-  private final SubscriptionService subService = mock(SubscriptionService.class);
-  private final ConfigurationPoller poller = mock(ConfigurationPoller.class);
+    private final SubscriptionService subService = mock(SubscriptionService.class);
+    private final ConfigurationPoller poller = mock(ConfigurationPoller.class);
 
-  @BeforeEach
-  void setUp() {
-    // a bare mock returns null from registerCallback, which would defeat the
-    // volatile-Subscription idempotency guard in GatewayBridge on every call
-    when(subService.registerCallback(any(), any())).thenReturn(mock(Subscription.class));
-  }
+    @BeforeEach
+    void setUp() {
+        // a bare mock returns null from registerCallback, which would defeat the
+        // volatile-Subscription idempotency guard in GatewayBridge on every call
+        when(subService.registerCallback(any(), any())).thenReturn(mock(Subscription.class));
+    }
 
-  @AfterEach
-  void tearDown() {
-    AppSecSystem.stop();
-  }
+    @AfterEach
+    void tearDown() {
+        AppSecSystem.stop();
+    }
 
-  @Test
-  void reloadThroughRemoteConfigDoesNotReRegisterCallback() throws Exception {
-    AppSecSystem.start(subService, sharedCommunicationObjects());
+    @Test
+    void reloadThroughRemoteConfigDoesNotReRegisterCallback() throws Exception {
+        AppSecSystem.start(subService, sharedCommunicationObjects());
 
-    ArgumentCaptor<ProductListener> asmListenerCaptor =
-        ArgumentCaptor.forClass(ProductListener.class);
-    verify(poller).addListener(eq(Product.ASM_DD), asmListenerCaptor.capture());
+        ArgumentCaptor<ProductListener> asmListenerCaptor = ArgumentCaptor.forClass(ProductListener.class);
+        verify(poller).addListener(eq(Product.ASM_DD), asmListenerCaptor.capture());
 
-    ArgumentCaptor<ConfigurationEndListener> confEndListenerCaptor =
-        ArgumentCaptor.forClass(ConfigurationEndListener.class);
-    verify(poller).addConfigurationEndListener(confEndListenerCaptor.capture());
+        ArgumentCaptor<ConfigurationEndListener> confEndListenerCaptor =
+                ArgumentCaptor.forClass(ConfigurationEndListener.class);
+        verify(poller).addConfigurationEndListener(confEndListenerCaptor.capture());
 
-    // the default ruleset already requires server.request.path_params, so it is registered
-    // at startup
-    verify(subService, times(1)).registerCallback(eq(EVENTS.requestPathParams()), any());
+        // the default ruleset already requires server.request.path_params, so it is registered
+        // at startup
+        verify(subService, times(1)).registerCallback(eq(EVENTS.requestPathParams()), any());
 
-    // Remote Config delivers a ruleset that also requires server.request.path_params
-    assertDoesNotThrow(
-        () -> {
-          asmListenerCaptor
-              .getValue()
-              .accept(
-                  mock(ConfigKey.class),
-                  RULE_REQUIRING_PATH_PARAMS.getBytes(StandardCharsets.UTF_8),
-                  null);
-          confEndListenerCaptor.getValue().onConfigurationEnd();
+        // Remote Config delivers a ruleset that also requires server.request.path_params
+        assertDoesNotThrow(() -> {
+            asmListenerCaptor
+                    .getValue()
+                    .accept(mock(ConfigKey.class), RULE_REQUIRING_PATH_PARAMS.getBytes(StandardCharsets.UTF_8), null);
+            confEndListenerCaptor.getValue().onConfigurationEnd();
         });
 
-    // the already-registered callback is left untouched, not re-registered
-    verify(subService, times(1)).registerCallback(eq(EVENTS.requestPathParams()), any());
-  }
+        // the already-registered callback is left untouched, not re-registered
+        verify(subService, times(1)).registerCallback(eq(EVENTS.requestPathParams()), any());
+    }
 
-  private SharedCommunicationObjects sharedCommunicationObjects() {
-    SharedCommunicationObjects sco =
-        new SharedCommunicationObjects() {
-          @Override
-          public ConfigurationPoller configurationPoller(Config config) {
-            return poller;
-          }
+    private SharedCommunicationObjects sharedCommunicationObjects() {
+        SharedCommunicationObjects sco = new SharedCommunicationObjects() {
+            @Override
+            public ConfigurationPoller configurationPoller(Config config) {
+                return poller;
+            }
         };
-    sco.agentHttpClient = mock(OkHttpClient.class);
-    sco.monitoring = mock(Monitoring.class);
-    sco.setFeaturesDiscovery(mock(DDAgentFeaturesDiscovery.class));
-    return sco;
-  }
+        sco.agentHttpClient = mock(OkHttpClient.class);
+        sco.monitoring = mock(Monitoring.class);
+        sco.setFeaturesDiscovery(mock(DDAgentFeaturesDiscovery.class));
+        return sco;
+    }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/api/security/LambdaApiSecurityForkedTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/api/security/LambdaApiSecurityForkedTest.java
index 39c24cf95ab..8d81c3f6a78 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/api/security/LambdaApiSecurityForkedTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/api/security/LambdaApiSecurityForkedTest.java
@@ -33,86 +33,82 @@
 @WithConfig(key = "api-security.sample.delay", value = "0")
 class LambdaApiSecurityForkedTest {
 
-  private static final String REQUEST_SCHEMA_TAG = "_dd.appsec.s.req.body";
-  private static final String RESPONSE_SCHEMA_TAG = "_dd.appsec.s.res.body";
-  private static final String RESPONSE_HEADERS_SCHEMA_TAG = "_dd.appsec.s.res.headers";
+    private static final String REQUEST_SCHEMA_TAG = "_dd.appsec.s.req.body";
+    private static final String RESPONSE_SCHEMA_TAG = "_dd.appsec.s.res.body";
+    private static final String RESPONSE_HEADERS_SCHEMA_TAG = "_dd.appsec.s.res.headers";
 
-  private AgentTracer.TracerAPI originalTracer;
-  private CoreTracer tracer;
-  private ListWriter writer;
+    private AgentTracer.TracerAPI originalTracer;
+    private CoreTracer tracer;
+    private ListWriter writer;
 
-  @BeforeEach
-  void setUp() {
-    originalTracer = AgentTracer.get();
-    writer = new ListWriter();
-    tracer = CoreTracer.builder().writer(writer).build();
-    AgentTracer.forceRegister(tracer);
-    AppSecSystem.start(
-        tracer.getSubscriptionService(RequestContextSlot.APPSEC), sharedCommunicationObjects());
-  }
+    @BeforeEach
+    void setUp() {
+        originalTracer = AgentTracer.get();
+        writer = new ListWriter();
+        tracer = CoreTracer.builder().writer(writer).build();
+        AgentTracer.forceRegister(tracer);
+        AppSecSystem.start(tracer.getSubscriptionService(RequestContextSlot.APPSEC), sharedCommunicationObjects());
+    }
 
-  @AfterEach
-  void tearDown() {
-    AppSecSystem.stop();
-    // stop() leaves the flag set; reset it so the state cannot leak between tests
-    ActiveSubsystems.APPSEC_ACTIVE = false;
-    SpanPostProcessor.Holder.INSTANCE = SpanPostProcessor.Holder.NOOP;
-    AgentTracer.forceRegister(originalTracer);
-    tracer.close();
-  }
+    @AfterEach
+    void tearDown() {
+        AppSecSystem.stop();
+        // stop() leaves the flag set; reset it so the state cannot leak between tests
+        ActiveSubsystems.APPSEC_ACTIVE = false;
+        SpanPostProcessor.Holder.INSTANCE = SpanPostProcessor.Holder.NOOP;
+        AgentTracer.forceRegister(originalTracer);
+        tracer.close();
+    }
 
-  @Test
-  void generatesSchemasAndInfersSuccessForHttpApiV2Invocation() throws Exception {
-    String eventJson =
-        "{"
-            + "\"version\":\"2.0\","
-            + "\"routeKey\":\"POST /api/users/{id}\","
-            + "\"rawPath\":\"/api/users/123\","
-            + "\"headers\":{\"content-type\":\"application/json\","
-            + "\"host\":\"api.example.com\"},"
-            + "\"pathParameters\":{\"id\":\"123\"},"
-            + "\"body\":\"{\\\"name\\\":\\\"Ada\\\",\\\"age\\\":37}\","
-            + "\"requestContext\":{\"domainName\":\"api.example.com\","
-            + "\"http\":{\"method\":\"POST\",\"path\":\"/api/users/123\","
-            + "\"sourceIp\":\"203.0.113.1\"}}"
-            + "}";
-    ByteArrayInputStream input =
-        new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
+    @Test
+    void generatesSchemasAndInfersSuccessForHttpApiV2Invocation() throws Exception {
+        String eventJson = "{"
+                + "\"version\":\"2.0\","
+                + "\"routeKey\":\"POST /api/users/{id}\","
+                + "\"rawPath\":\"/api/users/123\","
+                + "\"headers\":{\"content-type\":\"application/json\","
+                + "\"host\":\"api.example.com\"},"
+                + "\"pathParameters\":{\"id\":\"123\"},"
+                + "\"body\":\"{\\\"name\\\":\\\"Ada\\\",\\\"age\\\":37}\","
+                + "\"requestContext\":{\"domainName\":\"api.example.com\","
+                + "\"http\":{\"method\":\"POST\",\"path\":\"/api/users/123\","
+                + "\"sourceIp\":\"203.0.113.1\"}}"
+                + "}";
+        ByteArrayInputStream input = new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
 
-    AgentSpanContext parent = LambdaAppSecHandler.processRequestStart(input);
-    assertNotNull(parent);
-    AgentSpan span = AgentTracer.startSpan("aws-lambda", "aws.lambda.invoke", parent);
+        AgentSpanContext parent = LambdaAppSecHandler.processRequestStart(input);
+        assertNotNull(parent);
+        AgentSpan span = AgentTracer.startSpan("aws-lambda", "aws.lambda.invoke", parent);
 
-    String responseJson = "{\"id\":123,\"active\":true}";
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    output.write(responseJson.getBytes(StandardCharsets.UTF_8));
+        String responseJson = "{\"id\":123,\"active\":true}";
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        output.write(responseJson.getBytes(StandardCharsets.UTF_8));
 
-    LambdaAppSecHandler.processResponseData(span, output);
-    LambdaAppSecHandler.processRequestEnd(span);
-    // TraceProcessingWorker invokes this after request end in production. ListWriter deliberately
-    // bypasses that worker, so invoke the registered real post-processor here.
-    SpanPostProcessor.Holder.INSTANCE.process(span, () -> false);
-    span.finish();
+        LambdaAppSecHandler.processResponseData(span, output);
+        LambdaAppSecHandler.processRequestEnd(span);
+        // TraceProcessingWorker invokes this after request end in production. ListWriter deliberately
+        // bypasses that worker, so invoke the registered real post-processor here.
+        SpanPostProcessor.Holder.INSTANCE.process(span, () -> false);
+        span.finish();
 
-    writer.waitForTraces(1);
-    DDSpan finishedSpan = writer.firstTrace().get(0);
-    assertEquals(200, ((Number) finishedSpan.getTag("http.status_code")).intValue());
-    assertNotNull(finishedSpan.getTag(REQUEST_SCHEMA_TAG));
-    assertNotNull(finishedSpan.getTag(RESPONSE_SCHEMA_TAG));
-    assertNotNull(finishedSpan.getTag(RESPONSE_HEADERS_SCHEMA_TAG));
-  }
+        writer.waitForTraces(1);
+        DDSpan finishedSpan = writer.firstTrace().get(0);
+        assertEquals(200, ((Number) finishedSpan.getTag("http.status_code")).intValue());
+        assertNotNull(finishedSpan.getTag(REQUEST_SCHEMA_TAG));
+        assertNotNull(finishedSpan.getTag(RESPONSE_SCHEMA_TAG));
+        assertNotNull(finishedSpan.getTag(RESPONSE_HEADERS_SCHEMA_TAG));
+    }
 
-  private SharedCommunicationObjects sharedCommunicationObjects() {
-    SharedCommunicationObjects sco =
-        new SharedCommunicationObjects() {
-          @Override
-          public ConfigurationPoller configurationPoller(Config config) {
-            return mock(ConfigurationPoller.class);
-          }
+    private SharedCommunicationObjects sharedCommunicationObjects() {
+        SharedCommunicationObjects sco = new SharedCommunicationObjects() {
+            @Override
+            public ConfigurationPoller configurationPoller(Config config) {
+                return mock(ConfigurationPoller.class);
+            }
         };
-    sco.agentHttpClient = mock(OkHttpClient.class);
-    sco.monitoring = mock(Monitoring.class);
-    sco.setFeaturesDiscovery(mock(DDAgentFeaturesDiscovery.class));
-    return sco;
-  }
+        sco.agentHttpClient = mock(OkHttpClient.class);
+        sco.monitoring = mock(Monitoring.class);
+        sco.setFeaturesDiscovery(mock(DDAgentFeaturesDiscovery.class));
+        return sco;
+    }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/ddwaf/MoshiReflectiveDtoContractTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/ddwaf/MoshiReflectiveDtoContractTest.java
index ac81cb2f0b8..5b085f1f821 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/ddwaf/MoshiReflectiveDtoContractTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/ddwaf/MoshiReflectiveDtoContractTest.java
@@ -18,28 +18,27 @@
  */
 class MoshiReflectiveDtoContractTest {
 
-  /**
-   * Every class reached by the reflective adapters in {@code WAFModule} and {@code
-   * AppSecEventWrapper}.
-   */
-  private static final List<Class<?>> REFLECTIVELY_INSTANTIATED =
-      Arrays.asList(
-          WAFResultData.class,
-          WAFResultData.Rule.class,
-          WAFResultData.RuleMatch.class,
-          WAFResultData.Parameter.class,
-          WAFResultData.MatchInfo.class,
-          AppSecEventWrapper.class,
-          AppSecEvent.class);
+    /**
+     * Every class reached by the reflective adapters in {@code WAFModule} and {@code
+     * AppSecEventWrapper}.
+     */
+    private static final List<Class<?>> REFLECTIVELY_INSTANTIATED = Arrays.asList(
+            WAFResultData.class,
+            WAFResultData.Rule.class,
+            WAFResultData.RuleMatch.class,
+            WAFResultData.Parameter.class,
+            WAFResultData.MatchInfo.class,
+            AppSecEventWrapper.class,
+            AppSecEvent.class);
 
-  @Test
-  void everyReflectivelyBoundDtoDeclaresANoArgConstructor() {
-    for (Class<?> clazz : REFLECTIVELY_INSTANTIATED) {
-      assertDoesNotThrow(
-          () -> {
-            clazz.getDeclaredConstructor();
-          },
-          clazz.getName() + " must declare a no-arg constructor for Moshi");
+    @Test
+    void everyReflectivelyBoundDtoDeclaresANoArgConstructor() {
+        for (Class<?> clazz : REFLECTIVELY_INSTANTIATED) {
+            assertDoesNotThrow(
+                    () -> {
+                        clazz.getDeclaredConstructor();
+                    },
+                    clazz.getName() + " must declare a no-arg constructor for Moshi");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/ddwaf/WAFModuleContextClosedRaceTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/ddwaf/WAFModuleContextClosedRaceTest.java
index 458781f339c..4bd88fbb500 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/ddwaf/WAFModuleContextClosedRaceTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/ddwaf/WAFModuleContextClosedRaceTest.java
@@ -39,135 +39,122 @@
  */
 class WAFModuleContextClosedRaceTest {
 
-  private static final JsonAdapter<Map<String, Object>> ADAPTER =
-      new Moshi.Builder()
-          .build()
-          .adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
-
-  private WafBuilder wafBuilder;
-  private WAFModule wafModule;
-  private DataListener dataListener;
-
-  @BeforeEach
-  void setup() throws Exception {
-    assertTrue(WafInitialization.ONLINE, "libddwaf must be available for this test");
-    Waf.initialize(false);
-    wafBuilder = new WafBuilder();
-    try (InputStream stream =
-        getClass().getClassLoader().getResourceAsStream("test_multi_config.json")) {
-      wafBuilder.addOrUpdateConfig("test", ADAPTER.fromJson(Okio.buffer(Okio.source(stream))));
+    private static final JsonAdapter<Map<String, Object>> ADAPTER =
+            new Moshi.Builder().build().adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
+
+    private WafBuilder wafBuilder;
+    private WAFModule wafModule;
+    private DataListener dataListener;
+
+    @BeforeEach
+    void setup() throws Exception {
+        assertTrue(WafInitialization.ONLINE, "libddwaf must be available for this test");
+        Waf.initialize(false);
+        wafBuilder = new WafBuilder();
+        try (InputStream stream = getClass().getClassLoader().getResourceAsStream("test_multi_config.json")) {
+            wafBuilder.addOrUpdateConfig("test", ADAPTER.fromJson(Okio.buffer(Okio.source(stream))));
+        }
+
+        wafModule = new WAFModule();
+        wafModule.setWafBuilder(wafBuilder);
+        AppSecModuleConfigurer.SubconfigListener[] captured = new AppSecModuleConfigurer.SubconfigListener[1];
+        wafModule.config(new AppSecModuleConfigurer() {
+            @Override
+            public void addSubConfigListener(String key, AppSecModuleConfigurer.SubconfigListener listener) {
+                captured[0] = listener;
+            }
+
+            @Override
+            public void addTraceSegmentPostProcessor(TraceSegmentPostProcessor interceptor) {}
+        });
+        captured[0].onNewSubconfig(null, AppSecModuleConfigurer.Reconfiguration.NOOP);
+        dataListener = wafModule.getDataSubscriptions().iterator().next();
     }
 
-    wafModule = new WAFModule();
-    wafModule.setWafBuilder(wafBuilder);
-    AppSecModuleConfigurer.SubconfigListener[] captured =
-        new AppSecModuleConfigurer.SubconfigListener[1];
-    wafModule.config(
-        new AppSecModuleConfigurer() {
-          @Override
-          public void addSubConfigListener(
-              String key, AppSecModuleConfigurer.SubconfigListener listener) {
-            captured[0] = listener;
-          }
-
-          @Override
-          public void addTraceSegmentPostProcessor(TraceSegmentPostProcessor interceptor) {}
-        });
-    captured[0].onNewSubconfig(null, AppSecModuleConfigurer.Reconfiguration.NOOP);
-    dataListener = wafModule.getDataSubscriptions().iterator().next();
-  }
-
-  @AfterEach
-  void tearDown() {
-    if (wafBuilder != null) {
-      wafBuilder.close();
+    @AfterEach
+    void tearDown() {
+        if (wafBuilder != null) {
+            wafBuilder.close();
+        }
+    }
+
+    @Test
+    void skipsAndIncrementsCounterWhenContextClosedConcurrently() {
+        AppSecRequestContext reqCtx = mock(AppSecRequestContext.class);
+        when(reqCtx.isWafContextClosed()).thenReturn(false);
+        when(reqCtx.getOrCreateWafContext(any(), anyBoolean(), anyBoolean())).thenReturn(null);
+
+        ChangeableFlow flow = new ChangeableFlow();
+        GatewayContext gwCtx = new GatewayContext(false);
+
+        dataListener.onDataAvailable(flow, reqCtx, MapDataBundle.ofDelegate(Collections.emptyMap()), gwCtx);
+
+        assertFalse(flow.isBlocking());
+        WafMetricCollector.get().prepareMetrics();
+        boolean sawContextClosedRace =
+                WafMetricCollector.get().drain().stream().anyMatch(m -> "waf.context_closed_race".equals(m.metricName));
+        assertTrue(sawContextClosedRace, "expected waf.context_closed_race to be reported");
+    }
+
+    @Test
+    void countsRaspEvalNotSkippedWhenContextClosedConcurrently() {
+        AppSecRequestContext reqCtx = mock(AppSecRequestContext.class);
+        when(reqCtx.isWafContextClosed()).thenReturn(false);
+        when(reqCtx.getOrCreateWafContext(any(), anyBoolean(), anyBoolean())).thenReturn(null);
+
+        ChangeableFlow flow = new ChangeableFlow();
+        GatewayContext gwCtx = new GatewayContext(false, RuleType.LFI);
+
+        dataListener.onDataAvailable(flow, reqCtx, MapDataBundle.ofDelegate(Collections.emptyMap()), gwCtx);
+
+        assertFalse(flow.isBlocking());
+        WafMetricCollector.get().prepareMetrics();
+        // The eval attempt was already counted before the race was detected; rasp.rule.skipped is
+        // reserved for calls that never attempted eval (e.g. the isWafContextClosed() fast path), so
+        // it must not also be reported here - otherwise the same callback is double-counted.
+        Collection<WafMetricCollector.WafMetric> metrics =
+                WafMetricCollector.get().drain();
+        boolean sawRaspEval = metrics.stream().anyMatch(m -> "rasp.rule.eval".equals(m.metricName));
+        boolean sawRaspSkipped = metrics.stream().anyMatch(m -> "rasp.rule.skipped".equals(m.metricName));
+        assertTrue(sawRaspEval, "expected rasp.rule.eval to be reported");
+        assertFalse(sawRaspSkipped, "rasp.rule.skipped must not double-count an already-evaluated call");
+    }
+
+    /**
+     * Covers the structurally distinct race pointed out in review: {@code getOrCreateWafContext()}
+     * can return a non-null {@link WafContext} that is closed by another thread between the fetch and
+     * the actual {@code run()} call. In practice {@code closeWafContext()} flips {@code
+     * wafContextClosed} atomically with closing the native context, so by the time {@code run()}
+     * observes the closed context, {@code isWafContextClosed()} is already {@code true} - this
+     * mirrors that ordering rather than closing the context independently of the flag. {@code run()}
+     * then throws because the native context is no longer online, which {@code WAFModule} rewraps as
+     * {@code UnclassifiedWafException}. That case must be treated the same as the null-return race:
+     * no error log, no error-code metric, only {@code wafContextClosedRace()}.
+     */
+    @Test
+    void skipsAndIncrementsCounterWhenContextClosedDuringRun() throws Exception {
+        WafHandle wafHandle = wafBuilder.buildWafHandleInstance();
+        WafContext closedContext = new WafContext(wafHandle);
+        closedContext.close();
+
+        AppSecRequestContext reqCtx = mock(AppSecRequestContext.class);
+        // First call is the fast-path check before doRunWaf() runs (must be false to reach run());
+        // subsequent calls mimic closeWafContext() flipping the flag concurrently while run() fails.
+        when(reqCtx.isWafContextClosed()).thenReturn(false, true);
+        when(reqCtx.getOrCreateWafContext(any(), anyBoolean(), anyBoolean())).thenReturn(closedContext);
+
+        ChangeableFlow flow = new ChangeableFlow();
+        GatewayContext gwCtx = new GatewayContext(false);
+
+        dataListener.onDataAvailable(flow, reqCtx, MapDataBundle.ofDelegate(Collections.emptyMap()), gwCtx);
+
+        assertFalse(flow.isBlocking());
+        WafMetricCollector.get().prepareMetrics();
+        Collection<WafMetricCollector.WafMetric> metrics =
+                WafMetricCollector.get().drain();
+        boolean sawContextClosedRace = metrics.stream().anyMatch(m -> "waf.context_closed_race".equals(m.metricName));
+        boolean sawErrorCode = metrics.stream().anyMatch(m -> "waf.error".equals(m.metricName));
+        assertTrue(sawContextClosedRace, "expected waf.context_closed_race to be reported");
+        assertFalse(sawErrorCode, "a benign context-closed race must not be double-counted as a real WAF error");
     }
-  }
-
-  @Test
-  void skipsAndIncrementsCounterWhenContextClosedConcurrently() {
-    AppSecRequestContext reqCtx = mock(AppSecRequestContext.class);
-    when(reqCtx.isWafContextClosed()).thenReturn(false);
-    when(reqCtx.getOrCreateWafContext(any(), anyBoolean(), anyBoolean())).thenReturn(null);
-
-    ChangeableFlow flow = new ChangeableFlow();
-    GatewayContext gwCtx = new GatewayContext(false);
-
-    dataListener.onDataAvailable(
-        flow, reqCtx, MapDataBundle.ofDelegate(Collections.emptyMap()), gwCtx);
-
-    assertFalse(flow.isBlocking());
-    WafMetricCollector.get().prepareMetrics();
-    boolean sawContextClosedRace =
-        WafMetricCollector.get().drain().stream()
-            .anyMatch(m -> "waf.context_closed_race".equals(m.metricName));
-    assertTrue(sawContextClosedRace, "expected waf.context_closed_race to be reported");
-  }
-
-  @Test
-  void countsRaspEvalNotSkippedWhenContextClosedConcurrently() {
-    AppSecRequestContext reqCtx = mock(AppSecRequestContext.class);
-    when(reqCtx.isWafContextClosed()).thenReturn(false);
-    when(reqCtx.getOrCreateWafContext(any(), anyBoolean(), anyBoolean())).thenReturn(null);
-
-    ChangeableFlow flow = new ChangeableFlow();
-    GatewayContext gwCtx = new GatewayContext(false, RuleType.LFI);
-
-    dataListener.onDataAvailable(
-        flow, reqCtx, MapDataBundle.ofDelegate(Collections.emptyMap()), gwCtx);
-
-    assertFalse(flow.isBlocking());
-    WafMetricCollector.get().prepareMetrics();
-    // The eval attempt was already counted before the race was detected; rasp.rule.skipped is
-    // reserved for calls that never attempted eval (e.g. the isWafContextClosed() fast path), so
-    // it must not also be reported here - otherwise the same callback is double-counted.
-    Collection<WafMetricCollector.WafMetric> metrics = WafMetricCollector.get().drain();
-    boolean sawRaspEval = metrics.stream().anyMatch(m -> "rasp.rule.eval".equals(m.metricName));
-    boolean sawRaspSkipped =
-        metrics.stream().anyMatch(m -> "rasp.rule.skipped".equals(m.metricName));
-    assertTrue(sawRaspEval, "expected rasp.rule.eval to be reported");
-    assertFalse(
-        sawRaspSkipped, "rasp.rule.skipped must not double-count an already-evaluated call");
-  }
-
-  /**
-   * Covers the structurally distinct race pointed out in review: {@code getOrCreateWafContext()}
-   * can return a non-null {@link WafContext} that is closed by another thread between the fetch and
-   * the actual {@code run()} call. In practice {@code closeWafContext()} flips {@code
-   * wafContextClosed} atomically with closing the native context, so by the time {@code run()}
-   * observes the closed context, {@code isWafContextClosed()} is already {@code true} - this
-   * mirrors that ordering rather than closing the context independently of the flag. {@code run()}
-   * then throws because the native context is no longer online, which {@code WAFModule} rewraps as
-   * {@code UnclassifiedWafException}. That case must be treated the same as the null-return race:
-   * no error log, no error-code metric, only {@code wafContextClosedRace()}.
-   */
-  @Test
-  void skipsAndIncrementsCounterWhenContextClosedDuringRun() throws Exception {
-    WafHandle wafHandle = wafBuilder.buildWafHandleInstance();
-    WafContext closedContext = new WafContext(wafHandle);
-    closedContext.close();
-
-    AppSecRequestContext reqCtx = mock(AppSecRequestContext.class);
-    // First call is the fast-path check before doRunWaf() runs (must be false to reach run());
-    // subsequent calls mimic closeWafContext() flipping the flag concurrently while run() fails.
-    when(reqCtx.isWafContextClosed()).thenReturn(false, true);
-    when(reqCtx.getOrCreateWafContext(any(), anyBoolean(), anyBoolean())).thenReturn(closedContext);
-
-    ChangeableFlow flow = new ChangeableFlow();
-    GatewayContext gwCtx = new GatewayContext(false);
-
-    dataListener.onDataAvailable(
-        flow, reqCtx, MapDataBundle.ofDelegate(Collections.emptyMap()), gwCtx);
-
-    assertFalse(flow.isBlocking());
-    WafMetricCollector.get().prepareMetrics();
-    Collection<WafMetricCollector.WafMetric> metrics = WafMetricCollector.get().drain();
-    boolean sawContextClosedRace =
-        metrics.stream().anyMatch(m -> "waf.context_closed_race".equals(m.metricName));
-    boolean sawErrorCode = metrics.stream().anyMatch(m -> "waf.error".equals(m.metricName));
-    assertTrue(sawContextClosedRace, "expected waf.context_closed_race to be reported");
-    assertFalse(
-        sawErrorCode,
-        "a benign context-closed race must not be double-counted as a real WAF error");
-  }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/gateway/AppSecRequestContextTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/gateway/AppSecRequestContextTest.java
index a8a290ff4d9..60667be4ab2 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/gateway/AppSecRequestContextTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/gateway/AppSecRequestContextTest.java
@@ -70,916 +70,894 @@
 
 class AppSecRequestContextTest {
 
-  private static final JsonAdapter<Map<String, Object>> ADAPTER =
-      new Moshi.Builder()
-          .build()
-          .adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
+    private static final JsonAdapter<Map<String, Object>> ADAPTER =
+            new Moshi.Builder().build().adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
 
-  private final AppSecRequestContext ctx = new AppSecRequestContext();
-  private WafBuilder wafBuilder;
+    private final AppSecRequestContext ctx = new AppSecRequestContext();
+    private WafBuilder wafBuilder;
 
-  @AfterEach
-  void tearDown() {
-    if (wafBuilder != null) {
-      wafBuilder.close();
+    @AfterEach
+    void tearDown() {
+        if (wafBuilder != null) {
+            wafBuilder.close();
+        }
+    }
+
+    @Test
+    void implementsDataBundle() {
+        ctx.addAll(MapDataBundle.of(KnownAddresses.REQUEST_URI_RAW, "/a"));
+
+        assertEquals(1, ctx.size());
+        assertEquals("/a", ctx.get(KnownAddresses.REQUEST_URI_RAW));
+        assertEquals(singletonList(KnownAddresses.REQUEST_URI_RAW), new ArrayList<>(ctx.getAllAddresses()));
+        assertTrue(ctx.hasAddress(KnownAddresses.REQUEST_URI_RAW));
+
+        Iterator<Map.Entry<Address<?>, Object>> iterator = ctx.iterator();
+
+        assertTrue(iterator.hasNext());
+
+        Map.Entry<Address<?>, Object> element = iterator.next();
+
+        assertEquals(KnownAddresses.REQUEST_URI_RAW, element.getKey());
+        assertEquals("/a", element.getValue());
+    }
+
+    @Test
+    void itIsCloseable() {
+        assertInstanceOf(Closeable.class, ctx);
+
+        // close() on a context that was never used must not throw.
+        ctx.close();
+    }
+
+    @Test
+    void addingHeadersAfterTheyAreSaidToBeFinishedIsForbidden() {
+        ctx.finishRequestHeaders();
+
+        assertTrue(ctx.isFinishedRequestHeaders());
+        assertThrows(IllegalStateException.class, () -> ctx.addRequestHeader("a", "b"));
+        assertThrows(IllegalStateException.class, () -> ctx.addCookies(singletonMap("a", singletonList("b"))));
     }
-  }
 
-  @Test
-  void implementsDataBundle() {
-    ctx.addAll(MapDataBundle.of(KnownAddresses.REQUEST_URI_RAW, "/a"));
-
-    assertEquals(1, ctx.size());
-    assertEquals("/a", ctx.get(KnownAddresses.REQUEST_URI_RAW));
-    assertEquals(
-        singletonList(KnownAddresses.REQUEST_URI_RAW), new ArrayList<>(ctx.getAllAddresses()));
-    assertTrue(ctx.hasAddress(KnownAddresses.REQUEST_URI_RAW));
-
-    Iterator<Map.Entry<Address<?>, Object>> iterator = ctx.iterator();
-
-    assertTrue(iterator.hasNext());
-
-    Map.Entry<Address<?>, Object> element = iterator.next();
-
-    assertEquals(KnownAddresses.REQUEST_URI_RAW, element.getKey());
-    assertEquals("/a", element.getValue());
-  }
-
-  @Test
-  void itIsCloseable() {
-    assertInstanceOf(Closeable.class, ctx);
-
-    // close() on a context that was never used must not throw.
-    ctx.close();
-  }
-
-  @Test
-  void addingHeadersAfterTheyAreSaidToBeFinishedIsForbidden() {
-    ctx.finishRequestHeaders();
-
-    assertTrue(ctx.isFinishedRequestHeaders());
-    assertThrows(IllegalStateException.class, () -> ctx.addRequestHeader("a", "b"));
-    assertThrows(
-        IllegalStateException.class, () -> ctx.addCookies(singletonMap("a", singletonList("b"))));
-  }
-
-  @Test
-  void settingUriASecondTimeIsIgnoredFirstValueWins() {
-    ctx.setRawURI("/a");
-    ctx.setRawURI("/b");
-
-    assertEquals("/a", ctx.getSavedRawURI());
-  }
-
-  @Test
-  void savesCookiesAndOtherHeaders() {
-    ctx.addCookies(singletonMap("a", singletonList("c")));
-    ctx.addRequestHeader("user-agent", "foo");
-
-    assertEquals(singletonList("foo"), ctx.getRequestHeaders().get("user-agent"));
-    assertEquals(singletonMap("a", singletonList("c")), ctx.getCookies());
-  }
-
-  @Test
-  void canSaveTheUri() {
-    // The Groovy original assigned the private savedRawURI field; setRawURI is its only writer.
-    ctx.setRawURI("/a");
-
-    assertEquals("/a", ctx.getSavedRawURI());
-  }
-
-  @Test
-  void canCollectEvents() {
-    ctx.reportEvents(asList(new AppSecEvent(), new AppSecEvent()));
-    Collection<AppSecEvent> events = ctx.transferCollectedEvents();
-
-    assertEquals(2, events.size());
-    for (AppSecEvent event : events) {
-      assertNotNull(event);
-    }
-
-    ctx.reportEvents(singletonList(new AppSecEvent()));
-    events = ctx.transferCollectedEvents();
-
-    assertEquals(1, events.size());
-    assertNotNull(events.iterator().next());
-  }
-
-  @Test
-  void collectEventsWhenNoneReported() {
-    assertTrue(ctx.transferCollectedEvents().isEmpty());
-  }
-
-  @Test
-  void canCollectStackTraces() {
-    StackTraceElement element = new StackTraceElement("class", "method", "file", 1);
-    StackTraceFrame frame = new StackTraceFrame(1, element);
-    StackTraceEvent event = new StackTraceEvent(singletonList(frame), "java", "id", "message");
-
-    ctx.reportStackTrace(event);
-    List<StackTraceEvent> result = ctx.getStackTraces();
-
-    assertEquals(1, result.size());
-    StackTraceEvent reportedEvent = result.get(0);
-    assertEquals("id", reportedEvent.getId());
-    assertEquals("message", reportedEvent.getMessage());
-    assertEquals("java", reportedEvent.getLanguage());
-    assertEquals(1, reportedEvent.getFrames().size());
-    StackTraceFrame reportedFrame = reportedEvent.getFrames().get(0);
-    assertEquals(1, reportedFrame.getId());
-    assertEquals("class.method(file:1)", reportedFrame.getText());
-    assertEquals("file", reportedFrame.getFile());
-    assertEquals(Integer.valueOf(1), reportedFrame.getLine());
-    assertEquals("class", reportedFrame.getClass_name());
-    assertEquals("method", reportedFrame.getFunction());
-  }
-
-  @Test
-  void collectStackTracesWhenNoneReported() {
-    assertNull(ctx.getStackTraces());
-  }
-
-  @ParameterizedTest(name = "{0} allow list contains only lowercase names")
-  @MethodSource("headersAllowListShouldContainOnlyLowercaseNamesArguments")
-  void headersAllowListShouldContainOnlyLowercaseNames(String name, Set<String> headers) {
-    for (String header : headers) {
-      assertEquals(
-          header.toLowerCase(Locale.ROOT),
-          header,
-          "REASON: Allow header name \"" + header + "\" MUST be lowercase");
-    }
-  }
-
-  private static Stream<Arguments> headersAllowListShouldContainOnlyLowercaseNamesArguments() {
-    return Stream.of(
-        arguments(
-            "Default request headers", AppSecRequestContext.DEFAULT_REQUEST_HEADERS_ALLOW_LIST),
-        arguments("Request headers", AppSecRequestContext.REQUEST_HEADERS_ALLOW_LIST),
-        arguments("Response headers", AppSecRequestContext.RESPONSE_HEADERS_ALLOW_LIST));
-  }
-
-  @Test
-  void basicHeadersCollectionTest() {
-    ctx.addRequestHeader("Host", "127.0.0.1");
-    ctx.addRequestHeader("Content-Type", "text/html; charset=UTF-8");
-    ctx.addRequestHeader("Custom-Header", "value1");
-    ctx.addRequestHeader("Accept", "application/json");
-
-    Map<String, List<String>> expected = new HashMap<>();
-    expected.put("host", singletonList("127.0.0.1"));
-    expected.put("content-type", singletonList("text/html; charset=UTF-8"));
-    expected.put("custom-header", singletonList("value1"));
-    expected.put("accept", singletonList("application/json"));
-    assertEquals(expected, ctx.getRequestHeaders());
-  }
-
-  @Test
-  void nullHeadersShouldBeIgnored() {
-    ctx.addRequestHeader(null, "value");
-    ctx.addRequestHeader("key", null);
-
-    assertTrue(ctx.getRequestHeaders().isEmpty());
-  }
-
-  @Test
-  void concatMultipleValuesForSameHeader() {
-    ctx.addRequestHeader("Custom-Header", "value1");
-    ctx.addRequestHeader("CUSTOM-HEADER", "value2");
-    ctx.addRequestHeader("Accept", "application/json");
-    ctx.addRequestHeader("accept", "application/xml");
-
-    Map<String, List<String>> expected = new HashMap<>();
-    expected.put("custom-header", asList("value1", "value2"));
-    expected.put("accept", asList("application/json", "application/xml"));
-    assertEquals(expected, ctx.getRequestHeaders());
-  }
-
-  private WafContext createWafContext(AppSecRequestContext context) throws Exception {
-    assertTrue(WafInitialization.ONLINE, "libddwaf must be available for this test");
-    Waf.initialize(false);
-    if (wafBuilder != null) {
-      wafBuilder.close();
-    }
-    wafBuilder = new WafBuilder();
-    try (InputStream stream =
-        getClass().getClassLoader().getResourceAsStream("test_multi_config.json")) {
-      wafBuilder.addOrUpdateConfig("test", ADAPTER.fromJson(Okio.buffer(Okio.source(stream))));
-    }
-    return context.getOrCreateWafContext(wafBuilder.buildWafHandleInstance(), false, false);
-  }
-
-  @Test
-  void closeClosesTheWafContext() throws Exception {
-    WafContext wafContext = createWafContext(ctx);
-
-    ctx.close();
-
-    // isWafContextClosed() is the public witness for the nulled wafContext field.
-    assertTrue(ctx.isWafContextClosed());
-    assertFalse(wafContext.isOnline());
-  }
-
-  @Test
-  void testIsThrottled() {
-    RateLimiter rateLimiter = mock(RateLimiter.class);
-    when(rateLimiter.isThrottled()).thenReturn(true);
-    AppSecRequestContext appSecRequestContext = new AppSecRequestContext();
-
-    // rate limiter is called and throttled is set
-    boolean result = appSecRequestContext.isThrottled(rateLimiter);
-
-    assertTrue(result);
-
-    // rate limiter is not called more than once per appsec context, returns first result
-    boolean secondResult = appSecRequestContext.isThrottled(rateLimiter);
-
-    assertEquals(result, secondResult);
-    verify(rateLimiter, times(1)).isThrottled();
-  }
-
-  @Test
-  void testThatInternalDataIsReleasedOnClose() throws Exception {
-    AppSecRequestContext context = new AppSecRequestContext();
-
-    context.addRequestHeader("Accept", "*");
-    context.addResponseHeader("Content-Type", "text/plain");
-    context.addCookies(singletonMap("cookie", singletonList("test")));
-    context.addAll(MapDataBundle.of(KnownAddresses.REQUEST_METHOD, "GET"));
-    // Use reportDerivatives to properly set values via AtomicReference
-    context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "test_value")));
-    WafContext wafContext = createWafContext(context);
-    context.close();
-
-    assertTrue(context.isWafContextClosed());
-    assertFalse(wafContext.isOnline());
-    // Check that derivatives AtomicReference contains null after close
-    assertNull(derivativesField(context).get());
-
-    // Field access, not the getter: it null-coalesces, so emptiness would prove nothing.
-    assertNull(requestHeadersField(context));
-    assertNull(responseHeadersField(context));
-    assertTrue(context.getCookies().isEmpty());
-    assertEquals(0, context.size());
-  }
-
-  @Test
-  void testIncreaseAndGetWafTimeouts() {
-    ctx.increaseWafTimeouts();
-    ctx.increaseWafTimeouts();
-
-    assertEquals(2, ctx.getWafTimeouts());
-  }
-
-  @Test
-  void testIncreaseAndGetRaspTimeouts() {
-    ctx.increaseRaspTimeouts();
-    ctx.increaseRaspTimeouts();
-
-    assertEquals(2, ctx.getRaspTimeouts());
-  }
-
-  @Test
-  void closeLogsIfRequestEndWasNotCalled() {
-    TestLogCollector.enable();
-    try {
-      AppSecRequestContext context = new AppSecRequestContext();
-
-      context.close();
-
-      CapturedLog releaseLog = null;
-      for (CapturedLog captured : TestLogCollector.drainCapturedLogs()) {
-        if (captured.message.contains("Request end event was not called before close")) {
-          releaseLog = captured;
-          break;
+    @Test
+    void settingUriASecondTimeIsIgnoredFirstValueWins() {
+        ctx.setRawURI("/a");
+        ctx.setRawURI("/b");
+
+        assertEquals("/a", ctx.getSavedRawURI());
+    }
+
+    @Test
+    void savesCookiesAndOtherHeaders() {
+        ctx.addCookies(singletonMap("a", singletonList("c")));
+        ctx.addRequestHeader("user-agent", "foo");
+
+        assertEquals(singletonList("foo"), ctx.getRequestHeaders().get("user-agent"));
+        assertEquals(singletonMap("a", singletonList("c")), ctx.getCookies());
+    }
+
+    @Test
+    void canSaveTheUri() {
+        // The Groovy original assigned the private savedRawURI field; setRawURI is its only writer.
+        ctx.setRawURI("/a");
+
+        assertEquals("/a", ctx.getSavedRawURI());
+    }
+
+    @Test
+    void canCollectEvents() {
+        ctx.reportEvents(asList(new AppSecEvent(), new AppSecEvent()));
+        Collection<AppSecEvent> events = ctx.transferCollectedEvents();
+
+        assertEquals(2, events.size());
+        for (AppSecEvent event : events) {
+            assertNotNull(event);
         }
-      }
-      assertNotNull(releaseLog);
-      assertEquals(SEND_TELEMETRY, releaseLog.marker);
-    } finally {
-      TestLogCollector.disable();
-    }
-  }
-
-  @Test
-  void testThatProcessedAttributesAreClearedOnClose() {
-    Map<String, Object> derivatives = new HashMap<>();
-    derivatives.put("numeric", "42");
-    derivatives.put("string", "value");
-
-    ctx.reportDerivatives(derivatives);
-    ctx.close();
-
-    assertTrue(ctx.getDerivativeKeys().isEmpty());
-  }
-
-  @Test
-  void testAttributeHandlingWithLiteralValuesAndRequestDataExtraction() {
-    AppSecRequestContext context = new AppSecRequestContext();
-    context.setMethod("POST");
-    context.setScheme("https");
-    context.setRawURI("/api/test");
-    context.setRoute("/api/{param}");
-    context.setResponseStatus(200);
-    context.addRequestHeader("user-agent", "TestAgent/1.0");
-    context.addRequestHeader("content-type", "application/json");
-
-    // Test data for attributes
-    Map<String, Object> attributes = new HashMap<>();
-    attributes.put("_dd.appsec.s.res.headers", literalValue("literal-header-value"));
-    attributes.put("_dd.appsec.s.res.method", addressValue("server.request.method"));
-    attributes.put("_dd.appsec.s.res.scheme", addressValue("server.request.scheme"));
-    attributes.put("_dd.appsec.s.res.uri", addressValue("server.request.uri.raw"));
-    attributes.put("_dd.appsec.s.res.route", addressValue("server.request.route"));
-    attributes.put("_dd.appsec.s.res.status", addressValue("server.response.status"));
-    attributes.put("_dd.appsec.s.res.user_agent", headerValue("user-agent", null));
-    attributes.put("_dd.appsec.s.res.content_type", headerValue("content-type", null));
-    attributes.put("_dd.appsec.s.res.user_agent_lower", headerValue("user-agent", "lowercase"));
-    attributes.put("_dd.appsec.s.res.content_type_upper", headerValue("content-type", "uppercase"));
-
-    context.reportDerivatives(attributes);
-    Set<String> keys = context.getDerivativeKeys();
-
-    assertEquals(new HashSet<>(attributes.keySet()), keys);
-  }
-
-  @Test
-  void testAttributeHandlingWithUnknownAddress() {
-    AppSecRequestContext context = new AppSecRequestContext();
-    Map<String, Object> attributes =
-        singletonMap("_dd.appsec.s.res.unknown", addressValue("server.request.unknown"));
-
-    context.reportDerivatives(attributes);
-    Set<String> keys = context.getDerivativeKeys();
-
-    // No attributes should be added for unknown addresses
-    assertTrue(keys.isEmpty());
-  }
-
-  @Test
-  void testAttributeHandlingWithInvalidKeyPath() {
-    AppSecRequestContext context = new AppSecRequestContext();
-    context.addRequestHeader("user-agent", "TestAgent/1.0");
-    Map<String, Object> attributes =
-        singletonMap("_dd.appsec.s.res.invalid", headerValue("non-existent-header", null));
-
-    context.reportDerivatives(attributes);
-    Set<String> keys = context.getDerivativeKeys();
-
-    // No attributes should be added for invalid key paths
-    assertTrue(keys.isEmpty());
-  }
-
-  @Test
-  void testSamplingOfRequests() {
-    int maxRequests = Config.get().getApiSecurityMaxDownstreamRequestBodyAnalysis();
-    AppSecRequestContext context = new AppSecRequestContext();
-    Random random = new Random();
-    Map<Long, Boolean> sampledByRequestId = new HashMap<>();
-
-    for (int request = 0; request <= maxRequests; request++) {
-      long requestId = random.nextLong();
-      sampledByRequestId.put(requestId, context.sampleHttpClientRequest(requestId));
-    }
-
-    int sampledCount = 0;
-    for (Boolean sampled : sampledByRequestId.values()) {
-      if (sampled) {
-        sampledCount++;
-      }
-    }
-    assertEquals(maxRequests, sampledCount);
-    for (Map.Entry<Long, Boolean> entry : sampledByRequestId.entrySet()) {
-      assertEquals(entry.getValue(), context.isHttpClientRequestSampled(entry.getKey()));
-    }
-  }
-
-  @Test
-  void testCommitDerivativesWithDifferentValueTypes() {
-    AppSecRequestContext context = new AppSecRequestContext();
-    TraceSegment traceSegment = mock(TraceSegment.class);
-    // Capture what setTagTop is being called with
-    Map<String, Object> committedTags = captureCommittedTags(traceSegment);
-
-    // Set up derivatives with different types
-    Map<String, Object> derivatives = new HashMap<>();
-    derivatives.put("numeric_int", literalValue(42));
-    derivatives.put("numeric_double", literalValue(3.14));
-    derivatives.put("string_value", literalValue("test_string"));
-    derivatives.put("boolean_true", literalValue(true));
-    derivatives.put("boolean_false", literalValue(false));
-    derivatives.put("numeric_string", literalValue("100"));
-    derivatives.put("double_string", literalValue("99.5"));
-    derivatives.put("non_numeric_string", literalValue("not_a_number"));
-
-    context.reportDerivatives(derivatives);
-    boolean result = context.commitDerivatives(traceSegment);
-
-    assertTrue(result);
-    assertEquals(8, committedTags.size());
-
-    // Verify numeric values are preserved as numbers
-    assertEquals(42, committedTags.get("numeric_int"));
-    assertInstanceOf(Integer.class, committedTags.get("numeric_int"));
-
-    // Unlike Groovy, where 3.14 is a BigDecimal, Java gives a Double - both are Numbers
-    assertEquals(3.14, committedTags.get("numeric_double"));
-    assertInstanceOf(Number.class, committedTags.get("numeric_double"));
-
-    // Verify strings are handled correctly
-    assertEquals("test_string", committedTags.get("string_value"));
-    assertInstanceOf(String.class, committedTags.get("string_value"));
-
-    // Verify booleans are preserved
-    assertEquals(true, committedTags.get("boolean_true"));
-    assertInstanceOf(Boolean.class, committedTags.get("boolean_true"));
-
-    assertEquals(false, committedTags.get("boolean_false"));
-    assertInstanceOf(Boolean.class, committedTags.get("boolean_false"));
-
-    // Verify numeric strings are converted to numbers
-    assertEquals(100L, committedTags.get("numeric_string"));
-    assertInstanceOf(Long.class, committedTags.get("numeric_string"));
-
-    assertEquals(99.5, committedTags.get("double_string"));
-    assertInstanceOf(Number.class, committedTags.get("double_string"));
-
-    // Verify non-numeric strings remain strings
-    assertEquals("not_a_number", committedTags.get("non_numeric_string"));
-    assertInstanceOf(String.class, committedTags.get("non_numeric_string"));
-  }
-
-  @Test
-  void testCommitDerivativesClearsDerivativesAtomically() {
-    AppSecRequestContext context = new AppSecRequestContext();
-    TraceSegment traceSegment = mock(TraceSegment.class);
-    Map<String, Object> derivatives = new HashMap<>();
-    derivatives.put("attr1", literalValue("value1"));
-    derivatives.put("attr2", literalValue("value2"));
-
-    context.reportDerivatives(derivatives);
-
-    assertEquals(2, context.getDerivativeKeys().size());
-
-    context.commitDerivatives(traceSegment);
-
-    // Derivatives should be cleared after commit
-    assertTrue(context.getDerivativeKeys().isEmpty());
-    assertNull(derivativesField(context).get());
-  }
-
-  @Test
-  void testCommitDerivativesWithNullTraceSegmentReturnsFalse() {
-    AppSecRequestContext context = new AppSecRequestContext();
-
-    assertFalse(context.commitDerivatives(null));
-  }
-
-  @Test
-  void testMultipleReportDerivativesCallsAccumulateValues() {
-    AppSecRequestContext context = new AppSecRequestContext();
-
-    // First report
-    Map<String, Object> firstReport = new HashMap<>();
-    firstReport.put("attr1", literalValue("value1"));
-    firstReport.put("attr2", literalValue("value2"));
-    context.reportDerivatives(firstReport);
-
-    assertEquals(new HashSet<>(asList("attr1", "attr2")), context.getDerivativeKeys());
-
-    // Second report - should accumulate
-    Map<String, Object> secondReport = new HashMap<>();
-    secondReport.put("attr3", literalValue("value3"));
-    secondReport.put("attr4", literalValue("value4"));
-    context.reportDerivatives(secondReport);
-
-    assertEquals(
-        new HashSet<>(asList("attr1", "attr2", "attr3", "attr4")), context.getDerivativeKeys());
-  }
-
-  @Test
-  void testMultipleReportDerivativesWithOverlappingKeysUsesLastValue() {
-    AppSecRequestContext context = new AppSecRequestContext();
-    TraceSegment traceSegment = mock(TraceSegment.class);
-    Map<String, Object> committedTags = captureCommittedTags(traceSegment);
-
-    // First report
-    context.reportDerivatives(singletonMap("attr1", literalValue("first_value")));
-    // Second report with same key - should overwrite
-    context.reportDerivatives(singletonMap("attr1", literalValue("second_value")));
-    context.commitDerivatives(traceSegment);
-
-    assertEquals("second_value", committedTags.get("attr1"));
-  }
-
-  @Test
-  void testReportDerivativesMaintainsDataIntegrityUnderConcurrentAccess() throws Exception {
-    AppSecRequestContext context = new AppSecRequestContext();
-    int numThreads = 3;
-    CountDownLatch startLatch = new CountDownLatch(1);
-
-    // Simulate concurrent updates from multiple threads
-    ExecutorService executorService = Executors.newFixedThreadPool(numThreads);
-    List<Future<?>> futures = new ArrayList<>();
-    try {
-      for (int thread = 0; thread < numThreads; thread++) {
-        int firstAttribute = thread * 2 + 1;
-        futures.add(
-            executorService.submit(
-                () -> {
-                  startLatch.await(); // Wait for all threads to be ready
-                  context.reportDerivatives(
-                      singletonMap(
-                          "attr" + firstAttribute, literalValue("value" + firstAttribute)));
-                  context.reportDerivatives(
-                      singletonMap(
-                          "attr" + (firstAttribute + 1),
-                          literalValue("value" + (firstAttribute + 1))));
-                  return null;
-                }));
-      }
-
-      // Release all threads at once to maximize concurrent execution
-      startLatch.countDown();
-
-      // Wait for all tasks to complete using the futures
-      for (Future<?> future : futures) {
-        future.get();
-      }
-    } finally {
-      executorService.shutdown();
-    }
-
-    // Verify all attributes were added despite concurrent access
-    Set<String> keys = context.getDerivativeKeys();
-    // At least the 6 we explicitly added
-    assertTrue(keys.size() >= 6, "expected at least 6 derivative keys, got " + keys);
-    for (int attribute = 1; attribute <= 6; attribute++) {
-      assertTrue(keys.contains("attr" + attribute), "Missing attribute: attr" + attribute);
-    }
-  }
-
-  @ParameterizedTest(name = "numeric conversion with edge cases: {0}")
-  @MethodSource("testNumericConversionWithEdgeCasesArguments")
-  void testNumericConversionWithEdgeCases(
-      String description, String inputValue, Object expectedValue) {
-    AppSecRequestContext context = new AppSecRequestContext();
-    TraceSegment traceSegment = mock(TraceSegment.class);
-    Map<String, Object> committedTags = captureCommittedTags(traceSegment);
-
-    context.reportDerivatives(singletonMap("test_attr", literalValue(inputValue)));
-    context.commitDerivatives(traceSegment);
-
-    // When conversion fails (expectedValue is null), the original string value should be preserved
-    // When conversion succeeds, the converted numeric value should be used
-    assertEquals(
-        expectedValue != null ? expectedValue : inputValue, committedTags.get("test_attr"));
-  }
-
-  private static Stream<Arguments> testNumericConversionWithEdgeCasesArguments() {
-    return Stream.of(
-        // Valid integers
-        arguments("zero", "0", 0L),
-        arguments("positive integer", "42", 42L),
-        arguments("negative integer", "-100", -100L),
-        arguments("integer with plus sign", "+999", 999L),
-        arguments("large valid long", "9223372036854775807", 9223372036854775807L),
-        arguments("large negative long", "-9223372036854775808", -9223372036854775808L),
-
-        // Valid decimals
-        arguments("simple decimal", "3.14", 3.14d),
-        arguments("negative decimal", "-0.5", -0.5d),
-        arguments("decimal with plus sign", "+99.99", 99.99d),
-        arguments("zero decimal", "0.0", 0.0d),
-        arguments("decimal with many digits", "123.456789", 123.456789d),
-
-        // Whitespace handling (should now parse after trim - issue #10494 fix)
-        arguments("leading whitespace integer", " 42", 42L),
-        arguments("trailing whitespace integer", "42 ", 42L),
-        arguments("both whitespace integer", " 42 ", 42L),
-        arguments("tab and newline whitespace", "\t100\n", 100L),
-        arguments("multiple spaces decimal", "  -3.14  ", -3.14d),
-
-        // Empty and null
-        arguments("null value", null, null),
-        arguments("empty string", "", null),
-        arguments("whitespace only", "   ", null),
-        arguments("tab only", "\t", null),
-
-        // Invalid formats (should return null, original string preserved)
-        arguments("alphabetic string", "abc", null),
-        arguments("alphanumeric string", "12x34", null),
-        arguments("multiple decimals", "3.14.15", null),
-        arguments("multiple signs", "+-5", null),
-        arguments("sign in middle", "12-34", null),
-
-        // Sign-only strings
-        arguments("plus sign only", "+", null),
-        arguments("minus sign only", "-", null),
-        arguments("plus with whitespace", " + ", null),
-
-        // Overflow cases (should return null gracefully)
-        arguments("long overflow positive", "9223372036854775808", null),
-        arguments("long overflow negative", "-9223372036854775809", null),
-        arguments("very large number", "99999999999999999999999", null),
-
-        // Scientific notation (now supported for backward compatibility)
-        arguments("scientific notation lowercase", "1e10", 1.0e10d),
-        arguments("scientific notation uppercase", "1E10", 1.0E10d),
-        arguments("scientific with decimal", "1.5e10", 1.5e10d),
-        arguments("scientific negative exponent", "3.5E-7", 3.5E-7d),
-        arguments("scientific with sign", "-2.5e+3", -2.5e+3d),
-        arguments("scientific integer base", "5e3", 5000.0d),
-
-        // Exotic number formats (not supported)
-        arguments("hexadecimal", "0x10", null),
-        arguments("binary", "0b1010", null),
-        arguments("octal", "0777", 777L),
-
-        // Edge decimal cases (note: .5 and 5. are valid Java double literals)
-        arguments("decimal starts with dot", ".5", 0.5d),
-        arguments("decimal ends with dot", "5.", 5.0d),
-        arguments("dot only", ".", null),
-        arguments("multiple dots", "...", null),
-
-        // Regression - ensure existing valid formats still work
-        arguments("regression valid integer", "100", 100L),
-        arguments("regression valid decimal", "99.5", 99.5d),
-        arguments("regression negative", "-50", -50L),
-
-        // Special characters
-        arguments("comma separator", "1,000", null),
-        arguments("underscore separator", "1_000", null),
-        arguments("currency symbol", "$100", null),
-        arguments("percentage", "50%", null),
-
-        // Edge cases with zeros
-        arguments("zero with plus", "+0", 0L),
-        arguments("zero with minus", "-0", 0L),
-        arguments("decimal zero variations", "0.00", 0.0d));
-  }
-
-  @Test
-  void testGetDerivativeKeysWithEmptyDerivatives() {
-    AppSecRequestContext context = new AppSecRequestContext();
-
-    assertTrue(context.getDerivativeKeys().isEmpty());
-  }
-
-  @Test
-  void testReportDerivativesWithExtractedValuesFromRequestData() {
-    AppSecRequestContext context = new AppSecRequestContext();
-    context.setMethod("POST");
-    context.addRequestHeader("x-custom-header", "custom_value");
-
-    Map<String, Object> derivatives = new HashMap<>();
-    derivatives.put("extracted_method", addressValue("server.request.method"));
-    derivatives.put("extracted_header", headerValue("x-custom-header", null));
-
-    context.reportDerivatives(derivatives);
-    Set<String> keys = context.getDerivativeKeys();
-
-    assertEquals(new HashSet<>(asList("extracted_method", "extracted_header")), keys);
-  }
-
-  @Test
-  void testReportDerivativesWithTransformers() {
-    AppSecRequestContext context = new AppSecRequestContext();
-    context.addRequestHeader("user-agent", "Mozilla/5.0");
-
-    Map<String, Object> derivatives = new HashMap<>();
-    derivatives.put("ua_lowercase", headerValue("user-agent", "lowercase"));
-    derivatives.put("ua_uppercase", headerValue("user-agent", "uppercase"));
-
-    context.reportDerivatives(derivatives);
-    Set<String> keys = context.getDerivativeKeys();
-
-    assertEquals(new HashSet<>(asList("ua_lowercase", "ua_uppercase")), keys);
-  }
-
-  /** A derivative schema holding a literal value, reported as-is. */
-  private static Map<String, Object> literalValue(Object value) {
-    return singletonMap("value", value);
-  }
-
-  /** A derivative schema extracting the whole value stored at the given address. */
-  private static Map<String, Object> addressValue(String address) {
-    return singletonMap("address", address);
-  }
-
-  /**
-   * A derivative schema extracting one request header, optionally through a transformer.
-   *
-   * @param transformer the transformer to apply, or {@code null} for none
-   */
-  private static Map<String, Object> headerValue(String header, String transformer) {
-    Map<String, Object> schema = new HashMap<>();
-    schema.put("address", "server.request.headers");
-    schema.put("key_path", singletonList(header));
-    if (transformer != null) {
-      schema.put("transformers", singletonList(transformer));
-    }
-    return schema;
-  }
-
-  /** Records every {@code setTagTop} call on the mock into the returned map. */
-  private static Map<String, Object> captureCommittedTags(TraceSegment traceSegment) {
-    Map<String, Object> committedTags = new HashMap<>();
-    doAnswer(
-            invocation -> {
-              committedTags.put(invocation.getArgument(0), invocation.getArgument(1));
-              return null;
-            })
-        .when(traceSegment)
-        .setTagTop(anyString(), any());
-    return committedTags;
-  }
-
-  /**
-   * Tests that {@link AppSecRequestContext#close()} releases the request/response header maps and
-   * the published derivatives map by replacing references rather than mutating them in place, so
-   * that a reader on the trace-processing thread cannot observe a collection being emptied
-   * mid-iteration (APPSEC-70134).
-   *
-   * <p>The assertions read the private fields reflectively on purpose: the invariant is about which
-   * instance the context still points at, and the accessors deliberately hide that (the header
-   * getters null-coalesce, and {@code getDerivativeKeys} exposes only a key view).
-   */
-  @Nested
-  class ReleaseOnClose {
+
+        ctx.reportEvents(singletonList(new AppSecEvent()));
+        events = ctx.transferCollectedEvents();
+
+        assertEquals(1, events.size());
+        assertNotNull(events.iterator().next());
+    }
+
+    @Test
+    void collectEventsWhenNoneReported() {
+        assertTrue(ctx.transferCollectedEvents().isEmpty());
+    }
+
+    @Test
+    void canCollectStackTraces() {
+        StackTraceElement element = new StackTraceElement("class", "method", "file", 1);
+        StackTraceFrame frame = new StackTraceFrame(1, element);
+        StackTraceEvent event = new StackTraceEvent(singletonList(frame), "java", "id", "message");
+
+        ctx.reportStackTrace(event);
+        List<StackTraceEvent> result = ctx.getStackTraces();
+
+        assertEquals(1, result.size());
+        StackTraceEvent reportedEvent = result.get(0);
+        assertEquals("id", reportedEvent.getId());
+        assertEquals("message", reportedEvent.getMessage());
+        assertEquals("java", reportedEvent.getLanguage());
+        assertEquals(1, reportedEvent.getFrames().size());
+        StackTraceFrame reportedFrame = reportedEvent.getFrames().get(0);
+        assertEquals(1, reportedFrame.getId());
+        assertEquals("class.method(file:1)", reportedFrame.getText());
+        assertEquals("file", reportedFrame.getFile());
+        assertEquals(Integer.valueOf(1), reportedFrame.getLine());
+        assertEquals("class", reportedFrame.getClass_name());
+        assertEquals("method", reportedFrame.getFunction());
+    }
+
+    @Test
+    void collectStackTracesWhenNoneReported() {
+        assertNull(ctx.getStackTraces());
+    }
+
+    @ParameterizedTest(name = "{0} allow list contains only lowercase names")
+    @MethodSource("headersAllowListShouldContainOnlyLowercaseNamesArguments")
+    void headersAllowListShouldContainOnlyLowercaseNames(String name, Set<String> headers) {
+        for (String header : headers) {
+            assertEquals(
+                    header.toLowerCase(Locale.ROOT),
+                    header,
+                    "REASON: Allow header name \"" + header + "\" MUST be lowercase");
+        }
+    }
+
+    private static Stream<Arguments> headersAllowListShouldContainOnlyLowercaseNamesArguments() {
+        return Stream.of(
+                arguments("Default request headers", AppSecRequestContext.DEFAULT_REQUEST_HEADERS_ALLOW_LIST),
+                arguments("Request headers", AppSecRequestContext.REQUEST_HEADERS_ALLOW_LIST),
+                arguments("Response headers", AppSecRequestContext.RESPONSE_HEADERS_ALLOW_LIST));
+    }
+
+    @Test
+    void basicHeadersCollectionTest() {
+        ctx.addRequestHeader("Host", "127.0.0.1");
+        ctx.addRequestHeader("Content-Type", "text/html; charset=UTF-8");
+        ctx.addRequestHeader("Custom-Header", "value1");
+        ctx.addRequestHeader("Accept", "application/json");
+
+        Map<String, List<String>> expected = new HashMap<>();
+        expected.put("host", singletonList("127.0.0.1"));
+        expected.put("content-type", singletonList("text/html; charset=UTF-8"));
+        expected.put("custom-header", singletonList("value1"));
+        expected.put("accept", singletonList("application/json"));
+        assertEquals(expected, ctx.getRequestHeaders());
+    }
+
+    @Test
+    void nullHeadersShouldBeIgnored() {
+        ctx.addRequestHeader(null, "value");
+        ctx.addRequestHeader("key", null);
+
+        assertTrue(ctx.getRequestHeaders().isEmpty());
+    }
+
+    @Test
+    void concatMultipleValuesForSameHeader() {
+        ctx.addRequestHeader("Custom-Header", "value1");
+        ctx.addRequestHeader("CUSTOM-HEADER", "value2");
+        ctx.addRequestHeader("Accept", "application/json");
+        ctx.addRequestHeader("accept", "application/xml");
+
+        Map<String, List<String>> expected = new HashMap<>();
+        expected.put("custom-header", asList("value1", "value2"));
+        expected.put("accept", asList("application/json", "application/xml"));
+        assertEquals(expected, ctx.getRequestHeaders());
+    }
+
+    private WafContext createWafContext(AppSecRequestContext context) throws Exception {
+        assertTrue(WafInitialization.ONLINE, "libddwaf must be available for this test");
+        Waf.initialize(false);
+        if (wafBuilder != null) {
+            wafBuilder.close();
+        }
+        wafBuilder = new WafBuilder();
+        try (InputStream stream = getClass().getClassLoader().getResourceAsStream("test_multi_config.json")) {
+            wafBuilder.addOrUpdateConfig("test", ADAPTER.fromJson(Okio.buffer(Okio.source(stream))));
+        }
+        return context.getOrCreateWafContext(wafBuilder.buildWafHandleInstance(), false, false);
+    }
+
+    @Test
+    void closeClosesTheWafContext() throws Exception {
+        WafContext wafContext = createWafContext(ctx);
+
+        ctx.close();
+
+        // isWafContextClosed() is the public witness for the nulled wafContext field.
+        assertTrue(ctx.isWafContextClosed());
+        assertFalse(wafContext.isOnline());
+    }
+
+    @Test
+    void testIsThrottled() {
+        RateLimiter rateLimiter = mock(RateLimiter.class);
+        when(rateLimiter.isThrottled()).thenReturn(true);
+        AppSecRequestContext appSecRequestContext = new AppSecRequestContext();
+
+        // rate limiter is called and throttled is set
+        boolean result = appSecRequestContext.isThrottled(rateLimiter);
+
+        assertTrue(result);
+
+        // rate limiter is not called more than once per appsec context, returns first result
+        boolean secondResult = appSecRequestContext.isThrottled(rateLimiter);
+
+        assertEquals(result, secondResult);
+        verify(rateLimiter, times(1)).isThrottled();
+    }
+
+    @Test
+    void testThatInternalDataIsReleasedOnClose() throws Exception {
+        AppSecRequestContext context = new AppSecRequestContext();
+
+        context.addRequestHeader("Accept", "*");
+        context.addResponseHeader("Content-Type", "text/plain");
+        context.addCookies(singletonMap("cookie", singletonList("test")));
+        context.addAll(MapDataBundle.of(KnownAddresses.REQUEST_METHOD, "GET"));
+        // Use reportDerivatives to properly set values via AtomicReference
+        context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "test_value")));
+        WafContext wafContext = createWafContext(context);
+        context.close();
+
+        assertTrue(context.isWafContextClosed());
+        assertFalse(wafContext.isOnline());
+        // Check that derivatives AtomicReference contains null after close
+        assertNull(derivativesField(context).get());
+
+        // Field access, not the getter: it null-coalesces, so emptiness would prove nothing.
+        assertNull(requestHeadersField(context));
+        assertNull(responseHeadersField(context));
+        assertTrue(context.getCookies().isEmpty());
+        assertEquals(0, context.size());
+    }
+
+    @Test
+    void testIncreaseAndGetWafTimeouts() {
+        ctx.increaseWafTimeouts();
+        ctx.increaseWafTimeouts();
+
+        assertEquals(2, ctx.getWafTimeouts());
+    }
+
+    @Test
+    void testIncreaseAndGetRaspTimeouts() {
+        ctx.increaseRaspTimeouts();
+        ctx.increaseRaspTimeouts();
+
+        assertEquals(2, ctx.getRaspTimeouts());
+    }
 
     @Test
-    void closeDoesNotMutateThePublishedDerivativesMap() {
-      AppSecRequestContext context = new AppSecRequestContext();
-      context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "test_value")));
-      Map<String, Object> published = derivativesField(context).get();
-      assertEquals(singleton("test_attr"), published.keySet());
+    void closeLogsIfRequestEndWasNotCalled() {
+        TestLogCollector.enable();
+        try {
+            AppSecRequestContext context = new AppSecRequestContext();
+
+            context.close();
+
+            CapturedLog releaseLog = null;
+            for (CapturedLog captured : TestLogCollector.drainCapturedLogs()) {
+                if (captured.message.contains("Request end event was not called before close")) {
+                    releaseLog = captured;
+                    break;
+                }
+            }
+            assertNotNull(releaseLog);
+            assertEquals(SEND_TELEMETRY, releaseLog.marker);
+        } finally {
+            TestLogCollector.disable();
+        }
+    }
+
+    @Test
+    void testThatProcessedAttributesAreClearedOnClose() {
+        Map<String, Object> derivatives = new HashMap<>();
+        derivatives.put("numeric", "42");
+        derivatives.put("string", "value");
 
-      context.close();
+        ctx.reportDerivatives(derivatives);
+        ctx.close();
 
-      // The reference is detached, but the instance a concurrent reader holds is untouched.
-      assertNull(derivativesField(context).get());
-      assertEquals(singleton("test_attr"), published.keySet());
-      assertEquals("test_value", published.get("test_attr"));
+        assertTrue(ctx.getDerivativeKeys().isEmpty());
     }
 
     @Test
-    void closeReleasesTheHeaderMapsWithoutMutatingTheReaderSnapshots() {
-      AppSecRequestContext context = new AppSecRequestContext();
-      context.addRequestHeader("accept", "*");
-      context.addResponseHeader("content-type", "text/plain");
-      Map<String, List<String>> requestHeaders = context.getRequestHeaders();
-      Map<String, List<String>> responseHeaders = context.getResponseHeaders();
+    void testAttributeHandlingWithLiteralValuesAndRequestDataExtraction() {
+        AppSecRequestContext context = new AppSecRequestContext();
+        context.setMethod("POST");
+        context.setScheme("https");
+        context.setRawURI("/api/test");
+        context.setRoute("/api/{param}");
+        context.setResponseStatus(200);
+        context.addRequestHeader("user-agent", "TestAgent/1.0");
+        context.addRequestHeader("content-type", "application/json");
+
+        // Test data for attributes
+        Map<String, Object> attributes = new HashMap<>();
+        attributes.put("_dd.appsec.s.res.headers", literalValue("literal-header-value"));
+        attributes.put("_dd.appsec.s.res.method", addressValue("server.request.method"));
+        attributes.put("_dd.appsec.s.res.scheme", addressValue("server.request.scheme"));
+        attributes.put("_dd.appsec.s.res.uri", addressValue("server.request.uri.raw"));
+        attributes.put("_dd.appsec.s.res.route", addressValue("server.request.route"));
+        attributes.put("_dd.appsec.s.res.status", addressValue("server.response.status"));
+        attributes.put("_dd.appsec.s.res.user_agent", headerValue("user-agent", null));
+        attributes.put("_dd.appsec.s.res.content_type", headerValue("content-type", null));
+        attributes.put("_dd.appsec.s.res.user_agent_lower", headerValue("user-agent", "lowercase"));
+        attributes.put("_dd.appsec.s.res.content_type_upper", headerValue("content-type", "uppercase"));
+
+        context.reportDerivatives(attributes);
+        Set<String> keys = context.getDerivativeKeys();
+
+        assertEquals(new HashSet<>(attributes.keySet()), keys);
+    }
 
-      context.close();
+    @Test
+    void testAttributeHandlingWithUnknownAddress() {
+        AppSecRequestContext context = new AppSecRequestContext();
+        Map<String, Object> attributes =
+                singletonMap("_dd.appsec.s.res.unknown", addressValue("server.request.unknown"));
 
-      // Readers holding these maps (e.g. async schema extraction) still see their contents.
-      assertEquals(singletonMap("accept", singletonList("*")), requestHeaders);
-      assertEquals(singletonMap("content-type", singletonList("text/plain")), responseHeaders);
+        context.reportDerivatives(attributes);
+        Set<String> keys = context.getDerivativeKeys();
 
-      // The context dropped its own reference, so the contents are collectable.
-      assertNull(requestHeadersField(context));
-      assertNull(responseHeadersField(context));
+        // No attributes should be added for unknown addresses
+        assertTrue(keys.isEmpty());
     }
 
     @Test
-    void closeReleasesTheHeaderMapsWithoutAllocatingReplacements() {
-      AppSecRequestContext context = new AppSecRequestContext();
+    void testAttributeHandlingWithInvalidKeyPath() {
+        AppSecRequestContext context = new AppSecRequestContext();
+        context.addRequestHeader("user-agent", "TestAgent/1.0");
+        Map<String, Object> attributes =
+                singletonMap("_dd.appsec.s.res.invalid", headerValue("non-existent-header", null));
 
-      // An untouched context holds no header maps at all.
-      assertNull(requestHeadersField(context));
-      assertNull(responseHeadersField(context));
+        context.reportDerivatives(attributes);
+        Set<String> keys = context.getDerivativeKeys();
+
+        // No attributes should be added for invalid key paths
+        assertTrue(keys.isEmpty());
+    }
+
+    @Test
+    void testSamplingOfRequests() {
+        int maxRequests = Config.get().getApiSecurityMaxDownstreamRequestBodyAnalysis();
+        AppSecRequestContext context = new AppSecRequestContext();
+        Random random = new Random();
+        Map<Long, Boolean> sampledByRequestId = new HashMap<>();
+
+        for (int request = 0; request <= maxRequests; request++) {
+            long requestId = random.nextLong();
+            sampledByRequestId.put(requestId, context.sampleHttpClientRequest(requestId));
+        }
 
-      context.addRequestHeader("accept", "*");
-      context.addResponseHeader("content-type", "text/plain");
-      // close() runs twice per request: onRequestEnded, then onRootSpanPublished.
-      context.close();
-      context.close();
+        int sampledCount = 0;
+        for (Boolean sampled : sampledByRequestId.values()) {
+            if (sampled) {
+                sampledCount++;
+            }
+        }
+        assertEquals(maxRequests, sampledCount);
+        for (Map.Entry<Long, Boolean> entry : sampledByRequestId.entrySet()) {
+            assertEquals(entry.getValue(), context.isHttpClientRequestSampled(entry.getKey()));
+        }
+    }
 
-      assertNull(requestHeadersField(context));
-      assertNull(responseHeadersField(context));
-      // Readers see the shared empty map rather than a freshly allocated one.
-      assertSame(emptyMap(), context.getRequestHeaders());
-      assertSame(emptyMap(), context.getResponseHeaders());
+    @Test
+    void testCommitDerivativesWithDifferentValueTypes() {
+        AppSecRequestContext context = new AppSecRequestContext();
+        TraceSegment traceSegment = mock(TraceSegment.class);
+        // Capture what setTagTop is being called with
+        Map<String, Object> committedTags = captureCommittedTags(traceSegment);
+
+        // Set up derivatives with different types
+        Map<String, Object> derivatives = new HashMap<>();
+        derivatives.put("numeric_int", literalValue(42));
+        derivatives.put("numeric_double", literalValue(3.14));
+        derivatives.put("string_value", literalValue("test_string"));
+        derivatives.put("boolean_true", literalValue(true));
+        derivatives.put("boolean_false", literalValue(false));
+        derivatives.put("numeric_string", literalValue("100"));
+        derivatives.put("double_string", literalValue("99.5"));
+        derivatives.put("non_numeric_string", literalValue("not_a_number"));
+
+        context.reportDerivatives(derivatives);
+        boolean result = context.commitDerivatives(traceSegment);
+
+        assertTrue(result);
+        assertEquals(8, committedTags.size());
+
+        // Verify numeric values are preserved as numbers
+        assertEquals(42, committedTags.get("numeric_int"));
+        assertInstanceOf(Integer.class, committedTags.get("numeric_int"));
+
+        // Unlike Groovy, where 3.14 is a BigDecimal, Java gives a Double - both are Numbers
+        assertEquals(3.14, committedTags.get("numeric_double"));
+        assertInstanceOf(Number.class, committedTags.get("numeric_double"));
+
+        // Verify strings are handled correctly
+        assertEquals("test_string", committedTags.get("string_value"));
+        assertInstanceOf(String.class, committedTags.get("string_value"));
+
+        // Verify booleans are preserved
+        assertEquals(true, committedTags.get("boolean_true"));
+        assertInstanceOf(Boolean.class, committedTags.get("boolean_true"));
+
+        assertEquals(false, committedTags.get("boolean_false"));
+        assertInstanceOf(Boolean.class, committedTags.get("boolean_false"));
+
+        // Verify numeric strings are converted to numbers
+        assertEquals(100L, committedTags.get("numeric_string"));
+        assertInstanceOf(Long.class, committedTags.get("numeric_string"));
+
+        assertEquals(99.5, committedTags.get("double_string"));
+        assertInstanceOf(Number.class, committedTags.get("double_string"));
+
+        // Verify non-numeric strings remain strings
+        assertEquals("not_a_number", committedTags.get("non_numeric_string"));
+        assertInstanceOf(String.class, committedTags.get("non_numeric_string"));
     }
 
     @Test
-    void addressExtractionAfterCloseDoesNotRematerialiseTheHeaderMaps() {
-      AppSecRequestContext context = new AppSecRequestContext();
-      context.addRequestHeader("user-agent", "foo");
-      context.close();
+    void testCommitDerivativesClearsDerivativesAtomically() {
+        AppSecRequestContext context = new AppSecRequestContext();
+        TraceSegment traceSegment = mock(TraceSegment.class);
+        Map<String, Object> derivatives = new HashMap<>();
+        derivatives.put("attr1", literalValue("value1"));
+        derivatives.put("attr2", literalValue("value2"));
+
+        context.reportDerivatives(derivatives);
+
+        assertEquals(2, context.getDerivativeKeys().size());
 
-      // A late WAF result extracts an attribute from a header address.
-      context.reportDerivatives(
-          singletonMap("_dd.appsec.s.res.user_agent", headerValue("user-agent", null)));
+        context.commitDerivatives(traceSegment);
 
-      // The address lookup read the released field instead of allocating a new map.
-      assertNull(requestHeadersField(context));
-      assertSame(emptyMap(), context.getRequestHeaders());
-      assertTrue(context.getDerivativeKeys().isEmpty());
+        // Derivatives should be cleared after commit
+        assertTrue(context.getDerivativeKeys().isEmpty());
+        assertNull(derivativesField(context).get());
     }
 
     @Test
-    void headersCanStillBeRecordedAfterClose() {
-      AppSecRequestContext context = new AppSecRequestContext();
-      context.close();
+    void testCommitDerivativesWithNullTraceSegmentReturnsFalse() {
+        AppSecRequestContext context = new AppSecRequestContext();
+
+        assertFalse(context.commitDerivatives(null));
+    }
+
+    @Test
+    void testMultipleReportDerivativesCallsAccumulateValues() {
+        AppSecRequestContext context = new AppSecRequestContext();
+
+        // First report
+        Map<String, Object> firstReport = new HashMap<>();
+        firstReport.put("attr1", literalValue("value1"));
+        firstReport.put("attr2", literalValue("value2"));
+        context.reportDerivatives(firstReport);
 
-      // A late header arrives after the maps were released; it is accepted, as it was when close()
-      // cleared the maps in place.
-      context.addRequestHeader("accept", "*");
-      context.addResponseHeader("content-type", "text/plain");
+        assertEquals(new HashSet<>(asList("attr1", "attr2")), context.getDerivativeKeys());
 
-      assertEquals(singletonMap("accept", singletonList("*")), context.getRequestHeaders());
-      assertEquals(
-          singletonMap("content-type", singletonList("text/plain")), context.getResponseHeaders());
+        // Second report - should accumulate
+        Map<String, Object> secondReport = new HashMap<>();
+        secondReport.put("attr3", literalValue("value3"));
+        secondReport.put("attr4", literalValue("value4"));
+        context.reportDerivatives(secondReport);
+
+        assertEquals(new HashSet<>(asList("attr1", "attr2", "attr3", "attr4")), context.getDerivativeKeys());
+    }
+
+    @Test
+    void testMultipleReportDerivativesWithOverlappingKeysUsesLastValue() {
+        AppSecRequestContext context = new AppSecRequestContext();
+        TraceSegment traceSegment = mock(TraceSegment.class);
+        Map<String, Object> committedTags = captureCommittedTags(traceSegment);
+
+        // First report
+        context.reportDerivatives(singletonMap("attr1", literalValue("first_value")));
+        // Second report with same key - should overwrite
+        context.reportDerivatives(singletonMap("attr1", literalValue("second_value")));
+        context.commitDerivatives(traceSegment);
+
+        assertEquals("second_value", committedTags.get("attr1"));
     }
 
     @Test
-    void reportDerivativesPublishesANewMapAndLeavesEarlierSnapshotsUntouched() {
-      AppSecRequestContext context = new AppSecRequestContext();
-      context.reportDerivatives(singletonMap("attr1", literalValue("value1")));
-      Map<String, Object> first = derivativesField(context).get();
+    void testReportDerivativesMaintainsDataIntegrityUnderConcurrentAccess() throws Exception {
+        AppSecRequestContext context = new AppSecRequestContext();
+        int numThreads = 3;
+        CountDownLatch startLatch = new CountDownLatch(1);
+
+        // Simulate concurrent updates from multiple threads
+        ExecutorService executorService = Executors.newFixedThreadPool(numThreads);
+        List<Future<?>> futures = new ArrayList<>();
+        try {
+            for (int thread = 0; thread < numThreads; thread++) {
+                int firstAttribute = thread * 2 + 1;
+                futures.add(executorService.submit(() -> {
+                    startLatch.await(); // Wait for all threads to be ready
+                    context.reportDerivatives(
+                            singletonMap("attr" + firstAttribute, literalValue("value" + firstAttribute)));
+                    context.reportDerivatives(
+                            singletonMap("attr" + (firstAttribute + 1), literalValue("value" + (firstAttribute + 1))));
+                    return null;
+                }));
+            }
 
-      context.reportDerivatives(singletonMap("attr2", literalValue("value2")));
-      Map<String, Object> second = derivativesField(context).get();
+            // Release all threads at once to maximize concurrent execution
+            startLatch.countDown();
 
-      assertNotSame(first, second);
-      assertEquals(singleton("attr1"), first.keySet());
-      assertEquals(new HashSet<>(asList("attr1", "attr2")), second.keySet());
+            // Wait for all tasks to complete using the futures
+            for (Future<?> future : futures) {
+                future.get();
+            }
+        } finally {
+            executorService.shutdown();
+        }
+
+        // Verify all attributes were added despite concurrent access
+        Set<String> keys = context.getDerivativeKeys();
+        // At least the 6 we explicitly added
+        assertTrue(keys.size() >= 6, "expected at least 6 derivative keys, got " + keys);
+        for (int attribute = 1; attribute <= 6; attribute++) {
+            assertTrue(keys.contains("attr" + attribute), "Missing attribute: attr" + attribute);
+        }
+    }
+
+    @ParameterizedTest(name = "numeric conversion with edge cases: {0}")
+    @MethodSource("testNumericConversionWithEdgeCasesArguments")
+    void testNumericConversionWithEdgeCases(String description, String inputValue, Object expectedValue) {
+        AppSecRequestContext context = new AppSecRequestContext();
+        TraceSegment traceSegment = mock(TraceSegment.class);
+        Map<String, Object> committedTags = captureCommittedTags(traceSegment);
+
+        context.reportDerivatives(singletonMap("test_attr", literalValue(inputValue)));
+        context.commitDerivatives(traceSegment);
+
+        // When conversion fails (expectedValue is null), the original string value should be preserved
+        // When conversion succeeds, the converted numeric value should be used
+        assertEquals(expectedValue != null ? expectedValue : inputValue, committedTags.get("test_attr"));
+    }
+
+    private static Stream<Arguments> testNumericConversionWithEdgeCasesArguments() {
+        return Stream.of(
+                // Valid integers
+                arguments("zero", "0", 0L),
+                arguments("positive integer", "42", 42L),
+                arguments("negative integer", "-100", -100L),
+                arguments("integer with plus sign", "+999", 999L),
+                arguments("large valid long", "9223372036854775807", 9223372036854775807L),
+                arguments("large negative long", "-9223372036854775808", -9223372036854775808L),
+
+                // Valid decimals
+                arguments("simple decimal", "3.14", 3.14d),
+                arguments("negative decimal", "-0.5", -0.5d),
+                arguments("decimal with plus sign", "+99.99", 99.99d),
+                arguments("zero decimal", "0.0", 0.0d),
+                arguments("decimal with many digits", "123.456789", 123.456789d),
+
+                // Whitespace handling (should now parse after trim - issue #10494 fix)
+                arguments("leading whitespace integer", " 42", 42L),
+                arguments("trailing whitespace integer", "42 ", 42L),
+                arguments("both whitespace integer", " 42 ", 42L),
+                arguments("tab and newline whitespace", "\t100\n", 100L),
+                arguments("multiple spaces decimal", "  -3.14  ", -3.14d),
+
+                // Empty and null
+                arguments("null value", null, null),
+                arguments("empty string", "", null),
+                arguments("whitespace only", "   ", null),
+                arguments("tab only", "\t", null),
+
+                // Invalid formats (should return null, original string preserved)
+                arguments("alphabetic string", "abc", null),
+                arguments("alphanumeric string", "12x34", null),
+                arguments("multiple decimals", "3.14.15", null),
+                arguments("multiple signs", "+-5", null),
+                arguments("sign in middle", "12-34", null),
+
+                // Sign-only strings
+                arguments("plus sign only", "+", null),
+                arguments("minus sign only", "-", null),
+                arguments("plus with whitespace", " + ", null),
+
+                // Overflow cases (should return null gracefully)
+                arguments("long overflow positive", "9223372036854775808", null),
+                arguments("long overflow negative", "-9223372036854775809", null),
+                arguments("very large number", "99999999999999999999999", null),
+
+                // Scientific notation (now supported for backward compatibility)
+                arguments("scientific notation lowercase", "1e10", 1.0e10d),
+                arguments("scientific notation uppercase", "1E10", 1.0E10d),
+                arguments("scientific with decimal", "1.5e10", 1.5e10d),
+                arguments("scientific negative exponent", "3.5E-7", 3.5E-7d),
+                arguments("scientific with sign", "-2.5e+3", -2.5e+3d),
+                arguments("scientific integer base", "5e3", 5000.0d),
+
+                // Exotic number formats (not supported)
+                arguments("hexadecimal", "0x10", null),
+                arguments("binary", "0b1010", null),
+                arguments("octal", "0777", 777L),
+
+                // Edge decimal cases (note: .5 and 5. are valid Java double literals)
+                arguments("decimal starts with dot", ".5", 0.5d),
+                arguments("decimal ends with dot", "5.", 5.0d),
+                arguments("dot only", ".", null),
+                arguments("multiple dots", "...", null),
+
+                // Regression - ensure existing valid formats still work
+                arguments("regression valid integer", "100", 100L),
+                arguments("regression valid decimal", "99.5", 99.5d),
+                arguments("regression negative", "-50", -50L),
+
+                // Special characters
+                arguments("comma separator", "1,000", null),
+                arguments("underscore separator", "1_000", null),
+                arguments("currency symbol", "$100", null),
+                arguments("percentage", "50%", null),
+
+                // Edge cases with zeros
+                arguments("zero with plus", "+0", 0L),
+                arguments("zero with minus", "-0", 0L),
+                arguments("decimal zero variations", "0.00", 0.0d));
     }
 
     @Test
-    void publishedDerivativesMapRejectsMutation() {
-      AppSecRequestContext context = new AppSecRequestContext();
-      context.reportDerivatives(singletonMap("test_attr", literalValue("test_value")));
-      Map<String, Object> published = derivativesField(context).get();
+    void testGetDerivativeKeysWithEmptyDerivatives() {
+        AppSecRequestContext context = new AppSecRequestContext();
 
-      assertThrows(UnsupportedOperationException.class, published::clear);
+        assertTrue(context.getDerivativeKeys().isEmpty());
     }
 
-    @ParameterizedTest(name = "hasDerivativeKeyStartingWith: {0}")
-    @MethodSource("com.datadog.appsec.gateway.AppSecRequestContextTest#derivativePrefixScenarios")
-    void hasDerivativeKeyStartingWith(
-        String scenario, Map<String, Object> derivatives, boolean expected) {
-      AppSecRequestContext context = new AppSecRequestContext();
-      context.reportDerivatives(derivatives);
+    @Test
+    void testReportDerivativesWithExtractedValuesFromRequestData() {
+        AppSecRequestContext context = new AppSecRequestContext();
+        context.setMethod("POST");
+        context.addRequestHeader("x-custom-header", "custom_value");
+
+        Map<String, Object> derivatives = new HashMap<>();
+        derivatives.put("extracted_method", addressValue("server.request.method"));
+        derivatives.put("extracted_header", headerValue("x-custom-header", null));
 
-      assertEquals(expected, context.hasDerivativeKeyStartingWith("_dd.appsec.s."));
+        context.reportDerivatives(derivatives);
+        Set<String> keys = context.getDerivativeKeys();
+
+        assertEquals(new HashSet<>(asList("extracted_method", "extracted_header")), keys);
     }
 
     @Test
-    void aNullDerivativeKeyIsStoredButNeverMatches() {
-      AppSecRequestContext context = new AppSecRequestContext();
-      context.reportDerivatives(singletonMap(null, literalValue("x")));
+    void testReportDerivativesWithTransformers() {
+        AppSecRequestContext context = new AppSecRequestContext();
+        context.addRequestHeader("user-agent", "Mozilla/5.0");
+
+        Map<String, Object> derivatives = new HashMap<>();
+        derivatives.put("ua_lowercase", headerValue("user-agent", "lowercase"));
+        derivatives.put("ua_uppercase", headerValue("user-agent", "uppercase"));
+
+        context.reportDerivatives(derivatives);
+        Set<String> keys = context.getDerivativeKeys();
+
+        assertEquals(new HashSet<>(asList("ua_lowercase", "ua_uppercase")), keys);
+    }
 
-      assertTrue(context.getDerivativeKeys().contains(null));
-      assertFalse(context.hasDerivativeKeyStartingWith("_dd.appsec.s."));
+    /** A derivative schema holding a literal value, reported as-is. */
+    private static Map<String, Object> literalValue(Object value) {
+        return singletonMap("value", value);
     }
-  }
 
-  /** Declared on the outer class: {@code @MethodSource} factories must be static. */
-  private static Stream<Arguments> derivativePrefixScenarios() {
-    Map<String, Object> severalKeys = new HashMap<>();
-    severalKeys.put("_dd.appsec.fp.http.header", literalValue("x"));
-    severalKeys.put("_dd.appsec.s.req.body", literalValue("y"));
-    return Stream.of(
-        arguments("no derivatives reported", emptyMap(), false),
-        arguments("matching key", singletonMap("_dd.appsec.s.req.body", literalValue("x")), true),
-        arguments(
-            "non-matching key",
-            singletonMap("_dd.appsec.fp.http.header", literalValue("x")),
-            false),
-        arguments("one of several matches", severalKeys, true));
-  }
+    /** A derivative schema extracting the whole value stored at the given address. */
+    private static Map<String, Object> addressValue(String address) {
+        return singletonMap("address", address);
+    }
+
+    /**
+     * A derivative schema extracting one request header, optionally through a transformer.
+     *
+     * @param transformer the transformer to apply, or {@code null} for none
+     */
+    private static Map<String, Object> headerValue(String header, String transformer) {
+        Map<String, Object> schema = new HashMap<>();
+        schema.put("address", "server.request.headers");
+        schema.put("key_path", singletonList(header));
+        if (transformer != null) {
+            schema.put("transformers", singletonList(transformer));
+        }
+        return schema;
+    }
+
+    /** Records every {@code setTagTop} call on the mock into the returned map. */
+    private static Map<String, Object> captureCommittedTags(TraceSegment traceSegment) {
+        Map<String, Object> committedTags = new HashMap<>();
+        doAnswer(invocation -> {
+                    committedTags.put(invocation.getArgument(0), invocation.getArgument(1));
+                    return null;
+                })
+                .when(traceSegment)
+                .setTagTop(anyString(), any());
+        return committedTags;
+    }
+
+    /**
+     * Tests that {@link AppSecRequestContext#close()} releases the request/response header maps and
+     * the published derivatives map by replacing references rather than mutating them in place, so
+     * that a reader on the trace-processing thread cannot observe a collection being emptied
+     * mid-iteration (APPSEC-70134).
+     *
+     * <p>The assertions read the private fields reflectively on purpose: the invariant is about which
+     * instance the context still points at, and the accessors deliberately hide that (the header
+     * getters null-coalesce, and {@code getDerivativeKeys} exposes only a key view).
+     */
+    @Nested
+    class ReleaseOnClose {
+
+        @Test
+        void closeDoesNotMutateThePublishedDerivativesMap() {
+            AppSecRequestContext context = new AppSecRequestContext();
+            context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "test_value")));
+            Map<String, Object> published = derivativesField(context).get();
+            assertEquals(singleton("test_attr"), published.keySet());
+
+            context.close();
+
+            // The reference is detached, but the instance a concurrent reader holds is untouched.
+            assertNull(derivativesField(context).get());
+            assertEquals(singleton("test_attr"), published.keySet());
+            assertEquals("test_value", published.get("test_attr"));
+        }
+
+        @Test
+        void closeReleasesTheHeaderMapsWithoutMutatingTheReaderSnapshots() {
+            AppSecRequestContext context = new AppSecRequestContext();
+            context.addRequestHeader("accept", "*");
+            context.addResponseHeader("content-type", "text/plain");
+            Map<String, List<String>> requestHeaders = context.getRequestHeaders();
+            Map<String, List<String>> responseHeaders = context.getResponseHeaders();
+
+            context.close();
+
+            // Readers holding these maps (e.g. async schema extraction) still see their contents.
+            assertEquals(singletonMap("accept", singletonList("*")), requestHeaders);
+            assertEquals(singletonMap("content-type", singletonList("text/plain")), responseHeaders);
 
-  @SuppressWarnings("unchecked")
-  private static Map<String, List<String>> requestHeadersField(AppSecRequestContext context) {
-    return (Map<String, List<String>>) readField(context, "requestHeaders");
-  }
+            // The context dropped its own reference, so the contents are collectable.
+            assertNull(requestHeadersField(context));
+            assertNull(responseHeadersField(context));
+        }
+
+        @Test
+        void closeReleasesTheHeaderMapsWithoutAllocatingReplacements() {
+            AppSecRequestContext context = new AppSecRequestContext();
+
+            // An untouched context holds no header maps at all.
+            assertNull(requestHeadersField(context));
+            assertNull(responseHeadersField(context));
+
+            context.addRequestHeader("accept", "*");
+            context.addResponseHeader("content-type", "text/plain");
+            // close() runs twice per request: onRequestEnded, then onRootSpanPublished.
+            context.close();
+            context.close();
+
+            assertNull(requestHeadersField(context));
+            assertNull(responseHeadersField(context));
+            // Readers see the shared empty map rather than a freshly allocated one.
+            assertSame(emptyMap(), context.getRequestHeaders());
+            assertSame(emptyMap(), context.getResponseHeaders());
+        }
+
+        @Test
+        void addressExtractionAfterCloseDoesNotRematerialiseTheHeaderMaps() {
+            AppSecRequestContext context = new AppSecRequestContext();
+            context.addRequestHeader("user-agent", "foo");
+            context.close();
+
+            // A late WAF result extracts an attribute from a header address.
+            context.reportDerivatives(singletonMap("_dd.appsec.s.res.user_agent", headerValue("user-agent", null)));
+
+            // The address lookup read the released field instead of allocating a new map.
+            assertNull(requestHeadersField(context));
+            assertSame(emptyMap(), context.getRequestHeaders());
+            assertTrue(context.getDerivativeKeys().isEmpty());
+        }
+
+        @Test
+        void headersCanStillBeRecordedAfterClose() {
+            AppSecRequestContext context = new AppSecRequestContext();
+            context.close();
+
+            // A late header arrives after the maps were released; it is accepted, as it was when close()
+            // cleared the maps in place.
+            context.addRequestHeader("accept", "*");
+            context.addResponseHeader("content-type", "text/plain");
+
+            assertEquals(singletonMap("accept", singletonList("*")), context.getRequestHeaders());
+            assertEquals(singletonMap("content-type", singletonList("text/plain")), context.getResponseHeaders());
+        }
 
-  @SuppressWarnings("unchecked")
-  private static Map<String, List<String>> responseHeadersField(AppSecRequestContext context) {
-    return (Map<String, List<String>>) readField(context, "responseHeaders");
-  }
+        @Test
+        void reportDerivativesPublishesANewMapAndLeavesEarlierSnapshotsUntouched() {
+            AppSecRequestContext context = new AppSecRequestContext();
+            context.reportDerivatives(singletonMap("attr1", literalValue("value1")));
+            Map<String, Object> first = derivativesField(context).get();
 
-  @SuppressWarnings("unchecked")
-  private static AtomicReference<Map<String, Object>> derivativesField(
-      AppSecRequestContext context) {
-    return (AtomicReference<Map<String, Object>>) readField(context, "derivatives");
-  }
+            context.reportDerivatives(singletonMap("attr2", literalValue("value2")));
+            Map<String, Object> second = derivativesField(context).get();
 
-  /**
-   * Reads {@link AppSecRequestContext} private state for assertions whose invariant is about which
-   * instance the context still points at, rather than what its accessors report. The header getters
-   * null-coalesce to {@code emptyMap()} and {@code getDerivativeKeys} exposes only a key view, so
-   * neither can distinguish "released" from "empty".
-   */
-  private static Object readField(AppSecRequestContext context, String fieldName) {
-    try {
-      Field field = AppSecRequestContext.class.getDeclaredField(fieldName);
-      field.setAccessible(true);
-      return field.get(context);
-    } catch (ReflectiveOperationException e) {
-      throw new AssertionError("Cannot read " + fieldName, e);
+            assertNotSame(first, second);
+            assertEquals(singleton("attr1"), first.keySet());
+            assertEquals(new HashSet<>(asList("attr1", "attr2")), second.keySet());
+        }
+
+        @Test
+        void publishedDerivativesMapRejectsMutation() {
+            AppSecRequestContext context = new AppSecRequestContext();
+            context.reportDerivatives(singletonMap("test_attr", literalValue("test_value")));
+            Map<String, Object> published = derivativesField(context).get();
+
+            assertThrows(UnsupportedOperationException.class, published::clear);
+        }
+
+        @ParameterizedTest(name = "hasDerivativeKeyStartingWith: {0}")
+        @MethodSource("com.datadog.appsec.gateway.AppSecRequestContextTest#derivativePrefixScenarios")
+        void hasDerivativeKeyStartingWith(String scenario, Map<String, Object> derivatives, boolean expected) {
+            AppSecRequestContext context = new AppSecRequestContext();
+            context.reportDerivatives(derivatives);
+
+            assertEquals(expected, context.hasDerivativeKeyStartingWith("_dd.appsec.s."));
+        }
+
+        @Test
+        void aNullDerivativeKeyIsStoredButNeverMatches() {
+            AppSecRequestContext context = new AppSecRequestContext();
+            context.reportDerivatives(singletonMap(null, literalValue("x")));
+
+            assertTrue(context.getDerivativeKeys().contains(null));
+            assertFalse(context.hasDerivativeKeyStartingWith("_dd.appsec.s."));
+        }
+    }
+
+    /** Declared on the outer class: {@code @MethodSource} factories must be static. */
+    private static Stream<Arguments> derivativePrefixScenarios() {
+        Map<String, Object> severalKeys = new HashMap<>();
+        severalKeys.put("_dd.appsec.fp.http.header", literalValue("x"));
+        severalKeys.put("_dd.appsec.s.req.body", literalValue("y"));
+        return Stream.of(
+                arguments("no derivatives reported", emptyMap(), false),
+                arguments("matching key", singletonMap("_dd.appsec.s.req.body", literalValue("x")), true),
+                arguments("non-matching key", singletonMap("_dd.appsec.fp.http.header", literalValue("x")), false),
+                arguments("one of several matches", severalKeys, true));
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, List<String>> requestHeadersField(AppSecRequestContext context) {
+        return (Map<String, List<String>>) readField(context, "requestHeaders");
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, List<String>> responseHeadersField(AppSecRequestContext context) {
+        return (Map<String, List<String>>) readField(context, "responseHeaders");
+    }
+
+    @SuppressWarnings("unchecked")
+    private static AtomicReference<Map<String, Object>> derivativesField(AppSecRequestContext context) {
+        return (AtomicReference<Map<String, Object>>) readField(context, "derivatives");
+    }
+
+    /**
+     * Reads {@link AppSecRequestContext} private state for assertions whose invariant is about which
+     * instance the context still points at, rather than what its accessors report. The header getters
+     * null-coalesce to {@code emptyMap()} and {@code getDerivativeKeys} exposes only a key view, so
+     * neither can distinguish "released" from "empty".
+     */
+    private static Object readField(AppSecRequestContext context, String fieldName) {
+        try {
+            Field field = AppSecRequestContext.class.getDeclaredField(fieldName);
+            field.setAccessible(true);
+            return field.get(context);
+        } catch (ReflectiveOperationException e) {
+            throw new AssertionError("Cannot read " + fieldName, e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/gateway/AppSecRequestContextWafContextRaceTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/gateway/AppSecRequestContextWafContextRaceTest.java
index f9c3e78ddf2..e1e4326a555 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/gateway/AppSecRequestContextWafContextRaceTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/gateway/AppSecRequestContextWafContextRaceTest.java
@@ -34,166 +34,159 @@
  */
 class AppSecRequestContextWafContextRaceTest {
 
-  private static final JsonAdapter<Map<String, Object>> ADAPTER =
-      new Moshi.Builder()
-          .build()
-          .adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
-
-  private WafBuilder wafBuilder;
-  private WafHandle wafHandle;
-
-  @BeforeEach
-  void setup() throws Exception {
-    // Force the native library to load and initialize.
-    assertTrue(WafInitialization.ONLINE, "libddwaf must be available for this test");
-    Waf.initialize(false);
-    wafBuilder = new WafBuilder();
-    try (InputStream stream =
-        getClass().getClassLoader().getResourceAsStream("test_multi_config.json")) {
-      wafBuilder.addOrUpdateConfig("test", ADAPTER.fromJson(Okio.buffer(Okio.source(stream))));
+    private static final JsonAdapter<Map<String, Object>> ADAPTER =
+            new Moshi.Builder().build().adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
+
+    private WafBuilder wafBuilder;
+    private WafHandle wafHandle;
+
+    @BeforeEach
+    void setup() throws Exception {
+        // Force the native library to load and initialize.
+        assertTrue(WafInitialization.ONLINE, "libddwaf must be available for this test");
+        Waf.initialize(false);
+        wafBuilder = new WafBuilder();
+        try (InputStream stream = getClass().getClassLoader().getResourceAsStream("test_multi_config.json")) {
+            wafBuilder.addOrUpdateConfig("test", ADAPTER.fromJson(Okio.buffer(Okio.source(stream))));
+        }
+        wafHandle = wafBuilder.buildWafHandleInstance();
     }
-    wafHandle = wafBuilder.buildWafHandleInstance();
-  }
 
-  @AfterEach
-  void tearDown() {
-    if (wafBuilder != null) {
-      wafBuilder.close();
+    @AfterEach
+    void tearDown() {
+        if (wafBuilder != null) {
+            wafBuilder.close();
+        }
     }
-  }
-
-  @Test
-  void firstUseCreatesContext() {
-    AppSecRequestContext ctx = new AppSecRequestContext();
-    try {
-      WafContext created = ctx.getOrCreateWafContext(wafHandle, false, false);
-      assertNotNull(created);
-      assertTrue(created.isOnline());
-      assertFalse(ctx.isWafContextClosed());
-    } finally {
-      ctx.closeWafContext();
+
+    @Test
+    void firstUseCreatesContext() {
+        AppSecRequestContext ctx = new AppSecRequestContext();
+        try {
+            WafContext created = ctx.getOrCreateWafContext(wafHandle, false, false);
+            assertNotNull(created);
+            assertTrue(created.isOnline());
+            assertFalse(ctx.isWafContextClosed());
+        } finally {
+            ctx.closeWafContext();
+        }
     }
-  }
-
-  @Test
-  void reuseBeforeCloseReturnsSameInstance() {
-    AppSecRequestContext ctx = new AppSecRequestContext();
-    try {
-      WafContext first = ctx.getOrCreateWafContext(wafHandle, false, false);
-      WafContext second = ctx.getOrCreateWafContext(wafHandle, false, false);
-      assertNotNull(first);
-      assertSame(first, second);
-    } finally {
-      ctx.closeWafContext();
+
+    @Test
+    void reuseBeforeCloseReturnsSameInstance() {
+        AppSecRequestContext ctx = new AppSecRequestContext();
+        try {
+            WafContext first = ctx.getOrCreateWafContext(wafHandle, false, false);
+            WafContext second = ctx.getOrCreateWafContext(wafHandle, false, false);
+            assertNotNull(first);
+            assertSame(first, second);
+        } finally {
+            ctx.closeWafContext();
+        }
     }
-  }
-
-  @Test
-  void rejectsCreationAfterClose() {
-    AppSecRequestContext ctx = new AppSecRequestContext();
-    WafContext created = ctx.getOrCreateWafContext(wafHandle, false, false);
-    assertNotNull(created);
-
-    ctx.closeWafContext();
-    assertTrue(ctx.isWafContextClosed());
-    assertFalse(created.isOnline());
-
-    // A late/async caller must not resurrect a brand-new orphaned context.
-    WafContext afterClose = ctx.getOrCreateWafContext(wafHandle, false, false);
-    assertNull(afterClose);
-    assertTrue(ctx.isWafContextClosed());
-  }
-
-  @Test
-  void closeBeforeFirstUsePreventsLaterCreation() {
-    AppSecRequestContext ctx = new AppSecRequestContext();
-
-    // Close before the WAF ever ran for this request (e.g. an early-blocked request).
-    ctx.closeWafContext();
-    assertTrue(ctx.isWafContextClosed());
-
-    // A late/async caller must not create a brand-new orphaned context after close.
-    WafContext afterClose = ctx.getOrCreateWafContext(wafHandle, false, false);
-    assertNull(afterClose);
-    assertTrue(ctx.isWafContextClosed());
-  }
-
-  @Test
-  void fallbackCloseDoesNotClosePendingApiSecurityWafContext() {
-    AppSecRequestContext ctx = new AppSecRequestContext();
-    WafContext created = ctx.getOrCreateWafContext(wafHandle, false, false);
-    assertNotNull(created);
-
-    // API Security has sampled this request and asked to keep the context open for later
-    // schema-extraction post-processing (see ApiSecuritySamplerImpl#preSampleRequest).
-    ctx.setKeepOpenForApiSecurityPostProcessing(true);
-
-    // The generic fallback close (CoreTracer#onRootSpanPublished) must not tear down the WAF
-    // context while API Security post-processing is still pending, or schema extraction would
-    // run against an already-closed context.
-    ctx.close();
-    assertFalse(ctx.isWafContextClosed());
-    assertTrue(created.isOnline());
-
-    // AppSecSpanPostProcessor#process's finally block: post-processing is done, now really close.
-    ctx.setKeepOpenForApiSecurityPostProcessing(false);
-    ctx.closeWafContext();
-    ctx.close();
-
-    assertTrue(ctx.isWafContextClosed());
-    assertFalse(created.isOnline());
-  }
-
-  /**
-   * Drives {@code closeWafContext()} and {@code getOrCreateWafContext()} concurrently via a barrier
-   * across many iterations. The invariant: whatever {@code getOrCreateWafContext} returns after the
-   * race is either the ORIGINAL context (same instance, still online) or {@code null} - never a
-   * second/different instance. At the end, no observed context may still be online (all created
-   * contexts were eventually closed - no orphans).
-   */
-  @Test
-  void concurrentCloseNeverCreatesOrphan() throws Exception {
-    final int iterations = 5_000;
-    ExecutorService pool = Executors.newFixedThreadPool(2);
-    List<WafContext> observed = new ArrayList<>(iterations);
-    try {
-      for (int i = 0; i < iterations; i++) {
-        final AppSecRequestContext ctx = new AppSecRequestContext();
-        WafContext original = ctx.getOrCreateWafContext(wafHandle, false, false);
-        assertNotNull(original);
-        observed.add(original);
-
-        final CyclicBarrier barrier = new CyclicBarrier(2);
-        Future<?> closer =
-            pool.submit(
-                () -> {
-                  barrier.await();
-                  ctx.closeWafContext();
-                  return null;
-                });
-        Future<WafContext> creator =
-            pool.submit(
-                () -> {
-                  barrier.await();
-                  return ctx.getOrCreateWafContext(wafHandle, false, false);
-                });
 
-        closer.get();
-        WafContext late = creator.get();
+    @Test
+    void rejectsCreationAfterClose() {
+        AppSecRequestContext ctx = new AppSecRequestContext();
+        WafContext created = ctx.getOrCreateWafContext(wafHandle, false, false);
+        assertNotNull(created);
 
-        // Never a freshly created second context: only the original or null.
-        if (late != null) {
-          assertSame(original, late, "getOrCreateWafContext resurrected a new orphan context");
-        }
+        ctx.closeWafContext();
+        assertTrue(ctx.isWafContextClosed());
+        assertFalse(created.isOnline());
+
+        // A late/async caller must not resurrect a brand-new orphaned context.
+        WafContext afterClose = ctx.getOrCreateWafContext(wafHandle, false, false);
+        assertNull(afterClose);
+        assertTrue(ctx.isWafContextClosed());
+    }
+
+    @Test
+    void closeBeforeFirstUsePreventsLaterCreation() {
+        AppSecRequestContext ctx = new AppSecRequestContext();
+
+        // Close before the WAF ever ran for this request (e.g. an early-blocked request).
+        ctx.closeWafContext();
+        assertTrue(ctx.isWafContextClosed());
+
+        // A late/async caller must not create a brand-new orphaned context after close.
+        WafContext afterClose = ctx.getOrCreateWafContext(wafHandle, false, false);
+        assertNull(afterClose);
         assertTrue(ctx.isWafContextClosed());
-      }
-    } finally {
-      pool.shutdownNow();
     }
 
-    // Global invariant: every created context was eventually closed - no orphan left online.
-    for (WafContext context : observed) {
-      assertFalse(context.isOnline(), "orphaned WafContext left online (never closed)");
+    @Test
+    void fallbackCloseDoesNotClosePendingApiSecurityWafContext() {
+        AppSecRequestContext ctx = new AppSecRequestContext();
+        WafContext created = ctx.getOrCreateWafContext(wafHandle, false, false);
+        assertNotNull(created);
+
+        // API Security has sampled this request and asked to keep the context open for later
+        // schema-extraction post-processing (see ApiSecuritySamplerImpl#preSampleRequest).
+        ctx.setKeepOpenForApiSecurityPostProcessing(true);
+
+        // The generic fallback close (CoreTracer#onRootSpanPublished) must not tear down the WAF
+        // context while API Security post-processing is still pending, or schema extraction would
+        // run against an already-closed context.
+        ctx.close();
+        assertFalse(ctx.isWafContextClosed());
+        assertTrue(created.isOnline());
+
+        // AppSecSpanPostProcessor#process's finally block: post-processing is done, now really close.
+        ctx.setKeepOpenForApiSecurityPostProcessing(false);
+        ctx.closeWafContext();
+        ctx.close();
+
+        assertTrue(ctx.isWafContextClosed());
+        assertFalse(created.isOnline());
+    }
+
+    /**
+     * Drives {@code closeWafContext()} and {@code getOrCreateWafContext()} concurrently via a barrier
+     * across many iterations. The invariant: whatever {@code getOrCreateWafContext} returns after the
+     * race is either the ORIGINAL context (same instance, still online) or {@code null} - never a
+     * second/different instance. At the end, no observed context may still be online (all created
+     * contexts were eventually closed - no orphans).
+     */
+    @Test
+    void concurrentCloseNeverCreatesOrphan() throws Exception {
+        final int iterations = 5_000;
+        ExecutorService pool = Executors.newFixedThreadPool(2);
+        List<WafContext> observed = new ArrayList<>(iterations);
+        try {
+            for (int i = 0; i < iterations; i++) {
+                final AppSecRequestContext ctx = new AppSecRequestContext();
+                WafContext original = ctx.getOrCreateWafContext(wafHandle, false, false);
+                assertNotNull(original);
+                observed.add(original);
+
+                final CyclicBarrier barrier = new CyclicBarrier(2);
+                Future<?> closer = pool.submit(() -> {
+                    barrier.await();
+                    ctx.closeWafContext();
+                    return null;
+                });
+                Future<WafContext> creator = pool.submit(() -> {
+                    barrier.await();
+                    return ctx.getOrCreateWafContext(wafHandle, false, false);
+                });
+
+                closer.get();
+                WafContext late = creator.get();
+
+                // Never a freshly created second context: only the original or null.
+                if (late != null) {
+                    assertSame(original, late, "getOrCreateWafContext resurrected a new orphan context");
+                }
+                assertTrue(ctx.isWafContextClosed());
+            }
+        } finally {
+            pool.shutdownNow();
+        }
+
+        // Global invariant: every created context was eventually closed - no orphan left online.
+        for (WafContext context : observed) {
+            assertFalse(context.isOnline(), "orphaned WafContext left online (never closed)");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/gateway/GatewayBridgeReloadRegistrationTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/gateway/GatewayBridgeReloadRegistrationTest.java
index fad2ad5b3ee..aeb3667a8a6 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/gateway/GatewayBridgeReloadRegistrationTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/gateway/GatewayBridgeReloadRegistrationTest.java
@@ -30,129 +30,127 @@
  */
 class GatewayBridgeReloadRegistrationTest {
 
-  private InstrumentationGateway instrumentationGateway;
-  private CallbackProvider callbackProvider;
-  private StubEventProducerService producerService;
-  private GatewayBridge bridge;
-
-  @BeforeEach
-  void setUp() {
-    instrumentationGateway = new InstrumentationGateway();
-    callbackProvider = instrumentationGateway.getCallbackProvider(RequestContextSlot.APPSEC);
-    SubscriptionService subscriptionService =
-        instrumentationGateway.getSubscriptionService(RequestContextSlot.APPSEC);
-    producerService = new StubEventProducerService();
-    bridge = new GatewayBridge(subscriptionService, producerService, () -> null, null, emptyList());
-  }
-
-  @Test
-  void reloadRegistersCallbacksNotRequiredAtStartup() {
-    // startup: no ruleset requires the conditional addresses
-    producerService.subscribedAddresses = emptyList();
-    bridge.init();
-
-    assertNull(callbackProvider.getCallback(EVENTS.requestPathParams()));
-
-    // reload: the new ruleset requires request path params
-    producerService.subscribedAddresses = singletonList(KnownAddresses.REQUEST_PATH_PARAMS);
-    bridge.registerAdditionalIGCallbacksIfNeeded(
-        GatewayBridge.additionalIGEventTypes(producerService.allSubscribedDataAddresses()));
-
-    assertNotNull(callbackProvider.getCallback(EVENTS.requestPathParams()));
-  }
-
-  @Test
-  void consecutiveReloadsDoNotRegisterCallbacksTwice() {
-    // startup: no ruleset requires the conditional addresses
-    producerService.subscribedAddresses = emptyList();
-    bridge.init();
-
-    // reload: the new ruleset requires request path params and the request body object
-    producerService.subscribedAddresses =
-        asList(KnownAddresses.REQUEST_PATH_PARAMS, KnownAddresses.REQUEST_BODY_OBJECT);
-    reload();
-
-    Object pathParamsCallback = callbackProvider.getCallback(EVENTS.requestPathParams());
-    Object bodyProcessedCallback = callbackProvider.getCallback(EVENTS.requestBodyProcessed());
-    assertNotNull(pathParamsCallback);
-    assertNotNull(bodyProcessedCallback);
-
-    // AppSec triggers the reload twice per Remote Config update (WAFModule and
-    // AppSecConfigServiceImpl), this time with a growing address set
-    producerService.subscribedAddresses =
-        asList(
-            KnownAddresses.REQUEST_PATH_PARAMS,
-            KnownAddresses.REQUEST_BODY_OBJECT,
-            KnownAddresses.REQUEST_FILES_FILENAMES);
-    assertDoesNotThrow(this::reload);
-
-    // already registered callbacks are left untouched, the new one is registered
-    assertSame(pathParamsCallback, callbackProvider.getCallback(EVENTS.requestPathParams()));
-    assertSame(bodyProcessedCallback, callbackProvider.getCallback(EVENTS.requestBodyProcessed()));
-    assertNotNull(callbackProvider.getCallback(EVENTS.requestFilesFilenames()));
-    assertNull(callbackProvider.getCallback(EVENTS.requestFilesContent()));
-  }
-
-  @Test
-  void enabledInactiveRegistersCallbacksOnActivation() {
-    // ENABLED_INACTIVE: the WAF module has no ruleset loaded, so it exposes no data subscription
-    // and no address at all is subscribed at startup
-    producerService.subscribedAddresses = emptyList();
-    bridge.init();
-
-    assertNull(callbackProvider.getCallback(EVENTS.requestPathParams()));
-    assertNull(callbackProvider.getCallback(EVENTS.requestBodyProcessed()));
-    assertNull(callbackProvider.getCallback(EVENTS.requestFilesFilenames()));
-    assertNull(callbackProvider.getCallback(EVENTS.requestFilesContent()));
-
-    // activation: Remote Config delivers a ruleset requiring every conditional address, plus the
-    // raw request body, whose events are already registered unconditionally by init()
-    producerService.subscribedAddresses =
-        asList(
-            KnownAddresses.REQUEST_PATH_PARAMS,
-            KnownAddresses.REQUEST_BODY_OBJECT,
-            KnownAddresses.REQUEST_FILES_FILENAMES,
-            KnownAddresses.REQUEST_FILES_CONTENT,
-            KnownAddresses.REQUEST_BODY_RAW);
-    assertDoesNotThrow(this::reload);
-
-    assertNotNull(callbackProvider.getCallback(EVENTS.requestPathParams()));
-    assertNotNull(callbackProvider.getCallback(EVENTS.requestBodyProcessed()));
-    assertNotNull(callbackProvider.getCallback(EVENTS.requestFilesFilenames()));
-    assertNotNull(callbackProvider.getCallback(EVENTS.requestFilesContent()));
-  }
-
-  private void reload() {
-    bridge.registerAdditionalIGCallbacksIfNeeded(
-        GatewayBridge.additionalIGEventTypes(producerService.allSubscribedDataAddresses()));
-  }
-
-  /**
-   * Minimal {@link EventProducerService} whose set of subscribed addresses can be changed to
-   * simulate a configuration reload. Only {@link #allSubscribedDataAddresses()} is exercised by the
-   * registration logic under test.
-   */
-  private static final class StubEventProducerService implements EventProducerService {
-
-    private Collection<Address<?>> subscribedAddresses = emptyList();
-
-    @Override
-    public DataSubscriberInfo getDataSubscribers(Address<?>... newAddresses) {
-      throw new UnsupportedOperationException();
+    private InstrumentationGateway instrumentationGateway;
+    private CallbackProvider callbackProvider;
+    private StubEventProducerService producerService;
+    private GatewayBridge bridge;
+
+    @BeforeEach
+    void setUp() {
+        instrumentationGateway = new InstrumentationGateway();
+        callbackProvider = instrumentationGateway.getCallbackProvider(RequestContextSlot.APPSEC);
+        SubscriptionService subscriptionService =
+                instrumentationGateway.getSubscriptionService(RequestContextSlot.APPSEC);
+        producerService = new StubEventProducerService();
+        bridge = new GatewayBridge(subscriptionService, producerService, () -> null, null, emptyList());
     }
 
-    @Override
-    public Flow<Void> publishDataEvent(
-        DataSubscriberInfo subscribers,
-        AppSecRequestContext appSecRequestContext,
-        DataBundle newData,
-        GatewayContext gatewayContext) {
-      throw new UnsupportedOperationException();
+    @Test
+    void reloadRegistersCallbacksNotRequiredAtStartup() {
+        // startup: no ruleset requires the conditional addresses
+        producerService.subscribedAddresses = emptyList();
+        bridge.init();
+
+        assertNull(callbackProvider.getCallback(EVENTS.requestPathParams()));
+
+        // reload: the new ruleset requires request path params
+        producerService.subscribedAddresses = singletonList(KnownAddresses.REQUEST_PATH_PARAMS);
+        bridge.registerAdditionalIGCallbacksIfNeeded(
+                GatewayBridge.additionalIGEventTypes(producerService.allSubscribedDataAddresses()));
+
+        assertNotNull(callbackProvider.getCallback(EVENTS.requestPathParams()));
+    }
+
+    @Test
+    void consecutiveReloadsDoNotRegisterCallbacksTwice() {
+        // startup: no ruleset requires the conditional addresses
+        producerService.subscribedAddresses = emptyList();
+        bridge.init();
+
+        // reload: the new ruleset requires request path params and the request body object
+        producerService.subscribedAddresses =
+                asList(KnownAddresses.REQUEST_PATH_PARAMS, KnownAddresses.REQUEST_BODY_OBJECT);
+        reload();
+
+        Object pathParamsCallback = callbackProvider.getCallback(EVENTS.requestPathParams());
+        Object bodyProcessedCallback = callbackProvider.getCallback(EVENTS.requestBodyProcessed());
+        assertNotNull(pathParamsCallback);
+        assertNotNull(bodyProcessedCallback);
+
+        // AppSec triggers the reload twice per Remote Config update (WAFModule and
+        // AppSecConfigServiceImpl), this time with a growing address set
+        producerService.subscribedAddresses = asList(
+                KnownAddresses.REQUEST_PATH_PARAMS,
+                KnownAddresses.REQUEST_BODY_OBJECT,
+                KnownAddresses.REQUEST_FILES_FILENAMES);
+        assertDoesNotThrow(this::reload);
+
+        // already registered callbacks are left untouched, the new one is registered
+        assertSame(pathParamsCallback, callbackProvider.getCallback(EVENTS.requestPathParams()));
+        assertSame(bodyProcessedCallback, callbackProvider.getCallback(EVENTS.requestBodyProcessed()));
+        assertNotNull(callbackProvider.getCallback(EVENTS.requestFilesFilenames()));
+        assertNull(callbackProvider.getCallback(EVENTS.requestFilesContent()));
+    }
+
+    @Test
+    void enabledInactiveRegistersCallbacksOnActivation() {
+        // ENABLED_INACTIVE: the WAF module has no ruleset loaded, so it exposes no data subscription
+        // and no address at all is subscribed at startup
+        producerService.subscribedAddresses = emptyList();
+        bridge.init();
+
+        assertNull(callbackProvider.getCallback(EVENTS.requestPathParams()));
+        assertNull(callbackProvider.getCallback(EVENTS.requestBodyProcessed()));
+        assertNull(callbackProvider.getCallback(EVENTS.requestFilesFilenames()));
+        assertNull(callbackProvider.getCallback(EVENTS.requestFilesContent()));
+
+        // activation: Remote Config delivers a ruleset requiring every conditional address, plus the
+        // raw request body, whose events are already registered unconditionally by init()
+        producerService.subscribedAddresses = asList(
+                KnownAddresses.REQUEST_PATH_PARAMS,
+                KnownAddresses.REQUEST_BODY_OBJECT,
+                KnownAddresses.REQUEST_FILES_FILENAMES,
+                KnownAddresses.REQUEST_FILES_CONTENT,
+                KnownAddresses.REQUEST_BODY_RAW);
+        assertDoesNotThrow(this::reload);
+
+        assertNotNull(callbackProvider.getCallback(EVENTS.requestPathParams()));
+        assertNotNull(callbackProvider.getCallback(EVENTS.requestBodyProcessed()));
+        assertNotNull(callbackProvider.getCallback(EVENTS.requestFilesFilenames()));
+        assertNotNull(callbackProvider.getCallback(EVENTS.requestFilesContent()));
+    }
+
+    private void reload() {
+        bridge.registerAdditionalIGCallbacksIfNeeded(
+                GatewayBridge.additionalIGEventTypes(producerService.allSubscribedDataAddresses()));
     }
 
-    @Override
-    public Collection<Address<?>> allSubscribedDataAddresses() {
-      return subscribedAddresses;
+    /**
+     * Minimal {@link EventProducerService} whose set of subscribed addresses can be changed to
+     * simulate a configuration reload. Only {@link #allSubscribedDataAddresses()} is exercised by the
+     * registration logic under test.
+     */
+    private static final class StubEventProducerService implements EventProducerService {
+
+        private Collection<Address<?>> subscribedAddresses = emptyList();
+
+        @Override
+        public DataSubscriberInfo getDataSubscribers(Address<?>... newAddresses) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Flow<Void> publishDataEvent(
+                DataSubscriberInfo subscribers,
+                AppSecRequestContext appSecRequestContext,
+                DataBundle newData,
+                GatewayContext gatewayContext) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Collection<Address<?>> allSubscribedDataAddresses() {
+            return subscribedAddresses;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/report/AppSecEventWrapperTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/report/AppSecEventWrapperTest.java
index 1eb6f9031d7..674d0c2c474 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/report/AppSecEventWrapperTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/report/AppSecEventWrapperTest.java
@@ -13,65 +13,59 @@
 
 class AppSecEventWrapperTest {
 
-  @Test
-  void validateJsonSerializationForAppSecEvent() {
-    Parameter parameter =
-        new Parameter(
-            "parameter_address",
-            singletonList("parameter_key_path"),
-            "parameter_value",
-            singletonList("parameter_highlight"));
-    RuleMatch ruleMatch =
-        new RuleMatch("rule_match_operator", "rule_match_operator_value", singletonList(parameter));
-    AppSecEvent event =
-        new AppSecEvent.Builder()
-            .withRule(new Rule("rule_id", "rule_name", singletonMap("tag", "value")))
-            .withRuleMatches(singletonList(ruleMatch))
-            .build();
+    @Test
+    void validateJsonSerializationForAppSecEvent() {
+        Parameter parameter = new Parameter(
+                "parameter_address",
+                singletonList("parameter_key_path"),
+                "parameter_value",
+                singletonList("parameter_highlight"));
+        RuleMatch ruleMatch =
+                new RuleMatch("rule_match_operator", "rule_match_operator_value", singletonList(parameter));
+        AppSecEvent event = new AppSecEvent.Builder()
+                .withRule(new Rule("rule_id", "rule_name", singletonMap("tag", "value")))
+                .withRuleMatches(singletonList(ruleMatch))
+                .build();
 
-    String json = new AppSecEventWrapper(singletonList(event)).toString();
+        String json = new AppSecEventWrapper(singletonList(event)).toString();
 
-    String expectedJson =
-        "{\"triggers\":[{\"rule\":{\"id\":\"rule_id\",\"name\":\"rule_name\",\"tags\":{\"tag\":\"value\"}},"
-            + "\"rule_matches\":[{\"operator\":\"rule_match_operator\",\"operator_value\":\"rule_match_operator_value\","
-            + "\"parameters\":[{\"address\":\"parameter_address\",\"highlight\":[\"parameter_highlight\"],"
-            + "\"key_path\":[\"parameter_key_path\"],\"value\":\"parameter_value\"}]}]}]}";
-    assertEquals(expectedJson, json);
-  }
+        String expectedJson =
+                "{\"triggers\":[{\"rule\":{\"id\":\"rule_id\",\"name\":\"rule_name\",\"tags\":{\"tag\":\"value\"}},"
+                        + "\"rule_matches\":[{\"operator\":\"rule_match_operator\",\"operator_value\":\"rule_match_operator_value\","
+                        + "\"parameters\":[{\"address\":\"parameter_address\",\"highlight\":[\"parameter_highlight\"],"
+                        + "\"key_path\":[\"parameter_key_path\"],\"value\":\"parameter_value\"}]}]}]}";
+        assertEquals(expectedJson, json);
+    }
 
-  // libddwaf 2.x emits array indices in key_path as numbers (e.g. key_path: [0], not ["0"]);
-  // this guards that a whole-number Double round-trips as "0", not "0.0".
-  @Test
-  void validateJsonSerializationForNumericKeyPath() {
-    Parameter parameter =
-        new Parameter("server.request.body", Arrays.asList("items", 0.0, "name"), "value", null);
-    RuleMatch ruleMatch = new RuleMatch("operator", "operator_value", singletonList(parameter));
-    AppSecEvent event =
-        new AppSecEvent.Builder()
-            .withRule(new Rule("rule_id", "rule_name", singletonMap("tag", "value")))
-            .withRuleMatches(singletonList(ruleMatch))
-            .build();
+    // libddwaf 2.x emits array indices in key_path as numbers (e.g. key_path: [0], not ["0"]);
+    // this guards that a whole-number Double round-trips as "0", not "0.0".
+    @Test
+    void validateJsonSerializationForNumericKeyPath() {
+        Parameter parameter = new Parameter("server.request.body", Arrays.asList("items", 0.0, "name"), "value", null);
+        RuleMatch ruleMatch = new RuleMatch("operator", "operator_value", singletonList(parameter));
+        AppSecEvent event = new AppSecEvent.Builder()
+                .withRule(new Rule("rule_id", "rule_name", singletonMap("tag", "value")))
+                .withRuleMatches(singletonList(ruleMatch))
+                .build();
 
-    String json = new AppSecEventWrapper(singletonList(event)).toString();
+        String json = new AppSecEventWrapper(singletonList(event)).toString();
 
-    assertTrue(json.contains("\"key_path\":[\"items\",0,\"name\"]"), "actual json: " + json);
-  }
+        assertTrue(json.contains("\"key_path\":[\"items\",0,\"name\"]"), "actual json: " + json);
+    }
 
-  // Non-whole-number Doubles must keep Moshi's default formatting - only whole numbers get the
-  // integer-style rewrite.
-  @Test
-  void validateJsonSerializationForNonIntegralKeyPath() {
-    Parameter parameter =
-        new Parameter("server.request.body", Arrays.asList("items", 1.5, "name"), "value", null);
-    RuleMatch ruleMatch = new RuleMatch("operator", "operator_value", singletonList(parameter));
-    AppSecEvent event =
-        new AppSecEvent.Builder()
-            .withRule(new Rule("rule_id", "rule_name", singletonMap("tag", "value")))
-            .withRuleMatches(singletonList(ruleMatch))
-            .build();
+    // Non-whole-number Doubles must keep Moshi's default formatting - only whole numbers get the
+    // integer-style rewrite.
+    @Test
+    void validateJsonSerializationForNonIntegralKeyPath() {
+        Parameter parameter = new Parameter("server.request.body", Arrays.asList("items", 1.5, "name"), "value", null);
+        RuleMatch ruleMatch = new RuleMatch("operator", "operator_value", singletonList(parameter));
+        AppSecEvent event = new AppSecEvent.Builder()
+                .withRule(new Rule("rule_id", "rule_name", singletonMap("tag", "value")))
+                .withRuleMatches(singletonList(ruleMatch))
+                .build();
 
-    String json = new AppSecEventWrapper(singletonList(event)).toString();
+        String json = new AppSecEventWrapper(singletonList(event)).toString();
 
-    assertTrue(json.contains("\"key_path\":[\"items\",1.5,\"name\"]"), "actual json: " + json);
-  }
+        assertTrue(json.contains("\"key_path\":[\"items\",1.5,\"name\"]"), "actual json: " + json);
+    }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaBytecodeTestUtils.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaBytecodeTestUtils.java
index 3b2e4a02d04..78c67baca2c 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaBytecodeTestUtils.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaBytecodeTestUtils.java
@@ -9,34 +9,34 @@
 
 final class ScaBytecodeTestUtils {
 
-  private ScaBytecodeTestUtils() {}
+    private ScaBytecodeTestUtils() {}
 
-  static byte[] bytecodeOf(Class<?> clazz) throws Exception {
-    String path = clazz.getName().replace('.', '/') + ".class";
-    try (InputStream is = clazz.getClassLoader().getResourceAsStream(path)) {
-      assertNotNull(is, "Cannot load bytecode for " + clazz.getName());
-      ByteArrayOutputStream buf = new ByteArrayOutputStream();
-      byte[] chunk = new byte[4096];
-      int n;
-      while ((n = is.read(chunk)) != -1) {
-        buf.write(chunk, 0, n);
-      }
-      return buf.toByteArray();
+    static byte[] bytecodeOf(Class<?> clazz) throws Exception {
+        String path = clazz.getName().replace('.', '/') + ".class";
+        try (InputStream is = clazz.getClassLoader().getResourceAsStream(path)) {
+            assertNotNull(is, "Cannot load bytecode for " + clazz.getName());
+            ByteArrayOutputStream buf = new ByteArrayOutputStream();
+            byte[] chunk = new byte[4096];
+            int n;
+            while ((n = is.read(chunk)) != -1) {
+                buf.write(chunk, 0, n);
+            }
+            return buf.toByteArray();
+        }
     }
-  }
 
-  static Class<?> loadModified(byte[] bytecode) {
-    return new ClassLoader(ScaBytecodeTestUtils.class.getClassLoader()) {
-      Class<?> define() {
-        return defineClass(null, bytecode, 0, bytecode.length);
-      }
-    }.define();
-  }
+    static Class<?> loadModified(byte[] bytecode) {
+        return new ClassLoader(ScaBytecodeTestUtils.class.getClassLoader()) {
+            Class<?> define() {
+                return defineClass(null, bytecode, 0, bytecode.length);
+            }
+        }.define();
+    }
 
-  static byte[] bytecodeWithoutDebugInfo(Class<?> clazz) throws Exception {
-    ClassReader cr = new ClassReader(bytecodeOf(clazz));
-    ClassWriter cw = new ClassWriter(0);
-    cr.accept(cw, ClassReader.SKIP_DEBUG);
-    return cw.toByteArray();
-  }
+    static byte[] bytecodeWithoutDebugInfo(Class<?> clazz) throws Exception {
+        ClassReader cr = new ClassReader(bytecodeOf(clazz));
+        ClassWriter cw = new ClassWriter(0);
+        cr.accept(cw, ClassReader.SKIP_DEBUG);
+        return cw.toByteArray();
+    }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaCveDatabaseTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaCveDatabaseTest.java
index 5fe9efdbcad..ba7d6016010 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaCveDatabaseTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaCveDatabaseTest.java
@@ -14,182 +14,176 @@
 
 class ScaCveDatabaseTest {
 
-  private static final String MINIMAL_JSON =
-      "{\"version\":1,\"entries\":["
-          + "{\"vuln_id\":\"GHSA-test-1234-5678\","
-          + "\"artifact\":\"com.example:lib\","
-          + "\"version_ranges\":[\"< 2.0.0\"],"
-          + "\"symbols\":["
-          + "{\"class\":\"com/example/Foo\",\"method\":\"dangerousOp\"},"
-          + "{\"class\":\"com/example/Bar\",\"method\":\"dangerousOp\"}"
-          + "]}]}";
-
-  @Test
-  void loadsFromJson() throws Exception {
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(MINIMAL_JSON));
-
-    assertFalse(db.isEmpty());
-    assertEquals(2, db.size()); // 2 unique class names
-  }
-
-  @Test
-  void indexedByClassName() throws Exception {
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(MINIMAL_JSON));
-
-    List<ScaEntry> entries = db.entriesForClass("com/example/Foo");
-    assertNotNull(entries);
-    assertEquals(1, entries.size());
-    assertEquals("GHSA-test-1234-5678", entries.get(0).vulnId());
-    assertEquals("com.example:lib", entries.get(0).artifact());
-  }
-
-  @Test
-  void unknownClassReturnsNull() throws Exception {
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(MINIMAL_JSON));
-
-    assertNull(db.entriesForClass("com/example/Unknown"));
-  }
-
-  @Test
-  void emptyEntriesProducesEmptyDatabase() throws Exception {
-    String json = "{\"version\":1,\"entries\":[]}";
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json));
-
-    assertTrue(db.isEmpty());
-  }
-
-  @Test
-  void malformedEntryIsSkipped() throws Exception {
-    String json =
-        "{\"version\":1,\"entries\":["
-            + "{\"vuln_id\":null,\"artifact\":\"com.example:lib\","
-            + "\"version_ranges\":[\"< 2.0.0\"],\"symbols\":[{\"class\":\"com/example/Foo\",\"method\":\"op\"}]},"
-            + "{\"vuln_id\":\"GHSA-good-0000-0000\",\"artifact\":\"com.example:other\","
-            + "\"version_ranges\":[\"< 1.0.0\"],\"symbols\":[{\"class\":\"com/example/Good\",\"method\":\"op\"}]}"
-            + "]}";
-
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json));
-
-    assertNull(db.entriesForClass("com/example/Foo"));
-    assertNotNull(db.entriesForClass("com/example/Good"));
-  }
-
-  @Test
-  void symbolWithNullMethodIsSkipped() throws Exception {
-    // A symbol with method=null is treated as malformed and skipped.
-    // If all symbols in an entry are null-method, the whole entry is dropped.
-    String json =
-        "{\"version\":1,\"entries\":["
-            + "{\"vuln_id\":\"GHSA-null-method\",\"artifact\":\"com.example:lib\","
-            + "\"version_ranges\":[\"< 1.0.0\"],"
-            + "\"symbols\":[{\"class\":\"com/example/Foo\",\"method\":null}]}"
-            + "]}";
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json));
-
-    assertTrue(db.isEmpty(), "Entry with all null-method symbols must be dropped");
-  }
-
-  @Test
-  void symbolWithNullMethodSkippedButValidSymbolsKept() throws Exception {
-    // When an entry has a mix of null-method and valid symbols, only the valid ones are kept.
-    String json =
-        "{\"version\":1,\"entries\":["
-            + "{\"vuln_id\":\"GHSA-mixed-method\",\"artifact\":\"com.example:lib\","
-            + "\"version_ranges\":[\"< 1.0.0\"],"
+    private static final String MINIMAL_JSON = "{\"version\":1,\"entries\":["
+            + "{\"vuln_id\":\"GHSA-test-1234-5678\","
+            + "\"artifact\":\"com.example:lib\","
+            + "\"version_ranges\":[\"< 2.0.0\"],"
             + "\"symbols\":["
-            + "{\"class\":\"com/example/Foo\",\"method\":null},"
-            + "{\"class\":\"com/example/Foo\",\"method\":\"readValue\"}"
-            + "]}"
-            + "]}";
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json));
-
-    List<ScaEntry> entries = db.entriesForClass("com/example/Foo");
-    assertNotNull(entries);
-    List<ScaSymbol> symbols = entries.get(0).symbols();
-    assertEquals(1, symbols.size(), "null-method symbol must be dropped; valid symbol kept");
-    assertEquals("readValue", symbols.get(0).method());
-  }
-
-  @Test
-  void multipleEntriesForSameClass() throws Exception {
-    String json =
-        "{\"version\":1,\"entries\":["
-            + "{\"vuln_id\":\"GHSA-aaaa-0001-0001\",\"artifact\":\"com.example:lib\","
-            + "\"version_ranges\":[\"< 2.0.0\"],\"symbols\":[{\"class\":\"com/example/Shared\",\"method\":\"op\"}]},"
-            + "{\"vuln_id\":\"GHSA-bbbb-0002-0002\",\"artifact\":\"com.example:lib\","
-            + "\"version_ranges\":[\"< 3.0.0\"],\"symbols\":[{\"class\":\"com/example/Shared\",\"method\":\"op\"}]}"
-            + "]}";
-
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json));
-
-    List<ScaEntry> entries = db.entriesForClass("com/example/Shared");
-    assertNotNull(entries);
-    assertEquals(2, entries.size());
-  }
-
-  @Test
-  void scaEntryMatchesVersions() {
-    List<String> expectedRanges = singletonList("< 2.0.0");
-    List<ScaSymbol> symbols = singletonList(new ScaSymbol("com/example/Foo", "op"));
-    ScaEntry entry = new ScaEntry("GHSA-entry", "com.example:lib", expectedRanges, symbols);
-
-    assertEquals(expectedRanges, entry.versionRanges());
-    assertTrue(entry.isVersionVulnerable("1.9.9"));
-    assertFalse(entry.isVersionVulnerable("2.0.0"));
-  }
-
-  @Test
-  void scaEntryExposesImmutableLists() {
-    List<String> ranges = singletonList("< 2.0.0");
-    List<ScaSymbol> symbols = singletonList(new ScaSymbol("com/example/Foo", "op"));
-    ScaEntry entry = new ScaEntry("GHSA-entry", "com.example:lib", ranges, symbols);
-
-    assertThrows(UnsupportedOperationException.class, () -> entry.versionRanges().add("< 3.0.0"));
-    assertThrows(
-        UnsupportedOperationException.class,
-        () -> entry.symbols().add(new ScaSymbol("com/example/Bar", "op")));
-  }
-
-  @Test
-  void entryWithMultipleSymbolsInSameClassIndexedOnce() throws Exception {
-    // An entry with two symbols for the same class (e.g. Yaml.load + Yaml.loadAll) must appear
-    // only once in the index. Duplicate entries cause the same bytecode callback to be injected
-    // twice into each method, producing redundant bootstrap calls on every invocation.
-    String json =
-        "{\"version\":1,\"entries\":["
-            + "{\"vuln_id\":\"GHSA-mjmj-j48q-9wg2\",\"artifact\":\"org.yaml:snakeyaml\","
-            + "\"version_ranges\":[\"<= 1.33\"],\"symbols\":["
-            + "{\"class\":\"org/yaml/snakeyaml/Yaml\",\"method\":\"load\"},"
-            + "{\"class\":\"org/yaml/snakeyaml/Yaml\",\"method\":\"loadAll\"}"
+            + "{\"class\":\"com/example/Foo\",\"method\":\"dangerousOp\"},"
+            + "{\"class\":\"com/example/Bar\",\"method\":\"dangerousOp\"}"
             + "]}]}";
 
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json));
-
-    List<ScaEntry> entries = db.entriesForClass("org/yaml/snakeyaml/Yaml");
-    assertNotNull(entries);
-    assertEquals(1, entries.size(), "same entry must not appear twice even with multiple symbols");
-    assertEquals(2, entries.get(0).symbols().size(), "entry must retain all method symbols");
-  }
-
-  @Test
-  void loadFromClasspathSucceeds() {
-    // Verifies the real sca_cves.json generated by generateScaCvesJson is valid and loadable
-    ScaCveDatabase db = ScaCveDatabase.load();
-
-    assertFalse(db.isEmpty(), "sca_cves.json should be on the classpath and contain entries");
-    assertTrue(db.size() > 0);
-  }
-
-  @Test
-  void junrarLocalFolderExtractorIsIndexed() {
-    // Spot-check a known entry from the real database (com.github.junrar:junrar, GHSA-hf5p)
-    ScaCveDatabase db = ScaCveDatabase.load();
-
-    List<ScaEntry> entries = db.entriesForClass("com/github/junrar/LocalFolderExtractor");
-    assertNotNull(entries, "junrar LocalFolderExtractor should be in the database");
-    assertFalse(entries.isEmpty());
-    assertTrue(
-        entries.get(0).symbols().stream().allMatch(s -> s.method() != null),
-        "all symbols must be method-level");
-  }
+    @Test
+    void loadsFromJson() throws Exception {
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(MINIMAL_JSON));
+
+        assertFalse(db.isEmpty());
+        assertEquals(2, db.size()); // 2 unique class names
+    }
+
+    @Test
+    void indexedByClassName() throws Exception {
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(MINIMAL_JSON));
+
+        List<ScaEntry> entries = db.entriesForClass("com/example/Foo");
+        assertNotNull(entries);
+        assertEquals(1, entries.size());
+        assertEquals("GHSA-test-1234-5678", entries.get(0).vulnId());
+        assertEquals("com.example:lib", entries.get(0).artifact());
+    }
+
+    @Test
+    void unknownClassReturnsNull() throws Exception {
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(MINIMAL_JSON));
+
+        assertNull(db.entriesForClass("com/example/Unknown"));
+    }
+
+    @Test
+    void emptyEntriesProducesEmptyDatabase() throws Exception {
+        String json = "{\"version\":1,\"entries\":[]}";
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json));
+
+        assertTrue(db.isEmpty());
+    }
+
+    @Test
+    void malformedEntryIsSkipped() throws Exception {
+        String json = "{\"version\":1,\"entries\":["
+                + "{\"vuln_id\":null,\"artifact\":\"com.example:lib\","
+                + "\"version_ranges\":[\"< 2.0.0\"],\"symbols\":[{\"class\":\"com/example/Foo\",\"method\":\"op\"}]},"
+                + "{\"vuln_id\":\"GHSA-good-0000-0000\",\"artifact\":\"com.example:other\","
+                + "\"version_ranges\":[\"< 1.0.0\"],\"symbols\":[{\"class\":\"com/example/Good\",\"method\":\"op\"}]}"
+                + "]}";
+
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json));
+
+        assertNull(db.entriesForClass("com/example/Foo"));
+        assertNotNull(db.entriesForClass("com/example/Good"));
+    }
+
+    @Test
+    void symbolWithNullMethodIsSkipped() throws Exception {
+        // A symbol with method=null is treated as malformed and skipped.
+        // If all symbols in an entry are null-method, the whole entry is dropped.
+        String json = "{\"version\":1,\"entries\":["
+                + "{\"vuln_id\":\"GHSA-null-method\",\"artifact\":\"com.example:lib\","
+                + "\"version_ranges\":[\"< 1.0.0\"],"
+                + "\"symbols\":[{\"class\":\"com/example/Foo\",\"method\":null}]}"
+                + "]}";
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json));
+
+        assertTrue(db.isEmpty(), "Entry with all null-method symbols must be dropped");
+    }
+
+    @Test
+    void symbolWithNullMethodSkippedButValidSymbolsKept() throws Exception {
+        // When an entry has a mix of null-method and valid symbols, only the valid ones are kept.
+        String json = "{\"version\":1,\"entries\":["
+                + "{\"vuln_id\":\"GHSA-mixed-method\",\"artifact\":\"com.example:lib\","
+                + "\"version_ranges\":[\"< 1.0.0\"],"
+                + "\"symbols\":["
+                + "{\"class\":\"com/example/Foo\",\"method\":null},"
+                + "{\"class\":\"com/example/Foo\",\"method\":\"readValue\"}"
+                + "]}"
+                + "]}";
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json));
+
+        List<ScaEntry> entries = db.entriesForClass("com/example/Foo");
+        assertNotNull(entries);
+        List<ScaSymbol> symbols = entries.get(0).symbols();
+        assertEquals(1, symbols.size(), "null-method symbol must be dropped; valid symbol kept");
+        assertEquals("readValue", symbols.get(0).method());
+    }
+
+    @Test
+    void multipleEntriesForSameClass() throws Exception {
+        String json = "{\"version\":1,\"entries\":["
+                + "{\"vuln_id\":\"GHSA-aaaa-0001-0001\",\"artifact\":\"com.example:lib\","
+                + "\"version_ranges\":[\"< 2.0.0\"],\"symbols\":[{\"class\":\"com/example/Shared\",\"method\":\"op\"}]},"
+                + "{\"vuln_id\":\"GHSA-bbbb-0002-0002\",\"artifact\":\"com.example:lib\","
+                + "\"version_ranges\":[\"< 3.0.0\"],\"symbols\":[{\"class\":\"com/example/Shared\",\"method\":\"op\"}]}"
+                + "]}";
+
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json));
+
+        List<ScaEntry> entries = db.entriesForClass("com/example/Shared");
+        assertNotNull(entries);
+        assertEquals(2, entries.size());
+    }
+
+    @Test
+    void scaEntryMatchesVersions() {
+        List<String> expectedRanges = singletonList("< 2.0.0");
+        List<ScaSymbol> symbols = singletonList(new ScaSymbol("com/example/Foo", "op"));
+        ScaEntry entry = new ScaEntry("GHSA-entry", "com.example:lib", expectedRanges, symbols);
+
+        assertEquals(expectedRanges, entry.versionRanges());
+        assertTrue(entry.isVersionVulnerable("1.9.9"));
+        assertFalse(entry.isVersionVulnerable("2.0.0"));
+    }
+
+    @Test
+    void scaEntryExposesImmutableLists() {
+        List<String> ranges = singletonList("< 2.0.0");
+        List<ScaSymbol> symbols = singletonList(new ScaSymbol("com/example/Foo", "op"));
+        ScaEntry entry = new ScaEntry("GHSA-entry", "com.example:lib", ranges, symbols);
+
+        assertThrows(
+                UnsupportedOperationException.class, () -> entry.versionRanges().add("< 3.0.0"));
+        assertThrows(
+                UnsupportedOperationException.class, () -> entry.symbols().add(new ScaSymbol("com/example/Bar", "op")));
+    }
+
+    @Test
+    void entryWithMultipleSymbolsInSameClassIndexedOnce() throws Exception {
+        // An entry with two symbols for the same class (e.g. Yaml.load + Yaml.loadAll) must appear
+        // only once in the index. Duplicate entries cause the same bytecode callback to be injected
+        // twice into each method, producing redundant bootstrap calls on every invocation.
+        String json = "{\"version\":1,\"entries\":["
+                + "{\"vuln_id\":\"GHSA-mjmj-j48q-9wg2\",\"artifact\":\"org.yaml:snakeyaml\","
+                + "\"version_ranges\":[\"<= 1.33\"],\"symbols\":["
+                + "{\"class\":\"org/yaml/snakeyaml/Yaml\",\"method\":\"load\"},"
+                + "{\"class\":\"org/yaml/snakeyaml/Yaml\",\"method\":\"loadAll\"}"
+                + "]}]}";
+
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json));
+
+        List<ScaEntry> entries = db.entriesForClass("org/yaml/snakeyaml/Yaml");
+        assertNotNull(entries);
+        assertEquals(1, entries.size(), "same entry must not appear twice even with multiple symbols");
+        assertEquals(2, entries.get(0).symbols().size(), "entry must retain all method symbols");
+    }
+
+    @Test
+    void loadFromClasspathSucceeds() {
+        // Verifies the real sca_cves.json generated by generateScaCvesJson is valid and loadable
+        ScaCveDatabase db = ScaCveDatabase.load();
+
+        assertFalse(db.isEmpty(), "sca_cves.json should be on the classpath and contain entries");
+        assertTrue(db.size() > 0);
+    }
+
+    @Test
+    void junrarLocalFolderExtractorIsIndexed() {
+        // Spot-check a known entry from the real database (com.github.junrar:junrar, GHSA-hf5p)
+        ScaCveDatabase db = ScaCveDatabase.load();
+
+        List<ScaEntry> entries = db.entriesForClass("com/github/junrar/LocalFolderExtractor");
+        assertNotNull(entries, "junrar LocalFolderExtractor should be in the database");
+        assertFalse(entries.isEmpty());
+        assertTrue(
+                entries.get(0).symbols().stream().allMatch(s -> s.method() != null),
+                "all symbols must be method-level");
+    }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityMethodLevelTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityMethodLevelTest.java
index a708bd49384..7a46c9e2236 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityMethodLevelTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityMethodLevelTest.java
@@ -40,666 +40,621 @@
  */
 class ScaReachabilityMethodLevelTest {
 
-  /** Target class that the transformer will instrument in tests. */
-  public static class TargetClass {
-    public String vulnerableMethod() {
-      return "executed";
+    /** Target class that the transformer will instrument in tests. */
+    public static class TargetClass {
+        public String vulnerableMethod() {
+            return "executed";
+        }
+
+        public String safeMethod() {
+            return "safe";
+        }
+    }
+
+    /** Fixture compiled normally, then stripped of line numbers before callback injection. */
+    public static class ClassToBeStrippedOfLineNumber {
+        // Intentionally non-final so javac emits a field read instead of inlining a constant.
+        private static int runtimeFieldValue = 7;
+
+        public static int readField() {
+            return runtimeFieldValue;
+        }
+
+        public static Object returnArgument(Object value) {
+            return value;
+        }
+
+        public static String callToString(Object value) {
+            return value.toString();
+        }
     }
 
-    public String safeMethod() {
-      return "safe";
+    private ScaCveDatabase db;
+    private ScaReachabilityTransformer transformer;
+
+    @BeforeEach
+    void setUp() throws Exception {
+        ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
+        // Register the same handler as ScaReachabilitySystem.start() does in production
+        ScaReachabilityCallback.register((vulnId, artifact, version, dotClassName, methodName, line) ->
+                ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                        artifact, version, vulnId, dotClassName, methodName, line));
+        db = ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}"));
+        transformer = new ScaReachabilityTransformer(db, null);
     }
-  }
 
-  /** Fixture compiled normally, then stripped of line numbers before callback injection. */
-  public static class ClassToBeStrippedOfLineNumber {
-    // Intentionally non-final so javac emits a field read instead of inlining a constant.
-    private static int runtimeFieldValue = 7;
+    @AfterEach
+    void tearDown() {
+        ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
+        ScaReachabilityCallback.register(null);
+    }
+
+    // ---------------------------------------------------------------------------
+    // ASM injection: ScaMethodCallbackInjector.inject()
+    // ---------------------------------------------------------------------------
+
+    @Test
+    void inject_returnsModifiedBytecode() throws Exception {
+        byte[] original = bytecodeOf(TargetClass.class);
+        Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = singleCallback("vulnerableMethod");
 
-    public static int readField() {
-      return runtimeFieldValue;
+        byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
+
+        assertNotNull(modified, "inject must return non-null modified bytecode");
+    }
+
+    @Test
+    void inject_callbackFiredOnMethodCall() throws Exception {
+        byte[] original = bytecodeOf(TargetClass.class);
+        Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = singleCallback("vulnerableMethod");
+
+        byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
+        Class<?> cls = loadModified(modified);
+        Object instance = cls.getDeclaredConstructor().newInstance();
+        cls.getMethod("vulnerableMethod").invoke(instance);
+
+        List<ScaReachabilityHit> hits = drainHits();
+        assertEquals(1, hits.size());
+        ScaReachabilityHit hit = hits.get(0);
+        assertEquals("GHSA-method-0001", hit.vulnId());
+        assertEquals("com.example:test-lib", hit.artifact());
+        assertEquals("1.2.3", hit.version());
+        // Callsite semantics: path/symbol/line should be the APPLICATION frame that invoked the
+        // vulnerable method. In production (e.g. TargetClass = com.fasterxml.jackson.ObjectMapper),
+        // findCallsite() finds the caller and returns it.
+        //
+        // In this test, TargetClass is in com.datadog.appsec.sca.* which AbstractStackWalker
+        // treats as agent code and filters out. findCallsite() returns null and the handler falls
+        // back to reporting the vulnerable symbol itself (dotClassName/methodName).
+        // This verifies the fallback path works correctly.
+        assertFalse(hit.className().isEmpty(), "className must be non-empty (fallback: vulnerable class)");
+        assertFalse(hit.symbolName().isEmpty(), "symbolName must be non-empty");
+        assertTrue(hit.line() >= 0, "line must be non-negative");
     }
 
-    public static Object returnArgument(Object value) {
-      return value;
+    @Test
+    void inject_noCallbackForSafeMethod() throws Exception {
+        byte[] original = bytecodeOf(TargetClass.class);
+        Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = singleCallback("vulnerableMethod");
+
+        byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
+        Class<?> cls = loadModified(modified);
+        Object instance = cls.getDeclaredConstructor().newInstance();
+        cls.getMethod("safeMethod").invoke(instance); // call only the safe method
+
+        assertTrue(drainHits().isEmpty(), "No hit expected when only non-instrumented methods are called");
     }
 
-    public static String callToString(Object value) {
-      return value.toString();
+    @Test
+    void inject_deduplicatesOnMultipleCalls() throws Exception {
+        byte[] original = bytecodeOf(TargetClass.class);
+        Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = singleCallback("vulnerableMethod");
+
+        byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
+        Class<?> cls = loadModified(modified);
+        Object instance = cls.getDeclaredConstructor().newInstance();
+        Method m = cls.getMethod("vulnerableMethod");
+
+        m.invoke(instance);
+        m.invoke(instance);
+        m.invoke(instance);
+
+        assertEquals(
+                1,
+                drainHits().size(),
+                "Hit must be reported only once regardless of how many times the method is called");
     }
-  }
-
-  private ScaCveDatabase db;
-  private ScaReachabilityTransformer transformer;
-
-  @BeforeEach
-  void setUp() throws Exception {
-    ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
-    // Register the same handler as ScaReachabilitySystem.start() does in production
-    ScaReachabilityCallback.register(
-        (vulnId, artifact, version, dotClassName, methodName, line) ->
-            ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-                artifact, version, vulnId, dotClassName, methodName, line));
-    db = ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}"));
-    transformer = new ScaReachabilityTransformer(db, null);
-  }
-
-  @AfterEach
-  void tearDown() {
-    ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
-    ScaReachabilityCallback.register(null);
-  }
-
-  // ---------------------------------------------------------------------------
-  // ASM injection: ScaMethodCallbackInjector.inject()
-  // ---------------------------------------------------------------------------
-
-  @Test
-  void inject_returnsModifiedBytecode() throws Exception {
-    byte[] original = bytecodeOf(TargetClass.class);
-    Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks =
-        singleCallback("vulnerableMethod");
-
-    byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
-
-    assertNotNull(modified, "inject must return non-null modified bytecode");
-  }
-
-  @Test
-  void inject_callbackFiredOnMethodCall() throws Exception {
-    byte[] original = bytecodeOf(TargetClass.class);
-    Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks =
-        singleCallback("vulnerableMethod");
-
-    byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
-    Class<?> cls = loadModified(modified);
-    Object instance = cls.getDeclaredConstructor().newInstance();
-    cls.getMethod("vulnerableMethod").invoke(instance);
-
-    List<ScaReachabilityHit> hits = drainHits();
-    assertEquals(1, hits.size());
-    ScaReachabilityHit hit = hits.get(0);
-    assertEquals("GHSA-method-0001", hit.vulnId());
-    assertEquals("com.example:test-lib", hit.artifact());
-    assertEquals("1.2.3", hit.version());
-    // Callsite semantics: path/symbol/line should be the APPLICATION frame that invoked the
-    // vulnerable method. In production (e.g. TargetClass = com.fasterxml.jackson.ObjectMapper),
-    // findCallsite() finds the caller and returns it.
-    //
-    // In this test, TargetClass is in com.datadog.appsec.sca.* which AbstractStackWalker
-    // treats as agent code and filters out. findCallsite() returns null and the handler falls
-    // back to reporting the vulnerable symbol itself (dotClassName/methodName).
-    // This verifies the fallback path works correctly.
-    assertFalse(
-        hit.className().isEmpty(), "className must be non-empty (fallback: vulnerable class)");
-    assertFalse(hit.symbolName().isEmpty(), "symbolName must be non-empty");
-    assertTrue(hit.line() >= 0, "line must be non-negative");
-  }
-
-  @Test
-  void inject_noCallbackForSafeMethod() throws Exception {
-    byte[] original = bytecodeOf(TargetClass.class);
-    Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks =
-        singleCallback("vulnerableMethod");
-
-    byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
-    Class<?> cls = loadModified(modified);
-    Object instance = cls.getDeclaredConstructor().newInstance();
-    cls.getMethod("safeMethod").invoke(instance); // call only the safe method
-
-    assertTrue(
-        drainHits().isEmpty(), "No hit expected when only non-instrumented methods are called");
-  }
-
-  @Test
-  void inject_deduplicatesOnMultipleCalls() throws Exception {
-    byte[] original = bytecodeOf(TargetClass.class);
-    Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks =
-        singleCallback("vulnerableMethod");
-
-    byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
-    Class<?> cls = loadModified(modified);
-    Object instance = cls.getDeclaredConstructor().newInstance();
-    Method m = cls.getMethod("vulnerableMethod");
-
-    m.invoke(instance);
-    m.invoke(instance);
-    m.invoke(instance);
-
-    assertEquals(
-        1,
-        drainHits().size(),
-        "Hit must be reported only once regardless of how many times the method is called");
-  }
-
-  @Test
-  void inject_injectsMultipleMethodsIndependently() throws Exception {
-    byte[] original = bytecodeOf(TargetClass.class);
-    Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = new HashMap<>();
-    callbacks.put(
-        "vulnerableMethod",
-        Collections.singletonList(
-            spec("GHSA-m1", "com.example:lib", "1.0.0", "T", "vulnerableMethod")));
-    callbacks.put(
-        "safeMethod",
-        Collections.singletonList(spec("GHSA-m2", "com.example:lib", "1.0.0", "T", "safeMethod")));
-
-    byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
-    Class<?> cls = loadModified(modified);
-    Object instance = cls.getDeclaredConstructor().newInstance();
-
-    cls.getMethod("vulnerableMethod").invoke(instance);
-    cls.getMethod("safeMethod").invoke(instance);
-
-    List<ScaReachabilityHit> hits = drainHits();
-    assertEquals(2, hits.size(), "Each instrumented method produces its own hit");
-    assertTrue(hits.stream().anyMatch(h -> h.symbolName().equals("vulnerableMethod")));
-    assertTrue(hits.stream().anyMatch(h -> h.symbolName().equals("safeMethod")));
-  }
-
-  @Test
-  void inject_withoutLineNumbersInjectsBeforeFirstInstruction() throws Exception {
-    byte[] original = bytecodeWithoutDebugInfo(ClassToBeStrippedOfLineNumber.class);
-    String className = ClassToBeStrippedOfLineNumber.class.getName();
-    Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = new HashMap<>();
-    callbacks.put(
-        "readField",
-        Collections.singletonList(
-            spec("GHSA-field", "com.example:lib", "1.0.0", className, "readField")));
-    callbacks.put(
-        "returnArgument",
-        Collections.singletonList(
-            spec("GHSA-var", "com.example:lib", "1.0.0", className, "returnArgument")));
-    callbacks.put(
-        "callToString",
-        Collections.singletonList(
-            spec("GHSA-method", "com.example:lib", "1.0.0", className, "callToString")));
-
-    Class<?> cls = loadModified(ScaMethodCallbackInjector.inject(original, callbacks));
-
-    assertEquals(7, cls.getMethod("readField").invoke(null));
-    assertEquals("value", cls.getMethod("returnArgument", Object.class).invoke(null, "value"));
-    assertEquals("value", cls.getMethod("callToString", Object.class).invoke(null, "value"));
-
-    List<ScaReachabilityHit> hits = drainHits();
-    assertEquals(3, hits.size());
-    assertTrue(hits.stream().allMatch(hit -> hit.line() == 1));
-    assertTrue(hits.stream().anyMatch(hit -> hit.symbolName().equals("readField")));
-    assertTrue(hits.stream().anyMatch(hit -> hit.symbolName().equals("returnArgument")));
-    assertTrue(hits.stream().anyMatch(hit -> hit.symbolName().equals("callToString")));
-  }
-
-  @Test
-  void inject_sameMethodNameInDifferentClassesProduceIndependentHits() throws Exception {
-    // Regression test for dedup key bug: if two classes in the same artifact share a method
-    // name (e.g. ClassA.parse and ClassB.parse), both must be reported independently.
-    // With the stateful RFC model, one hit per CVE is reported (first occurrence wins).
-    // The dedup key in ScaReachabilityCallback uses dotClassName to allow both classes to reach
-    // the registry handler, but the registry itself enforces "single occurrence per CVE".
-    // This verifies that ClassB's hit does NOT cause a NullPointerException or error — it is
-    // simply ignored since ClassA already provided the first callsite for GHSA-shared.
-
-    Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacksClassA =
-        new HashMap<>();
-    callbacksClassA.put(
-        "vulnerableMethod",
-        Collections.singletonList(
-            spec(
-                "GHSA-shared",
-                "com.example:lib",
-                "1.0.0",
-                "com.example.ClassA",
-                "vulnerableMethod")));
-
-    Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacksClassB =
-        new HashMap<>();
-    callbacksClassB.put(
-        "vulnerableMethod",
-        Collections.singletonList(
-            spec(
-                "GHSA-shared",
-                "com.example:lib",
-                "1.0.0",
-                "com.example.ClassB",
-                "vulnerableMethod")));
-
-    byte[] original = bytecodeOf(TargetClass.class);
-    Class<?> clsA = loadModified(ScaMethodCallbackInjector.inject(original, callbacksClassA));
-    Class<?> clsB = loadModified(ScaMethodCallbackInjector.inject(original, callbacksClassB));
-
-    clsA.getMethod("vulnerableMethod").invoke(clsA.getDeclaredConstructor().newInstance());
-    clsB.getMethod("vulnerableMethod").invoke(clsB.getDeclaredConstructor().newInstance());
-
-    List<ScaReachabilityHit> hits = drainHits();
-    // RFC: "reporting a single occurrence is sufficient" — only the first callsite per CVE is kept.
-    assertEquals(1, hits.size(), "Only the first hit per CVE is retained (RFC: single occurrence)");
-    assertEquals("GHSA-shared", hits.get(0).vulnId());
-  }
-
-  /**
-   * Fixture whose methods start with bytecode opcodes that {@code MethodEntryInjector} used to
-   * leave unhandled (NEW, INVOKEDYNAMIC, LDC): the injected callback landed after that first
-   * instruction instead of at true method entry.
-   */
-  public static class UnhandledFirstOpcodeMethods {
-    public static Object newFirst() {
-      return new Object();
+
+    @Test
+    void inject_injectsMultipleMethodsIndependently() throws Exception {
+        byte[] original = bytecodeOf(TargetClass.class);
+        Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = new HashMap<>();
+        callbacks.put(
+                "vulnerableMethod",
+                Collections.singletonList(spec("GHSA-m1", "com.example:lib", "1.0.0", "T", "vulnerableMethod")));
+        callbacks.put(
+                "safeMethod",
+                Collections.singletonList(spec("GHSA-m2", "com.example:lib", "1.0.0", "T", "safeMethod")));
+
+        byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
+        Class<?> cls = loadModified(modified);
+        Object instance = cls.getDeclaredConstructor().newInstance();
+
+        cls.getMethod("vulnerableMethod").invoke(instance);
+        cls.getMethod("safeMethod").invoke(instance);
+
+        List<ScaReachabilityHit> hits = drainHits();
+        assertEquals(2, hits.size(), "Each instrumented method produces its own hit");
+        assertTrue(hits.stream().anyMatch(h -> h.symbolName().equals("vulnerableMethod")));
+        assertTrue(hits.stream().anyMatch(h -> h.symbolName().equals("safeMethod")));
     }
 
-    public static Supplier<String> lambdaFirst() {
-      return () -> "hi";
+    @Test
+    void inject_withoutLineNumbersInjectsBeforeFirstInstruction() throws Exception {
+        byte[] original = bytecodeWithoutDebugInfo(ClassToBeStrippedOfLineNumber.class);
+        String className = ClassToBeStrippedOfLineNumber.class.getName();
+        Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = new HashMap<>();
+        callbacks.put(
+                "readField",
+                Collections.singletonList(spec("GHSA-field", "com.example:lib", "1.0.0", className, "readField")));
+        callbacks.put(
+                "returnArgument",
+                Collections.singletonList(spec("GHSA-var", "com.example:lib", "1.0.0", className, "returnArgument")));
+        callbacks.put(
+                "callToString",
+                Collections.singletonList(spec("GHSA-method", "com.example:lib", "1.0.0", className, "callToString")));
+
+        Class<?> cls = loadModified(ScaMethodCallbackInjector.inject(original, callbacks));
+
+        assertEquals(7, cls.getMethod("readField").invoke(null));
+        assertEquals("value", cls.getMethod("returnArgument", Object.class).invoke(null, "value"));
+        assertEquals("value", cls.getMethod("callToString", Object.class).invoke(null, "value"));
+
+        List<ScaReachabilityHit> hits = drainHits();
+        assertEquals(3, hits.size());
+        assertTrue(hits.stream().allMatch(hit -> hit.line() == 1));
+        assertTrue(hits.stream().anyMatch(hit -> hit.symbolName().equals("readField")));
+        assertTrue(hits.stream().anyMatch(hit -> hit.symbolName().equals("returnArgument")));
+        assertTrue(hits.stream().anyMatch(hit -> hit.symbolName().equals("callToString")));
     }
 
-    public static String ldcFirst() {
-      return "constant".trim();
+    @Test
+    void inject_sameMethodNameInDifferentClassesProduceIndependentHits() throws Exception {
+        // Regression test for dedup key bug: if two classes in the same artifact share a method
+        // name (e.g. ClassA.parse and ClassB.parse), both must be reported independently.
+        // With the stateful RFC model, one hit per CVE is reported (first occurrence wins).
+        // The dedup key in ScaReachabilityCallback uses dotClassName to allow both classes to reach
+        // the registry handler, but the registry itself enforces "single occurrence per CVE".
+        // This verifies that ClassB's hit does NOT cause a NullPointerException or error — it is
+        // simply ignored since ClassA already provided the first callsite for GHSA-shared.
+
+        Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacksClassA = new HashMap<>();
+        callbacksClassA.put(
+                "vulnerableMethod",
+                Collections.singletonList(
+                        spec("GHSA-shared", "com.example:lib", "1.0.0", "com.example.ClassA", "vulnerableMethod")));
+
+        Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacksClassB = new HashMap<>();
+        callbacksClassB.put(
+                "vulnerableMethod",
+                Collections.singletonList(
+                        spec("GHSA-shared", "com.example:lib", "1.0.0", "com.example.ClassB", "vulnerableMethod")));
+
+        byte[] original = bytecodeOf(TargetClass.class);
+        Class<?> clsA = loadModified(ScaMethodCallbackInjector.inject(original, callbacksClassA));
+        Class<?> clsB = loadModified(ScaMethodCallbackInjector.inject(original, callbacksClassB));
+
+        clsA.getMethod("vulnerableMethod").invoke(clsA.getDeclaredConstructor().newInstance());
+        clsB.getMethod("vulnerableMethod").invoke(clsB.getDeclaredConstructor().newInstance());
+
+        List<ScaReachabilityHit> hits = drainHits();
+        // RFC: "reporting a single occurrence is sufficient" — only the first callsite per CVE is kept.
+        assertEquals(1, hits.size(), "Only the first hit per CVE is retained (RFC: single occurrence)");
+        assertEquals("GHSA-shared", hits.get(0).vulnId());
     }
-  }
-
-  @Test
-  void inject_withoutLineNumbersInjectsBeforeNewInstruction() throws Exception {
-    assertCallbackIsFirstInstruction("newFirst");
-  }
-
-  @Test
-  void inject_withoutLineNumbersInjectsBeforeInvokeDynamicInstruction() throws Exception {
-    assertCallbackIsFirstInstruction("lambdaFirst");
-  }
-
-  @Test
-  void inject_withoutLineNumbersInjectsBeforeLdcInstruction() throws Exception {
-    assertCallbackIsFirstInstruction("ldcFirst");
-  }
-
-  /**
-   * Regression test for the delayed-injection bug: verifies (via ASM inspection of the injected
-   * bytecode, not just observed behavior) that the very first instruction visited in {@code
-   * methodName} is the callback's own {@code LDC} of the injected {@code vulnId} — i.e. the
-   * callback runs strictly before the method's original first instruction. Before the fix, {@code
-   * MethodEntryInjector} did not override {@code visitTypeInsn}/{@code
-   * visitInvokeDynamicInsn}/{@code visitLdcInsn}, so for methods starting with {@code NEW}, {@code
-   * INVOKEDYNAMIC} or {@code LDC} the original instruction was visited first and the callback was
-   * spliced in right after it instead of before it.
-   */
-  private void assertCallbackIsFirstInstruction(String methodName) throws Exception {
-    byte[] original = bytecodeWithoutDebugInfo(UnhandledFirstOpcodeMethods.class);
-    Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = new HashMap<>();
-    callbacks.put(
-        methodName,
-        Collections.singletonList(
-            spec(
-                "GHSA-first-instruction",
-                "com.example:lib",
-                "1.0.0",
-                UnhandledFirstOpcodeMethods.class.getName(),
-                methodName)));
-    byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
-
-    assertEquals(
-        "GHSA-first-instruction",
-        firstVisitedInstructionOf(modified, methodName),
-        "the injected callback's first LDC (vulnId) must be the method's first visited instruction");
-  }
-
-  /**
-   * Reads {@code methodName} from {@code bytecode} and returns whatever value/marker the very first
-   * opcode-visiting callback receives (the LDC constant for {@code visitLdcInsn}, or the opcode
-   * name for other instruction kinds).
-   */
-  private static Object firstVisitedInstructionOf(byte[] bytecode, String methodName) {
-    Object[] first = {null};
-    new ClassReader(bytecode)
-        .accept(
-            new ClassVisitor(OpenedClassReader.ASM_API) {
-              @Override
-              public MethodVisitor visitMethod(
-                  int access, String name, String descriptor, String signature, String[] exc) {
-                if (!name.equals(methodName)) {
-                  return null;
-                }
-                return new MethodVisitor(OpenedClassReader.ASM_API) {
-                  @Override
-                  public void visitLdcInsn(Object value) {
-                    if (first[0] == null) {
-                      first[0] = value;
-                    }
-                  }
-
-                  @Override
-                  public void visitTypeInsn(int opcode, String type) {
-                    if (first[0] == null) {
-                      first[0] = "TYPE_INSN:" + opcode;
-                    }
-                  }
-
-                  @Override
-                  public void visitInvokeDynamicInsn(String n, String d, Handle h, Object... args) {
-                    if (first[0] == null) {
-                      first[0] = "INVOKEDYNAMIC";
-                    }
-                  }
-                };
-              }
-            },
-            0);
-    assertNotNull(first[0], "no matching instruction found in " + methodName);
-    return first[0];
-  }
-
-  /**
-   * Fixture exercising the instruction kinds {@link ScaMethodCallbackInjector.MethodEntryInjector}
-   * must forward to the delegate unchanged: BIPUSH ({@code visitIntInsn}), a conditional jump
-   * ({@code visitJumpInsn}), a loop increment ({@code visitIincInsn}), a dense switch ({@code
-   * visitTableSwitchInsn}), a sparse switch ({@code visitLookupSwitchInsn}) and a 2D array
-   * allocation ({@code visitMultiANewArrayInsn}).
-   */
-  public static class OpcodeCoverageMethods {
-    public static int intInsn() {
-      return 100;
+
+    /**
+     * Fixture whose methods start with bytecode opcodes that {@code MethodEntryInjector} used to
+     * leave unhandled (NEW, INVOKEDYNAMIC, LDC): the injected callback landed after that first
+     * instruction instead of at true method entry.
+     */
+    public static class UnhandledFirstOpcodeMethods {
+        public static Object newFirst() {
+            return new Object();
+        }
+
+        public static Supplier<String> lambdaFirst() {
+            return () -> "hi";
+        }
+
+        public static String ldcFirst() {
+            return "constant".trim();
+        }
     }
 
-    public static int jumpInsn(boolean flag) {
-      if (flag) {
-        return 1;
-      }
-      return 2;
+    @Test
+    void inject_withoutLineNumbersInjectsBeforeNewInstruction() throws Exception {
+        assertCallbackIsFirstInstruction("newFirst");
     }
 
-    public static int iincInsn() {
-      int i = 0;
-      i++;
-      return i;
+    @Test
+    void inject_withoutLineNumbersInjectsBeforeInvokeDynamicInstruction() throws Exception {
+        assertCallbackIsFirstInstruction("lambdaFirst");
     }
 
-    public static int tableSwitchInsn(int x) {
-      switch (x) {
-        case 0:
-          return 1;
-        case 1:
-          return 2;
-        case 2:
-          return 3;
-        default:
-          return -1;
-      }
+    @Test
+    void inject_withoutLineNumbersInjectsBeforeLdcInstruction() throws Exception {
+        assertCallbackIsFirstInstruction("ldcFirst");
     }
 
-    public static int lookupSwitchInsn(int x) {
-      switch (x) {
-        case 0:
-          return 1;
-        case 100:
-          return 2;
-        case 10000:
-          return 3;
-        default:
-          return -1;
-      }
+    /**
+     * Regression test for the delayed-injection bug: verifies (via ASM inspection of the injected
+     * bytecode, not just observed behavior) that the very first instruction visited in {@code
+     * methodName} is the callback's own {@code LDC} of the injected {@code vulnId} — i.e. the
+     * callback runs strictly before the method's original first instruction. Before the fix, {@code
+     * MethodEntryInjector} did not override {@code visitTypeInsn}/{@code
+     * visitInvokeDynamicInsn}/{@code visitLdcInsn}, so for methods starting with {@code NEW}, {@code
+     * INVOKEDYNAMIC} or {@code LDC} the original instruction was visited first and the callback was
+     * spliced in right after it instead of before it.
+     */
+    private void assertCallbackIsFirstInstruction(String methodName) throws Exception {
+        byte[] original = bytecodeWithoutDebugInfo(UnhandledFirstOpcodeMethods.class);
+        Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = new HashMap<>();
+        callbacks.put(
+                methodName,
+                Collections.singletonList(spec(
+                        "GHSA-first-instruction",
+                        "com.example:lib",
+                        "1.0.0",
+                        UnhandledFirstOpcodeMethods.class.getName(),
+                        methodName)));
+        byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
+
+        assertEquals(
+                "GHSA-first-instruction",
+                firstVisitedInstructionOf(modified, methodName),
+                "the injected callback's first LDC (vulnId) must be the method's first visited instruction");
     }
 
-    public static int[][] multiANewArrayInsn() {
-      return new int[2][3];
+    /**
+     * Reads {@code methodName} from {@code bytecode} and returns whatever value/marker the very first
+     * opcode-visiting callback receives (the LDC constant for {@code visitLdcInsn}, or the opcode
+     * name for other instruction kinds).
+     */
+    private static Object firstVisitedInstructionOf(byte[] bytecode, String methodName) {
+        Object[] first = {null};
+        new ClassReader(bytecode)
+                .accept(
+                        new ClassVisitor(OpenedClassReader.ASM_API) {
+                            @Override
+                            public MethodVisitor visitMethod(
+                                    int access, String name, String descriptor, String signature, String[] exc) {
+                                if (!name.equals(methodName)) {
+                                    return null;
+                                }
+                                return new MethodVisitor(OpenedClassReader.ASM_API) {
+                                    @Override
+                                    public void visitLdcInsn(Object value) {
+                                        if (first[0] == null) {
+                                            first[0] = value;
+                                        }
+                                    }
+
+                                    @Override
+                                    public void visitTypeInsn(int opcode, String type) {
+                                        if (first[0] == null) {
+                                            first[0] = "TYPE_INSN:" + opcode;
+                                        }
+                                    }
+
+                                    @Override
+                                    public void visitInvokeDynamicInsn(String n, String d, Handle h, Object... args) {
+                                        if (first[0] == null) {
+                                            first[0] = "INVOKEDYNAMIC";
+                                        }
+                                    }
+                                };
+                            }
+                        },
+                        0);
+        assertNotNull(first[0], "no matching instruction found in " + methodName);
+        return first[0];
     }
-  }
-
-  @Test
-  void inject_preservesBehaviorForAllInstructionKinds() throws Exception {
-    // Coverage for MethodEntryInjector's visitIntInsn/visitJumpInsn/visitIincInsn/
-    // visitTableSwitchInsn/visitLookupSwitchInsn/visitMultiANewArrayInsn overrides: each must
-    // forward to the delegate unchanged so the original method body still executes correctly
-    // once the entry callback is spliced in.
-    byte[] original = bytecodeOf(OpcodeCoverageMethods.class);
-    Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = new HashMap<>();
-    for (String methodName :
-        new String[] {
-          "intInsn",
-          "jumpInsn",
-          "iincInsn",
-          "tableSwitchInsn",
-          "lookupSwitchInsn",
-          "multiANewArrayInsn"
+
+    /**
+     * Fixture exercising the instruction kinds {@link ScaMethodCallbackInjector.MethodEntryInjector}
+     * must forward to the delegate unchanged: BIPUSH ({@code visitIntInsn}), a conditional jump
+     * ({@code visitJumpInsn}), a loop increment ({@code visitIincInsn}), a dense switch ({@code
+     * visitTableSwitchInsn}), a sparse switch ({@code visitLookupSwitchInsn}) and a 2D array
+     * allocation ({@code visitMultiANewArrayInsn}).
+     */
+    public static class OpcodeCoverageMethods {
+        public static int intInsn() {
+            return 100;
+        }
+
+        public static int jumpInsn(boolean flag) {
+            if (flag) {
+                return 1;
+            }
+            return 2;
+        }
+
+        public static int iincInsn() {
+            int i = 0;
+            i++;
+            return i;
+        }
+
+        public static int tableSwitchInsn(int x) {
+            switch (x) {
+                case 0:
+                    return 1;
+                case 1:
+                    return 2;
+                case 2:
+                    return 3;
+                default:
+                    return -1;
+            }
+        }
+
+        public static int lookupSwitchInsn(int x) {
+            switch (x) {
+                case 0:
+                    return 1;
+                case 100:
+                    return 2;
+                case 10000:
+                    return 3;
+                default:
+                    return -1;
+            }
+        }
+
+        public static int[][] multiANewArrayInsn() {
+            return new int[2][3];
+        }
+    }
+
+    @Test
+    void inject_preservesBehaviorForAllInstructionKinds() throws Exception {
+        // Coverage for MethodEntryInjector's visitIntInsn/visitJumpInsn/visitIincInsn/
+        // visitTableSwitchInsn/visitLookupSwitchInsn/visitMultiANewArrayInsn overrides: each must
+        // forward to the delegate unchanged so the original method body still executes correctly
+        // once the entry callback is spliced in.
+        byte[] original = bytecodeOf(OpcodeCoverageMethods.class);
+        Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = new HashMap<>();
+        for (String methodName : new String[] {
+            "intInsn", "jumpInsn", "iincInsn", "tableSwitchInsn", "lookupSwitchInsn", "multiANewArrayInsn"
         }) {
-      callbacks.put(
-          methodName,
-          Collections.singletonList(
-              spec("GHSA-" + methodName, "com.example:lib", "1.0.0", "T", methodName)));
+            callbacks.put(
+                    methodName,
+                    Collections.singletonList(spec("GHSA-" + methodName, "com.example:lib", "1.0.0", "T", methodName)));
+        }
+
+        Class<?> cls = loadModified(ScaMethodCallbackInjector.inject(original, callbacks));
+
+        assertEquals(100, cls.getMethod("intInsn").invoke(null));
+        assertEquals(1, cls.getMethod("jumpInsn", boolean.class).invoke(null, true));
+        assertEquals(2, cls.getMethod("jumpInsn", boolean.class).invoke(null, false));
+        assertEquals(1, cls.getMethod("iincInsn").invoke(null));
+        assertEquals(2, cls.getMethod("tableSwitchInsn", int.class).invoke(null, 1));
+        assertEquals(2, cls.getMethod("lookupSwitchInsn", int.class).invoke(null, 100));
+        assertEquals(2, ((int[][]) cls.getMethod("multiANewArrayInsn").invoke(null)).length);
+
+        assertEquals(6, drainHits().size(), "each instrumented method fires its own callback");
     }
 
-    Class<?> cls = loadModified(ScaMethodCallbackInjector.inject(original, callbacks));
-
-    assertEquals(100, cls.getMethod("intInsn").invoke(null));
-    assertEquals(1, cls.getMethod("jumpInsn", boolean.class).invoke(null, true));
-    assertEquals(2, cls.getMethod("jumpInsn", boolean.class).invoke(null, false));
-    assertEquals(1, cls.getMethod("iincInsn").invoke(null));
-    assertEquals(2, cls.getMethod("tableSwitchInsn", int.class).invoke(null, 1));
-    assertEquals(2, cls.getMethod("lookupSwitchInsn", int.class).invoke(null, 100));
-    assertEquals(2, ((int[][]) cls.getMethod("multiANewArrayInsn").invoke(null)).length);
-
-    assertEquals(6, drainHits().size(), "each instrumented method fires its own callback");
-  }
-
-  // ---------------------------------------------------------------------------
-  // transform(): two-phase design — first load enqueues, retransform injects
-  // ---------------------------------------------------------------------------
-
-  @Test
-  void transform_firstLoad_schedulesRetransformAndReturnsNull() throws Exception {
-    String json =
-        "{\"version\":1,\"entries\":[{"
-            + "\"vuln_id\":\"GHSA-cls\",\"artifact\":\"com.example:lib\","
-            + "\"version_ranges\":[\"< 999.0.0\"],"
-            + "\"symbols\":[{\"class\":\""
-            + TargetClass.class.getName().replace('.', '/')
-            + "\",\"method\":\"vulnerableMethod\"}]"
-            + "}]}";
-    ScaCveDatabase classDb = ScaCveDatabase.parse(new StringReader(json));
-    ScaReachabilityTransformer t = new ScaReachabilityTransformer(classDb, null);
-
-    byte[] result =
+    // ---------------------------------------------------------------------------
+    // transform(): two-phase design — first load enqueues, retransform injects
+    // ---------------------------------------------------------------------------
+
+    @Test
+    void transform_firstLoad_schedulesRetransformAndReturnsNull() throws Exception {
+        String json = "{\"version\":1,\"entries\":[{"
+                + "\"vuln_id\":\"GHSA-cls\",\"artifact\":\"com.example:lib\","
+                + "\"version_ranges\":[\"< 999.0.0\"],"
+                + "\"symbols\":[{\"class\":\""
+                + TargetClass.class.getName().replace('.', '/')
+                + "\",\"method\":\"vulnerableMethod\"}]"
+                + "}]}";
+        ScaCveDatabase classDb = ScaCveDatabase.parse(new StringReader(json));
+        ScaReachabilityTransformer t = new ScaReachabilityTransformer(classDb, null);
+
+        byte[] result = t.transform(
+                null,
+                TargetClass.class.getName().replace('.', '/'),
+                null, // classBeingRedefined == null → first load path
+                TargetClass.class.getProtectionDomain(),
+                bytecodeOf(TargetClass.class));
+
+        assertNull(result, "First load must return null (JAR I/O deferred to periodic task)");
+        assertFalse(
+                t.pendingRetransformNames.isEmpty(),
+                "First load must add the class name to pendingRetransformNames for the next heartbeat");
+    }
+
+    @Test
+    void transform_retransform_processesInlineAndDoesNotReSchedule() throws Exception {
+        // On retransform (classBeingRedefined != null), transform() calls processClass() inline.
+        // Version resolution fails in the unit-test context (no real JAR for com.example:lib), so
+        // processClass() re-queues in pendingRetransformNames for a retry. This exercises a single
+        // unresolved attempt (attempt 1 of ScaReachabilityTransformer.MAX_UNRESOLVED_RETRIES = 5), so
+        // re-queueing here is the expected, unchanged behaviour: the cap only stops the retries once it
+        // is exhausted, which transform_retransform_stopsReQueueingAfterMaxUnresolvedRetries covers.
+        // The invariant asserted here is that the retransform path reaches processClass() rather than
+        // the first-load fast-path.
+        String json = "{\"version\":1,\"entries\":[{"
+                + "\"vuln_id\":\"GHSA-mth\",\"artifact\":\"com.example:lib\","
+                + "\"version_ranges\":[\"< 999.0.0\"],"
+                + "\"symbols\":[{\"class\":\""
+                + TargetClass.class.getName().replace('.', '/')
+                + "\",\"method\":\"vulnerableMethod\"}]"
+                + "}]}";
+        ScaCveDatabase methodDb = ScaCveDatabase.parse(new StringReader(json));
+        ScaReachabilityTransformer t = new ScaReachabilityTransformer(methodDb, null);
+
+        // Start clean: no pending retransforms
+        assertTrue(t.pendingRetransformNames.isEmpty());
+
         t.transform(
-            null,
-            TargetClass.class.getName().replace('.', '/'),
-            null, // classBeingRedefined == null → first load path
-            TargetClass.class.getProtectionDomain(),
-            bytecodeOf(TargetClass.class));
-
-    assertNull(result, "First load must return null (JAR I/O deferred to periodic task)");
-    assertFalse(
-        t.pendingRetransformNames.isEmpty(),
-        "First load must add the class name to pendingRetransformNames for the next heartbeat");
-  }
-
-  @Test
-  void transform_retransform_processesInlineAndDoesNotReSchedule() throws Exception {
-    // On retransform (classBeingRedefined != null), transform() calls processClass() inline.
-    // Version resolution fails in the unit-test context (no real JAR for com.example:lib), so
-    // processClass() re-queues in pendingRetransformNames for a retry. This exercises a single
-    // unresolved attempt (attempt 1 of ScaReachabilityTransformer.MAX_UNRESOLVED_RETRIES = 5), so
-    // re-queueing here is the expected, unchanged behaviour: the cap only stops the retries once it
-    // is exhausted, which transform_retransform_stopsReQueueingAfterMaxUnresolvedRetries covers.
-    // The invariant asserted here is that the retransform path reaches processClass() rather than
-    // the first-load fast-path.
-    String json =
-        "{\"version\":1,\"entries\":[{"
-            + "\"vuln_id\":\"GHSA-mth\",\"artifact\":\"com.example:lib\","
-            + "\"version_ranges\":[\"< 999.0.0\"],"
-            + "\"symbols\":[{\"class\":\""
-            + TargetClass.class.getName().replace('.', '/')
-            + "\",\"method\":\"vulnerableMethod\"}]"
-            + "}]}";
-    ScaCveDatabase methodDb = ScaCveDatabase.parse(new StringReader(json));
-    ScaReachabilityTransformer t = new ScaReachabilityTransformer(methodDb, null);
-
-    // Start clean: no pending retransforms
-    assertTrue(t.pendingRetransformNames.isEmpty());
-
-    t.transform(
-        null,
-        TargetClass.class.getName().replace('.', '/'),
-        TargetClass.class, // classBeingRedefined != null → retransform path
-        TargetClass.class.getProtectionDomain(),
-        bytecodeOf(TargetClass.class));
-
-    // Version resolution failed (no pom.properties for com.example:lib in test classpath), so
-    // processClass() re-queued the class for a retry on the next heartbeat -- this is only attempt
-    // 1, well below the cap. This confirms the retransform path reached processClass() rather than
-    // the first-load path.
-    assertFalse(
-        t.pendingRetransformNames.isEmpty(),
-        "processClass() must re-queue on version resolution failure for heartbeat retry");
-  }
-
-  @Test
-  void transform_retransform_stopsReQueueingAfterMaxUnresolvedRetries() throws Exception {
-    // APPSEC-69734: an artifact that can never resolve as a dependency (com.example:lib has no
-    // pom.properties anywhere in the test classpath, just like an embedded-Tomcat app never
-    // resolving "tomcat"/"tomcat-coyote") must not re-queue itself into pendingRetransformNames
-    // forever — every heartbeat would otherwise cost a stop-the-world retransformClasses() call.
-    String json =
-        "{\"version\":1,\"entries\":[{"
-            + "\"vuln_id\":\"GHSA-cap\",\"artifact\":\"com.example:lib\","
-            + "\"version_ranges\":[\"< 999.0.0\"],"
-            + "\"symbols\":[{\"class\":\""
-            + TargetClass.class.getName().replace('.', '/')
-            + "\",\"method\":\"vulnerableMethod\"}]"
-            + "}]}";
-    ScaCveDatabase methodDb = ScaCveDatabase.parse(new StringReader(json));
-    ScaReachabilityTransformer t = new ScaReachabilityTransformer(methodDb, null);
-
-    int maxRetries = ScaReachabilityTransformer.MAX_UNRESOLVED_RETRIES;
-
-    // Heartbeats 1..maxRetries-1 stay within the cap and keep re-queuing. The Nth heartbeat is the
-    // one where the attempt count reaches maxRetries and processClass() gives up instead.
-    for (int attempt = 1; attempt < maxRetries; attempt++) {
-      // Each iteration stands for one telemetry heartbeat. Clearing pendingRetransformNames first
-      // makes each iteration's assertion meaningful on its own — otherwise a leftover entry from an
-      // earlier attempt would keep the set non-empty even if this attempt's re-queue were broken.
-      t.pendingRetransformNames.clear();
-      simulateHeartbeat(t);
-      assertFalse(
-          t.pendingRetransformNames.isEmpty(),
-          "attempt " + attempt + " is within the cap, so the class must still be queued for retry");
+                null,
+                TargetClass.class.getName().replace('.', '/'),
+                TargetClass.class, // classBeingRedefined != null → retransform path
+                TargetClass.class.getProtectionDomain(),
+                bytecodeOf(TargetClass.class));
+
+        // Version resolution failed (no pom.properties for com.example:lib in test classpath), so
+        // processClass() re-queued the class for a retry on the next heartbeat -- this is only attempt
+        // 1, well below the cap. This confirms the retransform path reached processClass() rather than
+        // the first-load path.
+        assertFalse(
+                t.pendingRetransformNames.isEmpty(),
+                "processClass() must re-queue on version resolution failure for heartbeat retry");
     }
 
-    // The cap is reached on this heartbeat (attempt count == maxRetries): from now on
-    // processClass() must not re-add the class. Clearing the set makes that unambiguous — anything
-    // present afterwards can only have been re-added by the call below.
-    t.pendingRetransformNames.clear();
-    simulateHeartbeat(t);
-
-    assertTrue(
-        t.pendingRetransformNames.isEmpty(),
-        "after MAX_UNRESOLVED_RETRIES the class must be given up on and never re-queued again");
-  }
-
-  @Test
-  void transform_retransform_resolvingBeforeTheCapStillInjectsTheCallback() throws Exception {
-    // APPSEC-69734: the retry cap must only ever kick in for artifacts that never resolve. An
-    // artifact that stays unresolved for a few heartbeats and then finally resolves (e.g. its JAR
-    // is only scanned successfully on a later pass) must behave exactly as before the cap existed:
-    // the method-level callback is injected on that attempt, and nothing is given up on early.
-    String json =
-        "{\"version\":1,\"entries\":[{"
-            + "\"vuln_id\":\"GHSA-late\",\"artifact\":\"com.example:lib\","
-            + "\"version_ranges\":[\"< 999.0.0\"],"
-            + "\"symbols\":[{\"class\":\""
-            + TargetClass.class.getName().replace('.', '/')
-            + "\",\"method\":\"vulnerableMethod\"}]"
-            + "}]}";
-    ScaCveDatabase methodDb = ScaCveDatabase.parse(new StringReader(json));
-    ScaReachabilityTransformer t = new ScaReachabilityTransformer(methodDb, null);
-
-    // Attempts 1..3: com.example:lib has no pom.properties in the test classpath, so resolution
-    // fails and the class is re-queued (3 < MAX_UNRESOLVED_RETRIES).
-    for (int attempt = 1; attempt <= 3; attempt++) {
-      t.pendingRetransformNames.clear();
-      assertNull(
-          simulateHeartbeat(t),
-          "attempt " + attempt + " cannot inject anything while the artifact is unresolved");
-      assertTrue(
-          t.pendingRetransformNames.contains(TargetClass.class.getName().replace('.', '/')),
-          "attempt " + attempt + " is well within the cap, so the class must be re-queued");
+    @Test
+    void transform_retransform_stopsReQueueingAfterMaxUnresolvedRetries() throws Exception {
+        // APPSEC-69734: an artifact that can never resolve as a dependency (com.example:lib has no
+        // pom.properties anywhere in the test classpath, just like an embedded-Tomcat app never
+        // resolving "tomcat"/"tomcat-coyote") must not re-queue itself into pendingRetransformNames
+        // forever — every heartbeat would otherwise cost a stop-the-world retransformClasses() call.
+        String json = "{\"version\":1,\"entries\":[{"
+                + "\"vuln_id\":\"GHSA-cap\",\"artifact\":\"com.example:lib\","
+                + "\"version_ranges\":[\"< 999.0.0\"],"
+                + "\"symbols\":[{\"class\":\""
+                + TargetClass.class.getName().replace('.', '/')
+                + "\",\"method\":\"vulnerableMethod\"}]"
+                + "}]}";
+        ScaCveDatabase methodDb = ScaCveDatabase.parse(new StringReader(json));
+        ScaReachabilityTransformer t = new ScaReachabilityTransformer(methodDb, null);
+
+        int maxRetries = ScaReachabilityTransformer.MAX_UNRESOLVED_RETRIES;
+
+        // Heartbeats 1..maxRetries-1 stay within the cap and keep re-queuing. The Nth heartbeat is the
+        // one where the attempt count reaches maxRetries and processClass() gives up instead.
+        for (int attempt = 1; attempt < maxRetries; attempt++) {
+            // Each iteration stands for one telemetry heartbeat. Clearing pendingRetransformNames first
+            // makes each iteration's assertion meaningful on its own — otherwise a leftover entry from an
+            // earlier attempt would keep the set non-empty even if this attempt's re-queue were broken.
+            t.pendingRetransformNames.clear();
+            simulateHeartbeat(t);
+            assertFalse(
+                    t.pendingRetransformNames.isEmpty(),
+                    "attempt " + attempt + " is within the cap, so the class must still be queued for retry");
+        }
+
+        // The cap is reached on this heartbeat (attempt count == maxRetries): from now on
+        // processClass() must not re-add the class. Clearing the set makes that unambiguous — anything
+        // present afterwards can only have been re-added by the call below.
+        t.pendingRetransformNames.clear();
+        simulateHeartbeat(t);
+
+        assertTrue(
+                t.pendingRetransformNames.isEmpty(),
+                "after MAX_UNRESOLVED_RETRIES the class must be given up on and never re-queued again");
     }
 
-    // Attempt 4 (still before the 5th and final allowed attempt): make resolution succeed by
-    // seeding the classpath-scan cache that resolveArtifactDep() consults before scanning, which
-    // is exactly what a successful findArtifactInClasspath() would have populated.
-    t.classpathArtifactCache.put(
-        "com.example:lib", new Dependency("com.example:lib", "1.0.0", "lib-1.0.0.jar", null));
-    t.pendingRetransformNames.clear();
-
-    byte[] modified = simulateHeartbeat(t);
-
-    assertNotNull(modified, "once the artifact resolves, the callback bytecode must be returned");
-    assertTrue(
-        t.pendingRetransformNames.isEmpty(),
-        "nothing is left unresolved, so there is nothing to re-queue");
-
-    Class<?> cls = loadModified(modified);
-    cls.getMethod("vulnerableMethod").invoke(cls.getDeclaredConstructor().newInstance());
-
-    List<ScaReachabilityHit> hits = drainHits();
-    assertEquals(1, hits.size(), "the injected callback must fire like it did before the cap");
-    assertEquals("GHSA-late", hits.get(0).vulnId());
-    assertEquals("com.example:lib", hits.get(0).artifact());
-    assertEquals("1.0.0", hits.get(0).version());
-  }
-
-  /**
-   * Simulates one telemetry heartbeat: clears the per-heartbeat dedup marker (only {@link
-   * ScaReachabilityTransformer#performPendingRetransforms()} does this in production; done here by
-   * hand because these tests drive {@code transform()} directly), then fires the retransform path
-   * ({@code classBeingRedefined != null}) for {@link TargetClass}, returning whatever bytecode
-   * {@code processClass()} produced ({@code null} while the watched artifact stays unresolved).
-   */
-  private static byte[] simulateHeartbeat(ScaReachabilityTransformer t) throws Exception {
-    t.countedThisHeartbeat.clear();
-    return t.transform(
-        null,
-        TargetClass.class.getName().replace('.', '/'),
-        TargetClass.class,
-        TargetClass.class.getProtectionDomain(),
-        bytecodeOf(TargetClass.class));
-  }
-
-  // ---------------------------------------------------------------------------
-  // Helpers
-  // ---------------------------------------------------------------------------
-
-  /**
-   * Extracts ScaReachabilityHit objects from pending dependencies in the registry. Only returns
-   * CVEs that have an actual hit (callsite recorded), not empty-reached CVEs.
-   */
-  private static List<ScaReachabilityHit> drainHits() {
-    List<ScaReachabilityHit> result = new ArrayList<>();
-    for (DependencySnapshot dep :
-        ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies()) {
-      for (ScaReachabilityDependencyRegistry.CveSnapshot cve : dep.cves) {
-        if (cve.hit != null) {
-          result.add(cve.hit);
+    @Test
+    void transform_retransform_resolvingBeforeTheCapStillInjectsTheCallback() throws Exception {
+        // APPSEC-69734: the retry cap must only ever kick in for artifacts that never resolve. An
+        // artifact that stays unresolved for a few heartbeats and then finally resolves (e.g. its JAR
+        // is only scanned successfully on a later pass) must behave exactly as before the cap existed:
+        // the method-level callback is injected on that attempt, and nothing is given up on early.
+        String json = "{\"version\":1,\"entries\":[{"
+                + "\"vuln_id\":\"GHSA-late\",\"artifact\":\"com.example:lib\","
+                + "\"version_ranges\":[\"< 999.0.0\"],"
+                + "\"symbols\":[{\"class\":\""
+                + TargetClass.class.getName().replace('.', '/')
+                + "\",\"method\":\"vulnerableMethod\"}]"
+                + "}]}";
+        ScaCveDatabase methodDb = ScaCveDatabase.parse(new StringReader(json));
+        ScaReachabilityTransformer t = new ScaReachabilityTransformer(methodDb, null);
+
+        // Attempts 1..3: com.example:lib has no pom.properties in the test classpath, so resolution
+        // fails and the class is re-queued (3 < MAX_UNRESOLVED_RETRIES).
+        for (int attempt = 1; attempt <= 3; attempt++) {
+            t.pendingRetransformNames.clear();
+            assertNull(
+                    simulateHeartbeat(t),
+                    "attempt " + attempt + " cannot inject anything while the artifact is unresolved");
+            assertTrue(
+                    t.pendingRetransformNames.contains(
+                            TargetClass.class.getName().replace('.', '/')),
+                    "attempt " + attempt + " is well within the cap, so the class must be re-queued");
         }
-      }
+
+        // Attempt 4 (still before the 5th and final allowed attempt): make resolution succeed by
+        // seeding the classpath-scan cache that resolveArtifactDep() consults before scanning, which
+        // is exactly what a successful findArtifactInClasspath() would have populated.
+        t.classpathArtifactCache.put(
+                "com.example:lib", new Dependency("com.example:lib", "1.0.0", "lib-1.0.0.jar", null));
+        t.pendingRetransformNames.clear();
+
+        byte[] modified = simulateHeartbeat(t);
+
+        assertNotNull(modified, "once the artifact resolves, the callback bytecode must be returned");
+        assertTrue(t.pendingRetransformNames.isEmpty(), "nothing is left unresolved, so there is nothing to re-queue");
+
+        Class<?> cls = loadModified(modified);
+        cls.getMethod("vulnerableMethod").invoke(cls.getDeclaredConstructor().newInstance());
+
+        List<ScaReachabilityHit> hits = drainHits();
+        assertEquals(1, hits.size(), "the injected callback must fire like it did before the cap");
+        assertEquals("GHSA-late", hits.get(0).vulnId());
+        assertEquals("com.example:lib", hits.get(0).artifact());
+        assertEquals("1.0.0", hits.get(0).version());
+    }
+
+    /**
+     * Simulates one telemetry heartbeat: clears the per-heartbeat dedup marker (only {@link
+     * ScaReachabilityTransformer#performPendingRetransforms()} does this in production; done here by
+     * hand because these tests drive {@code transform()} directly), then fires the retransform path
+     * ({@code classBeingRedefined != null}) for {@link TargetClass}, returning whatever bytecode
+     * {@code processClass()} produced ({@code null} while the watched artifact stays unresolved).
+     */
+    private static byte[] simulateHeartbeat(ScaReachabilityTransformer t) throws Exception {
+        t.countedThisHeartbeat.clear();
+        return t.transform(
+                null,
+                TargetClass.class.getName().replace('.', '/'),
+                TargetClass.class,
+                TargetClass.class.getProtectionDomain(),
+                bytecodeOf(TargetClass.class));
+    }
+
+    // ---------------------------------------------------------------------------
+    // Helpers
+    // ---------------------------------------------------------------------------
+
+    /**
+     * Extracts ScaReachabilityHit objects from pending dependencies in the registry. Only returns
+     * CVEs that have an actual hit (callsite recorded), not empty-reached CVEs.
+     */
+    private static List<ScaReachabilityHit> drainHits() {
+        List<ScaReachabilityHit> result = new ArrayList<>();
+        for (DependencySnapshot dep : ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies()) {
+            for (ScaReachabilityDependencyRegistry.CveSnapshot cve : dep.cves) {
+                if (cve.hit != null) {
+                    result.add(cve.hit);
+                }
+            }
+        }
+        return result;
+    }
+
+    private static Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> singleCallback(String methodName) {
+        Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> m = new HashMap<>();
+        m.put(
+                methodName,
+                Collections.singletonList(spec(
+                        "GHSA-method-0001", "com.example:test-lib", "1.2.3", TargetClass.class.getName(), methodName)));
+        return m;
+    }
+
+    private static ScaMethodCallbackInjector.MethodCallbackSpec spec(
+            String vulnId, String artifact, String version, String dotClass, String method) {
+        return new ScaMethodCallbackInjector.MethodCallbackSpec(vulnId, artifact, version, dotClass, method);
     }
-    return result;
-  }
-
-  private static Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> singleCallback(
-      String methodName) {
-    Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> m = new HashMap<>();
-    m.put(
-        methodName,
-        Collections.singletonList(
-            spec(
-                "GHSA-method-0001",
-                "com.example:test-lib",
-                "1.2.3",
-                TargetClass.class.getName(),
-                methodName)));
-    return m;
-  }
-
-  private static ScaMethodCallbackInjector.MethodCallbackSpec spec(
-      String vulnId, String artifact, String version, String dotClass, String method) {
-    return new ScaMethodCallbackInjector.MethodCallbackSpec(
-        vulnId, artifact, version, dotClass, method);
-  }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityRetransformTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityRetransformTest.java
index 3dabdfebb6f..502453960f0 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityRetransformTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityRetransformTest.java
@@ -30,227 +30,218 @@
  */
 class ScaReachabilityRetransformTest {
 
-  /** Dummy class used as the retransform target in tests. */
-  public static class Target {
-    public void method() {}
-  }
-
-  /** Second dummy class, distinct from {@link Target}, used to simulate a mixed batch. */
-  public static class Other {
-    public void method() {}
-  }
-
-  @Test
-  void performPendingRetransforms_retransformsAllMatchingInstances() throws Exception {
-    // Returning the same Class<?> twice in getAllLoadedClasses() simulates two classloader
-    // instances holding the same vulnerable class. With the old remove()-inside-loop approach
-    // only the first entry was retransformed; with contains()+removeAll() both are collected.
-    String internalName = Target.class.getName().replace('.', '/');
-
-    Instrumentation instr = mock(Instrumentation.class);
-    when(instr.getAllLoadedClasses()).thenReturn(new Class<?>[] {Target.class, Target.class});
-    when(instr.isModifiableClass(Target.class)).thenReturn(true);
-
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}"));
-    ScaReachabilityTransformer t = new ScaReachabilityTransformer(db, instr);
-    t.pendingRetransformNames.add(internalName);
-
-    t.performPendingRetransforms();
-
-    // Both entries must reach retransformClasses: with the old remove() approach only the first
-    // matched (length 1). With contains()+removeAll() both are collected (length 2).
-    // Mockito expands varargs as individual arguments, so verify with two explicit entries.
-    verify(instr).retransformClasses(Target.class, Target.class);
-    assertTrue(
-        t.pendingRetransformNames.isEmpty(),
-        "internal name must be removed from the pending set after retransform");
-  }
-
-  @Test
-  void performPendingRetransforms_requeuesOnRetransformFailure() throws Exception {
-    String internalName = Target.class.getName().replace('.', '/');
-
-    Instrumentation instr = mock(Instrumentation.class);
-    when(instr.getAllLoadedClasses()).thenReturn(new Class<?>[] {Target.class, Target.class});
-    when(instr.isModifiableClass(Target.class)).thenReturn(true);
-    doThrow(new RuntimeException("retransform failed")).when(instr).retransformClasses(any());
-
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}"));
-    ScaReachabilityTransformer t = new ScaReachabilityTransformer(db, instr);
-    t.pendingRetransformNames.add(internalName);
-
-    t.performPendingRetransforms();
-
-    assertEquals(
-        2,
-        t.pendingRetransform.size(),
-        "the failing batch of 2 must be bisected into 2 singleton batches for the next"
-            + " heartbeat retry");
-  }
-
-  @Test
-  void performPendingRetransforms_dropsSingletonBatchImmediatelyOnFailure() throws Exception {
-    // retransformClasses() is atomic for the whole array: an unrelated, permanently-failing class
-    // (this test simulates it with a RuntimeException on every attempt) must not be re-queued
-    // forever, or its Class<?> (and its ClassLoader) is retained indefinitely — the Metaspace leak
-    // from APPSEC-69201. Once a batch is down to a single class, a failure is treated as proof the
-    // class itself is the cause and it is dropped on the spot, with no retry budget.
-    Instrumentation instr = mock(Instrumentation.class);
-    when(instr.isModifiableClass(Target.class)).thenReturn(true);
-    doThrow(new RuntimeException("retransform failed")).when(instr).retransformClasses(any());
-
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}"));
-    ScaReachabilityTransformer t = new ScaReachabilityTransformer(db, instr);
-    t.pendingRetransform.add(new ArrayList<>(Collections.singletonList(Target.class)));
-
-    t.performPendingRetransforms();
-
-    assertTrue(
-        t.pendingRetransform.isEmpty(), "class must be dropped (not re-queued) after one failure");
-  }
-
-  @Test
-  void performPendingRetransforms_doesNotRequeueSingletonBatchOnSuccess() throws Exception {
-    Instrumentation instr = mock(Instrumentation.class);
-    when(instr.isModifiableClass(Target.class)).thenReturn(true);
-
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}"));
-    ScaReachabilityTransformer t = new ScaReachabilityTransformer(db, instr);
-
-    t.pendingRetransform.add(new ArrayList<>(Collections.singletonList(Target.class)));
-    t.performPendingRetransforms();
-
-    verify(instr).retransformClasses(Target.class);
-    assertTrue(t.pendingRetransform.isEmpty(), "class must not be re-queued after success");
-  }
-
-  @Test
-  void performPendingRetransforms_isolatesHealthyClassFromPermanentlyFailingBatchMateViaBisection()
-      throws Exception {
-    // A batch containing one permanently-failing class and one otherwise-healthy class fails once
-    // as a pair. Rather than tying both classes together, the batch is immediately bisected into
-    // two singleton batches, deferred to the next heartbeat. On the next heartbeat the healthy
-    // class retransforms successfully on its own, isolated from its unrelated, permanently-failing
-    // batch-mate — which is dropped on the spot since it fails again alone.
-    Class<?> poison = Target.class;
-    Class<?> healthy = Other.class;
-
-    Instrumentation instr = mock(Instrumentation.class);
-    when(instr.isModifiableClass(poison)).thenReturn(true);
-    when(instr.isModifiableClass(healthy)).thenReturn(true);
-    doAnswer(
-            invocation -> {
-              // Mockito flattens the varargs invocation, so getArguments() yields the individual
-              // Class<?> elements rather than the backing array.
-              for (Object arg : invocation.getArguments()) {
-                if (arg == poison) {
-                  throw new RuntimeException("retransform failed");
-                }
-              }
-              return null;
-            })
-        .when(instr)
-        .retransformClasses(any());
-
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}"));
-    ScaReachabilityTransformer t = new ScaReachabilityTransformer(db, instr);
-    t.pendingRetransform.add(new ArrayList<>(Arrays.asList(poison, healthy)));
-
-    t.performPendingRetransforms(); // batch of 2 fails, bisects into [poison] and [healthy]
-    t.performPendingRetransforms(); // [healthy] succeeds alone; [poison] fails alone and is dropped
-
-    verify(instr).retransformClasses(healthy);
-    assertTrue(
-        t.pendingRetransform.isEmpty(),
-        "healthy class must be successfully retransformed and the poison class dropped, leaving"
-            + " nothing queued");
-  }
-
-  @Test
-  void performPendingRetransforms_skipsNonModifiableClasses() throws Exception {
-    // Non-modifiable classes (e.g. JDK classes, primitive wrappers) must be silently discarded
-    // from the pending set and never passed to retransformClasses. Without this guard they would
-    // loop forever: retransformClasses rejects them, the catch re-queues them, next heartbeat
-    // tries again, ad infinitum.
-    String internalName = Target.class.getName().replace('.', '/');
-
-    Instrumentation instr = mock(Instrumentation.class);
-    when(instr.getAllLoadedClasses()).thenReturn(new Class<?>[] {Target.class});
-    when(instr.isModifiableClass(Target.class)).thenReturn(false);
-
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}"));
-    ScaReachabilityTransformer t = new ScaReachabilityTransformer(db, instr);
-    t.pendingRetransformNames.add(internalName);
-
-    t.performPendingRetransforms();
-
-    assertTrue(
-        t.pendingRetransformNames.isEmpty(),
-        "non-modifiable class must be removed from pendingRetransformNames");
-    assertTrue(
-        t.pendingRetransform.isEmpty(),
-        "non-modifiable class must not be re-queued in pendingRetransform");
-  }
-
-  @Test
-  void performPendingRetransforms_countsOneUnresolvedAttemptPerHeartbeatAcrossClassloaders()
-      throws Exception {
-    // APPSEC-69734: a Spring Boot fat JAR loads the same vulnerable class once per
-    // LaunchedURLClassLoader, so a single heartbeat retransforms N copies of the same class name
-    // and processClass() runs N times. The MAX_UNRESOLVED_RETRIES budget is per class name per
-    // heartbeat, not per loaded copy: otherwise N classloaders would drain the whole budget N
-    // times faster than real heartbeats and the class would be given up on almost immediately.
-    String internalName = Target.class.getName().replace('.', '/');
-    // com.example:lib never resolves as a dependency in the test classpath, so processClass()
-    // always takes the hasUnresolvedMethodLevelSymbols branch where the cap logic lives.
-    String json =
-        "{\"version\":1,\"entries\":[{"
-            + "\"vuln_id\":\"GHSA-dedup\",\"artifact\":\"com.example:lib\","
-            + "\"version_ranges\":[\"< 999.0.0\"],"
-            + "\"symbols\":[{\"class\":\""
-            + internalName
-            + "\",\"method\":\"method\"}]"
-            + "}]}";
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json));
-
-    Instrumentation instr = mock(Instrumentation.class);
-    // Same Class<?> twice: two classloader instances holding the same vulnerable class name.
-    when(instr.getAllLoadedClasses()).thenReturn(new Class<?>[] {Target.class, Target.class});
-    when(instr.isModifiableClass(Target.class)).thenReturn(true);
-
-    ScaReachabilityTransformer t = new ScaReachabilityTransformer(db, instr);
-
-    // The mocked Instrumentation does not run the JVM retransform machinery, so it never calls
-    // back into transform(). Do it by hand, once per retransformed Class<?>, exactly as the real
-    // JVM would within a single retransformClasses() call.
-    doAnswer(
-            invocation -> {
-              for (Object arg : invocation.getArguments()) {
-                Class<?> c = (Class<?>) arg;
-                t.transform(
-                    null,
-                    c.getName().replace('.', '/'),
-                    c, // classBeingRedefined != null → retransform path → processClass()
-                    c.getProtectionDomain(),
-                    ScaBytecodeTestUtils.bytecodeOf(c));
-              }
-              return null;
-            })
-        .when(instr)
-        .retransformClasses(any());
-
-    t.pendingRetransformNames.add(internalName);
-
-    t.performPendingRetransforms();
-
-    verify(instr).retransformClasses(Target.class, Target.class);
-    assertEquals(
-        Integer.valueOf(1),
-        t.unresolvedAttemptCounts.get(internalName),
-        "two loaded copies of the same class name retransformed in one heartbeat must consume a"
-            + " single unresolved-retry attempt, not one each");
-    assertTrue(
-        t.pendingRetransformNames.contains(internalName),
-        "the class is still well within the cap, so it must be re-queued for the next heartbeat");
-  }
+    /** Dummy class used as the retransform target in tests. */
+    public static class Target {
+        public void method() {}
+    }
+
+    /** Second dummy class, distinct from {@link Target}, used to simulate a mixed batch. */
+    public static class Other {
+        public void method() {}
+    }
+
+    @Test
+    void performPendingRetransforms_retransformsAllMatchingInstances() throws Exception {
+        // Returning the same Class<?> twice in getAllLoadedClasses() simulates two classloader
+        // instances holding the same vulnerable class. With the old remove()-inside-loop approach
+        // only the first entry was retransformed; with contains()+removeAll() both are collected.
+        String internalName = Target.class.getName().replace('.', '/');
+
+        Instrumentation instr = mock(Instrumentation.class);
+        when(instr.getAllLoadedClasses()).thenReturn(new Class<?>[] {Target.class, Target.class});
+        when(instr.isModifiableClass(Target.class)).thenReturn(true);
+
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}"));
+        ScaReachabilityTransformer t = new ScaReachabilityTransformer(db, instr);
+        t.pendingRetransformNames.add(internalName);
+
+        t.performPendingRetransforms();
+
+        // Both entries must reach retransformClasses: with the old remove() approach only the first
+        // matched (length 1). With contains()+removeAll() both are collected (length 2).
+        // Mockito expands varargs as individual arguments, so verify with two explicit entries.
+        verify(instr).retransformClasses(Target.class, Target.class);
+        assertTrue(
+                t.pendingRetransformNames.isEmpty(),
+                "internal name must be removed from the pending set after retransform");
+    }
+
+    @Test
+    void performPendingRetransforms_requeuesOnRetransformFailure() throws Exception {
+        String internalName = Target.class.getName().replace('.', '/');
+
+        Instrumentation instr = mock(Instrumentation.class);
+        when(instr.getAllLoadedClasses()).thenReturn(new Class<?>[] {Target.class, Target.class});
+        when(instr.isModifiableClass(Target.class)).thenReturn(true);
+        doThrow(new RuntimeException("retransform failed")).when(instr).retransformClasses(any());
+
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}"));
+        ScaReachabilityTransformer t = new ScaReachabilityTransformer(db, instr);
+        t.pendingRetransformNames.add(internalName);
+
+        t.performPendingRetransforms();
+
+        assertEquals(
+                2,
+                t.pendingRetransform.size(),
+                "the failing batch of 2 must be bisected into 2 singleton batches for the next" + " heartbeat retry");
+    }
+
+    @Test
+    void performPendingRetransforms_dropsSingletonBatchImmediatelyOnFailure() throws Exception {
+        // retransformClasses() is atomic for the whole array: an unrelated, permanently-failing class
+        // (this test simulates it with a RuntimeException on every attempt) must not be re-queued
+        // forever, or its Class<?> (and its ClassLoader) is retained indefinitely — the Metaspace leak
+        // from APPSEC-69201. Once a batch is down to a single class, a failure is treated as proof the
+        // class itself is the cause and it is dropped on the spot, with no retry budget.
+        Instrumentation instr = mock(Instrumentation.class);
+        when(instr.isModifiableClass(Target.class)).thenReturn(true);
+        doThrow(new RuntimeException("retransform failed")).when(instr).retransformClasses(any());
+
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}"));
+        ScaReachabilityTransformer t = new ScaReachabilityTransformer(db, instr);
+        t.pendingRetransform.add(new ArrayList<>(Collections.singletonList(Target.class)));
+
+        t.performPendingRetransforms();
+
+        assertTrue(t.pendingRetransform.isEmpty(), "class must be dropped (not re-queued) after one failure");
+    }
+
+    @Test
+    void performPendingRetransforms_doesNotRequeueSingletonBatchOnSuccess() throws Exception {
+        Instrumentation instr = mock(Instrumentation.class);
+        when(instr.isModifiableClass(Target.class)).thenReturn(true);
+
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}"));
+        ScaReachabilityTransformer t = new ScaReachabilityTransformer(db, instr);
+
+        t.pendingRetransform.add(new ArrayList<>(Collections.singletonList(Target.class)));
+        t.performPendingRetransforms();
+
+        verify(instr).retransformClasses(Target.class);
+        assertTrue(t.pendingRetransform.isEmpty(), "class must not be re-queued after success");
+    }
+
+    @Test
+    void performPendingRetransforms_isolatesHealthyClassFromPermanentlyFailingBatchMateViaBisection() throws Exception {
+        // A batch containing one permanently-failing class and one otherwise-healthy class fails once
+        // as a pair. Rather than tying both classes together, the batch is immediately bisected into
+        // two singleton batches, deferred to the next heartbeat. On the next heartbeat the healthy
+        // class retransforms successfully on its own, isolated from its unrelated, permanently-failing
+        // batch-mate — which is dropped on the spot since it fails again alone.
+        Class<?> poison = Target.class;
+        Class<?> healthy = Other.class;
+
+        Instrumentation instr = mock(Instrumentation.class);
+        when(instr.isModifiableClass(poison)).thenReturn(true);
+        when(instr.isModifiableClass(healthy)).thenReturn(true);
+        doAnswer(invocation -> {
+                    // Mockito flattens the varargs invocation, so getArguments() yields the individual
+                    // Class<?> elements rather than the backing array.
+                    for (Object arg : invocation.getArguments()) {
+                        if (arg == poison) {
+                            throw new RuntimeException("retransform failed");
+                        }
+                    }
+                    return null;
+                })
+                .when(instr)
+                .retransformClasses(any());
+
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}"));
+        ScaReachabilityTransformer t = new ScaReachabilityTransformer(db, instr);
+        t.pendingRetransform.add(new ArrayList<>(Arrays.asList(poison, healthy)));
+
+        t.performPendingRetransforms(); // batch of 2 fails, bisects into [poison] and [healthy]
+        t.performPendingRetransforms(); // [healthy] succeeds alone; [poison] fails alone and is dropped
+
+        verify(instr).retransformClasses(healthy);
+        assertTrue(
+                t.pendingRetransform.isEmpty(),
+                "healthy class must be successfully retransformed and the poison class dropped, leaving"
+                        + " nothing queued");
+    }
+
+    @Test
+    void performPendingRetransforms_skipsNonModifiableClasses() throws Exception {
+        // Non-modifiable classes (e.g. JDK classes, primitive wrappers) must be silently discarded
+        // from the pending set and never passed to retransformClasses. Without this guard they would
+        // loop forever: retransformClasses rejects them, the catch re-queues them, next heartbeat
+        // tries again, ad infinitum.
+        String internalName = Target.class.getName().replace('.', '/');
+
+        Instrumentation instr = mock(Instrumentation.class);
+        when(instr.getAllLoadedClasses()).thenReturn(new Class<?>[] {Target.class});
+        when(instr.isModifiableClass(Target.class)).thenReturn(false);
+
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}"));
+        ScaReachabilityTransformer t = new ScaReachabilityTransformer(db, instr);
+        t.pendingRetransformNames.add(internalName);
+
+        t.performPendingRetransforms();
+
+        assertTrue(
+                t.pendingRetransformNames.isEmpty(),
+                "non-modifiable class must be removed from pendingRetransformNames");
+        assertTrue(t.pendingRetransform.isEmpty(), "non-modifiable class must not be re-queued in pendingRetransform");
+    }
+
+    @Test
+    void performPendingRetransforms_countsOneUnresolvedAttemptPerHeartbeatAcrossClassloaders() throws Exception {
+        // APPSEC-69734: a Spring Boot fat JAR loads the same vulnerable class once per
+        // LaunchedURLClassLoader, so a single heartbeat retransforms N copies of the same class name
+        // and processClass() runs N times. The MAX_UNRESOLVED_RETRIES budget is per class name per
+        // heartbeat, not per loaded copy: otherwise N classloaders would drain the whole budget N
+        // times faster than real heartbeats and the class would be given up on almost immediately.
+        String internalName = Target.class.getName().replace('.', '/');
+        // com.example:lib never resolves as a dependency in the test classpath, so processClass()
+        // always takes the hasUnresolvedMethodLevelSymbols branch where the cap logic lives.
+        String json = "{\"version\":1,\"entries\":[{"
+                + "\"vuln_id\":\"GHSA-dedup\",\"artifact\":\"com.example:lib\","
+                + "\"version_ranges\":[\"< 999.0.0\"],"
+                + "\"symbols\":[{\"class\":\""
+                + internalName
+                + "\",\"method\":\"method\"}]"
+                + "}]}";
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json));
+
+        Instrumentation instr = mock(Instrumentation.class);
+        // Same Class<?> twice: two classloader instances holding the same vulnerable class name.
+        when(instr.getAllLoadedClasses()).thenReturn(new Class<?>[] {Target.class, Target.class});
+        when(instr.isModifiableClass(Target.class)).thenReturn(true);
+
+        ScaReachabilityTransformer t = new ScaReachabilityTransformer(db, instr);
+
+        // The mocked Instrumentation does not run the JVM retransform machinery, so it never calls
+        // back into transform(). Do it by hand, once per retransformed Class<?>, exactly as the real
+        // JVM would within a single retransformClasses() call.
+        doAnswer(invocation -> {
+                    for (Object arg : invocation.getArguments()) {
+                        Class<?> c = (Class<?>) arg;
+                        t.transform(
+                                null,
+                                c.getName().replace('.', '/'),
+                                c, // classBeingRedefined != null → retransform path → processClass()
+                                c.getProtectionDomain(),
+                                ScaBytecodeTestUtils.bytecodeOf(c));
+                    }
+                    return null;
+                })
+                .when(instr)
+                .retransformClasses(any());
+
+        t.pendingRetransformNames.add(internalName);
+
+        t.performPendingRetransforms();
+
+        verify(instr).retransformClasses(Target.class, Target.class);
+        assertEquals(
+                Integer.valueOf(1),
+                t.unresolvedAttemptCounts.get(internalName),
+                "two loaded copies of the same class name retransformed in one heartbeat must consume a"
+                        + " single unresolved-retry attempt, not one each");
+        assertTrue(
+                t.pendingRetransformNames.contains(internalName),
+                "the class is still well within the cap, so it must be re-queued for the next heartbeat");
+    }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilitySystemCallsiteTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilitySystemCallsiteTest.java
index 38dbb4130f5..f5fa6b01ac3 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilitySystemCallsiteTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilitySystemCallsiteTest.java
@@ -8,92 +8,92 @@
 /** Unit tests for {@link ScaReachabilitySystem#findCallsite(String, StackTraceElement[])}. */
 class ScaReachabilitySystemCallsiteTest {
 
-  private static final String VULNERABLE_CLASS = "org.yaml.snakeyaml.Yaml";
-
-  @Test
-  void findCallsite_returnsNullWhenVulnerableClassIsNotInStack() {
-    StackTraceElement[] stack = {
-      frame("sca.test.TestController", "doSomething"),
-    };
-
-    assertNull(
-        ScaReachabilitySystem.findCallsite("com.example.ClassNotOnStack", stack),
-        "Should return null when vulnerable class is not on the stack");
-  }
-
-  @Test
-  void findCallsite_returnsDirectCallerWhenNoIntermediateLibrary() {
-    StackTraceElement[] stack = {
-      frame(VULNERABLE_CLASS, "load"), frame("sca.test.TestController", "yamlHitDirect"),
-    };
-
-    StackTraceElement result = ScaReachabilitySystem.findCallsite(VULNERABLE_CLASS, stack);
-
-    assertEquals("sca.test.TestController", result.getClassName());
-    assertEquals("yamlHitDirect", result.getMethodName());
-  }
-
-  @Test
-  void findCallsite_skipsRepeatedVulnerableFrames() {
-    StackTraceElement[] stack = {
-      frame(VULNERABLE_CLASS, "load"),
-      frame(VULNERABLE_CLASS, "loadAll"),
-      frame("sca.test.TestController", "yamlHitRecursive"),
-    };
-
-    StackTraceElement result = ScaReachabilitySystem.findCallsite(VULNERABLE_CLASS, stack);
-
-    assertEquals("sca.test.TestController", result.getClassName());
-    assertEquals("yamlHitRecursive", result.getMethodName());
-  }
-
-  @Test
-  void findCallsite_skipsIntermediateLibraryFrameAndReturnsClientCode() {
-    // com.google.* is excluded by the SCA trie (value >= 1)
-    StackTraceElement[] stack = {
-      frame(VULNERABLE_CLASS, "load"),
-      frame("com.google.yaml.YamlWrapper", "load"),
-      frame("sca.test.TestController", "yamlHitTransitive"),
-    };
-
-    StackTraceElement result = ScaReachabilitySystem.findCallsite(VULNERABLE_CLASS, stack);
-
-    assertEquals(
-        "sca.test.TestController",
-        result.getClassName(),
-        "Should skip intermediate library frame and return application code");
-    assertEquals("yamlHitTransitive", result.getMethodName());
-  }
-
-  @Test
-  void findCallsite_skipsMultipleIntermediateLibraryFrames() {
-    StackTraceElement[] stack = {
-      frame(VULNERABLE_CLASS, "load"),
-      frame("com.google.yaml.YamlWrapper", "load"),
-      frame("org.springframework.beans.factory.xml.XmlBeanFactory", "init"),
-      frame("sca.test.TestController", "yamlHitDeep"),
-    };
-
-    StackTraceElement result = ScaReachabilitySystem.findCallsite(VULNERABLE_CLASS, stack);
-
-    assertEquals("sca.test.TestController", result.getClassName());
-    assertEquals("yamlHitDeep", result.getMethodName());
-  }
-
-  @Test
-  void findCallsite_returnsNullWhenOnlyLibraryFramesFollowVulnerableClass() {
-    StackTraceElement[] stack = {
-      frame(VULNERABLE_CLASS, "load"),
-      frame("com.google.yaml.YamlWrapper", "load"),
-      frame("org.springframework.beans.factory.BeanFactory", "getBean"),
-    };
-
-    assertNull(
-        ScaReachabilitySystem.findCallsite(VULNERABLE_CLASS, stack),
-        "Should return null and trigger fallback when no application frame is found");
-  }
-
-  private static StackTraceElement frame(String className, String methodName) {
-    return new StackTraceElement(className, methodName, null, -1);
-  }
+    private static final String VULNERABLE_CLASS = "org.yaml.snakeyaml.Yaml";
+
+    @Test
+    void findCallsite_returnsNullWhenVulnerableClassIsNotInStack() {
+        StackTraceElement[] stack = {
+            frame("sca.test.TestController", "doSomething"),
+        };
+
+        assertNull(
+                ScaReachabilitySystem.findCallsite("com.example.ClassNotOnStack", stack),
+                "Should return null when vulnerable class is not on the stack");
+    }
+
+    @Test
+    void findCallsite_returnsDirectCallerWhenNoIntermediateLibrary() {
+        StackTraceElement[] stack = {
+            frame(VULNERABLE_CLASS, "load"), frame("sca.test.TestController", "yamlHitDirect"),
+        };
+
+        StackTraceElement result = ScaReachabilitySystem.findCallsite(VULNERABLE_CLASS, stack);
+
+        assertEquals("sca.test.TestController", result.getClassName());
+        assertEquals("yamlHitDirect", result.getMethodName());
+    }
+
+    @Test
+    void findCallsite_skipsRepeatedVulnerableFrames() {
+        StackTraceElement[] stack = {
+            frame(VULNERABLE_CLASS, "load"),
+            frame(VULNERABLE_CLASS, "loadAll"),
+            frame("sca.test.TestController", "yamlHitRecursive"),
+        };
+
+        StackTraceElement result = ScaReachabilitySystem.findCallsite(VULNERABLE_CLASS, stack);
+
+        assertEquals("sca.test.TestController", result.getClassName());
+        assertEquals("yamlHitRecursive", result.getMethodName());
+    }
+
+    @Test
+    void findCallsite_skipsIntermediateLibraryFrameAndReturnsClientCode() {
+        // com.google.* is excluded by the SCA trie (value >= 1)
+        StackTraceElement[] stack = {
+            frame(VULNERABLE_CLASS, "load"),
+            frame("com.google.yaml.YamlWrapper", "load"),
+            frame("sca.test.TestController", "yamlHitTransitive"),
+        };
+
+        StackTraceElement result = ScaReachabilitySystem.findCallsite(VULNERABLE_CLASS, stack);
+
+        assertEquals(
+                "sca.test.TestController",
+                result.getClassName(),
+                "Should skip intermediate library frame and return application code");
+        assertEquals("yamlHitTransitive", result.getMethodName());
+    }
+
+    @Test
+    void findCallsite_skipsMultipleIntermediateLibraryFrames() {
+        StackTraceElement[] stack = {
+            frame(VULNERABLE_CLASS, "load"),
+            frame("com.google.yaml.YamlWrapper", "load"),
+            frame("org.springframework.beans.factory.xml.XmlBeanFactory", "init"),
+            frame("sca.test.TestController", "yamlHitDeep"),
+        };
+
+        StackTraceElement result = ScaReachabilitySystem.findCallsite(VULNERABLE_CLASS, stack);
+
+        assertEquals("sca.test.TestController", result.getClassName());
+        assertEquals("yamlHitDeep", result.getMethodName());
+    }
+
+    @Test
+    void findCallsite_returnsNullWhenOnlyLibraryFramesFollowVulnerableClass() {
+        StackTraceElement[] stack = {
+            frame(VULNERABLE_CLASS, "load"),
+            frame("com.google.yaml.YamlWrapper", "load"),
+            frame("org.springframework.beans.factory.BeanFactory", "getBean"),
+        };
+
+        assertNull(
+                ScaReachabilitySystem.findCallsite(VULNERABLE_CLASS, stack),
+                "Should return null and trigger fallback when no application frame is found");
+    }
+
+    private static StackTraceElement frame(String className, String methodName) {
+        return new StackTraceElement(className, methodName, null, -1);
+    }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilitySystemTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilitySystemTest.java
index 82c7f62a9ca..1dbc5fc54de 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilitySystemTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilitySystemTest.java
@@ -18,36 +18,36 @@
 
 class ScaReachabilitySystemTest {
 
-  @AfterEach
-  void tearDown() {
-    ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
-    ScaReachabilityCallback.register(null);
-  }
-
-  @Test
-  void startRegistersTransformerCallbackAndPeriodicWork() {
-    Instrumentation instrumentation = mock(Instrumentation.class);
-    when(instrumentation.getAllLoadedClasses()).thenReturn(new Class<?>[0]);
-
-    ScaReachabilitySystem.start(instrumentation);
-
-    verify(instrumentation).addTransformer(any(ScaReachabilityTransformer.class), eq(true));
-    assertNotNull(ScaReachabilityDependencyRegistry.INSTANCE.getPeriodicWorkCallback());
-
-    ScaReachabilityCallback.onMethodHit(
-        "GHSA-start", "com.example:lib", "1.0.0", "missing.Vulnerable", "danger", 42);
-
-    List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
-        ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
-    assertEquals(1, snapshots.size());
-    assertEquals("com.example:lib", snapshots.get(0).artifact);
-    assertEquals("1.0.0", snapshots.get(0).version);
-    assertEquals(1, snapshots.get(0).cves.size());
-    ScaReachabilityHit hit = snapshots.get(0).cves.get(0).hit;
-    assertNotNull(hit);
-    assertEquals("GHSA-start", hit.vulnId());
-    assertEquals("missing.Vulnerable", hit.className());
-    assertEquals("danger", hit.symbolName());
-    assertEquals(42, hit.line());
-  }
+    @AfterEach
+    void tearDown() {
+        ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
+        ScaReachabilityCallback.register(null);
+    }
+
+    @Test
+    void startRegistersTransformerCallbackAndPeriodicWork() {
+        Instrumentation instrumentation = mock(Instrumentation.class);
+        when(instrumentation.getAllLoadedClasses()).thenReturn(new Class<?>[0]);
+
+        ScaReachabilitySystem.start(instrumentation);
+
+        verify(instrumentation).addTransformer(any(ScaReachabilityTransformer.class), eq(true));
+        assertNotNull(ScaReachabilityDependencyRegistry.INSTANCE.getPeriodicWorkCallback());
+
+        ScaReachabilityCallback.onMethodHit(
+                "GHSA-start", "com.example:lib", "1.0.0", "missing.Vulnerable", "danger", 42);
+
+        List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
+                ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
+        assertEquals(1, snapshots.size());
+        assertEquals("com.example:lib", snapshots.get(0).artifact);
+        assertEquals("1.0.0", snapshots.get(0).version);
+        assertEquals(1, snapshots.get(0).cves.size());
+        ScaReachabilityHit hit = snapshots.get(0).cves.get(0).hit;
+        assertNotNull(hit);
+        assertEquals("GHSA-start", hit.vulnId());
+        assertEquals("missing.Vulnerable", hit.className());
+        assertEquals("danger", hit.symbolName());
+        assertEquals(42, hit.line());
+    }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityTransformerJava9Test.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityTransformerJava9Test.java
index 573424432ad..44707e7c343 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityTransformerJava9Test.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityTransformerJava9Test.java
@@ -52,407 +52,387 @@
  */
 class ScaReachabilityTransformerJava9Test {
 
-  /** Second dummy vulnerable class, distinct from {@code TargetClass}, used to test batching. */
-  public static class SecondTargetClass {
-    public void method() {}
-  }
-
-  private static final String JACKSON_JSON =
-      "{\"version\":1,\"entries\":[{"
-          + "\"vuln_id\":\"GHSA-test-jackson\","
-          + "\"artifact\":\"com.fasterxml.jackson.core:jackson-databind\","
-          + "\"version_ranges\":[\"< 999.0.0\"],"
-          + "\"symbols\":[{\"class\":\"com/fasterxml/jackson/databind/ObjectMapper\",\"method\":\"readValue\"}]"
-          + "}]}";
-
-  @AfterEach
-  void resetRegistry() {
-    ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_9)
-  void systemClassLoaderIsNotUrlClassLoaderOnJava9Plus() {
-    // This is the root cause of the bug: the URLClassLoader chain walk misses the system
-    // classloader on Java 9+. Verify our assumption so the test has a clear failure message
-    // if the JDK ever reverts this (extremely unlikely).
-    assertFalse(
-        ClassLoader.getSystemClassLoader() instanceof URLClassLoader,
-        "On Java 9+, the system classloader must not be a URLClassLoader — "
-            + "this is the invariant that makes the java.class.path fallback necessary");
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_9)
-  void findArtifactVersionInClasspath_findsArtifactViaJavaClassPathOnJava9Plus() throws Exception {
-    // jackson-databind is on the test classpath (testImplementation dependency).
-    // On Java 9+, it would NOT be found by the URLClassLoader chain because the system
-    // classloader is not a URLClassLoader. The java.class.path fallback must find it.
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(JACKSON_JSON));
-    ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, null);
-
-    String version =
-        transformer.findArtifactVersionInClasspath("com.fasterxml.jackson.core:jackson-databind");
-
-    assertNotNull(
-        version,
-        "jackson-databind must be found via java.class.path fallback on Java 9+. "
-            + "java.class.path="
-            + System.getProperty("java.class.path", ""));
-  }
-
-  @Test
-  @EnabledForJreRange(min = JRE.JAVA_9)
-  void findArtifactVersionInClasspath_returnsNullForUnknownArtifact() throws Exception {
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(JACKSON_JSON));
-    ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, null);
-
-    String version = transformer.findArtifactVersionInClasspath("com.example:nonexistent-artifact");
-
-    assertNull(version, "Unknown artifacts must return null");
-  }
-
-  // ---------------------------------------------------------------------------
-  // matchVersion: artifact-ID-only fallback for JARs without pom.properties
-  // ---------------------------------------------------------------------------
-
-  @Test
-  void matchVersion_exactMatchReturnsVersion() {
-    Dependency dep = new Dependency("com.github.junrar:junrar", "7.5.5", "junrar-7.5.5.jar", null);
-    assertEquals(
-        "7.5.5",
-        ScaReachabilityTransformer.matchVersion("com.github.junrar:junrar", singletonList(dep)));
-  }
-
-  @Test
-  void matchVersion_artifactIdOnlyFallbackForNoPomJar() {
-    // Models guessFallbackNoPom result: no pom.properties in junrar-7.5.5.jar,
-    // so DependencyResolver extracts only the artifact ID from the filename.
-    Dependency dep = new Dependency("junrar", "7.5.5", "junrar-7.5.5.jar", null);
-    assertEquals(
-        "7.5.5",
-        ScaReachabilityTransformer.matchVersion("com.github.junrar:junrar", singletonList(dep)),
-        "artifact-ID fallback must match 'junrar' against 'com.github.junrar:junrar'");
-  }
-
-  @Test
-  void matchVersion_artifactIdFallbackDoesNotMatchWhenGroupIdPresent() {
-    // If dep.name already contains ':' (from pom.properties), artifact-ID fallback must not fire:
-    // "org.other:junrar" should NOT match "com.github.junrar:junrar".
-    Dependency dep = new Dependency("org.other:junrar", "1.0.0", "junrar-1.0.0.jar", null);
-    assertNull(
-        ScaReachabilityTransformer.matchVersion("com.github.junrar:junrar", singletonList(dep)),
-        "artifact-ID fallback must not fire when dep.name already has a group ID");
-  }
-
-  @Test
-  void matchVersion_emptyListReturnsNull() {
-    assertNull(ScaReachabilityTransformer.matchVersion("com.github.junrar:junrar", emptyList()));
-  }
-
-  @Test
-  void matchVersion_exactMatchTakesPrecedenceOverFallback() {
-    // Exact match must win even when an artifact-ID-only dep is also present.
-    Dependency exact = new Dependency("com.github.junrar:junrar", "7.5.5", "a.jar", null);
-    Dependency fallback = new Dependency("junrar", "1.0.0", "b.jar", null);
-    assertEquals(
-        "7.5.5",
-        ScaReachabilityTransformer.matchVersion(
-            "com.github.junrar:junrar", Arrays.asList(fallback, exact)));
-  }
-
-  /**
-   * Regression test for the snakeyaml deadlock (APPSEC-62260 follow-up):
-   *
-   * <p>JAR resolution (I/O via {@code resolveDependencies}) must happen on the telemetry thread
-   * BEFORE {@code retransformClasses()} acquires JVM locks. If I/O runs inside the retransform
-   * callback, libraries that trigger class loading during JAR resolution (e.g. snakeyaml) can
-   * deadlock because the JVM class-loading lock and the retransform lock are both held.
-   *
-   * <p>With a mock {@code Instrumentation}, the retransform callback never fires, so {@code
-   * resolveDependencies} (and therefore {@code jarCache}) can only be populated by the pre-warming
-   * step that runs before {@code retransformClasses()}. The test asserts that {@code jarCache} is
-   * non-empty after the call, which is only possible if the pre-warm loop ran.
-   */
-  @Test
-  void performPendingRetransforms_prewarms_jarCache_before_retransformClasses() throws Exception {
-    Instrumentation mockInstr = mock(Instrumentation.class);
-    when(mockInstr.isModifiableClass(any())).thenReturn(true);
-    when(mockInstr.getAllLoadedClasses()).thenReturn(new Class<?>[0]);
-
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(JACKSON_JSON));
-    ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, mockInstr);
-
-    transformer.pendingRetransform.add(
-        new ArrayList<>(singletonList(com.fasterxml.jackson.databind.ObjectMapper.class)));
-    transformer.performPendingRetransforms();
-
-    assertFalse(
-        transformer.jarCache.isEmpty(),
-        "jarCache must be populated by the pre-warming step that runs before retransformClasses();"
-            + " with a mock Instrumentation the transform callback never fires, so an empty jarCache"
-            + " means the pre-warm loop was not executed");
-  }
-
-  /**
-   * Regression test for the aggregator-artifact deadlock gap (Codex P1 on PR #11614):
-   *
-   * <p>When the entry's artifact is not in the class's own JAR (aggregator/starter case, e.g.,
-   * {@code spring-boot-starter-web} whose watched classes live in {@code spring-context.jar}),
-   * {@code resolveVersionForArtifact()} falls through to {@code findArtifactVersionInClasspath()},
-   * which calls {@code resolveDependencies()} for every {@code java.class.path} entry — fresh JAR
-   * I/O that would deadlock if it ran inside the retransform callback.
-   *
-   * <p>The pre-warm step must also populate {@code classpathArtifactCache} before {@code
-   * retransformClasses()} acquires JVM locks. With a mock {@code Instrumentation} the callback
-   * never fires, so the only way {@code classpathArtifactCache} can be populated is via the
-   * pre-warm loop. {@code ObjectMapper} lives in {@code jackson-databind.jar}; the entry's artifact
-   * is {@code jackson-core} (a different JAR that is a transitive test dependency), so {@code
-   * matchVersion} fails on the class JAR and the classpath fallback must run during pre-warm.
-   */
-  @Test
-  void performPendingRetransforms_prewarms_classpathArtifactCache_for_aggregator_artifacts()
-      throws Exception {
-    // Entry artifact is jackson-core, but ObjectMapper is in jackson-databind.jar.
-    // matchVersion() returns null on classJarDeps → triggers findArtifactVersionInClasspath().
-    String crossJarJson =
-        "{\"version\":1,\"entries\":[{"
-            + "\"vuln_id\":\"GHSA-test-cross-jar\","
-            + "\"artifact\":\"com.fasterxml.jackson.core:jackson-core\","
-            + "\"version_ranges\":[\"< 999.0.0\"],"
-            + "\"symbols\":[{\"class\":\"com/fasterxml/jackson/databind/ObjectMapper\","
-            + "\"method\":\"readValue\"}]}]}";
-
-    Instrumentation mockInstr = mock(Instrumentation.class);
-    when(mockInstr.isModifiableClass(any())).thenReturn(true);
-    when(mockInstr.getAllLoadedClasses()).thenReturn(new Class<?>[0]);
-
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(crossJarJson));
-    ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, mockInstr);
-
-    transformer.pendingRetransform.add(
-        new ArrayList<>(singletonList(com.fasterxml.jackson.databind.ObjectMapper.class)));
-    transformer.performPendingRetransforms();
-
-    // jackson-core is on the test classpath (transitive dependency of jackson-databind).
-    // classpathArtifactCache must be populated during pre-warm — not by the callback (which never
-    // fires with a mock Instrumentation). An empty cache means findArtifactVersionInClasspath()
-    // would run under JVM retransform locks and risk the snakeyaml-style deadlock.
-    assertNotNull(
-        transformer.classpathArtifactCache.get("com.fasterxml.jackson.core:jackson-core"),
-        "classpathArtifactCache must be populated during pre-warm for aggregator artifacts; "
-            + "if empty, findArtifactVersionInClasspath() would run under JVM retransform locks");
-  }
-
-  @Test
-  void transform_retransform_injectsCallbacksWhenVersionResolvedFromCache() throws Exception {
-    String internalName =
-        ScaReachabilityMethodLevelTest.TargetClass.class.getName().replace('.', '/');
-    String json =
-        "{\"version\":1,\"entries\":[{"
-            + "\"vuln_id\":\"GHSA-transform\","
-            + "\"artifact\":\"com.example:lib\","
+    /** Second dummy vulnerable class, distinct from {@code TargetClass}, used to test batching. */
+    public static class SecondTargetClass {
+        public void method() {}
+    }
+
+    private static final String JACKSON_JSON = "{\"version\":1,\"entries\":[{"
+            + "\"vuln_id\":\"GHSA-test-jackson\","
+            + "\"artifact\":\"com.fasterxml.jackson.core:jackson-databind\","
             + "\"version_ranges\":[\"< 999.0.0\"],"
-            + "\"symbols\":[{\"class\":\""
-            + internalName
-            + "\",\"method\":\"vulnerableMethod\"}]"
+            + "\"symbols\":[{\"class\":\"com/fasterxml/jackson/databind/ObjectMapper\",\"method\":\"readValue\"}]"
             + "}]}";
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json));
-    ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, null);
-    transformer.jarCache.put(
-        ScaReachabilityMethodLevelTest.TargetClass.class
-            .getProtectionDomain()
-            .getCodeSource()
-            .getLocation()
-            .toURI(),
-        singletonList(new Dependency("com.example:lib", "1.2.3", "test.jar", null)));
-
-    byte[] transformed =
-        transformer.transform(
-            null,
-            internalName,
-            ScaReachabilityMethodLevelTest.TargetClass.class,
-            ScaReachabilityMethodLevelTest.TargetClass.class.getProtectionDomain(),
-            bytecodeOf(ScaReachabilityMethodLevelTest.TargetClass.class));
-
-    assertNotNull(transformed);
-    assertTrue(transformer.pendingRetransformNames.isEmpty());
-    List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
-        ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
-    assertEquals(1, snapshots.size());
-    assertEquals("com.example:lib", snapshots.get(0).artifact);
-    assertEquals("1.2.3", snapshots.get(0).version);
-    assertEquals("GHSA-transform", snapshots.get(0).cves.get(0).vulnId);
-    assertNull(snapshots.get(0).cves.get(0).hit);
-  }
-
-  @Test
-  void checkAlreadyLoadedClassesSchedulesOnlyMatchingNonBootstrapClasses() throws Exception {
-    String internalName =
-        ScaReachabilityMethodLevelTest.TargetClass.class.getName().replace('.', '/');
-    String json =
-        "{\"version\":1,\"entries\":["
-            + "{\"vuln_id\":\"GHSA-target\",\"artifact\":\"com.example:lib\","
-            + "\"version_ranges\":[\"< 999.0.0\"],"
-            + "\"symbols\":[{\"class\":\""
-            + internalName
-            + "\",\"method\":\"vulnerableMethod\"}]},"
-            + "{\"vuln_id\":\"GHSA-jdk\",\"artifact\":\"com.example:jdk\","
-            + "\"version_ranges\":[\"< 999.0.0\"],"
-            + "\"symbols\":[{\"class\":\"java/lang/String\",\"method\":\"substring\"}]}"
-            + "]}";
-
-    Instrumentation mockInstr = mock(Instrumentation.class);
-    when(mockInstr.getAllLoadedClasses())
-        .thenReturn(
-            new Class<?>[] {
-              null, String[].class, String.class, ScaReachabilityMethodLevelTest.TargetClass.class,
-            });
-    ScaReachabilityTransformer transformer =
-        new ScaReachabilityTransformer(ScaCveDatabase.parse(new StringReader(json)), mockInstr);
-
-    transformer.checkAlreadyLoadedClasses();
-
-    assertEquals(1, transformer.pendingRetransform.size());
-    assertSame(
-        ScaReachabilityMethodLevelTest.TargetClass.class,
-        transformer.pendingRetransform.peek().get(0));
-  }
-
-  @Test
-  void checkAlreadyLoadedClasses_queuesAllMatchingClassesAsOneSharedBatch() throws Exception {
-    // Startup can find many already-loaded vulnerable classes at once. Queuing each as its own
-    // singleton batch would turn the common (all-succeed) case into one retransformClasses() call
-    // per class instead of one call for all of them; bisection only needs to kick in if this shared
-    // batch actually fails on a later heartbeat.
-    String targetName =
-        ScaReachabilityMethodLevelTest.TargetClass.class.getName().replace('.', '/');
-    String secondName = SecondTargetClass.class.getName().replace('.', '/');
-    String json =
-        "{\"version\":1,\"entries\":["
-            + "{\"vuln_id\":\"GHSA-target\",\"artifact\":\"com.example:lib\","
-            + "\"version_ranges\":[\"< 999.0.0\"],"
-            + "\"symbols\":[{\"class\":\""
-            + targetName
-            + "\",\"method\":\"vulnerableMethod\"}]},"
-            + "{\"vuln_id\":\"GHSA-second\",\"artifact\":\"com.example:lib2\","
-            + "\"version_ranges\":[\"< 999.0.0\"],"
-            + "\"symbols\":[{\"class\":\""
-            + secondName
-            + "\",\"method\":\"method\"}]}"
-            + "]}";
-
-    Instrumentation mockInstr = mock(Instrumentation.class);
-    when(mockInstr.getAllLoadedClasses())
-        .thenReturn(
-            new Class<?>[] {
-              ScaReachabilityMethodLevelTest.TargetClass.class, SecondTargetClass.class,
-            });
-    ScaReachabilityTransformer transformer =
-        new ScaReachabilityTransformer(ScaCveDatabase.parse(new StringReader(json)), mockInstr);
-
-    transformer.checkAlreadyLoadedClasses();
-
-    assertEquals(1, transformer.pendingRetransform.size(), "both classes must share one batch");
-    assertEquals(
-        Arrays.asList(ScaReachabilityMethodLevelTest.TargetClass.class, SecondTargetClass.class),
-        transformer.pendingRetransform.peek());
-  }
-
-  @Test
-  void performPendingRetransforms_noopsWithoutInstrumentation() throws Exception {
-    ScaReachabilityTransformer transformer =
-        new ScaReachabilityTransformer(
-            ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}")), null);
-    transformer.pendingRetransform.add(
-        singletonList(ScaReachabilityMethodLevelTest.TargetClass.class));
-
-    transformer.performPendingRetransforms();
-
-    assertSame(
-        ScaReachabilityMethodLevelTest.TargetClass.class,
-        transformer.pendingRetransform.peek().get(0));
-  }
-
-  @Test
-  void resolveArtifactDep_returnsCachedClasspathArtifact() throws Exception {
-    ScaReachabilityTransformer transformer =
-        new ScaReachabilityTransformer(ScaCveDatabase.parse(new StringReader(JACKSON_JSON)), null);
-    Dependency cached = new Dependency("com.example:lib", "1.0.0", "lib.jar", null);
-    transformer.classpathArtifactCache.put("com.example:lib", cached);
-
-    assertSame(cached, transformer.resolveArtifactDep("com.example:lib", emptyList()));
-  }
-
-  @Test
-  void matchVersion_nullDepNameDoesNotThrow() {
-    // guessFallbackNoPom can produce Dependency(name=null, ...) for JARs with unrecognizable names.
-    Dependency nullName = new Dependency(null, "1.0", "foo.jar", null);
-    assertNull(ScaReachabilityTransformer.matchVersion("com.example:foo", singletonList(nullName)));
-  }
-
-  /**
-   * Regression test for the registry key mismatch bug (PR #11614).
-   *
-   * <p>For JARs without {@code pom.properties}, {@code DependencyResolver.guessFallbackNoPom}
-   * produces a dep with {@code name = "junrar"} (artifactId only, no groupId). {@code
-   * resolveArtifactDep} must return that dep object so that callers ({@code processClass}) can use
-   * {@code dep.name} — not {@code entry.artifact()} — when calling {@code registerCve} and building
-   * {@code MethodCallbackSpec}. Using {@code entry.artifact()} would create a registry key ({@code
-   * "com.github.junrar:junrar@7.5.5"}) that mismatches the key {@code DependencyService} will use
-   * ({@code "junrar@7.5.5"}), causing the CVE telemetry to lose source/hash or appear under the
-   * wrong name.
-   */
-  @Test
-  void resolveArtifactDep_noPomJar_returnsArtifactIdOnlyName() throws Exception {
-    ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(JACKSON_JSON));
-    ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, null);
-
-    // Simulate guessFallbackNoPom: dep.name is artifactId only (no groupId).
-    Dependency noPomDep =
-        new Dependency("jackson-databind", "2.9.0", "jackson-databind-2.9.0.jar", null);
-
-    Dependency resolved =
-        transformer.resolveArtifactDep(
-            "com.fasterxml.jackson.core:jackson-databind", singletonList(noPomDep));
-
-    assertNotNull(resolved, "should resolve via artifactId-only fallback");
-    assertEquals(
-        "jackson-databind",
-        resolved.name,
-        "resolved dep.name must be the artifactId-only name from the jar, "
-            + "not entry.artifact() — so registerCve uses the same key as DependencyService");
-    assertEquals("2.9.0", resolved.version);
-  }
-
-  /**
-   * Validates that {@code findArtifactVersionInClasspath} works correctly when the context
-   * classloader is {@code null} — which is the actual runtime condition on agent threads, because
-   * {@code AgentThreadFactory} calls {@code thread.setContextClassLoader(null)} unconditionally.
-   *
-   * <p>If the implementation relied on a URLClassLoader chain walk starting from the context
-   * classloader, it would silently return {@code null} here. The test asserts that {@code
-   * java.class.path} scanning is the only mechanism in use and is sufficient.
-   */
-  @Test
-  void findArtifactVersionInClasspath_worksWithNullContextClassLoader() throws Exception {
-    ClassLoader original = Thread.currentThread().getContextClassLoader();
-    try {
-      Thread.currentThread().setContextClassLoader(null);
-
-      ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(JACKSON_JSON));
-      ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, null);
-
-      String version =
-          transformer.findArtifactVersionInClasspath("com.fasterxml.jackson.core:jackson-databind");
-
-      assertNotNull(
-          version,
-          "jackson-databind must be found via java.class.path even with null context classloader. "
-              + "java.class.path="
-              + System.getProperty("java.class.path", ""));
-    } finally {
-      Thread.currentThread().setContextClassLoader(original);
+
+    @AfterEach
+    void resetRegistry() {
+        ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_9)
+    void systemClassLoaderIsNotUrlClassLoaderOnJava9Plus() {
+        // This is the root cause of the bug: the URLClassLoader chain walk misses the system
+        // classloader on Java 9+. Verify our assumption so the test has a clear failure message
+        // if the JDK ever reverts this (extremely unlikely).
+        assertFalse(
+                ClassLoader.getSystemClassLoader() instanceof URLClassLoader,
+                "On Java 9+, the system classloader must not be a URLClassLoader — "
+                        + "this is the invariant that makes the java.class.path fallback necessary");
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_9)
+    void findArtifactVersionInClasspath_findsArtifactViaJavaClassPathOnJava9Plus() throws Exception {
+        // jackson-databind is on the test classpath (testImplementation dependency).
+        // On Java 9+, it would NOT be found by the URLClassLoader chain because the system
+        // classloader is not a URLClassLoader. The java.class.path fallback must find it.
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(JACKSON_JSON));
+        ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, null);
+
+        String version = transformer.findArtifactVersionInClasspath("com.fasterxml.jackson.core:jackson-databind");
+
+        assertNotNull(
+                version,
+                "jackson-databind must be found via java.class.path fallback on Java 9+. "
+                        + "java.class.path="
+                        + System.getProperty("java.class.path", ""));
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_9)
+    void findArtifactVersionInClasspath_returnsNullForUnknownArtifact() throws Exception {
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(JACKSON_JSON));
+        ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, null);
+
+        String version = transformer.findArtifactVersionInClasspath("com.example:nonexistent-artifact");
+
+        assertNull(version, "Unknown artifacts must return null");
+    }
+
+    // ---------------------------------------------------------------------------
+    // matchVersion: artifact-ID-only fallback for JARs without pom.properties
+    // ---------------------------------------------------------------------------
+
+    @Test
+    void matchVersion_exactMatchReturnsVersion() {
+        Dependency dep = new Dependency("com.github.junrar:junrar", "7.5.5", "junrar-7.5.5.jar", null);
+        assertEquals("7.5.5", ScaReachabilityTransformer.matchVersion("com.github.junrar:junrar", singletonList(dep)));
+    }
+
+    @Test
+    void matchVersion_artifactIdOnlyFallbackForNoPomJar() {
+        // Models guessFallbackNoPom result: no pom.properties in junrar-7.5.5.jar,
+        // so DependencyResolver extracts only the artifact ID from the filename.
+        Dependency dep = new Dependency("junrar", "7.5.5", "junrar-7.5.5.jar", null);
+        assertEquals(
+                "7.5.5",
+                ScaReachabilityTransformer.matchVersion("com.github.junrar:junrar", singletonList(dep)),
+                "artifact-ID fallback must match 'junrar' against 'com.github.junrar:junrar'");
+    }
+
+    @Test
+    void matchVersion_artifactIdFallbackDoesNotMatchWhenGroupIdPresent() {
+        // If dep.name already contains ':' (from pom.properties), artifact-ID fallback must not fire:
+        // "org.other:junrar" should NOT match "com.github.junrar:junrar".
+        Dependency dep = new Dependency("org.other:junrar", "1.0.0", "junrar-1.0.0.jar", null);
+        assertNull(
+                ScaReachabilityTransformer.matchVersion("com.github.junrar:junrar", singletonList(dep)),
+                "artifact-ID fallback must not fire when dep.name already has a group ID");
+    }
+
+    @Test
+    void matchVersion_emptyListReturnsNull() {
+        assertNull(ScaReachabilityTransformer.matchVersion("com.github.junrar:junrar", emptyList()));
+    }
+
+    @Test
+    void matchVersion_exactMatchTakesPrecedenceOverFallback() {
+        // Exact match must win even when an artifact-ID-only dep is also present.
+        Dependency exact = new Dependency("com.github.junrar:junrar", "7.5.5", "a.jar", null);
+        Dependency fallback = new Dependency("junrar", "1.0.0", "b.jar", null);
+        assertEquals(
+                "7.5.5",
+                ScaReachabilityTransformer.matchVersion("com.github.junrar:junrar", Arrays.asList(fallback, exact)));
+    }
+
+    /**
+     * Regression test for the snakeyaml deadlock (APPSEC-62260 follow-up):
+     *
+     * <p>JAR resolution (I/O via {@code resolveDependencies}) must happen on the telemetry thread
+     * BEFORE {@code retransformClasses()} acquires JVM locks. If I/O runs inside the retransform
+     * callback, libraries that trigger class loading during JAR resolution (e.g. snakeyaml) can
+     * deadlock because the JVM class-loading lock and the retransform lock are both held.
+     *
+     * <p>With a mock {@code Instrumentation}, the retransform callback never fires, so {@code
+     * resolveDependencies} (and therefore {@code jarCache}) can only be populated by the pre-warming
+     * step that runs before {@code retransformClasses()}. The test asserts that {@code jarCache} is
+     * non-empty after the call, which is only possible if the pre-warm loop ran.
+     */
+    @Test
+    void performPendingRetransforms_prewarms_jarCache_before_retransformClasses() throws Exception {
+        Instrumentation mockInstr = mock(Instrumentation.class);
+        when(mockInstr.isModifiableClass(any())).thenReturn(true);
+        when(mockInstr.getAllLoadedClasses()).thenReturn(new Class<?>[0]);
+
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(JACKSON_JSON));
+        ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, mockInstr);
+
+        transformer.pendingRetransform.add(
+                new ArrayList<>(singletonList(com.fasterxml.jackson.databind.ObjectMapper.class)));
+        transformer.performPendingRetransforms();
+
+        assertFalse(
+                transformer.jarCache.isEmpty(),
+                "jarCache must be populated by the pre-warming step that runs before retransformClasses();"
+                        + " with a mock Instrumentation the transform callback never fires, so an empty jarCache"
+                        + " means the pre-warm loop was not executed");
+    }
+
+    /**
+     * Regression test for the aggregator-artifact deadlock gap (Codex P1 on PR #11614):
+     *
+     * <p>When the entry's artifact is not in the class's own JAR (aggregator/starter case, e.g.,
+     * {@code spring-boot-starter-web} whose watched classes live in {@code spring-context.jar}),
+     * {@code resolveVersionForArtifact()} falls through to {@code findArtifactVersionInClasspath()},
+     * which calls {@code resolveDependencies()} for every {@code java.class.path} entry — fresh JAR
+     * I/O that would deadlock if it ran inside the retransform callback.
+     *
+     * <p>The pre-warm step must also populate {@code classpathArtifactCache} before {@code
+     * retransformClasses()} acquires JVM locks. With a mock {@code Instrumentation} the callback
+     * never fires, so the only way {@code classpathArtifactCache} can be populated is via the
+     * pre-warm loop. {@code ObjectMapper} lives in {@code jackson-databind.jar}; the entry's artifact
+     * is {@code jackson-core} (a different JAR that is a transitive test dependency), so {@code
+     * matchVersion} fails on the class JAR and the classpath fallback must run during pre-warm.
+     */
+    @Test
+    void performPendingRetransforms_prewarms_classpathArtifactCache_for_aggregator_artifacts() throws Exception {
+        // Entry artifact is jackson-core, but ObjectMapper is in jackson-databind.jar.
+        // matchVersion() returns null on classJarDeps → triggers findArtifactVersionInClasspath().
+        String crossJarJson = "{\"version\":1,\"entries\":[{"
+                + "\"vuln_id\":\"GHSA-test-cross-jar\","
+                + "\"artifact\":\"com.fasterxml.jackson.core:jackson-core\","
+                + "\"version_ranges\":[\"< 999.0.0\"],"
+                + "\"symbols\":[{\"class\":\"com/fasterxml/jackson/databind/ObjectMapper\","
+                + "\"method\":\"readValue\"}]}]}";
+
+        Instrumentation mockInstr = mock(Instrumentation.class);
+        when(mockInstr.isModifiableClass(any())).thenReturn(true);
+        when(mockInstr.getAllLoadedClasses()).thenReturn(new Class<?>[0]);
+
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(crossJarJson));
+        ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, mockInstr);
+
+        transformer.pendingRetransform.add(
+                new ArrayList<>(singletonList(com.fasterxml.jackson.databind.ObjectMapper.class)));
+        transformer.performPendingRetransforms();
+
+        // jackson-core is on the test classpath (transitive dependency of jackson-databind).
+        // classpathArtifactCache must be populated during pre-warm — not by the callback (which never
+        // fires with a mock Instrumentation). An empty cache means findArtifactVersionInClasspath()
+        // would run under JVM retransform locks and risk the snakeyaml-style deadlock.
+        assertNotNull(
+                transformer.classpathArtifactCache.get("com.fasterxml.jackson.core:jackson-core"),
+                "classpathArtifactCache must be populated during pre-warm for aggregator artifacts; "
+                        + "if empty, findArtifactVersionInClasspath() would run under JVM retransform locks");
+    }
+
+    @Test
+    void transform_retransform_injectsCallbacksWhenVersionResolvedFromCache() throws Exception {
+        String internalName =
+                ScaReachabilityMethodLevelTest.TargetClass.class.getName().replace('.', '/');
+        String json = "{\"version\":1,\"entries\":[{"
+                + "\"vuln_id\":\"GHSA-transform\","
+                + "\"artifact\":\"com.example:lib\","
+                + "\"version_ranges\":[\"< 999.0.0\"],"
+                + "\"symbols\":[{\"class\":\""
+                + internalName
+                + "\",\"method\":\"vulnerableMethod\"}]"
+                + "}]}";
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json));
+        ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, null);
+        transformer.jarCache.put(
+                ScaReachabilityMethodLevelTest.TargetClass.class
+                        .getProtectionDomain()
+                        .getCodeSource()
+                        .getLocation()
+                        .toURI(),
+                singletonList(new Dependency("com.example:lib", "1.2.3", "test.jar", null)));
+
+        byte[] transformed = transformer.transform(
+                null,
+                internalName,
+                ScaReachabilityMethodLevelTest.TargetClass.class,
+                ScaReachabilityMethodLevelTest.TargetClass.class.getProtectionDomain(),
+                bytecodeOf(ScaReachabilityMethodLevelTest.TargetClass.class));
+
+        assertNotNull(transformed);
+        assertTrue(transformer.pendingRetransformNames.isEmpty());
+        List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
+                ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
+        assertEquals(1, snapshots.size());
+        assertEquals("com.example:lib", snapshots.get(0).artifact);
+        assertEquals("1.2.3", snapshots.get(0).version);
+        assertEquals("GHSA-transform", snapshots.get(0).cves.get(0).vulnId);
+        assertNull(snapshots.get(0).cves.get(0).hit);
+    }
+
+    @Test
+    void checkAlreadyLoadedClassesSchedulesOnlyMatchingNonBootstrapClasses() throws Exception {
+        String internalName =
+                ScaReachabilityMethodLevelTest.TargetClass.class.getName().replace('.', '/');
+        String json = "{\"version\":1,\"entries\":["
+                + "{\"vuln_id\":\"GHSA-target\",\"artifact\":\"com.example:lib\","
+                + "\"version_ranges\":[\"< 999.0.0\"],"
+                + "\"symbols\":[{\"class\":\""
+                + internalName
+                + "\",\"method\":\"vulnerableMethod\"}]},"
+                + "{\"vuln_id\":\"GHSA-jdk\",\"artifact\":\"com.example:jdk\","
+                + "\"version_ranges\":[\"< 999.0.0\"],"
+                + "\"symbols\":[{\"class\":\"java/lang/String\",\"method\":\"substring\"}]}"
+                + "]}";
+
+        Instrumentation mockInstr = mock(Instrumentation.class);
+        when(mockInstr.getAllLoadedClasses()).thenReturn(new Class<?>[] {
+            null, String[].class, String.class, ScaReachabilityMethodLevelTest.TargetClass.class,
+        });
+        ScaReachabilityTransformer transformer =
+                new ScaReachabilityTransformer(ScaCveDatabase.parse(new StringReader(json)), mockInstr);
+
+        transformer.checkAlreadyLoadedClasses();
+
+        assertEquals(1, transformer.pendingRetransform.size());
+        assertSame(
+                ScaReachabilityMethodLevelTest.TargetClass.class,
+                transformer.pendingRetransform.peek().get(0));
+    }
+
+    @Test
+    void checkAlreadyLoadedClasses_queuesAllMatchingClassesAsOneSharedBatch() throws Exception {
+        // Startup can find many already-loaded vulnerable classes at once. Queuing each as its own
+        // singleton batch would turn the common (all-succeed) case into one retransformClasses() call
+        // per class instead of one call for all of them; bisection only needs to kick in if this shared
+        // batch actually fails on a later heartbeat.
+        String targetName =
+                ScaReachabilityMethodLevelTest.TargetClass.class.getName().replace('.', '/');
+        String secondName = SecondTargetClass.class.getName().replace('.', '/');
+        String json = "{\"version\":1,\"entries\":["
+                + "{\"vuln_id\":\"GHSA-target\",\"artifact\":\"com.example:lib\","
+                + "\"version_ranges\":[\"< 999.0.0\"],"
+                + "\"symbols\":[{\"class\":\""
+                + targetName
+                + "\",\"method\":\"vulnerableMethod\"}]},"
+                + "{\"vuln_id\":\"GHSA-second\",\"artifact\":\"com.example:lib2\","
+                + "\"version_ranges\":[\"< 999.0.0\"],"
+                + "\"symbols\":[{\"class\":\""
+                + secondName
+                + "\",\"method\":\"method\"}]}"
+                + "]}";
+
+        Instrumentation mockInstr = mock(Instrumentation.class);
+        when(mockInstr.getAllLoadedClasses()).thenReturn(new Class<?>[] {
+            ScaReachabilityMethodLevelTest.TargetClass.class, SecondTargetClass.class,
+        });
+        ScaReachabilityTransformer transformer =
+                new ScaReachabilityTransformer(ScaCveDatabase.parse(new StringReader(json)), mockInstr);
+
+        transformer.checkAlreadyLoadedClasses();
+
+        assertEquals(1, transformer.pendingRetransform.size(), "both classes must share one batch");
+        assertEquals(
+                Arrays.asList(ScaReachabilityMethodLevelTest.TargetClass.class, SecondTargetClass.class),
+                transformer.pendingRetransform.peek());
+    }
+
+    @Test
+    void performPendingRetransforms_noopsWithoutInstrumentation() throws Exception {
+        ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(
+                ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}")), null);
+        transformer.pendingRetransform.add(singletonList(ScaReachabilityMethodLevelTest.TargetClass.class));
+
+        transformer.performPendingRetransforms();
+
+        assertSame(
+                ScaReachabilityMethodLevelTest.TargetClass.class,
+                transformer.pendingRetransform.peek().get(0));
+    }
+
+    @Test
+    void resolveArtifactDep_returnsCachedClasspathArtifact() throws Exception {
+        ScaReachabilityTransformer transformer =
+                new ScaReachabilityTransformer(ScaCveDatabase.parse(new StringReader(JACKSON_JSON)), null);
+        Dependency cached = new Dependency("com.example:lib", "1.0.0", "lib.jar", null);
+        transformer.classpathArtifactCache.put("com.example:lib", cached);
+
+        assertSame(cached, transformer.resolveArtifactDep("com.example:lib", emptyList()));
+    }
+
+    @Test
+    void matchVersion_nullDepNameDoesNotThrow() {
+        // guessFallbackNoPom can produce Dependency(name=null, ...) for JARs with unrecognizable names.
+        Dependency nullName = new Dependency(null, "1.0", "foo.jar", null);
+        assertNull(ScaReachabilityTransformer.matchVersion("com.example:foo", singletonList(nullName)));
+    }
+
+    /**
+     * Regression test for the registry key mismatch bug (PR #11614).
+     *
+     * <p>For JARs without {@code pom.properties}, {@code DependencyResolver.guessFallbackNoPom}
+     * produces a dep with {@code name = "junrar"} (artifactId only, no groupId). {@code
+     * resolveArtifactDep} must return that dep object so that callers ({@code processClass}) can use
+     * {@code dep.name} — not {@code entry.artifact()} — when calling {@code registerCve} and building
+     * {@code MethodCallbackSpec}. Using {@code entry.artifact()} would create a registry key ({@code
+     * "com.github.junrar:junrar@7.5.5"}) that mismatches the key {@code DependencyService} will use
+     * ({@code "junrar@7.5.5"}), causing the CVE telemetry to lose source/hash or appear under the
+     * wrong name.
+     */
+    @Test
+    void resolveArtifactDep_noPomJar_returnsArtifactIdOnlyName() throws Exception {
+        ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(JACKSON_JSON));
+        ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, null);
+
+        // Simulate guessFallbackNoPom: dep.name is artifactId only (no groupId).
+        Dependency noPomDep = new Dependency("jackson-databind", "2.9.0", "jackson-databind-2.9.0.jar", null);
+
+        Dependency resolved =
+                transformer.resolveArtifactDep("com.fasterxml.jackson.core:jackson-databind", singletonList(noPomDep));
+
+        assertNotNull(resolved, "should resolve via artifactId-only fallback");
+        assertEquals(
+                "jackson-databind",
+                resolved.name,
+                "resolved dep.name must be the artifactId-only name from the jar, "
+                        + "not entry.artifact() — so registerCve uses the same key as DependencyService");
+        assertEquals("2.9.0", resolved.version);
+    }
+
+    /**
+     * Validates that {@code findArtifactVersionInClasspath} works correctly when the context
+     * classloader is {@code null} — which is the actual runtime condition on agent threads, because
+     * {@code AgentThreadFactory} calls {@code thread.setContextClassLoader(null)} unconditionally.
+     *
+     * <p>If the implementation relied on a URLClassLoader chain walk starting from the context
+     * classloader, it would silently return {@code null} here. The test asserts that {@code
+     * java.class.path} scanning is the only mechanism in use and is sufficient.
+     */
+    @Test
+    void findArtifactVersionInClasspath_worksWithNullContextClassLoader() throws Exception {
+        ClassLoader original = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(null);
+
+            ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(JACKSON_JSON));
+            ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, null);
+
+            String version = transformer.findArtifactVersionInClasspath("com.fasterxml.jackson.core:jackson-databind");
+
+            assertNotNull(
+                    version,
+                    "jackson-databind must be found via java.class.path even with null context classloader. "
+                            + "java.class.path="
+                            + System.getProperty("java.class.path", ""));
+        } finally {
+            Thread.currentThread().setContextClassLoader(original);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealDatabaseTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealDatabaseTest.java
index 68550972572..c336e96081d 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealDatabaseTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealDatabaseTest.java
@@ -19,77 +19,70 @@
  */
 class ScaRealDatabaseTest {
 
-  @Test
-  void junrarLocalFolderExtractorMethodsAreIndexed() {
-    ScaCveDatabase db = ScaCveDatabase.load();
+    @Test
+    void junrarLocalFolderExtractorMethodsAreIndexed() {
+        ScaCveDatabase db = ScaCveDatabase.load();
 
-    List<ScaEntry> entries = db.entriesForClass("com/github/junrar/LocalFolderExtractor");
-    assertNotNull(entries, "LocalFolderExtractor must be indexed (junrar GHSA-hf5p)");
-    assertFalse(entries.isEmpty());
-    assertTrue(
-        entries.stream()
-            .flatMap(e -> e.symbols().stream())
-            .anyMatch(s -> "createDirectory".equals(s.method())),
-        "createDirectory must be a tracked method");
-    assertTrue(
-        entries.stream()
-            .flatMap(e -> e.symbols().stream())
-            .anyMatch(s -> "createFile".equals(s.method())),
-        "createFile must be a tracked method");
-  }
+        List<ScaEntry> entries = db.entriesForClass("com/github/junrar/LocalFolderExtractor");
+        assertNotNull(entries, "LocalFolderExtractor must be indexed (junrar GHSA-hf5p)");
+        assertFalse(entries.isEmpty());
+        assertTrue(
+                entries.stream().flatMap(e -> e.symbols().stream()).anyMatch(s -> "createDirectory".equals(s.method())),
+                "createDirectory must be a tracked method");
+        assertTrue(
+                entries.stream().flatMap(e -> e.symbols().stream()).anyMatch(s -> "createFile".equals(s.method())),
+                "createFile must be a tracked method");
+    }
 
-  @Test
-  void zserioArrayReadIsIndexed() {
-    ScaCveDatabase db = ScaCveDatabase.load();
+    @Test
+    void zserioArrayReadIsIndexed() {
+        ScaCveDatabase db = ScaCveDatabase.load();
 
-    List<ScaEntry> entries = db.entriesForClass("zserio/runtime/array/Array");
-    assertNotNull(entries, "zserio Array must be indexed (zserio-runtime GHSA-cwq5)");
-    assertFalse(entries.isEmpty());
-    assertTrue(
-        entries.stream()
-            .flatMap(e -> e.symbols().stream())
-            .anyMatch(s -> "read".equals(s.method())),
-        "read must be a tracked method");
-  }
+        List<ScaEntry> entries = db.entriesForClass("zserio/runtime/array/Array");
+        assertNotNull(entries, "zserio Array must be indexed (zserio-runtime GHSA-cwq5)");
+        assertFalse(entries.isEmpty());
+        assertTrue(
+                entries.stream().flatMap(e -> e.symbols().stream()).anyMatch(s -> "read".equals(s.method())),
+                "read must be a tracked method");
+    }
 
-  @Test
-  void tomcatChunkedInputFilterIsIndexed() {
-    ScaCveDatabase db = ScaCveDatabase.load();
+    @Test
+    void tomcatChunkedInputFilterIsIndexed() {
+        ScaCveDatabase db = ScaCveDatabase.load();
 
-    List<ScaEntry> entries =
-        db.entriesForClass("org/apache/coyote/http11/filters/ChunkedInputFilter");
-    assertNotNull(entries, "ChunkedInputFilter must be indexed (tomcat-embed-core GHSA-563x)");
-    assertFalse(entries.isEmpty());
-    assertTrue(
-        entries.stream()
-            .flatMap(e -> e.symbols().stream())
-            .anyMatch(s -> "parseChunkHeader".equals(s.method())),
-        "parseChunkHeader must be a tracked method");
-  }
+        List<ScaEntry> entries = db.entriesForClass("org/apache/coyote/http11/filters/ChunkedInputFilter");
+        assertNotNull(entries, "ChunkedInputFilter must be indexed (tomcat-embed-core GHSA-563x)");
+        assertFalse(entries.isEmpty());
+        assertTrue(
+                entries.stream()
+                        .flatMap(e -> e.symbols().stream())
+                        .anyMatch(s -> "parseChunkHeader".equals(s.method())),
+                "parseChunkHeader must be a tracked method");
+    }
 
-  @Test
-  void allTrackedSymbolsForThreeLibrariesAreMethodLevel() {
-    ScaCveDatabase db = ScaCveDatabase.load();
+    @Test
+    void allTrackedSymbolsForThreeLibrariesAreMethodLevel() {
+        ScaCveDatabase db = ScaCveDatabase.load();
 
-    String[] classes = {
-      "com/github/junrar/LocalFolderExtractor",
-      "zserio/runtime/array/Array",
-      "zserio/runtime/io/ByteArrayBitStreamReader",
-      "org/apache/coyote/http11/filters/ChunkedInputFilter",
-    };
-    for (String className : classes) {
-      List<ScaEntry> entries = db.entriesForClass(className);
-      if (entries == null) continue;
-      for (ScaEntry entry : entries) {
-        for (ScaSymbol symbol : entry.symbols()) {
-          assertNotNull(
-              symbol.method(),
-              "All symbols must be method-level - found null method for "
-                  + symbol.className()
-                  + " in entry "
-                  + entry.vulnId());
+        String[] classes = {
+            "com/github/junrar/LocalFolderExtractor",
+            "zserio/runtime/array/Array",
+            "zserio/runtime/io/ByteArrayBitStreamReader",
+            "org/apache/coyote/http11/filters/ChunkedInputFilter",
+        };
+        for (String className : classes) {
+            List<ScaEntry> entries = db.entriesForClass(className);
+            if (entries == null) continue;
+            for (ScaEntry entry : entries) {
+                for (ScaSymbol symbol : entry.symbols()) {
+                    assertNotNull(
+                            symbol.method(),
+                            "All symbols must be method-level - found null method for "
+                                    + symbol.className()
+                                    + " in entry "
+                                    + entry.vulnId());
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealLibraryBytecodeTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealLibraryBytecodeTest.java
index 40303c46bf2..b27249e14f1 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealLibraryBytecodeTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealLibraryBytecodeTest.java
@@ -40,162 +40,153 @@
  */
 class ScaRealLibraryBytecodeTest {
 
-  @BeforeEach
-  void setUp() {
-    ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
-    ScaReachabilityCallback.register(
-        (vulnId, artifact, version, dotClassName, methodName, line) ->
-            ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-                artifact, version, vulnId, dotClassName, methodName, line));
-  }
-
-  @AfterEach
-  void tearDown() {
-    ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
-    ScaReachabilityCallback.register(null);
-  }
-
-  // ---------------------------------------------------------------------------
-  // Injection tests: ASM can process real library bytecode
-  // ---------------------------------------------------------------------------
-
-  @Test
-  void junrar_createDirectory_injectionProducesBytecodeChange() throws Exception {
-    Class<?> localFolderExtractor = Class.forName("com.github.junrar.LocalFolderExtractor");
-    byte[] original = bytecodeOf(localFolderExtractor);
-    Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = new HashMap<>();
-    callbacks.put(
-        "createDirectory",
-        Collections.singletonList(
-            spec(
-                "GHSA-hf5p-q87m-crj7",
-                "com.github.junrar:junrar",
-                "7.5.5",
-                "com.github.junrar.LocalFolderExtractor",
-                "createDirectory")));
-
-    byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
-
-    assertNotNull(modified, "ASM injection must not return null on real junrar bytecode");
-    assertTrue(
-        modified.length > original.length,
-        "injected bytecode must be larger than original; proves createDirectory exists"
-            + " and the callback was inserted");
-  }
-
-  @Test
-  void zserio_array_read_injectionProducesBytecodeChange() throws Exception {
-    byte[] original = bytecodeOf(zserio.runtime.array.Array.class);
-    Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = new HashMap<>();
-    callbacks.put(
-        "read",
-        Collections.singletonList(
-            spec(
-                "GHSA-cwq5-8pvq-j65j",
-                "io.github.ndsev:zserio-runtime",
-                "2.16.1",
-                "zserio.runtime.array.Array",
-                "read")));
-
-    byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
-
-    assertNotNull(modified);
-    assertTrue(
-        modified.length > original.length,
-        "injected bytecode must be larger than original; proves Array.read exists"
-            + " and the callback was inserted");
-  }
-
-  @Test
-  void tomcat_chunkedInputFilter_parseChunkHeader_injectionProducesBytecodeChange()
-      throws Exception {
-    byte[] original = bytecodeOf(org.apache.coyote.http11.filters.ChunkedInputFilter.class);
-    Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = new HashMap<>();
-    callbacks.put(
-        "parseChunkHeader",
-        Collections.singletonList(
-            spec(
-                "GHSA-563x-q5rq-57qp",
-                "org.apache.tomcat.embed:tomcat-embed-core",
-                "9.0.115",
-                "org.apache.coyote.http11.filters.ChunkedInputFilter",
-                "parseChunkHeader")));
-
-    byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
-
-    assertNotNull(modified);
-    assertTrue(
-        modified.length > original.length,
-        "injected bytecode must be larger; proves parseChunkHeader exists and was instrumented");
-  }
-
-  // ---------------------------------------------------------------------------
-  // Callback test: the injected callback fires on a real method call
-  // ---------------------------------------------------------------------------
-
-  @Test
-  void junrar_createDirectory_callbackFiresWhenMethodCalled() throws Exception {
-    Class<?> localFolderExtractor = Class.forName("com.github.junrar.LocalFolderExtractor");
-    byte[] original = bytecodeOf(localFolderExtractor);
-    Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = new HashMap<>();
-    callbacks.put(
-        "createDirectory",
-        Collections.singletonList(
-            spec(
-                "GHSA-hf5p-q87m-crj7",
-                "com.github.junrar:junrar",
-                "7.5.5",
-                "com.github.junrar.LocalFolderExtractor",
-                "createDirectory")));
-
-    byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
-    Class<?> cls = loadModified(modified);
-
-    // Constructor is package-private in junrar; setAccessible(true) bypasses visibility.
-    Constructor<?> ctor = cls.getDeclaredConstructor(File.class);
-    ctor.setAccessible(true);
-    Object instance = ctor.newInstance(new File("/tmp"));
-
-    // createDirectory(FileHeader) is package-private. Passing null triggers the injected callback
-    // at method entry before the body tries to access header fields (NPE expected after callback).
-    Class<?> fileHeaderClass = Class.forName("com.github.junrar.rarfile.FileHeader");
-    Method m = cls.getDeclaredMethod("createDirectory", fileHeaderClass);
-    m.setAccessible(true);
-    try {
-      m.invoke(instance, (Object) null);
-    } catch (InvocationTargetException ignored) {
-      // NPE from null FileHeader is expected; the callback already fired before it
+    @BeforeEach
+    void setUp() {
+        ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
+        ScaReachabilityCallback.register((vulnId, artifact, version, dotClassName, methodName, line) ->
+                ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                        artifact, version, vulnId, dotClassName, methodName, line));
     }
 
-    List<ScaReachabilityHit> hits = drainHits();
-    assertEquals(
-        1, hits.size(), "createDirectory callback must fire even when method body throws NPE");
-    ScaReachabilityHit hit = hits.get(0);
-    assertEquals("GHSA-hf5p-q87m-crj7", hit.vulnId());
-    assertEquals("com.github.junrar:junrar", hit.artifact());
-    assertEquals("7.5.5", hit.version());
-  }
-
-  // ---------------------------------------------------------------------------
-  // Helpers (duplicated from ScaReachabilityMethodLevelTest to keep tests self-contained)
-  // ---------------------------------------------------------------------------
-
-  private static List<ScaReachabilityHit> drainHits() {
-    List<ScaReachabilityHit> result = new ArrayList<>();
-    for (DependencySnapshot dep :
-        ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies()) {
-      for (CveSnapshot cve : dep.cves) {
-        if (cve.hit != null) {
-          result.add(cve.hit);
+    @AfterEach
+    void tearDown() {
+        ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
+        ScaReachabilityCallback.register(null);
+    }
+
+    // ---------------------------------------------------------------------------
+    // Injection tests: ASM can process real library bytecode
+    // ---------------------------------------------------------------------------
+
+    @Test
+    void junrar_createDirectory_injectionProducesBytecodeChange() throws Exception {
+        Class<?> localFolderExtractor = Class.forName("com.github.junrar.LocalFolderExtractor");
+        byte[] original = bytecodeOf(localFolderExtractor);
+        Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = new HashMap<>();
+        callbacks.put(
+                "createDirectory",
+                Collections.singletonList(spec(
+                        "GHSA-hf5p-q87m-crj7",
+                        "com.github.junrar:junrar",
+                        "7.5.5",
+                        "com.github.junrar.LocalFolderExtractor",
+                        "createDirectory")));
+
+        byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
+
+        assertNotNull(modified, "ASM injection must not return null on real junrar bytecode");
+        assertTrue(
+                modified.length > original.length,
+                "injected bytecode must be larger than original; proves createDirectory exists"
+                        + " and the callback was inserted");
+    }
+
+    @Test
+    void zserio_array_read_injectionProducesBytecodeChange() throws Exception {
+        byte[] original = bytecodeOf(zserio.runtime.array.Array.class);
+        Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = new HashMap<>();
+        callbacks.put(
+                "read",
+                Collections.singletonList(spec(
+                        "GHSA-cwq5-8pvq-j65j",
+                        "io.github.ndsev:zserio-runtime",
+                        "2.16.1",
+                        "zserio.runtime.array.Array",
+                        "read")));
+
+        byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
+
+        assertNotNull(modified);
+        assertTrue(
+                modified.length > original.length,
+                "injected bytecode must be larger than original; proves Array.read exists"
+                        + " and the callback was inserted");
+    }
+
+    @Test
+    void tomcat_chunkedInputFilter_parseChunkHeader_injectionProducesBytecodeChange() throws Exception {
+        byte[] original = bytecodeOf(org.apache.coyote.http11.filters.ChunkedInputFilter.class);
+        Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = new HashMap<>();
+        callbacks.put(
+                "parseChunkHeader",
+                Collections.singletonList(spec(
+                        "GHSA-563x-q5rq-57qp",
+                        "org.apache.tomcat.embed:tomcat-embed-core",
+                        "9.0.115",
+                        "org.apache.coyote.http11.filters.ChunkedInputFilter",
+                        "parseChunkHeader")));
+
+        byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
+
+        assertNotNull(modified);
+        assertTrue(
+                modified.length > original.length,
+                "injected bytecode must be larger; proves parseChunkHeader exists and was instrumented");
+    }
+
+    // ---------------------------------------------------------------------------
+    // Callback test: the injected callback fires on a real method call
+    // ---------------------------------------------------------------------------
+
+    @Test
+    void junrar_createDirectory_callbackFiresWhenMethodCalled() throws Exception {
+        Class<?> localFolderExtractor = Class.forName("com.github.junrar.LocalFolderExtractor");
+        byte[] original = bytecodeOf(localFolderExtractor);
+        Map<String, List<ScaMethodCallbackInjector.MethodCallbackSpec>> callbacks = new HashMap<>();
+        callbacks.put(
+                "createDirectory",
+                Collections.singletonList(spec(
+                        "GHSA-hf5p-q87m-crj7",
+                        "com.github.junrar:junrar",
+                        "7.5.5",
+                        "com.github.junrar.LocalFolderExtractor",
+                        "createDirectory")));
+
+        byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks);
+        Class<?> cls = loadModified(modified);
+
+        // Constructor is package-private in junrar; setAccessible(true) bypasses visibility.
+        Constructor<?> ctor = cls.getDeclaredConstructor(File.class);
+        ctor.setAccessible(true);
+        Object instance = ctor.newInstance(new File("/tmp"));
+
+        // createDirectory(FileHeader) is package-private. Passing null triggers the injected callback
+        // at method entry before the body tries to access header fields (NPE expected after callback).
+        Class<?> fileHeaderClass = Class.forName("com.github.junrar.rarfile.FileHeader");
+        Method m = cls.getDeclaredMethod("createDirectory", fileHeaderClass);
+        m.setAccessible(true);
+        try {
+            m.invoke(instance, (Object) null);
+        } catch (InvocationTargetException ignored) {
+            // NPE from null FileHeader is expected; the callback already fired before it
         }
-      }
+
+        List<ScaReachabilityHit> hits = drainHits();
+        assertEquals(1, hits.size(), "createDirectory callback must fire even when method body throws NPE");
+        ScaReachabilityHit hit = hits.get(0);
+        assertEquals("GHSA-hf5p-q87m-crj7", hit.vulnId());
+        assertEquals("com.github.junrar:junrar", hit.artifact());
+        assertEquals("7.5.5", hit.version());
+    }
+
+    // ---------------------------------------------------------------------------
+    // Helpers (duplicated from ScaReachabilityMethodLevelTest to keep tests self-contained)
+    // ---------------------------------------------------------------------------
+
+    private static List<ScaReachabilityHit> drainHits() {
+        List<ScaReachabilityHit> result = new ArrayList<>();
+        for (DependencySnapshot dep : ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies()) {
+            for (CveSnapshot cve : dep.cves) {
+                if (cve.hit != null) {
+                    result.add(cve.hit);
+                }
+            }
+        }
+        return result;
+    }
+
+    private static ScaMethodCallbackInjector.MethodCallbackSpec spec(
+            String vulnId, String artifact, String version, String dotClass, String method) {
+        return new ScaMethodCallbackInjector.MethodCallbackSpec(vulnId, artifact, version, dotClass, method);
     }
-    return result;
-  }
-
-  private static ScaMethodCallbackInjector.MethodCallbackSpec spec(
-      String vulnId, String artifact, String version, String dotClass, String method) {
-    return new ScaMethodCallbackInjector.MethodCallbackSpec(
-        vulnId, artifact, version, dotClass, method);
-  }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/VersionRangeParserTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/VersionRangeParserTest.java
index 1e74d9de5d6..ffdcd19833b 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/VersionRangeParserTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/VersionRangeParserTest.java
@@ -11,171 +11,169 @@
 
 class VersionRangeParserTest {
 
-  // --- matchesAny: null / empty guards ---
-
-  @Test
-  void nullVersionReturnsFalse() {
-    assertFalse(VersionRangeParser.matchesAny(null, Arrays.asList("< 2.0.0")));
-  }
-
-  @Test
-  void emptyVersionReturnsFalse() {
-    assertFalse(VersionRangeParser.matchesAny("", Arrays.asList("< 2.0.0")));
-  }
-
-  @Test
-  void nullRangesReturnsFalse() {
-    assertFalse(VersionRangeParser.matchesAny("1.0.0", null));
-  }
-
-  @Test
-  void emptyRangesReturnsFalse() {
-    assertFalse(VersionRangeParser.matchesAny("1.0.0", Collections.emptyList()));
-  }
-
-  // --- single-condition operators ---
-
-  @Test
-  void lessThan_belowBound() {
-    assertTrue(VersionRangeParser.matchesAny("2.6.7.2", Arrays.asList("< 2.6.7.3")));
-  }
-
-  @Test
-  void lessThan_atBound() {
-    assertFalse(VersionRangeParser.matchesAny("2.6.7.3", Arrays.asList("< 2.6.7.3")));
-  }
-
-  @Test
-  void lessThan_aboveBound() {
-    assertFalse(VersionRangeParser.matchesAny("2.6.7.4", Arrays.asList("< 2.6.7.3")));
-  }
-
-  @Test
-  void lessThanOrEqual_atBound() {
-    assertTrue(VersionRangeParser.matchesAny("2.6.7.3", Arrays.asList("<= 2.6.7.3")));
-  }
-
-  @Test
-  void lessThanOrEqual_aboveBound() {
-    assertFalse(VersionRangeParser.matchesAny("2.6.7.4", Arrays.asList("<= 2.6.7.3")));
-  }
-
-  @Test
-  void greaterThan_aboveBound() {
-    assertTrue(VersionRangeParser.matchesAny("9.5.1", Arrays.asList("> 9.5.0")));
-  }
-
-  @Test
-  void greaterThan_atBound() {
-    assertFalse(VersionRangeParser.matchesAny("9.5.0", Arrays.asList("> 9.5.0")));
-  }
-
-  @Test
-  void greaterThanOrEqual_atBound() {
-    assertTrue(VersionRangeParser.matchesAny("9.5.0", Arrays.asList(">= 9.5.0")));
-  }
-
-  @Test
-  void exactMatch_matches() {
-    assertTrue(VersionRangeParser.matchesAny("9.5.0", Arrays.asList("= 9.5.0")));
-  }
-
-  @Test
-  void exactMatch_doesNotMatch() {
-    assertFalse(VersionRangeParser.matchesAny("9.5.1", Arrays.asList("= 9.5.0")));
-  }
-
-  // --- compound condition (AND within one string) ---
-
-  @Test
-  void compoundRange_withinBounds() {
-    assertTrue(VersionRangeParser.matchesAny("2.7.5", Arrays.asList(">= 2.7.0, < 2.7.9.5")));
-  }
-
-  @Test
-  void compoundRange_realGhsaJackson() {
-    List<String> ranges = Arrays.asList("< 2.6.7.3", ">= 2.7.0, < 2.7.9.5", ">= 2.8.0, < 2.8.11.3");
-    assertTrue(VersionRangeParser.matchesAny("2.8.5", ranges));
-    assertTrue(VersionRangeParser.matchesAny("2.7.5", ranges));
-    assertTrue(VersionRangeParser.matchesAny("2.6.0", ranges));
-    assertFalse(VersionRangeParser.matchesAny("2.9.7", ranges));
-  }
-
-  @Test
-  void compoundRange_atLowerBound() {
-    assertTrue(VersionRangeParser.matchesAny("2.7.0", Arrays.asList(">= 2.7.0, < 2.7.9.5")));
-  }
-
-  @Test
-  void compoundRange_atUpperBound() {
-    assertFalse(VersionRangeParser.matchesAny("2.7.9.5", Arrays.asList(">= 2.7.0, < 2.7.9.5")));
-  }
-
-  @Test
-  void compoundRange_belowLowerBound() {
-    assertFalse(VersionRangeParser.matchesAny("2.6.9", Arrays.asList(">= 2.7.0, < 2.7.9.5")));
-  }
-
-  // --- OR across multiple range strings ---
-
-  @Test
-  void multipleRanges_matchesFirstRange() {
-    List<String> ranges = Arrays.asList("< 2.6.7.3", ">= 2.7.0, < 2.7.9.5");
-    assertTrue(VersionRangeParser.matchesAny("2.6.0", ranges));
-  }
-
-  @Test
-  void multipleRanges_matchesSecondRange() {
-    List<String> ranges = Arrays.asList("< 2.6.7.3", ">= 2.7.0, < 2.7.9.5");
-    assertTrue(VersionRangeParser.matchesAny("2.7.5", ranges));
-  }
-
-  @Test
-  void multipleRanges_matchesNeitherRange() {
-    List<String> ranges = Arrays.asList("< 2.6.7.3", ">= 2.7.0, < 2.7.9.5");
-    assertFalse(VersionRangeParser.matchesAny("2.6.8", ranges));
-  }
-
-  // --- Maven qualifier handling (Gap 10) ---
-
-  @Test
-  void releaseQualifier_belowBound() {
-    assertTrue(VersionRangeParser.matchesAny("5.2.19.RELEASE", Arrays.asList("< 5.2.20.RELEASE")));
-  }
-
-  @Test
-  void releaseQualifier_atBound() {
-    assertFalse(VersionRangeParser.matchesAny("5.2.20.RELEASE", Arrays.asList("< 5.2.20.RELEASE")));
-  }
-
-  @Test
-  void releaseQualifier_equivalentToPlain() {
-    // 5.2.20.RELEASE == 5.2.20 in Maven versioning
-    assertFalse(VersionRangeParser.matchesAny("5.2.20", Arrays.asList("< 5.2.20.RELEASE")));
-  }
-
-  @Test
-  void releaseQualifier_compoundRange() {
-    assertTrue(VersionRangeParser.matchesAny("5.3.10", Arrays.asList(">= 5.3.0, < 5.3.18")));
-    assertFalse(
-        VersionRangeParser.matchesAny("5.2.20.RELEASE", Arrays.asList(">= 5.3.0, < 5.3.18")));
-  }
-
-  // --- 4-part versions ---
-
-  @Test
-  void fourPartVersion() {
-    assertTrue(VersionRangeParser.matchesAny("2.6.7.2", Arrays.asList("< 2.6.7.3")));
-    assertFalse(VersionRangeParser.matchesAny("2.6.7.3", Arrays.asList("< 2.6.7.3")));
-    assertFalse(VersionRangeParser.matchesAny("2.6.7.4", Arrays.asList("< 2.6.7.3")));
-  }
-
-  // --- error handling ---
-
-  @Test
-  void unknownOperatorThrows() {
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> VersionRangeParser.matchesAny("1.0.0", Arrays.asList("~ 2.0.0")));
-  }
+    // --- matchesAny: null / empty guards ---
+
+    @Test
+    void nullVersionReturnsFalse() {
+        assertFalse(VersionRangeParser.matchesAny(null, Arrays.asList("< 2.0.0")));
+    }
+
+    @Test
+    void emptyVersionReturnsFalse() {
+        assertFalse(VersionRangeParser.matchesAny("", Arrays.asList("< 2.0.0")));
+    }
+
+    @Test
+    void nullRangesReturnsFalse() {
+        assertFalse(VersionRangeParser.matchesAny("1.0.0", null));
+    }
+
+    @Test
+    void emptyRangesReturnsFalse() {
+        assertFalse(VersionRangeParser.matchesAny("1.0.0", Collections.emptyList()));
+    }
+
+    // --- single-condition operators ---
+
+    @Test
+    void lessThan_belowBound() {
+        assertTrue(VersionRangeParser.matchesAny("2.6.7.2", Arrays.asList("< 2.6.7.3")));
+    }
+
+    @Test
+    void lessThan_atBound() {
+        assertFalse(VersionRangeParser.matchesAny("2.6.7.3", Arrays.asList("< 2.6.7.3")));
+    }
+
+    @Test
+    void lessThan_aboveBound() {
+        assertFalse(VersionRangeParser.matchesAny("2.6.7.4", Arrays.asList("< 2.6.7.3")));
+    }
+
+    @Test
+    void lessThanOrEqual_atBound() {
+        assertTrue(VersionRangeParser.matchesAny("2.6.7.3", Arrays.asList("<= 2.6.7.3")));
+    }
+
+    @Test
+    void lessThanOrEqual_aboveBound() {
+        assertFalse(VersionRangeParser.matchesAny("2.6.7.4", Arrays.asList("<= 2.6.7.3")));
+    }
+
+    @Test
+    void greaterThan_aboveBound() {
+        assertTrue(VersionRangeParser.matchesAny("9.5.1", Arrays.asList("> 9.5.0")));
+    }
+
+    @Test
+    void greaterThan_atBound() {
+        assertFalse(VersionRangeParser.matchesAny("9.5.0", Arrays.asList("> 9.5.0")));
+    }
+
+    @Test
+    void greaterThanOrEqual_atBound() {
+        assertTrue(VersionRangeParser.matchesAny("9.5.0", Arrays.asList(">= 9.5.0")));
+    }
+
+    @Test
+    void exactMatch_matches() {
+        assertTrue(VersionRangeParser.matchesAny("9.5.0", Arrays.asList("= 9.5.0")));
+    }
+
+    @Test
+    void exactMatch_doesNotMatch() {
+        assertFalse(VersionRangeParser.matchesAny("9.5.1", Arrays.asList("= 9.5.0")));
+    }
+
+    // --- compound condition (AND within one string) ---
+
+    @Test
+    void compoundRange_withinBounds() {
+        assertTrue(VersionRangeParser.matchesAny("2.7.5", Arrays.asList(">= 2.7.0, < 2.7.9.5")));
+    }
+
+    @Test
+    void compoundRange_realGhsaJackson() {
+        List<String> ranges = Arrays.asList("< 2.6.7.3", ">= 2.7.0, < 2.7.9.5", ">= 2.8.0, < 2.8.11.3");
+        assertTrue(VersionRangeParser.matchesAny("2.8.5", ranges));
+        assertTrue(VersionRangeParser.matchesAny("2.7.5", ranges));
+        assertTrue(VersionRangeParser.matchesAny("2.6.0", ranges));
+        assertFalse(VersionRangeParser.matchesAny("2.9.7", ranges));
+    }
+
+    @Test
+    void compoundRange_atLowerBound() {
+        assertTrue(VersionRangeParser.matchesAny("2.7.0", Arrays.asList(">= 2.7.0, < 2.7.9.5")));
+    }
+
+    @Test
+    void compoundRange_atUpperBound() {
+        assertFalse(VersionRangeParser.matchesAny("2.7.9.5", Arrays.asList(">= 2.7.0, < 2.7.9.5")));
+    }
+
+    @Test
+    void compoundRange_belowLowerBound() {
+        assertFalse(VersionRangeParser.matchesAny("2.6.9", Arrays.asList(">= 2.7.0, < 2.7.9.5")));
+    }
+
+    // --- OR across multiple range strings ---
+
+    @Test
+    void multipleRanges_matchesFirstRange() {
+        List<String> ranges = Arrays.asList("< 2.6.7.3", ">= 2.7.0, < 2.7.9.5");
+        assertTrue(VersionRangeParser.matchesAny("2.6.0", ranges));
+    }
+
+    @Test
+    void multipleRanges_matchesSecondRange() {
+        List<String> ranges = Arrays.asList("< 2.6.7.3", ">= 2.7.0, < 2.7.9.5");
+        assertTrue(VersionRangeParser.matchesAny("2.7.5", ranges));
+    }
+
+    @Test
+    void multipleRanges_matchesNeitherRange() {
+        List<String> ranges = Arrays.asList("< 2.6.7.3", ">= 2.7.0, < 2.7.9.5");
+        assertFalse(VersionRangeParser.matchesAny("2.6.8", ranges));
+    }
+
+    // --- Maven qualifier handling (Gap 10) ---
+
+    @Test
+    void releaseQualifier_belowBound() {
+        assertTrue(VersionRangeParser.matchesAny("5.2.19.RELEASE", Arrays.asList("< 5.2.20.RELEASE")));
+    }
+
+    @Test
+    void releaseQualifier_atBound() {
+        assertFalse(VersionRangeParser.matchesAny("5.2.20.RELEASE", Arrays.asList("< 5.2.20.RELEASE")));
+    }
+
+    @Test
+    void releaseQualifier_equivalentToPlain() {
+        // 5.2.20.RELEASE == 5.2.20 in Maven versioning
+        assertFalse(VersionRangeParser.matchesAny("5.2.20", Arrays.asList("< 5.2.20.RELEASE")));
+    }
+
+    @Test
+    void releaseQualifier_compoundRange() {
+        assertTrue(VersionRangeParser.matchesAny("5.3.10", Arrays.asList(">= 5.3.0, < 5.3.18")));
+        assertFalse(VersionRangeParser.matchesAny("5.2.20.RELEASE", Arrays.asList(">= 5.3.0, < 5.3.18")));
+    }
+
+    // --- 4-part versions ---
+
+    @Test
+    void fourPartVersion() {
+        assertTrue(VersionRangeParser.matchesAny("2.6.7.2", Arrays.asList("< 2.6.7.3")));
+        assertFalse(VersionRangeParser.matchesAny("2.6.7.3", Arrays.asList("< 2.6.7.3")));
+        assertFalse(VersionRangeParser.matchesAny("2.6.7.4", Arrays.asList("< 2.6.7.3")));
+    }
+
+    // --- error handling ---
+
+    @Test
+    void unknownOperatorThrows() {
+        assertThrows(
+                IllegalArgumentException.class, () -> VersionRangeParser.matchesAny("1.0.0", Arrays.asList("~ 2.0.0")));
+    }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/user/AppSecEventTrackerTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/user/AppSecEventTrackerTest.java
index 6f827e5f0b2..a0597162e51 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/user/AppSecEventTrackerTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/user/AppSecEventTrackerTest.java
@@ -67,339 +67,327 @@
 @SuppressWarnings("deprecation") // exercises the deprecated v1 EventTracker API on purpose
 class AppSecEventTrackerTest extends DDJavaSpecification {
 
-  private static final String USER_LOGIN = "user";
-  private static final String ANONYMIZED_USER_LOGIN = "anon_04f8996da763b7a969b1028ee3007569";
-  private static final String USER_ID = "1";
-  private static final String ANONYMIZED_USER_ID = "anon_6b86b273ff34fce19d6b804eff5a3f57";
-  private static final Map<String, String> METADATA = metadata();
-
-  private static boolean appSecActiveBefore;
-  private static EventTracker eventTrackerBefore;
-
-  private TestAppSecEventTracker tracker;
-  private TraceSegment traceSegment;
-  private RequestContext requestContext;
-  private AgentSpan span;
-  private CallbackProvider provider;
-  private TracerAPI tracer;
-  private BiFunction<RequestContext, String, Flow<Void>> user;
-  private TriFunction<RequestContext, LoginEvent, String, Flow<Void>> loginEvent;
-
-  @BeforeAll
-  static void saveGlobalState() {
-    appSecActiveBefore = ActiveSubsystems.APPSEC_ACTIVE;
-    eventTrackerBefore = GlobalTracer.getEventTracker();
-  }
-
-  /**
-   * {@link User} and {@link EventTrackerV2} hold their implementation in a static field with no
-   * getter, so the pre-test value cannot be captured; resetting them to their no-op defaults at
-   * least keeps this test's tracker (and its mocks) from leaking into later tests.
-   */
-  @AfterAll
-  static void restoreGlobalState() {
-    ActiveSubsystems.APPSEC_ACTIVE = appSecActiveBefore;
-    GlobalTracer.setEventTracker(eventTrackerBefore);
-    User.setUserService(UserService.NO_OP);
-    EventTrackerV2.setEventTrackerService(EventTrackerService.NO_OP);
-  }
-
-  @SuppressWarnings("unchecked")
-  @BeforeEach
-  void setup() {
-    traceSegment = mock(TraceSegment.class);
-    requestContext = mock(RequestContext.class);
-    span = mock(AgentSpan.class);
-    when(span.getRequestContext()).thenReturn(requestContext);
-    user = mock(BiFunction.class);
-    loginEvent = mock(TriFunction.class);
-    when(user.apply(any(), any())).thenReturn(NoopFlow.INSTANCE);
-    when(loginEvent.apply(any(), any(), any())).thenReturn(NoopFlow.INSTANCE);
-
-    provider = mock(CallbackProvider.class);
-    when(provider.getCallback(EVENTS.user())).thenReturn(user);
-    when(provider.getCallback(EVENTS.loginEvent())).thenReturn(loginEvent);
-
-    tracer = mock(TracerAPI.class);
-    when(tracer.getTraceSegment()).thenReturn(traceSegment);
-    when(tracer.activeSpan()).thenReturn(span);
-    when(tracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(provider);
-
-    tracker = new TestAppSecEventTracker(tracer);
-    GlobalTracer.setEventTracker(tracker);
-    User.setUserService(tracker);
-    EventTrackerV2.setEventTrackerService(tracker.v2EventTrackerService());
-    ActiveSubsystems.APPSEC_ACTIVE = true;
-
-    // discard telemetry produced elsewhere so each assertion only sees its own event
-    drainSdkEvents();
-  }
-
-  @Test
-  void trackLoginSuccessEvent() {
-    GlobalTracer.getEventTracker().trackLoginSuccessEvent(USER_ID, METADATA);
-
-    verify(traceSegment).setTagTop("usr.id", USER_ID);
-    verify(traceSegment).setTagTop("appsec.events.users.login.success.usr.login", USER_ID, true);
-    verify(traceSegment).setTagTop("appsec.events.users.login.success", METADATA, true);
-    verify(traceSegment).setTagTop("appsec.events.users.login.success.track", true, true);
-    verify(traceSegment).setTagTop("_dd.appsec.events.users.login.success.sdk", true, true);
-    verify(traceSegment).setTagTop("asm.keep", true);
-    verify(traceSegment).setTagTop("_dd.p.ts", ASM);
-    verify(loginEvent).apply(isA(RequestContext.class), eq(LOGIN_SUCCESS), eq(USER_ID));
-    verify(user).apply(isA(RequestContext.class), eq(USER_ID));
-    verifyNoMoreMockInteractions();
-
-    assertAppSecSdkEvent(LOGIN_SUCCESS, V1);
-  }
-
-  @Test
-  void trackLoginFailureEvent() {
-    GlobalTracer.getEventTracker().trackLoginFailureEvent(USER_ID, true, METADATA);
-
-    verify(traceSegment).setTagTop("appsec.events.users.login.failure.usr.id", USER_ID, true);
-    verify(traceSegment).setTagTop("appsec.events.users.login.failure.usr.login", USER_ID, true);
-    verify(traceSegment).setTagTop("appsec.events.users.login.failure.usr.exists", true, true);
-    verify(traceSegment).setTagTop("appsec.events.users.login.failure", METADATA, true);
-    verify(traceSegment).setTagTop("appsec.events.users.login.failure.track", true, true);
-    verify(traceSegment).setTagTop("_dd.appsec.events.users.login.failure.sdk", true, true);
-    verify(traceSegment).setTagTop("asm.keep", true);
-    verify(traceSegment).setTagTop("_dd.p.ts", ASM);
-    verify(loginEvent).apply(isA(RequestContext.class), eq(LOGIN_FAILURE), eq(USER_ID));
-    verify(user).apply(isA(RequestContext.class), eq(USER_ID));
-    verifyNoMoreMockInteractions();
-
-    assertAppSecSdkEvent(LOGIN_FAILURE, V1);
-  }
-
-  @Test
-  void trackCustomEvent() {
-    GlobalTracer.getEventTracker().trackCustomEvent("myevent", METADATA);
-
-    verify(traceSegment).setTagTop("appsec.events.myevent", METADATA, true);
-    verify(traceSegment).setTagTop("appsec.events.myevent.track", true, true);
-    verify(traceSegment).setTagTop("_dd.appsec.events.myevent.sdk", true, true);
-    verify(traceSegment).setTagTop("asm.keep", true);
-    verify(traceSegment).setTagTop("_dd.p.ts", ASM);
-    verifyNoMoreMockInteractions();
-
-    assertAppSecSdkEvent(CUSTOM, V1);
-  }
-
-  @Test
-  void trackLoginSuccessEventV2() {
-    EventTrackerV2.trackUserLoginSuccess(USER_LOGIN, USER_ID, METADATA);
-
-    verify(traceSegment).setTagTop("usr.id", USER_ID);
-    verify(traceSegment).setTagTop("usr", METADATA);
-    verify(traceSegment).setTagTop("appsec.events.users.login.success.usr.id", USER_ID, true);
-    verify(traceSegment).setTagTop("appsec.events.users.login.success.usr", METADATA, true);
-    verify(traceSegment).setTagTop("_dd.appsec.user.collection_mode", "sdk");
-    verify(traceSegment).setTagTop("appsec.events.users.login.success.usr.login", USER_LOGIN, true);
-    verify(traceSegment).setTagTop("appsec.events.users.login.success", METADATA, true);
-    verify(traceSegment).setTagTop("appsec.events.users.login.success.track", true, true);
-    verify(traceSegment).setTagTop("_dd.appsec.events.users.login.success.sdk", true, true);
-    verify(traceSegment, times(2)).setTagTop("asm.keep", true);
-    verify(traceSegment, times(2)).setTagTop("_dd.p.ts", ASM);
-    verify(loginEvent).apply(isA(RequestContext.class), eq(LOGIN_SUCCESS), eq(USER_LOGIN));
-    verify(user).apply(isA(RequestContext.class), eq(USER_ID));
-    verifyNoMoreMockInteractions();
-
-    assertAppSecSdkEvent(LOGIN_SUCCESS, V2);
-  }
-
-  @Test
-  void trackLoginFailureEventV2() {
-    EventTrackerV2.trackUserLoginFailure(USER_LOGIN, true, METADATA);
-
-    verify(traceSegment).setTagTop("appsec.events.users.login.failure.usr.login", USER_LOGIN, true);
-    verify(traceSegment).setTagTop("appsec.events.users.login.failure.usr.exists", true, true);
-    verify(traceSegment).setTagTop("appsec.events.users.login.failure", METADATA, true);
-    verify(traceSegment).setTagTop("appsec.events.users.login.failure.track", true, true);
-    verify(traceSegment).setTagTop("_dd.appsec.events.users.login.failure.sdk", true, true);
-    verify(traceSegment).setTagTop("asm.keep", true);
-    verify(traceSegment).setTagTop("_dd.p.ts", ASM);
-    verify(loginEvent).apply(isA(RequestContext.class), eq(LOGIN_FAILURE), eq(USER_LOGIN));
-    verifyNoMoreMockInteractions();
-
-    assertAppSecSdkEvent(LOGIN_FAILURE, V2);
-  }
-
-  @Test
-  void trackCustomEventV2() {
-    EventTrackerV2.trackCustomEvent("myevent", METADATA);
-
-    verify(traceSegment).setTagTop("appsec.events.myevent", METADATA, true);
-    verify(traceSegment).setTagTop("appsec.events.myevent.track", true, true);
-    verify(traceSegment).setTagTop("_dd.appsec.events.myevent.sdk", true, true);
-    verify(traceSegment).setTagTop("asm.keep", true);
-    verify(traceSegment).setTagTop("_dd.p.ts", ASM);
-    verifyNoMoreMockInteractions();
-
-    assertAppSecSdkEvent(CUSTOM, V2);
-  }
-
-  @Test
-  void trackUser() {
-    setUser(USER_ID, METADATA);
-
-    verify(traceSegment).setTagTop("usr.id", USER_ID);
-    verify(traceSegment).setTagTop("usr", METADATA);
-    verify(traceSegment).setTagTop("_dd.appsec.user.collection_mode", SDK.fullName());
-    verify(traceSegment).setTagTop("asm.keep", true);
-    verify(traceSegment).setTagTop("_dd.p.ts", ASM);
-    verify(user).apply(isA(RequestContext.class), eq(USER_ID));
-    verifyNoMoreMockInteractions();
-  }
-
-  @Test
-  void wrongEventArgumentValidation() {
-    EventTracker eventTracker = GlobalTracer.getEventTracker();
-
-    assertThrows(
-        IllegalArgumentException.class, () -> eventTracker.trackLoginSuccessEvent(null, null));
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> eventTracker.trackLoginFailureEvent(null, false, null));
-    assertThrows(IllegalArgumentException.class, () -> eventTracker.trackCustomEvent(null, null));
-    assertThrows(
-        IllegalArgumentException.class, () -> eventTracker.trackLoginSuccessEvent("", null));
-    assertThrows(
-        IllegalArgumentException.class, () -> eventTracker.trackLoginFailureEvent("", false, null));
-    assertThrows(IllegalArgumentException.class, () -> eventTracker.trackCustomEvent("", null));
-    assertThrows(IllegalArgumentException.class, () -> setUser(null, null));
-  }
+    private static final String USER_LOGIN = "user";
+    private static final String ANONYMIZED_USER_LOGIN = "anon_04f8996da763b7a969b1028ee3007569";
+    private static final String USER_ID = "1";
+    private static final String ANONYMIZED_USER_ID = "anon_6b86b273ff34fce19d6b804eff5a3f57";
+    private static final Map<String, String> METADATA = metadata();
+
+    private static boolean appSecActiveBefore;
+    private static EventTracker eventTrackerBefore;
+
+    private TestAppSecEventTracker tracker;
+    private TraceSegment traceSegment;
+    private RequestContext requestContext;
+    private AgentSpan span;
+    private CallbackProvider provider;
+    private TracerAPI tracer;
+    private BiFunction<RequestContext, String, Flow<Void>> user;
+    private TriFunction<RequestContext, LoginEvent, String, Flow<Void>> loginEvent;
+
+    @BeforeAll
+    static void saveGlobalState() {
+        appSecActiveBefore = ActiveSubsystems.APPSEC_ACTIVE;
+        eventTrackerBefore = GlobalTracer.getEventTracker();
+    }
 
-  @TableTest({
-    "scenario       | mode          ",
-    "identification | IDENTIFICATION",
-    "anonymization  | ANONYMIZATION ",
-    "disabled       | DISABLED      "
-  })
-  void onSignup(UserIdCollectionMode mode) {
-    String expectedUserLogin = mode == ANONYMIZATION ? ANONYMIZED_USER_LOGIN : USER_LOGIN;
-
-    tracker.onSignupEvent(mode, USER_LOGIN, METADATA);
-
-    if (mode != DISABLED) {
-      verify(traceSegment).getTagTop("_dd.appsec.events.users.signup.sdk"); // no SDK event before
-      verify(traceSegment).setTagTop("_dd.appsec.usr.login", expectedUserLogin);
-      verify(traceSegment)
-          .setTagTop("_dd.appsec.events.users.signup.auto.mode", mode.fullName(), true);
-      verify(traceSegment)
-          .setTagTop("appsec.events.users.signup.usr.login", expectedUserLogin, true);
-      verify(traceSegment).setTagTop("appsec.events.users.signup", METADATA, true);
-      verify(traceSegment).setTagTop("appsec.events.users.signup.track", true, true);
-      verify(traceSegment).setTagTop("asm.keep", true);
-      verify(traceSegment).setTagTop("_dd.p.ts", ASM);
-      verify(loginEvent).apply(isA(RequestContext.class), eq(SIGN_UP), eq(expectedUserLogin));
+    /**
+     * {@link User} and {@link EventTrackerV2} hold their implementation in a static field with no
+     * getter, so the pre-test value cannot be captured; resetting them to their no-op defaults at
+     * least keeps this test's tracker (and its mocks) from leaking into later tests.
+     */
+    @AfterAll
+    static void restoreGlobalState() {
+        ActiveSubsystems.APPSEC_ACTIVE = appSecActiveBefore;
+        GlobalTracer.setEventTracker(eventTrackerBefore);
+        User.setUserService(UserService.NO_OP);
+        EventTrackerV2.setEventTrackerService(EventTrackerService.NO_OP);
     }
-    verifyNoMoreMockInteractions();
-  }
 
-  @TableTest({
-    "scenario       | mode          ",
-    "identification | IDENTIFICATION",
-    "anonymization  | ANONYMIZATION ",
-    "disabled       | DISABLED      "
-  })
-  void onLoginSuccess(UserIdCollectionMode mode) {
-    String expectedUserLogin = mode == ANONYMIZATION ? ANONYMIZED_USER_LOGIN : USER_LOGIN;
-
-    tracker.onLoginSuccessEvent(mode, USER_LOGIN, METADATA);
-
-    if (mode != DISABLED) {
-      // no SDK event before
-      verify(traceSegment).getTagTop("_dd.appsec.events.users.login.success.sdk");
-      verify(traceSegment).setTagTop("_dd.appsec.usr.login", expectedUserLogin);
-      verify(traceSegment)
-          .setTagTop("_dd.appsec.events.users.login.success.auto.mode", mode.fullName(), true);
-      verify(traceSegment)
-          .setTagTop("appsec.events.users.login.success.usr.login", expectedUserLogin, true);
-      verify(traceSegment).setTagTop("appsec.events.users.login.success", METADATA, true);
-      verify(traceSegment).setTagTop("appsec.events.users.login.success.track", true, true);
-      verify(traceSegment).setTagTop("asm.keep", true);
-      verify(traceSegment).setTagTop("_dd.p.ts", ASM);
-      verify(loginEvent).apply(isA(RequestContext.class), eq(LOGIN_SUCCESS), eq(expectedUserLogin));
+    @SuppressWarnings("unchecked")
+    @BeforeEach
+    void setup() {
+        traceSegment = mock(TraceSegment.class);
+        requestContext = mock(RequestContext.class);
+        span = mock(AgentSpan.class);
+        when(span.getRequestContext()).thenReturn(requestContext);
+        user = mock(BiFunction.class);
+        loginEvent = mock(TriFunction.class);
+        when(user.apply(any(), any())).thenReturn(NoopFlow.INSTANCE);
+        when(loginEvent.apply(any(), any(), any())).thenReturn(NoopFlow.INSTANCE);
+
+        provider = mock(CallbackProvider.class);
+        when(provider.getCallback(EVENTS.user())).thenReturn(user);
+        when(provider.getCallback(EVENTS.loginEvent())).thenReturn(loginEvent);
+
+        tracer = mock(TracerAPI.class);
+        when(tracer.getTraceSegment()).thenReturn(traceSegment);
+        when(tracer.activeSpan()).thenReturn(span);
+        when(tracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(provider);
+
+        tracker = new TestAppSecEventTracker(tracer);
+        GlobalTracer.setEventTracker(tracker);
+        User.setUserService(tracker);
+        EventTrackerV2.setEventTrackerService(tracker.v2EventTrackerService());
+        ActiveSubsystems.APPSEC_ACTIVE = true;
+
+        // discard telemetry produced elsewhere so each assertion only sees its own event
+        drainSdkEvents();
     }
-    verifyNoMoreMockInteractions();
-  }
 
-  @TableTest({
-    "scenario       | mode          ",
-    "identification | IDENTIFICATION",
-    "anonymization  | ANONYMIZATION ",
-    "disabled       | DISABLED      "
-  })
-  void onLoginFailed(UserIdCollectionMode mode) {
-    String expectedUserLogin = mode == ANONYMIZATION ? ANONYMIZED_USER_LOGIN : USER_LOGIN;
-
-    tracker.onLoginFailureEvent(mode, USER_LOGIN, true, METADATA);
-
-    if (mode != DISABLED) {
-      // no SDK event before
-      verify(traceSegment).getTagTop("_dd.appsec.events.users.login.failure.sdk");
-      verify(traceSegment).setTagTop("_dd.appsec.usr.login", expectedUserLogin);
-      verify(traceSegment)
-          .setTagTop("_dd.appsec.events.users.login.failure.auto.mode", mode.fullName(), true);
-      verify(traceSegment)
-          .setTagTop("appsec.events.users.login.failure.usr.login", expectedUserLogin, true);
-      verify(traceSegment).setTagTop("appsec.events.users.login.failure", METADATA, true);
-      verify(traceSegment).setTagTop("appsec.events.users.login.failure.usr.exists", true, true);
-      verify(traceSegment).setTagTop("appsec.events.users.login.failure.track", true, true);
-      verify(traceSegment).setTagTop("asm.keep", true);
-      verify(traceSegment).setTagTop("_dd.p.ts", ASM);
-      verify(loginEvent).apply(isA(RequestContext.class), eq(LOGIN_FAILURE), eq(expectedUserLogin));
+    @Test
+    void trackLoginSuccessEvent() {
+        GlobalTracer.getEventTracker().trackLoginSuccessEvent(USER_ID, METADATA);
+
+        verify(traceSegment).setTagTop("usr.id", USER_ID);
+        verify(traceSegment).setTagTop("appsec.events.users.login.success.usr.login", USER_ID, true);
+        verify(traceSegment).setTagTop("appsec.events.users.login.success", METADATA, true);
+        verify(traceSegment).setTagTop("appsec.events.users.login.success.track", true, true);
+        verify(traceSegment).setTagTop("_dd.appsec.events.users.login.success.sdk", true, true);
+        verify(traceSegment).setTagTop("asm.keep", true);
+        verify(traceSegment).setTagTop("_dd.p.ts", ASM);
+        verify(loginEvent).apply(isA(RequestContext.class), eq(LOGIN_SUCCESS), eq(USER_ID));
+        verify(user).apply(isA(RequestContext.class), eq(USER_ID));
+        verifyNoMoreMockInteractions();
+
+        assertAppSecSdkEvent(LOGIN_SUCCESS, V1);
     }
-    verifyNoMoreMockInteractions();
-  }
 
-  @TableTest({
-    "scenario       | mode          ",
-    "identification | IDENTIFICATION",
-    "anonymization  | ANONYMIZATION ",
-    "disabled       | DISABLED      "
-  })
-  void onUserEvent(UserIdCollectionMode mode) {
-    String expectedUserId = mode == ANONYMIZATION ? ANONYMIZED_USER_ID : USER_ID;
-
-    tracker.onUserEvent(mode, USER_ID, emptyMap());
-
-    if (mode != DISABLED) {
-      verify(traceSegment).setTagTop("_dd.appsec.usr.id", expectedUserId);
-      verify(traceSegment).getTagTop("_dd.appsec.user.collection_mode"); // no user event before
-      verify(traceSegment).setTagTop("_dd.appsec.user.collection_mode", mode.fullName());
-      verify(traceSegment).setTagTop("usr.id", expectedUserId);
-      verify(traceSegment).setTagTop("asm.keep", true);
-      verify(traceSegment).setTagTop("_dd.p.ts", ASM);
-      verify(user).apply(isA(RequestContext.class), eq(expectedUserId));
+    @Test
+    void trackLoginFailureEvent() {
+        GlobalTracer.getEventTracker().trackLoginFailureEvent(USER_ID, true, METADATA);
+
+        verify(traceSegment).setTagTop("appsec.events.users.login.failure.usr.id", USER_ID, true);
+        verify(traceSegment).setTagTop("appsec.events.users.login.failure.usr.login", USER_ID, true);
+        verify(traceSegment).setTagTop("appsec.events.users.login.failure.usr.exists", true, true);
+        verify(traceSegment).setTagTop("appsec.events.users.login.failure", METADATA, true);
+        verify(traceSegment).setTagTop("appsec.events.users.login.failure.track", true, true);
+        verify(traceSegment).setTagTop("_dd.appsec.events.users.login.failure.sdk", true, true);
+        verify(traceSegment).setTagTop("asm.keep", true);
+        verify(traceSegment).setTagTop("_dd.p.ts", ASM);
+        verify(loginEvent).apply(isA(RequestContext.class), eq(LOGIN_FAILURE), eq(USER_ID));
+        verify(user).apply(isA(RequestContext.class), eq(USER_ID));
+        verifyNoMoreMockInteractions();
+
+        assertAppSecSdkEvent(LOGIN_FAILURE, V1);
     }
-    verifyNoMoreMockInteractions();
-  }
 
-  @TableTest({
-    "scenario       | mode          ",
-    "identification | IDENTIFICATION",
-    "anonymization  | ANONYMIZATION ",
-    "disabled       | DISABLED      "
-  })
-  void onUserNotFound(UserIdCollectionMode mode) {
-    tracker.onUserNotFound(mode);
-
-    if (mode != DISABLED) {
-      // no SDK event before
-      verify(traceSegment).getTagTop("_dd.appsec.events.users.login.failure.sdk");
-      verify(traceSegment)
-          .setTagTop("_dd.appsec.events.users.login.failure.auto.mode", mode.fullName(), true);
-      verify(traceSegment).setTagTop("appsec.events.users.login.failure.usr.exists", false, true);
-      verify(traceSegment).setTagTop("appsec.events.users.login.failure.track", true, true);
-      verify(traceSegment).setTagTop("asm.keep", true);
-      verify(traceSegment).setTagTop("_dd.p.ts", ASM);
+    @Test
+    void trackCustomEvent() {
+        GlobalTracer.getEventTracker().trackCustomEvent("myevent", METADATA);
+
+        verify(traceSegment).setTagTop("appsec.events.myevent", METADATA, true);
+        verify(traceSegment).setTagTop("appsec.events.myevent.track", true, true);
+        verify(traceSegment).setTagTop("_dd.appsec.events.myevent.sdk", true, true);
+        verify(traceSegment).setTagTop("asm.keep", true);
+        verify(traceSegment).setTagTop("_dd.p.ts", ASM);
+        verifyNoMoreMockInteractions();
+
+        assertAppSecSdkEvent(CUSTOM, V1);
+    }
+
+    @Test
+    void trackLoginSuccessEventV2() {
+        EventTrackerV2.trackUserLoginSuccess(USER_LOGIN, USER_ID, METADATA);
+
+        verify(traceSegment).setTagTop("usr.id", USER_ID);
+        verify(traceSegment).setTagTop("usr", METADATA);
+        verify(traceSegment).setTagTop("appsec.events.users.login.success.usr.id", USER_ID, true);
+        verify(traceSegment).setTagTop("appsec.events.users.login.success.usr", METADATA, true);
+        verify(traceSegment).setTagTop("_dd.appsec.user.collection_mode", "sdk");
+        verify(traceSegment).setTagTop("appsec.events.users.login.success.usr.login", USER_LOGIN, true);
+        verify(traceSegment).setTagTop("appsec.events.users.login.success", METADATA, true);
+        verify(traceSegment).setTagTop("appsec.events.users.login.success.track", true, true);
+        verify(traceSegment).setTagTop("_dd.appsec.events.users.login.success.sdk", true, true);
+        verify(traceSegment, times(2)).setTagTop("asm.keep", true);
+        verify(traceSegment, times(2)).setTagTop("_dd.p.ts", ASM);
+        verify(loginEvent).apply(isA(RequestContext.class), eq(LOGIN_SUCCESS), eq(USER_LOGIN));
+        verify(user).apply(isA(RequestContext.class), eq(USER_ID));
+        verifyNoMoreMockInteractions();
+
+        assertAppSecSdkEvent(LOGIN_SUCCESS, V2);
+    }
+
+    @Test
+    void trackLoginFailureEventV2() {
+        EventTrackerV2.trackUserLoginFailure(USER_LOGIN, true, METADATA);
+
+        verify(traceSegment).setTagTop("appsec.events.users.login.failure.usr.login", USER_LOGIN, true);
+        verify(traceSegment).setTagTop("appsec.events.users.login.failure.usr.exists", true, true);
+        verify(traceSegment).setTagTop("appsec.events.users.login.failure", METADATA, true);
+        verify(traceSegment).setTagTop("appsec.events.users.login.failure.track", true, true);
+        verify(traceSegment).setTagTop("_dd.appsec.events.users.login.failure.sdk", true, true);
+        verify(traceSegment).setTagTop("asm.keep", true);
+        verify(traceSegment).setTagTop("_dd.p.ts", ASM);
+        verify(loginEvent).apply(isA(RequestContext.class), eq(LOGIN_FAILURE), eq(USER_LOGIN));
+        verifyNoMoreMockInteractions();
+
+        assertAppSecSdkEvent(LOGIN_FAILURE, V2);
+    }
+
+    @Test
+    void trackCustomEventV2() {
+        EventTrackerV2.trackCustomEvent("myevent", METADATA);
+
+        verify(traceSegment).setTagTop("appsec.events.myevent", METADATA, true);
+        verify(traceSegment).setTagTop("appsec.events.myevent.track", true, true);
+        verify(traceSegment).setTagTop("_dd.appsec.events.myevent.sdk", true, true);
+        verify(traceSegment).setTagTop("asm.keep", true);
+        verify(traceSegment).setTagTop("_dd.p.ts", ASM);
+        verifyNoMoreMockInteractions();
+
+        assertAppSecSdkEvent(CUSTOM, V2);
+    }
+
+    @Test
+    void trackUser() {
+        setUser(USER_ID, METADATA);
+
+        verify(traceSegment).setTagTop("usr.id", USER_ID);
+        verify(traceSegment).setTagTop("usr", METADATA);
+        verify(traceSegment).setTagTop("_dd.appsec.user.collection_mode", SDK.fullName());
+        verify(traceSegment).setTagTop("asm.keep", true);
+        verify(traceSegment).setTagTop("_dd.p.ts", ASM);
+        verify(user).apply(isA(RequestContext.class), eq(USER_ID));
+        verifyNoMoreMockInteractions();
+    }
+
+    @Test
+    void wrongEventArgumentValidation() {
+        EventTracker eventTracker = GlobalTracer.getEventTracker();
+
+        assertThrows(IllegalArgumentException.class, () -> eventTracker.trackLoginSuccessEvent(null, null));
+        assertThrows(IllegalArgumentException.class, () -> eventTracker.trackLoginFailureEvent(null, false, null));
+        assertThrows(IllegalArgumentException.class, () -> eventTracker.trackCustomEvent(null, null));
+        assertThrows(IllegalArgumentException.class, () -> eventTracker.trackLoginSuccessEvent("", null));
+        assertThrows(IllegalArgumentException.class, () -> eventTracker.trackLoginFailureEvent("", false, null));
+        assertThrows(IllegalArgumentException.class, () -> eventTracker.trackCustomEvent("", null));
+        assertThrows(IllegalArgumentException.class, () -> setUser(null, null));
+    }
+
+    @TableTest({
+      "scenario       | mode          ",
+      "identification | IDENTIFICATION",
+      "anonymization  | ANONYMIZATION ",
+      "disabled       | DISABLED      "
+    })
+    void onSignup(UserIdCollectionMode mode) {
+        String expectedUserLogin = mode == ANONYMIZATION ? ANONYMIZED_USER_LOGIN : USER_LOGIN;
+
+        tracker.onSignupEvent(mode, USER_LOGIN, METADATA);
+
+        if (mode != DISABLED) {
+            verify(traceSegment).getTagTop("_dd.appsec.events.users.signup.sdk"); // no SDK event before
+            verify(traceSegment).setTagTop("_dd.appsec.usr.login", expectedUserLogin);
+            verify(traceSegment).setTagTop("_dd.appsec.events.users.signup.auto.mode", mode.fullName(), true);
+            verify(traceSegment).setTagTop("appsec.events.users.signup.usr.login", expectedUserLogin, true);
+            verify(traceSegment).setTagTop("appsec.events.users.signup", METADATA, true);
+            verify(traceSegment).setTagTop("appsec.events.users.signup.track", true, true);
+            verify(traceSegment).setTagTop("asm.keep", true);
+            verify(traceSegment).setTagTop("_dd.p.ts", ASM);
+            verify(loginEvent).apply(isA(RequestContext.class), eq(SIGN_UP), eq(expectedUserLogin));
+        }
+        verifyNoMoreMockInteractions();
+    }
+
+    @TableTest({
+      "scenario       | mode          ",
+      "identification | IDENTIFICATION",
+      "anonymization  | ANONYMIZATION ",
+      "disabled       | DISABLED      "
+    })
+    void onLoginSuccess(UserIdCollectionMode mode) {
+        String expectedUserLogin = mode == ANONYMIZATION ? ANONYMIZED_USER_LOGIN : USER_LOGIN;
+
+        tracker.onLoginSuccessEvent(mode, USER_LOGIN, METADATA);
+
+        if (mode != DISABLED) {
+            // no SDK event before
+            verify(traceSegment).getTagTop("_dd.appsec.events.users.login.success.sdk");
+            verify(traceSegment).setTagTop("_dd.appsec.usr.login", expectedUserLogin);
+            verify(traceSegment).setTagTop("_dd.appsec.events.users.login.success.auto.mode", mode.fullName(), true);
+            verify(traceSegment).setTagTop("appsec.events.users.login.success.usr.login", expectedUserLogin, true);
+            verify(traceSegment).setTagTop("appsec.events.users.login.success", METADATA, true);
+            verify(traceSegment).setTagTop("appsec.events.users.login.success.track", true, true);
+            verify(traceSegment).setTagTop("asm.keep", true);
+            verify(traceSegment).setTagTop("_dd.p.ts", ASM);
+            verify(loginEvent).apply(isA(RequestContext.class), eq(LOGIN_SUCCESS), eq(expectedUserLogin));
+        }
+        verifyNoMoreMockInteractions();
+    }
+
+    @TableTest({
+      "scenario       | mode          ",
+      "identification | IDENTIFICATION",
+      "anonymization  | ANONYMIZATION ",
+      "disabled       | DISABLED      "
+    })
+    void onLoginFailed(UserIdCollectionMode mode) {
+        String expectedUserLogin = mode == ANONYMIZATION ? ANONYMIZED_USER_LOGIN : USER_LOGIN;
+
+        tracker.onLoginFailureEvent(mode, USER_LOGIN, true, METADATA);
+
+        if (mode != DISABLED) {
+            // no SDK event before
+            verify(traceSegment).getTagTop("_dd.appsec.events.users.login.failure.sdk");
+            verify(traceSegment).setTagTop("_dd.appsec.usr.login", expectedUserLogin);
+            verify(traceSegment).setTagTop("_dd.appsec.events.users.login.failure.auto.mode", mode.fullName(), true);
+            verify(traceSegment).setTagTop("appsec.events.users.login.failure.usr.login", expectedUserLogin, true);
+            verify(traceSegment).setTagTop("appsec.events.users.login.failure", METADATA, true);
+            verify(traceSegment).setTagTop("appsec.events.users.login.failure.usr.exists", true, true);
+            verify(traceSegment).setTagTop("appsec.events.users.login.failure.track", true, true);
+            verify(traceSegment).setTagTop("asm.keep", true);
+            verify(traceSegment).setTagTop("_dd.p.ts", ASM);
+            verify(loginEvent).apply(isA(RequestContext.class), eq(LOGIN_FAILURE), eq(expectedUserLogin));
+        }
+        verifyNoMoreMockInteractions();
     }
-    verifyNoMoreMockInteractions();
-  }
 
-  // spotless:off
+    @TableTest({
+      "scenario       | mode          ",
+      "identification | IDENTIFICATION",
+      "anonymization  | ANONYMIZATION ",
+      "disabled       | DISABLED      "
+    })
+    void onUserEvent(UserIdCollectionMode mode) {
+        String expectedUserId = mode == ANONYMIZATION ? ANONYMIZED_USER_ID : USER_ID;
+
+        tracker.onUserEvent(mode, USER_ID, emptyMap());
+
+        if (mode != DISABLED) {
+            verify(traceSegment).setTagTop("_dd.appsec.usr.id", expectedUserId);
+            verify(traceSegment).getTagTop("_dd.appsec.user.collection_mode"); // no user event before
+            verify(traceSegment).setTagTop("_dd.appsec.user.collection_mode", mode.fullName());
+            verify(traceSegment).setTagTop("usr.id", expectedUserId);
+            verify(traceSegment).setTagTop("asm.keep", true);
+            verify(traceSegment).setTagTop("_dd.p.ts", ASM);
+            verify(user).apply(isA(RequestContext.class), eq(expectedUserId));
+        }
+        verifyNoMoreMockInteractions();
+    }
+
+    @TableTest({
+      "scenario       | mode          ",
+      "identification | IDENTIFICATION",
+      "anonymization  | ANONYMIZATION ",
+      "disabled       | DISABLED      "
+    })
+    void onUserNotFound(UserIdCollectionMode mode) {
+        tracker.onUserNotFound(mode);
+
+        if (mode != DISABLED) {
+            // no SDK event before
+            verify(traceSegment).getTagTop("_dd.appsec.events.users.login.failure.sdk");
+            verify(traceSegment).setTagTop("_dd.appsec.events.users.login.failure.auto.mode", mode.fullName(), true);
+            verify(traceSegment).setTagTop("appsec.events.users.login.failure.usr.exists", false, true);
+            verify(traceSegment).setTagTop("appsec.events.users.login.failure.track", true, true);
+            verify(traceSegment).setTagTop("asm.keep", true);
+            verify(traceSegment).setTagTop("_dd.p.ts", ASM);
+        }
+        verifyNoMoreMockInteractions();
+    }
+
+    // spotless:off
   @TableTest({
     "scenario            | appsec | collectionMode | trackingMode | result",
     // disabled states
@@ -438,159 +426,155 @@ void onUserNotFound(UserIdCollectionMode mode) {
     "on/anon/disabled    | true   | anon           | disabled     | true  "
   })
   // spotless:on
-  void isEnabled(boolean appsec, String collectionMode, String trackingMode, boolean result) {
-    ActiveSubsystems.APPSEC_ACTIVE = appsec;
-    UserIdCollectionMode mode = UserIdCollectionMode.fromString(collectionMode, trackingMode);
-
-    assertEquals(result, tracker.isEnabled(mode));
-  }
-
-  @Test
-  void blockingOnALogin() {
-    Flow.Action.RequestBlockingAction action =
-        new Flow.Action.RequestBlockingAction(403, BlockingContentType.AUTO);
-    when(loginEvent.apply(isA(RequestContext.class), eq(LOGIN_SUCCESS), eq(USER_LOGIN)))
-        .thenReturn(new ActionFlow<>(action));
-
-    assertThrows(
-        BlockingException.class,
-        () -> tracker.onLoginSuccessEvent(SDK, USER_LOGIN, USER_ID, METADATA));
-  }
-
-  @Test
-  void shouldNotFailOnNullCallback() {
-    when(provider.getCallback(EVENTS.user())).thenReturn(null);
-
-    assertDoesNotThrow(() -> tracker.onUserEvent(IDENTIFICATION, "test-user", emptyMap()));
-  }
-
-  @Test
-  void onUserEventDoesNotOverwriteSdk() {
-    when(traceSegment.getTagTop("_dd.appsec.user.collection_mode")).thenReturn(SDK.fullName());
-
-    tracker.onUserEvent(IDENTIFICATION, USER_ID, emptyMap());
-
-    // SDK data remains untouched
-    verify(traceSegment).getTagTop("_dd.appsec.user.collection_mode");
-    verify(traceSegment).setTagTop("_dd.appsec.usr.id", USER_ID);
-    verifyNoMoreMockInteractions();
-  }
-
-  @Test
-  void onLoginSuccessDoesNotOverwriteSdk() {
-    when(traceSegment.getTagTop("_dd.appsec.events.users.login.success.sdk")).thenReturn(true);
-
-    tracker.onLoginSuccessEvent(IDENTIFICATION, USER_LOGIN, null, emptyMap());
-
-    verify(traceSegment).getTagTop("_dd.appsec.events.users.login.success.sdk");
-    verify(traceSegment).setTagTop("_dd.appsec.usr.login", USER_LOGIN);
-    verify(traceSegment)
-        .setTagTop(
-            "_dd.appsec.events.users.login.success.auto.mode", IDENTIFICATION.fullName(), true);
-    verifyNoMoreMockInteractions();
-  }
-
-  @Test
-  void onLoginFailureDoesNotOverwriteSdk() {
-    when(traceSegment.getTagTop("_dd.appsec.events.users.login.failure.sdk")).thenReturn(true);
-
-    tracker.onLoginFailureEvent(IDENTIFICATION, USER_LOGIN, null, emptyMap());
-
-    verify(traceSegment).getTagTop("_dd.appsec.events.users.login.failure.sdk");
-    verify(traceSegment).setTagTop("_dd.appsec.usr.login", USER_LOGIN);
-    verify(traceSegment)
-        .setTagTop(
-            "_dd.appsec.events.users.login.failure.auto.mode", IDENTIFICATION.fullName(), true);
-    verifyNoMoreMockInteractions();
-  }
-
-  @Test
-  void onUserNotFoundDoesNotOverwriteSdk() {
-    when(traceSegment.getTagTop("_dd.appsec.events.users.login.failure.sdk")).thenReturn(true);
-
-    tracker.onUserNotFound(IDENTIFICATION);
-
-    verify(traceSegment).getTagTop("_dd.appsec.events.users.login.failure.sdk");
-    verify(traceSegment)
-        .setTagTop(
-            "_dd.appsec.events.users.login.failure.auto.mode", IDENTIFICATION.fullName(), true);
-    verifyNoMoreMockInteractions();
-  }
-
-  private void verifyNoMoreMockInteractions() {
-    verifyNoMoreInteractions(traceSegment, requestContext, user, loginEvent);
-    verifyNoMoreInteractions(ignoreStubs(span, provider, tracer));
-  }
-
-  private static Map<String, String> metadata() {
-    Map<String, String> metadata = new HashMap<>();
-    metadata.put("key1", "value1");
-    metadata.put("key2", "value2");
-    return metadata;
-  }
-
-  private static void assertAppSecSdkEvent(LoginEvent event, LoginVersion version) {
-    List<WafMetric> sdkEvents = drainSdkEvents();
-    assertEquals(1, sdkEvents.size());
-    WafMetric metric = sdkEvents.get(0);
-    assertEquals("appsec", metric.namespace);
-    assertEquals("count", metric.type);
-    assertEquals(1L, metric.value.longValue());
-    assertEquals(
-        asList("event_type:" + event.getTag(), "sdk_version:" + version.getTag()), metric.tags);
-  }
-
-  private static List<WafMetric> drainSdkEvents() {
-    WafMetricCollector collector = WafMetricCollector.get();
-    collector.prepareMetrics();
-    List<WafMetric> sdkEvents = new ArrayList<>();
-    for (WafMetric metric : collector.drain()) {
-      if ("sdk.event".equals(metric.metricName)) {
-        sdkEvents.add(metric);
-      }
+    void isEnabled(boolean appsec, String collectionMode, String trackingMode, boolean result) {
+        ActiveSubsystems.APPSEC_ACTIVE = appsec;
+        UserIdCollectionMode mode = UserIdCollectionMode.fromString(collectionMode, trackingMode);
+
+        assertEquals(result, tracker.isEnabled(mode));
+    }
+
+    @Test
+    void blockingOnALogin() {
+        Flow.Action.RequestBlockingAction action = new Flow.Action.RequestBlockingAction(403, BlockingContentType.AUTO);
+        when(loginEvent.apply(isA(RequestContext.class), eq(LOGIN_SUCCESS), eq(USER_LOGIN)))
+                .thenReturn(new ActionFlow<>(action));
+
+        assertThrows(BlockingException.class, () -> tracker.onLoginSuccessEvent(SDK, USER_LOGIN, USER_ID, METADATA));
     }
-    return sdkEvents;
-  }
 
-  /**
-   * Exposes the tracer used by the tracker and widens {@code isEnabled} so the test package can
-   * call it; both are {@code protected} on {@link AppSecEventTracker}.
-   */
-  private static class TestAppSecEventTracker extends AppSecEventTracker {
+    @Test
+    void shouldNotFailOnNullCallback() {
+        when(provider.getCallback(EVENTS.user())).thenReturn(null);
 
-    private final TracerAPI tracer;
+        assertDoesNotThrow(() -> tracker.onUserEvent(IDENTIFICATION, "test-user", emptyMap()));
+    }
+
+    @Test
+    void onUserEventDoesNotOverwriteSdk() {
+        when(traceSegment.getTagTop("_dd.appsec.user.collection_mode")).thenReturn(SDK.fullName());
 
-    TestAppSecEventTracker(TracerAPI tracer) {
-      this.tracer = tracer;
+        tracker.onUserEvent(IDENTIFICATION, USER_ID, emptyMap());
+
+        // SDK data remains untouched
+        verify(traceSegment).getTagTop("_dd.appsec.user.collection_mode");
+        verify(traceSegment).setTagTop("_dd.appsec.usr.id", USER_ID);
+        verifyNoMoreMockInteractions();
     }
 
-    @Override
-    protected TracerAPI tracer() {
-      return tracer;
+    @Test
+    void onLoginSuccessDoesNotOverwriteSdk() {
+        when(traceSegment.getTagTop("_dd.appsec.events.users.login.success.sdk"))
+                .thenReturn(true);
+
+        tracker.onLoginSuccessEvent(IDENTIFICATION, USER_LOGIN, null, emptyMap());
+
+        verify(traceSegment).getTagTop("_dd.appsec.events.users.login.success.sdk");
+        verify(traceSegment).setTagTop("_dd.appsec.usr.login", USER_LOGIN);
+        verify(traceSegment)
+                .setTagTop("_dd.appsec.events.users.login.success.auto.mode", IDENTIFICATION.fullName(), true);
+        verifyNoMoreMockInteractions();
     }
 
-    @Override
-    public boolean isEnabled(UserIdCollectionMode mode) {
-      return super.isEnabled(mode);
+    @Test
+    void onLoginFailureDoesNotOverwriteSdk() {
+        when(traceSegment.getTagTop("_dd.appsec.events.users.login.failure.sdk"))
+                .thenReturn(true);
+
+        tracker.onLoginFailureEvent(IDENTIFICATION, USER_LOGIN, null, emptyMap());
+
+        verify(traceSegment).getTagTop("_dd.appsec.events.users.login.failure.sdk");
+        verify(traceSegment).setTagTop("_dd.appsec.usr.login", USER_LOGIN);
+        verify(traceSegment)
+                .setTagTop("_dd.appsec.events.users.login.failure.auto.mode", IDENTIFICATION.fullName(), true);
+        verifyNoMoreMockInteractions();
     }
-  }
 
-  private static class ActionFlow<T> implements Flow<T> {
+    @Test
+    void onUserNotFoundDoesNotOverwriteSdk() {
+        when(traceSegment.getTagTop("_dd.appsec.events.users.login.failure.sdk"))
+                .thenReturn(true);
 
-    private final Action action;
+        tracker.onUserNotFound(IDENTIFICATION);
 
-    ActionFlow(Action action) {
-      this.action = action;
+        verify(traceSegment).getTagTop("_dd.appsec.events.users.login.failure.sdk");
+        verify(traceSegment)
+                .setTagTop("_dd.appsec.events.users.login.failure.auto.mode", IDENTIFICATION.fullName(), true);
+        verifyNoMoreMockInteractions();
     }
 
-    @Override
-    public Action getAction() {
-      return action;
+    private void verifyNoMoreMockInteractions() {
+        verifyNoMoreInteractions(traceSegment, requestContext, user, loginEvent);
+        verifyNoMoreInteractions(ignoreStubs(span, provider, tracer));
     }
 
-    @Override
-    public T getResult() {
-      return null;
+    private static Map<String, String> metadata() {
+        Map<String, String> metadata = new HashMap<>();
+        metadata.put("key1", "value1");
+        metadata.put("key2", "value2");
+        return metadata;
+    }
+
+    private static void assertAppSecSdkEvent(LoginEvent event, LoginVersion version) {
+        List<WafMetric> sdkEvents = drainSdkEvents();
+        assertEquals(1, sdkEvents.size());
+        WafMetric metric = sdkEvents.get(0);
+        assertEquals("appsec", metric.namespace);
+        assertEquals("count", metric.type);
+        assertEquals(1L, metric.value.longValue());
+        assertEquals(asList("event_type:" + event.getTag(), "sdk_version:" + version.getTag()), metric.tags);
+    }
+
+    private static List<WafMetric> drainSdkEvents() {
+        WafMetricCollector collector = WafMetricCollector.get();
+        collector.prepareMetrics();
+        List<WafMetric> sdkEvents = new ArrayList<>();
+        for (WafMetric metric : collector.drain()) {
+            if ("sdk.event".equals(metric.metricName)) {
+                sdkEvents.add(metric);
+            }
+        }
+        return sdkEvents;
+    }
+
+    /**
+     * Exposes the tracer used by the tracker and widens {@code isEnabled} so the test package can
+     * call it; both are {@code protected} on {@link AppSecEventTracker}.
+     */
+    private static class TestAppSecEventTracker extends AppSecEventTracker {
+
+        private final TracerAPI tracer;
+
+        TestAppSecEventTracker(TracerAPI tracer) {
+            this.tracer = tracer;
+        }
+
+        @Override
+        protected TracerAPI tracer() {
+            return tracer;
+        }
+
+        @Override
+        public boolean isEnabled(UserIdCollectionMode mode) {
+            return super.isEnabled(mode);
+        }
+    }
+
+    private static class ActionFlow<T> implements Flow<T> {
+
+        private final Action action;
+
+        ActionFlow(Action action) {
+            this.action = action;
+        }
+
+        @Override
+        public Action getAction() {
+            return action;
+        }
+
+        @Override
+        public T getResult() {
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/user/EventTrackerAppSecDisabledForkedTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/user/EventTrackerAppSecDisabledForkedTest.java
index 93a88094db4..8137b76dbc4 100644
--- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/user/EventTrackerAppSecDisabledForkedTest.java
+++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/user/EventTrackerAppSecDisabledForkedTest.java
@@ -28,110 +28,110 @@
 @WithConfig(key = APPSEC_ENABLED, value = "false")
 class EventTrackerAppSecDisabledForkedTest extends DDJavaSpecification {
 
-  private static final Map<String, String> METADATA = metadata();
+    private static final Map<String, String> METADATA = metadata();
 
-  private TraceSegment traceSegment;
-  private AppSecEventTracker tracker;
+    private TraceSegment traceSegment;
+    private AppSecEventTracker tracker;
 
-  @BeforeAll
-  static void disableAppSec() {
-    ActiveSubsystems.APPSEC_ACTIVE = false;
-  }
+    @BeforeAll
+    static void disableAppSec() {
+        ActiveSubsystems.APPSEC_ACTIVE = false;
+    }
 
-  @BeforeEach
-  void setup() {
-    tracker = new AppSecEventTracker();
-    GlobalTracer.setEventTracker(tracker);
-    EventTrackerV2.setEventTrackerService(tracker.v2EventTrackerService());
-    User.setUserService(tracker);
-    traceSegment = mock(TraceSegment.class);
-    TracerAPI tracer = mock(TracerAPI.class);
-    when(tracer.getTraceSegment()).thenReturn(traceSegment);
-    when(tracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(null);
-    AgentTracer.forceRegister(tracer);
-  }
+    @BeforeEach
+    void setup() {
+        tracker = new AppSecEventTracker();
+        GlobalTracer.setEventTracker(tracker);
+        EventTrackerV2.setEventTrackerService(tracker.v2EventTrackerService());
+        User.setUserService(tracker);
+        traceSegment = mock(TraceSegment.class);
+        TracerAPI tracer = mock(TracerAPI.class);
+        when(tracer.getTraceSegment()).thenReturn(traceSegment);
+        when(tracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(null);
+        AgentTracer.forceRegister(tracer);
+    }
 
-  @Test
-  void trackLoginSuccessEvent() {
-    GlobalTracer.getEventTracker().trackLoginSuccessEvent("user", METADATA);
+    @Test
+    void trackLoginSuccessEvent() {
+        GlobalTracer.getEventTracker().trackLoginSuccessEvent("user", METADATA);
 
-    verify(traceSegment).setTagTop("_dd.appsec.events.users.login.success.sdk", true, true);
-  }
+        verify(traceSegment).setTagTop("_dd.appsec.events.users.login.success.sdk", true, true);
+    }
 
-  @Test
-  void trackLoginFailureEvent() {
-    GlobalTracer.getEventTracker().trackLoginFailureEvent("user", true, METADATA);
+    @Test
+    void trackLoginFailureEvent() {
+        GlobalTracer.getEventTracker().trackLoginFailureEvent("user", true, METADATA);
 
-    verify(traceSegment).setTagTop("_dd.appsec.events.users.login.failure.sdk", true, true);
-  }
+        verify(traceSegment).setTagTop("_dd.appsec.events.users.login.failure.sdk", true, true);
+    }
 
-  @Test
-  void trackCustomEvent() {
-    GlobalTracer.getEventTracker().trackCustomEvent("myevent", METADATA);
+    @Test
+    void trackCustomEvent() {
+        GlobalTracer.getEventTracker().trackCustomEvent("myevent", METADATA);
 
-    verify(traceSegment).setTagTop("_dd.appsec.events.myevent.sdk", true, true);
-  }
+        verify(traceSegment).setTagTop("_dd.appsec.events.myevent.sdk", true, true);
+    }
 
-  @Test
-  void trackLoginSuccessEventV2() {
-    EventTrackerV2.trackUserLoginSuccess("user", "id", METADATA);
+    @Test
+    void trackLoginSuccessEventV2() {
+        EventTrackerV2.trackUserLoginSuccess("user", "id", METADATA);
 
-    verify(traceSegment).setTagTop("_dd.appsec.events.users.login.success.sdk", true, true);
-  }
+        verify(traceSegment).setTagTop("_dd.appsec.events.users.login.success.sdk", true, true);
+    }
 
-  @Test
-  void trackLoginFailureEventV2() {
-    EventTrackerV2.trackUserLoginFailure("user", true, METADATA);
+    @Test
+    void trackLoginFailureEventV2() {
+        EventTrackerV2.trackUserLoginFailure("user", true, METADATA);
 
-    verify(traceSegment).setTagTop("_dd.appsec.events.users.login.failure.sdk", true, true);
-  }
+        verify(traceSegment).setTagTop("_dd.appsec.events.users.login.failure.sdk", true, true);
+    }
 
-  @Test
-  void trackCustomEventV2() {
-    EventTrackerV2.trackCustomEvent("myevent", METADATA);
+    @Test
+    void trackCustomEventV2() {
+        EventTrackerV2.trackCustomEvent("myevent", METADATA);
 
-    verify(traceSegment).setTagTop("_dd.appsec.events.myevent.sdk", true, true);
-  }
+        verify(traceSegment).setTagTop("_dd.appsec.events.myevent.sdk", true, true);
+    }
 
-  @Test
-  void onSignup() {
-    tracker.onSignupEvent(IDENTIFICATION, "user", METADATA);
+    @Test
+    void onSignup() {
+        tracker.onSignupEvent(IDENTIFICATION, "user", METADATA);
 
-    verifyNoInteractions(traceSegment);
-  }
+        verifyNoInteractions(traceSegment);
+    }
 
-  @Test
-  void onLoginSuccess() {
-    tracker.onLoginSuccessEvent(IDENTIFICATION, "user", METADATA);
+    @Test
+    void onLoginSuccess() {
+        tracker.onLoginSuccessEvent(IDENTIFICATION, "user", METADATA);
 
-    verifyNoInteractions(traceSegment);
-  }
+        verifyNoInteractions(traceSegment);
+    }
 
-  @Test
-  void onLoginFailed() {
-    tracker.onLoginFailureEvent(IDENTIFICATION, "user", true, METADATA);
+    @Test
+    void onLoginFailed() {
+        tracker.onLoginFailureEvent(IDENTIFICATION, "user", true, METADATA);
 
-    verifyNoInteractions(traceSegment);
-  }
+        verifyNoInteractions(traceSegment);
+    }
 
-  @Test
-  void onUserEvent() {
-    tracker.onUserEvent(IDENTIFICATION, "user");
+    @Test
+    void onUserEvent() {
+        tracker.onUserEvent(IDENTIFICATION, "user");
 
-    verifyNoInteractions(traceSegment);
-  }
+        verifyNoInteractions(traceSegment);
+    }
 
-  @Test
-  void onUserNotFound() {
-    tracker.onUserNotFound(IDENTIFICATION);
+    @Test
+    void onUserNotFound() {
+        tracker.onUserNotFound(IDENTIFICATION);
 
-    verifyNoInteractions(traceSegment);
-  }
+        verifyNoInteractions(traceSegment);
+    }
 
-  private static Map<String, String> metadata() {
-    Map<String, String> metadata = new HashMap<>();
-    metadata.put("key1", "value1");
-    metadata.put("key2", "value2");
-    return metadata;
-  }
+    private static Map<String, String> metadata() {
+        Map<String, String> metadata = new HashMap<>();
+        metadata.put("key1", "value1");
+        metadata.put("key2", "value2");
+        return metadata;
+    }
 }
diff --git a/dd-java-agent/appsec/src/test/java/com/github/junrar/LocalFolderExtractor.java b/dd-java-agent/appsec/src/test/java/com/github/junrar/LocalFolderExtractor.java
index c518e200a0e..ec582e7ecde 100644
--- a/dd-java-agent/appsec/src/test/java/com/github/junrar/LocalFolderExtractor.java
+++ b/dd-java-agent/appsec/src/test/java/com/github/junrar/LocalFolderExtractor.java
@@ -7,14 +7,14 @@
 // Preserves the constructor and method signatures used by ScaRealLibraryBytecodeTest.
 class LocalFolderExtractor {
 
-  @SuppressWarnings("unused")
-  private final File destinationFolder;
+    @SuppressWarnings("unused")
+    private final File destinationFolder;
 
-  LocalFolderExtractor(File destinationFolder) {
-    this.destinationFolder = destinationFolder;
-  }
+    LocalFolderExtractor(File destinationFolder) {
+        this.destinationFolder = destinationFolder;
+    }
 
-  void createDirectory(FileHeader header) {
-    // stub — the test verifies that the injected callback fires at method entry before this body
-  }
+    void createDirectory(FileHeader header) {
+        // stub — the test verifies that the injected callback fires at method entry before this body
+    }
 }
diff --git a/dd-java-agent/appsec/src/test/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java b/dd-java-agent/appsec/src/test/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
index 2431b913796..eff235dc0de 100644
--- a/dd-java-agent/appsec/src/test/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
+++ b/dd-java-agent/appsec/src/test/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
@@ -5,5 +5,5 @@
 // Preserves the method signature used by ScaRealLibraryBytecodeTest.
 public class ChunkedInputFilter {
 
-  public void parseChunkHeader() {}
+    public void parseChunkHeader() {}
 }
diff --git a/dd-java-agent/appsec/src/test/java/zserio/runtime/array/Array.java b/dd-java-agent/appsec/src/test/java/zserio/runtime/array/Array.java
index 25896960568..3459c7627ee 100644
--- a/dd-java-agent/appsec/src/test/java/zserio/runtime/array/Array.java
+++ b/dd-java-agent/appsec/src/test/java/zserio/runtime/array/Array.java
@@ -4,5 +4,5 @@
 // Preserves the method signature used by ScaRealLibraryBytecodeTest.
 public class Array {
 
-  public void read() {}
+    public void read() {}
 }
diff --git a/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/datadog/perftest/Worker.java b/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/datadog/perftest/Worker.java
index aa7c86d29ac..96d59f27b63 100644
--- a/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/datadog/perftest/Worker.java
+++ b/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/datadog/perftest/Worker.java
@@ -7,19 +7,19 @@
 
 public class Worker {
 
-  @Trace
-  /** Simulate work for the give number of milliseconds. */
-  public static void doWork(final long workTimeMS) {
-    final Span span = GlobalTracer.get().activeSpan();
-    if (span != null) {
-      span.setTag("work-time", workTimeMS);
-      span.setTag("info", "interesting stuff");
-      span.setTag("additionalInfo", "interesting stuff");
-    }
+    @Trace
+    /** Simulate work for the give number of milliseconds. */
+    public static void doWork(final long workTimeMS) {
+        final Span span = GlobalTracer.get().activeSpan();
+        if (span != null) {
+            span.setTag("work-time", workTimeMS);
+            span.setTag("info", "interesting stuff");
+            span.setTag("additionalInfo", "interesting stuff");
+        }
 
-    final long doneTimestamp = System.nanoTime() + TimeUnit.MILLISECONDS.toNanos(workTimeMS);
-    while (System.nanoTime() < doneTimestamp) {
-      // busy-wait to simulate work
+        final long doneTimestamp = System.nanoTime() + TimeUnit.MILLISECONDS.toNanos(workTimeMS);
+        while (System.nanoTime() < doneTimestamp) {
+            // busy-wait to simulate work
+        }
     }
-  }
 }
diff --git a/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/datadog/perftest/jetty/JettyPerftest.java b/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/datadog/perftest/jetty/JettyPerftest.java
index 7af06019df8..5e4b5151778 100644
--- a/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/datadog/perftest/jetty/JettyPerftest.java
+++ b/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/datadog/perftest/jetty/JettyPerftest.java
@@ -14,59 +14,57 @@
 import org.eclipse.jetty.servlet.ServletContextHandler;
 
 public class JettyPerftest {
-  private static final int PORT = 8080;
-  private static final String PATH = "/work";
-  private static final Server jettyServer = new Server(PORT);
-  private static final ServletContextHandler servletContext = new ServletContextHandler();
+    private static final int PORT = 8080;
+    private static final String PATH = "/work";
+    private static final Server jettyServer = new Server(PORT);
+    private static final ServletContextHandler servletContext = new ServletContextHandler();
 
-  public static void main(final String[] args) throws Exception {
-    servletContext.addServlet(PerfServlet.class, PATH);
-    jettyServer.setHandler(servletContext);
-    jettyServer.start();
+    public static void main(final String[] args) throws Exception {
+        servletContext.addServlet(PerfServlet.class, PATH);
+        jettyServer.setHandler(servletContext);
+        jettyServer.start();
 
-    Runtime.getRuntime()
-        .addShutdownHook(
-            new Thread() {
-              @Override
-              public void run() {
+        Runtime.getRuntime().addShutdownHook(new Thread() {
+            @Override
+            public void run() {
                 try {
-                  jettyServer.stop();
-                  jettyServer.destroy();
+                    jettyServer.stop();
+                    jettyServer.destroy();
                 } catch (final Exception e) {
-                  throw new IllegalStateException(e);
+                    throw new IllegalStateException(e);
                 }
-              }
-            });
-  }
-
-  @WebServlet
-  public static class PerfServlet extends HttpServlet {
-    @Override
-    protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
-        throws ServletException, IOException {
-      if (request.getParameter("error") != null) {
-        throw new RuntimeException("some sync error");
-      }
-      final String workVal = request.getParameter("workTimeMS");
-      long workTimeMS = 0L;
-      if (null != workVal) {
-        workTimeMS = Long.parseLong(workVal);
-      }
-      scheduleWork(workTimeMS);
-      response.getWriter().print("Did " + workTimeMS + "ms of work.");
+            }
+        });
     }
 
-    @Trace
-    private void scheduleWork(final long workTimeMS) {
-      final Span span = GlobalTracer.get().activeSpan();
-      if (span != null) {
-        span.setTag("work-time", workTimeMS);
-        span.setTag("info", "interesting stuff");
-        span.setTag("additionalInfo", "interesting stuff");
-      }
-      if (workTimeMS > 0) {
-        Worker.doWork(workTimeMS);
-      }
+    @WebServlet
+    public static class PerfServlet extends HttpServlet {
+        @Override
+        protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
+                throws ServletException, IOException {
+            if (request.getParameter("error") != null) {
+                throw new RuntimeException("some sync error");
+            }
+            final String workVal = request.getParameter("workTimeMS");
+            long workTimeMS = 0L;
+            if (null != workVal) {
+                workTimeMS = Long.parseLong(workVal);
+            }
+            scheduleWork(workTimeMS);
+            response.getWriter().print("Did " + workTimeMS + "ms of work.");
+        }
+
+        @Trace
+        private void scheduleWork(final long workTimeMS) {
+            final Span span = GlobalTracer.get().activeSpan();
+            if (span != null) {
+                span.setTag("work-time", workTimeMS);
+                span.setTag("info", "interesting stuff");
+                span.setTag("additionalInfo", "interesting stuff");
+            }
+            if (workTimeMS > 0) {
+                Worker.doWork(workTimeMS);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/ClassRetransformingBenchmark.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/ClassRetransformingBenchmark.java
index e8c8986a458..61f4c6ac252 100644
--- a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/ClassRetransformingBenchmark.java
+++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/ClassRetransformingBenchmark.java
@@ -12,27 +12,24 @@
 
 public class ClassRetransformingBenchmark {
 
-  @State(Scope.Benchmark)
-  public static class BenchmarkState {
-    private final Instrumentation inst = ByteBuddyAgent.install();
-  }
+    @State(Scope.Benchmark)
+    public static class BenchmarkState {
+        private final Instrumentation inst = ByteBuddyAgent.install();
+    }
 
-  @Benchmark
-  public void testUntracedRetransform(final BenchmarkState state)
-      throws UnmodifiableClassException {
-    state.inst.retransformClasses(UntracedClass.class);
-  }
+    @Benchmark
+    public void testUntracedRetransform(final BenchmarkState state) throws UnmodifiableClassException {
+        state.inst.retransformClasses(UntracedClass.class);
+    }
 
-  @Benchmark
-  public void testTracedRetransform(final BenchmarkState state) throws UnmodifiableClassException {
-    state.inst.retransformClasses(TracedClass.class);
-  }
+    @Benchmark
+    public void testTracedRetransform(final BenchmarkState state) throws UnmodifiableClassException {
+        state.inst.retransformClasses(TracedClass.class);
+    }
 
-  @Fork(jvmArgsAppend = "-javaagent:/path/to/dd-java-agent-master.jar")
-  public static class WithAgentMaster extends ClassRetransformingBenchmark {}
+    @Fork(jvmArgsAppend = "-javaagent:/path/to/dd-java-agent-master.jar")
+    public static class WithAgentMaster extends ClassRetransformingBenchmark {}
 
-  @Fork(
-      jvmArgsAppend =
-          "-javaagent:/path/to/dd-trace-java/dd-java-agent/build/libs/dd-java-agent.jar")
-  public static class WithAgent extends ClassRetransformingBenchmark {}
+    @Fork(jvmArgsAppend = "-javaagent:/path/to/dd-trace-java/dd-java-agent/build/libs/dd-java-agent.jar")
+    public static class WithAgent extends ClassRetransformingBenchmark {}
 }
diff --git a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/A.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/A.java
index 5db2f9007fb..fdcf34ce8ea 100644
--- a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/A.java
+++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/A.java
@@ -1,5 +1,5 @@
 package datadog.benchmark.classes;
 
 public interface A {
-  void a();
+    void a();
 }
diff --git a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/B.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/B.java
index 6e45a514812..2894e29078c 100644
--- a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/B.java
+++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/B.java
@@ -1,5 +1,5 @@
 package datadog.benchmark.classes;
 
 public interface B extends A {
-  void b();
+    void b();
 }
diff --git a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/C.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/C.java
index b7a256697c1..c97efbef81a 100644
--- a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/C.java
+++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/C.java
@@ -1,5 +1,5 @@
 package datadog.benchmark.classes;
 
 public interface C extends A, B {
-  void c();
+    void c();
 }
diff --git a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/D.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/D.java
index a52a49aa62e..46990bcc8a2 100644
--- a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/D.java
+++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/D.java
@@ -1,5 +1,5 @@
 package datadog.benchmark.classes;
 
 public interface D extends A, B, C {
-  void d();
+    void d();
 }
diff --git a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/E.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/E.java
index 9846b8802c0..1833427ed57 100644
--- a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/E.java
+++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/E.java
@@ -1,5 +1,5 @@
 package datadog.benchmark.classes;
 
 public interface E extends B, C, D {
-  void e();
+    void e();
 }
diff --git a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/F.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/F.java
index b341841c168..d915ef08292 100644
--- a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/F.java
+++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/F.java
@@ -1,7 +1,7 @@
 package datadog.benchmark.classes;
 
 public abstract class F implements E {
-  public abstract void f();
+    public abstract void f();
 
-  public void g() {}
+    public void g() {}
 }
diff --git a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/TracedClass.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/TracedClass.java
index 4d39eec1777..a99d325f332 100644
--- a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/TracedClass.java
+++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/TracedClass.java
@@ -3,27 +3,27 @@
 import datadog.trace.api.Trace;
 
 public class TracedClass extends UntracedClass {
-  @Trace
-  @Override
-  public void f() {}
+    @Trace
+    @Override
+    public void f() {}
 
-  @Trace
-  @Override
-  public void e() {}
+    @Trace
+    @Override
+    public void e() {}
 
-  @Trace
-  @Override
-  public void d() {}
+    @Trace
+    @Override
+    public void d() {}
 
-  @Trace
-  @Override
-  public void c() {}
+    @Trace
+    @Override
+    public void c() {}
 
-  @Trace
-  @Override
-  public void b() {}
+    @Trace
+    @Override
+    public void b() {}
 
-  @Trace
-  @Override
-  public void a() {}
+    @Trace
+    @Override
+    public void a() {}
 }
diff --git a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/UntracedClass.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/UntracedClass.java
index 49bf506ea57..59a9786a539 100644
--- a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/UntracedClass.java
+++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/UntracedClass.java
@@ -1,21 +1,21 @@
 package datadog.benchmark.classes;
 
 public class UntracedClass extends F {
-  @Override
-  public void f() {}
+    @Override
+    public void f() {}
 
-  @Override
-  public void e() {}
+    @Override
+    public void e() {}
 
-  @Override
-  public void d() {}
+    @Override
+    public void d() {}
 
-  @Override
-  public void c() {}
+    @Override
+    public void c() {}
 
-  @Override
-  public void b() {}
+    @Override
+    public void b() {}
 
-  @Override
-  public void a() {}
+    @Override
+    public void a() {}
 }
diff --git a/dd-java-agent/cws-tls/src/main/java/datadog/cws/erpc/Erpc.java b/dd-java-agent/cws-tls/src/main/java/datadog/cws/erpc/Erpc.java
index eb86ea92e2a..e178dfa459d 100644
--- a/dd-java-agent/cws-tls/src/main/java/datadog/cws/erpc/Erpc.java
+++ b/dd-java-agent/cws-tls/src/main/java/datadog/cws/erpc/Erpc.java
@@ -12,15 +12,15 @@
  * code.
  */
 public class Erpc {
-  static final NativeLong REQUEST_CODE = new NativeLong(0xdeadc001L);
+    static final NativeLong REQUEST_CODE = new NativeLong(0xdeadc001L);
 
-  public interface CLibrary extends Library {
-    CLibrary Instance = (CLibrary) Native.load("c", CLibrary.class);
+    public interface CLibrary extends Library {
+        CLibrary Instance = (CLibrary) Native.load("c", CLibrary.class);
 
-    NativeLong ioctl(NativeLong fd, NativeLong request, Object... args);
-  }
+        NativeLong ioctl(NativeLong fd, NativeLong request, Object... args);
+    }
 
-  public static void send(Request request) {
-    CLibrary.Instance.ioctl(new NativeLong(0), REQUEST_CODE, Pointer.nativeValue(request.pointer));
-  }
+    public static void send(Request request) {
+        CLibrary.Instance.ioctl(new NativeLong(0), REQUEST_CODE, Pointer.nativeValue(request.pointer));
+    }
 }
diff --git a/dd-java-agent/cws-tls/src/main/java/datadog/cws/erpc/Request.java b/dd-java-agent/cws-tls/src/main/java/datadog/cws/erpc/Request.java
index ad56258be36..9793b269958 100644
--- a/dd-java-agent/cws-tls/src/main/java/datadog/cws/erpc/Request.java
+++ b/dd-java-agent/cws-tls/src/main/java/datadog/cws/erpc/Request.java
@@ -9,21 +9,21 @@
  * <p>A request is made of one op code of 8 bits + 256 bytes of data.
  */
 public class Request {
-  static final int OP_CODE_SIZE = 1;
-  static final int REQUEST_BUFFER_SIZE = OP_CODE_SIZE + 256;
+    static final int OP_CODE_SIZE = 1;
+    static final int REQUEST_BUFFER_SIZE = OP_CODE_SIZE + 256;
 
-  Pointer pointer;
+    Pointer pointer;
 
-  public Request(byte opCode) {
-    pointer = new Memory(REQUEST_BUFFER_SIZE);
-    pointer.setByte(0, opCode);
-  }
+    public Request(byte opCode) {
+        pointer = new Memory(REQUEST_BUFFER_SIZE);
+        pointer.setByte(0, opCode);
+    }
 
-  public byte getOpCode() {
-    return pointer.getByte(0);
-  }
+    public byte getOpCode() {
+        return pointer.getByte(0);
+    }
 
-  public Pointer getDataPointer() {
-    return pointer.share(1);
-  }
+    public Pointer getDataPointer() {
+        return pointer.share(1);
+    }
 }
diff --git a/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/ErpcTls.java b/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/ErpcTls.java
index 68fc1a1626e..85a6db8a3d5 100644
--- a/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/ErpcTls.java
+++ b/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/ErpcTls.java
@@ -21,156 +21,154 @@
  * from the CWS eBPF code.
  */
 public class ErpcTls implements Tls {
-  public static final byte REGISTER_SPAN_TLS_OP = 6;
-  public static final long TLS_FORMAT = 0;
-  static final int SPAN_ID_SIZE = 8; // 64 bits
-  static final int TRACE_ID_SIZE = 16; // 128 bits
-  static final long ENTRY_SIZE = SPAN_ID_SIZE + TRACE_ID_SIZE;
-
-  // Thread local storage
-  private Pointer tls;
-  private long maxThreads;
-  private int gettidSyscallId;
-
-  private final ThreadLocal<Integer> threadLocal = new ThreadLocal<>();
-
-  public interface CLibrary extends Library {
-    CLibrary Instance = (CLibrary) Native.load("c", CLibrary.class);
-
-    NativeLong syscall(NativeLong number, Object... args);
-  }
-
-  static int getGettidSyscallId() {
-    String arch = SystemProperties.get("os.arch");
-    if (arch.equals("amd64")) {
-      return 186; // 186 is the syscall ID for "gettid" on amd64
-    } else if (arch.equals("arm64")) {
-      return 178; // 78 is the syscall ID for "gettid" on arm64
-    }
-    return 0;
-  }
-
-  static boolean isSupported() {
-    int syscallID = getGettidSyscallId();
-    if (syscallID == 0) {
-      return false;
-    }
-    try {
-      CLibrary.Instance.syscall(new NativeLong(syscallID));
-    } catch (UnsatisfiedLinkError error) {
-      return false;
-    }
-    return true;
-  }
-
-  private int getTID() {
-    Integer thread = threadLocal.get();
-    if (thread == null && this.gettidSyscallId > 0) {
-      int threadId = CLibrary.Instance.syscall(new NativeLong(this.gettidSyscallId)).intValue();
-      threadLocal.set(threadId);
-    }
-    return thread;
-  }
-
-  public ErpcTls(int maxThreads, int refresh) {
-    Memory tls = new Memory(maxThreads * ENTRY_SIZE);
-    tls.clear();
-
-    this.gettidSyscallId = getGettidSyscallId();
-
-    this.maxThreads = maxThreads;
-    this.tls = tls;
-
-    registerTls();
-
-    final Thread thread =
-        newAgentThread(
-            CWS_TLS,
-            new Runnable() {
-              @Override
-              public void run() {
+    public static final byte REGISTER_SPAN_TLS_OP = 6;
+    public static final long TLS_FORMAT = 0;
+    static final int SPAN_ID_SIZE = 8; // 64 bits
+    static final int TRACE_ID_SIZE = 16; // 128 bits
+    static final long ENTRY_SIZE = SPAN_ID_SIZE + TRACE_ID_SIZE;
+
+    // Thread local storage
+    private Pointer tls;
+    private long maxThreads;
+    private int gettidSyscallId;
+
+    private final ThreadLocal<Integer> threadLocal = new ThreadLocal<>();
+
+    public interface CLibrary extends Library {
+        CLibrary Instance = (CLibrary) Native.load("c", CLibrary.class);
+
+        NativeLong syscall(NativeLong number, Object... args);
+    }
+
+    static int getGettidSyscallId() {
+        String arch = SystemProperties.get("os.arch");
+        if (arch.equals("amd64")) {
+            return 186; // 186 is the syscall ID for "gettid" on amd64
+        } else if (arch.equals("arm64")) {
+            return 178; // 78 is the syscall ID for "gettid" on arm64
+        }
+        return 0;
+    }
+
+    static boolean isSupported() {
+        int syscallID = getGettidSyscallId();
+        if (syscallID == 0) {
+            return false;
+        }
+        try {
+            CLibrary.Instance.syscall(new NativeLong(syscallID));
+        } catch (UnsatisfiedLinkError error) {
+            return false;
+        }
+        return true;
+    }
+
+    private int getTID() {
+        Integer thread = threadLocal.get();
+        if (thread == null && this.gettidSyscallId > 0) {
+            int threadId = CLibrary.Instance.syscall(new NativeLong(this.gettidSyscallId))
+                    .intValue();
+            threadLocal.set(threadId);
+        }
+        return thread;
+    }
+
+    public ErpcTls(int maxThreads, int refresh) {
+        Memory tls = new Memory(maxThreads * ENTRY_SIZE);
+        tls.clear();
+
+        this.gettidSyscallId = getGettidSyscallId();
+
+        this.maxThreads = maxThreads;
+        this.tls = tls;
+
+        registerTls();
+
+        final Thread thread = newAgentThread(CWS_TLS, new Runnable() {
+            @Override
+            public void run() {
                 try {
-                  Thread.sleep(refresh);
+                    Thread.sleep(refresh);
                 } catch (InterruptedException ex) {
-                  Thread.currentThread().interrupt();
-                  return;
+                    Thread.currentThread().interrupt();
+                    return;
                 }
 
                 while (!Thread.interrupted()) {
-                  try {
-                    registerTls();
-                    Thread.sleep(refresh);
-                  } catch (InterruptedException ex) {
-                    Thread.currentThread().interrupt();
-                    break;
-                  }
+                    try {
+                        registerTls();
+                        Thread.sleep(refresh);
+                    } catch (InterruptedException ex) {
+                        Thread.currentThread().interrupt();
+                        break;
+                    }
                 }
-              }
-            });
-    thread.start();
-  }
-
-  public Pointer getTlsPointer() {
-    return tls;
-  }
-
-  private void registerTls() {
-    Request request = new Request(REGISTER_SPAN_TLS_OP);
-    Pointer pointer = request.getDataPointer();
-
-    pointer.setLong(0, TLS_FORMAT);
-    pointer.setLong(Native.LONG_SIZE, maxThreads);
-    pointer.setPointer(Native.LONG_SIZE * 2L, tls);
-
-    sendRequest(request);
-  }
-
-  public void sendRequest(Request request) {
-    Erpc.send(request);
-  }
-
-  private long getEntryOffset(int threadId) {
-    return threadId % maxThreads * ENTRY_SIZE;
-  }
-
-  private long getSpanIdOffset(int threadId) {
-    return getEntryOffset(threadId);
-  }
-
-  private long getTraceIdOffset(int threadId) {
-    return getSpanIdOffset(threadId) + SPAN_ID_SIZE;
-  }
-
-  public void registerSpan(int threadId, DDTraceId traceId, long spanId) {
-    long spanIdOffset = getSpanIdOffset(threadId);
-    long traceIdOffset = getTraceIdOffset(threadId);
-
-    tls.setLong(spanIdOffset, spanId);
-    tls.setLong(traceIdOffset, traceId.toLong()); // low bits
-    tls.setLong(traceIdOffset + 8, traceId.toHighOrderLong()); // high bits
-  }
-
-  public void registerSpan(DDTraceId traceId, long spanId) {
-    registerSpan(getTID(), traceId, spanId);
-  }
-
-  public long getSpanId(int threadId) {
-    long offset = getSpanIdOffset(threadId);
-    return tls.getLong(offset);
-  }
-
-  public long getSpanId() {
-    return getSpanId(getTID());
-  }
-
-  public DDTraceId getTraceId(int threadId) {
-    long offset = getTraceIdOffset(threadId);
-    long lowBits = tls.getLong(offset);
-    long highBits = tls.getLong(offset + 8);
-    return DD128bTraceId.from(highBits, lowBits);
-  }
-
-  public DDTraceId getTraceId() {
-    return getTraceId(getTID());
-  }
+            }
+        });
+        thread.start();
+    }
+
+    public Pointer getTlsPointer() {
+        return tls;
+    }
+
+    private void registerTls() {
+        Request request = new Request(REGISTER_SPAN_TLS_OP);
+        Pointer pointer = request.getDataPointer();
+
+        pointer.setLong(0, TLS_FORMAT);
+        pointer.setLong(Native.LONG_SIZE, maxThreads);
+        pointer.setPointer(Native.LONG_SIZE * 2L, tls);
+
+        sendRequest(request);
+    }
+
+    public void sendRequest(Request request) {
+        Erpc.send(request);
+    }
+
+    private long getEntryOffset(int threadId) {
+        return threadId % maxThreads * ENTRY_SIZE;
+    }
+
+    private long getSpanIdOffset(int threadId) {
+        return getEntryOffset(threadId);
+    }
+
+    private long getTraceIdOffset(int threadId) {
+        return getSpanIdOffset(threadId) + SPAN_ID_SIZE;
+    }
+
+    public void registerSpan(int threadId, DDTraceId traceId, long spanId) {
+        long spanIdOffset = getSpanIdOffset(threadId);
+        long traceIdOffset = getTraceIdOffset(threadId);
+
+        tls.setLong(spanIdOffset, spanId);
+        tls.setLong(traceIdOffset, traceId.toLong()); // low bits
+        tls.setLong(traceIdOffset + 8, traceId.toHighOrderLong()); // high bits
+    }
+
+    public void registerSpan(DDTraceId traceId, long spanId) {
+        registerSpan(getTID(), traceId, spanId);
+    }
+
+    public long getSpanId(int threadId) {
+        long offset = getSpanIdOffset(threadId);
+        return tls.getLong(offset);
+    }
+
+    public long getSpanId() {
+        return getSpanId(getTID());
+    }
+
+    public DDTraceId getTraceId(int threadId) {
+        long offset = getTraceIdOffset(threadId);
+        long lowBits = tls.getLong(offset);
+        long highBits = tls.getLong(offset + 8);
+        return DD128bTraceId.from(highBits, lowBits);
+    }
+
+    public DDTraceId getTraceId() {
+        return getTraceId(getTID());
+    }
 }
diff --git a/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/NoTls.java b/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/NoTls.java
index 2b6c5c2714b..8fd3023f023 100644
--- a/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/NoTls.java
+++ b/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/NoTls.java
@@ -6,13 +6,13 @@
 
 public class NoTls implements Tls {
 
-  public void registerSpan(DDTraceId traceId, long spanId) {}
+    public void registerSpan(DDTraceId traceId, long spanId) {}
 
-  public long getSpanId() {
-    return DDSpanId.ZERO;
-  }
+    public long getSpanId() {
+        return DDSpanId.ZERO;
+    }
 
-  public DDTraceId getTraceId() {
-    return DD128bTraceId.ZERO;
-  }
+    public DDTraceId getTraceId() {
+        return DD128bTraceId.ZERO;
+    }
 }
diff --git a/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/Span.java b/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/Span.java
index edc48632c35..f9472a88900 100644
--- a/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/Span.java
+++ b/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/Span.java
@@ -4,19 +4,19 @@
 
 final class Span {
 
-  private final DDTraceId traceId;
-  private final long spanId;
+    private final DDTraceId traceId;
+    private final long spanId;
 
-  Span(DDTraceId traceId, long spanId) {
-    this.traceId = traceId;
-    this.spanId = spanId;
-  }
+    Span(DDTraceId traceId, long spanId) {
+        this.traceId = traceId;
+        this.spanId = spanId;
+    }
 
-  DDTraceId getTraceId() {
-    return traceId;
-  }
+    DDTraceId getTraceId() {
+        return traceId;
+    }
 
-  long getSpanId() {
-    return spanId;
-  }
+    long getSpanId() {
+        return spanId;
+    }
 }
diff --git a/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/Tls.java b/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/Tls.java
index 7bfc7498c51..9e2030bf552 100644
--- a/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/Tls.java
+++ b/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/Tls.java
@@ -4,9 +4,9 @@
 
 public interface Tls {
 
-  public void registerSpan(DDTraceId traceId, long spanId);
+    public void registerSpan(DDTraceId traceId, long spanId);
 
-  public long getSpanId();
+    public long getSpanId();
 
-  public DDTraceId getTraceId();
+    public DDTraceId getTraceId();
 }
diff --git a/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/TlsFactory.java b/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/TlsFactory.java
index 6d0cda5dd25..1478c2f3cb2 100644
--- a/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/TlsFactory.java
+++ b/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/TlsFactory.java
@@ -5,16 +5,16 @@
 import org.slf4j.LoggerFactory;
 
 public final class TlsFactory {
-  private static final Logger log = LoggerFactory.getLogger(TlsFactory.class);
+    private static final Logger log = LoggerFactory.getLogger(TlsFactory.class);
 
-  public static Tls newTls(int maxThreads) {
-    if (Config.get().isCwsEnabled()) {
-      if (ErpcTls.isSupported()) {
-        int refresh = Config.get().getCwsTlsRefresh();
-        return new ErpcTls(maxThreads, refresh);
-      }
-      log.warn("Cloud Workload Security integration not supported");
+    public static Tls newTls(int maxThreads) {
+        if (Config.get().isCwsEnabled()) {
+            if (ErpcTls.isSupported()) {
+                int refresh = Config.get().getCwsTlsRefresh();
+                return new ErpcTls(maxThreads, refresh);
+            }
+            log.warn("Cloud Workload Security integration not supported");
+        }
+        return new NoTls();
     }
-    return new NoTls();
-  }
 }
diff --git a/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/TlsScopeListener.java b/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/TlsScopeListener.java
index 1608cfa5bce..3f40ea9285b 100644
--- a/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/TlsScopeListener.java
+++ b/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/TlsScopeListener.java
@@ -9,56 +9,56 @@
 
 public class TlsScopeListener implements ExtendedScopeListener {
 
-  private final ThreadLocal<Deque<Span>> spanStack = ThreadLocal.withInitial(ArrayDeque::new);
+    private final ThreadLocal<Deque<Span>> spanStack = ThreadLocal.withInitial(ArrayDeque::new);
 
-  private Tls tls;
+    private Tls tls;
 
-  public TlsScopeListener() {
-    tls = TlsFactory.newTls(4096);
-  }
+    public TlsScopeListener() {
+        tls = TlsFactory.newTls(4096);
+    }
+
+    public TlsScopeListener(Tls tls) {
+        this.tls = tls;
+    }
 
-  public TlsScopeListener(Tls tls) {
-    this.tls = tls;
-  }
+    void push(DDTraceId traceId, long spanId) {
+        Deque<Span> stack = spanStack.get();
 
-  void push(DDTraceId traceId, long spanId) {
-    Deque<Span> stack = spanStack.get();
+        Span top = stack.peek();
+        if (top == null || !top.getTraceId().equals(traceId) || top.getSpanId() != spanId) {
+            Span span = new Span(traceId, spanId);
+            stack.push(span);
+        }
 
-    Span top = stack.peek();
-    if (top == null || !top.getTraceId().equals(traceId) || top.getSpanId() != spanId) {
-      Span span = new Span(traceId, spanId);
-      stack.push(span);
+        tls.registerSpan(traceId, spanId);
     }
 
-    tls.registerSpan(traceId, spanId);
-  }
-
-  void poll() {
-    Deque<Span> stack = spanStack.get();
+    void poll() {
+        Deque<Span> stack = spanStack.get();
 
-    Span span = stack.poll();
-    if (span != null) {
-      Span parent = stack.peek();
-      if (parent != null) {
-        tls.registerSpan(parent.getTraceId(), parent.getSpanId());
-        return;
-      }
+        Span span = stack.poll();
+        if (span != null) {
+            Span parent = stack.peek();
+            if (parent != null) {
+                tls.registerSpan(parent.getTraceId(), parent.getSpanId());
+                return;
+            }
+        }
+        tls.registerSpan(DD128bTraceId.ZERO, DDSpanId.ZERO);
     }
-    tls.registerSpan(DD128bTraceId.ZERO, DDSpanId.ZERO);
-  }
 
-  @Override
-  public void afterScopeActivated() {
-    afterScopeActivated(DDTraceId.ZERO, DDSpanId.ZERO);
-  }
+    @Override
+    public void afterScopeActivated() {
+        afterScopeActivated(DDTraceId.ZERO, DDSpanId.ZERO);
+    }
 
-  @Override
-  public void afterScopeActivated(DDTraceId traceId, long spanId) {
-    push(traceId, spanId);
-  }
+    @Override
+    public void afterScopeActivated(DDTraceId traceId, long spanId) {
+        push(traceId, spanId);
+    }
 
-  @Override
-  public void afterScopeClosed() {
-    poll();
-  }
+    @Override
+    public void afterScopeClosed() {
+        poll();
+    }
 }
diff --git a/dd-java-agent/cws-tls/src/test/java/datadog/cws/tls/DummyErpcTls.java b/dd-java-agent/cws-tls/src/test/java/datadog/cws/tls/DummyErpcTls.java
index 57ce9f89b59..24abe3e29ca 100644
--- a/dd-java-agent/cws-tls/src/test/java/datadog/cws/tls/DummyErpcTls.java
+++ b/dd-java-agent/cws-tls/src/test/java/datadog/cws/tls/DummyErpcTls.java
@@ -4,14 +4,14 @@
 
 class DummyErpcTls extends ErpcTls {
 
-  Request lastRequest;
+    Request lastRequest;
 
-  public DummyErpcTls(int maxThread) {
-    super(maxThread, 5000);
-  }
+    public DummyErpcTls(int maxThread) {
+        super(maxThread, 5000);
+    }
 
-  @Override
-  public void sendRequest(Request request) {
-    lastRequest = request;
-  }
+    @Override
+    public void sendRequest(Request request) {
+        lastRequest = request;
+    }
 }
diff --git a/dd-java-agent/cws-tls/src/test/java/datadog/cws/tls/DummyTls.java b/dd-java-agent/cws-tls/src/test/java/datadog/cws/tls/DummyTls.java
index 3587b44042e..81c271bcc33 100644
--- a/dd-java-agent/cws-tls/src/test/java/datadog/cws/tls/DummyTls.java
+++ b/dd-java-agent/cws-tls/src/test/java/datadog/cws/tls/DummyTls.java
@@ -4,22 +4,22 @@
 
 class DummyTls implements Tls {
 
-  private DDTraceId traceId;
-  private long spanId;
+    private DDTraceId traceId;
+    private long spanId;
 
-  @Override
-  public void registerSpan(DDTraceId traceId, long spanId) {
-    this.traceId = traceId;
-    this.spanId = spanId;
-  }
+    @Override
+    public void registerSpan(DDTraceId traceId, long spanId) {
+        this.traceId = traceId;
+        this.spanId = spanId;
+    }
 
-  @Override
-  public long getSpanId() {
-    return spanId;
-  }
+    @Override
+    public long getSpanId() {
+        return spanId;
+    }
 
-  @Override
-  public DDTraceId getTraceId() {
-    return traceId;
-  }
+    @Override
+    public DDTraceId getTraceId() {
+        return traceId;
+    }
 }
diff --git a/dd-java-agent/ddprof-lib/src/main/java/datadog/libs/ddprof/DdprofLibraryLoader.java b/dd-java-agent/ddprof-lib/src/main/java/datadog/libs/ddprof/DdprofLibraryLoader.java
index b637dc69309..d48a3ef23da 100644
--- a/dd-java-agent/ddprof-lib/src/main/java/datadog/libs/ddprof/DdprofLibraryLoader.java
+++ b/dd-java-agent/ddprof-lib/src/main/java/datadog/libs/ddprof/DdprofLibraryLoader.java
@@ -23,176 +23,173 @@
  * constructed, if that's the case.
  */
 public final class DdprofLibraryLoader {
-  private static final Logger log = LoggerFactory.getLogger(DdprofLibraryLoader.class.getName());
+    private static final Logger log = LoggerFactory.getLogger(DdprofLibraryLoader.class.getName());
 
-  public abstract static class ComponentHolder<T> {
-    private volatile boolean loaded = false;
+    public abstract static class ComponentHolder<T> {
+        private volatile boolean loaded = false;
 
-    private T component;
-    private Throwable reasonNotLoaded;
+        private T component;
+        private Throwable reasonNotLoaded;
 
-    private final Supplier<? extends ComponentHolder<T>> initializer;
+        private final Supplier<? extends ComponentHolder<T>> initializer;
 
-    protected ComponentHolder(T component, Throwable reasonNotLoaded) {
-      assert component != null || reasonNotLoaded != null;
-      this.component = component;
-      this.reasonNotLoaded = reasonNotLoaded;
-      this.initializer = null; // no need to initialize again
-      this.loaded = true; // already loaded
-    }
+        protected ComponentHolder(T component, Throwable reasonNotLoaded) {
+            assert component != null || reasonNotLoaded != null;
+            this.component = component;
+            this.reasonNotLoaded = reasonNotLoaded;
+            this.initializer = null; // no need to initialize again
+            this.loaded = true; // already loaded
+        }
 
-    protected ComponentHolder(Supplier<? extends ComponentHolder<T>> initializer) {
-      assert initializer != null;
-      this.initializer = initializer;
-    }
+        protected ComponentHolder(Supplier<? extends ComponentHolder<T>> initializer) {
+            assert initializer != null;
+            this.initializer = initializer;
+        }
 
-    private void initialize() {
-      if (!loaded) {
-        // all holders need to be synchronized on the same class to ensure that only one is loading
-        // the native library at a time
-        synchronized (DdprofLibraryLoader.class) {
-          if (!loaded) {
-            ComponentHolder<T> h = initializer.get();
-            component = h.getComponent();
-            reasonNotLoaded = h.getReasonNotLoaded();
-            loaded = true;
-          }
+        private void initialize() {
+            if (!loaded) {
+                // all holders need to be synchronized on the same class to ensure that only one is loading
+                // the native library at a time
+                synchronized (DdprofLibraryLoader.class) {
+                    if (!loaded) {
+                        ComponentHolder<T> h = initializer.get();
+                        component = h.getComponent();
+                        reasonNotLoaded = h.getReasonNotLoaded();
+                        loaded = true;
+                    }
+                }
+            }
         }
-      }
-    }
 
-    public final T getComponent() {
-      initialize();
-      return component;
-    }
+        public final T getComponent() {
+            initialize();
+            return component;
+        }
 
-    public final Throwable getReasonNotLoaded() {
-      initialize();
-      return reasonNotLoaded;
+        public final Throwable getReasonNotLoaded() {
+            initialize();
+            return reasonNotLoaded;
+        }
     }
-  }
 
-  public static final class JavaProfilerHolder extends ComponentHolder<JavaProfiler> {
-    public JavaProfilerHolder(Supplier<? extends ComponentHolder<JavaProfiler>> initializer) {
-      super(initializer);
+    public static final class JavaProfilerHolder extends ComponentHolder<JavaProfiler> {
+        public JavaProfilerHolder(Supplier<? extends ComponentHolder<JavaProfiler>> initializer) {
+            super(initializer);
+        }
+
+        JavaProfilerHolder(JavaProfiler component, Throwable reasonNotLoaded) {
+            super(component, reasonNotLoaded);
+        }
     }
 
-    JavaProfilerHolder(JavaProfiler component, Throwable reasonNotLoaded) {
-      super(component, reasonNotLoaded);
+    public static final class JVMAccessHolder extends ComponentHolder<JVMAccess> {
+        public JVMAccessHolder(Supplier<? extends ComponentHolder<JVMAccess>> initializer) {
+            super(initializer);
+        }
+
+        JVMAccessHolder(JVMAccess component, Throwable reasonNotLoaded) {
+            super(component, reasonNotLoaded);
+        }
     }
-  }
 
-  public static final class JVMAccessHolder extends ComponentHolder<JVMAccess> {
-    public JVMAccessHolder(Supplier<? extends ComponentHolder<JVMAccess>> initializer) {
-      super(initializer);
+    public static final class OTelContextHolder extends ComponentHolder<OTelContext> {
+        public OTelContextHolder(Supplier<? extends ComponentHolder<OTelContext>> initializer) {
+            super(initializer);
+        }
+
+        OTelContextHolder(OTelContext component, Throwable reasonNotLoaded) {
+            super(component, reasonNotLoaded);
+        }
     }
 
-    JVMAccessHolder(JVMAccess component, Throwable reasonNotLoaded) {
-      super(component, reasonNotLoaded);
+    private static final JavaProfilerHolder PROFILER_HOLDER =
+            new JavaProfilerHolder(DdprofLibraryLoader::initJavaProfiler);
+
+    private static final JVMAccessHolder JVM_ACCESS_HOLDER = new JVMAccessHolder(DdprofLibraryLoader::initJVMAccess);
+
+    private static final OTelContextHolder OTEL_CONTEXT_HOLDER =
+            new OTelContextHolder(DdprofLibraryLoader::initOtelContext);
+
+    public static JavaProfilerHolder javaProfiler() {
+        return PROFILER_HOLDER;
     }
-  }
 
-  public static final class OTelContextHolder extends ComponentHolder<OTelContext> {
-    public OTelContextHolder(Supplier<? extends ComponentHolder<OTelContext>> initializer) {
-      super(initializer);
+    public static JVMAccessHolder jvmAccess() {
+        return JVM_ACCESS_HOLDER;
     }
 
-    OTelContextHolder(OTelContext component, Throwable reasonNotLoaded) {
-      super(component, reasonNotLoaded);
+    public static OTelContextHolder otelContext() {
+        return OTEL_CONTEXT_HOLDER;
     }
-  }
-
-  private static final JavaProfilerHolder PROFILER_HOLDER =
-      new JavaProfilerHolder(DdprofLibraryLoader::initJavaProfiler);
-
-  private static final JVMAccessHolder JVM_ACCESS_HOLDER =
-      new JVMAccessHolder(DdprofLibraryLoader::initJVMAccess);
-
-  private static final OTelContextHolder OTEL_CONTEXT_HOLDER =
-      new OTelContextHolder(DdprofLibraryLoader::initOtelContext);
-
-  public static JavaProfilerHolder javaProfiler() {
-    return PROFILER_HOLDER;
-  }
-
-  public static JVMAccessHolder jvmAccess() {
-    return JVM_ACCESS_HOLDER;
-  }
-
-  public static OTelContextHolder otelContext() {
-    return OTEL_CONTEXT_HOLDER;
-  }
-
-  private static JavaProfilerHolder initJavaProfiler() {
-    JavaProfiler profiler;
-    Throwable reasonNotLoaded = null;
-    try {
-      ConfigProvider configProvider = ConfigProvider.getInstance();
-      String scratch = getScratchDir(configProvider);
-      profiler =
-          JavaProfiler.getInstance(
-              configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIBPATH),
-              scratch);
-      // sanity test - force load Datadog profiler to catch it not being available early
-      profiler.execute("status");
-    } catch (Throwable t) {
-      reasonNotLoaded = t;
-      profiler = null;
+
+    private static JavaProfilerHolder initJavaProfiler() {
+        JavaProfiler profiler;
+        Throwable reasonNotLoaded = null;
+        try {
+            ConfigProvider configProvider = ConfigProvider.getInstance();
+            String scratch = getScratchDir(configProvider);
+            profiler = JavaProfiler.getInstance(
+                    configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIBPATH), scratch);
+            // sanity test - force load Datadog profiler to catch it not being available early
+            profiler.execute("status");
+        } catch (Throwable t) {
+            reasonNotLoaded = t;
+            profiler = null;
+        }
+        return new JavaProfilerHolder(profiler, reasonNotLoaded);
     }
-    return new JavaProfilerHolder(profiler, reasonNotLoaded);
-  }
-
-  private static JVMAccessHolder initJVMAccess() {
-    ConfigProvider configProvider = ConfigProvider.getInstance();
-    AtomicReference<Throwable> reasonNotLoaded = new AtomicReference<>();
-    JVMAccess jvmAccess = null;
-    try {
-      String scratchDir = getScratchDir(configProvider);
-      jvmAccess = new JVMAccess(null, scratchDir, reasonNotLoaded::set);
-    } catch (Throwable t) {
-      if (reasonNotLoaded.get() == null) {
-        reasonNotLoaded.set(t);
-      } else {
-        // if we already have a reason, don't overwrite it
-        // this can happen if the JVMAccess constructor throws an exception
-        // and then the execute method throws another one
-      }
-      jvmAccess = null;
+
+    private static JVMAccessHolder initJVMAccess() {
+        ConfigProvider configProvider = ConfigProvider.getInstance();
+        AtomicReference<Throwable> reasonNotLoaded = new AtomicReference<>();
+        JVMAccess jvmAccess = null;
+        try {
+            String scratchDir = getScratchDir(configProvider);
+            jvmAccess = new JVMAccess(null, scratchDir, reasonNotLoaded::set);
+        } catch (Throwable t) {
+            if (reasonNotLoaded.get() == null) {
+                reasonNotLoaded.set(t);
+            } else {
+                // if we already have a reason, don't overwrite it
+                // this can happen if the JVMAccess constructor throws an exception
+                // and then the execute method throws another one
+            }
+            jvmAccess = null;
+        }
+        return new JVMAccessHolder(jvmAccess, reasonNotLoaded.get());
     }
-    return new JVMAccessHolder(jvmAccess, reasonNotLoaded.get());
-  }
-
-  private static OTelContextHolder initOtelContext() {
-    ConfigProvider configProvider = ConfigProvider.getInstance();
-    AtomicReference<Throwable> reasonNotLoaded = new AtomicReference<>();
-    OTelContext otelContext = null;
-    try {
-      String scratchDir = getScratchDir(configProvider);
-      otelContext = new OTelContext(null, scratchDir, reasonNotLoaded::set);
-    } catch (Throwable t) {
-      if (reasonNotLoaded.get() == null) {
-        reasonNotLoaded.set(t);
-      } else {
-        // if we already have a reason, don't overwrite it
-        // this can happen if the OTelContext constructor throws an exception
-        // and then the execute method throws another one
-      }
-      otelContext = null;
+
+    private static OTelContextHolder initOtelContext() {
+        ConfigProvider configProvider = ConfigProvider.getInstance();
+        AtomicReference<Throwable> reasonNotLoaded = new AtomicReference<>();
+        OTelContext otelContext = null;
+        try {
+            String scratchDir = getScratchDir(configProvider);
+            otelContext = new OTelContext(null, scratchDir, reasonNotLoaded::set);
+        } catch (Throwable t) {
+            if (reasonNotLoaded.get() == null) {
+                reasonNotLoaded.set(t);
+            } else {
+                // if we already have a reason, don't overwrite it
+                // this can happen if the OTelContext constructor throws an exception
+                // and then the execute method throws another one
+            }
+            otelContext = null;
+        }
+        return new OTelContextHolder(otelContext, reasonNotLoaded.get());
     }
-    return new OTelContextHolder(otelContext, reasonNotLoaded.get());
-  }
-
-  private static String getScratchDir(ConfigProvider configProvider) throws IOException {
-    String scratch = configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_SCRATCH);
-    if (scratch == null) {
-      Path scratchPath = TempLocationManager.getInstance().getTempDir().resolve("scratch");
-      if (!Files.exists(scratchPath)) {
-        Files.createDirectories(
-            scratchPath,
-            PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxr-xr-x")));
-      }
-      scratch = scratchPath.toString();
+
+    private static String getScratchDir(ConfigProvider configProvider) throws IOException {
+        String scratch = configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_SCRATCH);
+        if (scratch == null) {
+            Path scratchPath = TempLocationManager.getInstance().getTempDir().resolve("scratch");
+            if (!Files.exists(scratchPath)) {
+                Files.createDirectories(
+                        scratchPath,
+                        PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxr-xr-x")));
+            }
+            scratch = scratchPath.toString();
+        }
+        return scratch;
     }
-    return scratch;
-  }
 }
diff --git a/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/AnnoUtils.java b/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/AnnoUtils.java
index 17601bb1eed..17befa4664b 100644
--- a/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/AnnoUtils.java
+++ b/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/AnnoUtils.java
@@ -17,172 +17,171 @@
  * <p>By convention, nulls pass through nicely to allow easy composition
  */
 public final class AnnoUtils {
-  private AnnoUtils() {}
+    private AnnoUtils() {}
 
-  /** Finds the AnnotationMirror on Element of type TypeElement */
-  public static final AnnotationMirror findAnnotation(Element element, TypeElement annoType) {
-    if (element == null || annoType == null) return null;
+    /** Finds the AnnotationMirror on Element of type TypeElement */
+    public static final AnnotationMirror findAnnotation(Element element, TypeElement annoType) {
+        if (element == null || annoType == null) return null;
 
-    for (AnnotationMirror annoMirror : element.getAnnotationMirrors()) {
-      if (isA(annoMirror, annoType)) return annoMirror;
+        for (AnnotationMirror annoMirror : element.getAnnotationMirrors()) {
+            if (isA(annoMirror, annoType)) return annoMirror;
+        }
+        return null;
     }
-    return null;
-  }
 
-  public static final AnnotationMirror findAnnotation(Element element, Class<?> annoClass) {
-    if (element == null || annoClass == null) return null;
+    public static final AnnotationMirror findAnnotation(Element element, Class<?> annoClass) {
+        if (element == null || annoClass == null) return null;
 
-    for (AnnotationMirror annoMirror : element.getAnnotationMirrors()) {
-      if (isA(annoMirror, annoClass)) return annoMirror;
+        for (AnnotationMirror annoMirror : element.getAnnotationMirrors()) {
+            if (isA(annoMirror, annoClass)) return annoMirror;
+        }
+        return null;
     }
-    return null;
-  }
 
-  public static final boolean isSuppressed(Element element, String checkName) {
-    if (element == null) return false;
-    if (isSuppressedHelper(element, checkName)) return true;
+    public static final boolean isSuppressed(Element element, String checkName) {
+        if (element == null) return false;
+        if (isSuppressedHelper(element, checkName)) return true;
 
-    for (Element enclosingElement = element.getEnclosingElement();
-        enclosingElement != null;
-        enclosingElement = enclosingElement.getEnclosingElement()) {
-      if (isSuppressedHelper(enclosingElement, checkName)) return true;
+        for (Element enclosingElement = element.getEnclosingElement();
+                enclosingElement != null;
+                enclosingElement = enclosingElement.getEnclosingElement()) {
+            if (isSuppressedHelper(enclosingElement, checkName)) return true;
+        }
+        return false;
     }
-    return false;
-  }
 
-  private static final boolean isSuppressedHelper(Element element, String checkName) {
-    AnnotationMirror mirror = findAnnotation(element, SuppressWarnings.class);
-    AnnotationValue value = getValue(mirror);
-    List<? extends AnnotationValue> suppressionList = asList(value);
+    private static final boolean isSuppressedHelper(Element element, String checkName) {
+        AnnotationMirror mirror = findAnnotation(element, SuppressWarnings.class);
+        AnnotationValue value = getValue(mirror);
+        List<? extends AnnotationValue> suppressionList = asList(value);
 
-    return contains(suppressionList, checkName);
-  }
+        return contains(suppressionList, checkName);
+    }
 
-  public static final boolean contains(List<? extends AnnotationValue> annoList, Object value) {
-    if (annoList == null) return false;
+    public static final boolean contains(List<? extends AnnotationValue> annoList, Object value) {
+        if (annoList == null) return false;
 
-    for (AnnotationValue annoValue : annoList) {
-      if (is(annoValue, value)) return true;
+        for (AnnotationValue annoValue : annoList) {
+            if (is(annoValue, value)) return true;
+        }
+        return false;
     }
-    return false;
-  }
 
-  public static final boolean isA(AnnotationMirror annoMirror, TypeElement annoType) {
-    if (annoMirror == null) return false;
+    public static final boolean isA(AnnotationMirror annoMirror, TypeElement annoType) {
+        if (annoMirror == null) return false;
 
-    return annoMirror.getAnnotationType().asElement().equals(annoType);
-  }
+        return annoMirror.getAnnotationType().asElement().equals(annoType);
+    }
 
-  public static final boolean isA(AnnotationMirror annoMirror, Class<?> annoClass) {
-    if (annoMirror == null) return false;
+    public static final boolean isA(AnnotationMirror annoMirror, Class<?> annoClass) {
+        if (annoMirror == null) return false;
 
-    return TypeUtils.isClass(annoMirror.getAnnotationType(), annoClass);
-  }
+        return TypeUtils.isClass(annoMirror.getAnnotationType(), annoClass);
+    }
 
-  public static final boolean is(AnnotationValue annoValue, Object obj) {
-    // TODO: Add support for Class objects?
-    return (annoValue == null) ? false : annoValue.getValue().equals(obj);
-  }
+    public static final boolean is(AnnotationValue annoValue, Object obj) {
+        // TODO: Add support for Class objects?
+        return (annoValue == null) ? false : annoValue.getValue().equals(obj);
+    }
 
-  public static final TypeMirror asType(AnnotationValue annoValue) {
-    return (annoValue == null) ? null : (TypeMirror) annoValue.getValue();
-  }
+    public static final TypeMirror asType(AnnotationValue annoValue) {
+        return (annoValue == null) ? null : (TypeMirror) annoValue.getValue();
+    }
 
-  public static final List<? extends AnnotationValue> asList(AnnotationValue annoValue) {
-    if (annoValue == null) return null;
+    public static final List<? extends AnnotationValue> asList(AnnotationValue annoValue) {
+        if (annoValue == null) return null;
 
-    return annoValue.accept(
-        new AnnotationVisitor<List<? extends AnnotationValue>, Void>() {
-          @Override
-          public List<? extends AnnotationValue> visitArray(
-              List<? extends AnnotationValue> vals, Void p) {
-            return vals;
-          }
-        },
-        null);
-  }
+        return annoValue.accept(
+                new AnnotationVisitor<List<? extends AnnotationValue>, Void>() {
+                    @Override
+                    public List<? extends AnnotationValue> visitArray(List<? extends AnnotationValue> vals, Void p) {
+                        return vals;
+                    }
+                },
+                null);
+    }
 
-  public static final AnnotationValue getValue(AnnotationMirror annoMirror) {
-    return getValue(annoMirror, "value");
-  }
+    public static final AnnotationValue getValue(AnnotationMirror annoMirror) {
+        return getValue(annoMirror, "value");
+    }
 
-  public static final AnnotationValue getValue(AnnotationMirror annoMirror, String simpleName) {
-    if (annoMirror == null) return null;
+    public static final AnnotationValue getValue(AnnotationMirror annoMirror, String simpleName) {
+        if (annoMirror == null) return null;
 
-    for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> elementEntry :
-        annoMirror.getElementValues().entrySet()) {
-      ExecutableElement element = elementEntry.getKey();
-      if (!element.getSimpleName().contentEquals(simpleName)) continue;
+        for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> elementEntry :
+                annoMirror.getElementValues().entrySet()) {
+            ExecutableElement element = elementEntry.getKey();
+            if (!element.getSimpleName().contentEquals(simpleName)) continue;
 
-      return elementEntry.getValue();
+            return elementEntry.getValue();
+        }
+        return null;
     }
-    return null;
-  }
 
-  abstract static class AnnotationVisitor<R, P> extends AbstractAnnotationValueVisitor6<R, P> {
-    @Override
-    public R visitArray(List<? extends AnnotationValue> vals, P p) {
-      return null;
-    }
+    abstract static class AnnotationVisitor<R, P> extends AbstractAnnotationValueVisitor6<R, P> {
+        @Override
+        public R visitArray(List<? extends AnnotationValue> vals, P p) {
+            return null;
+        }
 
-    @Override
-    public R visitBoolean(boolean b, P p) {
-      return null;
-    }
+        @Override
+        public R visitBoolean(boolean b, P p) {
+            return null;
+        }
 
-    @Override
-    public R visitByte(byte b, P p) {
-      return null;
-    }
+        @Override
+        public R visitByte(byte b, P p) {
+            return null;
+        }
 
-    @Override
-    public R visitChar(char c, P p) {
-      return null;
-    }
+        @Override
+        public R visitChar(char c, P p) {
+            return null;
+        }
 
-    @Override
-    public R visitDouble(double d, P p) {
-      return null;
-    }
+        @Override
+        public R visitDouble(double d, P p) {
+            return null;
+        }
 
-    @Override
-    public R visitFloat(float f, P p) {
-      return null;
-    }
+        @Override
+        public R visitFloat(float f, P p) {
+            return null;
+        }
 
-    @Override
-    public R visitInt(int i, P p) {
-      return null;
-    }
+        @Override
+        public R visitInt(int i, P p) {
+            return null;
+        }
 
-    @Override
-    public R visitLong(long i, P p) {
-      return null;
-    }
+        @Override
+        public R visitLong(long i, P p) {
+            return null;
+        }
 
-    @Override
-    public R visitShort(short s, P p) {
-      return null;
-    }
+        @Override
+        public R visitShort(short s, P p) {
+            return null;
+        }
 
-    @Override
-    public R visitString(String s, P p) {
-      return null;
-    }
+        @Override
+        public R visitString(String s, P p) {
+            return null;
+        }
 
-    @Override
-    public R visitType(TypeMirror t, P p) {
-      return null;
-    }
+        @Override
+        public R visitType(TypeMirror t, P p) {
+            return null;
+        }
 
-    @Override
-    public R visitEnumConstant(VariableElement c, P p) {
-      return null;
-    }
+        @Override
+        public R visitEnumConstant(VariableElement c, P p) {
+            return null;
+        }
 
-    @Override
-    public R visitAnnotation(AnnotationMirror a, P p) {
-      return null;
+        @Override
+        public R visitAnnotation(AnnotationMirror a, P p) {
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/ByteBuddyAdviceProcessor.java b/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/ByteBuddyAdviceProcessor.java
index 619bda3e7dc..ed3ac869854 100644
--- a/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/ByteBuddyAdviceProcessor.java
+++ b/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/ByteBuddyAdviceProcessor.java
@@ -30,59 +30,58 @@
 @SupportedAnnotationTypes({"net.bytebuddy.asm.Advice.*"})
 public class ByteBuddyAdviceProcessor extends AbstractProcessor {
 
-  @Override
-  public SourceVersion getSupportedSourceVersion() {
-    return SourceVersion.latestSupported();
-  }
+    @Override
+    public SourceVersion getSupportedSourceVersion() {
+        return SourceVersion.latestSupported();
+    }
 
-  @Override
-  @SuppressForbidden
-  public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-    try {
-      processImpl(annotations, roundEnv);
-    } catch (RuntimeException e) {
-      e.printStackTrace(System.err);
+    @Override
+    @SuppressForbidden
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        try {
+            processImpl(annotations, roundEnv);
+        } catch (RuntimeException e) {
+            e.printStackTrace(System.err);
+        }
+        return false;
     }
-    return false;
-  }
 
-  private void processImpl(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-    if (annotations.isEmpty()) return;
+    private void processImpl(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        if (annotations.isEmpty()) return;
 
-    TypeElement beforeAnno = findType(annotations, "net.bytebuddy.asm.Advice.OnMethodEnter");
-    TypeElement afterAnno = findType(annotations, "net.bytebuddy.asm.Advice.OnMethodExit");
+        TypeElement beforeAnno = findType(annotations, "net.bytebuddy.asm.Advice.OnMethodEnter");
+        TypeElement afterAnno = findType(annotations, "net.bytebuddy.asm.Advice.OnMethodExit");
 
-    if (beforeAnno != null) processAnnotation(beforeAnno, roundEnv);
-    if (afterAnno != null) processAnnotation(afterAnno, roundEnv);
-  }
+        if (beforeAnno != null) processAnnotation(beforeAnno, roundEnv);
+        if (afterAnno != null) processAnnotation(afterAnno, roundEnv);
+    }
 
-  private void processAnnotation(TypeElement adviceAnno, RoundEnvironment roundEnv) {
-    Set<? extends Element> annotatedElements = roundEnv.getElementsAnnotatedWith(adviceAnno);
-    log(processingEnv, "Processing annotation %s...", adviceAnno.getSimpleName());
-    if (annotatedElements.isEmpty()) return;
+    private void processAnnotation(TypeElement adviceAnno, RoundEnvironment roundEnv) {
+        Set<? extends Element> annotatedElements = roundEnv.getElementsAnnotatedWith(adviceAnno);
+        log(processingEnv, "Processing annotation %s...", adviceAnno.getSimpleName());
+        if (annotatedElements.isEmpty()) return;
 
-    for (Element annotatedElement : annotatedElements) {
-      log(
-          processingEnv,
-          "\tProcessing annotated element %s::%s...",
-          annotatedElement.getEnclosingElement().getSimpleName(),
-          annotatedElement.getSimpleName());
+        for (Element annotatedElement : annotatedElements) {
+            log(
+                    processingEnv,
+                    "\tProcessing annotated element %s::%s...",
+                    annotatedElement.getEnclosingElement().getSimpleName(),
+                    annotatedElement.getSimpleName());
 
-      AnnotationMirror adviceAnnoMirror = findAnnotation(annotatedElement, adviceAnno);
-      TypeMirror suppressType = asType(getValue(adviceAnnoMirror, "suppress"));
-      if (suppressType == null
-          && !isSuppressed(annotatedElement, "bytebuddy-exception-suppression")) {
-        warning(
-            processingEnv,
-            annotatedElement,
-            "Missing `suppress` attribute - use @SuppressWarnings(\"bytebuddy-exception-suppression\") to ignore");
-      } else if (!isClass(suppressType, Throwable.class)
-          && !isSuppressed(annotatedElement, "bytebuddy-exception-suppression")) {
-        warning(
-            processingEnv,
-            annotatedElement,
-            "`suppress` attribute != Throwable.class - use @SuppressWarnings(\"bytebuddy-exception-suppression\") to ignore");
-      }
+            AnnotationMirror adviceAnnoMirror = findAnnotation(annotatedElement, adviceAnno);
+            TypeMirror suppressType = asType(getValue(adviceAnnoMirror, "suppress"));
+            if (suppressType == null && !isSuppressed(annotatedElement, "bytebuddy-exception-suppression")) {
+                warning(
+                        processingEnv,
+                        annotatedElement,
+                        "Missing `suppress` attribute - use @SuppressWarnings(\"bytebuddy-exception-suppression\") to ignore");
+            } else if (!isClass(suppressType, Throwable.class)
+                    && !isSuppressed(annotatedElement, "bytebuddy-exception-suppression")) {
+                warning(
+                        processingEnv,
+                        annotatedElement,
+                        "`suppress` attribute != Throwable.class - use @SuppressWarnings(\"bytebuddy-exception-suppression\") to ignore");
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/ElementUtils.java b/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/ElementUtils.java
index 88a21f50410..037c9f126f5 100644
--- a/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/ElementUtils.java
+++ b/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/ElementUtils.java
@@ -10,26 +10,26 @@
  * <p>By convention, nulls pass through nicely to allow easy composition
  */
 public final class ElementUtils {
-  private ElementUtils() {}
+    private ElementUtils() {}
 
-  public static final boolean isPackage(Element element, Package pkg) {
-    if (element == null) return false;
+    public static final boolean isPackage(Element element, Package pkg) {
+        if (element == null) return false;
 
-    return isPackage(element, pkg.getName());
-  }
+        return isPackage(element, pkg.getName());
+    }
 
-  public static final boolean isPackage(Element element, String packageName) {
-    if (!(element instanceof PackageElement)) return false;
+    public static final boolean isPackage(Element element, String packageName) {
+        if (!(element instanceof PackageElement)) return false;
 
-    PackageElement packageElement = (PackageElement) element;
+        PackageElement packageElement = (PackageElement) element;
 
-    return packageElement.getQualifiedName().contentEquals(packageName);
-  }
+        return packageElement.getQualifiedName().contentEquals(packageName);
+    }
 
-  public static final boolean isClass(Element element, Class<?> clazz) {
-    if (!(element instanceof TypeElement)) return false;
-    TypeElement typeElement = (TypeElement) element;
+    public static final boolean isClass(Element element, Class<?> clazz) {
+        if (!(element instanceof TypeElement)) return false;
+        TypeElement typeElement = (TypeElement) element;
 
-    return TypeUtils.isClass(typeElement.asType(), clazz);
-  }
+        return TypeUtils.isClass(typeElement.asType(), clazz);
+    }
 }
diff --git a/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/LogUtils.java b/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/LogUtils.java
index 34c0925ff4c..371e414be26 100644
--- a/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/LogUtils.java
+++ b/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/LogUtils.java
@@ -6,38 +6,32 @@
 
 /** Utility class for logging from annotation processor to the ProcessingEnvironment */
 public final class LogUtils {
-  private LogUtils() {}
+    private LogUtils() {}
 
-  private static final boolean NOTE = false;
+    private static final boolean NOTE = false;
 
-  public static void log(ProcessingEnvironment processingEnv, String formatStr, Object... args) {
-    String msg = String.format(formatStr, args);
+    public static void log(ProcessingEnvironment processingEnv, String formatStr, Object... args) {
+        String msg = String.format(formatStr, args);
 
-    if (NOTE) {
-      processingEnv.getMessager().printMessage(Kind.NOTE, msg);
+        if (NOTE) {
+            processingEnv.getMessager().printMessage(Kind.NOTE, msg);
+        }
     }
-  }
-
-  public static void warning(
-      ProcessingEnvironment processingEnv, Element element, String formatStr, Object... args) {
-    message(processingEnv, element, Kind.WARNING, formatStr, args);
-  }
-
-  public static void error(
-      ProcessingEnvironment processingEnv, Element element, String formatStr, Object... args) {
-    message(processingEnv, element, Kind.ERROR, formatStr, args);
-  }
-
-  public static void message(
-      ProcessingEnvironment processingEnv,
-      Element element,
-      Kind kind,
-      String formatStr,
-      Object... args) {
-    String msg = String.format(formatStr, args);
-
-    if (kind != Kind.NOTE || NOTE) {
-      processingEnv.getMessager().printMessage(kind, msg, element);
+
+    public static void warning(ProcessingEnvironment processingEnv, Element element, String formatStr, Object... args) {
+        message(processingEnv, element, Kind.WARNING, formatStr, args);
+    }
+
+    public static void error(ProcessingEnvironment processingEnv, Element element, String formatStr, Object... args) {
+        message(processingEnv, element, Kind.ERROR, formatStr, args);
+    }
+
+    public static void message(
+            ProcessingEnvironment processingEnv, Element element, Kind kind, String formatStr, Object... args) {
+        String msg = String.format(formatStr, args);
+
+        if (kind != Kind.NOTE || NOTE) {
+            processingEnv.getMessager().printMessage(kind, msg, element);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/TypeUtils.java b/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/TypeUtils.java
index faeb71ee3e0..7edb7927a3c 100644
--- a/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/TypeUtils.java
+++ b/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/TypeUtils.java
@@ -20,123 +20,121 @@
  * <p>By convention, nulls pass through nicely to allow easy composition
  */
 public final class TypeUtils {
-  private TypeUtils() {}
+    private TypeUtils() {}
 
-  public static final TypeElement findType(
-      Iterable<? extends TypeElement> types, String qualifiedName) {
-    if (types == null) return null;
+    public static final TypeElement findType(Iterable<? extends TypeElement> types, String qualifiedName) {
+        if (types == null) return null;
 
-    for (TypeElement type : types) {
-      if (type.getQualifiedName().contentEquals(qualifiedName)) return type;
+        for (TypeElement type : types) {
+            if (type.getQualifiedName().contentEquals(qualifiedName)) return type;
+        }
+        return null;
     }
-    return null;
-  }
 
-  public static final boolean isClass(DeclaredType type, Class<?> clazz) {
-    if (type == null) return false;
+    public static final boolean isClass(DeclaredType type, Class<?> clazz) {
+        if (type == null) return false;
 
-    boolean isSimpleMatch = type.asElement().getSimpleName().contentEquals(clazz.getSimpleName());
-    if (!isSimpleMatch) return false;
+        boolean isSimpleMatch = type.asElement().getSimpleName().contentEquals(clazz.getSimpleName());
+        if (!isSimpleMatch) return false;
 
-    Element enclosingElement = type.asElement().getEnclosingElement();
-    switch (enclosingElement.getKind()) {
-      case PACKAGE:
-        return ElementUtils.isPackage(enclosingElement, clazz.getPackage());
+        Element enclosingElement = type.asElement().getEnclosingElement();
+        switch (enclosingElement.getKind()) {
+            case PACKAGE:
+                return ElementUtils.isPackage(enclosingElement, clazz.getPackage());
 
-      case CLASS:
-        return ElementUtils.isClass(enclosingElement, clazz.getEnclosingClass());
+            case CLASS:
+                return ElementUtils.isClass(enclosingElement, clazz.getEnclosingClass());
 
-      default:
-        return false;
+            default:
+                return false;
+        }
     }
-  }
 
-  public static final boolean isClass(TypeMirror type, Class<?> clazz) {
-    if (type == null) return false;
+    public static final boolean isClass(TypeMirror type, Class<?> clazz) {
+        if (type == null) return false;
 
-    return type.accept(TypeEquivalenceVisitor.INSTANCE, clazz);
-  }
+        return type.accept(TypeEquivalenceVisitor.INSTANCE, clazz);
+    }
 
-  private static final class TypeEquivalenceVisitor
-      extends AbstractTypeVisitor6<Boolean, Class<?>> {
-    public static final TypeEquivalenceVisitor INSTANCE = new TypeEquivalenceVisitor();
+    private static final class TypeEquivalenceVisitor extends AbstractTypeVisitor6<Boolean, Class<?>> {
+        public static final TypeEquivalenceVisitor INSTANCE = new TypeEquivalenceVisitor();
 
-    private TypeEquivalenceVisitor() {}
+        private TypeEquivalenceVisitor() {}
 
-    @Override
-    public Boolean visitDeclared(DeclaredType type, Class<?> paramClass) {
-      return isClass(type, paramClass);
-    }
+        @Override
+        public Boolean visitDeclared(DeclaredType type, Class<?> paramClass) {
+            return isClass(type, paramClass);
+        }
 
-    @Override
-    public Boolean visitPrimitive(PrimitiveType t, Class<?> clazz) {
-      switch (t.getKind()) {
-        case BOOLEAN:
-          return boolean.class.equals(clazz);
+        @Override
+        public Boolean visitPrimitive(PrimitiveType t, Class<?> clazz) {
+            switch (t.getKind()) {
+                case BOOLEAN:
+                    return boolean.class.equals(clazz);
 
-        case BYTE:
-          return byte.class.equals(clazz);
+                case BYTE:
+                    return byte.class.equals(clazz);
 
-        case CHAR:
-          return char.class.equals(clazz);
+                case CHAR:
+                    return char.class.equals(clazz);
 
-        case DOUBLE:
-          return double.class.equals(clazz);
+                case DOUBLE:
+                    return double.class.equals(clazz);
 
-        case FLOAT:
-          return float.class.equals(clazz);
+                case FLOAT:
+                    return float.class.equals(clazz);
 
-        case INT:
-          return int.class.equals(clazz);
+                case INT:
+                    return int.class.equals(clazz);
 
-        case LONG:
-          return long.class.equals(clazz);
+                case LONG:
+                    return long.class.equals(clazz);
 
-        case SHORT:
-          return short.class.equals(clazz);
+                case SHORT:
+                    return short.class.equals(clazz);
 
-        default:
-          return false;
-      }
-    }
+                default:
+                    return false;
+            }
+        }
 
-    @Override
-    public Boolean visitArray(ArrayType arrayType, Class<?> clazz) {
-      if (arrayType == null) return false;
-      if (!clazz.isArray()) return false;
+        @Override
+        public Boolean visitArray(ArrayType arrayType, Class<?> clazz) {
+            if (arrayType == null) return false;
+            if (!clazz.isArray()) return false;
 
-      return isClass(arrayType.getComponentType(), clazz.getComponentType());
-    }
+            return isClass(arrayType.getComponentType(), clazz.getComponentType());
+        }
 
-    @Override
-    public Boolean visitError(ErrorType t, Class<?> p) {
-      return false;
-    }
+        @Override
+        public Boolean visitError(ErrorType t, Class<?> p) {
+            return false;
+        }
 
-    @Override
-    public Boolean visitExecutable(ExecutableType t, Class<?> p) {
-      return false;
-    }
+        @Override
+        public Boolean visitExecutable(ExecutableType t, Class<?> p) {
+            return false;
+        }
 
-    @Override
-    public Boolean visitNull(NullType t, Class<?> p) {
-      return false;
-    }
+        @Override
+        public Boolean visitNull(NullType t, Class<?> p) {
+            return false;
+        }
 
-    @Override
-    public Boolean visitNoType(NoType t, Class<?> paramClass) {
-      // void???
-      return false;
-    }
+        @Override
+        public Boolean visitNoType(NoType t, Class<?> paramClass) {
+            // void???
+            return false;
+        }
 
-    @Override
-    public Boolean visitTypeVariable(TypeVariable t, Class<?> p) {
-      return false;
-    }
+        @Override
+        public Boolean visitTypeVariable(TypeVariable t, Class<?> p) {
+            return false;
+        }
 
-    @Override
-    public Boolean visitWildcard(WildcardType t, Class<?> p) {
-      return false;
+        @Override
+        public Boolean visitWildcard(WildcardType t, Class<?> p) {
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/TooManyInvocationsErrorHandler.java b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/TooManyInvocationsErrorHandler.java
index 9316fffdca7..fed125fb138 100644
--- a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/TooManyInvocationsErrorHandler.java
+++ b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/TooManyInvocationsErrorHandler.java
@@ -20,37 +20,37 @@
  */
 public final class TooManyInvocationsErrorHandler implements TestExecutionExceptionHandler {
 
-  @Override
-  public void handleTestExecutionException(ExtensionContext ctx, Throwable ex) throws Throwable {
-    if (ex instanceof TooManyInvocationsError) {
-      fixTooManyInvocationsError((TooManyInvocationsError) ex);
-      throw ex; // re‑throw so JUnit still marks the test as failed.
+    @Override
+    public void handleTestExecutionException(ExtensionContext ctx, Throwable ex) throws Throwable {
+        if (ex instanceof TooManyInvocationsError) {
+            fixTooManyInvocationsError((TooManyInvocationsError) ex);
+            throw ex; // re‑throw so JUnit still marks the test as failed.
+        }
+        throw ex;
     }
-    throw ex;
-  }
 
-  static void fixTooManyInvocationsError(final TooManyInvocationsError error) {
-    final List<IMockInvocation> accepted = error.getAcceptedInvocations();
-    for (final IMockInvocation invocation : accepted) {
-      try {
-        invocation.toString();
-      } catch (final Throwable t) {
-        final List<Object> args = invocation.getArguments();
-        for (int i = 0; i < args.size(); i++) {
-          final Object arg = args.get(i);
-          if (arg instanceof AssertionError) {
-            args.set(
-                i,
-                new AssertionError(
-                    "'"
-                        + arg.getClass().getName()
-                        + "' hidden due to '"
-                        + t.getClass().getName()
-                        + "'",
-                    t));
-          }
+    static void fixTooManyInvocationsError(final TooManyInvocationsError error) {
+        final List<IMockInvocation> accepted = error.getAcceptedInvocations();
+        for (final IMockInvocation invocation : accepted) {
+            try {
+                invocation.toString();
+            } catch (final Throwable t) {
+                final List<Object> args = invocation.getArguments();
+                for (int i = 0; i < args.size(); i++) {
+                    final Object arg = args.get(i);
+                    if (arg instanceof AssertionError) {
+                        args.set(
+                                i,
+                                new AssertionError(
+                                        "'"
+                                                + arg.getClass().getName()
+                                                + "' hidden due to '"
+                                                + t.getClass().getName()
+                                                + "'",
+                                        t));
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/datastreams/MockFeaturesDiscovery.java b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/datastreams/MockFeaturesDiscovery.java
index e03f447f57c..ae08be7bc75 100644
--- a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/datastreams/MockFeaturesDiscovery.java
+++ b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/datastreams/MockFeaturesDiscovery.java
@@ -7,21 +7,21 @@
 
 // TODO Ideally, DDAgentFeaturesDiscovery would be an interface to create a proper testable stubs
 public class MockFeaturesDiscovery extends DDAgentFeaturesDiscovery {
-  private final boolean supportsDataStreams;
+    private final boolean supportsDataStreams;
 
-  public MockFeaturesDiscovery(boolean supportsDataStreams) {
-    super(null, Monitoring.DISABLED, null, V0_5, true, false);
-    this.supportsDataStreams = supportsDataStreams;
-  }
+    public MockFeaturesDiscovery(boolean supportsDataStreams) {
+        super(null, Monitoring.DISABLED, null, V0_5, true, false);
+        this.supportsDataStreams = supportsDataStreams;
+    }
 
-  @Override
-  public void discover() {}
+    @Override
+    public void discover() {}
 
-  @Override
-  public void discoverIfOutdated() {}
+    @Override
+    public void discoverIfOutdated() {}
 
-  @Override
-  public boolean supportsDataStreams() {
-    return supportsDataStreams;
-  }
+    @Override
+    public boolean supportsDataStreams() {
+        return supportsDataStreams;
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/AbstractInstrumentationTest.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/AbstractInstrumentationTest.java
index 2efee9eccbe..86757670916 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/AbstractInstrumentationTest.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/AbstractInstrumentationTest.java
@@ -57,189 +57,184 @@
  */
 @WithConfig(key = "detailed.instrumentation.errors", value = "true")
 @ExtendWith({
-  TestClassShadowingExtension.class,
-  AllowContextTestingExtension.class,
-  LegacyContextTestingExtension.class,
-  ScopeDiagnosticsExtension.class
+    TestClassShadowingExtension.class,
+    AllowContextTestingExtension.class,
+    LegacyContextTestingExtension.class,
+    ScopeDiagnosticsExtension.class
 })
 public abstract class AbstractInstrumentationTest {
-  static final Instrumentation INSTRUMENTATION = ByteBuddyAgent.getInstrumentation();
-
-  static final long TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(20);
-
-  protected static final InstrumentationTestConfig testConfig = new InstrumentationTestConfig();
-
-  protected static TracerAPI tracer;
-  protected static ListWriter writer;
-  private static ClassFileTransformer activeTransformer;
-  private static ClassFileTransformerListener transformerListener;
-
-  @BeforeAll
-  static void initAll() {
-    InstrumentationErrors.resetErrors();
-
-    // If this fails, it's likely the result of another test loading Config before it can be
-    // injected into the bootstrap classpath.
-    assertNull(Config.class.getClassLoader(), "Config must load on the bootstrap classpath.");
-
-    // Create shared test writer and tracer
-    writer = new ListWriter();
-    CoreTracer coreTracer =
-        CoreTracer.builder()
-            .writer(writer)
-            .idGenerationStrategy(IdGenerationStrategy.fromName(testConfig.idGenerationStrategy))
-            .strictTraceWrites(testConfig.strictTraceWrites)
-            .build();
-    TracerInstaller.forceInstallGlobalTracer(coreTracer);
-    tracer = coreTracer;
-
-    ClassInjector.enableClassInjection(INSTRUMENTATION);
-
-    // if a test enables the instrumentation it verifies,
-    // the cache needs to be recomputed taking into account that instrumentation's matchers
-    ClassLoaderMatchers.resetState();
-
-    assertTrue(
-        ServiceLoader.load(
-                InstrumenterModule.class, AbstractInstrumentationTest.class.getClassLoader())
-            .iterator()
-            .hasNext(),
-        "No instrumentation found");
-    transformerListener = new ClassFileTransformerListener();
-    activeTransformer =
-        AgentInstaller.installBytebuddyAgent(
-            INSTRUMENTATION, true, AgentInstaller.getEnabledSystems(), false, transformerListener);
-
-    // check for instrumentation issues during installation
-    assertTrue(InstrumentationErrors.noErrors(), InstrumentationErrors::describeErrors);
-  }
-
-  @BeforeEach
-  public void init() {
-    InstrumentationErrors.resetErrors(); // reset for each test
-    tracer.flush();
-    writer.start();
-  }
-
-  @AfterEach
-  public void tearDown() {
-    tracer.flush();
-
-    // check for instrumentation issues while running each test
-    assertTrue(InstrumentationErrors.noErrors(), InstrumentationErrors::describeErrors);
-  }
-
-  @AfterAll
-  static void tearDownAll() {
-    if (tracer != null) {
-      tracer.close();
-      tracer = null;
+    static final Instrumentation INSTRUMENTATION = ByteBuddyAgent.getInstrumentation();
+
+    static final long TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(20);
+
+    protected static final InstrumentationTestConfig testConfig = new InstrumentationTestConfig();
+
+    protected static TracerAPI tracer;
+    protected static ListWriter writer;
+    private static ClassFileTransformer activeTransformer;
+    private static ClassFileTransformerListener transformerListener;
+
+    @BeforeAll
+    static void initAll() {
+        InstrumentationErrors.resetErrors();
+
+        // If this fails, it's likely the result of another test loading Config before it can be
+        // injected into the bootstrap classpath.
+        assertNull(Config.class.getClassLoader(), "Config must load on the bootstrap classpath.");
+
+        // Create shared test writer and tracer
+        writer = new ListWriter();
+        CoreTracer coreTracer = CoreTracer.builder()
+                .writer(writer)
+                .idGenerationStrategy(IdGenerationStrategy.fromName(testConfig.idGenerationStrategy))
+                .strictTraceWrites(testConfig.strictTraceWrites)
+                .build();
+        TracerInstaller.forceInstallGlobalTracer(coreTracer);
+        tracer = coreTracer;
+
+        ClassInjector.enableClassInjection(INSTRUMENTATION);
+
+        // if a test enables the instrumentation it verifies,
+        // the cache needs to be recomputed taking into account that instrumentation's matchers
+        ClassLoaderMatchers.resetState();
+
+        assertTrue(
+                ServiceLoader.load(InstrumenterModule.class, AbstractInstrumentationTest.class.getClassLoader())
+                        .iterator()
+                        .hasNext(),
+                "No instrumentation found");
+        transformerListener = new ClassFileTransformerListener();
+        activeTransformer = AgentInstaller.installBytebuddyAgent(
+                INSTRUMENTATION, true, AgentInstaller.getEnabledSystems(), false, transformerListener);
+
+        // check for instrumentation issues during installation
+        assertTrue(InstrumentationErrors.noErrors(), InstrumentationErrors::describeErrors);
     }
-    if (writer != null) {
-      writer.close();
-      writer = null;
-    }
-    if (activeTransformer != null) {
-      INSTRUMENTATION.removeTransformer(activeTransformer);
-      activeTransformer = null;
+
+    @BeforeEach
+    public void init() {
+        InstrumentationErrors.resetErrors(); // reset for each test
+        tracer.flush();
+        writer.start();
     }
-    // All cleanups should happen before this verify call.
-    // If not, a failing assertion may prevent cleanup
-    if (transformerListener != null) {
-      transformerListener.verify();
-      transformerListener = null;
+
+    @AfterEach
+    public void tearDown() {
+        tracer.flush();
+
+        // check for instrumentation issues while running each test
+        assertTrue(InstrumentationErrors.noErrors(), InstrumentationErrors::describeErrors);
     }
-  }
-
-  /**
-   * Checks the structure of the traces captured from the test tracer.
-   *
-   * @param matchers The matchers to verify the trace collection, one matcher by expected trace.
-   */
-  protected void assertTraces(TraceMatcher... matchers) {
-    assertTraces(identity(), matchers);
-  }
-
-  /**
-   * Checks the structure of the traces captured from the test tracer.
-   *
-   * @param options The {@link TraceAssertions.Options} to configure the checks.
-   * @param matchers The matchers to verify the trace collection, one matcher by expected trace.
-   */
-  protected void assertTraces(
-      UnaryOperator<TraceAssertions.Options> options, TraceMatcher... matchers) {
-    int expectedTraceCount = matchers.length;
-    try {
-      writer.waitForTraces(expectedTraceCount);
-    } catch (InterruptedException | TimeoutException e) {
-      throw new AssertionFailedError("Timeout while waiting for traces", e);
+
+    @AfterAll
+    static void tearDownAll() {
+        if (tracer != null) {
+            tracer.close();
+            tracer = null;
+        }
+        if (writer != null) {
+            writer.close();
+            writer = null;
+        }
+        if (activeTransformer != null) {
+            INSTRUMENTATION.removeTransformer(activeTransformer);
+            activeTransformer = null;
+        }
+        // All cleanups should happen before this verify call.
+        // If not, a failing assertion may prevent cleanup
+        if (transformerListener != null) {
+            transformerListener.verify();
+            transformerListener = null;
+        }
     }
-    TraceAssertions.assertTraces(writer, options, matchers);
-  }
-
-  /**
-   * Blocks the current thread until the traces written match the given predicate or the timeout
-   * occurs.
-   *
-   * @param predicate the condition that must be satisfied by the list of traces
-   */
-  protected void blockUntilTracesMatch(Predicate<List<List<DDSpan>>> predicate) {
-    long deadline = System.currentTimeMillis() + TIMEOUT_MILLIS;
-    while (!predicate.test(writer)) {
-      if (System.currentTimeMillis() > deadline) {
-        throw new RuntimeException(new TimeoutException("Timed out waiting for traces/spans."));
-      }
-      try {
-        Thread.sleep(10);
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      }
+
+    /**
+     * Checks the structure of the traces captured from the test tracer.
+     *
+     * @param matchers The matchers to verify the trace collection, one matcher by expected trace.
+     */
+    protected void assertTraces(TraceMatcher... matchers) {
+        assertTraces(identity(), matchers);
     }
-  }
-
-  protected void blockUntilChildSpansFinished(int numberOfSpans) {
-    blockUntilChildSpansFinished(tracer.activeSpan(), numberOfSpans);
-  }
-
-  static void blockUntilChildSpansFinished(AgentSpan span, int numberOfSpans) {
-    if (span instanceof DDSpan) {
-      TraceCollector traceCollector = ((DDSpan) span).spanContext().getTraceCollector();
-      if (!(traceCollector instanceof PendingTrace)) {
-        throw new IllegalStateException(
-            "Expected PendingTrace trace collector, got " + traceCollector.getClass().getName());
-      }
-
-      PendingTrace pendingTrace = (PendingTrace) traceCollector;
-      long deadline = System.currentTimeMillis() + TIMEOUT_MILLIS;
-
-      while (pendingTrace.size() < numberOfSpans) {
-        if (System.currentTimeMillis() > deadline) {
-          throw new RuntimeException(
-              new TimeoutException(
-                  "Timed out waiting for child spans. Received: " + pendingTrace.size()));
-        }
+
+    /**
+     * Checks the structure of the traces captured from the test tracer.
+     *
+     * @param options The {@link TraceAssertions.Options} to configure the checks.
+     * @param matchers The matchers to verify the trace collection, one matcher by expected trace.
+     */
+    protected void assertTraces(UnaryOperator<TraceAssertions.Options> options, TraceMatcher... matchers) {
+        int expectedTraceCount = matchers.length;
         try {
-          Thread.sleep(10);
-        } catch (InterruptedException e) {
-          Thread.currentThread().interrupt();
+            writer.waitForTraces(expectedTraceCount);
+        } catch (InterruptedException | TimeoutException e) {
+            throw new AssertionFailedError("Timeout while waiting for traces", e);
         }
-      }
+        TraceAssertions.assertTraces(writer, options, matchers);
     }
-  }
 
-  /** Configuration for {@link AbstractInstrumentationTest}. */
-  protected static class InstrumentationTestConfig {
-    private String idGenerationStrategy = "SEQUENTIAL";
-    private boolean strictTraceWrites = true;
+    /**
+     * Blocks the current thread until the traces written match the given predicate or the timeout
+     * occurs.
+     *
+     * @param predicate the condition that must be satisfied by the list of traces
+     */
+    protected void blockUntilTracesMatch(Predicate<List<List<DDSpan>>> predicate) {
+        long deadline = System.currentTimeMillis() + TIMEOUT_MILLIS;
+        while (!predicate.test(writer)) {
+            if (System.currentTimeMillis() > deadline) {
+                throw new RuntimeException(new TimeoutException("Timed out waiting for traces/spans."));
+            }
+            try {
+                Thread.sleep(10);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
+    }
+
+    protected void blockUntilChildSpansFinished(int numberOfSpans) {
+        blockUntilChildSpansFinished(tracer.activeSpan(), numberOfSpans);
+    }
 
-    public InstrumentationTestConfig idGenerationStrategy(String strategy) {
-      this.idGenerationStrategy = strategy;
-      return this;
+    static void blockUntilChildSpansFinished(AgentSpan span, int numberOfSpans) {
+        if (span instanceof DDSpan) {
+            TraceCollector traceCollector = ((DDSpan) span).spanContext().getTraceCollector();
+            if (!(traceCollector instanceof PendingTrace)) {
+                throw new IllegalStateException("Expected PendingTrace trace collector, got "
+                        + traceCollector.getClass().getName());
+            }
+
+            PendingTrace pendingTrace = (PendingTrace) traceCollector;
+            long deadline = System.currentTimeMillis() + TIMEOUT_MILLIS;
+
+            while (pendingTrace.size() < numberOfSpans) {
+                if (System.currentTimeMillis() > deadline) {
+                    throw new RuntimeException(new TimeoutException(
+                            "Timed out waiting for child spans. Received: " + pendingTrace.size()));
+                }
+                try {
+                    Thread.sleep(10);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+            }
+        }
     }
 
-    public InstrumentationTestConfig strictTraceWrites(boolean strict) {
-      this.strictTraceWrites = strict;
-      return this;
+    /** Configuration for {@link AbstractInstrumentationTest}. */
+    protected static class InstrumentationTestConfig {
+        private String idGenerationStrategy = "SEQUENTIAL";
+        private boolean strictTraceWrites = true;
+
+        public InstrumentationTestConfig idGenerationStrategy(String strategy) {
+            this.idGenerationStrategy = strategy;
+            return this;
+        }
+
+        public InstrumentationTestConfig strictTraceWrites(boolean strict) {
+            this.strictTraceWrites = strict;
+            return this;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/BootstrapClasspathSetupListener.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/BootstrapClasspathSetupListener.java
index b0efe12e855..86182693e95 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/BootstrapClasspathSetupListener.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/BootstrapClasspathSetupListener.java
@@ -42,205 +42,196 @@
  */
 public class BootstrapClasspathSetupListener implements LauncherSessionListener {
 
-  @Override
-  public void launcherSessionOpened(LauncherSession session) {
-    // this method is only needed to trigger this class' static initializer before JUnit does
-    // classpath scanning
-  }
-
-  private static final String[] TEST_EXCLUDED_BOOTSTRAP_PACKAGE_PREFIXES = {
-    "ch.qos.logback.classic.servlet", // this draws javax.servlet deps that are not needed
-  };
-
-  private static final String[] TEST_BOOTSTRAP_PREFIXES;
-
-  /**
-   * An exact copy of {@link datadog.trace.bootstrap.Constants#BOOTSTRAP_PACKAGE_PREFIXES}.
-   *
-   * <p>This list is needed to initialize the bootstrap classpath because Utils' static initializer
-   * references bootstrap classes (e.g. DatadogClassLoader).
-   */
-  public static final String[] BOOTSTRAP_PACKAGE_PREFIXES_COPY = {
-    "datadog.slf4j",
-    "datadog.common.filesystem",
-    "datadog.context",
-    "datadog.environment",
-    "datadog.json",
-    "datadog.yaml",
-    "datadog.instrument",
-    "datadog.appsec.api",
-    "datadog.metrics.api",
-    "datadog.trace.api",
-    "datadog.trace.bootstrap",
-    "datadog.trace.config.inversion",
-    "datadog.trace.context",
-    "datadog.trace.instrumentation.api",
-    "datadog.trace.logging",
-    "datadog.trace.util",
-  };
-
-  public static final ClassPath TEST_CLASSPATH = computeTestClasspath();
-
-  // matches names ending with Test and inner classes (e.g. MyTest$1, MyTest$InnerClass,
-  // MyTest$InnerClass$2, etc)
-  private static final Pattern TEST_CLASS_PATTERN = Pattern.compile(".*Test(\\$\\w+)*$");
-
-  static {
-    TEST_BOOTSTRAP_PREFIXES =
-        Arrays.copyOf(BOOTSTRAP_PACKAGE_PREFIXES_COPY, BOOTSTRAP_PACKAGE_PREFIXES_COPY.length + 3);
-    TEST_BOOTSTRAP_PREFIXES[BOOTSTRAP_PACKAGE_PREFIXES_COPY.length] = "datadog.logging";
-    TEST_BOOTSTRAP_PREFIXES[BOOTSTRAP_PACKAGE_PREFIXES_COPY.length + 1] = "org.slf4j";
-    TEST_BOOTSTRAP_PREFIXES[BOOTSTRAP_PACKAGE_PREFIXES_COPY.length + 2] = "ch.qos.logback";
-
-    ByteBuddyAgent.install();
-    setupBootstrapClasspath();
-  }
-
-  private static ClassPath computeTestClasspath() {
-    ClassLoader testClassLoader = BootstrapClasspathSetupListener.class.getClassLoader();
-    if (!(testClassLoader instanceof URLClassLoader)) {
-      // java9's system loader does not extend URLClassLoader
-      // which breaks Guava ClassPath lookup
-      testClassLoader = buildJavaClassPathClassLoader();
+    @Override
+    public void launcherSessionOpened(LauncherSession session) {
+        // this method is only needed to trigger this class' static initializer before JUnit does
+        // classpath scanning
     }
-    try {
-      return ClassPath.from(testClassLoader);
-    } catch (final IOException e) {
-      throw new RuntimeException(e);
+
+    private static final String[] TEST_EXCLUDED_BOOTSTRAP_PACKAGE_PREFIXES = {
+        "ch.qos.logback.classic.servlet", // this draws javax.servlet deps that are not needed
+    };
+
+    private static final String[] TEST_BOOTSTRAP_PREFIXES;
+
+    /**
+     * An exact copy of {@link datadog.trace.bootstrap.Constants#BOOTSTRAP_PACKAGE_PREFIXES}.
+     *
+     * <p>This list is needed to initialize the bootstrap classpath because Utils' static initializer
+     * references bootstrap classes (e.g. DatadogClassLoader).
+     */
+    public static final String[] BOOTSTRAP_PACKAGE_PREFIXES_COPY = {
+        "datadog.slf4j",
+        "datadog.common.filesystem",
+        "datadog.context",
+        "datadog.environment",
+        "datadog.json",
+        "datadog.yaml",
+        "datadog.instrument",
+        "datadog.appsec.api",
+        "datadog.metrics.api",
+        "datadog.trace.api",
+        "datadog.trace.bootstrap",
+        "datadog.trace.config.inversion",
+        "datadog.trace.context",
+        "datadog.trace.instrumentation.api",
+        "datadog.trace.logging",
+        "datadog.trace.util",
+    };
+
+    public static final ClassPath TEST_CLASSPATH = computeTestClasspath();
+
+    // matches names ending with Test and inner classes (e.g. MyTest$1, MyTest$InnerClass,
+    // MyTest$InnerClass$2, etc)
+    private static final Pattern TEST_CLASS_PATTERN = Pattern.compile(".*Test(\\$\\w+)*$");
+
+    static {
+        TEST_BOOTSTRAP_PREFIXES =
+                Arrays.copyOf(BOOTSTRAP_PACKAGE_PREFIXES_COPY, BOOTSTRAP_PACKAGE_PREFIXES_COPY.length + 3);
+        TEST_BOOTSTRAP_PREFIXES[BOOTSTRAP_PACKAGE_PREFIXES_COPY.length] = "datadog.logging";
+        TEST_BOOTSTRAP_PREFIXES[BOOTSTRAP_PACKAGE_PREFIXES_COPY.length + 1] = "org.slf4j";
+        TEST_BOOTSTRAP_PREFIXES[BOOTSTRAP_PACKAGE_PREFIXES_COPY.length + 2] = "ch.qos.logback";
+
+        ByteBuddyAgent.install();
+        setupBootstrapClasspath();
+    }
+
+    private static ClassPath computeTestClasspath() {
+        ClassLoader testClassLoader = BootstrapClasspathSetupListener.class.getClassLoader();
+        if (!(testClassLoader instanceof URLClassLoader)) {
+            // java9's system loader does not extend URLClassLoader
+            // which breaks Guava ClassPath lookup
+            testClassLoader = buildJavaClassPathClassLoader();
+        }
+        try {
+            return ClassPath.from(testClassLoader);
+        } catch (final IOException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
-
-  /**
-   * Parse JVM classpath and return ClassLoader containing all classpath entries. Inspired by Guava.
-   */
-  @SuppressForbidden
-  private static ClassLoader buildJavaClassPathClassLoader() {
-    List<URL> urls = new ArrayList<>();
-    String classPath = System.getProperty("java.class.path", "");
-    for (String entry : classPath.split(pathSeparator)) {
-      try {
-        File pathEntry = new File(entry);
+
+    /**
+     * Parse JVM classpath and return ClassLoader containing all classpath entries. Inspired by Guava.
+     */
+    @SuppressForbidden
+    private static ClassLoader buildJavaClassPathClassLoader() {
+        List<URL> urls = new ArrayList<>();
+        String classPath = System.getProperty("java.class.path", "");
+        for (String entry : classPath.split(pathSeparator)) {
+            try {
+                File pathEntry = new File(entry);
+                try {
+                    urls.add(pathEntry.toURI().toURL());
+                } catch (final SecurityException e) {
+                    urls.add(new URL("file", null, pathEntry.getAbsolutePath()));
+                }
+            } catch (final MalformedURLException e) {
+                System.err.printf("Error injecting bootstrap jar: Malformed classpath entry: %s. %s%n", entry, e);
+            }
+        }
+        return new URLClassLoader(urls.toArray(new URL[0]), null);
+    }
+
+    private static void setupBootstrapClasspath() {
+        // Ensure there weren't any bootstrap classes loaded prematurely.
+        Set<String> prematureBootstrapClasses = new TreeSet<>();
+        for (Class<?> clazz : ByteBuddyAgent.getInstrumentation().getAllLoadedClasses()) {
+            // getAllLoadedClasses can return null classes (Class Unloading)
+            if (clazz != null
+                    && isBootstrapClass(clazz)
+                    && clazz.getClassLoader() != null
+                    && !clazz.getName().equals("datadog.trace.api.DisableTestTrace")
+                    && !clazz.getName().startsWith("org.slf4j")) {
+                prematureBootstrapClasses.add(clazz.getName());
+            }
+        }
+        if (!prematureBootstrapClasses.isEmpty()) {
+            throw new AssertionError(prematureBootstrapClasses.size()
+                    + " classes were loaded before bootstrap classpath was initialized: "
+                    + prematureBootstrapClasses);
+        }
         try {
-          urls.add(pathEntry.toURI().toURL());
-        } catch (final SecurityException e) {
-          urls.add(new URL("file", null, pathEntry.getAbsolutePath()));
+            final File bootstrapJar = createBootstrapJar();
+            ByteBuddyAgent.getInstrumentation().appendToBootstrapClassLoaderSearch(new JarFile(bootstrapJar));
+            BootstrapProxy.addBootstrapResource(bootstrapJar.toURI().toURL());
+        } catch (final IOException e) {
+            throw new RuntimeException(e);
         }
-      } catch (final MalformedURLException e) {
-        System.err.printf(
-            "Error injecting bootstrap jar: Malformed classpath entry: %s. %s%n", entry, e);
-      }
     }
-    return new URLClassLoader(urls.toArray(new URL[0]), null);
-  }
-
-  private static void setupBootstrapClasspath() {
-    // Ensure there weren't any bootstrap classes loaded prematurely.
-    Set<String> prematureBootstrapClasses = new TreeSet<>();
-    for (Class<?> clazz : ByteBuddyAgent.getInstrumentation().getAllLoadedClasses()) {
-      // getAllLoadedClasses can return null classes (Class Unloading)
-      if (clazz != null
-          && isBootstrapClass(clazz)
-          && clazz.getClassLoader() != null
-          && !clazz.getName().equals("datadog.trace.api.DisableTestTrace")
-          && !clazz.getName().startsWith("org.slf4j")) {
-        prematureBootstrapClasses.add(clazz.getName());
-      }
+
+    private static File createBootstrapJar() throws IOException {
+        Set<String> bootstrapClasses = new HashSet<>();
+        for (ClassPath.ClassInfo info : TEST_CLASSPATH.getAllClasses()) {
+            if (isBootstrapClass(info)) {
+                bootstrapClasses.add(info.getResourceName());
+            }
+        }
+        URL jar = ClasspathUtils.createJarWithClasses(
+                TestClassShadowingExtension.class.getClassLoader(), bootstrapClasses.toArray(new String[0]));
+        return new File(jar.getFile());
+    }
+
+    public static boolean isBootstrapClass(final ClassPath.ClassInfo info) {
+        return isBootstrapClass(
+                info, ClassPath.ClassInfo::getName, ClassPath.ClassInfo::getResourceName, ClassPath.ClassInfo::url);
     }
-    if (!prematureBootstrapClasses.isEmpty()) {
-      throw new AssertionError(
-          prematureBootstrapClasses.size()
-              + " classes were loaded before bootstrap classpath was initialized: "
-              + prematureBootstrapClasses);
+
+    public static boolean isBootstrapClass(final Class<?> clazz) {
+        return !clazz.isPrimitive()
+                && isBootstrapClass(
+                        clazz,
+                        Class::getName,
+                        BootstrapClasspathSetupListener::classToResourceName,
+                        BootstrapClasspathSetupListener::classToUrl);
     }
-    try {
-      final File bootstrapJar = createBootstrapJar();
-      ByteBuddyAgent.getInstrumentation()
-          .appendToBootstrapClassLoaderSearch(new JarFile(bootstrapJar));
-      BootstrapProxy.addBootstrapResource(bootstrapJar.toURI().toURL());
-    } catch (final IOException e) {
-      throw new RuntimeException(e);
+
+    private static final Map<String, String> CLASS_NAME_TO_RESOURCE_NAME = new HashMap<>();
+
+    private static String classToResourceName(final Class<?> clazz) {
+        return CLASS_NAME_TO_RESOURCE_NAME.computeIfAbsent(clazz.getName(), k -> k.replace('.', '/') + ".class");
     }
-  }
-
-  private static File createBootstrapJar() throws IOException {
-    Set<String> bootstrapClasses = new HashSet<>();
-    for (ClassPath.ClassInfo info : TEST_CLASSPATH.getAllClasses()) {
-      if (isBootstrapClass(info)) {
-        bootstrapClasses.add(info.getResourceName());
-      }
+
+    private static URL classToUrl(final Class<?> clazz) {
+        ClassLoader classLoader = clazz.getClassLoader();
+        return classLoader == null ? null : classLoader.getResource(classToResourceName(clazz));
     }
-    URL jar =
-        ClasspathUtils.createJarWithClasses(
-            TestClassShadowingExtension.class.getClassLoader(),
-            bootstrapClasses.toArray(new String[0]));
-    return new File(jar.getFile());
-  }
-
-  public static boolean isBootstrapClass(final ClassPath.ClassInfo info) {
-    return isBootstrapClass(
-        info,
-        ClassPath.ClassInfo::getName,
-        ClassPath.ClassInfo::getResourceName,
-        ClassPath.ClassInfo::url);
-  }
-
-  public static boolean isBootstrapClass(final Class<?> clazz) {
-    return !clazz.isPrimitive()
-        && isBootstrapClass(
-            clazz,
-            Class::getName,
-            BootstrapClasspathSetupListener::classToResourceName,
-            BootstrapClasspathSetupListener::classToUrl);
-  }
-
-  private static final Map<String, String> CLASS_NAME_TO_RESOURCE_NAME = new HashMap<>();
-
-  private static String classToResourceName(final Class<?> clazz) {
-    return CLASS_NAME_TO_RESOURCE_NAME.computeIfAbsent(
-        clazz.getName(), k -> k.replace('.', '/') + ".class");
-  }
-
-  private static URL classToUrl(final Class<?> clazz) {
-    ClassLoader classLoader = clazz.getClassLoader();
-    return classLoader == null ? null : classLoader.getResource(classToResourceName(clazz));
-  }
-
-  private static <T> boolean isBootstrapClass(
-      final T type,
-      final Function<T, String> toName,
-      final Function<T, String> toResourceName,
-      final Function<T, URL> toUrl) {
-    String name = toName.apply(type);
-    for (String prefix : TEST_BOOTSTRAP_PREFIXES) {
-      if (name.startsWith(prefix)) {
-        for (String excluded : TEST_EXCLUDED_BOOTSTRAP_PACKAGE_PREFIXES) {
-          if (name.startsWith(excluded)) {
-            return false;
-          }
-        }
-        // Tests should be loaded by the application classloader.
-        // If a test is loaded by the bootstrap classloader,
-        // it will either fail during the test discovery phase
-        // (if its method signatures contain classes only visible to the app classloader)
-        // or will not be discovered at all
-        // (because JUnit will be looking for annotation classes loaded by the app classloader)
-        if (TEST_CLASS_PATTERN.matcher(name).matches()) {
-          String resource = toResourceName.apply(type);
-          URL url = toUrl.apply(type);
-          if (isATest(resource, url)) {
-            return false;
-          }
+
+    private static <T> boolean isBootstrapClass(
+            final T type,
+            final Function<T, String> toName,
+            final Function<T, String> toResourceName,
+            final Function<T, URL> toUrl) {
+        String name = toName.apply(type);
+        for (String prefix : TEST_BOOTSTRAP_PREFIXES) {
+            if (name.startsWith(prefix)) {
+                for (String excluded : TEST_EXCLUDED_BOOTSTRAP_PACKAGE_PREFIXES) {
+                    if (name.startsWith(excluded)) {
+                        return false;
+                    }
+                }
+                // Tests should be loaded by the application classloader.
+                // If a test is loaded by the bootstrap classloader,
+                // it will either fail during the test discovery phase
+                // (if its method signatures contain classes only visible to the app classloader)
+                // or will not be discovered at all
+                // (because JUnit will be looking for annotation classes loaded by the app classloader)
+                if (TEST_CLASS_PATTERN.matcher(name).matches()) {
+                    String resource = toResourceName.apply(type);
+                    URL url = toUrl.apply(type);
+                    if (isATest(resource, url)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
         }
-        return true;
-      }
+        return false;
+    }
+
+    // A safety check to only consider classes from "test/latestDepTest/forkedTest/etc" source roots
+    private static boolean isATest(String resourceName, URL url) {
+        return url != null
+                && (url.getPath().endsWith("test/" + resourceName)
+                        || url.getPath().endsWith("Test/" + resourceName));
     }
-    return false;
-  }
-
-  // A safety check to only consider classes from "test/latestDepTest/forkedTest/etc" source roots
-  private static boolean isATest(String resourceName, URL url) {
-    return url != null
-        && (url.getPath().endsWith("test/" + resourceName)
-            || url.getPath().endsWith("Test/" + resourceName));
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/ClassFileTransformerListener.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/ClassFileTransformerListener.java
index a865bf374d1..bb624f7d515 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/ClassFileTransformerListener.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/ClassFileTransformerListener.java
@@ -15,64 +15,56 @@
 
 public class ClassFileTransformerListener implements AgentBuilder.Listener {
 
-  final Set<String> transformedClassesNames = Sets.newConcurrentHashSet();
-  final Set<TypeDescription> transformedClassesTypes = Sets.newConcurrentHashSet();
+    final Set<String> transformedClassesNames = Sets.newConcurrentHashSet();
+    final Set<TypeDescription> transformedClassesTypes = Sets.newConcurrentHashSet();
 
-  @Override
-  public void onTransformation(
-      TypeDescription typeDescription,
-      @MaybeNull ClassLoader classLoader,
-      @MaybeNull JavaModule module,
-      boolean loaded,
-      DynamicType dynamicType) {
-    this.transformedClassesNames.add(typeDescription.getActualName());
-    this.transformedClassesTypes.add(typeDescription);
-  }
-
-  @SuppressForbidden // Allows System.out.println
-  @Override
-  public void onError(
-      String typeName,
-      ClassLoader classLoader,
-      JavaModule module,
-      boolean loaded,
-      Throwable throwable) {
-    // Incorrect* classes assert on incorrect api usage. Error expected.
-    if (typeName.startsWith("context.FieldInjectionTestInstrumentation$Incorrect")
-        && throwable.getMessage().startsWith("Incorrect Context Api Usage detected.")) {
-      return;
+    @Override
+    public void onTransformation(
+            TypeDescription typeDescription,
+            @MaybeNull ClassLoader classLoader,
+            @MaybeNull JavaModule module,
+            boolean loaded,
+            DynamicType dynamicType) {
+        this.transformedClassesNames.add(typeDescription.getActualName());
+        this.transformedClassesTypes.add(typeDescription);
     }
 
-    InstrumentationErrors.recordError(throwable);
-    System.out.println(
-        "Unexpected instrumentation error when instrumenting " + typeName + " on " + classLoader);
-    throwable.printStackTrace();
-  }
+    @SuppressForbidden // Allows System.out.println
+    @Override
+    public void onError(
+            String typeName, ClassLoader classLoader, JavaModule module, boolean loaded, Throwable throwable) {
+        // Incorrect* classes assert on incorrect api usage. Error expected.
+        if (typeName.startsWith("context.FieldInjectionTestInstrumentation$Incorrect")
+                && throwable.getMessage().startsWith("Incorrect Context Api Usage detected.")) {
+            return;
+        }
 
-  @Override
-  public void onDiscovery(
-      String typeName, ClassLoader classLoader, JavaModule module, boolean loaded) {
-    // Nothing special to do
-  }
+        InstrumentationErrors.recordError(throwable);
+        System.out.println("Unexpected instrumentation error when instrumenting " + typeName + " on " + classLoader);
+        throwable.printStackTrace();
+    }
 
-  @Override
-  public void onIgnored(
-      TypeDescription typeDescription, ClassLoader classLoader, JavaModule module, boolean loaded) {
-    // Nothing special to do
-  }
+    @Override
+    public void onDiscovery(String typeName, ClassLoader classLoader, JavaModule module, boolean loaded) {
+        // Nothing special to do
+    }
 
-  @Override
-  public void onComplete(
-      String typeName, ClassLoader classLoader, JavaModule module, boolean loaded) {
-    // Nothing special to do
-  }
+    @Override
+    public void onIgnored(TypeDescription typeDescription, ClassLoader classLoader, JavaModule module, boolean loaded) {
+        // Nothing special to do
+    }
 
-  public void verify() {
-    // Check effectively transformed classes that should have been ignored
-    assertTrue(
-        this.transformedClassesTypes.stream()
-            .map(TypeDescription::getActualName)
-            .noneMatch(GlobalIgnores::isAdditionallyIgnored),
-        "Transformed classes match global libraries ignore matcher");
-  }
+    @Override
+    public void onComplete(String typeName, ClassLoader classLoader, JavaModule module, boolean loaded) {
+        // Nothing special to do
+    }
+
+    public void verify() {
+        // Check effectively transformed classes that should have been ignored
+        assertTrue(
+                this.transformedClassesTypes.stream()
+                        .map(TypeDescription::getActualName)
+                        .noneMatch(GlobalIgnores::isAdditionallyIgnored),
+                "Transformed classes match global libraries ignore matcher");
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/TestClassShadowingExtension.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/TestClassShadowingExtension.java
index 30564a0fe08..995b4cffcc3 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/TestClassShadowingExtension.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/TestClassShadowingExtension.java
@@ -23,111 +23,107 @@
  * @see BootstrapClasspathSetupListener#isBootstrapClass(Class)
  */
 public final class TestClassShadowingExtension
-    implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback {
+        implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback {
 
-  private static final ExtensionContext.Namespace NAMESPACE =
-      ExtensionContext.Namespace.create("dd", "spock");
+    private static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace.create("dd", "spock");
 
-  private static final String INSTRUMENTATION_CLASSLOADER = "instrumentation-class-loader";
-  private static final String ORIGINAL_CLASSLOADER = "original-thread-context-class-loader";
+    private static final String INSTRUMENTATION_CLASSLOADER = "instrumentation-class-loader";
+    private static final String ORIGINAL_CLASSLOADER = "original-thread-context-class-loader";
 
-  @Override
-  public void beforeAll(ExtensionContext ctx) {
-    Class<?> testClass = ctx.getRequiredTestClass();
-    assertNoBootstrapClassesInTestClass(testClass);
-
-    InstrumentationClassLoader custom =
-        new InstrumentationClassLoader(testClass.getClassLoader(), testClass.getName());
-    ctx.getStore(NAMESPACE).put(INSTRUMENTATION_CLASSLOADER, custom);
-  }
+    @Override
+    public void beforeAll(ExtensionContext ctx) {
+        Class<?> testClass = ctx.getRequiredTestClass();
+        assertNoBootstrapClassesInTestClass(testClass);
 
-  private static void assertNoBootstrapClassesInTestClass(final Class<?> testClass) {
-    for (final Field field : testClass.getDeclaredFields()) {
-      assertNotBootstrapClass(testClass, field.getType());
-    }
-    for (final Method method : testClass.getDeclaredMethods()) {
-      assertNotBootstrapClass(testClass, method.getReturnType());
-      for (final Class<?> paramType : method.getParameterTypes()) {
-        assertNotBootstrapClass(testClass, paramType);
-      }
+        InstrumentationClassLoader custom =
+                new InstrumentationClassLoader(testClass.getClassLoader(), testClass.getName());
+        ctx.getStore(NAMESPACE).put(INSTRUMENTATION_CLASSLOADER, custom);
     }
-  }
 
-  private static void assertNotBootstrapClass(final Class<?> testClass, final Class<?> clazz) {
-    if (BootstrapClasspathSetupListener.isBootstrapClass(clazz)) {
-      throw new IllegalStateException(
-          testClass.getName()
-              + ": Bootstrap classes are not allowed in test class field or method signatures. Offending class: "
-              + clazz.getName());
+    private static void assertNoBootstrapClassesInTestClass(final Class<?> testClass) {
+        for (final Field field : testClass.getDeclaredFields()) {
+            assertNotBootstrapClass(testClass, field.getType());
+        }
+        for (final Method method : testClass.getDeclaredMethods()) {
+            assertNotBootstrapClass(testClass, method.getReturnType());
+            for (final Class<?> paramType : method.getParameterTypes()) {
+                assertNotBootstrapClass(testClass, paramType);
+            }
+        }
     }
-  }
 
-  @Override
-  public void afterAll(ExtensionContext ctx) {
-    // nothing to clean‑up – garbage collector will take care of loader
-  }
-
-  @Override
-  public void beforeEach(ExtensionContext ctx) {
-    ClassLoader instrumentationClassloader =
-        ctx.getStore(NAMESPACE).get(INSTRUMENTATION_CLASSLOADER, ClassLoader.class);
-    ctx.getStore(NAMESPACE)
-        .put(ORIGINAL_CLASSLOADER, Thread.currentThread().getContextClassLoader());
-    Thread.currentThread().setContextClassLoader(instrumentationClassloader);
-  }
-
-  @Override
-  public void afterEach(ExtensionContext ctx) {
-    ClassLoader prev = ctx.getStore(NAMESPACE).remove(ORIGINAL_CLASSLOADER, ClassLoader.class);
-    if (prev != null) {
-      Thread.currentThread().setContextClassLoader(prev);
+    private static void assertNotBootstrapClass(final Class<?> testClass, final Class<?> clazz) {
+        if (BootstrapClasspathSetupListener.isBootstrapClass(clazz)) {
+            throw new IllegalStateException(testClass.getName()
+                    + ": Bootstrap classes are not allowed in test class field or method signatures. Offending class: "
+                    + clazz.getName());
+        }
     }
-  }
 
-  /** Run test classes in a classloader which loads test classes before delegating. */
-  private static class InstrumentationClassLoader extends ClassLoader {
-    private final ClassLoader parent;
-    private final String shadowPrefix;
-
-    InstrumentationClassLoader(ClassLoader parent, String shadowPrefix) {
-      super(parent);
-      this.parent = parent;
-      this.shadowPrefix = shadowPrefix;
+    @Override
+    public void afterAll(ExtensionContext ctx) {
+        // nothing to clean‑up – garbage collector will take care of loader
     }
 
-    /** Forcefully inject the bytes of clazz into this classloader. */
-    Class<?> shadow(Class<?> clazz) throws IOException {
-      Class<?> loaded = findLoadedClass(clazz.getName());
-      if (loaded != null && loaded.getClassLoader() == this) {
-        return loaded;
-      }
-      try (ClassFileLocator classFileLocator =
-          ClassFileLocator.ForClassLoader.of(clazz.getClassLoader())) {
-        byte[] classBytes = classFileLocator.locate(clazz.getName()).resolve();
-        return defineClass(clazz.getName(), classBytes, 0, classBytes.length);
-      }
+    @Override
+    public void beforeEach(ExtensionContext ctx) {
+        ClassLoader instrumentationClassloader =
+                ctx.getStore(NAMESPACE).get(INSTRUMENTATION_CLASSLOADER, ClassLoader.class);
+        ctx.getStore(NAMESPACE).put(ORIGINAL_CLASSLOADER, Thread.currentThread().getContextClassLoader());
+        Thread.currentThread().setContextClassLoader(instrumentationClassloader);
     }
 
     @Override
-    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-      synchronized (getClassLoadingLock(name)) {
-        Class<?> c = findLoadedClass(name);
-        if (c != null) {
-          return c;
+    public void afterEach(ExtensionContext ctx) {
+        ClassLoader prev = ctx.getStore(NAMESPACE).remove(ORIGINAL_CLASSLOADER, ClassLoader.class);
+        if (prev != null) {
+            Thread.currentThread().setContextClassLoader(prev);
+        }
+    }
+
+    /** Run test classes in a classloader which loads test classes before delegating. */
+    private static class InstrumentationClassLoader extends ClassLoader {
+        private final ClassLoader parent;
+        private final String shadowPrefix;
+
+        InstrumentationClassLoader(ClassLoader parent, String shadowPrefix) {
+            super(parent);
+            this.parent = parent;
+            this.shadowPrefix = shadowPrefix;
         }
-        if (name.startsWith(shadowPrefix)) {
-          try {
-            Class<?> shadowed = shadow(parent.loadClass(name));
-            if (resolve) {
-              resolveClass(shadowed);
+
+        /** Forcefully inject the bytes of clazz into this classloader. */
+        Class<?> shadow(Class<?> clazz) throws IOException {
+            Class<?> loaded = findLoadedClass(clazz.getName());
+            if (loaded != null && loaded.getClassLoader() == this) {
+                return loaded;
+            }
+            try (ClassFileLocator classFileLocator = ClassFileLocator.ForClassLoader.of(clazz.getClassLoader())) {
+                byte[] classBytes = classFileLocator.locate(clazz.getName()).resolve();
+                return defineClass(clazz.getName(), classBytes, 0, classBytes.length);
+            }
+        }
+
+        @Override
+        protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+            synchronized (getClassLoadingLock(name)) {
+                Class<?> c = findLoadedClass(name);
+                if (c != null) {
+                    return c;
+                }
+                if (name.startsWith(shadowPrefix)) {
+                    try {
+                        Class<?> shadowed = shadow(parent.loadClass(name));
+                        if (resolve) {
+                            resolveClass(shadowed);
+                        }
+                        return shadowed;
+                    } catch (Exception ignored) {
+                        // fall‑back to parent below
+                    }
+                }
+                return super.loadClass(name, resolve);
             }
-            return shadowed;
-          } catch (Exception ignored) {
-            // fall‑back to parent below
-          }
         }
-        return super.loadClass(name, resolve);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java
index 76cb201e790..d3b71ac8870 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java
@@ -18,101 +18,101 @@
  * to, trace flags, span attributes, and trace state.
  */
 public final class SpanLinkMatcher {
-  private final Matcher<DDTraceId> traceIdMatcher;
-  private final Matcher<Long> spanIdMatcher;
-  private Matcher<Byte> traceFlagsMatcher;
-  private Matcher<SpanAttributes> spanAttributesMatcher;
-  private Matcher<String> traceStateMatcher;
+    private final Matcher<DDTraceId> traceIdMatcher;
+    private final Matcher<Long> spanIdMatcher;
+    private Matcher<Byte> traceFlagsMatcher;
+    private Matcher<SpanAttributes> spanAttributesMatcher;
+    private Matcher<String> traceStateMatcher;
 
-  private SpanLinkMatcher(Matcher<DDTraceId> traceIdMatcher, Matcher<Long> spanIdMatcher) {
-    this.traceIdMatcher = traceIdMatcher;
-    this.spanIdMatcher = spanIdMatcher;
-    this.traceFlagsMatcher = is(DEFAULT_FLAGS);
-    this.spanAttributesMatcher = is(EMPTY);
-    this.traceStateMatcher = is("");
-  }
+    private SpanLinkMatcher(Matcher<DDTraceId> traceIdMatcher, Matcher<Long> spanIdMatcher) {
+        this.traceIdMatcher = traceIdMatcher;
+        this.spanIdMatcher = spanIdMatcher;
+        this.traceFlagsMatcher = is(DEFAULT_FLAGS);
+        this.spanAttributesMatcher = is(EMPTY);
+        this.traceStateMatcher = is("");
+    }
 
-  /**
-   * Creates a {@code SpanLinkMatcher} that matches a span link to the given span.
-   *
-   * @param span The span the link should match to.
-   * @return A {@code SpanLinkMatcher} that matches a span link to the given span.
-   */
-  public static SpanLinkMatcher to(DDSpan span) {
-    return to(span.spanContext());
-  }
+    /**
+     * Creates a {@code SpanLinkMatcher} that matches a span link to the given span.
+     *
+     * @param span The span the link should match to.
+     * @return A {@code SpanLinkMatcher} that matches a span link to the given span.
+     */
+    public static SpanLinkMatcher to(DDSpan span) {
+        return to(span.spanContext());
+    }
 
-  /**
-   * Creates a {@code SpanLinkMatcher} that matches a span link to the given span context.
-   *
-   * @param spanContext The span context the span link should match to.
-   * @return A {@code SpanLinkMatcher} that matches a span link to the given span context.
-   */
-  public static SpanLinkMatcher to(AgentSpanContext spanContext) {
-    return to(spanContext.getTraceId(), spanContext.getSpanId());
-  }
+    /**
+     * Creates a {@code SpanLinkMatcher} that matches a span link to the given span context.
+     *
+     * @param spanContext The span context the span link should match to.
+     * @return A {@code SpanLinkMatcher} that matches a span link to the given span context.
+     */
+    public static SpanLinkMatcher to(AgentSpanContext spanContext) {
+        return to(spanContext.getTraceId(), spanContext.getSpanId());
+    }
 
-  /**
-   * Creates a {@code SpanLinkMatcher} that matches a span link to the given trace / span
-   * identifiers.
-   *
-   * @param traceId The trace ID the span link should match to.
-   * @param spanId The trace ID the span link should match to.
-   * @return A {@code SpanLinkMatcher} that matches a span link to the given trace / span
-   *     identifiers.
-   */
-  public static SpanLinkMatcher to(DDTraceId traceId, long spanId) {
-    return new SpanLinkMatcher(is(traceId), is(spanId));
-  }
+    /**
+     * Creates a {@code SpanLinkMatcher} that matches a span link to the given trace / span
+     * identifiers.
+     *
+     * @param traceId The trace ID the span link should match to.
+     * @param spanId The trace ID the span link should match to.
+     * @return A {@code SpanLinkMatcher} that matches a span link to the given trace / span
+     *     identifiers.
+     */
+    public static SpanLinkMatcher to(DDTraceId traceId, long spanId) {
+        return new SpanLinkMatcher(is(traceId), is(spanId));
+    }
 
-  /**
-   * Creates a {@code SpanLinkMatcher} that matches any span link.
-   *
-   * @return A {@code SpanLinkMatcher} that matches any span link.
-   */
-  public static SpanLinkMatcher any() {
-    return new SpanLinkMatcher(Matchers.any(), Matchers.any());
-  }
+    /**
+     * Creates a {@code SpanLinkMatcher} that matches any span link.
+     *
+     * @return A {@code SpanLinkMatcher} that matches any span link.
+     */
+    public static SpanLinkMatcher any() {
+        return new SpanLinkMatcher(Matchers.any(), Matchers.any());
+    }
 
-  /**
-   * Sets the trace flags value to match against.
-   *
-   * @param traceFlags The byte value representing the trace flags to match against.
-   * @return The updated {@code SpanLinkMatcher} instance with the new trace flags constraint.
-   */
-  public SpanLinkMatcher traceFlags(byte traceFlags) {
-    this.traceFlagsMatcher = is(traceFlags);
-    return this;
-  }
+    /**
+     * Sets the trace flags value to match against.
+     *
+     * @param traceFlags The byte value representing the trace flags to match against.
+     * @return The updated {@code SpanLinkMatcher} instance with the new trace flags constraint.
+     */
+    public SpanLinkMatcher traceFlags(byte traceFlags) {
+        this.traceFlagsMatcher = is(traceFlags);
+        return this;
+    }
 
-  /**
-   * Sets the span attributes value to match against.
-   *
-   * @param spanAttributes The span attributes to match against.
-   * @return The updated {@code SpanLinkMatcher} instance with the new span attributes constraint.
-   */
-  public SpanLinkMatcher attributes(SpanAttributes spanAttributes) {
-    this.spanAttributesMatcher = is(spanAttributes);
-    return this;
-  }
+    /**
+     * Sets the span attributes value to match against.
+     *
+     * @param spanAttributes The span attributes to match against.
+     * @return The updated {@code SpanLinkMatcher} instance with the new span attributes constraint.
+     */
+    public SpanLinkMatcher attributes(SpanAttributes spanAttributes) {
+        this.spanAttributesMatcher = is(spanAttributes);
+        return this;
+    }
 
-  /**
-   * Sets the trace state value to match against.
-   *
-   * @param traceState The trace state to match against.
-   * @return The updated {@code SpanLinkMatcher} instance with the new trace state constraint.
-   */
-  public SpanLinkMatcher traceState(String traceState) {
-    this.traceStateMatcher = is(traceState);
-    return this;
-  }
+    /**
+     * Sets the trace state value to match against.
+     *
+     * @param traceState The trace state to match against.
+     * @return The updated {@code SpanLinkMatcher} instance with the new trace state constraint.
+     */
+    public SpanLinkMatcher traceState(String traceState) {
+        this.traceStateMatcher = is(traceState);
+        return this;
+    }
 
-  void assertLink(AgentSpanLink link) {
-    // Assert link values
-    assertValue(this.traceIdMatcher, link.traceId(), "Expected trace identifier");
-    assertValue(this.spanIdMatcher, link.spanId(), "Expected span identifier");
-    assertValue(this.traceFlagsMatcher, link.traceFlags(), "Expected trace flags");
-    assertValue(this.spanAttributesMatcher, link.attributes(), "Expected attributes");
-    assertValue(this.traceStateMatcher, link.traceState(), "Expected trace state");
-  }
+    void assertLink(AgentSpanLink link) {
+        // Assert link values
+        assertValue(this.traceIdMatcher, link.traceId(), "Expected trace identifier");
+        assertValue(this.spanIdMatcher, link.spanId(), "Expected span identifier");
+        assertValue(this.traceFlagsMatcher, link.traceFlags(), "Expected trace flags");
+        assertValue(this.spanAttributesMatcher, link.attributes(), "Expected attributes");
+        assertValue(this.traceStateMatcher, link.traceState(), "Expected trace state");
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanMatcher.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanMatcher.java
index f74168dd7f0..7c53bb63f88 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanMatcher.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanMatcher.java
@@ -56,409 +56,408 @@
  * </ul>
  */
 public final class SpanMatcher {
-  private Matcher<DDTraceId> traceIdMatcher;
-  private Matcher<Long> idMatcher;
-  private Matcher<Long> parentIdMatcher;
-  private int parentSpanIndex;
-  private Matcher<String> serviceNameMatcher;
-  private Matcher<CharSequence> operationNameMatcher;
-  private Matcher<CharSequence> resourceNameMatcher;
-  private Matcher<Duration> durationMatcher;
-  private Matcher<String> typeMatcher;
-  private Matcher<Boolean> errorMatcher;
-  private Matcher<Boolean> measuredMatcher;
-  private Matcher<Boolean> topLevelMatcher;
-  private TagsMatcher[] tagMatchers;
-  private SpanLinkMatcher[] linkMatchers;
-
-  private static final Matcher<Long> CHILD_OF_PREVIOUS_MATCHER = is(0L);
-
-  private SpanMatcher() {
-    this.parentSpanIndex = -1;
-    this.serviceNameMatcher = validates(s -> s != null && !s.isEmpty());
-    this.typeMatcher = isNull();
-    this.errorMatcher = isFalse();
-  }
-
-  /**
-   * Checks a span and its attributes.
-   *
-   * @return A new {@link SpanMatcher} instance to configure span matching constraints.
-   */
-  public static SpanMatcher span() {
-    return new SpanMatcher();
-  }
-
-  /**
-   * Checks the trace identifier matches the given value.
-   *
-   * @param traceId The trace identifier to match against.
-   * @return The current {@link SpanMatcher} instance with the specified trace identifier constraint
-   *     applied.
-   */
-  public SpanMatcher traceId(DDTraceId traceId) {
-    this.traceIdMatcher = Matchers.is(traceId);
-    return this;
-  }
-
-  /**
-   * Checks the span identifier matches the given value.
-   *
-   * @param id The identifier of the span to match against.
-   * @return The current {@link SpanMatcher} instance with the specified identifier constraint
-   *     applied.
-   */
-  public SpanMatcher id(long id) {
-    this.idMatcher = is(id);
-    return this;
-  }
-
-  /**
-   * Checks the span is a root span (i.e., a span with no parent).
-   *
-   * @return The current {@link SpanMatcher} instance with the root constraint applied.
-   */
-  public SpanMatcher root() {
-    return childOf(0L);
-  }
-
-  /**
-   * Checks the span is a direct child of the specified parent span.
-   *
-   * @param parentId The identifier of the parent span to match against.
-   * @return The current {@link SpanMatcher} instance with the child-of constraint applied.
-   */
-  public SpanMatcher childOf(long parentId) {
-    this.parentIdMatcher = is(parentId);
-    this.parentSpanIndex = -1;
-    return this;
-  }
-
-  /**
-   * Checks the span is a direct child of the immediately preceding span in the trace.
-   *
-   * @return The current {@link SpanMatcher} instance with the child-of constraint applied.
-   */
-  public SpanMatcher childOfPrevious() {
-    this.parentIdMatcher = CHILD_OF_PREVIOUS_MATCHER;
-    this.parentSpanIndex = -1;
-    return this;
-  }
-
-  /**
-   * Checks the span is a direct child of the span at the specified index in the trace.
-   *
-   * @param parentSpanIndex The index of the parent span in the trace.
-   * @return The current {@link SpanMatcher} instance with the child-of constraint applied.
-   */
-  public SpanMatcher childOfIndex(int parentSpanIndex) {
-    if (parentSpanIndex < 0) {
-      throw new AssertionFailedError("index  must be >= 0");
+    private Matcher<DDTraceId> traceIdMatcher;
+    private Matcher<Long> idMatcher;
+    private Matcher<Long> parentIdMatcher;
+    private int parentSpanIndex;
+    private Matcher<String> serviceNameMatcher;
+    private Matcher<CharSequence> operationNameMatcher;
+    private Matcher<CharSequence> resourceNameMatcher;
+    private Matcher<Duration> durationMatcher;
+    private Matcher<String> typeMatcher;
+    private Matcher<Boolean> errorMatcher;
+    private Matcher<Boolean> measuredMatcher;
+    private Matcher<Boolean> topLevelMatcher;
+    private TagsMatcher[] tagMatchers;
+    private SpanLinkMatcher[] linkMatchers;
+
+    private static final Matcher<Long> CHILD_OF_PREVIOUS_MATCHER = is(0L);
+
+    private SpanMatcher() {
+        this.parentSpanIndex = -1;
+        this.serviceNameMatcher = validates(s -> s != null && !s.isEmpty());
+        this.typeMatcher = isNull();
+        this.errorMatcher = isFalse();
     }
-    this.parentIdMatcher = null;
-    this.parentSpanIndex = parentSpanIndex;
-    return this;
-  }
-
-  /**
-   * Checks the span has service name defined.
-   *
-   * @return The current {@link SpanMatcher} instance with a defined service name constraint
-   *     applied.
-   */
-  public SpanMatcher serviceNameDefined() {
-    this.serviceNameMatcher = isNonNull();
-    return this;
-  }
-
-  /**
-   * Checks the span service name matches the given value.
-   *
-   * @param serviceName The service name to match against.
-   * @return The current {@link SpanMatcher} instance updated with the specified service name
-   *     constraint.
-   */
-  public SpanMatcher serviceName(String serviceName) {
-    this.serviceNameMatcher = is(serviceName);
-    return this;
-  }
-
-  /**
-   * Checks the span operation name matches the given value.
-   *
-   * @param operationName The operation name to match against.
-   * @return The current {@link SpanMatcher} instance updated with the specified operation name
-   *     constraint.
-   */
-  public SpanMatcher operationName(String operationName) {
-    this.operationNameMatcher = is(operationName);
-    return this;
-  }
-
-  /**
-   * Checks the span operation name matches the provided regular expression pattern.
-   *
-   * @param pattern The {@link Pattern} to match the operation name against.
-   * @return The current {@link SpanMatcher} instance updated with the specified operation name
-   *     constraint.
-   */
-  public SpanMatcher operationName(Pattern pattern) {
-    this.operationNameMatcher = matches(pattern);
-    return this;
-  }
-
-  /**
-   * Checks the span resource name matches the given value.
-   *
-   * @param resourceName The resource name to match against.
-   * @return The current {@link SpanMatcher} instance updated with the specified resource name
-   *     constraint.
-   */
-  public SpanMatcher resourceName(String resourceName) {
-    this.resourceNameMatcher = is(resourceName);
-    return this;
-  }
-
-  /**
-   * Checks the span resource name matches the provided regular expression pattern.
-   *
-   * @param pattern The {@link Pattern} used to match the resource name against.
-   * @return The current {@link SpanMatcher} instance updated with the specified resource name
-   *     constraint.
-   */
-  public SpanMatcher resourceName(Pattern pattern) {
-    this.resourceNameMatcher = matches(pattern);
-    return this;
-  }
-
-  /**
-   * Checks the span resource name matches the provided validator.
-   *
-   * @param validator The {@link Predicate} used to validate the resource name.
-   * @return The current {@link SpanMatcher} instance updated with the specified resource name
-   *     constraint.
-   */
-  public SpanMatcher resourceName(Predicate<CharSequence> validator) {
-    this.resourceNameMatcher = validates(validator);
-    return this;
-  }
-
-  /**
-   * Checks the span duration is shorter than the given value.
-   *
-   * @param duration The maximum allowed duration.
-   * @return The current {@link SpanMatcher} instance updated with the specified duration
-   *     constraint.
-   */
-  public SpanMatcher durationShorterThan(Duration duration) {
-    this.durationMatcher = validates(d -> d.compareTo(duration) < 0);
-    return this;
-  }
-
-  /**
-   * Checks the span duration is longer than the given value.
-   *
-   * @param duration The minimum allowed duration.
-   * @return The current {@link SpanMatcher} instance updated with the specified duration
-   *     constraint.
-   */
-  public SpanMatcher durationLongerThan(Duration duration) {
-    this.durationMatcher = validates(d -> d.compareTo(duration) > 0);
-    return this;
-  }
-
-  /**
-   * Checks the span duration matches the given validator.
-   *
-   * @param validator The validator to check the span duration.
-   * @return The current {@link SpanMatcher} instance updated with the specified duration
-   *     constraint.
-   */
-  public SpanMatcher duration(Predicate<Duration> validator) {
-    this.durationMatcher = validates(validator);
-    return this;
-  }
-
-  /**
-   * Checks the span type matches the given value.
-   *
-   * @param type The span type to match against.
-   * @return The current {@link SpanMatcher} instance updated with the specified span type
-   *     constraint.
-   */
-  public SpanMatcher type(String type) {
-    this.typeMatcher = is(type);
-    return this;
-  }
-
-  /**
-   * Checks the span is an error span.
-   *
-   * @return The current {@link SpanMatcher} instance updated with the specified error constraint.
-   */
-  public SpanMatcher error() {
-    return error(true);
-  }
-
-  /**
-   * Checks the span error status matches the given value.
-   *
-   * @param errored The expected error status.
-   * @return The current {@link SpanMatcher} instance updated with the specified error constraint.
-   */
-  public SpanMatcher error(boolean errored) {
-    this.errorMatcher = errored ? isTrue() : isFalse();
-    return this;
-  }
-
-  /**
-   * Checks the span is measured.
-   *
-   * @return The current {@link SpanMatcher} instance updated with the specified measured
-   *     constraint.
-   */
-  public SpanMatcher measured() {
-    return measured(true);
-  }
-
-  /**
-   * Checks the span measured status matches the given value.
-   *
-   * @param measured The expected measured status.
-   * @return The current {@link SpanMatcher} instance updated with the specified measured
-   *     constraint.
-   */
-  public SpanMatcher measured(boolean measured) {
-    this.measuredMatcher = measured ? isTrue() : isFalse();
-    return this;
-  }
-
-  /**
-   * Checks the span is a top-level span.
-   *
-   * @return The current {@link SpanMatcher} instance updated with the specified top-level
-   *     constraint.
-   */
-  public SpanMatcher topLevel() {
-    return topLevel(true);
-  }
-
-  /**
-   * Checks the span top-level status matches the given value.
-   *
-   * @param topLevel The expected top-level status.
-   * @return The current {@link SpanMatcher} instance updated with the specified top-level
-   *     constraint.
-   */
-  public SpanMatcher topLevel(boolean topLevel) {
-    this.topLevelMatcher = topLevel ? isTrue() : isFalse();
-    return this;
-  }
-
-  public SpanMatcher tags(TagsMatcher... matchers) {
-    this.tagMatchers = matchers;
-    return this;
-  }
-
-  /**
-   * Checks the span links structure.
-   *
-   * @param matchers The {@link SpanLinkMatcher} to very the span links structure, one per link.
-   * @return The current {@link SpanMatcher} instance updated with the specified span link
-   *     constraints.
-   */
-  public SpanMatcher links(SpanLinkMatcher... matchers) {
-    this.linkMatchers = matchers;
-    return this;
-  }
-
-  void assertSpan(List<DDSpan> trace, int spanIndex) {
-    DDSpan span = trace.get(spanIndex);
-    // Apply parent span index
-    if (this.parentSpanIndex >= 0) {
-      this.parentIdMatcher = is(trace.get(this.parentSpanIndex).getSpanId());
+
+    /**
+     * Checks a span and its attributes.
+     *
+     * @return A new {@link SpanMatcher} instance to configure span matching constraints.
+     */
+    public static SpanMatcher span() {
+        return new SpanMatcher();
     }
-    // Apply parent id matcher from the previous span
-    else if (this.parentIdMatcher == CHILD_OF_PREVIOUS_MATCHER) {
-      if (spanIndex == 0) {
-        throw new IllegalStateException("Cannot use childOfPrevious() matcher on the first span");
-      }
-      DDSpan previousSpan = trace.get(spanIndex - 1);
-      this.parentIdMatcher = is(previousSpan.getSpanId());
+
+    /**
+     * Checks the trace identifier matches the given value.
+     *
+     * @param traceId The trace identifier to match against.
+     * @return The current {@link SpanMatcher} instance with the specified trace identifier constraint
+     *     applied.
+     */
+    public SpanMatcher traceId(DDTraceId traceId) {
+        this.traceIdMatcher = Matchers.is(traceId);
+        return this;
     }
-    // Assert span values
-    assertValue(this.traceIdMatcher, span.getTraceId(), "Unexpected trace identifier");
-    assertValue(this.idMatcher, span.getSpanId(), "Unexpected identifier");
-    assertValue(this.parentIdMatcher, span.getParentId(), "Unexpected parent identifier");
-    assertValue(this.serviceNameMatcher, span.getServiceName(), "Unexpected service name");
-    assertValue(this.operationNameMatcher, span.getOperationName(), "Unexpected operation name");
-    assertValue(this.resourceNameMatcher, span.getResourceName(), "Unexpected resource name");
-    assertValue(this.durationMatcher, ofNanos(span.getDurationNano()), "Unexpected duration");
-    assertValue(this.typeMatcher, span.getSpanType(), "Unexpected span type");
-    assertValue(this.errorMatcher, span.isError(), "Unexpected error status");
-    assertValue(this.measuredMatcher, span.isMeasured(), "Unexpected measured status");
-    assertValue(this.topLevelMatcher, span.isTopLevel(), "Unexpected top-level status");
-    assertSpanTags(span.getTags());
-    assertSpanLinks(spanLinks(span));
-  }
-
-  private void assertSpanTags(TagMap tags) {
-    // Check if tags should be asserted at all
-    if (this.tagMatchers == null) {
-      return;
+
+    /**
+     * Checks the span identifier matches the given value.
+     *
+     * @param id The identifier of the span to match against.
+     * @return The current {@link SpanMatcher} instance with the specified identifier constraint
+     *     applied.
+     */
+    public SpanMatcher id(long id) {
+        this.idMatcher = is(id);
+        return this;
     }
-    // Collect all matchers
-    Map<String, Matcher<?>> matchers = new HashMap<>();
-    for (TagsMatcher tagMatcher : this.tagMatchers) {
-      matchers.putAll(tagMatcher.tagMatchers);
+
+    /**
+     * Checks the span is a root span (i.e., a span with no parent).
+     *
+     * @return The current {@link SpanMatcher} instance with the root constraint applied.
+     */
+    public SpanMatcher root() {
+        return childOf(0L);
     }
-    // Assert all tags
-    List<String> uncheckedTagNames = new ArrayList<>();
-    tags.forEach(
-        (key, value) -> {
-          Matcher<Object> matcher = (Matcher) matchers.remove(key);
-          if (matcher == null) {
-            uncheckedTagNames.add(key);
-          } else {
-            assertValue(matcher, value, "Unexpected " + key + " tag value");
-          }
-        });
-    // Remove matchers that accept missing tags
-    Collection<Matcher<?>> values = matchers.values();
-    values.removeIf(matcher -> matcher instanceof Any);
-    values.removeIf(matcher -> matcher instanceof IsNull);
-    // Fails if any tags are missing
-    if (!matchers.isEmpty()) {
-      throw new AssertionFailedError("Missing tags: " + String.join(", ", matchers.keySet()));
+
+    /**
+     * Checks the span is a direct child of the specified parent span.
+     *
+     * @param parentId The identifier of the parent span to match against.
+     * @return The current {@link SpanMatcher} instance with the child-of constraint applied.
+     */
+    public SpanMatcher childOf(long parentId) {
+        this.parentIdMatcher = is(parentId);
+        this.parentSpanIndex = -1;
+        return this;
+    }
+
+    /**
+     * Checks the span is a direct child of the immediately preceding span in the trace.
+     *
+     * @return The current {@link SpanMatcher} instance with the child-of constraint applied.
+     */
+    public SpanMatcher childOfPrevious() {
+        this.parentIdMatcher = CHILD_OF_PREVIOUS_MATCHER;
+        this.parentSpanIndex = -1;
+        return this;
+    }
+
+    /**
+     * Checks the span is a direct child of the span at the specified index in the trace.
+     *
+     * @param parentSpanIndex The index of the parent span in the trace.
+     * @return The current {@link SpanMatcher} instance with the child-of constraint applied.
+     */
+    public SpanMatcher childOfIndex(int parentSpanIndex) {
+        if (parentSpanIndex < 0) {
+            throw new AssertionFailedError("index  must be >= 0");
+        }
+        this.parentIdMatcher = null;
+        this.parentSpanIndex = parentSpanIndex;
+        return this;
+    }
+
+    /**
+     * Checks the span has service name defined.
+     *
+     * @return The current {@link SpanMatcher} instance with a defined service name constraint
+     *     applied.
+     */
+    public SpanMatcher serviceNameDefined() {
+        this.serviceNameMatcher = isNonNull();
+        return this;
+    }
+
+    /**
+     * Checks the span service name matches the given value.
+     *
+     * @param serviceName The service name to match against.
+     * @return The current {@link SpanMatcher} instance updated with the specified service name
+     *     constraint.
+     */
+    public SpanMatcher serviceName(String serviceName) {
+        this.serviceNameMatcher = is(serviceName);
+        return this;
     }
-    // Fails if any unexpected tags are present
-    if (!uncheckedTagNames.isEmpty()) {
-      throw new AssertionFailedError("Unexpected tags: " + String.join(", ", uncheckedTagNames));
+
+    /**
+     * Checks the span operation name matches the given value.
+     *
+     * @param operationName The operation name to match against.
+     * @return The current {@link SpanMatcher} instance updated with the specified operation name
+     *     constraint.
+     */
+    public SpanMatcher operationName(String operationName) {
+        this.operationNameMatcher = is(operationName);
+        return this;
     }
-  }
-
-  /*
-   * Right now, it's expecting to have as many matchers as links, and in the same order.
-   * It might evolve into partial link collection testing, matching links using TID/SIP.
-   */
-  private void assertSpanLinks(List<AgentSpanLink> links) {
-    // Check if links should be asserted at all
-    if (this.linkMatchers == null) {
-      return;
+
+    /**
+     * Checks the span operation name matches the provided regular expression pattern.
+     *
+     * @param pattern The {@link Pattern} to match the operation name against.
+     * @return The current {@link SpanMatcher} instance updated with the specified operation name
+     *     constraint.
+     */
+    public SpanMatcher operationName(Pattern pattern) {
+        this.operationNameMatcher = matches(pattern);
+        return this;
     }
-    int linkCount = links == null ? 0 : links.size();
-    int expectedLinkCount = this.linkMatchers.length;
-    if (linkCount != expectedLinkCount) {
-      throw assertionFailure()
-          .message("Unexpected span link count")
-          .expected(expectedLinkCount)
-          .actual(linkCount)
-          .build();
+
+    /**
+     * Checks the span resource name matches the given value.
+     *
+     * @param resourceName The resource name to match against.
+     * @return The current {@link SpanMatcher} instance updated with the specified resource name
+     *     constraint.
+     */
+    public SpanMatcher resourceName(String resourceName) {
+        this.resourceNameMatcher = is(resourceName);
+        return this;
     }
-    for (int i = 0; i < expectedLinkCount; i++) {
-      SpanLinkMatcher linkMatcher = this.linkMatchers[i];
-      AgentSpanLink link = links.get(i);
-      linkMatcher.assertLink(link);
+
+    /**
+     * Checks the span resource name matches the provided regular expression pattern.
+     *
+     * @param pattern The {@link Pattern} used to match the resource name against.
+     * @return The current {@link SpanMatcher} instance updated with the specified resource name
+     *     constraint.
+     */
+    public SpanMatcher resourceName(Pattern pattern) {
+        this.resourceNameMatcher = matches(pattern);
+        return this;
+    }
+
+    /**
+     * Checks the span resource name matches the provided validator.
+     *
+     * @param validator The {@link Predicate} used to validate the resource name.
+     * @return The current {@link SpanMatcher} instance updated with the specified resource name
+     *     constraint.
+     */
+    public SpanMatcher resourceName(Predicate<CharSequence> validator) {
+        this.resourceNameMatcher = validates(validator);
+        return this;
+    }
+
+    /**
+     * Checks the span duration is shorter than the given value.
+     *
+     * @param duration The maximum allowed duration.
+     * @return The current {@link SpanMatcher} instance updated with the specified duration
+     *     constraint.
+     */
+    public SpanMatcher durationShorterThan(Duration duration) {
+        this.durationMatcher = validates(d -> d.compareTo(duration) < 0);
+        return this;
+    }
+
+    /**
+     * Checks the span duration is longer than the given value.
+     *
+     * @param duration The minimum allowed duration.
+     * @return The current {@link SpanMatcher} instance updated with the specified duration
+     *     constraint.
+     */
+    public SpanMatcher durationLongerThan(Duration duration) {
+        this.durationMatcher = validates(d -> d.compareTo(duration) > 0);
+        return this;
+    }
+
+    /**
+     * Checks the span duration matches the given validator.
+     *
+     * @param validator The validator to check the span duration.
+     * @return The current {@link SpanMatcher} instance updated with the specified duration
+     *     constraint.
+     */
+    public SpanMatcher duration(Predicate<Duration> validator) {
+        this.durationMatcher = validates(validator);
+        return this;
+    }
+
+    /**
+     * Checks the span type matches the given value.
+     *
+     * @param type The span type to match against.
+     * @return The current {@link SpanMatcher} instance updated with the specified span type
+     *     constraint.
+     */
+    public SpanMatcher type(String type) {
+        this.typeMatcher = is(type);
+        return this;
+    }
+
+    /**
+     * Checks the span is an error span.
+     *
+     * @return The current {@link SpanMatcher} instance updated with the specified error constraint.
+     */
+    public SpanMatcher error() {
+        return error(true);
+    }
+
+    /**
+     * Checks the span error status matches the given value.
+     *
+     * @param errored The expected error status.
+     * @return The current {@link SpanMatcher} instance updated with the specified error constraint.
+     */
+    public SpanMatcher error(boolean errored) {
+        this.errorMatcher = errored ? isTrue() : isFalse();
+        return this;
+    }
+
+    /**
+     * Checks the span is measured.
+     *
+     * @return The current {@link SpanMatcher} instance updated with the specified measured
+     *     constraint.
+     */
+    public SpanMatcher measured() {
+        return measured(true);
+    }
+
+    /**
+     * Checks the span measured status matches the given value.
+     *
+     * @param measured The expected measured status.
+     * @return The current {@link SpanMatcher} instance updated with the specified measured
+     *     constraint.
+     */
+    public SpanMatcher measured(boolean measured) {
+        this.measuredMatcher = measured ? isTrue() : isFalse();
+        return this;
+    }
+
+    /**
+     * Checks the span is a top-level span.
+     *
+     * @return The current {@link SpanMatcher} instance updated with the specified top-level
+     *     constraint.
+     */
+    public SpanMatcher topLevel() {
+        return topLevel(true);
+    }
+
+    /**
+     * Checks the span top-level status matches the given value.
+     *
+     * @param topLevel The expected top-level status.
+     * @return The current {@link SpanMatcher} instance updated with the specified top-level
+     *     constraint.
+     */
+    public SpanMatcher topLevel(boolean topLevel) {
+        this.topLevelMatcher = topLevel ? isTrue() : isFalse();
+        return this;
+    }
+
+    public SpanMatcher tags(TagsMatcher... matchers) {
+        this.tagMatchers = matchers;
+        return this;
+    }
+
+    /**
+     * Checks the span links structure.
+     *
+     * @param matchers The {@link SpanLinkMatcher} to very the span links structure, one per link.
+     * @return The current {@link SpanMatcher} instance updated with the specified span link
+     *     constraints.
+     */
+    public SpanMatcher links(SpanLinkMatcher... matchers) {
+        this.linkMatchers = matchers;
+        return this;
+    }
+
+    void assertSpan(List<DDSpan> trace, int spanIndex) {
+        DDSpan span = trace.get(spanIndex);
+        // Apply parent span index
+        if (this.parentSpanIndex >= 0) {
+            this.parentIdMatcher = is(trace.get(this.parentSpanIndex).getSpanId());
+        }
+        // Apply parent id matcher from the previous span
+        else if (this.parentIdMatcher == CHILD_OF_PREVIOUS_MATCHER) {
+            if (spanIndex == 0) {
+                throw new IllegalStateException("Cannot use childOfPrevious() matcher on the first span");
+            }
+            DDSpan previousSpan = trace.get(spanIndex - 1);
+            this.parentIdMatcher = is(previousSpan.getSpanId());
+        }
+        // Assert span values
+        assertValue(this.traceIdMatcher, span.getTraceId(), "Unexpected trace identifier");
+        assertValue(this.idMatcher, span.getSpanId(), "Unexpected identifier");
+        assertValue(this.parentIdMatcher, span.getParentId(), "Unexpected parent identifier");
+        assertValue(this.serviceNameMatcher, span.getServiceName(), "Unexpected service name");
+        assertValue(this.operationNameMatcher, span.getOperationName(), "Unexpected operation name");
+        assertValue(this.resourceNameMatcher, span.getResourceName(), "Unexpected resource name");
+        assertValue(this.durationMatcher, ofNanos(span.getDurationNano()), "Unexpected duration");
+        assertValue(this.typeMatcher, span.getSpanType(), "Unexpected span type");
+        assertValue(this.errorMatcher, span.isError(), "Unexpected error status");
+        assertValue(this.measuredMatcher, span.isMeasured(), "Unexpected measured status");
+        assertValue(this.topLevelMatcher, span.isTopLevel(), "Unexpected top-level status");
+        assertSpanTags(span.getTags());
+        assertSpanLinks(spanLinks(span));
+    }
+
+    private void assertSpanTags(TagMap tags) {
+        // Check if tags should be asserted at all
+        if (this.tagMatchers == null) {
+            return;
+        }
+        // Collect all matchers
+        Map<String, Matcher<?>> matchers = new HashMap<>();
+        for (TagsMatcher tagMatcher : this.tagMatchers) {
+            matchers.putAll(tagMatcher.tagMatchers);
+        }
+        // Assert all tags
+        List<String> uncheckedTagNames = new ArrayList<>();
+        tags.forEach((key, value) -> {
+            Matcher<Object> matcher = (Matcher) matchers.remove(key);
+            if (matcher == null) {
+                uncheckedTagNames.add(key);
+            } else {
+                assertValue(matcher, value, "Unexpected " + key + " tag value");
+            }
+        });
+        // Remove matchers that accept missing tags
+        Collection<Matcher<?>> values = matchers.values();
+        values.removeIf(matcher -> matcher instanceof Any);
+        values.removeIf(matcher -> matcher instanceof IsNull);
+        // Fails if any tags are missing
+        if (!matchers.isEmpty()) {
+            throw new AssertionFailedError("Missing tags: " + String.join(", ", matchers.keySet()));
+        }
+        // Fails if any unexpected tags are present
+        if (!uncheckedTagNames.isEmpty()) {
+            throw new AssertionFailedError("Unexpected tags: " + String.join(", ", uncheckedTagNames));
+        }
+    }
+
+    /*
+     * Right now, it's expecting to have as many matchers as links, and in the same order.
+     * It might evolve into partial link collection testing, matching links using TID/SIP.
+     */
+    private void assertSpanLinks(List<AgentSpanLink> links) {
+        // Check if links should be asserted at all
+        if (this.linkMatchers == null) {
+            return;
+        }
+        int linkCount = links == null ? 0 : links.size();
+        int expectedLinkCount = this.linkMatchers.length;
+        if (linkCount != expectedLinkCount) {
+            throw assertionFailure()
+                    .message("Unexpected span link count")
+                    .expected(expectedLinkCount)
+                    .actual(linkCount)
+                    .build();
+        }
+        for (int i = 0; i < expectedLinkCount; i++) {
+            SpanLinkMatcher linkMatcher = this.linkMatchers[i];
+            AgentSpanLink link = links.get(i);
+            linkMatcher.assertLink(link);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TagsMatcher.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TagsMatcher.java
index 7fe7cd0645e..89590e921db 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TagsMatcher.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TagsMatcher.java
@@ -32,118 +32,117 @@
 import java.util.Map;
 
 public final class TagsMatcher {
-  final Map<String, Matcher<?>> tagMatchers;
+    final Map<String, Matcher<?>> tagMatchers;
 
-  private TagsMatcher(Map<String, Matcher<?>> tagMatchers) {
-    this.tagMatchers = tagMatchers;
-  }
-
-  public static TagsMatcher defaultTags() {
-    Map<String, Matcher<?>> tagMatchers = new HashMap<>();
-    tagMatchers.put(THREAD_NAME, isNonNull());
-    tagMatchers.put(THREAD_ID, isNonNull());
-    tagMatchers.put(RUNTIME_ID_TAG, any());
-    tagMatchers.put(LANGUAGE_TAG_KEY, any());
-    tagMatchers.put(SAMPLING_AGENT_RATE, any());
-    tagMatchers.put(SAMPLING_PRIORITY_KEY.toString(), any());
-    tagMatchers.put(SAMPLE_RATE_KEY, any());
-    tagMatchers.put(PID_TAG, any());
-    tagMatchers.put(SCHEMA_VERSION_TAG_KEY, any());
-    tagMatchers.put(PROFILING_ENABLED, any());
-    tagMatchers.put(PROFILING_CONTEXT_ENGINE, any());
-    tagMatchers.put(BASE_SERVICE, any());
-    tagMatchers.put(DSM_ENABLED, any());
-    tagMatchers.put(DJM_ENABLED, any());
-    tagMatchers.put(PARENT_ID, any());
-    tagMatchers.put(SPAN_LINKS, any()); // this is checked by LinksAsserter
-    tagMatchers.put(DD_INTEGRATION, any());
-    tagMatchers.put(TRACER_HOST, any());
-
-    for (String tagName : REQUIRED_CODE_ORIGIN_TAGS) {
-      tagMatchers.put(tagName, any());
+    private TagsMatcher(Map<String, Matcher<?>> tagMatchers) {
+        this.tagMatchers = tagMatchers;
     }
-    // TODO Keep porting default tag logic
-    // TODO Dev notes:
-    // - it seems there is way too many logic there
-    // - need to check if its related to tracing only
 
-    return new TagsMatcher(tagMatchers);
-  }
+    public static TagsMatcher defaultTags() {
+        Map<String, Matcher<?>> tagMatchers = new HashMap<>();
+        tagMatchers.put(THREAD_NAME, isNonNull());
+        tagMatchers.put(THREAD_ID, isNonNull());
+        tagMatchers.put(RUNTIME_ID_TAG, any());
+        tagMatchers.put(LANGUAGE_TAG_KEY, any());
+        tagMatchers.put(SAMPLING_AGENT_RATE, any());
+        tagMatchers.put(SAMPLING_PRIORITY_KEY.toString(), any());
+        tagMatchers.put(SAMPLE_RATE_KEY, any());
+        tagMatchers.put(PID_TAG, any());
+        tagMatchers.put(SCHEMA_VERSION_TAG_KEY, any());
+        tagMatchers.put(PROFILING_ENABLED, any());
+        tagMatchers.put(PROFILING_CONTEXT_ENGINE, any());
+        tagMatchers.put(BASE_SERVICE, any());
+        tagMatchers.put(DSM_ENABLED, any());
+        tagMatchers.put(DJM_ENABLED, any());
+        tagMatchers.put(PARENT_ID, any());
+        tagMatchers.put(SPAN_LINKS, any()); // this is checked by LinksAsserter
+        tagMatchers.put(DD_INTEGRATION, any());
+        tagMatchers.put(TRACER_HOST, any());
 
-  /**
-   * Requires the following tag to match the given matcher.
-   *
-   * @param tagName The tag name to match.
-   * @param matcher The matcher to apply to the tag value.
-   * @return A tag matcher that requires the following tag to match the given matcher.
-   */
-  public static TagsMatcher tag(String tagName, Matcher<?> matcher) {
-    Map<String, Matcher<?>> tagMatchers = new HashMap<>();
-    tagMatchers.put(tagName, matcher);
-    return new TagsMatcher(tagMatchers);
-  }
+        for (String tagName : REQUIRED_CODE_ORIGIN_TAGS) {
+            tagMatchers.put(tagName, any());
+        }
+        // TODO Keep porting default tag logic
+        // TODO Dev notes:
+        // - it seems there is way too many logic there
+        // - need to check if its related to tracing only
 
-  /**
-   * Requires the following tags to be present.
-   *
-   * @param tagNames The tag names to match.
-   * @return A tag matcher that requires the following tags to be present.
-   */
-  public static TagsMatcher includes(String... tagNames) {
-    Map<String, Matcher<?>> tagMatchers = new HashMap<>();
-    for (String tagName : tagNames) {
-      tagMatchers.put(tagName, any());
+        return new TagsMatcher(tagMatchers);
     }
-    return new TagsMatcher(tagMatchers);
-  }
 
-  /**
-   * Requires the error tags to match the given error.
-   *
-   * @param error The error to match.
-   * @return A tag matcher that requires the error tags to match the given error.
-   */
-  public static TagsMatcher error(Throwable error) {
-    return error(error.getClass(), error.getMessage());
-  }
+    /**
+     * Requires the following tag to match the given matcher.
+     *
+     * @param tagName The tag name to match.
+     * @param matcher The matcher to apply to the tag value.
+     * @return A tag matcher that requires the following tag to match the given matcher.
+     */
+    public static TagsMatcher tag(String tagName, Matcher<?> matcher) {
+        Map<String, Matcher<?>> tagMatchers = new HashMap<>();
+        tagMatchers.put(tagName, matcher);
+        return new TagsMatcher(tagMatchers);
+    }
 
-  /**
-   * Requires the error tags to match the given error type.
-   *
-   * @param errorType The error type to match.
-   * @return A tag matcher that requires the error tags to match the given error type.
-   */
-  public static TagsMatcher error(Class<? extends Throwable> errorType) {
-    return error(errorType, null);
-  }
+    /**
+     * Requires the following tags to be present.
+     *
+     * @param tagNames The tag names to match.
+     * @return A tag matcher that requires the following tags to be present.
+     */
+    public static TagsMatcher includes(String... tagNames) {
+        Map<String, Matcher<?>> tagMatchers = new HashMap<>();
+        for (String tagName : tagNames) {
+            tagMatchers.put(tagName, any());
+        }
+        return new TagsMatcher(tagMatchers);
+    }
 
-  /**
-   * Requires the error tags to match the given error type and message.
-   *
-   * @param errorType The error type to match.
-   * @param message The error message to match.
-   * @return A tag matcher that requires the error tags to match the given error type and message.
-   */
-  public static TagsMatcher error(Class<? extends Throwable> errorType, String message) {
-    Map<String, Matcher<?>> tagMatchers = new HashMap<>();
-    tagMatchers.put(ERROR_TYPE, Matchers.<String>validates(s -> testErrorType(errorType, s)));
-    tagMatchers.put(ERROR_STACK, isNonNull());
-    if (message != null) {
-      tagMatchers.put(ERROR_MSG, is(message));
+    /**
+     * Requires the error tags to match the given error.
+     *
+     * @param error The error to match.
+     * @return A tag matcher that requires the error tags to match the given error.
+     */
+    public static TagsMatcher error(Throwable error) {
+        return error(error.getClass(), error.getMessage());
     }
-    return new TagsMatcher(tagMatchers);
-  }
 
-  static boolean testErrorType(Class<? extends Throwable> errorType, String actual) {
-    if (errorType.getName().equals(actual)) {
-      return true;
+    /**
+     * Requires the error tags to match the given error type.
+     *
+     * @param errorType The error type to match.
+     * @return A tag matcher that requires the error tags to match the given error type.
+     */
+    public static TagsMatcher error(Class<? extends Throwable> errorType) {
+        return error(errorType, null);
     }
-    try {
-      // also accept type names which are subclasses of the given error type
-      return errorType.isAssignableFrom(
-          Class.forName(actual, false, TagsMatcher.class.getClassLoader()));
-    } catch (Throwable ignore) {
-      return false;
+
+    /**
+     * Requires the error tags to match the given error type and message.
+     *
+     * @param errorType The error type to match.
+     * @param message The error message to match.
+     * @return A tag matcher that requires the error tags to match the given error type and message.
+     */
+    public static TagsMatcher error(Class<? extends Throwable> errorType, String message) {
+        Map<String, Matcher<?>> tagMatchers = new HashMap<>();
+        tagMatchers.put(ERROR_TYPE, Matchers.<String>validates(s -> testErrorType(errorType, s)));
+        tagMatchers.put(ERROR_STACK, isNonNull());
+        if (message != null) {
+            tagMatchers.put(ERROR_MSG, is(message));
+        }
+        return new TagsMatcher(tagMatchers);
+    }
+
+    static boolean testErrorType(Class<? extends Throwable> errorType, String actual) {
+        if (errorType.getName().equals(actual)) {
+            return true;
+        }
+        try {
+            // also accept type names which are subclasses of the given error type
+            return errorType.isAssignableFrom(Class.forName(actual, false, TagsMatcher.class.getClassLoader()));
+        } catch (Throwable ignore) {
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TraceAssertions.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TraceAssertions.java
index ebbf23c5072..7746ecdb81b 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TraceAssertions.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TraceAssertions.java
@@ -27,107 +27,104 @@
  * </ul>
  */
 public final class TraceAssertions {
-  /*
-   * Trace comparators.
-   */
-  /** Trace comparator to sort by start time. */
-  public static final Comparator<List<DDSpan>> TRACE_START_TIME_COMPARATOR =
-      Comparator.comparingLong(
-          trace -> trace.isEmpty() ? 0L : trace.get(0).getLocalRootSpan().getStartTime());
+    /*
+     * Trace comparators.
+     */
+    /** Trace comparator to sort by start time. */
+    public static final Comparator<List<DDSpan>> TRACE_START_TIME_COMPARATOR = Comparator.comparingLong(
+            trace -> trace.isEmpty() ? 0L : trace.get(0).getLocalRootSpan().getStartTime());
 
-  /** Trace comparator to sort by root span identifier. */
-  public static final Comparator<List<DDSpan>> TRACE_ROOT_SPAN_ID_COMPARATOR =
-      Comparator.comparingLong(
-          trace -> trace.isEmpty() ? 0L : trace.get(0).getLocalRootSpan().getSpanId());
+    /** Trace comparator to sort by root span identifier. */
+    public static final Comparator<List<DDSpan>> TRACE_ROOT_SPAN_ID_COMPARATOR = Comparator.comparingLong(
+            trace -> trace.isEmpty() ? 0L : trace.get(0).getLocalRootSpan().getSpanId());
 
-  /*
-   * Trace assertion options.
-   */
-  /** Ignores additional traces. If there are more traces than expected, do not fail. */
-  public static final UnaryOperator<Options> IGNORE_ADDITIONAL_TRACES =
-      Options::ignoreAdditionalTraces;
+    /*
+     * Trace assertion options.
+     */
+    /** Ignores additional traces. If there are more traces than expected, do not fail. */
+    public static final UnaryOperator<Options> IGNORE_ADDITIONAL_TRACES = Options::ignoreAdditionalTraces;
 
-  /** Sorts traces by start time. */
-  public static final UnaryOperator<Options> SORT_BY_START_TIME =
-      options -> options.sort(TRACE_START_TIME_COMPARATOR);
+    /** Sorts traces by start time. */
+    public static final UnaryOperator<Options> SORT_BY_START_TIME =
+            options -> options.sort(TRACE_START_TIME_COMPARATOR);
 
-  /** Sorts traces by their root span identifier. */
-  public static final UnaryOperator<Options> SORT_BY_ROOT_SPAN_ID =
-      options -> options.sort(TRACE_ROOT_SPAN_ID_COMPARATOR);
+    /** Sorts traces by their root span identifier. */
+    public static final UnaryOperator<Options> SORT_BY_ROOT_SPAN_ID =
+            options -> options.sort(TRACE_ROOT_SPAN_ID_COMPARATOR);
 
-  private TraceAssertions() {}
+    private TraceAssertions() {}
 
-  /**
-   * Checks a trace structure.
-   *
-   * @param trace The trace to check.
-   * @param matcher The matcher to verify the trace structure.
-   */
-  public static void assertTrace(List<DDSpan> trace, TraceMatcher matcher) {
-    matcher.assertTrace(trace, 0);
-  }
-
-  /**
-   * Checks the structure of a trace collection.
-   *
-   * @param traces The trace collection to check.
-   * @param matchers The matchers to verify the trace collection, one matcher by expected trace.
-   */
-  public static void assertTraces(List<List<DDSpan>> traces, TraceMatcher... matchers) {
-    assertTraces(traces, identity(), matchers);
-  }
-
-  /**
-   * Checks the structure of a trace collection.
-   *
-   * @param traces The trace collection to check.
-   * @param options The {@link Options} to configure the checks.
-   * @param matchers The matchers to verify the trace collection, one matcher by expected trace.
-   */
-  public static void assertTraces(
-      List<List<DDSpan>> traces, UnaryOperator<Options> options, TraceMatcher... matchers) {
-    Options opts = options.apply(new Options());
-    int expectedTraceCount = matchers.length;
-    int traceCount = traces.size();
-    if (opts.ignoredAdditionalTraces) {
-      if (traceCount < expectedTraceCount) {
-        assertionFailure()
-            .message("Not enough of traces")
-            .expected(expectedTraceCount)
-            .actual(traceCount)
-            .buildAndThrow();
-      }
-    } else {
-      if (traceCount != expectedTraceCount) {
-        assertionFailure()
-            .message("Invalid number of traces")
-            .expected(expectedTraceCount)
-            .actual(traceCount)
-            .buildAndThrow();
-      }
+    /**
+     * Checks a trace structure.
+     *
+     * @param trace The trace to check.
+     * @param matcher The matcher to verify the trace structure.
+     */
+    public static void assertTrace(List<DDSpan> trace, TraceMatcher matcher) {
+        matcher.assertTrace(trace, 0);
     }
-    if (opts.comparator != null) {
-      traces = new ArrayList<>(traces);
-      traces.sort(opts.comparator);
+
+    /**
+     * Checks the structure of a trace collection.
+     *
+     * @param traces The trace collection to check.
+     * @param matchers The matchers to verify the trace collection, one matcher by expected trace.
+     */
+    public static void assertTraces(List<List<DDSpan>> traces, TraceMatcher... matchers) {
+        assertTraces(traces, identity(), matchers);
     }
-    for (int i = 0; i < expectedTraceCount; i++) {
-      List<DDSpan> trace = traces.get(i);
-      matchers[i].assertTrace(trace, i);
+
+    /**
+     * Checks the structure of a trace collection.
+     *
+     * @param traces The trace collection to check.
+     * @param options The {@link Options} to configure the checks.
+     * @param matchers The matchers to verify the trace collection, one matcher by expected trace.
+     */
+    public static void assertTraces(
+            List<List<DDSpan>> traces, UnaryOperator<Options> options, TraceMatcher... matchers) {
+        Options opts = options.apply(new Options());
+        int expectedTraceCount = matchers.length;
+        int traceCount = traces.size();
+        if (opts.ignoredAdditionalTraces) {
+            if (traceCount < expectedTraceCount) {
+                assertionFailure()
+                        .message("Not enough of traces")
+                        .expected(expectedTraceCount)
+                        .actual(traceCount)
+                        .buildAndThrow();
+            }
+        } else {
+            if (traceCount != expectedTraceCount) {
+                assertionFailure()
+                        .message("Invalid number of traces")
+                        .expected(expectedTraceCount)
+                        .actual(traceCount)
+                        .buildAndThrow();
+            }
+        }
+        if (opts.comparator != null) {
+            traces = new ArrayList<>(traces);
+            traces.sort(opts.comparator);
+        }
+        for (int i = 0; i < expectedTraceCount; i++) {
+            List<DDSpan> trace = traces.get(i);
+            matchers[i].assertTrace(trace, i);
+        }
     }
-  }
 
-  public static final class Options {
-    private boolean ignoredAdditionalTraces = false;
-    private Comparator<List<DDSpan>> comparator = TRACE_START_TIME_COMPARATOR;
+    public static final class Options {
+        private boolean ignoredAdditionalTraces = false;
+        private Comparator<List<DDSpan>> comparator = TRACE_START_TIME_COMPARATOR;
 
-    public Options ignoreAdditionalTraces() {
-      this.ignoredAdditionalTraces = true;
-      return this;
-    }
+        public Options ignoreAdditionalTraces() {
+            this.ignoredAdditionalTraces = true;
+            return this;
+        }
 
-    public Options sort(Comparator<List<DDSpan>> comparator) {
-      this.comparator = comparator;
-      return this;
+        public Options sort(Comparator<List<DDSpan>> comparator) {
+            this.comparator = comparator;
+            return this;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TraceMatcher.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TraceMatcher.java
index 7511ee12f99..ed843b6a2d0 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TraceMatcher.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TraceMatcher.java
@@ -32,117 +32,114 @@
  * @see SpanMatcher
  */
 public final class TraceMatcher {
-  /*
-   * Span comparators.
-   */
-  /** Span comparator to sort by start time. */
-  public static final Comparator<DDSpan> START_TIME_COMPARATOR =
-      comparingLong(DDSpan::getStartTime).thenComparingLong(DDSpan::getSpanId);
-
-  /*
-   * Span assertion options.
-   */
-  /** Sorts spans by start time. */
-  public static UnaryOperator<Options> SORT_BY_START_TIME =
-      options -> options.sort(START_TIME_COMPARATOR);
-
-  /**
-   * Sorts spans by ancestry, root spans (or which parents are absent from the trace chunk) first,
-   * followed by their children by start time, depth-first.
-   */
-  public static final UnaryOperator<Options> SORT_BY_ANCESTRY = Options::sortByAncestry;
-
-  private final Options options;
-  private final SpanMatcher[] matchers;
-
-  private TraceMatcher(Options options, SpanMatcher[] matchers) {
-    if (matchers.length == 0) {
-      throw new IllegalArgumentException("No span matchers provided");
+    /*
+     * Span comparators.
+     */
+    /** Span comparator to sort by start time. */
+    public static final Comparator<DDSpan> START_TIME_COMPARATOR =
+            comparingLong(DDSpan::getStartTime).thenComparingLong(DDSpan::getSpanId);
+
+    /*
+     * Span assertion options.
+     */
+    /** Sorts spans by start time. */
+    public static UnaryOperator<Options> SORT_BY_START_TIME = options -> options.sort(START_TIME_COMPARATOR);
+
+    /**
+     * Sorts spans by ancestry, root spans (or which parents are absent from the trace chunk) first,
+     * followed by their children by start time, depth-first.
+     */
+    public static final UnaryOperator<Options> SORT_BY_ANCESTRY = Options::sortByAncestry;
+
+    private final Options options;
+    private final SpanMatcher[] matchers;
+
+    private TraceMatcher(Options options, SpanMatcher[] matchers) {
+        if (matchers.length == 0) {
+            throw new IllegalArgumentException("No span matchers provided");
+        }
+        this.options = options;
+        this.matchers = matchers;
     }
-    this.options = options;
-    this.matchers = matchers;
-  }
-
-  /**
-   * Checks a trace structure.
-   *
-   * @param matchers The matchers to verify the trace structure.
-   */
-  public static TraceMatcher trace(SpanMatcher... matchers) {
-    return new TraceMatcher(new Options(), matchers);
-  }
-
-  /**
-   * Checks a trace structure.
-   *
-   * @param options The {@link TraceAssertions.Options} to configure the checks.
-   * @param matchers The matchers to verify the trace structure.
-   */
-  public static TraceMatcher trace(UnaryOperator<Options> options, SpanMatcher... matchers) {
-    return new TraceMatcher(options.apply(new Options()), matchers);
-  }
-
-  void assertTrace(List<DDSpan> trace, int traceIndex) {
-    int spanCount = trace.size();
-    if (spanCount != this.matchers.length) {
-      throw new AssertionFailedError(
-          "Invalid number of spans for trace " + traceIndex + " : " + trace,
-          this.matchers.length,
-          spanCount);
-    }
-    if (this.options.sortByAncestry) {
-      trace = sortByAncestry(trace);
-    } else if (this.options.comparator != null) {
-      trace = new ArrayList<>(trace);
-      trace.sort(this.options.comparator);
-    }
-    for (int spanIndex = 0; spanIndex < spanCount; spanIndex++) {
-      this.matchers[spanIndex].assertSpan(trace, spanIndex);
+
+    /**
+     * Checks a trace structure.
+     *
+     * @param matchers The matchers to verify the trace structure.
+     */
+    public static TraceMatcher trace(SpanMatcher... matchers) {
+        return new TraceMatcher(new Options(), matchers);
     }
-  }
-
-  private static List<DDSpan> sortByAncestry(List<DDSpan> spans) {
-    Set<Long> spanIds = spans.stream().map(DDSpan::getSpanId).collect(toSet());
-    Map<Long, List<DDSpan>> spansByParentId = new HashMap<>();
-    for (DDSpan span : spans) {
-      long parentId = span.getParentId();
-      if (parentId != 0 && !spanIds.contains(parentId)) {
-        parentId = 0;
-      }
-      spansByParentId.computeIfAbsent(parentId, k -> new ArrayList<>()).add(span);
+
+    /**
+     * Checks a trace structure.
+     *
+     * @param options The {@link TraceAssertions.Options} to configure the checks.
+     * @param matchers The matchers to verify the trace structure.
+     */
+    public static TraceMatcher trace(UnaryOperator<Options> options, SpanMatcher... matchers) {
+        return new TraceMatcher(options.apply(new Options()), matchers);
     }
-    spansByParentId.forEach((k, v) -> v.sort(START_TIME_COMPARATOR));
-
-    List<DDSpan> ordered = new ArrayList<>(spans.size());
-    appendChildren(ordered, spansByParentId.get(0L), spansByParentId);
-    return ordered;
-  }
-
-  private static void appendChildren(
-      List<DDSpan> orderedSpan, List<DDSpan> children, Map<Long, List<DDSpan>> spansByParentId) {
-    for (DDSpan child : children) {
-      orderedSpan.add(child);
-      List<DDSpan> grandChildren = spansByParentId.get(child.getSpanId());
-      if (grandChildren != null) {
-        appendChildren(orderedSpan, grandChildren, spansByParentId);
-      }
+
+    void assertTrace(List<DDSpan> trace, int traceIndex) {
+        int spanCount = trace.size();
+        if (spanCount != this.matchers.length) {
+            throw new AssertionFailedError(
+                    "Invalid number of spans for trace " + traceIndex + " : " + trace, this.matchers.length, spanCount);
+        }
+        if (this.options.sortByAncestry) {
+            trace = sortByAncestry(trace);
+        } else if (this.options.comparator != null) {
+            trace = new ArrayList<>(trace);
+            trace.sort(this.options.comparator);
+        }
+        for (int spanIndex = 0; spanIndex < spanCount; spanIndex++) {
+            this.matchers[spanIndex].assertSpan(trace, spanIndex);
+        }
     }
-  }
 
-  public static final class Options {
-    private Comparator<DDSpan> comparator = null;
-    private boolean sortByAncestry = false;
+    private static List<DDSpan> sortByAncestry(List<DDSpan> spans) {
+        Set<Long> spanIds = spans.stream().map(DDSpan::getSpanId).collect(toSet());
+        Map<Long, List<DDSpan>> spansByParentId = new HashMap<>();
+        for (DDSpan span : spans) {
+            long parentId = span.getParentId();
+            if (parentId != 0 && !spanIds.contains(parentId)) {
+                parentId = 0;
+            }
+            spansByParentId.computeIfAbsent(parentId, k -> new ArrayList<>()).add(span);
+        }
+        spansByParentId.forEach((k, v) -> v.sort(START_TIME_COMPARATOR));
+
+        List<DDSpan> ordered = new ArrayList<>(spans.size());
+        appendChildren(ordered, spansByParentId.get(0L), spansByParentId);
+        return ordered;
+    }
 
-    public Options sort(Comparator<DDSpan> comparator) {
-      this.comparator = comparator;
-      this.sortByAncestry = false;
-      return this;
+    private static void appendChildren(
+            List<DDSpan> orderedSpan, List<DDSpan> children, Map<Long, List<DDSpan>> spansByParentId) {
+        for (DDSpan child : children) {
+            orderedSpan.add(child);
+            List<DDSpan> grandChildren = spansByParentId.get(child.getSpanId());
+            if (grandChildren != null) {
+                appendChildren(orderedSpan, grandChildren, spansByParentId);
+            }
+        }
     }
 
-    private Options sortByAncestry() {
-      this.comparator = null;
-      this.sortByAncestry = true;
-      return this;
+    public static final class Options {
+        private Comparator<DDSpan> comparator = null;
+        private boolean sortByAncestry = false;
+
+        public Options sort(Comparator<DDSpan> comparator) {
+            this.comparator = comparator;
+            this.sortByAncestry = false;
+            return this;
+        }
+
+        private Options sortByAncestry() {
+            this.comparator = null;
+            this.sortByAncestry = true;
+            return this;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuableScopeAdvice.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuableScopeAdvice.java
index 59b2a3c23b1..3dd133f7295 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuableScopeAdvice.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuableScopeAdvice.java
@@ -4,19 +4,19 @@
 
 /** Test-only advice for {@code ContinuableScope}. */
 public final class ContinuableScopeAdvice {
-  private ContinuableScopeAdvice() {}
+    private ContinuableScopeAdvice() {}
 
-  public static final class OnProperClose {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void exit(@Advice.This Object scope) {
-      ScopeContinuationProbe.onScopeClose(scope);
+    public static final class OnProperClose {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void exit(@Advice.This Object scope) {
+            ScopeContinuationProbe.onScopeClose(scope);
+        }
     }
-  }
 
-  public static final class Close {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(@Advice.This Object scope) {
-      ScopeContinuationProbe.onScopeClosing(scope);
+    public static final class Close {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(@Advice.This Object scope) {
+            ScopeContinuationProbe.onScopeClosing(scope);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuableScopeManagerAdvice.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuableScopeManagerAdvice.java
index c98cfa301c9..72ad98c3b43 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuableScopeManagerAdvice.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuableScopeManagerAdvice.java
@@ -4,12 +4,12 @@
 
 /** Test-only advice for scopes owned by the iteration cleaner. */
 public final class ContinuableScopeManagerAdvice {
-  private ContinuableScopeManagerAdvice() {}
+    private ContinuableScopeManagerAdvice() {}
 
-  public static final class ScheduleRootIterationCleanup {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void exit(@Advice.Argument(1) Object scope) {
-      ScopeContinuationProbe.onDeferredScopeCleanup(scope);
+    public static final class ScheduleRootIterationCleanup {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void exit(@Advice.Argument(1) Object scope) {
+            ScopeContinuationProbe.onDeferredScopeCleanup(scope);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuationAdvice.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuationAdvice.java
index cbfa8c7256c..fb9cdc6b3e8 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuationAdvice.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuationAdvice.java
@@ -4,44 +4,42 @@
 
 /** Test-only advice for {@code ScopeContinuation}. */
 public final class ContinuationAdvice {
-  private ContinuationAdvice() {}
+    private ContinuationAdvice() {}
 
-  public static final class Register {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void exit(@Advice.This Object self) {
-      ScopeContinuationProbe.onCapture(self);
+    public static final class Register {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void exit(@Advice.This Object self) {
+            ScopeContinuationProbe.onCapture(self);
+        }
     }
-  }
 
-  /** Timestamps entry because {@code resume()} may resolve the continuation before returning. */
-  public static final class Activate {
-    @Advice.OnMethodEnter
-    public static long enter() {
-      return System.nanoTime();
-    }
+    /** Timestamps entry because {@code resume()} may resolve the continuation before returning. */
+    public static final class Activate {
+        @Advice.OnMethodEnter
+        public static long enter() {
+            return System.nanoTime();
+        }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void exit(
-        @Advice.This Object self, @Advice.Enter long ddActivateNanos, @Advice.Return Object scope) {
-      ScopeContinuationProbe.onActivate(self, scope, ddActivateNanos);
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void exit(
+                @Advice.This Object self, @Advice.Enter long ddActivateNanos, @Advice.Return Object scope) {
+            ScopeContinuationProbe.onActivate(self, scope, ddActivateNanos);
+        }
     }
-  }
 
-  /** Timestamps entry because resolution may write the trace before the method returns. */
-  public static final class Cancel {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ScopeContinuationProbe.ResolveAttempt enter(
-        @Advice.This Object self,
-        @Advice.Origin("#m") String method,
-        @Advice.FieldValue("count") int count) {
-      return ScopeContinuationProbe.onResolveEnter(self, method, count);
-    }
+    /** Timestamps entry because resolution may write the trace before the method returns. */
+    public static final class Cancel {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ScopeContinuationProbe.ResolveAttempt enter(
+                @Advice.This Object self, @Advice.Origin("#m") String method, @Advice.FieldValue("count") int count) {
+            return ScopeContinuationProbe.onResolveEnter(self, method, count);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter ScopeContinuationProbe.ResolveAttempt attempt,
-        @Advice.FieldValue("count") int countAfter) {
-      ScopeContinuationProbe.onResolveExit(attempt, countAfter);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter ScopeContinuationProbe.ResolveAttempt attempt,
+                @Advice.FieldValue("count") int countAfter) {
+            ScopeContinuationProbe.onResolveExit(attempt, countAfter);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuationRecord.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuationRecord.java
index 3758977f646..a9ffaa83e1c 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuationRecord.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuationRecord.java
@@ -7,216 +7,209 @@
 
 /** Records a continuation's capture, activations, scopes, and resolution. */
 public final class ContinuationRecord {
-  public final long seq;
-  public final DDTraceId traceId;
-  public final long spanId;
-  public final String spanName;
-  public final byte source;
-
-  /** {@code true} when a resume/resolution was seen without a preceding capture in this window. */
-  public final boolean orphan;
-
-  private final ScopeEvent capture;
-  private final List<ScopeEvent> resumes = new ArrayList<>(1);
-  private final List<ScopeEvent> failedActivations = new ArrayList<>(0);
-  private ScopeEvent terminal;
-  private boolean duplicateTerminalAttempt;
-  private final List<ScopeEvent> extraTerminals = new ArrayList<>(0);
-  private final List<Long> scopeRecordSeqs = new ArrayList<>(1);
-
-  ContinuationRecord(
-      long seq,
-      DDTraceId traceId,
-      long spanId,
-      String spanName,
-      byte source,
-      boolean orphan,
-      ScopeEvent capture) {
-    this.seq = seq;
-    this.traceId = traceId;
-    this.spanId = spanId;
-    this.spanName = spanName;
-    this.source = source;
-    this.orphan = orphan;
-    this.capture = capture;
-  }
-
-  synchronized void addResume(ScopeEvent event) {
-    resumes.add(event);
-  }
-
-  synchronized void addFailedActivation(ScopeEvent event) {
-    failedActivations.add(event);
-  }
-
-  /** First terminal sets {@link #terminal}; any subsequent terminal is a double-finish signal. */
-  synchronized void setTerminalOrExtra(ScopeEvent event) {
-    setTerminalOrExtra(event, false);
-  }
-
-  synchronized void setTerminalOrExtra(ScopeEvent event, boolean duplicateAttempt) {
-    // Counter underflow can prove duplicate cleanup before the first close's advice arrives.
-    duplicateTerminalAttempt |= duplicateAttempt;
-    if (terminal == null) {
-      terminal = event;
-    } else {
-      extraTerminals.add(event);
-    }
-  }
-
-  synchronized void linkScope(long scopeSeq) {
-    scopeRecordSeqs.add(scopeSeq);
-  }
-
-  synchronized ContinuationRecord snapshot() {
-    ContinuationRecord copy =
-        new ContinuationRecord(
-            seq,
-            traceId,
-            spanId,
-            spanName,
-            source,
-            orphan,
-            capture == null ? null : capture.snapshot());
-    for (ScopeEvent event : resumes) {
-      copy.resumes.add(event.snapshot());
-    }
-    for (ScopeEvent event : failedActivations) {
-      copy.failedActivations.add(event.snapshot());
-    }
-    if (terminal != null) {
-      copy.setTerminalOrExtra(terminal.snapshot(), duplicateTerminalAttempt);
-    }
-    for (ScopeEvent event : extraTerminals) {
-      copy.extraTerminals.add(event.snapshot());
-    }
-    copy.scopeRecordSeqs.addAll(scopeRecordSeqs);
-    return copy;
-  }
-
-  public synchronized ScopeEvent capture() {
-    return capture;
-  }
-
-  public synchronized List<ScopeEvent> resumes() {
-    return new ArrayList<>(resumes);
-  }
-
-  public synchronized List<ScopeEvent> failedActivations() {
-    return new ArrayList<>(failedActivations);
-  }
-
-  public synchronized ScopeEvent terminal() {
-    return terminal;
-  }
-
-  public synchronized List<ScopeEvent> extraTerminals() {
-    return new ArrayList<>(extraTerminals);
-  }
-
-  public synchronized List<Long> scopeRecordSeqs() {
-    return new ArrayList<>(scopeRecordSeqs);
-  }
-
-  public synchronized boolean isResolved() {
-    return terminal != null;
-  }
-
-  public synchronized ContinuationStatus status() {
-    if (terminal != null) {
-      return terminal.type == ScopeEvent.Type.RESOLVE_RELEASE
-          ? ContinuationStatus.RELEASED
-          : ContinuationStatus.FINISHED;
-    }
-    return ContinuationStatus.LEAKED;
-  }
-
-  /** Derives failures, including events after {@code rootWrittenNanos} when provided. */
-  public synchronized EnumSet<Failure> failures(Long rootWrittenNanos) {
-    EnumSet<Failure> failures = EnumSet.noneOf(Failure.class);
-    if (terminal == null) {
-      failures.add(Failure.LEAKED);
-    }
-    if (duplicateTerminalAttempt || !extraTerminals.isEmpty()) {
-      failures.add(Failure.DOUBLE_FINISH);
-    }
-    // Cleanup entry timestamps do not order resolution against concurrent successful resumes.
-    if (terminal != null && !failedActivations.isEmpty()) {
-      failures.add(Failure.ACTIVATE_AFTER_RESOLVE);
-    }
-    if (rootWrittenNanos != null
-        && (laterThan(terminal, rootWrittenNanos) || laterThan(resumes, rootWrittenNanos))) {
-      failures.add(Failure.LATE_FINISH);
-    }
-    return failures;
-  }
-
-  /** {@code true} when capture and any resume/terminal happened on different threads. */
-  public synchronized boolean threadHandoff() {
-    if (capture == null) {
-      return false;
-    }
-    String captureThread = capture.threadName;
-    for (ScopeEvent r : resumes) {
-      if (!captureThread.equals(r.threadName)) {
-        return true;
-      }
-    }
-    return terminal != null && !captureThread.equals(terminal.threadName);
-  }
-
-  /** Nanos between capture and the first resume, or {@code null} if not both observed. */
-  public synchronized Long captureToFirstResumeNanos() {
-    if (capture == null || resumes.isEmpty()) {
-      return null;
-    }
-    long firstResumeNanos = Long.MAX_VALUE;
-    for (ScopeEvent resume : resumes) {
-      firstResumeNanos = Math.min(firstResumeNanos, resume.nanos);
-    }
-    return firstResumeNanos - capture.nanos;
-  }
+    public final long seq;
+    public final DDTraceId traceId;
+    public final long spanId;
+    public final String spanName;
+    public final byte source;
 
-  /** Nanos between capture and the terminal resolution, or {@code null} if not both observed. */
-  public synchronized Long ageAtTerminalNanos() {
-    if (capture == null || terminal == null) {
-      return null;
+    /** {@code true} when a resume/resolution was seen without a preceding capture in this window. */
+    public final boolean orphan;
+
+    private final ScopeEvent capture;
+    private final List<ScopeEvent> resumes = new ArrayList<>(1);
+    private final List<ScopeEvent> failedActivations = new ArrayList<>(0);
+    private ScopeEvent terminal;
+    private boolean duplicateTerminalAttempt;
+    private final List<ScopeEvent> extraTerminals = new ArrayList<>(0);
+    private final List<Long> scopeRecordSeqs = new ArrayList<>(1);
+
+    ContinuationRecord(
+            long seq,
+            DDTraceId traceId,
+            long spanId,
+            String spanName,
+            byte source,
+            boolean orphan,
+            ScopeEvent capture) {
+        this.seq = seq;
+        this.traceId = traceId;
+        this.spanId = spanId;
+        this.spanName = spanName;
+        this.source = source;
+        this.orphan = orphan;
+        this.capture = capture;
     }
-    return terminal.nanos - capture.nanos;
-  }
 
-  /** Earliest known event time for ordering the timeline. */
-  public synchronized long firstNanos() {
-    long min = capture != null ? capture.nanos : Long.MAX_VALUE;
-    for (ScopeEvent e : resumes) {
-      min = Math.min(min, e.nanos);
-    }
-    for (ScopeEvent e : failedActivations) {
-      min = Math.min(min, e.nanos);
+    synchronized void addResume(ScopeEvent event) {
+        resumes.add(event);
     }
-    if (terminal != null) {
-      min = Math.min(min, terminal.nanos);
+
+    synchronized void addFailedActivation(ScopeEvent event) {
+        failedActivations.add(event);
     }
-    for (ScopeEvent e : extraTerminals) {
-      min = Math.min(min, e.nanos);
-    }
-    return min;
-  }
-
-  public String sourceName() {
-    return ScopeSources.name(source);
-  }
-
-  private static boolean laterThan(ScopeEvent event, long nanos) {
-    return event != null && event.nanos > nanos;
-  }
-
-  private static boolean laterThan(List<ScopeEvent> events, long nanos) {
-    for (ScopeEvent e : events) {
-      if (e.nanos > nanos) {
-        return true;
-      }
+
+    /** First terminal sets {@link #terminal}; any subsequent terminal is a double-finish signal. */
+    synchronized void setTerminalOrExtra(ScopeEvent event) {
+        setTerminalOrExtra(event, false);
+    }
+
+    synchronized void setTerminalOrExtra(ScopeEvent event, boolean duplicateAttempt) {
+        // Counter underflow can prove duplicate cleanup before the first close's advice arrives.
+        duplicateTerminalAttempt |= duplicateAttempt;
+        if (terminal == null) {
+            terminal = event;
+        } else {
+            extraTerminals.add(event);
+        }
+    }
+
+    synchronized void linkScope(long scopeSeq) {
+        scopeRecordSeqs.add(scopeSeq);
+    }
+
+    synchronized ContinuationRecord snapshot() {
+        ContinuationRecord copy = new ContinuationRecord(
+                seq, traceId, spanId, spanName, source, orphan, capture == null ? null : capture.snapshot());
+        for (ScopeEvent event : resumes) {
+            copy.resumes.add(event.snapshot());
+        }
+        for (ScopeEvent event : failedActivations) {
+            copy.failedActivations.add(event.snapshot());
+        }
+        if (terminal != null) {
+            copy.setTerminalOrExtra(terminal.snapshot(), duplicateTerminalAttempt);
+        }
+        for (ScopeEvent event : extraTerminals) {
+            copy.extraTerminals.add(event.snapshot());
+        }
+        copy.scopeRecordSeqs.addAll(scopeRecordSeqs);
+        return copy;
+    }
+
+    public synchronized ScopeEvent capture() {
+        return capture;
+    }
+
+    public synchronized List<ScopeEvent> resumes() {
+        return new ArrayList<>(resumes);
+    }
+
+    public synchronized List<ScopeEvent> failedActivations() {
+        return new ArrayList<>(failedActivations);
+    }
+
+    public synchronized ScopeEvent terminal() {
+        return terminal;
+    }
+
+    public synchronized List<ScopeEvent> extraTerminals() {
+        return new ArrayList<>(extraTerminals);
+    }
+
+    public synchronized List<Long> scopeRecordSeqs() {
+        return new ArrayList<>(scopeRecordSeqs);
+    }
+
+    public synchronized boolean isResolved() {
+        return terminal != null;
+    }
+
+    public synchronized ContinuationStatus status() {
+        if (terminal != null) {
+            return terminal.type == ScopeEvent.Type.RESOLVE_RELEASE
+                    ? ContinuationStatus.RELEASED
+                    : ContinuationStatus.FINISHED;
+        }
+        return ContinuationStatus.LEAKED;
+    }
+
+    /** Derives failures, including events after {@code rootWrittenNanos} when provided. */
+    public synchronized EnumSet<Failure> failures(Long rootWrittenNanos) {
+        EnumSet<Failure> failures = EnumSet.noneOf(Failure.class);
+        if (terminal == null) {
+            failures.add(Failure.LEAKED);
+        }
+        if (duplicateTerminalAttempt || !extraTerminals.isEmpty()) {
+            failures.add(Failure.DOUBLE_FINISH);
+        }
+        // Cleanup entry timestamps do not order resolution against concurrent successful resumes.
+        if (terminal != null && !failedActivations.isEmpty()) {
+            failures.add(Failure.ACTIVATE_AFTER_RESOLVE);
+        }
+        if (rootWrittenNanos != null
+                && (laterThan(terminal, rootWrittenNanos) || laterThan(resumes, rootWrittenNanos))) {
+            failures.add(Failure.LATE_FINISH);
+        }
+        return failures;
+    }
+
+    /** {@code true} when capture and any resume/terminal happened on different threads. */
+    public synchronized boolean threadHandoff() {
+        if (capture == null) {
+            return false;
+        }
+        String captureThread = capture.threadName;
+        for (ScopeEvent r : resumes) {
+            if (!captureThread.equals(r.threadName)) {
+                return true;
+            }
+        }
+        return terminal != null && !captureThread.equals(terminal.threadName);
+    }
+
+    /** Nanos between capture and the first resume, or {@code null} if not both observed. */
+    public synchronized Long captureToFirstResumeNanos() {
+        if (capture == null || resumes.isEmpty()) {
+            return null;
+        }
+        long firstResumeNanos = Long.MAX_VALUE;
+        for (ScopeEvent resume : resumes) {
+            firstResumeNanos = Math.min(firstResumeNanos, resume.nanos);
+        }
+        return firstResumeNanos - capture.nanos;
+    }
+
+    /** Nanos between capture and the terminal resolution, or {@code null} if not both observed. */
+    public synchronized Long ageAtTerminalNanos() {
+        if (capture == null || terminal == null) {
+            return null;
+        }
+        return terminal.nanos - capture.nanos;
+    }
+
+    /** Earliest known event time for ordering the timeline. */
+    public synchronized long firstNanos() {
+        long min = capture != null ? capture.nanos : Long.MAX_VALUE;
+        for (ScopeEvent e : resumes) {
+            min = Math.min(min, e.nanos);
+        }
+        for (ScopeEvent e : failedActivations) {
+            min = Math.min(min, e.nanos);
+        }
+        if (terminal != null) {
+            min = Math.min(min, terminal.nanos);
+        }
+        for (ScopeEvent e : extraTerminals) {
+            min = Math.min(min, e.nanos);
+        }
+        return min;
+    }
+
+    public String sourceName() {
+        return ScopeSources.name(source);
+    }
+
+    private static boolean laterThan(ScopeEvent event, long nanos) {
+        return event != null && event.nanos > nanos;
+    }
+
+    private static boolean laterThan(List<ScopeEvent> events, long nanos) {
+        for (ScopeEvent e : events) {
+            if (e.nanos > nanos) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuationStatus.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuationStatus.java
index 493cab1173e..c99d48cb35e 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuationStatus.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ContinuationStatus.java
@@ -5,10 +5,10 @@
  * recorded terminal observation, not which racing operation completed the core transition.
  */
 public enum ContinuationStatus {
-  /** Resolution observed through scope cleanup. */
-  FINISHED,
-  /** Resolution observed through an explicit release, including a clean release after a hold. */
-  RELEASED,
-  /** Captured (and possibly resumed) but never resolved within the recording window. */
-  LEAKED
+    /** Resolution observed through scope cleanup. */
+    FINISHED,
+    /** Resolution observed through an explicit release, including a clean release after a hold. */
+    RELEASED,
+    /** Captured (and possibly resumed) but never resolved within the recording window. */
+    LEAKED
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/Failure.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/Failure.java
index 64a596bf473..a133b1338ff 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/Failure.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/Failure.java
@@ -2,16 +2,16 @@
 
 /** A derived scope or continuation lifecycle finding. */
 public enum Failure {
-  /** Continuation captured but never resolved within the window. */
-  LEAKED,
-  /** Continuation resolved/resumed after the root span of its trace was already written. */
-  LATE_FINISH,
-  /** Continuation resolved more than once. */
-  DOUBLE_FINISH,
-  /** Continuation activated after it had already been resolved. */
-  ACTIVATE_AFTER_RESOLVE,
-  /** Scope closed while not on top of its thread's stack (closed on the wrong thread / order). */
-  CLOSE_WRONG_THREAD,
-  /** Scope opened but never closed within the window. */
-  NEVER_CLOSED
+    /** Continuation captured but never resolved within the window. */
+    LEAKED,
+    /** Continuation resolved/resumed after the root span of its trace was already written. */
+    LATE_FINISH,
+    /** Continuation resolved more than once. */
+    DOUBLE_FINISH,
+    /** Continuation activated after it had already been resolved. */
+    ACTIVATE_AFTER_RESOLVE,
+    /** Scope closed while not on top of its thread's stack (closed on the wrong thread / order). */
+    CLOSE_WRONG_THREAD,
+    /** Scope opened but never closed within the window. */
+    NEVER_CLOSED
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/PendingTraceAdvice.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/PendingTraceAdvice.java
index a93b2936b7c..46902d14f4d 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/PendingTraceAdvice.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/PendingTraceAdvice.java
@@ -6,24 +6,23 @@
  * Records a root write only after {@code PendingTrace.write(boolean)} sets {@code rootSpanWritten}.
  */
 public final class PendingTraceAdvice {
-  private PendingTraceAdvice() {}
+    private PendingTraceAdvice() {}
 
-  public static final class Write {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static boolean enter(
-        @Advice.Argument(0) boolean isPartial,
-        @Advice.FieldValue("rootSpanWritten") boolean alreadyWritten) {
-      return !isPartial && !alreadyWritten;
-    }
+    public static final class Write {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static boolean enter(
+                @Advice.Argument(0) boolean isPartial, @Advice.FieldValue("rootSpanWritten") boolean alreadyWritten) {
+            return !isPartial && !alreadyWritten;
+        }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter boolean candidate,
-        @Advice.FieldValue("rootSpanWritten") boolean written,
-        @Advice.FieldValue("traceId") Object traceId) {
-      if (candidate && written) {
-        ScopeContinuationProbe.onRootWritten(traceId);
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter boolean candidate,
+                @Advice.FieldValue("rootSpanWritten") boolean written,
+                @Advice.FieldValue("traceId") Object traceId) {
+            if (candidate && written) {
+                ScopeContinuationProbe.onRootWritten(traceId);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeContinuationProbe.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeContinuationProbe.java
index bd81814753f..5d5fbd1322e 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeContinuationProbe.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeContinuationProbe.java
@@ -27,311 +27,304 @@
  * actually recorded, as described by {@link ScopeContinuationTransformer}.
  */
 public final class ScopeContinuationProbe {
-  /**
-   * Mirrors {@code ScopeContinuation.CANCELLED}. Reaching this value marks a resolved continuation;
-   * {@code ScopeContinuationProbeTest} detects drift.
-   */
-  static final int CANCELLED = Integer.MIN_VALUE >> 1;
+    /**
+     * Mirrors {@code ScopeContinuation.CANCELLED}. Reaching this value marks a resolved continuation;
+     * {@code ScopeContinuationProbeTest} detects drift.
+     */
+    static final int CANCELLED = Integer.MIN_VALUE >> 1;
 
-  private static final ThreadLocal<ResolveAttempt> resolving = new ThreadLocal<>();
+    private static final ThreadLocal<ResolveAttempt> resolving = new ThreadLocal<>();
 
-  /** Distinguishes an explicit release from a scope close's internal release call. */
-  public static final class ResolveAttempt {
-    private final Object window;
-    private final ContextContinuation continuation;
-    private final boolean release;
-    private final int countBefore;
-    private final long nanos = System.nanoTime();
-    private final ResolveAttempt previous;
+    /** Distinguishes an explicit release from a scope close's internal release call. */
+    public static final class ResolveAttempt {
+        private final Object window;
+        private final ContextContinuation continuation;
+        private final boolean release;
+        private final int countBefore;
+        private final long nanos = System.nanoTime();
+        private final ResolveAttempt previous;
 
-    private ResolveAttempt(
-        Object window, ContextContinuation continuation, boolean release, int countBefore) {
-      this.window = window;
-      this.continuation = continuation;
-      this.release = release;
-      this.countBefore = countBefore;
-      this.previous = resolving.get();
+        private ResolveAttempt(Object window, ContextContinuation continuation, boolean release, int countBefore) {
+            this.window = window;
+            this.continuation = continuation;
+            this.release = release;
+            this.countBefore = countBefore;
+            this.previous = resolving.get();
+        }
     }
-  }
 
-  private static volatile Field sourceField;
+    private static volatile Field sourceField;
 
-  private static volatile Field scopeSourceField;
-  private static volatile Field continuationField;
-  private static volatile Field scopeManagerField;
-  private static volatile Method scopeStackMethod;
-  private static volatile Method checkTopMethod;
+    private static volatile Field scopeSourceField;
+    private static volatile Field continuationField;
+    private static volatile Field scopeManagerField;
+    private static volatile Method scopeStackMethod;
+    private static volatile Method checkTopMethod;
 
-  private ScopeContinuationProbe() {}
+    private ScopeContinuationProbe() {}
 
-  public static void onCapture(Object self) {
-    Object window = ScopeDiagnostics.recordingWindow();
-    if (window == null) {
-      return;
-    }
-    try {
-      ContextContinuation continuation = (ContextContinuation) self;
-      AgentSpan span = AgentSpan.fromContext(continuation.context());
-      if (span != null) {
-        ScopeDiagnostics.recordCapture(
-            window,
-            continuation,
-            span.getTraceId(),
-            span.getSpanId(),
-            spanName(span),
-            sourceOf(self));
-      }
-    } catch (Throwable ignored) {
-      // Diagnostics must never affect the tracer.
+    public static void onCapture(Object self) {
+        Object window = ScopeDiagnostics.recordingWindow();
+        if (window == null) {
+            return;
+        }
+        try {
+            ContextContinuation continuation = (ContextContinuation) self;
+            AgentSpan span = AgentSpan.fromContext(continuation.context());
+            if (span != null) {
+                ScopeDiagnostics.recordCapture(
+                        window, continuation, span.getTraceId(), span.getSpanId(), spanName(span), sourceOf(self));
+            }
+        } catch (Throwable ignored) {
+            // Diagnostics must never affect the tracer.
+        }
     }
-  }
 
-  public static void onActivate(Object self, Object returnedScope, long activateNanos) {
-    Object window = ScopeDiagnostics.recordingWindow();
-    if (window == null) {
-      return;
-    }
-    try {
-      ContextContinuation continuation = (ContextContinuation) self;
-      if (returnedScope == NoopScope.INSTANCE) {
-        // A noop result may indicate activation after resolution.
-        ScopeDiagnostics.recordActivateFailed(window, continuation);
-        return;
-      }
-      AgentSpan span = AgentSpan.fromContext(continuation.context());
-      if (span != null) {
-        ScopeDiagnostics.recordActivate(
-            window,
-            continuation,
-            span.getTraceId(),
-            span.getSpanId(),
-            spanName(span),
-            sourceOf(self),
-            activateNanos);
-      }
-    } catch (Throwable ignored) {
+    public static void onActivate(Object self, Object returnedScope, long activateNanos) {
+        Object window = ScopeDiagnostics.recordingWindow();
+        if (window == null) {
+            return;
+        }
+        try {
+            ContextContinuation continuation = (ContextContinuation) self;
+            if (returnedScope == NoopScope.INSTANCE) {
+                // A noop result may indicate activation after resolution.
+                ScopeDiagnostics.recordActivateFailed(window, continuation);
+                return;
+            }
+            AgentSpan span = AgentSpan.fromContext(continuation.context());
+            if (span != null) {
+                ScopeDiagnostics.recordActivate(
+                        window,
+                        continuation,
+                        span.getTraceId(),
+                        span.getSpanId(),
+                        spanName(span),
+                        sourceOf(self),
+                        activateNanos);
+            }
+        } catch (Throwable ignored) {
+        }
     }
-  }
 
-  public static ResolveAttempt onResolveEnter(Object self, String method, int countBefore) {
-    Object window = ScopeDiagnostics.recordingWindow();
-    if (window == null) {
-      return null;
+    public static ResolveAttempt onResolveEnter(Object self, String method, int countBefore) {
+        Object window = ScopeDiagnostics.recordingWindow();
+        if (window == null) {
+            return null;
+        }
+        ResolveAttempt attempt =
+                new ResolveAttempt(window, (ContextContinuation) self, "release".equals(method), countBefore);
+        resolving.set(attempt);
+        return attempt;
     }
-    ResolveAttempt attempt =
-        new ResolveAttempt(
-            window, (ContextContinuation) self, "release".equals(method), countBefore);
-    resolving.set(attempt);
-    return attempt;
-  }
 
-  public static void onResolveExit(ResolveAttempt attempt, int countAfter) {
-    if (attempt == null) {
-      return;
-    }
-    try {
-      if (attempt.countBefore > CANCELLED && countAfter > CANCELLED) {
-        return;
-      }
-      // Scope cleanup's slow path calls release(): only the outer close owns that event.
-      if (attempt.release) {
-        for (ResolveAttempt parent = attempt.previous; parent != null; parent = parent.previous) {
-          if (!parent.release
-              && parent.window == attempt.window
-              && parent.continuation == attempt.continuation) {
+    public static void onResolveExit(ResolveAttempt attempt, int countAfter) {
+        if (attempt == null) {
             return;
-          }
         }
-      }
-      ScopeDiagnostics.recordResolve(
-          attempt.window,
-          attempt.continuation,
-          attempt.release,
-          attempt.nanos,
-          attempt.countBefore <= CANCELLED || countAfter < CANCELLED);
-    } catch (Throwable ignored) {
-    } finally {
-      if (attempt.previous == null) {
-        resolving.remove();
-      } else {
-        resolving.set(attempt.previous);
-      }
+        try {
+            if (attempt.countBefore > CANCELLED && countAfter > CANCELLED) {
+                return;
+            }
+            // Scope cleanup's slow path calls release(): only the outer close owns that event.
+            if (attempt.release) {
+                for (ResolveAttempt parent = attempt.previous; parent != null; parent = parent.previous) {
+                    if (!parent.release
+                            && parent.window == attempt.window
+                            && parent.continuation == attempt.continuation) {
+                        return;
+                    }
+                }
+            }
+            ScopeDiagnostics.recordResolve(
+                    attempt.window,
+                    attempt.continuation,
+                    attempt.release,
+                    attempt.nanos,
+                    attempt.countBefore <= CANCELLED || countAfter < CANCELLED);
+        } catch (Throwable ignored) {
+        } finally {
+            if (attempt.previous == null) {
+                resolving.remove();
+            } else {
+                resolving.set(attempt.previous);
+            }
+        }
     }
-  }
 
-  public static void onRootWritten(Object traceId) {
-    Object window = ScopeDiagnostics.recordingWindow();
-    if (window == null) {
-      return;
-    }
-    try {
-      ScopeDiagnostics.recordRootWritten(window, (DDTraceId) traceId);
-    } catch (Throwable ignored) {
+    public static void onRootWritten(Object traceId) {
+        Object window = ScopeDiagnostics.recordingWindow();
+        if (window == null) {
+            return;
+        }
+        try {
+            ScopeDiagnostics.recordRootWritten(window, (DDTraceId) traceId);
+        } catch (Throwable ignored) {
+        }
     }
-  }
 
-  public static void onScopeOpen(Object scope) {
-    Object window = ScopeDiagnostics.recordingWindow();
-    if (window == null) {
-      return;
-    }
-    try {
-      AgentSpan span = AgentSpan.fromContext(((ContextScope) scope).context());
-      DDTraceId traceId = span != null ? span.getTraceId() : DDTraceId.ZERO;
-      long spanId = span != null ? span.getSpanId() : 0L;
-      String name = span != null ? spanName(span) : null;
-      ScopeDiagnostics.recordScopeOpen(
-          window, scope, traceId, spanId, name, scopeSourceOf(scope), continuationOf(scope));
-    } catch (Throwable ignored) {
+    public static void onScopeOpen(Object scope) {
+        Object window = ScopeDiagnostics.recordingWindow();
+        if (window == null) {
+            return;
+        }
+        try {
+            AgentSpan span = AgentSpan.fromContext(((ContextScope) scope).context());
+            DDTraceId traceId = span != null ? span.getTraceId() : DDTraceId.ZERO;
+            long spanId = span != null ? span.getSpanId() : 0L;
+            String name = span != null ? spanName(span) : null;
+            ScopeDiagnostics.recordScopeOpen(
+                    window, scope, traceId, spanId, name, scopeSourceOf(scope), continuationOf(scope));
+        } catch (Throwable ignored) {
+        }
     }
-  }
 
-  public static void onScopeClose(Object scope) {
-    Object window = ScopeDiagnostics.recordingWindow();
-    if (window == null) {
-      return;
-    }
-    try {
-      ScopeDiagnostics.recordScopeClose(window, scope);
-    } catch (Throwable ignored) {
+    public static void onScopeClose(Object scope) {
+        Object window = ScopeDiagnostics.recordingWindow();
+        if (window == null) {
+            return;
+        }
+        try {
+            ScopeDiagnostics.recordScopeClose(window, scope);
+        } catch (Throwable ignored) {
+        }
     }
-  }
 
-  public static void onDeferredScopeCleanup(Object scope) {
-    Object window = ScopeDiagnostics.recordingWindow();
-    if (window == null) {
-      return;
-    }
-    try {
-      ScopeDiagnostics.recordDeferredScopeCleanup(window, scope);
-    } catch (Throwable ignored) {
+    public static void onDeferredScopeCleanup(Object scope) {
+        Object window = ScopeDiagnostics.recordingWindow();
+        if (window == null) {
+            return;
+        }
+        try {
+            ScopeDiagnostics.recordDeferredScopeCleanup(window, scope);
+        } catch (Throwable ignored) {
+        }
     }
-  }
 
-  /** Records an out-of-order close when the internal stack can be inspected. */
-  public static void onScopeClosing(Object scope) {
-    Object window = ScopeDiagnostics.recordingWindow();
-    if (window == null) {
-      return;
-    }
-    try {
-      if (isNotOnTop(scope)) {
-        ScopeDiagnostics.recordScopeCloseWrongThread(window, scope);
-      }
-    } catch (Throwable ignored) {
+    /** Records an out-of-order close when the internal stack can be inspected. */
+    public static void onScopeClosing(Object scope) {
+        Object window = ScopeDiagnostics.recordingWindow();
+        if (window == null) {
+            return;
+        }
+        try {
+            if (isNotOnTop(scope)) {
+                ScopeDiagnostics.recordScopeCloseWrongThread(window, scope);
+            }
+        } catch (Throwable ignored) {
+        }
     }
-  }
 
-  /** Copies the possibly mutable span name. */
-  private static String spanName(AgentSpan span) {
-    try {
-      CharSequence name = span.getSpanName();
-      return name == null ? null : name.toString();
-    } catch (Throwable ignored) {
-      return null;
+    /** Copies the possibly mutable span name. */
+    private static String spanName(AgentSpan span) {
+        try {
+            CharSequence name = span.getSpanName();
+            return name == null ? null : name.toString();
+        } catch (Throwable ignored) {
+            return null;
+        }
     }
-  }
 
-  private static byte sourceOf(Object self) {
-    try {
-      Field field = sourceField;
-      if (field == null) {
-        field = self.getClass().getDeclaredField("source");
-        field.setAccessible(true);
-        sourceField = field;
-      }
-      return field.getByte(self);
-    } catch (Throwable ignored) {
-      return (byte) -1;
+    private static byte sourceOf(Object self) {
+        try {
+            Field field = sourceField;
+            if (field == null) {
+                field = self.getClass().getDeclaredField("source");
+                field.setAccessible(true);
+                sourceField = field;
+            }
+            return field.getByte(self);
+        } catch (Throwable ignored) {
+            return (byte) -1;
+        }
     }
-  }
 
-  private static byte scopeSourceOf(Object scope) {
-    try {
-      Field field = scopeSourceField;
-      if (field == null) {
-        field = findField(scope.getClass(), "source");
-        scopeSourceField = field;
-      }
-      return field != null ? field.getByte(scope) : (byte) -1;
-    } catch (Throwable ignored) {
-      return (byte) -1;
+    private static byte scopeSourceOf(Object scope) {
+        try {
+            Field field = scopeSourceField;
+            if (field == null) {
+                field = findField(scope.getClass(), "source");
+                scopeSourceField = field;
+            }
+            return field != null ? field.getByte(scope) : (byte) -1;
+        } catch (Throwable ignored) {
+            return (byte) -1;
+        }
     }
-  }
 
-  private static ContextContinuation continuationOf(Object scope) {
-    try {
-      Field field = continuationField;
-      if (field == null) {
-        field = findField(scope.getClass(), "continuation");
-        continuationField = field;
-      }
-      if (field == null || !field.getDeclaringClass().isInstance(scope)) {
-        return null;
-      }
-      Object value = field.get(scope);
-      return value instanceof ContextContinuation ? (ContextContinuation) value : null;
-    } catch (Throwable ignored) {
-      return null;
+    private static ContextContinuation continuationOf(Object scope) {
+        try {
+            Field field = continuationField;
+            if (field == null) {
+                field = findField(scope.getClass(), "continuation");
+                continuationField = field;
+            }
+            if (field == null || !field.getDeclaringClass().isInstance(scope)) {
+                return null;
+            }
+            Object value = field.get(scope);
+            return value instanceof ContextContinuation ? (ContextContinuation) value : null;
+        } catch (Throwable ignored) {
+            return null;
+        }
     }
-  }
 
-  private static boolean isNotOnTop(Object scope) {
-    try {
-      Field managerField = scopeManagerField;
-      if (managerField == null) {
-        managerField = findField(scope.getClass(), "scopeManager");
-        scopeManagerField = managerField;
-      }
-      Object manager = managerField != null ? managerField.get(scope) : null;
-      if (manager == null) {
-        return false;
-      }
-      Method stackMethod = scopeStackMethod;
-      if (stackMethod == null) {
-        stackMethod = findMethod(manager.getClass(), "scopeStack", 0);
-        scopeStackMethod = stackMethod;
-      }
-      Object stack = stackMethod != null ? stackMethod.invoke(manager) : null;
-      if (stack == null) {
-        return false;
-      }
-      Method check = checkTopMethod;
-      if (check == null) {
-        check = findMethod(stack.getClass(), "checkTop", 1);
-        checkTopMethod = check;
-      }
-      if (check == null) {
-        return false;
-      }
-      Object onTop = check.invoke(stack, scope);
-      return onTop instanceof Boolean && !((Boolean) onTop);
-    } catch (Throwable ignored) {
-      return false;
+    private static boolean isNotOnTop(Object scope) {
+        try {
+            Field managerField = scopeManagerField;
+            if (managerField == null) {
+                managerField = findField(scope.getClass(), "scopeManager");
+                scopeManagerField = managerField;
+            }
+            Object manager = managerField != null ? managerField.get(scope) : null;
+            if (manager == null) {
+                return false;
+            }
+            Method stackMethod = scopeStackMethod;
+            if (stackMethod == null) {
+                stackMethod = findMethod(manager.getClass(), "scopeStack", 0);
+                scopeStackMethod = stackMethod;
+            }
+            Object stack = stackMethod != null ? stackMethod.invoke(manager) : null;
+            if (stack == null) {
+                return false;
+            }
+            Method check = checkTopMethod;
+            if (check == null) {
+                check = findMethod(stack.getClass(), "checkTop", 1);
+                checkTopMethod = check;
+            }
+            if (check == null) {
+                return false;
+            }
+            Object onTop = check.invoke(stack, scope);
+            return onTop instanceof Boolean && !((Boolean) onTop);
+        } catch (Throwable ignored) {
+            return false;
+        }
     }
-  }
 
-  private static Field findField(Class<?> cls, String name) {
-    for (Class<?> c = cls; c != null; c = c.getSuperclass()) {
-      try {
-        Field f = c.getDeclaredField(name);
-        f.setAccessible(true);
-        return f;
-      } catch (NoSuchFieldException ignored) {
-      }
+    private static Field findField(Class<?> cls, String name) {
+        for (Class<?> c = cls; c != null; c = c.getSuperclass()) {
+            try {
+                Field f = c.getDeclaredField(name);
+                f.setAccessible(true);
+                return f;
+            } catch (NoSuchFieldException ignored) {
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  private static Method findMethod(Class<?> cls, String name, int paramCount) {
-    for (Class<?> c = cls; c != null; c = c.getSuperclass()) {
-      for (Method m : c.getDeclaredMethods()) {
-        if (m.getName().equals(name) && m.getParameterCount() == paramCount) {
-          m.setAccessible(true);
-          return m;
+    private static Method findMethod(Class<?> cls, String name, int paramCount) {
+        for (Class<?> c = cls; c != null; c = c.getSuperclass()) {
+            for (Method m : c.getDeclaredMethods()) {
+                if (m.getName().equals(name) && m.getParameterCount() == paramCount) {
+                    m.setAccessible(true);
+                    return m;
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeContinuationTransformer.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeContinuationTransformer.java
index b5e1c6544e1..8b922224238 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeContinuationTransformer.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeContinuationTransformer.java
@@ -50,120 +50,80 @@
  * leak-free.
  */
 final class ScopeContinuationTransformer {
-  private static volatile ResettableClassFileTransformer transformer;
+    private static volatile ResettableClassFileTransformer transformer;
 
-  private ScopeContinuationTransformer() {}
+    private ScopeContinuationTransformer() {}
 
-  static synchronized void install() {
-    if (transformer != null) {
-      return;
-    }
-    try {
-      // Related core types can otherwise load these targets reentrantly while they are transformed.
-      ClassLoader loader = ScopeContinuationTransformer.class.getClassLoader();
-      Class.forName("datadog.trace.core.scopemanager.ScopeContinuation", false, loader);
-      Class.forName("datadog.trace.core.scopemanager.ScopeStack", false, loader);
-    } catch (ClassNotFoundException missingCoreTracer) {
-      throw new IllegalStateException(
-          "Scope continuation diagnostics require dd-trace-core", missingCoreTracer);
-    }
-    Instrumentation instrumentation = ByteBuddyAgent.getInstrumentation();
-    transformer =
-        new AgentBuilder.Default()
-            .disableClassFormatChanges()
-            .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
-            .with(AgentBuilder.TypeStrategy.Default.REDEFINE)
-            .type(named("datadog.trace.core.scopemanager.ScopeContinuation"))
-            .transform(
-                (builder, type, classLoader, module, pd) ->
-                    builder
-                        .visit(
-                            Advice.to(ContinuationAdvice.Register.class)
-                                .on(
-                                    isMethod()
+    static synchronized void install() {
+        if (transformer != null) {
+            return;
+        }
+        try {
+            // Related core types can otherwise load these targets reentrantly while they are transformed.
+            ClassLoader loader = ScopeContinuationTransformer.class.getClassLoader();
+            Class.forName("datadog.trace.core.scopemanager.ScopeContinuation", false, loader);
+            Class.forName("datadog.trace.core.scopemanager.ScopeStack", false, loader);
+        } catch (ClassNotFoundException missingCoreTracer) {
+            throw new IllegalStateException("Scope continuation diagnostics require dd-trace-core", missingCoreTracer);
+        }
+        Instrumentation instrumentation = ByteBuddyAgent.getInstrumentation();
+        transformer = new AgentBuilder.Default()
+                .disableClassFormatChanges()
+                .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
+                .with(AgentBuilder.TypeStrategy.Default.REDEFINE)
+                .type(named("datadog.trace.core.scopemanager.ScopeContinuation"))
+                .transform((builder, type, classLoader, module, pd) -> builder.visit(Advice.to(
+                                        ContinuationAdvice.Register.class)
+                                .on(isMethod()
                                         .and(named("register"))
                                         .and(takesArguments(0))
-                                        .and(
-                                            returns(
-                                                named(
-                                                    "datadog.trace.core.scopemanager.ScopeContinuation")))))
-                        .visit(
-                            Advice.to(ContinuationAdvice.Activate.class)
-                                .on(
-                                    isMethod()
+                                        .and(returns(named("datadog.trace.core.scopemanager.ScopeContinuation")))))
+                        .visit(Advice.to(ContinuationAdvice.Activate.class)
+                                .on(isMethod()
                                         .and(named("resume"))
                                         .and(takesArguments(0))
                                         .and(returns(named("datadog.context.ContextScope")))))
-                        .visit(
-                            Advice.to(ContinuationAdvice.Cancel.class)
-                                .on(
-                                    isMethod()
-                                        .and(
-                                            named("release")
-                                                .or(named("cancelFromContinuedScopeClose")))
+                        .visit(Advice.to(ContinuationAdvice.Cancel.class)
+                                .on(isMethod()
+                                        .and(named("release").or(named("cancelFromContinuedScopeClose")))
                                         .and(takesArguments(0))
                                         .and(returns(void.class)))))
-            .type(named("datadog.trace.core.PendingTrace"))
-            .transform(
-                (builder, type, classLoader, module, pd) ->
-                    builder.visit(
-                        Advice.to(PendingTraceAdvice.Write.class)
-                            .on(
-                                isMethod()
-                                    .and(named("write"))
-                                    .and(takesArguments(boolean.class))
-                                    .and(returns(int.class)))))
-            .type(named("datadog.trace.core.scopemanager.ContinuableScope"))
-            .transform(
-                (builder, type, classLoader, module, pd) ->
-                    builder
-                        .visit(
-                            Advice.to(ContinuableScopeAdvice.OnProperClose.class)
-                                .on(
-                                    isMethod()
-                                        .and(named("onProperClose"))
-                                        .and(takesArguments(0))
-                                        .and(returns(void.class))))
-                        .visit(
-                            Advice.to(ContinuableScopeAdvice.Close.class)
-                                .on(
-                                    isMethod()
+                .type(named("datadog.trace.core.PendingTrace"))
+                .transform((builder, type, classLoader, module, pd) ->
+                        builder.visit(Advice.to(PendingTraceAdvice.Write.class)
+                                .on(isMethod()
+                                        .and(named("write"))
+                                        .and(takesArguments(boolean.class))
+                                        .and(returns(int.class)))))
+                .type(named("datadog.trace.core.scopemanager.ContinuableScope"))
+                .transform((builder, type, classLoader, module, pd) -> builder.visit(
+                                Advice.to(ContinuableScopeAdvice.OnProperClose.class)
+                                        .on(isMethod()
+                                                .and(named("onProperClose"))
+                                                .and(takesArguments(0))
+                                                .and(returns(void.class))))
+                        .visit(Advice.to(ContinuableScopeAdvice.Close.class)
+                                .on(isMethod()
                                         .and(named("close"))
                                         .and(takesArguments(0))
                                         .and(returns(void.class)))))
-            .type(named("datadog.trace.core.scopemanager.ScopeStack"))
-            .transform(
-                (builder, type, classLoader, module, pd) ->
-                    builder.visit(
-                        Advice.to(ScopeStackAdvice.Push.class)
-                            .on(
-                                isMethod()
-                                    .and(named("push"))
-                                    .and(takesArguments(1))
-                                    .and(
-                                        takesArgument(
-                                            0,
-                                            named(
-                                                "datadog.trace.core.scopemanager.ContinuableScope")))
-                                    .and(returns(void.class)))))
-            .type(named("datadog.trace.core.scopemanager.ContinuableScopeManager"))
-            .transform(
-                (builder, type, classLoader, module, pd) ->
-                    builder.visit(
-                        Advice.to(ContinuableScopeManagerAdvice.ScheduleRootIterationCleanup.class)
-                            .on(
-                                isMethod()
-                                    .and(named("scheduleRootIterationScopeCleanup"))
-                                    .and(takesArguments(2))
-                                    .and(
-                                        takesArgument(
-                                            0, named("datadog.trace.core.scopemanager.ScopeStack")))
-                                    .and(
-                                        takesArgument(
-                                            1,
-                                            named(
-                                                "datadog.trace.core.scopemanager.ContinuableScope")))
-                                    .and(returns(void.class)))))
-            .installOn(instrumentation);
-  }
+                .type(named("datadog.trace.core.scopemanager.ScopeStack"))
+                .transform((builder, type, classLoader, module, pd) -> builder.visit(Advice.to(
+                                ScopeStackAdvice.Push.class)
+                        .on(isMethod()
+                                .and(named("push"))
+                                .and(takesArguments(1))
+                                .and(takesArgument(0, named("datadog.trace.core.scopemanager.ContinuableScope")))
+                                .and(returns(void.class)))))
+                .type(named("datadog.trace.core.scopemanager.ContinuableScopeManager"))
+                .transform((builder, type, classLoader, module, pd) -> builder.visit(Advice.to(
+                                ContinuableScopeManagerAdvice.ScheduleRootIterationCleanup.class)
+                        .on(isMethod()
+                                .and(named("scheduleRootIterationScopeCleanup"))
+                                .and(takesArguments(2))
+                                .and(takesArgument(0, named("datadog.trace.core.scopemanager.ScopeStack")))
+                                .and(takesArgument(1, named("datadog.trace.core.scopemanager.ContinuableScope")))
+                                .and(returns(void.class)))))
+                .installOn(instrumentation);
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeDiagnostics.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeDiagnostics.java
index c26b8739065..0e225124c57 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeDiagnostics.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeDiagnostics.java
@@ -11,391 +11,367 @@
 
 /** Records test-time scope and continuation lifecycles and reports leaks. */
 public final class ScopeDiagnostics {
-  private static final int DEFAULT_MAX_FRAMES = 6;
-  private static final long DEFAULT_QUIESCENCE_TIMEOUT_MILLIS = 250;
-
-  private static final ScopeDiagnostics INSTANCE = new ScopeDiagnostics();
-
-  /** Linearizes event admission, stop/reset, and report snapshots. */
-  private final Object lifecycleLock = new Object();
-
-  private final Map<ContextContinuation, ContinuationRecord> records = new IdentityHashMap<>();
-  private final Map<Object, ScopeRecord> scopeRecords = new IdentityHashMap<>();
-  private final Set<Object> deferredCleanupScopes =
-      Collections.newSetFromMap(new IdentityHashMap<Object, Boolean>());
-  private final Map<DDTraceId, Long> rootWrittenNanos = new HashMap<>();
-  private final Set<ContextContinuation> resolved =
-      Collections.newSetFromMap(new IdentityHashMap<ContextContinuation, Boolean>());
-  private final Set<ContextContinuation> released =
-      Collections.newSetFromMap(new IdentityHashMap<ContextContinuation, Boolean>());
-  private long seq;
-  private long scopeSeq;
-  private volatile Object recordingWindow;
-  private StackFilter stackFilter = new StackFilter(DEFAULT_MAX_FRAMES);
-
-  private final Listener listener = new Listener();
-
-  private ScopeDiagnostics() {}
-
-  /** Clears any prior data and starts recording with the default stack depth. */
-  public static void startRecording() {
-    startRecording(DEFAULT_MAX_FRAMES);
-  }
-
-  /** Clears any prior data and starts recording, keeping up to {@code maxFrames} per stack. */
-  public static void startRecording(int maxFrames) {
-    ScopeContinuationTransformer.install();
-    synchronized (INSTANCE.lifecycleLock) {
-      INSTANCE.clear();
-      INSTANCE.stackFilter = new StackFilter(maxFrames);
-      INSTANCE.recordingWindow = new Object();
+    private static final int DEFAULT_MAX_FRAMES = 6;
+    private static final long DEFAULT_QUIESCENCE_TIMEOUT_MILLIS = 250;
+
+    private static final ScopeDiagnostics INSTANCE = new ScopeDiagnostics();
+
+    /** Linearizes event admission, stop/reset, and report snapshots. */
+    private final Object lifecycleLock = new Object();
+
+    private final Map<ContextContinuation, ContinuationRecord> records = new IdentityHashMap<>();
+    private final Map<Object, ScopeRecord> scopeRecords = new IdentityHashMap<>();
+    private final Set<Object> deferredCleanupScopes = Collections.newSetFromMap(new IdentityHashMap<Object, Boolean>());
+    private final Map<DDTraceId, Long> rootWrittenNanos = new HashMap<>();
+    private final Set<ContextContinuation> resolved =
+            Collections.newSetFromMap(new IdentityHashMap<ContextContinuation, Boolean>());
+    private final Set<ContextContinuation> released =
+            Collections.newSetFromMap(new IdentityHashMap<ContextContinuation, Boolean>());
+    private long seq;
+    private long scopeSeq;
+    private volatile Object recordingWindow;
+    private StackFilter stackFilter = new StackFilter(DEFAULT_MAX_FRAMES);
+
+    private final Listener listener = new Listener();
+
+    private ScopeDiagnostics() {}
+
+    /** Clears any prior data and starts recording with the default stack depth. */
+    public static void startRecording() {
+        startRecording(DEFAULT_MAX_FRAMES);
     }
-  }
 
-  /** Stops recording. Recorded data remains queryable until reset. */
-  public static void stop() {
-    synchronized (INSTANCE.lifecycleLock) {
-      INSTANCE.recordingWindow = null;
+    /** Clears any prior data and starts recording, keeping up to {@code maxFrames} per stack. */
+    public static void startRecording(int maxFrames) {
+        ScopeContinuationTransformer.install();
+        synchronized (INSTANCE.lifecycleLock) {
+            INSTANCE.clear();
+            INSTANCE.stackFilter = new StackFilter(maxFrames);
+            INSTANCE.recordingWindow = new Object();
+        }
     }
-  }
 
-  /** Discards all recorded data. */
-  public static void reset() {
-    synchronized (INSTANCE.lifecycleLock) {
-      INSTANCE.recordingWindow = null;
-      INSTANCE.clear();
+    /** Stops recording. Recorded data remains queryable until reset. */
+    public static void stop() {
+        synchronized (INSTANCE.lifecycleLock) {
+            INSTANCE.recordingWindow = null;
+        }
     }
-  }
-
-  /** Each probe keeps this identity until admission under the lifecycle lock. */
-  static Object recordingWindow() {
-    return INSTANCE.recordingWindow;
-  }
 
-  /** Returns an immutable snapshot of the events recorded so far. */
-  public static ScopeDiagnosticsReport report() {
-    synchronized (INSTANCE.lifecycleLock) {
-      return INSTANCE.snapshot();
-    }
-  }
-
-  /** Gives asynchronous cleanup a bounded opportunity to resolve lifecycles still in flight. */
-  public static void awaitQuiescence() {
-    long deadline = System.nanoTime() + DEFAULT_QUIESCENCE_TIMEOUT_MILLIS * 1_000_000L;
-    synchronized (INSTANCE.lifecycleLock) {
-      while (INSTANCE.recordingWindow != null && INSTANCE.snapshot().hasIncompleteLifecycles()) {
-        long remaining = deadline - System.nanoTime();
-        if (remaining <= 0) {
-          return;
-        }
-        try {
-          long millis = remaining / 1_000_000L;
-          int nanos = (int) (remaining % 1_000_000L);
-          INSTANCE.lifecycleLock.wait(millis, nanos);
-        } catch (InterruptedException interrupted) {
-          Thread.currentThread().interrupt();
-          return;
+    /** Discards all recorded data. */
+    public static void reset() {
+        synchronized (INSTANCE.lifecycleLock) {
+            INSTANCE.recordingWindow = null;
+            INSTANCE.clear();
         }
-      }
-    }
-  }
-
-  /**
-   * Fails with an {@link AssertionError} (carrying the problem summary) if the report flags a
-   * genuine bug (see {@link ScopeDiagnosticsReport#hasProblems()}). Report-only signals such as
-   * late-after-root and close-on-wrong-thread do not fail.
-   */
-  public static void assertNoLeaks() {
-    assertNoLeaks(report());
-  }
-
-  /** Fails using the supplied snapshot, so rendering and assertion examine the same events. */
-  public static void assertNoLeaks(ScopeDiagnosticsReport report) {
-    if (report.hasProblems()) {
-      throw new AssertionError("Scope continuation problems detected:\n" + report.renderSummary());
     }
-  }
 
-  /** Resolves the default-on policy and rejects opt-outs without a reason. */
-  public static boolean isEnabled(TrackScopeContinuations config) {
-    if (config == null || config.enabled()) {
-      return true;
+    /** Each probe keeps this identity until admission under the lifecycle lock. */
+    static Object recordingWindow() {
+        return INSTANCE.recordingWindow;
     }
-    if (config.reason().trim().isEmpty()) {
-      throw new IllegalArgumentException(
-          "@TrackScopeContinuations(enabled = false) requires a reason");
-    }
-    return false;
-  }
-
-  private void clear() {
-    records.clear();
-    scopeRecords.clear();
-    deferredCleanupScopes.clear();
-    rootWrittenNanos.clear();
-    resolved.clear();
-    released.clear();
-    seq = 0;
-    scopeSeq = 0;
-  }
-
-  private ScopeDiagnosticsReport snapshot() {
-    return new ScopeDiagnosticsReport(
-        new ArrayList<>(records.values()),
-        new ArrayList<>(scopeRecords.values()),
-        new HashMap<>(rootWrittenNanos));
-  }
-
-  private static final StackTraceElement[] NO_STACK = new StackTraceElement[0];
-
-  private ScopeEvent event(ScopeEvent.Type type) {
-    return event(type, System.nanoTime());
-  }
-
-  /** Uses the supplied event time while capturing the thread and stack at the call site. */
-  private ScopeEvent event(ScopeEvent.Type type, long nanos) {
-    // Avoid stack walking when call sites are disabled because it perturbs recorded timings.
-    StackFilter filter = stackFilter;
-    StackTraceElement[] stack =
-        filter.maxFrames() <= 0 ? NO_STACK : filter.filter(new Throwable().getStackTrace());
-    ScopeEvent event = new ScopeEvent(type, Thread.currentThread().getName(), nanos, stack);
-    lifecycleLock.notifyAll();
-    return event;
-  }
-
-  static void recordCapture(
-      Object window,
-      ContextContinuation id,
-      DDTraceId traceId,
-      long spanId,
-      String spanName,
-      byte source) {
-    synchronized (INSTANCE.lifecycleLock) {
-      if (window != null && window == INSTANCE.recordingWindow) {
-        INSTANCE.listener.onCapture(id, traceId, spanId, spanName, source);
-      }
+
+    /** Returns an immutable snapshot of the events recorded so far. */
+    public static ScopeDiagnosticsReport report() {
+        synchronized (INSTANCE.lifecycleLock) {
+            return INSTANCE.snapshot();
+        }
     }
-  }
-
-  static void recordActivate(
-      Object window,
-      ContextContinuation id,
-      DDTraceId traceId,
-      long spanId,
-      String spanName,
-      byte source,
-      long nanos) {
-    synchronized (INSTANCE.lifecycleLock) {
-      if (window != null && window == INSTANCE.recordingWindow) {
-        INSTANCE.listener.onActivate(id, traceId, spanId, spanName, source, nanos);
-      }
+
+    /** Gives asynchronous cleanup a bounded opportunity to resolve lifecycles still in flight. */
+    public static void awaitQuiescence() {
+        long deadline = System.nanoTime() + DEFAULT_QUIESCENCE_TIMEOUT_MILLIS * 1_000_000L;
+        synchronized (INSTANCE.lifecycleLock) {
+            while (INSTANCE.recordingWindow != null && INSTANCE.snapshot().hasIncompleteLifecycles()) {
+                long remaining = deadline - System.nanoTime();
+                if (remaining <= 0) {
+                    return;
+                }
+                try {
+                    long millis = remaining / 1_000_000L;
+                    int nanos = (int) (remaining % 1_000_000L);
+                    INSTANCE.lifecycleLock.wait(millis, nanos);
+                } catch (InterruptedException interrupted) {
+                    Thread.currentThread().interrupt();
+                    return;
+                }
+            }
+        }
     }
-  }
 
-  static void recordActivateFailed(Object window, ContextContinuation id) {
-    synchronized (INSTANCE.lifecycleLock) {
-      if (window != null && window == INSTANCE.recordingWindow) {
-        INSTANCE.listener.onActivateFailed(id);
-      }
+    /**
+     * Fails with an {@link AssertionError} (carrying the problem summary) if the report flags a
+     * genuine bug (see {@link ScopeDiagnosticsReport#hasProblems()}). Report-only signals such as
+     * late-after-root and close-on-wrong-thread do not fail.
+     */
+    public static void assertNoLeaks() {
+        assertNoLeaks(report());
     }
-  }
-
-  static void recordResolve(
-      Object window,
-      ContextContinuation id,
-      boolean release,
-      long resolveNanos,
-      boolean duplicateAttempt) {
-    synchronized (INSTANCE.lifecycleLock) {
-      if (window != null && window == INSTANCE.recordingWindow) {
-        boolean firstResolution = INSTANCE.resolved.add(id);
-        boolean repeatedRelease = release && !INSTANCE.released.add(id);
-        if (duplicateAttempt || firstResolution || repeatedRelease) {
-          INSTANCE.listener.onResolve(
-              id, release, resolveNanos, duplicateAttempt || repeatedRelease);
+
+    /** Fails using the supplied snapshot, so rendering and assertion examine the same events. */
+    public static void assertNoLeaks(ScopeDiagnosticsReport report) {
+        if (report.hasProblems()) {
+            throw new AssertionError("Scope continuation problems detected:\n" + report.renderSummary());
         }
-      }
     }
-  }
 
-  static void recordRootWritten(Object window, DDTraceId traceId) {
-    synchronized (INSTANCE.lifecycleLock) {
-      if (window != null && window == INSTANCE.recordingWindow) {
-        INSTANCE.listener.onRootWritten(traceId);
-      }
-    }
-  }
-
-  static void recordScopeOpen(
-      Object window,
-      Object scope,
-      DDTraceId traceId,
-      long spanId,
-      String spanName,
-      byte source,
-      ContextContinuation continuation) {
-    synchronized (INSTANCE.lifecycleLock) {
-      if (window != null && window == INSTANCE.recordingWindow) {
-        INSTANCE.listener.onScopeOpen(scope, traceId, spanId, spanName, source, continuation);
-      }
+    /** Resolves the default-on policy and rejects opt-outs without a reason. */
+    public static boolean isEnabled(TrackScopeContinuations config) {
+        if (config == null || config.enabled()) {
+            return true;
+        }
+        if (config.reason().trim().isEmpty()) {
+            throw new IllegalArgumentException("@TrackScopeContinuations(enabled = false) requires a reason");
+        }
+        return false;
     }
-  }
 
-  static void recordScopeClose(Object window, Object scope) {
-    synchronized (INSTANCE.lifecycleLock) {
-      if (window != null && window == INSTANCE.recordingWindow) {
-        INSTANCE.listener.onScopeClose(scope);
-      }
+    private void clear() {
+        records.clear();
+        scopeRecords.clear();
+        deferredCleanupScopes.clear();
+        rootWrittenNanos.clear();
+        resolved.clear();
+        released.clear();
+        seq = 0;
+        scopeSeq = 0;
     }
-  }
 
-  static void recordScopeCloseWrongThread(Object window, Object scope) {
-    synchronized (INSTANCE.lifecycleLock) {
-      if (window != null && window == INSTANCE.recordingWindow) {
-        INSTANCE.listener.onScopeCloseWrongThread(scope);
-      }
+    private ScopeDiagnosticsReport snapshot() {
+        return new ScopeDiagnosticsReport(
+                new ArrayList<>(records.values()),
+                new ArrayList<>(scopeRecords.values()),
+                new HashMap<>(rootWrittenNanos));
     }
-  }
 
-  static void recordDeferredScopeCleanup(Object window, Object scope) {
-    synchronized (INSTANCE.lifecycleLock) {
-      if (window != null && window == INSTANCE.recordingWindow) {
-        INSTANCE.listener.onDeferredScopeCleanup(scope);
-      }
+    private static final StackTraceElement[] NO_STACK = new StackTraceElement[0];
+
+    private ScopeEvent event(ScopeEvent.Type type) {
+        return event(type, System.nanoTime());
     }
-  }
-
-  private final class Listener {
-    void onCapture(
-        ContextContinuation id, DDTraceId traceId, long spanId, String spanName, byte source) {
-      try {
-        ContinuationRecord record =
-            new ContinuationRecord(
-                seq++, traceId, spanId, spanName, source, false, event(ScopeEvent.Type.CAPTURE));
-        records.put(id, record);
-      } catch (Throwable ignored) {
-        // diagnostics must never disturb the tracer
-      }
+
+    /** Uses the supplied event time while capturing the thread and stack at the call site. */
+    private ScopeEvent event(ScopeEvent.Type type, long nanos) {
+        // Avoid stack walking when call sites are disabled because it perturbs recorded timings.
+        StackFilter filter = stackFilter;
+        StackTraceElement[] stack = filter.maxFrames() <= 0 ? NO_STACK : filter.filter(new Throwable().getStackTrace());
+        ScopeEvent event = new ScopeEvent(type, Thread.currentThread().getName(), nanos, stack);
+        lifecycleLock.notifyAll();
+        return event;
     }
 
-    void onActivate(
-        ContextContinuation id,
-        DDTraceId traceId,
-        long spanId,
-        String spanName,
-        byte source,
-        long nanos) {
-      try {
-        recordFor(id, traceId, spanId, spanName, source)
-            .addResume(event(ScopeEvent.Type.ACTIVATE, nanos));
-      } catch (Throwable ignored) {
-      }
+    static void recordCapture(
+            Object window, ContextContinuation id, DDTraceId traceId, long spanId, String spanName, byte source) {
+        synchronized (INSTANCE.lifecycleLock) {
+            if (window != null && window == INSTANCE.recordingWindow) {
+                INSTANCE.listener.onCapture(id, traceId, spanId, spanName, source);
+            }
+        }
     }
 
-    void onActivateFailed(ContextContinuation id) {
-      try {
-        ContinuationRecord record = records.get(id);
-        // Resolution advice can arrive after a concurrent failed resume.
-        if (record != null) {
-          record.addFailedActivation(event(ScopeEvent.Type.ACTIVATE_FAILED));
+    static void recordActivate(
+            Object window,
+            ContextContinuation id,
+            DDTraceId traceId,
+            long spanId,
+            String spanName,
+            byte source,
+            long nanos) {
+        synchronized (INSTANCE.lifecycleLock) {
+            if (window != null && window == INSTANCE.recordingWindow) {
+                INSTANCE.listener.onActivate(id, traceId, spanId, spanName, source, nanos);
+            }
         }
-      } catch (Throwable ignored) {
-      }
     }
 
-    void onResolve(
-        ContextContinuation id, boolean release, long resolveNanos, boolean duplicateAttempt) {
-      try {
-        ScopeEvent.Type type =
-            release ? ScopeEvent.Type.RESOLVE_RELEASE : ScopeEvent.Type.RESOLVE_FINISH;
-        recordFor(id, DDTraceId.ZERO, 0, null, (byte) -1)
-            .setTerminalOrExtra(event(type, resolveNanos), duplicateAttempt);
-      } catch (Throwable ignored) {
-      }
+    static void recordActivateFailed(Object window, ContextContinuation id) {
+        synchronized (INSTANCE.lifecycleLock) {
+            if (window != null && window == INSTANCE.recordingWindow) {
+                INSTANCE.listener.onActivateFailed(id);
+            }
+        }
     }
 
-    void onRootWritten(DDTraceId traceId) {
-      try {
-        rootWrittenNanos.putIfAbsent(traceId, System.nanoTime());
-      } catch (Throwable ignored) {
-      }
+    static void recordResolve(
+            Object window, ContextContinuation id, boolean release, long resolveNanos, boolean duplicateAttempt) {
+        synchronized (INSTANCE.lifecycleLock) {
+            if (window != null && window == INSTANCE.recordingWindow) {
+                boolean firstResolution = INSTANCE.resolved.add(id);
+                boolean repeatedRelease = release && !INSTANCE.released.add(id);
+                if (duplicateAttempt || firstResolution || repeatedRelease) {
+                    INSTANCE.listener.onResolve(id, release, resolveNanos, duplicateAttempt || repeatedRelease);
+                }
+            }
+        }
     }
 
-    void onScopeOpen(
-        Object scope,
-        DDTraceId traceId,
-        long spanId,
-        String spanName,
-        byte source,
-        ContextContinuation continuation) {
-      try {
-        if (scopeRecords.containsKey(scope)) {
-          return; // re-activation of an already-open scope, not a new open
+    static void recordRootWritten(Object window, DDTraceId traceId) {
+        synchronized (INSTANCE.lifecycleLock) {
+            if (window != null && window == INSTANCE.recordingWindow) {
+                INSTANCE.listener.onRootWritten(traceId);
+            }
         }
-        ContinuationRecord owner = continuation != null ? records.get(continuation) : null;
-        Long continuationSeq = owner != null ? owner.seq : null;
-        long s = scopeSeq++;
-        scopeRecords.put(
-            scope,
-            new ScopeRecord(
-                s,
-                traceId,
-                spanId,
-                spanName,
-                source,
-                continuationSeq,
-                deferredCleanupScopes.remove(scope),
-                event(ScopeEvent.Type.SCOPE_OPEN)));
-        if (owner != null) {
-          owner.linkScope(s);
+    }
+
+    static void recordScopeOpen(
+            Object window,
+            Object scope,
+            DDTraceId traceId,
+            long spanId,
+            String spanName,
+            byte source,
+            ContextContinuation continuation) {
+        synchronized (INSTANCE.lifecycleLock) {
+            if (window != null && window == INSTANCE.recordingWindow) {
+                INSTANCE.listener.onScopeOpen(scope, traceId, spanId, spanName, source, continuation);
+            }
         }
-      } catch (Throwable ignored) {
-      }
     }
 
-    void onScopeClose(Object scope) {
-      try {
-        ScopeRecord record = scopeRecords.get(scope);
-        if (record != null) {
-          record.setClose(event(ScopeEvent.Type.SCOPE_CLOSE));
+    static void recordScopeClose(Object window, Object scope) {
+        synchronized (INSTANCE.lifecycleLock) {
+            if (window != null && window == INSTANCE.recordingWindow) {
+                INSTANCE.listener.onScopeClose(scope);
+            }
         }
-      } catch (Throwable ignored) {
-      }
     }
 
-    void onScopeCloseWrongThread(Object scope) {
-      try {
-        ScopeRecord record = scopeRecords.get(scope);
-        if (record != null) {
-          record.addWrongThreadClose(event(ScopeEvent.Type.SCOPE_CLOSE_WRONG_THREAD));
+    static void recordScopeCloseWrongThread(Object window, Object scope) {
+        synchronized (INSTANCE.lifecycleLock) {
+            if (window != null && window == INSTANCE.recordingWindow) {
+                INSTANCE.listener.onScopeCloseWrongThread(scope);
+            }
         }
-      } catch (Throwable ignored) {
-      }
     }
 
-    void onDeferredScopeCleanup(Object scope) {
-      try {
-        ScopeRecord record = scopeRecords.get(scope);
-        if (record != null) {
-          record.markDeferredCleanup();
-        } else {
-          deferredCleanupScopes.add(scope);
+    static void recordDeferredScopeCleanup(Object window, Object scope) {
+        synchronized (INSTANCE.lifecycleLock) {
+            if (window != null && window == INSTANCE.recordingWindow) {
+                INSTANCE.listener.onDeferredScopeCleanup(scope);
+            }
         }
-      } catch (Throwable ignored) {
-      }
     }
 
-    /** Returns the record for an id, creating an orphan record if capture was not observed. */
-    private ContinuationRecord recordFor(
-        ContextContinuation id, DDTraceId traceId, long spanId, String spanName, byte source) {
-      ContinuationRecord existing = records.get(id);
-      if (existing != null) {
-        return existing;
-      }
-      ContinuationRecord orphan =
-          new ContinuationRecord(seq++, traceId, spanId, spanName, source, true, null);
-      records.put(id, orphan);
-      return orphan;
+    private final class Listener {
+        void onCapture(ContextContinuation id, DDTraceId traceId, long spanId, String spanName, byte source) {
+            try {
+                ContinuationRecord record = new ContinuationRecord(
+                        seq++, traceId, spanId, spanName, source, false, event(ScopeEvent.Type.CAPTURE));
+                records.put(id, record);
+            } catch (Throwable ignored) {
+                // diagnostics must never disturb the tracer
+            }
+        }
+
+        void onActivate(
+                ContextContinuation id, DDTraceId traceId, long spanId, String spanName, byte source, long nanos) {
+            try {
+                recordFor(id, traceId, spanId, spanName, source).addResume(event(ScopeEvent.Type.ACTIVATE, nanos));
+            } catch (Throwable ignored) {
+            }
+        }
+
+        void onActivateFailed(ContextContinuation id) {
+            try {
+                ContinuationRecord record = records.get(id);
+                // Resolution advice can arrive after a concurrent failed resume.
+                if (record != null) {
+                    record.addFailedActivation(event(ScopeEvent.Type.ACTIVATE_FAILED));
+                }
+            } catch (Throwable ignored) {
+            }
+        }
+
+        void onResolve(ContextContinuation id, boolean release, long resolveNanos, boolean duplicateAttempt) {
+            try {
+                ScopeEvent.Type type = release ? ScopeEvent.Type.RESOLVE_RELEASE : ScopeEvent.Type.RESOLVE_FINISH;
+                recordFor(id, DDTraceId.ZERO, 0, null, (byte) -1)
+                        .setTerminalOrExtra(event(type, resolveNanos), duplicateAttempt);
+            } catch (Throwable ignored) {
+            }
+        }
+
+        void onRootWritten(DDTraceId traceId) {
+            try {
+                rootWrittenNanos.putIfAbsent(traceId, System.nanoTime());
+            } catch (Throwable ignored) {
+            }
+        }
+
+        void onScopeOpen(
+                Object scope,
+                DDTraceId traceId,
+                long spanId,
+                String spanName,
+                byte source,
+                ContextContinuation continuation) {
+            try {
+                if (scopeRecords.containsKey(scope)) {
+                    return; // re-activation of an already-open scope, not a new open
+                }
+                ContinuationRecord owner = continuation != null ? records.get(continuation) : null;
+                Long continuationSeq = owner != null ? owner.seq : null;
+                long s = scopeSeq++;
+                scopeRecords.put(
+                        scope,
+                        new ScopeRecord(
+                                s,
+                                traceId,
+                                spanId,
+                                spanName,
+                                source,
+                                continuationSeq,
+                                deferredCleanupScopes.remove(scope),
+                                event(ScopeEvent.Type.SCOPE_OPEN)));
+                if (owner != null) {
+                    owner.linkScope(s);
+                }
+            } catch (Throwable ignored) {
+            }
+        }
+
+        void onScopeClose(Object scope) {
+            try {
+                ScopeRecord record = scopeRecords.get(scope);
+                if (record != null) {
+                    record.setClose(event(ScopeEvent.Type.SCOPE_CLOSE));
+                }
+            } catch (Throwable ignored) {
+            }
+        }
+
+        void onScopeCloseWrongThread(Object scope) {
+            try {
+                ScopeRecord record = scopeRecords.get(scope);
+                if (record != null) {
+                    record.addWrongThreadClose(event(ScopeEvent.Type.SCOPE_CLOSE_WRONG_THREAD));
+                }
+            } catch (Throwable ignored) {
+            }
+        }
+
+        void onDeferredScopeCleanup(Object scope) {
+            try {
+                ScopeRecord record = scopeRecords.get(scope);
+                if (record != null) {
+                    record.markDeferredCleanup();
+                } else {
+                    deferredCleanupScopes.add(scope);
+                }
+            } catch (Throwable ignored) {
+            }
+        }
+
+        /** Returns the record for an id, creating an orphan record if capture was not observed. */
+        private ContinuationRecord recordFor(
+                ContextContinuation id, DDTraceId traceId, long spanId, String spanName, byte source) {
+            ContinuationRecord existing = records.get(id);
+            if (existing != null) {
+                return existing;
+            }
+            ContinuationRecord orphan = new ContinuationRecord(seq++, traceId, spanId, spanName, source, true, null);
+            records.put(id, orphan);
+            return orphan;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsExtension.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsExtension.java
index 7ba889284d0..4d3641603a5 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsExtension.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsExtension.java
@@ -11,48 +11,47 @@
 
 /** Runs {@link ScopeDiagnostics} around each JUnit instrumentation test. */
 public final class ScopeDiagnosticsExtension implements BeforeEachCallback, AfterEachCallback {
-  private static final Logger log = LoggerFactory.getLogger(ScopeDiagnosticsExtension.class);
+    private static final Logger log = LoggerFactory.getLogger(ScopeDiagnosticsExtension.class);
 
-  @Override
-  public void beforeEach(ExtensionContext context) {
-    TrackScopeContinuations config = resolve(context);
-    if (ScopeDiagnostics.isEnabled(config)) {
-      ScopeDiagnostics.startRecording();
+    @Override
+    public void beforeEach(ExtensionContext context) {
+        TrackScopeContinuations config = resolve(context);
+        if (ScopeDiagnostics.isEnabled(config)) {
+            ScopeDiagnostics.startRecording();
+        }
     }
-  }
 
-  @Override
-  public void afterEach(ExtensionContext context) {
-    TrackScopeContinuations config = resolve(context);
-    if (!ScopeDiagnostics.isEnabled(config)) {
-      return;
+    @Override
+    public void afterEach(ExtensionContext context) {
+        TrackScopeContinuations config = resolve(context);
+        if (!ScopeDiagnostics.isEnabled(config)) {
+            return;
+        }
+        try {
+            ScopeDiagnostics.awaitQuiescence();
+            ScopeDiagnostics.stop();
+            ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+            if (report.hasFindings()) {
+                log.info("[{}] {}", context.getDisplayName(), report.renderTimeline());
+            }
+            ScopeDiagnostics.assertNoLeaks(report);
+        } finally {
+            ScopeDiagnostics.reset();
+        }
     }
-    try {
-      ScopeDiagnostics.awaitQuiescence();
-      ScopeDiagnostics.stop();
-      ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-      if (report.hasFindings()) {
-        log.info("[{}] {}", context.getDisplayName(), report.renderTimeline());
-      }
-      ScopeDiagnostics.assertNoLeaks(report);
-    } finally {
-      ScopeDiagnostics.reset();
-    }
-  }
 
-  /** Resolves method configuration before inherited class configuration. */
-  private static TrackScopeContinuations resolve(ExtensionContext context) {
-    Optional<AnnotatedElement> element = context.getElement();
-    if (element.isPresent()) {
-      Optional<TrackScopeContinuations> onElement =
-          AnnotationSupport.findAnnotation(element.get(), TrackScopeContinuations.class);
-      if (onElement.isPresent()) {
-        return onElement.get();
-      }
+    /** Resolves method configuration before inherited class configuration. */
+    private static TrackScopeContinuations resolve(ExtensionContext context) {
+        Optional<AnnotatedElement> element = context.getElement();
+        if (element.isPresent()) {
+            Optional<TrackScopeContinuations> onElement =
+                    AnnotationSupport.findAnnotation(element.get(), TrackScopeContinuations.class);
+            if (onElement.isPresent()) {
+                return onElement.get();
+            }
+        }
+        return context.getTestClass()
+                .flatMap(c -> AnnotationSupport.findAnnotation(c, TrackScopeContinuations.class))
+                .orElse(null);
     }
-    return context
-        .getTestClass()
-        .flatMap(c -> AnnotationSupport.findAnnotation(c, TrackScopeContinuations.class))
-        .orElse(null);
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsReport.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsReport.java
index d25d9020853..16810a3020d 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsReport.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsReport.java
@@ -9,367 +9,358 @@
 
 /** Immutable scope and continuation lifecycle snapshot with derived failures. */
 public final class ScopeDiagnosticsReport {
-  private final List<ContinuationRecord> continuations;
-  private final List<ScopeRecord> scopes;
-  private final long t0;
-  private final Map<ContinuationRecord, EnumSet<Failure>> continuationFailures;
-  private final Map<ScopeRecord, EnumSet<Failure>> scopeFailures;
-  private final Map<Long, ScopeRecord> scopeBySeq;
-
-  ScopeDiagnosticsReport(
-      List<ContinuationRecord> continuations,
-      List<ScopeRecord> scopes,
-      Map<DDTraceId, Long> rootWrittenNanos) {
-    this.continuations = new ArrayList<>(continuations.size());
-    for (ContinuationRecord continuation : continuations) {
-      this.continuations.add(continuation.snapshot());
-    }
-    this.continuations.sort((a, b) -> Long.compare(a.firstNanos(), b.firstNanos()));
-    this.scopes = new ArrayList<>(scopes.size());
-    for (ScopeRecord scope : scopes) {
-      this.scopes.add(scope.snapshot());
-    }
-    this.scopes.sort((a, b) -> Long.compare(a.firstNanos(), b.firstNanos()));
-    this.t0 = computeT0(this.continuations, this.scopes);
-    this.continuationFailures = classifyContinuations(this.continuations, rootWrittenNanos);
-    this.scopeFailures = classifyScopes(this.scopes);
-    this.scopeBySeq = new LinkedHashMap<>();
-    for (ScopeRecord s : this.scopes) {
-      scopeBySeq.put(s.seq, s);
+    private final List<ContinuationRecord> continuations;
+    private final List<ScopeRecord> scopes;
+    private final long t0;
+    private final Map<ContinuationRecord, EnumSet<Failure>> continuationFailures;
+    private final Map<ScopeRecord, EnumSet<Failure>> scopeFailures;
+    private final Map<Long, ScopeRecord> scopeBySeq;
+
+    ScopeDiagnosticsReport(
+            List<ContinuationRecord> continuations, List<ScopeRecord> scopes, Map<DDTraceId, Long> rootWrittenNanos) {
+        this.continuations = new ArrayList<>(continuations.size());
+        for (ContinuationRecord continuation : continuations) {
+            this.continuations.add(continuation.snapshot());
+        }
+        this.continuations.sort((a, b) -> Long.compare(a.firstNanos(), b.firstNanos()));
+        this.scopes = new ArrayList<>(scopes.size());
+        for (ScopeRecord scope : scopes) {
+            this.scopes.add(scope.snapshot());
+        }
+        this.scopes.sort((a, b) -> Long.compare(a.firstNanos(), b.firstNanos()));
+        this.t0 = computeT0(this.continuations, this.scopes);
+        this.continuationFailures = classifyContinuations(this.continuations, rootWrittenNanos);
+        this.scopeFailures = classifyScopes(this.scopes);
+        this.scopeBySeq = new LinkedHashMap<>();
+        for (ScopeRecord s : this.scopes) {
+            scopeBySeq.put(s.seq, s);
+        }
     }
-  }
 
-  private static long computeT0(List<ContinuationRecord> continuations, List<ScopeRecord> scopes) {
-    long min = Long.MAX_VALUE;
-    for (ContinuationRecord r : continuations) {
-      min = Math.min(min, r.firstNanos());
+    private static long computeT0(List<ContinuationRecord> continuations, List<ScopeRecord> scopes) {
+        long min = Long.MAX_VALUE;
+        for (ContinuationRecord r : continuations) {
+            min = Math.min(min, r.firstNanos());
+        }
+        for (ScopeRecord s : scopes) {
+            min = Math.min(min, s.firstNanos());
+        }
+        return min == Long.MAX_VALUE ? 0 : min;
     }
-    for (ScopeRecord s : scopes) {
-      min = Math.min(min, s.firstNanos());
+
+    private static Map<ContinuationRecord, EnumSet<Failure>> classifyContinuations(
+            List<ContinuationRecord> records, Map<DDTraceId, Long> rootWrittenNanos) {
+        Map<ContinuationRecord, EnumSet<Failure>> result = new LinkedHashMap<>();
+        for (ContinuationRecord r : records) {
+            EnumSet<Failure> failures = r.failures(rootWrittenNanos.get(r.traceId));
+            if (!failures.isEmpty()) {
+                result.put(r, failures);
+            }
+        }
+        return result;
     }
-    return min == Long.MAX_VALUE ? 0 : min;
-  }
-
-  private static Map<ContinuationRecord, EnumSet<Failure>> classifyContinuations(
-      List<ContinuationRecord> records, Map<DDTraceId, Long> rootWrittenNanos) {
-    Map<ContinuationRecord, EnumSet<Failure>> result = new LinkedHashMap<>();
-    for (ContinuationRecord r : records) {
-      EnumSet<Failure> failures = r.failures(rootWrittenNanos.get(r.traceId));
-      if (!failures.isEmpty()) {
-        result.put(r, failures);
-      }
+
+    private static Map<ScopeRecord, EnumSet<Failure>> classifyScopes(List<ScopeRecord> scopes) {
+        Map<ScopeRecord, EnumSet<Failure>> result = new LinkedHashMap<>();
+        for (ScopeRecord s : scopes) {
+            EnumSet<Failure> failures = s.failures();
+            if (!failures.isEmpty()) {
+                result.put(s, failures);
+            }
+        }
+        return result;
     }
-    return result;
-  }
-
-  private static Map<ScopeRecord, EnumSet<Failure>> classifyScopes(List<ScopeRecord> scopes) {
-    Map<ScopeRecord, EnumSet<Failure>> result = new LinkedHashMap<>();
-    for (ScopeRecord s : scopes) {
-      EnumSet<Failure> failures = s.failures();
-      if (!failures.isEmpty()) {
-        result.put(s, failures);
-      }
+
+    public List<ContinuationRecord> records() {
+        return new ArrayList<>(continuations);
     }
-    return result;
-  }
-
-  public List<ContinuationRecord> records() {
-    return new ArrayList<>(continuations);
-  }
-
-  public List<ScopeRecord> scopeRecords() {
-    return new ArrayList<>(scopes);
-  }
-
-  public Map<ContinuationRecord, EnumSet<Failure>> findings() {
-    return new LinkedHashMap<>(continuationFailures);
-  }
-
-  public Map<ScopeRecord, EnumSet<Failure>> scopeFindings() {
-    return new LinkedHashMap<>(scopeFailures);
-  }
-
-  public int leakCount() {
-    return countWith(continuationFailures, Failure.LEAKED);
-  }
-
-  public int lateCount() {
-    return countWith(continuationFailures, Failure.LATE_FINISH);
-  }
-
-  public int doubleCount() {
-    return countWith(continuationFailures, Failure.DOUBLE_FINISH);
-  }
-
-  public int activateAfterResolveCount() {
-    return countWith(continuationFailures, Failure.ACTIVATE_AFTER_RESOLVE);
-  }
-
-  public int neverClosedScopeCount() {
-    return countWith(scopeFailures, Failure.NEVER_CLOSED);
-  }
-
-  public int closeWrongThreadCount() {
-    return countWith(scopeFailures, Failure.CLOSE_WRONG_THREAD);
-  }
-
-  public int deferredCleanupScopeCount() {
-    int count = 0;
-    for (ScopeRecord scope : scopes) {
-      if (scope.deferredCleanup() && !scope.closed()) {
-        count++;
-      }
+
+    public List<ScopeRecord> scopeRecords() {
+        return new ArrayList<>(scopes);
     }
-    return count;
-  }
-
-  boolean hasIncompleteLifecycles() {
-    return leakCount() > 0 || neverClosedScopeCount() > 0;
-  }
-
-  private static <K> int countWith(Map<K, EnumSet<Failure>> findings, Failure failure) {
-    int n = 0;
-    for (EnumSet<Failure> f : findings.values()) {
-      if (f.contains(failure)) {
-        n++;
-      }
+
+    public Map<ContinuationRecord, EnumSet<Failure>> findings() {
+        return new LinkedHashMap<>(continuationFailures);
     }
-    return n;
-  }
-
-  /** Returns whether the report contains a failure that should fail the test. */
-  public boolean hasProblems() {
-    return leakCount() > 0
-        || doubleCount() > 0
-        || activateAfterResolveCount() > 0
-        || neverClosedScopeCount() > 0;
-  }
-
-  /** True when the report contains either a failing problem or an advisory signal. */
-  public boolean hasFindings() {
-    return !continuationFailures.isEmpty() || !scopeFailures.isEmpty();
-  }
-
-  private void appendHeader(StringBuilder sb, String title) {
-    sb.append(title)
-        .append(" (")
-        .append(continuations.size())
-        .append(" continuations, ")
-        .append(scopes.size())
-        .append(" scopes; ")
-        .append(leakCount())
-        .append(" leaked, ")
-        .append(lateCount())
-        .append(" late, ")
-        .append(doubleCount())
-        .append(" double, ")
-        .append(activateAfterResolveCount())
-        .append(" activate-after-resolve | scopes: ")
-        .append(neverClosedScopeCount())
-        .append(" never-closed, ")
-        .append(deferredCleanupScopeCount())
-        .append(" deferred, ")
-        .append(closeWrongThreadCount())
-        .append(" wrong-thread)\n");
-  }
-
-  /** Renders flagged continuations and scopes with their call sites. */
-  public String renderSummary() {
-    StringBuilder sb = new StringBuilder();
-    appendHeader(sb, "Scope/continuation problems");
-    if (continuationFailures.isEmpty() && scopeFailures.isEmpty()) {
-      sb.append("  (none)\n");
-      return sb.toString();
+
+    public Map<ScopeRecord, EnumSet<Failure>> scopeFindings() {
+        return new LinkedHashMap<>(scopeFailures);
     }
-    for (Map.Entry<ContinuationRecord, EnumSet<Failure>> e : continuationFailures.entrySet()) {
-      ContinuationRecord r = e.getKey();
-      ScopeEvent capture = r.capture();
-      sb.append("  ")
-          .append(e.getValue())
-          .append(" #")
-          .append(r.seq)
-          .append(" trace=")
-          .append(r.traceId)
-          .append(" src=")
-          .append(r.sourceName())
-          .append(" captured at ")
-          .append(capture == null || capture.callsite() == null ? "<unknown>" : capture.callsite())
-          .append('\n');
+
+    public int leakCount() {
+        return countWith(continuationFailures, Failure.LEAKED);
     }
-    for (Map.Entry<ScopeRecord, EnumSet<Failure>> e : scopeFailures.entrySet()) {
-      ScopeRecord s = e.getKey();
-      ScopeEvent open = s.open();
-      sb.append("  ")
-          .append(e.getValue())
-          .append(" scope#")
-          .append(s.seq)
-          .append(" trace=")
-          .append(s.traceId)
-          .append(" src=")
-          .append(s.sourceName())
-          .append(" opened at ")
-          .append(open == null || open.callsite() == null ? "<unknown>" : open.callsite())
-          .append('\n');
+
+    public int lateCount() {
+        return countWith(continuationFailures, Failure.LATE_FINISH);
     }
-    return sb.toString();
-  }
-
-  private static final int TIMELINE_FRAMES = 3;
-
-  /** Renders all events with relative times, threads, call sites, and linked scopes. */
-  public String renderTimeline() {
-    StringBuilder sb = new StringBuilder();
-    appendHeader(sb, "Scope/continuation timeline");
-    if (continuations.isEmpty() && scopes.isEmpty()) {
-      sb.append("  (nothing captured)\n");
-      return sb.toString();
+
+    public int doubleCount() {
+        return countWith(continuationFailures, Failure.DOUBLE_FINISH);
     }
 
-    for (ContinuationRecord r : continuations) {
-      EnumSet<Failure> failures =
-          continuationFailures.getOrDefault(r, EnumSet.noneOf(Failure.class));
-      sb.append("\n#")
-          .append(r.seq)
-          .append(' ')
-          .append(r.status())
-          .append(" trace=")
-          .append(r.traceId)
-          .append(" span=")
-          .append(r.spanId);
-      if (r.spanName != null) {
-        sb.append(" \"").append(r.spanName).append('"');
-      }
-      sb.append(" src=").append(r.sourceName());
-      if (r.orphan) {
-        sb.append(" [ORPHAN]");
-      }
-      if (r.threadHandoff()) {
-        sb.append(" [handoff]");
-      }
-      if (!failures.isEmpty()) {
-        sb.append(' ').append(failures);
-      }
-      sb.append(timing(r)).append('\n');
-
-      appendEvent(sb, "capture ", r.capture());
-      for (ScopeEvent a : r.resumes()) {
-        appendEvent(sb, "resume  ", a);
-      }
-      for (ScopeEvent f : r.failedActivations()) {
-        appendEvent(sb, "act-fail", f);
-      }
-      ScopeEvent terminal = r.terminal();
-      if (terminal != null) {
-        appendEvent(
-            sb,
-            terminal.type == ScopeEvent.Type.RESOLVE_RELEASE ? "release " : "finish  ",
-            terminal);
-      }
-      for (ScopeEvent extra : r.extraTerminals()) {
-        appendEvent(sb, "DOUBLE  ", extra);
-      }
-      for (long scopeSeq : r.scopeRecordSeqs()) {
-        ScopeRecord scope = scopeBySeq.get(scopeSeq);
-        if (scope != null) {
-          appendScopeLine(sb, "  ", scope);
-        }
-      }
-      if (terminal == null) {
-        sb.append("  LEAKED   (never finished or released)\n");
-      }
+    public int activateAfterResolveCount() {
+        return countWith(continuationFailures, Failure.ACTIVATE_AFTER_RESOLVE);
     }
 
-    List<ScopeRecord> orphanScopes = new ArrayList<>();
-    for (ScopeRecord s : scopes) {
-      if (s.continuationSeq == null) {
-        orphanScopes.add(s);
-      }
+    public int neverClosedScopeCount() {
+        return countWith(scopeFailures, Failure.NEVER_CLOSED);
     }
-    if (!orphanScopes.isEmpty()) {
-      sb.append("\nNon-continuation scopes:\n");
-      for (ScopeRecord s : orphanScopes) {
-        appendScopeLine(sb, "  ", s);
-      }
+
+    public int closeWrongThreadCount() {
+        return countWith(scopeFailures, Failure.CLOSE_WRONG_THREAD);
     }
-    return sb.toString();
-  }
-
-  private String timing(ContinuationRecord r) {
-    StringBuilder sb = new StringBuilder();
-    Long capToResume = r.captureToFirstResumeNanos();
-    Long age = r.ageAtTerminalNanos();
-    if (capToResume != null) {
-      sb.append("  cap->resume=").append(millis(capToResume)).append("ms");
+
+    public int deferredCleanupScopeCount() {
+        int count = 0;
+        for (ScopeRecord scope : scopes) {
+            if (scope.deferredCleanup() && !scope.closed()) {
+                count++;
+            }
+        }
+        return count;
     }
-    if (age != null) {
-      sb.append("  age=").append(millis(age)).append("ms");
+
+    boolean hasIncompleteLifecycles() {
+        return leakCount() > 0 || neverClosedScopeCount() > 0;
     }
-    return sb.toString();
-  }
-
-  private void appendScopeLine(StringBuilder sb, String indent, ScopeRecord scope) {
-    EnumSet<Failure> failures = scopeFailures.getOrDefault(scope, EnumSet.noneOf(Failure.class));
-    sb.append(indent).append("scope#").append(scope.seq).append(' ').append(scope.sourceName());
-    if (scope.spanName != null) {
-      sb.append(" \"").append(scope.spanName).append('"');
+
+    private static <K> int countWith(Map<K, EnumSet<Failure>> findings, Failure failure) {
+        int n = 0;
+        for (EnumSet<Failure> f : findings.values()) {
+            if (f.contains(failure)) {
+                n++;
+            }
+        }
+        return n;
     }
-    ScopeEvent open = scope.open();
-    ScopeEvent close = scope.close();
-    if (open != null) {
-      sb.append("  open +").append(relMillis(open.nanos)).append("ms @ ").append(open.threadName);
+
+    /** Returns whether the report contains a failure that should fail the test. */
+    public boolean hasProblems() {
+        return leakCount() > 0 || doubleCount() > 0 || activateAfterResolveCount() > 0 || neverClosedScopeCount() > 0;
     }
-    if (close != null) {
-      sb.append("  close +")
-          .append(relMillis(close.nanos))
-          .append("ms @ ")
-          .append(close.threadName);
-      Long active = scope.activeDurationNanos();
-      if (active != null) {
-        sb.append(" (active ").append(millis(active)).append("ms)");
-      }
+
+    /** True when the report contains either a failing problem or an advisory signal. */
+    public boolean hasFindings() {
+        return !continuationFailures.isEmpty() || !scopeFailures.isEmpty();
     }
-    if (scope.threadHandoff()) {
-      sb.append(" [handoff]");
+
+    private void appendHeader(StringBuilder sb, String title) {
+        sb.append(title)
+                .append(" (")
+                .append(continuations.size())
+                .append(" continuations, ")
+                .append(scopes.size())
+                .append(" scopes; ")
+                .append(leakCount())
+                .append(" leaked, ")
+                .append(lateCount())
+                .append(" late, ")
+                .append(doubleCount())
+                .append(" double, ")
+                .append(activateAfterResolveCount())
+                .append(" activate-after-resolve | scopes: ")
+                .append(neverClosedScopeCount())
+                .append(" never-closed, ")
+                .append(deferredCleanupScopeCount())
+                .append(" deferred, ")
+                .append(closeWrongThreadCount())
+                .append(" wrong-thread)\n");
     }
-    if (scope.deferredCleanup() && !scope.closed()) {
-      sb.append(" [deferred-cleanup]");
+
+    /** Renders flagged continuations and scopes with their call sites. */
+    public String renderSummary() {
+        StringBuilder sb = new StringBuilder();
+        appendHeader(sb, "Scope/continuation problems");
+        if (continuationFailures.isEmpty() && scopeFailures.isEmpty()) {
+            sb.append("  (none)\n");
+            return sb.toString();
+        }
+        for (Map.Entry<ContinuationRecord, EnumSet<Failure>> e : continuationFailures.entrySet()) {
+            ContinuationRecord r = e.getKey();
+            ScopeEvent capture = r.capture();
+            sb.append("  ")
+                    .append(e.getValue())
+                    .append(" #")
+                    .append(r.seq)
+                    .append(" trace=")
+                    .append(r.traceId)
+                    .append(" src=")
+                    .append(r.sourceName())
+                    .append(" captured at ")
+                    .append(capture == null || capture.callsite() == null ? "<unknown>" : capture.callsite())
+                    .append('\n');
+        }
+        for (Map.Entry<ScopeRecord, EnumSet<Failure>> e : scopeFailures.entrySet()) {
+            ScopeRecord s = e.getKey();
+            ScopeEvent open = s.open();
+            sb.append("  ")
+                    .append(e.getValue())
+                    .append(" scope#")
+                    .append(s.seq)
+                    .append(" trace=")
+                    .append(s.traceId)
+                    .append(" src=")
+                    .append(s.sourceName())
+                    .append(" opened at ")
+                    .append(open == null || open.callsite() == null ? "<unknown>" : open.callsite())
+                    .append('\n');
+        }
+        return sb.toString();
     }
-    if (!failures.isEmpty()) {
-      sb.append(' ').append(failures);
+
+    private static final int TIMELINE_FRAMES = 3;
+
+    /** Renders all events with relative times, threads, call sites, and linked scopes. */
+    public String renderTimeline() {
+        StringBuilder sb = new StringBuilder();
+        appendHeader(sb, "Scope/continuation timeline");
+        if (continuations.isEmpty() && scopes.isEmpty()) {
+            sb.append("  (nothing captured)\n");
+            return sb.toString();
+        }
+
+        for (ContinuationRecord r : continuations) {
+            EnumSet<Failure> failures = continuationFailures.getOrDefault(r, EnumSet.noneOf(Failure.class));
+            sb.append("\n#")
+                    .append(r.seq)
+                    .append(' ')
+                    .append(r.status())
+                    .append(" trace=")
+                    .append(r.traceId)
+                    .append(" span=")
+                    .append(r.spanId);
+            if (r.spanName != null) {
+                sb.append(" \"").append(r.spanName).append('"');
+            }
+            sb.append(" src=").append(r.sourceName());
+            if (r.orphan) {
+                sb.append(" [ORPHAN]");
+            }
+            if (r.threadHandoff()) {
+                sb.append(" [handoff]");
+            }
+            if (!failures.isEmpty()) {
+                sb.append(' ').append(failures);
+            }
+            sb.append(timing(r)).append('\n');
+
+            appendEvent(sb, "capture ", r.capture());
+            for (ScopeEvent a : r.resumes()) {
+                appendEvent(sb, "resume  ", a);
+            }
+            for (ScopeEvent f : r.failedActivations()) {
+                appendEvent(sb, "act-fail", f);
+            }
+            ScopeEvent terminal = r.terminal();
+            if (terminal != null) {
+                appendEvent(sb, terminal.type == ScopeEvent.Type.RESOLVE_RELEASE ? "release " : "finish  ", terminal);
+            }
+            for (ScopeEvent extra : r.extraTerminals()) {
+                appendEvent(sb, "DOUBLE  ", extra);
+            }
+            for (long scopeSeq : r.scopeRecordSeqs()) {
+                ScopeRecord scope = scopeBySeq.get(scopeSeq);
+                if (scope != null) {
+                    appendScopeLine(sb, "  ", scope);
+                }
+            }
+            if (terminal == null) {
+                sb.append("  LEAKED   (never finished or released)\n");
+            }
+        }
+
+        List<ScopeRecord> orphanScopes = new ArrayList<>();
+        for (ScopeRecord s : scopes) {
+            if (s.continuationSeq == null) {
+                orphanScopes.add(s);
+            }
+        }
+        if (!orphanScopes.isEmpty()) {
+            sb.append("\nNon-continuation scopes:\n");
+            for (ScopeRecord s : orphanScopes) {
+                appendScopeLine(sb, "  ", s);
+            }
+        }
+        return sb.toString();
     }
-    sb.append('\n');
-    for (ScopeEvent event : scope.wrongThreadCloses()) {
-      appendEvent(sb, indent + "wrong-thread close", event);
+
+    private String timing(ContinuationRecord r) {
+        StringBuilder sb = new StringBuilder();
+        Long capToResume = r.captureToFirstResumeNanos();
+        Long age = r.ageAtTerminalNanos();
+        if (capToResume != null) {
+            sb.append("  cap->resume=").append(millis(capToResume)).append("ms");
+        }
+        if (age != null) {
+            sb.append("  age=").append(millis(age)).append("ms");
+        }
+        return sb.toString();
     }
-  }
 
-  private void appendEvent(StringBuilder sb, String label, ScopeEvent event) {
-    if (event == null) {
-      sb.append("  ").append(label).append("  (not observed)\n");
-      return;
+    private void appendScopeLine(StringBuilder sb, String indent, ScopeRecord scope) {
+        EnumSet<Failure> failures = scopeFailures.getOrDefault(scope, EnumSet.noneOf(Failure.class));
+        sb.append(indent).append("scope#").append(scope.seq).append(' ').append(scope.sourceName());
+        if (scope.spanName != null) {
+            sb.append(" \"").append(scope.spanName).append('"');
+        }
+        ScopeEvent open = scope.open();
+        ScopeEvent close = scope.close();
+        if (open != null) {
+            sb.append("  open +").append(relMillis(open.nanos)).append("ms @ ").append(open.threadName);
+        }
+        if (close != null) {
+            sb.append("  close +")
+                    .append(relMillis(close.nanos))
+                    .append("ms @ ")
+                    .append(close.threadName);
+            Long active = scope.activeDurationNanos();
+            if (active != null) {
+                sb.append(" (active ").append(millis(active)).append("ms)");
+            }
+        }
+        if (scope.threadHandoff()) {
+            sb.append(" [handoff]");
+        }
+        if (scope.deferredCleanup() && !scope.closed()) {
+            sb.append(" [deferred-cleanup]");
+        }
+        if (!failures.isEmpty()) {
+            sb.append(' ').append(failures);
+        }
+        sb.append('\n');
+        for (ScopeEvent event : scope.wrongThreadCloses()) {
+            appendEvent(sb, indent + "wrong-thread close", event);
+        }
     }
-    sb.append("  ")
-        .append(label)
-        .append("  +")
-        .append(relMillis(event.nanos))
-        .append("ms  @ ")
-        .append(event.threadName)
-        .append("  at ")
-        .append(event.callsite() == null ? "<filtered>" : event.callsite())
-        .append('\n');
-    StackTraceElement[] stack = event.stack;
-    if (stack != null) {
-      for (int i = 1; i < stack.length && i < TIMELINE_FRAMES; i++) {
-        sb.append("              from ").append(stack[i]).append('\n');
-      }
+
+    private void appendEvent(StringBuilder sb, String label, ScopeEvent event) {
+        if (event == null) {
+            sb.append("  ").append(label).append("  (not observed)\n");
+            return;
+        }
+        sb.append("  ")
+                .append(label)
+                .append("  +")
+                .append(relMillis(event.nanos))
+                .append("ms  @ ")
+                .append(event.threadName)
+                .append("  at ")
+                .append(event.callsite() == null ? "<filtered>" : event.callsite())
+                .append('\n');
+        StackTraceElement[] stack = event.stack;
+        if (stack != null) {
+            for (int i = 1; i < stack.length && i < TIMELINE_FRAMES; i++) {
+                sb.append("              from ").append(stack[i]).append('\n');
+            }
+        }
     }
-  }
 
-  private String relMillis(long nanos) {
-    return String.format("%.3f", (nanos - t0) / 1_000_000.0);
-  }
+    private String relMillis(long nanos) {
+        return String.format("%.3f", (nanos - t0) / 1_000_000.0);
+    }
 
-  private static String millis(long nanos) {
-    return String.format("%.3f", nanos / 1_000_000.0);
-  }
+    private static String millis(long nanos) {
+        return String.format("%.3f", nanos / 1_000_000.0);
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeEvent.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeEvent.java
index 2d20de2aacd..2ea9ff32abd 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeEvent.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeEvent.java
@@ -2,37 +2,37 @@
 
 /** A timestamped scope or continuation lifecycle event with its thread and call site. */
 public final class ScopeEvent {
-  public enum Type {
-    CAPTURE,
-    ACTIVATE,
-    /** An {@code activate()} that returned the noop scope after the continuation was resolved. */
-    ACTIVATE_FAILED,
-    RESOLVE_FINISH,
-    RESOLVE_RELEASE,
-    SCOPE_OPEN,
-    SCOPE_CLOSE,
-    /** A scope was closed while not on top of its thread's stack. */
-    SCOPE_CLOSE_WRONG_THREAD
-  }
+    public enum Type {
+        CAPTURE,
+        ACTIVATE,
+        /** An {@code activate()} that returned the noop scope after the continuation was resolved. */
+        ACTIVATE_FAILED,
+        RESOLVE_FINISH,
+        RESOLVE_RELEASE,
+        SCOPE_OPEN,
+        SCOPE_CLOSE,
+        /** A scope was closed while not on top of its thread's stack. */
+        SCOPE_CLOSE_WRONG_THREAD
+    }
 
-  public final Type type;
-  public final String threadName;
-  public final long nanos;
-  public final StackTraceElement[] stack;
+    public final Type type;
+    public final String threadName;
+    public final long nanos;
+    public final StackTraceElement[] stack;
 
-  ScopeEvent(Type type, String threadName, long nanos, StackTraceElement[] stack) {
-    this.type = type;
-    this.threadName = threadName;
-    this.nanos = nanos;
-    this.stack = stack;
-  }
+    ScopeEvent(Type type, String threadName, long nanos, StackTraceElement[] stack) {
+        this.type = type;
+        this.threadName = threadName;
+        this.nanos = nanos;
+        this.stack = stack;
+    }
 
-  ScopeEvent snapshot() {
-    return new ScopeEvent(type, threadName, nanos, stack == null ? null : stack.clone());
-  }
+    ScopeEvent snapshot() {
+        return new ScopeEvent(type, threadName, nanos, stack == null ? null : stack.clone());
+    }
 
-  /** The most relevant (top, post-filter) frame, or {@code null} if none survived filtering. */
-  public StackTraceElement callsite() {
-    return stack != null && stack.length > 0 ? stack[0] : null;
-  }
+    /** The most relevant (top, post-filter) frame, or {@code null} if none survived filtering. */
+    public StackTraceElement callsite() {
+        return stack != null && stack.length > 0 ? stack[0] : null;
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeRecord.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeRecord.java
index ec7f72b4117..3b7a1fc0350 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeRecord.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeRecord.java
@@ -7,129 +7,128 @@
 
 /** Records a scope's activation and close events. */
 public final class ScopeRecord {
-  public final long seq;
-  public final DDTraceId traceId;
-  public final long spanId;
-  public final String spanName;
-  public final byte source;
-
-  /** The continuation that spawned this scope, or {@code null} for a plain activation. */
-  public final Long continuationSeq;
-
-  private final ScopeEvent open;
-  private ScopeEvent close;
-  private boolean deferredCleanup;
-  private final List<ScopeEvent> wrongThreadCloses = new ArrayList<>(0);
-
-  ScopeRecord(
-      long seq,
-      DDTraceId traceId,
-      long spanId,
-      String spanName,
-      byte source,
-      Long continuationSeq,
-      boolean deferredCleanup,
-      ScopeEvent open) {
-    this.seq = seq;
-    this.traceId = traceId;
-    this.spanId = spanId;
-    this.spanName = spanName;
-    this.source = source;
-    this.continuationSeq = continuationSeq;
-    this.deferredCleanup = deferredCleanup;
-    this.open = open;
-  }
-
-  synchronized void setClose(ScopeEvent event) {
-    if (close == null) {
-      close = event;
+    public final long seq;
+    public final DDTraceId traceId;
+    public final long spanId;
+    public final String spanName;
+    public final byte source;
+
+    /** The continuation that spawned this scope, or {@code null} for a plain activation. */
+    public final Long continuationSeq;
+
+    private final ScopeEvent open;
+    private ScopeEvent close;
+    private boolean deferredCleanup;
+    private final List<ScopeEvent> wrongThreadCloses = new ArrayList<>(0);
+
+    ScopeRecord(
+            long seq,
+            DDTraceId traceId,
+            long spanId,
+            String spanName,
+            byte source,
+            Long continuationSeq,
+            boolean deferredCleanup,
+            ScopeEvent open) {
+        this.seq = seq;
+        this.traceId = traceId;
+        this.spanId = spanId;
+        this.spanName = spanName;
+        this.source = source;
+        this.continuationSeq = continuationSeq;
+        this.deferredCleanup = deferredCleanup;
+        this.open = open;
     }
-  }
-
-  synchronized void addWrongThreadClose(ScopeEvent event) {
-    wrongThreadCloses.add(event);
-  }
-
-  synchronized ScopeRecord snapshot() {
-    ScopeRecord copy =
-        new ScopeRecord(
-            seq,
-            traceId,
-            spanId,
-            spanName,
-            source,
-            continuationSeq,
-            deferredCleanup,
-            open == null ? null : open.snapshot());
-    if (close != null) {
-      copy.setClose(close.snapshot());
+
+    synchronized void setClose(ScopeEvent event) {
+        if (close == null) {
+            close = event;
+        }
+    }
+
+    synchronized void addWrongThreadClose(ScopeEvent event) {
+        wrongThreadCloses.add(event);
+    }
+
+    synchronized ScopeRecord snapshot() {
+        ScopeRecord copy = new ScopeRecord(
+                seq,
+                traceId,
+                spanId,
+                spanName,
+                source,
+                continuationSeq,
+                deferredCleanup,
+                open == null ? null : open.snapshot());
+        if (close != null) {
+            copy.setClose(close.snapshot());
+        }
+        for (ScopeEvent event : wrongThreadCloses) {
+            copy.wrongThreadCloses.add(event.snapshot());
+        }
+        return copy;
+    }
+
+    public synchronized ScopeEvent open() {
+        return open;
+    }
+
+    public synchronized ScopeEvent close() {
+        return close;
     }
-    for (ScopeEvent event : wrongThreadCloses) {
-      copy.wrongThreadCloses.add(event.snapshot());
+
+    public synchronized List<ScopeEvent> wrongThreadCloses() {
+        return new ArrayList<>(wrongThreadCloses);
     }
-    return copy;
-  }
-
-  public synchronized ScopeEvent open() {
-    return open;
-  }
-
-  public synchronized ScopeEvent close() {
-    return close;
-  }
-
-  public synchronized List<ScopeEvent> wrongThreadCloses() {
-    return new ArrayList<>(wrongThreadCloses);
-  }
-
-  public synchronized boolean closed() {
-    return close != null;
-  }
-
-  synchronized void markDeferredCleanup() {
-    deferredCleanup = true;
-  }
-
-  public synchronized boolean deferredCleanup() {
-    return deferredCleanup;
-  }
-
-  /** {@code true} when the scope was opened and closed on different threads. */
-  public synchronized boolean threadHandoff() {
-    return open != null && close != null && !open.threadName.equals(close.threadName);
-  }
-
-  /** Nanos the scope was active, or {@code null} if it was never closed. */
-  public synchronized Long activeDurationNanos() {
-    if (open == null || close == null) {
-      return null;
+
+    public synchronized boolean closed() {
+        return close != null;
     }
-    return close.nanos - open.nanos;
-  }
 
-  public synchronized EnumSet<Failure> failures() {
-    EnumSet<Failure> failures = EnumSet.noneOf(Failure.class);
-    if (open != null && close == null && !deferredCleanup) {
-      failures.add(Failure.NEVER_CLOSED);
+    synchronized void markDeferredCleanup() {
+        deferredCleanup = true;
     }
-    if (!wrongThreadCloses.isEmpty()) {
-      failures.add(Failure.CLOSE_WRONG_THREAD);
+
+    public synchronized boolean deferredCleanup() {
+        return deferredCleanup;
     }
-    return failures;
-  }
 
-  public synchronized long firstNanos() {
-    long min = open != null ? open.nanos : Long.MAX_VALUE;
-    if (close != null) {
-      min = Math.min(min, close.nanos);
+    /** {@code true} when the scope was opened and closed on different threads. */
+    public synchronized boolean threadHandoff() {
+        return open != null && close != null && !open.threadName.equals(close.threadName);
     }
-    for (ScopeEvent e : wrongThreadCloses) {
-      min = Math.min(min, e.nanos);
+
+    /** Nanos the scope was active, or {@code null} if it was never closed. */
+    public synchronized Long activeDurationNanos() {
+        if (open == null || close == null) {
+            return null;
+        }
+        return close.nanos - open.nanos;
     }
-    return min;
-  }
 
-  public String sourceName() {
-    return ScopeSources.name(source);
-  }
+    public synchronized EnumSet<Failure> failures() {
+        EnumSet<Failure> failures = EnumSet.noneOf(Failure.class);
+        if (open != null && close == null && !deferredCleanup) {
+            failures.add(Failure.NEVER_CLOSED);
+        }
+        if (!wrongThreadCloses.isEmpty()) {
+            failures.add(Failure.CLOSE_WRONG_THREAD);
+        }
+        return failures;
+    }
+
+    public synchronized long firstNanos() {
+        long min = open != null ? open.nanos : Long.MAX_VALUE;
+        if (close != null) {
+            min = Math.min(min, close.nanos);
+        }
+        for (ScopeEvent e : wrongThreadCloses) {
+            min = Math.min(min, e.nanos);
+        }
+        return min;
+    }
+
+    public String sourceName() {
+        return ScopeSources.name(source);
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeSources.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeSources.java
index f152c11ac39..02674d0d77c 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeSources.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeSources.java
@@ -2,20 +2,20 @@
 
 /** Maps package-private {@code ContinuableScope} source values to readable names. */
 final class ScopeSources {
-  private ScopeSources() {}
+    private ScopeSources() {}
 
-  static String name(byte source) {
-    switch (source) {
-      case 0:
-        return "INSTRUMENTATION";
-      case 1:
-        return "MANUAL";
-      case 2:
-        return "ITERATION";
-      case 3:
-        return "CONTEXT";
-      default:
-        return "UNKNOWN(" + source + ")";
+    static String name(byte source) {
+        switch (source) {
+            case 0:
+                return "INSTRUMENTATION";
+            case 1:
+                return "MANUAL";
+            case 2:
+                return "ITERATION";
+            case 3:
+                return "CONTEXT";
+            default:
+                return "UNKNOWN(" + source + ")";
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeStackAdvice.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeStackAdvice.java
index 1b6bef31bae..572ef5b01d8 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeStackAdvice.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/ScopeStackAdvice.java
@@ -4,12 +4,12 @@
 
 /** Test-only advice for scopes added to the active stack. */
 public final class ScopeStackAdvice {
-  private ScopeStackAdvice() {}
+    private ScopeStackAdvice() {}
 
-  public static final class Push {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(@Advice.Argument(0) Object scope) {
-      ScopeContinuationProbe.onScopeOpen(scope);
+    public static final class Push {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(@Advice.Argument(0) Object scope) {
+            ScopeContinuationProbe.onScopeOpen(scope);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/StackFilter.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/StackFilter.java
index fbc39593188..780a8eb01dd 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/StackFilter.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/StackFilter.java
@@ -5,75 +5,74 @@
 
 /** Removes diagnostic and runtime plumbing from captured call stacks. */
 final class StackFilter {
-  private static final String[] DROP_PREFIXES = {
-    "datadog.trace.agent.test.scopediag.",
-    "datadog.trace.core.",
-    "datadog.trace.bootstrap.instrumentation.java.concurrent.",
-    "datadog.trace.bootstrap.instrumentation.api.",
-    "java.util.concurrent.Executors$",
-    "jdk.internal.reflect.",
-    "java.lang.reflect.",
-    "sun.reflect.",
-    "org.spockframework.mock.",
-    "org.codehaus.groovy.",
-    "groovy.lang.",
-    "net.bytebuddy.",
-  };
+    private static final String[] DROP_PREFIXES = {
+        "datadog.trace.agent.test.scopediag.",
+        "datadog.trace.core.",
+        "datadog.trace.bootstrap.instrumentation.java.concurrent.",
+        "datadog.trace.bootstrap.instrumentation.api.",
+        "java.util.concurrent.Executors$",
+        "jdk.internal.reflect.",
+        "java.lang.reflect.",
+        "sun.reflect.",
+        "org.spockframework.mock.",
+        "org.codehaus.groovy.",
+        "groovy.lang.",
+        "net.bytebuddy.",
+    };
 
-  private static final String[] DROP_CLASSES = {
-    "datadog.trace.bootstrap.InstrumentationContext",
-    "java.util.concurrent.ThreadPoolExecutor",
-    "java.util.concurrent.ScheduledThreadPoolExecutor",
-    "java.util.concurrent.ForkJoinPool",
-    "java.util.concurrent.ForkJoinWorkerThread",
-    "java.util.concurrent.FutureTask",
-    "java.util.concurrent.CompletableFuture",
-  };
+    private static final String[] DROP_CLASSES = {
+        "datadog.trace.bootstrap.InstrumentationContext",
+        "java.util.concurrent.ThreadPoolExecutor",
+        "java.util.concurrent.ScheduledThreadPoolExecutor",
+        "java.util.concurrent.ForkJoinPool",
+        "java.util.concurrent.ForkJoinWorkerThread",
+        "java.util.concurrent.FutureTask",
+        "java.util.concurrent.CompletableFuture",
+    };
 
-  private final int maxFrames;
+    private final int maxFrames;
 
-  StackFilter(int maxFrames) {
-    this.maxFrames = maxFrames;
-  }
-
-  int maxFrames() {
-    return maxFrames;
-  }
-
-  StackTraceElement[] filter(StackTraceElement[] raw) {
-    if (raw == null) {
-      return new StackTraceElement[0];
-    }
-    List<StackTraceElement> kept = new ArrayList<>(maxFrames);
-    for (StackTraceElement frame : raw) {
-      if (isDropped(frame)) {
-        continue;
-      }
-      kept.add(frame);
-      if (kept.size() >= maxFrames) {
-        break;
-      }
+    StackFilter(int maxFrames) {
+        this.maxFrames = maxFrames;
     }
-    return kept.toArray(new StackTraceElement[0]);
-  }
 
-  private static boolean isDropped(StackTraceElement frame) {
-    String className = frame.getClassName();
-    if (className.equals("java.lang.Thread") && frame.getMethodName().equals("getStackTrace")) {
-      return true;
+    int maxFrames() {
+        return maxFrames;
     }
-    for (String prefix : DROP_PREFIXES) {
-      if (className.startsWith(prefix)) {
-        return true;
-      }
+
+    StackTraceElement[] filter(StackTraceElement[] raw) {
+        if (raw == null) {
+            return new StackTraceElement[0];
+        }
+        List<StackTraceElement> kept = new ArrayList<>(maxFrames);
+        for (StackTraceElement frame : raw) {
+            if (isDropped(frame)) {
+                continue;
+            }
+            kept.add(frame);
+            if (kept.size() >= maxFrames) {
+                break;
+            }
+        }
+        return kept.toArray(new StackTraceElement[0]);
     }
-    for (String droppedClass : DROP_CLASSES) {
-      if (className.equals(droppedClass)
-          || (className.startsWith(droppedClass)
-              && className.charAt(droppedClass.length()) == '$')) {
-        return true;
-      }
+
+    private static boolean isDropped(StackTraceElement frame) {
+        String className = frame.getClassName();
+        if (className.equals("java.lang.Thread") && frame.getMethodName().equals("getStackTrace")) {
+            return true;
+        }
+        for (String prefix : DROP_PREFIXES) {
+            if (className.startsWith(prefix)) {
+                return true;
+            }
+        }
+        for (String droppedClass : DROP_CLASSES) {
+            if (className.equals(droppedClass)
+                    || (className.startsWith(droppedClass) && className.charAt(droppedClass.length()) == '$')) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/TrackScopeContinuations.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/TrackScopeContinuations.java
index dcef5bb15a3..5ae69aa8e89 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/TrackScopeContinuations.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/scopediag/TrackScopeContinuations.java
@@ -11,9 +11,9 @@
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Inherited
 public @interface TrackScopeContinuations {
-  /** Set to {@code false} only for a proven incompatibility with the diagnostic itself. */
-  boolean enabled() default true;
+    /** Set to {@code false} only for a proven incompatibility with the diagnostic itself. */
+    boolean enabled() default true;
 
-  /** Explains why the diagnostic is disabled. Required when {@link #enabled()} is false. */
-  String reason() default "";
+    /** Explains why the diagnostic is disabled. Required when {@link #enabled()} is false. */
+    String reason() default "";
 }
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/core/DDSpanAccessor.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/core/DDSpanAccessor.java
index 3e88be78e4d..ed572c85eb5 100644
--- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/core/DDSpanAccessor.java
+++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/core/DDSpanAccessor.java
@@ -8,9 +8,9 @@
  * exposed as part of the public API.
  */
 public final class DDSpanAccessor {
-  private DDSpanAccessor() {}
+    private DDSpanAccessor() {}
 
-  public static List<AgentSpanLink> spanLinks(DDSpan span) {
-    return span.links;
-  }
+    public static List<AgentSpanLink> spanLinks(DDSpan span) {
+        return span.links;
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/test/java/IBMResourceLevelInstrumentation.java b/dd-java-agent/instrumentation-testing/src/test/java/IBMResourceLevelInstrumentation.java
index 6d8fe483c01..46c4700e15b 100644
--- a/dd-java-agent/instrumentation-testing/src/test/java/IBMResourceLevelInstrumentation.java
+++ b/dd-java-agent/instrumentation-testing/src/test/java/IBMResourceLevelInstrumentation.java
@@ -7,25 +7,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class IBMResourceLevelInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public IBMResourceLevelInstrumentation() {
-    super(IBMResourceLevelInstrumentation.class.getName());
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public IBMResourceLevelInstrumentation() {
+        super(IBMResourceLevelInstrumentation.class.getName());
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.as400.resource.ResourceLevel";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.ibm.as400.resource.ResourceLevel";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(named("toString"), ToStringAdvice.class.getName());
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("toString"), ToStringAdvice.class.getName());
+    }
 
-  public static class ToStringAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void toStringReplace(@Advice.Return(readOnly = false) String ret) {
-      ret = "instrumented";
+    public static class ToStringAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void toStringReplace(@Advice.Return(readOnly = false) String ret) {
+            ret = "instrumented";
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/test/java/config/exclude/SomeClass.java b/dd-java-agent/instrumentation-testing/src/test/java/config/exclude/SomeClass.java
index e5492c4d68c..e30a05e2a9b 100644
--- a/dd-java-agent/instrumentation-testing/src/test/java/config/exclude/SomeClass.java
+++ b/dd-java-agent/instrumentation-testing/src/test/java/config/exclude/SomeClass.java
@@ -4,14 +4,14 @@
 
 public class SomeClass implements Runnable {
 
-  @Trace
-  @Override
-  public void run() {}
-
-  public static class NestedClass implements Runnable {
-
     @Trace
     @Override
     public void run() {}
-  }
+
+    public static class NestedClass implements Runnable {
+
+        @Trace
+        @Override
+        public void run() {}
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/test/java/config/exclude/packagename/SomeClass.java b/dd-java-agent/instrumentation-testing/src/test/java/config/exclude/packagename/SomeClass.java
index e3f71fe3cd4..7b2ccf41e18 100644
--- a/dd-java-agent/instrumentation-testing/src/test/java/config/exclude/packagename/SomeClass.java
+++ b/dd-java-agent/instrumentation-testing/src/test/java/config/exclude/packagename/SomeClass.java
@@ -4,14 +4,14 @@
 
 public class SomeClass implements Runnable {
 
-  @Trace
-  @Override
-  public void run() {}
-
-  public static class NestedClass implements Runnable {
-
     @Trace
     @Override
     public void run() {}
-  }
+
+    public static class NestedClass implements Runnable {
+
+        @Trace
+        @Override
+        public void run() {}
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/test/java/context/FieldInjectionTestInstrumentation.java b/dd-java-agent/instrumentation-testing/src/test/java/context/FieldInjectionTestInstrumentation.java
index 2a8dcb46fe3..333437f7df0 100644
--- a/dd-java-agent/instrumentation-testing/src/test/java/context/FieldInjectionTestInstrumentation.java
+++ b/dd-java-agent/instrumentation-testing/src/test/java/context/FieldInjectionTestInstrumentation.java
@@ -17,260 +17,253 @@
 
 @AutoService(InstrumenterModule.class)
 public class FieldInjectionTestInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public FieldInjectionTestInstrumentation() {
-    super("fieldinjection-test");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // no particular marker type
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return nameStartsWith(getClass().getName() + "$");
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(named("isInstrumented"), MarkInstrumentedAdvice.class.getName());
-    transformer.applyAdvice(
-        named("incrementContextCount"), StoreAndIncrementApiUsageAdvice.class.getName());
-    transformer.applyAdvice(named("getContextCount"), GetApiUsageAdvice.class.getName());
-    transformer.applyAdvice(named("putContextCount"), PutApiUsageAdvice.class.getName());
-    transformer.applyAdvice(named("getContextCount2"), GetApiUsageAdvice2.class.getName());
-    transformer.applyAdvice(named("putContextCount2"), PutApiUsageAdvice2.class.getName());
-    transformer.applyAdvice(
-        named("incorrectKeyClassUsage"), IncorrectKeyClassContextApiUsageAdvice.class.getName());
-    transformer.applyAdvice(
-        named("incorrectContextClassUsage"),
-        IncorrectContextClassContextApiUsageAdvice.class.getName());
-    transformer.applyAdvice(
-        named("incorrectCallUsage"), IncorrectCallContextApiUsageAdvice.class.getName());
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {getClass().getName() + "$Context"};
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    final Map<String, String> store = new HashMap<>();
-    String prefix = getClass().getName() + "$";
-    store.put(prefix + "KeyClass", prefix + "Context");
-    store.put(prefix + "UntransformableKeyClass", prefix + "Context");
-    store.put(prefix + "DisabledKeyClass", prefix + "Context");
-    store.put(prefix + "ValidSerializableKeyClass", prefix + "Context");
-    store.put(prefix + "InvalidSerializableKeyClass", prefix + "Context");
-    store.put(prefix + "ValidInheritsSerializableKeyClass", prefix + "Context");
-    store.put(prefix + "InvalidInheritsSerializableKeyClass", prefix + "Context");
-    return store;
-  }
-
-  public static class MarkInstrumentedAdvice {
-    @Advice.OnMethodExit
-    public static void methodExit(@Advice.Return(readOnly = false) boolean isInstrumented) {
-      isInstrumented = true;
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public FieldInjectionTestInstrumentation() {
+        super("fieldinjection-test");
     }
-  }
-
-  public static class StoreAndIncrementApiUsageAdvice {
-    @Advice.OnMethodExit
-    public static void methodExit(
-        @Advice.This final KeyClass thiz, @Advice.Return(readOnly = false) int contextCount) {
-      final ContextStore<KeyClass, Context> contextStore =
-          InstrumentationContext.get(KeyClass.class, Context.class);
-      final Context context = contextStore.getOrPut(thiz, new Context());
-      contextCount = ++context.count;
+
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // no particular marker type
     }
-  }
-
-  public static class StoreAndIncrementWithFactoryApiUsageAdvice {
-    @Advice.OnMethodExit
-    public static void methodExit(
-        @Advice.This final KeyClass thiz, @Advice.Return(readOnly = false) int contextCount) {
-      final ContextStore<KeyClass, Context> contextStore =
-          InstrumentationContext.get(KeyClass.class, Context.class);
-      final Context context = contextStore.getOrCreate(thiz, Context::new);
-      contextCount = ++context.count;
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return nameStartsWith(getClass().getName() + "$");
     }
-  }
-
-  public static class GetApiUsageAdvice {
-    @Advice.OnMethodExit
-    public static void methodExit(
-        @Advice.This final KeyClass thiz, @Advice.Return(readOnly = false) int contextCount) {
-      final ContextStore<KeyClass, Context> contextStore =
-          InstrumentationContext.get(KeyClass.class, Context.class);
-      contextCount = contextStore.get(thiz).count;
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("isInstrumented"), MarkInstrumentedAdvice.class.getName());
+        transformer.applyAdvice(named("incrementContextCount"), StoreAndIncrementApiUsageAdvice.class.getName());
+        transformer.applyAdvice(named("getContextCount"), GetApiUsageAdvice.class.getName());
+        transformer.applyAdvice(named("putContextCount"), PutApiUsageAdvice.class.getName());
+        transformer.applyAdvice(named("getContextCount2"), GetApiUsageAdvice2.class.getName());
+        transformer.applyAdvice(named("putContextCount2"), PutApiUsageAdvice2.class.getName());
+        transformer.applyAdvice(
+                named("incorrectKeyClassUsage"), IncorrectKeyClassContextApiUsageAdvice.class.getName());
+        transformer.applyAdvice(
+                named("incorrectContextClassUsage"), IncorrectContextClassContextApiUsageAdvice.class.getName());
+        transformer.applyAdvice(named("incorrectCallUsage"), IncorrectCallContextApiUsageAdvice.class.getName());
     }
-  }
-
-  public static class PutApiUsageAdvice {
-    @Advice.OnMethodExit
-    public static void methodExit(
-        @Advice.This final KeyClass thiz, @Advice.Argument(0) final int value) {
-      final ContextStore<KeyClass, Context> contextStore =
-          InstrumentationContext.get(KeyClass.class, Context.class);
-      final Context context = new Context();
-      context.count = value;
-      contextStore.put(thiz, context);
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {getClass().getName() + "$Context"};
     }
-  }
-
-  public static class GetApiUsageAdvice2 {
-    @Advice.OnMethodExit
-    public static void methodExit(
-        @Advice.This final Object thiz, @Advice.Return(readOnly = false) int contextCount) {
-      final ContextStore<Object, Context> contextStore =
-          InstrumentationContext.get(
-              "context.FieldInjectionTestInstrumentation$KeyClass",
-              "context.FieldInjectionTestInstrumentation$Context");
-      contextCount = contextStore.get(thiz).count;
+
+    @Override
+    public Map<String, String> contextStore() {
+        final Map<String, String> store = new HashMap<>();
+        String prefix = getClass().getName() + "$";
+        store.put(prefix + "KeyClass", prefix + "Context");
+        store.put(prefix + "UntransformableKeyClass", prefix + "Context");
+        store.put(prefix + "DisabledKeyClass", prefix + "Context");
+        store.put(prefix + "ValidSerializableKeyClass", prefix + "Context");
+        store.put(prefix + "InvalidSerializableKeyClass", prefix + "Context");
+        store.put(prefix + "ValidInheritsSerializableKeyClass", prefix + "Context");
+        store.put(prefix + "InvalidInheritsSerializableKeyClass", prefix + "Context");
+        return store;
     }
-  }
-
-  public static class PutApiUsageAdvice2 {
-    @Advice.OnMethodExit
-    public static void methodExit(
-        @Advice.This final Object thiz, @Advice.Argument(0) final int value) {
-      final ContextStore<Object, Context> contextStore =
-          InstrumentationContext.get(
-              "context.FieldInjectionTestInstrumentation$KeyClass",
-              "context.FieldInjectionTestInstrumentation$Context");
-      final Context context = new Context();
-      context.count = value;
-      contextStore.put(thiz, context);
+
+    public static class MarkInstrumentedAdvice {
+        @Advice.OnMethodExit
+        public static void methodExit(@Advice.Return(readOnly = false) boolean isInstrumented) {
+            isInstrumented = true;
+        }
     }
-  }
 
-  public static class IncorrectKeyClassContextApiUsageAdvice {
-    @Advice.OnMethodExit
-    public static void methodExit() {
-      InstrumentationContext.get(Object.class, Context.class);
+    public static class StoreAndIncrementApiUsageAdvice {
+        @Advice.OnMethodExit
+        public static void methodExit(
+                @Advice.This final KeyClass thiz, @Advice.Return(readOnly = false) int contextCount) {
+            final ContextStore<KeyClass, Context> contextStore =
+                    InstrumentationContext.get(KeyClass.class, Context.class);
+            final Context context = contextStore.getOrPut(thiz, new Context());
+            contextCount = ++context.count;
+        }
     }
-  }
 
-  public static class IncorrectContextClassContextApiUsageAdvice {
-    @Advice.OnMethodExit
-    public static void methodExit() {
-      InstrumentationContext.get(KeyClass.class, Object.class);
+    public static class StoreAndIncrementWithFactoryApiUsageAdvice {
+        @Advice.OnMethodExit
+        public static void methodExit(
+                @Advice.This final KeyClass thiz, @Advice.Return(readOnly = false) int contextCount) {
+            final ContextStore<KeyClass, Context> contextStore =
+                    InstrumentationContext.get(KeyClass.class, Context.class);
+            final Context context = contextStore.getOrCreate(thiz, Context::new);
+            contextCount = ++context.count;
+        }
     }
-  }
-
-  public static class IncorrectCallContextApiUsageAdvice {
-    @Advice.OnMethodExit
-    public static void methodExit() {
-      // Our instrumentation doesn't handle variables being passed to InstrumentationContext.get,
-      // so we make sure that this actually fails instrumentation.
-      final Class clazz = null;
-      InstrumentationContext.get(clazz, Object.class);
+
+    public static class GetApiUsageAdvice {
+        @Advice.OnMethodExit
+        public static void methodExit(
+                @Advice.This final KeyClass thiz, @Advice.Return(readOnly = false) int contextCount) {
+            final ContextStore<KeyClass, Context> contextStore =
+                    InstrumentationContext.get(KeyClass.class, Context.class);
+            contextCount = contextStore.get(thiz).count;
+        }
     }
-  }
 
-  public static class Context {
-    int count = 0;
-  }
+    public static class PutApiUsageAdvice {
+        @Advice.OnMethodExit
+        public static void methodExit(@Advice.This final KeyClass thiz, @Advice.Argument(0) final int value) {
+            final ContextStore<KeyClass, Context> contextStore =
+                    InstrumentationContext.get(KeyClass.class, Context.class);
+            final Context context = new Context();
+            context.count = value;
+            contextStore.put(thiz, context);
+        }
+    }
 
-  public static class KeyClass {
-    public boolean isInstrumented() {
-      // implementation replaced with test instrumentation
-      return false;
+    public static class GetApiUsageAdvice2 {
+        @Advice.OnMethodExit
+        public static void methodExit(
+                @Advice.This final Object thiz, @Advice.Return(readOnly = false) int contextCount) {
+            final ContextStore<Object, Context> contextStore = InstrumentationContext.get(
+                    "context.FieldInjectionTestInstrumentation$KeyClass",
+                    "context.FieldInjectionTestInstrumentation$Context");
+            contextCount = contextStore.get(thiz).count;
+        }
     }
 
-    public int incrementContextCount() {
-      // implementation replaced with test instrumentation
-      return -1;
+    public static class PutApiUsageAdvice2 {
+        @Advice.OnMethodExit
+        public static void methodExit(@Advice.This final Object thiz, @Advice.Argument(0) final int value) {
+            final ContextStore<Object, Context> contextStore = InstrumentationContext.get(
+                    "context.FieldInjectionTestInstrumentation$KeyClass",
+                    "context.FieldInjectionTestInstrumentation$Context");
+            final Context context = new Context();
+            context.count = value;
+            contextStore.put(thiz, context);
+        }
     }
 
-    public int incrementContextCountWithFactory() {
-      // implementation replaced with test instrumentation
-      return -1;
+    public static class IncorrectKeyClassContextApiUsageAdvice {
+        @Advice.OnMethodExit
+        public static void methodExit() {
+            InstrumentationContext.get(Object.class, Context.class);
+        }
     }
 
-    public int getContextCount() {
-      // implementation replaced with test instrumentation
-      return -1;
+    public static class IncorrectContextClassContextApiUsageAdvice {
+        @Advice.OnMethodExit
+        public static void methodExit() {
+            InstrumentationContext.get(KeyClass.class, Object.class);
+        }
     }
 
-    public void putContextCount(final int value) {
-      // implementation replaced with test instrumentation
+    public static class IncorrectCallContextApiUsageAdvice {
+        @Advice.OnMethodExit
+        public static void methodExit() {
+            // Our instrumentation doesn't handle variables being passed to InstrumentationContext.get,
+            // so we make sure that this actually fails instrumentation.
+            final Class clazz = null;
+            InstrumentationContext.get(clazz, Object.class);
+        }
     }
 
-    public int getContextCount2() {
-      // implementation replaced with test instrumentation
-      return -1;
+    public static class Context {
+        int count = 0;
     }
 
-    public void putContextCount2(final int value) {
-      // implementation replaced with test instrumentation
+    public static class KeyClass {
+        public boolean isInstrumented() {
+            // implementation replaced with test instrumentation
+            return false;
+        }
+
+        public int incrementContextCount() {
+            // implementation replaced with test instrumentation
+            return -1;
+        }
+
+        public int incrementContextCountWithFactory() {
+            // implementation replaced with test instrumentation
+            return -1;
+        }
+
+        public int getContextCount() {
+            // implementation replaced with test instrumentation
+            return -1;
+        }
+
+        public void putContextCount(final int value) {
+            // implementation replaced with test instrumentation
+        }
+
+        public int getContextCount2() {
+            // implementation replaced with test instrumentation
+            return -1;
+        }
+
+        public void putContextCount2(final int value) {
+            // implementation replaced with test instrumentation
+        }
     }
-  }
 
-  /** A class which cannot be transformed by our instrumentation. */
-  public static class UntransformableKeyClass extends KeyClass {
-    @Override
-    public boolean isInstrumented() {
-      return false;
+    /** A class which cannot be transformed by our instrumentation. */
+    public static class UntransformableKeyClass extends KeyClass {
+        @Override
+        public boolean isInstrumented() {
+            return false;
+        }
     }
-  }
 
-  /** A class that is used that field injection can be disabled. */
-  public static class DisabledKeyClass extends KeyClass {
-    @Override
-    public boolean isInstrumented() {
-      return false;
+    /** A class that is used that field injection can be disabled. */
+    public static class DisabledKeyClass extends KeyClass {
+        @Override
+        public boolean isInstrumented() {
+            return false;
+        }
     }
-  }
 
-  /** A class that is serializable with serialVersionUID. */
-  public static class ValidSerializableKeyClass extends KeyClass implements Serializable {
-    private static final long serialVersionUID = 123;
-  }
+    /** A class that is serializable with serialVersionUID. */
+    public static class ValidSerializableKeyClass extends KeyClass implements Serializable {
+        private static final long serialVersionUID = 123;
+    }
 
-  /** A class that is serializable with no serialVersionUID. */
-  public static class InvalidSerializableKeyClass extends KeyClass implements Serializable {}
+    /** A class that is serializable with no serialVersionUID. */
+    public static class InvalidSerializableKeyClass extends KeyClass implements Serializable {}
 
-  /** A class that inherits serializable with serialVersionUID. */
-  public static class ValidInheritsSerializableKeyClass extends InvalidSerializableKeyClass {
-    private static final long serialVersionUID = 456;
-  }
+    /** A class that inherits serializable with serialVersionUID. */
+    public static class ValidInheritsSerializableKeyClass extends InvalidSerializableKeyClass {
+        private static final long serialVersionUID = 456;
+    }
 
-  /** A class that inherits serializable with no serialVersionUID. */
-  public static class InvalidInheritsSerializableKeyClass extends ValidSerializableKeyClass {}
+    /** A class that inherits serializable with no serialVersionUID. */
+    public static class InvalidInheritsSerializableKeyClass extends ValidSerializableKeyClass {}
 
-  public static class IncorrectKeyClassUsageKeyClass {
-    public boolean isInstrumented() {
-      return false;
-    }
+    public static class IncorrectKeyClassUsageKeyClass {
+        public boolean isInstrumented() {
+            return false;
+        }
 
-    public int incorrectKeyClassUsage() {
-      // instrumentation will not apply to this class because advice incorrectly uses context api
-      return -1;
+        public int incorrectKeyClassUsage() {
+            // instrumentation will not apply to this class because advice incorrectly uses context api
+            return -1;
+        }
     }
-  }
 
-  public static class IncorrectContextClassUsageKeyClass {
-    public boolean isInstrumented() {
-      return false;
-    }
+    public static class IncorrectContextClassUsageKeyClass {
+        public boolean isInstrumented() {
+            return false;
+        }
 
-    public int incorrectContextClassUsage() {
-      // instrumentation will not apply to this class because advice incorrectly uses context api
-      return -1;
+        public int incorrectContextClassUsage() {
+            // instrumentation will not apply to this class because advice incorrectly uses context api
+            return -1;
+        }
     }
-  }
 
-  public static class IncorrectCallUsageKeyClass {
-    public boolean isInstrumented() {
-      return false;
-    }
+    public static class IncorrectCallUsageKeyClass {
+        public boolean isInstrumented() {
+            return false;
+        }
 
-    public int incorrectCallUsage() {
-      // instrumentation will not apply to this class because advice incorrectly uses context api
-      return -1;
+        public int incorrectCallUsage() {
+            // instrumentation will not apply to this class because advice incorrectly uses context api
+            return -1;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeContinuationProbeTest.java b/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeContinuationProbeTest.java
index 0a5a0df4f7d..9e547d98d57 100644
--- a/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeContinuationProbeTest.java
+++ b/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeContinuationProbeTest.java
@@ -14,87 +14,87 @@
 /** Verifies the tracer internals used by {@link ScopeContinuationProbe}. */
 class ScopeContinuationProbeTest {
 
-  @Test
-  void cancelledSentinelMatchesProduction() throws Exception {
-    assertEquals(Integer.MIN_VALUE >> 1, ScopeContinuationProbe.CANCELLED);
+    @Test
+    void cancelledSentinelMatchesProduction() throws Exception {
+        assertEquals(Integer.MIN_VALUE >> 1, ScopeContinuationProbe.CANCELLED);
 
-    Class<?> scopeContinuation = Class.forName("datadog.trace.core.scopemanager.ScopeContinuation");
-    Field cancelled = scopeContinuation.getDeclaredField("CANCELLED");
-    cancelled.setAccessible(true);
-    assertEquals(
-        cancelled.getInt(null),
-        ScopeContinuationProbe.CANCELLED,
-        "ScopeContinuationProbe.CANCELLED is out of sync with ScopeContinuation.CANCELLED");
-  }
+        Class<?> scopeContinuation = Class.forName("datadog.trace.core.scopemanager.ScopeContinuation");
+        Field cancelled = scopeContinuation.getDeclaredField("CANCELLED");
+        cancelled.setAccessible(true);
+        assertEquals(
+                cancelled.getInt(null),
+                ScopeContinuationProbe.CANCELLED,
+                "ScopeContinuationProbe.CANCELLED is out of sync with ScopeContinuation.CANCELLED");
+    }
 
-  @Test
-  void continuationHooksExist() throws Exception {
-    Class<?> scopeContinuation = Class.forName("datadog.trace.core.scopemanager.ScopeContinuation");
-    assertMethod(scopeContinuation, "register", scopeContinuation);
-    assertMethod(scopeContinuation, "resume", ContextScope.class);
-    assertMethod(scopeContinuation, "release", void.class);
-    assertMethod(scopeContinuation, "cancelFromContinuedScopeClose", void.class);
-    assertField(scopeContinuation, "count", int.class);
-    assertField(scopeContinuation, "source", byte.class);
-  }
+    @Test
+    void continuationHooksExist() throws Exception {
+        Class<?> scopeContinuation = Class.forName("datadog.trace.core.scopemanager.ScopeContinuation");
+        assertMethod(scopeContinuation, "register", scopeContinuation);
+        assertMethod(scopeContinuation, "resume", ContextScope.class);
+        assertMethod(scopeContinuation, "release", void.class);
+        assertMethod(scopeContinuation, "cancelFromContinuedScopeClose", void.class);
+        assertField(scopeContinuation, "count", int.class);
+        assertField(scopeContinuation, "source", byte.class);
+    }
 
-  @Test
-  void rootWrittenHookExists() throws Exception {
-    Class<?> pendingTrace = Class.forName("datadog.trace.core.PendingTrace");
-    assertMethod(pendingTrace, "write", int.class, boolean.class);
-    assertField(pendingTrace, "rootSpanWritten", boolean.class);
-    assertField(pendingTrace, "traceId", DDTraceId.class);
-  }
+    @Test
+    void rootWrittenHookExists() throws Exception {
+        Class<?> pendingTrace = Class.forName("datadog.trace.core.PendingTrace");
+        assertMethod(pendingTrace, "write", int.class, boolean.class);
+        assertField(pendingTrace, "rootSpanWritten", boolean.class);
+        assertField(pendingTrace, "traceId", DDTraceId.class);
+    }
 
-  @Test
-  void scopeLifecycleHooksExist() throws Exception {
-    Class<?> scope = Class.forName("datadog.trace.core.scopemanager.ContinuableScope");
-    Class<?> stack = Class.forName("datadog.trace.core.scopemanager.ScopeStack");
-    assertMethod(stack, "push", void.class, scope);
-    assertMethod(scope, "onProperClose", void.class);
-    assertMethod(scope, "close", void.class);
-    assertField(scope, "source", byte.class);
-    Class<?> continuing = Class.forName("datadog.trace.core.scopemanager.ContinuingScope");
-    Class<?> continuation = Class.forName("datadog.trace.core.scopemanager.ScopeContinuation");
-    assertField(continuing, "continuation", continuation);
-    Class<?> manager = Class.forName("datadog.trace.core.scopemanager.ContinuableScopeManager");
-    assertMethod(manager, "scheduleRootIterationScopeCleanup", void.class, stack, scope);
-  }
+    @Test
+    void scopeLifecycleHooksExist() throws Exception {
+        Class<?> scope = Class.forName("datadog.trace.core.scopemanager.ContinuableScope");
+        Class<?> stack = Class.forName("datadog.trace.core.scopemanager.ScopeStack");
+        assertMethod(stack, "push", void.class, scope);
+        assertMethod(scope, "onProperClose", void.class);
+        assertMethod(scope, "close", void.class);
+        assertField(scope, "source", byte.class);
+        Class<?> continuing = Class.forName("datadog.trace.core.scopemanager.ContinuingScope");
+        Class<?> continuation = Class.forName("datadog.trace.core.scopemanager.ScopeContinuation");
+        assertField(continuing, "continuation", continuation);
+        Class<?> manager = Class.forName("datadog.trace.core.scopemanager.ContinuableScopeManager");
+        assertMethod(manager, "scheduleRootIterationScopeCleanup", void.class, stack, scope);
+    }
 
-  @Test
-  void wrongThreadCheckChainExists() throws Exception {
-    Class<?> scope = Class.forName("datadog.trace.core.scopemanager.ContinuableScope");
+    @Test
+    void wrongThreadCheckChainExists() throws Exception {
+        Class<?> scope = Class.forName("datadog.trace.core.scopemanager.ContinuableScope");
 
-    Class<?> manager = Class.forName("datadog.trace.core.scopemanager.ContinuableScopeManager");
-    assertField(scope, "scopeManager", manager);
-    Class<?> stack = Class.forName("datadog.trace.core.scopemanager.ScopeStack");
-    assertMethod(manager, "scopeStack", stack);
-    assertMethod(stack, "checkTop", boolean.class, scope);
-  }
+        Class<?> manager = Class.forName("datadog.trace.core.scopemanager.ContinuableScopeManager");
+        assertField(scope, "scopeManager", manager);
+        Class<?> stack = Class.forName("datadog.trace.core.scopemanager.ScopeStack");
+        assertMethod(manager, "scopeStack", stack);
+        assertMethod(stack, "checkTop", boolean.class, scope);
+    }
 
-  private static Field findField(Class<?> cls, String name) {
-    for (Class<?> c = cls; c != null; c = c.getSuperclass()) {
-      try {
-        return c.getDeclaredField(name);
-      } catch (NoSuchFieldException ignored) {
-      }
+    private static Field findField(Class<?> cls, String name) {
+        for (Class<?> c = cls; c != null; c = c.getSuperclass()) {
+            try {
+                return c.getDeclaredField(name);
+            } catch (NoSuchFieldException ignored) {
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  private static void assertField(Class<?> owner, String name, Class<?> type) {
-    Field field = findField(owner, name);
-    assertNotNull(field, owner.getName() + "." + name);
-    assertEquals(type, field.getType(), field.toString());
-    assertFalse(Modifier.isStatic(field.getModifiers()), field.toString());
-    field.setAccessible(true);
-  }
+    private static void assertField(Class<?> owner, String name, Class<?> type) {
+        Field field = findField(owner, name);
+        assertNotNull(field, owner.getName() + "." + name);
+        assertEquals(type, field.getType(), field.toString());
+        assertFalse(Modifier.isStatic(field.getModifiers()), field.toString());
+        field.setAccessible(true);
+    }
 
-  private static void assertMethod(
-      Class<?> owner, String name, Class<?> returnType, Class<?>... arguments) throws Exception {
-    Method method = owner.getDeclaredMethod(name, arguments);
-    assertEquals(returnType, method.getReturnType(), method.toString());
-    assertFalse(Modifier.isStatic(method.getModifiers()), method.toString());
-    method.setAccessible(true);
-  }
+    private static void assertMethod(Class<?> owner, String name, Class<?> returnType, Class<?>... arguments)
+            throws Exception {
+        Method method = owner.getDeclaredMethod(name, arguments);
+        assertEquals(returnType, method.getReturnType(), method.toString());
+        assertFalse(Modifier.isStatic(method.getModifiers()), method.toString());
+        method.setAccessible(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsAdmissionTest.java b/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsAdmissionTest.java
index 9b571a36842..e073c435fc9 100644
--- a/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsAdmissionTest.java
+++ b/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsAdmissionTest.java
@@ -11,75 +11,76 @@
 import org.junit.jupiter.api.Test;
 
 class ScopeDiagnosticsAdmissionTest {
-  @AfterEach
-  void reset() {
-    ScopeDiagnostics.reset();
-  }
+    @AfterEach
+    void reset() {
+        ScopeDiagnostics.reset();
+    }
 
-  @Test
-  void failedActivationBeforeResolutionAdviceIsRetained() {
-    ScopeDiagnostics.startRecording();
-    Object window = ScopeDiagnostics.recordingWindow();
-    ContextContinuation continuation = Context.root().capture();
-    ScopeDiagnostics.recordCapture(window, continuation, DDTraceId.from(1), 2, "op", (byte) 0);
+    @Test
+    void failedActivationBeforeResolutionAdviceIsRetained() {
+        ScopeDiagnostics.startRecording();
+        Object window = ScopeDiagnostics.recordingWindow();
+        ContextContinuation continuation = Context.root().capture();
+        ScopeDiagnostics.recordCapture(window, continuation, DDTraceId.from(1), 2, "op", (byte) 0);
 
-    // The tracer has resolved, but its exit advice has not reached the recorder yet.
-    ScopeDiagnostics.recordActivateFailed(window, continuation);
-    assertEquals(1, ScopeDiagnostics.report().records().get(0).failedActivations().size());
-    assertEquals(0, ScopeDiagnostics.report().activateAfterResolveCount());
-    ScopeDiagnostics.recordResolve(window, continuation, true, System.nanoTime(), false);
+        // The tracer has resolved, but its exit advice has not reached the recorder yet.
+        ScopeDiagnostics.recordActivateFailed(window, continuation);
+        assertEquals(
+                1,
+                ScopeDiagnostics.report().records().get(0).failedActivations().size());
+        assertEquals(0, ScopeDiagnostics.report().activateAfterResolveCount());
+        ScopeDiagnostics.recordResolve(window, continuation, true, System.nanoTime(), false);
 
-    ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-    assertEquals(0, report.leakCount());
-    assertEquals(1, report.activateAfterResolveCount());
-    assertTrue(report.hasProblems());
-  }
+        ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+        assertEquals(0, report.leakCount());
+        assertEquals(1, report.activateAfterResolveCount());
+        assertTrue(report.hasProblems());
+    }
 
-  @Test
-  void failedActivationWithoutAnObservedContinuationIsIgnored() {
-    ScopeDiagnostics.startRecording();
-    ScopeDiagnostics.recordActivateFailed(
-        ScopeDiagnostics.recordingWindow(), Context.root().capture());
-    assertTrue(ScopeDiagnostics.report().records().isEmpty());
-  }
+    @Test
+    void failedActivationWithoutAnObservedContinuationIsIgnored() {
+        ScopeDiagnostics.startRecording();
+        ScopeDiagnostics.recordActivateFailed(
+                ScopeDiagnostics.recordingWindow(), Context.root().capture());
+        assertTrue(ScopeDiagnostics.report().records().isEmpty());
+    }
 
-  @Test
-  void delayedEventsCannotEnterTheNextRecordingWindow() {
-    ScopeDiagnostics.startRecording();
-    Object previousWindow = ScopeDiagnostics.recordingWindow();
-    ScopeDiagnostics.stop();
-    ScopeDiagnostics.reset();
-    ScopeDiagnostics.startRecording();
-    Object currentWindow = ScopeDiagnostics.recordingWindow();
-    ContextContinuation continuation = Context.root().capture();
-    Object scope = new Object();
-    DDTraceId trace = DDTraceId.from(1);
+    @Test
+    void delayedEventsCannotEnterTheNextRecordingWindow() {
+        ScopeDiagnostics.startRecording();
+        Object previousWindow = ScopeDiagnostics.recordingWindow();
+        ScopeDiagnostics.stop();
+        ScopeDiagnostics.reset();
+        ScopeDiagnostics.startRecording();
+        Object currentWindow = ScopeDiagnostics.recordingWindow();
+        ContextContinuation continuation = Context.root().capture();
+        Object scope = new Object();
+        DDTraceId trace = DDTraceId.from(1);
 
-    // Deliver callbacks that read their window before stop but arrive after the next start.
-    ScopeDiagnostics.recordCapture(previousWindow, continuation, trace, 2, "old", (byte) 0);
-    ScopeDiagnostics.recordActivate(previousWindow, continuation, trace, 2, "old", (byte) 0, 1);
-    ScopeDiagnostics.recordActivateFailed(previousWindow, continuation);
-    ScopeDiagnostics.recordResolve(previousWindow, continuation, true, 2, false);
-    ScopeDiagnostics.recordRootWritten(previousWindow, trace);
-    ScopeDiagnostics.recordScopeOpen(
-        previousWindow, scope, trace, 2, "old", (byte) 0, continuation);
-    ScopeDiagnostics.recordScopeClose(previousWindow, scope);
-    ScopeDiagnostics.recordScopeCloseWrongThread(previousWindow, scope);
-    ScopeDiagnostics.recordDeferredScopeCleanup(previousWindow, scope);
+        // Deliver callbacks that read their window before stop but arrive after the next start.
+        ScopeDiagnostics.recordCapture(previousWindow, continuation, trace, 2, "old", (byte) 0);
+        ScopeDiagnostics.recordActivate(previousWindow, continuation, trace, 2, "old", (byte) 0, 1);
+        ScopeDiagnostics.recordActivateFailed(previousWindow, continuation);
+        ScopeDiagnostics.recordResolve(previousWindow, continuation, true, 2, false);
+        ScopeDiagnostics.recordRootWritten(previousWindow, trace);
+        ScopeDiagnostics.recordScopeOpen(previousWindow, scope, trace, 2, "old", (byte) 0, continuation);
+        ScopeDiagnostics.recordScopeClose(previousWindow, scope);
+        ScopeDiagnostics.recordScopeCloseWrongThread(previousWindow, scope);
+        ScopeDiagnostics.recordDeferredScopeCleanup(previousWindow, scope);
 
-    assertTrue(ScopeDiagnostics.report().records().isEmpty());
-    assertTrue(ScopeDiagnostics.report().scopeRecords().isEmpty());
+        assertTrue(ScopeDiagnostics.report().records().isEmpty());
+        assertTrue(ScopeDiagnostics.report().scopeRecords().isEmpty());
 
-    // Old resolution/deferred-cleanup/write events must not poison fresh records either.
-    ScopeDiagnostics.recordCapture(currentWindow, continuation, trace, 2, "new", (byte) 0);
-    ScopeDiagnostics.recordScopeOpen(currentWindow, scope, trace, 2, "new", (byte) 0, continuation);
-    ScopeDiagnostics.recordResolve(currentWindow, continuation, true, Long.MAX_VALUE, false);
-    assertEquals(0, ScopeDiagnostics.report().deferredCleanupScopeCount());
-    ScopeDiagnostics.recordScopeClose(currentWindow, scope);
-    ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-    assertEquals(1, report.records().size());
-    assertEquals(0, report.leakCount());
-    assertEquals(0, report.lateCount());
-    assertFalse(report.hasProblems());
-  }
+        // Old resolution/deferred-cleanup/write events must not poison fresh records either.
+        ScopeDiagnostics.recordCapture(currentWindow, continuation, trace, 2, "new", (byte) 0);
+        ScopeDiagnostics.recordScopeOpen(currentWindow, scope, trace, 2, "new", (byte) 0, continuation);
+        ScopeDiagnostics.recordResolve(currentWindow, continuation, true, Long.MAX_VALUE, false);
+        assertEquals(0, ScopeDiagnostics.report().deferredCleanupScopeCount());
+        ScopeDiagnostics.recordScopeClose(currentWindow, scope);
+        ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+        assertEquals(1, report.records().size());
+        assertEquals(0, report.leakCount());
+        assertEquals(0, report.lateCount());
+        assertFalse(report.hasProblems());
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsConfigurationTest.java b/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsConfigurationTest.java
index 2b0ada14e7a..1ff510aa4a3 100644
--- a/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsConfigurationTest.java
+++ b/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsConfigurationTest.java
@@ -8,29 +8,26 @@
 
 class ScopeDiagnosticsConfigurationTest {
 
-  @TrackScopeContinuations(enabled = false)
-  private static class UndocumentedOptOut {}
-
-  @TrackScopeContinuations(enabled = false, reason = "incompatible synthetic tracer")
-  private static class DocumentedOptOut {}
-
-  @Test
-  void diagnosticsAreEnabledByDefault() {
-    assertTrue(ScopeDiagnostics.isEnabled(null));
-  }
-
-  @Test
-  void documentedOptOutDisablesDiagnostics() {
-    assertFalse(
-        ScopeDiagnostics.isEnabled(
-            DocumentedOptOut.class.getAnnotation(TrackScopeContinuations.class)));
-  }
-
-  @Test
-  void undocumentedOptOutIsRejected() {
-    TrackScopeContinuations config =
-        UndocumentedOptOut.class.getAnnotation(TrackScopeContinuations.class);
-
-    assertThrows(IllegalArgumentException.class, () -> ScopeDiagnostics.isEnabled(config));
-  }
+    @TrackScopeContinuations(enabled = false)
+    private static class UndocumentedOptOut {}
+
+    @TrackScopeContinuations(enabled = false, reason = "incompatible synthetic tracer")
+    private static class DocumentedOptOut {}
+
+    @Test
+    void diagnosticsAreEnabledByDefault() {
+        assertTrue(ScopeDiagnostics.isEnabled(null));
+    }
+
+    @Test
+    void documentedOptOutDisablesDiagnostics() {
+        assertFalse(ScopeDiagnostics.isEnabled(DocumentedOptOut.class.getAnnotation(TrackScopeContinuations.class)));
+    }
+
+    @Test
+    void undocumentedOptOutIsRejected() {
+        TrackScopeContinuations config = UndocumentedOptOut.class.getAnnotation(TrackScopeContinuations.class);
+
+        assertThrows(IllegalArgumentException.class, () -> ScopeDiagnostics.isEnabled(config));
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsIntegrationTest.java b/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsIntegrationTest.java
index 55b9adbb408..58e98e1e2af 100644
--- a/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsIntegrationTest.java
+++ b/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsIntegrationTest.java
@@ -23,382 +23,424 @@
 /** Exercises diagnostics against continuations created by a real {@link CoreTracer}. */
 class ScopeDiagnosticsIntegrationTest {
 
-  private CoreTracer tracer;
-
-  @AfterEach
-  void tearDown() {
-    ScopeDiagnostics.stop();
-    ScopeDiagnostics.reset();
-    if (tracer != null) {
-      tracer.close();
+    private CoreTracer tracer;
+
+    @AfterEach
+    void tearDown() {
+        ScopeDiagnostics.stop();
+        ScopeDiagnostics.reset();
+        if (tracer != null) {
+            tracer.close();
+        }
     }
-  }
-
-  @Test
-  void capturesRealLeakAndResolvedContinuation() {
-    tracer = CoreTracer.builder().writer(new ListWriter()).strictTraceWrites(false).build();
-
-    ScopeDiagnostics.startRecording();
-
-    AgentSpan span = tracer.startSpan("test", "op");
-    ContextContinuation leaked = tracer.capture(span);
-    ContextContinuation resolved = tracer.capture(span);
-    resolved.release();
-
-    ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-
-    assertEquals(2, report.records().size(), "both captures recorded");
-    assertEquals(1, report.leakCount(), "exactly the un-resolved continuation leaks");
-    assertTrue(report.hasProblems());
-    assertFalse(leaked.toString().isEmpty());
-
-    span.finish();
-  }
-
-  @Test
-  void sameSpanReactivationIsNotFlaggedActivateAfterResolve() {
-    tracer = CoreTracer.builder().writer(new ListWriter()).strictTraceWrites(false).build();
-
-    ScopeDiagnostics.startRecording();
-
-    AgentSpan span = tracer.startSpan("test", "op");
-    ContextScope active = tracer.activateSpan(span);
-    // Same-span reuse resolves the continuation before resume() returns.
-    ContextContinuation continuation = tracer.capture(span);
-    ContextScope reused = continuation.resume();
-    reused.close();
-    active.close();
-    span.finish();
-
-    ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-
-    assertEquals(1, report.records().size());
-    ContinuationRecord record = report.records().get(0);
-    assertEquals(1, record.resumes().size(), "same-span resume must be observed");
-    assertNotNull(record.terminal());
-    assertTrue(
-        record.resumes().get(0).nanos <= record.terminal().nanos,
-        "resume must be timestamped before its nested resolution");
-    assertEquals(
-        0,
-        report.activateAfterResolveCount(),
-        "a same-span re-activation resolved during activate() is not activate-after-resolve");
-    assertEquals(0, report.leakCount());
-    assertFalse(report.hasProblems());
-  }
-
-  @Test
-  void resolvedContinuationDoesNotLeak() {
-    tracer = CoreTracer.builder().writer(new ListWriter()).strictTraceWrites(false).build();
-
-    ScopeDiagnostics.startRecording();
-
-    AgentSpan span = tracer.startSpan("test", "op");
-    ContextContinuation continuation = tracer.capture(span);
-    ContextScope scope = continuation.resume();
-    scope.close();
-    span.finish();
-
-    ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-
-    assertEquals(1, report.records().size());
-    assertEquals(0, report.leakCount(), "activated then closed continuation is resolved");
-  }
-
-  @Test
-  void repeatedContinuedScopeCloseIsFlagged() {
-    tracer = CoreTracer.builder().writer(new ListWriter()).strictTraceWrites(false).build();
-    ScopeDiagnostics.startRecording();
-
-    AgentSpan span = tracer.startSpan("test", "op");
-    ContextContinuation continuation = tracer.capture(span);
-    ContextScope scope = continuation.resume();
-    scope.close();
-    assertFalse(ScopeDiagnostics.report().hasProblems());
-    scope.close();
-    span.finish();
-
-    ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-    assertEquals(1, report.doubleCount());
-    assertEquals(0, report.leakCount());
-    assertTrue(report.hasProblems());
-    assertTrue(report.renderTimeline().contains("DOUBLE_FINISH"));
-  }
-
-  @Test
-  void heldContinuationScopeCloseAndReleaseResolveOnce() {
-    tracer = CoreTracer.builder().writer(new ListWriter()).strictTraceWrites(false).build();
-    ScopeDiagnostics.startRecording();
-
-    AgentSpan span = tracer.startSpan("test", "op");
-    ContextContinuation continuation = tracer.capture(span).hold();
-    ContextScope scope = continuation.resume();
-    scope.close();
-    assertEquals(1, ScopeDiagnostics.report().leakCount());
-    continuation.release();
-    span.finish();
-
-    ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-    assertEquals(1, report.records().size());
-    assertEquals(ContinuationStatus.RELEASED, report.records().get(0).status());
-    assertEquals(ScopeEvent.Type.RESOLVE_RELEASE, report.records().get(0).terminal().type);
-    assertTrue(report.renderTimeline().contains("RELEASED"));
-    assertTrue(report.renderTimeline().contains("release "));
-    assertFalse(report.renderTimeline().contains("cancel"));
-    assertEquals(0, report.doubleCount());
-    assertEquals(0, report.leakCount());
-    assertFalse(report.hasProblems());
-  }
-
-  @Test
-  void releaseWithoutResumeIsReportedAsReleased() {
-    tracer = CoreTracer.builder().writer(new ListWriter()).strictTraceWrites(false).build();
-    ScopeDiagnostics.startRecording();
-
-    AgentSpan span = tracer.startSpan("test", "op");
-    tracer.capture(span).release();
-    span.finish();
-
-    ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-    assertEquals(1, report.records().size());
-    assertEquals(ContinuationStatus.RELEASED, report.records().get(0).status());
-    assertEquals(ScopeEvent.Type.RESOLVE_RELEASE, report.records().get(0).terminal().type);
-    assertFalse(report.hasProblems());
-  }
-
-  @Test
-  void scopeLifetimeRecordedAndLinkedToContinuation() {
-    tracer = CoreTracer.builder().writer(new ListWriter()).strictTraceWrites(false).build();
-
-    ScopeDiagnostics.startRecording();
-
-    AgentSpan span = tracer.startSpan("test", "op");
-    ContextContinuation continuation = tracer.capture(span);
-    ContextScope scope = continuation.resume();
-    scope.close();
-    span.finish();
-
-    ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-
-    ScopeRecord linked = continuationScope(report);
-    assertNotNull(linked, "the resumed scope was recorded");
-    assertNotNull(linked.open(), "scope open observed");
-    assertTrue(linked.closed(), "scope close observed");
-    assertEquals(0, report.neverClosedScopeCount());
-    assertEquals(1, report.records().size());
-    ContinuationRecord record = report.records().get(0);
-    assertNotNull(record.capture());
-    assertFalse(record.orphan);
-    assertEquals(1, record.resumes().size());
-    assertEquals(ContinuationStatus.FINISHED, record.status());
-    assertEquals(span.getTraceId(), record.traceId);
-    assertEquals(span.getSpanId(), record.spanId);
-    assertEquals("op", record.spanName);
-    assertEquals(record.source, linked.source);
-    assertFalse(record.source == (byte) -1, "source must not fall back after reflection failure");
-    assertEquals(Long.valueOf(record.seq), linked.continuationSeq);
-  }
-
-  @Test
-  void swappedContextDoesNotCreateCloseOwnedScope() {
-    tracer = CoreTracer.builder().writer(new ListWriter()).strictTraceWrites(false).build();
-
-    ScopeDiagnostics.startRecording();
-
-    AgentSpan span = tracer.startSpan("test", "op");
-    Context previous = tracer.swap(span);
-    previous.swap();
-    span.finish();
-
-    ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-
-    assertEquals(0, report.neverClosedScopeCount());
-    assertTrue(report.scopeRecords().isEmpty(), "stack swaps do not own scope closure");
-  }
-
-  @Test
-  void rootIterationScopeDelegatesCleanup() {
-    tracer = CoreTracer.builder().writer(new ListWriter()).strictTraceWrites(false).build();
-
-    ScopeDiagnostics.startRecording();
-
-    AgentSpan span = tracer.startSpan("test", "iteration");
-    tracer.activateNext(span);
-
-    ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-    assertEquals(1, report.deferredCleanupScopeCount());
-    assertEquals(0, report.neverClosedScopeCount());
-    assertFalse(report.hasProblems());
-
-    tracer.closePrevious(true);
-  }
-
-  @Test
-  void waitsForAsynchronousScopeCleanup() throws Exception {
-    tracer = CoreTracer.builder().writer(new ListWriter()).strictTraceWrites(false).build();
-
-    ScopeDiagnostics.startRecording();
-
-    AgentSpan span = tracer.startSpan("test", "op");
-    ContextContinuation continuation = tracer.capture(span);
-    CountDownLatch scopeOpened = new CountDownLatch(1);
-    CountDownLatch closeScope = new CountDownLatch(1);
-    Thread worker =
-        new Thread(
-            () -> {
-              try (ContextScope ignored = continuation.resume()) {
+
+    @Test
+    void capturesRealLeakAndResolvedContinuation() {
+        tracer = CoreTracer.builder()
+                .writer(new ListWriter())
+                .strictTraceWrites(false)
+                .build();
+
+        ScopeDiagnostics.startRecording();
+
+        AgentSpan span = tracer.startSpan("test", "op");
+        ContextContinuation leaked = tracer.capture(span);
+        ContextContinuation resolved = tracer.capture(span);
+        resolved.release();
+
+        ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+
+        assertEquals(2, report.records().size(), "both captures recorded");
+        assertEquals(1, report.leakCount(), "exactly the un-resolved continuation leaks");
+        assertTrue(report.hasProblems());
+        assertFalse(leaked.toString().isEmpty());
+
+        span.finish();
+    }
+
+    @Test
+    void sameSpanReactivationIsNotFlaggedActivateAfterResolve() {
+        tracer = CoreTracer.builder()
+                .writer(new ListWriter())
+                .strictTraceWrites(false)
+                .build();
+
+        ScopeDiagnostics.startRecording();
+
+        AgentSpan span = tracer.startSpan("test", "op");
+        ContextScope active = tracer.activateSpan(span);
+        // Same-span reuse resolves the continuation before resume() returns.
+        ContextContinuation continuation = tracer.capture(span);
+        ContextScope reused = continuation.resume();
+        reused.close();
+        active.close();
+        span.finish();
+
+        ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+
+        assertEquals(1, report.records().size());
+        ContinuationRecord record = report.records().get(0);
+        assertEquals(1, record.resumes().size(), "same-span resume must be observed");
+        assertNotNull(record.terminal());
+        assertTrue(
+                record.resumes().get(0).nanos <= record.terminal().nanos,
+                "resume must be timestamped before its nested resolution");
+        assertEquals(
+                0,
+                report.activateAfterResolveCount(),
+                "a same-span re-activation resolved during activate() is not activate-after-resolve");
+        assertEquals(0, report.leakCount());
+        assertFalse(report.hasProblems());
+    }
+
+    @Test
+    void resolvedContinuationDoesNotLeak() {
+        tracer = CoreTracer.builder()
+                .writer(new ListWriter())
+                .strictTraceWrites(false)
+                .build();
+
+        ScopeDiagnostics.startRecording();
+
+        AgentSpan span = tracer.startSpan("test", "op");
+        ContextContinuation continuation = tracer.capture(span);
+        ContextScope scope = continuation.resume();
+        scope.close();
+        span.finish();
+
+        ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+
+        assertEquals(1, report.records().size());
+        assertEquals(0, report.leakCount(), "activated then closed continuation is resolved");
+    }
+
+    @Test
+    void repeatedContinuedScopeCloseIsFlagged() {
+        tracer = CoreTracer.builder()
+                .writer(new ListWriter())
+                .strictTraceWrites(false)
+                .build();
+        ScopeDiagnostics.startRecording();
+
+        AgentSpan span = tracer.startSpan("test", "op");
+        ContextContinuation continuation = tracer.capture(span);
+        ContextScope scope = continuation.resume();
+        scope.close();
+        assertFalse(ScopeDiagnostics.report().hasProblems());
+        scope.close();
+        span.finish();
+
+        ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+        assertEquals(1, report.doubleCount());
+        assertEquals(0, report.leakCount());
+        assertTrue(report.hasProblems());
+        assertTrue(report.renderTimeline().contains("DOUBLE_FINISH"));
+    }
+
+    @Test
+    void heldContinuationScopeCloseAndReleaseResolveOnce() {
+        tracer = CoreTracer.builder()
+                .writer(new ListWriter())
+                .strictTraceWrites(false)
+                .build();
+        ScopeDiagnostics.startRecording();
+
+        AgentSpan span = tracer.startSpan("test", "op");
+        ContextContinuation continuation = tracer.capture(span).hold();
+        ContextScope scope = continuation.resume();
+        scope.close();
+        assertEquals(1, ScopeDiagnostics.report().leakCount());
+        continuation.release();
+        span.finish();
+
+        ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+        assertEquals(1, report.records().size());
+        assertEquals(ContinuationStatus.RELEASED, report.records().get(0).status());
+        assertEquals(ScopeEvent.Type.RESOLVE_RELEASE, report.records().get(0).terminal().type);
+        assertTrue(report.renderTimeline().contains("RELEASED"));
+        assertTrue(report.renderTimeline().contains("release "));
+        assertFalse(report.renderTimeline().contains("cancel"));
+        assertEquals(0, report.doubleCount());
+        assertEquals(0, report.leakCount());
+        assertFalse(report.hasProblems());
+    }
+
+    @Test
+    void releaseWithoutResumeIsReportedAsReleased() {
+        tracer = CoreTracer.builder()
+                .writer(new ListWriter())
+                .strictTraceWrites(false)
+                .build();
+        ScopeDiagnostics.startRecording();
+
+        AgentSpan span = tracer.startSpan("test", "op");
+        tracer.capture(span).release();
+        span.finish();
+
+        ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+        assertEquals(1, report.records().size());
+        assertEquals(ContinuationStatus.RELEASED, report.records().get(0).status());
+        assertEquals(ScopeEvent.Type.RESOLVE_RELEASE, report.records().get(0).terminal().type);
+        assertFalse(report.hasProblems());
+    }
+
+    @Test
+    void scopeLifetimeRecordedAndLinkedToContinuation() {
+        tracer = CoreTracer.builder()
+                .writer(new ListWriter())
+                .strictTraceWrites(false)
+                .build();
+
+        ScopeDiagnostics.startRecording();
+
+        AgentSpan span = tracer.startSpan("test", "op");
+        ContextContinuation continuation = tracer.capture(span);
+        ContextScope scope = continuation.resume();
+        scope.close();
+        span.finish();
+
+        ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+
+        ScopeRecord linked = continuationScope(report);
+        assertNotNull(linked, "the resumed scope was recorded");
+        assertNotNull(linked.open(), "scope open observed");
+        assertTrue(linked.closed(), "scope close observed");
+        assertEquals(0, report.neverClosedScopeCount());
+        assertEquals(1, report.records().size());
+        ContinuationRecord record = report.records().get(0);
+        assertNotNull(record.capture());
+        assertFalse(record.orphan);
+        assertEquals(1, record.resumes().size());
+        assertEquals(ContinuationStatus.FINISHED, record.status());
+        assertEquals(span.getTraceId(), record.traceId);
+        assertEquals(span.getSpanId(), record.spanId);
+        assertEquals("op", record.spanName);
+        assertEquals(record.source, linked.source);
+        assertFalse(record.source == (byte) -1, "source must not fall back after reflection failure");
+        assertEquals(Long.valueOf(record.seq), linked.continuationSeq);
+    }
+
+    @Test
+    void swappedContextDoesNotCreateCloseOwnedScope() {
+        tracer = CoreTracer.builder()
+                .writer(new ListWriter())
+                .strictTraceWrites(false)
+                .build();
+
+        ScopeDiagnostics.startRecording();
+
+        AgentSpan span = tracer.startSpan("test", "op");
+        Context previous = tracer.swap(span);
+        previous.swap();
+        span.finish();
+
+        ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+
+        assertEquals(0, report.neverClosedScopeCount());
+        assertTrue(report.scopeRecords().isEmpty(), "stack swaps do not own scope closure");
+    }
+
+    @Test
+    void rootIterationScopeDelegatesCleanup() {
+        tracer = CoreTracer.builder()
+                .writer(new ListWriter())
+                .strictTraceWrites(false)
+                .build();
+
+        ScopeDiagnostics.startRecording();
+
+        AgentSpan span = tracer.startSpan("test", "iteration");
+        tracer.activateNext(span);
+
+        ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+        assertEquals(1, report.deferredCleanupScopeCount());
+        assertEquals(0, report.neverClosedScopeCount());
+        assertFalse(report.hasProblems());
+
+        tracer.closePrevious(true);
+    }
+
+    @Test
+    void waitsForAsynchronousScopeCleanup() throws Exception {
+        tracer = CoreTracer.builder()
+                .writer(new ListWriter())
+                .strictTraceWrites(false)
+                .build();
+
+        ScopeDiagnostics.startRecording();
+
+        AgentSpan span = tracer.startSpan("test", "op");
+        ContextContinuation continuation = tracer.capture(span);
+        CountDownLatch scopeOpened = new CountDownLatch(1);
+        CountDownLatch closeScope = new CountDownLatch(1);
+        Thread worker = new Thread(() -> {
+            try (ContextScope ignored = continuation.resume()) {
                 scopeOpened.countDown();
                 closeScope.await();
-              } catch (InterruptedException interrupted) {
+            } catch (InterruptedException interrupted) {
                 Thread.currentThread().interrupt();
-              }
-            });
-    worker.start();
-
-    assertTrue(scopeOpened.await(5, TimeUnit.SECONDS));
-    assertTrue(ScopeDiagnostics.report().hasIncompleteLifecycles());
-    closeScope.countDown();
-    ScopeDiagnostics.awaitQuiescence();
-    worker.join();
-
-    ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-    assertFalse(report.hasIncompleteLifecycles());
-    assertFalse(report.hasProblems());
-    span.finish();
-  }
-
-  @Test
-  void neverClosedScopeIsFlagged() {
-    tracer = CoreTracer.builder().writer(new ListWriter()).strictTraceWrites(false).build();
-
-    ScopeDiagnostics.startRecording();
-
-    AgentSpan span = tracer.startSpan("test", "op");
-    ContextContinuation continuation = tracer.capture(span);
-    ContextScope scope = continuation.resume();
-
-    ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-
-    assertEquals(1, report.neverClosedScopeCount(), "the open scope never closed");
-    assertEquals(1, report.leakCount(), "and the continuation it backs also leaks");
-    assertTrue(report.hasProblems());
-
-    scope.close();
-    span.finish();
-  }
-
-  @Test
-  void eventsAfterStopAreRejected() {
-    tracer = CoreTracer.builder().writer(new ListWriter()).strictTraceWrites(false).build();
-
-    ScopeDiagnostics.startRecording();
-    AgentSpan span = tracer.startSpan("test", "op");
-    ContextContinuation continuation = tracer.capture(span);
-
-    ScopeDiagnostics.stop();
-    continuation.release();
-    ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-
-    assertEquals(1, report.leakCount(), "the resolution happened outside the recording window");
-    span.finish();
-  }
-
-  @Test
-  void resumeAfterRootWriteIsRecorded() {
-    tracer = CoreTracer.builder().writer(new ListWriter()).strictTraceWrites(false).build();
-    ScopeDiagnostics.startRecording();
-    AgentSpan span = tracer.startSpan("test", "op");
-    ContextContinuation continuation = tracer.capture(span);
-    try {
-      span.finish();
-      ((PendingTrace) ((DDSpan) span).spanContext().getTraceCollector()).write();
-      assertEquals(0, ScopeDiagnostics.report().lateCount());
-      try (ContextScope ignored = continuation.resume()) {
-        assertEquals(1, ScopeDiagnostics.report().lateCount());
-      }
-      assertEquals(0, ScopeDiagnostics.report().leakCount());
-    } finally {
-      continuation.release();
+            }
+        });
+        worker.start();
+
+        assertTrue(scopeOpened.await(5, TimeUnit.SECONDS));
+        assertTrue(ScopeDiagnostics.report().hasIncompleteLifecycles());
+        closeScope.countDown();
+        ScopeDiagnostics.awaitQuiescence();
+        worker.join();
+
+        ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+        assertFalse(report.hasIncompleteLifecycles());
+        assertFalse(report.hasProblems());
+        span.finish();
     }
-  }
-
-  @Test
-  void resumeAfterReleaseRecordsFailedActivation() {
-    tracer = CoreTracer.builder().writer(new ListWriter()).strictTraceWrites(false).build();
-    ScopeDiagnostics.startRecording();
-    AgentSpan span = tracer.startSpan("test", "op");
-    try {
-      ContextContinuation continuation = tracer.capture(span);
-      continuation.release();
-      assertEquals(0, ScopeDiagnostics.report().activateAfterResolveCount());
-      continuation.resume().close();
-      ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-      assertEquals(1, report.records().size());
-      assertEquals(1, report.records().get(0).failedActivations().size());
-      assertTrue(report.records().get(0).resumes().isEmpty());
-      assertEquals(1, report.activateAfterResolveCount());
-      assertEquals(0, report.leakCount());
-    } finally {
-      span.finish();
+
+    @Test
+    void neverClosedScopeIsFlagged() {
+        tracer = CoreTracer.builder()
+                .writer(new ListWriter())
+                .strictTraceWrites(false)
+                .build();
+
+        ScopeDiagnostics.startRecording();
+
+        AgentSpan span = tracer.startSpan("test", "op");
+        ContextContinuation continuation = tracer.capture(span);
+        ContextScope scope = continuation.resume();
+
+        ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+
+        assertEquals(1, report.neverClosedScopeCount(), "the open scope never closed");
+        assertEquals(1, report.leakCount(), "and the continuation it backs also leaks");
+        assertTrue(report.hasProblems());
+
+        scope.close();
+        span.finish();
     }
-  }
-
-  @Test
-  void outOfOrderScopeCloseIsRecorded() throws Exception {
-    assertMisplacedClose(false);
-  }
-
-  @Test
-  void wrongThreadScopeCloseIsRecorded() throws Exception {
-    assertMisplacedClose(true);
-  }
-
-  private void assertMisplacedClose(boolean anotherThread) throws Exception {
-    tracer = CoreTracer.builder().writer(new ListWriter()).strictTraceWrites(false).build();
-    ScopeDiagnostics.startRecording();
-    AgentSpan outerSpan = tracer.startSpan("test", "outer");
-    AgentSpan innerSpan = tracer.startSpan("test", "inner");
-    ContextScope outer = tracer.activateSpan(outerSpan);
-    ContextScope inner = tracer.activateSpan(innerSpan);
-    try {
-      assertEquals(0, ScopeDiagnostics.report().closeWrongThreadCount());
-      String closingThread = Thread.currentThread().getName();
-      if (anotherThread) {
-        FutureTask<Void> close = new FutureTask<>(outer::close, null);
-        Thread worker = new Thread(close, "scope-diagnostics-wrong-thread");
-        worker.setDaemon(true);
-        worker.start();
-        close.get(5, TimeUnit.SECONDS);
-        closingThread = worker.getName();
-      } else {
-        outer.close();
-      }
-      ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-      assertEquals(1, report.closeWrongThreadCount());
-      ScopeRecord record =
-          report.scopeRecords().stream()
-              .filter(scope -> scope.spanId == outerSpan.getSpanId())
-              .findFirst()
-              .orElseThrow(() -> new AssertionError("outer scope was not recorded"));
-      assertEquals(1, record.wrongThreadCloses().size());
-      assertEquals(closingThread, record.wrongThreadCloses().get(0).threadName);
-      assertFalse(record.closed(), "owner stack has not unwound yet");
-    } finally {
-      inner.close();
-      innerSpan.finish();
-      outerSpan.finish();
+
+    @Test
+    void eventsAfterStopAreRejected() {
+        tracer = CoreTracer.builder()
+                .writer(new ListWriter())
+                .strictTraceWrites(false)
+                .build();
+
+        ScopeDiagnostics.startRecording();
+        AgentSpan span = tracer.startSpan("test", "op");
+        ContextContinuation continuation = tracer.capture(span);
+
+        ScopeDiagnostics.stop();
+        continuation.release();
+        ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+
+        assertEquals(1, report.leakCount(), "the resolution happened outside the recording window");
+        span.finish();
+    }
+
+    @Test
+    void resumeAfterRootWriteIsRecorded() {
+        tracer = CoreTracer.builder()
+                .writer(new ListWriter())
+                .strictTraceWrites(false)
+                .build();
+        ScopeDiagnostics.startRecording();
+        AgentSpan span = tracer.startSpan("test", "op");
+        ContextContinuation continuation = tracer.capture(span);
+        try {
+            span.finish();
+            ((PendingTrace) ((DDSpan) span).spanContext().getTraceCollector()).write();
+            assertEquals(0, ScopeDiagnostics.report().lateCount());
+            try (ContextScope ignored = continuation.resume()) {
+                assertEquals(1, ScopeDiagnostics.report().lateCount());
+            }
+            assertEquals(0, ScopeDiagnostics.report().leakCount());
+        } finally {
+            continuation.release();
+        }
+    }
+
+    @Test
+    void resumeAfterReleaseRecordsFailedActivation() {
+        tracer = CoreTracer.builder()
+                .writer(new ListWriter())
+                .strictTraceWrites(false)
+                .build();
+        ScopeDiagnostics.startRecording();
+        AgentSpan span = tracer.startSpan("test", "op");
+        try {
+            ContextContinuation continuation = tracer.capture(span);
+            continuation.release();
+            assertEquals(0, ScopeDiagnostics.report().activateAfterResolveCount());
+            continuation.resume().close();
+            ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+            assertEquals(1, report.records().size());
+            assertEquals(1, report.records().get(0).failedActivations().size());
+            assertTrue(report.records().get(0).resumes().isEmpty());
+            assertEquals(1, report.activateAfterResolveCount());
+            assertEquals(0, report.leakCount());
+        } finally {
+            span.finish();
+        }
     }
-    assertEquals(0, ScopeDiagnostics.report().neverClosedScopeCount());
-    assertEquals(1, ScopeDiagnostics.report().closeWrongThreadCount());
-  }
-
-  private static ScopeRecord continuationScope(ScopeDiagnosticsReport report) {
-    List<ScopeRecord> scopes = report.scopeRecords();
-    for (ScopeRecord s : scopes) {
-      if (s.continuationSeq != null) {
-        return s;
-      }
+
+    @Test
+    void outOfOrderScopeCloseIsRecorded() throws Exception {
+        assertMisplacedClose(false);
+    }
+
+    @Test
+    void wrongThreadScopeCloseIsRecorded() throws Exception {
+        assertMisplacedClose(true);
+    }
+
+    private void assertMisplacedClose(boolean anotherThread) throws Exception {
+        tracer = CoreTracer.builder()
+                .writer(new ListWriter())
+                .strictTraceWrites(false)
+                .build();
+        ScopeDiagnostics.startRecording();
+        AgentSpan outerSpan = tracer.startSpan("test", "outer");
+        AgentSpan innerSpan = tracer.startSpan("test", "inner");
+        ContextScope outer = tracer.activateSpan(outerSpan);
+        ContextScope inner = tracer.activateSpan(innerSpan);
+        try {
+            assertEquals(0, ScopeDiagnostics.report().closeWrongThreadCount());
+            String closingThread = Thread.currentThread().getName();
+            if (anotherThread) {
+                FutureTask<Void> close = new FutureTask<>(outer::close, null);
+                Thread worker = new Thread(close, "scope-diagnostics-wrong-thread");
+                worker.setDaemon(true);
+                worker.start();
+                close.get(5, TimeUnit.SECONDS);
+                closingThread = worker.getName();
+            } else {
+                outer.close();
+            }
+            ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+            assertEquals(1, report.closeWrongThreadCount());
+            ScopeRecord record = report.scopeRecords().stream()
+                    .filter(scope -> scope.spanId == outerSpan.getSpanId())
+                    .findFirst()
+                    .orElseThrow(() -> new AssertionError("outer scope was not recorded"));
+            assertEquals(1, record.wrongThreadCloses().size());
+            assertEquals(closingThread, record.wrongThreadCloses().get(0).threadName);
+            assertFalse(record.closed(), "owner stack has not unwound yet");
+        } finally {
+            inner.close();
+            innerSpan.finish();
+            outerSpan.finish();
+        }
+        assertEquals(0, ScopeDiagnostics.report().neverClosedScopeCount());
+        assertEquals(1, ScopeDiagnostics.report().closeWrongThreadCount());
+    }
+
+    private static ScopeRecord continuationScope(ScopeDiagnosticsReport report) {
+        List<ScopeRecord> scopes = report.scopeRecords();
+        for (ScopeRecord s : scopes) {
+            if (s.continuationSeq != null) {
+                return s;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsReportTest.java b/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsReportTest.java
index 232a7d18b2e..ed5ce870117 100644
--- a/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsReportTest.java
+++ b/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsReportTest.java
@@ -14,186 +14,184 @@
 
 class ScopeDiagnosticsReportTest {
 
-  private static final StackTraceElement[] STACK = {
-    new StackTraceElement("com.app.Worker", "submit", "Worker.java", 42)
-  };
-
-  private static ScopeEvent event(ScopeEvent.Type type, String thread, long nanos) {
-    return new ScopeEvent(type, thread, nanos, STACK);
-  }
-
-  private static ContinuationRecord record(long seq, DDTraceId trace) {
-    return new ContinuationRecord(
-        seq, trace, 7L, "op", (byte) 0, false, event(ScopeEvent.Type.CAPTURE, "main", 1000));
-  }
-
-  @Test
-  void firstResumeTimingUsesEarliestTimestampRegardlessOfRecordingOrder() {
-    ContinuationRecord r = record(0, DDTraceId.from(10));
-    r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-2", 3000));
-    r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-1", 2000));
-
-    assertEquals(Long.valueOf(1000), r.captureToFirstResumeNanos());
-    assertEquals(Long.valueOf(1000), r.snapshot().captureToFirstResumeNanos());
-  }
-
-  @Test
-  void firstResumeTimingRequiresCaptureAndResume() {
-    ContinuationRecord captured = record(0, DDTraceId.from(10));
-    assertNull(captured.captureToFirstResumeNanos());
-
-    ContinuationRecord orphan =
-        new ContinuationRecord(1, DDTraceId.from(10), 7L, "op", (byte) 0, true, null);
-    orphan.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-1", 2000));
-    assertNull(orphan.captureToFirstResumeNanos());
-  }
-
-  @Test
-  void resolvedContinuationHasNoFailures() {
-    ContinuationRecord r = record(0, DDTraceId.from(10));
-    r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-1", 2000));
-    r.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_FINISH, "pool-1", 3000));
-
-    ScopeDiagnosticsReport report = report(list(r), map());
-
-    assertEquals(0, report.leakCount());
-    assertEquals(0, report.lateCount());
-    assertEquals(0, report.doubleCount());
-    assertEquals(ContinuationStatus.FINISHED, r.status());
-    assertTrue(r.threadHandoff());
-    assertFalse(report.hasProblems());
-  }
-
-  @Test
-  void neverResolvedIsFlaggedAsLeak() {
-    ContinuationRecord r = record(0, DDTraceId.from(11));
-
-    ScopeDiagnosticsReport report = report(list(r), map());
-
-    assertEquals(1, report.leakCount());
-    assertEquals(ContinuationStatus.LEAKED, r.status());
-    assertTrue(report.hasProblems());
-    assertTrue(report.renderSummary().contains("LEAKED"));
-    assertTrue(report.renderSummary().contains("Worker.java:42"));
-  }
-
-  @Test
-  void resolutionAfterRootWriteIsFlaggedLate() {
-    DDTraceId trace = DDTraceId.from(12);
-    ContinuationRecord r = record(0, trace);
-    r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-1", 5000));
-    r.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_FINISH, "pool-1", 6000));
-
-    Map<DDTraceId, Long> rootWritten = map();
-    rootWritten.put(trace, 4000L);
-
-    ScopeDiagnosticsReport report = report(list(r), rootWritten);
-
-    assertEquals(1, report.lateCount());
-    assertEquals(0, report.leakCount());
-  }
-
-  @Test
-  void lateFinishDoesNotFail() {
-    DDTraceId trace = DDTraceId.from(120);
-    ContinuationRecord r = record(0, trace);
-    r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-1", 5000));
-    r.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_FINISH, "pool-1", 6000));
-    Map<DDTraceId, Long> rootWritten = map();
-    rootWritten.put(trace, 4000L);
-
-    ScopeDiagnosticsReport report = report(list(r), rootWritten);
-
-    assertEquals(1, report.lateCount());
-    assertFalse(report.hasProblems());
-  }
-
-  @Test
-  void multipleResolutionsAreFlaggedDouble() {
-    ContinuationRecord r = record(0, DDTraceId.from(13));
-    r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-1", 2000));
-    r.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_FINISH, "pool-1", 3000));
-    r.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_FINISH, "pool-1", 3500));
-
-    ScopeDiagnosticsReport report = report(list(r), map());
-
-    assertEquals(1, report.doubleCount());
-    assertTrue(report.hasProblems());
-  }
-
-  @Test
-  void successfulResumeAfterCleanupEntryIsNotActivationAfterResolve() {
-    ContinuationRecord r = record(0, DDTraceId.from(14));
-    r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-1", 1500));
-    r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-2", 3000));
-    r.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_FINISH, "pool-1", 2000));
-
-    ScopeDiagnosticsReport report = report(list(r), map());
-
-    assertEquals(2, report.records().get(0).resumes().size());
-    assertEquals(ContinuationStatus.FINISHED, report.records().get(0).status());
-    assertEquals(0, report.activateAfterResolveCount());
-    assertEquals(0, report.doubleCount());
-    assertFalse(report.hasProblems());
-  }
-
-  @Test
-  void failedActivationIsActivateAfterResolve() {
-    ContinuationRecord r = record(0, DDTraceId.from(141));
-    r.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_RELEASE, "pool-1", 2000));
-    r.addFailedActivation(event(ScopeEvent.Type.ACTIVATE_FAILED, "pool-2", 3000));
-
-    ScopeDiagnosticsReport report = report(list(r), map());
-
-    assertEquals(1, report.activateAfterResolveCount());
-    assertTrue(report.hasProblems());
-  }
-
-  @Test
-  void timelineRendersResolvedContinuationEvenWithoutProblems() {
-    ContinuationRecord r = record(0, DDTraceId.from(30));
-    r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-1", 2000));
-    r.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_FINISH, "pool-1", 3000));
-
-    ScopeDiagnosticsReport report = report(list(r), map());
-
-    assertFalse(report.hasProblems());
-    assertTrue(report.renderSummary().contains("(none)"));
-
-    String timeline = report.renderTimeline();
-    assertTrue(timeline.contains("#0 FINISHED"));
-    assertTrue(timeline.contains("capture"));
-    assertTrue(timeline.contains("resume"));
-    assertTrue(timeline.contains("finish"));
-    assertTrue(timeline.contains("Worker.java:42"));
-    assertTrue(timeline.contains("@ pool-1"));
-  }
-
-  @Test
-  void reportIsAnImmutableSnapshot() {
-    ContinuationRecord record = record(0, DDTraceId.from(31));
-    ScopeDiagnosticsReport report = report(list(record), map());
-
-    record.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_FINISH, "pool-1", 3000));
-
-    assertEquals(1, report.leakCount());
-    assertEquals(ContinuationStatus.LEAKED, report.records().get(0).status());
-  }
-
-  private static ScopeDiagnosticsReport report(
-      List<ContinuationRecord> records, Map<DDTraceId, Long> rootWritten) {
-    return new ScopeDiagnosticsReport(records, new ArrayList<>(), rootWritten);
-  }
-
-  private static List<ContinuationRecord> list(ContinuationRecord... rs) {
-    List<ContinuationRecord> l = new ArrayList<>();
-    for (ContinuationRecord r : rs) {
-      l.add(r);
-    }
-    return l;
-  }
-
-  private static Map<DDTraceId, Long> map() {
-    return new HashMap<>();
-  }
+    private static final StackTraceElement[] STACK = {
+        new StackTraceElement("com.app.Worker", "submit", "Worker.java", 42)
+    };
+
+    private static ScopeEvent event(ScopeEvent.Type type, String thread, long nanos) {
+        return new ScopeEvent(type, thread, nanos, STACK);
+    }
+
+    private static ContinuationRecord record(long seq, DDTraceId trace) {
+        return new ContinuationRecord(
+                seq, trace, 7L, "op", (byte) 0, false, event(ScopeEvent.Type.CAPTURE, "main", 1000));
+    }
+
+    @Test
+    void firstResumeTimingUsesEarliestTimestampRegardlessOfRecordingOrder() {
+        ContinuationRecord r = record(0, DDTraceId.from(10));
+        r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-2", 3000));
+        r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-1", 2000));
+
+        assertEquals(Long.valueOf(1000), r.captureToFirstResumeNanos());
+        assertEquals(Long.valueOf(1000), r.snapshot().captureToFirstResumeNanos());
+    }
+
+    @Test
+    void firstResumeTimingRequiresCaptureAndResume() {
+        ContinuationRecord captured = record(0, DDTraceId.from(10));
+        assertNull(captured.captureToFirstResumeNanos());
+
+        ContinuationRecord orphan = new ContinuationRecord(1, DDTraceId.from(10), 7L, "op", (byte) 0, true, null);
+        orphan.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-1", 2000));
+        assertNull(orphan.captureToFirstResumeNanos());
+    }
+
+    @Test
+    void resolvedContinuationHasNoFailures() {
+        ContinuationRecord r = record(0, DDTraceId.from(10));
+        r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-1", 2000));
+        r.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_FINISH, "pool-1", 3000));
+
+        ScopeDiagnosticsReport report = report(list(r), map());
+
+        assertEquals(0, report.leakCount());
+        assertEquals(0, report.lateCount());
+        assertEquals(0, report.doubleCount());
+        assertEquals(ContinuationStatus.FINISHED, r.status());
+        assertTrue(r.threadHandoff());
+        assertFalse(report.hasProblems());
+    }
+
+    @Test
+    void neverResolvedIsFlaggedAsLeak() {
+        ContinuationRecord r = record(0, DDTraceId.from(11));
+
+        ScopeDiagnosticsReport report = report(list(r), map());
+
+        assertEquals(1, report.leakCount());
+        assertEquals(ContinuationStatus.LEAKED, r.status());
+        assertTrue(report.hasProblems());
+        assertTrue(report.renderSummary().contains("LEAKED"));
+        assertTrue(report.renderSummary().contains("Worker.java:42"));
+    }
+
+    @Test
+    void resolutionAfterRootWriteIsFlaggedLate() {
+        DDTraceId trace = DDTraceId.from(12);
+        ContinuationRecord r = record(0, trace);
+        r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-1", 5000));
+        r.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_FINISH, "pool-1", 6000));
+
+        Map<DDTraceId, Long> rootWritten = map();
+        rootWritten.put(trace, 4000L);
+
+        ScopeDiagnosticsReport report = report(list(r), rootWritten);
+
+        assertEquals(1, report.lateCount());
+        assertEquals(0, report.leakCount());
+    }
+
+    @Test
+    void lateFinishDoesNotFail() {
+        DDTraceId trace = DDTraceId.from(120);
+        ContinuationRecord r = record(0, trace);
+        r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-1", 5000));
+        r.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_FINISH, "pool-1", 6000));
+        Map<DDTraceId, Long> rootWritten = map();
+        rootWritten.put(trace, 4000L);
+
+        ScopeDiagnosticsReport report = report(list(r), rootWritten);
+
+        assertEquals(1, report.lateCount());
+        assertFalse(report.hasProblems());
+    }
+
+    @Test
+    void multipleResolutionsAreFlaggedDouble() {
+        ContinuationRecord r = record(0, DDTraceId.from(13));
+        r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-1", 2000));
+        r.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_FINISH, "pool-1", 3000));
+        r.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_FINISH, "pool-1", 3500));
+
+        ScopeDiagnosticsReport report = report(list(r), map());
+
+        assertEquals(1, report.doubleCount());
+        assertTrue(report.hasProblems());
+    }
+
+    @Test
+    void successfulResumeAfterCleanupEntryIsNotActivationAfterResolve() {
+        ContinuationRecord r = record(0, DDTraceId.from(14));
+        r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-1", 1500));
+        r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-2", 3000));
+        r.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_FINISH, "pool-1", 2000));
+
+        ScopeDiagnosticsReport report = report(list(r), map());
+
+        assertEquals(2, report.records().get(0).resumes().size());
+        assertEquals(ContinuationStatus.FINISHED, report.records().get(0).status());
+        assertEquals(0, report.activateAfterResolveCount());
+        assertEquals(0, report.doubleCount());
+        assertFalse(report.hasProblems());
+    }
+
+    @Test
+    void failedActivationIsActivateAfterResolve() {
+        ContinuationRecord r = record(0, DDTraceId.from(141));
+        r.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_RELEASE, "pool-1", 2000));
+        r.addFailedActivation(event(ScopeEvent.Type.ACTIVATE_FAILED, "pool-2", 3000));
+
+        ScopeDiagnosticsReport report = report(list(r), map());
+
+        assertEquals(1, report.activateAfterResolveCount());
+        assertTrue(report.hasProblems());
+    }
+
+    @Test
+    void timelineRendersResolvedContinuationEvenWithoutProblems() {
+        ContinuationRecord r = record(0, DDTraceId.from(30));
+        r.addResume(event(ScopeEvent.Type.ACTIVATE, "pool-1", 2000));
+        r.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_FINISH, "pool-1", 3000));
+
+        ScopeDiagnosticsReport report = report(list(r), map());
+
+        assertFalse(report.hasProblems());
+        assertTrue(report.renderSummary().contains("(none)"));
+
+        String timeline = report.renderTimeline();
+        assertTrue(timeline.contains("#0 FINISHED"));
+        assertTrue(timeline.contains("capture"));
+        assertTrue(timeline.contains("resume"));
+        assertTrue(timeline.contains("finish"));
+        assertTrue(timeline.contains("Worker.java:42"));
+        assertTrue(timeline.contains("@ pool-1"));
+    }
+
+    @Test
+    void reportIsAnImmutableSnapshot() {
+        ContinuationRecord record = record(0, DDTraceId.from(31));
+        ScopeDiagnosticsReport report = report(list(record), map());
+
+        record.setTerminalOrExtra(event(ScopeEvent.Type.RESOLVE_FINISH, "pool-1", 3000));
+
+        assertEquals(1, report.leakCount());
+        assertEquals(ContinuationStatus.LEAKED, report.records().get(0).status());
+    }
+
+    private static ScopeDiagnosticsReport report(List<ContinuationRecord> records, Map<DDTraceId, Long> rootWritten) {
+        return new ScopeDiagnosticsReport(records, new ArrayList<>(), rootWritten);
+    }
+
+    private static List<ContinuationRecord> list(ContinuationRecord... rs) {
+        List<ContinuationRecord> l = new ArrayList<>();
+        for (ContinuationRecord r : rs) {
+            l.add(r);
+        }
+        return l;
+    }
+
+    private static Map<DDTraceId, Long> map() {
+        return new HashMap<>();
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeRecordTest.java b/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeRecordTest.java
index 5e0b09cb41a..4d78929f1e3 100644
--- a/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeRecordTest.java
+++ b/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeRecordTest.java
@@ -12,117 +12,107 @@
 
 class ScopeRecordTest {
 
-  private static final StackTraceElement[] STACK = {
-    new StackTraceElement("com.app.Worker", "run", "Worker.java", 7)
-  };
-
-  private static ScopeEvent event(ScopeEvent.Type type, String thread, long nanos) {
-    return new ScopeEvent(type, thread, nanos, STACK);
-  }
-
-  private static ScopeRecord scope(long seq, Long continuationSeq, String openThread, long nanos) {
-    return new ScopeRecord(
-        seq,
-        DDTraceId.from(1),
-        9L,
-        "op",
-        (byte) 0,
-        continuationSeq,
-        false,
-        event(ScopeEvent.Type.SCOPE_OPEN, openThread, nanos));
-  }
-
-  private static ScopeDiagnosticsReport report(ScopeRecord... scopes) {
-    List<ScopeRecord> list = new ArrayList<>();
-    for (ScopeRecord s : scopes) {
-      list.add(s);
+    private static final StackTraceElement[] STACK = {new StackTraceElement("com.app.Worker", "run", "Worker.java", 7)};
+
+    private static ScopeEvent event(ScopeEvent.Type type, String thread, long nanos) {
+        return new ScopeEvent(type, thread, nanos, STACK);
+    }
+
+    private static ScopeRecord scope(long seq, Long continuationSeq, String openThread, long nanos) {
+        return new ScopeRecord(
+                seq,
+                DDTraceId.from(1),
+                9L,
+                "op",
+                (byte) 0,
+                continuationSeq,
+                false,
+                event(ScopeEvent.Type.SCOPE_OPEN, openThread, nanos));
+    }
+
+    private static ScopeDiagnosticsReport report(ScopeRecord... scopes) {
+        List<ScopeRecord> list = new ArrayList<>();
+        for (ScopeRecord s : scopes) {
+            list.add(s);
+        }
+        return new ScopeDiagnosticsReport(new ArrayList<>(), list, new HashMap<>());
+    }
+
+    @Test
+    void openAndClosedHasNoFailures() {
+        ScopeRecord s = scope(0, null, "main", 1000);
+        s.setClose(event(ScopeEvent.Type.SCOPE_CLOSE, "main", 3000));
+
+        assertTrue(s.closed());
+        assertEquals(0, s.failures().size());
+        assertFalse(s.threadHandoff());
+        assertEquals(Long.valueOf(2000), s.activeDurationNanos());
+        assertFalse(report(s).hasProblems());
+    }
+
+    @Test
+    void timelineIncludesEveryWrongThreadCloseCallsite() {
+        ScopeRecord s = scope(0, null, "main", 1000);
+        s.addWrongThreadClose(
+                new ScopeEvent(ScopeEvent.Type.SCOPE_CLOSE_WRONG_THREAD, "worker-one", 2000, new StackTraceElement[] {
+                    new StackTraceElement("com.app.First", "close", "First.java", 12)
+                }));
+        s.addWrongThreadClose(
+                new ScopeEvent(ScopeEvent.Type.SCOPE_CLOSE_WRONG_THREAD, "worker-two", 3000, new StackTraceElement[] {
+                    new StackTraceElement("com.app.Second", "close", "Second.java", 34)
+                }));
+        s.setClose(event(ScopeEvent.Type.SCOPE_CLOSE, "main", 4000));
+
+        ScopeDiagnosticsReport report = report(s);
+        assertFalse(report.hasProblems(), "wrong-thread cleanup remains advisory");
+        String timeline = report.renderTimeline();
+        assertTrue(timeline.contains("wrong-thread close"));
+        assertTrue(timeline.contains("@ worker-one  at com.app.First.close(First.java:12)"));
+        assertTrue(timeline.contains("@ worker-two  at com.app.Second.close(Second.java:34)"));
+    }
+
+    @Test
+    void openWithoutCloseIsNeverClosed() {
+        ScopeRecord s = scope(0, null, "main", 1000);
+
+        assertFalse(s.closed());
+        assertTrue(s.failures().contains(Failure.NEVER_CLOSED));
+
+        ScopeDiagnosticsReport report = report(s);
+        assertEquals(1, report.neverClosedScopeCount());
+        assertTrue(report.hasProblems());
+    }
+
+    @Test
+    void deferredCleanupIsNotALeak() {
+        ScopeRecord s = scope(0, null, "main", 1000);
+        s.markDeferredCleanup();
+
+        ScopeDiagnosticsReport report = report(s);
+        assertFalse(s.failures().contains(Failure.NEVER_CLOSED));
+        assertEquals(1, report.deferredCleanupScopeCount());
+        assertEquals(0, report.neverClosedScopeCount());
+        assertFalse(report.hasProblems());
+    }
+
+    @Test
+    void openAndCloseOnDifferentThreadsIsHandoff() {
+        ScopeRecord s = scope(0, null, "main", 1000);
+        s.setClose(event(ScopeEvent.Type.SCOPE_CLOSE, "pool-1", 2000));
+
+        assertTrue(s.threadHandoff());
+    }
+
+    @Test
+    void wrongThreadCloseIsReportedButDoesNotFail() {
+        ScopeRecord s = scope(0, null, "main", 1000);
+        s.setClose(event(ScopeEvent.Type.SCOPE_CLOSE, "main", 2000));
+        s.addWrongThreadClose(event(ScopeEvent.Type.SCOPE_CLOSE_WRONG_THREAD, "pool-2", 1500));
+
+        assertTrue(s.failures().contains(Failure.CLOSE_WRONG_THREAD));
+
+        ScopeDiagnosticsReport report = report(s);
+        assertEquals(1, report.closeWrongThreadCount());
+        assertFalse(report.hasProblems()); // wrong-thread is report-only
     }
-    return new ScopeDiagnosticsReport(new ArrayList<>(), list, new HashMap<>());
-  }
-
-  @Test
-  void openAndClosedHasNoFailures() {
-    ScopeRecord s = scope(0, null, "main", 1000);
-    s.setClose(event(ScopeEvent.Type.SCOPE_CLOSE, "main", 3000));
-
-    assertTrue(s.closed());
-    assertEquals(0, s.failures().size());
-    assertFalse(s.threadHandoff());
-    assertEquals(Long.valueOf(2000), s.activeDurationNanos());
-    assertFalse(report(s).hasProblems());
-  }
-
-  @Test
-  void timelineIncludesEveryWrongThreadCloseCallsite() {
-    ScopeRecord s = scope(0, null, "main", 1000);
-    s.addWrongThreadClose(
-        new ScopeEvent(
-            ScopeEvent.Type.SCOPE_CLOSE_WRONG_THREAD,
-            "worker-one",
-            2000,
-            new StackTraceElement[] {
-              new StackTraceElement("com.app.First", "close", "First.java", 12)
-            }));
-    s.addWrongThreadClose(
-        new ScopeEvent(
-            ScopeEvent.Type.SCOPE_CLOSE_WRONG_THREAD,
-            "worker-two",
-            3000,
-            new StackTraceElement[] {
-              new StackTraceElement("com.app.Second", "close", "Second.java", 34)
-            }));
-    s.setClose(event(ScopeEvent.Type.SCOPE_CLOSE, "main", 4000));
-
-    ScopeDiagnosticsReport report = report(s);
-    assertFalse(report.hasProblems(), "wrong-thread cleanup remains advisory");
-    String timeline = report.renderTimeline();
-    assertTrue(timeline.contains("wrong-thread close"));
-    assertTrue(timeline.contains("@ worker-one  at com.app.First.close(First.java:12)"));
-    assertTrue(timeline.contains("@ worker-two  at com.app.Second.close(Second.java:34)"));
-  }
-
-  @Test
-  void openWithoutCloseIsNeverClosed() {
-    ScopeRecord s = scope(0, null, "main", 1000);
-
-    assertFalse(s.closed());
-    assertTrue(s.failures().contains(Failure.NEVER_CLOSED));
-
-    ScopeDiagnosticsReport report = report(s);
-    assertEquals(1, report.neverClosedScopeCount());
-    assertTrue(report.hasProblems());
-  }
-
-  @Test
-  void deferredCleanupIsNotALeak() {
-    ScopeRecord s = scope(0, null, "main", 1000);
-    s.markDeferredCleanup();
-
-    ScopeDiagnosticsReport report = report(s);
-    assertFalse(s.failures().contains(Failure.NEVER_CLOSED));
-    assertEquals(1, report.deferredCleanupScopeCount());
-    assertEquals(0, report.neverClosedScopeCount());
-    assertFalse(report.hasProblems());
-  }
-
-  @Test
-  void openAndCloseOnDifferentThreadsIsHandoff() {
-    ScopeRecord s = scope(0, null, "main", 1000);
-    s.setClose(event(ScopeEvent.Type.SCOPE_CLOSE, "pool-1", 2000));
-
-    assertTrue(s.threadHandoff());
-  }
-
-  @Test
-  void wrongThreadCloseIsReportedButDoesNotFail() {
-    ScopeRecord s = scope(0, null, "main", 1000);
-    s.setClose(event(ScopeEvent.Type.SCOPE_CLOSE, "main", 2000));
-    s.addWrongThreadClose(event(ScopeEvent.Type.SCOPE_CLOSE_WRONG_THREAD, "pool-2", 1500));
-
-    assertTrue(s.failures().contains(Failure.CLOSE_WRONG_THREAD));
-
-    ScopeDiagnosticsReport report = report(s);
-    assertEquals(1, report.closeWrongThreadCount());
-    assertFalse(report.hasProblems()); // wrong-thread is report-only
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeResolutionTest.java b/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeResolutionTest.java
index 103d503b769..b231f705984 100644
--- a/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeResolutionTest.java
+++ b/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/ScopeResolutionTest.java
@@ -13,177 +13,178 @@
 
 /** Replays advice observations deterministically, including overlapping method invocations. */
 class ScopeResolutionTest {
-  private ContextContinuation continuation;
-
-  @BeforeEach
-  void start() {
-    ScopeDiagnostics.startRecording();
-    continuation = Context.root().capture();
-    ScopeDiagnostics.recordCapture(
-        ScopeDiagnostics.recordingWindow(), continuation, DDTraceId.from(1), 2, "op", (byte) 0);
-  }
-
-  @AfterEach
-  void stop() {
-    ScopeDiagnostics.stop();
-    ScopeDiagnostics.reset();
-  }
-
-  @Test
-  void overlappingReleasesAreReportedEvenWhenBothEnteredBeforeResolution() {
-    Object window = ScopeDiagnostics.recordingWindow();
-    // Both release entries observed zero; both exits observed CANCELLED.
-    ScopeDiagnostics.recordResolve(window, continuation, true, 1, false);
-    ScopeDiagnostics.recordResolve(window, continuation, true, 2, false);
-    assertEquals(1, ScopeDiagnostics.report().doubleCount());
-    assertEquals(0, ScopeDiagnostics.report().leakCount());
-  }
-
-  @Test
-  void probeRetainsOverlappingReleaseAttempts() {
-    ScopeContinuationProbe.ResolveAttempt first = enter("release", 0);
-    ScopeContinuationProbe.ResolveAttempt second = enter("release", 0);
-    ScopeContinuationProbe.onResolveExit(second, CANCELLED);
-    ScopeContinuationProbe.onResolveExit(first, CANCELLED);
-    assertEquals(1, ScopeDiagnostics.report().doubleCount());
-  }
-
-  @Test
-  void nestedReleaseBelongsToTheScopeClose() {
-    ScopeContinuationProbe.ResolveAttempt close = enter("cancelFromContinuedScopeClose", 2);
-    ScopeContinuationProbe.ResolveAttempt release = enter("release", 0);
-    ScopeContinuationProbe.onResolveExit(release, CANCELLED);
-    ScopeContinuationProbe.onResolveExit(close, CANCELLED);
-    assertResolvedOnce();
-    assertEquals(ContinuationStatus.FINISHED, ScopeDiagnostics.report().records().get(0).status());
-  }
-
-  @Test
-  void delayedSuccessfulResumeCallbackAfterCleanupIsNotRejected() {
-    Object window = ScopeDiagnostics.recordingWindow();
-    ScopeContinuationProbe.ResolveAttempt close = enter("cancelFromContinuedScopeClose", 1);
-    ScopeContinuationProbe.onResolveExit(close, CANCELLED);
-    long cleanupEntryNanos = ScopeDiagnostics.report().records().get(0).terminal().nanos;
-
-    // The resume succeeded during cleanup, but its exit callback arrives after cleanup's callback.
-    ScopeDiagnostics.recordActivate(
-        window, continuation, DDTraceId.from(1), 2, "op", (byte) 0, cleanupEntryNanos + 1);
-
-    ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-    assertEquals(1, report.records().get(0).resumes().size());
-    assertEquals(ContinuationStatus.FINISHED, report.records().get(0).status());
-    assertEquals(0, report.activateAfterResolveCount());
-    assertResolvedOnce();
-  }
-
-  @Test
-  void overlappingLegitimateScopeClosesResolveOnce() {
-    Object window = ScopeDiagnostics.recordingWindow();
-    // Separate resumed scopes may both observe CANCELLED by the time their exit advice runs.
-    ScopeDiagnostics.recordResolve(window, continuation, false, 1, false);
-    ScopeDiagnostics.recordResolve(window, continuation, false, 2, false);
-    assertResolvedOnce();
-  }
-
-  @Test
-  void holdReleaseAndLastScopeCloseCanReportInEitherOrder() {
-    Object window = ScopeDiagnostics.recordingWindow();
-    ScopeDiagnostics.recordResolve(window, continuation, true, 1, false);
-    ScopeDiagnostics.recordResolve(window, continuation, false, 2, false);
-    assertResolvedOnce();
-
-    ScopeDiagnostics.reset();
-    start();
-    window = ScopeDiagnostics.recordingWindow();
-    ScopeDiagnostics.recordResolve(window, continuation, false, 2, false);
-    ScopeDiagnostics.recordResolve(window, continuation, true, 1, false);
-    assertResolvedOnce();
-  }
-
-  @Test
-  void scopeCloseDuringNestedReleaseDoesNotProduceADuplicate() {
-    ScopeContinuationProbe.ResolveAttempt close = enter("cancelFromContinuedScopeClose", 2);
-    ScopeContinuationProbe.ResolveAttempt release = enter("release", 0);
-    // Another scope's exit advice arrives before the nested release's exit advice.
-    ScopeDiagnostics.recordResolve(
-        ScopeDiagnostics.recordingWindow(), continuation, false, System.nanoTime(), false);
-    ScopeContinuationProbe.onResolveExit(release, CANCELLED);
-    ScopeContinuationProbe.onResolveExit(close, CANCELLED);
-    assertResolvedOnce();
-  }
-
-  @Test
-  void resolutionEnteredInAnOldWindowCannotResolveANewCapture() {
-    ScopeContinuationProbe.ResolveAttempt release = enter("release", 0);
-    ScopeDiagnostics.reset();
-    start();
-    ScopeContinuationProbe.onResolveExit(release, CANCELLED);
-    assertEquals(1, ScopeDiagnostics.report().leakCount());
-    ScopeContinuationProbe.onResolveExit(enter("release", 0), CANCELLED);
-    assertResolvedOnce();
-  }
-
-  @Test
-  void duplicateScopeClosesWithBothExitsBelowSentinelAreNotReportedAsLeaked() {
-    ScopeContinuationProbe.ResolveAttempt first = enter("cancelFromContinuedScopeClose", 1);
-    ScopeContinuationProbe.ResolveAttempt second = enter("cancelFromContinuedScopeClose", 1);
-    ScopeContinuationProbe.onResolveExit(second, CANCELLED - 1);
-    ScopeContinuationProbe.onResolveExit(first, CANCELLED - 1);
-    assertDuplicateWithoutLeak();
-  }
-
-  @Test
-  void duplicateScopeCloseAfterSuccessfulCloseIsReported() {
-    ScopeContinuationProbe.ResolveAttempt first = enter("cancelFromContinuedScopeClose", 1);
-    ScopeContinuationProbe.ResolveAttempt second = enter("cancelFromContinuedScopeClose", 1);
-    ScopeContinuationProbe.onResolveExit(second, CANCELLED);
-    ScopeContinuationProbe.onResolveExit(first, CANCELLED - 1);
-    assertDuplicateWithoutLeak();
-  }
-
-  @Test
-  void underflowBeforeSuccessfulCloseAdviceIsAlreadyDuplicateEvidence() {
-    ScopeContinuationProbe.ResolveAttempt first = enter("cancelFromContinuedScopeClose", 1);
-    ScopeContinuationProbe.ResolveAttempt second = enter("cancelFromContinuedScopeClose", 1);
-    ScopeContinuationProbe.onResolveExit(second, CANCELLED - 1);
-    try {
-      assertDuplicateWithoutLeak();
-    } finally {
-      // The successful close sampled CANCELLED, but its recorder callback was delayed.
-      ScopeContinuationProbe.onResolveExit(first, CANCELLED);
-    }
-    assertDuplicateWithoutLeak();
-  }
-
-  @Test
-  void furtherCloseAfterCounterUnderflowRemainsAReportedDuplicate() {
-    ScopeContinuationProbe.onResolveExit(enter("cancelFromContinuedScopeClose", 1), CANCELLED);
-    ScopeContinuationProbe.onResolveExit(
-        enter("cancelFromContinuedScopeClose", CANCELLED - 1), CANCELLED - 2);
-    assertDuplicateWithoutLeak();
-  }
-
-  @Test
-  void legitimateScopeClosesObservingTheSameTerminalStateAreNotDuplicates() {
-    ScopeContinuationProbe.ResolveAttempt first = enter("cancelFromContinuedScopeClose", 2);
-    ScopeContinuationProbe.ResolveAttempt second = enter("cancelFromContinuedScopeClose", 1);
-    ScopeContinuationProbe.onResolveExit(second, CANCELLED);
-    ScopeContinuationProbe.onResolveExit(first, CANCELLED);
-    assertResolvedOnce();
-  }
-
-  private ScopeContinuationProbe.ResolveAttempt enter(String method, int count) {
-    return ScopeContinuationProbe.onResolveEnter(continuation, method, count);
-  }
-
-  private void assertDuplicateWithoutLeak() {
-    ScopeDiagnosticsReport report = ScopeDiagnostics.report();
-    assertEquals(0, report.leakCount());
-    assertEquals(1, report.doubleCount());
-  }
-
-  private void assertResolvedOnce() {
-    assertEquals(0, ScopeDiagnostics.report().leakCount());
-    assertFalse(ScopeDiagnostics.report().hasProblems());
-  }
+    private ContextContinuation continuation;
+
+    @BeforeEach
+    void start() {
+        ScopeDiagnostics.startRecording();
+        continuation = Context.root().capture();
+        ScopeDiagnostics.recordCapture(
+                ScopeDiagnostics.recordingWindow(), continuation, DDTraceId.from(1), 2, "op", (byte) 0);
+    }
+
+    @AfterEach
+    void stop() {
+        ScopeDiagnostics.stop();
+        ScopeDiagnostics.reset();
+    }
+
+    @Test
+    void overlappingReleasesAreReportedEvenWhenBothEnteredBeforeResolution() {
+        Object window = ScopeDiagnostics.recordingWindow();
+        // Both release entries observed zero; both exits observed CANCELLED.
+        ScopeDiagnostics.recordResolve(window, continuation, true, 1, false);
+        ScopeDiagnostics.recordResolve(window, continuation, true, 2, false);
+        assertEquals(1, ScopeDiagnostics.report().doubleCount());
+        assertEquals(0, ScopeDiagnostics.report().leakCount());
+    }
+
+    @Test
+    void probeRetainsOverlappingReleaseAttempts() {
+        ScopeContinuationProbe.ResolveAttempt first = enter("release", 0);
+        ScopeContinuationProbe.ResolveAttempt second = enter("release", 0);
+        ScopeContinuationProbe.onResolveExit(second, CANCELLED);
+        ScopeContinuationProbe.onResolveExit(first, CANCELLED);
+        assertEquals(1, ScopeDiagnostics.report().doubleCount());
+    }
+
+    @Test
+    void nestedReleaseBelongsToTheScopeClose() {
+        ScopeContinuationProbe.ResolveAttempt close = enter("cancelFromContinuedScopeClose", 2);
+        ScopeContinuationProbe.ResolveAttempt release = enter("release", 0);
+        ScopeContinuationProbe.onResolveExit(release, CANCELLED);
+        ScopeContinuationProbe.onResolveExit(close, CANCELLED);
+        assertResolvedOnce();
+        assertEquals(
+                ContinuationStatus.FINISHED,
+                ScopeDiagnostics.report().records().get(0).status());
+    }
+
+    @Test
+    void delayedSuccessfulResumeCallbackAfterCleanupIsNotRejected() {
+        Object window = ScopeDiagnostics.recordingWindow();
+        ScopeContinuationProbe.ResolveAttempt close = enter("cancelFromContinuedScopeClose", 1);
+        ScopeContinuationProbe.onResolveExit(close, CANCELLED);
+        long cleanupEntryNanos = ScopeDiagnostics.report().records().get(0).terminal().nanos;
+
+        // The resume succeeded during cleanup, but its exit callback arrives after cleanup's callback.
+        ScopeDiagnostics.recordActivate(
+                window, continuation, DDTraceId.from(1), 2, "op", (byte) 0, cleanupEntryNanos + 1);
+
+        ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+        assertEquals(1, report.records().get(0).resumes().size());
+        assertEquals(ContinuationStatus.FINISHED, report.records().get(0).status());
+        assertEquals(0, report.activateAfterResolveCount());
+        assertResolvedOnce();
+    }
+
+    @Test
+    void overlappingLegitimateScopeClosesResolveOnce() {
+        Object window = ScopeDiagnostics.recordingWindow();
+        // Separate resumed scopes may both observe CANCELLED by the time their exit advice runs.
+        ScopeDiagnostics.recordResolve(window, continuation, false, 1, false);
+        ScopeDiagnostics.recordResolve(window, continuation, false, 2, false);
+        assertResolvedOnce();
+    }
+
+    @Test
+    void holdReleaseAndLastScopeCloseCanReportInEitherOrder() {
+        Object window = ScopeDiagnostics.recordingWindow();
+        ScopeDiagnostics.recordResolve(window, continuation, true, 1, false);
+        ScopeDiagnostics.recordResolve(window, continuation, false, 2, false);
+        assertResolvedOnce();
+
+        ScopeDiagnostics.reset();
+        start();
+        window = ScopeDiagnostics.recordingWindow();
+        ScopeDiagnostics.recordResolve(window, continuation, false, 2, false);
+        ScopeDiagnostics.recordResolve(window, continuation, true, 1, false);
+        assertResolvedOnce();
+    }
+
+    @Test
+    void scopeCloseDuringNestedReleaseDoesNotProduceADuplicate() {
+        ScopeContinuationProbe.ResolveAttempt close = enter("cancelFromContinuedScopeClose", 2);
+        ScopeContinuationProbe.ResolveAttempt release = enter("release", 0);
+        // Another scope's exit advice arrives before the nested release's exit advice.
+        ScopeDiagnostics.recordResolve(
+                ScopeDiagnostics.recordingWindow(), continuation, false, System.nanoTime(), false);
+        ScopeContinuationProbe.onResolveExit(release, CANCELLED);
+        ScopeContinuationProbe.onResolveExit(close, CANCELLED);
+        assertResolvedOnce();
+    }
+
+    @Test
+    void resolutionEnteredInAnOldWindowCannotResolveANewCapture() {
+        ScopeContinuationProbe.ResolveAttempt release = enter("release", 0);
+        ScopeDiagnostics.reset();
+        start();
+        ScopeContinuationProbe.onResolveExit(release, CANCELLED);
+        assertEquals(1, ScopeDiagnostics.report().leakCount());
+        ScopeContinuationProbe.onResolveExit(enter("release", 0), CANCELLED);
+        assertResolvedOnce();
+    }
+
+    @Test
+    void duplicateScopeClosesWithBothExitsBelowSentinelAreNotReportedAsLeaked() {
+        ScopeContinuationProbe.ResolveAttempt first = enter("cancelFromContinuedScopeClose", 1);
+        ScopeContinuationProbe.ResolveAttempt second = enter("cancelFromContinuedScopeClose", 1);
+        ScopeContinuationProbe.onResolveExit(second, CANCELLED - 1);
+        ScopeContinuationProbe.onResolveExit(first, CANCELLED - 1);
+        assertDuplicateWithoutLeak();
+    }
+
+    @Test
+    void duplicateScopeCloseAfterSuccessfulCloseIsReported() {
+        ScopeContinuationProbe.ResolveAttempt first = enter("cancelFromContinuedScopeClose", 1);
+        ScopeContinuationProbe.ResolveAttempt second = enter("cancelFromContinuedScopeClose", 1);
+        ScopeContinuationProbe.onResolveExit(second, CANCELLED);
+        ScopeContinuationProbe.onResolveExit(first, CANCELLED - 1);
+        assertDuplicateWithoutLeak();
+    }
+
+    @Test
+    void underflowBeforeSuccessfulCloseAdviceIsAlreadyDuplicateEvidence() {
+        ScopeContinuationProbe.ResolveAttempt first = enter("cancelFromContinuedScopeClose", 1);
+        ScopeContinuationProbe.ResolveAttempt second = enter("cancelFromContinuedScopeClose", 1);
+        ScopeContinuationProbe.onResolveExit(second, CANCELLED - 1);
+        try {
+            assertDuplicateWithoutLeak();
+        } finally {
+            // The successful close sampled CANCELLED, but its recorder callback was delayed.
+            ScopeContinuationProbe.onResolveExit(first, CANCELLED);
+        }
+        assertDuplicateWithoutLeak();
+    }
+
+    @Test
+    void furtherCloseAfterCounterUnderflowRemainsAReportedDuplicate() {
+        ScopeContinuationProbe.onResolveExit(enter("cancelFromContinuedScopeClose", 1), CANCELLED);
+        ScopeContinuationProbe.onResolveExit(enter("cancelFromContinuedScopeClose", CANCELLED - 1), CANCELLED - 2);
+        assertDuplicateWithoutLeak();
+    }
+
+    @Test
+    void legitimateScopeClosesObservingTheSameTerminalStateAreNotDuplicates() {
+        ScopeContinuationProbe.ResolveAttempt first = enter("cancelFromContinuedScopeClose", 2);
+        ScopeContinuationProbe.ResolveAttempt second = enter("cancelFromContinuedScopeClose", 1);
+        ScopeContinuationProbe.onResolveExit(second, CANCELLED);
+        ScopeContinuationProbe.onResolveExit(first, CANCELLED);
+        assertResolvedOnce();
+    }
+
+    private ScopeContinuationProbe.ResolveAttempt enter(String method, int count) {
+        return ScopeContinuationProbe.onResolveEnter(continuation, method, count);
+    }
+
+    private void assertDuplicateWithoutLeak() {
+        ScopeDiagnosticsReport report = ScopeDiagnostics.report();
+        assertEquals(0, report.leakCount());
+        assertEquals(1, report.doubleCount());
+    }
+
+    private void assertResolvedOnce() {
+        assertEquals(0, ScopeDiagnostics.report().leakCount());
+        assertFalse(ScopeDiagnostics.report().hasProblems());
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/StackFilterTest.java b/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/StackFilterTest.java
index ecb93f7a53c..a887b347fc5 100644
--- a/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/StackFilterTest.java
+++ b/dd-java-agent/instrumentation-testing/src/test/java/datadog/trace/agent/test/scopediag/StackFilterTest.java
@@ -8,84 +8,81 @@
 
 class StackFilterTest {
 
-  private static StackTraceElement frame(String cls, String method) {
-    return new StackTraceElement(cls, method, "Src.java", 1);
-  }
+    private static StackTraceElement frame(String cls, String method) {
+        return new StackTraceElement(cls, method, "Src.java", 1);
+    }
 
-  @Test
-  void dropsPlumbingAndKeepsAppFrames() {
-    StackTraceElement[] raw = {
-      frame("java.lang.Thread", "getStackTrace"),
-      frame("datadog.trace.agent.test.scopediag.ScopeDiagnostics", "event"),
-      frame("datadog.trace.core.scopemanager.ScopeContinuation", "register"),
-      frame("java.util.concurrent.ThreadPoolExecutor", "execute"),
-      frame("com.app.Service", "doWork"),
-      frame("com.app.Main", "main"),
-    };
+    @Test
+    void dropsPlumbingAndKeepsAppFrames() {
+        StackTraceElement[] raw = {
+            frame("java.lang.Thread", "getStackTrace"),
+            frame("datadog.trace.agent.test.scopediag.ScopeDiagnostics", "event"),
+            frame("datadog.trace.core.scopemanager.ScopeContinuation", "register"),
+            frame("java.util.concurrent.ThreadPoolExecutor", "execute"),
+            frame("com.app.Service", "doWork"),
+            frame("com.app.Main", "main"),
+        };
 
-    StackTraceElement[] filtered = new StackFilter(6).filter(raw);
+        StackTraceElement[] filtered = new StackFilter(6).filter(raw);
 
-    assertEquals(2, filtered.length);
-    assertEquals("com.app.Service", filtered[0].getClassName());
-    assertEquals("com.app.Main", filtered[1].getClassName());
-  }
+        assertEquals(2, filtered.length);
+        assertEquals("com.app.Service", filtered[0].getClassName());
+        assertEquals("com.app.Main", filtered[1].getClassName());
+    }
 
-  @Test
-  void matchesPlumbingClassesAndNestedClassesButNotNamePrefixes() {
-    String[] plumbingClasses = {
-      "datadog.trace.bootstrap.InstrumentationContext",
-      "java.util.concurrent.ThreadPoolExecutor",
-      "java.util.concurrent.ScheduledThreadPoolExecutor",
-      "java.util.concurrent.ForkJoinPool",
-      "java.util.concurrent.ForkJoinWorkerThread",
-      "java.util.concurrent.FutureTask",
-      "java.util.concurrent.CompletableFuture",
-    };
-    for (String className : plumbingClasses) {
-      StackTraceElement unrelated = frame(className + "Holder", "run");
-      StackTraceElement unrelatedNested = frame(className + "Holder$Worker", "run");
-      StackTraceElement[] raw = {
-        frame(className, "run"), frame(className + "$Worker", "run"), unrelated, unrelatedNested,
-      };
+    @Test
+    void matchesPlumbingClassesAndNestedClassesButNotNamePrefixes() {
+        String[] plumbingClasses = {
+            "datadog.trace.bootstrap.InstrumentationContext",
+            "java.util.concurrent.ThreadPoolExecutor",
+            "java.util.concurrent.ScheduledThreadPoolExecutor",
+            "java.util.concurrent.ForkJoinPool",
+            "java.util.concurrent.ForkJoinWorkerThread",
+            "java.util.concurrent.FutureTask",
+            "java.util.concurrent.CompletableFuture",
+        };
+        for (String className : plumbingClasses) {
+            StackTraceElement unrelated = frame(className + "Holder", "run");
+            StackTraceElement unrelatedNested = frame(className + "Holder$Worker", "run");
+            StackTraceElement[] raw = {
+                frame(className, "run"), frame(className + "$Worker", "run"), unrelated, unrelatedNested,
+            };
 
-      assertArrayEquals(
-          new StackTraceElement[] {unrelated, unrelatedNested},
-          new StackFilter(6).filter(raw),
-          className);
+            assertArrayEquals(
+                    new StackTraceElement[] {unrelated, unrelatedNested}, new StackFilter(6).filter(raw), className);
+        }
     }
-  }
 
-  @Test
-  void matchesStackCaptureMethodExactly() {
-    StackTraceElement otherMethod = frame("java.lang.Thread", "getStackTraceHelper");
-    StackTraceElement otherClass = frame("java.lang.ThreadHelper", "getStackTrace");
-    StackTraceElement[] raw = {
-      frame("java.lang.Thread", "getStackTrace"), otherMethod, otherClass,
-    };
+    @Test
+    void matchesStackCaptureMethodExactly() {
+        StackTraceElement otherMethod = frame("java.lang.Thread", "getStackTraceHelper");
+        StackTraceElement otherClass = frame("java.lang.ThreadHelper", "getStackTrace");
+        StackTraceElement[] raw = {
+            frame("java.lang.Thread", "getStackTrace"), otherMethod, otherClass,
+        };
 
-    assertArrayEquals(
-        new StackTraceElement[] {otherMethod, otherClass}, new StackFilter(6).filter(raw));
-  }
+        assertArrayEquals(new StackTraceElement[] {otherMethod, otherClass}, new StackFilter(6).filter(raw));
+    }
 
-  @Test
-  void respectsMaxFrames() {
-    StackTraceElement[] raw = {
-      frame("com.app.A", "a"), frame("com.app.B", "b"), frame("com.app.C", "c"),
-    };
+    @Test
+    void respectsMaxFrames() {
+        StackTraceElement[] raw = {
+            frame("com.app.A", "a"), frame("com.app.B", "b"), frame("com.app.C", "c"),
+        };
 
-    assertEquals(2, new StackFilter(2).filter(raw).length);
-  }
+        assertEquals(2, new StackFilter(2).filter(raw).length);
+    }
 
-  @Test
-  void handlesNullStack() {
-    assertEquals(0, new StackFilter(6).filter(null).length);
-  }
+    @Test
+    void handlesNullStack() {
+        assertEquals(0, new StackFilter(6).filter(null).length);
+    }
 
-  @Test
-  void keepsScopeManagerFreeStacks() {
-    StackTraceElement[] raw = {frame("com.app.Only", "here")};
-    StackTraceElement[] filtered = new StackFilter(6).filter(raw);
-    assertEquals(1, filtered.length);
-    assertTrue(filtered[0].getClassName().startsWith("com.app"));
-  }
+    @Test
+    void keepsScopeManagerFreeStacks() {
+        StackTraceElement[] raw = {frame("com.app.Only", "here")};
+        StackTraceElement[] filtered = new StackFilter(6).filter(raw);
+        assertEquals(1, filtered.length);
+        assertTrue(filtered[0].getClassName().startsWith("com.app"));
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/test/java/excludefilter/ExcludeFilterTestInstrumentation.java b/dd-java-agent/instrumentation-testing/src/test/java/excludefilter/ExcludeFilterTestInstrumentation.java
index f4e02247616..fa9fc9125ec 100644
--- a/dd-java-agent/instrumentation-testing/src/test/java/excludefilter/ExcludeFilterTestInstrumentation.java
+++ b/dd-java-agent/instrumentation-testing/src/test/java/excludefilter/ExcludeFilterTestInstrumentation.java
@@ -15,76 +15,73 @@
 import java.util.concurrent.Executor;
 
 @AutoService(InstrumenterModule.class)
-public class ExcludeFilterTestInstrumentation extends InstrumenterModule.Tracing
-    implements ExcludeFilterProvider {
-
-  public ExcludeFilterTestInstrumentation() {
-    super("excludefilter-test");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>();
-    contextStores.put(Runnable.class.getName(), Object.class.getName());
-    contextStores.put(Executor.class.getName(), Object.class.getName());
-    return contextStores;
-  }
-
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    EnumMap<ExcludeFilter.ExcludeType, Collection<String>> excludedTypes =
-        new EnumMap<>(ExcludeFilter.ExcludeType.class);
-    String prefix = getClass().getName() + "$";
-    excludedTypes.put(
-        RUNNABLE, Arrays.asList(prefix + "ExcludedRunnable", prefix + "ExecutorExcludedRunnable"));
-    excludedTypes.put(
-        EXECUTOR, Arrays.asList(prefix + "ExcludedExecutor", prefix + "RunnableExcludedExecutor"));
-    return excludedTypes;
-  }
-
-  public static final class ExcludedRunnable implements Runnable {
-    @Override
-    public void run() {}
-  }
-
-  public static final class NormalRunnable implements Runnable {
-    @Override
-    public void run() {}
-  }
-
-  public static final class ExcludedExecutor implements Executor {
-    @Override
-    public void execute(Runnable command) {}
-  }
-
-  public static final class NormalExecutor implements Executor {
-    @Override
-    public void execute(Runnable command) {}
-  }
-
-  public static final class RunnableExcludedExecutor implements Executor, Runnable {
-    @Override
-    public void execute(Runnable command) {}
-
-    @Override
-    public void run() {}
-  }
-
-  public static final class ExecutorExcludedRunnable implements Executor, Runnable {
-
-    @Override
-    public void run() {}
-
-    @Override
-    public void execute(Runnable command) {}
-  }
+public class ExcludeFilterTestInstrumentation extends InstrumenterModule.Tracing implements ExcludeFilterProvider {
 
-  public static final class ExecutorRunnable implements Executor, Runnable {
+    public ExcludeFilterTestInstrumentation() {
+        super("excludefilter-test");
+    }
 
     @Override
-    public void run() {}
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>();
+        contextStores.put(Runnable.class.getName(), Object.class.getName());
+        contextStores.put(Executor.class.getName(), Object.class.getName());
+        return contextStores;
+    }
 
     @Override
-    public void execute(Runnable command) {}
-  }
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        EnumMap<ExcludeFilter.ExcludeType, Collection<String>> excludedTypes =
+                new EnumMap<>(ExcludeFilter.ExcludeType.class);
+        String prefix = getClass().getName() + "$";
+        excludedTypes.put(RUNNABLE, Arrays.asList(prefix + "ExcludedRunnable", prefix + "ExecutorExcludedRunnable"));
+        excludedTypes.put(EXECUTOR, Arrays.asList(prefix + "ExcludedExecutor", prefix + "RunnableExcludedExecutor"));
+        return excludedTypes;
+    }
+
+    public static final class ExcludedRunnable implements Runnable {
+        @Override
+        public void run() {}
+    }
+
+    public static final class NormalRunnable implements Runnable {
+        @Override
+        public void run() {}
+    }
+
+    public static final class ExcludedExecutor implements Executor {
+        @Override
+        public void execute(Runnable command) {}
+    }
+
+    public static final class NormalExecutor implements Executor {
+        @Override
+        public void execute(Runnable command) {}
+    }
+
+    public static final class RunnableExcludedExecutor implements Executor, Runnable {
+        @Override
+        public void execute(Runnable command) {}
+
+        @Override
+        public void run() {}
+    }
+
+    public static final class ExecutorExcludedRunnable implements Executor, Runnable {
+
+        @Override
+        public void run() {}
+
+        @Override
+        public void execute(Runnable command) {}
+    }
+
+    public static final class ExecutorRunnable implements Executor, Runnable {
+
+        @Override
+        public void run() {}
+
+        @Override
+        public void execute(Runnable command) {}
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/test/java/locator/ClassInjectingTestInstrumentation.java b/dd-java-agent/instrumentation-testing/src/test/java/locator/ClassInjectingTestInstrumentation.java
index 9de4a6138b6..2a010140d47 100644
--- a/dd-java-agent/instrumentation-testing/src/test/java/locator/ClassInjectingTestInstrumentation.java
+++ b/dd-java-agent/instrumentation-testing/src/test/java/locator/ClassInjectingTestInstrumentation.java
@@ -16,50 +16,48 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumenterModule.class)
-public class ClassInjectingTestInstrumentation extends TestInstrumentation
-    implements Instrumenter.WithTypeStructure {
+public class ClassInjectingTestInstrumentation extends TestInstrumentation implements Instrumenter.WithTypeStructure {
 
-  @Override
-  public String instrumentedType() {
-    return getClass().getName() + "$ToBeInstrumented";
-  }
+    @Override
+    public String instrumentedType() {
+        return getClass().getName() + "$ToBeInstrumented";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    // additional constraint which requires loading the InjectedInterface to match
-    return hasInterface(declaresAnnotation(named(getClass().getName() + "$ToBeMatched")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        // additional constraint which requires loading the InjectedInterface to match
+        return hasInterface(declaresAnnotation(named(getClass().getName() + "$ToBeMatched")));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$ConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$ConstructorAdvice");
+    }
 
-  public static class ConstructorAdvice {
-    @Advice.OnMethodEnter
-    public static void appendToMessage(
-        @Advice.Argument(value = 0, readOnly = false) String message) {
-      message = message + ":instrumented";
+    public static class ConstructorAdvice {
+        @Advice.OnMethodEnter
+        public static void appendToMessage(@Advice.Argument(value = 0, readOnly = false) String message) {
+            message = message + ":instrumented";
+        }
     }
-  }
 
-  @Retention(RetentionPolicy.RUNTIME)
-  public @interface ToBeMatched {}
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface ToBeMatched {}
 
-  public static final class ToBeInstrumented {
-    private final String message;
+    public static final class ToBeInstrumented {
+        private final String message;
 
-    public ToBeInstrumented(String message) {
-      this.message = message;
-    }
+        public ToBeInstrumented(String message) {
+            this.message = message;
+        }
 
-    public String getMessage() {
-      StringBuilder msg = new StringBuilder(message);
-      for (Class<?> iface : getClass().getInterfaces()) {
-        msg.append(':');
-        msg.append(iface.getName());
-      }
-      return msg.toString();
+        public String getMessage() {
+            StringBuilder msg = new StringBuilder(message);
+            for (Class<?> iface : getClass().getInterfaces()) {
+                msg.append(':');
+                msg.append(iface.getName());
+            }
+            return msg.toString();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/test/java/locator/ClassInjectingTransformer.java b/dd-java-agent/instrumentation-testing/src/test/java/locator/ClassInjectingTransformer.java
index fa0a1fc50df..1220918c0fb 100644
--- a/dd-java-agent/instrumentation-testing/src/test/java/locator/ClassInjectingTransformer.java
+++ b/dd-java-agent/instrumentation-testing/src/test/java/locator/ClassInjectingTransformer.java
@@ -29,93 +29,81 @@
 
 public class ClassInjectingTransformer implements AgentBuilder.Transformer, AsmVisitorWrapper {
 
-  private static final String BINARY_NAME = "locator/InjectedInterface";
-  public static final String NAME = BINARY_NAME.replace("/", ".");
+    private static final String BINARY_NAME = "locator/InjectedInterface";
+    public static final String NAME = BINARY_NAME.replace("/", ".");
 
-  public static AgentBuilder instrument(AgentBuilder agentBuilder) {
-    return agentBuilder
-        .type(named(ClassInjectingTestInstrumentation.class.getName() + "$ToBeInstrumented"))
-        .transform(new ClassInjectingTransformer());
-  }
+    public static AgentBuilder instrument(AgentBuilder agentBuilder) {
+        return agentBuilder
+                .type(named(ClassInjectingTestInstrumentation.class.getName() + "$ToBeInstrumented"))
+                .transform(new ClassInjectingTransformer());
+    }
 
-  public static void injectInterfaceNamed(String binaryName, ClassLoader classLoader) {
-    MethodHandles.Lookup myLookup = MethodHandles.lookup();
-    try {
-      Method m =
-          ClassLoader.class.getDeclaredMethod(
-              "defineClass",
-              String.class,
-              byte[].class,
-              Integer.TYPE,
-              Integer.TYPE,
-              ProtectionDomain.class);
-      m.setAccessible(true);
-      MethodHandle defineMethod = myLookup.unreflect(m);
-      ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
-      cw.visit(
-          V1_8,
-          ACC_PUBLIC | ACC_INTERFACE | ACC_ABSTRACT,
-          binaryName,
-          null,
-          "java/lang/Object",
-          null);
-      String markerName = ClassInjectingTestInstrumentation.class.getName() + "$ToBeMatched";
-      cw.visitAnnotation("L" + markerName.replace(".", "/") + ";", true).visitEnd();
-      byte[] bytes = cw.toByteArray();
-      defineMethod.invoke(classLoader, binaryName.replace("/", "."), bytes, 0, bytes.length, null);
-    } catch (Throwable e) {
-      e.printStackTrace();
+    public static void injectInterfaceNamed(String binaryName, ClassLoader classLoader) {
+        MethodHandles.Lookup myLookup = MethodHandles.lookup();
+        try {
+            Method m = ClassLoader.class.getDeclaredMethod(
+                    "defineClass", String.class, byte[].class, Integer.TYPE, Integer.TYPE, ProtectionDomain.class);
+            m.setAccessible(true);
+            MethodHandle defineMethod = myLookup.unreflect(m);
+            ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
+            cw.visit(V1_8, ACC_PUBLIC | ACC_INTERFACE | ACC_ABSTRACT, binaryName, null, "java/lang/Object", null);
+            String markerName = ClassInjectingTestInstrumentation.class.getName() + "$ToBeMatched";
+            cw.visitAnnotation("L" + markerName.replace(".", "/") + ";", true).visitEnd();
+            byte[] bytes = cw.toByteArray();
+            defineMethod.invoke(classLoader, binaryName.replace("/", "."), bytes, 0, bytes.length, null);
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
     }
-  }
 
-  @Override
-  public DynamicType.Builder<?> transform(
-      DynamicType.Builder<?> builder,
-      TypeDescription typeDescription,
-      ClassLoader classLoader,
-      JavaModule module,
-      ProtectionDomain pd) {
+    @Override
+    public DynamicType.Builder<?> transform(
+            DynamicType.Builder<?> builder,
+            TypeDescription typeDescription,
+            ClassLoader classLoader,
+            JavaModule module,
+            ProtectionDomain pd) {
 
-    // First we create an interface and define it
-    injectInterfaceNamed(BINARY_NAME, classLoader);
+        // First we create an interface and define it
+        injectInterfaceNamed(BINARY_NAME, classLoader);
 
-    // Then we let the visitor add it to the class
-    return builder.visit(this);
-  }
+        // Then we let the visitor add it to the class
+        return builder.visit(this);
+    }
 
-  @Override
-  public int mergeWriter(int flags) {
-    return flags;
-  }
+    @Override
+    public int mergeWriter(int flags) {
+        return flags;
+    }
 
-  @Override
-  public int mergeReader(int flags) {
-    return flags;
-  }
+    @Override
+    public int mergeReader(int flags) {
+        return flags;
+    }
 
-  @Override
-  public ClassVisitor wrap(
-      TypeDescription instrumentedType,
-      ClassVisitor classVisitor,
-      Implementation.Context implementationContext,
-      TypePool typePool,
-      FieldList<FieldDescription.InDefinedShape> fields,
-      MethodList<?> methods,
-      int writerFlags,
-      int readerFlags) {
-    return new ClassVisitor(Opcodes.ASM7, classVisitor) {
-      @Override
-      public void visit(
-          final int version,
-          final int access,
-          final String name,
-          final String signature,
-          final String superName,
-          final String[] interfaces) {
-        List<String> ifs = interfaces != null ? Arrays.asList(interfaces) : new ArrayList<String>();
-        ifs.add(BINARY_NAME);
-        super.visit(version, access, name, signature, superName, ifs.toArray(new String[0]));
-      }
-    };
-  }
+    @Override
+    public ClassVisitor wrap(
+            TypeDescription instrumentedType,
+            ClassVisitor classVisitor,
+            Implementation.Context implementationContext,
+            TypePool typePool,
+            FieldList<FieldDescription.InDefinedShape> fields,
+            MethodList<?> methods,
+            int writerFlags,
+            int readerFlags) {
+        return new ClassVisitor(Opcodes.ASM7, classVisitor) {
+            @Override
+            public void visit(
+                    final int version,
+                    final int access,
+                    final String name,
+                    final String signature,
+                    final String superName,
+                    final String[] interfaces) {
+                List<String> ifs = interfaces != null ? Arrays.asList(interfaces) : new ArrayList<String>();
+                ifs.add(BINARY_NAME);
+                super.visit(version, access, name, signature, superName, ifs.toArray(new String[0]));
+            }
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation-testing/src/test/java/synthetic/SyntheticTestInstrumentation.java b/dd-java-agent/instrumentation-testing/src/test/java/synthetic/SyntheticTestInstrumentation.java
index 201ab59be68..779173aa68d 100644
--- a/dd-java-agent/instrumentation-testing/src/test/java/synthetic/SyntheticTestInstrumentation.java
+++ b/dd-java-agent/instrumentation-testing/src/test/java/synthetic/SyntheticTestInstrumentation.java
@@ -12,50 +12,50 @@
 
 @AutoService(InstrumenterModule.class)
 public class SyntheticTestInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public SyntheticTestInstrumentation() {
-    super("synthetic-test");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return getClass().getName() + "$WithSynthetic";
-  }
-
-  @Override
-  public ElementMatcher<? super MethodDescription> methodIgnoreMatcher() {
-    if (Boolean.getBoolean("synthetic.test.enabled")) {
-      return none();
-    } else {
-      return super.methodIgnoreMatcher();
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public SyntheticTestInstrumentation() {
+        super("synthetic-test");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return getClass().getName() + "$WithSynthetic";
     }
-  }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(named("access$000"), getClass().getName() + "$AccessAdvice");
-  }
+    @Override
+    public ElementMatcher<? super MethodDescription> methodIgnoreMatcher() {
+        if (Boolean.getBoolean("synthetic.test.enabled")) {
+            return none();
+        } else {
+            return super.methodIgnoreMatcher();
+        }
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("access$000"), getClass().getName() + "$AccessAdvice");
+    }
 
-  public static class Compute {
-    public static Integer result(Integer i) {
-      WithSynthetic p = new WithSynthetic(i);
-      return p.secret + 1;
+    public static class Compute {
+        public static Integer result(Integer i) {
+            WithSynthetic p = new WithSynthetic(i);
+            return p.secret + 1;
+        }
     }
-  }
 
-  private static final class WithSynthetic {
-    private Integer secret;
+    private static final class WithSynthetic {
+        private Integer secret;
 
-    public WithSynthetic(Integer secret) {
-      this.secret = secret;
+        public WithSynthetic(Integer secret) {
+            this.secret = secret;
+        }
     }
-  }
 
-  public static final class AccessAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void exit(@Advice.Return(readOnly = false) Integer i) {
-      i = i * 2;
+    public static final class AccessAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void exit(@Advice.Return(readOnly = false) Integer i) {
+            i = i * 2;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientDecorator.java b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientDecorator.java
index 134fed3a879..595b6023286 100644
--- a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientDecorator.java
+++ b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientDecorator.java
@@ -16,93 +16,92 @@
 import datadog.trace.bootstrap.instrumentation.decorator.DBTypeProcessingDatabaseClientDecorator;
 
 public class AerospikeClientDecorator extends DBTypeProcessingDatabaseClientDecorator<Node> {
-  private static final String DB_TYPE = "aerospike";
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().database().service(DB_TYPE);
-  public static final UTF8BytesString JAVA_AEROSPIKE = UTF8BytesString.create("java-aerospike");
-  public static final UTF8BytesString OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
-
-  public static final AerospikeClientDecorator DECORATE = new AerospikeClientDecorator();
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"aerospike"};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JAVA_AEROSPIKE;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.AEROSPIKE;
-  }
-
-  @Override
-  protected String dbType() {
-    return DB_TYPE;
-  }
-
-  @Override
-  protected String dbUser(final Node node) {
-    return null;
-  }
-
-  @Override
-  protected String dbInstance(final Node node) {
-    return null;
-  }
-
-  @Override
-  protected String dbHostname(final Node node) {
-    return null;
-  }
-
-  public void onConnection(
-      final AgentSpan span, final Node node, final Cluster cluster, final Partition partition) {
-
-    onPeerConnection(span, node.getAddress());
-
-    if (cluster != null && cluster.getUser() != null) {
-      span.setTag(Tags.DB_USER, UTF8BytesString.create(cluster.getUser()));
+    private static final String DB_TYPE = "aerospike";
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().database().service(DB_TYPE);
+    public static final UTF8BytesString JAVA_AEROSPIKE = UTF8BytesString.create("java-aerospike");
+    public static final UTF8BytesString OPERATION_NAME = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
+
+    public static final AerospikeClientDecorator DECORATE = new AerospikeClientDecorator();
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"aerospike"};
     }
 
-    if (partition != null) {
-      String instanceName = partition.toString();
-      final int namespaceEnd = instanceName.indexOf(':');
-      if (namespaceEnd > 0) {
-        instanceName = instanceName.substring(0, namespaceEnd);
-      }
-      span.setTag(Tags.DB_INSTANCE, instanceName);
-      if (Config.get().isDbClientSplitByInstance()) {
-        span.setServiceName(instanceName, DB_CLIENT_SPLIT_BY_INSTANCE);
-      }
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
     }
-  }
-
-  public void withMethod(final AgentSpan span, final String methodName) {
-    span.setResourceName(spanNameForMethod(AerospikeClient.class, methodName));
-  }
-
-  public AgentSpan startAerospikeSpan(final String methodName) {
-    final AgentSpan span = startSpan(JAVA_AEROSPIKE.toString(), OPERATION_NAME);
-    afterStart(span);
-    withMethod(span, methodName);
-    return span;
-  }
-
-  public void finishAerospikeSpan(final AgentSpan span, final Throwable error) {
-    if (error != null) {
-      onError(span, error);
+
+    @Override
+    protected CharSequence component() {
+        return JAVA_AEROSPIKE;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.AEROSPIKE;
+    }
+
+    @Override
+    protected String dbType() {
+        return DB_TYPE;
+    }
+
+    @Override
+    protected String dbUser(final Node node) {
+        return null;
+    }
+
+    @Override
+    protected String dbInstance(final Node node) {
+        return null;
+    }
+
+    @Override
+    protected String dbHostname(final Node node) {
+        return null;
+    }
+
+    public void onConnection(final AgentSpan span, final Node node, final Cluster cluster, final Partition partition) {
+
+        onPeerConnection(span, node.getAddress());
+
+        if (cluster != null && cluster.getUser() != null) {
+            span.setTag(Tags.DB_USER, UTF8BytesString.create(cluster.getUser()));
+        }
+
+        if (partition != null) {
+            String instanceName = partition.toString();
+            final int namespaceEnd = instanceName.indexOf(':');
+            if (namespaceEnd > 0) {
+                instanceName = instanceName.substring(0, namespaceEnd);
+            }
+            span.setTag(Tags.DB_INSTANCE, instanceName);
+            if (Config.get().isDbClientSplitByInstance()) {
+                span.setServiceName(instanceName, DB_CLIENT_SPLIT_BY_INSTANCE);
+            }
+        }
+    }
+
+    public void withMethod(final AgentSpan span, final String methodName) {
+        span.setResourceName(spanNameForMethod(AerospikeClient.class, methodName));
+    }
+
+    public AgentSpan startAerospikeSpan(final String methodName) {
+        final AgentSpan span = startSpan(JAVA_AEROSPIKE.toString(), OPERATION_NAME);
+        afterStart(span);
+        withMethod(span, methodName);
+        return span;
+    }
+
+    public void finishAerospikeSpan(final AgentSpan span, final Throwable error) {
+        if (error != null) {
+            onError(span, error);
+        }
+        beforeFinish(span);
+        span.finish();
     }
-    beforeFinish(span);
-    span.finish();
-  }
 }
diff --git a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientInstrumentation.java b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientInstrumentation.java
index c06a5c7a639..48f820721bb 100644
--- a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientInstrumentation.java
@@ -14,63 +14,56 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
 
-public final class AerospikeClientInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  @Override
-  public String instrumentedType() {
-    return "com.aerospike.client.AerospikeClient";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(takesArgument(0, nameStartsWith("com.aerospike.client.policy"))),
-        getClass().getName() + "$TraceSyncRequestAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(takesArgument(1, nameStartsWith("com.aerospike.client.listener"))),
-        getClass().getName() + "$TraceAsyncRequestAdvice");
-  }
-
-  public static final class TraceSyncRequestAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beginRequest(@Advice.Origin("#m") final String methodName) {
-      AgentSpan clientSpan = DECORATE.startAerospikeSpan(methodName);
-      return activateSpan(clientSpan);
+public final class AerospikeClientInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    @Override
+    public String instrumentedType() {
+        return "com.aerospike.client.AerospikeClient";
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exitRequest(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) {
-      DECORATE.finishAerospikeSpan(spanFromScope(scope), error);
-      scope.close();
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(takesArgument(0, nameStartsWith("com.aerospike.client.policy"))),
+                getClass().getName() + "$TraceSyncRequestAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(takesArgument(1, nameStartsWith("com.aerospike.client.listener"))),
+                getClass().getName() + "$TraceAsyncRequestAdvice");
     }
-  }
 
-  public static final class TraceAsyncRequestAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beginRequest(
-        @Advice.Origin("#m") final String methodName,
-        @Advice.Argument(value = 1, readOnly = false, typing = DYNAMIC) Object listener) {
-      AgentSpan clientSpan = DECORATE.startAerospikeSpan(methodName);
-      ContextScope scope = activateSpan(clientSpan);
-      // always want to wrap even when there's no listener so we get the true async time
-      listener = new TracingListener(clientSpan, clientSpan.captureWithContext(), listener);
-      return scope;
+    public static final class TraceSyncRequestAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beginRequest(@Advice.Origin("#m") final String methodName) {
+            AgentSpan clientSpan = DECORATE.startAerospikeSpan(methodName);
+            return activateSpan(clientSpan);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exitRequest(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) {
+            DECORATE.finishAerospikeSpan(spanFromScope(scope), error);
+            scope.close();
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exitRequest(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) {
-      if (error != null) {
-        DECORATE.finishAerospikeSpan(spanFromScope(scope), error);
-      } else {
-        // span will be finished in the traced listener
-      }
-      scope.close();
+    public static final class TraceAsyncRequestAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beginRequest(
+                @Advice.Origin("#m") final String methodName,
+                @Advice.Argument(value = 1, readOnly = false, typing = DYNAMIC) Object listener) {
+            AgentSpan clientSpan = DECORATE.startAerospikeSpan(methodName);
+            ContextScope scope = activateSpan(clientSpan);
+            // always want to wrap even when there's no listener so we get the true async time
+            listener = new TracingListener(clientSpan, clientSpan.captureWithContext(), listener);
+            return scope;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exitRequest(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) {
+            if (error != null) {
+                DECORATE.finishAerospikeSpan(spanFromScope(scope), error);
+            } else {
+                // span will be finished in the traced listener
+            }
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeModule.java b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeModule.java
index 77799dbba4d..cc405b33e10 100644
--- a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeModule.java
+++ b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeModule.java
@@ -11,19 +11,19 @@
 
 @AutoService(InstrumenterModule.class)
 public final class AerospikeModule extends InstrumenterModule.Tracing {
-  public AerospikeModule() {
-    super("aerospike");
-  }
+    public AerospikeModule() {
+        super("aerospike");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    final List<Instrumenter> ret = new ArrayList<>(4);
-    ret.add(new AerospikeClientInstrumentation());
-    ret.add(new CommandInstrumentation());
-    if (InstrumenterConfig.get().isIntegrationEnabled(singleton("java_concurrent"), true)) {
-      ret.add(new NioEventLoopInstrumentation());
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        final List<Instrumenter> ret = new ArrayList<>(4);
+        ret.add(new AerospikeClientInstrumentation());
+        ret.add(new CommandInstrumentation());
+        if (InstrumenterConfig.get().isIntegrationEnabled(singleton("java_concurrent"), true)) {
+            ret.add(new NioEventLoopInstrumentation());
+        }
+        ret.add(new PartitionInstrumentation());
+        return ret;
     }
-    ret.add(new PartitionInstrumentation());
-    return ret;
-  }
 }
diff --git a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/CommandInstrumentation.java b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/CommandInstrumentation.java
index 7b13dcd01b1..9f442584449 100644
--- a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/CommandInstrumentation.java
+++ b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/CommandInstrumentation.java
@@ -15,35 +15,34 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
 
-public final class CommandInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class CommandInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.aerospike.client.command.Command";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.aerospike.client.command.Command";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("getNode"))
-            .and(takesArgument(0, named("com.aerospike.client.cluster.Cluster")))
-            .and(returns(named("com.aerospike.client.cluster.Node"))),
-        getClass().getName() + "$GetNodeAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("getNode"))
+                        .and(takesArgument(0, named("com.aerospike.client.cluster.Cluster")))
+                        .and(returns(named("com.aerospike.client.cluster.Node"))),
+                getClass().getName() + "$GetNodeAdvice");
+    }
 
-  public static final class GetNodeAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void getNode(
-        @Advice.Return final Node node,
-        @Advice.Argument(0) final Cluster cluster,
-        @Advice.Argument(value = 1, optional = true) final Partition partition) {
-      final AgentSpan span = activeSpan();
-      // capture the connection details in the active Aerospike span
-      if (span != null && DDSpanTypes.AEROSPIKE.equals(span.getSpanType())) {
-        DECORATE.onConnection(span, node, cluster, partition);
-      }
+    public static final class GetNodeAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void getNode(
+                @Advice.Return final Node node,
+                @Advice.Argument(0) final Cluster cluster,
+                @Advice.Argument(value = 1, optional = true) final Partition partition) {
+            final AgentSpan span = activeSpan();
+            // capture the connection details in the active Aerospike span
+            if (span != null && DDSpanTypes.AEROSPIKE.equals(span.getSpanType())) {
+                DECORATE.onConnection(span, node, cluster, partition);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/NioEventLoopInstrumentation.java b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/NioEventLoopInstrumentation.java
index aab3a2de4e2..cd234918a28 100644
--- a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/NioEventLoopInstrumentation.java
+++ b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/NioEventLoopInstrumentation.java
@@ -12,31 +12,27 @@
 import java.util.concurrent.RunnableFuture;
 import net.bytebuddy.asm.Advice;
 
-public final class NioEventLoopInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class NioEventLoopInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.aerospike.client.async.NioEventLoop";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.aerospike.client.async.NioEventLoop";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, Runnable.class)),
-        getClass().getName() + "$WrapAsFutureTaskAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("execute")).and(takesArguments(1)).and(takesArgument(0, Runnable.class)),
+                getClass().getName() + "$WrapAsFutureTaskAdvice");
+    }
 
-  public static final class WrapAsFutureTaskAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enterExecute(@Advice.Argument(value = 0, readOnly = false) Runnable task) {
-      if (task == null || task instanceof RunnableFuture || exclude(RUNNABLE, task)) {
-        return;
-      }
-      task = new FutureTask<Void>(task, null);
+    public static final class WrapAsFutureTaskAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enterExecute(@Advice.Argument(value = 0, readOnly = false) Runnable task) {
+            if (task == null || task instanceof RunnableFuture || exclude(RUNNABLE, task)) {
+                return;
+            }
+            task = new FutureTask<Void>(task, null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/PartitionInstrumentation.java b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/PartitionInstrumentation.java
index ea201dc88c7..6ac331be636 100644
--- a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/PartitionInstrumentation.java
+++ b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/PartitionInstrumentation.java
@@ -16,35 +16,34 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
 
-public final class PartitionInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class PartitionInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.aerospike.client.cluster.Partition";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.aerospike.client.cluster.Partition";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("getNodeRead", "getNodeWrite"))
-            .and(takesArgument(0, named("com.aerospike.client.cluster.Cluster")))
-            .and(returns(named("com.aerospike.client.cluster.Node"))),
-        getClass().getName() + "$GetNodeAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("getNodeRead", "getNodeWrite"))
+                        .and(takesArgument(0, named("com.aerospike.client.cluster.Cluster")))
+                        .and(returns(named("com.aerospike.client.cluster.Node"))),
+                getClass().getName() + "$GetNodeAdvice");
+    }
 
-  public static final class GetNodeAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void getNode(
-        @Advice.Return final Node node,
-        @Advice.Argument(0) final Cluster cluster,
-        @Advice.This final Partition partition) {
-      final AgentSpan span = activeSpan();
-      // capture the connection details in the active Aerospike span
-      if (span != null && DDSpanTypes.AEROSPIKE.equals(span.getSpanType())) {
-        DECORATE.onConnection(span, node, cluster, partition);
-      }
+    public static final class GetNodeAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void getNode(
+                @Advice.Return final Node node,
+                @Advice.Argument(0) final Cluster cluster,
+                @Advice.This final Partition partition) {
+            final AgentSpan span = activeSpan();
+            // capture the connection details in the active Aerospike span
+            if (span != null && DDSpanTypes.AEROSPIKE.equals(span.getSpanType())) {
+                DECORATE.onConnection(span, node, cluster, partition);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/TracingListener.java b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/TracingListener.java
index be234ebb95f..fba8897f439 100644
--- a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/TracingListener.java
+++ b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/TracingListener.java
@@ -23,206 +23,205 @@
 import java.util.List;
 
 public final class TracingListener
-    implements ExistsListener,
-        ExistsSequenceListener,
-        ExistsArrayListener,
-        RecordListener,
-        RecordSequenceListener,
-        RecordArrayListener,
-        BatchSequenceListener,
-        BatchListListener,
-        WriteListener,
-        ExecuteListener,
-        DeleteListener {
-
-  protected final AgentSpan clientSpan;
-  protected final ContextContinuation continuation;
-  protected final Object listener;
-
-  public TracingListener(
-      final AgentSpan clientSpan, final ContextContinuation continuation, final Object listener) {
-    this.clientSpan = clientSpan;
-    this.continuation = continuation;
-    this.listener = listener;
-  }
-
-  @Override
-  public void onExists(final Key key, final boolean exists) {
-    if (listener != null) {
-      ((ExistsSequenceListener) listener).onExists(key, exists);
+        implements ExistsListener,
+                ExistsSequenceListener,
+                ExistsArrayListener,
+                RecordListener,
+                RecordSequenceListener,
+                RecordArrayListener,
+                BatchSequenceListener,
+                BatchListListener,
+                WriteListener,
+                ExecuteListener,
+                DeleteListener {
+
+    protected final AgentSpan clientSpan;
+    protected final ContextContinuation continuation;
+    protected final Object listener;
+
+    public TracingListener(final AgentSpan clientSpan, final ContextContinuation continuation, final Object listener) {
+        this.clientSpan = clientSpan;
+        this.continuation = continuation;
+        this.listener = listener;
     }
-  }
 
-  @Override
-  public void onRecord(final Key key, final Record record) throws AerospikeException {
-    if (listener != null) {
-      ((RecordSequenceListener) listener).onRecord(key, record);
+    @Override
+    public void onExists(final Key key, final boolean exists) {
+        if (listener != null) {
+            ((ExistsSequenceListener) listener).onExists(key, exists);
+        }
     }
-  }
 
-  @Override
-  public void onRecord(final BatchRead record) {
-    if (listener != null) {
-      ((BatchSequenceListener) listener).onRecord(record);
+    @Override
+    public void onRecord(final Key key, final Record record) throws AerospikeException {
+        if (listener != null) {
+            ((RecordSequenceListener) listener).onRecord(key, record);
+        }
+    }
+
+    @Override
+    public void onRecord(final BatchRead record) {
+        if (listener != null) {
+            ((BatchSequenceListener) listener).onRecord(record);
+        }
     }
-  }
-
-  @Override
-  public void onSuccess(final Key key, final boolean exists) {
-    DECORATE.beforeFinish(clientSpan);
-    clientSpan.finish();
-
-    if (listener != null) {
-      try (final ContextScope scope = continuation.resume()) {
-        if (listener instanceof ExistsListener) {
-          ((ExistsListener) listener).onSuccess(key, exists);
-        } else if (listener instanceof DeleteListener) {
-          ((DeleteListener) listener).onSuccess(key, exists);
+
+    @Override
+    public void onSuccess(final Key key, final boolean exists) {
+        DECORATE.beforeFinish(clientSpan);
+        clientSpan.finish();
+
+        if (listener != null) {
+            try (final ContextScope scope = continuation.resume()) {
+                if (listener instanceof ExistsListener) {
+                    ((ExistsListener) listener).onSuccess(key, exists);
+                } else if (listener instanceof DeleteListener) {
+                    ((DeleteListener) listener).onSuccess(key, exists);
+                }
+            }
+        } else {
+            continuation.release();
         }
-      }
-    } else {
-      continuation.release();
     }
-  }
-
-  @Override
-  public void onSuccess(final Key[] keys, final boolean[] exists) {
-    DECORATE.beforeFinish(clientSpan);
-    clientSpan.finish();
-
-    if (listener != null) {
-      try (final ContextScope scope = continuation.resume()) {
-        ((ExistsArrayListener) listener).onSuccess(keys, exists);
-      }
-    } else {
-      continuation.release();
+
+    @Override
+    public void onSuccess(final Key[] keys, final boolean[] exists) {
+        DECORATE.beforeFinish(clientSpan);
+        clientSpan.finish();
+
+        if (listener != null) {
+            try (final ContextScope scope = continuation.resume()) {
+                ((ExistsArrayListener) listener).onSuccess(keys, exists);
+            }
+        } else {
+            continuation.release();
+        }
     }
-  }
-
-  @Override
-  public void onSuccess(final Key key, final Record record) {
-    DECORATE.beforeFinish(clientSpan);
-    clientSpan.finish();
-
-    if (listener != null) {
-      try (final ContextScope scope = continuation.resume()) {
-        ((RecordListener) listener).onSuccess(key, record);
-      }
-    } else {
-      continuation.release();
+
+    @Override
+    public void onSuccess(final Key key, final Record record) {
+        DECORATE.beforeFinish(clientSpan);
+        clientSpan.finish();
+
+        if (listener != null) {
+            try (final ContextScope scope = continuation.resume()) {
+                ((RecordListener) listener).onSuccess(key, record);
+            }
+        } else {
+            continuation.release();
+        }
     }
-  }
-
-  @Override
-  public void onSuccess(final Key[] keys, final Record[] records) {
-    DECORATE.beforeFinish(clientSpan);
-    clientSpan.finish();
-
-    if (listener != null) {
-      try (final ContextScope scope = continuation.resume()) {
-        ((RecordArrayListener) listener).onSuccess(keys, records);
-      }
-    } else {
-      continuation.release();
+
+    @Override
+    public void onSuccess(final Key[] keys, final Record[] records) {
+        DECORATE.beforeFinish(clientSpan);
+        clientSpan.finish();
+
+        if (listener != null) {
+            try (final ContextScope scope = continuation.resume()) {
+                ((RecordArrayListener) listener).onSuccess(keys, records);
+            }
+        } else {
+            continuation.release();
+        }
     }
-  }
-
-  @Override
-  public void onSuccess(final List<BatchRead> records) {
-    DECORATE.beforeFinish(clientSpan);
-    clientSpan.finish();
-
-    if (listener != null) {
-      try (final ContextScope scope = continuation.resume()) {
-        ((BatchListListener) listener).onSuccess(records);
-      }
-    } else {
-      continuation.release();
+
+    @Override
+    public void onSuccess(final List<BatchRead> records) {
+        DECORATE.beforeFinish(clientSpan);
+        clientSpan.finish();
+
+        if (listener != null) {
+            try (final ContextScope scope = continuation.resume()) {
+                ((BatchListListener) listener).onSuccess(records);
+            }
+        } else {
+            continuation.release();
+        }
     }
-  }
-
-  @Override
-  public void onSuccess(final Key key) {
-    DECORATE.beforeFinish(clientSpan);
-    clientSpan.finish();
-
-    if (listener != null) {
-      try (final ContextScope scope = continuation.resume()) {
-        ((WriteListener) listener).onSuccess(key);
-      }
-    } else {
-      continuation.release();
+
+    @Override
+    public void onSuccess(final Key key) {
+        DECORATE.beforeFinish(clientSpan);
+        clientSpan.finish();
+
+        if (listener != null) {
+            try (final ContextScope scope = continuation.resume()) {
+                ((WriteListener) listener).onSuccess(key);
+            }
+        } else {
+            continuation.release();
+        }
     }
-  }
-
-  @Override
-  public void onSuccess(final Key key, final Object obj) {
-    DECORATE.beforeFinish(clientSpan);
-    clientSpan.finish();
-
-    if (listener != null) {
-      try (final ContextScope scope = continuation.resume()) {
-        ((ExecuteListener) listener).onSuccess(key, obj);
-      }
-    } else {
-      continuation.release();
+
+    @Override
+    public void onSuccess(final Key key, final Object obj) {
+        DECORATE.beforeFinish(clientSpan);
+        clientSpan.finish();
+
+        if (listener != null) {
+            try (final ContextScope scope = continuation.resume()) {
+                ((ExecuteListener) listener).onSuccess(key, obj);
+            }
+        } else {
+            continuation.release();
+        }
     }
-  }
-
-  @Override
-  public void onSuccess() {
-    DECORATE.beforeFinish(clientSpan);
-    clientSpan.finish();
-
-    if (listener != null) {
-      try (final ContextScope scope = continuation.resume()) {
-        if (listener instanceof ExistsSequenceListener) {
-          ((ExistsSequenceListener) listener).onSuccess();
-        } else if (listener instanceof RecordSequenceListener) {
-          ((RecordSequenceListener) listener).onSuccess();
-        } else if (listener instanceof BatchSequenceListener) {
-          ((BatchSequenceListener) listener).onSuccess();
+
+    @Override
+    public void onSuccess() {
+        DECORATE.beforeFinish(clientSpan);
+        clientSpan.finish();
+
+        if (listener != null) {
+            try (final ContextScope scope = continuation.resume()) {
+                if (listener instanceof ExistsSequenceListener) {
+                    ((ExistsSequenceListener) listener).onSuccess();
+                } else if (listener instanceof RecordSequenceListener) {
+                    ((RecordSequenceListener) listener).onSuccess();
+                } else if (listener instanceof BatchSequenceListener) {
+                    ((BatchSequenceListener) listener).onSuccess();
+                }
+            }
+        } else {
+            continuation.release();
         }
-      }
-    } else {
-      continuation.release();
     }
-  }
-
-  @Override
-  public void onFailure(final AerospikeException error) {
-    DECORATE.onError(clientSpan, error);
-    DECORATE.beforeFinish(clientSpan);
-    clientSpan.finish();
-
-    if (listener != null) {
-      try (final ContextScope scope = continuation.resume()) {
-        if (listener instanceof ExistsListener) {
-          ((ExistsListener) listener).onFailure(error);
-        } else if (listener instanceof ExistsSequenceListener) {
-          ((ExistsSequenceListener) listener).onFailure(error);
-        } else if (listener instanceof ExistsArrayListener) {
-          ((ExistsArrayListener) listener).onFailure(error);
-        } else if (listener instanceof RecordListener) {
-          ((RecordListener) listener).onFailure(error);
-        } else if (listener instanceof RecordSequenceListener) {
-          ((RecordSequenceListener) listener).onFailure(error);
-        } else if (listener instanceof RecordArrayListener) {
-          ((RecordArrayListener) listener).onFailure(error);
-        } else if (listener instanceof BatchSequenceListener) {
-          ((BatchSequenceListener) listener).onFailure(error);
-        } else if (listener instanceof BatchListListener) {
-          ((BatchListListener) listener).onFailure(error);
-        } else if (listener instanceof WriteListener) {
-          ((WriteListener) listener).onFailure(error);
-        } else if (listener instanceof ExecuteListener) {
-          ((ExecuteListener) listener).onFailure(error);
-        } else if (listener instanceof DeleteListener) {
-          ((DeleteListener) listener).onFailure(error);
+
+    @Override
+    public void onFailure(final AerospikeException error) {
+        DECORATE.onError(clientSpan, error);
+        DECORATE.beforeFinish(clientSpan);
+        clientSpan.finish();
+
+        if (listener != null) {
+            try (final ContextScope scope = continuation.resume()) {
+                if (listener instanceof ExistsListener) {
+                    ((ExistsListener) listener).onFailure(error);
+                } else if (listener instanceof ExistsSequenceListener) {
+                    ((ExistsSequenceListener) listener).onFailure(error);
+                } else if (listener instanceof ExistsArrayListener) {
+                    ((ExistsArrayListener) listener).onFailure(error);
+                } else if (listener instanceof RecordListener) {
+                    ((RecordListener) listener).onFailure(error);
+                } else if (listener instanceof RecordSequenceListener) {
+                    ((RecordSequenceListener) listener).onFailure(error);
+                } else if (listener instanceof RecordArrayListener) {
+                    ((RecordArrayListener) listener).onFailure(error);
+                } else if (listener instanceof BatchSequenceListener) {
+                    ((BatchSequenceListener) listener).onFailure(error);
+                } else if (listener instanceof BatchListListener) {
+                    ((BatchListListener) listener).onFailure(error);
+                } else if (listener instanceof WriteListener) {
+                    ((WriteListener) listener).onFailure(error);
+                } else if (listener instanceof ExecuteListener) {
+                    ((ExecuteListener) listener).onFailure(error);
+                } else if (listener instanceof DeleteListener) {
+                    ((DeleteListener) listener).onFailure(error);
+                }
+            }
+        } else {
+            continuation.release();
         }
-      }
-    } else {
-      continuation.release();
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaActorCellInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaActorCellInstrumentation.java
index 4343ae0bd47..09354cd6d36 100644
--- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaActorCellInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaActorCellInstrumentation.java
@@ -22,75 +22,70 @@
 
 @AutoService(InstrumenterModule.class)
 public class AkkaActorCellInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public AkkaActorCellInstrumentation() {
-    super("akka_actor_receive", "akka_actor", "akka_concurrent", "java_concurrent");
-  }
+    public AkkaActorCellInstrumentation() {
+        super("akka_actor_receive", "akka_actor", "akka_concurrent", "java_concurrent");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.actor.ActorCell";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.actor.ActorCell";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("akka.dispatch.Envelope", State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("akka.dispatch.Envelope", State.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("invoke")), getClass().getName() + "$InvokeAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isMethod().and(named("invoke")), getClass().getName() + "$InvokeAdvice");
+    }
 
-  /**
-   * This instrumentation is defensive and closes all scopes on the scope stack that were not there
-   * when we started processing this actor message. The reason for that is twofold.
-   *
-   * <p>1) An actor is self contained, and driven by a thread that could serve many other purposes,
-   * and a scope should not leak out after a message has been processed.
-   *
-   * <p>2) We rely on this cleanup mechanism to be able to intentionally leak the scope in the
-   * {@code AkkaHttpServerInstrumentation} so that it propagates to the user provided request
-   * handling code that will execute on the same thread in the same actor.
-   */
-  public static class InvokeAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static Context enter(
-        @Advice.Argument(value = 0) Envelope envelope,
-        @Advice.Local("taskScope") ContextScope taskScope) {
+    /**
+     * This instrumentation is defensive and closes all scopes on the scope stack that were not there
+     * when we started processing this actor message. The reason for that is twofold.
+     *
+     * <p>1) An actor is self contained, and driven by a thread that could serve many other purposes,
+     * and a scope should not leak out after a message has been processed.
+     *
+     * <p>2) We rely on this cleanup mechanism to be able to intentionally leak the scope in the
+     * {@code AkkaHttpServerInstrumentation} so that it propagates to the user provided request
+     * handling code that will execute on the same thread in the same actor.
+     */
+    public static class InvokeAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static Context enter(
+                @Advice.Argument(value = 0) Envelope envelope, @Advice.Local("taskScope") ContextScope taskScope) {
 
-      // do this before checkpointing, as the envelope's task scope may already be active
-      taskScope =
-          AdviceUtils.startTaskScope(
-              InstrumentationContext.get(Envelope.class, State.class), envelope);
+            // do this before checkpointing, as the envelope's task scope may already be active
+            taskScope = AdviceUtils.startTaskScope(InstrumentationContext.get(Envelope.class, State.class), envelope);
 
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        // remember the currently active scope so we can roll back to this point
-        checkpointActiveForRollback();
-        return null;
-      } else {
-        return currentContext().swap();
-      }
-    }
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                // remember the currently active scope so we can roll back to this point
+                checkpointActiveForRollback();
+                return null;
+            } else {
+                return currentContext().swap();
+            }
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Local("taskScope") ContextScope taskScope,
-        @Advice.Enter Context checkpointContext) {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Local("taskScope") ContextScope taskScope, @Advice.Enter Context checkpointContext) {
 
-      if (checkpointContext == null) {
-        // Clean up any leaking scopes from akka-streams/akka-http etc.
-        rollbackActiveToCheckpoint();
-      } else {
-        checkpointContext.swap();
-      }
+            if (checkpointContext == null) {
+                // Clean up any leaking scopes from akka-streams/akka-http etc.
+                rollbackActiveToCheckpoint();
+            } else {
+                checkpointContext.swap();
+            }
 
-      // close envelope's task scope if we previously started it
-      if (taskScope != null) {
-        taskScope.close();
-      }
+            // close envelope's task scope if we previously started it
+            if (taskScope != null) {
+                taskScope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaDeadLetterQueueInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaDeadLetterQueueInstrumentation.java
index 728c19acb29..2b14a258b5c 100644
--- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaDeadLetterQueueInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaDeadLetterQueueInstrumentation.java
@@ -24,47 +24,46 @@
 
 @AutoService(InstrumenterModule.class)
 public class AkkaDeadLetterQueueInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public AkkaDeadLetterQueueInstrumentation() {
-    super("akka_actor_receive", "akka_actor", "akka_concurrent", "java_concurrent");
-  }
+    public AkkaDeadLetterQueueInstrumentation() {
+        super("akka_actor_receive", "akka_actor", "akka_concurrent", "java_concurrent");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "akka.dispatch.MessageQueue";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "akka.dispatch.MessageQueue";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    // Match the dead-letter queue without depending on Scala's anonymous-class numbering.
-    return nameStartsWith("akka.dispatch.Mailboxes$")
-        .and(implementsInterface(named("akka.dispatch.MessageQueue")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        // Match the dead-letter queue without depending on Scala's anonymous-class numbering.
+        return nameStartsWith("akka.dispatch.Mailboxes$").and(implementsInterface(named("akka.dispatch.MessageQueue")));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("akka.dispatch.Envelope", State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("akka.dispatch.Envelope", State.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("enqueue"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("akka.actor.ActorRef")))
-            .and(takesArgument(1, named("akka.dispatch.Envelope")))
-            .and(returns(void.class)),
-        getClass().getName() + "$EnqueueAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("enqueue"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("akka.actor.ActorRef")))
+                        .and(takesArgument(1, named("akka.dispatch.Envelope")))
+                        .and(returns(void.class)),
+                getClass().getName() + "$EnqueueAdvice");
+    }
 
-  public static class EnqueueAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterEnqueue(@Advice.Argument(1) Envelope envelope) {
-      // Dead-letter publication discards the original envelope without invoking its actor.
-      cancelTask(InstrumentationContext.get(Envelope.class, State.class), envelope);
+    public static class EnqueueAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterEnqueue(@Advice.Argument(1) Envelope envelope) {
+            // Dead-letter publication discards the original envelope without invoking its actor.
+            cancelTask(InstrumentationContext.get(Envelope.class, State.class), envelope);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaEnvelopeInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaEnvelopeInstrumentation.java
index 9cb6efc647b..be5831420d7 100644
--- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaEnvelopeInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaEnvelopeInstrumentation.java
@@ -15,31 +15,31 @@
 
 @AutoService(InstrumenterModule.class)
 public class AkkaEnvelopeInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public AkkaEnvelopeInstrumentation() {
-    super("akka_actor_send", "akka_actor", "akka_concurrent", "java_concurrent");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "akka.dispatch.Envelope";
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("akka.dispatch.Envelope", State.class.getName());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$ConstructAdvice");
-  }
-
-  public static class ConstructAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterInit(@Advice.This Envelope zis) {
-      capture(InstrumentationContext.get(Envelope.class, State.class), zis);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public AkkaEnvelopeInstrumentation() {
+        super("akka_actor_send", "akka_actor", "akka_concurrent", "java_concurrent");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "akka.dispatch.Envelope";
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("akka.dispatch.Envelope", State.class.getName());
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$ConstructAdvice");
+    }
+
+    public static class ConstructAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterInit(@Advice.This Envelope zis) {
+            capture(InstrumentationContext.get(Envelope.class, State.class), zis);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinExecutorTaskInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinExecutorTaskInstrumentation.java
index 8f7c2f893a7..87393735276 100644
--- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinExecutorTaskInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinExecutorTaskInstrumentation.java
@@ -25,54 +25,51 @@
  * error handling.
  */
 @AutoService(InstrumenterModule.class)
-public final class AkkaForkJoinExecutorTaskInstrumentation
-    extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType,
-        Instrumenter.ForConfiguredType,
-        Instrumenter.HasMethodAdvice {
-  public AkkaForkJoinExecutorTaskInstrumentation() {
-    super("java_concurrent", "akka_concurrent");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(Runnable.class.getName(), State.class.getName());
-  }
+public final class AkkaForkJoinExecutorTaskInstrumentation extends InstrumenterModule.ContextTracking
+        implements Instrumenter.ForSingleType, Instrumenter.ForConfiguredType, Instrumenter.HasMethodAdvice {
+    public AkkaForkJoinExecutorTaskInstrumentation() {
+        super("java_concurrent", "akka_concurrent");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.dispatch.ForkJoinExecutorConfigurator$AkkaForkJoinTask";
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(Runnable.class.getName(), State.class.getName());
+    }
 
-  @Override
-  public String configuredMatchingType() {
-    return InstrumenterConfig.get().getAkkaForkJoinExecutorTaskName();
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.dispatch.ForkJoinExecutorConfigurator$AkkaForkJoinTask";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(0, named(Runnable.class.getName()))),
-        getClass().getName() + "$Construct");
-    transformer.applyAdvice(isMethod().and(named("run")), getClass().getName() + "$Run");
-  }
+    @Override
+    public String configuredMatchingType() {
+        return InstrumenterConfig.get().getAkkaForkJoinExecutorTaskName();
+    }
 
-  public static final class Construct {
-    @Advice.OnMethodExit
-    public static void construct(@Advice.Argument(0) Runnable wrapped) {
-      capture(InstrumentationContext.get(Runnable.class, State.class), wrapped);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(0, named(Runnable.class.getName()))),
+                getClass().getName() + "$Construct");
+        transformer.applyAdvice(isMethod().and(named("run")), getClass().getName() + "$Run");
     }
-  }
 
-  public static final class Run {
-    @Advice.OnMethodEnter
-    public static ContextScope before(@Advice.Argument(0) Runnable wrapped) {
-      return startTaskScope(InstrumentationContext.get(Runnable.class, State.class), wrapped);
+    public static final class Construct {
+        @Advice.OnMethodExit
+        public static void construct(@Advice.Argument(0) Runnable wrapped) {
+            capture(InstrumentationContext.get(Runnable.class, State.class), wrapped);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      endTaskScope(scope);
+    public static final class Run {
+        @Advice.OnMethodEnter
+        public static ContextScope before(@Advice.Argument(0) Runnable wrapped) {
+            return startTaskScope(InstrumentationContext.get(Runnable.class, State.class), wrapped);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinPoolInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinPoolInstrumentation.java
index d7ab19ae060..aa772d9e4ac 100644
--- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinPoolInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinPoolInstrumentation.java
@@ -20,51 +20,48 @@
 
 @AutoService(InstrumenterModule.class)
 public final class AkkaForkJoinPoolInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType,
-        Instrumenter.ForConfiguredType,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.ForConfiguredType, Instrumenter.HasMethodAdvice {
 
-  public AkkaForkJoinPoolInstrumentation() {
-    super("java_concurrent", "akka_concurrent");
-  }
+    public AkkaForkJoinPoolInstrumentation() {
+        super("java_concurrent", "akka_concurrent");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.dispatch.forkjoin.ForkJoinPool";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.dispatch.forkjoin.ForkJoinPool";
+    }
 
-  @Override
-  public String configuredMatchingType() {
-    return InstrumenterConfig.get().getAkkaForkJoinPoolName();
-  }
+    @Override
+    public String configuredMatchingType() {
+        return InstrumenterConfig.get().getAkkaForkJoinPoolName();
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("akka.dispatch.forkjoin.ForkJoinTask", State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("akka.dispatch.forkjoin.ForkJoinTask", State.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("externalPush", "fullExternalPush")),
-        getClass().getName() + "$ExternalPush");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("externalPush", "fullExternalPush")),
+                getClass().getName() + "$ExternalPush");
+    }
 
-  public static final class ExternalPush {
+    public static final class ExternalPush {
 
-    @Advice.OnMethodEnter
-    public static <T> void externalPush(@Advice.Argument(0) ForkJoinTask<T> task) {
-      if (!exclude(FORK_JOIN_TASK, task)) {
-        capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
-      }
-    }
+        @Advice.OnMethodEnter
+        public static <T> void externalPush(@Advice.Argument(0) ForkJoinTask<T> task) {
+            if (!exclude(FORK_JOIN_TASK, task)) {
+                capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+            }
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static <T> void cleanup(
-        @Advice.Argument(0) ForkJoinTask<T> task, @Advice.Thrown Throwable thrown) {
-      if (null != thrown) {
-        cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static <T> void cleanup(@Advice.Argument(0) ForkJoinTask<T> task, @Advice.Thrown Throwable thrown) {
+            if (null != thrown) {
+                cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinTaskInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinTaskInstrumentation.java
index d079a6e03b8..194eb1da7c9 100644
--- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinTaskInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinTaskInstrumentation.java
@@ -40,90 +40,89 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class AkkaForkJoinTaskInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
 
-  public AkkaForkJoinTaskInstrumentation() {
-    super("java_concurrent", "akka_concurrent");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("akka.dispatch.forkjoin.ForkJoinTask", State.class.getName());
-  }
+    public AkkaForkJoinTaskInstrumentation() {
+        super("java_concurrent", "akka_concurrent");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    String akkaForkJoinTaskName = InstrumenterConfig.get().getAkkaForkJoinTaskName();
-    return akkaForkJoinTaskName != null && !akkaForkJoinTaskName.isEmpty()
-        ? null // bypass the hint if custom class is configured
-        : "akka.dispatch.forkjoin.ForkJoinTask";
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("akka.dispatch.forkjoin.ForkJoinTask", State.class.getName());
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return notExcludedByName(FORK_JOIN_TASK)
-        .and(declaresMethod(namedOneOf("exec", "fork", "cancel")))
-        .and(isForkJoinTaskSubclass());
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        String akkaForkJoinTaskName = InstrumenterConfig.get().getAkkaForkJoinTaskName();
+        return akkaForkJoinTaskName != null && !akkaForkJoinTaskName.isEmpty()
+                ? null // bypass the hint if custom class is configured
+                : "akka.dispatch.forkjoin.ForkJoinTask";
+    }
 
-  private ElementMatcher<TypeDescription> isForkJoinTaskSubclass() {
-    ElementMatcher.Junction<TypeDescription> forkJoinTaskSubclass =
-        extendsClass(named("akka.dispatch.forkjoin.ForkJoinTask"));
-    String akkaForkJoinTaskName = InstrumenterConfig.get().getAkkaForkJoinTaskName();
-    return akkaForkJoinTaskName != null && !akkaForkJoinTaskName.isEmpty()
-        ? forkJoinTaskSubclass.or(extendsClass(named(akkaForkJoinTaskName)))
-        : forkJoinTaskSubclass;
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return notExcludedByName(FORK_JOIN_TASK)
+                .and(declaresMethod(namedOneOf("exec", "fork", "cancel")))
+                .and(isForkJoinTaskSubclass());
+    }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    Map<ExcludeFilter.ExcludeType, Collection<String>> exclude =
-        new EnumMap<>(ExcludeFilter.ExcludeType.class);
-    exclude.put(
-        FORK_JOIN_TASK,
-        Arrays.asList(
-            "akka.dispatch.ForkJoinExecutorConfigurator$AkkaForkJoinTask",
-            "akka.dispatch.Dispatcher$$anon$1"));
-    exclude.put(
-        RUNNABLE_FUTURE,
-        Arrays.asList(
-            "akka.dispatch.forkjoin.ForkJoinTask$AdaptedCallable",
-            "akka.dispatch.forkjoin.ForkJoinTask$AdaptedRunnable",
-            "akka.dispatch.forkjoin.ForkJoinTask$AdaptedRunnableAction"));
-    return exclude;
-  }
+    private ElementMatcher<TypeDescription> isForkJoinTaskSubclass() {
+        ElementMatcher.Junction<TypeDescription> forkJoinTaskSubclass =
+                extendsClass(named("akka.dispatch.forkjoin.ForkJoinTask"));
+        String akkaForkJoinTaskName = InstrumenterConfig.get().getAkkaForkJoinTaskName();
+        return akkaForkJoinTaskName != null && !akkaForkJoinTaskName.isEmpty()
+                ? forkJoinTaskSubclass.or(extendsClass(named(akkaForkJoinTaskName)))
+                : forkJoinTaskSubclass;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("doExec", "exec")), getClass().getName() + "$Exec");
-    transformer.applyAdvice(isMethod().and(named("fork")), getClass().getName() + "$Fork");
-    transformer.applyAdvice(isMethod().and(named("cancel")), getClass().getName() + "$Cancel");
-  }
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        Map<ExcludeFilter.ExcludeType, Collection<String>> exclude = new EnumMap<>(ExcludeFilter.ExcludeType.class);
+        exclude.put(
+                FORK_JOIN_TASK,
+                Arrays.asList(
+                        "akka.dispatch.ForkJoinExecutorConfigurator$AkkaForkJoinTask",
+                        "akka.dispatch.Dispatcher$$anon$1"));
+        exclude.put(
+                RUNNABLE_FUTURE,
+                Arrays.asList(
+                        "akka.dispatch.forkjoin.ForkJoinTask$AdaptedCallable",
+                        "akka.dispatch.forkjoin.ForkJoinTask$AdaptedRunnable",
+                        "akka.dispatch.forkjoin.ForkJoinTask$AdaptedRunnableAction"));
+        return exclude;
+    }
 
-  public static final class Exec {
-    @Advice.OnMethodEnter
-    public static <T> ContextScope before(@Advice.This ForkJoinTask<T> task) {
-      return startTaskScope(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("doExec", "exec")), getClass().getName() + "$Exec");
+        transformer.applyAdvice(isMethod().and(named("fork")), getClass().getName() + "$Fork");
+        transformer.applyAdvice(isMethod().and(named("cancel")), getClass().getName() + "$Cancel");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      endTaskScope(scope);
+    public static final class Exec {
+        @Advice.OnMethodEnter
+        public static <T> ContextScope before(@Advice.This ForkJoinTask<T> task) {
+            return startTaskScope(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 
-  public static final class Fork {
-    @Advice.OnMethodEnter
-    public static <T> void fork(@Advice.This ForkJoinTask<T> task) {
-      capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+    public static final class Fork {
+        @Advice.OnMethodEnter
+        public static <T> void fork(@Advice.This ForkJoinTask<T> task) {
+            capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+        }
     }
-  }
 
-  public static final class Cancel {
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static <T> void cancel(@Advice.This ForkJoinTask<T> task) {
-      cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+    public static final class Cancel {
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static <T> void cancel(@Advice.This ForkJoinTask<T> task) {
+            cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java
index 96efa140128..894fa491633 100644
--- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java
@@ -15,54 +15,53 @@
 
 @AutoService(InstrumenterModule.class)
 public class AkkaMailboxInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public AkkaMailboxInstrumentation() {
-    super("akka_actor_mailbox", "akka_actor", "akka_concurrent", "java_concurrent");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "akka.dispatch.Mailbox";
-  }
+    public AkkaMailboxInstrumentation() {
+        super("akka_actor_mailbox", "akka_actor", "akka_concurrent", "java_concurrent");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("run")), getClass().getName() + "$SuppressMailboxRunAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.dispatch.Mailbox";
+    }
 
-  /**
-   * This instrumentation is defensive and closes all scopes on the scope stack that were not there
-   * when we started processing this actor mailbox. The reason for that is twofold.
-   *
-   * <p>1) An actor is self contained, and driven by a thread that could serve many other purposes,
-   * and a scope should not leak out after a mailbox has been processed.
-   *
-   * <p>2) We rely on this cleanup mechanism to be able to intentionally leak the scope in the
-   * {@code AkkaHttpServerInstrumentation} so that it propagates to the user provided request
-   * handling code that will execute on the same thread in the same actor.
-   */
-  public static final class SuppressMailboxRunAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static Context enter() {
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        // remember the currently active scope so we can roll back to this point
-        checkpointActiveForRollback();
-        return null;
-      } else {
-        return currentContext().swap();
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isMethod().and(named("run")), getClass().getName() + "$SuppressMailboxRunAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Enter final Context checkpointContext) {
-      if (checkpointContext == null) {
-        // Clean up any leaking scopes from akka-streams/akka-http etc.
-        rollbackActiveToCheckpoint();
-      } else {
-        checkpointContext.swap();
-      }
+    /**
+     * This instrumentation is defensive and closes all scopes on the scope stack that were not there
+     * when we started processing this actor mailbox. The reason for that is twofold.
+     *
+     * <p>1) An actor is self contained, and driven by a thread that could serve many other purposes,
+     * and a scope should not leak out after a mailbox has been processed.
+     *
+     * <p>2) We rely on this cleanup mechanism to be able to intentionally leak the scope in the
+     * {@code AkkaHttpServerInstrumentation} so that it propagates to the user provided request
+     * handling code that will execute on the same thread in the same actor.
+     */
+    public static final class SuppressMailboxRunAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static Context enter() {
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                // remember the currently active scope so we can roll back to this point
+                checkpointActiveForRollback();
+                return null;
+            } else {
+                return currentContext().swap();
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Enter final Context checkpointContext) {
+            if (checkpointContext == null) {
+                // Clean up any leaking scopes from akka-streams/akka-http etc.
+                rollbackActiveToCheckpoint();
+            } else {
+                checkpointContext.swap();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaRoutedActorCellInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaRoutedActorCellInstrumentation.java
index 90d5ccf1fb8..5e072709b2f 100644
--- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaRoutedActorCellInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaRoutedActorCellInstrumentation.java
@@ -19,53 +19,52 @@
 
 @AutoService(InstrumenterModule.class)
 public class AkkaRoutedActorCellInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public AkkaRoutedActorCellInstrumentation() {
-    super("akka_actor_send", "akka_actor", "akka_concurrent", "java_concurrent");
-  }
+    public AkkaRoutedActorCellInstrumentation() {
+        super("akka_actor_send", "akka_actor", "akka_concurrent", "java_concurrent");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.routing.RoutedActorCell";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.routing.RoutedActorCell";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("akka.dispatch.Envelope", State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("akka.dispatch.Envelope", State.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("sendMessage").and(takesArgument(0, named("akka.dispatch.Envelope")))),
-        getClass().getName() + "$SendMessageAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("sendMessage").and(takesArgument(0, named("akka.dispatch.Envelope")))),
+                getClass().getName() + "$SendMessageAdvice");
+    }
 
-  /**
-   * RoutedActorCell will sometimes deconstruct the Envelope in the {@code sendMessage} method, so
-   * we might need to activate the {@code Scope} to ensure that it propagates properly.
-   */
-  public static class SendMessageAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.This RoutedActorCell zis, @Advice.Argument(value = 0) Envelope envelope) {
-      // If this isn't a management message, it will be deconstructed before being routed through
-      // the routing logic, so activate the Scope
-      if (!zis.routerConfig().isManagementMessage(envelope.message())) {
-        return AdviceUtils.startTaskScope(
-            InstrumentationContext.get(Envelope.class, State.class), envelope);
-      }
+    /**
+     * RoutedActorCell will sometimes deconstruct the Envelope in the {@code sendMessage} method, so
+     * we might need to activate the {@code Scope} to ensure that it propagates properly.
+     */
+    public static class SendMessageAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.This RoutedActorCell zis, @Advice.Argument(value = 0) Envelope envelope) {
+            // If this isn't a management message, it will be deconstructed before being routed through
+            // the routing logic, so activate the Scope
+            if (!zis.routerConfig().isManagementMessage(envelope.message())) {
+                return AdviceUtils.startTaskScope(InstrumentationContext.get(Envelope.class, State.class), envelope);
+            }
 
-      return null;
-    }
+            return null;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Enter ContextScope scope) {
-      if (null != scope) {
-        scope.close();
-        // then we have invoked an Envelope and need to mark the work complete
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Enter ContextScope scope) {
+            if (null != scope) {
+                scope.close();
+                // then we have invoked an Envelope and need to mark the work complete
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/init/DisableTracingActorInitInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/init/DisableTracingActorInitInstrumentation.java
index 98e6172a2df..60203f21b8a 100644
--- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/init/DisableTracingActorInitInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/init/DisableTracingActorInitInstrumentation.java
@@ -13,42 +13,41 @@
 
 @AutoService(InstrumenterModule.class)
 public final class DisableTracingActorInitInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public DisableTracingActorInitInstrumentation() {
-    super("akka_concurrent");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "akka.actor.ActorSystem$";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("apply"),
-        DisableTracingActorInitInstrumentation.class.getName() + "$BlockPropagation");
-  }
-
-  /**
-   * This instrumentation was added to ensure that the play 2.3 test doesn't hang on the first
-   * request. (Without this it propagates the trace into the lazy akka initialization.)
-   */
-  public static class BlockPropagation {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter() {
-      return activateSpan(noopSpan());
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public DisableTracingActorInitInstrumentation() {
+        super("akka_concurrent");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "akka.actor.ActorSystem$";
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Enter final ContextScope scope) {
-      scope.close();
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("apply"), DisableTracingActorInitInstrumentation.class.getName() + "$BlockPropagation");
     }
 
-    public static void muzzleCheck(final ActorSystem$ actorSystem) {
-      actorSystem.apply();
+    /**
+     * This instrumentation was added to ensure that the play 2.3 test doesn't hang on the first
+     * request. (Without this it propagates the trace into the lazy akka initialization.)
+     */
+    public static class BlockPropagation {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter() {
+            return activateSpan(noopSpan());
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Enter final ContextScope scope) {
+            scope.close();
+        }
+
+        public static void muzzleCheck(final ActorSystem$ actorSystem) {
+            actorSystem.apply();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/groovy/AkkaAsyncChild.java b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/groovy/AkkaAsyncChild.java
index 695588f462c..08ad37ef0c0 100644
--- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/groovy/AkkaAsyncChild.java
+++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/groovy/AkkaAsyncChild.java
@@ -4,56 +4,56 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class AkkaAsyncChild extends ForkJoinTask implements Runnable, Callable {
-  private final AtomicBoolean blockThread;
-  private final boolean doTraceableWork;
-
-  public AkkaAsyncChild() {
-    this(true, false);
-  }
-
-  @Override
-  public Object getRawResult() {
-    return null;
-  }
-
-  @Override
-  protected void setRawResult(final Object value) {}
-
-  @Override
-  protected boolean exec() {
-    runImpl();
-    return true;
-  }
-
-  public AkkaAsyncChild(final boolean doTraceableWork, final boolean blockThread) {
-    this.doTraceableWork = doTraceableWork;
-    this.blockThread = new AtomicBoolean(blockThread);
-  }
-
-  public void unblock() {
-    blockThread.set(false);
-  }
-
-  @Override
-  public void run() {
-    runImpl();
-  }
-
-  @Override
-  public Object call() throws Exception {
-    runImpl();
-    return null;
-  }
-
-  private void runImpl() {
-    while (blockThread.get()) {
-      // busy-wait to block thread
-    }
-    if (doTraceableWork) {
-      asyncChild();
-    }
-  }
-
-  @Trace(operationName = "asyncChild")
-  private void asyncChild() {}
+    private final AtomicBoolean blockThread;
+    private final boolean doTraceableWork;
+
+    public AkkaAsyncChild() {
+        this(true, false);
+    }
+
+    @Override
+    public Object getRawResult() {
+        return null;
+    }
+
+    @Override
+    protected void setRawResult(final Object value) {}
+
+    @Override
+    protected boolean exec() {
+        runImpl();
+        return true;
+    }
+
+    public AkkaAsyncChild(final boolean doTraceableWork, final boolean blockThread) {
+        this.doTraceableWork = doTraceableWork;
+        this.blockThread = new AtomicBoolean(blockThread);
+    }
+
+    public void unblock() {
+        blockThread.set(false);
+    }
+
+    @Override
+    public void run() {
+        runImpl();
+    }
+
+    @Override
+    public Object call() throws Exception {
+        runImpl();
+        return null;
+    }
+
+    private void runImpl() {
+        while (blockThread.get()) {
+            // busy-wait to block thread
+        }
+        if (doTraceableWork) {
+            asyncChild();
+        }
+    }
+
+    @Trace(operationName = "asyncChild")
+    private void asyncChild() {}
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/java/LinearTask.java b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/java/LinearTask.java
index 14be3d3601b..22a6a2a4345 100644
--- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/java/LinearTask.java
+++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/java/LinearTask.java
@@ -6,38 +6,38 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 
 public class LinearTask extends RecursiveTask<Integer> {
-  private final int depth;
-  private final int parent;
+    private final int depth;
+    private final int parent;
 
-  public LinearTask(int depth) {
-    this(0, depth);
-  }
-
-  private LinearTask(int parent, int depth) {
-    this.parent = parent;
-    this.depth = depth;
-  }
+    public LinearTask(int depth) {
+        this(0, depth);
+    }
 
-  @Override
-  protected Integer compute() {
-    try {
-      // introduces delay to encourage parallelism
-      // which will expose problems with context propagation
-      Thread.sleep(5);
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
+    private LinearTask(int parent, int depth) {
+        this.parent = parent;
+        this.depth = depth;
     }
-    if (parent == depth) {
-      return parent;
-    } else {
-      int next = parent + 1;
-      AgentSpan span = startSpan("test", Integer.toString(next));
-      try (ContextScope scope = activateSpan(span)) {
-        LinearTask child = new LinearTask(next, depth);
-        return child.fork().join();
-      } finally {
-        span.finish();
-      }
+
+    @Override
+    protected Integer compute() {
+        try {
+            // introduces delay to encourage parallelism
+            // which will expose problems with context propagation
+            Thread.sleep(5);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+        if (parent == depth) {
+            return parent;
+        } else {
+            int next = parent + 1;
+            AgentSpan span = startSpan("test", Integer.toString(next));
+            try (ContextScope scope = activateSpan(span)) {
+                LinearTask child = new LinearTask(next, depth);
+                return child.fork().join();
+            } finally {
+                span.finish();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/java/datadog/trace/instrumentation/akkahttp/SwappedContextScopeTest.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/java/datadog/trace/instrumentation/akkahttp/SwappedContextScopeTest.java
index a439fdd92ce..e69c1ba66a6 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/java/datadog/trace/instrumentation/akkahttp/SwappedContextScopeTest.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/java/datadog/trace/instrumentation/akkahttp/SwappedContextScopeTest.java
@@ -8,36 +8,36 @@
 import org.junit.jupiter.api.Test;
 
 class SwappedContextScopeTest {
-  private static final ContextKey<String> KEY = ContextKey.named("akka-http-swap-test");
+    private static final ContextKey<String> KEY = ContextKey.named("akka-http-swap-test");
 
-  @Test
-  void restoresPreviousContext() {
-    Context previous = Context.root().with(KEY, "previous");
-    Context request = Context.root().with(KEY, "request");
+    @Test
+    void restoresPreviousContext() {
+        Context previous = Context.root().with(KEY, "previous");
+        Context request = Context.root().with(KEY, "request");
 
-    try (ContextScope previousScope = previous.attach()) {
-      try (ContextScope requestScope = new DatadogWrapperHelper.SwappedContextScope(request)) {
-        assertSame(request, Context.current());
-      }
-      assertSame(previous, Context.current());
+        try (ContextScope previousScope = previous.attach()) {
+            try (ContextScope requestScope = new DatadogWrapperHelper.SwappedContextScope(request)) {
+                assertSame(request, Context.current());
+            }
+            assertSame(previous, Context.current());
+        }
     }
-  }
 
-  @Test
-  void waitsUntilRequestContextIsCurrent() {
-    Context previous = Context.root().with(KEY, "previous");
-    Context request = Context.root().with(KEY, "request");
-    Context other = Context.root().with(KEY, "other");
+    @Test
+    void waitsUntilRequestContextIsCurrent() {
+        Context previous = Context.root().with(KEY, "previous");
+        Context request = Context.root().with(KEY, "request");
+        Context other = Context.root().with(KEY, "other");
 
-    try (ContextScope previousScope = previous.attach()) {
-      ContextScope requestScope = new DatadogWrapperHelper.SwappedContextScope(request);
-      try (ContextScope otherScope = other.attach()) {
-        requestScope.close();
-        assertSame(other, Context.current());
-      }
-      assertSame(request, Context.current());
-      requestScope.close();
-      assertSame(previous, Context.current());
+        try (ContextScope previousScope = previous.attach()) {
+            ContextScope requestScope = new DatadogWrapperHelper.SwappedContextScope(request);
+            try (ContextScope otherScope = other.attach()) {
+                requestScope.close();
+                assertSame(other, Context.current());
+            }
+            assertSame(request, Context.current());
+            requestScope.close();
+            assertSame(previous, Context.current());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/lagomTest/java/EchoService.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/lagomTest/java/EchoService.java
index a5884c20640..3b2f144255f 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/lagomTest/java/EchoService.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/lagomTest/java/EchoService.java
@@ -9,12 +9,12 @@
 
 public interface EchoService extends Service {
 
-  ServiceCall<Source<String, NotUsed>, Source<String, NotUsed>> echo();
+    ServiceCall<Source<String, NotUsed>, Source<String, NotUsed>> echo();
 
-  ServiceCall<Source<String, NotUsed>, Source<String, NotUsed>> error();
+    ServiceCall<Source<String, NotUsed>, Source<String, NotUsed>> error();
 
-  @Override
-  default Descriptor descriptor() {
-    return named("echo").withCalls(namedCall("echo", this::echo), namedCall("error", this::error));
-  }
+    @Override
+    default Descriptor descriptor() {
+        return named("echo").withCalls(namedCall("echo", this::echo), namedCall("error", this::error));
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/lagomTest/java/EchoServiceImpl.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/lagomTest/java/EchoServiceImpl.java
index 9f75a55e0dd..8570256e5ce 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/lagomTest/java/EchoServiceImpl.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/lagomTest/java/EchoServiceImpl.java
@@ -7,20 +7,20 @@
 
 public class EchoServiceImpl implements EchoService {
 
-  @Override
-  public ServiceCall<Source<String, NotUsed>, Source<String, NotUsed>> echo() {
-    final CompletableFuture<Source<String, NotUsed>> fut = new CompletableFuture<>();
-    ServiceTestModule.executor.submit(() -> fut.complete(Source.from(tracedMethod())));
-    return req -> fut;
-  }
+    @Override
+    public ServiceCall<Source<String, NotUsed>, Source<String, NotUsed>> echo() {
+        final CompletableFuture<Source<String, NotUsed>> fut = new CompletableFuture<>();
+        ServiceTestModule.executor.submit(() -> fut.complete(Source.from(tracedMethod())));
+        return req -> fut;
+    }
 
-  @Override
-  public ServiceCall<Source<String, NotUsed>, Source<String, NotUsed>> error() {
-    throw new RuntimeException("lagom exception");
-  }
+    @Override
+    public ServiceCall<Source<String, NotUsed>, Source<String, NotUsed>> error() {
+        throw new RuntimeException("lagom exception");
+    }
 
-  @Trace
-  public List<String> tracedMethod() {
-    return java.util.Arrays.asList("msg1", "msg2", "msg3");
-  }
+    @Trace
+    public List<String> tracedMethod() {
+        return java.util.Arrays.asList("msg1", "msg2", "msg3");
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/lagomTest/java/ServiceTestModule.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/lagomTest/java/ServiceTestModule.java
index ff0af8c1f66..b25f7273061 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/lagomTest/java/ServiceTestModule.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/lagomTest/java/ServiceTestModule.java
@@ -15,70 +15,66 @@
 import java.util.concurrent.Executors;
 
 public class ServiceTestModule extends AbstractModule implements ServiceGuiceSupport {
-  public static final ExecutorService executor = Executors.newCachedThreadPool();
+    public static final ExecutorService executor = Executors.newCachedThreadPool();
 
-  @Override
-  protected void configure() {
-    bindServices(
-        serviceBinding(EchoService.class, EchoServiceImpl.class)
-        // , serviceBinding(HelloService.class, HelloServiceImpl.class)
-        );
-  }
+    @Override
+    protected void configure() {
+        bindServices(
+                serviceBinding(EchoService.class, EchoServiceImpl.class)
+                // , serviceBinding(HelloService.class, HelloServiceImpl.class)
+                );
+    }
 
-  // ------------------------------
+    // ------------------------------
 
-  /**
-   * This is a copy of {@link
-   * com.lightbend.lagom.javadsl.server.ServiceGuiceSupport#bindServices(ServiceGuiceSupport.ServiceBinding[])}
-   * that should survive deprecation. When removing the method from the superclass this should
-   * inherit the removed code.
-   *
-   * <p>This method is used in docs/ so that many tests can share a single Guice module.
-   */
-  @Override
-  public void bindServices(ServiceBinding<?>... serviceBindings) {
-    Binder binder = BinderAccessor.binder(this);
+    /**
+     * This is a copy of {@link
+     * com.lightbend.lagom.javadsl.server.ServiceGuiceSupport#bindServices(ServiceGuiceSupport.ServiceBinding[])}
+     * that should survive deprecation. When removing the method from the superclass this should
+     * inherit the removed code.
+     *
+     * <p>This method is used in docs/ so that many tests can share a single Guice module.
+     */
+    @Override
+    public void bindServices(ServiceBinding<?>... serviceBindings) {
+        Binder binder = BinderAccessor.binder(this);
 
-    for (ServiceBinding binding : serviceBindings) {
-      // First, bind the client implementation.  A service should be able to be a client to itself.
-      bindClient(binding.serviceInterface());
+        for (ServiceBinding binding : serviceBindings) {
+            // First, bind the client implementation.  A service should be able to be a client to itself.
+            bindClient(binding.serviceInterface());
 
-      // Now, bind the server implementation to itself as an eager singleton.
-      if (binding instanceof ClassServiceBinding) {
-        binder.bind(((ClassServiceBinding<?>) binding).serviceImplementation()).asEagerSingleton();
-      } else {
-        Object service = ((InstanceServiceBinding<?>) binding).service();
-        binder.bind((Class<Object>) service.getClass()).toInstance(service);
-      }
-    }
+            // Now, bind the server implementation to itself as an eager singleton.
+            if (binding instanceof ClassServiceBinding) {
+                binder.bind(((ClassServiceBinding<?>) binding).serviceImplementation())
+                        .asEagerSingleton();
+            } else {
+                Object service = ((InstanceServiceBinding<?>) binding).service();
+                binder.bind((Class<Object>) service.getClass()).toInstance(service);
+            }
+        }
 
-    ServiceBinding<?> primaryServiceBinding = serviceBindings[0];
-    // Bind the service info for the first one passed in
-    binder
-        .bind(ServiceInfo.class)
-        .toProvider(
-            new ServiceInfoProvider(
-                primaryServiceBinding.serviceInterface(),
-                Arrays.stream(serviceBindings)
-                    .map(ServiceBinding::serviceInterface)
-                    .toArray(Class[]::new)));
+        ServiceBinding<?> primaryServiceBinding = serviceBindings[0];
+        // Bind the service info for the first one passed in
+        binder.bind(ServiceInfo.class)
+                .toProvider(new ServiceInfoProvider(
+                        primaryServiceBinding.serviceInterface(),
+                        Arrays.stream(serviceBindings)
+                                .map(ServiceBinding::serviceInterface)
+                                .toArray(Class[]::new)));
 
-    // Bind the metrics
-    ServiceBinding<MetricsService> metricsServiceBinding =
-        serviceBinding(MetricsService.class, MetricsServiceImpl.class);
-    binder
-        .bind(((ClassServiceBinding<?>) metricsServiceBinding).serviceImplementation())
-        .asEagerSingleton();
-    ServiceBinding<?>[] allServiceBindings = new ServiceBinding<?>[serviceBindings.length + 1];
-    System.arraycopy(serviceBindings, 0, allServiceBindings, 0, serviceBindings.length);
-    allServiceBindings[allServiceBindings.length - 1] = metricsServiceBinding;
+        // Bind the metrics
+        ServiceBinding<MetricsService> metricsServiceBinding =
+                serviceBinding(MetricsService.class, MetricsServiceImpl.class);
+        binder.bind(((ClassServiceBinding<?>) metricsServiceBinding).serviceImplementation())
+                .asEagerSingleton();
+        ServiceBinding<?>[] allServiceBindings = new ServiceBinding<?>[serviceBindings.length + 1];
+        System.arraycopy(serviceBindings, 0, allServiceBindings, 0, serviceBindings.length);
+        allServiceBindings[allServiceBindings.length - 1] = metricsServiceBinding;
 
-    // Bind the resolved services
-    binder
-        .bind(ResolvedServices.class)
-        .toProvider(new ResolvedServicesProvider(allServiceBindings));
+        // Bind the resolved services
+        binder.bind(ResolvedServices.class).toProvider(new ResolvedServicesProvider(allServiceBindings));
 
-    // And bind the router
-    binder.bind(LagomServiceRouter.class).to(JavadslServicesRouter.class);
-  }
+        // And bind the router
+        binder.bind(LagomServiceRouter.class).to(JavadslServicesRouter.class);
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java
index e37e6b94498..16661bd821a 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java
@@ -22,70 +22,67 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class AkkaHttp2ServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public AkkaHttp2ServerInstrumentation() {
-    super("akka-http2", "akka-http", "akka-http-server");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public AkkaHttp2ServerInstrumentation() {
+        super("akka-http2", "akka-http", "akka-http-server");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {"akka.http.scaladsl.Http2Ext", "akka.http.impl.engine.http2.Http2Ext"};
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"akka.http.scaladsl.Http2Ext", "akka.http.impl.engine.http2.Http2Ext"};
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        takesArguments(8)
-            .and(named("bindAndHandleAsync"))
-            .and(takesArgument(0, named("scala.Function1")))
-            .and(takesArgument(7, named("akka.stream.Materializer"))),
-        getClass().getName() + "$Http2BindAndHandleAsync8ArgAdvice");
-    transformer.applyAdvice(
-        takesArguments(7)
-            .and(named("bindAndHandleAsync"))
-            .and(takesArgument(0, named("scala.Function1")))
-            .and(takesArgument(6, named("akka.stream.Materializer"))),
-        getClass().getName() + "$Http2BindAndHandleAsync7ArgAdvice");
-    transformer.applyAdvice(
-        takesArguments(6)
-            .and(named("bindAndHandleAsync"))
-            .and(takesArgument(0, named("scala.Function1")))
-            .and(takesArgument(5, named("akka.stream.Materializer"))),
-        getClass().getName() + "$Http2BindAndHandleAsync6ArgAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                takesArguments(8)
+                        .and(named("bindAndHandleAsync"))
+                        .and(takesArgument(0, named("scala.Function1")))
+                        .and(takesArgument(7, named("akka.stream.Materializer"))),
+                getClass().getName() + "$Http2BindAndHandleAsync8ArgAdvice");
+        transformer.applyAdvice(
+                takesArguments(7)
+                        .and(named("bindAndHandleAsync"))
+                        .and(takesArgument(0, named("scala.Function1")))
+                        .and(takesArgument(6, named("akka.stream.Materializer"))),
+                getClass().getName() + "$Http2BindAndHandleAsync7ArgAdvice");
+        transformer.applyAdvice(
+                takesArguments(6)
+                        .and(named("bindAndHandleAsync"))
+                        .and(takesArgument(0, named("scala.Function1")))
+                        .and(takesArgument(5, named("akka.stream.Materializer"))),
+                getClass().getName() + "$Http2BindAndHandleAsync6ArgAdvice");
+    }
 
-  public static class Http2BindAndHandleAsync8ArgAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(
-        @Advice.Argument(value = 0, readOnly = false)
-            Function1<HttpRequest, Future<HttpResponse>> handler,
-        @Advice.Argument(value = 7) final Materializer materializer) {
-      handler = new DatadogAsyncHandlerWrapper(handler, materializer);
+    public static class Http2BindAndHandleAsync8ArgAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(
+                @Advice.Argument(value = 0, readOnly = false) Function1<HttpRequest, Future<HttpResponse>> handler,
+                @Advice.Argument(value = 7) final Materializer materializer) {
+            handler = new DatadogAsyncHandlerWrapper(handler, materializer);
+        }
     }
-  }
 
-  public static class Http2BindAndHandleAsync7ArgAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(
-        @Advice.Argument(value = 0, readOnly = false)
-            Function1<HttpRequest, Future<HttpResponse>> handler,
-        @Advice.Argument(value = 6) final Materializer materializer) {
-      handler = new DatadogAsyncHandlerWrapper(handler, materializer);
+    public static class Http2BindAndHandleAsync7ArgAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(
+                @Advice.Argument(value = 0, readOnly = false) Function1<HttpRequest, Future<HttpResponse>> handler,
+                @Advice.Argument(value = 6) final Materializer materializer) {
+            handler = new DatadogAsyncHandlerWrapper(handler, materializer);
+        }
     }
-  }
 
-  public static class Http2BindAndHandleAsync6ArgAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(
-        @Advice.Argument(value = 0, readOnly = false)
-            Function1<HttpRequest, Future<HttpResponse>> handler,
-        @Advice.Argument(value = 5) final Materializer materializer) {
-      handler = new DatadogAsyncHandlerWrapper(handler, materializer);
+    public static class Http2BindAndHandleAsync6ArgAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(
+                @Advice.Argument(value = 0, readOnly = false) Function1<HttpRequest, Future<HttpResponse>> handler,
+                @Advice.Argument(value = 5) final Materializer materializer) {
+            handler = new DatadogAsyncHandlerWrapper(handler, materializer);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpClientDecorator.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpClientDecorator.java
index 67ebfbc0f21..45c378f6410 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpClientDecorator.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpClientDecorator.java
@@ -10,43 +10,42 @@
 import java.net.URISyntaxException;
 
 public class AkkaHttpClientDecorator extends HttpClientDecorator<HttpRequest, HttpResponse> {
-  public static final CharSequence AKKA_HTTP_CLIENT = UTF8BytesString.create("akka-http-client");
-  public static final AkkaHttpClientDecorator DECORATE = new AkkaHttpClientDecorator();
-  public static final CharSequence AKKA_CLIENT_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"akka-http", "akka-http-client"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return AKKA_HTTP_CLIENT;
-  }
-
-  @Override
-  protected String method(final HttpRequest httpRequest) {
-    return httpRequest.method().value();
-  }
-
-  @Override
-  protected URI url(final HttpRequest httpRequest) throws URISyntaxException {
-    return URIUtils.safeParse(httpRequest.uri().toString());
-  }
-
-  @Override
-  protected int status(final HttpResponse httpResponse) {
-    return httpResponse.status().intValue();
-  }
-
-  @Override
-  protected String getRequestHeader(HttpRequest request, String headerName) {
-    return request.getHeader(headerName).map(HttpHeader::value).orElse(null);
-  }
-
-  @Override
-  protected String getResponseHeader(HttpResponse response, String headerName) {
-    return response.getHeader(headerName).map(HttpHeader::value).orElse(null);
-  }
+    public static final CharSequence AKKA_HTTP_CLIENT = UTF8BytesString.create("akka-http-client");
+    public static final AkkaHttpClientDecorator DECORATE = new AkkaHttpClientDecorator();
+    public static final CharSequence AKKA_CLIENT_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"akka-http", "akka-http-client"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return AKKA_HTTP_CLIENT;
+    }
+
+    @Override
+    protected String method(final HttpRequest httpRequest) {
+        return httpRequest.method().value();
+    }
+
+    @Override
+    protected URI url(final HttpRequest httpRequest) throws URISyntaxException {
+        return URIUtils.safeParse(httpRequest.uri().toString());
+    }
+
+    @Override
+    protected int status(final HttpResponse httpResponse) {
+        return httpResponse.status().intValue();
+    }
+
+    @Override
+    protected String getRequestHeader(HttpRequest request, String headerName) {
+        return request.getHeader(headerName).map(HttpHeader::value).orElse(null);
+    }
+
+    @Override
+    protected String getResponseHeader(HttpResponse response, String headerName) {
+        return response.getHeader(headerName).map(HttpHeader::value).orElse(null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpClientHelpers.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpClientHelpers.java
index 1ce5ed19499..ad9c968caf7 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpClientHelpers.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpClientHelpers.java
@@ -13,77 +13,77 @@
 import scala.util.Try;
 
 public final class AkkaHttpClientHelpers {
-  public static class OnCompleteHandler extends AbstractFunction1<Try<HttpResponse>, Void> {
-    private final AgentSpan span;
+    public static class OnCompleteHandler extends AbstractFunction1<Try<HttpResponse>, Void> {
+        private final AgentSpan span;
 
-    public OnCompleteHandler(final AgentSpan span) {
-      this.span = span;
-    }
+        public OnCompleteHandler(final AgentSpan span) {
+            this.span = span;
+        }
 
-    @Override
-    public Void apply(final Try<HttpResponse> result) {
-      if (result.isSuccess()) {
-        DECORATE.onResponse(span, result.get());
-      } else {
-        DECORATE.onError(span, result.failed().get());
-      }
-      DECORATE.beforeFinish(span);
-      span.finish();
-      return null;
+        @Override
+        public Void apply(final Try<HttpResponse> result) {
+            if (result.isSuccess()) {
+                DECORATE.onResponse(span, result.get());
+            } else {
+                DECORATE.onError(span, result.failed().get());
+            }
+            DECORATE.beforeFinish(span);
+            span.finish();
+            return null;
+        }
     }
-  }
 
-  public static class AkkaHttpHeaders implements CarrierSetter<HttpRequest> {
-    private HttpRequest request;
-    // Did this request have a span when the AkkaHttpHeaders object was created?
-    private final boolean hadSpan;
+    public static class AkkaHttpHeaders implements CarrierSetter<HttpRequest> {
+        private HttpRequest request;
+        // Did this request have a span when the AkkaHttpHeaders object was created?
+        private final boolean hadSpan;
 
-    public AkkaHttpHeaders(final HttpRequest request) {
-      hadSpan = request != null && request.getHeader(HasSpanHeader.class).isPresent();
-      if (hadSpan || request == null) {
-        this.request = request;
-      } else {
-        // Coerce a Scala trait Self type into the correct type
-        this.request = (HttpRequest) request.addHeader(new HasSpanHeader());
-      }
-    }
+        public AkkaHttpHeaders(final HttpRequest request) {
+            hadSpan = request != null && request.getHeader(HasSpanHeader.class).isPresent();
+            if (hadSpan || request == null) {
+                this.request = request;
+            } else {
+                // Coerce a Scala trait Self type into the correct type
+                this.request = (HttpRequest) request.addHeader(new HasSpanHeader());
+            }
+        }
 
-    public boolean hadSpan() {
-      return hadSpan;
-    }
+        public boolean hadSpan() {
+            return hadSpan;
+        }
 
-    @ParametersAreNonnullByDefault
-    @Override
-    public void set(final HttpRequest carrier, final String key, final String value) {
-      // Coerce a Scala trait Self type into the correct type
-      request = (HttpRequest) request.addHeader(RawHeader.create(key, value));
-    }
+        @ParametersAreNonnullByDefault
+        @Override
+        public void set(final HttpRequest carrier, final String key, final String value) {
+            // Coerce a Scala trait Self type into the correct type
+            request = (HttpRequest) request.addHeader(RawHeader.create(key, value));
+        }
 
-    public HttpRequest getRequest() {
-      return request;
+        public HttpRequest getRequest() {
+            return request;
+        }
     }
-  }
 
-  // Custom header to mark that this request has a span associated with it
-  public static class HasSpanHeader extends CustomHeader {
-    @Override
-    public String name() {
-      return "x-datadog-request-has-span";
-    }
+    // Custom header to mark that this request has a span associated with it
+    public static class HasSpanHeader extends CustomHeader {
+        @Override
+        public String name() {
+            return "x-datadog-request-has-span";
+        }
 
-    @Override
-    public String value() {
-      return "true";
-    }
+        @Override
+        public String value() {
+            return "true";
+        }
 
-    @Override
-    public boolean renderInRequests() {
-      return false;
-    }
+        @Override
+        public boolean renderInRequests() {
+            return false;
+        }
 
-    @Override
-    public boolean renderInResponses() {
-      return false;
+        @Override
+        public boolean renderInResponses() {
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerDecorator.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerDecorator.java
index c4ffd1d83b0..16e3f044582 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerDecorator.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerDecorator.java
@@ -15,93 +15,90 @@
 import scala.Option;
 import scala.reflect.ClassTag$;
 
-public class AkkaHttpServerDecorator
-    extends HttpServerDecorator<HttpRequest, HttpRequest, HttpResponse, HttpRequest> {
-  private static final CharSequence AKKA_HTTP_SERVER = UTF8BytesString.create("akka-http-server");
-
-  public static final AkkaHttpServerDecorator DECORATE = new AkkaHttpServerDecorator();
-  public static final CharSequence AKKA_SERVER_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"akka-http", "akka-http-server"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return AKKA_HTTP_SERVER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpRequest> getter() {
-    return AkkaHttpServerHeaders.requestGetter();
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
-    return AkkaHttpServerHeaders.responseGetter();
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return AKKA_SERVER_REQUEST;
-  }
-
-  @Override
-  protected String method(final HttpRequest httpRequest) {
-    return httpRequest.method().value();
-  }
-
-  @Override
-  protected URIDataAdapter url(final HttpRequest httpRequest) {
-    return new UriAdapter(httpRequest.uri());
-  }
-
-  @Override
-  protected String peerHostIP(final HttpRequest httpRequest) {
-    Option<HttpHeader> header = httpRequest.header(ClassTag$.MODULE$.apply(RemoteAddress.class));
-    if (!header.isEmpty()) {
-      RemoteAddress httpHeader = (RemoteAddress) header.get();
-      akka.http.javadsl.model.RemoteAddress remAddress = httpHeader.address();
-      Optional<InetAddress> address = remAddress.getAddress();
-      if (address.isPresent()) {
-        return address.get().getHostAddress();
-      }
+public class AkkaHttpServerDecorator extends HttpServerDecorator<HttpRequest, HttpRequest, HttpResponse, HttpRequest> {
+    private static final CharSequence AKKA_HTTP_SERVER = UTF8BytesString.create("akka-http-server");
+
+    public static final AkkaHttpServerDecorator DECORATE = new AkkaHttpServerDecorator();
+    public static final CharSequence AKKA_SERVER_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"akka-http", "akka-http-server"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return AKKA_HTTP_SERVER;
     }
-    return null;
-  }
-
-  @Override
-  protected int peerPort(final HttpRequest httpRequest) {
-    Option<HttpHeader> header = httpRequest.header(ClassTag$.MODULE$.apply(RemoteAddress.class));
-    if (!header.isEmpty()) {
-      RemoteAddress httpHeader = (RemoteAddress) header.get();
-      akka.http.javadsl.model.RemoteAddress address = httpHeader.address();
-      return address.getPort();
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpRequest> getter() {
+        return AkkaHttpServerHeaders.requestGetter();
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
+        return AkkaHttpServerHeaders.responseGetter();
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return AKKA_SERVER_REQUEST;
+    }
+
+    @Override
+    protected String method(final HttpRequest httpRequest) {
+        return httpRequest.method().value();
+    }
+
+    @Override
+    protected URIDataAdapter url(final HttpRequest httpRequest) {
+        return new UriAdapter(httpRequest.uri());
+    }
+
+    @Override
+    protected String peerHostIP(final HttpRequest httpRequest) {
+        Option<HttpHeader> header = httpRequest.header(ClassTag$.MODULE$.apply(RemoteAddress.class));
+        if (!header.isEmpty()) {
+            RemoteAddress httpHeader = (RemoteAddress) header.get();
+            akka.http.javadsl.model.RemoteAddress remAddress = httpHeader.address();
+            Optional<InetAddress> address = remAddress.getAddress();
+            if (address.isPresent()) {
+                return address.get().getHostAddress();
+            }
+        }
+        return null;
+    }
+
+    @Override
+    protected int peerPort(final HttpRequest httpRequest) {
+        Option<HttpHeader> header = httpRequest.header(ClassTag$.MODULE$.apply(RemoteAddress.class));
+        if (!header.isEmpty()) {
+            RemoteAddress httpHeader = (RemoteAddress) header.get();
+            akka.http.javadsl.model.RemoteAddress address = httpHeader.address();
+            return address.getPort();
+        }
+        return 0;
+    }
+
+    @Override
+    protected int status(final HttpResponse httpResponse) {
+        return httpResponse.status().intValue();
+    }
+
+    @Override
+    protected String getRequestHeader(HttpRequest httpRequest, String key) {
+        Optional<akka.http.javadsl.model.HttpHeader> header = httpRequest.getHeader(key);
+        return header.map(HttpHeader::value).orElse(null);
+    }
+
+    @Override
+    protected boolean isAppSecOnResponseSeparate() {
+        return true;
+    }
+
+    @Override
+    protected BlockResponseFunction createBlockResponseFunction(HttpRequest httpRequest, HttpRequest httpRequest2) {
+        return new AkkaBlockResponseFunction(httpRequest);
     }
-    return 0;
-  }
-
-  @Override
-  protected int status(final HttpResponse httpResponse) {
-    return httpResponse.status().intValue();
-  }
-
-  @Override
-  protected String getRequestHeader(HttpRequest httpRequest, String key) {
-    Optional<akka.http.javadsl.model.HttpHeader> header = httpRequest.getHeader(key);
-    return header.map(HttpHeader::value).orElse(null);
-  }
-
-  @Override
-  protected boolean isAppSecOnResponseSeparate() {
-    return true;
-  }
-
-  @Override
-  protected BlockResponseFunction createBlockResponseFunction(
-      HttpRequest httpRequest, HttpRequest httpRequest2) {
-    return new AkkaBlockResponseFunction(httpRequest);
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerHeaders.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerHeaders.java
index 124b59f363e..326ae86e8fc 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerHeaders.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerHeaders.java
@@ -12,63 +12,57 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
 
 public class AkkaHttpServerHeaders {
-  private AkkaHttpServerHeaders() {}
+    private AkkaHttpServerHeaders() {}
 
-  private static final AgentPropagation.ContextVisitor<HttpRequest> GETTER_REQUEST =
-      AkkaHttpServerHeaders::forEachKeyRequest;
-  private static final AgentPropagation.ContextVisitor<HttpResponse> GETTER_RESPONSE =
-      AkkaHttpServerHeaders::forEachKeyResponse;
+    private static final AgentPropagation.ContextVisitor<HttpRequest> GETTER_REQUEST =
+            AkkaHttpServerHeaders::forEachKeyRequest;
+    private static final AgentPropagation.ContextVisitor<HttpResponse> GETTER_RESPONSE =
+            AkkaHttpServerHeaders::forEachKeyResponse;
 
-  public static AgentPropagation.ContextVisitor<HttpRequest> requestGetter() {
-    return GETTER_REQUEST;
-  }
+    public static AgentPropagation.ContextVisitor<HttpRequest> requestGetter() {
+        return GETTER_REQUEST;
+    }
 
-  public static AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
-    return GETTER_RESPONSE;
-  }
+    public static AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
+        return GETTER_RESPONSE;
+    }
 
-  private static void doForEachKey(
-      HttpMessage carrier,
-      akka.http.javadsl.model.HttpEntity entity,
-      AgentPropagation.KeyClassifier classifier) {
-    // In Akka HTTP, Content-Type is part of the entity, not a regular header.
-    // Extract it for all entity types (Default, Chunked, etc.), not only Strict.
-    if (entity instanceof HttpEntity) {
-      ContentType contentType = ((HttpEntity) entity).contentType();
-      if (contentType != null) {
-        String contentTypeValue = contentType.value();
-        if (!contentTypeValue.isEmpty() && !classifier.accept("content-type", contentTypeValue)) {
-          return;
+    private static void doForEachKey(
+            HttpMessage carrier, akka.http.javadsl.model.HttpEntity entity, AgentPropagation.KeyClassifier classifier) {
+        // In Akka HTTP, Content-Type is part of the entity, not a regular header.
+        // Extract it for all entity types (Default, Chunked, etc.), not only Strict.
+        if (entity instanceof HttpEntity) {
+            ContentType contentType = ((HttpEntity) entity).contentType();
+            if (contentType != null) {
+                String contentTypeValue = contentType.value();
+                if (!contentTypeValue.isEmpty() && !classifier.accept("content-type", contentTypeValue)) {
+                    return;
+                }
+            }
+        }
+        if (entity instanceof HttpEntity.Strict) {
+            HttpEntity.Strict strictEntity = (HttpEntity.Strict) entity;
+            if (!classifier.accept("content-length", Long.toString(strictEntity.contentLength()))) {
+                return;
+            }
         }
-      }
-    }
-    if (entity instanceof HttpEntity.Strict) {
-      HttpEntity.Strict strictEntity = (HttpEntity.Strict) entity;
-      if (!classifier.accept("content-length", Long.toString(strictEntity.contentLength()))) {
-        return;
-      }
-    }
 
-    for (final HttpHeader header : carrier.getHeaders()) {
-      // skip synthetic headers
-      if (header instanceof RemoteAddress
-          || header instanceof TimeoutAccess
-          || header instanceof RawRequestURI) {
-        continue;
-      }
-      if (!classifier.accept(header.lowercaseName(), header.value())) {
-        return;
-      }
+        for (final HttpHeader header : carrier.getHeaders()) {
+            // skip synthetic headers
+            if (header instanceof RemoteAddress || header instanceof TimeoutAccess || header instanceof RawRequestURI) {
+                continue;
+            }
+            if (!classifier.accept(header.lowercaseName(), header.value())) {
+                return;
+            }
+        }
     }
-  }
 
-  private static void forEachKeyRequest(
-      HttpRequest req, AgentPropagation.KeyClassifier classifier) {
-    doForEachKey(req, req.entity(), classifier);
-  }
+    private static void forEachKeyRequest(HttpRequest req, AgentPropagation.KeyClassifier classifier) {
+        doForEachKey(req, req.entity(), classifier);
+    }
 
-  private static void forEachKeyResponse(
-      final HttpResponse resp, final AgentPropagation.KeyClassifier classifier) {
-    doForEachKey(resp, resp.entity(), classifier);
-  }
+    private static void forEachKeyResponse(final HttpResponse resp, final AgentPropagation.KeyClassifier classifier) {
+        doForEachKey(resp, resp.entity(), classifier);
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java
index d2555ed1c8a..0376f8998b2 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java
@@ -51,38 +51,39 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class AkkaHttpServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public AkkaHttpServerInstrumentation() {
-    super("akka-http", "akka-http-server");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public AkkaHttpServerInstrumentation() {
+        super("akka-http", "akka-http-server");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.http.scaladsl.HttpExt";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.http.scaladsl.HttpExt";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("bindAndHandle").and(takesArgument(0, named("akka.stream.scaladsl.Flow"))),
-        getClass().getName() + "$AkkaHttpBindAndHandleAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("bindAndHandle").and(takesArgument(0, named("akka.stream.scaladsl.Flow"))),
+                getClass().getName() + "$AkkaHttpBindAndHandleAdvice");
+    }
 
-  public static class AkkaHttpBindAndHandleAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(
-        @Advice.Argument(value = 0, readOnly = false)
-            Flow<HttpRequest, HttpResponse, NotUsed> handler,
-        @Advice.Argument(value = 4, readOnly = false) ServerSettings settings) {
-      handler = handler.asJava().recover(RecoverFromBlockedExceptionPF.INSTANCE).asScala();
-      final BidiFlow<HttpResponse, HttpResponse, HttpRequest, HttpRequest, NotUsed> wrapper =
-          BidiFlow.fromGraph(new DatadogServerRequestResponseFlowWrapper(settings));
-      handler = wrapper.reversed().join(handler.asJava()).asScala();
+    public static class AkkaHttpBindAndHandleAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(
+                @Advice.Argument(value = 0, readOnly = false) Flow<HttpRequest, HttpResponse, NotUsed> handler,
+                @Advice.Argument(value = 4, readOnly = false) ServerSettings settings) {
+            handler = handler.asJava()
+                    .recover(RecoverFromBlockedExceptionPF.INSTANCE)
+                    .asScala();
+            final BidiFlow<HttpResponse, HttpResponse, HttpRequest, HttpRequest, NotUsed> wrapper =
+                    BidiFlow.fromGraph(new DatadogServerRequestResponseFlowWrapper(settings));
+            handler = wrapper.reversed().join(handler.asJava()).asScala();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java
index 5fe7844e488..b8c908cfec0 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java
@@ -27,99 +27,96 @@
 
 @AutoService(InstrumenterModule.class)
 public final class AkkaHttpSingleRequestInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public AkkaHttpSingleRequestInstrumentation() {
-    super("akka-http", "akka-http-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public AkkaHttpSingleRequestInstrumentation() {
+        super("akka-http", "akka-http-client");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.http.scaladsl.HttpExt";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.http.scaladsl.HttpExt";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".AkkaHttpClientHelpers",
-      packageName + ".AkkaHttpClientHelpers$OnCompleteHandler",
-      packageName + ".AkkaHttpClientHelpers$AkkaHttpHeaders",
-      packageName + ".AkkaHttpClientHelpers$HasSpanHeader",
-      packageName + ".AkkaHttpClientDecorator",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".AkkaHttpClientHelpers",
+            packageName + ".AkkaHttpClientHelpers$OnCompleteHandler",
+            packageName + ".AkkaHttpClientHelpers$AkkaHttpHeaders",
+            packageName + ".AkkaHttpClientHelpers$HasSpanHeader",
+            packageName + ".AkkaHttpClientDecorator",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // This is mainly for compatibility with 10.0
-    transformer.applyAdvices(
-        named("singleRequest").and(takesArgument(0, named("akka.http.scaladsl.model.HttpRequest"))),
-        AkkaHttpSingleRequestInstrumentation.class.getName() + "$SingleRequestAdvice",
-        AkkaHttpSingleRequestInstrumentation.class.getName()
-            + "$SingleRequestContextPropagationAdvice");
-    // This is for 10.1+
-    transformer.applyAdvices(
-        named("singleRequestImpl")
-            .and(takesArgument(0, named("akka.http.scaladsl.model.HttpRequest"))),
-        AkkaHttpSingleRequestInstrumentation.class.getName() + "$SingleRequestAdvice",
-        AkkaHttpSingleRequestInstrumentation.class.getName()
-            + "$SingleRequestContextPropagationAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // This is mainly for compatibility with 10.0
+        transformer.applyAdvices(
+                named("singleRequest").and(takesArgument(0, named("akka.http.scaladsl.model.HttpRequest"))),
+                AkkaHttpSingleRequestInstrumentation.class.getName() + "$SingleRequestAdvice",
+                AkkaHttpSingleRequestInstrumentation.class.getName() + "$SingleRequestContextPropagationAdvice");
+        // This is for 10.1+
+        transformer.applyAdvices(
+                named("singleRequestImpl").and(takesArgument(0, named("akka.http.scaladsl.model.HttpRequest"))),
+                AkkaHttpSingleRequestInstrumentation.class.getName() + "$SingleRequestAdvice",
+                AkkaHttpSingleRequestInstrumentation.class.getName() + "$SingleRequestContextPropagationAdvice");
+    }
 
-  public static class SingleRequestAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(@Advice.Argument(value = 0) final HttpRequest request) {
-      /*
-      Versions 10.0 and 10.1 have slightly different structure that is hard to distinguish so here
-      we cast 'wider net' and avoid instrumenting twice.
-      In the future we may want to separate these, but since lots of code is reused we would need to come up
-      with way of continuing to reusing it.
-       */
-      final AkkaHttpHeaders headers = new AkkaHttpHeaders(request);
-      if (headers.hadSpan()) {
-        return null;
-      }
+    public static class SingleRequestAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(@Advice.Argument(value = 0) final HttpRequest request) {
+            /*
+            Versions 10.0 and 10.1 have slightly different structure that is hard to distinguish so here
+            we cast 'wider net' and avoid instrumenting twice.
+            In the future we may want to separate these, but since lots of code is reused we would need to come up
+            with way of continuing to reusing it.
+             */
+            final AkkaHttpHeaders headers = new AkkaHttpHeaders(request);
+            if (headers.hadSpan()) {
+                return null;
+            }
 
-      final AgentSpan span = startSpan(AKKA_HTTP_CLIENT.toString(), AKKA_CLIENT_REQUEST);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, request);
-      return activateSpan(span);
-    }
+            final AgentSpan span = startSpan(AKKA_HTTP_CLIENT.toString(), AKKA_CLIENT_REQUEST);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, request);
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.This final HttpExt thiz,
-        @Advice.Return final Future<HttpResponse> responseFuture,
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.This final HttpExt thiz,
+                @Advice.Return final Future<HttpResponse> responseFuture,
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
 
-      final AgentSpan span = spanFromScope(scope);
+            final AgentSpan span = spanFromScope(scope);
 
-      if (throwable == null) {
-        responseFuture.onComplete(new OnCompleteHandler(span), thiz.system().dispatcher());
-        scope.close();
-      } else {
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      }
+            if (throwable == null) {
+                responseFuture.onComplete(
+                        new OnCompleteHandler(span), thiz.system().dispatcher());
+                scope.close();
+            } else {
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            }
+        }
     }
-  }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class SingleRequestContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
-        @Advice.Argument(value = 0, readOnly = false) HttpRequest request) {
-      if (request == null) {
-        return;
-      }
-      final AkkaHttpHeaders headers = new AkkaHttpHeaders(request);
-      DECORATE.injectContext(currentContext(), request, headers);
-      request = headers.getRequest();
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class SingleRequestContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter(@Advice.Argument(value = 0, readOnly = false) HttpRequest request) {
+            if (request == null) {
+                return;
+            }
+            final AkkaHttpHeaders headers = new AkkaHttpHeaders(request);
+            DECORATE.injectContext(currentContext(), request, headers);
+            request = headers.getRequest();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaPoolMasterActorInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaPoolMasterActorInstrumentation.java
index ce271b32e64..4fa24dc715f 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaPoolMasterActorInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaPoolMasterActorInstrumentation.java
@@ -12,40 +12,40 @@
 
 @AutoService(InstrumenterModule.class)
 public final class AkkaPoolMasterActorInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public AkkaPoolMasterActorInstrumentation() {
-    super("akka-http", "akka-http-client");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "akka.http.impl.engine.client.PoolMasterActor";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // This is how scala names a method that is private to a class but is used in a PartialFunction
-    transformer.applyAdvice(
-        named("akka$http$impl$engine$client$PoolMasterActor$$startPoolInterface"),
-        AkkaPoolMasterActorInstrumentation.class.getName() + "$BlockPropagation");
-  }
-
-  /**
-   * This instrumentation ensures that the creation of a pool doesn't attach the current {@code
-   * Scope} to the {@code onComplete} of the {@code Future} that is only completed when the
-   * interface is shut down. This means that the {@code Trace} will finish fast, and not wait for
-   * the flush to happen.
-   */
-  public static class BlockPropagation {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter() {
-      return activateSpan(noopSpan());
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public AkkaPoolMasterActorInstrumentation() {
+        super("akka-http", "akka-http-client");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Enter final ContextScope scope) {
-      scope.close();
+    @Override
+    public String instrumentedType() {
+        return "akka.http.impl.engine.client.PoolMasterActor";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // This is how scala names a method that is private to a class but is used in a PartialFunction
+        transformer.applyAdvice(
+                named("akka$http$impl$engine$client$PoolMasterActor$$startPoolInterface"),
+                AkkaPoolMasterActorInstrumentation.class.getName() + "$BlockPropagation");
+    }
+
+    /**
+     * This instrumentation ensures that the creation of a pool doesn't attach the current {@code
+     * Scope} to the {@code onComplete} of the {@code Future} that is only completed when the
+     * interface is shut down. This means that the {@code Trace} will finish fast, and not wait for
+     * the flush to happen.
+     */
+    public static class BlockPropagation {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter() {
+            return activateSpan(noopSpan());
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Enter final ContextScope scope) {
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogAsyncHandlerWrapper.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogAsyncHandlerWrapper.java
index 91850d3621f..32b98ebd382 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogAsyncHandlerWrapper.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogAsyncHandlerWrapper.java
@@ -15,73 +15,68 @@
 import scala.concurrent.Future;
 import scala.runtime.AbstractFunction1;
 
-public class DatadogAsyncHandlerWrapper
-    extends AbstractFunction1<HttpRequest, Future<HttpResponse>> {
-  private final Function1<HttpRequest, Future<HttpResponse>> userHandler;
-  private final Materializer materializer;
+public class DatadogAsyncHandlerWrapper extends AbstractFunction1<HttpRequest, Future<HttpResponse>> {
+    private final Function1<HttpRequest, Future<HttpResponse>> userHandler;
+    private final Materializer materializer;
 
-  public DatadogAsyncHandlerWrapper(
-      final Function1<HttpRequest, Future<HttpResponse>> userHandler,
-      final Materializer materializer) {
-    this.userHandler = userHandler;
-    this.materializer = materializer;
-  }
+    public DatadogAsyncHandlerWrapper(
+            final Function1<HttpRequest, Future<HttpResponse>> userHandler, final Materializer materializer) {
+        this.userHandler = userHandler;
+        this.materializer = materializer;
+    }
 
-  @Override
-  public Future<HttpResponse> apply(final HttpRequest request) {
-    final ContextScope scope = DatadogWrapperHelper.createSpan(request);
-    final Context context = scope.context();
-    final AgentSpan span = fromContext(context);
-    Future<HttpResponse> futureResponse;
+    @Override
+    public Future<HttpResponse> apply(final HttpRequest request) {
+        final ContextScope scope = DatadogWrapperHelper.createSpan(request);
+        final Context context = scope.context();
+        final AgentSpan span = fromContext(context);
+        Future<HttpResponse> futureResponse;
 
-    // handle blocking in the beginning of the request
-    Flow.Action.RequestBlockingAction rba;
-    if ((rba = span.getRequestBlockingAction()) != null) {
-      request.discardEntityBytes(materializer);
-      HttpResponse response = BlockingResponseHelper.maybeCreateBlockingResponse(rba, request);
-      span.getRequestContext().getTraceSegment().effectivelyBlocked();
-      DatadogWrapperHelper.finishSpan(context, response);
-      return FastFuture$.MODULE$.<HttpResponse>successful().apply(response);
-    }
+        // handle blocking in the beginning of the request
+        Flow.Action.RequestBlockingAction rba;
+        if ((rba = span.getRequestBlockingAction()) != null) {
+            request.discardEntityBytes(materializer);
+            HttpResponse response = BlockingResponseHelper.maybeCreateBlockingResponse(rba, request);
+            span.getRequestContext().getTraceSegment().effectivelyBlocked();
+            DatadogWrapperHelper.finishSpan(context, response);
+            return FastFuture$.MODULE$.<HttpResponse>successful().apply(response);
+        }
 
-    try {
-      futureResponse = userHandler.apply(request);
-    } catch (final Throwable t) {
-      scope.close();
-      DatadogWrapperHelper.finishSpan(context, t);
-      throw t;
-    }
+        try {
+            futureResponse = userHandler.apply(request);
+        } catch (final Throwable t) {
+            scope.close();
+            DatadogWrapperHelper.finishSpan(context, t);
+            throw t;
+        }
 
-    final Future<HttpResponse> wrapped =
-        futureResponse
-            .recoverWith(
-                RecoverFromBlockedExceptionPF.INSTANCE_FUTURE, materializer.executionContext())
-            .transform(
-                new AbstractFunction1<HttpResponse, HttpResponse>() {
-                  @Override
-                  public HttpResponse apply(HttpResponse response) {
-                    // handle blocking at the middle/end of the request
-                    HttpResponse newResponse =
-                        BlockingResponseHelper.handleFinishForWaf(span, response);
-                    if (newResponse != response) {
-                      span.getRequestContext().getTraceSegment().effectivelyBlocked();
-                      response.entity().discardBytes(materializer);
-                      response = newResponse;
-                    }
+        final Future<HttpResponse> wrapped = futureResponse
+                .recoverWith(RecoverFromBlockedExceptionPF.INSTANCE_FUTURE, materializer.executionContext())
+                .transform(
+                        new AbstractFunction1<HttpResponse, HttpResponse>() {
+                            @Override
+                            public HttpResponse apply(HttpResponse response) {
+                                // handle blocking at the middle/end of the request
+                                HttpResponse newResponse = BlockingResponseHelper.handleFinishForWaf(span, response);
+                                if (newResponse != response) {
+                                    span.getRequestContext().getTraceSegment().effectivelyBlocked();
+                                    response.entity().discardBytes(materializer);
+                                    response = newResponse;
+                                }
 
-                    DatadogWrapperHelper.finishSpan(context, response);
-                    return response;
-                  }
-                },
-                new AbstractFunction1<Throwable, Throwable>() {
-                  @Override
-                  public Throwable apply(final Throwable t) {
-                    DatadogWrapperHelper.finishSpan(context, t);
-                    return t;
-                  }
-                },
-                materializer.executionContext());
-    scope.close();
-    return wrapped;
-  }
+                                DatadogWrapperHelper.finishSpan(context, response);
+                                return response;
+                            }
+                        },
+                        new AbstractFunction1<Throwable, Throwable>() {
+                            @Override
+                            public Throwable apply(final Throwable t) {
+                                DatadogWrapperHelper.finishSpan(context, t);
+                                return t;
+                            }
+                        },
+                        materializer.executionContext());
+        scope.close();
+        return wrapped;
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java
index 545aeff7600..7ada149c14f 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java
@@ -22,191 +22,181 @@
 import java.util.concurrent.ArrayBlockingQueue;
 
 public class DatadogServerRequestResponseFlowWrapper
-    extends GraphStage<BidiShape<HttpResponse, HttpResponse, HttpRequest, HttpRequest>> {
-  private final Inlet<HttpRequest> requestInlet = Inlet.create("Datadog.server.requestIn");
-  private final Outlet<HttpRequest> requestOutlet = Outlet.create("Datadog.server.requestOut");
-  private final Inlet<HttpResponse> responseInlet = Inlet.create("Datadog.server.responseIn");
-  private final Outlet<HttpResponse> responseOutlet = Outlet.create("Datadog.server.responseOut");
-  private final BidiShape<HttpResponse, HttpResponse, HttpRequest, HttpRequest> shape =
-      BidiShape.of(responseInlet, responseOutlet, requestInlet, requestOutlet);
-
-  private final int pipeliningLimit;
-
-  public DatadogServerRequestResponseFlowWrapper(final ServerSettings settings) {
-    this.pipeliningLimit = settings.getPipeliningLimit();
-  }
-
-  @Override
-  public BidiShape<HttpResponse, HttpResponse, HttpRequest, HttpRequest> shape() {
-    return shape;
-  }
-
-  @Override
-  public Attributes initialAttributes() {
-    return Attributes.name("DatadogServerRequestResponseFlowWrapper");
-  }
-
-  @Override
-  public GraphStageLogic createLogic(final Attributes inheritedAttributes) throws Exception {
-    return new GraphStageLogic(shape) {
-      {
-        // The is one instance of this logic per connection, and the request/response is
-        // guaranteed to be in order according to the docs at
-        // https://doc.akka.io/docs/akka-http/current/server-side/low-level-api.html#request-response-cycle
-        // and there can never be more outstanding requests than the pipeliningLimit
-        // that this connection was created with. This means that we can safely
-        // close the span at the front of the queue when we receive the response
-        // from the user code, since it will match up to the request for that span.
-        final Queue<ContextScope> scopes = new ArrayBlockingQueue<>(pipeliningLimit);
-        boolean[] skipNextPull = new boolean[] {false};
-
-        // This is where the request comes in from the server and TCP layer
-        setHandler(
-            requestInlet,
-            new AbstractInHandler() {
-              @Override
-              public void onPush() throws Exception {
-                final HttpRequest request = grab(requestInlet);
-                final ContextScope scope = DatadogWrapperHelper.createSpanForFlow(request);
-                final AgentSpan span = fromContext(scope.context());
-                RequestContext requestContext = span.getRequestContext();
-                if (requestContext != null) {
-                  HttpResponse response =
-                      BlockingResponseHelper.maybeCreateBlockingResponse(span, request);
-                  if (response != null) {
-                    request.discardEntityBytes(materializer());
-                    skipNextPull[0] = true;
-                    requestContext.getTraceSegment().effectivelyBlocked();
-                    emit(responseOutlet, response);
-                    DatadogWrapperHelper.finishSpan(scope.context(), response);
-                    pull(requestInlet);
-                    scope.close();
-                    return;
-                  }
-                }
-
-                scopes.add(scope);
-                push(requestOutlet, request);
-                // Legacy mode leaves the scope open so the surrounding actor can clean it up.
-                // Context-manager mode swaps the context and the actor restores it on exit.
-              }
-
-              @Override
-              public void onUpstreamFinish() throws Exception {
-                // We will not receive any more requests from the server and TCP layer so stop
-                // sending them
-                complete(requestOutlet);
-              }
-
-              @Override
-              public void onUpstreamFailure(final Throwable ex) throws Exception {
-                // We will not receive any more requests from the server and TCP layer so stop
-                // sending them
-                fail(requestOutlet, ex);
-              }
-            });
-
-        // This is where demand comes in from the user code
-        setHandler(
-            requestOutlet,
-            new AbstractOutHandler() {
-              @Override
-              public void onPull() throws Exception {
-                pull(requestInlet);
-              }
-
-              @Override
-              public void onDownstreamFinish() throws Exception {
-                // We can not send out any more requests to the user code so stop receiving them
-                cancel(requestInlet);
-              }
-            });
-
-        // This is where the response comes back from the user code
-        setHandler(
-            responseInlet,
-            new AbstractInHandler() {
-              @Override
-              public void onPush() throws Exception {
-                HttpResponse response = grab(responseInlet);
-                final ContextScope scope = scopes.poll();
-                if (scope != null) {
-                  AgentSpan span = fromContext(scope.context());
-                  HttpResponse newResponse =
-                      BlockingResponseHelper.handleFinishForWaf(span, response);
-                  if (newResponse != response) {
-                    span.getRequestContext().getTraceSegment().effectivelyBlocked();
-                    response.discardEntityBytes(materializer());
-                    response = newResponse;
-                  }
-                  DatadogWrapperHelper.finishSpan(scope.context(), response);
-                  // Legacy mode may still own the scope when the response arrives.
-                  AgentSpan activeSpan = activeSpan();
-                  if (activeSpan == span) {
-                    scope.close();
-                  }
-                }
-                push(responseOutlet, response);
-              }
-
-              @Override
-              public void onUpstreamFinish() throws Exception {
-                // We will not receive any more responses from the user code, so clean up any
-                // remaining spans
-                ContextScope scope = scopes.poll();
-                while (scope != null) {
-                  fromContext(scope.context()).finish();
-                  scope = scopes.poll();
-                }
-                completeStage();
-              }
-
-              @Override
-              public void onUpstreamFailure(final Throwable ex) throws Exception {
-                ContextScope scope = scopes.poll();
-                if (scope != null) {
-                  // Mark the span as failed
-                  AgentSpan span = fromContext(scope.context());
-                  DatadogWrapperHelper.finishSpan(scope.context(), ex);
-                }
-                // We will not receive any more responses from the user code, so clean up any
-                // remaining spans
-                scope = scopes.poll();
-                while (scope != null) {
-                  fromContext(scope.context()).finish();
-                  scope = scopes.poll();
-                }
-                fail(responseOutlet, ex);
-              }
-            });
-
-        // This is where demand comes in from the server and TCP layer
-        setHandler(
-            responseOutlet,
-            new AbstractOutHandler() {
-              @Override
-              public void onPull() throws Exception {
-                if (isClosed(responseInlet)) {
-                  fail(responseOutlet, new RuntimeException("Failed earlier"));
-                }
-                // condition is needed when we emit() directly to the outlet
-                // The value was not pushed through the response inlet, so we need not
-                // request more data through the inlet
-                if (skipNextPull[0]) {
-                  skipNextPull[0] = false;
-                } else {
-                  pull(responseInlet);
-                }
-              }
-
-              @Override
-              public void onDownstreamFinish() throws Exception {
-                // We can not send out any more responses to the server and TCP layer so stop
-                // receiving them
-                cancel(responseInlet);
-              }
-            });
-      }
-    };
-  }
+        extends GraphStage<BidiShape<HttpResponse, HttpResponse, HttpRequest, HttpRequest>> {
+    private final Inlet<HttpRequest> requestInlet = Inlet.create("Datadog.server.requestIn");
+    private final Outlet<HttpRequest> requestOutlet = Outlet.create("Datadog.server.requestOut");
+    private final Inlet<HttpResponse> responseInlet = Inlet.create("Datadog.server.responseIn");
+    private final Outlet<HttpResponse> responseOutlet = Outlet.create("Datadog.server.responseOut");
+    private final BidiShape<HttpResponse, HttpResponse, HttpRequest, HttpRequest> shape =
+            BidiShape.of(responseInlet, responseOutlet, requestInlet, requestOutlet);
+
+    private final int pipeliningLimit;
+
+    public DatadogServerRequestResponseFlowWrapper(final ServerSettings settings) {
+        this.pipeliningLimit = settings.getPipeliningLimit();
+    }
+
+    @Override
+    public BidiShape<HttpResponse, HttpResponse, HttpRequest, HttpRequest> shape() {
+        return shape;
+    }
+
+    @Override
+    public Attributes initialAttributes() {
+        return Attributes.name("DatadogServerRequestResponseFlowWrapper");
+    }
+
+    @Override
+    public GraphStageLogic createLogic(final Attributes inheritedAttributes) throws Exception {
+        return new GraphStageLogic(shape) {
+            {
+                // The is one instance of this logic per connection, and the request/response is
+                // guaranteed to be in order according to the docs at
+                // https://doc.akka.io/docs/akka-http/current/server-side/low-level-api.html#request-response-cycle
+                // and there can never be more outstanding requests than the pipeliningLimit
+                // that this connection was created with. This means that we can safely
+                // close the span at the front of the queue when we receive the response
+                // from the user code, since it will match up to the request for that span.
+                final Queue<ContextScope> scopes = new ArrayBlockingQueue<>(pipeliningLimit);
+                boolean[] skipNextPull = new boolean[] {false};
+
+                // This is where the request comes in from the server and TCP layer
+                setHandler(requestInlet, new AbstractInHandler() {
+                    @Override
+                    public void onPush() throws Exception {
+                        final HttpRequest request = grab(requestInlet);
+                        final ContextScope scope = DatadogWrapperHelper.createSpanForFlow(request);
+                        final AgentSpan span = fromContext(scope.context());
+                        RequestContext requestContext = span.getRequestContext();
+                        if (requestContext != null) {
+                            HttpResponse response = BlockingResponseHelper.maybeCreateBlockingResponse(span, request);
+                            if (response != null) {
+                                request.discardEntityBytes(materializer());
+                                skipNextPull[0] = true;
+                                requestContext.getTraceSegment().effectivelyBlocked();
+                                emit(responseOutlet, response);
+                                DatadogWrapperHelper.finishSpan(scope.context(), response);
+                                pull(requestInlet);
+                                scope.close();
+                                return;
+                            }
+                        }
+
+                        scopes.add(scope);
+                        push(requestOutlet, request);
+                        // Legacy mode leaves the scope open so the surrounding actor can clean it up.
+                        // Context-manager mode swaps the context and the actor restores it on exit.
+                    }
+
+                    @Override
+                    public void onUpstreamFinish() throws Exception {
+                        // We will not receive any more requests from the server and TCP layer so stop
+                        // sending them
+                        complete(requestOutlet);
+                    }
+
+                    @Override
+                    public void onUpstreamFailure(final Throwable ex) throws Exception {
+                        // We will not receive any more requests from the server and TCP layer so stop
+                        // sending them
+                        fail(requestOutlet, ex);
+                    }
+                });
+
+                // This is where demand comes in from the user code
+                setHandler(requestOutlet, new AbstractOutHandler() {
+                    @Override
+                    public void onPull() throws Exception {
+                        pull(requestInlet);
+                    }
+
+                    @Override
+                    public void onDownstreamFinish() throws Exception {
+                        // We can not send out any more requests to the user code so stop receiving them
+                        cancel(requestInlet);
+                    }
+                });
+
+                // This is where the response comes back from the user code
+                setHandler(responseInlet, new AbstractInHandler() {
+                    @Override
+                    public void onPush() throws Exception {
+                        HttpResponse response = grab(responseInlet);
+                        final ContextScope scope = scopes.poll();
+                        if (scope != null) {
+                            AgentSpan span = fromContext(scope.context());
+                            HttpResponse newResponse = BlockingResponseHelper.handleFinishForWaf(span, response);
+                            if (newResponse != response) {
+                                span.getRequestContext().getTraceSegment().effectivelyBlocked();
+                                response.discardEntityBytes(materializer());
+                                response = newResponse;
+                            }
+                            DatadogWrapperHelper.finishSpan(scope.context(), response);
+                            // Legacy mode may still own the scope when the response arrives.
+                            AgentSpan activeSpan = activeSpan();
+                            if (activeSpan == span) {
+                                scope.close();
+                            }
+                        }
+                        push(responseOutlet, response);
+                    }
+
+                    @Override
+                    public void onUpstreamFinish() throws Exception {
+                        // We will not receive any more responses from the user code, so clean up any
+                        // remaining spans
+                        ContextScope scope = scopes.poll();
+                        while (scope != null) {
+                            fromContext(scope.context()).finish();
+                            scope = scopes.poll();
+                        }
+                        completeStage();
+                    }
+
+                    @Override
+                    public void onUpstreamFailure(final Throwable ex) throws Exception {
+                        ContextScope scope = scopes.poll();
+                        if (scope != null) {
+                            // Mark the span as failed
+                            AgentSpan span = fromContext(scope.context());
+                            DatadogWrapperHelper.finishSpan(scope.context(), ex);
+                        }
+                        // We will not receive any more responses from the user code, so clean up any
+                        // remaining spans
+                        scope = scopes.poll();
+                        while (scope != null) {
+                            fromContext(scope.context()).finish();
+                            scope = scopes.poll();
+                        }
+                        fail(responseOutlet, ex);
+                    }
+                });
+
+                // This is where demand comes in from the server and TCP layer
+                setHandler(responseOutlet, new AbstractOutHandler() {
+                    @Override
+                    public void onPull() throws Exception {
+                        if (isClosed(responseInlet)) {
+                            fail(responseOutlet, new RuntimeException("Failed earlier"));
+                        }
+                        // condition is needed when we emit() directly to the outlet
+                        // The value was not pushed through the response inlet, so we need not
+                        // request more data through the inlet
+                        if (skipNextPull[0]) {
+                            skipNextPull[0] = false;
+                        } else {
+                            pull(responseInlet);
+                        }
+                    }
+
+                    @Override
+                    public void onDownstreamFinish() throws Exception {
+                        // We can not send out any more responses to the server and TCP layer so stop
+                        // receiving them
+                        cancel(responseInlet);
+                    }
+                });
+            }
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java
index cf0a5d68258..389329fd117 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java
@@ -11,71 +11,71 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 
 public class DatadogWrapperHelper {
-  private static final boolean LEGACY_CONTEXT_MANAGER_ENABLED =
-      InstrumenterConfig.get().isLegacyContextManagerEnabled();
+    private static final boolean LEGACY_CONTEXT_MANAGER_ENABLED =
+            InstrumenterConfig.get().isLegacyContextManagerEnabled();
 
-  public static ContextScope createSpan(final HttpRequest request) {
-    return startSpan(request).attach();
-  }
+    public static ContextScope createSpan(final HttpRequest request) {
+        return startSpan(request).attach();
+    }
 
-  public static ContextScope createSpanForFlow(final HttpRequest request) {
-    final Context context = startSpan(request);
-    if (LEGACY_CONTEXT_MANAGER_ENABLED) {
-      return context.attach();
+    public static ContextScope createSpanForFlow(final HttpRequest request) {
+        final Context context = startSpan(request);
+        if (LEGACY_CONTEXT_MANAGER_ENABLED) {
+            return context.attach();
+        }
+        return new SwappedContextScope(context);
     }
-    return new SwappedContextScope(context);
-  }
 
-  private static Context startSpan(final HttpRequest request) {
-    final Context parentContext = DECORATE.extract(request);
-    final Context context = DECORATE.startSpan(request, parentContext);
-    final AgentSpan span = fromContext(context);
-    DECORATE.afterStart(span);
-    DECORATE.onRequest(span, request, request, parentContext);
+    private static Context startSpan(final HttpRequest request) {
+        final Context parentContext = DECORATE.extract(request);
+        final Context context = DECORATE.startSpan(request, parentContext);
+        final AgentSpan span = fromContext(context);
+        DECORATE.afterStart(span);
+        DECORATE.onRequest(span, request, request, parentContext);
 
-    return context;
-  }
+        return context;
+    }
 
-  static final class SwappedContextScope implements ContextScope {
-    private final Context context;
-    private final Context previousContext;
-    private final Thread ownerThread;
-    private boolean closed;
+    static final class SwappedContextScope implements ContextScope {
+        private final Context context;
+        private final Context previousContext;
+        private final Thread ownerThread;
+        private boolean closed;
 
-    SwappedContextScope(final Context context) {
-      this.context = context;
-      this.ownerThread = Thread.currentThread();
-      this.previousContext = context.swap();
-    }
+        SwappedContextScope(final Context context) {
+            this.context = context;
+            this.ownerThread = Thread.currentThread();
+            this.previousContext = context.swap();
+        }
 
-    @Override
-    public Context context() {
-      return context;
-    }
+        @Override
+        public Context context() {
+            return context;
+        }
 
-    @Override
-    public void close() {
-      if (!closed && ownerThread == Thread.currentThread() && context == Context.current()) {
-        closed = true;
-        previousContext.swap();
-      }
+        @Override
+        public void close() {
+            if (!closed && ownerThread == Thread.currentThread() && context == Context.current()) {
+                closed = true;
+                previousContext.swap();
+            }
+        }
     }
-  }
 
-  public static void finishSpan(final Context context, final HttpResponse response) {
-    final AgentSpan span = fromContext(context);
-    DECORATE.onResponse(span, response);
-    DECORATE.beforeFinish(context);
+    public static void finishSpan(final Context context, final HttpResponse response) {
+        final AgentSpan span = fromContext(context);
+        DECORATE.onResponse(span, response);
+        DECORATE.beforeFinish(context);
 
-    span.finish();
-  }
+        span.finish();
+    }
 
-  public static void finishSpan(final Context context, final Throwable t) {
-    final AgentSpan span = fromContext(context);
-    DECORATE.onError(span, t);
-    span.setHttpStatusCode(500);
-    DECORATE.beforeFinish(context);
+    public static void finishSpan(final Context context, final Throwable t) {
+        final AgentSpan span = fromContext(context);
+        DECORATE.onError(span, t);
+        span.setHttpStatusCode(500);
+        DECORATE.beforeFinish(context);
 
-    span.finish();
-  }
+        span.finish();
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DefaultExceptionHandlerInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DefaultExceptionHandlerInstrumentation.java
index cab7d647167..542fe910b79 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DefaultExceptionHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DefaultExceptionHandlerInstrumentation.java
@@ -15,31 +15,30 @@
 
 @AutoService(InstrumenterModule.class)
 public class DefaultExceptionHandlerInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public DefaultExceptionHandlerInstrumentation() {
-    super("akka-http", "akka-http-server");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public DefaultExceptionHandlerInstrumentation() {
+        super("akka-http", "akka-http-server");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.http.scaladsl.server.ExceptionHandler$";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.http.scaladsl.server.ExceptionHandler$";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(returns(named("akka.http.scaladsl.server.ExceptionHandler")))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("akka.http.scaladsl.settings.RoutingSettings"))),
-        DefaultExceptionHandlerInstrumentation.class.getName() + "$DefaultHandlerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(returns(named("akka.http.scaladsl.server.ExceptionHandler")))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("akka.http.scaladsl.settings.RoutingSettings"))),
+                DefaultExceptionHandlerInstrumentation.class.getName() + "$DefaultHandlerAdvice");
+    }
 
-  static class DefaultHandlerAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(
-        @Advice.This ExceptionHandler$ eh, @Advice.Return(readOnly = false) ExceptionHandler ret) {
-      ret = eh.apply(MarkSpanAsErroredPF.INSTANCE).withFallback(ret);
+    static class DefaultHandlerAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.This ExceptionHandler$ eh, @Advice.Return(readOnly = false) ExceptionHandler ret) {
+            ret = eh.apply(MarkSpanAsErroredPF.INSTANCE).withFallback(ret);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/MarkSpanAsErroredPF.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/MarkSpanAsErroredPF.java
index 064fd2a0615..9724575f17d 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/MarkSpanAsErroredPF.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/MarkSpanAsErroredPF.java
@@ -14,18 +14,17 @@
  * the exception may be recorded.
  */
 public class MarkSpanAsErroredPF
-    extends JavaPartialFunction<Throwable, scala.Function1<RequestContext, Future<RouteResult>>> {
-  public static final JavaPartialFunction INSTANCE = new MarkSpanAsErroredPF();
+        extends JavaPartialFunction<Throwable, scala.Function1<RequestContext, Future<RouteResult>>> {
+    public static final JavaPartialFunction INSTANCE = new MarkSpanAsErroredPF();
 
-  private MarkSpanAsErroredPF() {}
+    private MarkSpanAsErroredPF() {}
 
-  @Override
-  public Function1<RequestContext, Future<RouteResult>> apply(Throwable x, boolean isCheck)
-      throws Exception {
-    AgentSpan agentSpan = AgentTracer.activeSpan();
-    if (agentSpan != null) {
-      agentSpan.addThrowable(x);
+    @Override
+    public Function1<RequestContext, Future<RouteResult>> apply(Throwable x, boolean isCheck) throws Exception {
+        AgentSpan agentSpan = AgentTracer.activeSpan();
+        if (agentSpan != null) {
+            agentSpan.addThrowable(x);
+        }
+        throw noMatch();
     }
-    throw noMatch();
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/RecoverFromBlockedExceptionPF.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/RecoverFromBlockedExceptionPF.java
index 96bfb55194d..d39560f5ad0 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/RecoverFromBlockedExceptionPF.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/RecoverFromBlockedExceptionPF.java
@@ -15,38 +15,37 @@
 import scala.concurrent.Future;
 
 public class RecoverFromBlockedExceptionPF extends JavaPartialFunction<Throwable, HttpResponse> {
-  public static final PartialFunction<Throwable, HttpResponse> INSTANCE =
-      new RecoverFromBlockedExceptionPF();
-  public static final PartialFunction<Throwable, Future<HttpResponse>> INSTANCE_FUTURE;
+    public static final PartialFunction<Throwable, HttpResponse> INSTANCE = new RecoverFromBlockedExceptionPF();
+    public static final PartialFunction<Throwable, Future<HttpResponse>> INSTANCE_FUTURE;
 
-  static {
-    JFunction1<HttpResponse, Future<HttpResponse>> f = RecoverFromBlockedExceptionPF::valueToFuture;
-    INSTANCE_FUTURE = INSTANCE.andThen(f);
-  }
+    static {
+        JFunction1<HttpResponse, Future<HttpResponse>> f = RecoverFromBlockedExceptionPF::valueToFuture;
+        INSTANCE_FUTURE = INSTANCE.andThen(f);
+    }
 
-  @Override
-  public HttpResponse apply(Throwable x, boolean isCheck) throws Exception {
-    if (x instanceof BlockingException) {
-      if (isCheck) {
-        return null;
-      }
-      AgentSpan agentSpan = AgentTracer.activeSpan();
-      if (agentSpan != null) {
-        agentSpan.addThrowable(x);
-      }
+    @Override
+    public HttpResponse apply(Throwable x, boolean isCheck) throws Exception {
+        if (x instanceof BlockingException) {
+            if (isCheck) {
+                return null;
+            }
+            AgentSpan agentSpan = AgentTracer.activeSpan();
+            if (agentSpan != null) {
+                agentSpan.addThrowable(x);
+            }
 
-      // will be replaced anyway
-      return new HttpResponse(
-          StatusCode.int2StatusCode(500),
-          List$.MODULE$.empty(),
-          HttpEntity$.MODULE$.Empty(),
-          HttpProtocols.HTTP$div1$u002E1());
-    } else {
-      throw noMatch();
+            // will be replaced anyway
+            return new HttpResponse(
+                    StatusCode.int2StatusCode(500),
+                    List$.MODULE$.empty(),
+                    HttpEntity$.MODULE$.Empty(),
+                    HttpProtocols.HTTP$div1$u002E1());
+        } else {
+            throw noMatch();
+        }
     }
-  }
 
-  private static <V> Future<V> valueToFuture(V value) {
-    return FastFuture$.MODULE$.<V>successful().apply(value);
-  }
+    private static <V> Future<V> valueToFuture(V value) {
+        return FastFuture$.MODULE$.<V>successful().apply(value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/UriAdapter.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/UriAdapter.java
index f74b4453e55..6aa27e5dff6 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/UriAdapter.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/UriAdapter.java
@@ -6,46 +6,46 @@
 
 final class UriAdapter extends URIRawDataAdapter {
 
-  private final Uri uri;
-
-  UriAdapter(Uri uri) {
-    this.uri = uri;
-  }
-
-  @Override
-  public String scheme() {
-    return uri.scheme();
-  }
-
-  @Override
-  public String host() {
-    return uri.authority().host().address();
-  }
-
-  @Override
-  public int port() {
-    return uri.authority().port();
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return uri.path().toString();
-  }
-
-  @Override
-  public String fragment() {
-    return getOrElseNull(uri.fragment());
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return getOrElseNull(uri.rawQueryString());
-  }
-
-  private static String getOrElseNull(Option<String> optional) {
-    if (optional.nonEmpty()) {
-      return optional.get();
-    }
-    return null;
-  }
+    private final Uri uri;
+
+    UriAdapter(Uri uri) {
+        this.uri = uri;
+    }
+
+    @Override
+    public String scheme() {
+        return uri.scheme();
+    }
+
+    @Override
+    public String host() {
+        return uri.authority().host().address();
+    }
+
+    @Override
+    public int port() {
+        return uri.authority().port();
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return uri.path().toString();
+    }
+
+    @Override
+    public String fragment() {
+        return getOrElseNull(uri.fragment());
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return getOrElseNull(uri.rawQueryString());
+    }
+
+    private static String getOrElseNull(Option<String> optional) {
+        if (optional.nonEmpty()) {
+            return optional.get();
+        }
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/AkkaBlockResponseFunction.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/AkkaBlockResponseFunction.java
index 00f20e1639b..c4a42d69ea0 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/AkkaBlockResponseFunction.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/AkkaBlockResponseFunction.java
@@ -17,56 +17,54 @@
  * @see BlockingResponseHelper#handleFinishForWaf(AgentSpan, HttpResponse)
  */
 public class AkkaBlockResponseFunction implements BlockResponseFunction {
-  private final HttpRequest request;
-  private Flow.Action.RequestBlockingAction rba;
-  private boolean unmarshallBlock;
-  private TraceSegment traceSegment;
+    private final HttpRequest request;
+    private Flow.Action.RequestBlockingAction rba;
+    private boolean unmarshallBlock;
+    private TraceSegment traceSegment;
 
-  public AkkaBlockResponseFunction(HttpRequest request) {
-    this.request = request;
-  }
-
-  public boolean isBlocking() {
-    return rba != null;
-  }
-
-  public boolean isUnmarshallBlock() {
-    return unmarshallBlock;
-  }
+    public AkkaBlockResponseFunction(HttpRequest request) {
+        this.request = request;
+    }
 
-  public void setUnmarshallBlock(boolean unmarshallBlock) {
-    this.unmarshallBlock = unmarshallBlock;
-  }
+    public boolean isBlocking() {
+        return rba != null;
+    }
 
-  public HttpResponse maybeCreateAlternativeResponse() {
-    if (!isBlocking()) {
-      return null;
+    public boolean isUnmarshallBlock() {
+        return unmarshallBlock;
     }
 
-    HttpResponse httpResponse = BlockingResponseHelper.maybeCreateBlockingResponse(rba, request);
-    if (httpResponse != null) {
-      traceSegment.effectivelyBlocked();
+    public void setUnmarshallBlock(boolean unmarshallBlock) {
+        this.unmarshallBlock = unmarshallBlock;
     }
-    return httpResponse;
-  }
 
-  @Override
-  public boolean tryCommitBlockingResponse(
-      TraceSegment segment,
-      int statusCode,
-      BlockingContentType templateType,
-      Map<String, String> extraHeaders,
-      String securityResponseId) {
-    AgentSpan agentSpan = AgentTracer.activeSpan();
-    if (agentSpan == null) {
-      return false;
+    public HttpResponse maybeCreateAlternativeResponse() {
+        if (!isBlocking()) {
+            return null;
+        }
+
+        HttpResponse httpResponse = BlockingResponseHelper.maybeCreateBlockingResponse(rba, request);
+        if (httpResponse != null) {
+            traceSegment.effectivelyBlocked();
+        }
+        return httpResponse;
     }
-    if (rba == null) {
-      rba =
-          new Flow.Action.RequestBlockingAction(
-              statusCode, templateType, extraHeaders, securityResponseId);
-      this.traceSegment = segment;
+
+    @Override
+    public boolean tryCommitBlockingResponse(
+            TraceSegment segment,
+            int statusCode,
+            BlockingContentType templateType,
+            Map<String, String> extraHeaders,
+            String securityResponseId) {
+        AgentSpan agentSpan = AgentTracer.activeSpan();
+        if (agentSpan == null) {
+            return false;
+        }
+        if (rba == null) {
+            rba = new Flow.Action.RequestBlockingAction(statusCode, templateType, extraHeaders, securityResponseId);
+            this.traceSegment = segment;
+        }
+        return true;
     }
-    return true;
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/BlockingResponseHelper.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/BlockingResponseHelper.java
index 68d6a9d84c0..8319eee226d 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/BlockingResponseHelper.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/BlockingResponseHelper.java
@@ -23,81 +23,71 @@
 import scala.collection.immutable.List;
 
 public class BlockingResponseHelper {
-  private BlockingResponseHelper() {}
+    private BlockingResponseHelper() {}
 
-  public static HttpResponse handleFinishForWaf(final AgentSpan span, final HttpResponse response) {
-    RequestContext requestContext = span.getRequestContext();
-    BlockResponseFunction brf = requestContext.getBlockResponseFunction();
-    if (brf instanceof AkkaBlockResponseFunction) {
-      HttpResponse altResponse = ((AkkaBlockResponseFunction) brf).maybeCreateAlternativeResponse();
-      if (altResponse != null) {
-        // we already blocked during the request
-        return altResponse;
-      }
-    }
-    Flow<Void> flow =
-        DECORATE.callIGCallbackResponseAndHeaders(
-            span, response, response.status().intValue(), AkkaHttpServerHeaders.responseGetter());
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      if (brf instanceof AkkaBlockResponseFunction) {
-        brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
-        HttpResponse altResponse =
-            ((AkkaBlockResponseFunction) brf).maybeCreateAlternativeResponse();
-        if (altResponse != null) {
-          return altResponse;
+    public static HttpResponse handleFinishForWaf(final AgentSpan span, final HttpResponse response) {
+        RequestContext requestContext = span.getRequestContext();
+        BlockResponseFunction brf = requestContext.getBlockResponseFunction();
+        if (brf instanceof AkkaBlockResponseFunction) {
+            HttpResponse altResponse = ((AkkaBlockResponseFunction) brf).maybeCreateAlternativeResponse();
+            if (altResponse != null) {
+                // we already blocked during the request
+                return altResponse;
+            }
+        }
+        Flow<Void> flow = DECORATE.callIGCallbackResponseAndHeaders(
+                span, response, response.status().intValue(), AkkaHttpServerHeaders.responseGetter());
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            if (brf instanceof AkkaBlockResponseFunction) {
+                brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
+                HttpResponse altResponse = ((AkkaBlockResponseFunction) brf).maybeCreateAlternativeResponse();
+                if (altResponse != null) {
+                    return altResponse;
+                }
+            }
         }
-      }
-    }
-
-    return response;
-  }
-
-  public static HttpResponse maybeCreateBlockingResponse(AgentSpan span, HttpRequest request) {
-    return maybeCreateBlockingResponse(span.getRequestBlockingAction(), request);
-  }
 
-  public static HttpResponse maybeCreateBlockingResponse(
-      Flow.Action.RequestBlockingAction rba, HttpRequest request) {
-    if (rba == null) {
-      return null;
+        return response;
     }
-    Optional<HttpHeader> accept = request.getHeader("accept");
-    BlockingContentType bct = rba.getBlockingContentType();
-    int httpCode = BlockingActionHelper.getHttpCode(rba.getStatusCode());
-    ResponseEntity entity;
-    if (bct != BlockingContentType.NONE) {
-      BlockingActionHelper.TemplateType tt =
-          BlockingActionHelper.determineTemplateType(bct, accept.map(h -> h.value()).orElse(null));
-      byte[] template = BlockingActionHelper.getTemplate(tt, rba.getSecurityResponseId());
-      if (tt == BlockingActionHelper.TemplateType.HTML) {
-        entity =
-            HttpEntity$.MODULE$.apply(
-                ContentTypes.text$divhtml$u0028UTF$minus8$u0029(), ByteString.fromArray(template));
-      } else { // json
-        entity =
-            HttpEntity$.MODULE$.apply(
-                ContentTypes.application$divjson(), ByteString.fromArray(template));
-      }
-    } else {
-      entity = HttpEntity$.MODULE$.Empty();
+
+    public static HttpResponse maybeCreateBlockingResponse(AgentSpan span, HttpRequest request) {
+        return maybeCreateBlockingResponse(span.getRequestBlockingAction(), request);
     }
 
-    List<akka.http.scaladsl.model.HttpHeader> headersList =
-        rba.getExtraHeaders().entrySet().stream()
-            .map(
-                e ->
-                    (akka.http.scaladsl.model.HttpHeader)
-                        RawHeader.create(e.getKey(), e.getValue()))
-            .collect(ScalaListCollector.toScalaList());
+    public static HttpResponse maybeCreateBlockingResponse(Flow.Action.RequestBlockingAction rba, HttpRequest request) {
+        if (rba == null) {
+            return null;
+        }
+        Optional<HttpHeader> accept = request.getHeader("accept");
+        BlockingContentType bct = rba.getBlockingContentType();
+        int httpCode = BlockingActionHelper.getHttpCode(rba.getStatusCode());
+        ResponseEntity entity;
+        if (bct != BlockingContentType.NONE) {
+            BlockingActionHelper.TemplateType tt = BlockingActionHelper.determineTemplateType(
+                    bct, accept.map(h -> h.value()).orElse(null));
+            byte[] template = BlockingActionHelper.getTemplate(tt, rba.getSecurityResponseId());
+            if (tt == BlockingActionHelper.TemplateType.HTML) {
+                entity = HttpEntity$.MODULE$.apply(
+                        ContentTypes.text$divhtml$u0028UTF$minus8$u0029(), ByteString.fromArray(template));
+            } else { // json
+                entity = HttpEntity$.MODULE$.apply(ContentTypes.application$divjson(), ByteString.fromArray(template));
+            }
+        } else {
+            entity = HttpEntity$.MODULE$.Empty();
+        }
 
-    StatusCode code;
-    try {
-      code = StatusCode.int2StatusCode(httpCode);
-    } catch (RuntimeException e) {
-      code = StatusCodes.custom(httpCode, "Request Blocked", "", false, true);
+        List<akka.http.scaladsl.model.HttpHeader> headersList = rba.getExtraHeaders().entrySet().stream()
+                .map(e -> (akka.http.scaladsl.model.HttpHeader) RawHeader.create(e.getKey(), e.getValue()))
+                .collect(ScalaListCollector.toScalaList());
+
+        StatusCode code;
+        try {
+            code = StatusCode.int2StatusCode(httpCode);
+        } catch (RuntimeException e) {
+            code = StatusCodes.custom(httpCode, "Request Blocked", "", false, true);
+        }
+        return HttpResponse.apply(code, headersList, entity, request.protocol());
     }
-    return HttpResponse.apply(code, headersList, entity, request.protocol());
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/Bug4304Instrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/Bug4304Instrumentation.java
index 83450efe544..c4a84f45b74 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/Bug4304Instrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/Bug4304Instrumentation.java
@@ -29,85 +29,78 @@
  */
 @AutoService(InstrumenterModule.class)
 public class Bug4304Instrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForTypeHierarchy,
-        Instrumenter.WithTypeStructure,
-        Instrumenter.HasMethodAdvice {
-  public Bug4304Instrumentation() {
-    super("akka-http");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.WithTypeStructure, Instrumenter.HasMethodAdvice {
+    public Bug4304Instrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "akka.http.impl.engine.server.HttpServerBluePrint";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "akka.http.impl.engine.server.HttpServerBluePrint";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return nameStartsWith("akka.http.impl.engine.server.HttpServerBluePrint$ControllerStage$$anon$")
-        .and(HierarchyMatchers.extendsClass(named("akka.stream.stage.GraphStageLogic")))
-        .and(MatchesOneHundredContinueStageAnonClass.INSTANCE);
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return nameStartsWith("akka.http.impl.engine.server.HttpServerBluePrint$ControllerStage$$anon$")
+                .and(HierarchyMatchers.extendsClass(named("akka.stream.stage.GraphStageLogic")))
+                .and(MatchesOneHundredContinueStageAnonClass.INSTANCE);
+    }
 
-  public static class MatchesOneHundredContinueStageAnonClass
-      implements ElementMatcher<TypeDescription> {
-    public static final ElementMatcher<TypeDescription> INSTANCE =
-        new MatchesOneHundredContinueStageAnonClass();
+    public static class MatchesOneHundredContinueStageAnonClass implements ElementMatcher<TypeDescription> {
+        public static final ElementMatcher<TypeDescription> INSTANCE = new MatchesOneHundredContinueStageAnonClass();
 
-    private MatchesOneHundredContinueStageAnonClass() {}
+        private MatchesOneHundredContinueStageAnonClass() {}
 
-    private static final Pattern ANON_CLASS_PATTERN =
-        Pattern.compile(
-            "akka\\.http\\.impl\\.engine\\.server\\.HttpServerBluePrint\\$ControllerStage\\$\\$anon\\$"
-                + "\\d+\\$OneHundredContinueStage\\$\\$anon\\$\\d+");
+        private static final Pattern ANON_CLASS_PATTERN = Pattern.compile(
+                "akka\\.http\\.impl\\.engine\\.server\\.HttpServerBluePrint\\$ControllerStage\\$\\$anon\\$"
+                        + "\\d+\\$OneHundredContinueStage\\$\\$anon\\$\\d+");
 
-    @Override
-    public boolean matches(TypeDescription td) {
-      return ANON_CLASS_PATTERN.matcher(td.getName()).matches();
+        @Override
+        public boolean matches(TypeDescription td) {
+            return ANON_CLASS_PATTERN.matcher(td.getName()).matches();
+        }
     }
-  }
 
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("oneHundredContinueSent"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("oneHundredContinueSent"));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(), Bug4304Instrumentation.class.getName() + "$GraphStageLogicAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), Bug4304Instrumentation.class.getName() + "$GraphStageLogicAdvice");
+    }
 
-  static class GraphStageLogicAdvice {
-    // Field::set() is forbidden because it may be used to mutate final fields, disallowed by
-    // https://openjdk.org/jeps/500.
-    // However, in this case the method is called on a non-final field, so it is safe. See
-    // https://github.com/akka/akka-http/blob/8fb19fce3548c3bfa1e8ebcb1115be29f342df69/akka-http-core/src/main/scala/akka/http/impl/engine/server/HttpServerBluePrint.scala#L588
-    @SuppressForbidden
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(@Advice.This GraphStageLogic thiz)
-        throws NoSuchFieldException, IllegalAccessException {
-      AgentSpan span = activeSpan();
-      RequestContext reqCtx;
-      if (span == null
-          || (reqCtx = span.getRequestContext()) == null
-          || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
-        return;
-      }
+    static class GraphStageLogicAdvice {
+        // Field::set() is forbidden because it may be used to mutate final fields, disallowed by
+        // https://openjdk.org/jeps/500.
+        // However, in this case the method is called on a non-final field, so it is safe. See
+        // https://github.com/akka/akka-http/blob/8fb19fce3548c3bfa1e8ebcb1115be29f342df69/akka-http-core/src/main/scala/akka/http/impl/engine/server/HttpServerBluePrint.scala#L588
+        @SuppressForbidden
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.This GraphStageLogic thiz) throws NoSuchFieldException, IllegalAccessException {
+            AgentSpan span = activeSpan();
+            RequestContext reqCtx;
+            if (span == null
+                    || (reqCtx = span.getRequestContext()) == null
+                    || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
+                return;
+            }
 
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf instanceof AkkaBlockResponseFunction) {
-        AkkaBlockResponseFunction abrf = (AkkaBlockResponseFunction) brf;
-        if (abrf.isBlocking() && abrf.isUnmarshallBlock()) {
-          Field f = thiz.getClass().getDeclaredField("oneHundredContinueSent");
-          f.setAccessible(true);
-          f.set(thiz, true);
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf instanceof AkkaBlockResponseFunction) {
+                AkkaBlockResponseFunction abrf = (AkkaBlockResponseFunction) brf;
+                if (abrf.isBlocking() && abrf.isUnmarshallBlock()) {
+                    Field f = thiz.getClass().getDeclaredField("oneHundredContinueSent");
+                    f.setAccessible(true);
+                    f.set(thiz, true);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/ConfigProvideRemoteAddressHeaderInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/ConfigProvideRemoteAddressHeaderInstrumentation.java
index c11da33cf64..732e97a4e84 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/ConfigProvideRemoteAddressHeaderInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/ConfigProvideRemoteAddressHeaderInstrumentation.java
@@ -13,41 +13,40 @@
 
 @AutoService(InstrumenterModule.class)
 public class ConfigProvideRemoteAddressHeaderInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ConfigProvideRemoteAddressHeaderInstrumentation() {
-    super("akka-http");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.typesafe.config.impl.SimpleConfig";
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ConfigProvideRemoteAddressHeaderInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("getBoolean"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, String.class))
-            .and(returns(boolean.class)),
-        ConfigProvideRemoteAddressHeaderInstrumentation.class.getName()
-            + "$EnableRemoteAddressHeaderAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.typesafe.config.impl.SimpleConfig";
+    }
 
-  static class EnableRemoteAddressHeaderAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-    static boolean enter(@Advice.Argument(0) String configName) {
-      // ideally we'd use remote-address-attribute, but that's only available on 10.2,
-      // and doesn't work on http/2 until 10.2.3
-      return "remote-address-header".equals(configName);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("getBoolean"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, String.class))
+                        .and(returns(boolean.class)),
+                ConfigProvideRemoteAddressHeaderInstrumentation.class.getName() + "$EnableRemoteAddressHeaderAdvice");
     }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void exit(@Advice.Enter boolean enter, @Advice.Return(readOnly = false) boolean ret) {
-      if (enter) {
-        ret = true;
-      }
+    static class EnableRemoteAddressHeaderAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+        static boolean enter(@Advice.Argument(0) String configName) {
+            // ideally we'd use remote-address-attribute, but that's only available on 10.2,
+            // and doesn't work on http/2 until 10.2.3
+            return "remote-address-header".equals(configName);
+        }
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void exit(@Advice.Enter boolean enter, @Advice.Return(readOnly = false) boolean ret) {
+            if (enter) {
+                ret = true;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/FormDataToStrictInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/FormDataToStrictInstrumentation.java
index 8137d993f67..a1d7ef4b2d2 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/FormDataToStrictInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/FormDataToStrictInstrumentation.java
@@ -20,38 +20,36 @@
  */
 @AutoService(InstrumenterModule.class)
 public class FormDataToStrictInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasMethodAdvice,
-        ScalaListCollectorMuzzleReferences {
-  public FormDataToStrictInstrumentation() {
-    super("akka-http");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ScalaListCollectorMuzzleReferences {
+    public FormDataToStrictInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.http.scaladsl.model.Multipart$FormData";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.http.scaladsl.model.Multipart$FormData";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("toStrict"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("scala.concurrent.duration.FiniteDuration")))
-            .and(takesArgument(1, named("akka.stream.Materializer")))
-            .and(returns(named("scala.concurrent.Future"))),
-        FormDataToStrictInstrumentation.class.getName() + "$ToStrictAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("toStrict"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("scala.concurrent.duration.FiniteDuration")))
+                        .and(takesArgument(1, named("akka.stream.Materializer")))
+                        .and(returns(named("scala.concurrent.Future"))),
+                FormDataToStrictInstrumentation.class.getName() + "$ToStrictAdvice");
+    }
 
-  static class ToStrictAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void before(
-        @Advice.Return(readOnly = false)
-            scala.concurrent.Future<akka.http.scaladsl.model.Multipart$FormData$Strict> fut,
-        @Advice.Argument(1) Materializer mat) {
-      fut = UnmarshallerHelpers.transformMultiPartFormDataToStrictFuture(fut, mat);
+    static class ToStrictAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void before(
+                @Advice.Return(readOnly = false)
+                        scala.concurrent.Future<akka.http.scaladsl.model.Multipart$FormData$Strict> fut,
+                @Advice.Argument(1) Materializer mat) {
+            fut = UnmarshallerHelpers.transformMultiPartFormDataToStrictFuture(fut, mat);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/JacksonUnmarshallerInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/JacksonUnmarshallerInstrumentation.java
index 5b779ef34dc..b67d43022e1 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/JacksonUnmarshallerInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/JacksonUnmarshallerInstrumentation.java
@@ -16,39 +16,39 @@
 
 @AutoService(InstrumenterModule.class)
 public class JacksonUnmarshallerInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public JacksonUnmarshallerInstrumentation() {
-    super("akka-http");
-  }
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "akka.http.javadsl.marshallers.jackson.Jackson";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(returns(named("akka.http.javadsl.unmarshalling.Unmarshaller")))
-            .and(named("byteStringUnmarshaller").or(named("unmarshaller")))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("com.fasterxml.jackson.databind.ObjectMapper")))
-            .and(takesArgument(1, Class.class)),
-        JacksonUnmarshallerInstrumentation.class.getName() + "$UnmarshallerAdvice");
-  }
-
-  static class UnmarshallerAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(@Advice.Return(readOnly = false) Unmarshaller ret) {
-      ret = UnmarshallerHelpers.transformJacksonUnmarshaller(ret);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public JacksonUnmarshallerInstrumentation() {
+        super("akka-http");
+    }
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "akka.http.javadsl.marshallers.jackson.Jackson";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(returns(named("akka.http.javadsl.unmarshalling.Unmarshaller")))
+                        .and(named("byteStringUnmarshaller").or(named("unmarshaller")))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("com.fasterxml.jackson.databind.ObjectMapper")))
+                        .and(takesArgument(1, Class.class)),
+                JacksonUnmarshallerInstrumentation.class.getName() + "$UnmarshallerAdvice");
+    }
+
+    static class UnmarshallerAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.Return(readOnly = false) Unmarshaller ret) {
+            ret = UnmarshallerHelpers.transformJacksonUnmarshaller(ret);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java
index 2b29bfcf6a8..9dd9d4db473 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java
@@ -16,38 +16,37 @@
  */
 @AutoService(InstrumenterModule.class)
 public class MultipartUnmarshallersInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-
-  private static final String TRAIT_NAME =
-      "akka.http.scaladsl.unmarshalling.MultipartUnmarshallers";
-
-  public MultipartUnmarshallersInstrumentation() {
-    super("akka-http");
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      TRAIT_NAME, TRAIT_NAME + "$class",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isTraitMethod(
-                TRAIT_NAME,
-                "multipartFormDataUnmarshaller",
-                "akka.event.LoggingAdapter",
-                "akka.http.scaladsl.settings.ParserSettings")
-            .and(returns(named("akka.http.scaladsl.unmarshalling.Unmarshaller"))),
-        MultipartUnmarshallersInstrumentation.class.getName() + "$UnmarshallerWrappingAdvice");
-  }
-
-  static class UnmarshallerWrappingAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(@Advice.Return(readOnly = false) Unmarshaller unmarshaller) {
-      unmarshaller = UnmarshallerHelpers.transformMultipartFormDataUnmarshaller(unmarshaller);
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+
+    private static final String TRAIT_NAME = "akka.http.scaladsl.unmarshalling.MultipartUnmarshallers";
+
+    public MultipartUnmarshallersInstrumentation() {
+        super("akka-http");
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            TRAIT_NAME, TRAIT_NAME + "$class",
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isTraitMethod(
+                                TRAIT_NAME,
+                                "multipartFormDataUnmarshaller",
+                                "akka.event.LoggingAdapter",
+                                "akka.http.scaladsl.settings.ParserSettings")
+                        .and(returns(named("akka.http.scaladsl.unmarshalling.Unmarshaller"))),
+                MultipartUnmarshallersInstrumentation.class.getName() + "$UnmarshallerWrappingAdvice");
+    }
+
+    static class UnmarshallerWrappingAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.Return(readOnly = false) Unmarshaller unmarshaller) {
+            unmarshaller = UnmarshallerHelpers.transformMultipartFormDataUnmarshaller(unmarshaller);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java
index 3f5bb502563..c6d1407495b 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java
@@ -20,57 +20,55 @@
  */
 @AutoService(InstrumenterModule.class)
 public class PredefinedFromEntityUnmarshallersInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  private static final String TRAIT_NAME =
-      "akka.http.scaladsl.unmarshalling.PredefinedFromEntityUnmarshallers";
+    private static final String TRAIT_NAME = "akka.http.scaladsl.unmarshalling.PredefinedFromEntityUnmarshallers";
 
-  public PredefinedFromEntityUnmarshallersInstrumentation() {
-    super("akka-http");
-  }
+    public PredefinedFromEntityUnmarshallersInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      TRAIT_NAME, TRAIT_NAME + "$class",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            TRAIT_NAME, TRAIT_NAME + "$class",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isTraitMethod(
-                TRAIT_NAME,
-                "urlEncodedFormDataUnmarshaller",
-                namedOneOf("scala.collection.Seq", "scala.collection.immutable.Seq"))
-            .and(returns(named("akka.http.scaladsl.unmarshalling.Unmarshaller"))),
-        PredefinedFromEntityUnmarshallersInstrumentation.class.getName()
-            + "$UrlEncodedUnmarshallerWrappingAdvice");
-    transformer.applyAdvice(
-        isTraitMethod(TRAIT_NAME, "stringUnmarshaller")
-            .and(returns(named("akka.http.scaladsl.unmarshalling.Unmarshaller"))),
-        PredefinedFromEntityUnmarshallersInstrumentation.class.getName()
-            + "$StringUnmarshallerWrappingAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isTraitMethod(
+                                TRAIT_NAME,
+                                "urlEncodedFormDataUnmarshaller",
+                                namedOneOf("scala.collection.Seq", "scala.collection.immutable.Seq"))
+                        .and(returns(named("akka.http.scaladsl.unmarshalling.Unmarshaller"))),
+                PredefinedFromEntityUnmarshallersInstrumentation.class.getName()
+                        + "$UrlEncodedUnmarshallerWrappingAdvice");
+        transformer.applyAdvice(
+                isTraitMethod(TRAIT_NAME, "stringUnmarshaller")
+                        .and(returns(named("akka.http.scaladsl.unmarshalling.Unmarshaller"))),
+                PredefinedFromEntityUnmarshallersInstrumentation.class.getName() + "$StringUnmarshallerWrappingAdvice");
+    }
 
-  static class UrlEncodedUnmarshallerWrappingAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(@Advice.Return(readOnly = false) Unmarshaller unmarshaller) {
-      unmarshaller = UnmarshallerHelpers.transformUrlEncodedUnmarshaller(unmarshaller);
+    static class UrlEncodedUnmarshallerWrappingAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.Return(readOnly = false) Unmarshaller unmarshaller) {
+            unmarshaller = UnmarshallerHelpers.transformUrlEncodedUnmarshaller(unmarshaller);
+        }
     }
-  }
 
-  static class StringUnmarshallerWrappingAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(
-        @Advice.Return(readOnly = false)
-            Unmarshaller<akka.http.scaladsl.model.HttpEntity, String> unmarshaller) {
-      unmarshaller = UnmarshallerHelpers.transformStringUnmarshaller(unmarshaller);
+    static class StringUnmarshallerWrappingAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(
+                @Advice.Return(readOnly = false)
+                        Unmarshaller<akka.http.scaladsl.model.HttpEntity, String> unmarshaller) {
+            unmarshaller = UnmarshallerHelpers.transformStringUnmarshaller(unmarshaller);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/ScalaListCollector.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/ScalaListCollector.java
index 6410d125c5d..7d7bd1bd0e6 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/ScalaListCollector.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/ScalaListCollector.java
@@ -16,93 +16,81 @@
 
 public class ScalaListCollector<T> implements Collector<T, ListBuffer<T>, List<T>> {
 
-  private static final Collector INSTANCE_TO_LIST;
-  private static final MethodHandle PLUS_EQ;
-  private static final MethodHandle PLUS_PLUS_EQ;
+    private static final Collector INSTANCE_TO_LIST;
+    private static final MethodHandle PLUS_EQ;
+    private static final MethodHandle PLUS_PLUS_EQ;
 
-  static {
-    ClassLoader classLoader = ScalaListCollector.class.getClassLoader();
-    if (classLoader == null) {
-      classLoader = ClassLoader.getSystemClassLoader();
-    }
+    static {
+        ClassLoader classLoader = ScalaListCollector.class.getClassLoader();
+        if (classLoader == null) {
+            classLoader = ClassLoader.getSystemClassLoader();
+        }
 
-    MethodHandle plusEq;
-    MethodHandle plusPlusEq;
-    try {
-      plusEq =
-          lookup()
-              .findVirtual(
-                  ListBuffer.class, "$plus$eq", methodType(ListBuffer.class, Object.class));
-      Class traversableOnceCls = classLoader.loadClass("scala.collection.TraversableOnce");
-      plusPlusEq =
-          lookup()
-              .findVirtual(
-                  ListBuffer.class,
-                  "$plus$plus$eq",
-                  methodType(ListBuffer.class, traversableOnceCls));
-    } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) {
-      try {
-        plusEq =
-            lookup()
-                .findVirtual(
-                    ListBuffer.class, "addOne", methodType(ListBuffer.class, Object.class));
-        Class iterableOnceCls = classLoader.loadClass("scala.collection.IterableOnce");
-        plusPlusEq =
-            lookup()
-                .findVirtual(
-                    ListBuffer.class, "addAll", methodType(ListBuffer.class, iterableOnceCls));
-      } catch (NoSuchMethodException | IllegalAccessException | ClassNotFoundException ex) {
-        throw new RuntimeException(ex);
-      }
-    }
+        MethodHandle plusEq;
+        MethodHandle plusPlusEq;
+        try {
+            plusEq = lookup().findVirtual(ListBuffer.class, "$plus$eq", methodType(ListBuffer.class, Object.class));
+            Class traversableOnceCls = classLoader.loadClass("scala.collection.TraversableOnce");
+            plusPlusEq = lookup().findVirtual(
+                            ListBuffer.class, "$plus$plus$eq", methodType(ListBuffer.class, traversableOnceCls));
+        } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) {
+            try {
+                plusEq = lookup().findVirtual(ListBuffer.class, "addOne", methodType(ListBuffer.class, Object.class));
+                Class iterableOnceCls = classLoader.loadClass("scala.collection.IterableOnce");
+                plusPlusEq =
+                        lookup().findVirtual(ListBuffer.class, "addAll", methodType(ListBuffer.class, iterableOnceCls));
+            } catch (NoSuchMethodException | IllegalAccessException | ClassNotFoundException ex) {
+                throw new RuntimeException(ex);
+            }
+        }
 
-    PLUS_EQ = plusEq;
-    PLUS_PLUS_EQ = plusPlusEq;
-    INSTANCE_TO_LIST = new ScalaListCollector();
-  }
+        PLUS_EQ = plusEq;
+        PLUS_PLUS_EQ = plusPlusEq;
+        INSTANCE_TO_LIST = new ScalaListCollector();
+    }
 
-  public static <T> Collector<T, ?, List<T>> toScalaList() {
-    return INSTANCE_TO_LIST;
-  }
+    public static <T> Collector<T, ?, List<T>> toScalaList() {
+        return INSTANCE_TO_LIST;
+    }
 
-  private static <T> ListBuffer<T> addOne(ListBuffer<T> list, T object) {
-    try {
-      return (ListBuffer<T>) PLUS_EQ.invoke(list, object);
-    } catch (Throwable e) {
-      throw new RuntimeException(e);
+    private static <T> ListBuffer<T> addOne(ListBuffer<T> list, T object) {
+        try {
+            return (ListBuffer<T>) PLUS_EQ.invoke(list, object);
+        } catch (Throwable e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  private static <T> ListBuffer<T> addAll(ListBuffer<T> list, ListBuffer<T> otherList) {
-    try {
-      return (ListBuffer<T>) PLUS_PLUS_EQ.invoke(list, otherList);
-    } catch (Throwable e) {
-      throw new RuntimeException(e);
+    private static <T> ListBuffer<T> addAll(ListBuffer<T> list, ListBuffer<T> otherList) {
+        try {
+            return (ListBuffer<T>) PLUS_PLUS_EQ.invoke(list, otherList);
+        } catch (Throwable e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  @Override
-  public Supplier<ListBuffer<T>> supplier() {
-    return scala.collection.mutable.ListBuffer::new;
-  }
+    @Override
+    public Supplier<ListBuffer<T>> supplier() {
+        return scala.collection.mutable.ListBuffer::new;
+    }
 
-  @Override
-  public BiConsumer<ListBuffer<T>, T> accumulator() {
-    return ScalaListCollector::addOne;
-  }
+    @Override
+    public BiConsumer<ListBuffer<T>, T> accumulator() {
+        return ScalaListCollector::addOne;
+    }
 
-  @Override
-  public BinaryOperator<ListBuffer<T>> combiner() {
-    return ScalaListCollector::addAll;
-  }
+    @Override
+    public BinaryOperator<ListBuffer<T>> combiner() {
+        return ScalaListCollector::addAll;
+    }
 
-  @Override
-  public Function<ListBuffer<T>, List<T>> finisher() {
-    return scala.collection.mutable.ListBuffer::toList;
-  }
+    @Override
+    public Function<ListBuffer<T>, List<T>> finisher() {
+        return scala.collection.mutable.ListBuffer::toList;
+    }
 
-  @Override
-  public Set<Characteristics> characteristics() {
-    return Collections.emptySet();
-  }
+    @Override
+    public Set<Characteristics> characteristics() {
+        return Collections.emptySet();
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/ScalaListCollectorMuzzleReferences.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/ScalaListCollectorMuzzleReferences.java
index 08f73d2c7fa..0b4360de8f6 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/ScalaListCollectorMuzzleReferences.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/ScalaListCollectorMuzzleReferences.java
@@ -3,36 +3,35 @@
 import datadog.trace.agent.tooling.muzzle.Reference;
 
 public interface ScalaListCollectorMuzzleReferences {
-  Reference SCALA_LIST_COLLECTOR =
-      new Reference.Builder("scala.collection.mutable.ListBuffer")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC | Reference.EXPECTS_PUBLIC,
-              "$plus$eq",
-              "Lscala/collection/mutable/ListBuffer;",
-              "Ljava/lang/Object;")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC | Reference.EXPECTS_PUBLIC,
-              "$plus$plus$eq",
-              "Lscala/collection/mutable/ListBuffer;",
-              "Lscala/collection/TraversableOnce;")
-          .or()
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC | Reference.EXPECTS_PUBLIC,
-              "addOne",
-              "Lscala/collection/mutable/ListBuffer;",
-              "Ljava/lang/Object;")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC | Reference.EXPECTS_PUBLIC,
-              "addAll",
-              "Lscala/collection/mutable/ListBuffer;",
-              "Lscala/collection/IterableOnce;")
-          .build();
+    Reference SCALA_LIST_COLLECTOR = new Reference.Builder("scala.collection.mutable.ListBuffer")
+            .withMethod(
+                    new String[0],
+                    Reference.EXPECTS_NON_STATIC | Reference.EXPECTS_PUBLIC,
+                    "$plus$eq",
+                    "Lscala/collection/mutable/ListBuffer;",
+                    "Ljava/lang/Object;")
+            .withMethod(
+                    new String[0],
+                    Reference.EXPECTS_NON_STATIC | Reference.EXPECTS_PUBLIC,
+                    "$plus$plus$eq",
+                    "Lscala/collection/mutable/ListBuffer;",
+                    "Lscala/collection/TraversableOnce;")
+            .or()
+            .withMethod(
+                    new String[0],
+                    Reference.EXPECTS_NON_STATIC | Reference.EXPECTS_PUBLIC,
+                    "addOne",
+                    "Lscala/collection/mutable/ListBuffer;",
+                    "Ljava/lang/Object;")
+            .withMethod(
+                    new String[0],
+                    Reference.EXPECTS_NON_STATIC | Reference.EXPECTS_PUBLIC,
+                    "addAll",
+                    "Lscala/collection/mutable/ListBuffer;",
+                    "Lscala/collection/IterableOnce;")
+            .build();
 
-  static Reference[] additionalMuzzleReferences() {
-    return new Reference[] {SCALA_LIST_COLLECTOR};
-  }
+    static Reference[] additionalMuzzleReferences() {
+        return new Reference[] {SCALA_LIST_COLLECTOR};
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java
index 70a3e21ca95..868ba49da02 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java
@@ -14,47 +14,44 @@
 // TODO: move to separate module and have better support
 @AutoService(InstrumenterModule.class)
 public class SprayUnmarshallerInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-
-  private static final String TRAIT_NAME =
-      "akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport";
-
-  public SprayUnmarshallerInstrumentation() {
-    super("akka-http");
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      TRAIT_NAME, TRAIT_NAME + "$class",
-    };
-  }
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isTraitMethod(TRAIT_NAME, "sprayJsonUnmarshaller", "spray.json.RootJsonReader")
-            .and(returns(named("akka.http.scaladsl.unmarshalling.Unmarshaller")))
-            .or(
-                isTraitMethod(
-                        TRAIT_NAME, "sprayJsonByteStringUnmarshaller", "spray.json.RootJsonReader")
-                    .and(returns(named("akka.http.scaladsl.unmarshalling.Unmarshaller")))),
-        SprayUnmarshallerInstrumentation.class.getName() + "$ArbitraryTypeAdvice");
-    // support is basic:
-    // * Source[T, NotUsed] is not intercepted
-    // * neither is the conversion into JsValue. It would need to wrap the JsValue
-    //   to intercept calls to the methods in play.api.libs.json.JsReadable
-  }
-
-  static class ArbitraryTypeAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(@Advice.Return(readOnly = false) Unmarshaller ret) {
-      ret = UnmarshallerHelpers.transformArbitrarySprayUnmarshaller(ret);
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+
+    private static final String TRAIT_NAME = "akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport";
+
+    public SprayUnmarshallerInstrumentation() {
+        super("akka-http");
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            TRAIT_NAME, TRAIT_NAME + "$class",
+        };
+    }
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isTraitMethod(TRAIT_NAME, "sprayJsonUnmarshaller", "spray.json.RootJsonReader")
+                        .and(returns(named("akka.http.scaladsl.unmarshalling.Unmarshaller")))
+                        .or(isTraitMethod(TRAIT_NAME, "sprayJsonByteStringUnmarshaller", "spray.json.RootJsonReader")
+                                .and(returns(named("akka.http.scaladsl.unmarshalling.Unmarshaller")))),
+                SprayUnmarshallerInstrumentation.class.getName() + "$ArbitraryTypeAdvice");
+        // support is basic:
+        // * Source[T, NotUsed] is not intercepted
+        // * neither is the conversion into JsValue. It would need to wrap the JsValue
+        //   to intercept calls to the methods in play.api.libs.json.JsReadable
+    }
+
+    static class ArbitraryTypeAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.Return(readOnly = false) Unmarshaller ret) {
+            ret = UnmarshallerHelpers.transformArbitrarySprayUnmarshaller(ret);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/StrictFormCompanionInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/StrictFormCompanionInstrumentation.java
index d6d0012dff0..ead658ef3d8 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/StrictFormCompanionInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/StrictFormCompanionInstrumentation.java
@@ -22,38 +22,38 @@
  */
 @AutoService(InstrumenterModule.class)
 public class StrictFormCompanionInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public StrictFormCompanionInstrumentation() {
-    super("akka-http");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public StrictFormCompanionInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.http.scaladsl.common.StrictForm$";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.http.scaladsl.common.StrictForm$";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("unmarshaller"))
-            .and(returns(named("akka.http.scaladsl.unmarshalling.Unmarshaller")))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("akka.http.scaladsl.unmarshalling.Unmarshaller")))
-            .and(takesArgument(1, named("akka.http.scaladsl.unmarshalling.Unmarshaller"))),
-        StrictFormCompanionInstrumentation.class.getName() + "$UnmarshallerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("unmarshaller"))
+                        .and(returns(named("akka.http.scaladsl.unmarshalling.Unmarshaller")))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("akka.http.scaladsl.unmarshalling.Unmarshaller")))
+                        .and(takesArgument(1, named("akka.http.scaladsl.unmarshalling.Unmarshaller"))),
+                StrictFormCompanionInstrumentation.class.getName() + "$UnmarshallerAdvice");
+    }
 
-  static class UnmarshallerAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(@Advice.Return(readOnly = false) Unmarshaller<HttpEntity, StrictForm> ret) {
-      ret = UnmarshallerHelpers.transformStrictFormUnmarshaller(ret);
+    static class UnmarshallerAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.Return(readOnly = false) Unmarshaller<HttpEntity, StrictForm> ret) {
+            ret = UnmarshallerHelpers.transformStrictFormUnmarshaller(ret);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/UnmarshallerHelpers.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/UnmarshallerHelpers.java
index 78c791612a5..fcaed2ac879 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/UnmarshallerHelpers.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/UnmarshallerHelpers.java
@@ -45,589 +45,545 @@
 
 public class UnmarshallerHelpers {
 
-  public static final int MAX_CONVERSION_DEPTH = 10;
-  static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
-  static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
-  private static final Logger log = LoggerFactory.getLogger(UnmarshallerHelpers.class);
-
-  private static final MediaType APPLICATION_X_WWW_FORM_URLENCODED;
-
-  static {
-    MediaType t = null;
-    try {
-      // subtype of MediaType changes between 10.0 and 10.1
-      Field f = MediaTypes.class.getField("APPLICATION_X_WWW_FORM_URLENCODED");
-      t = (MediaType) f.get(null);
-    } catch (NoSuchFieldException | IllegalAccessException e) {
-    }
-    APPLICATION_X_WWW_FORM_URLENCODED = t;
-  }
-
-  private UnmarshallerHelpers() {}
-
-  public static Unmarshaller<HttpEntity, akka.http.scaladsl.model.FormData>
-      transformUrlEncodedUnmarshaller(
-          Unmarshaller<HttpEntity, akka.http.scaladsl.model.FormData> original) {
-    JFunction1<akka.http.scaladsl.model.FormData, akka.http.scaladsl.model.FormData> mapf =
-        formData -> {
-          try {
-            handleFormData(formData);
-          } catch (Exception e) {
-            handleException(e, "transformUrlEncodedMarshaller");
-          }
-
-          return formData;
-        };
+    public static final int MAX_CONVERSION_DEPTH = 10;
+    static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
+    static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
+    private static final Logger log = LoggerFactory.getLogger(UnmarshallerHelpers.class);
 
-    return original.map(mapf);
-  }
-
-  private static void handleFormData(FormData formData) {
-    AgentSpan span = activeSpan();
-    RequestContext reqCtx;
-    if (span == null
-        || (reqCtx = span.getRequestContext()) == null
-        || reqCtx.getData(RequestContextSlot.APPSEC) == null
-        || isStrictFormOngoing(span)) {
-      return;
-    }
+    private static final MediaType APPLICATION_X_WWW_FORM_URLENCODED;
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, Object, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestBodyProcessed());
-    if (callback == null) {
-      return;
+    static {
+        MediaType t = null;
+        try {
+            // subtype of MediaType changes between 10.0 and 10.1
+            Field f = MediaTypes.class.getField("APPLICATION_X_WWW_FORM_URLENCODED");
+            t = (MediaType) f.get(null);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+        }
+        APPLICATION_X_WWW_FORM_URLENCODED = t;
     }
 
-    Iterator<Tuple2<String, String>> fieldsIter = formData.fields().iterator();
-    Map<String, List<String>> conv = new HashMap<>();
-    while (fieldsIter.hasNext()) {
-      Tuple2<String, String> pair = fieldsIter.next();
-
-      String key = pair._1;
-      List<String> values = conv.get(key);
-      if (values == null) {
-        values = new ArrayList<>();
-        conv.put(key, values);
-      }
-      values.add(pair._2);
-    }
+    private UnmarshallerHelpers() {}
 
-    if (conv.isEmpty()) {
-      return;
-    }
+    public static Unmarshaller<HttpEntity, akka.http.scaladsl.model.FormData> transformUrlEncodedUnmarshaller(
+            Unmarshaller<HttpEntity, akka.http.scaladsl.model.FormData> original) {
+        JFunction1<akka.http.scaladsl.model.FormData, akka.http.scaladsl.model.FormData> mapf = formData -> {
+            try {
+                handleFormData(formData);
+            } catch (Exception e) {
+                handleException(e, "transformUrlEncodedMarshaller");
+            }
 
-    // callback execution
-    executeCallback(reqCtx, callback, conv, "urlEncodedFormDataUnmarshaller");
-  }
-
-  private static void executeCallback(
-      RequestContext reqCtx,
-      BiFunction<RequestContext, Object, Flow<Void>> callback,
-      Object conv,
-      String details) {
-    Flow<Void> flow = callback.apply(reqCtx, conv);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockingException e =
-          tryBlock(reqCtx, (Flow.Action.RequestBlockingAction) action, "for " + details);
-      if (e != null) {
-        throw e;
-      }
-    }
-  }
-
-  public static Unmarshaller transformMultipartFormDataUnmarshaller(Unmarshaller original) {
-    JFunction1<
-            akka.http.scaladsl.model.Multipart.FormData,
-            akka.http.scaladsl.model.Multipart.FormData>
-        mapf =
-            t -> {
-              if (!(t instanceof akka.http.scaladsl.model.Multipart$FormData$Strict)) {
-                // data not loaded yet...
-                // it's not practical to wrap the object
-                // rely on instrumentation on toStrict
-                return t;
-              }
-
-              try {
-                handleMultipartStrictFormData(
-                    (akka.http.scaladsl.model.Multipart$FormData$Strict) t);
-              } catch (Exception e) {
-                handleException(e, "Error in handleMultipartStrictFormData");
-              }
-
-              return t;
-            };
-
-    return original.map(mapf);
-  }
-
-  public static scala.concurrent.Future<akka.http.scaladsl.model.Multipart$FormData$Strict>
-      transformMultiPartFormDataToStrictFuture(
-          scala.concurrent.Future<akka.http.scaladsl.model.Multipart$FormData$Strict> future,
-          Materializer materializer) {
-    JFunction1<
-            akka.http.scaladsl.model.Multipart$FormData$Strict,
-            akka.http.scaladsl.model.Multipart$FormData$Strict>
-        mapf =
-            t -> {
-              try {
-                AgentSpan span = activeSpan();
-                if (span != null && !isStrictFormOngoing(span)) {
-                  handleMultipartStrictFormData(t);
-                }
-              } catch (Exception e) {
-                handleException(e, "Error in transformMultiPartFormDataToStrictFuture");
-              }
-              return t;
-            };
-    return future.map(mapf, materializer.executionContext());
-  }
-
-  private static void handleMultipartStrictFormData(
-      akka.http.scaladsl.model.Multipart$FormData$Strict st) {
-    AgentSpan span = activeSpan();
-    RequestContext reqCtx;
-    if (span == null
-        || (reqCtx = span.getRequestContext()) == null
-        || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
-      return;
-    }
+            return formData;
+        };
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, Object, Flow<Void>> bodyCallback =
-        cbp.getCallback(EVENTS.requestBodyProcessed());
-    BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCallback =
-        cbp.getCallback(EVENTS.requestFilesFilenames());
-    BiFunction<RequestContext, List<String>, Flow<Void>> contentCallback =
-        cbp.getCallback(EVENTS.requestFilesContent());
-    if (bodyCallback == null && filenamesCallback == null && contentCallback == null) {
-      return;
+        return original.map(mapf);
     }
 
-    java.lang.Iterable<akka.http.javadsl.model.Multipart.FormData.BodyPart.Strict> strictParts =
-        st.getStrictParts();
-    Map<String, List<String>> conv = new HashMap<>();
-    List<String> filenames = filenamesCallback != null ? new ArrayList<>() : null;
-    List<String> filesContent = contentCallback != null ? new ArrayList<>() : null;
-    for (akka.http.javadsl.model.Multipart.FormData.BodyPart.Strict part : strictParts) {
-      Optional<String> filenameOpt = part.getFilename();
-      if (filenames != null && filenameOpt.isPresent() && !filenameOpt.get().isEmpty()) {
-        filenames.add(filenameOpt.get());
-      }
-
-      boolean needsEntity =
-          bodyCallback != null
-              || (filesContent != null
-                  && filenameOpt.isPresent()
-                  && filesContent.size() < MAX_FILES_TO_INSPECT);
-      if (!needsEntity) {
-        continue;
-      }
-
-      akka.http.javadsl.model.HttpEntity.Strict entity = part.getEntity();
-      if (!(entity instanceof HttpEntity.Strict)) {
-        continue;
-      }
-
-      HttpEntity.Strict sentity = (HttpEntity.Strict) entity;
-
-      if (bodyCallback != null) {
-        String name = part.getName();
-        List<String> curStrings = conv.get(name);
-        if (curStrings == null) {
-          curStrings = new ArrayList<>();
-          conv.put(name, curStrings);
-        }
-
-        String s =
-            sentity
-                .getData()
-                .decodeString(
-                    Unmarshaller$.MODULE$.bestUnmarshallingCharsetFor(sentity).nioCharset());
-        curStrings.add(s);
-      }
-
-      if (filesContent != null
-          && filenameOpt.isPresent()
-          && filesContent.size() < MAX_FILES_TO_INSPECT) {
-        byte[] bytes = sentity.getData().take(MAX_CONTENT_BYTES).toArray();
-        filesContent.add(
-            MultipartContentDecoder.decodeBytes(
-                bytes, bytes.length, entity.getContentType().toString()));
-      }
-    }
+    private static void handleFormData(FormData formData) {
+        AgentSpan span = activeSpan();
+        RequestContext reqCtx;
+        if (span == null
+                || (reqCtx = span.getRequestContext()) == null
+                || reqCtx.getData(RequestContextSlot.APPSEC) == null
+                || isStrictFormOngoing(span)) {
+            return;
+        }
+
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+        if (callback == null) {
+            return;
+        }
 
-    BlockingException pendingBlock = null;
-    if (bodyCallback != null) {
-      Flow<Void> flow = bodyCallback.apply(reqCtx, conv);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        pendingBlock =
-            tryBlock(
-                reqCtx,
-                (Flow.Action.RequestBlockingAction) action,
-                "multipartFormDataUnmarshaller");
-      }
+        Iterator<Tuple2<String, String>> fieldsIter = formData.fields().iterator();
+        Map<String, List<String>> conv = new HashMap<>();
+        while (fieldsIter.hasNext()) {
+            Tuple2<String, String> pair = fieldsIter.next();
+
+            String key = pair._1;
+            List<String> values = conv.get(key);
+            if (values == null) {
+                values = new ArrayList<>();
+                conv.put(key, values);
+            }
+            values.add(pair._2);
+        }
+
+        if (conv.isEmpty()) {
+            return;
+        }
+
+        // callback execution
+        executeCallback(reqCtx, callback, conv, "urlEncodedFormDataUnmarshaller");
     }
 
-    if (filenamesCallback != null && filenames != null && !filenames.isEmpty()) {
-      Flow<Void> flow = filenamesCallback.apply(reqCtx, filenames);
-      if (pendingBlock == null) {
+    private static void executeCallback(
+            RequestContext reqCtx,
+            BiFunction<RequestContext, Object, Flow<Void>> callback,
+            Object conv,
+            String details) {
+        Flow<Void> flow = callback.apply(reqCtx, conv);
         Flow.Action action = flow.getAction();
         if (action instanceof Flow.Action.RequestBlockingAction) {
-          pendingBlock =
-              tryBlock(reqCtx, (Flow.Action.RequestBlockingAction) action, "multipart file upload");
+            BlockingException e = tryBlock(reqCtx, (Flow.Action.RequestBlockingAction) action, "for " + details);
+            if (e != null) {
+                throw e;
+            }
         }
-      }
     }
 
-    if (pendingBlock == null && filesContent != null && !filesContent.isEmpty()) {
-      Flow<Void> flow = contentCallback.apply(reqCtx, filesContent);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        pendingBlock =
-            tryBlock(
-                reqCtx,
-                (Flow.Action.RequestBlockingAction) action,
-                "multipart file upload content");
-      }
-    }
+    public static Unmarshaller transformMultipartFormDataUnmarshaller(Unmarshaller original) {
+        JFunction1<akka.http.scaladsl.model.Multipart.FormData, akka.http.scaladsl.model.Multipart.FormData> mapf =
+                t -> {
+                    if (!(t instanceof akka.http.scaladsl.model.Multipart$FormData$Strict)) {
+                        // data not loaded yet...
+                        // it's not practical to wrap the object
+                        // rely on instrumentation on toStrict
+                        return t;
+                    }
+
+                    try {
+                        handleMultipartStrictFormData((akka.http.scaladsl.model.Multipart$FormData$Strict) t);
+                    } catch (Exception e) {
+                        handleException(e, "Error in handleMultipartStrictFormData");
+                    }
+
+                    return t;
+                };
+
+        return original.map(mapf);
+    }
+
+    public static scala.concurrent.Future<akka.http.scaladsl.model.Multipart$FormData$Strict>
+            transformMultiPartFormDataToStrictFuture(
+                    scala.concurrent.Future<akka.http.scaladsl.model.Multipart$FormData$Strict> future,
+                    Materializer materializer) {
+        JFunction1<
+                        akka.http.scaladsl.model.Multipart$FormData$Strict,
+                        akka.http.scaladsl.model.Multipart$FormData$Strict>
+                mapf = t -> {
+                    try {
+                        AgentSpan span = activeSpan();
+                        if (span != null && !isStrictFormOngoing(span)) {
+                            handleMultipartStrictFormData(t);
+                        }
+                    } catch (Exception e) {
+                        handleException(e, "Error in transformMultiPartFormDataToStrictFuture");
+                    }
+                    return t;
+                };
+        return future.map(mapf, materializer.executionContext());
+    }
+
+    private static void handleMultipartStrictFormData(akka.http.scaladsl.model.Multipart$FormData$Strict st) {
+        AgentSpan span = activeSpan();
+        RequestContext reqCtx;
+        if (span == null
+                || (reqCtx = span.getRequestContext()) == null
+                || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
+            return;
+        }
 
-    if (pendingBlock != null) {
-      throw pendingBlock;
-    }
-  }
-
-  public static Unmarshaller<HttpEntity, String> transformStringUnmarshaller(
-      Unmarshaller<HttpEntity, String> original) {
-    Unmarshaller.EnhancedUnmarshaller<HttpEntity, String> enhancedOriginal =
-        new Unmarshaller.EnhancedUnmarshaller<>(original);
-    JFunction2<HttpEntity, String, String> f2 =
-        (entity, str) -> {
-          try {
-            AgentSpan agentSpan = activeSpan();
-            if (agentSpan == null || isStrictFormOngoing(agentSpan)) {
-              return str;
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, Object, Flow<Void>> bodyCallback = cbp.getCallback(EVENTS.requestBodyProcessed());
+        BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCallback =
+                cbp.getCallback(EVENTS.requestFilesFilenames());
+        BiFunction<RequestContext, List<String>, Flow<Void>> contentCallback =
+                cbp.getCallback(EVENTS.requestFilesContent());
+        if (bodyCallback == null && filenamesCallback == null && contentCallback == null) {
+            return;
+        }
+
+        java.lang.Iterable<akka.http.javadsl.model.Multipart.FormData.BodyPart.Strict> strictParts =
+                st.getStrictParts();
+        Map<String, List<String>> conv = new HashMap<>();
+        List<String> filenames = filenamesCallback != null ? new ArrayList<>() : null;
+        List<String> filesContent = contentCallback != null ? new ArrayList<>() : null;
+        for (akka.http.javadsl.model.Multipart.FormData.BodyPart.Strict part : strictParts) {
+            Optional<String> filenameOpt = part.getFilename();
+            if (filenames != null
+                    && filenameOpt.isPresent()
+                    && !filenameOpt.get().isEmpty()) {
+                filenames.add(filenameOpt.get());
+            }
+
+            boolean needsEntity = bodyCallback != null
+                    || (filesContent != null && filenameOpt.isPresent() && filesContent.size() < MAX_FILES_TO_INSPECT);
+            if (!needsEntity) {
+                continue;
             }
 
-            ContentType contentType = entity.getContentType();
-            MediaType mediaType = contentType.mediaType();
-            if (mediaType != MediaTypes.APPLICATION_JSON
-                && mediaType != MediaTypes.MULTIPART_FORM_DATA
-                && mediaType != APPLICATION_X_WWW_FORM_URLENCODED) {
-              handleArbitraryPostData(str, "HttpEntity -> String unmarshaller");
+            akka.http.javadsl.model.HttpEntity.Strict entity = part.getEntity();
+            if (!(entity instanceof HttpEntity.Strict)) {
+                continue;
             }
-          } catch (Exception e) {
-            handleException(e, "Error in transformStringUnmarshaller");
-          }
 
-          return str;
+            HttpEntity.Strict sentity = (HttpEntity.Strict) entity;
+
+            if (bodyCallback != null) {
+                String name = part.getName();
+                List<String> curStrings = conv.get(name);
+                if (curStrings == null) {
+                    curStrings = new ArrayList<>();
+                    conv.put(name, curStrings);
+                }
+
+                String s = sentity.getData()
+                        .decodeString(Unmarshaller$.MODULE$
+                                .bestUnmarshallingCharsetFor(sentity)
+                                .nioCharset());
+                curStrings.add(s);
+            }
+
+            if (filesContent != null && filenameOpt.isPresent() && filesContent.size() < MAX_FILES_TO_INSPECT) {
+                byte[] bytes = sentity.getData().take(MAX_CONTENT_BYTES).toArray();
+                filesContent.add(MultipartContentDecoder.decodeBytes(
+                        bytes, bytes.length, entity.getContentType().toString()));
+            }
+        }
+
+        BlockingException pendingBlock = null;
+        if (bodyCallback != null) {
+            Flow<Void> flow = bodyCallback.apply(reqCtx, conv);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                pendingBlock =
+                        tryBlock(reqCtx, (Flow.Action.RequestBlockingAction) action, "multipartFormDataUnmarshaller");
+            }
+        }
+
+        if (filenamesCallback != null && filenames != null && !filenames.isEmpty()) {
+            Flow<Void> flow = filenamesCallback.apply(reqCtx, filenames);
+            if (pendingBlock == null) {
+                Flow.Action action = flow.getAction();
+                if (action instanceof Flow.Action.RequestBlockingAction) {
+                    pendingBlock =
+                            tryBlock(reqCtx, (Flow.Action.RequestBlockingAction) action, "multipart file upload");
+                }
+            }
+        }
+
+        if (pendingBlock == null && filesContent != null && !filesContent.isEmpty()) {
+            Flow<Void> flow = contentCallback.apply(reqCtx, filesContent);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                pendingBlock =
+                        tryBlock(reqCtx, (Flow.Action.RequestBlockingAction) action, "multipart file upload content");
+            }
+        }
+
+        if (pendingBlock != null) {
+            throw pendingBlock;
+        }
+    }
+
+    public static Unmarshaller<HttpEntity, String> transformStringUnmarshaller(
+            Unmarshaller<HttpEntity, String> original) {
+        Unmarshaller.EnhancedUnmarshaller<HttpEntity, String> enhancedOriginal =
+                new Unmarshaller.EnhancedUnmarshaller<>(original);
+        JFunction2<HttpEntity, String, String> f2 = (entity, str) -> {
+            try {
+                AgentSpan agentSpan = activeSpan();
+                if (agentSpan == null || isStrictFormOngoing(agentSpan)) {
+                    return str;
+                }
+
+                ContentType contentType = entity.getContentType();
+                MediaType mediaType = contentType.mediaType();
+                if (mediaType != MediaTypes.APPLICATION_JSON
+                        && mediaType != MediaTypes.MULTIPART_FORM_DATA
+                        && mediaType != APPLICATION_X_WWW_FORM_URLENCODED) {
+                    handleArbitraryPostData(str, "HttpEntity -> String unmarshaller");
+                }
+            } catch (Exception e) {
+                handleException(e, "Error in transformStringUnmarshaller");
+            }
+
+            return str;
         };
 
-    return enhancedOriginal.mapWithInput(f2);
-  }
-
-  public static akka.http.javadsl.unmarshalling.Unmarshaller transformJacksonUnmarshaller(
-      akka.http.javadsl.unmarshalling.Unmarshaller original) {
-    return original.thenApply(
-        ret -> {
-          try {
-            handleArbitraryPostData(ret, "jackson unmarshaller");
-          } catch (Exception e) {
-            handleException(e, "Error in transformJacksonUnmarshaller");
-          }
-          return ret;
+        return enhancedOriginal.mapWithInput(f2);
+    }
+
+    public static akka.http.javadsl.unmarshalling.Unmarshaller transformJacksonUnmarshaller(
+            akka.http.javadsl.unmarshalling.Unmarshaller original) {
+        return original.thenApply(ret -> {
+            try {
+                handleArbitraryPostData(ret, "jackson unmarshaller");
+            } catch (Exception e) {
+                handleException(e, "Error in transformJacksonUnmarshaller");
+            }
+            return ret;
         });
-  }
-
-  public static Unmarshaller transformArbitrarySprayUnmarshaller(Unmarshaller original) {
-    JFunction1<Object, Object> f =
-        ret -> {
-          Object conv = tryConvertingScalaContainers(ret, MAX_CONVERSION_DEPTH);
-          try {
-            handleArbitraryPostData(conv, "spray unmarshaller");
-          } catch (Exception e) {
-            handleException(e, "Error in transformArbitrarySprayUnmarshaller");
-          }
-          return ret;
+    }
+
+    public static Unmarshaller transformArbitrarySprayUnmarshaller(Unmarshaller original) {
+        JFunction1<Object, Object> f = ret -> {
+            Object conv = tryConvertingScalaContainers(ret, MAX_CONVERSION_DEPTH);
+            try {
+                handleArbitraryPostData(conv, "spray unmarshaller");
+            } catch (Exception e) {
+                handleException(e, "Error in transformArbitrarySprayUnmarshaller");
+            }
+            return ret;
         };
-    return original.map(f);
-  }
-
-  private static final WeakHashMap<RequestContext, Boolean> STRICT_FORM_SERIALIZATION_ONGOING =
-      new WeakHashMap<>();
-
-  // when unmarshalling parts of multipart requests, some other unmarshallers that
-  // we also instrument, like the string unmarshaller, can run. Those runs happen
-  // in a subset of the data, so we are not interested in them: instead we want
-  // to submit all the data at the same time, after having finished fully
-  // unmarshalling the StrictForm. We suppress the sub-runs of unmarshallers by
-  // noticing when the StrictForm unmarshaller starts running
-  private static void markStrictFormOngoing(AgentSpan agentSpan) {
-    synchronized (STRICT_FORM_SERIALIZATION_ONGOING) {
-      STRICT_FORM_SERIALIZATION_ONGOING.put(agentSpan.getRequestContext(), Boolean.TRUE);
+        return original.map(f);
+    }
+
+    private static final WeakHashMap<RequestContext, Boolean> STRICT_FORM_SERIALIZATION_ONGOING = new WeakHashMap<>();
+
+    // when unmarshalling parts of multipart requests, some other unmarshallers that
+    // we also instrument, like the string unmarshaller, can run. Those runs happen
+    // in a subset of the data, so we are not interested in them: instead we want
+    // to submit all the data at the same time, after having finished fully
+    // unmarshalling the StrictForm. We suppress the sub-runs of unmarshallers by
+    // noticing when the StrictForm unmarshaller starts running
+    private static void markStrictFormOngoing(AgentSpan agentSpan) {
+        synchronized (STRICT_FORM_SERIALIZATION_ONGOING) {
+            STRICT_FORM_SERIALIZATION_ONGOING.put(agentSpan.getRequestContext(), Boolean.TRUE);
+        }
     }
-  }
 
-  private static void unmarkStrictFormOngoing(AgentSpan agentSpan) {
-    synchronized (STRICT_FORM_SERIALIZATION_ONGOING) {
-      STRICT_FORM_SERIALIZATION_ONGOING.remove(agentSpan.getRequestContext());
+    private static void unmarkStrictFormOngoing(AgentSpan agentSpan) {
+        synchronized (STRICT_FORM_SERIALIZATION_ONGOING) {
+            STRICT_FORM_SERIALIZATION_ONGOING.remove(agentSpan.getRequestContext());
+        }
     }
-  }
 
-  private static boolean isStrictFormOngoing(AgentSpan agentSpan) {
-    synchronized (STRICT_FORM_SERIALIZATION_ONGOING) {
-      return STRICT_FORM_SERIALIZATION_ONGOING.getOrDefault(
-          agentSpan.getRequestContext(), Boolean.FALSE);
+    private static boolean isStrictFormOngoing(AgentSpan agentSpan) {
+        synchronized (STRICT_FORM_SERIALIZATION_ONGOING) {
+            return STRICT_FORM_SERIALIZATION_ONGOING.getOrDefault(agentSpan.getRequestContext(), Boolean.FALSE);
+        }
     }
-  }
 
-  private static JFunction1<StrictForm, StrictForm> STRICT_FORM_DATA_POST_TRANSF =
-      sf -> {
+    private static JFunction1<StrictForm, StrictForm> STRICT_FORM_DATA_POST_TRANSF = sf -> {
         try {
-          handleStrictFormData(sf);
+            handleStrictFormData(sf);
         } catch (Exception e) {
-          handleException(e, "Error in transformStrictFromUnmarshaller");
+            handleException(e, "Error in transformStrictFromUnmarshaller");
         }
         // we do not remove the span from STRICT_FORM_SERIALIZATION_ONGOING,
         // as the string unmarshaller can still run afterwards. This way, the
         // advice will still be skipped
         return sf;
-      };
-
-  public static class UnmarkStrictFormOngoingOnUnsupportedException
-      extends JavaPartialFunction<Throwable, StrictForm> {
-    public static final PartialFunction<Throwable, StrictForm> INSTANCE =
-        new UnmarkStrictFormOngoingOnUnsupportedException();
-
-    @Override
-    public StrictForm apply(Throwable x, boolean isCheck) throws Exception {
-      if (!(x
-          instanceof
-          akka.http.scaladsl.unmarshalling.Unmarshaller.UnsupportedContentTypeException)) {
-        throw noMatch();
-      }
-      if (isCheck) {
-        return null;
-      }
-
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan != null) {
-        unmarkStrictFormOngoing(agentSpan);
-      }
-      throw (Exception) x;
+    };
+
+    public static class UnmarkStrictFormOngoingOnUnsupportedException
+            extends JavaPartialFunction<Throwable, StrictForm> {
+        public static final PartialFunction<Throwable, StrictForm> INSTANCE =
+                new UnmarkStrictFormOngoingOnUnsupportedException();
+
+        @Override
+        public StrictForm apply(Throwable x, boolean isCheck) throws Exception {
+            if (!(x instanceof akka.http.scaladsl.unmarshalling.Unmarshaller.UnsupportedContentTypeException)) {
+                throw noMatch();
+            }
+            if (isCheck) {
+                return null;
+            }
+
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan != null) {
+                unmarkStrictFormOngoing(agentSpan);
+            }
+            throw (Exception) x;
+        }
     }
-  }
-
-  public static Unmarshaller<HttpEntity, StrictForm> transformStrictFormUnmarshaller(
-      Unmarshaller<HttpEntity, StrictForm> original) {
-    JFunction1<ExecutionContext, Function1<Materializer, Function1<HttpEntity, Future<StrictForm>>>>
-        wrappedBeforeF =
-            ec -> {
-              JFunction1<Materializer, Function1<HttpEntity, Future<StrictForm>>> g =
-                  mat -> {
-                    JFunction1<HttpEntity, Future<StrictForm>> h =
-                        entity -> {
-                          AgentSpan agentSpan = activeSpan();
-                          if (agentSpan != null) {
-                            markStrictFormOngoing(agentSpan);
-                          }
-
-                          Future<StrictForm> resFut = original.apply(entity, ec, mat);
-                          return resFut
-                              .recover(UnmarkStrictFormOngoingOnUnsupportedException.INSTANCE, ec)
-                              .map(STRICT_FORM_DATA_POST_TRANSF, ec);
+
+    public static Unmarshaller<HttpEntity, StrictForm> transformStrictFormUnmarshaller(
+            Unmarshaller<HttpEntity, StrictForm> original) {
+        JFunction1<ExecutionContext, Function1<Materializer, Function1<HttpEntity, Future<StrictForm>>>>
+                wrappedBeforeF = ec -> {
+                    JFunction1<Materializer, Function1<HttpEntity, Future<StrictForm>>> g = mat -> {
+                        JFunction1<HttpEntity, Future<StrictForm>> h = entity -> {
+                            AgentSpan agentSpan = activeSpan();
+                            if (agentSpan != null) {
+                                markStrictFormOngoing(agentSpan);
+                            }
+
+                            Future<StrictForm> resFut = original.apply(entity, ec, mat);
+                            return resFut.recover(UnmarkStrictFormOngoingOnUnsupportedException.INSTANCE, ec)
+                                    .map(STRICT_FORM_DATA_POST_TRANSF, ec);
                         };
-                    return h;
-                  };
-              return g;
-            };
-    Unmarshaller<HttpEntity, StrictForm> wrapped =
-        Unmarshaller$.MODULE$.withMaterializer(wrappedBeforeF);
-
-    return wrapped;
-  }
-
-  private static void handleStrictFormData(StrictForm sf) {
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, Object, Flow<Void>> bodyCb =
-        cbp.getCallback(EVENTS.requestBodyProcessed());
-    BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb =
-        cbp.getCallback(EVENTS.requestFilesFilenames());
-    BiFunction<RequestContext, List<String>, Flow<Void>> contentCb =
-        cbp.getCallback(EVENTS.requestFilesContent());
-    if (bodyCb == null && filenamesCb == null && contentCb == null) {
-      return;
-    }
+                        return h;
+                    };
+                    return g;
+                };
+        Unmarshaller<HttpEntity, StrictForm> wrapped = Unmarshaller$.MODULE$.withMaterializer(wrappedBeforeF);
+
+        return wrapped;
+    }
+
+    private static void handleStrictFormData(StrictForm sf) {
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, Object, Flow<Void>> bodyCb = cbp.getCallback(EVENTS.requestBodyProcessed());
+        BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb =
+                cbp.getCallback(EVENTS.requestFilesFilenames());
+        BiFunction<RequestContext, List<String>, Flow<Void>> contentCb = cbp.getCallback(EVENTS.requestFilesContent());
+        if (bodyCb == null && filenamesCb == null && contentCb == null) {
+            return;
+        }
+
+        Iterator<Tuple2<String, StrictForm.Field>> iterator = sf.fields().iterator();
+        Map<String, List<String>> conv = new HashMap<>();
+        List<String> filenames = filenamesCb != null ? new ArrayList<>() : null;
+        List<String> filesContent = contentCb != null ? new ArrayList<>() : null;
+        while (iterator.hasNext()) {
+            Tuple2<String, StrictForm.Field> next = iterator.next();
+            String fieldName = next._1();
+            StrictForm.Field field = next._2();
+
+            List<String> strings = conv.get(fieldName);
+            if (strings == null) {
+                strings = new ArrayList<>();
+                conv.put(fieldName, strings);
+            }
 
-    Iterator<Tuple2<String, StrictForm.Field>> iterator = sf.fields().iterator();
-    Map<String, List<String>> conv = new HashMap<>();
-    List<String> filenames = filenamesCb != null ? new ArrayList<>() : null;
-    List<String> filesContent = contentCb != null ? new ArrayList<>() : null;
-    while (iterator.hasNext()) {
-      Tuple2<String, StrictForm.Field> next = iterator.next();
-      String fieldName = next._1();
-      StrictForm.Field field = next._2();
-
-      List<String> strings = conv.get(fieldName);
-      if (strings == null) {
-        strings = new ArrayList<>();
-        conv.put(fieldName, strings);
-      }
-
-      Object strictFieldValue;
-      try {
-        Field f = field.getClass().getDeclaredField("value");
-        f.setAccessible(true);
-        strictFieldValue = f.get(field);
-      } catch (NoSuchFieldException | IllegalAccessException e) {
-        continue;
-      }
-
-      if (strictFieldValue instanceof String) {
-        strings.add((String) strictFieldValue);
-      } else if (strictFieldValue
-          instanceof akka.http.scaladsl.model.Multipart$FormData$BodyPart$Strict) {
-        akka.http.scaladsl.model.Multipart$FormData$BodyPart$Strict bodyPart =
-            (akka.http.scaladsl.model.Multipart$FormData$BodyPart$Strict) strictFieldValue;
-        Optional<String> filenameOpt = bodyPart.getFilename();
-        if (filenames != null && filenameOpt.isPresent() && !filenameOpt.get().isEmpty()) {
-          filenames.add(filenameOpt.get());
-        }
-        HttpEntity.Strict sentity = bodyPart.entity();
-        if (filesContent != null
-            && filenameOpt.isPresent()
-            && filesContent.size() < MAX_FILES_TO_INSPECT) {
-          byte[] bytes = sentity.getData().take(MAX_CONTENT_BYTES).toArray();
-          filesContent.add(
-              MultipartContentDecoder.decodeBytes(
-                  bytes, bytes.length, sentity.contentType().toString()));
+            Object strictFieldValue;
+            try {
+                Field f = field.getClass().getDeclaredField("value");
+                f.setAccessible(true);
+                strictFieldValue = f.get(field);
+            } catch (NoSuchFieldException | IllegalAccessException e) {
+                continue;
+            }
+
+            if (strictFieldValue instanceof String) {
+                strings.add((String) strictFieldValue);
+            } else if (strictFieldValue instanceof akka.http.scaladsl.model.Multipart$FormData$BodyPart$Strict) {
+                akka.http.scaladsl.model.Multipart$FormData$BodyPart$Strict bodyPart =
+                        (akka.http.scaladsl.model.Multipart$FormData$BodyPart$Strict) strictFieldValue;
+                Optional<String> filenameOpt = bodyPart.getFilename();
+                if (filenames != null
+                        && filenameOpt.isPresent()
+                        && !filenameOpt.get().isEmpty()) {
+                    filenames.add(filenameOpt.get());
+                }
+                HttpEntity.Strict sentity = bodyPart.entity();
+                if (filesContent != null && filenameOpt.isPresent() && filesContent.size() < MAX_FILES_TO_INSPECT) {
+                    byte[] bytes = sentity.getData().take(MAX_CONTENT_BYTES).toArray();
+                    filesContent.add(MultipartContentDecoder.decodeBytes(
+                            bytes, bytes.length, sentity.contentType().toString()));
+                }
+                if (bodyCb != null) {
+                    String s = sentity.getData()
+                            .decodeString(Unmarshaller$.MODULE$
+                                    .bestUnmarshallingCharsetFor(sentity)
+                                    .nioCharset());
+                    strings.add(s);
+                }
+            }
         }
-        if (bodyCb != null) {
-          String s =
-              sentity
-                  .getData()
-                  .decodeString(
-                      Unmarshaller$.MODULE$.bestUnmarshallingCharsetFor(sentity).nioCharset());
-          strings.add(s);
-        }
-      }
-    }
 
-    BlockingException pendingBlock = null;
-    if (bodyCb != null) {
-      try {
-        handleArbitraryPostData(conv, "HttpEntity -> StrictForm unmarshaller");
-      } catch (BlockingException e) {
-        pendingBlock = e;
-      }
-    }
+        BlockingException pendingBlock = null;
+        if (bodyCb != null) {
+            try {
+                handleArbitraryPostData(conv, "HttpEntity -> StrictForm unmarshaller");
+            } catch (BlockingException e) {
+                pendingBlock = e;
+            }
+        }
 
-    AgentSpan span = activeSpan();
-    RequestContext reqCtx = null;
-    if (span != null) {
-      RequestContext ctx = span.getRequestContext();
-      if (ctx != null && ctx.getData(RequestContextSlot.APPSEC) != null) {
-        reqCtx = ctx;
-      }
-    }
+        AgentSpan span = activeSpan();
+        RequestContext reqCtx = null;
+        if (span != null) {
+            RequestContext ctx = span.getRequestContext();
+            if (ctx != null && ctx.getData(RequestContextSlot.APPSEC) != null) {
+                reqCtx = ctx;
+            }
+        }
 
-    if (reqCtx != null && filenamesCb != null && filenames != null && !filenames.isEmpty()) {
-      Flow<Void> flow = filenamesCb.apply(reqCtx, filenames);
-      if (pendingBlock == null) {
-        Flow.Action action = flow.getAction();
-        if (action instanceof Flow.Action.RequestBlockingAction) {
-          pendingBlock =
-              tryBlock(reqCtx, (Flow.Action.RequestBlockingAction) action, "multipart file upload");
+        if (reqCtx != null && filenamesCb != null && filenames != null && !filenames.isEmpty()) {
+            Flow<Void> flow = filenamesCb.apply(reqCtx, filenames);
+            if (pendingBlock == null) {
+                Flow.Action action = flow.getAction();
+                if (action instanceof Flow.Action.RequestBlockingAction) {
+                    pendingBlock =
+                            tryBlock(reqCtx, (Flow.Action.RequestBlockingAction) action, "multipart file upload");
+                }
+            }
         }
-      }
-    }
 
-    if (pendingBlock == null && reqCtx != null && contentCb != null && !filesContent.isEmpty()) {
-      Flow<Void> flow = contentCb.apply(reqCtx, filesContent);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        pendingBlock =
-            tryBlock(
-                reqCtx,
-                (Flow.Action.RequestBlockingAction) action,
-                "multipart file upload content");
-      }
-    }
+        if (pendingBlock == null && reqCtx != null && contentCb != null && !filesContent.isEmpty()) {
+            Flow<Void> flow = contentCb.apply(reqCtx, filesContent);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                pendingBlock =
+                        tryBlock(reqCtx, (Flow.Action.RequestBlockingAction) action, "multipart file upload content");
+            }
+        }
 
-    if (pendingBlock != null) {
-      throw pendingBlock;
+        if (pendingBlock != null) {
+            throw pendingBlock;
+        }
     }
-  }
 
-  private static Object tryConvertingScalaContainers(Object obj, int depth) {
-    if (depth == 0) {
-      return obj;
-    }
-    if (obj instanceof scala.collection.Map) {
-      scala.collection.Map map = (scala.collection.Map) obj;
-      Map<Object, Object> ret = new HashMap<>();
-      Iterator<Tuple2> iterator = map.iterator();
-      while (iterator.hasNext()) {
-        Tuple2 next = iterator.next();
-        ret.put(next._1(), tryConvertingScalaContainers(next._2(), depth - 1));
-      }
-      return ret;
-    } else if (obj instanceof scala.collection.Iterable) {
-      List<Object> ret = new ArrayList<>();
-      Iterator iterator = ((Iterable) obj).iterator();
-      while (iterator.hasNext()) {
-        Object next = iterator.next();
-        ret.add(tryConvertingScalaContainers(next, depth - 1));
-      }
-      return ret;
-    }
-    return obj;
-  }
-
-  private static void handleArbitraryPostData(Object o, String source) {
-    AgentSpan span = activeSpan();
-    RequestContext reqCtx;
-    if (span == null
-        || (reqCtx = span.getRequestContext()) == null
-        || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
-      return;
+    private static Object tryConvertingScalaContainers(Object obj, int depth) {
+        if (depth == 0) {
+            return obj;
+        }
+        if (obj instanceof scala.collection.Map) {
+            scala.collection.Map map = (scala.collection.Map) obj;
+            Map<Object, Object> ret = new HashMap<>();
+            Iterator<Tuple2> iterator = map.iterator();
+            while (iterator.hasNext()) {
+                Tuple2 next = iterator.next();
+                ret.put(next._1(), tryConvertingScalaContainers(next._2(), depth - 1));
+            }
+            return ret;
+        } else if (obj instanceof scala.collection.Iterable) {
+            List<Object> ret = new ArrayList<>();
+            Iterator iterator = ((Iterable) obj).iterator();
+            while (iterator.hasNext()) {
+                Object next = iterator.next();
+                ret.add(tryConvertingScalaContainers(next, depth - 1));
+            }
+            return ret;
+        }
+        return obj;
     }
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, Object, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestBodyProcessed());
-    if (callback == null) {
-      return;
-    }
+    private static void handleArbitraryPostData(Object o, String source) {
+        AgentSpan span = activeSpan();
+        RequestContext reqCtx;
+        if (span == null
+                || (reqCtx = span.getRequestContext()) == null
+                || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
+            return;
+        }
 
-    // callback execution
-    executeCallback(reqCtx, callback, o, source);
-  }
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+        if (callback == null) {
+            return;
+        }
 
-  private static BlockingException tryBlock(
-      RequestContext reqCtx, Flow.Action.RequestBlockingAction rba, String details) {
-    BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-    if (brf == null) {
-      return null;
-    }
-    boolean success = brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-    if (!success) {
-      return null;
+        // callback execution
+        executeCallback(reqCtx, callback, o, source);
     }
-    if (brf instanceof AkkaBlockResponseFunction) {
-      ((AkkaBlockResponseFunction) brf).setUnmarshallBlock(true);
-    }
-    return new BlockingException("Blocked request (" + details + ")");
-  }
 
-  private static void handleException(Exception e, String logMessage) {
-    if (e instanceof BlockingException) {
-      throw (BlockingException) e;
+    private static BlockingException tryBlock(
+            RequestContext reqCtx, Flow.Action.RequestBlockingAction rba, String details) {
+        BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+        if (brf == null) {
+            return null;
+        }
+        boolean success = brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+        if (!success) {
+            return null;
+        }
+        if (brf instanceof AkkaBlockResponseFunction) {
+            ((AkkaBlockResponseFunction) brf).setUnmarshallBlock(true);
+        }
+        return new BlockingException("Blocked request (" + details + ")");
     }
 
-    log.warn(logMessage, e);
-  }
+    private static void handleException(Exception e, String logMessage) {
+        if (e instanceof BlockingException) {
+            throw (BlockingException) e;
+        }
+
+        log.warn(logMessage, e);
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieDirectivesInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieDirectivesInstrumentation.java
index a484aa29110..d4a95bd1b77 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieDirectivesInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieDirectivesInstrumentation.java
@@ -22,44 +22,43 @@
  */
 @AutoService(InstrumenterModule.class)
 public class CookieDirectivesInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public CookieDirectivesInstrumentation() {
-    super("akka-http");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public CookieDirectivesInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "akka.http.scaladsl.server.directives.CookieDirectives$class", // scala 2.11
-      "akka.http.scaladsl.server.directives.CookieDirectives", // scala 2.12+ (default methods)
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "akka.http.scaladsl.server.directives.CookieDirectives$class", // scala 2.11
+            "akka.http.scaladsl.server.directives.CookieDirectives", // scala 2.12+ (default methods)
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    String traitName = "akka.http.scaladsl.server.directives.CookieDirectives";
-    transformer.applyAdvice(
-        isTraitDirectiveMethod(traitName, "cookie", "java.lang.String"),
-        CookieDirectivesInstrumentation.class.getName() + "$TaintCookieAdvice");
-    transformer.applyAdvice(
-        isTraitDirectiveMethod(traitName, "optionalCookie", "java.lang.String"),
-        CookieDirectivesInstrumentation.class.getName() + "$TaintOptionalCookieAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        String traitName = "akka.http.scaladsl.server.directives.CookieDirectives";
+        transformer.applyAdvice(
+                isTraitDirectiveMethod(traitName, "cookie", "java.lang.String"),
+                CookieDirectivesInstrumentation.class.getName() + "$TaintCookieAdvice");
+        transformer.applyAdvice(
+                isTraitDirectiveMethod(traitName, "optionalCookie", "java.lang.String"),
+                CookieDirectivesInstrumentation.class.getName() + "$TaintOptionalCookieAdvice");
+    }
 
-  static class TaintCookieAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    static void after(@Advice.Return(readOnly = false) Directive directive) {
-      directive = directive.tmap(TaintCookieFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+    static class TaintCookieAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        static void after(@Advice.Return(readOnly = false) Directive directive) {
+            directive = directive.tmap(TaintCookieFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        }
     }
-  }
 
-  static class TaintOptionalCookieAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    static void after(@Advice.Return(readOnly = false) Directive directive) {
-      directive =
-          directive.tmap(TaintOptionalCookieFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+    static class TaintOptionalCookieAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        static void after(@Advice.Return(readOnly = false) Directive directive) {
+            directive = directive.tmap(TaintOptionalCookieFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieHeaderInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieHeaderInstrumentation.java
index 1a0b5a1a5ff..713f8c326b7 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieHeaderInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieHeaderInstrumentation.java
@@ -33,51 +33,51 @@
  */
 @AutoService(InstrumenterModule.class)
 public class CookieHeaderInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public CookieHeaderInstrumentation() {
-    super("akka-http");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public CookieHeaderInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.http.scaladsl.model.headers.Cookie";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.http.scaladsl.model.headers.Cookie";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("cookies"))
-            .and(returns(named("scala.collection.immutable.Seq")))
-            .and(takesArguments(0)),
-        CookieHeaderInstrumentation.class.getName() + "$TaintAllCookiesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("cookies"))
+                        .and(returns(named("scala.collection.immutable.Seq")))
+                        .and(takesArguments(0)),
+                CookieHeaderInstrumentation.class.getName() + "$TaintAllCookiesAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  static class TaintAllCookiesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    static void after(
-        @Advice.This HttpHeader cookie,
-        @Advice.Return Seq<HttpCookiePair> cookiePairs,
-        @ActiveRequestContext RequestContext reqCtx) {
-      PropagationModule prop = InstrumentationBridge.PROPAGATION;
-      if (prop == null || cookiePairs == null || cookiePairs.isEmpty()) {
-        return;
-      }
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      if (!prop.isTainted(ctx, cookie)) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    static class TaintAllCookiesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        static void after(
+                @Advice.This HttpHeader cookie,
+                @Advice.Return Seq<HttpCookiePair> cookiePairs,
+                @ActiveRequestContext RequestContext reqCtx) {
+            PropagationModule prop = InstrumentationBridge.PROPAGATION;
+            if (prop == null || cookiePairs == null || cookiePairs.isEmpty()) {
+                return;
+            }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            if (!prop.isTainted(ctx, cookie)) {
+                return;
+            }
 
-      Iterator<HttpCookiePair> iterator = cookiePairs.iterator();
-      while (iterator.hasNext()) {
-        HttpCookiePair pair = iterator.next();
-        final String name = pair.name(), value = pair.value();
-        prop.taintString(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
-        prop.taintString(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
-      }
+            Iterator<HttpCookiePair> iterator = cookiePairs.iterator();
+            while (iterator.hasNext()) {
+                HttpCookiePair pair = iterator.next();
+                final String name = pair.name(), value = pair.value();
+                prop.taintString(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
+                prop.taintString(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ExtractDirectivesInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ExtractDirectivesInstrumentation.java
index d1104b47321..c3a5b46a205 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ExtractDirectivesInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ExtractDirectivesInstrumentation.java
@@ -34,54 +34,53 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ExtractDirectivesInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public ExtractDirectivesInstrumentation() {
-    super("akka-http");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public ExtractDirectivesInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "akka.http.scaladsl.server.directives.BasicDirectives$class",
-      "akka.http.scaladsl.server.directives.BasicDirectives",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "akka.http.scaladsl.server.directives.BasicDirectives$class",
+            "akka.http.scaladsl.server.directives.BasicDirectives",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    instrumentDirective(transformer, "extractUri", "TaintUriDirectiveAdvice");
-    instrumentDirective(transformer, "extractRequest", "TaintRequestDirectiveAdvice");
-    instrumentDirective(transformer, "extractRequestContext", "TaintRequestContextDirectiveAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        instrumentDirective(transformer, "extractUri", "TaintUriDirectiveAdvice");
+        instrumentDirective(transformer, "extractRequest", "TaintRequestDirectiveAdvice");
+        instrumentDirective(transformer, "extractRequestContext", "TaintRequestContextDirectiveAdvice");
+    }
 
-  private void instrumentDirective(MethodTransformer transformation, String method, String advice) {
-    transformation.applyAdvice(
-        isTraitDirectiveMethod("akka.http.scaladsl.server.directives.BasicDirectives", method),
-        ExtractDirectivesInstrumentation.class.getName() + '$' + advice);
-  }
+    private void instrumentDirective(MethodTransformer transformation, String method, String advice) {
+        transformation.applyAdvice(
+                isTraitDirectiveMethod("akka.http.scaladsl.server.directives.BasicDirectives", method),
+                ExtractDirectivesInstrumentation.class.getName() + '$' + advice);
+    }
 
-  static class TaintUriDirectiveAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_QUERY)
-    static void after(@Advice.Return(readOnly = false) Directive directive) {
-      directive = directive.tmap(TaintUriFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+    static class TaintUriDirectiveAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_QUERY)
+        static void after(@Advice.Return(readOnly = false) Directive directive) {
+            directive = directive.tmap(TaintUriFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        }
     }
-  }
 
-  static class TaintRequestDirectiveAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_BODY)
-    static void after(@Advice.Return(readOnly = false) Directive directive) {
-      directive = directive.tmap(TaintRequestFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+    static class TaintRequestDirectiveAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_BODY)
+        static void after(@Advice.Return(readOnly = false) Directive directive) {
+            directive = directive.tmap(TaintRequestFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        }
     }
-  }
 
-  static class TaintRequestContextDirectiveAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_BODY)
-    static void after(@Advice.Return(readOnly = false) Directive directive) {
-      directive =
-          directive.tmap(TaintRequestContextFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+    static class TaintRequestContextDirectiveAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_BODY)
+        static void after(@Advice.Return(readOnly = false) Directive directive) {
+            directive = directive.tmap(TaintRequestContextFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormDataInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormDataInstrumentation.java
index 3f83982bf34..5171a66bc11 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormDataInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormDataInstrumentation.java
@@ -20,28 +20,28 @@
  */
 @AutoService(InstrumenterModule.class)
 public class FormDataInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public FormDataInstrumentation() {
-    super("akka-http");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public FormDataInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.http.scaladsl.model.FormData";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.http.scaladsl.model.FormData";
+    }
 
-  /**
-   * @param transformer
-   * @see UriInstrumentation.TaintQueryAdvice
-   */
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("fields"))
-            .and(takesArguments(0))
-            .and(returns(named("akka.http.scaladsl.model.Uri$Query"))),
-        "datadog.trace.instrumentation.akkahttp.iast.UriInstrumentation$TaintQueryAdvice");
-  }
+    /**
+     * @param transformer
+     * @see UriInstrumentation.TaintQueryAdvice
+     */
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("fields"))
+                        .and(takesArguments(0))
+                        .and(returns(named("akka.http.scaladsl.model.Uri$Query"))),
+                "datadog.trace.instrumentation.akkahttp.iast.UriInstrumentation$TaintQueryAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormFieldDirectivesInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormFieldDirectivesInstrumentation.java
index 1a0ccc7ff7f..1dc87cbc5e7 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormFieldDirectivesInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormFieldDirectivesInstrumentation.java
@@ -30,92 +30,81 @@
  */
 @AutoService(InstrumenterModule.class)
 public class FormFieldDirectivesInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  private static final String TRAIT_CLASS =
-      "akka.http.scaladsl.server.directives.FormFieldDirectives";
+    private static final String TRAIT_CLASS = "akka.http.scaladsl.server.directives.FormFieldDirectives";
 
-  public FormFieldDirectivesInstrumentation() {
-    super("akka-http");
-  }
+    public FormFieldDirectivesInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      TRAIT_CLASS + "$class", TRAIT_CLASS,
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            TRAIT_CLASS + "$class", TRAIT_CLASS,
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // the Java API delegates to the Scala API
-    transformDirective(transformer, "formFieldMultiMap", "TaintMultiMapDirectiveAdvice");
-    transformDirective(transformer, "formFieldMap", "TaintMapDirectiveAdvice");
-    transformDirective(transformer, "formFieldSeq", "TaintSeqDirectiveAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // the Java API delegates to the Scala API
+        transformDirective(transformer, "formFieldMultiMap", "TaintMultiMapDirectiveAdvice");
+        transformDirective(transformer, "formFieldMap", "TaintMapDirectiveAdvice");
+        transformDirective(transformer, "formFieldSeq", "TaintSeqDirectiveAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("formField").or(named("formFields")))
-            .and(returns(Object.class))
-            .and(takesArguments(2))
-            .and(
-                takesArgument(0, named("akka.http.scaladsl.server.directives.FormFieldDirectives")))
-            .and(
-                takesArgument(
-                    1,
-                    named("akka.http.scaladsl.server.directives.FormFieldDirectives$FieldMagnet"))),
-        FormFieldDirectivesInstrumentation.class.getName()
-            + "$TaintSingleFormFieldDirectiveOldScalaAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("formField").or(named("formFields")))
+                        .and(returns(Object.class))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("akka.http.scaladsl.server.directives.FormFieldDirectives")))
+                        .and(takesArgument(
+                                1, named("akka.http.scaladsl.server.directives.FormFieldDirectives$FieldMagnet"))),
+                FormFieldDirectivesInstrumentation.class.getName() + "$TaintSingleFormFieldDirectiveOldScalaAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("formField").or(named("formFields")))
-            .and(returns(Object.class).or(returns(named("akka.http.scaladsl.server.Directive"))))
-            .and(takesArguments(1))
-            .and(
-                takesArgument(
-                    0,
-                    named("akka.http.scaladsl.server.directives.FormFieldDirectives$FieldMagnet"))),
-        FormFieldDirectivesInstrumentation.class.getName()
-            + "$TaintSingleFormFieldDirectiveNewScalaAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("formField").or(named("formFields")))
+                        .and(returns(Object.class).or(returns(named("akka.http.scaladsl.server.Directive"))))
+                        .and(takesArguments(1))
+                        .and(takesArgument(
+                                0, named("akka.http.scaladsl.server.directives.FormFieldDirectives$FieldMagnet"))),
+                FormFieldDirectivesInstrumentation.class.getName() + "$TaintSingleFormFieldDirectiveNewScalaAdvice");
+    }
 
-  private void transformDirective(
-      MethodTransformer transformation, String methodName, String adviceClass) {
-    transformation.applyAdvice(
-        isTraitDirectiveMethod(TRAIT_CLASS, methodName),
-        ParameterDirectivesInstrumentation.class.getName() + "$" + adviceClass);
-  }
+    private void transformDirective(MethodTransformer transformation, String methodName, String adviceClass) {
+        transformation.applyAdvice(
+                isTraitDirectiveMethod(TRAIT_CLASS, methodName),
+                ParameterDirectivesInstrumentation.class.getName() + "$" + adviceClass);
+    }
 
-  static class TaintSingleFormFieldDirectiveOldScalaAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(
-        @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Directive retval,
-        @Advice.Argument(1) FormFieldDirectives.FieldMagnet fmag) {
-      try {
-        retval =
-            retval.tmap(new TaintSingleParameterFunction<>(fmag), Tupler$.MODULE$.forTuple(null));
-      } catch (Exception e) {
-        throw new RuntimeException(e); // propagate so it's logged
-      }
+    static class TaintSingleFormFieldDirectiveOldScalaAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(
+                @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Directive retval,
+                @Advice.Argument(1) FormFieldDirectives.FieldMagnet fmag) {
+            try {
+                retval = retval.tmap(new TaintSingleParameterFunction<>(fmag), Tupler$.MODULE$.forTuple(null));
+            } catch (Exception e) {
+                throw new RuntimeException(e); // propagate so it's logged
+            }
+        }
     }
-  }
 
-  static class TaintSingleFormFieldDirectiveNewScalaAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(
-        @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Directive retval,
-        @Advice.Argument(0) FormFieldDirectives.FieldMagnet fmag) {
-      try {
-        retval =
-            retval.tmap(new TaintSingleParameterFunction<>(fmag), Tupler$.MODULE$.forTuple(null));
-      } catch (Exception e) {
-        throw new RuntimeException(e); // propagate so it's logged
-      }
+    static class TaintSingleFormFieldDirectiveNewScalaAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(
+                @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Directive retval,
+                @Advice.Argument(0) FormFieldDirectives.FieldMagnet fmag) {
+            try {
+                retval = retval.tmap(new TaintSingleParameterFunction<>(fmag), Tupler$.MODULE$.forTuple(null));
+            } catch (Exception e) {
+                throw new RuntimeException(e); // propagate so it's logged
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HeaderNameCallSite.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HeaderNameCallSite.java
index 143f2829989..ff418089e0e 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HeaderNameCallSite.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HeaderNameCallSite.java
@@ -19,23 +19,22 @@
 @CallSite(spi = IastCallSites.class)
 public class HeaderNameCallSite {
 
-  @CallSite.After("java.lang.String akka.http.javadsl.model.HttpHeader.name()")
-  @CallSite.After(
-      "java.lang.String akka.http.scaladsl.model.HttpHeader.name()") // subtype of the first
-  public static String after(@CallSite.This HttpHeader header, @CallSite.Return String result) {
-    PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module == null) {
-      return result;
-    }
-    try {
-      final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-      if (ctx == null) {
+    @CallSite.After("java.lang.String akka.http.javadsl.model.HttpHeader.name()")
+    @CallSite.After("java.lang.String akka.http.scaladsl.model.HttpHeader.name()") // subtype of the first
+    public static String after(@CallSite.This HttpHeader header, @CallSite.Return String result) {
+        PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module == null) {
+            return result;
+        }
+        try {
+            final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+            if (ctx == null) {
+                return result;
+            }
+            module.taintStringIfTainted(ctx, result, header, SourceTypes.REQUEST_HEADER_NAME, result);
+        } catch (final Throwable e) {
+            module.onUnexpectedException("onHeaderNames threw", e);
+        }
         return result;
-      }
-      module.taintStringIfTainted(ctx, result, header, SourceTypes.REQUEST_HEADER_NAME, result);
-    } catch (final Throwable e) {
-      module.onUnexpectedException("onHeaderNames threw", e);
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpHeaderSubclassesInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpHeaderSubclassesInstrumentation.java
index a102830d10b..38219e375a0 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpHeaderSubclassesInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpHeaderSubclassesInstrumentation.java
@@ -34,45 +34,43 @@
  */
 @AutoService(InstrumenterModule.class)
 public class HttpHeaderSubclassesInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public HttpHeaderSubclassesInstrumentation() {
-    super("akka-http");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public HttpHeaderSubclassesInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "akka.http.scaladsl.model.HttpHeader";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "akka.http.scaladsl.model.HttpHeader";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return nameStartsWith("akka.http.scaladsl.model.")
-        .and(not(named(hierarchyMarkerType())))
-        .and(extendsClass(named(hierarchyMarkerType())));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return nameStartsWith("akka.http.scaladsl.model.")
+                .and(not(named(hierarchyMarkerType())))
+                .and(extendsClass(named(hierarchyMarkerType())));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("value")).and(takesArguments(0)).and(returns(String.class)),
-        HttpHeaderSubclassesInstrumentation.class.getName() + "$HttpHeaderSubclassesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("value")).and(takesArguments(0)).and(returns(String.class)),
+                HttpHeaderSubclassesInstrumentation.class.getName() + "$HttpHeaderSubclassesAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  static class HttpHeaderSubclassesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    static void onExit(
-        @Advice.This HttpHeader h,
-        @Advice.Return String retVal,
-        @ActiveRequestContext RequestContext reqCtx) {
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    static class HttpHeaderSubclassesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        static void onExit(
+                @Advice.This HttpHeader h, @Advice.Return String retVal, @ActiveRequestContext RequestContext reqCtx) {
 
-      PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      propagation.taintStringIfTainted(ctx, retVal, h);
+            PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            propagation.taintStringIfTainted(ctx, retVal, h);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpRequestInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpRequestInstrumentation.java
index b0b027bcfd7..554a4ee140a 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/HttpRequestInstrumentation.java
@@ -35,82 +35,86 @@
  */
 @AutoService(InstrumenterModule.class)
 public class HttpRequestInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public HttpRequestInstrumentation() {
-    super("akka-http");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public HttpRequestInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.http.scaladsl.model.HttpRequest";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.http.scaladsl.model.HttpRequest";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("headers"))
-            .and(returns(named("scala.collection.immutable.Seq")))
-            .and(takesArguments(0)),
-        HttpRequestInstrumentation.class.getName() + "$RequestHeadersAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("headers"))
+                        .and(returns(named("scala.collection.immutable.Seq")))
+                        .and(takesArguments(0)),
+                HttpRequestInstrumentation.class.getName() + "$RequestHeadersAdvice");
 
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(not(isStatic())).and(named("entity")).and(takesArguments(0)),
-        HttpRequestInstrumentation.class.getName() + "$EntityAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(not(isStatic()))
+                        .and(named("entity"))
+                        .and(takesArguments(0)),
+                HttpRequestInstrumentation.class.getName() + "$EntityAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  static class RequestHeadersAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    static void onExit(
-        @Advice.This HttpRequest thiz,
-        @Advice.Return(readOnly = false) Seq<HttpHeader> headers,
-        @ActiveRequestContext RequestContext reqCtx) {
-      PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation == null || headers == null || headers.isEmpty()) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    static class RequestHeadersAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        static void onExit(
+                @Advice.This HttpRequest thiz,
+                @Advice.Return(readOnly = false) Seq<HttpHeader> headers,
+                @ActiveRequestContext RequestContext reqCtx) {
+            PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation == null || headers == null || headers.isEmpty()) {
+                return;
+            }
 
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      if (!propagation.isTainted(ctx, thiz)) {
-        return;
-      }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            if (!propagation.isTainted(ctx, thiz)) {
+                return;
+            }
 
-      Iterator<HttpHeader> iterator = headers.iterator();
-      while (iterator.hasNext()) {
-        HttpHeader h = iterator.next();
-        if (propagation.isTainted(ctx, h)) {
-          continue;
+            Iterator<HttpHeader> iterator = headers.iterator();
+            while (iterator.hasNext()) {
+                HttpHeader h = iterator.next();
+                if (propagation.isTainted(ctx, h)) {
+                    continue;
+                }
+                // unfortunately, the call to h.value() is instrumented, but
+                // because the call to taint() only happens after, the call is a noop
+                propagation.taintObject(ctx, h, SourceTypes.REQUEST_HEADER_VALUE, h.name(), h.value());
+            }
         }
-        // unfortunately, the call to h.value() is instrumented, but
-        // because the call to taint() only happens after, the call is a noop
-        propagation.taintObject(ctx, h, SourceTypes.REQUEST_HEADER_VALUE, h.name(), h.value());
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  static class EntityAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    static void onExit(
-        @Advice.This HttpRequest thiz,
-        @Advice.Return(readOnly = false, typing = DYNAMIC) Object entity,
-        @ActiveRequestContext RequestContext reqCtx) {
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    static class EntityAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        static void onExit(
+                @Advice.This HttpRequest thiz,
+                @Advice.Return(readOnly = false, typing = DYNAMIC) Object entity,
+                @ActiveRequestContext RequestContext reqCtx) {
 
-      PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation == null || entity == null) {
-        return;
-      }
+            PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation == null || entity == null) {
+                return;
+            }
 
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      if (propagation.isTainted(ctx, entity)) {
-        return;
-      }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            if (propagation.isTainted(ctx, entity)) {
+                return;
+            }
 
-      propagation.taintObjectIfTainted(ctx, entity, thiz);
+            propagation.taintObjectIfTainted(ctx, entity, thiz);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MakeTaintableInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MakeTaintableInstrumentation.java
index c2898fc5afc..1bd57732f5b 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MakeTaintableInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MakeTaintableInstrumentation.java
@@ -7,32 +7,32 @@
 
 @AutoService(InstrumenterModule.class)
 public class MakeTaintableInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasTypeAdvice {
-  public MakeTaintableInstrumentation() {
-    super("akka-http");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasTypeAdvice {
+    public MakeTaintableInstrumentation() {
+        super("akka-http");
+    }
 
-  /**
-   * @see akka.http.scaladsl.model.HttpHeader
-   * @return the matching types
-   */
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "akka.http.javadsl.model.HttpHeader", // scaladsl versions extends javadsl.m.HttpHeader
-      "akka.http.scaladsl.model.Uri", // javadsl version wraps scaladsl version
-      "akka.http.scaladsl.model.HttpRequest", // javadsl is abstract superclass, but scaladsl is
-      // concrete types of request entities
-      "akka.http.scaladsl.model.HttpEntity$Strict",
-      "akka.http.scaladsl.model.HttpEntity$Default",
-      "akka.http.scaladsl.model.HttpEntity$Chunked",
-      // only impl
-      "akka.http.scaladsl.server.RequestContextImpl",
-    };
-  }
+    /**
+     * @see akka.http.scaladsl.model.HttpHeader
+     * @return the matching types
+     */
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "akka.http.javadsl.model.HttpHeader", // scaladsl versions extends javadsl.m.HttpHeader
+            "akka.http.scaladsl.model.Uri", // javadsl version wraps scaladsl version
+            "akka.http.scaladsl.model.HttpRequest", // javadsl is abstract superclass, but scaladsl is
+            // concrete types of request entities
+            "akka.http.scaladsl.model.HttpEntity$Strict",
+            "akka.http.scaladsl.model.HttpEntity$Default",
+            "akka.http.scaladsl.model.HttpEntity$Chunked",
+            // only impl
+            "akka.http.scaladsl.server.RequestContextImpl",
+        };
+    }
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new TaintableVisitor(knownMatchingTypes()));
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new TaintableVisitor(knownMatchingTypes()));
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MarshallingDirectivesInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MarshallingDirectivesInstrumentation.java
index b2bfc3ecee5..f7c25efadbd 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MarshallingDirectivesInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MarshallingDirectivesInstrumentation.java
@@ -28,65 +28,61 @@
  */
 @AutoService(InstrumenterModule.class)
 public class MarshallingDirectivesInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public MarshallingDirectivesInstrumentation() {
-    super("akka-http");
-  }
+    public MarshallingDirectivesInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "akka.http.scaladsl.server.directives.MarshallingDirectives$class",
-      "akka.http.scaladsl.server.directives.MarshallingDirectives",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "akka.http.scaladsl.server.directives.MarshallingDirectives$class",
+            "akka.http.scaladsl.server.directives.MarshallingDirectives",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("entity"))
-            .and(returns(named("akka.http.scaladsl.server.Directive")))
-            .and(takesArguments(2))
-            .and(
-                takesArgument(
-                    0, named("akka.http.scaladsl.server.directives.MarshallingDirectives")))
-            .and(takesArgument(1, named("akka.http.scaladsl.unmarshalling.Unmarshaller"))),
-        MarshallingDirectivesInstrumentation.class.getName()
-            + "$TaintUnmarshallerInputOldScalaAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("entity"))
+                        .and(returns(named("akka.http.scaladsl.server.Directive")))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("akka.http.scaladsl.server.directives.MarshallingDirectives")))
+                        .and(takesArgument(1, named("akka.http.scaladsl.unmarshalling.Unmarshaller"))),
+                MarshallingDirectivesInstrumentation.class.getName() + "$TaintUnmarshallerInputOldScalaAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("entity"))
-            .and(returns(named("akka.http.scaladsl.server.Directive")))
-            .and(takesArguments(1))
-            .and(takesArgument(1, named("akka.http.scaladsl.unmarshalling.Unmarshaller"))),
-        MarshallingDirectivesInstrumentation.class.getName()
-            + "$TaintUnmarshallerInputNewScalaAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("entity"))
+                        .and(returns(named("akka.http.scaladsl.server.Directive")))
+                        .and(takesArguments(1))
+                        .and(takesArgument(1, named("akka.http.scaladsl.unmarshalling.Unmarshaller"))),
+                MarshallingDirectivesInstrumentation.class.getName() + "$TaintUnmarshallerInputNewScalaAdvice");
+    }
 
-  static class TaintUnmarshallerInputOldScalaAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_BODY)
-    static void before(@Advice.Argument(readOnly = false, value = 1) Unmarshaller unmarshaller) {
-      PropagationModule mod = InstrumentationBridge.PROPAGATION;
-      if (mod != null) {
-        unmarshaller = new TaintUnmarshaller(mod, unmarshaller);
-      }
+    static class TaintUnmarshallerInputOldScalaAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_BODY)
+        static void before(@Advice.Argument(readOnly = false, value = 1) Unmarshaller unmarshaller) {
+            PropagationModule mod = InstrumentationBridge.PROPAGATION;
+            if (mod != null) {
+                unmarshaller = new TaintUnmarshaller(mod, unmarshaller);
+            }
+        }
     }
-  }
 
-  static class TaintUnmarshallerInputNewScalaAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_BODY)
-    static void before(@Advice.Argument(readOnly = false, value = 0) Unmarshaller unmarshaller) {
-      PropagationModule mod = InstrumentationBridge.PROPAGATION;
-      if (mod != null) {
-        unmarshaller = new TaintUnmarshaller(mod, unmarshaller);
-      }
+    static class TaintUnmarshallerInputNewScalaAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_BODY)
+        static void before(@Advice.Argument(readOnly = false, value = 0) Unmarshaller unmarshaller) {
+            PropagationModule mod = InstrumentationBridge.PROPAGATION;
+            if (mod != null) {
+                unmarshaller = new TaintUnmarshaller(mod, unmarshaller);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ParameterDirectivesInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ParameterDirectivesInstrumentation.java
index 35818620e8d..891722e703e 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ParameterDirectivesInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ParameterDirectivesInstrumentation.java
@@ -30,125 +30,114 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ParameterDirectivesInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  private static final String TRAIT_NAME =
-      "akka.http.scaladsl.server.directives.ParameterDirectives";
-
-  public ParameterDirectivesInstrumentation() {
-    super("akka-http");
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      TRAIT_NAME + "$class", TRAIT_NAME,
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // the Java API delegates to the Scala API
-    transformDirective(transformer, "parameterMultiMap", "TaintMultiMapDirectiveAdvice");
-    transformDirective(transformer, "parameterMap", "TaintMapDirectiveAdvice");
-    transformDirective(transformer, "parameterSeq", "TaintSeqDirectiveAdvice");
-
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("parameter").or(named("parameters")))
-            .and(returns(Object.class))
-            .and(takesArguments(2))
-            .and(
-                takesArgument(0, named("akka.http.scaladsl.server.directives.ParameterDirectives")))
-            .and(
-                takesArgument(
-                    1,
-                    named("akka.http.scaladsl.server.directives.ParameterDirectives$ParamMagnet"))),
-        ParameterDirectivesInstrumentation.class.getName()
-            + "$TaintSingleParameterDirectiveOldScalaAdvice");
-
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("parameter").or(named("parameters")))
-            .and(returns(Object.class).or(returns(named("akka.http.scaladsl.server.Directive"))))
-            .and(takesArguments(1))
-            .and(
-                takesArgument(
-                    0,
-                    named("akka.http.scaladsl.server.directives.ParameterDirectives$ParamMagnet"))),
-        ParameterDirectivesInstrumentation.class.getName()
-            + "$TaintSingleParameterDirectiveNewScalaAdvice");
-  }
-
-  private void transformDirective(
-      MethodTransformer transformation, String methodName, String adviceClass) {
-    transformation.applyAdvice(
-        TraitMethodMatchers.isTraitDirectiveMethod(TRAIT_NAME, methodName),
-        ParameterDirectivesInstrumentation.class.getName() + "$" + adviceClass);
-  }
-
-  static class TaintMultiMapDirectiveAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(@Advice.Return(readOnly = false) Directive directive) {
-      directive = directive.tmap(TaintMultiMapFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    private static final String TRAIT_NAME = "akka.http.scaladsl.server.directives.ParameterDirectives";
+
+    public ParameterDirectivesInstrumentation() {
+        super("akka-http");
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            TRAIT_NAME + "$class", TRAIT_NAME,
+        };
     }
-  }
 
-  static class TaintMapDirectiveAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(@Advice.Return(readOnly = false) Directive directive) {
-      directive = directive.tmap(TaintMapFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // the Java API delegates to the Scala API
+        transformDirective(transformer, "parameterMultiMap", "TaintMultiMapDirectiveAdvice");
+        transformDirective(transformer, "parameterMap", "TaintMapDirectiveAdvice");
+        transformDirective(transformer, "parameterSeq", "TaintSeqDirectiveAdvice");
+
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("parameter").or(named("parameters")))
+                        .and(returns(Object.class))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("akka.http.scaladsl.server.directives.ParameterDirectives")))
+                        .and(takesArgument(
+                                1, named("akka.http.scaladsl.server.directives.ParameterDirectives$ParamMagnet"))),
+                ParameterDirectivesInstrumentation.class.getName() + "$TaintSingleParameterDirectiveOldScalaAdvice");
+
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("parameter").or(named("parameters")))
+                        .and(returns(Object.class).or(returns(named("akka.http.scaladsl.server.Directive"))))
+                        .and(takesArguments(1))
+                        .and(takesArgument(
+                                0, named("akka.http.scaladsl.server.directives.ParameterDirectives$ParamMagnet"))),
+                ParameterDirectivesInstrumentation.class.getName() + "$TaintSingleParameterDirectiveNewScalaAdvice");
     }
-  }
 
-  static class TaintSeqDirectiveAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(@Advice.Return(readOnly = false) Directive directive) {
-      directive = directive.tmap(TaintSeqFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+    private void transformDirective(MethodTransformer transformation, String methodName, String adviceClass) {
+        transformation.applyAdvice(
+                TraitMethodMatchers.isTraitDirectiveMethod(TRAIT_NAME, methodName),
+                ParameterDirectivesInstrumentation.class.getName() + "$" + adviceClass);
     }
-  }
-
-  static class TaintSingleParameterDirectiveOldScalaAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(
-        @Advice.Return(readOnly = false) Object retval,
-        @Advice.Argument(1) ParameterDirectives.ParamMagnet pmag) {
-      if (!(retval instanceof Directive)) {
-        return;
-      }
-
-      try {
-        retval =
-            ((Directive) retval)
-                .tmap(new TaintSingleParameterFunction<>(pmag), Tupler$.MODULE$.forTuple(null));
-      } catch (Exception e) {
-        throw new RuntimeException(e); // propagate so it's logged
-      }
+
+    static class TaintMultiMapDirectiveAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(@Advice.Return(readOnly = false) Directive directive) {
+            directive = directive.tmap(TaintMultiMapFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        }
+    }
+
+    static class TaintMapDirectiveAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(@Advice.Return(readOnly = false) Directive directive) {
+            directive = directive.tmap(TaintMapFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        }
     }
-  }
-
-  static class TaintSingleParameterDirectiveNewScalaAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(
-        @Advice.Return(readOnly = false) Object retval,
-        @Advice.Argument(0) ParameterDirectives.ParamMagnet pmag) {
-      if (!(retval instanceof Directive)) {
-        return;
-      }
-
-      try {
-        retval =
-            ((Directive) retval)
-                .tmap(new TaintSingleParameterFunction<>(pmag), Tupler$.MODULE$.forTuple(null));
-      } catch (Exception e) {
-        throw new RuntimeException(e); // propagate so it's logged
-      }
+
+    static class TaintSeqDirectiveAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(@Advice.Return(readOnly = false) Directive directive) {
+            directive = directive.tmap(TaintSeqFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        }
+    }
+
+    static class TaintSingleParameterDirectiveOldScalaAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(
+                @Advice.Return(readOnly = false) Object retval,
+                @Advice.Argument(1) ParameterDirectives.ParamMagnet pmag) {
+            if (!(retval instanceof Directive)) {
+                return;
+            }
+
+            try {
+                retval = ((Directive) retval)
+                        .tmap(new TaintSingleParameterFunction<>(pmag), Tupler$.MODULE$.forTuple(null));
+            } catch (Exception e) {
+                throw new RuntimeException(e); // propagate so it's logged
+            }
+        }
+    }
+
+    static class TaintSingleParameterDirectiveNewScalaAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(
+                @Advice.Return(readOnly = false) Object retval,
+                @Advice.Argument(0) ParameterDirectives.ParamMagnet pmag) {
+            if (!(retval instanceof Directive)) {
+                return;
+            }
+
+            try {
+                retval = ((Directive) retval)
+                        .tmap(new TaintSingleParameterFunction<>(pmag), Tupler$.MODULE$.forTuple(null));
+            } catch (Exception e) {
+                throw new RuntimeException(e); // propagate so it's logged
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/PathMatcherInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/PathMatcherInstrumentation.java
index 021c9f4df57..136280b7946 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/PathMatcherInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/PathMatcherInstrumentation.java
@@ -25,54 +25,53 @@
  */
 @AutoService(InstrumenterModule.class)
 public class PathMatcherInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public PathMatcherInstrumentation() {
-    super("akka-http");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public PathMatcherInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.http.scaladsl.server.PathMatcher$Matched";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.http.scaladsl.server.PathMatcher$Matched";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("akka.http.scaladsl.model.Uri$Path")))
-            .and(takesArgument(1, Object.class))
-            .and(takesArgument(2, named("akka.http.scaladsl.server.util.Tuple"))),
-        PathMatcherInstrumentation.class.getName() + "$PathMatcherAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("akka.http.scaladsl.model.Uri$Path")))
+                        .and(takesArgument(1, Object.class))
+                        .and(takesArgument(2, named("akka.http.scaladsl.server.util.Tuple"))),
+                PathMatcherInstrumentation.class.getName() + "$PathMatcherAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  static class PathMatcherAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PATH_PARAMETER)
-    static void onExit(
-        @Advice.Argument(1) Object extractions, @ActiveRequestContext RequestContext reqCtx) {
-      if (!(extractions instanceof scala.Tuple1)) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    static class PathMatcherAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PATH_PARAMETER)
+        static void onExit(@Advice.Argument(1) Object extractions, @ActiveRequestContext RequestContext reqCtx) {
+            if (!(extractions instanceof scala.Tuple1)) {
+                return;
+            }
 
-      scala.Tuple1 tuple = (scala.Tuple1) extractions;
-      Object value = tuple._1();
+            scala.Tuple1 tuple = (scala.Tuple1) extractions;
+            Object value = tuple._1();
 
-      PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null || !(value instanceof String)) {
-        return;
-      }
-      final String stringValue = (String) value;
+            PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null || !(value instanceof String)) {
+                return;
+            }
+            final String stringValue = (String) value;
 
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
 
-      // in the test, 4 instances of PathMatcher$Match are created, all with the same value
-      if (module.isTainted(ctx, stringValue)) {
-        return;
-      }
+            // in the test, 4 instances of PathMatcher$Match are created, all with the same value
+            if (module.isTainted(ctx, stringValue)) {
+                return;
+            }
 
-      module.taintString(ctx, stringValue, SourceTypes.REQUEST_PATH_PARAMETER);
+            module.taintString(ctx, stringValue, SourceTypes.REQUEST_PATH_PARAMETER);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/RequestContextInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/RequestContextInstrumentation.java
index f1cf128078e..49d7c901f06 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/RequestContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/RequestContextInstrumentation.java
@@ -24,48 +24,48 @@
 /** Propagates taint when fetching the {@link HttpRequest} from the {@link RequestContext}. */
 @AutoService(InstrumenterModule.class)
 public class RequestContextInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public RequestContextInstrumentation() {
-    super("akka-http");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public RequestContextInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.http.scaladsl.server.RequestContextImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.http.scaladsl.server.RequestContextImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("request"))
-            .and(returns(named("akka.http.scaladsl.model.HttpRequest")))
-            .and(takesArguments(0)),
-        RequestContextInstrumentation.class.getName() + "$GetRequestAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("request"))
+                        .and(returns(named("akka.http.scaladsl.model.HttpRequest")))
+                        .and(takesArguments(0)),
+                RequestContextInstrumentation.class.getName() + "$GetRequestAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  static class GetRequestAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    static void onExit(
-        @Advice.This RequestContext requestContext,
-        @Advice.Return HttpRequest request,
-        @ActiveRequestContext datadog.trace.api.gateway.RequestContext reqCtx) {
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    static class GetRequestAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        static void onExit(
+                @Advice.This RequestContext requestContext,
+                @Advice.Return HttpRequest request,
+                @ActiveRequestContext datadog.trace.api.gateway.RequestContext reqCtx) {
 
-      PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation == null) {
-        return;
-      }
+            PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation == null) {
+                return;
+            }
 
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
 
-      if (propagation.isTainted(ctx, request)) {
-        return;
-      }
+            if (propagation.isTainted(ctx, request)) {
+                return;
+            }
 
-      propagation.taintObjectIfTainted(ctx, request, requestContext);
+            propagation.taintObjectIfTainted(ctx, request, requestContext);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/TraitMethodMatchers.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/TraitMethodMatchers.java
index fb58538102e..564f556b236 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/TraitMethodMatchers.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/TraitMethodMatchers.java
@@ -8,9 +8,9 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class TraitMethodMatchers {
-  public static ElementMatcher.Junction<MethodDescription> isTraitDirectiveMethod(
-      String traitName, String name, Object... argumentTypes) {
-    return isTraitMethod(traitName, name, (Object[]) argumentTypes)
-        .and(returns(named("akka.http.scaladsl.server.Directive")));
-  }
+    public static ElementMatcher.Junction<MethodDescription> isTraitDirectiveMethod(
+            String traitName, String name, Object... argumentTypes) {
+        return isTraitMethod(traitName, name, (Object[]) argumentTypes)
+                .and(returns(named("akka.http.scaladsl.server.Directive")));
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UnmarshallerInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UnmarshallerInstrumentation.java
index 4ef8ecd7efa..5ff8f91d202 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UnmarshallerInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UnmarshallerInstrumentation.java
@@ -34,48 +34,48 @@
  */
 @AutoService(InstrumenterModule.class)
 public class UnmarshallerInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public UnmarshallerInstrumentation() {
-    super("akka-http");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public UnmarshallerInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "akka.http.scaladsl.unmarshalling.Unmarshaller";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "akka.http.scaladsl.unmarshalling.Unmarshaller";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return nameStartsWith("akka.http.scaladsl.unmarshalling.")
-        .and(implementsInterface(named(hierarchyMarkerType())));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return nameStartsWith("akka.http.scaladsl.unmarshalling.")
+                .and(implementsInterface(named(hierarchyMarkerType())));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("apply"))
-            .and(returns(named("scala.concurrent.Future")))
-            .and(takesArguments(3))
-            .and(takesArgument(0, Object.class))
-            .and(takesArgument(1, named("scala.concurrent.ExecutionContext")))
-            .and(takesArgument(2, named("akka.stream.Materializer"))),
-        UnmarshallerInstrumentation.class.getName() + "$PropagateTaintOnApplyAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("apply"))
+                        .and(returns(named("scala.concurrent.Future")))
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, Object.class))
+                        .and(takesArgument(1, named("scala.concurrent.ExecutionContext")))
+                        .and(takesArgument(2, named("akka.stream.Materializer"))),
+                UnmarshallerInstrumentation.class.getName() + "$PropagateTaintOnApplyAdvice");
+    }
 
-  static class PropagateTaintOnApplyAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    static void after(
-        @Advice.Return(readOnly = false) Future<?> result,
-        @Advice.Argument(0) Object input,
-        @Advice.Argument(1) ExecutionContext ec) {
-      PropagationModule mod = InstrumentationBridge.PROPAGATION;
-      if (mod == null) {
-        return;
-      }
-      result = TaintFutureHelper.wrapFuture(result, input, mod, ec);
+    static class PropagateTaintOnApplyAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        static void after(
+                @Advice.Return(readOnly = false) Future<?> result,
+                @Advice.Argument(0) Object input,
+                @Advice.Argument(1) ExecutionContext ec) {
+            PropagationModule mod = InstrumentationBridge.PROPAGATION;
+            if (mod == null) {
+                return;
+            }
+            result = TaintFutureHelper.wrapFuture(result, input, mod, ec);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UriInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UriInstrumentation.java
index 1c178dfbd5d..b586bb49d68 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UriInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UriInstrumentation.java
@@ -29,89 +29,89 @@
 /** Propagates taint from a {@link Uri} to query strings fetched from it. */
 @AutoService(InstrumenterModule.class)
 public class UriInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public UriInstrumentation() {
-    super("akka-http");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public UriInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.http.scaladsl.model.Uri";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.http.scaladsl.model.Uri";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("queryString"))
-            .and(returns(named("scala.Option")))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("java.nio.charset.Charset"))),
-        UriInstrumentation.class.getName() + "$TaintQueryStringAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("rawQueryString"))
-            .and(returns(named("scala.Option")))
-            .and(takesArguments(0)),
-        UriInstrumentation.class.getName() + "$TaintQueryStringAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("query"))
-            .and(returns(named("akka.http.scaladsl.model.Uri$Query")))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("java.nio.charset.Charset")))
-            .and(takesArgument(1, named("akka.http.scaladsl.model.Uri$ParsingMode"))),
-        UriInstrumentation.class.getName() + "$TaintQueryAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("queryString"))
+                        .and(returns(named("scala.Option")))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("java.nio.charset.Charset"))),
+                UriInstrumentation.class.getName() + "$TaintQueryStringAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("rawQueryString"))
+                        .and(returns(named("scala.Option")))
+                        .and(takesArguments(0)),
+                UriInstrumentation.class.getName() + "$TaintQueryStringAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("query"))
+                        .and(returns(named("akka.http.scaladsl.model.Uri$Query")))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("java.nio.charset.Charset")))
+                        .and(takesArgument(1, named("akka.http.scaladsl.model.Uri$ParsingMode"))),
+                UriInstrumentation.class.getName() + "$TaintQueryAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  static class TaintQueryStringAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    static void after(
-        @Advice.This Uri uri,
-        @Advice.Return scala.Option<String> ret,
-        @ActiveRequestContext RequestContext reqCtx) {
-      PropagationModule mod = InstrumentationBridge.PROPAGATION;
-      if (mod == null || ret.isEmpty()) {
-        return;
-      }
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      mod.taintStringIfTainted(ctx, ret.get(), uri);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    static class TaintQueryStringAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        static void after(
+                @Advice.This Uri uri,
+                @Advice.Return scala.Option<String> ret,
+                @ActiveRequestContext RequestContext reqCtx) {
+            PropagationModule mod = InstrumentationBridge.PROPAGATION;
+            if (mod == null || ret.isEmpty()) {
+                return;
+            }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            mod.taintStringIfTainted(ctx, ret.get(), uri);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class TaintQueryAdvice {
-    // bind uri to a variable of type Object so that this advice can also
-    // be used from FromDataInstrumentaton
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(
-        @Advice.This /*Uri*/ Object uri,
-        @Advice.Return Uri.Query ret,
-        @ActiveRequestContext RequestContext reqCtx) {
-      PropagationModule prop = InstrumentationBridge.PROPAGATION;
-      if (prop == null || ret.isEmpty()) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class TaintQueryAdvice {
+        // bind uri to a variable of type Object so that this advice can also
+        // be used from FromDataInstrumentaton
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(
+                @Advice.This /*Uri*/ Object uri,
+                @Advice.Return Uri.Query ret,
+                @ActiveRequestContext RequestContext reqCtx) {
+            PropagationModule prop = InstrumentationBridge.PROPAGATION;
+            if (prop == null || ret.isEmpty()) {
+                return;
+            }
 
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
 
-      if (!prop.isTainted(ctx, uri)) {
-        return;
-      }
+            if (!prop.isTainted(ctx, uri)) {
+                return;
+            }
 
-      Iterator<Tuple2<String, String>> iterator = ret.iterator();
-      while (iterator.hasNext()) {
-        Tuple2<String, String> pair = iterator.next();
-        final String name = pair._1(), value = pair._2();
-        prop.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
-        prop.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
-      }
+            Iterator<Tuple2<String, String>> iterator = ret.iterator();
+            while (iterator.hasNext()) {
+                Tuple2<String, String> pair = iterator.next();
+                final String name = pair._1(), value = pair._2();
+                prop.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+                prop.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/ScalaToJava.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/ScalaToJava.java
index 0e4c9873b81..18f6ad372fa 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/ScalaToJava.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/ScalaToJava.java
@@ -7,22 +7,22 @@
 
 // do not use JavaConverters, as they changed in an ABI-incompatible way in Scala 2.13
 public class ScalaToJava {
-  public static java.util.List<String> keySetAsCollection(Map<String, ?> m) {
-    scala.collection.immutable.Set<String> keys = m.keySet();
-    java.util.List<String> keysAsCollection = new ArrayList<>(keys.size());
-    Iterator<String> keysIterator = keys.iterator();
-    while (keysIterator.hasNext()) {
-      keysAsCollection.add(keysIterator.next());
+    public static java.util.List<String> keySetAsCollection(Map<String, ?> m) {
+        scala.collection.immutable.Set<String> keys = m.keySet();
+        java.util.List<String> keysAsCollection = new ArrayList<>(keys.size());
+        Iterator<String> keysIterator = keys.iterator();
+        while (keysIterator.hasNext()) {
+            keysAsCollection.add(keysIterator.next());
+        }
+        return keysAsCollection;
     }
-    return keysAsCollection;
-  }
 
-  public static <T> java.util.List<T> listAsList(List<T> l) {
-    java.util.List<T> asJavaList = new ArrayList<>(l.size());
-    Iterator<T> iterator = l.iterator();
-    while (iterator.hasNext()) {
-      asJavaList.add(iterator.next());
+    public static <T> java.util.List<T> listAsList(List<T> l) {
+        java.util.List<T> asJavaList = new ArrayList<>(l.size());
+        Iterator<T> iterator = l.iterator();
+        while (iterator.hasNext()) {
+            asJavaList.add(iterator.next());
+        }
+        return asJavaList;
     }
-    return asJavaList;
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintCookieFunction.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintCookieFunction.java
index 5cbc18d95e1..cc9788d6ed1 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintCookieFunction.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintCookieFunction.java
@@ -9,26 +9,25 @@
 import scala.Tuple1;
 import scala.compat.java8.JFunction1;
 
-public class TaintCookieFunction
-    implements JFunction1<Tuple1<HttpCookiePair>, Tuple1<HttpCookiePair>> {
-  public static final TaintCookieFunction INSTANCE = new TaintCookieFunction();
+public class TaintCookieFunction implements JFunction1<Tuple1<HttpCookiePair>, Tuple1<HttpCookiePair>> {
+    public static final TaintCookieFunction INSTANCE = new TaintCookieFunction();
 
-  @Override
-  public Tuple1<HttpCookiePair> apply(Tuple1<HttpCookiePair> v1) {
-    HttpCookiePair httpCookiePair = v1._1();
+    @Override
+    public Tuple1<HttpCookiePair> apply(Tuple1<HttpCookiePair> v1) {
+        HttpCookiePair httpCookiePair = v1._1();
 
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null || httpCookiePair == null) {
-      return v1;
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
+        if (mod == null || httpCookiePair == null) {
+            return v1;
+        }
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        final String name = httpCookiePair.name();
+        final String value = httpCookiePair.value();
+        mod.taintString(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
+        mod.taintString(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
+        return v1;
     }
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    final String name = httpCookiePair.name();
-    final String value = httpCookiePair.value();
-    mod.taintString(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
-    mod.taintString(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
-    return v1;
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintFutureHelper.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintFutureHelper.java
index b7153bef168..007d9f3e1ca 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintFutureHelper.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintFutureHelper.java
@@ -8,16 +8,14 @@
 import scala.concurrent.Future;
 
 public class TaintFutureHelper {
-  public static <T> Future<T> wrapFuture(
-      Future<T> f, Object input, PropagationModule mod, ExecutionContext ec) {
-    JFunction1<T, T> mapf =
-        t -> {
-          IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-          if (ctx != null) {
-            mod.taintObjectIfTainted(ctx, t, input);
-          }
-          return t;
+    public static <T> Future<T> wrapFuture(Future<T> f, Object input, PropagationModule mod, ExecutionContext ec) {
+        JFunction1<T, T> mapf = t -> {
+            IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+            if (ctx != null) {
+                mod.taintObjectIfTainted(ctx, t, input);
+            }
+            return t;
         };
-    return f.map(mapf, ec);
-  }
+        return f.map(mapf, ec);
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintMapFunction.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintMapFunction.java
index d8485bfa4b9..00cafa6f779 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintMapFunction.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintMapFunction.java
@@ -11,31 +11,30 @@
 import scala.collection.immutable.Map;
 import scala.compat.java8.JFunction1;
 
-public class TaintMapFunction
-    implements JFunction1<Tuple1<Map<String, String>>, Tuple1<Map<String, String>>> {
-  public static final TaintMapFunction INSTANCE = new TaintMapFunction();
+public class TaintMapFunction implements JFunction1<Tuple1<Map<String, String>>, Tuple1<Map<String, String>>> {
+    public static final TaintMapFunction INSTANCE = new TaintMapFunction();
 
-  @Override
-  public Tuple1<Map<String, String>> apply(Tuple1<Map<String, String>> v1) {
-    Map<String, String> m = v1._1;
+    @Override
+    public Tuple1<Map<String, String>> apply(Tuple1<Map<String, String>> v1) {
+        Map<String, String> m = v1._1;
 
-    PropagationModule prop = InstrumentationBridge.PROPAGATION;
-    if (prop == null || m == null || m.isEmpty()) {
-      return v1;
-    }
+        PropagationModule prop = InstrumentationBridge.PROPAGATION;
+        if (prop == null || m == null || m.isEmpty()) {
+            return v1;
+        }
 
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    Iterator<Tuple2<String, String>> iterator = m.iterator();
-    while (iterator.hasNext()) {
-      Tuple2<String, String> e = iterator.next();
-      final String name = e._1(), value = e._2();
-      prop.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
-      prop.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
-    }
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        Iterator<Tuple2<String, String>> iterator = m.iterator();
+        while (iterator.hasNext()) {
+            Tuple2<String, String> e = iterator.next();
+            final String name = e._1(), value = e._2();
+            prop.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+            prop.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+        }
 
-    return v1;
-  }
+        return v1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintMultiMapFunction.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintMultiMapFunction.java
index e98b45866b7..6dd9e2195bd 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintMultiMapFunction.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintMultiMapFunction.java
@@ -13,33 +13,33 @@
 import scala.compat.java8.JFunction1;
 
 public class TaintMultiMapFunction
-    implements JFunction1<Tuple1<Map<String, List<String>>>, Tuple1<Map<String, List<String>>>> {
-  public static final TaintMultiMapFunction INSTANCE = new TaintMultiMapFunction();
+        implements JFunction1<Tuple1<Map<String, List<String>>>, Tuple1<Map<String, List<String>>>> {
+    public static final TaintMultiMapFunction INSTANCE = new TaintMultiMapFunction();
 
-  @Override
-  public Tuple1<Map<String, List<String>>> apply(Tuple1<Map<String, List<String>>> v1) {
-    Map<String, List<String>> m = v1._1;
+    @Override
+    public Tuple1<Map<String, List<String>>> apply(Tuple1<Map<String, List<String>>> v1) {
+        Map<String, List<String>> m = v1._1;
 
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null || m == null || m.isEmpty()) {
-      return v1;
-    }
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
+        if (mod == null || m == null || m.isEmpty()) {
+            return v1;
+        }
 
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    Iterator<Tuple2<String, List<String>>> entriesIterator = m.iterator();
-    while (entriesIterator.hasNext()) {
-      Tuple2<String, List<String>> e = entriesIterator.next();
-      final String name = e._1();
-      mod.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
-      List<String> values = e._2();
-      for (final String value : ScalaToJava.listAsList(values)) {
-        mod.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
-      }
-    }
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        Iterator<Tuple2<String, List<String>>> entriesIterator = m.iterator();
+        while (entriesIterator.hasNext()) {
+            Tuple2<String, List<String>> e = entriesIterator.next();
+            final String name = e._1();
+            mod.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+            List<String> values = e._2();
+            for (final String value : ScalaToJava.listAsList(values)) {
+                mod.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+            }
+        }
 
-    return v1;
-  }
+        return v1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintOptionalCookieFunction.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintOptionalCookieFunction.java
index 1aeb51bec1b..0849a1bce9e 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintOptionalCookieFunction.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintOptionalCookieFunction.java
@@ -11,26 +11,26 @@
 import scala.compat.java8.JFunction1;
 
 public class TaintOptionalCookieFunction
-    implements JFunction1<Tuple1<Option<HttpCookiePair>>, Tuple1<Option<HttpCookiePair>>> {
-  public static final TaintOptionalCookieFunction INSTANCE = new TaintOptionalCookieFunction();
+        implements JFunction1<Tuple1<Option<HttpCookiePair>>, Tuple1<Option<HttpCookiePair>>> {
+    public static final TaintOptionalCookieFunction INSTANCE = new TaintOptionalCookieFunction();
 
-  @Override
-  public Tuple1<Option<HttpCookiePair>> apply(Tuple1<Option<HttpCookiePair>> v1) {
-    Option<HttpCookiePair> httpCookiePair = v1._1();
+    @Override
+    public Tuple1<Option<HttpCookiePair>> apply(Tuple1<Option<HttpCookiePair>> v1) {
+        Option<HttpCookiePair> httpCookiePair = v1._1();
 
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null || httpCookiePair == null || httpCookiePair.isEmpty()) {
-      return v1;
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
+        if (mod == null || httpCookiePair == null || httpCookiePair.isEmpty()) {
+            return v1;
+        }
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        final HttpCookiePair cookie = httpCookiePair.get();
+        final String name = cookie.name();
+        final String value = cookie.value();
+        mod.taintString(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
+        mod.taintString(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
+        return v1;
     }
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    final HttpCookiePair cookie = httpCookiePair.get();
-    final String name = cookie.name();
-    final String value = cookie.value();
-    mod.taintString(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
-    mod.taintString(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
-    return v1;
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintRequestContextFunction.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintRequestContextFunction.java
index 4839211d196..e4827a5460c 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintRequestContextFunction.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintRequestContextFunction.java
@@ -9,24 +9,23 @@
 import scala.Tuple1;
 import scala.compat.java8.JFunction1;
 
-public class TaintRequestContextFunction
-    implements JFunction1<Tuple1<RequestContext>, Tuple1<RequestContext>> {
-  public static final TaintRequestContextFunction INSTANCE = new TaintRequestContextFunction();
+public class TaintRequestContextFunction implements JFunction1<Tuple1<RequestContext>, Tuple1<RequestContext>> {
+    public static final TaintRequestContextFunction INSTANCE = new TaintRequestContextFunction();
 
-  @Override
-  public Tuple1<RequestContext> apply(Tuple1<RequestContext> v1) {
-    RequestContext reqCtx = v1._1();
+    @Override
+    public Tuple1<RequestContext> apply(Tuple1<RequestContext> v1) {
+        RequestContext reqCtx = v1._1();
 
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null || reqCtx == null) {
-      return v1;
-    }
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    mod.taintObject(ctx, reqCtx, SourceTypes.REQUEST_BODY);
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
+        if (mod == null || reqCtx == null) {
+            return v1;
+        }
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        mod.taintObject(ctx, reqCtx, SourceTypes.REQUEST_BODY);
 
-    return v1;
-  }
+        return v1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintRequestFunction.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintRequestFunction.java
index cd80b65b56f..a981a38af64 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintRequestFunction.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintRequestFunction.java
@@ -10,22 +10,22 @@
 import scala.compat.java8.JFunction1;
 
 public class TaintRequestFunction implements JFunction1<Tuple1<HttpRequest>, Tuple1<HttpRequest>> {
-  public static final TaintRequestFunction INSTANCE = new TaintRequestFunction();
+    public static final TaintRequestFunction INSTANCE = new TaintRequestFunction();
 
-  @Override
-  public Tuple1<HttpRequest> apply(Tuple1<HttpRequest> v1) {
-    HttpRequest httpRequest = v1._1();
+    @Override
+    public Tuple1<HttpRequest> apply(Tuple1<HttpRequest> v1) {
+        HttpRequest httpRequest = v1._1();
 
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null || httpRequest == null) {
-      return v1;
-    }
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    mod.taintObject(ctx, httpRequest, SourceTypes.REQUEST_BODY);
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
+        if (mod == null || httpRequest == null) {
+            return v1;
+        }
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        mod.taintObject(ctx, httpRequest, SourceTypes.REQUEST_BODY);
 
-    return v1;
-  }
+        return v1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintSeqFunction.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintSeqFunction.java
index 1269d8ef448..b98c4f5b080 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintSeqFunction.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintSeqFunction.java
@@ -15,35 +15,34 @@
 import scala.compat.java8.JFunction1;
 
 public class TaintSeqFunction
-    implements JFunction1<
-        Tuple1<Seq<Tuple2<String, String>>>, Tuple1<Seq<Tuple2<String, String>>>> {
-  public static final TaintSeqFunction INSTANCE = new TaintSeqFunction();
+        implements JFunction1<Tuple1<Seq<Tuple2<String, String>>>, Tuple1<Seq<Tuple2<String, String>>>> {
+    public static final TaintSeqFunction INSTANCE = new TaintSeqFunction();
 
-  @Override
-  public Tuple1<Seq<Tuple2<String, String>>> apply(Tuple1<Seq<Tuple2<String, String>>> v1) {
-    Seq<Tuple2<String, String>> seq = v1._1;
+    @Override
+    public Tuple1<Seq<Tuple2<String, String>>> apply(Tuple1<Seq<Tuple2<String, String>>> v1) {
+        Seq<Tuple2<String, String>> seq = v1._1;
 
-    PropagationModule prop = InstrumentationBridge.PROPAGATION;
-    if (prop == null || seq == null || seq.isEmpty()) {
-      return v1;
-    }
+        PropagationModule prop = InstrumentationBridge.PROPAGATION;
+        if (prop == null || seq == null || seq.isEmpty()) {
+            return v1;
+        }
 
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    Iterator<Tuple2<String, String>> iterator = seq.iterator();
-    Set<String> seenKeys = Collections.newSetFromMap(new IdentityHashMap<>());
-    while (iterator.hasNext()) {
-      Tuple2<String, String> t = iterator.next();
-      String name = t._1();
-      String value = t._2();
-      if (seenKeys.add(name)) {
-        prop.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
-      }
-      prop.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
-    }
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        Iterator<Tuple2<String, String>> iterator = seq.iterator();
+        Set<String> seenKeys = Collections.newSetFromMap(new IdentityHashMap<>());
+        while (iterator.hasNext()) {
+            Tuple2<String, String> t = iterator.next();
+            String name = t._1();
+            String value = t._2();
+            if (seenKeys.add(name)) {
+                prop.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+            }
+            prop.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+        }
 
-    return v1;
-  }
+        return v1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintSingleParameterFunction.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintSingleParameterFunction.java
index 47928b02f1b..a1d524f0295 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintSingleParameterFunction.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintSingleParameterFunction.java
@@ -13,50 +13,49 @@
 import scala.collection.Iterator;
 import scala.compat.java8.JFunction1;
 
-public class TaintSingleParameterFunction<Magnet>
-    implements JFunction1<Tuple1<Object>, Tuple1<Object>> {
-  private final String paramName;
+public class TaintSingleParameterFunction<Magnet> implements JFunction1<Tuple1<Object>, Tuple1<Object>> {
+    private final String paramName;
 
-  public TaintSingleParameterFunction(Magnet pmag) throws Exception {
-    Field value$1 = pmag.getClass().getDeclaredField("value$1");
-    value$1.setAccessible(true);
-    Object nameReceptacle = value$1.get(pmag);
-    Method nameMeth = nameReceptacle.getClass().getMethod("name");
-    paramName = (String) nameMeth.invoke(nameReceptacle);
-  }
-
-  @Override
-  public Tuple1<Object> apply(Tuple1<Object> v1) {
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null || v1 == null) {
-      return v1;
+    public TaintSingleParameterFunction(Magnet pmag) throws Exception {
+        Field value$1 = pmag.getClass().getDeclaredField("value$1");
+        value$1.setAccessible(true);
+        Object nameReceptacle = value$1.get(pmag);
+        Method nameMeth = nameReceptacle.getClass().getMethod("name");
+        paramName = (String) nameMeth.invoke(nameReceptacle);
     }
 
-    Object value = v1._1();
-    if (value instanceof Option) {
-      Option<?> option = (Option<?>) value;
-      if (option.isEmpty()) {
-        return v1;
-      }
-      value = option.get();
-    }
+    @Override
+    public Tuple1<Object> apply(Tuple1<Object> v1) {
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
+        if (mod == null || v1 == null) {
+            return v1;
+        }
 
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    if (value instanceof Iterable) {
-      Iterator<?> iterator = ((Iterable<?>) value).iterator();
-      while (iterator.hasNext()) {
-        Object o = iterator.next();
-        if (o instanceof String) {
-          mod.taintString(ctx, (String) o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
+        Object value = v1._1();
+        if (value instanceof Option) {
+            Option<?> option = (Option<?>) value;
+            if (option.isEmpty()) {
+                return v1;
+            }
+            value = option.get();
         }
-      }
-    } else if (value instanceof String) {
-      mod.taintString(ctx, (String) value, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
-    }
 
-    return v1;
-  }
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        if (value instanceof Iterable) {
+            Iterator<?> iterator = ((Iterable<?>) value).iterator();
+            while (iterator.hasNext()) {
+                Object o = iterator.next();
+                if (o instanceof String) {
+                    mod.taintString(ctx, (String) o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
+                }
+            }
+        } else if (value instanceof String) {
+            mod.taintString(ctx, (String) value, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
+        }
+
+        return v1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintUnmarshaller.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintUnmarshaller.java
index e993056d629..a9c03c9f15f 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintUnmarshaller.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintUnmarshaller.java
@@ -20,53 +20,53 @@
  * @see UnmarshallerInstrumentation
  */
 public class TaintUnmarshaller<A, B> implements Unmarshaller<A, B> {
-  private final PropagationModule propagationModule;
-  private final Unmarshaller<A, B> delegate;
+    private final PropagationModule propagationModule;
+    private final Unmarshaller<A, B> delegate;
 
-  public TaintUnmarshaller(PropagationModule propagationModule, Unmarshaller<A, B> delegate) {
-    this.propagationModule = propagationModule;
-    this.delegate = delegate;
-  }
+    public TaintUnmarshaller(PropagationModule propagationModule, Unmarshaller<A, B> delegate) {
+        this.propagationModule = propagationModule;
+        this.delegate = delegate;
+    }
 
-  @Override
-  public Future<B> apply(A value, ExecutionContext ec, Materializer materializer) {
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx != null) {
-      propagationModule.taintObject(ctx, value, SourceTypes.REQUEST_BODY);
+    @Override
+    public Future<B> apply(A value, ExecutionContext ec, Materializer materializer) {
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx != null) {
+            propagationModule.taintObject(ctx, value, SourceTypes.REQUEST_BODY);
+        }
+        return delegate.apply(value, ec, materializer);
     }
-    return delegate.apply(value, ec, materializer);
-  }
 
-  @Override
-  public <C> Unmarshaller<A, C> transform(
-      Function1<ExecutionContext, Function1<Materializer, Function1<Future<B>, Future<C>>>> f) {
-    return delegate.transform(f);
-  }
+    @Override
+    public <C> Unmarshaller<A, C> transform(
+            Function1<ExecutionContext, Function1<Materializer, Function1<Future<B>, Future<C>>>> f) {
+        return delegate.transform(f);
+    }
 
-  @Override
-  public <C> Unmarshaller<A, C> map(Function1<B, C> f) {
-    return delegate.map(f);
-  }
+    @Override
+    public <C> Unmarshaller<A, C> map(Function1<B, C> f) {
+        return delegate.map(f);
+    }
 
-  @Override
-  public <C> Unmarshaller<A, C> flatMap(
-      Function1<ExecutionContext, Function1<Materializer, Function1<B, Future<C>>>> f) {
-    return delegate.flatMap(f);
-  }
+    @Override
+    public <C> Unmarshaller<A, C> flatMap(
+            Function1<ExecutionContext, Function1<Materializer, Function1<B, Future<C>>>> f) {
+        return delegate.flatMap(f);
+    }
 
-  @Override
-  public <C> Unmarshaller<A, C> recover(
-      Function1<ExecutionContext, Function1<Materializer, PartialFunction<Throwable, C>>> pf) {
-    return delegate.recover(pf);
-  }
+    @Override
+    public <C> Unmarshaller<A, C> recover(
+            Function1<ExecutionContext, Function1<Materializer, PartialFunction<Throwable, C>>> pf) {
+        return delegate.recover(pf);
+    }
 
-  @Override
-  public <BB> Unmarshaller<A, BB> withDefaultValue(BB defaultValue) {
-    return delegate.withDefaultValue(defaultValue);
-  }
+    @Override
+    public <BB> Unmarshaller<A, BB> withDefaultValue(BB defaultValue) {
+        return delegate.withDefaultValue(defaultValue);
+    }
 
-  @Override
-  public Unmarshaller<A, B> asScala() {
-    return this;
-  }
+    @Override
+    public Unmarshaller<A, B> asScala() {
+        return this;
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintUriFunction.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintUriFunction.java
index bad8548853e..b60a03b8f36 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintUriFunction.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/helpers/TaintUriFunction.java
@@ -10,22 +10,22 @@
 import scala.compat.java8.JFunction1;
 
 public class TaintUriFunction implements JFunction1<Tuple1<Uri>, Tuple1<Uri>> {
-  public static final TaintUriFunction INSTANCE = new TaintUriFunction();
+    public static final TaintUriFunction INSTANCE = new TaintUriFunction();
 
-  @Override
-  public Tuple1<Uri> apply(Tuple1<Uri> v1) {
-    Uri uri = v1._1();
+    @Override
+    public Tuple1<Uri> apply(Tuple1<Uri> v1) {
+        Uri uri = v1._1();
 
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null) {
-      return v1;
-    }
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    mod.taintObject(ctx, uri, SourceTypes.REQUEST_QUERY);
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
+        if (mod == null) {
+            return v1;
+        }
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        mod.taintObject(ctx, uri, SourceTypes.REQUEST_QUERY);
 
-    return v1;
-  }
+        return v1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/FormFieldDirectivesImplInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/FormFieldDirectivesImplInstrumentation.java
index 6aee02050bc..a1ee4c9f077 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/FormFieldDirectivesImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/FormFieldDirectivesImplInstrumentation.java
@@ -5,8 +5,8 @@
 
 @AutoService(InstrumenterModule.class)
 public class FormFieldDirectivesImplInstrumentation extends ParameterDirectivesImplInstrumentation {
-  @Override
-  public String instrumentedType() {
-    return "akka.http.scaladsl.server.directives.FormFieldDirectives$Impl$";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.http.scaladsl.server.directives.FormFieldDirectives$Impl$";
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/ParameterDirectivesImplInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/ParameterDirectivesImplInstrumentation.java
index ae28313541d..892fe3927d0 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/ParameterDirectivesImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/ParameterDirectivesImplInstrumentation.java
@@ -26,81 +26,77 @@
 
 @AutoService(InstrumenterModule.class)
 public class ParameterDirectivesImplInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ParameterDirectivesImplInstrumentation() {
-    super("akka-http");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ParameterDirectivesImplInstrumentation() {
+        super("akka-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.http.scaladsl.server.directives.ParameterDirectives$Impl$";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.http.scaladsl.server.directives.ParameterDirectives$Impl$";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    // just so we can use assertInverse in the muzzle directive
-    return new Reference[] {new Reference.Builder(instrumentedType()).build()};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        // just so we can use assertInverse in the muzzle directive
+        return new Reference[] {new Reference.Builder(instrumentedType()).build()};
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("filter"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, String.class))
-            .and(takesArgument(1, named("akka.http.scaladsl.unmarshalling.Unmarshaller")))
-            .and(returns(named("akka.http.scaladsl.server.Directive"))),
-        ParameterDirectivesImplInstrumentation.class.getName() + "$FilterAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("filter"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, String.class))
+                        .and(takesArgument(1, named("akka.http.scaladsl.unmarshalling.Unmarshaller")))
+                        .and(returns(named("akka.http.scaladsl.server.Directive"))),
+                ParameterDirectivesImplInstrumentation.class.getName() + "$FilterAdvice");
 
-    // requiredFilter not relevant
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("repeatedFilter"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, String.class))
-            .and(takesArgument(1, named("akka.http.scaladsl.unmarshalling.Unmarshaller")))
-            .and(returns(named("akka.http.scaladsl.server.Directive"))),
-        ParameterDirectivesImplInstrumentation.class.getName() + "$RepeatedFilterAdvice");
-  }
+        // requiredFilter not relevant
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("repeatedFilter"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, String.class))
+                        .and(takesArgument(1, named("akka.http.scaladsl.unmarshalling.Unmarshaller")))
+                        .and(returns(named("akka.http.scaladsl.server.Directive"))),
+                ParameterDirectivesImplInstrumentation.class.getName() + "$RepeatedFilterAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  static class FilterAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(
-        @Advice.Argument(0) String paramName,
-        @Advice.Return(readOnly = false) Directive /*<Tuple1<?>>*/ retval,
-        @ActiveRequestContext RequestContext reqCtx) {
-      try {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        retval =
-            retval.tmap(
-                new TaintParametersFunction(ctx, paramName), Tupler$.MODULE$.forTuple(null));
-      } catch (Exception e) {
-        throw new RuntimeException(e); // propagate so it's logged
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    static class FilterAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(
+                @Advice.Argument(0) String paramName,
+                @Advice.Return(readOnly = false) Directive /*<Tuple1<?>>*/ retval,
+                @ActiveRequestContext RequestContext reqCtx) {
+            try {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                retval = retval.tmap(new TaintParametersFunction(ctx, paramName), Tupler$.MODULE$.forTuple(null));
+            } catch (Exception e) {
+                throw new RuntimeException(e); // propagate so it's logged
+            }
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  static class RepeatedFilterAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(
-        @Advice.Argument(0) String paramName,
-        @Advice.Return(readOnly = false) Directive /*<Tuple1<Iterable<?>>>*/ retval,
-        @ActiveRequestContext RequestContext reqCtx) {
-      try {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        retval =
-            retval.tmap(
-                new TaintParametersFunction(ctx, paramName), Tupler$.MODULE$.forTuple(null));
-      } catch (Exception e) {
-        throw new RuntimeException(e); // propagate so it's logged
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    static class RepeatedFilterAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(
+                @Advice.Argument(0) String paramName,
+                @Advice.Return(readOnly = false) Directive /*<Tuple1<Iterable<?>>>*/ retval,
+                @ActiveRequestContext RequestContext reqCtx) {
+            try {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                retval = retval.tmap(new TaintParametersFunction(ctx, paramName), Tupler$.MODULE$.forTuple(null));
+            } catch (Exception e) {
+                throw new RuntimeException(e); // propagate so it's logged
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/helpers/TaintParametersFunction.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/helpers/TaintParametersFunction.java
index a5d800fc236..da2dfda1ba8 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/helpers/TaintParametersFunction.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/helpers/TaintParametersFunction.java
@@ -12,42 +12,42 @@
 
 public class TaintParametersFunction<T> implements Function1<Tuple1<T>, Tuple1<T>> {
 
-  private final IastContext ctx;
-  private final String paramName;
-
-  public TaintParametersFunction(IastContext ctx, String paramName) {
-    this.ctx = ctx;
-    this.paramName = paramName;
-  }
-
-  @Override
-  public Tuple1<T> apply(Tuple1<T> v1) {
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null) {
-      return v1;
-    }
+    private final IastContext ctx;
+    private final String paramName;
 
-    Object value = v1._1();
-    if (value instanceof Option) {
-      Option<?> option = (Option<?>) value;
-      if (option.isEmpty()) {
-        return v1;
-      }
-      value = option.get();
+    public TaintParametersFunction(IastContext ctx, String paramName) {
+        this.ctx = ctx;
+        this.paramName = paramName;
     }
 
-    if (value instanceof Iterable) {
-      Iterator<?> iterator = ((Iterable<?>) value).iterator();
-      while (iterator.hasNext()) {
-        Object o = iterator.next();
-        if (o instanceof String) {
-          mod.taintString(ctx, (String) o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
+    @Override
+    public Tuple1<T> apply(Tuple1<T> v1) {
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
+        if (mod == null) {
+            return v1;
+        }
+
+        Object value = v1._1();
+        if (value instanceof Option) {
+            Option<?> option = (Option<?>) value;
+            if (option.isEmpty()) {
+                return v1;
+            }
+            value = option.get();
         }
-      }
-    } else if (value instanceof String) {
-      mod.taintString(ctx, (String) value, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
-    }
 
-    return v1;
-  }
+        if (value instanceof Iterable) {
+            Iterator<?> iterator = ((Iterable<?>) value).iterator();
+            while (iterator.hasNext()) {
+                Object o = iterator.next();
+                if (o instanceof String) {
+                    mod.taintString(ctx, (String) o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
+                }
+            }
+        } else if (value instanceof String) {
+            mod.taintString(ctx, (String) value, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
+        }
+
+        return v1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java/datadog/trace/instrumentation/akkahttp106/AkkaHttpSingleRequestInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java/datadog/trace/instrumentation/akkahttp106/AkkaHttpSingleRequestInstrumentation.java
index ee5b362437b..80d95e26460 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java/datadog/trace/instrumentation/akkahttp106/AkkaHttpSingleRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java/datadog/trace/instrumentation/akkahttp106/AkkaHttpSingleRequestInstrumentation.java
@@ -9,32 +9,32 @@
 
 @AutoService(InstrumenterModule.class)
 public final class AkkaHttpSingleRequestInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public AkkaHttpSingleRequestInstrumentation() {
-    super("akka-http", "akka-http-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public AkkaHttpSingleRequestInstrumentation() {
+        super("akka-http", "akka-http-client");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "akka.http.scaladsl.HttpExt";
-  }
+    @Override
+    public String instrumentedType() {
+        return "akka.http.scaladsl.HttpExt";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".AkkaHttpClientHelpers",
-      packageName + ".AkkaHttpClientHelpers$OnCompleteHandler",
-      packageName + ".AkkaHttpClientHelpers$AkkaHttpHeaders",
-      packageName + ".AkkaHttpClientHelpers$HasSpanHeader",
-      packageName + ".AkkaHttpClientDecorator",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".AkkaHttpClientHelpers",
+            packageName + ".AkkaHttpClientHelpers$OnCompleteHandler",
+            packageName + ".AkkaHttpClientHelpers$AkkaHttpHeaders",
+            packageName + ".AkkaHttpClientHelpers$HasSpanHeader",
+            packageName + ".AkkaHttpClientDecorator",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        named("singleRequest").and(takesArgument(0, named("akka.http.scaladsl.model.HttpRequest"))),
-        packageName + ".SingleRequestAdvice",
-        packageName + ".SingleRequestContextPropagationAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                named("singleRequest").and(takesArgument(0, named("akka.http.scaladsl.model.HttpRequest"))),
+                packageName + ".SingleRequestAdvice",
+                packageName + ".SingleRequestContextPropagationAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/AkkaHttpClientDecorator.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/AkkaHttpClientDecorator.java
index 35f5b54e734..50f25b3c127 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/AkkaHttpClientDecorator.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/AkkaHttpClientDecorator.java
@@ -10,43 +10,42 @@
 import java.net.URISyntaxException;
 
 public class AkkaHttpClientDecorator extends HttpClientDecorator<HttpRequest, HttpResponse> {
-  public static final CharSequence AKKA_HTTP_CLIENT = UTF8BytesString.create("akka-http-client");
-  public static final AkkaHttpClientDecorator DECORATE = new AkkaHttpClientDecorator();
-  public static final CharSequence AKKA_CLIENT_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"akka-http", "akka-http-client"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return AKKA_HTTP_CLIENT;
-  }
-
-  @Override
-  protected String method(final HttpRequest httpRequest) {
-    return httpRequest.method().value();
-  }
-
-  @Override
-  protected URI url(final HttpRequest httpRequest) throws URISyntaxException {
-    return URIUtils.safeParse(httpRequest.uri().toString());
-  }
-
-  @Override
-  protected int status(final HttpResponse httpResponse) {
-    return httpResponse.status().intValue();
-  }
-
-  @Override
-  protected String getRequestHeader(HttpRequest request, String headerName) {
-    return request.getHeader(headerName).map(HttpHeader::value).orElse(null);
-  }
-
-  @Override
-  protected String getResponseHeader(HttpResponse response, String headerName) {
-    return response.getHeader(headerName).map(HttpHeader::value).orElse(null);
-  }
+    public static final CharSequence AKKA_HTTP_CLIENT = UTF8BytesString.create("akka-http-client");
+    public static final AkkaHttpClientDecorator DECORATE = new AkkaHttpClientDecorator();
+    public static final CharSequence AKKA_CLIENT_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"akka-http", "akka-http-client"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return AKKA_HTTP_CLIENT;
+    }
+
+    @Override
+    protected String method(final HttpRequest httpRequest) {
+        return httpRequest.method().value();
+    }
+
+    @Override
+    protected URI url(final HttpRequest httpRequest) throws URISyntaxException {
+        return URIUtils.safeParse(httpRequest.uri().toString());
+    }
+
+    @Override
+    protected int status(final HttpResponse httpResponse) {
+        return httpResponse.status().intValue();
+    }
+
+    @Override
+    protected String getRequestHeader(HttpRequest request, String headerName) {
+        return request.getHeader(headerName).map(HttpHeader::value).orElse(null);
+    }
+
+    @Override
+    protected String getResponseHeader(HttpResponse response, String headerName) {
+        return response.getHeader(headerName).map(HttpHeader::value).orElse(null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/AkkaHttpClientHelpers.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/AkkaHttpClientHelpers.java
index bfcf27da0f5..eb7f323ae7f 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/AkkaHttpClientHelpers.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/AkkaHttpClientHelpers.java
@@ -10,74 +10,75 @@
 import scala.util.Try;
 
 public final class AkkaHttpClientHelpers {
-  public static class OnCompleteHandler extends AbstractFunction1<Try<HttpResponse>, Void> {
-    private final AgentSpan span;
+    public static class OnCompleteHandler extends AbstractFunction1<Try<HttpResponse>, Void> {
+        private final AgentSpan span;
 
-    public OnCompleteHandler(final AgentSpan span) {
-      this.span = span;
-    }
+        public OnCompleteHandler(final AgentSpan span) {
+            this.span = span;
+        }
 
-    @Override
-    public Void apply(final Try<HttpResponse> result) {
-      if (result.isSuccess()) {
-        AkkaHttpClientDecorator.DECORATE.onResponse(span, result.get());
-      } else {
-        AkkaHttpClientDecorator.DECORATE.onError(span, result.failed().get());
-      }
-      AkkaHttpClientDecorator.DECORATE.beforeFinish(span);
-      span.finish();
-      return null;
+        @Override
+        public Void apply(final Try<HttpResponse> result) {
+            if (result.isSuccess()) {
+                AkkaHttpClientDecorator.DECORATE.onResponse(span, result.get());
+            } else {
+                AkkaHttpClientDecorator.DECORATE.onError(span, result.failed().get());
+            }
+            AkkaHttpClientDecorator.DECORATE.beforeFinish(span);
+            span.finish();
+            return null;
+        }
     }
-  }
 
-  public static class AkkaHttpHeaders implements CarrierSetter<HttpRequest> {
-    private HttpRequest request;
-    // Did this request have a span when the AkkaHttpHeaders object was created?
-    private boolean hadSpan;
+    public static class AkkaHttpHeaders implements CarrierSetter<HttpRequest> {
+        private HttpRequest request;
+        // Did this request have a span when the AkkaHttpHeaders object was created?
+        private boolean hadSpan;
 
-    public AkkaHttpHeaders(final HttpRequest request) {
-      hadSpan = request != null && request.getHeader("x-datadog-request-has-span").isPresent();
-      if (hadSpan || request == null) {
-        this.request = request;
-      } else {
-        this.request = (HttpRequest) request.addHeader(new HasSpanHeader());
-      }
-    }
+        public AkkaHttpHeaders(final HttpRequest request) {
+            hadSpan = request != null
+                    && request.getHeader("x-datadog-request-has-span").isPresent();
+            if (hadSpan || request == null) {
+                this.request = request;
+            } else {
+                this.request = (HttpRequest) request.addHeader(new HasSpanHeader());
+            }
+        }
 
-    public boolean hadSpan() {
-      return hadSpan;
-    }
+        public boolean hadSpan() {
+            return hadSpan;
+        }
 
-    @Override
-    public void set(final HttpRequest carrier, final String key, final String value) {
-      request = (HttpRequest) request.addHeader(RawHeader.create(key, value));
-    }
+        @Override
+        public void set(final HttpRequest carrier, final String key, final String value) {
+            request = (HttpRequest) request.addHeader(RawHeader.create(key, value));
+        }
 
-    public HttpRequest getRequest() {
-      return request;
+        public HttpRequest getRequest() {
+            return request;
+        }
     }
-  }
 
-  // Custom header to mark that this request has a span associated with it
-  public static class HasSpanHeader extends CustomHeader {
-    @Override
-    public String name() {
-      return "x-datadog-request-has-span";
-    }
+    // Custom header to mark that this request has a span associated with it
+    public static class HasSpanHeader extends CustomHeader {
+        @Override
+        public String name() {
+            return "x-datadog-request-has-span";
+        }
 
-    @Override
-    public String value() {
-      return "true";
-    }
+        @Override
+        public String value() {
+            return "true";
+        }
 
-    @Override
-    public boolean renderInRequests() {
-      return false;
-    }
+        @Override
+        public boolean renderInRequests() {
+            return false;
+        }
 
-    @Override
-    public boolean renderInResponses() {
-      return false;
+        @Override
+        public boolean renderInResponses() {
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/SingleRequestAdvice.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/SingleRequestAdvice.java
index f35f13707a6..d75c21ba534 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/SingleRequestAdvice.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/SingleRequestAdvice.java
@@ -16,41 +16,41 @@
 import scala.concurrent.Future;
 
 public class SingleRequestAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope methodEnter(@Advice.Argument(value = 0) final HttpRequest request) {
-    final AkkaHttpClientHelpers.AkkaHttpHeaders headers =
-        new AkkaHttpClientHelpers.AkkaHttpHeaders(request);
-    if (headers.hadSpan()) {
-      return null;
-    }
-
-    final AgentSpan span = startSpan(AKKA_HTTP_CLIENT.toString(), AKKA_CLIENT_REQUEST);
-    DECORATE.afterStart(span);
-    DECORATE.onRequest(span, request);
-    return activateSpan(span);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope methodEnter(@Advice.Argument(value = 0) final HttpRequest request) {
+        final AkkaHttpClientHelpers.AkkaHttpHeaders headers = new AkkaHttpClientHelpers.AkkaHttpHeaders(request);
+        if (headers.hadSpan()) {
+            return null;
+        }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void methodExit(
-      @Advice.This final HttpExt thiz,
-      @Advice.Return final Future<HttpResponse> responseFuture,
-      @Advice.Enter final ContextScope scope,
-      @Advice.Thrown final Throwable throwable) {
-    if (scope == null) {
-      return;
+        final AgentSpan span = startSpan(AKKA_HTTP_CLIENT.toString(), AKKA_CLIENT_REQUEST);
+        DECORATE.afterStart(span);
+        DECORATE.onRequest(span, request);
+        return activateSpan(span);
     }
 
-    final AgentSpan span = spanFromScope(scope);
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void methodExit(
+            @Advice.This final HttpExt thiz,
+            @Advice.Return final Future<HttpResponse> responseFuture,
+            @Advice.Enter final ContextScope scope,
+            @Advice.Thrown final Throwable throwable) {
+        if (scope == null) {
+            return;
+        }
+
+        final AgentSpan span = spanFromScope(scope);
 
-    if (throwable == null) {
-      responseFuture.onComplete(
-          new AkkaHttpClientHelpers.OnCompleteHandler(span), thiz.system().dispatcher());
-      scope.close();
-    } else {
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+        if (throwable == null) {
+            responseFuture.onComplete(
+                    new AkkaHttpClientHelpers.OnCompleteHandler(span),
+                    thiz.system().dispatcher());
+            scope.close();
+        } else {
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/SingleRequestContextPropagationAdvice.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/SingleRequestContextPropagationAdvice.java
index 5cc4af02d7a..d76661d1b95 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/SingleRequestContextPropagationAdvice.java
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/SingleRequestContextPropagationAdvice.java
@@ -10,16 +10,14 @@
 
 @AppliesOn(CONTEXT_TRACKING)
 public class SingleRequestContextPropagationAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void methodEnter(
-      @Advice.Argument(value = 0, readOnly = false) HttpRequest request) {
-    if (request == null) {
-      return;
-    }
-    final AkkaHttpClientHelpers.AkkaHttpHeaders headers =
-        new AkkaHttpClientHelpers.AkkaHttpHeaders(request);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void methodEnter(@Advice.Argument(value = 0, readOnly = false) HttpRequest request) {
+        if (request == null) {
+            return;
+        }
+        final AkkaHttpClientHelpers.AkkaHttpHeaders headers = new AkkaHttpClientHelpers.AkkaHttpHeaders(request);
 
-    DECORATE.injectContext(currentContext(), request, headers);
-    request = headers.getRequest();
-  }
+        DECORATE.injectContext(currentContext(), request, headers);
+        request = headers.getRequest();
+    }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientDecorator.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientDecorator.java
index e8faa71340d..cfc0d47b3db 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientDecorator.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientDecorator.java
@@ -11,71 +11,68 @@
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpCoreContext;
 
-public class ApacheHttpAsyncClientDecorator
-    extends HttpClientDecorator<HttpUriRequest, HttpContext> {
+public class ApacheHttpAsyncClientDecorator extends HttpClientDecorator<HttpUriRequest, HttpContext> {
 
-  public static final CharSequence APACHE_HTTPASYNCCLIENT =
-      UTF8BytesString.create("apache-httpasyncclient");
+    public static final CharSequence APACHE_HTTPASYNCCLIENT = UTF8BytesString.create("apache-httpasyncclient");
 
-  public static final ApacheHttpAsyncClientDecorator DECORATE =
-      new ApacheHttpAsyncClientDecorator();
-  public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+    public static final ApacheHttpAsyncClientDecorator DECORATE = new ApacheHttpAsyncClientDecorator();
+    public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"httpasyncclient", "apache-httpasyncclient"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"httpasyncclient", "apache-httpasyncclient"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return APACHE_HTTPASYNCCLIENT;
-  }
+    @Override
+    protected CharSequence component() {
+        return APACHE_HTTPASYNCCLIENT;
+    }
 
-  @Override
-  protected String method(final HttpUriRequest request) {
-    return request.getMethod();
-  }
+    @Override
+    protected String method(final HttpUriRequest request) {
+        return request.getMethod();
+    }
 
-  @Override
-  protected URI url(final HttpUriRequest request) throws URISyntaxException {
-    return request.getURI();
-  }
+    @Override
+    protected URI url(final HttpUriRequest request) throws URISyntaxException {
+        return request.getURI();
+    }
 
-  @Override
-  protected URI sourceUrl(final HttpUriRequest request) {
-    return request.getURI();
-  }
+    @Override
+    protected URI sourceUrl(final HttpUriRequest request) {
+        return request.getURI();
+    }
 
-  @Override
-  protected int status(final HttpContext context) {
-    final Object responseObject = context.getAttribute(HttpCoreContext.HTTP_RESPONSE);
-    if (responseObject instanceof HttpResponse) {
-      final StatusLine statusLine = ((HttpResponse) responseObject).getStatusLine();
-      if (statusLine != null) {
-        return statusLine.getStatusCode();
-      }
+    @Override
+    protected int status(final HttpContext context) {
+        final Object responseObject = context.getAttribute(HttpCoreContext.HTTP_RESPONSE);
+        if (responseObject instanceof HttpResponse) {
+            final StatusLine statusLine = ((HttpResponse) responseObject).getStatusLine();
+            if (statusLine != null) {
+                return statusLine.getStatusCode();
+            }
+        }
+        return 0;
     }
-    return 0;
-  }
 
-  @Override
-  protected String getRequestHeader(HttpUriRequest request, String headerName) {
-    Header header = request.getFirstHeader(headerName);
-    if (header != null) {
-      return header.getValue();
+    @Override
+    protected String getRequestHeader(HttpUriRequest request, String headerName) {
+        Header header = request.getFirstHeader(headerName);
+        if (header != null) {
+            return header.getValue();
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Override
-  protected String getResponseHeader(HttpContext context, String headerName) {
-    final Object responseObject = context.getAttribute(HttpCoreContext.HTTP_RESPONSE);
-    if (responseObject instanceof HttpResponse) {
-      Header header = ((HttpResponse) responseObject).getFirstHeader(headerName);
-      if (header != null) {
-        return header.getValue();
-      }
+    @Override
+    protected String getResponseHeader(HttpContext context, String headerName) {
+        final Object responseObject = context.getAttribute(HttpCoreContext.HTTP_RESPONSE);
+        if (responseObject instanceof HttpResponse) {
+            Header header = ((HttpResponse) responseObject).getFirstHeader(headerName);
+            if (header != null) {
+                return header.getValue();
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java
index 6c728610980..cd9429ad212 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java
@@ -27,110 +27,107 @@
 import org.apache.http.protocol.HttpContext;
 
 public class ApacheHttpAsyncClientInstrumentation
-    implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
 
-  public ApacheHttpAsyncClientInstrumentation() {
-    super();
-  }
+    public ApacheHttpAsyncClientInstrumentation() {
+        super();
+    }
 
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return InstrumenterConfig.get()
-        .isIntegrationShortcutMatchingEnabled(
-            asList("httpasyncclient", "apache-httpasyncclient"), false);
-  }
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return InstrumenterConfig.get()
+                .isIntegrationShortcutMatchingEnabled(asList("httpasyncclient", "apache-httpasyncclient"), false);
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.apache.http.impl.nio.client.AbstractHttpAsyncClient",
-      "org.apache.http.impl.nio.client.CloseableHttpAsyncClient",
-      "org.apache.http.impl.nio.client.CloseableHttpAsyncClientBase",
-      "org.apache.http.impl.nio.client.CloseableHttpPipeliningClient",
-      "org.apache.http.impl.nio.client.DefaultHttpAsyncClient",
-      "org.apache.http.impl.nio.client.InternalHttpAsyncClient",
-      "org.apache.http.impl.nio.client.MinimalHttpAsyncClient"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.apache.http.impl.nio.client.AbstractHttpAsyncClient",
+            "org.apache.http.impl.nio.client.CloseableHttpAsyncClient",
+            "org.apache.http.impl.nio.client.CloseableHttpAsyncClientBase",
+            "org.apache.http.impl.nio.client.CloseableHttpPipeliningClient",
+            "org.apache.http.impl.nio.client.DefaultHttpAsyncClient",
+            "org.apache.http.impl.nio.client.InternalHttpAsyncClient",
+            "org.apache.http.impl.nio.client.MinimalHttpAsyncClient"
+        };
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.http.nio.client.HttpAsyncClient";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.http.nio.client.HttpAsyncClient";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(4))
-            .and(takesArgument(0, named("org.apache.http.nio.protocol.HttpAsyncRequestProducer")))
-            .and(takesArgument(1, named("org.apache.http.nio.protocol.HttpAsyncResponseConsumer")))
-            .and(takesArgument(2, named("org.apache.http.protocol.HttpContext")))
-            .and(takesArgument(3, named("org.apache.http.concurrent.FutureCallback"))),
-        ApacheHttpAsyncClientInstrumentation.class.getName() + "$ClientContextPropagationAdvice",
-        ApacheHttpAsyncClientInstrumentation.class.getName() + "$ClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(4))
+                        .and(takesArgument(0, named("org.apache.http.nio.protocol.HttpAsyncRequestProducer")))
+                        .and(takesArgument(1, named("org.apache.http.nio.protocol.HttpAsyncResponseConsumer")))
+                        .and(takesArgument(2, named("org.apache.http.protocol.HttpContext")))
+                        .and(takesArgument(3, named("org.apache.http.concurrent.FutureCallback"))),
+                ApacheHttpAsyncClientInstrumentation.class.getName() + "$ClientContextPropagationAdvice",
+                ApacheHttpAsyncClientInstrumentation.class.getName() + "$ClientAdvice");
+    }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  @SuppressFBWarnings("UC_USELESS_OBJECT")
-  public static class ClientContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
-        @Advice.Argument(value = 0, readOnly = false) HttpAsyncRequestProducer requestProducer) {
-      final DelegatingRequestProducer delegatingRequestProducer =
-          new DelegatingRequestProducer(requestProducer);
-      delegatingRequestProducer.setInjectContext(true);
-      requestProducer = delegatingRequestProducer;
+    @AppliesOn(CONTEXT_TRACKING)
+    @SuppressFBWarnings("UC_USELESS_OBJECT")
+    public static class ClientContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter(
+                @Advice.Argument(value = 0, readOnly = false) HttpAsyncRequestProducer requestProducer) {
+            final DelegatingRequestProducer delegatingRequestProducer = new DelegatingRequestProducer(requestProducer);
+            delegatingRequestProducer.setInjectContext(true);
+            requestProducer = delegatingRequestProducer;
+        }
     }
-  }
 
-  @SuppressFBWarnings("UC_USELESS_OBJECT")
-  public static class ClientAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static AgentSpan methodEnter(
-        @Advice.Argument(value = 0, readOnly = false) HttpAsyncRequestProducer requestProducer,
-        @Advice.Argument(2) HttpContext context,
-        @Advice.Argument(value = 3, readOnly = false) FutureCallback<?> futureCallback,
-        @Advice.Local("parentContinuation") ContextContinuation parentContinuation) {
+    @SuppressFBWarnings("UC_USELESS_OBJECT")
+    public static class ClientAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static AgentSpan methodEnter(
+                @Advice.Argument(value = 0, readOnly = false) HttpAsyncRequestProducer requestProducer,
+                @Advice.Argument(2) HttpContext context,
+                @Advice.Argument(value = 3, readOnly = false) FutureCallback<?> futureCallback,
+                @Advice.Local("parentContinuation") ContextContinuation parentContinuation) {
 
-      if (!(requestProducer instanceof DelegatingRequestProducer)) {
-        requestProducer = new DelegatingRequestProducer(requestProducer);
-      }
+            if (!(requestProducer instanceof DelegatingRequestProducer)) {
+                requestProducer = new DelegatingRequestProducer(requestProducer);
+            }
 
-      parentContinuation = currentContext().capture();
-      final AgentSpan clientSpan = startSpan(APACHE_HTTPASYNCCLIENT.toString(), HTTP_REQUEST);
-      DECORATE.afterStart(clientSpan);
-      ((DelegatingRequestProducer) requestProducer).setSpan(clientSpan);
-      futureCallback =
-          new TraceContinuedFutureCallback<>(
-              parentContinuation, clientSpan, context, futureCallback);
+            parentContinuation = currentContext().capture();
+            final AgentSpan clientSpan = startSpan(APACHE_HTTPASYNCCLIENT.toString(), HTTP_REQUEST);
+            DECORATE.afterStart(clientSpan);
+            ((DelegatingRequestProducer) requestProducer).setSpan(clientSpan);
+            futureCallback =
+                    new TraceContinuedFutureCallback<>(parentContinuation, clientSpan, context, futureCallback);
 
-      return clientSpan;
-    }
+            return clientSpan;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final AgentSpan span,
-        @Advice.Local("parentContinuation") final ContextContinuation parentContinuation,
-        @Advice.Thrown final Throwable throwable) {
-      if (throwable != null) {
-        try {
-          DECORATE.onError(span, throwable);
-          DECORATE.beforeFinish(span);
-          span.finish();
-        } finally {
-          // Submission failed before a callback could take ownership.
-          if (parentContinuation != null) {
-            parentContinuation.release();
-          }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final AgentSpan span,
+                @Advice.Local("parentContinuation") final ContextContinuation parentContinuation,
+                @Advice.Thrown final Throwable throwable) {
+            if (throwable != null) {
+                try {
+                    DECORATE.onError(span, throwable);
+                    DECORATE.beforeFinish(span);
+                    span.finish();
+                } finally {
+                    // Submission failed before a callback could take ownership.
+                    if (parentContinuation != null) {
+                        parentContinuation.release();
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientModule.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientModule.java
index a9314c7acec..8a5338864f2 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientModule.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientModule.java
@@ -11,21 +11,20 @@
 
 @AutoService(InstrumenterModule.class)
 public class ApacheHttpAsyncClientModule extends InstrumenterModule.Tracing {
-  public ApacheHttpAsyncClientModule() {
-    super("httpasyncclient", "apache-httpasyncclient");
-  }
+    public ApacheHttpAsyncClientModule() {
+        super("httpasyncclient", "apache-httpasyncclient");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(
-        "org.apache.http.concurrent.BasicFuture", "org.apache.http.concurrent.FutureCallback");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.apache.http.concurrent.BasicFuture", "org.apache.http.concurrent.FutureCallback");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(
-        new ApacheHttpAsyncClientInstrumentation(),
-        new ApacheHttpClientRedirectInstrumentation(),
-        new BasicFutureInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(
+                new ApacheHttpAsyncClientInstrumentation(),
+                new ApacheHttpClientRedirectInstrumentation(),
+                new BasicFutureInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java
index cd6473b1285..80f82b5d5cb 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java
@@ -23,67 +23,68 @@
  * https://github.com/elastic/apm-agent-java/blob/master/apm-agent-plugins/apm-apache-httpclient-plugin/src/main/java/co/elastic/apm/agent/httpclient/ApacheHttpAsyncClientRedirectInstrumentation.java
  */
 public class ApacheHttpClientRedirectInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.http.client.RedirectStrategy";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.http.client.RedirectStrategy";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("getRedirect"))
-            .and(takesArgument(2, named("org.apache.http.protocol.HttpContext"))),
-        ApacheHttpClientRedirectInstrumentation.class.getName() + "$ClientRedirectAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("getRedirect"))
+                        .and(takesArgument(2, named("org.apache.http.protocol.HttpContext"))),
+                ApacheHttpClientRedirectInstrumentation.class.getName() + "$ClientRedirectAdvice");
+    }
 
-  public static class ClientRedirectAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void onAfterExecute(
-        @Advice.Argument(value = 2) final HttpContext context,
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC) final HttpRequest redirect) {
-      if (redirect == null) {
-        return;
-      }
-      Object originalRequest = context.getAttribute("http.request");
-      if (!(originalRequest instanceof HttpRequest)) {
-        return;
-      }
-      HttpRequest original = (HttpRequest) originalRequest;
+    public static class ClientRedirectAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void onAfterExecute(
+                @Advice.Argument(value = 2) final HttpContext context,
+                @Advice.Return(typing = Assigner.Typing.DYNAMIC) final HttpRequest redirect) {
+            if (redirect == null) {
+                return;
+            }
+            Object originalRequest = context.getAttribute("http.request");
+            if (!(originalRequest instanceof HttpRequest)) {
+                return;
+            }
+            HttpRequest original = (HttpRequest) originalRequest;
 
-      // Apache HttpClient 4.0.1+ copies headers from the original request to the redirect only when
-      // the redirect request has no headers. Because tracing injects propagation headers before
-      // redirect handling completes, an otherwise empty redirect request may no longer look empty
-      // to HttpClient. Preserve that header-copy behavior only for same-origin redirects;
-      // cross-origin redirects must not receive application headers such as Authorization or
-      // Cookie.
-      boolean emptyRedirect = !redirect.headerIterator().hasNext();
-      if (emptyRedirect && RedirectHelper.isSameOrigin(context, original, redirect)) {
-        redirect.setHeaders(((HttpRequestWrapper) original).getOriginal().getAllHeaders());
-      } else {
-        boolean copiedPropagationHeader = false;
-        for (final Header header : original.getAllHeaders()) {
-          if (PropagationUtils.KNOWN_PROPAGATION_HEADERS.contains(
-              header.getName().toLowerCase(Locale.ROOT))) {
-            if (!redirect.containsHeader(header.getName())) {
-              redirect.setHeader(header.getName(), header.getValue());
-              copiedPropagationHeader = true;
+            // Apache HttpClient 4.0.1+ copies headers from the original request to the redirect only when
+            // the redirect request has no headers. Because tracing injects propagation headers before
+            // redirect handling completes, an otherwise empty redirect request may no longer look empty
+            // to HttpClient. Preserve that header-copy behavior only for same-origin redirects;
+            // cross-origin redirects must not receive application headers such as Authorization or
+            // Cookie.
+            boolean emptyRedirect = !redirect.headerIterator().hasNext();
+            if (emptyRedirect && RedirectHelper.isSameOrigin(context, original, redirect)) {
+                redirect.setHeaders(
+                        ((HttpRequestWrapper) original).getOriginal().getAllHeaders());
+            } else {
+                boolean copiedPropagationHeader = false;
+                for (final Header header : original.getAllHeaders()) {
+                    if (PropagationUtils.KNOWN_PROPAGATION_HEADERS.contains(
+                            header.getName().toLowerCase(Locale.ROOT))) {
+                        if (!redirect.containsHeader(header.getName())) {
+                            redirect.setHeader(header.getName(), header.getValue());
+                            copiedPropagationHeader = true;
+                        }
+                    }
+                }
+                if (emptyRedirect && !copiedPropagationHeader) {
+                    // When there are no propagation headers to copy, add a harmless header to keep HttpClient
+                    // from treating the redirect as empty and copying application headers later.
+                    redirect.setHeader("x-datadog-redirect", "true");
+                }
             }
-          }
-        }
-        if (emptyRedirect && !copiedPropagationHeader) {
-          // When there are no propagation headers to copy, add a harmless header to keep HttpClient
-          // from treating the redirect as empty and copying application headers later.
-          redirect.setHeader("x-datadog-redirect", "true");
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/BasicFutureInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/BasicFutureInstrumentation.java
index f4f7eaec730..9532f1f1efb 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/BasicFutureInstrumentation.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/BasicFutureInstrumentation.java
@@ -13,37 +13,34 @@
 import org.apache.http.concurrent.FutureCallback;
 
 public final class BasicFutureInstrumentation
-    implements Instrumenter.ForSingleType,
-        Instrumenter.WithTypeStructure,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.WithTypeStructure, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.http.concurrent.BasicFuture";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.http.concurrent.BasicFuture";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("callback"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("callback"));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$StealCallback");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$StealCallback");
+    }
 
-  // TODO there are numerous cases of using context stores to access immutable private fields
-  //  where the field value is copied into a context field so it can be accessed via
-  //  instrumentation context (e.g. MongoDB), but this has a footprint cost and can't be used
-  //  for mutable fields. This mechanism could be enhanced to direct ContextStore.get to a
-  //  generated field accessor, which would eliminate both these concerns.
-  public static final class StealCallback {
-    @Advice.OnMethodExit
-    public static <T> void postConstruct(
-        @Advice.This BasicFuture<T> future,
-        @Advice.FieldValue("callback") FutureCallback<T> callback) {
-      // the callback can now be accessed elsewhere in the processing pipeline
-      InstrumentationContext.get(BasicFuture.class, FutureCallback.class).put(future, callback);
+    // TODO there are numerous cases of using context stores to access immutable private fields
+    //  where the field value is copied into a context field so it can be accessed via
+    //  instrumentation context (e.g. MongoDB), but this has a footprint cost and can't be used
+    //  for mutable fields. This mechanism could be enhanced to direct ContextStore.get to a
+    //  generated field accessor, which would eliminate both these concerns.
+    public static final class StealCallback {
+        @Advice.OnMethodExit
+        public static <T> void postConstruct(
+                @Advice.This BasicFuture<T> future, @Advice.FieldValue("callback") FutureCallback<T> callback) {
+            // the callback can now be accessed elsewhere in the processing pipeline
+            InstrumentationContext.get(BasicFuture.class, FutureCallback.class).put(future, callback);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/DelegatingRequestProducer.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/DelegatingRequestProducer.java
index a9d267f11ec..8d10273b146 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/DelegatingRequestProducer.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/DelegatingRequestProducer.java
@@ -16,71 +16,70 @@
 import org.apache.http.protocol.HttpContext;
 
 public class DelegatingRequestProducer implements HttpAsyncRequestProducer {
-  AgentSpan span;
-  final HttpAsyncRequestProducer delegate;
-  boolean injectContext = false;
+    AgentSpan span;
+    final HttpAsyncRequestProducer delegate;
+    boolean injectContext = false;
 
-  public DelegatingRequestProducer(final HttpAsyncRequestProducer delegate) {
-    this.delegate = delegate;
-  }
-
-  public void setInjectContext(boolean injectContext) {
-    this.injectContext = injectContext;
-  }
+    public DelegatingRequestProducer(final HttpAsyncRequestProducer delegate) {
+        this.delegate = delegate;
+    }
 
-  public void setSpan(final AgentSpan span) {
-    this.span = span;
-  }
+    public void setInjectContext(boolean injectContext) {
+        this.injectContext = injectContext;
+    }
 
-  @Override
-  public HttpHost getTarget() {
-    return delegate.getTarget();
-  }
+    public void setSpan(final AgentSpan span) {
+        this.span = span;
+    }
 
-  @Override
-  public HttpRequest generateRequest() throws IOException, HttpException {
-    final HttpRequest request = delegate.generateRequest();
-    if (span != null) {
-      DECORATE.onRequest(span, new HostAndRequestAsHttpUriRequest(delegate.getTarget(), request));
+    @Override
+    public HttpHost getTarget() {
+        return delegate.getTarget();
     }
-    if (injectContext) {
-      Context receiver = current();
-      if (span != null) {
-        receiver = receiver.with(span);
-      }
-      DECORATE.injectContext(receiver, request, SETTER);
+
+    @Override
+    public HttpRequest generateRequest() throws IOException, HttpException {
+        final HttpRequest request = delegate.generateRequest();
+        if (span != null) {
+            DECORATE.onRequest(span, new HostAndRequestAsHttpUriRequest(delegate.getTarget(), request));
+        }
+        if (injectContext) {
+            Context receiver = current();
+            if (span != null) {
+                receiver = receiver.with(span);
+            }
+            DECORATE.injectContext(receiver, request, SETTER);
+        }
+        return request;
     }
-    return request;
-  }
 
-  @Override
-  public void produceContent(final ContentEncoder encoder, final IOControl ioctrl)
-      throws IOException {
-    delegate.produceContent(encoder, ioctrl);
-  }
+    @Override
+    public void produceContent(final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
+        delegate.produceContent(encoder, ioctrl);
+    }
 
-  @Override
-  public void requestCompleted(final HttpContext context) {
-    delegate.requestCompleted(context);
-  }
+    @Override
+    public void requestCompleted(final HttpContext context) {
+        delegate.requestCompleted(context);
+    }
 
-  @Override
-  public void failed(final Exception ex) {
-    delegate.failed(ex);
-  }
+    @Override
+    public void failed(final Exception ex) {
+        delegate.failed(ex);
+    }
 
-  @Override
-  public boolean isRepeatable() {
-    return delegate.isRepeatable();
-  }
+    @Override
+    public boolean isRepeatable() {
+        return delegate.isRepeatable();
+    }
 
-  @Override
-  public void resetRequest() throws IOException {
-    delegate.resetRequest();
-  }
+    @Override
+    public void resetRequest() throws IOException {
+        delegate.resetRequest();
+    }
 
-  @Override
-  public void close() throws IOException {
-    delegate.close();
-  }
+    @Override
+    public void close() throws IOException {
+        delegate.close();
+    }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HostAndRequestAsHttpUriRequest.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HostAndRequestAsHttpUriRequest.java
index 7bf1f316b60..4738be031ef 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HostAndRequestAsHttpUriRequest.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HostAndRequestAsHttpUriRequest.java
@@ -12,67 +12,65 @@
 
 /** Wraps HttpHost and HttpRequest into a HttpUriRequest for decorators and injectors */
 public class HostAndRequestAsHttpUriRequest extends AbstractHttpMessage implements HttpUriRequest {
-  // other versions are not affected by this url parsing bug
-  private static final boolean legacyTracingEnabled =
-      Config.get().isLegacyTracingEnabled(false, "httpasyncclient4");
-  private final String method;
-  private final RequestLine requestLine;
-  private final ProtocolVersion protocolVersion;
-  private final java.net.URI uri;
-  private final HttpRequest actualRequest;
+    // other versions are not affected by this url parsing bug
+    private static final boolean legacyTracingEnabled = Config.get().isLegacyTracingEnabled(false, "httpasyncclient4");
+    private final String method;
+    private final RequestLine requestLine;
+    private final ProtocolVersion protocolVersion;
+    private final java.net.URI uri;
+    private final HttpRequest actualRequest;
 
-  public HostAndRequestAsHttpUriRequest(final HttpHost httpHost, final HttpRequest httpRequest) {
-    method = httpRequest.getRequestLine().getMethod();
-    requestLine = httpRequest.getRequestLine();
-    protocolVersion = requestLine.getProtocolVersion();
-    uri =
-        legacyTracingEnabled
-            ? URIUtils.safeParse(requestLine.getUri())
-            : URIUtils.safeConcat(httpHost.toURI(), requestLine.getUri());
-    actualRequest = httpRequest;
-  }
+    public HostAndRequestAsHttpUriRequest(final HttpHost httpHost, final HttpRequest httpRequest) {
+        method = httpRequest.getRequestLine().getMethod();
+        requestLine = httpRequest.getRequestLine();
+        protocolVersion = requestLine.getProtocolVersion();
+        uri = legacyTracingEnabled
+                ? URIUtils.safeParse(requestLine.getUri())
+                : URIUtils.safeConcat(httpHost.toURI(), requestLine.getUri());
+        actualRequest = httpRequest;
+    }
 
-  @Override
-  public void abort() throws UnsupportedOperationException {
-    throw new UnsupportedOperationException();
-  }
+    @Override
+    public void abort() throws UnsupportedOperationException {
+        throw new UnsupportedOperationException();
+    }
 
-  @Override
-  public boolean isAborted() {
-    return false;
-  }
+    @Override
+    public boolean isAborted() {
+        return false;
+    }
 
-  @Override
-  public void setHeader(final String name, final String value) {
-    actualRequest.setHeader(name, value);
-  }
+    @Override
+    public void setHeader(final String name, final String value) {
+        actualRequest.setHeader(name, value);
+    }
 
-  @Override
-  public String getMethod() {
-    return method;
-  }
+    @Override
+    public String getMethod() {
+        return method;
+    }
 
-  @Override
-  public RequestLine getRequestLine() {
-    return requestLine;
-  }
+    @Override
+    public RequestLine getRequestLine() {
+        return requestLine;
+    }
 
-  @Override
-  public ProtocolVersion getProtocolVersion() {
-    return protocolVersion;
-  }
+    @Override
+    public ProtocolVersion getProtocolVersion() {
+        return protocolVersion;
+    }
 
-  @Override
-  public java.net.URI getURI() {
-    return uri;
-  }
+    @Override
+    public java.net.URI getURI() {
+        return uri;
+    }
 
-  @Override
-  public Header getFirstHeader(String name) {
-    return actualRequest.getFirstHeader(name);
-  }
+    @Override
+    public Header getFirstHeader(String name) {
+        return actualRequest.getFirstHeader(name);
+    }
 
-  public HttpRequest getActualRequest() {
-    return actualRequest;
-  }
+    public HttpRequest getActualRequest() {
+        return actualRequest;
+    }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java
index 0bc97acaf98..ba389f3f0f9 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java
@@ -7,10 +7,10 @@
 @ParametersAreNonnullByDefault
 public class HttpHeadersInjectAdapter implements CarrierSetter<HttpRequest> {
 
-  public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
+    public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
 
-  @Override
-  public void set(final HttpRequest carrier, final String key, final String value) {
-    carrier.setHeader(key, value);
-  }
+    @Override
+    public void set(final HttpRequest carrier, final String key, final String value) {
+        carrier.setHeader(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/RedirectHelper.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/RedirectHelper.java
index 017f93c185a..473a4378648 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/RedirectHelper.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/RedirectHelper.java
@@ -8,69 +8,69 @@
 import org.apache.http.protocol.HttpContext;
 
 public final class RedirectHelper {
-  private RedirectHelper() {}
+    private RedirectHelper() {}
 
-  public static boolean isSameOrigin(
-      final HttpContext context, final HttpRequest original, final HttpRequest redirect) {
-    if (!(original instanceof HttpRequestWrapper) || !(redirect instanceof HttpUriRequest)) {
-      return false;
-    }
-    HttpRequest unwrappedOriginal = ((HttpRequestWrapper) original).getOriginal();
-    if (!(unwrappedOriginal instanceof HttpUriRequest)) {
-      return false;
-    }
-    URI originalUri = ((HttpUriRequest) unwrappedOriginal).getURI();
-    URI redirectUri = ((HttpUriRequest) redirect).getURI();
-    if (originalUri == null || redirectUri == null) {
-      return false;
-    }
+    public static boolean isSameOrigin(
+            final HttpContext context, final HttpRequest original, final HttpRequest redirect) {
+        if (!(original instanceof HttpRequestWrapper) || !(redirect instanceof HttpUriRequest)) {
+            return false;
+        }
+        HttpRequest unwrappedOriginal = ((HttpRequestWrapper) original).getOriginal();
+        if (!(unwrappedOriginal instanceof HttpUriRequest)) {
+            return false;
+        }
+        URI originalUri = ((HttpUriRequest) unwrappedOriginal).getURI();
+        URI redirectUri = ((HttpUriRequest) redirect).getURI();
+        if (originalUri == null || redirectUri == null) {
+            return false;
+        }
 
-    originalUri = resolveOriginalUri(context, originalUri);
-    if (!redirectUri.isAbsolute()) {
-      redirectUri = originalUri.resolve(redirectUri);
-    }
-    if (originalUri.getScheme() == null || redirectUri.getScheme() == null) {
-      return false;
-    }
+        originalUri = resolveOriginalUri(context, originalUri);
+        if (!redirectUri.isAbsolute()) {
+            redirectUri = originalUri.resolve(redirectUri);
+        }
+        if (originalUri.getScheme() == null || redirectUri.getScheme() == null) {
+            return false;
+        }
 
-    String originalHost = originalUri.getHost();
-    String redirectHost = redirectUri.getHost();
-    if (originalHost == null || redirectHost == null) {
-      return false;
-    }
+        String originalHost = originalUri.getHost();
+        String redirectHost = redirectUri.getHost();
+        if (originalHost == null || redirectHost == null) {
+            return false;
+        }
 
-    return originalUri.getScheme().equalsIgnoreCase(redirectUri.getScheme())
-        && originalHost.equalsIgnoreCase(redirectHost)
-        && effectivePort(originalUri) == effectivePort(redirectUri);
-  }
-
-  private static URI resolveOriginalUri(final HttpContext context, final URI originalUri) {
-    if (originalUri.isAbsolute()) {
-      return originalUri;
-    }
-    Object targetHost = context.getAttribute("http.target_host");
-    if (!(targetHost instanceof HttpHost)) {
-      return originalUri;
-    }
-    HttpHost host = (HttpHost) targetHost;
-    try {
-      return URI.create(host.toURI()).resolve(originalUri);
-    } catch (IllegalArgumentException e) {
-      return originalUri;
+        return originalUri.getScheme().equalsIgnoreCase(redirectUri.getScheme())
+                && originalHost.equalsIgnoreCase(redirectHost)
+                && effectivePort(originalUri) == effectivePort(redirectUri);
     }
-  }
 
-  private static int effectivePort(final URI uri) {
-    if (uri.getPort() != -1) {
-      return uri.getPort();
+    private static URI resolveOriginalUri(final HttpContext context, final URI originalUri) {
+        if (originalUri.isAbsolute()) {
+            return originalUri;
+        }
+        Object targetHost = context.getAttribute("http.target_host");
+        if (!(targetHost instanceof HttpHost)) {
+            return originalUri;
+        }
+        HttpHost host = (HttpHost) targetHost;
+        try {
+            return URI.create(host.toURI()).resolve(originalUri);
+        } catch (IllegalArgumentException e) {
+            return originalUri;
+        }
     }
-    String scheme = uri.getScheme();
-    if ("http".equalsIgnoreCase(scheme)) {
-      return 80;
-    }
-    if ("https".equalsIgnoreCase(scheme)) {
-      return 443;
+
+    private static int effectivePort(final URI uri) {
+        if (uri.getPort() != -1) {
+            return uri.getPort();
+        }
+        String scheme = uri.getScheme();
+        if ("http".equalsIgnoreCase(scheme)) {
+            return 80;
+        }
+        if ("https".equalsIgnoreCase(scheme)) {
+            return 443;
+        }
+        return -1;
     }
-    return -1;
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java
index cebba8c14b9..71ab4fb83ff 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java
@@ -10,84 +10,84 @@
 import org.apache.http.protocol.HttpContext;
 
 public class TraceContinuedFutureCallback<T> implements FutureCallback<T> {
-  private final ContextContinuation parentContinuation;
-  private final AgentSpan clientSpan;
-  private final HttpContext context;
-  private final FutureCallback<T> delegate;
+    private final ContextContinuation parentContinuation;
+    private final AgentSpan clientSpan;
+    private final HttpContext context;
+    private final FutureCallback<T> delegate;
 
-  public TraceContinuedFutureCallback(
-      final ContextContinuation parentContinuation,
-      final AgentSpan clientSpan,
-      final HttpContext context,
-      final FutureCallback<T> delegate) {
-    this.parentContinuation = parentContinuation;
-    this.clientSpan = clientSpan;
-    this.context = context;
-    // Note: this can be null in real life, so we have to handle this carefully
-    this.delegate = delegate;
-  }
+    public TraceContinuedFutureCallback(
+            final ContextContinuation parentContinuation,
+            final AgentSpan clientSpan,
+            final HttpContext context,
+            final FutureCallback<T> delegate) {
+        this.parentContinuation = parentContinuation;
+        this.clientSpan = clientSpan;
+        this.context = context;
+        // Note: this can be null in real life, so we have to handle this carefully
+        this.delegate = delegate;
+    }
 
-  @Override
-  public void completed(final T result) {
-    DECORATE.onResponse(clientSpan, context);
-    DECORATE.beforeFinish(clientSpan);
-    clientSpan.finish(); // Finish span before calling delegate
+    @Override
+    public void completed(final T result) {
+        DECORATE.onResponse(clientSpan, context);
+        DECORATE.beforeFinish(clientSpan);
+        clientSpan.finish(); // Finish span before calling delegate
 
-    if (parentContinuation.context() == Context.root()) {
-      completeDelegate(result);
-    } else {
-      try (final ContextScope scope = parentContinuation.resume()) {
-        completeDelegate(result);
-      }
+        if (parentContinuation.context() == Context.root()) {
+            completeDelegate(result);
+        } else {
+            try (final ContextScope scope = parentContinuation.resume()) {
+                completeDelegate(result);
+            }
+        }
     }
-  }
 
-  @Override
-  public void failed(final Exception ex) {
-    DECORATE.onResponse(clientSpan, context);
-    DECORATE.onError(clientSpan, ex);
-    DECORATE.beforeFinish(clientSpan);
-    clientSpan.finish(); // Finish span before calling delegate
+    @Override
+    public void failed(final Exception ex) {
+        DECORATE.onResponse(clientSpan, context);
+        DECORATE.onError(clientSpan, ex);
+        DECORATE.beforeFinish(clientSpan);
+        clientSpan.finish(); // Finish span before calling delegate
 
-    if (parentContinuation.context() == Context.root()) {
-      failDelegate(ex);
-    } else {
-      try (final ContextScope scope = parentContinuation.resume()) {
-        failDelegate(ex);
-      }
+        if (parentContinuation.context() == Context.root()) {
+            failDelegate(ex);
+        } else {
+            try (final ContextScope scope = parentContinuation.resume()) {
+                failDelegate(ex);
+            }
+        }
     }
-  }
 
-  @Override
-  public void cancelled() {
-    DECORATE.onResponse(clientSpan, context);
-    DECORATE.beforeFinish(clientSpan);
-    clientSpan.finish(); // Finish span before calling delegate
+    @Override
+    public void cancelled() {
+        DECORATE.onResponse(clientSpan, context);
+        DECORATE.beforeFinish(clientSpan);
+        clientSpan.finish(); // Finish span before calling delegate
 
-    if (parentContinuation.context() == Context.root()) {
-      cancelDelegate();
-    } else {
-      try (final ContextScope scope = parentContinuation.resume()) {
-        cancelDelegate();
-      }
+        if (parentContinuation.context() == Context.root()) {
+            cancelDelegate();
+        } else {
+            try (final ContextScope scope = parentContinuation.resume()) {
+                cancelDelegate();
+            }
+        }
     }
-  }
 
-  private void completeDelegate(final T result) {
-    if (delegate != null) {
-      delegate.completed(result);
+    private void completeDelegate(final T result) {
+        if (delegate != null) {
+            delegate.completed(result);
+        }
     }
-  }
 
-  private void failDelegate(final Exception ex) {
-    if (delegate != null) {
-      delegate.failed(ex);
+    private void failDelegate(final Exception ex) {
+        if (delegate != null) {
+            delegate.failed(ex);
+        }
     }
-  }
 
-  private void cancelDelegate() {
-    if (delegate != null) {
-      delegate.cancelled();
+    private void cancelDelegate() {
+        if (delegate != null) {
+            delegate.cancelled();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentationTest.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentationTest.java
index 83892ef07a5..35deb384895 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentationTest.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentationTest.java
@@ -12,90 +12,86 @@
 
 class ApacheHttpClientRedirectInstrumentationTest {
 
-  @Test
-  void doesNotCopyApplicationHeadersToCrossOriginRedirects() throws Exception {
-    HttpGet original = originalRequest("http://example.com/request");
-    original.addHeader("Authorization", "Bearer secret");
-    original.addHeader("Cookie", "session=secret");
-    original.addHeader("X-Api-Key", "secret");
-    original.addHeader("x-datadog-trace-id", "123");
+    @Test
+    void doesNotCopyApplicationHeadersToCrossOriginRedirects() throws Exception {
+        HttpGet original = originalRequest("http://example.com/request");
+        original.addHeader("Authorization", "Bearer secret");
+        original.addHeader("Cookie", "session=secret");
+        original.addHeader("X-Api-Key", "secret");
+        original.addHeader("x-datadog-trace-id", "123");
 
-    HttpGet redirect = new HttpGet("http://attacker.example/redirect");
+        HttpGet redirect = new HttpGet("http://attacker.example/redirect");
 
-    ApacheHttpClientRedirectInstrumentation.ClientRedirectAdvice.onAfterExecute(
-        contextWith(original), redirect);
+        ApacheHttpClientRedirectInstrumentation.ClientRedirectAdvice.onAfterExecute(contextWith(original), redirect);
 
-    assertFalse(redirect.containsHeader("Authorization"));
-    assertFalse(redirect.containsHeader("Cookie"));
-    assertFalse(redirect.containsHeader("X-Api-Key"));
-    assertEquals("123", redirect.getFirstHeader("x-datadog-trace-id").getValue());
-  }
+        assertFalse(redirect.containsHeader("Authorization"));
+        assertFalse(redirect.containsHeader("Cookie"));
+        assertFalse(redirect.containsHeader("X-Api-Key"));
+        assertEquals("123", redirect.getFirstHeader("x-datadog-trace-id").getValue());
+    }
 
-  @Test
-  void preventsApacheHeaderCopyWhenCrossOriginRedirectHasNoPropagationHeaders() throws Exception {
-    HttpGet original = originalRequest("http://example.com/request");
-    original.addHeader("Authorization", "Bearer secret");
-    original.addHeader("Cookie", "session=secret");
+    @Test
+    void preventsApacheHeaderCopyWhenCrossOriginRedirectHasNoPropagationHeaders() throws Exception {
+        HttpGet original = originalRequest("http://example.com/request");
+        original.addHeader("Authorization", "Bearer secret");
+        original.addHeader("Cookie", "session=secret");
 
-    HttpGet redirect = new HttpGet("http://attacker.example/redirect");
+        HttpGet redirect = new HttpGet("http://attacker.example/redirect");
 
-    ApacheHttpClientRedirectInstrumentation.ClientRedirectAdvice.onAfterExecute(
-        contextWith(original), redirect);
+        ApacheHttpClientRedirectInstrumentation.ClientRedirectAdvice.onAfterExecute(contextWith(original), redirect);
 
-    assertFalse(redirect.containsHeader("Authorization"));
-    assertFalse(redirect.containsHeader("Cookie"));
-    assertEquals("true", redirect.getFirstHeader("x-datadog-redirect").getValue());
-  }
+        assertFalse(redirect.containsHeader("Authorization"));
+        assertFalse(redirect.containsHeader("Cookie"));
+        assertEquals("true", redirect.getFirstHeader("x-datadog-redirect").getValue());
+    }
 
-  @Test
-  void copiesApplicationHeadersToSameOriginRedirects() throws Exception {
-    HttpGet original = originalRequest("https://example.com/request");
-    original.addHeader("Authorization", "Bearer secret");
-    original.addHeader("x-datadog-trace-id", "123");
+    @Test
+    void copiesApplicationHeadersToSameOriginRedirects() throws Exception {
+        HttpGet original = originalRequest("https://example.com/request");
+        original.addHeader("Authorization", "Bearer secret");
+        original.addHeader("x-datadog-trace-id", "123");
 
-    HttpGet redirect = new HttpGet("https://example.com/redirect");
+        HttpGet redirect = new HttpGet("https://example.com/redirect");
 
-    ApacheHttpClientRedirectInstrumentation.ClientRedirectAdvice.onAfterExecute(
-        contextWith(original), redirect);
+        ApacheHttpClientRedirectInstrumentation.ClientRedirectAdvice.onAfterExecute(contextWith(original), redirect);
 
-    assertEquals("Bearer secret", redirect.getFirstHeader("Authorization").getValue());
-    assertEquals("123", redirect.getFirstHeader("x-datadog-trace-id").getValue());
-  }
+        assertEquals("Bearer secret", redirect.getFirstHeader("Authorization").getValue());
+        assertEquals("123", redirect.getFirstHeader("x-datadog-trace-id").getValue());
+    }
 
-  @Test
-  void treatsDefaultPortsAsSameOrigin() throws Exception {
-    HttpGet original = originalRequest("https://example.com:443/request");
-    original.addHeader("Authorization", "Bearer secret");
+    @Test
+    void treatsDefaultPortsAsSameOrigin() throws Exception {
+        HttpGet original = originalRequest("https://example.com:443/request");
+        original.addHeader("Authorization", "Bearer secret");
 
-    HttpGet redirect = new HttpGet("https://example.com/redirect");
+        HttpGet redirect = new HttpGet("https://example.com/redirect");
 
-    ApacheHttpClientRedirectInstrumentation.ClientRedirectAdvice.onAfterExecute(
-        contextWith(original), redirect);
+        ApacheHttpClientRedirectInstrumentation.ClientRedirectAdvice.onAfterExecute(contextWith(original), redirect);
 
-    assertEquals("Bearer secret", redirect.getFirstHeader("Authorization").getValue());
-  }
+        assertEquals("Bearer secret", redirect.getFirstHeader("Authorization").getValue());
+    }
 
-  @Test
-  void resolvesHostRequestOriginFromContext() throws Exception {
-    HttpGet original = originalRequest("/request");
-    original.addHeader("Authorization", "Bearer secret");
+    @Test
+    void resolvesHostRequestOriginFromContext() throws Exception {
+        HttpGet original = originalRequest("/request");
+        original.addHeader("Authorization", "Bearer secret");
 
-    HttpGet redirect = new HttpGet("http://example.com/redirect");
-    HttpContext context = contextWith(original);
-    context.setAttribute("http.target_host", new HttpHost("example.com", 80, "http"));
+        HttpGet redirect = new HttpGet("http://example.com/redirect");
+        HttpContext context = contextWith(original);
+        context.setAttribute("http.target_host", new HttpHost("example.com", 80, "http"));
 
-    ApacheHttpClientRedirectInstrumentation.ClientRedirectAdvice.onAfterExecute(context, redirect);
+        ApacheHttpClientRedirectInstrumentation.ClientRedirectAdvice.onAfterExecute(context, redirect);
 
-    assertEquals("Bearer secret", redirect.getFirstHeader("Authorization").getValue());
-  }
+        assertEquals("Bearer secret", redirect.getFirstHeader("Authorization").getValue());
+    }
 
-  private static HttpGet originalRequest(final String uri) {
-    return new HttpGet(uri);
-  }
+    private static HttpGet originalRequest(final String uri) {
+        return new HttpGet(uri);
+    }
 
-  private static HttpContext contextWith(final HttpGet request) throws Exception {
-    HttpContext context = new BasicHttpContext();
-    context.setAttribute("http.request", HttpRequestWrapper.wrap(request));
-    return context;
-  }
+    private static HttpContext contextWith(final HttpGet request) throws Exception {
+        HttpContext context = new BasicHttpContext();
+        context.setAttribute("http.request", HttpRequestWrapper.wrap(request));
+        return context;
+    }
 }
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 b5e19ab58fe..665c0361819 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
@@ -12,89 +12,85 @@
 
 public class SsrfController {
 
-  private static final Logger logger = LoggerFactory.getLogger(SsrfController.class);
+    private static final Logger logger = LoggerFactory.getLogger(SsrfController.class);
 
-  public String apacheSsrf(
-      final String url,
-      final String clientClassName,
-      final String method,
-      final String requestType,
-      final String scheme) {
-    try {
-      HttpClient httpClient = getHttpClient(clientClassName);
-      execute(httpClient, url, ExecuteMethod.valueOf(method), requestType, scheme);
-    } catch (Exception e) {
-      logger.error("Error executing request", e);
-      return "NO_OK";
+    public String apacheSsrf(
+            final String url,
+            final String clientClassName,
+            final String method,
+            final String requestType,
+            final String scheme) {
+        try {
+            HttpClient httpClient = getHttpClient(clientClassName);
+            execute(httpClient, url, ExecuteMethod.valueOf(method), requestType, scheme);
+        } catch (Exception e) {
+            logger.error("Error executing request", e);
+            return "NO_OK";
+        }
+        return "OK";
     }
-    return "OK";
-  }
 
-  private void execute(
-      final HttpClient client,
-      final String url,
-      ExecuteMethod executeMethod,
-      String requestType,
-      String scheme)
-      throws IOException {
-    HttpUriRequest httpUriRequest = new HttpGet(url);
-    boolean isUriRequest = requestType.equals(Request.HttpUriRequest.name());
-    HttpHost host =
-        new HttpHost(httpUriRequest.getURI().getHost(), httpUriRequest.getURI().getPort(), scheme);
-    HttpRequest httpRequest = isUriRequest ? httpUriRequest : new BasicHttpRequest("GET", url);
-    switch (executeMethod) {
-      case REQUEST:
-        client.execute(httpUriRequest);
-        break;
-      case REQUEST_CONTEXT:
-        client.execute(httpUriRequest, new BasicHttpContext());
-        break;
-      case HOST_REQUEST:
-        client.execute(host, httpRequest);
-        break;
-      case REQUEST_HANDLER:
-        client.execute(httpUriRequest, new BasicResponseHandler());
-        break;
-      case REQUEST_HANDLER_CONTEXT:
-        client.execute(httpUriRequest, new BasicResponseHandler(), new BasicHttpContext());
-        break;
-      case HOST_REQUEST_HANDLER:
-        client.execute(host, httpRequest, new BasicResponseHandler());
-        break;
-      case HOST_REQUEST_HANDLER_CONTEXT:
-        client.execute(host, httpRequest, new BasicResponseHandler(), new BasicHttpContext());
-        break;
-      case HOST_REQUEST_CONTEXT:
-        client.execute(host, httpRequest, new BasicHttpContext());
-        break;
-      default:
-        throw new IllegalArgumentException("Unknown execute method: " + executeMethod);
+    private void execute(
+            final HttpClient client, final String url, ExecuteMethod executeMethod, String requestType, String scheme)
+            throws IOException {
+        HttpUriRequest httpUriRequest = new HttpGet(url);
+        boolean isUriRequest = requestType.equals(Request.HttpUriRequest.name());
+        HttpHost host = new HttpHost(
+                httpUriRequest.getURI().getHost(), httpUriRequest.getURI().getPort(), scheme);
+        HttpRequest httpRequest = isUriRequest ? httpUriRequest : new BasicHttpRequest("GET", url);
+        switch (executeMethod) {
+            case REQUEST:
+                client.execute(httpUriRequest);
+                break;
+            case REQUEST_CONTEXT:
+                client.execute(httpUriRequest, new BasicHttpContext());
+                break;
+            case HOST_REQUEST:
+                client.execute(host, httpRequest);
+                break;
+            case REQUEST_HANDLER:
+                client.execute(httpUriRequest, new BasicResponseHandler());
+                break;
+            case REQUEST_HANDLER_CONTEXT:
+                client.execute(httpUriRequest, new BasicResponseHandler(), new BasicHttpContext());
+                break;
+            case HOST_REQUEST_HANDLER:
+                client.execute(host, httpRequest, new BasicResponseHandler());
+                break;
+            case HOST_REQUEST_HANDLER_CONTEXT:
+                client.execute(host, httpRequest, new BasicResponseHandler(), new BasicHttpContext());
+                break;
+            case HOST_REQUEST_CONTEXT:
+                client.execute(host, httpRequest, new BasicHttpContext());
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown execute method: " + executeMethod);
+        }
     }
-  }
 
-  private HttpClient getHttpClient(final String clientClassName) {
-    try {
-      Class<?> clientClass = Class.forName(clientClassName);
-      clientClass.getDeclaredConstructor().setAccessible(true);
-      return (HttpClient) clientClass.getDeclaredConstructor().newInstance();
-    } catch (Exception e) {
-      throw new IllegalArgumentException("Unknown client class: " + clientClassName, e);
+    private HttpClient getHttpClient(final String clientClassName) {
+        try {
+            Class<?> clientClass = Class.forName(clientClassName);
+            clientClass.getDeclaredConstructor().setAccessible(true);
+            return (HttpClient) clientClass.getDeclaredConstructor().newInstance();
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Unknown client class: " + clientClassName, e);
+        }
     }
-  }
 
-  public enum Request {
-    HttpRequest,
-    HttpUriRequest
-  }
+    public enum Request {
+        HttpRequest,
+        HttpUriRequest
+    }
 
-  public enum ExecuteMethod {
-    REQUEST,
-    REQUEST_CONTEXT,
-    HOST_REQUEST,
-    REQUEST_HANDLER,
-    REQUEST_HANDLER_CONTEXT,
-    HOST_REQUEST_HANDLER,
-    HOST_REQUEST_HANDLER_CONTEXT,
-    HOST_REQUEST_CONTEXT
-  }
+    public enum ExecuteMethod {
+        REQUEST,
+        REQUEST_CONTEXT,
+        HOST_REQUEST,
+        REQUEST_HANDLER,
+        REQUEST_HANDLER_CONTEXT,
+        HOST_REQUEST_HANDLER,
+        HOST_REQUEST_HANDLER_CONTEXT,
+        HOST_REQUEST_CONTEXT
+    }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/iastIntegrationTest/java/foo/bar/VulnerableUrlBuilder.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/iastIntegrationTest/java/foo/bar/VulnerableUrlBuilder.java
index a8b793a15b1..dc82e248764 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/iastIntegrationTest/java/foo/bar/VulnerableUrlBuilder.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/iastIntegrationTest/java/foo/bar/VulnerableUrlBuilder.java
@@ -5,27 +5,27 @@
 /** Class to be instrumented by IAST call sites containing methods to work with urls */
 public abstract class VulnerableUrlBuilder {
 
-  private VulnerableUrlBuilder() {}
+    private VulnerableUrlBuilder() {}
 
-  public static String url(HttpServletRequest request) {
-    final String url = request.getParameter("url");
-    if (url != null) {
-      return url;
+    public static String url(HttpServletRequest request) {
+        final String url = request.getParameter("url");
+        if (url != null) {
+            return url;
+        }
+        final String scheme = request.getParameter("scheme");
+        final boolean https = "https".equals(scheme);
+        final String host = request.getParameter("host");
+        if (host != null) {
+            return (https ? "https://" : "http://") + host + "/test?1=1";
+        }
+        final String path = request.getParameter("path");
+        if (path != null) {
+            return (https ? "https://inexistent/" : "http://inexistent/") + path + "?1=1";
+        }
+        final String query = request.getParameter("query");
+        if (query != null) {
+            return (https ? "https://inexistent/test" : "http://inexistent/test") + query;
+        }
+        return scheme + "://inexistent/test?1=1";
     }
-    final String scheme = request.getParameter("scheme");
-    final boolean https = "https".equals(scheme);
-    final String host = request.getParameter("host");
-    if (host != null) {
-      return (https ? "https://" : "http://") + host + "/test?1=1";
-    }
-    final String path = request.getParameter("path");
-    if (path != null) {
-      return (https ? "https://inexistent/" : "http://inexistent/") + path + "?1=1";
-    }
-    final String query = request.getParameter("query");
-    if (query != null) {
-      return (https ? "https://inexistent/test" : "http://inexistent/test") + query;
-    }
-    return scheme + "://inexistent/test?1=1";
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java
index 91cee1f3f85..4d5ce267d97 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java
@@ -9,56 +9,56 @@
 
 public class ApacheHttpClientDecorator extends HttpClientDecorator<HttpUriRequest, HttpResponse> {
 
-  public static final CharSequence APACHE_HTTP_CLIENT = UTF8BytesString.create("apache-httpclient");
-  public static final ApacheHttpClientDecorator DECORATE = new ApacheHttpClientDecorator();
+    public static final CharSequence APACHE_HTTP_CLIENT = UTF8BytesString.create("apache-httpclient");
+    public static final ApacheHttpClientDecorator DECORATE = new ApacheHttpClientDecorator();
 
-  public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+    public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"httpclient", "apache-httpclient", "apache-http-client"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"httpclient", "apache-httpclient", "apache-http-client"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return APACHE_HTTP_CLIENT;
-  }
+    @Override
+    protected CharSequence component() {
+        return APACHE_HTTP_CLIENT;
+    }
 
-  @Override
-  protected String method(final HttpUriRequest httpRequest) {
-    return httpRequest.getMethod();
-  }
+    @Override
+    protected String method(final HttpUriRequest httpRequest) {
+        return httpRequest.getMethod();
+    }
 
-  @Override
-  protected URI url(final HttpUriRequest request) {
-    return request.getURI();
-  }
+    @Override
+    protected URI url(final HttpUriRequest request) {
+        return request.getURI();
+    }
 
-  @Override
-  protected URI sourceUrl(final HttpUriRequest request) {
-    return request.getURI();
-  }
+    @Override
+    protected URI sourceUrl(final HttpUriRequest request) {
+        return request.getURI();
+    }
 
-  @Override
-  protected int status(final HttpResponse httpResponse) {
-    return httpResponse.getStatusLine().getStatusCode();
-  }
+    @Override
+    protected int status(final HttpResponse httpResponse) {
+        return httpResponse.getStatusLine().getStatusCode();
+    }
 
-  @Override
-  protected String getRequestHeader(HttpUriRequest request, String headerName) {
-    Header header = request.getFirstHeader(headerName);
-    if (null != header) {
-      return header.getValue();
+    @Override
+    protected String getRequestHeader(HttpUriRequest request, String headerName) {
+        Header header = request.getFirstHeader(headerName);
+        if (null != header) {
+            return header.getValue();
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Override
-  protected String getResponseHeader(HttpResponse response, String headerName) {
-    Header header = response.getFirstHeader(headerName);
-    if (null != header) {
-      return header.getValue();
+    @Override
+    protected String getResponseHeader(HttpResponse response, String headerName) {
+        Header header = response.getFirstHeader(headerName);
+        if (null != header) {
+            return header.getValue();
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java
index 37de9441df0..68ea7434074 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java
@@ -25,10 +25,9 @@
 
 @AutoService(InstrumenterModule.class)
 public class ApacheHttpClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
 
-  static final String[] MATCHING_TYPES =
-      new String[] {
+    static final String[] MATCHING_TYPES = new String[] {
         "org.apache.http.impl.client.AbstractHttpClient",
         "software.amazon.awssdk.http.apache.internal.impl.ApacheSdkHttpClient",
         "org.apache.http.impl.client.AutoRetryHttpClient",
@@ -41,256 +40,244 @@ public class ApacheHttpClientInstrumentation extends InstrumenterModule.Tracing
         "org.apache.http.impl.client.SystemDefaultHttpClient",
         "com.netflix.http4.NFHttpClient",
         "com.amazonaws.http.apache.client.impl.SdkHttpClient"
-      };
+    };
 
-  public ApacheHttpClientInstrumentation() {
-    super("httpclient", "apache-httpclient", "apache-http-client");
-  }
-
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return isShortcutMatchingEnabled(false);
-  }
+    public ApacheHttpClientInstrumentation() {
+        super("httpclient", "apache-httpclient", "apache-http-client");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return MATCHING_TYPES;
-  }
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return isShortcutMatchingEnabled(false);
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.http.client.HttpClient";
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return MATCHING_TYPES;
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.http.client.HttpClient";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // There are 8 execute(...) methods.  Depending on the version, they may or may not delegate to
-    // eachother. Thus, all methods need to be instrumented.  Because of argument position and type,
-    // some methods can share the same advice class.  The call depth tracking ensures only 1 span is
-    // created
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("org.apache.http.client.methods.HttpUriRequest"))),
-        ApacheHttpClientInstrumentation.class.getName() + "$UriRequestAdvice",
-        ApacheHttpClientInstrumentation.class.getName() + "$UriRequestContextPropagationAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // There are 8 execute(...) methods.  Depending on the version, they may or may not delegate to
+        // eachother. Thus, all methods need to be instrumented.  Because of argument position and type,
+        // some methods can share the same advice class.  The call depth tracking ensures only 1 span is
+        // created
 
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("org.apache.http.client.methods.HttpUriRequest")))
-            .and(takesArgument(1, named("org.apache.http.protocol.HttpContext"))),
-        ApacheHttpClientInstrumentation.class.getName() + "$UriRequestAdvice",
-        ApacheHttpClientInstrumentation.class.getName() + "$UriRequestContextPropagationAdvice");
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("org.apache.http.client.methods.HttpUriRequest"))),
+                ApacheHttpClientInstrumentation.class.getName() + "$UriRequestAdvice",
+                ApacheHttpClientInstrumentation.class.getName() + "$UriRequestContextPropagationAdvice");
 
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("org.apache.http.client.methods.HttpUriRequest")))
-            .and(takesArgument(1, named("org.apache.http.client.ResponseHandler"))),
-        ApacheHttpClientInstrumentation.class.getName() + "$UriRequestWithHandlerAdvice",
-        ApacheHttpClientInstrumentation.class.getName() + "$UriRequestContextPropagationAdvice");
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("org.apache.http.client.methods.HttpUriRequest")))
+                        .and(takesArgument(1, named("org.apache.http.protocol.HttpContext"))),
+                ApacheHttpClientInstrumentation.class.getName() + "$UriRequestAdvice",
+                ApacheHttpClientInstrumentation.class.getName() + "$UriRequestContextPropagationAdvice");
 
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("org.apache.http.client.methods.HttpUriRequest")))
-            .and(takesArgument(1, named("org.apache.http.client.ResponseHandler")))
-            .and(takesArgument(2, named("org.apache.http.protocol.HttpContext"))),
-        ApacheHttpClientInstrumentation.class.getName() + "$UriRequestWithHandlerAdvice",
-        ApacheHttpClientInstrumentation.class.getName() + "$UriRequestContextPropagationAdvice");
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("org.apache.http.client.methods.HttpUriRequest")))
+                        .and(takesArgument(1, named("org.apache.http.client.ResponseHandler"))),
+                ApacheHttpClientInstrumentation.class.getName() + "$UriRequestWithHandlerAdvice",
+                ApacheHttpClientInstrumentation.class.getName() + "$UriRequestContextPropagationAdvice");
 
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("org.apache.http.HttpHost")))
-            .and(takesArgument(1, named("org.apache.http.HttpRequest"))),
-        ApacheHttpClientInstrumentation.class.getName() + "$RequestAdvice",
-        ApacheHttpClientInstrumentation.class.getName() + "$RequestContextPropagationAdvice");
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("org.apache.http.client.methods.HttpUriRequest")))
+                        .and(takesArgument(1, named("org.apache.http.client.ResponseHandler")))
+                        .and(takesArgument(2, named("org.apache.http.protocol.HttpContext"))),
+                ApacheHttpClientInstrumentation.class.getName() + "$UriRequestWithHandlerAdvice",
+                ApacheHttpClientInstrumentation.class.getName() + "$UriRequestContextPropagationAdvice");
 
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("org.apache.http.HttpHost")))
-            .and(takesArgument(1, named("org.apache.http.HttpRequest")))
-            .and(takesArgument(2, named("org.apache.http.protocol.HttpContext"))),
-        ApacheHttpClientInstrumentation.class.getName() + "$RequestAdvice",
-        ApacheHttpClientInstrumentation.class.getName() + "$RequestContextPropagationAdvice");
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("org.apache.http.HttpHost")))
+                        .and(takesArgument(1, named("org.apache.http.HttpRequest"))),
+                ApacheHttpClientInstrumentation.class.getName() + "$RequestAdvice",
+                ApacheHttpClientInstrumentation.class.getName() + "$RequestContextPropagationAdvice");
 
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("org.apache.http.HttpHost")))
-            .and(takesArgument(1, named("org.apache.http.HttpRequest")))
-            .and(takesArgument(2, named("org.apache.http.client.ResponseHandler"))),
-        ApacheHttpClientInstrumentation.class.getName() + "$RequestWithHandlerAdvice",
-        ApacheHttpClientInstrumentation.class.getName() + "$RequestContextPropagationAdvice");
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("org.apache.http.HttpHost")))
+                        .and(takesArgument(1, named("org.apache.http.HttpRequest")))
+                        .and(takesArgument(2, named("org.apache.http.protocol.HttpContext"))),
+                ApacheHttpClientInstrumentation.class.getName() + "$RequestAdvice",
+                ApacheHttpClientInstrumentation.class.getName() + "$RequestContextPropagationAdvice");
 
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(4))
-            .and(takesArgument(0, named("org.apache.http.HttpHost")))
-            .and(takesArgument(1, named("org.apache.http.HttpRequest")))
-            .and(takesArgument(2, named("org.apache.http.client.ResponseHandler")))
-            .and(takesArgument(3, named("org.apache.http.protocol.HttpContext"))),
-        ApacheHttpClientInstrumentation.class.getName() + "$RequestWithHandlerAdvice",
-        ApacheHttpClientInstrumentation.class.getName() + "$RequestContextPropagationAdvice");
-  }
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("org.apache.http.HttpHost")))
+                        .and(takesArgument(1, named("org.apache.http.HttpRequest")))
+                        .and(takesArgument(2, named("org.apache.http.client.ResponseHandler"))),
+                ApacheHttpClientInstrumentation.class.getName() + "$RequestWithHandlerAdvice",
+                ApacheHttpClientInstrumentation.class.getName() + "$RequestContextPropagationAdvice");
 
-  public static class UriRequestAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(@Advice.Argument(0) final HttpUriRequest request) {
-      try {
-        return HelperMethods.doMethodEnter(request);
-      } catch (BlockingException e) {
-        HelperMethods.onBlockingRequest();
-        // re-throw blocking exceptions
-        throw e;
-      }
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(4))
+                        .and(takesArgument(0, named("org.apache.http.HttpHost")))
+                        .and(takesArgument(1, named("org.apache.http.HttpRequest")))
+                        .and(takesArgument(2, named("org.apache.http.client.ResponseHandler")))
+                        .and(takesArgument(3, named("org.apache.http.protocol.HttpContext"))),
+                ApacheHttpClientInstrumentation.class.getName() + "$RequestWithHandlerAdvice",
+                ApacheHttpClientInstrumentation.class.getName() + "$RequestContextPropagationAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return final Object result,
-        @Advice.Thrown final Throwable throwable) {
-      HelperMethods.doMethodExit(scope, result, throwable);
+    public static class UriRequestAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(@Advice.Argument(0) final HttpUriRequest request) {
+            try {
+                return HelperMethods.doMethodEnter(request);
+            } catch (BlockingException e) {
+                HelperMethods.onBlockingRequest();
+                // re-throw blocking exceptions
+                throw e;
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return final Object result,
+                @Advice.Thrown final Throwable throwable) {
+            HelperMethods.doMethodExit(scope, result, throwable);
+        }
     }
-  }
 
-  public static class UriRequestWithHandlerAdvice {
+    public static class UriRequestWithHandlerAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.Argument(0) final HttpUriRequest request,
-        @Advice.Argument(
-                value = 1,
-                optional = true,
-                typing = Assigner.Typing.DYNAMIC,
-                readOnly = false)
-            Object handler) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.Argument(0) final HttpUriRequest request,
+                @Advice.Argument(value = 1, optional = true, typing = Assigner.Typing.DYNAMIC, readOnly = false)
+                        Object handler) {
 
-      try {
-        final ContextScope scope = HelperMethods.doMethodEnter(request);
-        // Wrap the handler so we capture the status code
-        if (null != scope && handler instanceof ResponseHandler) {
-          handler =
-              new WrappingStatusSettingResponseHandler(
-                  spanFromScope(scope), (ResponseHandler) handler);
+            try {
+                final ContextScope scope = HelperMethods.doMethodEnter(request);
+                // Wrap the handler so we capture the status code
+                if (null != scope && handler instanceof ResponseHandler) {
+                    handler = new WrappingStatusSettingResponseHandler(spanFromScope(scope), (ResponseHandler) handler);
+                }
+                return scope;
+            } catch (BlockingException e) {
+                HelperMethods.onBlockingRequest();
+                // re-throw blocking exceptions
+                throw e;
+            }
         }
-        return scope;
-      } catch (BlockingException e) {
-        HelperMethods.onBlockingRequest();
-        // re-throw blocking exceptions
-        throw e;
-      }
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return final Object result,
-        @Advice.Thrown final Throwable throwable) {
-      HelperMethods.doMethodExit(scope, result, throwable);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return final Object result,
+                @Advice.Thrown final Throwable throwable) {
+            HelperMethods.doMethodExit(scope, result, throwable);
+        }
     }
-  }
 
-  public static class RequestAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.Argument(0) final HttpHost host, @Advice.Argument(1) final HttpRequest request) {
-      try {
-        if (request instanceof HttpUriRequest) {
-          return HelperMethods.doMethodEnter((HttpUriRequest) request);
-        } else {
-          return HelperMethods.doMethodEnter(host, request);
+    public static class RequestAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.Argument(0) final HttpHost host, @Advice.Argument(1) final HttpRequest request) {
+            try {
+                if (request instanceof HttpUriRequest) {
+                    return HelperMethods.doMethodEnter((HttpUriRequest) request);
+                } else {
+                    return HelperMethods.doMethodEnter(host, request);
+                }
+            } catch (BlockingException e) {
+                HelperMethods.onBlockingRequest();
+                // re-throw blocking exceptions
+                throw e;
+            }
         }
-      } catch (BlockingException e) {
-        HelperMethods.onBlockingRequest();
-        // re-throw blocking exceptions
-        throw e;
-      }
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return final Object result,
-        @Advice.Thrown final Throwable throwable) {
-      HelperMethods.doMethodExit(scope, result, throwable);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return final Object result,
+                @Advice.Thrown final Throwable throwable) {
+            HelperMethods.doMethodExit(scope, result, throwable);
+        }
     }
-  }
 
-  public static class RequestWithHandlerAdvice {
+    public static class RequestWithHandlerAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.Argument(0) final HttpHost host,
-        @Advice.Argument(1) final HttpRequest request,
-        @Advice.Argument(
-                value = 2,
-                optional = true,
-                typing = Assigner.Typing.DYNAMIC,
-                readOnly = false)
-            Object handler) {
-      try {
-        final ContextScope scope;
-        if (request instanceof HttpUriRequest) {
-          scope = HelperMethods.doMethodEnter((HttpUriRequest) request);
-        } else {
-          scope = HelperMethods.doMethodEnter(host, request);
-        }
-        // Wrap the handler so we capture the status code
-        if (null != scope && handler instanceof ResponseHandler) {
-          handler =
-              new WrappingStatusSettingResponseHandler(
-                  spanFromScope(scope), (ResponseHandler) handler);
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.Argument(0) final HttpHost host,
+                @Advice.Argument(1) final HttpRequest request,
+                @Advice.Argument(value = 2, optional = true, typing = Assigner.Typing.DYNAMIC, readOnly = false)
+                        Object handler) {
+            try {
+                final ContextScope scope;
+                if (request instanceof HttpUriRequest) {
+                    scope = HelperMethods.doMethodEnter((HttpUriRequest) request);
+                } else {
+                    scope = HelperMethods.doMethodEnter(host, request);
+                }
+                // Wrap the handler so we capture the status code
+                if (null != scope && handler instanceof ResponseHandler) {
+                    handler = new WrappingStatusSettingResponseHandler(spanFromScope(scope), (ResponseHandler) handler);
+                }
+                return scope;
+            } catch (BlockingException e) {
+                HelperMethods.onBlockingRequest();
+                // re-throw blocking exceptions
+                throw e;
+            }
         }
-        return scope;
-      } catch (BlockingException e) {
-        HelperMethods.onBlockingRequest();
-        // re-throw blocking exceptions
-        throw e;
-      }
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return final Object result,
-        @Advice.Thrown final Throwable throwable) {
-      HelperMethods.doMethodExit(scope, result, throwable);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return final Object result,
+                @Advice.Thrown final Throwable throwable) {
+            HelperMethods.doMethodExit(scope, result, throwable);
+        }
     }
-  }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class UriRequestContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(@Advice.Argument(0) final HttpUriRequest request) {
-      HelperMethods.doInjectContext(request);
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class UriRequestContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter(@Advice.Argument(0) final HttpUriRequest request) {
+            HelperMethods.doInjectContext(request);
+        }
     }
-  }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class RequestContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
-        @Advice.Argument(0) final HttpHost host, @Advice.Argument(1) final HttpRequest request) {
-      HelperMethods.doInjectContext(host, request);
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class RequestContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter(
+                @Advice.Argument(0) final HttpHost host, @Advice.Argument(1) final HttpRequest request) {
+            HelperMethods.doInjectContext(host, request);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java
index e6afc6202b5..91a3b42f2e1 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java
@@ -20,76 +20,75 @@
 import org.apache.http.client.methods.HttpUriRequest;
 
 public class HelperMethods {
-  public static ContextScope doMethodEnter(final HttpUriRequest request) {
-    final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class);
-    if (callDepth > 0) {
-      return null;
+    public static ContextScope doMethodEnter(final HttpUriRequest request) {
+        final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class);
+        if (callDepth > 0) {
+            return null;
+        }
+        return activateHttpSpan(request);
     }
-    return activateHttpSpan(request);
-  }
 
-  public static ContextScope doMethodEnter(HttpHost host, HttpRequest request) {
-    final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class);
-    if (callDepth > 0) {
-      return null;
+    public static ContextScope doMethodEnter(HttpHost host, HttpRequest request) {
+        final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class);
+        if (callDepth > 0) {
+            return null;
+        }
+
+        return activateHttpSpan(new HostAndRequestAsHttpUriRequest(host, request));
     }
 
-    return activateHttpSpan(new HostAndRequestAsHttpUriRequest(host, request));
-  }
+    private static ContextScope activateHttpSpan(final HttpUriRequest request) {
+        final AgentSpan span = startSpan(APACHE_HTTP_CLIENT.toString(), HTTP_REQUEST);
+        final ContextScope scope = activateSpan(span);
 
-  private static ContextScope activateHttpSpan(final HttpUriRequest request) {
-    final AgentSpan span = startSpan(APACHE_HTTP_CLIENT.toString(), HTTP_REQUEST);
-    final ContextScope scope = activateSpan(span);
+        try {
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, request);
+        } catch (BlockingException e) {
+            DECORATE.onError(span, e);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+            throw e;
+        }
 
-    try {
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, request);
-    } catch (BlockingException e) {
-      DECORATE.onError(span, e);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
-      throw e;
+        return scope;
     }
 
-    return scope;
-  }
-
-  public static void doInjectContext(final HttpUriRequest request) {
-    if (request.containsHeader("amz-sdk-invocation-id")) {
-      return;
+    public static void doInjectContext(final HttpUriRequest request) {
+        if (request.containsHeader("amz-sdk-invocation-id")) {
+            return;
+        }
+        DECORATE.injectContext(current(), request, SETTER);
     }
-    DECORATE.injectContext(current(), request, SETTER);
-  }
 
-  public static void doInjectContext(final HttpHost host, final HttpRequest request) {
-    final HttpUriRequest uriRequest;
-    if (request instanceof HttpUriRequest) {
-      uriRequest = (HttpUriRequest) request;
-    } else {
-      uriRequest = new HostAndRequestAsHttpUriRequest(host, request);
+    public static void doInjectContext(final HttpHost host, final HttpRequest request) {
+        final HttpUriRequest uriRequest;
+        if (request instanceof HttpUriRequest) {
+            uriRequest = (HttpUriRequest) request;
+        } else {
+            uriRequest = new HostAndRequestAsHttpUriRequest(host, request);
+        }
+        doInjectContext(uriRequest);
     }
-    doInjectContext(uriRequest);
-  }
 
-  public static void doMethodExit(
-      final ContextScope scope, final Object result, final Throwable throwable) {
-    if (scope == null) {
-      return;
-    }
-    final AgentSpan span = spanFromScope(scope);
-    if (result instanceof HttpResponse) {
-      DECORATE.onResponse(span, (HttpResponse) result);
-    } // else they probably provided a ResponseHandler.
+    public static void doMethodExit(final ContextScope scope, final Object result, final Throwable throwable) {
+        if (scope == null) {
+            return;
+        }
+        final AgentSpan span = spanFromScope(scope);
+        if (result instanceof HttpResponse) {
+            DECORATE.onResponse(span, (HttpResponse) result);
+        } // else they probably provided a ResponseHandler.
 
-    DECORATE.onError(span, throwable);
-    DECORATE.beforeFinish(span);
-    scope.close();
-    span.finish();
-    CallDepthThreadLocalMap.reset(HttpClient.class);
-  }
+        DECORATE.onError(span, throwable);
+        DECORATE.beforeFinish(span);
+        scope.close();
+        span.finish();
+        CallDepthThreadLocalMap.reset(HttpClient.class);
+    }
 
-  public static void onBlockingRequest() {
-    CallDepthThreadLocalMap.reset(HttpClient.class);
-  }
+    public static void onBlockingRequest() {
+        CallDepthThreadLocalMap.reset(HttpClient.class);
+    }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HostAndRequestAsHttpUriRequest.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HostAndRequestAsHttpUriRequest.java
index 4d7a7ffc929..88f513c3c1a 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HostAndRequestAsHttpUriRequest.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HostAndRequestAsHttpUriRequest.java
@@ -12,63 +12,63 @@
 /** Wraps HttpHost and HttpRequest into a HttpUriRequest for decorators and injectors */
 public class HostAndRequestAsHttpUriRequest extends AbstractHttpMessage implements HttpUriRequest {
 
-  private final String method;
-  private final RequestLine requestLine;
-  private final ProtocolVersion protocolVersion;
-  private final java.net.URI uri;
+    private final String method;
+    private final RequestLine requestLine;
+    private final ProtocolVersion protocolVersion;
+    private final java.net.URI uri;
 
-  private final HttpRequest actualRequest;
+    private final HttpRequest actualRequest;
 
-  public HostAndRequestAsHttpUriRequest(final HttpHost httpHost, final HttpRequest httpRequest) {
+    public HostAndRequestAsHttpUriRequest(final HttpHost httpHost, final HttpRequest httpRequest) {
 
-    method = httpRequest.getRequestLine().getMethod();
-    requestLine = httpRequest.getRequestLine();
-    protocolVersion = requestLine.getProtocolVersion();
-    uri = URIUtils.safeConcat(httpHost.toURI(), requestLine.getUri());
-    actualRequest = httpRequest;
-  }
+        method = httpRequest.getRequestLine().getMethod();
+        requestLine = httpRequest.getRequestLine();
+        protocolVersion = requestLine.getProtocolVersion();
+        uri = URIUtils.safeConcat(httpHost.toURI(), requestLine.getUri());
+        actualRequest = httpRequest;
+    }
 
-  @Override
-  public void abort() throws UnsupportedOperationException {
-    throw new UnsupportedOperationException();
-  }
+    @Override
+    public void abort() throws UnsupportedOperationException {
+        throw new UnsupportedOperationException();
+    }
 
-  @Override
-  public boolean isAborted() {
-    return false;
-  }
+    @Override
+    public boolean isAborted() {
+        return false;
+    }
 
-  @Override
-  public void setHeader(final String name, final String value) {
-    actualRequest.setHeader(name, value);
-  }
+    @Override
+    public void setHeader(final String name, final String value) {
+        actualRequest.setHeader(name, value);
+    }
 
-  @Override
-  public String getMethod() {
-    return method;
-  }
+    @Override
+    public String getMethod() {
+        return method;
+    }
 
-  @Override
-  public RequestLine getRequestLine() {
-    return requestLine;
-  }
+    @Override
+    public RequestLine getRequestLine() {
+        return requestLine;
+    }
 
-  @Override
-  public ProtocolVersion getProtocolVersion() {
-    return protocolVersion;
-  }
+    @Override
+    public ProtocolVersion getProtocolVersion() {
+        return protocolVersion;
+    }
 
-  @Override
-  public java.net.URI getURI() {
-    return uri;
-  }
+    @Override
+    public java.net.URI getURI() {
+        return uri;
+    }
 
-  @Override
-  public Header getFirstHeader(String name) {
-    return actualRequest.getFirstHeader(name);
-  }
+    @Override
+    public Header getFirstHeader(String name) {
+        return actualRequest.getFirstHeader(name);
+    }
 
-  public HttpRequest getActualRequest() {
-    return actualRequest;
-  }
+    public HttpRequest getActualRequest() {
+        return actualRequest;
+    }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HttpHeadersInjectAdapter.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HttpHeadersInjectAdapter.java
index d677fdc1bd4..e6624afcd6e 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HttpHeadersInjectAdapter.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HttpHeadersInjectAdapter.java
@@ -7,10 +7,10 @@
 @ParametersAreNonnullByDefault
 public class HttpHeadersInjectAdapter implements CarrierSetter<HttpUriRequest> {
 
-  public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
+    public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
 
-  @Override
-  public void set(final HttpUriRequest carrier, final String key, final String value) {
-    carrier.setHeader(key, value);
-  }
+    @Override
+    public void set(final HttpUriRequest carrier, final String key, final String value) {
+        carrier.setHeader(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/WrappingStatusSettingResponseHandler.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/WrappingStatusSettingResponseHandler.java
index f27f9fda256..7d00c229401 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/WrappingStatusSettingResponseHandler.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/WrappingStatusSettingResponseHandler.java
@@ -9,20 +9,19 @@
 import org.apache.http.client.ResponseHandler;
 
 public class WrappingStatusSettingResponseHandler implements ResponseHandler {
-  final AgentSpan span;
-  final ResponseHandler handler;
+    final AgentSpan span;
+    final ResponseHandler handler;
 
-  public WrappingStatusSettingResponseHandler(final AgentSpan span, final ResponseHandler handler) {
-    this.span = span;
-    this.handler = handler;
-  }
+    public WrappingStatusSettingResponseHandler(final AgentSpan span, final ResponseHandler handler) {
+        this.span = span;
+        this.handler = handler;
+    }
 
-  @Override
-  public Object handleResponse(final HttpResponse response)
-      throws ClientProtocolException, IOException {
-    if (null != span) {
-      DECORATE.onResponse(span, response);
+    @Override
+    public Object handleResponse(final HttpResponse response) throws ClientProtocolException, IOException {
+        if (null != span) {
+            DECORATE.onResponse(span, response);
+        }
+        return handler.handleResponse(response);
     }
-    return handler.handleResponse(response);
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java
index 05c623d608d..c76ef24a984 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java
@@ -32,116 +32,112 @@
 
 @AutoService(InstrumenterModule.class)
 public class ApacheHttpAsyncClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
-
-  public ApacheHttpAsyncClientInstrumentation() {
-    super(
-        "httpasyncclient5", "apache-httpasyncclient5", "httpasyncclient", "apache-httpasyncclient");
-  }
-
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return isShortcutMatchingEnabled(false);
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient",
-      "org.apache.hc.client5.http.impl.async.AbstractHttpAsyncClientBase",
-      "org.apache.hc.client5.http.impl.async.AbstractMinimalHttpAsyncClientBase",
-      "org.apache.hc.client5.http.impl.async.MinimalHttpAsyncClient",
-      "org.apache.hc.client5.http.impl.async.MinimalH2AsyncClient",
-      "org.apache.hc.client5.http.impl.async.InternalAbstractHttpAsyncClient",
-      "org.apache.hc.client5.http.impl.async.InternalHttpAsyncClient",
-      "org.apache.hc.client5.http.impl.async.InternalH2AsyncClient"
-    };
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.hc.client5.http.async.HttpAsyncClient";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(5))
-            .and(takesArgument(0, named("org.apache.hc.core5.http.nio.AsyncRequestProducer")))
-            .and(takesArgument(1, named("org.apache.hc.core5.http.nio.AsyncResponseConsumer")))
-            .and(takesArgument(2, named("org.apache.hc.core5.http.nio.HandlerFactory")))
-            .and(takesArgument(3, named("org.apache.hc.core5.http.protocol.HttpContext")))
-            .and(takesArgument(4, named("org.apache.hc.core5.concurrent.FutureCallback"))),
-        this.getClass().getName() + "$ClientContextPropagationAdvice",
-        this.getClass().getName() + "$ClientAdvice");
-  }
-
-  @AppliesOn(CONTEXT_TRACKING)
-  @SuppressFBWarnings("UC_USELESS_OBJECT")
-  public static class ClientContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(value = 0, readOnly = false) AsyncRequestProducer requestProducer) {
-      final DelegatingRequestProducer delegatingRequestProducer =
-          new DelegatingRequestProducer(requestProducer);
-      delegatingRequestProducer.setInjectContext(true);
-      requestProducer = delegatingRequestProducer;
+        implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
+
+    public ApacheHttpAsyncClientInstrumentation() {
+        super("httpasyncclient5", "apache-httpasyncclient5", "httpasyncclient", "apache-httpasyncclient");
+    }
+
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return isShortcutMatchingEnabled(false);
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient",
+            "org.apache.hc.client5.http.impl.async.AbstractHttpAsyncClientBase",
+            "org.apache.hc.client5.http.impl.async.AbstractMinimalHttpAsyncClientBase",
+            "org.apache.hc.client5.http.impl.async.MinimalHttpAsyncClient",
+            "org.apache.hc.client5.http.impl.async.MinimalH2AsyncClient",
+            "org.apache.hc.client5.http.impl.async.InternalAbstractHttpAsyncClient",
+            "org.apache.hc.client5.http.impl.async.InternalHttpAsyncClient",
+            "org.apache.hc.client5.http.impl.async.InternalH2AsyncClient"
+        };
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.hc.client5.http.async.HttpAsyncClient";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(5))
+                        .and(takesArgument(0, named("org.apache.hc.core5.http.nio.AsyncRequestProducer")))
+                        .and(takesArgument(1, named("org.apache.hc.core5.http.nio.AsyncResponseConsumer")))
+                        .and(takesArgument(2, named("org.apache.hc.core5.http.nio.HandlerFactory")))
+                        .and(takesArgument(3, named("org.apache.hc.core5.http.protocol.HttpContext")))
+                        .and(takesArgument(4, named("org.apache.hc.core5.concurrent.FutureCallback"))),
+                this.getClass().getName() + "$ClientContextPropagationAdvice",
+                this.getClass().getName() + "$ClientAdvice");
     }
-  }
 
-  public static class ClientAdvice {
+    @AppliesOn(CONTEXT_TRACKING)
     @SuppressFBWarnings("UC_USELESS_OBJECT")
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.Argument(value = 0, readOnly = false) AsyncRequestProducer requestProducer,
-        @Advice.Argument(value = 3, readOnly = false) HttpContext context,
-        @Advice.Argument(value = 4, readOnly = false) FutureCallback<?> futureCallback) {
-
-      final ContextContinuation parentContinuation = currentContext().capture();
-      final AgentSpan clientSpan = startSpan(APACHE_HTTP_CLIENT.toString(), HTTP_REQUEST);
-      final ContextScope clientScope = activateSpan(clientSpan);
-      DECORATE.afterStart(clientSpan);
-
-      if (context == null) {
-        context = new BasicHttpContext();
-      }
-
-      if (!(requestProducer instanceof DelegatingRequestProducer)) {
-        requestProducer = new DelegatingRequestProducer(requestProducer);
-      }
-
-      ((DelegatingRequestProducer) requestProducer).setSpan(clientSpan);
-      futureCallback =
-          new TraceContinuedFutureCallback<>(
-              parentContinuation, clientSpan, context, futureCallback);
-
-      return clientScope;
+    public static class ClientContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(value = 0, readOnly = false) AsyncRequestProducer requestProducer) {
+            final DelegatingRequestProducer delegatingRequestProducer = new DelegatingRequestProducer(requestProducer);
+            delegatingRequestProducer.setInjectContext(true);
+            requestProducer = delegatingRequestProducer;
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return final Object result,
-        @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      final AgentSpan span = spanFromScope(scope);
-      if (throwable != null) {
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
+    public static class ClientAdvice {
+        @SuppressFBWarnings("UC_USELESS_OBJECT")
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.Argument(value = 0, readOnly = false) AsyncRequestProducer requestProducer,
+                @Advice.Argument(value = 3, readOnly = false) HttpContext context,
+                @Advice.Argument(value = 4, readOnly = false) FutureCallback<?> futureCallback) {
+
+            final ContextContinuation parentContinuation = currentContext().capture();
+            final AgentSpan clientSpan = startSpan(APACHE_HTTP_CLIENT.toString(), HTTP_REQUEST);
+            final ContextScope clientScope = activateSpan(clientSpan);
+            DECORATE.afterStart(clientSpan);
+
+            if (context == null) {
+                context = new BasicHttpContext();
+            }
+
+            if (!(requestProducer instanceof DelegatingRequestProducer)) {
+                requestProducer = new DelegatingRequestProducer(requestProducer);
+            }
+
+            ((DelegatingRequestProducer) requestProducer).setSpan(clientSpan);
+            futureCallback =
+                    new TraceContinuedFutureCallback<>(parentContinuation, clientSpan, context, futureCallback);
+
+            return clientScope;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return final Object result,
+                @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            final AgentSpan span = spanFromScope(scope);
+            if (throwable != null) {
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientDecorator.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientDecorator.java
index 78d7958d6f6..f725b39e0af 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientDecorator.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientDecorator.java
@@ -10,63 +10,62 @@
 
 public class ApacheHttpClientDecorator extends HttpClientDecorator<HttpRequest, HttpResponse> {
 
-  public static final CharSequence APACHE_HTTP_CLIENT =
-      UTF8BytesString.create("apache-httpclient5");
-  public static final ApacheHttpClientDecorator DECORATE = new ApacheHttpClientDecorator();
-  public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+    public static final CharSequence APACHE_HTTP_CLIENT = UTF8BytesString.create("apache-httpclient5");
+    public static final ApacheHttpClientDecorator DECORATE = new ApacheHttpClientDecorator();
+    public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {
-      "httpclient5",
-      "apache-httpclient5",
-      "apache-http-client5",
-      "httpclient",
-      "apache-httpclient",
-      "apache-http-client"
-    };
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {
+            "httpclient5",
+            "apache-httpclient5",
+            "apache-http-client5",
+            "httpclient",
+            "apache-httpclient",
+            "apache-http-client"
+        };
+    }
 
-  @Override
-  protected CharSequence component() {
-    return APACHE_HTTP_CLIENT;
-  }
+    @Override
+    protected CharSequence component() {
+        return APACHE_HTTP_CLIENT;
+    }
 
-  @Override
-  protected String method(final HttpRequest httpRequest) {
-    return httpRequest.getMethod();
-  }
+    @Override
+    protected String method(final HttpRequest httpRequest) {
+        return httpRequest.getMethod();
+    }
 
-  @Override
-  protected URI url(final HttpRequest request) throws URISyntaxException {
-    return request.getUri();
-  }
+    @Override
+    protected URI url(final HttpRequest request) throws URISyntaxException {
+        return request.getUri();
+    }
 
-  @Override
-  protected HttpRequest sourceUrl(final HttpRequest request) {
-    return request;
-  }
+    @Override
+    protected HttpRequest sourceUrl(final HttpRequest request) {
+        return request;
+    }
 
-  @Override
-  protected int status(final HttpResponse httpResponse) {
-    return httpResponse.getCode();
-  }
+    @Override
+    protected int status(final HttpResponse httpResponse) {
+        return httpResponse.getCode();
+    }
 
-  @Override
-  protected String getRequestHeader(HttpRequest request, String headerName) {
-    Header header = request.getFirstHeader(headerName);
-    if (null != header) {
-      return header.getValue();
+    @Override
+    protected String getRequestHeader(HttpRequest request, String headerName) {
+        Header header = request.getFirstHeader(headerName);
+        if (null != header) {
+            return header.getValue();
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Override
-  protected String getResponseHeader(HttpResponse response, String headerName) {
-    Header header = response.getFirstHeader(headerName);
-    if (null != header) {
-      return header.getValue();
+    @Override
+    protected String getResponseHeader(HttpResponse response, String headerName) {
+        Header header = response.getFirstHeader(headerName);
+        if (null != header) {
+            return header.getValue();
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java
index d283f2715b3..bdfdbd39a9f 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java
@@ -25,186 +25,180 @@
 
 @AutoService(InstrumenterModule.class)
 public class ApacheHttpClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
-
-  public ApacheHttpClientInstrumentation() {
-    super(
-        "httpclient5",
-        "apache-httpclient5",
-        "apache-http-client5",
-        "httpclient",
-        "apache-httpclient",
-        "apache-http-client");
-  }
-
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return isShortcutMatchingEnabled(false);
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.apache.hc.client5.http.impl.classic.CloseableHttpClient",
-      "org.apache.hc.client5.http.impl.classic.MinimalHttpClient"
-    };
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.hc.client5.http.classic.HttpClient";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("org.apache.hc.core5.http.ClassicHttpRequest"))),
-        ApacheHttpClientInstrumentation.class.getName() + "$RequestAdvice",
-        ApacheHttpClientInstrumentation.class.getName() + "$ContextPropagationAdviceArg0");
-
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("org.apache.hc.core5.http.ClassicHttpRequest")))
-            .and(takesArgument(1, named("org.apache.hc.core5.http.protocol.HttpContext"))),
-        ApacheHttpClientInstrumentation.class.getName() + "$RequestAdvice",
-        ApacheHttpClientInstrumentation.class.getName() + "$ContextPropagationAdviceArg0");
-
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("org.apache.hc.core5.http.HttpHost")))
-            .and(takesArgument(1, named("org.apache.hc.core5.http.ClassicHttpRequest")))
-            .and(takesArgument(2, named("org.apache.hc.core5.http.protocol.HttpContext"))),
-        ApacheHttpClientInstrumentation.class.getName() + "$HostRequestAdvice",
-        ApacheHttpClientInstrumentation.class.getName() + "$ContextPropagationAdviceArg1");
-
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("org.apache.hc.core5.http.HttpHost")))
-            .and(takesArgument(1, named("org.apache.hc.core5.http.ClassicHttpRequest"))),
-        ApacheHttpClientInstrumentation.class.getName() + "$HostRequestAdvice",
-        ApacheHttpClientInstrumentation.class.getName() + "$ContextPropagationAdviceArg1");
-
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(4))
-            .and(takesArgument(0, named("org.apache.hc.core5.http.HttpHost")))
-            .and(takesArgument(1, named("org.apache.hc.core5.http.ClassicHttpRequest")))
-            .and(takesArgument(2, named("org.apache.hc.core5.http.protocol.HttpContext")))
-            .and(takesArgument(3, named("org.apache.hc.core5.http.io.HttpClientResponseHandler"))),
-        ApacheHttpClientInstrumentation.class.getName() + "$ResponseHandlerAdvice",
-        ApacheHttpClientInstrumentation.class.getName() + "$ContextPropagationAdviceArg1");
-  }
-
-  public static class RequestAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(@Advice.Argument(0) final ClassicHttpRequest request) {
-      try {
-        return HelperMethods.doMethodEnter(request);
-      } catch (BlockingException e) {
-        HelperMethods.onBlockingRequest();
-        // re-throw blocking exceptions
-        throw e;
-      }
+        implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
+
+    public ApacheHttpClientInstrumentation() {
+        super(
+                "httpclient5",
+                "apache-httpclient5",
+                "apache-http-client5",
+                "httpclient",
+                "apache-httpclient",
+                "apache-http-client");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return final Object result,
-        @Advice.Thrown final Throwable throwable) {
-      HelperMethods.doMethodExit(scope, result, throwable);
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return isShortcutMatchingEnabled(false);
     }
-  }
-
-  public static class HostRequestAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.Argument(0) final HttpHost host,
-        @Advice.Argument(1) final ClassicHttpRequest request) {
-      try {
-        return HelperMethods.doMethodEnter(host, request);
-      } catch (BlockingException e) {
-        HelperMethods.onBlockingRequest();
-        // re-throw blocking exceptions
-        throw e;
-      }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.apache.hc.client5.http.impl.classic.CloseableHttpClient",
+            "org.apache.hc.client5.http.impl.classic.MinimalHttpClient"
+        };
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.hc.client5.http.classic.HttpClient";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return final Object result,
-        @Advice.Thrown final Throwable throwable) {
-      HelperMethods.doMethodExit(scope, result, throwable);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("org.apache.hc.core5.http.ClassicHttpRequest"))),
+                ApacheHttpClientInstrumentation.class.getName() + "$RequestAdvice",
+                ApacheHttpClientInstrumentation.class.getName() + "$ContextPropagationAdviceArg0");
+
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("org.apache.hc.core5.http.ClassicHttpRequest")))
+                        .and(takesArgument(1, named("org.apache.hc.core5.http.protocol.HttpContext"))),
+                ApacheHttpClientInstrumentation.class.getName() + "$RequestAdvice",
+                ApacheHttpClientInstrumentation.class.getName() + "$ContextPropagationAdviceArg0");
+
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("org.apache.hc.core5.http.HttpHost")))
+                        .and(takesArgument(1, named("org.apache.hc.core5.http.ClassicHttpRequest")))
+                        .and(takesArgument(2, named("org.apache.hc.core5.http.protocol.HttpContext"))),
+                ApacheHttpClientInstrumentation.class.getName() + "$HostRequestAdvice",
+                ApacheHttpClientInstrumentation.class.getName() + "$ContextPropagationAdviceArg1");
+
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("org.apache.hc.core5.http.HttpHost")))
+                        .and(takesArgument(1, named("org.apache.hc.core5.http.ClassicHttpRequest"))),
+                ApacheHttpClientInstrumentation.class.getName() + "$HostRequestAdvice",
+                ApacheHttpClientInstrumentation.class.getName() + "$ContextPropagationAdviceArg1");
+
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(4))
+                        .and(takesArgument(0, named("org.apache.hc.core5.http.HttpHost")))
+                        .and(takesArgument(1, named("org.apache.hc.core5.http.ClassicHttpRequest")))
+                        .and(takesArgument(2, named("org.apache.hc.core5.http.protocol.HttpContext")))
+                        .and(takesArgument(3, named("org.apache.hc.core5.http.io.HttpClientResponseHandler"))),
+                ApacheHttpClientInstrumentation.class.getName() + "$ResponseHandlerAdvice",
+                ApacheHttpClientInstrumentation.class.getName() + "$ContextPropagationAdviceArg1");
+    }
+
+    public static class RequestAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(@Advice.Argument(0) final ClassicHttpRequest request) {
+            try {
+                return HelperMethods.doMethodEnter(request);
+            } catch (BlockingException e) {
+                HelperMethods.onBlockingRequest();
+                // re-throw blocking exceptions
+                throw e;
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return final Object result,
+                @Advice.Thrown final Throwable throwable) {
+            HelperMethods.doMethodExit(scope, result, throwable);
+        }
     }
-  }
-
-  public static class ResponseHandlerAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.Argument(0) final HttpHost host,
-        @Advice.Argument(1) final ClassicHttpRequest request,
-        @Advice.Argument(2) final HttpContext context,
-        @Advice.Argument(
-                value = 3,
-                optional = true,
-                typing = Assigner.Typing.DYNAMIC,
-                readOnly = false)
-            Object handler) {
-      try {
-        final ContextScope scope = HelperMethods.doMethodEnter(host, request);
-        // Wrap the handler so we capture the status code
-        if (null != scope && handler instanceof HttpClientResponseHandler) {
-          handler =
-              new WrappingStatusSettingResponseHandler(
-                  spanFromScope(scope), (HttpClientResponseHandler) handler);
+
+    public static class HostRequestAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.Argument(0) final HttpHost host, @Advice.Argument(1) final ClassicHttpRequest request) {
+            try {
+                return HelperMethods.doMethodEnter(host, request);
+            } catch (BlockingException e) {
+                HelperMethods.onBlockingRequest();
+                // re-throw blocking exceptions
+                throw e;
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return final Object result,
+                @Advice.Thrown final Throwable throwable) {
+            HelperMethods.doMethodExit(scope, result, throwable);
         }
-        return scope;
-      } catch (BlockingException e) {
-        HelperMethods.onBlockingRequest();
-        // re-throw blocking exceptions
-        throw e;
-      }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return final Object result,
-        @Advice.Thrown final Throwable throwable) {
-      HelperMethods.doMethodExit(scope, result, throwable);
+    public static class ResponseHandlerAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.Argument(0) final HttpHost host,
+                @Advice.Argument(1) final ClassicHttpRequest request,
+                @Advice.Argument(2) final HttpContext context,
+                @Advice.Argument(value = 3, optional = true, typing = Assigner.Typing.DYNAMIC, readOnly = false)
+                        Object handler) {
+            try {
+                final ContextScope scope = HelperMethods.doMethodEnter(host, request);
+                // Wrap the handler so we capture the status code
+                if (null != scope && handler instanceof HttpClientResponseHandler) {
+                    handler = new WrappingStatusSettingResponseHandler(
+                            spanFromScope(scope), (HttpClientResponseHandler) handler);
+                }
+                return scope;
+            } catch (BlockingException e) {
+                HelperMethods.onBlockingRequest();
+                // re-throw blocking exceptions
+                throw e;
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return final Object result,
+                @Advice.Thrown final Throwable throwable) {
+            HelperMethods.doMethodExit(scope, result, throwable);
+        }
     }
-  }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextPropagationAdviceArg0 {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(@Advice.Argument(0) final ClassicHttpRequest request) {
-      HelperMethods.doInjectContext(request);
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextPropagationAdviceArg0 {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter(@Advice.Argument(0) final ClassicHttpRequest request) {
+            HelperMethods.doInjectContext(request);
+        }
     }
-  }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextPropagationAdviceArg1 {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(@Advice.Argument(1) final ClassicHttpRequest request) {
-      HelperMethods.doInjectContext(request);
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextPropagationAdviceArg1 {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter(@Advice.Argument(1) final ClassicHttpRequest request) {
+            HelperMethods.doInjectContext(request);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestChannel.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestChannel.java
index 367e3b45a84..58ebcdff7e0 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestChannel.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestChannel.java
@@ -13,24 +13,23 @@
 import org.apache.hc.core5.http.protocol.HttpContext;
 
 public class DelegatingRequestChannel implements RequestChannel {
-  private final RequestChannel delegate;
-  private final AgentSpan span;
-  private final boolean injectContext;
+    private final RequestChannel delegate;
+    private final AgentSpan span;
+    private final boolean injectContext;
 
-  public DelegatingRequestChannel(
-      RequestChannel requestChannel, AgentSpan span, boolean injectContext) {
-    this.delegate = requestChannel;
-    this.span = span;
-    this.injectContext = injectContext;
-  }
+    public DelegatingRequestChannel(RequestChannel requestChannel, AgentSpan span, boolean injectContext) {
+        this.delegate = requestChannel;
+        this.span = span;
+        this.injectContext = injectContext;
+    }
 
-  @Override
-  public void sendRequest(HttpRequest request, EntityDetails entityDetails, HttpContext context)
-      throws HttpException, IOException {
-    DECORATE.onRequest(span, request);
-    if (injectContext) {
-      DECORATE.injectContext(current().with(span), request, SETTER);
+    @Override
+    public void sendRequest(HttpRequest request, EntityDetails entityDetails, HttpContext context)
+            throws HttpException, IOException {
+        DECORATE.onRequest(span, request);
+        if (injectContext) {
+            DECORATE.injectContext(current().with(span), request, SETTER);
+        }
+        delegate.sendRequest(request, entityDetails, context);
     }
-    delegate.sendRequest(request, entityDetails, context);
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestProducer.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestProducer.java
index 50ecf1b729b..0b29003901d 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestProducer.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestProducer.java
@@ -9,52 +9,50 @@
 import org.apache.hc.core5.http.protocol.HttpContext;
 
 public class DelegatingRequestProducer implements AsyncRequestProducer {
-  AgentSpan span;
-  final AsyncRequestProducer delegate;
-  boolean injectContext = false;
-
-  public DelegatingRequestProducer(final AsyncRequestProducer delegate) {
-    this.delegate = delegate;
-  }
-
-  public void setSpan(AgentSpan span) {
-    this.span = span;
-  }
-
-  public void setInjectContext(boolean injectContext) {
-    this.injectContext = injectContext;
-  }
-
-  @Override
-  public void failed(final Exception ex) {
-    delegate.failed(ex);
-  }
-
-  @Override
-  public void sendRequest(RequestChannel channel, HttpContext context)
-      throws HttpException, IOException {
-    DelegatingRequestChannel requestChannel =
-        new DelegatingRequestChannel(channel, span, injectContext);
-    delegate.sendRequest(requestChannel, context);
-  }
-
-  @Override
-  public boolean isRepeatable() {
-    return delegate.isRepeatable();
-  }
-
-  @Override
-  public int available() {
-    return delegate.available();
-  }
-
-  @Override
-  public void produce(DataStreamChannel channel) throws IOException {
-    delegate.produce(channel);
-  }
-
-  @Override
-  public void releaseResources() {
-    delegate.releaseResources();
-  }
+    AgentSpan span;
+    final AsyncRequestProducer delegate;
+    boolean injectContext = false;
+
+    public DelegatingRequestProducer(final AsyncRequestProducer delegate) {
+        this.delegate = delegate;
+    }
+
+    public void setSpan(AgentSpan span) {
+        this.span = span;
+    }
+
+    public void setInjectContext(boolean injectContext) {
+        this.injectContext = injectContext;
+    }
+
+    @Override
+    public void failed(final Exception ex) {
+        delegate.failed(ex);
+    }
+
+    @Override
+    public void sendRequest(RequestChannel channel, HttpContext context) throws HttpException, IOException {
+        DelegatingRequestChannel requestChannel = new DelegatingRequestChannel(channel, span, injectContext);
+        delegate.sendRequest(requestChannel, context);
+    }
+
+    @Override
+    public boolean isRepeatable() {
+        return delegate.isRepeatable();
+    }
+
+    @Override
+    public int available() {
+        return delegate.available();
+    }
+
+    @Override
+    public void produce(DataStreamChannel channel) throws IOException {
+        delegate.produce(channel);
+    }
+
+    @Override
+    public void releaseResources() {
+        delegate.releaseResources();
+    }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java
index c4d5b6a2ac6..9027b60ff81 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java
@@ -18,59 +18,58 @@
 import org.apache.hc.core5.http.HttpResponse;
 
 public class HelperMethods {
-  public static ContextScope doMethodEnter(final HttpRequest request) {
-    final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class);
-    if (callDepth > 0) {
-      return null;
-    }
-
-    return activateHttpSpan(request);
-  }
+    public static ContextScope doMethodEnter(final HttpRequest request) {
+        final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class);
+        if (callDepth > 0) {
+            return null;
+        }
 
-  public static ContextScope doMethodEnter(HttpHost host, HttpRequest request) {
-    final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class);
-    if (callDepth > 0) {
-      return null;
+        return activateHttpSpan(request);
     }
 
-    return activateHttpSpan(new HostAndRequestAsHttpUriRequest(host, request));
-  }
+    public static ContextScope doMethodEnter(HttpHost host, HttpRequest request) {
+        final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class);
+        if (callDepth > 0) {
+            return null;
+        }
 
-  private static ContextScope activateHttpSpan(final HttpRequest request) {
-    final AgentSpan span = startSpan(APACHE_HTTP_CLIENT.toString(), HTTP_REQUEST);
-    final ContextScope scope = activateSpan(span);
+        return activateHttpSpan(new HostAndRequestAsHttpUriRequest(host, request));
+    }
 
-    DECORATE.afterStart(span);
-    DECORATE.onRequest(span, request);
+    private static ContextScope activateHttpSpan(final HttpRequest request) {
+        final AgentSpan span = startSpan(APACHE_HTTP_CLIENT.toString(), HTTP_REQUEST);
+        final ContextScope scope = activateSpan(span);
 
-    return scope;
-  }
+        DECORATE.afterStart(span);
+        DECORATE.onRequest(span, request);
 
-  public static void doInjectContext(final HttpRequest request) {
-    if (request.containsHeader("amz-sdk-invocation-id")) {
-      return;
+        return scope;
     }
-    DECORATE.injectContext(current(), request, SETTER);
-  }
 
-  public static void doMethodExit(
-      final ContextScope scope, final Object result, final Throwable throwable) {
-    if (scope == null) {
-      return;
+    public static void doInjectContext(final HttpRequest request) {
+        if (request.containsHeader("amz-sdk-invocation-id")) {
+            return;
+        }
+        DECORATE.injectContext(current(), request, SETTER);
     }
-    final AgentSpan span = spanFromScope(scope);
-    if (result instanceof HttpResponse) {
-      DECORATE.onResponse(span, (HttpResponse) result);
-    } // else they probably provided a ResponseHandler.
 
-    DECORATE.onError(span, throwable);
-    DECORATE.beforeFinish(span);
-    scope.close();
-    span.finish();
-    CallDepthThreadLocalMap.reset(HttpClient.class);
-  }
+    public static void doMethodExit(final ContextScope scope, final Object result, final Throwable throwable) {
+        if (scope == null) {
+            return;
+        }
+        final AgentSpan span = spanFromScope(scope);
+        if (result instanceof HttpResponse) {
+            DECORATE.onResponse(span, (HttpResponse) result);
+        } // else they probably provided a ResponseHandler.
 
-  public static void onBlockingRequest() {
-    CallDepthThreadLocalMap.reset(HttpClient.class);
-  }
+        DECORATE.onError(span, throwable);
+        DECORATE.beforeFinish(span);
+        scope.close();
+        span.finish();
+        CallDepthThreadLocalMap.reset(HttpClient.class);
+    }
+
+    public static void onBlockingRequest() {
+        CallDepthThreadLocalMap.reset(HttpClient.class);
+    }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HostAndRequestAsHttpUriRequest.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HostAndRequestAsHttpUriRequest.java
index da3045f8b45..6f71c2e3e25 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HostAndRequestAsHttpUriRequest.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HostAndRequestAsHttpUriRequest.java
@@ -11,32 +11,32 @@
 /** Wraps HttpHost and HttpRequest into a HttpUriRequest for decorators and injectors */
 public class HostAndRequestAsHttpUriRequest extends BasicClassicHttpRequest {
 
-  private final HttpRequest actualRequest;
+    private final HttpRequest actualRequest;
 
-  public HostAndRequestAsHttpUriRequest(final HttpHost httpHost, final HttpRequest httpRequest) {
-    super(httpRequest.getMethod(), httpHost, httpRequest.getPath());
-    actualRequest = httpRequest;
-    // Propagate in case the host or request is tainted
-    PropagationUtils.taintObjectIfTainted(this, httpHost);
-    PropagationUtils.taintObjectIfTainted(this, httpRequest);
-  }
+    public HostAndRequestAsHttpUriRequest(final HttpHost httpHost, final HttpRequest httpRequest) {
+        super(httpRequest.getMethod(), httpHost, httpRequest.getPath());
+        actualRequest = httpRequest;
+        // Propagate in case the host or request is tainted
+        PropagationUtils.taintObjectIfTainted(this, httpHost);
+        PropagationUtils.taintObjectIfTainted(this, httpRequest);
+    }
 
-  @Override
-  public URI getUri() throws URISyntaxException {
-    URI uri = super.getUri();
-    if (uri != null && uri.getHost() != null) {
-      return uri;
+    @Override
+    public URI getUri() throws URISyntaxException {
+        URI uri = super.getUri();
+        if (uri != null && uri.getHost() != null) {
+            return uri;
+        }
+        return actualRequest.getUri();
     }
-    return actualRequest.getUri();
-  }
 
-  @Override
-  public void setHeader(String name, Object value) {
-    actualRequest.setHeader(name, value);
-  }
+    @Override
+    public void setHeader(String name, Object value) {
+        actualRequest.setHeader(name, value);
+    }
 
-  @Override
-  public Header getFirstHeader(String name) {
-    return actualRequest.getFirstHeader(name);
-  }
+    @Override
+    public Header getFirstHeader(String name) {
+        return actualRequest.getFirstHeader(name);
+    }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HttpHeadersInjectAdapter.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HttpHeadersInjectAdapter.java
index 30f945432ef..d000b790db5 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HttpHeadersInjectAdapter.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HttpHeadersInjectAdapter.java
@@ -7,10 +7,10 @@
 @ParametersAreNonnullByDefault
 public class HttpHeadersInjectAdapter implements CarrierSetter<HttpRequest> {
 
-  public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
+    public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
 
-  @Override
-  public void set(final HttpRequest carrier, final String key, final String value) {
-    carrier.setHeader(key, value);
-  }
+    @Override
+    public void set(final HttpRequest carrier, final String key, final String value) {
+        carrier.setHeader(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/IastHttpUriRequestBaseInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/IastHttpUriRequestBaseInstrumentation.java
index 41483b459d3..8ca051dfc41 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/IastHttpUriRequestBaseInstrumentation.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/IastHttpUriRequestBaseInstrumentation.java
@@ -16,40 +16,37 @@
 
 @AutoService(InstrumenterModule.class)
 public class IastHttpUriRequestBaseInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
-
-  public IastHttpUriRequestBaseInstrumentation() {
-    super("apache-httpclient", "httpclient5");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.hc.client5.http.classic.methods.HttpUriRequestBase";
-  }
-
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArguments(String.class, URI.class)),
-        IastHttpUriRequestBaseInstrumentation.class.getName() + "$CtorAdvice");
-  }
-
-  public static class CtorAdvice {
-    @Advice.OnMethodExit()
-    @Propagation
-    public static void afterCtor(
-        @Advice.This final HttpUriRequestBase self, @Advice.Argument(1) final URI uri) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        module.taintObjectIfTainted(self, uri);
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
+
+    public IastHttpUriRequestBaseInstrumentation() {
+        super("apache-httpclient", "httpclient5");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.apache.hc.client5.http.classic.methods.HttpUriRequestBase";
+    }
+
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArguments(String.class, URI.class)),
+                IastHttpUriRequestBaseInstrumentation.class.getName() + "$CtorAdvice");
+    }
+
+    public static class CtorAdvice {
+        @Advice.OnMethodExit()
+        @Propagation
+        public static void afterCtor(@Advice.This final HttpUriRequestBase self, @Advice.Argument(1) final URI uri) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                module.taintObjectIfTainted(self, uri);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java
index 771ee21a4a1..e9877944119 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java
@@ -13,98 +13,98 @@
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 
 public class TraceContinuedFutureCallback<T> implements FutureCallback<T> {
-  private final ContextContinuation parentContinuation;
-  private final AgentSpan clientSpan;
-  private final HttpContext context;
-  private final FutureCallback<T> delegate;
+    private final ContextContinuation parentContinuation;
+    private final AgentSpan clientSpan;
+    private final HttpContext context;
+    private final FutureCallback<T> delegate;
 
-  public TraceContinuedFutureCallback(
-      final ContextContinuation parentContinuation,
-      final AgentSpan clientSpan,
-      final HttpContext context,
-      final FutureCallback<T> delegate) {
-    this.parentContinuation = parentContinuation;
-    this.clientSpan = clientSpan;
-    this.context = context;
-    // Note: this can be null in real life, so we have to handle this carefully
-    this.delegate = delegate;
-  }
+    public TraceContinuedFutureCallback(
+            final ContextContinuation parentContinuation,
+            final AgentSpan clientSpan,
+            final HttpContext context,
+            final FutureCallback<T> delegate) {
+        this.parentContinuation = parentContinuation;
+        this.clientSpan = clientSpan;
+        this.context = context;
+        // Note: this can be null in real life, so we have to handle this carefully
+        this.delegate = delegate;
+    }
 
-  @Override
-  public void completed(final T result) {
-    DECORATE.onResponse(clientSpan, extractHttpResponse(result));
-    DECORATE.beforeFinish(clientSpan);
-    clientSpan.finish(); // Finish span before calling delegate
+    @Override
+    public void completed(final T result) {
+        DECORATE.onResponse(clientSpan, extractHttpResponse(result));
+        DECORATE.beforeFinish(clientSpan);
+        clientSpan.finish(); // Finish span before calling delegate
 
-    if (parentContinuation.context() == Context.root()) {
-      completeDelegate(result);
-    } else {
-      try (final ContextScope scope = parentContinuation.resume()) {
-        completeDelegate(result);
-      }
+        if (parentContinuation.context() == Context.root()) {
+            completeDelegate(result);
+        } else {
+            try (final ContextScope scope = parentContinuation.resume()) {
+                completeDelegate(result);
+            }
+        }
     }
-  }
 
-  @Override
-  public void failed(final Exception ex) {
-    DECORATE.onResponse(clientSpan, extractHttpResponse(null));
-    DECORATE.onError(clientSpan, ex);
-    DECORATE.beforeFinish(clientSpan);
-    clientSpan.finish(); // Finish span before calling delegate
+    @Override
+    public void failed(final Exception ex) {
+        DECORATE.onResponse(clientSpan, extractHttpResponse(null));
+        DECORATE.onError(clientSpan, ex);
+        DECORATE.beforeFinish(clientSpan);
+        clientSpan.finish(); // Finish span before calling delegate
 
-    if (parentContinuation.context() == Context.root()) {
-      failDelegate(ex);
-    } else {
-      try (final ContextScope scope = parentContinuation.resume()) {
-        failDelegate(ex);
-      }
+        if (parentContinuation.context() == Context.root()) {
+            failDelegate(ex);
+        } else {
+            try (final ContextScope scope = parentContinuation.resume()) {
+                failDelegate(ex);
+            }
+        }
     }
-  }
 
-  @Override
-  public void cancelled() {
-    DECORATE.onResponse(clientSpan, extractHttpResponse(null));
-    DECORATE.beforeFinish(clientSpan);
-    clientSpan.finish(); // Finish span before calling delegate
+    @Override
+    public void cancelled() {
+        DECORATE.onResponse(clientSpan, extractHttpResponse(null));
+        DECORATE.beforeFinish(clientSpan);
+        clientSpan.finish(); // Finish span before calling delegate
 
-    if (parentContinuation.context() == Context.root()) {
-      cancelDelegate();
-    } else {
-      try (final ContextScope scope = parentContinuation.resume()) {
-        cancelDelegate();
-      }
+        if (parentContinuation.context() == Context.root()) {
+            cancelDelegate();
+        } else {
+            try (final ContextScope scope = parentContinuation.resume()) {
+                cancelDelegate();
+            }
+        }
     }
-  }
 
-  private void completeDelegate(final T result) {
-    if (delegate != null) {
-      delegate.completed(result);
+    private void completeDelegate(final T result) {
+        if (delegate != null) {
+            delegate.completed(result);
+        }
     }
-  }
 
-  private void failDelegate(final Exception ex) {
-    if (delegate != null) {
-      delegate.failed(ex);
+    private void failDelegate(final Exception ex) {
+        if (delegate != null) {
+            delegate.failed(ex);
+        }
     }
-  }
 
-  private void cancelDelegate() {
-    if (delegate != null) {
-      delegate.cancelled();
+    private void cancelDelegate() {
+        if (delegate != null) {
+            delegate.cancelled();
+        }
     }
-  }
 
-  @Nullable
-  private HttpResponse extractHttpResponse(Object futureResult) {
-    if (context != null) {
-      Object fromContext = context.getAttribute(HttpCoreContext.HTTP_RESPONSE);
-      if (fromContext instanceof HttpResponse) {
-        return (HttpResponse) fromContext;
-      }
-    }
-    if (futureResult instanceof HttpResponse) {
-      return (HttpResponse) futureResult;
+    @Nullable
+    private HttpResponse extractHttpResponse(Object futureResult) {
+        if (context != null) {
+            Object fromContext = context.getAttribute(HttpCoreContext.HTTP_RESPONSE);
+            if (fromContext instanceof HttpResponse) {
+                return (HttpResponse) fromContext;
+            }
+        }
+        if (futureResult instanceof HttpResponse) {
+            return (HttpResponse) futureResult;
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/WrappingStatusSettingResponseHandler.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/WrappingStatusSettingResponseHandler.java
index 98aaf9f291f..b3e911485e0 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/WrappingStatusSettingResponseHandler.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/WrappingStatusSettingResponseHandler.java
@@ -9,21 +9,19 @@
 import org.apache.hc.core5.http.io.HttpClientResponseHandler;
 
 public class WrappingStatusSettingResponseHandler implements HttpClientResponseHandler {
-  final AgentSpan span;
-  final HttpClientResponseHandler handler;
+    final AgentSpan span;
+    final HttpClientResponseHandler handler;
 
-  public WrappingStatusSettingResponseHandler(
-      final AgentSpan span, final HttpClientResponseHandler handler) {
-    this.span = span;
-    this.handler = handler;
-  }
+    public WrappingStatusSettingResponseHandler(final AgentSpan span, final HttpClientResponseHandler handler) {
+        this.span = span;
+        this.handler = handler;
+    }
 
-  @Override
-  public Object handleResponse(final ClassicHttpResponse response)
-      throws HttpException, IOException {
-    if (null != span) {
-      DECORATE.onResponse(span, response);
+    @Override
+    public Object handleResponse(final ClassicHttpResponse response) throws HttpException, IOException {
+        if (null != span) {
+            DECORATE.onResponse(span, response);
+        }
+        return handler.handleResponse(response);
     }
-    return handler.handleResponse(response);
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/src/main/java/datadog/trace/instrumentation/apachehttpcore/IastHttpHostInstrumentation.java b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/src/main/java/datadog/trace/instrumentation/apachehttpcore/IastHttpHostInstrumentation.java
index 07be588f80c..4b3f0edd9d9 100644
--- a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/src/main/java/datadog/trace/instrumentation/apachehttpcore/IastHttpHostInstrumentation.java
+++ b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/src/main/java/datadog/trace/instrumentation/apachehttpcore/IastHttpHostInstrumentation.java
@@ -16,47 +16,46 @@
 
 @AutoService(InstrumenterModule.class)
 public class IastHttpHostInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public IastHttpHostInstrumentation() {
-    super("httpcore", "apache-httpcore", "apache-http-core");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.http.HttpHost";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArguments(String.class, int.class, String.class)),
-        IastHttpHostInstrumentation.class.getName() + "$CtorAdvice");
-    transformer.applyAdvice(
-        named("toURI").and(isMethod()).and(takesArguments(0)),
-        IastHttpHostInstrumentation.class.getName() + "$ToUriAdvice");
-  }
-
-  public static class CtorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void afterCtor(
-        @Advice.This final Object self, @Advice.Argument(0) final Object argument) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        module.taintObjectIfTainted(self, argument);
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public IastHttpHostInstrumentation() {
+        super("httpcore", "apache-httpcore", "apache-http-core");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.apache.http.HttpHost";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArguments(String.class, int.class, String.class)),
+                IastHttpHostInstrumentation.class.getName() + "$CtorAdvice");
+        transformer.applyAdvice(
+                named("toURI").and(isMethod()).and(takesArguments(0)),
+                IastHttpHostInstrumentation.class.getName() + "$ToUriAdvice");
+    }
+
+    public static class CtorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void afterCtor(@Advice.This final Object self, @Advice.Argument(0) final Object argument) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                module.taintObjectIfTainted(self, argument);
+            }
+        }
     }
-  }
-
-  public static class ToUriAdvice {
-    @Advice.OnMethodExit()
-    @Propagation
-    public static void methodExit(@Advice.This HttpHost self, @Advice.Return String result) {
-      final PropagationModule propagationModule = InstrumentationBridge.PROPAGATION;
-      if (propagationModule != null) {
-        propagationModule.taintObjectIfTainted(result, self);
-      }
+
+    public static class ToUriAdvice {
+        @Advice.OnMethodExit()
+        @Propagation
+        public static void methodExit(@Advice.This HttpHost self, @Advice.Return String result) {
+            final PropagationModule propagationModule = InstrumentationBridge.PROPAGATION;
+            if (propagationModule != null) {
+                propagationModule.taintObjectIfTainted(result, self);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/src/main/java/datadog/trace/instrumentation/apachehttpcore5/IastHttpHostInstrumentation.java b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/src/main/java/datadog/trace/instrumentation/apachehttpcore5/IastHttpHostInstrumentation.java
index b91db12ad39..657757c2096 100644
--- a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/src/main/java/datadog/trace/instrumentation/apachehttpcore5/IastHttpHostInstrumentation.java
+++ b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/src/main/java/datadog/trace/instrumentation/apachehttpcore5/IastHttpHostInstrumentation.java
@@ -14,34 +14,32 @@
 
 @AutoService(InstrumenterModule.class)
 public class IastHttpHostInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public IastHttpHostInstrumentation() {
-    super("httpcore-5", "apache-httpcore-5", "apache-http-core-5");
-  }
+    public IastHttpHostInstrumentation() {
+        super("httpcore-5", "apache-httpcore-5", "apache-http-core-5");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.hc.core5.http.HttpHost";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.hc.core5.http.HttpHost";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArguments(String.class, InetAddress.class, String.class, int.class)),
-        IastHttpHostInstrumentation.class.getName() + "$CtorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArguments(String.class, InetAddress.class, String.class, int.class)),
+                IastHttpHostInstrumentation.class.getName() + "$CtorAdvice");
+    }
 
-  public static class CtorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void afterCtor(
-        @Advice.This final Object self, @Advice.Argument(2) final String host) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        module.taintObjectIfTainted(self, host);
-      }
+    public static class CtorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void afterCtor(@Advice.This final Object self, @Advice.Argument(2) final String host) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                module.taintObjectIfTainted(self, host);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaGrpcClientModule.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaGrpcClientModule.java
index fcd8ea03cfb..97ee100bd0f 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaGrpcClientModule.java
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaGrpcClientModule.java
@@ -13,38 +13,37 @@
 
 @AutoService(InstrumenterModule.class)
 public class ArmeriaGrpcClientModule extends InstrumenterModule.Tracing {
-  public ArmeriaGrpcClientModule() {
-    super("armeria-grpc-client", "armeria-grpc", "armeria", "grpc-client", "grpc");
-  }
+    public ArmeriaGrpcClientModule() {
+        super("armeria-grpc-client", "armeria-grpc", "armeria", "grpc-client", "grpc");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStore = new HashMap<>();
-    contextStore.put("io.grpc.ClientCall", AgentSpan.class.getName());
-    contextStore.put(
-        "com.linecorp.armeria.common.grpc.protocol.ArmeriaMessageDeframer", "io.grpc.ClientCall");
-    return contextStore;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStore = new HashMap<>();
+        contextStore.put("io.grpc.ClientCall", AgentSpan.class.getName());
+        contextStore.put("com.linecorp.armeria.common.grpc.protocol.ArmeriaMessageDeframer", "io.grpc.ClientCall");
+        return contextStore;
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      new Reference(
-          new String[0],
-          1,
-          "com.linecorp.armeria.common.grpc.protocol.ArmeriaMessageDeframer",
-          null,
-          new String[0],
-          new Reference.Field[0],
-          new Reference.Method[0])
-    };
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            new Reference(
+                    new String[0],
+                    1,
+                    "com.linecorp.armeria.common.grpc.protocol.ArmeriaMessageDeframer",
+                    null,
+                    new String[0],
+                    new Reference.Field[0],
+                    new Reference.Method[0])
+        };
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(
-        new ArmeriaMessageDeframerInstrumentation(),
-        new ArmeriaMessageDeframerInstrumentation(),
-        new ClientCallImplInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(
+                new ArmeriaMessageDeframerInstrumentation(),
+                new ArmeriaMessageDeframerInstrumentation(),
+                new ClientCallImplInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java
index 17450cc5235..87606bd8293 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java
@@ -18,87 +18,80 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class ArmeriaMessageDeframerInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "com.linecorp.armeria.common.grpc.protocol.ArmeriaMessageDeframer";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return named(hierarchyMarkerType()).or(extendsClass(named(hierarchyMarkerType())));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "com.linecorp.armeria.common.grpc.protocol.ArmeriaMessageDeframer";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(
-                takesArgument(
-                    0,
-                    named(
-                        "com.linecorp.armeria.common.grpc.protocol.ArmeriaMessageDeframer$Listener"))),
-        getClass().getName() + "$CaptureClientCallArg0");
-    transformer.applyAdvice(
-        isConstructor()
-            .and(
-                takesArgument(
-                    2, named("com.linecorp.armeria.internal.common.grpc.TransportStatusListener"))),
-        getClass().getName() + "$CaptureClientCallArg2");
-    transformer.applyAdvice(
-        isMethod().and(named("process").or(named("deframe"))),
-        getClass().getName() + "$ActivateSpan");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return named(hierarchyMarkerType()).or(extendsClass(named(hierarchyMarkerType())));
+    }
 
-  public static final class CaptureClientCallArg0 {
-    @SuppressWarnings("rawtypes")
-    @Advice.OnMethodExit
-    public static void capture(
-        @Advice.This ArmeriaMessageDeframer messageDeframer,
-        @Advice.Argument(0) Object clientCall) {
-      if (clientCall instanceof ClientCall) {
-        InstrumentationContext.get(ArmeriaMessageDeframer.class, ClientCall.class)
-            .put(messageDeframer, (ClientCall) clientCall);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(
+                                0, named("com.linecorp.armeria.common.grpc.protocol.ArmeriaMessageDeframer$Listener"))),
+                getClass().getName() + "$CaptureClientCallArg0");
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(
+                                2, named("com.linecorp.armeria.internal.common.grpc.TransportStatusListener"))),
+                getClass().getName() + "$CaptureClientCallArg2");
+        transformer.applyAdvice(
+                isMethod().and(named("process").or(named("deframe"))),
+                getClass().getName() + "$ActivateSpan");
     }
-  }
 
-  public static final class CaptureClientCallArg2 {
-    @SuppressWarnings("rawtypes")
-    @Advice.OnMethodExit
-    public static void capture(
-        @Advice.This ArmeriaMessageDeframer messageDeframer,
-        @Advice.Argument(2) Object clientCall) {
-      if (clientCall instanceof ClientCall) {
-        InstrumentationContext.get(ArmeriaMessageDeframer.class, ClientCall.class)
-            .put(messageDeframer, (ClientCall) clientCall);
-      }
+    public static final class CaptureClientCallArg0 {
+        @SuppressWarnings("rawtypes")
+        @Advice.OnMethodExit
+        public static void capture(
+                @Advice.This ArmeriaMessageDeframer messageDeframer, @Advice.Argument(0) Object clientCall) {
+            if (clientCall instanceof ClientCall) {
+                InstrumentationContext.get(ArmeriaMessageDeframer.class, ClientCall.class)
+                        .put(messageDeframer, (ClientCall) clientCall);
+            }
+        }
     }
-  }
 
-  public static final class ActivateSpan {
-    @SuppressWarnings("rawtypes")
-    @Advice.OnMethodEnter
-    public static ContextScope before(@Advice.This ArmeriaMessageDeframer messageDeframer) {
-      ClientCall clientCall =
-          InstrumentationContext.get(ArmeriaMessageDeframer.class, ClientCall.class)
-              .get(messageDeframer);
-      if (clientCall != null) {
-        AgentSpan span =
-            InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(clientCall);
-        if (null != span) {
-          return activateSpan(span);
+    public static final class CaptureClientCallArg2 {
+        @SuppressWarnings("rawtypes")
+        @Advice.OnMethodExit
+        public static void capture(
+                @Advice.This ArmeriaMessageDeframer messageDeframer, @Advice.Argument(2) Object clientCall) {
+            if (clientCall instanceof ClientCall) {
+                InstrumentationContext.get(ArmeriaMessageDeframer.class, ClientCall.class)
+                        .put(messageDeframer, (ClientCall) clientCall);
+            }
         }
-      }
-      return null;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      if (null != scope) {
-        scope.close();
-      }
+    public static final class ActivateSpan {
+        @SuppressWarnings("rawtypes")
+        @Advice.OnMethodEnter
+        public static ContextScope before(@Advice.This ArmeriaMessageDeframer messageDeframer) {
+            ClientCall clientCall = InstrumentationContext.get(ArmeriaMessageDeframer.class, ClientCall.class)
+                    .get(messageDeframer);
+            if (clientCall != null) {
+                AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class)
+                        .get(clientCall);
+                if (null != span) {
+                    return activateSpan(span);
+                }
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            if (null != scope) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java
index 0c436799290..dfc5f9b8fff 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java
@@ -32,251 +32,253 @@
 import java.util.Arrays;
 import net.bytebuddy.asm.Advice;
 
-public final class ClientCallImplInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  @Override
-  public String instrumentedType() {
-    return "com.linecorp.armeria.internal.client.grpc.ArmeriaClientCall";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(4, named("io.grpc.MethodDescriptor"))),
-        getClass().getName() + "$CaptureCallPos4");
-    // from 1.32.3
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(2, named("io.grpc.MethodDescriptor"))),
-        getClass().getName() + "$CaptureCallPos2");
-    transformer.applyAdvices(
-        named("start").and(isMethod()),
-        getClass().getName() + "$Start",
-        getClass().getName() + "$StartContextPropagationAdvice");
-    transformer.applyAdvice(named("cancel").and(isMethod()), getClass().getName() + "$Cancel");
-    transformer.applyAdvice(
-        named("request")
-            .and(isMethod())
-            .and(takesArguments(int.class))
-            .or(isMethod().and(named("halfClose").and(takesArguments(0)))),
-        getClass().getName() + "$ActivateSpan");
-    transformer.applyAdvice(
-        named("sendMessage").and(isMethod()), getClass().getName() + "$SendMessage");
-    transformer.applyAdvice(
-        // matches the method signature for versions until 1.40 excluded
-        named("close").and(isMethod().and(takesArguments(2))),
-        getClass().getName() + "$CloseObserver");
-    transformer.applyAdvice(
-        // matches the signature after v1.40
-        named("close")
-            .and(isMethod())
-            .and(takesArguments(3))
-            .and(takesArgument(2, named("java.lang.Throwable"))),
-        getClass().getName() + "$CloseObserverWithCause");
-    if (InstrumenterConfig.get()
-        .isIntegrationEnabled(Arrays.asList("armeria-grpc-message", "grpc-message"), false)) {
-      transformer.applyAdvice(
-          named("onNext").or(named("messageRead")), getClass().getName() + "$ReceiveMessages");
+public final class ClientCallImplInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    @Override
+    public String instrumentedType() {
+        return "com.linecorp.armeria.internal.client.grpc.ArmeriaClientCall";
     }
-  }
 
-  public static final class CaptureCallPos4 {
-    @Advice.OnMethodExit
-    public static void capture(
-        @Advice.This ClientCall<?, ?> call, @Advice.Argument(4) MethodDescriptor<?, ?> method) {
-      AgentSpan span = DECORATE.startCall(method);
-      if (null != span) {
-        InstrumentationContext.get(ClientCall.class, AgentSpan.class).put(call, span);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(4, named("io.grpc.MethodDescriptor"))),
+                getClass().getName() + "$CaptureCallPos4");
+        // from 1.32.3
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(2, named("io.grpc.MethodDescriptor"))),
+                getClass().getName() + "$CaptureCallPos2");
+        transformer.applyAdvices(
+                named("start").and(isMethod()),
+                getClass().getName() + "$Start",
+                getClass().getName() + "$StartContextPropagationAdvice");
+        transformer.applyAdvice(named("cancel").and(isMethod()), getClass().getName() + "$Cancel");
+        transformer.applyAdvice(
+                named("request")
+                        .and(isMethod())
+                        .and(takesArguments(int.class))
+                        .or(isMethod().and(named("halfClose").and(takesArguments(0)))),
+                getClass().getName() + "$ActivateSpan");
+        transformer.applyAdvice(named("sendMessage").and(isMethod()), getClass().getName() + "$SendMessage");
+        transformer.applyAdvice(
+                // matches the method signature for versions until 1.40 excluded
+                named("close").and(isMethod().and(takesArguments(2))),
+                getClass().getName() + "$CloseObserver");
+        transformer.applyAdvice(
+                // matches the signature after v1.40
+                named("close")
+                        .and(isMethod())
+                        .and(takesArguments(3))
+                        .and(takesArgument(2, named("java.lang.Throwable"))),
+                getClass().getName() + "$CloseObserverWithCause");
+        if (InstrumenterConfig.get()
+                .isIntegrationEnabled(Arrays.asList("armeria-grpc-message", "grpc-message"), false)) {
+            transformer.applyAdvice(
+                    named("onNext").or(named("messageRead")), getClass().getName() + "$ReceiveMessages");
+        }
     }
-  }
 
-  public static final class CaptureCallPos2 {
-    @Advice.OnMethodExit
-    public static void capture(
-        @Advice.This ClientCall<?, ?> call, @Advice.Argument(2) MethodDescriptor<?, ?> method) {
-      AgentSpan span = DECORATE.startCall(method);
-      if (null != span) {
-        InstrumentationContext.get(ClientCall.class, AgentSpan.class).put(call, span);
-      }
+    public static final class CaptureCallPos4 {
+        @Advice.OnMethodExit
+        public static void capture(
+                @Advice.This ClientCall<?, ?> call, @Advice.Argument(4) MethodDescriptor<?, ?> method) {
+            AgentSpan span = DECORATE.startCall(method);
+            if (null != span) {
+                InstrumentationContext.get(ClientCall.class, AgentSpan.class).put(call, span);
+            }
+        }
     }
-  }
 
-  public static final class Start {
-    @Advice.OnMethodEnter
-    public static <T> ContextScope before(
-        @Advice.This ClientCall<?, ?> call,
-        @Advice.Argument(0) ClientCall.Listener<T> responseListener,
-        @Advice.Argument(1) Metadata headers,
-        @Advice.Local("$$ddSpan") AgentSpan span) {
-      if (null != responseListener && null != headers) {
-        span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(call);
-        if (null != span) {
-          return activateSpan(span);
+    public static final class CaptureCallPos2 {
+        @Advice.OnMethodExit
+        public static void capture(
+                @Advice.This ClientCall<?, ?> call, @Advice.Argument(2) MethodDescriptor<?, ?> method) {
+            AgentSpan span = DECORATE.startCall(method);
+            if (null != span) {
+                InstrumentationContext.get(ClientCall.class, AgentSpan.class).put(call, span);
+            }
         }
-      }
-      return null;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(
-        @Advice.Enter ContextScope scope,
-        @Advice.Thrown Throwable error,
-        @Advice.Local("$$ddSpan") AgentSpan span)
-        throws Throwable {
-      if (null != error && null != span) {
-        DECORATE.onError(span, error);
-        DECORATE.beforeFinish(span);
-      }
-      if (null != scope) {
-        scope.close();
-      }
-      if (null != error && null != span) {
-        span.finish();
-        throw error;
-      }
-    }
-  }
+    public static final class Start {
+        @Advice.OnMethodEnter
+        public static <T> ContextScope before(
+                @Advice.This ClientCall<?, ?> call,
+                @Advice.Argument(0) ClientCall.Listener<T> responseListener,
+                @Advice.Argument(1) Metadata headers,
+                @Advice.Local("$$ddSpan") AgentSpan span) {
+            if (null != responseListener && null != headers) {
+                span = InstrumentationContext.get(ClientCall.class, AgentSpan.class)
+                        .get(call);
+                if (null != span) {
+                    return activateSpan(span);
+                }
+            }
+            return null;
+        }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static final class StartContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void before(@Advice.Argument(1) Metadata headers) {
-      DECORATE.injectContext(currentContext(), headers, SETTER);
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(
+                @Advice.Enter ContextScope scope,
+                @Advice.Thrown Throwable error,
+                @Advice.Local("$$ddSpan") AgentSpan span)
+                throws Throwable {
+            if (null != error && null != span) {
+                DECORATE.onError(span, error);
+                DECORATE.beforeFinish(span);
+            }
+            if (null != scope) {
+                scope.close();
+            }
+            if (null != error && null != span) {
+                span.finish();
+                throw error;
+            }
+        }
     }
-  }
 
-  public static final class ActivateSpan {
-    @Advice.OnMethodEnter
-    public static ContextScope before(@Advice.This ClientCall<?, ?> call) {
-      AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(call);
-      if (null != span) {
-        return activateSpan(span);
-      }
-      return null;
+    @AppliesOn(CONTEXT_TRACKING)
+    public static final class StartContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void before(@Advice.Argument(1) Metadata headers) {
+            DECORATE.injectContext(currentContext(), headers, SETTER);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      if (null != scope) {
-        scope.close();
-      }
-    }
-  }
+    public static final class ActivateSpan {
+        @Advice.OnMethodEnter
+        public static ContextScope before(@Advice.This ClientCall<?, ?> call) {
+            AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class)
+                    .get(call);
+            if (null != span) {
+                return activateSpan(span);
+            }
+            return null;
+        }
 
-  public static final class SendMessage {
-    @Advice.OnMethodEnter
-    public static ContextScope before(@Advice.This ClientCall<?, ?> call) {
-      // could create a message span here for the request
-      AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(call);
-      if (span != null) {
-        return activateSpan(span);
-      }
-      return null;
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            if (null != scope) {
+                scope.close();
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      if (null != scope) {
-        scope.close();
-      }
-    }
-  }
+    public static final class SendMessage {
+        @Advice.OnMethodEnter
+        public static ContextScope before(@Advice.This ClientCall<?, ?> call) {
+            // could create a message span here for the request
+            AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class)
+                    .get(call);
+            if (span != null) {
+                return activateSpan(span);
+            }
+            return null;
+        }
 
-  public static final class Cancel {
-    @Advice.OnMethodEnter
-    public static void before(
-        @Advice.This ClientCall<?, ?> call, @Advice.Argument(1) Throwable cause) {
-      AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).remove(call);
-      if (null != span) {
-        if (cause instanceof StatusRuntimeException) {
-          DECORATE.onClose(span, ((StatusRuntimeException) cause).getStatus());
-        } else if (cause instanceof StatusException) {
-          DECORATE.onClose(span, ((StatusException) cause).getStatus());
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            if (null != scope) {
+                scope.close();
+            }
         }
-        span.finish();
-      }
     }
-  }
 
-  public static final class CloseObserver {
-    @Advice.OnMethodEnter
-    public static ContextScope before(@Advice.This ClientCall<?, ?> call) {
-      AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).remove(call);
-      if (span != null) {
-        return activateSpan(span);
-      }
-      return null;
+    public static final class Cancel {
+        @Advice.OnMethodEnter
+        public static void before(@Advice.This ClientCall<?, ?> call, @Advice.Argument(1) Throwable cause) {
+            AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class)
+                    .remove(call);
+            if (null != span) {
+                if (cause instanceof StatusRuntimeException) {
+                    DECORATE.onClose(span, ((StatusRuntimeException) cause).getStatus());
+                } else if (cause instanceof StatusException) {
+                    DECORATE.onClose(span, ((StatusException) cause).getStatus());
+                }
+                span.finish();
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void closeObserver(
-        @Advice.Enter ContextScope scope, @Advice.Argument(0) Status status) {
-      if (null != scope) {
-        AgentSpan span = spanFromScope(scope);
-        DECORATE.onClose(span, status);
-        scope.close();
-        span.finish();
-      }
-    }
-  }
+    public static final class CloseObserver {
+        @Advice.OnMethodEnter
+        public static ContextScope before(@Advice.This ClientCall<?, ?> call) {
+            AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class)
+                    .remove(call);
+            if (span != null) {
+                return activateSpan(span);
+            }
+            return null;
+        }
 
-  /**
-   * After armeria 1.40 and <a href="https://github.com/line/armeria/pull/6717">this PR</a>, it is
-   * possible that the first call to close would not be the real close. We need to rely on the
-   * internal boolean `closed` to know if we are dealing with the real closing.
-   */
-  public static final class CloseObserverWithCause {
-    @Advice.OnMethodEnter
-    public static ContextScope before(@Advice.This ClientCall<?, ?> call) {
-      AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(call);
-      if (span != null) {
-        return activateSpan(span);
-      }
-      return null;
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void closeObserver(@Advice.Enter ContextScope scope, @Advice.Argument(0) Status status) {
+            if (null != scope) {
+                AgentSpan span = spanFromScope(scope);
+                DECORATE.onClose(span, status);
+                scope.close();
+                span.finish();
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void closeObserver(
-        @Advice.This ClientCall<?, ?> call,
-        @Advice.Enter ContextScope scope,
-        @Advice.Argument(0) Status status,
-        @Advice.FieldValue("closed") boolean closed) {
-      if (null != scope) {
-        AgentSpan span = null;
-        if (closed) {
-          span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).remove(call);
-          if (span != null) {
-            DECORATE.onClose(span, status);
-          }
+    /**
+     * After armeria 1.40 and <a href="https://github.com/line/armeria/pull/6717">this PR</a>, it is
+     * possible that the first call to close would not be the real close. We need to rely on the
+     * internal boolean `closed` to know if we are dealing with the real closing.
+     */
+    public static final class CloseObserverWithCause {
+        @Advice.OnMethodEnter
+        public static ContextScope before(@Advice.This ClientCall<?, ?> call) {
+            AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class)
+                    .get(call);
+            if (span != null) {
+                return activateSpan(span);
+            }
+            return null;
         }
-        scope.close();
-        if (span != null) {
-          span.finish();
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void closeObserver(
+                @Advice.This ClientCall<?, ?> call,
+                @Advice.Enter ContextScope scope,
+                @Advice.Argument(0) Status status,
+                @Advice.FieldValue("closed") boolean closed) {
+            if (null != scope) {
+                AgentSpan span = null;
+                if (closed) {
+                    span = InstrumentationContext.get(ClientCall.class, AgentSpan.class)
+                            .remove(call);
+                    if (span != null) {
+                        DECORATE.onClose(span, status);
+                    }
+                }
+                scope.close();
+                if (span != null) {
+                    span.finish();
+                }
+            }
         }
-      }
     }
-  }
 
-  public static final class ReceiveMessages {
-    @Advice.OnMethodEnter
-    public static ContextScope before() {
-      AgentSpan clientSpan = activeSpan();
-      if (clientSpan != null && OPERATION_NAME.equals(clientSpan.getOperationName())) {
-        AgentSpan messageSpan =
-            startSpan(COMPONENT_NAME.toString(), GRPC_MESSAGE)
-                .setTag("message.type", clientSpan.getTag("response.type"));
-        DECORATE.afterStart(messageSpan);
-        return activateSpan(messageSpan);
-      }
-      return null;
-    }
+    public static final class ReceiveMessages {
+        @Advice.OnMethodEnter
+        public static ContextScope before() {
+            AgentSpan clientSpan = activeSpan();
+            if (clientSpan != null && OPERATION_NAME.equals(clientSpan.getOperationName())) {
+                AgentSpan messageSpan = startSpan(COMPONENT_NAME.toString(), GRPC_MESSAGE)
+                        .setTag("message.type", clientSpan.getTag("response.type"));
+                DECORATE.afterStart(messageSpan);
+                return activateSpan(messageSpan);
+            }
+            return null;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      if (null != scope) {
-        scope.close();
-        spanFromScope(scope).finish();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            if (null != scope) {
+                scope.close();
+                spanFromScope(scope).finish();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java
index d7a592ee72a..8f2ed4ae48b 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java
@@ -28,102 +28,98 @@
 import java.util.function.Function;
 
 public class GrpcClientDecorator extends ClientDecorator {
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().client().operationForProtocol("grpc"));
-  public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("armeria-grpc-client");
-  public static final CharSequence GRPC_MESSAGE = UTF8BytesString.create("grpc.message");
-
-  private static DataStreamsContext createDsmContext() {
-    return DataStreamsContext.fromTags(DataStreamsTags.create("grpc", OUTBOUND));
-  }
-
-  public static final GrpcClientDecorator DECORATE = new GrpcClientDecorator();
-
-  private static final Set<String> IGNORED_METHODS = Config.get().getGrpcIgnoredOutboundMethods();
-  private static final BitSet CLIENT_ERROR_STATUSES = Config.get().getGrpcClientErrorStatuses();
-
-  private static final ClassValue<UTF8BytesString> MESSAGE_TYPES =
-      GenericClassValue.of(
-          // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
-          new Function<Class<?>, UTF8BytesString>() {
-            @Override
-            public UTF8BytesString apply(Class<?> input) {
-              return UTF8BytesString.create(input.getName());
-            }
-          });
-
-  private static final DDCache<String, String> RPC_SERVICE_CACHE = DDCaches.newFixedSizeCache(64);
-
-  public UTF8BytesString requestMessageType(MethodDescriptor<?, ?> method) {
-    return messageType(method.getRequestMarshaller());
-  }
-
-  public UTF8BytesString responseMessageType(MethodDescriptor<?, ?> method) {
-    return messageType(method.getResponseMarshaller());
-  }
-
-  private UTF8BytesString messageType(MethodDescriptor.Marshaller<?> marshaller) {
-    return marshaller instanceof MethodDescriptor.ReflectableMarshaller
-        ? MESSAGE_TYPES.get(
-            ((MethodDescriptor.ReflectableMarshaller<?>) marshaller).getMessageClass())
-        : null;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"armeria-grpc-client", "armeria-grpc", "armeria", "grpc-client", "grpc"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.RPC;
-  }
-
-  @Override
-  protected String service() {
-    return null;
-  }
-
-  public <ReqT, RespT> AgentSpan startCall(MethodDescriptor<ReqT, RespT> method) {
-    if (IGNORED_METHODS.contains(method.getFullMethodName())) {
-      return AgentTracer.blackholeSpan();
+    public static final CharSequence OPERATION_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().client().operationForProtocol("grpc"));
+    public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("armeria-grpc-client");
+    public static final CharSequence GRPC_MESSAGE = UTF8BytesString.create("grpc.message");
+
+    private static DataStreamsContext createDsmContext() {
+        return DataStreamsContext.fromTags(DataStreamsTags.create("grpc", OUTBOUND));
+    }
+
+    public static final GrpcClientDecorator DECORATE = new GrpcClientDecorator();
+
+    private static final Set<String> IGNORED_METHODS = Config.get().getGrpcIgnoredOutboundMethods();
+    private static final BitSet CLIENT_ERROR_STATUSES = Config.get().getGrpcClientErrorStatuses();
+
+    private static final ClassValue<UTF8BytesString> MESSAGE_TYPES = GenericClassValue.of(
+            // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
+            new Function<Class<?>, UTF8BytesString>() {
+                @Override
+                public UTF8BytesString apply(Class<?> input) {
+                    return UTF8BytesString.create(input.getName());
+                }
+            });
+
+    private static final DDCache<String, String> RPC_SERVICE_CACHE = DDCaches.newFixedSizeCache(64);
+
+    public UTF8BytesString requestMessageType(MethodDescriptor<?, ?> method) {
+        return messageType(method.getRequestMarshaller());
+    }
+
+    public UTF8BytesString responseMessageType(MethodDescriptor<?, ?> method) {
+        return messageType(method.getResponseMarshaller());
     }
-    AgentSpan span =
-        startSpan(COMPONENT_NAME.toString(), OPERATION_NAME)
-            .setTag("request.type", requestMessageType(method))
-            .setTag("response.type", responseMessageType(method))
-            // method.getServiceName() may not be available on some grpc versions
-            .setTag(
-                Tags.RPC_SERVICE,
-                RPC_SERVICE_CACHE.computeIfAbsent(
-                    method.getFullMethodName(), MethodDescriptor::extractFullServiceName));
-    span.setResourceName(method.getFullMethodName());
-    afterStart(span);
-    return span;
-  }
-
-  public <C> void injectContext(Context context, final C request, CarrierSetter<C> setter) {
-    if (traceConfig().isDataStreamsEnabled()) {
-      context = context.with(createDsmContext());
+
+    private UTF8BytesString messageType(MethodDescriptor.Marshaller<?> marshaller) {
+        return marshaller instanceof MethodDescriptor.ReflectableMarshaller
+                ? MESSAGE_TYPES.get(((MethodDescriptor.ReflectableMarshaller<?>) marshaller).getMessageClass())
+                : null;
     }
-    defaultPropagator().inject(context, request, setter);
-  }
 
-  public void onClose(final AgentSpan span, final Status status) {
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"armeria-grpc-client", "armeria-grpc", "armeria", "grpc-client", "grpc"};
+    }
 
-    span.setTag("status.code", status.getCode().name());
-    span.setTag("grpc.status.code", status.getCode().name());
-    span.setTag(InstrumentationTags.GRPC_STATUS_CODE, status.getCode().value());
-    span.setTag("status.description", status.getDescription());
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
 
-    // TODO why is there a mismatch between client / server for calling the onError method?
-    onError(span, status.getCause());
-    span.setError(CLIENT_ERROR_STATUSES.get(status.getCode().value()));
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.RPC;
+    }
+
+    @Override
+    protected String service() {
+        return null;
+    }
+
+    public <ReqT, RespT> AgentSpan startCall(MethodDescriptor<ReqT, RespT> method) {
+        if (IGNORED_METHODS.contains(method.getFullMethodName())) {
+            return AgentTracer.blackholeSpan();
+        }
+        AgentSpan span = startSpan(COMPONENT_NAME.toString(), OPERATION_NAME)
+                .setTag("request.type", requestMessageType(method))
+                .setTag("response.type", responseMessageType(method))
+                // method.getServiceName() may not be available on some grpc versions
+                .setTag(
+                        Tags.RPC_SERVICE,
+                        RPC_SERVICE_CACHE.computeIfAbsent(
+                                method.getFullMethodName(), MethodDescriptor::extractFullServiceName));
+        span.setResourceName(method.getFullMethodName());
+        afterStart(span);
+        return span;
+    }
+
+    public <C> void injectContext(Context context, final C request, CarrierSetter<C> setter) {
+        if (traceConfig().isDataStreamsEnabled()) {
+            context = context.with(createDsmContext());
+        }
+        defaultPropagator().inject(context, request, setter);
+    }
+
+    public void onClose(final AgentSpan span, final Status status) {
+
+        span.setTag("status.code", status.getCode().name());
+        span.setTag("grpc.status.code", status.getCode().name());
+        span.setTag(InstrumentationTags.GRPC_STATUS_CODE, status.getCode().value());
+        span.setTag("status.description", status.getDescription());
+
+        // TODO why is there a mismatch between client / server for calling the onError method?
+        onError(span, status.getCause());
+        span.setError(CLIENT_ERROR_STATUSES.get(status.getCode().value()));
+    }
 }
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcInjectAdapter.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcInjectAdapter.java
index 8be18d7f369..8bc2cb97eaf 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcInjectAdapter.java
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcInjectAdapter.java
@@ -9,20 +9,18 @@
 
 @ParametersAreNonnullByDefault
 public final class GrpcInjectAdapter implements CarrierSetter<Metadata> {
-  private static final Function<String, Metadata.Key<String>> KEY_MAKER =
-      key -> Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
-  private static final DDCache<String, Metadata.Key<String>> KEY_CACHE =
-      DDCaches.newFixedSizeCache(64);
+    private static final Function<String, Metadata.Key<String>> KEY_MAKER =
+            key -> Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
+    private static final DDCache<String, Metadata.Key<String>> KEY_CACHE = DDCaches.newFixedSizeCache(64);
 
-  public static final GrpcInjectAdapter SETTER = new GrpcInjectAdapter();
+    public static final GrpcInjectAdapter SETTER = new GrpcInjectAdapter();
 
-  @Override
-  public void set(final Metadata carrier, final String key, final String value) {
-    Metadata.Key<String> metadataKey = KEY_CACHE.computeIfAbsent(key, KEY_MAKER);
-    if (carrier.containsKey(metadataKey)) {
-      carrier.removeAll(
-          metadataKey); // Remove existing to ensure identical behavior with other carriers
+    @Override
+    public void set(final Metadata carrier, final String key, final String value) {
+        Metadata.Key<String> metadataKey = KEY_CACHE.computeIfAbsent(key, KEY_MAKER);
+        if (carrier.containsKey(metadataKey)) {
+            carrier.removeAll(metadataKey); // Remove existing to ensure identical behavior with other carriers
+        }
+        carrier.put(metadataKey, value);
     }
-    carrier.put(metadataKey, value);
-  }
 }
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcExtractAdapter.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcExtractAdapter.java
index 6cc62562d72..a8dc76dd0c0 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcExtractAdapter.java
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcExtractAdapter.java
@@ -7,21 +7,20 @@
 import java.util.function.Function;
 
 public final class GrpcExtractAdapter implements AgentPropagation.ContextVisitor<Metadata> {
-  private static final Function<String, Metadata.Key<String>> KEY_MAKER =
-      key -> Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
-  private static final DDCache<String, Metadata.Key<String>> KEY_CACHE =
-      DDCaches.newFixedSizeCache(64);
+    private static final Function<String, Metadata.Key<String>> KEY_MAKER =
+            key -> Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
+    private static final DDCache<String, Metadata.Key<String>> KEY_CACHE = DDCaches.newFixedSizeCache(64);
 
-  public static final GrpcExtractAdapter GETTER = new GrpcExtractAdapter();
+    public static final GrpcExtractAdapter GETTER = new GrpcExtractAdapter();
 
-  @Override
-  public void forEachKey(Metadata carrier, AgentPropagation.KeyClassifier classifier) {
-    for (String key : carrier.keys()) {
-      if (!key.endsWith(Metadata.BINARY_HEADER_SUFFIX) && !key.startsWith(":")) {
-        if (!classifier.accept(key, carrier.get(KEY_CACHE.computeIfAbsent(key, KEY_MAKER)))) {
-          return;
+    @Override
+    public void forEachKey(Metadata carrier, AgentPropagation.KeyClassifier classifier) {
+        for (String key : carrier.keys()) {
+            if (!key.endsWith(Metadata.BINARY_HEADER_SUFFIX) && !key.startsWith(":")) {
+                if (!classifier.accept(key, carrier.get(KEY_CACHE.computeIfAbsent(key, KEY_MAKER)))) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java
index 6c2a85cdff8..1feaa2fb109 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java
@@ -23,102 +23,97 @@
 
 public class GrpcServerDecorator extends ServerDecorator {
 
-  private static final boolean TRIM_RESOURCE_PACKAGE_NAME =
-      Config.get().isGrpcServerTrimPackageResource();
-  private static final BitSet SERVER_ERROR_STATUSES = Config.get().getGrpcServerErrorStatuses();
-
-  public static final CharSequence GRPC_SERVER =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().server().operationForProtocol("grpc"));
-  public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("armeria-grpc-server");
-  public static final CharSequence GRPC_MESSAGE = UTF8BytesString.create("grpc.message");
-
-  private static DataStreamsTags createServerPathwaySortedTags() {
-    return DataStreamsTags.create("grpc", INBOUND);
-  }
-
-  public static final DataStreamsTags SERVER_PATHWAY_EDGE_TAGS = createServerPathwaySortedTags();
-  public static final GrpcServerDecorator DECORATE = new GrpcServerDecorator();
-
-  private static final Function<String, String> NORMALIZE =
-      // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
-      new Function<String, String>() {
-        @Override
-        public String apply(String fullName) {
-          int index = fullName.lastIndexOf(".");
-          if (index > 0) {
-            return fullName.substring(index + 1);
-          } else {
-            return fullName;
-          }
+    private static final boolean TRIM_RESOURCE_PACKAGE_NAME = Config.get().isGrpcServerTrimPackageResource();
+    private static final BitSet SERVER_ERROR_STATUSES = Config.get().getGrpcServerErrorStatuses();
+
+    public static final CharSequence GRPC_SERVER =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().server().operationForProtocol("grpc"));
+    public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("armeria-grpc-server");
+    public static final CharSequence GRPC_MESSAGE = UTF8BytesString.create("grpc.message");
+
+    private static DataStreamsTags createServerPathwaySortedTags() {
+        return DataStreamsTags.create("grpc", INBOUND);
+    }
+
+    public static final DataStreamsTags SERVER_PATHWAY_EDGE_TAGS = createServerPathwaySortedTags();
+    public static final GrpcServerDecorator DECORATE = new GrpcServerDecorator();
+
+    private static final Function<String, String> NORMALIZE =
+            // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
+            new Function<String, String>() {
+                @Override
+                public String apply(String fullName) {
+                    int index = fullName.lastIndexOf(".");
+                    if (index > 0) {
+                        return fullName.substring(index + 1);
+                    } else {
+                        return fullName;
+                    }
+                }
+            };
+
+    private final DDCache<String, String> cachedResourceNames;
+
+    public GrpcServerDecorator() {
+        if (TRIM_RESOURCE_PACKAGE_NAME) {
+            cachedResourceNames = DDCaches.newFixedSizeCache(512);
+        } else {
+            cachedResourceNames = null;
         }
-      };
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"armeria-grpc-server", "armeria-grpc", "armeria", "grpc-server", "grpc"};
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.RPC;
+    }
 
-  private final DDCache<String, String> cachedResourceNames;
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
 
-  public GrpcServerDecorator() {
-    if (TRIM_RESOURCE_PACKAGE_NAME) {
-      cachedResourceNames = DDCaches.newFixedSizeCache(512);
-    } else {
-      cachedResourceNames = null;
+    @Override
+    protected void doAfterStart(@Nonnull final AgentSpan span) {
+        span.setMeasured(true);
+        super.doAfterStart(span);
     }
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"armeria-grpc-server", "armeria-grpc", "armeria", "grpc-server", "grpc"};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.RPC;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected void doAfterStart(@Nonnull final AgentSpan span) {
-    span.setMeasured(true);
-    super.doAfterStart(span);
-  }
-
-  public <RespT, ReqT> void onCall(final AgentSpan span, ServerCall<ReqT, RespT> call) {
-    if (TRIM_RESOURCE_PACKAGE_NAME) {
-      span.setResourceName(
-          cachedResourceNames.computeIfAbsent(
-              call.getMethodDescriptor().getFullMethodName(), NORMALIZE));
-    } else {
-      span.setResourceName(call.getMethodDescriptor().getFullMethodName());
+
+    public <RespT, ReqT> void onCall(final AgentSpan span, ServerCall<ReqT, RespT> call) {
+        if (TRIM_RESOURCE_PACKAGE_NAME) {
+            span.setResourceName(cachedResourceNames.computeIfAbsent(
+                    call.getMethodDescriptor().getFullMethodName(), NORMALIZE));
+        } else {
+            span.setResourceName(call.getMethodDescriptor().getFullMethodName());
+        }
     }
-  }
-
-  public void onStatus(final AgentSpan span, final Status status) {
-    span.setTag("status.code", status.getCode().name());
-    span.setTag("grpc.status.code", status.getCode().name());
-    span.setTag(InstrumentationTags.GRPC_STATUS_CODE, status.getCode().value());
-    span.setTag("status.description", status.getDescription());
-    span.setError(
-        SERVER_ERROR_STATUSES.get(status.getCode().value()), ErrorPriorities.HTTP_SERVER_DECORATOR);
-  }
-
-  public void onClose(final AgentSpan span, final Status status) {
-    if (status.getCause() != null) {
-      onError(span, status.getCause());
+
+    public void onStatus(final AgentSpan span, final Status status) {
+        span.setTag("status.code", status.getCode().name());
+        span.setTag("grpc.status.code", status.getCode().name());
+        span.setTag(InstrumentationTags.GRPC_STATUS_CODE, status.getCode().value());
+        span.setTag("status.description", status.getDescription());
+        span.setError(SERVER_ERROR_STATUSES.get(status.getCode().value()), ErrorPriorities.HTTP_SERVER_DECORATOR);
     }
-    onStatus(span, status);
-  }
-
-  @Override
-  protected void doOnError(
-      @Nonnull AgentSpan span, @Nonnull Throwable throwable, byte errorPriority) {
-    super.doOnError(span, throwable, ErrorPriorities.HTTP_SERVER_DECORATOR);
-    if (throwable instanceof StatusRuntimeException) {
-      onStatus(span, ((StatusRuntimeException) throwable).getStatus());
-    } else if (throwable instanceof StatusException) {
-      onStatus(span, ((StatusException) throwable).getStatus());
+
+    public void onClose(final AgentSpan span, final Status status) {
+        if (status.getCause() != null) {
+            onError(span, status.getCause());
+        }
+        onStatus(span, status);
+    }
+
+    @Override
+    protected void doOnError(@Nonnull AgentSpan span, @Nonnull Throwable throwable, byte errorPriority) {
+        super.doOnError(span, throwable, ErrorPriorities.HTTP_SERVER_DECORATOR);
+        if (throwable instanceof StatusRuntimeException) {
+            onStatus(span, ((StatusRuntimeException) throwable).getStatus());
+        } else if (throwable instanceof StatusException) {
+            onStatus(span, ((StatusException) throwable).getStatus());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/HandlerRegistryBuilderInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/HandlerRegistryBuilderInstrumentation.java
index bb9f2a4ed83..be504a0b11b 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/HandlerRegistryBuilderInstrumentation.java
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/HandlerRegistryBuilderInstrumentation.java
@@ -14,46 +14,43 @@
 
 @AutoService(InstrumenterModule.class)
 public class HandlerRegistryBuilderInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public HandlerRegistryBuilderInstrumentation() {
-    super("armeria-grpc-server", "armeria-grpc", "armeria", "grpc-server", "grpc");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public HandlerRegistryBuilderInstrumentation() {
+        super("armeria-grpc-server", "armeria-grpc", "armeria", "grpc-server", "grpc");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.linecorp.armeria.server.grpc.HandlerRegistry$Builder";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.linecorp.armeria.server.grpc.HandlerRegistry$Builder";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      new Reference(
-          new String[0],
-          1,
-          "com.linecorp.armeria.common.grpc.protocol.ArmeriaMessageDeframer",
-          null,
-          new String[0],
-          new Reference.Field[0],
-          new Reference.Method[0])
-    };
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            new Reference(
+                    new String[0],
+                    1,
+                    "com.linecorp.armeria.common.grpc.protocol.ArmeriaMessageDeframer",
+                    null,
+                    new String[0],
+                    new Reference.Field[0],
+                    new Reference.Method[0])
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("addService"))
-            .and(takesArgument(0, named("io.grpc.ServerServiceDefinition"))),
-        getClass().getName() + "$AddService");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("addService")).and(takesArgument(0, named("io.grpc.ServerServiceDefinition"))),
+                getClass().getName() + "$AddService");
+    }
 
-  public static final class AddService {
-    @Advice.OnMethodEnter
-    public static void before(
-        @Advice.Argument(value = 0, readOnly = false)
-            ServerServiceDefinition serverServiceDefinition) {
-      serverServiceDefinition =
-          ServerInterceptors.intercept(serverServiceDefinition, TracingServerInterceptor.INSTANCE);
+    public static final class AddService {
+        @Advice.OnMethodEnter
+        public static void before(
+                @Advice.Argument(value = 0, readOnly = false) ServerServiceDefinition serverServiceDefinition) {
+            serverServiceDefinition =
+                    ServerInterceptors.intercept(serverServiceDefinition, TracingServerInterceptor.INSTANCE);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java
index 7acce3e37fe..8063b4a36c9 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java
+++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java
@@ -45,325 +45,317 @@
 import javax.annotation.Nonnull;
 
 public class TracingServerInterceptor implements ServerInterceptor {
-  private static final Function<String, Metadata.Key<String>> KEY_MAKER =
-      key -> Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
-  private static final DDCache<String, Metadata.Key<String>> KEY_CACHE =
-      DDCaches.newFixedSizeCache(64);
-
-  public static final TracingServerInterceptor INSTANCE = new TracingServerInterceptor();
-  private static final Set<String> IGNORED_METHODS = Config.get().getGrpcIgnoredInboundMethods();
-
-  private TracingServerInterceptor() {}
-
-  protected static AgentTracer.TracerAPI tracer() {
-    return AgentTracer.get();
-  }
-
-  @Override
-  public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
-      final ServerCall<ReqT, RespT> call,
-      final Metadata headers,
-      final ServerCallHandler<ReqT, RespT> next) {
-    if (IGNORED_METHODS.contains(call.getMethodDescriptor().getFullMethodName())) {
-      return next.startCall(call, headers);
-    }
-
-    AgentSpanContext spanContext = extractContextAndGetSpanContext(headers, GETTER);
-    AgentTracer.TracerAPI tracer = tracer();
-    spanContext = callIGCallbackRequestStarted(tracer, spanContext);
+    private static final Function<String, Metadata.Key<String>> KEY_MAKER =
+            key -> Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
+    private static final DDCache<String, Metadata.Key<String>> KEY_CACHE = DDCaches.newFixedSizeCache(64);
 
-    CallbackProvider cbp = tracer.getCallbackProvider(RequestContextSlot.APPSEC);
-    final AgentSpan span =
-        startSpan(DECORATE.instrumentationNames()[0], GRPC_SERVER, spanContext).setMeasured(true);
+    public static final TracingServerInterceptor INSTANCE = new TracingServerInterceptor();
+    private static final Set<String> IGNORED_METHODS = Config.get().getGrpcIgnoredInboundMethods();
 
-    AgentTracer.get()
-        .getDataStreamsMonitoring()
-        .setCheckpoint(span, fromTags(SERVER_PATHWAY_EDGE_TAGS));
+    private TracingServerInterceptor() {}
 
-    RequestContext reqContext = span.getRequestContext();
-    if (reqContext != null) {
-      callIGCallbackClientAddress(cbp, reqContext, call);
-      callIGCallbackHeaders(cbp, reqContext, headers);
-      callIGCallbackGrpcServerMethod(cbp, reqContext, call.getMethodDescriptor());
+    protected static AgentTracer.TracerAPI tracer() {
+        return AgentTracer.get();
     }
 
-    DECORATE.afterStart(span);
-    DECORATE.onCall(span, call);
-
-    final ServerCall.Listener<ReqT> result;
-    try (ContextScope scope = activateSpan(span)) {
-      // Wrap the server call so that we can decorate the span
-      // with the resulting status
-      final TracingServerCall<ReqT, RespT> tracingServerCall = new TracingServerCall<>(span, call);
-      // call other interceptors
-      result = next.startCall(tracingServerCall, headers);
-    } catch (final Throwable e) {
-      if (span.phasedFinish()) {
-        DECORATE.onError(span, e);
-        DECORATE.beforeFinish(span);
-        callIGCallbackRequestEnded(span);
-        span.publish();
-      }
-      throw e;
-    }
+    @Override
+    public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
+            final ServerCall<ReqT, RespT> call, final Metadata headers, final ServerCallHandler<ReqT, RespT> next) {
+        if (IGNORED_METHODS.contains(call.getMethodDescriptor().getFullMethodName())) {
+            return next.startCall(call, headers);
+        }
 
-    // This ensures the server implementation can see the span in scope
-    return new TracingServerCallListener<>(span, result);
-  }
+        AgentSpanContext spanContext = extractContextAndGetSpanContext(headers, GETTER);
+        AgentTracer.TracerAPI tracer = tracer();
+        spanContext = callIGCallbackRequestStarted(tracer, spanContext);
 
-  static final class TracingServerCall<ReqT, RespT>
-      extends ForwardingServerCall.SimpleForwardingServerCall<ReqT, RespT> {
-    final AgentSpan span;
+        CallbackProvider cbp = tracer.getCallbackProvider(RequestContextSlot.APPSEC);
+        final AgentSpan span = startSpan(DECORATE.instrumentationNames()[0], GRPC_SERVER, spanContext)
+                .setMeasured(true);
 
-    TracingServerCall(final AgentSpan span, final ServerCall<ReqT, RespT> delegate) {
-      super(delegate);
-      this.span = span;
-    }
+        AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, fromTags(SERVER_PATHWAY_EDGE_TAGS));
 
-    @Override
-    public void close(final Status status, final Metadata trailers) {
-      DECORATE.onClose(span, status);
-      try (final ContextScope scope = activateSpan(span)) {
-        delegate().close(status, trailers);
-      } catch (final Throwable e) {
-        DECORATE.onError(span, e);
-        throw e;
-      } finally {
-        if (span.phasedFinish()) {
-          DECORATE.beforeFinish(span);
-          callIGCallbackRequestEnded(span);
-          span.publish();
+        RequestContext reqContext = span.getRequestContext();
+        if (reqContext != null) {
+            callIGCallbackClientAddress(cbp, reqContext, call);
+            callIGCallbackHeaders(cbp, reqContext, headers);
+            callIGCallbackGrpcServerMethod(cbp, reqContext, call.getMethodDescriptor());
         }
-      }
-    }
-  }
 
-  public static final class TracingServerCallListener<ReqT>
-      extends ForwardingServerCallListener.SimpleForwardingServerCallListener<ReqT> {
-    private final AgentSpan span;
+        DECORATE.afterStart(span);
+        DECORATE.onCall(span, call);
+
+        final ServerCall.Listener<ReqT> result;
+        try (ContextScope scope = activateSpan(span)) {
+            // Wrap the server call so that we can decorate the span
+            // with the resulting status
+            final TracingServerCall<ReqT, RespT> tracingServerCall = new TracingServerCall<>(span, call);
+            // call other interceptors
+            result = next.startCall(tracingServerCall, headers);
+        } catch (final Throwable e) {
+            if (span.phasedFinish()) {
+                DECORATE.onError(span, e);
+                DECORATE.beforeFinish(span);
+                callIGCallbackRequestEnded(span);
+                span.publish();
+            }
+            throw e;
+        }
 
-    TracingServerCallListener(final AgentSpan span, final ServerCall.Listener<ReqT> delegate) {
-      super(delegate);
-      this.span = span;
+        // This ensures the server implementation can see the span in scope
+        return new TracingServerCallListener<>(span, result);
     }
 
-    @Override
-    public void onMessage(final ReqT message) {
-      final AgentSpan msgSpan =
-          startSpan(DECORATE.instrumentationNames()[0], GRPC_MESSAGE, this.span.spanContext())
-              .setTag("message.type", message.getClass().getName());
-      DECORATE.afterStart(msgSpan);
-      try (ContextScope scope = activateSpan(msgSpan)) {
-        callIGCallbackGrpcMessage(msgSpan, message);
-        delegate().onMessage(message);
-      } catch (final Throwable e) {
-        // I'm not convinced we should actually be finishing the span here...
-        if (span.phasedFinish()) {
-          DECORATE.onError(msgSpan, e);
-          DECORATE.beforeFinish(span);
-          callIGCallbackRequestEnded(span);
-          span.publish();
+    static final class TracingServerCall<ReqT, RespT>
+            extends ForwardingServerCall.SimpleForwardingServerCall<ReqT, RespT> {
+        final AgentSpan span;
+
+        TracingServerCall(final AgentSpan span, final ServerCall<ReqT, RespT> delegate) {
+            super(delegate);
+            this.span = span;
         }
-        throw e;
-      } finally {
-        DECORATE.beforeFinish(msgSpan);
-        msgSpan.finish();
-      }
-    }
 
-    @Override
-    public void onHalfClose() {
-      try (final ContextScope scope = activateSpan(span)) {
-        delegate().onHalfClose();
-      } catch (final Throwable e) {
-        if (span.phasedFinish()) {
-          DECORATE.onError(span, e);
-          DECORATE.beforeFinish(span);
-          callIGCallbackRequestEnded(span);
-          span.publish();
+        @Override
+        public void close(final Status status, final Metadata trailers) {
+            DECORATE.onClose(span, status);
+            try (final ContextScope scope = activateSpan(span)) {
+                delegate().close(status, trailers);
+            } catch (final Throwable e) {
+                DECORATE.onError(span, e);
+                throw e;
+            } finally {
+                if (span.phasedFinish()) {
+                    DECORATE.beforeFinish(span);
+                    callIGCallbackRequestEnded(span);
+                    span.publish();
+                }
+            }
         }
-        throw e;
-      }
     }
 
-    @Override
-    public void onCancel() {
-      // Finishes span.
-      try (final ContextScope scope = activateSpan(span)) {
-        delegate().onCancel();
-        span.setTag("canceled", true);
-      } catch (CancellationException e) {
-        // No need to report an exception or mark as error that it was canceled.
-        throw e;
-      } catch (final Throwable e) {
-        DECORATE.onError(span, e);
-        throw e;
-      } finally {
-        if (span.phasedFinish()) {
-          DECORATE.beforeFinish(span);
-          callIGCallbackRequestEnded(span);
-          span.publish();
+    public static final class TracingServerCallListener<ReqT>
+            extends ForwardingServerCallListener.SimpleForwardingServerCallListener<ReqT> {
+        private final AgentSpan span;
+
+        TracingServerCallListener(final AgentSpan span, final ServerCall.Listener<ReqT> delegate) {
+            super(delegate);
+            this.span = span;
         }
-      }
-    }
 
-    @Override
-    public void onComplete() {
-      // Finishes span.
-      try (final ContextScope scope = activateSpan(span)) {
-        delegate().onComplete();
-      } catch (final Throwable e) {
-        DECORATE.onError(span, e);
-        throw e;
-      } finally {
-        /**
-         * grpc has quite a few states that can finish the span. rather than track down the correct
-         * combination of them to exclusively finish the span, use phasedFinish.
-         */
-        if (span.phasedFinish()) {
-          DECORATE.beforeFinish(span);
-          callIGCallbackRequestEnded(span);
-          span.publish();
+        @Override
+        public void onMessage(final ReqT message) {
+            final AgentSpan msgSpan = startSpan(
+                            DECORATE.instrumentationNames()[0], GRPC_MESSAGE, this.span.spanContext())
+                    .setTag("message.type", message.getClass().getName());
+            DECORATE.afterStart(msgSpan);
+            try (ContextScope scope = activateSpan(msgSpan)) {
+                callIGCallbackGrpcMessage(msgSpan, message);
+                delegate().onMessage(message);
+            } catch (final Throwable e) {
+                // I'm not convinced we should actually be finishing the span here...
+                if (span.phasedFinish()) {
+                    DECORATE.onError(msgSpan, e);
+                    DECORATE.beforeFinish(span);
+                    callIGCallbackRequestEnded(span);
+                    span.publish();
+                }
+                throw e;
+            } finally {
+                DECORATE.beforeFinish(msgSpan);
+                msgSpan.finish();
+            }
         }
-      }
-    }
 
-    @Override
-    public void onReady() {
-      try (final ContextScope scope = activateSpan(span)) {
-        delegate().onReady();
-      } catch (final Throwable e) {
-        if (span.phasedFinish()) {
-          DECORATE.onError(span, e);
-          DECORATE.beforeFinish(span);
-          callIGCallbackRequestEnded(span);
-          span.publish();
+        @Override
+        public void onHalfClose() {
+            try (final ContextScope scope = activateSpan(span)) {
+                delegate().onHalfClose();
+            } catch (final Throwable e) {
+                if (span.phasedFinish()) {
+                    DECORATE.onError(span, e);
+                    DECORATE.beforeFinish(span);
+                    callIGCallbackRequestEnded(span);
+                    span.publish();
+                }
+                throw e;
+            }
         }
-        throw e;
-      }
-    }
-  }
 
-  // IG helpers follow
+        @Override
+        public void onCancel() {
+            // Finishes span.
+            try (final ContextScope scope = activateSpan(span)) {
+                delegate().onCancel();
+                span.setTag("canceled", true);
+            } catch (CancellationException e) {
+                // No need to report an exception or mark as error that it was canceled.
+                throw e;
+            } catch (final Throwable e) {
+                DECORATE.onError(span, e);
+                throw e;
+            } finally {
+                if (span.phasedFinish()) {
+                    DECORATE.beforeFinish(span);
+                    callIGCallbackRequestEnded(span);
+                    span.publish();
+                }
+            }
+        }
 
-  private static AgentSpanContext callIGCallbackRequestStarted(
-      AgentTracer.TracerAPI cbp, AgentSpanContext context) {
-    Supplier<Flow<Object>> startedCbAppSec =
-        cbp.getCallbackProvider(RequestContextSlot.APPSEC).getCallback(EVENTS.requestStarted());
-    Supplier<Flow<Object>> startedCbIast =
-        cbp.getCallbackProvider(RequestContextSlot.IAST).getCallback(EVENTS.requestStarted());
+        @Override
+        public void onComplete() {
+            // Finishes span.
+            try (final ContextScope scope = activateSpan(span)) {
+                delegate().onComplete();
+            } catch (final Throwable e) {
+                DECORATE.onError(span, e);
+                throw e;
+            } finally {
+                /**
+                 * grpc has quite a few states that can finish the span. rather than track down the correct
+                 * combination of them to exclusively finish the span, use phasedFinish.
+                 */
+                if (span.phasedFinish()) {
+                    DECORATE.beforeFinish(span);
+                    callIGCallbackRequestEnded(span);
+                    span.publish();
+                }
+            }
+        }
 
-    if (startedCbAppSec == null && startedCbIast == null) {
-      return context;
+        @Override
+        public void onReady() {
+            try (final ContextScope scope = activateSpan(span)) {
+                delegate().onReady();
+            } catch (final Throwable e) {
+                if (span.phasedFinish()) {
+                    DECORATE.onError(span, e);
+                    DECORATE.beforeFinish(span);
+                    callIGCallbackRequestEnded(span);
+                    span.publish();
+                }
+                throw e;
+            }
+        }
     }
 
-    TagContext tagContext = null;
-    if (context == null) {
-      tagContext = new TagContext();
-    } else if (context instanceof TagContext) {
-      tagContext = (TagContext) context;
-    }
-    if (tagContext != null) {
-      if (startedCbAppSec != null) {
-        Flow<Object> flowAppSec = startedCbAppSec.get();
-        tagContext.withRequestContextDataAppSec(flowAppSec.getResult());
-      }
-      if (startedCbIast != null) {
-        Flow<Object> flowIast = startedCbIast.get();
-        tagContext.withRequestContextDataIast(flowIast.getResult());
-      }
-      return tagContext;
-    }
+    // IG helpers follow
 
-    return context;
-  }
+    private static AgentSpanContext callIGCallbackRequestStarted(AgentTracer.TracerAPI cbp, AgentSpanContext context) {
+        Supplier<Flow<Object>> startedCbAppSec =
+                cbp.getCallbackProvider(RequestContextSlot.APPSEC).getCallback(EVENTS.requestStarted());
+        Supplier<Flow<Object>> startedCbIast =
+                cbp.getCallbackProvider(RequestContextSlot.IAST).getCallback(EVENTS.requestStarted());
 
-  private static <ReqT, RespT> void callIGCallbackClientAddress(
-      CallbackProvider cbp, RequestContext ctx, ServerCall<ReqT, RespT> call) {
-    SocketAddress socketAddress = call.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR);
-    TriFunction<RequestContext, String, Integer, Flow<Void>> cb =
-        cbp.getCallback(EVENTS.requestClientSocketAddress());
-    if (socketAddress == null || !(socketAddress instanceof InetSocketAddress) || cb == null) {
-      return;
-    }
+        if (startedCbAppSec == null && startedCbIast == null) {
+            return context;
+        }
 
-    InetSocketAddress inetSockAddr = (InetSocketAddress) socketAddress;
-    cb.apply(ctx, inetSockAddr.getHostString(), inetSockAddr.getPort());
-  }
+        TagContext tagContext = null;
+        if (context == null) {
+            tagContext = new TagContext();
+        } else if (context instanceof TagContext) {
+            tagContext = (TagContext) context;
+        }
+        if (tagContext != null) {
+            if (startedCbAppSec != null) {
+                Flow<Object> flowAppSec = startedCbAppSec.get();
+                tagContext.withRequestContextDataAppSec(flowAppSec.getResult());
+            }
+            if (startedCbIast != null) {
+                Flow<Object> flowIast = startedCbIast.get();
+                tagContext.withRequestContextDataIast(flowIast.getResult());
+            }
+            return tagContext;
+        }
 
-  private static void callIGCallbackHeaders(
-      CallbackProvider cbp, RequestContext reqCtx, Metadata metadata) {
-    TriConsumer<RequestContext, String, String> headerCb = cbp.getCallback(EVENTS.requestHeader());
-    Function<RequestContext, Flow<Void>> headerEndCb = cbp.getCallback(EVENTS.requestHeaderDone());
-    if (headerCb == null || headerEndCb == null) {
-      return;
+        return context;
     }
-    for (String key : metadata.keys()) {
-      if (!key.endsWith(Metadata.BINARY_HEADER_SUFFIX) && !key.startsWith(":")) {
-        Metadata.Key<String> mdKey = KEY_CACHE.computeIfAbsent(key, KEY_MAKER);
-        for (String value : metadata.getAll(mdKey)) {
-          headerCb.accept(reqCtx, key, value);
+
+    private static <ReqT, RespT> void callIGCallbackClientAddress(
+            CallbackProvider cbp, RequestContext ctx, ServerCall<ReqT, RespT> call) {
+        SocketAddress socketAddress = call.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR);
+        TriFunction<RequestContext, String, Integer, Flow<Void>> cb =
+                cbp.getCallback(EVENTS.requestClientSocketAddress());
+        if (socketAddress == null || !(socketAddress instanceof InetSocketAddress) || cb == null) {
+            return;
         }
-      }
+
+        InetSocketAddress inetSockAddr = (InetSocketAddress) socketAddress;
+        cb.apply(ctx, inetSockAddr.getHostString(), inetSockAddr.getPort());
     }
 
-    headerEndCb.apply(reqCtx);
-  }
+    private static void callIGCallbackHeaders(CallbackProvider cbp, RequestContext reqCtx, Metadata metadata) {
+        TriConsumer<RequestContext, String, String> headerCb = cbp.getCallback(EVENTS.requestHeader());
+        Function<RequestContext, Flow<Void>> headerEndCb = cbp.getCallback(EVENTS.requestHeaderDone());
+        if (headerCb == null || headerEndCb == null) {
+            return;
+        }
+        for (String key : metadata.keys()) {
+            if (!key.endsWith(Metadata.BINARY_HEADER_SUFFIX) && !key.startsWith(":")) {
+                Metadata.Key<String> mdKey = KEY_CACHE.computeIfAbsent(key, KEY_MAKER);
+                for (String value : metadata.getAll(mdKey)) {
+                    headerCb.accept(reqCtx, key, value);
+                }
+            }
+        }
 
-  private static void callIGCallbackRequestEnded(@Nonnull final AgentSpan span) {
-    CallbackProvider cbp = tracer().getUniversalCallbackProvider();
-    if (cbp == null) {
-      return;
+        headerEndCb.apply(reqCtx);
     }
-    RequestContext requestContext = span.getRequestContext();
-    if (requestContext != null) {
-      BiFunction<RequestContext, IGSpanInfo, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestEnded());
-      if (callback != null) {
-        callback.apply(requestContext, span);
-      }
-    }
-  }
-
-  private static <ReqT, RespT> void callIGCallbackGrpcServerMethod(
-      CallbackProvider cbp, RequestContext ctx, MethodDescriptor<ReqT, RespT> methodDescriptor) {
-    String method = methodDescriptor.getFullMethodName();
-    BiFunction<RequestContext, String, Flow<Void>> cb = cbp.getCallback(EVENTS.grpcServerMethod());
-    if (method == null || cb == null) {
-      return;
-    }
-    cb.apply(ctx, method);
-  }
 
-  private static void callIGCallbackGrpcMessage(@Nonnull final AgentSpan span, Object obj) {
-    if (obj == null) {
-      return;
+    private static void callIGCallbackRequestEnded(@Nonnull final AgentSpan span) {
+        CallbackProvider cbp = tracer().getUniversalCallbackProvider();
+        if (cbp == null) {
+            return;
+        }
+        RequestContext requestContext = span.getRequestContext();
+        if (requestContext != null) {
+            BiFunction<RequestContext, IGSpanInfo, Flow<Void>> callback = cbp.getCallback(EVENTS.requestEnded());
+            if (callback != null) {
+                callback.apply(requestContext, span);
+            }
+        }
     }
 
-    CallbackProvider cbpAppsec = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
-    CallbackProvider cbpIast = tracer().getCallbackProvider(RequestContextSlot.IAST);
-    if (cbpAppsec == null && cbpIast == null) {
-      return;
-    }
-    RequestContext requestContext = span.getRequestContext();
-    if (requestContext == null) {
-      return;
+    private static <ReqT, RespT> void callIGCallbackGrpcServerMethod(
+            CallbackProvider cbp, RequestContext ctx, MethodDescriptor<ReqT, RespT> methodDescriptor) {
+        String method = methodDescriptor.getFullMethodName();
+        BiFunction<RequestContext, String, Flow<Void>> cb = cbp.getCallback(EVENTS.grpcServerMethod());
+        if (method == null || cb == null) {
+            return;
+        }
+        cb.apply(ctx, method);
     }
 
-    if (cbpAppsec != null) {
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbpAppsec.getCallback(EVENTS.grpcServerRequestMessage());
-      if (callback != null) {
-        callback.apply(requestContext, obj);
-      }
-    }
+    private static void callIGCallbackGrpcMessage(@Nonnull final AgentSpan span, Object obj) {
+        if (obj == null) {
+            return;
+        }
 
-    if (cbpIast != null) {
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbpIast.getCallback(EVENTS.grpcServerRequestMessage());
-      if (callback != null) {
-        callback.apply(requestContext, obj);
-      }
+        CallbackProvider cbpAppsec = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
+        CallbackProvider cbpIast = tracer().getCallbackProvider(RequestContextSlot.IAST);
+        if (cbpAppsec == null && cbpIast == null) {
+            return;
+        }
+        RequestContext requestContext = span.getRequestContext();
+        if (requestContext == null) {
+            return;
+        }
+
+        if (cbpAppsec != null) {
+            BiFunction<RequestContext, Object, Flow<Void>> callback =
+                    cbpAppsec.getCallback(EVENTS.grpcServerRequestMessage());
+            if (callback != null) {
+                callback.apply(requestContext, obj);
+            }
+        }
+
+        if (cbpIast != null) {
+            BiFunction<RequestContext, Object, Flow<Void>> callback =
+                    cbpIast.getCallback(EVENTS.grpcServerRequestMessage());
+            if (callback != null) {
+                callback.apply(requestContext, obj);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java
index 6de993fa6d0..4aed5f763ee 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java
+++ b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java
@@ -13,34 +13,33 @@
 
 @AutoService(InstrumenterModule.class)
 public class ArmeriaHttpConnectionInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ArmeriaHttpConnectionInstrumentation() {
-    super("armeria-jetty", "armeria");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ArmeriaHttpConnectionInstrumentation() {
+        super("armeria-jetty", "armeria");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.HttpChannel";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.HttpChannel";
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("com.linecorp.armeria.server.ServiceRequestContext");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("com.linecorp.armeria.server.ServiceRequestContext");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(), getClass().getName() + "$JettyHttpChannelCaptureAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$JettyHttpChannelCaptureAdvice");
+    }
 
-  public static class JettyHttpChannelCaptureAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterInvoke(@Advice.This final HttpChannel channel) {
-      final ServiceRequestContext current = ServiceRequestContext.currentOrNull();
-      if (current != null) {
-        current.setAttr(AttributeKeys.HTTP_CHANNEL_ATTRIBUTE_KEY, channel);
-      }
+    public static class JettyHttpChannelCaptureAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterInvoke(@Advice.This final HttpChannel channel) {
+            final ServiceRequestContext current = ServiceRequestContext.currentOrNull();
+            if (current != null) {
+                current.setAttr(AttributeKeys.HTTP_CHANNEL_ATTRIBUTE_KEY, channel);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaJettyInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaJettyInstrumentation.java
index 33a79c89341..5f1e2aaf7ec 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaJettyInstrumentation.java
+++ b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaJettyInstrumentation.java
@@ -15,39 +15,35 @@
 
 @AutoService(InstrumenterModule.class)
 public class ArmeriaJettyInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ArmeriaJettyInstrumentation() {
-    super("armeria-jetty", "armeria");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ArmeriaJettyInstrumentation() {
+        super("armeria-jetty", "armeria");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.linecorp.armeria.server.jetty.JettyService";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.linecorp.armeria.server.jetty.JettyService";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("serve"))
-            .and(
-                returns(named("com.linecorp.armeria.common.HttpResponse"))
-                    .and(
-                        takesArgument(
-                            0, named("com.linecorp.armeria.server.ServiceRequestContext")))),
-        getClass().getName() + "$JettySpanCloserAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("serve"))
+                        .and(returns(named("com.linecorp.armeria.common.HttpResponse"))
+                                .and(takesArgument(0, named("com.linecorp.armeria.server.ServiceRequestContext")))),
+                getClass().getName() + "$JettySpanCloserAdvice");
+    }
 
-  public static class JettySpanCloserAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void afterInvoke(
-        @Advice.Return final HttpResponse response,
-        @Advice.Argument(0) ServiceRequestContext context) {
-      // get the current attribute value and clear it if existing
-      HttpChannel channel = context.setAttr(AttributeKeys.HTTP_CHANNEL_ATTRIBUTE_KEY, null);
-      if (channel != null) {
-        response.whenComplete().thenRun(channel::recycle);
-      }
+    public static class JettySpanCloserAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void afterInvoke(
+                @Advice.Return final HttpResponse response, @Advice.Argument(0) ServiceRequestContext context) {
+            // get the current attribute value and clear it if existing
+            HttpChannel channel = context.setAttr(AttributeKeys.HTTP_CHANNEL_ATTRIBUTE_KEY, null);
+            if (channel != null) {
+                response.whenComplete().thenRun(channel::recycle);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/AttributeKeys.java b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/AttributeKeys.java
index 340692f9c46..5eaa2e97b23 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/AttributeKeys.java
+++ b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/AttributeKeys.java
@@ -8,30 +8,29 @@
 
 public final class AttributeKeys {
 
-  private static final ClassValue<ConcurrentHashMap<String, AttributeKey<?>>> MAPS =
-      GenericClassValue.constructing(ConcurrentHashMap.class);
+    private static final ClassValue<ConcurrentHashMap<String, AttributeKey<?>>> MAPS =
+            GenericClassValue.constructing(ConcurrentHashMap.class);
 
-  public static final AttributeKey<HttpChannel> HTTP_CHANNEL_ATTRIBUTE_KEY =
-      attributeKey("dd.armeria.jetty.channel");
+    public static final AttributeKey<HttpChannel> HTTP_CHANNEL_ATTRIBUTE_KEY = attributeKey("dd.armeria.jetty.channel");
 
-  /**
-   * Generate an attribute key or reuse the one existing in the global app map. This implementation
-   * creates attributes only once even if the current class is loaded by several class loaders and
-   * prevents an issue with Apache Atlas project were this class loaded by multiple class loaders,
-   * while the Attribute class is loaded by a third class loader and used internally for the
-   * cassandra driver. note: drawn from netty module instrumentation
-   */
-  @SuppressWarnings("unchecked")
-  private static <T> AttributeKey<T> attributeKey(final String key) {
-    ConcurrentMap<String, AttributeKey<?>> map = MAPS.get(AttributeKey.class);
-    AttributeKey<T> attributeKey = (AttributeKey<T>) map.get(key);
-    if (null == attributeKey) {
-      attributeKey = AttributeKey.newInstance(key);
-      AttributeKey<T> predecessor = (AttributeKey<T>) map.putIfAbsent(key, attributeKey);
-      if (null != predecessor) {
-        attributeKey = predecessor;
-      }
+    /**
+     * Generate an attribute key or reuse the one existing in the global app map. This implementation
+     * creates attributes only once even if the current class is loaded by several class loaders and
+     * prevents an issue with Apache Atlas project were this class loaded by multiple class loaders,
+     * while the Attribute class is loaded by a third class loader and used internally for the
+     * cassandra driver. note: drawn from netty module instrumentation
+     */
+    @SuppressWarnings("unchecked")
+    private static <T> AttributeKey<T> attributeKey(final String key) {
+        ConcurrentMap<String, AttributeKey<?>> map = MAPS.get(AttributeKey.class);
+        AttributeKey<T> attributeKey = (AttributeKey<T>) map.get(key);
+        if (null == attributeKey) {
+            attributeKey = AttributeKey.newInstance(key);
+            AttributeKey<T> predecessor = (AttributeKey<T>) map.putIfAbsent(key, attributeKey);
+            if (null != predecessor) {
+                attributeKey = predecessor;
+            }
+        }
+        return attributeKey;
     }
-    return attributeKey;
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-common/src/main/java/datadog/trace/instrumentation/aws/ExpectedQueryParams.java b/dd-java-agent/instrumentation/aws-java/aws-java-common/src/main/java/datadog/trace/instrumentation/aws/ExpectedQueryParams.java
index 09478161b8d..2702314ab73 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-common/src/main/java/datadog/trace/instrumentation/aws/ExpectedQueryParams.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-common/src/main/java/datadog/trace/instrumentation/aws/ExpectedQueryParams.java
@@ -4,59 +4,59 @@
 import java.util.List;
 
 public final class ExpectedQueryParams {
-  private ExpectedQueryParams() {}
+    private ExpectedQueryParams() {}
 
-  public static List<String> getExpectedQueryParams(String operation) {
-    switch (operation) {
-      case "Publish":
-        return Arrays.asList("Action", "Version", "TopicArn", "Message");
-      case "PublishBatch":
-        return Arrays.asList(
-            "Action",
-            "Version",
-            "TopicArn",
-            "PublishBatchRequestEntries.member.1.Id",
-            "PublishBatchRequestEntries.member.1.Message",
-            "PublishBatchRequestEntries.member.2.Id",
-            "PublishBatchRequestEntries.member.2.Message");
-      case "AllocateAddress":
-      case "DeleteOptionGroup":
-        return Arrays.asList("Action", "Version");
-      case "CreateQueue":
-      case "GetQueueUrl":
-        return Arrays.asList("Action", "Version", "QueueName");
-      case "SendMessage":
-        return Arrays.asList("Action", "Version", "QueueUrl", "MessageBody");
-      case "DeleteMessage":
-        return Arrays.asList("Action", "Version", "QueueUrl", "ReceiptHandle");
-      case "ReceiveMessage":
-        return Arrays.asList("Action", "Version", "QueueUrl", "AttributeName.1");
-      case "SendMessageBatch":
-        return Arrays.asList(
-            "Action",
-            "Version",
-            "QueueUrl",
-            "SendMessageBatchRequestEntry.1.Id",
-            "SendMessageBatchRequestEntry.1.MessageBody",
-            "SendMessageBatchRequestEntry.2.Id",
-            "SendMessageBatchRequestEntry.2.MessageBody",
-            "SendMessageBatchRequestEntry.3.Id",
-            "SendMessageBatchRequestEntry.3.MessageBody",
-            "SendMessageBatchRequestEntry.4.Id",
-            "SendMessageBatchRequestEntry.4.MessageBody",
-            "SendMessageBatchRequestEntry.5.Id",
-            "SendMessageBatchRequestEntry.5.MessageBody");
-      case "DeleteMessageBatch":
-        return Arrays.asList(
-            "Action",
-            "Version",
-            "QueueUrl",
-            "DeleteMessageBatchRequestEntry.1.Id",
-            "DeleteMessageBatchRequestEntry.1.ReceiptHandle");
-      case "Mule":
-        return Arrays.asList("name");
-      default:
-        return null;
+    public static List<String> getExpectedQueryParams(String operation) {
+        switch (operation) {
+            case "Publish":
+                return Arrays.asList("Action", "Version", "TopicArn", "Message");
+            case "PublishBatch":
+                return Arrays.asList(
+                        "Action",
+                        "Version",
+                        "TopicArn",
+                        "PublishBatchRequestEntries.member.1.Id",
+                        "PublishBatchRequestEntries.member.1.Message",
+                        "PublishBatchRequestEntries.member.2.Id",
+                        "PublishBatchRequestEntries.member.2.Message");
+            case "AllocateAddress":
+            case "DeleteOptionGroup":
+                return Arrays.asList("Action", "Version");
+            case "CreateQueue":
+            case "GetQueueUrl":
+                return Arrays.asList("Action", "Version", "QueueName");
+            case "SendMessage":
+                return Arrays.asList("Action", "Version", "QueueUrl", "MessageBody");
+            case "DeleteMessage":
+                return Arrays.asList("Action", "Version", "QueueUrl", "ReceiptHandle");
+            case "ReceiveMessage":
+                return Arrays.asList("Action", "Version", "QueueUrl", "AttributeName.1");
+            case "SendMessageBatch":
+                return Arrays.asList(
+                        "Action",
+                        "Version",
+                        "QueueUrl",
+                        "SendMessageBatchRequestEntry.1.Id",
+                        "SendMessageBatchRequestEntry.1.MessageBody",
+                        "SendMessageBatchRequestEntry.2.Id",
+                        "SendMessageBatchRequestEntry.2.MessageBody",
+                        "SendMessageBatchRequestEntry.3.Id",
+                        "SendMessageBatchRequestEntry.3.MessageBody",
+                        "SendMessageBatchRequestEntry.4.Id",
+                        "SendMessageBatchRequestEntry.4.MessageBody",
+                        "SendMessageBatchRequestEntry.5.Id",
+                        "SendMessageBatchRequestEntry.5.MessageBody");
+            case "DeleteMessageBatch":
+                return Arrays.asList(
+                        "Action",
+                        "Version",
+                        "QueueUrl",
+                        "DeleteMessageBatchRequestEntry.1.Id",
+                        "DeleteMessageBatchRequestEntry.1.ReceiptHandle");
+            case "Mule":
+                return Arrays.asList("name");
+            default:
+                return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbClientInstrumentation.java
index 1498426cef1..1e63d745d66 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbClientInstrumentation.java
@@ -12,32 +12,32 @@
 
 @AutoService(InstrumenterModule.class)
 public final class DynamoDbClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public DynamoDbClientInstrumentation() {
-    super("dynamodb", "aws-dynamodb");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public DynamoDbClientInstrumentation() {
+        super("dynamodb", "aws-dynamodb");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder";
-  }
+    @Override
+    public String instrumentedType() {
+        return "software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("resolveExecutionInterceptors")),
-        DynamoDbClientInstrumentation.class.getName() + "$AwsDynamoDbBuilderAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("resolveExecutionInterceptors")),
+                DynamoDbClientInstrumentation.class.getName() + "$AwsDynamoDbBuilderAdvice");
+    }
 
-  public static class AwsDynamoDbBuilderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void addHandler(@Advice.Return final List<ExecutionInterceptor> interceptors) {
-      for (ExecutionInterceptor interceptor : interceptors) {
-        if (interceptor instanceof DynamoDbInterceptor) {
-          return; // list already has our interceptor, return to builder
+    public static class AwsDynamoDbBuilderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void addHandler(@Advice.Return final List<ExecutionInterceptor> interceptors) {
+            for (ExecutionInterceptor interceptor : interceptors) {
+                if (interceptor instanceof DynamoDbInterceptor) {
+                    return; // list already has our interceptor, return to builder
+                }
+            }
+            interceptors.add(new DynamoDbInterceptor());
         }
-      }
-      interceptors.add(new DynamoDbInterceptor());
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbInterceptor.java
index a192f3d38a1..b88cf59019e 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbInterceptor.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbInterceptor.java
@@ -19,34 +19,33 @@
 import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
 
 public class DynamoDbInterceptor implements ExecutionInterceptor {
-  private static final Logger log = LoggerFactory.getLogger(DynamoDbInterceptor.class);
-
-  public static final ExecutionAttribute<Context> CONTEXT_ATTRIBUTE =
-      InstanceStore.of(ExecutionAttribute.class)
-          .getOrCreate("DatadogContext", () -> new ExecutionAttribute<>("DatadogContext"));
-
-  private static final boolean CAN_ADD_SPAN_POINTERS = Config.get().isAddSpanPointers("aws");
-
-  @Override
-  public void afterExecution(AfterExecution context, ExecutionAttributes executionAttributes) {
-    if (!CAN_ADD_SPAN_POINTERS) {
-      return;
-    }
-
-    Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
-    AgentSpan span = fromContext(ddContext);
-    if (span == null) {
-      log.debug("Unable to find DynamoDb request span. Not creating span pointer.");
-      return;
-    }
-
-    SdkRequest request = context.request();
-    if (request instanceof UpdateItemRequest) {
-      Map<String, AttributeValue> keys = ((UpdateItemRequest) request).key();
-      DynamoDbUtil.exportTagsWithKnownKeys(span, keys);
-    } else if (request instanceof DeleteItemRequest) {
-      Map<String, AttributeValue> keys = ((DeleteItemRequest) request).key();
-      DynamoDbUtil.exportTagsWithKnownKeys(span, keys);
+    private static final Logger log = LoggerFactory.getLogger(DynamoDbInterceptor.class);
+
+    public static final ExecutionAttribute<Context> CONTEXT_ATTRIBUTE = InstanceStore.of(ExecutionAttribute.class)
+            .getOrCreate("DatadogContext", () -> new ExecutionAttribute<>("DatadogContext"));
+
+    private static final boolean CAN_ADD_SPAN_POINTERS = Config.get().isAddSpanPointers("aws");
+
+    @Override
+    public void afterExecution(AfterExecution context, ExecutionAttributes executionAttributes) {
+        if (!CAN_ADD_SPAN_POINTERS) {
+            return;
+        }
+
+        Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
+        AgentSpan span = fromContext(ddContext);
+        if (span == null) {
+            log.debug("Unable to find DynamoDb request span. Not creating span pointer.");
+            return;
+        }
+
+        SdkRequest request = context.request();
+        if (request instanceof UpdateItemRequest) {
+            Map<String, AttributeValue> keys = ((UpdateItemRequest) request).key();
+            DynamoDbUtil.exportTagsWithKnownKeys(span, keys);
+        } else if (request instanceof DeleteItemRequest) {
+            Map<String, AttributeValue> keys = ((DeleteItemRequest) request).key();
+            DynamoDbUtil.exportTagsWithKnownKeys(span, keys);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbUtil.java b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbUtil.java
index 021965bec22..6c1911c2554 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbUtil.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbUtil.java
@@ -13,60 +13,60 @@
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 
 public class DynamoDbUtil {
-  /**
-   * Extracts a string value from a DynamoDB AttributeValue.
-   *
-   * @param value The AttributeValue to extract from
-   * @return The extracted string value
-   */
-  private static String extractValueAsString(AttributeValue value) {
-    if (value == null) {
-      return "";
-    }
-
-    if (value.s() != null) {
-      return value.s();
-    } else if (value.n() != null) {
-      return value.n();
-    } else if (value.b() != null) {
-      // For binary values, convert the bytes back to string
-      return new String(value.b().asByteArray(), java.nio.charset.Charset.defaultCharset());
-    }
+    /**
+     * Extracts a string value from a DynamoDB AttributeValue.
+     *
+     * @param value The AttributeValue to extract from
+     * @return The extracted string value
+     */
+    private static String extractValueAsString(AttributeValue value) {
+        if (value == null) {
+            return "";
+        }
 
-    return "";
-  }
+        if (value.s() != null) {
+            return value.s();
+        } else if (value.n() != null) {
+            return value.n();
+        } else if (value.b() != null) {
+            // For binary values, convert the bytes back to string
+            return new String(value.b().asByteArray(), java.nio.charset.Charset.defaultCharset());
+        }
 
-  /**
-   * Gets primary key/values and exports them as temporary tags on the span so that
-   * SpanPointersProcessor.java can complete the span pointer creation.
-   *
-   * @param span The span to set the temporary tags on
-   * @param keys The primary key/values to extract from
-   */
-  static void exportTagsWithKnownKeys(AgentSpan span, Map<String, AttributeValue> keys) {
-    if (keys == null || keys.isEmpty()) {
-      return;
+        return "";
     }
 
-    if (keys.size() == 1) {
-      // Single primary key case
-      Map.Entry<String, AttributeValue> entry = keys.entrySet().iterator().next();
-      span.setTag(DYNAMO_PRIMARY_KEY_1, entry.getKey());
-      span.setTag(DYNAMO_PRIMARY_KEY_1_VALUE, extractValueAsString(entry.getValue()));
-    } else {
-      // Sort keys alphabetically
-      List<String> keyNames = new ArrayList<>(keys.keySet());
-      Collections.sort(keyNames);
+    /**
+     * Gets primary key/values and exports them as temporary tags on the span so that
+     * SpanPointersProcessor.java can complete the span pointer creation.
+     *
+     * @param span The span to set the temporary tags on
+     * @param keys The primary key/values to extract from
+     */
+    static void exportTagsWithKnownKeys(AgentSpan span, Map<String, AttributeValue> keys) {
+        if (keys == null || keys.isEmpty()) {
+            return;
+        }
+
+        if (keys.size() == 1) {
+            // Single primary key case
+            Map.Entry<String, AttributeValue> entry = keys.entrySet().iterator().next();
+            span.setTag(DYNAMO_PRIMARY_KEY_1, entry.getKey());
+            span.setTag(DYNAMO_PRIMARY_KEY_1_VALUE, extractValueAsString(entry.getValue()));
+        } else {
+            // Sort keys alphabetically
+            List<String> keyNames = new ArrayList<>(keys.keySet());
+            Collections.sort(keyNames);
 
-      // First key (alphabetically)
-      String primaryKey1Name = keyNames.get(0);
-      span.setTag(DYNAMO_PRIMARY_KEY_1, primaryKey1Name);
-      span.setTag(DYNAMO_PRIMARY_KEY_1_VALUE, extractValueAsString(keys.get(primaryKey1Name)));
+            // First key (alphabetically)
+            String primaryKey1Name = keyNames.get(0);
+            span.setTag(DYNAMO_PRIMARY_KEY_1, primaryKey1Name);
+            span.setTag(DYNAMO_PRIMARY_KEY_1_VALUE, extractValueAsString(keys.get(primaryKey1Name)));
 
-      // Second key
-      String primaryKey2Name = keyNames.get(1);
-      span.setTag(DYNAMO_PRIMARY_KEY_2, primaryKey2Name);
-      span.setTag(DYNAMO_PRIMARY_KEY_2_VALUE, extractValueAsString(keys.get(primaryKey2Name)));
+            // Second key
+            String primaryKey2Name = keyNames.get(1);
+            span.setTag(DYNAMO_PRIMARY_KEY_2, primaryKey2Name);
+            span.setTag(DYNAMO_PRIMARY_KEY_2_VALUE, extractValueAsString(keys.get(primaryKey2Name)));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java
index c74b5c36e65..a5a19818520 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java
@@ -12,32 +12,32 @@
 
 @AutoService(InstrumenterModule.class)
 public final class EventBridgeClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public EventBridgeClientInstrumentation() {
-    super("eventbridge");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public EventBridgeClientInstrumentation() {
+        super("eventbridge");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder";
-  }
+    @Override
+    public String instrumentedType() {
+        return "software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("resolveExecutionInterceptors")),
-        EventBridgeClientInstrumentation.class.getName() + "$AwsEventBridgeBuilderAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("resolveExecutionInterceptors")),
+                EventBridgeClientInstrumentation.class.getName() + "$AwsEventBridgeBuilderAdvice");
+    }
 
-  public static class AwsEventBridgeBuilderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void addHandler(@Advice.Return final List<ExecutionInterceptor> interceptors) {
-      for (ExecutionInterceptor interceptor : interceptors) {
-        if (interceptor instanceof EventBridgeInterceptor) {
-          return; // list already has our interceptor, return to builder
+    public static class AwsEventBridgeBuilderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void addHandler(@Advice.Return final List<ExecutionInterceptor> interceptors) {
+            for (ExecutionInterceptor interceptor : interceptors) {
+                if (interceptor instanceof EventBridgeInterceptor) {
+                    return; // list already has our interceptor, return to builder
+                }
+            }
+            interceptors.add(new EventBridgeInterceptor());
         }
-      }
-      interceptors.add(new EventBridgeInterceptor());
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java
index 3672b49b88d..5c8f73f3731 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java
@@ -24,135 +24,130 @@
 import software.amazon.awssdk.services.eventbridge.model.PutEventsRequestEntry;
 
 public class EventBridgeInterceptor implements ExecutionInterceptor {
-  private static final Logger log = LoggerFactory.getLogger(EventBridgeInterceptor.class);
-  private static final String DEFAULT_EVENT_BUS_NAME = "default";
-  private static final String EVENT_BUS_ARN_PREFIX = "event-bus/";
-
-  public static final ExecutionAttribute<Context> CONTEXT_ATTRIBUTE =
-      InstanceStore.of(ExecutionAttribute.class)
-          .getOrCreate("DatadogContext", () -> new ExecutionAttribute<>("DatadogContext"));
-
-  private static final String START_TIME_KEY = "x-datadog-start-time";
-  private static final String RESOURCE_NAME_KEY = "x-datadog-resource-name";
-
-  @Override
-  public SdkRequest modifyRequest(ModifyRequest context, ExecutionAttributes executionAttributes) {
-    if (!(context.request() instanceof PutEventsRequest)
-        || !Config.get().isEventbridgeInjectDatadogAttributeEnabled()) {
-      return context.request();
+    private static final Logger log = LoggerFactory.getLogger(EventBridgeInterceptor.class);
+    private static final String DEFAULT_EVENT_BUS_NAME = "default";
+    private static final String EVENT_BUS_ARN_PREFIX = "event-bus/";
+
+    public static final ExecutionAttribute<Context> CONTEXT_ATTRIBUTE = InstanceStore.of(ExecutionAttribute.class)
+            .getOrCreate("DatadogContext", () -> new ExecutionAttribute<>("DatadogContext"));
+
+    private static final String START_TIME_KEY = "x-datadog-start-time";
+    private static final String RESOURCE_NAME_KEY = "x-datadog-resource-name";
+
+    @Override
+    public SdkRequest modifyRequest(ModifyRequest context, ExecutionAttributes executionAttributes) {
+        if (!(context.request() instanceof PutEventsRequest)
+                || !Config.get().isEventbridgeInjectDatadogAttributeEnabled()) {
+            return context.request();
+        }
+
+        PutEventsRequest request = (PutEventsRequest) context.request();
+        List<PutEventsRequestEntry> modifiedEntries =
+                new ArrayList<>(request.entries().size());
+        long startTime = System.currentTimeMillis();
+
+        for (PutEventsRequestEntry entry : request.entries()) {
+            StringBuilder detailBuilder = new StringBuilder(entry.detail().trim());
+            if (detailBuilder.length() == 0) {
+                detailBuilder.append("{}");
+            }
+            if (detailBuilder.charAt(detailBuilder.length() - 1) != '}') {
+                log.debug("Unable to parse detail JSON. Not injecting trace context into EventBridge payload.");
+                modifiedEntries.add(entry); // Add the original entry without modification
+                continue;
+            }
+
+            String traceContext =
+                    getTraceContextToInject(executionAttributes, entry.eventBusName(), entry.detailType(), startTime);
+            detailBuilder.setLength(detailBuilder.length() - 1); // Remove the last bracket
+            if (detailBuilder.length() > 1) {
+                detailBuilder.append(", "); // Only add a comma if detail is not empty.
+            }
+
+            detailBuilder
+                    .append('\"')
+                    .append(PathwayContext.DATADOG_KEY)
+                    .append("\": ")
+                    .append(traceContext)
+                    .append('}');
+
+            String modifiedDetail = detailBuilder.toString();
+            PutEventsRequestEntry modifiedEntry =
+                    entry.toBuilder().detail(modifiedDetail).build();
+            modifiedEntries.add(modifiedEntry);
+        }
+
+        return request.toBuilder().entries(modifiedEntries).build();
     }
 
-    PutEventsRequest request = (PutEventsRequest) context.request();
-    List<PutEventsRequestEntry> modifiedEntries = new ArrayList<>(request.entries().size());
-    long startTime = System.currentTimeMillis();
-
-    for (PutEventsRequestEntry entry : request.entries()) {
-      StringBuilder detailBuilder = new StringBuilder(entry.detail().trim());
-      if (detailBuilder.length() == 0) {
-        detailBuilder.append("{}");
-      }
-      if (detailBuilder.charAt(detailBuilder.length() - 1) != '}') {
-        log.debug(
-            "Unable to parse detail JSON. Not injecting trace context into EventBridge payload.");
-        modifiedEntries.add(entry); // Add the original entry without modification
-        continue;
-      }
-
-      String traceContext =
-          getTraceContextToInject(
-              executionAttributes, entry.eventBusName(), entry.detailType(), startTime);
-      detailBuilder.setLength(detailBuilder.length() - 1); // Remove the last bracket
-      if (detailBuilder.length() > 1) {
-        detailBuilder.append(", "); // Only add a comma if detail is not empty.
-      }
-
-      detailBuilder
-          .append('\"')
-          .append(PathwayContext.DATADOG_KEY)
-          .append("\": ")
-          .append(traceContext)
-          .append('}');
-
-      String modifiedDetail = detailBuilder.toString();
-      PutEventsRequestEntry modifiedEntry = entry.toBuilder().detail(modifiedDetail).build();
-      modifiedEntries.add(modifiedEntry);
+    private String getTraceContextToInject(
+            ExecutionAttributes executionAttributes, String eventBusName, String detailType, long startTime) {
+        Context context = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
+        String resourceName = eventBusName == null || eventBusName.isEmpty() ? DEFAULT_EVENT_BUS_NAME : eventBusName;
+        StringBuilder jsonBuilder = new StringBuilder();
+        jsonBuilder.append('{');
+
+        // Inject context
+        if (traceConfig().isDataStreamsEnabled()) {
+            DataStreamsTags tags = buildDataStreamsTags(eventBusName, detailType);
+            DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
+            context = context.with(dsmContext);
+        }
+        defaultPropagator().inject(context, jsonBuilder, SETTER);
+
+        // Add bus name and start time
+        jsonBuilder
+                .append(" \"")
+                .append(START_TIME_KEY)
+                .append("\": \"")
+                .append(startTime)
+                .append("\", ");
+        jsonBuilder
+                .append(" \"")
+                .append(RESOURCE_NAME_KEY)
+                .append("\": \"")
+                .append(resourceName)
+                .append('\"');
+
+        jsonBuilder.append('}');
+        return jsonBuilder.toString();
     }
 
-    return request.toBuilder().entries(modifiedEntries).build();
-  }
-
-  private String getTraceContextToInject(
-      ExecutionAttributes executionAttributes,
-      String eventBusName,
-      String detailType,
-      long startTime) {
-    Context context = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
-    String resourceName =
-        eventBusName == null || eventBusName.isEmpty() ? DEFAULT_EVENT_BUS_NAME : eventBusName;
-    StringBuilder jsonBuilder = new StringBuilder();
-    jsonBuilder.append('{');
-
-    // Inject context
-    if (traceConfig().isDataStreamsEnabled()) {
-      DataStreamsTags tags = buildDataStreamsTags(eventBusName, detailType);
-      DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
-      context = context.with(dsmContext);
-    }
-    defaultPropagator().inject(context, jsonBuilder, SETTER);
-
-    // Add bus name and start time
-    jsonBuilder
-        .append(" \"")
-        .append(START_TIME_KEY)
-        .append("\": \"")
-        .append(startTime)
-        .append("\", ");
-    jsonBuilder
-        .append(" \"")
-        .append(RESOURCE_NAME_KEY)
-        .append("\": \"")
-        .append(resourceName)
-        .append('\"');
-
-    jsonBuilder.append('}');
-    return jsonBuilder.toString();
-  }
-
-  static DataStreamsTags buildDataStreamsTags(String eventBusName, String detailType) {
-    return new DataStreamsTags(
-        null,
-        OUTBOUND,
-        normalizeEventBusName(eventBusName),
-        normalizeDetailType(detailType),
-        "eventbridge",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null);
-  }
-
-  static String normalizeEventBusName(String eventBusName) {
-    if (eventBusName == null || eventBusName.isEmpty()) {
-      return DEFAULT_EVENT_BUS_NAME;
+    static DataStreamsTags buildDataStreamsTags(String eventBusName, String detailType) {
+        return new DataStreamsTags(
+                null,
+                OUTBOUND,
+                normalizeEventBusName(eventBusName),
+                normalizeDetailType(detailType),
+                "eventbridge",
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null);
     }
 
-    // EventBridge ARNs embed the full bus name after "event-bus/", including partner bus paths.
-    int arnBusNameStart = eventBusName.indexOf(EVENT_BUS_ARN_PREFIX);
-    if (arnBusNameStart >= 0) {
-      return eventBusName.substring(arnBusNameStart + EVENT_BUS_ARN_PREFIX.length());
+    static String normalizeEventBusName(String eventBusName) {
+        if (eventBusName == null || eventBusName.isEmpty()) {
+            return DEFAULT_EVENT_BUS_NAME;
+        }
+
+        // EventBridge ARNs embed the full bus name after "event-bus/", including partner bus paths.
+        int arnBusNameStart = eventBusName.indexOf(EVENT_BUS_ARN_PREFIX);
+        if (arnBusNameStart >= 0) {
+            return eventBusName.substring(arnBusNameStart + EVENT_BUS_ARN_PREFIX.length());
+        }
+        return eventBusName;
     }
-    return eventBusName;
-  }
 
-  static String normalizeDetailType(String detailType) {
-    if (detailType == null || detailType.isEmpty()) {
-      return null;
+    static String normalizeDetailType(String detailType) {
+        if (detailType == null || detailType.isEmpty()) {
+            return null;
+        }
+        return detailType;
     }
-    return detailType;
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/TextMapInjectAdapter.java b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/TextMapInjectAdapter.java
index f89f0a28f75..7ffdaeb18b0 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/TextMapInjectAdapter.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/TextMapInjectAdapter.java
@@ -6,10 +6,10 @@
 @ParametersAreNonnullByDefault
 public class TextMapInjectAdapter implements CarrierSetter<StringBuilder> {
 
-  public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
+    public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
 
-  @Override
-  public void set(final StringBuilder builder, final String key, final String value) {
-    builder.append('"').append(key).append("\":\"").append(value).append("\",");
-  }
+    @Override
+    public void set(final StringBuilder builder, final String key, final String value) {
+        builder.append('"').append(key).append("\":\"").append(value).append("\",");
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/test/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptorTest.java b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/test/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptorTest.java
index b30ccec011a..885b2dfd161 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/test/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptorTest.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/test/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptorTest.java
@@ -8,44 +8,39 @@
 
 class EventBridgeInterceptorTest {
 
-  @Test
-  void buildsDataStreamsTagsFromArnAndDetailType() {
-    DataStreamsTags tags =
-        EventBridgeInterceptor.buildDataStreamsTags(
-            "arn:aws:events:us-east-1:123456789012:event-bus/test-bus", "order.created");
-
-    assertEquals(DataStreamsTags.DIRECTION_TAG + ":out", tags.getDirection());
-    assertEquals(DataStreamsTags.EXCHANGE_TAG + ":test-bus", tags.getExchange());
-    assertEquals(DataStreamsTags.TOPIC_TAG + ":order.created", tags.getTopic());
-    assertEquals(DataStreamsTags.TYPE_TAG + ":eventbridge", tags.getType());
-  }
-
-  @Test
-  void keepsPartnerBusPathWhenNormalizingArn() {
-    DataStreamsTags tags =
-        EventBridgeInterceptor.buildDataStreamsTags(
-            "arn:aws:events:us-east-1:123456789012:event-bus/aws.partner/example.com/acct/bus-name",
-            "detail-type");
-
-    assertEquals(
-        DataStreamsTags.EXCHANGE_TAG + ":aws.partner/example.com/acct/bus-name",
-        tags.getExchange());
-    assertEquals(DataStreamsTags.TOPIC_TAG + ":detail-type", tags.getTopic());
-  }
-
-  @Test
-  void defaultsToTheDefaultEventBusNameWhenMissing() {
-    DataStreamsTags tags = EventBridgeInterceptor.buildDataStreamsTags(null, "detail-type");
-
-    assertEquals(DataStreamsTags.EXCHANGE_TAG + ":default", tags.getExchange());
-    assertEquals(DataStreamsTags.TOPIC_TAG + ":detail-type", tags.getTopic());
-  }
-
-  @Test
-  void omitsTheTopicTagWhenDetailTypeIsMissing() {
-    DataStreamsTags tags = EventBridgeInterceptor.buildDataStreamsTags("test-bus", null);
-
-    assertEquals(DataStreamsTags.EXCHANGE_TAG + ":test-bus", tags.getExchange());
-    assertNull(tags.getTopic());
-  }
+    @Test
+    void buildsDataStreamsTagsFromArnAndDetailType() {
+        DataStreamsTags tags = EventBridgeInterceptor.buildDataStreamsTags(
+                "arn:aws:events:us-east-1:123456789012:event-bus/test-bus", "order.created");
+
+        assertEquals(DataStreamsTags.DIRECTION_TAG + ":out", tags.getDirection());
+        assertEquals(DataStreamsTags.EXCHANGE_TAG + ":test-bus", tags.getExchange());
+        assertEquals(DataStreamsTags.TOPIC_TAG + ":order.created", tags.getTopic());
+        assertEquals(DataStreamsTags.TYPE_TAG + ":eventbridge", tags.getType());
+    }
+
+    @Test
+    void keepsPartnerBusPathWhenNormalizingArn() {
+        DataStreamsTags tags = EventBridgeInterceptor.buildDataStreamsTags(
+                "arn:aws:events:us-east-1:123456789012:event-bus/aws.partner/example.com/acct/bus-name", "detail-type");
+
+        assertEquals(DataStreamsTags.EXCHANGE_TAG + ":aws.partner/example.com/acct/bus-name", tags.getExchange());
+        assertEquals(DataStreamsTags.TOPIC_TAG + ":detail-type", tags.getTopic());
+    }
+
+    @Test
+    void defaultsToTheDefaultEventBusNameWhenMissing() {
+        DataStreamsTags tags = EventBridgeInterceptor.buildDataStreamsTags(null, "detail-type");
+
+        assertEquals(DataStreamsTags.EXCHANGE_TAG + ":default", tags.getExchange());
+        assertEquals(DataStreamsTags.TOPIC_TAG + ":detail-type", tags.getTopic());
+    }
+
+    @Test
+    void omitsTheTopicTagWhenDetailTypeIsMissing() {
+        DataStreamsTags tags = EventBridgeInterceptor.buildDataStreamsTags("test-bus", null);
+
+        assertEquals(DataStreamsTags.EXCHANGE_TAG + ":test-bus", tags.getExchange());
+        assertNull(tags.getTopic());
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerDecorator.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerDecorator.java
index 46bff5b8b4a..2c70e23e177 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerDecorator.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerDecorator.java
@@ -4,6 +4,6 @@
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 
 public class LambdaHandlerDecorator {
-  public static final UTF8BytesString INVOCATION_SPAN_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().cloud().operationForFaas("aws"));
+    public static final UTF8BytesString INVOCATION_SPAN_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cloud().operationForFaas("aws"));
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java
index 7f62f4337d9..c465913428e 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java
@@ -33,114 +33,112 @@
 
 @AutoService(InstrumenterModule.class)
 public class LambdaHandlerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  // these must remain as String literals so they can be easily be shared (copied) with the nested
-  // advice classes
-  private static final String HANDLER_ENV_NAME = "_HANDLER";
-
-  public LambdaHandlerInstrumentation() {
-    super("aws-lambda");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "com.amazonaws.services.lambda.runtime.RequestStreamHandler";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(
-        named(hierarchyMarkerType())
-            .or(named("com.amazonaws.services.lambda.runtime.RequestHandler")));
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return ConfigHelper.env(HANDLER_ENV_NAME) != null;
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // lambda under the hood converts all handlers to streaming handlers via
-    // lambdainternal.EventHandlerLoader$PojoHandlerAsStreamHandler.handleRequest
-    // full spec here : https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("handleRequest"))
-            .and(takesArgument(2, named("com.amazonaws.services.lambda.runtime.Context"))),
-        getClass().getName() + "$ExtensionCommunicationAdvice");
-  }
-
-  public static class ExtensionCommunicationAdvice {
-    @OnMethodEnter
-    static ContextScope enter(
-        @This final Object that,
-        @Advice.Argument(0) final Object in,
-        @Advice.Argument(1) final Object out,
-        @Advice.Argument(2) final Context awsContext,
-        @Origin("#m") final String methodName) {
-
-      if (CallDepthThreadLocalMap.incrementCallDepth(RequestHandler.class) > 0) {
-        return null;
-      }
-      String lambdaRequestId = awsContext.getAwsRequestId();
-      AgentSpanContext lambdaContext = AgentTracer.get().notifyLambdaStart(in, lambdaRequestId);
-      final AgentSpan span;
-      if (null == lambdaContext) {
-        span = startSpan("java-aws-sdk", INVOCATION_SPAN_NAME);
-      } else {
-        span = startSpan("java-aws-sdk", INVOCATION_SPAN_NAME, lambdaContext);
-      }
-      span.setSpanType(InternalSpanTypes.SERVERLESS);
-      span.setTag("request_id", lambdaRequestId);
-
-      final ContextScope scope = activateSpan(span);
-      return scope;
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    // these must remain as String literals so they can be easily be shared (copied) with the nested
+    // advice classes
+    private static final String HANDLER_ENV_NAME = "_HANDLER";
+
+    public LambdaHandlerInstrumentation() {
+        super("aws-lambda");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "com.amazonaws.services.lambda.runtime.RequestStreamHandler";
     }
 
-    @OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void exit(
-        @Origin String method,
-        @Enter final ContextScope scope,
-        @Advice.Argument(1) final Object result,
-        @Advice.Argument(2) final Context awsContext,
-        @Advice.Thrown final Throwable throwable) {
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(
+                named(hierarchyMarkerType()).or(named("com.amazonaws.services.lambda.runtime.RequestHandler")));
+    }
 
-      if (scope == null) {
-        return;
-      }
+    @Override
+    protected boolean defaultEnabled() {
+        return ConfigHelper.env(HANDLER_ENV_NAME) != null;
+    }
 
-      CallDepthThreadLocalMap.reset(RequestHandler.class);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // lambda under the hood converts all handlers to streaming handlers via
+        // lambdainternal.EventHandlerLoader$PojoHandlerAsStreamHandler.handleRequest
+        // full spec here : https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("handleRequest"))
+                        .and(takesArgument(2, named("com.amazonaws.services.lambda.runtime.Context"))),
+                getClass().getName() + "$ExtensionCommunicationAdvice");
+    }
 
-      final AgentSpan span = spanFromScope(scope);
-      try {
-        if (throwable != null) {
-          span.addThrowable(throwable);
+    public static class ExtensionCommunicationAdvice {
+        @OnMethodEnter
+        static ContextScope enter(
+                @This final Object that,
+                @Advice.Argument(0) final Object in,
+                @Advice.Argument(1) final Object out,
+                @Advice.Argument(2) final Context awsContext,
+                @Origin("#m") final String methodName) {
+
+            if (CallDepthThreadLocalMap.incrementCallDepth(RequestHandler.class) > 0) {
+                return null;
+            }
+            String lambdaRequestId = awsContext.getAwsRequestId();
+            AgentSpanContext lambdaContext = AgentTracer.get().notifyLambdaStart(in, lambdaRequestId);
+            final AgentSpan span;
+            if (null == lambdaContext) {
+                span = startSpan("java-aws-sdk", INVOCATION_SPAN_NAME);
+            } else {
+                span = startSpan("java-aws-sdk", INVOCATION_SPAN_NAME, lambdaContext);
+            }
+            span.setSpanType(InternalSpanTypes.SERVERLESS);
+            span.setTag("request_id", lambdaRequestId);
+
+            final ContextScope scope = activateSpan(span);
+            return scope;
         }
 
-        AgentTracer.get().notifyAppSecEnd(span, throwable == null ? result : null);
-      } finally {
-        // Force the resource name back to the literal placeholder marker right
-        // before finish so that the Datadog Lambda Extension's filter
-        // (filter_span_from_lambda_library_or_runtime in
-        // bottlecap/src/traces/trace_processor.rs, which compares
-        // span.resource == "dd-tracer-serverless-span") drops the placeholder.
-        // Other instrumentation (HTTP/JAX-RS) may have overwritten it with the
-        // route ("POST /") during the invocation, in which case the extension
-        // would fail to dedup, leading to the placeholder leaking to the backend
-        // with parent_id=0 and detaching the inferred apigateway root from the
-        // rest of the trace.
-        // Use TAG_INTERCEPTOR priority because DDSpanContext.setResourceName
-        // ignores writes whose priority is below the current resource priority,
-        // and the HTTP/JAX-RS instrumentation will already have written
-        // HTTP_FRAMEWORK_ROUTE (3) by this point.
-        span.setResourceName(INVOCATION_SPAN_NAME, ResourceNamePriorities.TAG_INTERCEPTOR);
-        scope.close();
-        span.finish();
-        AgentTracer.get()
-            .notifyExtensionEnd(span, result, null != throwable, awsContext.getAwsRequestId());
-      }
+        @OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void exit(
+                @Origin String method,
+                @Enter final ContextScope scope,
+                @Advice.Argument(1) final Object result,
+                @Advice.Argument(2) final Context awsContext,
+                @Advice.Thrown final Throwable throwable) {
+
+            if (scope == null) {
+                return;
+            }
+
+            CallDepthThreadLocalMap.reset(RequestHandler.class);
+
+            final AgentSpan span = spanFromScope(scope);
+            try {
+                if (throwable != null) {
+                    span.addThrowable(throwable);
+                }
+
+                AgentTracer.get().notifyAppSecEnd(span, throwable == null ? result : null);
+            } finally {
+                // Force the resource name back to the literal placeholder marker right
+                // before finish so that the Datadog Lambda Extension's filter
+                // (filter_span_from_lambda_library_or_runtime in
+                // bottlecap/src/traces/trace_processor.rs, which compares
+                // span.resource == "dd-tracer-serverless-span") drops the placeholder.
+                // Other instrumentation (HTTP/JAX-RS) may have overwritten it with the
+                // route ("POST /") during the invocation, in which case the extension
+                // would fail to dedup, leading to the placeholder leaking to the backend
+                // with parent_id=0 and detaching the inferred apigateway root from the
+                // rest of the trace.
+                // Use TAG_INTERCEPTOR priority because DDSpanContext.setResourceName
+                // ignores writes whose priority is below the current resource priority,
+                // and the HTTP/JAX-RS instrumentation will already have written
+                // HTTP_FRAMEWORK_ROUTE (3) by this point.
+                span.setResourceName(INVOCATION_SPAN_NAME, ResourceNamePriorities.TAG_INTERCEPTOR);
+                scope.close();
+                span.finish();
+                AgentTracer.get().notifyExtensionEnd(span, result, null != throwable, awsContext.getAwsRequestId());
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreaming.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreaming.java
index 46e27447224..1581e8698aa 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreaming.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreaming.java
@@ -9,13 +9,11 @@
 import java.nio.charset.StandardCharsets;
 
 public class HandlerStreaming implements RequestStreamHandler {
-  @Override
-  public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
-      throws IOException {
-    PrintWriter writer =
-        new PrintWriter(
-            new BufferedWriter(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8)));
-    writer.write("Hello World!");
-    writer.close();
-  }
+    @Override
+    public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) throws IOException {
+        PrintWriter writer =
+                new PrintWriter(new BufferedWriter(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8)));
+        writer.write("Hello World!");
+        writer.close();
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingNested.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingNested.java
index ce4188a7256..7d2281473db 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingNested.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingNested.java
@@ -5,9 +5,8 @@
 import java.io.OutputStream;
 
 public class HandlerStreamingNested implements RequestStreamHandler {
-  @Override
-  public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
-      throws IOException {
-    new HandlerStreamingWithApiGwResponse().handleRequest(inputStream, outputStream, context);
-  }
+    @Override
+    public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) throws IOException {
+        new HandlerStreamingWithApiGwResponse().handleRequest(inputStream, outputStream, context);
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingSimulatesHttpFrameworkResource.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingSimulatesHttpFrameworkResource.java
index 826f9858e25..9efb7b2a194 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingSimulatesHttpFrameworkResource.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingSimulatesHttpFrameworkResource.java
@@ -13,14 +13,13 @@
  */
 public class HandlerStreamingSimulatesHttpFrameworkResource implements RequestStreamHandler {
 
-  @Override
-  public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
-      throws IOException {
-    AgentSpan span = AgentTracer.activeSpan();
-    if (span != null) {
-      span.setResourceName("POST /api/simulated", ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE);
+    @Override
+    public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) throws IOException {
+        AgentSpan span = AgentTracer.activeSpan();
+        if (span != null) {
+            span.setResourceName("POST /api/simulated", ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE);
+        }
+        outputStream.write('O');
+        outputStream.write('K');
     }
-    outputStream.write('O');
-    outputStream.write('K');
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWith404Response.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWith404Response.java
index 540b245e802..a69b079c70e 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWith404Response.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWith404Response.java
@@ -9,16 +9,13 @@
 import java.nio.charset.StandardCharsets;
 
 public class HandlerStreamingWith404Response implements RequestStreamHandler {
-  @Override
-  public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
-      throws IOException {
-    PrintWriter writer =
-        new PrintWriter(
-            new BufferedWriter(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8)));
-    writer.write(
-        "{\"statusCode\": 404, "
-            + "\"headers\": {\"content-type\": \"text/html\"}, "
-            + "\"body\": \"Not Found\"}");
-    writer.close();
-  }
+    @Override
+    public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) throws IOException {
+        PrintWriter writer =
+                new PrintWriter(new BufferedWriter(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8)));
+        writer.write("{\"statusCode\": 404, "
+                + "\"headers\": {\"content-type\": \"text/html\"}, "
+                + "\"body\": \"Not Found\"}");
+        writer.close();
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWithApiGwResponse.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWithApiGwResponse.java
index 7b91f1f3510..4f4ac85c6a2 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWithApiGwResponse.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWithApiGwResponse.java
@@ -9,16 +9,13 @@
 import java.nio.charset.StandardCharsets;
 
 public class HandlerStreamingWithApiGwResponse implements RequestStreamHandler {
-  @Override
-  public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
-      throws IOException {
-    PrintWriter writer =
-        new PrintWriter(
-            new BufferedWriter(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8)));
-    writer.write(
-        "{\"statusCode\": 200, "
-            + "\"headers\": {\"content-type\": \"application/json\", \"x-custom\": \"custom-val\"}, "
-            + "\"body\": \"{\\\"result\\\": \\\"ok\\\"}\"}");
-    writer.close();
-  }
+    @Override
+    public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) throws IOException {
+        PrintWriter writer =
+                new PrintWriter(new BufferedWriter(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8)));
+        writer.write("{\"statusCode\": 200, "
+                + "\"headers\": {\"content-type\": \"application/json\", \"x-custom\": \"custom-val\"}, "
+                + "\"body\": \"{\\\"result\\\": \\\"ok\\\"}\"}");
+        writer.close();
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWithError.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWithError.java
index d9ff02f6865..b9e39e4121b 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWithError.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWithError.java
@@ -4,8 +4,8 @@
 import java.io.OutputStream;
 
 public class HandlerStreamingWithError implements RequestStreamHandler {
-  @Override
-  public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) {
-    throw new Error("Some error");
-  }
+    @Override
+    public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) {
+        throw new Error("Some error");
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWithRawJson.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWithRawJson.java
index a34a2623770..2199d80e6a4 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWithRawJson.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWithRawJson.java
@@ -7,9 +7,8 @@
 
 /** Writes valid JSON that is not in API Gateway response format (no statusCode/headers/body). */
 public class HandlerStreamingWithRawJson implements RequestStreamHandler {
-  @Override
-  public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
-      throws IOException {
-    outputStream.write("{\"result\": \"hello\"}".getBytes(StandardCharsets.UTF_8));
-  }
+    @Override
+    public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) throws IOException {
+        outputStream.write("{\"result\": \"hello\"}".getBytes(StandardCharsets.UTF_8));
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWritesResponseThenThrows.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWritesResponseThenThrows.java
index 4169b8a2d9f..9d0d06cec2c 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWritesResponseThenThrows.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/HandlerStreamingWritesResponseThenThrows.java
@@ -6,13 +6,11 @@
 import java.nio.charset.StandardCharsets;
 
 public class HandlerStreamingWritesResponseThenThrows implements RequestStreamHandler {
-  @Override
-  public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
-      throws IOException {
-    outputStream.write(
-        ("{\"statusCode\":200,\"headers\":{\"content-type\":\"application/json\"},"
-                + "\"body\":\"{\\\"discarded\\\":true}\"}")
-            .getBytes(StandardCharsets.UTF_8));
-    throw new Error("Some error");
-  }
+    @Override
+    public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) throws IOException {
+        outputStream.write(("{\"statusCode\":200,\"headers\":{\"content-type\":\"application/json\"},"
+                        + "\"body\":\"{\\\"discarded\\\":true}\"}")
+                .getBytes(StandardCharsets.UTF_8));
+        throw new Error("Some error");
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/LambdaHandlerInstrumentationTest.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/LambdaHandlerInstrumentationTest.java
index 0aff2114e51..e51f5cb806c 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/LambdaHandlerInstrumentationTest.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/LambdaHandlerInstrumentationTest.java
@@ -49,651 +49,566 @@
 @WithConfig(key = "_HANDLER", value = "Handler", env = true, addPrefix = false)
 abstract class LambdaHandlerInstrumentationTest extends AbstractInstrumentationTest {
 
-  static final String REQUEST_ID = "test-request-id";
-
-  // Object to avoid bootstrap class in field type (TestClassShadowingExtension check)
-  Object ig;
-
-  boolean appSecStarted;
-  String capturedMethod;
-  String capturedPath;
-  Map<String, String> capturedHeaders;
-  Object capturedBody;
-  boolean appSecEnded;
-  int appSecEndCount;
-
-  Integer capturedResponseStatus;
-  Map<String, String> capturedResponseHeaders;
-  Object capturedResponseBody;
-  boolean responseHeaderDoneCalled;
-
-  abstract int version();
-
-  abstract String operation();
-
-  @BeforeEach
-  void setUpAppSec() {
-    SubscriptionService ss =
-        (SubscriptionService) AgentTracer.get().getSubscriptionService(RequestContextSlot.APPSEC);
-    ig = ss;
-    ActiveSubsystems.APPSEC_ACTIVE = true;
-
-    appSecStarted = false;
-    capturedMethod = null;
-    capturedPath = null;
-    capturedHeaders = new HashMap<>();
-    capturedBody = null;
-    appSecEnded = false;
-    appSecEndCount = 0;
-    capturedResponseStatus = null;
-    capturedResponseHeaders = new HashMap<>();
-    capturedResponseBody = null;
-    responseHeaderDoneCalled = false;
-
-    ss.registerCallback(
-        EVENTS.requestStarted(),
-        (Supplier<Flow<Object>>)
-            () -> {
-              appSecStarted = true;
-              return new Flow.ResultFlow<>(new Object());
-            });
-    ss.registerCallback(
-        EVENTS.requestMethodUriRaw(),
-        (TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>>)
-            (ctx2, method2, uri) -> {
-              capturedMethod = method2;
-              capturedPath = uri.path();
-              return Flow.ResultFlow.empty();
-            });
-    ss.registerCallback(
-        EVENTS.requestHeader(),
-        (TriConsumer<RequestContext, String, String>)
-            (ctx2, name, value) -> capturedHeaders.put(name, value));
-    ss.registerCallback(
-        EVENTS.requestHeaderDone(),
-        (Function<RequestContext, Flow<Void>>) ctx2 -> Flow.ResultFlow.empty());
-    ss.registerCallback(
-        EVENTS.requestBodyProcessed(),
-        (BiFunction<RequestContext, Object, Flow<Void>>)
-            (ctx2, body) -> {
-              capturedBody = body;
-              return Flow.ResultFlow.empty();
-            });
-    ss.registerCallback(
-        EVENTS.requestEnded(),
-        (BiFunction<RequestContext, IGSpanInfo, Flow<Void>>)
-            (ctx2, spanInfo) -> {
-              appSecEnded = true;
-              appSecEndCount++;
-              return Flow.ResultFlow.empty();
-            });
-
-    ss.registerCallback(
-        EVENTS.responseStarted(),
-        (BiFunction<RequestContext, Integer, Flow<Void>>)
-            (ctx2, status) -> {
-              capturedResponseStatus = status;
-              return Flow.ResultFlow.empty();
-            });
-    ss.registerCallback(
-        EVENTS.responseHeader(),
-        (TriConsumer<RequestContext, String, String>)
-            (ctx2, name, value) -> capturedResponseHeaders.put(name, value));
-    ss.registerCallback(
-        EVENTS.responseHeaderDone(),
-        (Function<RequestContext, Flow<Void>>)
-            ctx2 -> {
-              responseHeaderDoneCalled = true;
-              return Flow.ResultFlow.empty();
-            });
-    ss.registerCallback(
-        EVENTS.responseBody(),
-        (BiFunction<RequestContext, Object, Flow<Void>>)
-            (ctx2, body) -> {
-              capturedResponseBody = body;
-              return Flow.ResultFlow.empty();
-            });
-  }
-
-  @AfterEach
-  void cleanUpAppSec() {
-    ((SubscriptionService) ig).reset();
-    ActiveSubsystems.APPSEC_ACTIVE = false;
-  }
-
-  private Context newContext() {
-    return new TestContext(REQUEST_ID);
-  }
-
-  @Test
-  void testLambdaStreamingHandler() throws IOException {
-    ByteArrayInputStream input = new ByteArrayInputStream("Hello".getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    new HandlerStreaming().handleRequest(input, output, newContext());
-
-    assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
-  }
-
-  @Test
-  void serverlessInvocationSpanResourceResetAfterHttpFrameworkOverwrite() throws IOException {
-    ByteArrayInputStream input = new ByteArrayInputStream("Hello".getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    new HandlerStreamingSimulatesHttpFrameworkResource().handleRequest(input, output, newContext());
-
-    assertTraces(
-        trace(
-            span()
-                .resourceName(name -> operation().equals(name.toString()))
+    static final String REQUEST_ID = "test-request-id";
+
+    // Object to avoid bootstrap class in field type (TestClassShadowingExtension check)
+    Object ig;
+
+    boolean appSecStarted;
+    String capturedMethod;
+    String capturedPath;
+    Map<String, String> capturedHeaders;
+    Object capturedBody;
+    boolean appSecEnded;
+    int appSecEndCount;
+
+    Integer capturedResponseStatus;
+    Map<String, String> capturedResponseHeaders;
+    Object capturedResponseBody;
+    boolean responseHeaderDoneCalled;
+
+    abstract int version();
+
+    abstract String operation();
+
+    @BeforeEach
+    void setUpAppSec() {
+        SubscriptionService ss =
+                (SubscriptionService) AgentTracer.get().getSubscriptionService(RequestContextSlot.APPSEC);
+        ig = ss;
+        ActiveSubsystems.APPSEC_ACTIVE = true;
+
+        appSecStarted = false;
+        capturedMethod = null;
+        capturedPath = null;
+        capturedHeaders = new HashMap<>();
+        capturedBody = null;
+        appSecEnded = false;
+        appSecEndCount = 0;
+        capturedResponseStatus = null;
+        capturedResponseHeaders = new HashMap<>();
+        capturedResponseBody = null;
+        responseHeaderDoneCalled = false;
+
+        ss.registerCallback(EVENTS.requestStarted(), (Supplier<Flow<Object>>) () -> {
+            appSecStarted = true;
+            return new Flow.ResultFlow<>(new Object());
+        });
+        ss.registerCallback(
+                EVENTS.requestMethodUriRaw(),
+                (TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>>) (ctx2, method2, uri) -> {
+                    capturedMethod = method2;
+                    capturedPath = uri.path();
+                    return Flow.ResultFlow.empty();
+                });
+        ss.registerCallback(EVENTS.requestHeader(), (TriConsumer<RequestContext, String, String>)
+                (ctx2, name, value) -> capturedHeaders.put(name, value));
+        ss.registerCallback(
+                EVENTS.requestHeaderDone(), (Function<RequestContext, Flow<Void>>) ctx2 -> Flow.ResultFlow.empty());
+        ss.registerCallback(
+                EVENTS.requestBodyProcessed(), (BiFunction<RequestContext, Object, Flow<Void>>) (ctx2, body) -> {
+                    capturedBody = body;
+                    return Flow.ResultFlow.empty();
+                });
+        ss.registerCallback(
+                EVENTS.requestEnded(), (BiFunction<RequestContext, IGSpanInfo, Flow<Void>>) (ctx2, spanInfo) -> {
+                    appSecEnded = true;
+                    appSecEndCount++;
+                    return Flow.ResultFlow.empty();
+                });
+
+        ss.registerCallback(
+                EVENTS.responseStarted(), (BiFunction<RequestContext, Integer, Flow<Void>>) (ctx2, status) -> {
+                    capturedResponseStatus = status;
+                    return Flow.ResultFlow.empty();
+                });
+        ss.registerCallback(EVENTS.responseHeader(), (TriConsumer<RequestContext, String, String>)
+                (ctx2, name, value) -> capturedResponseHeaders.put(name, value));
+        ss.registerCallback(EVENTS.responseHeaderDone(), (Function<RequestContext, Flow<Void>>) ctx2 -> {
+            responseHeaderDoneCalled = true;
+            return Flow.ResultFlow.empty();
+        });
+        ss.registerCallback(EVENTS.responseBody(), (BiFunction<RequestContext, Object, Flow<Void>>) (ctx2, body) -> {
+            capturedResponseBody = body;
+            return Flow.ResultFlow.empty();
+        });
+    }
+
+    @AfterEach
+    void cleanUpAppSec() {
+        ((SubscriptionService) ig).reset();
+        ActiveSubsystems.APPSEC_ACTIVE = false;
+    }
+
+    private Context newContext() {
+        return new TestContext(REQUEST_ID);
+    }
+
+    @Test
+    void testLambdaStreamingHandler() throws IOException {
+        ByteArrayInputStream input = new ByteArrayInputStream("Hello".getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        new HandlerStreaming().handleRequest(input, output, newContext());
+
+        assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
+    }
+
+    @Test
+    void serverlessInvocationSpanResourceResetAfterHttpFrameworkOverwrite() throws IOException {
+        ByteArrayInputStream input = new ByteArrayInputStream("Hello".getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        new HandlerStreamingSimulatesHttpFrameworkResource().handleRequest(input, output, newContext());
+
+        assertTraces(trace(span().resourceName(name -> operation().equals(name.toString()))
                 .type(DDSpanTypes.SERVERLESS)
                 .error(false)));
-  }
-
-  @Test
-  void serverlessInvocationSpanResourceResetWhenAppSecEndThrows() throws IOException {
-    String eventJson =
-        "{" + "\"path\": \"/\"," + "\"requestContext\": {\"httpMethod\": \"GET\"}" + "}";
-    ByteArrayInputStream input =
-        new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output =
-        new ByteArrayOutputStream() {
-          @Override
-          public synchronized byte[] toByteArray() {
-            throw new AssertionError("response processing failed");
-          }
+    }
+
+    @Test
+    void serverlessInvocationSpanResourceResetWhenAppSecEndThrows() throws IOException {
+        String eventJson = "{" + "\"path\": \"/\"," + "\"requestContext\": {\"httpMethod\": \"GET\"}" + "}";
+        ByteArrayInputStream input = new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream() {
+            @Override
+            public synchronized byte[] toByteArray() {
+                throw new AssertionError("response processing failed");
+            }
         };
 
-    new HandlerStreamingSimulatesHttpFrameworkResource().handleRequest(input, output, newContext());
+        new HandlerStreamingSimulatesHttpFrameworkResource().handleRequest(input, output, newContext());
 
-    assertFalse(InstrumentationErrors.noErrors());
-    InstrumentationErrors.resetErrors();
-    assertTrue(appSecEnded);
-    assertTraces(
-        trace(
-            span()
-                .resourceName(name -> operation().equals(name.toString()))
+        assertFalse(InstrumentationErrors.noErrors());
+        InstrumentationErrors.resetErrors();
+        assertTrue(appSecEnded);
+        assertTraces(trace(span().resourceName(name -> operation().equals(name.toString()))
                 .type(DDSpanTypes.SERVERLESS)
                 .error(false)));
-  }
+    }
 
-  @Test
-  void testStreamingHandlerWithError() {
-    ByteArrayInputStream input = new ByteArrayInputStream("Hello".getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
+    @Test
+    void testStreamingHandlerWithError() {
+        ByteArrayInputStream input = new ByteArrayInputStream("Hello".getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
 
-    assertThrows(
-        Error.class,
-        () -> new HandlerStreamingWithError().handleRequest(input, output, newContext()));
+        assertThrows(Error.class, () -> new HandlerStreamingWithError().handleRequest(input, output, newContext()));
 
-    assertTraces(
-        trace(
-            span()
-                .type(DDSpanTypes.SERVERLESS)
+        assertTraces(trace(span().type(DDSpanTypes.SERVERLESS)
                 .error(true)
                 .tags(
-                    defaultTags(),
-                    tag("request_id", is(REQUEST_ID)),
-                    tag("_dd.appsec.unsupported_event_type", is(1)),
-                    error(Error.class, "Some error"))));
-  }
-
-  @Test
-  void appSecCallbacksAreInvokedForApiGatewayV1Event() throws IOException {
-    String eventJson =
-        "{"
-            + "\"path\": \"/api/users/123\","
-            + "\"headers\": {\"content-type\": \"application/json\","
-            + "              \"x-forwarded-for\": \"203.0.113.1\"},"
-            + "\"body\": \"{\\\"key\\\": \\\"value\\\"}\","
-            + "\"requestContext\": {"
-            + "  \"httpMethod\": \"GET\","
-            + "  \"requestId\": \"req-abc\","
-            + "  \"identity\": {\"sourceIp\": \"203.0.113.1\"}"
-            + "}"
-            + "}";
-
-    ByteArrayInputStream input =
-        new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    new HandlerStreaming().handleRequest(input, output, newContext());
-
-    assertTrue(appSecStarted);
-    assertEquals("GET", capturedMethod);
-    assertEquals("/api/users/123", capturedPath);
-    assertEquals("application/json", capturedHeaders.get("content-type"));
-    assertTrue(capturedBody instanceof Map);
-    assertTrue(appSecEnded);
-    assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
-  }
-
-  @Test
-  void appSecCallbacksAreInvokedForApiGatewayV2HttpEvent() throws IOException {
-    String eventJson =
-        "{"
-            + "\"version\": \"2.0\","
-            + "\"headers\": {\"content-type\": \"application/json\","
-            + "              \"accept\": \"application/json\"},"
-            + "\"cookies\": [\"session=abc123\"],"
-            + "\"body\": \"{\\\"key\\\": \\\"value\\\"}\","
-            + "\"requestContext\": {"
-            + "  \"http\": {"
-            + "    \"method\": \"POST\","
-            + "    \"path\": \"/api/items\","
-            + "    \"sourceIp\": \"198.51.100.1\""
-            + "  },"
-            + "  \"domainName\": \"api.example.com\""
-            + "}"
-            + "}";
-
-    ByteArrayInputStream input =
-        new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    new HandlerStreaming().handleRequest(input, output, newContext());
-
-    assertTrue(appSecStarted);
-    assertEquals("POST", capturedMethod);
-    assertEquals("/api/items", capturedPath);
-    assertEquals("application/json", capturedHeaders.get("content-type"));
-    assertEquals("session=abc123", capturedHeaders.get("cookie"));
-    assertTrue(capturedBody instanceof Map);
-    assertTrue(appSecEnded);
-    assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
-  }
-
-  @Test
-  void appSecCallbacksAreNotInvokedWhenAppSecIsDisabled() throws IOException {
-    ActiveSubsystems.APPSEC_ACTIVE = false;
-
-    String eventJson =
-        "{"
-            + "\"path\": \"/api/test\","
-            + "\"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"req-xyz\"}"
-            + "}";
-    ByteArrayInputStream input =
-        new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    new HandlerStreaming().handleRequest(input, output, newContext());
-
-    assertFalse(appSecStarted);
-    assertNull(capturedMethod);
-    assertFalse(appSecEnded);
-    assertNull(capturedResponseStatus);
-    assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
-  }
-
-  @Test
-  void appSecIsSkippedAndReportedUnsupportedForNonHttpEvent() throws IOException {
-    String eventJson = "{\"Records\": [{\"eventSource\": \"aws:sqs\", \"body\": \"hello\"}]}";
-
-    ByteArrayInputStream input =
-        new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    new HandlerStreaming().handleRequest(input, output, newContext());
-
-    assertFalse(appSecStarted);
-    assertNull(capturedMethod);
-    assertNull(capturedPath);
-    assertTrue(capturedHeaders.isEmpty());
-    assertNull(capturedBody);
-    assertFalse(appSecEnded);
-    assertNull(capturedResponseStatus);
-    // Tag matching is exhaustive, so this also asserts the span carries no http.* tag
-    assertTraces(
-        trace(
-            span()
-                .type(DDSpanTypes.SERVERLESS)
-                .error(false)
-                .tags(
-                    defaultTags(),
-                    tag("request_id", is(REQUEST_ID)),
-                    tag("_dd.appsec.unsupported_event_type", is(1)))));
-  }
-
-  @Test
-  void responseCallbacksAreInvokedForJsonEncodedResponse() throws IOException {
-    String eventJson =
-        "{"
-            + "\"path\": \"/api/test\","
-            + "\"headers\": {\"content-type\": \"application/json\"},"
-            + "\"requestContext\": {"
-            + "  \"httpMethod\": \"GET\","
-            + "  \"identity\": {\"sourceIp\": \"127.0.0.1\"}"
-            + "}"
-            + "}";
-
-    ByteArrayInputStream input =
-        new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    new HandlerStreamingWithApiGwResponse().handleRequest(input, output, newContext());
-
-    assertEquals(200, (int) capturedResponseStatus);
-    assertEquals("application/json", capturedResponseHeaders.get("content-type"));
-    assertEquals("custom-val", capturedResponseHeaders.get("x-custom"));
-    assertTrue(capturedResponseBody instanceof Map);
-    assertEquals("ok", ((Map<?, ?>) capturedResponseBody).get("result"));
-    assertTrue(responseHeaderDoneCalled);
-    assertTrue(appSecEnded);
-    assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
-  }
-
-  @Test
-  void responseCallbacksReceiveCorrectDataFor404Response() throws IOException {
-    String eventJson =
-        "{"
-            + "\"path\": \"/missing\","
-            + "\"requestContext\": {"
-            + "  \"httpMethod\": \"GET\""
-            + "}"
-            + "}";
-
-    ByteArrayInputStream input =
-        new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    new HandlerStreamingWith404Response().handleRequest(input, output, newContext());
-
-    assertEquals(404, (int) capturedResponseStatus);
-    assertEquals("text/html", capturedResponseHeaders.get("content-type"));
-    assertEquals("Not Found", capturedResponseBody);
-    assertTrue(appSecEnded);
-    assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
-  }
-
-  @Test
-  void responseCallbacksTreatLambdaUrlResponseWithoutStatusCodeAsImplicitSuccess()
-      throws IOException {
-    // A Lambda Function URL return value carrying no statusCode is not a response the gateway
-    // honours: it serialises the whole value as the body of a 200 with content-type
-    // application/json, which is what the callbacks must report.
-    String eventJson =
-        "{"
-            + "\"version\": \"2.0\","
-            + "\"rawPath\": \"/\","
-            + "\"headers\": {\"host\": \"example.lambda-url.us-east-1.on.aws\"},"
-            + "\"requestContext\": {"
-            + "  \"domainName\": \"example.lambda-url.us-east-1.on.aws\","
-            + "  \"http\": {"
-            + "    \"method\": \"GET\","
-            + "    \"path\": \"/\","
-            + "    \"sourceIp\": \"1.2.3.4\""
-            + "  }"
-            + "}"
-            + "}";
-    ByteArrayInputStream input =
-        new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    new HandlerStreamingWithRawJson().handleRequest(input, output, newContext());
-
-    assertEquals(200, (int) capturedResponseStatus);
-    assertEquals("application/json", capturedResponseHeaders.get("content-type"));
-    assertTrue(capturedResponseBody instanceof Map);
-    assertEquals("hello", ((Map<?, ?>) capturedResponseBody).get("result"));
-    assertTrue(responseHeaderDoneCalled);
-    assertTrue(appSecEnded);
-    assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
-  }
-
-  @Test
-  void responseCallbacksSkipNonApiGatewayResponseForNonHttpEvent() throws IOException {
-    // When the trigger type cannot be determined (non-JSON or non-HTTP event),
-    // response callbacks must not fire even if the response is valid JSON.
-    ByteArrayInputStream input = new ByteArrayInputStream("Hello".getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    new HandlerStreamingWithRawJson().handleRequest(input, output, newContext());
-
-    assertNull(capturedResponseStatus);
-    assertTrue(capturedResponseHeaders.isEmpty());
-    assertNull(capturedResponseBody);
-    assertFalse(responseHeaderDoneCalled);
-    // AppSec skipped the invocation entirely, so there is no request context to end
-    assertFalse(appSecEnded);
-    assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
-  }
-
-  @Test
-  void responseAndRequestCallbacksAreBothInvoked() throws IOException {
-    String eventJson =
-        "{"
-            + "\"path\": \"/api/users/123\","
-            + "\"headers\": {\"content-type\": \"application/json\"},"
-            + "\"body\": \"{\\\"key\\\": \\\"value\\\"}\","
-            + "\"requestContext\": {"
-            + "  \"httpMethod\": \"POST\","
-            + "  \"requestId\": \"req-order-1\","
-            + "  \"identity\": {\"sourceIp\": \"10.0.0.1\"}"
-            + "}"
-            + "}";
-
-    ByteArrayInputStream input =
-        new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    new HandlerStreamingWithApiGwResponse().handleRequest(input, output, newContext());
-
-    assertTrue(appSecStarted);
-    assertEquals("POST", capturedMethod);
-    assertEquals("/api/users/123", capturedPath);
-    assertTrue(capturedBody instanceof Map);
-
-    assertEquals(200, (int) capturedResponseStatus);
-    assertEquals("application/json", capturedResponseHeaders.get("content-type"));
-    assertTrue(capturedResponseBody instanceof Map);
-
-    assertTrue(appSecEnded);
-    assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
-  }
-
-  @Test
-  void invocationSpanCarriesHttpTags() throws IOException {
-    String eventJson =
-        "{"
-            + "\"resource\": \"/api/users/{id}\","
-            + "\"path\": \"/api/users/123\","
-            + "\"httpMethod\": \"GET\","
-            + "\"queryStringParameters\": {\"q\": \"hello\"},"
-            + "\"headers\": {\"Host\": \"api.example.com\","
-            + "              \"User-Agent\": \"test-agent\"},"
-            + "\"requestContext\": {"
-            + "  \"httpMethod\": \"GET\","
-            + "  \"requestId\": \"req-tags\","
-            + "  \"domainName\": \"api.example.com\","
-            + "  \"identity\": {\"sourceIp\": \"127.0.0.1\"}"
-            + "}"
-            + "}";
-
-    ByteArrayInputStream input =
-        new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    new HandlerStreamingWithApiGwResponse().handleRequest(input, output, newContext());
-
-    assertTraces(
-        trace(
-            span()
-                .type(DDSpanTypes.SERVERLESS)
+                        defaultTags(),
+                        tag("request_id", is(REQUEST_ID)),
+                        tag("_dd.appsec.unsupported_event_type", is(1)),
+                        error(Error.class, "Some error"))));
+    }
+
+    @Test
+    void appSecCallbacksAreInvokedForApiGatewayV1Event() throws IOException {
+        String eventJson = "{"
+                + "\"path\": \"/api/users/123\","
+                + "\"headers\": {\"content-type\": \"application/json\","
+                + "              \"x-forwarded-for\": \"203.0.113.1\"},"
+                + "\"body\": \"{\\\"key\\\": \\\"value\\\"}\","
+                + "\"requestContext\": {"
+                + "  \"httpMethod\": \"GET\","
+                + "  \"requestId\": \"req-abc\","
+                + "  \"identity\": {\"sourceIp\": \"203.0.113.1\"}"
+                + "}"
+                + "}";
+
+        ByteArrayInputStream input = new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        new HandlerStreaming().handleRequest(input, output, newContext());
+
+        assertTrue(appSecStarted);
+        assertEquals("GET", capturedMethod);
+        assertEquals("/api/users/123", capturedPath);
+        assertEquals("application/json", capturedHeaders.get("content-type"));
+        assertTrue(capturedBody instanceof Map);
+        assertTrue(appSecEnded);
+        assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
+    }
+
+    @Test
+    void appSecCallbacksAreInvokedForApiGatewayV2HttpEvent() throws IOException {
+        String eventJson = "{"
+                + "\"version\": \"2.0\","
+                + "\"headers\": {\"content-type\": \"application/json\","
+                + "              \"accept\": \"application/json\"},"
+                + "\"cookies\": [\"session=abc123\"],"
+                + "\"body\": \"{\\\"key\\\": \\\"value\\\"}\","
+                + "\"requestContext\": {"
+                + "  \"http\": {"
+                + "    \"method\": \"POST\","
+                + "    \"path\": \"/api/items\","
+                + "    \"sourceIp\": \"198.51.100.1\""
+                + "  },"
+                + "  \"domainName\": \"api.example.com\""
+                + "}"
+                + "}";
+
+        ByteArrayInputStream input = new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        new HandlerStreaming().handleRequest(input, output, newContext());
+
+        assertTrue(appSecStarted);
+        assertEquals("POST", capturedMethod);
+        assertEquals("/api/items", capturedPath);
+        assertEquals("application/json", capturedHeaders.get("content-type"));
+        assertEquals("session=abc123", capturedHeaders.get("cookie"));
+        assertTrue(capturedBody instanceof Map);
+        assertTrue(appSecEnded);
+        assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
+    }
+
+    @Test
+    void appSecCallbacksAreNotInvokedWhenAppSecIsDisabled() throws IOException {
+        ActiveSubsystems.APPSEC_ACTIVE = false;
+
+        String eventJson = "{"
+                + "\"path\": \"/api/test\","
+                + "\"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"req-xyz\"}"
+                + "}";
+        ByteArrayInputStream input = new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        new HandlerStreaming().handleRequest(input, output, newContext());
+
+        assertFalse(appSecStarted);
+        assertNull(capturedMethod);
+        assertFalse(appSecEnded);
+        assertNull(capturedResponseStatus);
+        assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
+    }
+
+    @Test
+    void appSecIsSkippedAndReportedUnsupportedForNonHttpEvent() throws IOException {
+        String eventJson = "{\"Records\": [{\"eventSource\": \"aws:sqs\", \"body\": \"hello\"}]}";
+
+        ByteArrayInputStream input = new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        new HandlerStreaming().handleRequest(input, output, newContext());
+
+        assertFalse(appSecStarted);
+        assertNull(capturedMethod);
+        assertNull(capturedPath);
+        assertTrue(capturedHeaders.isEmpty());
+        assertNull(capturedBody);
+        assertFalse(appSecEnded);
+        assertNull(capturedResponseStatus);
+        // Tag matching is exhaustive, so this also asserts the span carries no http.* tag
+        assertTraces(trace(span().type(DDSpanTypes.SERVERLESS)
                 .error(false)
                 .tags(
-                    defaultTags(),
-                    tag("request_id", is(REQUEST_ID)),
-                    tag(Tags.HTTP_METHOD, is("GET")),
-                    // The tracer tags http.url without the query string; QueryObfuscator
-                    // obfuscates http.query.string and re-appends it as the trace is serialised
-                    tag(Tags.HTTP_URL, is("https://api.example.com/api/users/123?q=hello")),
-                    tag(DDTags.HTTP_QUERY, is("q=hello")),
-                    tag(Tags.HTTP_USER_AGENT, is("test-agent")),
-                    tag(Tags.HTTP_ROUTE, is("/api/users/{id}")),
-                    tag(Tags.HTTP_HOSTNAME, is("api.example.com")),
-                    tag(Tags.COMPONENT, is("aws-lambda")),
-                    tag(Tags.HTTP_STATUS, is(200)))));
-  }
-
-  @Test
-  void nestedHandlerFinalizesAppSecRequestOnce() throws IOException {
-    String eventJson =
-        "{" + "\"path\": \"/api/nested\"," + "\"requestContext\": {\"httpMethod\": \"GET\"}" + "}";
-    ByteArrayInputStream input =
-        new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-
-    new HandlerStreamingNested().handleRequest(input, output, newContext());
-
-    assertTrue(appSecStarted);
-    assertTrue(appSecEnded);
-    assertEquals(1, appSecEndCount);
-    assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
-  }
-
-  @Test
-  void responseCallbacksFireBeforeRequestEnded() throws IOException {
-    List<String> callOrder = new ArrayList<>();
-
-    // Reset and re-register to capture ordering
-    SubscriptionService ss = (SubscriptionService) ig;
-    ss.reset();
-
-    ss.registerCallback(
-        EVENTS.requestStarted(),
-        (Supplier<Flow<Object>>) () -> new Flow.ResultFlow<>(new Object()));
-    ss.registerCallback(
-        EVENTS.responseStarted(),
-        (BiFunction<RequestContext, Integer, Flow<Void>>)
-            (ctx2, status) -> {
-              callOrder.add("responseStarted");
-              return Flow.ResultFlow.empty();
-            });
-    ss.registerCallback(
-        EVENTS.responseHeaderDone(),
-        (Function<RequestContext, Flow<Void>>)
-            ctx2 -> {
-              callOrder.add("responseHeaderDone");
-              return Flow.ResultFlow.empty();
-            });
-    ss.registerCallback(
-        EVENTS.responseBody(),
-        (BiFunction<RequestContext, Object, Flow<Void>>)
-            (ctx2, body) -> {
-              callOrder.add("responseBody");
-              return Flow.ResultFlow.empty();
-            });
-    ss.registerCallback(
-        EVENTS.requestEnded(),
-        (BiFunction<RequestContext, IGSpanInfo, Flow<Void>>)
-            (ctx2, spanInfo) -> {
-              callOrder.add("requestEnded");
-              return Flow.ResultFlow.empty();
-            });
-
-    String eventJson =
-        "{"
-            + "\"path\": \"/api/test\","
-            + "\"requestContext\": {"
-            + "  \"httpMethod\": \"GET\","
-            + "  \"requestId\": \"req-order-2\""
-            + "}"
-            + "}";
-    ByteArrayInputStream input =
-        new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    new HandlerStreamingWithApiGwResponse().handleRequest(input, output, newContext());
-
-    assertTrue(callOrder.contains("responseStarted"));
-    assertTrue(callOrder.contains("responseHeaderDone"));
-    assertTrue(callOrder.contains("responseBody"));
-    assertTrue(callOrder.contains("requestEnded"));
-    assertTrue(callOrder.indexOf("responseStarted") < callOrder.indexOf("requestEnded"));
-    assertTrue(callOrder.indexOf("responseHeaderDone") < callOrder.indexOf("requestEnded"));
-    assertTrue(callOrder.indexOf("responseBody") < callOrder.indexOf("requestEnded"));
-    assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
-  }
-
-  @Test
-  void responseCallbacksReceiveNoDataWhenHandlerThrows() {
-    String eventJson =
-        "{" + "\"path\": \"/api/failure\"," + "\"requestContext\": {\"httpMethod\": \"GET\"}" + "}";
-    ByteArrayInputStream input =
-        new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-
-    assertThrows(
-        Error.class,
-        () ->
-            new HandlerStreamingWritesResponseThenThrows()
-                .handleRequest(input, output, newContext()));
-
-    assertTrue(appSecStarted, "request callbacks should run before the handler throws");
-    assertTrue(appSecEnded, "requestEnded should run after the handler throws");
-    assertEquals(1, appSecEndCount);
-    assertNull(capturedResponseStatus, "response status should not be set when handler throws");
-    assertNull(capturedResponseBody, "response body should not be set when handler throws");
-    assertTraces(
-        trace(
-            span()
-                .type(DDSpanTypes.SERVERLESS)
-                .error(true)
-                .tags(
-                    defaultTags(),
-                    tag("request_id", is(REQUEST_ID)),
-                    tag(Tags.HTTP_METHOD, is("GET")),
-                    tag(Tags.COMPONENT, is("aws-lambda")),
-                    error(Error.class, "Some error"))));
-  }
-
-  private static final class TestContext implements Context {
-    private final String requestId;
-
-    TestContext(String requestId) {
-      this.requestId = requestId;
+                        defaultTags(),
+                        tag("request_id", is(REQUEST_ID)),
+                        tag("_dd.appsec.unsupported_event_type", is(1)))));
     }
 
-    @Override
-    public String getAwsRequestId() {
-      return requestId;
+    @Test
+    void responseCallbacksAreInvokedForJsonEncodedResponse() throws IOException {
+        String eventJson = "{"
+                + "\"path\": \"/api/test\","
+                + "\"headers\": {\"content-type\": \"application/json\"},"
+                + "\"requestContext\": {"
+                + "  \"httpMethod\": \"GET\","
+                + "  \"identity\": {\"sourceIp\": \"127.0.0.1\"}"
+                + "}"
+                + "}";
+
+        ByteArrayInputStream input = new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        new HandlerStreamingWithApiGwResponse().handleRequest(input, output, newContext());
+
+        assertEquals(200, (int) capturedResponseStatus);
+        assertEquals("application/json", capturedResponseHeaders.get("content-type"));
+        assertEquals("custom-val", capturedResponseHeaders.get("x-custom"));
+        assertTrue(capturedResponseBody instanceof Map);
+        assertEquals("ok", ((Map<?, ?>) capturedResponseBody).get("result"));
+        assertTrue(responseHeaderDoneCalled);
+        assertTrue(appSecEnded);
+        assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
     }
 
-    @Override
-    public String getLogGroupName() {
-      return null;
-    }
+    @Test
+    void responseCallbacksReceiveCorrectDataFor404Response() throws IOException {
+        String eventJson =
+                "{" + "\"path\": \"/missing\"," + "\"requestContext\": {" + "  \"httpMethod\": \"GET\"" + "}" + "}";
+
+        ByteArrayInputStream input = new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        new HandlerStreamingWith404Response().handleRequest(input, output, newContext());
 
-    @Override
-    public String getLogStreamName() {
-      return null;
+        assertEquals(404, (int) capturedResponseStatus);
+        assertEquals("text/html", capturedResponseHeaders.get("content-type"));
+        assertEquals("Not Found", capturedResponseBody);
+        assertTrue(appSecEnded);
+        assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
     }
 
-    @Override
-    public String getFunctionName() {
-      return null;
+    @Test
+    void responseCallbacksTreatLambdaUrlResponseWithoutStatusCodeAsImplicitSuccess() throws IOException {
+        // A Lambda Function URL return value carrying no statusCode is not a response the gateway
+        // honours: it serialises the whole value as the body of a 200 with content-type
+        // application/json, which is what the callbacks must report.
+        String eventJson = "{"
+                + "\"version\": \"2.0\","
+                + "\"rawPath\": \"/\","
+                + "\"headers\": {\"host\": \"example.lambda-url.us-east-1.on.aws\"},"
+                + "\"requestContext\": {"
+                + "  \"domainName\": \"example.lambda-url.us-east-1.on.aws\","
+                + "  \"http\": {"
+                + "    \"method\": \"GET\","
+                + "    \"path\": \"/\","
+                + "    \"sourceIp\": \"1.2.3.4\""
+                + "  }"
+                + "}"
+                + "}";
+        ByteArrayInputStream input = new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        new HandlerStreamingWithRawJson().handleRequest(input, output, newContext());
+
+        assertEquals(200, (int) capturedResponseStatus);
+        assertEquals("application/json", capturedResponseHeaders.get("content-type"));
+        assertTrue(capturedResponseBody instanceof Map);
+        assertEquals("hello", ((Map<?, ?>) capturedResponseBody).get("result"));
+        assertTrue(responseHeaderDoneCalled);
+        assertTrue(appSecEnded);
+        assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
     }
 
-    @Override
-    public String getFunctionVersion() {
-      return null;
+    @Test
+    void responseCallbacksSkipNonApiGatewayResponseForNonHttpEvent() throws IOException {
+        // When the trigger type cannot be determined (non-JSON or non-HTTP event),
+        // response callbacks must not fire even if the response is valid JSON.
+        ByteArrayInputStream input = new ByteArrayInputStream("Hello".getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        new HandlerStreamingWithRawJson().handleRequest(input, output, newContext());
+
+        assertNull(capturedResponseStatus);
+        assertTrue(capturedResponseHeaders.isEmpty());
+        assertNull(capturedResponseBody);
+        assertFalse(responseHeaderDoneCalled);
+        // AppSec skipped the invocation entirely, so there is no request context to end
+        assertFalse(appSecEnded);
+        assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
     }
 
-    @Override
-    public String getInvokedFunctionArn() {
-      return null;
+    @Test
+    void responseAndRequestCallbacksAreBothInvoked() throws IOException {
+        String eventJson = "{"
+                + "\"path\": \"/api/users/123\","
+                + "\"headers\": {\"content-type\": \"application/json\"},"
+                + "\"body\": \"{\\\"key\\\": \\\"value\\\"}\","
+                + "\"requestContext\": {"
+                + "  \"httpMethod\": \"POST\","
+                + "  \"requestId\": \"req-order-1\","
+                + "  \"identity\": {\"sourceIp\": \"10.0.0.1\"}"
+                + "}"
+                + "}";
+
+        ByteArrayInputStream input = new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        new HandlerStreamingWithApiGwResponse().handleRequest(input, output, newContext());
+
+        assertTrue(appSecStarted);
+        assertEquals("POST", capturedMethod);
+        assertEquals("/api/users/123", capturedPath);
+        assertTrue(capturedBody instanceof Map);
+
+        assertEquals(200, (int) capturedResponseStatus);
+        assertEquals("application/json", capturedResponseHeaders.get("content-type"));
+        assertTrue(capturedResponseBody instanceof Map);
+
+        assertTrue(appSecEnded);
+        assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
     }
 
-    @Override
-    public CognitoIdentity getIdentity() {
-      return null;
+    @Test
+    void invocationSpanCarriesHttpTags() throws IOException {
+        String eventJson = "{"
+                + "\"resource\": \"/api/users/{id}\","
+                + "\"path\": \"/api/users/123\","
+                + "\"httpMethod\": \"GET\","
+                + "\"queryStringParameters\": {\"q\": \"hello\"},"
+                + "\"headers\": {\"Host\": \"api.example.com\","
+                + "              \"User-Agent\": \"test-agent\"},"
+                + "\"requestContext\": {"
+                + "  \"httpMethod\": \"GET\","
+                + "  \"requestId\": \"req-tags\","
+                + "  \"domainName\": \"api.example.com\","
+                + "  \"identity\": {\"sourceIp\": \"127.0.0.1\"}"
+                + "}"
+                + "}";
+
+        ByteArrayInputStream input = new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        new HandlerStreamingWithApiGwResponse().handleRequest(input, output, newContext());
+
+        assertTraces(trace(span().type(DDSpanTypes.SERVERLESS)
+                .error(false)
+                .tags(
+                        defaultTags(),
+                        tag("request_id", is(REQUEST_ID)),
+                        tag(Tags.HTTP_METHOD, is("GET")),
+                        // The tracer tags http.url without the query string; QueryObfuscator
+                        // obfuscates http.query.string and re-appends it as the trace is serialised
+                        tag(Tags.HTTP_URL, is("https://api.example.com/api/users/123?q=hello")),
+                        tag(DDTags.HTTP_QUERY, is("q=hello")),
+                        tag(Tags.HTTP_USER_AGENT, is("test-agent")),
+                        tag(Tags.HTTP_ROUTE, is("/api/users/{id}")),
+                        tag(Tags.HTTP_HOSTNAME, is("api.example.com")),
+                        tag(Tags.COMPONENT, is("aws-lambda")),
+                        tag(Tags.HTTP_STATUS, is(200)))));
     }
 
-    @Override
-    public ClientContext getClientContext() {
-      return null;
+    @Test
+    void nestedHandlerFinalizesAppSecRequestOnce() throws IOException {
+        String eventJson = "{" + "\"path\": \"/api/nested\"," + "\"requestContext\": {\"httpMethod\": \"GET\"}" + "}";
+        ByteArrayInputStream input = new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+
+        new HandlerStreamingNested().handleRequest(input, output, newContext());
+
+        assertTrue(appSecStarted);
+        assertTrue(appSecEnded);
+        assertEquals(1, appSecEndCount);
+        assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
     }
 
-    @Override
-    public int getRemainingTimeInMillis() {
-      return 0;
+    @Test
+    void responseCallbacksFireBeforeRequestEnded() throws IOException {
+        List<String> callOrder = new ArrayList<>();
+
+        // Reset and re-register to capture ordering
+        SubscriptionService ss = (SubscriptionService) ig;
+        ss.reset();
+
+        ss.registerCallback(
+                EVENTS.requestStarted(), (Supplier<Flow<Object>>) () -> new Flow.ResultFlow<>(new Object()));
+        ss.registerCallback(
+                EVENTS.responseStarted(), (BiFunction<RequestContext, Integer, Flow<Void>>) (ctx2, status) -> {
+                    callOrder.add("responseStarted");
+                    return Flow.ResultFlow.empty();
+                });
+        ss.registerCallback(EVENTS.responseHeaderDone(), (Function<RequestContext, Flow<Void>>) ctx2 -> {
+            callOrder.add("responseHeaderDone");
+            return Flow.ResultFlow.empty();
+        });
+        ss.registerCallback(EVENTS.responseBody(), (BiFunction<RequestContext, Object, Flow<Void>>) (ctx2, body) -> {
+            callOrder.add("responseBody");
+            return Flow.ResultFlow.empty();
+        });
+        ss.registerCallback(
+                EVENTS.requestEnded(), (BiFunction<RequestContext, IGSpanInfo, Flow<Void>>) (ctx2, spanInfo) -> {
+                    callOrder.add("requestEnded");
+                    return Flow.ResultFlow.empty();
+                });
+
+        String eventJson = "{"
+                + "\"path\": \"/api/test\","
+                + "\"requestContext\": {"
+                + "  \"httpMethod\": \"GET\","
+                + "  \"requestId\": \"req-order-2\""
+                + "}"
+                + "}";
+        ByteArrayInputStream input = new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        new HandlerStreamingWithApiGwResponse().handleRequest(input, output, newContext());
+
+        assertTrue(callOrder.contains("responseStarted"));
+        assertTrue(callOrder.contains("responseHeaderDone"));
+        assertTrue(callOrder.contains("responseBody"));
+        assertTrue(callOrder.contains("requestEnded"));
+        assertTrue(callOrder.indexOf("responseStarted") < callOrder.indexOf("requestEnded"));
+        assertTrue(callOrder.indexOf("responseHeaderDone") < callOrder.indexOf("requestEnded"));
+        assertTrue(callOrder.indexOf("responseBody") < callOrder.indexOf("requestEnded"));
+        assertTraces(trace(span().type(DDSpanTypes.SERVERLESS).error(false)));
     }
 
-    @Override
-    public int getMemoryLimitInMB() {
-      return 0;
+    @Test
+    void responseCallbacksReceiveNoDataWhenHandlerThrows() {
+        String eventJson = "{" + "\"path\": \"/api/failure\"," + "\"requestContext\": {\"httpMethod\": \"GET\"}" + "}";
+        ByteArrayInputStream input = new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8));
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+
+        assertThrows(
+                Error.class,
+                () -> new HandlerStreamingWritesResponseThenThrows().handleRequest(input, output, newContext()));
+
+        assertTrue(appSecStarted, "request callbacks should run before the handler throws");
+        assertTrue(appSecEnded, "requestEnded should run after the handler throws");
+        assertEquals(1, appSecEndCount);
+        assertNull(capturedResponseStatus, "response status should not be set when handler throws");
+        assertNull(capturedResponseBody, "response body should not be set when handler throws");
+        assertTraces(trace(span().type(DDSpanTypes.SERVERLESS)
+                .error(true)
+                .tags(
+                        defaultTags(),
+                        tag("request_id", is(REQUEST_ID)),
+                        tag(Tags.HTTP_METHOD, is("GET")),
+                        tag(Tags.COMPONENT, is("aws-lambda")),
+                        error(Error.class, "Some error"))));
     }
 
-    @Override
-    public LambdaLogger getLogger() {
-      return null;
+    private static final class TestContext implements Context {
+        private final String requestId;
+
+        TestContext(String requestId) {
+            this.requestId = requestId;
+        }
+
+        @Override
+        public String getAwsRequestId() {
+            return requestId;
+        }
+
+        @Override
+        public String getLogGroupName() {
+            return null;
+        }
+
+        @Override
+        public String getLogStreamName() {
+            return null;
+        }
+
+        @Override
+        public String getFunctionName() {
+            return null;
+        }
+
+        @Override
+        public String getFunctionVersion() {
+            return null;
+        }
+
+        @Override
+        public String getInvokedFunctionArn() {
+            return null;
+        }
+
+        @Override
+        public CognitoIdentity getIdentity() {
+            return null;
+        }
+
+        @Override
+        public ClientContext getClientContext() {
+            return null;
+        }
+
+        @Override
+        public int getRemainingTimeInMillis() {
+            return 0;
+        }
+
+        @Override
+        public int getMemoryLimitInMB() {
+            return 0;
+        }
+
+        @Override
+        public LambdaLogger getLogger() {
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/LambdaHandlerInstrumentationV0Test.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/LambdaHandlerInstrumentationV0Test.java
index b92c889193b..a2b584e4c81 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/LambdaHandlerInstrumentationV0Test.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/LambdaHandlerInstrumentationV0Test.java
@@ -3,13 +3,13 @@
 @WithConfig(key = "trace.span.attribute.schema", value = "v0")
 class LambdaHandlerInstrumentationV0Test extends LambdaHandlerInstrumentationTest {
 
-  @Override
-  int version() {
-    return 0;
-  }
+    @Override
+    int version() {
+        return 0;
+    }
 
-  @Override
-  String operation() {
-    return "dd-tracer-serverless-span";
-  }
+    @Override
+    String operation() {
+        return "dd-tracer-serverless-span";
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/LambdaHandlerInstrumentationV1ForkedTest.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/LambdaHandlerInstrumentationV1ForkedTest.java
index 784431755c9..f771948b546 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/LambdaHandlerInstrumentationV1ForkedTest.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/LambdaHandlerInstrumentationV1ForkedTest.java
@@ -3,13 +3,13 @@
 @WithConfig(key = "trace.span.attribute.schema", value = "v1")
 class LambdaHandlerInstrumentationV1ForkedTest extends LambdaHandlerInstrumentationTest {
 
-  @Override
-  int version() {
-    return 1;
-  }
+    @Override
+    int version() {
+        return 1;
+    }
 
-  @Override
-  String operation() {
-    return "aws.lambda.invoke";
-  }
+    @Override
+    String operation() {
+        return "aws.lambda.invoke";
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3ClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3ClientInstrumentation.java
index 38033bd76fe..a0f75b87c54 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3ClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3ClientInstrumentation.java
@@ -12,32 +12,32 @@
 
 @AutoService(InstrumenterModule.class)
 public final class S3ClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public S3ClientInstrumentation() {
-    super("s3", "aws-s3");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public S3ClientInstrumentation() {
+        super("s3", "aws-s3");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder";
-  }
+    @Override
+    public String instrumentedType() {
+        return "software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("resolveExecutionInterceptors")),
-        S3ClientInstrumentation.class.getName() + "$AwsS3BuilderAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("resolveExecutionInterceptors")),
+                S3ClientInstrumentation.class.getName() + "$AwsS3BuilderAdvice");
+    }
 
-  public static class AwsS3BuilderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void addHandler(@Advice.Return final List<ExecutionInterceptor> interceptors) {
-      for (ExecutionInterceptor interceptor : interceptors) {
-        if (interceptor instanceof S3Interceptor) {
-          return; // list already has our interceptor, return to builder
+    public static class AwsS3BuilderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void addHandler(@Advice.Return final List<ExecutionInterceptor> interceptors) {
+            for (ExecutionInterceptor interceptor : interceptors) {
+                if (interceptor instanceof S3Interceptor) {
+                    return; // list already has our interceptor, return to builder
+                }
+            }
+            interceptors.add(new S3Interceptor());
         }
-      }
-      interceptors.add(new S3Interceptor());
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3Interceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3Interceptor.java
index 4ab9a591572..a15efa1fdf1 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3Interceptor.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3Interceptor.java
@@ -17,44 +17,43 @@
 import software.amazon.awssdk.services.s3.model.PutObjectResponse;
 
 public class S3Interceptor implements ExecutionInterceptor {
-  private static final Logger log = LoggerFactory.getLogger(S3Interceptor.class);
-
-  public static final ExecutionAttribute<Context> CONTEXT_ATTRIBUTE =
-      InstanceStore.of(ExecutionAttribute.class)
-          .getOrCreate("DatadogContext", () -> new ExecutionAttribute<>("DatadogContext"));
-
-  private static final boolean CAN_ADD_SPAN_POINTERS = Config.get().isAddSpanPointers("aws");
-
-  @Override
-  public void afterExecution(AfterExecution context, ExecutionAttributes executionAttributes) {
-    if (!CAN_ADD_SPAN_POINTERS) {
-      return;
+    private static final Logger log = LoggerFactory.getLogger(S3Interceptor.class);
+
+    public static final ExecutionAttribute<Context> CONTEXT_ATTRIBUTE = InstanceStore.of(ExecutionAttribute.class)
+            .getOrCreate("DatadogContext", () -> new ExecutionAttribute<>("DatadogContext"));
+
+    private static final boolean CAN_ADD_SPAN_POINTERS = Config.get().isAddSpanPointers("aws");
+
+    @Override
+    public void afterExecution(AfterExecution context, ExecutionAttributes executionAttributes) {
+        if (!CAN_ADD_SPAN_POINTERS) {
+            return;
+        }
+
+        Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
+        AgentSpan span = AgentSpan.fromContext(ddContext);
+        if (span == null) {
+            log.debug("Unable to find S3 request span. Not creating span pointer.");
+            return;
+        }
+        String eTag;
+        Object response = context.response();
+
+        // Get eTag for hash calculation.
+        // https://sdk.amazonaws.com/java/api/latest/software/amazon/awssdk/services/s3/S3Client.html
+        if (response instanceof PutObjectResponse) {
+            eTag = ((PutObjectResponse) response).eTag();
+        } else if (response instanceof CopyObjectResponse) {
+            eTag = ((CopyObjectResponse) response).copyObjectResult().eTag();
+        } else if (response instanceof CompleteMultipartUploadResponse) {
+            eTag = ((CompleteMultipartUploadResponse) response).eTag();
+        } else {
+            return;
+        }
+
+        // Store eTag as tag, then calculate hash + add span pointers in SpanPointersProcessor.
+        // Bucket and key are already stored as tags in AwsSdkClientDecorator, so need to make redundant
+        // tags.
+        span.setTag(S3_ETAG, eTag);
     }
-
-    Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
-    AgentSpan span = AgentSpan.fromContext(ddContext);
-    if (span == null) {
-      log.debug("Unable to find S3 request span. Not creating span pointer.");
-      return;
-    }
-    String eTag;
-    Object response = context.response();
-
-    // Get eTag for hash calculation.
-    // https://sdk.amazonaws.com/java/api/latest/software/amazon/awssdk/services/s3/S3Client.html
-    if (response instanceof PutObjectResponse) {
-      eTag = ((PutObjectResponse) response).eTag();
-    } else if (response instanceof CopyObjectResponse) {
-      eTag = ((CopyObjectResponse) response).copyObjectResult().eTag();
-    } else if (response instanceof CompleteMultipartUploadResponse) {
-      eTag = ((CompleteMultipartUploadResponse) response).eTag();
-    } else {
-      return;
-    }
-
-    // Store eTag as tag, then calculate hash + add span pointers in SpanPointersProcessor.
-    // Bucket and key are already stored as tags in AwsSdkClientDecorator, so need to make redundant
-    // tags.
-    span.setTag(S3_ETAG, eTag);
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AWSHttpClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AWSHttpClientInstrumentation.java
index 0d773ee49df..eaf75793345 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AWSHttpClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AWSHttpClientInstrumentation.java
@@ -21,52 +21,49 @@
  * {@link AmazonClientException} (for example an error thrown by another handler). In these cases
  * {@link RequestHandler2#afterError} is not called.
  */
-public class AWSHttpClientInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  private final String namespace;
+public class AWSHttpClientInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    private final String namespace;
 
-  public AWSHttpClientInstrumentation(String namespace) {
-    this.namespace = namespace;
-  }
+    public AWSHttpClientInstrumentation(String namespace) {
+        this.namespace = namespace;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return namespace + ".http.AmazonHttpClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return namespace + ".http.AmazonHttpClient";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("doExecute")),
-        AWSHttpClientInstrumentation.class.getName() + "$HttpClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("doExecute")), AWSHttpClientInstrumentation.class.getName() + "$HttpClientAdvice");
+    }
 
-  public static class HttpClientAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Argument(value = 0, optional = true) final Request<?> request,
-        @Advice.Thrown final Throwable throwable) {
+    public static class HttpClientAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Argument(value = 0, optional = true) final Request<?> request,
+                @Advice.Thrown final Throwable throwable) {
 
-      final AgentSpan activeSpan = activeSpan();
-      // check name in case TracingRequestHandler failed to activate the span
-      if (activeSpan != null
-          && (AwsNameCache.spanName(request).equals(activeSpan.getSpanName())
-              || !activeSpan.isValid())) {
-        closeActive();
-      }
+            final AgentSpan activeSpan = activeSpan();
+            // check name in case TracingRequestHandler failed to activate the span
+            if (activeSpan != null
+                    && (AwsNameCache.spanName(request).equals(activeSpan.getSpanName()) || !activeSpan.isValid())) {
+                closeActive();
+            }
 
-      if (throwable != null && request != null) {
-        final Context context = request.getHandlerContext(CONTEXT_CONTEXT_KEY);
-        if (context != null) {
-          request.addHandlerContext(CONTEXT_CONTEXT_KEY, null);
-          final AgentSpan span = spanFromContext(context);
-          if (span != null) {
-            DECORATE.onError(span, throwable);
-            DECORATE.beforeFinish(span);
-            span.finish();
-          }
+            if (throwable != null && request != null) {
+                final Context context = request.getHandlerContext(CONTEXT_CONTEXT_KEY);
+                if (context != null) {
+                    request.addHandlerContext(CONTEXT_CONTEXT_KEY, null);
+                    final AgentSpan span = spanFromContext(context);
+                    if (span != null) {
+                        DECORATE.onError(span, throwable);
+                        DECORATE.beforeFinish(span);
+                        span.finish();
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsNameCache.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsNameCache.java
index 11d9d397884..fd48d755d41 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsNameCache.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsNameCache.java
@@ -11,35 +11,37 @@
 
 public class AwsNameCache {
 
-  private static final Pattern REQUEST_PATTERN = Pattern.compile("Request", Pattern.LITERAL);
-  private static final Pattern AMAZON_PATTERN = Pattern.compile("Amazon", Pattern.LITERAL);
-  private static final DDCache<String, CharSequence> CACHE =
-      DDCaches.newFixedSizeCache(128); // cloud services can have high cardinality
+    private static final Pattern REQUEST_PATTERN = Pattern.compile("Request", Pattern.LITERAL);
+    private static final Pattern AMAZON_PATTERN = Pattern.compile("Amazon", Pattern.LITERAL);
+    private static final DDCache<String, CharSequence> CACHE =
+            DDCaches.newFixedSizeCache(128); // cloud services can have high cardinality
 
-  private static final QualifiedClassNameCache CLASS_NAME_CACHE =
-      new QualifiedClassNameCache(
-          input -> REQUEST_PATTERN.matcher(input.getSimpleName()).replaceAll(""),
-          Functions.SuffixJoin.of(
-              ".",
-              serviceName ->
-                  AMAZON_PATTERN.matcher(String.valueOf(serviceName)).replaceAll("").trim()));
+    private static final QualifiedClassNameCache CLASS_NAME_CACHE = new QualifiedClassNameCache(
+            input -> REQUEST_PATTERN.matcher(input.getSimpleName()).replaceAll(""),
+            Functions.SuffixJoin.of(
+                    ".",
+                    serviceName -> AMAZON_PATTERN
+                            .matcher(String.valueOf(serviceName))
+                            .replaceAll("")
+                            .trim()));
 
-  public static CharSequence spanName(final Request<?> awsRequest) {
-    return CACHE.computeIfAbsent(
-        getQualifiedName(awsRequest).toString(),
-        key ->
-            UTF8BytesString.create(
-                SpanNaming.instance()
-                    .namingSchema()
-                    .cloud()
-                    .operationForRequest(
-                        "aws",
-                        AMAZON_PATTERN.matcher(awsRequest.getServiceName()).replaceAll("").trim(),
-                        key)));
-  }
+    public static CharSequence spanName(final Request<?> awsRequest) {
+        return CACHE.computeIfAbsent(
+                getQualifiedName(awsRequest).toString(),
+                key -> UTF8BytesString.create(SpanNaming.instance()
+                        .namingSchema()
+                        .cloud()
+                        .operationForRequest(
+                                "aws",
+                                AMAZON_PATTERN
+                                        .matcher(awsRequest.getServiceName())
+                                        .replaceAll("")
+                                        .trim(),
+                                key)));
+    }
 
-  public static CharSequence getQualifiedName(final Request<?> awsRequest) {
-    return CLASS_NAME_CACHE.getQualifiedName(
-        awsRequest.getOriginalRequest().getClass(), awsRequest.getServiceName());
-  }
+    public static CharSequence getQualifiedName(final Request<?> awsRequest) {
+        return CLASS_NAME_CACHE.getQualifiedName(
+                awsRequest.getOriginalRequest().getClass(), awsRequest.getServiceName());
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java
index 07027e0f4f6..c702c9dc74b 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java
@@ -32,318 +32,306 @@
 import java.util.regex.Pattern;
 import javax.annotation.ParametersAreNonnullByDefault;
 
-public class AwsSdkClientDecorator extends HttpClientDecorator<Request, Response>
-    implements CarrierSetter<Request<?>> {
+public class AwsSdkClientDecorator extends HttpClientDecorator<Request, Response> implements CarrierSetter<Request<?>> {
 
-  private static final String AWS = "aws";
+    private static final String AWS = "aws";
 
-  static final CharSequence COMPONENT_NAME = UTF8BytesString.create("java-aws-sdk");
+    static final CharSequence COMPONENT_NAME = UTF8BytesString.create("java-aws-sdk");
 
-  public static final boolean AWS_LEGACY_TRACING = Config.get().isAwsLegacyTracingEnabled();
+    public static final boolean AWS_LEGACY_TRACING = Config.get().isAwsLegacyTracingEnabled();
 
-  public static final boolean SQS_LEGACY_TRACING = Config.get().isSqsLegacyTracingEnabled();
+    public static final boolean SQS_LEGACY_TRACING = Config.get().isSqsLegacyTracingEnabled();
 
-  private static final String SQS_SERVICE_NAME =
-      // this is probably wrong since it should use SpanNaming.instance()...
-      // but at this point changing the naming will be a breaking change
-      AWS_LEGACY_TRACING || SQS_LEGACY_TRACING ? "sqs" : Config.get().getServiceName();
+    private static final String SQS_SERVICE_NAME =
+            // this is probably wrong since it should use SpanNaming.instance()...
+            // but at this point changing the naming will be a breaking change
+            AWS_LEGACY_TRACING || SQS_LEGACY_TRACING ? "sqs" : Config.get().getServiceName();
 
-  private static final String SNS_SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cloud().serviceForRequest(AWS, "sns");
-  private static final String GENERIC_SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cloud().serviceForRequest(AWS, null);
-  public static final AwsSdkClientDecorator DECORATE = new AwsSdkClientDecorator();
+    private static final String SNS_SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cloud().serviceForRequest(AWS, "sns");
+    private static final String GENERIC_SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cloud().serviceForRequest(AWS, null);
+    public static final AwsSdkClientDecorator DECORATE = new AwsSdkClientDecorator();
 
-  private static final DDCache<String, String> serviceNameCache = DDCaches.newFixedSizeCache(128);
-  private static final Pattern AWS_SERVICE_NAME_PATTERN = Pattern.compile("Amazon\\s?(\\w+)");
+    private static final DDCache<String, String> serviceNameCache = DDCaches.newFixedSizeCache(128);
+    private static final Pattern AWS_SERVICE_NAME_PATTERN = Pattern.compile("Amazon\\s?(\\w+)");
 
-  private static final String PUT_RECORD_OPERATION_NAME = "PutRecordRequest";
-  private static final String PUT_RECORDS_OPERATION_NAME = "PutRecordsRequest";
-  private static final String PUBLISH_OPERATION_NAME = "PublishRequest";
-  private static final String PUBLISH_BATCH_OPERATION_NAME = "PublishBatchRequest";
+    private static final String PUT_RECORD_OPERATION_NAME = "PutRecordRequest";
+    private static final String PUT_RECORDS_OPERATION_NAME = "PutRecordsRequest";
+    private static final String PUBLISH_OPERATION_NAME = "PublishRequest";
+    private static final String PUBLISH_BATCH_OPERATION_NAME = "PublishBatchRequest";
 
-  private static String simplifyServiceName(String awsServiceName) {
-    return serviceNameCache.computeIfAbsent(
-        awsServiceName, AwsSdkClientDecorator::applyServiceNamePattern);
-  }
-
-  private static String applyServiceNamePattern(String awsServiceName) {
-    if (awsServiceName != null) {
-      Matcher matcher = AWS_SERVICE_NAME_PATTERN.matcher(awsServiceName);
-      if (matcher.find()) {
-        return matcher.group(1).toLowerCase(Locale.ROOT);
-      }
+    private static String simplifyServiceName(String awsServiceName) {
+        return serviceNameCache.computeIfAbsent(awsServiceName, AwsSdkClientDecorator::applyServiceNamePattern);
     }
-    return awsServiceName;
-  }
-
-  @Override
-  protected void doOnRequest(final AgentSpan span, final Request request) {
-    // Call super first because we override the resource name below.
-    super.doOnRequest(span, request);
-
-    final String awsServiceName = request.getServiceName();
-    final String awsSimplifiedServiceName = simplifyServiceName(awsServiceName);
-    final AmazonWebServiceRequest originalRequest = request.getOriginalRequest();
-    final Class<?> awsOperation = originalRequest.getClass();
-    final GetterAccess access = GetterAccess.of(originalRequest);
-    final String endpoint = request.getEndpoint().toString();
-
-    span.setTag(InstrumentationTags.AWS_AGENT, COMPONENT_NAME);
-    span.setTag(InstrumentationTags.AWS_SERVICE, awsServiceName);
-    span.setTag(InstrumentationTags.TOP_LEVEL_AWS_SERVICE, awsSimplifiedServiceName);
-    span.setTag(InstrumentationTags.AWS_OPERATION, awsOperation.getSimpleName());
-    span.setTag(InstrumentationTags.AWS_ENDPOINT, endpoint);
-
-    CharSequence awsRequestName = AwsNameCache.getQualifiedName(request);
-    span.setResourceName(awsRequestName, RPC_COMMAND_NAME);
-
-    if ("s3".equalsIgnoreCase(awsSimplifiedServiceName) && traceConfig().isDataStreamsEnabled()) {
-      span.setTag(Tags.HTTP_REQUEST_CONTENT_LENGTH, getRequestContentLength(request));
+
+    private static String applyServiceNamePattern(String awsServiceName) {
+        if (awsServiceName != null) {
+            Matcher matcher = AWS_SERVICE_NAME_PATTERN.matcher(awsServiceName);
+            if (matcher.find()) {
+                return matcher.group(1).toLowerCase(Locale.ROOT);
+            }
+        }
+        return awsServiceName;
     }
 
-    switch (awsRequestName.toString()) {
-      case "SQS.SendMessage":
-      case "SQS.SendMessageBatch":
-      case "SQS.ReceiveMessage":
-      case "SQS.DeleteMessage":
-      case "SQS.DeleteMessageBatch":
-        span.setServiceName(SQS_SERVICE_NAME, component());
-        break;
-      case "SNS.Publish":
-      case "SNS.PublishBatch":
-        if (SNS_SERVICE_NAME != null) {
-          span.setServiceName(SNS_SERVICE_NAME, component());
+    @Override
+    protected void doOnRequest(final AgentSpan span, final Request request) {
+        // Call super first because we override the resource name below.
+        super.doOnRequest(span, request);
+
+        final String awsServiceName = request.getServiceName();
+        final String awsSimplifiedServiceName = simplifyServiceName(awsServiceName);
+        final AmazonWebServiceRequest originalRequest = request.getOriginalRequest();
+        final Class<?> awsOperation = originalRequest.getClass();
+        final GetterAccess access = GetterAccess.of(originalRequest);
+        final String endpoint = request.getEndpoint().toString();
+
+        span.setTag(InstrumentationTags.AWS_AGENT, COMPONENT_NAME);
+        span.setTag(InstrumentationTags.AWS_SERVICE, awsServiceName);
+        span.setTag(InstrumentationTags.TOP_LEVEL_AWS_SERVICE, awsSimplifiedServiceName);
+        span.setTag(InstrumentationTags.AWS_OPERATION, awsOperation.getSimpleName());
+        span.setTag(InstrumentationTags.AWS_ENDPOINT, endpoint);
+
+        CharSequence awsRequestName = AwsNameCache.getQualifiedName(request);
+        span.setResourceName(awsRequestName, RPC_COMMAND_NAME);
+
+        if ("s3".equalsIgnoreCase(awsSimplifiedServiceName) && traceConfig().isDataStreamsEnabled()) {
+            span.setTag(Tags.HTTP_REQUEST_CONTENT_LENGTH, getRequestContentLength(request));
         }
-        break;
-      default:
-        if (GENERIC_SERVICE_NAME != null) {
-          span.setServiceName(GENERIC_SERVICE_NAME, component());
+
+        switch (awsRequestName.toString()) {
+            case "SQS.SendMessage":
+            case "SQS.SendMessageBatch":
+            case "SQS.ReceiveMessage":
+            case "SQS.DeleteMessage":
+            case "SQS.DeleteMessageBatch":
+                span.setServiceName(SQS_SERVICE_NAME, component());
+                break;
+            case "SNS.Publish":
+            case "SNS.PublishBatch":
+                if (SNS_SERVICE_NAME != null) {
+                    span.setServiceName(SNS_SERVICE_NAME, component());
+                }
+                break;
+            default:
+                if (GENERIC_SERVICE_NAME != null) {
+                    span.setServiceName(GENERIC_SERVICE_NAME, component());
+                }
+                break;
         }
-        break;
-    }
 
-    String bestPrecursor = null;
-    String bestPeerService = null;
+        String bestPrecursor = null;
+        String bestPeerService = null;
 
-    String key = access.getKey(originalRequest);
-    if (null != key) {
-      span.setTag(InstrumentationTags.AWS_OBJECT_KEY, key);
-    }
-    String bucketName = access.getBucketName(originalRequest);
-    if (null != bucketName) {
-      span.setTag(InstrumentationTags.AWS_BUCKET_NAME, bucketName);
-      span.setTag(InstrumentationTags.BUCKET_NAME, bucketName);
-      bestPrecursor = InstrumentationTags.AWS_BUCKET_NAME;
-      bestPeerService = bucketName;
-    }
-    String queueUrl = access.getQueueUrl(originalRequest);
-    if (null != queueUrl) {
-      span.setTag(InstrumentationTags.AWS_QUEUE_URL, queueUrl);
-      bestPrecursor = InstrumentationTags.AWS_QUEUE_URL;
-      bestPeerService = queueUrl;
+        String key = access.getKey(originalRequest);
+        if (null != key) {
+            span.setTag(InstrumentationTags.AWS_OBJECT_KEY, key);
+        }
+        String bucketName = access.getBucketName(originalRequest);
+        if (null != bucketName) {
+            span.setTag(InstrumentationTags.AWS_BUCKET_NAME, bucketName);
+            span.setTag(InstrumentationTags.BUCKET_NAME, bucketName);
+            bestPrecursor = InstrumentationTags.AWS_BUCKET_NAME;
+            bestPeerService = bucketName;
+        }
+        String queueUrl = access.getQueueUrl(originalRequest);
+        if (null != queueUrl) {
+            span.setTag(InstrumentationTags.AWS_QUEUE_URL, queueUrl);
+            bestPrecursor = InstrumentationTags.AWS_QUEUE_URL;
+            bestPeerService = queueUrl;
+        }
+        String queueName = access.getQueueName(originalRequest);
+        if (null != queueName) {
+            span.setTag(InstrumentationTags.AWS_QUEUE_NAME, queueName);
+            span.setTag(InstrumentationTags.QUEUE_NAME, queueName);
+            bestPrecursor = InstrumentationTags.AWS_QUEUE_NAME;
+            bestPeerService = queueName;
+        }
+        String topicName = null;
+        String topicArn = access.getTopicArn(originalRequest);
+        if (null != topicArn) {
+            topicName = topicArn.substring(topicArn.lastIndexOf(':') + 1);
+            span.setTag(InstrumentationTags.AWS_TOPIC_NAME, topicName);
+            span.setTag(InstrumentationTags.TOPIC_NAME, topicName);
+            bestPrecursor = InstrumentationTags.AWS_TOPIC_NAME;
+            bestPeerService = topicName;
+        }
+        String streamName = access.getStreamName(originalRequest);
+        if (null != streamName) {
+            span.setTag(InstrumentationTags.AWS_STREAM_NAME, streamName);
+            span.setTag(InstrumentationTags.STREAM_NAME, streamName);
+            bestPrecursor = InstrumentationTags.AWS_STREAM_NAME;
+            bestPeerService = streamName;
+        }
+        String streamArn = access.getStreamARN(originalRequest);
+        if (null != streamArn) {
+            int streamNameStart = streamArn.indexOf(":stream/");
+            if (streamNameStart >= 0) {
+                streamName = streamArn.substring(streamNameStart + 8);
+                span.setTag(InstrumentationTags.AWS_STREAM_NAME, streamName);
+                span.setTag(InstrumentationTags.STREAM_NAME, streamName);
+                bestPrecursor = InstrumentationTags.AWS_STREAM_NAME;
+                bestPeerService = streamName;
+            }
+        }
+        String tableName = access.getTableName(originalRequest);
+        if (null != tableName) {
+            span.setTag(InstrumentationTags.AWS_TABLE_NAME, tableName);
+            span.setTag(InstrumentationTags.TABLE_NAME, tableName);
+            bestPrecursor = InstrumentationTags.AWS_TABLE_NAME;
+            bestPeerService = tableName;
+        }
+
+        // Set peer.service based on Config for serverless functions
+        if (Config.get().isAwsServerless()) {
+            URI uri = request.getEndpoint();
+            String hostname = uri.getHost();
+            if (uri.getPort() != -1) {
+                hostname = hostname + ":" + uri.getPort();
+            }
+            span.setTag(Tags.PEER_SERVICE, hostname);
+            span.setTag(DDTags.PEER_SERVICE_SOURCE, "peer.service");
+        } else {
+            if (bestPrecursor != null
+                    && SpanNaming.instance().namingSchema().peerService().supports()) {
+                span.setTag(Tags.PEER_SERVICE, bestPeerService);
+                span.setTag(DDTags.PEER_SERVICE_SOURCE, bestPrecursor);
+            }
+        }
+
+        // DSM
+        if (traceConfig().isDataStreamsEnabled()) {
+            if (null != streamArn && "AmazonKinesis".equals(awsServiceName)) {
+                switch (awsOperation.getSimpleName()) {
+                    case PUT_RECORD_OPERATION_NAME:
+                        try (ContextScope scope = AgentTracer.activateSpan(span)) {
+                            AgentTracer.get().getDataStreamsMonitoring().setProduceCheckpoint("kinesis", streamArn);
+                        }
+                        break;
+                    case PUT_RECORDS_OPERATION_NAME:
+                        try (ContextScope scope = AgentTracer.activateSpan(span)) {
+                            List records = access.getRecords(originalRequest);
+                            for (Object ignored : records) {
+                                AgentTracer.get().getDataStreamsMonitoring().setProduceCheckpoint("kinesis", streamArn);
+                            }
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            } else if (null != topicName && "AmazonSNS".equals(awsServiceName)) {
+                switch (awsOperation.getSimpleName()) {
+                    case PUBLISH_OPERATION_NAME:
+                        try (ContextScope scope = AgentTracer.activateSpan(span)) {
+                            AgentTracer.get().getDataStreamsMonitoring().setProduceCheckpoint("sns", topicName);
+                        }
+                        break;
+                    case PUBLISH_BATCH_OPERATION_NAME:
+                        try (ContextScope scope = AgentTracer.activateSpan(span)) {
+                            List entries = access.getEntries(originalRequest);
+                            for (Object ignored : entries) {
+                                AgentTracer.get().getDataStreamsMonitoring().setProduceCheckpoint("sns", topicName);
+                            }
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
     }
-    String queueName = access.getQueueName(originalRequest);
-    if (null != queueName) {
-      span.setTag(InstrumentationTags.AWS_QUEUE_NAME, queueName);
-      span.setTag(InstrumentationTags.QUEUE_NAME, queueName);
-      bestPrecursor = InstrumentationTags.AWS_QUEUE_NAME;
-      bestPeerService = queueName;
+
+    public void onServiceResponse(final AgentSpan span, final String awsService, final Response response) {
+        if ("s3".equalsIgnoreCase(simplifyServiceName(awsService))
+                && traceConfig().isDataStreamsEnabled()) {
+            long responseSize = getResponseContentLength(response);
+            span.setTag(Tags.HTTP_RESPONSE_CONTENT_LENGTH, responseSize);
+
+            String key = getSpanTagAsString(span, InstrumentationTags.AWS_OBJECT_KEY);
+            String bucket = getSpanTagAsString(span, InstrumentationTags.AWS_BUCKET_NAME);
+            String awsOperation = getSpanTagAsString(span, InstrumentationTags.AWS_OPERATION);
+
+            if (key != null && bucket != null && awsOperation != null) {
+                // GetObjectMetadataRequest may return the object if it's not "HEAD"
+                if (HttpMethodName.GET.name().equals(span.getTag(Tags.HTTP_METHOD))
+                        && ("GetObjectMetadataRequest".equalsIgnoreCase(awsOperation)
+                                || "GetObjectRequest".equalsIgnoreCase(awsOperation))) {
+                    DataStreamsTags tags = DataStreamsTags.createWithDataset("s3", INBOUND, bucket, key, bucket);
+                    AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, create(tags, 0, responseSize));
+                }
+
+                if ("PutObjectRequest".equalsIgnoreCase(awsOperation)
+                        || "UploadPartRequest".equalsIgnoreCase(awsOperation)) {
+                    Object requestSize = span.getTag(Tags.HTTP_REQUEST_CONTENT_LENGTH);
+                    long payloadSize = 0;
+                    if (requestSize != null) {
+                        payloadSize = (long) requestSize;
+                    }
+                    DataStreamsTags tags = DataStreamsTags.createWithDataset("s3", OUTBOUND, bucket, key, bucket);
+                    AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, create(tags, 0, payloadSize));
+                }
+            }
+        }
     }
-    String topicName = null;
-    String topicArn = access.getTopicArn(originalRequest);
-    if (null != topicArn) {
-      topicName = topicArn.substring(topicArn.lastIndexOf(':') + 1);
-      span.setTag(InstrumentationTags.AWS_TOPIC_NAME, topicName);
-      span.setTag(InstrumentationTags.TOPIC_NAME, topicName);
-      bestPrecursor = InstrumentationTags.AWS_TOPIC_NAME;
-      bestPeerService = topicName;
+
+    @Override
+    protected void doOnResponse(final AgentSpan span, final Response response) {
+        if (response.getAwsResponse() instanceof AmazonWebServiceResponse) {
+            final AmazonWebServiceResponse awsResp = (AmazonWebServiceResponse) response.getAwsResponse();
+            span.setTag(InstrumentationTags.AWS_REQUEST_ID, awsResp.getRequestId());
+        }
+
+        super.doOnResponse(span, response);
     }
-    String streamName = access.getStreamName(originalRequest);
-    if (null != streamName) {
-      span.setTag(InstrumentationTags.AWS_STREAM_NAME, streamName);
-      span.setTag(InstrumentationTags.STREAM_NAME, streamName);
-      bestPrecursor = InstrumentationTags.AWS_STREAM_NAME;
-      bestPeerService = streamName;
+
+    @Override
+    protected boolean shouldSetResourceName() {
+        return false;
     }
-    String streamArn = access.getStreamARN(originalRequest);
-    if (null != streamArn) {
-      int streamNameStart = streamArn.indexOf(":stream/");
-      if (streamNameStart >= 0) {
-        streamName = streamArn.substring(streamNameStart + 8);
-        span.setTag(InstrumentationTags.AWS_STREAM_NAME, streamName);
-        span.setTag(InstrumentationTags.STREAM_NAME, streamName);
-        bestPrecursor = InstrumentationTags.AWS_STREAM_NAME;
-        bestPeerService = streamName;
-      }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"aws-sdk"};
     }
-    String tableName = access.getTableName(originalRequest);
-    if (null != tableName) {
-      span.setTag(InstrumentationTags.AWS_TABLE_NAME, tableName);
-      span.setTag(InstrumentationTags.TABLE_NAME, tableName);
-      bestPrecursor = InstrumentationTags.AWS_TABLE_NAME;
-      bestPeerService = tableName;
+
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
     }
 
-    // Set peer.service based on Config for serverless functions
-    if (Config.get().isAwsServerless()) {
-      URI uri = request.getEndpoint();
-      String hostname = uri.getHost();
-      if (uri.getPort() != -1) {
-        hostname = hostname + ":" + uri.getPort();
-      }
-      span.setTag(Tags.PEER_SERVICE, hostname);
-      span.setTag(DDTags.PEER_SERVICE_SOURCE, "peer.service");
-    } else {
-      if (bestPrecursor != null && SpanNaming.instance().namingSchema().peerService().supports()) {
-        span.setTag(Tags.PEER_SERVICE, bestPeerService);
-        span.setTag(DDTags.PEER_SERVICE_SOURCE, bestPrecursor);
-      }
+    @Override
+    protected String method(final Request request) {
+        return request.getHttpMethod().name();
     }
 
-    // DSM
-    if (traceConfig().isDataStreamsEnabled()) {
-      if (null != streamArn && "AmazonKinesis".equals(awsServiceName)) {
-        switch (awsOperation.getSimpleName()) {
-          case PUT_RECORD_OPERATION_NAME:
-            try (ContextScope scope = AgentTracer.activateSpan(span)) {
-              AgentTracer.get()
-                  .getDataStreamsMonitoring()
-                  .setProduceCheckpoint("kinesis", streamArn);
-            }
-            break;
-          case PUT_RECORDS_OPERATION_NAME:
-            try (ContextScope scope = AgentTracer.activateSpan(span)) {
-              List records = access.getRecords(originalRequest);
-              for (Object ignored : records) {
-                AgentTracer.get()
-                    .getDataStreamsMonitoring()
-                    .setProduceCheckpoint("kinesis", streamArn);
-              }
-            }
-            break;
-          default:
-            break;
-        }
-      } else if (null != topicName && "AmazonSNS".equals(awsServiceName)) {
-        switch (awsOperation.getSimpleName()) {
-          case PUBLISH_OPERATION_NAME:
-            try (ContextScope scope = AgentTracer.activateSpan(span)) {
-              AgentTracer.get().getDataStreamsMonitoring().setProduceCheckpoint("sns", topicName);
-            }
-            break;
-          case PUBLISH_BATCH_OPERATION_NAME:
-            try (ContextScope scope = AgentTracer.activateSpan(span)) {
-              List entries = access.getEntries(originalRequest);
-              for (Object ignored : entries) {
-                AgentTracer.get().getDataStreamsMonitoring().setProduceCheckpoint("sns", topicName);
-              }
-            }
-            break;
-          default:
-            break;
-        }
-      }
+    @Override
+    protected URI url(final Request request) {
+        return request.getEndpoint();
     }
-  }
-
-  public void onServiceResponse(
-      final AgentSpan span, final String awsService, final Response response) {
-    if ("s3".equalsIgnoreCase(simplifyServiceName(awsService))
-        && traceConfig().isDataStreamsEnabled()) {
-      long responseSize = getResponseContentLength(response);
-      span.setTag(Tags.HTTP_RESPONSE_CONTENT_LENGTH, responseSize);
-
-      String key = getSpanTagAsString(span, InstrumentationTags.AWS_OBJECT_KEY);
-      String bucket = getSpanTagAsString(span, InstrumentationTags.AWS_BUCKET_NAME);
-      String awsOperation = getSpanTagAsString(span, InstrumentationTags.AWS_OPERATION);
-
-      if (key != null && bucket != null && awsOperation != null) {
-        // GetObjectMetadataRequest may return the object if it's not "HEAD"
-        if (HttpMethodName.GET.name().equals(span.getTag(Tags.HTTP_METHOD))
-            && ("GetObjectMetadataRequest".equalsIgnoreCase(awsOperation)
-                || "GetObjectRequest".equalsIgnoreCase(awsOperation))) {
-          DataStreamsTags tags =
-              DataStreamsTags.createWithDataset("s3", INBOUND, bucket, key, bucket);
-          AgentTracer.get()
-              .getDataStreamsMonitoring()
-              .setCheckpoint(span, create(tags, 0, responseSize));
-        }
 
-        if ("PutObjectRequest".equalsIgnoreCase(awsOperation)
-            || "UploadPartRequest".equalsIgnoreCase(awsOperation)) {
-          Object requestSize = span.getTag(Tags.HTTP_REQUEST_CONTENT_LENGTH);
-          long payloadSize = 0;
-          if (requestSize != null) {
-            payloadSize = (long) requestSize;
-          }
-          DataStreamsTags tags =
-              DataStreamsTags.createWithDataset("s3", OUTBOUND, bucket, key, bucket);
-          AgentTracer.get()
-              .getDataStreamsMonitoring()
-              .setCheckpoint(span, create(tags, 0, payloadSize));
-        }
-      }
+    @Override
+    protected int status(final Response response) {
+        return response.getHttpResponse().getStatusCode();
     }
-  }
 
-  @Override
-  protected void doOnResponse(final AgentSpan span, final Response response) {
-    if (response.getAwsResponse() instanceof AmazonWebServiceResponse) {
-      final AmazonWebServiceResponse awsResp = (AmazonWebServiceResponse) response.getAwsResponse();
-      span.setTag(InstrumentationTags.AWS_REQUEST_ID, awsResp.getRequestId());
+    @ParametersAreNonnullByDefault
+    @Override
+    public void set(Request<?> carrier, String key, String value) {
+        carrier.addHeader(key, value);
     }
 
-    super.doOnResponse(span, response);
-  }
-
-  @Override
-  protected boolean shouldSetResourceName() {
-    return false;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"aws-sdk"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected String method(final Request request) {
-    return request.getHttpMethod().name();
-  }
-
-  @Override
-  protected URI url(final Request request) {
-    return request.getEndpoint();
-  }
-
-  @Override
-  protected int status(final Response response) {
-    return response.getHttpResponse().getStatusCode();
-  }
-
-  @ParametersAreNonnullByDefault
-  @Override
-  public void set(Request<?> carrier, String key, String value) {
-    carrier.addHeader(key, value);
-  }
-
-  @Override
-  protected String getRequestHeader(Request request, String headerName) {
-    Object header = request.getHeaders().get(headerName);
-    if (null != header) {
-      return header.toString();
+    @Override
+    protected String getRequestHeader(Request request, String headerName) {
+        Object header = request.getHeaders().get(headerName);
+        if (null != header) {
+            return header.toString();
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Override
-  protected String getResponseHeader(Response response, String headerName) {
-    return response.getHttpResponse().getHeaders().get(headerName);
-  }
+    @Override
+    protected String getResponseHeader(Response response, String headerName) {
+        return response.getHttpResponse().getHeaders().get(headerName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkModule.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkModule.java
index 85e69c37492..6558fc24617 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkModule.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkModule.java
@@ -10,30 +10,30 @@
 /** Groups the instrumentations for AWS SDK 1.11.0+. */
 @AutoService(InstrumenterModule.class)
 public class AwsSdkModule extends InstrumenterModule.Tracing {
-  private final String namespace;
+    private final String namespace;
 
-  public AwsSdkModule() {
-    this("com.amazonaws", "aws-sdk");
-  }
+    public AwsSdkModule() {
+        this("com.amazonaws", "aws-sdk");
+    }
 
-  protected AwsSdkModule(String namespace, String instrumentationName) {
-    super(instrumentationName);
-    this.namespace = namespace;
-  }
+    protected AwsSdkModule(String namespace, String instrumentationName) {
+        super(instrumentationName);
+        this.namespace = namespace;
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> map = new java.util.HashMap<>();
-    map.put(namespace + ".services.sqs.model.ReceiveMessageResult", "java.lang.String");
-    map.put(namespace + ".AmazonWebServiceRequest", "datadog.context.Context");
-    return map;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> map = new java.util.HashMap<>();
+        map.put(namespace + ".services.sqs.model.ReceiveMessageResult", "java.lang.String");
+        map.put(namespace + ".AmazonWebServiceRequest", "datadog.context.Context");
+        return map;
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new AWSHttpClientInstrumentation(namespace),
-        new RequestExecutorInstrumentation(namespace),
-        new HandlerChainFactoryInstrumentation(namespace));
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(
+                new AWSHttpClientInstrumentation(namespace),
+                new RequestExecutorInstrumentation(namespace),
+                new HandlerChainFactoryInstrumentation(namespace));
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/EmrSdkModule.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/EmrSdkModule.java
index 042f71f2cdb..bf72a13600f 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/EmrSdkModule.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/EmrSdkModule.java
@@ -9,17 +9,17 @@
 /** Repackaged AWS SDK instrumentations for Amazon EMR. */
 @AutoService(InstrumenterModule.class)
 public class EmrSdkModule extends AwsSdkModule {
-  public EmrSdkModule() {
-    super("com.amazon.ws.emr.hadoop.fs.shaded.com.amazonaws", "emr-aws-sdk");
-  }
+    public EmrSdkModule() {
+        super("com.amazon.ws.emr.hadoop.fs.shaded.com.amazonaws", "emr-aws-sdk");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "emr-aws-sdk";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "emr-aws-sdk";
+    }
 
-  @Override
-  public Map<String, String> adviceShading() {
-    return singletonMap("com.amazonaws", "com.amazon.ws.emr.hadoop.fs.shaded.com.amazonaws");
-  }
+    @Override
+    public Map<String, String> adviceShading() {
+        return singletonMap("com.amazonaws", "com.amazon.ws.emr.hadoop.fs.shaded.com.amazonaws");
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/GetterAccess.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/GetterAccess.java
index ed87408c1bd..a82e752438b 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/GetterAccess.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/GetterAccess.java
@@ -10,161 +10,158 @@
 import java.util.regex.Pattern;
 
 final class GetterAccess {
-  private static final ClassValue<GetterAccess> GETTER_ACCESS =
-      GenericClassValue.of(
-          // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
-          new Function<Class<?>, GetterAccess>() {
-            @Override
-            public GetterAccess apply(final Class<?> requestType) {
-              return new GetterAccess(requestType);
-            }
-          });
-
-  static GetterAccess of(final Object request) {
-    return GETTER_ACCESS.get(request.getClass());
-  }
-
-  private static final Pattern REQUEST_OPERATION_NAME_PATTERN =
-      Pattern.compile("Request", Pattern.LITERAL);
-
-  private final String operationName;
-  private final MethodHandle getKey;
-  private final MethodHandle getBucketName;
-  private final MethodHandle getQueueUrl;
-  private final MethodHandle getQueueName;
-  private final MethodHandle getTopicArn;
-  private final MethodHandle getStreamName;
-  private final MethodHandle getStreamARN;
-  private final MethodHandle getRecords;
-  private final MethodHandle getPublishBatchRequestEntries;
-  private final MethodHandle getApproximateArrivalTimestamp;
-  private final MethodHandle getTableName;
-
-  private GetterAccess(final Class<?> objectType) {
-    operationName =
-        REQUEST_OPERATION_NAME_PATTERN.matcher(objectType.getSimpleName()).replaceAll("");
-    getKey = findStringGetter(objectType, "getKey");
-    getBucketName = findStringGetter(objectType, "getBucketName");
-    getQueueUrl = findStringGetter(objectType, "getQueueUrl");
-    getQueueName = findStringGetter(objectType, "getQueueName");
-    getTopicArn = findStringGetter(objectType, "getTopicArn");
-    getStreamName = findStringGetter(objectType, "getStreamName");
-    getStreamARN = findStringGetter(objectType, "getStreamARN");
-    getRecords = findListGetter(objectType, "getRecords");
-    getPublishBatchRequestEntries = findListGetter(objectType, "getPublishBatchRequestEntries");
-    getApproximateArrivalTimestamp =
-        findGetter(objectType, "getApproximateArrivalTimestamp", Date.class);
-    getTableName = findStringGetter(objectType, "getTableName");
-  }
-
-  String getOperationNameFromType() {
-    return operationName;
-  }
-
-  String getKey(final Object object) {
-    return invokeForString(getKey, object);
-  }
-
-  String getBucketName(final Object object) {
-    return invokeForString(getBucketName, object);
-  }
-
-  String getQueueUrl(final Object object) {
-    return invokeForString(getQueueUrl, object);
-  }
-
-  String getQueueName(final Object object) {
-    return invokeForString(getQueueName, object);
-  }
-
-  String getTopicArn(final Object object) {
-    return invokeForString(getTopicArn, object);
-  }
-
-  String getStreamName(final Object object) {
-    return invokeForString(getStreamName, object);
-  }
-
-  String getStreamARN(final Object object) {
-    return invokeForString(getStreamARN, object);
-  }
-
-  List getRecords(final Object object) {
-    return invokeForList(getRecords, object);
-  }
-
-  List getEntries(final Object object) {
-    return invokeForList(getPublishBatchRequestEntries, object);
-  }
-
-  String getTableName(final Object object) {
-    return invokeForString(getTableName, object);
-  }
-
-  Date getApproximateArrivalTimestamp(final Object object) {
-    return invoke(getApproximateArrivalTimestamp, object);
-  }
-
-  private static String invokeForString(final MethodHandle method, final Object object) {
-    if (null == method) {
-      return null;
-    }
-    try {
-      return (String) method.invoke(object);
-    } catch (Throwable e) {
-      return null;
-    }
-  }
-
-  private static List invokeForList(final MethodHandle method, final Object object) {
-    if (null == method) {
-      return null;
-    }
-    try {
-      return (List) method.invoke(object);
-    } catch (Throwable e) {
-      return null;
-    }
-  }
-
-  private static <T> T invoke(final MethodHandle method, final Object object) {
-    if (null == method) {
-      return null;
-    }
-    try {
-      return (T) method.invoke(object);
-    } catch (Throwable e) {
-      return null;
-    }
-  }
-
-  private static final MethodHandles.Lookup PUBLIC_LOOKUP = MethodHandles.publicLookup();
-  private static final MethodType STRING_RETURN_TYPE = MethodType.methodType(String.class);
-  private static final MethodType LIST_RETURN_TYPE = MethodType.methodType(List.class);
-
-  private static MethodHandle findStringGetter(
-      final Class<?> requestType, final String methodName) {
-    try {
-      return PUBLIC_LOOKUP.findVirtual(requestType, methodName, STRING_RETURN_TYPE);
-    } catch (Throwable e) {
-      return null;
-    }
-  }
-
-  private static MethodHandle findListGetter(final Class<?> requestType, final String methodName) {
-    try {
-      return PUBLIC_LOOKUP.findVirtual(requestType, methodName, LIST_RETURN_TYPE);
-    } catch (Throwable e) {
-      return null;
+    private static final ClassValue<GetterAccess> GETTER_ACCESS = GenericClassValue.of(
+            // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
+            new Function<Class<?>, GetterAccess>() {
+                @Override
+                public GetterAccess apply(final Class<?> requestType) {
+                    return new GetterAccess(requestType);
+                }
+            });
+
+    static GetterAccess of(final Object request) {
+        return GETTER_ACCESS.get(request.getClass());
     }
-  }
 
-  private static MethodHandle findGetter(
-      final Class<?> pojoType, final String methodName, final Class<?> returnType) {
-    try {
-      return PUBLIC_LOOKUP.findVirtual(pojoType, methodName, MethodType.methodType(returnType));
-    } catch (Throwable e) {
-      return null;
+    private static final Pattern REQUEST_OPERATION_NAME_PATTERN = Pattern.compile("Request", Pattern.LITERAL);
+
+    private final String operationName;
+    private final MethodHandle getKey;
+    private final MethodHandle getBucketName;
+    private final MethodHandle getQueueUrl;
+    private final MethodHandle getQueueName;
+    private final MethodHandle getTopicArn;
+    private final MethodHandle getStreamName;
+    private final MethodHandle getStreamARN;
+    private final MethodHandle getRecords;
+    private final MethodHandle getPublishBatchRequestEntries;
+    private final MethodHandle getApproximateArrivalTimestamp;
+    private final MethodHandle getTableName;
+
+    private GetterAccess(final Class<?> objectType) {
+        operationName = REQUEST_OPERATION_NAME_PATTERN
+                .matcher(objectType.getSimpleName())
+                .replaceAll("");
+        getKey = findStringGetter(objectType, "getKey");
+        getBucketName = findStringGetter(objectType, "getBucketName");
+        getQueueUrl = findStringGetter(objectType, "getQueueUrl");
+        getQueueName = findStringGetter(objectType, "getQueueName");
+        getTopicArn = findStringGetter(objectType, "getTopicArn");
+        getStreamName = findStringGetter(objectType, "getStreamName");
+        getStreamARN = findStringGetter(objectType, "getStreamARN");
+        getRecords = findListGetter(objectType, "getRecords");
+        getPublishBatchRequestEntries = findListGetter(objectType, "getPublishBatchRequestEntries");
+        getApproximateArrivalTimestamp = findGetter(objectType, "getApproximateArrivalTimestamp", Date.class);
+        getTableName = findStringGetter(objectType, "getTableName");
+    }
+
+    String getOperationNameFromType() {
+        return operationName;
+    }
+
+    String getKey(final Object object) {
+        return invokeForString(getKey, object);
+    }
+
+    String getBucketName(final Object object) {
+        return invokeForString(getBucketName, object);
+    }
+
+    String getQueueUrl(final Object object) {
+        return invokeForString(getQueueUrl, object);
+    }
+
+    String getQueueName(final Object object) {
+        return invokeForString(getQueueName, object);
+    }
+
+    String getTopicArn(final Object object) {
+        return invokeForString(getTopicArn, object);
+    }
+
+    String getStreamName(final Object object) {
+        return invokeForString(getStreamName, object);
+    }
+
+    String getStreamARN(final Object object) {
+        return invokeForString(getStreamARN, object);
+    }
+
+    List getRecords(final Object object) {
+        return invokeForList(getRecords, object);
+    }
+
+    List getEntries(final Object object) {
+        return invokeForList(getPublishBatchRequestEntries, object);
+    }
+
+    String getTableName(final Object object) {
+        return invokeForString(getTableName, object);
+    }
+
+    Date getApproximateArrivalTimestamp(final Object object) {
+        return invoke(getApproximateArrivalTimestamp, object);
+    }
+
+    private static String invokeForString(final MethodHandle method, final Object object) {
+        if (null == method) {
+            return null;
+        }
+        try {
+            return (String) method.invoke(object);
+        } catch (Throwable e) {
+            return null;
+        }
+    }
+
+    private static List invokeForList(final MethodHandle method, final Object object) {
+        if (null == method) {
+            return null;
+        }
+        try {
+            return (List) method.invoke(object);
+        } catch (Throwable e) {
+            return null;
+        }
+    }
+
+    private static <T> T invoke(final MethodHandle method, final Object object) {
+        if (null == method) {
+            return null;
+        }
+        try {
+            return (T) method.invoke(object);
+        } catch (Throwable e) {
+            return null;
+        }
+    }
+
+    private static final MethodHandles.Lookup PUBLIC_LOOKUP = MethodHandles.publicLookup();
+    private static final MethodType STRING_RETURN_TYPE = MethodType.methodType(String.class);
+    private static final MethodType LIST_RETURN_TYPE = MethodType.methodType(List.class);
+
+    private static MethodHandle findStringGetter(final Class<?> requestType, final String methodName) {
+        try {
+            return PUBLIC_LOOKUP.findVirtual(requestType, methodName, STRING_RETURN_TYPE);
+        } catch (Throwable e) {
+            return null;
+        }
+    }
+
+    private static MethodHandle findListGetter(final Class<?> requestType, final String methodName) {
+        try {
+            return PUBLIC_LOOKUP.findVirtual(requestType, methodName, LIST_RETURN_TYPE);
+        } catch (Throwable e) {
+            return null;
+        }
+    }
+
+    private static MethodHandle findGetter(
+            final Class<?> pojoType, final String methodName, final Class<?> returnType) {
+        try {
+            return PUBLIC_LOOKUP.findVirtual(pojoType, methodName, MethodType.methodType(returnType));
+        } catch (Throwable e) {
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/HandlerChainFactoryInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/HandlerChainFactoryInstrumentation.java
index 30abe11b161..47cace5489c 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/HandlerChainFactoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/HandlerChainFactoryInstrumentation.java
@@ -14,39 +14,37 @@
  * is tested. It could possibly be extended earlier.
  */
 public final class HandlerChainFactoryInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  private final String namespace;
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    private final String namespace;
 
-  public HandlerChainFactoryInstrumentation(String namespace) {
-    this.namespace = namespace;
-  }
+    public HandlerChainFactoryInstrumentation(String namespace) {
+        this.namespace = namespace;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return namespace + ".handlers.HandlerChainFactory";
-  }
+    @Override
+    public String instrumentedType() {
+        return namespace + ".handlers.HandlerChainFactory";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("newRequestHandler2Chain")),
-        HandlerChainFactoryInstrumentation.class.getName() + "$HandlerChainAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("newRequestHandler2Chain")),
+                HandlerChainFactoryInstrumentation.class.getName() + "$HandlerChainAdvice");
+    }
 
-  public static class HandlerChainAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void addHandler(@Advice.Return final List<RequestHandler2> handlers) {
-      for (final RequestHandler2 handler : handlers) {
-        if (handler instanceof TracingRequestHandler) {
-          return;
+    public static class HandlerChainAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void addHandler(@Advice.Return final List<RequestHandler2> handlers) {
+            for (final RequestHandler2 handler : handlers) {
+                if (handler instanceof TracingRequestHandler) {
+                    return;
+                }
+            }
+            handlers.add(new TracingRequestHandler(
+                    InstrumentationContext.get(
+                            "com.amazonaws.services.sqs.model.ReceiveMessageResult", "java.lang.String"),
+                    InstrumentationContext.get("com.amazonaws.AmazonWebServiceRequest", "datadog.context.Context")));
         }
-      }
-      handlers.add(
-          new TracingRequestHandler(
-              InstrumentationContext.get(
-                  "com.amazonaws.services.sqs.model.ReceiveMessageResult", "java.lang.String"),
-              InstrumentationContext.get(
-                  "com.amazonaws.AmazonWebServiceRequest", "datadog.context.Context")));
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/OnErrorDecorator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/OnErrorDecorator.java
index fb25eb82d07..b58128bfc1f 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/OnErrorDecorator.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/OnErrorDecorator.java
@@ -7,26 +7,25 @@
 
 public class OnErrorDecorator extends BaseDecorator {
 
-  public static final HandlerContextKey<Context> CONTEXT_CONTEXT_KEY =
-      new HandlerContextKey<>(
-          "DatadogContext"); // same as TracingRequestHandler.CONTEXT_CONTEXT_KEY
+    public static final HandlerContextKey<Context> CONTEXT_CONTEXT_KEY =
+            new HandlerContextKey<>("DatadogContext"); // same as TracingRequestHandler.CONTEXT_CONTEXT_KEY
 
-  public static final OnErrorDecorator DECORATE = new OnErrorDecorator();
+    public static final OnErrorDecorator DECORATE = new OnErrorDecorator();
 
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("java-aws-sdk");
+    private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("java-aws-sdk");
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"aws-sdk"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"aws-sdk"};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/RequestExecutorInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/RequestExecutorInstrumentation.java
index ab0344047d8..e371cf71582 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/RequestExecutorInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/RequestExecutorInstrumentation.java
@@ -18,52 +18,49 @@
  * Due to a change in the AmazonHttpClient class, this instrumentation is needed to support newer
  * versions. The {@link AWSHttpClientInstrumentation} class should cover older versions.
  */
-public final class RequestExecutorInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  private final String namespace;
+public final class RequestExecutorInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    private final String namespace;
 
-  public RequestExecutorInstrumentation(String namespace) {
-    this.namespace = namespace;
-  }
+    public RequestExecutorInstrumentation(String namespace) {
+        this.namespace = namespace;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return namespace + ".http.AmazonHttpClient$RequestExecutor";
-  }
+    @Override
+    public String instrumentedType() {
+        return namespace + ".http.AmazonHttpClient$RequestExecutor";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("doExecute")),
-        RequestExecutorInstrumentation.class.getName() + "$RequestExecutorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("doExecute")),
+                RequestExecutorInstrumentation.class.getName() + "$RequestExecutorAdvice");
+    }
 
-  public static class RequestExecutorAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.FieldValue("request") final Request<?> request,
-        @Advice.Thrown final Throwable throwable) {
+    public static class RequestExecutorAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.FieldValue("request") final Request<?> request, @Advice.Thrown final Throwable throwable) {
 
-      final AgentSpan activeSpan = activeSpan();
-      // check name in case TracingRequestHandler failed to activate the span
-      if (activeSpan != null
-          && (AwsNameCache.spanName(request).equals(activeSpan.getSpanName())
-              || !activeSpan.isValid())) {
-        closeActive();
-      }
+            final AgentSpan activeSpan = activeSpan();
+            // check name in case TracingRequestHandler failed to activate the span
+            if (activeSpan != null
+                    && (AwsNameCache.spanName(request).equals(activeSpan.getSpanName()) || !activeSpan.isValid())) {
+                closeActive();
+            }
 
-      if (throwable != null) {
-        final Context context = request.getHandlerContext(CONTEXT_CONTEXT_KEY);
-        if (context != null) {
-          request.addHandlerContext(CONTEXT_CONTEXT_KEY, null);
-          final AgentSpan span = spanFromContext(context);
-          if (span != null) {
-            DECORATE.onError(span, throwable);
-            DECORATE.beforeFinish(span);
-            span.finish();
-          }
+            if (throwable != null) {
+                final Context context = request.getHandlerContext(CONTEXT_CONTEXT_KEY);
+                if (context != null) {
+                    request.addHandlerContext(CONTEXT_CONTEXT_KEY, null);
+                    final AgentSpan span = spanFromContext(context);
+                    if (span != null) {
+                        DECORATE.onError(span, throwable);
+                        DECORATE.beforeFinish(span);
+                        span.finish();
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java
index 84e6f7ad142..81701faaadd 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java
@@ -35,148 +35,146 @@
 /** Tracing Request Handler */
 public class TracingRequestHandler extends RequestHandler2 {
 
-  public static final HandlerContextKey<Context> CONTEXT_CONTEXT_KEY =
-      new HandlerContextKey<>("DatadogContext"); // same as OnErrorDecorator.CONTEXT_CONTEXT_KEY
+    public static final HandlerContextKey<Context> CONTEXT_CONTEXT_KEY =
+            new HandlerContextKey<>("DatadogContext"); // same as OnErrorDecorator.CONTEXT_CONTEXT_KEY
 
-  private static final Logger log = LoggerFactory.getLogger(TracingRequestHandler.class);
+    private static final Logger log = LoggerFactory.getLogger(TracingRequestHandler.class);
 
-  private final ContextStore<Object, String> responseQueueStore;
-  private final ContextStore<AmazonWebServiceRequest, Context> requestContextStore;
+    private final ContextStore<Object, String> responseQueueStore;
+    private final ContextStore<AmazonWebServiceRequest, Context> requestContextStore;
 
-  public TracingRequestHandler(
-      ContextStore<Object, String> responseQueueStore,
-      ContextStore<AmazonWebServiceRequest, Context> requestContextStore) {
-    this.responseQueueStore = responseQueueStore;
-    this.requestContextStore = requestContextStore;
-  }
+    public TracingRequestHandler(
+            ContextStore<Object, String> responseQueueStore,
+            ContextStore<AmazonWebServiceRequest, Context> requestContextStore) {
+        this.responseQueueStore = responseQueueStore;
+        this.requestContextStore = requestContextStore;
+    }
 
-  @Override
-  public void beforeRequest(final Request<?> request) {
-    if (!AWS_LEGACY_TRACING && isPollingRequest(request.getOriginalRequest())) {
-      // SQS messages spans are created by aws-java-sqs-1.0 - replace client scope with no-op,
-      // so we can tell when receive call is complete without affecting the rest of the trace
-      activateSpanWithoutScope(blackholeSpan());
-    } else {
-      Context context = requestContextStore.remove(request.getOriginalRequest());
-      AgentSpan span = AgentSpan.fromContext(context);
-      if (span != null) {
-        // we'll land here for SQS send requests when DSM is enabled. In that case, we create the
-        // span in SqsInterceptor to inject DSM tags.
-        span.setOperationName(AwsNameCache.spanName(request));
-      } else {
-        // this is the most common code path
-        span = startSpan(COMPONENT_NAME.toString(), AwsNameCache.spanName(request));
-        context = span; // TODO If DSM is enabled, add DSM context here too
-      }
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, request);
-      request.addHandlerContext(CONTEXT_CONTEXT_KEY, context);
-      if (Config.get().isAwsPropagationEnabled()) {
-        try {
-          Propagators.forConcern(XRAY_TRACING_CONCERN).inject(span, request, DECORATE);
-        } catch (Throwable e) {
-          log.warn("Unable to inject trace header", e);
+    @Override
+    public void beforeRequest(final Request<?> request) {
+        if (!AWS_LEGACY_TRACING && isPollingRequest(request.getOriginalRequest())) {
+            // SQS messages spans are created by aws-java-sqs-1.0 - replace client scope with no-op,
+            // so we can tell when receive call is complete without affecting the rest of the trace
+            activateSpanWithoutScope(blackholeSpan());
+        } else {
+            Context context = requestContextStore.remove(request.getOriginalRequest());
+            AgentSpan span = AgentSpan.fromContext(context);
+            if (span != null) {
+                // we'll land here for SQS send requests when DSM is enabled. In that case, we create the
+                // span in SqsInterceptor to inject DSM tags.
+                span.setOperationName(AwsNameCache.spanName(request));
+            } else {
+                // this is the most common code path
+                span = startSpan(COMPONENT_NAME.toString(), AwsNameCache.spanName(request));
+                context = span; // TODO If DSM is enabled, add DSM context here too
+            }
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, request);
+            request.addHandlerContext(CONTEXT_CONTEXT_KEY, context);
+            if (Config.get().isAwsPropagationEnabled()) {
+                try {
+                    Propagators.forConcern(XRAY_TRACING_CONCERN).inject(span, request, DECORATE);
+                } catch (Throwable e) {
+                    log.warn("Unable to inject trace header", e);
+                }
+            }
+            // This scope will be closed by AwsHttpClientInstrumentation
+            if (AWS_LEGACY_TRACING) {
+                activateSpanWithoutScope(span);
+            } else {
+                activateSpanWithoutScope(blackholeSpan());
+            }
         }
-      }
-      // This scope will be closed by AwsHttpClientInstrumentation
-      if (AWS_LEGACY_TRACING) {
-        activateSpanWithoutScope(span);
-      } else {
-        activateSpanWithoutScope(blackholeSpan());
-      }
     }
-  }
 
-  @Override
-  public void afterResponse(final Request<?> request, final Response<?> response) {
-    final Context context = request.getHandlerContext(CONTEXT_CONTEXT_KEY);
-    AgentSpan span = null;
-    if (context != null) {
-      request.addHandlerContext(CONTEXT_CONTEXT_KEY, null);
-      span = AgentSpan.fromContext(context);
-      if (span != null) {
-        DECORATE.onResponse(span, response);
-        DECORATE.onServiceResponse(span, request.getServiceName(), response);
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
-    }
-    AmazonWebServiceRequest originalRequest = request.getOriginalRequest();
-    GetterAccess requestAccess = GetterAccess.of(originalRequest);
-    if (!AWS_LEGACY_TRACING && isPollingResponse(response.getAwsResponse())) {
-      try {
-        // store queueUrl inside response for SqsReceiveResultInstrumentation
-        responseQueueStore.put(
-            response.getAwsResponse(), requestAccess.getQueueUrl(originalRequest));
-      } catch (Throwable e) {
-        log.debug("Unable to extract queueUrl from ReceiveMessageRequest", e);
-      }
-    }
-    if (span != null
-        && traceConfig().isDataStreamsEnabled()
-        && "AmazonKinesis".equals(request.getServiceName())
-        && "GetRecords".equals(requestAccess.getOperationNameFromType())) {
-      String streamArn = requestAccess.getStreamARN(originalRequest);
-      dsmCheckpoint(span, streamArn, response);
+    @Override
+    public void afterResponse(final Request<?> request, final Response<?> response) {
+        final Context context = request.getHandlerContext(CONTEXT_CONTEXT_KEY);
+        AgentSpan span = null;
+        if (context != null) {
+            request.addHandlerContext(CONTEXT_CONTEXT_KEY, null);
+            span = AgentSpan.fromContext(context);
+            if (span != null) {
+                DECORATE.onResponse(span, response);
+                DECORATE.onServiceResponse(span, request.getServiceName(), response);
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
+        }
+        AmazonWebServiceRequest originalRequest = request.getOriginalRequest();
+        GetterAccess requestAccess = GetterAccess.of(originalRequest);
+        if (!AWS_LEGACY_TRACING && isPollingResponse(response.getAwsResponse())) {
+            try {
+                // store queueUrl inside response for SqsReceiveResultInstrumentation
+                responseQueueStore.put(response.getAwsResponse(), requestAccess.getQueueUrl(originalRequest));
+            } catch (Throwable e) {
+                log.debug("Unable to extract queueUrl from ReceiveMessageRequest", e);
+            }
+        }
+        if (span != null
+                && traceConfig().isDataStreamsEnabled()
+                && "AmazonKinesis".equals(request.getServiceName())
+                && "GetRecords".equals(requestAccess.getOperationNameFromType())) {
+            String streamArn = requestAccess.getStreamARN(originalRequest);
+            dsmCheckpoint(span, streamArn, response);
+        }
     }
-  }
 
-  private void dsmCheckpoint(AgentSpan span, String streamArn, Response<?> response) {
-    if (null != streamArn) {
-      List<?> records =
-          GetterAccess.of(response.getAwsResponse()).getRecords(response.getAwsResponse());
-      if (null != records) {
-        DataStreamsTags tags = create("kinesis", INBOUND, streamArn);
-        for (Object record : records) {
-          Date arrivalTime = GetterAccess.of(record).getApproximateArrivalTimestamp(record);
-          AgentDataStreamsMonitoring dataStreamsMonitoring =
-              AgentTracer.get().getDataStreamsMonitoring();
-          PathwayContext pathwayContext = dataStreamsMonitoring.newPathwayContext();
-          DataStreamsContext dataStreamsContext = create(tags, arrivalTime.getTime(), 0);
-          pathwayContext.setCheckpoint(dataStreamsContext, dataStreamsMonitoring::add);
-          if (!span.spanContext().getPathwayContext().isStarted()) {
-            span.spanContext().mergePathwayContext(pathwayContext);
-          }
+    private void dsmCheckpoint(AgentSpan span, String streamArn, Response<?> response) {
+        if (null != streamArn) {
+            List<?> records = GetterAccess.of(response.getAwsResponse()).getRecords(response.getAwsResponse());
+            if (null != records) {
+                DataStreamsTags tags = create("kinesis", INBOUND, streamArn);
+                for (Object record : records) {
+                    Date arrivalTime = GetterAccess.of(record).getApproximateArrivalTimestamp(record);
+                    AgentDataStreamsMonitoring dataStreamsMonitoring =
+                            AgentTracer.get().getDataStreamsMonitoring();
+                    PathwayContext pathwayContext = dataStreamsMonitoring.newPathwayContext();
+                    DataStreamsContext dataStreamsContext = create(tags, arrivalTime.getTime(), 0);
+                    pathwayContext.setCheckpoint(dataStreamsContext, dataStreamsMonitoring::add);
+                    if (!span.spanContext().getPathwayContext().isStarted()) {
+                        span.spanContext().mergePathwayContext(pathwayContext);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  @Override
-  public void afterError(final Request<?> request, final Response<?> response, final Exception e) {
-    Context context = request.getHandlerContext(CONTEXT_CONTEXT_KEY);
-    if (context == null) {
-      // also try getting the context from the context store, if the error happened early
-      context = requestContextStore.remove(request.getOriginalRequest());
-    }
+    @Override
+    public void afterError(final Request<?> request, final Response<?> response, final Exception e) {
+        Context context = request.getHandlerContext(CONTEXT_CONTEXT_KEY);
+        if (context == null) {
+            // also try getting the context from the context store, if the error happened early
+            context = requestContextStore.remove(request.getOriginalRequest());
+        }
 
-    if (context != null) {
-      request.addHandlerContext(CONTEXT_CONTEXT_KEY, null);
-      final AgentSpan span = AgentSpan.fromContext(context);
-      if (span != null) {
-        if (response != null) {
-          DECORATE.onResponse(span, response);
-          if (span.isError()) {
-            DECORATE.onError(span, e);
-          }
-        } else {
-          DECORATE.onError(span, e);
+        if (context != null) {
+            request.addHandlerContext(CONTEXT_CONTEXT_KEY, null);
+            final AgentSpan span = AgentSpan.fromContext(context);
+            if (span != null) {
+                if (response != null) {
+                    DECORATE.onResponse(span, response);
+                    if (span.isError()) {
+                        DECORATE.onError(span, e);
+                    }
+                } else {
+                    DECORATE.onError(span, e);
+                }
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
         }
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
     }
-  }
 
-  private static boolean isPollingRequest(AmazonWebServiceRequest request) {
-    return null != request
-        && "com.amazonaws.services.sqs.model.ReceiveMessageRequest"
-            .equals(request.getClass().getName());
-  }
+    private static boolean isPollingRequest(AmazonWebServiceRequest request) {
+        return null != request
+                && "com.amazonaws.services.sqs.model.ReceiveMessageRequest"
+                        .equals(request.getClass().getName());
+    }
 
-  private static boolean isPollingResponse(Object response) {
-    return null != response
-        && "com.amazonaws.services.sqs.model.ReceiveMessageResult"
-            .equals(response.getClass().getName());
-  }
+    private static boolean isPollingResponse(Object response) {
+        return null != response
+                && "com.amazonaws.services.sqs.model.ReceiveMessageResult"
+                        .equals(response.getClass().getName());
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsClientInstrumentation.java
index 440295067ae..c88f94e4e73 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsClientInstrumentation.java
@@ -10,34 +10,30 @@
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 
 /** AWS SDK v2 instrumentation */
-public final class AwsClientInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class AwsClientInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder";
-  }
+    @Override
+    public String instrumentedType() {
+        return "software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("resolveExecutionInterceptors")),
-        AwsClientInstrumentation.class.getName() + "$AwsBuilderAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("resolveExecutionInterceptors")),
+                AwsClientInstrumentation.class.getName() + "$AwsBuilderAdvice");
+    }
 
-  public static class AwsBuilderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void methodExit(@Advice.Return final List<ExecutionInterceptor> interceptors) {
-      for (ExecutionInterceptor interceptor : interceptors) {
-        if (interceptor instanceof TracingExecutionInterceptor) {
-          return; // list already has our interceptor, return to builder
+    public static class AwsBuilderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void methodExit(@Advice.Return final List<ExecutionInterceptor> interceptors) {
+            for (ExecutionInterceptor interceptor : interceptors) {
+                if (interceptor instanceof TracingExecutionInterceptor) {
+                    return; // list already has our interceptor, return to builder
+                }
+            }
+            interceptors.add(new TracingExecutionInterceptor(InstrumentationContext.get(
+                    "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse", "java.lang.String")));
         }
-      }
-      interceptors.add(
-          new TracingExecutionInterceptor(
-              InstrumentationContext.get(
-                  "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse",
-                  "java.lang.String")));
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java
index 7d8df3683cb..bb8e1ff4bba 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java
@@ -25,81 +25,77 @@
  * Separate instrumentation class to close aws request scope right after request has been submitted
  * for execution for Sync clients.
  */
-public final class AwsHttpClientInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+public final class AwsHttpClientInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "software.amazon.awssdk.core.internal.http.pipeline.stages.MakeHttpRequestStage";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "software.amazon.awssdk.core.internal.http.pipeline.stages.MakeHttpRequestStage";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return nameStartsWith("software.amazon.awssdk.")
-        .and(
-            extendsClass(
-                namedOneOf(
-                    "software.amazon.awssdk.core.internal.http.pipeline.stages.MakeHttpRequestStage",
-                    "software.amazon.awssdk.core.internal.http.pipeline.stages.MakeAsyncHttpRequestStage")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return nameStartsWith("software.amazon.awssdk.")
+                .and(extendsClass(namedOneOf(
+                        "software.amazon.awssdk.core.internal.http.pipeline.stages.MakeHttpRequestStage",
+                        "software.amazon.awssdk.core.internal.http.pipeline.stages.MakeAsyncHttpRequestStage")));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("execute"))
-            .and(
-                takesArgument(
-                    1, named("software.amazon.awssdk.core.internal.http.RequestExecutionContext"))),
-        AwsHttpClientInstrumentation.class.getName() + "$AwsHttpClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("execute"))
+                        .and(takesArgument(
+                                1, named("software.amazon.awssdk.core.internal.http.RequestExecutionContext"))),
+                AwsHttpClientInstrumentation.class.getName() + "$AwsHttpClientAdvice");
+    }
 
-  public static class AwsHttpClientAdvice {
-    // scope.close here doesn't actually finish the span.
+    public static class AwsHttpClientAdvice {
+        // scope.close here doesn't actually finish the span.
 
-    /**
-     * FIXME: This is a hack to prevent netty instrumentation from messing things up.
-     *
-     * <p>Currently netty instrumentation cannot handle way AWS SDK makes http requests. If AWS SDK
-     * make a netty call with active scope then continuation will be created that would never be
-     * closed preventing whole trace from reporting. This happens because netty switches channels
-     * between connection and request stages and netty instrumentation cannot find continuation
-     * stored in channel attributes.
-     */
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static AutoCloseable methodEnter(
-        @Advice.This final Object thiz,
-        @Advice.Argument(1) final RequestExecutionContext requestExecutionContext) {
-      final AgentSpan activeSpan = activeSpan();
-      // check name in case TracingExecutionInterceptor failed to activate the span
-      if (activeSpan != null
-          && ((!activeSpan.isValid())
-              || AwsSdkClientDecorator.DECORATE
-                  .spanName(requestExecutionContext.executionAttributes())
-                  .equals(activeSpan.getSpanName()))) {
-        if (thiz instanceof MakeAsyncHttpRequestStage) {
-          // close async legacy HTTP span to avoid Netty leak...
-          closeActive(); // then drop-through and activate no-op span
-        } else {
-          // keep sync legacy HTTP span alive for duration of call
-          return AgentTracer::closeActive;
+        /**
+         * FIXME: This is a hack to prevent netty instrumentation from messing things up.
+         *
+         * <p>Currently netty instrumentation cannot handle way AWS SDK makes http requests. If AWS SDK
+         * make a netty call with active scope then continuation will be created that would never be
+         * closed preventing whole trace from reporting. This happens because netty switches channels
+         * between connection and request stages and netty instrumentation cannot find continuation
+         * stored in channel attributes.
+         */
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static AutoCloseable methodEnter(
+                @Advice.This final Object thiz,
+                @Advice.Argument(1) final RequestExecutionContext requestExecutionContext) {
+            final AgentSpan activeSpan = activeSpan();
+            // check name in case TracingExecutionInterceptor failed to activate the span
+            if (activeSpan != null
+                    && ((!activeSpan.isValid())
+                            || AwsSdkClientDecorator.DECORATE
+                                    .spanName(requestExecutionContext.executionAttributes())
+                                    .equals(activeSpan.getSpanName()))) {
+                if (thiz instanceof MakeAsyncHttpRequestStage) {
+                    // close async legacy HTTP span to avoid Netty leak...
+                    closeActive(); // then drop-through and activate no-op span
+                } else {
+                    // keep sync legacy HTTP span alive for duration of call
+                    return AgentTracer::closeActive;
+                }
+            }
+            return activateSpan(noopSpan());
         }
-      }
-      return activateSpan(noopSpan());
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(@Advice.Enter final AutoCloseable scope) throws Exception {
-      scope.close();
-    }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(@Advice.Enter final AutoCloseable scope) throws Exception {
+            scope.close();
+        }
 
-    /**
-     * This is to make muzzle think we need TracingExecutionInterceptor to make sure we do not apply
-     * this instrumentation when TracingExecutionInterceptor would not work.
-     */
-    public static void muzzleCheck() {
-      TracingExecutionInterceptor.muzzleCheck();
+        /**
+         * This is to make muzzle think we need TracingExecutionInterceptor to make sure we do not apply
+         * this instrumentation when TracingExecutionInterceptor would not work.
+         */
+        public static void muzzleCheck() {
+            TracingExecutionInterceptor.muzzleCheck();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java
index 7c1a1a85b90..944610d075d 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java
@@ -54,440 +54,408 @@
 import software.amazon.awssdk.http.SdkHttpResponse;
 
 public class AwsSdkClientDecorator extends HttpClientDecorator<SdkHttpRequest, SdkHttpResponse>
-    implements CarrierSetter<SdkHttpRequest.Builder> {
-  public static final AwsSdkClientDecorator DECORATE = new AwsSdkClientDecorator();
-  private static final DDCache<String, CharSequence> CACHE =
-      DDCaches.newFixedSizeCache(128); // cloud services can have high cardinality
-
-  static final CharSequence COMPONENT_NAME = UTF8BytesString.create("java-aws-sdk");
-
-  // We only want tag interceptor to take priority
-  private static final byte RESOURCE_NAME_PRIORITY = ResourceNamePriorities.TAG_INTERCEPTOR - 1;
-
-  public static final boolean AWS_LEGACY_TRACING = Config.get().isAwsLegacyTracingEnabled();
-
-  public static final boolean SQS_LEGACY_TRACING = Config.get().isSqsLegacyTracingEnabled();
-
-  private static final String SQS_SERVICE_NAME =
-      AWS_LEGACY_TRACING || SQS_LEGACY_TRACING ? "sqs" : Config.get().getServiceName();
-
-  private static final String SNS_SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cloud().serviceForRequest("aws", "sns");
-  private static final String GENERIC_SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cloud().serviceForRequest("aws", null);
-
-  private static final Set<String> KINESIS_PUT_RECORD_OPERATION_NAMES;
-
-  static {
-    KINESIS_PUT_RECORD_OPERATION_NAMES = new HashSet<>();
-    KINESIS_PUT_RECORD_OPERATION_NAMES.add("PutRecord");
-    KINESIS_PUT_RECORD_OPERATION_NAMES.add("PutRecords");
-  }
-
-  private static final Set<String> SNS_PUBLISH_OPERATION_NAMES;
-
-  static {
-    SNS_PUBLISH_OPERATION_NAMES = new HashSet<>();
-    SNS_PUBLISH_OPERATION_NAMES.add("Publish");
-    SNS_PUBLISH_OPERATION_NAMES.add("PublishBatch");
-  }
-
-  public static final ExecutionAttribute<String> KINESIS_STREAM_ARN_ATTRIBUTE =
-      InstanceStore.of(ExecutionAttribute.class)
-          .getOrCreate("KinesisStreamArn", () -> new ExecutionAttribute<>("KinesisStreamArn"));
-
-  // not static because this object would be ClassLoader specific if multiple SDK instances were
-  // loaded by different loaders
-  private SdkField<Instant> kinesisApproximateArrivalTimestampField = null;
-
-  public CharSequence spanName(final ExecutionAttributes attributes) {
-    final String awsServiceName = attributes.getAttribute(SdkExecutionAttribute.SERVICE_NAME);
-    final String awsOperationName = attributes.getAttribute(SdkExecutionAttribute.OPERATION_NAME);
-
-    final String qualifiedName = awsServiceName + "." + awsOperationName;
-
-    return CACHE.computeIfAbsent(
-        qualifiedName,
-        s ->
-            SpanNaming.instance()
-                .namingSchema()
-                .cloud()
-                .operationForRequest(
-                    "aws", attributes.getAttribute(SdkExecutionAttribute.SERVICE_NAME), s));
-  }
-
-  public void onSdkRequest(
-      final Context context,
-      final SdkRequest request,
-      final SdkHttpRequest httpRequest,
-      final ExecutionAttributes attributes) {
-    final AgentSpan span = fromContext(context);
-    final String awsServiceName = attributes.getAttribute(SdkExecutionAttribute.SERVICE_NAME);
-    final String awsOperationName = attributes.getAttribute(SdkExecutionAttribute.OPERATION_NAME);
-    onOperation(span, awsServiceName, awsOperationName);
-
-    Config config = Config.get();
-    if (config.isCloudRequestPayloadTaggingEnabled()
-        && config.isCloudPayloadTaggingEnabledFor(awsServiceName)) {
-      awsPojoToTags(span, ConfigDefaults.DEFAULT_TRACE_CLOUD_PAYLOAD_REQUEST_TAG, request);
+        implements CarrierSetter<SdkHttpRequest.Builder> {
+    public static final AwsSdkClientDecorator DECORATE = new AwsSdkClientDecorator();
+    private static final DDCache<String, CharSequence> CACHE =
+            DDCaches.newFixedSizeCache(128); // cloud services can have high cardinality
+
+    static final CharSequence COMPONENT_NAME = UTF8BytesString.create("java-aws-sdk");
+
+    // We only want tag interceptor to take priority
+    private static final byte RESOURCE_NAME_PRIORITY = ResourceNamePriorities.TAG_INTERCEPTOR - 1;
+
+    public static final boolean AWS_LEGACY_TRACING = Config.get().isAwsLegacyTracingEnabled();
+
+    public static final boolean SQS_LEGACY_TRACING = Config.get().isSqsLegacyTracingEnabled();
+
+    private static final String SQS_SERVICE_NAME =
+            AWS_LEGACY_TRACING || SQS_LEGACY_TRACING ? "sqs" : Config.get().getServiceName();
+
+    private static final String SNS_SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cloud().serviceForRequest("aws", "sns");
+    private static final String GENERIC_SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cloud().serviceForRequest("aws", null);
+
+    private static final Set<String> KINESIS_PUT_RECORD_OPERATION_NAMES;
+
+    static {
+        KINESIS_PUT_RECORD_OPERATION_NAMES = new HashSet<>();
+        KINESIS_PUT_RECORD_OPERATION_NAMES.add("PutRecord");
+        KINESIS_PUT_RECORD_OPERATION_NAMES.add("PutRecords");
     }
 
-    // S3
-    request.getValueForField("Bucket", String.class).ifPresent(name -> setBucketName(span, name));
-    if ("s3".equalsIgnoreCase(awsServiceName)) {
-      // gate "Key" extraction to S3 — DynamoDB's Key is Map<String, AttributeValue>, would CCE
-      request.getValueForField("Key", String.class).ifPresent(key -> setObjectKey(span, key));
-      if (traceConfig().isDataStreamsEnabled()) {
-        span.setTag(Tags.HTTP_REQUEST_CONTENT_LENGTH, getRequestContentLength(httpRequest));
-      }
+    private static final Set<String> SNS_PUBLISH_OPERATION_NAMES;
+
+    static {
+        SNS_PUBLISH_OPERATION_NAMES = new HashSet<>();
+        SNS_PUBLISH_OPERATION_NAMES.add("Publish");
+        SNS_PUBLISH_OPERATION_NAMES.add("PublishBatch");
     }
 
-    request
-        .getValueForField("StorageClass", String.class)
-        .ifPresent(
-            storageClass -> span.setTag(InstrumentationTags.AWS_STORAGE_CLASS, storageClass));
-
-    // SQS
-    request
-        .getValueForField("QueueUrl", String.class)
-        .ifPresent(
-            url -> {
-              span.setTag(InstrumentationTags.AWS_QUEUE_URL, url);
-              setPeerService(span, InstrumentationTags.AWS_QUEUE_URL, url);
-              String queueName = urlFileName(url);
-              if (!queueName.isEmpty()) {
-                setQueueName(span, queueName);
-              }
-            });
-    request.getValueForField("QueueName", String.class).ifPresent(name -> setQueueName(span, name));
-
-    // SNS
-    Optional<String> snsTopicArn = request.getValueForField("TopicArn", String.class);
-    if (!snsTopicArn.isPresent()) {
-      snsTopicArn = request.getValueForField("TargetArn", String.class);
+    public static final ExecutionAttribute<String> KINESIS_STREAM_ARN_ATTRIBUTE = InstanceStore.of(
+                    ExecutionAttribute.class)
+            .getOrCreate("KinesisStreamArn", () -> new ExecutionAttribute<>("KinesisStreamArn"));
+
+    // not static because this object would be ClassLoader specific if multiple SDK instances were
+    // loaded by different loaders
+    private SdkField<Instant> kinesisApproximateArrivalTimestampField = null;
+
+    public CharSequence spanName(final ExecutionAttributes attributes) {
+        final String awsServiceName = attributes.getAttribute(SdkExecutionAttribute.SERVICE_NAME);
+        final String awsOperationName = attributes.getAttribute(SdkExecutionAttribute.OPERATION_NAME);
+
+        final String qualifiedName = awsServiceName + "." + awsOperationName;
+
+        return CACHE.computeIfAbsent(
+                qualifiedName,
+                s -> SpanNaming.instance()
+                        .namingSchema()
+                        .cloud()
+                        .operationForRequest("aws", attributes.getAttribute(SdkExecutionAttribute.SERVICE_NAME), s));
     }
-    Optional<String> snsTopicName = snsTopicArn.map(arn -> arn.substring(arn.lastIndexOf(':') + 1));
-    snsTopicName.ifPresent(topic -> setTopicName(span, topic));
-
-    // Kinesis
-    request
-        .getValueForField("StreamName", String.class)
-        .ifPresent(name -> setStreamName(span, name));
-    Optional<String> kinesisStreamArn = request.getValueForField("StreamARN", String.class);
-    kinesisStreamArn.ifPresent(
-        streamArn -> {
-          if (traceConfig().isDataStreamsEnabled()) {
-            attributes.putAttribute(KINESIS_STREAM_ARN_ATTRIBUTE, streamArn);
-          }
-          int streamNameStart = streamArn.indexOf(":stream/");
-          if (streamNameStart >= 0) {
-            setStreamName(span, streamArn.substring(streamNameStart + 8));
-          }
+
+    public void onSdkRequest(
+            final Context context,
+            final SdkRequest request,
+            final SdkHttpRequest httpRequest,
+            final ExecutionAttributes attributes) {
+        final AgentSpan span = fromContext(context);
+        final String awsServiceName = attributes.getAttribute(SdkExecutionAttribute.SERVICE_NAME);
+        final String awsOperationName = attributes.getAttribute(SdkExecutionAttribute.OPERATION_NAME);
+        onOperation(span, awsServiceName, awsOperationName);
+
+        Config config = Config.get();
+        if (config.isCloudRequestPayloadTaggingEnabled() && config.isCloudPayloadTaggingEnabledFor(awsServiceName)) {
+            awsPojoToTags(span, ConfigDefaults.DEFAULT_TRACE_CLOUD_PAYLOAD_REQUEST_TAG, request);
+        }
+
+        // S3
+        request.getValueForField("Bucket", String.class).ifPresent(name -> setBucketName(span, name));
+        if ("s3".equalsIgnoreCase(awsServiceName)) {
+            // gate "Key" extraction to S3 — DynamoDB's Key is Map<String, AttributeValue>, would CCE
+            request.getValueForField("Key", String.class).ifPresent(key -> setObjectKey(span, key));
+            if (traceConfig().isDataStreamsEnabled()) {
+                span.setTag(Tags.HTTP_REQUEST_CONTENT_LENGTH, getRequestContentLength(httpRequest));
+            }
+        }
+
+        request.getValueForField("StorageClass", String.class)
+                .ifPresent(storageClass -> span.setTag(InstrumentationTags.AWS_STORAGE_CLASS, storageClass));
+
+        // SQS
+        request.getValueForField("QueueUrl", String.class).ifPresent(url -> {
+            span.setTag(InstrumentationTags.AWS_QUEUE_URL, url);
+            setPeerService(span, InstrumentationTags.AWS_QUEUE_URL, url);
+            String queueName = urlFileName(url);
+            if (!queueName.isEmpty()) {
+                setQueueName(span, queueName);
+            }
         });
+        request.getValueForField("QueueName", String.class).ifPresent(name -> setQueueName(span, name));
 
-    // DynamoDB
-    request.getValueForField("TableName", String.class).ifPresent(name -> setTableName(span, name));
-
-    // DSM
-    if (traceConfig().isDataStreamsEnabled()) {
-      if (kinesisStreamArn.isPresent()
-          && "kinesis".equalsIgnoreCase(awsServiceName)
-          && KINESIS_PUT_RECORD_OPERATION_NAMES.contains(awsOperationName)) {
-        // https://github.com/DataDog/dd-trace-py/blob/864abb6c99e1cb0449904260bac93e8232261f2a/ddtrace/contrib/botocore/patch.py#L368
-        List records =
-            request
-                .getValueForField("Records", List.class)
-                .orElse(Collections.singletonList(request)); // For PutRecord use request
-
-        for (Object ignored : records) {
-          AgentTracer.get()
-              .getDataStreamsMonitoring()
-              .setProduceCheckpoint("kinesis", kinesisStreamArn.get());
+        // SNS
+        Optional<String> snsTopicArn = request.getValueForField("TopicArn", String.class);
+        if (!snsTopicArn.isPresent()) {
+            snsTopicArn = request.getValueForField("TargetArn", String.class);
         }
-      } else if (snsTopicName.isPresent()
-          && "sns".equalsIgnoreCase(awsServiceName)
-          && SNS_PUBLISH_OPERATION_NAMES.contains(awsOperationName)) {
-        List entries =
-            request
-                .getValueForField("PublishBatchRequestEntries", List.class)
-                .orElse(Collections.singletonList(request));
-
-        for (Object ignored : entries) {
-          AgentTracer.get()
-              .getDataStreamsMonitoring()
-              .setProduceCheckpoint("sns", snsTopicName.get());
+        Optional<String> snsTopicName = snsTopicArn.map(arn -> arn.substring(arn.lastIndexOf(':') + 1));
+        snsTopicName.ifPresent(topic -> setTopicName(span, topic));
+
+        // Kinesis
+        request.getValueForField("StreamName", String.class).ifPresent(name -> setStreamName(span, name));
+        Optional<String> kinesisStreamArn = request.getValueForField("StreamARN", String.class);
+        kinesisStreamArn.ifPresent(streamArn -> {
+            if (traceConfig().isDataStreamsEnabled()) {
+                attributes.putAttribute(KINESIS_STREAM_ARN_ATTRIBUTE, streamArn);
+            }
+            int streamNameStart = streamArn.indexOf(":stream/");
+            if (streamNameStart >= 0) {
+                setStreamName(span, streamArn.substring(streamNameStart + 8));
+            }
+        });
+
+        // DynamoDB
+        request.getValueForField("TableName", String.class).ifPresent(name -> setTableName(span, name));
+
+        // DSM
+        if (traceConfig().isDataStreamsEnabled()) {
+            if (kinesisStreamArn.isPresent()
+                    && "kinesis".equalsIgnoreCase(awsServiceName)
+                    && KINESIS_PUT_RECORD_OPERATION_NAMES.contains(awsOperationName)) {
+                // https://github.com/DataDog/dd-trace-py/blob/864abb6c99e1cb0449904260bac93e8232261f2a/ddtrace/contrib/botocore/patch.py#L368
+                List records = request.getValueForField("Records", List.class)
+                        .orElse(Collections.singletonList(request)); // For PutRecord use request
+
+                for (Object ignored : records) {
+                    AgentTracer.get()
+                            .getDataStreamsMonitoring()
+                            .setProduceCheckpoint("kinesis", kinesisStreamArn.get());
+                }
+            } else if (snsTopicName.isPresent()
+                    && "sns".equalsIgnoreCase(awsServiceName)
+                    && SNS_PUBLISH_OPERATION_NAMES.contains(awsOperationName)) {
+                List entries = request.getValueForField("PublishBatchRequestEntries", List.class)
+                        .orElse(Collections.singletonList(request));
+
+                for (Object ignored : entries) {
+                    AgentTracer.get().getDataStreamsMonitoring().setProduceCheckpoint("sns", snsTopicName.get());
+                }
+            }
         }
-      }
-    }
 
-    // Set peer.service based on Config for serverless functions
-    if (Config.get().isAwsServerless()) {
-      URI uri = httpRequest.getUri();
-      String hostname = uri.getHost();
-      if (uri.getPort() != -1) {
-        hostname = hostname + ":" + uri.getPort();
-      }
+        // Set peer.service based on Config for serverless functions
+        if (Config.get().isAwsServerless()) {
+            URI uri = httpRequest.getUri();
+            String hostname = uri.getHost();
+            if (uri.getPort() != -1) {
+                hostname = hostname + ":" + uri.getPort();
+            }
 
-      span.setTag(Tags.PEER_SERVICE, hostname);
-      span.setTag(DDTags.PEER_SERVICE_SOURCE, "peer.service");
-    }
-  }
-
-  private static void onOperation(
-      final AgentSpan span, final String awsServiceName, final String awsOperationName) {
-    String awsRequestName = awsServiceName + "." + awsOperationName;
-    span.setResourceName(awsRequestName, RESOURCE_NAME_PRIORITY);
-
-    switch (awsRequestName) {
-      case "Sqs.SendMessage":
-      case "Sqs.SendMessageBatch":
-      case "Sqs.ReceiveMessage":
-      case "Sqs.DeleteMessage":
-      case "Sqs.DeleteMessageBatch":
-        if (SQS_SERVICE_NAME != null) {
-          span.setServiceName(SQS_SERVICE_NAME, COMPONENT_NAME);
+            span.setTag(Tags.PEER_SERVICE, hostname);
+            span.setTag(DDTags.PEER_SERVICE_SOURCE, "peer.service");
         }
-        break;
-      case "Sns.PublishBatch":
-      case "Sns.Publish":
-        if (SNS_SERVICE_NAME != null) {
-          span.setServiceName(SNS_SERVICE_NAME, COMPONENT_NAME);
+    }
+
+    private static void onOperation(final AgentSpan span, final String awsServiceName, final String awsOperationName) {
+        String awsRequestName = awsServiceName + "." + awsOperationName;
+        span.setResourceName(awsRequestName, RESOURCE_NAME_PRIORITY);
+
+        switch (awsRequestName) {
+            case "Sqs.SendMessage":
+            case "Sqs.SendMessageBatch":
+            case "Sqs.ReceiveMessage":
+            case "Sqs.DeleteMessage":
+            case "Sqs.DeleteMessageBatch":
+                if (SQS_SERVICE_NAME != null) {
+                    span.setServiceName(SQS_SERVICE_NAME, COMPONENT_NAME);
+                }
+                break;
+            case "Sns.PublishBatch":
+            case "Sns.Publish":
+                if (SNS_SERVICE_NAME != null) {
+                    span.setServiceName(SNS_SERVICE_NAME, COMPONENT_NAME);
+                }
+                break;
+            default:
+                if (GENERIC_SERVICE_NAME != null) {
+                    span.setServiceName(GENERIC_SERVICE_NAME, COMPONENT_NAME);
+                }
+                break;
         }
-        break;
-      default:
-        if (GENERIC_SERVICE_NAME != null) {
-          span.setServiceName(GENERIC_SERVICE_NAME, COMPONENT_NAME);
+        span.setTag(InstrumentationTags.AWS_AGENT, COMPONENT_NAME);
+        span.setTag(InstrumentationTags.AWS_SERVICE, awsServiceName);
+        span.setTag(InstrumentationTags.TOP_LEVEL_AWS_SERVICE, awsServiceName);
+        span.setTag(InstrumentationTags.AWS_OPERATION, awsOperationName);
+    }
+
+    private static void setPeerService(
+            @Nonnull final AgentSpan span, @Nonnull final String precursor, @Nonnull final String value) {
+        if (SpanNaming.instance().namingSchema().peerService().supports()) {
+            span.setTag(Tags.PEER_SERVICE, value);
+            span.setTag(DDTags.PEER_SERVICE_SOURCE, precursor);
         }
-        break;
     }
-    span.setTag(InstrumentationTags.AWS_AGENT, COMPONENT_NAME);
-    span.setTag(InstrumentationTags.AWS_SERVICE, awsServiceName);
-    span.setTag(InstrumentationTags.TOP_LEVEL_AWS_SERVICE, awsServiceName);
-    span.setTag(InstrumentationTags.AWS_OPERATION, awsOperationName);
-  }
-
-  private static void setPeerService(
-      @Nonnull final AgentSpan span, @Nonnull final String precursor, @Nonnull final String value) {
-    if (SpanNaming.instance().namingSchema().peerService().supports()) {
-      span.setTag(Tags.PEER_SERVICE, value);
-      span.setTag(DDTags.PEER_SERVICE_SOURCE, precursor);
+
+    private static void setBucketName(AgentSpan span, String name) {
+        span.setTag(InstrumentationTags.AWS_BUCKET_NAME, name);
+        span.setTag(InstrumentationTags.BUCKET_NAME, name);
+        setPeerService(span, InstrumentationTags.AWS_BUCKET_NAME, name);
     }
-  }
-
-  private static void setBucketName(AgentSpan span, String name) {
-    span.setTag(InstrumentationTags.AWS_BUCKET_NAME, name);
-    span.setTag(InstrumentationTags.BUCKET_NAME, name);
-    setPeerService(span, InstrumentationTags.AWS_BUCKET_NAME, name);
-  }
-
-  private static void setObjectKey(AgentSpan span, String key) {
-    span.setTag(InstrumentationTags.AWS_OBJECT_KEY, key);
-  }
-
-  private static void setQueueName(AgentSpan span, String name) {
-    span.setTag(InstrumentationTags.AWS_QUEUE_NAME, name);
-    span.setTag(InstrumentationTags.QUEUE_NAME, name);
-    setPeerService(span, InstrumentationTags.AWS_QUEUE_NAME, name);
-  }
-
-  private static void setTopicName(AgentSpan span, String name) {
-    span.setTag(InstrumentationTags.AWS_TOPIC_NAME, name);
-    span.setTag(InstrumentationTags.TOPIC_NAME, name);
-    setPeerService(span, InstrumentationTags.AWS_TOPIC_NAME, name);
-  }
-
-  private static void setStreamName(AgentSpan span, String name) {
-    span.setTag(InstrumentationTags.AWS_STREAM_NAME, name);
-    span.setTag(InstrumentationTags.STREAM_NAME, name);
-    setPeerService(span, InstrumentationTags.AWS_STREAM_NAME, name);
-  }
-
-  private static void setTableName(AgentSpan span, String name) {
-    span.setTag(InstrumentationTags.AWS_TABLE_NAME, name);
-    span.setTag(InstrumentationTags.TABLE_NAME, name);
-    setPeerService(span, InstrumentationTags.AWS_TABLE_NAME, name);
-  }
-
-  public void onSdkResponse(
-      final Context context,
-      final SdkResponse response,
-      final SdkHttpResponse httpResponse,
-      final ExecutionAttributes attributes) {
-
-    final AgentSpan span = fromContext(context);
-    Config config = Config.get();
-    String serviceName = attributes.getAttribute(SdkExecutionAttribute.SERVICE_NAME);
-    if (config.isCloudResponsePayloadTaggingEnabled()
-        && config.isCloudPayloadTaggingEnabledFor(serviceName)) {
-      awsPojoToTags(span, ConfigDefaults.DEFAULT_TRACE_CLOUD_PAYLOAD_RESPONSE_TAG, response);
+
+    private static void setObjectKey(AgentSpan span, String key) {
+        span.setTag(InstrumentationTags.AWS_OBJECT_KEY, key);
     }
 
-    if (response instanceof AwsResponse) {
-      span.setTag(
-          InstrumentationTags.AWS_REQUEST_ID,
-          ((AwsResponse) response).responseMetadata().requestId());
-
-      final String awsServiceName = attributes.getAttribute(SdkExecutionAttribute.SERVICE_NAME);
-      final String awsOperationName = attributes.getAttribute(SdkExecutionAttribute.OPERATION_NAME);
-      if (traceConfig().isDataStreamsEnabled()
-          && "kinesis".equalsIgnoreCase(awsServiceName)
-          && "GetRecords".equals(awsOperationName)) {
-        // https://github.com/DataDog/dd-trace-py/blob/864abb6c99e1cb0449904260bac93e8232261f2a/ddtrace/contrib/botocore/patch.py#L350
-        String streamArn = attributes.getAttribute(KINESIS_STREAM_ARN_ATTRIBUTE);
-        if (null != streamArn) {
-          response
-              .getValueForField("Records", List.class)
-              .ifPresent(
-                  recordsRaw -> {
-                    //noinspection unchecked
-                    List<SdkPojo> records = (List<SdkPojo>) recordsRaw;
-                    if (!records.isEmpty()) {
-                      DataStreamsTags tags = create("kinesis", INBOUND, streamArn);
-                      if (null == kinesisApproximateArrivalTimestampField) {
-                        Optional<SdkField<?>> maybeField =
-                            records.get(0).sdkFields().stream()
-                                .filter(f -> f.locationName().equals("ApproximateArrivalTimestamp"))
-                                .findFirst();
-                        if (maybeField.isPresent()) {
-                          //noinspection unchecked
-                          kinesisApproximateArrivalTimestampField =
-                              (SdkField<Instant>) maybeField.get();
-                        } else {
-                          // shouldn't be possible
-                          return;
+    private static void setQueueName(AgentSpan span, String name) {
+        span.setTag(InstrumentationTags.AWS_QUEUE_NAME, name);
+        span.setTag(InstrumentationTags.QUEUE_NAME, name);
+        setPeerService(span, InstrumentationTags.AWS_QUEUE_NAME, name);
+    }
+
+    private static void setTopicName(AgentSpan span, String name) {
+        span.setTag(InstrumentationTags.AWS_TOPIC_NAME, name);
+        span.setTag(InstrumentationTags.TOPIC_NAME, name);
+        setPeerService(span, InstrumentationTags.AWS_TOPIC_NAME, name);
+    }
+
+    private static void setStreamName(AgentSpan span, String name) {
+        span.setTag(InstrumentationTags.AWS_STREAM_NAME, name);
+        span.setTag(InstrumentationTags.STREAM_NAME, name);
+        setPeerService(span, InstrumentationTags.AWS_STREAM_NAME, name);
+    }
+
+    private static void setTableName(AgentSpan span, String name) {
+        span.setTag(InstrumentationTags.AWS_TABLE_NAME, name);
+        span.setTag(InstrumentationTags.TABLE_NAME, name);
+        setPeerService(span, InstrumentationTags.AWS_TABLE_NAME, name);
+    }
+
+    public void onSdkResponse(
+            final Context context,
+            final SdkResponse response,
+            final SdkHttpResponse httpResponse,
+            final ExecutionAttributes attributes) {
+
+        final AgentSpan span = fromContext(context);
+        Config config = Config.get();
+        String serviceName = attributes.getAttribute(SdkExecutionAttribute.SERVICE_NAME);
+        if (config.isCloudResponsePayloadTaggingEnabled() && config.isCloudPayloadTaggingEnabledFor(serviceName)) {
+            awsPojoToTags(span, ConfigDefaults.DEFAULT_TRACE_CLOUD_PAYLOAD_RESPONSE_TAG, response);
+        }
+
+        if (response instanceof AwsResponse) {
+            span.setTag(
+                    InstrumentationTags.AWS_REQUEST_ID,
+                    ((AwsResponse) response).responseMetadata().requestId());
+
+            final String awsServiceName = attributes.getAttribute(SdkExecutionAttribute.SERVICE_NAME);
+            final String awsOperationName = attributes.getAttribute(SdkExecutionAttribute.OPERATION_NAME);
+            if (traceConfig().isDataStreamsEnabled()
+                    && "kinesis".equalsIgnoreCase(awsServiceName)
+                    && "GetRecords".equals(awsOperationName)) {
+                // https://github.com/DataDog/dd-trace-py/blob/864abb6c99e1cb0449904260bac93e8232261f2a/ddtrace/contrib/botocore/patch.py#L350
+                String streamArn = attributes.getAttribute(KINESIS_STREAM_ARN_ATTRIBUTE);
+                if (null != streamArn) {
+                    response.getValueForField("Records", List.class).ifPresent(recordsRaw -> {
+                        //noinspection unchecked
+                        List<SdkPojo> records = (List<SdkPojo>) recordsRaw;
+                        if (!records.isEmpty()) {
+                            DataStreamsTags tags = create("kinesis", INBOUND, streamArn);
+                            if (null == kinesisApproximateArrivalTimestampField) {
+                                Optional<SdkField<?>> maybeField = records.get(0).sdkFields().stream()
+                                        .filter(f -> f.locationName().equals("ApproximateArrivalTimestamp"))
+                                        .findFirst();
+                                if (maybeField.isPresent()) {
+                                    //noinspection unchecked
+                                    kinesisApproximateArrivalTimestampField = (SdkField<Instant>) maybeField.get();
+                                } else {
+                                    // shouldn't be possible
+                                    return;
+                                }
+                            }
+                            for (SdkPojo record : records) {
+                                Instant arrivalTime = kinesisApproximateArrivalTimestampField.getValueOrDefault(record);
+                                AgentDataStreamsMonitoring dataStreamsMonitoring =
+                                        AgentTracer.get().getDataStreamsMonitoring();
+                                PathwayContext pathwayContext = dataStreamsMonitoring.newPathwayContext();
+                                pathwayContext.setCheckpoint(
+                                        create(tags, arrivalTime.toEpochMilli(), 0), dataStreamsMonitoring::add);
+                                if (!span.spanContext().getPathwayContext().isStarted()) {
+                                    span.spanContext().mergePathwayContext(pathwayContext);
+                                }
+                            }
                         }
-                      }
-                      for (SdkPojo record : records) {
-                        Instant arrivalTime =
-                            kinesisApproximateArrivalTimestampField.getValueOrDefault(record);
-                        AgentDataStreamsMonitoring dataStreamsMonitoring =
-                            AgentTracer.get().getDataStreamsMonitoring();
-                        PathwayContext pathwayContext = dataStreamsMonitoring.newPathwayContext();
-                        pathwayContext.setCheckpoint(
-                            create(tags, arrivalTime.toEpochMilli(), 0),
-                            dataStreamsMonitoring::add);
-                        if (!span.spanContext().getPathwayContext().isStarted()) {
-                          span.spanContext().mergePathwayContext(pathwayContext);
+                    });
+                }
+            }
+
+            if ("s3".equalsIgnoreCase(awsServiceName) && traceConfig().isDataStreamsEnabled()) {
+                long responseSize = getResponseContentLength(httpResponse);
+                span.setTag(Tags.HTTP_RESPONSE_CONTENT_LENGTH, responseSize);
+
+                String key = getSpanTagAsString(span, InstrumentationTags.AWS_OBJECT_KEY);
+                String bucket = getSpanTagAsString(span, InstrumentationTags.AWS_BUCKET_NAME);
+                String awsOperation = getSpanTagAsString(span, InstrumentationTags.AWS_OPERATION);
+
+                if (key != null && bucket != null && awsOperation != null) {
+                    if ("GetObject".equalsIgnoreCase(awsOperation)) {
+                        DataStreamsTags tags = createWithDataset("s3", INBOUND, bucket, key, bucket);
+                        AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, create(tags, 0, responseSize));
+                    }
+
+                    if ("PutObject".equalsIgnoreCase(awsOperation)) {
+                        Object requestSize = span.getTag(Tags.HTTP_REQUEST_CONTENT_LENGTH);
+                        long payloadSize = 0;
+                        if (requestSize != null) {
+                            payloadSize = (long) requestSize;
                         }
-                      }
+
+                        DataStreamsTags tags = createWithDataset("s3", OUTBOUND, bucket, key, bucket);
+                        AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, create(tags, 0, payloadSize));
                     }
-                  });
-        }
-      }
-
-      if ("s3".equalsIgnoreCase(awsServiceName) && traceConfig().isDataStreamsEnabled()) {
-        long responseSize = getResponseContentLength(httpResponse);
-        span.setTag(Tags.HTTP_RESPONSE_CONTENT_LENGTH, responseSize);
-
-        String key = getSpanTagAsString(span, InstrumentationTags.AWS_OBJECT_KEY);
-        String bucket = getSpanTagAsString(span, InstrumentationTags.AWS_BUCKET_NAME);
-        String awsOperation = getSpanTagAsString(span, InstrumentationTags.AWS_OPERATION);
-
-        if (key != null && bucket != null && awsOperation != null) {
-          if ("GetObject".equalsIgnoreCase(awsOperation)) {
-            DataStreamsTags tags = createWithDataset("s3", INBOUND, bucket, key, bucket);
-            AgentTracer.get()
-                .getDataStreamsMonitoring()
-                .setCheckpoint(span, create(tags, 0, responseSize));
-          }
-
-          if ("PutObject".equalsIgnoreCase(awsOperation)) {
-            Object requestSize = span.getTag(Tags.HTTP_REQUEST_CONTENT_LENGTH);
-            long payloadSize = 0;
-            if (requestSize != null) {
-              payloadSize = (long) requestSize;
+                }
             }
-
-            DataStreamsTags tags = createWithDataset("s3", OUTBOUND, bucket, key, bucket);
-            AgentTracer.get()
-                .getDataStreamsMonitoring()
-                .setCheckpoint(span, create(tags, 0, payloadSize));
-          }
         }
-      }
     }
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"aws-sdk"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected String method(final SdkHttpRequest request) {
-    return request.method().name();
-  }
-
-  @Override
-  protected URI url(final SdkHttpRequest request) {
-    return request.getUri();
-  }
-
-  @Override
-  protected int status(final SdkHttpResponse response) {
-    return response.statusCode();
-  }
-
-  @ParametersAreNonnullByDefault
-  @Override
-  public void set(SdkHttpRequest.Builder carrier, String key, String value) {
-    carrier.putHeader(key, value);
-  }
-
-  @Override
-  protected String getRequestHeader(SdkHttpRequest request, String headerName) {
-    return request.firstMatchingHeader(headerName).orElse(null);
-  }
-
-  @Override
-  protected String getResponseHeader(SdkHttpResponse response, String headerName) {
-    return response.firstMatchingHeader(headerName).orElse(null);
-  }
-
-  private void awsPojoToTags(AgentSpan span, String tagsPrefix, Object pojo) {
-    Collection<PayloadTagsData.PathAndValue> payloadTagsData = new ArrayList<>();
-    List<Object> path = new ArrayList<>();
-    collectPayloadTagsData(payloadTagsData, path, pojo);
-    span.setTag(
-        tagsPrefix,
-        new PayloadTagsData(payloadTagsData.toArray(new PayloadTagsData.PathAndValue[0])));
-  }
-
-  private void collectPayloadTagsData(
-      Collection<PayloadTagsData.PathAndValue> payloadTagsData, List<Object> path, Object object) {
-    if (object instanceof SdkPojo) {
-      SdkPojo pojo = (SdkPojo) object;
-      for (SdkField<?> field : pojo.sdkFields()) {
-        Object val = field.getValueOrDefault(pojo);
-        path.add(field.locationName());
-        collectPayloadTagsData(payloadTagsData, path, val);
-        path.remove(path.size() - 1);
-      }
-    } else if (object instanceof Collection) {
-      int index = 0;
-      for (Object value : (Collection<?>) object) {
-        path.add(index);
-        collectPayloadTagsData(payloadTagsData, path, value);
-        path.remove(path.size() - 1);
-        index++;
-      }
-    } else if (object instanceof Map) {
-      Map<?, ?> map = (Map<?, ?>) object;
-      for (Map.Entry<?, ?> entry : map.entrySet()) {
-        path.add(entry.getKey().toString());
-        collectPayloadTagsData(payloadTagsData, path, entry.getValue());
-        path.remove(path.size() - 1);
-      }
-    } else if (object instanceof SdkBytes) {
-      SdkBytes bytes = (SdkBytes) object;
-      payloadTagsData.add(new PayloadTagsData.PathAndValue(path.toArray(), bytes.asInputStream()));
-    } else if (object != null) {
-      payloadTagsData.add(new PayloadTagsData.PathAndValue(path.toArray(), object));
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"aws-sdk"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
+
+    @Override
+    protected String method(final SdkHttpRequest request) {
+        return request.method().name();
+    }
+
+    @Override
+    protected URI url(final SdkHttpRequest request) {
+        return request.getUri();
+    }
+
+    @Override
+    protected int status(final SdkHttpResponse response) {
+        return response.statusCode();
+    }
+
+    @ParametersAreNonnullByDefault
+    @Override
+    public void set(SdkHttpRequest.Builder carrier, String key, String value) {
+        carrier.putHeader(key, value);
+    }
+
+    @Override
+    protected String getRequestHeader(SdkHttpRequest request, String headerName) {
+        return request.firstMatchingHeader(headerName).orElse(null);
+    }
+
+    @Override
+    protected String getResponseHeader(SdkHttpResponse response, String headerName) {
+        return response.firstMatchingHeader(headerName).orElse(null);
+    }
+
+    private void awsPojoToTags(AgentSpan span, String tagsPrefix, Object pojo) {
+        Collection<PayloadTagsData.PathAndValue> payloadTagsData = new ArrayList<>();
+        List<Object> path = new ArrayList<>();
+        collectPayloadTagsData(payloadTagsData, path, pojo);
+        span.setTag(tagsPrefix, new PayloadTagsData(payloadTagsData.toArray(new PayloadTagsData.PathAndValue[0])));
+    }
+
+    private void collectPayloadTagsData(
+            Collection<PayloadTagsData.PathAndValue> payloadTagsData, List<Object> path, Object object) {
+        if (object instanceof SdkPojo) {
+            SdkPojo pojo = (SdkPojo) object;
+            for (SdkField<?> field : pojo.sdkFields()) {
+                Object val = field.getValueOrDefault(pojo);
+                path.add(field.locationName());
+                collectPayloadTagsData(payloadTagsData, path, val);
+                path.remove(path.size() - 1);
+            }
+        } else if (object instanceof Collection) {
+            int index = 0;
+            for (Object value : (Collection<?>) object) {
+                path.add(index);
+                collectPayloadTagsData(payloadTagsData, path, value);
+                path.remove(path.size() - 1);
+                index++;
+            }
+        } else if (object instanceof Map) {
+            Map<?, ?> map = (Map<?, ?>) object;
+            for (Map.Entry<?, ?> entry : map.entrySet()) {
+                path.add(entry.getKey().toString());
+                collectPayloadTagsData(payloadTagsData, path, entry.getValue());
+                path.remove(path.size() - 1);
+            }
+        } else if (object instanceof SdkBytes) {
+            SdkBytes bytes = (SdkBytes) object;
+            payloadTagsData.add(new PayloadTagsData.PathAndValue(path.toArray(), bytes.asInputStream()));
+        } else if (object != null) {
+            payloadTagsData.add(new PayloadTagsData.PathAndValue(path.toArray(), object));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkModule.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkModule.java
index d2202c1f730..1899dbf7442 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkModule.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkModule.java
@@ -12,18 +12,18 @@
 @AutoService(InstrumenterModule.class)
 public final class AwsSdkModule extends InstrumenterModule.Tracing {
 
-  public AwsSdkModule() {
-    super("aws-sdk");
-  }
+    public AwsSdkModule() {
+        super("aws-sdk");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse", "java.lang.String");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(
+                "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse", "java.lang.String");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(new AwsClientInstrumentation(), new AwsHttpClientInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(new AwsClientInstrumentation(), new AwsHttpClientInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java
index 366c67675e3..63e47993927 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java
@@ -37,149 +37,137 @@
 /** AWS request execution interceptor */
 public class TracingExecutionInterceptor implements ExecutionInterceptor {
 
-  public static final ExecutionAttribute<Context> CONTEXT_ATTRIBUTE =
-      InstanceStore.of(ExecutionAttribute.class)
-          .getOrCreate("DatadogContext", () -> new ExecutionAttribute<>("DatadogContext"));
+    public static final ExecutionAttribute<Context> CONTEXT_ATTRIBUTE = InstanceStore.of(ExecutionAttribute.class)
+            .getOrCreate("DatadogContext", () -> new ExecutionAttribute<>("DatadogContext"));
 
-  private static final Logger log = LoggerFactory.getLogger(TracingExecutionInterceptor.class);
+    private static final Logger log = LoggerFactory.getLogger(TracingExecutionInterceptor.class);
 
-  private final ContextStore<Object, String> responseQueueStore;
+    private final ContextStore<Object, String> responseQueueStore;
 
-  public TracingExecutionInterceptor(ContextStore<Object, String> responseQueueStore) {
-    this.responseQueueStore = responseQueueStore;
-  }
-
-  @Override
-  public void beforeExecution(
-      final BeforeExecution context, final ExecutionAttributes executionAttributes) {
-    if (!AWS_LEGACY_TRACING && isPollingRequest(context.request())) {
-      return; // SQS messages spans are created by aws-java-sqs-2.0
+    public TracingExecutionInterceptor(ContextStore<Object, String> responseQueueStore) {
+        this.responseQueueStore = responseQueueStore;
     }
 
-    final AgentSpan span =
-        startSpan(COMPONENT_NAME.toString(), DECORATE.spanName(executionAttributes));
-    // TODO If DSM is enabled, add DSM context here too
-    DECORATE.afterStart(span);
-    executionAttributes.putAttribute(CONTEXT_ATTRIBUTE, span);
-  }
-
-  @Override
-  public void afterMarshalling(
-      final AfterMarshalling context, final ExecutionAttributes executionAttributes) {
-    final Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
-    final AgentSpan span = fromContext(ddContext);
-    if (context != null && span != null) {
-      try (ContextScope ignored = activateSpan(span)) {
-        DECORATE.onRequest(span, context.httpRequest());
-        DECORATE.onSdkRequest(
-            ddContext, context.request(), context.httpRequest(), executionAttributes);
-      }
+    @Override
+    public void beforeExecution(final BeforeExecution context, final ExecutionAttributes executionAttributes) {
+        if (!AWS_LEGACY_TRACING && isPollingRequest(context.request())) {
+            return; // SQS messages spans are created by aws-java-sqs-2.0
+        }
+
+        final AgentSpan span = startSpan(COMPONENT_NAME.toString(), DECORATE.spanName(executionAttributes));
+        // TODO If DSM is enabled, add DSM context here too
+        DECORATE.afterStart(span);
+        executionAttributes.putAttribute(CONTEXT_ATTRIBUTE, span);
     }
-  }
 
-  @Override
-  public SdkHttpRequest modifyHttpRequest(
-      ModifyHttpRequest context, ExecutionAttributes executionAttributes) {
-    if (Config.get().isAwsPropagationEnabled()) {
-      try {
+    @Override
+    public void afterMarshalling(final AfterMarshalling context, final ExecutionAttributes executionAttributes) {
         final Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
-        if (ddContext != null) {
-          SdkHttpRequest.Builder requestBuilder = context.httpRequest().toBuilder();
-          Propagators.forConcern(XRAY_TRACING_CONCERN).inject(ddContext, requestBuilder, DECORATE);
-          return requestBuilder.build();
+        final AgentSpan span = fromContext(ddContext);
+        if (context != null && span != null) {
+            try (ContextScope ignored = activateSpan(span)) {
+                DECORATE.onRequest(span, context.httpRequest());
+                DECORATE.onSdkRequest(ddContext, context.request(), context.httpRequest(), executionAttributes);
+            }
         }
-      } catch (Throwable e) {
-        log.warn("Unable to inject trace header", e);
-      }
     }
-    return context.httpRequest();
-  }
-
-  @Override
-  public void beforeTransmission(
-      final BeforeTransmission context, final ExecutionAttributes executionAttributes) {
-    final AgentSpan span;
-    if (!AWS_LEGACY_TRACING) {
-      span = blackholeSpan();
-    } else {
-      final Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
-      span = fromContext(ddContext);
+
+    @Override
+    public SdkHttpRequest modifyHttpRequest(ModifyHttpRequest context, ExecutionAttributes executionAttributes) {
+        if (Config.get().isAwsPropagationEnabled()) {
+            try {
+                final Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
+                if (ddContext != null) {
+                    SdkHttpRequest.Builder requestBuilder = context.httpRequest().toBuilder();
+                    Propagators.forConcern(XRAY_TRACING_CONCERN).inject(ddContext, requestBuilder, DECORATE);
+                    return requestBuilder.build();
+                }
+            } catch (Throwable e) {
+                log.warn("Unable to inject trace header", e);
+            }
+        }
+        return context.httpRequest();
     }
-    if (span != null) {
-      // This scope will be closed by AwsHttpClientInstrumentation since ExecutionInterceptor API
-      // doesn't provide a way to run code in same thread after transmission has been scheduled.
-      activateSpanWithoutScope(span);
+
+    @Override
+    public void beforeTransmission(final BeforeTransmission context, final ExecutionAttributes executionAttributes) {
+        final AgentSpan span;
+        if (!AWS_LEGACY_TRACING) {
+            span = blackholeSpan();
+        } else {
+            final Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
+            span = fromContext(ddContext);
+        }
+        if (span != null) {
+            // This scope will be closed by AwsHttpClientInstrumentation since ExecutionInterceptor API
+            // doesn't provide a way to run code in same thread after transmission has been scheduled.
+            activateSpanWithoutScope(span);
+        }
     }
-  }
-
-  @Override
-  public SdkResponse modifyResponse(
-      final ModifyResponse context, final ExecutionAttributes executionAttributes) {
-    final SdkResponse response = context.response();
-    if (!AWS_LEGACY_TRACING && isPollingRequest(context.request()) && isPollingResponse(response)) {
-      // Attach queueUrl before AWS SDK core rebuilds the response with
-      // toBuilder().sdkHttpResponse(...).build(). afterExecution sees this pre-rebuild response,
-      // not the final response returned to user code, so capturing queueUrl there is too late.
-      context
-          .request()
-          .getValueForField("QueueUrl", String.class)
-          .ifPresent(queueUrl -> responseQueueStore.put(response, queueUrl));
+
+    @Override
+    public SdkResponse modifyResponse(final ModifyResponse context, final ExecutionAttributes executionAttributes) {
+        final SdkResponse response = context.response();
+        if (!AWS_LEGACY_TRACING && isPollingRequest(context.request()) && isPollingResponse(response)) {
+            // Attach queueUrl before AWS SDK core rebuilds the response with
+            // toBuilder().sdkHttpResponse(...).build(). afterExecution sees this pre-rebuild response,
+            // not the final response returned to user code, so capturing queueUrl there is too late.
+            context.request()
+                    .getValueForField("QueueUrl", String.class)
+                    .ifPresent(queueUrl -> responseQueueStore.put(response, queueUrl));
+        }
+        return response;
     }
-    return response;
-  }
-
-  @Override
-  public void afterExecution(
-      final AfterExecution context, final ExecutionAttributes executionAttributes) {
-    final Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
-    final AgentSpan span = fromContext(ddContext);
-    if (span != null) {
-      executionAttributes.putAttribute(CONTEXT_ATTRIBUTE, null);
-      // Call onResponse on both types of responses:
-      DECORATE.onSdkResponse(span, context.response(), context.httpResponse(), executionAttributes);
-      DECORATE.onResponse(span, context.httpResponse());
-      DECORATE.beforeFinish(span);
-      span.finish();
+
+    @Override
+    public void afterExecution(final AfterExecution context, final ExecutionAttributes executionAttributes) {
+        final Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
+        final AgentSpan span = fromContext(ddContext);
+        if (span != null) {
+            executionAttributes.putAttribute(CONTEXT_ATTRIBUTE, null);
+            // Call onResponse on both types of responses:
+            DECORATE.onSdkResponse(span, context.response(), context.httpResponse(), executionAttributes);
+            DECORATE.onResponse(span, context.httpResponse());
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
-
-  @Override
-  public void onExecutionFailure(
-      final FailedExecution context, final ExecutionAttributes executionAttributes) {
-    final Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
-    final AgentSpan span = fromContext(ddContext);
-    if (ddContext != null && span != null) {
-      executionAttributes.putAttribute(CONTEXT_ATTRIBUTE, null);
-      Optional<SdkResponse> responseOpt = context.response();
-      if (responseOpt.isPresent()) {
-        SdkResponse response = responseOpt.get();
-        DECORATE.onSdkResponse(
-            ddContext, response, response.sdkHttpResponse(), executionAttributes);
-        DECORATE.onResponse(span, response.sdkHttpResponse());
-        if (span.isError()) {
-          DECORATE.onError(span, context.exception());
+
+    @Override
+    public void onExecutionFailure(final FailedExecution context, final ExecutionAttributes executionAttributes) {
+        final Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
+        final AgentSpan span = fromContext(ddContext);
+        if (ddContext != null && span != null) {
+            executionAttributes.putAttribute(CONTEXT_ATTRIBUTE, null);
+            Optional<SdkResponse> responseOpt = context.response();
+            if (responseOpt.isPresent()) {
+                SdkResponse response = responseOpt.get();
+                DECORATE.onSdkResponse(ddContext, response, response.sdkHttpResponse(), executionAttributes);
+                DECORATE.onResponse(span, response.sdkHttpResponse());
+                if (span.isError()) {
+                    DECORATE.onError(span, context.exception());
+                }
+            } else {
+                DECORATE.onError(span, context.exception());
+            }
+            DECORATE.beforeFinish(span);
+            span.finish();
         }
-      } else {
-        DECORATE.onError(span, context.exception());
-      }
-      DECORATE.beforeFinish(span);
-      span.finish();
     }
-  }
-
-  private static boolean isPollingRequest(SdkRequest request) {
-    return null != request
-        && "software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest"
-            .equals(request.getClass().getName());
-  }
-
-  private static boolean isPollingResponse(SdkResponse response) {
-    return null != response
-        && "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse"
-            .equals(response.getClass().getName());
-  }
-
-  public static void muzzleCheck() {
-    // Noop
-  }
+
+    private static boolean isPollingRequest(SdkRequest request) {
+        return null != request
+                && "software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest"
+                        .equals(request.getClass().getName());
+    }
+
+    private static boolean isPollingResponse(SdkResponse response) {
+        return null != response
+                && "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse"
+                        .equals(response.getClass().getName());
+    }
+
+    public static void muzzleCheck() {
+        // Noop
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/InputAttributeInjector.java b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/InputAttributeInjector.java
index e78fbcb797c..dd58ef51f34 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/InputAttributeInjector.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/InputAttributeInjector.java
@@ -7,47 +7,47 @@
 import datadog.json.JsonWriter;
 
 public class InputAttributeInjector {
-  private static final String DATADOG_KEY = "_datadog";
-
-  public static String buildTraceContext(Context context) {
-    if (fromContext(context) == null) {
-      return null;
-    }
-    try (JsonWriter writer = new JsonWriter()) {
-      writer.beginObject();
-      // note: injection allows non-datadog style propogation (W3C, B3)
-      // which the extension does not yet extract
-      defaultPropagator().inject(context, writer, TextMapInjectAdapter.SETTER);
-      writer.endObject();
-      return writer.toString();
-    } catch (Exception e) {
-      return null;
-    }
-  }
-
-  public static String getModifiedInput(String request, String ddTraceContextJSON) {
-    if (request == null || ddTraceContextJSON == null) {
-      return request; // leave request unmodified
-    }
-
-    final String traceContextProperty = "\"" + DATADOG_KEY + "\":" + ddTraceContextJSON;
-    int startPos = request.indexOf('{');
-    int endPos = request.lastIndexOf('}');
-
-    if (startPos < 0 || endPos < startPos) {
-      return request; // leave request unmodified
-    }
-
-    // If input is an empty {}
-    if (endPos == startPos + 1) {
-      return "{" + traceContextProperty + "}";
+    private static final String DATADOG_KEY = "_datadog";
+
+    public static String buildTraceContext(Context context) {
+        if (fromContext(context) == null) {
+            return null;
+        }
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginObject();
+            // note: injection allows non-datadog style propogation (W3C, B3)
+            // which the extension does not yet extract
+            defaultPropagator().inject(context, writer, TextMapInjectAdapter.SETTER);
+            writer.endObject();
+            return writer.toString();
+        } catch (Exception e) {
+            return null;
+        }
     }
 
-    String existingJSON = request.substring(startPos + 1, endPos).trim();
-    if (existingJSON.isEmpty()) {
-      return "{" + traceContextProperty + "}";
-    } else {
-      return "{" + existingJSON + "," + traceContextProperty + "}";
+    public static String getModifiedInput(String request, String ddTraceContextJSON) {
+        if (request == null || ddTraceContextJSON == null) {
+            return request; // leave request unmodified
+        }
+
+        final String traceContextProperty = "\"" + DATADOG_KEY + "\":" + ddTraceContextJSON;
+        int startPos = request.indexOf('{');
+        int endPos = request.lastIndexOf('}');
+
+        if (startPos < 0 || endPos < startPos) {
+            return request; // leave request unmodified
+        }
+
+        // If input is an empty {}
+        if (endPos == startPos + 1) {
+            return "{" + traceContextProperty + "}";
+        }
+
+        String existingJSON = request.substring(startPos + 1, endPos).trim();
+        if (existingJSON.isEmpty()) {
+            return "{" + traceContextProperty + "}";
+        } else {
+            return "{" + existingJSON + "," + traceContextProperty + "}";
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnClientInstrumentation.java
index 90b93d108d9..17c3f16920c 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnClientInstrumentation.java
@@ -13,33 +13,33 @@
 /** AWS SDK v2 Step Function instrumentation */
 @AutoService(InstrumenterModule.class)
 public final class SfnClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public SfnClientInstrumentation() {
-    super("sfn", "aws-sdk");
-  }
+    public SfnClientInstrumentation() {
+        super("sfn", "aws-sdk");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder";
-  }
+    @Override
+    public String instrumentedType() {
+        return "software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("resolveExecutionInterceptors")),
-        SfnClientInstrumentation.class.getName() + "$AwsSfnBuilderAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("resolveExecutionInterceptors")),
+                SfnClientInstrumentation.class.getName() + "$AwsSfnBuilderAdvice");
+    }
 
-  public static class AwsSfnBuilderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void addHandler(@Advice.Return final List<ExecutionInterceptor> interceptors) {
-      for (ExecutionInterceptor interceptor : interceptors) {
-        if (interceptor instanceof SfnInterceptor) {
-          return;
+    public static class AwsSfnBuilderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void addHandler(@Advice.Return final List<ExecutionInterceptor> interceptors) {
+            for (ExecutionInterceptor interceptor : interceptors) {
+                if (interceptor instanceof SfnInterceptor) {
+                    return;
+                }
+            }
+            interceptors.add(new SfnInterceptor());
         }
-      }
-      interceptors.add(new SfnInterceptor());
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnInterceptor.java
index 0b6b36b945d..b2dd87d688e 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnInterceptor.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnInterceptor.java
@@ -13,64 +13,60 @@
 
 public class SfnInterceptor implements ExecutionInterceptor {
 
-  public static final ExecutionAttribute<Context> CONTEXT_ATTRIBUTE =
-      InstanceStore.of(ExecutionAttribute.class)
-          .getOrCreate("DatadogContext", () -> new ExecutionAttribute<>("DatadogContext"));
+    public static final ExecutionAttribute<Context> CONTEXT_ATTRIBUTE = InstanceStore.of(ExecutionAttribute.class)
+            .getOrCreate("DatadogContext", () -> new ExecutionAttribute<>("DatadogContext"));
 
-  public SfnInterceptor() {}
+    public SfnInterceptor() {}
 
-  @Override
-  public SdkRequest modifyRequest(ModifyRequest context, ExecutionAttributes executionAttributes) {
-    SdkRequest request = context.request();
-    if (!Config.get().isSfnInjectDatadogAttributeEnabled()) {
-      return request;
+    @Override
+    public SdkRequest modifyRequest(ModifyRequest context, ExecutionAttributes executionAttributes) {
+        SdkRequest request = context.request();
+        if (!Config.get().isSfnInjectDatadogAttributeEnabled()) {
+            return request;
+        }
+        try {
+            return modifyRequestImpl(context, executionAttributes);
+        } catch (Exception e) {
+            return request;
+        }
     }
-    try {
-      return modifyRequestImpl(context, executionAttributes);
-    } catch (Exception e) {
-      return request;
-    }
-  }
 
-  public SdkRequest modifyRequestImpl(
-      ModifyRequest context, ExecutionAttributes executionAttributes) {
-    final Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
-    // StartExecutionRequest
-    if (context.request() instanceof StartExecutionRequest) {
-      StartExecutionRequest request = (StartExecutionRequest) context.request();
-      if (request.input() == null) {
-        return request;
-      }
-      return injectTraceContext(ddContext, request);
-    }
+    public SdkRequest modifyRequestImpl(ModifyRequest context, ExecutionAttributes executionAttributes) {
+        final Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
+        // StartExecutionRequest
+        if (context.request() instanceof StartExecutionRequest) {
+            StartExecutionRequest request = (StartExecutionRequest) context.request();
+            if (request.input() == null) {
+                return request;
+            }
+            return injectTraceContext(ddContext, request);
+        }
 
-    // StartSyncExecutionRequest
-    if (context.request() instanceof StartSyncExecutionRequest) {
-      StartSyncExecutionRequest request = (StartSyncExecutionRequest) context.request();
-      if (request.input() == null) {
-        return request;
-      }
-      return injectTraceContext(ddContext, request);
-    }
+        // StartSyncExecutionRequest
+        if (context.request() instanceof StartSyncExecutionRequest) {
+            StartSyncExecutionRequest request = (StartSyncExecutionRequest) context.request();
+            if (request.input() == null) {
+                return request;
+            }
+            return injectTraceContext(ddContext, request);
+        }
 
-    return context.request();
-  }
+        return context.request();
+    }
 
-  private SdkRequest injectTraceContext(Context ddContext, StartExecutionRequest request) {
-    String ddTraceContextJSON = InputAttributeInjector.buildTraceContext(ddContext);
-    // Inject the trace context into the StartExecutionRequest input
-    String modifiedInput =
-        InputAttributeInjector.getModifiedInput(request.input(), ddTraceContextJSON);
+    private SdkRequest injectTraceContext(Context ddContext, StartExecutionRequest request) {
+        String ddTraceContextJSON = InputAttributeInjector.buildTraceContext(ddContext);
+        // Inject the trace context into the StartExecutionRequest input
+        String modifiedInput = InputAttributeInjector.getModifiedInput(request.input(), ddTraceContextJSON);
 
-    return request.toBuilder().input(modifiedInput).build();
-  }
+        return request.toBuilder().input(modifiedInput).build();
+    }
 
-  private SdkRequest injectTraceContext(Context ddContext, StartSyncExecutionRequest request) {
-    String ddTraceContextJSON = InputAttributeInjector.buildTraceContext(ddContext);
-    // Inject the trace context into the StartSyncExecutionRequest input
-    String modifiedInput =
-        InputAttributeInjector.getModifiedInput(request.input(), ddTraceContextJSON);
+    private SdkRequest injectTraceContext(Context ddContext, StartSyncExecutionRequest request) {
+        String ddTraceContextJSON = InputAttributeInjector.buildTraceContext(ddContext);
+        // Inject the trace context into the StartSyncExecutionRequest input
+        String modifiedInput = InputAttributeInjector.getModifiedInput(request.input(), ddTraceContextJSON);
 
-    return request.toBuilder().input(modifiedInput).build();
-  }
+        return request.toBuilder().input(modifiedInput).build();
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/TextMapInjectAdapter.java b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/TextMapInjectAdapter.java
index 0c7311129fc..0156c91aaba 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/TextMapInjectAdapter.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/TextMapInjectAdapter.java
@@ -5,10 +5,10 @@
 
 public class TextMapInjectAdapter implements CarrierSetter<JsonWriter> {
 
-  public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
+    public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
 
-  @Override
-  public void set(final JsonWriter writer, final String key, final String value) {
-    writer.name(key).value(value);
-  }
+    @Override
+    public void set(final JsonWriter writer, final String key, final String value) {
+        writer.name(key).value(value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java
index 668453bd753..50cc4b3ad31 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java
@@ -16,42 +16,39 @@
 /** AWS SDK v1 SNS instrumentation */
 @AutoService(InstrumenterModule.class)
 public final class SnsClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public SnsClientInstrumentation() {
-    super("sns", "aws-sdk");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.amazonaws.handlers.HandlerChainFactory";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("newRequestHandler2Chain")),
-        SnsClientInstrumentation.class.getName() + "$HandlerChainAdvice");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "com.amazonaws.AmazonWebServiceRequest", "datadog.context.Context");
-  }
-
-  public static class HandlerChainAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void addHandler(@Advice.Return final List<RequestHandler2> handlers) {
-      for (RequestHandler2 interceptor : handlers) {
-        if (interceptor instanceof SnsInterceptor) {
-          return; // list already has our interceptor, return to builder
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public SnsClientInstrumentation() {
+        super("sns", "aws-sdk");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "com.amazonaws.handlers.HandlerChainFactory";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("newRequestHandler2Chain")),
+                SnsClientInstrumentation.class.getName() + "$HandlerChainAdvice");
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("com.amazonaws.AmazonWebServiceRequest", "datadog.context.Context");
+    }
+
+    public static class HandlerChainAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void addHandler(@Advice.Return final List<RequestHandler2> handlers) {
+            for (RequestHandler2 interceptor : handlers) {
+                if (interceptor instanceof SnsInterceptor) {
+                    return; // list already has our interceptor, return to builder
+                }
+            }
+            handlers.add(new SnsInterceptor(
+                    InstrumentationContext.get("com.amazonaws.AmazonWebServiceRequest", "datadog.context.Context")));
         }
-      }
-      handlers.add(
-          new SnsInterceptor(
-              InstrumentationContext.get(
-                  "com.amazonaws.AmazonWebServiceRequest", "datadog.context.Context")));
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java
index 25158ae8255..e1ce2175b4b 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java
@@ -26,98 +26,95 @@
 
 public class SnsInterceptor extends RequestHandler2 {
 
-  private final ContextStore<AmazonWebServiceRequest, Context> contextStore;
+    private final ContextStore<AmazonWebServiceRequest, Context> contextStore;
 
-  public SnsInterceptor(ContextStore<AmazonWebServiceRequest, Context> contextStore) {
-    this.contextStore = contextStore;
-  }
-
-  private ByteBuffer getMessageAttributeValueToInject(
-      AmazonWebServiceRequest request, String snsTopicName) {
-    final AgentSpan span = newSpan(request);
-    StringBuilder jsonBuilder = new StringBuilder();
-    jsonBuilder.append('{');
-    Context context = span;
-    if (traceConfig().isDataStreamsEnabled()) {
-      DataStreamsContext dsmContext = DataStreamsContext.fromTags(getTags(snsTopicName));
-      context = context.with(dsmContext);
+    public SnsInterceptor(ContextStore<AmazonWebServiceRequest, Context> contextStore) {
+        this.contextStore = contextStore;
     }
-    defaultPropagator().inject(context, jsonBuilder, SETTER);
-    jsonBuilder.setLength(jsonBuilder.length() - 1); // Remove the last comma
-    jsonBuilder.append('}');
-    return ByteBuffer.wrap(jsonBuilder.toString().getBytes(StandardCharsets.UTF_8));
-  }
 
-  @Override
-  public AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest request) {
-    if (!Config.get().isSnsInjectDatadogAttributeEnabled()) {
-      return request;
+    private ByteBuffer getMessageAttributeValueToInject(AmazonWebServiceRequest request, String snsTopicName) {
+        final AgentSpan span = newSpan(request);
+        StringBuilder jsonBuilder = new StringBuilder();
+        jsonBuilder.append('{');
+        Context context = span;
+        if (traceConfig().isDataStreamsEnabled()) {
+            DataStreamsContext dsmContext = DataStreamsContext.fromTags(getTags(snsTopicName));
+            context = context.with(dsmContext);
+        }
+        defaultPropagator().inject(context, jsonBuilder, SETTER);
+        jsonBuilder.setLength(jsonBuilder.length() - 1); // Remove the last comma
+        jsonBuilder.append('}');
+        return ByteBuffer.wrap(jsonBuilder.toString().getBytes(StandardCharsets.UTF_8));
     }
-    // Injecting the trace context into SNS messageAttributes.
-    if (request instanceof PublishRequest) {
-      PublishRequest pRequest = (PublishRequest) request;
-      // note: modifying message attributes has to be done before marshalling, otherwise the changes
-      // are not reflected in the actual request (and the MD5 check on send will fail).
-      Map<String, MessageAttributeValue> messageAttributes = pRequest.getMessageAttributes();
-      // 10 messageAttributes is a limit from SQS, which is often used as a subscriber, therefore
-      // the limit still applies here
-      if (messageAttributes.size() < 10) {
-        // Extract the topic name from the ARN for DSM
-        String topicName = pRequest.getTopicArn();
-        if (null == topicName) {
-          topicName = pRequest.getTargetArn();
-          if (null == topicName) {
-            return request; // request is to phone number, ignore for DSM
-          }
+
+    @Override
+    public AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest request) {
+        if (!Config.get().isSnsInjectDatadogAttributeEnabled()) {
+            return request;
         }
+        // Injecting the trace context into SNS messageAttributes.
+        if (request instanceof PublishRequest) {
+            PublishRequest pRequest = (PublishRequest) request;
+            // note: modifying message attributes has to be done before marshalling, otherwise the changes
+            // are not reflected in the actual request (and the MD5 check on send will fail).
+            Map<String, MessageAttributeValue> messageAttributes = pRequest.getMessageAttributes();
+            // 10 messageAttributes is a limit from SQS, which is often used as a subscriber, therefore
+            // the limit still applies here
+            if (messageAttributes.size() < 10) {
+                // Extract the topic name from the ARN for DSM
+                String topicName = pRequest.getTopicArn();
+                if (null == topicName) {
+                    topicName = pRequest.getTargetArn();
+                    if (null == topicName) {
+                        return request; // request is to phone number, ignore for DSM
+                    }
+                }
 
-        topicName = topicName.substring(topicName.lastIndexOf(':') + 1);
+                topicName = topicName.substring(topicName.lastIndexOf(':') + 1);
 
-        HashMap<String, MessageAttributeValue> modifiedMessageAttributes =
-            new HashMap<>(messageAttributes);
-        modifiedMessageAttributes.put(
-            "_datadog",
-            new MessageAttributeValue()
-                .withDataType(
-                    "Binary") // Use Binary since SNS subscription filter policies fail silently
-                // with JSON strings
-                // https://github.com/DataDog/datadog-lambda-js/pull/269
-                .withBinaryValue(this.getMessageAttributeValueToInject(request, topicName)));
+                HashMap<String, MessageAttributeValue> modifiedMessageAttributes = new HashMap<>(messageAttributes);
+                modifiedMessageAttributes.put(
+                        "_datadog",
+                        new MessageAttributeValue()
+                                .withDataType(
+                                        "Binary") // Use Binary since SNS subscription filter policies fail silently
+                                // with JSON strings
+                                // https://github.com/DataDog/datadog-lambda-js/pull/269
+                                .withBinaryValue(this.getMessageAttributeValueToInject(request, topicName)));
 
-        pRequest.setMessageAttributes(modifiedMessageAttributes);
-      }
-    } else if (request instanceof PublishBatchRequest) {
-      PublishBatchRequest pmbRequest = (PublishBatchRequest) request;
-      // Extract the topic name from the ARN for DSM
-      String topicName = pmbRequest.getTopicArn();
-      topicName = topicName.substring(topicName.lastIndexOf(':') + 1);
+                pRequest.setMessageAttributes(modifiedMessageAttributes);
+            }
+        } else if (request instanceof PublishBatchRequest) {
+            PublishBatchRequest pmbRequest = (PublishBatchRequest) request;
+            // Extract the topic name from the ARN for DSM
+            String topicName = pmbRequest.getTopicArn();
+            topicName = topicName.substring(topicName.lastIndexOf(':') + 1);
 
-      final ByteBuffer bytebuffer = this.getMessageAttributeValueToInject(request, topicName);
-      for (PublishBatchRequestEntry entry : pmbRequest.getPublishBatchRequestEntries()) {
-        Map<String, MessageAttributeValue> messageAttributes = entry.getMessageAttributes();
-        if (messageAttributes.size() < 10) {
-          HashMap<String, MessageAttributeValue> modifiedMessageAttributes =
-              new HashMap<>(messageAttributes);
-          modifiedMessageAttributes.put(
-              "_datadog",
-              new MessageAttributeValue().withDataType("Binary").withBinaryValue(bytebuffer));
-          entry.setMessageAttributes(modifiedMessageAttributes);
+            final ByteBuffer bytebuffer = this.getMessageAttributeValueToInject(request, topicName);
+            for (PublishBatchRequestEntry entry : pmbRequest.getPublishBatchRequestEntries()) {
+                Map<String, MessageAttributeValue> messageAttributes = entry.getMessageAttributes();
+                if (messageAttributes.size() < 10) {
+                    HashMap<String, MessageAttributeValue> modifiedMessageAttributes = new HashMap<>(messageAttributes);
+                    modifiedMessageAttributes.put(
+                            "_datadog",
+                            new MessageAttributeValue().withDataType("Binary").withBinaryValue(bytebuffer));
+                    entry.setMessageAttributes(modifiedMessageAttributes);
+                }
+            }
         }
-      }
+        return request;
     }
-    return request;
-  }
 
-  private AgentSpan newSpan(AmazonWebServiceRequest request) {
-    final AgentSpan span = AgentTracer.startSpan("java-aws-sdk", "aws.sns.send");
-    // pass the span to TracingRequestHandler in the sdk instrumentation where it'll be enriched &
-    // activated
-    // TODO If DSM is enabled, add DSM context here too
-    contextStore.put(request, span);
-    return span;
-  }
+    private AgentSpan newSpan(AmazonWebServiceRequest request) {
+        final AgentSpan span = AgentTracer.startSpan("java-aws-sdk", "aws.sns.send");
+        // pass the span to TracingRequestHandler in the sdk instrumentation where it'll be enriched &
+        // activated
+        // TODO If DSM is enabled, add DSM context here too
+        contextStore.put(request, span);
+        return span;
+    }
 
-  private DataStreamsTags getTags(String snsTopicName) {
-    return create("sns", OUTBOUND, snsTopicName);
-  }
+    private DataStreamsTags getTags(String snsTopicName) {
+        return create("sns", OUTBOUND, snsTopicName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java
index 27e19045655..e0cd098367e 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java
@@ -4,10 +4,10 @@
 
 public class TextMapInjectAdapter implements CarrierSetter<StringBuilder> {
 
-  public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
+    public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
 
-  @Override
-  public void set(final StringBuilder builder, final String key, final String value) {
-    builder.append('\"').append(key).append("\":\"").append(value).append("\",");
-  }
+    @Override
+    public void set(final StringBuilder builder, final String key, final String value) {
+        builder.append('\"').append(key).append("\":\"").append(value).append("\",");
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java
index 3770ec7df55..678281911e1 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java
@@ -15,39 +15,38 @@
 /** AWS SDK v2 SNS instrumentation */
 @AutoService(InstrumenterModule.class)
 public final class SnsClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public SnsClientInstrumentation() {
-    super("sns", "aws-sdk");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public SnsClientInstrumentation() {
+        super("sns", "aws-sdk");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder";
-  }
+    @Override
+    public String instrumentedType() {
+        return "software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("resolveExecutionInterceptors")),
-        SnsClientInstrumentation.class.getName() + "$AwsSnsBuilderAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("resolveExecutionInterceptors")),
+                SnsClientInstrumentation.class.getName() + "$AwsSnsBuilderAdvice");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "com.amazonaws.AmazonWebServiceRequest",
-        "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(
+                "com.amazonaws.AmazonWebServiceRequest", "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
+    }
 
-  public static class AwsSnsBuilderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void addHandler(@Advice.Return final List<ExecutionInterceptor> interceptors) {
-      for (ExecutionInterceptor interceptor : interceptors) {
-        if (interceptor instanceof SnsInterceptor) {
-          return; // list already has our interceptor, return to builder
+    public static class AwsSnsBuilderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void addHandler(@Advice.Return final List<ExecutionInterceptor> interceptors) {
+            for (ExecutionInterceptor interceptor : interceptors) {
+                if (interceptor instanceof SnsInterceptor) {
+                    return; // list already has our interceptor, return to builder
+                }
+            }
+            interceptors.add(new SnsInterceptor());
         }
-      }
-      interceptors.add(new SnsInterceptor());
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsInterceptor.java
index 6f84107b7dd..931f5b975a1 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsInterceptor.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsInterceptor.java
@@ -25,86 +25,88 @@
 
 public class SnsInterceptor implements ExecutionInterceptor {
 
-  // SQS subscriber limit; SNS inherits it when SQS is used as a subscriber
-  private static final int MAX_MESSAGE_ATTRIBUTES = 10;
+    // SQS subscriber limit; SNS inherits it when SQS is used as a subscriber
+    private static final int MAX_MESSAGE_ATTRIBUTES = 10;
 
-  public static final ExecutionAttribute<Context> CONTEXT_ATTRIBUTE =
-      InstanceStore.of(ExecutionAttribute.class)
-          .getOrCreate("DatadogContext", () -> new ExecutionAttribute<>("DatadogContext"));
+    public static final ExecutionAttribute<Context> CONTEXT_ATTRIBUTE = InstanceStore.of(ExecutionAttribute.class)
+            .getOrCreate("DatadogContext", () -> new ExecutionAttribute<>("DatadogContext"));
 
-  private SdkBytes getMessageAttributeValueToInject(
-      ExecutionAttributes executionAttributes, String snsTopicName) {
-    Context context = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
-    StringBuilder jsonBuilder = new StringBuilder();
-    jsonBuilder.append('{');
-    if (traceConfig().isDataStreamsEnabled()) {
-      DataStreamsTags tags =
-          DataStreamsTags.create("sns", DataStreamsTags.Direction.OUTBOUND, snsTopicName);
-      DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
-      context = context.with(dsmContext);
+    private SdkBytes getMessageAttributeValueToInject(ExecutionAttributes executionAttributes, String snsTopicName) {
+        Context context = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
+        StringBuilder jsonBuilder = new StringBuilder();
+        jsonBuilder.append('{');
+        if (traceConfig().isDataStreamsEnabled()) {
+            DataStreamsTags tags = DataStreamsTags.create("sns", DataStreamsTags.Direction.OUTBOUND, snsTopicName);
+            DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
+            context = context.with(dsmContext);
+        }
+        defaultPropagator().inject(context, jsonBuilder, TextMapInjectAdapter.SETTER);
+        jsonBuilder.setLength(jsonBuilder.length() - 1); // Remove the last comma
+        jsonBuilder.append('}');
+        return SdkBytes.fromString(jsonBuilder.toString(), StandardCharsets.UTF_8);
     }
-    defaultPropagator().inject(context, jsonBuilder, TextMapInjectAdapter.SETTER);
-    jsonBuilder.setLength(jsonBuilder.length() - 1); // Remove the last comma
-    jsonBuilder.append('}');
-    return SdkBytes.fromString(jsonBuilder.toString(), StandardCharsets.UTF_8);
-  }
 
-  public SnsInterceptor() {}
+    public SnsInterceptor() {}
 
-  @Override
-  public SdkRequest modifyRequest(ModifyRequest context, ExecutionAttributes executionAttributes) {
-    if (!Config.get().isSnsInjectDatadogAttributeEnabled()) {
-      return context.request();
-    }
-    // Injecting the trace context into SNS messageAttributes.
-    if (context.request() instanceof PublishRequest) {
-      PublishRequest request = (PublishRequest) context.request();
-      if (request.messageAttributes().size() < MAX_MESSAGE_ATTRIBUTES) {
-        // Get topic name for DSM
-        String snsTopicArn = request.topicArn();
-        if (null == snsTopicArn) {
-          snsTopicArn = request.targetArn();
-          if (null == snsTopicArn) {
-            return request; // request is to phone number, ignore for DSM
-          }
+    @Override
+    public SdkRequest modifyRequest(ModifyRequest context, ExecutionAttributes executionAttributes) {
+        if (!Config.get().isSnsInjectDatadogAttributeEnabled()) {
+            return context.request();
         }
+        // Injecting the trace context into SNS messageAttributes.
+        if (context.request() instanceof PublishRequest) {
+            PublishRequest request = (PublishRequest) context.request();
+            if (request.messageAttributes().size() < MAX_MESSAGE_ATTRIBUTES) {
+                // Get topic name for DSM
+                String snsTopicArn = request.topicArn();
+                if (null == snsTopicArn) {
+                    snsTopicArn = request.targetArn();
+                    if (null == snsTopicArn) {
+                        return request; // request is to phone number, ignore for DSM
+                    }
+                }
 
-        String snsTopicName = snsTopicArn.substring(snsTopicArn.lastIndexOf(':') + 1);
-        Map<String, MessageAttributeValue> messageAttributes =
-            withDatadogAttribute(
-                request.messageAttributes(),
-                this.getMessageAttributeValueToInject(executionAttributes, snsTopicName));
-        return request.toBuilder().messageAttributes(messageAttributes).build();
-      }
-      return request;
-    } else if (context.request() instanceof PublishBatchRequest) {
-      PublishBatchRequest request = (PublishBatchRequest) context.request();
-      // Get topic name for DSM
-      String snsTopicArn = request.topicArn();
-      String snsTopicName = snsTopicArn.substring(snsTopicArn.lastIndexOf(':') + 1);
-      ArrayList<PublishBatchRequestEntry> entries = new ArrayList<>();
-      SdkBytes value = this.getMessageAttributeValueToInject(executionAttributes, snsTopicName);
-      for (PublishBatchRequestEntry entry : request.publishBatchRequestEntries()) {
-        if (entry.messageAttributes().size() < MAX_MESSAGE_ATTRIBUTES) {
-          Map<String, MessageAttributeValue> messageAttributes =
-              withDatadogAttribute(entry.messageAttributes(), value);
-          entry = entry.toBuilder().messageAttributes(messageAttributes).build();
+                String snsTopicName = snsTopicArn.substring(snsTopicArn.lastIndexOf(':') + 1);
+                Map<String, MessageAttributeValue> messageAttributes = withDatadogAttribute(
+                        request.messageAttributes(),
+                        this.getMessageAttributeValueToInject(executionAttributes, snsTopicName));
+                return request.toBuilder().messageAttributes(messageAttributes).build();
+            }
+            return request;
+        } else if (context.request() instanceof PublishBatchRequest) {
+            PublishBatchRequest request = (PublishBatchRequest) context.request();
+            // Get topic name for DSM
+            String snsTopicArn = request.topicArn();
+            String snsTopicName = snsTopicArn.substring(snsTopicArn.lastIndexOf(':') + 1);
+            ArrayList<PublishBatchRequestEntry> entries = new ArrayList<>();
+            SdkBytes value = this.getMessageAttributeValueToInject(executionAttributes, snsTopicName);
+            for (PublishBatchRequestEntry entry : request.publishBatchRequestEntries()) {
+                if (entry.messageAttributes().size() < MAX_MESSAGE_ATTRIBUTES) {
+                    Map<String, MessageAttributeValue> messageAttributes =
+                            withDatadogAttribute(entry.messageAttributes(), value);
+                    entry = entry.toBuilder()
+                            .messageAttributes(messageAttributes)
+                            .build();
+                }
+                entries.add(entry);
+            }
+            return request.toBuilder().publishBatchRequestEntries(entries).build();
         }
-        entries.add(entry);
-      }
-      return request.toBuilder().publishBatchRequestEntries(entries).build();
+        return context.request();
     }
-    return context.request();
-  }
 
-  private static Map<String, MessageAttributeValue> withDatadogAttribute(
-      Map<String, MessageAttributeValue> attributes, SdkBytes value) {
-    // copy since the original map may be unmodifiable
-    Map<String, MessageAttributeValue> modified = new HashMap<>(attributes);
-    // Use Binary since SNS subscription filter policies fail silently with JSON strings
-    // https://github.com/DataDog/datadog-lambda-js/pull/269
-    modified.put(
-        "_datadog", MessageAttributeValue.builder().dataType("Binary").binaryValue(value).build());
-    return modified;
-  }
+    private static Map<String, MessageAttributeValue> withDatadogAttribute(
+            Map<String, MessageAttributeValue> attributes, SdkBytes value) {
+        // copy since the original map may be unmodifiable
+        Map<String, MessageAttributeValue> modified = new HashMap<>(attributes);
+        // Use Binary since SNS subscription filter policies fail silently with JSON strings
+        // https://github.com/DataDog/datadog-lambda-js/pull/269
+        modified.put(
+                "_datadog",
+                MessageAttributeValue.builder()
+                        .dataType("Binary")
+                        .binaryValue(value)
+                        .build());
+        return modified;
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/TextMapInjectAdapter.java b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/TextMapInjectAdapter.java
index bbe542be905..da36a240a83 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/TextMapInjectAdapter.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/TextMapInjectAdapter.java
@@ -4,10 +4,10 @@
 
 public class TextMapInjectAdapter implements CarrierSetter<StringBuilder> {
 
-  public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
+    public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
 
-  @Override
-  public void set(final StringBuilder builder, final String key, final String value) {
-    builder.append('\"').append(key).append("\":\"").append(value).append("\",");
-  }
+    @Override
+    public void set(final StringBuilder builder, final String key, final String value) {
+        builder.append('\"').append(key).append("\":\"").append(value).append("\",");
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/test/java/datadog/trace/instrumentation/aws/v2/sns/SnsInterceptorTest.java b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/test/java/datadog/trace/instrumentation/aws/v2/sns/SnsInterceptorTest.java
index 74e4ad2d454..e34208b6247 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/test/java/datadog/trace/instrumentation/aws/v2/sns/SnsInterceptorTest.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/test/java/datadog/trace/instrumentation/aws/v2/sns/SnsInterceptorTest.java
@@ -21,75 +21,79 @@
 
 public class SnsInterceptorTest {
 
-  @Test
-  void publishBatchPreservesEntriesAndOnlyInjectsBelowTheMessageAttributeLimit() {
-    PublishBatchRequest batchRequest =
-        PublishBatchRequest.builder()
-            .topicArn("arn:aws:sns:us-east-1:123456789012:test-topic")
-            .publishBatchRequestEntries(
-                PublishBatchRequestEntry.builder()
-                    .id("at-limit")
-                    .message("first")
-                    .messageAttributes(stringAttributes(10))
-                    .build(),
-                PublishBatchRequestEntry.builder()
-                    .id("under-limit")
-                    .message("second")
-                    .messageAttributes(stringAttributes(9))
-                    .build())
-            .build();
+    @Test
+    void publishBatchPreservesEntriesAndOnlyInjectsBelowTheMessageAttributeLimit() {
+        PublishBatchRequest batchRequest = PublishBatchRequest.builder()
+                .topicArn("arn:aws:sns:us-east-1:123456789012:test-topic")
+                .publishBatchRequestEntries(
+                        PublishBatchRequestEntry.builder()
+                                .id("at-limit")
+                                .message("first")
+                                .messageAttributes(stringAttributes(10))
+                                .build(),
+                        PublishBatchRequestEntry.builder()
+                                .id("under-limit")
+                                .message("second")
+                                .messageAttributes(stringAttributes(9))
+                                .build())
+                .build();
 
-    PublishBatchRequest modified =
-        (PublishBatchRequest)
-            new SnsInterceptor().modifyRequest(() -> batchRequest, executionAttributes());
+        PublishBatchRequest modified =
+                (PublishBatchRequest) new SnsInterceptor().modifyRequest(() -> batchRequest, executionAttributes());
 
-    assertEquals(
-        Arrays.asList("at-limit", "under-limit"),
-        modified.publishBatchRequestEntries().stream()
-            .map(PublishBatchRequestEntry::id)
-            .collect(Collectors.toList()));
-    assertFalse(
-        modified.publishBatchRequestEntries().get(0).messageAttributes().containsKey("_datadog"));
-    assertTrue(
-        modified.publishBatchRequestEntries().get(1).messageAttributes().containsKey("_datadog"));
-  }
+        assertEquals(
+                Arrays.asList("at-limit", "under-limit"),
+                modified.publishBatchRequestEntries().stream()
+                        .map(PublishBatchRequestEntry::id)
+                        .collect(Collectors.toList()));
+        assertFalse(
+                modified.publishBatchRequestEntries().get(0).messageAttributes().containsKey("_datadog"));
+        assertTrue(
+                modified.publishBatchRequestEntries().get(1).messageAttributes().containsKey("_datadog"));
+    }
 
-  @Test
-  void publishPreservesReadonlyAttributesWhileAddingDatadogContext() {
-    Map<String, MessageAttributeValue> headers = new HashMap<>();
-    headers.put(
-        "mykey", MessageAttributeValue.builder().dataType("String").stringValue("myvalue").build());
-    Map<String, MessageAttributeValue> readonlyHeaders = Collections.unmodifiableMap(headers);
+    @Test
+    void publishPreservesReadonlyAttributesWhileAddingDatadogContext() {
+        Map<String, MessageAttributeValue> headers = new HashMap<>();
+        headers.put(
+                "mykey",
+                MessageAttributeValue.builder()
+                        .dataType("String")
+                        .stringValue("myvalue")
+                        .build());
+        Map<String, MessageAttributeValue> readonlyHeaders = Collections.unmodifiableMap(headers);
 
-    PublishRequest request =
-        PublishRequest.builder()
-            .topicArn("arn:aws:sns:us-east-1:123456789012:test-topic")
-            .message("sometext")
-            .messageAttributes(readonlyHeaders)
-            .build();
+        PublishRequest request = PublishRequest.builder()
+                .topicArn("arn:aws:sns:us-east-1:123456789012:test-topic")
+                .message("sometext")
+                .messageAttributes(readonlyHeaders)
+                .build();
 
-    PublishRequest modified =
-        (PublishRequest) new SnsInterceptor().modifyRequest(() -> request, executionAttributes());
+        PublishRequest modified =
+                (PublishRequest) new SnsInterceptor().modifyRequest(() -> request, executionAttributes());
 
-    assertNotSame(readonlyHeaders, modified.messageAttributes());
-    assertEquals("myvalue", modified.messageAttributes().get("mykey").stringValue());
-    assertTrue(modified.messageAttributes().containsKey("_datadog"));
-    assertFalse(readonlyHeaders.containsKey("_datadog"));
-  }
+        assertNotSame(readonlyHeaders, modified.messageAttributes());
+        assertEquals("myvalue", modified.messageAttributes().get("mykey").stringValue());
+        assertTrue(modified.messageAttributes().containsKey("_datadog"));
+        assertFalse(readonlyHeaders.containsKey("_datadog"));
+    }
 
-  private static ExecutionAttributes executionAttributes() {
-    ExecutionAttributes executionAttributes = new ExecutionAttributes();
-    executionAttributes.putAttribute(SnsInterceptor.CONTEXT_ATTRIBUTE, Context.root());
-    return executionAttributes;
-  }
+    private static ExecutionAttributes executionAttributes() {
+        ExecutionAttributes executionAttributes = new ExecutionAttributes();
+        executionAttributes.putAttribute(SnsInterceptor.CONTEXT_ATTRIBUTE, Context.root());
+        return executionAttributes;
+    }
 
-  private static Map<String, MessageAttributeValue> stringAttributes(int count) {
-    Map<String, MessageAttributeValue> attributes = new LinkedHashMap<>();
-    for (int index = 1; index <= count; index++) {
-      attributes.put(
-          "key" + index,
-          MessageAttributeValue.builder().dataType("String").stringValue("value" + index).build());
+    private static Map<String, MessageAttributeValue> stringAttributes(int count) {
+        Map<String, MessageAttributeValue> attributes = new LinkedHashMap<>();
+        for (int index = 1; index <= count; index++) {
+            attributes.put(
+                    "key" + index,
+                    MessageAttributeValue.builder()
+                            .dataType("String")
+                            .stringValue("value" + index)
+                            .build());
+        }
+        return attributes;
     }
-    return attributes;
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/AbstractSqsInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/AbstractSqsInstrumentation.java
index 7db3c720b72..d13d249d07a 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/AbstractSqsInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/AbstractSqsInstrumentation.java
@@ -4,11 +4,11 @@
 import datadog.trace.util.Strings;
 
 public abstract class AbstractSqsInstrumentation extends InstrumenterModule.Tracing {
-  public AbstractSqsInstrumentation() {
-    super("sqs", "aws-sdk");
-  }
+    public AbstractSqsInstrumentation() {
+        super("sqs", "aws-sdk");
+    }
 
-  public AbstractSqsInstrumentation(String... additionalNames) {
-    super("sqs", Strings.concat(additionalNames, "aws-sdk"));
-  }
+    public AbstractSqsInstrumentation(String... additionalNames) {
+        super("sqs", Strings.concat(additionalNames, "aws-sdk"));
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageAttributeInjector.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageAttributeInjector.java
index 9e85f11b63c..aa2d37ad340 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageAttributeInjector.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageAttributeInjector.java
@@ -9,51 +9,48 @@
 
 public class MessageAttributeInjector implements CarrierSetter<Map<String, MessageAttributeValue>> {
 
-  public static final MessageAttributeInjector SETTER = new MessageAttributeInjector();
+    public static final MessageAttributeInjector SETTER = new MessageAttributeInjector();
 
-  @Override
-  public void set(
-      final Map<String, MessageAttributeValue> carrier, final String key, final String value) {
-    if (!Config.get().isSqsInjectDatadogAttributeEnabled()) {
-      return;
+    @Override
+    public void set(final Map<String, MessageAttributeValue> carrier, final String key, final String value) {
+        if (!Config.get().isSqsInjectDatadogAttributeEnabled()) {
+            return;
+        }
+        // A single propagator.inject() call invokes set() once per header key (e.g.
+        // x-datadog-trace-id, x-datadog-parent-id, dd-pathway-ctx-base64). All of them must be
+        // accumulated into the same _datadog JSON attribute rather than overwriting each other.
+        if (!carrier.containsKey(DATADOG_KEY)) {
+            if (carrier.size() >= 10) {
+                return;
+            }
+            carrier.put(
+                    DATADOG_KEY,
+                    new MessageAttributeValue()
+                            .withDataType("String")
+                            .withStringValue("{\"" + key + "\": \"" + value + "\"}"));
+        } else {
+            // _datadog was created by an earlier set() call in this same inject session; append to it.
+            String existing = carrier.get(DATADOG_KEY).getStringValue();
+            if (existing == null) {
+                return;
+            }
+            int closingBrace = existing.lastIndexOf('}');
+            if (closingBrace >= 0) {
+                String updated = new StringBuilder(closingBrace
+                                + String.valueOf(key).length()
+                                + String.valueOf(value).length()
+                                + 9)
+                        .append(existing, 0, closingBrace)
+                        .append(", \"")
+                        .append(key)
+                        .append("\": \"")
+                        .append(value)
+                        .append("\"}")
+                        .toString();
+                carrier.put(
+                        DATADOG_KEY,
+                        new MessageAttributeValue().withDataType("String").withStringValue(updated));
+            }
+        }
     }
-    // A single propagator.inject() call invokes set() once per header key (e.g.
-    // x-datadog-trace-id, x-datadog-parent-id, dd-pathway-ctx-base64). All of them must be
-    // accumulated into the same _datadog JSON attribute rather than overwriting each other.
-    if (!carrier.containsKey(DATADOG_KEY)) {
-      if (carrier.size() >= 10) {
-        return;
-      }
-      carrier.put(
-          DATADOG_KEY,
-          new MessageAttributeValue()
-              .withDataType("String")
-              .withStringValue("{\"" + key + "\": \"" + value + "\"}"));
-    } else {
-      // _datadog was created by an earlier set() call in this same inject session; append to it.
-      String existing = carrier.get(DATADOG_KEY).getStringValue();
-      if (existing == null) {
-        return;
-      }
-      int closingBrace = existing.lastIndexOf('}');
-      if (closingBrace >= 0) {
-        String updated =
-            new StringBuilder(
-                    closingBrace
-                        + String.valueOf(key).length()
-                        + String.valueOf(value).length()
-                        + 9)
-                .append(existing, 0, closingBrace)
-                .append(", \"")
-                .append(key)
-                .append("\": \"")
-                .append(value)
-                .append("\"}")
-                .toString();
-        carrier.put(
-            DATADOG_KEY,
-            new MessageAttributeValue().withDataType("String").withStringValue(updated));
-      }
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageExtractAdapter.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageExtractAdapter.java
index da37db8de49..707a60d662c 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageExtractAdapter.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageExtractAdapter.java
@@ -20,112 +20,110 @@
 import org.slf4j.LoggerFactory;
 
 public final class MessageExtractAdapter implements AgentPropagation.ContextVisitor<Message> {
-  private static final Logger log = LoggerFactory.getLogger(MessageExtractAdapter.class);
-  public static final MessageExtractAdapter GETTER = new MessageExtractAdapter();
-  private static final ObjectMapper MAPPER = new ObjectMapper();
-  public static final boolean SHOULD_EXTRACT_CONTEXT_FROM_BODY =
-      Config.get().isSqsBodyPropagationEnabled();
+    private static final Logger log = LoggerFactory.getLogger(MessageExtractAdapter.class);
+    public static final MessageExtractAdapter GETTER = new MessageExtractAdapter();
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+    public static final boolean SHOULD_EXTRACT_CONTEXT_FROM_BODY = Config.get().isSqsBodyPropagationEnabled();
 
-  @Override
-  public void forEachKey(Message carrier, AgentPropagation.KeyClassifier classifier) {
-    boolean shouldExtractContextFromBody = SHOULD_EXTRACT_CONTEXT_FROM_BODY;
-    Map<String, String> systemAttributes = carrier.getAttributes();
-    if (systemAttributes.containsKey("AWSTraceHeader")) {
-      // alias 'AWSTraceHeader' to 'X-Amzn-Trace-Id' because it uses the same format
-      classifier.accept("X-Amzn-Trace-Id", systemAttributes.get("AWSTraceHeader"));
-    }
-    Map<String, MessageAttributeValue> messageAttributes = carrier.getMessageAttributes();
-    if (messageAttributes.containsKey("_datadog")) {
-      MessageAttributeValue datadog = messageAttributes.get("_datadog");
-      boolean hasPathwayContext = false;
-      if ("String".equals(datadog.getDataType())) {
-        String value = datadog.getStringValue();
-        hasPathwayContext = value != null && value.contains(PROPAGATION_KEY_BASE64);
-        DatadogAttributeParser.forEachProperty(classifier, value);
-      } else if ("Binary".equals(datadog.getDataType())) {
-        ByteBuffer value = datadog.getBinaryValue();
-        if (value != null) {
-          ByteBuffer duplicate = value.duplicate();
-          hasPathwayContext =
-              StandardCharsets.UTF_8.decode(duplicate).toString().contains(PROPAGATION_KEY_BASE64);
+    @Override
+    public void forEachKey(Message carrier, AgentPropagation.KeyClassifier classifier) {
+        boolean shouldExtractContextFromBody = SHOULD_EXTRACT_CONTEXT_FROM_BODY;
+        Map<String, String> systemAttributes = carrier.getAttributes();
+        if (systemAttributes.containsKey("AWSTraceHeader")) {
+            // alias 'AWSTraceHeader' to 'X-Amzn-Trace-Id' because it uses the same format
+            classifier.accept("X-Amzn-Trace-Id", systemAttributes.get("AWSTraceHeader"));
+        }
+        Map<String, MessageAttributeValue> messageAttributes = carrier.getMessageAttributes();
+        if (messageAttributes.containsKey("_datadog")) {
+            MessageAttributeValue datadog = messageAttributes.get("_datadog");
+            boolean hasPathwayContext = false;
+            if ("String".equals(datadog.getDataType())) {
+                String value = datadog.getStringValue();
+                hasPathwayContext = value != null && value.contains(PROPAGATION_KEY_BASE64);
+                DatadogAttributeParser.forEachProperty(classifier, value);
+            } else if ("Binary".equals(datadog.getDataType())) {
+                ByteBuffer value = datadog.getBinaryValue();
+                if (value != null) {
+                    ByteBuffer duplicate = value.duplicate();
+                    hasPathwayContext =
+                            StandardCharsets.UTF_8.decode(duplicate).toString().contains(PROPAGATION_KEY_BASE64);
+                }
+                DatadogAttributeParser.forEachProperty(classifier, value);
+            }
+            shouldExtractContextFromBody &= !hasPathwayContext;
         }
-        DatadogAttributeParser.forEachProperty(classifier, value);
-      }
-      shouldExtractContextFromBody &= !hasPathwayContext;
-    }
 
-    if (shouldExtractContextFromBody) {
-      // The top-level SQS _datadog attribute and the SNS-style body payload are separate carriers.
-      // APM headers may be present in the message attribute while DSM context still only exists in
-      // the body payload.
-      try {
-        this.forEachKeyInBody(carrier.getBody(), classifier);
-      } catch (Throwable e) {
-        log.debug("Error extracting Datadog context from SQS message body", e);
-      }
+        if (shouldExtractContextFromBody) {
+            // The top-level SQS _datadog attribute and the SNS-style body payload are separate carriers.
+            // APM headers may be present in the message attribute while DSM context still only exists in
+            // the body payload.
+            try {
+                this.forEachKeyInBody(carrier.getBody(), classifier);
+            } catch (Throwable e) {
+                log.debug("Error extracting Datadog context from SQS message body", e);
+            }
+        }
     }
-  }
 
-  public void forEachKeyInBody(String body, AgentPropagation.KeyClassifier classifier)
-      throws IOException {
-    JsonNode messageAttributes = null;
-    try (JsonParser parser = MAPPER.getFactory().createParser(body)) {
-      if (parser.nextToken() == JsonToken.START_OBJECT) {
-        while (parser.nextToken() == JsonToken.FIELD_NAME) {
-          String name = parser.getCurrentName();
-          parser.nextToken();
-          if ("MessageAttributes".equals(name)) {
-            messageAttributes = readDatadogAttribute(parser);
-          } else {
-            parser.skipChildren();
-          }
+    public void forEachKeyInBody(String body, AgentPropagation.KeyClassifier classifier) throws IOException {
+        JsonNode messageAttributes = null;
+        try (JsonParser parser = MAPPER.getFactory().createParser(body)) {
+            if (parser.nextToken() == JsonToken.START_OBJECT) {
+                while (parser.nextToken() == JsonToken.FIELD_NAME) {
+                    String name = parser.getCurrentName();
+                    parser.nextToken();
+                    if ("MessageAttributes".equals(name)) {
+                        messageAttributes = readDatadogAttribute(parser);
+                    } else {
+                        parser.skipChildren();
+                    }
+                }
+            } else {
+                MAPPER.readTree(parser);
+            }
+        }
+        if (messageAttributes == null) {
+            return;
         }
-      } else {
-        MAPPER.readTree(parser);
-      }
-    }
-    if (messageAttributes == null) {
-      return;
-    }
 
-    // Extract Value and Type
-    String value = messageAttributes.path("Value").asText();
-    String type = messageAttributes.path("Type").asText();
-    if ("String".equals(type)) {
-      DatadogAttributeParser.forEachProperty(classifier, value);
-    } else if ("Binary".equals(type)) {
-      ByteBuffer decodedValue = ByteBuffer.wrap(Base64.getDecoder().decode(value));
-      DatadogAttributeParser.forEachProperty(classifier, decodedValue);
+        // Extract Value and Type
+        String value = messageAttributes.path("Value").asText();
+        String type = messageAttributes.path("Type").asText();
+        if ("String".equals(type)) {
+            DatadogAttributeParser.forEachProperty(classifier, value);
+        } else if ("Binary".equals(type)) {
+            ByteBuffer decodedValue = ByteBuffer.wrap(Base64.getDecoder().decode(value));
+            DatadogAttributeParser.forEachProperty(classifier, decodedValue);
+        }
     }
-  }
 
-  private static JsonNode readDatadogAttribute(JsonParser parser) throws IOException {
-    JsonNode attribute = null;
-    if (parser.getCurrentToken() == JsonToken.START_OBJECT) {
-      while (parser.nextToken() == JsonToken.FIELD_NAME) {
-        String name = parser.getCurrentName();
-        parser.nextToken();
-        if ("_datadog".equals(name)) {
-          attribute = MAPPER.readTree(parser);
+    private static JsonNode readDatadogAttribute(JsonParser parser) throws IOException {
+        JsonNode attribute = null;
+        if (parser.getCurrentToken() == JsonToken.START_OBJECT) {
+            while (parser.nextToken() == JsonToken.FIELD_NAME) {
+                String name = parser.getCurrentName();
+                parser.nextToken();
+                if ("_datadog".equals(name)) {
+                    attribute = MAPPER.readTree(parser);
+                } else {
+                    parser.skipChildren();
+                }
+            }
         } else {
-          parser.skipChildren();
+            parser.skipChildren();
         }
-      }
-    } else {
-      parser.skipChildren();
+        return attribute;
     }
-    return attribute;
-  }
 
-  public long extractTimeInQueueStart(final Message carrier) {
-    try {
-      Map<String, String> systemAttributes = carrier.getAttributes();
-      if (systemAttributes.containsKey("SentTimestamp")) {
-        return Long.parseLong(systemAttributes.get("SentTimestamp"));
-      }
-    } catch (Exception e) {
-      log.debug("Unable to get SQS sent time", e);
+    public long extractTimeInQueueStart(final Message carrier) {
+        try {
+            Map<String, String> systemAttributes = carrier.getAttributes();
+            if (systemAttributes.containsKey("SentTimestamp")) {
+                return Long.parseLong(systemAttributes.get("SentTimestamp"));
+            }
+        } catch (Exception e) {
+            log.debug("Unable to get SQS sent time", e);
+        }
+        return 0;
     }
-    return 0;
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/QueueBufferConfigInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/QueueBufferConfigInstrumentation.java
index eee0e4d9b9d..587393bfb4c 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/QueueBufferConfigInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/QueueBufferConfigInstrumentation.java
@@ -18,47 +18,42 @@
 
 @AutoService(InstrumenterModule.class)
 public class QueueBufferConfigInstrumentation extends AbstractSqsInstrumentation
-    implements Instrumenter.ForSingleType,
-        Instrumenter.WithTypeStructure,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.WithTypeStructure, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.amazonaws.services.sqs.buffered.QueueBufferConfig";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.amazonaws.services.sqs.buffered.QueueBufferConfig";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("receiveAttributeNames"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("receiveAttributeNames"));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .or(
-                isMethod()
-                    .and(namedOneOf("setReceiveAttributeNames", "withReceiveAttributeNames"))),
-        getClass().getName() + "$QueueBufferConfigAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().or(isMethod().and(namedOneOf("setReceiveAttributeNames", "withReceiveAttributeNames"))),
+                getClass().getName() + "$QueueBufferConfigAdvice");
+    }
 
-  public static class QueueBufferConfigAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.FieldValue(value = "receiveAttributeNames", readOnly = false)
-            List<String> receiveAttributeNames) {
-      if (Config.get().isSqsPropagationEnabled()) {
-        // QueueBufferConfig maintains an immutable list which we may need to replace
-        for (String name : receiveAttributeNames) {
-          if ("AWSTraceHeader".equals(name) || "All".equals(name)) {
-            return;
-          }
+    public static class QueueBufferConfigAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.FieldValue(value = "receiveAttributeNames", readOnly = false)
+                        List<String> receiveAttributeNames) {
+            if (Config.get().isSqsPropagationEnabled()) {
+                // QueueBufferConfig maintains an immutable list which we may need to replace
+                for (String name : receiveAttributeNames) {
+                    if ("AWSTraceHeader".equals(name) || "All".equals(name)) {
+                        return;
+                    }
+                }
+                int oldLength = receiveAttributeNames.size();
+                String[] nameArray = receiveAttributeNames.toArray(new String[oldLength + 1]);
+                nameArray[oldLength] = "AWSTraceHeader";
+                receiveAttributeNames = asList(nameArray);
+            }
         }
-        int oldLength = receiveAttributeNames.size();
-        String[] nameArray = receiveAttributeNames.toArray(new String[oldLength + 1]);
-        nameArray[oldLength] = "AWSTraceHeader";
-        receiveAttributeNames = asList(nameArray);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java
index e8832605179..b66fb953bad 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java
@@ -17,46 +17,42 @@
 /** AWS SDK v1 instrumentation */
 @AutoService(InstrumenterModule.class)
 public final class SqsClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  private static final String INSTRUMENTATION_NAME = "aws-sdk";
-
-  public SqsClientInstrumentation() {
-    super(INSTRUMENTATION_NAME);
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.amazonaws.handlers.HandlerChainFactory";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("newRequestHandler2Chain")),
-        SqsClientInstrumentation.class.getName() + "$HandlerChainAdvice");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "com.amazonaws.AmazonWebServiceRequest", "datadog.context.Context");
-  }
-
-  public static class HandlerChainAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void addHandler(@Advice.Return final List<RequestHandler2> handlers) {
-      if (Config.get().isDataStreamsEnabled()
-          || Config.get().isSqsInjectDatadogAttributeEnabled()) {
-        for (RequestHandler2 interceptor : handlers) {
-          if (interceptor instanceof SqsInterceptor) {
-            return; // list already has our interceptor, return to builder
-          }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    private static final String INSTRUMENTATION_NAME = "aws-sdk";
+
+    public SqsClientInstrumentation() {
+        super(INSTRUMENTATION_NAME);
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "com.amazonaws.handlers.HandlerChainFactory";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("newRequestHandler2Chain")),
+                SqsClientInstrumentation.class.getName() + "$HandlerChainAdvice");
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("com.amazonaws.AmazonWebServiceRequest", "datadog.context.Context");
+    }
+
+    public static class HandlerChainAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void addHandler(@Advice.Return final List<RequestHandler2> handlers) {
+            if (Config.get().isDataStreamsEnabled() || Config.get().isSqsInjectDatadogAttributeEnabled()) {
+                for (RequestHandler2 interceptor : handlers) {
+                    if (interceptor instanceof SqsInterceptor) {
+                        return; // list already has our interceptor, return to builder
+                    }
+                }
+                handlers.add(new SqsInterceptor(InstrumentationContext.get(
+                        "com.amazonaws.AmazonWebServiceRequest", "datadog.context.Context")));
+            }
         }
-        handlers.add(
-            new SqsInterceptor(
-                InstrumentationContext.get(
-                    "com.amazonaws.AmazonWebServiceRequest", "datadog.context.Context")));
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsDecorator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsDecorator.java
index a306525a91e..a4f3e43d139 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsDecorator.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsDecorator.java
@@ -13,78 +13,71 @@
 import java.util.function.Supplier;
 
 public class SqsDecorator extends MessagingClientDecorator {
-  static final CharSequence COMPONENT_NAME = UTF8BytesString.create("java-aws-sdk");
-  public static final CharSequence SQS_INBOUND_OPERATION =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().messaging().inboundOperation("sqs"));
-  public static final CharSequence SQS_RECEIVE = UTF8BytesString.create("SQS.ReceiveMessage");
-  public static final CharSequence SQS_DELIVER = UTF8BytesString.create("SQS.DeliverMessage");
-  public static final CharSequence SQS_TIME_IN_QUEUE_OPERATION =
-      SpanNaming.instance().namingSchema().messaging().timeInQueueOperation("sqs");
-  public static final boolean SQS_LEGACY_TRACING = Config.get().isSqsLegacyTracingEnabled();
-  public static final boolean TIME_IN_QUEUE_ENABLED =
-      Config.get().isTimeInQueueEnabled(!SQS_LEGACY_TRACING, "sqs");
-  private final String spanKind;
-  private final CharSequence spanType;
-  private final Supplier<String> serviceNameSupplier;
+    static final CharSequence COMPONENT_NAME = UTF8BytesString.create("java-aws-sdk");
+    public static final CharSequence SQS_INBOUND_OPERATION = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().messaging().inboundOperation("sqs"));
+    public static final CharSequence SQS_RECEIVE = UTF8BytesString.create("SQS.ReceiveMessage");
+    public static final CharSequence SQS_DELIVER = UTF8BytesString.create("SQS.DeliverMessage");
+    public static final CharSequence SQS_TIME_IN_QUEUE_OPERATION =
+            SpanNaming.instance().namingSchema().messaging().timeInQueueOperation("sqs");
+    public static final boolean SQS_LEGACY_TRACING = Config.get().isSqsLegacyTracingEnabled();
+    public static final boolean TIME_IN_QUEUE_ENABLED = Config.get().isTimeInQueueEnabled(!SQS_LEGACY_TRACING, "sqs");
+    private final String spanKind;
+    private final CharSequence spanType;
+    private final Supplier<String> serviceNameSupplier;
 
-  public static final SqsDecorator CONSUMER_DECORATE =
-      new SqsDecorator(
-          SPAN_KIND_CONSUMER,
-          MESSAGE_CONSUMER,
-          SpanNaming.instance()
-              .namingSchema()
-              .messaging()
-              .inboundService("sqs", SQS_LEGACY_TRACING));
+    public static final SqsDecorator CONSUMER_DECORATE = new SqsDecorator(
+            SPAN_KIND_CONSUMER,
+            MESSAGE_CONSUMER,
+            SpanNaming.instance().namingSchema().messaging().inboundService("sqs", SQS_LEGACY_TRACING));
 
-  public static final SqsDecorator BROKER_DECORATE =
-      new SqsDecorator(
-          SPAN_KIND_BROKER,
-          MESSAGE_BROKER,
-          SpanNaming.instance().namingSchema().messaging().timeInQueueService("sqs"));
+    public static final SqsDecorator BROKER_DECORATE = new SqsDecorator(
+            SPAN_KIND_BROKER,
+            MESSAGE_BROKER,
+            SpanNaming.instance().namingSchema().messaging().timeInQueueService("sqs"));
 
-  protected SqsDecorator(String spanKind, CharSequence spanType, Supplier<String> serviceName) {
-    this.spanKind = spanKind;
-    this.spanType = spanType;
-    this.serviceNameSupplier = serviceName;
-  }
+    protected SqsDecorator(String spanKind, CharSequence spanType, Supplier<String> serviceName) {
+        this.spanKind = spanKind;
+        this.spanType = spanType;
+        this.serviceNameSupplier = serviceName;
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return spanType;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return spanType;
+    }
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"aws-sdk"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"aws-sdk"};
+    }
 
-  @Override
-  protected String service() {
-    return serviceNameSupplier.get();
-  }
+    @Override
+    protected String service() {
+        return serviceNameSupplier.get();
+    }
 
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
 
-  @Override
-  protected String spanKind() {
-    return spanKind;
-  }
+    @Override
+    protected String spanKind() {
+        return spanKind;
+    }
 
-  public void onConsume(final AgentSpan span, final String queueUrl) {
-    span.setResourceName(SQS_RECEIVE);
-    span.setTag("aws.service", "AmazonSQS");
-    span.setTag("aws_service", "sqs");
-    span.setTag("aws.operation", "ReceiveMessageRequest");
-    span.setTag("aws.agent", COMPONENT_NAME);
-    span.setTag("aws.queue.url", queueUrl);
-  }
+    public void onConsume(final AgentSpan span, final String queueUrl) {
+        span.setResourceName(SQS_RECEIVE);
+        span.setTag("aws.service", "AmazonSQS");
+        span.setTag("aws_service", "sqs");
+        span.setTag("aws.operation", "ReceiveMessageRequest");
+        span.setTag("aws.agent", COMPONENT_NAME);
+        span.setTag("aws.queue.url", queueUrl);
+    }
 
-  public void onTimeInQueue(final AgentSpan span, final String queueUrl) {
-    span.setResourceName(SQS_DELIVER);
-    span.setTag("aws.queue.url", queueUrl);
-  }
+    public void onTimeInQueue(final AgentSpan span, final String queueUrl) {
+        span.setResourceName(SQS_DELIVER);
+        span.setTag("aws.queue.url", queueUrl);
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsInterceptor.java
index a9c199e1b7a..03bba3f30bc 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsInterceptor.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsInterceptor.java
@@ -28,75 +28,73 @@
 
 public class SqsInterceptor extends RequestHandler2 {
 
-  private final ContextStore<AmazonWebServiceRequest, Context> contextStore;
+    private final ContextStore<AmazonWebServiceRequest, Context> contextStore;
 
-  public SqsInterceptor(ContextStore<AmazonWebServiceRequest, Context> contextStore) {
-    this.contextStore = contextStore;
-  }
+    public SqsInterceptor(ContextStore<AmazonWebServiceRequest, Context> contextStore) {
+        this.contextStore = contextStore;
+    }
 
-  @Override
-  public AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest request) {
-    if (request instanceof SendMessageRequest) {
-      SendMessageRequest smRequest = (SendMessageRequest) request;
+    @Override
+    public AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest request) {
+        if (request instanceof SendMessageRequest) {
+            SendMessageRequest smRequest = (SendMessageRequest) request;
 
-      String queueUrl = smRequest.getQueueUrl();
-      if (queueUrl == null) return request;
+            String queueUrl = smRequest.getQueueUrl();
+            if (queueUrl == null) return request;
 
-      // making a copy of the MessageAttributes before modifying them because they can be stored in
-      // a kind of ImmutableMap
-      Map<String, MessageAttributeValue> messageAttributes =
-          new HashMap<>(smRequest.getMessageAttributes());
-      if (!messageAttributes.containsKey(DATADOG_KEY)) {
-        Context context = newContext(request, queueUrl);
-        defaultPropagator().inject(context, messageAttributes, SETTER);
-      }
-      // note: modifying message attributes has to be done before marshalling, otherwise the changes
-      // are not reflected in the actual request (and the MD5 check on send will fail).
-      smRequest.setMessageAttributes(messageAttributes);
-    } else if (request instanceof SendMessageBatchRequest) {
-      SendMessageBatchRequest smbRequest = (SendMessageBatchRequest) request;
+            // making a copy of the MessageAttributes before modifying them because they can be stored in
+            // a kind of ImmutableMap
+            Map<String, MessageAttributeValue> messageAttributes = new HashMap<>(smRequest.getMessageAttributes());
+            if (!messageAttributes.containsKey(DATADOG_KEY)) {
+                Context context = newContext(request, queueUrl);
+                defaultPropagator().inject(context, messageAttributes, SETTER);
+            }
+            // note: modifying message attributes has to be done before marshalling, otherwise the changes
+            // are not reflected in the actual request (and the MD5 check on send will fail).
+            smRequest.setMessageAttributes(messageAttributes);
+        } else if (request instanceof SendMessageBatchRequest) {
+            SendMessageBatchRequest smbRequest = (SendMessageBatchRequest) request;
 
-      String queueUrl = smbRequest.getQueueUrl();
-      if (queueUrl == null) return request;
+            String queueUrl = smbRequest.getQueueUrl();
+            if (queueUrl == null) return request;
 
-      Context context = newContext(request, queueUrl);
-      for (SendMessageBatchRequestEntry entry : smbRequest.getEntries()) {
-        Map<String, MessageAttributeValue> messageAttributes =
-            new HashMap<>(entry.getMessageAttributes());
-        if (!messageAttributes.containsKey(DATADOG_KEY)) {
-          defaultPropagator().inject(context, messageAttributes, SETTER);
+            Context context = newContext(request, queueUrl);
+            for (SendMessageBatchRequestEntry entry : smbRequest.getEntries()) {
+                Map<String, MessageAttributeValue> messageAttributes = new HashMap<>(entry.getMessageAttributes());
+                if (!messageAttributes.containsKey(DATADOG_KEY)) {
+                    defaultPropagator().inject(context, messageAttributes, SETTER);
+                }
+                entry.setMessageAttributes(messageAttributes);
+            }
+        } else if (request instanceof ReceiveMessageRequest) {
+            ReceiveMessageRequest rmRequest = (ReceiveMessageRequest) request;
+            if (Config.get().isSqsInjectDatadogAttributeEnabled()
+                    && rmRequest.getMessageAttributeNames().size() < 10
+                    && !rmRequest.getMessageAttributeNames().contains(DATADOG_KEY)) {
+                List<String> attributeNames = new ArrayList<>(rmRequest.getMessageAttributeNames());
+                attributeNames.add(DATADOG_KEY);
+                rmRequest.setMessageAttributeNames(attributeNames);
+            }
         }
-        entry.setMessageAttributes(messageAttributes);
-      }
-    } else if (request instanceof ReceiveMessageRequest) {
-      ReceiveMessageRequest rmRequest = (ReceiveMessageRequest) request;
-      if (Config.get().isSqsInjectDatadogAttributeEnabled()
-          && rmRequest.getMessageAttributeNames().size() < 10
-          && !rmRequest.getMessageAttributeNames().contains(DATADOG_KEY)) {
-        List<String> attributeNames = new ArrayList<>(rmRequest.getMessageAttributeNames());
-        attributeNames.add(DATADOG_KEY);
-        rmRequest.setMessageAttributeNames(attributeNames);
-      }
+        return request;
     }
-    return request;
-  }
 
-  private Context newContext(AmazonWebServiceRequest request, String queueUrl) {
-    AgentSpan span = newSpan(request);
-    DataStreamsContext dsmContext = DataStreamsContext.fromTags(getTags(queueUrl));
-    return span.with(dsmContext);
-  }
+    private Context newContext(AmazonWebServiceRequest request, String queueUrl) {
+        AgentSpan span = newSpan(request);
+        DataStreamsContext dsmContext = DataStreamsContext.fromTags(getTags(queueUrl));
+        return span.with(dsmContext);
+    }
 
-  private AgentSpan newSpan(AmazonWebServiceRequest request) {
-    final AgentSpan span = startSpan("java-aws-sdk", "aws.sqs.send");
-    // pass the span to TracingRequestHandler in the sdk instrumentation where it'll be enriched &
-    // activated
-    // TODO If DSM is enabled, add DSM context here too
-    contextStore.put(request, span);
-    return span;
-  }
+    private AgentSpan newSpan(AmazonWebServiceRequest request) {
+        final AgentSpan span = startSpan("java-aws-sdk", "aws.sqs.send");
+        // pass the span to TracingRequestHandler in the sdk instrumentation where it'll be enriched &
+        // activated
+        // TODO If DSM is enabled, add DSM context here too
+        contextStore.put(request, span);
+        return span;
+    }
 
-  private static DataStreamsTags getTags(String queueUrl) {
-    return create("sqs", OUTBOUND, urlFileName(queueUrl));
-  }
+    private static DataStreamsTags getTags(String queueUrl) {
+        return create("sqs", OUTBOUND, urlFileName(queueUrl));
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsJmsMessageInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsJmsMessageInstrumentation.java
index 9d43c3229b4..c13be7f29b4 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsJmsMessageInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsJmsMessageInstrumentation.java
@@ -19,57 +19,57 @@
 
 @AutoService(InstrumenterModule.class)
 public class SqsJmsMessageInstrumentation extends AbstractSqsInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public SqsJmsMessageInstrumentation() {
-    super("jms");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.amazon.sqs.javamessaging.message.SQSMessage";
-  }
+    public SqsJmsMessageInstrumentation() {
+        super("jms");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(2, named("com.amazonaws.services.sqs.model.Message"))),
-        getClass().getName() + "$JmsSqsMessageConstructorAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.amazon.sqs.javamessaging.message.SQSMessage";
+    }
 
-  public static class JmsSqsMessageConstructorAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(2) Message sqsMessage) {
-      Map<String, MessageAttributeValue> messageAttributes = sqsMessage.getMessageAttributes();
-      MessageAttributeValue ddAttribute = messageAttributes.get("_datadog");
-      if (ddAttribute != null && "Binary".equals(ddAttribute.getDataType())) {
-        // binary message attributes are not supported by amazon-sqs-java-messaging-lib, and there
-        // is a chance we might introduce one, either when the message was sent from SNS or from a
-        // DD-instrumented Javascript app.
-        // When we reach this point, the value would already have been used by the aws-sqs
-        // instrumentation, so we can safely remove it.
-        Map<String, MessageAttributeValue> messageAttributesCopy = new HashMap<>(messageAttributes);
-        // need to copy to remove because the original is an UnmodifiableMap
-        messageAttributesCopy.remove("_datadog");
-        sqsMessage.withMessageAttributes(messageAttributesCopy);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(2, named("com.amazonaws.services.sqs.model.Message"))),
+                getClass().getName() + "$JmsSqsMessageConstructorAdvice");
     }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Argument(2) Message sqsMessage, @Advice.FieldValue("properties") Map properties)
-        throws JMSException {
-      if (Config.get().isSqsPropagationEnabled()) {
-        Map<String, String> systemAttributes = sqsMessage.getAttributes();
-        if (null != systemAttributes) {
-          String awsTraceHeader = systemAttributes.get("AWSTraceHeader");
-          if (null != awsTraceHeader && !awsTraceHeader.isEmpty()) {
-            properties.put(
-                "x__dash__amzn__dash__trace__dash__id", // X-Amzn-Trace-Id, encoded for JMS
-                new SQSMessage.JMSMessagePropertyValue(awsTraceHeader, STRING));
-          }
+    public static class JmsSqsMessageConstructorAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(2) Message sqsMessage) {
+            Map<String, MessageAttributeValue> messageAttributes = sqsMessage.getMessageAttributes();
+            MessageAttributeValue ddAttribute = messageAttributes.get("_datadog");
+            if (ddAttribute != null && "Binary".equals(ddAttribute.getDataType())) {
+                // binary message attributes are not supported by amazon-sqs-java-messaging-lib, and there
+                // is a chance we might introduce one, either when the message was sent from SNS or from a
+                // DD-instrumented Javascript app.
+                // When we reach this point, the value would already have been used by the aws-sqs
+                // instrumentation, so we can safely remove it.
+                Map<String, MessageAttributeValue> messageAttributesCopy = new HashMap<>(messageAttributes);
+                // need to copy to remove because the original is an UnmodifiableMap
+                messageAttributesCopy.remove("_datadog");
+                sqsMessage.withMessageAttributes(messageAttributesCopy);
+            }
+        }
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Argument(2) Message sqsMessage, @Advice.FieldValue("properties") Map properties)
+                throws JMSException {
+            if (Config.get().isSqsPropagationEnabled()) {
+                Map<String, String> systemAttributes = sqsMessage.getAttributes();
+                if (null != systemAttributes) {
+                    String awsTraceHeader = systemAttributes.get("AWSTraceHeader");
+                    if (null != awsTraceHeader && !awsTraceHeader.isEmpty()) {
+                        properties.put(
+                                "x__dash__amzn__dash__trace__dash__id", // X-Amzn-Trace-Id, encoded for JMS
+                                new SQSMessage.JMSMessagePropertyValue(awsTraceHeader, STRING));
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveRequestInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveRequestInstrumentation.java
index 0e133aa121e..7f0cb2f5a39 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveRequestInstrumentation.java
@@ -14,33 +14,33 @@
 
 @AutoService(InstrumenterModule.class)
 public class SqsReceiveRequestInstrumentation extends AbstractSqsInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.amazonaws.services.sqs.model.ReceiveMessageRequest";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.amazonaws.services.sqs.model.ReceiveMessageRequest";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().or(isMethod().and(namedOneOf("setAttributeNames", "withAttributeNames"))),
-        getClass().getName() + "$ReceiveMessageRequestAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().or(isMethod().and(namedOneOf("setAttributeNames", "withAttributeNames"))),
+                getClass().getName() + "$ReceiveMessageRequestAdvice");
+    }
 
-  public static class ReceiveMessageRequestAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(@Advice.This ReceiveMessageRequest request) {
-      if (Config.get().isSqsPropagationEnabled()) {
-        // ReceiveMessageRequest always returns a mutable list which we can append to
-        List<String> attributeNames = request.getAttributeNames();
-        for (String name : attributeNames) {
-          if ("AWSTraceHeader".equals(name) || "All".equals(name)) {
-            return;
-          }
+    public static class ReceiveMessageRequestAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(@Advice.This ReceiveMessageRequest request) {
+            if (Config.get().isSqsPropagationEnabled()) {
+                // ReceiveMessageRequest always returns a mutable list which we can append to
+                List<String> attributeNames = request.getAttributeNames();
+                for (String name : attributeNames) {
+                    if ("AWSTraceHeader".equals(name) || "All".equals(name)) {
+                        return;
+                    }
+                }
+                attributeNames.add("AWSTraceHeader");
+            }
         }
-        attributeNames.add("AWSTraceHeader");
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java
index 99bcba2fe47..a6bb9c602b2 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java
@@ -17,44 +17,41 @@
 
 @AutoService(InstrumenterModule.class)
 public class SqsReceiveResultInstrumentation extends AbstractSqsInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  @Override
-  public String instrumentedType() {
-    return "com.amazonaws.services.sqs.model.ReceiveMessageResult";
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled()
-        // we don't need to instrument messages when we're doing legacy AWS-SDK tracing
-        && !InstrumenterConfig.get().isLegacyInstrumentationEnabled(false, "aws-sdk");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(
-        "com.amazonaws.services.sqs.model.ReceiveMessageResult", "java.lang.String");
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("getMessages")), getClass().getName() + "$GetMessagesAdvice");
-  }
-
-  public static class GetMessagesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This ReceiveMessageResult result,
-        @Advice.Return(readOnly = false) List<Message> messages) {
-      if (messages != null && !messages.isEmpty() && !(messages instanceof TracingList)) {
-        String queueUrl =
-            InstrumentationContext.get(ReceiveMessageResult.class, String.class).get(result);
-        if (queueUrl != null) {
-          messages = new TracingList(messages, queueUrl);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    @Override
+    public String instrumentedType() {
+        return "com.amazonaws.services.sqs.model.ReceiveMessageResult";
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled()
+                // we don't need to instrument messages when we're doing legacy AWS-SDK tracing
+                && !InstrumenterConfig.get().isLegacyInstrumentationEnabled(false, "aws-sdk");
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("com.amazonaws.services.sqs.model.ReceiveMessageResult", "java.lang.String");
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isMethod().and(named("getMessages")), getClass().getName() + "$GetMessagesAdvice");
+    }
+
+    public static class GetMessagesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This ReceiveMessageResult result, @Advice.Return(readOnly = false) List<Message> messages) {
+            if (messages != null && !messages.isEmpty() && !(messages instanceof TracingList)) {
+                String queueUrl = InstrumentationContext.get(ReceiveMessageResult.class, String.class)
+                        .get(result);
+                if (queueUrl != null) {
+                    messages = new TracingList(messages, queueUrl);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java
index c6d6b40cc59..2f10b2a6147 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java
@@ -30,106 +30,106 @@
 import org.slf4j.LoggerFactory;
 
 public class TracingIterator<L extends Iterator<Message>> implements Iterator<Message> {
-  private static final Logger log = LoggerFactory.getLogger(TracingIterator.class);
+    private static final Logger log = LoggerFactory.getLogger(TracingIterator.class);
 
-  protected final L delegate;
-  private final String queueUrl;
-  private AgentSpanContext batchContext;
+    protected final L delegate;
+    private final String queueUrl;
+    private AgentSpanContext batchContext;
 
-  public TracingIterator(L delegate, String queueUrl) {
-    this.delegate = delegate;
-    this.queueUrl = queueUrl;
-  }
+    public TracingIterator(L delegate, String queueUrl) {
+        this.delegate = delegate;
+        this.queueUrl = queueUrl;
+    }
 
-  @Override
-  public boolean hasNext() {
-    boolean moreMessages = delegate.hasNext();
-    if (!moreMessages) {
-      // no more messages, use this as a signal to close the last iteration scope
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        closePrevious(true);
-      } else {
-        final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
-        if (previousSpan != null) {
-          previousSpan.finishWithEndToEnd();
+    @Override
+    public boolean hasNext() {
+        boolean moreMessages = delegate.hasNext();
+        if (!moreMessages) {
+            // no more messages, use this as a signal to close the last iteration scope
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                closePrevious(true);
+            } else {
+                final AgentSpan previousSpan =
+                        AgentSpan.fromContext(Context.root().swap());
+                if (previousSpan != null) {
+                    previousSpan.finishWithEndToEnd();
+                }
+            }
         }
-      }
+        return moreMessages;
     }
-    return moreMessages;
-  }
 
-  @Override
-  public Message next() {
-    Message next = delegate.next();
-    startNewMessageSpan(next);
-    return next;
-  }
+    @Override
+    public Message next() {
+        Message next = delegate.next();
+        startNewMessageSpan(next);
+        return next;
+    }
 
-  protected void startNewMessageSpan(Message message) {
-    try {
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        closePrevious(true);
-      } else if (message == null) { // previous message span was the last
-        final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
-        if (previousSpan != null) {
-          previousSpan.finishWithEndToEnd();
-        }
-      }
-      if (message != null) {
-        AgentSpan queueSpan = null;
-        if (batchContext == null) {
-          // first grab any incoming distributed context
-          AgentSpanContext spanContext =
-              Config.get().isSqsPropagationEnabled()
-                  ? extractContextAndGetSpanContext(message, GETTER)
-                  : null;
-          // next add a time-in-queue span for non-legacy SQS traces
-          if (TIME_IN_QUEUE_ENABLED) {
-            long timeInQueueStart = GETTER.extractTimeInQueueStart(message);
-            if (timeInQueueStart > 0) {
-              queueSpan =
-                  startSpan(
-                      COMPONENT_NAME.toString(),
-                      SQS_TIME_IN_QUEUE_OPERATION,
-                      spanContext,
-                      MILLISECONDS.toMicros(timeInQueueStart));
-              BROKER_DECORATE.afterStart(queueSpan);
-              BROKER_DECORATE.onTimeInQueue(queueSpan, queueUrl);
-              spanContext = queueSpan.spanContext();
-              // The queueSpan will be finished after inner span has been activated to ensure that
-              // spans are written out together by TraceStructureWriter when running in strict mode
+    protected void startNewMessageSpan(Message message) {
+        try {
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                closePrevious(true);
+            } else if (message == null) { // previous message span was the last
+                final AgentSpan previousSpan =
+                        AgentSpan.fromContext(Context.root().swap());
+                if (previousSpan != null) {
+                    previousSpan.finishWithEndToEnd();
+                }
             }
-          }
-          // re-use this context for any other messages received in this batch
-          batchContext = spanContext;
-        }
-        AgentSpan span = startSpan(COMPONENT_NAME.toString(), SQS_INBOUND_OPERATION, batchContext);
+            if (message != null) {
+                AgentSpan queueSpan = null;
+                if (batchContext == null) {
+                    // first grab any incoming distributed context
+                    AgentSpanContext spanContext = Config.get().isSqsPropagationEnabled()
+                            ? extractContextAndGetSpanContext(message, GETTER)
+                            : null;
+                    // next add a time-in-queue span for non-legacy SQS traces
+                    if (TIME_IN_QUEUE_ENABLED) {
+                        long timeInQueueStart = GETTER.extractTimeInQueueStart(message);
+                        if (timeInQueueStart > 0) {
+                            queueSpan = startSpan(
+                                    COMPONENT_NAME.toString(),
+                                    SQS_TIME_IN_QUEUE_OPERATION,
+                                    spanContext,
+                                    MILLISECONDS.toMicros(timeInQueueStart));
+                            BROKER_DECORATE.afterStart(queueSpan);
+                            BROKER_DECORATE.onTimeInQueue(queueSpan, queueUrl);
+                            spanContext = queueSpan.spanContext();
+                            // The queueSpan will be finished after inner span has been activated to ensure that
+                            // spans are written out together by TraceStructureWriter when running in strict mode
+                        }
+                    }
+                    // re-use this context for any other messages received in this batch
+                    batchContext = spanContext;
+                }
+                AgentSpan span = startSpan(COMPONENT_NAME.toString(), SQS_INBOUND_OPERATION, batchContext);
 
-        DataStreamsTags tags = create("sqs", INBOUND, urlFileName(queueUrl));
-        AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, create(tags, 0, 0));
+                DataStreamsTags tags = create("sqs", INBOUND, urlFileName(queueUrl));
+                AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, create(tags, 0, 0));
 
-        CONSUMER_DECORATE.afterStart(span);
-        CONSUMER_DECORATE.onConsume(span, queueUrl);
-        if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-          activateNext(span);
-        } else {
-          final AgentSpan previousSpan = AgentSpan.fromContext(span.swap());
-          if (previousSpan != null) {
-            previousSpan.finishWithEndToEnd();
-          }
-        }
-        if (queueSpan != null) {
-          BROKER_DECORATE.beforeFinish(queueSpan);
-          queueSpan.finish();
+                CONSUMER_DECORATE.afterStart(span);
+                CONSUMER_DECORATE.onConsume(span, queueUrl);
+                if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                    activateNext(span);
+                } else {
+                    final AgentSpan previousSpan = AgentSpan.fromContext(span.swap());
+                    if (previousSpan != null) {
+                        previousSpan.finishWithEndToEnd();
+                    }
+                }
+                if (queueSpan != null) {
+                    BROKER_DECORATE.beforeFinish(queueSpan);
+                    queueSpan.finish();
+                }
+            }
+        } catch (Exception e) {
+            log.debug("Problem tracing new SQS message span", e);
         }
-      }
-    } catch (Exception e) {
-      log.debug("Problem tracing new SQS message span", e);
     }
-  }
 
-  @Override
-  public void remove() {
-    delegate.remove();
-  }
+    @Override
+    public void remove() {
+        delegate.remove();
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingList.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingList.java
index 574b6ef52cc..5129e0f5a99 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingList.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingList.java
@@ -7,132 +7,132 @@
 import java.util.ListIterator;
 
 public class TracingList implements List<Message> {
-  private final List<Message> delegate;
-  private final String queueUrl;
-
-  public TracingList(List<Message> delegate, String queueUrl) {
-    this.delegate = delegate;
-    this.queueUrl = queueUrl;
-  }
-
-  @Override
-  public int size() {
-    return delegate.size();
-  }
-
-  @Override
-  public boolean isEmpty() {
-    return delegate.isEmpty();
-  }
-
-  @Override
-  public boolean contains(Object o) {
-    return delegate.contains(o);
-  }
-
-  @Override
-  public Iterator<Message> iterator() {
-    return listIterator(0);
-  }
-
-  @Override
-  public Object[] toArray() {
-    return delegate.toArray();
-  }
-
-  @Override
-  public <T> T[] toArray(T[] a) {
-    return delegate.toArray(a);
-  }
-
-  @Override
-  public boolean add(Message message) {
-    return delegate.add(message);
-  }
-
-  @Override
-  public boolean remove(Object o) {
-    return delegate.remove(o);
-  }
-
-  @Override
-  public boolean containsAll(Collection<?> c) {
-    return delegate.containsAll(c);
-  }
-
-  @Override
-  public boolean addAll(Collection<? extends Message> c) {
-    return delegate.addAll(c);
-  }
-
-  @Override
-  public boolean addAll(int index, Collection<? extends Message> c) {
-    return delegate.addAll(index, c);
-  }
-
-  @Override
-  public boolean removeAll(Collection<?> c) {
-    return delegate.removeAll(c);
-  }
-
-  @Override
-  public boolean retainAll(Collection<?> c) {
-    return delegate.retainAll(c);
-  }
-
-  @Override
-  public void clear() {
-    delegate.clear();
-  }
-
-  @Override
-  public Message get(int index) {
-    return delegate.get(index); // not currently covered by iteration span
-  }
-
-  @Override
-  public Message set(int index, Message element) {
-    return delegate.set(index, element);
-  }
-
-  @Override
-  public void add(int index, Message element) {
-    delegate.add(index, element);
-  }
-
-  @Override
-  public Message remove(int index) {
-    return delegate.remove(index);
-  }
-
-  @Override
-  public int indexOf(Object o) {
-    return delegate.indexOf(o);
-  }
-
-  @Override
-  public int lastIndexOf(Object o) {
-    return delegate.lastIndexOf(o);
-  }
-
-  @Override
-  public ListIterator<Message> listIterator() {
-    return listIterator(0);
-  }
-
-  @Override
-  public ListIterator<Message> listIterator(int index) {
-    // every iteration will add spans. Not only the very first one
-    return new TracingListIterator(delegate.listIterator(index), queueUrl);
-  }
-
-  @Override
-  public List<Message> subList(int fromIndex, int toIndex) {
-    return new TracingList(delegate.subList(fromIndex, toIndex), queueUrl);
-  }
-
-  @Override
-  public String toString() {
-    return delegate.toString();
-  }
+    private final List<Message> delegate;
+    private final String queueUrl;
+
+    public TracingList(List<Message> delegate, String queueUrl) {
+        this.delegate = delegate;
+        this.queueUrl = queueUrl;
+    }
+
+    @Override
+    public int size() {
+        return delegate.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return delegate.isEmpty();
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return delegate.contains(o);
+    }
+
+    @Override
+    public Iterator<Message> iterator() {
+        return listIterator(0);
+    }
+
+    @Override
+    public Object[] toArray() {
+        return delegate.toArray();
+    }
+
+    @Override
+    public <T> T[] toArray(T[] a) {
+        return delegate.toArray(a);
+    }
+
+    @Override
+    public boolean add(Message message) {
+        return delegate.add(message);
+    }
+
+    @Override
+    public boolean remove(Object o) {
+        return delegate.remove(o);
+    }
+
+    @Override
+    public boolean containsAll(Collection<?> c) {
+        return delegate.containsAll(c);
+    }
+
+    @Override
+    public boolean addAll(Collection<? extends Message> c) {
+        return delegate.addAll(c);
+    }
+
+    @Override
+    public boolean addAll(int index, Collection<? extends Message> c) {
+        return delegate.addAll(index, c);
+    }
+
+    @Override
+    public boolean removeAll(Collection<?> c) {
+        return delegate.removeAll(c);
+    }
+
+    @Override
+    public boolean retainAll(Collection<?> c) {
+        return delegate.retainAll(c);
+    }
+
+    @Override
+    public void clear() {
+        delegate.clear();
+    }
+
+    @Override
+    public Message get(int index) {
+        return delegate.get(index); // not currently covered by iteration span
+    }
+
+    @Override
+    public Message set(int index, Message element) {
+        return delegate.set(index, element);
+    }
+
+    @Override
+    public void add(int index, Message element) {
+        delegate.add(index, element);
+    }
+
+    @Override
+    public Message remove(int index) {
+        return delegate.remove(index);
+    }
+
+    @Override
+    public int indexOf(Object o) {
+        return delegate.indexOf(o);
+    }
+
+    @Override
+    public int lastIndexOf(Object o) {
+        return delegate.lastIndexOf(o);
+    }
+
+    @Override
+    public ListIterator<Message> listIterator() {
+        return listIterator(0);
+    }
+
+    @Override
+    public ListIterator<Message> listIterator(int index) {
+        // every iteration will add spans. Not only the very first one
+        return new TracingListIterator(delegate.listIterator(index), queueUrl);
+    }
+
+    @Override
+    public List<Message> subList(int fromIndex, int toIndex) {
+        return new TracingList(delegate.subList(fromIndex, toIndex), queueUrl);
+    }
+
+    @Override
+    public String toString() {
+        return delegate.toString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingListIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingListIterator.java
index d7f8174cd8c..86994be0642 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingListIterator.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingListIterator.java
@@ -8,54 +8,54 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import java.util.ListIterator;
 
-public class TracingListIterator extends TracingIterator<ListIterator<Message>>
-    implements ListIterator<Message> {
-
-  public TracingListIterator(ListIterator<Message> delegate, String queueUrl) {
-    super(delegate, queueUrl);
-  }
-
-  @Override
-  public boolean hasPrevious() {
-    boolean moreMessages = delegate.hasPrevious();
-    if (!moreMessages) {
-      // no more messages, use this as a signal to close the last iteration scope
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        closePrevious(true);
-      } else {
-        final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
-        if (previousSpan != null) {
-          previousSpan.finishWithEndToEnd();
+public class TracingListIterator extends TracingIterator<ListIterator<Message>> implements ListIterator<Message> {
+
+    public TracingListIterator(ListIterator<Message> delegate, String queueUrl) {
+        super(delegate, queueUrl);
+    }
+
+    @Override
+    public boolean hasPrevious() {
+        boolean moreMessages = delegate.hasPrevious();
+        if (!moreMessages) {
+            // no more messages, use this as a signal to close the last iteration scope
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                closePrevious(true);
+            } else {
+                final AgentSpan previousSpan =
+                        AgentSpan.fromContext(Context.root().swap());
+                if (previousSpan != null) {
+                    previousSpan.finishWithEndToEnd();
+                }
+            }
         }
-      }
+        return moreMessages;
+    }
+
+    @Override
+    public Message previous() {
+        Message prev = delegate.previous();
+        startNewMessageSpan(prev);
+        return prev;
+    }
+
+    @Override
+    public int nextIndex() {
+        return delegate.nextIndex();
+    }
+
+    @Override
+    public int previousIndex() {
+        return delegate.previousIndex();
+    }
+
+    @Override
+    public void set(Message message) {
+        delegate.set(message);
+    }
+
+    @Override
+    public void add(Message message) {
+        delegate.add(message);
     }
-    return moreMessages;
-  }
-
-  @Override
-  public Message previous() {
-    Message prev = delegate.previous();
-    startNewMessageSpan(prev);
-    return prev;
-  }
-
-  @Override
-  public int nextIndex() {
-    return delegate.nextIndex();
-  }
-
-  @Override
-  public int previousIndex() {
-    return delegate.previousIndex();
-  }
-
-  @Override
-  public void set(Message message) {
-    delegate.set(message);
-  }
-
-  @Override
-  public void add(Message message) {
-    delegate.add(message);
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/test/java/datadog/trace/instrumentation/aws/v1/sqs/MessageExtractAdapterTest.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/test/java/datadog/trace/instrumentation/aws/v1/sqs/MessageExtractAdapterTest.java
index b7a0395fe75..b119148a7c8 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/test/java/datadog/trace/instrumentation/aws/v1/sqs/MessageExtractAdapterTest.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/test/java/datadog/trace/instrumentation/aws/v1/sqs/MessageExtractAdapterTest.java
@@ -17,122 +17,108 @@
 import org.junit.jupiter.api.Test;
 
 class MessageExtractAdapterTest {
-  private static final ObjectMapper MAPPER = new ObjectMapper();
-  private static final String CONTEXT =
-      "{\"x-datadog-trace-id\":\"123\",\"x-datadog-parent-id\":\"456\"}";
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+    private static final String CONTEXT = "{\"x-datadog-trace-id\":\"123\",\"x-datadog-parent-id\":\"456\"}";
 
-  private static String attribute(String type, String value) throws IOException {
-    return "{\"Type\":"
-        + MAPPER.writeValueAsString(type)
-        + ",\"Value\":"
-        + MAPPER.writeValueAsString(value)
-        + "}";
-  }
+    private static String attribute(String type, String value) throws IOException {
+        return "{\"Type\":" + MAPPER.writeValueAsString(type) + ",\"Value\":" + MAPPER.writeValueAsString(value) + "}";
+    }
 
-  private static List<String> extract(String body, boolean baseline) throws IOException {
-    List<String> result = new ArrayList<>();
-    AgentPropagation.KeyClassifier classifier =
-        (key, value) -> {
-          result.add(key + "=" + value);
-          return true;
+    private static List<String> extract(String body, boolean baseline) throws IOException {
+        List<String> result = new ArrayList<>();
+        AgentPropagation.KeyClassifier classifier = (key, value) -> {
+            result.add(key + "=" + value);
+            return true;
         };
-    if (baseline) {
-      JsonNode node = MAPPER.readTree(body).path("MessageAttributes").path("_datadog");
-      String value = node.path("Value").asText();
-      String type = node.path("Type").asText();
-      if ("String".equals(type)) {
-        DatadogAttributeParser.forEachProperty(classifier, value);
-      } else if ("Binary".equals(type)) {
-        DatadogAttributeParser.forEachProperty(
-            classifier, ByteBuffer.wrap(Base64.getDecoder().decode(value)));
-      }
-    } else {
-      MessageExtractAdapter.GETTER.forEachKeyInBody(body, classifier);
+        if (baseline) {
+            JsonNode node = MAPPER.readTree(body).path("MessageAttributes").path("_datadog");
+            String value = node.path("Value").asText();
+            String type = node.path("Type").asText();
+            if ("String".equals(type)) {
+                DatadogAttributeParser.forEachProperty(classifier, value);
+            } else if ("Binary".equals(type)) {
+                DatadogAttributeParser.forEachProperty(
+                        classifier, ByteBuffer.wrap(Base64.getDecoder().decode(value)));
+            }
+        } else {
+            MessageExtractAdapter.GETTER.forEachKeyInBody(body, classifier);
+        }
+        return result;
     }
-    return result;
-  }
 
-  @Test
-  void extractsStringAndBinaryWithEitherFieldOrder() throws IOException {
-    for (String type : new String[] {"String", "Binary"}) {
-      String value =
-          "Binary".equals(type)
-              ? Base64.getEncoder().encodeToString(CONTEXT.getBytes(UTF_8))
-              : CONTEXT;
-      String attr = attribute(type, value);
-      String reversed =
-          "{\"Value\":" + MAPPER.writeValueAsString(value) + ",\"Type\":\"" + type + "\"}";
-      for (String a : new String[] {attr, reversed}) {
-        String body =
-            "{\"Message\":\"ignored\",\"MessageAttributes\":{\"other\":{\"nested\":[1,2]},\"_datadog\":"
-                + a
-                + "},\"tail\":[{},true]}";
-        assertEquals(extract(body, true), extract(body, false));
-        assertEquals(2, extract(body, false).size());
-      }
+    @Test
+    void extractsStringAndBinaryWithEitherFieldOrder() throws IOException {
+        for (String type : new String[] {"String", "Binary"}) {
+            String value =
+                    "Binary".equals(type) ? Base64.getEncoder().encodeToString(CONTEXT.getBytes(UTF_8)) : CONTEXT;
+            String attr = attribute(type, value);
+            String reversed = "{\"Value\":" + MAPPER.writeValueAsString(value) + ",\"Type\":\"" + type + "\"}";
+            for (String a : new String[] {attr, reversed}) {
+                String body =
+                        "{\"Message\":\"ignored\",\"MessageAttributes\":{\"other\":{\"nested\":[1,2]},\"_datadog\":"
+                                + a
+                                + "},\"tail\":[{},true]}";
+                assertEquals(extract(body, true), extract(body, false));
+                assertEquals(2, extract(body, false).size());
+            }
+        }
     }
-  }
 
-  @Test
-  void preservesLastDuplicateAtEveryLevel() throws IOException {
-    String attr = attribute("String", CONTEXT);
-    String attrs = "{\"_datadog\":" + attr + "}";
-    String[] bodies = {
-      "{\"MessageAttributes\":" + attrs + ",\"MessageAttributes\":{}}",
-      "{\"MessageAttributes\":{},\"MessageAttributes\":" + attrs + "}",
-      "{\"MessageAttributes\":" + attrs + ",\"MessageAttributes\":null}",
-      "{\"MessageAttributes\":{\"_datadog\":" + attr + ",\"_datadog\":null}}",
-      "{\"MessageAttributes\":{\"_datadog\":null,\"_datadog\":" + attr + "}}",
-      "{\"MessageAttributes\":{\"_datadog\":{\"Type\":\"Binary\",\"Type\":\"String\",\"Value\":false,\"Value\":"
-          + MAPPER.writeValueAsString(CONTEXT)
-          + "}}}",
-      "{\"MessageAttributes\":{" + "\"_datadog\":" + attr + ",\"other\":1}}"
-    };
-    for (String body : bodies) assertEquals(extract(body, true), extract(body, false), body);
-  }
-
-  @Test
-  void ignoresUnrelatedFieldsAndPreservesNodeConversions() throws IOException {
-    String attr = attribute("String", CONTEXT);
-    for (String value : new String[] {"null", "true", "123", "1.25", "[]", "{}", "\"\""}) {
-      String[] bodies = {
-        "{\"MessageAttributes\":" + value + "}",
-        "{\"MessageAttributes\":{\"_datadog\":" + value + "}}",
-        "{\"MessageAttributes\":{\"_datadog\":{\"Type\":\"String\",\"Value\":" + value + "}}}",
-        "{\"nested\":{\"MessageAttributes\":{\"_datadog\":" + attr + "}},\"other\":" + value + "}"
-      };
-      for (String body : bodies) assertEquals(extract(body, true), extract(body, false), body);
+    @Test
+    void preservesLastDuplicateAtEveryLevel() throws IOException {
+        String attr = attribute("String", CONTEXT);
+        String attrs = "{\"_datadog\":" + attr + "}";
+        String[] bodies = {
+            "{\"MessageAttributes\":" + attrs + ",\"MessageAttributes\":{}}",
+            "{\"MessageAttributes\":{},\"MessageAttributes\":" + attrs + "}",
+            "{\"MessageAttributes\":" + attrs + ",\"MessageAttributes\":null}",
+            "{\"MessageAttributes\":{\"_datadog\":" + attr + ",\"_datadog\":null}}",
+            "{\"MessageAttributes\":{\"_datadog\":null,\"_datadog\":" + attr + "}}",
+            "{\"MessageAttributes\":{\"_datadog\":{\"Type\":\"Binary\",\"Type\":\"String\",\"Value\":false,\"Value\":"
+                    + MAPPER.writeValueAsString(CONTEXT)
+                    + "}}}",
+            "{\"MessageAttributes\":{" + "\"_datadog\":" + attr + ",\"other\":1}}"
+        };
+        for (String body : bodies) assertEquals(extract(body, true), extract(body, false), body);
     }
-    for (String body : new String[] {"{}", "[]", "null", "42", "\"plain text\""}) {
-      assertEquals(extract(body, true), extract(body, false), body);
+
+    @Test
+    void ignoresUnrelatedFieldsAndPreservesNodeConversions() throws IOException {
+        String attr = attribute("String", CONTEXT);
+        for (String value : new String[] {"null", "true", "123", "1.25", "[]", "{}", "\"\""}) {
+            String[] bodies = {
+                "{\"MessageAttributes\":" + value + "}",
+                "{\"MessageAttributes\":{\"_datadog\":" + value + "}}",
+                "{\"MessageAttributes\":{\"_datadog\":{\"Type\":\"String\",\"Value\":" + value + "}}}",
+                "{\"nested\":{\"MessageAttributes\":{\"_datadog\":" + attr + "}},\"other\":" + value + "}"
+            };
+            for (String body : bodies) assertEquals(extract(body, true), extract(body, false), body);
+        }
+        for (String body : new String[] {"{}", "[]", "null", "42", "\"plain text\""}) {
+            assertEquals(extract(body, true), extract(body, false), body);
+        }
     }
-  }
 
-  @Test
-  void validatesTheEnvelopeBeforePublishingContext() throws IOException {
-    String prefix = "{\"MessageAttributes\":{\"_datadog\":" + attribute("String", CONTEXT) + "}";
-    for (String suffix :
-        new String[] {"", ",\"tail\":[1,]}", ",\"tail\":\"\\uZZZZ\"}", ",\"tail\":{\"x\":}}"}) {
-      String body = prefix + suffix;
-      List<String> observed = new ArrayList<>();
-      assertThrows(IOException.class, () -> extract(body, true));
-      assertThrows(
-          IOException.class,
-          () ->
-              MessageExtractAdapter.GETTER.forEachKeyInBody(
-                  body,
-                  (key, value) -> {
-                    observed.add(key);
-                    return true;
-                  }));
-      assertTrue(observed.isEmpty());
+    @Test
+    void validatesTheEnvelopeBeforePublishingContext() throws IOException {
+        String prefix = "{\"MessageAttributes\":{\"_datadog\":" + attribute("String", CONTEXT) + "}";
+        for (String suffix : new String[] {"", ",\"tail\":[1,]}", ",\"tail\":\"\\uZZZZ\"}", ",\"tail\":{\"x\":}}"}) {
+            String body = prefix + suffix;
+            List<String> observed = new ArrayList<>();
+            assertThrows(IOException.class, () -> extract(body, true));
+            assertThrows(
+                    IOException.class,
+                    () -> MessageExtractAdapter.GETTER.forEachKeyInBody(body, (key, value) -> {
+                        observed.add(key);
+                        return true;
+                    }));
+            assertTrue(observed.isEmpty());
+        }
     }
-  }
 
-  @Test
-  void preservesIgnoringTrailingRootValues() throws IOException {
-    String body =
-        "{\"MessageAttributes\":{\"_datadog\":" + attribute("String", CONTEXT) + "}} trailing";
-    assertEquals(extract(body, true), extract(body, false));
-  }
+    @Test
+    void preservesIgnoringTrailingRootValues() throws IOException {
+        String body = "{\"MessageAttributes\":{\"_datadog\":" + attribute("String", CONTEXT) + "}} trailing";
+        assertEquals(extract(body, true), extract(body, false));
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageAttributeInjector.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageAttributeInjector.java
index 144e29cfbba..7c01941d9ff 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageAttributeInjector.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageAttributeInjector.java
@@ -11,52 +11,52 @@
 @ParametersAreNonnullByDefault
 public class MessageAttributeInjector implements CarrierSetter<Map<String, MessageAttributeValue>> {
 
-  public static final MessageAttributeInjector SETTER = new MessageAttributeInjector();
+    public static final MessageAttributeInjector SETTER = new MessageAttributeInjector();
 
-  @Override
-  public void set(
-      final Map<String, MessageAttributeValue> carrier, final String key, final String value) {
-    if (!Config.get().isSqsInjectDatadogAttributeEnabled()) {
-      return;
+    @Override
+    public void set(final Map<String, MessageAttributeValue> carrier, final String key, final String value) {
+        if (!Config.get().isSqsInjectDatadogAttributeEnabled()) {
+            return;
+        }
+        // A single propagator.inject() call invokes set() once per header key (e.g.
+        // x-datadog-trace-id, x-datadog-parent-id, dd-pathway-ctx-base64). All of them must be
+        // accumulated into the same _datadog JSON attribute rather than overwriting each other.
+        if (!carrier.containsKey(DATADOG_KEY)) {
+            if (carrier.size() >= 10) {
+                return;
+            }
+            carrier.put(
+                    DATADOG_KEY,
+                    MessageAttributeValue.builder()
+                            .dataType("String")
+                            .stringValue("{\"" + key + "\": \"" + value + "\"}")
+                            .build());
+        } else {
+            // _datadog was created by an earlier set() call in this same inject session; append to it.
+            String existing = carrier.get(DATADOG_KEY).stringValue();
+            if (existing == null) {
+                return;
+            }
+            int closingBrace = existing.lastIndexOf('}');
+            if (closingBrace >= 0) {
+                String updated = new StringBuilder(closingBrace
+                                + String.valueOf(key).length()
+                                + String.valueOf(value).length()
+                                + 9)
+                        .append(existing, 0, closingBrace)
+                        .append(", \"")
+                        .append(key)
+                        .append("\": \"")
+                        .append(value)
+                        .append("\"}")
+                        .toString();
+                carrier.put(
+                        DATADOG_KEY,
+                        MessageAttributeValue.builder()
+                                .dataType("String")
+                                .stringValue(updated)
+                                .build());
+            }
+        }
     }
-    // A single propagator.inject() call invokes set() once per header key (e.g.
-    // x-datadog-trace-id, x-datadog-parent-id, dd-pathway-ctx-base64). All of them must be
-    // accumulated into the same _datadog JSON attribute rather than overwriting each other.
-    if (!carrier.containsKey(DATADOG_KEY)) {
-      if (carrier.size() >= 10) {
-        return;
-      }
-      carrier.put(
-          DATADOG_KEY,
-          MessageAttributeValue.builder()
-              .dataType("String")
-              .stringValue("{\"" + key + "\": \"" + value + "\"}")
-              .build());
-    } else {
-      // _datadog was created by an earlier set() call in this same inject session; append to it.
-      String existing = carrier.get(DATADOG_KEY).stringValue();
-      if (existing == null) {
-        return;
-      }
-      int closingBrace = existing.lastIndexOf('}');
-      if (closingBrace >= 0) {
-        String updated =
-            new StringBuilder(
-                    closingBrace
-                        + String.valueOf(key).length()
-                        + String.valueOf(value).length()
-                        + 9)
-                .append(existing, 0, closingBrace)
-                .append(", \"")
-                .append(key)
-                .append("\": \"")
-                .append(value)
-                .append("\"}")
-                .toString();
-        carrier.put(
-            DATADOG_KEY,
-            MessageAttributeValue.builder().dataType("String").stringValue(updated).build());
-      }
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageExtractAdapter.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageExtractAdapter.java
index 18ed90ff4a2..66dbddac813 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageExtractAdapter.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageExtractAdapter.java
@@ -9,37 +9,38 @@
 import software.amazon.awssdk.services.sqs.model.MessageAttributeValue;
 
 public final class MessageExtractAdapter implements AgentPropagation.ContextVisitor<Message> {
-  private static final Logger log = LoggerFactory.getLogger(MessageExtractAdapter.class);
+    private static final Logger log = LoggerFactory.getLogger(MessageExtractAdapter.class);
 
-  public static final MessageExtractAdapter GETTER = new MessageExtractAdapter();
+    public static final MessageExtractAdapter GETTER = new MessageExtractAdapter();
 
-  @Override
-  public void forEachKey(Message carrier, AgentPropagation.KeyClassifier classifier) {
-    Map<String, String> systemAttributes = carrier.attributesAsStrings();
-    if (systemAttributes.containsKey("AWSTraceHeader")) {
-      // alias 'AWSTraceHeader' to 'X-Amzn-Trace-Id' because it uses the same format
-      classifier.accept("X-Amzn-Trace-Id", systemAttributes.get("AWSTraceHeader"));
+    @Override
+    public void forEachKey(Message carrier, AgentPropagation.KeyClassifier classifier) {
+        Map<String, String> systemAttributes = carrier.attributesAsStrings();
+        if (systemAttributes.containsKey("AWSTraceHeader")) {
+            // alias 'AWSTraceHeader' to 'X-Amzn-Trace-Id' because it uses the same format
+            classifier.accept("X-Amzn-Trace-Id", systemAttributes.get("AWSTraceHeader"));
+        }
+        Map<String, MessageAttributeValue> messageAttributes = carrier.messageAttributes();
+        if (messageAttributes.containsKey("_datadog")) {
+            MessageAttributeValue datadog = messageAttributes.get("_datadog");
+            if ("String".equals(datadog.dataType())) {
+                DatadogAttributeParser.forEachProperty(classifier, datadog.stringValue());
+            } else if ("Binary".equals(datadog.dataType()) && null != datadog.binaryValue()) {
+                DatadogAttributeParser.forEachProperty(
+                        classifier, datadog.binaryValue().asByteBuffer());
+            }
+        }
     }
-    Map<String, MessageAttributeValue> messageAttributes = carrier.messageAttributes();
-    if (messageAttributes.containsKey("_datadog")) {
-      MessageAttributeValue datadog = messageAttributes.get("_datadog");
-      if ("String".equals(datadog.dataType())) {
-        DatadogAttributeParser.forEachProperty(classifier, datadog.stringValue());
-      } else if ("Binary".equals(datadog.dataType()) && null != datadog.binaryValue()) {
-        DatadogAttributeParser.forEachProperty(classifier, datadog.binaryValue().asByteBuffer());
-      }
-    }
-  }
 
-  public long extractTimeInQueueStart(final Message carrier) {
-    try {
-      Map<String, String> systemAttributes = carrier.attributesAsStrings();
-      if (systemAttributes.containsKey("SentTimestamp")) {
-        return Long.parseLong(systemAttributes.get("SentTimestamp"));
-      }
-    } catch (Exception e) {
-      log.debug("Unable to get SQS sent time", e);
+    public long extractTimeInQueueStart(final Message carrier) {
+        try {
+            Map<String, String> systemAttributes = carrier.attributesAsStrings();
+            if (systemAttributes.containsKey("SentTimestamp")) {
+                return Long.parseLong(systemAttributes.get("SentTimestamp"));
+            }
+        } catch (Exception e) {
+            log.debug("Unable to get SQS sent time", e);
+        }
+        return 0;
     }
-    return 0;
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsClientInstrumentation.java
index f71df8eacee..78aea4ad011 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsClientInstrumentation.java
@@ -10,33 +10,31 @@
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 
 /** AWS SDK v2 instrumentation */
-public final class SqsClientInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class SqsClientInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder";
-  }
+    @Override
+    public String instrumentedType() {
+        return "software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("resolveExecutionInterceptors")),
-        SqsClientInstrumentation.class.getName() + "$AwsSqsBuilderAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("resolveExecutionInterceptors")),
+                SqsClientInstrumentation.class.getName() + "$AwsSqsBuilderAdvice");
+    }
 
-  public static class AwsSqsBuilderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void methodExit(@Advice.Return final List<ExecutionInterceptor> interceptors) {
-      if (Config.get().isDataStreamsEnabled()
-          || Config.get().isSqsInjectDatadogAttributeEnabled()) {
-        for (ExecutionInterceptor interceptor : interceptors) {
-          if (interceptor instanceof SqsInterceptor) {
-            return; // list already has our interceptor, return to builder
-          }
+    public static class AwsSqsBuilderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void methodExit(@Advice.Return final List<ExecutionInterceptor> interceptors) {
+            if (Config.get().isDataStreamsEnabled() || Config.get().isSqsInjectDatadogAttributeEnabled()) {
+                for (ExecutionInterceptor interceptor : interceptors) {
+                    if (interceptor instanceof SqsInterceptor) {
+                        return; // list already has our interceptor, return to builder
+                    }
+                }
+                interceptors.add(new SqsInterceptor());
+            }
         }
-        interceptors.add(new SqsInterceptor());
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsDecorator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsDecorator.java
index dd4da882456..eaf4711ba64 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsDecorator.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsDecorator.java
@@ -14,94 +14,84 @@
 import java.util.function.Supplier;
 
 public class SqsDecorator extends MessagingClientDecorator {
-  static final CharSequence COMPONENT_NAME = UTF8BytesString.create("java-aws-sdk");
-  public static final CharSequence SQS_INBOUND_OPERATION =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().messaging().inboundOperation("sqs"));
-  public static final CharSequence SQS_RECEIVE = UTF8BytesString.create("Sqs.ReceiveMessage");
-  public static final CharSequence SQS_DELIVER = UTF8BytesString.create("Sqs.DeliverMessage");
-  public static final CharSequence SQS_TIME_IN_QUEUE_OPERATION =
-      SpanNaming.instance().namingSchema().messaging().timeInQueueOperation("sqs");
-  public static final boolean SQS_LEGACY_TRACING = Config.get().isSqsLegacyTracingEnabled();
+    static final CharSequence COMPONENT_NAME = UTF8BytesString.create("java-aws-sdk");
+    public static final CharSequence SQS_INBOUND_OPERATION = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().messaging().inboundOperation("sqs"));
+    public static final CharSequence SQS_RECEIVE = UTF8BytesString.create("Sqs.ReceiveMessage");
+    public static final CharSequence SQS_DELIVER = UTF8BytesString.create("Sqs.DeliverMessage");
+    public static final CharSequence SQS_TIME_IN_QUEUE_OPERATION =
+            SpanNaming.instance().namingSchema().messaging().timeInQueueOperation("sqs");
+    public static final boolean SQS_LEGACY_TRACING = Config.get().isSqsLegacyTracingEnabled();
 
-  public static final boolean TIME_IN_QUEUE_ENABLED =
-      Config.get().isTimeInQueueEnabled(!SQS_LEGACY_TRACING, "sqs");
-  private final String spanKind;
-  private final CharSequence spanType;
-  private final Supplier<String> serviceNameSupplier;
+    public static final boolean TIME_IN_QUEUE_ENABLED = Config.get().isTimeInQueueEnabled(!SQS_LEGACY_TRACING, "sqs");
+    private final String spanKind;
+    private final CharSequence spanType;
+    private final Supplier<String> serviceNameSupplier;
 
-  public static final SqsDecorator CONSUMER_DECORATE =
-      new SqsDecorator(
-          SPAN_KIND_CONSUMER,
-          MESSAGE_CONSUMER,
-          SpanNaming.instance()
-              .namingSchema()
-              .messaging()
-              .inboundService("sqs", SQS_LEGACY_TRACING));
+    public static final SqsDecorator CONSUMER_DECORATE = new SqsDecorator(
+            SPAN_KIND_CONSUMER,
+            MESSAGE_CONSUMER,
+            SpanNaming.instance().namingSchema().messaging().inboundService("sqs", SQS_LEGACY_TRACING));
 
-  public static final SqsDecorator BROKER_DECORATE =
-      new SqsDecorator(
-          SPAN_KIND_BROKER,
-          MESSAGE_BROKER,
-          SpanNaming.instance().namingSchema().messaging().timeInQueueService("sqs"));
+    public static final SqsDecorator BROKER_DECORATE = new SqsDecorator(
+            SPAN_KIND_BROKER,
+            MESSAGE_BROKER,
+            SpanNaming.instance().namingSchema().messaging().timeInQueueService("sqs"));
 
-  protected SqsDecorator(
-      String spanKind, CharSequence spanType, Supplier<String> serviceNameSupplier) {
-    this.spanKind = spanKind;
-    this.spanType = spanType;
-    this.serviceNameSupplier = serviceNameSupplier;
-  }
+    protected SqsDecorator(String spanKind, CharSequence spanType, Supplier<String> serviceNameSupplier) {
+        this.spanKind = spanKind;
+        this.spanType = spanType;
+        this.serviceNameSupplier = serviceNameSupplier;
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return spanType;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return spanType;
+    }
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"aws-sdk"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"aws-sdk"};
+    }
 
-  @Override
-  protected String service() {
-    return serviceNameSupplier.get();
-  }
+    @Override
+    protected String service() {
+        return serviceNameSupplier.get();
+    }
 
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
 
-  @Override
-  protected String spanKind() {
-    return spanKind;
-  }
+    @Override
+    protected String spanKind() {
+        return spanKind;
+    }
 
-  public void onConsume(
-      final AgentSpan span, final String queueUrl, final String queueName, String requestId) {
-    span.setResourceName(SQS_RECEIVE);
-    span.setTag("aws.service", "Sqs");
-    span.setTag("aws_service", "Sqs");
-    span.setTag("aws.operation", "ReceiveMessage");
-    span.setTag("aws.agent", COMPONENT_NAME);
-    span.setTag("aws.queue.url", queueUrl);
-    setQueueName(span, queueName);
-    span.setTag("aws.requestId", requestId);
-  }
+    public void onConsume(final AgentSpan span, final String queueUrl, final String queueName, String requestId) {
+        span.setResourceName(SQS_RECEIVE);
+        span.setTag("aws.service", "Sqs");
+        span.setTag("aws_service", "Sqs");
+        span.setTag("aws.operation", "ReceiveMessage");
+        span.setTag("aws.agent", COMPONENT_NAME);
+        span.setTag("aws.queue.url", queueUrl);
+        setQueueName(span, queueName);
+        span.setTag("aws.requestId", requestId);
+    }
 
-  public void onTimeInQueue(
-      final AgentSpan span, final String queueUrl, final String queueName, String requestId) {
-    span.setResourceName(SQS_DELIVER);
-    span.setTag("aws.queue.url", queueUrl);
-    setQueueName(span, queueName);
-    span.setTag("aws.requestId", requestId);
-  }
+    public void onTimeInQueue(final AgentSpan span, final String queueUrl, final String queueName, String requestId) {
+        span.setResourceName(SQS_DELIVER);
+        span.setTag("aws.queue.url", queueUrl);
+        setQueueName(span, queueName);
+        span.setTag("aws.requestId", requestId);
+    }
 
-  private static void setQueueName(final AgentSpan span, final String queueName) {
-    if (queueName == null || queueName.isEmpty()) {
-      return;
+    private static void setQueueName(final AgentSpan span, final String queueName) {
+        if (queueName == null || queueName.isEmpty()) {
+            return;
+        }
+        span.setTag(InstrumentationTags.AWS_QUEUE_NAME, queueName);
+        span.setTag(InstrumentationTags.QUEUE_NAME, queueName);
     }
-    span.setTag(InstrumentationTags.AWS_QUEUE_NAME, queueName);
-    span.setTag(InstrumentationTags.QUEUE_NAME, queueName);
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsInterceptor.java
index ed59931810a..90e41183b54 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsInterceptor.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsInterceptor.java
@@ -30,72 +30,72 @@
 
 public class SqsInterceptor implements ExecutionInterceptor {
 
-  public static final ExecutionAttribute<Context> CONTEXT_ATTRIBUTE =
-      InstanceStore.of(ExecutionAttribute.class)
-          .getOrCreate("DatadogContext", () -> new ExecutionAttribute<>("DatadogContext"));
+    public static final ExecutionAttribute<Context> CONTEXT_ATTRIBUTE = InstanceStore.of(ExecutionAttribute.class)
+            .getOrCreate("DatadogContext", () -> new ExecutionAttribute<>("DatadogContext"));
 
-  public SqsInterceptor() {}
+    public SqsInterceptor() {}
 
-  @Override
-  public SdkRequest modifyRequest(ModifyRequest context, ExecutionAttributes executionAttributes) {
-    if (context.request() instanceof SendMessageRequest) {
-      SendMessageRequest request = (SendMessageRequest) context.request();
-      Optional<String> optionalQueueUrl = request.getValueForField("QueueUrl", String.class);
-      if (!optionalQueueUrl.isPresent()) {
-        return request;
-      }
+    @Override
+    public SdkRequest modifyRequest(ModifyRequest context, ExecutionAttributes executionAttributes) {
+        if (context.request() instanceof SendMessageRequest) {
+            SendMessageRequest request = (SendMessageRequest) context.request();
+            Optional<String> optionalQueueUrl = request.getValueForField("QueueUrl", String.class);
+            if (!optionalQueueUrl.isPresent()) {
+                return request;
+            }
 
-      Map<String, MessageAttributeValue> messageAttributes =
-          new HashMap<>(request.messageAttributes());
-      if (!messageAttributes.containsKey(DATADOG_KEY)) {
-        Context ctx = getContext(executionAttributes, optionalQueueUrl.get());
-        defaultPropagator().inject(ctx, messageAttributes, SETTER);
-      }
+            Map<String, MessageAttributeValue> messageAttributes = new HashMap<>(request.messageAttributes());
+            if (!messageAttributes.containsKey(DATADOG_KEY)) {
+                Context ctx = getContext(executionAttributes, optionalQueueUrl.get());
+                defaultPropagator().inject(ctx, messageAttributes, SETTER);
+            }
 
-      return request.toBuilder().messageAttributes(messageAttributes).build();
+            return request.toBuilder().messageAttributes(messageAttributes).build();
 
-    } else if (context.request() instanceof SendMessageBatchRequest) {
-      SendMessageBatchRequest request = (SendMessageBatchRequest) context.request();
-      Optional<String> optionalQueueUrl = request.getValueForField("QueueUrl", String.class);
-      if (!optionalQueueUrl.isPresent()) {
-        return request;
-      }
+        } else if (context.request() instanceof SendMessageBatchRequest) {
+            SendMessageBatchRequest request = (SendMessageBatchRequest) context.request();
+            Optional<String> optionalQueueUrl = request.getValueForField("QueueUrl", String.class);
+            if (!optionalQueueUrl.isPresent()) {
+                return request;
+            }
 
-      Context ctx = getContext(executionAttributes, optionalQueueUrl.get());
-      List<SendMessageBatchRequestEntry> entries = new ArrayList<>();
+            Context ctx = getContext(executionAttributes, optionalQueueUrl.get());
+            List<SendMessageBatchRequestEntry> entries = new ArrayList<>();
 
-      for (SendMessageBatchRequestEntry entry : request.entries()) {
-        Map<String, MessageAttributeValue> messageAttributes =
-            new HashMap<>(entry.messageAttributes());
-        if (!messageAttributes.containsKey(DATADOG_KEY)) {
-          defaultPropagator().inject(ctx, messageAttributes, SETTER);
-        }
-        entries.add(entry.toBuilder().messageAttributes(messageAttributes).build());
-      }
+            for (SendMessageBatchRequestEntry entry : request.entries()) {
+                Map<String, MessageAttributeValue> messageAttributes = new HashMap<>(entry.messageAttributes());
+                if (!messageAttributes.containsKey(DATADOG_KEY)) {
+                    defaultPropagator().inject(ctx, messageAttributes, SETTER);
+                }
+                entries.add(
+                        entry.toBuilder().messageAttributes(messageAttributes).build());
+            }
 
-      return request.toBuilder().entries(entries).build();
+            return request.toBuilder().entries(entries).build();
 
-    } else if (context.request() instanceof ReceiveMessageRequest) {
-      ReceiveMessageRequest request = (ReceiveMessageRequest) context.request();
-      if (request.messageAttributeNames().size() < 10
-          && !request.messageAttributeNames().contains(DATADOG_KEY)
-          && Config.get().isSqsInjectDatadogAttributeEnabled()) {
-        List<String> messageAttributeNames = new ArrayList<>(request.messageAttributeNames());
-        messageAttributeNames.add(DATADOG_KEY);
-        return request.toBuilder().messageAttributeNames(messageAttributeNames).build();
-      } else {
-        return request;
-      }
-    } else {
-      return context.request();
+        } else if (context.request() instanceof ReceiveMessageRequest) {
+            ReceiveMessageRequest request = (ReceiveMessageRequest) context.request();
+            if (request.messageAttributeNames().size() < 10
+                    && !request.messageAttributeNames().contains(DATADOG_KEY)
+                    && Config.get().isSqsInjectDatadogAttributeEnabled()) {
+                List<String> messageAttributeNames = new ArrayList<>(request.messageAttributeNames());
+                messageAttributeNames.add(DATADOG_KEY);
+                return request.toBuilder()
+                        .messageAttributeNames(messageAttributeNames)
+                        .build();
+            } else {
+                return request;
+            }
+        } else {
+            return context.request();
+        }
     }
-  }
 
-  private Context getContext(ExecutionAttributes executionAttributes, String queueUrl) {
-    Context context = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
+    private Context getContext(ExecutionAttributes executionAttributes, String queueUrl) {
+        Context context = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
 
-    DataStreamsTags tags = create("sqs", OUTBOUND, urlFileName(queueUrl));
-    DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
-    return context.with(dsmContext);
-  }
+        DataStreamsTags tags = create("sqs", OUTBOUND, urlFileName(queueUrl));
+        DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
+        return context.with(dsmContext);
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsJmsMessageInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsJmsMessageInstrumentation.java
index 0e759660cec..dddbcb2e387 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsJmsMessageInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsJmsMessageInstrumentation.java
@@ -19,58 +19,59 @@
 
 @AutoService(InstrumenterModule.class)
 public class SqsJmsMessageInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public SqsJmsMessageInstrumentation() {
-    super("sqs", "aws-sdk", "jms");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.amazon.sqs.javamessaging.message.SQSMessage";
-  }
+    public SqsJmsMessageInstrumentation() {
+        super("sqs", "aws-sdk", "jms");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(2, named("software.amazon.awssdk.services.sqs.model.Message"))),
-        getClass().getName() + "$JmsSqsMessageConstructorAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.amazon.sqs.javamessaging.message.SQSMessage";
+    }
 
-  public static class JmsSqsMessageConstructorAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(value = 2, readOnly = false) Message sqsMessage) {
-      Map<String, MessageAttributeValue> messageAttributes = sqsMessage.messageAttributes();
-      MessageAttributeValue ddAttribute = messageAttributes.get("_datadog");
-      if (ddAttribute != null && "Binary".equals(ddAttribute.dataType())) {
-        // binary message attributes are not supported by amazon-sqs-java-messaging-lib, and there
-        // is a chance we might introduce one, either when the message was sent from SNS or from a
-        // DD-instrumented Javascript app.
-        // When we reach this point, the value would already have been used by the aws-sqs
-        // instrumentation, so we can safely remove it.
-        Map<String, MessageAttributeValue> messageAttributesCopy = new HashMap<>(messageAttributes);
-        // need to copy to remove because the original is an UnmodifiableMap
-        messageAttributesCopy.remove("_datadog");
-        sqsMessage = sqsMessage.toBuilder().messageAttributes(messageAttributesCopy).build();
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(2, named("software.amazon.awssdk.services.sqs.model.Message"))),
+                getClass().getName() + "$JmsSqsMessageConstructorAdvice");
     }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Argument(2) Message sqsMessage, @Advice.FieldValue("properties") Map properties)
-        throws JMSException {
-      if (Config.get().isSqsPropagationEnabled()) {
-        Map<String, String> systemAttributes = sqsMessage.attributesAsStrings();
-        if (null != systemAttributes) {
-          String awsTraceHeader = systemAttributes.get("AWSTraceHeader");
-          if (null != awsTraceHeader && !awsTraceHeader.isEmpty()) {
-            properties.put(
-                "x__dash__amzn__dash__trace__dash__id", // X-Amzn-Trace-Id, encoded for JMS
-                new SQSMessage.JMSMessagePropertyValue(awsTraceHeader, STRING));
-          }
+    public static class JmsSqsMessageConstructorAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(value = 2, readOnly = false) Message sqsMessage) {
+            Map<String, MessageAttributeValue> messageAttributes = sqsMessage.messageAttributes();
+            MessageAttributeValue ddAttribute = messageAttributes.get("_datadog");
+            if (ddAttribute != null && "Binary".equals(ddAttribute.dataType())) {
+                // binary message attributes are not supported by amazon-sqs-java-messaging-lib, and there
+                // is a chance we might introduce one, either when the message was sent from SNS or from a
+                // DD-instrumented Javascript app.
+                // When we reach this point, the value would already have been used by the aws-sqs
+                // instrumentation, so we can safely remove it.
+                Map<String, MessageAttributeValue> messageAttributesCopy = new HashMap<>(messageAttributes);
+                // need to copy to remove because the original is an UnmodifiableMap
+                messageAttributesCopy.remove("_datadog");
+                sqsMessage = sqsMessage.toBuilder()
+                        .messageAttributes(messageAttributesCopy)
+                        .build();
+            }
+        }
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Argument(2) Message sqsMessage, @Advice.FieldValue("properties") Map properties)
+                throws JMSException {
+            if (Config.get().isSqsPropagationEnabled()) {
+                Map<String, String> systemAttributes = sqsMessage.attributesAsStrings();
+                if (null != systemAttributes) {
+                    String awsTraceHeader = systemAttributes.get("AWSTraceHeader");
+                    if (null != awsTraceHeader && !awsTraceHeader.isEmpty()) {
+                        properties.put(
+                                "x__dash__amzn__dash__trace__dash__id", // X-Amzn-Trace-Id, encoded for JMS
+                                new SQSMessage.JMSMessagePropertyValue(awsTraceHeader, STRING));
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsMd5ChecksumInterceptorInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsMd5ChecksumInterceptorInstrumentation.java
index 074f09ca47c..c910092c403 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsMd5ChecksumInterceptorInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsMd5ChecksumInterceptorInstrumentation.java
@@ -7,30 +7,30 @@
 import net.bytebuddy.asm.Advice;
 
 public final class SqsMd5ChecksumInterceptorInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    // The AWS SDK checksum interceptor reads ReceiveMessageResponse.messages() while finalizing
-    // the response. Mark that internal access so we only wrap messages for application code.
-    return "software.amazon.awssdk.services.sqs.internal.MessageMD5ChecksumInterceptor";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("afterExecution")), getClass().getName() + "$AfterExecutionAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        // The AWS SDK checksum interceptor reads ReceiveMessageResponse.messages() while finalizing
+        // the response. Mark that internal access so we only wrap messages for application code.
+        return "software.amazon.awssdk.services.sqs.internal.MessageMD5ChecksumInterceptor";
+    }
 
-  public static class AfterExecutionAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter() {
-      SqsReceiveResponseInternalAccess.enter();
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("afterExecution")), getClass().getName() + "$AfterExecutionAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit() {
-      SqsReceiveResponseInternalAccess.exit();
+    public static class AfterExecutionAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter() {
+            SqsReceiveResponseInternalAccess.enter();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit() {
+            SqsReceiveResponseInternalAccess.exit();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsModule.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsModule.java
index a15c006b8bb..9661ca984e2 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsModule.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsModule.java
@@ -12,33 +12,31 @@
 @AutoService(InstrumenterModule.class)
 public final class SqsModule extends InstrumenterModule.Tracing {
 
-  public SqsModule() {
-    super("sqs", "aws-sdk");
-  }
+    public SqsModule() {
+        super("sqs", "aws-sdk");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStore = new java.util.HashMap<>();
-    contextStore.put(
-        "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse", "java.lang.String");
-    contextStore.put(
-        "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse$BuilderImpl",
-        "java.lang.String");
-    return contextStore;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStore = new java.util.HashMap<>();
+        contextStore.put("software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse", "java.lang.String");
+        contextStore.put(
+                "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse$BuilderImpl", "java.lang.String");
+        return contextStore;
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    final List<Instrumenter> ret = new ArrayList<>(6);
-    ret.add(new SqsClientInstrumentation());
-    ret.add(new SqsReceiveRequestInstrumentation());
-    // we don't need to instrument messages when we're doing legacy AWS-SDK tracing
-    if (!InstrumenterConfig.get().isLegacyInstrumentationEnabled(false, "aws-sdk")) {
-      ret.add(new SqsMd5ChecksumInterceptorInstrumentation());
-      ret.add(new SqsReceiveResponseBuilderInstrumentation());
-      ret.add(new SqsReceiveResponseBuilderImplInstrumentation());
-      ret.add(new SqsReceiveResultInstrumentation());
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        final List<Instrumenter> ret = new ArrayList<>(6);
+        ret.add(new SqsClientInstrumentation());
+        ret.add(new SqsReceiveRequestInstrumentation());
+        // we don't need to instrument messages when we're doing legacy AWS-SDK tracing
+        if (!InstrumenterConfig.get().isLegacyInstrumentationEnabled(false, "aws-sdk")) {
+            ret.add(new SqsMd5ChecksumInterceptorInstrumentation());
+            ret.add(new SqsReceiveResponseBuilderInstrumentation());
+            ret.add(new SqsReceiveResponseBuilderImplInstrumentation());
+            ret.add(new SqsReceiveResultInstrumentation());
+        }
+        return ret;
     }
-    return ret;
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveRequestInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveRequestInstrumentation.java
index 4d767a49e5f..24fdc31f1bc 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveRequestInstrumentation.java
@@ -13,43 +13,39 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public final class SqsReceiveRequestInstrumentation
-    implements Instrumenter.ForSingleType,
-        Instrumenter.WithTypeStructure,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.WithTypeStructure, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest$BuilderImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest$BuilderImpl";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("attributeNames"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("attributeNames"));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("build")), getClass().getName() + "$ReceiveMessageRequestAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isMethod().and(named("build")), getClass().getName() + "$ReceiveMessageRequestAdvice");
+    }
 
-  public static class ReceiveMessageRequestAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEntry(
-        @Advice.FieldValue(value = "attributeNames", readOnly = false)
-            List<String> attributeNames) {
-      // ReceiveMessageRequest.BuilderImpl maintains an immutable list which we may need to replace
-      if (Config.get().isSqsPropagationEnabled()) {
-        for (String name : attributeNames) {
-          if ("AWSTraceHeader".equals(name) || "All".equals(name)) {
-            return;
-          }
+    public static class ReceiveMessageRequestAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEntry(
+                @Advice.FieldValue(value = "attributeNames", readOnly = false) List<String> attributeNames) {
+            // ReceiveMessageRequest.BuilderImpl maintains an immutable list which we may need to replace
+            if (Config.get().isSqsPropagationEnabled()) {
+                for (String name : attributeNames) {
+                    if ("AWSTraceHeader".equals(name) || "All".equals(name)) {
+                        return;
+                    }
+                }
+                int oldLength = attributeNames.size();
+                String[] nameArray = attributeNames.toArray(new String[oldLength + 1]);
+                nameArray[oldLength] = "AWSTraceHeader";
+                attributeNames = asList(nameArray);
+            }
         }
-        int oldLength = attributeNames.size();
-        String[] nameArray = attributeNames.toArray(new String[oldLength + 1]);
-        nameArray[oldLength] = "AWSTraceHeader";
-        attributeNames = asList(nameArray);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseBuilderImplInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseBuilderImplInstrumentation.java
index 9b6266ef0ad..5e2e04fbb8c 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseBuilderImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseBuilderImplInstrumentation.java
@@ -12,43 +12,40 @@
 import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;
 
 public final class SqsReceiveResponseBuilderImplInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  private static final String BUILDER_IMPL =
-      "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse$BuilderImpl";
+    private static final String BUILDER_IMPL =
+            "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse$BuilderImpl";
 
-  @Override
-  public String instrumentedType() {
-    return BUILDER_IMPL;
-  }
+    @Override
+    public String instrumentedType() {
+        return BUILDER_IMPL;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("build"))
-            .and(takesNoArguments())
-            .and(
-                returns(named("software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse"))),
-        getClass().getName() + "$BuildAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("build"))
+                        .and(takesNoArguments())
+                        .and(returns(named("software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse"))),
+                getClass().getName() + "$BuildAdvice");
+    }
 
-  public static class BuildAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This Object builder, @Advice.Return ReceiveMessageResponse response) {
-      if (response == null) {
-        return;
-      }
-      ContextStore<Object, String> builderStore =
-          InstrumentationContext.get(BUILDER_IMPL, "java.lang.String");
-      String queueUrl = builderStore.get(builder);
-      if (queueUrl != null) {
-        // Complete the handoff from the pre-rebuild response to the final response user code
-        // sees.
-        InstrumentationContext.get(ReceiveMessageResponse.class, String.class)
-            .put(response, queueUrl);
-      }
+    public static class BuildAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(@Advice.This Object builder, @Advice.Return ReceiveMessageResponse response) {
+            if (response == null) {
+                return;
+            }
+            ContextStore<Object, String> builderStore = InstrumentationContext.get(BUILDER_IMPL, "java.lang.String");
+            String queueUrl = builderStore.get(builder);
+            if (queueUrl != null) {
+                // Complete the handoff from the pre-rebuild response to the final response user code
+                // sees.
+                InstrumentationContext.get(ReceiveMessageResponse.class, String.class)
+                        .put(response, queueUrl);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseBuilderInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseBuilderInstrumentation.java
index 3fc1ffeb55d..2f848c43aaa 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseBuilderInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseBuilderInstrumentation.java
@@ -11,43 +11,40 @@
 import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;
 
 public final class SqsReceiveResponseBuilderInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  private static final String BUILDER_IMPL =
-      "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse$BuilderImpl";
+    private static final String BUILDER_IMPL =
+            "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse$BuilderImpl";
 
-  @Override
-  public String instrumentedType() {
-    return "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse";
-  }
+    @Override
+    public String instrumentedType() {
+        return "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("toBuilder"))
-            .and(takesNoArguments())
-            .and(
-                returns(
-                    named(
-                        "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse$Builder"))),
-        getClass().getName() + "$ToBuilderAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("toBuilder"))
+                        .and(takesNoArguments())
+                        .and(returns(
+                                named("software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse$Builder"))),
+                getClass().getName() + "$ToBuilderAdvice");
+    }
 
-  public static class ToBuilderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This ReceiveMessageResponse response, @Advice.Return Object builder) {
-      if (builder == null) {
-        return;
-      }
-      String queueUrl =
-          InstrumentationContext.get(ReceiveMessageResponse.class, String.class).get(response);
-      if (queueUrl != null) {
-        // AWS SDK core finalizes modeled responses through response.toBuilder().build().
-        // Carry queueUrl onto the builder so it survives that response instance change.
-        InstrumentationContext.get(BUILDER_IMPL, "java.lang.String").put(builder, queueUrl);
-      }
+    public static class ToBuilderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(@Advice.This ReceiveMessageResponse response, @Advice.Return Object builder) {
+            if (builder == null) {
+                return;
+            }
+            String queueUrl = InstrumentationContext.get(ReceiveMessageResponse.class, String.class)
+                    .get(response);
+            if (queueUrl != null) {
+                // AWS SDK core finalizes modeled responses through response.toBuilder().build().
+                // Carry queueUrl onto the builder so it survives that response instance change.
+                InstrumentationContext.get(BUILDER_IMPL, "java.lang.String").put(builder, queueUrl);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseInternalAccess.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseInternalAccess.java
index aa73af23641..8dd06fbf748 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseInternalAccess.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseInternalAccess.java
@@ -4,17 +4,17 @@
 
 public final class SqsReceiveResponseInternalAccess {
 
-  private SqsReceiveResponseInternalAccess() {}
+    private SqsReceiveResponseInternalAccess() {}
 
-  public static void enter() {
-    CallDepthThreadLocalMap.incrementCallDepth(SqsReceiveResponseInternalAccess.class);
-  }
+    public static void enter() {
+        CallDepthThreadLocalMap.incrementCallDepth(SqsReceiveResponseInternalAccess.class);
+    }
 
-  public static void exit() {
-    CallDepthThreadLocalMap.decrementCallDepth(SqsReceiveResponseInternalAccess.class);
-  }
+    public static void exit() {
+        CallDepthThreadLocalMap.decrementCallDepth(SqsReceiveResponseInternalAccess.class);
+    }
 
-  public static boolean active() {
-    return CallDepthThreadLocalMap.getCallDepth(SqsReceiveResponseInternalAccess.class) > 0;
-  }
+    public static boolean active() {
+        return CallDepthThreadLocalMap.getCallDepth(SqsReceiveResponseInternalAccess.class) > 0;
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java
index 9b53fd8a316..4855730b679 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java
@@ -10,37 +10,35 @@
 import software.amazon.awssdk.services.sqs.model.Message;
 import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;
 
-public final class SqsReceiveResultInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class SqsReceiveResultInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse";
-  }
+    @Override
+    public String instrumentedType() {
+        return "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("messages")), getClass().getName() + "$GetMessagesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isMethod().and(named("messages")), getClass().getName() + "$GetMessagesAdvice");
+    }
 
-  public static class GetMessagesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This ReceiveMessageResponse result,
-        @Advice.Return(readOnly = false) List<Message> messages) {
-      if (SqsReceiveResponseInternalAccess.active()) {
-        // AWS SDK's MD5 checksum interceptor calls messages() during afterExecution. That should
-        // not create consumer spans; those belong around application message processing.
-        return;
-      }
-      if (messages != null && !messages.isEmpty() && !(messages instanceof TracingList)) {
-        String queueUrl =
-            InstrumentationContext.get(ReceiveMessageResponse.class, String.class).get(result);
-        if (queueUrl != null) {
-          messages = new TracingList(messages, queueUrl, result.responseMetadata().requestId());
+    public static class GetMessagesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This ReceiveMessageResponse result, @Advice.Return(readOnly = false) List<Message> messages) {
+            if (SqsReceiveResponseInternalAccess.active()) {
+                // AWS SDK's MD5 checksum interceptor calls messages() during afterExecution. That should
+                // not create consumer spans; those belong around application message processing.
+                return;
+            }
+            if (messages != null && !messages.isEmpty() && !(messages instanceof TracingList)) {
+                String queueUrl = InstrumentationContext.get(ReceiveMessageResponse.class, String.class)
+                        .get(result);
+                if (queueUrl != null) {
+                    messages = new TracingList(
+                            messages, queueUrl, result.responseMetadata().requestId());
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java
index c027a4432fe..ad9ecb2fe55 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java
@@ -30,110 +30,110 @@
 import software.amazon.awssdk.services.sqs.model.Message;
 
 public class TracingIterator<L extends Iterator<Message>> implements Iterator<Message> {
-  private static final Logger log = LoggerFactory.getLogger(TracingIterator.class);
+    private static final Logger log = LoggerFactory.getLogger(TracingIterator.class);
 
-  protected final L delegate;
-  private final String queueUrl;
-  private final String queueName;
-  private final String requestId;
-  private AgentSpanContext batchContext;
+    protected final L delegate;
+    private final String queueUrl;
+    private final String queueName;
+    private final String requestId;
+    private AgentSpanContext batchContext;
 
-  public TracingIterator(L delegate, String queueUrl, String requestId) {
-    this.delegate = delegate;
-    this.queueUrl = queueUrl;
-    this.queueName = queueUrl == null ? "" : urlFileName(queueUrl);
-    this.requestId = requestId;
-  }
+    public TracingIterator(L delegate, String queueUrl, String requestId) {
+        this.delegate = delegate;
+        this.queueUrl = queueUrl;
+        this.queueName = queueUrl == null ? "" : urlFileName(queueUrl);
+        this.requestId = requestId;
+    }
 
-  @Override
-  public boolean hasNext() {
-    boolean moreMessages = delegate.hasNext();
-    if (!moreMessages) {
-      // no more messages, use this as a signal to close the last iteration scope
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        closePrevious(true);
-      } else {
-        final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
-        if (previousSpan != null) {
-          previousSpan.finishWithEndToEnd();
+    @Override
+    public boolean hasNext() {
+        boolean moreMessages = delegate.hasNext();
+        if (!moreMessages) {
+            // no more messages, use this as a signal to close the last iteration scope
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                closePrevious(true);
+            } else {
+                final AgentSpan previousSpan =
+                        AgentSpan.fromContext(Context.root().swap());
+                if (previousSpan != null) {
+                    previousSpan.finishWithEndToEnd();
+                }
+            }
         }
-      }
+        return moreMessages;
     }
-    return moreMessages;
-  }
 
-  @Override
-  public Message next() {
-    Message next = delegate.next();
-    startNewMessageSpan(next);
-    return next;
-  }
+    @Override
+    public Message next() {
+        Message next = delegate.next();
+        startNewMessageSpan(next);
+        return next;
+    }
 
-  protected void startNewMessageSpan(Message message) {
-    try {
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        closePrevious(true);
-      } else if (message == null) { // previous message span was the last
-        final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
-        if (previousSpan != null) {
-          previousSpan.finishWithEndToEnd();
-        }
-      }
-      if (message != null) {
-        AgentSpan queueSpan = null;
-        if (batchContext == null) {
-          // first grab any incoming distributed context
-          AgentSpanContext spanContext =
-              Config.get().isSqsPropagationEnabled()
-                  ? extractContextAndGetSpanContext(message, GETTER)
-                  : null;
-          // next add a time-in-queue span for non-legacy SQS traces
-          if (TIME_IN_QUEUE_ENABLED) {
-            long timeInQueueStart = GETTER.extractTimeInQueueStart(message);
-            if (timeInQueueStart > 0) {
-              queueSpan =
-                  startSpan(
-                      COMPONENT_NAME.toString(),
-                      SQS_TIME_IN_QUEUE_OPERATION,
-                      spanContext,
-                      MILLISECONDS.toMicros(timeInQueueStart));
-              BROKER_DECORATE.afterStart(queueSpan);
-              BROKER_DECORATE.onTimeInQueue(queueSpan, queueUrl, queueName, requestId);
-              spanContext = queueSpan.spanContext();
-              // The queueSpan will be finished after inner span has been activated to ensure that
-              // spans are written out together by TraceStructureWriter when running in strict mode
+    protected void startNewMessageSpan(Message message) {
+        try {
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                closePrevious(true);
+            } else if (message == null) { // previous message span was the last
+                final AgentSpan previousSpan =
+                        AgentSpan.fromContext(Context.root().swap());
+                if (previousSpan != null) {
+                    previousSpan.finishWithEndToEnd();
+                }
             }
-          }
-          // re-use this context for any other messages received in this batch
-          batchContext = spanContext;
-        }
-        AgentSpan span = startSpan(COMPONENT_NAME.toString(), SQS_INBOUND_OPERATION, batchContext);
+            if (message != null) {
+                AgentSpan queueSpan = null;
+                if (batchContext == null) {
+                    // first grab any incoming distributed context
+                    AgentSpanContext spanContext = Config.get().isSqsPropagationEnabled()
+                            ? extractContextAndGetSpanContext(message, GETTER)
+                            : null;
+                    // next add a time-in-queue span for non-legacy SQS traces
+                    if (TIME_IN_QUEUE_ENABLED) {
+                        long timeInQueueStart = GETTER.extractTimeInQueueStart(message);
+                        if (timeInQueueStart > 0) {
+                            queueSpan = startSpan(
+                                    COMPONENT_NAME.toString(),
+                                    SQS_TIME_IN_QUEUE_OPERATION,
+                                    spanContext,
+                                    MILLISECONDS.toMicros(timeInQueueStart));
+                            BROKER_DECORATE.afterStart(queueSpan);
+                            BROKER_DECORATE.onTimeInQueue(queueSpan, queueUrl, queueName, requestId);
+                            spanContext = queueSpan.spanContext();
+                            // The queueSpan will be finished after inner span has been activated to ensure that
+                            // spans are written out together by TraceStructureWriter when running in strict mode
+                        }
+                    }
+                    // re-use this context for any other messages received in this batch
+                    batchContext = spanContext;
+                }
+                AgentSpan span = startSpan(COMPONENT_NAME.toString(), SQS_INBOUND_OPERATION, batchContext);
 
-        DataStreamsTags tags = create("sqs", INBOUND, queueName);
-        AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, create(tags, 0, 0));
+                DataStreamsTags tags = create("sqs", INBOUND, queueName);
+                AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, create(tags, 0, 0));
 
-        CONSUMER_DECORATE.afterStart(span);
-        CONSUMER_DECORATE.onConsume(span, queueUrl, queueName, requestId);
-        if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-          activateNext(span);
-        } else {
-          final AgentSpan previousSpan = AgentSpan.fromContext(span.swap());
-          if (previousSpan != null) {
-            previousSpan.finishWithEndToEnd();
-          }
-        }
-        if (queueSpan != null) {
-          BROKER_DECORATE.beforeFinish(queueSpan);
-          queueSpan.finish();
+                CONSUMER_DECORATE.afterStart(span);
+                CONSUMER_DECORATE.onConsume(span, queueUrl, queueName, requestId);
+                if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                    activateNext(span);
+                } else {
+                    final AgentSpan previousSpan = AgentSpan.fromContext(span.swap());
+                    if (previousSpan != null) {
+                        previousSpan.finishWithEndToEnd();
+                    }
+                }
+                if (queueSpan != null) {
+                    BROKER_DECORATE.beforeFinish(queueSpan);
+                    queueSpan.finish();
+                }
+            }
+        } catch (Exception e) {
+            log.debug("Problem tracing new SQS message span", e);
         }
-      }
-    } catch (Exception e) {
-      log.debug("Problem tracing new SQS message span", e);
     }
-  }
 
-  @Override
-  public void remove() {
-    delegate.remove();
-  }
+    @Override
+    public void remove() {
+        delegate.remove();
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingList.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingList.java
index abb0e637f27..b5d98ad3c54 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingList.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingList.java
@@ -7,134 +7,134 @@
 import software.amazon.awssdk.services.sqs.model.Message;
 
 public class TracingList implements List<Message> {
-  private final List<Message> delegate;
-  private final String queueUrl;
-  private final String requestId;
-
-  public TracingList(List<Message> delegate, String queueUrl, String requestId) {
-    this.delegate = delegate;
-    this.queueUrl = queueUrl;
-    this.requestId = requestId;
-  }
-
-  @Override
-  public int size() {
-    return delegate.size();
-  }
-
-  @Override
-  public boolean isEmpty() {
-    return delegate.isEmpty();
-  }
-
-  @Override
-  public boolean contains(Object o) {
-    return delegate.contains(o);
-  }
-
-  @Override
-  public Iterator<Message> iterator() {
-    return listIterator(0);
-  }
-
-  @Override
-  public Object[] toArray() {
-    return delegate.toArray();
-  }
-
-  @Override
-  public <T> T[] toArray(T[] a) {
-    return delegate.toArray(a);
-  }
-
-  @Override
-  public boolean add(Message message) {
-    return delegate.add(message);
-  }
-
-  @Override
-  public boolean remove(Object o) {
-    return delegate.remove(o);
-  }
-
-  @Override
-  public boolean containsAll(Collection<?> c) {
-    return delegate.containsAll(c);
-  }
-
-  @Override
-  public boolean addAll(Collection<? extends Message> c) {
-    return delegate.addAll(c);
-  }
-
-  @Override
-  public boolean addAll(int index, Collection<? extends Message> c) {
-    return delegate.addAll(index, c);
-  }
-
-  @Override
-  public boolean removeAll(Collection<?> c) {
-    return delegate.removeAll(c);
-  }
-
-  @Override
-  public boolean retainAll(Collection<?> c) {
-    return delegate.retainAll(c);
-  }
-
-  @Override
-  public void clear() {
-    delegate.clear();
-  }
-
-  @Override
-  public Message get(int index) {
-    return delegate.get(index); // not currently covered by iteration span
-  }
-
-  @Override
-  public Message set(int index, Message element) {
-    return delegate.set(index, element);
-  }
-
-  @Override
-  public void add(int index, Message element) {
-    delegate.add(index, element);
-  }
-
-  @Override
-  public Message remove(int index) {
-    return delegate.remove(index);
-  }
-
-  @Override
-  public int indexOf(Object o) {
-    return delegate.indexOf(o);
-  }
-
-  @Override
-  public int lastIndexOf(Object o) {
-    return delegate.lastIndexOf(o);
-  }
-
-  @Override
-  public ListIterator<Message> listIterator() {
-    return listIterator(0);
-  }
-
-  @Override
-  public ListIterator<Message> listIterator(int index) {
-    // every iteration will add spans. Not only the very first one
-    return new TracingListIterator(delegate.listIterator(index), queueUrl, requestId);
-  }
-
-  @Override
-  public List<Message> subList(int fromIndex, int toIndex) {
-    return new TracingList(delegate.subList(fromIndex, toIndex), queueUrl, requestId);
-  }
-
-  @Override
-  public String toString() {
-    return delegate.toString();
-  }
+    private final List<Message> delegate;
+    private final String queueUrl;
+    private final String requestId;
+
+    public TracingList(List<Message> delegate, String queueUrl, String requestId) {
+        this.delegate = delegate;
+        this.queueUrl = queueUrl;
+        this.requestId = requestId;
+    }
+
+    @Override
+    public int size() {
+        return delegate.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return delegate.isEmpty();
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return delegate.contains(o);
+    }
+
+    @Override
+    public Iterator<Message> iterator() {
+        return listIterator(0);
+    }
+
+    @Override
+    public Object[] toArray() {
+        return delegate.toArray();
+    }
+
+    @Override
+    public <T> T[] toArray(T[] a) {
+        return delegate.toArray(a);
+    }
+
+    @Override
+    public boolean add(Message message) {
+        return delegate.add(message);
+    }
+
+    @Override
+    public boolean remove(Object o) {
+        return delegate.remove(o);
+    }
+
+    @Override
+    public boolean containsAll(Collection<?> c) {
+        return delegate.containsAll(c);
+    }
+
+    @Override
+    public boolean addAll(Collection<? extends Message> c) {
+        return delegate.addAll(c);
+    }
+
+    @Override
+    public boolean addAll(int index, Collection<? extends Message> c) {
+        return delegate.addAll(index, c);
+    }
+
+    @Override
+    public boolean removeAll(Collection<?> c) {
+        return delegate.removeAll(c);
+    }
+
+    @Override
+    public boolean retainAll(Collection<?> c) {
+        return delegate.retainAll(c);
+    }
+
+    @Override
+    public void clear() {
+        delegate.clear();
+    }
+
+    @Override
+    public Message get(int index) {
+        return delegate.get(index); // not currently covered by iteration span
+    }
+
+    @Override
+    public Message set(int index, Message element) {
+        return delegate.set(index, element);
+    }
+
+    @Override
+    public void add(int index, Message element) {
+        delegate.add(index, element);
+    }
+
+    @Override
+    public Message remove(int index) {
+        return delegate.remove(index);
+    }
+
+    @Override
+    public int indexOf(Object o) {
+        return delegate.indexOf(o);
+    }
+
+    @Override
+    public int lastIndexOf(Object o) {
+        return delegate.lastIndexOf(o);
+    }
+
+    @Override
+    public ListIterator<Message> listIterator() {
+        return listIterator(0);
+    }
+
+    @Override
+    public ListIterator<Message> listIterator(int index) {
+        // every iteration will add spans. Not only the very first one
+        return new TracingListIterator(delegate.listIterator(index), queueUrl, requestId);
+    }
+
+    @Override
+    public List<Message> subList(int fromIndex, int toIndex) {
+        return new TracingList(delegate.subList(fromIndex, toIndex), queueUrl, requestId);
+    }
+
+    @Override
+    public String toString() {
+        return delegate.toString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingListIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingListIterator.java
index f3f471db89d..8721eebf4d8 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingListIterator.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingListIterator.java
@@ -8,54 +8,54 @@
 import java.util.ListIterator;
 import software.amazon.awssdk.services.sqs.model.Message;
 
-public class TracingListIterator extends TracingIterator<ListIterator<Message>>
-    implements ListIterator<Message> {
-
-  public TracingListIterator(ListIterator<Message> delegate, String queueUrl, String requestId) {
-    super(delegate, queueUrl, requestId);
-  }
-
-  @Override
-  public boolean hasPrevious() {
-    boolean moreMessages = delegate.hasPrevious();
-    if (!moreMessages) {
-      // no more messages, use this as a signal to close the last iteration scope
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        closePrevious(true);
-      } else {
-        final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
-        if (previousSpan != null) {
-          previousSpan.finishWithEndToEnd();
+public class TracingListIterator extends TracingIterator<ListIterator<Message>> implements ListIterator<Message> {
+
+    public TracingListIterator(ListIterator<Message> delegate, String queueUrl, String requestId) {
+        super(delegate, queueUrl, requestId);
+    }
+
+    @Override
+    public boolean hasPrevious() {
+        boolean moreMessages = delegate.hasPrevious();
+        if (!moreMessages) {
+            // no more messages, use this as a signal to close the last iteration scope
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                closePrevious(true);
+            } else {
+                final AgentSpan previousSpan =
+                        AgentSpan.fromContext(Context.root().swap());
+                if (previousSpan != null) {
+                    previousSpan.finishWithEndToEnd();
+                }
+            }
         }
-      }
+        return moreMessages;
+    }
+
+    @Override
+    public Message previous() {
+        Message prev = delegate.previous();
+        startNewMessageSpan(prev);
+        return prev;
+    }
+
+    @Override
+    public int nextIndex() {
+        return delegate.nextIndex();
+    }
+
+    @Override
+    public int previousIndex() {
+        return delegate.previousIndex();
+    }
+
+    @Override
+    public void set(Message message) {
+        delegate.set(message);
+    }
+
+    @Override
+    public void add(Message message) {
+        delegate.add(message);
     }
-    return moreMessages;
-  }
-
-  @Override
-  public Message previous() {
-    Message prev = delegate.previous();
-    startNewMessageSpan(prev);
-    return prev;
-  }
-
-  @Override
-  public int nextIndex() {
-    return delegate.nextIndex();
-  }
-
-  @Override
-  public int previousIndex() {
-    return delegate.previousIndex();
-  }
-
-  @Override
-  public void set(Message message) {
-    delegate.set(message);
-  }
-
-  @Override
-  public void add(Message message) {
-    delegate.add(message);
-  }
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/java/SqsClientTest.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/java/SqsClientTest.java
index 5569f7898fc..5d4024a828f 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/java/SqsClientTest.java
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/java/SqsClientTest.java
@@ -52,476 +52,458 @@
 
 @WithConfig(key = GeneralConfig.SERVICE_NAME, value = "A-service")
 abstract class SqsClientTestBase extends AbstractInstrumentationTest {
-  private static final AnonymousCredentialsProvider CREDENTIALS_PROVIDER =
-      AnonymousCredentialsProvider.create();
-  private static final AtomicInteger QUEUE_COUNTER = new AtomicInteger();
-  private static SQSRestServer server;
-  private static URI endpoint;
-
-  @BeforeAll
-  static void startSqsServer() {
-    server = SQSRestServerBuilder.withInterface("localhost").withDynamicPort().start();
-    InetSocketAddress address = server.waitUntilStarted().localAddress();
-    endpoint = URI.create("http://localhost:" + address.getPort());
-  }
-
-  @AfterAll
-  static void stopSqsServer() {
-    if (server != null) {
-      server.stopAndWait();
-      server = null;
-    }
-  }
-
-  @BeforeEach
-  void setUpAwsCredentials() {
-    System.setProperty(SdkSystemSetting.AWS_ACCESS_KEY_ID.property(), "my-access-key");
-    System.setProperty(SdkSystemSetting.AWS_SECRET_ACCESS_KEY.property(), "my-secret-key");
-  }
-
-  @Test
-  void traceDetailsPropagatedViaSqsSystemMessageAttributes() throws Exception {
-    try (SqsClient client = newClient()) {
-      String queueUrl = createQueue(client);
-      writer.clear();
-
-      TraceUtils.runUnderTrace(
-          "parent",
-          () -> {
-            client.sendMessage(
-                SendMessageRequest.builder().queueUrl(queueUrl).messageBody("sometext").build());
-            return null;
-          });
-      List<Message> messages =
-          client
-              .receiveMessage(ReceiveMessageRequest.builder().queueUrl(queueUrl).build())
-              .messages();
-      messages.forEach(message -> {});
-
-      DDSpan sendSpan = assertSqsSendReceiveTraces(queueUrl);
-      assertEquals(1, messages.size());
-
-      String awsTraceHeader = messages.get(0).attributesAsStrings().get("AWSTraceHeader");
-      assertNotNull(awsTraceHeader);
-      assertTrue(
-          awsTraceHeader.matches(
-              "Root=1-[0-9a-f]{8}-00000000"
-                  + sendSpan.getTraceId().toHexStringPadded(16)
-                  + ";Parent="
-                  + DDSpanId.toHexStringPadded(sendSpan.getSpanId())
-                  + ";Sampled=1"));
-    }
-  }
-
-  @Test
-  @WithConfig(key = "sqs.inject.datadog.attribute.enabled", value = "false")
-  void datadogContextIsNotInjectedIfSqsInjectDatadogAttributeIsDisabled() throws Exception {
-    try (SqsClient client = newClient()) {
-      String queueUrl = createQueue(client);
-      writer.clear();
-
-      client.sendMessage(
-          SendMessageRequest.builder().queueUrl(queueUrl).messageBody("sometext").build());
-      List<Message> messages =
-          client
-              .receiveMessage(ReceiveMessageRequest.builder().queueUrl(queueUrl).build())
-              .messages();
-
-      assertEquals(1, messages.size());
-      assertFalse(messages.get(0).messageAttributes().containsKey("_datadog"));
-    }
-  }
-
-  @Test
-  void apmTraceContextIsInjectedIntoDatadogMessageAttributeOnSend() throws Exception {
-    try (SqsClient client = newClient()) {
-      String queueUrl = createQueue(client);
-      writer.clear();
-
-      TraceUtils.runUnderTrace(
-          "parent",
-          () -> {
-            client.sendMessage(
-                SendMessageRequest.builder().queueUrl(queueUrl).messageBody("sometext").build());
-            return null;
-          });
-      List<Message> messages =
-          client
-              .receiveMessage(ReceiveMessageRequest.builder().queueUrl(queueUrl).build())
-              .messages();
-      messages.forEach(message -> {});
-
-      DDSpan sendSpan = assertSqsSendReceiveTraces(queueUrl);
-      MessageAttributeValue datadogAttribute = messages.get(0).messageAttributes().get("_datadog");
-      assertNotNull(datadogAttribute);
-      assertEquals("String", datadogAttribute.dataType());
-      assertTrue(datadogAttribute.stringValue().contains("\"x-datadog-trace-id\""));
-      assertTrue(datadogAttribute.stringValue().contains(sendSpan.getTraceId().toString()));
-      assertTrue(datadogAttribute.stringValue().contains("\"x-datadog-parent-id\""));
-      assertTrue(
-          datadogAttribute.stringValue().contains(Long.toUnsignedString(sendSpan.getSpanId())));
-    }
-  }
-
-  @Test
-  void traceDetailsPropagatedViaEmbeddedSqsMessageAttributeString() throws Exception {
-    assumeFalse(isDataStreamsEnabled());
-
-    writer.clear();
-    Message message =
-        Message.builder()
-            .messageAttributes(
-                Collections.singletonMap(
-                    "_datadog",
-                    MessageAttributeValue.builder()
-                        .dataType("String")
-                        .stringValue(
-                            "{\"x-datadog-trace-id\": \"4948377316357291421\", "
-                                + "\"x-datadog-parent-id\": \"6746998015037429512\", "
-                                + "\"x-datadog-sampling-priority\": \"1\"}")
-                        .build()))
-            .build();
-    List<Message> messages =
-        new TracingList(
-            Collections.singletonList(message), expectedQueueUrl("somequeue"), requestId());
-
-    messages.forEach(ignored -> {});
-
-    assertEmbeddedReceiveSpan("somequeue");
-  }
-
-  @Test
-  void traceDetailsPropagatedViaEmbeddedSqsMessageAttributeBinary() throws Exception {
-    assumeFalse(isDataStreamsEnabled());
-
-    assertEmbeddedBinaryHeader(
-        UTF_8.encode(
-            "{\"x-datadog-trace-id\":\"4948377316357291421\","
+    private static final AnonymousCredentialsProvider CREDENTIALS_PROVIDER = AnonymousCredentialsProvider.create();
+    private static final AtomicInteger QUEUE_COUNTER = new AtomicInteger();
+    private static SQSRestServer server;
+    private static URI endpoint;
+
+    @BeforeAll
+    static void startSqsServer() {
+        server = SQSRestServerBuilder.withInterface("localhost")
+                .withDynamicPort()
+                .start();
+        InetSocketAddress address = server.waitUntilStarted().localAddress();
+        endpoint = URI.create("http://localhost:" + address.getPort());
+    }
+
+    @AfterAll
+    static void stopSqsServer() {
+        if (server != null) {
+            server.stopAndWait();
+            server = null;
+        }
+    }
+
+    @BeforeEach
+    void setUpAwsCredentials() {
+        System.setProperty(SdkSystemSetting.AWS_ACCESS_KEY_ID.property(), "my-access-key");
+        System.setProperty(SdkSystemSetting.AWS_SECRET_ACCESS_KEY.property(), "my-secret-key");
+    }
+
+    @Test
+    void traceDetailsPropagatedViaSqsSystemMessageAttributes() throws Exception {
+        try (SqsClient client = newClient()) {
+            String queueUrl = createQueue(client);
+            writer.clear();
+
+            TraceUtils.runUnderTrace("parent", () -> {
+                client.sendMessage(SendMessageRequest.builder()
+                        .queueUrl(queueUrl)
+                        .messageBody("sometext")
+                        .build());
+                return null;
+            });
+            List<Message> messages = client.receiveMessage(
+                            ReceiveMessageRequest.builder().queueUrl(queueUrl).build())
+                    .messages();
+            messages.forEach(message -> {});
+
+            DDSpan sendSpan = assertSqsSendReceiveTraces(queueUrl);
+            assertEquals(1, messages.size());
+
+            String awsTraceHeader = messages.get(0).attributesAsStrings().get("AWSTraceHeader");
+            assertNotNull(awsTraceHeader);
+            assertTrue(awsTraceHeader.matches("Root=1-[0-9a-f]{8}-00000000"
+                    + sendSpan.getTraceId().toHexStringPadded(16)
+                    + ";Parent="
+                    + DDSpanId.toHexStringPadded(sendSpan.getSpanId())
+                    + ";Sampled=1"));
+        }
+    }
+
+    @Test
+    @WithConfig(key = "sqs.inject.datadog.attribute.enabled", value = "false")
+    void datadogContextIsNotInjectedIfSqsInjectDatadogAttributeIsDisabled() throws Exception {
+        try (SqsClient client = newClient()) {
+            String queueUrl = createQueue(client);
+            writer.clear();
+
+            client.sendMessage(SendMessageRequest.builder()
+                    .queueUrl(queueUrl)
+                    .messageBody("sometext")
+                    .build());
+            List<Message> messages = client.receiveMessage(
+                            ReceiveMessageRequest.builder().queueUrl(queueUrl).build())
+                    .messages();
+
+            assertEquals(1, messages.size());
+            assertFalse(messages.get(0).messageAttributes().containsKey("_datadog"));
+        }
+    }
+
+    @Test
+    void apmTraceContextIsInjectedIntoDatadogMessageAttributeOnSend() throws Exception {
+        try (SqsClient client = newClient()) {
+            String queueUrl = createQueue(client);
+            writer.clear();
+
+            TraceUtils.runUnderTrace("parent", () -> {
+                client.sendMessage(SendMessageRequest.builder()
+                        .queueUrl(queueUrl)
+                        .messageBody("sometext")
+                        .build());
+                return null;
+            });
+            List<Message> messages = client.receiveMessage(
+                            ReceiveMessageRequest.builder().queueUrl(queueUrl).build())
+                    .messages();
+            messages.forEach(message -> {});
+
+            DDSpan sendSpan = assertSqsSendReceiveTraces(queueUrl);
+            MessageAttributeValue datadogAttribute =
+                    messages.get(0).messageAttributes().get("_datadog");
+            assertNotNull(datadogAttribute);
+            assertEquals("String", datadogAttribute.dataType());
+            assertTrue(datadogAttribute.stringValue().contains("\"x-datadog-trace-id\""));
+            assertTrue(datadogAttribute
+                    .stringValue()
+                    .contains(sendSpan.getTraceId().toString()));
+            assertTrue(datadogAttribute.stringValue().contains("\"x-datadog-parent-id\""));
+            assertTrue(datadogAttribute.stringValue().contains(Long.toUnsignedString(sendSpan.getSpanId())));
+        }
+    }
+
+    @Test
+    void traceDetailsPropagatedViaEmbeddedSqsMessageAttributeString() throws Exception {
+        assumeFalse(isDataStreamsEnabled());
+
+        writer.clear();
+        Message message = Message.builder()
+                .messageAttributes(Collections.singletonMap(
+                        "_datadog",
+                        MessageAttributeValue.builder()
+                                .dataType("String")
+                                .stringValue("{\"x-datadog-trace-id\": \"4948377316357291421\", "
+                                        + "\"x-datadog-parent-id\": \"6746998015037429512\", "
+                                        + "\"x-datadog-sampling-priority\": \"1\"}")
+                                .build()))
+                .build();
+        List<Message> messages =
+                new TracingList(Collections.singletonList(message), expectedQueueUrl("somequeue"), requestId());
+
+        messages.forEach(ignored -> {});
+
+        assertEmbeddedReceiveSpan("somequeue");
+    }
+
+    @Test
+    void traceDetailsPropagatedViaEmbeddedSqsMessageAttributeBinary() throws Exception {
+        assumeFalse(isDataStreamsEnabled());
+
+        assertEmbeddedBinaryHeader(UTF_8.encode("{\"x-datadog-trace-id\":\"4948377316357291421\","
                 + "\"x-datadog-parent-id\":\"6746998015037429512\","
                 + "\"x-datadog-sampling-priority\":\"1\"}"));
-    assertEmbeddedBinaryHeader(
-        UTF_8.encode(
-            "eyJ4LWRhdGFkb2ctdHJhY2UtaWQiOiI0OTQ4Mzc3MzE2MzU3MjkxNDIxIiwieC1kYXRhZG9n"
-                + "LXBhcmVudC1pZCI6IjY3NDY5OTgwMTUwMzc0Mjk1MTIiLCJ4LWRhdGFkb2ctc2FtcGxpbmct"
-                + "cHJpb3JpdHkiOiIxIn0="));
-  }
-
-  @Test
-  void traceDetailsPropagatedFromSqsToJms() throws Exception {
-    assumeFalse(isDataStreamsEnabled());
-
-    try (SqsClient client = newClient()) {
-      String queueName = queueName();
-      String queueUrl =
-          client.createQueue(CreateQueueRequest.builder().queueName(queueName).build()).queueUrl();
-      SQSConnectionFactory connectionFactory =
-          new SQSConnectionFactory(new ProviderConfiguration(), client);
-      Connection connection = connectionFactory.createConnection();
-      Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-      Queue queue = session.createQueue(queueName);
-      MessageConsumer consumer = session.createConsumer(queue);
-
-      writer.clear();
-
-      MessageAttributeValue datadogAttribute =
-          MessageAttributeValue.builder()
-              .dataType("Binary")
-              .binaryValue(SdkBytes.fromUtf8String("hello world"))
-              .build();
-
-      try {
-        connection.start();
-        TraceUtils.runUnderTrace(
-            "parent",
-            () -> {
-              client.sendMessage(
-                  SendMessageRequest.builder()
-                      .queueUrl(queueUrl)
-                      .messageBody("sometext")
-                      .messageAttributes(Collections.singletonMap("_datadog", datadogAttribute))
-                      .build());
-              return null;
-            });
-        javax.jms.Message message = consumer.receive();
-        consumer.receiveNoWait();
+        assertEmbeddedBinaryHeader(
+                UTF_8.encode("eyJ4LWRhdGFkb2ctdHJhY2UtaWQiOiI0OTQ4Mzc3MzE2MzU3MjkxNDIxIiwieC1kYXRhZG9n"
+                        + "LXBhcmVudC1pZCI6IjY3NDY5OTgwMTUwMzc0Mjk1MTIiLCJ4LWRhdGFkb2ctc2FtcGxpbmct"
+                        + "cHJpb3JpdHkiOiIxIn0="));
+    }
 
-        writer.waitForTraces(4);
+    @Test
+    void traceDetailsPropagatedFromSqsToJms() throws Exception {
+        assumeFalse(isDataStreamsEnabled());
+
+        try (SqsClient client = newClient()) {
+            String queueName = queueName();
+            String queueUrl = client.createQueue(
+                            CreateQueueRequest.builder().queueName(queueName).build())
+                    .queueUrl();
+            SQSConnectionFactory connectionFactory = new SQSConnectionFactory(new ProviderConfiguration(), client);
+            Connection connection = connectionFactory.createConnection();
+            Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            Queue queue = session.createQueue(queueName);
+            MessageConsumer consumer = session.createConsumer(queue);
+
+            writer.clear();
+
+            MessageAttributeValue datadogAttribute = MessageAttributeValue.builder()
+                    .dataType("Binary")
+                    .binaryValue(SdkBytes.fromUtf8String("hello world"))
+                    .build();
+
+            try {
+                connection.start();
+                TraceUtils.runUnderTrace("parent", () -> {
+                    client.sendMessage(SendMessageRequest.builder()
+                            .queueUrl(queueUrl)
+                            .messageBody("sometext")
+                            .messageAttributes(Collections.singletonMap("_datadog", datadogAttribute))
+                            .build());
+                    return null;
+                });
+                javax.jms.Message message = consumer.receive();
+                consumer.receiveNoWait();
+
+                writer.waitForTraces(4);
+
+                DDSpan parentSpan = findSpanByResource("parent");
+                DDSpan sendSpan = findSpanByResource("Sqs.SendMessage");
+                DDSpan receiveSpan = findSpanByResource("Sqs.ReceiveMessage");
+                DDSpan deleteSpan = findSpanByResource("Sqs.DeleteMessage");
+                DDSpan jmsSpan = findSpanByResource("Consumed from Queue " + queue.getQueueName());
+
+                assertTestSpan(parentSpan, 0);
+                assertAwsSpan(
+                        sendSpan,
+                        expectedService("Sqs", "SendMessage"),
+                        expectedOperation("Sqs", "SendMessage"),
+                        "Sqs.SendMessage",
+                        DDSpanTypes.HTTP_CLIENT,
+                        Tags.SPAN_KIND_CLIENT,
+                        "SendMessage",
+                        parentSpan.getSpanId(),
+                        queueUrl);
+                assertEquals(parentSpan.getTraceId(), sendSpan.getTraceId());
+
+                assertAwsSpan(
+                        receiveSpan,
+                        expectedService("Sqs", "ReceiveMessage"),
+                        expectedOperation("Sqs", "ReceiveMessage"),
+                        "Sqs.ReceiveMessage",
+                        DDSpanTypes.MESSAGE_CONSUMER,
+                        Tags.SPAN_KIND_CONSUMER,
+                        "ReceiveMessage",
+                        sendSpan.getSpanId(),
+                        queueUrl);
+                assertEquals(sendSpan.getTraceId(), receiveSpan.getTraceId());
+
+                assertAwsSpan(
+                        deleteSpan,
+                        expectedService("Sqs", "DeleteMessage"),
+                        expectedOperation("Sqs", "DeleteMessage"),
+                        "Sqs.DeleteMessage",
+                        DDSpanTypes.HTTP_CLIENT,
+                        Tags.SPAN_KIND_CLIENT,
+                        "DeleteMessage",
+                        0,
+                        queueUrl);
+
+                assertNotNull(jmsSpan);
+                assertEquals(expectedJmsService(), jmsSpan.getServiceName());
+                assertEquals(expectedJmsOperation(), jmsSpan.getOperationName().toString());
+                assertEquals(DDSpanTypes.MESSAGE_CONSUMER, jmsSpan.getSpanType());
+                assertEquals(sendSpan.getSpanId(), jmsSpan.getParentId());
+                assertEquals(sendSpan.getTraceId(), jmsSpan.getTraceId());
+                assertEquals("jms", tagValue(jmsSpan, Tags.COMPONENT));
+                assertEquals(Tags.SPAN_KIND_CONSUMER, tagValue(jmsSpan, Tags.SPAN_KIND));
+                assertNotNull(jmsSpan.getTag(InstrumentationTags.RECORD_QUEUE_TIME_MS));
+
+                String expectedTraceProperty =
+                        "X-Amzn-Trace-Id".toLowerCase(Locale.ENGLISH).replace("-", "__dash__");
+                assertTrue(message.getStringProperty(expectedTraceProperty)
+                        .matches("Root=1-[0-9a-f]{8}-00000000"
+                                + sendSpan.getTraceId().toHexStringPadded(16)
+                                + ";Parent="
+                                + DDSpanId.toHexStringPadded(sendSpan.getSpanId())
+                                + ";Sampled=1"));
+                assertFalse(message.propertyExists("_datadog"));
+            } finally {
+                session.close();
+                connection.stop();
+            }
+        }
+    }
+
+    abstract String expectedOperation(String awsService, String awsOperation);
+
+    abstract String expectedService(String awsService, String awsOperation);
+
+    boolean isDataStreamsEnabled() {
+        return false;
+    }
+
+    private SqsClient newClient() {
+        return SqsClient.builder()
+                .region(Region.EU_CENTRAL_1)
+                .endpointOverride(endpoint)
+                .credentialsProvider(CREDENTIALS_PROVIDER)
+                .build();
+    }
+
+    private static String createQueue(SqsClient client) {
+        return client.createQueue(
+                        CreateQueueRequest.builder().queueName(queueName()).build())
+                .queueUrl();
+    }
+
+    private static String queueName() {
+        return "somequeue" + QUEUE_COUNTER.incrementAndGet();
+    }
+
+    private DDSpan assertSqsSendReceiveTraces(String queueUrl) throws Exception {
+        writer.waitForTraces(2);
 
         DDSpan parentSpan = findSpanByResource("parent");
         DDSpan sendSpan = findSpanByResource("Sqs.SendMessage");
         DDSpan receiveSpan = findSpanByResource("Sqs.ReceiveMessage");
-        DDSpan deleteSpan = findSpanByResource("Sqs.DeleteMessage");
-        DDSpan jmsSpan = findSpanByResource("Consumed from Queue " + queue.getQueueName());
+
+        assertEquals(2, writer.size(), () -> "Unexpected traces: " + writer);
+        assertEquals(3, spanCount(), () -> "Unexpected spans: " + writer);
 
         assertTestSpan(parentSpan, 0);
         assertAwsSpan(
-            sendSpan,
-            expectedService("Sqs", "SendMessage"),
-            expectedOperation("Sqs", "SendMessage"),
-            "Sqs.SendMessage",
-            DDSpanTypes.HTTP_CLIENT,
-            Tags.SPAN_KIND_CLIENT,
-            "SendMessage",
-            parentSpan.getSpanId(),
-            queueUrl);
+                sendSpan,
+                expectedService("Sqs", "SendMessage"),
+                expectedOperation("Sqs", "SendMessage"),
+                "Sqs.SendMessage",
+                DDSpanTypes.HTTP_CLIENT,
+                Tags.SPAN_KIND_CLIENT,
+                "SendMessage",
+                parentSpan.getSpanId(),
+                queueUrl);
         assertEquals(parentSpan.getTraceId(), sendSpan.getTraceId());
 
         assertAwsSpan(
-            receiveSpan,
-            expectedService("Sqs", "ReceiveMessage"),
-            expectedOperation("Sqs", "ReceiveMessage"),
-            "Sqs.ReceiveMessage",
-            DDSpanTypes.MESSAGE_CONSUMER,
-            Tags.SPAN_KIND_CONSUMER,
-            "ReceiveMessage",
-            sendSpan.getSpanId(),
-            queueUrl);
+                receiveSpan,
+                expectedService("Sqs", "ReceiveMessage"),
+                expectedOperation("Sqs", "ReceiveMessage"),
+                "Sqs.ReceiveMessage",
+                DDSpanTypes.MESSAGE_CONSUMER,
+                Tags.SPAN_KIND_CONSUMER,
+                "ReceiveMessage",
+                sendSpan.getSpanId(),
+                queueUrl);
         assertEquals(sendSpan.getTraceId(), receiveSpan.getTraceId());
 
+        return sendSpan;
+    }
+
+    private void assertEmbeddedBinaryHeader(ByteBuffer headerValue) throws Exception {
+        writer.clear();
+        Message message = Message.builder()
+                .messageAttributes(Collections.singletonMap(
+                        "_datadog",
+                        MessageAttributeValue.builder()
+                                .dataType("Binary")
+                                .binaryValue(SdkBytes.fromByteBuffer(headerValue))
+                                .build()))
+                .build();
+        List<Message> messages =
+                new TracingList(Collections.singletonList(message), expectedQueueUrl("somequeue"), requestId());
+
+        messages.forEach(ignored -> {});
+
+        assertEmbeddedReceiveSpan("somequeue");
+    }
+
+    private void assertEmbeddedReceiveSpan(String queueName) throws Exception {
+        writer.waitForTraces(1);
+
+        DDSpan receiveSpan = findSpanByResource("Sqs.ReceiveMessage");
+        assertEquals(1, writer.size(), () -> "Unexpected traces: " + writer);
+        assertEquals(1, spanCount(), () -> "Unexpected spans: " + writer);
         assertAwsSpan(
-            deleteSpan,
-            expectedService("Sqs", "DeleteMessage"),
-            expectedOperation("Sqs", "DeleteMessage"),
-            "Sqs.DeleteMessage",
-            DDSpanTypes.HTTP_CLIENT,
-            Tags.SPAN_KIND_CLIENT,
-            "DeleteMessage",
-            0,
-            queueUrl);
-
-        assertNotNull(jmsSpan);
-        assertEquals(expectedJmsService(), jmsSpan.getServiceName());
-        assertEquals(expectedJmsOperation(), jmsSpan.getOperationName().toString());
-        assertEquals(DDSpanTypes.MESSAGE_CONSUMER, jmsSpan.getSpanType());
-        assertEquals(sendSpan.getSpanId(), jmsSpan.getParentId());
-        assertEquals(sendSpan.getTraceId(), jmsSpan.getTraceId());
-        assertEquals("jms", tagValue(jmsSpan, Tags.COMPONENT));
-        assertEquals(Tags.SPAN_KIND_CONSUMER, tagValue(jmsSpan, Tags.SPAN_KIND));
-        assertNotNull(jmsSpan.getTag(InstrumentationTags.RECORD_QUEUE_TIME_MS));
-
-        String expectedTraceProperty =
-            "X-Amzn-Trace-Id".toLowerCase(Locale.ENGLISH).replace("-", "__dash__");
-        assertTrue(
-            message
-                .getStringProperty(expectedTraceProperty)
-                .matches(
-                    "Root=1-[0-9a-f]{8}-00000000"
-                        + sendSpan.getTraceId().toHexStringPadded(16)
-                        + ";Parent="
-                        + DDSpanId.toHexStringPadded(sendSpan.getSpanId())
-                        + ";Sampled=1"));
-        assertFalse(message.propertyExists("_datadog"));
-      } finally {
-        session.close();
-        connection.stop();
-      }
-    }
-  }
-
-  abstract String expectedOperation(String awsService, String awsOperation);
-
-  abstract String expectedService(String awsService, String awsOperation);
-
-  boolean isDataStreamsEnabled() {
-    return false;
-  }
-
-  private SqsClient newClient() {
-    return SqsClient.builder()
-        .region(Region.EU_CENTRAL_1)
-        .endpointOverride(endpoint)
-        .credentialsProvider(CREDENTIALS_PROVIDER)
-        .build();
-  }
-
-  private static String createQueue(SqsClient client) {
-    return client
-        .createQueue(CreateQueueRequest.builder().queueName(queueName()).build())
-        .queueUrl();
-  }
-
-  private static String queueName() {
-    return "somequeue" + QUEUE_COUNTER.incrementAndGet();
-  }
-
-  private DDSpan assertSqsSendReceiveTraces(String queueUrl) throws Exception {
-    writer.waitForTraces(2);
-
-    DDSpan parentSpan = findSpanByResource("parent");
-    DDSpan sendSpan = findSpanByResource("Sqs.SendMessage");
-    DDSpan receiveSpan = findSpanByResource("Sqs.ReceiveMessage");
-
-    assertEquals(2, writer.size(), () -> "Unexpected traces: " + writer);
-    assertEquals(3, spanCount(), () -> "Unexpected spans: " + writer);
-
-    assertTestSpan(parentSpan, 0);
-    assertAwsSpan(
-        sendSpan,
-        expectedService("Sqs", "SendMessage"),
-        expectedOperation("Sqs", "SendMessage"),
-        "Sqs.SendMessage",
-        DDSpanTypes.HTTP_CLIENT,
-        Tags.SPAN_KIND_CLIENT,
-        "SendMessage",
-        parentSpan.getSpanId(),
-        queueUrl);
-    assertEquals(parentSpan.getTraceId(), sendSpan.getTraceId());
-
-    assertAwsSpan(
-        receiveSpan,
-        expectedService("Sqs", "ReceiveMessage"),
-        expectedOperation("Sqs", "ReceiveMessage"),
-        "Sqs.ReceiveMessage",
-        DDSpanTypes.MESSAGE_CONSUMER,
-        Tags.SPAN_KIND_CONSUMER,
-        "ReceiveMessage",
-        sendSpan.getSpanId(),
-        queueUrl);
-    assertEquals(sendSpan.getTraceId(), receiveSpan.getTraceId());
-
-    return sendSpan;
-  }
-
-  private void assertEmbeddedBinaryHeader(ByteBuffer headerValue) throws Exception {
-    writer.clear();
-    Message message =
-        Message.builder()
-            .messageAttributes(
-                Collections.singletonMap(
-                    "_datadog",
-                    MessageAttributeValue.builder()
-                        .dataType("Binary")
-                        .binaryValue(SdkBytes.fromByteBuffer(headerValue))
-                        .build()))
-            .build();
-    List<Message> messages =
-        new TracingList(
-            Collections.singletonList(message), expectedQueueUrl("somequeue"), requestId());
-
-    messages.forEach(ignored -> {});
-
-    assertEmbeddedReceiveSpan("somequeue");
-  }
-
-  private void assertEmbeddedReceiveSpan(String queueName) throws Exception {
-    writer.waitForTraces(1);
-
-    DDSpan receiveSpan = findSpanByResource("Sqs.ReceiveMessage");
-    assertEquals(1, writer.size(), () -> "Unexpected traces: " + writer);
-    assertEquals(1, spanCount(), () -> "Unexpected spans: " + writer);
-    assertAwsSpan(
-        receiveSpan,
-        expectedService("Sqs", "ReceiveMessage"),
-        expectedOperation("Sqs", "ReceiveMessage"),
-        "Sqs.ReceiveMessage",
-        DDSpanTypes.MESSAGE_CONSUMER,
-        Tags.SPAN_KIND_CONSUMER,
-        "ReceiveMessage",
-        6746998015037429512L,
-        expectedQueueUrl(queueName));
-    assertEquals(4948377316357291421L, receiveSpan.getTraceId().toLong());
-  }
-
-  private static void assertTestSpan(DDSpan span, long parentId) {
-    assertNotNull(span);
-    assertEquals(parentId, span.getParentId());
-    assertFalse(span.isError());
-  }
-
-  private static void assertAwsSpan(
-      DDSpan span,
-      String serviceName,
-      String operationName,
-      String resourceName,
-      String spanType,
-      String spanKind,
-      String awsOperation,
-      long parentId,
-      String queueUrl) {
-    assertNotNull(span);
-    assertEquals(serviceName, span.getServiceName());
-    assertEquals(operationName, span.getOperationName().toString());
-    assertEquals(resourceName, span.getResourceName().toString());
-    assertEquals(spanType, span.getSpanType());
-    assertEquals(parentId, span.getParentId());
-    assertFalse(span.isError());
-    assertEquals("java-aws-sdk", tagValue(span, Tags.COMPONENT));
-    assertEquals(spanKind, tagValue(span, Tags.SPAN_KIND));
-    assertEquals("Sqs", tagValue(span, "aws.service"));
-    assertEquals("Sqs", tagValue(span, "aws_service"));
-    assertEquals(awsOperation, tagValue(span, "aws.operation"));
-    assertEquals("java-aws-sdk", tagValue(span, "aws.agent"));
-    assertEquals(queueUrl, tagValue(span, "aws.queue.url"));
-    assertEquals(queueName(queueUrl), tagValue(span, "aws.queue.name"));
-    assertEquals(queueName(queueUrl), tagValue(span, "queuename"));
-    assertEquals(requestId(), tagValue(span, "aws.requestId").trim());
-  }
-
-  private static String queueName(String queueUrl) {
-    return queueUrl.substring(queueUrl.lastIndexOf('/') + 1);
-  }
-
-  private static String tagValue(DDSpan span, String tagName) {
-    Object value = span.getTag(tagName);
-    return value == null ? null : value.toString();
-  }
-
-  private static DDSpan findSpanByResource(String resourceName) {
-    for (List<DDSpan> trace : writer) {
-      for (DDSpan span : trace) {
-        if (resourceName.equals(span.getResourceName().toString())) {
-          return span;
+                receiveSpan,
+                expectedService("Sqs", "ReceiveMessage"),
+                expectedOperation("Sqs", "ReceiveMessage"),
+                "Sqs.ReceiveMessage",
+                DDSpanTypes.MESSAGE_CONSUMER,
+                Tags.SPAN_KIND_CONSUMER,
+                "ReceiveMessage",
+                6746998015037429512L,
+                expectedQueueUrl(queueName));
+        assertEquals(4948377316357291421L, receiveSpan.getTraceId().toLong());
+    }
+
+    private static void assertTestSpan(DDSpan span, long parentId) {
+        assertNotNull(span);
+        assertEquals(parentId, span.getParentId());
+        assertFalse(span.isError());
+    }
+
+    private static void assertAwsSpan(
+            DDSpan span,
+            String serviceName,
+            String operationName,
+            String resourceName,
+            String spanType,
+            String spanKind,
+            String awsOperation,
+            long parentId,
+            String queueUrl) {
+        assertNotNull(span);
+        assertEquals(serviceName, span.getServiceName());
+        assertEquals(operationName, span.getOperationName().toString());
+        assertEquals(resourceName, span.getResourceName().toString());
+        assertEquals(spanType, span.getSpanType());
+        assertEquals(parentId, span.getParentId());
+        assertFalse(span.isError());
+        assertEquals("java-aws-sdk", tagValue(span, Tags.COMPONENT));
+        assertEquals(spanKind, tagValue(span, Tags.SPAN_KIND));
+        assertEquals("Sqs", tagValue(span, "aws.service"));
+        assertEquals("Sqs", tagValue(span, "aws_service"));
+        assertEquals(awsOperation, tagValue(span, "aws.operation"));
+        assertEquals("java-aws-sdk", tagValue(span, "aws.agent"));
+        assertEquals(queueUrl, tagValue(span, "aws.queue.url"));
+        assertEquals(queueName(queueUrl), tagValue(span, "aws.queue.name"));
+        assertEquals(queueName(queueUrl), tagValue(span, "queuename"));
+        assertEquals(requestId(), tagValue(span, "aws.requestId").trim());
+    }
+
+    private static String queueName(String queueUrl) {
+        return queueUrl.substring(queueUrl.lastIndexOf('/') + 1);
+    }
+
+    private static String tagValue(DDSpan span, String tagName) {
+        Object value = span.getTag(tagName);
+        return value == null ? null : value.toString();
+    }
+
+    private static DDSpan findSpanByResource(String resourceName) {
+        for (List<DDSpan> trace : writer) {
+            for (DDSpan span : trace) {
+                if (resourceName.equals(span.getResourceName().toString())) {
+                    return span;
+                }
+            }
         }
-      }
-    }
-    return null;
-  }
-
-  private static int spanCount() {
-    int count = 0;
-    for (List<DDSpan> trace : writer) {
-      count += trace.size();
-    }
-    return count;
-  }
-
-  private static String expectedQueueUrl(String queueName) {
-    return endpoint + "/000000000000/" + queueName;
-  }
-
-  private static String requestId() {
-    return "00000000-0000-0000-0000-000000000000";
-  }
-
-  private static String expectedJmsService() {
-    String service =
-        SpanNaming.instance()
-            .namingSchema()
-            .messaging()
-            .inboundService("jms", Config.get().isJmsLegacyTracingEnabled())
-            .get();
-    return service == null ? Config.get().getServiceName() : service;
-  }
-
-  private static String expectedJmsOperation() {
-    return SpanNaming.instance().namingSchema().messaging().inboundOperation("jms");
-  }
+        return null;
+    }
+
+    private static int spanCount() {
+        int count = 0;
+        for (List<DDSpan> trace : writer) {
+            count += trace.size();
+        }
+        return count;
+    }
+
+    private static String expectedQueueUrl(String queueName) {
+        return endpoint + "/000000000000/" + queueName;
+    }
+
+    private static String requestId() {
+        return "00000000-0000-0000-0000-000000000000";
+    }
+
+    private static String expectedJmsService() {
+        String service = SpanNaming.instance()
+                .namingSchema()
+                .messaging()
+                .inboundService("jms", Config.get().isJmsLegacyTracingEnabled())
+                .get();
+        return service == null ? Config.get().getServiceName() : service;
+    }
+
+    private static String expectedJmsOperation() {
+        return SpanNaming.instance().namingSchema().messaging().inboundOperation("jms");
+    }
 }
 
 @WithConfig(key = TracerConfig.TRACE_SPAN_ATTRIBUTE_SCHEMA, value = "v0")
 abstract class SqsClientV0TestBase extends SqsClientTestBase {
-  @Override
-  String expectedOperation(String awsService, String awsOperation) {
-    return "aws.http";
-  }
-
-  @Override
-  String expectedService(String awsService, String awsOperation) {
-    if ("Sqs".equals(awsService)) {
-      return "sqs";
-    }
-    return "java-aws-sdk";
-  }
+    @Override
+    String expectedOperation(String awsService, String awsOperation) {
+        return "aws.http";
+    }
+
+    @Override
+    String expectedService(String awsService, String awsOperation) {
+        if ("Sqs".equals(awsService)) {
+            return "sqs";
+        }
+        return "java-aws-sdk";
+    }
 }
 
 @WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "false")
@@ -529,10 +511,10 @@ class SqsClientV0Test extends SqsClientV0TestBase {}
 
 @WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "true")
 class SqsClientV0DataStreamsTest extends SqsClientV0TestBase {
-  @Override
-  boolean isDataStreamsEnabled() {
-    return true;
-  }
+    @Override
+    boolean isDataStreamsEnabled() {
+        return true;
+    }
 }
 
 @WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "false")
@@ -541,22 +523,22 @@ class SqsClientV0ContextSwapForkedTest extends SqsClientV0TestBase {}
 
 @WithConfig(key = TracerConfig.TRACE_SPAN_ATTRIBUTE_SCHEMA, value = "v1")
 abstract class SqsClientV1TestBase extends SqsClientTestBase {
-  @Override
-  String expectedOperation(String awsService, String awsOperation) {
-    if ("Sqs".equals(awsService)) {
-      if ("ReceiveMessage".equals(awsOperation)) {
-        return "aws.sqs.process";
-      } else if ("SendMessage".equals(awsOperation)) {
-        return "aws.sqs.send";
-      }
-    }
-    return "aws." + awsService.toLowerCase(Locale.ROOT) + ".request";
-  }
-
-  @Override
-  String expectedService(String awsService, String awsOperation) {
-    return "A-service";
-  }
+    @Override
+    String expectedOperation(String awsService, String awsOperation) {
+        if ("Sqs".equals(awsService)) {
+            if ("ReceiveMessage".equals(awsOperation)) {
+                return "aws.sqs.process";
+            } else if ("SendMessage".equals(awsOperation)) {
+                return "aws.sqs.send";
+            }
+        }
+        return "aws." + awsService.toLowerCase(Locale.ROOT) + ".request";
+    }
+
+    @Override
+    String expectedService(String awsService, String awsOperation) {
+        return "A-service";
+    }
 }
 
 @WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "false")
@@ -564,198 +546,196 @@ class SqsClientV1ForkedTest extends SqsClientV1TestBase {}
 
 @WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "true")
 class SqsClientV1DataStreamsForkedTest extends SqsClientV1TestBase {
-  @Override
-  boolean isDataStreamsEnabled() {
-    return true;
-  }
+    @Override
+    boolean isDataStreamsEnabled() {
+        return true;
+    }
 }
 
 @WithConfig(key = GeneralConfig.SERVICE_NAME, value = "A-service")
 @WithConfig(key = TracerConfig.SCOPE_ITERATION_KEEP_ALIVE, value = "1")
 abstract class SqsClientReceiveIterationTestBase extends AbstractInstrumentationTest {
-  private static final AnonymousCredentialsProvider CREDENTIALS_PROVIDER =
-      AnonymousCredentialsProvider.create();
-  private static SQSRestServer server;
-  private static URI endpoint;
-
-  @BeforeAll
-  static void startSqsServer() {
-    server = SQSRestServerBuilder.withInterface("localhost").withDynamicPort().start();
-    InetSocketAddress address = server.waitUntilStarted().localAddress();
-    endpoint = URI.create("http://localhost:" + address.getPort());
-  }
-
-  @AfterAll
-  static void stopSqsServer() {
-    if (server != null) {
-      server.stopAndWait();
-      server = null;
-    }
-  }
-
-  @BeforeEach
-  void setUpAwsCredentials() {
-    if (closePreviousBeforeTest()) {
-      AgentTracer.closePrevious(true);
-    }
-    System.setProperty(SdkSystemSetting.AWS_ACCESS_KEY_ID.property(), "my-access-key");
-    System.setProperty(SdkSystemSetting.AWS_SECRET_ACCESS_KEY.property(), "my-secret-key");
-  }
-
-  @Test
-  void syncReceiveActivatesConsumerSpanForUserHandlerIteration() throws Exception {
-    try (SqsClient client =
-        SqsClient.builder()
-            .region(Region.EU_CENTRAL_1)
-            .endpointOverride(endpoint)
-            .credentialsProvider(CREDENTIALS_PROVIDER)
-            .build()) {
-      String queueUrl =
-          client
-              .createQueue(CreateQueueRequest.builder().queueName("somequeue").build())
-              .queueUrl();
-      writer.clear();
-
-      TraceUtils.runUnderTrace(
-          "parent",
-          () -> {
-            client.sendMessage(
-                SendMessageRequest.builder().queueUrl(queueUrl).messageBody("sometext").build());
-            return null;
-          });
-
-      // The sync AWS SDK receive pipeline rebuilds the immutable response before user code sees it.
-      // Iterating the copied message list must still activate the consumer span for user handlers.
-      List<Message> messages =
-          client
-              .receiveMessage(ReceiveMessageRequest.builder().queueUrl(queueUrl).build())
-              .messages();
-      messages.forEach(message -> TraceUtils.runUnderTrace("handler", () -> null));
-
-      assertEquals(1, messages.size());
-      writer.waitForTraces(2);
-
-      DDSpan parentSpan = findSpanByResource("parent");
-      DDSpan sendSpan = findSpanByResource("Sqs.SendMessage");
-      DDSpan receiveSpan = findSpanByResource("Sqs.ReceiveMessage");
-      DDSpan handlerSpan = findSpanByResource("handler");
-
-      assertEquals(2, writer.size(), () -> "Unexpected traces: " + writer);
-      assertEquals(4, spanCount(), () -> "Unexpected spans: " + writer);
-
-      assertTestSpan(parentSpan, 0);
-      assertAwsSpan(
-          sendSpan,
-          expectedService("Sqs", "SendMessage"),
-          expectedOperation("Sqs", "SendMessage"),
-          "Sqs.SendMessage",
-          DDSpanTypes.HTTP_CLIENT,
-          Tags.SPAN_KIND_CLIENT,
-          "SendMessage",
-          parentSpan.getSpanId());
-      assertEquals(parentSpan.getTraceId(), sendSpan.getTraceId());
-
-      assertAwsSpan(
-          receiveSpan,
-          expectedService("Sqs", "ReceiveMessage"),
-          expectedOperation("Sqs", "ReceiveMessage"),
-          "Sqs.ReceiveMessage",
-          DDSpanTypes.MESSAGE_CONSUMER,
-          Tags.SPAN_KIND_CONSUMER,
-          "ReceiveMessage",
-          sendSpan.getSpanId());
-      assertEquals(sendSpan.getTraceId(), receiveSpan.getTraceId());
-
-      assertTestSpan(handlerSpan, receiveSpan.getSpanId());
-      assertEquals(receiveSpan.getTraceId(), handlerSpan.getTraceId());
-    }
-  }
-
-  abstract String expectedOperation(String awsService, String awsOperation);
-
-  abstract String expectedService(String awsService, String awsOperation);
-
-  boolean closePreviousBeforeTest() {
-    return true;
-  }
-
-  private static void assertTestSpan(DDSpan span, long parentId) {
-    assertNotNull(span);
-    assertEquals(parentId, span.getParentId());
-    assertFalse(span.isError());
-  }
-
-  private static void assertAwsSpan(
-      DDSpan span,
-      String serviceName,
-      String operationName,
-      String resourceName,
-      String spanType,
-      String spanKind,
-      String awsOperation,
-      long parentId) {
-    assertNotNull(span);
-    assertEquals(serviceName, span.getServiceName());
-    assertEquals(operationName, span.getOperationName().toString());
-    assertEquals(resourceName, span.getResourceName().toString());
-    assertEquals(spanType, span.getSpanType());
-    assertEquals(parentId, span.getParentId());
-    assertFalse(span.isError());
-    assertEquals("java-aws-sdk", tagValue(span, Tags.COMPONENT));
-    assertEquals(spanKind, tagValue(span, Tags.SPAN_KIND));
-    assertEquals("Sqs", tagValue(span, "aws.service"));
-    assertEquals("Sqs", tagValue(span, "aws_service"));
-    assertEquals(awsOperation, tagValue(span, "aws.operation"));
-    assertEquals("java-aws-sdk", tagValue(span, "aws.agent"));
-    assertEquals(expectedQueueUrl(), tagValue(span, "aws.queue.url"));
-    assertEquals("somequeue", tagValue(span, "aws.queue.name"));
-    assertEquals("somequeue", tagValue(span, "queuename"));
-    assertEquals("00000000-0000-0000-0000-000000000000", tagValue(span, "aws.requestId"));
-  }
-
-  private static String tagValue(DDSpan span, String tagName) {
-    Object value = span.getTag(tagName);
-    return value == null ? null : value.toString();
-  }
-
-  private static DDSpan findSpanByResource(String resourceName) {
-    for (List<DDSpan> trace : writer) {
-      for (DDSpan span : trace) {
-        if (resourceName.equals(span.getResourceName().toString())) {
-          return span;
+    private static final AnonymousCredentialsProvider CREDENTIALS_PROVIDER = AnonymousCredentialsProvider.create();
+    private static SQSRestServer server;
+    private static URI endpoint;
+
+    @BeforeAll
+    static void startSqsServer() {
+        server = SQSRestServerBuilder.withInterface("localhost")
+                .withDynamicPort()
+                .start();
+        InetSocketAddress address = server.waitUntilStarted().localAddress();
+        endpoint = URI.create("http://localhost:" + address.getPort());
+    }
+
+    @AfterAll
+    static void stopSqsServer() {
+        if (server != null) {
+            server.stopAndWait();
+            server = null;
+        }
+    }
+
+    @BeforeEach
+    void setUpAwsCredentials() {
+        if (closePreviousBeforeTest()) {
+            AgentTracer.closePrevious(true);
+        }
+        System.setProperty(SdkSystemSetting.AWS_ACCESS_KEY_ID.property(), "my-access-key");
+        System.setProperty(SdkSystemSetting.AWS_SECRET_ACCESS_KEY.property(), "my-secret-key");
+    }
+
+    @Test
+    void syncReceiveActivatesConsumerSpanForUserHandlerIteration() throws Exception {
+        try (SqsClient client = SqsClient.builder()
+                .region(Region.EU_CENTRAL_1)
+                .endpointOverride(endpoint)
+                .credentialsProvider(CREDENTIALS_PROVIDER)
+                .build()) {
+            String queueUrl = client.createQueue(
+                            CreateQueueRequest.builder().queueName("somequeue").build())
+                    .queueUrl();
+            writer.clear();
+
+            TraceUtils.runUnderTrace("parent", () -> {
+                client.sendMessage(SendMessageRequest.builder()
+                        .queueUrl(queueUrl)
+                        .messageBody("sometext")
+                        .build());
+                return null;
+            });
+
+            // The sync AWS SDK receive pipeline rebuilds the immutable response before user code sees it.
+            // Iterating the copied message list must still activate the consumer span for user handlers.
+            List<Message> messages = client.receiveMessage(
+                            ReceiveMessageRequest.builder().queueUrl(queueUrl).build())
+                    .messages();
+            messages.forEach(message -> TraceUtils.runUnderTrace("handler", () -> null));
+
+            assertEquals(1, messages.size());
+            writer.waitForTraces(2);
+
+            DDSpan parentSpan = findSpanByResource("parent");
+            DDSpan sendSpan = findSpanByResource("Sqs.SendMessage");
+            DDSpan receiveSpan = findSpanByResource("Sqs.ReceiveMessage");
+            DDSpan handlerSpan = findSpanByResource("handler");
+
+            assertEquals(2, writer.size(), () -> "Unexpected traces: " + writer);
+            assertEquals(4, spanCount(), () -> "Unexpected spans: " + writer);
+
+            assertTestSpan(parentSpan, 0);
+            assertAwsSpan(
+                    sendSpan,
+                    expectedService("Sqs", "SendMessage"),
+                    expectedOperation("Sqs", "SendMessage"),
+                    "Sqs.SendMessage",
+                    DDSpanTypes.HTTP_CLIENT,
+                    Tags.SPAN_KIND_CLIENT,
+                    "SendMessage",
+                    parentSpan.getSpanId());
+            assertEquals(parentSpan.getTraceId(), sendSpan.getTraceId());
+
+            assertAwsSpan(
+                    receiveSpan,
+                    expectedService("Sqs", "ReceiveMessage"),
+                    expectedOperation("Sqs", "ReceiveMessage"),
+                    "Sqs.ReceiveMessage",
+                    DDSpanTypes.MESSAGE_CONSUMER,
+                    Tags.SPAN_KIND_CONSUMER,
+                    "ReceiveMessage",
+                    sendSpan.getSpanId());
+            assertEquals(sendSpan.getTraceId(), receiveSpan.getTraceId());
+
+            assertTestSpan(handlerSpan, receiveSpan.getSpanId());
+            assertEquals(receiveSpan.getTraceId(), handlerSpan.getTraceId());
         }
-      }
     }
-    return null;
-  }
 
-  private static int spanCount() {
-    int count = 0;
-    for (List<DDSpan> trace : writer) {
-      count += trace.size();
+    abstract String expectedOperation(String awsService, String awsOperation);
+
+    abstract String expectedService(String awsService, String awsOperation);
+
+    boolean closePreviousBeforeTest() {
+        return true;
+    }
+
+    private static void assertTestSpan(DDSpan span, long parentId) {
+        assertNotNull(span);
+        assertEquals(parentId, span.getParentId());
+        assertFalse(span.isError());
+    }
+
+    private static void assertAwsSpan(
+            DDSpan span,
+            String serviceName,
+            String operationName,
+            String resourceName,
+            String spanType,
+            String spanKind,
+            String awsOperation,
+            long parentId) {
+        assertNotNull(span);
+        assertEquals(serviceName, span.getServiceName());
+        assertEquals(operationName, span.getOperationName().toString());
+        assertEquals(resourceName, span.getResourceName().toString());
+        assertEquals(spanType, span.getSpanType());
+        assertEquals(parentId, span.getParentId());
+        assertFalse(span.isError());
+        assertEquals("java-aws-sdk", tagValue(span, Tags.COMPONENT));
+        assertEquals(spanKind, tagValue(span, Tags.SPAN_KIND));
+        assertEquals("Sqs", tagValue(span, "aws.service"));
+        assertEquals("Sqs", tagValue(span, "aws_service"));
+        assertEquals(awsOperation, tagValue(span, "aws.operation"));
+        assertEquals("java-aws-sdk", tagValue(span, "aws.agent"));
+        assertEquals(expectedQueueUrl(), tagValue(span, "aws.queue.url"));
+        assertEquals("somequeue", tagValue(span, "aws.queue.name"));
+        assertEquals("somequeue", tagValue(span, "queuename"));
+        assertEquals("00000000-0000-0000-0000-000000000000", tagValue(span, "aws.requestId"));
+    }
+
+    private static String tagValue(DDSpan span, String tagName) {
+        Object value = span.getTag(tagName);
+        return value == null ? null : value.toString();
+    }
+
+    private static DDSpan findSpanByResource(String resourceName) {
+        for (List<DDSpan> trace : writer) {
+            for (DDSpan span : trace) {
+                if (resourceName.equals(span.getResourceName().toString())) {
+                    return span;
+                }
+            }
+        }
+        return null;
     }
-    return count;
-  }
 
-  private static String expectedQueueUrl() {
-    return endpoint + "/000000000000/somequeue";
-  }
+    private static int spanCount() {
+        int count = 0;
+        for (List<DDSpan> trace : writer) {
+            count += trace.size();
+        }
+        return count;
+    }
+
+    private static String expectedQueueUrl() {
+        return endpoint + "/000000000000/somequeue";
+    }
 }
 
 @WithConfig(key = TracerConfig.TRACE_SPAN_ATTRIBUTE_SCHEMA, value = "v0")
 abstract class SqsClientV0ReceiveIterationTestBase extends SqsClientReceiveIterationTestBase {
-  @Override
-  String expectedOperation(String awsService, String awsOperation) {
-    return "aws.http";
-  }
-
-  @Override
-  String expectedService(String awsService, String awsOperation) {
-    if ("Sqs".equals(awsService)) {
-      return "sqs";
-    }
-    return "java-aws-sdk";
-  }
+    @Override
+    String expectedOperation(String awsService, String awsOperation) {
+        return "aws.http";
+    }
+
+    @Override
+    String expectedService(String awsService, String awsOperation) {
+        if ("Sqs".equals(awsService)) {
+            return "sqs";
+        }
+        return "java-aws-sdk";
+    }
 }
 
 @WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "false")
@@ -767,35 +747,34 @@ class SqsClientV0DataStreamsReceiveIterationTest extends SqsClientV0ReceiveItera
 @WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "false")
 @WithConfig(key = TraceInstrumentationConfig.LEGACY_CONTEXT_MANAGER_ENABLED, value = "false")
 class SqsClientV0ContextSwapReceiveIterationForkedTest extends SqsClientV0ReceiveIterationTestBase {
-  @Override
-  boolean closePreviousBeforeTest() {
-    return false;
-  }
+    @Override
+    boolean closePreviousBeforeTest() {
+        return false;
+    }
 }
 
 @WithConfig(key = TracerConfig.TRACE_SPAN_ATTRIBUTE_SCHEMA, value = "v1")
 abstract class SqsClientV1ReceiveIterationTestBase extends SqsClientReceiveIterationTestBase {
-  @Override
-  String expectedOperation(String awsService, String awsOperation) {
-    if ("Sqs".equals(awsService)) {
-      if ("ReceiveMessage".equals(awsOperation)) {
-        return "aws.sqs.process";
-      } else if ("SendMessage".equals(awsOperation)) {
-        return "aws.sqs.send";
-      }
-    }
-    return "aws." + awsService.toLowerCase(Locale.ROOT) + ".request";
-  }
-
-  @Override
-  String expectedService(String awsService, String awsOperation) {
-    return "A-service";
-  }
+    @Override
+    String expectedOperation(String awsService, String awsOperation) {
+        if ("Sqs".equals(awsService)) {
+            if ("ReceiveMessage".equals(awsOperation)) {
+                return "aws.sqs.process";
+            } else if ("SendMessage".equals(awsOperation)) {
+                return "aws.sqs.send";
+            }
+        }
+        return "aws." + awsService.toLowerCase(Locale.ROOT) + ".request";
+    }
+
+    @Override
+    String expectedService(String awsService, String awsOperation) {
+        return "A-service";
+    }
 }
 
 @WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "false")
 class SqsClientV1ReceiveIterationForkedTest extends SqsClientV1ReceiveIterationTestBase {}
 
 @WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "true")
-class SqsClientV1DataStreamsReceiveIterationForkedTest
-    extends SqsClientV1ReceiveIterationTestBase {}
+class SqsClientV1DataStreamsReceiveIterationForkedTest extends SqsClientV1ReceiveIterationTestBase {}
diff --git a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/Axis2Module.java b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/Axis2Module.java
index 0473ee14c30..62bdd69bd00 100644
--- a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/Axis2Module.java
+++ b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/Axis2Module.java
@@ -9,15 +9,15 @@
 
 @AutoService(InstrumenterModule.class)
 public class Axis2Module extends InstrumenterModule.Tracing {
-  public Axis2Module() {
-    super("axis2");
-  }
+    public Axis2Module() {
+        super("axis2");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(
-        new AxisEngineInstrumentation(),
-        new AxisTransportInstrumentation(),
-        new WebSphereAsyncInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(
+                new AxisEngineInstrumentation(),
+                new AxisTransportInstrumentation(),
+                new WebSphereAsyncInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java
index d04e7059aec..67b382af87d 100644
--- a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java
+++ b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java
@@ -21,116 +21,109 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.engine.Handler.InvocationResponse;
 
-public final class AxisEngineInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class AxisEngineInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.axis2.engine.AxisEngine";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("receive", "send", "sendFault"))
-            .and(takesArgument(0, named("org.apache.axis2.context.MessageContext"))),
-        getClass().getName() + "$HandleMessageAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("resumeReceive", "resumeSend", "resumeSendFault"))
-            .and(takesArgument(0, named("org.apache.axis2.context.MessageContext"))),
-        getClass().getName() + "$ResumeMessageAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("invoke"))
-            .and(takesArgument(0, named("org.apache.axis2.context.MessageContext"))),
-        getClass().getName() + "$InvokeMessageAdvice");
-  }
-
-  public static final class HandleMessageAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beginProcessingMessage(
-        @Advice.Argument(0) final MessageContext message) {
-      // only create a span if the message has a clear action and there's a surrounding request
-      if (DECORATE.shouldTrace(message)) {
-        AgentSpan span = startSpan("axis2", AXIS2_MESSAGE);
-        DECORATE.afterStart(span);
-        DECORATE.onMessage(span, message);
-        return activateSpan(span);
-      }
-      return null;
+    @Override
+    public String instrumentedType() {
+        return "org.apache.axis2.engine.AxisEngine";
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void finishProcessingMessage(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Argument(0) final MessageContext message,
-        @Advice.Thrown final Throwable error) {
-      if (null == scope) {
-        return;
-      }
-      AgentSpan span = spanFromScope(scope);
-      if (null != error) {
-        DECORATE.onError(span, error);
-      }
-      DECORATE.beforeFinish(span, message);
-      scope.close();
-      span.finish();
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("receive", "send", "sendFault"))
+                        .and(takesArgument(0, named("org.apache.axis2.context.MessageContext"))),
+                getClass().getName() + "$HandleMessageAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("resumeReceive", "resumeSend", "resumeSendFault"))
+                        .and(takesArgument(0, named("org.apache.axis2.context.MessageContext"))),
+                getClass().getName() + "$ResumeMessageAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("invoke")).and(takesArgument(0, named("org.apache.axis2.context.MessageContext"))),
+                getClass().getName() + "$InvokeMessageAdvice");
     }
-  }
 
-  public static final class ResumeMessageAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beginResumingMessage(
-        @Advice.Argument(0) final MessageContext message) {
-      Object continuation = message.getSelfManagedData(Tracer.class, AXIS2_CONTINUATION_KEY);
-      if (continuation instanceof ContextContinuation) {
-        message.removeSelfManagedData(Tracer.class, AXIS2_CONTINUATION_KEY);
-        // resuming is a distinct operation, so create a new span under the original request
-        try (ContextScope parentScope = ((ContextContinuation) continuation).resume()) {
-          AgentSpan span = startSpan("axis2", AXIS2_MESSAGE);
-          DECORATE.afterStart(span);
-          DECORATE.onMessage(span, message);
-          return activateSpan(span);
+    public static final class HandleMessageAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beginProcessingMessage(@Advice.Argument(0) final MessageContext message) {
+            // only create a span if the message has a clear action and there's a surrounding request
+            if (DECORATE.shouldTrace(message)) {
+                AgentSpan span = startSpan("axis2", AXIS2_MESSAGE);
+                DECORATE.afterStart(span);
+                DECORATE.onMessage(span, message);
+                return activateSpan(span);
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void finishProcessingMessage(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Argument(0) final MessageContext message,
+                @Advice.Thrown final Throwable error) {
+            if (null == scope) {
+                return;
+            }
+            AgentSpan span = spanFromScope(scope);
+            if (null != error) {
+                DECORATE.onError(span, error);
+            }
+            DECORATE.beforeFinish(span, message);
+            scope.close();
+            span.finish();
         }
-      }
-      return null;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void finishResumingMessage(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Argument(0) final MessageContext message,
-        @Advice.Thrown final Throwable error) {
-      if (null == scope) {
-        return;
-      }
-      AgentSpan span = spanFromScope(scope);
-      if (null != error) {
-        DECORATE.onError(span, error);
-      }
-      DECORATE.beforeFinish(span, message);
-      scope.close();
-      span.finish();
+    public static final class ResumeMessageAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beginResumingMessage(@Advice.Argument(0) final MessageContext message) {
+            Object continuation = message.getSelfManagedData(Tracer.class, AXIS2_CONTINUATION_KEY);
+            if (continuation instanceof ContextContinuation) {
+                message.removeSelfManagedData(Tracer.class, AXIS2_CONTINUATION_KEY);
+                // resuming is a distinct operation, so create a new span under the original request
+                try (ContextScope parentScope = ((ContextContinuation) continuation).resume()) {
+                    AgentSpan span = startSpan("axis2", AXIS2_MESSAGE);
+                    DECORATE.afterStart(span);
+                    DECORATE.onMessage(span, message);
+                    return activateSpan(span);
+                }
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void finishResumingMessage(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Argument(0) final MessageContext message,
+                @Advice.Thrown final Throwable error) {
+            if (null == scope) {
+                return;
+            }
+            AgentSpan span = spanFromScope(scope);
+            if (null != error) {
+                DECORATE.onError(span, error);
+            }
+            DECORATE.beforeFinish(span, message);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 
-  public static final class InvokeMessageAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void finishInvokingMessage(
-        @Advice.Argument(0) final MessageContext message,
-        @Advice.Return final InvocationResponse response) {
-      if (InvocationResponse.SUSPEND == response
-          && !message.containsSelfManagedDataKey(Tracer.class, AXIS2_CONTINUATION_KEY)) {
-        AgentSpan span = activeSpan();
-        if (null != span && DECORATE.sameTrace(span, message)) {
-          // record continuation in the message so we can re-activate it on resume
-          // we use the self-managed area of the message which is private/internal
-          message.setSelfManagedData(
-              Tracer.class, AXIS2_CONTINUATION_KEY, span.captureWithContext());
+    public static final class InvokeMessageAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void finishInvokingMessage(
+                @Advice.Argument(0) final MessageContext message, @Advice.Return final InvocationResponse response) {
+            if (InvocationResponse.SUSPEND == response
+                    && !message.containsSelfManagedDataKey(Tracer.class, AXIS2_CONTINUATION_KEY)) {
+                AgentSpan span = activeSpan();
+                if (null != span && DECORATE.sameTrace(span, message)) {
+                    // record continuation in the message so we can re-activate it on resume
+                    // we use the self-managed area of the message which is private/internal
+                    message.setSelfManagedData(Tracer.class, AXIS2_CONTINUATION_KEY, span.captureWithContext());
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisMessageDecorator.java b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisMessageDecorator.java
index 86538638f50..df20c7e3483 100644
--- a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisMessageDecorator.java
+++ b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisMessageDecorator.java
@@ -20,113 +20,111 @@
 import org.apache.axis2.context.MessageContext;
 
 public class AxisMessageDecorator extends BaseDecorator {
-  public static final AxisMessageDecorator DECORATE = new AxisMessageDecorator();
+    public static final AxisMessageDecorator DECORATE = new AxisMessageDecorator();
 
-  public static final CharSequence AXIS2 = UTF8BytesString.create("axis2");
-  public static final CharSequence AXIS2_MESSAGE = UTF8BytesString.create("axis2.message");
-  public static final CharSequence AXIS2_TRANSPORT = UTF8BytesString.create("axis2.transport");
-  public static final String AXIS2_CONTINUATION_KEY = "dd.trace.axis2.continuation";
-  public static final String AXIS2_ASYNC_SPAN_KEY = "dd.trace.axis2.asyncSpan";
+    public static final CharSequence AXIS2 = UTF8BytesString.create("axis2");
+    public static final CharSequence AXIS2_MESSAGE = UTF8BytesString.create("axis2.message");
+    public static final CharSequence AXIS2_TRANSPORT = UTF8BytesString.create("axis2.transport");
+    public static final String AXIS2_CONTINUATION_KEY = "dd.trace.axis2.continuation";
+    public static final String AXIS2_ASYNC_SPAN_KEY = "dd.trace.axis2.asyncSpan";
 
-  private static final DDCache<String, UTF8BytesString> SOAP_ACTIONS =
-      DDCaches.newFixedSizeCache(32);
+    private static final DDCache<String, UTF8BytesString> SOAP_ACTIONS = DDCaches.newFixedSizeCache(32);
 
-  private AxisMessageDecorator() {}
+    private AxisMessageDecorator() {}
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"axis2"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"axis2"};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return SOAP;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return SOAP;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return AXIS2;
-  }
+    @Override
+    protected CharSequence component() {
+        return AXIS2;
+    }
 
-  public boolean shouldTrace(final MessageContext message) {
-    if (message.isServerSide() && null == message.getOperationContext()) {
-      return false; // ignore server messages without an associated operation
+    public boolean shouldTrace(final MessageContext message) {
+        if (message.isServerSide() && null == message.getOperationContext()) {
+            return false; // ignore server messages without an associated operation
+        }
+        return null != activeSpan() && null != soapAction(message);
     }
-    return null != activeSpan() && null != soapAction(message);
-  }
-
-  public boolean sameTrace(final AgentSpan span, final MessageContext message) {
-    return AXIS2_MESSAGE.equals(span.getSpanName())
-        && span.getResourceName().toString().equals(soapAction(message));
-  }
-
-  public void onMessage(final AgentSpan span, final MessageContext message) {
-    final CharSequence soapAction = SOAP_ACTIONS.computeIfAbsent(soapAction(message), UTF8_ENCODE);
-    span.setResourceName(soapAction);
-    if (message.isServerSide() && Config.get().isAxisPromoteResourceName()) {
-      final AgentSpan localRoot = span.getLocalRootSpan();
-      // explicitly check for strict comparison in order to set only once (if multiple axis
-      // messages)
-      if (localRoot != null
-          && localRoot.getResourceNamePriority() < ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE) {
-        localRoot.setResourceName(
-            soapAction,
-            ResourceNamePriorities
-                .HTTP_FRAMEWORK_ROUTE); // reusing this since functionally equivalent
-      }
+
+    public boolean sameTrace(final AgentSpan span, final MessageContext message) {
+        return AXIS2_MESSAGE.equals(span.getSpanName())
+                && span.getResourceName().toString().equals(soapAction(message));
     }
-  }
 
-  public void beforeFinish(final AgentSpan span, final MessageContext message) {
-    if (message.isProcessingFault()) {
-      span.setError(true);
+    public void onMessage(final AgentSpan span, final MessageContext message) {
+        final CharSequence soapAction = SOAP_ACTIONS.computeIfAbsent(soapAction(message), UTF8_ENCODE);
+        span.setResourceName(soapAction);
+        if (message.isServerSide() && Config.get().isAxisPromoteResourceName()) {
+            final AgentSpan localRoot = span.getLocalRootSpan();
+            // explicitly check for strict comparison in order to set only once (if multiple axis
+            // messages)
+            if (localRoot != null
+                    && localRoot.getResourceNamePriority() < ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE) {
+                localRoot.setResourceName(
+                        soapAction,
+                        ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE); // reusing this since functionally equivalent
+            }
+        }
     }
-    super.beforeFinish(span);
-  }
 
-  private static String soapAction(final MessageContext message) {
-    String action = message.getSoapAction();
-    if (null != action && !action.isEmpty()) {
-      return action;
+    public void beforeFinish(final AgentSpan span, final MessageContext message) {
+        if (message.isProcessingFault()) {
+            span.setError(true);
+        }
+        super.beforeFinish(span);
     }
-    if (message.getTo() != null) {
-      return message.getTo().getAddress();
+
+    private static String soapAction(final MessageContext message) {
+        String action = message.getSoapAction();
+        if (null != action && !action.isEmpty()) {
+            return action;
+        }
+        if (message.getTo() != null) {
+            return message.getTo().getAddress();
+        }
+        return null;
     }
-    return null;
-  }
-
-  @Override
-  protected void doAfterStart(@Nonnull AgentSpan span) {
-    super.doAfterStart(span);
-    span.setMeasured(true);
-  }
-
-  public void onTransport(AgentSpan span, MessageContext message) {
-    // mark axis2.transport spans as client spans
-    span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_CLIENT);
-    String toAddress;
-    EndpointReference to = message.getTo();
-    if (null != to && !to.hasAnonymousAddress() && !to.hasNoneAddress()) {
-      toAddress = to.getAddress();
-    } else {
-      toAddress = (String) message.getProperty("TransportURL");
+
+    @Override
+    protected void doAfterStart(@Nonnull AgentSpan span) {
+        super.doAfterStart(span);
+        span.setMeasured(true);
     }
-    if (null != toAddress) {
-      URI uri = URIUtils.safeParse(toAddress);
-      if (null != uri) {
-        // same tag logic as UriBasedClientDecorator.onURI
-        String host = uri.getHost();
-        int port = uri.getPort();
-        if (null != host && !host.isEmpty()) {
-          span.setTag(Tags.PEER_HOSTNAME, host);
-          if (Config.get().isHttpClientSplitByDomain() && host.charAt(0) >= 'A') {
-            span.setServiceName(host, HTTP_CLIENT_SPLIT_BY_DOMAIN);
-          }
-          if (port > 0) {
-            setPeerPort(span, port);
-          }
+
+    public void onTransport(AgentSpan span, MessageContext message) {
+        // mark axis2.transport spans as client spans
+        span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_CLIENT);
+        String toAddress;
+        EndpointReference to = message.getTo();
+        if (null != to && !to.hasAnonymousAddress() && !to.hasNoneAddress()) {
+            toAddress = to.getAddress();
+        } else {
+            toAddress = (String) message.getProperty("TransportURL");
+        }
+        if (null != toAddress) {
+            URI uri = URIUtils.safeParse(toAddress);
+            if (null != uri) {
+                // same tag logic as UriBasedClientDecorator.onURI
+                String host = uri.getHost();
+                int port = uri.getPort();
+                if (null != host && !host.isEmpty()) {
+                    span.setTag(Tags.PEER_HOSTNAME, host);
+                    if (Config.get().isHttpClientSplitByDomain() && host.charAt(0) >= 'A') {
+                        span.setServiceName(host, HTTP_CLIENT_SPLIT_BY_DOMAIN);
+                    }
+                    if (port > 0) {
+                        setPeerPort(span, port);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java
index a02121f0e4c..d85a2ec16e9 100644
--- a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java
+++ b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java
@@ -25,91 +25,87 @@
 import org.apache.axis2.context.MessageContext;
 
 public final class AxisTransportInstrumentation
-    implements Instrumenter.ForKnownTypes,
-        Instrumenter.ForConfiguredType,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.ForConfiguredType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {"com.ibm.ws.websvcs.transport.http.HTTPTransportSender"};
-  }
-
-  @Override
-  public String configuredMatchingType() {
-    // this won't match any class unless the property is set
-    return InstrumenterConfig.get().getAxisTransportClassName();
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"com.ibm.ws.websvcs.transport.http.HTTPTransportSender"};
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("invoke"))
-            .and(takesArgument(0, named("org.apache.axis2.context.MessageContext"))),
-        getClass().getName() + "$TransportAdvice",
-        getClass().getName() + "$TransportContextPropagationAdvice");
-  }
+    @Override
+    public String configuredMatchingType() {
+        // this won't match any class unless the property is set
+        return InstrumenterConfig.get().getAxisTransportClassName();
+    }
 
-  public static final class TransportAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beginTransport(@Advice.Argument(0) final MessageContext message) {
-      // only create a span if the message has a clear action and there's a surrounding request
-      if (DECORATE.shouldTrace(message)) {
-        AgentSpan span = startSpan("axis2", AXIS2_TRANSPORT);
-        DECORATE.afterStart(span);
-        DECORATE.onTransport(span, message);
-        DECORATE.onMessage(span, message);
-        return activateSpan(span);
-      }
-      return null;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod().and(named("invoke")).and(takesArgument(0, named("org.apache.axis2.context.MessageContext"))),
+                getClass().getName() + "$TransportAdvice",
+                getClass().getName() + "$TransportContextPropagationAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void finishTransport(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Argument(0) final MessageContext message,
-        @Advice.Thrown final Throwable error) {
-      if (null == scope) {
-        return;
-      }
+    public static final class TransportAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beginTransport(@Advice.Argument(0) final MessageContext message) {
+            // only create a span if the message has a clear action and there's a surrounding request
+            if (DECORATE.shouldTrace(message)) {
+                AgentSpan span = startSpan("axis2", AXIS2_TRANSPORT);
+                DECORATE.afterStart(span);
+                DECORATE.onTransport(span, message);
+                DECORATE.onMessage(span, message);
+                return activateSpan(span);
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void finishTransport(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Argument(0) final MessageContext message,
+                @Advice.Thrown final Throwable error) {
+            if (null == scope) {
+                return;
+            }
 
-      AgentSpan span = spanFromScope(scope);
-      if (null != error) {
-        // cancel async tracking when we know there's an error
-        message.removePropertyNonReplicable(AXIS2_ASYNC_SPAN_KEY);
-        DECORATE.onError(span, error);
-      }
-      scope.close();
-      if (span.equals(message.getPropertyNonReplicable(AXIS2_ASYNC_SPAN_KEY))) {
-        // delay finishing span until async callback completes...
-      } else {
-        Object statusCode = message.getProperty("transport.http.statusCode");
-        if (statusCode instanceof Integer) {
-          span.setHttpStatusCode((Integer) statusCode);
+            AgentSpan span = spanFromScope(scope);
+            if (null != error) {
+                // cancel async tracking when we know there's an error
+                message.removePropertyNonReplicable(AXIS2_ASYNC_SPAN_KEY);
+                DECORATE.onError(span, error);
+            }
+            scope.close();
+            if (span.equals(message.getPropertyNonReplicable(AXIS2_ASYNC_SPAN_KEY))) {
+                // delay finishing span until async callback completes...
+            } else {
+                Object statusCode = message.getProperty("transport.http.statusCode");
+                if (statusCode instanceof Integer) {
+                    span.setHttpStatusCode((Integer) statusCode);
+                }
+                DECORATE.beforeFinish(span, message);
+                span.finish();
+            }
         }
-        DECORATE.beforeFinish(span, message);
-        span.finish();
-      }
     }
-  }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static final class TransportContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(0) final MessageContext message) {
-      AgentSpan span = activeSpan();
-      if (span == null) return;
-      // the transport handler will copy TRANSPORT_HEADERS to the outgoing request
-      @SuppressWarnings({"unchecked", "rawtypes"})
-      Map<String, Object> headers = (Map) message.getProperty("TRANSPORT_HEADERS");
-      if (null == headers) {
-        headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-        message.setProperty("TRANSPORT_HEADERS", headers);
-      }
-      try {
-        defaultPropagator().inject(span, headers, SETTER);
-      } catch (Throwable ignore) {
-      }
+    @AppliesOn(CONTEXT_TRACKING)
+    public static final class TransportContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(0) final MessageContext message) {
+            AgentSpan span = activeSpan();
+            if (span == null) return;
+            // the transport handler will copy TRANSPORT_HEADERS to the outgoing request
+            @SuppressWarnings({"unchecked", "rawtypes"})
+            Map<String, Object> headers = (Map) message.getProperty("TRANSPORT_HEADERS");
+            if (null == headers) {
+                headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+                message.setProperty("TRANSPORT_HEADERS", headers);
+            }
+            try {
+                defaultPropagator().inject(span, headers, SETTER);
+            } catch (Throwable ignore) {
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/TextMapInjectAdapter.java b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/TextMapInjectAdapter.java
index fe4f2311bdc..29a2ddb6dfc 100644
--- a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/TextMapInjectAdapter.java
+++ b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/TextMapInjectAdapter.java
@@ -6,10 +6,10 @@
 
 @ParametersAreNonnullByDefault
 public class TextMapInjectAdapter implements CarrierSetter<Map<String, Object>> {
-  public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
+    public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
 
-  @Override
-  public void set(Map<String, Object> carrier, String key, String value) {
-    carrier.put(key, value);
-  }
+    @Override
+    public void set(Map<String, Object> carrier, String key, String value) {
+        carrier.put(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/WebSphereAsyncInstrumentation.java b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/WebSphereAsyncInstrumentation.java
index 312c026c317..a6dc7cdfeff 100644
--- a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/WebSphereAsyncInstrumentation.java
+++ b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/WebSphereAsyncInstrumentation.java
@@ -12,47 +12,45 @@
 import net.bytebuddy.asm.Advice;
 import org.apache.axis2.context.MessageContext;
 
-public final class WebSphereAsyncInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class WebSphereAsyncInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.ws.websvcs.transport.http.SOAPOverHTTPSender";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.ibm.ws.websvcs.transport.http.SOAPOverHTTPSender";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("sendSOAPRequestAsync")),
-        getClass().getName() + "$CaptureAsyncAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("releaseBuffer")), getClass().getName() + "$ReleaseAsyncAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("sendSOAPRequestAsync")), getClass().getName() + "$CaptureAsyncAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("releaseBuffer")), getClass().getName() + "$ReleaseAsyncAdvice");
+    }
 
-  public static final class CaptureAsyncAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void beginAsync(@Advice.Argument(0) final MessageContext message) {
-      AgentSpan span = activeSpan();
-      if (null != span && AXIS2_TRANSPORT.equals(span.getSpanName())) {
-        message.setNonReplicableProperty(AXIS2_ASYNC_SPAN_KEY, span);
-      }
+    public static final class CaptureAsyncAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void beginAsync(@Advice.Argument(0) final MessageContext message) {
+            AgentSpan span = activeSpan();
+            if (null != span && AXIS2_TRANSPORT.equals(span.getSpanName())) {
+                message.setNonReplicableProperty(AXIS2_ASYNC_SPAN_KEY, span);
+            }
+        }
     }
-  }
 
-  public static final class ReleaseAsyncAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void finishAsync(@Advice.FieldValue("msgContext") final MessageContext message) {
-      AgentSpan span = (AgentSpan) message.getPropertyNonReplicable(AXIS2_ASYNC_SPAN_KEY);
-      if (null != span) {
-        message.removePropertyNonReplicable(AXIS2_ASYNC_SPAN_KEY);
-        // same as AxisTransportInstrumentation.TransportAdvice.finishTransport
-        Object statusCode = message.getProperty("transport.http.statusCode");
-        if (statusCode instanceof Integer) {
-          span.setHttpStatusCode((Integer) statusCode);
+    public static final class ReleaseAsyncAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void finishAsync(@Advice.FieldValue("msgContext") final MessageContext message) {
+            AgentSpan span = (AgentSpan) message.getPropertyNonReplicable(AXIS2_ASYNC_SPAN_KEY);
+            if (null != span) {
+                message.removePropertyNonReplicable(AXIS2_ASYNC_SPAN_KEY);
+                // same as AxisTransportInstrumentation.TransportAdvice.finishTransport
+                Object statusCode = message.getProperty("transport.http.statusCode");
+                if (statusCode instanceof Integer) {
+                    span.setHttpStatusCode((Integer) statusCode);
+                }
+                DECORATE.beforeFinish(span, message);
+                span.finish();
+            }
         }
-        DECORATE.beforeFinish(span, message);
-        span.finish();
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/axis2-1.3/src/test/java/test/TestSender.java b/dd-java-agent/instrumentation/axis2-1.3/src/test/java/test/TestSender.java
index b3a826c73ae..ba35d5642ce 100644
--- a/dd-java-agent/instrumentation/axis2-1.3/src/test/java/test/TestSender.java
+++ b/dd-java-agent/instrumentation/axis2-1.3/src/test/java/test/TestSender.java
@@ -9,30 +9,27 @@
 
 /** Test sender that checks the outgoing TRANSPORT_HEADERS have the expected propagation headers. */
 public class TestSender extends LocalTransportSender {
-  private static final Set<String> EXPECTED_HEADERS =
-      new HashSet<>(
-          Arrays.asList(
-              "x-datadog-trace-id",
-              "x-datadog-parent-id",
-              "x-datadog-sampling-priority",
-              "x-datadog-tags",
-              "traceparent",
-              "tracestate"));
+    private static final Set<String> EXPECTED_HEADERS = new HashSet<>(Arrays.asList(
+            "x-datadog-trace-id",
+            "x-datadog-parent-id",
+            "x-datadog-sampling-priority",
+            "x-datadog-tags",
+            "traceparent",
+            "tracestate"));
 
-  @Override
-  public InvocationResponse invoke(MessageContext messageContext) {
-    @SuppressWarnings("unchecked")
-    Map<String, Object> headers =
-        (Map<String, Object>) messageContext.getProperty("TRANSPORT_HEADERS");
-    if (null == headers) {
-      throw new RuntimeException("Missing TRANSPORT_HEADERS");
+    @Override
+    public InvocationResponse invoke(MessageContext messageContext) {
+        @SuppressWarnings("unchecked")
+        Map<String, Object> headers = (Map<String, Object>) messageContext.getProperty("TRANSPORT_HEADERS");
+        if (null == headers) {
+            throw new RuntimeException("Missing TRANSPORT_HEADERS");
+        }
+        Set<String> missing = new HashSet<>(EXPECTED_HEADERS);
+        missing.removeAll(headers.keySet());
+        if (!missing.isEmpty()) {
+            throw new RuntimeException("Missing propagation headers: " + missing);
+        }
+        messageContext.setProperty("transport.http.statusCode", 200);
+        return InvocationResponse.CONTINUE;
     }
-    Set<String> missing = new HashSet<>(EXPECTED_HEADERS);
-    missing.removeAll(headers.keySet());
-    if (!missing.isEmpty()) {
-      throw new RuntimeException("Missing propagation headers: " + missing);
-    }
-    messageContext.setProperty("transport.http.statusCode", 200);
-    return InvocationResponse.CONTINUE;
-  }
 }
diff --git a/dd-java-agent/instrumentation/axis2-1.3/src/test/java/test/TestService.java b/dd-java-agent/instrumentation/axis2-1.3/src/test/java/test/TestService.java
index 164d996a1c4..9bdd49168b5 100644
--- a/dd-java-agent/instrumentation/axis2-1.3/src/test/java/test/TestService.java
+++ b/dd-java-agent/instrumentation/axis2-1.3/src/test/java/test/TestService.java
@@ -3,11 +3,11 @@
 import org.apache.axiom.om.OMElement;
 
 public class TestService {
-  public void testAction(final OMElement element) {
-    System.out.println("Received action message");
-  }
+    public void testAction(final OMElement element) {
+        System.out.println("Received action message");
+    }
 
-  public void testFault(final OMElement element) {
-    System.out.println("Received fault message");
-  }
+    public void testFault(final OMElement element) {
+        System.out.println("Received fault message");
+    }
 }
diff --git a/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginDecorator.java b/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginDecorator.java
index 10ce28bdd1b..afd76963290 100644
--- a/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginDecorator.java
+++ b/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginDecorator.java
@@ -21,240 +21,234 @@
 
 // request = is com.vordel.circuit.net.State,  connection = com.vordel.dwe.http.ServerTransaction
 public class AxwayHTTPPluginDecorator extends HttpServerDecorator<Object, Object, Object, Void> {
-  private static final Logger log = LoggerFactory.getLogger(AxwayHTTPPluginDecorator.class);
+    private static final Logger log = LoggerFactory.getLogger(AxwayHTTPPluginDecorator.class);
 
-  public static final CharSequence AXWAY_TRY_TRANSACTION =
-      UTF8BytesString.create("axway.trytransaction");
+    public static final CharSequence AXWAY_TRY_TRANSACTION = UTF8BytesString.create("axway.trytransaction");
 
-  public static final AxwayHTTPPluginDecorator DECORATE = new AxwayHTTPPluginDecorator();
+    public static final AxwayHTTPPluginDecorator DECORATE = new AxwayHTTPPluginDecorator();
 
-  public static final CharSequence AXWAY_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+    public static final CharSequence AXWAY_REQUEST = UTF8BytesString.create(DECORATE.operationName());
 
-  private static final MethodHandles.Lookup lookup = MethodHandles.lookup();
+    private static final MethodHandles.Lookup lookup = MethodHandles.lookup();
 
-  private static final String SERVERTRANSACTION_CLASSNAME = "com.vordel.dwe.http.ServerTransaction";
-  private static final Class<?> classServerTransaction;
-  private static final MethodHandle getRemoteAddr_mh;
-  private static final MethodHandle getMethod_mh;
-  private static final MethodHandle getURI_mh;
+    private static final String SERVERTRANSACTION_CLASSNAME = "com.vordel.dwe.http.ServerTransaction";
+    private static final Class<?> classServerTransaction;
+    private static final MethodHandle getRemoteAddr_mh;
+    private static final MethodHandle getMethod_mh;
+    private static final MethodHandle getURI_mh;
 
-  private static final String STATE_CLASSNAME = "com.vordel.circuit.net.State";
-  private static final Class<?> classState;
-  private static final MethodHandle hostField_mh;
-  private static final MethodHandle portField_mh;
-  private static final MethodHandle methodField_mh;
-  private static final MethodHandle uriField_mh;
+    private static final String STATE_CLASSNAME = "com.vordel.circuit.net.State";
+    private static final Class<?> classState;
+    private static final MethodHandle hostField_mh;
+    private static final MethodHandle portField_mh;
+    private static final MethodHandle methodField_mh;
+    private static final MethodHandle uriField_mh;
 
-  static final String SERVER_TRANSACTION_CLASSNAME = "com.vordel.dwe.http.ServerTransaction";
-  static final Class<Object> SERVER_TRANSACTION_CLASS = getServerTransactionClass();
+    static final String SERVER_TRANSACTION_CLASSNAME = "com.vordel.dwe.http.ServerTransaction";
+    static final Class<Object> SERVER_TRANSACTION_CLASS = getServerTransactionClass();
 
-  @SuppressForbidden
-  private static Class<Object> getServerTransactionClass() {
-    try {
-      return (Class<Object>) Class.forName(SERVER_TRANSACTION_CLASSNAME);
-    } catch (ClassNotFoundException e) {
-      log.debug("Can't get ServerTransaction class name", e);
+    @SuppressForbidden
+    private static Class<Object> getServerTransactionClass() {
+        try {
+            return (Class<Object>) Class.forName(SERVER_TRANSACTION_CLASSNAME);
+        } catch (ClassNotFoundException e) {
+            log.debug("Can't get ServerTransaction class name", e);
+        }
+        return null;
     }
-    return null;
-  }
 
-  static {
-    classServerTransaction = initClass(SERVERTRANSACTION_CLASSNAME);
-    getRemoteAddr_mh =
-        initNoArgServerTransactionMethodHandle("getRemoteAddr", InetSocketAddress.class);
-    getMethod_mh = initNoArgServerTransactionMethodHandle("getMethod", String.class);
-    getURI_mh = initGetURI();
-
-    classState = initClass(STATE_CLASSNAME);
-    hostField_mh = initStateFieldGetter("host");
-    portField_mh = initStateFieldGetter("port");
-    methodField_mh = initStateFieldGetter("verb");
-    uriField_mh = initStateFieldGetter("uri");
-  }
+    static {
+        classServerTransaction = initClass(SERVERTRANSACTION_CLASSNAME);
+        getRemoteAddr_mh = initNoArgServerTransactionMethodHandle("getRemoteAddr", InetSocketAddress.class);
+        getMethod_mh = initNoArgServerTransactionMethodHandle("getMethod", String.class);
+        getURI_mh = initGetURI();
+
+        classState = initClass(STATE_CLASSNAME);
+        hostField_mh = initStateFieldGetter("host");
+        portField_mh = initStateFieldGetter("port");
+        methodField_mh = initStateFieldGetter("verb");
+        uriField_mh = initStateFieldGetter("uri");
+    }
 
-  private static Class<?> initClass(final String name) {
-    try {
-      return Class.forName(name, false, AxwayHTTPPluginDecorator.class.getClassLoader());
-    } catch (ClassNotFoundException e) {
-      log.debug(
-          "Can't find class '{}': Axaway integration failed. ", SERVERTRANSACTION_CLASSNAME, e);
+    private static Class<?> initClass(final String name) {
+        try {
+            return Class.forName(name, false, AxwayHTTPPluginDecorator.class.getClassLoader());
+        } catch (ClassNotFoundException e) {
+            log.debug("Can't find class '{}': Axaway integration failed. ", SERVERTRANSACTION_CLASSNAME, e);
+        }
+        return null;
     }
-    return null;
-  }
 
-  private static MethodHandle initNoArgServerTransactionMethodHandle(String name, Class<?> rtype) {
-    try {
-      return lookup.findVirtual(classServerTransaction, name, methodType(rtype));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
-      log.debug("Can't find method handler '{}' ", name, e);
+    private static MethodHandle initNoArgServerTransactionMethodHandle(String name, Class<?> rtype) {
+        try {
+            return lookup.findVirtual(classServerTransaction, name, methodType(rtype));
+        } catch (NoSuchMethodException | IllegalAccessException e) {
+            log.debug("Can't find method handler '{}' ", name, e);
+        }
+        return null;
     }
-    return null;
-  }
 
-  private static MethodHandle initGetURI() {
-    Method m = null;
-    try {
-      m = classServerTransaction.getDeclaredMethod("getURI"); // private method
-      m.setAccessible(true);
-      return lookup.unreflect(m);
-    } catch (Throwable e) {
-      log.debug("Can't unreflect method '{}': ", m, e);
+    private static MethodHandle initGetURI() {
+        Method m = null;
+        try {
+            m = classServerTransaction.getDeclaredMethod("getURI"); // private method
+            m.setAccessible(true);
+            return lookup.unreflect(m);
+        } catch (Throwable e) {
+            log.debug("Can't unreflect method '{}': ", m, e);
+        }
+        return null;
     }
-    return null;
-  }
 
-  private static MethodHandle initStateFieldGetter(String fieldName) {
-    Field field = null;
-    MethodHandle mh = null;
-    try {
-      field = classState.getDeclaredField(fieldName);
-      field.setAccessible(true);
-      mh = lookup.unreflectGetter(field);
-      log.debug(
-          "Initialized field '{}' of class '{}' unreflected to {}", fieldName, classState, mh);
-    } catch (NoSuchFieldException | IllegalAccessException e) {
-      log.debug(
-          "Can't find and unreflect declared field '{}' with name '{}' for class '{}' to mh: '{}'",
-          field,
-          fieldName,
-          classState,
-          mh,
-          e);
+    private static MethodHandle initStateFieldGetter(String fieldName) {
+        Field field = null;
+        MethodHandle mh = null;
+        try {
+            field = classState.getDeclaredField(fieldName);
+            field.setAccessible(true);
+            mh = lookup.unreflectGetter(field);
+            log.debug("Initialized field '{}' of class '{}' unreflected to {}", fieldName, classState, mh);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            log.debug(
+                    "Can't find and unreflect declared field '{}' with name '{}' for class '{}' to mh: '{}'",
+                    field,
+                    fieldName,
+                    classState,
+                    mh,
+                    e);
+        }
+        return mh;
     }
-    return mh;
-  }
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"axway-http"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"axway-http"};
+    }
 
-  @Override
-  protected String component() {
-    return "axway-http";
-  }
+    @Override
+    protected String component() {
+        return "axway-http";
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<Void> getter() {
-    return null;
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<Void> getter() {
+        return null;
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<Object> responseGetter() {
-    return null;
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<Object> responseGetter() {
+        return null;
+    }
 
-  @Override
-  public CharSequence spanName() {
-    return AXWAY_REQUEST;
-  }
+    @Override
+    public CharSequence spanName() {
+        return AXWAY_REQUEST;
+    }
 
-  @Override
-  protected String method(final Object serverTransaction) {
-    try {
-      return (String) getMethod_mh.invoke(serverTransaction);
-    } catch (Throwable throwable) {
-      log.debug(
-          "Can't invoke invoke '{}' on instance '{}' of class '{}'",
-          getMethod_mh,
-          serverTransaction,
-          serverTransaction.getClass(),
-          throwable);
+    @Override
+    protected String method(final Object serverTransaction) {
+        try {
+            return (String) getMethod_mh.invoke(serverTransaction);
+        } catch (Throwable throwable) {
+            log.debug(
+                    "Can't invoke invoke '{}' on instance '{}' of class '{}'",
+                    getMethod_mh,
+                    serverTransaction,
+                    serverTransaction.getClass(),
+                    throwable);
+        }
+        return "UNKNOWN";
     }
-    return "UNKNOWN";
-  }
 
-  @Override
-  protected URIDataAdapter url(final Object serverTransaction) {
-    try {
-      return new URIDefaultDataAdapter((URI) getURI_mh.invoke(serverTransaction));
-    } catch (Throwable e) {
-      log.debug("Can't find invoke '{}}' on '{}': ", getURI_mh, serverTransaction, e);
+    @Override
+    protected URIDataAdapter url(final Object serverTransaction) {
+        try {
+            return new URIDefaultDataAdapter((URI) getURI_mh.invoke(serverTransaction));
+        } catch (Throwable e) {
+            log.debug("Can't find invoke '{}}' on '{}': ", getURI_mh, serverTransaction, e);
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Override
-  protected String peerHostIP(Object serverTransaction) {
-    return getRemoteAddr(serverTransaction).getHostString();
-  }
+    @Override
+    protected String peerHostIP(Object serverTransaction) {
+        return getRemoteAddr(serverTransaction).getHostString();
+    }
 
-  @Override
-  protected int peerPort(Object serverTransaction) {
-    return getRemoteAddr(serverTransaction).getPort();
-  }
+    @Override
+    protected int peerPort(Object serverTransaction) {
+        return getRemoteAddr(serverTransaction).getPort();
+    }
 
-  /**
-   * @param serverTransaction instance of {@value #SERVERTRANSACTION_CLASSNAME}
-   */
-  @Override
-  protected int status(final Object serverTransaction) {
-    // TODO will be done manually
-    return 0;
-  }
+    /**
+     * @param serverTransaction instance of {@value #SERVERTRANSACTION_CLASSNAME}
+     */
+    @Override
+    protected int status(final Object serverTransaction) {
+        // TODO will be done manually
+        return 0;
+    }
 
-  /**
-   * @param stateInstance type com.vordel.circuit.net.State
-   */
-  public void onTransaction(AgentSpan span, Object stateInstance) {
-    if (span != null) {
-      setStringTagFromStateField(span, Tags.PEER_HOSTNAME, stateInstance, hostField_mh);
-      setStringTagFromStateField(span, Tags.PEER_PORT, stateInstance, portField_mh);
-      setStringTagFromStateField(span, Tags.HTTP_METHOD, stateInstance, methodField_mh);
-      setURLTagFromUriStateField(span, stateInstance);
+    /**
+     * @param stateInstance type com.vordel.circuit.net.State
+     */
+    public void onTransaction(AgentSpan span, Object stateInstance) {
+        if (span != null) {
+            setStringTagFromStateField(span, Tags.PEER_HOSTNAME, stateInstance, hostField_mh);
+            setStringTagFromStateField(span, Tags.PEER_PORT, stateInstance, portField_mh);
+            setStringTagFromStateField(span, Tags.HTTP_METHOD, stateInstance, methodField_mh);
+            setURLTagFromUriStateField(span, stateInstance);
+        }
     }
-  }
 
-  /**
-   * class hierarchy in package com.vordel.dwe.http :
-   *
-   * <pre><code>
-   * public class Transaction implements IMetricsTransaction {
-   *    public native InetSocketAddress getLocalAddr();
-   *    public native InetSocketAddress getRemoteAddr();
-   * }
-   * public abstract class HTTPTransaction extends Transaction {
-   *
-   * }
-   * public class ServerTransaction extends HTTPTransaction {
-   *
-   * }
-   * </code></pre>
-   *
-   * @param obj instance of {@value #SERVERTRANSACTION_CLASSNAME}
-   * @return result of {@value #SERVERTRANSACTION_CLASSNAME}::getRemoteAddr()
-   */
-  private static InetSocketAddress getRemoteAddr(Object obj) {
-    try {
-      return (InetSocketAddress) getRemoteAddr_mh.invoke(obj);
-    } catch (Throwable throwable) {
-      log.debug("Can't invoke '{}' on instance '{}': ", getRemoteAddr_mh, obj, throwable);
+    /**
+     * class hierarchy in package com.vordel.dwe.http :
+     *
+     * <pre><code>
+     * public class Transaction implements IMetricsTransaction {
+     *    public native InetSocketAddress getLocalAddr();
+     *    public native InetSocketAddress getRemoteAddr();
+     * }
+     * public abstract class HTTPTransaction extends Transaction {
+     *
+     * }
+     * public class ServerTransaction extends HTTPTransaction {
+     *
+     * }
+     * </code></pre>
+     *
+     * @param obj instance of {@value #SERVERTRANSACTION_CLASSNAME}
+     * @return result of {@value #SERVERTRANSACTION_CLASSNAME}::getRemoteAddr()
+     */
+    private static InetSocketAddress getRemoteAddr(Object obj) {
+        try {
+            return (InetSocketAddress) getRemoteAddr_mh.invoke(obj);
+        } catch (Throwable throwable) {
+            log.debug("Can't invoke '{}' on instance '{}': ", getRemoteAddr_mh, obj, throwable);
+        }
+        return new InetSocketAddress(0);
     }
-    return new InetSocketAddress(0);
-  }
 
-  private static void setStringTagFromStateField(
-      AgentSpan span, String tag, Object stateInstance, MethodHandle mh) {
-    String v = "";
-    try {
-      v = (String) mh.invoke(stateInstance);
-    } catch (Throwable e) {
-      log.debug(
-          "Can't invoke '{}' on instance '{}'; ; Tag '{}' not set.", mh, stateInstance, tag, e);
+    private static void setStringTagFromStateField(AgentSpan span, String tag, Object stateInstance, MethodHandle mh) {
+        String v = "";
+        try {
+            v = (String) mh.invoke(stateInstance);
+        } catch (Throwable e) {
+            log.debug("Can't invoke '{}' on instance '{}'; ; Tag '{}' not set.", mh, stateInstance, tag, e);
+        }
+        span.setTag(tag, v);
     }
-    span.setTag(tag, v);
-  }
 
-  private static void setURLTagFromUriStateField(AgentSpan span, Object stateInstance) {
-    try {
-      span.setTag(Tags.HTTP_URL, uriField_mh.invoke(stateInstance).toString());
-    } catch (Throwable e) {
-      log.debug(
-          "Can't invoke '{}' on instance '{}'; Tag '{}' not set.",
-          uriField_mh,
-          stateInstance,
-          Tags.HTTP_URL,
-          e);
+    private static void setURLTagFromUriStateField(AgentSpan span, Object stateInstance) {
+        try {
+            span.setTag(Tags.HTTP_URL, uriField_mh.invoke(stateInstance).toString());
+        } catch (Throwable e) {
+            log.debug(
+                    "Can't invoke '{}' on instance '{}'; Tag '{}' not set.",
+                    uriField_mh,
+                    stateInstance,
+                    Tags.HTTP_URL,
+                    e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginInstrumentation.java b/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginInstrumentation.java
index 08dfab98087..282479124da 100644
--- a/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginInstrumentation.java
+++ b/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginInstrumentation.java
@@ -12,34 +12,30 @@
 
 @AutoService(InstrumenterModule.class)
 public final class AxwayHTTPPluginInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public AxwayHTTPPluginInstrumentation() {
-    super("axway-api");
-  }
+    public AxwayHTTPPluginInstrumentation() {
+        super("axway-api");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("com.vordel.dwe.http.ServerTransaction", int.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("com.vordel.dwe.http.ServerTransaction", int.class.getName());
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "com.vordel.dwe.http.HTTPPlugin",
-      "com.vordel.dwe.http.ServerTransaction",
-      "com.vordel.circuit.net.State"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "com.vordel.dwe.http.HTTPPlugin", "com.vordel.dwe.http.ServerTransaction", "com.vordel.circuit.net.State"
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("invokeDispose")), packageName + ".HTTPPluginAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("tryTransaction")), packageName + ".StateAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("sendResponse")),
-        packageName + ".ServerTransactionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("invokeDispose")), packageName + ".HTTPPluginAdvice");
+        transformer.applyAdvice(isMethod().and(isPublic()).and(named("tryTransaction")), packageName + ".StateAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("sendResponse")), packageName + ".ServerTransactionAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/HTTPPluginAdvice.java b/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/HTTPPluginAdvice.java
index 757e44e03a1..533ca701fa1 100644
--- a/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/HTTPPluginAdvice.java
+++ b/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/HTTPPluginAdvice.java
@@ -14,43 +14,43 @@
 
 public class HTTPPluginAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(@Advice.Argument(value = 2) final Object serverTransaction) {
-    final AgentSpan span = startSpan("axway-http", DECORATE.spanName()).setMeasured(true);
-    DECORATE.afterStart(span);
-    // serverTransaction is like request + connection in one object:
-    DECORATE.onRequest(span, serverTransaction, serverTransaction, rootContext());
-    return span.attachWithContext();
-  }
-
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void onExit(
-      @Advice.Enter final ContextScope scope,
-      @Advice.Argument(value = 2) final Object serverTransaction,
-      @Advice.Thrown final Throwable throwable) {
-    if (scope == null) {
-      return;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(@Advice.Argument(value = 2) final Object serverTransaction) {
+        final AgentSpan span = startSpan("axway-http", DECORATE.spanName()).setMeasured(true);
+        DECORATE.afterStart(span);
+        // serverTransaction is like request + connection in one object:
+        DECORATE.onRequest(span, serverTransaction, serverTransaction, rootContext());
+        return span.attachWithContext();
     }
-    final Context context = scope.context();
-    final AgentSpan span = fromContext(context);
-    try {
-      if (null != serverTransaction) {
-        // manual DECORATE.onResponse(span, serverTransaction):
-        // TODO: It doesn't work. Rewriting of InstrumentationContext.get fails here, because both
-        // arguments should be
-        //  class-literals (not runtime Class object) to make FieldBackedContextRequestRewriter
-        // work.
-        int respCode =
-            InstrumentationContext.get(SERVER_TRANSACTION_CLASS, int.class).get(serverTransaction);
-        span.setHttpStatusCode(respCode);
-      }
-      if (throwable != null) {
-        DECORATE.onError(span, throwable);
-      }
-      DECORATE.beforeFinish(context);
-    } finally {
-      scope.close();
-      span.finish();
+
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void onExit(
+            @Advice.Enter final ContextScope scope,
+            @Advice.Argument(value = 2) final Object serverTransaction,
+            @Advice.Thrown final Throwable throwable) {
+        if (scope == null) {
+            return;
+        }
+        final Context context = scope.context();
+        final AgentSpan span = fromContext(context);
+        try {
+            if (null != serverTransaction) {
+                // manual DECORATE.onResponse(span, serverTransaction):
+                // TODO: It doesn't work. Rewriting of InstrumentationContext.get fails here, because both
+                // arguments should be
+                //  class-literals (not runtime Class object) to make FieldBackedContextRequestRewriter
+                // work.
+                int respCode = InstrumentationContext.get(SERVER_TRANSACTION_CLASS, int.class)
+                        .get(serverTransaction);
+                span.setHttpStatusCode(respCode);
+            }
+            if (throwable != null) {
+                DECORATE.onError(span, throwable);
+            }
+            DECORATE.beforeFinish(context);
+        } finally {
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/ServerTransactionAdvice.java b/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/ServerTransactionAdvice.java
index 54a5643ecc0..d588fdf4e8d 100644
--- a/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/ServerTransactionAdvice.java
+++ b/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/ServerTransactionAdvice.java
@@ -7,11 +7,10 @@
 
 public class ServerTransactionAdvice {
 
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onEnter(
-      @Advice.This Object thiz, @Advice.Argument(value = 0) final int responseCode) {
-    if (null != SERVER_TRANSACTION_CLASS) {
-      InstrumentationContext.get(SERVER_TRANSACTION_CLASS, int.class).put(thiz, responseCode);
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onEnter(@Advice.This Object thiz, @Advice.Argument(value = 0) final int responseCode) {
+        if (null != SERVER_TRANSACTION_CLASS) {
+            InstrumentationContext.get(SERVER_TRANSACTION_CLASS, int.class).put(thiz, responseCode);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/StateAdvice.java b/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/StateAdvice.java
index 5651c5b019d..8308d4bfef7 100644
--- a/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/StateAdvice.java
+++ b/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/StateAdvice.java
@@ -19,27 +19,26 @@
  * instrumentation intends to see to which services apigateway goes to prepare it response.
  */
 public class StateAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(@Advice.This final Object stateInstance) {
-    final AgentSpan span = startSpan("axway-http", AXWAY_TRY_TRANSACTION);
-    final ContextScope scope = activateSpan(span);
-    span.setMeasured(true);
-    DECORATE.onTransaction(span, stateInstance);
-    DECORATE.afterStart(span);
-    return scope;
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(@Advice.This final Object stateInstance) {
+        final AgentSpan span = startSpan("axway-http", AXWAY_TRY_TRANSACTION);
+        final ContextScope scope = activateSpan(span);
+        span.setMeasured(true);
+        DECORATE.onTransaction(span, stateInstance);
+        DECORATE.afterStart(span);
+        return scope;
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void onExit(
-      @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-    if (scope == null) {
-      return;
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void onExit(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+        if (scope == null) {
+            return;
+        }
+        final AgentSpan span = spanFromScope(scope);
+        final Context context = scope.context();
+        DECORATE.onError(span, throwable);
+        DECORATE.beforeFinish(context);
+        scope.close();
+        span.finish();
     }
-    final AgentSpan span = spanFromScope(scope);
-    final Context context = scope.context();
-    DECORATE.onError(span, throwable);
-    DECORATE.beforeFinish(context);
-    scope.close();
-    span.finish();
-  }
 }
diff --git a/dd-java-agent/instrumentation/azure-functions-1.2.2/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsDecorator.java b/dd-java-agent/instrumentation/azure-functions-1.2.2/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsDecorator.java
index e8466f50844..7a7ac3590ff 100644
--- a/dd-java-agent/instrumentation/azure-functions-1.2.2/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsDecorator.java
+++ b/dd-java-agent/instrumentation/azure-functions-1.2.2/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsDecorator.java
@@ -12,73 +12,71 @@
 import datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator;
 
 public class AzureFunctionsDecorator
-    extends HttpServerDecorator<
-        HttpRequestMessage, HttpRequestMessage, HttpResponseMessage, HttpRequestMessage> {
-  public static final CharSequence AZURE_FUNCTIONS = UTF8BytesString.create("azure-functions");
+        extends HttpServerDecorator<HttpRequestMessage, HttpRequestMessage, HttpResponseMessage, HttpRequestMessage> {
+    public static final CharSequence AZURE_FUNCTIONS = UTF8BytesString.create("azure-functions");
 
-  public static final AzureFunctionsDecorator DECORATE = new AzureFunctionsDecorator();
-  public static final CharSequence AZURE_FUNCTIONS_REQUEST =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().cloud().operationForFaas("azure"));
+    public static final AzureFunctionsDecorator DECORATE = new AzureFunctionsDecorator();
+    public static final CharSequence AZURE_FUNCTIONS_REQUEST =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cloud().operationForFaas("azure"));
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"azure-functions"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"azure-functions"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return AZURE_FUNCTIONS;
-  }
+    @Override
+    protected CharSequence component() {
+        return AZURE_FUNCTIONS;
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpRequestMessage> getter() {
-    return HttpRequestMessageExtractAdapter.GETTER;
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpRequestMessage> getter() {
+        return HttpRequestMessageExtractAdapter.GETTER;
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpResponseMessage> responseGetter() {
-    return null;
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpResponseMessage> responseGetter() {
+        return null;
+    }
 
-  @Override
-  public CharSequence spanName() {
-    return AZURE_FUNCTIONS_REQUEST;
-  }
+    @Override
+    public CharSequence spanName() {
+        return AZURE_FUNCTIONS_REQUEST;
+    }
 
-  @Override
-  protected String method(final HttpRequestMessage request) {
-    return request.getHttpMethod().name();
-  }
+    @Override
+    protected String method(final HttpRequestMessage request) {
+        return request.getHttpMethod().name();
+    }
 
-  @Override
-  protected URIDataAdapter url(final HttpRequestMessage request) {
-    return new URIDefaultDataAdapter(request.getUri());
-  }
+    @Override
+    protected URIDataAdapter url(final HttpRequestMessage request) {
+        return new URIDefaultDataAdapter(request.getUri());
+    }
 
-  @Override
-  protected String peerHostIP(final HttpRequestMessage request) {
-    return null;
-  }
+    @Override
+    protected String peerHostIP(final HttpRequestMessage request) {
+        return null;
+    }
 
-  @Override
-  protected int peerPort(final HttpRequestMessage request) {
-    return 0;
-  }
+    @Override
+    protected int peerPort(final HttpRequestMessage request) {
+        return 0;
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.SERVERLESS;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.SERVERLESS;
+    }
 
-  @Override
-  protected int status(final HttpResponseMessage response) {
-    return response.getStatusCode();
-  }
+    @Override
+    protected int status(final HttpResponseMessage response) {
+        return response.getStatusCode();
+    }
 
-  public void afterStart(final AgentSpan span, final String functionName) {
-    span.setTag("aas.function.name", functionName);
-    span.setTag("aas.function.trigger", "Http");
-    super.afterStart(span);
-  }
+    public void afterStart(final AgentSpan span, final String functionName) {
+        span.setTag("aas.function.name", functionName);
+        span.setTag("aas.function.trigger", "Http");
+        super.afterStart(span);
+    }
 }
diff --git a/dd-java-agent/instrumentation/azure-functions-1.2.2/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsInstrumentation.java b/dd-java-agent/instrumentation/azure-functions-1.2.2/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsInstrumentation.java
index e54b78a9e8d..3de0e90a98e 100644
--- a/dd-java-agent/instrumentation/azure-functions-1.2.2/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsInstrumentation.java
+++ b/dd-java-agent/instrumentation/azure-functions-1.2.2/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsInstrumentation.java
@@ -28,78 +28,76 @@
 
 @AutoService(InstrumenterModule.class)
 public class AzureFunctionsInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public AzureFunctionsInstrumentation() {
-    super("azure-functions");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    /*
-    Due to the class-loading in the Azure Function environment we cannot assume that
-    "com.microsoft.azure.functions.annotation.FunctionName" will be visible (as in defined as a
-    resource) for any types using that annotation
-    */
-    return null;
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return declaresMethod(
-        isAnnotatedWith(named("com.microsoft.azure.functions.annotation.FunctionName")));
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public AzureFunctionsInstrumentation() {
+        super("azure-functions");
+    }
 
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(isPublic())
-            .and(takesArgument(0, named("com.microsoft.azure.functions.HttpRequestMessage")))
-            .and(takesArgument(1, named("com.microsoft.azure.functions.ExecutionContext"))),
-        AzureFunctionsInstrumentation.class.getName() + "$ContextTrackingAdvice",
-        AzureFunctionsInstrumentation.class.getName() + "$AzureFunctionsAdvice");
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        /*
+        Due to the class-loading in the Azure Function environment we cannot assume that
+        "com.microsoft.azure.functions.annotation.FunctionName" will be visible (as in defined as a
+        resource) for any types using that annotation
+        */
+        return null;
+    }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextTrackingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(@Advice.Argument(0) final HttpRequestMessage<?> request) {
-      Context parentContext = DECORATE.extract(request);
-      return parentContext.attach();
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return declaresMethod(isAnnotatedWith(named("com.microsoft.azure.functions.annotation.FunctionName")));
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      scope.close();
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(isPublic())
+                        .and(takesArgument(0, named("com.microsoft.azure.functions.HttpRequestMessage")))
+                        .and(takesArgument(1, named("com.microsoft.azure.functions.ExecutionContext"))),
+                AzureFunctionsInstrumentation.class.getName() + "$ContextTrackingAdvice",
+                AzureFunctionsInstrumentation.class.getName() + "$AzureFunctionsAdvice");
     }
-  }
 
-  public static class AzureFunctionsAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.Argument(0) final HttpRequestMessage<?> request,
-        @Advice.Argument(1) final ExecutionContext executionContext) {
-      final Context parentContext =
-          currentContext(); // parent context attached by ContextTrackingAdvice
-      final Context context = DECORATE.startSpan(request, parentContext);
-      final AgentSpan span = fromContext(context);
-      DECORATE.afterStart(span, executionContext.getFunctionName());
-      DECORATE.onRequest(span, request, request, parentContext);
-      HTTP_RESOURCE_DECORATOR.withRoute(
-          span, request.getHttpMethod().name(), request.getUri().getPath());
-      return context.attach();
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextTrackingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(@Advice.Argument(0) final HttpRequestMessage<?> request) {
+            Context parentContext = DECORATE.extract(request);
+            return parentContext.attach();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            scope.close();
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return final HttpResponseMessage response,
-        @Advice.Thrown final Throwable throwable) {
-      final AgentSpan span = fromContext(scope.context());
-      DECORATE.onError(span, throwable);
-      DECORATE.onResponse(span, response);
-      DECORATE.beforeFinish(scope.context());
-      scope.close();
-      span.finish();
+    public static class AzureFunctionsAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.Argument(0) final HttpRequestMessage<?> request,
+                @Advice.Argument(1) final ExecutionContext executionContext) {
+            final Context parentContext = currentContext(); // parent context attached by ContextTrackingAdvice
+            final Context context = DECORATE.startSpan(request, parentContext);
+            final AgentSpan span = fromContext(context);
+            DECORATE.afterStart(span, executionContext.getFunctionName());
+            DECORATE.onRequest(span, request, request, parentContext);
+            HTTP_RESOURCE_DECORATOR.withRoute(
+                    span, request.getHttpMethod().name(), request.getUri().getPath());
+            return context.attach();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return final HttpResponseMessage response,
+                @Advice.Thrown final Throwable throwable) {
+            final AgentSpan span = fromContext(scope.context());
+            DECORATE.onError(span, throwable);
+            DECORATE.onResponse(span, response);
+            DECORATE.beforeFinish(scope.context());
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/azure-functions-1.2.2/src/main/java/datadog/trace/instrumentation/azure/functions/HttpRequestMessageExtractAdapter.java b/dd-java-agent/instrumentation/azure-functions-1.2.2/src/main/java/datadog/trace/instrumentation/azure/functions/HttpRequestMessageExtractAdapter.java
index e9c43a5c752..a747ba0032e 100644
--- a/dd-java-agent/instrumentation/azure-functions-1.2.2/src/main/java/datadog/trace/instrumentation/azure/functions/HttpRequestMessageExtractAdapter.java
+++ b/dd-java-agent/instrumentation/azure-functions-1.2.2/src/main/java/datadog/trace/instrumentation/azure/functions/HttpRequestMessageExtractAdapter.java
@@ -4,13 +4,11 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
 import datadog.trace.bootstrap.instrumentation.api.ContextVisitors;
 
-public class HttpRequestMessageExtractAdapter
-    implements AgentPropagation.ContextVisitor<HttpRequestMessage> {
-  public static final HttpRequestMessageExtractAdapter GETTER =
-      new HttpRequestMessageExtractAdapter();
+public class HttpRequestMessageExtractAdapter implements AgentPropagation.ContextVisitor<HttpRequestMessage> {
+    public static final HttpRequestMessageExtractAdapter GETTER = new HttpRequestMessageExtractAdapter();
 
-  @Override
-  public void forEachKey(HttpRequestMessage carrier, AgentPropagation.KeyClassifier classifier) {
-    ContextVisitors.stringValuesEntrySet().forEachKey(carrier.getHeaders().entrySet(), classifier);
-  }
+    @Override
+    public void forEachKey(HttpRequestMessage carrier, AgentPropagation.KeyClassifier classifier) {
+        ContextVisitors.stringValuesEntrySet().forEachKey(carrier.getHeaders().entrySet(), classifier);
+    }
 }
diff --git a/dd-java-agent/instrumentation/azure-functions-1.2.2/src/test/groovy/Function.java b/dd-java-agent/instrumentation/azure-functions-1.2.2/src/test/groovy/Function.java
index 94df257d079..e06710c0576 100644
--- a/dd-java-agent/instrumentation/azure-functions-1.2.2/src/test/groovy/Function.java
+++ b/dd-java-agent/instrumentation/azure-functions-1.2.2/src/test/groovy/Function.java
@@ -9,14 +9,16 @@
 import java.util.Optional;
 
 public class Function {
-  @FunctionName("HttpTest")
-  public HttpResponseMessage run(
-      @HttpTrigger(
-              name = "req",
-              methods = {HttpMethod.GET},
-              authLevel = AuthorizationLevel.ANONYMOUS)
-          HttpRequestMessage<Optional<String>> request,
-      final ExecutionContext context) {
-    return request.createResponseBuilder(HttpStatus.OK).body("Hello Datadog test!").build();
-  }
+    @FunctionName("HttpTest")
+    public HttpResponseMessage run(
+            @HttpTrigger(
+                            name = "req",
+                            methods = {HttpMethod.GET},
+                            authLevel = AuthorizationLevel.ANONYMOUS)
+                    HttpRequestMessage<Optional<String>> request,
+            final ExecutionContext context) {
+        return request.createResponseBuilder(HttpStatus.OK)
+                .body("Hello Datadog test!")
+                .build();
+    }
 }
diff --git a/dd-java-agent/instrumentation/beanshell-2.0/src/main/java/datadog/trace/instrumentation/beanshell/BeanShellInstrumentation.java b/dd-java-agent/instrumentation/beanshell-2.0/src/main/java/datadog/trace/instrumentation/beanshell/BeanShellInstrumentation.java
index 2f2431f8c8a..4fa4161a6a1 100644
--- a/dd-java-agent/instrumentation/beanshell-2.0/src/main/java/datadog/trace/instrumentation/beanshell/BeanShellInstrumentation.java
+++ b/dd-java-agent/instrumentation/beanshell-2.0/src/main/java/datadog/trace/instrumentation/beanshell/BeanShellInstrumentation.java
@@ -22,144 +22,141 @@
 
 @AutoService(InstrumenterModule.class)
 public class BeanShellInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public BeanShellInstrumentation() {
-    super("beanshell");
-  }
+    public BeanShellInstrumentation() {
+        super("beanshell");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {"bsh.Interpreter", "bsh.Remote"};
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"bsh.Interpreter", "bsh.Remote"};
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      new Reference.Builder("bsh.Interpreter")
-          .withMethod(
-              new String[0],
-              EXPECTS_PUBLIC | EXPECTS_NON_STATIC,
-              "eval",
-              "Ljava/lang/Object;",
-              "Ljava/lang/String;",
-              "Lbsh/NameSpace;")
-          .withMethod(
-              new String[0],
-              EXPECTS_PUBLIC | EXPECTS_NON_STATIC,
-              "eval",
-              "Ljava/lang/Object;",
-              "Ljava/io/Reader;",
-              "Lbsh/NameSpace;",
-              "Ljava/lang/String;")
-          .build(),
-      new Reference.Builder("bsh.Remote")
-          .withMethod(
-              new String[0],
-              EXPECTS_PUBLIC | EXPECTS_STATIC,
-              "eval",
-              "I",
-              "Ljava/lang/String;",
-              "Ljava/lang/String;")
-          .build(),
-    };
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            new Reference.Builder("bsh.Interpreter")
+                    .withMethod(
+                            new String[0],
+                            EXPECTS_PUBLIC | EXPECTS_NON_STATIC,
+                            "eval",
+                            "Ljava/lang/Object;",
+                            "Ljava/lang/String;",
+                            "Lbsh/NameSpace;")
+                    .withMethod(
+                            new String[0],
+                            EXPECTS_PUBLIC | EXPECTS_NON_STATIC,
+                            "eval",
+                            "Ljava/lang/Object;",
+                            "Ljava/io/Reader;",
+                            "Lbsh/NameSpace;",
+                            "Ljava/lang/String;")
+                    .build(),
+            new Reference.Builder("bsh.Remote")
+                    .withMethod(
+                            new String[0],
+                            EXPECTS_PUBLIC | EXPECTS_STATIC,
+                            "eval",
+                            "I",
+                            "Ljava/lang/String;",
+                            "Ljava/lang/String;")
+                    .build(),
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // bsh.Interpreter.eval(String, NameSpace): entry point that eval(String) also delegates to.
-    // It builds the Reader internally, but bsh.* is excluded from call-site instrumentation
-    // (iast_exclusion.trie) so that reader is never tainted; we inspect the String arg directly.
-    transformer.applyAdvice(
-        named("eval")
-            .and(isMethod())
-            .and(
-                takesArguments(2)
-                    .and(takesArgument(0, String.class))
-                    .and(takesArgument(1, named("bsh.NameSpace")))),
-        BeanShellInstrumentation.class.getName() + "$StringEvalAdvice");
-    // bsh.Interpreter.eval(Reader, NameSpace, String): shared core reached by public eval(Reader).
-    // Only reports when the caller supplied a tainted Reader; the Reader built internally by
-    // eval(String, NameSpace) is untainted, so the String path above does not double-report.
-    // NOTE: this non-duplication relies on bsh.* staying in iast_exclusion.trie; removing it would
-    // taint the internally built reader and make eval(String) double-report CODE_INJECTION.
-    transformer.applyAdvice(
-        named("eval")
-            .and(isMethod())
-            .and(
-                takesArguments(3)
-                    .and(takesArgument(0, Reader.class))
-                    .and(takesArgument(1, named("bsh.NameSpace")))
-                    .and(takesArgument(2, String.class))),
-        BeanShellInstrumentation.class.getName() + "$EvalAdvice");
-    // bsh.Remote.eval(String url, String text)
-    transformer.applyAdvice(
-        named("eval").and(isMethod()).and(takesArguments(String.class, String.class)),
-        BeanShellInstrumentation.class.getName() + "$RemoteEvalAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // bsh.Interpreter.eval(String, NameSpace): entry point that eval(String) also delegates to.
+        // It builds the Reader internally, but bsh.* is excluded from call-site instrumentation
+        // (iast_exclusion.trie) so that reader is never tainted; we inspect the String arg directly.
+        transformer.applyAdvice(
+                named("eval")
+                        .and(isMethod())
+                        .and(takesArguments(2)
+                                .and(takesArgument(0, String.class))
+                                .and(takesArgument(1, named("bsh.NameSpace")))),
+                BeanShellInstrumentation.class.getName() + "$StringEvalAdvice");
+        // bsh.Interpreter.eval(Reader, NameSpace, String): shared core reached by public eval(Reader).
+        // Only reports when the caller supplied a tainted Reader; the Reader built internally by
+        // eval(String, NameSpace) is untainted, so the String path above does not double-report.
+        // NOTE: this non-duplication relies on bsh.* staying in iast_exclusion.trie; removing it would
+        // taint the internally built reader and make eval(String) double-report CODE_INJECTION.
+        transformer.applyAdvice(
+                named("eval")
+                        .and(isMethod())
+                        .and(takesArguments(3)
+                                .and(takesArgument(0, Reader.class))
+                                .and(takesArgument(1, named("bsh.NameSpace")))
+                                .and(takesArgument(2, String.class))),
+                BeanShellInstrumentation.class.getName() + "$EvalAdvice");
+        // bsh.Remote.eval(String url, String text)
+        transformer.applyAdvice(
+                named("eval").and(isMethod()).and(takesArguments(String.class, String.class)),
+                BeanShellInstrumentation.class.getName() + "$RemoteEvalAdvice");
+    }
 
-  public static class StringEvalAdvice {
+    public static class StringEvalAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.CODE_INJECTION)
-    public static void onEnter(@Advice.Argument(0) final String statements) {
-      if (statements == null) {
-        return;
-      }
-      final CodeInjectionModule codeInjectionModule = InstrumentationBridge.CODE_INJECTION;
-      if (codeInjectionModule == null) {
-        return;
-      }
-      codeInjectionModule.onEval(statements);
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.CODE_INJECTION)
+        public static void onEnter(@Advice.Argument(0) final String statements) {
+            if (statements == null) {
+                return;
+            }
+            final CodeInjectionModule codeInjectionModule = InstrumentationBridge.CODE_INJECTION;
+            if (codeInjectionModule == null) {
+                return;
+            }
+            codeInjectionModule.onEval(statements);
+        }
     }
-  }
 
-  public static class EvalAdvice {
+    public static class EvalAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.CODE_INJECTION)
-    public static void onEnter(@Advice.Argument(0) final Reader reader) {
-      if (reader == null) {
-        return;
-      }
-      final CodeInjectionModule codeInjectionModule = InstrumentationBridge.CODE_INJECTION;
-      if (codeInjectionModule == null) {
-        return;
-      }
-      codeInjectionModule.onEval(reader);
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.CODE_INJECTION)
+        public static void onEnter(@Advice.Argument(0) final Reader reader) {
+            if (reader == null) {
+                return;
+            }
+            final CodeInjectionModule codeInjectionModule = InstrumentationBridge.CODE_INJECTION;
+            if (codeInjectionModule == null) {
+                return;
+            }
+            codeInjectionModule.onEval(reader);
+        }
     }
-  }
 
-  public static class RemoteEvalAdvice {
+    public static class RemoteEvalAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.CODE_INJECTION)
-    public static void onEnter(
-        @Advice.Argument(0) final String url, @Advice.Argument(1) final String text) {
-      // Remote.eval dispatches on the URL scheme: "http:" opens a URL connection and "bsh:" opens a
-      // raw socket; every other scheme throws before any I/O or script dispatch, so neither the URL
-      // nor the script reaches a sink. bsh.* is excluded from call-site instrumentation, so neither
-      // the URL/URLConnection nor the socket SSRF call-site sink fires inside bsh either.
-      if (url == null || !(url.startsWith("http:") || url.startsWith("bsh:"))) {
-        return;
-      }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.CODE_INJECTION)
+        public static void onEnter(@Advice.Argument(0) final String url, @Advice.Argument(1) final String text) {
+            // Remote.eval dispatches on the URL scheme: "http:" opens a URL connection and "bsh:" opens a
+            // raw socket; every other scheme throws before any I/O or script dispatch, so neither the URL
+            // nor the script reaches a sink. bsh.* is excluded from call-site instrumentation, so neither
+            // the URL/URLConnection nor the socket SSRF call-site sink fires inside bsh either.
+            if (url == null || !(url.startsWith("http:") || url.startsWith("bsh:"))) {
+                return;
+            }
 
-      // @Sink only declares CODE_INJECTION (it is single-valued), so this SSRF report is not
-      // counted in the instrumented/executed-sink telemetry; the vulnerability itself is still
-      // reported.
-      final SsrfModule ssrfModule = InstrumentationBridge.SSRF;
-      if (ssrfModule != null) {
-        ssrfModule.onURLConnection(url);
-      }
+            // @Sink only declares CODE_INJECTION (it is single-valued), so this SSRF report is not
+            // counted in the instrumented/executed-sink telemetry; the vulnerability itself is still
+            // reported.
+            final SsrfModule ssrfModule = InstrumentationBridge.SSRF;
+            if (ssrfModule != null) {
+                ssrfModule.onURLConnection(url);
+            }
 
-      if (text == null) {
-        return;
-      }
-      final CodeInjectionModule codeInjectionModule = InstrumentationBridge.CODE_INJECTION;
-      if (codeInjectionModule == null) {
-        return;
-      }
-      codeInjectionModule.onEval(text);
+            if (text == null) {
+                return;
+            }
+            final CodeInjectionModule codeInjectionModule = InstrumentationBridge.CODE_INJECTION;
+            if (codeInjectionModule == null) {
+                return;
+            }
+            codeInjectionModule.onEval(text);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/caffeine-1.0/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheAdvice.java b/dd-java-agent/instrumentation/caffeine-1.0/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheAdvice.java
index 5282bf3cbcd..0cecd8a6395 100644
--- a/dd-java-agent/instrumentation/caffeine-1.0/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheAdvice.java
+++ b/dd-java-agent/instrumentation/caffeine-1.0/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheAdvice.java
@@ -8,13 +8,13 @@
 
 public class BoundedLocalCacheAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope enter() {
-    return activateSpan(noopSpan());
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope enter() {
+        return activateSpan(noopSpan());
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void exit(@Advice.Enter final ContextScope scope) {
-    scope.close();
-  }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void exit(@Advice.Enter final ContextScope scope) {
+        scope.close();
+    }
 }
diff --git a/dd-java-agent/instrumentation/caffeine-1.0/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheInstrumentation.java b/dd-java-agent/instrumentation/caffeine-1.0/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheInstrumentation.java
index b1e01e1901d..71c5386e355 100644
--- a/dd-java-agent/instrumentation/caffeine-1.0/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheInstrumentation.java
+++ b/dd-java-agent/instrumentation/caffeine-1.0/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheInstrumentation.java
@@ -13,34 +13,33 @@
 
 @AutoService(InstrumenterModule.class)
 public final class BoundedLocalCacheInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public BoundedLocalCacheInstrumentation() {
-    super("caffeine");
-  }
+    public BoundedLocalCacheInstrumentation() {
+        super("caffeine");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.github.benmanes.caffeine.cache.BoundedLocalCache";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.github.benmanes.caffeine.cache.BoundedLocalCache";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("scheduleDrainBuffers").and(takesArguments(0)),
-        getClass().getName() + "$ScheduleDrainBuffers");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("scheduleDrainBuffers").and(takesArguments(0)), getClass().getName() + "$ScheduleDrainBuffers");
+    }
 
-  public static class ScheduleDrainBuffers {
+    public static class ScheduleDrainBuffers {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter() {
-      return activateSpan(noopSpan());
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter() {
+            return activateSpan(noopSpan());
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Enter final ContextScope scope) {
-      scope.close();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Enter final ContextScope scope) {
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/cdi-1.2/src/test/java/TestBean.java b/dd-java-agent/instrumentation/cdi-1.2/src/test/java/TestBean.java
index c68ad16a120..016f631fdd2 100644
--- a/dd-java-agent/instrumentation/cdi-1.2/src/test/java/TestBean.java
+++ b/dd-java-agent/instrumentation/cdi-1.2/src/test/java/TestBean.java
@@ -1,12 +1,12 @@
 public class TestBean {
 
-  private String someField;
+    private String someField;
 
-  public String getSomeField() {
-    return someField;
-  }
+    public String getSomeField() {
+        return someField;
+    }
 
-  public void setSomeField(final String someField) {
-    this.someField = someField;
-  }
+    public void setSomeField(final String someField) {
+        this.someField = someField;
+    }
 }
diff --git a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/CicsDecorator.java b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/CicsDecorator.java
index d98940352c4..669b5a6b922 100644
--- a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/CicsDecorator.java
+++ b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/CicsDecorator.java
@@ -10,101 +10,101 @@
 import javax.annotation.Nonnull;
 
 public class CicsDecorator extends ClientDecorator {
-  public static final CharSequence CICS_CLIENT = UTF8BytesString.create("cics-client");
-  public static final CharSequence ECI_EXECUTE_OPERATION = UTF8BytesString.create("cics.execute");
-  public static final CharSequence GATEWAY_FLOW_OPERATION = UTF8BytesString.create("gateway.flow");
+    public static final CharSequence CICS_CLIENT = UTF8BytesString.create("cics-client");
+    public static final CharSequence ECI_EXECUTE_OPERATION = UTF8BytesString.create("cics.execute");
+    public static final CharSequence GATEWAY_FLOW_OPERATION = UTF8BytesString.create("gateway.flow");
 
-  public static final CicsDecorator DECORATE = new CicsDecorator();
+    public static final CicsDecorator DECORATE = new CicsDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"cics"};
-  }
-
-  @Override
-  protected String service() {
-    return null; // Use default service name
-  }
-
-  @Override
-  protected CharSequence component() {
-    return CICS_CLIENT;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.RPC;
-  }
-
-  @Override
-  protected void doAfterStart(@Nonnull AgentSpan span) {
-    assert span != null;
-    span.setTag("rpc.system", "cics");
-    super.doAfterStart(span);
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"cics"};
+    }
 
-  /**
-   * Adds connection details to a span from JavaGatewayInterface fields.
-   *
-   * @param span the span to decorate
-   * @param strAddress the hostname/address string
-   * @param port the port number
-   * @param ipGateway the resolved InetAddress (can be null)
-   */
-  public void onConnection(
-      final AgentSpan span, final String strAddress, final int port, final InetAddress ipGateway) {
-    if (strAddress != null) {
-      span.setTag(Tags.PEER_HOSTNAME, strAddress);
+    @Override
+    protected String service() {
+        return null; // Use default service name
     }
 
-    if (ipGateway != null) {
-      onPeerConnection(span, ipGateway, false);
+    @Override
+    protected CharSequence component() {
+        return CICS_CLIENT;
     }
 
-    if (port > 0) {
-      setPeerPort(span, port);
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.RPC;
     }
-  }
 
-  /**
-   * Converts ECI interaction verb code to string representation.
-   *
-   * @param verb the interaction verb code
-   * @return string representation of the verb
-   * @see <a
-   *     href="https://docs.oracle.com/javaee/6/api/constant-values.html#javax.resource.cci.InteractionSpec.SYNC_SEND">InteractionSpec
-   *     constants</a>
-   */
-  private String getInteractionVerbString(final int verb) {
-    switch (verb) {
-      case 0:
-        return "SYNC_SEND";
-      case 1:
-        return "SYNC_SEND_RECEIVE";
-      case 2:
-        return "SYNC_RECEIVE";
-      default:
-        return "UNKNOWN_" + verb;
+    @Override
+    protected void doAfterStart(@Nonnull AgentSpan span) {
+        assert span != null;
+        span.setTag("rpc.system", "cics");
+        super.doAfterStart(span);
     }
-  }
 
-  public void onECIInteraction(final AgentSpan span, final ECIInteractionSpec spec) {
-    final String interactionVerb = getInteractionVerbString(spec.getInteractionVerb());
-    final String functionName = spec.getFunctionName();
-    final String tranName = spec.getTranName();
-    final String tpnName = spec.getTPNName();
+    /**
+     * Adds connection details to a span from JavaGatewayInterface fields.
+     *
+     * @param span the span to decorate
+     * @param strAddress the hostname/address string
+     * @param port the port number
+     * @param ipGateway the resolved InetAddress (can be null)
+     */
+    public void onConnection(
+            final AgentSpan span, final String strAddress, final int port, final InetAddress ipGateway) {
+        if (strAddress != null) {
+            span.setTag(Tags.PEER_HOSTNAME, strAddress);
+        }
 
-    span.setResourceName(interactionVerb + " " + functionName);
-    span.setTag("cics.interaction", interactionVerb);
+        if (ipGateway != null) {
+            onPeerConnection(span, ipGateway, false);
+        }
 
-    if (functionName != null) {
-      span.setTag("rpc.method", functionName);
+        if (port > 0) {
+            setPeerPort(span, port);
+        }
     }
-    if (tranName != null) {
-      span.setTag("cics.tran", tranName);
+
+    /**
+     * Converts ECI interaction verb code to string representation.
+     *
+     * @param verb the interaction verb code
+     * @return string representation of the verb
+     * @see <a
+     *     href="https://docs.oracle.com/javaee/6/api/constant-values.html#javax.resource.cci.InteractionSpec.SYNC_SEND">InteractionSpec
+     *     constants</a>
+     */
+    private String getInteractionVerbString(final int verb) {
+        switch (verb) {
+            case 0:
+                return "SYNC_SEND";
+            case 1:
+                return "SYNC_SEND_RECEIVE";
+            case 2:
+                return "SYNC_RECEIVE";
+            default:
+                return "UNKNOWN_" + verb;
+        }
     }
-    if (tpnName != null) {
-      span.setTag("cics.tpn", tpnName);
+
+    public void onECIInteraction(final AgentSpan span, final ECIInteractionSpec spec) {
+        final String interactionVerb = getInteractionVerbString(spec.getInteractionVerb());
+        final String functionName = spec.getFunctionName();
+        final String tranName = spec.getTranName();
+        final String tpnName = spec.getTPNName();
+
+        span.setResourceName(interactionVerb + " " + functionName);
+        span.setTag("cics.interaction", interactionVerb);
+
+        if (functionName != null) {
+            span.setTag("rpc.method", functionName);
+        }
+        if (tranName != null) {
+            span.setTag("cics.tran", tranName);
+        }
+        if (tpnName != null) {
+            span.setTag("cics.tpn", tpnName);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/CicsModule.java b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/CicsModule.java
index 5c8fc4ec917..5ae3d76dcdb 100644
--- a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/CicsModule.java
+++ b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/CicsModule.java
@@ -9,12 +9,12 @@
 
 @AutoService(InstrumenterModule.class)
 public class CicsModule extends InstrumenterModule.Tracing {
-  public CicsModule() {
-    super("cics");
-  }
+    public CicsModule() {
+        super("cics");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(new ECIInteractionInstrumentation(), new JavaGatewayInterfaceInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(new ECIInteractionInstrumentation(), new JavaGatewayInterfaceInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/ECIInteractionInstrumentation.java b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/ECIInteractionInstrumentation.java
index ab785206078..3aa64d95e92 100644
--- a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/ECIInteractionInstrumentation.java
+++ b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/ECIInteractionInstrumentation.java
@@ -16,47 +16,45 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
 
-public final class ECIInteractionInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.connector2.cics.ECIInteraction";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(named("execute"), getClass().getName() + "$ExecuteAdvice");
-  }
-
-  public static class ExecuteAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(@Advice.Argument(0) final Object spec) {
-      // Coordinating with JavaGatewayInterfaceInstrumentation
-      CallDepthThreadLocalMap.incrementCallDepth(ECIInteraction.class);
-
-      if (!(spec instanceof ECIInteractionSpec)) {
-        return null;
-      }
-
-      AgentSpan span = startSpan(CICS_CLIENT.toString(), ECI_EXECUTE_OPERATION);
-      DECORATE.afterStart(span);
-      DECORATE.onECIInteraction(span, (ECIInteractionSpec) spec);
-
-      return activateSpan(span);
+public final class ECIInteractionInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    @Override
+    public String instrumentedType() {
+        return "com.ibm.connector2.cics.ECIInteraction";
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      CallDepthThreadLocalMap.decrementCallDepth(ECIInteraction.class);
-
-      if (null != scope) {
-        AgentSpan span = spanFromScope(scope);
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("execute"), getClass().getName() + "$ExecuteAdvice");
+    }
+
+    public static class ExecuteAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(@Advice.Argument(0) final Object spec) {
+            // Coordinating with JavaGatewayInterfaceInstrumentation
+            CallDepthThreadLocalMap.incrementCallDepth(ECIInteraction.class);
+
+            if (!(spec instanceof ECIInteractionSpec)) {
+                return null;
+            }
+
+            AgentSpan span = startSpan(CICS_CLIENT.toString(), ECI_EXECUTE_OPERATION);
+            DECORATE.afterStart(span);
+            DECORATE.onECIInteraction(span, (ECIInteractionSpec) spec);
+
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            CallDepthThreadLocalMap.decrementCallDepth(ECIInteraction.class);
+
+            if (null != scope) {
+                AgentSpan span = spanFromScope(scope);
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/JavaGatewayInterfaceInstrumentation.java b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/JavaGatewayInterfaceInstrumentation.java
index a0e020fb320..87f78ec7757 100644
--- a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/JavaGatewayInterfaceInstrumentation.java
+++ b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/JavaGatewayInterfaceInstrumentation.java
@@ -21,59 +21,58 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public final class JavaGatewayInterfaceInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  @Override
-  public String hierarchyMarkerType() {
-    return "com.ibm.ctg.client.JavaGatewayInterface";
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    @Override
+    public String hierarchyMarkerType() {
+        return "com.ibm.ctg.client.JavaGatewayInterface";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(named("flow"), getClass().getName() + "$FlowAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("flow"), getClass().getName() + "$FlowAdvice");
+    }
 
-  public static class FlowAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.FieldValue("strAddress") final String strAddress,
-        @Advice.FieldValue("iPort") final int port,
-        @Advice.FieldValue("ipGateway") final InetAddress ipGateway) {
-      // Coordinating with ECIInteractionInstrumentation
-      final int callDepth = CallDepthThreadLocalMap.getCallDepth(ECIInteraction.class);
-      if (callDepth > 0) {
-        // Inside execute() - add connection tags to the existing span instead of creating new one
-        final AgentSpan parentSpan = activeSpan();
-        if (parentSpan != null) {
-          DECORATE.onConnection(parentSpan, strAddress, port, ipGateway);
-        }
-        return null;
-      }
+    public static class FlowAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.FieldValue("strAddress") final String strAddress,
+                @Advice.FieldValue("iPort") final int port,
+                @Advice.FieldValue("ipGateway") final InetAddress ipGateway) {
+            // Coordinating with ECIInteractionInstrumentation
+            final int callDepth = CallDepthThreadLocalMap.getCallDepth(ECIInteraction.class);
+            if (callDepth > 0) {
+                // Inside execute() - add connection tags to the existing span instead of creating new one
+                final AgentSpan parentSpan = activeSpan();
+                if (parentSpan != null) {
+                    DECORATE.onConnection(parentSpan, strAddress, port, ipGateway);
+                }
+                return null;
+            }
 
-      // Not inside execute() - create a new span
-      final AgentSpan span = startSpan(CICS_CLIENT.toString(), GATEWAY_FLOW_OPERATION);
-      DECORATE.afterStart(span);
-      DECORATE.onConnection(span, strAddress, port, ipGateway);
-      return activateSpan(span);
-    }
+            // Not inside execute() - create a new span
+            final AgentSpan span = startSpan(CICS_CLIENT.toString(), GATEWAY_FLOW_OPERATION);
+            DECORATE.afterStart(span);
+            DECORATE.onConnection(span, strAddress, port, ipGateway);
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (null == scope) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (null == scope) {
+                return;
+            }
 
-      final AgentSpan span = spanFromScope(scope);
+            final AgentSpan span = spanFromScope(scope);
 
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/commons-codec-1.1/src/main/java/datadog/trace/instrumentation/commonscodec/Base64CallSite.java b/dd-java-agent/instrumentation/commons-codec-1.1/src/main/java/datadog/trace/instrumentation/commonscodec/Base64CallSite.java
index d998022328f..f5402cf4b6b 100644
--- a/dd-java-agent/instrumentation/commons-codec-1.1/src/main/java/datadog/trace/instrumentation/commonscodec/Base64CallSite.java
+++ b/dd-java-agent/instrumentation/commons-codec-1.1/src/main/java/datadog/trace/instrumentation/commonscodec/Base64CallSite.java
@@ -14,69 +14,67 @@
 // TODO complete propagation support
 public class Base64CallSite {
 
-  @CallSite.After("byte[] org.apache.commons.codec.binary.Base64.encodeBase64(byte[])")
-  @Nonnull
-  public static byte[] afterEncodeBase64(
-      @CallSite.Argument @Nullable final byte[] param,
-      @CallSite.Return @Nonnull final byte[] result) {
-    final CodecModule module = InstrumentationBridge.CODEC;
-    if (module != null) {
-      try {
-        module.onBase64Encode(param, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterEncodeBase64 threw", e);
-      }
+    @CallSite.After("byte[] org.apache.commons.codec.binary.Base64.encodeBase64(byte[])")
+    @Nonnull
+    public static byte[] afterEncodeBase64(
+            @CallSite.Argument @Nullable final byte[] param, @CallSite.Return @Nonnull final byte[] result) {
+        final CodecModule module = InstrumentationBridge.CODEC;
+        if (module != null) {
+            try {
+                module.onBase64Encode(param, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterEncodeBase64 threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("byte[] org.apache.commons.codec.binary.Base64.encode(byte[])")
-  @Nonnull
-  public static byte[] afterEncode(
-      @CallSite.This final Base64 codec,
-      @CallSite.Argument @Nullable final byte[] param,
-      @CallSite.Return @Nonnull final byte[] result) {
-    final CodecModule module = InstrumentationBridge.CODEC;
-    if (module != null) {
-      try {
-        module.onBase64Encode(param, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterEncode threw", e);
-      }
+    @CallSite.After("byte[] org.apache.commons.codec.binary.Base64.encode(byte[])")
+    @Nonnull
+    public static byte[] afterEncode(
+            @CallSite.This final Base64 codec,
+            @CallSite.Argument @Nullable final byte[] param,
+            @CallSite.Return @Nonnull final byte[] result) {
+        final CodecModule module = InstrumentationBridge.CODEC;
+        if (module != null) {
+            try {
+                module.onBase64Encode(param, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterEncode threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("byte[] org.apache.commons.codec.binary.Base64.decodeBase64(byte[])")
-  @Nonnull
-  public static byte[] afterDecodeBase64(
-      @CallSite.Argument @Nullable final byte[] param,
-      @CallSite.Return @Nonnull final byte[] result) {
-    final CodecModule module = InstrumentationBridge.CODEC;
-    if (module != null) {
-      try {
-        module.onBase64Decode(param, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterDecodeBase64 threw", e);
-      }
+    @CallSite.After("byte[] org.apache.commons.codec.binary.Base64.decodeBase64(byte[])")
+    @Nonnull
+    public static byte[] afterDecodeBase64(
+            @CallSite.Argument @Nullable final byte[] param, @CallSite.Return @Nonnull final byte[] result) {
+        final CodecModule module = InstrumentationBridge.CODEC;
+        if (module != null) {
+            try {
+                module.onBase64Decode(param, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterDecodeBase64 threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("byte[] org.apache.commons.codec.binary.Base64.decode(byte[])")
-  @Nonnull
-  public static byte[] afterDecode(
-      @CallSite.This final Base64 codec,
-      @CallSite.Argument @Nullable final byte[] param,
-      @CallSite.Return @Nonnull final byte[] result) {
-    final CodecModule module = InstrumentationBridge.CODEC;
-    if (module != null) {
-      try {
-        module.onBase64Decode(param, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterDecode threw", e);
-      }
+    @CallSite.After("byte[] org.apache.commons.codec.binary.Base64.decode(byte[])")
+    @Nonnull
+    public static byte[] afterDecode(
+            @CallSite.This final Base64 codec,
+            @CallSite.Argument @Nullable final byte[] param,
+            @CallSite.Return @Nonnull final byte[] result) {
+        final CodecModule module = InstrumentationBridge.CODEC;
+        if (module != null) {
+            try {
+                module.onBase64Decode(param, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterDecode threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/commons-codec-1.1/src/test/java/foo/bar/TestBase64CallSiteSuite.java b/dd-java-agent/instrumentation/commons-codec-1.1/src/test/java/foo/bar/TestBase64CallSiteSuite.java
index 7dc671236de..0f5ea99e12c 100644
--- a/dd-java-agent/instrumentation/commons-codec-1.1/src/test/java/foo/bar/TestBase64CallSiteSuite.java
+++ b/dd-java-agent/instrumentation/commons-codec-1.1/src/test/java/foo/bar/TestBase64CallSiteSuite.java
@@ -8,33 +8,33 @@
 
 public class TestBase64CallSiteSuite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestBase64CallSiteSuite.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestBase64CallSiteSuite.class);
 
-  public static byte[] encode(final byte[] bytes) {
-    LOGGER.debug("Before encode {}", bytes);
-    final byte[] result = Base64.encodeBase64(bytes);
-    LOGGER.debug("After encode {}", result);
-    return result;
-  }
+    public static byte[] encode(final byte[] bytes) {
+        LOGGER.debug("Before encode {}", bytes);
+        final byte[] result = Base64.encodeBase64(bytes);
+        LOGGER.debug("After encode {}", result);
+        return result;
+    }
 
-  public static byte[] encode(final byte[] bytes, final Base64 encoder) throws EncoderException {
-    LOGGER.debug("Before encode {} {}", bytes, encoder);
-    final byte[] result = encoder.encode(bytes);
-    LOGGER.debug("After encode {}", result);
-    return result;
-  }
+    public static byte[] encode(final byte[] bytes, final Base64 encoder) throws EncoderException {
+        LOGGER.debug("Before encode {} {}", bytes, encoder);
+        final byte[] result = encoder.encode(bytes);
+        LOGGER.debug("After encode {}", result);
+        return result;
+    }
 
-  public static byte[] decode(final byte[] bytes) {
-    LOGGER.debug("Before decode {}", bytes);
-    final byte[] result = Base64.decodeBase64(bytes);
-    LOGGER.debug("After decode {}", result);
-    return result;
-  }
+    public static byte[] decode(final byte[] bytes) {
+        LOGGER.debug("Before decode {}", bytes);
+        final byte[] result = Base64.decodeBase64(bytes);
+        LOGGER.debug("After decode {}", result);
+        return result;
+    }
 
-  public static byte[] decode(final byte[] bytes, final Base64 encoder) throws DecoderException {
-    LOGGER.debug("Before decode {} {}", bytes, encoder);
-    final byte[] result = encoder.decode(bytes);
-    LOGGER.debug("After decode {}", result);
-    return result;
-  }
+    public static byte[] decode(final byte[] bytes, final Base64 encoder) throws DecoderException {
+        LOGGER.debug("Before decode {} {}", bytes, encoder);
+        final byte[] result = encoder.decode(bytes);
+        LOGGER.debug("After decode {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileUploadAppSecInstrumentation.java b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileUploadAppSecInstrumentation.java
index 50ff915de66..c03e27775e0 100644
--- a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileUploadAppSecInstrumentation.java
+++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileUploadAppSecInstrumentation.java
@@ -25,87 +25,87 @@
 
 @AutoService(InstrumenterModule.class)
 public class CommonsFileUploadAppSecInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public CommonsFileUploadAppSecInstrumentation() {
-    super("commons-fileupload");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public CommonsFileUploadAppSecInstrumentation() {
+        super("commons-fileupload");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.commons.fileupload.servlet.ServletFileUpload";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.commons.fileupload.servlet.ServletFileUpload";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("parseRequest")
-            .and(isPublic())
-            .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest"))),
-        getClass().getName() + "$ParseRequestAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("parseRequest")
+                        .and(isPublic())
+                        .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest"))),
+                getClass().getName() + "$ParseRequestAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class ParseRequestAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return final List<FileItem> fileItems,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null || fileItems == null || fileItems.isEmpty()) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class ParseRequestAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Return final List<FileItem> fileItems,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null || fileItems == null || fileItems.isEmpty()) {
+                return;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCallback =
-          cbp.getCallback(EVENTS.requestFilesFilenames());
-      BiFunction<RequestContext, List<String>, Flow<Void>> contentCallback =
-          cbp.getCallback(EVENTS.requestFilesContent());
-      if (filenamesCallback == null && contentCallback == null) {
-        return;
-      }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCallback =
+                    cbp.getCallback(EVENTS.requestFilesFilenames());
+            BiFunction<RequestContext, List<String>, Flow<Void>> contentCallback =
+                    cbp.getCallback(EVENTS.requestFilesContent());
+            if (filenamesCallback == null && contentCallback == null) {
+                return;
+            }
 
-      List<String> filenames = filenamesCallback != null ? new ArrayList<>() : null;
-      List<String> filesContent = contentCallback != null ? new ArrayList<>() : null;
-      for (FileItem fileItem : fileItems) {
-        if (fileItem.isFormField()) {
-          continue;
-        }
-        String name = fileItem.getName();
-        if (filenames != null && name != null && !name.isEmpty()) {
-          filenames.add(name);
-        }
-        if (filesContent != null) {
-          FileItemContentReader.addToContents(fileItem, filesContent);
-        }
-      }
+            List<String> filenames = filenamesCallback != null ? new ArrayList<>() : null;
+            List<String> filesContent = contentCallback != null ? new ArrayList<>() : null;
+            for (FileItem fileItem : fileItems) {
+                if (fileItem.isFormField()) {
+                    continue;
+                }
+                String name = fileItem.getName();
+                if (filenames != null && name != null && !name.isEmpty()) {
+                    filenames.add(name);
+                }
+                if (filesContent != null) {
+                    FileItemContentReader.addToContents(fileItem, filesContent);
+                }
+            }
 
-      if (filenames != null && !filenames.isEmpty()) {
-        Flow<Void> flow = filenamesCallback.apply(reqCtx, filenames);
-        Flow.Action action = flow.getAction();
-        if (action instanceof Flow.Action.RequestBlockingAction) {
-          Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-          BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-          if (brf != null) {
-            brf.tryCommitBlockingResponse(reqCtx, rba);
-            t = new BlockingException("Blocked request (multipart file upload)");
-            reqCtx.getTraceSegment().effectivelyBlocked();
-          }
-        }
-      }
+            if (filenames != null && !filenames.isEmpty()) {
+                Flow<Void> flow = filenamesCallback.apply(reqCtx, filenames);
+                Flow.Action action = flow.getAction();
+                if (action instanceof Flow.Action.RequestBlockingAction) {
+                    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                    BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+                    if (brf != null) {
+                        brf.tryCommitBlockingResponse(reqCtx, rba);
+                        t = new BlockingException("Blocked request (multipart file upload)");
+                        reqCtx.getTraceSegment().effectivelyBlocked();
+                    }
+                }
+            }
 
-      if (t == null && filesContent != null && !filesContent.isEmpty()) {
-        Flow<Void> contentFlow = contentCallback.apply(reqCtx, filesContent);
-        Flow.Action contentAction = contentFlow.getAction();
-        if (contentAction instanceof Flow.Action.RequestBlockingAction) {
-          Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) contentAction;
-          BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-          if (brf != null) {
-            brf.tryCommitBlockingResponse(reqCtx, rba);
-            t = new BlockingException("Blocked request (multipart file upload content)");
-            reqCtx.getTraceSegment().effectivelyBlocked();
-          }
+            if (t == null && filesContent != null && !filesContent.isEmpty()) {
+                Flow<Void> contentFlow = contentCallback.apply(reqCtx, filesContent);
+                Flow.Action contentAction = contentFlow.getAction();
+                if (contentAction instanceof Flow.Action.RequestBlockingAction) {
+                    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) contentAction;
+                    BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+                    if (brf != null) {
+                        brf.tryCommitBlockingResponse(reqCtx, rba);
+                        t = new BlockingException("Blocked request (multipart file upload content)");
+                        reqCtx.getTraceSegment().effectivelyBlocked();
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileUploadModule.java b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileUploadModule.java
index 6bf280db32f..ae6e6e83043 100644
--- a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileUploadModule.java
+++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileUploadModule.java
@@ -9,17 +9,17 @@
 
 @AutoService(InstrumenterModule.class)
 public class CommonsFileUploadModule extends InstrumenterModule.Iast {
-  public CommonsFileUploadModule() {
-    super("commons-fileupload");
-  }
+    public CommonsFileUploadModule() {
+        super("commons-fileupload");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(
-        new CommonsFileuploadInstrumentation(),
-        new FileItemInstrumentation(),
-        new FileItemIteratorInstrumentation(),
-        new FileItemStreamInstrumentation(),
-        new ServletFileUploadInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(
+                new CommonsFileuploadInstrumentation(),
+                new FileItemInstrumentation(),
+                new FileItemIteratorInstrumentation(),
+                new FileItemStreamInstrumentation(),
+                new ServletFileUploadInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumentation.java b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumentation.java
index ff4c902eb4f..baf74d69149 100644
--- a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumentation.java
+++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumentation.java
@@ -19,47 +19,45 @@
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
 
-public class CommonsFileuploadInstrumentation
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+public class CommonsFileuploadInstrumentation implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("parse"))
-            .and(isPublic())
-            .and(returns(Map.class))
-            .and(takesArguments(char[].class, int.class, int.class, char.class)),
-        getClass().getName() + "$ParseAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("parse"))
+                        .and(isPublic())
+                        .and(returns(Map.class))
+                        .and(takesArguments(char[].class, int.class, int.class, char.class)),
+                getClass().getName() + "$ParseAdvice");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.apache.commons.fileupload.ParameterParser",
-      "org.apache.tomcat.util.http.fileupload.ParameterParser"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.apache.commons.fileupload.ParameterParser", "org.apache.tomcat.util.http.fileupload.ParameterParser"
+        };
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class ParseAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
-    public static Map<String, String> onExit(
-        @Advice.Return final Map<String, String> map, @ActiveRequestContext RequestContext reqCtx) {
-      if (!map.isEmpty()) {
-        final PropagationModule module = InstrumentationBridge.PROPAGATION;
-        if (module != null) {
-          final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-          for (final Map.Entry<String, String> entry : map.entrySet()) {
-            if (entry.getValue() != null) {
-              module.taintString(
-                  ctx, entry.getValue(), SourceTypes.REQUEST_MULTIPART_PARAMETER, entry.getKey());
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class ParseAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
+        public static Map<String, String> onExit(
+                @Advice.Return final Map<String, String> map, @ActiveRequestContext RequestContext reqCtx) {
+            if (!map.isEmpty()) {
+                final PropagationModule module = InstrumentationBridge.PROPAGATION;
+                if (module != null) {
+                    final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                    for (final Map.Entry<String, String> entry : map.entrySet()) {
+                        if (entry.getValue() != null) {
+                            module.taintString(
+                                    ctx, entry.getValue(), SourceTypes.REQUEST_MULTIPART_PARAMETER, entry.getKey());
+                        }
+                    }
+                }
             }
-          }
+            return map;
         }
-      }
-      return map;
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemContentReader.java b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemContentReader.java
index 58ade1d656d..de55326db69 100644
--- a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemContentReader.java
+++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemContentReader.java
@@ -9,23 +9,22 @@
 
 /** Reads uploaded file content for WAF inspection. */
 public final class FileItemContentReader {
-  public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
-  public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
+    public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
+    public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
 
-  public static String readContent(FileItem fileItem) {
-    try (InputStream is = fileItem.getInputStream()) {
-      return MultipartContentDecoder.readInputStream(
-          is, MAX_CONTENT_BYTES, fileItem.getContentType());
-    } catch (IOException ignored) {
-      return "";
+    public static String readContent(FileItem fileItem) {
+        try (InputStream is = fileItem.getInputStream()) {
+            return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, fileItem.getContentType());
+        } catch (IOException ignored) {
+            return "";
+        }
     }
-  }
 
-  public static void addToContents(FileItem fileItem, List<String> contents) {
-    if (contents.size() < MAX_FILES_TO_INSPECT) {
-      contents.add(readContent(fileItem));
+    public static void addToContents(FileItem fileItem, List<String> contents) {
+        if (contents.size() < MAX_FILES_TO_INSPECT) {
+            contents.add(readContent(fileItem));
+        }
     }
-  }
 
-  private FileItemContentReader() {}
+    private FileItemContentReader() {}
 }
diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemInstrumentation.java b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemInstrumentation.java
index 9f1859c0034..199cd4772a5 100644
--- a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemInstrumentation.java
+++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemInstrumentation.java
@@ -19,38 +19,37 @@
 import net.bytebuddy.matcher.ElementMatcher;
 import org.apache.commons.fileupload.FileItem;
 
-public class FileItemInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+public class FileItemInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.commons.fileupload.FileItem";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.commons.fileupload.FileItem";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getInputStream").and(isPublic()).and(takesArguments(0)),
-        getClass().getName() + "$GetInputStreamAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getInputStream").and(isPublic()).and(takesArguments(0)),
+                getClass().getName() + "$GetInputStreamAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetInputStreamAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Return final InputStream inputStream,
-        @Advice.This final FileItem self,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintObjectIfTainted(ctx, inputStream, self);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetInputStreamAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Return final InputStream inputStream,
+                @Advice.This final FileItem self,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintObjectIfTainted(ctx, inputStream, self);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemIteratorInstrumentation.java b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemIteratorInstrumentation.java
index 6de4f48188e..1e9d0ccfc1e 100644
--- a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemIteratorInstrumentation.java
+++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemIteratorInstrumentation.java
@@ -19,37 +19,36 @@
 import org.apache.commons.fileupload.FileItemIterator;
 import org.apache.commons.fileupload.FileItemStream;
 
-public class FileItemIteratorInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+public class FileItemIteratorInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.commons.fileupload.FileItemIterator";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.commons.fileupload.FileItemIterator";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("next").and(isPublic()).and(takesArguments(0)), getClass().getName() + "$NextAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("next").and(isPublic()).and(takesArguments(0)), getClass().getName() + "$NextAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class NextAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Return final FileItemStream fileItemStream,
-        @Advice.This final FileItemIterator self,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintObjectIfTainted(ctx, fileItemStream, self);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class NextAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Return final FileItemStream fileItemStream,
+                @Advice.This final FileItemIterator self,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintObjectIfTainted(ctx, fileItemStream, self);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemStreamInstrumentation.java b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemStreamInstrumentation.java
index de36914c329..d2357acccf9 100644
--- a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemStreamInstrumentation.java
+++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemStreamInstrumentation.java
@@ -19,38 +19,37 @@
 import net.bytebuddy.matcher.ElementMatcher;
 import org.apache.commons.fileupload.FileItemStream;
 
-public class FileItemStreamInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+public class FileItemStreamInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.commons.fileupload.FileItemStream";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.commons.fileupload.FileItemStream";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("openStream").and(isPublic()).and(takesArguments(0)),
-        getClass().getName() + "$OpenStreamAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("openStream").and(isPublic()).and(takesArguments(0)),
+                getClass().getName() + "$OpenStreamAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class OpenStreamAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Return final InputStream inputStream,
-        @Advice.This final FileItemStream self,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintObjectIfTainted(ctx, inputStream, self);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class OpenStreamAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Return final InputStream inputStream,
+                @Advice.This final FileItemStream self,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintObjectIfTainted(ctx, inputStream, self);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/ServletFileUploadInstrumentation.java b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/ServletFileUploadInstrumentation.java
index 424958f5363..807cd592874 100644
--- a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/ServletFileUploadInstrumentation.java
+++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/ServletFileUploadInstrumentation.java
@@ -20,81 +20,78 @@
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemIterator;
 
-public class ServletFileUploadInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class ServletFileUploadInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.commons.fileupload.servlet.ServletFileUpload";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.commons.fileupload.servlet.ServletFileUpload";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("parseRequest")
-            .and(isPublic())
-            .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest"))),
-        getClass().getName() + "$ParseRequestAdvice");
-    transformer.applyAdvice(
-        named("parseParameterMap")
-            .and(isPublic())
-            .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest"))),
-        getClass().getName() + "$ParseParameterMapAdvice");
-    transformer.applyAdvice(
-        named("getItemIterator")
-            .and(isPublic())
-            .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest"))),
-        getClass().getName() + "$GetItemIteratorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("parseRequest")
+                        .and(isPublic())
+                        .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest"))),
+                getClass().getName() + "$ParseRequestAdvice");
+        transformer.applyAdvice(
+                named("parseParameterMap")
+                        .and(isPublic())
+                        .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest"))),
+                getClass().getName() + "$ParseParameterMapAdvice");
+        transformer.applyAdvice(
+                named("getItemIterator")
+                        .and(isPublic())
+                        .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest"))),
+                getClass().getName() + "$GetItemIteratorAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class ParseRequestAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
-    public static void onExit(
-        @Advice.Return final List<FileItem> fileItems,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        for (final FileItem fileItem : fileItems) {
-          module.taintObject(ctx, fileItem, SourceTypes.REQUEST_MULTIPART_PARAMETER);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class ParseRequestAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
+        public static void onExit(
+                @Advice.Return final List<FileItem> fileItems, @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                for (final FileItem fileItem : fileItems) {
+                    module.taintObject(ctx, fileItem, SourceTypes.REQUEST_MULTIPART_PARAMETER);
+                }
+            }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class ParseParameterMapAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
-    public static void onExit(
-        @Advice.Return final Map<String, List<FileItem>> parameterMap,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        for (List<FileItem> fileItems : parameterMap.values()) {
-          for (FileItem fileItem : fileItems) {
-            module.taintObject(ctx, fileItem, SourceTypes.REQUEST_MULTIPART_PARAMETER);
-          }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class ParseParameterMapAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
+        public static void onExit(
+                @Advice.Return final Map<String, List<FileItem>> parameterMap,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                for (List<FileItem> fileItems : parameterMap.values()) {
+                    for (FileItem fileItem : fileItems) {
+                        module.taintObject(ctx, fileItem, SourceTypes.REQUEST_MULTIPART_PARAMETER);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetItemIteratorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
-    public static void onExit(
-        @Advice.Return final FileItemIterator fileItemIterator,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintObject(ctx, fileItemIterator, SourceTypes.REQUEST_MULTIPART_PARAMETER);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetItemIteratorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
+        public static void onExit(
+                @Advice.Return final FileItemIterator fileItemIterator, @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintObject(ctx, fileItemIterator, SourceTypes.REQUEST_MULTIPART_PARAMETER);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/java/foo/bar/smoketest/MockFileItem.java b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/java/foo/bar/smoketest/MockFileItem.java
index 86417c0c2ca..d10ce2019b4 100644
--- a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/java/foo/bar/smoketest/MockFileItem.java
+++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/java/foo/bar/smoketest/MockFileItem.java
@@ -9,87 +9,87 @@
 import org.apache.commons.fileupload.FileItemHeaders;
 
 public class MockFileItem implements FileItem {
-  private final String name;
-
-  private final InputStream inputStream;
-
-  public MockFileItem(final String name, final InputStream inputStream) {
-    this.name = name;
-    this.inputStream = inputStream;
-  }
-
-  @Override
-  public FileItemHeaders getHeaders() {
-    return null;
-  }
-
-  @Override
-  public void setHeaders(FileItemHeaders var1) {}
-
-  @Override
-  public InputStream getInputStream() throws IOException {
-    return inputStream;
-  }
-
-  @Override
-  public String getContentType() {
-    return null;
-  }
-
-  @Override
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public boolean isInMemory() {
-    return true;
-  }
-
-  @Override
-  public long getSize() {
-    return 0;
-  }
-
-  @Override
-  public byte[] get() {
-    return null;
-  }
-
-  @Override
-  public String getString(String var1) throws UnsupportedEncodingException {
-    return null;
-  }
-
-  @Override
-  public String getString() {
-    return null;
-  }
-
-  @Override
-  public void write(File var1) throws Exception {}
-
-  @Override
-  public void delete() {}
-
-  @Override
-  public String getFieldName() {
-    return null;
-  }
-
-  @Override
-  public void setFieldName(String var1) {}
-
-  @Override
-  public boolean isFormField() {
-    return true;
-  }
-
-  @Override
-  public void setFormField(boolean var1) {}
-
-  @Override
-  public OutputStream getOutputStream() throws IOException {
-    return null;
-  }
+    private final String name;
+
+    private final InputStream inputStream;
+
+    public MockFileItem(final String name, final InputStream inputStream) {
+        this.name = name;
+        this.inputStream = inputStream;
+    }
+
+    @Override
+    public FileItemHeaders getHeaders() {
+        return null;
+    }
+
+    @Override
+    public void setHeaders(FileItemHeaders var1) {}
+
+    @Override
+    public InputStream getInputStream() throws IOException {
+        return inputStream;
+    }
+
+    @Override
+    public String getContentType() {
+        return null;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public boolean isInMemory() {
+        return true;
+    }
+
+    @Override
+    public long getSize() {
+        return 0;
+    }
+
+    @Override
+    public byte[] get() {
+        return null;
+    }
+
+    @Override
+    public String getString(String var1) throws UnsupportedEncodingException {
+        return null;
+    }
+
+    @Override
+    public String getString() {
+        return null;
+    }
+
+    @Override
+    public void write(File var1) throws Exception {}
+
+    @Override
+    public void delete() {}
+
+    @Override
+    public String getFieldName() {
+        return null;
+    }
+
+    @Override
+    public void setFieldName(String var1) {}
+
+    @Override
+    public boolean isFormField() {
+        return true;
+    }
+
+    @Override
+    public void setFormField(boolean var1) {}
+
+    @Override
+    public OutputStream getOutputStream() throws IOException {
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/java/foo/bar/smoketest/MockFileItemIterator.java b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/java/foo/bar/smoketest/MockFileItemIterator.java
index f5d823b9256..c3897eb6454 100644
--- a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/java/foo/bar/smoketest/MockFileItemIterator.java
+++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/java/foo/bar/smoketest/MockFileItemIterator.java
@@ -4,20 +4,20 @@
 import org.apache.commons.fileupload.FileItemStream;
 
 public class MockFileItemIterator implements FileItemIterator {
-  private final MockFileItemStream[] items;
-  private int index = 0;
+    private final MockFileItemStream[] items;
+    private int index = 0;
 
-  public MockFileItemIterator(final MockFileItemStream... items) {
-    this.items = items;
-  }
+    public MockFileItemIterator(final MockFileItemStream... items) {
+        this.items = items;
+    }
 
-  @Override
-  public boolean hasNext() {
-    return true;
-  }
+    @Override
+    public boolean hasNext() {
+        return true;
+    }
 
-  @Override
-  public FileItemStream next() {
-    return items[index++];
-  }
+    @Override
+    public FileItemStream next() {
+        return items[index++];
+    }
 }
diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/java/foo/bar/smoketest/MockFileItemStream.java b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/java/foo/bar/smoketest/MockFileItemStream.java
index 528f58b8a35..7f36eb39c14 100644
--- a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/java/foo/bar/smoketest/MockFileItemStream.java
+++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/java/foo/bar/smoketest/MockFileItemStream.java
@@ -6,38 +6,38 @@
 import org.apache.commons.fileupload.FileItemStream;
 
 public class MockFileItemStream implements FileItemStream {
-  private final String name;
+    private final String name;
 
-  private final InputStream inputStream;
+    private final InputStream inputStream;
 
-  public MockFileItemStream(final String name, final InputStream inputStream) {
-    this.name = name;
-    this.inputStream = inputStream;
-  }
+    public MockFileItemStream(final String name, final InputStream inputStream) {
+        this.name = name;
+        this.inputStream = inputStream;
+    }
 
-  public FileItemHeaders getHeaders() {
-    return null;
-  }
+    public FileItemHeaders getHeaders() {
+        return null;
+    }
 
-  public void setHeaders(FileItemHeaders var1) {}
+    public void setHeaders(FileItemHeaders var1) {}
 
-  public InputStream openStream() throws IOException {
-    return inputStream;
-  }
+    public InputStream openStream() throws IOException {
+        return inputStream;
+    }
 
-  public String getContentType() {
-    return null;
-  }
+    public String getContentType() {
+        return null;
+    }
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 
-  public String getFieldName() {
-    return null;
-  }
+    public String getFieldName() {
+        return null;
+    }
 
-  public boolean isFormField() {
-    return true;
-  }
+    public boolean isFormField() {
+        return true;
+    }
 }
diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/java/foo/bar/smoketest/MockHttpServletRequest.java b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/java/foo/bar/smoketest/MockHttpServletRequest.java
index 2ed2096ad73..f90b7034717 100644
--- a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/java/foo/bar/smoketest/MockHttpServletRequest.java
+++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/java/foo/bar/smoketest/MockHttpServletRequest.java
@@ -24,357 +24,355 @@
 import javax.servlet.http.Part;
 
 public class MockHttpServletRequest implements HttpServletRequest {
-  private final String BOUNDARY = "----boundary";
-  private final String BOUNDARY_START = "--" + BOUNDARY + "\r\n";
-  private final String BOUNDARY_END = "--" + BOUNDARY + "--\r\n";
-
-  private final String contentType;
-  private final String inputStream;
-  private String characterEncoding;
-  private final int contentLength;
-
-  public MockHttpServletRequest(
-      final String contentType, final String inputStream, final String characterEncoding)
-      throws UnsupportedEncodingException {
-    this.contentType = contentType;
-    this.inputStream = inputStream;
-    this.characterEncoding = characterEncoding;
-    this.contentLength = inputStream.getBytes(characterEncoding).length;
-  }
-
-  @Override
-  public Object getAttribute(String var1) {
-    return null;
-  }
-
-  @Override
-  public Enumeration<String> getAttributeNames() {
-    return null;
-  }
-
-  @Override
-  public String getCharacterEncoding() {
-    return characterEncoding;
-  }
-
-  @Override
-  public void setCharacterEncoding(String var1) throws UnsupportedEncodingException {
-    characterEncoding = var1;
-  }
-
-  @Override
-  public int getContentLength() {
-    return contentLength;
-  }
-
-  @Override
-  public String getContentType() {
-    return contentType + "; boundary=" + BOUNDARY;
-  }
-
-  @Override
-  public ServletInputStream getInputStream() throws IOException {
-    String body = BOUNDARY_START + inputStream + BOUNDARY_END;
-    ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(body.getBytes());
-    return new ServletInputStream() {
-      @Override
-      public int read() throws IOException {
-        return byteArrayInputStream.read();
-      }
-    };
-  }
-
-  @Override
-  public String getParameter(String var1) {
-    return null;
-  }
-
-  @Override
-  public Enumeration<String> getParameterNames() {
-    return null;
-  }
-
-  @Override
-  public String[] getParameterValues(String var1) {
-    return null;
-  }
-
-  @Override
-  public Map<String, String[]> getParameterMap() {
-    return null;
-  }
-
-  @Override
-  public String getProtocol() {
-    return null;
-  }
-
-  @Override
-  public String getScheme() {
-    return null;
-  }
-
-  @Override
-  public String getServerName() {
-    return null;
-  }
-
-  @Override
-  public int getServerPort() {
-    return 0;
-  }
-
-  @Override
-  public BufferedReader getReader() throws IOException {
-    return null;
-  }
-
-  @Override
-  public String getRemoteAddr() {
-    return null;
-  }
-
-  @Override
-  public String getRemoteHost() {
-    return null;
-  }
-
-  @Override
-  public void setAttribute(String var1, Object var2) {}
-
-  @Override
-  public void removeAttribute(String var1) {}
-
-  @Override
-  public Locale getLocale() {
-    return null;
-  }
-
-  @Override
-  public Enumeration<Locale> getLocales() {
-    return null;
-  }
-
-  @Override
-  public boolean isSecure() {
-    return false;
-  }
-
-  @Override
-  public RequestDispatcher getRequestDispatcher(String var1) {
-    return null;
-  }
-
-  @Override
-  /**
-   * @deprecated
-   */
-  public String getRealPath(String var1) {
-    return null;
-  }
-
-  @Override
-  public int getRemotePort() {
-    return 0;
-  }
-
-  @Override
-  public String getLocalName() {
-    return null;
-  }
-
-  @Override
-  public String getLocalAddr() {
-    return null;
-  }
-
-  @Override
-  public int getLocalPort() {
-    return 0;
-  }
-
-  @Override
-  public ServletContext getServletContext() {
-    return null;
-  }
-
-  @Override
-  public AsyncContext startAsync() throws IllegalStateException {
-    return null;
-  }
-
-  @Override
-  public AsyncContext startAsync(ServletRequest var1, ServletResponse var2)
-      throws IllegalStateException {
-    return null;
-  }
-
-  @Override
-  public boolean isAsyncStarted() {
-    return false;
-  }
-
-  @Override
-  public boolean isAsyncSupported() {
-    return false;
-  }
-
-  @Override
-  public AsyncContext getAsyncContext() {
-    return null;
-  }
-
-  @Override
-  public DispatcherType getDispatcherType() {
-    return null;
-  }
-
-  @Override
-  public String getAuthType() {
-    return null;
-  }
-
-  @Override
-  public Cookie[] getCookies() {
-    return null;
-  }
-
-  @Override
-  public long getDateHeader(String var1) {
-    return 0;
-  }
-
-  @Override
-  public String getHeader(String var1) {
-    return null;
-  }
-
-  @Override
-  public Enumeration<String> getHeaders(String var1) {
-    return null;
-  }
-
-  @Override
-  public Enumeration<String> getHeaderNames() {
-    return null;
-  }
-
-  @Override
-  public int getIntHeader(String var1) {
-    return 0;
-  }
-
-  @Override
-  public String getMethod() {
-    return null;
-  }
-
-  @Override
-  public String getPathInfo() {
-    return null;
-  }
-
-  @Override
-  public String getPathTranslated() {
-    return null;
-  }
-
-  @Override
-  public String getContextPath() {
-    return null;
-  }
-
-  @Override
-  public String getQueryString() {
-    return null;
-  }
-
-  @Override
-  public String getRemoteUser() {
-    return null;
-  }
-
-  @Override
-  public boolean isUserInRole(String var1) {
-    return false;
-  }
-
-  @Override
-  public Principal getUserPrincipal() {
-    return null;
-  }
-
-  @Override
-  public String getRequestedSessionId() {
-    return null;
-  }
-
-  @Override
-  public String getRequestURI() {
-    return null;
-  }
-
-  @Override
-  public StringBuffer getRequestURL() {
-    return null;
-  }
-
-  @Override
-  public String getServletPath() {
-    return null;
-  }
-
-  @Override
-  public HttpSession getSession(boolean var1) {
-    return null;
-  }
-
-  @Override
-  public HttpSession getSession() {
-    return null;
-  }
-
-  @Override
-  public boolean isRequestedSessionIdValid() {
-    return false;
-  }
-
-  @Override
-  public boolean isRequestedSessionIdFromCookie() {
-    return false;
-  }
-
-  @Override
-  public boolean isRequestedSessionIdFromURL() {
-    return false;
-  }
-
-  @Override
-  /**
-   * @deprecated
-   */
-  public boolean isRequestedSessionIdFromUrl() {
-    return false;
-  }
-
-  @Override
-  public boolean authenticate(HttpServletResponse var1) throws IOException, ServletException {
-    return false;
-  }
-
-  @Override
-  public void login(String var1, String var2) throws ServletException {}
-
-  @Override
-  public void logout() throws ServletException {}
-
-  @Override
-  public Collection<Part> getParts() throws IOException, ServletException {
-    return null;
-  }
-
-  @Override
-  public Part getPart(String var1) throws IOException, ServletException {
-    return null;
-  }
+    private final String BOUNDARY = "----boundary";
+    private final String BOUNDARY_START = "--" + BOUNDARY + "\r\n";
+    private final String BOUNDARY_END = "--" + BOUNDARY + "--\r\n";
+
+    private final String contentType;
+    private final String inputStream;
+    private String characterEncoding;
+    private final int contentLength;
+
+    public MockHttpServletRequest(final String contentType, final String inputStream, final String characterEncoding)
+            throws UnsupportedEncodingException {
+        this.contentType = contentType;
+        this.inputStream = inputStream;
+        this.characterEncoding = characterEncoding;
+        this.contentLength = inputStream.getBytes(characterEncoding).length;
+    }
+
+    @Override
+    public Object getAttribute(String var1) {
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getAttributeNames() {
+        return null;
+    }
+
+    @Override
+    public String getCharacterEncoding() {
+        return characterEncoding;
+    }
+
+    @Override
+    public void setCharacterEncoding(String var1) throws UnsupportedEncodingException {
+        characterEncoding = var1;
+    }
+
+    @Override
+    public int getContentLength() {
+        return contentLength;
+    }
+
+    @Override
+    public String getContentType() {
+        return contentType + "; boundary=" + BOUNDARY;
+    }
+
+    @Override
+    public ServletInputStream getInputStream() throws IOException {
+        String body = BOUNDARY_START + inputStream + BOUNDARY_END;
+        ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(body.getBytes());
+        return new ServletInputStream() {
+            @Override
+            public int read() throws IOException {
+                return byteArrayInputStream.read();
+            }
+        };
+    }
+
+    @Override
+    public String getParameter(String var1) {
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getParameterNames() {
+        return null;
+    }
+
+    @Override
+    public String[] getParameterValues(String var1) {
+        return null;
+    }
+
+    @Override
+    public Map<String, String[]> getParameterMap() {
+        return null;
+    }
+
+    @Override
+    public String getProtocol() {
+        return null;
+    }
+
+    @Override
+    public String getScheme() {
+        return null;
+    }
+
+    @Override
+    public String getServerName() {
+        return null;
+    }
+
+    @Override
+    public int getServerPort() {
+        return 0;
+    }
+
+    @Override
+    public BufferedReader getReader() throws IOException {
+        return null;
+    }
+
+    @Override
+    public String getRemoteAddr() {
+        return null;
+    }
+
+    @Override
+    public String getRemoteHost() {
+        return null;
+    }
+
+    @Override
+    public void setAttribute(String var1, Object var2) {}
+
+    @Override
+    public void removeAttribute(String var1) {}
+
+    @Override
+    public Locale getLocale() {
+        return null;
+    }
+
+    @Override
+    public Enumeration<Locale> getLocales() {
+        return null;
+    }
+
+    @Override
+    public boolean isSecure() {
+        return false;
+    }
+
+    @Override
+    public RequestDispatcher getRequestDispatcher(String var1) {
+        return null;
+    }
+
+    @Override
+    /**
+     * @deprecated
+     */
+    public String getRealPath(String var1) {
+        return null;
+    }
+
+    @Override
+    public int getRemotePort() {
+        return 0;
+    }
+
+    @Override
+    public String getLocalName() {
+        return null;
+    }
+
+    @Override
+    public String getLocalAddr() {
+        return null;
+    }
+
+    @Override
+    public int getLocalPort() {
+        return 0;
+    }
+
+    @Override
+    public ServletContext getServletContext() {
+        return null;
+    }
+
+    @Override
+    public AsyncContext startAsync() throws IllegalStateException {
+        return null;
+    }
+
+    @Override
+    public AsyncContext startAsync(ServletRequest var1, ServletResponse var2) throws IllegalStateException {
+        return null;
+    }
+
+    @Override
+    public boolean isAsyncStarted() {
+        return false;
+    }
+
+    @Override
+    public boolean isAsyncSupported() {
+        return false;
+    }
+
+    @Override
+    public AsyncContext getAsyncContext() {
+        return null;
+    }
+
+    @Override
+    public DispatcherType getDispatcherType() {
+        return null;
+    }
+
+    @Override
+    public String getAuthType() {
+        return null;
+    }
+
+    @Override
+    public Cookie[] getCookies() {
+        return null;
+    }
+
+    @Override
+    public long getDateHeader(String var1) {
+        return 0;
+    }
+
+    @Override
+    public String getHeader(String var1) {
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getHeaders(String var1) {
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getHeaderNames() {
+        return null;
+    }
+
+    @Override
+    public int getIntHeader(String var1) {
+        return 0;
+    }
+
+    @Override
+    public String getMethod() {
+        return null;
+    }
+
+    @Override
+    public String getPathInfo() {
+        return null;
+    }
+
+    @Override
+    public String getPathTranslated() {
+        return null;
+    }
+
+    @Override
+    public String getContextPath() {
+        return null;
+    }
+
+    @Override
+    public String getQueryString() {
+        return null;
+    }
+
+    @Override
+    public String getRemoteUser() {
+        return null;
+    }
+
+    @Override
+    public boolean isUserInRole(String var1) {
+        return false;
+    }
+
+    @Override
+    public Principal getUserPrincipal() {
+        return null;
+    }
+
+    @Override
+    public String getRequestedSessionId() {
+        return null;
+    }
+
+    @Override
+    public String getRequestURI() {
+        return null;
+    }
+
+    @Override
+    public StringBuffer getRequestURL() {
+        return null;
+    }
+
+    @Override
+    public String getServletPath() {
+        return null;
+    }
+
+    @Override
+    public HttpSession getSession(boolean var1) {
+        return null;
+    }
+
+    @Override
+    public HttpSession getSession() {
+        return null;
+    }
+
+    @Override
+    public boolean isRequestedSessionIdValid() {
+        return false;
+    }
+
+    @Override
+    public boolean isRequestedSessionIdFromCookie() {
+        return false;
+    }
+
+    @Override
+    public boolean isRequestedSessionIdFromURL() {
+        return false;
+    }
+
+    @Override
+    /**
+     * @deprecated
+     */
+    public boolean isRequestedSessionIdFromUrl() {
+        return false;
+    }
+
+    @Override
+    public boolean authenticate(HttpServletResponse var1) throws IOException, ServletException {
+        return false;
+    }
+
+    @Override
+    public void login(String var1, String var2) throws ServletException {}
+
+    @Override
+    public void logout() throws ServletException {}
+
+    @Override
+    public Collection<Part> getParts() throws IOException, ServletException {
+        return null;
+    }
+
+    @Override
+    public Part getPart(String var1) throws IOException, ServletException {
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientDecorator.java b/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientDecorator.java
index a7596e2f2ea..d7410fc4342 100644
--- a/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientDecorator.java
+++ b/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientDecorator.java
@@ -10,63 +10,62 @@
 import org.apache.commons.httpclient.URIException;
 
 public class CommonsHttpClientDecorator extends HttpClientDecorator<HttpMethod, HttpMethod> {
-  public static final CharSequence COMMONS_HTTP_CLIENT =
-      UTF8BytesString.create("commons-http-client");
-  public static final CommonsHttpClientDecorator DECORATE = new CommonsHttpClientDecorator();
+    public static final CharSequence COMMONS_HTTP_CLIENT = UTF8BytesString.create("commons-http-client");
+    public static final CommonsHttpClientDecorator DECORATE = new CommonsHttpClientDecorator();
 
-  public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+    public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"commons-http-client"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"commons-http-client"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return COMMONS_HTTP_CLIENT;
-  }
+    @Override
+    protected CharSequence component() {
+        return COMMONS_HTTP_CLIENT;
+    }
 
-  @Override
-  protected String method(final HttpMethod httpMethod) {
-    return httpMethod.getName();
-  }
+    @Override
+    protected String method(final HttpMethod httpMethod) {
+        return httpMethod.getName();
+    }
 
-  @Override
-  protected URI url(final HttpMethod httpMethod) throws URISyntaxException {
-    try {
-      //  org.apache.commons.httpclient.URI -> java.net.URI
-      return new URI(httpMethod.getURI().toString());
-    } catch (final URIException e) {
-      throw new URISyntaxException("", e.getMessage());
+    @Override
+    protected URI url(final HttpMethod httpMethod) throws URISyntaxException {
+        try {
+            //  org.apache.commons.httpclient.URI -> java.net.URI
+            return new URI(httpMethod.getURI().toString());
+        } catch (final URIException e) {
+            throw new URISyntaxException("", e.getMessage());
+        }
     }
-  }
 
-  @Override
-  protected HttpMethod sourceUrl(final HttpMethod httpMethod) {
-    return httpMethod;
-  }
+    @Override
+    protected HttpMethod sourceUrl(final HttpMethod httpMethod) {
+        return httpMethod;
+    }
 
-  @Override
-  protected int status(final HttpMethod httpMethod) {
-    final StatusLine statusLine = httpMethod.getStatusLine();
-    return statusLine == null ? 0 : statusLine.getStatusCode();
-  }
+    @Override
+    protected int status(final HttpMethod httpMethod) {
+        final StatusLine statusLine = httpMethod.getStatusLine();
+        return statusLine == null ? 0 : statusLine.getStatusCode();
+    }
 
-  @Override
-  protected String getRequestHeader(HttpMethod request, String headerName) {
-    Header header = request.getRequestHeader(headerName);
-    if (null != header) {
-      return header.getValue();
+    @Override
+    protected String getRequestHeader(HttpMethod request, String headerName) {
+        Header header = request.getRequestHeader(headerName);
+        if (null != header) {
+            return header.getValue();
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Override
-  protected String getResponseHeader(HttpMethod response, String headerName) {
-    Header header = response.getResponseHeader(headerName);
-    if (null != header) {
-      return header.getValue();
+    @Override
+    protected String getResponseHeader(HttpMethod response, String headerName) {
+        Header header = response.getResponseHeader(headerName);
+        if (null != header) {
+            return header.getValue();
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java b/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java
index 611805d4562..6180d87443c 100644
--- a/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java
@@ -27,87 +27,87 @@
 
 @AutoService(InstrumenterModule.class)
 public class CommonsHttpClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public CommonsHttpClientInstrumentation() {
-    super("commons-http-client");
-  }
+    public CommonsHttpClientInstrumentation() {
+        super("commons-http-client");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.apache.commons.httpclient.HttpClient";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.commons.httpclient.HttpClient";
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("executeMethod"))
+                        .and(takesArguments(3))
+                        .and(takesArgument(1, named("org.apache.commons.httpclient.HttpMethod"))),
+                CommonsHttpClientInstrumentation.class.getName() + "$ExecAdvice",
+                CommonsHttpClientInstrumentation.class.getName() + "$ContextPropagationAdvice");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("executeMethod"))
-            .and(takesArguments(3))
-            .and(takesArgument(1, named("org.apache.commons.httpclient.HttpMethod"))),
-        CommonsHttpClientInstrumentation.class.getName() + "$ExecAdvice",
-        CommonsHttpClientInstrumentation.class.getName() + "$ContextPropagationAdvice");
-  }
+    public static class ExecAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(@Advice.Argument(1) final HttpMethod httpMethod) {
 
-  public static class ExecAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(@Advice.Argument(1) final HttpMethod httpMethod) {
+            ContextScope scope = null;
+            try {
+                final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class);
+                if (callDepth > 0) {
+                    return null;
+                }
 
-      ContextScope scope = null;
-      try {
-        final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class);
-        if (callDepth > 0) {
-          return null;
-        }
+                final AgentSpan span = startSpan("commons-http-client", HTTP_REQUEST);
+                scope = activateSpan(span);
 
-        final AgentSpan span = startSpan("commons-http-client", HTTP_REQUEST);
-        scope = activateSpan(span);
+                DECORATE.afterStart(span);
+                DECORATE.onRequest(span, httpMethod);
 
-        DECORATE.afterStart(span);
-        DECORATE.onRequest(span, httpMethod);
+                return scope;
+            } catch (BlockingException e) {
+                CallDepthThreadLocalMap.reset(HttpClient.class);
+                if (scope != null) {
+                    final AgentSpan span = spanFromScope(scope);
+                    try {
+                        DECORATE.onError(span, e);
+                        DECORATE.beforeFinish(span);
+                    } finally {
+                        scope.close();
+                        span.finish();
+                    }
+                }
+                // re-throw blocking exceptions
+                throw e;
+            }
+        }
 
-        return scope;
-      } catch (BlockingException e) {
-        CallDepthThreadLocalMap.reset(HttpClient.class);
-        if (scope != null) {
-          final AgentSpan span = spanFromScope(scope);
-          try {
-            DECORATE.onError(span, e);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Argument(1) final HttpMethod httpMethod,
+                @Advice.Thrown final Throwable throwable) {
+
+            if (scope == null) {
+                return;
+            }
+            final AgentSpan span = spanFromScope(scope);
+            DECORATE.onResponse(span, httpMethod);
+            DECORATE.onError(span, throwable);
             DECORATE.beforeFinish(span);
-          } finally {
             scope.close();
             span.finish();
-          }
+            CallDepthThreadLocalMap.reset(HttpClient.class);
         }
-        // re-throw blocking exceptions
-        throw e;
-      }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Argument(1) final HttpMethod httpMethod,
-        @Advice.Thrown final Throwable throwable) {
-
-      if (scope == null) {
-        return;
-      }
-      final AgentSpan span = spanFromScope(scope);
-      DECORATE.onResponse(span, httpMethod);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
-      CallDepthThreadLocalMap.reset(HttpClient.class);
-    }
-  }
-
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(@Advice.Argument(1) final HttpMethod httpMethod) {
-      DECORATE.injectContext(currentContext(), httpMethod, SETTER);
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter(@Advice.Argument(1) final HttpMethod httpMethod) {
+            DECORATE.injectContext(currentContext(), httpMethod, SETTER);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/HttpHeadersInjectAdapter.java b/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/HttpHeadersInjectAdapter.java
index f35bb0eb8af..c56eabc7ca8 100644
--- a/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/HttpHeadersInjectAdapter.java
+++ b/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/HttpHeadersInjectAdapter.java
@@ -8,10 +8,10 @@
 @ParametersAreNonnullByDefault
 public class HttpHeadersInjectAdapter implements CarrierSetter<HttpMethod> {
 
-  public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
+    public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
 
-  @Override
-  public void set(final HttpMethod carrier, final String key, final String value) {
-    carrier.setRequestHeader(new Header(key, value));
-  }
+    @Override
+    public void set(final HttpMethod carrier, final String key, final String value) {
+        carrier.setRequestHeader(new Header(key, value));
+    }
 }
diff --git a/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/IastHttpMethodBaseInstrumentation.java b/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/IastHttpMethodBaseInstrumentation.java
index 9594b7b78e8..a8ccfb97609 100644
--- a/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/IastHttpMethodBaseInstrumentation.java
+++ b/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/IastHttpMethodBaseInstrumentation.java
@@ -15,47 +15,43 @@
 
 @AutoService(InstrumenterModule.class)
 public class IastHttpMethodBaseInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
-
-  private final String className = IastHttpMethodBaseInstrumentation.class.getName();
-
-  public IastHttpMethodBaseInstrumentation() {
-    super("commons-http-client");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.commons.httpclient.HttpMethodBase";
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "commons-http-client-x";
-  }
-
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArguments(1)).and(takesArgument(0, String.class)),
-        className + "$CtorAdvice");
-  }
-
-  public static class CtorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void afterCtor(
-        @Advice.This final Object self, @Advice.Argument(0) final Object argument) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        module.taintObjectIfTainted(self, argument);
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
+
+    private final String className = IastHttpMethodBaseInstrumentation.class.getName();
+
+    public IastHttpMethodBaseInstrumentation() {
+        super("commons-http-client");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.apache.commons.httpclient.HttpMethodBase";
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "commons-http-client-x";
+    }
+
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArguments(1)).and(takesArgument(0, String.class)), className + "$CtorAdvice");
+    }
+
+    public static class CtorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void afterCtor(@Advice.This final Object self, @Advice.Argument(0) final Object argument) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                module.taintObjectIfTainted(self, argument);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/src/main/java/datadog/trace/instrumentation/commonslang/StringEscapeUtilsCallSite.java b/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/src/main/java/datadog/trace/instrumentation/commonslang/StringEscapeUtilsCallSite.java
index b4eaa0a4ef3..2992ddd6f28 100644
--- a/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/src/main/java/datadog/trace/instrumentation/commonslang/StringEscapeUtilsCallSite.java
+++ b/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/src/main/java/datadog/trace/instrumentation/commonslang/StringEscapeUtilsCallSite.java
@@ -12,39 +12,34 @@
 @CallSite(spi = IastCallSites.class)
 public class StringEscapeUtilsCallSite {
 
-  @CallSite.After(
-      "java.lang.String org.apache.commons.lang.StringEscapeUtils.escapeHtml(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String org.apache.commons.lang.StringEscapeUtils.escapeJava(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String org.apache.commons.lang.StringEscapeUtils.escapeXml(java.lang.String)")
-  public static String afterEscape(
-      @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input, false, VulnerabilityMarks.HTML_ESCAPED_MARK);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterEscape threw", e);
-      }
+    @CallSite.After("java.lang.String org.apache.commons.lang.StringEscapeUtils.escapeHtml(java.lang.String)")
+    @CallSite.After("java.lang.String org.apache.commons.lang.StringEscapeUtils.escapeJava(java.lang.String)")
+    @CallSite.After("java.lang.String org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(java.lang.String)")
+    @CallSite.After("java.lang.String org.apache.commons.lang.StringEscapeUtils.escapeXml(java.lang.String)")
+    public static String afterEscape(
+            @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input, false, VulnerabilityMarks.HTML_ESCAPED_MARK);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterEscape threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After(
-      "java.lang.String org.apache.commons.lang.StringEscapeUtils.escapeSql(java.lang.String)")
-  public static String afterEscapeSQL(
-      @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input, false, VulnerabilityMarks.SQL_INJECTION_MARK);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterEscapeSQL threw", e);
-      }
+    @CallSite.After("java.lang.String org.apache.commons.lang.StringEscapeUtils.escapeSql(java.lang.String)")
+    public static String afterEscapeSQL(
+            @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input, false, VulnerabilityMarks.SQL_INJECTION_MARK);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterEscapeSQL threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/src/test/java/foo/bar/TestStringEscapeUtilsSuite.java b/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/src/test/java/foo/bar/TestStringEscapeUtilsSuite.java
index d49504615db..0c45a596e76 100644
--- a/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/src/test/java/foo/bar/TestStringEscapeUtilsSuite.java
+++ b/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/src/test/java/foo/bar/TestStringEscapeUtilsSuite.java
@@ -4,23 +4,23 @@
 
 public class TestStringEscapeUtilsSuite {
 
-  public static String escapeHtml(String input) {
-    return StringEscapeUtils.escapeHtml(input);
-  }
+    public static String escapeHtml(String input) {
+        return StringEscapeUtils.escapeHtml(input);
+    }
 
-  public static String escapeJava(String input) {
-    return StringEscapeUtils.escapeJava(input);
-  }
+    public static String escapeJava(String input) {
+        return StringEscapeUtils.escapeJava(input);
+    }
 
-  public static String escapeJavaScript(String input) {
-    return StringEscapeUtils.escapeJavaScript(input);
-  }
+    public static String escapeJavaScript(String input) {
+        return StringEscapeUtils.escapeJavaScript(input);
+    }
 
-  public static String escapeXml(String input) {
-    return StringEscapeUtils.escapeXml(input);
-  }
+    public static String escapeXml(String input) {
+        return StringEscapeUtils.escapeXml(input);
+    }
 
-  public static String escapeSql(String input) {
-    return StringEscapeUtils.escapeSql(input);
-  }
+    public static String escapeSql(String input) {
+        return StringEscapeUtils.escapeSql(input);
+    }
 }
diff --git a/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/src/main/java/datadog/trace/instrumentation/commonslang3/StringEscapeUtilsCallSite.java b/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/src/main/java/datadog/trace/instrumentation/commonslang3/StringEscapeUtilsCallSite.java
index 9fd76e0be7a..4760004e5f1 100644
--- a/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/src/main/java/datadog/trace/instrumentation/commonslang3/StringEscapeUtilsCallSite.java
+++ b/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/src/main/java/datadog/trace/instrumentation/commonslang3/StringEscapeUtilsCallSite.java
@@ -12,41 +12,35 @@
 @CallSite(spi = IastCallSites.class)
 public class StringEscapeUtilsCallSite {
 
-  @CallSite.After(
-      "java.lang.String org.apache.commons.lang3.StringEscapeUtils.escapeHtml3(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String org.apache.commons.lang3.StringEscapeUtils.escapeHtml4(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String org.apache.commons.lang3.StringEscapeUtils.escapeXml10(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String org.apache.commons.lang3.StringEscapeUtils.escapeXml11(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String org.apache.commons.lang3.StringEscapeUtils.escapeEcmaScript(java.lang.String)")
-  public static String afterEscape(
-      @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input, false, VulnerabilityMarks.HTML_ESCAPED_MARK);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterEscape threw", e);
-      }
+    @CallSite.After("java.lang.String org.apache.commons.lang3.StringEscapeUtils.escapeHtml3(java.lang.String)")
+    @CallSite.After("java.lang.String org.apache.commons.lang3.StringEscapeUtils.escapeHtml4(java.lang.String)")
+    @CallSite.After("java.lang.String org.apache.commons.lang3.StringEscapeUtils.escapeXml10(java.lang.String)")
+    @CallSite.After("java.lang.String org.apache.commons.lang3.StringEscapeUtils.escapeXml11(java.lang.String)")
+    @CallSite.After("java.lang.String org.apache.commons.lang3.StringEscapeUtils.escapeEcmaScript(java.lang.String)")
+    public static String afterEscape(
+            @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input, false, VulnerabilityMarks.HTML_ESCAPED_MARK);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterEscape threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After(
-      "java.lang.String org.apache.commons.lang3.StringEscapeUtils.escapeJson(java.lang.String)")
-  public static String afterEscapeJson(
-      @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterEscapeJson threw", e);
-      }
+    @CallSite.After("java.lang.String org.apache.commons.lang3.StringEscapeUtils.escapeJson(java.lang.String)")
+    public static String afterEscapeJson(
+            @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterEscapeJson threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/src/test/java/foo/bar/TestStringEscapeUtilsSuite.java b/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/src/test/java/foo/bar/TestStringEscapeUtilsSuite.java
index 6fc11e07055..26f578df6a9 100644
--- a/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/src/test/java/foo/bar/TestStringEscapeUtilsSuite.java
+++ b/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/src/test/java/foo/bar/TestStringEscapeUtilsSuite.java
@@ -4,27 +4,27 @@
 
 public class TestStringEscapeUtilsSuite {
 
-  public static String escapeHtml3(String input) {
-    return StringEscapeUtils.escapeHtml3(input);
-  }
+    public static String escapeHtml3(String input) {
+        return StringEscapeUtils.escapeHtml3(input);
+    }
 
-  public static String escapeHtml4(String input) {
-    return StringEscapeUtils.escapeHtml4(input);
-  }
+    public static String escapeHtml4(String input) {
+        return StringEscapeUtils.escapeHtml4(input);
+    }
 
-  public static String escapeEcmaScript(String input) {
-    return StringEscapeUtils.escapeEcmaScript(input);
-  }
+    public static String escapeEcmaScript(String input) {
+        return StringEscapeUtils.escapeEcmaScript(input);
+    }
 
-  public static String escapeXml10(String input) {
-    return StringEscapeUtils.escapeXml10(input);
-  }
+    public static String escapeXml10(String input) {
+        return StringEscapeUtils.escapeXml10(input);
+    }
 
-  public static String escapeXml11(String input) {
-    return StringEscapeUtils.escapeXml11(input);
-  }
+    public static String escapeXml11(String input) {
+        return StringEscapeUtils.escapeXml11(input);
+    }
 
-  public static String escapeJson(String input) {
-    return StringEscapeUtils.escapeJson(input);
-  }
+    public static String escapeJson(String input) {
+        return StringEscapeUtils.escapeJson(input);
+    }
 }
diff --git a/dd-java-agent/instrumentation/commons-text-1.0/src/main/java/datadog/trace/instrumentation/commonstext/StringEscapeUtilsCallSite.java b/dd-java-agent/instrumentation/commons-text-1.0/src/main/java/datadog/trace/instrumentation/commonstext/StringEscapeUtilsCallSite.java
index 0d4cfc5ff32..a79fb8ba9c3 100644
--- a/dd-java-agent/instrumentation/commons-text-1.0/src/main/java/datadog/trace/instrumentation/commonstext/StringEscapeUtilsCallSite.java
+++ b/dd-java-agent/instrumentation/commons-text-1.0/src/main/java/datadog/trace/instrumentation/commonstext/StringEscapeUtilsCallSite.java
@@ -12,43 +12,36 @@
 @CallSite(spi = IastCallSites.class)
 public class StringEscapeUtilsCallSite {
 
-  @CallSite.After(
-      "java.lang.String org.apache.commons.text.StringEscapeUtils.escapeEcmaScript(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String org.apache.commons.text.StringEscapeUtils.escapeHtml3(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String org.apache.commons.text.StringEscapeUtils.escapeHtml4(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String org.apache.commons.text.StringEscapeUtils.escapeJava(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String org.apache.commons.text.StringEscapeUtils.escapeXml10(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String org.apache.commons.text.StringEscapeUtils.escapeXml11(java.lang.String)")
-  public static String afterEscape(
-      @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input, false, VulnerabilityMarks.HTML_ESCAPED_MARK);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterEscape threw", e);
-      }
+    @CallSite.After("java.lang.String org.apache.commons.text.StringEscapeUtils.escapeEcmaScript(java.lang.String)")
+    @CallSite.After("java.lang.String org.apache.commons.text.StringEscapeUtils.escapeHtml3(java.lang.String)")
+    @CallSite.After("java.lang.String org.apache.commons.text.StringEscapeUtils.escapeHtml4(java.lang.String)")
+    @CallSite.After("java.lang.String org.apache.commons.text.StringEscapeUtils.escapeJava(java.lang.String)")
+    @CallSite.After("java.lang.String org.apache.commons.text.StringEscapeUtils.escapeXml10(java.lang.String)")
+    @CallSite.After("java.lang.String org.apache.commons.text.StringEscapeUtils.escapeXml11(java.lang.String)")
+    public static String afterEscape(
+            @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input, false, VulnerabilityMarks.HTML_ESCAPED_MARK);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterEscape threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After(
-      "java.lang.String org.apache.commons.text.StringEscapeUtils.escapeJson(java.lang.String)")
-  public static String afterEscapeJson(
-      @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterEscapeJson threw", e);
-      }
+    @CallSite.After("java.lang.String org.apache.commons.text.StringEscapeUtils.escapeJson(java.lang.String)")
+    public static String afterEscapeJson(
+            @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterEscapeJson threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/commons-text-1.0/src/test/java/foo/bar/TestStringEscapeUtilsSuite.java b/dd-java-agent/instrumentation/commons-text-1.0/src/test/java/foo/bar/TestStringEscapeUtilsSuite.java
index 14026d2160d..4ab10f62d7d 100644
--- a/dd-java-agent/instrumentation/commons-text-1.0/src/test/java/foo/bar/TestStringEscapeUtilsSuite.java
+++ b/dd-java-agent/instrumentation/commons-text-1.0/src/test/java/foo/bar/TestStringEscapeUtilsSuite.java
@@ -4,31 +4,31 @@
 
 public class TestStringEscapeUtilsSuite {
 
-  public static String escapeEcmaScript(String input) {
-    return StringEscapeUtils.escapeEcmaScript(input);
-  }
+    public static String escapeEcmaScript(String input) {
+        return StringEscapeUtils.escapeEcmaScript(input);
+    }
 
-  public static String escapeHtml3(String input) {
-    return StringEscapeUtils.escapeHtml3(input);
-  }
+    public static String escapeHtml3(String input) {
+        return StringEscapeUtils.escapeHtml3(input);
+    }
 
-  public static String escapeJava(String input) {
-    return StringEscapeUtils.escapeJava(input);
-  }
+    public static String escapeJava(String input) {
+        return StringEscapeUtils.escapeJava(input);
+    }
 
-  public static String escapeJson(String input) {
-    return StringEscapeUtils.escapeJson(input);
-  }
+    public static String escapeJson(String input) {
+        return StringEscapeUtils.escapeJson(input);
+    }
 
-  public static String escapeHtml4(String input) {
-    return StringEscapeUtils.escapeHtml4(input);
-  }
+    public static String escapeHtml4(String input) {
+        return StringEscapeUtils.escapeHtml4(input);
+    }
 
-  public static String escapeXml10(String input) {
-    return StringEscapeUtils.escapeXml10(input);
-  }
+    public static String escapeXml10(String input) {
+        return StringEscapeUtils.escapeXml10(input);
+    }
 
-  public static String escapeXml11(String input) {
-    return StringEscapeUtils.escapeXml11(input);
-  }
+    public static String escapeXml11(String input) {
+        return StringEscapeUtils.escapeXml11(input);
+    }
 }
diff --git a/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/ConfluentSchemaRegistryModule.java b/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/ConfluentSchemaRegistryModule.java
index 3d8fb856453..947e9e62ae0 100644
--- a/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/ConfluentSchemaRegistryModule.java
+++ b/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/ConfluentSchemaRegistryModule.java
@@ -11,28 +11,27 @@
 
 @AutoService(InstrumenterModule.class)
 public class ConfluentSchemaRegistryModule extends InstrumenterModule.Tracing {
-  public ConfluentSchemaRegistryModule() {
-    super("confluent-schema-registry", "kafka");
-  }
+    public ConfluentSchemaRegistryModule() {
+        super("confluent-schema-registry", "kafka");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.kafka_common.ClusterIdHolder",
-      packageName + ".SchemaIdExtractor"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.kafka_common.ClusterIdHolder", packageName + ".SchemaIdExtractor"
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>();
-    contextStores.put("org.apache.kafka.common.serialization.Deserializer", "java.lang.Boolean");
-    contextStores.put("org.apache.kafka.common.serialization.Serializer", "java.lang.Boolean");
-    return contextStores;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>();
+        contextStores.put("org.apache.kafka.common.serialization.Deserializer", "java.lang.Boolean");
+        contextStores.put("org.apache.kafka.common.serialization.Serializer", "java.lang.Boolean");
+        return contextStores;
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(new KafkaDeserializerInstrumentation(), new KafkaSerializerInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(new KafkaDeserializerInstrumentation(), new KafkaSerializerInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/KafkaDeserializerInstrumentation.java b/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/KafkaDeserializerInstrumentation.java
index 838c6221a13..23c2beca12a 100644
--- a/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/KafkaDeserializerInstrumentation.java
+++ b/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/KafkaDeserializerInstrumentation.java
@@ -18,74 +18,72 @@
  * Instruments Confluent Schema Registry deserializers (Avro, Protobuf, and JSON) to capture
  * deserialization operations.
  */
-public class KafkaDeserializerInstrumentation
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+public class KafkaDeserializerInstrumentation implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.confluent.kafka.serializers.KafkaAvroDeserializer",
-      "io.confluent.kafka.serializers.json.KafkaJsonSchemaDeserializer",
-      "io.confluent.kafka.serializers.protobuf.KafkaProtobufDeserializer"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.confluent.kafka.serializers.KafkaAvroDeserializer",
+            "io.confluent.kafka.serializers.json.KafkaJsonSchemaDeserializer",
+            "io.confluent.kafka.serializers.protobuf.KafkaProtobufDeserializer"
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // Instrument configure to capture isKey value
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("configure"))
-            .and(isPublic())
-            .and(takesArguments(2))
-            .and(takesArgument(1, boolean.class)),
-        getClass().getName() + "$ConfigureAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // Instrument configure to capture isKey value
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("configure"))
+                        .and(isPublic())
+                        .and(takesArguments(2))
+                        .and(takesArgument(1, boolean.class)),
+                getClass().getName() + "$ConfigureAdvice");
 
-    // Instrument deserialize(String topic, Headers headers, byte[] data)
-    // The 2-arg version calls this one, so we only need to instrument this to avoid duplicates
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("deserialize"))
-            .and(isPublic())
-            .and(takesArguments(3))
-            .and(takesArgument(0, String.class))
-            .and(takesArgument(2, byte[].class)),
-        getClass().getName() + "$DeserializeAdvice");
-  }
+        // Instrument deserialize(String topic, Headers headers, byte[] data)
+        // The 2-arg version calls this one, so we only need to instrument this to avoid duplicates
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("deserialize"))
+                        .and(isPublic())
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, String.class))
+                        .and(takesArgument(2, byte[].class)),
+                getClass().getName() + "$DeserializeAdvice");
+    }
 
-  public static class ConfigureAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This Deserializer deserializer, @Advice.Argument(1) boolean isKey) {
-      // Store the isKey value in InstrumentationContext for later use
-      InstrumentationContext.get(Deserializer.class, Boolean.class).put(deserializer, isKey);
+    public static class ConfigureAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(@Advice.This Deserializer deserializer, @Advice.Argument(1) boolean isKey) {
+            // Store the isKey value in InstrumentationContext for later use
+            InstrumentationContext.get(Deserializer.class, Boolean.class).put(deserializer, isKey);
+        }
     }
-  }
 
-  public static class DeserializeAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This Deserializer deserializer,
-        @Advice.Argument(0) String topic,
-        @Advice.Argument(2) byte[] data,
-        @Advice.Return Object result,
-        @Advice.Thrown Throwable throwable) {
+    public static class DeserializeAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This Deserializer deserializer,
+                @Advice.Argument(0) String topic,
+                @Advice.Argument(2) byte[] data,
+                @Advice.Return Object result,
+                @Advice.Thrown Throwable throwable) {
 
-      // Get isKey from InstrumentationContext (stored during configure)
-      Boolean isKeyObj =
-          InstrumentationContext.get(Deserializer.class, Boolean.class).get(deserializer);
-      boolean isKey = isKeyObj != null && isKeyObj;
+            // Get isKey from InstrumentationContext (stored during configure)
+            Boolean isKeyObj = InstrumentationContext.get(Deserializer.class, Boolean.class)
+                    .get(deserializer);
+            boolean isKey = isKeyObj != null && isKeyObj;
 
-      // Get cluster ID from thread-local (set by Kafka consumer instrumentation)
-      String clusterId = ClusterIdHolder.get();
+            // Get cluster ID from thread-local (set by Kafka consumer instrumentation)
+            String clusterId = ClusterIdHolder.get();
 
-      boolean isSuccess = throwable == null;
-      int schemaId = isSuccess ? SchemaIdExtractor.extractSchemaId(data) : -1;
+            boolean isSuccess = throwable == null;
+            int schemaId = isSuccess ? SchemaIdExtractor.extractSchemaId(data) : -1;
 
-      // Record the schema registry usage
-      AgentTracer.get()
-          .getDataStreamsMonitoring()
-          .reportSchemaRegistryUsage(topic, clusterId, schemaId, isSuccess, isKey, "deserialize");
+            // Record the schema registry usage
+            AgentTracer.get()
+                    .getDataStreamsMonitoring()
+                    .reportSchemaRegistryUsage(topic, clusterId, schemaId, isSuccess, isKey, "deserialize");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/KafkaSerializerInstrumentation.java b/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/KafkaSerializerInstrumentation.java
index 4405be8c139..e4eefedd715 100644
--- a/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/KafkaSerializerInstrumentation.java
+++ b/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/KafkaSerializerInstrumentation.java
@@ -19,72 +19,70 @@
  * Instruments Confluent Schema Registry serializers (Avro, Protobuf, and JSON) to capture
  * serialization operations.
  */
-public class KafkaSerializerInstrumentation
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+public class KafkaSerializerInstrumentation implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.confluent.kafka.serializers.KafkaAvroSerializer",
-      "io.confluent.kafka.serializers.json.KafkaJsonSchemaSerializer",
-      "io.confluent.kafka.serializers.protobuf.KafkaProtobufSerializer"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.confluent.kafka.serializers.KafkaAvroSerializer",
+            "io.confluent.kafka.serializers.json.KafkaJsonSchemaSerializer",
+            "io.confluent.kafka.serializers.protobuf.KafkaProtobufSerializer"
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // Instrument configure to capture isKey value
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("configure"))
-            .and(isPublic())
-            .and(takesArguments(2))
-            .and(takesArgument(1, boolean.class)),
-        getClass().getName() + "$ConfigureAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // Instrument configure to capture isKey value
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("configure"))
+                        .and(isPublic())
+                        .and(takesArguments(2))
+                        .and(takesArgument(1, boolean.class)),
+                getClass().getName() + "$ConfigureAdvice");
 
-    // Instrument both serialize(String topic, Object data)
-    // and serialize(String topic, Headers headers, Object data) for Kafka 2.1+
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("serialize"))
-            .and(isPublic())
-            .and(takesArgument(0, String.class))
-            .and(returns(byte[].class)),
-        getClass().getName() + "$SerializeAdvice");
-  }
+        // Instrument both serialize(String topic, Object data)
+        // and serialize(String topic, Headers headers, Object data) for Kafka 2.1+
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("serialize"))
+                        .and(isPublic())
+                        .and(takesArgument(0, String.class))
+                        .and(returns(byte[].class)),
+                getClass().getName() + "$SerializeAdvice");
+    }
 
-  public static class ConfigureAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This Serializer serializer, @Advice.Argument(1) boolean isKey) {
-      // Store the isKey value in InstrumentationContext for later use
-      InstrumentationContext.get(Serializer.class, Boolean.class).put(serializer, isKey);
+    public static class ConfigureAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(@Advice.This Serializer serializer, @Advice.Argument(1) boolean isKey) {
+            // Store the isKey value in InstrumentationContext for later use
+            InstrumentationContext.get(Serializer.class, Boolean.class).put(serializer, isKey);
+        }
     }
-  }
 
-  public static class SerializeAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This Serializer serializer,
-        @Advice.Argument(0) String topic,
-        @Advice.Return byte[] result,
-        @Advice.Thrown Throwable throwable) {
+    public static class SerializeAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This Serializer serializer,
+                @Advice.Argument(0) String topic,
+                @Advice.Return byte[] result,
+                @Advice.Thrown Throwable throwable) {
 
-      // Get isKey from InstrumentationContext (stored during configure)
-      Boolean isKeyObj =
-          InstrumentationContext.get(Serializer.class, Boolean.class).get(serializer);
-      boolean isKey = isKeyObj != null && isKeyObj;
+            // Get isKey from InstrumentationContext (stored during configure)
+            Boolean isKeyObj =
+                    InstrumentationContext.get(Serializer.class, Boolean.class).get(serializer);
+            boolean isKey = isKeyObj != null && isKeyObj;
 
-      // Get cluster ID from thread-local (set by Kafka producer instrumentation)
-      String clusterId = ClusterIdHolder.get();
+            // Get cluster ID from thread-local (set by Kafka producer instrumentation)
+            String clusterId = ClusterIdHolder.get();
 
-      boolean isSuccess = throwable == null;
-      int schemaId = isSuccess ? SchemaIdExtractor.extractSchemaId(result) : -1;
+            boolean isSuccess = throwable == null;
+            int schemaId = isSuccess ? SchemaIdExtractor.extractSchemaId(result) : -1;
 
-      // Record the schema registry usage
-      AgentTracer.get()
-          .getDataStreamsMonitoring()
-          .reportSchemaRegistryUsage(topic, clusterId, schemaId, isSuccess, isKey, "serialize");
+            // Record the schema registry usage
+            AgentTracer.get()
+                    .getDataStreamsMonitoring()
+                    .reportSchemaRegistryUsage(topic, clusterId, schemaId, isSuccess, isKey, "serialize");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/SchemaIdExtractor.java b/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/SchemaIdExtractor.java
index 786ff25bc21..f2873a232d4 100644
--- a/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/SchemaIdExtractor.java
+++ b/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/SchemaIdExtractor.java
@@ -5,19 +5,16 @@
  * [magic_byte][4-byte schema id][data]
  */
 public class SchemaIdExtractor {
-  public static int extractSchemaId(byte[] data) {
-    if (data == null || data.length < 5 || data[0] != 0) {
-      return -1;
-    }
+    public static int extractSchemaId(byte[] data) {
+        if (data == null || data.length < 5 || data[0] != 0) {
+            return -1;
+        }
 
-    try {
-      // Confluent wire format: [magic_byte][4-byte schema id][data]
-      return ((data[1] & 0xFF) << 24)
-          | ((data[2] & 0xFF) << 16)
-          | ((data[3] & 0xFF) << 8)
-          | (data[4] & 0xFF);
-    } catch (Throwable ignored) {
-      return -1;
+        try {
+            // Confluent wire format: [magic_byte][4-byte schema id][data]
+            return ((data[1] & 0xFF) << 24) | ((data[2] & 0xFF) << 16) | ((data[3] & 0xFF) << 8) | (data[4] & 0xFF);
+        } catch (Throwable ignored) {
+            return -1;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseBucketInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseBucketInstrumentation.java
index 041970a757a..aaef3e0deb9 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseBucketInstrumentation.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseBucketInstrumentation.java
@@ -16,59 +16,59 @@
 
 @AutoService(InstrumenterModule.class)
 public class CouchbaseBucketInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public CouchbaseBucketInstrumentation() {
-    super("couchbase");
-  }
+    public CouchbaseBucketInstrumentation() {
+        super("couchbase");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "com.couchbase.client.java.bucket.DefaultAsyncBucketManager",
-      "com.couchbase.client.java.CouchbaseAsyncBucket"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "com.couchbase.client.java.bucket.DefaultAsyncBucketManager",
+            "com.couchbase.client.java.CouchbaseAsyncBucket"
+        };
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "rx.DDTracingUtil",
-      "datadog.trace.instrumentation.rxjava.SpanFinishingSubscription",
-      "datadog.trace.instrumentation.rxjava.TracedSubscriber",
-      "datadog.trace.instrumentation.rxjava.TracedOnSubscribe",
-      packageName + ".CouchbaseClientDecorator",
-      packageName + ".CouchbaseOnSubscribe",
-      packageName + ".CouchbaseOnSubscribe$1"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "rx.DDTracingUtil",
+            "datadog.trace.instrumentation.rxjava.SpanFinishingSubscription",
+            "datadog.trace.instrumentation.rxjava.TracedSubscriber",
+            "datadog.trace.instrumentation.rxjava.TracedOnSubscribe",
+            packageName + ".CouchbaseClientDecorator",
+            packageName + ".CouchbaseOnSubscribe",
+            packageName + ".CouchbaseOnSubscribe$1"
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(returns(named("rx.Observable"))),
-        CouchbaseBucketInstrumentation.class.getName() + "$CouchbaseClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(returns(named("rx.Observable"))),
+                CouchbaseBucketInstrumentation.class.getName() + "$CouchbaseClientAdvice");
+    }
 
-  public static class CouchbaseClientAdvice {
+    public static class CouchbaseClientAdvice {
 
-    @Advice.OnMethodEnter
-    public static int trackCallDepth() {
-      return CallDepthThreadLocalMap.incrementCallDepth(CouchbaseCluster.class);
-    }
+        @Advice.OnMethodEnter
+        public static int trackCallDepth() {
+            return CallDepthThreadLocalMap.incrementCallDepth(CouchbaseCluster.class);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void subscribeResult(
-        @Advice.Enter final int callDepth,
-        @Advice.Origin final Method method,
-        @Advice.FieldValue("bucket") final String bucket,
-        @Advice.Return(readOnly = false) Observable result) {
-      if (callDepth > 0) {
-        return;
-      }
-      CallDepthThreadLocalMap.reset(CouchbaseCluster.class);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void subscribeResult(
+                @Advice.Enter final int callDepth,
+                @Advice.Origin final Method method,
+                @Advice.FieldValue("bucket") final String bucket,
+                @Advice.Return(readOnly = false) Observable result) {
+            if (callDepth > 0) {
+                return;
+            }
+            CallDepthThreadLocalMap.reset(CouchbaseCluster.class);
 
-      result = Observable.create(new CouchbaseOnSubscribe(result, method, bucket));
+            result = Observable.create(new CouchbaseOnSubscribe(result, method, bucket));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseClientDecorator.java b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseClientDecorator.java
index cd592761951..ee05bcbe357 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseClientDecorator.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseClientDecorator.java
@@ -6,54 +6,54 @@
 import datadog.trace.bootstrap.instrumentation.decorator.DBTypeProcessingDatabaseClientDecorator;
 
 class CouchbaseClientDecorator extends DBTypeProcessingDatabaseClientDecorator {
-  private static final CharSequence COUCHBASE_CLIENT = UTF8BytesString.create("couchbase-client");
-  private static final String DB_TYPE = "couchbase";
-
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().database().service(DB_TYPE);
-
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
-
-  public static final CouchbaseClientDecorator DECORATE = new CouchbaseClientDecorator();
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"couchbase"};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COUCHBASE_CLIENT;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.COUCHBASE;
-  }
-
-  @Override
-  protected String dbType() {
-    return "couchbase";
-  }
-
-  @Override
-  protected String dbUser(final Object o) {
-    return null;
-  }
-
-  @Override
-  protected String dbInstance(final Object o) {
-    return null;
-  }
-
-  @Override
-  protected String dbHostname(Object o) {
-    return null;
-  }
+    private static final CharSequence COUCHBASE_CLIENT = UTF8BytesString.create("couchbase-client");
+    private static final String DB_TYPE = "couchbase";
+
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().database().service(DB_TYPE);
+
+    public static final CharSequence OPERATION_NAME = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
+
+    public static final CouchbaseClientDecorator DECORATE = new CouchbaseClientDecorator();
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"couchbase"};
+    }
+
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return COUCHBASE_CLIENT;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.COUCHBASE;
+    }
+
+    @Override
+    protected String dbType() {
+        return "couchbase";
+    }
+
+    @Override
+    protected String dbUser(final Object o) {
+        return null;
+    }
+
+    @Override
+    protected String dbInstance(final Object o) {
+        return null;
+    }
+
+    @Override
+    protected String dbHostname(Object o) {
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseClusterInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseClusterInstrumentation.java
index 7c95dfa971c..d40810e57d0 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseClusterInstrumentation.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseClusterInstrumentation.java
@@ -17,57 +17,57 @@
 
 @AutoService(InstrumenterModule.class)
 public class CouchbaseClusterInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public CouchbaseClusterInstrumentation() {
-    super("couchbase");
-  }
+    public CouchbaseClusterInstrumentation() {
+        super("couchbase");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "com.couchbase.client.java.cluster.DefaultAsyncClusterManager",
-      "com.couchbase.client.java.CouchbaseAsyncCluster"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "com.couchbase.client.java.cluster.DefaultAsyncClusterManager",
+            "com.couchbase.client.java.CouchbaseAsyncCluster"
+        };
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "rx.DDTracingUtil",
-      "datadog.trace.instrumentation.rxjava.SpanFinishingSubscription",
-      "datadog.trace.instrumentation.rxjava.TracedSubscriber",
-      "datadog.trace.instrumentation.rxjava.TracedOnSubscribe",
-      packageName + ".CouchbaseClientDecorator",
-      packageName + ".CouchbaseOnSubscribe",
-      packageName + ".CouchbaseOnSubscribe$1"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "rx.DDTracingUtil",
+            "datadog.trace.instrumentation.rxjava.SpanFinishingSubscription",
+            "datadog.trace.instrumentation.rxjava.TracedSubscriber",
+            "datadog.trace.instrumentation.rxjava.TracedOnSubscribe",
+            packageName + ".CouchbaseClientDecorator",
+            packageName + ".CouchbaseOnSubscribe",
+            packageName + ".CouchbaseOnSubscribe$1"
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(returns(named("rx.Observable"))).and(not(named("core"))),
-        CouchbaseClusterInstrumentation.class.getName() + "$CouchbaseClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(returns(named("rx.Observable"))).and(not(named("core"))),
+                CouchbaseClusterInstrumentation.class.getName() + "$CouchbaseClientAdvice");
+    }
 
-  public static class CouchbaseClientAdvice {
+    public static class CouchbaseClientAdvice {
 
-    @Advice.OnMethodEnter
-    public static int trackCallDepth() {
-      return CallDepthThreadLocalMap.incrementCallDepth(CouchbaseCluster.class);
-    }
+        @Advice.OnMethodEnter
+        public static int trackCallDepth() {
+            return CallDepthThreadLocalMap.incrementCallDepth(CouchbaseCluster.class);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void subscribeResult(
-        @Advice.Enter final int callDepth,
-        @Advice.Origin final Method method,
-        @Advice.Return(readOnly = false) Observable result) {
-      if (callDepth > 0) {
-        return;
-      }
-      CallDepthThreadLocalMap.reset(CouchbaseCluster.class);
-      result = Observable.create(new CouchbaseOnSubscribe(result, method, null));
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void subscribeResult(
+                @Advice.Enter final int callDepth,
+                @Advice.Origin final Method method,
+                @Advice.Return(readOnly = false) Observable result) {
+            if (callDepth > 0) {
+                return;
+            }
+            CallDepthThreadLocalMap.reset(CouchbaseCluster.class);
+            result = Observable.create(new CouchbaseOnSubscribe(result, method, null));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseOnSubscribe.java b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseOnSubscribe.java
index ea0fa683725..cc8d8463a71 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseOnSubscribe.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseOnSubscribe.java
@@ -12,45 +12,43 @@
 
 public class CouchbaseOnSubscribe extends TracedOnSubscribe {
 
-  private static final QualifiedClassNameCache NAMES =
-      new QualifiedClassNameCache(
-          new Function<Class<?>, CharSequence>() {
-            @Override
-            public String apply(Class<?> input) {
-              StringBuilder builder = new StringBuilder(input.getSimpleName());
-              int i;
-              while ((i = builder.indexOf("CouchbaseAsync")) != -1)
-                builder.delete(i, i + "CouchbaseAsync".length());
-              while ((i = builder.indexOf("DefaultAsync")) != -1)
-                builder.delete(i, i + "DefaultAsync".length());
-              return builder.toString();
-            }
-          },
-          Functions.PrefixJoin.of("."));
-
-  private final String resourceName;
-  private final String bucket;
-
-  public CouchbaseOnSubscribe(
-      final Observable originalObservable, final Method method, final String bucket) {
-    super(originalObservable, CouchbaseClientDecorator.OPERATION_NAME, DECORATE);
-    resourceName = NAMES.getQualifiedName(method.getDeclaringClass(), method.getName()).toString();
-    this.bucket = bucket;
-  }
-
-  @Override
-  protected String instrumentationName() {
-    return "couchbase-client";
-  }
-
-  @Override
-  protected void afterStart(final AgentSpan span) {
-    super.afterStart(span);
-
-    span.setResourceName(resourceName);
-
-    if (bucket != null) {
-      span.setTag("bucket", bucket);
+    private static final QualifiedClassNameCache NAMES = new QualifiedClassNameCache(
+            new Function<Class<?>, CharSequence>() {
+                @Override
+                public String apply(Class<?> input) {
+                    StringBuilder builder = new StringBuilder(input.getSimpleName());
+                    int i;
+                    while ((i = builder.indexOf("CouchbaseAsync")) != -1)
+                        builder.delete(i, i + "CouchbaseAsync".length());
+                    while ((i = builder.indexOf("DefaultAsync")) != -1) builder.delete(i, i + "DefaultAsync".length());
+                    return builder.toString();
+                }
+            },
+            Functions.PrefixJoin.of("."));
+
+    private final String resourceName;
+    private final String bucket;
+
+    public CouchbaseOnSubscribe(final Observable originalObservable, final Method method, final String bucket) {
+        super(originalObservable, CouchbaseClientDecorator.OPERATION_NAME, DECORATE);
+        resourceName = NAMES.getQualifiedName(method.getDeclaringClass(), method.getName())
+                .toString();
+        this.bucket = bucket;
+    }
+
+    @Override
+    protected String instrumentationName() {
+        return "couchbase-client";
+    }
+
+    @Override
+    protected void afterStart(final AgentSpan span) {
+        super.afterStart(span);
+
+        span.setResourceName(resourceName);
+
+        if (bucket != null) {
+            span.setTag("bucket", bucket);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseCoreInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseCoreInstrumentation.java
index 4d60aff4a08..48d464f9c08 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseCoreInstrumentation.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseCoreInstrumentation.java
@@ -19,54 +19,53 @@
 
 @AutoService(InstrumenterModule.class)
 public class CouchbaseCoreInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public CouchbaseCoreInstrumentation() {
-    super("couchbase");
-  }
+    public CouchbaseCoreInstrumentation() {
+        super("couchbase");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.couchbase.client.core.CouchbaseCore";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.couchbase.client.core.CouchbaseCore";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(
-        "com.couchbase.client.core.message.CouchbaseRequest", AgentSpan.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("com.couchbase.client.core.message.CouchbaseRequest", AgentSpan.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(takesArgument(0, named("com.couchbase.client.core.message.CouchbaseRequest")))
-            .and(named("send")),
-        CouchbaseCoreInstrumentation.class.getName() + "$CouchbaseCoreAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(takesArgument(0, named("com.couchbase.client.core.message.CouchbaseRequest")))
+                        .and(named("send")),
+                CouchbaseCoreInstrumentation.class.getName() + "$CouchbaseCoreAdvice");
+    }
 
-  public static class CouchbaseCoreAdvice {
+    public static class CouchbaseCoreAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void addOperationIdToSpan(@Advice.Argument(0) final CouchbaseRequest request) {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void addOperationIdToSpan(@Advice.Argument(0) final CouchbaseRequest request) {
 
-      final AgentSpan span = activeSpan();
-      if (span != null) {
-        // The context from the initial rxJava subscribe is not available to the networking layer
-        // To transfer the span, the span is added to the context store
+            final AgentSpan span = activeSpan();
+            if (span != null) {
+                // The context from the initial rxJava subscribe is not available to the networking layer
+                // To transfer the span, the span is added to the context store
 
-        final ContextStore<CouchbaseRequest, AgentSpan> contextStore =
-            InstrumentationContext.get(CouchbaseRequest.class, AgentSpan.class);
+                final ContextStore<CouchbaseRequest, AgentSpan> contextStore =
+                        InstrumentationContext.get(CouchbaseRequest.class, AgentSpan.class);
 
-        if (contextStore.get(request) == null) {
-          contextStore.put(request, span);
+                if (contextStore.get(request) == null) {
+                    contextStore.put(request, span);
 
-          if (request.operationId() != null) {
-            span.setTag("couchbase.operation_id", request.operationId());
-          }
+                    if (request.operationId() != null) {
+                        span.setTag("couchbase.operation_id", request.operationId());
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseNetworkInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseNetworkInstrumentation.java
index b708292cabf..a00f7dd8577 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseNetworkInstrumentation.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseNetworkInstrumentation.java
@@ -24,70 +24,69 @@
 
 @AutoService(InstrumenterModule.class)
 public class CouchbaseNetworkInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public CouchbaseNetworkInstrumentation() {
-    super("couchbase");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public CouchbaseNetworkInstrumentation() {
+        super("couchbase");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "com.couchbase.client.core.endpoint.AbstractGenericHandler";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "com.couchbase.client.core.endpoint.AbstractGenericHandler";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    // Exact class because private fields are used
-    return nameStartsWith("com.couchbase.client.").and(extendsClass(named(hierarchyMarkerType())));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        // Exact class because private fields are used
+        return nameStartsWith("com.couchbase.client.").and(extendsClass(named(hierarchyMarkerType())));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "com.couchbase.client.core.message.CouchbaseRequest", AgentSpan.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(
+                "com.couchbase.client.core.message.CouchbaseRequest", AgentSpan.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // encode(ChannelHandlerContext ctx, REQUEST msg, List<Object> out)
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("encode"))
-            .and(takesArguments(3))
-            .and(
-                takesArgument(
-                    0, named("com.couchbase.client.deps.io.netty.channel.ChannelHandlerContext")))
-            .and(takesArgument(2, named("java.util.List"))),
-        CouchbaseNetworkInstrumentation.class.getName() + "$CouchbaseNetworkAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // encode(ChannelHandlerContext ctx, REQUEST msg, List<Object> out)
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("encode"))
+                        .and(takesArguments(3))
+                        .and(takesArgument(
+                                0, named("com.couchbase.client.deps.io.netty.channel.ChannelHandlerContext")))
+                        .and(takesArgument(2, named("java.util.List"))),
+                CouchbaseNetworkInstrumentation.class.getName() + "$CouchbaseNetworkAdvice");
+    }
 
-  public static class CouchbaseNetworkAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void addNetworkTagsToSpan(
-        @Advice.FieldValue("remoteHostname") final String remoteHostname,
-        @Advice.FieldValue("remoteSocket") final String remoteSocket,
-        @Advice.FieldValue("localSocket") final String localSocket,
-        @Advice.Argument(1) final CouchbaseRequest request) {
-      final ContextStore<CouchbaseRequest, AgentSpan> contextStore =
-          InstrumentationContext.get(CouchbaseRequest.class, AgentSpan.class);
+    public static class CouchbaseNetworkAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void addNetworkTagsToSpan(
+                @Advice.FieldValue("remoteHostname") final String remoteHostname,
+                @Advice.FieldValue("remoteSocket") final String remoteSocket,
+                @Advice.FieldValue("localSocket") final String localSocket,
+                @Advice.Argument(1) final CouchbaseRequest request) {
+            final ContextStore<CouchbaseRequest, AgentSpan> contextStore =
+                    InstrumentationContext.get(CouchbaseRequest.class, AgentSpan.class);
 
-      final AgentSpan span = contextStore.get(request);
-      if (span != null) {
-        span.setTag(Tags.PEER_HOSTNAME, remoteHostname);
+            final AgentSpan span = contextStore.get(request);
+            if (span != null) {
+                span.setTag(Tags.PEER_HOSTNAME, remoteHostname);
 
-        if (remoteSocket != null) {
-          final int splitIndex = remoteSocket.lastIndexOf(":");
-          if (splitIndex != -1) {
-            span.setTag(Tags.PEER_PORT, Integer.parseInt(remoteSocket.substring(splitIndex + 1)));
-          }
-        }
+                if (remoteSocket != null) {
+                    final int splitIndex = remoteSocket.lastIndexOf(":");
+                    if (splitIndex != -1) {
+                        span.setTag(Tags.PEER_PORT, Integer.parseInt(remoteSocket.substring(splitIndex + 1)));
+                    }
+                }
 
-        span.setTag("local.address", localSocket);
-      }
-    }
+                span.setTag("local.address", localSocket);
+            }
+        }
 
-    // 2.6.0 and above
-    public static void muzzleCheck(final JsonCryptoTranscoder transcoder) {
-      transcoder.documentType();
+        // 2.6.0 and above
+        public static void muzzleCheck(final JsonCryptoTranscoder transcoder) {
+            transcoder.documentType();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestAdvice.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestAdvice.java
index 6d809e14eb1..50a1bd46a80 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestAdvice.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestAdvice.java
@@ -6,12 +6,12 @@
 import net.bytebuddy.asm.Advice;
 
 public class BaseRequestAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit(
-      @Advice.FieldValue(value = "response", readOnly = false) CompletableFuture<?> response,
-      @Advice.FieldValue(value = "requestSpan") RequestSpan requestSpan) {
-    if (requestSpan instanceof DatadogRequestSpan) {
-      response = new StatusSettingCompletableFuture<>((DatadogRequestSpan) requestSpan);
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(
+            @Advice.FieldValue(value = "response", readOnly = false) CompletableFuture<?> response,
+            @Advice.FieldValue(value = "requestSpan") RequestSpan requestSpan) {
+        if (requestSpan instanceof DatadogRequestSpan) {
+            response = new StatusSettingCompletableFuture<>((DatadogRequestSpan) requestSpan);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestInstrumentation.java
index e2df39ec757..9c3a74a6a7c 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestInstrumentation.java
@@ -10,33 +10,30 @@
 
 @AutoService(InstrumenterModule.class)
 public class BaseRequestInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public BaseRequestInstrumentation() {
-    super("couchbase", "couchbase-3");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.couchbase.client.core.msg.BaseRequest";
-  }
-
-  private static final Reference TRACING_IDENTIFIERS_REFERENCE =
-      new Reference.Builder("com.couchbase.client.core.cnc.TracingIdentifiers").build();
-
-  private static final Reference SUSPICIOUS_EXPIRY_REFERENCE =
-      new Reference.Builder(
-              "com.couchbase.client.core.cnc.events.request.SuspiciousExpiryDurationEvent")
-          .build();
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {TRACING_IDENTIFIERS_REFERENCE, SUSPICIOUS_EXPIRY_REFERENCE};
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArguments(4)), packageName + ".BaseRequestAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public BaseRequestInstrumentation() {
+        super("couchbase", "couchbase-3");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "com.couchbase.client.core.msg.BaseRequest";
+    }
+
+    private static final Reference TRACING_IDENTIFIERS_REFERENCE =
+            new Reference.Builder("com.couchbase.client.core.cnc.TracingIdentifiers").build();
+
+    private static final Reference SUSPICIOUS_EXPIRY_REFERENCE =
+            new Reference.Builder("com.couchbase.client.core.cnc.events.request.SuspiciousExpiryDurationEvent").build();
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {TRACING_IDENTIFIERS_REFERENCE, SUSPICIOUS_EXPIRY_REFERENCE};
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor().and(takesArguments(4)), packageName + ".BaseRequestAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderAdvice.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderAdvice.java
index 13359d7f116..388ee89cb0a 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderAdvice.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderAdvice.java
@@ -7,10 +7,9 @@
 import net.bytebuddy.asm.Advice;
 
 public class CoreEnvironmentBuilderAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit(@Advice.This CoreEnvironment.Builder<?> builder) {
-    builder.requestTracer(
-        new DatadogRequestTracer(
-            AgentTracer.get(), InstrumentationContext.get(Core.class, String.class)));
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(@Advice.This CoreEnvironment.Builder<?> builder) {
+        builder.requestTracer(
+                new DatadogRequestTracer(AgentTracer.get(), InstrumentationContext.get(Core.class, String.class)));
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderInstrumentation.java
index 5eef7d52e7f..5a530e9a89b 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderInstrumentation.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderInstrumentation.java
@@ -11,37 +11,35 @@
 
 @AutoService(InstrumenterModule.class)
 public class CoreEnvironmentBuilderInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public CoreEnvironmentBuilderInstrumentation() {
-    super("couchbase", "couchbase-3");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("com.couchbase.client.core.Core", String.class.getName());
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.couchbase.client.core.env.CoreEnvironment$Builder";
-  }
-
-  private static final Reference TRACING_IDENTIFIERS_REFERENCE =
-      new Reference.Builder("com.couchbase.client.core.cnc.TracingIdentifiers").build();
-
-  private static final Reference SUSPICIOUS_EXPIRY_REFERENCE =
-      new Reference.Builder(
-              "com.couchbase.client.core.cnc.events.request.SuspiciousExpiryDurationEvent")
-          .build();
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {TRACING_IDENTIFIERS_REFERENCE, SUSPICIOUS_EXPIRY_REFERENCE};
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), packageName + ".CoreEnvironmentBuilderAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public CoreEnvironmentBuilderInstrumentation() {
+        super("couchbase", "couchbase-3");
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("com.couchbase.client.core.Core", String.class.getName());
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "com.couchbase.client.core.env.CoreEnvironment$Builder";
+    }
+
+    private static final Reference TRACING_IDENTIFIERS_REFERENCE =
+            new Reference.Builder("com.couchbase.client.core.cnc.TracingIdentifiers").build();
+
+    private static final Reference SUSPICIOUS_EXPIRY_REFERENCE =
+            new Reference.Builder("com.couchbase.client.core.cnc.events.request.SuspiciousExpiryDurationEvent").build();
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {TRACING_IDENTIFIERS_REFERENCE, SUSPICIOUS_EXPIRY_REFERENCE};
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), packageName + ".CoreEnvironmentBuilderAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreInstrumentation.java
index 5113c625220..eb378330072 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreInstrumentation.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreInstrumentation.java
@@ -18,48 +18,45 @@
 
 @AutoService(InstrumenterModule.class)
 public class CoreInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  private static final Reference TRACING_IDENTIFIERS_REFERENCE =
-      new Reference.Builder("com.couchbase.client.core.cnc.TracingIdentifiers").build();
+    private static final Reference TRACING_IDENTIFIERS_REFERENCE =
+            new Reference.Builder("com.couchbase.client.core.cnc.TracingIdentifiers").build();
 
-  private static final Reference SUSPICIOUS_EXPIRY_REFERENCE =
-      new Reference.Builder(
-              "com.couchbase.client.core.cnc.events.request.SuspiciousExpiryDurationEvent")
-          .build();
+    private static final Reference SUSPICIOUS_EXPIRY_REFERENCE =
+            new Reference.Builder("com.couchbase.client.core.cnc.events.request.SuspiciousExpiryDurationEvent").build();
 
-  public CoreInstrumentation() {
-    super("couchbase");
-  }
+    public CoreInstrumentation() {
+        super("couchbase");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.couchbase.client.core.Core";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.couchbase.client.core.Core";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("com.couchbase.client.core.Core", String.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("com.couchbase.client.core.Core", String.class.getName());
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {TRACING_IDENTIFIERS_REFERENCE, SUSPICIOUS_EXPIRY_REFERENCE};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {TRACING_IDENTIFIERS_REFERENCE, SUSPICIOUS_EXPIRY_REFERENCE};
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(2, named("java.util.Set"))),
-        CoreInstrumentation.class.getName() + "$CoreConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(2, named("java.util.Set"))),
+                CoreInstrumentation.class.getName() + "$CoreConstructorAdvice");
+    }
 
-  public static class CoreConstructorAdvice {
-    @Advice.OnMethodExit
-    public static void afterConstruct(
-        @Advice.Argument(2) final Set<SeedNode> seedNodes, @Advice.This final Core core) {
-      InstrumentationContext.get(Core.class, String.class)
-          .put(core, SeedNodeHelper.toStringForm(seedNodes));
+    public static class CoreConstructorAdvice {
+        @Advice.OnMethodExit
+        public static void afterConstruct(
+                @Advice.Argument(2) final Set<SeedNode> seedNodes, @Advice.This final Core core) {
+            InstrumentationContext.get(Core.class, String.class).put(core, SeedNodeHelper.toStringForm(seedNodes));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CouchbaseClientDecorator.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CouchbaseClientDecorator.java
index 803b53e7e49..432e337eac5 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CouchbaseClientDecorator.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CouchbaseClientDecorator.java
@@ -11,62 +11,62 @@
 import java.util.function.ToIntFunction;
 
 class CouchbaseClientDecorator extends DBTypeProcessingDatabaseClientDecorator {
-  private static final String DB_TYPE = "couchbase";
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().database().service(DB_TYPE);
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
-  public static final CharSequence COUCHBASE_CLIENT = UTF8BytesString.create("couchbase-client");
-  public static final CouchbaseClientDecorator DECORATE = new CouchbaseClientDecorator();
+    private static final String DB_TYPE = "couchbase";
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().database().service(DB_TYPE);
+    public static final CharSequence OPERATION_NAME = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
+    public static final CharSequence COUCHBASE_CLIENT = UTF8BytesString.create("couchbase-client");
+    public static final CouchbaseClientDecorator DECORATE = new CouchbaseClientDecorator();
 
-  private static final Function<String, UTF8BytesString> NORMALIZE = SQLNormalizer::normalize;
-  private static final int COMBINED_STATEMENT_LIMIT = 2 * 1024 * 1024; // characters
+    private static final Function<String, UTF8BytesString> NORMALIZE = SQLNormalizer::normalize;
+    private static final int COMBINED_STATEMENT_LIMIT = 2 * 1024 * 1024; // characters
 
-  private static final ToIntFunction<UTF8BytesString> STATEMENT_WEIGHER = UTF8BytesString::length;
-  private static final DDCache<String, UTF8BytesString> CACHED_STATEMENTS =
-      DDCaches.newFixedSizeWeightedCache(512, STATEMENT_WEIGHER, COMBINED_STATEMENT_LIMIT);
+    private static final ToIntFunction<UTF8BytesString> STATEMENT_WEIGHER = UTF8BytesString::length;
+    private static final DDCache<String, UTF8BytesString> CACHED_STATEMENTS =
+            DDCaches.newFixedSizeWeightedCache(512, STATEMENT_WEIGHER, COMBINED_STATEMENT_LIMIT);
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"couchbase"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"couchbase"};
+    }
 
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return COUCHBASE_CLIENT;
-  }
+    @Override
+    protected CharSequence component() {
+        return COUCHBASE_CLIENT;
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.COUCHBASE;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.COUCHBASE;
+    }
 
-  @Override
-  protected String dbType() {
-    return DB_TYPE;
-  }
+    @Override
+    protected String dbType() {
+        return DB_TYPE;
+    }
 
-  @Override
-  protected String dbUser(final Object o) {
-    return null;
-  }
+    @Override
+    protected String dbUser(final Object o) {
+        return null;
+    }
 
-  @Override
-  protected String dbInstance(final Object o) {
-    return null;
-  }
+    @Override
+    protected String dbInstance(final Object o) {
+        return null;
+    }
 
-  @Override
-  protected String dbHostname(Object o) {
-    return null;
-  }
+    @Override
+    protected String dbHostname(Object o) {
+        return null;
+    }
 
-  protected static UTF8BytesString normalizedQuery(String sql) {
-    return CACHED_STATEMENTS.computeIfAbsent(sql, NORMALIZE);
-  }
+    protected static UTF8BytesString normalizedQuery(String sql) {
+        return CACHED_STATEMENTS.computeIfAbsent(sql, NORMALIZE);
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestSpan.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestSpan.java
index 0e4af4d1373..e5388980cab 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestSpan.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestSpan.java
@@ -13,170 +13,167 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class DatadogRequestSpan implements RequestSpan, StatusSettable<Integer> {
-  private final AgentSpan span;
-
-  // We need to keep track of the paren spans to propagate error information
-  private DatadogRequestSpan parent;
-
-  private final ContextStore<Core, String> coreContext;
-
-  // The interaction between error setting in StatusSettingCompletableFuture and the span is a bit
-  // involved since we need to make sure that we don't finish the span before we have set the error
-  // on it. That's why we have a counter here and let the status setting code finish the span if
-  // the code tried to finish the span while the completable future was completed.
-  private AtomicInteger endCounter = new AtomicInteger(0);
-
-  // The code in DefaultErrorUtil is sometimes run from inside the completion of a completable
-  // future, so we need to ensure that the completion of the future does not overwrite the error
-  private AtomicBoolean statusSet = new AtomicBoolean(false);
-
-  private DatadogRequestSpan(AgentSpan span, final ContextStore<Core, String> coreContext) {
-    this.span = span;
-    this.coreContext = coreContext;
-  }
-
-  public static DatadogRequestSpan wrap(
-      AgentSpan span, final ContextStore<Core, String> coreContext) {
-    return new DatadogRequestSpan(span, coreContext);
-  }
-
-  public static AgentSpan unwrap(RequestSpan span) {
-    if (span == null) {
-      return null;
-    }
-    if (span instanceof DatadogRequestSpan) {
-      return ((DatadogRequestSpan) span).span;
-    } else {
-      throw new IllegalArgumentException("RequestSpan must be of type DatadogRequestSpan");
-    }
-  }
-
-  public void setParent(RequestSpan parent) {
-    if (endCounter.get() == 0) {
-      if (parent instanceof DatadogRequestSpan) {
-        this.parent = (DatadogRequestSpan) parent;
-      }
-    }
-  }
-
-  @Override
-  public void setAttribute(String key, String value) {
-    // TODO when `db.statement` is set here it will be intercepted by the TagInterceptor, so any
-    //  sort of obfuscation should go in there, preferably as a lazy sort of Utf8String that does
-    //  the actual work at the end
-    if ("db.statement".equals(key)) {
-      span.setTag(key, CouchbaseClientDecorator.normalizedQuery(value));
-    } else {
-      span.setTag(key, value);
-    }
-  }
-
-  // This method shows up in later versions
-  public void setAttribute(String key, boolean value) {
-    span.setTag(key, value);
-  }
-
-  // This method shows up in later versions
-  public void setAttribute(String key, long value) {
-    span.setTag(key, value);
-  }
-
-  // This method shows up in later versions
-  public void attribute(String key, String value) {
-    setAttribute(key, value);
-  }
-
-  // This method shows up in later versions
-  public void attribute(String key, boolean value) {
-    setAttribute(key, value);
-  }
-
-  // This method shows up in later versions
-  public void attribute(String key, long value) {
-    setAttribute(key, value);
-  }
-
-  @Override
-  public void addEvent(String name, Instant timestamp) {
-    // TODO event support would be nice
-  }
-
-  // This method shows up in later versions
-  public void event(String name, Instant timestamp) {
-    addEvent(name, timestamp);
-  }
-
-  @Override
-  public void end() {
-    if (endCounter.getAndIncrement() == 0) {
-      endInternal();
-    }
-  }
-
-  private void endInternal() {
-    CouchbaseClientDecorator.DECORATE.beforeFinish(span);
-    span.finish();
-  }
-
-  @Override
-  public void requestContext(RequestContext requestContext) {
-    span.setTag(InstrumentationTags.COUCHBASE_SEED_NODES, coreContext.get(requestContext.core()));
-  }
-
-  private boolean shouldSetStatus() {
-    return statusSet.compareAndSet(false, true);
-  }
-
-  @Override
-  public Integer statusStart() {
-    return endCounter.getAndIncrement();
-  }
-
-  @Override
-  public void statusFinished(Integer context) {
-    int current = endCounter.decrementAndGet();
-    if (current > 0 && context == 0) {
-      // There was an attempt to end the RequestSpan while we were in status processing, so end it
-      this.endInternal();
-    }
-  }
-
-  @Override
-  public void setSuccess(Integer context) {
-    // We can get a call to setSuccess from StatusSettingCompletableFuture before we intercept an
-    // exception.
-    // So do nothing here.
-  }
-
-  @Override
-  public void setError(Integer context, Throwable throwable) {
-    if (context == 0) {
-      setErrorDirectly(throwable);
-    }
-  }
-
-  public void setErrorDirectly(Throwable throwable) {
-    if (shouldSetStatus()) {
-      this.span.setError(true);
-      this.span.addThrowable(throwable);
-      if (null != parent) {
-        parent.setErrorDirectly(
-            span.getTag(DDTags.ERROR_MSG),
-            span.getTag(DDTags.ERROR_TYPE),
-            span.getTag(DDTags.ERROR_STACK));
-      }
-    }
-  }
-
-  private void setErrorDirectly(Object errorMsg, Object errorType, Object errorStack) {
-    if (shouldSetStatus()) {
-      span.setError(true);
-      span.setTag(DDTags.ERROR_MSG, errorMsg);
-      span.setTag(DDTags.ERROR_TYPE, errorType);
-      span.setTag(DDTags.ERROR_STACK, errorStack);
-      if (null != parent) {
-        parent.setErrorDirectly(errorMsg, errorType, errorStack);
-      }
-    }
-  }
+    private final AgentSpan span;
+
+    // We need to keep track of the paren spans to propagate error information
+    private DatadogRequestSpan parent;
+
+    private final ContextStore<Core, String> coreContext;
+
+    // The interaction between error setting in StatusSettingCompletableFuture and the span is a bit
+    // involved since we need to make sure that we don't finish the span before we have set the error
+    // on it. That's why we have a counter here and let the status setting code finish the span if
+    // the code tried to finish the span while the completable future was completed.
+    private AtomicInteger endCounter = new AtomicInteger(0);
+
+    // The code in DefaultErrorUtil is sometimes run from inside the completion of a completable
+    // future, so we need to ensure that the completion of the future does not overwrite the error
+    private AtomicBoolean statusSet = new AtomicBoolean(false);
+
+    private DatadogRequestSpan(AgentSpan span, final ContextStore<Core, String> coreContext) {
+        this.span = span;
+        this.coreContext = coreContext;
+    }
+
+    public static DatadogRequestSpan wrap(AgentSpan span, final ContextStore<Core, String> coreContext) {
+        return new DatadogRequestSpan(span, coreContext);
+    }
+
+    public static AgentSpan unwrap(RequestSpan span) {
+        if (span == null) {
+            return null;
+        }
+        if (span instanceof DatadogRequestSpan) {
+            return ((DatadogRequestSpan) span).span;
+        } else {
+            throw new IllegalArgumentException("RequestSpan must be of type DatadogRequestSpan");
+        }
+    }
+
+    public void setParent(RequestSpan parent) {
+        if (endCounter.get() == 0) {
+            if (parent instanceof DatadogRequestSpan) {
+                this.parent = (DatadogRequestSpan) parent;
+            }
+        }
+    }
+
+    @Override
+    public void setAttribute(String key, String value) {
+        // TODO when `db.statement` is set here it will be intercepted by the TagInterceptor, so any
+        //  sort of obfuscation should go in there, preferably as a lazy sort of Utf8String that does
+        //  the actual work at the end
+        if ("db.statement".equals(key)) {
+            span.setTag(key, CouchbaseClientDecorator.normalizedQuery(value));
+        } else {
+            span.setTag(key, value);
+        }
+    }
+
+    // This method shows up in later versions
+    public void setAttribute(String key, boolean value) {
+        span.setTag(key, value);
+    }
+
+    // This method shows up in later versions
+    public void setAttribute(String key, long value) {
+        span.setTag(key, value);
+    }
+
+    // This method shows up in later versions
+    public void attribute(String key, String value) {
+        setAttribute(key, value);
+    }
+
+    // This method shows up in later versions
+    public void attribute(String key, boolean value) {
+        setAttribute(key, value);
+    }
+
+    // This method shows up in later versions
+    public void attribute(String key, long value) {
+        setAttribute(key, value);
+    }
+
+    @Override
+    public void addEvent(String name, Instant timestamp) {
+        // TODO event support would be nice
+    }
+
+    // This method shows up in later versions
+    public void event(String name, Instant timestamp) {
+        addEvent(name, timestamp);
+    }
+
+    @Override
+    public void end() {
+        if (endCounter.getAndIncrement() == 0) {
+            endInternal();
+        }
+    }
+
+    private void endInternal() {
+        CouchbaseClientDecorator.DECORATE.beforeFinish(span);
+        span.finish();
+    }
+
+    @Override
+    public void requestContext(RequestContext requestContext) {
+        span.setTag(InstrumentationTags.COUCHBASE_SEED_NODES, coreContext.get(requestContext.core()));
+    }
+
+    private boolean shouldSetStatus() {
+        return statusSet.compareAndSet(false, true);
+    }
+
+    @Override
+    public Integer statusStart() {
+        return endCounter.getAndIncrement();
+    }
+
+    @Override
+    public void statusFinished(Integer context) {
+        int current = endCounter.decrementAndGet();
+        if (current > 0 && context == 0) {
+            // There was an attempt to end the RequestSpan while we were in status processing, so end it
+            this.endInternal();
+        }
+    }
+
+    @Override
+    public void setSuccess(Integer context) {
+        // We can get a call to setSuccess from StatusSettingCompletableFuture before we intercept an
+        // exception.
+        // So do nothing here.
+    }
+
+    @Override
+    public void setError(Integer context, Throwable throwable) {
+        if (context == 0) {
+            setErrorDirectly(throwable);
+        }
+    }
+
+    public void setErrorDirectly(Throwable throwable) {
+        if (shouldSetStatus()) {
+            this.span.setError(true);
+            this.span.addThrowable(throwable);
+            if (null != parent) {
+                parent.setErrorDirectly(
+                        span.getTag(DDTags.ERROR_MSG), span.getTag(DDTags.ERROR_TYPE), span.getTag(DDTags.ERROR_STACK));
+            }
+        }
+    }
+
+    private void setErrorDirectly(Object errorMsg, Object errorType, Object errorStack) {
+        if (shouldSetStatus()) {
+            span.setError(true);
+            span.setTag(DDTags.ERROR_MSG, errorMsg);
+            span.setTag(DDTags.ERROR_TYPE, errorType);
+            span.setTag(DDTags.ERROR_STACK, errorStack);
+            if (null != parent) {
+                parent.setErrorDirectly(errorMsg, errorType, errorStack);
+            }
+        }
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestTracer.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestTracer.java
index bd508d4bd85..d0c46ddfe71 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestTracer.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestTracer.java
@@ -17,62 +17,60 @@
 import reactor.core.publisher.Mono;
 
 public class DatadogRequestTracer implements RequestTracer {
-  private static final CharSequence COUCHBASE_INTERNAL =
-      UTF8BytesString.create("couchbase.internal");
+    private static final CharSequence COUCHBASE_INTERNAL = UTF8BytesString.create("couchbase.internal");
 
-  private final AgentTracer.TracerAPI tracer;
-  private final ContextStore<Core, String> coreContext;
+    private final AgentTracer.TracerAPI tracer;
+    private final ContextStore<Core, String> coreContext;
 
-  public DatadogRequestTracer(
-      AgentTracer.TracerAPI tracer, final ContextStore<Core, String> coreContext) {
-    this.tracer = tracer;
-    this.coreContext = coreContext;
-  }
+    public DatadogRequestTracer(AgentTracer.TracerAPI tracer, final ContextStore<Core, String> coreContext) {
+        this.tracer = tracer;
+        this.coreContext = coreContext;
+    }
 
-  @Override
-  public RequestSpan requestSpan(String requestName, RequestSpan requestParent) {
-    CharSequence spanName = CouchbaseClientDecorator.OPERATION_NAME;
-    boolean measured = true;
-    Object seedNodes = null;
+    @Override
+    public RequestSpan requestSpan(String requestName, RequestSpan requestParent) {
+        CharSequence spanName = CouchbaseClientDecorator.OPERATION_NAME;
+        boolean measured = true;
+        Object seedNodes = null;
 
-    AgentSpan parent = DatadogRequestSpan.unwrap(requestParent);
-    if (null == parent) {
-      parent = tracer.activeSpan();
-    }
+        AgentSpan parent = DatadogRequestSpan.unwrap(requestParent);
+        if (null == parent) {
+            parent = tracer.activeSpan();
+        }
 
-    if (null != parent && COUCHBASE_CLIENT.equals(parent.getTag(Tags.COMPONENT))) {
-      if (!Config.get().isCouchbaseInternalSpansEnabled()) {
-        // mute the tracing related to internal spans
-        return DatadogRequestSpan.wrap(blackholeSpan(), coreContext);
-      }
-      spanName = COUCHBASE_INTERNAL;
-      measured = false;
-      seedNodes = parent.getTag(InstrumentationTags.COUCHBASE_SEED_NODES);
-    }
+        if (null != parent && COUCHBASE_CLIENT.equals(parent.getTag(Tags.COMPONENT))) {
+            if (!Config.get().isCouchbaseInternalSpansEnabled()) {
+                // mute the tracing related to internal spans
+                return DatadogRequestSpan.wrap(blackholeSpan(), coreContext);
+            }
+            spanName = COUCHBASE_INTERNAL;
+            measured = false;
+            seedNodes = parent.getTag(InstrumentationTags.COUCHBASE_SEED_NODES);
+        }
 
-    AgentTracer.SpanBuilder builder = tracer.singleSpanBuilder("couchbase", spanName);
-    if (null != parent) {
-      builder.asChildOf(parent.spanContext());
+        AgentTracer.SpanBuilder builder = tracer.singleSpanBuilder("couchbase", spanName);
+        if (null != parent) {
+            builder.asChildOf(parent.spanContext());
+        }
+        AgentSpan span = builder.start();
+        CouchbaseClientDecorator.DECORATE.afterStart(span);
+        span.setResourceName(requestName);
+        span.setMeasured(measured);
+        DatadogRequestSpan requestSpan = DatadogRequestSpan.wrap(span, coreContext);
+        requestSpan.setParent(requestParent);
+        if (seedNodes != null) {
+            span.setTag(InstrumentationTags.COUCHBASE_SEED_NODES, seedNodes);
+        }
+        return requestSpan;
     }
-    AgentSpan span = builder.start();
-    CouchbaseClientDecorator.DECORATE.afterStart(span);
-    span.setResourceName(requestName);
-    span.setMeasured(measured);
-    DatadogRequestSpan requestSpan = DatadogRequestSpan.wrap(span, coreContext);
-    requestSpan.setParent(requestParent);
-    if (seedNodes != null) {
-      span.setTag(InstrumentationTags.COUCHBASE_SEED_NODES, seedNodes);
-    }
-    return requestSpan;
-  }
 
-  @Override
-  public Mono<Void> start() {
-    return Mono.empty(); // Tracer already exists
-  }
+    @Override
+    public Mono<Void> start() {
+        return Mono.empty(); // Tracer already exists
+    }
 
-  @Override
-  public Mono<Void> stop(Duration timeout) {
-    return Mono.empty(); // Tracer should continue to exist
-  }
+    @Override
+    public Mono<Void> stop(Duration timeout) {
+        return Mono.empty(); // Tracer should continue to exist
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilAdvice.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilAdvice.java
index 4ae83a5530e..a28389f1b47 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilAdvice.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilAdvice.java
@@ -6,14 +6,13 @@
 import net.bytebuddy.asm.Advice;
 
 public class DefaultErrorUtilAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit(
-      @Advice.Argument(0) KeyValueRequest<?> request, @Advice.Return CouchbaseException ex) {
-    if (null != request) {
-      RequestSpan requestSpan = request.requestSpan();
-      if (requestSpan instanceof DatadogRequestSpan) {
-        ((DatadogRequestSpan) requestSpan).setErrorDirectly(ex);
-      }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(@Advice.Argument(0) KeyValueRequest<?> request, @Advice.Return CouchbaseException ex) {
+        if (null != request) {
+            RequestSpan requestSpan = request.requestSpan();
+            if (requestSpan instanceof DatadogRequestSpan) {
+                ((DatadogRequestSpan) requestSpan).setErrorDirectly(ex);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilInstrumentation.java
index 0071856ac07..cbcc4f03010 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilInstrumentation.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilInstrumentation.java
@@ -11,34 +11,32 @@
 
 @AutoService(InstrumenterModule.class)
 public class DefaultErrorUtilInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public DefaultErrorUtilInstrumentation() {
-    super("couchbase", "couchbase-3");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.couchbase.client.core.error.DefaultErrorUtil";
-  }
-
-  private static final Reference TRACING_IDENTIFIERS_REFERENCE =
-      new Reference.Builder("com.couchbase.client.core.cnc.TracingIdentifiers").build();
-
-  private static final Reference SUSPICIOUS_EXPIRY_REFERENCE =
-      new Reference.Builder(
-              "com.couchbase.client.core.cnc.events.request.SuspiciousExpiryDurationEvent")
-          .build();
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {TRACING_IDENTIFIERS_REFERENCE, SUSPICIOUS_EXPIRY_REFERENCE};
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isStatic().and(isMethod()).and(named("keyValueStatusToException")),
-        packageName + ".DefaultErrorUtilAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public DefaultErrorUtilInstrumentation() {
+        super("couchbase", "couchbase-3");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "com.couchbase.client.core.error.DefaultErrorUtil";
+    }
+
+    private static final Reference TRACING_IDENTIFIERS_REFERENCE =
+            new Reference.Builder("com.couchbase.client.core.cnc.TracingIdentifiers").build();
+
+    private static final Reference SUSPICIOUS_EXPIRY_REFERENCE =
+            new Reference.Builder("com.couchbase.client.core.cnc.events.request.SuspiciousExpiryDurationEvent").build();
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {TRACING_IDENTIFIERS_REFERENCE, SUSPICIOUS_EXPIRY_REFERENCE};
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isStatic().and(isMethod()).and(named("keyValueStatusToException")),
+                packageName + ".DefaultErrorUtilAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/SeedNodeHelper.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/SeedNodeHelper.java
index 64981d01f83..045e6d501f9 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/SeedNodeHelper.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/SeedNodeHelper.java
@@ -5,7 +5,7 @@
 import java.util.stream.Collectors;
 
 public class SeedNodeHelper {
-  public static String toStringForm(final Set<SeedNode> seedNodes) {
-    return seedNodes.stream().map(SeedNode::address).distinct().collect(Collectors.joining(","));
-  }
+    public static String toStringForm(final Set<SeedNode> seedNodes) {
+        return seedNodes.stream().map(SeedNode::address).distinct().collect(Collectors.joining(","));
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestAdvice.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestAdvice.java
index 0c2fd84e526..c24fa8bcbc4 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestAdvice.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestAdvice.java
@@ -6,17 +6,17 @@
 import net.bytebuddy.asm.Advice;
 
 public class BaseRequestAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit(
-      @Advice.FieldValue(value = "response", readOnly = false) CompletableFuture<?> response,
-      @Advice.FieldValue(value = "requestSpan") RequestSpan requestSpan) {
-    if (requestSpan instanceof DatadogRequestSpan) {
-      response = new StatusSettingCompletableFuture<>((DatadogRequestSpan) requestSpan);
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(
+            @Advice.FieldValue(value = "response", readOnly = false) CompletableFuture<?> response,
+            @Advice.FieldValue(value = "requestSpan") RequestSpan requestSpan) {
+        if (requestSpan instanceof DatadogRequestSpan) {
+            response = new StatusSettingCompletableFuture<>((DatadogRequestSpan) requestSpan);
+        }
     }
-  }
 
-  // Use this to not apply instrumentation on [2,3.2)
-  private static void muzzleCheck(RequestSpan requestSpan) {
-    requestSpan.status(RequestSpan.StatusCode.ERROR);
-  }
+    // Use this to not apply instrumentation on [2,3.2)
+    private static void muzzleCheck(RequestSpan requestSpan) {
+        requestSpan.status(RequestSpan.StatusCode.ERROR);
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestInstrumentation.java
index 73cb1a26ddb..9062195b08c 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestInstrumentation.java
@@ -9,20 +9,19 @@
 
 @AutoService(InstrumenterModule.class)
 public class BaseRequestInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public BaseRequestInstrumentation() {
-    super("couchbase", "couchbase-3");
-  }
+    public BaseRequestInstrumentation() {
+        super("couchbase", "couchbase-3");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.couchbase.client.core.msg.BaseRequest";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.couchbase.client.core.msg.BaseRequest";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArguments(4)), packageName + ".BaseRequestAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor().and(takesArguments(4)), packageName + ".BaseRequestAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/ConnectionStringHelper.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/ConnectionStringHelper.java
index cf7c75772a2..4f7ca8aad0e 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/ConnectionStringHelper.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/ConnectionStringHelper.java
@@ -7,20 +7,18 @@
 import java.util.stream.Collectors;
 
 public class ConnectionStringHelper {
-  private static final DDCache<ConnectionString, String> CONNECTION_STRING_STRING_CACHE =
-      DDCaches.newFixedSizeCache(8);
+    private static final DDCache<ConnectionString, String> CONNECTION_STRING_STRING_CACHE =
+            DDCaches.newFixedSizeCache(8);
 
-  private static final Function<ConnectionString, String> ADDER =
-      cs ->
-          cs.hosts().stream()
-              .map(ConnectionString.UnresolvedSocket::hostname)
-              .distinct()
-              .collect(Collectors.joining(","));
+    private static final Function<ConnectionString, String> ADDER = cs -> cs.hosts().stream()
+            .map(ConnectionString.UnresolvedSocket::hostname)
+            .distinct()
+            .collect(Collectors.joining(","));
 
-  public static String toHostPortList(final ConnectionString connectionString) {
-    if (connectionString == null) {
-      return null;
+    public static String toHostPortList(final ConnectionString connectionString) {
+        if (connectionString == null) {
+            return null;
+        }
+        return CONNECTION_STRING_STRING_CACHE.computeIfAbsent(connectionString, ADDER);
     }
-    return CONNECTION_STRING_STRING_CACHE.computeIfAbsent(connectionString, ADDER);
-  }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderAdvice.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderAdvice.java
index be0092c2873..607dc8f18e6 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderAdvice.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderAdvice.java
@@ -7,10 +7,9 @@
 import net.bytebuddy.asm.Advice;
 
 public class CoreEnvironmentBuilderAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit(@Advice.This CoreEnvironment.Builder<?> builder) {
-    builder.requestTracer(
-        new DatadogRequestTracer(
-            AgentTracer.get(), InstrumentationContext.get(Core.class, String.class)));
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(@Advice.This CoreEnvironment.Builder<?> builder) {
+        builder.requestTracer(
+                new DatadogRequestTracer(AgentTracer.get(), InstrumentationContext.get(Core.class, String.class)));
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderInstrumentation.java
index 42a4996de50..436d63980da 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderInstrumentation.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderInstrumentation.java
@@ -12,27 +12,26 @@
 
 @AutoService(InstrumenterModule.class)
 public class CoreEnvironmentBuilderInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public CoreEnvironmentBuilderInstrumentation() {
-    super("couchbase", "couchbase-3");
-  }
+    public CoreEnvironmentBuilderInstrumentation() {
+        super("couchbase", "couchbase-3");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("com.couchbase.client.core.Core", String.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("com.couchbase.client.core.Core", String.class.getName());
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.couchbase.client.core.env.CoreEnvironment$Builder";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.couchbase.client.core.env.CoreEnvironment$Builder";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), packageName + ".CoreEnvironmentBuilderAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("requestTracer")),
-        packageName + ".CoreEnvironmentBuilderRequestTracerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), packageName + ".CoreEnvironmentBuilderAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("requestTracer")), packageName + ".CoreEnvironmentBuilderRequestTracerAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderRequestTracerAdvice.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderRequestTracerAdvice.java
index a2e7c3473f1..da291d408af 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderRequestTracerAdvice.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderRequestTracerAdvice.java
@@ -8,31 +8,30 @@
 import net.bytebuddy.asm.Advice;
 
 public class CoreEnvironmentBuilderRequestTracerAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void onEnter(
-      @Advice.Argument(value = 0, readOnly = false) RequestTracer requestTracer) {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void onEnter(@Advice.Argument(value = 0, readOnly = false) RequestTracer requestTracer) {
 
-    // already a delegating tracer
-    if (requestTracer instanceof DelegatingRequestTracer) {
-      return;
-    }
+        // already a delegating tracer
+        if (requestTracer instanceof DelegatingRequestTracer) {
+            return;
+        }
 
-    // already a datadog tracer
-    if (requestTracer instanceof DatadogRequestTracer) {
-      return;
-    }
+        // already a datadog tracer
+        if (requestTracer instanceof DatadogRequestTracer) {
+            return;
+        }
 
-    ContextStore<Core, String> coreContext = InstrumentationContext.get(Core.class, String.class);
+        ContextStore<Core, String> coreContext = InstrumentationContext.get(Core.class, String.class);
 
-    DatadogRequestTracer datadogTracer = new DatadogRequestTracer(AgentTracer.get(), coreContext);
+        DatadogRequestTracer datadogTracer = new DatadogRequestTracer(AgentTracer.get(), coreContext);
 
-    // if the app didn't set a custom tracer, use only datadog tracer
-    if (requestTracer == null) {
-      requestTracer = datadogTracer;
-      return;
-    }
+        // if the app didn't set a custom tracer, use only datadog tracer
+        if (requestTracer == null) {
+            requestTracer = datadogTracer;
+            return;
+        }
 
-    // Wrap custom datadog and cnc tracers into a delegating
-    requestTracer = new DelegatingRequestTracer(datadogTracer, requestTracer);
-  }
+        // Wrap custom datadog and cnc tracers into a delegating
+        requestTracer = new DelegatingRequestTracer(datadogTracer, requestTracer);
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreInstrumentation.java
index 97a06b6b174..ee6a76978bf 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreInstrumentation.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreInstrumentation.java
@@ -19,51 +19,49 @@
 
 @AutoService(InstrumenterModule.class)
 public class CoreInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public CoreInstrumentation() {
-    super("couchbase");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.couchbase.client.core.Core";
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public CoreInstrumentation() {
+        super("couchbase");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("com.couchbase.client.core.Core", String.class.getName());
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.couchbase.client.core.Core";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(2, named("java.util.Set"))),
-        CoreInstrumentation.class.getName() + "$CoreConstructorSeedNodeAdvice");
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(2, named("com.couchbase.client.core.util.ConnectionString"))),
-        CoreInstrumentation.class.getName() + "$CoreConstructorConnectionStringAdvice");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("com.couchbase.client.core.Core", String.class.getName());
+    }
 
-  public static class CoreConstructorSeedNodeAdvice {
-    @Advice.OnMethodExit
-    public static void afterConstruct(
-        @Advice.Argument(2) final Set<SeedNode> seedNodes, @Advice.This final Core core) {
-      InstrumentationContext.get(Core.class, String.class)
-          .put(core, SeedNodeHelper.toStringForm(seedNodes));
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(2, named("java.util.Set"))),
+                CoreInstrumentation.class.getName() + "$CoreConstructorSeedNodeAdvice");
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(2, named("com.couchbase.client.core.util.ConnectionString"))),
+                CoreInstrumentation.class.getName() + "$CoreConstructorConnectionStringAdvice");
     }
 
-    public static void muzzleCheck(RequestSpan requestSpan) {
-      requestSpan.status(RequestSpan.StatusCode.ERROR);
+    public static class CoreConstructorSeedNodeAdvice {
+        @Advice.OnMethodExit
+        public static void afterConstruct(
+                @Advice.Argument(2) final Set<SeedNode> seedNodes, @Advice.This final Core core) {
+            InstrumentationContext.get(Core.class, String.class).put(core, SeedNodeHelper.toStringForm(seedNodes));
+        }
+
+        public static void muzzleCheck(RequestSpan requestSpan) {
+            requestSpan.status(RequestSpan.StatusCode.ERROR);
+        }
     }
-  }
 
-  public static class CoreConstructorConnectionStringAdvice {
-    @Advice.OnMethodExit
-    public static void afterConstruct(
-        @Advice.Argument(2) final ConnectionString connectionString, @Advice.This final Core core) {
-      InstrumentationContext.get(Core.class, String.class)
-          .put(core, ConnectionStringHelper.toHostPortList(connectionString));
+    public static class CoreConstructorConnectionStringAdvice {
+        @Advice.OnMethodExit
+        public static void afterConstruct(
+                @Advice.Argument(2) final ConnectionString connectionString, @Advice.This final Core core) {
+            InstrumentationContext.get(Core.class, String.class)
+                    .put(core, ConnectionStringHelper.toHostPortList(connectionString));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CouchbaseClientDecorator.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CouchbaseClientDecorator.java
index 642f88eb739..de9d1099998 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CouchbaseClientDecorator.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CouchbaseClientDecorator.java
@@ -11,62 +11,62 @@
 import java.util.function.ToIntFunction;
 
 class CouchbaseClientDecorator extends DBTypeProcessingDatabaseClientDecorator {
-  private static final String DB_TYPE = "couchbase";
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().database().service(DB_TYPE);
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
-  public static final CharSequence COUCHBASE_CLIENT = UTF8BytesString.create("couchbase-client");
-  public static final CouchbaseClientDecorator DECORATE = new CouchbaseClientDecorator();
+    private static final String DB_TYPE = "couchbase";
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().database().service(DB_TYPE);
+    public static final CharSequence OPERATION_NAME = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
+    public static final CharSequence COUCHBASE_CLIENT = UTF8BytesString.create("couchbase-client");
+    public static final CouchbaseClientDecorator DECORATE = new CouchbaseClientDecorator();
 
-  private static final Function<String, UTF8BytesString> NORMALIZE = SQLNormalizer::normalize;
-  private static final int COMBINED_STATEMENT_LIMIT = 2 * 1024 * 1024; // characters
+    private static final Function<String, UTF8BytesString> NORMALIZE = SQLNormalizer::normalize;
+    private static final int COMBINED_STATEMENT_LIMIT = 2 * 1024 * 1024; // characters
 
-  private static final ToIntFunction<UTF8BytesString> STATEMENT_WEIGHER = UTF8BytesString::length;
-  private static final DDCache<String, UTF8BytesString> CACHED_STATEMENTS =
-      DDCaches.newFixedSizeWeightedCache(512, STATEMENT_WEIGHER, COMBINED_STATEMENT_LIMIT);
+    private static final ToIntFunction<UTF8BytesString> STATEMENT_WEIGHER = UTF8BytesString::length;
+    private static final DDCache<String, UTF8BytesString> CACHED_STATEMENTS =
+            DDCaches.newFixedSizeWeightedCache(512, STATEMENT_WEIGHER, COMBINED_STATEMENT_LIMIT);
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"couchbase"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"couchbase"};
+    }
 
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return COUCHBASE_CLIENT;
-  }
+    @Override
+    protected CharSequence component() {
+        return COUCHBASE_CLIENT;
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.COUCHBASE;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.COUCHBASE;
+    }
 
-  @Override
-  protected String dbType() {
-    return DB_TYPE;
-  }
+    @Override
+    protected String dbType() {
+        return DB_TYPE;
+    }
 
-  @Override
-  protected String dbUser(final Object o) {
-    return null;
-  }
+    @Override
+    protected String dbUser(final Object o) {
+        return null;
+    }
 
-  @Override
-  protected String dbInstance(final Object o) {
-    return null;
-  }
+    @Override
+    protected String dbInstance(final Object o) {
+        return null;
+    }
 
-  @Override
-  protected String dbHostname(Object o) {
-    return null;
-  }
+    @Override
+    protected String dbHostname(Object o) {
+        return null;
+    }
 
-  protected static UTF8BytesString normalizedQuery(String sql) {
-    return CACHED_STATEMENTS.computeIfAbsent(sql, NORMALIZE);
-  }
+    protected static UTF8BytesString normalizedQuery(String sql) {
+        return CACHED_STATEMENTS.computeIfAbsent(sql, NORMALIZE);
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestSpan.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestSpan.java
index 11d452bf45d..21946547345 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestSpan.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestSpan.java
@@ -13,183 +13,180 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class DatadogRequestSpan implements RequestSpan, StatusSettable<Integer> {
-  private final AgentSpan span;
-  private final ContextStore<Core, String> coreContext;
-
-  // When a QueryRequest is converted into a prepare or execute request, then we need to close
-  // the parent span as well, since Couchbase drops it on the floor
-  private DatadogRequestSpan convertedParent;
-  private DatadogRequestSpan convertedChild;
-
-  // The interaction between error setting in StatusSettingCompletableFuture and the span is a bit
-  // involved since we need to make sure that we don't finish the span before we have set the error
-  // on it. That's why we have a counter here and let the status setting code finish the span if
-  // the code tried to finish the span while the completable future was completed.
-  private AtomicInteger endCounter = new AtomicInteger(0);
-
-  // The code in DefaultErrorUtil is sometimes run from inside the completion of a completable
-  // future, so we need to ensure that the completion of the future does not overwrite the error
-  private AtomicBoolean statusSet = new AtomicBoolean(false);
-
-  private DatadogRequestSpan(AgentSpan span, final ContextStore<Core, String> coreContext) {
-    this.span = span;
-    this.coreContext = coreContext;
-  }
-
-  public static DatadogRequestSpan wrap(
-      AgentSpan span, final ContextStore<Core, String> coreContext) {
-    return new DatadogRequestSpan(span, coreContext);
-  }
-
-  public static AgentSpan unwrap(RequestSpan span) {
-    if (span == null) {
-      return null;
-    }
-    if (span instanceof DatadogRequestSpan) {
-      return ((DatadogRequestSpan) span).span;
-    } else {
-      throw new IllegalArgumentException("RequestSpan must be of type DatadogRequestSpan");
-    }
-  }
-
-  public void setConvertedParent(RequestSpan convertedParent) {
-    if (endCounter.get() == 0) {
-      if (convertedParent instanceof DatadogRequestSpan) {
-        // We need to keep track of previously converted child spans since a query
-        // that is converted to an execute statement will create a prepare-span
-        // which will be a converted child, but it will never get finished
-        DatadogRequestSpan parent = (DatadogRequestSpan) convertedParent;
-        this.convertedParent = parent;
-        DatadogRequestSpan previous = parent.convertedChild;
-        parent.convertedChild = this;
-        if (null != previous) {
-          previous.setConvertedParent(null);
-          previous.end();
+    private final AgentSpan span;
+    private final ContextStore<Core, String> coreContext;
+
+    // When a QueryRequest is converted into a prepare or execute request, then we need to close
+    // the parent span as well, since Couchbase drops it on the floor
+    private DatadogRequestSpan convertedParent;
+    private DatadogRequestSpan convertedChild;
+
+    // The interaction between error setting in StatusSettingCompletableFuture and the span is a bit
+    // involved since we need to make sure that we don't finish the span before we have set the error
+    // on it. That's why we have a counter here and let the status setting code finish the span if
+    // the code tried to finish the span while the completable future was completed.
+    private AtomicInteger endCounter = new AtomicInteger(0);
+
+    // The code in DefaultErrorUtil is sometimes run from inside the completion of a completable
+    // future, so we need to ensure that the completion of the future does not overwrite the error
+    private AtomicBoolean statusSet = new AtomicBoolean(false);
+
+    private DatadogRequestSpan(AgentSpan span, final ContextStore<Core, String> coreContext) {
+        this.span = span;
+        this.coreContext = coreContext;
+    }
+
+    public static DatadogRequestSpan wrap(AgentSpan span, final ContextStore<Core, String> coreContext) {
+        return new DatadogRequestSpan(span, coreContext);
+    }
+
+    public static AgentSpan unwrap(RequestSpan span) {
+        if (span == null) {
+            return null;
+        }
+        if (span instanceof DatadogRequestSpan) {
+            return ((DatadogRequestSpan) span).span;
+        } else {
+            throw new IllegalArgumentException("RequestSpan must be of type DatadogRequestSpan");
+        }
+    }
+
+    public void setConvertedParent(RequestSpan convertedParent) {
+        if (endCounter.get() == 0) {
+            if (convertedParent instanceof DatadogRequestSpan) {
+                // We need to keep track of previously converted child spans since a query
+                // that is converted to an execute statement will create a prepare-span
+                // which will be a converted child, but it will never get finished
+                DatadogRequestSpan parent = (DatadogRequestSpan) convertedParent;
+                this.convertedParent = parent;
+                DatadogRequestSpan previous = parent.convertedChild;
+                parent.convertedChild = this;
+                if (null != previous) {
+                    previous.setConvertedParent(null);
+                    previous.end();
+                }
+            } else {
+                this.convertedParent = null;
+            }
+        }
+    }
+
+    @Override
+    public void attribute(String key, String value) {
+        // TODO when `db.statement` is set here it will be intercepted by the TagInterceptor, so any
+        //  sort of obfuscation should go in there, preferably as a lazy sort of Utf8String that does
+        //  the actual work at the end
+        if ("db.statement".equals(key)) {
+            span.setTag(key, CouchbaseClientDecorator.normalizedQuery(value));
+        } else {
+            span.setTag(key, value);
+        }
+    }
+
+    @Override
+    public void attribute(String key, boolean value) {
+        span.setTag(key, value);
+    }
+
+    @Override
+    public void attribute(String key, long value) {
+        span.setTag(key, value);
+    }
+
+    @Override
+    public void event(String name, Instant timestamp) {
+        // TODO event support would be nice
+    }
+
+    @Override
+    public void status(StatusCode status) {
+        if (status == null) {
+            return;
+        }
+        switch (status) {
+            case OK:
+                span.setError(false);
+                break;
+            case ERROR:
+                span.setError(true);
+                break;
+            default:
+        }
+    }
+
+    @Override
+    public void end() {
+        if (endCounter.getAndIncrement() == 0) {
+            endInternal();
         }
-      } else {
-        this.convertedParent = null;
-      }
-    }
-  }
-
-  @Override
-  public void attribute(String key, String value) {
-    // TODO when `db.statement` is set here it will be intercepted by the TagInterceptor, so any
-    //  sort of obfuscation should go in there, preferably as a lazy sort of Utf8String that does
-    //  the actual work at the end
-    if ("db.statement".equals(key)) {
-      span.setTag(key, CouchbaseClientDecorator.normalizedQuery(value));
-    } else {
-      span.setTag(key, value);
-    }
-  }
-
-  @Override
-  public void attribute(String key, boolean value) {
-    span.setTag(key, value);
-  }
-
-  @Override
-  public void attribute(String key, long value) {
-    span.setTag(key, value);
-  }
-
-  @Override
-  public void event(String name, Instant timestamp) {
-    // TODO event support would be nice
-  }
-
-  @Override
-  public void status(StatusCode status) {
-    if (status == null) {
-      return;
-    }
-    switch (status) {
-      case OK:
-        span.setError(false);
-        break;
-      case ERROR:
-        span.setError(true);
-        break;
-      default:
-    }
-  }
-
-  @Override
-  public void end() {
-    if (endCounter.getAndIncrement() == 0) {
-      endInternal();
-    }
-  }
-
-  private void endInternal() {
-    CouchbaseClientDecorator.DECORATE.beforeFinish(span);
-    span.finish();
-    if (null != convertedParent) {
-      convertedParent.end();
-      convertedParent = null;
-    }
-  }
-
-  @Override
-  public void requestContext(RequestContext requestContext) {
-    span.setTag(InstrumentationTags.COUCHBASE_SEED_NODES, coreContext.get(requestContext.core()));
-  }
-
-  private boolean shouldSetStatus() {
-    return statusSet.compareAndSet(false, true);
-  }
-
-  @Override
-  public Integer statusStart() {
-    return endCounter.getAndIncrement();
-  }
-
-  @Override
-  public void statusFinished(Integer context) {
-    int current = endCounter.decrementAndGet();
-    if (current > 0 && context == 0) {
-      // There was an attempt to end the RequestSpan while we were in status processing, so end it
-      this.endInternal();
-    }
-  }
-
-  @Override
-  public void setSuccess(Integer context) {
-    // We can get a call to setSuccess from StatusSettingCompletableFuture before we intercept an
-    // exception.
-    // So do nothing here.
-  }
-
-  @Override
-  public void setError(Integer context, Throwable throwable) {
-    if (context == 0) {
-      setErrorDirectly(throwable);
-    }
-  }
-
-  public void setErrorDirectly(Throwable throwable) {
-    if (shouldSetStatus()) {
-      this.span.setError(true);
-      this.span.addThrowable(throwable);
-      if (null != convertedParent) {
-        convertedParent.setErrorDirectly(
-            span.getTag(DDTags.ERROR_MSG),
-            span.getTag(DDTags.ERROR_TYPE),
-            span.getTag(DDTags.ERROR_STACK));
-      }
-    }
-  }
-
-  private void setErrorDirectly(Object errorMsg, Object errorType, Object errorStack) {
-    if (shouldSetStatus()) {
-      span.setError(true);
-      span.setTag(DDTags.ERROR_MSG, errorMsg);
-      span.setTag(DDTags.ERROR_TYPE, errorType);
-      span.setTag(DDTags.ERROR_STACK, errorStack);
-      if (null != convertedParent) {
-        convertedParent.setErrorDirectly(errorMsg, errorType, errorStack);
-      }
-    }
-  }
+    }
+
+    private void endInternal() {
+        CouchbaseClientDecorator.DECORATE.beforeFinish(span);
+        span.finish();
+        if (null != convertedParent) {
+            convertedParent.end();
+            convertedParent = null;
+        }
+    }
+
+    @Override
+    public void requestContext(RequestContext requestContext) {
+        span.setTag(InstrumentationTags.COUCHBASE_SEED_NODES, coreContext.get(requestContext.core()));
+    }
+
+    private boolean shouldSetStatus() {
+        return statusSet.compareAndSet(false, true);
+    }
+
+    @Override
+    public Integer statusStart() {
+        return endCounter.getAndIncrement();
+    }
+
+    @Override
+    public void statusFinished(Integer context) {
+        int current = endCounter.decrementAndGet();
+        if (current > 0 && context == 0) {
+            // There was an attempt to end the RequestSpan while we were in status processing, so end it
+            this.endInternal();
+        }
+    }
+
+    @Override
+    public void setSuccess(Integer context) {
+        // We can get a call to setSuccess from StatusSettingCompletableFuture before we intercept an
+        // exception.
+        // So do nothing here.
+    }
+
+    @Override
+    public void setError(Integer context, Throwable throwable) {
+        if (context == 0) {
+            setErrorDirectly(throwable);
+        }
+    }
+
+    public void setErrorDirectly(Throwable throwable) {
+        if (shouldSetStatus()) {
+            this.span.setError(true);
+            this.span.addThrowable(throwable);
+            if (null != convertedParent) {
+                convertedParent.setErrorDirectly(
+                        span.getTag(DDTags.ERROR_MSG), span.getTag(DDTags.ERROR_TYPE), span.getTag(DDTags.ERROR_STACK));
+            }
+        }
+    }
+
+    private void setErrorDirectly(Object errorMsg, Object errorType, Object errorStack) {
+        if (shouldSetStatus()) {
+            span.setError(true);
+            span.setTag(DDTags.ERROR_MSG, errorMsg);
+            span.setTag(DDTags.ERROR_TYPE, errorType);
+            span.setTag(DDTags.ERROR_STACK, errorStack);
+            if (null != convertedParent) {
+                convertedParent.setErrorDirectly(errorMsg, errorType, errorStack);
+            }
+        }
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestTracer.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestTracer.java
index 8463e0e20b9..5cab4fb048e 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestTracer.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestTracer.java
@@ -18,76 +18,74 @@
 import reactor.core.publisher.Mono;
 
 public class DatadogRequestTracer implements RequestTracer {
-  private static final CharSequence COUCHBASE_INTERNAL =
-      UTF8BytesString.create("couchbase.internal");
+    private static final CharSequence COUCHBASE_INTERNAL = UTF8BytesString.create("couchbase.internal");
 
-  private final AgentTracer.TracerAPI tracer;
+    private final AgentTracer.TracerAPI tracer;
 
-  private final ContextStore<Core, String> coreContext;
+    private final ContextStore<Core, String> coreContext;
 
-  public DatadogRequestTracer(
-      AgentTracer.TracerAPI tracer, final ContextStore<Core, String> coreContext) {
-    this.tracer = tracer;
-    this.coreContext = coreContext;
-  }
+    public DatadogRequestTracer(AgentTracer.TracerAPI tracer, final ContextStore<Core, String> coreContext) {
+        this.tracer = tracer;
+        this.coreContext = coreContext;
+    }
 
-  @Override
-  public RequestSpan requestSpan(String requestName, RequestSpan requestParent) {
-    CharSequence spanName = OPERATION_NAME;
-    boolean measured = true;
-    Object seedNodes = null;
+    @Override
+    public RequestSpan requestSpan(String requestName, RequestSpan requestParent) {
+        CharSequence spanName = OPERATION_NAME;
+        boolean measured = true;
+        Object seedNodes = null;
 
-    AgentSpan parent = DatadogRequestSpan.unwrap(requestParent);
-    if (null == parent) {
-      parent = tracer.activeSpan();
-    }
-    DatadogRequestSpan requestSpan = null;
+        AgentSpan parent = DatadogRequestSpan.unwrap(requestParent);
+        if (null == parent) {
+            parent = tracer.activeSpan();
+        }
+        DatadogRequestSpan requestSpan = null;
 
-    if (null != parent && COUCHBASE_CLIENT.equals(parent.getTag(Tags.COMPONENT))) {
-      if (!Config.get().isCouchbaseInternalSpansEnabled()) {
-        // mute the tracing related to internal spans
-        requestSpan = DatadogRequestSpan.wrap(blackholeSpan(), coreContext);
-      } else {
-        spanName = COUCHBASE_INTERNAL;
-        measured = false;
-        seedNodes = parent.getTag(InstrumentationTags.COUCHBASE_SEED_NODES);
-      }
-    }
-    if (requestSpan == null) {
-      AgentTracer.SpanBuilder builder = tracer.singleSpanBuilder("couchbase", spanName);
-      if (null != parent) {
-        builder.asChildOf(parent.spanContext());
-      }
-      AgentSpan span = builder.start();
-      CouchbaseClientDecorator.DECORATE.afterStart(span);
-      span.setResourceName(requestName);
-      span.setMeasured(measured);
-      if (seedNodes != null) {
-        span.setTag(InstrumentationTags.COUCHBASE_SEED_NODES, seedNodes);
-      }
-      requestSpan = DatadogRequestSpan.wrap(span, coreContext);
-    }
-    // When Couchbase converts a query to a prepare statement or execute statement,
-    // it will not finish the original span
-    switch (requestName) {
-      case "prepare":
-      case "execute":
-        requestSpan.setConvertedParent(requestParent);
-        break;
-      default:
-        break;
-    }
+        if (null != parent && COUCHBASE_CLIENT.equals(parent.getTag(Tags.COMPONENT))) {
+            if (!Config.get().isCouchbaseInternalSpansEnabled()) {
+                // mute the tracing related to internal spans
+                requestSpan = DatadogRequestSpan.wrap(blackholeSpan(), coreContext);
+            } else {
+                spanName = COUCHBASE_INTERNAL;
+                measured = false;
+                seedNodes = parent.getTag(InstrumentationTags.COUCHBASE_SEED_NODES);
+            }
+        }
+        if (requestSpan == null) {
+            AgentTracer.SpanBuilder builder = tracer.singleSpanBuilder("couchbase", spanName);
+            if (null != parent) {
+                builder.asChildOf(parent.spanContext());
+            }
+            AgentSpan span = builder.start();
+            CouchbaseClientDecorator.DECORATE.afterStart(span);
+            span.setResourceName(requestName);
+            span.setMeasured(measured);
+            if (seedNodes != null) {
+                span.setTag(InstrumentationTags.COUCHBASE_SEED_NODES, seedNodes);
+            }
+            requestSpan = DatadogRequestSpan.wrap(span, coreContext);
+        }
+        // When Couchbase converts a query to a prepare statement or execute statement,
+        // it will not finish the original span
+        switch (requestName) {
+            case "prepare":
+            case "execute":
+                requestSpan.setConvertedParent(requestParent);
+                break;
+            default:
+                break;
+        }
 
-    return requestSpan;
-  }
+        return requestSpan;
+    }
 
-  @Override
-  public Mono<Void> start() {
-    return Mono.empty(); // Tracer already exists
-  }
+    @Override
+    public Mono<Void> start() {
+        return Mono.empty(); // Tracer already exists
+    }
 
-  @Override
-  public Mono<Void> stop(Duration timeout) {
-    return Mono.empty(); // Tracer should continue to exist
-  }
+    @Override
+    public Mono<Void> stop(Duration timeout) {
+        return Mono.empty(); // Tracer should continue to exist
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilAdvice.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilAdvice.java
index 2376ccdd23a..0c72da01b28 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilAdvice.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilAdvice.java
@@ -6,19 +6,18 @@
 import net.bytebuddy.asm.Advice;
 
 public class DefaultErrorUtilAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit(
-      @Advice.Argument(0) KeyValueRequest<?> request, @Advice.Return CouchbaseException ex) {
-    if (null != request) {
-      RequestSpan requestSpan = request.requestSpan();
-      if (requestSpan instanceof DatadogRequestSpan) {
-        ((DatadogRequestSpan) requestSpan).setErrorDirectly(ex);
-      }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(@Advice.Argument(0) KeyValueRequest<?> request, @Advice.Return CouchbaseException ex) {
+        if (null != request) {
+            RequestSpan requestSpan = request.requestSpan();
+            if (requestSpan instanceof DatadogRequestSpan) {
+                ((DatadogRequestSpan) requestSpan).setErrorDirectly(ex);
+            }
+        }
     }
-  }
 
-  // Use this to not apply instrumentation on [2,3.2)
-  private static void muzzleCheck(RequestSpan requestSpan) {
-    requestSpan.status(RequestSpan.StatusCode.ERROR);
-  }
+    // Use this to not apply instrumentation on [2,3.2)
+    private static void muzzleCheck(RequestSpan requestSpan) {
+        requestSpan.status(RequestSpan.StatusCode.ERROR);
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilInstrumentation.java
index f97cdfcb5dc..cc4ca2f2a79 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilInstrumentation.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilInstrumentation.java
@@ -10,21 +10,21 @@
 
 @AutoService(InstrumenterModule.class)
 public class DefaultErrorUtilInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public DefaultErrorUtilInstrumentation() {
-    super("couchbase", "couchbase-3");
-  }
+    public DefaultErrorUtilInstrumentation() {
+        super("couchbase", "couchbase-3");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.couchbase.client.core.error.DefaultErrorUtil";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.couchbase.client.core.error.DefaultErrorUtil";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isStatic().and(isMethod()).and(named("keyValueStatusToException")),
-        packageName + ".DefaultErrorUtilAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isStatic().and(isMethod()).and(named("keyValueStatusToException")),
+                packageName + ".DefaultErrorUtilAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DelegatingRequestSpan.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DelegatingRequestSpan.java
index eb0cfbc68d1..25de05d6cfc 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DelegatingRequestSpan.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DelegatingRequestSpan.java
@@ -8,65 +8,65 @@
 /** RequestSpan, which delegates all calls to two other RequestSpans */
 public class DelegatingRequestSpan implements RequestSpan {
 
-  private final RequestSpan ddSpan;
-  private final RequestSpan cncSpan;
+    private final RequestSpan ddSpan;
+    private final RequestSpan cncSpan;
 
-  public DelegatingRequestSpan(@Nonnull RequestSpan ddSpan, @Nonnull RequestSpan cncSpan) {
-    this.ddSpan = ddSpan;
-    this.cncSpan = cncSpan;
-  }
+    public DelegatingRequestSpan(@Nonnull RequestSpan ddSpan, @Nonnull RequestSpan cncSpan) {
+        this.ddSpan = ddSpan;
+        this.cncSpan = cncSpan;
+    }
 
-  public RequestSpan getDatadogSpan() {
-    return ddSpan;
-  }
+    public RequestSpan getDatadogSpan() {
+        return ddSpan;
+    }
 
-  public RequestSpan getCncSpan() {
-    return cncSpan;
-  }
+    public RequestSpan getCncSpan() {
+        return cncSpan;
+    }
 
-  @Override
-  public void attribute(String key, String value) {
-    ddSpan.attribute(key, value);
-    cncSpan.attribute(key, value);
-  }
+    @Override
+    public void attribute(String key, String value) {
+        ddSpan.attribute(key, value);
+        cncSpan.attribute(key, value);
+    }
 
-  @Override
-  public void attribute(String key, boolean value) {
-    ddSpan.attribute(key, value);
-    cncSpan.attribute(key, value);
-  }
+    @Override
+    public void attribute(String key, boolean value) {
+        ddSpan.attribute(key, value);
+        cncSpan.attribute(key, value);
+    }
 
-  @Override
-  public void attribute(String key, long value) {
-    ddSpan.attribute(key, value);
-    cncSpan.attribute(key, value);
-  }
+    @Override
+    public void attribute(String key, long value) {
+        ddSpan.attribute(key, value);
+        cncSpan.attribute(key, value);
+    }
 
-  @Override
-  public void event(String name, Instant timestamp) {
-    ddSpan.event(name, timestamp);
-    cncSpan.event(name, timestamp);
-  }
+    @Override
+    public void event(String name, Instant timestamp) {
+        ddSpan.event(name, timestamp);
+        cncSpan.event(name, timestamp);
+    }
 
-  @Override
-  public void status(StatusCode status) {
-    ddSpan.status(status);
-    cncSpan.status(status);
-  }
+    @Override
+    public void status(StatusCode status) {
+        ddSpan.status(status);
+        cncSpan.status(status);
+    }
 
-  @Override
-  public void end() {
-    try {
-      ddSpan.end();
-    } finally {
-      // guarantee cnc spans get ended even if ddSpan.end() throws exception
-      cncSpan.end();
+    @Override
+    public void end() {
+        try {
+            ddSpan.end();
+        } finally {
+            // guarantee cnc spans get ended even if ddSpan.end() throws exception
+            cncSpan.end();
+        }
     }
-  }
 
-  @Override
-  public void requestContext(RequestContext requestContext) {
-    ddSpan.requestContext(requestContext);
-    cncSpan.requestContext(requestContext);
-  }
+    @Override
+    public void requestContext(RequestContext requestContext) {
+        ddSpan.requestContext(requestContext);
+        cncSpan.requestContext(requestContext);
+    }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DelegatingRequestTracer.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DelegatingRequestTracer.java
index 932ffca045a..a828703ae21 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DelegatingRequestTracer.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DelegatingRequestTracer.java
@@ -8,63 +8,63 @@
 
 public class DelegatingRequestTracer implements RequestTracer {
 
-  private final DatadogRequestTracer ddTracer;
-  private final RequestTracer cncTracer;
+    private final DatadogRequestTracer ddTracer;
+    private final RequestTracer cncTracer;
 
-  public DelegatingRequestTracer(DatadogRequestTracer ddTracer, RequestTracer cncTracer) {
-    this.ddTracer = ddTracer;
-    this.cncTracer = cncTracer;
-  }
+    public DelegatingRequestTracer(DatadogRequestTracer ddTracer, RequestTracer cncTracer) {
+        this.ddTracer = ddTracer;
+        this.cncTracer = cncTracer;
+    }
 
-  @Override
-  public RequestSpan requestSpan(String name, RequestSpan parent) {
-    RequestSpan ddParentSpan = unwrapDatadogParentSpan(parent);
-    RequestSpan cncParentSpan = unwrapCncParentSpan(parent);
+    @Override
+    public RequestSpan requestSpan(String name, RequestSpan parent) {
+        RequestSpan ddParentSpan = unwrapDatadogParentSpan(parent);
+        RequestSpan cncParentSpan = unwrapCncParentSpan(parent);
 
-    RequestSpan ddSpan = ddTracer != null ? ddTracer.requestSpan(name, ddParentSpan) : null;
-    RequestSpan cncSpan = cncTracer != null ? cncTracer.requestSpan(name, cncParentSpan) : null;
+        RequestSpan ddSpan = ddTracer != null ? ddTracer.requestSpan(name, ddParentSpan) : null;
+        RequestSpan cncSpan = cncTracer != null ? cncTracer.requestSpan(name, cncParentSpan) : null;
 
-    // no tracers are present - return noop span
-    if (ddSpan == null && cncSpan == null) {
-      return NoopRequestSpan.INSTANCE;
-    }
+        // no tracers are present - return noop span
+        if (ddSpan == null && cncSpan == null) {
+            return NoopRequestSpan.INSTANCE;
+        }
 
-    // only one tracer is present - no need to delegate
-    if (ddSpan == null) {
-      return cncSpan;
-    }
-    if (cncSpan == null) {
-      return ddSpan;
-    }
+        // only one tracer is present - no need to delegate
+        if (ddSpan == null) {
+            return cncSpan;
+        }
+        if (cncSpan == null) {
+            return ddSpan;
+        }
 
-    return new DelegatingRequestSpan(ddSpan, cncSpan);
-  }
+        return new DelegatingRequestSpan(ddSpan, cncSpan);
+    }
 
-  @Override
-  public Mono<Void> start() {
-    Mono<Void> primary = ddTracer != null ? ddTracer.start() : Mono.empty();
-    Mono<Void> secondary = cncTracer != null ? cncTracer.start() : Mono.empty();
-    return Mono.when(primary, secondary);
-  }
+    @Override
+    public Mono<Void> start() {
+        Mono<Void> primary = ddTracer != null ? ddTracer.start() : Mono.empty();
+        Mono<Void> secondary = cncTracer != null ? cncTracer.start() : Mono.empty();
+        return Mono.when(primary, secondary);
+    }
 
-  @Override
-  public Mono<Void> stop(Duration timeout) {
-    Mono<Void> primary = ddTracer != null ? ddTracer.stop(timeout) : Mono.empty();
-    Mono<Void> secondary = cncTracer != null ? cncTracer.stop(timeout) : Mono.empty();
-    return Mono.when(primary, secondary);
-  }
+    @Override
+    public Mono<Void> stop(Duration timeout) {
+        Mono<Void> primary = ddTracer != null ? ddTracer.stop(timeout) : Mono.empty();
+        Mono<Void> secondary = cncTracer != null ? cncTracer.stop(timeout) : Mono.empty();
+        return Mono.when(primary, secondary);
+    }
 
-  private static RequestSpan unwrapDatadogParentSpan(RequestSpan parent) {
-    if (parent instanceof DelegatingRequestSpan) {
-      return ((DelegatingRequestSpan) parent).getDatadogSpan();
+    private static RequestSpan unwrapDatadogParentSpan(RequestSpan parent) {
+        if (parent instanceof DelegatingRequestSpan) {
+            return ((DelegatingRequestSpan) parent).getDatadogSpan();
+        }
+        return parent;
     }
-    return parent;
-  }
 
-  private static RequestSpan unwrapCncParentSpan(RequestSpan parent) {
-    if (parent instanceof DelegatingRequestSpan) {
-      return ((DelegatingRequestSpan) parent).getCncSpan();
+    private static RequestSpan unwrapCncParentSpan(RequestSpan parent) {
+        if (parent instanceof DelegatingRequestSpan) {
+            return ((DelegatingRequestSpan) parent).getCncSpan();
+        }
+        return parent;
     }
-    return parent;
-  }
 }
diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/SeedNodeHelper.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/SeedNodeHelper.java
index 9beb27c9ba5..e93ed258b04 100644
--- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/SeedNodeHelper.java
+++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/SeedNodeHelper.java
@@ -5,11 +5,7 @@
 import java.util.stream.Collectors;
 
 public class SeedNodeHelper {
-  public static String toStringForm(final Set<SeedNode> seedNodes) {
-    return seedNodes.stream()
-        .map(SeedNode::address)
-        .sorted()
-        .distinct()
-        .collect(Collectors.joining(","));
-  }
+    public static String toStringForm(final Set<SeedNode> seedNodes) {
+        return seedNodes.stream().map(SeedNode::address).sorted().distinct().collect(Collectors.joining(","));
+    }
 }
diff --git a/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberInstrumentation.java b/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberInstrumentation.java
index 6d68cb71dc5..7c126731ca1 100644
--- a/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberInstrumentation.java
+++ b/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberInstrumentation.java
@@ -16,45 +16,45 @@
 
 @AutoService(InstrumenterModule.class)
 public class CucumberInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public CucumberInstrumentation() {
-    super("cucumber", "cucumber-5");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.cucumber.core.backend.StepDefinition";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        .and(namedNoneOf("io.cucumber.core.runner.CoreStepDefinition"));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("execute").and(takesArguments(Object[].class)),
-        CucumberInstrumentation.class.getName() + "$CucumberAdvice");
-  }
-
-  public static class CucumberAdvice {
-    @Advice.OnMethodEnter
-    public static ContextScope onCucumberStepStart(
-        @Advice.This StepDefinition step, @Advice.Argument(0) Object[] arguments) {
-      return CucumberStepDecorator.DECORATE.onStepStart(step, arguments);
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public CucumberInstrumentation() {
+        super("cucumber", "cucumber-5");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.cucumber.core.backend.StepDefinition";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                .and(namedNoneOf("io.cucumber.core.runner.CoreStepDefinition"));
     }
 
-    @Advice.OnMethodExit
-    public static void onCucumberStepFinish(@Advice.Enter ContextScope scope) {
-      CucumberStepDecorator.DECORATE.onStepFinish(scope);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("execute").and(takesArguments(Object[].class)),
+                CucumberInstrumentation.class.getName() + "$CucumberAdvice");
     }
 
-    // Cucumber 5.0.0 and above
-    public static void muzzleCheck(io.cucumber.core.backend.StepDefinition stepDefinition) {
-      stepDefinition.execute(null);
+    public static class CucumberAdvice {
+        @Advice.OnMethodEnter
+        public static ContextScope onCucumberStepStart(
+                @Advice.This StepDefinition step, @Advice.Argument(0) Object[] arguments) {
+            return CucumberStepDecorator.DECORATE.onStepStart(step, arguments);
+        }
+
+        @Advice.OnMethodExit
+        public static void onCucumberStepFinish(@Advice.Enter ContextScope scope) {
+            CucumberStepDecorator.DECORATE.onStepFinish(scope);
+        }
+
+        // Cucumber 5.0.0 and above
+        public static void muzzleCheck(io.cucumber.core.backend.StepDefinition stepDefinition) {
+            stepDefinition.execute(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberStepDecorator.java b/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberStepDecorator.java
index 6f9e37f4fe5..bc7ac780af6 100644
--- a/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberStepDecorator.java
+++ b/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberStepDecorator.java
@@ -11,42 +11,42 @@
 
 public class CucumberStepDecorator extends BaseDecorator {
 
-  public static CucumberStepDecorator DECORATE = new CucumberStepDecorator();
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"cucumber", "cucumber-5"};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return "cucumber";
-  }
-
-  public ContextScope onStepStart(StepDefinition step, Object[] arguments) {
-    AgentSpan span = AgentTracer.startSpan("cucumber", "cucumber.step");
-    afterStart(span);
-
-    span.setResourceName(step.getPattern());
-    span.setTag("step.name", step.getPattern());
-    span.setTag("step.location", step.getLocation());
-    span.setTag("step.type", step.getClass().getName());
-    if (arguments != null && arguments.length > 0) {
-      span.setTag("step.arguments", Arrays.toString(arguments));
+    public static CucumberStepDecorator DECORATE = new CucumberStepDecorator();
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"cucumber", "cucumber-5"};
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return "cucumber";
     }
 
-    return AgentTracer.activateSpan(span);
-  }
+    public ContextScope onStepStart(StepDefinition step, Object[] arguments) {
+        AgentSpan span = AgentTracer.startSpan("cucumber", "cucumber.step");
+        afterStart(span);
 
-  public void onStepFinish(ContextScope scope) {
-    AgentSpan span = spanFromScope(scope);
-    beforeFinish(span);
-    scope.close();
-    span.finish();
-  }
+        span.setResourceName(step.getPattern());
+        span.setTag("step.name", step.getPattern());
+        span.setTag("step.location", step.getLocation());
+        span.setTag("step.type", step.getClass().getName());
+        if (arguments != null && arguments.length > 0) {
+            span.setTag("step.arguments", Arrays.toString(arguments));
+        }
+
+        return AgentTracer.activateSpan(span);
+    }
+
+    public void onStepFinish(ContextScope scope) {
+        AgentSpan span = spanFromScope(scope);
+        beforeFinish(span);
+        scope.close();
+        span.finish();
+    }
 }
diff --git a/dd-java-agent/instrumentation/cucumber-5.4/src/test/java/org/example/TestSucceedCucumber.java b/dd-java-agent/instrumentation/cucumber-5.4/src/test/java/org/example/TestSucceedCucumber.java
index 7a6453fe427..4eb53857988 100644
--- a/dd-java-agent/instrumentation/cucumber-5.4/src/test/java/org/example/TestSucceedCucumber.java
+++ b/dd-java-agent/instrumentation/cucumber-5.4/src/test/java/org/example/TestSucceedCucumber.java
@@ -9,7 +9,5 @@
 @Suite
 @IncludeEngines("cucumber")
 @SelectClasspathResource("org/example/cucumber/calculator/basic_arithmetic.feature")
-@ConfigurationParameter(
-    key = Constants.GLUE_PROPERTY_NAME,
-    value = "org.example.cucumber.calculator")
+@ConfigurationParameter(key = Constants.GLUE_PROPERTY_NAME, value = "org.example.cucumber.calculator")
 public class TestSucceedCucumber {}
diff --git a/dd-java-agent/instrumentation/cucumber-5.4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java b/dd-java-agent/instrumentation/cucumber-5.4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
index e2c1d1da4a2..3286c0fcd37 100644
--- a/dd-java-agent/instrumentation/cucumber-5.4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
+++ b/dd-java-agent/instrumentation/cucumber-5.4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
@@ -12,51 +12,51 @@
 
 public class CalculatorSteps {
 
-  private Calculator calc;
-
-  @Given("a calculator I just turned on")
-  public void a_calculator_I_just_turned_on() {
-    calc = new Calculator();
-  }
-
-  @When("I add {int} and {int}")
-  public void adding(int arg1, int arg2) {
-    calc.push(arg1);
-    calc.push(arg2);
-    calc.push("+");
-  }
-
-  @Then("the result is {int}")
-  public void the_result_is(double expected) {
-    assertEquals(expected, calc.value());
-  }
-
-  static class Calculator {
-    private static final List<String> OPS = asList("-", "+", "*", "/");
-    private final Deque<Number> stack = new LinkedList<>();
-
-    public void push(Object arg) {
-      if (OPS.contains(arg)) {
-        Number y = stack.removeLast();
-        Number x = stack.isEmpty() ? 0 : stack.removeLast();
-        Double val = null;
-        if (arg.equals("-")) {
-          val = x.doubleValue() - y.doubleValue();
-        } else if (arg.equals("+")) {
-          val = x.doubleValue() + y.doubleValue();
-        } else if (arg.equals("*")) {
-          val = x.doubleValue() * y.doubleValue();
-        } else if (arg.equals("/")) {
-          val = x.doubleValue() / y.doubleValue();
-        }
-        push(val);
-      } else {
-        stack.add((Number) arg);
-      }
+    private Calculator calc;
+
+    @Given("a calculator I just turned on")
+    public void a_calculator_I_just_turned_on() {
+        calc = new Calculator();
     }
 
-    public Number value() {
-      return stack.getLast();
+    @When("I add {int} and {int}")
+    public void adding(int arg1, int arg2) {
+        calc.push(arg1);
+        calc.push(arg2);
+        calc.push("+");
+    }
+
+    @Then("the result is {int}")
+    public void the_result_is(double expected) {
+        assertEquals(expected, calc.value());
+    }
+
+    static class Calculator {
+        private static final List<String> OPS = asList("-", "+", "*", "/");
+        private final Deque<Number> stack = new LinkedList<>();
+
+        public void push(Object arg) {
+            if (OPS.contains(arg)) {
+                Number y = stack.removeLast();
+                Number x = stack.isEmpty() ? 0 : stack.removeLast();
+                Double val = null;
+                if (arg.equals("-")) {
+                    val = x.doubleValue() - y.doubleValue();
+                } else if (arg.equals("+")) {
+                    val = x.doubleValue() + y.doubleValue();
+                } else if (arg.equals("*")) {
+                    val = x.doubleValue() * y.doubleValue();
+                } else if (arg.equals("/")) {
+                    val = x.doubleValue() / y.doubleValue();
+                }
+                push(val);
+            } else {
+                stack.add((Number) arg);
+            }
+        }
+
+        public Number value() {
+            return stack.getLast();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/cxf-2.1/src/latestDepTest/java/TestExceptionMapper.java b/dd-java-agent/instrumentation/cxf-2.1/src/latestDepTest/java/TestExceptionMapper.java
index faf7a6db53c..893f177f219 100644
--- a/dd-java-agent/instrumentation/cxf-2.1/src/latestDepTest/java/TestExceptionMapper.java
+++ b/dd-java-agent/instrumentation/cxf-2.1/src/latestDepTest/java/TestExceptionMapper.java
@@ -3,9 +3,9 @@
 import jakarta.ws.rs.ext.ExceptionMapper;
 
 public class TestExceptionMapper implements ExceptionMapper<Throwable> {
-  @Override
-  @Trace
-  public Response toResponse(Throwable exception) {
-    return Response.ok(exception.getMessage()).build();
-  }
+    @Override
+    @Trace
+    public Response toResponse(Throwable exception) {
+        return Response.ok(exception.getMessage()).build();
+    }
 }
diff --git a/dd-java-agent/instrumentation/cxf-2.1/src/latestDepTest/java/TestResource.java b/dd-java-agent/instrumentation/cxf-2.1/src/latestDepTest/java/TestResource.java
index bc6efcd7759..59245121686 100644
--- a/dd-java-agent/instrumentation/cxf-2.1/src/latestDepTest/java/TestResource.java
+++ b/dd-java-agent/instrumentation/cxf-2.1/src/latestDepTest/java/TestResource.java
@@ -6,12 +6,12 @@
 
 @Path("/test")
 public class TestResource {
-  @GET
-  public void someService(@Suspended final AsyncResponse response) {
-    doSomething();
-    response.resume(new RuntimeException("Failure"));
-  }
+    @GET
+    public void someService(@Suspended final AsyncResponse response) {
+        doSomething();
+        response.resume(new RuntimeException("Failure"));
+    }
 
-  @Trace
-  private void doSomething() {}
+    @Trace
+    private void doSomething() {}
 }
diff --git a/dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/InvokerInstrumentation.java b/dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/InvokerInstrumentation.java
index aa3cc4e9d07..447a164cb1f 100644
--- a/dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/InvokerInstrumentation.java
+++ b/dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/InvokerInstrumentation.java
@@ -18,55 +18,53 @@
 
 @AutoService(InstrumenterModule.class)
 public class InvokerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public InvokerInstrumentation() {
-    super("cxf", "cxf-invoker");
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return ClassLoaderMatchers.hasClassNamed("javax.servlet.ServletRequest")
-        .or(ClassLoaderMatchers.hasClassNamed("jakarta.servlet.ServletRequest"));
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public InvokerInstrumentation() {
+        super("cxf", "cxf-invoker");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.cxf.service.invoker.Invoker";
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return ClassLoaderMatchers.hasClassNamed("javax.servlet.ServletRequest")
+                .or(ClassLoaderMatchers.hasClassNamed("jakarta.servlet.ServletRequest"));
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return HierarchyMatchers.implementsInterface(NameMatchers.named(hierarchyMarkerType()));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.cxf.service.invoker.Invoker";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        ElementMatchers.isMethod().and(NameMatchers.named("invoke")),
-        getClass().getName() + "$PropagateSpanAdvice");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return HierarchyMatchers.implementsInterface(NameMatchers.named(hierarchyMarkerType()));
+    }
 
-  public static class PropagateSpanAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beforeInvoke(@Advice.Argument(0) final Exchange exchange) {
-      if (exchange == null || exchange.getInMessage() == null || AgentTracer.activeSpan() != null) {
-        return null;
-      }
-      final Object contextObj =
-          ServletHelper.getServletRequestAttribute(
-              exchange.getInMessage().get("HTTP.REQUEST"),
-              HttpServerDecorator.DD_CONTEXT_ATTRIBUTE);
-      if (contextObj instanceof Context) {
-        return ((Context) contextObj).attach();
-      }
-      return null;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                ElementMatchers.isMethod().and(NameMatchers.named("invoke")),
+                getClass().getName() + "$PropagateSpanAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterInvoke(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    public static class PropagateSpanAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beforeInvoke(@Advice.Argument(0) final Exchange exchange) {
+            if (exchange == null || exchange.getInMessage() == null || AgentTracer.activeSpan() != null) {
+                return null;
+            }
+            final Object contextObj = ServletHelper.getServletRequestAttribute(
+                    exchange.getInMessage().get("HTTP.REQUEST"), HttpServerDecorator.DD_CONTEXT_ATTRIBUTE);
+            if (contextObj instanceof Context) {
+                return ((Context) contextObj).attach();
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterInvoke(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/ServletHelper.java b/dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/ServletHelper.java
index adbd6eb4463..5be7fe0a6cd 100644
--- a/dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/ServletHelper.java
+++ b/dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/ServletHelper.java
@@ -7,58 +7,52 @@
 
 // Probably one day we should put it in the bootstrap if used in a lot of places
 public class ServletHelper {
-  private static final Logger LOGGER = LoggerFactory.getLogger(ServletHelper.class);
-  private static final Class<?> JAVAX_SERVLET_REQUEST_CLASS =
-      safelyLocateClass("javax.servlet.ServletRequest");
-  private static final Class<?> JAKARTA_SERVLET_REQUEST_CLASS =
-      safelyLocateClass("jakarta.servlet.ServletRequest");
-  private static final MethodHandle JAVAX_ATTRIBUTE_ACCESSOR =
-      safelyUnreflectServletRequestAttributeGetter(JAVAX_SERVLET_REQUEST_CLASS);
-  private static final MethodHandle JAKARTA_ATTRIBUTE_ACCESSOR =
-      safelyUnreflectServletRequestAttributeGetter(JAKARTA_SERVLET_REQUEST_CLASS);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ServletHelper.class);
+    private static final Class<?> JAVAX_SERVLET_REQUEST_CLASS = safelyLocateClass("javax.servlet.ServletRequest");
+    private static final Class<?> JAKARTA_SERVLET_REQUEST_CLASS = safelyLocateClass("jakarta.servlet.ServletRequest");
+    private static final MethodHandle JAVAX_ATTRIBUTE_ACCESSOR =
+            safelyUnreflectServletRequestAttributeGetter(JAVAX_SERVLET_REQUEST_CLASS);
+    private static final MethodHandle JAKARTA_ATTRIBUTE_ACCESSOR =
+            safelyUnreflectServletRequestAttributeGetter(JAKARTA_SERVLET_REQUEST_CLASS);
 
-  private static Class<?> safelyLocateClass(final String name) {
-    try {
-      return Class.forName(name, false, ServletHelper.class.getClassLoader());
-    } catch (Throwable t) {
-      // can be expected
+    private static Class<?> safelyLocateClass(final String name) {
+        try {
+            return Class.forName(name, false, ServletHelper.class.getClassLoader());
+        } catch (Throwable t) {
+            // can be expected
+        }
+        return null;
     }
-    return null;
-  }
 
-  private static MethodHandle safelyUnreflectServletRequestAttributeGetter(
-      final Class<?> servletRequestClass) {
-    if (servletRequestClass != null) {
-      try {
-        return MethodHandles.lookup()
-            .unreflect(servletRequestClass.getMethod("getAttribute", String.class));
-      } catch (Throwable t) {
-        if (JAVAX_ATTRIBUTE_ACCESSOR == null) {
-          LOGGER.debug(
-              "Unable to lookup getAttribute for servlet request class. The cxf-core instrumentation might not work as expected",
-              t);
+    private static MethodHandle safelyUnreflectServletRequestAttributeGetter(final Class<?> servletRequestClass) {
+        if (servletRequestClass != null) {
+            try {
+                return MethodHandles.lookup().unreflect(servletRequestClass.getMethod("getAttribute", String.class));
+            } catch (Throwable t) {
+                if (JAVAX_ATTRIBUTE_ACCESSOR == null) {
+                    LOGGER.debug(
+                            "Unable to lookup getAttribute for servlet request class. The cxf-core instrumentation might not work as expected",
+                            t);
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
 
-  public static Object getServletRequestAttribute(final Object servletRequest, final String name) {
-    final MethodHandle mh =
-        JAVAX_SERVLET_REQUEST_CLASS != null
-                && JAVAX_SERVLET_REQUEST_CLASS.isInstance(servletRequest)
-            ? JAVAX_ATTRIBUTE_ACCESSOR
-            : JAKARTA_SERVLET_REQUEST_CLASS != null
-                    && JAKARTA_SERVLET_REQUEST_CLASS.isInstance(servletRequest)
-                ? JAKARTA_ATTRIBUTE_ACCESSOR
-                : null;
-    if (mh != null) {
-      try {
-        return mh.invoke(servletRequest, name);
-      } catch (Throwable e) {
-        // nothing we can do here. Silently ignore
-      }
+    public static Object getServletRequestAttribute(final Object servletRequest, final String name) {
+        final MethodHandle mh = JAVAX_SERVLET_REQUEST_CLASS != null
+                        && JAVAX_SERVLET_REQUEST_CLASS.isInstance(servletRequest)
+                ? JAVAX_ATTRIBUTE_ACCESSOR
+                : JAKARTA_SERVLET_REQUEST_CLASS != null && JAKARTA_SERVLET_REQUEST_CLASS.isInstance(servletRequest)
+                        ? JAKARTA_ATTRIBUTE_ACCESSOR
+                        : null;
+        if (mh != null) {
+            try {
+                return mh.invoke(servletRequest, name);
+            } catch (Throwable e) {
+                // nothing we can do here. Silently ignore
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/cxf-2.1/src/test/java/TestExceptionMapper.java b/dd-java-agent/instrumentation/cxf-2.1/src/test/java/TestExceptionMapper.java
index 3ea54ae9508..8b0271b4d95 100644
--- a/dd-java-agent/instrumentation/cxf-2.1/src/test/java/TestExceptionMapper.java
+++ b/dd-java-agent/instrumentation/cxf-2.1/src/test/java/TestExceptionMapper.java
@@ -3,9 +3,9 @@
 import javax.ws.rs.ext.ExceptionMapper;
 
 public class TestExceptionMapper implements ExceptionMapper<Throwable> {
-  @Override
-  @Trace
-  public Response toResponse(Throwable exception) {
-    return Response.ok(exception.getMessage()).build();
-  }
+    @Override
+    @Trace
+    public Response toResponse(Throwable exception) {
+        return Response.ok(exception.getMessage()).build();
+    }
 }
diff --git a/dd-java-agent/instrumentation/cxf-2.1/src/test/java/TestResource.java b/dd-java-agent/instrumentation/cxf-2.1/src/test/java/TestResource.java
index bc9d722afa1..8b3b051c596 100644
--- a/dd-java-agent/instrumentation/cxf-2.1/src/test/java/TestResource.java
+++ b/dd-java-agent/instrumentation/cxf-2.1/src/test/java/TestResource.java
@@ -6,12 +6,12 @@
 
 @Path("/test")
 public class TestResource {
-  @GET
-  public void someService(@Suspended final AsyncResponse response) {
-    doSomething();
-    response.resume(new RuntimeException("Failure"));
-  }
+    @GET
+    public void someService(@Suspended final AsyncResponse response) {
+        doSomething();
+        response.resume(new RuntimeException("Failure"));
+    }
 
-  @Trace
-  private void doSomething() {}
+    @Trace
+    private void doSomething() {}
 }
diff --git a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastHardcodedSecretListener.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastHardcodedSecretListener.java
index 06e282b57d2..3e59c3ee0fa 100644
--- a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastHardcodedSecretListener.java
+++ b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastHardcodedSecretListener.java
@@ -20,83 +20,81 @@
 
 public class IastHardcodedSecretListener implements Advices.Listener {
 
-  public static final IastHardcodedSecretListener INSTANCE =
-      new IastHardcodedSecretListener(IastSecretClassReader.INSTANCE);
+    public static final IastHardcodedSecretListener INSTANCE =
+            new IastHardcodedSecretListener(IastSecretClassReader.INSTANCE);
 
-  private final IastSecretClassReader iastSecretClassReader;
+    private final IastSecretClassReader iastSecretClassReader;
 
-  protected IastHardcodedSecretListener(final IastSecretClassReader iastSecretClassReader) {
-    this.iastSecretClassReader = iastSecretClassReader;
-  }
+    protected IastHardcodedSecretListener(final IastSecretClassReader iastSecretClassReader) {
+        this.iastSecretClassReader = iastSecretClassReader;
+    }
 
-  @Override
-  public void onConstantPool(
-      final @Nonnull TypeDescription type,
-      final @Nonnull ConstantPool pool,
-      final @Nonnull byte[] classFile) {
-    final HardcodedSecretModule iastModule = InstrumentationBridge.HARDCODED_SECRET;
-    if (iastModule != null) {
-      Set<String> literals = new HashSet<>();
-      for (int index = 1; index < pool.getCount(); index++) {
-        if (pool.getType(index) == ConstantPool.CONSTANT_STRING_TAG) {
-          final int literalIndex = pool.readUnsignedShort(pool.getOffset(index));
-          int bytesLength = pool.readUnsignedShort(pool.getOffset(literalIndex));
-          if (bytesLength >= MIN_SECRET_LENGTH) { // prefilter short strings
-            final String literal = pool.readUTF8(pool.getOffset(literalIndex));
-            if (literal.length() >= MIN_SECRET_LENGTH) {
-              literals.add(literal);
+    @Override
+    public void onConstantPool(
+            final @Nonnull TypeDescription type, final @Nonnull ConstantPool pool, final @Nonnull byte[] classFile) {
+        final HardcodedSecretModule iastModule = InstrumentationBridge.HARDCODED_SECRET;
+        if (iastModule != null) {
+            Set<String> literals = new HashSet<>();
+            for (int index = 1; index < pool.getCount(); index++) {
+                if (pool.getType(index) == ConstantPool.CONSTANT_STRING_TAG) {
+                    final int literalIndex = pool.readUnsignedShort(pool.getOffset(index));
+                    int bytesLength = pool.readUnsignedShort(pool.getOffset(literalIndex));
+                    if (bytesLength >= MIN_SECRET_LENGTH) { // prefilter short strings
+                        final String literal = pool.readUTF8(pool.getOffset(literalIndex));
+                        if (literal.length() >= MIN_SECRET_LENGTH) {
+                            literals.add(literal);
+                        }
+                    }
+                }
+            }
+            if (!literals.isEmpty()) {
+                onStringLiteral(iastModule, literals, type.getName(), classFile);
             }
-          }
         }
-      }
-      if (!literals.isEmpty()) {
-        onStringLiteral(iastModule, literals, type.getName(), classFile);
-      }
     }
-  }
 
-  private void onStringLiteral(
-      final HardcodedSecretModule module,
-      final Set<String> literals,
-      final String clazz,
-      final byte[] classFile) {
-    Map<String, String> secrets = getSecrets(literals);
-    if (secrets != null) {
-      iastSecretClassReader.readClass(secrets, classFile, new ReportSecretConsumer(module, clazz));
+    private void onStringLiteral(
+            final HardcodedSecretModule module,
+            final Set<String> literals,
+            final String clazz,
+            final byte[] classFile) {
+        Map<String, String> secrets = getSecrets(literals);
+        if (secrets != null) {
+            iastSecretClassReader.readClass(secrets, classFile, new ReportSecretConsumer(module, clazz));
+        }
     }
-  }
 
-  @Nullable
-  private Map<String, String> getSecrets(final Set<String> literals) {
-    Map<String, String> secrets = null;
-    for (String literal : literals) {
-      for (HardcodedSecretMatcher secretMatcher : HARDCODED_SECRET_MATCHERS) {
-        if (secretMatcher.matches(literal)) {
-          if (secrets == null) {
-            secrets = new HashMap<>();
-          }
-          secrets.put(literal, secretMatcher.getRedactedEvidence());
-          break;
+    @Nullable
+    private Map<String, String> getSecrets(final Set<String> literals) {
+        Map<String, String> secrets = null;
+        for (String literal : literals) {
+            for (HardcodedSecretMatcher secretMatcher : HARDCODED_SECRET_MATCHERS) {
+                if (secretMatcher.matches(literal)) {
+                    if (secrets == null) {
+                        secrets = new HashMap<>();
+                    }
+                    secrets.put(literal, secretMatcher.getRedactedEvidence());
+                    break;
+                }
+            }
         }
-      }
+        return secrets;
     }
-    return secrets;
-  }
 
-  private static class ReportSecretConsumer implements TriConsumer<String, String, Integer> {
+    private static class ReportSecretConsumer implements TriConsumer<String, String, Integer> {
 
-    private final String clazz;
+        private final String clazz;
 
-    private final HardcodedSecretModule module;
+        private final HardcodedSecretModule module;
 
-    public ReportSecretConsumer(final HardcodedSecretModule module, final String clazz) {
-      this.module = module;
-      this.clazz = clazz;
-    }
+        public ReportSecretConsumer(final HardcodedSecretModule module, final String clazz) {
+            this.module = module;
+            this.clazz = clazz;
+        }
 
-    @Override
-    public void accept(String method, String value, Integer currentLine) {
-      module.onHardcodedSecret(value, method, clazz, currentLine);
+        @Override
+        public void accept(String method, String value, Integer currentLine) {
+            module.onHardcodedSecret(value, method, clazz, currentLine);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastInstrumentation.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastInstrumentation.java
index fc5637527ec..42292aed3de 100644
--- a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastInstrumentation.java
+++ b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastInstrumentation.java
@@ -30,119 +30,115 @@
 @AutoService(InstrumenterModule.class)
 public class IastInstrumentation extends CallSiteInstrumentation {
 
-  public IastInstrumentation() {
-    super("IastInstrumentation");
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> callerType() {
-    return IastMatchers.INSTANCE;
-  }
-
-  @Override
-  public boolean isApplicable(final Set<TargetSystem> enabledSystems) {
-    return enabledSystems.contains(TargetSystem.IAST) || enabledSystems.contains(TargetSystem.RASP);
-  }
-
-  @Override
-  protected CallSiteSupplier callSites() {
-    return IastCallSiteSupplier.INSTANCE;
-  }
-
-  @Override
-  protected Advices buildAdvices(final Iterable<CallSites> callSites) {
-    final List<Listener> listeners = new ArrayList<>();
-    final boolean iastActive =
-        InstrumenterConfig.get().getIastActivation() == ProductActivation.FULLY_ENABLED;
-    if (iastActive) {
-      if (Config.get().isIastHardcodedSecretEnabled()) {
-        listeners.add(IastHardcodedSecretListener.INSTANCE);
-      }
-      StratumManager stratumManager =
-          StratumManager.init(
-              Config.get().getIastSourceMappingMaxSize(),
-              IastInstrumentation::onSourceMappingLimitReached);
-      listeners.add(new StratumListener(stratumManager));
+    public IastInstrumentation() {
+        super("IastInstrumentation");
     }
-    return Advices.fromCallSites(callSites, listeners.toArray(new Listener[0]));
-  }
-
-  private static void onSourceMappingLimitReached(int maxSize) {
-    IastMetricCollector.add(IastMetric.SOURCE_MAPPING_LIMIT_REACHED, 1);
-  }
-
-  public static final class IastMatchers {
-
-    public static final ElementMatcher<TypeDescription> INSTANCE;
-
-    private static final ElementMatcher.Junction<TypeDescription> TRIE_MATCHER =
-        new ElementMatcher.Junction.ForNonNullValues<TypeDescription>() {
-          @Override
-          protected boolean doMatch(TypeDescription target) {
-            return IastExclusionTrie.apply(target.getName()) != 1;
-          }
-        };
-
-    // this deliberately only considers anonymous types following the Java naming convention
-    private static final ElementMatcher.Junction<TypeDescription> ANONYMOUS_TYPE_MATCHER =
-        new ElementMatcher.Junction.ForNonNullValues<TypeDescription>() {
-          @Override
-          protected boolean doMatch(TypeDescription target) {
-            String name = target.getName();
-            // search the name in reverse until we find a $ or non-digit
-            for (int end = name.length() - 1, i = end; i > 0; i--) {
-              char c = name.charAt(i);
-              if (c == '$' && i < end) {
-                return true; // only seen digits so far, assume anonymous
-              } else if (c < '0' || c > '9') {
-                break; // non-digit character found, assume not anonymous
-              }
-            }
-            return false;
-          }
-        };
-
-    static {
-      if (Config.get().isIastAnonymousClassesEnabled()) {
-        INSTANCE = TRIE_MATCHER;
-      } else {
-        INSTANCE = TRIE_MATCHER.and(not(ANONYMOUS_TYPE_MATCHER));
-      }
-    }
-  }
-
-  public static class IastCallSiteSupplier implements CallSiteSupplier {
-
-    public static final CallSiteSupplier INSTANCE;
-
-    static {
-      final List<Class<?>> spi = new LinkedList<>();
-      final boolean iastActive =
-          InstrumenterConfig.get().getIastActivation() == ProductActivation.FULLY_ENABLED;
-      if (iastActive) {
-        spi.add(IastCallSites.class);
-      }
-      if (InstrumenterConfig.get().isAppSecRaspEnabled()) {
-        spi.add(RaspCallSites.class);
-      }
-      CallSiteSupplier supplier = new IastCallSiteSupplier(spi.toArray(new Class[0]));
-      final Verbosity verbosity = Config.get().getIastTelemetryVerbosity();
-      if (iastActive && verbosity != Verbosity.OFF) {
-        supplier = new TelemetryCallSiteSupplier(verbosity, supplier);
-      }
-      INSTANCE = supplier;
+
+    @Override
+    public ElementMatcher<TypeDescription> callerType() {
+        return IastMatchers.INSTANCE;
     }
 
-    private final Class<?>[] spiInterfaces;
+    @Override
+    public boolean isApplicable(final Set<TargetSystem> enabledSystems) {
+        return enabledSystems.contains(TargetSystem.IAST) || enabledSystems.contains(TargetSystem.RASP);
+    }
 
-    public IastCallSiteSupplier(final Class<?>... spiInterfaces) {
-      this.spiInterfaces = spiInterfaces;
+    @Override
+    protected CallSiteSupplier callSites() {
+        return IastCallSiteSupplier.INSTANCE;
     }
 
     @Override
-    public Iterable<CallSites> get() {
-      final ClassLoader targetClassLoader = CallSiteInstrumentation.class.getClassLoader();
-      return CallSitesLoader.load(targetClassLoader, spiInterfaces);
+    protected Advices buildAdvices(final Iterable<CallSites> callSites) {
+        final List<Listener> listeners = new ArrayList<>();
+        final boolean iastActive = InstrumenterConfig.get().getIastActivation() == ProductActivation.FULLY_ENABLED;
+        if (iastActive) {
+            if (Config.get().isIastHardcodedSecretEnabled()) {
+                listeners.add(IastHardcodedSecretListener.INSTANCE);
+            }
+            StratumManager stratumManager = StratumManager.init(
+                    Config.get().getIastSourceMappingMaxSize(), IastInstrumentation::onSourceMappingLimitReached);
+            listeners.add(new StratumListener(stratumManager));
+        }
+        return Advices.fromCallSites(callSites, listeners.toArray(new Listener[0]));
+    }
+
+    private static void onSourceMappingLimitReached(int maxSize) {
+        IastMetricCollector.add(IastMetric.SOURCE_MAPPING_LIMIT_REACHED, 1);
+    }
+
+    public static final class IastMatchers {
+
+        public static final ElementMatcher<TypeDescription> INSTANCE;
+
+        private static final ElementMatcher.Junction<TypeDescription> TRIE_MATCHER =
+                new ElementMatcher.Junction.ForNonNullValues<TypeDescription>() {
+                    @Override
+                    protected boolean doMatch(TypeDescription target) {
+                        return IastExclusionTrie.apply(target.getName()) != 1;
+                    }
+                };
+
+        // this deliberately only considers anonymous types following the Java naming convention
+        private static final ElementMatcher.Junction<TypeDescription> ANONYMOUS_TYPE_MATCHER =
+                new ElementMatcher.Junction.ForNonNullValues<TypeDescription>() {
+                    @Override
+                    protected boolean doMatch(TypeDescription target) {
+                        String name = target.getName();
+                        // search the name in reverse until we find a $ or non-digit
+                        for (int end = name.length() - 1, i = end; i > 0; i--) {
+                            char c = name.charAt(i);
+                            if (c == '$' && i < end) {
+                                return true; // only seen digits so far, assume anonymous
+                            } else if (c < '0' || c > '9') {
+                                break; // non-digit character found, assume not anonymous
+                            }
+                        }
+                        return false;
+                    }
+                };
+
+        static {
+            if (Config.get().isIastAnonymousClassesEnabled()) {
+                INSTANCE = TRIE_MATCHER;
+            } else {
+                INSTANCE = TRIE_MATCHER.and(not(ANONYMOUS_TYPE_MATCHER));
+            }
+        }
+    }
+
+    public static class IastCallSiteSupplier implements CallSiteSupplier {
+
+        public static final CallSiteSupplier INSTANCE;
+
+        static {
+            final List<Class<?>> spi = new LinkedList<>();
+            final boolean iastActive = InstrumenterConfig.get().getIastActivation() == ProductActivation.FULLY_ENABLED;
+            if (iastActive) {
+                spi.add(IastCallSites.class);
+            }
+            if (InstrumenterConfig.get().isAppSecRaspEnabled()) {
+                spi.add(RaspCallSites.class);
+            }
+            CallSiteSupplier supplier = new IastCallSiteSupplier(spi.toArray(new Class[0]));
+            final Verbosity verbosity = Config.get().getIastTelemetryVerbosity();
+            if (iastActive && verbosity != Verbosity.OFF) {
+                supplier = new TelemetryCallSiteSupplier(verbosity, supplier);
+            }
+            INSTANCE = supplier;
+        }
+
+        private final Class<?>[] spiInterfaces;
+
+        public IastCallSiteSupplier(final Class<?>... spiInterfaces) {
+            this.spiInterfaces = spiInterfaces;
+        }
+
+        @Override
+        public Iterable<CallSites> get() {
+            final ClassLoader targetClassLoader = CallSiteInstrumentation.class.getClassLoader();
+            return CallSitesLoader.load(targetClassLoader, spiInterfaces);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/SourceMapperImpl.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/SourceMapperImpl.java
index 349439662f7..0b58a7a1fa1 100644
--- a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/SourceMapperImpl.java
+++ b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/SourceMapperImpl.java
@@ -8,28 +8,26 @@
 
 public class SourceMapperImpl implements SourceMapper {
 
-  // This is only available if IAST source mapping is enabled
-  public static final SourceMapperImpl INSTANCE =
-      Config.get().isIastSourceMappingEnabled()
-          ? new SourceMapperImpl(StratumManager.getInstance())
-          : null;
+    // This is only available if IAST source mapping is enabled
+    public static final SourceMapperImpl INSTANCE =
+            Config.get().isIastSourceMappingEnabled() ? new SourceMapperImpl(StratumManager.getInstance()) : null;
 
-  private final StratumManager stratumManager;
+    private final StratumManager stratumManager;
 
-  private SourceMapperImpl(StratumManager stratumManager) {
-    this.stratumManager = stratumManager;
-  }
-
-  @Override
-  public Pair<String, Integer> getFileAndLine(String className, int lineNumber) {
-    Stratum stratum = stratumManager.get(className);
-    if (stratum == null) {
-      return null;
+    private SourceMapperImpl(StratumManager stratumManager) {
+        this.stratumManager = stratumManager;
     }
-    Pair<String, Integer> inputLine = stratum.getInputLine(lineNumber);
-    if (inputLine == null) {
-      return null;
+
+    @Override
+    public Pair<String, Integer> getFileAndLine(String className, int lineNumber) {
+        Stratum stratum = stratumManager.get(className);
+        if (stratum == null) {
+            return null;
+        }
+        Pair<String, Integer> inputLine = stratum.getInputLine(lineNumber);
+        if (inputLine == null) {
+            return null;
+        }
+        return Pair.of(stratum.getSourceFile(inputLine.getLeft()), inputLine.getRight());
     }
-    return Pair.of(stratum.getSourceFile(inputLine.getLeft()), inputLine.getRight());
-  }
 }
diff --git a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/StratumListener.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/StratumListener.java
index 4352faacf1f..fb396e62bb8 100644
--- a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/StratumListener.java
+++ b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/StratumListener.java
@@ -8,24 +8,23 @@
 
 public class StratumListener implements Advices.Listener {
 
-  private final StratumManager stratumManager;
+    private final StratumManager stratumManager;
 
-  public StratumListener(StratumManager stratumManager) {
-    this.stratumManager = stratumManager;
-  }
+    public StratumListener(StratumManager stratumManager) {
+        this.stratumManager = stratumManager;
+    }
 
-  @Override
-  public void onConstantPool(
-      @Nonnull TypeDescription type, @Nonnull ConstantPool pool, byte[] classFile) {
-    if (shouldBeAnalyzed(type.getInternalName())) {
-      stratumManager.analyzeClass(classFile);
+    @Override
+    public void onConstantPool(@Nonnull TypeDescription type, @Nonnull ConstantPool pool, byte[] classFile) {
+        if (shouldBeAnalyzed(type.getInternalName())) {
+            stratumManager.analyzeClass(classFile);
+        }
     }
-  }
 
-  private static boolean shouldBeAnalyzed(final String internalClassName) {
-    return internalClassName.contains("jsp")
-        && (internalClassName.contains("_jsp")
-            || internalClassName.contains("jsp_")
-            || internalClassName.contains("_tag"));
-  }
+    private static boolean shouldBeAnalyzed(final String internalClassName) {
+        return internalClassName.contains("jsp")
+                && (internalClassName.contains("_jsp")
+                        || internalClassName.contains("jsp_")
+                        || internalClassName.contains("_tag"));
+    }
 }
diff --git a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/service/CallSitesLoader.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/service/CallSitesLoader.java
index dabd0c6a3d7..0a983a72998 100644
--- a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/service/CallSitesLoader.java
+++ b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/service/CallSitesLoader.java
@@ -18,56 +18,56 @@
 
 public abstract class CallSitesLoader {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(CallSitesLoader.class);
-  private static final int CALL_SITE_COUNT = 64;
+    private static final Logger LOGGER = LoggerFactory.getLogger(CallSitesLoader.class);
+    private static final int CALL_SITE_COUNT = 64;
 
-  private CallSitesLoader() {}
+    private CallSitesLoader() {}
 
-  public static <E> List<E> load(final ClassLoader classLoader, final Class<?>... spiInterfaces) {
-    if (spiInterfaces == null || spiInterfaces.length == 0) {
-      return Collections.emptyList();
-    }
-    try {
-      List<E> services = new ArrayList<>(CALL_SITE_COUNT);
-      for (String site : loadServiceNames(classLoader, spiInterfaces)) {
+    public static <E> List<E> load(final ClassLoader classLoader, final Class<?>... spiInterfaces) {
+        if (spiInterfaces == null || spiInterfaces.length == 0) {
+            return Collections.emptyList();
+        }
         try {
-          @SuppressWarnings({"rawtypes", "unchecked"})
-          Class<E> moduleType = (Class) classLoader.loadClass(site);
-          services.add(moduleType.getConstructor().newInstance());
-        } catch (Throwable e) {
-          LOGGER.error("Failed to load call site {}", site, e);
+            List<E> services = new ArrayList<>(CALL_SITE_COUNT);
+            for (String site : loadServiceNames(classLoader, spiInterfaces)) {
+                try {
+                    @SuppressWarnings({"rawtypes", "unchecked"})
+                    Class<E> moduleType = (Class) classLoader.loadClass(site);
+                    services.add(moduleType.getConstructor().newInstance());
+                } catch (Throwable e) {
+                    LOGGER.error("Failed to load call site {}", site, e);
+                }
+            }
+            if (services.size() > CALL_SITE_COUNT) {
+                LOGGER.debug(
+                        "Call site count has gone over the expected threshold CALL_SITE_COUNT={}, consider setting a bigger value",
+                        CALL_SITE_COUNT);
+            }
+            return services;
+        } catch (final IOException e) {
+            throw new UncheckedIOException("Problem loading call sites", e);
         }
-      }
-      if (services.size() > CALL_SITE_COUNT) {
-        LOGGER.debug(
-            "Call site count has gone over the expected threshold CALL_SITE_COUNT={}, consider setting a bigger value",
-            CALL_SITE_COUNT);
-      }
-      return services;
-    } catch (final IOException e) {
-      throw new UncheckedIOException("Problem loading call sites", e);
     }
-  }
 
-  private static String[] loadServiceNames(
-      final ClassLoader loader, final Class<?>... spiInterfaces) throws IOException {
-    Set<String> lines = new LinkedHashSet<>();
-    for (final Class<?> spi : spiInterfaces) {
-      Enumeration<URL> urls = loader.getResources("META-INF/services/" + spi.getName());
-      while (urls.hasMoreElements()) {
-        try (BufferedReader reader =
-            new BufferedReader(new InputStreamReader(urls.nextElement().openStream(), UTF_8))) {
-          String line = reader.readLine();
-          while (line != null) {
-            line = line.trim();
-            if (!line.isEmpty()) {
-              lines.add(line);
+    private static String[] loadServiceNames(final ClassLoader loader, final Class<?>... spiInterfaces)
+            throws IOException {
+        Set<String> lines = new LinkedHashSet<>();
+        for (final Class<?> spi : spiInterfaces) {
+            Enumeration<URL> urls = loader.getResources("META-INF/services/" + spi.getName());
+            while (urls.hasMoreElements()) {
+                try (BufferedReader reader = new BufferedReader(
+                        new InputStreamReader(urls.nextElement().openStream(), UTF_8))) {
+                    String line = reader.readLine();
+                    while (line != null) {
+                        line = line.trim();
+                        if (!line.isEmpty()) {
+                            lines.add(line);
+                        }
+                        line = reader.readLine();
+                    }
+                }
             }
-            line = reader.readLine();
-          }
         }
-      }
+        return lines.toArray(new String[0]);
     }
-    return lines.toArray(new String[0]);
-  }
 }
diff --git a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/telemetry/TelemetryCallSiteSupplier.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/telemetry/TelemetryCallSiteSupplier.java
index d300d6c1ec3..0ab40392921 100644
--- a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/telemetry/TelemetryCallSiteSupplier.java
+++ b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/telemetry/TelemetryCallSiteSupplier.java
@@ -9,44 +9,43 @@
 
 public class TelemetryCallSiteSupplier implements CallSiteSupplier {
 
-  private final Verbosity verbosity;
-  private final CallSiteSupplier delegate;
-
-  public TelemetryCallSiteSupplier(final Verbosity verbosity, final CallSiteSupplier delegate) {
-    this.verbosity = verbosity;
-    this.delegate = delegate;
-  }
-
-  @Override
-  public Iterable<CallSites> get() {
-    final Iterable<CallSites> iterable = delegate.get();
-    return () -> new IteratorAdapter(verbosity, iterable.iterator());
-  }
-
-  private static class IteratorAdapter implements Iterator<CallSites> {
-
     private final Verbosity verbosity;
-    private final Iterator<CallSites> delegate;
+    private final CallSiteSupplier delegate;
 
-    private IteratorAdapter(
-        @Nonnull final Verbosity verbosity, @Nonnull final Iterator<CallSites> delegate) {
-      this.verbosity = verbosity;
-      this.delegate = delegate;
+    public TelemetryCallSiteSupplier(final Verbosity verbosity, final CallSiteSupplier delegate) {
+        this.verbosity = verbosity;
+        this.delegate = delegate;
     }
 
     @Override
-    public boolean hasNext() {
-      return delegate.hasNext();
+    public Iterable<CallSites> get() {
+        final Iterable<CallSites> iterable = delegate.get();
+        return () -> new IteratorAdapter(verbosity, iterable.iterator());
     }
 
-    @Override
-    public CallSites next() {
-      CallSites advice = delegate.next();
-      if (advice instanceof IastCallSites.HasTelemetry) {
-        final IastCallSites.HasTelemetry hasTelemetry = (IastCallSites.HasTelemetry) advice;
-        hasTelemetry.setVerbosity(verbosity);
-      }
-      return advice;
+    private static class IteratorAdapter implements Iterator<CallSites> {
+
+        private final Verbosity verbosity;
+        private final Iterator<CallSites> delegate;
+
+        private IteratorAdapter(@Nonnull final Verbosity verbosity, @Nonnull final Iterator<CallSites> delegate) {
+            this.verbosity = verbosity;
+            this.delegate = delegate;
+        }
+
+        @Override
+        public boolean hasNext() {
+            return delegate.hasNext();
+        }
+
+        @Override
+        public CallSites next() {
+            CallSites advice = delegate.next();
+            if (advice instanceof IastCallSites.HasTelemetry) {
+                final IastCallSites.HasTelemetry hasTelemetry = (IastCallSites.HasTelemetry) advice;
+                hasTelemetry.setVerbosity(verbosity);
+            }
+            return advice;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockCallSites.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockCallSites.java
index b569d2d874d..477d66373c8 100644
--- a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockCallSites.java
+++ b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockCallSites.java
@@ -5,8 +5,8 @@
 import datadog.trace.api.iast.IastCallSites;
 
 public class MockCallSites implements IastCallSites, CallSites {
-  @Override
-  public void accept(final Container container) {
-    container.addAdvice(BEFORE, "type", "method", "descriptor", (CallSiteAdvice) null);
-  }
+    @Override
+    public void accept(final Container container) {
+        container.addAdvice(BEFORE, "type", "method", "descriptor", (CallSiteAdvice) null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockCallSitesWithTelemetry.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockCallSitesWithTelemetry.java
index 3b8041e06f9..b8b21c4e230 100644
--- a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockCallSitesWithTelemetry.java
+++ b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockCallSitesWithTelemetry.java
@@ -2,20 +2,19 @@
 import datadog.trace.api.iast.IastCallSites;
 import datadog.trace.api.iast.telemetry.Verbosity;
 
-public class MockCallSitesWithTelemetry
-    implements CallSites, IastCallSites, IastCallSites.HasTelemetry {
+public class MockCallSitesWithTelemetry implements CallSites, IastCallSites, IastCallSites.HasTelemetry {
 
-  private Verbosity verbosity;
+    private Verbosity verbosity;
 
-  @Override
-  public void setVerbosity(Verbosity verbosity) {
-    this.verbosity = verbosity;
-  }
+    @Override
+    public void setVerbosity(Verbosity verbosity) {
+        this.verbosity = verbosity;
+    }
 
-  public Verbosity getVerbosity() {
-    return verbosity;
-  }
+    public Verbosity getVerbosity() {
+        return verbosity;
+    }
 
-  @Override
-  public void accept(final Container container) {}
+    @Override
+    public void accept(final Container container) {}
 }
diff --git a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockRaspCallSites.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockRaspCallSites.java
index 5db049a3383..540757ab2f8 100644
--- a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockRaspCallSites.java
+++ b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockRaspCallSites.java
@@ -5,8 +5,8 @@
 import datadog.trace.api.appsec.RaspCallSites;
 
 public class MockRaspCallSites implements RaspCallSites, CallSites {
-  @Override
-  public void accept(final Container container) {
-    container.addAdvice(BEFORE, "typeRasp", "methodRasp", "descriptorRasp", (CallSiteAdvice) null);
-  }
+    @Override
+    public void accept(final Container container) {
+        container.addAdvice(BEFORE, "typeRasp", "methodRasp", "descriptorRasp", (CallSiteAdvice) null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/OuterClass.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/OuterClass.java
index 443603df135..95b5a1ae87e 100644
--- a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/OuterClass.java
+++ b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/OuterClass.java
@@ -2,19 +2,18 @@
 
 public class OuterClass {
 
-  public final long anonymous =
-      new Supplier<Long>() {
+    public final long anonymous = new Supplier<Long>() {
         @Override
         public Long get() {
-          return 1L;
+            return 1L;
         }
-      }.get();
+    }.get();
 
-  public final InnerClass inner = new InnerClass();
+    public final InnerClass inner = new InnerClass();
 
-  public final InnerStaticClass innerStatic = new InnerStaticClass();
+    public final InnerStaticClass innerStatic = new InnerStaticClass();
 
-  public class InnerClass {}
+    public class InnerClass {}
 
-  public static class InnerStaticClass {}
+    public static class InnerStaticClass {}
 }
diff --git a/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java b/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java
index db77d1b8bc5..4785496786b 100644
--- a/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java
+++ b/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java
@@ -17,46 +17,45 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public abstract class CodeOriginInstrumentation extends Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  private final OneOf<NamedElement> matcher;
-
-  @SuppressForbidden
-  public CodeOriginInstrumentation(String instrumentationName, String... additionalNames) {
-    super(instrumentationName, additionalNames);
-    this.matcher = NameMatchers.namedOneOf(getAnnotations());
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return InstrumenterConfig.get().isCodeOriginEnabled() && super.isEnabled();
-  }
-
-  protected abstract Set<String> getAnnotations();
-
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // no particular marker type
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    ElementMatcher.Junction<TypeDescription> matcher =
-        declaresMethod(isAnnotatedWith(this.matcher));
-    if (InstrumenterConfig.get().isCodeOriginInterfaceSupport()) {
-      matcher = matcher.or(implementsInterface(declaresMethod(isAnnotatedWith(this.matcher))));
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    private final OneOf<NamedElement> matcher;
+
+    @SuppressForbidden
+    public CodeOriginInstrumentation(String instrumentationName, String... additionalNames) {
+        super(instrumentationName, additionalNames);
+        this.matcher = NameMatchers.namedOneOf(getAnnotations());
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return InstrumenterConfig.get().isCodeOriginEnabled() && super.isEnabled();
+    }
+
+    protected abstract Set<String> getAnnotations();
+
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // no particular marker type
     }
-    return matcher;
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isAnnotatedWith(matcher), "datadog.trace.instrumentation.codeorigin.EntrySpanOriginAdvice");
-    if (InstrumenterConfig.get().isCodeOriginInterfaceSupport()) {
-      transformer.applyAdvice(
-          isDeclaredBy(implementsInterface(declaresMethod(isAnnotatedWith(matcher)))),
-          "datadog.trace.instrumentation.codeorigin.EntrySpanOriginAdvice");
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        ElementMatcher.Junction<TypeDescription> matcher = declaresMethod(isAnnotatedWith(this.matcher));
+        if (InstrumenterConfig.get().isCodeOriginInterfaceSupport()) {
+            matcher = matcher.or(implementsInterface(declaresMethod(isAnnotatedWith(this.matcher))));
+        }
+        return matcher;
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isAnnotatedWith(matcher), "datadog.trace.instrumentation.codeorigin.EntrySpanOriginAdvice");
+        if (InstrumenterConfig.get().isCodeOriginInterfaceSupport()) {
+            transformer.applyAdvice(
+                    isDeclaredBy(implementsInterface(declaresMethod(isAnnotatedWith(matcher)))),
+                    "datadog.trace.instrumentation.codeorigin.EntrySpanOriginAdvice");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/EntrySpanOriginAdvice.java b/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/EntrySpanOriginAdvice.java
index c69ade49dbf..2aa69494386 100644
--- a/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/EntrySpanOriginAdvice.java
+++ b/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/EntrySpanOriginAdvice.java
@@ -7,13 +7,13 @@
 
 public class EntrySpanOriginAdvice {
 
-  @Advice.OnMethodEnter
-  @SuppressWarnings("bytebuddy-exception-suppression")
-  public static void onEnter(
-      @Advice.Origin("#t") String typeName,
-      @Advice.Origin("#m") String methodName,
-      @Advice.Origin("#d") String descriptor) {
-    marker();
-    captureCodeOrigin(typeName, methodName, descriptor, true);
-  }
+    @Advice.OnMethodEnter
+    @SuppressWarnings("bytebuddy-exception-suppression")
+    public static void onEnter(
+            @Advice.Origin("#t") String typeName,
+            @Advice.Origin("#m") String methodName,
+            @Advice.Origin("#d") String descriptor) {
+        marker();
+        captureCodeOrigin(typeName, methodName, descriptor, true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/src/main/java/datadog/trace/instrumentation/wallclock/EnableWallclockProfilingInstrumentation.java b/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/src/main/java/datadog/trace/instrumentation/wallclock/EnableWallclockProfilingInstrumentation.java
index 42750e317ba..4c84ebb5054 100644
--- a/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/src/main/java/datadog/trace/instrumentation/wallclock/EnableWallclockProfilingInstrumentation.java
+++ b/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/src/main/java/datadog/trace/instrumentation/wallclock/EnableWallclockProfilingInstrumentation.java
@@ -21,84 +21,81 @@
 
 @AutoService(InstrumenterModule.class)
 public class EnableWallclockProfilingInstrumentation extends InstrumenterModule.Profiling
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public EnableWallclockProfilingInstrumentation() {
-    super("wallclock");
-  }
+    public EnableWallclockProfilingInstrumentation() {
+        super("wallclock");
+    }
 
-  private static final String[] RUNNABLE_EVENT_LOOPS = {
-    // regular netty
-    "io.netty.channel.ThreadPerChannelEventLoop",
-    "io.netty.channel.nio.NioEventLoop",
-    "io.netty.channel.epoll.EPollEventLoop",
-    "io.netty.channel.kqueue.KQueueEventLoop",
-    // gRPC shades the same classes
-    "io.grpc.netty.shaded.io.netty.channel.ThreadPerChannelEventLoop",
-    "io.grpc.netty.shaded.io.netty.channel.nio.NioEventLoop",
-    "io.grpc.netty.shaded.io.netty.channel.epoll.EPollEventLoop",
-    "io.grpc.netty.shaded.io.netty.channel.kqueue.KQueueEventLoop"
-  };
+    private static final String[] RUNNABLE_EVENT_LOOPS = {
+        // regular netty
+        "io.netty.channel.ThreadPerChannelEventLoop",
+        "io.netty.channel.nio.NioEventLoop",
+        "io.netty.channel.epoll.EPollEventLoop",
+        "io.netty.channel.kqueue.KQueueEventLoop",
+        // gRPC shades the same classes
+        "io.grpc.netty.shaded.io.netty.channel.ThreadPerChannelEventLoop",
+        "io.grpc.netty.shaded.io.netty.channel.nio.NioEventLoop",
+        "io.grpc.netty.shaded.io.netty.channel.epoll.EPollEventLoop",
+        "io.grpc.netty.shaded.io.netty.channel.kqueue.KQueueEventLoop"
+    };
 
-  @Override
-  public boolean isEnabled() {
-    // only needed if wallclock profiling is enabled, which requires tracing
-    return super.isEnabled()
-        && ConfigProvider.getInstance()
-            .getBoolean(
-                PROFILING_DATADOG_PROFILER_WALL_ENABLED,
-                PROFILING_DATADOG_PROFILER_WALL_ENABLED_DEFAULT)
-        && InstrumenterConfig.get().isTraceEnabled();
-  }
+    @Override
+    public boolean isEnabled() {
+        // only needed if wallclock profiling is enabled, which requires tracing
+        return super.isEnabled()
+                && ConfigProvider.getInstance()
+                        .getBoolean(
+                                PROFILING_DATADOG_PROFILER_WALL_ENABLED,
+                                PROFILING_DATADOG_PROFILER_WALL_ENABLED_DEFAULT)
+                && InstrumenterConfig.get().isTraceEnabled();
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    String adviceClassName = getClass().getName() + "$EnableWallclockSampling";
-    transformer.applyAdvice(
-        isMethod()
-            .and(
-                named("run")
-                    .and(isDeclaredBy(namedOneOf(RUNNABLE_EVENT_LOOPS)))
-                    .and(takesNoArguments())),
-        adviceClassName);
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("dowait"))
-            .and(takesArguments(boolean.class, long.class))
-            .and(isDeclaredBy(named("java.util.concurrent.CyclicBarrier"))),
-        adviceClassName);
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("await"))
-            .and(isDeclaredBy(named("java.util.concurrent.CountDownLatch"))),
-        adviceClassName);
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        String adviceClassName = getClass().getName() + "$EnableWallclockSampling";
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("run")
+                                .and(isDeclaredBy(namedOneOf(RUNNABLE_EVENT_LOOPS)))
+                                .and(takesNoArguments())),
+                adviceClassName);
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("dowait"))
+                        .and(takesArguments(boolean.class, long.class))
+                        .and(isDeclaredBy(named("java.util.concurrent.CyclicBarrier"))),
+                adviceClassName);
+        transformer.applyAdvice(
+                isMethod().and(named("await")).and(isDeclaredBy(named("java.util.concurrent.CountDownLatch"))),
+                adviceClassName);
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    String[] all = Arrays.copyOf(RUNNABLE_EVENT_LOOPS, RUNNABLE_EVENT_LOOPS.length + 2);
-    all[RUNNABLE_EVENT_LOOPS.length] = "java.util.concurrent.CyclicBarrier";
-    all[RUNNABLE_EVENT_LOOPS.length + 1] = "java.util.concurrent.CountDownLatch";
-    return all;
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        String[] all = Arrays.copyOf(RUNNABLE_EVENT_LOOPS, RUNNABLE_EVENT_LOOPS.length + 2);
+        all[RUNNABLE_EVENT_LOOPS.length] = "java.util.concurrent.CyclicBarrier";
+        all[RUNNABLE_EVENT_LOOPS.length + 1] = "java.util.concurrent.CountDownLatch";
+        return all;
+    }
 
-  public static final class EnableWallclockSampling {
+    public static final class EnableWallclockSampling {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static boolean before() {
-      AgentSpan span = AgentTracer.activeSpan();
-      if (span == null) {
-        AgentTracer.get().getProfilingContext().onAttach();
-        return true;
-      }
-      return false;
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static boolean before() {
+            AgentSpan span = AgentTracer.activeSpan();
+            if (span == null) {
+                AgentTracer.get().getProfilingContext().onAttach();
+                return true;
+            }
+            return false;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter boolean wasDisabled) {
-      if (wasDisabled) {
-        AgentTracer.get().getProfilingContext().onDetach();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter boolean wasDisabled) {
+            if (wasDisabled) {
+                AgentTracer.get().getProfilingContext().onDetach();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java/datadog/exceptions/instrumentation/KnownExcludesInstrumentation.java b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java/datadog/exceptions/instrumentation/KnownExcludesInstrumentation.java
index a483d78d7a4..7e0cb576963 100644
--- a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java/datadog/exceptions/instrumentation/KnownExcludesInstrumentation.java
+++ b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java/datadog/exceptions/instrumentation/KnownExcludesInstrumentation.java
@@ -13,25 +13,25 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class KnownExcludesInstrumentation extends InstrumenterModule.Profiling
-    implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public KnownExcludesInstrumentation() {
-    // this instrumentation is controlled together with 'throwables' instrumentation
-    super("throwables");
-  }
+    public KnownExcludesInstrumentation() {
+        // this instrumentation is controlled together with 'throwables' instrumentation
+        super("throwables");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return Platform.hasJfr() && super.isEnabled();
-  }
+    @Override
+    public boolean isEnabled() {
+        return Platform.hasJfr() && super.isEnabled();
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), packageName + ".ExclusionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), packageName + ".ExclusionAdvice");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {"com.zaxxer.hikari.pool.ProxyLeakTask"};
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"com.zaxxer.hikari.pool.ProxyLeakTask"};
+    }
 }
diff --git a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java
index eb91b4e1088..f158a012a70 100644
--- a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java
+++ b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java
@@ -10,26 +10,24 @@
 /** Provides instrumentation of {@linkplain Exception} and {@linkplain Error} constructors. */
 @AutoService(InstrumenterModule.class)
 public final class ThrowableInstrumentation extends InstrumenterModule.Profiling
-    implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public ThrowableInstrumentation() {
-    super("throwables");
-  }
+    public ThrowableInstrumentation() {
+        super("throwables");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return Platform.hasJfr() && super.isEnabled();
-  }
+    @Override
+    public boolean isEnabled() {
+        return Platform.hasJfr() && super.isEnabled();
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), packageName + ".ThrowableInstanceAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), packageName + ".ThrowableInstanceAdvice");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "java.lang.Exception", "java.lang.Error", "kotlin.Exception", "kotlin.Error"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"java.lang.Exception", "java.lang.Error", "kotlin.Exception", "kotlin.Error"};
+    }
 }
diff --git a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ExclusionAdvice.java b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ExclusionAdvice.java
index c4fe7c99443..59d744853f6 100644
--- a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ExclusionAdvice.java
+++ b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ExclusionAdvice.java
@@ -4,13 +4,13 @@
 import net.bytebuddy.asm.Advice;
 
 public class ExclusionAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void onEnter() {
-    ExceptionProfiling.Exclusion.enter();
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void onEnter() {
+        ExceptionProfiling.Exclusion.enter();
+    }
 
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit(@Advice.This final Object t) {
-    ExceptionProfiling.Exclusion.exit();
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(@Advice.This final Object t) {
+        ExceptionProfiling.Exclusion.exit();
+    }
 }
diff --git a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ThrowableInstanceAdvice.java b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ThrowableInstanceAdvice.java
index c1f15e9a7b3..93b60261c7f 100644
--- a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ThrowableInstanceAdvice.java
+++ b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ThrowableInstanceAdvice.java
@@ -11,50 +11,50 @@
 import net.bytebuddy.asm.Advice;
 
 public class ThrowableInstanceAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit(@Advice.This final Object t) {
-    if (Platform.isNativeImageBuilder()) {
-      return;
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(@Advice.This final Object t) {
+        if (Platform.isNativeImageBuilder()) {
+            return;
+        }
+        if (ExceptionProfiling.Exclusion.isEffective()) {
+            return;
+        }
+        /*
+         * This instrumentation handler is sensitive to any throwables thrown from its body -
+         * it will go into infinite loop of trying to handle the new throwable instance and generating
+         * another instance while doing so.
+         *
+         * The solution is to keep a TLS flag and just skip the handler if it was invoked as a result of handling
+         * a previous throwable instance (on the same thread).
+         */
+        final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Throwable.class);
+        if (callDepth > 0) {
+            return;
+        }
+        try {
+            /*
+             * We may get into a situation when this is called before exception sampling is active.
+             */
+            if (!InstrumentationBasedProfiling.isJFRReady()) {
+                return;
+            }
+            /*
+             * Exclude internal agent threads from exception profiling.
+             */
+            if (Config.get().isProfilingExcludeAgentThreads()
+                    && AGENT_THREAD_GROUP.equals(Thread.currentThread().getThreadGroup())) {
+                return;
+            }
+            /*
+             * JFR will assign the stacktrace depending on the place where the event is committed.
+             * Therefore, we need to commit the event here, right in the 'Exception' constructor
+             */
+            final ExceptionSampleEvent event = ExceptionProfiling.getInstance().process((Throwable) t);
+            if (event != null && event.shouldCommit()) {
+                event.commit();
+            }
+        } finally {
+            CallDepthThreadLocalMap.reset(Throwable.class);
+        }
     }
-    if (ExceptionProfiling.Exclusion.isEffective()) {
-      return;
-    }
-    /*
-     * This instrumentation handler is sensitive to any throwables thrown from its body -
-     * it will go into infinite loop of trying to handle the new throwable instance and generating
-     * another instance while doing so.
-     *
-     * The solution is to keep a TLS flag and just skip the handler if it was invoked as a result of handling
-     * a previous throwable instance (on the same thread).
-     */
-    final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Throwable.class);
-    if (callDepth > 0) {
-      return;
-    }
-    try {
-      /*
-       * We may get into a situation when this is called before exception sampling is active.
-       */
-      if (!InstrumentationBasedProfiling.isJFRReady()) {
-        return;
-      }
-      /*
-       * Exclude internal agent threads from exception profiling.
-       */
-      if (Config.get().isProfilingExcludeAgentThreads()
-          && AGENT_THREAD_GROUP.equals(Thread.currentThread().getThreadGroup())) {
-        return;
-      }
-      /*
-       * JFR will assign the stacktrace depending on the place where the event is committed.
-       * Therefore, we need to commit the event here, right in the 'Exception' constructor
-       */
-      final ExceptionSampleEvent event = ExceptionProfiling.getInstance().process((Throwable) t);
-      if (event != null && event.shouldCommit()) {
-        event.commit();
-      }
-    } finally {
-      CallDepthThreadLocalMap.reset(Throwable.class);
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/com/zaxxer/hikari/pool/ProxyLeakTask.java b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/com/zaxxer/hikari/pool/ProxyLeakTask.java
index 88d2c8f4caf..75749b798a3 100644
--- a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/com/zaxxer/hikari/pool/ProxyLeakTask.java
+++ b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/com/zaxxer/hikari/pool/ProxyLeakTask.java
@@ -1,21 +1,21 @@
 package com.zaxxer.hikari.pool;
 
 public class ProxyLeakTask extends Exception {
-  private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-  public ProxyLeakTask() {
-    super("Proxy leak detected");
-  }
+    public ProxyLeakTask() {
+        super("Proxy leak detected");
+    }
 
-  public ProxyLeakTask(String message) {
-    super(message);
-  }
+    public ProxyLeakTask(String message) {
+        super(message);
+    }
 
-  public ProxyLeakTask(String message, Throwable cause) {
-    super(message, cause);
-  }
+    public ProxyLeakTask(String message, Throwable cause) {
+        super(message, cause);
+    }
 
-  public ProxyLeakTask(Throwable cause) {
-    super(cause);
-  }
+    public ProxyLeakTask(Throwable cause) {
+        super(cause);
+    }
 }
diff --git a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTest.java b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTest.java
index f5823a5bebe..55e09330ee1 100644
--- a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTest.java
+++ b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTest.java
@@ -35,288 +35,261 @@
 
 public class ExceptionHistogramTest {
 
-  private static final IAttribute<String> TYPE =
-      Attribute.attr("type", "type", "Exception type", UnitLookup.PLAIN_TEXT);
-  private static final IAttribute<IQuantity> COUNT =
-      Attribute.attr("count", "count", "Exception count", UnitLookup.NUMBER);
+    private static final IAttribute<String> TYPE =
+            Attribute.attr("type", "type", "Exception type", UnitLookup.PLAIN_TEXT);
+    private static final IAttribute<IQuantity> COUNT =
+            Attribute.attr("count", "count", "Exception count", UnitLookup.NUMBER);
 
-  private static final Comparator<Exception> EXCEPTION_COMPARATOR =
-      new Comparator<Exception>() {
+    private static final Comparator<Exception> EXCEPTION_COMPARATOR = new Comparator<Exception>() {
         @Override
         public int compare(final Exception e1, final Exception e2) {
-          return e1.getClass().getCanonicalName().compareTo(e2.getClass().getCanonicalName());
+            return e1.getClass().getCanonicalName().compareTo(e2.getClass().getCanonicalName());
         }
 
         @Override
         public boolean equals(final Object obj) {
-          return this == obj;
+            return this == obj;
         }
-      };
+    };
 
-  private static final int MAX_ITEMS = 2;
-  private static final int MAX_SIZE = 2;
+    private static final int MAX_ITEMS = 2;
+    private static final int MAX_SIZE = 2;
 
-  private Recording recording;
-  private Recording snapshot;
-  private ExceptionHistogram instance;
+    private Recording recording;
+    private Recording snapshot;
+    private ExceptionHistogram instance;
 
-  @BeforeAll
-  public static void precheck() {
-    assumeFalse(JavaVirtualMachine.isJ9());
-  }
+    @BeforeAll
+    public static void precheck() {
+        assumeFalse(JavaVirtualMachine.isJ9());
+    }
+
+    @BeforeEach
+    public void setup() {
+        recording = new Recording();
+        recording.enable("datadog.ExceptionCount");
+        recording.start();
+
+        final Properties properties = new Properties();
+        properties.setProperty(PROFILING_EXCEPTION_HISTOGRAM_TOP_ITEMS, Integer.toString(MAX_ITEMS));
 
-  @BeforeEach
-  public void setup() {
-    recording = new Recording();
-    recording.enable("datadog.ExceptionCount");
-    recording.start();
+        instance = ExceptionHistogramTestBridge.create(Config.get(properties));
+    }
 
-    final Properties properties = new Properties();
-    properties.setProperty(PROFILING_EXCEPTION_HISTOGRAM_TOP_ITEMS, Integer.toString(MAX_ITEMS));
+    @AfterEach
+    public void tearDown() {
+        if (snapshot != null) {
+            snapshot.close();
+        }
+        recording.close();
+        ExceptionHistogramTestBridge.deregister(instance);
+    }
 
-    instance = ExceptionHistogramTestBridge.create(Config.get(properties));
-  }
+    @Test
+    public void testFirstHitConcurrent() {
+        Phaser phaser = new Phaser(2);
+
+        ExceptionHistogram histogram = ExceptionHistogramTestBridge.create(Config.get(), () -> {
+            // below code is executed after emitEvents() returns:
+            // #1 - histo sums are reset but 0 entries not removed yet
+            phaser.arriveAndAwaitAdvance();
+            // #2 - safe to leave the emit() method
+            phaser.arriveAndAwaitAdvance();
+        });
+        // don't want the JFR integration active here
+        ExceptionHistogramTestBridge.deregister(histogram);
+        for (int i = 0; i < 5; i++) {
+            boolean firstHit = histogram.record(new NullPointerException());
+            assertEquals(i == 0, firstHit);
+        }
 
-  @AfterEach
-  public void tearDown() {
-    if (snapshot != null) {
-      snapshot.close();
+        // start emitting in a separate thread
+        new Thread(() -> ExceptionHistogramTestBridge.doEmit(histogram)).start();
+        // wait for #1 - this is the point where data race can happen if new exceptions are recording
+        // during 'emit()'
+        phaser.arriveAndAwaitAdvance();
+        // make sure that any exception recording during 'emit()' has a correct 'first hit' status
+        assertTrue(histogram.record(new NullPointerException()));
+        // unblock #2 such that 'emit()' may continue
+        phaser.arrive();
+
+        // the subsequent exception recording will not be a 'first hit'
+        assertFalse(histogram.record(new NullPointerException()));
     }
-    recording.close();
-    ExceptionHistogramTestBridge.deregister(instance);
-  }
-
-  @Test
-  public void testFirstHitConcurrent() {
-    Phaser phaser = new Phaser(2);
-
-    ExceptionHistogram histogram =
-        ExceptionHistogramTestBridge.create(
-            Config.get(),
-            () -> {
-              // below code is executed after emitEvents() returns:
-              // #1 - histo sums are reset but 0 entries not removed yet
-              phaser.arriveAndAwaitAdvance();
-              // #2 - safe to leave the emit() method
-              phaser.arriveAndAwaitAdvance();
-            });
-    // don't want the JFR integration active here
-    ExceptionHistogramTestBridge.deregister(histogram);
-    for (int i = 0; i < 5; i++) {
-      boolean firstHit = histogram.record(new NullPointerException());
-      assertEquals(i == 0, firstHit);
+
+    @Test
+    public void testExceptionsRecorded() throws IOException, CouldNotLoadRecordingException, InterruptedException {
+        writeExceptions(ImmutableMap.of(
+                new NullPointerException(), 8, new IllegalArgumentException(), 5, new RuntimeException(), 1));
+
+        final Instant firstRecordingNow = Instant.now();
+        snapshot = FlightRecorder.getFlightRecorder().takeSnapshot();
+        final IItemCollection firstRecording = getEvents(snapshot, Instant.MIN, firstRecordingNow);
+
+        assertEquals(MAX_ITEMS, firstRecording.getAggregate(Aggregators.count()).longValue());
+        assertEquals(
+                8,
+                firstRecording
+                        .apply(ItemFilters.equals(TYPE, NullPointerException.class.getCanonicalName()))
+                        .getAggregate(Aggregators.sum(COUNT))
+                        .longValue());
+        assertEquals(
+                5,
+                firstRecording
+                        .apply(ItemFilters.equals(TYPE, IllegalArgumentException.class.getCanonicalName()))
+                        .getAggregate(Aggregators.sum(COUNT))
+                        .longValue());
+        snapshot.close();
+
+        // Sleep to make sure we get new batch of exceptions only
+        Thread.sleep(1000);
+
+        writeExceptions(ImmutableMap.of(
+                new RuntimeException(), 8, new NullPointerException(), 5, new IllegalArgumentException(), 1));
+
+        snapshot = FlightRecorder.getFlightRecorder().takeSnapshot();
+        final IItemCollection secondRecording = getEvents(snapshot, firstRecordingNow.plusMillis(1000), Instant.MAX);
+
+        assertEquals(
+                MAX_ITEMS, secondRecording.getAggregate(Aggregators.count()).longValue());
+        assertEquals(
+                8,
+                secondRecording
+                        .apply(ItemFilters.equals(TYPE, RuntimeException.class.getCanonicalName()))
+                        .getAggregate(Aggregators.sum(COUNT))
+                        .longValue());
+        assertEquals(
+                5,
+                secondRecording
+                        .apply(ItemFilters.equals(TYPE, NullPointerException.class.getCanonicalName()))
+                        .getAggregate(Aggregators.sum(COUNT))
+                        .longValue());
+        snapshot.close();
     }
 
-    // start emitting in a separate thread
-    new Thread(() -> ExceptionHistogramTestBridge.doEmit(histogram)).start();
-    // wait for #1 - this is the point where data race can happen if new exceptions are recording
-    // during 'emit()'
-    phaser.arriveAndAwaitAdvance();
-    // make sure that any exception recording during 'emit()' has a correct 'first hit' status
-    assertTrue(histogram.record(new NullPointerException()));
-    // unblock #2 such that 'emit()' may continue
-    phaser.arrive();
-
-    // the subsequent exception recording will not be a 'first hit'
-    assertFalse(histogram.record(new NullPointerException()));
-  }
-
-  @Test
-  public void testExceptionsRecorded()
-      throws IOException, CouldNotLoadRecordingException, InterruptedException {
-    writeExceptions(
-        ImmutableMap.of(
-            new NullPointerException(),
-            8,
-            new IllegalArgumentException(),
-            5,
-            new RuntimeException(),
-            1));
-
-    final Instant firstRecordingNow = Instant.now();
-    snapshot = FlightRecorder.getFlightRecorder().takeSnapshot();
-    final IItemCollection firstRecording = getEvents(snapshot, Instant.MIN, firstRecordingNow);
-
-    assertEquals(MAX_ITEMS, firstRecording.getAggregate(Aggregators.count()).longValue());
-    assertEquals(
-        8,
-        firstRecording
-            .apply(ItemFilters.equals(TYPE, NullPointerException.class.getCanonicalName()))
-            .getAggregate(Aggregators.sum(COUNT))
-            .longValue());
-    assertEquals(
-        5,
-        firstRecording
-            .apply(ItemFilters.equals(TYPE, IllegalArgumentException.class.getCanonicalName()))
-            .getAggregate(Aggregators.sum(COUNT))
-            .longValue());
-    snapshot.close();
-
-    // Sleep to make sure we get new batch of exceptions only
-    Thread.sleep(1000);
-
-    writeExceptions(
-        ImmutableMap.of(
-            new RuntimeException(),
-            8,
-            new NullPointerException(),
-            5,
-            new IllegalArgumentException(),
-            1));
-
-    snapshot = FlightRecorder.getFlightRecorder().takeSnapshot();
-    final IItemCollection secondRecording =
-        getEvents(snapshot, firstRecordingNow.plusMillis(1000), Instant.MAX);
-
-    assertEquals(MAX_ITEMS, secondRecording.getAggregate(Aggregators.count()).longValue());
-    assertEquals(
-        8,
-        secondRecording
-            .apply(ItemFilters.equals(TYPE, RuntimeException.class.getCanonicalName()))
-            .getAggregate(Aggregators.sum(COUNT))
-            .longValue());
-    assertEquals(
-        5,
-        secondRecording
-            .apply(ItemFilters.equals(TYPE, NullPointerException.class.getCanonicalName()))
-            .getAggregate(Aggregators.sum(COUNT))
-            .longValue());
-    snapshot.close();
-  }
-
-  @Test
-  public void testHistogramSizeIsLimited()
-      throws IOException, CouldNotLoadRecordingException, InterruptedException {
-    ExceptionHistogramTestBridge.deregister(instance);
-    final Properties properties = new Properties();
-    properties.setProperty(
-        PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE, Integer.toString(MAX_SIZE));
-
-    instance = ExceptionHistogramTestBridge.create(Config.get(properties));
-
-    // Exceptions are written in alphabetical order
-    writeExceptions(
-        ImmutableSortedMap.copyOf(
-            ImmutableMap.of(
-                new Exception(),
+    @Test
+    public void testHistogramSizeIsLimited() throws IOException, CouldNotLoadRecordingException, InterruptedException {
+        ExceptionHistogramTestBridge.deregister(instance);
+        final Properties properties = new Properties();
+        properties.setProperty(PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE, Integer.toString(MAX_SIZE));
+
+        instance = ExceptionHistogramTestBridge.create(Config.get(properties));
+
+        // Exceptions are written in alphabetical order
+        writeExceptions(ImmutableSortedMap.copyOf(
+                ImmutableMap.of(
+                        new Exception(),
+                        5,
+                        new IllegalArgumentException(),
+                        8,
+                        new NegativeArraySizeException(),
+                        10,
+                        new NullPointerException(),
+                        11),
+                EXCEPTION_COMPARATOR));
+
+        final Instant firstRecordingNow = Instant.now();
+        snapshot = FlightRecorder.getFlightRecorder().takeSnapshot();
+        final IItemCollection firstRecording = getEvents(snapshot, Instant.MIN, firstRecordingNow);
+
+        assertEquals(
+                MAX_ITEMS + 1, firstRecording.getAggregate(Aggregators.count()).longValue());
+        assertEquals(
                 5,
-                new IllegalArgumentException(),
+                firstRecording
+                        .apply(ItemFilters.equals(TYPE, Exception.class.getCanonicalName()))
+                        .getAggregate(Aggregators.sum(COUNT))
+                        .longValue());
+        assertEquals(
                 8,
-                new NegativeArraySizeException(),
-                10,
-                new NullPointerException(),
-                11),
-            EXCEPTION_COMPARATOR));
-
-    final Instant firstRecordingNow = Instant.now();
-    snapshot = FlightRecorder.getFlightRecorder().takeSnapshot();
-    final IItemCollection firstRecording = getEvents(snapshot, Instant.MIN, firstRecordingNow);
-
-    assertEquals(MAX_ITEMS + 1, firstRecording.getAggregate(Aggregators.count()).longValue());
-    assertEquals(
-        5,
-        firstRecording
-            .apply(ItemFilters.equals(TYPE, Exception.class.getCanonicalName()))
-            .getAggregate(Aggregators.sum(COUNT))
-            .longValue());
-    assertEquals(
-        8,
-        firstRecording
-            .apply(ItemFilters.equals(TYPE, IllegalArgumentException.class.getCanonicalName()))
-            .getAggregate(Aggregators.sum(COUNT))
-            .longValue());
-    assertEquals(
-        21,
-        firstRecording
-            .apply(ItemFilters.equals(TYPE, ExceptionHistogram.CLIPPED_ENTRY_TYPE_NAME))
-            .getAggregate(Aggregators.sum(COUNT))
-            .longValue());
-    snapshot.close();
-
-    // Sleep to make sure we get new batch of exceptions only
-    Thread.sleep(1000);
-
-    // Exceptions are written in 'code' order
-    writeExceptions(
-        ImmutableSortedMap.copyOf(
-            ImmutableMap.of(
-                new IllegalArgumentException(),
+                firstRecording
+                        .apply(ItemFilters.equals(TYPE, IllegalArgumentException.class.getCanonicalName()))
+                        .getAggregate(Aggregators.sum(COUNT))
+                        .longValue());
+        assertEquals(
+                21,
+                firstRecording
+                        .apply(ItemFilters.equals(TYPE, ExceptionHistogram.CLIPPED_ENTRY_TYPE_NAME))
+                        .getAggregate(Aggregators.sum(COUNT))
+                        .longValue());
+        snapshot.close();
+
+        // Sleep to make sure we get new batch of exceptions only
+        Thread.sleep(1000);
+
+        // Exceptions are written in 'code' order
+        writeExceptions(ImmutableSortedMap.copyOf(
+                ImmutableMap.of(
+                        new IllegalArgumentException(),
+                        5,
+                        new NegativeArraySizeException(),
+                        8,
+                        new NullPointerException(),
+                        10,
+                        new RuntimeException(),
+                        11),
+                EXCEPTION_COMPARATOR));
+
+        snapshot = FlightRecorder.getFlightRecorder().takeSnapshot();
+        final IItemCollection secondRecording = getEvents(snapshot, firstRecordingNow.plusMillis(1000), Instant.MAX);
+
+        assertEquals(
+                MAX_ITEMS + 1, secondRecording.getAggregate(Aggregators.count()).longValue());
+        assertEquals(
                 5,
-                new NegativeArraySizeException(),
+                secondRecording
+                        .apply(ItemFilters.equals(TYPE, IllegalArgumentException.class.getCanonicalName()))
+                        .getAggregate(Aggregators.sum(COUNT))
+                        .longValue());
+        assertEquals(
                 8,
-                new NullPointerException(),
-                10,
-                new RuntimeException(),
-                11),
-            EXCEPTION_COMPARATOR));
-
-    snapshot = FlightRecorder.getFlightRecorder().takeSnapshot();
-    final IItemCollection secondRecording =
-        getEvents(snapshot, firstRecordingNow.plusMillis(1000), Instant.MAX);
-
-    assertEquals(MAX_ITEMS + 1, secondRecording.getAggregate(Aggregators.count()).longValue());
-    assertEquals(
-        5,
-        secondRecording
-            .apply(ItemFilters.equals(TYPE, IllegalArgumentException.class.getCanonicalName()))
-            .getAggregate(Aggregators.sum(COUNT))
-            .longValue());
-    assertEquals(
-        8,
-        secondRecording
-            .apply(ItemFilters.equals(TYPE, NegativeArraySizeException.class.getCanonicalName()))
-            .getAggregate(Aggregators.sum(COUNT))
-            .longValue());
-    assertEquals(
-        21,
-        firstRecording
-            .apply(ItemFilters.equals(TYPE, ExceptionHistogram.CLIPPED_ENTRY_TYPE_NAME))
-            .getAggregate(Aggregators.sum(COUNT))
-            .longValue());
-    snapshot.close();
-  }
-
-  @Test
-  public void testDisabled() throws IOException, CouldNotLoadRecordingException {
-    recording.disable("datadog.ExceptionCount");
-    final Map<Exception, Integer> exceptions =
-        ImmutableMap.of(
-            new NullPointerException(),
-            8,
-            new IllegalArgumentException(),
-            5,
-            new RuntimeException(),
-            1);
-
-    for (final Map.Entry<Exception, Integer> entry : exceptions.entrySet()) {
-      for (int i = 0; i < entry.getValue(); i++) {
-        assertFalse(instance.record(entry.getKey()));
-      }
+                secondRecording
+                        .apply(ItemFilters.equals(TYPE, NegativeArraySizeException.class.getCanonicalName()))
+                        .getAggregate(Aggregators.sum(COUNT))
+                        .longValue());
+        assertEquals(
+                21,
+                firstRecording
+                        .apply(ItemFilters.equals(TYPE, ExceptionHistogram.CLIPPED_ENTRY_TYPE_NAME))
+                        .getAggregate(Aggregators.sum(COUNT))
+                        .longValue());
+        snapshot.close();
     }
 
-    final Recording snapshot = FlightRecorder.getFlightRecorder().takeSnapshot();
-    final IItemCollection recording = getEvents(snapshot, Instant.MIN, Instant.MAX);
+    @Test
+    public void testDisabled() throws IOException, CouldNotLoadRecordingException {
+        recording.disable("datadog.ExceptionCount");
+        final Map<Exception, Integer> exceptions = ImmutableMap.of(
+                new NullPointerException(), 8, new IllegalArgumentException(), 5, new RuntimeException(), 1);
 
-    assertEquals(0, recording.getAggregate(Aggregators.count()).longValue());
+        for (final Map.Entry<Exception, Integer> entry : exceptions.entrySet()) {
+            for (int i = 0; i < entry.getValue(); i++) {
+                assertFalse(instance.record(entry.getKey()));
+            }
+        }
+
+        final Recording snapshot = FlightRecorder.getFlightRecorder().takeSnapshot();
+        final IItemCollection recording = getEvents(snapshot, Instant.MIN, Instant.MAX);
+
+        assertEquals(0, recording.getAggregate(Aggregators.count()).longValue());
 
-    snapshot.close();
-  }
+        snapshot.close();
+    }
 
-  private IItemCollection getEvents(
-      final Recording secondSnapshot, final Instant start, final Instant end)
-      throws IOException, CouldNotLoadRecordingException {
-    return JfrLoaderToolkit.loadEvents(secondSnapshot.getStream(start, end))
-        .apply(ItemFilters.type("datadog.ExceptionCount"));
-  }
+    private IItemCollection getEvents(final Recording secondSnapshot, final Instant start, final Instant end)
+            throws IOException, CouldNotLoadRecordingException {
+        return JfrLoaderToolkit.loadEvents(secondSnapshot.getStream(start, end))
+                .apply(ItemFilters.type("datadog.ExceptionCount"));
+    }
 
-  private void writeExceptions(final Map<Exception, Integer> exceptions) {
-    // Just check that writing null doesn't break anything
-    instance.record(null);
+    private void writeExceptions(final Map<Exception, Integer> exceptions) {
+        // Just check that writing null doesn't break anything
+        instance.record(null);
 
-    for (final Map.Entry<Exception, Integer> entry : exceptions.entrySet()) {
-      for (int i = 0; i < entry.getValue(); i++) {
-        instance.record(entry.getKey());
-      }
+        for (final Map.Entry<Exception, Integer> entry : exceptions.entrySet()) {
+            for (int i = 0; i < entry.getValue(); i++) {
+                instance.record(entry.getKey());
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTestBridge.java b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTestBridge.java
index 4fcb63ea1d8..cde59052c49 100644
--- a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTestBridge.java
+++ b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTestBridge.java
@@ -16,25 +16,25 @@
  */
 public class ExceptionHistogramTestBridge {
 
-  public static ExceptionHistogram create(final Config config) {
-    return new ExceptionHistogram(config);
-  }
+    public static ExceptionHistogram create(final Config config) {
+        return new ExceptionHistogram(config);
+    }
 
-  public static ExceptionHistogram create(final Config config, Runnable afterEmit) {
-    return new ExceptionHistogram(config) {
-      @Override
-      void emitEvents(Stream<Pair<String, Long>> items) {
-        super.emitEvents(items);
-        afterEmit.run();
-      }
-    };
-  }
+    public static ExceptionHistogram create(final Config config, Runnable afterEmit) {
+        return new ExceptionHistogram(config) {
+            @Override
+            void emitEvents(Stream<Pair<String, Long>> items) {
+                super.emitEvents(items);
+                afterEmit.run();
+            }
+        };
+    }
 
-  public static void doEmit(final ExceptionHistogram histogram) {
-    histogram.doEmit();
-  }
+    public static void doEmit(final ExceptionHistogram histogram) {
+        histogram.doEmit();
+    }
 
-  public static void deregister(final ExceptionHistogram histogram) {
-    histogram.deregister();
-  }
+    public static void deregister(final ExceptionHistogram histogram) {
+        histogram.deregister();
+    }
 }
diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAdvice.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAdvice.java
index d43d2aab353..3fdb79f7d46 100644
--- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAdvice.java
+++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAdvice.java
@@ -11,21 +11,19 @@
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
 
 public class DoNotTraceAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope before() {
-    return activateSpan(blackholeSpan());
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope before() {
+        return activateSpan(blackholeSpan());
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void after(
-      @Advice.Enter final ContextScope scope,
-      @Advice.Origin final MethodType methodType,
-      @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false) Object result) {
-    if (scope != null) {
-      scope.close();
-      result =
-          DECORATE.wrapAsyncResultOrFinishSpan(
-              result, methodType.returnType(), spanFromScope(scope));
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void after(
+            @Advice.Enter final ContextScope scope,
+            @Advice.Origin final MethodType methodType,
+            @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false) Object result) {
+        if (scope != null) {
+            scope.close();
+            result = DECORATE.wrapAsyncResultOrFinishSpan(result, methodType.returnType(), spanFromScope(scope));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java
index 3173e479158..30f2ab4e2fe 100644
--- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java
+++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java
@@ -13,26 +13,25 @@
 
 @AutoService(InstrumenterModule.class)
 public final class DoNotTraceAnnotationInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @SuppressForbidden
-  public DoNotTraceAnnotationInstrumentation() {
-    super("not-not-trace", "do-not-trace-annotation");
-  }
+    @SuppressForbidden
+    public DoNotTraceAnnotationInstrumentation() {
+        super("not-not-trace", "do-not-trace-annotation");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "datadog.trace.api.DoNotTrace";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "datadog.trace.api.DoNotTrace";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return declaresMethod(isAnnotatedWith(named(hierarchyMarkerType())));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return declaresMethod(isAnnotatedWith(named(hierarchyMarkerType())));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isAnnotatedWith(named(hierarchyMarkerType())), packageName + ".DoNotTraceAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isAnnotatedWith(named(hierarchyMarkerType())), packageName + ".DoNotTraceAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java
index 493202c1f9e..a857a1f8bde 100644
--- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java
+++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java
@@ -14,26 +14,25 @@
 
 public class TraceAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(@Advice.Origin final Method method) {
-    ContextScope agentScope = activateSpan(DECORATE.startMethodSpan(method));
-    marker();
-    captureCodeOrigin(method, true);
-    return agentScope;
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(@Advice.Origin final Method method) {
+        ContextScope agentScope = activateSpan(DECORATE.startMethodSpan(method));
+        marker();
+        captureCodeOrigin(method, true);
+        return agentScope;
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void stopSpan(
-      @Advice.Enter final ContextScope scope,
-      @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false) Object result,
-      @Advice.Origin final MethodType methodType,
-      @Advice.Thrown final Throwable throwable) {
-    DECORATE.onError(scope, throwable);
-    DECORATE.beforeFinish(scope);
-    scope.close();
-    // we must check against the method return signature and not the type of the returned object
-    // otherwise we'll risk to have class cast at runtime
-    result =
-        DECORATE.wrapAsyncResultOrFinishSpan(result, methodType.returnType(), spanFromScope(scope));
-  }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void stopSpan(
+            @Advice.Enter final ContextScope scope,
+            @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false) Object result,
+            @Advice.Origin final MethodType methodType,
+            @Advice.Thrown final Throwable throwable) {
+        DECORATE.onError(scope, throwable);
+        DECORATE.beforeFinish(scope);
+        scope.close();
+        // we must check against the method return signature and not the type of the returned object
+        // otherwise we'll risk to have class cast at runtime
+        result = DECORATE.wrapAsyncResultOrFinishSpan(result, methodType.returnType(), spanFromScope(scope));
+    }
 }
diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java
index 3be53e102d4..1a8ff7c7f13 100644
--- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java
+++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java
@@ -20,62 +20,61 @@
 
 @AutoService(InstrumenterModule.class)
 public final class TraceAnnotationsInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  static final String CONFIG_FORMAT = "(?:\\s*[\\w.$]+\\s*;)*\\s*[\\w.$]+\\s*;?\\s*";
+    static final String CONFIG_FORMAT = "(?:\\s*[\\w.$]+\\s*;)*\\s*[\\w.$]+\\s*;?\\s*";
 
-  private final NameMatchers.OneOf<NamedElement> methodTraceMatcher;
+    private final NameMatchers.OneOf<NamedElement> methodTraceMatcher;
 
-  @SuppressForbidden
-  public TraceAnnotationsInstrumentation() {
-    super("trace", "trace-annotation");
-    this.methodTraceMatcher = namedOneOf(loadAnnotations());
-  }
+    @SuppressForbidden
+    public TraceAnnotationsInstrumentation() {
+        super("trace", "trace-annotation");
+        this.methodTraceMatcher = namedOneOf(loadAnnotations());
+    }
 
-  static Set<String> loadAnnotations() {
-    Set<String> annotations = new HashSet<>();
-    annotations.add("datadog.trace.api.Trace");
-    final String configString = InstrumenterConfig.get().getTraceAnnotations();
-    if (configString == null) {
-      annotations.addAll(
-          Arrays.asList(
-              "com.newrelic.api.agent.Trace",
-              "kamon.annotation.Trace",
-              "com.tracelytics.api.ext.LogMethod",
-              "io.opentracing.contrib.dropwizard.Trace",
-              "org.springframework.cloud.sleuth.annotation.NewSpan"));
-    } else if (!configString.matches(CONFIG_FORMAT)) {
-      LoggerFactory.getLogger(TraceAnnotationsInstrumentation.class)
-          .warn(
-              "Invalid trace annotations config '{}'. Must match 'package.Annotation$Name;*'.",
-              configString);
-    } else {
-      int start = 0;
-      do {
-        int next = configString.indexOf(';', start + 1);
-        int end = next == -1 ? configString.length() : next;
-        String annotation = configString.substring(start, end).trim();
-        if (!annotation.isEmpty()) {
-          annotations.add(annotation);
+    static Set<String> loadAnnotations() {
+        Set<String> annotations = new HashSet<>();
+        annotations.add("datadog.trace.api.Trace");
+        final String configString = InstrumenterConfig.get().getTraceAnnotations();
+        if (configString == null) {
+            annotations.addAll(Arrays.asList(
+                    "com.newrelic.api.agent.Trace",
+                    "kamon.annotation.Trace",
+                    "com.tracelytics.api.ext.LogMethod",
+                    "io.opentracing.contrib.dropwizard.Trace",
+                    "org.springframework.cloud.sleuth.annotation.NewSpan"));
+        } else if (!configString.matches(CONFIG_FORMAT)) {
+            LoggerFactory.getLogger(TraceAnnotationsInstrumentation.class)
+                    .warn(
+                            "Invalid trace annotations config '{}'. Must match 'package.Annotation$Name;*'.",
+                            configString);
+        } else {
+            int start = 0;
+            do {
+                int next = configString.indexOf(';', start + 1);
+                int end = next == -1 ? configString.length() : next;
+                String annotation = configString.substring(start, end).trim();
+                if (!annotation.isEmpty()) {
+                    annotations.add(annotation);
+                }
+                start = next + 1;
+            } while (start != 0);
         }
-        start = next + 1;
-      } while (start != 0);
+        return annotations;
     }
-    return annotations;
-  }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // no particular marker type
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // no particular marker type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return declaresMethod(isAnnotatedWith(methodTraceMatcher));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return declaresMethod(isAnnotatedWith(methodTraceMatcher));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isAnnotatedWith(methodTraceMatcher), packageName + ".TraceAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isAnnotatedWith(methodTraceMatcher), packageName + ".TraceAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java
index c60d6458496..5fc987ea875 100644
--- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java
+++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java
@@ -38,78 +38,75 @@
  */
 @AutoService(InstrumenterModule.class)
 public class TraceConfigInstrumentation extends InstrumenterModule.Tracing {
-  private final Map<String, Set<String>> classMethodsToTrace;
+    private final Map<String, Set<String>> classMethodsToTrace;
 
-  public TraceConfigInstrumentation() {
-    super("trace", "trace-config");
-    classMethodsToTrace = InstrumenterConfig.get().getTraceMethods();
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".TraceDecorator",
-    };
-  }
-
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    if (classMethodsToTrace.isEmpty()) {
-      return emptyList();
-    }
-    List<Instrumenter> typeInstrumentations = new ArrayList<>();
-    for (Map.Entry<String, Set<String>> entry : classMethodsToTrace.entrySet()) {
-      List<String> integrationNames = singletonList("trace-config_" + entry.getKey());
-      if (InstrumenterConfig.get().isIntegrationEnabled(integrationNames, true)) {
-        typeInstrumentations.add(new TracerClassInstrumentation(entry.getKey(), entry.getValue()));
-      }
-    }
-    return typeInstrumentations;
-  }
-
-  // Not Using AutoService to hook up this instrumentation
-  public static class TracerClassInstrumentation implements ForTypeHierarchy, HasMethodAdvice {
-    private final String className;
-    private final Set<String> methodNames;
-
-    public TracerClassInstrumentation(final String className, final Set<String> methodNames) {
-      this.className = className;
-      this.methodNames = methodNames;
+    public TraceConfigInstrumentation() {
+        super("trace", "trace-config");
+        classMethodsToTrace = InstrumenterConfig.get().getTraceMethods();
     }
 
     @Override
-    public String hierarchyMarkerType() {
-      return className;
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".TraceDecorator",
+        };
     }
 
     @Override
-    public ElementMatcher<TypeDescription> hierarchyMatcher() {
-      return hasSuperType(named(hierarchyMarkerType()));
+    public List<Instrumenter> typeInstrumentations() {
+        if (classMethodsToTrace.isEmpty()) {
+            return emptyList();
+        }
+        List<Instrumenter> typeInstrumentations = new ArrayList<>();
+        for (Map.Entry<String, Set<String>> entry : classMethodsToTrace.entrySet()) {
+            List<String> integrationNames = singletonList("trace-config_" + entry.getKey());
+            if (InstrumenterConfig.get().isIntegrationEnabled(integrationNames, true)) {
+                typeInstrumentations.add(new TracerClassInstrumentation(entry.getKey(), entry.getValue()));
+            }
+        }
+        return typeInstrumentations;
     }
 
-    @Override
-    public void methodAdvice(MethodTransformer transformer) {
-      boolean hasWildcard = false;
-      for (String methodName : methodNames) {
-        hasWildcard |= methodName.equals("*");
-      }
-      ElementMatcher<MethodDescription> methodFilter;
-      if (hasWildcard) {
-        methodFilter =
-            not(
-                isHashCode()
-                    .or(isEquals())
-                    .or(isToString())
-                    .or(isFinalizer())
-                    .or(isGetter())
-                    .or(isSetter())
-                    .or(isSynthetic()));
-      } else {
-        methodFilter = namedOneOf(methodNames);
-      }
-      transformer.applyAdvice(
-          isMethod().and(methodFilter),
-          "datadog.trace.instrumentation.trace_annotation.TraceAdvice");
+    // Not Using AutoService to hook up this instrumentation
+    public static class TracerClassInstrumentation implements ForTypeHierarchy, HasMethodAdvice {
+        private final String className;
+        private final Set<String> methodNames;
+
+        public TracerClassInstrumentation(final String className, final Set<String> methodNames) {
+            this.className = className;
+            this.methodNames = methodNames;
+        }
+
+        @Override
+        public String hierarchyMarkerType() {
+            return className;
+        }
+
+        @Override
+        public ElementMatcher<TypeDescription> hierarchyMatcher() {
+            return hasSuperType(named(hierarchyMarkerType()));
+        }
+
+        @Override
+        public void methodAdvice(MethodTransformer transformer) {
+            boolean hasWildcard = false;
+            for (String methodName : methodNames) {
+                hasWildcard |= methodName.equals("*");
+            }
+            ElementMatcher<MethodDescription> methodFilter;
+            if (hasWildcard) {
+                methodFilter = not(isHashCode()
+                        .or(isEquals())
+                        .or(isToString())
+                        .or(isFinalizer())
+                        .or(isGetter())
+                        .or(isSetter())
+                        .or(isSynthetic()));
+            } else {
+                methodFilter = namedOneOf(methodNames);
+            }
+            transformer.applyAdvice(
+                    isMethod().and(methodFilter), "datadog.trace.instrumentation.trace_annotation.TraceAdvice");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceDecorator.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceDecorator.java
index 34311bf4c23..288520f95b5 100644
--- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceDecorator.java
+++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceDecorator.java
@@ -10,101 +10,99 @@
 import java.lang.reflect.Method;
 
 public class TraceDecorator extends AsyncResultDecorator {
-  public static TraceDecorator DECORATE = new TraceDecorator();
-  private static final String INSTRUMENTATION_NAME = "trace";
-
-  private static final boolean USE_LEGACY_OPERATION_NAME =
-      InstrumenterConfig.get().isLegacyInstrumentationEnabled(true, "trace.annotations");
-
-  private static final boolean ASYNC_SUPPORT = InstrumenterConfig.get().isTraceAnnotationAsync();
-
-  private static final CharSequence TRACE = UTF8BytesString.create("trace");
-
-  private static final String DEFAULT_OPERATION_NAME = "trace.annotation";
-
-  @Override
-  protected String[] instrumentationNames() {
-    // Can't use "trace" because that's used as the general config name:
-    return new String[] {"trace-annotation", "trace-config"};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return TRACE;
-  }
-
-  public boolean useLegacyOperationName() {
-    return USE_LEGACY_OPERATION_NAME;
-  }
-
-  public AgentSpan startMethodSpan(Method method) {
-    CharSequence operationName = null;
-    CharSequence resourceName = null;
-    boolean measured = false;
-    boolean noParent = false;
-
-    Trace traceAnnotation = method.getAnnotation(Trace.class);
-    if (null != traceAnnotation) {
-      operationName = traceAnnotation.operationName();
-      try {
-        resourceName = traceAnnotation.resourceName();
-      } catch (Throwable ignore) {
-        // dd-trace-api < 0.31.0 on classpath
-      }
-
-      try {
-        measured = traceAnnotation.measured();
-      } catch (Throwable ignore) {
-        // dd-trace-api < 1.10.0 on classpath
-      }
-
-      try {
-        noParent = traceAnnotation.noParent();
-      } catch (Throwable ignore) {
-        // dd-trace-api < 1.22.0 on classpath
-      }
-    }
+    public static TraceDecorator DECORATE = new TraceDecorator();
+    private static final String INSTRUMENTATION_NAME = "trace";
+
+    private static final boolean USE_LEGACY_OPERATION_NAME =
+            InstrumenterConfig.get().isLegacyInstrumentationEnabled(true, "trace.annotations");
+
+    private static final boolean ASYNC_SUPPORT = InstrumenterConfig.get().isTraceAnnotationAsync();
+
+    private static final CharSequence TRACE = UTF8BytesString.create("trace");
 
-    if (operationName == null || operationName.length() == 0) {
-      if (useLegacyOperationName()) {
-        operationName = DEFAULT_OPERATION_NAME;
-      } else {
-        operationName = spanNameForMethod(method);
-      }
+    private static final String DEFAULT_OPERATION_NAME = "trace.annotation";
+
+    @Override
+    protected String[] instrumentationNames() {
+        // Can't use "trace" because that's used as the general config name:
+        return new String[] {"trace-annotation", "trace-config"};
     }
 
-    if (resourceName == null || resourceName.length() == 0) {
-      resourceName = spanNameForMethod(method);
+    @Override
+    protected CharSequence spanType() {
+        return null;
     }
 
-    AgentSpan span =
-        noParent
-            ? startSpan(INSTRUMENTATION_NAME, operationName, null)
-            : startSpan(INSTRUMENTATION_NAME, operationName);
+    @Override
+    protected CharSequence component() {
+        return TRACE;
+    }
 
-    afterStart(span);
-    span.setResourceName(resourceName);
+    public boolean useLegacyOperationName() {
+        return USE_LEGACY_OPERATION_NAME;
+    }
 
-    if (measured || InstrumenterConfig.get().isMethodMeasured(method)) {
-      span.setMeasured(true);
+    public AgentSpan startMethodSpan(Method method) {
+        CharSequence operationName = null;
+        CharSequence resourceName = null;
+        boolean measured = false;
+        boolean noParent = false;
+
+        Trace traceAnnotation = method.getAnnotation(Trace.class);
+        if (null != traceAnnotation) {
+            operationName = traceAnnotation.operationName();
+            try {
+                resourceName = traceAnnotation.resourceName();
+            } catch (Throwable ignore) {
+                // dd-trace-api < 0.31.0 on classpath
+            }
+
+            try {
+                measured = traceAnnotation.measured();
+            } catch (Throwable ignore) {
+                // dd-trace-api < 1.10.0 on classpath
+            }
+
+            try {
+                noParent = traceAnnotation.noParent();
+            } catch (Throwable ignore) {
+                // dd-trace-api < 1.22.0 on classpath
+            }
+        }
+
+        if (operationName == null || operationName.length() == 0) {
+            if (useLegacyOperationName()) {
+                operationName = DEFAULT_OPERATION_NAME;
+            } else {
+                operationName = spanNameForMethod(method);
+            }
+        }
+
+        if (resourceName == null || resourceName.length() == 0) {
+            resourceName = spanNameForMethod(method);
+        }
+
+        AgentSpan span = noParent
+                ? startSpan(INSTRUMENTATION_NAME, operationName, null)
+                : startSpan(INSTRUMENTATION_NAME, operationName);
+
+        afterStart(span);
+        span.setResourceName(resourceName);
+
+        if (measured || InstrumenterConfig.get().isMethodMeasured(method)) {
+            span.setMeasured(true);
+        }
+
+        return span;
     }
 
-    return span;
-  }
-
-  @Override
-  public Object wrapAsyncResultOrFinishSpan(
-      Object result, Class<?> methodReturnType, AgentSpan span) {
-    if (ASYNC_SUPPORT) {
-      return super.wrapAsyncResultOrFinishSpan(result, methodReturnType, span);
-    } else {
-      span.finish();
-      return result;
+    @Override
+    public Object wrapAsyncResultOrFinishSpan(Object result, Class<?> methodReturnType, AgentSpan span) {
+        if (ASYNC_SUPPORT) {
+            return super.wrapAsyncResultOrFinishSpan(result, methodReturnType, span);
+        } else {
+            span.finish();
+            return result;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/OuterClass.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/OuterClass.java
index 7f5efac3274..9667a54067e 100644
--- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/OuterClass.java
+++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/OuterClass.java
@@ -6,7 +6,7 @@
 
 public class OuterClass {
 
-  @Retention(RUNTIME)
-  @Target(METHOD)
-  public @interface InterestingMethod {}
+    @Retention(RUNTIME)
+    @Target(METHOD)
+    public @interface InterestingMethod {}
 }
diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/DontTraceClass.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/DontTraceClass.java
index ebb875610ac..de72f49c5fa 100644
--- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/DontTraceClass.java
+++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/DontTraceClass.java
@@ -4,11 +4,11 @@
 import datadog.trace.api.Trace;
 
 public class DontTraceClass {
-  @DoNotTrace
-  public void muted() {
-    normallyTraced();
-  }
+    @DoNotTrace
+    public void muted() {
+        normallyTraced();
+    }
 
-  @Trace
-  public void normallyTraced() {}
+    @Trace
+    public void normallyTraced() {}
 }
diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/SayTracedHello.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/SayTracedHello.java
index 24c4468ec9e..6426646e12b 100644
--- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/SayTracedHello.java
+++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/SayTracedHello.java
@@ -10,103 +10,102 @@
 
 public class SayTracedHello {
 
-  @Trace
-  public static String sayHello() {
-    activeSpan().setTag(DDTags.SERVICE_NAME, "test");
-    return "hello!";
-  }
-
-  @Trace(resourceName = "WORLD")
-  public static String sayHelloOnlyResourceSet() {
-    activeSpan().setTag(DDTags.SERVICE_NAME, "test");
-    return "hello!";
-  }
-
-  @Trace(operationName = "SAY_HA")
-  public static String sayHA() {
-    activeSpan().setTag(DDTags.SERVICE_NAME, "test");
-    activeSpan().setSpanType("DB");
-    return "HA!!";
-  }
-
-  @Trace(operationName = "SAY_HA", resourceName = "EARTH")
-  public static String sayHAWithResource() {
-    activeSpan().setTag(DDTags.SERVICE_NAME, "test");
-    activeSpan().setSpanType("DB");
-    return "HA EARTH!!";
-  }
-
-  @Trace(operationName = "NEW_TRACE")
-  public static String sayHELLOsayHA() {
-    activeSpan().setTag(DDTags.SERVICE_NAME, "test2");
-    return sayHello() + sayHA();
-  }
-
-  @Trace(operationName = "NEW_TRACE", resourceName = "WORLD")
-  public static String sayHELLOsayHAWithResource() {
-    activeSpan().setTag(DDTags.SERVICE_NAME, "test2");
-    return sayHello() + sayHA();
-  }
-
-  @Trace(operationName = "NEW_TRACE", resourceName = "WORLD")
-  public static String sayHELLOsayHAMixedResourceChildren() {
-    activeSpan().setTag(DDTags.SERVICE_NAME, "test2");
-    return sayHello() + sayHAWithResource();
-  }
-
-  @Trace(measured = true)
-  public static String sayHelloMeasured() {
-    activeSpan().setTag(DDTags.SERVICE_NAME, "test");
-    return "hello!";
-  }
-
-  @Trace(noParent = true)
-  public static String sayHelloNoParent() {
-    activeSpan().setTag(DDTags.SERVICE_NAME, "test");
-    return "hello!";
-  }
-
-  @Trace(operationName = "ERROR")
-  public static String sayERROR() {
-    throw new RuntimeException();
-  }
-
-  @Trace(operationName = "ERROR", resourceName = "WORLD")
-  public static String sayERRORWithResource() {
-    throw new RuntimeException();
-  }
-
-  @Trace
-  public static CompletableFuture<String> sayHelloFuture(CountDownLatch latch) {
-    activeSpan().setTag(DDTags.SERVICE_NAME, "test");
-    return CompletableFuture.supplyAsync(
-        () -> {
-          try {
-            latch.await();
-          } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-          }
-          return "hello!";
+    @Trace
+    public static String sayHello() {
+        activeSpan().setTag(DDTags.SERVICE_NAME, "test");
+        return "hello!";
+    }
+
+    @Trace(resourceName = "WORLD")
+    public static String sayHelloOnlyResourceSet() {
+        activeSpan().setTag(DDTags.SERVICE_NAME, "test");
+        return "hello!";
+    }
+
+    @Trace(operationName = "SAY_HA")
+    public static String sayHA() {
+        activeSpan().setTag(DDTags.SERVICE_NAME, "test");
+        activeSpan().setSpanType("DB");
+        return "HA!!";
+    }
+
+    @Trace(operationName = "SAY_HA", resourceName = "EARTH")
+    public static String sayHAWithResource() {
+        activeSpan().setTag(DDTags.SERVICE_NAME, "test");
+        activeSpan().setSpanType("DB");
+        return "HA EARTH!!";
+    }
+
+    @Trace(operationName = "NEW_TRACE")
+    public static String sayHELLOsayHA() {
+        activeSpan().setTag(DDTags.SERVICE_NAME, "test2");
+        return sayHello() + sayHA();
+    }
+
+    @Trace(operationName = "NEW_TRACE", resourceName = "WORLD")
+    public static String sayHELLOsayHAWithResource() {
+        activeSpan().setTag(DDTags.SERVICE_NAME, "test2");
+        return sayHello() + sayHA();
+    }
+
+    @Trace(operationName = "NEW_TRACE", resourceName = "WORLD")
+    public static String sayHELLOsayHAMixedResourceChildren() {
+        activeSpan().setTag(DDTags.SERVICE_NAME, "test2");
+        return sayHello() + sayHAWithResource();
+    }
+
+    @Trace(measured = true)
+    public static String sayHelloMeasured() {
+        activeSpan().setTag(DDTags.SERVICE_NAME, "test");
+        return "hello!";
+    }
+
+    @Trace(noParent = true)
+    public static String sayHelloNoParent() {
+        activeSpan().setTag(DDTags.SERVICE_NAME, "test");
+        return "hello!";
+    }
+
+    @Trace(operationName = "ERROR")
+    public static String sayERROR() {
+        throw new RuntimeException();
+    }
+
+    @Trace(operationName = "ERROR", resourceName = "WORLD")
+    public static String sayERRORWithResource() {
+        throw new RuntimeException();
+    }
+
+    @Trace
+    public static CompletableFuture<String> sayHelloFuture(CountDownLatch latch) {
+        activeSpan().setTag(DDTags.SERVICE_NAME, "test");
+        return CompletableFuture.supplyAsync(() -> {
+            try {
+                latch.await();
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            return "hello!";
         });
-  }
-
-  public static String fromCallable() throws Exception {
-    return new Callable<String>() {
-      @com.newrelic.api.agent.Trace
-      @Override
-      public String call() throws Exception {
-        return "Howdy!";
-      }
-    }.call();
-  }
-
-  public static String fromCallableWhenDisabled() throws Exception {
-    return new Callable<String>() {
-      @com.newrelic.api.agent.Trace
-      @Override
-      public String call() throws Exception {
-        return "Howdy!";
-      }
-    }.call();
-  }
+    }
+
+    public static String fromCallable() throws Exception {
+        return new Callable<String>() {
+            @com.newrelic.api.agent.Trace
+            @Override
+            public String call() throws Exception {
+                return "Howdy!";
+            }
+        }.call();
+    }
+
+    public static String fromCallableWhenDisabled() throws Exception {
+        return new Callable<String>() {
+            @com.newrelic.api.agent.Trace
+            @Override
+            public String call() throws Exception {
+                return "Howdy!";
+            }
+        }.call();
+    }
 }
diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedInterface.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedInterface.java
index e97a668357e..6a3c7e02d10 100644
--- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedInterface.java
+++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedInterface.java
@@ -3,16 +3,16 @@
 import datadog.trace.api.Trace;
 
 public interface TracedInterface {
-  @Trace
-  String testTracedInterfaceMethod();
+    @Trace
+    String testTracedInterfaceMethod();
 
-  @Trace
-  default String testTracedDefaultMethod() {
-    return "Hello from default method";
-  }
+    @Trace
+    default String testTracedDefaultMethod() {
+        return "Hello from default method";
+    }
 
-  @Trace
-  default String testOverriddenTracedDefaultMethod() {
-    return "Expected to be overridden!";
-  }
+    @Trace
+    default String testOverriddenTracedDefaultMethod() {
+        return "Expected to be overridden!";
+    }
 }
diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSubClass.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSubClass.java
index d849323ca18..f75c8a3171d 100644
--- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSubClass.java
+++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSubClass.java
@@ -1,23 +1,23 @@
 package dd.test.trace.annotation;
 
 public class TracedSubClass extends TracedSuperClass implements TracedInterface {
-  @Override
-  public String testTracedInterfaceMethod() {
-    return "Hello from implemented interface method";
-  }
+    @Override
+    public String testTracedInterfaceMethod() {
+        return "Hello from implemented interface method";
+    }
 
-  @Override
-  public String testOverriddenTracedDefaultMethod() {
-    return "Hello from overridden default method";
-  }
+    @Override
+    public String testOverriddenTracedDefaultMethod() {
+        return "Hello from overridden default method";
+    }
 
-  @Override
-  public String testTracedAbstractMethod() {
-    return "Hello from implemented abstract method";
-  }
+    @Override
+    public String testTracedAbstractMethod() {
+        return "Hello from implemented abstract method";
+    }
 
-  @Override
-  public String testOverriddenTracedSuperMethod() {
-    return "Hello from overridden super method";
-  }
+    @Override
+    public String testOverriddenTracedSuperMethod() {
+        return "Hello from overridden super method";
+    }
 }
diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSuperClass.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSuperClass.java
index 8f190ef6201..7b2d578429b 100644
--- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSuperClass.java
+++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSuperClass.java
@@ -3,16 +3,16 @@
 import datadog.trace.api.Trace;
 
 public abstract class TracedSuperClass {
-  @Trace
-  public abstract String testTracedAbstractMethod();
+    @Trace
+    public abstract String testTracedAbstractMethod();
 
-  @Trace
-  public String testTracedSuperMethod() {
-    return "Hello from super method";
-  }
+    @Trace
+    public String testTracedSuperMethod() {
+        return "Hello from super method";
+    }
 
-  @Trace
-  public String testOverriddenTracedSuperMethod() {
-    return "Expected to be overridden!";
-  }
+    @Trace
+    public String testOverriddenTracedSuperMethod() {
+        return "Expected to be overridden!";
+    }
 }
diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusDecorator.java b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusDecorator.java
index cbd9aa4d665..3b17a04f88a 100644
--- a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusDecorator.java
+++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusDecorator.java
@@ -10,74 +10,71 @@
 
 public class DatanucleusDecorator extends OrmClientDecorator {
 
-  public static final CharSequence DATANUCLEUS_FIND_OBJECT =
-      UTF8BytesString.create("datanucleus.findObject");
-  public static final CharSequence DATANUCLEUS_QUERY_EXECUTE =
-      UTF8BytesString.create("datanucleus.query.execute");
-  public static final CharSequence DATANUCLEUS_QUERY_DELETE =
-      UTF8BytesString.create("datanucleus.query.delete");
-  public static final CharSequence JAVA_DATANUCLEUS = UTF8BytesString.create("java-datanucleus");
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().database().service("datanucleus");
-  public static final DatanucleusDecorator DECORATE = new DatanucleusDecorator();
+    public static final CharSequence DATANUCLEUS_FIND_OBJECT = UTF8BytesString.create("datanucleus.findObject");
+    public static final CharSequence DATANUCLEUS_QUERY_EXECUTE = UTF8BytesString.create("datanucleus.query.execute");
+    public static final CharSequence DATANUCLEUS_QUERY_DELETE = UTF8BytesString.create("datanucleus.query.delete");
+    public static final CharSequence JAVA_DATANUCLEUS = UTF8BytesString.create("java-datanucleus");
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().database().service("datanucleus");
+    public static final DatanucleusDecorator DECORATE = new DatanucleusDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"datanucleus"};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.DATANUCLEUS;
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"datanucleus"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return JAVA_DATANUCLEUS;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.DATANUCLEUS;
+    }
 
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
+    @Override
+    protected CharSequence component() {
+        return JAVA_DATANUCLEUS;
+    }
 
-  @Override
-  public CharSequence entityName(final Object entity) {
-    return className(entity.getClass());
-  }
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
 
-  public void setResourceFromIdOrClass(AgentSpan span, Object id, String className) {
-    String targetClass = null;
-    if (className != null) {
-      targetClass = className;
-    } else if (id instanceof SingleFieldId) {
-      targetClass = ((SingleFieldId) id).getTargetClassName();
-    } else if (id instanceof SCOID) {
-      targetClass = ((SCOID) id).getSCOClass();
+    @Override
+    public CharSequence entityName(final Object entity) {
+        return className(entity.getClass());
     }
 
-    if (targetClass != null && !targetClass.isEmpty()) {
-      span.setResourceName(targetClass.substring(targetClass.lastIndexOf(".") + 1));
+    public void setResourceFromIdOrClass(AgentSpan span, Object id, String className) {
+        String targetClass = null;
+        if (className != null) {
+            targetClass = className;
+        } else if (id instanceof SingleFieldId) {
+            targetClass = ((SingleFieldId) id).getTargetClassName();
+        } else if (id instanceof SCOID) {
+            targetClass = ((SCOID) id).getSCOClass();
+        }
+
+        if (targetClass != null && !targetClass.isEmpty()) {
+            span.setResourceName(targetClass.substring(targetClass.lastIndexOf(".") + 1));
+        }
     }
-  }
 
-  @Override
-  protected String dbType() {
-    return null;
-  }
+    @Override
+    protected String dbType() {
+        return null;
+    }
 
-  @Override
-  protected String dbUser(final Object o) {
-    return null;
-  }
+    @Override
+    protected String dbUser(final Object o) {
+        return null;
+    }
 
-  @Override
-  protected String dbInstance(final Object o) {
-    return null;
-  }
+    @Override
+    protected String dbInstance(final Object o) {
+        return null;
+    }
 
-  @Override
-  protected CharSequence dbHostname(Object o) {
-    return null;
-  }
+    @Override
+    protected CharSequence dbHostname(Object o) {
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusModule.java b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusModule.java
index 6227123214c..b0df6c1ae1f 100644
--- a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusModule.java
+++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusModule.java
@@ -9,15 +9,15 @@
 
 @AutoService(InstrumenterModule.class)
 public class DatanucleusModule extends InstrumenterModule.Tracing {
-  public DatanucleusModule() {
-    super("datanucleus");
-  }
+    public DatanucleusModule() {
+        super("datanucleus");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(
-        new ExecutionContextInstrumentation(),
-        new JDOQueryInstrumentation(),
-        new JDOTransactionInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(
+                new ExecutionContextInstrumentation(),
+                new JDOQueryInstrumentation(),
+                new JDOTransactionInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java
index d2d2c2d2e73..a121a1fb665 100644
--- a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java
@@ -24,180 +24,168 @@
 import org.datanucleus.ExecutionContext;
 
 public class ExecutionContextInstrumentation
-    implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
-
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return InstrumenterConfig.get()
-        .isIntegrationShortcutMatchingEnabled(singleton("datanucleus"), false);
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.datanucleus.ExecutionContextImpl", "org.datanucleus.ExecutionContextThreadedImpl"
-    };
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.datanucleus.ExecutionContext";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("persistObject", "deleteObject", "refreshObject")),
-        ExecutionContextInstrumentation.class.getName() + "$SingleObjectActionAdvice");
-
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("refreshAllObjects", "persistObjects", "deleteObjects", "findObjects")),
-        ExecutionContextInstrumentation.class.getName() + "$MultiObjectActionAdvice");
-
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("findObject"))
-            .and(takesArguments(4))
-            .and(takesArgument(3, String.class)),
-        ExecutionContextInstrumentation.class.getName() + "$FindWithStringClassnameAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("findObject"))
-            .and(takesArguments(4))
-            .and(takesArgument(2, Class.class)),
-        ExecutionContextInstrumentation.class.getName() + "$FindWithClassAdvice");
-  }
-
-  public static class MultiObjectActionAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope startMethod(
-        @Advice.This final ExecutionContext executionContext,
-        @Advice.Origin("datanucleus.#m") final String operationName) {
-
-      final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), operationName);
-      DECORATE.afterStart(span);
-
-      return activateSpan(span);
+        implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
+
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return InstrumenterConfig.get().isIntegrationShortcutMatchingEnabled(singleton("datanucleus"), false);
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void endMethod(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"org.datanucleus.ExecutionContextImpl", "org.datanucleus.ExecutionContextThreadedImpl"};
+    }
 
-      if (scope == null) {
-        return;
-      }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.datanucleus.ExecutionContext";
+    }
 
-      AgentSpan span = spanFromScope(scope);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-      scope.close();
-      span.finish();
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("persistObject", "deleteObject", "refreshObject")),
+                ExecutionContextInstrumentation.class.getName() + "$SingleObjectActionAdvice");
+
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("refreshAllObjects", "persistObjects", "deleteObjects", "findObjects")),
+                ExecutionContextInstrumentation.class.getName() + "$MultiObjectActionAdvice");
+
+        transformer.applyAdvice(
+                isMethod().and(named("findObject")).and(takesArguments(4)).and(takesArgument(3, String.class)),
+                ExecutionContextInstrumentation.class.getName() + "$FindWithStringClassnameAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("findObject")).and(takesArguments(4)).and(takesArgument(2, Class.class)),
+                ExecutionContextInstrumentation.class.getName() + "$FindWithClassAdvice");
     }
-  }
 
-  public static class SingleObjectActionAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope startMethod(
-        @Advice.Origin("datanucleus.#m") final String operationName,
-        @Advice.Argument(0) Object entity) {
+    public static class MultiObjectActionAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope startMethod(
+                @Advice.This final ExecutionContext executionContext,
+                @Advice.Origin("datanucleus.#m") final String operationName) {
+
+            final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), operationName);
+            DECORATE.afterStart(span);
+
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void endMethod(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
 
-      if (entity == null) {
-        return null;
-      }
+            if (scope == null) {
+                return;
+            }
 
-      final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), operationName);
-      DECORATE.afterStart(span);
+            AgentSpan span = spanFromScope(scope);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
 
-      return activateSpan(span);
+            scope.close();
+            span.finish();
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void endMethod(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Argument(0) Object entity) {
+    public static class SingleObjectActionAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope startMethod(
+                @Advice.Origin("datanucleus.#m") final String operationName, @Advice.Argument(0) Object entity) {
 
-      if (scope == null) {
-        return;
-      }
+            if (entity == null) {
+                return null;
+            }
 
-      AgentSpan span = spanFromScope(scope);
-      DECORATE.onError(span, throwable);
-      DECORATE.onOperation(span, entity);
-      DECORATE.beforeFinish(span);
+            final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), operationName);
+            DECORATE.afterStart(span);
 
-      scope.close();
-      span.finish();
-    }
-  }
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void endMethod(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Argument(0) Object entity) {
 
-  public static class FindWithStringClassnameAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope startMethod() {
+            if (scope == null) {
+                return;
+            }
 
-      final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), DATANUCLEUS_FIND_OBJECT);
-      DECORATE.afterStart(span);
+            AgentSpan span = spanFromScope(scope);
+            DECORATE.onError(span, throwable);
+            DECORATE.onOperation(span, entity);
+            DECORATE.beforeFinish(span);
 
-      return activateSpan(span);
+            scope.close();
+            span.finish();
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void endMethod(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Argument(0) Object id,
-        @Advice.Argument(3) String objectClassName) {
+    public static class FindWithStringClassnameAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope startMethod() {
 
-      if (scope == null) {
-        return;
-      }
+            final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), DATANUCLEUS_FIND_OBJECT);
+            DECORATE.afterStart(span);
 
-      AgentSpan span = spanFromScope(scope);
-      DECORATE.setResourceFromIdOrClass(span, id, objectClassName);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
+            return activateSpan(span);
+        }
 
-      scope.close();
-      span.finish();
-    }
-  }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void endMethod(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Argument(0) Object id,
+                @Advice.Argument(3) String objectClassName) {
 
-  public static class FindWithClassAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope startMethod() {
+            if (scope == null) {
+                return;
+            }
 
-      final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), DATANUCLEUS_FIND_OBJECT);
-      DECORATE.afterStart(span);
+            AgentSpan span = spanFromScope(scope);
+            DECORATE.setResourceFromIdOrClass(span, id, objectClassName);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
 
-      return activateSpan(span);
+            scope.close();
+            span.finish();
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void endMethod(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Argument(0) Object id,
-        @Advice.Argument(2) Class cls) {
+    public static class FindWithClassAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope startMethod() {
+
+            final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), DATANUCLEUS_FIND_OBJECT);
+            DECORATE.afterStart(span);
+
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void endMethod(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Argument(0) Object id,
+                @Advice.Argument(2) Class cls) {
 
-      if (scope == null) {
-        return;
-      }
+            if (scope == null) {
+                return;
+            }
 
-      AgentSpan span = spanFromScope(scope);
-      DECORATE.setResourceFromIdOrClass(span, id, cls == null ? null : cls.getName());
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
+            AgentSpan span = spanFromScope(scope);
+            DECORATE.setResourceFromIdOrClass(span, id, cls == null ? null : cls.getName());
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
 
-      scope.close();
-      span.finish();
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java
index a072d175e2f..48ab4c58dcc 100644
--- a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java
+++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java
@@ -18,80 +18,76 @@
 import org.datanucleus.api.jdo.JDOQuery;
 import org.datanucleus.store.query.Query;
 
-public class JDOQueryInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  @Override
-  public String instrumentedType() {
-    return "org.datanucleus.api.jdo.JDOQuery";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // All of these methods delegate to *Internal() but have parameter checking and exceptions
-    // beforehand.  Instrumenting all ensures we trace those exceptions.  Still instrumenting
-    // *Internal() to futureproof the instrumentation
-    transformer.applyAdvice(
-        isMethod()
-            .and(
-                namedOneOf(
-                    "execute",
-                    "executeInternal",
-                    "executeList",
-                    "executeResultList",
-                    "executeResultUnique",
-                    "executeUnique",
-                    "executeWithArray",
-                    "executeWithMap",
-                    "deletePersistentAll",
-                    "deletePersistentInternal")),
-        JDOQueryInstrumentation.class.getName() + "$QueryAdvice");
-  }
-
-  public static class QueryAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope startExecute(@Advice.Origin("#m") final String methodName) {
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(JDOQuery.class);
-      if (callDepth > 0) {
-        return null;
-      }
-
-      final AgentSpan span =
-          methodName.startsWith("execute")
-              ? startSpan(JAVA_DATANUCLEUS.toString(), DATANUCLEUS_QUERY_EXECUTE)
-              : startSpan(JAVA_DATANUCLEUS.toString(), DATANUCLEUS_QUERY_DELETE);
-
-      DECORATE.afterStart(span);
-
-      return activateSpan(span);
+public class JDOQueryInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    @Override
+    public String instrumentedType() {
+        return "org.datanucleus.api.jdo.JDOQuery";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // All of these methods delegate to *Internal() but have parameter checking and exceptions
+        // beforehand.  Instrumenting all ensures we trace those exceptions.  Still instrumenting
+        // *Internal() to futureproof the instrumentation
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf(
+                                "execute",
+                                "executeInternal",
+                                "executeList",
+                                "executeResultList",
+                                "executeResultUnique",
+                                "executeUnique",
+                                "executeWithArray",
+                                "executeWithMap",
+                                "deletePersistentAll",
+                                "deletePersistentInternal")),
+                JDOQueryInstrumentation.class.getName() + "$QueryAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void endExecute(
-        @Advice.Enter final ContextScope scope,
-        @Advice.FieldValue("query") Query internalQuery,
-        @Advice.Thrown final Throwable throwable) {
+    public static class QueryAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope startExecute(@Advice.Origin("#m") final String methodName) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(JDOQuery.class);
+            if (callDepth > 0) {
+                return null;
+            }
+
+            final AgentSpan span = methodName.startsWith("execute")
+                    ? startSpan(JAVA_DATANUCLEUS.toString(), DATANUCLEUS_QUERY_EXECUTE)
+                    : startSpan(JAVA_DATANUCLEUS.toString(), DATANUCLEUS_QUERY_DELETE);
+
+            DECORATE.afterStart(span);
+
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void endExecute(
+                @Advice.Enter final ContextScope scope,
+                @Advice.FieldValue("query") Query internalQuery,
+                @Advice.Thrown final Throwable throwable) {
 
-      if (scope == null) {
-        return;
-      }
+            if (scope == null) {
+                return;
+            }
 
-      CallDepthThreadLocalMap.reset(JDOQuery.class);
+            CallDepthThreadLocalMap.reset(JDOQuery.class);
 
-      AgentSpan span = spanFromScope(scope);
+            AgentSpan span = spanFromScope(scope);
 
-      // candidateClass is set internally and is not always in sync with candidateClassName
-      String candidateClassName =
-          internalQuery.getCandidateClass() != null
-              ? internalQuery.getCandidateClass().getName()
-              : internalQuery.getCandidateClassName();
+            // candidateClass is set internally and is not always in sync with candidateClassName
+            String candidateClassName = internalQuery.getCandidateClass() != null
+                    ? internalQuery.getCandidateClass().getName()
+                    : internalQuery.getCandidateClassName();
 
-      DECORATE.setResourceFromIdOrClass(span, null, candidateClassName);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
+            DECORATE.setResourceFromIdOrClass(span, null, candidateClassName);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
 
-      scope.close();
-      span.finish();
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java
index 3a5364dce49..1857ebb0528 100644
--- a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java
+++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java
@@ -13,47 +13,44 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
 
-public class JDOTransactionInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  @Override
-  public String instrumentedType() {
-    return "org.datanucleus.api.jdo.JDOTransaction";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("commit", "rollback")),
-        JDOTransactionInstrumentation.class.getName() + "$TransactionAdvice");
-  }
-
-  public static class TransactionAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope start(
-        @Advice.Origin("datanucleus.transaction.#m") final String operationName) {
-      final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), operationName);
-
-      DECORATE.afterStart(span);
-
-      return activateSpan(span);
+public class JDOTransactionInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    @Override
+    public String instrumentedType() {
+        return "org.datanucleus.api.jdo.JDOTransaction";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("commit", "rollback")),
+                JDOTransactionInstrumentation.class.getName() + "$TransactionAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void end(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+    public static class TransactionAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope start(@Advice.Origin("datanucleus.transaction.#m") final String operationName) {
+            final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), operationName);
+
+            DECORATE.afterStart(span);
+
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void end(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
 
-      if (scope == null) {
-        return;
-      }
+            if (scope == null) {
+                return;
+            }
 
-      AgentSpan span = spanFromScope(scope);
+            AgentSpan span = spanFromScope(scope);
 
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
 
-      scope.close();
-      span.finish();
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/test/java/Value.java b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/test/java/Value.java
index c33091096c0..39e8f9e7a83 100644
--- a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/test/java/Value.java
+++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/test/java/Value.java
@@ -5,29 +5,29 @@
 
 @PersistenceCapable
 public class Value {
-  @PrimaryKey
-  @Persistent(valueStrategy = IdGeneratorStrategy.NATIVE)
-  protected long id;
+    @PrimaryKey
+    @Persistent(valueStrategy = IdGeneratorStrategy.NATIVE)
+    protected long id;
 
-  protected String name;
+    protected String name;
 
-  public Value(String name) {
-    this.name = name;
-  }
+    public Value(String name) {
+        this.name = name;
+    }
 
-  public long getId() {
-    return id;
-  }
+    public long getId() {
+        return id;
+    }
 
-  public void setId(long id) {
-    this.id = id;
-  }
+    public void setId(long id) {
+        this.id = id;
+    }
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 
-  public void setName(String name) {
-    this.name = name;
-  }
+    public void setName(String name) {
+        this.name = name;
+    }
 }
diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java
index ac3bfe440a8..c6b2b284770 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java
+++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java
@@ -19,85 +19,85 @@
 import java.util.function.ToIntFunction;
 
 public class CassandraClientDecorator extends DBTypeProcessingDatabaseClientDecorator<Session> {
-  private static final String DB_TYPE = "cassandra";
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().database().service(DB_TYPE);
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
-  public static final CharSequence JAVA_CASSANDRA = UTF8BytesString.create("java-cassandra");
-
-  public static final CassandraClientDecorator DECORATE = new CassandraClientDecorator();
-
-  private static final int COMBINED_STATEMENT_LIMIT = 2 * 1024 * 1024; // chars
-  private static final ToIntFunction<UTF8BytesString> STATEMENT_WEIGHER = UTF8BytesString::length;
-  private static final DDCache<CharSequence, UTF8BytesString> CACHED_STATEMENTS =
-      DDCaches.newFixedSizeWeightedCache(512, STATEMENT_WEIGHER, COMBINED_STATEMENT_LIMIT);
-
-  protected static UTF8BytesString normalizedQuery(CharSequence sql) {
-    return CACHED_STATEMENTS.computeIfAbsent(sql, SQLNormalizer::normalizeCharSequence);
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"cassandra"};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JAVA_CASSANDRA;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.CASSANDRA;
-  }
-
-  @Override
-  protected String dbType() {
-    return DB_TYPE;
-  }
-
-  @Override
-  protected String dbUser(final Session session) {
-    return null;
-  }
-
-  @Override
-  protected String dbInstance(final Session session) {
-    return session.getLoggedKeyspace();
-  }
-
-  @Override
-  protected String dbHostname(Session session) {
-    // Getting hostname through session.getState() seems to be expensive
-    return null;
-  }
-
-  public void onStatement(final AgentSpan span, final CharSequence statement) {
-    span.setResourceName(normalizedQuery(statement));
-  }
-
-  public void onResponse(final AgentSpan span, final ResultSet result) {
-    if (result != null) {
-      final Host host = result.getExecutionInfo().getQueriedHost();
-      onPeerConnection(span, host.getSocketAddress());
-      try {
-        if (Config.get().isCassandraKeyspaceStatementExtractionEnabled()) {
-          final ColumnDefinitions defs = result.getColumnDefinitions();
-          if (defs != null && defs.size() > 0) {
-            final String keySpace = defs.getKeyspace(0);
-            if (Strings.isNotBlank(keySpace) && !keySpace.equals(span.getTag(DB_INSTANCE))) {
-              onInstance(span, keySpace);
+    private static final String DB_TYPE = "cassandra";
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().database().service(DB_TYPE);
+    public static final CharSequence OPERATION_NAME = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
+    public static final CharSequence JAVA_CASSANDRA = UTF8BytesString.create("java-cassandra");
+
+    public static final CassandraClientDecorator DECORATE = new CassandraClientDecorator();
+
+    private static final int COMBINED_STATEMENT_LIMIT = 2 * 1024 * 1024; // chars
+    private static final ToIntFunction<UTF8BytesString> STATEMENT_WEIGHER = UTF8BytesString::length;
+    private static final DDCache<CharSequence, UTF8BytesString> CACHED_STATEMENTS =
+            DDCaches.newFixedSizeWeightedCache(512, STATEMENT_WEIGHER, COMBINED_STATEMENT_LIMIT);
+
+    protected static UTF8BytesString normalizedQuery(CharSequence sql) {
+        return CACHED_STATEMENTS.computeIfAbsent(sql, SQLNormalizer::normalizeCharSequence);
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"cassandra"};
+    }
+
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JAVA_CASSANDRA;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.CASSANDRA;
+    }
+
+    @Override
+    protected String dbType() {
+        return DB_TYPE;
+    }
+
+    @Override
+    protected String dbUser(final Session session) {
+        return null;
+    }
+
+    @Override
+    protected String dbInstance(final Session session) {
+        return session.getLoggedKeyspace();
+    }
+
+    @Override
+    protected String dbHostname(Session session) {
+        // Getting hostname through session.getState() seems to be expensive
+        return null;
+    }
+
+    public void onStatement(final AgentSpan span, final CharSequence statement) {
+        span.setResourceName(normalizedQuery(statement));
+    }
+
+    public void onResponse(final AgentSpan span, final ResultSet result) {
+        if (result != null) {
+            final Host host = result.getExecutionInfo().getQueriedHost();
+            onPeerConnection(span, host.getSocketAddress());
+            try {
+                if (Config.get().isCassandraKeyspaceStatementExtractionEnabled()) {
+                    final ColumnDefinitions defs = result.getColumnDefinitions();
+                    if (defs != null && defs.size() > 0) {
+                        final String keySpace = defs.getKeyspace(0);
+                        if (Strings.isNotBlank(keySpace) && !keySpace.equals(span.getTag(DB_INSTANCE))) {
+                            onInstance(span, keySpace);
+                        }
+                    }
+                }
+            } catch (final Throwable ignored) {
             }
-          }
         }
-      } catch (final Throwable ignored) {
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
index bc1184e4a59..a92a50458df 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
@@ -17,51 +17,49 @@
 
 @AutoService(InstrumenterModule.class)
 public class CassandraClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public CassandraClientInstrumentation() {
-    super("cassandra");
-  }
+    public CassandraClientInstrumentation() {
+        super("cassandra");
+    }
 
-  @Override
-  public String instrumentedType() {
-    // Note: Cassandra has a large driver and we instrument single class in it.
-    // The rest is ignored in the additional ignores of GlobalIgnoresMatcher
-    return "com.datastax.driver.core.Cluster$Manager";
-  }
+    @Override
+    public String instrumentedType() {
+        // Note: Cassandra has a large driver and we instrument single class in it.
+        // The rest is ignored in the additional ignores of GlobalIgnoresMatcher
+        return "com.datastax.driver.core.Cluster$Manager";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("com.datastax.driver.core.Cluster", String.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("com.datastax.driver.core.Cluster", String.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPrivate()).and(named("newSession")).and(takesArguments(0)),
-        CassandraClientInstrumentation.class.getName() + "$CassandraClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPrivate()).and(named("newSession")).and(takesArguments(0)),
+                CassandraClientInstrumentation.class.getName() + "$CassandraClientAdvice");
+    }
 
-  public static class CassandraClientAdvice {
-    /**
-     * Strategy: each time we build a connection to a Cassandra cluster, the
-     * com.datastax.driver.core.Cluster$Manager.newSession() method is called. The opentracing
-     * contribution is a simple wrapper, so we just have to wrap the new session.
-     *
-     * @param session The fresh session to patch. This session is replaced with new session
-     * @throws Exception
-     */
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void injectTracingSession(@Advice.Return(readOnly = false) Session session)
-        throws Exception {
-      // This should cover ours and OT's TracingSession
-      if (session.getClass().getName().endsWith("cassandra.TracingSession")) {
-        return;
-      }
-      session =
-          new TracingSession(
-              session,
-              InstrumentationContext.get(Cluster.class, String.class).get(session.getCluster()));
+    public static class CassandraClientAdvice {
+        /**
+         * Strategy: each time we build a connection to a Cassandra cluster, the
+         * com.datastax.driver.core.Cluster$Manager.newSession() method is called. The opentracing
+         * contribution is a simple wrapper, so we just have to wrap the new session.
+         *
+         * @param session The fresh session to patch. This session is replaced with new session
+         * @throws Exception
+         */
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void injectTracingSession(@Advice.Return(readOnly = false) Session session) throws Exception {
+            // This should cover ours and OT's TracingSession
+            if (session.getClass().getName().endsWith("cassandra.TracingSession")) {
+                return;
+            }
+            session = new TracingSession(
+                    session,
+                    InstrumentationContext.get(Cluster.class, String.class).get(session.getCluster()));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java
index 791b3b0375a..5860909ec3e 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java
+++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java
@@ -20,46 +20,46 @@
 
 @AutoService(InstrumenterModule.class)
 public class CassandraClusterInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public CassandraClusterInstrumentation() {
-    super("cassandra");
-  }
+    public CassandraClusterInstrumentation() {
+        super("cassandra");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.datastax.driver.core.Cluster";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.datastax.driver.core.Cluster";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("com.datastax.driver.core.Cluster", String.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("com.datastax.driver.core.Cluster", String.class.getName());
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return not(hasClassNamed("com.datastax.driver.core.EndPoint"));
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return not(hasClassNamed("com.datastax.driver.core.EndPoint"));
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "cluster";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "cluster";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(1, named("java.util.List"))),
-        getClass().getName() + "$CassandraManagerConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(1, named("java.util.List"))),
+                getClass().getName() + "$CassandraManagerConstructorAdvice");
+    }
 
-  public static class CassandraManagerConstructorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterConstruct(
-        @Advice.This Cluster self, @Advice.Argument(1) final List<InetSocketAddress> contactPoints)
-        throws Exception {
-      InstrumentationContext.get(Cluster.class, String.class)
-          .put(self, ContactPointsUtil.fromInetSocketList(contactPoints));
+    public static class CassandraManagerConstructorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterConstruct(
+                @Advice.This Cluster self, @Advice.Argument(1) final List<InetSocketAddress> contactPoints)
+                throws Exception {
+            InstrumentationContext.get(Cluster.class, String.class)
+                    .put(self, ContactPointsUtil.fromInetSocketList(contactPoints));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/ContactPointsUtil.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/ContactPointsUtil.java
index ff2c27465e2..2643314d9d1 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/ContactPointsUtil.java
+++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/ContactPointsUtil.java
@@ -9,24 +9,20 @@
 import javax.annotation.Nullable;
 
 public class ContactPointsUtil {
-  private static final DDCache<List<InetSocketAddress>, String> CONTACT_POINT_CACHE =
-      DDCaches.newFixedSizeCache(8);
+    private static final DDCache<List<InetSocketAddress>, String> CONTACT_POINT_CACHE = DDCaches.newFixedSizeCache(8);
 
-  private static final Function<List<InetSocketAddress>, String> ADDER =
-      inetSocketAddresses ->
-          inetSocketAddresses.stream()
-              .map(
-                  inetSocketAddress ->
-                      inetSocketAddress.getPort() > 0
-                          ? inetSocketAddress.getHostString() + ":" + inetSocketAddress.getPort()
-                          : inetSocketAddress.getHostString())
-              .distinct()
-              .collect(Collectors.joining(","));
+    private static final Function<List<InetSocketAddress>, String> ADDER =
+            inetSocketAddresses -> inetSocketAddresses.stream()
+                    .map(inetSocketAddress -> inetSocketAddress.getPort() > 0
+                            ? inetSocketAddress.getHostString() + ":" + inetSocketAddress.getPort()
+                            : inetSocketAddress.getHostString())
+                    .distinct()
+                    .collect(Collectors.joining(","));
 
-  public static String fromInetSocketList(@Nullable final List<InetSocketAddress> contactPoints) {
-    if (contactPoints == null) {
-      return null;
+    public static String fromInetSocketList(@Nullable final List<InetSocketAddress> contactPoints) {
+        if (contactPoints == null) {
+            return null;
+        }
+        return CONTACT_POINT_CACHE.computeIfAbsent(contactPoints, ADDER);
     }
-    return CONTACT_POINT_CACHE.computeIfAbsent(contactPoints, ADDER);
-  }
 }
diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
index 076d57e1157..32384381871 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
+++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
@@ -32,247 +32,246 @@
 import javax.annotation.Nullable;
 
 public class TracingSession implements Session {
-  public static class SessionTransfomer implements Function<Session, Session> {
+    public static class SessionTransfomer implements Function<Session, Session> {
+        private final String contactPoints;
+
+        public SessionTransfomer(String contactPoints) {
+            this.contactPoints = contactPoints;
+        }
+
+        @Nullable
+        @Override
+        public Session apply(@Nullable Session s) {
+            if (s == null) {
+                return null;
+            }
+            return new TracingSession(s, contactPoints);
+        }
+    }
+
+    private static final ExecutorService EXECUTOR_SERVICE =
+            Executors.newCachedThreadPool(new AgentThreadFactory(TRACE_CASSANDRA_ASYNC_SESSION));
+
+    private final Session session;
     private final String contactPoints;
 
-    public SessionTransfomer(String contactPoints) {
-      this.contactPoints = contactPoints;
+    public TracingSession(final Session session, final String contactPoints) {
+        this.session = session;
+        this.contactPoints = contactPoints;
     }
 
-    @Nullable
     @Override
-    public Session apply(@Nullable Session s) {
-      if (s == null) {
-        return null;
-      }
-      return new TracingSession(s, contactPoints);
+    public String getLoggedKeyspace() {
+        return session.getLoggedKeyspace();
     }
-  }
-
-  private static final ExecutorService EXECUTOR_SERVICE =
-      Executors.newCachedThreadPool(new AgentThreadFactory(TRACE_CASSANDRA_ASYNC_SESSION));
-
-  private final Session session;
-  private final String contactPoints;
-
-  public TracingSession(final Session session, final String contactPoints) {
-    this.session = session;
-    this.contactPoints = contactPoints;
-  }
-
-  @Override
-  public String getLoggedKeyspace() {
-    return session.getLoggedKeyspace();
-  }
-
-  @Override
-  public Session init() {
-    return new TracingSession(session.init(), contactPoints);
-  }
-
-  @Override
-  public ListenableFuture<Session> initAsync() {
-    return Futures.transform(
-        session.initAsync(), new SessionTransfomer(contactPoints), directExecutor());
-  }
-
-  @Override
-  public ResultSet execute(final String query) {
-    try (final ContextScope scope = startSpanWithScope(query)) {
-      final AgentSpan span = spanFromScope(scope);
-      try {
-        final ResultSet resultSet = session.execute(query);
-        beforeSpanFinish(span, resultSet);
-        return resultSet;
-      } catch (final RuntimeException e) {
-        beforeSpanFinish(span, e);
-        throw e;
-      } finally {
-        span.finish();
-      }
+
+    @Override
+    public Session init() {
+        return new TracingSession(session.init(), contactPoints);
     }
-  }
-
-  @Override
-  public ResultSet execute(final String query, final Object... values) {
-    try (final ContextScope scope = startSpanWithScope(query)) {
-      final AgentSpan span = spanFromScope(scope);
-      try {
-        final ResultSet resultSet = session.execute(query, values);
-        beforeSpanFinish(span, resultSet);
-        return resultSet;
-      } catch (final RuntimeException e) {
-        beforeSpanFinish(span, e);
-        throw e;
-      } finally {
-        span.finish();
-      }
+
+    @Override
+    public ListenableFuture<Session> initAsync() {
+        return Futures.transform(session.initAsync(), new SessionTransfomer(contactPoints), directExecutor());
     }
-  }
-
-  @Override
-  public ResultSet execute(final String query, final Map<String, Object> values) {
-    try (final ContextScope scope = startSpanWithScope(query)) {
-      final AgentSpan span = spanFromScope(scope);
-      try {
-        final ResultSet resultSet = session.execute(query, values);
-        beforeSpanFinish(span, resultSet);
-        return resultSet;
-      } catch (final RuntimeException e) {
-        beforeSpanFinish(span, e);
-        throw e;
-      } finally {
-        span.finish();
-      }
+
+    @Override
+    public ResultSet execute(final String query) {
+        try (final ContextScope scope = startSpanWithScope(query)) {
+            final AgentSpan span = spanFromScope(scope);
+            try {
+                final ResultSet resultSet = session.execute(query);
+                beforeSpanFinish(span, resultSet);
+                return resultSet;
+            } catch (final RuntimeException e) {
+                beforeSpanFinish(span, e);
+                throw e;
+            } finally {
+                span.finish();
+            }
+        }
     }
-  }
-
-  @Override
-  public ResultSet execute(final Statement statement) {
-    final String query = getQuery(statement);
-    try (final ContextScope scope = startSpanWithScope(query)) {
-      final AgentSpan span = spanFromScope(scope);
-      try {
-        final ResultSet resultSet = session.execute(statement);
-        beforeSpanFinish(span, resultSet);
-        return resultSet;
-      } catch (final RuntimeException e) {
-        beforeSpanFinish(span, e);
-        throw e;
-      } finally {
-        span.finish();
-      }
+
+    @Override
+    public ResultSet execute(final String query, final Object... values) {
+        try (final ContextScope scope = startSpanWithScope(query)) {
+            final AgentSpan span = spanFromScope(scope);
+            try {
+                final ResultSet resultSet = session.execute(query, values);
+                beforeSpanFinish(span, resultSet);
+                return resultSet;
+            } catch (final RuntimeException e) {
+                beforeSpanFinish(span, e);
+                throw e;
+            } finally {
+                span.finish();
+            }
+        }
     }
-  }
 
-  @Override
-  public ResultSetFuture executeAsync(final String query) {
-    try (final ContextScope scope = startSpanWithScope(query)) {
-      final ResultSetFuture future = session.executeAsync(query);
-      future.addListener(createListener(spanFromScope(scope), future), EXECUTOR_SERVICE);
+    @Override
+    public ResultSet execute(final String query, final Map<String, Object> values) {
+        try (final ContextScope scope = startSpanWithScope(query)) {
+            final AgentSpan span = spanFromScope(scope);
+            try {
+                final ResultSet resultSet = session.execute(query, values);
+                beforeSpanFinish(span, resultSet);
+                return resultSet;
+            } catch (final RuntimeException e) {
+                beforeSpanFinish(span, e);
+                throw e;
+            } finally {
+                span.finish();
+            }
+        }
+    }
 
-      return future;
+    @Override
+    public ResultSet execute(final Statement statement) {
+        final String query = getQuery(statement);
+        try (final ContextScope scope = startSpanWithScope(query)) {
+            final AgentSpan span = spanFromScope(scope);
+            try {
+                final ResultSet resultSet = session.execute(statement);
+                beforeSpanFinish(span, resultSet);
+                return resultSet;
+            } catch (final RuntimeException e) {
+                beforeSpanFinish(span, e);
+                throw e;
+            } finally {
+                span.finish();
+            }
+        }
     }
-  }
 
-  @Override
-  public ResultSetFuture executeAsync(final String query, final Object... values) {
-    try (final ContextScope scope = startSpanWithScope(query)) {
-      final ResultSetFuture future = session.executeAsync(query, values);
-      future.addListener(createListener(spanFromScope(scope), future), EXECUTOR_SERVICE);
+    @Override
+    public ResultSetFuture executeAsync(final String query) {
+        try (final ContextScope scope = startSpanWithScope(query)) {
+            final ResultSetFuture future = session.executeAsync(query);
+            future.addListener(createListener(spanFromScope(scope), future), EXECUTOR_SERVICE);
 
-      return future;
+            return future;
+        }
     }
-  }
 
-  @Override
-  public ResultSetFuture executeAsync(final String query, final Map<String, Object> values) {
-    try (final ContextScope scope = startSpanWithScope(query)) {
-      final ResultSetFuture future = session.executeAsync(query, values);
-      future.addListener(createListener(spanFromScope(scope), future), EXECUTOR_SERVICE);
+    @Override
+    public ResultSetFuture executeAsync(final String query, final Object... values) {
+        try (final ContextScope scope = startSpanWithScope(query)) {
+            final ResultSetFuture future = session.executeAsync(query, values);
+            future.addListener(createListener(spanFromScope(scope), future), EXECUTOR_SERVICE);
 
-      return future;
+            return future;
+        }
     }
-  }
 
-  @Override
-  public ResultSetFuture executeAsync(final Statement statement) {
-    final String query = getQuery(statement);
-    try (final ContextScope scope = startSpanWithScope(query)) {
-      final ResultSetFuture future = session.executeAsync(statement);
-      future.addListener(createListener(spanFromScope(scope), future), EXECUTOR_SERVICE);
+    @Override
+    public ResultSetFuture executeAsync(final String query, final Map<String, Object> values) {
+        try (final ContextScope scope = startSpanWithScope(query)) {
+            final ResultSetFuture future = session.executeAsync(query, values);
+            future.addListener(createListener(spanFromScope(scope), future), EXECUTOR_SERVICE);
 
-      return future;
+            return future;
+        }
+    }
+
+    @Override
+    public ResultSetFuture executeAsync(final Statement statement) {
+        final String query = getQuery(statement);
+        try (final ContextScope scope = startSpanWithScope(query)) {
+            final ResultSetFuture future = session.executeAsync(statement);
+            future.addListener(createListener(spanFromScope(scope), future), EXECUTOR_SERVICE);
+
+            return future;
+        }
     }
-  }
-
-  @Override
-  public PreparedStatement prepare(final String query) {
-    return session.prepare(query);
-  }
-
-  @Override
-  public PreparedStatement prepare(final RegularStatement statement) {
-    return session.prepare(statement);
-  }
-
-  @Override
-  public ListenableFuture<PreparedStatement> prepareAsync(final String query) {
-    return session.prepareAsync(query);
-  }
-
-  @Override
-  public ListenableFuture<PreparedStatement> prepareAsync(final RegularStatement statement) {
-    return session.prepareAsync(statement);
-  }
-
-  @Override
-  public CloseFuture closeAsync() {
-    return session.closeAsync();
-  }
-
-  @Override
-  public void close() {
-    session.close();
-  }
-
-  @Override
-  public boolean isClosed() {
-    return session.isClosed();
-  }
-
-  @Override
-  public Cluster getCluster() {
-    return session.getCluster();
-  }
-
-  @Override
-  public State getState() {
-    return session.getState();
-  }
-
-  private static String getQuery(final Statement statement) {
-    String query = null;
-    if (statement instanceof BoundStatement) {
-      query = ((BoundStatement) statement).preparedStatement().getQueryString();
-    } else if (statement instanceof RegularStatement) {
-      query = ((RegularStatement) statement).getQueryString();
+
+    @Override
+    public PreparedStatement prepare(final String query) {
+        return session.prepare(query);
     }
 
-    return query == null ? "" : query;
-  }
-
-  private static Runnable createListener(final AgentSpan span, final ResultSetFuture future) {
-    return new Runnable() {
-      @Override
-      public void run() {
-        try (final ContextScope scope = activateSpan(span)) {
-          beforeSpanFinish(span, future.get());
-        } catch (final InterruptedException | ExecutionException e) {
-          beforeSpanFinish(span, e);
-        } finally {
-          span.finish();
+    @Override
+    public PreparedStatement prepare(final RegularStatement statement) {
+        return session.prepare(statement);
+    }
+
+    @Override
+    public ListenableFuture<PreparedStatement> prepareAsync(final String query) {
+        return session.prepareAsync(query);
+    }
+
+    @Override
+    public ListenableFuture<PreparedStatement> prepareAsync(final RegularStatement statement) {
+        return session.prepareAsync(statement);
+    }
+
+    @Override
+    public CloseFuture closeAsync() {
+        return session.closeAsync();
+    }
+
+    @Override
+    public void close() {
+        session.close();
+    }
+
+    @Override
+    public boolean isClosed() {
+        return session.isClosed();
+    }
+
+    @Override
+    public Cluster getCluster() {
+        return session.getCluster();
+    }
+
+    @Override
+    public State getState() {
+        return session.getState();
+    }
+
+    private static String getQuery(final Statement statement) {
+        String query = null;
+        if (statement instanceof BoundStatement) {
+            query = ((BoundStatement) statement).preparedStatement().getQueryString();
+        } else if (statement instanceof RegularStatement) {
+            query = ((RegularStatement) statement).getQueryString();
         }
-      }
-    };
-  }
-
-  private ContextScope startSpanWithScope(final String query) {
-    final AgentSpan span = startSpan(JAVA_CASSANDRA.toString(), OPERATION_NAME);
-    DECORATE.afterStart(span);
-    DECORATE.onConnection(span, session);
-    DECORATE.onStatement(span, query);
-    span.setTag(InstrumentationTags.CASSANDRA_CONTACT_POINTS, contactPoints);
-    return activateSpan(span);
-  }
-
-  private static void beforeSpanFinish(final AgentSpan span, final ResultSet resultSet) {
-    DECORATE.onResponse(span, resultSet);
-    DECORATE.beforeFinish(span);
-  }
-
-  private static void beforeSpanFinish(final AgentSpan span, final Exception e) {
-    DECORATE.onError(span, e);
-    DECORATE.beforeFinish(span);
-  }
+
+        return query == null ? "" : query;
+    }
+
+    private static Runnable createListener(final AgentSpan span, final ResultSetFuture future) {
+        return new Runnable() {
+            @Override
+            public void run() {
+                try (final ContextScope scope = activateSpan(span)) {
+                    beforeSpanFinish(span, future.get());
+                } catch (final InterruptedException | ExecutionException e) {
+                    beforeSpanFinish(span, e);
+                } finally {
+                    span.finish();
+                }
+            }
+        };
+    }
+
+    private ContextScope startSpanWithScope(final String query) {
+        final AgentSpan span = startSpan(JAVA_CASSANDRA.toString(), OPERATION_NAME);
+        DECORATE.afterStart(span);
+        DECORATE.onConnection(span, session);
+        DECORATE.onStatement(span, query);
+        span.setTag(InstrumentationTags.CASSANDRA_CONTACT_POINTS, contactPoints);
+        return activateSpan(span);
+    }
+
+    private static void beforeSpanFinish(final AgentSpan span, final ResultSet resultSet) {
+        DECORATE.onResponse(span, resultSet);
+        DECORATE.beforeFinish(span);
+    }
+
+    private static void beforeSpanFinish(final AgentSpan span, final Exception e) {
+        DECORATE.onError(span, e);
+        DECORATE.beforeFinish(span);
+    }
 }
diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java
index 377279187d0..d0d36e6595d 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java
+++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java
@@ -19,41 +19,40 @@
 
 @AutoService(InstrumenterModule.class)
 public class CassandraClusterInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public CassandraClusterInstrumentation() {
-    super("cassandra");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.datastax.driver.core.Cluster";
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("com.datastax.driver.core.Cluster", String.class.getName());
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("com.datastax.driver.core.EndPoint");
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(1, named("java.util.List"))),
-        getClass().getName() + "$CassandraManagerConstructorAdvice");
-  }
-
-  public static class CassandraManagerConstructorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterConstruct(
-        @Advice.This Cluster self, @Advice.Argument(1) final List<EndPoint> contactPoints)
-        throws Exception {
-      InstrumentationContext.get(Cluster.class, String.class)
-          .put(self, ContactPointsUtil.fromEndPointList(contactPoints));
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public CassandraClusterInstrumentation() {
+        super("cassandra");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "com.datastax.driver.core.Cluster";
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("com.datastax.driver.core.Cluster", String.class.getName());
+    }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("com.datastax.driver.core.EndPoint");
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(1, named("java.util.List"))),
+                getClass().getName() + "$CassandraManagerConstructorAdvice");
+    }
+
+    public static class CassandraManagerConstructorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterConstruct(
+                @Advice.This Cluster self, @Advice.Argument(1) final List<EndPoint> contactPoints) throws Exception {
+            InstrumentationContext.get(Cluster.class, String.class)
+                    .put(self, ContactPointsUtil.fromEndPointList(contactPoints));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/ContactPointsUtil.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/ContactPointsUtil.java
index d045a517e86..ca586acd864 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/ContactPointsUtil.java
+++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/ContactPointsUtil.java
@@ -9,25 +9,20 @@
 import javax.annotation.Nullable;
 
 public class ContactPointsUtil {
-  private static final DDCache<List<EndPoint>, String> CONTACT_POINT_CACHE =
-      DDCaches.newFixedSizeCache(8);
+    private static final DDCache<List<EndPoint>, String> CONTACT_POINT_CACHE = DDCaches.newFixedSizeCache(8);
 
-  private static final Function<List<EndPoint>, String> ADDER =
-      endPoints ->
-          endPoints.stream()
-              .map(EndPoint::resolve)
-              .map(
-                  inetSocketAddress ->
-                      inetSocketAddress.getPort() > 0
-                          ? inetSocketAddress.getHostString() + ":" + inetSocketAddress.getPort()
-                          : inetSocketAddress.getHostString())
-              .distinct() // avoid duplicates
-              .collect(Collectors.joining(","));
+    private static final Function<List<EndPoint>, String> ADDER = endPoints -> endPoints.stream()
+            .map(EndPoint::resolve)
+            .map(inetSocketAddress -> inetSocketAddress.getPort() > 0
+                    ? inetSocketAddress.getHostString() + ":" + inetSocketAddress.getPort()
+                    : inetSocketAddress.getHostString())
+            .distinct() // avoid duplicates
+            .collect(Collectors.joining(","));
 
-  public static String fromEndPointList(@Nullable final List<EndPoint> contactPoints) {
-    if (contactPoints == null) {
-      return null;
+    public static String fromEndPointList(@Nullable final List<EndPoint> contactPoints) {
+        if (contactPoints == null) {
+            return null;
+        }
+        return CONTACT_POINT_CACHE.computeIfAbsent(contactPoints, ADDER);
     }
-    return CONTACT_POINT_CACHE.computeIfAbsent(contactPoints, ADDER);
-  }
 }
diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientAdvice.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientAdvice.java
index d43ff39d1a1..e370ce284b2 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientAdvice.java
+++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientAdvice.java
@@ -9,16 +9,15 @@
 
 public class CassandraClientAdvice {
 
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void injectTracingSession(
-      @Advice.Argument(1) final Set<EndPoint> contactPoints,
-      @Advice.Return(readOnly = false) CompletionStage<Session> completionStage) {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void injectTracingSession(
+            @Advice.Argument(1) final Set<EndPoint> contactPoints,
+            @Advice.Return(readOnly = false) CompletionStage<Session> completionStage) {
 
-    // Change CompletingStage<Session> to CompletingStage<TracingSession>
-    // The TracingSession wrapper includes span start/stop
-    completionStage =
-        completionStage.thenCombine(
-            CompletableFuture.completedFuture(ContactPointsUtil.fromEndPointSet(contactPoints)),
-            TracingSession::new);
-  }
+        // Change CompletingStage<Session> to CompletingStage<TracingSession>
+        // The TracingSession wrapper includes span start/stop
+        completionStage = completionStage.thenCombine(
+                CompletableFuture.completedFuture(ContactPointsUtil.fromEndPointSet(contactPoints)),
+                TracingSession::new);
+    }
 }
diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientDecorator.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientDecorator.java
index 7e5a66c28e0..ea15639b4c1 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientDecorator.java
+++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientDecorator.java
@@ -25,107 +25,104 @@
 import javax.annotation.Nonnull;
 
 public class CassandraClientDecorator extends DBTypeProcessingDatabaseClientDecorator<Session> {
-  private static final String DB_TYPE = "cassandra";
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().database().service(DB_TYPE);
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
-  public static final CharSequence JAVA_CASSANDRA = UTF8BytesString.create("java-cassandra");
-
-  public static final CassandraClientDecorator DECORATE = new CassandraClientDecorator();
-
-  private static final int COMBINED_STATEMENT_LIMIT = 2 * 1024 * 1024; // chars
-  private static final ToIntFunction<UTF8BytesString> STATEMENT_WEIGHER = UTF8BytesString::length;
-  private static final DDCache<CharSequence, UTF8BytesString> CACHED_STATEMENTS =
-      DDCaches.newFixedSizeWeightedCache(512, STATEMENT_WEIGHER, COMBINED_STATEMENT_LIMIT);
-
-  protected static UTF8BytesString normalizedQuery(CharSequence sql) {
-    return CACHED_STATEMENTS.computeIfAbsent(sql, SQLNormalizer::normalizeCharSequence);
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"cassandra"};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JAVA_CASSANDRA;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.CASSANDRA;
-  }
-
-  @Override
-  protected String dbType() {
-    return DB_TYPE;
-  }
-
-  @Override
-  protected String dbUser(final Session session) {
-    return null;
-  }
-
-  @Override
-  protected String dbInstance(final Session session) {
-    return session.getKeyspace().map(Objects::toString).orElse(null);
-  }
-
-  @Override
-  protected String dbHostname(Session session) {
-    return null;
-  }
-
-  public void onStatement(final AgentSpan span, final CharSequence statement) {
-    span.setResourceName(normalizedQuery(statement));
-  }
-
-  public void onResponse(final AgentSpan span, final ResultSet result) {
-    if (result != null) {
-      onResponse(span, result.getExecutionInfo().getCoordinator(), result.getColumnDefinitions());
+    private static final String DB_TYPE = "cassandra";
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().database().service(DB_TYPE);
+    public static final CharSequence OPERATION_NAME = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
+    public static final CharSequence JAVA_CASSANDRA = UTF8BytesString.create("java-cassandra");
+
+    public static final CassandraClientDecorator DECORATE = new CassandraClientDecorator();
+
+    private static final int COMBINED_STATEMENT_LIMIT = 2 * 1024 * 1024; // chars
+    private static final ToIntFunction<UTF8BytesString> STATEMENT_WEIGHER = UTF8BytesString::length;
+    private static final DDCache<CharSequence, UTF8BytesString> CACHED_STATEMENTS =
+            DDCaches.newFixedSizeWeightedCache(512, STATEMENT_WEIGHER, COMBINED_STATEMENT_LIMIT);
+
+    protected static UTF8BytesString normalizedQuery(CharSequence sql) {
+        return CACHED_STATEMENTS.computeIfAbsent(sql, SQLNormalizer::normalizeCharSequence);
     }
-  }
 
-  public void onResponse(final AgentSpan span, final AsyncResultSet result) {
-    if (result != null) {
-      onResponse(span, result.getExecutionInfo().getCoordinator(), result.getColumnDefinitions());
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"cassandra"};
     }
-  }
 
-  @Override
-  protected void doOnError(
-      @Nonnull final AgentSpan span, @Nonnull final Throwable throwable, byte errorPriority) {
-    super.doOnError(span, throwable, errorPriority);
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JAVA_CASSANDRA;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.CASSANDRA;
+    }
+
+    @Override
+    protected String dbType() {
+        return DB_TYPE;
+    }
+
+    @Override
+    protected String dbUser(final Session session) {
+        return null;
+    }
+
+    @Override
+    protected String dbInstance(final Session session) {
+        return session.getKeyspace().map(Objects::toString).orElse(null);
+    }
+
+    @Override
+    protected String dbHostname(Session session) {
+        return null;
+    }
+
+    public void onStatement(final AgentSpan span, final CharSequence statement) {
+        span.setResourceName(normalizedQuery(statement));
+    }
+
+    public void onResponse(final AgentSpan span, final ResultSet result) {
+        if (result != null) {
+            onResponse(span, result.getExecutionInfo().getCoordinator(), result.getColumnDefinitions());
+        }
+    }
 
-    if (throwable instanceof CoordinatorException) {
-      onResponse(span, ((CoordinatorException) throwable).getCoordinator(), null);
+    public void onResponse(final AgentSpan span, final AsyncResultSet result) {
+        if (result != null) {
+            onResponse(span, result.getExecutionInfo().getCoordinator(), result.getColumnDefinitions());
+        }
     }
-  }
-
-  private void onResponse(AgentSpan span, Node coordinator, ColumnDefinitions columns) {
-    if (coordinator != null) {
-      SocketAddress address = coordinator.getEndPoint().resolve();
-      if (address instanceof InetSocketAddress) {
-        onPeerConnection(span, (InetSocketAddress) address);
-      }
+
+    @Override
+    protected void doOnError(@Nonnull final AgentSpan span, @Nonnull final Throwable throwable, byte errorPriority) {
+        super.doOnError(span, throwable, errorPriority);
+
+        if (throwable instanceof CoordinatorException) {
+            onResponse(span, ((CoordinatorException) throwable).getCoordinator(), null);
+        }
     }
-    try {
-      if (Config.get().isCassandraKeyspaceStatementExtractionEnabled()
-          && columns != null
-          && columns.size() > 0) {
-        final String keySpace = columns.get(0).getKeyspace().toString();
-        if (Strings.isNotBlank(keySpace) && !keySpace.equals(span.getTag(DB_INSTANCE))) {
-          onInstance(span, keySpace);
+
+    private void onResponse(AgentSpan span, Node coordinator, ColumnDefinitions columns) {
+        if (coordinator != null) {
+            SocketAddress address = coordinator.getEndPoint().resolve();
+            if (address instanceof InetSocketAddress) {
+                onPeerConnection(span, (InetSocketAddress) address);
+            }
+        }
+        try {
+            if (Config.get().isCassandraKeyspaceStatementExtractionEnabled() && columns != null && columns.size() > 0) {
+                final String keySpace = columns.get(0).getKeyspace().toString();
+                if (Strings.isNotBlank(keySpace) && !keySpace.equals(span.getTag(DB_INSTANCE))) {
+                    onInstance(span, keySpace);
+                }
+            }
+        } catch (final Throwable ignored) {
         }
-      }
-    } catch (final Throwable ignored) {
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientInstrumentation.java
index f9e0f865ad3..2a21d268e08 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/CassandraClientInstrumentation.java
@@ -13,26 +13,26 @@
 
 @AutoService(InstrumenterModule.class)
 public class CassandraClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public CassandraClientInstrumentation() {
-    super("cassandra");
-  }
+    public CassandraClientInstrumentation() {
+        super("cassandra");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.datastax.oss.driver.internal.core.session.DefaultSession";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.datastax.oss.driver.internal.core.session.DefaultSession";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("init"))
-            .and(isStatic())
-            .and(takesArguments(3))
-            .and(takesArgument(1, named("java.util.Set")))
-            .and(returns(named("java.util.concurrent.CompletionStage"))),
-        packageName + ".CassandraClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("init"))
+                        .and(isStatic())
+                        .and(takesArguments(3))
+                        .and(takesArgument(1, named("java.util.Set")))
+                        .and(returns(named("java.util.concurrent.CompletionStage"))),
+                packageName + ".CassandraClientAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/ContactPointsUtil.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/ContactPointsUtil.java
index bb72201069b..78a8e91d56d 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/ContactPointsUtil.java
+++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/ContactPointsUtil.java
@@ -10,29 +10,25 @@
 import javax.annotation.Nullable;
 
 public class ContactPointsUtil {
-  private static final DDCache<Set<EndPoint>, String> CONTACT_POINT_CACHE =
-      DDCaches.newFixedSizeCache(8);
+    private static final DDCache<Set<EndPoint>, String> CONTACT_POINT_CACHE = DDCaches.newFixedSizeCache(8);
 
-  private static final Function<Set<EndPoint>, String> ADDER =
-      endPoints ->
-          endPoints.stream()
-              .map(EndPoint::resolve)
-              .filter(InetSocketAddress.class::isInstance)
-              .map(InetSocketAddress.class::cast)
-              .map(
-                  inetSocketAddress -> {
-                    if (inetSocketAddress.getPort() > 0) {
-                      return inetSocketAddress.getHostString() + ":" + inetSocketAddress.getPort();
-                    }
-                    return inetSocketAddress.getHostString();
-                  })
-              .distinct() // avoid duplicates
-              .collect(Collectors.joining(","));
+    private static final Function<Set<EndPoint>, String> ADDER = endPoints -> endPoints.stream()
+            .map(EndPoint::resolve)
+            .filter(InetSocketAddress.class::isInstance)
+            .map(InetSocketAddress.class::cast)
+            .map(inetSocketAddress -> {
+                if (inetSocketAddress.getPort() > 0) {
+                    return inetSocketAddress.getHostString() + ":" + inetSocketAddress.getPort();
+                }
+                return inetSocketAddress.getHostString();
+            })
+            .distinct() // avoid duplicates
+            .collect(Collectors.joining(","));
 
-  public static String fromEndPointSet(@Nullable final Set<EndPoint> contactPoints) {
-    if (contactPoints == null) {
-      return null;
+    public static String fromEndPointSet(@Nullable final Set<EndPoint> contactPoints) {
+        if (contactPoints == null) {
+            return null;
+        }
+        return CONTACT_POINT_CACHE.computeIfAbsent(contactPoints, ADDER);
     }
-    return CONTACT_POINT_CACHE.computeIfAbsent(contactPoints, ADDER);
-  }
 }
diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java
index 23cdb14b3d2..3636ce7a5fd 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java
+++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java
@@ -29,90 +29,88 @@
 import javax.annotation.Nullable;
 
 public class TracingSession extends SessionWrapper implements CqlSession {
-  private static final ExecutorService EXECUTOR_SERVICE =
-      Executors.newCachedThreadPool(new AgentThreadFactory(TRACE_CASSANDRA_ASYNC_SESSION));
-
-  private final String contactPoints;
-
-  public TracingSession(final Session session, final String contactPoints) {
-    super(session);
-    this.contactPoints = contactPoints;
-  }
-
-  @Override
-  @Nullable
-  public <RequestT extends Request, ResultT> ResultT execute(
-      @Nonnull RequestT request, @Nonnull GenericType<ResultT> resultType) {
-
-    if (request instanceof Statement && resultType.equals(Statement.SYNC)) {
-      return (ResultT) wrapSyncRequest((Statement) request);
-    } else if (request instanceof Statement && resultType.equals(Statement.ASYNC)) {
-      return (ResultT) wrapAsyncRequest((Statement) request);
-    } else {
-      // PrepareRequest or unknown request: just forward to delegate
-      return getDelegate().execute(request, resultType);
+    private static final ExecutorService EXECUTOR_SERVICE =
+            Executors.newCachedThreadPool(new AgentThreadFactory(TRACE_CASSANDRA_ASYNC_SESSION));
+
+    private final String contactPoints;
+
+    public TracingSession(final Session session, final String contactPoints) {
+        super(session);
+        this.contactPoints = contactPoints;
     }
-  }
 
-  private ResultSet wrapSyncRequest(Statement request) {
-    AgentSpan span = startSpan(JAVA_CASSANDRA.toString(), OPERATION_NAME);
+    @Override
+    @Nullable
+    public <RequestT extends Request, ResultT> ResultT execute(
+            @Nonnull RequestT request, @Nonnull GenericType<ResultT> resultType) {
+
+        if (request instanceof Statement && resultType.equals(Statement.SYNC)) {
+            return (ResultT) wrapSyncRequest((Statement) request);
+        } else if (request instanceof Statement && resultType.equals(Statement.ASYNC)) {
+            return (ResultT) wrapAsyncRequest((Statement) request);
+        } else {
+            // PrepareRequest or unknown request: just forward to delegate
+            return getDelegate().execute(request, resultType);
+        }
+    }
 
-    DECORATE.afterStart(span);
-    DECORATE.onConnection(span, getDelegate());
-    DECORATE.onStatement(span, getQuery(request));
-    span.setTag(InstrumentationTags.CASSANDRA_CONTACT_POINTS, contactPoints);
+    private ResultSet wrapSyncRequest(Statement request) {
+        AgentSpan span = startSpan(JAVA_CASSANDRA.toString(), OPERATION_NAME);
 
-    try (ContextScope scope = activateSpan(span)) {
-      ResultSet resultSet = getDelegate().execute(request, Statement.SYNC);
-      DECORATE.onResponse(span, resultSet);
-      DECORATE.beforeFinish(span);
+        DECORATE.afterStart(span);
+        DECORATE.onConnection(span, getDelegate());
+        DECORATE.onStatement(span, getQuery(request));
+        span.setTag(InstrumentationTags.CASSANDRA_CONTACT_POINTS, contactPoints);
 
-      return resultSet;
-    } catch (Exception e) {
-      DECORATE.onError(span, e);
-      DECORATE.beforeFinish(span);
+        try (ContextScope scope = activateSpan(span)) {
+            ResultSet resultSet = getDelegate().execute(request, Statement.SYNC);
+            DECORATE.onResponse(span, resultSet);
+            DECORATE.beforeFinish(span);
 
-      throw e;
-    } finally {
-      span.finish();
-    }
-  }
-
-  private CompletionStage<AsyncResultSet> wrapAsyncRequest(Statement request) {
-    AgentSpan span = startSpan(JAVA_CASSANDRA.toString(), OPERATION_NAME);
-
-    DECORATE.afterStart(span);
-    DECORATE.onConnection(span, getDelegate());
-    DECORATE.onStatement(span, getQuery(request));
-    span.setTag(InstrumentationTags.CASSANDRA_CONTACT_POINTS, contactPoints);
-
-    try (ContextScope scope = activateSpan(span)) {
-      CompletionStage<AsyncResultSet> completionStage =
-          getDelegate().execute(request, Statement.ASYNC);
-
-      return completionStage.whenComplete(
-          (result, throwable) -> {
-            if (result != null) {
-              DECORATE.onResponse(span, result);
-            }
-
-            if (throwable instanceof CompletionException) {
-              throwable = throwable.getCause();
-            }
-            DECORATE.onError(span, throwable);
+            return resultSet;
+        } catch (Exception e) {
+            DECORATE.onError(span, e);
+            DECORATE.beforeFinish(span);
+
+            throw e;
+        } finally {
             span.finish();
-          });
+        }
     }
-  }
-
-  private static String getQuery(final Statement statement) {
-    String query = null;
-    if (statement instanceof BoundStatement) {
-      query = ((BoundStatement) statement).getPreparedStatement().getQuery();
-    } else if (statement instanceof SimpleStatement) {
-      query = ((SimpleStatement) statement).getQuery();
+
+    private CompletionStage<AsyncResultSet> wrapAsyncRequest(Statement request) {
+        AgentSpan span = startSpan(JAVA_CASSANDRA.toString(), OPERATION_NAME);
+
+        DECORATE.afterStart(span);
+        DECORATE.onConnection(span, getDelegate());
+        DECORATE.onStatement(span, getQuery(request));
+        span.setTag(InstrumentationTags.CASSANDRA_CONTACT_POINTS, contactPoints);
+
+        try (ContextScope scope = activateSpan(span)) {
+            CompletionStage<AsyncResultSet> completionStage = getDelegate().execute(request, Statement.ASYNC);
+
+            return completionStage.whenComplete((result, throwable) -> {
+                if (result != null) {
+                    DECORATE.onResponse(span, result);
+                }
+
+                if (throwable instanceof CompletionException) {
+                    throwable = throwable.getCause();
+                }
+                DECORATE.onError(span, throwable);
+                span.finish();
+            });
+        }
     }
 
-    return query == null ? "" : query;
-  }
+    private static String getQuery(final Statement statement) {
+        String query = null;
+        if (statement instanceof BoundStatement) {
+            query = ((BoundStatement) statement).getPreparedStatement().getQuery();
+        } else if (statement instanceof SimpleStatement) {
+            query = ((SimpleStatement) statement).getQuery();
+        }
+
+        return query == null ? "" : query;
+    }
 }
diff --git a/dd-java-agent/instrumentation/drools/drools-6.0/src/test/java/example/Person.java b/dd-java-agent/instrumentation/drools/drools-6.0/src/test/java/example/Person.java
index 08346b1a234..125418d0dff 100644
--- a/dd-java-agent/instrumentation/drools/drools-6.0/src/test/java/example/Person.java
+++ b/dd-java-agent/instrumentation/drools/drools-6.0/src/test/java/example/Person.java
@@ -1,44 +1,44 @@
 package example;
 
 public class Person {
-  private String name;
-  private int age;
-  private boolean adult;
-
-  public Person() {}
-
-  public Person(String name, int age) {
-    this.name = name;
-    this.age = age;
-    this.adult = false;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public int getAge() {
-    return age;
-  }
-
-  public void setAge(int age) {
-    this.age = age;
-  }
-
-  public boolean isAdult() {
-    return adult;
-  }
-
-  public void setAdult(boolean adult) {
-    this.adult = adult;
-  }
-
-  @Override
-  public String toString() {
-    return "Person{name='" + name + "', age=" + age + ", adult=" + adult + "}";
-  }
+    private String name;
+    private int age;
+    private boolean adult;
+
+    public Person() {}
+
+    public Person(String name, int age) {
+        this.name = name;
+        this.age = age;
+        this.adult = false;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    public boolean isAdult() {
+        return adult;
+    }
+
+    public void setAdult(boolean adult) {
+        this.adult = adult;
+    }
+
+    @Override
+    public String toString() {
+        return "Person{name='" + name + "', age=" + age + ", adult=" + adult + "}";
+    }
 }
diff --git a/dd-java-agent/instrumentation/drools/drools-6.0/src/test/java/test/ConstructorAdvice.java b/dd-java-agent/instrumentation/drools/drools-6.0/src/test/java/test/ConstructorAdvice.java
index 0a44404f343..89e1287dc88 100644
--- a/dd-java-agent/instrumentation/drools/drools-6.0/src/test/java/test/ConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/drools/drools-6.0/src/test/java/test/ConstructorAdvice.java
@@ -3,6 +3,6 @@
 import net.bytebuddy.asm.Advice;
 
 public class ConstructorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit() {}
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit() {}
 }
diff --git a/dd-java-agent/instrumentation/drools/drools-6.0/src/test/java/test/InternalTypesClassLoaderInstrumentation.java b/dd-java-agent/instrumentation/drools/drools-6.0/src/test/java/test/InternalTypesClassLoaderInstrumentation.java
index dbc0af0f2c8..60ef6e68c0a 100644
--- a/dd-java-agent/instrumentation/drools/drools-6.0/src/test/java/test/InternalTypesClassLoaderInstrumentation.java
+++ b/dd-java-agent/instrumentation/drools/drools-6.0/src/test/java/test/InternalTypesClassLoaderInstrumentation.java
@@ -9,32 +9,32 @@
 
 @AutoService(InstrumenterModule.class)
 public class InternalTypesClassLoaderInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  private static final String INTERNAL_TYPES_CLASSLOADER_NAME =
-      "org.drools.wiring.dynamic.DynamicProjectClassLoader$DefaultInternalTypesClassLoader";
-
-  public InternalTypesClassLoaderInstrumentation() {
-    super("drools-test");
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return new ElementMatcher.Junction.ForNonNullValues<ClassLoader>() {
-      @Override
-      protected boolean doMatch(ClassLoader loader) {
-        return INTERNAL_TYPES_CLASSLOADER_NAME.equals(loader.getClass().getName());
-      }
-    };
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "example.GeneratedFact";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), "test.ConstructorAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    private static final String INTERNAL_TYPES_CLASSLOADER_NAME =
+            "org.drools.wiring.dynamic.DynamicProjectClassLoader$DefaultInternalTypesClassLoader";
+
+    public InternalTypesClassLoaderInstrumentation() {
+        super("drools-test");
+    }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return new ElementMatcher.Junction.ForNonNullValues<ClassLoader>() {
+            @Override
+            protected boolean doMatch(ClassLoader loader) {
+                return INTERNAL_TYPES_CLASSLOADER_NAME.equals(loader.getClass().getName());
+            }
+        };
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "example.GeneratedFact";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), "test.ConstructorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/drools/drools-6.0/src/test/java/test/RuleInstrumentation.java b/dd-java-agent/instrumentation/drools/drools-6.0/src/test/java/test/RuleInstrumentation.java
index 1241e84f079..649fed85d40 100644
--- a/dd-java-agent/instrumentation/drools/drools-6.0/src/test/java/test/RuleInstrumentation.java
+++ b/dd-java-agent/instrumentation/drools/drools-6.0/src/test/java/test/RuleInstrumentation.java
@@ -11,24 +11,24 @@
 
 @AutoService(InstrumenterModule.class)
 public class RuleInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public RuleInstrumentation() {
-    super("drools-test");
-  }
+    public RuleInstrumentation() {
+        super("drools-test");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), "test.ConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), "test.ConstructorAdvice");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null;
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null;
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return NameMatchers.nameStartsWith("example.Rule");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return NameMatchers.nameStartsWith("example.Rule");
+    }
 }
diff --git a/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java b/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java
index beb5686e3ad..ef100367832 100644
--- a/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java
+++ b/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java
@@ -23,73 +23,70 @@
 
 @AutoService(InstrumenterModule.class)
 public final class DropwizardViewInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
 
-  public DropwizardViewInstrumentation() {
-    super("dropwizard", "dropwizard-view");
-  }
+    public DropwizardViewInstrumentation() {
+        super("dropwizard", "dropwizard-view");
+    }
 
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return isShortcutMatchingEnabled(true);
-  }
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return isShortcutMatchingEnabled(true);
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.dropwizard.views.freemarker.FreemarkerViewRenderer",
-      "io.dropwizard.views.mustache.MustacheViewRenderer"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.dropwizard.views.freemarker.FreemarkerViewRenderer", "io.dropwizard.views.mustache.MustacheViewRenderer"
+        };
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.dropwizard.views.ViewRenderer";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.dropwizard.views.ViewRenderer";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("render"))
-            .and(takesArgument(0, named("io.dropwizard.views.View")))
-            .and(isPublic()),
-        DropwizardViewInstrumentation.class.getName() + "$RenderAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("render"))
+                        .and(takesArgument(0, named("io.dropwizard.views.View")))
+                        .and(isPublic()),
+                DropwizardViewInstrumentation.class.getName() + "$RenderAdvice");
+    }
 
-  public static class RenderAdvice {
+    public static class RenderAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.This final Object obj, @Advice.Argument(0) final View view) {
-      if (activeSpan() == null) {
-        return null;
-      }
-      final AgentSpan span =
-          startSpan("dropwizard-view", "view.render").setTag(Tags.COMPONENT, "dropwizard-view");
-      span.spanContext().setIntegrationName("dropwizard-view");
-      span.setResourceName("View " + view.getTemplateName());
-      return activateSpan(span);
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(@Advice.This final Object obj, @Advice.Argument(0) final View view) {
+            if (activeSpan() == null) {
+                return null;
+            }
+            final AgentSpan span =
+                    startSpan("dropwizard-view", "view.render").setTag(Tags.COMPONENT, "dropwizard-view");
+            span.spanContext().setIntegrationName("dropwizard-view");
+            span.setResourceName("View " + view.getTemplateName());
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      final AgentSpan span = spanFromScope(scope);
-      if (throwable != null) {
-        span.setError(true);
-        span.addThrowable(throwable);
-      }
-      scope.close();
-      span.finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            final AgentSpan span = spanFromScope(scope);
+            if (throwable != null) {
+                span.setError(true);
+                span.addThrowable(throwable);
+            }
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java
index 951967e2ec4..c72aa8f9dbf 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java
@@ -18,121 +18,117 @@
 import org.elasticsearch.client.Response;
 
 public class ElasticsearchRestClientDecorator extends DBTypeProcessingDatabaseClientDecorator {
-  private static final int MAX_ELASTICSEARCH_BODY_CONTENT_LENGTH = 25000;
-
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().database().service("elasticsearch");
-
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().database().operation("elasticsearch.rest"));
-  public static final CharSequence ELASTICSEARCH_JAVA =
-      UTF8BytesString.create("elasticsearch-java");
-
-  public static final ElasticsearchRestClientDecorator DECORATE =
-      new ElasticsearchRestClientDecorator();
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"elasticsearch"};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return ELASTICSEARCH_JAVA;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.ELASTICSEARCH;
-  }
-
-  @Override
-  protected String dbType() {
-    return "elasticsearch";
-  }
-
-  @Override
-  protected String dbUser(final Object o) {
-    return null;
-  }
-
-  @Override
-  protected String dbInstance(final Object o) {
-    return null;
-  }
-
-  @Override
-  protected String dbHostname(Object o) {
-    return null;
-  }
-
-  private String getElasticsearchRequestBody(HttpEntity entity) {
-    try (BufferedReader bodyBufferedReader =
-        new BufferedReader(new InputStreamReader(entity.getContent(), StandardCharsets.UTF_8))) {
-      StringBuilder bodyStringBuilder = new StringBuilder();
-      String bodyline;
-      while ((bodyline = bodyBufferedReader.readLine()) != null) {
-        bodyStringBuilder.append(bodyline);
-      }
-      return bodyStringBuilder.toString();
-    } catch (IOException e) {
-      return "";
+    private static final int MAX_ELASTICSEARCH_BODY_CONTENT_LENGTH = 25000;
+
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().database().service("elasticsearch");
+
+    public static final CharSequence OPERATION_NAME = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().database().operation("elasticsearch.rest"));
+    public static final CharSequence ELASTICSEARCH_JAVA = UTF8BytesString.create("elasticsearch-java");
+
+    public static final ElasticsearchRestClientDecorator DECORATE = new ElasticsearchRestClientDecorator();
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"elasticsearch"};
+    }
+
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
     }
-  }
-
-  public void onRequest(
-      final AgentSpan span,
-      final String method,
-      final String endpoint,
-      final HttpEntity entity,
-      final Map<String, String> parameters) {
-    span.setTag(Tags.HTTP_METHOD, method);
-    span.setTag(Tags.HTTP_URL, endpoint);
-
-    final Config config = Config.get();
-    if (config.isElasticsearchBodyEnabled() || config.isElasticsearchBodyAndParamsEnabled()) {
-      if (entity != null) {
-        long contentLength = entity.getContentLength();
-        if (contentLength <= MAX_ELASTICSEARCH_BODY_CONTENT_LENGTH) {
-          span.setTag("elasticsearch.body", getElasticsearchRequestBody(entity));
-        } else {
-          span.setTag(
-              "elasticsearch.body",
-              "<body size "
-                  + contentLength
-                  + " exceeds limit of "
-                  + MAX_ELASTICSEARCH_BODY_CONTENT_LENGTH
-                  + ">");
+
+    @Override
+    protected CharSequence component() {
+        return ELASTICSEARCH_JAVA;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.ELASTICSEARCH;
+    }
+
+    @Override
+    protected String dbType() {
+        return "elasticsearch";
+    }
+
+    @Override
+    protected String dbUser(final Object o) {
+        return null;
+    }
+
+    @Override
+    protected String dbInstance(final Object o) {
+        return null;
+    }
+
+    @Override
+    protected String dbHostname(Object o) {
+        return null;
+    }
+
+    private String getElasticsearchRequestBody(HttpEntity entity) {
+        try (BufferedReader bodyBufferedReader =
+                new BufferedReader(new InputStreamReader(entity.getContent(), StandardCharsets.UTF_8))) {
+            StringBuilder bodyStringBuilder = new StringBuilder();
+            String bodyline;
+            while ((bodyline = bodyBufferedReader.readLine()) != null) {
+                bodyStringBuilder.append(bodyline);
+            }
+            return bodyStringBuilder.toString();
+        } catch (IOException e) {
+            return "";
         }
-      }
     }
 
-    if (config.isElasticsearchParamsEnabled() || config.isElasticsearchBodyAndParamsEnabled()) {
-      if (parameters != null) {
-        StringBuilder queryParametersStringBuilder = new StringBuilder();
-        for (Map.Entry<String, String> parameter : parameters.entrySet()) {
-          queryParametersStringBuilder.append(
-              parameter.getKey() + "=" + parameter.getValue() + "&");
+    public void onRequest(
+            final AgentSpan span,
+            final String method,
+            final String endpoint,
+            final HttpEntity entity,
+            final Map<String, String> parameters) {
+        span.setTag(Tags.HTTP_METHOD, method);
+        span.setTag(Tags.HTTP_URL, endpoint);
+
+        final Config config = Config.get();
+        if (config.isElasticsearchBodyEnabled() || config.isElasticsearchBodyAndParamsEnabled()) {
+            if (entity != null) {
+                long contentLength = entity.getContentLength();
+                if (contentLength <= MAX_ELASTICSEARCH_BODY_CONTENT_LENGTH) {
+                    span.setTag("elasticsearch.body", getElasticsearchRequestBody(entity));
+                } else {
+                    span.setTag(
+                            "elasticsearch.body",
+                            "<body size "
+                                    + contentLength
+                                    + " exceeds limit of "
+                                    + MAX_ELASTICSEARCH_BODY_CONTENT_LENGTH
+                                    + ">");
+                }
+            }
         }
-        if (queryParametersStringBuilder.length() >= 1) {
-          queryParametersStringBuilder.deleteCharAt(queryParametersStringBuilder.length() - 1);
+
+        if (config.isElasticsearchParamsEnabled() || config.isElasticsearchBodyAndParamsEnabled()) {
+            if (parameters != null) {
+                StringBuilder queryParametersStringBuilder = new StringBuilder();
+                for (Map.Entry<String, String> parameter : parameters.entrySet()) {
+                    queryParametersStringBuilder.append(parameter.getKey() + "=" + parameter.getValue() + "&");
+                }
+                if (queryParametersStringBuilder.length() >= 1) {
+                    queryParametersStringBuilder.deleteCharAt(queryParametersStringBuilder.length() - 1);
+                }
+                span.setTag("elasticsearch.params", queryParametersStringBuilder.toString());
+            }
         }
-        span.setTag("elasticsearch.params", queryParametersStringBuilder.toString());
-      }
+        HTTP_RESOURCE_DECORATOR.withClientPath(span, method, endpoint);
     }
-    HTTP_RESOURCE_DECORATOR.withClientPath(span, method, endpoint);
-  }
 
-  public void onResponse(final AgentSpan span, final Response response) {
-    if (response != null && response.getHost() != null) {
-      span.setTag(Tags.PEER_HOSTNAME, response.getHost().getHostName());
-      setPeerPort(span, response.getHost().getPort());
+    public void onResponse(final AgentSpan span, final Response response) {
+        if (response != null && response.getHost() != null) {
+            span.setTag(Tags.PEER_HOSTNAME, response.getHost().getHostName());
+            setPeerPort(span, response.getHost().getPort());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java
index 1973e2b15d5..b24758eb7ff 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java
@@ -8,71 +8,69 @@
 
 public class ElasticsearchTransportClientDecorator extends DBTypeProcessingDatabaseClientDecorator {
 
-  private static final String DB_TYPE = "elasticsearch";
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().database().service(DB_TYPE);
+    private static final String DB_TYPE = "elasticsearch";
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().database().service(DB_TYPE);
 
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
-  public static final CharSequence ELASTICSEARCH_JAVA =
-      UTF8BytesString.create("elasticsearch-java");
+    public static final CharSequence OPERATION_NAME = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
+    public static final CharSequence ELASTICSEARCH_JAVA = UTF8BytesString.create("elasticsearch-java");
 
-  public static final ElasticsearchTransportClientDecorator DECORATE =
-      new ElasticsearchTransportClientDecorator();
+    public static final ElasticsearchTransportClientDecorator DECORATE = new ElasticsearchTransportClientDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"elasticsearch"};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"elasticsearch"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return ELASTICSEARCH_JAVA;
-  }
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.ELASTICSEARCH;
-  }
+    @Override
+    protected CharSequence component() {
+        return ELASTICSEARCH_JAVA;
+    }
 
-  @Override
-  protected String dbType() {
-    return DB_TYPE;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.ELASTICSEARCH;
+    }
 
-  @Override
-  protected String dbUser(final Object o) {
-    return null;
-  }
+    @Override
+    protected String dbType() {
+        return DB_TYPE;
+    }
 
-  @Override
-  protected String dbInstance(final Object o) {
-    return null;
-  }
+    @Override
+    protected String dbUser(final Object o) {
+        return null;
+    }
 
-  @Override
-  protected String dbHostname(Object o) {
-    return null;
-  }
+    @Override
+    protected String dbInstance(final Object o) {
+        return null;
+    }
 
-  public void onRequest(final AgentSpan span, final Class action, final Class request) {
-    if (action != null) {
-      String actionName = action.getSimpleName();
-      // ES 7.9 internally changes PutMappingAction to AutoPutMappingAction for
-      // documents with unmapped fields; reverse this to get the original action
-      if ("AutoPutMappingAction".equals(actionName)) {
-        actionName = "PutMappingAction";
-      }
-      span.setResourceName(actionName);
-      span.setTag("elasticsearch.action", actionName);
+    @Override
+    protected String dbHostname(Object o) {
+        return null;
     }
-    if (request != null) {
-      span.setTag("elasticsearch.request", request.getSimpleName());
+
+    public void onRequest(final AgentSpan span, final Class action, final Class request) {
+        if (action != null) {
+            String actionName = action.getSimpleName();
+            // ES 7.9 internally changes PutMappingAction to AutoPutMappingAction for
+            // documents with unmapped fields; reverse this to get the original action
+            if ("AutoPutMappingAction".equals(actionName)) {
+                actionName = "PutMappingAction";
+            }
+            span.setResourceName(actionName);
+            span.setTag("elasticsearch.action", actionName);
+        }
+        if (request != null) {
+            span.setTag("elasticsearch.request", request.getSimpleName());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java
index cab6fb252bc..5f801aaef91 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java
@@ -22,67 +22,66 @@
 
 @AutoService(InstrumenterModule.class)
 public class Elasticsearch5RestClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public Elasticsearch5RestClientInstrumentation() {
-    super("elasticsearch", "elasticsearch-rest", "elasticsearch-rest-5");
-  }
+    public Elasticsearch5RestClientInstrumentation() {
+        super("elasticsearch", "elasticsearch-rest", "elasticsearch-rest-5");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator",
-      packageName + ".RestResponseListener",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator",
+            packageName + ".RestResponseListener",
+        };
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.elasticsearch.client.RestClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.elasticsearch.client.RestClient";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("performRequestAsync", "performRequestAsyncNoCatch"))
-            .and(takesArguments(7))
-            .and(takesArgument(0, named("java.lang.String"))) // method
-            .and(takesArgument(1, named("java.lang.String"))) // endpoint
-            .and(takesArgument(5, named("org.elasticsearch.client.ResponseListener"))),
-        Elasticsearch5RestClientInstrumentation.class.getName() + "$ElasticsearchRestClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("performRequestAsync", "performRequestAsyncNoCatch"))
+                        .and(takesArguments(7))
+                        .and(takesArgument(0, named("java.lang.String"))) // method
+                        .and(takesArgument(1, named("java.lang.String"))) // endpoint
+                        .and(takesArgument(5, named("org.elasticsearch.client.ResponseListener"))),
+                Elasticsearch5RestClientInstrumentation.class.getName() + "$ElasticsearchRestClientAdvice");
+    }
 
-  public static class ElasticsearchRestClientAdvice {
+    public static class ElasticsearchRestClientAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final String method,
-        @Advice.Argument(1) final String endpoint,
-        @Advice.Argument(value = 5, readOnly = false) ResponseListener responseListener) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final String method,
+                @Advice.Argument(1) final String endpoint,
+                @Advice.Argument(value = 5, readOnly = false) ResponseListener responseListener) {
 
-      final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, method, endpoint, null, null);
+            final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, method, endpoint, null, null);
 
-      responseListener = new RestResponseListener(responseListener, span);
+            responseListener = new RestResponseListener(responseListener, span);
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (throwable != null) {
-        final AgentSpan span = spanFromScope(scope);
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
-      // span finished by RestResponseListener
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (throwable != null) {
+                final AgentSpan span = spanFromScope(scope);
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+            // span finished by RestResponseListener
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/RestResponseListener.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/RestResponseListener.java
index 94756884646..ba910bf3334 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/RestResponseListener.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/RestResponseListener.java
@@ -8,37 +8,37 @@
 
 public class RestResponseListener implements ResponseListener {
 
-  private final ResponseListener listener;
-  private final AgentSpan span;
-
-  public RestResponseListener(final ResponseListener listener, final AgentSpan span) {
-    this.listener = listener;
-    this.span = span;
-  }
-
-  @Override
-  public void onSuccess(final Response response) {
-    if (response.getHost() != null) {
-      DECORATE.onResponse(span, response);
+    private final ResponseListener listener;
+    private final AgentSpan span;
+
+    public RestResponseListener(final ResponseListener listener, final AgentSpan span) {
+        this.listener = listener;
+        this.span = span;
     }
 
-    try {
-      listener.onSuccess(response);
-    } finally {
-      DECORATE.beforeFinish(span);
-      span.finish();
+    @Override
+    public void onSuccess(final Response response) {
+        if (response.getHost() != null) {
+            DECORATE.onResponse(span, response);
+        }
+
+        try {
+            listener.onSuccess(response);
+        } finally {
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 
-  @Override
-  public void onFailure(final Exception e) {
-    DECORATE.onError(span, e);
+    @Override
+    public void onFailure(final Exception e) {
+        DECORATE.onError(span, e);
 
-    try {
-      listener.onFailure(e);
-    } finally {
-      DECORATE.beforeFinish(span);
-      span.finish();
+        try {
+            listener.onFailure(e);
+        } finally {
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java
index eacb7bab4b5..fa7deabf3b4 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java
@@ -22,70 +22,65 @@
 
 @AutoService(InstrumenterModule.class)
 public class Elasticsearch6RestClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public Elasticsearch6RestClientInstrumentation() {
-    super("elasticsearch", "elasticsearch-rest", "elasticsearch-rest-6");
-  }
+    public Elasticsearch6RestClientInstrumentation() {
+        super("elasticsearch", "elasticsearch-rest", "elasticsearch-rest-6");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator",
-      packageName + ".RestResponseListener",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator",
+            packageName + ".RestResponseListener",
+        };
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.elasticsearch.client.RestClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.elasticsearch.client.RestClient";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("performRequestAsyncNoCatch"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("org.elasticsearch.client.Request")))
-            .and(takesArgument(1, named("org.elasticsearch.client.ResponseListener"))),
-        Elasticsearch6RestClientInstrumentation.class.getName() + "$ElasticsearchRestClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("performRequestAsyncNoCatch"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("org.elasticsearch.client.Request")))
+                        .and(takesArgument(1, named("org.elasticsearch.client.ResponseListener"))),
+                Elasticsearch6RestClientInstrumentation.class.getName() + "$ElasticsearchRestClientAdvice");
+    }
 
-  public static class ElasticsearchRestClientAdvice {
+    public static class ElasticsearchRestClientAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final Request request,
-        @Advice.Argument(value = 1, readOnly = false) ResponseListener responseListener) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final Request request,
+                @Advice.Argument(value = 1, readOnly = false) ResponseListener responseListener) {
 
-      final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(
-          span,
-          request.getMethod(),
-          request.getEndpoint(),
-          request.getEntity(),
-          request.getParameters());
+            final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(
+                    span, request.getMethod(), request.getEndpoint(), request.getEntity(), request.getParameters());
 
-      responseListener = new RestResponseListener(responseListener, span);
+            responseListener = new RestResponseListener(responseListener, span);
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (throwable != null) {
-        final AgentSpan span = spanFromScope(scope);
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
-      // span finished by RestResponseListener
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (throwable != null) {
+                final AgentSpan span = spanFromScope(scope);
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+            // span finished by RestResponseListener
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/RestResponseListener.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/RestResponseListener.java
index a08b4683bdc..3273a2d8bcc 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/RestResponseListener.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/RestResponseListener.java
@@ -7,37 +7,37 @@
 
 public class RestResponseListener implements ResponseListener {
 
-  private final ResponseListener listener;
-  private final AgentSpan span;
-
-  public RestResponseListener(final ResponseListener listener, final AgentSpan span) {
-    this.listener = listener;
-    this.span = span;
-  }
-
-  @Override
-  public void onSuccess(final Response response) {
-    if (response.getHost() != null) {
-      ElasticsearchRestClientDecorator.DECORATE.onResponse(span, response);
+    private final ResponseListener listener;
+    private final AgentSpan span;
+
+    public RestResponseListener(final ResponseListener listener, final AgentSpan span) {
+        this.listener = listener;
+        this.span = span;
     }
 
-    try {
-      listener.onSuccess(response);
-    } finally {
-      ElasticsearchRestClientDecorator.DECORATE.beforeFinish(span);
-      span.finish();
+    @Override
+    public void onSuccess(final Response response) {
+        if (response.getHost() != null) {
+            ElasticsearchRestClientDecorator.DECORATE.onResponse(span, response);
+        }
+
+        try {
+            listener.onSuccess(response);
+        } finally {
+            ElasticsearchRestClientDecorator.DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 
-  @Override
-  public void onFailure(final Exception e) {
-    ElasticsearchRestClientDecorator.DECORATE.onError(span, e);
+    @Override
+    public void onFailure(final Exception e) {
+        ElasticsearchRestClientDecorator.DECORATE.onError(span, e);
 
-    try {
-      listener.onFailure(e);
-    } finally {
-      ElasticsearchRestClientDecorator.DECORATE.beforeFinish(span);
-      span.finish();
+        try {
+            listener.onFailure(e);
+        } finally {
+            ElasticsearchRestClientDecorator.DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java
index 24a3eaa0148..87d23492f67 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java
@@ -26,95 +26,90 @@
 
 @AutoService(InstrumenterModule.class)
 public class Elasticsearch7RestClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public Elasticsearch7RestClientInstrumentation() {
-    super("elasticsearch", "elasticsearch-rest", "elasticsearch-rest-7");
-  }
+    public Elasticsearch7RestClientInstrumentation() {
+        super("elasticsearch", "elasticsearch-rest", "elasticsearch-rest-7");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Avoid matching pre-ES7 releases which have their own instrumentations.
-    return hasClassNamed("org.elasticsearch.client.RestClient$InternalRequest");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Avoid matching pre-ES7 releases which have their own instrumentations.
+        return hasClassNamed("org.elasticsearch.client.RestClient$InternalRequest");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator",
-      packageName + ".RestResponseListener",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator",
+            packageName + ".RestResponseListener",
+        };
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.elasticsearch.client.RestClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.elasticsearch.client.RestClient";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("performRequest"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("org.elasticsearch.client.Request"))),
-        Elasticsearch7RestClientInstrumentation.class.getName() + "$ElasticsearchRestClientAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("performRequestAsync"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("org.elasticsearch.client.Request")))
-            .and(takesArgument(1, named("org.elasticsearch.client.ResponseListener"))),
-        Elasticsearch7RestClientInstrumentation.class.getName() + "$ElasticsearchRestClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("performRequest"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("org.elasticsearch.client.Request"))),
+                Elasticsearch7RestClientInstrumentation.class.getName() + "$ElasticsearchRestClientAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("performRequestAsync"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("org.elasticsearch.client.Request")))
+                        .and(takesArgument(1, named("org.elasticsearch.client.ResponseListener"))),
+                Elasticsearch7RestClientInstrumentation.class.getName() + "$ElasticsearchRestClientAdvice");
+    }
 
-  public static class ElasticsearchRestClientAdvice {
+    public static class ElasticsearchRestClientAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final Request request,
-        @Advice.Argument(value = 1, readOnly = false, optional = true)
-            ResponseListener responseListener) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final Request request,
+                @Advice.Argument(value = 1, readOnly = false, optional = true) ResponseListener responseListener) {
 
-      final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(
-          span,
-          request.getMethod(),
-          request.getEndpoint(),
-          request.getEntity(),
-          request.getParameters());
+            final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(
+                    span, request.getMethod(), request.getEndpoint(), request.getEntity(), request.getParameters());
 
-      if (responseListener != null) {
-        responseListener = new RestResponseListener(responseListener, span);
-      }
+            if (responseListener != null) {
+                responseListener = new RestResponseListener(responseListener, span);
+            }
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object result) {
-      if (throwable != null) {
-        final AgentSpan span = spanFromScope(scope);
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else if (result instanceof Response) {
-        final AgentSpan span = spanFromScope(scope);
-        if (((Response) result).getHost() != null) {
-          DECORATE.onResponse(span, ((Response) result));
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object result) {
+            if (throwable != null) {
+                final AgentSpan span = spanFromScope(scope);
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else if (result instanceof Response) {
+                final AgentSpan span = spanFromScope(scope);
+                if (((Response) result).getHost() != null) {
+                    DECORATE.onResponse(span, ((Response) result));
+                }
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+                // async call, span finished by RestResponseListener
+            }
         }
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-        // async call, span finished by RestResponseListener
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/RestResponseListener.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/RestResponseListener.java
index b957462cb0c..2d55dc9f264 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/RestResponseListener.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/RestResponseListener.java
@@ -8,37 +8,37 @@
 /** This class is identical to version 6's instrumentation. */
 public class RestResponseListener implements ResponseListener {
 
-  private final ResponseListener listener;
-  private final AgentSpan span;
-
-  public RestResponseListener(final ResponseListener listener, final AgentSpan span) {
-    this.listener = listener;
-    this.span = span;
-  }
-
-  @Override
-  public void onSuccess(final Response response) {
-    if (response.getHost() != null) {
-      ElasticsearchRestClientDecorator.DECORATE.onResponse(span, response);
+    private final ResponseListener listener;
+    private final AgentSpan span;
+
+    public RestResponseListener(final ResponseListener listener, final AgentSpan span) {
+        this.listener = listener;
+        this.span = span;
     }
 
-    try {
-      listener.onSuccess(response);
-    } finally {
-      ElasticsearchRestClientDecorator.DECORATE.beforeFinish(span);
-      span.finish();
+    @Override
+    public void onSuccess(final Response response) {
+        if (response.getHost() != null) {
+            ElasticsearchRestClientDecorator.DECORATE.onResponse(span, response);
+        }
+
+        try {
+            listener.onSuccess(response);
+        } finally {
+            ElasticsearchRestClientDecorator.DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 
-  @Override
-  public void onFailure(final Exception e) {
-    ElasticsearchRestClientDecorator.DECORATE.onError(span, e);
+    @Override
+    public void onFailure(final Exception e) {
+        ElasticsearchRestClientDecorator.DECORATE.onError(span, e);
 
-    try {
-      listener.onFailure(e);
-    } finally {
-      ElasticsearchRestClientDecorator.DECORATE.beforeFinish(span);
-      span.finish();
+        try {
+            listener.onFailure(e);
+        } finally {
+            ElasticsearchRestClientDecorator.DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/latestDepTest/groovy/ElasticsearchBreakTraceInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/latestDepTest/groovy/ElasticsearchBreakTraceInstrumentation.java
index 9f8e6ea4142..cd357d8670e 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/latestDepTest/groovy/ElasticsearchBreakTraceInstrumentation.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/latestDepTest/groovy/ElasticsearchBreakTraceInstrumentation.java
@@ -13,14 +13,14 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ElasticsearchBreakTraceInstrumentation extends TestInstrumentation {
-  @Override
-  public String instrumentedType() {
-    return "org.elasticsearch.client.node.NodeClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.elasticsearch.client.node.NodeClient";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // this method changed to executeLocally in 5+
-    transformer.applyAdvice(named("doExecute"), ShadowExistingScopeAdvice.class.getName());
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // this method changed to executeLocally in 5+
+        transformer.applyAdvice(named("doExecute"), ShadowExistingScopeAdvice.class.getName());
+    }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java
index 22697ceba52..de758f20512 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java
@@ -23,70 +23,67 @@
 
 @AutoService(InstrumenterModule.class)
 public class Elasticsearch2TransportClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public Elasticsearch2TransportClientInstrumentation() {
-    super("elasticsearch", "elasticsearch-transport", "elasticsearch-transport-2");
-  }
+    public Elasticsearch2TransportClientInstrumentation() {
+        super("elasticsearch", "elasticsearch-transport", "elasticsearch-transport-2");
+    }
 
-  @Override
-  public String instrumentedType() {
-    // If we want to be more generic, we could instrument the interface instead:
-    // .and(safeHasSuperType(named("org.elasticsearch.client.ElasticsearchClient"))))
-    return "org.elasticsearch.client.support.AbstractClient";
-  }
+    @Override
+    public String instrumentedType() {
+        // If we want to be more generic, we could instrument the interface instead:
+        // .and(safeHasSuperType(named("org.elasticsearch.client.ElasticsearchClient"))))
+        return "org.elasticsearch.client.support.AbstractClient";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator",
-      packageName + ".TransportActionListener",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator",
+            packageName + ".TransportActionListener",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArgument(0, named("org.elasticsearch.action.Action")))
-            .and(takesArgument(1, named("org.elasticsearch.action.ActionRequest")))
-            .and(takesArgument(2, named("org.elasticsearch.action.ActionListener"))),
-        Elasticsearch2TransportClientInstrumentation.class.getName()
-            + "$ElasticsearchTransportClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArgument(0, named("org.elasticsearch.action.Action")))
+                        .and(takesArgument(1, named("org.elasticsearch.action.ActionRequest")))
+                        .and(takesArgument(2, named("org.elasticsearch.action.ActionListener"))),
+                Elasticsearch2TransportClientInstrumentation.class.getName() + "$ElasticsearchTransportClientAdvice");
+    }
 
-  public static class ElasticsearchTransportClientAdvice {
+    public static class ElasticsearchTransportClientAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final Action action,
-        @Advice.Argument(1) final ActionRequest actionRequest,
-        @Advice.Argument(value = 2, readOnly = false)
-            ActionListener<ActionResponse> actionListener) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final Action action,
+                @Advice.Argument(1) final ActionRequest actionRequest,
+                @Advice.Argument(value = 2, readOnly = false) ActionListener<ActionResponse> actionListener) {
 
-      final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, action.getClass(), actionRequest.getClass());
+            final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, action.getClass(), actionRequest.getClass());
 
-      actionListener = new TransportActionListener<>(actionRequest, actionListener, span);
+            actionListener = new TransportActionListener<>(actionRequest, actionListener, span);
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (throwable != null) {
-        final AgentSpan span = spanFromScope(scope);
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
-      // span finished by TransportActionListener
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (throwable != null) {
+                final AgentSpan span = spanFromScope(scope);
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+            // span finished by TransportActionListener
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/main/java/datadog/trace/instrumentation/elasticsearch2/TransportActionListener.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/main/java/datadog/trace/instrumentation/elasticsearch2/TransportActionListener.java
index db8144f8a22..e2ccc8e9401 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/main/java/datadog/trace/instrumentation/elasticsearch2/TransportActionListener.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/main/java/datadog/trace/instrumentation/elasticsearch2/TransportActionListener.java
@@ -17,87 +17,87 @@
 
 public class TransportActionListener<T extends ActionResponse> implements ActionListener<T> {
 
-  private final ActionListener<T> listener;
-  private final AgentSpan span;
+    private final ActionListener<T> listener;
+    private final AgentSpan span;
 
-  public TransportActionListener(
-      final ActionRequest actionRequest, final ActionListener<T> listener, final AgentSpan span) {
-    this.listener = listener;
-    this.span = span;
-    onRequest(actionRequest);
-  }
-
-  private void onRequest(final ActionRequest request) {
-    if (request instanceof IndicesRequest) {
-      final IndicesRequest req = (IndicesRequest) request;
-      if (req.indices() != null) {
-        span.setTag("elasticsearch.request.indices", String.join(",", req.indices()));
-      }
-    }
-    if (request instanceof SearchRequest) {
-      final SearchRequest req = (SearchRequest) request;
-      span.setTag("elasticsearch.request.search.types", String.join(",", req.types()));
+    public TransportActionListener(
+            final ActionRequest actionRequest, final ActionListener<T> listener, final AgentSpan span) {
+        this.listener = listener;
+        this.span = span;
+        onRequest(actionRequest);
     }
-    if (request instanceof DocumentRequest) {
-      final DocumentRequest req = (DocumentRequest) request;
-      span.setTag("elasticsearch.request.write.type", req.type());
-      span.setTag("elasticsearch.request.write.routing", req.routing());
-    }
-  }
 
-  @Override
-  public void onResponse(final T response) {
-    if (response.remoteAddress() != null) {
-      span.setTag(Tags.PEER_HOSTNAME, response.remoteAddress().getHost());
-      span.setTag(Tags.PEER_HOST_IPV4, response.remoteAddress().getAddress());
-      DECORATE.setPeerPort(span, response.remoteAddress().getPort());
+    private void onRequest(final ActionRequest request) {
+        if (request instanceof IndicesRequest) {
+            final IndicesRequest req = (IndicesRequest) request;
+            if (req.indices() != null) {
+                span.setTag("elasticsearch.request.indices", String.join(",", req.indices()));
+            }
+        }
+        if (request instanceof SearchRequest) {
+            final SearchRequest req = (SearchRequest) request;
+            span.setTag("elasticsearch.request.search.types", String.join(",", req.types()));
+        }
+        if (request instanceof DocumentRequest) {
+            final DocumentRequest req = (DocumentRequest) request;
+            span.setTag("elasticsearch.request.write.type", req.type());
+            span.setTag("elasticsearch.request.write.routing", req.routing());
+        }
     }
 
-    if (response instanceof GetResponse) {
-      final GetResponse resp = (GetResponse) response;
-      span.setTag("elasticsearch.type", resp.getType());
-      span.setTag("elasticsearch.id", resp.getId());
-      span.setTag("elasticsearch.version", resp.getVersion());
-    }
+    @Override
+    public void onResponse(final T response) {
+        if (response.remoteAddress() != null) {
+            span.setTag(Tags.PEER_HOSTNAME, response.remoteAddress().getHost());
+            span.setTag(Tags.PEER_HOST_IPV4, response.remoteAddress().getAddress());
+            DECORATE.setPeerPort(span, response.remoteAddress().getPort());
+        }
 
-    if (response instanceof BroadcastResponse) {
-      final BroadcastResponse resp = (BroadcastResponse) response;
-      span.setTag("elasticsearch.shard.broadcast.total", resp.getTotalShards());
-      span.setTag("elasticsearch.shard.broadcast.successful", resp.getSuccessfulShards());
-      span.setTag("elasticsearch.shard.broadcast.failed", resp.getFailedShards());
-    }
+        if (response instanceof GetResponse) {
+            final GetResponse resp = (GetResponse) response;
+            span.setTag("elasticsearch.type", resp.getType());
+            span.setTag("elasticsearch.id", resp.getId());
+            span.setTag("elasticsearch.version", resp.getVersion());
+        }
 
-    if (response instanceof BulkShardResponse) {
-      final BulkShardResponse resp = (BulkShardResponse) response;
-      span.setTag("elasticsearch.shard.bulk.id", resp.getShardId().getId());
-      span.setTag("elasticsearch.shard.bulk.index", resp.getShardId().getIndex());
-    }
+        if (response instanceof BroadcastResponse) {
+            final BroadcastResponse resp = (BroadcastResponse) response;
+            span.setTag("elasticsearch.shard.broadcast.total", resp.getTotalShards());
+            span.setTag("elasticsearch.shard.broadcast.successful", resp.getSuccessfulShards());
+            span.setTag("elasticsearch.shard.broadcast.failed", resp.getFailedShards());
+        }
 
-    if (response instanceof BaseNodesResponse) {
-      final BaseNodesResponse resp = (BaseNodesResponse) response;
-      if (resp.failures() != null && resp.failures().length > 0) {
-        span.setTag("elasticsearch.node.failures", resp.failures().length);
-      }
-      span.setTag("elasticsearch.node.cluster.name", resp.getClusterName().value());
-    }
+        if (response instanceof BulkShardResponse) {
+            final BulkShardResponse resp = (BulkShardResponse) response;
+            span.setTag("elasticsearch.shard.bulk.id", resp.getShardId().getId());
+            span.setTag("elasticsearch.shard.bulk.index", resp.getShardId().getIndex());
+        }
+
+        if (response instanceof BaseNodesResponse) {
+            final BaseNodesResponse resp = (BaseNodesResponse) response;
+            if (resp.failures() != null && resp.failures().length > 0) {
+                span.setTag("elasticsearch.node.failures", resp.failures().length);
+            }
+            span.setTag("elasticsearch.node.cluster.name", resp.getClusterName().value());
+        }
 
-    try {
-      listener.onResponse(response);
-    } finally {
-      DECORATE.beforeFinish(span);
-      span.finish();
+        try {
+            listener.onResponse(response);
+        } finally {
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 
-  @Override
-  public void onFailure(final Throwable e) {
-    DECORATE.onError(span, e);
+    @Override
+    public void onFailure(final Throwable e) {
+        DECORATE.onError(span, e);
 
-    try {
-      listener.onFailure(e);
-    } finally {
-      DECORATE.beforeFinish(span);
-      span.finish();
+        try {
+            listener.onFailure(e);
+        } finally {
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java
index 9f8e6ea4142..cd357d8670e 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java
@@ -13,14 +13,14 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ElasticsearchBreakTraceInstrumentation extends TestInstrumentation {
-  @Override
-  public String instrumentedType() {
-    return "org.elasticsearch.client.node.NodeClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.elasticsearch.client.node.NodeClient";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // this method changed to executeLocally in 5+
-    transformer.applyAdvice(named("doExecute"), ShadowExistingScopeAdvice.class.getName());
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // this method changed to executeLocally in 5+
+        transformer.applyAdvice(named("doExecute"), ShadowExistingScopeAdvice.class.getName());
+    }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java
index 28afc82b20b..f71b9767167 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java
@@ -23,70 +23,67 @@
 
 @AutoService(InstrumenterModule.class)
 public class Elasticsearch5TransportClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public Elasticsearch5TransportClientInstrumentation() {
-    super("elasticsearch", "elasticsearch-transport", "elasticsearch-transport-5");
-  }
+    public Elasticsearch5TransportClientInstrumentation() {
+        super("elasticsearch", "elasticsearch-transport", "elasticsearch-transport-5");
+    }
 
-  @Override
-  public String instrumentedType() {
-    // If we want to be more generic, we could instrument the interface instead:
-    // .and(safeHasSuperType(named("org.elasticsearch.client.ElasticsearchClient"))))
-    return "org.elasticsearch.client.support.AbstractClient";
-  }
+    @Override
+    public String instrumentedType() {
+        // If we want to be more generic, we could instrument the interface instead:
+        // .and(safeHasSuperType(named("org.elasticsearch.client.ElasticsearchClient"))))
+        return "org.elasticsearch.client.support.AbstractClient";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator",
-      packageName + ".TransportActionListener",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator",
+            packageName + ".TransportActionListener",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArgument(0, named("org.elasticsearch.action.Action")))
-            .and(takesArgument(1, named("org.elasticsearch.action.ActionRequest")))
-            .and(takesArgument(2, named("org.elasticsearch.action.ActionListener"))),
-        Elasticsearch5TransportClientInstrumentation.class.getName()
-            + "$ElasticsearchTransportClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArgument(0, named("org.elasticsearch.action.Action")))
+                        .and(takesArgument(1, named("org.elasticsearch.action.ActionRequest")))
+                        .and(takesArgument(2, named("org.elasticsearch.action.ActionListener"))),
+                Elasticsearch5TransportClientInstrumentation.class.getName() + "$ElasticsearchTransportClientAdvice");
+    }
 
-  public static class ElasticsearchTransportClientAdvice {
+    public static class ElasticsearchTransportClientAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final Action action,
-        @Advice.Argument(1) final ActionRequest actionRequest,
-        @Advice.Argument(value = 2, readOnly = false)
-            ActionListener<ActionResponse> actionListener) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final Action action,
+                @Advice.Argument(1) final ActionRequest actionRequest,
+                @Advice.Argument(value = 2, readOnly = false) ActionListener<ActionResponse> actionListener) {
 
-      final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, action.getClass(), actionRequest.getClass());
+            final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, action.getClass(), actionRequest.getClass());
 
-      actionListener = new TransportActionListener<>(actionRequest, actionListener, span);
+            actionListener = new TransportActionListener<>(actionRequest, actionListener, span);
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (throwable != null) {
-        final AgentSpan span = spanFromScope(scope);
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
-      // span finished by TransportActionListener
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (throwable != null) {
+                final AgentSpan span = spanFromScope(scope);
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+            // span finished by TransportActionListener
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/TransportActionListener.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/TransportActionListener.java
index 826cb940e37..c455c572a51 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/TransportActionListener.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/TransportActionListener.java
@@ -20,100 +20,106 @@
 
 public class TransportActionListener<T extends ActionResponse> implements ActionListener<T> {
 
-  private final ActionListener<T> listener;
-  private final AgentSpan span;
-  private final boolean migrateSpan;
-
-  public TransportActionListener(
-      final ActionRequest actionRequest, final ActionListener<T> listener, final AgentSpan span) {
-    this.listener = listener;
-    this.span = span;
-    this.migrateSpan = actionRequest instanceof PutMappingRequest;
-    onRequest(actionRequest);
-  }
-
-  private void onRequest(final ActionRequest request) {
-    if (request instanceof IndicesRequest) {
-      final IndicesRequest req = (IndicesRequest) request;
-      if (req.indices() != null) {
-        span.setTag("elasticsearch.request.indices", String.join(",", req.indices()));
-      }
-    }
-    if (request instanceof SearchRequest) {
-      final SearchRequest req = (SearchRequest) request;
-      span.setTag("elasticsearch.request.search.types", String.join(",", req.types()));
-    }
-    if (request instanceof DocumentRequest) {
-      final DocumentRequest req = (DocumentRequest) request;
-      span.setTag("elasticsearch.request.write.type", req.type());
-      span.setTag("elasticsearch.request.write.routing", req.routing());
-    }
-  }
-
-  @Override
-  public void onResponse(final T response) {
-    if (response.remoteAddress() != null) {
-      span.setTag(Tags.PEER_HOSTNAME, response.remoteAddress().getHost());
-      span.setTag(Tags.PEER_HOST_IPV4, response.remoteAddress().getAddress());
-      DECORATE.setPeerPort(span, response.remoteAddress().getPort());
-    }
-
-    if (response instanceof GetResponse) {
-      final GetResponse resp = (GetResponse) response;
-      span.setTag("elasticsearch.type", resp.getType());
-      span.setTag("elasticsearch.id", resp.getId());
-      span.setTag("elasticsearch.version", resp.getVersion());
-    }
-
-    if (response instanceof BroadcastResponse) {
-      final BroadcastResponse resp = (BroadcastResponse) response;
-      span.setTag("elasticsearch.shard.broadcast.total", resp.getTotalShards());
-      span.setTag("elasticsearch.shard.broadcast.successful", resp.getSuccessfulShards());
-      span.setTag("elasticsearch.shard.broadcast.failed", resp.getFailedShards());
-    }
-
-    if (response instanceof ReplicationResponse) {
-      final ReplicationResponse resp = (ReplicationResponse) response;
-      span.setTag("elasticsearch.shard.replication.total", resp.getShardInfo().getTotal());
-      span.setTag(
-          "elasticsearch.shard.replication.successful", resp.getShardInfo().getSuccessful());
-      span.setTag("elasticsearch.shard.replication.failed", resp.getShardInfo().getFailed());
-    }
-
-    if (response instanceof IndexResponse) {
-      span.setTag("elasticsearch.response.status", ((IndexResponse) response).status().getStatus());
-    }
-
-    if (response instanceof BulkShardResponse) {
-      final BulkShardResponse resp = (BulkShardResponse) response;
-      span.setTag("elasticsearch.shard.bulk.id", resp.getShardId().getId());
-      span.setTag("elasticsearch.shard.bulk.index", resp.getShardId().getIndexName());
+    private final ActionListener<T> listener;
+    private final AgentSpan span;
+    private final boolean migrateSpan;
+
+    public TransportActionListener(
+            final ActionRequest actionRequest, final ActionListener<T> listener, final AgentSpan span) {
+        this.listener = listener;
+        this.span = span;
+        this.migrateSpan = actionRequest instanceof PutMappingRequest;
+        onRequest(actionRequest);
     }
 
-    if (response instanceof BaseNodesResponse) {
-      final BaseNodesResponse resp = (BaseNodesResponse) response;
-      if (resp.hasFailures()) {
-        span.setTag("elasticsearch.node.failures", resp.failures().size());
-      }
-      span.setTag("elasticsearch.node.cluster.name", resp.getClusterName().value());
+    private void onRequest(final ActionRequest request) {
+        if (request instanceof IndicesRequest) {
+            final IndicesRequest req = (IndicesRequest) request;
+            if (req.indices() != null) {
+                span.setTag("elasticsearch.request.indices", String.join(",", req.indices()));
+            }
+        }
+        if (request instanceof SearchRequest) {
+            final SearchRequest req = (SearchRequest) request;
+            span.setTag("elasticsearch.request.search.types", String.join(",", req.types()));
+        }
+        if (request instanceof DocumentRequest) {
+            final DocumentRequest req = (DocumentRequest) request;
+            span.setTag("elasticsearch.request.write.type", req.type());
+            span.setTag("elasticsearch.request.write.routing", req.routing());
+        }
     }
 
-    try {
-      listener.onResponse(response);
-    } finally {
-      DECORATE.beforeFinish(span);
-      span.finish();
+    @Override
+    public void onResponse(final T response) {
+        if (response.remoteAddress() != null) {
+            span.setTag(Tags.PEER_HOSTNAME, response.remoteAddress().getHost());
+            span.setTag(Tags.PEER_HOST_IPV4, response.remoteAddress().getAddress());
+            DECORATE.setPeerPort(span, response.remoteAddress().getPort());
+        }
+
+        if (response instanceof GetResponse) {
+            final GetResponse resp = (GetResponse) response;
+            span.setTag("elasticsearch.type", resp.getType());
+            span.setTag("elasticsearch.id", resp.getId());
+            span.setTag("elasticsearch.version", resp.getVersion());
+        }
+
+        if (response instanceof BroadcastResponse) {
+            final BroadcastResponse resp = (BroadcastResponse) response;
+            span.setTag("elasticsearch.shard.broadcast.total", resp.getTotalShards());
+            span.setTag("elasticsearch.shard.broadcast.successful", resp.getSuccessfulShards());
+            span.setTag("elasticsearch.shard.broadcast.failed", resp.getFailedShards());
+        }
+
+        if (response instanceof ReplicationResponse) {
+            final ReplicationResponse resp = (ReplicationResponse) response;
+            span.setTag(
+                    "elasticsearch.shard.replication.total", resp.getShardInfo().getTotal());
+            span.setTag(
+                    "elasticsearch.shard.replication.successful",
+                    resp.getShardInfo().getSuccessful());
+            span.setTag(
+                    "elasticsearch.shard.replication.failed",
+                    resp.getShardInfo().getFailed());
+        }
+
+        if (response instanceof IndexResponse) {
+            span.setTag(
+                    "elasticsearch.response.status",
+                    ((IndexResponse) response).status().getStatus());
+        }
+
+        if (response instanceof BulkShardResponse) {
+            final BulkShardResponse resp = (BulkShardResponse) response;
+            span.setTag("elasticsearch.shard.bulk.id", resp.getShardId().getId());
+            span.setTag("elasticsearch.shard.bulk.index", resp.getShardId().getIndexName());
+        }
+
+        if (response instanceof BaseNodesResponse) {
+            final BaseNodesResponse resp = (BaseNodesResponse) response;
+            if (resp.hasFailures()) {
+                span.setTag("elasticsearch.node.failures", resp.failures().size());
+            }
+            span.setTag("elasticsearch.node.cluster.name", resp.getClusterName().value());
+        }
+
+        try {
+            listener.onResponse(response);
+        } finally {
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 
-  @Override
-  public void onFailure(final Exception e) {
-    DECORATE.onError(span, e);
+    @Override
+    public void onFailure(final Exception e) {
+        DECORATE.onError(span, e);
 
-    try {
-      listener.onFailure(e);
-    } finally {
-      span.finish();
+        try {
+            listener.onFailure(e);
+        } finally {
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java
index 47765bc78de..81c675d5aab 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java
@@ -13,13 +13,13 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ElasticsearchBreakTraceInstrumentation extends TestInstrumentation {
-  @Override
-  public String instrumentedType() {
-    return "org.elasticsearch.client.node.NodeClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.elasticsearch.client.node.NodeClient";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(named("executeLocally"), ShadowExistingScopeAdvice.class.getName());
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("executeLocally"), ShadowExistingScopeAdvice.class.getName());
+    }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java
index 81975a43382..6f21a39a645 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java
@@ -24,70 +24,67 @@
 /** Beginning in version 5.3.0, DocumentRequest was renamed to DocWriteRequest. */
 @AutoService(InstrumenterModule.class)
 public class Elasticsearch53TransportClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public Elasticsearch53TransportClientInstrumentation() {
-    super("elasticsearch", "elasticsearch-transport", "elasticsearch-transport-5");
-  }
+    public Elasticsearch53TransportClientInstrumentation() {
+        super("elasticsearch", "elasticsearch-transport", "elasticsearch-transport-5");
+    }
 
-  @Override
-  public String instrumentedType() {
-    // If we want to be more generic, we could instrument the interface instead:
-    // .and(safeHasSuperType(named("org.elasticsearch.client.ElasticsearchClient"))))
-    return "org.elasticsearch.client.support.AbstractClient";
-  }
+    @Override
+    public String instrumentedType() {
+        // If we want to be more generic, we could instrument the interface instead:
+        // .and(safeHasSuperType(named("org.elasticsearch.client.ElasticsearchClient"))))
+        return "org.elasticsearch.client.support.AbstractClient";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator",
-      packageName + ".TransportActionListener",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator",
+            packageName + ".TransportActionListener",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArgument(0, named("org.elasticsearch.action.Action")))
-            .and(takesArgument(1, named("org.elasticsearch.action.ActionRequest")))
-            .and(takesArgument(2, named("org.elasticsearch.action.ActionListener"))),
-        Elasticsearch53TransportClientInstrumentation.class.getName()
-            + "$ElasticsearchTransportClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArgument(0, named("org.elasticsearch.action.Action")))
+                        .and(takesArgument(1, named("org.elasticsearch.action.ActionRequest")))
+                        .and(takesArgument(2, named("org.elasticsearch.action.ActionListener"))),
+                Elasticsearch53TransportClientInstrumentation.class.getName() + "$ElasticsearchTransportClientAdvice");
+    }
 
-  public static class ElasticsearchTransportClientAdvice {
+    public static class ElasticsearchTransportClientAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final Action action,
-        @Advice.Argument(1) final ActionRequest actionRequest,
-        @Advice.Argument(value = 2, readOnly = false)
-            ActionListener<ActionResponse> actionListener) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final Action action,
+                @Advice.Argument(1) final ActionRequest actionRequest,
+                @Advice.Argument(value = 2, readOnly = false) ActionListener<ActionResponse> actionListener) {
 
-      final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, action.getClass(), actionRequest.getClass());
+            final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, action.getClass(), actionRequest.getClass());
 
-      actionListener = new TransportActionListener<>(actionRequest, actionListener, span);
+            actionListener = new TransportActionListener<>(actionRequest, actionListener, span);
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (throwable != null) {
-        final AgentSpan span = spanFromScope(scope);
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
-      // span finished by TransportActionListener
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (throwable != null) {
+                final AgentSpan span = spanFromScope(scope);
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+            // span finished by TransportActionListener
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/TransportActionListener.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/TransportActionListener.java
index f3d0e613650..81330a3c7d7 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/TransportActionListener.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/TransportActionListener.java
@@ -19,100 +19,106 @@
 
 public class TransportActionListener<T extends ActionResponse> implements ActionListener<T> {
 
-  private final ActionListener<T> listener;
-  private final AgentSpan span;
-
-  public TransportActionListener(
-      final ActionRequest actionRequest, final ActionListener<T> listener, final AgentSpan span) {
-    this.listener = listener;
-    this.span = span;
-    onRequest(actionRequest);
-  }
-
-  private void onRequest(final ActionRequest request) {
-    if (request instanceof IndicesRequest) {
-      final IndicesRequest req = (IndicesRequest) request;
-      if (req.indices() != null) {
-        span.setTag("elasticsearch.request.indices", String.join(",", req.indices()));
-      }
-    }
-    if (request instanceof SearchRequest) {
-      final SearchRequest req = (SearchRequest) request;
-      span.setTag("elasticsearch.request.search.types", String.join(",", req.types()));
-    }
-    if (request instanceof DocWriteRequest) {
-      final DocWriteRequest req = (DocWriteRequest) request;
-      span.setTag("elasticsearch.request.write.type", req.type());
-      span.setTag("elasticsearch.request.write.routing", req.routing());
-      span.setTag("elasticsearch.request.write.version", req.version());
-    }
-  }
-
-  @Override
-  public void onResponse(final T response) {
-    if (response.remoteAddress() != null) {
-      span.setTag(Tags.PEER_HOSTNAME, response.remoteAddress().getHost());
-      span.setTag(Tags.PEER_HOST_IPV4, response.remoteAddress().getAddress());
-      DECORATE.setPeerPort(span, response.remoteAddress().getPort());
-    }
-
-    if (response instanceof GetResponse) {
-      final GetResponse resp = (GetResponse) response;
-      span.setTag("elasticsearch.type", resp.getType());
-      span.setTag("elasticsearch.id", resp.getId());
-      span.setTag("elasticsearch.version", resp.getVersion());
-    }
-
-    if (response instanceof BroadcastResponse) {
-      final BroadcastResponse resp = (BroadcastResponse) response;
-      span.setTag("elasticsearch.shard.broadcast.total", resp.getTotalShards());
-      span.setTag("elasticsearch.shard.broadcast.successful", resp.getSuccessfulShards());
-      span.setTag("elasticsearch.shard.broadcast.failed", resp.getFailedShards());
-    }
-
-    if (response instanceof ReplicationResponse) {
-      final ReplicationResponse resp = (ReplicationResponse) response;
-      span.setTag("elasticsearch.shard.replication.total", resp.getShardInfo().getTotal());
-      span.setTag(
-          "elasticsearch.shard.replication.successful", resp.getShardInfo().getSuccessful());
-      span.setTag("elasticsearch.shard.replication.failed", resp.getShardInfo().getFailed());
-    }
-
-    if (response instanceof IndexResponse) {
-      span.setTag("elasticsearch.response.status", ((IndexResponse) response).status().getStatus());
-    }
-
-    if (response instanceof BulkShardResponse) {
-      final BulkShardResponse resp = (BulkShardResponse) response;
-      span.setTag("elasticsearch.shard.bulk.id", resp.getShardId().getId());
-      span.setTag("elasticsearch.shard.bulk.index", resp.getShardId().getIndexName());
+    private final ActionListener<T> listener;
+    private final AgentSpan span;
+
+    public TransportActionListener(
+            final ActionRequest actionRequest, final ActionListener<T> listener, final AgentSpan span) {
+        this.listener = listener;
+        this.span = span;
+        onRequest(actionRequest);
     }
 
-    if (response instanceof BaseNodesResponse) {
-      final BaseNodesResponse resp = (BaseNodesResponse) response;
-      if (resp.hasFailures()) {
-        span.setTag("elasticsearch.node.failures", resp.failures().size());
-      }
-      span.setTag("elasticsearch.node.cluster.name", resp.getClusterName().value());
+    private void onRequest(final ActionRequest request) {
+        if (request instanceof IndicesRequest) {
+            final IndicesRequest req = (IndicesRequest) request;
+            if (req.indices() != null) {
+                span.setTag("elasticsearch.request.indices", String.join(",", req.indices()));
+            }
+        }
+        if (request instanceof SearchRequest) {
+            final SearchRequest req = (SearchRequest) request;
+            span.setTag("elasticsearch.request.search.types", String.join(",", req.types()));
+        }
+        if (request instanceof DocWriteRequest) {
+            final DocWriteRequest req = (DocWriteRequest) request;
+            span.setTag("elasticsearch.request.write.type", req.type());
+            span.setTag("elasticsearch.request.write.routing", req.routing());
+            span.setTag("elasticsearch.request.write.version", req.version());
+        }
     }
 
-    try {
-      listener.onResponse(response);
-    } finally {
-      DECORATE.beforeFinish(span);
-      span.finish();
+    @Override
+    public void onResponse(final T response) {
+        if (response.remoteAddress() != null) {
+            span.setTag(Tags.PEER_HOSTNAME, response.remoteAddress().getHost());
+            span.setTag(Tags.PEER_HOST_IPV4, response.remoteAddress().getAddress());
+            DECORATE.setPeerPort(span, response.remoteAddress().getPort());
+        }
+
+        if (response instanceof GetResponse) {
+            final GetResponse resp = (GetResponse) response;
+            span.setTag("elasticsearch.type", resp.getType());
+            span.setTag("elasticsearch.id", resp.getId());
+            span.setTag("elasticsearch.version", resp.getVersion());
+        }
+
+        if (response instanceof BroadcastResponse) {
+            final BroadcastResponse resp = (BroadcastResponse) response;
+            span.setTag("elasticsearch.shard.broadcast.total", resp.getTotalShards());
+            span.setTag("elasticsearch.shard.broadcast.successful", resp.getSuccessfulShards());
+            span.setTag("elasticsearch.shard.broadcast.failed", resp.getFailedShards());
+        }
+
+        if (response instanceof ReplicationResponse) {
+            final ReplicationResponse resp = (ReplicationResponse) response;
+            span.setTag(
+                    "elasticsearch.shard.replication.total", resp.getShardInfo().getTotal());
+            span.setTag(
+                    "elasticsearch.shard.replication.successful",
+                    resp.getShardInfo().getSuccessful());
+            span.setTag(
+                    "elasticsearch.shard.replication.failed",
+                    resp.getShardInfo().getFailed());
+        }
+
+        if (response instanceof IndexResponse) {
+            span.setTag(
+                    "elasticsearch.response.status",
+                    ((IndexResponse) response).status().getStatus());
+        }
+
+        if (response instanceof BulkShardResponse) {
+            final BulkShardResponse resp = (BulkShardResponse) response;
+            span.setTag("elasticsearch.shard.bulk.id", resp.getShardId().getId());
+            span.setTag("elasticsearch.shard.bulk.index", resp.getShardId().getIndexName());
+        }
+
+        if (response instanceof BaseNodesResponse) {
+            final BaseNodesResponse resp = (BaseNodesResponse) response;
+            if (resp.hasFailures()) {
+                span.setTag("elasticsearch.node.failures", resp.failures().size());
+            }
+            span.setTag("elasticsearch.node.cluster.name", resp.getClusterName().value());
+        }
+
+        try {
+            listener.onResponse(response);
+        } finally {
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 
-  @Override
-  public void onFailure(final Exception e) {
-    DECORATE.onError(span, e);
+    @Override
+    public void onFailure(final Exception e) {
+        DECORATE.onError(span, e);
 
-    try {
-      listener.onFailure(e);
-    } finally {
-      DECORATE.beforeFinish(span);
-      span.finish();
+        try {
+            listener.onFailure(e);
+        } finally {
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java
index 47765bc78de..81c675d5aab 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java
@@ -13,13 +13,13 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ElasticsearchBreakTraceInstrumentation extends TestInstrumentation {
-  @Override
-  public String instrumentedType() {
-    return "org.elasticsearch.client.node.NodeClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.elasticsearch.client.node.NodeClient";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(named("executeLocally"), ShadowExistingScopeAdvice.class.getName());
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("executeLocally"), ShadowExistingScopeAdvice.class.getName());
+    }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java
index 7cc856c19f1..bb19da6a084 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java
@@ -27,70 +27,67 @@
  */
 @AutoService(InstrumenterModule.class)
 public class Elasticsearch6TransportClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public Elasticsearch6TransportClientInstrumentation() {
-    super("elasticsearch", "elasticsearch-transport", "elasticsearch-transport-6");
-  }
+    public Elasticsearch6TransportClientInstrumentation() {
+        super("elasticsearch", "elasticsearch-transport", "elasticsearch-transport-6");
+    }
 
-  @Override
-  public String instrumentedType() {
-    // If we want to be more generic, we could instrument the interface instead:
-    // .and(safeHasSuperType(named("org.elasticsearch.client.ElasticsearchClient"))))
-    return "org.elasticsearch.client.support.AbstractClient";
-  }
+    @Override
+    public String instrumentedType() {
+        // If we want to be more generic, we could instrument the interface instead:
+        // .and(safeHasSuperType(named("org.elasticsearch.client.ElasticsearchClient"))))
+        return "org.elasticsearch.client.support.AbstractClient";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator",
-      packageName + ".TransportActionListener",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator",
+            packageName + ".TransportActionListener",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArgument(0, named("org.elasticsearch.action.Action")))
-            .and(takesArgument(1, named("org.elasticsearch.action.ActionRequest")))
-            .and(takesArgument(2, named("org.elasticsearch.action.ActionListener"))),
-        Elasticsearch6TransportClientInstrumentation.class.getName()
-            + "$Elasticsearch6TransportClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArgument(0, named("org.elasticsearch.action.Action")))
+                        .and(takesArgument(1, named("org.elasticsearch.action.ActionRequest")))
+                        .and(takesArgument(2, named("org.elasticsearch.action.ActionListener"))),
+                Elasticsearch6TransportClientInstrumentation.class.getName() + "$Elasticsearch6TransportClientAdvice");
+    }
 
-  public static class Elasticsearch6TransportClientAdvice {
+    public static class Elasticsearch6TransportClientAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final Action action,
-        @Advice.Argument(1) final ActionRequest actionRequest,
-        @Advice.Argument(value = 2, readOnly = false)
-            ActionListener<ActionResponse> actionListener) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final Action action,
+                @Advice.Argument(1) final ActionRequest actionRequest,
+                @Advice.Argument(value = 2, readOnly = false) ActionListener<ActionResponse> actionListener) {
 
-      final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, action.getClass(), actionRequest.getClass());
+            final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, action.getClass(), actionRequest.getClass());
 
-      actionListener = new TransportActionListener<>(actionRequest, actionListener, span);
+            actionListener = new TransportActionListener<>(actionRequest, actionListener, span);
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (throwable != null) {
-        final AgentSpan span = spanFromScope(scope);
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
-      // span finished by TransportActionListener
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (throwable != null) {
+                final AgentSpan span = spanFromScope(scope);
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+            // span finished by TransportActionListener
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/main/java/datadog/trace/instrumentation/elasticsearch6/TransportActionListener.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/main/java/datadog/trace/instrumentation/elasticsearch6/TransportActionListener.java
index da6c206ba11..226543d245e 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/main/java/datadog/trace/instrumentation/elasticsearch6/TransportActionListener.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/main/java/datadog/trace/instrumentation/elasticsearch6/TransportActionListener.java
@@ -22,98 +22,104 @@
  */
 public class TransportActionListener<T extends ActionResponse> implements ActionListener<T> {
 
-  private final ActionListener<T> listener;
-  private final AgentSpan span;
-
-  public TransportActionListener(
-      final ActionRequest actionRequest, final ActionListener<T> listener, final AgentSpan span) {
-    this.listener = listener;
-    this.span = span;
-    onRequest(actionRequest);
-  }
-
-  private void onRequest(final ActionRequest request) {
-    if (request instanceof IndicesRequest) {
-      final IndicesRequest req = (IndicesRequest) request;
-      if (req.indices() != null) {
-        span.setTag("elasticsearch.request.indices", String.join(",", req.indices()));
-      }
-    }
-    if (request instanceof SearchRequest) {
-      final SearchRequest req = (SearchRequest) request;
-      span.setTag("elasticsearch.request.search.types", String.join(",", req.types()));
-    }
-    if (request instanceof DocWriteRequest) {
-      final DocWriteRequest req = (DocWriteRequest) request;
-      span.setTag("elasticsearch.request.write.type", req.type());
-      span.setTag("elasticsearch.request.write.routing", req.routing());
-      span.setTag("elasticsearch.request.write.version", req.version());
-    }
-  }
-
-  @Override
-  public void onResponse(final T response) {
-    if (response.remoteAddress() != null) {
-      DECORATE.onPeerConnection(span, response.remoteAddress().address());
-    }
-
-    if (response instanceof GetResponse) {
-      final GetResponse resp = (GetResponse) response;
-      span.setTag("elasticsearch.type", resp.getType());
-      span.setTag("elasticsearch.id", resp.getId());
-      span.setTag("elasticsearch.version", resp.getVersion());
-    }
-
-    if (response instanceof BroadcastResponse) {
-      final BroadcastResponse resp = (BroadcastResponse) response;
-      span.setTag("elasticsearch.shard.broadcast.total", resp.getTotalShards());
-      span.setTag("elasticsearch.shard.broadcast.successful", resp.getSuccessfulShards());
-      span.setTag("elasticsearch.shard.broadcast.failed", resp.getFailedShards());
-    }
-
-    if (response instanceof ReplicationResponse) {
-      final ReplicationResponse resp = (ReplicationResponse) response;
-      span.setTag("elasticsearch.shard.replication.total", resp.getShardInfo().getTotal());
-      span.setTag(
-          "elasticsearch.shard.replication.successful", resp.getShardInfo().getSuccessful());
-      span.setTag("elasticsearch.shard.replication.failed", resp.getShardInfo().getFailed());
-    }
-
-    if (response instanceof IndexResponse) {
-      span.setTag("elasticsearch.response.status", ((IndexResponse) response).status().getStatus());
-    }
-
-    if (response instanceof BulkShardResponse) {
-      final BulkShardResponse resp = (BulkShardResponse) response;
-      span.setTag("elasticsearch.shard.bulk.id", resp.getShardId().getId());
-      span.setTag("elasticsearch.shard.bulk.index", resp.getShardId().getIndexName());
+    private final ActionListener<T> listener;
+    private final AgentSpan span;
+
+    public TransportActionListener(
+            final ActionRequest actionRequest, final ActionListener<T> listener, final AgentSpan span) {
+        this.listener = listener;
+        this.span = span;
+        onRequest(actionRequest);
     }
 
-    if (response instanceof BaseNodesResponse) {
-      final BaseNodesResponse resp = (BaseNodesResponse) response;
-      if (resp.hasFailures()) {
-        span.setTag("elasticsearch.node.failures", resp.failures().size());
-      }
-      span.setTag("elasticsearch.node.cluster.name", resp.getClusterName().value());
+    private void onRequest(final ActionRequest request) {
+        if (request instanceof IndicesRequest) {
+            final IndicesRequest req = (IndicesRequest) request;
+            if (req.indices() != null) {
+                span.setTag("elasticsearch.request.indices", String.join(",", req.indices()));
+            }
+        }
+        if (request instanceof SearchRequest) {
+            final SearchRequest req = (SearchRequest) request;
+            span.setTag("elasticsearch.request.search.types", String.join(",", req.types()));
+        }
+        if (request instanceof DocWriteRequest) {
+            final DocWriteRequest req = (DocWriteRequest) request;
+            span.setTag("elasticsearch.request.write.type", req.type());
+            span.setTag("elasticsearch.request.write.routing", req.routing());
+            span.setTag("elasticsearch.request.write.version", req.version());
+        }
     }
 
-    try {
-      listener.onResponse(response);
-    } finally {
-      DECORATE.beforeFinish(span);
-      span.finish();
+    @Override
+    public void onResponse(final T response) {
+        if (response.remoteAddress() != null) {
+            DECORATE.onPeerConnection(span, response.remoteAddress().address());
+        }
+
+        if (response instanceof GetResponse) {
+            final GetResponse resp = (GetResponse) response;
+            span.setTag("elasticsearch.type", resp.getType());
+            span.setTag("elasticsearch.id", resp.getId());
+            span.setTag("elasticsearch.version", resp.getVersion());
+        }
+
+        if (response instanceof BroadcastResponse) {
+            final BroadcastResponse resp = (BroadcastResponse) response;
+            span.setTag("elasticsearch.shard.broadcast.total", resp.getTotalShards());
+            span.setTag("elasticsearch.shard.broadcast.successful", resp.getSuccessfulShards());
+            span.setTag("elasticsearch.shard.broadcast.failed", resp.getFailedShards());
+        }
+
+        if (response instanceof ReplicationResponse) {
+            final ReplicationResponse resp = (ReplicationResponse) response;
+            span.setTag(
+                    "elasticsearch.shard.replication.total", resp.getShardInfo().getTotal());
+            span.setTag(
+                    "elasticsearch.shard.replication.successful",
+                    resp.getShardInfo().getSuccessful());
+            span.setTag(
+                    "elasticsearch.shard.replication.failed",
+                    resp.getShardInfo().getFailed());
+        }
+
+        if (response instanceof IndexResponse) {
+            span.setTag(
+                    "elasticsearch.response.status",
+                    ((IndexResponse) response).status().getStatus());
+        }
+
+        if (response instanceof BulkShardResponse) {
+            final BulkShardResponse resp = (BulkShardResponse) response;
+            span.setTag("elasticsearch.shard.bulk.id", resp.getShardId().getId());
+            span.setTag("elasticsearch.shard.bulk.index", resp.getShardId().getIndexName());
+        }
+
+        if (response instanceof BaseNodesResponse) {
+            final BaseNodesResponse resp = (BaseNodesResponse) response;
+            if (resp.hasFailures()) {
+                span.setTag("elasticsearch.node.failures", resp.failures().size());
+            }
+            span.setTag("elasticsearch.node.cluster.name", resp.getClusterName().value());
+        }
+
+        try {
+            listener.onResponse(response);
+        } finally {
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 
-  @Override
-  public void onFailure(final Exception e) {
-    DECORATE.onError(span, e);
+    @Override
+    public void onFailure(final Exception e) {
+        DECORATE.onError(span, e);
 
-    try {
-      listener.onFailure(e);
-    } finally {
-      DECORATE.beforeFinish(span);
-      span.finish();
+        try {
+            listener.onFailure(e);
+        } finally {
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java
index 47765bc78de..81c675d5aab 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java
@@ -13,13 +13,13 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ElasticsearchBreakTraceInstrumentation extends TestInstrumentation {
-  @Override
-  public String instrumentedType() {
-    return "org.elasticsearch.client.node.NodeClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.elasticsearch.client.node.NodeClient";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(named("executeLocally"), ShadowExistingScopeAdvice.class.getName());
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("executeLocally"), ShadowExistingScopeAdvice.class.getName());
+    }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java
index 67e43ed64c9..a2165a7158c 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java
@@ -27,77 +27,75 @@
 /** This class is identical to version 6's instrumentation, except Action is now ActionType. */
 @AutoService(InstrumenterModule.class)
 public class Elasticsearch73TransportClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public Elasticsearch73TransportClientInstrumentation() {
-    super("elasticsearch", "elasticsearch-transport", "elasticsearch-transport-7");
-  }
+    public Elasticsearch73TransportClientInstrumentation() {
+        super("elasticsearch", "elasticsearch-transport", "elasticsearch-transport-7");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Avoid matching pre-ES7 releases which have their own instrumentations.
-    return hasClassNamed("org.elasticsearch.action.ActionType");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Avoid matching pre-ES7 releases which have their own instrumentations.
+        return hasClassNamed("org.elasticsearch.action.ActionType");
+    }
 
-  @Override
-  public String instrumentedType() {
-    // If we want to be more generic, we could instrument the interface instead:
-    // .and(safeHasSuperType(named("org.elasticsearch.client.ElasticsearchClient"))))
-    return "org.elasticsearch.client.support.AbstractClient";
-  }
+    @Override
+    public String instrumentedType() {
+        // If we want to be more generic, we could instrument the interface instead:
+        // .and(safeHasSuperType(named("org.elasticsearch.client.ElasticsearchClient"))))
+        return "org.elasticsearch.client.support.AbstractClient";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator",
-      packageName + ".TransportActionListener",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator",
+            packageName + ".TransportActionListener",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("org.elasticsearch.action.ActionType")))
-            .and(takesArgument(1, named("org.elasticsearch.action.ActionRequest")))
-            .and(takesArgument(2, named("org.elasticsearch.action.ActionListener"))),
-        Elasticsearch73TransportClientInstrumentation.class.getName()
-            + "$Elasticsearch73TransportClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("org.elasticsearch.action.ActionType")))
+                        .and(takesArgument(1, named("org.elasticsearch.action.ActionRequest")))
+                        .and(takesArgument(2, named("org.elasticsearch.action.ActionListener"))),
+                Elasticsearch73TransportClientInstrumentation.class.getName()
+                        + "$Elasticsearch73TransportClientAdvice");
+    }
 
-  public static class Elasticsearch73TransportClientAdvice {
+    public static class Elasticsearch73TransportClientAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final ActionType action,
-        @Advice.Argument(1) final ActionRequest actionRequest,
-        @Advice.Argument(value = 2, readOnly = false)
-            ActionListener<ActionResponse> actionListener) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final ActionType action,
+                @Advice.Argument(1) final ActionRequest actionRequest,
+                @Advice.Argument(value = 2, readOnly = false) ActionListener<ActionResponse> actionListener) {
 
-      final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, action.getClass(), actionRequest.getClass());
+            final AgentSpan span = startSpan(ELASTICSEARCH_JAVA.toString(), OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, action.getClass(), actionRequest.getClass());
 
-      actionListener = new TransportActionListener<>(actionRequest, actionListener, span);
+            actionListener = new TransportActionListener<>(actionRequest, actionListener, span);
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (throwable != null) {
-        final AgentSpan span = spanFromScope(scope);
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
-      // span finished by TransportActionListener
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (throwable != null) {
+                final AgentSpan span = spanFromScope(scope);
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+            // span finished by TransportActionListener
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/TransportActionListener.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/TransportActionListener.java
index e2cdff49789..be4440ba3d7 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/TransportActionListener.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/TransportActionListener.java
@@ -19,98 +19,104 @@
 /** This class is identical to version 6's instrumentation. */
 public class TransportActionListener<T extends ActionResponse> implements ActionListener<T> {
 
-  private final ActionListener<T> listener;
-  private final AgentSpan span;
-
-  public TransportActionListener(
-      final ActionRequest actionRequest, final ActionListener<T> listener, final AgentSpan span) {
-    this.listener = listener;
-    this.span = span;
-    onRequest(actionRequest);
-  }
-
-  private void onRequest(final ActionRequest request) {
-    if (request instanceof IndicesRequest) {
-      final IndicesRequest req = (IndicesRequest) request;
-      if (req.indices() != null) {
-        span.setTag("elasticsearch.request.indices", String.join(",", req.indices()));
-      }
-    }
-    if (request instanceof SearchRequest) {
-      final SearchRequest req = (SearchRequest) request;
-      span.setTag("elasticsearch.request.search.types", String.join(",", req.types()));
-    }
-    if (request instanceof DocWriteRequest) {
-      final DocWriteRequest req = (DocWriteRequest) request;
-      span.setTag("elasticsearch.request.write.type", req.type());
-      span.setTag("elasticsearch.request.write.routing", req.routing());
-      span.setTag("elasticsearch.request.write.version", req.version());
-    }
-  }
-
-  @Override
-  public void onResponse(final T response) {
-    if (response.remoteAddress() != null) {
-      DECORATE.onPeerConnection(span, response.remoteAddress().address());
-    }
-
-    if (response instanceof GetResponse) {
-      final GetResponse resp = (GetResponse) response;
-      span.setTag("elasticsearch.type", resp.getType());
-      span.setTag("elasticsearch.id", resp.getId());
-      span.setTag("elasticsearch.version", resp.getVersion());
-    }
-
-    if (response instanceof BroadcastResponse) {
-      final BroadcastResponse resp = (BroadcastResponse) response;
-      span.setTag("elasticsearch.shard.broadcast.total", resp.getTotalShards());
-      span.setTag("elasticsearch.shard.broadcast.successful", resp.getSuccessfulShards());
-      span.setTag("elasticsearch.shard.broadcast.failed", resp.getFailedShards());
-    }
-
-    if (response instanceof ReplicationResponse) {
-      final ReplicationResponse resp = (ReplicationResponse) response;
-      span.setTag("elasticsearch.shard.replication.total", resp.getShardInfo().getTotal());
-      span.setTag(
-          "elasticsearch.shard.replication.successful", resp.getShardInfo().getSuccessful());
-      span.setTag("elasticsearch.shard.replication.failed", resp.getShardInfo().getFailed());
-    }
-
-    if (response instanceof IndexResponse) {
-      span.setTag("elasticsearch.response.status", ((IndexResponse) response).status().getStatus());
-    }
-
-    if (response instanceof BulkShardResponse) {
-      final BulkShardResponse resp = (BulkShardResponse) response;
-      span.setTag("elasticsearch.shard.bulk.id", resp.getShardId().getId());
-      span.setTag("elasticsearch.shard.bulk.index", resp.getShardId().getIndexName());
+    private final ActionListener<T> listener;
+    private final AgentSpan span;
+
+    public TransportActionListener(
+            final ActionRequest actionRequest, final ActionListener<T> listener, final AgentSpan span) {
+        this.listener = listener;
+        this.span = span;
+        onRequest(actionRequest);
     }
 
-    if (response instanceof BaseNodesResponse) {
-      final BaseNodesResponse resp = (BaseNodesResponse) response;
-      if (resp.hasFailures()) {
-        span.setTag("elasticsearch.node.failures", resp.failures().size());
-      }
-      span.setTag("elasticsearch.node.cluster.name", resp.getClusterName().value());
+    private void onRequest(final ActionRequest request) {
+        if (request instanceof IndicesRequest) {
+            final IndicesRequest req = (IndicesRequest) request;
+            if (req.indices() != null) {
+                span.setTag("elasticsearch.request.indices", String.join(",", req.indices()));
+            }
+        }
+        if (request instanceof SearchRequest) {
+            final SearchRequest req = (SearchRequest) request;
+            span.setTag("elasticsearch.request.search.types", String.join(",", req.types()));
+        }
+        if (request instanceof DocWriteRequest) {
+            final DocWriteRequest req = (DocWriteRequest) request;
+            span.setTag("elasticsearch.request.write.type", req.type());
+            span.setTag("elasticsearch.request.write.routing", req.routing());
+            span.setTag("elasticsearch.request.write.version", req.version());
+        }
     }
 
-    try {
-      listener.onResponse(response);
-    } finally {
-      DECORATE.beforeFinish(span);
-      span.finish();
+    @Override
+    public void onResponse(final T response) {
+        if (response.remoteAddress() != null) {
+            DECORATE.onPeerConnection(span, response.remoteAddress().address());
+        }
+
+        if (response instanceof GetResponse) {
+            final GetResponse resp = (GetResponse) response;
+            span.setTag("elasticsearch.type", resp.getType());
+            span.setTag("elasticsearch.id", resp.getId());
+            span.setTag("elasticsearch.version", resp.getVersion());
+        }
+
+        if (response instanceof BroadcastResponse) {
+            final BroadcastResponse resp = (BroadcastResponse) response;
+            span.setTag("elasticsearch.shard.broadcast.total", resp.getTotalShards());
+            span.setTag("elasticsearch.shard.broadcast.successful", resp.getSuccessfulShards());
+            span.setTag("elasticsearch.shard.broadcast.failed", resp.getFailedShards());
+        }
+
+        if (response instanceof ReplicationResponse) {
+            final ReplicationResponse resp = (ReplicationResponse) response;
+            span.setTag(
+                    "elasticsearch.shard.replication.total", resp.getShardInfo().getTotal());
+            span.setTag(
+                    "elasticsearch.shard.replication.successful",
+                    resp.getShardInfo().getSuccessful());
+            span.setTag(
+                    "elasticsearch.shard.replication.failed",
+                    resp.getShardInfo().getFailed());
+        }
+
+        if (response instanceof IndexResponse) {
+            span.setTag(
+                    "elasticsearch.response.status",
+                    ((IndexResponse) response).status().getStatus());
+        }
+
+        if (response instanceof BulkShardResponse) {
+            final BulkShardResponse resp = (BulkShardResponse) response;
+            span.setTag("elasticsearch.shard.bulk.id", resp.getShardId().getId());
+            span.setTag("elasticsearch.shard.bulk.index", resp.getShardId().getIndexName());
+        }
+
+        if (response instanceof BaseNodesResponse) {
+            final BaseNodesResponse resp = (BaseNodesResponse) response;
+            if (resp.hasFailures()) {
+                span.setTag("elasticsearch.node.failures", resp.failures().size());
+            }
+            span.setTag("elasticsearch.node.cluster.name", resp.getClusterName().value());
+        }
+
+        try {
+            listener.onResponse(response);
+        } finally {
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 
-  @Override
-  public void onFailure(final Exception e) {
-    DECORATE.onError(span, e);
+    @Override
+    public void onFailure(final Exception e) {
+        DECORATE.onError(span, e);
 
-    try {
-      listener.onFailure(e);
-    } finally {
-      DECORATE.beforeFinish(span);
-      span.finish();
+        try {
+            listener.onFailure(e);
+        } finally {
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java
index 47765bc78de..81c675d5aab 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/test/groovy/ElasticsearchBreakTraceInstrumentation.java
@@ -13,13 +13,13 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ElasticsearchBreakTraceInstrumentation extends TestInstrumentation {
-  @Override
-  public String instrumentedType() {
-    return "org.elasticsearch.client.node.NodeClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.elasticsearch.client.node.NodeClient";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(named("executeLocally"), ShadowExistingScopeAdvice.class.getName());
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("executeLocally"), ShadowExistingScopeAdvice.class.getName());
+    }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ShadowExistingScopeAdvice.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ShadowExistingScopeAdvice.java
index 11a07a6732f..ca1c317a900 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ShadowExistingScopeAdvice.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ShadowExistingScopeAdvice.java
@@ -12,13 +12,13 @@
  */
 public class ShadowExistingScopeAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope enter() {
-    return activateSpan(noopSpan());
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope enter() {
+        return activateSpan(noopSpan());
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void exit(@Advice.Enter final ContextScope scope) {
-    scope.close();
-  }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void exit(@Advice.Enter final ContextScope scope) {
+        scope.close();
+    }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ThreadedActionListenerInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ThreadedActionListenerInstrumentation.java
index 0d82ef38f7d..81d5fd942ec 100644
--- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ThreadedActionListenerInstrumentation.java
+++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ThreadedActionListenerInstrumentation.java
@@ -24,51 +24,49 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class ThreadedActionListenerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ThreadedActionListenerInstrumentation() {
-    super("elasticsearch", "elasticsearch-transport");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.elasticsearch.action.support.ThreadedActionListener";
-  }
+    public ThreadedActionListenerInstrumentation() {
+        super("elasticsearch", "elasticsearch-transport");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(
-        "org.elasticsearch.action.support.ThreadedActionListener", State.class.getName());
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.elasticsearch.action.support.ThreadedActionListener";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // only one constructor
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
-    transformer.applyAdvice(
-        namedOneOf("onResponse", "onFailure").and(takesArguments(1)),
-        getClass().getName() + "$OnResponse");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.elasticsearch.action.support.ThreadedActionListener", State.class.getName());
+    }
 
-  @SuppressWarnings("rawtypes")
-  public static final class Construct {
-    @Advice.OnMethodExit
-    public static void after(@Advice.This ThreadedActionListener listener) {
-      capture(InstrumentationContext.get(ThreadedActionListener.class, State.class), listener);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // only one constructor
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
+        transformer.applyAdvice(
+                namedOneOf("onResponse", "onFailure").and(takesArguments(1)),
+                getClass().getName() + "$OnResponse");
     }
-  }
 
-  @SuppressWarnings("rawtypes")
-  public static final class OnResponse {
-    @Advice.OnMethodEnter
-    public static ContextScope before(@Advice.This ThreadedActionListener listener) {
-      return startTaskScope(
-          InstrumentationContext.get(ThreadedActionListener.class, State.class), listener);
+    @SuppressWarnings("rawtypes")
+    public static final class Construct {
+        @Advice.OnMethodExit
+        public static void after(@Advice.This ThreadedActionListener listener) {
+            capture(InstrumentationContext.get(ThreadedActionListener.class, State.class), listener);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      endTaskScope(scope);
+    @SuppressWarnings("rawtypes")
+    public static final class OnResponse {
+        @Advice.OnMethodEnter
+        public static ContextScope before(@Advice.This ThreadedActionListener listener) {
+            return startTaskScope(InstrumentationContext.get(ThreadedActionListener.class, State.class), listener);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraDecorator.java b/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraDecorator.java
index 057c4b4d85f..b2cffa495fb 100644
--- a/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraDecorator.java
+++ b/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraDecorator.java
@@ -11,61 +11,59 @@
 
 public class FinatraDecorator extends HttpServerDecorator<Request, Request, Response, Void> {
 
-  public static final CharSequence FINATRA = UTF8BytesString.create("finatra");
-  public static final CharSequence FINATRA_CONTROLLER =
-      UTF8BytesString.create("finatra.controller");
-  public static final FinatraDecorator DECORATE = new FinatraDecorator();
+    public static final CharSequence FINATRA = UTF8BytesString.create("finatra");
+    public static final CharSequence FINATRA_CONTROLLER = UTF8BytesString.create("finatra.controller");
+    public static final FinatraDecorator DECORATE = new FinatraDecorator();
 
-  private static final CharSequence FINATRA_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
+    private static final CharSequence FINATRA_REQUEST = UTF8BytesString.create(DECORATE.operationName());
 
-  @Override
-  protected CharSequence component() {
-    return FINATRA;
-  }
+    @Override
+    protected CharSequence component() {
+        return FINATRA;
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<Void> getter() {
-    return null;
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<Void> getter() {
+        return null;
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<Response> responseGetter() {
-    return null;
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<Response> responseGetter() {
+        return null;
+    }
 
-  @Override
-  public CharSequence spanName() {
-    return FINATRA_REQUEST;
-  }
+    @Override
+    public CharSequence spanName() {
+        return FINATRA_REQUEST;
+    }
 
-  @Override
-  protected String method(final Request request) {
-    return request.method().name();
-  }
+    @Override
+    protected String method(final Request request) {
+        return request.method().name();
+    }
 
-  @Override
-  protected URIDataAdapter url(final Request request) {
-    return URIDataAdapterBase.fromURI(request.uri(), URIDefaultDataAdapter::new);
-  }
+    @Override
+    protected URIDataAdapter url(final Request request) {
+        return URIDataAdapterBase.fromURI(request.uri(), URIDefaultDataAdapter::new);
+    }
 
-  @Override
-  protected String peerHostIP(final Request request) {
-    return request.remoteAddress().getHostAddress();
-  }
+    @Override
+    protected String peerHostIP(final Request request) {
+        return request.remoteAddress().getHostAddress();
+    }
 
-  @Override
-  protected int peerPort(final Request request) {
-    return request.remotePort();
-  }
+    @Override
+    protected int peerPort(final Request request) {
+        return request.remotePort();
+    }
 
-  @Override
-  protected int status(final Response response) {
-    return response.statusCode();
-  }
+    @Override
+    protected int status(final Response response) {
+        return response.statusCode();
+    }
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"finatra"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"finatra"};
+    }
 }
diff --git a/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java b/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java
index e692369ca56..095da8337af 100644
--- a/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java
+++ b/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java
@@ -29,73 +29,73 @@
 
 @AutoService(InstrumenterModule.class)
 public class FinatraInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public FinatraInstrumentation() {
-    super("finatra");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public FinatraInstrumentation() {
+        super("finatra");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "com.twitter.finatra.http.internal.routing.Route";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "com.twitter.finatra.http.internal.routing.Route";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return nameStartsWith("com.twitter.finatra.").and(extendsClass(named(hierarchyMarkerType())));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return nameStartsWith("com.twitter.finatra.").and(extendsClass(named(hierarchyMarkerType())));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("handleMatch"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("com.twitter.finagle.http.Request"))),
-        FinatraInstrumentation.class.getName() + "$RouteAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("handleMatch"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("com.twitter.finagle.http.Request"))),
+                FinatraInstrumentation.class.getName() + "$RouteAdvice");
+    }
 
-  public static class RouteAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope nameSpan(
-        @Advice.Argument(0) final Request request,
-        @Advice.FieldValue("path") final String path,
-        @Advice.FieldValue("clazz") final Class clazz) {
+    public static class RouteAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope nameSpan(
+                @Advice.Argument(0) final Request request,
+                @Advice.FieldValue("path") final String path,
+                @Advice.FieldValue("clazz") final Class clazz) {
 
-      // Update the parent "netty.request" if present
-      final AgentSpan parent = activeSpan();
-      if (parent != null) {
-        HTTP_RESOURCE_DECORATOR.withRoute(parent, request.method().name(), path);
-        parent.setTag(Tags.COMPONENT, "finatra");
-        parent.setSpanName(DECORATE.spanName());
-      }
+            // Update the parent "netty.request" if present
+            final AgentSpan parent = activeSpan();
+            if (parent != null) {
+                HTTP_RESOURCE_DECORATOR.withRoute(parent, request.method().name(), path);
+                parent.setTag(Tags.COMPONENT, "finatra");
+                parent.setSpanName(DECORATE.spanName());
+            }
 
-      final AgentSpan span = startSpan("finatra", FINATRA_CONTROLLER);
-      DECORATE.afterStart(span);
-      span.setResourceName(DECORATE.className(clazz));
+            final AgentSpan span = startSpan("finatra", FINATRA_CONTROLLER);
+            DECORATE.afterStart(span);
+            span.setResourceName(DECORATE.className(clazz));
 
-      return span.attachWithContext();
-    }
+            return span.attachWithContext();
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void setupCallback(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return final Some<Future<Response>> responseOption) {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void setupCallback(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return final Some<Future<Response>> responseOption) {
 
-      if (scope == null) {
-        return;
-      }
+            if (scope == null) {
+                return;
+            }
 
-      final AgentSpan span = spanFromContext(scope.context());
-      if (throwable != null) {
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(scope.context());
-        scope.close();
-        span.finish();
-        return;
-      }
+            final AgentSpan span = spanFromContext(scope.context());
+            if (throwable != null) {
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(scope.context());
+                scope.close();
+                span.finish();
+                return;
+            }
 
-      responseOption.get().addEventListener(new Listener(scope));
+            responseOption.get().addEventListener(new Listener(scope));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/Listener.java b/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/Listener.java
index 29c3723559d..65d9deb0751 100644
--- a/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/Listener.java
+++ b/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/Listener.java
@@ -9,31 +9,31 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 
 public class Listener implements FutureEventListener<Response> {
-  private final ContextScope scope;
+    private final ContextScope scope;
 
-  public Listener(final ContextScope scope) {
-    this.scope = scope;
-  }
-
-  @Override
-  public void onSuccess(final Response response) {
-    final AgentSpan span = AgentSpan.fromContext(scope.context());
-    // Don't use DECORATE.onResponse because this is the controller span
-    if (Config.get().getHttpServerErrorStatuses().get(DECORATE.status(response))) {
-      span.setError(true);
+    public Listener(final ContextScope scope) {
+        this.scope = scope;
     }
 
-    DECORATE.beforeFinish(scope.context());
-    scope.close();
-    span.finish();
-  }
+    @Override
+    public void onSuccess(final Response response) {
+        final AgentSpan span = AgentSpan.fromContext(scope.context());
+        // Don't use DECORATE.onResponse because this is the controller span
+        if (Config.get().getHttpServerErrorStatuses().get(DECORATE.status(response))) {
+            span.setError(true);
+        }
+
+        DECORATE.beforeFinish(scope.context());
+        scope.close();
+        span.finish();
+    }
 
-  @Override
-  public void onFailure(final Throwable cause) {
-    final AgentSpan span = AgentSpan.fromContext(scope.context());
-    DECORATE.onError(span, cause);
-    DECORATE.beforeFinish(scope.context());
-    scope.close();
-    span.finish();
-  }
+    @Override
+    public void onFailure(final Throwable cause) {
+        final AgentSpan span = AgentSpan.fromContext(scope.context());
+        DECORATE.onError(span, cause);
+        DECORATE.beforeFinish(scope.context());
+        scope.close();
+        span.finish();
+    }
 }
diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker/StringUtilCallSite.java b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker/StringUtilCallSite.java
index d73c66d920b..788747ef0b2 100644
--- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker/StringUtilCallSite.java
+++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker/StringUtilCallSite.java
@@ -12,28 +12,22 @@
 @CallSite(spi = IastCallSites.class)
 public class StringUtilCallSite {
 
-  @CallSite.After(
-      "java.lang.String freemarker.template.utility.StringUtil.HTMLEnc(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String freemarker.template.utility.StringUtil.XMLEnc(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String freemarker.template.utility.StringUtil.XHTMLEnc(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String freemarker.template.utility.StringUtil.javaStringEnc(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String freemarker.template.utility.StringUtil.javaScriptStringEnc(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String freemarker.template.utility.StringUtil.jsonStringEnc(java.lang.String)")
-  public static String afterEscape(
-      @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterEscape threw", e);
-      }
+    @CallSite.After("java.lang.String freemarker.template.utility.StringUtil.HTMLEnc(java.lang.String)")
+    @CallSite.After("java.lang.String freemarker.template.utility.StringUtil.XMLEnc(java.lang.String)")
+    @CallSite.After("java.lang.String freemarker.template.utility.StringUtil.XHTMLEnc(java.lang.String)")
+    @CallSite.After("java.lang.String freemarker.template.utility.StringUtil.javaStringEnc(java.lang.String)")
+    @CallSite.After("java.lang.String freemarker.template.utility.StringUtil.javaScriptStringEnc(java.lang.String)")
+    @CallSite.After("java.lang.String freemarker.template.utility.StringUtil.jsonStringEnc(java.lang.String)")
+    public static String afterEscape(
+            @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterEscape threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/DollarVariableDatadogAdvice.java b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/DollarVariableDatadogAdvice.java
index 794d011c27c..69153ff8873 100644
--- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/DollarVariableDatadogAdvice.java
+++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/DollarVariableDatadogAdvice.java
@@ -10,29 +10,28 @@
 
 public final class DollarVariableDatadogAdvice {
 
-  public static class DollarVariableAdvice {
+    public static class DollarVariableAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.XSS)
-    public static void onEnter(
-        @Advice.Argument(0) final Environment environment, @Advice.This final Object self) {
-      if (environment == null || self == null) {
-        return;
-      }
-      final XssModule xssModule = InstrumentationBridge.XSS;
-      if (xssModule == null) {
-        return;
-      }
-      if (DollarVariable24Helper.fetchAutoEscape(self)) {
-        return;
-      }
-      String charSec = DollarVariable24Helper.fetchCharSec(self, environment);
-      if (charSec == null) {
-        return;
-      }
-      final String templateName = environment.getMainTemplate().getName();
-      final int line = DollarVariable24Helper.fetchBeginLine(self);
-      xssModule.onXss(charSec, templateName, line);
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.XSS)
+        public static void onEnter(@Advice.Argument(0) final Environment environment, @Advice.This final Object self) {
+            if (environment == null || self == null) {
+                return;
+            }
+            final XssModule xssModule = InstrumentationBridge.XSS;
+            if (xssModule == null) {
+                return;
+            }
+            if (DollarVariable24Helper.fetchAutoEscape(self)) {
+                return;
+            }
+            String charSec = DollarVariable24Helper.fetchCharSec(self, environment);
+            if (charSec == null) {
+                return;
+            }
+            final String templateName = environment.getMainTemplate().getName();
+            final int line = DollarVariable24Helper.fetchBeginLine(self);
+            xssModule.onXss(charSec, templateName, line);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/DollarVariableInstrumentation.java b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/DollarVariableInstrumentation.java
index 54ca9b2f1c9..345968baf67 100644
--- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/DollarVariableInstrumentation.java
+++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/DollarVariableInstrumentation.java
@@ -12,37 +12,35 @@
 
 @AutoService(InstrumenterModule.class)
 public class DollarVariableInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  static final String FREEMARKER_CORE = "freemarker.core";
-
-  public DollarVariableInstrumentation() {
-    super("freemarker");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "freemarker-2.3.24";
-  }
-
-  static final ElementMatcher.Junction<ClassLoader> VERSION_POST_2_3_24 =
-      hasClassNamed("freemarker.cache.ByteArrayTemplateLoader");
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return VERSION_POST_2_3_24;
-  }
-
-  @Override
-  public String instrumentedType() {
-    return FREEMARKER_CORE + ".DollarVariable";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("accept")
-            .and(isMethod())
-            .and(takesArgument(0, named(FREEMARKER_CORE + ".Environment"))),
-        packageName + ".DollarVariableDatadogAdvice$DollarVariableAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    static final String FREEMARKER_CORE = "freemarker.core";
+
+    public DollarVariableInstrumentation() {
+        super("freemarker");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "freemarker-2.3.24";
+    }
+
+    static final ElementMatcher.Junction<ClassLoader> VERSION_POST_2_3_24 =
+            hasClassNamed("freemarker.cache.ByteArrayTemplateLoader");
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return VERSION_POST_2_3_24;
+    }
+
+    @Override
+    public String instrumentedType() {
+        return FREEMARKER_CORE + ".DollarVariable";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("accept").and(isMethod()).and(takesArgument(0, named(FREEMARKER_CORE + ".Environment"))),
+                packageName + ".DollarVariableDatadogAdvice$DollarVariableAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/ObjectWrapperInstrumentation.java b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/ObjectWrapperInstrumentation.java
index 7e4c2036ecb..7a6d1ec53af 100644
--- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/ObjectWrapperInstrumentation.java
+++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/ObjectWrapperInstrumentation.java
@@ -23,44 +23,44 @@
 
 @AutoService(InstrumenterModule.class)
 public class ObjectWrapperInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public ObjectWrapperInstrumentation() {
-    super("freemarker");
-  }
+    public ObjectWrapperInstrumentation() {
+        super("freemarker");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "freemarker.template.ObjectWrapper";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "freemarker.template.ObjectWrapper";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("wrap")
-            .and(takesArgument(0, named("java.lang.Object")))
-            .and(returns(named("freemarker.template.TemplateModel"))),
-        getClass().getName() + "$ObjectWrapperAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("wrap")
+                        .and(takesArgument(0, named("java.lang.Object")))
+                        .and(returns(named("freemarker.template.TemplateModel"))),
+                getClass().getName() + "$ObjectWrapperAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class ObjectWrapperAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onExit(
-        @Advice.Return final TemplateModel templateModel,
-        @Advice.Argument(0) final Object object,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintObjectIfTainted(ctx, templateModel, object);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class ObjectWrapperAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onExit(
+                @Advice.Return final TemplateModel templateModel,
+                @Advice.Argument(0) final Object object,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintObjectIfTainted(ctx, templateModel, object);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/freemarker/core/DollarVariable24Helper.java b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/freemarker/core/DollarVariable24Helper.java
index 84c936f02c6..c3cf5571cf1 100644
--- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/freemarker/core/DollarVariable24Helper.java
+++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/freemarker/core/DollarVariable24Helper.java
@@ -7,71 +7,71 @@
 import org.slf4j.LoggerFactory;
 
 public final class DollarVariable24Helper {
-  private DollarVariable24Helper() {}
+    private DollarVariable24Helper() {}
 
-  private static final Logger log = LoggerFactory.getLogger(DollarVariable24Helper.class);
+    private static final Logger log = LoggerFactory.getLogger(DollarVariable24Helper.class);
 
-  private static final Field AUTO_ESCAPE = prepareAutoEscape();
-  private static final Field ESCAPED_EXPRESSION = prepareEscapedExpression();
+    private static final Field AUTO_ESCAPE = prepareAutoEscape();
+    private static final Field ESCAPED_EXPRESSION = prepareEscapedExpression();
 
-  private static Field prepareAutoEscape() {
-    Field autoEscape = null;
-    try {
-      autoEscape = DollarVariable.class.getDeclaredField("autoEscape");
-      autoEscape.setAccessible(true);
-    } catch (Throwable e) {
-      log.debug("Failed to get DollarVariable autoEscape", e);
-      return null;
+    private static Field prepareAutoEscape() {
+        Field autoEscape = null;
+        try {
+            autoEscape = DollarVariable.class.getDeclaredField("autoEscape");
+            autoEscape.setAccessible(true);
+        } catch (Throwable e) {
+            log.debug("Failed to get DollarVariable autoEscape", e);
+            return null;
+        }
+        return autoEscape;
     }
-    return autoEscape;
-  }
 
-  private static Field prepareEscapedExpression() {
-    try {
-      Field escapedExpression = DollarVariable.class.getDeclaredField("escapedExpression");
-      escapedExpression.setAccessible(true);
-      return escapedExpression;
-    } catch (Throwable e) {
-      log.debug("Failed to get DollarVariable escapedExpression", e);
-      return null;
+    private static Field prepareEscapedExpression() {
+        try {
+            Field escapedExpression = DollarVariable.class.getDeclaredField("escapedExpression");
+            escapedExpression.setAccessible(true);
+            return escapedExpression;
+        } catch (Throwable e) {
+            log.debug("Failed to get DollarVariable escapedExpression", e);
+            return null;
+        }
     }
-  }
 
-  public static boolean fetchAutoEscape(Object dollarVariable) {
-    if (AUTO_ESCAPE == null || !(dollarVariable instanceof DollarVariable)) {
-      return true;
-    }
-    try {
-      return (boolean) AUTO_ESCAPE.get(dollarVariable);
-    } catch (IllegalAccessException e) {
-      throw new UndeclaredThrowableException(e);
+    public static boolean fetchAutoEscape(Object dollarVariable) {
+        if (AUTO_ESCAPE == null || !(dollarVariable instanceof DollarVariable)) {
+            return true;
+        }
+        try {
+            return (boolean) AUTO_ESCAPE.get(dollarVariable);
+        } catch (IllegalAccessException e) {
+            throw new UndeclaredThrowableException(e);
+        }
     }
-  }
 
-  public static String fetchCharSec(Object object, Environment environment) {
-    if (!(object instanceof DollarVariable)) {
-      return null;
-    }
-    if (ESCAPED_EXPRESSION != null) {
-      try {
-        if (ESCAPED_EXPRESSION.get(object) instanceof BuiltInForLegacyEscaping) {
-          return null;
+    public static String fetchCharSec(Object object, Environment environment) {
+        if (!(object instanceof DollarVariable)) {
+            return null;
+        }
+        if (ESCAPED_EXPRESSION != null) {
+            try {
+                if (ESCAPED_EXPRESSION.get(object) instanceof BuiltInForLegacyEscaping) {
+                    return null;
+                }
+            } catch (IllegalAccessException e) {
+                throw new UndeclaredThrowableException(e);
+            }
+        }
+        try {
+            return (String) ((DollarVariable) object).calculateInterpolatedStringOrMarkup(environment);
+        } catch (TemplateException e) {
+            throw new UndeclaredThrowableException(e);
         }
-      } catch (IllegalAccessException e) {
-        throw new UndeclaredThrowableException(e);
-      }
-    }
-    try {
-      return (String) ((DollarVariable) object).calculateInterpolatedStringOrMarkup(environment);
-    } catch (TemplateException e) {
-      throw new UndeclaredThrowableException(e);
     }
-  }
 
-  public static Integer fetchBeginLine(Object object) {
-    if (!(object instanceof DollarVariable)) {
-      return null;
+    public static Integer fetchBeginLine(Object object) {
+        if (!(object instanceof DollarVariable)) {
+            return null;
+        }
+        return ((DollarVariable) object).beginLine;
     }
-    return ((DollarVariable) object).beginLine;
-  }
 }
diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/test/java/foo/bar/TestStringUtilSuite.java b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/test/java/foo/bar/TestStringUtilSuite.java
index 70f5bb67425..0a25e6ac814 100644
--- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/test/java/foo/bar/TestStringUtilSuite.java
+++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/test/java/foo/bar/TestStringUtilSuite.java
@@ -4,27 +4,27 @@
 
 public class TestStringUtilSuite {
 
-  public static String HTMLEnc(String input) {
-    return StringUtil.HTMLEnc(input);
-  }
+    public static String HTMLEnc(String input) {
+        return StringUtil.HTMLEnc(input);
+    }
 
-  public static String XMLEnc(String input) {
-    return StringUtil.XMLEnc(input);
-  }
+    public static String XMLEnc(String input) {
+        return StringUtil.XMLEnc(input);
+    }
 
-  public static String XHTMLEnc(String input) {
-    return StringUtil.XHTMLEnc(input);
-  }
+    public static String XHTMLEnc(String input) {
+        return StringUtil.XHTMLEnc(input);
+    }
 
-  public static String javaStringEnc(String input) {
-    return StringUtil.javaStringEnc(input);
-  }
+    public static String javaStringEnc(String input) {
+        return StringUtil.javaStringEnc(input);
+    }
 
-  public static String javaScriptStringEnc(String input) {
-    return StringUtil.javaScriptStringEnc(input);
-  }
+    public static String javaScriptStringEnc(String input) {
+        return StringUtil.javaScriptStringEnc(input);
+    }
 
-  public static String jsonStringEnc(String input) {
-    return StringUtil.jsonStringEnc(input);
-  }
+    public static String jsonStringEnc(String input) {
+        return StringUtil.jsonStringEnc(input);
+    }
 }
diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/src/main/java/datadog/trace/instrumentation/freemarker9/DollarVariableInstrumentation.java b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/src/main/java/datadog/trace/instrumentation/freemarker9/DollarVariableInstrumentation.java
index 38935ea363c..14095c44152 100644
--- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/src/main/java/datadog/trace/instrumentation/freemarker9/DollarVariableInstrumentation.java
+++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/src/main/java/datadog/trace/instrumentation/freemarker9/DollarVariableInstrumentation.java
@@ -20,57 +20,54 @@
 
 @AutoService(InstrumenterModule.class)
 public class DollarVariableInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  static final String FREEMARKER_CORE = "freemarker.core";
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    static final String FREEMARKER_CORE = "freemarker.core";
 
-  public DollarVariableInstrumentation() {
-    super("freemarker");
-  }
+    public DollarVariableInstrumentation() {
+        super("freemarker");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "freemarker-2.3.9";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "freemarker-2.3.9";
+    }
 
-  static final ElementMatcher.Junction<ClassLoader> NOT_VERSION_PRIOR_2_3_24 =
-      not(hasClassNamed("freemarker.cache.ByteArrayTemplateLoader"));
+    static final ElementMatcher.Junction<ClassLoader> NOT_VERSION_PRIOR_2_3_24 =
+            not(hasClassNamed("freemarker.cache.ByteArrayTemplateLoader"));
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return NOT_VERSION_PRIOR_2_3_24;
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return NOT_VERSION_PRIOR_2_3_24;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return FREEMARKER_CORE + ".DollarVariable";
-  }
+    @Override
+    public String instrumentedType() {
+        return FREEMARKER_CORE + ".DollarVariable";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("accept")
-            .and(isMethod())
-            .and(takesArgument(0, named(FREEMARKER_CORE + ".Environment"))),
-        DollarVariableInstrumentation.class.getName() + "$DollarVariableAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("accept").and(isMethod()).and(takesArgument(0, named(FREEMARKER_CORE + ".Environment"))),
+                DollarVariableInstrumentation.class.getName() + "$DollarVariableAdvice");
+    }
 
-  public static class DollarVariableAdvice {
+    public static class DollarVariableAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.XSS)
-    public static void onEnter(
-        @Advice.Argument(0) final Environment environment, @Advice.This final Object self) {
-      if (environment == null || self == null) {
-        return;
-      }
-      final XssModule xssModule = InstrumentationBridge.XSS;
-      if (xssModule == null) {
-        return;
-      }
-      String charSec = DollarVariable2_3_9Helper.fetchCharSec(self, environment);
-      final String templateName = environment.getTemplate().getName();
-      final int line = DollarVariable2_3_9Helper.fetchBeginLine(self);
-      xssModule.onXss(charSec, templateName, line);
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.XSS)
+        public static void onEnter(@Advice.Argument(0) final Environment environment, @Advice.This final Object self) {
+            if (environment == null || self == null) {
+                return;
+            }
+            final XssModule xssModule = InstrumentationBridge.XSS;
+            if (xssModule == null) {
+                return;
+            }
+            String charSec = DollarVariable2_3_9Helper.fetchCharSec(self, environment);
+            final String templateName = environment.getTemplate().getName();
+            final int line = DollarVariable2_3_9Helper.fetchBeginLine(self);
+            xssModule.onXss(charSec, templateName, line);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/src/main/java/freemarker/core/DollarVariable2_3_9Helper.java b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/src/main/java/freemarker/core/DollarVariable2_3_9Helper.java
index 03d3d4b3b4e..e17e5a03047 100644
--- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/src/main/java/freemarker/core/DollarVariable2_3_9Helper.java
+++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/src/main/java/freemarker/core/DollarVariable2_3_9Helper.java
@@ -7,53 +7,53 @@
 import org.slf4j.LoggerFactory;
 
 public final class DollarVariable2_3_9Helper {
-  private DollarVariable2_3_9Helper() {}
+    private DollarVariable2_3_9Helper() {}
 
-  private static final Logger log = LoggerFactory.getLogger(DollarVariable2_3_9Helper.class);
+    private static final Logger log = LoggerFactory.getLogger(DollarVariable2_3_9Helper.class);
 
-  private static final Field ESCAPED_EXPRESSION = prepareEscapedExpression();
+    private static final Field ESCAPED_EXPRESSION = prepareEscapedExpression();
 
-  private static Field prepareEscapedExpression() {
-    try {
-      Field autoEscape = DollarVariable.class.getDeclaredField("escapedExpression");
-      autoEscape.setAccessible(true);
-      return autoEscape;
-    } catch (Throwable e) {
-      log.debug("Failed to get DollarVariable escapedExpression", e);
-      return null;
+    private static Field prepareEscapedExpression() {
+        try {
+            Field autoEscape = DollarVariable.class.getDeclaredField("escapedExpression");
+            autoEscape.setAccessible(true);
+            return autoEscape;
+        } catch (Throwable e) {
+            log.debug("Failed to get DollarVariable escapedExpression", e);
+            return null;
+        }
     }
-  }
 
-  public static Expression fetchEscapeExpression(Object object) {
-    if (ESCAPED_EXPRESSION == null || !(object instanceof DollarVariable)) {
-      return null;
+    public static Expression fetchEscapeExpression(Object object) {
+        if (ESCAPED_EXPRESSION == null || !(object instanceof DollarVariable)) {
+            return null;
+        }
+        try {
+            return (Expression) ESCAPED_EXPRESSION.get(object);
+        } catch (IllegalAccessException e) {
+            throw new UndeclaredThrowableException(e);
+        }
     }
-    try {
-      return (Expression) ESCAPED_EXPRESSION.get(object);
-    } catch (IllegalAccessException e) {
-      throw new UndeclaredThrowableException(e);
-    }
-  }
 
-  public static String fetchCharSec(Object object, Environment environment) {
-    if (!(object instanceof DollarVariable)) {
-      return null;
-    }
-    final Expression expression = DollarVariable2_3_9Helper.fetchEscapeExpression(object);
-    if (expression instanceof BuiltIn) {
-      return null;
-    }
-    try {
-      return environment.getDataModel().get(expression.toString()).toString();
-    } catch (TemplateModelException e) {
-      throw new UndeclaredThrowableException(e);
+    public static String fetchCharSec(Object object, Environment environment) {
+        if (!(object instanceof DollarVariable)) {
+            return null;
+        }
+        final Expression expression = DollarVariable2_3_9Helper.fetchEscapeExpression(object);
+        if (expression instanceof BuiltIn) {
+            return null;
+        }
+        try {
+            return environment.getDataModel().get(expression.toString()).toString();
+        } catch (TemplateModelException e) {
+            throw new UndeclaredThrowableException(e);
+        }
     }
-  }
 
-  public static Integer fetchBeginLine(Object object) {
-    if (!(object instanceof DollarVariable)) {
-      return null;
+    public static Integer fetchBeginLine(Object object) {
+        if (!(object instanceof DollarVariable)) {
+            return null;
+        }
+        return ((DollarVariable) object).beginLine;
     }
-    return ((DollarVariable) object).beginLine;
-  }
 }
diff --git a/dd-java-agent/instrumentation/gax-1.4/src/main/java/datadog/trace/instrumentation/gax/CallbackChainRetryingFutureInstrumentation.java b/dd-java-agent/instrumentation/gax-1.4/src/main/java/datadog/trace/instrumentation/gax/CallbackChainRetryingFutureInstrumentation.java
index 9eb3b2edd35..900d19f0eb1 100644
--- a/dd-java-agent/instrumentation/gax-1.4/src/main/java/datadog/trace/instrumentation/gax/CallbackChainRetryingFutureInstrumentation.java
+++ b/dd-java-agent/instrumentation/gax-1.4/src/main/java/datadog/trace/instrumentation/gax/CallbackChainRetryingFutureInstrumentation.java
@@ -33,52 +33,52 @@
  */
 @AutoService(InstrumenterModule.class)
 public class CallbackChainRetryingFutureInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public CallbackChainRetryingFutureInstrumentation() {
-    super("gax", "gax-1.4");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.google.api.gax.retrying.CallbackChainRetryingFuture";
-  }
+    public CallbackChainRetryingFutureInstrumentation() {
+        super("gax", "gax-1.4");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(Runnable.class.getName(), State.class.getName());
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.google.api.gax.retrying.CallbackChainRetryingFuture";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("setAttemptFuture")
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("com.google.api.core.ApiFuture"))),
-        CallbackChainRetryingFutureInstrumentation.class.getName() + "$SetAttemptFutureAdvice");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(Runnable.class.getName(), State.class.getName());
+    }
 
-  public static class SetAttemptFutureAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static Runnable capturePrevious(
-        @Advice.FieldValue("attemptFutureCompletionListener") final Runnable previousListener) {
-      return previousListener;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("setAttemptFuture")
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("com.google.api.core.ApiFuture"))),
+                CallbackChainRetryingFutureInstrumentation.class.getName() + "$SetAttemptFutureAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void cancelSuperseded(
-        @Advice.Enter final Runnable previousListener,
-        @Advice.FieldValue("attemptFutureCompletionListener") final Runnable newListener) {
-      // Only cancel once the field has actually been replaced: GAX may return early without
-      // reassigning, and a listener still treated as active must keep its continuation.
-      if (previousListener != null && previousListener != newListener) {
-        final ContextStore<Runnable, State> contextStore =
-            InstrumentationContext.get(Runnable.class, State.class);
-        final State state = contextStore.remove(previousListener);
-        if (state != null) {
-          state.closeContinuation();
+    public static class SetAttemptFutureAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static Runnable capturePrevious(
+                @Advice.FieldValue("attemptFutureCompletionListener") final Runnable previousListener) {
+            return previousListener;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void cancelSuperseded(
+                @Advice.Enter final Runnable previousListener,
+                @Advice.FieldValue("attemptFutureCompletionListener") final Runnable newListener) {
+            // Only cancel once the field has actually been replaced: GAX may return early without
+            // reassigning, and a listener still treated as active must keep its continuation.
+            if (previousListener != null && previousListener != newListener) {
+                final ContextStore<Runnable, State> contextStore =
+                        InstrumentationContext.get(Runnable.class, State.class);
+                final State state = contextStore.remove(previousListener);
+                if (state != null) {
+                    state.closeContinuation();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/gax-1.4/src/test/java/datadog/trace/instrumentation/gax/GaxRetryContinuationTest.java b/dd-java-agent/instrumentation/gax-1.4/src/test/java/datadog/trace/instrumentation/gax/GaxRetryContinuationTest.java
index f70f1b6280e..82347c877f5 100644
--- a/dd-java-agent/instrumentation/gax-1.4/src/test/java/datadog/trace/instrumentation/gax/GaxRetryContinuationTest.java
+++ b/dd-java-agent/instrumentation/gax-1.4/src/test/java/datadog/trace/instrumentation/gax/GaxRetryContinuationTest.java
@@ -31,163 +31,148 @@
 
 class GaxRetryContinuationTest extends AbstractInstrumentationTest {
 
-  @Test
-  void supersededAttemptListenerDoesNotLeak() throws Exception {
-    ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
-    try {
-      ScheduledRetryingExecutor<String> executor =
-          new ScheduledRetryingExecutor<>(retryAlgorithm(1), scheduler);
-      RetryingFuture<String> retryingFuture = executor.createFuture(() -> "ok");
+    @Test
+    void supersededAttemptListenerDoesNotLeak() throws Exception {
+        ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
+        try {
+            ScheduledRetryingExecutor<String> executor = new ScheduledRetryingExecutor<>(retryAlgorithm(1), scheduler);
+            RetryingFuture<String> retryingFuture = executor.createFuture(() -> "ok");
 
-      AgentSpan span = startSpan("gax", "publish");
-      try (ContextScope scope = activateSpan(span)) {
-        // reserve the attempt slot with a placeholder that is never completed
-        SettableApiFuture<String> placeholder = SettableApiFuture.create();
-        retryingFuture.setAttemptFuture(placeholder);
-        // supersede it with the real attempt future -> must cancel the placeholder's continuation
-        SettableApiFuture<String> attempt = SettableApiFuture.create();
-        retryingFuture.setAttemptFuture(attempt);
-        // real attempt completes -> its listener runs -> resolves normally
-        attempt.set("ok");
-      }
-      span.finish();
-      // one trace that will be dropped if the placeholder's continuation is never cancelled
-      assertTraces(trace(span().root().operationName("publish")));
-    } finally {
-      scheduler.shutdownNow();
+            AgentSpan span = startSpan("gax", "publish");
+            try (ContextScope scope = activateSpan(span)) {
+                // reserve the attempt slot with a placeholder that is never completed
+                SettableApiFuture<String> placeholder = SettableApiFuture.create();
+                retryingFuture.setAttemptFuture(placeholder);
+                // supersede it with the real attempt future -> must cancel the placeholder's continuation
+                SettableApiFuture<String> attempt = SettableApiFuture.create();
+                retryingFuture.setAttemptFuture(attempt);
+                // real attempt completes -> its listener runs -> resolves normally
+                attempt.set("ok");
+            }
+            span.finish();
+            // one trace that will be dropped if the placeholder's continuation is never cancelled
+            assertTraces(trace(span().root().operationName("publish")));
+        } finally {
+            scheduler.shutdownNow();
+        }
     }
-  }
 
-  @Test
-  void singleAttemptSucceedsAndContextNotLeaked() throws Exception {
-    ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
-    try {
-      ScheduledRetryingExecutor<String> executor =
-          new ScheduledRetryingExecutor<>(retryAlgorithm(3), scheduler);
-      AgentSpan parent = startSpan("gax", "publish");
-      CountDownLatch allAttemptsDone = new CountDownLatch(1);
-      RetryingFuture<String> future =
-          executor.createFuture(
-              () -> {
+    @Test
+    void singleAttemptSucceedsAndContextNotLeaked() throws Exception {
+        ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
+        try {
+            ScheduledRetryingExecutor<String> executor = new ScheduledRetryingExecutor<>(retryAlgorithm(3), scheduler);
+            AgentSpan parent = startSpan("gax", "publish");
+            CountDownLatch allAttemptsDone = new CountDownLatch(1);
+            RetryingFuture<String> future = executor.createFuture(() -> {
                 AgentSpan attempt = startSpan("gax", "attempt");
                 try {
-                  return "ok";
+                    return "ok";
                 } finally {
-                  attempt.finish();
-                  allAttemptsDone.countDown();
+                    attempt.finish();
+                    allAttemptsDone.countDown();
                 }
-              });
+            });
 
-      try (ContextScope scope = activateSpan(parent)) {
-        future.setAttemptFuture(executor.submit(future));
-        assertEquals("ok", future.get(5, TimeUnit.SECONDS));
-      }
-      allAttemptsDone.await(5, TimeUnit.SECONDS);
-      parent.finish();
-      assertTraces(
-          trace(
-              SORT_BY_START_TIME,
-              span().root().operationName("publish"),
-              span().childOf(parent.getSpanId()).operationName("attempt")));
-    } finally {
-      scheduler.shutdownNow();
+            try (ContextScope scope = activateSpan(parent)) {
+                future.setAttemptFuture(executor.submit(future));
+                assertEquals("ok", future.get(5, TimeUnit.SECONDS));
+            }
+            allAttemptsDone.await(5, TimeUnit.SECONDS);
+            parent.finish();
+            assertTraces(trace(
+                    SORT_BY_START_TIME,
+                    span().root().operationName("publish"),
+                    span().childOf(parent.getSpanId()).operationName("attempt")));
+        } finally {
+            scheduler.shutdownNow();
+        }
     }
-  }
 
-  @Test
-  void retriedAttemptsSucceedAndContextNotLeaked() throws Exception {
-    ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
-    try {
-      ScheduledRetryingExecutor<String> executor =
-          new ScheduledRetryingExecutor<>(retryAlgorithm(3), scheduler);
-      AtomicInteger count = new AtomicInteger(0);
-      AgentSpan parent = startSpan("gax", "publish");
-      CountDownLatch allAttemptsDone = new CountDownLatch(3);
-      RetryingFuture<String> future =
-          executor.createFuture(
-              () -> {
+    @Test
+    void retriedAttemptsSucceedAndContextNotLeaked() throws Exception {
+        ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
+        try {
+            ScheduledRetryingExecutor<String> executor = new ScheduledRetryingExecutor<>(retryAlgorithm(3), scheduler);
+            AtomicInteger count = new AtomicInteger(0);
+            AgentSpan parent = startSpan("gax", "publish");
+            CountDownLatch allAttemptsDone = new CountDownLatch(3);
+            RetryingFuture<String> future = executor.createFuture(() -> {
                 AgentSpan attempt = startSpan("gax", "attempt");
                 try {
-                  if (count.incrementAndGet() < 3) {
-                    throw new RuntimeException("transient");
-                  }
-                  return "ok";
+                    if (count.incrementAndGet() < 3) {
+                        throw new RuntimeException("transient");
+                    }
+                    return "ok";
                 } finally {
-                  attempt.finish();
-                  allAttemptsDone.countDown();
+                    attempt.finish();
+                    allAttemptsDone.countDown();
                 }
-              });
+            });
 
-      try (ContextScope scope = activateSpan(parent)) {
-        future.setAttemptFuture(executor.submit(future));
-        assertEquals("ok", future.get(5, TimeUnit.SECONDS));
-      }
-      allAttemptsDone.await(5, TimeUnit.SECONDS);
-      parent.finish();
-      assertTraces(
-          trace(
-              SORT_BY_START_TIME,
-              span().root().operationName("publish"),
-              span().childOf(parent.getSpanId()).operationName("attempt"),
-              span().childOf(parent.getSpanId()).operationName("attempt"),
-              span().childOf(parent.getSpanId()).operationName("attempt")));
-    } finally {
-      scheduler.shutdownNow();
+            try (ContextScope scope = activateSpan(parent)) {
+                future.setAttemptFuture(executor.submit(future));
+                assertEquals("ok", future.get(5, TimeUnit.SECONDS));
+            }
+            allAttemptsDone.await(5, TimeUnit.SECONDS);
+            parent.finish();
+            assertTraces(trace(
+                    SORT_BY_START_TIME,
+                    span().root().operationName("publish"),
+                    span().childOf(parent.getSpanId()).operationName("attempt"),
+                    span().childOf(parent.getSpanId()).operationName("attempt"),
+                    span().childOf(parent.getSpanId()).operationName("attempt")));
+        } finally {
+            scheduler.shutdownNow();
+        }
     }
-  }
 
-  @Test
-  void exhaustedRetriesContextNotLeaked() throws Exception {
-    ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
-    try {
-      ScheduledRetryingExecutor<String> executor =
-          new ScheduledRetryingExecutor<>(retryAlgorithm(3), scheduler);
-      AgentSpan parent = startSpan("gax", "publish");
-      CountDownLatch allAttemptsDone = new CountDownLatch(3);
-      RetryingFuture<String> future =
-          executor.createFuture(
-              () -> {
+    @Test
+    void exhaustedRetriesContextNotLeaked() throws Exception {
+        ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
+        try {
+            ScheduledRetryingExecutor<String> executor = new ScheduledRetryingExecutor<>(retryAlgorithm(3), scheduler);
+            AgentSpan parent = startSpan("gax", "publish");
+            CountDownLatch allAttemptsDone = new CountDownLatch(3);
+            RetryingFuture<String> future = executor.createFuture(() -> {
                 AgentSpan attempt = startSpan("gax", "attempt");
                 try {
-                  throw new RuntimeException("always fails");
+                    throw new RuntimeException("always fails");
                 } finally {
-                  attempt.finish();
-                  allAttemptsDone.countDown();
+                    attempt.finish();
+                    allAttemptsDone.countDown();
                 }
-              });
+            });
 
-      try (ContextScope scope = activateSpan(parent)) {
-        future.setAttemptFuture(executor.submit(future));
-        assertThrows(ExecutionException.class, () -> future.get(5, TimeUnit.SECONDS));
-      }
-      allAttemptsDone.await(5, TimeUnit.SECONDS);
-      parent.finish();
-      assertTraces(
-          trace(
-              SORT_BY_START_TIME,
-              span().root().operationName("publish"),
-              span().childOf(parent.getSpanId()).operationName("attempt"),
-              span().childOf(parent.getSpanId()).operationName("attempt"),
-              span().childOf(parent.getSpanId()).operationName("attempt")));
-    } finally {
-      scheduler.shutdownNow();
+            try (ContextScope scope = activateSpan(parent)) {
+                future.setAttemptFuture(executor.submit(future));
+                assertThrows(ExecutionException.class, () -> future.get(5, TimeUnit.SECONDS));
+            }
+            allAttemptsDone.await(5, TimeUnit.SECONDS);
+            parent.finish();
+            assertTraces(trace(
+                    SORT_BY_START_TIME,
+                    span().root().operationName("publish"),
+                    span().childOf(parent.getSpanId()).operationName("attempt"),
+                    span().childOf(parent.getSpanId()).operationName("attempt"),
+                    span().childOf(parent.getSpanId()).operationName("attempt")));
+        } finally {
+            scheduler.shutdownNow();
+        }
     }
-  }
 
-  private static RetryAlgorithm<String> retryAlgorithm(int maxAttempts) {
-    RetrySettings settings =
-        RetrySettings.newBuilder()
-            .setMaxAttempts(maxAttempts)
-            .setInitialRetryDelay(Duration.ofMillis(1))
-            .setRetryDelayMultiplier(1.0)
-            .setMaxRetryDelay(Duration.ofMillis(10))
-            .setInitialRpcTimeout(Duration.ofSeconds(5))
-            .setRpcTimeoutMultiplier(1.0)
-            .setMaxRpcTimeout(Duration.ofSeconds(5))
-            .setTotalTimeout(Duration.ofSeconds(30))
-            .build();
-    ApiClock clock = NanoClock.getDefaultClock();
-    return new RetryAlgorithm<>(
-        new BasicResultRetryAlgorithm<>(), new ExponentialRetryAlgorithm(settings, clock));
-  }
+    private static RetryAlgorithm<String> retryAlgorithm(int maxAttempts) {
+        RetrySettings settings = RetrySettings.newBuilder()
+                .setMaxAttempts(maxAttempts)
+                .setInitialRetryDelay(Duration.ofMillis(1))
+                .setRetryDelayMultiplier(1.0)
+                .setMaxRetryDelay(Duration.ofMillis(10))
+                .setInitialRpcTimeout(Duration.ofSeconds(5))
+                .setRpcTimeoutMultiplier(1.0)
+                .setMaxRpcTimeout(Duration.ofSeconds(5))
+                .setTotalTimeout(Duration.ofSeconds(30))
+                .build();
+        ApiClock clock = NanoClock.getDefaultClock();
+        return new RetryAlgorithm<>(new BasicResultRetryAlgorithm<>(), new ExponentialRetryAlgorithm(settings, clock));
+    }
 }
diff --git a/dd-java-agent/instrumentation/glassfish-3.0/src/main/java/datadog/trace/instrumentation/glassfish/GlassFishInstrumentation.java b/dd-java-agent/instrumentation/glassfish-3.0/src/main/java/datadog/trace/instrumentation/glassfish/GlassFishInstrumentation.java
index d922aea24c6..32c1f66e872 100644
--- a/dd-java-agent/instrumentation/glassfish-3.0/src/main/java/datadog/trace/instrumentation/glassfish/GlassFishInstrumentation.java
+++ b/dd-java-agent/instrumentation/glassfish-3.0/src/main/java/datadog/trace/instrumentation/glassfish/GlassFishInstrumentation.java
@@ -20,35 +20,34 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class GlassFishInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public GlassFishInstrumentation() {
-    super("glassfish");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.sun.enterprise.v3.server.APIClassLoaderServiceImpl$APIClassLoader";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("addToBlackList")).and(takesArguments(1)),
-        GlassFishInstrumentation.class.getName() + "$AvoidGlassFishBlockingAdvice");
-  }
-
-  public static class AvoidGlassFishBlockingAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void preventBlockingOfTracerClasses(
-        @Advice.Argument(value = 0, readOnly = false) String name) {
-      for (final String prefix : Constants.BOOTSTRAP_PACKAGE_PREFIXES) {
-        if (name.startsWith(prefix)) {
-          name = "__datadog_no_block." + name;
-          break;
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public GlassFishInstrumentation() {
+        super("glassfish");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "com.sun.enterprise.v3.server.APIClassLoaderServiceImpl$APIClassLoader";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("addToBlackList")).and(takesArguments(1)),
+                GlassFishInstrumentation.class.getName() + "$AvoidGlassFishBlockingAdvice");
+    }
+
+    public static class AvoidGlassFishBlockingAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void preventBlockingOfTracerClasses(@Advice.Argument(value = 0, readOnly = false) String name) {
+            for (final String prefix : Constants.BOOTSTRAP_PACKAGE_PREFIXES) {
+                if (name.startsWith(prefix)) {
+                    name = "__datadog_no_block." + name;
+                    break;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/glassfish-3.0/src/test/groovy/TestServlets.java b/dd-java-agent/instrumentation/glassfish-3.0/src/test/groovy/TestServlets.java
index d324550d452..7ae32b88aff 100644
--- a/dd-java-agent/instrumentation/glassfish-3.0/src/test/groovy/TestServlets.java
+++ b/dd-java-agent/instrumentation/glassfish-3.0/src/test/groovy/TestServlets.java
@@ -23,187 +23,160 @@
 
 public class TestServlets {
 
-  @WebServlet("/success")
-  public static class Success extends HttpServlet {
-    @Override
-    protected void service(final HttpServletRequest req, final HttpServletResponse resp) {
-      final HttpServerTest.ServerEndpoint endpoint =
-          HttpServerTest.ServerEndpoint.forPath(req.getServletPath());
-      HttpServerTest.controller(
-          endpoint,
-          new Closure(null) {
-            public Object doCall() throws Exception {
-              resp.setContentType("text/plain");
-              resp.setStatus(endpoint.getStatus());
-              resp.getWriter().print(endpoint.getBody());
-              return null;
-            }
-          });
+    @WebServlet("/success")
+    public static class Success extends HttpServlet {
+        @Override
+        protected void service(final HttpServletRequest req, final HttpServletResponse resp) {
+            final HttpServerTest.ServerEndpoint endpoint = HttpServerTest.ServerEndpoint.forPath(req.getServletPath());
+            HttpServerTest.controller(endpoint, new Closure(null) {
+                public Object doCall() throws Exception {
+                    resp.setContentType("text/plain");
+                    resp.setStatus(endpoint.getStatus());
+                    resp.getWriter().print(endpoint.getBody());
+                    return null;
+                }
+            });
+        }
     }
-  }
 
-  @WebServlet("/forwarded")
-  public static class Forwarded extends HttpServlet {
-    @Override
-    protected void service(final HttpServletRequest req, final HttpServletResponse resp) {
-      final HttpServerTest.ServerEndpoint endpoint =
-          HttpServerTest.ServerEndpoint.forPath(req.getServletPath());
-      HttpServerTest.controller(
-          endpoint,
-          new Closure(null) {
-            public Object doCall() throws Exception {
-              resp.setContentType("text/plain");
-              resp.setStatus(endpoint.getStatus());
-              resp.getWriter().print(req.getHeader("x-forwarded-for"));
-              return null;
-            }
-          });
+    @WebServlet("/forwarded")
+    public static class Forwarded extends HttpServlet {
+        @Override
+        protected void service(final HttpServletRequest req, final HttpServletResponse resp) {
+            final HttpServerTest.ServerEndpoint endpoint = HttpServerTest.ServerEndpoint.forPath(req.getServletPath());
+            HttpServerTest.controller(endpoint, new Closure(null) {
+                public Object doCall() throws Exception {
+                    resp.setContentType("text/plain");
+                    resp.setStatus(endpoint.getStatus());
+                    resp.getWriter().print(req.getHeader("x-forwarded-for"));
+                    return null;
+                }
+            });
+        }
     }
-  }
 
-  @WebServlet("/body-urlencoded")
-  public static class BodyUrlEncoded extends HttpServlet {
-    @Override
-    protected void service(final HttpServletRequest req, final HttpServletResponse resp) {
-      HttpServerTest.controller(
-          HttpServerTest.ServerEndpoint.BODY_URLENCODED,
-          new Closure(null) {
-            public Object doCall() throws Exception {
-              resp.setContentType("text/plain");
-              resp.setStatus(HttpServerTest.ServerEndpoint.BODY_URLENCODED.getStatus());
-              resp.getWriter().print("[a:" + Arrays.asList(req.getParameterValues("a")) + "]");
-              return null;
-            }
-          });
+    @WebServlet("/body-urlencoded")
+    public static class BodyUrlEncoded extends HttpServlet {
+        @Override
+        protected void service(final HttpServletRequest req, final HttpServletResponse resp) {
+            HttpServerTest.controller(HttpServerTest.ServerEndpoint.BODY_URLENCODED, new Closure(null) {
+                public Object doCall() throws Exception {
+                    resp.setContentType("text/plain");
+                    resp.setStatus(HttpServerTest.ServerEndpoint.BODY_URLENCODED.getStatus());
+                    resp.getWriter().print("[a:" + Arrays.asList(req.getParameterValues("a")) + "]");
+                    return null;
+                }
+            });
+        }
     }
-  }
 
-  @WebServlet({"/query", "/encoded_query", "/encoded path query"})
-  public static class Query extends HttpServlet {
-    @Override
-    protected void service(final HttpServletRequest req, final HttpServletResponse resp) {
-      final HttpServerTest.ServerEndpoint endpoint =
-          HttpServerTest.ServerEndpoint.forPath(req.getServletPath());
-      HttpServerTest.controller(
-          endpoint,
-          new Closure(null) {
-            public Object doCall() throws Exception {
-              resp.setContentType("text/plain");
-              resp.setStatus(endpoint.getStatus());
-              resp.getWriter().print(endpoint.getBody());
-              return null;
-            }
-          });
+    @WebServlet({"/query", "/encoded_query", "/encoded path query"})
+    public static class Query extends HttpServlet {
+        @Override
+        protected void service(final HttpServletRequest req, final HttpServletResponse resp) {
+            final HttpServerTest.ServerEndpoint endpoint = HttpServerTest.ServerEndpoint.forPath(req.getServletPath());
+            HttpServerTest.controller(endpoint, new Closure(null) {
+                public Object doCall() throws Exception {
+                    resp.setContentType("text/plain");
+                    resp.setStatus(endpoint.getStatus());
+                    resp.getWriter().print(endpoint.getBody());
+                    return null;
+                }
+            });
+        }
     }
-  }
 
-  @WebServlet("/redirect")
-  public static class Redirect extends HttpServlet {
-    @Override
-    protected void service(final HttpServletRequest req, final HttpServletResponse resp) {
-      final HttpServerTest.ServerEndpoint endpoint =
-          HttpServerTest.ServerEndpoint.forPath(req.getServletPath());
-      HttpServerTest.controller(
-          endpoint,
-          new Closure(null) {
-            public Object doCall() throws Exception {
-              resp.sendRedirect(endpoint.getBody());
-              return null;
-            }
-          });
+    @WebServlet("/redirect")
+    public static class Redirect extends HttpServlet {
+        @Override
+        protected void service(final HttpServletRequest req, final HttpServletResponse resp) {
+            final HttpServerTest.ServerEndpoint endpoint = HttpServerTest.ServerEndpoint.forPath(req.getServletPath());
+            HttpServerTest.controller(endpoint, new Closure(null) {
+                public Object doCall() throws Exception {
+                    resp.sendRedirect(endpoint.getBody());
+                    return null;
+                }
+            });
+        }
     }
-  }
 
-  @WebServlet("/error-status")
-  public static class Error extends HttpServlet {
-    @Override
-    protected void service(final HttpServletRequest req, final HttpServletResponse resp) {
-      final HttpServerTest.ServerEndpoint endpoint =
-          HttpServerTest.ServerEndpoint.forPath(req.getServletPath());
-      HttpServerTest.controller(
-          endpoint,
-          new Closure(null) {
-            public Object doCall() throws Exception {
-              resp.setContentType("text/plain");
-              resp.sendError(endpoint.getStatus(), endpoint.getBody());
-              return null;
-            }
-          });
+    @WebServlet("/error-status")
+    public static class Error extends HttpServlet {
+        @Override
+        protected void service(final HttpServletRequest req, final HttpServletResponse resp) {
+            final HttpServerTest.ServerEndpoint endpoint = HttpServerTest.ServerEndpoint.forPath(req.getServletPath());
+            HttpServerTest.controller(endpoint, new Closure(null) {
+                public Object doCall() throws Exception {
+                    resp.setContentType("text/plain");
+                    resp.sendError(endpoint.getStatus(), endpoint.getBody());
+                    return null;
+                }
+            });
+        }
     }
-  }
 
-  @WebServlet("/exception")
-  public static class ExceptionServlet extends HttpServlet {
-    @Override
-    protected void service(final HttpServletRequest req, final HttpServletResponse resp) {
-      final HttpServerTest.ServerEndpoint endpoint =
-          HttpServerTest.ServerEndpoint.forPath(req.getServletPath());
-      HttpServerTest.controller(
-          endpoint,
-          new Closure(null) {
-            public Object doCall() throws Exception {
-              throw new Exception(endpoint.getBody());
-            }
-          });
+    @WebServlet("/exception")
+    public static class ExceptionServlet extends HttpServlet {
+        @Override
+        protected void service(final HttpServletRequest req, final HttpServletResponse resp) {
+            final HttpServerTest.ServerEndpoint endpoint = HttpServerTest.ServerEndpoint.forPath(req.getServletPath());
+            HttpServerTest.controller(endpoint, new Closure(null) {
+                public Object doCall() throws Exception {
+                    throw new Exception(endpoint.getBody());
+                }
+            });
+        }
     }
-  }
 
-  @WebServlet("/created")
-  public static class CreatedServlet extends HttpServlet {
-    @Override
-    protected void doPost(final HttpServletRequest req, final HttpServletResponse resp) {
-      controller(
-          CREATED,
-          new Closure(this) {
-            public Object doCall() throws IOException {
-              resp.setStatus(CREATED.getStatus());
-              resp.getWriter()
-                  .print(CREATED.getBody() + ": " + CharStreams.toString(req.getReader()));
-              return null;
-            }
-          });
+    @WebServlet("/created")
+    public static class CreatedServlet extends HttpServlet {
+        @Override
+        protected void doPost(final HttpServletRequest req, final HttpServletResponse resp) {
+            controller(CREATED, new Closure(this) {
+                public Object doCall() throws IOException {
+                    resp.setStatus(CREATED.getStatus());
+                    resp.getWriter().print(CREATED.getBody() + ": " + CharStreams.toString(req.getReader()));
+                    return null;
+                }
+            });
+        }
     }
-  }
 
-  @WebServlet("/created_input_stream")
-  public static class CreatedISServlet extends HttpServlet {
-    @Override
-    protected void doPost(final HttpServletRequest req, final HttpServletResponse resp) {
-      controller(
-          CREATED_IS,
-          new Closure(this) {
-            public Object doCall() throws IOException {
-              resp.setStatus(CREATED_IS.getStatus());
-              resp.getWriter()
-                  .print(
-                      CREATED_IS.getBody()
-                          + ": "
-                          + CharStreams.toString(
-                              new InputStreamReader(req.getInputStream(), StandardCharsets.UTF_8)));
-              return null;
-            }
-          });
+    @WebServlet("/created_input_stream")
+    public static class CreatedISServlet extends HttpServlet {
+        @Override
+        protected void doPost(final HttpServletRequest req, final HttpServletResponse resp) {
+            controller(CREATED_IS, new Closure(this) {
+                public Object doCall() throws IOException {
+                    resp.setStatus(CREATED_IS.getStatus());
+                    resp.getWriter()
+                            .print(CREATED_IS.getBody()
+                                    + ": "
+                                    + CharStreams.toString(
+                                            new InputStreamReader(req.getInputStream(), StandardCharsets.UTF_8)));
+                    return null;
+                }
+            });
+        }
     }
-  }
 
-  @WebFilter(urlPatterns = "/*")
-  public static class ResponseHeaderFilter implements Filter {
-    @Override
-    public void init(FilterConfig filterConfig) throws ServletException {}
+    @WebFilter(urlPatterns = "/*")
+    public static class ResponseHeaderFilter implements Filter {
+        @Override
+        public void init(FilterConfig filterConfig) throws ServletException {}
 
-    @Override
-    public void doFilter(
-        ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
-        throws IOException, ServletException {
-      if (servletResponse instanceof HttpServletResponse) {
-        HttpServletResponse response = (HttpServletResponse) servletResponse;
-        response.addHeader(
-            HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE());
-      }
-      filterChain.doFilter(servletRequest, servletResponse);
-    }
+        @Override
+        public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
+                throws IOException, ServletException {
+            if (servletResponse instanceof HttpServletResponse) {
+                HttpServletResponse response = (HttpServletResponse) servletResponse;
+                response.addHeader(
+                        HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE());
+            }
+            filterChain.doFilter(servletRequest, servletResponse);
+        }
 
-    @Override
-    public void destroy() {}
-  }
+        @Override
+        public void destroy() {}
+    }
 }
diff --git a/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientDecorator.java b/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientDecorator.java
index f1d41a0d97c..24929233a54 100644
--- a/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientDecorator.java
+++ b/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientDecorator.java
@@ -11,53 +11,52 @@
 import java.util.regex.Pattern;
 
 public class GoogleHttpClientDecorator extends HttpClientDecorator<HttpRequest, HttpResponse> {
-  private static final Pattern URL_REPLACEMENT = Pattern.compile("%20");
-  public static final CharSequence GOOGLE_HTTP_CLIENT =
-      UTF8BytesString.create("google-http-client");
-  public static final GoogleHttpClientDecorator DECORATE = new GoogleHttpClientDecorator();
-  public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String method(final HttpRequest httpRequest) {
-    return httpRequest.getRequestMethod();
-  }
-
-  @Override
-  protected URI url(final HttpRequest httpRequest) throws URISyntaxException {
-    // Google uses %20 (space) instead of "+" for spaces in the fragment
-    // Add "+" back for consistency with the other http client instrumentations
-    final String url = httpRequest.getUrl().build();
-    final String fixedUrl = URL_REPLACEMENT.matcher(url).replaceAll("+");
-    return URIUtils.safeParse(fixedUrl);
-  }
-
-  public void prepareSpan(AgentSpan span, HttpRequest request) {
-    DECORATE.afterStart(span);
-    DECORATE.onRequest(span, request);
-  }
-
-  @Override
-  protected int status(final HttpResponse httpResponse) {
-    return httpResponse.getStatusCode();
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"google-http-client"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return GOOGLE_HTTP_CLIENT;
-  }
-
-  @Override
-  protected String getRequestHeader(HttpRequest request, String headerName) {
-    return request.getHeaders().getFirstHeaderStringValue(headerName);
-  }
-
-  @Override
-  protected String getResponseHeader(HttpResponse response, String headerName) {
-    return response.getHeaders().getFirstHeaderStringValue(headerName);
-  }
+    private static final Pattern URL_REPLACEMENT = Pattern.compile("%20");
+    public static final CharSequence GOOGLE_HTTP_CLIENT = UTF8BytesString.create("google-http-client");
+    public static final GoogleHttpClientDecorator DECORATE = new GoogleHttpClientDecorator();
+    public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String method(final HttpRequest httpRequest) {
+        return httpRequest.getRequestMethod();
+    }
+
+    @Override
+    protected URI url(final HttpRequest httpRequest) throws URISyntaxException {
+        // Google uses %20 (space) instead of "+" for spaces in the fragment
+        // Add "+" back for consistency with the other http client instrumentations
+        final String url = httpRequest.getUrl().build();
+        final String fixedUrl = URL_REPLACEMENT.matcher(url).replaceAll("+");
+        return URIUtils.safeParse(fixedUrl);
+    }
+
+    public void prepareSpan(AgentSpan span, HttpRequest request) {
+        DECORATE.afterStart(span);
+        DECORATE.onRequest(span, request);
+    }
+
+    @Override
+    protected int status(final HttpResponse httpResponse) {
+        return httpResponse.getStatusCode();
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"google-http-client"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return GOOGLE_HTTP_CLIENT;
+    }
+
+    @Override
+    protected String getRequestHeader(HttpRequest request, String headerName) {
+        return request.getHeaders().getFirstHeaderStringValue(headerName);
+    }
+
+    @Override
+    protected String getResponseHeader(HttpResponse response, String headerName) {
+        return response.getHeaders().getFirstHeaderStringValue(headerName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java b/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java
index 4399139e53e..f09e68a957f 100644
--- a/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java
@@ -27,104 +27,101 @@
 
 @AutoService(InstrumenterModule.class)
 public class GoogleHttpClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public GoogleHttpClientInstrumentation() {
-    super("google-http-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public GoogleHttpClientInstrumentation() {
+        super("google-http-client");
+    }
 
-  @Override
-  public String instrumentedType() {
-    // HttpRequest is a final class.  Only need to instrument it exactly
-    // Note: the rest of com.google.api is ignored in the additional ignores
-    // of GlobalIgnoresMatcher to speed things up
-    return "com.google.api.client.http.HttpRequest";
-  }
+    @Override
+    public String instrumentedType() {
+        // HttpRequest is a final class.  Only need to instrument it exactly
+        // Note: the rest of com.google.api is ignored in the additional ignores
+        // of GlobalIgnoresMatcher to speed things up
+        return "com.google.api.client.http.HttpRequest";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod().and(isPublic()).and(named("execute")).and(takesArguments(0)),
-        GoogleHttpClientInstrumentation.class.getName() + "$GoogleHttpClientAdvice",
-        GoogleHttpClientInstrumentation.class.getName()
-            + "$GoogleHttpClientContextPropagationAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod().and(isPublic()).and(named("execute")).and(takesArguments(0)),
+                GoogleHttpClientInstrumentation.class.getName() + "$GoogleHttpClientAdvice",
+                GoogleHttpClientInstrumentation.class.getName() + "$GoogleHttpClientContextPropagationAdvice");
 
-    transformer.applyAdvices(
-        isMethod()
-            .and(isPublic())
-            .and(named("executeAsync"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, (named("java.util.concurrent.Executor")))),
-        GoogleHttpClientInstrumentation.class.getName() + "$GoogleHttpClientAsyncAdvice",
-        GoogleHttpClientInstrumentation.class.getName()
-            + "$GoogleHttpClientContextPropagationAdvice");
-  }
+        transformer.applyAdvices(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("executeAsync"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, (named("java.util.concurrent.Executor")))),
+                GoogleHttpClientInstrumentation.class.getName() + "$GoogleHttpClientAsyncAdvice",
+                GoogleHttpClientInstrumentation.class.getName() + "$GoogleHttpClientContextPropagationAdvice");
+    }
 
-  public static class GoogleHttpClientAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.This HttpRequest request, @Advice.Local("inherited") AgentSpan inheritedSpan) {
-      AgentSpan activeSpan = activeSpan();
-      // detect if span was propagated here by java-concurrent handling
-      // of async requests
-      if (null != activeSpan) {
-        // reference equality to check this instrumentation created the span,
-        // not some other HTTP client
-        if (HTTP_REQUEST == activeSpan.getOperationName()) {
-          inheritedSpan = activeSpan;
-          return null;
+    public static class GoogleHttpClientAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.This HttpRequest request, @Advice.Local("inherited") AgentSpan inheritedSpan) {
+            AgentSpan activeSpan = activeSpan();
+            // detect if span was propagated here by java-concurrent handling
+            // of async requests
+            if (null != activeSpan) {
+                // reference equality to check this instrumentation created the span,
+                // not some other HTTP client
+                if (HTTP_REQUEST == activeSpan.getOperationName()) {
+                    inheritedSpan = activeSpan;
+                    return null;
+                }
+            }
+            AgentSpan span = startSpan("google-http-client", HTTP_REQUEST);
+            DECORATE.prepareSpan(span, request);
+            return activateSpan(span);
         }
-      }
-      AgentSpan span = startSpan("google-http-client", HTTP_REQUEST);
-      DECORATE.prepareSpan(span, request);
-      return activateSpan(span);
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter ContextScope scope,
-        @Advice.Local("inherited") AgentSpan inheritedSpan,
-        @Advice.Return final HttpResponse response,
-        @Advice.Thrown final Throwable throwable) {
-      AgentSpan span = scope != null ? spanFromScope(scope) : inheritedSpan;
-      DECORATE.onError(span, throwable);
-      DECORATE.onResponse(span, response);
-      DECORATE.beforeFinish(span);
-      if (scope != null) {
-        scope.close();
-      }
-      span.finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter ContextScope scope,
+                @Advice.Local("inherited") AgentSpan inheritedSpan,
+                @Advice.Return final HttpResponse response,
+                @Advice.Thrown final Throwable throwable) {
+            AgentSpan span = scope != null ? spanFromScope(scope) : inheritedSpan;
+            DECORATE.onError(span, throwable);
+            DECORATE.onResponse(span, response);
+            DECORATE.beforeFinish(span);
+            if (scope != null) {
+                scope.close();
+            }
+            span.finish();
+        }
     }
-  }
 
-  public static class GoogleHttpClientAsyncAdvice {
+    public static class GoogleHttpClientAsyncAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(@Advice.This HttpRequest request) {
-      AgentSpan span = startSpan("google-http-client", HTTP_REQUEST);
-      DECORATE.prepareSpan(span, request);
-      return activateSpan(span);
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(@Advice.This HttpRequest request) {
+            AgentSpan span = startSpan("google-http-client", HTTP_REQUEST);
+            DECORATE.prepareSpan(span, request);
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      final AgentSpan span = spanFromScope(scope);
-      if (throwable != null) {
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(@Advice.Enter ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            final AgentSpan span = spanFromScope(scope);
+            if (throwable != null) {
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+        }
     }
-  }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class GoogleHttpClientContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(@Advice.This HttpRequest request) {
-      DECORATE.injectContext(currentContext(), request, SETTER);
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class GoogleHttpClientContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter(@Advice.This HttpRequest request) {
+            DECORATE.injectContext(currentContext(), request, SETTER);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/HeadersInjectAdapter.java b/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/HeadersInjectAdapter.java
index a9a162d576a..5e8ce8ab453 100644
--- a/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/HeadersInjectAdapter.java
+++ b/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/HeadersInjectAdapter.java
@@ -7,10 +7,10 @@
 @ParametersAreNonnullByDefault
 public class HeadersInjectAdapter implements CarrierSetter<HttpRequest> {
 
-  public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter();
+    public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter();
 
-  @Override
-  public void set(final HttpRequest carrier, final String key, final String value) {
-    carrier.getHeaders().put(key, value);
-  }
+    @Override
+    public void set(final HttpRequest carrier, final String key, final String value) {
+        carrier.getHeaders().put(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/GooglePubSubModule.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/GooglePubSubModule.java
index 6b227b50dab..9c0097bb3f3 100644
--- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/GooglePubSubModule.java
+++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/GooglePubSubModule.java
@@ -15,22 +15,19 @@
 import java.util.Map;
 
 @AutoService(InstrumenterModule.class)
-public class GooglePubSubModule extends InstrumenterModule.Tracing
-    implements ExcludeFilterProvider {
-  public GooglePubSubModule() {
-    super("google-pubsub");
-  }
+public class GooglePubSubModule extends InstrumenterModule.Tracing implements ExcludeFilterProvider {
+    public GooglePubSubModule() {
+        super("google-pubsub");
+    }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    return singletonMap(RUNNABLE, singletonList("com.google.api.gax.rpc.Watchdog"));
-  }
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        return singletonMap(RUNNABLE, singletonList("com.google.api.gax.rpc.Watchdog"));
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(
-        new PublisherInstrumentation(),
-        new ReceiverInstrumentation(),
-        new ReceiverWithAckInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(
+                new PublisherInstrumentation(), new ReceiverInstrumentation(), new ReceiverWithAckInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWithAckResponseWrapper.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWithAckResponseWrapper.java
index e85354c537c..6d215e8dde2 100644
--- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWithAckResponseWrapper.java
+++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWithAckResponseWrapper.java
@@ -10,23 +10,22 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 
 public class MessageReceiverWithAckResponseWrapper implements MessageReceiverWithAckResponse {
-  private final String subscription;
-  private final MessageReceiverWithAckResponse delegate;
+    private final String subscription;
+    private final MessageReceiverWithAckResponse delegate;
 
-  public MessageReceiverWithAckResponseWrapper(
-      String subscription, MessageReceiverWithAckResponse delegate) {
-    this.subscription = subscription;
-    this.delegate = delegate;
-  }
+    public MessageReceiverWithAckResponseWrapper(String subscription, MessageReceiverWithAckResponse delegate) {
+        this.subscription = subscription;
+        this.delegate = delegate;
+    }
 
-  @Override
-  public void receiveMessage(PubsubMessage message, AckReplyConsumerWithResponse consumer) {
-    final AgentSpan span = CONSUMER_DECORATE.startConsumeSpan(message, subscription);
-    try (final ContextScope scope = activateSpan(span)) {
-      this.delegate.receiveMessage(message, consumer);
-    } finally {
-      CONSUMER_DECORATE.beforeFinish(span);
-      span.finish();
+    @Override
+    public void receiveMessage(PubsubMessage message, AckReplyConsumerWithResponse consumer) {
+        final AgentSpan span = CONSUMER_DECORATE.startConsumeSpan(message, subscription);
+        try (final ContextScope scope = activateSpan(span)) {
+            this.delegate.receiveMessage(message, consumer);
+        } finally {
+            CONSUMER_DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWrapper.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWrapper.java
index 59ffc1d928e..98868881afc 100644
--- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWrapper.java
+++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWrapper.java
@@ -10,22 +10,22 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 
 public final class MessageReceiverWrapper implements MessageReceiver {
-  private final String subscription;
-  private final MessageReceiver delegate;
+    private final String subscription;
+    private final MessageReceiver delegate;
 
-  public MessageReceiverWrapper(String subscription, MessageReceiver delegate) {
-    this.subscription = subscription;
-    this.delegate = delegate;
-  }
+    public MessageReceiverWrapper(String subscription, MessageReceiver delegate) {
+        this.subscription = subscription;
+        this.delegate = delegate;
+    }
 
-  @Override
-  public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
-    final AgentSpan span = CONSUMER_DECORATE.startConsumeSpan(message, subscription);
-    try (final ContextScope scope = activateSpan(span)) {
-      this.delegate.receiveMessage(message, consumer);
-    } finally {
-      CONSUMER_DECORATE.beforeFinish(span);
-      span.finish();
+    @Override
+    public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
+        final AgentSpan span = CONSUMER_DECORATE.startConsumeSpan(message, subscription);
+        try (final ContextScope scope = activateSpan(span)) {
+            this.delegate.receiveMessage(message, consumer);
+        } finally {
+            CONSUMER_DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PubSubDecorator.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PubSubDecorator.java
index 8e64b96ea44..ee182b157f0 100644
--- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PubSubDecorator.java
+++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PubSubDecorator.java
@@ -27,138 +27,126 @@
 import java.util.regex.Pattern;
 
 public class PubSubDecorator extends MessagingClientDecorator {
-  private static class RegexExtractor implements Function<CharSequence, CharSequence> {
-    private final Pattern pattern;
-    private final int group;
+    private static class RegexExtractor implements Function<CharSequence, CharSequence> {
+        private final Pattern pattern;
+        private final int group;
+
+        public RegexExtractor(final String regex, final int group) {
+            pattern = Pattern.compile(regex);
+            this.group = group;
+        }
+
+        @Override
+        public CharSequence apply(CharSequence input) {
+            final Matcher matcher = pattern.matcher(input);
+            if (matcher.matches() && group <= matcher.groupCount()) {
+                return matcher.group(group);
+            }
+            return input;
+        }
+    }
+
+    private static final String PUBSUB = "google-pubsub";
+    public static final CharSequence JAVA_PUBSUB = UTF8BytesString.create("java-google-pubsub");
+    public static final CharSequence PUBSUB_CONSUME = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().messaging().inboundOperation(PUBSUB));
+    public static final CharSequence PUBSUB_PRODUCE = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().messaging().outboundOperation(PUBSUB));
+
+    private static final DDCache<CharSequence, CharSequence> TOPIC_NAME_CACHE = DDCaches.newFixedSizeCache(32);
+    private static final DDCache<CharSequence, CharSequence> SUBSCRIPTION_NAME_CACHE = DDCaches.newFixedSizeCache(32);
+
+    private static final DDCache<CharSequence, CharSequence> PRODUCER_RESOURCE_NAME_CACHE =
+            DDCaches.newFixedSizeCache(32);
+    private static final DDCache<CharSequence, CharSequence> CONSUMER_RESOURCE_NAME_CACHE =
+            DDCaches.newFixedSizeCache(32);
+    private static final Functions.Prefix PRODUCER_PREFIX = new Functions.Prefix("Produce Topic ");
+    private static final Functions.Prefix CONSUMER_PREFIX = new Functions.Prefix("Consume Subscription ");
+
+    private static final Function<CharSequence, CharSequence> TOPIC_EXTRACTION_FUNCTION =
+            new RegexExtractor("^projects/(.+)/topics/(.+)$", 2).andThen(UTF8BytesString::create);
+    private static final Function<CharSequence, CharSequence> SUBSCRIPTION_EXTRACTION_FUNCTION =
+            new RegexExtractor("^projects/(.+)/subscriptions/(.+)$", 2).andThen(UTF8BytesString::create);
+
+    public static final PubSubDecorator PRODUCER_DECORATE = new PubSubDecorator(
+            Tags.SPAN_KIND_PRODUCER,
+            InternalSpanTypes.MESSAGE_PRODUCER,
+            SpanNaming.instance()
+                    .namingSchema()
+                    .messaging()
+                    .outboundService(PUBSUB, Config.get().isGooglePubSubLegacyTracingEnabled()));
+
+    public static final PubSubDecorator CONSUMER_DECORATE = new PubSubDecorator(
+            Tags.SPAN_KIND_CONSUMER,
+            InternalSpanTypes.MESSAGE_CONSUMER,
+            SpanNaming.instance()
+                    .namingSchema()
+                    .messaging()
+                    .inboundService(PUBSUB, Config.get().isGooglePubSubLegacyTracingEnabled()));
+    private final String spanKind;
+    private final CharSequence spanType;
+    private final Supplier<String> serviceNameSupplier;
+
+    protected PubSubDecorator(String spanKind, CharSequence spanType, Supplier<String> serviceNameSupplier) {
+        this.spanKind = spanKind;
+        this.spanType = spanType;
+        this.serviceNameSupplier = serviceNameSupplier;
+    }
 
-    public RegexExtractor(final String regex, final int group) {
-      pattern = Pattern.compile(regex);
-      this.group = group;
+    @Override
+    protected CharSequence spanType() {
+        return spanType;
     }
 
     @Override
-    public CharSequence apply(CharSequence input) {
-      final Matcher matcher = pattern.matcher(input);
-      if (matcher.matches() && group <= matcher.groupCount()) {
-        return matcher.group(group);
-      }
-      return input;
+    protected String[] instrumentationNames() {
+        return new String[] {"google-pubsub"};
+    }
+
+    @Override
+    protected String service() {
+        return serviceNameSupplier.get();
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JAVA_PUBSUB;
+    }
+
+    @Override
+    protected String spanKind() {
+        return spanKind;
+    }
+
+    public AgentSpan startConsumeSpan(final PubsubMessage message, final String subscription) {
+        final AgentSpanContext spanContext = extractContextAndGetSpanContext(message, TextMapExtractAdapter.GETTER);
+        final AgentSpan span = startSpan(JAVA_PUBSUB.toString(), PUBSUB_CONSUME, spanContext);
+        final CharSequence parsedSubscription = extractSubscription(subscription);
+        DataStreamsTags tags = createWithSubscription("google-pubsub", INBOUND, parsedSubscription.toString());
+        final Timestamp publishTime = message.getPublishTime();
+        // FIXME: use full nanosecond resolution when this method will accept nanos
+        AgentTracer.get()
+                .getDataStreamsMonitoring()
+                .setCheckpoint(
+                        span,
+                        DataStreamsContext.create(
+                                tags,
+                                publishTime.getSeconds() * 1_000 + publishTime.getNanos() / (int) 1e6,
+                                message.getSerializedSize()));
+        afterStart(span);
+        span.setResourceName(CONSUMER_RESOURCE_NAME_CACHE.computeIfAbsent(parsedSubscription, CONSUMER_PREFIX));
+        return span;
+    }
+
+    public void onProduce(final AgentSpan span, final CharSequence topic) {
+        span.setResourceName(PRODUCER_RESOURCE_NAME_CACHE.computeIfAbsent(topic, PRODUCER_PREFIX));
+    }
+
+    public CharSequence extractTopic(String fullTopic) {
+        return TOPIC_NAME_CACHE.computeIfAbsent(fullTopic, TOPIC_EXTRACTION_FUNCTION);
+    }
+
+    public CharSequence extractSubscription(String fullSubscription) {
+        return SUBSCRIPTION_NAME_CACHE.computeIfAbsent(fullSubscription, SUBSCRIPTION_EXTRACTION_FUNCTION);
     }
-  }
-
-  private static final String PUBSUB = "google-pubsub";
-  public static final CharSequence JAVA_PUBSUB = UTF8BytesString.create("java-google-pubsub");
-  public static final CharSequence PUBSUB_CONSUME =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().messaging().inboundOperation(PUBSUB));
-  public static final CharSequence PUBSUB_PRODUCE =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().messaging().outboundOperation(PUBSUB));
-
-  private static final DDCache<CharSequence, CharSequence> TOPIC_NAME_CACHE =
-      DDCaches.newFixedSizeCache(32);
-  private static final DDCache<CharSequence, CharSequence> SUBSCRIPTION_NAME_CACHE =
-      DDCaches.newFixedSizeCache(32);
-
-  private static final DDCache<CharSequence, CharSequence> PRODUCER_RESOURCE_NAME_CACHE =
-      DDCaches.newFixedSizeCache(32);
-  private static final DDCache<CharSequence, CharSequence> CONSUMER_RESOURCE_NAME_CACHE =
-      DDCaches.newFixedSizeCache(32);
-  private static final Functions.Prefix PRODUCER_PREFIX = new Functions.Prefix("Produce Topic ");
-  private static final Functions.Prefix CONSUMER_PREFIX =
-      new Functions.Prefix("Consume Subscription ");
-
-  private static final Function<CharSequence, CharSequence> TOPIC_EXTRACTION_FUNCTION =
-      new RegexExtractor("^projects/(.+)/topics/(.+)$", 2).andThen(UTF8BytesString::create);
-  private static final Function<CharSequence, CharSequence> SUBSCRIPTION_EXTRACTION_FUNCTION =
-      new RegexExtractor("^projects/(.+)/subscriptions/(.+)$", 2).andThen(UTF8BytesString::create);
-
-  public static final PubSubDecorator PRODUCER_DECORATE =
-      new PubSubDecorator(
-          Tags.SPAN_KIND_PRODUCER,
-          InternalSpanTypes.MESSAGE_PRODUCER,
-          SpanNaming.instance()
-              .namingSchema()
-              .messaging()
-              .outboundService(PUBSUB, Config.get().isGooglePubSubLegacyTracingEnabled()));
-
-  public static final PubSubDecorator CONSUMER_DECORATE =
-      new PubSubDecorator(
-          Tags.SPAN_KIND_CONSUMER,
-          InternalSpanTypes.MESSAGE_CONSUMER,
-          SpanNaming.instance()
-              .namingSchema()
-              .messaging()
-              .inboundService(PUBSUB, Config.get().isGooglePubSubLegacyTracingEnabled()));
-  private final String spanKind;
-  private final CharSequence spanType;
-  private final Supplier<String> serviceNameSupplier;
-
-  protected PubSubDecorator(
-      String spanKind, CharSequence spanType, Supplier<String> serviceNameSupplier) {
-    this.spanKind = spanKind;
-    this.spanType = spanType;
-    this.serviceNameSupplier = serviceNameSupplier;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return spanType;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"google-pubsub"};
-  }
-
-  @Override
-  protected String service() {
-    return serviceNameSupplier.get();
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JAVA_PUBSUB;
-  }
-
-  @Override
-  protected String spanKind() {
-    return spanKind;
-  }
-
-  public AgentSpan startConsumeSpan(final PubsubMessage message, final String subscription) {
-    final AgentSpanContext spanContext =
-        extractContextAndGetSpanContext(message, TextMapExtractAdapter.GETTER);
-    final AgentSpan span = startSpan(JAVA_PUBSUB.toString(), PUBSUB_CONSUME, spanContext);
-    final CharSequence parsedSubscription = extractSubscription(subscription);
-    DataStreamsTags tags =
-        createWithSubscription("google-pubsub", INBOUND, parsedSubscription.toString());
-    final Timestamp publishTime = message.getPublishTime();
-    // FIXME: use full nanosecond resolution when this method will accept nanos
-    AgentTracer.get()
-        .getDataStreamsMonitoring()
-        .setCheckpoint(
-            span,
-            DataStreamsContext.create(
-                tags,
-                publishTime.getSeconds() * 1_000 + publishTime.getNanos() / (int) 1e6,
-                message.getSerializedSize()));
-    afterStart(span);
-    span.setResourceName(
-        CONSUMER_RESOURCE_NAME_CACHE.computeIfAbsent(parsedSubscription, CONSUMER_PREFIX));
-    return span;
-  }
-
-  public void onProduce(final AgentSpan span, final CharSequence topic) {
-    span.setResourceName(PRODUCER_RESOURCE_NAME_CACHE.computeIfAbsent(topic, PRODUCER_PREFIX));
-  }
-
-  public CharSequence extractTopic(String fullTopic) {
-    return TOPIC_NAME_CACHE.computeIfAbsent(fullTopic, TOPIC_EXTRACTION_FUNCTION);
-  }
-
-  public CharSequence extractSubscription(String fullSubscription) {
-    return SUBSCRIPTION_NAME_CACHE.computeIfAbsent(
-        fullSubscription, SUBSCRIPTION_EXTRACTION_FUNCTION);
-  }
 }
diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java
index 6b73846ea34..61fbb8da893 100644
--- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java
+++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java
@@ -25,61 +25,59 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
 
-public final class PublisherInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class PublisherInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.google.cloud.pubsub.v1.Publisher";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.google.cloud.pubsub.v1.Publisher";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod().and(named("publish")),
-        getClass().getName() + "$Wrap",
-        getClass().getName() + "$ContextPropagationAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod().and(named("publish")),
+                getClass().getName() + "$Wrap",
+                getClass().getName() + "$ContextPropagationAdvice");
+    }
 
-  public static final class Wrap {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(@Advice.This Publisher publisher) {
-      final AgentSpan span = startSpan(JAVA_PUBSUB.toString(), PUBSUB_PRODUCE);
+    public static final class Wrap {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(@Advice.This Publisher publisher) {
+            final AgentSpan span = startSpan(JAVA_PUBSUB.toString(), PUBSUB_PRODUCE);
 
-      final CharSequence topicName = PRODUCER_DECORATE.extractTopic(publisher.getTopicNameString());
-      PRODUCER_DECORATE.afterStart(span);
-      PRODUCER_DECORATE.onProduce(span, topicName);
+            final CharSequence topicName = PRODUCER_DECORATE.extractTopic(publisher.getTopicNameString());
+            PRODUCER_DECORATE.afterStart(span);
+            PRODUCER_DECORATE.onProduce(span, topicName);
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      PRODUCER_DECORATE.onError(scope, throwable);
-      PRODUCER_DECORATE.beforeFinish(scope);
-      scope.close();
-      spanFromScope(scope).finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            PRODUCER_DECORATE.onError(scope, throwable);
+            PRODUCER_DECORATE.beforeFinish(scope);
+            scope.close();
+            spanFromScope(scope).finish();
+        }
     }
-  }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static final class ContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(value = 0, readOnly = false) PubsubMessage msg,
-        @Advice.This Publisher publisher) {
-      AgentSpan span = activeSpan();
-      if (span == null) return;
-      DataStreamsTags tags =
-          create(
-              "google-pubsub",
-              OUTBOUND,
-              PRODUCER_DECORATE.extractTopic(publisher.getTopicNameString()).toString());
-      PubsubMessage.Builder builder = msg.toBuilder();
-      DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
-      defaultPropagator().inject(span.with(dsmContext), builder, SETTER);
-      msg = builder.build();
+    @AppliesOn(CONTEXT_TRACKING)
+    public static final class ContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Argument(value = 0, readOnly = false) PubsubMessage msg, @Advice.This Publisher publisher) {
+            AgentSpan span = activeSpan();
+            if (span == null) return;
+            DataStreamsTags tags = create(
+                    "google-pubsub",
+                    OUTBOUND,
+                    PRODUCER_DECORATE
+                            .extractTopic(publisher.getTopicNameString())
+                            .toString());
+            PubsubMessage.Builder builder = msg.toBuilder();
+            DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
+            defaultPropagator().inject(span.with(dsmContext), builder, SETTER);
+            msg = builder.build();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverInstrumentation.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverInstrumentation.java
index 5314f9505b3..245548d63f4 100644
--- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverInstrumentation.java
+++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverInstrumentation.java
@@ -8,30 +8,29 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import net.bytebuddy.asm.Advice;
 
-public class ReceiverInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class ReceiverInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.google.cloud.pubsub.v1.Subscriber";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.google.cloud.pubsub.v1.Subscriber";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("newBuilder"))
-            .and(takesArgument(0, String.class))
-            .and(takesArgument(1, named("com.google.cloud.pubsub.v1.MessageReceiver"))),
-        getClass().getName() + "$Wrap");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("newBuilder"))
+                        .and(takesArgument(0, String.class))
+                        .and(takesArgument(1, named("com.google.cloud.pubsub.v1.MessageReceiver"))),
+                getClass().getName() + "$Wrap");
+    }
 
-  public static final class Wrap {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void before(
-        @Advice.Argument(value = 0) final String subscription,
-        @Advice.Argument(value = 1, readOnly = false) MessageReceiver receiver) {
-      receiver = new MessageReceiverWrapper(subscription, receiver);
+    public static final class Wrap {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void before(
+                @Advice.Argument(value = 0) final String subscription,
+                @Advice.Argument(value = 1, readOnly = false) MessageReceiver receiver) {
+            receiver = new MessageReceiverWrapper(subscription, receiver);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverWithAckInstrumentation.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverWithAckInstrumentation.java
index 93696ef0e53..f53acb801c3 100644
--- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverWithAckInstrumentation.java
+++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/ReceiverWithAckInstrumentation.java
@@ -9,30 +9,29 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import net.bytebuddy.asm.Advice;
 
-public final class ReceiverWithAckInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class ReceiverWithAckInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.google.cloud.pubsub.v1.Subscriber";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.google.cloud.pubsub.v1.Subscriber";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("newBuilder"))
-            .and(takesArgument(0, String.class))
-            .and(takesArgument(1, nameEndsWith("MessageReceiverWithAckResponse"))),
-        getClass().getName() + "$Wrap");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("newBuilder"))
+                        .and(takesArgument(0, String.class))
+                        .and(takesArgument(1, nameEndsWith("MessageReceiverWithAckResponse"))),
+                getClass().getName() + "$Wrap");
+    }
 
-  public static final class Wrap {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void before(
-        @Advice.Argument(value = 0) final String subscription,
-        @Advice.Argument(value = 1, readOnly = false) MessageReceiverWithAckResponse receiver) {
-      receiver = new MessageReceiverWithAckResponseWrapper(subscription, receiver);
+    public static final class Wrap {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void before(
+                @Advice.Argument(value = 0) final String subscription,
+                @Advice.Argument(value = 1, readOnly = false) MessageReceiverWithAckResponse receiver) {
+            receiver = new MessageReceiverWithAckResponseWrapper(subscription, receiver);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/TextMapExtractAdapter.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/TextMapExtractAdapter.java
index 61c50219769..86834414546 100644
--- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/TextMapExtractAdapter.java
+++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/TextMapExtractAdapter.java
@@ -6,17 +6,17 @@
 import java.util.Map;
 
 public class TextMapExtractAdapter implements ContextVisitor<PubsubMessage> {
-  public static final TextMapExtractAdapter GETTER = new TextMapExtractAdapter();
+    public static final TextMapExtractAdapter GETTER = new TextMapExtractAdapter();
 
-  @Override
-  public void forEachKey(PubsubMessage carrier, AgentPropagation.KeyClassifier classifier) {
-    for (Map.Entry<String, String> kv : carrier.getAttributesMap().entrySet()) {
-      String value = kv.getValue();
-      if (null != value) {
-        if (!classifier.accept(kv.getKey(), value)) {
-          return;
+    @Override
+    public void forEachKey(PubsubMessage carrier, AgentPropagation.KeyClassifier classifier) {
+        for (Map.Entry<String, String> kv : carrier.getAttributesMap().entrySet()) {
+            String value = kv.getValue();
+            if (null != value) {
+                if (!classifier.accept(kv.getKey(), value)) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/TextMapInjectAdapter.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/TextMapInjectAdapter.java
index c1c39bc4e77..600fb2a3b97 100644
--- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/TextMapInjectAdapter.java
+++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/TextMapInjectAdapter.java
@@ -7,10 +7,10 @@
 @ParametersAreNonnullByDefault
 public class TextMapInjectAdapter implements CarrierSetter<PubsubMessage.Builder> {
 
-  public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
+    public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
 
-  @Override
-  public void set(final PubsubMessage.Builder msg, final String key, final String value) {
-    msg.putAttributes(key, value);
-  }
+    @Override
+    public void set(final PubsubMessage.Builder msg, final String key, final String value) {
+        msg.putAttributes(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AbstractNativeImageModule.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AbstractNativeImageModule.java
index 344adc59985..e87e0ceccaa 100644
--- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AbstractNativeImageModule.java
+++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AbstractNativeImageModule.java
@@ -5,19 +5,19 @@
 import java.util.Set;
 
 public abstract class AbstractNativeImageModule extends InstrumenterModule {
-  public AbstractNativeImageModule() {
-    super("native-image");
-  }
+    public AbstractNativeImageModule() {
+        super("native-image");
+    }
 
-  @Override
-  public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    // this is a cross product module, and it's always enabled apriori.
-    // The enablement is done at runtime via `isEnabled()`
-    return true;
-  }
+    @Override
+    public boolean isApplicable(Set<TargetSystem> enabledSystems) {
+        // this is a cross product module, and it's always enabled apriori.
+        // The enablement is done at runtime via `isEnabled()`
+        return true;
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Platform.isNativeImageBuilder();
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Platform.isNativeImageBuilder();
+    }
 }
diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AnnotationSubstitutionProcessorInstrumentation.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AnnotationSubstitutionProcessorInstrumentation.java
index a65e1bd1290..32ae4476cc7 100644
--- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AnnotationSubstitutionProcessorInstrumentation.java
+++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AnnotationSubstitutionProcessorInstrumentation.java
@@ -9,34 +9,31 @@
 import net.bytebuddy.asm.Advice;
 
 public final class AnnotationSubstitutionProcessorInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("lookup"))
-            .and(takesArgument(0, named("jdk.vm.ci.meta.ResolvedJavaField"))),
-        "datadog.trace.instrumentation.graal.nativeimage.DeleteFieldAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("findTargetClasses")),
-        AnnotationSubstitutionProcessorInstrumentation.class.getName()
-            + "$FindTargetClassesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("lookup")).and(takesArgument(0, named("jdk.vm.ci.meta.ResolvedJavaField"))),
+                "datadog.trace.instrumentation.graal.nativeimage.DeleteFieldAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("findTargetClasses")),
+                AnnotationSubstitutionProcessorInstrumentation.class.getName() + "$FindTargetClassesAdvice");
+    }
 
-  public static class FindTargetClassesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(@Advice.Return(readOnly = false) List<Class<?>> result) {
-      result.add(Target_com_datadog_profiling_agent_ProcessContext.class);
-      result.add(Target_datadog_jctools_util_UnsafeRefArrayAccess.class);
-      result.add(Target_org_datadog_jmxfetch_App.class);
-      result.add(Target_org_datadog_jmxfetch_Status.class);
-      result.add(Target_org_datadog_jmxfetch_reporter_JsonReporter.class);
+    public static class FindTargetClassesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(@Advice.Return(readOnly = false) List<Class<?>> result) {
+            result.add(Target_com_datadog_profiling_agent_ProcessContext.class);
+            result.add(Target_datadog_jctools_util_UnsafeRefArrayAccess.class);
+            result.add(Target_org_datadog_jmxfetch_App.class);
+            result.add(Target_org_datadog_jmxfetch_Status.class);
+            result.add(Target_org_datadog_jmxfetch_reporter_JsonReporter.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/GraalNativeImageModule.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/GraalNativeImageModule.java
index 087288e4b76..4a9e095c4f2 100644
--- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/GraalNativeImageModule.java
+++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/GraalNativeImageModule.java
@@ -9,38 +9,38 @@
 
 @AutoService(InstrumenterModule.class)
 public class GraalNativeImageModule extends AbstractNativeImageModule {
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".Target_com_datadog_profiling_agent_ProcessContext",
-      packageName + ".Target_datadog_jctools_util_UnsafeRefArrayAccess",
-      packageName + ".Target_org_datadog_jmxfetch_App",
-      packageName + ".Target_org_datadog_jmxfetch_Status",
-      packageName + ".Target_org_datadog_jmxfetch_reporter_JsonReporter"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".Target_com_datadog_profiling_agent_ProcessContext",
+            packageName + ".Target_datadog_jctools_util_UnsafeRefArrayAccess",
+            packageName + ".Target_org_datadog_jmxfetch_App",
+            packageName + ".Target_org_datadog_jmxfetch_Status",
+            packageName + ".Target_org_datadog_jmxfetch_reporter_JsonReporter"
+        };
+    }
 
-  @Override
-  public String[] muzzleIgnoredClassNames() {
-    // JVMCI classes which are part of GraalVM but aren't available in public repositories
-    return new String[] {
-      "jdk.vm.ci.meta.ResolvedJavaType",
-      "jdk.vm.ci.meta.ResolvedJavaField",
-      // ignore helper class names as usual
-      packageName + ".Target_com_datadog_profiling_agent_ProcessContext",
-      packageName + ".Target_datadog_jctools_util_UnsafeRefArrayAccess",
-      packageName + ".Target_org_datadog_jmxfetch_App",
-      packageName + ".Target_org_datadog_jmxfetch_Status",
-      packageName + ".Target_org_datadog_jmxfetch_reporter_JsonReporter",
-    };
-  }
+    @Override
+    public String[] muzzleIgnoredClassNames() {
+        // JVMCI classes which are part of GraalVM but aren't available in public repositories
+        return new String[] {
+            "jdk.vm.ci.meta.ResolvedJavaType",
+            "jdk.vm.ci.meta.ResolvedJavaField",
+            // ignore helper class names as usual
+            packageName + ".Target_com_datadog_profiling_agent_ProcessContext",
+            packageName + ".Target_datadog_jctools_util_UnsafeRefArrayAccess",
+            packageName + ".Target_org_datadog_jmxfetch_App",
+            packageName + ".Target_org_datadog_jmxfetch_Status",
+            packageName + ".Target_org_datadog_jmxfetch_reporter_JsonReporter",
+        };
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(
-        new AnnotationSubstitutionProcessorInstrumentation(),
-        new LinkAtBuildTimeInstrumentation(),
-        new NativeImageGeneratorRunnerInstrumentation(),
-        new ResourcesFeatureInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(
+                new AnnotationSubstitutionProcessorInstrumentation(),
+                new LinkAtBuildTimeInstrumentation(),
+                new NativeImageGeneratorRunnerInstrumentation(),
+                new ResourcesFeatureInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/LinkAtBuildTimeInstrumentation.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/LinkAtBuildTimeInstrumentation.java
index ae88c2993ee..5e71c87ac67 100644
--- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/LinkAtBuildTimeInstrumentation.java
+++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/LinkAtBuildTimeInstrumentation.java
@@ -7,30 +7,28 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import net.bytebuddy.asm.Advice;
 
-public final class LinkAtBuildTimeInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class LinkAtBuildTimeInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.oracle.svm.hosted.LinkAtBuildTimeSupport";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.oracle.svm.hosted.LinkAtBuildTimeSupport";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("linkAtBuildTime")).and(takesArgument(0, Class.class)),
-        LinkAtBuildTimeInstrumentation.class.getName() + "$LinkAtBuildTimeAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("linkAtBuildTime")).and(takesArgument(0, Class.class)),
+                LinkAtBuildTimeInstrumentation.class.getName() + "$LinkAtBuildTimeAdvice");
+    }
 
-  public static class LinkAtBuildTimeAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Argument(0) Class<?> declaringClass,
-        @Advice.Return(readOnly = false) boolean linkAtBuildTime) {
-      // skip AndroidPlatform from build-time linking because we're not building on Android
-      if ("datadog.okhttp3.internal.platform.AndroidPlatform".equals(declaringClass.getName())) {
-        linkAtBuildTime = false;
-      }
+    public static class LinkAtBuildTimeAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Argument(0) Class<?> declaringClass, @Advice.Return(readOnly = false) boolean linkAtBuildTime) {
+            // skip AndroidPlatform from build-time linking because we're not building on Android
+            if ("datadog.okhttp3.internal.platform.AndroidPlatform".equals(declaringClass.getName())) {
+                linkAtBuildTime = false;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java
index c4c47e02233..d25db79f450 100644
--- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java
+++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java
@@ -13,200 +13,196 @@
 import net.bytebuddy.asm.Advice;
 
 public final class NativeImageGeneratorRunnerInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.oracle.svm.hosted.NativeImageGeneratorRunner";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.oracle.svm.hosted.NativeImageGeneratorRunner";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("main")),
-        NativeImageGeneratorRunnerInstrumentation.class.getName() + "$ArgsAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("extractDriverArguments")),
-        NativeImageGeneratorRunnerInstrumentation.class.getName() + "$ExtractedArgsAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("main")),
+                NativeImageGeneratorRunnerInstrumentation.class.getName() + "$ArgsAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("extractDriverArguments")),
+                NativeImageGeneratorRunnerInstrumentation.class.getName() + "$ExtractedArgsAdvice");
+    }
 
-  public static class ArgsAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[] args) {
-      int oldLength = args.length;
+    public static class ArgsAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[] args) {
+            int oldLength = args.length;
 
-      // attempt to extract configured image name, so we can use it for the service name
-      for (int i = 0; i < oldLength; i++) {
-        if (args[i].startsWith("-H:Name=")) {
-          String name = args[i].substring(8);
-          CapturedEnvironment.get().getProperties().put(SERVICE_NAME, name);
-          break;
-        }
-      }
+            // attempt to extract configured image name, so we can use it for the service name
+            for (int i = 0; i < oldLength; i++) {
+                if (args[i].startsWith("-H:Name=")) {
+                    String name = args[i].substring(8);
+                    CapturedEnvironment.get().getProperties().put(SERVICE_NAME, name);
+                    break;
+                }
+            }
 
-      // !!! Important - if you add more args entries here, make sure to update the array copy below
-      args =
-          Arrays.copyOf(
-              args, oldLength + 5 + (InstrumenterConfig.get().isProfilingEnabled() ? 1 : 0));
+            // !!! Important - if you add more args entries here, make sure to update the array copy below
+            args = Arrays.copyOf(args, oldLength + 5 + (InstrumenterConfig.get().isProfilingEnabled() ? 1 : 0));
 
-      args[oldLength++] = "-H:+AddAllCharsets";
-      args[oldLength++] = "-H:EnableURLProtocols=http";
-      // placeholder to trigger resource scanning, ResourcesFeatureInstrumentation does the rest
-      args[oldLength++] = "-H:IncludeResources=.*dd-.*version$";
-      args[oldLength++] =
-          "-H:ReflectionConfigurationResources="
-              + "META-INF/native-image/com.datadoghq/dd-java-agent/reflect-config.json";
-      args[oldLength++] =
-          "-H:ClassInitialization="
-              + "com.datadog.profiling.controller.openjdk.events.AvailableProcessorCoresEvent:build_time,"
-              + "com.datadog.profiling.controller.openjdk.events.DeadlockEvent:build_time,"
-              + "com.datadog.profiling.controller.openjdk.events.ProfilerSettingEvent:build_time,"
-              + "com.datadog.profiling.controller.openjdk.events.EndpointEvent:build_time,"
-              + "com.datadog.profiling.controller.openjdk.events.QueueTimeEvent:build_time,"
-              + "com.datadog.profiling.controller.openjdk.events.TimelineEvent:build_time,"
-              + "com.datadog.profiling.controller.openjdk.events.SmapEntryEvent:build_time,"
-              + "datadog.context.ContextKey:build_time,"
-              + "datadog.context.ContextProviders$ProvidedManager:build_time,"
-              + "datadog.environment.JavaVirtualMachine:rerun,"
-              + "datadog.environment.OperatingSystem:rerun,"
-              + "datadog.environment.OperatingSystem$Architecture:rerun,"
-              + "datadog.trace.agent.tooling.WeakMaps$Adapter:build_time,"
-              + "datadog.trace.api.Config:rerun,"
-              + "datadog.trace.api.Platform:rerun,"
-              + "datadog.trace.api.Platform$Captured:build_time,"
-              + "datadog.trace.api.env.CapturedEnvironment:build_time,"
-              + "datadog.trace.api.env.CapturedEnvironment$ProcessInfo:build_time,"
-              + "datadog.trace.api.ConfigCollector:rerun,"
-              + "datadog.trace.api.ConfigDefaults:build_time,"
-              + "datadog.trace.api.ConfigOrigin:build_time,"
-              + "datadog.trace.api.ConfigSetting:build_time,"
-              + "datadog.trace.api.ProtocolVersion:build_time,"
-              + "datadog.trace.api.config.OtlpConfig$Protocol:build_time,"
-              + "datadog.trace.api.config.OtlpConfig$Temporality:build_time,"
-              + "datadog.trace.api.EventTracker:build_time,"
-              + "datadog.trace.api.InstrumenterConfig:build_time,"
-              + "datadog.trace.api.Functions:build_time,"
-              + "datadog.trace.api.Functions$NewInstance:build_time,"
-              + "datadog.trace.api.GenericClassValue:build_time,"
-              + "datadog.trace.api.GlobalTracer:build_time,"
-              + "datadog.trace.api.GlobalTracer$1:build_time,"
-              + "datadog.trace.api.IdGenerationStrategy:build_time,"
-              + "datadog.trace.api.MethodFilterConfigParser:build_time,"
-              + "datadog.trace.api.WithGlobalTracer:build_time,"
-              + "datadog.trace.api.ProductActivation:build_time,"
-              + "datadog.trace.api.PropagationStyle:build_time,"
-              + "datadog.trace.api.ResolverCacheConfig$1:build_time,"
-              + "datadog.trace.api.ResolverCacheConfig$2:build_time,"
-              + "datadog.trace.api.ResolverCacheConfig$3:build_time,"
-              + "datadog.trace.api.ResolverCacheConfig$4:build_time,"
-              + "datadog.trace.api.ResolverCacheConfig$5:build_time,"
-              + "datadog.trace.api.TracePropagationStyle:build_time,"
-              + "datadog.trace.api.TracePropagationBehaviorExtract:build_time,"
-              + "datadog.trace.api.telemetry.ConfigInversionMetricCollectorProvider:rerun,"
-              + "datadog.trace.api.telemetry.ConfigInversionMetricCollectorImpl:build_time,"
-              + "datadog.trace.api.telemetry.ConfigInversionMetricCollectorImpl$ConfigInversionMetric:build_time,"
-              + "datadog.trace.api.telemetry.NoOpConfigInversionMetricCollector:build_time,"
-              + "datadog.trace.api.telemetry.OtelEnvMetricCollectorImpl:build_time,"
-              + "datadog.trace.api.telemetry.OtelSpiCollector:build_time,"
-              + "datadog.trace.api.profiling.ProfilingEnablement:build_time,"
-              + "datadog.trace.bootstrap.config.provider.ConfigConverter:build_time,"
-              + "datadog.trace.bootstrap.config.provider.ConfigConverter$ValueOfLookup:build_time,"
-              + "datadog.trace.bootstrap.config.provider.ConfigProvider:build_time,"
-              + "datadog.trace.bootstrap.config.provider.ConfigProvider$Singleton:build_time,"
-              + "datadog.trace.bootstrap.config.provider.CapturedEnvironmentConfigSource:build_time,"
-              + "datadog.trace.bootstrap.config.provider.EnvironmentConfigSource:build_time,"
-              + "datadog.trace.bootstrap.config.provider.OtelEnvironmentConfigSource:build_time,"
-              + "datadog.trace.bootstrap.config.provider.SystemPropertiesConfigSource:build_time,"
-              + "datadog.trace.bootstrap.config.provider.StableConfigSource:build_time,"
-              + "datadog.trace.bootstrap.config.provider.StableConfigSource$StableConfig:build_time,"
-              + "datadog.trace.bootstrap.Agent:build_time,"
-              + "datadog.trace.bootstrap.BootstrapProxy:build_time,"
-              + "datadog.trace.bootstrap.CallDepthThreadLocalMap:build_time,"
-              + "datadog.trace.bootstrap.CallDepthThreadLocalMap$ThreadLocalDepth:build_time,"
-              + "datadog.trace.bootstrap.ContextStore$Factory:build_time,"
-              + "datadog.trace.bootstrap.DatadogClassLoader:build_time,"
-              + "datadog.trace.bootstrap.InstrumentationClassLoader:build_time,"
-              + "datadog.trace.bootstrap.FieldBackedContextStores:build_time,"
-              + "datadog.trace.bootstrap.FieldBackedContextStore:build_time,"
-              + "datadog.trace.bootstrap.benchmark.StaticEventLogger:build_time,"
-              + "datadog.trace.bootstrap.blocking.BlockingExceptionHandler:build_time,"
-              + "datadog.trace.bootstrap.InstrumentationErrors:build_time,"
-              + "datadog.trace.bootstrap.instrumentation.api.AgentTracer$LegacyContextManager:build_time,"
-              + "datadog.trace.bootstrap.instrumentation.api.InternalContextKeys:build_time,"
-              + "datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions$CompletableAsyncResultExtension:build_time,"
-              + "datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions$1:build_time,"
-              + "datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions:build_time,"
-              + "datadog.trace.bootstrap.instrumentation.java.concurrent.ConcurrentState:build_time,"
-              + "datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter:build_time,"
-              + "datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter$ExcludeType:build_time,"
-              + "datadog.trace.bootstrap.instrumentation.java.concurrent.QueueTimerHelper:build_time,"
-              + "datadog.trace.bootstrap.instrumentation.java.concurrent.QueueTimerHelper$RateLimiterHolder:run_time,"
-              + "datadog.trace.bootstrap.instrumentation.java.concurrent.TPEHelper:build_time,"
-              + "datadog.trace.bootstrap.instrumentation.java.module.JpmsHelper:build_time,"
-              + "datadog.trace.bootstrap.instrumentation.jfr.exceptions.ExceptionCountEvent:build_time,"
-              + "datadog.trace.bootstrap.instrumentation.jfr.exceptions.ExceptionSampleEvent:build_time,"
-              + "datadog.trace.bootstrap.instrumentation.jfr.backpressure.BackpressureSampleEvent:build_time,"
-              + "datadog.trace.bootstrap.instrumentation.jfr.directallocation.DirectAllocationTotalEvent:build_time,"
-              + "datadog.trace.bootstrap.WeakMapPerStore:build_time,"
-              + "datadog.trace.config.inversion.ConfigHelper:rerun,"
-              + "datadog.trace.config.inversion.ConfigHelper$StrictnessPolicy:rerun,"
-              + "datadog.trace.config.inversion.GeneratedSupportedConfigurations:build_time,"
-              + "datadog.trace.config.inversion.SupportedConfiguration:build_time,"
-              + "datadog.trace.instrumentation.guava10.GuavaAsyncResultExtension:build_time,"
-              + "datadog.trace.instrumentation.reactivestreams.ReactiveStreamsAsyncResultExtension:build_time,"
-              + "datadog.trace.instrumentation.reactor.core.ReactorAsyncResultExtension:build_time,"
-              + "datadog.trace.instrumentation.rxjava2.RxJavaAsyncResultExtension:build_time,"
-              + "datadog.trace.instrumentation.rxjava3.RxJavaAsyncResultExtension:build_time,"
-              + "datadog.trace.logging.ddlogger.DDLogger:build_time,"
-              + "datadog.trace.logging.ddlogger.DDLoggerFactory:build_time,"
-              + "datadog.trace.logging.ddlogger.DDLoggerFactory$HelperWrapper:build_time,"
-              + "datadog.trace.logging.LoggingSettingsDescription:build_time,"
-              + "datadog.trace.logging.simplelogger.SLCompatFactory:build_time,"
-              + "datadog.trace.logging.simplelogger.SLCompatHelper:build_time,"
-              + "datadog.trace.logging.simplelogger.SLCompatSettings:build_time,"
-              + "datadog.trace.logging.simplelogger.SLCompatSettings$NewDTFormatter:build_time,"
-              + "datadog.trace.logging.LogLevel:build_time,"
-              + "datadog.trace.logging.LogReporter:build_time,"
-              + "datadog.trace.logging.PrintStreamWrapper:build_time,"
-              + "datadog.trace.util.CollectionUtils:build_time,"
-              + "datadog.trace.util.TempLocationManager$SingletonHolder:run_time,"
-              + "datadog.slf4j.helpers.NOPLoggerFactory:build_time,"
-              + "datadog.slf4j.helpers.SubstituteLoggerFactory:build_time,"
-              + "datadog.slf4j.impl.StaticLoggerBinder:build_time,"
-              + "datadog.slf4j.LoggerFactory:build_time,"
-              + "datadog.instrument.fieldinject.GlobalObjectStore:build_time,"
-              + "datadog.instrument.fieldinject.GlobalObjectStore$LookupKey:build_time,"
-              + "com.blogspot.mydailyjava.weaklockfree.WeakConcurrentMap:build_time,"
-              + "com.blogspot.mydailyjava.weaklockfree.WeakConcurrentMap$1:build_time,"
-              + "net.bytebuddy:build_time,"
-              + "com.sun.proxy:build_time,"
-              + "jnr.enxio.channels:run_time,"
-              + "jnr.unixsocket:run_time";
-      if (InstrumenterConfig.get().isProfilingEnabled()) {
-        // Specific GraalVM versions have different flags for enabling JFR
-        // We don't want to drag in internal-api via Platform class, so we just read the system
-        // property directly
-        String version = SystemProperties.getOrDefault("java.specification.version", "");
-        if (version.startsWith("17")) {
-          args[oldLength++] = "-H:EnableMonitoringFeatures=jfr";
-        } else {
-          args[oldLength++] = "-H:EnableMonitoringFeatures@user+api=jfr";
+            args[oldLength++] = "-H:+AddAllCharsets";
+            args[oldLength++] = "-H:EnableURLProtocols=http";
+            // placeholder to trigger resource scanning, ResourcesFeatureInstrumentation does the rest
+            args[oldLength++] = "-H:IncludeResources=.*dd-.*version$";
+            args[oldLength++] = "-H:ReflectionConfigurationResources="
+                    + "META-INF/native-image/com.datadoghq/dd-java-agent/reflect-config.json";
+            args[oldLength++] = "-H:ClassInitialization="
+                    + "com.datadog.profiling.controller.openjdk.events.AvailableProcessorCoresEvent:build_time,"
+                    + "com.datadog.profiling.controller.openjdk.events.DeadlockEvent:build_time,"
+                    + "com.datadog.profiling.controller.openjdk.events.ProfilerSettingEvent:build_time,"
+                    + "com.datadog.profiling.controller.openjdk.events.EndpointEvent:build_time,"
+                    + "com.datadog.profiling.controller.openjdk.events.QueueTimeEvent:build_time,"
+                    + "com.datadog.profiling.controller.openjdk.events.TimelineEvent:build_time,"
+                    + "com.datadog.profiling.controller.openjdk.events.SmapEntryEvent:build_time,"
+                    + "datadog.context.ContextKey:build_time,"
+                    + "datadog.context.ContextProviders$ProvidedManager:build_time,"
+                    + "datadog.environment.JavaVirtualMachine:rerun,"
+                    + "datadog.environment.OperatingSystem:rerun,"
+                    + "datadog.environment.OperatingSystem$Architecture:rerun,"
+                    + "datadog.trace.agent.tooling.WeakMaps$Adapter:build_time,"
+                    + "datadog.trace.api.Config:rerun,"
+                    + "datadog.trace.api.Platform:rerun,"
+                    + "datadog.trace.api.Platform$Captured:build_time,"
+                    + "datadog.trace.api.env.CapturedEnvironment:build_time,"
+                    + "datadog.trace.api.env.CapturedEnvironment$ProcessInfo:build_time,"
+                    + "datadog.trace.api.ConfigCollector:rerun,"
+                    + "datadog.trace.api.ConfigDefaults:build_time,"
+                    + "datadog.trace.api.ConfigOrigin:build_time,"
+                    + "datadog.trace.api.ConfigSetting:build_time,"
+                    + "datadog.trace.api.ProtocolVersion:build_time,"
+                    + "datadog.trace.api.config.OtlpConfig$Protocol:build_time,"
+                    + "datadog.trace.api.config.OtlpConfig$Temporality:build_time,"
+                    + "datadog.trace.api.EventTracker:build_time,"
+                    + "datadog.trace.api.InstrumenterConfig:build_time,"
+                    + "datadog.trace.api.Functions:build_time,"
+                    + "datadog.trace.api.Functions$NewInstance:build_time,"
+                    + "datadog.trace.api.GenericClassValue:build_time,"
+                    + "datadog.trace.api.GlobalTracer:build_time,"
+                    + "datadog.trace.api.GlobalTracer$1:build_time,"
+                    + "datadog.trace.api.IdGenerationStrategy:build_time,"
+                    + "datadog.trace.api.MethodFilterConfigParser:build_time,"
+                    + "datadog.trace.api.WithGlobalTracer:build_time,"
+                    + "datadog.trace.api.ProductActivation:build_time,"
+                    + "datadog.trace.api.PropagationStyle:build_time,"
+                    + "datadog.trace.api.ResolverCacheConfig$1:build_time,"
+                    + "datadog.trace.api.ResolverCacheConfig$2:build_time,"
+                    + "datadog.trace.api.ResolverCacheConfig$3:build_time,"
+                    + "datadog.trace.api.ResolverCacheConfig$4:build_time,"
+                    + "datadog.trace.api.ResolverCacheConfig$5:build_time,"
+                    + "datadog.trace.api.TracePropagationStyle:build_time,"
+                    + "datadog.trace.api.TracePropagationBehaviorExtract:build_time,"
+                    + "datadog.trace.api.telemetry.ConfigInversionMetricCollectorProvider:rerun,"
+                    + "datadog.trace.api.telemetry.ConfigInversionMetricCollectorImpl:build_time,"
+                    + "datadog.trace.api.telemetry.ConfigInversionMetricCollectorImpl$ConfigInversionMetric:build_time,"
+                    + "datadog.trace.api.telemetry.NoOpConfigInversionMetricCollector:build_time,"
+                    + "datadog.trace.api.telemetry.OtelEnvMetricCollectorImpl:build_time,"
+                    + "datadog.trace.api.telemetry.OtelSpiCollector:build_time,"
+                    + "datadog.trace.api.profiling.ProfilingEnablement:build_time,"
+                    + "datadog.trace.bootstrap.config.provider.ConfigConverter:build_time,"
+                    + "datadog.trace.bootstrap.config.provider.ConfigConverter$ValueOfLookup:build_time,"
+                    + "datadog.trace.bootstrap.config.provider.ConfigProvider:build_time,"
+                    + "datadog.trace.bootstrap.config.provider.ConfigProvider$Singleton:build_time,"
+                    + "datadog.trace.bootstrap.config.provider.CapturedEnvironmentConfigSource:build_time,"
+                    + "datadog.trace.bootstrap.config.provider.EnvironmentConfigSource:build_time,"
+                    + "datadog.trace.bootstrap.config.provider.OtelEnvironmentConfigSource:build_time,"
+                    + "datadog.trace.bootstrap.config.provider.SystemPropertiesConfigSource:build_time,"
+                    + "datadog.trace.bootstrap.config.provider.StableConfigSource:build_time,"
+                    + "datadog.trace.bootstrap.config.provider.StableConfigSource$StableConfig:build_time,"
+                    + "datadog.trace.bootstrap.Agent:build_time,"
+                    + "datadog.trace.bootstrap.BootstrapProxy:build_time,"
+                    + "datadog.trace.bootstrap.CallDepthThreadLocalMap:build_time,"
+                    + "datadog.trace.bootstrap.CallDepthThreadLocalMap$ThreadLocalDepth:build_time,"
+                    + "datadog.trace.bootstrap.ContextStore$Factory:build_time,"
+                    + "datadog.trace.bootstrap.DatadogClassLoader:build_time,"
+                    + "datadog.trace.bootstrap.InstrumentationClassLoader:build_time,"
+                    + "datadog.trace.bootstrap.FieldBackedContextStores:build_time,"
+                    + "datadog.trace.bootstrap.FieldBackedContextStore:build_time,"
+                    + "datadog.trace.bootstrap.benchmark.StaticEventLogger:build_time,"
+                    + "datadog.trace.bootstrap.blocking.BlockingExceptionHandler:build_time,"
+                    + "datadog.trace.bootstrap.InstrumentationErrors:build_time,"
+                    + "datadog.trace.bootstrap.instrumentation.api.AgentTracer$LegacyContextManager:build_time,"
+                    + "datadog.trace.bootstrap.instrumentation.api.InternalContextKeys:build_time,"
+                    + "datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions$CompletableAsyncResultExtension:build_time,"
+                    + "datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions$1:build_time,"
+                    + "datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions:build_time,"
+                    + "datadog.trace.bootstrap.instrumentation.java.concurrent.ConcurrentState:build_time,"
+                    + "datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter:build_time,"
+                    + "datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter$ExcludeType:build_time,"
+                    + "datadog.trace.bootstrap.instrumentation.java.concurrent.QueueTimerHelper:build_time,"
+                    + "datadog.trace.bootstrap.instrumentation.java.concurrent.QueueTimerHelper$RateLimiterHolder:run_time,"
+                    + "datadog.trace.bootstrap.instrumentation.java.concurrent.TPEHelper:build_time,"
+                    + "datadog.trace.bootstrap.instrumentation.java.module.JpmsHelper:build_time,"
+                    + "datadog.trace.bootstrap.instrumentation.jfr.exceptions.ExceptionCountEvent:build_time,"
+                    + "datadog.trace.bootstrap.instrumentation.jfr.exceptions.ExceptionSampleEvent:build_time,"
+                    + "datadog.trace.bootstrap.instrumentation.jfr.backpressure.BackpressureSampleEvent:build_time,"
+                    + "datadog.trace.bootstrap.instrumentation.jfr.directallocation.DirectAllocationTotalEvent:build_time,"
+                    + "datadog.trace.bootstrap.WeakMapPerStore:build_time,"
+                    + "datadog.trace.config.inversion.ConfigHelper:rerun,"
+                    + "datadog.trace.config.inversion.ConfigHelper$StrictnessPolicy:rerun,"
+                    + "datadog.trace.config.inversion.GeneratedSupportedConfigurations:build_time,"
+                    + "datadog.trace.config.inversion.SupportedConfiguration:build_time,"
+                    + "datadog.trace.instrumentation.guava10.GuavaAsyncResultExtension:build_time,"
+                    + "datadog.trace.instrumentation.reactivestreams.ReactiveStreamsAsyncResultExtension:build_time,"
+                    + "datadog.trace.instrumentation.reactor.core.ReactorAsyncResultExtension:build_time,"
+                    + "datadog.trace.instrumentation.rxjava2.RxJavaAsyncResultExtension:build_time,"
+                    + "datadog.trace.instrumentation.rxjava3.RxJavaAsyncResultExtension:build_time,"
+                    + "datadog.trace.logging.ddlogger.DDLogger:build_time,"
+                    + "datadog.trace.logging.ddlogger.DDLoggerFactory:build_time,"
+                    + "datadog.trace.logging.ddlogger.DDLoggerFactory$HelperWrapper:build_time,"
+                    + "datadog.trace.logging.LoggingSettingsDescription:build_time,"
+                    + "datadog.trace.logging.simplelogger.SLCompatFactory:build_time,"
+                    + "datadog.trace.logging.simplelogger.SLCompatHelper:build_time,"
+                    + "datadog.trace.logging.simplelogger.SLCompatSettings:build_time,"
+                    + "datadog.trace.logging.simplelogger.SLCompatSettings$NewDTFormatter:build_time,"
+                    + "datadog.trace.logging.LogLevel:build_time,"
+                    + "datadog.trace.logging.LogReporter:build_time,"
+                    + "datadog.trace.logging.PrintStreamWrapper:build_time,"
+                    + "datadog.trace.util.CollectionUtils:build_time,"
+                    + "datadog.trace.util.TempLocationManager$SingletonHolder:run_time,"
+                    + "datadog.slf4j.helpers.NOPLoggerFactory:build_time,"
+                    + "datadog.slf4j.helpers.SubstituteLoggerFactory:build_time,"
+                    + "datadog.slf4j.impl.StaticLoggerBinder:build_time,"
+                    + "datadog.slf4j.LoggerFactory:build_time,"
+                    + "datadog.instrument.fieldinject.GlobalObjectStore:build_time,"
+                    + "datadog.instrument.fieldinject.GlobalObjectStore$LookupKey:build_time,"
+                    + "com.blogspot.mydailyjava.weaklockfree.WeakConcurrentMap:build_time,"
+                    + "com.blogspot.mydailyjava.weaklockfree.WeakConcurrentMap$1:build_time,"
+                    + "net.bytebuddy:build_time,"
+                    + "com.sun.proxy:build_time,"
+                    + "jnr.enxio.channels:run_time,"
+                    + "jnr.unixsocket:run_time";
+            if (InstrumenterConfig.get().isProfilingEnabled()) {
+                // Specific GraalVM versions have different flags for enabling JFR
+                // We don't want to drag in internal-api via Platform class, so we just read the system
+                // property directly
+                String version = SystemProperties.getOrDefault("java.specification.version", "");
+                if (version.startsWith("17")) {
+                    args[oldLength++] = "-H:EnableMonitoringFeatures=jfr";
+                } else {
+                    args[oldLength++] = "-H:EnableMonitoringFeatures@user+api=jfr";
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class ExtractedArgsAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(@Advice.Return List<String> expandedArgs) {
-      // GraalVM 22.x supports arg files, so repeat image name check after expansion
-      for (int i = 0; i < expandedArgs.size(); i++) {
-        if (expandedArgs.get(i).startsWith("-H:Name=")) {
-          String name = expandedArgs.get(i).substring(8);
-          CapturedEnvironment.get().getProperties().put(SERVICE_NAME, name);
-          break;
+    public static class ExtractedArgsAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(@Advice.Return List<String> expandedArgs) {
+            // GraalVM 22.x supports arg files, so repeat image name check after expansion
+            for (int i = 0; i < expandedArgs.size(); i++) {
+                if (expandedArgs.get(i).startsWith("-H:Name=")) {
+                    String name = expandedArgs.get(i).substring(8);
+                    CapturedEnvironment.get().getProperties().put(SERVICE_NAME, name);
+                    break;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java
index bdc78bed041..2f9f39ba925 100644
--- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java
+++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java
@@ -12,74 +12,73 @@
 import java.util.List;
 import net.bytebuddy.asm.Advice;
 
-public final class ResourcesFeatureInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class ResourcesFeatureInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.oracle.svm.hosted.ResourcesFeature";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.oracle.svm.hosted.ResourcesFeature";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("beforeAnalysis")),
-        ResourcesFeatureInstrumentation.class.getName() + "$InjectResourcesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("beforeAnalysis")),
+                ResourcesFeatureInstrumentation.class.getName() + "$InjectResourcesAdvice");
+    }
 
-  public static class InjectResourcesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit() {
-      // the tracer jar is not listed on the image classpath, so manually inject its resources
-      // (drop trace/shared prefixes from embedded resources, so we can find them in native-image
-      // as the final executable won't have our isolating class-loader to map these resources)
+    public static class InjectResourcesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit() {
+            // the tracer jar is not listed on the image classpath, so manually inject its resources
+            // (drop trace/shared prefixes from embedded resources, so we can find them in native-image
+            // as the final executable won't have our isolating class-loader to map these resources)
 
-      List<String> tracerResources = new ArrayList<>();
-      tracerResources.add("dd-java-agent.version");
-      tracerResources.add("dd-trace-api.version");
-      tracerResources.add("trace/dd-trace-core.version");
-      tracerResources.add("shared/dogstatsd/version.properties");
-      tracerResources.add("shared/version-utils.version");
-      tracerResources.add("shared/datadog/okhttp3/internal/publicsuffix/publicsuffixes.gz");
-      tracerResources.add("profiling/jfr/dd.jfp");
-      tracerResources.add("profiling/jfr/safepoints.jfp");
-      tracerResources.add("profiling/jfr/overrides/comprehensive.jfp");
-      tracerResources.add("profiling/jfr/overrides/minimal.jfp");
+            List<String> tracerResources = new ArrayList<>();
+            tracerResources.add("dd-java-agent.version");
+            tracerResources.add("dd-trace-api.version");
+            tracerResources.add("trace/dd-trace-core.version");
+            tracerResources.add("shared/dogstatsd/version.properties");
+            tracerResources.add("shared/version-utils.version");
+            tracerResources.add("shared/datadog/okhttp3/internal/publicsuffix/publicsuffixes.gz");
+            tracerResources.add("profiling/jfr/dd.jfp");
+            tracerResources.add("profiling/jfr/safepoints.jfp");
+            tracerResources.add("profiling/jfr/overrides/comprehensive.jfp");
+            tracerResources.add("profiling/jfr/overrides/minimal.jfp");
 
-      // jmxfetch configs
-      tracerResources.add("jmxfetch/project.properties");
-      tracerResources.add("jmxfetch/org/datadog/jmxfetch/default-jmx-metrics.yaml");
-      tracerResources.add("jmxfetch/org/datadog/jmxfetch/new-gc-default-jmx-metrics.yaml");
-      tracerResources.add("jmxfetch/org/datadog/jmxfetch/old-gc-default-jmx-metrics.yaml");
+            // jmxfetch configs
+            tracerResources.add("jmxfetch/project.properties");
+            tracerResources.add("jmxfetch/org/datadog/jmxfetch/default-jmx-metrics.yaml");
+            tracerResources.add("jmxfetch/org/datadog/jmxfetch/new-gc-default-jmx-metrics.yaml");
+            tracerResources.add("jmxfetch/org/datadog/jmxfetch/old-gc-default-jmx-metrics.yaml");
 
-      // tracer's jmxfetch configs
-      tracerResources.add("jmxfetch/jmxfetch-config.yaml");
-      tracerResources.add("jmxfetch/jmxfetch-config-no-jvm-defaults.yaml");
-      tracerResources.add("jmxfetch/jmxfetch-websphere-config.yaml");
+            // tracer's jmxfetch configs
+            tracerResources.add("jmxfetch/jmxfetch-config.yaml");
+            tracerResources.add("jmxfetch/jmxfetch-config-no-jvm-defaults.yaml");
+            tracerResources.add("jmxfetch/jmxfetch-websphere-config.yaml");
 
-      // jmxfetch integrations metricconfigs
-      String metricConfigsPath = "jmxfetch/datadog/trace/agent/jmxfetch/";
-      String metricConfigs = metricConfigsPath + "metricconfigs.txt";
-      tracerResources.add(metricConfigs);
-      try (InputStream is = ClassLoader.getSystemResourceAsStream(metricConfigs);
-          BufferedReader reader = new BufferedReader(new InputStreamReader(is))) {
-        String metricConfig;
-        while ((metricConfig = reader.readLine()) != null) {
-          if (!metricConfig.trim().isEmpty()) {
-            tracerResources.add(metricConfigsPath + "metricconfigs/" + metricConfig);
-          }
-        }
-      } catch (Throwable ignore) {
-      }
+            // jmxfetch integrations metricconfigs
+            String metricConfigsPath = "jmxfetch/datadog/trace/agent/jmxfetch/";
+            String metricConfigs = metricConfigsPath + "metricconfigs.txt";
+            tracerResources.add(metricConfigs);
+            try (InputStream is = ClassLoader.getSystemResourceAsStream(metricConfigs);
+                    BufferedReader reader = new BufferedReader(new InputStreamReader(is))) {
+                String metricConfig;
+                while ((metricConfig = reader.readLine()) != null) {
+                    if (!metricConfig.trim().isEmpty()) {
+                        tracerResources.add(metricConfigsPath + "metricconfigs/" + metricConfig);
+                    }
+                }
+            } catch (Throwable ignore) {
+            }
 
-      // registering tracer resources to include in the native build
-      for (String original : tracerResources) {
-        String flattened = original.substring(original.indexOf('/') + 1);
-        try (InputStream is = ClassLoader.getSystemResourceAsStream(original)) {
-          Resources.registerResource(flattened, is);
-        } catch (Throwable ignore) {
+            // registering tracer resources to include in the native build
+            for (String original : tracerResources) {
+                String flattened = original.substring(original.indexOf('/') + 1);
+                try (InputStream is = ClassLoader.getSystemResourceAsStream(original)) {
+                    Resources.registerResource(flattened, is);
+                } catch (Throwable ignore) {
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_com_datadog_profiling_agent_ProcessContext.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_com_datadog_profiling_agent_ProcessContext.java
index b44fa781ea2..fcee3eda0ea 100644
--- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_com_datadog_profiling_agent_ProcessContext.java
+++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_com_datadog_profiling_agent_ProcessContext.java
@@ -6,11 +6,11 @@
 
 @TargetClass(className = "com.datadog.profiling.agent.ProcessContext")
 public final class Target_com_datadog_profiling_agent_ProcessContext {
-  @Substitute
-  public static void register(ConfigProvider configProvider) {
-    // This method references com.datadoghq.profiler.OTelContext which is not available
-    // during native image build. OTelContext is part of the ddprof native library that's
-    // loaded at runtime. For native image builds, profiling context registration is disabled.
-    // No-op during native image build.
-  }
+    @Substitute
+    public static void register(ConfigProvider configProvider) {
+        // This method references com.datadoghq.profiler.OTelContext which is not available
+        // during native image build. OTelContext is part of the ddprof native library that's
+        // loaded at runtime. For native image builds, profiling context registration is disabled.
+        // No-op during native image build.
+    }
 }
diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_datadog_jctools_util_UnsafeRefArrayAccess.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_datadog_jctools_util_UnsafeRefArrayAccess.java
index e00ce7b1387..eeac69e95b5 100644
--- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_datadog_jctools_util_UnsafeRefArrayAccess.java
+++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_datadog_jctools_util_UnsafeRefArrayAccess.java
@@ -6,7 +6,7 @@
 
 @TargetClass(className = "datadog.jctools.util.UnsafeRefArrayAccess")
 public final class Target_datadog_jctools_util_UnsafeRefArrayAccess {
-  @Alias
-  @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.ArrayIndexShift, declClass = Object[].class)
-  public static int REF_ELEMENT_SHIFT;
+    @Alias
+    @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.ArrayIndexShift, declClass = Object[].class)
+    public static int REF_ELEMENT_SHIFT;
 }
diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_App.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_App.java
index 0106ca1de1b..e47adbd234c 100644
--- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_App.java
+++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_App.java
@@ -5,13 +5,13 @@
 
 @TargetClass(className = "org.datadog.jmxfetch.App")
 public final class Target_org_datadog_jmxfetch_App {
-  @Substitute
-  private boolean getJsonConfigs() {
-    // This method has a reference to the excluded transitive dependency jackson-jr-objects.
-    // GraalVM Native detects it during the reachability analysis and results in
-    // "Discovered unresolved method during parsing:
-    // org.datadog.jmxfetch.App.<init>(org.datadog.jmxfetch.AppConfig)."
-    // because of the missing classes that belong to the excluded dependencies.
-    throw new IllegalStateException("Unreachable");
-  }
+    @Substitute
+    private boolean getJsonConfigs() {
+        // This method has a reference to the excluded transitive dependency jackson-jr-objects.
+        // GraalVM Native detects it during the reachability analysis and results in
+        // "Discovered unresolved method during parsing:
+        // org.datadog.jmxfetch.App.<init>(org.datadog.jmxfetch.AppConfig)."
+        // because of the missing classes that belong to the excluded dependencies.
+        throw new IllegalStateException("Unreachable");
+    }
 }
diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_Status.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_Status.java
index 395f3a34983..e3c8a960c70 100644
--- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_Status.java
+++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_Status.java
@@ -6,12 +6,12 @@
 
 @TargetClass(className = "org.datadog.jmxfetch.Status")
 public final class Target_org_datadog_jmxfetch_Status {
-  @Substitute
-  private String generateJson() throws IOException {
-    // This method has a reference to the excluded transitive dependency jackson-jr-objects.
-    // GraalVM Native detects it during the reachability analysis and results in
-    // "Discovered unresolved type during parsing: com.fasterxml.jackson.jr.ob.JSON."
-    // because of the missing classes that belong to the excluded dependencies.
-    throw new IllegalStateException("Unreachable");
-  }
+    @Substitute
+    private String generateJson() throws IOException {
+        // This method has a reference to the excluded transitive dependency jackson-jr-objects.
+        // GraalVM Native detects it during the reachability analysis and results in
+        // "Discovered unresolved type during parsing: com.fasterxml.jackson.jr.ob.JSON."
+        // because of the missing classes that belong to the excluded dependencies.
+        throw new IllegalStateException("Unreachable");
+    }
 }
diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_reporter_JsonReporter.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_reporter_JsonReporter.java
index 8ff63ca180f..defbe41e237 100644
--- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_reporter_JsonReporter.java
+++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_reporter_JsonReporter.java
@@ -5,13 +5,12 @@
 
 @TargetClass(className = "org.datadog.jmxfetch.reporter.JsonReporter")
 public final class Target_org_datadog_jmxfetch_reporter_JsonReporter {
-  @Substitute
-  public void doSendServiceCheck(
-      String serviceCheckName, String status, String message, String[] tags) {
-    // This method has a reference to the excluded transitive dependency jackson-jr-objects.
-    // GraalVM Native detects it during the reachability analysis and results in
-    // "Discovered unresolved type during parsing: com.fasterxml.jackson.jr.ob.JSON."
-    // because of the missing classes that belong to the excluded dependencies.
-    throw new IllegalStateException("Unreachable");
-  }
+    @Substitute
+    public void doSendServiceCheck(String serviceCheckName, String status, String message, String[] tags) {
+        // This method has a reference to the excluded transitive dependency jackson-jr-objects.
+        // GraalVM Native detects it during the reachability analysis and results in
+        // "Discovered unresolved type during parsing: com.fasterxml.jackson.jr.ob.JSON."
+        // because of the missing classes that belong to the excluded dependencies.
+        throw new IllegalStateException("Unreachable");
+    }
 }
diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeModule.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeModule.java
index 56465905ab0..0006d3a4fc5 100644
--- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeModule.java
+++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeModule.java
@@ -22,48 +22,47 @@
 
 @AutoService(InstrumenterModule.class)
 public final class VMRuntimeModule extends AbstractNativeImageModule
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
-  @Override
-  public String instrumentedType() {
-    return "org.graalvm.nativeimage.VMRuntime";
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
+    @Override
+    public String instrumentedType() {
+        return "org.graalvm.nativeimage.VMRuntime";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("initialize")), VMRuntimeModule.class.getName() + "$InitializeAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("initialize")), VMRuntimeModule.class.getName() + "$InitializeAdvice");
+    }
 
-  @Override
-  public boolean injectHelperDependencies() {
-    return true;
-  }
+    @Override
+    public boolean injectHelperDependencies() {
+        return true;
+    }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    return singletonMap(
-        RUNNABLE, singletonList("com.oracle.svm.core.thread.VMOperationControl$VMOperationThread"));
-  }
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        return singletonMap(RUNNABLE, singletonList("com.oracle.svm.core.thread.VMOperationControl$VMOperationThread"));
+    }
 
-  public static class InitializeAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter() {
-      if (Config.get().isDebugEnabled()) {
-        // was this native image originally built with debug off?
-        Logger configLogger = LoggerFactory.getLogger(Config.class);
-        if (!configLogger.isDebugEnabled()) {
-          // patch logger level and re-log configuration details
-          GlobalLogLevelSwitcher.get().switchLevel(LogLevel.DEBUG);
-          configLogger.debug("New instance: {}", Config.get());
-        }
-      } else {
-        String logLevel = Config.get().getLogLevel();
-        if (null != logLevel) {
-          GlobalLogLevelSwitcher.get().switchLevel(LogLevel.fromString(logLevel));
-        }
-      }
+    public static class InitializeAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter() {
+            if (Config.get().isDebugEnabled()) {
+                // was this native image originally built with debug off?
+                Logger configLogger = LoggerFactory.getLogger(Config.class);
+                if (!configLogger.isDebugEnabled()) {
+                    // patch logger level and re-log configuration details
+                    GlobalLogLevelSwitcher.get().switchLevel(LogLevel.DEBUG);
+                    configLogger.debug("New instance: {}", Config.get());
+                }
+            } else {
+                String logLevel = Config.get().getLogLevel();
+                if (null != logLevel) {
+                    GlobalLogLevelSwitcher.get().switchLevel(LogLevel.fromString(logLevel));
+                }
+            }
 
-      datadog.trace.agent.tooling.nativeimage.TracerActivation.activate();
+            datadog.trace.agent.tooling.nativeimage.TracerActivation.activate();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java11/datadog/trace/instrumentation/graal/nativeimage/DeleteFieldAdvice.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java11/datadog/trace/instrumentation/graal/nativeimage/DeleteFieldAdvice.java
index 87d03a4b33f..2bc2bcaf1df 100644
--- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java11/datadog/trace/instrumentation/graal/nativeimage/DeleteFieldAdvice.java
+++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java11/datadog/trace/instrumentation/graal/nativeimage/DeleteFieldAdvice.java
@@ -6,14 +6,14 @@
 import net.bytebuddy.asm.Advice;
 
 public class DeleteFieldAdvice {
-  @Advice.OnMethodExit
-  public static void onExit(
-      @Advice.Argument(0) ResolvedJavaField field,
-      @Advice.Return(readOnly = false) ResolvedJavaField result,
-      @Advice.FieldValue("SUBSTITUTION_DELETE") Delete SUBSTITUTION_DELETE) {
-    if ("datadog.trace.bootstrap.DatadogClassLoader"
-        .equals(field.getDeclaringClass().toClassName())) {
-      result = new AnnotatedField(field, SUBSTITUTION_DELETE);
+    @Advice.OnMethodExit
+    public static void onExit(
+            @Advice.Argument(0) ResolvedJavaField field,
+            @Advice.Return(readOnly = false) ResolvedJavaField result,
+            @Advice.FieldValue("SUBSTITUTION_DELETE") Delete SUBSTITUTION_DELETE) {
+        if ("datadog.trace.bootstrap.DatadogClassLoader"
+                .equals(field.getDeclaringClass().toClassName())) {
+            result = new AnnotatedField(field, SUBSTITUTION_DELETE);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/AbstractJUnitTestClassProcessorInstrumentation.java b/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/AbstractJUnitTestClassProcessorInstrumentation.java
index 406e845cd29..ba7873e01c4 100644
--- a/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/AbstractJUnitTestClassProcessorInstrumentation.java
+++ b/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/AbstractJUnitTestClassProcessorInstrumentation.java
@@ -14,60 +14,59 @@
 
 @AutoService(InstrumenterModule.class)
 public class AbstractJUnitTestClassProcessorInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public AbstractJUnitTestClassProcessorInstrumentation() {
-    super("ci-visibility", "gradle", "junit4");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public AbstractJUnitTestClassProcessorInstrumentation() {
+        super("ci-visibility", "gradle", "junit4");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      JUnit4Instrumentation.class.getPackage().getName() + ".SkippedByDatadog",
-      JUnit4Instrumentation.class.getPackage().getName() + ".JUnit4Utils",
-      JUnit4Instrumentation.class.getPackage().getName() + ".TestEventsHandlerHolder",
-      JUnit4Instrumentation.class.getPackage().getName() + ".TracingListener",
-      JUnit4Instrumentation.class.getPackage().getName() + ".order.JUnit4FailFastClassOrderer",
-      packageName + ".DDCollectAllTestClassesExecutor",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            JUnit4Instrumentation.class.getPackage().getName() + ".SkippedByDatadog",
+            JUnit4Instrumentation.class.getPackage().getName() + ".JUnit4Utils",
+            JUnit4Instrumentation.class.getPackage().getName() + ".TestEventsHandlerHolder",
+            JUnit4Instrumentation.class.getPackage().getName() + ".TracingListener",
+            JUnit4Instrumentation.class.getPackage().getName() + ".order.JUnit4FailFastClassOrderer",
+            packageName + ".DDCollectAllTestClassesExecutor",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("stop"),
-        AbstractJUnitTestClassProcessorInstrumentation.class.getName()
-            + "$ProcessAllTestClassesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("stop"),
+                AbstractJUnitTestClassProcessorInstrumentation.class.getName() + "$ProcessAllTestClassesAdvice");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "skipMuzzle";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "skipMuzzle";
+    }
 
-  public static class ProcessAllTestClassesAdvice {
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @Advice.OnMethodEnter
-    public static void onStop(
-        @Advice.FieldValue(value = "executor") final Action<String> executor,
-        @Advice.FieldValue(value = "resultProcessorActor") final Actor resultProcessorActor) {
-      String testOrder = Config.get().getCiVisibilityTestOrder();
-      if (!CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) {
-        throw new IllegalArgumentException("Unknown test order: " + testOrder);
-      }
+    public static class ProcessAllTestClassesAdvice {
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @Advice.OnMethodEnter
+        public static void onStop(
+                @Advice.FieldValue(value = "executor") final Action<String> executor,
+                @Advice.FieldValue(value = "resultProcessorActor") final Actor resultProcessorActor) {
+            String testOrder = Config.get().getCiVisibilityTestOrder();
+            if (!CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) {
+                throw new IllegalArgumentException("Unknown test order: " + testOrder);
+            }
 
-      if (executor instanceof DDCollectAllTestClassesExecutor) {
-        ((DDCollectAllTestClassesExecutor) executor).processAllTestClasses();
-      }
+            if (executor instanceof DDCollectAllTestClassesExecutor) {
+                ((DDCollectAllTestClassesExecutor) executor).processAllTestClasses();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/AbstractJUnitTestDefinitionProcessorInstrumentation.java b/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/AbstractJUnitTestDefinitionProcessorInstrumentation.java
index 04d8677d4d7..0a869a567b3 100644
--- a/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/AbstractJUnitTestDefinitionProcessorInstrumentation.java
+++ b/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/AbstractJUnitTestDefinitionProcessorInstrumentation.java
@@ -13,62 +13,59 @@
 import org.gradle.api.internal.tasks.testing.TestDefinitionConsumer;
 
 @AutoService(InstrumenterModule.class)
-public class AbstractJUnitTestDefinitionProcessorInstrumentation
-    extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public AbstractJUnitTestDefinitionProcessorInstrumentation() {
-    super("ci-visibility", "gradle", "junit4");
-  }
+public class AbstractJUnitTestDefinitionProcessorInstrumentation extends InstrumenterModule.CiVisibility
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public AbstractJUnitTestDefinitionProcessorInstrumentation() {
+        super("ci-visibility", "gradle", "junit4");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestDefinitionProcessor";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestDefinitionProcessor";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      JUnit4Instrumentation.class.getPackage().getName() + ".SkippedByDatadog",
-      JUnit4Instrumentation.class.getPackage().getName() + ".JUnit4Utils",
-      JUnit4Instrumentation.class.getPackage().getName() + ".TestEventsHandlerHolder",
-      JUnit4Instrumentation.class.getPackage().getName() + ".TracingListener",
-      JUnit4Instrumentation.class.getPackage().getName() + ".order.JUnit4FailFastClassOrderer",
-      packageName + ".DDCollectAllTestDefinitionsExecutor",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            JUnit4Instrumentation.class.getPackage().getName() + ".SkippedByDatadog",
+            JUnit4Instrumentation.class.getPackage().getName() + ".JUnit4Utils",
+            JUnit4Instrumentation.class.getPackage().getName() + ".TestEventsHandlerHolder",
+            JUnit4Instrumentation.class.getPackage().getName() + ".TracingListener",
+            JUnit4Instrumentation.class.getPackage().getName() + ".order.JUnit4FailFastClassOrderer",
+            packageName + ".DDCollectAllTestDefinitionsExecutor",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("stop"),
-        AbstractJUnitTestDefinitionProcessorInstrumentation.class.getName()
-            + "$ProcessAllTestClassesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("stop"),
+                AbstractJUnitTestDefinitionProcessorInstrumentation.class.getName() + "$ProcessAllTestClassesAdvice");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "skipMuzzle";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "skipMuzzle";
+    }
 
-  public static class ProcessAllTestClassesAdvice {
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @Advice.OnMethodEnter
-    public static void onStop(
-        @Advice.FieldValue(value = "executor")
-            final TestDefinitionConsumer<ClassTestDefinition> executor) {
-      String testOrder = Config.get().getCiVisibilityTestOrder();
-      if (!CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) {
-        throw new IllegalArgumentException("Unknown test order: " + testOrder);
-      }
+    public static class ProcessAllTestClassesAdvice {
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @Advice.OnMethodEnter
+        public static void onStop(
+                @Advice.FieldValue(value = "executor") final TestDefinitionConsumer<ClassTestDefinition> executor) {
+            String testOrder = Config.get().getCiVisibilityTestOrder();
+            if (!CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) {
+                throw new IllegalArgumentException("Unknown test order: " + testOrder);
+            }
 
-      if (executor instanceof DDCollectAllTestDefinitionsExecutor) {
-        ((DDCollectAllTestDefinitionsExecutor) executor).processAllTestClasses();
-      }
+            if (executor instanceof DDCollectAllTestDefinitionsExecutor) {
+                ((DDCollectAllTestDefinitionsExecutor) executor).processAllTestClasses();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/DDCollectAllTestClassesExecutor.java b/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/DDCollectAllTestClassesExecutor.java
index 7648ae06e1b..9d6a1f59997 100644
--- a/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/DDCollectAllTestClassesExecutor.java
+++ b/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/DDCollectAllTestClassesExecutor.java
@@ -16,43 +16,41 @@
  * all test classes to order them before execution.
  */
 public class DDCollectAllTestClassesExecutor implements Action<String> {
-  private final List<Class<?>> testClasses = new ArrayList<>();
-  private final Action<String> delegate;
-  private final ClassLoader classLoader;
-
-  public DDCollectAllTestClassesExecutor(Action<String> delegate, ClassLoader junitClassLoader) {
-    this.delegate = delegate;
-    this.classLoader = junitClassLoader;
-  }
-
-  @Override
-  public void execute(@Nonnull String testClassName) {
-    Class<?> clazz = loadClass(testClassName);
-
-    TestFrameworkInstrumentation framework = JUnit4Utils.classToFramework(clazz);
-    if (framework == TestFrameworkInstrumentation.JUNIT4) {
-      TestEventsHandlerHolder.start(
-          TestFrameworkInstrumentation.JUNIT4, JUnit4Utils.capabilities(true));
+    private final List<Class<?>> testClasses = new ArrayList<>();
+    private final Action<String> delegate;
+    private final ClassLoader classLoader;
+
+    public DDCollectAllTestClassesExecutor(Action<String> delegate, ClassLoader junitClassLoader) {
+        this.delegate = delegate;
+        this.classLoader = junitClassLoader;
     }
 
-    testClasses.add(clazz);
-  }
+    @Override
+    public void execute(@Nonnull String testClassName) {
+        Class<?> clazz = loadClass(testClassName);
+
+        TestFrameworkInstrumentation framework = JUnit4Utils.classToFramework(clazz);
+        if (framework == TestFrameworkInstrumentation.JUNIT4) {
+            TestEventsHandlerHolder.start(TestFrameworkInstrumentation.JUNIT4, JUnit4Utils.capabilities(true));
+        }
+
+        testClasses.add(clazz);
+    }
 
-  public void processAllTestClasses() {
-    testClasses.sort(
-        new JUnit4FailFastClassOrderer(
-            TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT4)));
+    public void processAllTestClasses() {
+        testClasses.sort(new JUnit4FailFastClassOrderer(
+                TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT4)));
 
-    for (Class<?> clazz : testClasses) {
-      delegate.execute(clazz.getName());
+        for (Class<?> clazz : testClasses) {
+            delegate.execute(clazz.getName());
+        }
     }
-  }
 
-  private Class<?> loadClass(String testClassName) {
-    try {
-      return Class.forName(testClassName, false, classLoader);
-    } catch (ClassNotFoundException e) {
-      throw UncheckedException.throwAsUncheckedException(e);
+    private Class<?> loadClass(String testClassName) {
+        try {
+            return Class.forName(testClassName, false, classLoader);
+        } catch (ClassNotFoundException e) {
+            throw UncheckedException.throwAsUncheckedException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/DDCollectAllTestDefinitionsExecutor.java b/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/DDCollectAllTestDefinitionsExecutor.java
index 96b3803e49e..95bc737efad 100644
--- a/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/DDCollectAllTestDefinitionsExecutor.java
+++ b/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/DDCollectAllTestDefinitionsExecutor.java
@@ -12,48 +12,45 @@
 import org.gradle.api.internal.tasks.testing.TestDefinitionConsumer;
 import org.gradle.internal.UncheckedException;
 
-public class DDCollectAllTestDefinitionsExecutor
-    implements TestDefinitionConsumer<ClassTestDefinition> {
-  private final List<Class<?>> testClasses = new ArrayList<>();
-  private final Map<String, ClassTestDefinition> testDefinitions = new HashMap<>();
-  private final TestDefinitionConsumer<ClassTestDefinition> delegate;
-  private final ClassLoader classLoader;
-
-  public DDCollectAllTestDefinitionsExecutor(
-      TestDefinitionConsumer<ClassTestDefinition> delegate, ClassLoader junitClassLoader) {
-    this.delegate = delegate;
-    this.classLoader = junitClassLoader;
-  }
-
-  @Override
-  public void accept(ClassTestDefinition testDefinition) {
-    Class<?> clazz = loadClass(testDefinition.getTestClassName());
-
-    TestFrameworkInstrumentation framework = JUnit4Utils.classToFramework(clazz);
-    if (framework == TestFrameworkInstrumentation.JUNIT4) {
-      TestEventsHandlerHolder.start(
-          TestFrameworkInstrumentation.JUNIT4, JUnit4Utils.capabilities(true));
+public class DDCollectAllTestDefinitionsExecutor implements TestDefinitionConsumer<ClassTestDefinition> {
+    private final List<Class<?>> testClasses = new ArrayList<>();
+    private final Map<String, ClassTestDefinition> testDefinitions = new HashMap<>();
+    private final TestDefinitionConsumer<ClassTestDefinition> delegate;
+    private final ClassLoader classLoader;
+
+    public DDCollectAllTestDefinitionsExecutor(
+            TestDefinitionConsumer<ClassTestDefinition> delegate, ClassLoader junitClassLoader) {
+        this.delegate = delegate;
+        this.classLoader = junitClassLoader;
     }
 
-    testClasses.add(clazz);
-    testDefinitions.put(testDefinition.getTestClassName(), testDefinition);
-  }
+    @Override
+    public void accept(ClassTestDefinition testDefinition) {
+        Class<?> clazz = loadClass(testDefinition.getTestClassName());
 
-  public void processAllTestClasses() {
-    testClasses.sort(
-        new JUnit4FailFastClassOrderer(
-            TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT4)));
+        TestFrameworkInstrumentation framework = JUnit4Utils.classToFramework(clazz);
+        if (framework == TestFrameworkInstrumentation.JUNIT4) {
+            TestEventsHandlerHolder.start(TestFrameworkInstrumentation.JUNIT4, JUnit4Utils.capabilities(true));
+        }
 
-    for (Class<?> clazz : testClasses) {
-      delegate.accept(testDefinitions.get(clazz.getName()));
+        testClasses.add(clazz);
+        testDefinitions.put(testDefinition.getTestClassName(), testDefinition);
     }
-  }
 
-  private Class<?> loadClass(String testClassName) {
-    try {
-      return Class.forName(testClassName, false, classLoader);
-    } catch (ClassNotFoundException e) {
-      throw UncheckedException.throwAsUncheckedException(e);
+    public void processAllTestClasses() {
+        testClasses.sort(new JUnit4FailFastClassOrderer(
+                TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT4)));
+
+        for (Class<?> clazz : testClasses) {
+            delegate.accept(testDefinitions.get(clazz.getName()));
+        }
+    }
+
+    private Class<?> loadClass(String testClassName) {
+        try {
+            return Class.forName(testClassName, false, classLoader);
+        } catch (ClassNotFoundException e) {
+            throw UncheckedException.throwAsUncheckedException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/JUnitTestClassProcessorInstrumentation.java b/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/JUnitTestClassProcessorInstrumentation.java
index b30413fbae4..ed2f44dd39b 100644
--- a/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/JUnitTestClassProcessorInstrumentation.java
+++ b/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/JUnitTestClassProcessorInstrumentation.java
@@ -15,60 +15,58 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnitTestClassProcessorInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public JUnitTestClassProcessorInstrumentation() {
-    super("ci-visibility", "gradle", "junit4");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public JUnitTestClassProcessorInstrumentation() {
+        super("ci-visibility", "gradle", "junit4");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.gradle.api.internal.tasks.testing.junit.JUnitTestClassProcessor";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.gradle.api.internal.tasks.testing.junit.JUnitTestClassProcessor";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      JUnit4Instrumentation.class.getPackage().getName() + ".JUnit4Utils",
-      JUnit4Instrumentation.class.getPackage().getName() + ".TestEventsHandlerHolder",
-      JUnit4Instrumentation.class.getPackage().getName() + ".SkippedByDatadog",
-      JUnit4Instrumentation.class.getPackage().getName() + ".TracingListener",
-      JUnit4Instrumentation.class.getPackage().getName() + ".order.JUnit4FailFastClassOrderer",
-      packageName + ".DDCollectAllTestClassesExecutor",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            JUnit4Instrumentation.class.getPackage().getName() + ".JUnit4Utils",
+            JUnit4Instrumentation.class.getPackage().getName() + ".TestEventsHandlerHolder",
+            JUnit4Instrumentation.class.getPackage().getName() + ".SkippedByDatadog",
+            JUnit4Instrumentation.class.getPackage().getName() + ".TracingListener",
+            JUnit4Instrumentation.class.getPackage().getName() + ".order.JUnit4FailFastClassOrderer",
+            packageName + ".DDCollectAllTestClassesExecutor",
+        };
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "skipMuzzle";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "skipMuzzle";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("createTestExecutor")
-            .and(takesArgument(0, named("org.gradle.internal.actor.Actor")))
-            .and(returns(named("org.gradle.api.Action"))),
-        JUnitTestClassProcessorInstrumentation.class.getName() + "$TestExecutorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("createTestExecutor")
+                        .and(takesArgument(0, named("org.gradle.internal.actor.Actor")))
+                        .and(returns(named("org.gradle.api.Action"))),
+                JUnitTestClassProcessorInstrumentation.class.getName() + "$TestExecutorAdvice");
+    }
 
-  public static class TestExecutorAdvice {
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @Advice.OnMethodExit
-    public static void onTestExecutorCreation(
-        @Advice.Return(readOnly = false) Action<String> executor) {
-      String testOrder = Config.get().getCiVisibilityTestOrder();
-      if (!CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) {
-        throw new IllegalArgumentException("Unknown test order: " + testOrder);
-      }
+    public static class TestExecutorAdvice {
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @Advice.OnMethodExit
+        public static void onTestExecutorCreation(@Advice.Return(readOnly = false) Action<String> executor) {
+            String testOrder = Config.get().getCiVisibilityTestOrder();
+            if (!CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) {
+                throw new IllegalArgumentException("Unknown test order: " + testOrder);
+            }
 
-      executor =
-          new DDCollectAllTestClassesExecutor(
-              executor, Thread.currentThread().getContextClassLoader());
+            executor = new DDCollectAllTestClassesExecutor(
+                    executor, Thread.currentThread().getContextClassLoader());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/JUnitTestDefinitionProcessorInstrumentation.java b/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/JUnitTestDefinitionProcessorInstrumentation.java
index 9963637cea3..1fdb7171da1 100644
--- a/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/JUnitTestDefinitionProcessorInstrumentation.java
+++ b/dd-java-agent/instrumentation/gradle-testing-5.1/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/JUnitTestDefinitionProcessorInstrumentation.java
@@ -16,60 +16,59 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnitTestDefinitionProcessorInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public JUnitTestDefinitionProcessorInstrumentation() {
-    super("ci-visibility", "gradle", "junit4");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public JUnitTestDefinitionProcessorInstrumentation() {
+        super("ci-visibility", "gradle", "junit4");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.gradle.api.internal.tasks.testing.junit.JUnitTestDefinitionProcessor";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.gradle.api.internal.tasks.testing.junit.JUnitTestDefinitionProcessor";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      JUnit4Instrumentation.class.getPackage().getName() + ".JUnit4Utils",
-      JUnit4Instrumentation.class.getPackage().getName() + ".TestEventsHandlerHolder",
-      JUnit4Instrumentation.class.getPackage().getName() + ".SkippedByDatadog",
-      JUnit4Instrumentation.class.getPackage().getName() + ".TracingListener",
-      JUnit4Instrumentation.class.getPackage().getName() + ".order.JUnit4FailFastClassOrderer",
-      packageName + ".DDCollectAllTestDefinitionsExecutor",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            JUnit4Instrumentation.class.getPackage().getName() + ".JUnit4Utils",
+            JUnit4Instrumentation.class.getPackage().getName() + ".TestEventsHandlerHolder",
+            JUnit4Instrumentation.class.getPackage().getName() + ".SkippedByDatadog",
+            JUnit4Instrumentation.class.getPackage().getName() + ".TracingListener",
+            JUnit4Instrumentation.class.getPackage().getName() + ".order.JUnit4FailFastClassOrderer",
+            packageName + ".DDCollectAllTestDefinitionsExecutor",
+        };
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "skipMuzzle";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "skipMuzzle";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("createTestExecutor")
-            .and(takesArgument(0, named("org.gradle.internal.actor.Actor")))
-            .and(returns(named("org.gradle.api.internal.tasks.testing.TestDefinitionConsumer"))),
-        JUnitTestDefinitionProcessorInstrumentation.class.getName() + "$TestExecutorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("createTestExecutor")
+                        .and(takesArgument(0, named("org.gradle.internal.actor.Actor")))
+                        .and(returns(named("org.gradle.api.internal.tasks.testing.TestDefinitionConsumer"))),
+                JUnitTestDefinitionProcessorInstrumentation.class.getName() + "$TestExecutorAdvice");
+    }
 
-  public static class TestExecutorAdvice {
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @Advice.OnMethodExit
-    public static void onTestExecutorCreation(
-        @Advice.Return(readOnly = false) TestDefinitionConsumer<ClassTestDefinition> executor) {
-      String testOrder = Config.get().getCiVisibilityTestOrder();
-      if (!CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) {
-        throw new IllegalArgumentException("Unknown test order: " + testOrder);
-      }
+    public static class TestExecutorAdvice {
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @Advice.OnMethodExit
+        public static void onTestExecutorCreation(
+                @Advice.Return(readOnly = false) TestDefinitionConsumer<ClassTestDefinition> executor) {
+            String testOrder = Config.get().getCiVisibilityTestOrder();
+            if (!CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) {
+                throw new IllegalArgumentException("Unknown test order: " + testOrder);
+            }
 
-      executor =
-          new DDCollectAllTestDefinitionsExecutor(
-              executor, Thread.currentThread().getContextClassLoader());
+            executor = new DDCollectAllTestDefinitionsExecutor(
+                    executor, Thread.currentThread().getContextClassLoader());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java b/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java
index bf99dbe034d..c1d2ff51736 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java
@@ -28,134 +28,125 @@
 
 public class GradleBuildListener extends BuildAdapter {
 
-  private static final Logger log = LoggerFactory.getLogger(GradleBuildListener.class);
+    private static final Logger log = LoggerFactory.getLogger(GradleBuildListener.class);
 
-  private final BuildEventsHandler<Gradle> buildEventsHandler =
-      InstrumentationBridge.createBuildEventsHandler();
+    private final BuildEventsHandler<Gradle> buildEventsHandler = InstrumentationBridge.createBuildEventsHandler();
 
-  @Override
-  public void settingsEvaluated(@Nonnull Settings settings) {
-    if (!Config.get().isCiVisibilityEnabled()) {
-      return;
-    }
-    Gradle gradle = settings.getGradle();
-    Path projectRoot = settings.getRootDir().toPath();
-    ProjectDescriptor rootProject = settings.getRootProject();
-    String projectName = rootProject.getName();
-    String startCommand = GradleUtils.recreateStartCommand(settings.getStartParameter());
-    String gradleVersion = gradle.getGradleVersion();
-    buildEventsHandler.onTestSessionStart(
-        gradle, projectName, projectRoot, startCommand, "gradle", gradleVersion, null);
-  }
-
-  @Override
-  public void projectsEvaluated(@Nonnull Gradle gradle) {
-    Config config = Config.get();
-    if (!config.isCiVisibilityEnabled()) {
-      return;
-    }
-
-    if (config.isCiVisibilityAutoConfigurationEnabled()) {
-      BuildSessionSettings sessionSettings = buildEventsHandler.getSessionSettings(gradle);
-
-      Project rootProject = gradle.getRootProject();
-      Set<Project> projects = rootProject.getAllprojects();
-      for (Project project : projects) {
-        try {
-          GradleProjectConfigurator.INSTANCE.configureProject(project, sessionSettings);
-        } catch (Exception e) {
-          log.error("Error while configuring project {}", project.getName(), e);
+    @Override
+    public void settingsEvaluated(@Nonnull Settings settings) {
+        if (!Config.get().isCiVisibilityEnabled()) {
+            return;
         }
-      }
+        Gradle gradle = settings.getGradle();
+        Path projectRoot = settings.getRootDir().toPath();
+        ProjectDescriptor rootProject = settings.getRootProject();
+        String projectName = rootProject.getName();
+        String startCommand = GradleUtils.recreateStartCommand(settings.getStartParameter());
+        String gradleVersion = gradle.getGradleVersion();
+        buildEventsHandler.onTestSessionStart(
+                gradle, projectName, projectRoot, startCommand, "gradle", gradleVersion, null);
     }
 
-    gradle.addListener(new TestTaskExecutionListener(buildEventsHandler));
-  }
+    @Override
+    public void projectsEvaluated(@Nonnull Gradle gradle) {
+        Config config = Config.get();
+        if (!config.isCiVisibilityEnabled()) {
+            return;
+        }
 
-  @Override
-  public void buildFinished(@Nonnull BuildResult result) {
-    if (!Config.get().isCiVisibilityEnabled()) {
-      return;
-    }
+        if (config.isCiVisibilityAutoConfigurationEnabled()) {
+            BuildSessionSettings sessionSettings = buildEventsHandler.getSessionSettings(gradle);
+
+            Project rootProject = gradle.getRootProject();
+            Set<Project> projects = rootProject.getAllprojects();
+            for (Project project : projects) {
+                try {
+                    GradleProjectConfigurator.INSTANCE.configureProject(project, sessionSettings);
+                } catch (Exception e) {
+                    log.error("Error while configuring project {}", project.getName(), e);
+                }
+            }
+        }
 
-    Gradle gradle = result.getGradle();
-    Throwable failure = result.getFailure();
-    if (failure != null) {
-      buildEventsHandler.onTestSessionFail(gradle, failure);
+        gradle.addListener(new TestTaskExecutionListener(buildEventsHandler));
     }
 
-    buildEventsHandler.onTestSessionFinish(gradle);
-  }
-
-  static final class TestTaskExecutionListener implements TaskExecutionListener {
+    @Override
+    public void buildFinished(@Nonnull BuildResult result) {
+        if (!Config.get().isCiVisibilityEnabled()) {
+            return;
+        }
 
-    private final BuildEventsHandler<Gradle> buildEventsHandler;
+        Gradle gradle = result.getGradle();
+        Throwable failure = result.getFailure();
+        if (failure != null) {
+            buildEventsHandler.onTestSessionFail(gradle, failure);
+        }
 
-    TestTaskExecutionListener(BuildEventsHandler<Gradle> buildEventsHandler) {
-      this.buildEventsHandler = buildEventsHandler;
+        buildEventsHandler.onTestSessionFinish(gradle);
     }
 
-    @Override
-    public void beforeExecute(@Nonnull Task task) {
-      Project project = task.getProject();
-      Gradle gradle = project.getGradle();
-      String taskPath = task.getPath();
-
-      if (!GradleUtils.isTestTask(task)) {
-        buildEventsHandler.onBuildTaskStart(gradle, taskPath, Collections.emptyMap());
-        return;
-      }
-
-      List<String> sourceSetNames = Config.get().getCiVisibilityJacocoGradleSourceSets();
-      BuildModuleLayout moduleLayout = GradleUtils.getModuleLayout(project, sourceSetNames);
-      Path jvmExecutable = GradleUtils.getEffectiveExecutable(task);
-      List<Path> classpath = GradleUtils.getClasspath(task);
-      JavaAgent jacocoAgent = GradleUtils.getJacocoAgent(task);
-
-      // "com.android.base" is applied transitively by every Android Gradle Plugin, so it is a
-      // reliable single marker for an Android project regardless of how its tests are executed.
-      Map<String, Object> additionalTags =
-          project.getPluginManager().hasPlugin("com.android.base")
-              ? Collections.singletonMap(Tags.TEST_IS_ANDROID, true)
-              : Collections.emptyMap();
-
-      BuildModuleSettings moduleSettings =
-          buildEventsHandler.onTestModuleStart(
-              gradle,
-              taskPath,
-              moduleLayout,
-              jvmExecutable,
-              classpath,
-              jacocoAgent,
-              additionalTags);
-      Map<String, String> systemProperties = moduleSettings.getSystemProperties();
-      GradleProjectConfigurator.INSTANCE.configureTracer(task, systemProperties);
-    }
+    static final class TestTaskExecutionListener implements TaskExecutionListener {
 
-    @Override
-    public void afterExecute(@Nonnull Task task, @Nonnull TaskState state) {
-      Project project = task.getProject();
-      Gradle gradle = project.getGradle();
-      String taskPath = task.getPath();
-      Throwable failure = state.getFailure();
+        private final BuildEventsHandler<Gradle> buildEventsHandler;
 
-      if (!GradleUtils.isTestTask(task)) {
-        if (failure != null) {
-          buildEventsHandler.onBuildTaskFail(gradle, taskPath, failure);
+        TestTaskExecutionListener(BuildEventsHandler<Gradle> buildEventsHandler) {
+            this.buildEventsHandler = buildEventsHandler;
         }
-        buildEventsHandler.onBuildTaskFinish(gradle, taskPath);
-        return;
-      }
-
-      if (failure != null) {
-        buildEventsHandler.onTestModuleFail(gradle, taskPath, failure);
 
-      } else if (state.getSkipped() || !state.getDidWork()) {
-        String reason = state.getSkipMessage();
-        buildEventsHandler.onTestModuleSkip(gradle, taskPath, reason);
-      }
+        @Override
+        public void beforeExecute(@Nonnull Task task) {
+            Project project = task.getProject();
+            Gradle gradle = project.getGradle();
+            String taskPath = task.getPath();
+
+            if (!GradleUtils.isTestTask(task)) {
+                buildEventsHandler.onBuildTaskStart(gradle, taskPath, Collections.emptyMap());
+                return;
+            }
+
+            List<String> sourceSetNames = Config.get().getCiVisibilityJacocoGradleSourceSets();
+            BuildModuleLayout moduleLayout = GradleUtils.getModuleLayout(project, sourceSetNames);
+            Path jvmExecutable = GradleUtils.getEffectiveExecutable(task);
+            List<Path> classpath = GradleUtils.getClasspath(task);
+            JavaAgent jacocoAgent = GradleUtils.getJacocoAgent(task);
+
+            // "com.android.base" is applied transitively by every Android Gradle Plugin, so it is a
+            // reliable single marker for an Android project regardless of how its tests are executed.
+            Map<String, Object> additionalTags = project.getPluginManager().hasPlugin("com.android.base")
+                    ? Collections.singletonMap(Tags.TEST_IS_ANDROID, true)
+                    : Collections.emptyMap();
+
+            BuildModuleSettings moduleSettings = buildEventsHandler.onTestModuleStart(
+                    gradle, taskPath, moduleLayout, jvmExecutable, classpath, jacocoAgent, additionalTags);
+            Map<String, String> systemProperties = moduleSettings.getSystemProperties();
+            GradleProjectConfigurator.INSTANCE.configureTracer(task, systemProperties);
+        }
 
-      buildEventsHandler.onTestModuleFinish(gradle, taskPath);
+        @Override
+        public void afterExecute(@Nonnull Task task, @Nonnull TaskState state) {
+            Project project = task.getProject();
+            Gradle gradle = project.getGradle();
+            String taskPath = task.getPath();
+            Throwable failure = state.getFailure();
+
+            if (!GradleUtils.isTestTask(task)) {
+                if (failure != null) {
+                    buildEventsHandler.onBuildTaskFail(gradle, taskPath, failure);
+                }
+                buildEventsHandler.onBuildTaskFinish(gradle, taskPath);
+                return;
+            }
+
+            if (failure != null) {
+                buildEventsHandler.onTestModuleFail(gradle, taskPath, failure);
+
+            } else if (state.getSkipped() || !state.getDidWork()) {
+                String reason = state.getSkipMessage();
+                buildEventsHandler.onTestModuleSkip(gradle, taskPath, reason);
+            }
+
+            buildEventsHandler.onTestModuleFinish(gradle, taskPath);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java
index e45ab9ba98d..2baf00f930e 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java
@@ -14,42 +14,42 @@
 
 @AutoService(InstrumenterModule.class)
 public class GradleBuildListenerInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public GradleBuildListenerInstrumentation() {
-    super("gradle", "gradle-build-listener");
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Only instrument Gradle older than 8.3
-    return not(hasClassNamed("org.gradle.api.file.ConfigurableFilePermissions"));
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.gradle.invocation.DefaultGradle";
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled();
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
-  }
-
-  public static class Construct {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterConstructor(@Advice.This final DefaultGradle gradle) {
-      gradle.addBuildListener(new GradleBuildListener());
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public GradleBuildListenerInstrumentation() {
+        super("gradle", "gradle-build-listener");
+    }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Only instrument Gradle older than 8.3
+        return not(hasClassNamed("org.gradle.api.file.ConfigurableFilePermissions"));
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.gradle.invocation.DefaultGradle";
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled();
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
     }
-  }
 
-  @Override
-  public String muzzleDirective() {
-    return "skipMuzzle";
-  }
+    public static class Construct {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterConstructor(@Advice.This final DefaultGradle gradle) {
+            gradle.addBuildListener(new GradleBuildListener());
+        }
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "skipMuzzle";
+    }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java
index 5015f3778be..e28165fd59d 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java
@@ -39,261 +39,252 @@
 import org.gradle.process.CommandLineArgumentProvider;
 
 @ListenerService
-public class CiVisibilityGradleListener extends BuildAdapter
-    implements InternalBuildListener, TaskListenerInternal {
-
-  private static final String NO_TESTS_EXECUTED_REASON = "No tests were executed by Gradle";
-  private static final String TRACER_VERSION;
-
-  static {
-    try (BufferedReader reader =
-        new BufferedReader(
-            new InputStreamReader(
-                ClassLoader.getSystemResourceAsStream("dd-java-agent.version")))) {
-      TRACER_VERSION = reader.lines().collect(Collectors.joining());
-    } catch (IOException e) {
-      throw new RuntimeException("Could not read tracer version from dd-java-agent.version", e);
-    }
-  }
-
-  {
-    /*
-     * Gradle's configuration cache has a set of "inputs" that determine whether an existing entry
-     * can be reused, or a new one should be created.
-     * Presence or absence of a javaagent and the variables that are used for the tracer configuration are
-     * not among those inputs.
-     * That means that a cache entry created without the tracer can be reused when the tracer is present:
-     * as the result test tasks will not be instrumented.
-     * Or the other way around, a cache entry created with the tracer can be reused when the tracer is absent:
-     * as the result a test task may try to access CI Visibility services and fail.
-     * Likewise, a cache entry created with an older version of the tracer can be reused with the newer version
-     * of the tracer, which is undesirable if there are some changes in the tasks configuration logic.
-     * To prevent this we have to ensure that the presence or absence of tracer, as well as the version of the tracer,
-     * is a part of the configuration cache inputs.
-     * We do this by settings the system property below, since all properties with the prefix "org.gradle.project."
-     * are included into configuration cache inputs by default.
-     *
-     * Please note that this has to be done for every build, so this block has to be dynamic and not static.
-     */
-    System.setProperty("org.gradle.project.datadog.tracer.version", TRACER_VERSION);
-  }
-
-  private final Config config = Config.get();
-  private final Gradle gradle;
-  private final CiVisibilityService ciVisibilityService;
-  private final Set<String> emptyTestTasks = ConcurrentHashMap.newKeySet();
-
-  public CiVisibilityGradleListener(
-      Gradle gradle,
-      BuildState buildState,
-      BuildEventsListenerRegistry buildEventsListenerRegistry) {
-    this.gradle = gradle;
-
-    BuildServiceRegistry sharedServices = gradle.getSharedServices();
-    Provider<CiVisibilityService> ciVisibilityServiceProvider =
-        sharedServices.registerIfAbsent(
-            "ciVisibilityService", CiVisibilityService.class, spec -> {});
-    // registration is needed to keep the service alive until the end of the build
-    buildEventsListenerRegistry.onTaskCompletion(ciVisibilityServiceProvider);
-    ciVisibilityService = ciVisibilityServiceProvider.get();
-
-    String buildPath = buildState.getBuildIdentifier().getBuildPath();
-    Path projectRoot = buildState.getBuildRootDir().toPath();
-
-    boolean nestedBuild;
-    String nestedBuildPath;
-    if (buildState instanceof NestedBuildState) {
-      nestedBuild = true;
-      nestedBuildPath = buildPath;
-    } else {
-      nestedBuild = false;
-      nestedBuildPath = null;
-    }
+public class CiVisibilityGradleListener extends BuildAdapter implements InternalBuildListener, TaskListenerInternal {
 
-    StartParameterInternal startParameter = getStartParameter(buildState);
-    String startCommand = recreateStartCommand(startParameter, nestedBuildPath);
-    String gradleVersion = gradle.getGradleVersion();
-    ciVisibilityService.onBuildStart(
-        buildPath, projectRoot, startCommand, gradleVersion, nestedBuild);
-  }
-
-  private static StartParameterInternal getStartParameter(BuildState buildState) {
-    if (buildState instanceof RootBuildState) {
-      RootBuildState rootBuildState = (RootBuildState) buildState;
-      return rootBuildState.getStartParameter();
-    } else if (buildState instanceof NestedBuildState) {
-      NestedBuildState nestedBuildState = (NestedBuildState) buildState;
-      BuildDefinition buildDefinition = nestedBuildState.getBuildDefinition();
-      return buildDefinition.getStartParameter();
-    } else {
-      throw new IllegalArgumentException("Unexpected build state: " + buildState);
-    }
-  }
-
-  /**
-   * Returns command line used to start the build. We instrument Gradle daemon process, not the
-   * client process that is launched from the command line, so the result of this method is an
-   * approximation of what the actual command could look like
-   */
-  private static String recreateStartCommand(StartParameter startParameter, String buildPath) {
-    StringBuilder command = new StringBuilder("gradle");
-
-    if (buildPath != null && !buildPath.isEmpty()) {
-      command.append(' ').append(buildPath);
+    private static final String NO_TESTS_EXECUTED_REASON = "No tests were executed by Gradle";
+    private static final String TRACER_VERSION;
+
+    static {
+        try (BufferedReader reader = new BufferedReader(
+                new InputStreamReader(ClassLoader.getSystemResourceAsStream("dd-java-agent.version")))) {
+            TRACER_VERSION = reader.lines().collect(Collectors.joining());
+        } catch (IOException e) {
+            throw new RuntimeException("Could not read tracer version from dd-java-agent.version", e);
+        }
     }
 
-    for (String taskName : startParameter.getTaskNames()) {
-      command.append(' ').append(taskName);
+    {
+        /*
+         * Gradle's configuration cache has a set of "inputs" that determine whether an existing entry
+         * can be reused, or a new one should be created.
+         * Presence or absence of a javaagent and the variables that are used for the tracer configuration are
+         * not among those inputs.
+         * That means that a cache entry created without the tracer can be reused when the tracer is present:
+         * as the result test tasks will not be instrumented.
+         * Or the other way around, a cache entry created with the tracer can be reused when the tracer is absent:
+         * as the result a test task may try to access CI Visibility services and fail.
+         * Likewise, a cache entry created with an older version of the tracer can be reused with the newer version
+         * of the tracer, which is undesirable if there are some changes in the tasks configuration logic.
+         * To prevent this we have to ensure that the presence or absence of tracer, as well as the version of the tracer,
+         * is a part of the configuration cache inputs.
+         * We do this by settings the system property below, since all properties with the prefix "org.gradle.project."
+         * are included into configuration cache inputs by default.
+         *
+         * Please note that this has to be done for every build, so this block has to be dynamic and not static.
+         */
+        System.setProperty("org.gradle.project.datadog.tracer.version", TRACER_VERSION);
     }
 
-    for (String excludedTaskName : startParameter.getExcludedTaskNames()) {
-      command.append(" -x").append(excludedTaskName);
+    private final Config config = Config.get();
+    private final Gradle gradle;
+    private final CiVisibilityService ciVisibilityService;
+    private final Set<String> emptyTestTasks = ConcurrentHashMap.newKeySet();
+
+    public CiVisibilityGradleListener(
+            Gradle gradle, BuildState buildState, BuildEventsListenerRegistry buildEventsListenerRegistry) {
+        this.gradle = gradle;
+
+        BuildServiceRegistry sharedServices = gradle.getSharedServices();
+        Provider<CiVisibilityService> ciVisibilityServiceProvider =
+                sharedServices.registerIfAbsent("ciVisibilityService", CiVisibilityService.class, spec -> {});
+        // registration is needed to keep the service alive until the end of the build
+        buildEventsListenerRegistry.onTaskCompletion(ciVisibilityServiceProvider);
+        ciVisibilityService = ciVisibilityServiceProvider.get();
+
+        String buildPath = buildState.getBuildIdentifier().getBuildPath();
+        Path projectRoot = buildState.getBuildRootDir().toPath();
+
+        boolean nestedBuild;
+        String nestedBuildPath;
+        if (buildState instanceof NestedBuildState) {
+            nestedBuild = true;
+            nestedBuildPath = buildPath;
+        } else {
+            nestedBuild = false;
+            nestedBuildPath = null;
+        }
+
+        StartParameterInternal startParameter = getStartParameter(buildState);
+        String startCommand = recreateStartCommand(startParameter, nestedBuildPath);
+        String gradleVersion = gradle.getGradleVersion();
+        ciVisibilityService.onBuildStart(buildPath, projectRoot, startCommand, gradleVersion, nestedBuild);
     }
 
-    for (Map.Entry<String, String> e : startParameter.getProjectProperties().entrySet()) {
-      String propertyKey = e.getKey();
-      String propertyValue = e.getValue();
-      command.append(" -P").append(propertyKey);
-      if (propertyValue != null && !propertyValue.isEmpty()) {
-        command.append('=').append(propertyValue);
-      }
+    private static StartParameterInternal getStartParameter(BuildState buildState) {
+        if (buildState instanceof RootBuildState) {
+            RootBuildState rootBuildState = (RootBuildState) buildState;
+            return rootBuildState.getStartParameter();
+        } else if (buildState instanceof NestedBuildState) {
+            NestedBuildState nestedBuildState = (NestedBuildState) buildState;
+            BuildDefinition buildDefinition = nestedBuildState.getBuildDefinition();
+            return buildDefinition.getStartParameter();
+        } else {
+            throw new IllegalArgumentException("Unexpected build state: " + buildState);
+        }
     }
 
-    return command.toString();
-  }
+    /**
+     * Returns command line used to start the build. We instrument Gradle daemon process, not the
+     * client process that is launched from the command line, so the result of this method is an
+     * approximation of what the actual command could look like
+     */
+    private static String recreateStartCommand(StartParameter startParameter, String buildPath) {
+        StringBuilder command = new StringBuilder("gradle");
 
-  @Override
-  public void projectsEvaluated(Gradle gradle) {
-    if (!config.isCiVisibilityAutoConfigurationEnabled()) {
-      return;
-    }
+        if (buildPath != null && !buildPath.isEmpty()) {
+            command.append(' ').append(buildPath);
+        }
 
-    Project rootProject = gradle.getRootProject();
-    Set<Project> projects = rootProject.getAllprojects();
-    for (Project project : projects) {
-      PluginManager pluginManager = project.getPluginManager();
-      pluginManager.apply(CiVisibilityPlugin.class);
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public void beforeExecute(TaskIdentity<?> taskIdentity) {
-    String taskPath = taskIdentity.getTaskPath();
-    if (!Test.class.isAssignableFrom(taskIdentity.getTaskType())) {
-      ciVisibilityService.onBuildTaskStart(taskPath);
-      return;
-    }
+        for (String taskName : startParameter.getTaskNames()) {
+            command.append(' ').append(taskName);
+        }
 
-    String projectPath = taskIdentity.getProjectPath();
-    Project project = gradle.getRootProject().project(projectPath);
-    Test task = (Test) project.getTasks().getByName(taskIdentity.name);
-
-    // "com.android.base" is applied transitively by the application/library/dynamic-feature/test
-    // Android Gradle Plugins. The Android KMP library plugin (AGP 8.8+) is a separate entry point
-    // that does NOT apply com.android.base, so it must be checked explicitly.
-    PluginManager pluginManager = project.getPluginManager();
-    boolean isAndroid =
-        pluginManager.hasPlugin("com.android.base")
-            || pluginManager.hasPlugin("com.android.kotlin.multiplatform.library");
-
-    Map<String, Object> inputProperties = task.getInputs().getProperties();
-    BuildModuleLayout moduleLayout =
-        (BuildModuleLayout) inputProperties.get(CiVisibilityPluginExtension.MODULE_LAYOUT_PROPERTY);
-    if ((moduleLayout == null || moduleLayout.getSourceSets().isEmpty())
-        && project.getExtensions().findByName("android") != null) {
-      moduleLayout = AndroidGradleUtils.getAndroidModuleLayout(project, task);
+        for (String excludedTaskName : startParameter.getExcludedTaskNames()) {
+            command.append(" -x").append(excludedTaskName);
+        }
+
+        for (Map.Entry<String, String> e : startParameter.getProjectProperties().entrySet()) {
+            String propertyKey = e.getKey();
+            String propertyValue = e.getValue();
+            command.append(" -P").append(propertyKey);
+            if (propertyValue != null && !propertyValue.isEmpty()) {
+                command.append('=').append(propertyValue);
+            }
+        }
+
+        return command.toString();
     }
 
-    JavaAgent jacocoAgent = getJacocoAgent(task);
-
-    Path jvmExecutable = CiVisibilityPluginExtension.getEffectiveExecutable(task);
-    List<Path> taskClasspath = CiVisibilityPluginExtension.getClasspath(task);
-
-    ciVisibilityService.onModuleStart(
-        taskPath, isAndroid, moduleLayout, jvmExecutable, taskClasspath, jacocoAgent);
-    task.addTestListener(new EmptyTestTaskListener(taskPath, emptyTestTasks));
-  }
-
-  private JavaAgent getJacocoAgent(Test task) {
-    for (CommandLineArgumentProvider jvmArgumentProvider : task.getJvmArgumentProviders()) {
-      if (!(jvmArgumentProvider instanceof Named)) {
-        continue;
-      }
-      Named namedProvider = (Named) jvmArgumentProvider;
-      String providerName = namedProvider.getName();
-      if (!providerName.toLowerCase().contains("jacoco")) {
-        continue;
-      }
-      Iterable<String> arguments = jvmArgumentProvider.asArguments();
-      for (String arg : arguments) {
-        if (!arg.contains("-javaagent:")) {
-          continue;
+    @Override
+    public void projectsEvaluated(Gradle gradle) {
+        if (!config.isCiVisibilityAutoConfigurationEnabled()) {
+            return;
         }
-        String argNoPrefix = arg.substring(arg.indexOf(':') + 1);
-        int agentArgsIndex = argNoPrefix.indexOf('=');
-        if (agentArgsIndex < 0) {
-          return new JavaAgent(argNoPrefix, null);
-        } else {
-          String agentPath = argNoPrefix.substring(0, agentArgsIndex);
-          String args = argNoPrefix.substring(argNoPrefix.indexOf('=') + 1);
-          return new JavaAgent(agentPath, args);
+
+        Project rootProject = gradle.getRootProject();
+        Set<Project> projects = rootProject.getAllprojects();
+        for (Project project : projects) {
+            PluginManager pluginManager = project.getPluginManager();
+            pluginManager.apply(CiVisibilityPlugin.class);
         }
-      }
     }
-    return null;
-  }
 
-  @Override
-  public void afterExecute(TaskIdentity<?> taskIdentity, TaskState state) {
-    String taskPath = taskIdentity.getTaskPath();
-    Throwable failure = state.getFailure();
+    @SuppressWarnings("unchecked")
+    @Override
+    public void beforeExecute(TaskIdentity<?> taskIdentity) {
+        String taskPath = taskIdentity.getTaskPath();
+        if (!Test.class.isAssignableFrom(taskIdentity.getTaskType())) {
+            ciVisibilityService.onBuildTaskStart(taskPath);
+            return;
+        }
 
-    if (!Test.class.isAssignableFrom(taskIdentity.getTaskType())) {
-      ciVisibilityService.onBuildTaskFinish(taskPath, failure);
-      return;
-    }
+        String projectPath = taskIdentity.getProjectPath();
+        Project project = gradle.getRootProject().project(projectPath);
+        Test task = (Test) project.getTasks().getByName(taskIdentity.name);
+
+        // "com.android.base" is applied transitively by the application/library/dynamic-feature/test
+        // Android Gradle Plugins. The Android KMP library plugin (AGP 8.8+) is a separate entry point
+        // that does NOT apply com.android.base, so it must be checked explicitly.
+        PluginManager pluginManager = project.getPluginManager();
+        boolean isAndroid = pluginManager.hasPlugin("com.android.base")
+                || pluginManager.hasPlugin("com.android.kotlin.multiplatform.library");
+
+        Map<String, Object> inputProperties = task.getInputs().getProperties();
+        BuildModuleLayout moduleLayout =
+                (BuildModuleLayout) inputProperties.get(CiVisibilityPluginExtension.MODULE_LAYOUT_PROPERTY);
+        if ((moduleLayout == null || moduleLayout.getSourceSets().isEmpty())
+                && project.getExtensions().findByName("android") != null) {
+            moduleLayout = AndroidGradleUtils.getAndroidModuleLayout(project, task);
+        }
 
-    boolean empty = emptyTestTasks.remove(taskPath);
-    String reason = state.getSkipped() || !state.getDidWork() ? state.getSkipMessage() : null;
-    if (reason == null && empty) {
-      reason = NO_TESTS_EXECUTED_REASON;
-    }
-    ciVisibilityService.onModuleFinish(taskPath, failure, reason);
-  }
+        JavaAgent jacocoAgent = getJacocoAgent(task);
 
-  static final class EmptyTestTaskListener implements TestListener {
-    private final String taskPath;
-    private final Set<String> emptyTestTasks;
+        Path jvmExecutable = CiVisibilityPluginExtension.getEffectiveExecutable(task);
+        List<Path> taskClasspath = CiVisibilityPluginExtension.getClasspath(task);
 
-    EmptyTestTaskListener(String taskPath, Set<String> emptyTestTasks) {
-      this.taskPath = taskPath;
-      this.emptyTestTasks = emptyTestTasks;
+        ciVisibilityService.onModuleStart(taskPath, isAndroid, moduleLayout, jvmExecutable, taskClasspath, jacocoAgent);
+        task.addTestListener(new EmptyTestTaskListener(taskPath, emptyTestTasks));
     }
 
-    @Override
-    public void beforeSuite(TestDescriptor suite) {}
+    private JavaAgent getJacocoAgent(Test task) {
+        for (CommandLineArgumentProvider jvmArgumentProvider : task.getJvmArgumentProviders()) {
+            if (!(jvmArgumentProvider instanceof Named)) {
+                continue;
+            }
+            Named namedProvider = (Named) jvmArgumentProvider;
+            String providerName = namedProvider.getName();
+            if (!providerName.toLowerCase().contains("jacoco")) {
+                continue;
+            }
+            Iterable<String> arguments = jvmArgumentProvider.asArguments();
+            for (String arg : arguments) {
+                if (!arg.contains("-javaagent:")) {
+                    continue;
+                }
+                String argNoPrefix = arg.substring(arg.indexOf(':') + 1);
+                int agentArgsIndex = argNoPrefix.indexOf('=');
+                if (agentArgsIndex < 0) {
+                    return new JavaAgent(argNoPrefix, null);
+                } else {
+                    String agentPath = argNoPrefix.substring(0, agentArgsIndex);
+                    String args = argNoPrefix.substring(argNoPrefix.indexOf('=') + 1);
+                    return new JavaAgent(agentPath, args);
+                }
+            }
+        }
+        return null;
+    }
 
     @Override
-    public void afterSuite(TestDescriptor suite, TestResult result) {
-      // Use Gradle's completed root result, not absence of tracer events: tests may have run
-      // without supported or enabled framework instrumentation.
-      if (suite.getParent() == null
-          && result.getTestCount() == 0
-          && result.getResultType() == TestResult.ResultType.SUCCESS) {
-        emptyTestTasks.add(taskPath);
-      }
+    public void afterExecute(TaskIdentity<?> taskIdentity, TaskState state) {
+        String taskPath = taskIdentity.getTaskPath();
+        Throwable failure = state.getFailure();
+
+        if (!Test.class.isAssignableFrom(taskIdentity.getTaskType())) {
+            ciVisibilityService.onBuildTaskFinish(taskPath, failure);
+            return;
+        }
+
+        boolean empty = emptyTestTasks.remove(taskPath);
+        String reason = state.getSkipped() || !state.getDidWork() ? state.getSkipMessage() : null;
+        if (reason == null && empty) {
+            reason = NO_TESTS_EXECUTED_REASON;
+        }
+        ciVisibilityService.onModuleFinish(taskPath, failure, reason);
     }
 
-    @Override
-    public void beforeTest(TestDescriptor test) {}
+    static final class EmptyTestTaskListener implements TestListener {
+        private final String taskPath;
+        private final Set<String> emptyTestTasks;
 
-    @Override
-    public void afterTest(TestDescriptor test, TestResult result) {}
-  }
+        EmptyTestTaskListener(String taskPath, Set<String> emptyTestTasks) {
+            this.taskPath = taskPath;
+            this.emptyTestTasks = emptyTestTasks;
+        }
+
+        @Override
+        public void beforeSuite(TestDescriptor suite) {}
+
+        @Override
+        public void afterSuite(TestDescriptor suite, TestResult result) {
+            // Use Gradle's completed root result, not absence of tracer events: tests may have run
+            // without supported or enabled framework instrumentation.
+            if (suite.getParent() == null
+                    && result.getTestCount() == 0
+                    && result.getResultType() == TestResult.ResultType.SUCCESS) {
+                emptyTestTasks.add(taskPath);
+            }
+        }
 
-  @Override
-  public void buildFinished(BuildResult result) {
-    ciVisibilityService.onBuildFinish(result.getFailure());
-  }
+        @Override
+        public void beforeTest(TestDescriptor test) {}
+
+        @Override
+        public void afterTest(TestDescriptor test, TestResult result) {}
+    }
+
+    @Override
+    public void buildFinished(BuildResult result) {
+        ciVisibilityService.onBuildFinish(result.getFailure());
+    }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_10.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_10.java
index 5b2f325517b..7e7f76c5b41 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_10.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_10.java
@@ -12,75 +12,70 @@
 
 public class CiVisibilityGradleListenerInjector_8_10 {
 
-  private static final Logger LOGGER =
-      LoggerFactory.getLogger(CiVisibilityGradleListenerInjector_8_10.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CiVisibilityGradleListenerInjector_8_10.class);
 
-  /**
-   * Performs listener injection for Gradle v8.10+. As the tracer currently uses v8.4, some of the
-   * required interfaces are not available at compile time, which is why reflection is used.
-   */
-  // TODO: once the tracer is bumped to use Gradle v8.10 replace reflection with regular invocations
-  public static void injectCiVisibilityGradleListener(
-      DefaultServiceRegistry buildScopeServices, ServiceRegistry... parentServices) {
-    try {
-      ClassLoaderRegistry classLoaderRegistry = getClassLoaderRegistry(parentServices);
-      ClassLoader coreApiClassLoader = classLoaderRegistry.getGradleCoreApiClassLoader();
-      Class<?> serviceRegistrationActionClass =
-          coreApiClassLoader.loadClass("org.gradle.internal.service.ServiceRegistrationAction");
+    /**
+     * Performs listener injection for Gradle v8.10+. As the tracer currently uses v8.4, some of the
+     * required interfaces are not available at compile time, which is why reflection is used.
+     */
+    // TODO: once the tracer is bumped to use Gradle v8.10 replace reflection with regular invocations
+    public static void injectCiVisibilityGradleListener(
+            DefaultServiceRegistry buildScopeServices, ServiceRegistry... parentServices) {
+        try {
+            ClassLoaderRegistry classLoaderRegistry = getClassLoaderRegistry(parentServices);
+            ClassLoader coreApiClassLoader = classLoaderRegistry.getGradleCoreApiClassLoader();
+            Class<?> serviceRegistrationActionClass =
+                    coreApiClassLoader.loadClass("org.gradle.internal.service.ServiceRegistrationAction");
 
-      Object serviceRegistrationAction =
-          Proxy.newProxyInstance(
-              coreApiClassLoader,
-              new Class<?>[] {serviceRegistrationActionClass},
-              (proxy, method, args) -> {
-                if (method.getName().equals("registerServices")) {
-                  ServiceRegistration serviceRegistration = (ServiceRegistration) args[0];
-                  Class<?> ciVisibilityGradleListener =
-                      CiVisibilityGradleListenerInjector_8_10.loadCiVisibilityGradleListener(
-                          classLoaderRegistry);
-                  serviceRegistration.add(ciVisibilityGradleListener);
-                  return null;
-                }
-                throw new UnsupportedOperationException("Method not implemented");
-              });
+            Object serviceRegistrationAction = Proxy.newProxyInstance(
+                    coreApiClassLoader, new Class<?>[] {serviceRegistrationActionClass}, (proxy, method, args) -> {
+                        if (method.getName().equals("registerServices")) {
+                            ServiceRegistration serviceRegistration = (ServiceRegistration) args[0];
+                            Class<?> ciVisibilityGradleListener =
+                                    CiVisibilityGradleListenerInjector_8_10.loadCiVisibilityGradleListener(
+                                            classLoaderRegistry);
+                            serviceRegistration.add(ciVisibilityGradleListener);
+                            return null;
+                        }
+                        throw new UnsupportedOperationException("Method not implemented");
+                    });
 
-      Method register =
-          DefaultServiceRegistry.class.getMethod("register", serviceRegistrationActionClass);
-      register.invoke(buildScopeServices, serviceRegistrationAction);
+            Method register = DefaultServiceRegistry.class.getMethod("register", serviceRegistrationActionClass);
+            register.invoke(buildScopeServices, serviceRegistrationAction);
 
-    } catch (Exception e) {
-      LOGGER.warn("Could not inject CI Visibility Gradle listener", e);
+        } catch (Exception e) {
+            LOGGER.warn("Could not inject CI Visibility Gradle listener", e);
+        }
     }
-  }
 
-  private static ClassLoaderRegistry getClassLoaderRegistry(ServiceRegistry[] serviceRegistries) {
-    for (ServiceRegistry serviceRegistry : serviceRegistries) {
-      ClassLoaderRegistry classLoaderRegistry =
-          (ClassLoaderRegistry) serviceRegistry.find(ClassLoaderRegistry.class);
-      if (classLoaderRegistry != null) {
-        return classLoaderRegistry;
-      }
+    private static ClassLoaderRegistry getClassLoaderRegistry(ServiceRegistry[] serviceRegistries) {
+        for (ServiceRegistry serviceRegistry : serviceRegistries) {
+            ClassLoaderRegistry classLoaderRegistry =
+                    (ClassLoaderRegistry) serviceRegistry.find(ClassLoaderRegistry.class);
+            if (classLoaderRegistry != null) {
+                return classLoaderRegistry;
+            }
+        }
+        throw new RuntimeException(
+                "Could not find ClassLoaderRegistry service in " + Arrays.toString(serviceRegistries));
     }
-    throw new RuntimeException(
-        "Could not find ClassLoaderRegistry service in " + Arrays.toString(serviceRegistries));
-  }
 
-  /**
-   * There are several class loaders in Gradle that load various parts of the system: core classes,
-   * plugins, etc. This provider class is injected into the core classloader since it is invoked by
-   * the build service registry, which is a part of the Gradle core. The CI Visibility listener
-   * (that is being registered as a service here) is injected into the plugins classloader because
-   * it needs to work with domain objects from Gradle Testing JVM (e.g. {@link
-   * org.gradle.api.tasks.testing.Test} task), which is a plugin. Therefore, we cannot reference its
-   * {@code Class} instance directly, and instead have to load it explicitly.
-   */
-  private static Class<?> loadCiVisibilityGradleListener(ClassLoaderRegistry classLoaderRegistry) {
-    try {
-      return classLoaderRegistry
-          .getPluginsClassLoader()
-          .loadClass("datadog.trace.instrumentation.gradle.CiVisibilityGradleListener");
-    } catch (ClassNotFoundException e) {
-      throw new RuntimeException("Could not load CI Visibility Gradle Listener", e);
+    /**
+     * There are several class loaders in Gradle that load various parts of the system: core classes,
+     * plugins, etc. This provider class is injected into the core classloader since it is invoked by
+     * the build service registry, which is a part of the Gradle core. The CI Visibility listener
+     * (that is being registered as a service here) is injected into the plugins classloader because
+     * it needs to work with domain objects from Gradle Testing JVM (e.g. {@link
+     * org.gradle.api.tasks.testing.Test} task), which is a plugin. Therefore, we cannot reference its
+     * {@code Class} instance directly, and instead have to load it explicitly.
+     */
+    private static Class<?> loadCiVisibilityGradleListener(ClassLoaderRegistry classLoaderRegistry) {
+        try {
+            return classLoaderRegistry
+                    .getPluginsClassLoader()
+                    .loadClass("datadog.trace.instrumentation.gradle.CiVisibilityGradleListener");
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException("Could not load CI Visibility Gradle Listener", e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_3.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_3.java
index 225004ce44b..d109a139113 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_3.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_3.java
@@ -13,59 +13,57 @@
 
 public class CiVisibilityGradleListenerInjector_8_3 {
 
-  private static final MethodHandles METHOD_HANDLES =
-      new MethodHandles(DefaultServiceRegistry.class.getClassLoader());
-  private static final MethodHandle REGISTER_SERVICE =
-      METHOD_HANDLES.method(DefaultServiceRegistry.class, "register", Action.class);
+    private static final MethodHandles METHOD_HANDLES =
+            new MethodHandles(DefaultServiceRegistry.class.getClassLoader());
+    private static final MethodHandle REGISTER_SERVICE =
+            METHOD_HANDLES.method(DefaultServiceRegistry.class, "register", Action.class);
 
-  private static final Logger LOGGER =
-      LoggerFactory.getLogger(CiVisibilityGradleListenerInjector_8_3.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CiVisibilityGradleListenerInjector_8_3.class);
 
-  /** Performs listener injection for Gradle v8.3 - 8.9 */
-  public static void injectCiVisibilityGradleListener(
-      DefaultServiceRegistry buildScopeServices, ServiceRegistry... parentServices) {
-    try {
-      ClassLoaderRegistry classLoaderRegistry =
-          CiVisibilityGradleListenerInjector_8_3.getClassLoaderRegistry(parentServices);
-      Class<?> ciVisibilityGradleListener =
-          CiVisibilityGradleListenerInjector_8_3.loadCiVisibilityGradleListener(
-              classLoaderRegistry);
-      Action<ServiceRegistration> registrationAction =
-          serviceRegistration -> serviceRegistration.add(ciVisibilityGradleListener);
-      METHOD_HANDLES.invoke(REGISTER_SERVICE, buildScopeServices, registrationAction);
-    } catch (Exception e) {
-      LOGGER.warn("Could not inject CI Visibility Gradle listener", e);
+    /** Performs listener injection for Gradle v8.3 - 8.9 */
+    public static void injectCiVisibilityGradleListener(
+            DefaultServiceRegistry buildScopeServices, ServiceRegistry... parentServices) {
+        try {
+            ClassLoaderRegistry classLoaderRegistry =
+                    CiVisibilityGradleListenerInjector_8_3.getClassLoaderRegistry(parentServices);
+            Class<?> ciVisibilityGradleListener =
+                    CiVisibilityGradleListenerInjector_8_3.loadCiVisibilityGradleListener(classLoaderRegistry);
+            Action<ServiceRegistration> registrationAction =
+                    serviceRegistration -> serviceRegistration.add(ciVisibilityGradleListener);
+            METHOD_HANDLES.invoke(REGISTER_SERVICE, buildScopeServices, registrationAction);
+        } catch (Exception e) {
+            LOGGER.warn("Could not inject CI Visibility Gradle listener", e);
+        }
     }
-  }
 
-  private static ClassLoaderRegistry getClassLoaderRegistry(ServiceRegistry[] serviceRegistries) {
-    for (ServiceRegistry serviceRegistry : serviceRegistries) {
-      ClassLoaderRegistry classLoaderRegistry =
-          (ClassLoaderRegistry) serviceRegistry.find(ClassLoaderRegistry.class);
-      if (classLoaderRegistry != null) {
-        return classLoaderRegistry;
-      }
+    private static ClassLoaderRegistry getClassLoaderRegistry(ServiceRegistry[] serviceRegistries) {
+        for (ServiceRegistry serviceRegistry : serviceRegistries) {
+            ClassLoaderRegistry classLoaderRegistry =
+                    (ClassLoaderRegistry) serviceRegistry.find(ClassLoaderRegistry.class);
+            if (classLoaderRegistry != null) {
+                return classLoaderRegistry;
+            }
+        }
+        throw new RuntimeException(
+                "Could not find ClassLoaderRegistry service in " + Arrays.toString(serviceRegistries));
     }
-    throw new RuntimeException(
-        "Could not find ClassLoaderRegistry service in " + Arrays.toString(serviceRegistries));
-  }
 
-  /**
-   * There are several class loaders in Gradle that load various parts of the system: core classes,
-   * plugins, etc. This provider class is injected into the core classloader since it is invoked by
-   * the build service registry, which is a part of the Gradle core. The CI Visibility listener
-   * (that is being registered as a service here) is injected into the plugins classloader because
-   * it needs to work with domain objects from Gradle Testing JVM (e.g. {@link
-   * org.gradle.api.tasks.testing.Test} task), which is a plugin. Therefore, we cannot reference its
-   * {@code Class} instance directly, and instead have to load it explicitly.
-   */
-  private static Class<?> loadCiVisibilityGradleListener(ClassLoaderRegistry classLoaderRegistry) {
-    try {
-      return classLoaderRegistry
-          .getPluginsClassLoader()
-          .loadClass("datadog.trace.instrumentation.gradle.CiVisibilityGradleListener");
-    } catch (ClassNotFoundException e) {
-      throw new RuntimeException("Could not load CI Visibility Gradle Listener", e);
+    /**
+     * There are several class loaders in Gradle that load various parts of the system: core classes,
+     * plugins, etc. This provider class is injected into the core classloader since it is invoked by
+     * the build service registry, which is a part of the Gradle core. The CI Visibility listener
+     * (that is being registered as a service here) is injected into the plugins classloader because
+     * it needs to work with domain objects from Gradle Testing JVM (e.g. {@link
+     * org.gradle.api.tasks.testing.Test} task), which is a plugin. Therefore, we cannot reference its
+     * {@code Class} instance directly, and instead have to load it explicitly.
+     */
+    private static Class<?> loadCiVisibilityGradleListener(ClassLoaderRegistry classLoaderRegistry) {
+        try {
+            return classLoaderRegistry
+                    .getPluginsClassLoader()
+                    .loadClass("datadog.trace.instrumentation.gradle.CiVisibilityGradleListener");
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException("Could not load CI Visibility Gradle Listener", e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPlugin.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPlugin.java
index 4d7ad9c2c26..296d75beb8e 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPlugin.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPlugin.java
@@ -27,181 +27,157 @@
 
 public abstract class CiVisibilityPlugin implements Plugin<Project> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(CiVisibilityPlugin.class);
-
-  private static final String PLUGIN_EXTENSION_NAME = "dd-ci-visibility";
-  private static final String JACOCO_PLUGIN_ID = "jacoco";
-  private static final String JACOCO_AGENT_CONFIGURATION_NAME = "jacocoAgent";
-  private static final String JACOCO_ANT_CONFIGURATION_NAME = "jacocoAnt";
-  private static final String DEPENDENCY_VERIFICATION_WARNING_EMITTED =
-      "datadog.civisibility.dependency-verification-warning-emitted";
-
-  private Project project;
-
-  @Override
-  public void apply(Project project) {
-    this.project = project;
-
-    CiVisibilityPluginExtension extension =
-        project
-            .getExtensions()
-            .create(PLUGIN_EXTENSION_NAME, CiVisibilityPluginExtension.class, project.getObjects());
-    calculateCompiledClassesFolders(extension);
-    applyCompilerPlugin(extension);
-    applyJacocoPlugin(extension);
-    applyToTestTasks(extension);
-  }
-
-  private void calculateCompiledClassesFolders(CiVisibilityPluginExtension extension) {
-    SourceSetContainer gradleSourceSets =
-        project.getExtensions().findByType(SourceSetContainer.class);
-    if (gradleSourceSets == null) {
-      return;
+    private static final Logger LOGGER = LoggerFactory.getLogger(CiVisibilityPlugin.class);
+
+    private static final String PLUGIN_EXTENSION_NAME = "dd-ci-visibility";
+    private static final String JACOCO_PLUGIN_ID = "jacoco";
+    private static final String JACOCO_AGENT_CONFIGURATION_NAME = "jacocoAgent";
+    private static final String JACOCO_ANT_CONFIGURATION_NAME = "jacocoAnt";
+    private static final String DEPENDENCY_VERIFICATION_WARNING_EMITTED =
+            "datadog.civisibility.dependency-verification-warning-emitted";
+
+    private Project project;
+
+    @Override
+    public void apply(Project project) {
+        this.project = project;
+
+        CiVisibilityPluginExtension extension = project.getExtensions()
+                .create(PLUGIN_EXTENSION_NAME, CiVisibilityPluginExtension.class, project.getObjects());
+        calculateCompiledClassesFolders(extension);
+        applyCompilerPlugin(extension);
+        applyJacocoPlugin(extension);
+        applyToTestTasks(extension);
     }
 
-    Collection<datadog.trace.api.civisibility.domain.SourceSet> sourceSets = new ArrayList<>();
-    List<String> sourceSetNames = extension.getCoverageEnabledSourceSets();
-    for (String sourceSetName : sourceSetNames) {
-      SourceSet sourceSet = gradleSourceSets.findByName(sourceSetName);
-      if (sourceSet != null) {
-        datadog.trace.api.civisibility.domain.SourceSet.Type sourceSetType =
-            sourceSet.getName().toLowerCase().contains("test")
-                ? datadog.trace.api.civisibility.domain.SourceSet.Type.TEST
-                : datadog.trace.api.civisibility.domain.SourceSet.Type.CODE;
-
-        SourceDirectorySet allSource = sourceSet.getAllSource();
-        Collection<File> srcDirs = allSource.getSrcDirs();
-
-        SourceSetOutput output = sourceSet.getOutput();
-        Collection<File> destinationDirs = output.getFiles();
-
-        sourceSets.add(
-            new datadog.trace.api.civisibility.domain.SourceSet(
-                sourceSetType, srcDirs, destinationDirs));
-      }
-    }
+    private void calculateCompiledClassesFolders(CiVisibilityPluginExtension extension) {
+        SourceSetContainer gradleSourceSets = project.getExtensions().findByType(SourceSetContainer.class);
+        if (gradleSourceSets == null) {
+            return;
+        }
 
-    extension.setModuleLayout(new BuildModuleLayout(sourceSets));
-  }
+        Collection<datadog.trace.api.civisibility.domain.SourceSet> sourceSets = new ArrayList<>();
+        List<String> sourceSetNames = extension.getCoverageEnabledSourceSets();
+        for (String sourceSetName : sourceSetNames) {
+            SourceSet sourceSet = gradleSourceSets.findByName(sourceSetName);
+            if (sourceSet != null) {
+                datadog.trace.api.civisibility.domain.SourceSet.Type sourceSetType =
+                        sourceSet.getName().toLowerCase().contains("test")
+                                ? datadog.trace.api.civisibility.domain.SourceSet.Type.TEST
+                                : datadog.trace.api.civisibility.domain.SourceSet.Type.CODE;
+
+                SourceDirectorySet allSource = sourceSet.getAllSource();
+                Collection<File> srcDirs = allSource.getSrcDirs();
+
+                SourceSetOutput output = sourceSet.getOutput();
+                Collection<File> destinationDirs = output.getFiles();
+
+                sourceSets.add(
+                        new datadog.trace.api.civisibility.domain.SourceSet(sourceSetType, srcDirs, destinationDirs));
+            }
+        }
 
-  private void applyCompilerPlugin(CiVisibilityPluginExtension extension) {
-    if (extension.isCompilerPluginEnabled()) {
-      addCompilerPluginConfigurations(extension);
-      addModuleName(extension);
-      applyToCompileTasks(extension);
+        extension.setModuleLayout(new BuildModuleLayout(sourceSets));
     }
-  }
-
-  public void addCompilerPluginConfigurations(CiVisibilityPluginExtension extension) {
-    Configuration configuration =
-        project
-            .getConfigurations()
-            .detachedConfiguration(
-                project
-                    .getDependencies()
-                    .create(
-                        String.format(
-                            "com.datadoghq:dd-javac-plugin:%s",
-                            extension.getCompilerPluginVersion())),
-                project
-                    .getDependencies()
-                    .create(
-                        String.format(
-                            "com.datadoghq:dd-javac-plugin-client:%s",
-                            extension.getCompilerPluginVersion())));
-
-    disableDependencyVerificationIfConfigured(configuration);
-
-    extension.setCompilerPluginClasspath(configuration);
-  }
-
-  private void disableDependencyVerificationIfConfigured(Configuration configuration) {
-    if (Config.get().isCiVisibilityGradleDependencyVerificationEnabled()) {
-      return;
+
+    private void applyCompilerPlugin(CiVisibilityPluginExtension extension) {
+        if (extension.isCompilerPluginEnabled()) {
+            addCompilerPluginConfigurations(extension);
+            addModuleName(extension);
+            applyToCompileTasks(extension);
+        }
     }
 
-    if (Files.isRegularFile(
-        project
-            .getRootProject()
-            .getProjectDir()
-            .toPath()
-            .resolve("gradle/verification-metadata.xml"))) {
-      if (!project
-          .getRootProject()
-          .getExtensions()
-          .getExtraProperties()
-          .has(DEPENDENCY_VERIFICATION_WARNING_EMITTED)) {
-        project
-            .getRootProject()
-            .getExtensions()
-            .getExtraProperties()
-            .set(DEPENDENCY_VERIFICATION_WARNING_EMITTED, true);
-        LOGGER.warn(
-            "Datadog Test Optimization disabled Gradle dependency verification for dependencies "
-                + "injected into this build. To keep verification enabled, set "
-                + "DD_CIVISIBILITY_GRADLE_DEPENDENCY_VERIFICATION_ENABLED=true and add "
-                + "the Datadog compiler plugin and injected JaCoCo dependencies to "
-                + "gradle/verification-metadata.xml. If the metadata is not updated, Gradle will "
-                + "fail the build while resolving these dependencies.");
-      }
+    public void addCompilerPluginConfigurations(CiVisibilityPluginExtension extension) {
+        Configuration configuration = project.getConfigurations()
+                .detachedConfiguration(
+                        project.getDependencies()
+                                .create(String.format(
+                                        "com.datadoghq:dd-javac-plugin:%s", extension.getCompilerPluginVersion())),
+                        project.getDependencies()
+                                .create(String.format(
+                                        "com.datadoghq:dd-javac-plugin-client:%s",
+                                        extension.getCompilerPluginVersion())));
+
+        disableDependencyVerificationIfConfigured(configuration);
+
+        extension.setCompilerPluginClasspath(configuration);
     }
-    configuration.getResolutionStrategy().disableDependencyVerification();
-  }
-
-  private void addModuleName(CiVisibilityPluginExtension extension) {
-    extension.setModuleName(getModuleName());
-  }
-
-  private static final Pattern MODULE_NAME_PATTERN =
-      Pattern.compile("\\s*module\\s*((\\w|\\.)+)\\s*\\{");
-
-  private String getModuleName() {
-    Path projectDir = project.getProjectDir().toPath();
-    Path moduleInfo = projectDir.resolve(Paths.get("src", "main", "java", "module-info.java"));
-    try {
-      if (Files.exists(moduleInfo)) {
-        List<String> lines = Files.readAllLines(moduleInfo);
-        for (String line : lines) {
-          Matcher matcher = MODULE_NAME_PATTERN.matcher(line);
-          if (matcher.matches()) {
-            return matcher.group(1);
-          }
+
+    private void disableDependencyVerificationIfConfigured(Configuration configuration) {
+        if (Config.get().isCiVisibilityGradleDependencyVerificationEnabled()) {
+            return;
+        }
+
+        if (Files.isRegularFile(
+                project.getRootProject().getProjectDir().toPath().resolve("gradle/verification-metadata.xml"))) {
+            if (!project.getRootProject()
+                    .getExtensions()
+                    .getExtraProperties()
+                    .has(DEPENDENCY_VERIFICATION_WARNING_EMITTED)) {
+                project.getRootProject()
+                        .getExtensions()
+                        .getExtraProperties()
+                        .set(DEPENDENCY_VERIFICATION_WARNING_EMITTED, true);
+                LOGGER.warn("Datadog Test Optimization disabled Gradle dependency verification for dependencies "
+                        + "injected into this build. To keep verification enabled, set "
+                        + "DD_CIVISIBILITY_GRADLE_DEPENDENCY_VERIFICATION_ENABLED=true and add "
+                        + "the Datadog compiler plugin and injected JaCoCo dependencies to "
+                        + "gradle/verification-metadata.xml. If the metadata is not updated, Gradle will "
+                        + "fail the build while resolving these dependencies.");
+            }
         }
-      }
-    } catch (Exception e) {
-      LOGGER.error("Could not read module name from {}", moduleInfo, e);
+        configuration.getResolutionStrategy().disableDependencyVerification();
     }
-    return null;
-  }
 
-  private void applyToCompileTasks(CiVisibilityPluginExtension extension) {
-    project.getTasks().withType(JavaCompile.class).configureEach(extension::applyTo);
-  }
+    private void addModuleName(CiVisibilityPluginExtension extension) {
+        extension.setModuleName(getModuleName());
+    }
 
-  private void applyJacocoPlugin(CiVisibilityPluginExtension extension) {
-    if (!extension.isJacocoInjectionEnabled()
-        || project.getPluginManager().hasPlugin(JACOCO_PLUGIN_ID)) {
-      return;
+    private static final Pattern MODULE_NAME_PATTERN = Pattern.compile("\\s*module\\s*((\\w|\\.)+)\\s*\\{");
+
+    private String getModuleName() {
+        Path projectDir = project.getProjectDir().toPath();
+        Path moduleInfo = projectDir.resolve(Paths.get("src", "main", "java", "module-info.java"));
+        try {
+            if (Files.exists(moduleInfo)) {
+                List<String> lines = Files.readAllLines(moduleInfo);
+                for (String line : lines) {
+                    Matcher matcher = MODULE_NAME_PATTERN.matcher(line);
+                    if (matcher.matches()) {
+                        return matcher.group(1);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            LOGGER.error("Could not read module name from {}", moduleInfo, e);
+        }
+        return null;
     }
 
-    project.getPluginManager().apply(JACOCO_PLUGIN_ID);
-    JacocoPluginExtension jacocoExtension =
-        project.getExtensions().getByType(JacocoPluginExtension.class);
-    jacocoExtension.setToolVersion(extension.getJacocoVersion());
+    private void applyToCompileTasks(CiVisibilityPluginExtension extension) {
+        project.getTasks().withType(JavaCompile.class).configureEach(extension::applyTo);
+    }
 
-    List<Configuration> jacocoConfigurations =
-        project.getConfigurations().stream()
-            .filter(
-                c ->
-                    JACOCO_AGENT_CONFIGURATION_NAME.equals(c.getName())
+    private void applyJacocoPlugin(CiVisibilityPluginExtension extension) {
+        if (!extension.isJacocoInjectionEnabled() || project.getPluginManager().hasPlugin(JACOCO_PLUGIN_ID)) {
+            return;
+        }
+
+        project.getPluginManager().apply(JACOCO_PLUGIN_ID);
+        JacocoPluginExtension jacocoExtension = project.getExtensions().getByType(JacocoPluginExtension.class);
+        jacocoExtension.setToolVersion(extension.getJacocoVersion());
+
+        List<Configuration> jacocoConfigurations = project.getConfigurations().stream()
+                .filter(c -> JACOCO_AGENT_CONFIGURATION_NAME.equals(c.getName())
                         || JACOCO_ANT_CONFIGURATION_NAME.equals(c.getName()))
-            .collect(Collectors.toList());
-    for (Configuration jacocoConfiguration : jacocoConfigurations) {
-      disableDependencyVerificationIfConfigured(jacocoConfiguration);
+                .collect(Collectors.toList());
+        for (Configuration jacocoConfiguration : jacocoConfigurations) {
+            disableDependencyVerificationIfConfigured(jacocoConfiguration);
+        }
     }
-  }
 
-  private void applyToTestTasks(CiVisibilityPluginExtension extension) {
-    project.getTasks().withType(Test.class).configureEach(extension::applyTo);
-  }
+    private void applyToTestTasks(CiVisibilityPluginExtension extension) {
+        project.getTasks().withType(Test.class).configureEach(extension::applyTo);
+    }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPluginExtension.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPluginExtension.java
index 78a67b04d76..01d302209ee 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPluginExtension.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPluginExtension.java
@@ -27,179 +27,173 @@
 
 public abstract class CiVisibilityPluginExtension {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(CiVisibilityPluginExtension.class);
-
-  public static final String MODULE_LAYOUT_PROPERTY = "moduleLayout";
-
-  private final ObjectFactory objectFactory;
-  private FileCollection compilerPluginClasspath;
-  private String moduleName;
-  private BuildModuleLayout moduleLayout;
-
-  @Inject
-  public CiVisibilityPluginExtension(ObjectFactory objectFactory) {
-    this.objectFactory = objectFactory;
-  }
-
-  public void setCompilerPluginClasspath(FileCollection compilerPluginClasspath) {
-    this.compilerPluginClasspath = compilerPluginClasspath;
-  }
-
-  public void setModuleName(String moduleName) {
-    this.moduleName = moduleName;
-  }
-
-  public void setModuleLayout(BuildModuleLayout moduleLayout) {
-    this.moduleLayout = moduleLayout;
-  }
-
-  @ServiceReference
-  abstract Property<CiVisibilityService> getCiVisibilityService();
-
-  public boolean isCompilerPluginEnabled() {
-    return getCiVisibilityService().get().isCompilerPluginEnabled();
-  }
-
-  public String getCompilerPluginVersion() {
-    return getCiVisibilityService().get().getCompilerPluginVersion();
-  }
-
-  public boolean isJacocoInjectionEnabled() {
-    CiVisibilityService ciVisibilityService = getCiVisibilityService().get();
-    return ciVisibilityService.isJacocoInjectionEnabled();
-  }
-
-  public List<String> getCoverageEnabledSourceSets() {
-    return getCiVisibilityService().get().getCoverageEnabledSourceSets();
-  }
-
-  public String getJacocoVersion() {
-    return getCiVisibilityService().get().getJacocoVersion();
-  }
-
-  public void applyTo(JavaCompile javaCompile) {
-    CompileOptions options = javaCompile.getOptions();
-    ForkOptions forkOptions = options.getForkOptions();
-    String compilerExecutable = forkOptions.getExecutable();
-    if (compilerExecutable != null && !compilerExecutable.isEmpty()) {
-      // assuming a non-standard compiler is used
-      return;
-    }
-
-    FileCollection classpath = javaCompile.getClasspath();
-    FileCollection updatedClasspath =
-        classpath != null ? classpath.plus(compilerPluginClasspath) : compilerPluginClasspath;
-    javaCompile.setClasspath(updatedClasspath);
-
-    FileCollection annotationProcessorPath = options.getAnnotationProcessorPath();
-    FileCollection updatedAnnotationProcessorPath =
-        annotationProcessorPath != null
-            ? annotationProcessorPath.plus(compilerPluginClasspath)
-            : compilerPluginClasspath;
-    options.setAnnotationProcessorPath(updatedAnnotationProcessorPath);
-
-    CommandLineArgumentProvider argumentProvider =
-        new JavaCompilerPluginArgumentsProvider(moduleName);
-    options.getCompilerArgumentProviders().add(argumentProvider);
-  }
-
-  public void applyTo(Test task) {
-    task.getInputs().property(MODULE_LAYOUT_PROPERTY, moduleLayout);
-
-    applyTracerSettings(task.getPath(), getProjectProperties(task), task.getJvmArgumentProviders());
-
-    JacocoTaskExtension jacocoTaskExtension =
-        task.getExtensions().findByType(JacocoTaskExtension.class);
-    if (jacocoTaskExtension != null) {
-      applyJacocoSettings(jacocoTaskExtension);
-    }
-  }
-
-  public static Path getEffectiveExecutable(Test task) {
-    Property<JavaLauncher> javaLauncher = task.getJavaLauncher();
-    if (javaLauncher.isPresent()) {
-      try {
-        return javaLauncher.get().getExecutablePath().getAsFile().toPath();
-      } catch (Exception e) {
-        LOGGER.error("Could not get Java launcher for test task", e);
-      }
-    }
-    String executable = task.getExecutable();
-    if (executable != null && !executable.isEmpty()) {
-      return Paths.get(executable);
-    } else {
-      return Jvm.current().getJavaExecutable().toPath();
-    }
-  }
-
-  public static List<Path> getClasspath(Test task) {
-    try {
-      return task.getClasspath().getFiles().stream().map(File::toPath).collect(Collectors.toList());
-    } catch (Exception e) {
-      LOGGER.error("Could not get classpath for test task", e);
-      return null;
-    }
-  }
-
-  private static Map<String, String> getProjectProperties(Test task) {
-    Map<String, String> projectProperties = new HashMap<>();
-    for (Map.Entry<String, ?> e : task.getProject().getProperties().entrySet()) {
-      String propertyName = e.getKey();
-      Object propertyValue = e.getValue();
-      if (propertyValue instanceof String) {
-        projectProperties.put(propertyName, (String) propertyValue);
-      }
-    }
-    return projectProperties;
-  }
-
-  private void applyJacocoSettings(JacocoTaskExtension jacocoTaskExtension) {
-    CiVisibilityService ciVisibilityService = getCiVisibilityService().get();
-
-    List<String> taskExcludeClassLoaders = jacocoTaskExtension.getExcludeClassLoaders();
-    if (taskExcludeClassLoaders != null) {
-      // taskExcludeClassLoaders list may be immutable, so we need to construct a new one
-      List<String> ciVisExcludedClassLoaders = ciVisibilityService.getExcludeClassLoaders();
-      List<String> updatedTaskExcludeClassLoaders =
-          new ArrayList<>(taskExcludeClassLoaders.size() + ciVisExcludedClassLoaders.size());
-      updatedTaskExcludeClassLoaders.addAll(taskExcludeClassLoaders);
-      updatedTaskExcludeClassLoaders.addAll(ciVisExcludedClassLoaders);
-      jacocoTaskExtension.setExcludeClassLoaders(updatedTaskExcludeClassLoaders);
-    } else {
-      jacocoTaskExtension.setExcludeClassLoaders(
-          new ArrayList<>(ciVisibilityService.getExcludeClassLoaders()));
-    }
-
-    jacocoTaskExtension.setIncludes(
-        merge(
-            jacocoTaskExtension.getIncludes(), ciVisibilityService.getCoverageIncludedPackages()));
-    jacocoTaskExtension.setExcludes(
-        merge(
-            jacocoTaskExtension.getExcludes(), ciVisibilityService.getCoverageExcludedPackages()));
-  }
-
-  @SafeVarargs
-  private static List<String> merge(List<String>... packageLists) {
-    List<String> merged = new ArrayList<>();
-    for (List<String> packageList : packageLists) {
-      if (packageList == null) {
-        continue;
-      }
-      for (String pkg : packageList) {
-        if (pkg != null && !pkg.isEmpty()) {
-          merged.add(pkg);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CiVisibilityPluginExtension.class);
+
+    public static final String MODULE_LAYOUT_PROPERTY = "moduleLayout";
+
+    private final ObjectFactory objectFactory;
+    private FileCollection compilerPluginClasspath;
+    private String moduleName;
+    private BuildModuleLayout moduleLayout;
+
+    @Inject
+    public CiVisibilityPluginExtension(ObjectFactory objectFactory) {
+        this.objectFactory = objectFactory;
+    }
+
+    public void setCompilerPluginClasspath(FileCollection compilerPluginClasspath) {
+        this.compilerPluginClasspath = compilerPluginClasspath;
+    }
+
+    public void setModuleName(String moduleName) {
+        this.moduleName = moduleName;
+    }
+
+    public void setModuleLayout(BuildModuleLayout moduleLayout) {
+        this.moduleLayout = moduleLayout;
+    }
+
+    @ServiceReference
+    abstract Property<CiVisibilityService> getCiVisibilityService();
+
+    public boolean isCompilerPluginEnabled() {
+        return getCiVisibilityService().get().isCompilerPluginEnabled();
+    }
+
+    public String getCompilerPluginVersion() {
+        return getCiVisibilityService().get().getCompilerPluginVersion();
+    }
+
+    public boolean isJacocoInjectionEnabled() {
+        CiVisibilityService ciVisibilityService = getCiVisibilityService().get();
+        return ciVisibilityService.isJacocoInjectionEnabled();
+    }
+
+    public List<String> getCoverageEnabledSourceSets() {
+        return getCiVisibilityService().get().getCoverageEnabledSourceSets();
+    }
+
+    public String getJacocoVersion() {
+        return getCiVisibilityService().get().getJacocoVersion();
+    }
+
+    public void applyTo(JavaCompile javaCompile) {
+        CompileOptions options = javaCompile.getOptions();
+        ForkOptions forkOptions = options.getForkOptions();
+        String compilerExecutable = forkOptions.getExecutable();
+        if (compilerExecutable != null && !compilerExecutable.isEmpty()) {
+            // assuming a non-standard compiler is used
+            return;
+        }
+
+        FileCollection classpath = javaCompile.getClasspath();
+        FileCollection updatedClasspath =
+                classpath != null ? classpath.plus(compilerPluginClasspath) : compilerPluginClasspath;
+        javaCompile.setClasspath(updatedClasspath);
+
+        FileCollection annotationProcessorPath = options.getAnnotationProcessorPath();
+        FileCollection updatedAnnotationProcessorPath = annotationProcessorPath != null
+                ? annotationProcessorPath.plus(compilerPluginClasspath)
+                : compilerPluginClasspath;
+        options.setAnnotationProcessorPath(updatedAnnotationProcessorPath);
+
+        CommandLineArgumentProvider argumentProvider = new JavaCompilerPluginArgumentsProvider(moduleName);
+        options.getCompilerArgumentProviders().add(argumentProvider);
+    }
+
+    public void applyTo(Test task) {
+        task.getInputs().property(MODULE_LAYOUT_PROPERTY, moduleLayout);
+
+        applyTracerSettings(task.getPath(), getProjectProperties(task), task.getJvmArgumentProviders());
+
+        JacocoTaskExtension jacocoTaskExtension = task.getExtensions().findByType(JacocoTaskExtension.class);
+        if (jacocoTaskExtension != null) {
+            applyJacocoSettings(jacocoTaskExtension);
         }
-      }
-    }
-    return merged;
-  }
-
-  private void applyTracerSettings(
-      String taskPath,
-      Map<String, String> projectProperties,
-      List<CommandLineArgumentProvider> jvmArgumentProviders) {
-    CommandLineArgumentProvider tracerArgumentsProvider =
-        objectFactory.newInstance(TracerArgumentsProvider.class, taskPath, projectProperties);
-    jvmArgumentProviders.add(tracerArgumentsProvider);
-  }
+    }
+
+    public static Path getEffectiveExecutable(Test task) {
+        Property<JavaLauncher> javaLauncher = task.getJavaLauncher();
+        if (javaLauncher.isPresent()) {
+            try {
+                return javaLauncher.get().getExecutablePath().getAsFile().toPath();
+            } catch (Exception e) {
+                LOGGER.error("Could not get Java launcher for test task", e);
+            }
+        }
+        String executable = task.getExecutable();
+        if (executable != null && !executable.isEmpty()) {
+            return Paths.get(executable);
+        } else {
+            return Jvm.current().getJavaExecutable().toPath();
+        }
+    }
+
+    public static List<Path> getClasspath(Test task) {
+        try {
+            return task.getClasspath().getFiles().stream().map(File::toPath).collect(Collectors.toList());
+        } catch (Exception e) {
+            LOGGER.error("Could not get classpath for test task", e);
+            return null;
+        }
+    }
+
+    private static Map<String, String> getProjectProperties(Test task) {
+        Map<String, String> projectProperties = new HashMap<>();
+        for (Map.Entry<String, ?> e : task.getProject().getProperties().entrySet()) {
+            String propertyName = e.getKey();
+            Object propertyValue = e.getValue();
+            if (propertyValue instanceof String) {
+                projectProperties.put(propertyName, (String) propertyValue);
+            }
+        }
+        return projectProperties;
+    }
+
+    private void applyJacocoSettings(JacocoTaskExtension jacocoTaskExtension) {
+        CiVisibilityService ciVisibilityService = getCiVisibilityService().get();
+
+        List<String> taskExcludeClassLoaders = jacocoTaskExtension.getExcludeClassLoaders();
+        if (taskExcludeClassLoaders != null) {
+            // taskExcludeClassLoaders list may be immutable, so we need to construct a new one
+            List<String> ciVisExcludedClassLoaders = ciVisibilityService.getExcludeClassLoaders();
+            List<String> updatedTaskExcludeClassLoaders =
+                    new ArrayList<>(taskExcludeClassLoaders.size() + ciVisExcludedClassLoaders.size());
+            updatedTaskExcludeClassLoaders.addAll(taskExcludeClassLoaders);
+            updatedTaskExcludeClassLoaders.addAll(ciVisExcludedClassLoaders);
+            jacocoTaskExtension.setExcludeClassLoaders(updatedTaskExcludeClassLoaders);
+        } else {
+            jacocoTaskExtension.setExcludeClassLoaders(new ArrayList<>(ciVisibilityService.getExcludeClassLoaders()));
+        }
+
+        jacocoTaskExtension.setIncludes(
+                merge(jacocoTaskExtension.getIncludes(), ciVisibilityService.getCoverageIncludedPackages()));
+        jacocoTaskExtension.setExcludes(
+                merge(jacocoTaskExtension.getExcludes(), ciVisibilityService.getCoverageExcludedPackages()));
+    }
+
+    @SafeVarargs
+    private static List<String> merge(List<String>... packageLists) {
+        List<String> merged = new ArrayList<>();
+        for (List<String> packageList : packageLists) {
+            if (packageList == null) {
+                continue;
+            }
+            for (String pkg : packageList) {
+                if (pkg != null && !pkg.isEmpty()) {
+                    merged.add(pkg);
+                }
+            }
+        }
+        return merged;
+    }
+
+    private void applyTracerSettings(
+            String taskPath,
+            Map<String, String> projectProperties,
+            List<CommandLineArgumentProvider> jvmArgumentProviders) {
+        CommandLineArgumentProvider tracerArgumentsProvider =
+                objectFactory.newInstance(TracerArgumentsProvider.class, taskPath, projectProperties);
+        jvmArgumentProviders.add(tracerArgumentsProvider);
+    }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityService.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityService.java
index 6d4462f15b0..287e0c95c97 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityService.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityService.java
@@ -24,141 +24,125 @@
 import org.gradle.tooling.events.OperationCompletionListener;
 
 public abstract class CiVisibilityService
-    implements BuildService<BuildServiceParameters.None>, OperationCompletionListener {
-
-  // using constant session key, since the service is already build-scoped
-  private static final Object SESSION_KEY = new Object();
-  private final Config config = Config.get();
-  private final BuildEventsHandler<Object> buildEventsHandler =
-      InstrumentationBridge.createBuildEventsHandler();
-
-  public boolean isCompilerPluginEnabled() {
-    return config.isCiVisibilityCompilerPluginAutoConfigurationEnabled();
-  }
-
-  public String getCompilerPluginVersion() {
-    return config.getCiVisibilityCompilerPluginVersion();
-  }
-
-  public boolean isJacocoInjectionEnabled() {
-    return config.isCiVisibilityJacocoPluginVersionProvided()
-        || buildEventsHandler.getSessionSettings(SESSION_KEY).isCoverageReportUploadEnabled();
-  }
-
-  public String getJacocoVersion() {
-    return config.getCiVisibilityJacocoPluginVersion();
-  }
-
-  public List<String> getExcludeClassLoaders() {
-    return Collections.singletonList(DatadogClassLoader.class.getName());
-  }
-
-  public List<String> getCoverageEnabledSourceSets() {
-    return config.getCiVisibilityJacocoGradleSourceSets();
-  }
-
-  public List<String> getCoverageIncludedPackages() {
-    BuildSessionSettings sessionSettings = buildEventsHandler.getSessionSettings(SESSION_KEY);
-    return sessionSettings.getCoverageIncludedPackages();
-  }
-
-  public List<String> getCoverageExcludedPackages() {
-    BuildSessionSettings sessionSettings = buildEventsHandler.getSessionSettings(SESSION_KEY);
-    return sessionSettings.getCoverageExcludedPackages();
-  }
-
-  @SuppressForbidden
-  public Collection<String> getTracerJvmArgs(String taskPath) {
-    List<String> jvmArgs = new ArrayList<>();
-
-    BuildModuleSettings moduleSettings =
-        buildEventsHandler.getModuleSettings(SESSION_KEY, taskPath);
-    Map<String, String> propagatedSystemProperties = moduleSettings.getSystemProperties();
-    // propagate to child process all "dd." system properties available in current process
-    for (Map.Entry<String, String> e : propagatedSystemProperties.entrySet()) {
-      jvmArgs.add("-D" + e.getKey() + '=' + e.getValue());
-    }
-
-    Integer ciVisibilityDebugPort = config.getCiVisibilityDebugPort();
-    if (ciVisibilityDebugPort != null) {
-      jvmArgs.add(
-          "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=" + ciVisibilityDebugPort);
-    }
-
-    String additionalArgs = config.getCiVisibilityAdditionalChildProcessJvmArgs();
-    if (additionalArgs != null) {
-      List<String> splitArgs = Arrays.asList(additionalArgs.split(" "));
-      jvmArgs.addAll(splitArgs);
-    }
-
-    jvmArgs.add("-javaagent:" + config.getCiVisibilityAgentJarFile().toPath());
-
-    return jvmArgs;
-  }
-
-  public void onBuildStart(
-      String buildPath,
-      Path projectRoot,
-      String startCommand,
-      String gradleVersion,
-      boolean nestedBuild) {
-    Map<String, Object> additionalTags =
-        nestedBuild
-            ? Collections.singletonMap(Tags.TEST_GRADLE_NESTED_BUILD, true)
-            : Collections.emptyMap();
-    buildEventsHandler.onTestSessionStart(
-        SESSION_KEY, buildPath, projectRoot, startCommand, "gradle", gradleVersion, additionalTags);
-  }
-
-  public void onBuildTaskStart(String taskPath) {
-    buildEventsHandler.onBuildTaskStart(SESSION_KEY, taskPath, Collections.emptyMap());
-  }
-
-  public void onBuildTaskFinish(String taskPath, @Nullable Throwable failure) {
-    if (failure != null) {
-      buildEventsHandler.onBuildTaskFail(SESSION_KEY, taskPath, failure);
-    }
-    buildEventsHandler.onBuildTaskFinish(SESSION_KEY, taskPath);
-  }
-
-  public void onModuleStart(
-      String taskPath,
-      boolean isAndroid,
-      BuildModuleLayout moduleLayout,
-      Path jvmExecutable,
-      Collection<Path> taskClasspath,
-      JavaAgent jacocoAgent) {
-    Map<String, Object> additionalTags =
-        isAndroid ? Collections.singletonMap(Tags.TEST_IS_ANDROID, true) : Collections.emptyMap();
-    buildEventsHandler.onTestModuleStart(
-        SESSION_KEY,
-        taskPath,
-        moduleLayout,
-        jvmExecutable,
-        taskClasspath,
-        jacocoAgent,
-        additionalTags);
-  }
-
-  public void onModuleFinish(
-      String taskPath, @Nullable Throwable failure, @Nullable String skipReason) {
-    if (failure != null) {
-      buildEventsHandler.onTestModuleFail(SESSION_KEY, taskPath, failure);
-    } else if (skipReason != null) {
-      buildEventsHandler.onTestModuleSkip(SESSION_KEY, taskPath, skipReason);
-    }
-    buildEventsHandler.onTestModuleFinish(SESSION_KEY, taskPath);
-  }
-
-  public void onBuildFinish(@Nullable Throwable failure) {
-    if (failure != null) {
-      buildEventsHandler.onTestSessionFail(SESSION_KEY, failure);
-    }
-    buildEventsHandler.onTestSessionFinish(SESSION_KEY);
-  }
-
-  @Override
-  public void onFinish(FinishEvent event) {
-    // do nothing
-  }
+        implements BuildService<BuildServiceParameters.None>, OperationCompletionListener {
+
+    // using constant session key, since the service is already build-scoped
+    private static final Object SESSION_KEY = new Object();
+    private final Config config = Config.get();
+    private final BuildEventsHandler<Object> buildEventsHandler = InstrumentationBridge.createBuildEventsHandler();
+
+    public boolean isCompilerPluginEnabled() {
+        return config.isCiVisibilityCompilerPluginAutoConfigurationEnabled();
+    }
+
+    public String getCompilerPluginVersion() {
+        return config.getCiVisibilityCompilerPluginVersion();
+    }
+
+    public boolean isJacocoInjectionEnabled() {
+        return config.isCiVisibilityJacocoPluginVersionProvided()
+                || buildEventsHandler.getSessionSettings(SESSION_KEY).isCoverageReportUploadEnabled();
+    }
+
+    public String getJacocoVersion() {
+        return config.getCiVisibilityJacocoPluginVersion();
+    }
+
+    public List<String> getExcludeClassLoaders() {
+        return Collections.singletonList(DatadogClassLoader.class.getName());
+    }
+
+    public List<String> getCoverageEnabledSourceSets() {
+        return config.getCiVisibilityJacocoGradleSourceSets();
+    }
+
+    public List<String> getCoverageIncludedPackages() {
+        BuildSessionSettings sessionSettings = buildEventsHandler.getSessionSettings(SESSION_KEY);
+        return sessionSettings.getCoverageIncludedPackages();
+    }
+
+    public List<String> getCoverageExcludedPackages() {
+        BuildSessionSettings sessionSettings = buildEventsHandler.getSessionSettings(SESSION_KEY);
+        return sessionSettings.getCoverageExcludedPackages();
+    }
+
+    @SuppressForbidden
+    public Collection<String> getTracerJvmArgs(String taskPath) {
+        List<String> jvmArgs = new ArrayList<>();
+
+        BuildModuleSettings moduleSettings = buildEventsHandler.getModuleSettings(SESSION_KEY, taskPath);
+        Map<String, String> propagatedSystemProperties = moduleSettings.getSystemProperties();
+        // propagate to child process all "dd." system properties available in current process
+        for (Map.Entry<String, String> e : propagatedSystemProperties.entrySet()) {
+            jvmArgs.add("-D" + e.getKey() + '=' + e.getValue());
+        }
+
+        Integer ciVisibilityDebugPort = config.getCiVisibilityDebugPort();
+        if (ciVisibilityDebugPort != null) {
+            jvmArgs.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=" + ciVisibilityDebugPort);
+        }
+
+        String additionalArgs = config.getCiVisibilityAdditionalChildProcessJvmArgs();
+        if (additionalArgs != null) {
+            List<String> splitArgs = Arrays.asList(additionalArgs.split(" "));
+            jvmArgs.addAll(splitArgs);
+        }
+
+        jvmArgs.add("-javaagent:" + config.getCiVisibilityAgentJarFile().toPath());
+
+        return jvmArgs;
+    }
+
+    public void onBuildStart(
+            String buildPath, Path projectRoot, String startCommand, String gradleVersion, boolean nestedBuild) {
+        Map<String, Object> additionalTags =
+                nestedBuild ? Collections.singletonMap(Tags.TEST_GRADLE_NESTED_BUILD, true) : Collections.emptyMap();
+        buildEventsHandler.onTestSessionStart(
+                SESSION_KEY, buildPath, projectRoot, startCommand, "gradle", gradleVersion, additionalTags);
+    }
+
+    public void onBuildTaskStart(String taskPath) {
+        buildEventsHandler.onBuildTaskStart(SESSION_KEY, taskPath, Collections.emptyMap());
+    }
+
+    public void onBuildTaskFinish(String taskPath, @Nullable Throwable failure) {
+        if (failure != null) {
+            buildEventsHandler.onBuildTaskFail(SESSION_KEY, taskPath, failure);
+        }
+        buildEventsHandler.onBuildTaskFinish(SESSION_KEY, taskPath);
+    }
+
+    public void onModuleStart(
+            String taskPath,
+            boolean isAndroid,
+            BuildModuleLayout moduleLayout,
+            Path jvmExecutable,
+            Collection<Path> taskClasspath,
+            JavaAgent jacocoAgent) {
+        Map<String, Object> additionalTags =
+                isAndroid ? Collections.singletonMap(Tags.TEST_IS_ANDROID, true) : Collections.emptyMap();
+        buildEventsHandler.onTestModuleStart(
+                SESSION_KEY, taskPath, moduleLayout, jvmExecutable, taskClasspath, jacocoAgent, additionalTags);
+    }
+
+    public void onModuleFinish(String taskPath, @Nullable Throwable failure, @Nullable String skipReason) {
+        if (failure != null) {
+            buildEventsHandler.onTestModuleFail(SESSION_KEY, taskPath, failure);
+        } else if (skipReason != null) {
+            buildEventsHandler.onTestModuleSkip(SESSION_KEY, taskPath, skipReason);
+        }
+        buildEventsHandler.onTestModuleFinish(SESSION_KEY, taskPath);
+    }
+
+    public void onBuildFinish(@Nullable Throwable failure) {
+        if (failure != null) {
+            buildEventsHandler.onTestSessionFail(SESSION_KEY, failure);
+        }
+        buildEventsHandler.onTestSessionFinish(SESSION_KEY);
+    }
+
+    @Override
+    public void onFinish(FinishEvent event) {
+        // do nothing
+    }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java
index bb81be31f8a..6d9c924beb7 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java
@@ -17,53 +17,53 @@
 
 @AutoService(InstrumenterModule.class)
 public class GradleBuildScopeServices_8_10_Instrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public GradleBuildScopeServices_8_10_Instrumentation() {
-    super("gradle", "gradle-build-scope-services");
-  }
+    public GradleBuildScopeServices_8_10_Instrumentation() {
+        super("gradle", "gradle-build-scope-services");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Instrument Gradle [8.10 ... )
-    return hasClassNamed("org.gradle.internal.classpath.transforms.AdhocInterceptors");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Instrument Gradle [8.10 ... )
+        return hasClassNamed("org.gradle.internal.classpath.transforms.AdhocInterceptors");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.gradle.internal.service.ScopedServiceRegistry";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.gradle.internal.service.ScopedServiceRegistry";
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled();
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled();
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(0, Class.class))
-            .and(takesArgument(1, boolean.class))
-            .and(takesArgument(3, named("org.gradle.internal.service.ServiceRegistry[]"))),
-        getClass().getName() + "$Construct");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(0, Class.class))
+                        .and(takesArgument(1, boolean.class))
+                        .and(takesArgument(3, named("org.gradle.internal.service.ServiceRegistry[]"))),
+                getClass().getName() + "$Construct");
+    }
 
-  public static class Construct {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterConstructor(
-        @Advice.This final DefaultServiceRegistry buildScopeServices,
-        @Advice.Argument(0) final Class<? extends Scope> scope,
-        @Advice.Argument(3) final ServiceRegistry[] parentServices) {
-      if (scope.getSimpleName().equals("Build")) {
-        CiVisibilityGradleListenerInjector_8_10.injectCiVisibilityGradleListener(
-            buildScopeServices, parentServices);
-      }
+    public static class Construct {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterConstructor(
+                @Advice.This final DefaultServiceRegistry buildScopeServices,
+                @Advice.Argument(0) final Class<? extends Scope> scope,
+                @Advice.Argument(3) final ServiceRegistry[] parentServices) {
+            if (scope.getSimpleName().equals("Build")) {
+                CiVisibilityGradleListenerInjector_8_10.injectCiVisibilityGradleListener(
+                        buildScopeServices, parentServices);
+            }
+        }
     }
-  }
 
-  @Override
-  public String muzzleDirective() {
-    return "skipMuzzle";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "skipMuzzle";
+    }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java
index 71fd02280ad..6220f2ef555 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java
@@ -15,46 +15,45 @@
 
 @AutoService(InstrumenterModule.class)
 public class GradleBuildScopeServices_8_3_Instrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public GradleBuildScopeServices_8_3_Instrumentation() {
-    super("gradle", "gradle-build-scope-services");
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Instrument Gradle [8.3 ... 8.10)
-    return hasClassNamed("org.gradle.api.file.ConfigurableFilePermissions")
-        .and(not(hasClassNamed("org.gradle.internal.classpath.transforms.AdhocInterceptors")));
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.gradle.internal.service.scopes.BuildScopeServices";
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled();
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
-  }
-
-  public static class Construct {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterConstructor(
-        @Advice.This final DefaultServiceRegistry buildScopeServices,
-        @Advice.Argument(0) final ServiceRegistry parentServices) {
-      CiVisibilityGradleListenerInjector_8_3.injectCiVisibilityGradleListener(
-          buildScopeServices, parentServices);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public GradleBuildScopeServices_8_3_Instrumentation() {
+        super("gradle", "gradle-build-scope-services");
+    }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Instrument Gradle [8.3 ... 8.10)
+        return hasClassNamed("org.gradle.api.file.ConfigurableFilePermissions")
+                .and(not(hasClassNamed("org.gradle.internal.classpath.transforms.AdhocInterceptors")));
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.gradle.internal.service.scopes.BuildScopeServices";
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled();
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
     }
-  }
 
-  @Override
-  public String muzzleDirective() {
-    return "skipMuzzle";
-  }
+    public static class Construct {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterConstructor(
+                @Advice.This final DefaultServiceRegistry buildScopeServices,
+                @Advice.Argument(0) final ServiceRegistry parentServices) {
+            CiVisibilityGradleListenerInjector_8_3.injectCiVisibilityGradleListener(buildScopeServices, parentServices);
+        }
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "skipMuzzle";
+    }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonInjectionUtils.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonInjectionUtils.java
index 69528065c3e..e1c44ec4fb6 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonInjectionUtils.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonInjectionUtils.java
@@ -12,36 +12,34 @@
 
 public class GradleDaemonInjectionUtils {
 
-  public static Map<String, String> addJavaagentToGradleDaemonProperties(
-      Map<String, String> jvmOptions) {
-    if (SystemProperties.get(propertyNameToSystemPropertyName(CIVISIBILITY_INJECTED_TRACER_VERSION))
-        != null) {
-      // This Gradle launcher is started by a process that is itself instrumented,
-      // most likely this is a Gradle build using Gradle Test Kit to fork another Gradle instance
-      // (e.g. to test a Gradle plugin).
-      // We don't want to instrument/trace such "nested" Gradle instances
-      return jvmOptions;
-    }
+    public static Map<String, String> addJavaagentToGradleDaemonProperties(Map<String, String> jvmOptions) {
+        if (SystemProperties.get(propertyNameToSystemPropertyName(CIVISIBILITY_INJECTED_TRACER_VERSION)) != null) {
+            // This Gradle launcher is started by a process that is itself instrumented,
+            // most likely this is a Gradle build using Gradle Test Kit to fork another Gradle instance
+            // (e.g. to test a Gradle plugin).
+            // We don't want to instrument/trace such "nested" Gradle instances
+            return jvmOptions;
+        }
 
-    File agentJar = Config.get().getCiVisibilityAgentJarFile();
-    Path agentJarPath = agentJar.toPath();
-    StringBuilder agentArg = new StringBuilder("-javaagent:").append(agentJarPath).append('=');
+        File agentJar = Config.get().getCiVisibilityAgentJarFile();
+        Path agentJarPath = agentJar.toPath();
+        StringBuilder agentArg =
+                new StringBuilder("-javaagent:").append(agentJarPath).append('=');
 
-    for (Map.Entry<String, String> p : SystemProperties.asStringMap().entrySet()) {
-      String propertyName = p.getKey();
-      String propertyValue = p.getValue();
-      if (propertyName.startsWith(Config.PREFIX)) {
-        agentArg
-            .append(propertyName)
-            .append("='")
-            .append(propertyValue.replace("'", "'\\''"))
-            .append("',");
-      }
-    }
+        for (Map.Entry<String, String> p : SystemProperties.asStringMap().entrySet()) {
+            String propertyName = p.getKey();
+            String propertyValue = p.getValue();
+            if (propertyName.startsWith(Config.PREFIX)) {
+                agentArg.append(propertyName)
+                        .append("='")
+                        .append(propertyValue.replace("'", "'\\''"))
+                        .append("',");
+            }
+        }
 
-    // creating a new map in case jvmOptions is immutable
-    Map<String, String> updatedJvmOptions = new HashMap<>(jvmOptions);
-    updatedJvmOptions.merge("org.gradle.jvmargs", agentArg.toString(), (o, n) -> o + " " + n);
-    return updatedJvmOptions;
-  }
+        // creating a new map in case jvmOptions is immutable
+        Map<String, String> updatedJvmOptions = new HashMap<>(jvmOptions);
+        updatedJvmOptions.merge("org.gradle.jvmargs", agentArg.toString(), (o, n) -> o + " " + n);
+        return updatedJvmOptions;
+    }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonLoggingInstrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonLoggingInstrumentation.java
index feb81d78935..1ae70749c05 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonLoggingInstrumentation.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonLoggingInstrumentation.java
@@ -10,39 +10,39 @@
 
 @AutoService(InstrumenterModule.class)
 public class GradleDaemonLoggingInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public GradleDaemonLoggingInstrumentation() {
-    super("gradle", "gradle-daemon-logging");
-  }
+    public GradleDaemonLoggingInstrumentation() {
+        super("gradle", "gradle-daemon-logging");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.gradle.launcher.daemon.bootstrap.DaemonMain";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.gradle.launcher.daemon.bootstrap.DaemonMain";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("initialiseLogging"),
-        GradleDaemonLoggingInstrumentation.class.getName() + "$ReinitialiseLogging");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("initialiseLogging"),
+                GradleDaemonLoggingInstrumentation.class.getName() + "$ReinitialiseLogging");
+    }
 
-  /**
-   * Gradle Daemon closes original {@link System.out} and {@link System.err} streams (see {@link
-   * org.gradle.launcher.daemon.bootstrap.DaemonMain#daemonStarted}), and replaces them with Gradle
-   * Daemon log streams (see {@link
-   * org.gradle.launcher.daemon.bootstrap.DaemonMain#initialiseLogging}).
-   *
-   * <p>{@link datadog.trace.logging.simplelogger.SLCompatFactory} that contains logging settings
-   * gets initialized before Gradle Daemon, so DD logging settings refer to the original streams
-   * that the daemon closes. They need to refer to the new streams created by the daemon, so here we
-   * reset the settings letting them re-initialize to capture the new streams.
-   */
-  public static class ReinitialiseLogging {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void reinitialiseTracerLogging() {
-      GlobalLogLevelSwitcher.get().reinitialize();
+    /**
+     * Gradle Daemon closes original {@link System.out} and {@link System.err} streams (see {@link
+     * org.gradle.launcher.daemon.bootstrap.DaemonMain#daemonStarted}), and replaces them with Gradle
+     * Daemon log streams (see {@link
+     * org.gradle.launcher.daemon.bootstrap.DaemonMain#initialiseLogging}).
+     *
+     * <p>{@link datadog.trace.logging.simplelogger.SLCompatFactory} that contains logging settings
+     * gets initialized before Gradle Daemon, so DD logging settings refer to the original streams
+     * that the daemon closes. They need to refer to the new streams created by the daemon, so here we
+     * reset the settings letting them re-initialize to capture the new streams.
+     */
+    public static class ReinitialiseLogging {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void reinitialiseTracerLogging() {
+            GlobalLogLevelSwitcher.get().reinitialize();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java
index 4c93db0125b..122e73864dc 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java
@@ -19,34 +19,34 @@
  */
 @AutoService(InstrumenterModule.class)
 public class GradleLauncherInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public GradleLauncherInstrumentation() {
-    super("gradle", "gradle-daemon-jvm-options");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.gradle.launcher.configuration.AllProperties";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getProperties"),
-        GradleLauncherInstrumentation.class.getName() + "$PropertiesAugmentationAdvice");
-  }
-
-  public static class PropertiesAugmentationAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void addJavaagentToGradleDaemonProperties(
-        @Advice.Return(readOnly = false) Map<String, String> jvmOptions) {
-      jvmOptions = GradleDaemonInjectionUtils.addJavaagentToGradleDaemonProperties(jvmOptions);
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public GradleLauncherInstrumentation() {
+        super("gradle", "gradle-daemon-jvm-options");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.gradle.launcher.configuration.AllProperties";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getProperties"),
+                GradleLauncherInstrumentation.class.getName() + "$PropertiesAugmentationAdvice");
+    }
+
+    public static class PropertiesAugmentationAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void addJavaagentToGradleDaemonProperties(
+                @Advice.Return(readOnly = false) Map<String, String> jvmOptions) {
+            jvmOptions = GradleDaemonInjectionUtils.addJavaagentToGradleDaemonProperties(jvmOptions);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java
index 6aaee670402..d45b71c6d8f 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java
@@ -10,56 +10,56 @@
 
 @AutoService(InstrumenterModule.class)
 public class GradlePluginInjectorInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType {
+        implements Instrumenter.ForSingleType {
 
-  public GradlePluginInjectorInstrumentation() {
-    super("gradle", "gradle-plugin-injector");
-  }
+    public GradlePluginInjectorInstrumentation() {
+        super("gradle", "gradle-plugin-injector");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Only instrument Gradle 8.3+
-    return hasClassNamed("org.gradle.api.file.ConfigurableFilePermissions");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Only instrument Gradle 8.3+
+        return hasClassNamed("org.gradle.api.file.ConfigurableFilePermissions");
+    }
 
-  /**
-   * There are several class loaders in Gradle that load various parts of the system: core classes,
-   * plugins, etc. CI Visibility listener and plugin (as well as the rest of the helper classes)
-   * need to be injected into the plugins classloader because they refer to classes from Gradle
-   * Testing JVM (e.g. {@link org.gradle.api.tasks.testing.Test}), which are loaded by the plugins
-   * CL. The purpose of this instrumentation is only to inject the classes into the classloader, so
-   * that they could be used from elsewhere.
-   *
-   * <p>{@link org.gradle.platform.base.Platform} was chosen as the instrumented type since it is
-   * loaded early in the build lifecycle, therefore the injected classes can be safely used by the
-   * services that are initialized later on.
-   */
-  @Override
-  public String instrumentedType() {
-    return "org.gradle.platform.base.Platform";
-  }
+    /**
+     * There are several class loaders in Gradle that load various parts of the system: core classes,
+     * plugins, etc. CI Visibility listener and plugin (as well as the rest of the helper classes)
+     * need to be injected into the plugins classloader because they refer to classes from Gradle
+     * Testing JVM (e.g. {@link org.gradle.api.tasks.testing.Test}), which are loaded by the plugins
+     * CL. The purpose of this instrumentation is only to inject the classes into the classloader, so
+     * that they could be used from elsewhere.
+     *
+     * <p>{@link org.gradle.platform.base.Platform} was chosen as the instrumented type since it is
+     * loaded early in the build lifecycle, therefore the injected classes can be safely used by the
+     * services that are initialized later on.
+     */
+    @Override
+    public String instrumentedType() {
+        return "org.gradle.platform.base.Platform";
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled();
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled();
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".CiVisibilityService",
-      packageName + ".JavaCompilerPluginArgumentsProvider",
-      packageName + ".TracerArgumentsProvider",
-      packageName + ".AndroidGradleUtils",
-      packageName + ".CiVisibilityGradleListener",
-      packageName + ".CiVisibilityGradleListener$EmptyTestTaskListener",
-      packageName + ".CiVisibilityPluginExtension",
-      packageName + ".CiVisibilityPlugin"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".CiVisibilityService",
+            packageName + ".JavaCompilerPluginArgumentsProvider",
+            packageName + ".TracerArgumentsProvider",
+            packageName + ".AndroidGradleUtils",
+            packageName + ".CiVisibilityGradleListener",
+            packageName + ".CiVisibilityGradleListener$EmptyTestTaskListener",
+            packageName + ".CiVisibilityPluginExtension",
+            packageName + ".CiVisibilityPlugin"
+        };
+    }
 
-  @Override
-  public boolean useAgentCodeSource() {
-    return true;
-  }
+    @Override
+    public boolean useAgentCodeSource() {
+        return true;
+    }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleServiceValidationInstrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleServiceValidationInstrumentation.java
index e100cacaa1a..a08546d1411 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleServiceValidationInstrumentation.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleServiceValidationInstrumentation.java
@@ -25,37 +25,37 @@
  */
 @AutoService(InstrumenterModule.class)
 public class GradleServiceValidationInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public GradleServiceValidationInstrumentation() {
-    super("gradle", "gradle-build-scope-services");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.gradle.internal.service.ServiceScopeValidatorWorkarounds";
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled();
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("shouldSuppressValidation").and(takesArgument(0, Class.class)),
-        getClass().getName() + "$SuppressValidation");
-  }
-
-  public static class SuppressValidation {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void suppressValidationForCiVisService(
-        @Advice.Argument(0) final Class<?> validatedClass,
-        @Advice.Return(readOnly = false) boolean suppressValidation) {
-      if (validatedClass.getName().endsWith("CiVisibilityGradleListener")) {
-        suppressValidation = true;
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public GradleServiceValidationInstrumentation() {
+        super("gradle", "gradle-build-scope-services");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.gradle.internal.service.ServiceScopeValidatorWorkarounds";
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled();
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("shouldSuppressValidation").and(takesArgument(0, Class.class)),
+                getClass().getName() + "$SuppressValidation");
+    }
+
+    public static class SuppressValidation {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void suppressValidationForCiVisService(
+                @Advice.Argument(0) final Class<?> validatedClass,
+                @Advice.Return(readOnly = false) boolean suppressValidation) {
+            if (validatedClass.getName().endsWith("CiVisibilityGradleListener")) {
+                suppressValidation = true;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/JavaCompilerPluginArgumentsProvider.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/JavaCompilerPluginArgumentsProvider.java
index 2860506252e..a8e6c54904a 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/JavaCompilerPluginArgumentsProvider.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/JavaCompilerPluginArgumentsProvider.java
@@ -5,27 +5,27 @@
 import org.gradle.process.CommandLineArgumentProvider;
 
 public class JavaCompilerPluginArgumentsProvider implements CommandLineArgumentProvider {
-  private final String moduleName;
+    private final String moduleName;
 
-  public JavaCompilerPluginArgumentsProvider(String moduleName) {
-    this.moduleName = moduleName;
-  }
+    public JavaCompilerPluginArgumentsProvider(String moduleName) {
+        this.moduleName = moduleName;
+    }
 
-  @Override
-  public Iterable<String> asArguments() {
-    List<String> arguments = new ArrayList<>();
-    arguments.add("-Xplugin:DatadogCompilerPlugin");
+    @Override
+    public Iterable<String> asArguments() {
+        List<String> arguments = new ArrayList<>();
+        arguments.add("-Xplugin:DatadogCompilerPlugin");
 
-    // disable compiler warnings related to annotation processing,
-    // since "fail-on-warning" linters might complain about the annotation that the compiler plugin
-    // injects
-    arguments.add("-Xlint:-processing");
+        // disable compiler warnings related to annotation processing,
+        // since "fail-on-warning" linters might complain about the annotation that the compiler plugin
+        // injects
+        arguments.add("-Xlint:-processing");
 
-    if (moduleName != null) {
-      arguments.add("--add-reads");
-      arguments.add(moduleName + "=ALL-UNNAMED");
-    }
+        if (moduleName != null) {
+            arguments.add("--add-reads");
+            arguments.add(moduleName + "=ALL-UNNAMED");
+        }
 
-    return arguments;
-  }
+        return arguments;
+    }
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/TracerArgumentsProvider.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/TracerArgumentsProvider.java
index 3e257623f8c..a9604a316cc 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/TracerArgumentsProvider.java
+++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/TracerArgumentsProvider.java
@@ -11,35 +11,35 @@
 import org.gradle.process.CommandLineArgumentProvider;
 
 public abstract class TracerArgumentsProvider implements CommandLineArgumentProvider {
-  private static final Pattern PROJECT_PROPERTY_REFERENCE = Pattern.compile("\\$\\{([^}]+)\\}");
+    private static final Pattern PROJECT_PROPERTY_REFERENCE = Pattern.compile("\\$\\{([^}]+)\\}");
 
-  private final String taskPath;
-  private final Map<String, String> projectProperties;
+    private final String taskPath;
+    private final Map<String, String> projectProperties;
 
-  @Inject
-  public TracerArgumentsProvider(String taskPath, Map<String, String> projectProperties) {
-    this.taskPath = taskPath;
-    this.projectProperties = projectProperties;
-  }
+    @Inject
+    public TracerArgumentsProvider(String taskPath, Map<String, String> projectProperties) {
+        this.taskPath = taskPath;
+        this.projectProperties = projectProperties;
+    }
 
-  @ServiceReference
-  abstract Property<CiVisibilityService> getCiVisibilityService();
+    @ServiceReference
+    abstract Property<CiVisibilityService> getCiVisibilityService();
 
-  @Override
-  public Iterable<String> asArguments() {
-    Collection<String> tracerJvmArgs = getCiVisibilityService().get().getTracerJvmArgs(taskPath);
-    return tracerJvmArgs.stream().map(this::replaceProjectProperties).collect(Collectors.toList());
-  }
+    @Override
+    public Iterable<String> asArguments() {
+        Collection<String> tracerJvmArgs = getCiVisibilityService().get().getTracerJvmArgs(taskPath);
+        return tracerJvmArgs.stream().map(this::replaceProjectProperties).collect(Collectors.toList());
+    }
 
-  private String replaceProjectProperties(String s) {
-    StringBuffer output = new StringBuffer();
-    Matcher matcher = PROJECT_PROPERTY_REFERENCE.matcher(s);
-    while (matcher.find()) {
-      String propertyName = matcher.group(1);
-      Object propertyValue = projectProperties.get(propertyName);
-      matcher.appendReplacement(output, Matcher.quoteReplacement(String.valueOf(propertyValue)));
+    private String replaceProjectProperties(String s) {
+        StringBuffer output = new StringBuffer();
+        Matcher matcher = PROJECT_PROPERTY_REFERENCE.matcher(s);
+        while (matcher.find()) {
+            String propertyName = matcher.group(1);
+            Object propertyValue = projectProperties.get(propertyName);
+            matcher.appendReplacement(output, Matcher.quoteReplacement(String.valueOf(propertyValue)));
+        }
+        matcher.appendTail(output);
+        return output.toString();
     }
-    matcher.appendTail(output);
-    return output.toString();
-  }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLInstrumentation.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLInstrumentation.java
index 14c2753d1c0..7d456599166 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLInstrumentation.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLInstrumentation.java
@@ -32,90 +32,88 @@
 
 public final class GraphQLInstrumentation extends SimpleInstrumentation {
 
-  public static Instrumentation install(Instrumentation instrumentation) {
-    if (instrumentation == null) {
-      return new GraphQLInstrumentation();
+    public static Instrumentation install(Instrumentation instrumentation) {
+        if (instrumentation == null) {
+            return new GraphQLInstrumentation();
+        }
+        if (instrumentation.getClass() == GraphQLInstrumentation.class) {
+            return instrumentation;
+        }
+        List<Instrumentation> instrumentationList = new ArrayList<>();
+        if (instrumentation instanceof ChainedInstrumentation) {
+            List<Instrumentation> instrumentations = ((ChainedInstrumentation) instrumentation).getInstrumentations();
+            if (instrumentations.stream().anyMatch(v -> v.getClass() == GraphQLInstrumentation.class)) {
+                return instrumentation;
+            }
+            instrumentationList.addAll(instrumentations);
+        } else {
+            instrumentationList.add(instrumentation);
+        }
+        instrumentationList.add(new GraphQLInstrumentation());
+        return new ChainedInstrumentation(instrumentationList);
     }
-    if (instrumentation.getClass() == GraphQLInstrumentation.class) {
-      return instrumentation;
-    }
-    List<Instrumentation> instrumentationList = new ArrayList<>();
-    if (instrumentation instanceof ChainedInstrumentation) {
-      List<Instrumentation> instrumentations =
-          ((ChainedInstrumentation) instrumentation).getInstrumentations();
-      if (instrumentations.stream().anyMatch(v -> v.getClass() == GraphQLInstrumentation.class)) {
-        return instrumentation;
-      }
-      instrumentationList.addAll(instrumentations);
-    } else {
-      instrumentationList.add(instrumentation);
-    }
-    instrumentationList.add(new GraphQLInstrumentation());
-    return new ChainedInstrumentation(instrumentationList);
-  }
 
-  @Override
-  public State createState() {
-    return new State();
-  }
+    @Override
+    public State createState() {
+        return new State();
+    }
 
-  @Override
-  public InstrumentationContext<ExecutionResult> beginExecution(
-      InstrumentationExecutionParameters parameters) {
-    final AgentSpan requestSpan = startSpan(GRAPHQL_JAVA.toString(), GRAPHQL_REQUEST);
-    DECORATE.afterStart(requestSpan);
+    @Override
+    public InstrumentationContext<ExecutionResult> beginExecution(InstrumentationExecutionParameters parameters) {
+        final AgentSpan requestSpan = startSpan(GRAPHQL_JAVA.toString(), GRAPHQL_REQUEST);
+        DECORATE.afterStart(requestSpan);
 
-    State state = parameters.getInstrumentationState();
-    state.setRequestSpan(requestSpan);
-    // parameters.getOperation() is null
+        State state = parameters.getInstrumentationState();
+        state.setRequestSpan(requestSpan);
+        // parameters.getOperation() is null
 
-    return new ExecutionInstrumentationContext(state);
-  }
+        return new ExecutionInstrumentationContext(state);
+    }
 
-  @Override
-  public InstrumentationContext<ExecutionResult> beginExecuteOperation(
-      InstrumentationExecuteOperationParameters parameters) {
-    State state = parameters.getInstrumentationState();
-    AgentSpan requestSpan = state.getRequestSpan();
+    @Override
+    public InstrumentationContext<ExecutionResult> beginExecuteOperation(
+            InstrumentationExecuteOperationParameters parameters) {
+        State state = parameters.getInstrumentationState();
+        AgentSpan requestSpan = state.getRequestSpan();
 
-    OperationDefinition operationDefinition =
-        parameters.getExecutionContext().getOperationDefinition();
-    String operationName = operationDefinition.getName();
+        OperationDefinition operationDefinition =
+                parameters.getExecutionContext().getOperationDefinition();
+        String operationName = operationDefinition.getName();
 
-    requestSpan.setTag("graphql.operation.name", operationName);
-    String resourceName = operationName != null ? operationName : state.getQuery();
-    requestSpan.setResourceName(resourceName);
-    DECORATE.onRequest(requestSpan, parameters.getExecutionContext());
-    return SimpleInstrumentationContext.noOp();
-  }
+        requestSpan.setTag("graphql.operation.name", operationName);
+        String resourceName = operationName != null ? operationName : state.getQuery();
+        requestSpan.setResourceName(resourceName);
+        DECORATE.onRequest(requestSpan, parameters.getExecutionContext());
+        return SimpleInstrumentationContext.noOp();
+    }
 
-  @Override
-  public DataFetcher<?> instrumentDataFetcher(
-      final DataFetcher<?> dataFetcher, InstrumentationFieldFetchParameters parameters) {
-    State state = parameters.getInstrumentationState();
-    final AgentSpan requestSpan = state.getRequestSpan();
-    return new InstrumentedDataFetcher(dataFetcher, parameters, requestSpan);
-  }
+    @Override
+    public DataFetcher<?> instrumentDataFetcher(
+            final DataFetcher<?> dataFetcher, InstrumentationFieldFetchParameters parameters) {
+        State state = parameters.getInstrumentationState();
+        final AgentSpan requestSpan = state.getRequestSpan();
+        return new InstrumentedDataFetcher(dataFetcher, parameters, requestSpan);
+    }
 
-  @Override
-  public InstrumentationContext<Document> beginParse(
-      InstrumentationExecutionParameters parameters) {
-    State state = parameters.getInstrumentationState();
-    final AgentSpan parsingSpan =
-        startSpan(GRAPHQL_JAVA.toString(), GRAPHQL_PARSING, state.getRequestSpan().spanContext());
-    DECORATE.afterStart(parsingSpan);
-    return new ParsingInstrumentationContext(parsingSpan, state, parameters.getQuery());
-  }
+    @Override
+    public InstrumentationContext<Document> beginParse(InstrumentationExecutionParameters parameters) {
+        State state = parameters.getInstrumentationState();
+        final AgentSpan parsingSpan = startSpan(
+                GRAPHQL_JAVA.toString(), GRAPHQL_PARSING, state.getRequestSpan().spanContext());
+        DECORATE.afterStart(parsingSpan);
+        return new ParsingInstrumentationContext(parsingSpan, state, parameters.getQuery());
+    }
 
-  @Override
-  public InstrumentationContext<List<ValidationError>> beginValidation(
-      InstrumentationValidationParameters parameters) {
-    State state = parameters.getInstrumentationState();
+    @Override
+    public InstrumentationContext<List<ValidationError>> beginValidation(
+            InstrumentationValidationParameters parameters) {
+        State state = parameters.getInstrumentationState();
 
-    final AgentSpan validationSpan =
-        startSpan(
-            GRAPHQL_JAVA.toString(), GRAPHQL_VALIDATION, state.getRequestSpan().spanContext());
-    DECORATE.afterStart(validationSpan);
-    return new ValidationInstrumentationContext(validationSpan);
-  }
+        final AgentSpan validationSpan = startSpan(
+                GRAPHQL_JAVA.toString(),
+                GRAPHQL_VALIDATION,
+                state.getRequestSpan().spanContext());
+        DECORATE.afterStart(validationSpan);
+        return new ValidationInstrumentationContext(validationSpan);
+    }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLJavaInstrumentation.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLJavaInstrumentation.java
index 4c33771e369..71a70c07972 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLJavaInstrumentation.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLJavaInstrumentation.java
@@ -17,63 +17,62 @@
 
 @AutoService(InstrumenterModule.class)
 public class GraphQLJavaInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public GraphQLJavaInstrumentation() {
-    super("graphql-java");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "graphql.GraphQL";
-  }
+    public GraphQLJavaInstrumentation() {
+        super("graphql-java");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.graphqljava.GraphQLDecorator",
-      "datadog.trace.instrumentation.graphqljava.ParsingInstrumentationContext",
-      "datadog.trace.instrumentation.graphqljava.ExecutionInstrumentationContext",
-      "datadog.trace.instrumentation.graphqljava.ValidationInstrumentationContext",
-      "datadog.trace.instrumentation.graphqljava.State",
-      packageName + ".GraphQLInstrumentation",
-      "datadog.trace.instrumentation.graphqljava.GraphQLQuerySanitizer",
-      "datadog.trace.instrumentation.graphqljava.InstrumentedDataFetcher",
-      "datadog.trace.instrumentation.graphqljava.AsyncExceptionUnwrapper"
-    };
-  }
+    @Override
+    public String instrumentedType() {
+        return "graphql.GraphQL";
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // introduced in 20.0
-    return not(hasClassNamed("graphql.execution.instrumentation.SimplePerformantInstrumentation"));
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.graphqljava.GraphQLDecorator",
+            "datadog.trace.instrumentation.graphqljava.ParsingInstrumentationContext",
+            "datadog.trace.instrumentation.graphqljava.ExecutionInstrumentationContext",
+            "datadog.trace.instrumentation.graphqljava.ValidationInstrumentationContext",
+            "datadog.trace.instrumentation.graphqljava.State",
+            packageName + ".GraphQLInstrumentation",
+            "datadog.trace.instrumentation.graphqljava.GraphQLQuerySanitizer",
+            "datadog.trace.instrumentation.graphqljava.InstrumentedDataFetcher",
+            "datadog.trace.instrumentation.graphqljava.AsyncExceptionUnwrapper"
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(
-                namedOneOf(
-                    "checkInstrumentationDefaultState" // 9.7+
-                    // https://github.com/graphql-java/graphql-java/commit/821241de8ee055d6d254a9d95ef5143f9e540826
-                    //                    "checkInstrumentation" // <9.7
-                    // https://github.com/graphql-java/graphql-java/commit/78a6e4eda1c13f47573adb879ae781cce794e96a
-                    ))
-            .and(returns(named("graphql.execution.instrumentation.Instrumentation"))),
-        this.getClass().getName() + "$AddInstrumentationAdvice");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // introduced in 20.0
+        return not(hasClassNamed("graphql.execution.instrumentation.SimplePerformantInstrumentation"));
+    }
 
-  @SuppressWarnings("unused")
-  public static class AddInstrumentationAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(@Advice.Return(readOnly = false) Instrumentation instrumentation) {
-      instrumentation = GraphQLInstrumentation.install(instrumentation);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf(
+                                "checkInstrumentationDefaultState" // 9.7+
+                                // https://github.com/graphql-java/graphql-java/commit/821241de8ee055d6d254a9d95ef5143f9e540826
+                                //                    "checkInstrumentation" // <9.7
+                                // https://github.com/graphql-java/graphql-java/commit/78a6e4eda1c13f47573adb879ae781cce794e96a
+                                ))
+                        .and(returns(named("graphql.execution.instrumentation.Instrumentation"))),
+                this.getClass().getName() + "$AddInstrumentationAdvice");
     }
 
-    public static void muzzleCheck() {
-      // Class introduced in 15.0
-      ValueUnboxer value = ValueUnboxer.DEFAULT;
+    @SuppressWarnings("unused")
+    public static class AddInstrumentationAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(@Advice.Return(readOnly = false) Instrumentation instrumentation) {
+            instrumentation = GraphQLInstrumentation.install(instrumentation);
+        }
+
+        public static void muzzleCheck() {
+            // Class introduced in 15.0
+            ValueUnboxer value = ValueUnboxer.DEFAULT;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/test/java/Author.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/test/java/Author.java
index 18794637b06..a03b0de5e7a 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/test/java/Author.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/test/java/Author.java
@@ -3,27 +3,29 @@
 
 public class Author {
 
-  private String id;
-  private String firstName;
-  private String lastName;
+    private String id;
+    private String firstName;
+    private String lastName;
 
-  public Author(String id, String firstName, String lastName) {
-    this.id = id;
-    this.firstName = firstName;
-    this.lastName = lastName;
-  }
+    public Author(String id, String firstName, String lastName) {
+        this.id = id;
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
 
-  private static List<Author> authors =
-      Arrays.asList(
-          new Author("author-1", "Joanne", "Rowling"),
-          new Author("author-2", "Herman", "Melville"),
-          new Author("author-3", "Anne", "Rice"));
+    private static List<Author> authors = Arrays.asList(
+            new Author("author-1", "Joanne", "Rowling"),
+            new Author("author-2", "Herman", "Melville"),
+            new Author("author-3", "Anne", "Rice"));
 
-  public static Author getById(String id) {
-    return authors.stream().filter(author -> author.getId().equals(id)).findFirst().orElse(null);
-  }
+    public static Author getById(String id) {
+        return authors.stream()
+                .filter(author -> author.getId().equals(id))
+                .findFirst()
+                .orElse(null);
+    }
 
-  public String getId() {
-    return id;
-  }
+    public String getId() {
+        return id;
+    }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/test/java/Book.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/test/java/Book.java
index d80166121cb..e11debf7ed6 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/test/java/Book.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/test/java/Book.java
@@ -2,39 +2,41 @@
 import java.util.List;
 
 public class Book {
-  private String id;
-  private String name;
-  private int pageCount;
-  private String authorId;
-  private String isbn;
+    private String id;
+    private String name;
+    private int pageCount;
+    private String authorId;
+    private String isbn;
 
-  public Book(String id, String name, int pageCount, String authorId, String isbn) {
-    this.id = id;
-    this.name = name;
-    this.pageCount = pageCount;
-    this.authorId = authorId;
-    this.isbn = isbn;
-  }
+    public Book(String id, String name, int pageCount, String authorId, String isbn) {
+        this.id = id;
+        this.name = name;
+        this.pageCount = pageCount;
+        this.authorId = authorId;
+        this.isbn = isbn;
+    }
 
-  private static List<Book> books =
-      Arrays.asList(
-          new Book("book-1", "Harry Potter and the Philosopher's Stone", 223, "author-1", "isbn1"),
-          new Book("book-2", "Moby Dick", 635, "author-2", "isbn2"),
-          new Book("book-3", "Interview with the vampire", 371, "author-3", "isbn3"));
+    private static List<Book> books = Arrays.asList(
+            new Book("book-1", "Harry Potter and the Philosopher's Stone", 223, "author-1", "isbn1"),
+            new Book("book-2", "Moby Dick", 635, "author-2", "isbn2"),
+            new Book("book-3", "Interview with the vampire", 371, "author-3", "isbn3"));
 
-  public static Book getById(String id) {
-    return books.stream().filter(book -> book.getId().equals(id)).findFirst().orElse(null);
-  }
+    public static Book getById(String id) {
+        return books.stream()
+                .filter(book -> book.getId().equals(id))
+                .findFirst()
+                .orElse(null);
+    }
 
-  public String getId() {
-    return id;
-  }
+    public String getId() {
+        return id;
+    }
 
-  public String getAuthorId() {
-    return authorId;
-  }
+    public String getAuthorId() {
+        return authorId;
+    }
 
-  public String getIsbn() {
-    return isbn;
-  }
+    public String getIsbn() {
+        return isbn;
+    }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLInstrumentation.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLInstrumentation.java
index 5a88ec3dd81..2818ab183d9 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLInstrumentation.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLInstrumentation.java
@@ -31,114 +31,110 @@
 
 public final class GraphQLInstrumentation extends SimplePerformantInstrumentation {
 
-  public static Instrumentation install(Instrumentation instrumentation) {
-    if (instrumentation == null) {
-      return new GraphQLInstrumentation();
+    public static Instrumentation install(Instrumentation instrumentation) {
+        if (instrumentation == null) {
+            return new GraphQLInstrumentation();
+        }
+        if (instrumentation.getClass() == GraphQLInstrumentation.class) {
+            return instrumentation;
+        }
+        List<Instrumentation> instrumentationList = new ArrayList<>();
+        if (instrumentation instanceof ChainedInstrumentation) {
+            List<Instrumentation> instrumentations = ((ChainedInstrumentation) instrumentation).getInstrumentations();
+            if (instrumentations.stream().anyMatch(v -> v.getClass() == GraphQLInstrumentation.class)) {
+                return instrumentation;
+            }
+            instrumentationList.addAll(instrumentations);
+        } else {
+            instrumentationList.add(instrumentation);
+        }
+        instrumentationList.add(new GraphQLInstrumentation());
+        return new ChainedInstrumentation(instrumentationList);
     }
-    if (instrumentation.getClass() == GraphQLInstrumentation.class) {
-      return instrumentation;
-    }
-    List<Instrumentation> instrumentationList = new ArrayList<>();
-    if (instrumentation instanceof ChainedInstrumentation) {
-      List<Instrumentation> instrumentations =
-          ((ChainedInstrumentation) instrumentation).getInstrumentations();
-      if (instrumentations.stream().anyMatch(v -> v.getClass() == GraphQLInstrumentation.class)) {
-        return instrumentation;
-      }
-      instrumentationList.addAll(instrumentations);
-    } else {
-      instrumentationList.add(instrumentation);
-    }
-    instrumentationList.add(new GraphQLInstrumentation());
-    return new ChainedInstrumentation(instrumentationList);
-  }
-
-  @Override
-  public State createState(InstrumentationCreateStateParameters parameters) {
-    return new State();
-  }
 
-  @Override
-  public InstrumentationContext<ExecutionResult> beginExecution(
-      InstrumentationExecutionParameters parameters, InstrumentationState instrumentationState) {
-    if (!(instrumentationState instanceof State)) {
-      return super.beginExecution(parameters, instrumentationState);
+    @Override
+    public State createState(InstrumentationCreateStateParameters parameters) {
+        return new State();
     }
-    final State state = (State) instrumentationState;
-    final AgentSpan requestSpan =
-        startSpan(GraphQLDecorator.GRAPHQL_JAVA.toString(), GraphQLDecorator.GRAPHQL_REQUEST);
-    GraphQLDecorator.DECORATE.afterStart(requestSpan);
 
-    state.setRequestSpan(requestSpan);
-    // parameters.getOperation() is null
+    @Override
+    public InstrumentationContext<ExecutionResult> beginExecution(
+            InstrumentationExecutionParameters parameters, InstrumentationState instrumentationState) {
+        if (!(instrumentationState instanceof State)) {
+            return super.beginExecution(parameters, instrumentationState);
+        }
+        final State state = (State) instrumentationState;
+        final AgentSpan requestSpan =
+                startSpan(GraphQLDecorator.GRAPHQL_JAVA.toString(), GraphQLDecorator.GRAPHQL_REQUEST);
+        GraphQLDecorator.DECORATE.afterStart(requestSpan);
 
-    return new ExecutionInstrumentationContext(state);
-  }
+        state.setRequestSpan(requestSpan);
+        // parameters.getOperation() is null
 
-  @Override
-  public InstrumentationContext<ExecutionResult> beginExecuteOperation(
-      InstrumentationExecuteOperationParameters parameters,
-      InstrumentationState instrumentationState) {
-    if (!(instrumentationState instanceof State)) {
-      return super.beginExecuteOperation(parameters, instrumentationState);
+        return new ExecutionInstrumentationContext(state);
     }
-    final State state = (State) instrumentationState;
-    AgentSpan requestSpan = state.getRequestSpan();
 
-    OperationDefinition operationDefinition =
-        parameters.getExecutionContext().getOperationDefinition();
-    String operationName = operationDefinition.getName();
+    @Override
+    public InstrumentationContext<ExecutionResult> beginExecuteOperation(
+            InstrumentationExecuteOperationParameters parameters, InstrumentationState instrumentationState) {
+        if (!(instrumentationState instanceof State)) {
+            return super.beginExecuteOperation(parameters, instrumentationState);
+        }
+        final State state = (State) instrumentationState;
+        AgentSpan requestSpan = state.getRequestSpan();
 
-    requestSpan.setTag("graphql.operation.name", operationName);
-    String resourceName = operationName != null ? operationName : state.getQuery();
-    requestSpan.setResourceName(resourceName);
-    GraphQLDecorator.DECORATE.onRequest(requestSpan, parameters.getExecutionContext());
-    return SimpleInstrumentationContext.noOp();
-  }
+        OperationDefinition operationDefinition =
+                parameters.getExecutionContext().getOperationDefinition();
+        String operationName = operationDefinition.getName();
 
-  @Override
-  public DataFetcher<?> instrumentDataFetcher(
-      final DataFetcher<?> dataFetcher,
-      InstrumentationFieldFetchParameters parameters,
-      InstrumentationState instrumentationState) {
-    if (!(instrumentationState instanceof State)) {
-      return super.instrumentDataFetcher(dataFetcher, parameters, instrumentationState);
+        requestSpan.setTag("graphql.operation.name", operationName);
+        String resourceName = operationName != null ? operationName : state.getQuery();
+        requestSpan.setResourceName(resourceName);
+        GraphQLDecorator.DECORATE.onRequest(requestSpan, parameters.getExecutionContext());
+        return SimpleInstrumentationContext.noOp();
     }
-    final State state = (State) instrumentationState;
-    final AgentSpan requestSpan = state.getRequestSpan();
-    return new InstrumentedDataFetcher(dataFetcher, parameters, requestSpan);
-  }
 
-  @Override
-  public InstrumentationContext<Document> beginParse(
-      InstrumentationExecutionParameters parameters, InstrumentationState instrumentationState) {
-    if (!(instrumentationState instanceof State)) {
-      return super.beginParse(parameters, instrumentationState);
+    @Override
+    public DataFetcher<?> instrumentDataFetcher(
+            final DataFetcher<?> dataFetcher,
+            InstrumentationFieldFetchParameters parameters,
+            InstrumentationState instrumentationState) {
+        if (!(instrumentationState instanceof State)) {
+            return super.instrumentDataFetcher(dataFetcher, parameters, instrumentationState);
+        }
+        final State state = (State) instrumentationState;
+        final AgentSpan requestSpan = state.getRequestSpan();
+        return new InstrumentedDataFetcher(dataFetcher, parameters, requestSpan);
     }
-    final State state = (State) instrumentationState;
-    final AgentSpan parsingSpan =
-        AgentTracer.startSpan(
-            GraphQLDecorator.GRAPHQL_JAVA.toString(),
-            GraphQLDecorator.GRAPHQL_PARSING,
-            state.getRequestSpan().spanContext());
-    GraphQLDecorator.DECORATE.afterStart(parsingSpan);
-    return new ParsingInstrumentationContext(parsingSpan, state, parameters.getQuery());
-  }
 
-  @Override
-  public InstrumentationContext<List<ValidationError>> beginValidation(
-      InstrumentationValidationParameters parameters, InstrumentationState instrumentationState) {
-    if (!(instrumentationState instanceof State)) {
-      return super.beginValidation(parameters, instrumentationState);
+    @Override
+    public InstrumentationContext<Document> beginParse(
+            InstrumentationExecutionParameters parameters, InstrumentationState instrumentationState) {
+        if (!(instrumentationState instanceof State)) {
+            return super.beginParse(parameters, instrumentationState);
+        }
+        final State state = (State) instrumentationState;
+        final AgentSpan parsingSpan = AgentTracer.startSpan(
+                GraphQLDecorator.GRAPHQL_JAVA.toString(),
+                GraphQLDecorator.GRAPHQL_PARSING,
+                state.getRequestSpan().spanContext());
+        GraphQLDecorator.DECORATE.afterStart(parsingSpan);
+        return new ParsingInstrumentationContext(parsingSpan, state, parameters.getQuery());
     }
-    final State state = (State) instrumentationState;
 
-    final AgentSpan validationSpan =
-        AgentTracer.startSpan(
-            GraphQLDecorator.GRAPHQL_JAVA.toString(),
-            GraphQLDecorator.GRAPHQL_VALIDATION,
-            state.getRequestSpan().spanContext());
-    GraphQLDecorator.DECORATE.afterStart(validationSpan);
-    return new ValidationInstrumentationContext(validationSpan);
-  }
+    @Override
+    public InstrumentationContext<List<ValidationError>> beginValidation(
+            InstrumentationValidationParameters parameters, InstrumentationState instrumentationState) {
+        if (!(instrumentationState instanceof State)) {
+            return super.beginValidation(parameters, instrumentationState);
+        }
+        final State state = (State) instrumentationState;
+
+        final AgentSpan validationSpan = AgentTracer.startSpan(
+                GraphQLDecorator.GRAPHQL_JAVA.toString(),
+                GraphQLDecorator.GRAPHQL_VALIDATION,
+                state.getRequestSpan().spanContext());
+        GraphQLDecorator.DECORATE.afterStart(validationSpan);
+        return new ValidationInstrumentationContext(validationSpan);
+    }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLJavaInstrumentation.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLJavaInstrumentation.java
index e4f357b696a..97bae961384 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLJavaInstrumentation.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLJavaInstrumentation.java
@@ -12,46 +12,45 @@
 
 @AutoService(InstrumenterModule.class)
 public class GraphQLJavaInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public GraphQLJavaInstrumentation() {
-    super("graphql-java");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "graphql.GraphQL$Builder";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.graphqljava.GraphQLDecorator",
-      "datadog.trace.instrumentation.graphqljava.ParsingInstrumentationContext",
-      "datadog.trace.instrumentation.graphqljava.ExecutionInstrumentationContext",
-      "datadog.trace.instrumentation.graphqljava.ValidationInstrumentationContext",
-      "datadog.trace.instrumentation.graphqljava.State",
-      packageName + ".GraphQLInstrumentation",
-      "datadog.trace.instrumentation.graphqljava.GraphQLQuerySanitizer",
-      "datadog.trace.instrumentation.graphqljava.InstrumentedDataFetcher",
-      "datadog.trace.instrumentation.graphqljava.AsyncExceptionUnwrapper"
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("build")).and(returns(named("graphql.GraphQL"))),
-        this.getClass().getName() + "$AddInstrumentationAdvice");
-  }
-
-  @SuppressWarnings("unused")
-  public static class AddInstrumentationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.FieldValue(value = "instrumentation", readOnly = false)
-            Instrumentation instrumentation) {
-      instrumentation = GraphQLInstrumentation.install(instrumentation);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public GraphQLJavaInstrumentation() {
+        super("graphql-java");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "graphql.GraphQL$Builder";
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.graphqljava.GraphQLDecorator",
+            "datadog.trace.instrumentation.graphqljava.ParsingInstrumentationContext",
+            "datadog.trace.instrumentation.graphqljava.ExecutionInstrumentationContext",
+            "datadog.trace.instrumentation.graphqljava.ValidationInstrumentationContext",
+            "datadog.trace.instrumentation.graphqljava.State",
+            packageName + ".GraphQLInstrumentation",
+            "datadog.trace.instrumentation.graphqljava.GraphQLQuerySanitizer",
+            "datadog.trace.instrumentation.graphqljava.InstrumentedDataFetcher",
+            "datadog.trace.instrumentation.graphqljava.AsyncExceptionUnwrapper"
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("build")).and(returns(named("graphql.GraphQL"))),
+                this.getClass().getName() + "$AddInstrumentationAdvice");
+    }
+
+    @SuppressWarnings("unused")
+    public static class AddInstrumentationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.FieldValue(value = "instrumentation", readOnly = false) Instrumentation instrumentation) {
+            instrumentation = GraphQLInstrumentation.install(instrumentation);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/test/java/Author.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/test/java/Author.java
index 18794637b06..a03b0de5e7a 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/test/java/Author.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/test/java/Author.java
@@ -3,27 +3,29 @@
 
 public class Author {
 
-  private String id;
-  private String firstName;
-  private String lastName;
+    private String id;
+    private String firstName;
+    private String lastName;
 
-  public Author(String id, String firstName, String lastName) {
-    this.id = id;
-    this.firstName = firstName;
-    this.lastName = lastName;
-  }
+    public Author(String id, String firstName, String lastName) {
+        this.id = id;
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
 
-  private static List<Author> authors =
-      Arrays.asList(
-          new Author("author-1", "Joanne", "Rowling"),
-          new Author("author-2", "Herman", "Melville"),
-          new Author("author-3", "Anne", "Rice"));
+    private static List<Author> authors = Arrays.asList(
+            new Author("author-1", "Joanne", "Rowling"),
+            new Author("author-2", "Herman", "Melville"),
+            new Author("author-3", "Anne", "Rice"));
 
-  public static Author getById(String id) {
-    return authors.stream().filter(author -> author.getId().equals(id)).findFirst().orElse(null);
-  }
+    public static Author getById(String id) {
+        return authors.stream()
+                .filter(author -> author.getId().equals(id))
+                .findFirst()
+                .orElse(null);
+    }
 
-  public String getId() {
-    return id;
-  }
+    public String getId() {
+        return id;
+    }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/test/java/Book.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/test/java/Book.java
index d80166121cb..e11debf7ed6 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/test/java/Book.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/test/java/Book.java
@@ -2,39 +2,41 @@
 import java.util.List;
 
 public class Book {
-  private String id;
-  private String name;
-  private int pageCount;
-  private String authorId;
-  private String isbn;
+    private String id;
+    private String name;
+    private int pageCount;
+    private String authorId;
+    private String isbn;
 
-  public Book(String id, String name, int pageCount, String authorId, String isbn) {
-    this.id = id;
-    this.name = name;
-    this.pageCount = pageCount;
-    this.authorId = authorId;
-    this.isbn = isbn;
-  }
+    public Book(String id, String name, int pageCount, String authorId, String isbn) {
+        this.id = id;
+        this.name = name;
+        this.pageCount = pageCount;
+        this.authorId = authorId;
+        this.isbn = isbn;
+    }
 
-  private static List<Book> books =
-      Arrays.asList(
-          new Book("book-1", "Harry Potter and the Philosopher's Stone", 223, "author-1", "isbn1"),
-          new Book("book-2", "Moby Dick", 635, "author-2", "isbn2"),
-          new Book("book-3", "Interview with the vampire", 371, "author-3", "isbn3"));
+    private static List<Book> books = Arrays.asList(
+            new Book("book-1", "Harry Potter and the Philosopher's Stone", 223, "author-1", "isbn1"),
+            new Book("book-2", "Moby Dick", 635, "author-2", "isbn2"),
+            new Book("book-3", "Interview with the vampire", 371, "author-3", "isbn3"));
 
-  public static Book getById(String id) {
-    return books.stream().filter(book -> book.getId().equals(id)).findFirst().orElse(null);
-  }
+    public static Book getById(String id) {
+        return books.stream()
+                .filter(book -> book.getId().equals(id))
+                .findFirst()
+                .orElse(null);
+    }
 
-  public String getId() {
-    return id;
-  }
+    public String getId() {
+        return id;
+    }
 
-  public String getAuthorId() {
-    return authorId;
-  }
+    public String getAuthorId() {
+        return authorId;
+    }
 
-  public String getIsbn() {
-    return isbn;
-  }
+    public String getIsbn() {
+        return isbn;
+    }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/AsyncExceptionUnwrapper.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/AsyncExceptionUnwrapper.java
index f0d350f1b6d..17114b5c628 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/AsyncExceptionUnwrapper.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/AsyncExceptionUnwrapper.java
@@ -4,13 +4,13 @@
 
 public final class AsyncExceptionUnwrapper {
 
-  private AsyncExceptionUnwrapper() {}
+    private AsyncExceptionUnwrapper() {}
 
-  // Util function to unwrap CompletionException and expose underlying exception
-  public static Throwable unwrap(Throwable throwable) {
-    if (throwable instanceof CompletionException && throwable.getCause() != null) {
-      return throwable.getCause();
+    // Util function to unwrap CompletionException and expose underlying exception
+    public static Throwable unwrap(Throwable throwable) {
+        if (throwable instanceof CompletionException && throwable.getCause() != null) {
+            return throwable.getCause();
+        }
+        return throwable;
     }
-    return throwable;
-  }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/ExecutionInstrumentationContext.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/ExecutionInstrumentationContext.java
index df9ffebd692..dc26de966c3 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/ExecutionInstrumentationContext.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/ExecutionInstrumentationContext.java
@@ -9,31 +9,31 @@
 import java.util.List;
 
 public class ExecutionInstrumentationContext extends SimpleInstrumentationContext<ExecutionResult> {
-  private final State state;
+    private final State state;
 
-  public ExecutionInstrumentationContext(State state) {
-    this.state = state;
-  }
+    public ExecutionInstrumentationContext(State state) {
+        this.state = state;
+    }
 
-  @Override
-  public void onCompleted(ExecutionResult result, Throwable t) {
-    List<GraphQLError> errors = result.getErrors();
-    AgentSpan requestSpan = state.getRequestSpan();
-    if (t != null) {
-      DECORATE.onError(requestSpan, t);
-    } else {
-      int errorCounter = errors.size();
-      if (errorCounter >= 1) {
-        String error = errors.get(0).getMessage();
-        if (errorCounter > 1) {
-          error += " (and " + (errorCounter - 1) + " more errors)";
+    @Override
+    public void onCompleted(ExecutionResult result, Throwable t) {
+        List<GraphQLError> errors = result.getErrors();
+        AgentSpan requestSpan = state.getRequestSpan();
+        if (t != null) {
+            DECORATE.onError(requestSpan, t);
+        } else {
+            int errorCounter = errors.size();
+            if (errorCounter >= 1) {
+                String error = errors.get(0).getMessage();
+                if (errorCounter > 1) {
+                    error += " (and " + (errorCounter - 1) + " more errors)";
+                }
+                requestSpan.setErrorMessage(error);
+                requestSpan.setError(true);
+            }
         }
-        requestSpan.setErrorMessage(error);
-        requestSpan.setError(true);
-      }
+        requestSpan.setTag("graphql.source", state.getQuery());
+        DECORATE.beforeFinish(requestSpan);
+        requestSpan.finish();
     }
-    requestSpan.setTag("graphql.source", state.getQuery());
-    DECORATE.beforeFinish(requestSpan);
-    requestSpan.finish();
-  }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/GraphQLDecorator.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/GraphQLDecorator.java
index 97e49cb3b09..91aa72407f1 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/GraphQLDecorator.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/GraphQLDecorator.java
@@ -25,84 +25,82 @@
 import javax.annotation.Nonnull;
 
 public class GraphQLDecorator extends BaseDecorator {
-  public static final GraphQLDecorator DECORATE = new GraphQLDecorator();
-  public static final CharSequence GRAPHQL_REQUEST =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().server().operationForProtocol("graphql"));
-  public static final CharSequence GRAPHQL_PARSING = UTF8BytesString.create("graphql.parsing");
-  public static final CharSequence GRAPHQL_VALIDATION =
-      UTF8BytesString.create("graphql.validation");
-  public static final CharSequence GRAPHQL_JAVA = UTF8BytesString.create("graphql-java");
-
-  // Extract this to allow for easier testing
-  protected AgentTracer.TracerAPI tracer() {
-    return AgentTracer.get();
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"graphql-java"};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.GRAPHQL;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return GRAPHQL_JAVA;
-  }
-
-  @Override
-  protected void doAfterStart(@Nonnull final AgentSpan span) {
-    span.setMeasured(true);
-    super.doAfterStart(span);
-  }
-
-  public void onRequest(final AgentSpan span, final ExecutionContext context) {
-
-    if (ActiveSubsystems.APPSEC_ACTIVE) {
-
-      Map<String, Map<String, String>> resolversArgs = new HashMap<>();
-
-      for (Selection<?> selection :
-          context.getOperationDefinition().getSelectionSet().getSelections()) {
-        if (selection instanceof Field) {
-          Field field = (Field) selection;
-          String name = field.getName();
-
-          Map<String, String> arguments = new HashMap<>();
-
-          for (Argument argument : field.getArguments()) {
-            String fieldName = argument.getName();
-            Value<?> fieldValue = argument.getValue();
-            if (fieldValue instanceof StringValue) {
-              String stringValue = ((StringValue) fieldValue).getValue();
-              arguments.put(fieldName, stringValue);
+    public static final GraphQLDecorator DECORATE = new GraphQLDecorator();
+    public static final CharSequence GRAPHQL_REQUEST =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().server().operationForProtocol("graphql"));
+    public static final CharSequence GRAPHQL_PARSING = UTF8BytesString.create("graphql.parsing");
+    public static final CharSequence GRAPHQL_VALIDATION = UTF8BytesString.create("graphql.validation");
+    public static final CharSequence GRAPHQL_JAVA = UTF8BytesString.create("graphql-java");
+
+    // Extract this to allow for easier testing
+    protected AgentTracer.TracerAPI tracer() {
+        return AgentTracer.get();
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"graphql-java"};
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.GRAPHQL;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return GRAPHQL_JAVA;
+    }
+
+    @Override
+    protected void doAfterStart(@Nonnull final AgentSpan span) {
+        span.setMeasured(true);
+        super.doAfterStart(span);
+    }
+
+    public void onRequest(final AgentSpan span, final ExecutionContext context) {
+
+        if (ActiveSubsystems.APPSEC_ACTIVE) {
+
+            Map<String, Map<String, String>> resolversArgs = new HashMap<>();
+
+            for (Selection<?> selection :
+                    context.getOperationDefinition().getSelectionSet().getSelections()) {
+                if (selection instanceof Field) {
+                    Field field = (Field) selection;
+                    String name = field.getName();
+
+                    Map<String, String> arguments = new HashMap<>();
+
+                    for (Argument argument : field.getArguments()) {
+                        String fieldName = argument.getName();
+                        Value<?> fieldValue = argument.getValue();
+                        if (fieldValue instanceof StringValue) {
+                            String stringValue = ((StringValue) fieldValue).getValue();
+                            arguments.put(fieldName, stringValue);
+                        }
+                    }
+                    resolversArgs.put(name, arguments);
+                }
+            }
+
+            CallbackProvider cbp = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
+            RequestContext ctx = span.getRequestContext();
+            if (cbp == null || resolversArgs.isEmpty() || ctx == null) {
+                return;
+            }
+
+            BiFunction<RequestContext, Map<String, ?>, Flow<Void>> graphqlResolverCallback =
+                    cbp.getCallback(EVENTS.graphqlServerRequestMessage());
+            if (graphqlResolverCallback == null) {
+                return;
+            }
+
+            Flow<Void> flow = graphqlResolverCallback.apply(ctx, resolversArgs);
+            if (flow.getAction() instanceof Flow.Action.RequestBlockingAction) {
+                // Blocking will be implemented in future PRs
+                // span.setRequestBlockingAction((Flow.Action.RequestBlockingAction) flow.getAction());
             }
-          }
-          resolversArgs.put(name, arguments);
         }
-      }
-
-      CallbackProvider cbp = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
-      RequestContext ctx = span.getRequestContext();
-      if (cbp == null || resolversArgs.isEmpty() || ctx == null) {
-        return;
-      }
-
-      BiFunction<RequestContext, Map<String, ?>, Flow<Void>> graphqlResolverCallback =
-          cbp.getCallback(EVENTS.graphqlServerRequestMessage());
-      if (graphqlResolverCallback == null) {
-        return;
-      }
-
-      Flow<Void> flow = graphqlResolverCallback.apply(ctx, resolversArgs);
-      if (flow.getAction() instanceof Flow.Action.RequestBlockingAction) {
-        // Blocking will be implemented in future PRs
-        // span.setRequestBlockingAction((Flow.Action.RequestBlockingAction) flow.getAction());
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/GraphQLQuerySanitizer.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/GraphQLQuerySanitizer.java
index c76e7af53b4..ac07c9de712 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/GraphQLQuerySanitizer.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/GraphQLQuerySanitizer.java
@@ -15,31 +15,31 @@
 import graphql.util.TreeTransformerUtil;
 
 public final class GraphQLQuerySanitizer extends NodeVisitorStub {
-  private static final NodeVisitor REPLACE_VALUES_VISITOR = new GraphQLQuerySanitizer();
-  private static final AstTransformer AST_TRANSFORMER = new AstTransformer();
+    private static final NodeVisitor REPLACE_VALUES_VISITOR = new GraphQLQuerySanitizer();
+    private static final AstTransformer AST_TRANSFORMER = new AstTransformer();
 
-  public static String sanitizeQuery(Node<?> node) {
-    Node sanitizedQuery = AST_TRANSFORMER.transform(node, REPLACE_VALUES_VISITOR);
-    return AstPrinter.printAst(sanitizedQuery);
-  }
+    public static String sanitizeQuery(Node<?> node) {
+        Node sanitizedQuery = AST_TRANSFORMER.transform(node, REPLACE_VALUES_VISITOR);
+        return AstPrinter.printAst(sanitizedQuery);
+    }
 
-  @Override
-  public TraversalControl visitIntValue(IntValue node, TraverserContext<Node> context) {
-    return TreeTransformerUtil.changeNode(context, new EnumValue("{Int}"));
-  }
+    @Override
+    public TraversalControl visitIntValue(IntValue node, TraverserContext<Node> context) {
+        return TreeTransformerUtil.changeNode(context, new EnumValue("{Int}"));
+    }
 
-  @Override
-  public TraversalControl visitBooleanValue(BooleanValue node, TraverserContext<Node> context) {
-    return TreeTransformerUtil.changeNode(context, new EnumValue("{Boolean}"));
-  }
+    @Override
+    public TraversalControl visitBooleanValue(BooleanValue node, TraverserContext<Node> context) {
+        return TreeTransformerUtil.changeNode(context, new EnumValue("{Boolean}"));
+    }
 
-  @Override
-  public TraversalControl visitFloatValue(FloatValue node, TraverserContext<Node> context) {
-    return TreeTransformerUtil.changeNode(context, new EnumValue("{Float}"));
-  }
+    @Override
+    public TraversalControl visitFloatValue(FloatValue node, TraverserContext<Node> context) {
+        return TreeTransformerUtil.changeNode(context, new EnumValue("{Float}"));
+    }
 
-  @Override
-  public TraversalControl visitStringValue(StringValue node, TraverserContext<Node> context) {
-    return TreeTransformerUtil.changeNode(context, new EnumValue("{String}"));
-  }
+    @Override
+    public TraversalControl visitStringValue(StringValue node, TraverserContext<Node> context) {
+        return TreeTransformerUtil.changeNode(context, new EnumValue("{String}"));
+    }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/GraphQLUnwrapExceptionInstrumentation.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/GraphQLUnwrapExceptionInstrumentation.java
index 46c14444f89..02380dcb7d3 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/GraphQLUnwrapExceptionInstrumentation.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/GraphQLUnwrapExceptionInstrumentation.java
@@ -11,33 +11,33 @@
 
 @AutoService(InstrumenterModule.class)
 public class GraphQLUnwrapExceptionInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public GraphQLUnwrapExceptionInstrumentation() {
-    super("graphql-java");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "graphql-java-common";
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "graphql.execution.DataFetcherExceptionHandlerParameters";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("getException")).and(returns(Throwable.class)),
-        this.getClass().getName() + "$UnwrapGetExceptionAdvice");
-  }
-
-  public static class UnwrapGetExceptionAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(@Advice.Return(readOnly = false) Throwable throwable) {
-      throwable = AsyncExceptionUnwrapper.unwrap(throwable);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public GraphQLUnwrapExceptionInstrumentation() {
+        super("graphql-java");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "graphql-java-common";
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "graphql.execution.DataFetcherExceptionHandlerParameters";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("getException")).and(returns(Throwable.class)),
+                this.getClass().getName() + "$UnwrapGetExceptionAdvice");
+    }
+
+    public static class UnwrapGetExceptionAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(@Advice.Return(readOnly = false) Throwable throwable) {
+            throwable = AsyncExceptionUnwrapper.unwrap(throwable);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java
index 98bbc788e2c..61c788495ea 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java
@@ -15,57 +15,53 @@
 import java.util.concurrent.CompletionStage;
 
 public class InstrumentedDataFetcher implements DataFetcher<Object> {
-  private final DataFetcher<?> dataFetcher;
-  private final InstrumentationFieldFetchParameters parameters;
-  private final AgentSpan requestSpan;
+    private final DataFetcher<?> dataFetcher;
+    private final InstrumentationFieldFetchParameters parameters;
+    private final AgentSpan requestSpan;
 
-  public InstrumentedDataFetcher(
-      DataFetcher<?> dataFetcher,
-      InstrumentationFieldFetchParameters parameters,
-      AgentSpan requestSpan) {
-    this.dataFetcher = dataFetcher;
-    this.parameters = parameters;
-    this.requestSpan = requestSpan;
-  }
+    public InstrumentedDataFetcher(
+            DataFetcher<?> dataFetcher, InstrumentationFieldFetchParameters parameters, AgentSpan requestSpan) {
+        this.dataFetcher = dataFetcher;
+        this.parameters = parameters;
+        this.requestSpan = requestSpan;
+    }
 
-  @Override
-  public Object get(DataFetchingEnvironment environment) throws Exception {
-    if (parameters.isTrivialDataFetcher()) {
-      try (ContextScope scope = activateSpan(this.requestSpan)) {
-        return dataFetcher.get(environment);
-      }
-    } else {
-      final AgentSpan fieldSpan =
-          startSpan(GRAPHQL_JAVA.toString(), "graphql.field", this.requestSpan.spanContext());
-      DECORATE.afterStart(fieldSpan);
-      String parentType = GraphQLTypeUtil.simplePrint(environment.getParentType());
-      String fieldName = environment.getField().getName();
-      String schemaCoordinates = parentType + '.' + fieldName;
-      fieldSpan.setResourceName(schemaCoordinates);
-      fieldSpan.setTag("graphql.coordinates", schemaCoordinates);
-      GraphQLOutputType fieldType = environment.getFieldType();
-      fieldSpan.setTag("graphql.type", GraphQLTypeUtil.simplePrint(fieldType));
-      Object dataValue;
-      try (ContextScope scope = activateSpan(fieldSpan)) {
-        dataValue = dataFetcher.get(environment);
-      } catch (Exception e) {
-        DECORATE.onError(fieldSpan, e);
-        DECORATE.beforeFinish(fieldSpan);
-        fieldSpan.finish();
-        throw e;
-      }
-      if (dataValue instanceof CompletionStage<?>) {
-        return ((CompletionStage<?>) dataValue)
-            .whenComplete(
-                (result, throwable) -> {
-                  DECORATE.onError(fieldSpan, AsyncExceptionUnwrapper.unwrap(throwable));
-                  DECORATE.beforeFinish(fieldSpan);
-                  fieldSpan.finish();
+    @Override
+    public Object get(DataFetchingEnvironment environment) throws Exception {
+        if (parameters.isTrivialDataFetcher()) {
+            try (ContextScope scope = activateSpan(this.requestSpan)) {
+                return dataFetcher.get(environment);
+            }
+        } else {
+            final AgentSpan fieldSpan =
+                    startSpan(GRAPHQL_JAVA.toString(), "graphql.field", this.requestSpan.spanContext());
+            DECORATE.afterStart(fieldSpan);
+            String parentType = GraphQLTypeUtil.simplePrint(environment.getParentType());
+            String fieldName = environment.getField().getName();
+            String schemaCoordinates = parentType + '.' + fieldName;
+            fieldSpan.setResourceName(schemaCoordinates);
+            fieldSpan.setTag("graphql.coordinates", schemaCoordinates);
+            GraphQLOutputType fieldType = environment.getFieldType();
+            fieldSpan.setTag("graphql.type", GraphQLTypeUtil.simplePrint(fieldType));
+            Object dataValue;
+            try (ContextScope scope = activateSpan(fieldSpan)) {
+                dataValue = dataFetcher.get(environment);
+            } catch (Exception e) {
+                DECORATE.onError(fieldSpan, e);
+                DECORATE.beforeFinish(fieldSpan);
+                fieldSpan.finish();
+                throw e;
+            }
+            if (dataValue instanceof CompletionStage<?>) {
+                return ((CompletionStage<?>) dataValue).whenComplete((result, throwable) -> {
+                    DECORATE.onError(fieldSpan, AsyncExceptionUnwrapper.unwrap(throwable));
+                    DECORATE.beforeFinish(fieldSpan);
+                    fieldSpan.finish();
                 });
-      }
-      DECORATE.beforeFinish(fieldSpan);
-      fieldSpan.finish();
-      return dataValue;
+            }
+            DECORATE.beforeFinish(fieldSpan);
+            fieldSpan.finish();
+            return dataValue;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/ParsingInstrumentationContext.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/ParsingInstrumentationContext.java
index 936b32183e4..9b8da53685a 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/ParsingInstrumentationContext.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/ParsingInstrumentationContext.java
@@ -8,27 +8,27 @@
 
 public class ParsingInstrumentationContext extends SimpleInstrumentationContext<Document> {
 
-  private final AgentSpan parsingSpan;
-  private final State state;
-  private final String rawQuery;
+    private final AgentSpan parsingSpan;
+    private final State state;
+    private final String rawQuery;
 
-  public ParsingInstrumentationContext(AgentSpan parsingSpan, State state, String rawQuery) {
-    this.parsingSpan = parsingSpan;
-    this.state = state;
-    this.rawQuery = rawQuery;
-  }
+    public ParsingInstrumentationContext(AgentSpan parsingSpan, State state, String rawQuery) {
+        this.parsingSpan = parsingSpan;
+        this.state = state;
+        this.rawQuery = rawQuery;
+    }
 
-  @Override
-  public void onCompleted(Document result, Throwable t) {
-    if (t != null) {
-      DECORATE.onError(parsingSpan, t);
-      // fail to parse query use the original raw query
-      state.setQuery(rawQuery);
-    } else {
-      // parse successfully use sanitized query
-      state.setQuery(GraphQLQuerySanitizer.sanitizeQuery(result));
+    @Override
+    public void onCompleted(Document result, Throwable t) {
+        if (t != null) {
+            DECORATE.onError(parsingSpan, t);
+            // fail to parse query use the original raw query
+            state.setQuery(rawQuery);
+        } else {
+            // parse successfully use sanitized query
+            state.setQuery(GraphQLQuerySanitizer.sanitizeQuery(result));
+        }
+        DECORATE.beforeFinish(parsingSpan);
+        parsingSpan.finish();
     }
-    DECORATE.beforeFinish(parsingSpan);
-    parsingSpan.finish();
-  }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/State.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/State.java
index b19fcefeacd..1fa00c44fce 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/State.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/State.java
@@ -4,22 +4,22 @@
 import graphql.execution.instrumentation.InstrumentationState;
 
 public final class State implements InstrumentationState {
-  private AgentSpan requestSpan;
-  private String query;
+    private AgentSpan requestSpan;
+    private String query;
 
-  public AgentSpan getRequestSpan() {
-    return requestSpan;
-  }
+    public AgentSpan getRequestSpan() {
+        return requestSpan;
+    }
 
-  public void setRequestSpan(AgentSpan requestSpan) {
-    this.requestSpan = requestSpan;
-  }
+    public void setRequestSpan(AgentSpan requestSpan) {
+        this.requestSpan = requestSpan;
+    }
 
-  public String getQuery() {
-    return query;
-  }
+    public String getQuery() {
+        return query;
+    }
 
-  public void setQuery(String query) {
-    this.query = query;
-  }
+    public void setQuery(String query) {
+        this.query = query;
+    }
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/ValidationInstrumentationContext.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/ValidationInstrumentationContext.java
index d6a82a33a7a..676c562b6bc 100644
--- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/ValidationInstrumentationContext.java
+++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/ValidationInstrumentationContext.java
@@ -7,22 +7,21 @@
 import graphql.validation.ValidationError;
 import java.util.List;
 
-public final class ValidationInstrumentationContext
-    extends SimpleInstrumentationContext<List<ValidationError>> {
-  private final AgentSpan span;
+public final class ValidationInstrumentationContext extends SimpleInstrumentationContext<List<ValidationError>> {
+    private final AgentSpan span;
 
-  public ValidationInstrumentationContext(AgentSpan span) {
-    this.span = span;
-  }
+    public ValidationInstrumentationContext(AgentSpan span) {
+        this.span = span;
+    }
 
-  @Override
-  public void onCompleted(List<ValidationError> result, Throwable t) {
-    if (t != null) {
-      DECORATE.onError(span, t);
-    } else if (!result.isEmpty()) {
-      span.setError(true);
+    @Override
+    public void onCompleted(List<ValidationError> result, Throwable t) {
+        if (t != null) {
+            DECORATE.onError(span, t);
+        } else if (!result.isEmpty()) {
+            span.setError(true);
+        }
+        DECORATE.beforeFinish(span);
+        span.finish();
     }
-    DECORATE.beforeFinish(span);
-    span.finish();
-  }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/ExtractAdapter.java b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/ExtractAdapter.java
index ec85f962d12..05a18f81301 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/ExtractAdapter.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/ExtractAdapter.java
@@ -6,39 +6,38 @@
 import org.glassfish.grizzly.http.util.MimeHeaders;
 
 public abstract class ExtractAdapter<T> implements AgentPropagation.ContextVisitor<T> {
-  abstract MimeHeaders getMimeHeaders(T t);
+    abstract MimeHeaders getMimeHeaders(T t);
 
-  @Override
-  public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-    MimeHeaders mimeHeaders = getMimeHeaders(carrier);
-    if (mimeHeaders == null) {
-      return;
-    }
-    for (int i = 0; i < mimeHeaders.size(); ++i) {
-      if (!classifier.accept(
-          mimeHeaders.getName(i).toString(UTF_8), mimeHeaders.getValue(i).toString(UTF_8))) {
-        return;
-      }
+    @Override
+    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+        MimeHeaders mimeHeaders = getMimeHeaders(carrier);
+        if (mimeHeaders == null) {
+            return;
+        }
+        for (int i = 0; i < mimeHeaders.size(); ++i) {
+            if (!classifier.accept(
+                    mimeHeaders.getName(i).toString(UTF_8),
+                    mimeHeaders.getValue(i).toString(UTF_8))) {
+                return;
+            }
+        }
     }
-  }
 
-  public static final class Request
-      extends ExtractAdapter<org.glassfish.grizzly.http.server.Request> {
-    public static final Request GETTER = new Request();
+    public static final class Request extends ExtractAdapter<org.glassfish.grizzly.http.server.Request> {
+        public static final Request GETTER = new Request();
 
-    @Override
-    MimeHeaders getMimeHeaders(org.glassfish.grizzly.http.server.Request request) {
-      return request.getRequest().getHeaders();
+        @Override
+        MimeHeaders getMimeHeaders(org.glassfish.grizzly.http.server.Request request) {
+            return request.getRequest().getHeaders();
+        }
     }
-  }
 
-  public static final class Response
-      extends ExtractAdapter<org.glassfish.grizzly.http.server.Response> {
-    public static final Response GETTER = new Response();
+    public static final class Response extends ExtractAdapter<org.glassfish.grizzly.http.server.Response> {
+        public static final Response GETTER = new Response();
 
-    @Override
-    MimeHeaders getMimeHeaders(org.glassfish.grizzly.http.server.Response response) {
-      return response.getResponse().getHeaders();
+        @Override
+        MimeHeaders getMimeHeaders(org.glassfish.grizzly.http.server.Response response) {
+            return response.getResponse().getHeaders();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyBlockingHelper.java b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyBlockingHelper.java
index ece9d6c4f07..edad6f2fd1e 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyBlockingHelper.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyBlockingHelper.java
@@ -18,81 +18,79 @@
 import org.slf4j.LoggerFactory;
 
 public class GrizzlyBlockingHelper {
-  private static final Logger log = LoggerFactory.getLogger(GrizzlyBlockingHelper.class);
-  private static final MethodHandle GET_OUTPUT_STREAM;
+    private static final Logger log = LoggerFactory.getLogger(GrizzlyBlockingHelper.class);
+    private static final MethodHandle GET_OUTPUT_STREAM;
 
-  static {
-    MethodHandle getOutputStreamMH = null;
-    try {
-      Method getOutputStream = Response.class.getMethod("getOutputStream");
-      getOutputStreamMH = MethodHandles.lookup().unreflect(getOutputStream);
-    } catch (IllegalAccessException | NoSuchMethodException | RuntimeException e) {
-      log.error("Lookup of getOutputStream failed. Will be unable to commit blocking response", e);
+    static {
+        MethodHandle getOutputStreamMH = null;
+        try {
+            Method getOutputStream = Response.class.getMethod("getOutputStream");
+            getOutputStreamMH = MethodHandles.lookup().unreflect(getOutputStream);
+        } catch (IllegalAccessException | NoSuchMethodException | RuntimeException e) {
+            log.error("Lookup of getOutputStream failed. Will be unable to commit blocking response", e);
+        }
+        GET_OUTPUT_STREAM = getOutputStreamMH; // return value changed from NIOOutputStream to OutputStream
     }
-    GET_OUTPUT_STREAM =
-        getOutputStreamMH; // return value changed from NIOOutputStream to OutputStream
-  }
 
-  private GrizzlyBlockingHelper() {}
+    private GrizzlyBlockingHelper() {}
 
-  public static boolean block(
-      Request request, Response response, Flow.Action.RequestBlockingAction rba, Context context) {
-    return block(
-        request,
-        response,
-        rba.getStatusCode(),
-        rba.getBlockingContentType(),
-        rba.getExtraHeaders(),
-        rba.getSecurityResponseId(),
-        context);
-  }
-
-  public static boolean block(
-      Request request,
-      Response response,
-      int statusCode,
-      BlockingContentType bct,
-      Map<String, String> extraHeaders,
-      String securityResponseId,
-      Context context) {
-    if (GET_OUTPUT_STREAM == null) {
-      return false;
+    public static boolean block(
+            Request request, Response response, Flow.Action.RequestBlockingAction rba, Context context) {
+        return block(
+                request,
+                response,
+                rba.getStatusCode(),
+                rba.getBlockingContentType(),
+                rba.getExtraHeaders(),
+                rba.getSecurityResponseId(),
+                context);
     }
 
-    AgentSpan span = AgentSpan.fromContext(context);
-    try {
-      OutputStream os = (OutputStream) GET_OUTPUT_STREAM.invoke(response);
-      response.setStatus(BlockingActionHelper.getHttpCode(statusCode));
+    public static boolean block(
+            Request request,
+            Response response,
+            int statusCode,
+            BlockingContentType bct,
+            Map<String, String> extraHeaders,
+            String securityResponseId,
+            Context context) {
+        if (GET_OUTPUT_STREAM == null) {
+            return false;
+        }
 
-      for (Map.Entry<String, String> h : extraHeaders.entrySet()) {
-        response.setHeader(h.getKey(), h.getValue());
-      }
+        AgentSpan span = AgentSpan.fromContext(context);
+        try {
+            OutputStream os = (OutputStream) GET_OUTPUT_STREAM.invoke(response);
+            response.setStatus(BlockingActionHelper.getHttpCode(statusCode));
 
-      if (bct != BlockingContentType.NONE) {
-        String acceptHeader = request.getHeader("Accept");
-        BlockingActionHelper.TemplateType type =
-            BlockingActionHelper.determineTemplateType(bct, acceptHeader);
-        response.setHeader("Content-type", BlockingActionHelper.getContentType(type));
-        byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
-        response.setHeader("Content-length", Integer.toString(template.length));
-        os.write(template);
-      }
-      os.close();
-      response.finish();
+            for (Map.Entry<String, String> h : extraHeaders.entrySet()) {
+                response.setHeader(h.getKey(), h.getValue());
+            }
 
-      if (span != null) {
-        span.getRequestContext().getTraceSegment().effectivelyBlocked();
-      }
-      SpanClosingListener.LISTENER.onAfterService(request);
-    } catch (Throwable e) {
-      log.info("Error committing blocking response", e);
-      if (span != null) {
-        DECORATE.onError(span, e);
-        DECORATE.beforeFinish(context);
-        span.finish();
-      }
-    }
+            if (bct != BlockingContentType.NONE) {
+                String acceptHeader = request.getHeader("Accept");
+                BlockingActionHelper.TemplateType type = BlockingActionHelper.determineTemplateType(bct, acceptHeader);
+                response.setHeader("Content-type", BlockingActionHelper.getContentType(type));
+                byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+                response.setHeader("Content-length", Integer.toString(template.length));
+                os.write(template);
+            }
+            os.close();
+            response.finish();
 
-    return true;
-  }
+            if (span != null) {
+                span.getRequestContext().getTraceSegment().effectivelyBlocked();
+            }
+            SpanClosingListener.LISTENER.onAfterService(request);
+        } catch (Throwable e) {
+            log.info("Error committing blocking response", e);
+            if (span != null) {
+                DECORATE.onError(span, e);
+                DECORATE.beforeFinish(context);
+                span.finish();
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyDecorator.java b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyDecorator.java
index e7db93be5ee..74a989021d0 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyDecorator.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyDecorator.java
@@ -16,95 +16,95 @@
 import org.slf4j.LoggerFactory;
 
 public class GrizzlyDecorator extends HttpServerDecorator<Request, Request, Response, Request> {
-  public static final CharSequence GRIZZLY = UTF8BytesString.create("grizzly");
-  public static final CharSequence GRIZZLY_REQUEST = UTF8BytesString.create("grizzly.request");
-  public static final GrizzlyDecorator DECORATE = new GrizzlyDecorator();
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Request> getter() {
-    return ExtractAdapter.Request.GETTER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Response> responseGetter() {
-    return ExtractAdapter.Response.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return GRIZZLY_REQUEST;
-  }
-
-  @Override
-  protected String method(final Request request) {
-    return request.getMethod().getMethodString();
-  }
-
-  @Override
-  protected URIDataAdapter url(final Request request) {
-    return new RequestURIDataAdapter(request);
-  }
-
-  @Override
-  protected String peerHostIP(final Request request) {
-    return request.getRemoteAddr();
-  }
-
-  @Override
-  protected int peerPort(final Request request) {
-    return request.getRemotePort();
-  }
-
-  @Override
-  protected int status(final Response containerResponse) {
-    return containerResponse.getStatus();
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"grizzly"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return GRIZZLY;
-  }
-
-  @Override
-  protected BlockResponseFunction createBlockResponseFunction(Request request, Request request2) {
-    return new GrizzlyBlockResponseFunction(request);
-  }
-
-  public static class GrizzlyBlockResponseFunction implements BlockResponseFunction {
-    private static final Logger log = LoggerFactory.getLogger(GrizzlyBlockResponseFunction.class);
-
-    private final Request request;
-
-    public GrizzlyBlockResponseFunction(Request request) {
-      this.request = request;
+    public static final CharSequence GRIZZLY = UTF8BytesString.create("grizzly");
+    public static final CharSequence GRIZZLY_REQUEST = UTF8BytesString.create("grizzly.request");
+    public static final GrizzlyDecorator DECORATE = new GrizzlyDecorator();
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Request> getter() {
+        return ExtractAdapter.Request.GETTER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Response> responseGetter() {
+        return ExtractAdapter.Response.GETTER;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return GRIZZLY_REQUEST;
     }
 
     @Override
-    public boolean tryCommitBlockingResponse(
-        TraceSegment segment,
-        int statusCode,
-        BlockingContentType templateType,
-        Map<String, String> extraHeaders,
-        String securityResponseId) {
-      AgentSpan agentSpan = AgentTracer.get().activeSpan();
-      if (agentSpan == null) {
-        log.warn("Can't block: no active span");
-        return false;
-      }
-
-      return GrizzlyBlockingHelper.block(
-          this.request,
-          this.request.getResponse(),
-          statusCode,
-          templateType,
-          extraHeaders,
-          securityResponseId,
-          agentSpan);
+    protected String method(final Request request) {
+        return request.getMethod().getMethodString();
+    }
+
+    @Override
+    protected URIDataAdapter url(final Request request) {
+        return new RequestURIDataAdapter(request);
+    }
+
+    @Override
+    protected String peerHostIP(final Request request) {
+        return request.getRemoteAddr();
+    }
+
+    @Override
+    protected int peerPort(final Request request) {
+        return request.getRemotePort();
+    }
+
+    @Override
+    protected int status(final Response containerResponse) {
+        return containerResponse.getStatus();
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"grizzly"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return GRIZZLY;
+    }
+
+    @Override
+    protected BlockResponseFunction createBlockResponseFunction(Request request, Request request2) {
+        return new GrizzlyBlockResponseFunction(request);
+    }
+
+    public static class GrizzlyBlockResponseFunction implements BlockResponseFunction {
+        private static final Logger log = LoggerFactory.getLogger(GrizzlyBlockResponseFunction.class);
+
+        private final Request request;
+
+        public GrizzlyBlockResponseFunction(Request request) {
+            this.request = request;
+        }
+
+        @Override
+        public boolean tryCommitBlockingResponse(
+                TraceSegment segment,
+                int statusCode,
+                BlockingContentType templateType,
+                Map<String, String> extraHeaders,
+                String securityResponseId) {
+            AgentSpan agentSpan = AgentTracer.get().activeSpan();
+            if (agentSpan == null) {
+                log.warn("Can't block: no active span");
+                return false;
+            }
+
+            return GrizzlyBlockingHelper.block(
+                    this.request,
+                    this.request.getResponse(),
+                    statusCode,
+                    templateType,
+                    extraHeaders,
+                    securityResponseId,
+                    agentSpan);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java
index 5c474dfdd0e..07da14e5434 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java
@@ -20,109 +20,105 @@
 import org.glassfish.grizzly.http.server.Request;
 import org.glassfish.grizzly.http.server.Response;
 
-public class GrizzlyHttpHandlerInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.grizzly.http.server.HttpHandler";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("doHandle"))
-            .and(takesArgument(0, named("org.glassfish.grizzly.http.server.Request")))
-            .and(takesArgument(1, named("org.glassfish.grizzly.http.server.Response"))),
-        GrizzlyHttpHandlerInstrumentation.class.getName() + "$ContextTrackingAdvice",
-        GrizzlyHttpHandlerInstrumentation.class.getName() + "$HandleAdvice");
-  }
-
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextTrackingAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Local("parentScope") ContextScope parentScope,
-        @Advice.Argument(0) final Request request) {
-      if (request.getAttribute(DD_CONTEXT_ATTRIBUTE) != null) {
-        return; // re-entry: HandleAdvice will return false (no-op)
-      }
-      Context parentContext = DECORATE.extract(request);
-      parentScope = parentContext.attach();
+public class GrizzlyHttpHandlerInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.grizzly.http.server.HttpHandler";
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Local("parentScope") ContextScope parentScope) {
-      if (parentScope != null) {
-        parentScope.close();
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("doHandle"))
+                        .and(takesArgument(0, named("org.glassfish.grizzly.http.server.Request")))
+                        .and(takesArgument(1, named("org.glassfish.grizzly.http.server.Response"))),
+                GrizzlyHttpHandlerInstrumentation.class.getName() + "$ContextTrackingAdvice",
+                GrizzlyHttpHandlerInstrumentation.class.getName() + "$HandleAdvice");
     }
-  }
-
-  public static class HandleAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-    public static boolean /* skip body */ methodEnter(
-        @Advice.Local("contextScope") ContextScope scope,
-        @Advice.Argument(0) final Request request,
-        @Advice.Argument(1) final Response response) {
-      if (request.getAttribute(DD_CONTEXT_ATTRIBUTE) != null) {
-        return false;
-      }
-
-      final Context parentContext =
-          currentContext(); // parent context attached by ContextTrackingAdvice
-      final Context context = DECORATE.startSpan(request, parentContext);
-      final AgentSpan span = spanFromContext(context);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, request, request, parentContext);
-
-      scope = context.attach();
-
-      request.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
-      request.setAttribute(
-          CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
-      request.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
-
-      Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
-      if (rba != null) {
-        boolean success = GrizzlyBlockingHelper.block(request, response, rba, context);
-        if (success) {
-          return true; /* skip body */
-        }
-      }
 
-      request.addAfterServiceListener(SpanClosingListener.LISTENER);
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextTrackingAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Local("parentScope") ContextScope parentScope, @Advice.Argument(0) final Request request) {
+            if (request.getAttribute(DD_CONTEXT_ATTRIBUTE) != null) {
+                return; // re-entry: HandleAdvice will return false (no-op)
+            }
+            Context parentContext = DECORATE.extract(request);
+            parentScope = parentContext.attach();
+        }
 
-      return false;
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Local("parentScope") ContextScope parentScope) {
+            if (parentScope != null) {
+                parentScope.close();
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter boolean skippedBody,
-        @Advice.Return(readOnly = false) boolean retVal,
-        @Advice.Local("contextScope") ContextScope scope,
-        @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-
-      if (throwable != null) {
-        final AgentSpan span = spanFromContext(scope.context());
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
-      // span finished by SpanClosingListener
-
-      if (skippedBody) {
-        retVal = true; // return true to avoid suspending the request
-      }
+    public static class HandleAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+        public static boolean /* skip body */ methodEnter(
+                @Advice.Local("contextScope") ContextScope scope,
+                @Advice.Argument(0) final Request request,
+                @Advice.Argument(1) final Response response) {
+            if (request.getAttribute(DD_CONTEXT_ATTRIBUTE) != null) {
+                return false;
+            }
+
+            final Context parentContext = currentContext(); // parent context attached by ContextTrackingAdvice
+            final Context context = DECORATE.startSpan(request, parentContext);
+            final AgentSpan span = spanFromContext(context);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, request, request, parentContext);
+
+            scope = context.attach();
+
+            request.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
+            request.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+            request.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+
+            Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
+            if (rba != null) {
+                boolean success = GrizzlyBlockingHelper.block(request, response, rba, context);
+                if (success) {
+                    return true; /* skip body */
+                }
+            }
+
+            request.addAfterServiceListener(SpanClosingListener.LISTENER);
+
+            return false;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter boolean skippedBody,
+                @Advice.Return(readOnly = false) boolean retVal,
+                @Advice.Local("contextScope") ContextScope scope,
+                @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+
+            if (throwable != null) {
+                final AgentSpan span = spanFromContext(scope.context());
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+            // span finished by SpanClosingListener
+
+            if (skippedBody) {
+                retVal = true; // return true to avoid suspending the request
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyModule.java b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyModule.java
index 5b7215c17fa..306267ebf20 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyModule.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyModule.java
@@ -9,17 +9,17 @@
 
 @AutoService(InstrumenterModule.class)
 public class GrizzlyModule extends InstrumenterModule.Tracing {
-  public GrizzlyModule() {
-    super("grizzly");
-  }
+    public GrizzlyModule() {
+        super("grizzly");
+    }
 
-  @Override
-  public boolean defaultEnabled() {
-    return false;
-  }
+    @Override
+    public boolean defaultEnabled() {
+        return false;
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return singletonList(new GrizzlyHttpHandlerInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return singletonList(new GrizzlyHttpHandlerInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/RequestURIDataAdapter.java
index 83c890ab587..ce0c8210e33 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/RequestURIDataAdapter.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/RequestURIDataAdapter.java
@@ -5,39 +5,39 @@
 
 final class RequestURIDataAdapter extends URIRawDataAdapter {
 
-  private final Request request;
-
-  RequestURIDataAdapter(Request request) {
-    this.request = request;
-  }
-
-  @Override
-  public String scheme() {
-    return request.getScheme();
-  }
-
-  @Override
-  public String host() {
-    return request.getServerName();
-  }
-
-  @Override
-  public int port() {
-    return request.getServerPort();
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return request.getRequestURI();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return request.getQueryString();
-  }
+    private final Request request;
+
+    RequestURIDataAdapter(Request request) {
+        this.request = request;
+    }
+
+    @Override
+    public String scheme() {
+        return request.getScheme();
+    }
+
+    @Override
+    public String host() {
+        return request.getServerName();
+    }
+
+    @Override
+    public int port() {
+        return request.getServerPort();
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return request.getRequestURI();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return request.getQueryString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/SpanClosingListener.java b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/SpanClosingListener.java
index 4729ae8b395..254f148a713 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/SpanClosingListener.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/SpanClosingListener.java
@@ -9,23 +9,23 @@
 import org.glassfish.grizzly.http.server.Request;
 
 public class SpanClosingListener implements AfterServiceListener {
-  public static final SpanClosingListener LISTENER = new SpanClosingListener();
+    public static final SpanClosingListener LISTENER = new SpanClosingListener();
 
-  @Override
-  public void onAfterService(final Request request) {
-    final Object contextAttr = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-    if (contextAttr instanceof Context) {
-      request.removeAttribute(DD_CONTEXT_ATTRIBUTE);
+    @Override
+    public void onAfterService(final Request request) {
+        final Object contextAttr = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+        if (contextAttr instanceof Context) {
+            request.removeAttribute(DD_CONTEXT_ATTRIBUTE);
 
-      final Context context = (Context) contextAttr;
-      final AgentSpan span = AgentSpan.fromContext(context);
-      if (span != null) {
-        DECORATE.onResponse(span, request.getResponse());
-        DECORATE.beforeFinish(context);
-        span.finish();
-      } else {
-        DECORATE.beforeFinish(context);
-      }
+            final Context context = (Context) contextAttr;
+            final AgentSpan span = AgentSpan.fromContext(context);
+            if (span != null) {
+                DECORATE.onResponse(span, request.getResponse());
+                DECORATE.beforeFinish(context);
+                span.finish();
+            } else {
+                DECORATE.beforeFinish(context);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHandlerAdapter.java b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHandlerAdapter.java
index 2a3c84139a0..5b8773e5d51 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHandlerAdapter.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHandlerAdapter.java
@@ -12,61 +12,61 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 
 public class AsyncHandlerAdapter<T> implements AsyncHandler<T> {
-  private final AgentSpan clientSpan;
-  private final AgentSpan parentSpan;
-  private final AsyncHandler<T> delegate;
-  private Response.ResponseBuilder responseBuilder = new Response.ResponseBuilder();
+    private final AgentSpan clientSpan;
+    private final AgentSpan parentSpan;
+    private final AsyncHandler<T> delegate;
+    private Response.ResponseBuilder responseBuilder = new Response.ResponseBuilder();
 
-  public AsyncHandlerAdapter(AgentSpan clientSpan, AgentSpan parentSpan, AsyncHandler<T> delegate) {
-    this.clientSpan = clientSpan;
-    this.parentSpan = parentSpan;
-    this.delegate = delegate;
-  }
+    public AsyncHandlerAdapter(AgentSpan clientSpan, AgentSpan parentSpan, AsyncHandler<T> delegate) {
+        this.clientSpan = clientSpan;
+        this.parentSpan = parentSpan;
+        this.delegate = delegate;
+    }
 
-  @Override
-  public void onThrowable(Throwable throwable) {
-    delegate.onThrowable(throwable);
-  }
+    @Override
+    public void onThrowable(Throwable throwable) {
+        delegate.onThrowable(throwable);
+    }
 
-  @Override
-  public STATE onBodyPartReceived(HttpResponseBodyPart httpResponseBodyPart) throws Exception {
-    try (final ContextScope ignored = activateSpan(clientSpan)) {
-      return delegate.onBodyPartReceived(httpResponseBodyPart);
+    @Override
+    public STATE onBodyPartReceived(HttpResponseBodyPart httpResponseBodyPart) throws Exception {
+        try (final ContextScope ignored = activateSpan(clientSpan)) {
+            return delegate.onBodyPartReceived(httpResponseBodyPart);
+        }
     }
-  }
 
-  @Override
-  public STATE onStatusReceived(HttpResponseStatus httpResponseStatus) throws Exception {
-    responseBuilder = responseBuilder.accumulate(httpResponseStatus);
-    try (final ContextScope ignored = activateSpan(clientSpan)) {
-      return delegate.onStatusReceived(httpResponseStatus);
+    @Override
+    public STATE onStatusReceived(HttpResponseStatus httpResponseStatus) throws Exception {
+        responseBuilder = responseBuilder.accumulate(httpResponseStatus);
+        try (final ContextScope ignored = activateSpan(clientSpan)) {
+            return delegate.onStatusReceived(httpResponseStatus);
+        }
     }
-  }
 
-  @Override
-  public STATE onHeadersReceived(HttpResponseHeaders httpResponseHeaders) throws Exception {
-    responseBuilder = responseBuilder.accumulate(httpResponseHeaders);
-    try (final ContextScope ignored = activateSpan(clientSpan)) {
-      return delegate.onHeadersReceived(httpResponseHeaders);
+    @Override
+    public STATE onHeadersReceived(HttpResponseHeaders httpResponseHeaders) throws Exception {
+        responseBuilder = responseBuilder.accumulate(httpResponseHeaders);
+        try (final ContextScope ignored = activateSpan(clientSpan)) {
+            return delegate.onHeadersReceived(httpResponseHeaders);
+        }
     }
-  }
 
-  @Override
-  public T onCompleted() throws Exception {
-    try {
-      final T response;
-      try (ContextScope ignored = (parentSpan != null ? activateSpan(parentSpan) : null)) {
-        response = delegate.onCompleted();
-      }
-      if (response instanceof Response) {
-        DECORATE.onResponse(clientSpan, (Response) response);
-      } else {
-        DECORATE.onResponse(clientSpan, responseBuilder.build());
-      }
-      return response;
-    } finally {
-      DECORATE.beforeFinish(clientSpan);
-      clientSpan.finish();
+    @Override
+    public T onCompleted() throws Exception {
+        try {
+            final T response;
+            try (ContextScope ignored = (parentSpan != null ? activateSpan(parentSpan) : null)) {
+                response = delegate.onCompleted();
+            }
+            if (response instanceof Response) {
+                DECORATE.onResponse(clientSpan, (Response) response);
+            } else {
+                DECORATE.onResponse(clientSpan, responseBuilder.build());
+            }
+            return response;
+        } finally {
+            DECORATE.beforeFinish(clientSpan);
+            clientSpan.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java
index fd2da5eea0d..79c68afc220 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java
@@ -21,62 +21,60 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
 
-public final class AsyncHttpClientInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class AsyncHttpClientInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.ning.http.client.AsyncHttpClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.ning.http.client.AsyncHttpClient";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        named("executeRequest")
-            .and(takesArgument(0, named("com.ning.http.client.Request")))
-            .and(takesArgument(1, named("com.ning.http.client.AsyncHandler")))
-            .and(isPublic()),
-        getClass().getName() + "$ExecuteRequest",
-        getClass().getName() + "$ExecuteContextPropagationAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                named("executeRequest")
+                        .and(takesArgument(0, named("com.ning.http.client.Request")))
+                        .and(takesArgument(1, named("com.ning.http.client.AsyncHandler")))
+                        .and(isPublic()),
+                getClass().getName() + "$ExecuteRequest",
+                getClass().getName() + "$ExecuteContextPropagationAdvice");
+    }
 
-  public static class ExecuteRequest {
+    public static class ExecuteRequest {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final Request request,
-        @Advice.Argument(value = 1, readOnly = false) AsyncHandler<?> handler) {
-      AgentSpan parentSpan = activeSpan();
-      AgentSpan span = startSpan("grizzly-http-async-client", HTTP_REQUEST);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, request);
-      handler = new AsyncHandlerAdapter<>(span, parentSpan, handler);
-      return activateSpan(span);
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final Request request,
+                @Advice.Argument(value = 1, readOnly = false) AsyncHandler<?> handler) {
+            AgentSpan parentSpan = activeSpan();
+            AgentSpan span = startSpan("grizzly-http-async-client", HTTP_REQUEST);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, request);
+            handler = new AsyncHandlerAdapter<>(span, parentSpan, handler);
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      if (throwable != null) {
-        AgentSpan span = spanFromScope(scope);
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            if (throwable != null) {
+                AgentSpan span = spanFromScope(scope);
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+        }
     }
-  }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ExecuteContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(0) final Request request) {
-      DECORATE.injectContext(currentContext(), request, SETTER);
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ExecuteContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(0) final Request request) {
+            DECORATE.injectContext(currentContext(), request, SETTER);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/ClientDecorator.java b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/ClientDecorator.java
index d9ac7a19fb6..42dfc6d5fe2 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/ClientDecorator.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/ClientDecorator.java
@@ -9,44 +9,43 @@
 
 public class ClientDecorator extends HttpClientDecorator<Request, Response> {
 
-  private static final CharSequence GRIZZLY_HTTP_ASYNC_CLIENT =
-      UTF8BytesString.create("grizzly-http-async-client");
-  public static final ClientDecorator DECORATE = new ClientDecorator();
-
-  public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"grizzly-client", "ning"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return GRIZZLY_HTTP_ASYNC_CLIENT;
-  }
-
-  @Override
-  protected String method(final Request request) {
-    return request.getMethod();
-  }
-
-  @Override
-  protected URI url(final Request request) throws URISyntaxException {
-    return request.getUri().toJavaNetURI();
-  }
-
-  @Override
-  protected int status(final Response response) {
-    return response.getStatusCode();
-  }
-
-  @Override
-  protected String getRequestHeader(Request request, String headerName) {
-    return request.getHeaders().getFirstValue(headerName);
-  }
-
-  @Override
-  protected String getResponseHeader(Response response, String headerName) {
-    return response.getHeader(headerName);
-  }
+    private static final CharSequence GRIZZLY_HTTP_ASYNC_CLIENT = UTF8BytesString.create("grizzly-http-async-client");
+    public static final ClientDecorator DECORATE = new ClientDecorator();
+
+    public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"grizzly-client", "ning"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return GRIZZLY_HTTP_ASYNC_CLIENT;
+    }
+
+    @Override
+    protected String method(final Request request) {
+        return request.getMethod();
+    }
+
+    @Override
+    protected URI url(final Request request) throws URISyntaxException {
+        return request.getUri().toJavaNetURI();
+    }
+
+    @Override
+    protected int status(final Response response) {
+        return response.getStatusCode();
+    }
+
+    @Override
+    protected String getRequestHeader(Request request, String headerName) {
+        return request.getHeaders().getFirstValue(headerName);
+    }
+
+    @Override
+    protected String getResponseHeader(Response response, String headerName) {
+        return response.getHeader(headerName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/GrizzlyClientModule.java b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/GrizzlyClientModule.java
index 3387a3094dc..941dc2fcd34 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/GrizzlyClientModule.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/GrizzlyClientModule.java
@@ -11,17 +11,17 @@
 
 @AutoService(InstrumenterModule.class)
 public class GrizzlyClientModule extends InstrumenterModule.Tracing {
-  public GrizzlyClientModule() {
-    super("grizzly-client", "ning");
-  }
+    public GrizzlyClientModule() {
+        super("grizzly-client", "ning");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isIntegrationEnabled(Collections.singleton("mule"), false);
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isIntegrationEnabled(Collections.singleton("mule"), false);
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return singletonList(new AsyncHttpClientInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return singletonList(new AsyncHttpClientInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/InjectAdapter.java b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/InjectAdapter.java
index 44f71cf95a2..2542e7b8de0 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/InjectAdapter.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/InjectAdapter.java
@@ -6,10 +6,10 @@
 
 @ParametersAreNonnullByDefault
 public class InjectAdapter implements CarrierSetter<Request> {
-  public static final InjectAdapter SETTER = new InjectAdapter();
+    public static final InjectAdapter SETTER = new InjectAdapter();
 
-  @Override
-  public void set(final Request carrier, final String key, final String value) {
-    carrier.getHeaders().replaceWith(key, value);
-  }
+    @Override
+    public void set(final Request carrier, final String key, final String value) {
+        carrier.getHeaders().replaceWith(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainAdvice.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainAdvice.java
index ddc143750f3..6d77be99654 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainAdvice.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainAdvice.java
@@ -7,10 +7,9 @@
 
 public class DefaultFilterChainAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void onFail(
-      @Advice.Argument(0) final FilterChainContext ctx,
-      @Advice.Argument(1) final Throwable throwable) {
-    onFilterChainFail(ctx, throwable);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void onFail(
+            @Advice.Argument(0) final FilterChainContext ctx, @Advice.Argument(1) final Throwable throwable) {
+        onFilterChainFail(ctx, throwable);
+    }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainInstrumentation.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainInstrumentation.java
index 99b02eb9052..ea58604fc50 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainInstrumentation.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainInstrumentation.java
@@ -14,50 +14,49 @@
 import net.bytebuddy.asm.Advice;
 import org.glassfish.grizzly.filterchain.FilterChainContext;
 
-public class DefaultFilterChainInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class DefaultFilterChainInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.grizzly.filterchain.DefaultFilterChain";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPrivate())
-            .and(named("notifyFailure"))
-            .and(takesArgument(0, named("org.glassfish.grizzly.filterchain.FilterChainContext")))
-            .and(takesArgument(1, named("java.lang.Throwable"))),
-        "datadog.trace.instrumentation.grizzlyhttp232.DefaultFilterChainAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("executeFilter"))
-            .and(takesArgument(2, named("org.glassfish.grizzly.filterchain.FilterChainContext"))),
-        getClass().getName() + "$PropagateServerSpanAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.grizzly.filterchain.DefaultFilterChain";
+    }
 
-  public static class PropagateServerSpanAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(@Advice.Argument(2) final FilterChainContext ctx) {
-      final AgentSpan active = activeSpan();
-      // don't activate a span if already one is active
-      if (active != null) {
-        return null;
-      }
-      final Object contextObj = ctx.getAttributes().getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (contextObj instanceof Context) {
-        return ((Context) contextObj).attach();
-      }
-      return null;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPrivate())
+                        .and(named("notifyFailure"))
+                        .and(takesArgument(0, named("org.glassfish.grizzly.filterchain.FilterChainContext")))
+                        .and(takesArgument(1, named("java.lang.Throwable"))),
+                "datadog.trace.instrumentation.grizzlyhttp232.DefaultFilterChainAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("executeFilter"))
+                        .and(takesArgument(2, named("org.glassfish.grizzly.filterchain.FilterChainContext"))),
+                getClass().getName() + "$PropagateServerSpanAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    public static class PropagateServerSpanAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(@Advice.Argument(2) final FilterChainContext ctx) {
+            final AgentSpan active = activeSpan();
+            // don't activate a span if already one is active
+            if (active != null) {
+                return null;
+            }
+            final Object contextObj = ctx.getAttributes().getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (contextObj instanceof Context) {
+                return ((Context) contextObj).attach();
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/ExtractAdapter.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/ExtractAdapter.java
index af76f7b8fa4..3023459d285 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/ExtractAdapter.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/ExtractAdapter.java
@@ -9,33 +9,33 @@
 
 public class ExtractAdapter<T extends HttpHeader> implements AgentPropagation.ContextVisitor<T> {
 
-  @SuppressWarnings("rawtypes")
-  private static final ExtractAdapter GETTER = new ExtractAdapter();
+    @SuppressWarnings("rawtypes")
+    private static final ExtractAdapter GETTER = new ExtractAdapter();
 
-  private ExtractAdapter() {}
+    private ExtractAdapter() {}
 
-  @SuppressWarnings("unchecked")
-  public static AgentPropagation.ContextVisitor<HttpRequestPacket> requestGetter() {
-    return (AgentPropagation.ContextVisitor<HttpRequestPacket>) GETTER;
-  }
-
-  @SuppressWarnings("unchecked")
-  public static AgentPropagation.ContextVisitor<HttpResponsePacket> responseGetter() {
-    return (AgentPropagation.ContextVisitor<HttpResponsePacket>) GETTER;
-  }
+    @SuppressWarnings("unchecked")
+    public static AgentPropagation.ContextVisitor<HttpRequestPacket> requestGetter() {
+        return (AgentPropagation.ContextVisitor<HttpRequestPacket>) GETTER;
+    }
 
-  @Override
-  public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-    MimeHeaders headers = carrier.getHeaders();
-    if (headers == null) {
-      return;
+    @SuppressWarnings("unchecked")
+    public static AgentPropagation.ContextVisitor<HttpResponsePacket> responseGetter() {
+        return (AgentPropagation.ContextVisitor<HttpResponsePacket>) GETTER;
     }
-    for (int i = 0; i < headers.size(); ++i) {
-      if (!classifier.accept(
-          headers.getName(i).toString(StandardCharsets.UTF_8),
-          headers.getValue(i).toString(StandardCharsets.UTF_8))) {
-        return;
-      }
+
+    @Override
+    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+        MimeHeaders headers = carrier.getHeaders();
+        if (headers == null) {
+            return;
+        }
+        for (int i = 0; i < headers.size(); ++i) {
+            if (!classifier.accept(
+                    headers.getName(i).toString(StandardCharsets.UTF_8),
+                    headers.getValue(i).toString(StandardCharsets.UTF_8))) {
+                return;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterAdvice.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterAdvice.java
index 0c58e436c8d..17cc75a9ff5 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterAdvice.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterAdvice.java
@@ -11,22 +11,22 @@
 
 public class FilterAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(@Advice.Argument(0) final FilterChainContext ctx) {
-    if (currentContext() != rootContext()) {
-      return null;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(@Advice.Argument(0) final FilterChainContext ctx) {
+        if (currentContext() != rootContext()) {
+            return null;
+        }
+        Object contextObj = ctx.getAttributes().getAttribute(DD_CONTEXT_ATTRIBUTE);
+        if (contextObj instanceof Context) {
+            return ((Context) contextObj).attach();
+        }
+        return null;
     }
-    Object contextObj = ctx.getAttributes().getAttribute(DD_CONTEXT_ATTRIBUTE);
-    if (contextObj instanceof Context) {
-      return ((Context) contextObj).attach();
-    }
-    return null;
-  }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void onExit(@Advice.Enter final ContextScope scope) {
-    if (scope != null) {
-      scope.close();
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void onExit(@Advice.Enter final ContextScope scope) {
+        if (scope != null) {
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterInstrumentation.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterInstrumentation.java
index 2495f91c55f..d6f54aa3773 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterInstrumentation.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterInstrumentation.java
@@ -10,27 +10,26 @@
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
-public final class FilterInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.glassfish.grizzly.filterchain.BaseFilter";
-  }
+public final class FilterInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.glassfish.grizzly.filterchain.BaseFilter";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()))
-        // HttpCodecFilter is instrumented in the server instrumentation
-        .and(not(named("org.glassfish.grizzly.http.HttpCodecFilter")))
-        .and(not(named("org.glassfish.grizzly.http.HttpServerFilter")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()))
+                // HttpCodecFilter is instrumented in the server instrumentation
+                .and(not(named("org.glassfish.grizzly.http.HttpCodecFilter")))
+                .and(not(named("org.glassfish.grizzly.http.HttpServerFilter")));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("handleRead")
-            .and(takesArgument(0, named("org.glassfish.grizzly.filterchain.FilterChainContext")))
-            .and(isPublic()),
-        "datadog.trace.instrumentation.grizzlyhttp232.FilterAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("handleRead")
+                        .and(takesArgument(0, named("org.glassfish.grizzly.filterchain.FilterChainContext")))
+                        .and(isPublic()),
+                "datadog.trace.instrumentation.grizzlyhttp232.FilterAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyBodyModule.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyBodyModule.java
index 7b2db63a7ab..68f5722cdb0 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyBodyModule.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyBodyModule.java
@@ -10,22 +10,20 @@
 
 @AutoService(InstrumenterModule.class)
 public class GrizzlyBodyModule extends InstrumenterModule.AppSec {
-  public GrizzlyBodyModule() {
-    super("grizzly");
-  }
+    public GrizzlyBodyModule() {
+        super("grizzly");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    final Map<String, String> ret = new HashMap<>();
-    ret.put(
-        "org.glassfish.grizzly.http.io.NIOInputStream", "datadog.trace.api.http.StoredByteBody");
-    ret.put("org.glassfish.grizzly.http.io.NIOReader", "datadog.trace.api.http.StoredCharBody");
-    return ret;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        final Map<String, String> ret = new HashMap<>();
+        ret.put("org.glassfish.grizzly.http.io.NIOInputStream", "datadog.trace.api.http.StoredByteBody");
+        ret.put("org.glassfish.grizzly.http.io.NIOReader", "datadog.trace.api.http.StoredCharBody");
+        return ret;
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new GrizzlyByteBodyInstrumentation(), new GrizzlyCharBodyInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(new GrizzlyByteBodyInstrumentation(), new GrizzlyCharBodyInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyByteBodyInstrumentation.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyByteBodyInstrumentation.java
index 1989ab3ba0b..2fd0d63e527 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyByteBodyInstrumentation.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyByteBodyInstrumentation.java
@@ -22,194 +22,191 @@
 import org.glassfish.grizzly.http.io.NIOInputStream;
 import org.glassfish.grizzly.utils.Charsets;
 
-public class GrizzlyByteBodyInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.grizzly.http.server.NIOInputStreamImpl";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("setInputBuffer")
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("org.glassfish.grizzly.http.io.InputBuffer"))),
-        getClass().getName() + "$NIOInputStreamSetInputBufferAdvice");
-    /* we're assuming here none of these methods call the other instrumented methods */
-    transformer.applyAdvice(
-        named("read").and(takesArguments(0)), getClass().getName() + "$NIOInputStreamReadAdvice");
-    transformer.applyAdvice(
-        named("read").and(takesArguments(1)).and(takesArgument(0, byte[].class)),
-        getClass().getName() + "$NIOInputStreamReadByteArrayAdvice");
-    transformer.applyAdvice(
-        named("read").and(takesArguments(byte[].class, int.class, int.class)),
-        getClass().getName() + "$NIOInputStreamReadByteArrayIntIntAdvice");
-    transformer.applyAdvice(
-        named("readBuffer").and(takesArguments(0).or(takesArguments(int.class))),
-        getClass().getName() + "$NIOInputStreamReadBufferAdvice");
-    transformer.applyAdvice(
-        named("isFinished").and(takesArguments(0)),
-        getClass().getName() + "$NIOInputStreamIsFinishedAdvice");
-    transformer.applyAdvice(
-        named("recycle").and(takesArguments(0)),
-        getClass().getName() + "$NIOInputStreamRecycleAdvice");
-    /* Possible alternative impl: call getBuffer() and register notifications.
-    It would work even if the application relies on getBuffer() */
-  }
-
-  @SuppressWarnings("Duplicates")
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  static class NIOInputStreamSetInputBufferAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(
-        @Advice.This final NIOInputStream thiz, @Advice.Argument(0) final InputBuffer inputBuffer) {
-      // this is what grizzly defaults to
-      Charset charset = StandardCharsets.ISO_8859_1;
-      HttpHeader header = HttpHeaderFetchingHelper.fetchHttpHeader(inputBuffer);
-      AttributeHolder attributes = header.getAttributes();
-      Object attribute = attributes.getAttribute("datadog.intercepted_request_body");
-      if (attribute != null) {
-        return;
-      }
-      attributes.setAttribute("datadog.intercepted_request_body", Boolean.TRUE);
-
-      String lengthHeader = header.getHeader("content-length");
-      String encodingString = header.getCharacterEncoding();
-      if (encodingString != null) {
-        try {
-          charset = Charsets.lookupCharset(encodingString);
-        } catch (UnsupportedCharsetException use) {
-          // purposefully left blank
-        }
-      }
+public class GrizzlyByteBodyInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-      StoredByteBody storedByteBody = StoredBodyFactories.maybeCreateForByte(charset, lengthHeader);
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.grizzly.http.server.NIOInputStreamImpl";
+    }
 
-      InstrumentationContext.get(NIOInputStream.class, StoredByteBody.class)
-          .put(thiz, storedByteBody);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("setInputBuffer")
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("org.glassfish.grizzly.http.io.InputBuffer"))),
+                getClass().getName() + "$NIOInputStreamSetInputBufferAdvice");
+        /* we're assuming here none of these methods call the other instrumented methods */
+        transformer.applyAdvice(
+                named("read").and(takesArguments(0)), getClass().getName() + "$NIOInputStreamReadAdvice");
+        transformer.applyAdvice(
+                named("read").and(takesArguments(1)).and(takesArgument(0, byte[].class)),
+                getClass().getName() + "$NIOInputStreamReadByteArrayAdvice");
+        transformer.applyAdvice(
+                named("read").and(takesArguments(byte[].class, int.class, int.class)),
+                getClass().getName() + "$NIOInputStreamReadByteArrayIntIntAdvice");
+        transformer.applyAdvice(
+                named("readBuffer").and(takesArguments(0).or(takesArguments(int.class))),
+                getClass().getName() + "$NIOInputStreamReadBufferAdvice");
+        transformer.applyAdvice(
+                named("isFinished").and(takesArguments(0)), getClass().getName() + "$NIOInputStreamIsFinishedAdvice");
+        transformer.applyAdvice(
+                named("recycle").and(takesArguments(0)), getClass().getName() + "$NIOInputStreamRecycleAdvice");
+        /* Possible alternative impl: call getBuffer() and register notifications.
+        It would work even if the application relies on getBuffer() */
     }
-  }
-
-  static class NIOInputStreamReadAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(@Advice.This final NIOInputStream thiz, @Advice.Return int ret) {
-      StoredByteBody storedByteBody =
-          InstrumentationContext.get(NIOInputStream.class, StoredByteBody.class).get(thiz);
-      if (storedByteBody == null) {
-        return;
-      }
-      if (ret == -1) {
-        storedByteBody.maybeNotifyAndBlock();
-        return;
-      }
-      storedByteBody.appendData(ret);
+
+    @SuppressWarnings("Duplicates")
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    static class NIOInputStreamSetInputBufferAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.This final NIOInputStream thiz, @Advice.Argument(0) final InputBuffer inputBuffer) {
+            // this is what grizzly defaults to
+            Charset charset = StandardCharsets.ISO_8859_1;
+            HttpHeader header = HttpHeaderFetchingHelper.fetchHttpHeader(inputBuffer);
+            AttributeHolder attributes = header.getAttributes();
+            Object attribute = attributes.getAttribute("datadog.intercepted_request_body");
+            if (attribute != null) {
+                return;
+            }
+            attributes.setAttribute("datadog.intercepted_request_body", Boolean.TRUE);
+
+            String lengthHeader = header.getHeader("content-length");
+            String encodingString = header.getCharacterEncoding();
+            if (encodingString != null) {
+                try {
+                    charset = Charsets.lookupCharset(encodingString);
+                } catch (UnsupportedCharsetException use) {
+                    // purposefully left blank
+                }
+            }
+
+            StoredByteBody storedByteBody = StoredBodyFactories.maybeCreateForByte(charset, lengthHeader);
+
+            InstrumentationContext.get(NIOInputStream.class, StoredByteBody.class)
+                    .put(thiz, storedByteBody);
+        }
     }
-  }
-
-  static class NIOInputStreamReadByteArrayAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.This final NIOInputStream thiz,
-        @Advice.Argument(0) byte[] byteArray,
-        @Advice.Return int ret,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
-      StoredByteBody storedByteBody =
-          InstrumentationContext.get(NIOInputStream.class, StoredByteBody.class).get(thiz);
-      if (storedByteBody == null) {
-        return;
-      }
-
-      if (ret == -1) {
-        try {
-          storedByteBody.maybeNotifyAndBlock();
-        } catch (BlockingException be) {
-          t = be;
+
+    static class NIOInputStreamReadAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.This final NIOInputStream thiz, @Advice.Return int ret) {
+            StoredByteBody storedByteBody = InstrumentationContext.get(NIOInputStream.class, StoredByteBody.class)
+                    .get(thiz);
+            if (storedByteBody == null) {
+                return;
+            }
+            if (ret == -1) {
+                storedByteBody.maybeNotifyAndBlock();
+                return;
+            }
+            storedByteBody.appendData(ret);
         }
-        return;
-      }
-      storedByteBody.appendData(byteArray, 0, ret);
     }
-  }
-
-  static class NIOInputStreamReadByteArrayIntIntAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.This final NIOInputStream thiz,
-        @Advice.Argument(0) byte[] byteArray,
-        @Advice.Argument(1) int off,
-        @Advice.Return int ret,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
-
-      StoredByteBody storedByteBody =
-          InstrumentationContext.get(NIOInputStream.class, StoredByteBody.class).get(thiz);
-      if (storedByteBody == null) {
-        return;
-      }
-      if (ret == -1) {
-        try {
-          storedByteBody.maybeNotifyAndBlock();
-        } catch (BlockingException be) {
-          t = be;
+
+    static class NIOInputStreamReadByteArrayAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.This final NIOInputStream thiz,
+                @Advice.Argument(0) byte[] byteArray,
+                @Advice.Return int ret,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
+            }
+            StoredByteBody storedByteBody = InstrumentationContext.get(NIOInputStream.class, StoredByteBody.class)
+                    .get(thiz);
+            if (storedByteBody == null) {
+                return;
+            }
+
+            if (ret == -1) {
+                try {
+                    storedByteBody.maybeNotifyAndBlock();
+                } catch (BlockingException be) {
+                    t = be;
+                }
+                return;
+            }
+            storedByteBody.appendData(byteArray, 0, ret);
         }
-        return;
-      }
-      storedByteBody.appendData(byteArray, off, off + ret);
     }
-  }
-
-  static class NIOInputStreamReadBufferAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(@Advice.This final NIOInputStream thiz, @Advice.Return Buffer ret) {
-      StoredByteBody storedByteBody =
-          InstrumentationContext.get(NIOInputStream.class, StoredByteBody.class).get(thiz);
-      if (storedByteBody == null) {
-        return;
-      }
-      int initPos = ret.position();
-      byte[] bytes = new byte[ret.remaining()];
-      ret.get(bytes);
-      ret.position(initPos);
-
-      storedByteBody.appendData(bytes, 0, bytes.length);
+
+    static class NIOInputStreamReadByteArrayIntIntAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.This final NIOInputStream thiz,
+                @Advice.Argument(0) byte[] byteArray,
+                @Advice.Argument(1) int off,
+                @Advice.Return int ret,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
+            }
+
+            StoredByteBody storedByteBody = InstrumentationContext.get(NIOInputStream.class, StoredByteBody.class)
+                    .get(thiz);
+            if (storedByteBody == null) {
+                return;
+            }
+            if (ret == -1) {
+                try {
+                    storedByteBody.maybeNotifyAndBlock();
+                } catch (BlockingException be) {
+                    t = be;
+                }
+                return;
+            }
+            storedByteBody.appendData(byteArray, off, off + ret);
+        }
+    }
+
+    static class NIOInputStreamReadBufferAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.This final NIOInputStream thiz, @Advice.Return Buffer ret) {
+            StoredByteBody storedByteBody = InstrumentationContext.get(NIOInputStream.class, StoredByteBody.class)
+                    .get(thiz);
+            if (storedByteBody == null) {
+                return;
+            }
+            int initPos = ret.position();
+            byte[] bytes = new byte[ret.remaining()];
+            ret.get(bytes);
+            ret.position(initPos);
+
+            storedByteBody.appendData(bytes, 0, bytes.length);
+        }
     }
-  }
-
-  static class NIOInputStreamIsFinishedAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.This final NIOInputStream thiz,
-        @Advice.Return boolean ret,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
-      StoredByteBody storedByteBody =
-          InstrumentationContext.get(NIOInputStream.class, StoredByteBody.class).get(thiz);
-      if (storedByteBody == null) {
-        return;
-      }
-      if (ret) {
-        try {
-          storedByteBody.maybeNotifyAndBlock();
-        } catch (BlockingException be) {
-          t = be;
+
+    static class NIOInputStreamIsFinishedAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.This final NIOInputStream thiz,
+                @Advice.Return boolean ret,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
+            }
+            StoredByteBody storedByteBody = InstrumentationContext.get(NIOInputStream.class, StoredByteBody.class)
+                    .get(thiz);
+            if (storedByteBody == null) {
+                return;
+            }
+            if (ret) {
+                try {
+                    storedByteBody.maybeNotifyAndBlock();
+                } catch (BlockingException be) {
+                    t = be;
+                }
+            }
         }
-      }
     }
-  }
 
-  static class NIOInputStreamRecycleAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(@Advice.This final NIOInputStream thiz) {
-      InstrumentationContext.get(NIOInputStream.class, StoredByteBody.class).put(thiz, null);
+    static class NIOInputStreamRecycleAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(@Advice.This final NIOInputStream thiz) {
+            InstrumentationContext.get(NIOInputStream.class, StoredByteBody.class)
+                    .put(thiz, null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyCharBodyInstrumentation.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyCharBodyInstrumentation.java
index 73ce6a5efdd..ed98a9dc2c4 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyCharBodyInstrumentation.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyCharBodyInstrumentation.java
@@ -18,212 +18,209 @@
 import org.glassfish.grizzly.http.io.InputBuffer;
 import org.glassfish.grizzly.http.io.NIOReader;
 
-public class GrizzlyCharBodyInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.grizzly.http.server.NIOReaderImpl";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("setInputBuffer")
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("org.glassfish.grizzly.http.io.InputBuffer"))),
-        getClass().getName() + "$NIOReaderSetInputBufferAdvice");
-    transformer.applyAdvice(
-        named("read").and(takesArguments(0)), getClass().getName() + "$NIOReaderReadAdvice");
-    transformer.applyAdvice(
-        named("read").and(takesArguments(1)).and(takesArgument(0, char[].class)),
-        getClass().getName() + "$NIOReaderReadCharArrayAdvice");
-    transformer.applyAdvice(
-        named("read").and(takesArguments(char[].class, int.class, int.class)),
-        getClass().getName() + "$NIOReaderReadCharArrayIntIntAdvice");
-    transformer.applyAdvice(
-        named("read").and(takesArguments(CharBuffer.class)),
-        getClass().getName() + "$NIOReaderReadCharBufferAdvice");
-    transformer.applyAdvice(
-        named("isFinished").and(takesArguments(0)),
-        getClass().getName() + "$NIOReaderIsFinishedAdvice");
-    transformer.applyAdvice(
-        named("recycle").and(takesArguments(0)), getClass().getName() + "$NIOReaderRecycleAdvice");
-  }
-
-  @SuppressWarnings("Duplicates")
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  static class NIOReaderSetInputBufferAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(
-        @Advice.This final NIOReader thiz, @Advice.Argument(0) final InputBuffer inputBuffer) {
-      HttpHeader header = HttpHeaderFetchingHelper.fetchHttpHeader(inputBuffer);
-      AttributeHolder attributes = header.getAttributes();
-      Object attribute = attributes.getAttribute("datadog.intercepted_request_body");
-      if (attribute != null) {
-        return;
-      }
-
-      attributes.setAttribute("datadog.intercepted_request_body", Boolean.TRUE);
-
-      String lengthHeader = header.getHeader("content-length");
-      StoredCharBody storedCharBody = StoredBodyFactories.maybeCreateForChar(lengthHeader);
-
-      InstrumentationContext.get(NIOReader.class, StoredCharBody.class).put(thiz, storedCharBody);
+public class GrizzlyCharBodyInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.grizzly.http.server.NIOReaderImpl";
     }
-  }
-
-  static class NIOReaderReadAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.This final NIOReader thiz,
-        @Advice.Return int ret,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
-      StoredCharBody storedCharBody =
-          InstrumentationContext.get(NIOReader.class, StoredCharBody.class).get(thiz);
-      if (storedCharBody == null) {
-        return;
-      }
-      if (ret == -1) {
-        try {
-          storedCharBody.maybeNotifyAndBlock();
-        } catch (BlockingException be) {
-          t = be;
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("setInputBuffer")
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("org.glassfish.grizzly.http.io.InputBuffer"))),
+                getClass().getName() + "$NIOReaderSetInputBufferAdvice");
+        transformer.applyAdvice(named("read").and(takesArguments(0)), getClass().getName() + "$NIOReaderReadAdvice");
+        transformer.applyAdvice(
+                named("read").and(takesArguments(1)).and(takesArgument(0, char[].class)),
+                getClass().getName() + "$NIOReaderReadCharArrayAdvice");
+        transformer.applyAdvice(
+                named("read").and(takesArguments(char[].class, int.class, int.class)),
+                getClass().getName() + "$NIOReaderReadCharArrayIntIntAdvice");
+        transformer.applyAdvice(
+                named("read").and(takesArguments(CharBuffer.class)),
+                getClass().getName() + "$NIOReaderReadCharBufferAdvice");
+        transformer.applyAdvice(
+                named("isFinished").and(takesArguments(0)), getClass().getName() + "$NIOReaderIsFinishedAdvice");
+        transformer.applyAdvice(
+                named("recycle").and(takesArguments(0)), getClass().getName() + "$NIOReaderRecycleAdvice");
+    }
+
+    @SuppressWarnings("Duplicates")
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    static class NIOReaderSetInputBufferAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.This final NIOReader thiz, @Advice.Argument(0) final InputBuffer inputBuffer) {
+            HttpHeader header = HttpHeaderFetchingHelper.fetchHttpHeader(inputBuffer);
+            AttributeHolder attributes = header.getAttributes();
+            Object attribute = attributes.getAttribute("datadog.intercepted_request_body");
+            if (attribute != null) {
+                return;
+            }
+
+            attributes.setAttribute("datadog.intercepted_request_body", Boolean.TRUE);
+
+            String lengthHeader = header.getHeader("content-length");
+            StoredCharBody storedCharBody = StoredBodyFactories.maybeCreateForChar(lengthHeader);
+
+            InstrumentationContext.get(NIOReader.class, StoredCharBody.class).put(thiz, storedCharBody);
         }
-        return;
-      }
-      storedCharBody.appendData(ret);
     }
-  }
-
-  static class NIOReaderReadCharArrayAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.This final NIOReader thiz,
-        @Advice.Argument(0) char[] charArray,
-        @Advice.Return int ret,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
-      StoredCharBody storedCharBody =
-          InstrumentationContext.get(NIOReader.class, StoredCharBody.class).get(thiz);
-      if (storedCharBody == null) {
-        return;
-      }
-      if (ret == -1) {
-        try {
-          storedCharBody.maybeNotifyAndBlock();
-        } catch (BlockingException be) {
-          t = be;
+
+    static class NIOReaderReadAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.This final NIOReader thiz,
+                @Advice.Return int ret,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
+            }
+            StoredCharBody storedCharBody = InstrumentationContext.get(NIOReader.class, StoredCharBody.class)
+                    .get(thiz);
+            if (storedCharBody == null) {
+                return;
+            }
+            if (ret == -1) {
+                try {
+                    storedCharBody.maybeNotifyAndBlock();
+                } catch (BlockingException be) {
+                    t = be;
+                }
+                return;
+            }
+            storedCharBody.appendData(ret);
         }
-        return;
-      }
-      storedCharBody.appendData(charArray, 0, ret);
     }
-  }
-
-  static class NIOReaderReadCharArrayIntIntAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.This final NIOReader thiz,
-        @Advice.Argument(0) char[] charArray,
-        @Advice.Argument(1) int off,
-        @Advice.Return int ret,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
-      StoredCharBody storedCharBody =
-          InstrumentationContext.get(NIOReader.class, StoredCharBody.class).get(thiz);
-      if (storedCharBody == null) {
-        return;
-      }
-      if (ret == -1) {
-        try {
-          storedCharBody.maybeNotifyAndBlock();
-        } catch (BlockingException be) {
-          t = be;
+
+    static class NIOReaderReadCharArrayAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.This final NIOReader thiz,
+                @Advice.Argument(0) char[] charArray,
+                @Advice.Return int ret,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
+            }
+            StoredCharBody storedCharBody = InstrumentationContext.get(NIOReader.class, StoredCharBody.class)
+                    .get(thiz);
+            if (storedCharBody == null) {
+                return;
+            }
+            if (ret == -1) {
+                try {
+                    storedCharBody.maybeNotifyAndBlock();
+                } catch (BlockingException be) {
+                    t = be;
+                }
+                return;
+            }
+            storedCharBody.appendData(charArray, 0, ret);
         }
-        return;
-      }
-      storedCharBody.appendData(charArray, off, off + ret);
     }
-  }
-
-  static class NIOReaderReadCharBufferAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static int before(
-        @Advice.This final NIOReader thiz,
-        @Advice.Local("storedCharBody") StoredCharBody storedCharBody,
-        @Advice.Argument(0) CharBuffer charBuffer) {
-      storedCharBody = InstrumentationContext.get(NIOReader.class, StoredCharBody.class).get(thiz);
-      if (storedCharBody == null) {
-        return 0;
-      }
-      return charBuffer.position();
+
+    static class NIOReaderReadCharArrayIntIntAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.This final NIOReader thiz,
+                @Advice.Argument(0) char[] charArray,
+                @Advice.Argument(1) int off,
+                @Advice.Return int ret,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
+            }
+            StoredCharBody storedCharBody = InstrumentationContext.get(NIOReader.class, StoredCharBody.class)
+                    .get(thiz);
+            if (storedCharBody == null) {
+                return;
+            }
+            if (ret == -1) {
+                try {
+                    storedCharBody.maybeNotifyAndBlock();
+                } catch (BlockingException be) {
+                    t = be;
+                }
+                return;
+            }
+            storedCharBody.appendData(charArray, off, off + ret);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Local("storedCharBody") StoredCharBody storedCharBody,
-        @Advice.Argument(0) CharBuffer charBuffer,
-        @Advice.Enter int initPos,
-        @Advice.Return int ret,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (storedCharBody == null || t != null) {
-        return;
-      }
-      if (ret > 0) {
-        int finalLimit = charBuffer.limit();
-        int finalPos = charBuffer.position();
-        charBuffer.limit(charBuffer.position());
-        charBuffer.position(initPos);
-
-        storedCharBody.appendData(charBuffer);
-
-        charBuffer.limit(finalLimit);
-        charBuffer.position(finalPos);
-      } else if (ret == -1) {
-        try {
-          storedCharBody.maybeNotifyAndBlock();
-        } catch (BlockingException be) {
-          t = be;
+    static class NIOReaderReadCharBufferAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static int before(
+                @Advice.This final NIOReader thiz,
+                @Advice.Local("storedCharBody") StoredCharBody storedCharBody,
+                @Advice.Argument(0) CharBuffer charBuffer) {
+            storedCharBody = InstrumentationContext.get(NIOReader.class, StoredCharBody.class)
+                    .get(thiz);
+            if (storedCharBody == null) {
+                return 0;
+            }
+            return charBuffer.position();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Local("storedCharBody") StoredCharBody storedCharBody,
+                @Advice.Argument(0) CharBuffer charBuffer,
+                @Advice.Enter int initPos,
+                @Advice.Return int ret,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (storedCharBody == null || t != null) {
+                return;
+            }
+            if (ret > 0) {
+                int finalLimit = charBuffer.limit();
+                int finalPos = charBuffer.position();
+                charBuffer.limit(charBuffer.position());
+                charBuffer.position(initPos);
+
+                storedCharBody.appendData(charBuffer);
+
+                charBuffer.limit(finalLimit);
+                charBuffer.position(finalPos);
+            } else if (ret == -1) {
+                try {
+                    storedCharBody.maybeNotifyAndBlock();
+                } catch (BlockingException be) {
+                    t = be;
+                }
+            }
         }
-      }
     }
-  }
-
-  static class NIOReaderIsFinishedAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.This final NIOReader thiz,
-        @Advice.Return boolean ret,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
-      StoredCharBody storedCharBody =
-          InstrumentationContext.get(NIOReader.class, StoredCharBody.class).get(thiz);
-      if (storedCharBody == null) {
-        return;
-      }
-      if (ret) {
-        try {
-          storedCharBody.maybeNotifyAndBlock();
-        } catch (BlockingException be) {
-          t = be;
+
+    static class NIOReaderIsFinishedAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.This final NIOReader thiz,
+                @Advice.Return boolean ret,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
+            }
+            StoredCharBody storedCharBody = InstrumentationContext.get(NIOReader.class, StoredCharBody.class)
+                    .get(thiz);
+            if (storedCharBody == null) {
+                return;
+            }
+            if (ret) {
+                try {
+                    storedCharBody.maybeNotifyAndBlock();
+                } catch (BlockingException be) {
+                    t = be;
+                }
+            }
         }
-      }
     }
-  }
 
-  static class NIOReaderRecycleAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(@Advice.This final NIOReader thiz) {
-      InstrumentationContext.get(NIOReader.class, StoredCharBody.class).put(thiz, null);
+    static class NIOReaderRecycleAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(@Advice.This final NIOReader thiz) {
+            InstrumentationContext.get(NIOReader.class, StoredCharBody.class).put(thiz, null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyDecorator.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyDecorator.java
index acdb6b26eee..45c3e03d16d 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyDecorator.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyDecorator.java
@@ -25,167 +25,164 @@
 import org.glassfish.grizzly.http.HttpServerFilter;
 
 public class GrizzlyDecorator
-    extends HttpServerDecorator<
-        HttpRequestPacket, HttpRequestPacket, HttpResponsePacket, HttpRequestPacket> {
-
-  public static final CharSequence GRIZZLY_FILTER_CHAIN_SERVER =
-      UTF8BytesString.create("grizzly-filterchain-server");
-
-  public static final CharSequence GRIZZLY_REQUEST = UTF8BytesString.create("grizzly.request");
-
-  public static final GrizzlyDecorator DECORATE = new GrizzlyDecorator();
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpRequestPacket> getter() {
-    return ExtractAdapter.requestGetter();
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpResponsePacket> responseGetter() {
-    return ExtractAdapter.responseGetter();
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return GRIZZLY_REQUEST;
-  }
-
-  @Override
-  protected String method(final HttpRequestPacket httpRequest) {
-    return httpRequest.getMethod().getMethodString();
-  }
-
-  @Override
-  protected URIDataAdapter url(final HttpRequestPacket httpRequest) {
-    return new HTTPRequestPacketURIDataAdapter(httpRequest);
-  }
-
-  @Override
-  protected String peerHostIP(final HttpRequestPacket httpRequest) {
-    return httpRequest.getRemoteAddress();
-  }
-
-  @Override
-  protected int peerPort(final HttpRequestPacket httpRequest) {
-    return httpRequest.getRemotePort();
-  }
-
-  @Override
-  protected int status(final HttpResponsePacket httpResponse) {
-    return httpResponse.getStatus();
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"grizzly-client", "ning"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return GRIZZLY_FILTER_CHAIN_SERVER;
-  }
-
-  public static void onHttpServerFilterPrepareResponseEnter(
-      FilterChainContext ctx, HttpResponsePacket responsePacket) {
-    Context context = (Context) ctx.getAttributes().getAttribute(DD_CONTEXT_ATTRIBUTE);
-    AgentSpan span;
-    if (context != null && (span = AgentSpan.fromContext(context)) != null) {
-      DECORATE.onResponse(span, responsePacket);
-    }
-  }
-
-  public static void onHttpServerFilterPrepareResponseExit(
-      FilterChainContext ctx, HttpResponsePacket responsePacket) {
-    Context context = (Context) ctx.getAttributes().getAttribute(DD_CONTEXT_ATTRIBUTE);
-    AgentSpan span;
-    if (context != null && (span = AgentSpan.fromContext(context)) != null) {
-      DECORATE.beforeFinish(context);
-      span.finish();
-    }
-    ctx.getAttributes().removeAttribute(DD_CONTEXT_ATTRIBUTE);
-    ctx.getAttributes().removeAttribute(DD_RESPONSE_ATTRIBUTE);
-  }
-
-  public static NextAction onHttpCodecFilterExit(
-      FilterChainContext ctx, HttpHeader httpHeader, HttpCodecFilter thiz, NextAction nextAction) {
-    // only create a span if there isn't another one attached to the current ctx
-    // and if the httpHeader has been parsed into a HttpRequestPacket
-    if (ctx.getAttributes().getAttribute(DD_CONTEXT_ATTRIBUTE) != null
-        || !(httpHeader instanceof HttpRequestPacket)) {
-      return nextAction;
-    }
-    HttpRequestPacket httpRequest = (HttpRequestPacket) httpHeader;
-    HttpResponsePacket httpResponse = httpRequest.getResponse();
-    Context parentContext = DECORATE.extract(httpRequest);
-    Context context = DECORATE.startSpan(httpRequest, parentContext);
-    ContextScope scope = context.attach();
-    AgentSpan span = AgentSpan.fromContext(context);
-    DECORATE.afterStart(span);
-    ctx.getAttributes().setAttribute(DD_RESPONSE_ATTRIBUTE, httpResponse);
-    ctx.getAttributes().setAttribute(DD_CONTEXT_ATTRIBUTE, context);
-    DECORATE.onRequest(span, httpRequest, httpRequest, parentContext);
-
-    Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
-    if (rba != null && thiz instanceof HttpServerFilter) {
-      span.getRequestContext().getTraceSegment().effectivelyBlocked();
-      nextAction =
-          GrizzlyHttpBlockingHelper.block(
-              ctx, (HttpServerFilter) thiz, httpRequest, httpResponse, rba, nextAction);
-    }
-    if (ActiveSubsystems.APPSEC_ACTIVE) {
-      RequestContext requestContext = span.getRequestContext();
-      if (requestContext != null) {
-        BlockResponseFunction brf = requestContext.getBlockResponseFunction();
-        if (brf instanceof GrizzlyHttpBlockResponseFunction) {
-          ((GrizzlyHttpBlockResponseFunction) brf).ctx = ctx;
-        }
-      }
+        extends HttpServerDecorator<HttpRequestPacket, HttpRequestPacket, HttpResponsePacket, HttpRequestPacket> {
+
+    public static final CharSequence GRIZZLY_FILTER_CHAIN_SERVER = UTF8BytesString.create("grizzly-filterchain-server");
+
+    public static final CharSequence GRIZZLY_REQUEST = UTF8BytesString.create("grizzly.request");
+
+    public static final GrizzlyDecorator DECORATE = new GrizzlyDecorator();
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpRequestPacket> getter() {
+        return ExtractAdapter.requestGetter();
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpResponsePacket> responseGetter() {
+        return ExtractAdapter.responseGetter();
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return GRIZZLY_REQUEST;
+    }
+
+    @Override
+    protected String method(final HttpRequestPacket httpRequest) {
+        return httpRequest.getMethod().getMethodString();
+    }
+
+    @Override
+    protected URIDataAdapter url(final HttpRequestPacket httpRequest) {
+        return new HTTPRequestPacketURIDataAdapter(httpRequest);
+    }
+
+    @Override
+    protected String peerHostIP(final HttpRequestPacket httpRequest) {
+        return httpRequest.getRemoteAddress();
+    }
+
+    @Override
+    protected int peerPort(final HttpRequestPacket httpRequest) {
+        return httpRequest.getRemotePort();
     }
-    scope.close();
 
-    return nextAction;
-  }
+    @Override
+    protected int status(final HttpResponsePacket httpResponse) {
+        return httpResponse.getStatus();
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"grizzly-client", "ning"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return GRIZZLY_FILTER_CHAIN_SERVER;
+    }
+
+    public static void onHttpServerFilterPrepareResponseEnter(
+            FilterChainContext ctx, HttpResponsePacket responsePacket) {
+        Context context = (Context) ctx.getAttributes().getAttribute(DD_CONTEXT_ATTRIBUTE);
+        AgentSpan span;
+        if (context != null && (span = AgentSpan.fromContext(context)) != null) {
+            DECORATE.onResponse(span, responsePacket);
+        }
+    }
 
-  public static void onFilterChainFail(FilterChainContext ctx, Throwable throwable) {
-    Context context = (Context) ctx.getAttributes().getAttribute(DD_CONTEXT_ATTRIBUTE);
-    AgentSpan span;
-    if (context != null && (span = AgentSpan.fromContext(context)) != null) {
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(context);
-      span.finish();
-    } else if (context != null) {
-      DECORATE.beforeFinish(context);
+    public static void onHttpServerFilterPrepareResponseExit(
+            FilterChainContext ctx, HttpResponsePacket responsePacket) {
+        Context context = (Context) ctx.getAttributes().getAttribute(DD_CONTEXT_ATTRIBUTE);
+        AgentSpan span;
+        if (context != null && (span = AgentSpan.fromContext(context)) != null) {
+            DECORATE.beforeFinish(context);
+            span.finish();
+        }
+        ctx.getAttributes().removeAttribute(DD_CONTEXT_ATTRIBUTE);
+        ctx.getAttributes().removeAttribute(DD_RESPONSE_ATTRIBUTE);
     }
-    ctx.getAttributes().removeAttribute(DD_CONTEXT_ATTRIBUTE);
-    ctx.getAttributes().removeAttribute(DD_RESPONSE_ATTRIBUTE);
-  }
 
-  @Override
-  protected BlockResponseFunction createBlockResponseFunction(
-      HttpRequestPacket httpRequestPacket, HttpRequestPacket httpRequestPacket2) {
-    return new GrizzlyHttpBlockResponseFunction(httpRequestPacket.getHeader("Accept"));
-  }
+    public static NextAction onHttpCodecFilterExit(
+            FilterChainContext ctx, HttpHeader httpHeader, HttpCodecFilter thiz, NextAction nextAction) {
+        // only create a span if there isn't another one attached to the current ctx
+        // and if the httpHeader has been parsed into a HttpRequestPacket
+        if (ctx.getAttributes().getAttribute(DD_CONTEXT_ATTRIBUTE) != null
+                || !(httpHeader instanceof HttpRequestPacket)) {
+            return nextAction;
+        }
+        HttpRequestPacket httpRequest = (HttpRequestPacket) httpHeader;
+        HttpResponsePacket httpResponse = httpRequest.getResponse();
+        Context parentContext = DECORATE.extract(httpRequest);
+        Context context = DECORATE.startSpan(httpRequest, parentContext);
+        ContextScope scope = context.attach();
+        AgentSpan span = AgentSpan.fromContext(context);
+        DECORATE.afterStart(span);
+        ctx.getAttributes().setAttribute(DD_RESPONSE_ATTRIBUTE, httpResponse);
+        ctx.getAttributes().setAttribute(DD_CONTEXT_ATTRIBUTE, context);
+        DECORATE.onRequest(span, httpRequest, httpRequest, parentContext);
+
+        Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
+        if (rba != null && thiz instanceof HttpServerFilter) {
+            span.getRequestContext().getTraceSegment().effectivelyBlocked();
+            nextAction = GrizzlyHttpBlockingHelper.block(
+                    ctx, (HttpServerFilter) thiz, httpRequest, httpResponse, rba, nextAction);
+        }
+        if (ActiveSubsystems.APPSEC_ACTIVE) {
+            RequestContext requestContext = span.getRequestContext();
+            if (requestContext != null) {
+                BlockResponseFunction brf = requestContext.getBlockResponseFunction();
+                if (brf instanceof GrizzlyHttpBlockResponseFunction) {
+                    ((GrizzlyHttpBlockResponseFunction) brf).ctx = ctx;
+                }
+            }
+        }
+        scope.close();
 
-  public static class GrizzlyHttpBlockResponseFunction implements BlockResponseFunction {
-    private final String acceptHeader;
-    public volatile FilterChainContext ctx;
+        return nextAction;
+    }
 
-    public GrizzlyHttpBlockResponseFunction(String acceptHeader) {
-      this.acceptHeader = acceptHeader;
+    public static void onFilterChainFail(FilterChainContext ctx, Throwable throwable) {
+        Context context = (Context) ctx.getAttributes().getAttribute(DD_CONTEXT_ATTRIBUTE);
+        AgentSpan span;
+        if (context != null && (span = AgentSpan.fromContext(context)) != null) {
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(context);
+            span.finish();
+        } else if (context != null) {
+            DECORATE.beforeFinish(context);
+        }
+        ctx.getAttributes().removeAttribute(DD_CONTEXT_ATTRIBUTE);
+        ctx.getAttributes().removeAttribute(DD_RESPONSE_ATTRIBUTE);
     }
 
     @Override
-    public boolean tryCommitBlockingResponse(
-        TraceSegment segment,
-        int statusCode,
-        BlockingContentType templateType,
-        Map<String, String> extraHeaders,
-        String securityResponseId) {
-      if (ctx == null) {
-        return false;
-      }
-      return GrizzlyHttpBlockingHelper.block(
-          ctx, acceptHeader, statusCode, templateType, extraHeaders, segment, securityResponseId);
-    }
-  }
+    protected BlockResponseFunction createBlockResponseFunction(
+            HttpRequestPacket httpRequestPacket, HttpRequestPacket httpRequestPacket2) {
+        return new GrizzlyHttpBlockResponseFunction(httpRequestPacket.getHeader("Accept"));
+    }
+
+    public static class GrizzlyHttpBlockResponseFunction implements BlockResponseFunction {
+        private final String acceptHeader;
+        public volatile FilterChainContext ctx;
+
+        public GrizzlyHttpBlockResponseFunction(String acceptHeader) {
+            this.acceptHeader = acceptHeader;
+        }
+
+        @Override
+        public boolean tryCommitBlockingResponse(
+                TraceSegment segment,
+                int statusCode,
+                BlockingContentType templateType,
+                Map<String, String> extraHeaders,
+                String securityResponseId) {
+            if (ctx == null) {
+                return false;
+            }
+            return GrizzlyHttpBlockingHelper.block(
+                    ctx, acceptHeader, statusCode, templateType, extraHeaders, segment, securityResponseId);
+        }
+    }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyFilterChainModule.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyFilterChainModule.java
index 346edea14ea..857fd074ec8 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyFilterChainModule.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyFilterChainModule.java
@@ -10,21 +10,21 @@
 
 @AutoService(InstrumenterModule.class)
 public class GrizzlyFilterChainModule extends InstrumenterModule.Tracing {
-  public GrizzlyFilterChainModule() {
-    super("grizzly-filterchain");
-  }
+    public GrizzlyFilterChainModule() {
+        super("grizzly-filterchain");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isIntegrationEnabled(Collections.singleton("mule"), false);
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isIntegrationEnabled(Collections.singleton("mule"), false);
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new DefaultFilterChainInstrumentation(),
-        new FilterInstrumentation(),
-        new HttpCodecFilterInstrumentation(),
-        new HttpServerFilterInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(
+                new DefaultFilterChainInstrumentation(),
+                new FilterInstrumentation(),
+                new HttpCodecFilterInstrumentation(),
+                new HttpServerFilterInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyHttpBlockingHelper.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyHttpBlockingHelper.java
index 700ad1a13a1..a34716763fa 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyHttpBlockingHelper.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyHttpBlockingHelper.java
@@ -34,236 +34,233 @@
 import org.slf4j.LoggerFactory;
 
 public class GrizzlyHttpBlockingHelper {
-  private static final Logger log = LoggerFactory.getLogger(GrizzlyHttpBlockingHelper.class);
-
-  /**
-   * @see HttpServerFilter#encodeHttpPacket(FilterChainContext, HttpPacket)
-   */
-  private static final MethodHandle ENCODE_HTTP_PACKET;
-
-  private static final CompletionHandler CLOSE_COMPLETION_HANDLER = new CloseCompletionHandler();
-
-  static {
-    MethodHandle handle = null;
-    Method encodeHttpPacket = null;
-
-    try {
-      encodeHttpPacket =
-          HttpServerFilter.class.getDeclaredMethod(
-              "encodeHttpPacket", FilterChainContext.class, HttpPacket.class);
-      encodeHttpPacket.setAccessible(true);
-    } catch (NoSuchMethodException nsme) {
-      log.error(
-          "Cannot find method HttpServerFilter::encodeHttpPacket. "
-              + "Blocking will not be possible at the grizzly-http level");
-    } catch (RuntimeException e) {
-      log.error(
-          "Exception trying to obtain handle for method HttpServerFilter::encodeHttpPacket. "
-              + "Blocking will not be possible at the grizzly-http level",
-          e);
+    private static final Logger log = LoggerFactory.getLogger(GrizzlyHttpBlockingHelper.class);
+
+    /**
+     * @see HttpServerFilter#encodeHttpPacket(FilterChainContext, HttpPacket)
+     */
+    private static final MethodHandle ENCODE_HTTP_PACKET;
+
+    private static final CompletionHandler CLOSE_COMPLETION_HANDLER = new CloseCompletionHandler();
+
+    static {
+        MethodHandle handle = null;
+        Method encodeHttpPacket = null;
+
+        try {
+            encodeHttpPacket = HttpServerFilter.class.getDeclaredMethod(
+                    "encodeHttpPacket", FilterChainContext.class, HttpPacket.class);
+            encodeHttpPacket.setAccessible(true);
+        } catch (NoSuchMethodException nsme) {
+            log.error("Cannot find method HttpServerFilter::encodeHttpPacket. "
+                    + "Blocking will not be possible at the grizzly-http level");
+        } catch (RuntimeException e) {
+            log.error(
+                    "Exception trying to obtain handle for method HttpServerFilter::encodeHttpPacket. "
+                            + "Blocking will not be possible at the grizzly-http level",
+                    e);
+        }
+
+        if (encodeHttpPacket != null) {
+            try {
+                handle = MethodHandles.lookup().unreflect(encodeHttpPacket);
+            } catch (IllegalAccessException e) {
+                log.error("Exception unreflecting method HttpServerFilter::encodeHttpPacket. "
+                        + "Blocking will not be possible at the grizzly-http level");
+            }
+        }
+
+        ENCODE_HTTP_PACKET = handle;
     }
 
-    if (encodeHttpPacket != null) {
-      try {
-        handle = MethodHandles.lookup().unreflect(encodeHttpPacket);
-      } catch (IllegalAccessException e) {
-        log.error(
-            "Exception unreflecting method HttpServerFilter::encodeHttpPacket. "
-                + "Blocking will not be possible at the grizzly-http level");
-      }
+    private GrizzlyHttpBlockingHelper() {}
+
+    public static NextAction block(
+            FilterChainContext ctx,
+            HttpServerFilter httpServerFilter,
+            HttpRequestPacket httpRequest,
+            HttpResponsePacket httpResponse,
+            Flow.Action.RequestBlockingAction rba,
+            NextAction nextAction) {
+        if (ENCODE_HTTP_PACKET == null) {
+            return nextAction;
+        }
+
+        HttpStatus status =
+                HttpStatus.newHttpStatus(BlockingActionHelper.getHttpCode(rba.getStatusCode()), "Request Blocked");
+        status.setValues(httpResponse);
+
+        for (Map.Entry<String, String> h : rba.getExtraHeaders().entrySet()) {
+            httpResponse.setHeader(h.getKey(), h.getValue());
+        }
+
+        HttpContent httpContent;
+        if (rba.getBlockingContentType() != BlockingContentType.NONE) {
+            String acceptHeader = httpRequest.getHeader("Accept");
+            BlockingActionHelper.TemplateType type =
+                    BlockingActionHelper.determineTemplateType(rba.getBlockingContentType(), acceptHeader);
+
+            httpResponse.setHeader("Content-type", BlockingActionHelper.getContentType(type));
+            byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
+            httpResponse.setContentLength(template.length);
+            httpContent = HttpContent.builder(httpResponse)
+                    .content(HeapBuffer.wrap(template))
+                    .last(true)
+                    .build();
+        } else {
+            httpContent = HttpContent.builder(httpResponse).last(true).build();
+        }
+
+        Buffer buff;
+        try {
+            buff = (Buffer) ENCODE_HTTP_PACKET.invoke(httpServerFilter, ctx, httpContent);
+        } catch (Throwable e) {
+            log.error("Failure serializing http response for blocking", e);
+            // in normal circumstances, recycle is called by encodeHttPacket
+            httpContent.recycle();
+            return nextAction;
+        }
+
+        ctx.write(buff);
+        ctx.flush(CLOSE_COMPLETION_HANDLER);
+
+        nextAction = ctx.getSuspendAction();
+        // destroying the filter chain context should cause any further content to be ignored
+        ctx.completeAndRecycle();
+
+        return nextAction;
     }
 
-    ENCODE_HTTP_PACKET = handle;
-  }
-
-  private GrizzlyHttpBlockingHelper() {}
-
-  public static NextAction block(
-      FilterChainContext ctx,
-      HttpServerFilter httpServerFilter,
-      HttpRequestPacket httpRequest,
-      HttpResponsePacket httpResponse,
-      Flow.Action.RequestBlockingAction rba,
-      NextAction nextAction) {
-    if (ENCODE_HTTP_PACKET == null) {
-      return nextAction;
-    }
-
-    HttpStatus status =
-        HttpStatus.newHttpStatus(
-            BlockingActionHelper.getHttpCode(rba.getStatusCode()), "Request Blocked");
-    status.setValues(httpResponse);
-
-    for (Map.Entry<String, String> h : rba.getExtraHeaders().entrySet()) {
-      httpResponse.setHeader(h.getKey(), h.getValue());
-    }
-
-    HttpContent httpContent;
-    if (rba.getBlockingContentType() != BlockingContentType.NONE) {
-      String acceptHeader = httpRequest.getHeader("Accept");
-      BlockingActionHelper.TemplateType type =
-          BlockingActionHelper.determineTemplateType(rba.getBlockingContentType(), acceptHeader);
-
-      httpResponse.setHeader("Content-type", BlockingActionHelper.getContentType(type));
-      byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
-      httpResponse.setContentLength(template.length);
-      httpContent =
-          HttpContent.builder(httpResponse).content(HeapBuffer.wrap(template)).last(true).build();
-    } else {
-      httpContent = HttpContent.builder(httpResponse).last(true).build();
-    }
-
-    Buffer buff;
-    try {
-      buff = (Buffer) ENCODE_HTTP_PACKET.invoke(httpServerFilter, ctx, httpContent);
-    } catch (Throwable e) {
-      log.error("Failure serializing http response for blocking", e);
-      // in normal circumstances, recycle is called by encodeHttPacket
-      httpContent.recycle();
-      return nextAction;
-    }
-
-    ctx.write(buff);
-    ctx.flush(CLOSE_COMPLETION_HANDLER);
-
-    nextAction = ctx.getSuspendAction();
-    // destroying the filter chain context should cause any further content to be ignored
-    ctx.completeAndRecycle();
-
-    return nextAction;
-  }
-
-  public static boolean block(
-      FilterChainContext ctx,
-      String acceptHeader,
-      int statusCode,
-      BlockingContentType templateType,
-      Map<String, String> extraHeaders,
-      TraceSegment segment,
-      String securityResponseId) {
-    if (ENCODE_HTTP_PACKET == null) {
-      return false;
-    }
-    int filterIdx = ctx.getFilterChain().indexOfType(HttpServerFilter.class);
-    if (filterIdx == -1) {
-      log.warn("Can't block: can't find filter of type HttpServerFilter");
-      return false;
-    }
-    HttpServerFilter httpServerFilter = (HttpServerFilter) ctx.getFilterChain().get(filterIdx);
-
-    HttpStatus status =
-        HttpStatus.newHttpStatus(BlockingActionHelper.getHttpCode(statusCode), "Request Blocked");
-    HttpResponsePacket httpResponse =
-        (HttpResponsePacket) ctx.getAttributes().getAttribute(DD_RESPONSE_ATTRIBUTE);
-    status.setValues(httpResponse);
-
-    for (Map.Entry<String, String> h : extraHeaders.entrySet()) {
-      httpResponse.setHeader(h.getKey(), h.getValue());
-    }
-
-    HttpContent httpContent;
-    if (templateType != BlockingContentType.NONE) {
-      BlockingActionHelper.TemplateType type =
-          BlockingActionHelper.determineTemplateType(templateType, acceptHeader);
-
-      httpResponse.setHeader("Content-type", BlockingActionHelper.getContentType(type));
-      byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
-      httpResponse.setContentLength(template.length);
-      httpContent =
-          HttpContent.builder(httpResponse).content(HeapBuffer.wrap(template)).last(true).build();
-    } else {
-      httpContent = HttpContent.builder(httpResponse).last(true).build();
-    }
-
-    Buffer buff;
-    try {
-      segment.effectivelyBlocked(); // last opportunity before HttpServerFilterAdvice runs
-      buff = (Buffer) ENCODE_HTTP_PACKET.invoke(httpServerFilter, ctx, httpContent);
-    } catch (Throwable e) {
-      log.error("Failure serializing http response for blocking", e);
-      // in normal circumstances, recycle is called by encodeHttPacket
-      httpContent.recycle();
-      return true;
-    }
-
-    ctx.write(buff);
-    ctx.flush(CLOSE_COMPLETION_HANDLER);
-
-    Context ictx = ctx.getInternalContext();
-    // see ProcessorExecutor::execute
-    ictx.setProcessor(JustCompleteProcessor.INSTANCE);
-
-    return true;
-  }
-
-  public static class CloseCompletionHandler extends EmptyCompletionHandler {
-    @Override
-    public void completed(Object result) {
-      final WriteResult<?, ?> wr = (WriteResult<?, ?>) result;
-      try {
-        // close tcp connection
-        wr.getConnection().close().markForRecycle(false);
-      } finally {
-        wr.recycle();
-      }
-    }
-  }
-
-  public static class JustCompleteProcessor implements Processor {
-    public static final Processor INSTANCE = new JustCompleteProcessor();
-
-    @Override
-    public Context obtainContext(Connection connection) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ProcessorResult process(Context context) {
-      return ProcessorResult.createComplete();
-    }
-
-    @Override
-    public void read(Connection connection, CompletionHandler completionHandler) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void write(
-        Connection connection,
-        Object dstAddress,
-        Object message,
-        CompletionHandler completionHandler) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void write(
-        Connection connection,
-        Object dstAddress,
-        Object message,
-        CompletionHandler completionHandler,
-        MessageCloner messageCloner) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void write(
-        Connection connection,
-        Object dstAddress,
-        Object message,
-        CompletionHandler completionHandler,
-        PushBackHandler pushBackHandler) {
-      throw new UnsupportedOperationException();
+    public static boolean block(
+            FilterChainContext ctx,
+            String acceptHeader,
+            int statusCode,
+            BlockingContentType templateType,
+            Map<String, String> extraHeaders,
+            TraceSegment segment,
+            String securityResponseId) {
+        if (ENCODE_HTTP_PACKET == null) {
+            return false;
+        }
+        int filterIdx = ctx.getFilterChain().indexOfType(HttpServerFilter.class);
+        if (filterIdx == -1) {
+            log.warn("Can't block: can't find filter of type HttpServerFilter");
+            return false;
+        }
+        HttpServerFilter httpServerFilter =
+                (HttpServerFilter) ctx.getFilterChain().get(filterIdx);
+
+        HttpStatus status = HttpStatus.newHttpStatus(BlockingActionHelper.getHttpCode(statusCode), "Request Blocked");
+        HttpResponsePacket httpResponse =
+                (HttpResponsePacket) ctx.getAttributes().getAttribute(DD_RESPONSE_ATTRIBUTE);
+        status.setValues(httpResponse);
+
+        for (Map.Entry<String, String> h : extraHeaders.entrySet()) {
+            httpResponse.setHeader(h.getKey(), h.getValue());
+        }
+
+        HttpContent httpContent;
+        if (templateType != BlockingContentType.NONE) {
+            BlockingActionHelper.TemplateType type =
+                    BlockingActionHelper.determineTemplateType(templateType, acceptHeader);
+
+            httpResponse.setHeader("Content-type", BlockingActionHelper.getContentType(type));
+            byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+            httpResponse.setContentLength(template.length);
+            httpContent = HttpContent.builder(httpResponse)
+                    .content(HeapBuffer.wrap(template))
+                    .last(true)
+                    .build();
+        } else {
+            httpContent = HttpContent.builder(httpResponse).last(true).build();
+        }
+
+        Buffer buff;
+        try {
+            segment.effectivelyBlocked(); // last opportunity before HttpServerFilterAdvice runs
+            buff = (Buffer) ENCODE_HTTP_PACKET.invoke(httpServerFilter, ctx, httpContent);
+        } catch (Throwable e) {
+            log.error("Failure serializing http response for blocking", e);
+            // in normal circumstances, recycle is called by encodeHttPacket
+            httpContent.recycle();
+            return true;
+        }
+
+        ctx.write(buff);
+        ctx.flush(CLOSE_COMPLETION_HANDLER);
+
+        Context ictx = ctx.getInternalContext();
+        // see ProcessorExecutor::execute
+        ictx.setProcessor(JustCompleteProcessor.INSTANCE);
+
+        return true;
     }
 
-    @Override
-    public boolean isInterested(IOEvent ioEvent) {
-      return false;
+    public static class CloseCompletionHandler extends EmptyCompletionHandler {
+        @Override
+        public void completed(Object result) {
+            final WriteResult<?, ?> wr = (WriteResult<?, ?>) result;
+            try {
+                // close tcp connection
+                wr.getConnection().close().markForRecycle(false);
+            } finally {
+                wr.recycle();
+            }
+        }
     }
 
-    @Override
-    public void setInterested(IOEvent ioEvent, boolean isInterested) {
-      throw new UnsupportedOperationException();
+    public static class JustCompleteProcessor implements Processor {
+        public static final Processor INSTANCE = new JustCompleteProcessor();
+
+        @Override
+        public Context obtainContext(Connection connection) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public ProcessorResult process(Context context) {
+            return ProcessorResult.createComplete();
+        }
+
+        @Override
+        public void read(Connection connection, CompletionHandler completionHandler) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void write(
+                Connection connection, Object dstAddress, Object message, CompletionHandler completionHandler) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void write(
+                Connection connection,
+                Object dstAddress,
+                Object message,
+                CompletionHandler completionHandler,
+                MessageCloner messageCloner) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void write(
+                Connection connection,
+                Object dstAddress,
+                Object message,
+                CompletionHandler completionHandler,
+                PushBackHandler pushBackHandler) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean isInterested(IOEvent ioEvent) {
+            return false;
+        }
+
+        @Override
+        public void setInterested(IOEvent ioEvent, boolean isInterested) {
+            throw new UnsupportedOperationException();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HTTPRequestPacketURIDataAdapter.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HTTPRequestPacketURIDataAdapter.java
index 2c86d3a709e..14aea1f6c17 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HTTPRequestPacketURIDataAdapter.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HTTPRequestPacketURIDataAdapter.java
@@ -6,39 +6,39 @@
 
 final class HTTPRequestPacketURIDataAdapter extends URIRawDataAdapter {
 
-  private final HttpRequestPacket packet;
-
-  HTTPRequestPacketURIDataAdapter(HttpRequestPacket packet) {
-    this.packet = packet;
-  }
-
-  @Override
-  public String scheme() {
-    return packet.isSecure() ? "https" : "http";
-  }
-
-  @Override
-  public String host() {
-    return packet.serverName().toString(StandardCharsets.UTF_8);
-  }
-
-  @Override
-  public int port() {
-    return packet.getServerPort();
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return packet.getRequestURI();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return packet.getQueryString();
-  }
+    private final HttpRequestPacket packet;
+
+    HTTPRequestPacketURIDataAdapter(HttpRequestPacket packet) {
+        this.packet = packet;
+    }
+
+    @Override
+    public String scheme() {
+        return packet.isSecure() ? "https" : "http";
+    }
+
+    @Override
+    public String host() {
+        return packet.serverName().toString(StandardCharsets.UTF_8);
+    }
+
+    @Override
+    public int port() {
+        return packet.getServerPort();
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return packet.getRequestURI();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return packet.getQueryString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterAdvice.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterAdvice.java
index 392e14f8379..0a7e75ed3b5 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterAdvice.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterAdvice.java
@@ -10,12 +10,12 @@
 
 public class HttpCodecFilterAdvice {
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void onExit(
-      @Advice.Argument(0) final FilterChainContext ctx,
-      @Advice.Argument(1) final HttpHeader httpHeader,
-      @Advice.This HttpCodecFilter thiz,
-      @Advice.Return(readOnly = false) NextAction nextAction) {
-    nextAction = onHttpCodecFilterExit(ctx, httpHeader, thiz, nextAction);
-  }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void onExit(
+            @Advice.Argument(0) final FilterChainContext ctx,
+            @Advice.Argument(1) final HttpHeader httpHeader,
+            @Advice.This HttpCodecFilter thiz,
+            @Advice.Return(readOnly = false) NextAction nextAction) {
+        nextAction = onHttpCodecFilterExit(ctx, httpHeader, thiz, nextAction);
+    }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterInstrumentation.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterInstrumentation.java
index 8d4345997c1..8e5586be96d 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterInstrumentation.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterInstrumentation.java
@@ -6,21 +6,20 @@
 
 import datadog.trace.agent.tooling.Instrumenter;
 
-public final class HttpCodecFilterInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class HttpCodecFilterInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.grizzly.http.HttpCodecFilter";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.grizzly.http.HttpCodecFilter";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("handleRead")
-            .and(takesArgument(0, named("org.glassfish.grizzly.filterchain.FilterChainContext")))
-            .and(takesArgument(1, named("org.glassfish.grizzly.http.HttpHeader")))
-            .and(isPublic()),
-        "datadog.trace.instrumentation.grizzlyhttp232.HttpCodecFilterAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("handleRead")
+                        .and(takesArgument(0, named("org.glassfish.grizzly.filterchain.FilterChainContext")))
+                        .and(takesArgument(1, named("org.glassfish.grizzly.http.HttpHeader")))
+                        .and(isPublic()),
+                "datadog.trace.instrumentation.grizzlyhttp232.HttpCodecFilterAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpHeaderFetchingHelper.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpHeaderFetchingHelper.java
index 7e63f0aa8cf..b9afcd85296 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpHeaderFetchingHelper.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpHeaderFetchingHelper.java
@@ -10,26 +10,26 @@
  * https://github.com/raphw/byte-buddy/issues/1009
  */
 public final class HttpHeaderFetchingHelper {
-  private HttpHeaderFetchingHelper() {}
+    private HttpHeaderFetchingHelper() {}
 
-  private static final Field HTTP_HEADER_FIELD = prepareField();
+    private static final Field HTTP_HEADER_FIELD = prepareField();
 
-  private static Field prepareField() {
-    Field httpHeaderField = null;
-    try {
-      httpHeaderField = InputBuffer.class.getDeclaredField("httpHeader");
-    } catch (NoSuchFieldException e) {
-      throw new UndeclaredThrowableException(e);
+    private static Field prepareField() {
+        Field httpHeaderField = null;
+        try {
+            httpHeaderField = InputBuffer.class.getDeclaredField("httpHeader");
+        } catch (NoSuchFieldException e) {
+            throw new UndeclaredThrowableException(e);
+        }
+        httpHeaderField.setAccessible(true);
+        return httpHeaderField;
     }
-    httpHeaderField.setAccessible(true);
-    return httpHeaderField;
-  }
 
-  public static HttpHeader fetchHttpHeader(InputBuffer inputBuffer) {
-    try {
-      return (HttpHeader) HTTP_HEADER_FIELD.get(inputBuffer);
-    } catch (IllegalAccessException e) {
-      throw new UndeclaredThrowableException(e);
+    public static HttpHeader fetchHttpHeader(InputBuffer inputBuffer) {
+        try {
+            return (HttpHeader) HTTP_HEADER_FIELD.get(inputBuffer);
+        } catch (IllegalAccessException e) {
+            throw new UndeclaredThrowableException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterAdvice.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterAdvice.java
index fdc15cca5ae..49853e8a4c7 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterAdvice.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterAdvice.java
@@ -10,24 +10,23 @@
 
 public class HttpServerFilterAdvice {
 
-  @Advice.OnMethodEnter
-  public static boolean onEnter(
-      @Advice.Argument(0) final FilterChainContext ctx,
-      @Advice.Argument(2) final HttpResponsePacket response) {
-    if (response.getHttpStatus() == HttpStatus.CONINTUE_100) {
-      return true;
+    @Advice.OnMethodEnter
+    public static boolean onEnter(
+            @Advice.Argument(0) final FilterChainContext ctx, @Advice.Argument(2) final HttpResponsePacket response) {
+        if (response.getHttpStatus() == HttpStatus.CONINTUE_100) {
+            return true;
+        }
+        onHttpServerFilterPrepareResponseEnter(ctx, response);
+        return false;
     }
-    onHttpServerFilterPrepareResponseEnter(ctx, response);
-    return false;
-  }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void onExit(
-      @Advice.Enter boolean isContinue,
-      @Advice.Argument(0) final FilterChainContext ctx,
-      @Advice.Argument(2) final HttpResponsePacket response) {
-    if (!isContinue) {
-      onHttpServerFilterPrepareResponseExit(ctx, response);
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void onExit(
+            @Advice.Enter boolean isContinue,
+            @Advice.Argument(0) final FilterChainContext ctx,
+            @Advice.Argument(2) final HttpResponsePacket response) {
+        if (!isContinue) {
+            onHttpServerFilterPrepareResponseExit(ctx, response);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterInstrumentation.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterInstrumentation.java
index 7ea2fce5811..caaaaad4ffb 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterInstrumentation.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterInstrumentation.java
@@ -6,23 +6,22 @@
 
 import datadog.trace.agent.tooling.Instrumenter;
 
-public class HttpServerFilterInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class HttpServerFilterInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.grizzly.http.HttpServerFilter";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.grizzly.http.HttpServerFilter";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("prepareResponse")
-            .and(takesArgument(0, named("org.glassfish.grizzly.filterchain.FilterChainContext")))
-            .and(takesArgument(1, named("org.glassfish.grizzly.http.HttpRequestPacket")))
-            .and(takesArgument(2, named("org.glassfish.grizzly.http.HttpResponsePacket")))
-            .and(takesArgument(3, named("org.glassfish.grizzly.http.HttpContent")))
-            .and(isPrivate()),
-        "datadog.trace.instrumentation.grizzlyhttp232.HttpServerFilterAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("prepareResponse")
+                        .and(takesArgument(0, named("org.glassfish.grizzly.filterchain.FilterChainContext")))
+                        .and(takesArgument(1, named("org.glassfish.grizzly.http.HttpRequestPacket")))
+                        .and(takesArgument(2, named("org.glassfish.grizzly.http.HttpResponsePacket")))
+                        .and(takesArgument(3, named("org.glassfish.grizzly.http.HttpContent")))
+                        .and(isPrivate()),
+                "datadog.trace.instrumentation.grizzlyhttp232.HttpServerFilterAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/ParsedBodyParametersInstrumentation.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/ParsedBodyParametersInstrumentation.java
index aea5c512c3b..9c36dbfd3c9 100644
--- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/ParsedBodyParametersInstrumentation.java
+++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/ParsedBodyParametersInstrumentation.java
@@ -31,98 +31,97 @@
 // org.glassfish.grizzly.http.server.HttpHandler
 @AutoService(InstrumenterModule.class)
 public class ParsedBodyParametersInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ParsedBodyParametersInstrumentation() {
-    super("grizzly");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.grizzly.http.util.Parameters";
-  }
-
-  private static final Reference PARAM_HASH_VALUES_HASH_MAP_REFERENCE =
-      new Reference.Builder("org.glassfish.grizzly.http.util.Parameters")
-          .withField(new String[0], 0, "paramHashValues", "Ljava/util/LinkedHashMap;")
-          .build();
+    public ParsedBodyParametersInstrumentation() {
+        super("grizzly");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {PARAM_HASH_VALUES_HASH_MAP_REFERENCE};
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.grizzly.http.util.Parameters";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        // also matches the variant taking an extra encoding parameter
-        named("processParameters")
-            .and(takesArgument(0, named("org.glassfish.grizzly.Buffer")))
-            .and(takesArgument(1, int.class))
-            .and(takesArgument(2, int.class))
-            .and(takesArgument(3, Charset.class)),
-        getClass().getName() + "$ProcessParametersAdvice");
-  }
+    private static final Reference PARAM_HASH_VALUES_HASH_MAP_REFERENCE = new Reference.Builder(
+                    "org.glassfish.grizzly.http.util.Parameters")
+            .withField(new String[0], 0, "paramHashValues", "Ljava/util/LinkedHashMap;")
+            .build();
 
-  @SuppressWarnings("Duplicates")
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class ProcessParametersAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static int before(
-        @Advice.FieldValue(value = "paramHashValues")
-            final Map<String, ArrayList<String>> paramValuesField,
-        @Advice.Local("origParamHashValues") Map<String, ArrayList<String>> origParamValues) {
-      int depth = CallDepthThreadLocalMap.incrementCallDepth(Parameters.class);
-      if (depth == 0 && !paramValuesField.isEmpty()) {
-        // field is final
-        origParamValues = new HashMap<>(paramValuesField);
-        paramValuesField.clear();
-      }
-      return depth;
-      // if there is no request context, skips the body, returns 0 and will skip after()
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {PARAM_HASH_VALUES_HASH_MAP_REFERENCE};
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Local("origParamHashValues") Map<String, ArrayList<String>> origParamValues,
-        @Advice.FieldValue("paramHashValues") final Map<String, ArrayList<String>> paramValuesField,
-        @Advice.Enter final int depth,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (depth > 0) {
-        return;
-      }
-      CallDepthThreadLocalMap.reset(Parameters.class);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                // also matches the variant taking an extra encoding parameter
+                named("processParameters")
+                        .and(takesArgument(0, named("org.glassfish.grizzly.Buffer")))
+                        .and(takesArgument(1, int.class))
+                        .and(takesArgument(2, int.class))
+                        .and(takesArgument(3, Charset.class)),
+                getClass().getName() + "$ProcessParametersAdvice");
+    }
 
-      try {
-        if (paramValuesField.isEmpty()) {
-          return;
+    @SuppressWarnings("Duplicates")
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class ProcessParametersAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static int before(
+                @Advice.FieldValue(value = "paramHashValues") final Map<String, ArrayList<String>> paramValuesField,
+                @Advice.Local("origParamHashValues") Map<String, ArrayList<String>> origParamValues) {
+            int depth = CallDepthThreadLocalMap.incrementCallDepth(Parameters.class);
+            if (depth == 0 && !paramValuesField.isEmpty()) {
+                // field is final
+                origParamValues = new HashMap<>(paramValuesField);
+                paramValuesField.clear();
+            }
+            return depth;
+            // if there is no request context, skips the body, returns 0 and will skip after()
         }
 
-        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-        BiFunction<RequestContext, Object, Flow<Void>> callback =
-            cbp.getCallback(EVENTS.requestBodyProcessed());
-        if (callback == null) {
-          return;
-        }
-        Flow<Void> flow = callback.apply(reqCtx, paramValuesField);
-        Flow.Action action = flow.getAction();
-        if (action instanceof Flow.Action.RequestBlockingAction) {
-          Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-          BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-          if (blockResponseFunction != null) {
-            blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-            if (t == null) {
-              t = new BlockingException("Blocked request (for Parameters/processParameters)");
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Local("origParamHashValues") Map<String, ArrayList<String>> origParamValues,
+                @Advice.FieldValue("paramHashValues") final Map<String, ArrayList<String>> paramValuesField,
+                @Advice.Enter final int depth,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (depth > 0) {
+                return;
+            }
+            CallDepthThreadLocalMap.reset(Parameters.class);
+
+            try {
+                if (paramValuesField.isEmpty()) {
+                    return;
+                }
+
+                CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+                BiFunction<RequestContext, Object, Flow<Void>> callback =
+                        cbp.getCallback(EVENTS.requestBodyProcessed());
+                if (callback == null) {
+                    return;
+                }
+                Flow<Void> flow = callback.apply(reqCtx, paramValuesField);
+                Flow.Action action = flow.getAction();
+                if (action instanceof Flow.Action.RequestBlockingAction) {
+                    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                    BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                    if (blockResponseFunction != null) {
+                        blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                        if (t == null) {
+                            t = new BlockingException("Blocked request (for Parameters/processParameters)");
+                        }
+                        reqCtx.getTraceSegment().effectivelyBlocked();
+                    }
+                }
+            } finally {
+                if (origParamValues != null) {
+                    paramValuesField.putAll(origParamValues);
+                }
             }
-            reqCtx.getTraceSegment().effectivelyBlocked();
-          }
-        }
-      } finally {
-        if (origParamValues != null) {
-          paramValuesField.putAll(origParamValues);
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/QueuedCommandInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/QueuedCommandInstrumentation.java
index d44454e6c1d..ea3d7e21557 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/QueuedCommandInstrumentation.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/QueuedCommandInstrumentation.java
@@ -25,68 +25,63 @@
 
 @AutoService(InstrumenterModule.class)
 public final class QueuedCommandInstrumentation extends InstrumenterModule.Profiling
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  private static final String QUEUED_COMMAND = "io.grpc.netty.WriteQueue$QueuedCommand";
-  private static final String STATE =
-      "datadog.trace.bootstrap.instrumentation.java.concurrent.State";
+    private static final String QUEUED_COMMAND = "io.grpc.netty.WriteQueue$QueuedCommand";
+    private static final String STATE = "datadog.trace.bootstrap.instrumentation.java.concurrent.State";
 
-  public QueuedCommandInstrumentation() {
-    super("grpc", "grpc-netty");
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
-    transformer.applyAdvice(
-        isMethod()
-            .and(
-                named("run")
-                    .and(
-                        takesArguments(1)
-                            .and(takesArgument(0, named("io.netty.channel.Channel"))))),
-        getClass().getName() + "$Run");
-  }
+    public QueuedCommandInstrumentation() {
+        super("grpc", "grpc-netty");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(QUEUED_COMMAND, STATE);
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("run")
+                                .and(takesArguments(1).and(takesArgument(0, named("io.netty.channel.Channel"))))),
+                getClass().getName() + "$Run");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.grpc.netty.WriteQueue$AbstractQueuedCommand",
-      "io.grpc.netty.WriteQueue$RunnableCommand",
-      "io.grpc.netty.SendGrpcFrameCommand"
-    };
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(QUEUED_COMMAND, STATE);
+    }
 
-  public static final class Construct {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void after(@Advice.This Object command) {
-      ContextStore<Object, State> contextStore = InstrumentationContext.get(QUEUED_COMMAND, STATE);
-      capture(contextStore, command);
-      // FIXME hard to handle both the lifecyle and get access to the queue instance in the same
-      // frame within the WriteQueue class.
-      //  This means we can't get the queue length. A (bad) alternative would be to instrument
-      // ConcurrentLinkedQueue broadly,
-      //  or we could write more brittle instrumentation targeting code patterns in different gRPC
-      // versions.
-      QueueTimerHelper.startQueuingTimer(
-          contextStore, Channel.class, ConcurrentLinkedQueue.class, 0, command);
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.grpc.netty.WriteQueue$AbstractQueuedCommand",
+            "io.grpc.netty.WriteQueue$RunnableCommand",
+            "io.grpc.netty.SendGrpcFrameCommand"
+        };
     }
-  }
 
-  public static final class Run {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(@Advice.This Object command) {
-      return startTaskScope(InstrumentationContext.get(QUEUED_COMMAND, STATE), command);
+    public static final class Construct {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void after(@Advice.This Object command) {
+            ContextStore<Object, State> contextStore = InstrumentationContext.get(QUEUED_COMMAND, STATE);
+            capture(contextStore, command);
+            // FIXME hard to handle both the lifecyle and get access to the queue instance in the same
+            // frame within the WriteQueue class.
+            //  This means we can't get the queue length. A (bad) alternative would be to instrument
+            // ConcurrentLinkedQueue broadly,
+            //  or we could write more brittle instrumentation targeting code patterns in different gRPC
+            // versions.
+            QueueTimerHelper.startQueuingTimer(contextStore, Channel.class, ConcurrentLinkedQueue.class, 0, command);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      endTaskScope(scope);
+    public static final class Run {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(@Advice.This Object command) {
+            return startTaskScope(InstrumentationContext.get(QUEUED_COMMAND, STATE), command);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/AbstractClientStreamInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/AbstractClientStreamInstrumentation.java
index 93628297d55..cea9b995069 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/AbstractClientStreamInstrumentation.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/AbstractClientStreamInstrumentation.java
@@ -14,41 +14,39 @@
 import net.bytebuddy.asm.Advice;
 
 public final class AbstractClientStreamInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "io.grpc.internal.AbstractClientStream";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("start")
-            .and(
-                isMethod()
-                    .and(
-                        takesArgument(0, named("io.grpc.internal.ClientStreamListener"))
-                            .and(takesArguments(1)))),
-        getClass().getName() + "$ActivateSpan");
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.grpc.internal.AbstractClientStream";
+    }
 
-  public static final class ActivateSpan {
-    @Advice.OnMethodEnter
-    public static ContextScope before(@Advice.Argument(0) ClientStreamListener listener) {
-      AgentSpan span =
-          InstrumentationContext.get(ClientStreamListener.class, AgentSpan.class).get(listener);
-      if (null != span) {
-        return activateSpan(span);
-      }
-      return null;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("start")
+                        .and(isMethod()
+                                .and(takesArgument(0, named("io.grpc.internal.ClientStreamListener"))
+                                        .and(takesArguments(1)))),
+                getClass().getName() + "$ActivateSpan");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      if (null != scope) {
-        scope.close();
-      }
+    public static final class ActivateSpan {
+        @Advice.OnMethodEnter
+        public static ContextScope before(@Advice.Argument(0) ClientStreamListener listener) {
+            AgentSpan span = InstrumentationContext.get(ClientStreamListener.class, AgentSpan.class)
+                    .get(listener);
+            if (null != span) {
+                return activateSpan(span);
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            if (null != scope) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java
index b9fd2143262..f88989a216c 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java
@@ -25,159 +25,156 @@
 import java.net.SocketAddress;
 import net.bytebuddy.asm.Advice;
 
-public final class ClientCallImplInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class ClientCallImplInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "io.grpc.internal.ClientCallImpl";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Capture");
-    transformer.applyAdvices(
-        named("start").and(isMethod()),
-        getClass().getName() + "$Start",
-        getClass().getName() + "$StartContextPropagationAdvice");
-    transformer.applyAdvice(named("cancel").and(isMethod()), getClass().getName() + "$Cancel");
-    transformer.applyAdvice(
-        named("request")
-            .and(isMethod())
-            .and(takesArguments(int.class))
-            .or(isMethod().and(named("halfClose").and(takesArguments(0)))),
-        getClass().getName() + "$ActivateSpan");
-    transformer.applyAdvice(
-        named("sendMessage").and(isMethod()), getClass().getName() + "$SendMessage");
-    transformer.applyAdvice(
-        named("closeObserver").and(takesArguments(3)), getClass().getName() + "$CloseObserver");
-  }
-
-  public static final class Capture {
-    @Advice.OnMethodExit
-    public static void capture(
-        @Advice.This io.grpc.ClientCall<?, ?> call,
-        @Advice.Argument(0) MethodDescriptor<?, ?> method) {
-      AgentSpan span = DECORATE.startCall(method);
-      if (null != span) {
-        InstrumentationContext.get(ClientCall.class, AgentSpan.class).put(call, span);
-      }
+    @Override
+    public String instrumentedType() {
+        return "io.grpc.internal.ClientCallImpl";
     }
-  }
 
-  public static final class Start {
-    @Advice.OnMethodEnter
-    public static ContextScope before(
-        @Advice.This ClientCall<?, ?> call,
-        @Advice.Argument(1) Metadata headers,
-        @Advice.Local("$$ddSpan") AgentSpan span) {
-      span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(call);
-      if (null != span) {
-        return activateSpan(span);
-      }
-      return null;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Capture");
+        transformer.applyAdvices(
+                named("start").and(isMethod()),
+                getClass().getName() + "$Start",
+                getClass().getName() + "$StartContextPropagationAdvice");
+        transformer.applyAdvice(named("cancel").and(isMethod()), getClass().getName() + "$Cancel");
+        transformer.applyAdvice(
+                named("request")
+                        .and(isMethod())
+                        .and(takesArguments(int.class))
+                        .or(isMethod().and(named("halfClose").and(takesArguments(0)))),
+                getClass().getName() + "$ActivateSpan");
+        transformer.applyAdvice(named("sendMessage").and(isMethod()), getClass().getName() + "$SendMessage");
+        transformer.applyAdvice(
+                named("closeObserver").and(takesArguments(3)), getClass().getName() + "$CloseObserver");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(
-        @Advice.Enter ContextScope scope,
-        @Advice.Thrown Throwable error,
-        @Advice.Local("$$ddSpan") AgentSpan span)
-        throws Throwable {
-      if (null != scope) {
-        scope.close();
-      }
-      if (null != error && null != span) {
-        DECORATE.onError(span, error);
-        DECORATE.beforeFinish(span);
-        span.finish();
-        throw error;
-      }
+    public static final class Capture {
+        @Advice.OnMethodExit
+        public static void capture(
+                @Advice.This io.grpc.ClientCall<?, ?> call, @Advice.Argument(0) MethodDescriptor<?, ?> method) {
+            AgentSpan span = DECORATE.startCall(method);
+            if (null != span) {
+                InstrumentationContext.get(ClientCall.class, AgentSpan.class).put(call, span);
+            }
+        }
     }
-  }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static final class StartContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void before(@Advice.Argument(1) Metadata headers) {
-      AgentSpan span = activeSpan();
-      if (span == null) {
-        return;
-      }
-      DECORATE.injectContext(span, headers, SETTER);
-    }
-  }
+    public static final class Start {
+        @Advice.OnMethodEnter
+        public static ContextScope before(
+                @Advice.This ClientCall<?, ?> call,
+                @Advice.Argument(1) Metadata headers,
+                @Advice.Local("$$ddSpan") AgentSpan span) {
+            span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(call);
+            if (null != span) {
+                return activateSpan(span);
+            }
+            return null;
+        }
 
-  public static final class ActivateSpan {
-    @Advice.OnMethodEnter
-    public static ContextScope before(@Advice.This ClientCall<?, ?> call) {
-      AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(call);
-      if (null != span) {
-        return activateSpan(span);
-      }
-      return null;
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(
+                @Advice.Enter ContextScope scope,
+                @Advice.Thrown Throwable error,
+                @Advice.Local("$$ddSpan") AgentSpan span)
+                throws Throwable {
+            if (null != scope) {
+                scope.close();
+            }
+            if (null != error && null != span) {
+                DECORATE.onError(span, error);
+                DECORATE.beforeFinish(span);
+                span.finish();
+                throw error;
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      if (null != scope) {
-        scope.close();
-      }
+    @AppliesOn(CONTEXT_TRACKING)
+    public static final class StartContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void before(@Advice.Argument(1) Metadata headers) {
+            AgentSpan span = activeSpan();
+            if (span == null) {
+                return;
+            }
+            DECORATE.injectContext(span, headers, SETTER);
+        }
     }
-  }
 
-  public static final class SendMessage {
-    @Advice.OnMethodEnter
-    public static ContextScope before(@Advice.This ClientCall<?, ?> call) {
-      // could create a message span here for the request
-      AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(call);
-      if (span != null) {
-        return activateSpan(span);
-      }
-      return null;
-    }
+    public static final class ActivateSpan {
+        @Advice.OnMethodEnter
+        public static ContextScope before(@Advice.This ClientCall<?, ?> call) {
+            AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class)
+                    .get(call);
+            if (null != span) {
+                return activateSpan(span);
+            }
+            return null;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      if (null != scope) {
-        scope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            if (null != scope) {
+                scope.close();
+            }
+        }
     }
-  }
 
-  public static final class Cancel {
-    @Advice.OnMethodEnter
-    public static void before(
-        @Advice.This ClientCall<?, ?> call, @Advice.Argument(1) Throwable cause) {
-      AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).remove(call);
-      if (null != span) {
-        final SocketAddress socketAddress =
-            call.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR);
-        if (socketAddress instanceof InetSocketAddress) {
-          DECORATE.onPeerConnection(span, (InetSocketAddress) socketAddress);
+    public static final class SendMessage {
+        @Advice.OnMethodEnter
+        public static ContextScope before(@Advice.This ClientCall<?, ?> call) {
+            // could create a message span here for the request
+            AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class)
+                    .get(call);
+            if (span != null) {
+                return activateSpan(span);
+            }
+            return null;
         }
-        if (cause instanceof StatusException) {
-          DECORATE.onClose(span, ((StatusException) cause).getStatus());
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            if (null != scope) {
+                scope.close();
+            }
+        }
+    }
+
+    public static final class Cancel {
+        @Advice.OnMethodEnter
+        public static void before(@Advice.This ClientCall<?, ?> call, @Advice.Argument(1) Throwable cause) {
+            AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class)
+                    .remove(call);
+            if (null != span) {
+                final SocketAddress socketAddress = call.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR);
+                if (socketAddress instanceof InetSocketAddress) {
+                    DECORATE.onPeerConnection(span, (InetSocketAddress) socketAddress);
+                }
+                if (cause instanceof StatusException) {
+                    DECORATE.onClose(span, ((StatusException) cause).getStatus());
+                }
+                span.finish();
+            }
         }
-        span.finish();
-      }
     }
-  }
 
-  public static final class CloseObserver {
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void closeObserver(
-        @Advice.This ClientCall<?, ?> call, @Advice.Argument(1) Status status) {
-      AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).remove(call);
-      if (null != span) {
-        final SocketAddress socketAddress =
-            call.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR);
-        if (socketAddress instanceof InetSocketAddress) {
-          DECORATE.onPeerConnection(span, (InetSocketAddress) socketAddress);
+    public static final class CloseObserver {
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void closeObserver(@Advice.This ClientCall<?, ?> call, @Advice.Argument(1) Status status) {
+            AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class)
+                    .remove(call);
+            if (null != span) {
+                final SocketAddress socketAddress = call.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR);
+                if (socketAddress instanceof InetSocketAddress) {
+                    DECORATE.onPeerConnection(span, (InetSocketAddress) socketAddress);
+                }
+                DECORATE.onClose(span, status);
+                span.finish();
+            }
         }
-        DECORATE.onClose(span, status);
-        span.finish();
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientStreamListenerImplInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientStreamListenerImplInstrumentation.java
index 0c0f04cc812..82e98d85d34 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientStreamListenerImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientStreamListenerImplInstrumentation.java
@@ -18,100 +18,101 @@
 import net.bytebuddy.asm.Advice;
 
 public class ClientStreamListenerImplInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "io.grpc.internal.ClientCallImpl$ClientStreamListenerImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.grpc.internal.ClientCallImpl$ClientStreamListenerImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
-    transformer.applyAdvice(
-        named("exceptionThrown")
-            .and(takesArgument(0, named("io.grpc.Status")))
-            .and(takesArguments(1)),
-        getClass().getName() + "$ExceptionThrown");
-    transformer.applyAdvice(
-        namedOneOf("messageRead", "messagesAvailable"), getClass().getName() + "$RecordActivity");
-    transformer.applyAdvice(named("headersRead"), getClass().getName() + "$RecordHeaders");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
+        transformer.applyAdvice(
+                named("exceptionThrown")
+                        .and(takesArgument(0, named("io.grpc.Status")))
+                        .and(takesArguments(1)),
+                getClass().getName() + "$ExceptionThrown");
+        transformer.applyAdvice(
+                namedOneOf("messageRead", "messagesAvailable"), getClass().getName() + "$RecordActivity");
+        transformer.applyAdvice(named("headersRead"), getClass().getName() + "$RecordHeaders");
+    }
 
-  public static final class Construct {
-    @Advice.OnMethodExit
-    public static void capture(@Advice.This ClientStreamListener listener) {
-      // instrumentation of ClientCallImpl::start ensures this scope is present and valid
-      AgentSpan span = activeSpan();
-      if (null != span) {
-        InstrumentationContext.get(ClientStreamListener.class, AgentSpan.class).put(listener, span);
-      }
+    public static final class Construct {
+        @Advice.OnMethodExit
+        public static void capture(@Advice.This ClientStreamListener listener) {
+            // instrumentation of ClientCallImpl::start ensures this scope is present and valid
+            AgentSpan span = activeSpan();
+            if (null != span) {
+                InstrumentationContext.get(ClientStreamListener.class, AgentSpan.class)
+                        .put(listener, span);
+            }
+        }
     }
-  }
 
-  public static final class ExceptionThrown {
-    @Advice.OnMethodEnter
-    public static void exceptionThrown(
-        @Advice.This ClientStreamListener listener, @Advice.Argument(0) Status status) {
-      if (null != status) {
-        AgentSpan span =
-            InstrumentationContext.get(ClientStreamListener.class, AgentSpan.class).get(listener);
-        if (null != span) {
-          DECORATE.onError(span, status.getCause());
-          DECORATE.beforeFinish(span);
-          span.finish();
+    public static final class ExceptionThrown {
+        @Advice.OnMethodEnter
+        public static void exceptionThrown(
+                @Advice.This ClientStreamListener listener, @Advice.Argument(0) Status status) {
+            if (null != status) {
+                AgentSpan span = InstrumentationContext.get(ClientStreamListener.class, AgentSpan.class)
+                        .get(listener);
+                if (null != span) {
+                    DECORATE.onError(span, status.getCause());
+                    DECORATE.beforeFinish(span);
+                    span.finish();
+                }
+            }
         }
-      }
     }
-  }
 
-  public static final class RecordActivity {
+    public static final class RecordActivity {
 
-    @Advice.OnMethodEnter
-    public static ContextScope before(@Advice.This ClientStreamListener listener) {
-      // activate the span so serialisation work is accounted for, whichever thread the work is done
-      // on
-      AgentSpan span =
-          InstrumentationContext.get(ClientStreamListener.class, AgentSpan.class).get(listener);
-      if (span != null) {
-        return activateSpan(span);
-      }
-      return null;
-    }
+        @Advice.OnMethodEnter
+        public static ContextScope before(@Advice.This ClientStreamListener listener) {
+            // activate the span so serialisation work is accounted for, whichever thread the work is done
+            // on
+            AgentSpan span = InstrumentationContext.get(ClientStreamListener.class, AgentSpan.class)
+                    .get(listener);
+            if (span != null) {
+                return activateSpan(span);
+            }
+            return null;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      if (null != scope) {
-        scope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            if (null != scope) {
+                scope.close();
+            }
+        }
     }
-  }
 
-  /*
-  A call to 'headersAvailable' is optional - meaning that it may not appear at all but if it appears
-  it will be followed by a call to `messageRead`. In order to properly cooperate with the `messageRead` instrumentation
-  we must make sure that when this method is finished the associated span is 'migrated' - such that `messageRead`
-  instrumentation can correctly 'resume' the span.
-   */
-  public static final class RecordHeaders {
+    /*
+    A call to 'headersAvailable' is optional - meaning that it may not appear at all but if it appears
+    it will be followed by a call to `messageRead`. In order to properly cooperate with the `messageRead` instrumentation
+    we must make sure that when this method is finished the associated span is 'migrated' - such that `messageRead`
+    instrumentation can correctly 'resume' the span.
+     */
+    public static final class RecordHeaders {
 
-    @Advice.OnMethodEnter
-    public static ContextScope before(@Advice.This ClientStreamListener listener) {
-      // activate the span so serialisation work is accounted for, whichever thread the work is done
-      // on
-      AgentSpan span =
-          InstrumentationContext.get(ClientStreamListener.class, AgentSpan.class).get(listener);
-      if (span != null) {
-        return activateSpan(span);
-      }
-      return null;
-    }
+        @Advice.OnMethodEnter
+        public static ContextScope before(@Advice.This ClientStreamListener listener) {
+            // activate the span so serialisation work is accounted for, whichever thread the work is done
+            // on
+            AgentSpan span = InstrumentationContext.get(ClientStreamListener.class, AgentSpan.class)
+                    .get(listener);
+            if (span != null) {
+                return activateSpan(span);
+            }
+            return null;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      if (null != scope) {
-        scope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            if (null != scope) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java
index bcf6a5461b5..c797117022a 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java
@@ -29,103 +29,99 @@
 import java.util.function.Function;
 
 public class GrpcClientDecorator extends ClientDecorator {
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().client().operationForProtocol("grpc"));
-  public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("grpc-client");
-  public static final CharSequence GRPC_MESSAGE = UTF8BytesString.create("grpc.message");
-
-  private static DataStreamsContext createDsmContext() {
-    return fromTags(create("grpc", OUTBOUND));
-  }
-
-  public static final GrpcClientDecorator DECORATE = new GrpcClientDecorator();
-
-  private static final Set<String> IGNORED_METHODS = Config.get().getGrpcIgnoredOutboundMethods();
-  private static final BitSet CLIENT_ERROR_STATUSES = Config.get().getGrpcClientErrorStatuses();
-
-  private static final ClassValue<UTF8BytesString> MESSAGE_TYPES =
-      GenericClassValue.of(
-          // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
-          new Function<Class<?>, UTF8BytesString>() {
-            @Override
-            public UTF8BytesString apply(Class<?> input) {
-              return UTF8BytesString.create(input.getName());
-            }
-          });
-
-  private static final DDCache<String, String> RPC_SERVICE_CACHE = DDCaches.newFixedSizeCache(64);
-
-  public UTF8BytesString requestMessageType(MethodDescriptor<?, ?> method) {
-    return messageType(method.getRequestMarshaller());
-  }
-
-  public UTF8BytesString responseMessageType(MethodDescriptor<?, ?> method) {
-    return messageType(method.getResponseMarshaller());
-  }
-
-  private UTF8BytesString messageType(MethodDescriptor.Marshaller<?> marshaller) {
-    return marshaller instanceof MethodDescriptor.ReflectableMarshaller
-        ? MESSAGE_TYPES.get(
-            ((MethodDescriptor.ReflectableMarshaller<?>) marshaller).getMessageClass())
-        : null;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"grpc", "grpc-client"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.RPC;
-  }
-
-  @Override
-  protected String service() {
-    return null;
-  }
-
-  public <ReqT, RespT> AgentSpan startCall(MethodDescriptor<ReqT, RespT> method) {
-    if (IGNORED_METHODS.contains(method.getFullMethodName())) {
-      // if the method is ignored we want to preserve the old behaviour and not make injection
-      // happen
-      return AgentTracer.blackholeSpan();
+    public static final CharSequence OPERATION_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().client().operationForProtocol("grpc"));
+    public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("grpc-client");
+    public static final CharSequence GRPC_MESSAGE = UTF8BytesString.create("grpc.message");
+
+    private static DataStreamsContext createDsmContext() {
+        return fromTags(create("grpc", OUTBOUND));
+    }
+
+    public static final GrpcClientDecorator DECORATE = new GrpcClientDecorator();
+
+    private static final Set<String> IGNORED_METHODS = Config.get().getGrpcIgnoredOutboundMethods();
+    private static final BitSet CLIENT_ERROR_STATUSES = Config.get().getGrpcClientErrorStatuses();
+
+    private static final ClassValue<UTF8BytesString> MESSAGE_TYPES = GenericClassValue.of(
+            // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
+            new Function<Class<?>, UTF8BytesString>() {
+                @Override
+                public UTF8BytesString apply(Class<?> input) {
+                    return UTF8BytesString.create(input.getName());
+                }
+            });
+
+    private static final DDCache<String, String> RPC_SERVICE_CACHE = DDCaches.newFixedSizeCache(64);
+
+    public UTF8BytesString requestMessageType(MethodDescriptor<?, ?> method) {
+        return messageType(method.getRequestMarshaller());
+    }
+
+    public UTF8BytesString responseMessageType(MethodDescriptor<?, ?> method) {
+        return messageType(method.getResponseMarshaller());
+    }
+
+    private UTF8BytesString messageType(MethodDescriptor.Marshaller<?> marshaller) {
+        return marshaller instanceof MethodDescriptor.ReflectableMarshaller
+                ? MESSAGE_TYPES.get(((MethodDescriptor.ReflectableMarshaller<?>) marshaller).getMessageClass())
+                : null;
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"grpc", "grpc-client"};
     }
-    AgentSpan span =
-        startSpan(COMPONENT_NAME.toString(), OPERATION_NAME)
-            .setTag("request.type", requestMessageType(method))
-            .setTag("response.type", responseMessageType(method))
-            // method.getServiceName() may not be available on some grpc versions
-            .setTag(
-                Tags.RPC_SERVICE,
-                RPC_SERVICE_CACHE.computeIfAbsent(
-                    method.getFullMethodName(), MethodDescriptor::extractFullServiceName));
-    span.setResourceName(method.getFullMethodName());
-    afterStart(span);
-    return span;
-  }
-
-  public <C> void injectContext(Context context, final C request, CarrierSetter<C> setter) {
-    if (traceConfig().isDataStreamsEnabled()) {
-      context = context.with(createDsmContext());
+
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.RPC;
+    }
+
+    @Override
+    protected String service() {
+        return null;
+    }
+
+    public <ReqT, RespT> AgentSpan startCall(MethodDescriptor<ReqT, RespT> method) {
+        if (IGNORED_METHODS.contains(method.getFullMethodName())) {
+            // if the method is ignored we want to preserve the old behaviour and not make injection
+            // happen
+            return AgentTracer.blackholeSpan();
+        }
+        AgentSpan span = startSpan(COMPONENT_NAME.toString(), OPERATION_NAME)
+                .setTag("request.type", requestMessageType(method))
+                .setTag("response.type", responseMessageType(method))
+                // method.getServiceName() may not be available on some grpc versions
+                .setTag(
+                        Tags.RPC_SERVICE,
+                        RPC_SERVICE_CACHE.computeIfAbsent(
+                                method.getFullMethodName(), MethodDescriptor::extractFullServiceName));
+        span.setResourceName(method.getFullMethodName());
+        afterStart(span);
+        return span;
+    }
+
+    public <C> void injectContext(Context context, final C request, CarrierSetter<C> setter) {
+        if (traceConfig().isDataStreamsEnabled()) {
+            context = context.with(createDsmContext());
+        }
+        defaultPropagator().inject(context, request, setter);
+    }
+
+    public void onClose(final AgentSpan span, final Status status) {
+        span.setTag("status.code", status.getCode().name());
+        span.setTag("grpc.status.code", status.getCode().name());
+        span.setTag(InstrumentationTags.GRPC_STATUS_CODE, status.getCode().value());
+        span.setTag("status.description", status.getDescription());
+
+        // TODO why is there a mismatch between client / server for calling the onError method?
+        onError(span, status.getCause());
+        span.setError(CLIENT_ERROR_STATUSES.get(status.getCode().value()));
     }
-    defaultPropagator().inject(context, request, setter);
-  }
-
-  public void onClose(final AgentSpan span, final Status status) {
-    span.setTag("status.code", status.getCode().name());
-    span.setTag("grpc.status.code", status.getCode().name());
-    span.setTag(InstrumentationTags.GRPC_STATUS_CODE, status.getCode().value());
-    span.setTag("status.description", status.getDescription());
-
-    // TODO why is there a mismatch between client / server for calling the onError method?
-    onError(span, status.getCause());
-    span.setError(CLIENT_ERROR_STATUSES.get(status.getCode().value()));
-  }
 }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientModule.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientModule.java
index 05c90685a9c..8b58d29f636 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientModule.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientModule.java
@@ -14,25 +14,25 @@
 @AutoService(InstrumenterModule.class)
 public class GrpcClientModule extends InstrumenterModule.Tracing {
 
-  public GrpcClientModule() {
-    super("grpc", "grpc-client", "grpc-message");
-  }
+    public GrpcClientModule() {
+        super("grpc", "grpc-client", "grpc-message");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>();
-    contextStores.put("io.grpc.ClientCall", AgentSpan.class.getName());
-    contextStores.put("io.grpc.internal.ClientStreamListener", AgentSpan.class.getName());
-    contextStores.put(Runnable.class.getName(), State.class.getName());
-    return contextStores;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>();
+        contextStores.put("io.grpc.ClientCall", AgentSpan.class.getName());
+        contextStores.put("io.grpc.internal.ClientStreamListener", AgentSpan.class.getName());
+        contextStores.put(Runnable.class.getName(), State.class.getName());
+        return contextStores;
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(
-        new ClientCallImplInstrumentation(),
-        new AbstractClientStreamInstrumentation(),
-        new ClientStreamListenerImplInstrumentation(),
-        new MessagesAvailableInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(
+                new ClientCallImplInstrumentation(),
+                new AbstractClientStreamInstrumentation(),
+                new ClientStreamListenerImplInstrumentation(),
+                new MessagesAvailableInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcInjectAdapter.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcInjectAdapter.java
index 24a6c7df1aa..c511d2ff9f5 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcInjectAdapter.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcInjectAdapter.java
@@ -9,20 +9,18 @@
 
 @ParametersAreNonnullByDefault
 public final class GrpcInjectAdapter implements CarrierSetter<Metadata> {
-  private static final Function<String, Metadata.Key<String>> KEY_MAKER =
-      key -> Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
-  private static final DDCache<String, Metadata.Key<String>> KEY_CACHE =
-      DDCaches.newFixedSizeCache(64);
+    private static final Function<String, Metadata.Key<String>> KEY_MAKER =
+            key -> Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
+    private static final DDCache<String, Metadata.Key<String>> KEY_CACHE = DDCaches.newFixedSizeCache(64);
 
-  public static final GrpcInjectAdapter SETTER = new GrpcInjectAdapter();
+    public static final GrpcInjectAdapter SETTER = new GrpcInjectAdapter();
 
-  @Override
-  public void set(final Metadata carrier, final String key, final String value) {
-    Metadata.Key<String> metadataKey = KEY_CACHE.computeIfAbsent(key, KEY_MAKER);
-    if (carrier.containsKey(metadataKey)) {
-      carrier.removeAll(
-          metadataKey); // Remove existing to ensure identical behavior with other carriers
+    @Override
+    public void set(final Metadata carrier, final String key, final String value) {
+        Metadata.Key<String> metadataKey = KEY_CACHE.computeIfAbsent(key, KEY_MAKER);
+        if (carrier.containsKey(metadataKey)) {
+            carrier.removeAll(metadataKey); // Remove existing to ensure identical behavior with other carriers
+        }
+        carrier.put(metadataKey, value);
     }
-    carrier.put(metadataKey, value);
-  }
 }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java
index 1d586a350a6..c7d3f8340e7 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java
@@ -24,53 +24,51 @@
 import net.bytebuddy.asm.Advice;
 
 public final class MessagesAvailableInstrumentation
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.grpc.internal.ClientCallImpl$ClientStreamListenerImpl$1MessagesAvailable",
-      "io.grpc.internal.ClientCallImpl$ClientStreamListenerImpl$1MessageRead"
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Capture");
-    if (InstrumenterConfig.get()
-        .isIntegrationEnabled(Collections.singleton("grpc-message"), false)) {
-      transformer.applyAdvice(named("runInContext"), getClass().getName() + "$ReceiveMessages");
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.grpc.internal.ClientCallImpl$ClientStreamListenerImpl$1MessagesAvailable",
+            "io.grpc.internal.ClientCallImpl$ClientStreamListenerImpl$1MessageRead"
+        };
     }
-  }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static final class Capture {
-    @Advice.OnMethodExit
-    public static void capture(@Advice.This Runnable task) {
-      AdviceUtils.capture(InstrumentationContext.get(Runnable.class, State.class), task);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Capture");
+        if (InstrumenterConfig.get().isIntegrationEnabled(Collections.singleton("grpc-message"), false)) {
+            transformer.applyAdvice(named("runInContext"), getClass().getName() + "$ReceiveMessages");
+        }
     }
-  }
 
-  public static final class ReceiveMessages {
-    @Advice.OnMethodEnter
-    public static ContextScope before() {
-      AgentSpan clientSpan = activeSpan();
-      if (clientSpan != null && OPERATION_NAME.equals(clientSpan.getOperationName())) {
-        AgentSpan messageSpan =
-            startSpan(COMPONENT_NAME.toString(), GRPC_MESSAGE)
-                .setTag("message.type", clientSpan.getTag("response.type"));
-        DECORATE.afterStart(messageSpan);
-        return activateSpan(messageSpan);
-      }
-      return null;
+    @AppliesOn(CONTEXT_TRACKING)
+    public static final class Capture {
+        @Advice.OnMethodExit
+        public static void capture(@Advice.This Runnable task) {
+            AdviceUtils.capture(InstrumentationContext.get(Runnable.class, State.class), task);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      if (null != scope) {
-        scope.close();
-        spanFromScope(scope).finish();
-      }
+    public static final class ReceiveMessages {
+        @Advice.OnMethodEnter
+        public static ContextScope before() {
+            AgentSpan clientSpan = activeSpan();
+            if (clientSpan != null && OPERATION_NAME.equals(clientSpan.getOperationName())) {
+                AgentSpan messageSpan = startSpan(COMPONENT_NAME.toString(), GRPC_MESSAGE)
+                        .setTag("message.type", clientSpan.getTag("response.type"));
+                DECORATE.afterStart(messageSpan);
+                return activateSpan(messageSpan);
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            if (null != scope) {
+                scope.close();
+                spanFromScope(scope).finish();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcExtractAdapter.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcExtractAdapter.java
index 27a8804651c..9ac5390262b 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcExtractAdapter.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcExtractAdapter.java
@@ -7,21 +7,20 @@
 import java.util.function.Function;
 
 public final class GrpcExtractAdapter implements AgentPropagation.ContextVisitor<Metadata> {
-  private static final Function<String, Metadata.Key<String>> KEY_MAKER =
-      key -> Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
-  private static final DDCache<String, Metadata.Key<String>> KEY_CACHE =
-      DDCaches.newFixedSizeCache(64);
+    private static final Function<String, Metadata.Key<String>> KEY_MAKER =
+            key -> Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
+    private static final DDCache<String, Metadata.Key<String>> KEY_CACHE = DDCaches.newFixedSizeCache(64);
 
-  public static final GrpcExtractAdapter GETTER = new GrpcExtractAdapter();
+    public static final GrpcExtractAdapter GETTER = new GrpcExtractAdapter();
 
-  @Override
-  public void forEachKey(Metadata carrier, AgentPropagation.KeyClassifier classifier) {
-    for (String key : carrier.keys()) {
-      if (!key.endsWith(Metadata.BINARY_HEADER_SUFFIX)) {
-        if (!classifier.accept(key, carrier.get(KEY_CACHE.computeIfAbsent(key, KEY_MAKER)))) {
-          return;
+    @Override
+    public void forEachKey(Metadata carrier, AgentPropagation.KeyClassifier classifier) {
+        for (String key : carrier.keys()) {
+            if (!key.endsWith(Metadata.BINARY_HEADER_SUFFIX)) {
+                if (!classifier.accept(key, carrier.get(KEY_CACHE.computeIfAbsent(key, KEY_MAKER)))) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerBuilderInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerBuilderInstrumentation.java
index 4e982e6f031..7a6e30e0416 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerBuilderInstrumentation.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerBuilderInstrumentation.java
@@ -19,62 +19,61 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class GrpcServerBuilderInstrumentation
-    implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return InstrumenterConfig.get()
-        .isIntegrationShortcutMatchingEnabled(asList("grpc", "grpc-server"), true);
-  }
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return InstrumenterConfig.get().isIntegrationShortcutMatchingEnabled(asList("grpc", "grpc-server"), true);
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.grpc.internal.AbstractServerImplBuilder",
-      "io.grpc.alts.AltsServerBuilder",
-      "io.grpc.ForwardingServerBuilder",
-      "io.grpc.inprocess.InProcessServerBuilder",
-      "io.grpc.netty.NettyServerBuilder",
-      "io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder",
-      "io.grpc.internal.ServerImplBuilder"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.grpc.internal.AbstractServerImplBuilder",
+            "io.grpc.alts.AltsServerBuilder",
+            "io.grpc.ForwardingServerBuilder",
+            "io.grpc.inprocess.InProcessServerBuilder",
+            "io.grpc.netty.NettyServerBuilder",
+            "io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder",
+            "io.grpc.internal.ServerImplBuilder"
+        };
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.grpc.ServerBuilder";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.grpc.ServerBuilder";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("build")).and(takesArguments(0)),
-        GrpcServerBuilderInstrumentation.class.getName() + "$BuildAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("build")).and(takesArguments(0)),
+                GrpcServerBuilderInstrumentation.class.getName() + "$BuildAdvice");
+    }
 
-  public static class BuildAdvice {
+    public static class BuildAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.This ServerBuilder<?> serverBuilder) {
-      int callDepth = incrementCallDepth(ServerBuilder.class);
-      if (callDepth == 0) {
-        ContextStore<ServerBuilder, Boolean> interceptedStore =
-            InstrumentationContext.get(ServerBuilder.class, Boolean.class);
-        if (interceptedStore.get(serverBuilder) == null) {
-          interceptedStore.put(serverBuilder, Boolean.TRUE);
-          serverBuilder.intercept(TracingServerInterceptor.INSTANCE);
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.This ServerBuilder<?> serverBuilder) {
+            int callDepth = incrementCallDepth(ServerBuilder.class);
+            if (callDepth == 0) {
+                ContextStore<ServerBuilder, Boolean> interceptedStore =
+                        InstrumentationContext.get(ServerBuilder.class, Boolean.class);
+                if (interceptedStore.get(serverBuilder) == null) {
+                    interceptedStore.put(serverBuilder, Boolean.TRUE);
+                    serverBuilder.intercept(TracingServerInterceptor.INSTANCE);
+                }
+            }
         }
-      }
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit() {
-      CallDepthThreadLocalMap.decrementCallDepth(ServerBuilder.class);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit() {
+            CallDepthThreadLocalMap.decrementCallDepth(ServerBuilder.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerDecorator.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerDecorator.java
index 0126ae15ad4..6626aa17b7e 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerDecorator.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerDecorator.java
@@ -24,102 +24,97 @@
 
 public class GrpcServerDecorator extends ServerDecorator {
 
-  private static final boolean TRIM_RESOURCE_PACKAGE_NAME =
-      Config.get().isGrpcServerTrimPackageResource();
-  private static final BitSet SERVER_ERROR_STATUSES = Config.get().getGrpcServerErrorStatuses();
-
-  public static final CharSequence GRPC_SERVER =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().server().operationForProtocol("grpc"));
-  public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("grpc-server");
-  public static final CharSequence GRPC_MESSAGE = UTF8BytesString.create("grpc.message");
-
-  private static DataStreamsTags createServerPathwaySortedTags() {
-    return create("grpc", INBOUND);
-  }
-
-  public static final DataStreamsTags SERVER_PATHWAY_EDGE_TAGS = createServerPathwaySortedTags();
-  public static final GrpcServerDecorator DECORATE = new GrpcServerDecorator();
-
-  private static final Function<String, String> NORMALIZE =
-      // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
-      new Function<String, String>() {
-        @Override
-        public String apply(String fullName) {
-          int index = fullName.lastIndexOf(".");
-          if (index > 0) {
-            return fullName.substring(index + 1);
-          } else {
-            return fullName;
-          }
+    private static final boolean TRIM_RESOURCE_PACKAGE_NAME = Config.get().isGrpcServerTrimPackageResource();
+    private static final BitSet SERVER_ERROR_STATUSES = Config.get().getGrpcServerErrorStatuses();
+
+    public static final CharSequence GRPC_SERVER =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().server().operationForProtocol("grpc"));
+    public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("grpc-server");
+    public static final CharSequence GRPC_MESSAGE = UTF8BytesString.create("grpc.message");
+
+    private static DataStreamsTags createServerPathwaySortedTags() {
+        return create("grpc", INBOUND);
+    }
+
+    public static final DataStreamsTags SERVER_PATHWAY_EDGE_TAGS = createServerPathwaySortedTags();
+    public static final GrpcServerDecorator DECORATE = new GrpcServerDecorator();
+
+    private static final Function<String, String> NORMALIZE =
+            // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
+            new Function<String, String>() {
+                @Override
+                public String apply(String fullName) {
+                    int index = fullName.lastIndexOf(".");
+                    if (index > 0) {
+                        return fullName.substring(index + 1);
+                    } else {
+                        return fullName;
+                    }
+                }
+            };
+
+    private final DDCache<String, String> cachedResourceNames;
+
+    public GrpcServerDecorator() {
+        if (TRIM_RESOURCE_PACKAGE_NAME) {
+            cachedResourceNames = DDCaches.newFixedSizeCache(512);
+        } else {
+            cachedResourceNames = null;
         }
-      };
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"grpc", "grpc-server"};
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.RPC;
+    }
 
-  private final DDCache<String, String> cachedResourceNames;
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
 
-  public GrpcServerDecorator() {
-    if (TRIM_RESOURCE_PACKAGE_NAME) {
-      cachedResourceNames = DDCaches.newFixedSizeCache(512);
-    } else {
-      cachedResourceNames = null;
+    @Override
+    protected void doAfterStart(@Nonnull final AgentSpan span) {
+        span.setMeasured(true);
+        super.doAfterStart(span);
     }
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"grpc", "grpc-server"};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.RPC;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected void doAfterStart(@Nonnull final AgentSpan span) {
-    span.setMeasured(true);
-    super.doAfterStart(span);
-  }
-
-  public <RespT, ReqT> void onCall(final AgentSpan span, ServerCall<ReqT, RespT> call) {
-    if (TRIM_RESOURCE_PACKAGE_NAME) {
-      span.setResourceName(
-          cachedResourceNames.computeIfAbsent(
-              call.getMethodDescriptor().getFullMethodName(), NORMALIZE));
-    } else {
-      span.setResourceName(call.getMethodDescriptor().getFullMethodName());
+
+    public <RespT, ReqT> void onCall(final AgentSpan span, ServerCall<ReqT, RespT> call) {
+        if (TRIM_RESOURCE_PACKAGE_NAME) {
+            span.setResourceName(cachedResourceNames.computeIfAbsent(
+                    call.getMethodDescriptor().getFullMethodName(), NORMALIZE));
+        } else {
+            span.setResourceName(call.getMethodDescriptor().getFullMethodName());
+        }
     }
-  }
-
-  public void onStatus(final AgentSpan span, final Status status) {
-    span.setTag("status.code", status.getCode().name());
-    span.setTag("grpc.status.code", status.getCode().name());
-    span.setTag(InstrumentationTags.GRPC_STATUS_CODE, status.getCode().value());
-    span.setTag("status.description", status.getDescription());
-    span.setError(
-        SERVER_ERROR_STATUSES.get(status.getCode().value()), ErrorPriorities.HTTP_SERVER_DECORATOR);
-  }
-
-  public void onClose(final AgentSpan span, final Status status) {
-    if (status.getCause() != null) {
-      onError(span, status.getCause());
+
+    public void onStatus(final AgentSpan span, final Status status) {
+        span.setTag("status.code", status.getCode().name());
+        span.setTag("grpc.status.code", status.getCode().name());
+        span.setTag(InstrumentationTags.GRPC_STATUS_CODE, status.getCode().value());
+        span.setTag("status.description", status.getDescription());
+        span.setError(SERVER_ERROR_STATUSES.get(status.getCode().value()), ErrorPriorities.HTTP_SERVER_DECORATOR);
     }
-    onStatus(span, status);
-  }
-
-  @Override
-  protected void doOnError(
-      @Nonnull AgentSpan span, @Nonnull Throwable throwable, byte errorPriority) {
-    super.doOnError(span, throwable, ErrorPriorities.HTTP_SERVER_DECORATOR);
-    if (throwable instanceof StatusRuntimeException) {
-      onStatus(span, ((StatusRuntimeException) throwable).getStatus());
-    } else if (throwable instanceof StatusException) {
-      onStatus(span, ((StatusException) throwable).getStatus());
+
+    public void onClose(final AgentSpan span, final Status status) {
+        if (status.getCause() != null) {
+            onError(span, status.getCause());
+        }
+        onStatus(span, status);
+    }
+
+    @Override
+    protected void doOnError(@Nonnull AgentSpan span, @Nonnull Throwable throwable, byte errorPriority) {
+        super.doOnError(span, throwable, ErrorPriorities.HTTP_SERVER_DECORATOR);
+        if (throwable instanceof StatusRuntimeException) {
+            onStatus(span, ((StatusRuntimeException) throwable).getStatus());
+        } else if (throwable instanceof StatusException) {
+            onStatus(span, ((StatusException) throwable).getStatus());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerModule.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerModule.java
index cb68c9a9719..4defde2f01a 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerModule.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerModule.java
@@ -14,24 +14,23 @@
 
 @AutoService(InstrumenterModule.class)
 public class GrpcServerModule extends InstrumenterModule.Tracing {
-  public GrpcServerModule() {
-    super("grpc", "grpc-server");
-  }
+    public GrpcServerModule() {
+        super("grpc", "grpc-server");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("io.grpc.ServerBuilder", Boolean.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("io.grpc.ServerBuilder", Boolean.class.getName());
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    final List<Instrumenter> ret = new ArrayList<>(2);
-    ret.add(new GrpcServerBuilderInstrumentation());
-    if (!JavaVirtualMachine.isGraalVM()
-        && InstrumenterConfig.get()
-            .isIntegrationEnabled(singleton("grpc-server-code-origin"), true)) {
-      ret.add(new MethodHandlersInstrumentation());
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        final List<Instrumenter> ret = new ArrayList<>(2);
+        ret.add(new GrpcServerBuilderInstrumentation());
+        if (!JavaVirtualMachine.isGraalVM()
+                && InstrumenterConfig.get().isIntegrationEnabled(singleton("grpc-server-code-origin"), true)) {
+            ret.add(new MethodHandlersInstrumentation());
+        }
+        return ret;
     }
-    return ret;
-  }
 }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/MethodHandlersInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/MethodHandlersInstrumentation.java
index 18afa651be1..60d9e573323 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/MethodHandlersInstrumentation.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/MethodHandlersInstrumentation.java
@@ -12,62 +12,59 @@
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
-public class MethodHandlersInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  private static final ElementMatcher<TypeDescription> METHOD_HANDLERS =
-      nameEndsWith("$MethodHandlers");
+public class MethodHandlersInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    private static final ElementMatcher<TypeDescription> METHOD_HANDLERS = nameEndsWith("$MethodHandlers");
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.grpc.MethodDescriptor";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.grpc.MethodDescriptor";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return METHOD_HANDLERS;
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return METHOD_HANDLERS;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArguments(2)),
-        "datadog.trace.instrumentation.grpc.server.MethodHandlersInstrumentation$BuildAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArguments(2)),
+                "datadog.trace.instrumentation.grpc.server.MethodHandlersInstrumentation$BuildAdvice");
+    }
 
-  public static class BuildAdvice {
+    public static class BuildAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(0) Object serviceImpl) {
-      try {
-        Class<?> serviceClass = serviceImpl.getClass();
-        Class<?> superClass = serviceClass.getSuperclass();
-        while (superClass != null && !superClass.getSimpleName().endsWith("ImplBase")) {
-          superClass = superClass.getSuperclass();
-        }
-        if (superClass != null) {
-          // bindService() would be the only method in this case and it's irrelevant
-          if (superClass.getDeclaredMethods().length == 1) {
-            for (Class<?> i : superClass.getInterfaces()) {
-              if (i.getSimpleName().equals("AsyncService")) {
-                superClass = i;
-                break;
-              }
-            }
-          }
-          for (Method method : superClass.getDeclaredMethods()) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(0) Object serviceImpl) {
             try {
-              marker();
-              captureCodeOrigin(
-                  serviceClass.getDeclaredMethod(method.getName(), method.getParameterTypes()),
-                  true);
+                Class<?> serviceClass = serviceImpl.getClass();
+                Class<?> superClass = serviceClass.getSuperclass();
+                while (superClass != null && !superClass.getSimpleName().endsWith("ImplBase")) {
+                    superClass = superClass.getSuperclass();
+                }
+                if (superClass != null) {
+                    // bindService() would be the only method in this case and it's irrelevant
+                    if (superClass.getDeclaredMethods().length == 1) {
+                        for (Class<?> i : superClass.getInterfaces()) {
+                            if (i.getSimpleName().equals("AsyncService")) {
+                                superClass = i;
+                                break;
+                            }
+                        }
+                    }
+                    for (Method method : superClass.getDeclaredMethods()) {
+                        try {
+                            marker();
+                            captureCodeOrigin(
+                                    serviceClass.getDeclaredMethod(method.getName(), method.getParameterTypes()), true);
+                        } catch (Throwable e) {
+                            // service method not overridden on the impl.  skipping instrumentation.
+                        }
+                    }
+                }
             } catch (Throwable e) {
-              // service method not overridden on the impl.  skipping instrumentation.
+                // this should be logged somehow
             }
-          }
         }
-      } catch (Throwable e) {
-        // this should be logged somehow
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java
index 7b45d3b1577..5e0e3485e24 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java
@@ -46,324 +46,315 @@
 import javax.annotation.Nonnull;
 
 public class TracingServerInterceptor implements ServerInterceptor {
-  private static final Function<String, Metadata.Key<String>> KEY_MAKER =
-      key -> Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
-  private static final DDCache<String, Metadata.Key<String>> KEY_CACHE =
-      DDCaches.newFixedSizeCache(64);
-
-  public static final TracingServerInterceptor INSTANCE = new TracingServerInterceptor();
-  private static final Set<String> IGNORED_METHODS = Config.get().getGrpcIgnoredInboundMethods();
-
-  private TracingServerInterceptor() {}
-
-  protected static AgentTracer.TracerAPI tracer() {
-    return AgentTracer.get();
-  }
-
-  @Override
-  public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
-      final ServerCall<ReqT, RespT> call,
-      final Metadata headers,
-      final ServerCallHandler<ReqT, RespT> next) {
-    if (IGNORED_METHODS.contains(call.getMethodDescriptor().getFullMethodName())) {
-      return next.startCall(call, headers);
-    }
-
-    AgentSpanContext spanContext = extractContextAndGetSpanContext(headers, GETTER);
-    AgentTracer.TracerAPI tracer = tracer();
-    spanContext = callIGCallbackRequestStarted(tracer, spanContext);
+    private static final Function<String, Metadata.Key<String>> KEY_MAKER =
+            key -> Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
+    private static final DDCache<String, Metadata.Key<String>> KEY_CACHE = DDCaches.newFixedSizeCache(64);
 
-    CallbackProvider cbp = tracer.getCallbackProvider(RequestContextSlot.APPSEC);
-    final AgentSpan span =
-        startSpan(COMPONENT_NAME.toString(), GRPC_SERVER, spanContext).setMeasured(true);
+    public static final TracingServerInterceptor INSTANCE = new TracingServerInterceptor();
+    private static final Set<String> IGNORED_METHODS = Config.get().getGrpcIgnoredInboundMethods();
 
-    AgentTracer.get()
-        .getDataStreamsMonitoring()
-        .setCheckpoint(span, fromTags(SERVER_PATHWAY_EDGE_TAGS));
+    private TracingServerInterceptor() {}
 
-    RequestContext reqContext = span.getRequestContext();
-    if (reqContext != null) {
-      callIGCallbackClientAddress(cbp, reqContext, call);
-      callIGCallbackHeaders(cbp, reqContext, headers);
-      callIGCallbackGrpcServerMethod(cbp, reqContext, call.getMethodDescriptor());
+    protected static AgentTracer.TracerAPI tracer() {
+        return AgentTracer.get();
     }
 
-    DECORATE.afterStart(span);
-    DECORATE.onCall(span, call);
-
-    final ServerCall.Listener<ReqT> result;
-    try (ContextScope scope = activateSpan(span)) {
-      // Wrap the server call so that we can decorate the span
-      // with the resulting status
-      final TracingServerCall<ReqT, RespT> tracingServerCall = new TracingServerCall<>(span, call);
-      // call other interceptors
-      result = next.startCall(tracingServerCall, headers);
-    } catch (final Throwable e) {
-      if (span.phasedFinish()) {
-        DECORATE.onError(span, e);
-        DECORATE.beforeFinish(span);
-        callIGCallbackRequestEnded(span);
-        span.publish();
-      }
-      throw e;
-    }
+    @Override
+    public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
+            final ServerCall<ReqT, RespT> call, final Metadata headers, final ServerCallHandler<ReqT, RespT> next) {
+        if (IGNORED_METHODS.contains(call.getMethodDescriptor().getFullMethodName())) {
+            return next.startCall(call, headers);
+        }
 
-    // This ensures the server implementation can see the span in scope
-    return new TracingServerCallListener<>(span, result);
-  }
+        AgentSpanContext spanContext = extractContextAndGetSpanContext(headers, GETTER);
+        AgentTracer.TracerAPI tracer = tracer();
+        spanContext = callIGCallbackRequestStarted(tracer, spanContext);
 
-  static final class TracingServerCall<ReqT, RespT>
-      extends ForwardingServerCall.SimpleForwardingServerCall<ReqT, RespT> {
-    final AgentSpan span;
+        CallbackProvider cbp = tracer.getCallbackProvider(RequestContextSlot.APPSEC);
+        final AgentSpan span =
+                startSpan(COMPONENT_NAME.toString(), GRPC_SERVER, spanContext).setMeasured(true);
 
-    TracingServerCall(final AgentSpan span, final ServerCall<ReqT, RespT> delegate) {
-      super(delegate);
-      this.span = span;
-    }
+        AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, fromTags(SERVER_PATHWAY_EDGE_TAGS));
 
-    @Override
-    public void close(final Status status, final Metadata trailers) {
-      DECORATE.onClose(span, status);
-      try (final ContextScope scope = activateSpan(span)) {
-        delegate().close(status, trailers);
-      } catch (final Throwable e) {
-        DECORATE.onError(span, e);
-        throw e;
-      } finally {
-        if (span.phasedFinish()) {
-          DECORATE.beforeFinish(span);
-          callIGCallbackRequestEnded(span);
-          span.publish();
+        RequestContext reqContext = span.getRequestContext();
+        if (reqContext != null) {
+            callIGCallbackClientAddress(cbp, reqContext, call);
+            callIGCallbackHeaders(cbp, reqContext, headers);
+            callIGCallbackGrpcServerMethod(cbp, reqContext, call.getMethodDescriptor());
         }
-      }
-    }
-  }
 
-  static final class TracingServerCallListener<ReqT>
-      extends ForwardingServerCallListener.SimpleForwardingServerCallListener<ReqT> {
-    private final AgentSpan span;
+        DECORATE.afterStart(span);
+        DECORATE.onCall(span, call);
+
+        final ServerCall.Listener<ReqT> result;
+        try (ContextScope scope = activateSpan(span)) {
+            // Wrap the server call so that we can decorate the span
+            // with the resulting status
+            final TracingServerCall<ReqT, RespT> tracingServerCall = new TracingServerCall<>(span, call);
+            // call other interceptors
+            result = next.startCall(tracingServerCall, headers);
+        } catch (final Throwable e) {
+            if (span.phasedFinish()) {
+                DECORATE.onError(span, e);
+                DECORATE.beforeFinish(span);
+                callIGCallbackRequestEnded(span);
+                span.publish();
+            }
+            throw e;
+        }
 
-    TracingServerCallListener(final AgentSpan span, final ServerCall.Listener<ReqT> delegate) {
-      super(delegate);
-      this.span = span;
+        // This ensures the server implementation can see the span in scope
+        return new TracingServerCallListener<>(span, result);
     }
 
-    @Override
-    public void onMessage(final ReqT message) {
-      final AgentSpan msgSpan =
-          startSpan(COMPONENT_NAME.toString(), GRPC_MESSAGE, this.span.spanContext())
-              .setTag("message.type", message.getClass().getName());
-      DECORATE.afterStart(msgSpan);
-      try (ContextScope scope = activateSpan(msgSpan)) {
-        callIGCallbackGrpcMessage(msgSpan, message);
-        delegate().onMessage(message);
-      } catch (final Throwable e) {
-        // I'm not convinced we should actually be finishing the span here...
-        if (span.phasedFinish()) {
-          DECORATE.onError(msgSpan, e);
-          DECORATE.beforeFinish(span);
-          callIGCallbackRequestEnded(span);
-          span.publish();
+    static final class TracingServerCall<ReqT, RespT>
+            extends ForwardingServerCall.SimpleForwardingServerCall<ReqT, RespT> {
+        final AgentSpan span;
+
+        TracingServerCall(final AgentSpan span, final ServerCall<ReqT, RespT> delegate) {
+            super(delegate);
+            this.span = span;
         }
-        throw e;
-      } finally {
-        DECORATE.beforeFinish(msgSpan);
-        msgSpan.finish();
-      }
-    }
 
-    @Override
-    public void onHalfClose() {
-      try (final ContextScope scope = activateSpan(span)) {
-        delegate().onHalfClose();
-      } catch (final Throwable e) {
-        if (span.phasedFinish()) {
-          DECORATE.onError(span, e);
-          DECORATE.beforeFinish(span);
-          callIGCallbackRequestEnded(span);
-          span.publish();
+        @Override
+        public void close(final Status status, final Metadata trailers) {
+            DECORATE.onClose(span, status);
+            try (final ContextScope scope = activateSpan(span)) {
+                delegate().close(status, trailers);
+            } catch (final Throwable e) {
+                DECORATE.onError(span, e);
+                throw e;
+            } finally {
+                if (span.phasedFinish()) {
+                    DECORATE.beforeFinish(span);
+                    callIGCallbackRequestEnded(span);
+                    span.publish();
+                }
+            }
         }
-        throw e;
-      }
     }
 
-    @Override
-    public void onCancel() {
-      // Finishes span.
-      try (final ContextScope scope = activateSpan(span)) {
-        delegate().onCancel();
-        span.setTag("canceled", true);
-      } catch (CancellationException e) {
-        // No need to report an exception or mark as error that it was canceled.
-        throw e;
-      } catch (final Throwable e) {
-        DECORATE.onError(span, e);
-        throw e;
-      } finally {
-        if (span.phasedFinish()) {
-          DECORATE.beforeFinish(span);
-          callIGCallbackRequestEnded(span);
-          span.publish();
+    static final class TracingServerCallListener<ReqT>
+            extends ForwardingServerCallListener.SimpleForwardingServerCallListener<ReqT> {
+        private final AgentSpan span;
+
+        TracingServerCallListener(final AgentSpan span, final ServerCall.Listener<ReqT> delegate) {
+            super(delegate);
+            this.span = span;
         }
-      }
-    }
 
-    @Override
-    public void onComplete() {
-      // Finishes span.
-      try (final ContextScope scope = activateSpan(span)) {
-        delegate().onComplete();
-      } catch (final Throwable e) {
-        DECORATE.onError(span, e);
-        throw e;
-      } finally {
-        /**
-         * grpc has quite a few states that can finish the span. rather than track down the correct
-         * combination of them to exclusively finish the span, use phasedFinish.
-         */
-        if (span.phasedFinish()) {
-          DECORATE.beforeFinish(span);
-          callIGCallbackRequestEnded(span);
-          span.publish();
+        @Override
+        public void onMessage(final ReqT message) {
+            final AgentSpan msgSpan = startSpan(COMPONENT_NAME.toString(), GRPC_MESSAGE, this.span.spanContext())
+                    .setTag("message.type", message.getClass().getName());
+            DECORATE.afterStart(msgSpan);
+            try (ContextScope scope = activateSpan(msgSpan)) {
+                callIGCallbackGrpcMessage(msgSpan, message);
+                delegate().onMessage(message);
+            } catch (final Throwable e) {
+                // I'm not convinced we should actually be finishing the span here...
+                if (span.phasedFinish()) {
+                    DECORATE.onError(msgSpan, e);
+                    DECORATE.beforeFinish(span);
+                    callIGCallbackRequestEnded(span);
+                    span.publish();
+                }
+                throw e;
+            } finally {
+                DECORATE.beforeFinish(msgSpan);
+                msgSpan.finish();
+            }
         }
-      }
-    }
 
-    @Override
-    public void onReady() {
-      try (final ContextScope scope = activateSpan(span)) {
-        delegate().onReady();
-      } catch (final Throwable e) {
-        if (span.phasedFinish()) {
-          DECORATE.onError(span, e);
-          DECORATE.beforeFinish(span);
-          callIGCallbackRequestEnded(span);
-          span.publish();
+        @Override
+        public void onHalfClose() {
+            try (final ContextScope scope = activateSpan(span)) {
+                delegate().onHalfClose();
+            } catch (final Throwable e) {
+                if (span.phasedFinish()) {
+                    DECORATE.onError(span, e);
+                    DECORATE.beforeFinish(span);
+                    callIGCallbackRequestEnded(span);
+                    span.publish();
+                }
+                throw e;
+            }
         }
-        throw e;
-      }
-    }
-  }
 
-  // IG helpers follow
+        @Override
+        public void onCancel() {
+            // Finishes span.
+            try (final ContextScope scope = activateSpan(span)) {
+                delegate().onCancel();
+                span.setTag("canceled", true);
+            } catch (CancellationException e) {
+                // No need to report an exception or mark as error that it was canceled.
+                throw e;
+            } catch (final Throwable e) {
+                DECORATE.onError(span, e);
+                throw e;
+            } finally {
+                if (span.phasedFinish()) {
+                    DECORATE.beforeFinish(span);
+                    callIGCallbackRequestEnded(span);
+                    span.publish();
+                }
+            }
+        }
 
-  private static AgentSpanContext callIGCallbackRequestStarted(
-      AgentTracer.TracerAPI cbp, AgentSpanContext context) {
-    Supplier<Flow<Object>> startedCbAppSec =
-        cbp.getCallbackProvider(RequestContextSlot.APPSEC).getCallback(EVENTS.requestStarted());
-    Supplier<Flow<Object>> startedCbIast =
-        cbp.getCallbackProvider(RequestContextSlot.IAST).getCallback(EVENTS.requestStarted());
+        @Override
+        public void onComplete() {
+            // Finishes span.
+            try (final ContextScope scope = activateSpan(span)) {
+                delegate().onComplete();
+            } catch (final Throwable e) {
+                DECORATE.onError(span, e);
+                throw e;
+            } finally {
+                /**
+                 * grpc has quite a few states that can finish the span. rather than track down the correct
+                 * combination of them to exclusively finish the span, use phasedFinish.
+                 */
+                if (span.phasedFinish()) {
+                    DECORATE.beforeFinish(span);
+                    callIGCallbackRequestEnded(span);
+                    span.publish();
+                }
+            }
+        }
 
-    if (startedCbAppSec == null && startedCbIast == null) {
-      return context;
+        @Override
+        public void onReady() {
+            try (final ContextScope scope = activateSpan(span)) {
+                delegate().onReady();
+            } catch (final Throwable e) {
+                if (span.phasedFinish()) {
+                    DECORATE.onError(span, e);
+                    DECORATE.beforeFinish(span);
+                    callIGCallbackRequestEnded(span);
+                    span.publish();
+                }
+                throw e;
+            }
+        }
     }
 
-    TagContext tagContext = null;
-    if (context == null) {
-      tagContext = new TagContext();
-    } else if (context instanceof TagContext) {
-      tagContext = (TagContext) context;
-    }
-    if (tagContext != null) {
-      if (startedCbAppSec != null) {
-        Flow<Object> flowAppSec = startedCbAppSec.get();
-        tagContext.withRequestContextDataAppSec(flowAppSec.getResult());
-      }
-      if (startedCbIast != null) {
-        Flow<Object> flowIast = startedCbIast.get();
-        tagContext.withRequestContextDataIast(flowIast.getResult());
-      }
-      return tagContext;
-    }
+    // IG helpers follow
 
-    return context;
-  }
+    private static AgentSpanContext callIGCallbackRequestStarted(AgentTracer.TracerAPI cbp, AgentSpanContext context) {
+        Supplier<Flow<Object>> startedCbAppSec =
+                cbp.getCallbackProvider(RequestContextSlot.APPSEC).getCallback(EVENTS.requestStarted());
+        Supplier<Flow<Object>> startedCbIast =
+                cbp.getCallbackProvider(RequestContextSlot.IAST).getCallback(EVENTS.requestStarted());
 
-  private static <ReqT, RespT> void callIGCallbackClientAddress(
-      CallbackProvider cbp, RequestContext ctx, ServerCall<ReqT, RespT> call) {
-    SocketAddress socketAddress = call.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR);
-    TriFunction<RequestContext, String, Integer, Flow<Void>> cb =
-        cbp.getCallback(EVENTS.requestClientSocketAddress());
-    if (socketAddress == null || !(socketAddress instanceof InetSocketAddress) || cb == null) {
-      return;
-    }
+        if (startedCbAppSec == null && startedCbIast == null) {
+            return context;
+        }
 
-    InetSocketAddress inetSockAddr = (InetSocketAddress) socketAddress;
-    cb.apply(ctx, inetSockAddr.getHostString(), inetSockAddr.getPort());
-  }
+        TagContext tagContext = null;
+        if (context == null) {
+            tagContext = new TagContext();
+        } else if (context instanceof TagContext) {
+            tagContext = (TagContext) context;
+        }
+        if (tagContext != null) {
+            if (startedCbAppSec != null) {
+                Flow<Object> flowAppSec = startedCbAppSec.get();
+                tagContext.withRequestContextDataAppSec(flowAppSec.getResult());
+            }
+            if (startedCbIast != null) {
+                Flow<Object> flowIast = startedCbIast.get();
+                tagContext.withRequestContextDataIast(flowIast.getResult());
+            }
+            return tagContext;
+        }
 
-  private static void callIGCallbackHeaders(
-      CallbackProvider cbp, RequestContext reqCtx, Metadata metadata) {
-    TriConsumer<RequestContext, String, String> headerCb = cbp.getCallback(EVENTS.requestHeader());
-    Function<RequestContext, Flow<Void>> headerEndCb = cbp.getCallback(EVENTS.requestHeaderDone());
-    if (headerCb == null || headerEndCb == null) {
-      return;
+        return context;
     }
-    for (String key : metadata.keys()) {
-      if (!key.endsWith(Metadata.BINARY_HEADER_SUFFIX)) {
-        Metadata.Key<String> mdKey = KEY_CACHE.computeIfAbsent(key, KEY_MAKER);
-        for (String value : metadata.getAll(mdKey)) {
-          headerCb.accept(reqCtx, key, value);
+
+    private static <ReqT, RespT> void callIGCallbackClientAddress(
+            CallbackProvider cbp, RequestContext ctx, ServerCall<ReqT, RespT> call) {
+        SocketAddress socketAddress = call.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR);
+        TriFunction<RequestContext, String, Integer, Flow<Void>> cb =
+                cbp.getCallback(EVENTS.requestClientSocketAddress());
+        if (socketAddress == null || !(socketAddress instanceof InetSocketAddress) || cb == null) {
+            return;
         }
-      }
+
+        InetSocketAddress inetSockAddr = (InetSocketAddress) socketAddress;
+        cb.apply(ctx, inetSockAddr.getHostString(), inetSockAddr.getPort());
     }
 
-    headerEndCb.apply(reqCtx);
-  }
+    private static void callIGCallbackHeaders(CallbackProvider cbp, RequestContext reqCtx, Metadata metadata) {
+        TriConsumer<RequestContext, String, String> headerCb = cbp.getCallback(EVENTS.requestHeader());
+        Function<RequestContext, Flow<Void>> headerEndCb = cbp.getCallback(EVENTS.requestHeaderDone());
+        if (headerCb == null || headerEndCb == null) {
+            return;
+        }
+        for (String key : metadata.keys()) {
+            if (!key.endsWith(Metadata.BINARY_HEADER_SUFFIX)) {
+                Metadata.Key<String> mdKey = KEY_CACHE.computeIfAbsent(key, KEY_MAKER);
+                for (String value : metadata.getAll(mdKey)) {
+                    headerCb.accept(reqCtx, key, value);
+                }
+            }
+        }
 
-  private static void callIGCallbackRequestEnded(@Nonnull final AgentSpan span) {
-    CallbackProvider cbp = tracer().getUniversalCallbackProvider();
-    if (cbp == null) {
-      return;
+        headerEndCb.apply(reqCtx);
     }
-    RequestContext requestContext = span.getRequestContext();
-    if (requestContext != null) {
-      BiFunction<RequestContext, IGSpanInfo, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestEnded());
-      if (callback != null) {
-        callback.apply(requestContext, span);
-      }
-    }
-  }
-
-  private static <ReqT, RespT> void callIGCallbackGrpcServerMethod(
-      CallbackProvider cbp, RequestContext ctx, MethodDescriptor<ReqT, RespT> methodDescriptor) {
-    String method = methodDescriptor.getFullMethodName();
-    BiFunction<RequestContext, String, Flow<Void>> cb = cbp.getCallback(EVENTS.grpcServerMethod());
-    if (method == null || cb == null) {
-      return;
-    }
-    cb.apply(ctx, method);
-  }
 
-  private static void callIGCallbackGrpcMessage(@Nonnull final AgentSpan span, Object obj) {
-    if (obj == null) {
-      return;
-    }
-    CallbackProvider cbpAppsec = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
-    CallbackProvider cbpIast = tracer().getCallbackProvider(RequestContextSlot.IAST);
-    if (cbpAppsec == null && cbpIast == null) {
-      return;
-    }
-    RequestContext requestContext = span.getRequestContext();
-    if (requestContext == null) {
-      return;
+    private static void callIGCallbackRequestEnded(@Nonnull final AgentSpan span) {
+        CallbackProvider cbp = tracer().getUniversalCallbackProvider();
+        if (cbp == null) {
+            return;
+        }
+        RequestContext requestContext = span.getRequestContext();
+        if (requestContext != null) {
+            BiFunction<RequestContext, IGSpanInfo, Flow<Void>> callback = cbp.getCallback(EVENTS.requestEnded());
+            if (callback != null) {
+                callback.apply(requestContext, span);
+            }
+        }
     }
 
-    if (cbpAppsec != null) {
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbpAppsec.getCallback(EVENTS.grpcServerRequestMessage());
-      if (callback != null) {
-        callback.apply(requestContext, obj);
-      }
+    private static <ReqT, RespT> void callIGCallbackGrpcServerMethod(
+            CallbackProvider cbp, RequestContext ctx, MethodDescriptor<ReqT, RespT> methodDescriptor) {
+        String method = methodDescriptor.getFullMethodName();
+        BiFunction<RequestContext, String, Flow<Void>> cb = cbp.getCallback(EVENTS.grpcServerMethod());
+        if (method == null || cb == null) {
+            return;
+        }
+        cb.apply(ctx, method);
     }
 
-    if (cbpIast != null) {
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbpIast.getCallback(EVENTS.grpcServerRequestMessage());
-      if (callback != null) {
-        callback.apply(requestContext, obj);
-      }
+    private static void callIGCallbackGrpcMessage(@Nonnull final AgentSpan span, Object obj) {
+        if (obj == null) {
+            return;
+        }
+        CallbackProvider cbpAppsec = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
+        CallbackProvider cbpIast = tracer().getCallbackProvider(RequestContextSlot.IAST);
+        if (cbpAppsec == null && cbpIast == null) {
+            return;
+        }
+        RequestContext requestContext = span.getRequestContext();
+        if (requestContext == null) {
+            return;
+        }
+
+        if (cbpAppsec != null) {
+            BiFunction<RequestContext, Object, Flow<Void>> callback =
+                    cbpAppsec.getCallback(EVENTS.grpcServerRequestMessage());
+            if (callback != null) {
+                callback.apply(requestContext, obj);
+            }
+        }
+
+        if (cbpIast != null) {
+            BiFunction<RequestContext, Object, Flow<Void>> callback =
+                    cbpIast.getCallback(EVENTS.grpcServerRequestMessage());
+            if (callback != null) {
+                callback.apply(requestContext, obj);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/gson-1.6/src/main/java/datadog/trace/instrumentation/gson/JsonReaderInstrumentation.java b/dd-java-agent/instrumentation/gson-1.6/src/main/java/datadog/trace/instrumentation/gson/JsonReaderInstrumentation.java
index 1e3b729198c..83b13b4083f 100644
--- a/dd-java-agent/instrumentation/gson-1.6/src/main/java/datadog/trace/instrumentation/gson/JsonReaderInstrumentation.java
+++ b/dd-java-agent/instrumentation/gson-1.6/src/main/java/datadog/trace/instrumentation/gson/JsonReaderInstrumentation.java
@@ -22,56 +22,55 @@
 
 @AutoService(InstrumenterModule.class)
 public class JsonReaderInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JsonReaderInstrumentation() {
-    super("gson");
-  }
+    public JsonReaderInstrumentation() {
+        super("gson");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.google.gson.stream.JsonReader";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.google.gson.stream.JsonReader";
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("com.google.gson.stream.JsonReader");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("com.google.gson.stream.JsonReader");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArguments(1)).and(takesArgument(0, named("java.io.Reader"))),
-        getClass().getName() + "$ConstructAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(returns(String.class))
-            .and(namedOneOf("nextName", "nextString"))
-            .and(takesNoArguments()),
-        getClass().getName() + "$MethodAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArguments(1)).and(takesArgument(0, named("java.io.Reader"))),
+                getClass().getName() + "$ConstructAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(returns(String.class))
+                        .and(namedOneOf("nextName", "nextString"))
+                        .and(takesNoArguments()),
+                getClass().getName() + "$MethodAdvice");
+    }
 
-  public static class ConstructAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void afterInit(
-        @Advice.This Object self, @Advice.Argument(0) final java.io.Reader input) {
-      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
-      if (iastModule != null && input != null) {
-        iastModule.taintObjectIfTainted(self, input);
-      }
+    public static class ConstructAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void afterInit(@Advice.This Object self, @Advice.Argument(0) final java.io.Reader input) {
+            final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+            if (iastModule != null && input != null) {
+                iastModule.taintObjectIfTainted(self, input);
+            }
+        }
     }
-  }
 
-  public static class MethodAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void afterMethod(@Advice.This Object self, @Advice.Return final String result) {
-      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
-      if (iastModule != null && result != null) {
-        iastModule.taintStringIfTainted(result, self);
-      }
+    public static class MethodAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void afterMethod(@Advice.This Object self, @Advice.Return final String result) {
+            final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+            if (iastModule != null && result != null) {
+                iastModule.taintStringIfTainted(result, self);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/guava-10.0/src/main/java/datadog/trace/instrumentation/guava10/GuavaAsyncResultExtension.java b/dd-java-agent/instrumentation/guava-10.0/src/main/java/datadog/trace/instrumentation/guava10/GuavaAsyncResultExtension.java
index 78a2c37f207..20b15308a15 100644
--- a/dd-java-agent/instrumentation/guava-10.0/src/main/java/datadog/trace/instrumentation/guava10/GuavaAsyncResultExtension.java
+++ b/dd-java-agent/instrumentation/guava-10.0/src/main/java/datadog/trace/instrumentation/guava10/GuavaAsyncResultExtension.java
@@ -9,45 +9,45 @@
 import java.util.concurrent.ExecutionException;
 
 public class GuavaAsyncResultExtension implements AsyncResultExtension, EagerHelper {
-  static {
-    AsyncResultExtensions.register(new GuavaAsyncResultExtension());
-  }
+    static {
+        AsyncResultExtensions.register(new GuavaAsyncResultExtension());
+    }
 
-  /**
-   * Register the extension as an {@link AsyncResultExtension} using static class initialization.
-   * <br>
-   * It uses an empty static method call to ensure the class loading and the one-time-only static
-   * class initialization. This will ensure this extension will only be registered once under {@link
-   * AsyncResultExtensions}.
-   */
-  public static void init() {}
+    /**
+     * Register the extension as an {@link AsyncResultExtension} using static class initialization.
+     * <br>
+     * It uses an empty static method call to ensure the class loading and the one-time-only static
+     * class initialization. This will ensure this extension will only be registered once under {@link
+     * AsyncResultExtensions}.
+     */
+    public static void init() {}
 
-  @Override
-  public boolean supports(Class<?> result) {
-    return ListenableFuture.class.isAssignableFrom(result);
-  }
+    @Override
+    public boolean supports(Class<?> result) {
+        return ListenableFuture.class.isAssignableFrom(result);
+    }
 
-  @Override
-  public Object apply(Object result, AgentSpan span) {
-    if (result instanceof ListenableFuture) {
-      ListenableFuture<?> listenableFuture = (ListenableFuture<?>) result;
-      if (!listenableFuture.isDone() && !listenableFuture.isCancelled()) {
-        listenableFuture.addListener(
-            () -> {
-              // Get value to check for execution exception
-              try {
-                listenableFuture.get();
-              } catch (ExecutionException e) {
-                span.addThrowable(e.getCause());
-              } catch (CancellationException | InterruptedException e) {
-                // Ignored
-              }
-              span.finish();
-            },
-            Runnable::run);
-        return result;
-      }
+    @Override
+    public Object apply(Object result, AgentSpan span) {
+        if (result instanceof ListenableFuture) {
+            ListenableFuture<?> listenableFuture = (ListenableFuture<?>) result;
+            if (!listenableFuture.isDone() && !listenableFuture.isCancelled()) {
+                listenableFuture.addListener(
+                        () -> {
+                            // Get value to check for execution exception
+                            try {
+                                listenableFuture.get();
+                            } catch (ExecutionException e) {
+                                span.addThrowable(e.getCause());
+                            } catch (CancellationException | InterruptedException e) {
+                                // Ignored
+                            }
+                            span.finish();
+                        },
+                        Runnable::run);
+                return result;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/guava-10.0/src/main/java/datadog/trace/instrumentation/guava10/ListenableFutureInstrumentation.java b/dd-java-agent/instrumentation/guava-10.0/src/main/java/datadog/trace/instrumentation/guava10/ListenableFutureInstrumentation.java
index c0fe8e71137..a41de0433f4 100644
--- a/dd-java-agent/instrumentation/guava-10.0/src/main/java/datadog/trace/instrumentation/guava10/ListenableFutureInstrumentation.java
+++ b/dd-java-agent/instrumentation/guava-10.0/src/main/java/datadog/trace/instrumentation/guava10/ListenableFutureInstrumentation.java
@@ -22,63 +22,61 @@
 
 @AutoService(InstrumenterModule.class)
 public class ListenableFutureInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ListenableFutureInstrumentation() {
-    super("guava");
-  }
+    public ListenableFutureInstrumentation() {
+        super("guava");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.google.common.util.concurrent.AbstractFuture";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.google.common.util.concurrent.AbstractFuture";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      this.packageName + ".GuavaAsyncResultExtension",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            this.packageName + ".GuavaAsyncResultExtension",
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(Runnable.class.getName(), State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(Runnable.class.getName(), State.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("addListener").and(takesArguments(Runnable.class, Executor.class)),
-        ListenableFutureInstrumentation.class.getName() + "$AddListenerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("addListener").and(takesArguments(Runnable.class, Executor.class)),
+                ListenableFutureInstrumentation.class.getName() + "$AddListenerAdvice");
+    }
 
-  public static class AddListenerAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static State addListenerEnter(
-        @Advice.Argument(value = 0, readOnly = false) Runnable task) {
-      final Context context = currentContext();
-      if (context != rootContext()) {
-        final Runnable newTask = RunnableWrapper.wrapIfNeeded(task);
-        // It is important to check potentially wrapped task if we can instrument task in this
-        // executor. Some executors do not support wrapped tasks.
-        if (ExecutorInstrumentationUtils.shouldAttachStateToTask(newTask, context)) {
-          task = newTask;
-          final ContextStore<Runnable, State> contextStore =
-              InstrumentationContext.get(Runnable.class, State.class);
-          return ExecutorInstrumentationUtils.setupState(contextStore, newTask, context);
+    public static class AddListenerAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static State addListenerEnter(@Advice.Argument(value = 0, readOnly = false) Runnable task) {
+            final Context context = currentContext();
+            if (context != rootContext()) {
+                final Runnable newTask = RunnableWrapper.wrapIfNeeded(task);
+                // It is important to check potentially wrapped task if we can instrument task in this
+                // executor. Some executors do not support wrapped tasks.
+                if (ExecutorInstrumentationUtils.shouldAttachStateToTask(newTask, context)) {
+                    task = newTask;
+                    final ContextStore<Runnable, State> contextStore =
+                            InstrumentationContext.get(Runnable.class, State.class);
+                    return ExecutorInstrumentationUtils.setupState(contextStore, newTask, context);
+                }
+            }
+            return null;
         }
-      }
-      return null;
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void addListenerExit(
-        @Advice.Enter final State state, @Advice.Thrown final Throwable throwable) {
-      ExecutorInstrumentationUtils.cleanUpOnMethodExit(state, throwable);
-    }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void addListenerExit(@Advice.Enter final State state, @Advice.Thrown final Throwable throwable) {
+            ExecutorInstrumentationUtils.cleanUpOnMethodExit(state, throwable);
+        }
 
-    private static void muzzleCheck(final AbstractFuture<?> future) {
-      future.addListener(null, null);
+        private static void muzzleCheck(final AbstractFuture<?> future) {
+            future.addListener(null, null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/guava-10.0/src/test/java/annotatedsample/GuavaTracedMethods.java b/dd-java-agent/instrumentation/guava-10.0/src/test/java/annotatedsample/GuavaTracedMethods.java
index 4bb6550b57b..5388921cf7c 100644
--- a/dd-java-agent/instrumentation/guava-10.0/src/test/java/annotatedsample/GuavaTracedMethods.java
+++ b/dd-java-agent/instrumentation/guava-10.0/src/test/java/annotatedsample/GuavaTracedMethods.java
@@ -9,59 +9,58 @@
 import java.util.concurrent.ExecutorService;
 
 public class GuavaTracedMethods {
-  @WithSpan
-  public static ListenableFuture<String> traceAsyncListenableFuture(
-      ExecutorService executor, CountDownLatch latch) {
-    TestFuture listenableFuture = TestFuture.ofComplete(latch, "hello");
-    executor.submit(listenableFuture::start);
-    return listenableFuture;
-  }
+    @WithSpan
+    public static ListenableFuture<String> traceAsyncListenableFuture(ExecutorService executor, CountDownLatch latch) {
+        TestFuture listenableFuture = TestFuture.ofComplete(latch, "hello");
+        executor.submit(listenableFuture::start);
+        return listenableFuture;
+    }
 
-  @WithSpan
-  public static ListenableFuture<?> traceAsyncCancelledListenableFuture(CountDownLatch latch) {
-    return TestFuture.ofComplete(latch, "hello");
-  }
+    @WithSpan
+    public static ListenableFuture<?> traceAsyncCancelledListenableFuture(CountDownLatch latch) {
+        return TestFuture.ofComplete(latch, "hello");
+    }
 
-  @WithSpan
-  public static ListenableFuture<?> traceAsyncFailingListenableFuture(
-      ExecutorService executor, CountDownLatch latch, Throwable exception) {
-    TestFuture listenableFuture = TestFuture.ofFailing(latch, exception);
-    executor.submit(listenableFuture::start);
-    return listenableFuture;
-  }
+    @WithSpan
+    public static ListenableFuture<?> traceAsyncFailingListenableFuture(
+            ExecutorService executor, CountDownLatch latch, Throwable exception) {
+        TestFuture listenableFuture = TestFuture.ofFailing(latch, exception);
+        executor.submit(listenableFuture::start);
+        return listenableFuture;
+    }
 
-  private static class TestFuture extends AbstractFuture<String> {
-    private final CountDownLatch latch;
-    private final String value;
-    private final Throwable exception;
+    private static class TestFuture extends AbstractFuture<String> {
+        private final CountDownLatch latch;
+        private final String value;
+        private final Throwable exception;
 
-    private TestFuture(CountDownLatch latch, String value, Throwable exception) {
-      this.latch = latch;
-      this.value = value;
-      this.exception = exception;
-    }
+        private TestFuture(CountDownLatch latch, String value, Throwable exception) {
+            this.latch = latch;
+            this.value = value;
+            this.exception = exception;
+        }
 
-    private void start() {
-      try {
-        if (!this.latch.await(5, SECONDS)) {
-          throw new IllegalStateException("Latch still locked");
+        private void start() {
+            try {
+                if (!this.latch.await(5, SECONDS)) {
+                    throw new IllegalStateException("Latch still locked");
+                }
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            if (this.exception != null) {
+                setException(this.exception);
+            } else {
+                set(this.value);
+            }
         }
-      } catch (InterruptedException e) {
-        throw new RuntimeException(e);
-      }
-      if (this.exception != null) {
-        setException(this.exception);
-      } else {
-        set(this.value);
-      }
-    }
 
-    private static TestFuture ofComplete(CountDownLatch latch, String value) {
-      return new TestFuture(latch, value, null);
-    }
+        private static TestFuture ofComplete(CountDownLatch latch, String value) {
+            return new TestFuture(latch, value, null);
+        }
 
-    private static TestFuture ofFailing(CountDownLatch latch, Throwable exception) {
-      return new TestFuture(latch, null, exception);
+        private static TestFuture ofFailing(CountDownLatch latch, Throwable exception) {
+            return new TestFuture(latch, null, exception);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/guidewire-10.0/src/main/java/datadog/trace/instrumentation/guidewire/WsiAsyncResponseInstrumentation.java b/dd-java-agent/instrumentation/guidewire-10.0/src/main/java/datadog/trace/instrumentation/guidewire/WsiAsyncResponseInstrumentation.java
index 9874de89c3d..1145c897661 100644
--- a/dd-java-agent/instrumentation/guidewire-10.0/src/main/java/datadog/trace/instrumentation/guidewire/WsiAsyncResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/guidewire-10.0/src/main/java/datadog/trace/instrumentation/guidewire/WsiAsyncResponseInstrumentation.java
@@ -43,53 +43,53 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class WsiAsyncResponseInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  private static final String ASYNC_RESPONSE = "gw.internal.xml.ws.AsyncResponseImpl";
+    private static final String ASYNC_RESPONSE = "gw.internal.xml.ws.AsyncResponseImpl";
 
-  public WsiAsyncResponseInstrumentation() {
-    super("guidewire");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return ASYNC_RESPONSE;
-  }
+    public WsiAsyncResponseInstrumentation() {
+        super("guidewire");
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    // '$' matches only nested classes of AsyncResponseImpl, not top-level siblings.
-    return nameStartsWith(ASYNC_RESPONSE + "$").and(extendsClass(named("java.lang.Thread")));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return ASYNC_RESPONSE;
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(Runnable.class.getName(), State.class.getName());
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        // '$' matches only nested classes of AsyncResponseImpl, not top-level siblings.
+        return nameStartsWith(ASYNC_RESPONSE + "$").and(extendsClass(named("java.lang.Thread")));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Capture");
-    transformer.applyAdvice(
-        named("run").and(takesArguments(0)).and(isPublic()), getClass().getName() + "$Activate");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(Runnable.class.getName(), State.class.getName());
+    }
 
-  public static final class Capture {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onConstruct(@Advice.This final Runnable thiz) {
-      capture(InstrumentationContext.get(Runnable.class, State.class), thiz);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Capture");
+        transformer.applyAdvice(
+                named("run").and(takesArguments(0)).and(isPublic()), getClass().getName() + "$Activate");
     }
-  }
 
-  public static final class Activate {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(@Advice.This final Runnable thiz) {
-      return startTaskScope(InstrumentationContext.get(Runnable.class, State.class), thiz);
+    public static final class Capture {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onConstruct(@Advice.This final Runnable thiz) {
+            capture(InstrumentationContext.get(Runnable.class, State.class), thiz);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Enter final ContextScope scope) {
-      endTaskScope(scope);
+    public static final class Activate {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(@Advice.This final Runnable thiz) {
+            return startTaskScope(InstrumentationContext.get(Runnable.class, State.class), thiz);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Enter final ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/guidewire-10.0/src/test/java/datadog/trace/instrumentation/guidewire/WsiAsyncResponseInstrumentationTest.java b/dd-java-agent/instrumentation/guidewire-10.0/src/test/java/datadog/trace/instrumentation/guidewire/WsiAsyncResponseInstrumentationTest.java
index e8534b5c3b5..1a7ea66dff2 100644
--- a/dd-java-agent/instrumentation/guidewire-10.0/src/test/java/datadog/trace/instrumentation/guidewire/WsiAsyncResponseInstrumentationTest.java
+++ b/dd-java-agent/instrumentation/guidewire-10.0/src/test/java/datadog/trace/instrumentation/guidewire/WsiAsyncResponseInstrumentationTest.java
@@ -16,99 +16,94 @@
 
 class WsiAsyncResponseInstrumentationTest extends AbstractInstrumentationTest {
 
-  @FunctionalInterface
-  interface Body {
-    void run() throws Exception;
-  }
-
-  private static void runUnderTrace(String operationName, Body body) throws Exception {
-    AgentSpan span = startSpan("guidewire-test", operationName);
-    try (ContextScope scope = activateSpan(span)) {
-      body.run();
-    } finally {
-      span.finish();
+    @FunctionalInterface
+    interface Body {
+        void run() throws Exception;
     }
-  }
-
-  @Test
-  void namedWorkerPropagatesContext() throws Exception {
-    // Constructed and run while the caller's span is active; invoke() blocks until the worker ends.
-    runUnderTrace("parent", () -> new AsyncResponseImpl().invoke());
-
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("parent"),
-            span().childOfPrevious().operationName("soap.call")));
-  }
-
-  @Test
-  void anonymousWorkerPropagatesContext() throws Exception {
-    runUnderTrace("parent", () -> AsyncResponseImpl.anonymous().invoke());
-
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("parent"),
-            span().childOfPrevious().operationName("soap.call")));
-  }
-
-  @Test
-  void synchronousRunPropagatesContext() throws Exception {
-    // callTimeout <= 0 path: AsyncResponseImpl.run() calls _thread.run() on the caller thread.
-    runUnderTrace("parent", () -> new AsyncResponseImpl().invokeSync());
-
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("parent"),
-            span().childOfPrevious().operationName("soap.call")));
-  }
-
-  @Test
-  void unrelatedThreadIsNotInstrumented() throws Exception {
-    // Same construction pattern, but a class the narrow matcher must ignore.
-    runUnderTrace(
-        "parent",
-        () -> {
-          UnrelatedWorker worker = new UnrelatedWorker();
-          worker.start();
-          worker.join();
+
+    private static void runUnderTrace(String operationName, Body body) throws Exception {
+        AgentSpan span = startSpan("guidewire-test", operationName);
+        try (ContextScope scope = activateSpan(span)) {
+            body.run();
+        } finally {
+            span.finish();
+        }
+    }
+
+    @Test
+    void namedWorkerPropagatesContext() throws Exception {
+        // Constructed and run while the caller's span is active; invoke() blocks until the worker ends.
+        runUnderTrace("parent", () -> new AsyncResponseImpl().invoke());
+
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root().operationName("parent"),
+                span().childOfPrevious().operationName("soap.call")));
+    }
+
+    @Test
+    void anonymousWorkerPropagatesContext() throws Exception {
+        runUnderTrace("parent", () -> AsyncResponseImpl.anonymous().invoke());
+
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root().operationName("parent"),
+                span().childOfPrevious().operationName("soap.call")));
+    }
+
+    @Test
+    void synchronousRunPropagatesContext() throws Exception {
+        // callTimeout <= 0 path: AsyncResponseImpl.run() calls _thread.run() on the caller thread.
+        runUnderTrace("parent", () -> new AsyncResponseImpl().invokeSync());
+
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root().operationName("parent"),
+                span().childOfPrevious().operationName("soap.call")));
+    }
+
+    @Test
+    void unrelatedThreadIsNotInstrumented() throws Exception {
+        // Same construction pattern, but a class the narrow matcher must ignore.
+        runUnderTrace("parent", () -> {
+            UnrelatedWorker worker = new UnrelatedWorker();
+            worker.start();
+            worker.join();
         });
 
-    // No propagation: the worker's span starts its own trace instead of joining "parent".
-    assertTraces(
-        trace(span().root().operationName("parent")),
-        trace(span().root().operationName("unrelated.work")));
-  }
-
-  @Test
-  void noContextLeakToSubsequentInvocation() throws Exception {
-    runUnderTrace("parent", () -> new AsyncResponseImpl().invoke());
-    // Second invocation runs with no active span: capture is a no-op, so soap.call is its own root.
-    new AsyncResponseImpl().invoke();
-
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("parent"),
-            span().childOfPrevious().operationName("soap.call")),
-        trace(span().root().operationName("soap.call")));
-  }
-
-  @Test
-  void delayedWorkerDoesNotCorruptInterveningTrace() throws Exception {
-    AtomicReference<AsyncResponseImpl> response = new AtomicReference<>();
-
-    runUnderTrace("outer", () -> response.set(new AsyncResponseImpl()));
-    runUnderTrace("independent", () -> {});
-    response.get().invokeSync();
-
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("outer"),
-            span().childOfPrevious().operationName("soap.call")),
-        trace(span().root().operationName("independent")));
-  }
+        // No propagation: the worker's span starts its own trace instead of joining "parent".
+        assertTraces(
+                trace(span().root().operationName("parent")),
+                trace(span().root().operationName("unrelated.work")));
+    }
+
+    @Test
+    void noContextLeakToSubsequentInvocation() throws Exception {
+        runUnderTrace("parent", () -> new AsyncResponseImpl().invoke());
+        // Second invocation runs with no active span: capture is a no-op, so soap.call is its own root.
+        new AsyncResponseImpl().invoke();
+
+        assertTraces(
+                trace(
+                        SORT_BY_START_TIME,
+                        span().root().operationName("parent"),
+                        span().childOfPrevious().operationName("soap.call")),
+                trace(span().root().operationName("soap.call")));
+    }
+
+    @Test
+    void delayedWorkerDoesNotCorruptInterveningTrace() throws Exception {
+        AtomicReference<AsyncResponseImpl> response = new AtomicReference<>();
+
+        runUnderTrace("outer", () -> response.set(new AsyncResponseImpl()));
+        runUnderTrace("independent", () -> {});
+        response.get().invokeSync();
+
+        assertTraces(
+                trace(
+                        SORT_BY_START_TIME,
+                        span().root().operationName("outer"),
+                        span().childOfPrevious().operationName("soap.call")),
+                trace(span().root().operationName("independent")));
+    }
 }
diff --git a/dd-java-agent/instrumentation/guidewire-10.0/src/test/java/gw/internal/xml/ws/AsyncResponseImpl.java b/dd-java-agent/instrumentation/guidewire-10.0/src/test/java/gw/internal/xml/ws/AsyncResponseImpl.java
index b5ff52050f5..3b79cbca296 100644
--- a/dd-java-agent/instrumentation/guidewire-10.0/src/test/java/gw/internal/xml/ws/AsyncResponseImpl.java
+++ b/dd-java-agent/instrumentation/guidewire-10.0/src/test/java/gw/internal/xml/ws/AsyncResponseImpl.java
@@ -8,52 +8,51 @@
  */
 public class AsyncResponseImpl {
 
-  private final Thread thread;
-
-  public AsyncResponseImpl() {
-    this.thread = new WebserviceInvocationThread();
-  }
-
-  // The boolean only distinguishes this overload from the no-arg constructor; its value is unused.
-  private AsyncResponseImpl(boolean anonymous) {
-    this.thread =
-        new Thread() {
-          @Override
-          public void run() {
-            soapCall();
-          }
-        };
-  }
-
-  public static AsyncResponseImpl anonymous() {
-    return new AsyncResponseImpl(true);
-  }
+    private final Thread thread;
 
-  public void invoke() throws InterruptedException {
-    thread.start();
-    thread.join();
-  }
+    public AsyncResponseImpl() {
+        this.thread = new WebserviceInvocationThread();
+    }
 
-  public void invokeSync() {
-    thread.run();
-  }
+    // The boolean only distinguishes this overload from the no-arg constructor; its value is unused.
+    private AsyncResponseImpl(boolean anonymous) {
+        this.thread = new Thread() {
+            @Override
+            public void run() {
+                soapCall();
+            }
+        };
+    }
 
-  @Trace(operationName = "soap.call")
-  static void soapCall() {}
+    public static AsyncResponseImpl anonymous() {
+        return new AsyncResponseImpl(true);
+    }
 
-  // Chained constructor: two <init> frames make capture fire twice, testing the State CAS dedup.
-  public static final class WebserviceInvocationThread extends Thread {
-    public WebserviceInvocationThread() {
-      this("WSI-Invocation");
+    public void invoke() throws InterruptedException {
+        thread.start();
+        thread.join();
     }
 
-    private WebserviceInvocationThread(String name) {
-      super(name);
+    public void invokeSync() {
+        thread.run();
     }
 
-    @Override
-    public void run() {
-      soapCall();
+    @Trace(operationName = "soap.call")
+    static void soapCall() {}
+
+    // Chained constructor: two <init> frames make capture fire twice, testing the State CAS dedup.
+    public static final class WebserviceInvocationThread extends Thread {
+        public WebserviceInvocationThread() {
+            this("WSI-Invocation");
+        }
+
+        private WebserviceInvocationThread(String name) {
+            super(name);
+        }
+
+        @Override
+        public void run() {
+            soapCall();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/guidewire-10.0/src/test/java/gw/internal/xml/ws/UnrelatedWorker.java b/dd-java-agent/instrumentation/guidewire-10.0/src/test/java/gw/internal/xml/ws/UnrelatedWorker.java
index d70037df86a..57992f914d6 100644
--- a/dd-java-agent/instrumentation/guidewire-10.0/src/test/java/gw/internal/xml/ws/UnrelatedWorker.java
+++ b/dd-java-agent/instrumentation/guidewire-10.0/src/test/java/gw/internal/xml/ws/UnrelatedWorker.java
@@ -7,11 +7,11 @@
  */
 public class UnrelatedWorker extends Thread {
 
-  @Override
-  public void run() {
-    unrelatedWork();
-  }
+    @Override
+    public void run() {
+        unrelatedWork();
+    }
 
-  @Trace(operationName = "unrelated.work")
-  static void unrelatedWork() {}
+    @Trace(operationName = "unrelated.work")
+    static void unrelatedWork() {}
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/ClientInvocationInstrumentation.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/ClientInvocationInstrumentation.java
index b3782db915d..2bf958fd27b 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/ClientInvocationInstrumentation.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/ClientInvocationInstrumentation.java
@@ -14,51 +14,48 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
 
-public final class ClientInvocationInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class ClientInvocationInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.hazelcast.client.spi.impl.ClientInvocation";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.hazelcast.client.spi.impl.ClientInvocation";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(0, named("com.hazelcast.client.impl.HazelcastClientInstanceImpl"))),
-        getClass().getName() + "$ConstructAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(0, named("com.hazelcast.client.impl.HazelcastClientInstanceImpl"))),
+                getClass().getName() + "$ConstructAdvice");
+    }
 
-  public static class ConstructAdvice {
+    public static class ConstructAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void constructorExit(
-        @Advice.Argument(0) final HazelcastClientInstanceImpl hazelcastInstance) {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void constructorExit(@Advice.Argument(0) final HazelcastClientInstanceImpl hazelcastInstance) {
 
-      final AgentSpan span = activeSpan();
+            final AgentSpan span = activeSpan();
 
-      if (span != null
-          && hazelcastInstance != null
-          && hazelcastInstance.getLifecycleService() != null
-          && hazelcastInstance.getLifecycleService().isRunning()) {
+            if (span != null
+                    && hazelcastInstance != null
+                    && hazelcastInstance.getLifecycleService() != null
+                    && hazelcastInstance.getLifecycleService().isRunning()) {
 
-        activeSpan().setTag(HAZELCAST_INSTANCE, hazelcastInstance.getName());
-      }
-    }
+                activeSpan().setTag(HAZELCAST_INSTANCE, hazelcastInstance.getName());
+            }
+        }
 
-    public static void muzzleCheck(
-        // Moved in 4.0
-        ClientMapProxy proxy,
+        public static void muzzleCheck(
+                // Moved in 4.0
+                ClientMapProxy proxy,
 
-        // New in 3.6
-        DiscoveryStrategy strategy,
+                // New in 3.6
+                DiscoveryStrategy strategy,
 
-        // Renamed in 3.9
-        ClientNonSmartInvocationServiceImpl invocationService) {
-      strategy.start();
-      proxy.getServiceName();
-      invocationService.start();
+                // Renamed in 3.9
+                ClientNonSmartInvocationServiceImpl invocationService) {
+            strategy.start();
+            proxy.getServiceName();
+            invocationService.start();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectDecorator.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectDecorator.java
index 5deadde66c4..40f81380463 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectDecorator.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectDecorator.java
@@ -20,73 +20,69 @@
 /** Decorate Hazelcast distributed object span's with relevant contextual information. */
 public class DistributedObjectDecorator extends ClientDecorator {
 
-  public static final DistributedObjectDecorator DECORATE = new DistributedObjectDecorator();
-
-  private static final DDCache<Pair<String, String>, String> QUALIFIED_NAME_CACHE =
-      DDCaches.newFixedSizeCache(64);
-
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cache().service(INSTRUMENTATION_NAME);
-
-  private static final Function<Pair<String, String>, String> COMPUTE_QUALIFIED_NAME =
-      // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
-      new Function<Pair<String, String>, String>() {
-        @Override
-        public String apply(Pair<String, String> input) {
-          final String service = input.getLeft();
-          final String objectName = input.getRight();
-
-          final StringBuilder qualifiedName = new StringBuilder();
-          boolean terminateBracket = false;
-
-          if (service != null && service.length() > 15 && service.startsWith("hz:impl:")) {
-            // Transform into just the service qualifiedName
-            qualifiedName.append(
-                service, "hz:impl:".length(), service.length() - "Service".length());
-            qualifiedName.append('[');
-            terminateBracket = true;
-          }
-
-          qualifiedName.append(objectName);
-
-          if (terminateBracket) qualifiedName.append(']');
-
-          return qualifiedName.toString();
-        }
-      };
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.HTTP_CLIENT;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {COMPONENT_NAME.toString()};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  /** Decorate trace based on service execution metadata. */
-  public void onServiceExecution(
-      final AgentSpan span, final DistributedObject object, final String methodName) {
-
-    final String objectName =
-        QUALIFIED_NAME_CACHE.computeIfAbsent(
-            Pair.of(object.getServiceName(), object.getName()), COMPUTE_QUALIFIED_NAME);
-
-    span.setResourceName(UTF8BytesString.create(String.join(".", objectName, methodName)));
-
-    span.setTag(HAZELCAST_SERVICE, object.getServiceName());
-    span.setTag(HAZELCAST_OPERATION, methodName);
-    span.setTag(HAZELCAST_NAME, objectName);
-  }
+    public static final DistributedObjectDecorator DECORATE = new DistributedObjectDecorator();
+
+    private static final DDCache<Pair<String, String>, String> QUALIFIED_NAME_CACHE = DDCaches.newFixedSizeCache(64);
+
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cache().service(INSTRUMENTATION_NAME);
+
+    private static final Function<Pair<String, String>, String> COMPUTE_QUALIFIED_NAME =
+            // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
+            new Function<Pair<String, String>, String>() {
+                @Override
+                public String apply(Pair<String, String> input) {
+                    final String service = input.getLeft();
+                    final String objectName = input.getRight();
+
+                    final StringBuilder qualifiedName = new StringBuilder();
+                    boolean terminateBracket = false;
+
+                    if (service != null && service.length() > 15 && service.startsWith("hz:impl:")) {
+                        // Transform into just the service qualifiedName
+                        qualifiedName.append(service, "hz:impl:".length(), service.length() - "Service".length());
+                        qualifiedName.append('[');
+                        terminateBracket = true;
+                    }
+
+                    qualifiedName.append(objectName);
+
+                    if (terminateBracket) qualifiedName.append(']');
+
+                    return qualifiedName.toString();
+                }
+            };
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.HTTP_CLIENT;
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {COMPONENT_NAME.toString()};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
+
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
+
+    /** Decorate trace based on service execution metadata. */
+    public void onServiceExecution(final AgentSpan span, final DistributedObject object, final String methodName) {
+
+        final String objectName = QUALIFIED_NAME_CACHE.computeIfAbsent(
+                Pair.of(object.getServiceName(), object.getName()), COMPUTE_QUALIFIED_NAME);
+
+        span.setResourceName(UTF8BytesString.create(String.join(".", objectName, methodName)));
+
+        span.setTag(HAZELCAST_SERVICE, object.getServiceName());
+        span.setTag(HAZELCAST_OPERATION, methodName);
+        span.setTag(HAZELCAST_NAME, objectName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java
index c240d2147d7..c11bb87fb64 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java
@@ -24,285 +24,283 @@
 import net.bytebuddy.asm.Advice;
 
 public final class DistributedObjectInstrumentation
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  private static final String PROXY_PACKAGE = "com.hazelcast.client.proxy";
+    private static final String PROXY_PACKAGE = "com.hazelcast.client.proxy";
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      PROXY_PACKAGE + ".ClientMapProxy",
-      PROXY_PACKAGE + ".ClientReplicatedMapProxy",
-      PROXY_PACKAGE + ".ClientQueueProxy",
-      PROXY_PACKAGE + ".ClientTopicProxy",
-      PROXY_PACKAGE + ".ClientReliableTopicProxy",
-      PROXY_PACKAGE + ".ClientSetProxy",
-      PROXY_PACKAGE + ".ClientListProxy",
-      PROXY_PACKAGE + ".ClientMultiMapProxy",
-      PROXY_PACKAGE + ".ClientLockProxy",
-      PROXY_PACKAGE + ".ClientRingbufferProxy",
-      PROXY_PACKAGE + ".ClientExecutorServiceProxy",
-      PROXY_PACKAGE + ".ClientFlakeIdGeneratorProxy",
-      PROXY_PACKAGE + ".ClientIdGeneratorProxy",
-      PROXY_PACKAGE + ".ClientPNCounterProxy",
-      PROXY_PACKAGE + ".ClientCardinalityEstimatorProxy",
-      PROXY_PACKAGE + ".ClientSemaphoreProxy"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            PROXY_PACKAGE + ".ClientMapProxy",
+            PROXY_PACKAGE + ".ClientReplicatedMapProxy",
+            PROXY_PACKAGE + ".ClientQueueProxy",
+            PROXY_PACKAGE + ".ClientTopicProxy",
+            PROXY_PACKAGE + ".ClientReliableTopicProxy",
+            PROXY_PACKAGE + ".ClientSetProxy",
+            PROXY_PACKAGE + ".ClientListProxy",
+            PROXY_PACKAGE + ".ClientMultiMapProxy",
+            PROXY_PACKAGE + ".ClientLockProxy",
+            PROXY_PACKAGE + ".ClientRingbufferProxy",
+            PROXY_PACKAGE + ".ClientExecutorServiceProxy",
+            PROXY_PACKAGE + ".ClientFlakeIdGeneratorProxy",
+            PROXY_PACKAGE + ".ClientIdGeneratorProxy",
+            PROXY_PACKAGE + ".ClientPNCounterProxy",
+            PROXY_PACKAGE + ".ClientCardinalityEstimatorProxy",
+            PROXY_PACKAGE + ".ClientSemaphoreProxy"
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(
-                namedOneOf(
-                    "acquire",
-                    "add",
-                    "addAll",
-                    "addAndGet",
-                    "addIndex",
-                    "aggregate",
-                    "availablePermits",
-                    "awaitTermination",
-                    "capacity",
-                    "clear",
-                    "contains",
-                    "containsAll",
-                    "containsEntry",
-                    "containsKey",
-                    "containsValue",
-                    "decrementAndGet",
-                    "delete",
-                    "drainPermits",
-                    "drainTo",
-                    "element",
-                    "entrySet",
-                    "estimate",
-                    "evict",
-                    "evictAll",
-                    "execute",
-                    "executeOnAllMembers",
-                    "executeOnEntries",
-                    "executeOnKey",
-                    "executeOnKeyOwner",
-                    "executeOnKeys",
-                    "executeOnMember",
-                    "executeOnMembers",
-                    "flush",
-                    "forceUnlock",
-                    "get",
-                    "getAll",
-                    "getAndAdd",
-                    "getAndDecrement",
-                    "getAndIncrement",
-                    "getAndSubtract",
-                    "getEntryView",
-                    "getLocalExecutorStats",
-                    "getLockCount",
-                    "getQueryCache",
-                    "getQueryCacheContext",
-                    "getRemainingLeaseTime",
-                    "headSequence",
-                    "increasePermits",
-                    "incrementAndGet",
-                    "indexOf",
-                    "init",
-                    "invokeAll",
-                    "invokeAny",
-                    "isEmpty",
-                    "isLocked",
-                    "isLockedByCurrentThread",
-                    "isShutdown",
-                    "isTerminated",
-                    "iterator",
-                    "keySet",
-                    "lastIndexOf",
-                    "listIterator",
-                    "loadAll",
-                    "lock",
-                    "newCondition",
-                    "newId",
-                    "offer",
-                    "peek",
-                    "poll",
-                    "project",
-                    "publish",
-                    "put",
-                    "putAll",
-                    "putIfAbsent",
-                    "putTransient",
-                    "readFromEventJournal",
-                    "readOne",
-                    "reducePermits",
-                    "release",
-                    "remainingCapacity",
-                    "remove",
-                    "removeAll",
-                    "replace",
-                    "reset",
-                    "retainAll",
-                    "set",
-                    "setTtl",
-                    "shutdown",
-                    "shutdownNow",
-                    "size",
-                    "subList",
-                    "submitToKey",
-                    "submitToKeys",
-                    "subscribeToEventJournal",
-                    "subtractAndGet",
-                    "tailSequence",
-                    "take",
-                    "toArray",
-                    "tryAcquire",
-                    "tryLock",
-                    "tryPut",
-                    "tryRemove",
-                    "unlock",
-                    "valueCount",
-                    "values")),
-        getClass().getName() + "$SyncAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(namedOneOf(
+                                "acquire",
+                                "add",
+                                "addAll",
+                                "addAndGet",
+                                "addIndex",
+                                "aggregate",
+                                "availablePermits",
+                                "awaitTermination",
+                                "capacity",
+                                "clear",
+                                "contains",
+                                "containsAll",
+                                "containsEntry",
+                                "containsKey",
+                                "containsValue",
+                                "decrementAndGet",
+                                "delete",
+                                "drainPermits",
+                                "drainTo",
+                                "element",
+                                "entrySet",
+                                "estimate",
+                                "evict",
+                                "evictAll",
+                                "execute",
+                                "executeOnAllMembers",
+                                "executeOnEntries",
+                                "executeOnKey",
+                                "executeOnKeyOwner",
+                                "executeOnKeys",
+                                "executeOnMember",
+                                "executeOnMembers",
+                                "flush",
+                                "forceUnlock",
+                                "get",
+                                "getAll",
+                                "getAndAdd",
+                                "getAndDecrement",
+                                "getAndIncrement",
+                                "getAndSubtract",
+                                "getEntryView",
+                                "getLocalExecutorStats",
+                                "getLockCount",
+                                "getQueryCache",
+                                "getQueryCacheContext",
+                                "getRemainingLeaseTime",
+                                "headSequence",
+                                "increasePermits",
+                                "incrementAndGet",
+                                "indexOf",
+                                "init",
+                                "invokeAll",
+                                "invokeAny",
+                                "isEmpty",
+                                "isLocked",
+                                "isLockedByCurrentThread",
+                                "isShutdown",
+                                "isTerminated",
+                                "iterator",
+                                "keySet",
+                                "lastIndexOf",
+                                "listIterator",
+                                "loadAll",
+                                "lock",
+                                "newCondition",
+                                "newId",
+                                "offer",
+                                "peek",
+                                "poll",
+                                "project",
+                                "publish",
+                                "put",
+                                "putAll",
+                                "putIfAbsent",
+                                "putTransient",
+                                "readFromEventJournal",
+                                "readOne",
+                                "reducePermits",
+                                "release",
+                                "remainingCapacity",
+                                "remove",
+                                "removeAll",
+                                "replace",
+                                "reset",
+                                "retainAll",
+                                "set",
+                                "setTtl",
+                                "shutdown",
+                                "shutdownNow",
+                                "size",
+                                "subList",
+                                "submitToKey",
+                                "submitToKeys",
+                                "subscribeToEventJournal",
+                                "subtractAndGet",
+                                "tailSequence",
+                                "take",
+                                "toArray",
+                                "tryAcquire",
+                                "tryLock",
+                                "tryPut",
+                                "tryRemove",
+                                "unlock",
+                                "valueCount",
+                                "values")),
+                getClass().getName() + "$SyncAdvice");
 
-    // Async
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(
-                namedOneOf(
-                    "addAllAsync",
-                    "addAsync",
-                    "estimateAsync",
-                    "getAsync",
-                    "putAsync",
-                    "readManyAsync",
-                    "removeAsync",
-                    "setAsync"))
-            .and(returns(NameMatchers.named("com.hazelcast.core.ICompletableFuture"))),
-        getClass().getName() + "$CompletableFutureAdvice");
-  }
+        // Async
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(namedOneOf(
+                                "addAllAsync",
+                                "addAsync",
+                                "estimateAsync",
+                                "getAsync",
+                                "putAsync",
+                                "readManyAsync",
+                                "removeAsync",
+                                "setAsync"))
+                        .and(returns(NameMatchers.named("com.hazelcast.core.ICompletableFuture"))),
+                getClass().getName() + "$CompletableFutureAdvice");
+    }
 
-  /** Advice for instrumenting distributed object client proxy classes. */
-  public static class SyncAdvice {
+    /** Advice for instrumenting distributed object client proxy classes. */
+    public static class SyncAdvice {
 
-    /** Method entry instrumentation. */
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.This final DistributedObject that, @Advice.Origin("#m") final String methodName) {
+        /** Method entry instrumentation. */
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.This final DistributedObject that, @Advice.Origin("#m") final String methodName) {
 
-      // Ensure that we only create a span for the top-level Hazelcast method; except in the
-      // case of async operations where we want visibility into how long the task was delayed from
-      // starting. Our call depth checker does not span threads, so the async case is handled
-      // automatically for us.
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(DistributedObject.class);
-      if (callDepth > 0) {
-        return null;
-      }
+            // Ensure that we only create a span for the top-level Hazelcast method; except in the
+            // case of async operations where we want visibility into how long the task was delayed from
+            // starting. Our call depth checker does not span threads, so the async case is handled
+            // automatically for us.
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(DistributedObject.class);
+            if (callDepth > 0) {
+                return null;
+            }
 
-      final AgentSpan span = startSpan(COMPONENT_NAME.toString(), SPAN_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onServiceExecution(span, that, methodName);
+            final AgentSpan span = startSpan(COMPONENT_NAME.toString(), SPAN_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onServiceExecution(span, that, methodName);
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    /** Method exit instrumentation. */
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
+        /** Method exit instrumentation. */
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
 
-      // If we have a scope (i.e. we were the top-level Hazelcast SDK invocation),
-      final AgentSpan span = spanFromScope(scope);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
-      CallDepthThreadLocalMap.reset(DistributedObject.class); // reset call depth count
-    }
+            // If we have a scope (i.e. we were the top-level Hazelcast SDK invocation),
+            final AgentSpan span = spanFromScope(scope);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+            CallDepthThreadLocalMap.reset(DistributedObject.class); // reset call depth count
+        }
 
-    public static void muzzleCheck(
-        // Moved in 4.0
-        ClientMapProxy proxy,
+        public static void muzzleCheck(
+                // Moved in 4.0
+                ClientMapProxy proxy,
 
-        // New in 3.6
-        DiscoveryStrategy strategy,
+                // New in 3.6
+                DiscoveryStrategy strategy,
 
-        // Renamed in 3.9
-        ClientNonSmartInvocationServiceImpl invocationService) {
-      strategy.start();
-      proxy.getServiceName();
-      invocationService.start();
+                // Renamed in 3.9
+                ClientNonSmartInvocationServiceImpl invocationService) {
+            strategy.start();
+            proxy.getServiceName();
+            invocationService.start();
+        }
     }
-  }
 
-  /** Advice for instrumenting distributed object client proxy classes. */
-  public static class CompletableFutureAdvice {
+    /** Advice for instrumenting distributed object client proxy classes. */
+    public static class CompletableFutureAdvice {
 
-    /** Method entry instrumentation. */
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.This final DistributedObject that, @Advice.Origin("#m") final String methodName) {
+        /** Method entry instrumentation. */
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.This final DistributedObject that, @Advice.Origin("#m") final String methodName) {
 
-      // Ensure that we only create a span for the top-level Hazelcast method; except in the
-      // case of async operations where we want visibility into how long the task was delayed from
-      // starting. Our call depth checker does not span threads, so the async case is handled
-      // automatically for us.
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(DistributedObject.class);
-      if (callDepth > 0) {
-        return null;
-      }
+            // Ensure that we only create a span for the top-level Hazelcast method; except in the
+            // case of async operations where we want visibility into how long the task was delayed from
+            // starting. Our call depth checker does not span threads, so the async case is handled
+            // automatically for us.
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(DistributedObject.class);
+            if (callDepth > 0) {
+                return null;
+            }
 
-      final AgentSpan span = startSpan(COMPONENT_NAME.toString(), SPAN_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onServiceExecution(span, that, methodName);
+            final AgentSpan span = startSpan(COMPONENT_NAME.toString(), SPAN_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onServiceExecution(span, that, methodName);
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    /** Method exit instrumentation. */
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return final ICompletableFuture<?> future) {
-      if (scope == null) {
-        return;
-      }
+        /** Method exit instrumentation. */
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return final ICompletableFuture<?> future) {
+            if (scope == null) {
+                return;
+            }
 
-      // If we have a scope (i.e. we were the top-level Hazelcast SDK invocation),
-      final AgentSpan span = spanFromScope(scope);
-      if (throwable != null) {
-        // There was a synchronous error,
-        // which means we shouldn't wait for a callback to close the span.
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        future.andThen(new SpanFinishingExecutionCallback(span));
-        scope.close();
-      }
-      CallDepthThreadLocalMap.reset(DistributedObject.class); // reset call depth count
-    }
+            // If we have a scope (i.e. we were the top-level Hazelcast SDK invocation),
+            final AgentSpan span = spanFromScope(scope);
+            if (throwable != null) {
+                // There was a synchronous error,
+                // which means we shouldn't wait for a callback to close the span.
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                future.andThen(new SpanFinishingExecutionCallback(span));
+                scope.close();
+            }
+            CallDepthThreadLocalMap.reset(DistributedObject.class); // reset call depth count
+        }
 
-    public static void muzzleCheck(
-        // Moved in 4.0
-        ClientMapProxy proxy,
+        public static void muzzleCheck(
+                // Moved in 4.0
+                ClientMapProxy proxy,
 
-        // New in 3.6
-        DiscoveryStrategy strategy,
+                // New in 3.6
+                DiscoveryStrategy strategy,
 
-        // Renamed in 3.9
-        ClientNonSmartInvocationServiceImpl invocationService,
+                // Renamed in 3.9
+                ClientNonSmartInvocationServiceImpl invocationService,
 
-        // Required for async instrumentation
-        ICompletableFuture future) {
-      strategy.start();
-      proxy.getServiceName();
-      invocationService.start();
+                // Required for async instrumentation
+                ICompletableFuture future) {
+            strategy.start();
+            proxy.getServiceName();
+            invocationService.start();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/HazelcastConstants.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/HazelcastConstants.java
index 12adc01646f..eaede932c41 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/HazelcastConstants.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/HazelcastConstants.java
@@ -6,14 +6,13 @@
 /** Holder for constant values shared across the instrumentation versions. */
 public class HazelcastConstants {
 
-  public static final String INSTRUMENTATION_NAME = "hazelcast";
-  public static final String HAZELCAST_SERVICE = "hazelcast.service";
-  public static final String HAZELCAST_NAME = "hazelcast.name";
-  public static final String HAZELCAST_OPERATION = "hazelcast.operation";
-  public static final String HAZELCAST_INSTANCE = "hazelcast.instance";
+    public static final String INSTRUMENTATION_NAME = "hazelcast";
+    public static final String HAZELCAST_SERVICE = "hazelcast.service";
+    public static final String HAZELCAST_NAME = "hazelcast.name";
+    public static final String HAZELCAST_OPERATION = "hazelcast.operation";
+    public static final String HAZELCAST_INSTANCE = "hazelcast.instance";
 
-  public static final CharSequence SPAN_NAME =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().cache().operation(INSTRUMENTATION_NAME));
-  public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("hazelcast-sdk");
+    public static final CharSequence SPAN_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation(INSTRUMENTATION_NAME));
+    public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("hazelcast-sdk");
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/HazelcastLegacyModule.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/HazelcastLegacyModule.java
index 08432142772..ec496aa732d 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/HazelcastLegacyModule.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/HazelcastLegacyModule.java
@@ -14,18 +14,17 @@
 @AutoService(InstrumenterModule.class)
 public final class HazelcastLegacyModule extends InstrumenterModule.Tracing {
 
-  public HazelcastLegacyModule() {
-    super("hazelcast_legacy");
-  }
+    public HazelcastLegacyModule() {
+        super("hazelcast_legacy");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return false;
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new ClientInvocationInstrumentation(), new DistributedObjectInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(new ClientInvocationInstrumentation(), new DistributedObjectInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/SpanFinishingExecutionCallback.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/SpanFinishingExecutionCallback.java
index 337e044089d..e0696b58de5 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/SpanFinishingExecutionCallback.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/SpanFinishingExecutionCallback.java
@@ -7,23 +7,23 @@
 
 public class SpanFinishingExecutionCallback<V> implements ExecutionCallback<V> {
 
-  /** Span that we should finish and annotate when the future is complete. */
-  private final AgentSpan span;
+    /** Span that we should finish and annotate when the future is complete. */
+    private final AgentSpan span;
 
-  public SpanFinishingExecutionCallback(final AgentSpan span) {
-    this.span = span;
-  }
+    public SpanFinishingExecutionCallback(final AgentSpan span) {
+        this.span = span;
+    }
 
-  @Override
-  public void onResponse(V response) {
-    DECORATE.beforeFinish(span);
-    span.finish();
-  }
+    @Override
+    public void onResponse(V response) {
+        DECORATE.beforeFinish(span);
+        span.finish();
+    }
 
-  @Override
-  public void onFailure(final Throwable t) {
-    DECORATE.onError(span, t);
-    DECORATE.beforeFinish(span);
-    span.finish();
-  }
+    @Override
+    public void onFailure(final Throwable t) {
+        DECORATE.onError(span, t);
+        DECORATE.beforeFinish(span);
+        span.finish();
+    }
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationDecorator.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationDecorator.java
index b038ccb22c2..46b0fe67858 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationDecorator.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationDecorator.java
@@ -17,54 +17,51 @@
 /** Decorate Hazelcast client invocations with relevant contextual information. */
 public class ClientInvocationDecorator extends ClientDecorator {
 
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cache().service(INSTRUMENTATION_NAME);
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cache().service(INSTRUMENTATION_NAME);
 
-  public static final ClientInvocationDecorator DECORATE = new ClientInvocationDecorator();
+    public static final ClientInvocationDecorator DECORATE = new ClientInvocationDecorator();
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.HTTP_CLIENT;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.HTTP_CLIENT;
+    }
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {COMPONENT_NAME.toString()};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {COMPONENT_NAME.toString()};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
 
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
 
-  /** Decorate trace based on service execution metadata. */
-  public void onServiceExecution(
-      final AgentSpan span,
-      final String operationName,
-      final String objectName,
-      long correlationId) {
+    /** Decorate trace based on service execution metadata. */
+    public void onServiceExecution(
+            final AgentSpan span, final String operationName, final String objectName, long correlationId) {
 
-    if (objectName != null) {
-      span.setResourceName(UTF8BytesString.create(String.join(" ", operationName, objectName)));
-      span.setTag(HAZELCAST_NAME, objectName);
-    } else {
-      span.setResourceName(UTF8BytesString.create(operationName));
-    }
+        if (objectName != null) {
+            span.setResourceName(UTF8BytesString.create(String.join(" ", operationName, objectName)));
+            span.setTag(HAZELCAST_NAME, objectName);
+        } else {
+            span.setResourceName(UTF8BytesString.create(operationName));
+        }
 
-    span.setTag(HAZELCAST_OPERATION, operationName);
-    span.setTag(HAZELCAST_SERVICE, operationName.substring(0, operationName.indexOf('.')));
+        span.setTag(HAZELCAST_OPERATION, operationName);
+        span.setTag(HAZELCAST_SERVICE, operationName.substring(0, operationName.indexOf('.')));
 
-    if (correlationId > 0) {
-      span.setTag(HAZELCAST_CORRELATION_ID, correlationId);
+        if (correlationId > 0) {
+            span.setTag(HAZELCAST_CORRELATION_ID, correlationId);
+        }
     }
-  }
 
-  public void onHazelcastInstance(final AgentSpan span, String instanceName) {
-    span.setTag(HAZELCAST_INSTANCE, instanceName);
-  }
+    public void onHazelcastInstance(final AgentSpan span, String instanceName) {
+        span.setTag(HAZELCAST_INSTANCE, instanceName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java
index 8de87678326..8109716ac2c 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java
@@ -25,120 +25,117 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
 
-public final class ClientInvocationInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  @Override
-  public String instrumentedType() {
-    return "com.hazelcast.client.spi.impl.ClientInvocation";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("invokeOnSelection")), getClass().getName() + "$InvocationAdvice");
-    transformer.applyAdvice(
-        isConstructor()
-            .and(
-                takesArgument(
-                    0,
-                    namedOneOf(
-                        "com.hazelcast.client.impl.HazelcastClientInstanceImpl",
-                        "com.hazelcast.client.impl.clientside.HazelcastClientInstanceImpl"))),
-        getClass().getName() + "$ConstructAdvice");
-  }
-
-  /** Advice for instrumenting distributed object client proxy classes. */
-  public static class InvocationAdvice {
-
-    /** Method entry instrumentation. */
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.This final ClientInvocation that,
-        @Advice.FieldValue("objectName") final String objectName,
-        @Advice.FieldValue("clientMessage") final ClientMessage clientMessage) {
-
-      final String operationName =
-          InstrumentationContext.get(ClientMessage.class, String.class).get(clientMessage);
-
-      // Ensure that we only create a span for the top-level Hazelcast method; except in the
-      // case of async operations where we want visibility into how long the task was delayed from
-      // starting. Our call depth checker does not span threads, so the async case is handled
-      // automatically for us.
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(ClientInvocation.class);
-      if (callDepth > 0) {
-        return null;
-      }
-
-      final AgentSpan span = startSpan(COMPONENT_NAME.toString(), SPAN_NAME);
-      DECORATE.onHazelcastInstance(
-          span, InstrumentationContext.get(ClientInvocation.class, String.class).get(that));
-      DECORATE.afterStart(span);
-      DECORATE.onServiceExecution(
-          span, operationName, objectName, clientMessage.getCorrelationId());
-
-      return activateSpan(span);
-    }
+public final class ClientInvocationInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-    /** Method exit instrumentation. */
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.FieldValue("clientInvocationFuture") final ClientInvocationFuture future) {
-      if (scope == null) {
-        return;
-      }
-
-      // If we have a scope (i.e. we were the top-level Hazelcast SDK invocation),
-      final AgentSpan span = spanFromScope(scope);
-      if (throwable != null) {
-        // There was a synchronous error,
-        // which means we shouldn't wait for a callback to close the span.
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        future.andThen(new SpanFinishingExecutionCallback(span));
-        scope.close();
-      }
-      CallDepthThreadLocalMap.reset(ClientInvocation.class); // reset call depth count
+    @Override
+    public String instrumentedType() {
+        return "com.hazelcast.client.spi.impl.ClientInvocation";
     }
 
-    public static void muzzleCheck(
-        // Moved in 4.0
-        ClientMapProxy proxy,
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("invokeOnSelection")), getClass().getName() + "$InvocationAdvice");
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(
+                                0,
+                                namedOneOf(
+                                        "com.hazelcast.client.impl.HazelcastClientInstanceImpl",
+                                        "com.hazelcast.client.impl.clientside.HazelcastClientInstanceImpl"))),
+                getClass().getName() + "$ConstructAdvice");
+    }
 
-        // Renamed in 3.9
-        NonSmartClientInvocationService invocationService) {
-      proxy.getServiceName();
-      invocationService.start();
+    /** Advice for instrumenting distributed object client proxy classes. */
+    public static class InvocationAdvice {
+
+        /** Method entry instrumentation. */
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.This final ClientInvocation that,
+                @Advice.FieldValue("objectName") final String objectName,
+                @Advice.FieldValue("clientMessage") final ClientMessage clientMessage) {
+
+            final String operationName = InstrumentationContext.get(ClientMessage.class, String.class)
+                    .get(clientMessage);
+
+            // Ensure that we only create a span for the top-level Hazelcast method; except in the
+            // case of async operations where we want visibility into how long the task was delayed from
+            // starting. Our call depth checker does not span threads, so the async case is handled
+            // automatically for us.
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(ClientInvocation.class);
+            if (callDepth > 0) {
+                return null;
+            }
+
+            final AgentSpan span = startSpan(COMPONENT_NAME.toString(), SPAN_NAME);
+            DECORATE.onHazelcastInstance(
+                    span,
+                    InstrumentationContext.get(ClientInvocation.class, String.class)
+                            .get(that));
+            DECORATE.afterStart(span);
+            DECORATE.onServiceExecution(span, operationName, objectName, clientMessage.getCorrelationId());
+
+            return activateSpan(span);
+        }
+
+        /** Method exit instrumentation. */
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.FieldValue("clientInvocationFuture") final ClientInvocationFuture future) {
+            if (scope == null) {
+                return;
+            }
+
+            // If we have a scope (i.e. we were the top-level Hazelcast SDK invocation),
+            final AgentSpan span = spanFromScope(scope);
+            if (throwable != null) {
+                // There was a synchronous error,
+                // which means we shouldn't wait for a callback to close the span.
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                future.andThen(new SpanFinishingExecutionCallback(span));
+                scope.close();
+            }
+            CallDepthThreadLocalMap.reset(ClientInvocation.class); // reset call depth count
+        }
+
+        public static void muzzleCheck(
+                // Moved in 4.0
+                ClientMapProxy proxy,
+
+                // Renamed in 3.9
+                NonSmartClientInvocationService invocationService) {
+            proxy.getServiceName();
+            invocationService.start();
+        }
     }
-  }
 
-  public static class ConstructAdvice {
+    public static class ConstructAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void constructorExit(
-        @Advice.This ClientInvocation that,
-        @Advice.Argument(0) final HazelcastInstance hazelcastInstance) {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void constructorExit(
+                @Advice.This ClientInvocation that, @Advice.Argument(0) final HazelcastInstance hazelcastInstance) {
 
-      if (hazelcastInstance.getLifecycleService() != null
-          && hazelcastInstance.getLifecycleService().isRunning()) {
-        InstrumentationContext.get(ClientInvocation.class, String.class)
-            .put(that, hazelcastInstance.getName());
-      }
-    }
+            if (hazelcastInstance.getLifecycleService() != null
+                    && hazelcastInstance.getLifecycleService().isRunning()) {
+                InstrumentationContext.get(ClientInvocation.class, String.class).put(that, hazelcastInstance.getName());
+            }
+        }
 
-    public static void muzzleCheck(
-        // Moved in 4.0
-        ClientMapProxy proxy,
+        public static void muzzleCheck(
+                // Moved in 4.0
+                ClientMapProxy proxy,
 
-        // Renamed in 3.9
-        NonSmartClientInvocationService invocationService) {
-      proxy.getServiceName();
-      invocationService.start();
+                // Renamed in 3.9
+                NonSmartClientInvocationService invocationService) {
+            proxy.getServiceName();
+            invocationService.start();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientMessageInstrumentation.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientMessageInstrumentation.java
index b0a5cd3f89e..51449f34868 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientMessageInstrumentation.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientMessageInstrumentation.java
@@ -17,40 +17,37 @@
  *
  * <p>It is required because there is no getter for this value until 4.0.
  */
-public final class ClientMessageInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  @Override
-  public String instrumentedType() {
-    return "com.hazelcast.client.impl.protocol.ClientMessage";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("setOperationName"))
-            .and(takesArgument(0, named(String.class.getName()))),
-        getClass().getName() + "$OperationCapturingAdvice");
-  }
-
-  public static class OperationCapturingAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
-        @Advice.This ClientMessage that, @Advice.Argument(0) final String operationName) {
-
-      InstrumentationContext.get(ClientMessage.class, String.class).put(that, operationName);
+public final class ClientMessageInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    @Override
+    public String instrumentedType() {
+        return "com.hazelcast.client.impl.protocol.ClientMessage";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("setOperationName")).and(takesArgument(0, named(String.class.getName()))),
+                getClass().getName() + "$OperationCapturingAdvice");
     }
 
-    public static void muzzleCheck(
-        // Moved in 4.0
-        ClientMapProxy proxy,
+    public static class OperationCapturingAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter(
+                @Advice.This ClientMessage that, @Advice.Argument(0) final String operationName) {
+
+            InstrumentationContext.get(ClientMessage.class, String.class).put(that, operationName);
+        }
+
+        public static void muzzleCheck(
+                // Moved in 4.0
+                ClientMapProxy proxy,
 
-        // Renamed in 3.9
-        NonSmartClientInvocationService invocationService) {
-      proxy.getServiceName();
-      invocationService.start();
+                // Renamed in 3.9
+                NonSmartClientInvocationService invocationService) {
+            proxy.getServiceName();
+            invocationService.start();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/HazelcastConstants.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/HazelcastConstants.java
index 4b128dd3bfd..099bcd319a9 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/HazelcastConstants.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/HazelcastConstants.java
@@ -6,18 +6,17 @@
 /** Holder for constant values shared across the instrumentation versions. */
 public class HazelcastConstants {
 
-  public static final String INSTRUMENTATION_NAME = "hazelcast";
+    public static final String INSTRUMENTATION_NAME = "hazelcast";
 
-  public static final boolean DEFAULT_ENABLED = false;
+    public static final boolean DEFAULT_ENABLED = false;
 
-  public static final String HAZELCAST_SERVICE = "hazelcast.service";
-  public static final String HAZELCAST_NAME = "hazelcast.name";
-  public static final String HAZELCAST_OPERATION = "hazelcast.operation";
-  public static final String HAZELCAST_INSTANCE = "hazelcast.instance";
-  public static final String HAZELCAST_CORRELATION_ID = "hazelcast.correlationId";
+    public static final String HAZELCAST_SERVICE = "hazelcast.service";
+    public static final String HAZELCAST_NAME = "hazelcast.name";
+    public static final String HAZELCAST_OPERATION = "hazelcast.operation";
+    public static final String HAZELCAST_INSTANCE = "hazelcast.instance";
+    public static final String HAZELCAST_CORRELATION_ID = "hazelcast.correlationId";
 
-  public static final CharSequence SPAN_NAME =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().cache().operation(INSTRUMENTATION_NAME));
-  public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("hazelcast-sdk");
+    public static final CharSequence SPAN_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation(INSTRUMENTATION_NAME));
+    public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("hazelcast-sdk");
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/HazelcastModule.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/HazelcastModule.java
index df520fde910..432b8b76580 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/HazelcastModule.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/HazelcastModule.java
@@ -19,25 +19,25 @@
 @AutoService(InstrumenterModule.class)
 public final class HazelcastModule extends InstrumenterModule.Tracing {
 
-  public HazelcastModule() {
-    super(INSTRUMENTATION_NAME);
-  }
+    public HazelcastModule() {
+        super(INSTRUMENTATION_NAME);
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return DEFAULT_ENABLED;
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return DEFAULT_ENABLED;
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    final Map<String, String> stores = new HashMap<>();
-    stores.put("com.hazelcast.client.impl.protocol.ClientMessage", String.class.getName());
-    stores.put("com.hazelcast.client.spi.impl.ClientInvocation", String.class.getName());
-    return stores;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        final Map<String, String> stores = new HashMap<>();
+        stores.put("com.hazelcast.client.impl.protocol.ClientMessage", String.class.getName());
+        stores.put("com.hazelcast.client.spi.impl.ClientInvocation", String.class.getName());
+        return stores;
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(new ClientInvocationInstrumentation(), new ClientMessageInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(new ClientInvocationInstrumentation(), new ClientMessageInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/SpanFinishingExecutionCallback.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/SpanFinishingExecutionCallback.java
index 6d5547f9c38..bedb87f10ea 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/SpanFinishingExecutionCallback.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/SpanFinishingExecutionCallback.java
@@ -7,23 +7,23 @@
 
 public class SpanFinishingExecutionCallback<V> implements ExecutionCallback<V> {
 
-  /** Span that we should finish and annotate when the future is complete. */
-  private final AgentSpan span;
+    /** Span that we should finish and annotate when the future is complete. */
+    private final AgentSpan span;
 
-  public SpanFinishingExecutionCallback(final AgentSpan span) {
-    this.span = span;
-  }
+    public SpanFinishingExecutionCallback(final AgentSpan span) {
+        this.span = span;
+    }
 
-  @Override
-  public void onResponse(V response) {
-    DECORATE.beforeFinish(span);
-    span.finish();
-  }
+    @Override
+    public void onResponse(V response) {
+        DECORATE.beforeFinish(span);
+        span.finish();
+    }
 
-  @Override
-  public void onFailure(final Throwable t) {
-    DECORATE.onError(span, t);
-    DECORATE.beforeFinish(span);
-    span.finish();
-  }
+    @Override
+    public void onFailure(final Throwable t) {
+        DECORATE.onError(span, t);
+        DECORATE.beforeFinish(span);
+        span.finish();
+    }
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientInvocationInstrumentation.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientInvocationInstrumentation.java
index 01135b2cc57..d74bce7f3e6 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientInvocationInstrumentation.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientInvocationInstrumentation.java
@@ -12,48 +12,46 @@
 import datadog.trace.bootstrap.InstrumentationContext;
 import net.bytebuddy.asm.Advice;
 
-public final class ClientInvocationInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  @Override
-  public String instrumentedType() {
-    return "com.hazelcast.client.impl.spi.impl.ClientInvocation";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("invokeOnSelection")),
-        "datadog.trace.instrumentation.hazelcast4.InvocationAdvice");
-    transformer.applyAdvice(
-        isConstructor()
-            .and(
-                takesArgument(
-                    0, named("com.hazelcast.client.impl.clientside.HazelcastClientInstanceImpl"))),
-        getClass().getName() + "$ConstructAdvice");
-  }
-
-  public static class ConstructAdvice {
-
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void constructorExit(
-        @Advice.This ClientInvocation that,
-        @Advice.Argument(0) final HazelcastClientInstanceImpl hazelcastInstance) {
-
-      if (hazelcastInstance != null) {
-        hazelcastInstance.getLifecycleService();
-        if (hazelcastInstance.getLifecycleService().isRunning()) {
-
-          InstrumentationContext.get(ClientInvocation.class, String.class)
-              .put(that, hazelcastInstance.getName());
-        }
-      }
+public final class ClientInvocationInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    @Override
+    public String instrumentedType() {
+        return "com.hazelcast.client.impl.spi.impl.ClientInvocation";
     }
 
-    public static void muzzleCheck(
-        // Moved in 4.0
-        ClientMapProxy proxy) {
-      proxy.getServiceName();
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("invokeOnSelection")),
+                "datadog.trace.instrumentation.hazelcast4.InvocationAdvice");
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(
+                                0, named("com.hazelcast.client.impl.clientside.HazelcastClientInstanceImpl"))),
+                getClass().getName() + "$ConstructAdvice");
+    }
+
+    public static class ConstructAdvice {
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void constructorExit(
+                @Advice.This ClientInvocation that,
+                @Advice.Argument(0) final HazelcastClientInstanceImpl hazelcastInstance) {
+
+            if (hazelcastInstance != null) {
+                hazelcastInstance.getLifecycleService();
+                if (hazelcastInstance.getLifecycleService().isRunning()) {
+
+                    InstrumentationContext.get(ClientInvocation.class, String.class)
+                            .put(that, hazelcastInstance.getName());
+                }
+            }
+        }
+
+        public static void muzzleCheck(
+                // Moved in 4.0
+                ClientMapProxy proxy) {
+            proxy.getServiceName();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java
index 755b4c2accd..a389332c9af 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java
@@ -20,75 +20,71 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
 
-public final class ClientListenerInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class ClientListenerInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.hazelcast.client.impl.spi.impl.listener.ClientListenerServiceImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.hazelcast.client.impl.spi.impl.listener.ClientListenerServiceImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("handleEventMessageOnCallingThread"))
-            .and(takesArgument(0, named("com.hazelcast.client.impl.protocol.ClientMessage"))),
-        getClass().getName() + "$ListenerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("handleEventMessageOnCallingThread"))
+                        .and(takesArgument(0, named("com.hazelcast.client.impl.protocol.ClientMessage"))),
+                getClass().getName() + "$ListenerAdvice");
+    }
 
-  /** Advice for instrumenting distributed object client proxy classes. */
-  public static class ListenerAdvice {
+    /** Advice for instrumenting distributed object client proxy classes. */
+    public static class ListenerAdvice {
 
-    /** Method entry instrumentation. */
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.This final ClientListenerService that,
-        @Advice.Argument(0) final ClientMessage clientMessage) {
+        /** Method entry instrumentation. */
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.This final ClientListenerService that, @Advice.Argument(0) final ClientMessage clientMessage) {
 
-      final String operationName =
-          clientMessage.getOperationName() != null
-              ? clientMessage.getOperationName()
-              : "Event.Handle";
-      long correlationId = clientMessage.getCorrelationId();
+            final String operationName =
+                    clientMessage.getOperationName() != null ? clientMessage.getOperationName() : "Event.Handle";
+            long correlationId = clientMessage.getCorrelationId();
 
-      // Ensure that we only create a span for the top-level Hazelcast method; except in the
-      // case of async operations where we want visibility into how long the task was delayed from
-      // starting. Our call depth checker does not span threads, so the async case is handled
-      // automatically for us.
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(ClientListener.class);
-      if (callDepth > 0) {
-        return null;
-      }
+            // Ensure that we only create a span for the top-level Hazelcast method; except in the
+            // case of async operations where we want visibility into how long the task was delayed from
+            // starting. Our call depth checker does not span threads, so the async case is handled
+            // automatically for us.
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(ClientListener.class);
+            if (callDepth > 0) {
+                return null;
+            }
 
-      final AgentSpan span = startSpan(COMPONENT_NAME.toString(), SPAN_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onServiceExecution(span, operationName, null, correlationId);
+            final AgentSpan span = startSpan(COMPONENT_NAME.toString(), SPAN_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onServiceExecution(span, operationName, null, correlationId);
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    /** Method exit instrumentation. */
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
+        /** Method exit instrumentation. */
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
 
-      // If we have a scope (i.e. we were the top-level Hazelcast SDK invocation),
-      final AgentSpan span = spanFromScope(scope);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
-      CallDepthThreadLocalMap.reset(ClientListener.class); // reset call depth count
-    }
+            // If we have a scope (i.e. we were the top-level Hazelcast SDK invocation),
+            final AgentSpan span = spanFromScope(scope);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+            CallDepthThreadLocalMap.reset(ClientListener.class); // reset call depth count
+        }
 
-    public static void muzzleCheck(
-        // Moved in 4.0
-        ClientMapProxy proxy) {
-      proxy.getServiceName();
+        public static void muzzleCheck(
+                // Moved in 4.0
+                ClientMapProxy proxy) {
+            proxy.getServiceName();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastConstants.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastConstants.java
index 6c9cbb7b646..638fe12b017 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastConstants.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastConstants.java
@@ -6,18 +6,17 @@
 /** Holder for constant values shared across the instrumentation versions. */
 public class HazelcastConstants {
 
-  public static final String INSTRUMENTATION_NAME = "hazelcast";
+    public static final String INSTRUMENTATION_NAME = "hazelcast";
 
-  public static final boolean DEFAULT_ENABLED = false;
+    public static final boolean DEFAULT_ENABLED = false;
 
-  public static final String HAZELCAST_SERVICE = "hazelcast.service";
-  public static final String HAZELCAST_NAME = "hazelcast.name";
-  public static final String HAZELCAST_OPERATION = "hazelcast.operation";
-  public static final String HAZELCAST_INSTANCE = "hazelcast.instance";
-  public static final String HAZELCAST_CORRELATION_ID = "hazelcast.correlationId";
+    public static final String HAZELCAST_SERVICE = "hazelcast.service";
+    public static final String HAZELCAST_NAME = "hazelcast.name";
+    public static final String HAZELCAST_OPERATION = "hazelcast.operation";
+    public static final String HAZELCAST_INSTANCE = "hazelcast.instance";
+    public static final String HAZELCAST_CORRELATION_ID = "hazelcast.correlationId";
 
-  public static final CharSequence SPAN_NAME =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().cache().operation(INSTRUMENTATION_NAME));
-  public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("hazelcast-sdk");
+    public static final CharSequence SPAN_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation(INSTRUMENTATION_NAME));
+    public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("hazelcast-sdk");
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastDecorator.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastDecorator.java
index 86dfab1731a..680469eb7aa 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastDecorator.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastDecorator.java
@@ -16,51 +16,47 @@
 /** Decorate Hazelcast distributed object span's with relevant contextual information. */
 public class HazelcastDecorator extends ClientDecorator {
 
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cache().service(INSTRUMENTATION_NAME);
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cache().service(INSTRUMENTATION_NAME);
 
-  public static final HazelcastDecorator DECORATE = new HazelcastDecorator();
+    public static final HazelcastDecorator DECORATE = new HazelcastDecorator();
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.HTTP_CLIENT;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.HTTP_CLIENT;
+    }
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {COMPONENT_NAME.toString()};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {COMPONENT_NAME.toString()};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
 
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
 
-  /** Decorate trace based on service execution metadata. */
-  public void onServiceExecution(
-      final AgentSpan span,
-      final String operationName,
-      final Object objectName,
-      long correlationId) {
+    /** Decorate trace based on service execution metadata. */
+    public void onServiceExecution(
+            final AgentSpan span, final String operationName, final Object objectName, long correlationId) {
 
-    if (objectName != null) {
-      span.setResourceName(
-          UTF8BytesString.create(String.join(" ", operationName, objectName.toString())));
-      span.setTag(HAZELCAST_NAME, objectName.toString());
-    } else {
-      span.setResourceName(UTF8BytesString.create(operationName));
-    }
+        if (objectName != null) {
+            span.setResourceName(UTF8BytesString.create(String.join(" ", operationName, objectName.toString())));
+            span.setTag(HAZELCAST_NAME, objectName.toString());
+        } else {
+            span.setResourceName(UTF8BytesString.create(operationName));
+        }
 
-    span.setTag(HAZELCAST_OPERATION, operationName);
-    span.setTag(HAZELCAST_SERVICE, operationName.substring(0, operationName.indexOf('.')));
+        span.setTag(HAZELCAST_OPERATION, operationName);
+        span.setTag(HAZELCAST_SERVICE, operationName.substring(0, operationName.indexOf('.')));
 
-    if (correlationId > 0) {
-      span.setTag(HAZELCAST_CORRELATION_ID, correlationId);
+        if (correlationId > 0) {
+            span.setTag(HAZELCAST_CORRELATION_ID, correlationId);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastModule.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastModule.java
index a3770395f58..c56aaffa499 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastModule.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastModule.java
@@ -19,24 +19,22 @@
 @AutoService(InstrumenterModule.class)
 public final class HazelcastModule extends InstrumenterModule.Tracing {
 
-  public HazelcastModule() {
-    super(INSTRUMENTATION_NAME);
-  }
+    public HazelcastModule() {
+        super(INSTRUMENTATION_NAME);
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return DEFAULT_ENABLED;
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return DEFAULT_ENABLED;
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "com.hazelcast.client.impl.spi.impl.ClientInvocation", String.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("com.hazelcast.client.impl.spi.impl.ClientInvocation", String.class.getName());
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new ClientInvocationInstrumentation(), new ClientListenerInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(new ClientInvocationInstrumentation(), new ClientListenerInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/InvocationAdvice.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/InvocationAdvice.java
index d7e7420436f..83b31485091 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/InvocationAdvice.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/InvocationAdvice.java
@@ -19,65 +19,65 @@
 /** Advice for instrumenting distributed object client proxy classes. */
 public class InvocationAdvice {
 
-  /** Method entry instrumentation. */
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope methodEnter(
-      @Advice.This final ClientInvocation that,
-      @Advice.FieldValue("objectName") final Object objectName,
-      @Advice.FieldValue("clientMessage") final ClientMessage clientMessage) {
+    /** Method entry instrumentation. */
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope methodEnter(
+            @Advice.This final ClientInvocation that,
+            @Advice.FieldValue("objectName") final Object objectName,
+            @Advice.FieldValue("clientMessage") final ClientMessage clientMessage) {
 
-    final String operationName = clientMessage.getOperationName();
-    long correlationId = clientMessage.getCorrelationId();
+        final String operationName = clientMessage.getOperationName();
+        long correlationId = clientMessage.getCorrelationId();
 
-    // Ensure that we only create a span for the top-level Hazelcast method; except in the
-    // case of async operations where we want visibility into how long the task was delayed from
-    // starting. Our call depth checker does not span threads, so the async case is handled
-    // automatically for us.
-    final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(ClientInvocation.class);
-    if (callDepth > 0) {
-      return null;
-    }
-
-    final AgentSpan span = startSpan(COMPONENT_NAME.toString(), HazelcastConstants.SPAN_NAME);
+        // Ensure that we only create a span for the top-level Hazelcast method; except in the
+        // case of async operations where we want visibility into how long the task was delayed from
+        // starting. Our call depth checker does not span threads, so the async case is handled
+        // automatically for us.
+        final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(ClientInvocation.class);
+        if (callDepth > 0) {
+            return null;
+        }
 
-    span.setTag(
-        HazelcastConstants.HAZELCAST_INSTANCE,
-        InstrumentationContext.get(ClientInvocation.class, String.class).get(that));
-    DECORATE.afterStart(span);
-    DECORATE.onServiceExecution(span, operationName, objectName, correlationId);
+        final AgentSpan span = startSpan(COMPONENT_NAME.toString(), HazelcastConstants.SPAN_NAME);
 
-    return activateSpan(span);
-  }
+        span.setTag(
+                HazelcastConstants.HAZELCAST_INSTANCE,
+                InstrumentationContext.get(ClientInvocation.class, String.class).get(that));
+        DECORATE.afterStart(span);
+        DECORATE.onServiceExecution(span, operationName, objectName, correlationId);
 
-  /** Method exit instrumentation. */
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void methodExit(
-      @Advice.Enter final ContextScope scope,
-      @Advice.Thrown final Throwable throwable,
-      @Advice.FieldValue("clientInvocationFuture") final ClientInvocationFuture future) {
-    if (scope == null) {
-      return;
+        return activateSpan(span);
     }
 
-    // If we have a scope (i.e. we were the top-level Hazelcast SDK invocation),
-    final AgentSpan span = spanFromScope(scope);
-    if (throwable != null) {
-      // There was a synchronous error,
-      // which means we shouldn't wait for a callback to close the span.
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
-    } else {
-      future.whenComplete(new SpanFinishingExecutionCallback(span));
-      scope.close();
+    /** Method exit instrumentation. */
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void methodExit(
+            @Advice.Enter final ContextScope scope,
+            @Advice.Thrown final Throwable throwable,
+            @Advice.FieldValue("clientInvocationFuture") final ClientInvocationFuture future) {
+        if (scope == null) {
+            return;
+        }
+
+        // If we have a scope (i.e. we were the top-level Hazelcast SDK invocation),
+        final AgentSpan span = spanFromScope(scope);
+        if (throwable != null) {
+            // There was a synchronous error,
+            // which means we shouldn't wait for a callback to close the span.
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        } else {
+            future.whenComplete(new SpanFinishingExecutionCallback(span));
+            scope.close();
+        }
+        CallDepthThreadLocalMap.reset(ClientInvocation.class); // reset call depth count
     }
-    CallDepthThreadLocalMap.reset(ClientInvocation.class); // reset call depth count
-  }
 
-  public static void muzzleCheck(
-      // Moved in 4.0
-      ClientMapProxy proxy) {
-    proxy.getServiceName();
-  }
+    public static void muzzleCheck(
+            // Moved in 4.0
+            ClientMapProxy proxy) {
+        proxy.getServiceName();
+    }
 }
diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/SpanFinishingExecutionCallback.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/SpanFinishingExecutionCallback.java
index 51e24c7e6b1..5b1dcfc2512 100644
--- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/SpanFinishingExecutionCallback.java
+++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/SpanFinishingExecutionCallback.java
@@ -6,30 +6,30 @@
 
 public class SpanFinishingExecutionCallback implements BiConsumer<ClientMessage, Throwable> {
 
-  /** Span that we should finish and annotate when the future is complete. */
-  private final AgentSpan span;
+    /** Span that we should finish and annotate when the future is complete. */
+    private final AgentSpan span;
 
-  public SpanFinishingExecutionCallback(final AgentSpan span) {
-    this.span = span;
-  }
+    public SpanFinishingExecutionCallback(final AgentSpan span) {
+        this.span = span;
+    }
 
-  public void onResponse(ClientMessage response) {
-    HazelcastDecorator.DECORATE.beforeFinish(span);
-    span.finish();
-  }
+    public void onResponse(ClientMessage response) {
+        HazelcastDecorator.DECORATE.beforeFinish(span);
+        span.finish();
+    }
 
-  public void onFailure(final Throwable t) {
-    HazelcastDecorator.DECORATE.onError(span, t);
-    HazelcastDecorator.DECORATE.beforeFinish(span);
-    span.finish();
-  }
+    public void onFailure(final Throwable t) {
+        HazelcastDecorator.DECORATE.onError(span, t);
+        HazelcastDecorator.DECORATE.beforeFinish(span);
+        span.finish();
+    }
 
-  @Override
-  public void accept(ClientMessage clientMessage, Throwable throwable) {
-    if (throwable != null) {
-      onFailure(throwable);
-    } else {
-      onResponse(clientMessage);
+    @Override
+    public void accept(ClientMessage clientMessage, Throwable throwable) {
+        if (throwable != null) {
+            onFailure(throwable);
+        } else {
+            onResponse(clientMessage);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java b/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java
index 7defdcde0af..4d98876a12f 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java
@@ -9,82 +9,80 @@
 import java.util.List;
 
 public class HibernateDecorator extends OrmClientDecorator {
-  public static final CharSequence HIBERNATE_SESSION = UTF8BytesString.create("hibernate.session");
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().database().service("hibernate");
-  public static final HibernateDecorator DECORATOR = new HibernateDecorator();
+    public static final CharSequence HIBERNATE_SESSION = UTF8BytesString.create("hibernate.session");
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().database().service("hibernate");
+    public static final HibernateDecorator DECORATOR = new HibernateDecorator();
 
-  private static final ClassValue<String> ENTITY_NAMES =
-      GenericClassValue.of(
-          type -> {
-            for (Annotation annotation : type.getDeclaredAnnotations()) {
-              if ("javax.persistence.Entity".equals(annotation.annotationType().getName())) {
+    private static final ClassValue<String> ENTITY_NAMES = GenericClassValue.of(type -> {
+        for (Annotation annotation : type.getDeclaredAnnotations()) {
+            if ("javax.persistence.Entity".equals(annotation.annotationType().getName())) {
                 return type.getName();
-              }
             }
-            return null;
-          });
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"hibernate-core"};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.HIBERNATE;
-  }
+        }
+        return null;
+    });
 
-  @Override
-  protected CharSequence component() {
-    return "java-hibernate";
-  }
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
 
-  @Override
-  protected String dbType() {
-    return null;
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"hibernate-core"};
+    }
 
-  @Override
-  protected String dbUser(final Object o) {
-    return null;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.HIBERNATE;
+    }
 
-  @Override
-  protected String dbInstance(final Object o) {
-    return null;
-  }
+    @Override
+    protected CharSequence component() {
+        return "java-hibernate";
+    }
 
-  @Override
-  protected String dbHostname(Object o) {
-    return null;
-  }
+    @Override
+    protected String dbType() {
+        return null;
+    }
 
-  @Override
-  public String entityName(final Object entity) {
-    if (entity == null) {
-      return null;
+    @Override
+    protected String dbUser(final Object o) {
+        return null;
     }
-    if (entity instanceof String) {
-      // We were given an entity name, not the entity itself.
-      return (String) entity;
+
+    @Override
+    protected String dbInstance(final Object o) {
+        return null;
     }
 
-    String name = ENTITY_NAMES.get(entity.getClass());
-    if (name != null) {
-      return name;
+    @Override
+    protected String dbHostname(Object o) {
+        return null;
     }
-    if (entity instanceof List) {
-      List<?> entities = (List<?>) entity;
-      if (!entities.isEmpty()) {
-        return entityName(entities.get(0));
-      }
+
+    @Override
+    public String entityName(final Object entity) {
+        if (entity == null) {
+            return null;
+        }
+        if (entity instanceof String) {
+            // We were given an entity name, not the entity itself.
+            return (String) entity;
+        }
+
+        String name = ENTITY_NAMES.get(entity.getClass());
+        if (name != null) {
+            return name;
+        }
+        if (entity instanceof List) {
+            List<?> entities = (List<?>) entity;
+            if (!entities.isEmpty()) {
+                return entityName(entities.get(0));
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java b/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java
index e76bdba737e..eb5d6f308e4 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java
@@ -15,92 +15,90 @@
 
 public class SessionMethodUtils {
 
-  public static final Set<String> SCOPE_ONLY_METHODS =
-      new HashSet<>(Arrays.asList("immediateLoad", "internalLoad"));
-
-  /**
-   * Starts a scope as a child from a Span, where the Span is attached to the given spanKey using
-   * the given contextStore.
-   */
-  public static <TARGET, ENTITY> SessionState startScopeFrom(
-      final ContextStore<TARGET, SessionState> contextStore,
-      final TARGET spanKey,
-      final String operationName,
-      final ENTITY entity,
-      final boolean createSpan) {
-
-    final SessionState sessionState = contextStore.get(spanKey);
-
-    if (sessionState == null) {
-      return null; // No state found. We aren't in a Session.
+    public static final Set<String> SCOPE_ONLY_METHODS = new HashSet<>(Arrays.asList("immediateLoad", "internalLoad"));
+
+    /**
+     * Starts a scope as a child from a Span, where the Span is attached to the given spanKey using
+     * the given contextStore.
+     */
+    public static <TARGET, ENTITY> SessionState startScopeFrom(
+            final ContextStore<TARGET, SessionState> contextStore,
+            final TARGET spanKey,
+            final String operationName,
+            final ENTITY entity,
+            final boolean createSpan) {
+
+        final SessionState sessionState = contextStore.get(spanKey);
+
+        if (sessionState == null) {
+            return null; // No state found. We aren't in a Session.
+        }
+
+        final int depth = CallDepthThreadLocalMap.incrementCallDepth(SessionMethodUtils.class);
+        if (depth > 0) {
+            return null; // This method call is being traced already.
+        }
+
+        final ContextScope scope;
+        if (createSpan) {
+            final AgentSpan span = startSpan(
+                    "java-hibernate",
+                    operationName,
+                    sessionState.getSessionSpan().spanContext());
+            DECORATOR.afterStart(span);
+            DECORATOR.onOperation(span, entity);
+            scope = activateSpan(span);
+        } else {
+            scope = activateSpan(sessionState.getSessionSpan());
+            sessionState.setHasChildSpan(false);
+        }
+
+        sessionState.setMethodScope(scope);
+        return sessionState;
     }
 
-    final int depth = CallDepthThreadLocalMap.incrementCallDepth(SessionMethodUtils.class);
-    if (depth > 0) {
-      return null; // This method call is being traced already.
+    /** Closes a Scope/Span, adding an error tag if the given Throwable is not null. */
+    public static void closeScope(
+            final SessionState sessionState, final Throwable throwable, final Object entity, final boolean closeSpan) {
+
+        final ContextScope scope = sessionState == null ? null : sessionState.getMethodScope();
+        if (scope == null) {
+            // This method call was re-entrant. Do nothing, since it is being traced by the parent/first
+            // call.
+            return;
+        }
+
+        CallDepthThreadLocalMap.reset(SessionMethodUtils.class);
+        sessionState.setMethodScope(null);
+        final AgentSpan span = spanFromScope(scope);
+        if (span != null && (sessionState.hasChildSpan() || closeSpan)) {
+            DECORATOR.onError(span, throwable);
+            if (entity != null) {
+                DECORATOR.onOperation(span, entity);
+            }
+            DECORATOR.beforeFinish(span);
+            scope.close();
+            span.finish();
+        } else {
+            scope.close();
+        }
     }
 
-    final ContextScope scope;
-    if (createSpan) {
-      final AgentSpan span =
-          startSpan("java-hibernate", operationName, sessionState.getSessionSpan().spanContext());
-      DECORATOR.afterStart(span);
-      DECORATOR.onOperation(span, entity);
-      scope = activateSpan(span);
-    } else {
-      scope = activateSpan(sessionState.getSessionSpan());
-      sessionState.setHasChildSpan(false);
+    /**
+     * Copies a span from the given Session ContextStore into the targetContextStore. Used to
+     * propagate a Span from a Session to transient Session objects such as Transaction and Query.
+     */
+    public static <S, T> void attachSpanFromStore(
+            final ContextStore<S, SessionState> sourceContextStore,
+            final S source,
+            final ContextStore<T, SessionState> targetContextStore,
+            final T target) {
+
+        final SessionState state = sourceContextStore.get(source);
+        if (state == null) {
+            return;
+        }
+
+        targetContextStore.getOrPut(target, state);
     }
-
-    sessionState.setMethodScope(scope);
-    return sessionState;
-  }
-
-  /** Closes a Scope/Span, adding an error tag if the given Throwable is not null. */
-  public static void closeScope(
-      final SessionState sessionState,
-      final Throwable throwable,
-      final Object entity,
-      final boolean closeSpan) {
-
-    final ContextScope scope = sessionState == null ? null : sessionState.getMethodScope();
-    if (scope == null) {
-      // This method call was re-entrant. Do nothing, since it is being traced by the parent/first
-      // call.
-      return;
-    }
-
-    CallDepthThreadLocalMap.reset(SessionMethodUtils.class);
-    sessionState.setMethodScope(null);
-    final AgentSpan span = spanFromScope(scope);
-    if (span != null && (sessionState.hasChildSpan() || closeSpan)) {
-      DECORATOR.onError(span, throwable);
-      if (entity != null) {
-        DECORATOR.onOperation(span, entity);
-      }
-      DECORATOR.beforeFinish(span);
-      scope.close();
-      span.finish();
-    } else {
-      scope.close();
-    }
-  }
-
-  /**
-   * Copies a span from the given Session ContextStore into the targetContextStore. Used to
-   * propagate a Span from a Session to transient Session objects such as Transaction and Query.
-   */
-  public static <S, T> void attachSpanFromStore(
-      final ContextStore<S, SessionState> sourceContextStore,
-      final S source,
-      final ContextStore<T, SessionState> targetContextStore,
-      final T target) {
-
-    final SessionState state = sourceContextStore.get(source);
-    if (state == null) {
-      return;
-    }
-
-    targetContextStore.getOrPut(target, state);
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionState.java b/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionState.java
index ecbb2447706..d6431d20827 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionState.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionState.java
@@ -4,32 +4,32 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 
 public class SessionState {
-  private final AgentSpan sessionSpan;
+    private final AgentSpan sessionSpan;
 
-  private ContextScope methodScope;
-  private boolean hasChildSpan = true;
+    private ContextScope methodScope;
+    private boolean hasChildSpan = true;
 
-  public SessionState(AgentSpan sessionSpan) {
-    this.sessionSpan = sessionSpan;
-  }
+    public SessionState(AgentSpan sessionSpan) {
+        this.sessionSpan = sessionSpan;
+    }
 
-  public AgentSpan getSessionSpan() {
-    return sessionSpan;
-  }
+    public AgentSpan getSessionSpan() {
+        return sessionSpan;
+    }
 
-  public ContextScope getMethodScope() {
-    return methodScope;
-  }
+    public ContextScope getMethodScope() {
+        return methodScope;
+    }
 
-  public void setMethodScope(ContextScope methodScope) {
-    this.methodScope = methodScope;
-  }
+    public void setMethodScope(ContextScope methodScope) {
+        this.methodScope = methodScope;
+    }
 
-  public boolean hasChildSpan() {
-    return hasChildSpan;
-  }
+    public boolean hasChildSpan() {
+        return hasChildSpan;
+    }
 
-  public void setHasChildSpan(boolean hasChildSpan) {
-    this.hasChildSpan = hasChildSpan;
-  }
+    public void setHasChildSpan(boolean hasChildSpan) {
+        this.hasChildSpan = hasChildSpan;
+    }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/AbstractHibernateInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/AbstractHibernateInstrumentation.java
index 318e5210f24..ace69e55e1d 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/AbstractHibernateInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/AbstractHibernateInstrumentation.java
@@ -6,13 +6,13 @@
 import datadog.trace.api.InstrumenterConfig;
 
 public abstract class AbstractHibernateInstrumentation
-    implements Instrumenter.HasMethodAdvice, Instrumenter.CanShortcutTypeMatching {
+        implements Instrumenter.HasMethodAdvice, Instrumenter.CanShortcutTypeMatching {
 
-  static final String SESSION_STATE = "datadog.trace.instrumentation.hibernate.SessionState";
+    static final String SESSION_STATE = "datadog.trace.instrumentation.hibernate.SessionState";
 
-  @Override
-  public final boolean onlyMatchKnownTypes() {
-    return InstrumenterConfig.get()
-        .isIntegrationShortcutMatchingEnabled(asList("hibernate", "hibernate-core"), true);
-  }
+    @Override
+    public final boolean onlyMatchKnownTypes() {
+        return InstrumenterConfig.get()
+                .isIntegrationShortcutMatchingEnabled(asList("hibernate", "hibernate-core"), true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/CriteriaInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/CriteriaInstrumentation.java
index 208b3760c00..7a13861eb5c 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/CriteriaInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/CriteriaInstrumentation.java
@@ -18,63 +18,61 @@
 import org.hibernate.transaction.JBossTransactionManagerLookup;
 
 public final class CriteriaInstrumentation extends AbstractHibernateInstrumentation {
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.hibernate.impl.CriteriaImpl", "org.hibernate.impl.CriteriaImpl$Subcriteria"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"org.hibernate.impl.CriteriaImpl", "org.hibernate.impl.CriteriaImpl$Subcriteria"};
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.hibernate.Criteria";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.hibernate.Criteria";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("list", "uniqueResult", "scroll")),
-        CriteriaInstrumentation.class.getName() + "$CriteriaMethodAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("list", "uniqueResult", "scroll")),
+                CriteriaInstrumentation.class.getName() + "$CriteriaMethodAdvice");
+    }
 
-  public static class CriteriaMethodAdvice {
+    public static class CriteriaMethodAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static SessionState startMethod(
-        @Advice.This final Criteria criteria,
-        @Advice.Origin("hibernate.criteria.#m") final String operationName) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static SessionState startMethod(
+                @Advice.This final Criteria criteria,
+                @Advice.Origin("hibernate.criteria.#m") final String operationName) {
 
-      final ContextStore<Criteria, SessionState> contextStore =
-          InstrumentationContext.get(Criteria.class, SessionState.class);
+            final ContextStore<Criteria, SessionState> contextStore =
+                    InstrumentationContext.get(Criteria.class, SessionState.class);
 
-      return SessionMethodUtils.startScopeFrom(contextStore, criteria, operationName, null, true);
-    }
+            return SessionMethodUtils.startScopeFrom(contextStore, criteria, operationName, null, true);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void endMethod(
-        @Advice.Enter final SessionState state,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object entity) {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void endMethod(
+                @Advice.Enter final SessionState state,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object entity) {
 
-      SessionMethodUtils.closeScope(state, throwable, entity, true);
-    }
+            SessionMethodUtils.closeScope(state, throwable, entity, true);
+        }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
-     */
-    public static void muzzleCheck(
-        // Not in 4.0
-        final Validatable validatable,
-        // Not before 3.3.0.GA
-        final JBossTransactionManagerLookup lookup) {
-      validatable.validate();
-      lookup.getUserTransactionName();
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
+         */
+        public static void muzzleCheck(
+                // Not in 4.0
+                final Validatable validatable,
+                // Not before 3.3.0.GA
+                final JBossTransactionManagerLookup lookup) {
+            validatable.validate();
+            lookup.getUserTransactionName();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/HibernateModule.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/HibernateModule.java
index 4da265d5296..8f6db8ac6b9 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/HibernateModule.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/HibernateModule.java
@@ -18,40 +18,40 @@
 @AutoService(InstrumenterModule.class)
 public final class HibernateModule extends InstrumenterModule.Tracing {
 
-  static final String SESSION_STATE = "datadog.trace.instrumentation.hibernate.SessionState";
+    static final String SESSION_STATE = "datadog.trace.instrumentation.hibernate.SessionState";
 
-  public HibernateModule() {
-    super("hibernate", "hibernate-core");
-  }
+    public HibernateModule() {
+        super("hibernate", "hibernate-core");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    final Map<String, String> stores = new HashMap<>();
-    stores.put("org.hibernate.Session", SESSION_STATE);
-    stores.put("org.hibernate.StatelessSession", SESSION_STATE);
-    stores.put("org.hibernate.SharedSessionContract", SESSION_STATE);
-    stores.put("org.hibernate.Query", SESSION_STATE);
-    stores.put("org.hibernate.Transaction", SESSION_STATE);
-    stores.put("org.hibernate.Criteria", SESSION_STATE);
-    return Collections.unmodifiableMap(stores);
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        final Map<String, String> stores = new HashMap<>();
+        stores.put("org.hibernate.Session", SESSION_STATE);
+        stores.put("org.hibernate.StatelessSession", SESSION_STATE);
+        stores.put("org.hibernate.SharedSessionContract", SESSION_STATE);
+        stores.put("org.hibernate.Query", SESSION_STATE);
+        stores.put("org.hibernate.Transaction", SESSION_STATE);
+        stores.put("org.hibernate.Criteria", SESSION_STATE);
+        return Collections.unmodifiableMap(stores);
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.hibernate.SessionMethodUtils",
-      "datadog.trace.instrumentation.hibernate.SessionState",
-      "datadog.trace.instrumentation.hibernate.HibernateDecorator",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.hibernate.SessionMethodUtils",
+            "datadog.trace.instrumentation.hibernate.SessionState",
+            "datadog.trace.instrumentation.hibernate.HibernateDecorator",
+        };
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new SessionInstrumentation(),
-        new SessionFactoryInstrumentation(),
-        new QueryInstrumentation(),
-        new CriteriaInstrumentation(),
-        new TransactionInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(
+                new SessionInstrumentation(),
+                new SessionFactoryInstrumentation(),
+                new QueryInstrumentation(),
+                new CriteriaInstrumentation(),
+                new TransactionInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/IastQueryInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/IastQueryInstrumentation.java
index dea82aac1c6..d600f82774c 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/IastQueryInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/IastQueryInstrumentation.java
@@ -18,46 +18,46 @@
 
 @AutoService(InstrumenterModule.class)
 public class IastQueryInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public IastQueryInstrumentation() {
-    super("hibernate", "hibernate-core");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.hibernate.impl.AbstractQueryImpl";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("before").and(takesArguments(0))),
-        IastQueryInstrumentation.class.getName() + "$QueryMethodAdvice");
-  }
-
-  public static class QueryMethodAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.SQL_INJECTION)
-    public static void beforeMethod(@Advice.This final Query query) {
-      final SqlInjectionModule module = InstrumentationBridge.SQL_INJECTION;
-      if (module != null) {
-        module.onJdbcQuery(query.getQueryString());
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public IastQueryInstrumentation() {
+        super("hibernate", "hibernate-core");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.hibernate.impl.AbstractQueryImpl";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("before").and(takesArguments(0))),
+                IastQueryInstrumentation.class.getName() + "$QueryMethodAdvice");
     }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
-     */
-    public static void muzzleCheck(
-        // Not in 4.0
-        final Validatable validatable,
-        // Not before 3.3.0.GA
-        final JBossTransactionManagerLookup lookup) {
-      validatable.validate();
-      lookup.getUserTransactionName();
+    public static class QueryMethodAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.SQL_INJECTION)
+        public static void beforeMethod(@Advice.This final Query query) {
+            final SqlInjectionModule module = InstrumentationBridge.SQL_INJECTION;
+            if (module != null) {
+                module.onJdbcQuery(query.getQueryString());
+            }
+        }
+
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
+         */
+        public static void muzzleCheck(
+                // Not in 4.0
+                final Validatable validatable,
+                // Not before 3.3.0.GA
+                final JBossTransactionManagerLookup lookup) {
+            validatable.validate();
+            lookup.getUserTransactionName();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/QueryInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/QueryInstrumentation.java
index 42f57f9fd27..be342771a74 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/QueryInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/QueryInstrumentation.java
@@ -21,80 +21,79 @@
 import org.hibernate.transaction.JBossTransactionManagerLookup;
 
 public final class QueryInstrumentation extends AbstractHibernateInstrumentation {
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.hibernate.impl.AbstractQueryImpl",
-      "org.hibernate.impl.CollectionFilterImpl",
-      "org.hibernate.impl.QueryImpl",
-      "org.hibernate.impl.SQLQueryImpl"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.hibernate.impl.AbstractQueryImpl",
+            "org.hibernate.impl.CollectionFilterImpl",
+            "org.hibernate.impl.QueryImpl",
+            "org.hibernate.impl.SQLQueryImpl"
+        };
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.hibernate.Query";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.hibernate.Query";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("list", "executeUpdate", "uniqueResult", "scroll")),
-        QueryInstrumentation.class.getName() + "$QueryMethodAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("list", "executeUpdate", "uniqueResult", "scroll")),
+                QueryInstrumentation.class.getName() + "$QueryMethodAdvice");
+    }
 
-  public static class QueryMethodAdvice {
+    public static class QueryMethodAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static SessionState startMethod(
-        @Advice.This final Query query,
-        @Advice.Origin("hibernate.query.#m") final String operationName) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static SessionState startMethod(
+                @Advice.This final Query query, @Advice.Origin("hibernate.query.#m") final String operationName) {
 
-      final ContextStore<Query, SessionState> contextStore =
-          InstrumentationContext.get(Query.class, SessionState.class);
+            final ContextStore<Query, SessionState> contextStore =
+                    InstrumentationContext.get(Query.class, SessionState.class);
 
-      // Note: We don't know what the entity is until the method is returning.
-      final SessionState state =
-          SessionMethodUtils.startScopeFrom(contextStore, query, operationName, null, true);
-      if (state != null) {
-        DECORATOR.onStatement(spanFromScope(state.getMethodScope()), query.getQueryString());
-      }
-      return state;
-    }
+            // Note: We don't know what the entity is until the method is returning.
+            final SessionState state =
+                    SessionMethodUtils.startScopeFrom(contextStore, query, operationName, null, true);
+            if (state != null) {
+                DECORATOR.onStatement(spanFromScope(state.getMethodScope()), query.getQueryString());
+            }
+            return state;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void endMethod(
-        @Advice.This final Query query,
-        @Advice.Enter final SessionState state,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object returned) {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void endMethod(
+                @Advice.This final Query query,
+                @Advice.Enter final SessionState state,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object returned) {
 
-      Object entity = returned;
-      if (returned == null || query instanceof SQLQuery) {
-        // Not a method that returns results, or the query returns a table rather than an ORM
-        // object.
-        entity = query.getQueryString();
-      }
+            Object entity = returned;
+            if (returned == null || query instanceof SQLQuery) {
+                // Not a method that returns results, or the query returns a table rather than an ORM
+                // object.
+                entity = query.getQueryString();
+            }
 
-      SessionMethodUtils.closeScope(state, throwable, entity, true);
-    }
+            SessionMethodUtils.closeScope(state, throwable, entity, true);
+        }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
-     */
-    public static void muzzleCheck(
-        // Not in 4.0
-        final Validatable validatable,
-        // Not before 3.3.0.GA
-        final JBossTransactionManagerLookup lookup) {
-      validatable.validate();
-      lookup.getUserTransactionName();
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
+         */
+        public static void muzzleCheck(
+                // Not in 4.0
+                final Validatable validatable,
+                // Not before 3.3.0.GA
+                final JBossTransactionManagerLookup lookup) {
+            validatable.validate();
+            lookup.getUserTransactionName();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/SessionFactoryInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/SessionFactoryInstrumentation.java
index be7f635672c..0f9f9d06e7b 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/SessionFactoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/SessionFactoryInstrumentation.java
@@ -24,65 +24,63 @@
 import org.hibernate.transaction.JBossTransactionManagerLookup;
 
 public final class SessionFactoryInstrumentation extends AbstractHibernateInstrumentation {
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {"org.hibernate.impl.SessionFactoryImpl"};
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"org.hibernate.impl.SessionFactoryImpl"};
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.hibernate.SessionFactory";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.hibernate.SessionFactory";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("openSession", "openStatelessSession"))
-            .and(takesArguments(0))
-            .and(
-                returns(
-                    namedOneOf("org.hibernate.Session", "org.hibernate.StatelessSession")
-                        .or(hasInterface(named("org.hibernate.Session"))))),
-        SessionFactoryInstrumentation.class.getName() + "$SessionFactoryAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("openSession", "openStatelessSession"))
+                        .and(takesArguments(0))
+                        .and(returns(namedOneOf("org.hibernate.Session", "org.hibernate.StatelessSession")
+                                .or(hasInterface(named("org.hibernate.Session"))))),
+                SessionFactoryInstrumentation.class.getName() + "$SessionFactoryAdvice");
+    }
 
-  public static class SessionFactoryAdvice {
+    public static class SessionFactoryAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void openSession(@Advice.Return final Object session) {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void openSession(@Advice.Return final Object session) {
 
-      final AgentSpan span = startSpan("java-hibernate", HIBERNATE_SESSION);
-      DECORATOR.afterStart(span);
-      DECORATOR.onConnection(span, session);
+            final AgentSpan span = startSpan("java-hibernate", HIBERNATE_SESSION);
+            DECORATOR.afterStart(span);
+            DECORATOR.onConnection(span, session);
 
-      if (session instanceof Session) {
-        final ContextStore<Session, SessionState> contextStore =
-            InstrumentationContext.get(Session.class, SessionState.class);
-        contextStore.getOrPut((Session) session, new SessionState(span));
-      } else if (session instanceof StatelessSession) {
-        final ContextStore<StatelessSession, SessionState> contextStore =
-            InstrumentationContext.get(StatelessSession.class, SessionState.class);
-        contextStore.getOrPut((StatelessSession) session, new SessionState(span));
-      }
-    }
+            if (session instanceof Session) {
+                final ContextStore<Session, SessionState> contextStore =
+                        InstrumentationContext.get(Session.class, SessionState.class);
+                contextStore.getOrPut((Session) session, new SessionState(span));
+            } else if (session instanceof StatelessSession) {
+                final ContextStore<StatelessSession, SessionState> contextStore =
+                        InstrumentationContext.get(StatelessSession.class, SessionState.class);
+                contextStore.getOrPut((StatelessSession) session, new SessionState(span));
+            }
+        }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
-     */
-    public static void muzzleCheck(
-        // Not in 4.0
-        final Validatable validatable,
-        // Not before 3.3.0.GA
-        final JBossTransactionManagerLookup lookup) {
-      validatable.validate();
-      lookup.getUserTransactionName();
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
+         */
+        public static void muzzleCheck(
+                // Not in 4.0
+                final Validatable validatable,
+                // Not before 3.3.0.GA
+                final JBossTransactionManagerLookup lookup) {
+            validatable.validate();
+            lookup.getUserTransactionName();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/SessionInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/SessionInstrumentation.java
index 108cbcdaa75..06605df37ba 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/SessionInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/SessionInstrumentation.java
@@ -29,273 +29,266 @@
 import org.hibernate.transaction.JBossTransactionManagerLookup;
 
 public final class SessionInstrumentation extends AbstractHibernateInstrumentation {
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.hibernate.impl.SessionImpl", "org.hibernate.impl.StatelessSessionImpl"
-    };
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.hibernate.Session";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(
-        namedOneOf("org.hibernate.Session", "org.hibernate.StatelessSession"));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("close")).and(takesArguments(0)),
-        SessionInstrumentation.class.getName() + "$SessionCloseAdvice");
-
-    // Session synchronous methods we want to instrument.
-    transformer.applyAdvice(
-        isMethod()
-            .and(
-                namedOneOf(
-                    "save",
-                    "replicate",
-                    "saveOrUpdate",
-                    "update",
-                    "merge",
-                    "persist",
-                    "lock",
-                    "refresh",
-                    "insert",
-                    "delete",
-                    // Iterator methods.
-                    "iterate",
-                    // Lazy-load methods.
-                    "immediateLoad",
-                    "internalLoad")),
-        SessionInstrumentation.class.getName() + "$SessionMethodAdvice");
-
-    // Handle the non-generic 'get' separately.
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("get"))
-            .and(returns(named("java.lang.Object")))
-            .and(takesArgument(0, named("java.lang.String"))),
-        SessionInstrumentation.class.getName() + "$SessionMethodAdvice");
-
-    // These methods return some object that we want to instrument, and so the Advice will pin the
-    // current Span to the returned object using a ContextStore.
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("beginTransaction", "getTransaction"))
-            .and(returns(named("org.hibernate.Transaction"))),
-        SessionInstrumentation.class.getName() + "$GetTransactionAdvice");
-
-    transformer.applyAdvice(
-        isMethod().and(returns(hasInterface(named("org.hibernate.Query")))),
-        SessionInstrumentation.class.getName() + "$GetQueryAdvice");
-
-    transformer.applyAdvice(
-        isMethod().and(returns(hasInterface(named("org.hibernate.Criteria")))),
-        SessionInstrumentation.class.getName() + "$GetCriteriaAdvice");
-  }
-
-  public static class SessionCloseAdvice {
-
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeSession(
-        @Advice.This final Object session, @Advice.Thrown final Throwable throwable) {
-
-      SessionState state = null;
-      if (session instanceof Session) {
-        final ContextStore<Session, SessionState> contextStore =
-            InstrumentationContext.get(Session.class, SessionState.class);
-        state = contextStore.get((Session) session);
-      } else if (session instanceof StatelessSession) {
-        final ContextStore<StatelessSession, SessionState> contextStore =
-            InstrumentationContext.get(StatelessSession.class, SessionState.class);
-        state = contextStore.get((StatelessSession) session);
-      }
-
-      if (state == null || state.getSessionSpan() == null) {
-        return;
-      }
-      if (state.getMethodScope() != null) {
-        state.getMethodScope().close();
-      }
-
-      final AgentSpan span = state.getSessionSpan();
-      DECORATOR.onError(span, throwable);
-      DECORATOR.beforeFinish(span);
-      span.finish();
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"org.hibernate.impl.SessionImpl", "org.hibernate.impl.StatelessSessionImpl"};
     }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
-     */
-    public static void muzzleCheck(
-        // Not in 4.0
-        final Validatable validatable,
-        // Not before 3.3.0.GA
-        final JBossTransactionManagerLookup lookup) {
-      validatable.validate();
-      lookup.getUserTransactionName();
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.hibernate.Session";
     }
-  }
-
-  public static class SessionMethodAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static SessionState startMethod(
-        @Advice.This final Object session,
-        @Advice.Origin("hibernate.#m") final String operationName,
-        @Advice.Origin("#m") final String methodName,
-        @Advice.Argument(0) final Object entity,
-        @Advice.Local("startSpan") boolean startSpan) {
-
-      startSpan = !SCOPE_ONLY_METHODS.contains(methodName);
-      if (session instanceof Session) {
-        final ContextStore<Session, SessionState> contextStore =
-            InstrumentationContext.get(Session.class, SessionState.class);
-        return SessionMethodUtils.startScopeFrom(
-            contextStore, (Session) session, operationName, entity, startSpan);
-      } else if (session instanceof StatelessSession) {
-        final ContextStore<StatelessSession, SessionState> contextStore =
-            InstrumentationContext.get(StatelessSession.class, SessionState.class);
-        return SessionMethodUtils.startScopeFrom(
-            contextStore, (StatelessSession) session, operationName, entity, startSpan);
-      }
-      return null;
-    }
-
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void endMethod(
-        @Advice.Enter final SessionState sessionState,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Local("startSpan") final boolean startSpan,
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object returned) {
 
-      SessionMethodUtils.closeScope(sessionState, throwable, returned, startSpan);
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(namedOneOf("org.hibernate.Session", "org.hibernate.StatelessSession"));
     }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
-     */
-    public static void muzzleCheck(
-        // Not in 4.0
-        final Validatable validatable,
-        // Not before 3.3.0.GA
-        final JBossTransactionManagerLookup lookup) {
-      validatable.validate();
-      lookup.getUserTransactionName();
-    }
-  }
-
-  public static class GetQueryAdvice {
-
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void getQuery(
-        @Advice.This final Object session, @Advice.Return final Query query) {
-
-      final ContextStore<Query, SessionState> queryContextStore =
-          InstrumentationContext.get(Query.class, SessionState.class);
-      if (session instanceof Session) {
-        final ContextStore<Session, SessionState> sessionContextStore =
-            InstrumentationContext.get(Session.class, SessionState.class);
-        SessionMethodUtils.attachSpanFromStore(
-            sessionContextStore, (Session) session, queryContextStore, query);
-      } else if (session instanceof StatelessSession) {
-        final ContextStore<StatelessSession, SessionState> sessionContextStore =
-            InstrumentationContext.get(StatelessSession.class, SessionState.class);
-        SessionMethodUtils.attachSpanFromStore(
-            sessionContextStore, (StatelessSession) session, queryContextStore, query);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("close")).and(takesArguments(0)),
+                SessionInstrumentation.class.getName() + "$SessionCloseAdvice");
+
+        // Session synchronous methods we want to instrument.
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf(
+                                "save",
+                                "replicate",
+                                "saveOrUpdate",
+                                "update",
+                                "merge",
+                                "persist",
+                                "lock",
+                                "refresh",
+                                "insert",
+                                "delete",
+                                // Iterator methods.
+                                "iterate",
+                                // Lazy-load methods.
+                                "immediateLoad",
+                                "internalLoad")),
+                SessionInstrumentation.class.getName() + "$SessionMethodAdvice");
+
+        // Handle the non-generic 'get' separately.
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("get"))
+                        .and(returns(named("java.lang.Object")))
+                        .and(takesArgument(0, named("java.lang.String"))),
+                SessionInstrumentation.class.getName() + "$SessionMethodAdvice");
+
+        // These methods return some object that we want to instrument, and so the Advice will pin the
+        // current Span to the returned object using a ContextStore.
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("beginTransaction", "getTransaction"))
+                        .and(returns(named("org.hibernate.Transaction"))),
+                SessionInstrumentation.class.getName() + "$GetTransactionAdvice");
+
+        transformer.applyAdvice(
+                isMethod().and(returns(hasInterface(named("org.hibernate.Query")))),
+                SessionInstrumentation.class.getName() + "$GetQueryAdvice");
+
+        transformer.applyAdvice(
+                isMethod().and(returns(hasInterface(named("org.hibernate.Criteria")))),
+                SessionInstrumentation.class.getName() + "$GetCriteriaAdvice");
     }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
-     */
-    public static void muzzleCheck(
-        // Not in 4.0
-        final Validatable validatable,
-        // Not before 3.3.0.GA
-        final JBossTransactionManagerLookup lookup) {
-      validatable.validate();
-      lookup.getUserTransactionName();
+    public static class SessionCloseAdvice {
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeSession(@Advice.This final Object session, @Advice.Thrown final Throwable throwable) {
+
+            SessionState state = null;
+            if (session instanceof Session) {
+                final ContextStore<Session, SessionState> contextStore =
+                        InstrumentationContext.get(Session.class, SessionState.class);
+                state = contextStore.get((Session) session);
+            } else if (session instanceof StatelessSession) {
+                final ContextStore<StatelessSession, SessionState> contextStore =
+                        InstrumentationContext.get(StatelessSession.class, SessionState.class);
+                state = contextStore.get((StatelessSession) session);
+            }
+
+            if (state == null || state.getSessionSpan() == null) {
+                return;
+            }
+            if (state.getMethodScope() != null) {
+                state.getMethodScope().close();
+            }
+
+            final AgentSpan span = state.getSessionSpan();
+            DECORATOR.onError(span, throwable);
+            DECORATOR.beforeFinish(span);
+            span.finish();
+        }
+
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
+         */
+        public static void muzzleCheck(
+                // Not in 4.0
+                final Validatable validatable,
+                // Not before 3.3.0.GA
+                final JBossTransactionManagerLookup lookup) {
+            validatable.validate();
+            lookup.getUserTransactionName();
+        }
     }
-  }
-
-  public static class GetTransactionAdvice {
-
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void getTransaction(
-        @Advice.This final Object session, @Advice.Return final Transaction transaction) {
-
-      final ContextStore<Transaction, SessionState> transactionContextStore =
-          InstrumentationContext.get(Transaction.class, SessionState.class);
-
-      if (session instanceof Session) {
-        final ContextStore<Session, SessionState> sessionContextStore =
-            InstrumentationContext.get(Session.class, SessionState.class);
-        SessionMethodUtils.attachSpanFromStore(
-            sessionContextStore, (Session) session, transactionContextStore, transaction);
-      } else if (session instanceof StatelessSession) {
-        final ContextStore<StatelessSession, SessionState> sessionContextStore =
-            InstrumentationContext.get(StatelessSession.class, SessionState.class);
-        SessionMethodUtils.attachSpanFromStore(
-            sessionContextStore, (StatelessSession) session, transactionContextStore, transaction);
-      }
+
+    public static class SessionMethodAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static SessionState startMethod(
+                @Advice.This final Object session,
+                @Advice.Origin("hibernate.#m") final String operationName,
+                @Advice.Origin("#m") final String methodName,
+                @Advice.Argument(0) final Object entity,
+                @Advice.Local("startSpan") boolean startSpan) {
+
+            startSpan = !SCOPE_ONLY_METHODS.contains(methodName);
+            if (session instanceof Session) {
+                final ContextStore<Session, SessionState> contextStore =
+                        InstrumentationContext.get(Session.class, SessionState.class);
+                return SessionMethodUtils.startScopeFrom(
+                        contextStore, (Session) session, operationName, entity, startSpan);
+            } else if (session instanceof StatelessSession) {
+                final ContextStore<StatelessSession, SessionState> contextStore =
+                        InstrumentationContext.get(StatelessSession.class, SessionState.class);
+                return SessionMethodUtils.startScopeFrom(
+                        contextStore, (StatelessSession) session, operationName, entity, startSpan);
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void endMethod(
+                @Advice.Enter final SessionState sessionState,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Local("startSpan") final boolean startSpan,
+                @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object returned) {
+
+            SessionMethodUtils.closeScope(sessionState, throwable, returned, startSpan);
+        }
+
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
+         */
+        public static void muzzleCheck(
+                // Not in 4.0
+                final Validatable validatable,
+                // Not before 3.3.0.GA
+                final JBossTransactionManagerLookup lookup) {
+            validatable.validate();
+            lookup.getUserTransactionName();
+        }
     }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
-     */
-    public static void muzzleCheck(
-        // Not in 4.0
-        final Validatable validatable,
-        // Not before 3.3.0.GA
-        final JBossTransactionManagerLookup lookup) {
-      validatable.validate();
-      lookup.getUserTransactionName();
+    public static class GetQueryAdvice {
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void getQuery(@Advice.This final Object session, @Advice.Return final Query query) {
+
+            final ContextStore<Query, SessionState> queryContextStore =
+                    InstrumentationContext.get(Query.class, SessionState.class);
+            if (session instanceof Session) {
+                final ContextStore<Session, SessionState> sessionContextStore =
+                        InstrumentationContext.get(Session.class, SessionState.class);
+                SessionMethodUtils.attachSpanFromStore(
+                        sessionContextStore, (Session) session, queryContextStore, query);
+            } else if (session instanceof StatelessSession) {
+                final ContextStore<StatelessSession, SessionState> sessionContextStore =
+                        InstrumentationContext.get(StatelessSession.class, SessionState.class);
+                SessionMethodUtils.attachSpanFromStore(
+                        sessionContextStore, (StatelessSession) session, queryContextStore, query);
+            }
+        }
+
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
+         */
+        public static void muzzleCheck(
+                // Not in 4.0
+                final Validatable validatable,
+                // Not before 3.3.0.GA
+                final JBossTransactionManagerLookup lookup) {
+            validatable.validate();
+            lookup.getUserTransactionName();
+        }
     }
-  }
-
-  public static class GetCriteriaAdvice {
-
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void getCriteria(
-        @Advice.This final Object session, @Advice.Return final Criteria criteria) {
-
-      final ContextStore<Criteria, SessionState> criteriaContextStore =
-          InstrumentationContext.get(Criteria.class, SessionState.class);
-      if (session instanceof Session) {
-        final ContextStore<Session, SessionState> sessionContextStore =
-            InstrumentationContext.get(Session.class, SessionState.class);
-        SessionMethodUtils.attachSpanFromStore(
-            sessionContextStore, (Session) session, criteriaContextStore, criteria);
-      } else if (session instanceof StatelessSession) {
-        final ContextStore<StatelessSession, SessionState> sessionContextStore =
-            InstrumentationContext.get(StatelessSession.class, SessionState.class);
-        SessionMethodUtils.attachSpanFromStore(
-            sessionContextStore, (StatelessSession) session, criteriaContextStore, criteria);
-      }
+
+    public static class GetTransactionAdvice {
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void getTransaction(
+                @Advice.This final Object session, @Advice.Return final Transaction transaction) {
+
+            final ContextStore<Transaction, SessionState> transactionContextStore =
+                    InstrumentationContext.get(Transaction.class, SessionState.class);
+
+            if (session instanceof Session) {
+                final ContextStore<Session, SessionState> sessionContextStore =
+                        InstrumentationContext.get(Session.class, SessionState.class);
+                SessionMethodUtils.attachSpanFromStore(
+                        sessionContextStore, (Session) session, transactionContextStore, transaction);
+            } else if (session instanceof StatelessSession) {
+                final ContextStore<StatelessSession, SessionState> sessionContextStore =
+                        InstrumentationContext.get(StatelessSession.class, SessionState.class);
+                SessionMethodUtils.attachSpanFromStore(
+                        sessionContextStore, (StatelessSession) session, transactionContextStore, transaction);
+            }
+        }
+
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
+         */
+        public static void muzzleCheck(
+                // Not in 4.0
+                final Validatable validatable,
+                // Not before 3.3.0.GA
+                final JBossTransactionManagerLookup lookup) {
+            validatable.validate();
+            lookup.getUserTransactionName();
+        }
     }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
-     */
-    public static void muzzleCheck(
-        // Not in 4.0
-        final Validatable validatable,
-        // Not before 3.3.0.GA
-        final JBossTransactionManagerLookup lookup) {
-      validatable.validate();
-      lookup.getUserTransactionName();
+    public static class GetCriteriaAdvice {
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void getCriteria(@Advice.This final Object session, @Advice.Return final Criteria criteria) {
+
+            final ContextStore<Criteria, SessionState> criteriaContextStore =
+                    InstrumentationContext.get(Criteria.class, SessionState.class);
+            if (session instanceof Session) {
+                final ContextStore<Session, SessionState> sessionContextStore =
+                        InstrumentationContext.get(Session.class, SessionState.class);
+                SessionMethodUtils.attachSpanFromStore(
+                        sessionContextStore, (Session) session, criteriaContextStore, criteria);
+            } else if (session instanceof StatelessSession) {
+                final ContextStore<StatelessSession, SessionState> sessionContextStore =
+                        InstrumentationContext.get(StatelessSession.class, SessionState.class);
+                SessionMethodUtils.attachSpanFromStore(
+                        sessionContextStore, (StatelessSession) session, criteriaContextStore, criteria);
+            }
+        }
+
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
+         */
+        public static void muzzleCheck(
+                // Not in 4.0
+                final Validatable validatable,
+                // Not before 3.3.0.GA
+                final JBossTransactionManagerLookup lookup) {
+            validatable.validate();
+            lookup.getUserTransactionName();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/TransactionInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/TransactionInstrumentation.java
index 9ea2ae215aa..314fce27754 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/TransactionInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/TransactionInstrumentation.java
@@ -17,65 +17,65 @@
 import org.hibernate.transaction.JBossTransactionManagerLookup;
 
 public final class TransactionInstrumentation extends AbstractHibernateInstrumentation {
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.hibernate.engine.transaction.spi.CMTTransaction",
-      "org.hibernate.transaction.CMTTransaction",
-      "org.hibernate.transaction.JDBCTransaction",
-      "org.hibernate.transaction.JTATransaction"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.hibernate.engine.transaction.spi.CMTTransaction",
+            "org.hibernate.transaction.CMTTransaction",
+            "org.hibernate.transaction.JDBCTransaction",
+            "org.hibernate.transaction.JTATransaction"
+        };
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.hibernate.Transaction";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.hibernate.Transaction";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("commit")).and(takesArguments(0)),
-        TransactionInstrumentation.class.getName() + "$TransactionCommitAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("commit")).and(takesArguments(0)),
+                TransactionInstrumentation.class.getName() + "$TransactionCommitAdvice");
+    }
 
-  public static class TransactionCommitAdvice {
+    public static class TransactionCommitAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static SessionState startCommit(@Advice.This final Transaction transaction) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static SessionState startCommit(@Advice.This final Transaction transaction) {
 
-      final ContextStore<Transaction, SessionState> contextStore =
-          InstrumentationContext.get(Transaction.class, SessionState.class);
+            final ContextStore<Transaction, SessionState> contextStore =
+                    InstrumentationContext.get(Transaction.class, SessionState.class);
 
-      return SessionMethodUtils.startScopeFrom(
-          contextStore, transaction, "hibernate.transaction.commit", null, true);
-    }
+            return SessionMethodUtils.startScopeFrom(
+                    contextStore, transaction, "hibernate.transaction.commit", null, true);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void endCommit(
-        @Advice.This final Transaction transaction,
-        @Advice.Enter final SessionState state,
-        @Advice.Thrown final Throwable throwable) {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void endCommit(
+                @Advice.This final Transaction transaction,
+                @Advice.Enter final SessionState state,
+                @Advice.Thrown final Throwable throwable) {
 
-      SessionMethodUtils.closeScope(state, throwable, null, true);
-    }
+            SessionMethodUtils.closeScope(state, throwable, null, true);
+        }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
-     */
-    public static void muzzleCheck(
-        // Not in 4.0
-        final Validatable validatable,
-        // Not before 3.3.0.GA
-        final JBossTransactionManagerLookup lookup) {
-      validatable.validate();
-      lookup.getUserTransactionName();
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate between 3.3 and 4.
+         */
+        public static void muzzleCheck(
+                // Not in 4.0
+                final Validatable validatable,
+                // Not before 3.3.0.GA
+                final JBossTransactionManagerLookup lookup) {
+            validatable.validate();
+            lookup.getUserTransactionName();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/test/java/Value.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/test/java/Value.java
index b8f4235cce9..cd930884b50 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/test/java/Value.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/test/java/Value.java
@@ -11,32 +11,32 @@
 @NamedQuery(name = "TestNamedQuery", query = "from Value")
 public class Value {
 
-  private Long id;
-  private String name;
-
-  public Value() {}
-
-  public Value(final String name) {
-    this.name = name;
-  }
-
-  @Id
-  @GeneratedValue(generator = "increment")
-  @GenericGenerator(name = "increment", strategy = "increment")
-  public Long getId() {
-    return id;
-  }
-
-  private void setId(final Long id) {
-    this.id = id;
-  }
-
-  @Trace
-  public String getName() {
-    return name;
-  }
-
-  public void setName(final String title) {
-    this.name = title;
-  }
+    private Long id;
+    private String name;
+
+    public Value() {}
+
+    public Value(final String name) {
+        this.name = name;
+    }
+
+    @Id
+    @GeneratedValue(generator = "increment")
+    @GenericGenerator(name = "increment", strategy = "increment")
+    public Long getId() {
+        return id;
+    }
+
+    private void setId(final Long id) {
+        this.id = id;
+    }
+
+    @Trace
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String title) {
+        this.name = title;
+    }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/AbstractHibernateInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/AbstractHibernateInstrumentation.java
index 334a1c54c14..743fbe03213 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/AbstractHibernateInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/AbstractHibernateInstrumentation.java
@@ -6,10 +6,10 @@
 import datadog.trace.api.InstrumenterConfig;
 
 public abstract class AbstractHibernateInstrumentation
-    implements Instrumenter.HasMethodAdvice, Instrumenter.CanShortcutTypeMatching {
-  @Override
-  public final boolean onlyMatchKnownTypes() {
-    return InstrumenterConfig.get()
-        .isIntegrationShortcutMatchingEnabled(asList("hibernate", "hibernate-core"), true);
-  }
+        implements Instrumenter.HasMethodAdvice, Instrumenter.CanShortcutTypeMatching {
+    @Override
+    public final boolean onlyMatchKnownTypes() {
+        return InstrumenterConfig.get()
+                .isIntegrationShortcutMatchingEnabled(asList("hibernate", "hibernate-core"), true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/CriteriaInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/CriteriaInstrumentation.java
index ebfb5e4ed15..9c245a68f5e 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/CriteriaInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/CriteriaInstrumentation.java
@@ -18,58 +18,56 @@
 
 public final class CriteriaInstrumentation extends AbstractHibernateInstrumentation {
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.hibernate.internal.CriteriaImpl", "org.hibernate.internal.CriteriaImpl$Subcriteria"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"org.hibernate.internal.CriteriaImpl", "org.hibernate.internal.CriteriaImpl$Subcriteria"};
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.hibernate.Criteria";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.hibernate.Criteria";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("list", "uniqueResult", "scroll")),
-        CriteriaInstrumentation.class.getName() + "$CriteriaMethodAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("list", "uniqueResult", "scroll")),
+                CriteriaInstrumentation.class.getName() + "$CriteriaMethodAdvice");
+    }
 
-  public static class CriteriaMethodAdvice {
+    public static class CriteriaMethodAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static SessionState startMethod(
-        @Advice.This final Criteria criteria,
-        @Advice.Origin("hibernate.criteria.#m") final String operationName) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static SessionState startMethod(
+                @Advice.This final Criteria criteria,
+                @Advice.Origin("hibernate.criteria.#m") final String operationName) {
 
-      final ContextStore<Criteria, SessionState> contextStore =
-          InstrumentationContext.get(Criteria.class, SessionState.class);
+            final ContextStore<Criteria, SessionState> contextStore =
+                    InstrumentationContext.get(Criteria.class, SessionState.class);
 
-      return SessionMethodUtils.startScopeFrom(contextStore, criteria, operationName, null, true);
-    }
+            return SessionMethodUtils.startScopeFrom(contextStore, criteria, operationName, null, true);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void endMethod(
-        @Advice.Enter final SessionState state,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object entity) {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void endMethod(
+                @Advice.Enter final SessionState state,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object entity) {
 
-      SessionMethodUtils.closeScope(state, throwable, entity, true);
-    }
+            SessionMethodUtils.closeScope(state, throwable, entity, true);
+        }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
-     */
-    public static void muzzleCheck(final SharedSessionContract contract) {
-      contract.createCriteria("");
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
+         */
+        public static void muzzleCheck(final SharedSessionContract contract) {
+            contract.createCriteria("");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/HibernateModule.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/HibernateModule.java
index 4ebfad5a737..d3e2839208b 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/HibernateModule.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/HibernateModule.java
@@ -18,38 +18,38 @@
 @AutoService(InstrumenterModule.class)
 public final class HibernateModule extends InstrumenterModule.Tracing {
 
-  static final String SESSION_STATE = "datadog.trace.instrumentation.hibernate.SessionState";
+    static final String SESSION_STATE = "datadog.trace.instrumentation.hibernate.SessionState";
 
-  public HibernateModule() {
-    super("hibernate", "hibernate-core");
-  }
+    public HibernateModule() {
+        super("hibernate", "hibernate-core");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    final Map<String, String> stores = new HashMap<>();
-    stores.put("org.hibernate.SharedSessionContract", SESSION_STATE);
-    stores.put("org.hibernate.Query", SESSION_STATE);
-    stores.put("org.hibernate.Transaction", SESSION_STATE);
-    stores.put("org.hibernate.Criteria", SESSION_STATE);
-    return Collections.unmodifiableMap(stores);
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        final Map<String, String> stores = new HashMap<>();
+        stores.put("org.hibernate.SharedSessionContract", SESSION_STATE);
+        stores.put("org.hibernate.Query", SESSION_STATE);
+        stores.put("org.hibernate.Transaction", SESSION_STATE);
+        stores.put("org.hibernate.Criteria", SESSION_STATE);
+        return Collections.unmodifiableMap(stores);
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.hibernate.SessionMethodUtils",
-      "datadog.trace.instrumentation.hibernate.SessionState",
-      "datadog.trace.instrumentation.hibernate.HibernateDecorator",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.hibernate.SessionMethodUtils",
+            "datadog.trace.instrumentation.hibernate.SessionState",
+            "datadog.trace.instrumentation.hibernate.HibernateDecorator",
+        };
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new SessionInstrumentation(),
-        new SessionFactoryInstrumentation(),
-        new QueryInstrumentation(),
-        new CriteriaInstrumentation(),
-        new TransactionInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(
+                new SessionInstrumentation(),
+                new SessionFactoryInstrumentation(),
+                new QueryInstrumentation(),
+                new CriteriaInstrumentation(),
+                new TransactionInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/IastQueryInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/IastQueryInstrumentation.java
index 7af26fc6164..448c0153e6e 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/IastQueryInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/IastQueryInstrumentation.java
@@ -17,41 +17,41 @@
 
 @AutoService(InstrumenterModule.class)
 public class IastQueryInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public IastQueryInstrumentation() {
-    super("hibernate", "hibernate-core");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.hibernate.internal.AbstractQueryImpl";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("before").and(takesArguments(0))),
-        IastQueryInstrumentation.class.getName() + "$QueryMethodAdvice");
-  }
-
-  public static class QueryMethodAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.SQL_INJECTION)
-    public static void beforeMethod(@Advice.This final Query query) {
-      final SqlInjectionModule module = InstrumentationBridge.SQL_INJECTION;
-      if (module != null) {
-        module.onJdbcQuery(query.getQueryString());
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public IastQueryInstrumentation() {
+        super("hibernate", "hibernate-core");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.hibernate.internal.AbstractQueryImpl";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("before").and(takesArguments(0))),
+                IastQueryInstrumentation.class.getName() + "$QueryMethodAdvice");
     }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
-     */
-    public static void muzzleCheck(final SharedSessionContract contract) {
-      contract.createCriteria("");
+    public static class QueryMethodAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.SQL_INJECTION)
+        public static void beforeMethod(@Advice.This final Query query) {
+            final SqlInjectionModule module = InstrumentationBridge.SQL_INJECTION;
+            if (module != null) {
+                module.onJdbcQuery(query.getQueryString());
+            }
+        }
+
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
+         */
+        public static void muzzleCheck(final SharedSessionContract contract) {
+            contract.createCriteria("");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/QueryInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/QueryInstrumentation.java
index c37929908cc..60f0dea5337 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/QueryInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/QueryInstrumentation.java
@@ -21,76 +21,75 @@
 
 public final class QueryInstrumentation extends AbstractHibernateInstrumentation {
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.hibernate.query.internal.AbstractProducedQuery",
-      "org.hibernate.internal.AbstractQueryImpl",
-      "org.hibernate.internal.CollectionFilterImpl",
-      "org.hibernate.internal.QueryImpl",
-      "org.hibernate.internal.SQLQueryImpl"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.hibernate.query.internal.AbstractProducedQuery",
+            "org.hibernate.internal.AbstractQueryImpl",
+            "org.hibernate.internal.CollectionFilterImpl",
+            "org.hibernate.internal.QueryImpl",
+            "org.hibernate.internal.SQLQueryImpl"
+        };
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.hibernate.Query";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.hibernate.Query";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("list", "executeUpdate", "uniqueResult", "scroll")),
-        QueryInstrumentation.class.getName() + "$QueryMethodAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("list", "executeUpdate", "uniqueResult", "scroll")),
+                QueryInstrumentation.class.getName() + "$QueryMethodAdvice");
+    }
 
-  public static class QueryMethodAdvice {
+    public static class QueryMethodAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static SessionState startMethod(
-        @Advice.This final Query query,
-        @Advice.Origin("hibernate.query.#m") final String operationName) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static SessionState startMethod(
+                @Advice.This final Query query, @Advice.Origin("hibernate.query.#m") final String operationName) {
 
-      final ContextStore<Query, SessionState> contextStore =
-          InstrumentationContext.get(Query.class, SessionState.class);
+            final ContextStore<Query, SessionState> contextStore =
+                    InstrumentationContext.get(Query.class, SessionState.class);
 
-      // Note: We don't know what the entity is until the method is returning.
-      final SessionState state =
-          SessionMethodUtils.startScopeFrom(contextStore, query, operationName, null, true);
-      if (state != null) {
-        DECORATOR.onStatement(spanFromScope(state.getMethodScope()), query.getQueryString());
-      }
-      return state;
-    }
+            // Note: We don't know what the entity is until the method is returning.
+            final SessionState state =
+                    SessionMethodUtils.startScopeFrom(contextStore, query, operationName, null, true);
+            if (state != null) {
+                DECORATOR.onStatement(spanFromScope(state.getMethodScope()), query.getQueryString());
+            }
+            return state;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void endMethod(
-        @Advice.This final Query query,
-        @Advice.Enter final SessionState state,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object returned) {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void endMethod(
+                @Advice.This final Query query,
+                @Advice.Enter final SessionState state,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object returned) {
 
-      Object entity = returned;
-      if (returned == null || query instanceof SQLQuery) {
-        // Not a method that returns results, or the query returns a table rather than an ORM
-        // object.
-        entity = query.getQueryString();
-      }
+            Object entity = returned;
+            if (returned == null || query instanceof SQLQuery) {
+                // Not a method that returns results, or the query returns a table rather than an ORM
+                // object.
+                entity = query.getQueryString();
+            }
 
-      SessionMethodUtils.closeScope(state, throwable, entity, true);
-    }
+            SessionMethodUtils.closeScope(state, throwable, entity, true);
+        }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
-     */
-    public static void muzzleCheck(final SharedSessionContract contract) {
-      contract.createCriteria("");
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
+         */
+        public static void muzzleCheck(final SharedSessionContract contract) {
+            contract.createCriteria("");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionFactoryInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionFactoryInstrumentation.java
index 00482ed4d67..393c63881e4 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionFactoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionFactoryInstrumentation.java
@@ -21,51 +21,51 @@
 
 public final class SessionFactoryInstrumentation extends AbstractHibernateInstrumentation {
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {"org.hibernate.internal.SessionFactoryImpl"};
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"org.hibernate.internal.SessionFactoryImpl"};
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.hibernate.SessionFactory";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.hibernate.SessionFactory";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("openSession", "openStatelessSession"))
-            .and(takesArguments(0))
-            .and(returns(namedOneOf("org.hibernate.Session", "org.hibernate.StatelessSession"))),
-        SessionFactoryInstrumentation.class.getName() + "$SessionFactoryAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("openSession", "openStatelessSession"))
+                        .and(takesArguments(0))
+                        .and(returns(namedOneOf("org.hibernate.Session", "org.hibernate.StatelessSession"))),
+                SessionFactoryInstrumentation.class.getName() + "$SessionFactoryAdvice");
+    }
 
-  public static class SessionFactoryAdvice {
+    public static class SessionFactoryAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void openSession(@Advice.Return final SharedSessionContract session) {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void openSession(@Advice.Return final SharedSessionContract session) {
 
-      final AgentSpan span = startSpan("java-hibernate", HIBERNATE_SESSION);
-      DECORATOR.afterStart(span);
-      DECORATOR.onConnection(span, session);
+            final AgentSpan span = startSpan("java-hibernate", HIBERNATE_SESSION);
+            DECORATOR.afterStart(span);
+            DECORATOR.onConnection(span, session);
 
-      final ContextStore<SharedSessionContract, SessionState> contextStore =
-          InstrumentationContext.get(SharedSessionContract.class, SessionState.class);
-      contextStore.getOrPut(session, new SessionState(span));
-    }
+            final ContextStore<SharedSessionContract, SessionState> contextStore =
+                    InstrumentationContext.get(SharedSessionContract.class, SessionState.class);
+            contextStore.getOrPut(session, new SessionState(span));
+        }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
-     */
-    public static void muzzleCheck(final SharedSessionContract contract) {
-      contract.createCriteria("");
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
+         */
+        public static void muzzleCheck(final SharedSessionContract contract) {
+            contract.createCriteria("");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionInstrumentation.java
index 310ce821165..b48cd9d8447 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionInstrumentation.java
@@ -27,213 +27,204 @@
 
 public final class SessionInstrumentation extends AbstractHibernateInstrumentation {
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.hibernate.internal.SessionImpl", "org.hibernate.internal.StatelessSessionImpl"
-    };
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.hibernate.SharedSessionContract";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("close")).and(takesArguments(0)),
-        SessionInstrumentation.class.getName() + "$SessionCloseAdvice");
-
-    // Session synchronous methods we want to instrument.
-    transformer.applyAdvice(
-        isMethod()
-            .and(
-                namedOneOf(
-                    "save",
-                    "replicate",
-                    "saveOrUpdate",
-                    "update",
-                    "merge",
-                    "persist",
-                    "lock",
-                    "refresh",
-                    "insert",
-                    "delete",
-                    // Iterator methods.
-                    "iterate",
-                    // Lazy-load methods.
-                    "immediateLoad",
-                    "internalLoad")),
-        SessionInstrumentation.class.getName() + "$SessionMethodAdvice");
-    // Handle the non-generic 'get' separately.
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("get"))
-            .and(returns(named("java.lang.Object")))
-            .and(takesArgument(0, named("java.lang.String"))),
-        SessionInstrumentation.class.getName() + "$SessionMethodAdvice");
-
-    // These methods return some object that we want to instrument, and so the Advice will pin the
-    // current Span to the returned object using a ContextStore.
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("beginTransaction", "getTransaction"))
-            .and(returns(named("org.hibernate.Transaction"))),
-        SessionInstrumentation.class.getName() + "$GetTransactionAdvice");
-
-    transformer.applyAdvice(
-        isMethod().and(returns(hasInterface(named("org.hibernate.Query")))),
-        SessionInstrumentation.class.getName() + "$GetQueryAdvice");
-
-    transformer.applyAdvice(
-        isMethod().and(returns(hasInterface(named("org.hibernate.Criteria")))),
-        SessionInstrumentation.class.getName() + "$GetCriteriaAdvice");
-  }
-
-  public static class SessionCloseAdvice {
-
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeSession(
-        @Advice.This final SharedSessionContract session,
-        @Advice.Thrown final Throwable throwable) {
-
-      final ContextStore<SharedSessionContract, SessionState> contextStore =
-          InstrumentationContext.get(SharedSessionContract.class, SessionState.class);
-      final SessionState state = contextStore.get(session);
-      if (state == null || state.getSessionSpan() == null) {
-        return;
-      }
-      if (state.getMethodScope() != null) {
-        state.getMethodScope().close();
-      }
-
-      final AgentSpan span = state.getSessionSpan();
-      DECORATOR.onError(span, throwable);
-      DECORATOR.beforeFinish(span);
-      span.finish();
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"org.hibernate.internal.SessionImpl", "org.hibernate.internal.StatelessSessionImpl"};
     }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
-     */
-    public static void muzzleCheck(final SharedSessionContract contract) {
-      contract.createCriteria("");
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.hibernate.SharedSessionContract";
     }
-  }
-
-  public static class SessionMethodAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static SessionState startMethod(
-        @Advice.This final SharedSessionContract session,
-        @Advice.Origin("hibernate.#m") final String operationName,
-        @Advice.Origin("#m") final String methodName,
-        @Advice.Argument(0) final Object entity,
-        @Advice.Local("startSpan") boolean startSpan) {
-
-      startSpan = !SCOPE_ONLY_METHODS.contains(methodName);
-      final ContextStore<SharedSessionContract, SessionState> contextStore =
-          InstrumentationContext.get(SharedSessionContract.class, SessionState.class);
-      return SessionMethodUtils.startScopeFrom(
-          contextStore, session, operationName, entity, startSpan);
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void endMethod(
-        @Advice.Enter final SessionState sessionState,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Local("startSpan") final boolean startSpan,
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object returned) {
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("close")).and(takesArguments(0)),
+                SessionInstrumentation.class.getName() + "$SessionCloseAdvice");
+
+        // Session synchronous methods we want to instrument.
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf(
+                                "save",
+                                "replicate",
+                                "saveOrUpdate",
+                                "update",
+                                "merge",
+                                "persist",
+                                "lock",
+                                "refresh",
+                                "insert",
+                                "delete",
+                                // Iterator methods.
+                                "iterate",
+                                // Lazy-load methods.
+                                "immediateLoad",
+                                "internalLoad")),
+                SessionInstrumentation.class.getName() + "$SessionMethodAdvice");
+        // Handle the non-generic 'get' separately.
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("get"))
+                        .and(returns(named("java.lang.Object")))
+                        .and(takesArgument(0, named("java.lang.String"))),
+                SessionInstrumentation.class.getName() + "$SessionMethodAdvice");
+
+        // These methods return some object that we want to instrument, and so the Advice will pin the
+        // current Span to the returned object using a ContextStore.
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("beginTransaction", "getTransaction"))
+                        .and(returns(named("org.hibernate.Transaction"))),
+                SessionInstrumentation.class.getName() + "$GetTransactionAdvice");
+
+        transformer.applyAdvice(
+                isMethod().and(returns(hasInterface(named("org.hibernate.Query")))),
+                SessionInstrumentation.class.getName() + "$GetQueryAdvice");
+
+        transformer.applyAdvice(
+                isMethod().and(returns(hasInterface(named("org.hibernate.Criteria")))),
+                SessionInstrumentation.class.getName() + "$GetCriteriaAdvice");
+    }
 
-      SessionMethodUtils.closeScope(sessionState, throwable, returned, startSpan);
+    public static class SessionCloseAdvice {
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeSession(
+                @Advice.This final SharedSessionContract session, @Advice.Thrown final Throwable throwable) {
+
+            final ContextStore<SharedSessionContract, SessionState> contextStore =
+                    InstrumentationContext.get(SharedSessionContract.class, SessionState.class);
+            final SessionState state = contextStore.get(session);
+            if (state == null || state.getSessionSpan() == null) {
+                return;
+            }
+            if (state.getMethodScope() != null) {
+                state.getMethodScope().close();
+            }
+
+            final AgentSpan span = state.getSessionSpan();
+            DECORATOR.onError(span, throwable);
+            DECORATOR.beforeFinish(span);
+            span.finish();
+        }
+
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
+         */
+        public static void muzzleCheck(final SharedSessionContract contract) {
+            contract.createCriteria("");
+        }
     }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
-     */
-    public static void muzzleCheck(final SharedSessionContract contract) {
-      contract.createCriteria("");
+    public static class SessionMethodAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static SessionState startMethod(
+                @Advice.This final SharedSessionContract session,
+                @Advice.Origin("hibernate.#m") final String operationName,
+                @Advice.Origin("#m") final String methodName,
+                @Advice.Argument(0) final Object entity,
+                @Advice.Local("startSpan") boolean startSpan) {
+
+            startSpan = !SCOPE_ONLY_METHODS.contains(methodName);
+            final ContextStore<SharedSessionContract, SessionState> contextStore =
+                    InstrumentationContext.get(SharedSessionContract.class, SessionState.class);
+            return SessionMethodUtils.startScopeFrom(contextStore, session, operationName, entity, startSpan);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void endMethod(
+                @Advice.Enter final SessionState sessionState,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Local("startSpan") final boolean startSpan,
+                @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object returned) {
+
+            SessionMethodUtils.closeScope(sessionState, throwable, returned, startSpan);
+        }
+
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
+         */
+        public static void muzzleCheck(final SharedSessionContract contract) {
+            contract.createCriteria("");
+        }
     }
-  }
 
-  public static class GetQueryAdvice {
+    public static class GetQueryAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void getQuery(
-        @Advice.This final SharedSessionContract session, @Advice.Return final Query query) {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void getQuery(
+                @Advice.This final SharedSessionContract session, @Advice.Return final Query query) {
 
-      final ContextStore<SharedSessionContract, SessionState> sessionContextStore =
-          InstrumentationContext.get(SharedSessionContract.class, SessionState.class);
-      final ContextStore<Query, SessionState> queryContextStore =
-          InstrumentationContext.get(Query.class, SessionState.class);
+            final ContextStore<SharedSessionContract, SessionState> sessionContextStore =
+                    InstrumentationContext.get(SharedSessionContract.class, SessionState.class);
+            final ContextStore<Query, SessionState> queryContextStore =
+                    InstrumentationContext.get(Query.class, SessionState.class);
 
-      SessionMethodUtils.attachSpanFromStore(
-          sessionContextStore, session, queryContextStore, query);
-    }
+            SessionMethodUtils.attachSpanFromStore(sessionContextStore, session, queryContextStore, query);
+        }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
-     */
-    public static void muzzleCheck(final SharedSessionContract contract) {
-      contract.createCriteria("");
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
+         */
+        public static void muzzleCheck(final SharedSessionContract contract) {
+            contract.createCriteria("");
+        }
     }
-  }
 
-  public static class GetTransactionAdvice {
+    public static class GetTransactionAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void getTransaction(
-        @Advice.This final SharedSessionContract session,
-        @Advice.Return final Transaction transaction) {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void getTransaction(
+                @Advice.This final SharedSessionContract session, @Advice.Return final Transaction transaction) {
 
-      final ContextStore<SharedSessionContract, SessionState> sessionContextStore =
-          InstrumentationContext.get(SharedSessionContract.class, SessionState.class);
-      final ContextStore<Transaction, SessionState> transactionContextStore =
-          InstrumentationContext.get(Transaction.class, SessionState.class);
+            final ContextStore<SharedSessionContract, SessionState> sessionContextStore =
+                    InstrumentationContext.get(SharedSessionContract.class, SessionState.class);
+            final ContextStore<Transaction, SessionState> transactionContextStore =
+                    InstrumentationContext.get(Transaction.class, SessionState.class);
 
-      SessionMethodUtils.attachSpanFromStore(
-          sessionContextStore, session, transactionContextStore, transaction);
-    }
+            SessionMethodUtils.attachSpanFromStore(sessionContextStore, session, transactionContextStore, transaction);
+        }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
-     */
-    public static void muzzleCheck(final SharedSessionContract contract) {
-      contract.createCriteria("");
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
+         */
+        public static void muzzleCheck(final SharedSessionContract contract) {
+            contract.createCriteria("");
+        }
     }
-  }
 
-  public static class GetCriteriaAdvice {
+    public static class GetCriteriaAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void getCriteria(
-        @Advice.This final SharedSessionContract session, @Advice.Return final Criteria criteria) {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void getCriteria(
+                @Advice.This final SharedSessionContract session, @Advice.Return final Criteria criteria) {
 
-      final ContextStore<SharedSessionContract, SessionState> sessionContextStore =
-          InstrumentationContext.get(SharedSessionContract.class, SessionState.class);
-      final ContextStore<Criteria, SessionState> criteriaContextStore =
-          InstrumentationContext.get(Criteria.class, SessionState.class);
+            final ContextStore<SharedSessionContract, SessionState> sessionContextStore =
+                    InstrumentationContext.get(SharedSessionContract.class, SessionState.class);
+            final ContextStore<Criteria, SessionState> criteriaContextStore =
+                    InstrumentationContext.get(Criteria.class, SessionState.class);
 
-      SessionMethodUtils.attachSpanFromStore(
-          sessionContextStore, session, criteriaContextStore, criteria);
-    }
+            SessionMethodUtils.attachSpanFromStore(sessionContextStore, session, criteriaContextStore, criteria);
+        }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
-     */
-    public static void muzzleCheck(final SharedSessionContract contract) {
-      contract.createCriteria("");
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
+         */
+        public static void muzzleCheck(final SharedSessionContract contract) {
+            contract.createCriteria("");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/TransactionInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/TransactionInstrumentation.java
index b9e57eca901..475893dadcb 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/TransactionInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/TransactionInstrumentation.java
@@ -17,60 +17,60 @@
 
 public final class TransactionInstrumentation extends AbstractHibernateInstrumentation {
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.hibernate.engine.transaction.spi.AbstractTransactionImpl",
-      "org.hibernate.engine.transaction.internal.jta.CMTTransaction",
-      "org.hibernate.engine.transaction.internal.jdbc.JdbcTransaction",
-      "org.hibernate.engine.transaction.internal.jta.JtaTransaction"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.hibernate.engine.transaction.spi.AbstractTransactionImpl",
+            "org.hibernate.engine.transaction.internal.jta.CMTTransaction",
+            "org.hibernate.engine.transaction.internal.jdbc.JdbcTransaction",
+            "org.hibernate.engine.transaction.internal.jta.JtaTransaction"
+        };
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.hibernate.Transaction";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.hibernate.Transaction";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("commit")).and(takesArguments(0)),
-        TransactionInstrumentation.class.getName() + "$TransactionCommitAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("commit")).and(takesArguments(0)),
+                TransactionInstrumentation.class.getName() + "$TransactionCommitAdvice");
+    }
 
-  public static class TransactionCommitAdvice {
+    public static class TransactionCommitAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static SessionState startCommit(@Advice.This final Transaction transaction) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static SessionState startCommit(@Advice.This final Transaction transaction) {
 
-      final ContextStore<Transaction, SessionState> contextStore =
-          InstrumentationContext.get(Transaction.class, SessionState.class);
+            final ContextStore<Transaction, SessionState> contextStore =
+                    InstrumentationContext.get(Transaction.class, SessionState.class);
 
-      return SessionMethodUtils.startScopeFrom(
-          contextStore, transaction, "hibernate.transaction.commit", null, true);
-    }
+            return SessionMethodUtils.startScopeFrom(
+                    contextStore, transaction, "hibernate.transaction.commit", null, true);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void endCommit(
-        @Advice.This final Transaction transaction,
-        @Advice.Enter final SessionState state,
-        @Advice.Thrown final Throwable throwable) {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void endCommit(
+                @Advice.This final Transaction transaction,
+                @Advice.Enter final SessionState state,
+                @Advice.Thrown final Throwable throwable) {
 
-      SessionMethodUtils.closeScope(state, throwable, null, true);
-    }
+            SessionMethodUtils.closeScope(state, throwable, null, true);
+        }
 
-    /**
-     * Some cases of instrumentation will match more broadly than others, so this unused method
-     * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
-     */
-    public static void muzzleCheck(final SharedSessionContract contract) {
-      contract.createCriteria("");
+        /**
+         * Some cases of instrumentation will match more broadly than others, so this unused method
+         * allows all instrumentation to uniformly match versions of Hibernate starting at 4.0.
+         */
+        public static void muzzleCheck(final SharedSessionContract contract) {
+            contract.createCriteria("");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/test/java/HibernateDecoratorTest.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/test/java/HibernateDecoratorTest.java
index 4c14b4e5920..0eeb4b35868 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/test/java/HibernateDecoratorTest.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/test/java/HibernateDecoratorTest.java
@@ -11,58 +11,57 @@
 import org.junit.jupiter.api.Test;
 
 class HibernateDecoratorTest {
-  @Test
-  void handlesNullAndExplicitEntityNames() {
-    assertNull(DECORATOR.entityName(null));
-    String name = new String("ExplicitEntity");
-    assertSame(name, DECORATOR.entityName(name));
-    assertEquals("AnotherEntity", DECORATOR.entityName("AnotherEntity"));
-  }
+    @Test
+    void handlesNullAndExplicitEntityNames() {
+        assertNull(DECORATOR.entityName(null));
+        String name = new String("ExplicitEntity");
+        assertSame(name, DECORATOR.entityName(name));
+        assertEquals("AnotherEntity", DECORATOR.entityName("AnotherEntity"));
+    }
 
-  @Test
-  void usesClassNameForDeclaredEntities() {
-    assertEquals(TestEntity.class.getName(), DECORATOR.entityName(new TestEntity()));
-    assertEquals(TestEntity.class.getName(), DECORATOR.entityName(new TestEntity()));
-  }
+    @Test
+    void usesClassNameForDeclaredEntities() {
+        assertEquals(TestEntity.class.getName(), DECORATOR.entityName(new TestEntity()));
+        assertEquals(TestEntity.class.getName(), DECORATOR.entityName(new TestEntity()));
+    }
 
-  @Test
-  void doesNotTreatSubclassesOrPlainObjectsAsDeclaredEntities() {
-    assertNull(DECORATOR.entityName(new EntitySubclass()));
-    assertNull(DECORATOR.entityName(new Object()));
-    assertNull(DECORATOR.entityName(new Object()));
-  }
+    @Test
+    void doesNotTreatSubclassesOrPlainObjectsAsDeclaredEntities() {
+        assertNull(DECORATOR.entityName(new EntitySubclass()));
+        assertNull(DECORATOR.entityName(new Object()));
+        assertNull(DECORATOR.entityName(new Object()));
+    }
 
-  @Test
-  void handlesEmptyAndNestedLists() {
-    assertNull(DECORATOR.entityName(emptyList()));
-    assertNull(DECORATOR.entityName(singletonList(null)));
-    assertEquals(
-        "NestedEntity", DECORATOR.entityName(singletonList(singletonList("NestedEntity"))));
-  }
+    @Test
+    void handlesEmptyAndNestedLists() {
+        assertNull(DECORATOR.entityName(emptyList()));
+        assertNull(DECORATOR.entityName(singletonList(null)));
+        assertEquals("NestedEntity", DECORATOR.entityName(singletonList(singletonList("NestedEntity"))));
+    }
 
-  @Test
-  void resolvesTheCurrentFirstListElement() {
-    List<Object> entities = new ArrayList<>();
-    entities.add(new TestEntity());
-    assertEquals(TestEntity.class.getName(), DECORATOR.entityName(entities));
-    entities.set(0, "ExplicitEntity");
-    assertEquals("ExplicitEntity", DECORATOR.entityName(entities));
-    entities.set(0, new Object());
-    assertNull(DECORATOR.entityName(entities));
-  }
+    @Test
+    void resolvesTheCurrentFirstListElement() {
+        List<Object> entities = new ArrayList<>();
+        entities.add(new TestEntity());
+        assertEquals(TestEntity.class.getName(), DECORATOR.entityName(entities));
+        entities.set(0, "ExplicitEntity");
+        assertEquals("ExplicitEntity", DECORATOR.entityName(entities));
+        entities.set(0, new Object());
+        assertNull(DECORATOR.entityName(entities));
+    }
 
-  @Test
-  void prefersEntityAnnotationOverListContents() {
-    EntityList entities = new EntityList();
-    entities.add("OtherEntity");
-    assertEquals(EntityList.class.getName(), DECORATOR.entityName(entities));
-  }
+    @Test
+    void prefersEntityAnnotationOverListContents() {
+        EntityList entities = new EntityList();
+        entities.add("OtherEntity");
+        assertEquals(EntityList.class.getName(), DECORATOR.entityName(entities));
+    }
 
-  @Entity(name = "CustomEntityName")
-  static class TestEntity {}
+    @Entity(name = "CustomEntityName")
+    static class TestEntity {}
 
-  static class EntitySubclass extends TestEntity {}
+    static class EntitySubclass extends TestEntity {}
 
-  @Entity
-  static class EntityList extends ArrayList<Object> {}
+    @Entity
+    static class EntityList extends ArrayList<Object> {}
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/test/java/Value.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/test/java/Value.java
index b8f4235cce9..cd930884b50 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/test/java/Value.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/test/java/Value.java
@@ -11,32 +11,32 @@
 @NamedQuery(name = "TestNamedQuery", query = "from Value")
 public class Value {
 
-  private Long id;
-  private String name;
-
-  public Value() {}
-
-  public Value(final String name) {
-    this.name = name;
-  }
-
-  @Id
-  @GeneratedValue(generator = "increment")
-  @GenericGenerator(name = "increment", strategy = "increment")
-  public Long getId() {
-    return id;
-  }
-
-  private void setId(final Long id) {
-    this.id = id;
-  }
-
-  @Trace
-  public String getName() {
-    return name;
-  }
-
-  public void setName(final String title) {
-    this.name = title;
-  }
+    private Long id;
+    private String name;
+
+    public Value() {}
+
+    public Value(final String name) {
+        this.name = name;
+    }
+
+    @Id
+    @GeneratedValue(generator = "increment")
+    @GenericGenerator(name = "increment", strategy = "increment")
+    public Long getId() {
+        return id;
+    }
+
+    private void setId(final Long id) {
+        this.id = id;
+    }
+
+    @Trace
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String title) {
+        this.name = title;
+    }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/HibernateModule.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/HibernateModule.java
index fecbb52b0c1..458c274604b 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/HibernateModule.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/HibernateModule.java
@@ -18,31 +18,31 @@
 @AutoService(InstrumenterModule.class)
 public final class HibernateModule extends InstrumenterModule.Tracing {
 
-  static final String SESSION_STATE = "datadog.trace.instrumentation.hibernate.SessionState";
+    static final String SESSION_STATE = "datadog.trace.instrumentation.hibernate.SessionState";
 
-  public HibernateModule() {
-    super("hibernate", "hibernate-core");
-  }
+    public HibernateModule() {
+        super("hibernate", "hibernate-core");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    final Map<String, String> stores = new HashMap<>();
-    stores.put("org.hibernate.SharedSessionContract", SESSION_STATE);
-    stores.put("org.hibernate.procedure.ProcedureCall", SESSION_STATE);
-    return Collections.unmodifiableMap(stores);
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        final Map<String, String> stores = new HashMap<>();
+        stores.put("org.hibernate.SharedSessionContract", SESSION_STATE);
+        stores.put("org.hibernate.procedure.ProcedureCall", SESSION_STATE);
+        return Collections.unmodifiableMap(stores);
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.hibernate.SessionMethodUtils",
-      "datadog.trace.instrumentation.hibernate.SessionState",
-      "datadog.trace.instrumentation.hibernate.HibernateDecorator",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.hibernate.SessionMethodUtils",
+            "datadog.trace.instrumentation.hibernate.SessionState",
+            "datadog.trace.instrumentation.hibernate.HibernateDecorator",
+        };
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(new SessionInstrumentation(), new ProcedureCallInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(new SessionInstrumentation(), new ProcedureCallInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/ProcedureCallInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/ProcedureCallInstrumentation.java
index ba6651816dd..10ddacb6930 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/ProcedureCallInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/ProcedureCallInstrumentation.java
@@ -17,56 +17,54 @@
 import org.hibernate.procedure.ProcedureCall;
 
 public final class ProcedureCallInstrumentation
-    implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {"org.hibernate.procedure.internal.ProcedureCallImpl"};
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"org.hibernate.procedure.internal.ProcedureCallImpl"};
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.hibernate.procedure.ProcedureCall";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.hibernate.procedure.ProcedureCall";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return InstrumenterConfig.get()
-        .isIntegrationShortcutMatchingEnabled(asList("hibernate", "hibernate-core"), true);
-  }
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return InstrumenterConfig.get()
+                .isIntegrationShortcutMatchingEnabled(asList("hibernate", "hibernate-core"), true);
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("getOutputs")),
-        ProcedureCallInstrumentation.class.getName() + "$ProcedureCallMethodAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("getOutputs")),
+                ProcedureCallInstrumentation.class.getName() + "$ProcedureCallMethodAdvice");
+    }
 
-  public static class ProcedureCallMethodAdvice {
+    public static class ProcedureCallMethodAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static SessionState startMethod(
-        @Advice.This final ProcedureCall call,
-        @Advice.Origin("hibernate.procedure.#m") final String operationName) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static SessionState startMethod(
+                @Advice.This final ProcedureCall call,
+                @Advice.Origin("hibernate.procedure.#m") final String operationName) {
 
-      final ContextStore<ProcedureCall, SessionState> contextStore =
-          InstrumentationContext.get(ProcedureCall.class, SessionState.class);
+            final ContextStore<ProcedureCall, SessionState> contextStore =
+                    InstrumentationContext.get(ProcedureCall.class, SessionState.class);
 
-      final SessionState state =
-          SessionMethodUtils.startScopeFrom(
-              contextStore, call, operationName, call.getProcedureName(), true);
-      return state;
-    }
+            final SessionState state =
+                    SessionMethodUtils.startScopeFrom(contextStore, call, operationName, call.getProcedureName(), true);
+            return state;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void endMethod(
-        @Advice.Enter final SessionState state, @Advice.Thrown final Throwable throwable) {
-      SessionMethodUtils.closeScope(state, throwable, null, true);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void endMethod(@Advice.Enter final SessionState state, @Advice.Thrown final Throwable throwable) {
+            SessionMethodUtils.closeScope(state, throwable, null, true);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/SessionInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/SessionInstrumentation.java
index d7073bae68d..2e069aeb92c 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/SessionInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/SessionInstrumentation.java
@@ -20,57 +20,55 @@
 import org.hibernate.procedure.ProcedureCall;
 
 public final class SessionInstrumentation
-    implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.hibernate.internal.AbstractSessionImpl",
-      "org.hibernate.internal.AbstractSharedSessionContract",
-      "org.hibernate.impl.SessionImpl",
-      "org.hibernate.impl.StatelessSessionImpl",
-      "org.hibernate.internal.SessionImpl",
-      "org.hibernate.internal.StatelessSessionImpl"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.hibernate.internal.AbstractSessionImpl",
+            "org.hibernate.internal.AbstractSharedSessionContract",
+            "org.hibernate.impl.SessionImpl",
+            "org.hibernate.impl.StatelessSessionImpl",
+            "org.hibernate.internal.SessionImpl",
+            "org.hibernate.internal.StatelessSessionImpl"
+        };
+    }
 
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return InstrumenterConfig.get()
-        .isIntegrationShortcutMatchingEnabled(asList("hibernate", "hibernate-core"), true);
-  }
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return InstrumenterConfig.get()
+                .isIntegrationShortcutMatchingEnabled(asList("hibernate", "hibernate-core"), true);
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.hibernate.SharedSessionContract";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.hibernate.SharedSessionContract";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(returns(hasInterface(named("org.hibernate.procedure.ProcedureCall")))),
-        SessionInstrumentation.class.getName() + "$GetProcedureCallAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(returns(hasInterface(named("org.hibernate.procedure.ProcedureCall")))),
+                SessionInstrumentation.class.getName() + "$GetProcedureCallAdvice");
+    }
 
-  public static class GetProcedureCallAdvice {
+    public static class GetProcedureCallAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void getProcedureCall(
-        @Advice.This final SharedSessionContract session,
-        @Advice.Return final ProcedureCall returned) {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void getProcedureCall(
+                @Advice.This final SharedSessionContract session, @Advice.Return final ProcedureCall returned) {
 
-      final ContextStore<SharedSessionContract, SessionState> sessionContextStore =
-          InstrumentationContext.get(SharedSessionContract.class, SessionState.class);
-      final ContextStore<ProcedureCall, SessionState> returnedContextStore =
-          InstrumentationContext.get(ProcedureCall.class, SessionState.class);
+            final ContextStore<SharedSessionContract, SessionState> sessionContextStore =
+                    InstrumentationContext.get(SharedSessionContract.class, SessionState.class);
+            final ContextStore<ProcedureCall, SessionState> returnedContextStore =
+                    InstrumentationContext.get(ProcedureCall.class, SessionState.class);
 
-      SessionMethodUtils.attachSpanFromStore(
-          sessionContextStore, session, returnedContextStore, returned);
+            SessionMethodUtils.attachSpanFromStore(sessionContextStore, session, returnedContextStore, returned);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/test/java/Value.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/test/java/Value.java
index b8f4235cce9..cd930884b50 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/test/java/Value.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/test/java/Value.java
@@ -11,32 +11,32 @@
 @NamedQuery(name = "TestNamedQuery", query = "from Value")
 public class Value {
 
-  private Long id;
-  private String name;
-
-  public Value() {}
-
-  public Value(final String name) {
-    this.name = name;
-  }
-
-  @Id
-  @GeneratedValue(generator = "increment")
-  @GenericGenerator(name = "increment", strategy = "increment")
-  public Long getId() {
-    return id;
-  }
-
-  private void setId(final Long id) {
-    this.id = id;
-  }
-
-  @Trace
-  public String getName() {
-    return name;
-  }
-
-  public void setName(final String title) {
-    this.name = title;
-  }
+    private Long id;
+    private String name;
+
+    public Value() {}
+
+    public Value(final String name) {
+        this.name = name;
+    }
+
+    @Id
+    @GeneratedValue(generator = "increment")
+    @GenericGenerator(name = "increment", strategy = "increment")
+    public Long getId() {
+        return id;
+    }
+
+    private void setId(final Long id) {
+        this.id = id;
+    }
+
+    @Trace
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String title) {
+        this.name = title;
+    }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/test/java/spring/hibernate/jpa/Customer.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/test/java/spring/hibernate/jpa/Customer.java
index 746aac31e51..4b132fe3504 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/test/java/spring/hibernate/jpa/Customer.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/test/java/spring/hibernate/jpa/Customer.java
@@ -8,34 +8,34 @@
 @Entity
 public class Customer {
 
-  @Id
-  @GeneratedValue(strategy = GenerationType.AUTO)
-  private Long id;
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
 
-  private String firstName;
-  private String lastName;
+    private String firstName;
+    private String lastName;
 
-  protected Customer() {}
+    protected Customer() {}
 
-  public Customer(final String firstName, final String lastName) {
-    this.firstName = firstName;
-    this.lastName = lastName;
-  }
+    public Customer(final String firstName, final String lastName) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
 
-  public Long getId() {
-    return id;
-  }
+    public Long getId() {
+        return id;
+    }
 
-  public String getFirstName() {
-    return firstName;
-  }
+    public String getFirstName() {
+        return firstName;
+    }
 
-  public String getLastName() {
-    return lastName;
-  }
+    public String getLastName() {
+        return lastName;
+    }
 
-  @Override
-  public String toString() {
-    return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
-  }
+    @Override
+    public String toString() {
+        return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/test/java/spring/hibernate/jpa/CustomerRepository.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/test/java/spring/hibernate/jpa/CustomerRepository.java
index e21c17454d9..0704c856617 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/test/java/spring/hibernate/jpa/CustomerRepository.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/test/java/spring/hibernate/jpa/CustomerRepository.java
@@ -5,5 +5,5 @@
 
 public interface CustomerRepository extends CrudRepository<Customer, Long> {
 
-  List<Customer> findByLastName(String lastName);
+    List<Customer> findByLastName(String lastName);
 }
diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/test/java/spring/hibernate/jpa/PersistenceConfig.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/test/java/spring/hibernate/jpa/PersistenceConfig.java
index 7129056bed1..edfd56bd135 100644
--- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/test/java/spring/hibernate/jpa/PersistenceConfig.java
+++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/src/test/java/spring/hibernate/jpa/PersistenceConfig.java
@@ -14,47 +14,47 @@
 @EnableJpaRepositories(basePackages = "spring/hibernate/jpa")
 public class PersistenceConfig {
 
-  @Bean(name = "transactionManager")
-  public PlatformTransactionManager dbTransactionManager() {
-    final JpaTransactionManager transactionManager = new JpaTransactionManager();
-    transactionManager.setEntityManagerFactory(entityManagerFactory().getObject());
-    return transactionManager;
-  }
-
-  @Bean
-  public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
-
-    final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-    vendorAdapter.setDatabase(Database.HSQL);
-    vendorAdapter.setGenerateDdl(true);
-
-    final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
-    em.setDataSource(dataSource());
-    em.setPackagesToScan("spring/hibernate/jpa");
-    em.setJpaVendorAdapter(vendorAdapter);
-    em.setJpaProperties(additionalProperties());
-
-    return em;
-  }
-
-  @Bean
-  public DataSource dataSource() {
-    final DriverManagerDataSource dataSource = new DriverManagerDataSource();
-    dataSource.setDriverClassName("org.hsqldb.jdbcDriver");
-    dataSource.setUrl("jdbc:hsqldb:mem:test");
-    dataSource.setUsername("sa");
-    dataSource.setPassword("1");
-    return dataSource;
-  }
-
-  private Properties additionalProperties() {
-    final Properties properties = new Properties();
-    properties.setProperty("hibernate.show_sql", "true");
-    properties.setProperty("hibernate.hbm2ddl.auto", "create");
-    properties.setProperty("hibernate.dialect", "org.hibernate.dialect.HSQLDialect");
-    //    properties.setProperty(
-    //        "hibernate.format_sql",
-    // env.getProperty("spring.jpa.properties.hibernate.format_sql"));
-    return properties;
-  }
+    @Bean(name = "transactionManager")
+    public PlatformTransactionManager dbTransactionManager() {
+        final JpaTransactionManager transactionManager = new JpaTransactionManager();
+        transactionManager.setEntityManagerFactory(entityManagerFactory().getObject());
+        return transactionManager;
+    }
+
+    @Bean
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
+
+        final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+        vendorAdapter.setDatabase(Database.HSQL);
+        vendorAdapter.setGenerateDdl(true);
+
+        final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+        em.setDataSource(dataSource());
+        em.setPackagesToScan("spring/hibernate/jpa");
+        em.setJpaVendorAdapter(vendorAdapter);
+        em.setJpaProperties(additionalProperties());
+
+        return em;
+    }
+
+    @Bean
+    public DataSource dataSource() {
+        final DriverManagerDataSource dataSource = new DriverManagerDataSource();
+        dataSource.setDriverClassName("org.hsqldb.jdbcDriver");
+        dataSource.setUrl("jdbc:hsqldb:mem:test");
+        dataSource.setUsername("sa");
+        dataSource.setPassword("1");
+        return dataSource;
+    }
+
+    private Properties additionalProperties() {
+        final Properties properties = new Properties();
+        properties.setProperty("hibernate.show_sql", "true");
+        properties.setProperty("hibernate.hbm2ddl.auto", "create");
+        properties.setProperty("hibernate.dialect", "org.hibernate.dialect.HSQLDialect");
+        //    properties.setProperty(
+        //        "hibernate.format_sql",
+        // env.getProperty("spring.jpa.properties.hibernate.format_sql"));
+        return properties;
+    }
 }
diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixDecorator.java b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixDecorator.java
index 9a39c235052..1f55b3fdb3a 100644
--- a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixDecorator.java
+++ b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixDecorator.java
@@ -14,94 +14,92 @@
 import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;
 
 public class HystrixDecorator extends BaseDecorator {
-  public static HystrixDecorator DECORATE = new HystrixDecorator();
+    public static HystrixDecorator DECORATE = new HystrixDecorator();
 
-  private final boolean extraTags;
-  private final boolean measured;
+    private final boolean extraTags;
+    private final boolean measured;
 
-  private HystrixDecorator(boolean extraTags, boolean measured) {
-    this.extraTags = extraTags;
-    this.measured = measured;
-  }
-
-  private HystrixDecorator() {
-    this(Config.get().isHystrixTagsEnabled(), Config.get().isHystrixMeasuredEnabled());
-  }
-
-  public static final CharSequence HYSTRIX = UTF8BytesString.create("hystrix");
-
-  private static final DDCache<ResourceNameCacheKey, String> RESOURCE_NAME_CACHE =
-      DDCaches.newFixedSizeCache(64);
-
-  private static final Functions.ToString<ResourceNameCacheKey> TO_STRING =
-      new Functions.ToString<>();
+    private HystrixDecorator(boolean extraTags, boolean measured) {
+        this.extraTags = extraTags;
+        this.measured = measured;
+    }
 
-  private static final class ResourceNameCacheKey {
-    private final String group;
-    private final String command;
-    private final String methodName;
+    private HystrixDecorator() {
+        this(Config.get().isHystrixTagsEnabled(), Config.get().isHystrixMeasuredEnabled());
+    }
 
-    private ResourceNameCacheKey(String group, String command, String methodName) {
-      this.group = group;
-      this.command = command;
-      this.methodName = methodName;
+    public static final CharSequence HYSTRIX = UTF8BytesString.create("hystrix");
+
+    private static final DDCache<ResourceNameCacheKey, String> RESOURCE_NAME_CACHE = DDCaches.newFixedSizeCache(64);
+
+    private static final Functions.ToString<ResourceNameCacheKey> TO_STRING = new Functions.ToString<>();
+
+    private static final class ResourceNameCacheKey {
+        private final String group;
+        private final String command;
+        private final String methodName;
+
+        private ResourceNameCacheKey(String group, String command, String methodName) {
+            this.group = group;
+            this.command = command;
+            this.methodName = methodName;
+        }
+
+        public String toString() {
+            return group + "." + command + "." + methodName;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            ResourceNameCacheKey cacheKey = (ResourceNameCacheKey) o;
+            return group.equals(cacheKey.group)
+                    && command.equals(cacheKey.command)
+                    && methodName.equals(cacheKey.methodName);
+        }
+
+        @Override
+        public int hashCode() {
+            int hash = 1;
+            hash = 31 * hash + group.hashCode();
+            hash = 31 * hash + command.hashCode();
+            hash = 31 * hash + methodName.hashCode();
+            return hash;
+        }
     }
 
-    public String toString() {
-      return group + "." + command + "." + methodName;
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[0];
     }
 
     @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      ResourceNameCacheKey cacheKey = (ResourceNameCacheKey) o;
-      return group.equals(cacheKey.group)
-          && command.equals(cacheKey.command)
-          && methodName.equals(cacheKey.methodName);
+    protected CharSequence spanType() {
+        return null;
     }
 
     @Override
-    public int hashCode() {
-      int hash = 1;
-      hash = 31 * hash + group.hashCode();
-      hash = 31 * hash + command.hashCode();
-      hash = 31 * hash + methodName.hashCode();
-      return hash;
+    protected CharSequence component() {
+        return HYSTRIX;
     }
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[0];
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return HYSTRIX;
-  }
-
-  public void onCommand(
-      final AgentSpan span, final HystrixInvokableInfo<?> command, final String methodName) {
-    if (command != null) {
-      if (extraTags) {
-        span.setTag(HYSTRIX_COMMAND, command.getCommandKey().name());
-        span.setTag(HYSTRIX_GROUP, command.getCommandGroup().name());
-        span.setTag(HYSTRIX_CIRCUIT_OPEN, command.isCircuitBreakerOpen());
-      }
-      if (measured) {
-        span.setMeasured(true);
-      }
-      span.setResourceName(
-          RESOURCE_NAME_CACHE.computeIfAbsent(
-              new ResourceNameCacheKey(
-                  command.getCommandGroup().name(), command.getCommandKey().name(), methodName),
-              TO_STRING));
+
+    public void onCommand(final AgentSpan span, final HystrixInvokableInfo<?> command, final String methodName) {
+        if (command != null) {
+            if (extraTags) {
+                span.setTag(HYSTRIX_COMMAND, command.getCommandKey().name());
+                span.setTag(HYSTRIX_GROUP, command.getCommandGroup().name());
+                span.setTag(HYSTRIX_CIRCUIT_OPEN, command.isCircuitBreakerOpen());
+            }
+            if (measured) {
+                span.setMeasured(true);
+            }
+            span.setResourceName(RESOURCE_NAME_CACHE.computeIfAbsent(
+                    new ResourceNameCacheKey(
+                            command.getCommandGroup().name(),
+                            command.getCommandKey().name(),
+                            methodName),
+                    TO_STRING));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixInstrumentation.java b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixInstrumentation.java
index 1026c9754f5..5afde8a44c0 100644
--- a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixInstrumentation.java
+++ b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixInstrumentation.java
@@ -16,69 +16,68 @@
 
 @AutoService(InstrumenterModule.class)
 public class HystrixInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public HystrixInstrumentation() {
-    super("hystrix");
-  }
+    public HystrixInstrumentation() {
+        super("hystrix");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "com.netflix.hystrix.HystrixCommand";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "com.netflix.hystrix.HystrixCommand";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(
-        namedOneOf(
-            "com.netflix.hystrix.HystrixCommand", "com.netflix.hystrix.HystrixObservableCommand"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(
+                namedOneOf("com.netflix.hystrix.HystrixCommand", "com.netflix.hystrix.HystrixObservableCommand"));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "rx.DDTracingUtil",
-      "datadog.trace.instrumentation.rxjava.SpanFinishingSubscription",
-      "datadog.trace.instrumentation.rxjava.TracedSubscriber",
-      "datadog.trace.instrumentation.rxjava.TracedOnSubscribe",
-      packageName + ".HystrixDecorator",
-      packageName + ".HystrixDecorator$1",
-      packageName + ".HystrixDecorator$ResourceNameCacheKey",
-      packageName + ".HystrixOnSubscribe",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "rx.DDTracingUtil",
+            "datadog.trace.instrumentation.rxjava.SpanFinishingSubscription",
+            "datadog.trace.instrumentation.rxjava.TracedSubscriber",
+            "datadog.trace.instrumentation.rxjava.TracedOnSubscribe",
+            packageName + ".HystrixDecorator",
+            packageName + ".HystrixDecorator$1",
+            packageName + ".HystrixDecorator$ResourceNameCacheKey",
+            packageName + ".HystrixOnSubscribe",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getExecutionObservable").and(returns(named("rx.Observable"))),
-        HystrixInstrumentation.class.getName() + "$ExecuteAdvice");
-    transformer.applyAdvice(
-        named("getFallbackObservable").and(returns(named("rx.Observable"))),
-        HystrixInstrumentation.class.getName() + "$FallbackAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getExecutionObservable").and(returns(named("rx.Observable"))),
+                HystrixInstrumentation.class.getName() + "$ExecuteAdvice");
+        transformer.applyAdvice(
+                named("getFallbackObservable").and(returns(named("rx.Observable"))),
+                HystrixInstrumentation.class.getName() + "$FallbackAdvice");
+    }
 
-  public static class ExecuteAdvice {
+    public static class ExecuteAdvice {
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.This final HystrixInvokableInfo<?> command,
-        @Advice.Return(readOnly = false) Observable result,
-        @Advice.Thrown final Throwable throwable) {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.This final HystrixInvokableInfo<?> command,
+                @Advice.Return(readOnly = false) Observable result,
+                @Advice.Thrown final Throwable throwable) {
 
-      result = Observable.create(new HystrixOnSubscribe(result, command, "execute"));
+            result = Observable.create(new HystrixOnSubscribe(result, command, "execute"));
+        }
     }
-  }
 
-  public static class FallbackAdvice {
+    public static class FallbackAdvice {
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.This final HystrixInvokableInfo<?> command,
-        @Advice.Return(readOnly = false) Observable<?> result,
-        @Advice.Thrown final Throwable throwable) {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.This final HystrixInvokableInfo<?> command,
+                @Advice.Return(readOnly = false) Observable<?> result,
+                @Advice.Thrown final Throwable throwable) {
 
-      result = Observable.create(new HystrixOnSubscribe(result, command, "fallback"));
+            result = Observable.create(new HystrixOnSubscribe(result, command, "fallback"));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixOnSubscribe.java b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixOnSubscribe.java
index 5a0fa12236f..09be7545bed 100644
--- a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixOnSubscribe.java
+++ b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixOnSubscribe.java
@@ -8,30 +8,28 @@
 import rx.Observable;
 
 public class HystrixOnSubscribe extends TracedOnSubscribe {
-  private static final String OPERATION_NAME = "hystrix.cmd";
+    private static final String OPERATION_NAME = "hystrix.cmd";
 
-  private final HystrixInvokableInfo<?> command;
-  private final String methodName;
+    private final HystrixInvokableInfo<?> command;
+    private final String methodName;
 
-  public HystrixOnSubscribe(
-      final Observable originalObservable,
-      final HystrixInvokableInfo<?> command,
-      final String methodName) {
-    super(originalObservable, OPERATION_NAME, DECORATE);
+    public HystrixOnSubscribe(
+            final Observable originalObservable, final HystrixInvokableInfo<?> command, final String methodName) {
+        super(originalObservable, OPERATION_NAME, DECORATE);
 
-    this.command = command;
-    this.methodName = methodName;
-  }
+        this.command = command;
+        this.methodName = methodName;
+    }
 
-  @Override
-  protected String instrumentationName() {
-    return "hystrix";
-  }
+    @Override
+    protected String instrumentationName() {
+        return "hystrix";
+    }
 
-  @Override
-  protected void afterStart(final AgentSpan span) {
-    super.afterStart(span);
+    @Override
+    protected void afterStart(final AgentSpan span) {
+        super.afterStart(span);
 
-    DECORATE.onCommand(span, command, methodName);
-  }
+        DECORATE.onCommand(span, command, methodName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteInstrumentation.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteInstrumentation.java
index 715144d263f..e2a7e614c85 100644
--- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteInstrumentation.java
+++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteInstrumentation.java
@@ -17,67 +17,61 @@
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 
-public final class IgniteInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+public final class IgniteInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.ignite.Ignite";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.ignite.Ignite";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(
-                namedOneOf(
-                    "createCache",
-                    "getOrCreateCache",
-                    "cache",
-                    "createNearCache",
-                    "getOrCreateNearCache"))
-            .and(returns(hasInterface(named("org.apache.ignite.IgniteCache")))),
-        IgniteInstrumentation.class.getName() + "$IgniteCacheAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(namedOneOf("createCaches", "getOrCreateCaches"))
-            .and(returns(hasInterface(named("java.util.Collection")))),
-        IgniteInstrumentation.class.getName() + "$IgniteCachesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(namedOneOf(
+                                "createCache", "getOrCreateCache", "cache", "createNearCache", "getOrCreateNearCache"))
+                        .and(returns(hasInterface(named("org.apache.ignite.IgniteCache")))),
+                IgniteInstrumentation.class.getName() + "$IgniteCacheAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(namedOneOf("createCaches", "getOrCreateCaches"))
+                        .and(returns(hasInterface(named("java.util.Collection")))),
+                IgniteInstrumentation.class.getName() + "$IgniteCachesAdvice");
+    }
 
-  public static class IgniteCacheAdvice {
+    public static class IgniteCacheAdvice {
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.This Ignite that,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return final IgniteCache<?, ?> cache) {
-      if (cache != null) {
-        InstrumentationContext.get(IgniteCache.class, Ignite.class).put(cache, that);
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.This Ignite that,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return final IgniteCache<?, ?> cache) {
+            if (cache != null) {
+                InstrumentationContext.get(IgniteCache.class, Ignite.class).put(cache, that);
+            }
+        }
     }
-  }
 
-  public static class IgniteCachesAdvice {
+    public static class IgniteCachesAdvice {
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.This Ignite that,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return final Collection<IgniteCache<?, ?>> caches) {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.This Ignite that,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return final Collection<IgniteCache<?, ?>> caches) {
 
-      if (caches != null) {
-        for (IgniteCache<?, ?> cache : caches) {
-          InstrumentationContext.get(IgniteCache.class, Ignite.class).put(cache, that);
+            if (caches != null) {
+                for (IgniteCache<?, ?> cache : caches) {
+                    InstrumentationContext.get(IgniteCache.class, Ignite.class).put(cache, that);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteModule.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteModule.java
index 6db08a3b597..3983e6bacb1 100644
--- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteModule.java
+++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteModule.java
@@ -19,25 +19,25 @@
 @AutoService(InstrumenterModule.class)
 public final class IgniteModule extends InstrumenterModule.Tracing {
 
-  public IgniteModule() {
-    super("ignite");
-  }
+    public IgniteModule() {
+        super("ignite");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return false;
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("org.apache.ignite.IgniteCache", "org.apache.ignite.Ignite");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.apache.ignite.IgniteCache", "org.apache.ignite.Ignite");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new IgniteInstrumentation(),
-        new IgniteCacheSyncInstrumentation(),
-        new IgniteCacheAsyncInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(
+                new IgniteInstrumentation(),
+                new IgniteCacheSyncInstrumentation(),
+                new IgniteCacheAsyncInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/AbstractIgniteCacheInstrumentation.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/AbstractIgniteCacheInstrumentation.java
index b65b504e964..b745e520117 100644
--- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/AbstractIgniteCacheInstrumentation.java
+++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/AbstractIgniteCacheInstrumentation.java
@@ -3,15 +3,15 @@
 import datadog.trace.agent.tooling.Instrumenter;
 
 public abstract class AbstractIgniteCacheInstrumentation
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.apache.ignite.internal.processors.cache.IgniteCacheProxy",
-      "org.apache.ignite.internal.processors.cache.IgniteCacheProxyImpl",
-      "org.apache.ignite.internal.processors.cache.GatewayProtectedCacheProxy",
-      "org.apache.ignite.IgniteCache"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.apache.ignite.internal.processors.cache.IgniteCacheProxy",
+            "org.apache.ignite.internal.processors.cache.IgniteCacheProxyImpl",
+            "org.apache.ignite.internal.processors.cache.GatewayProtectedCacheProxy",
+            "org.apache.ignite.IgniteCache"
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java
index 6af960820a1..229b20d2517 100644
--- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java
+++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java
@@ -19,144 +19,144 @@
 
 public final class IgniteCacheAsyncInstrumentation extends AbstractIgniteCacheInstrumentation {
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(
-                namedOneOf(
-                    "loadCacheAsync",
-                    "sizeAsync",
-                    "sizeLongAsync",
-                    "invokeAllAsync",
-                    "getAllAsync",
-                    "getEntriesAsync",
-                    "getAllOutTxAsync",
-                    "containsKeysAsync",
-                    "putAllAsync",
-                    "removeAllAsync")),
-        IgniteCacheAsyncInstrumentation.class.getName() + "$IgniteAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(
-                namedOneOf(
-                    "getAndPutIfAbsentAsync",
-                    "getAsync",
-                    "getEntryAsync",
-                    "containsKeyAsync",
-                    "getAndPutAsync",
-                    "putAsync",
-                    "putIfAbsentAsync",
-                    "removeAsync",
-                    "getAndRemoveAsync",
-                    "replaceAsync",
-                    "getAndReplaceAsync",
-                    "clearAsync",
-                    "invokeAsync")),
-        IgniteCacheAsyncInstrumentation.class.getName() + "$KeyedAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(namedOneOf(
+                                "loadCacheAsync",
+                                "sizeAsync",
+                                "sizeLongAsync",
+                                "invokeAllAsync",
+                                "getAllAsync",
+                                "getEntriesAsync",
+                                "getAllOutTxAsync",
+                                "containsKeysAsync",
+                                "putAllAsync",
+                                "removeAllAsync")),
+                IgniteCacheAsyncInstrumentation.class.getName() + "$IgniteAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(namedOneOf(
+                                "getAndPutIfAbsentAsync",
+                                "getAsync",
+                                "getEntryAsync",
+                                "containsKeyAsync",
+                                "getAndPutAsync",
+                                "putAsync",
+                                "putIfAbsentAsync",
+                                "removeAsync",
+                                "getAndRemoveAsync",
+                                "replaceAsync",
+                                "getAndReplaceAsync",
+                                "clearAsync",
+                                "invokeAsync")),
+                IgniteCacheAsyncInstrumentation.class.getName() + "$KeyedAdvice");
+    }
 
-  public static class IgniteAdvice {
+    public static class IgniteAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.This final IgniteCache<?, ?> that, @Advice.Origin("#m") final String methodName) {
-      // Ensure that we only create a span for the top-level cache method
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(IgniteCache.class);
-      if (callDepth > 0) {
-        return null;
-      }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.This final IgniteCache<?, ?> that, @Advice.Origin("#m") final String methodName) {
+            // Ensure that we only create a span for the top-level cache method
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(IgniteCache.class);
+            if (callDepth > 0) {
+                return null;
+            }
 
-      final AgentSpan span = startSpan("ignite-cache", IgniteCacheDecorator.OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onIgnite(
-          span, InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that));
-      DECORATE.onOperation(span, that.getName(), methodName);
+            final AgentSpan span = startSpan("ignite-cache", IgniteCacheDecorator.OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onIgnite(
+                    span,
+                    InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that));
+            DECORATE.onOperation(span, that.getName(), methodName);
 
-      // Enable async propagation, so the newly spawned task will be associated back with this
-      // original trace.
-      return activateSpan(span);
-    }
+            // Enable async propagation, so the newly spawned task will be associated back with this
+            // original trace.
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return final IgniteFuture<?> future) {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return final IgniteFuture<?> future) {
 
-      if (scope == null) {
-        return;
-      }
-      // If we have a scope (i.e. we were the top-level Ignite SDK invocation),
-      final AgentSpan span = spanFromScope(scope);
-      if (throwable != null) {
-        // There was a synchronous error,
-        // which means we shouldn't wait for a callback to close the span.
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        // We're calling an async operation, we still need to finish the span when it's
-        // complete and report the results; set an appropriate callback
-        future.listen(new SpanFinishingCallback(span));
-        scope.close();
-      }
-      // else span finished in SpanFinishingCallback
-      CallDepthThreadLocalMap.reset(IgniteCache.class); // reset call depth count
+            if (scope == null) {
+                return;
+            }
+            // If we have a scope (i.e. we were the top-level Ignite SDK invocation),
+            final AgentSpan span = spanFromScope(scope);
+            if (throwable != null) {
+                // There was a synchronous error,
+                // which means we shouldn't wait for a callback to close the span.
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                // We're calling an async operation, we still need to finish the span when it's
+                // complete and report the results; set an appropriate callback
+                future.listen(new SpanFinishingCallback(span));
+                scope.close();
+            }
+            // else span finished in SpanFinishingCallback
+            CallDepthThreadLocalMap.reset(IgniteCache.class); // reset call depth count
+        }
     }
-  }
 
-  public static class KeyedAdvice {
+    public static class KeyedAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.This final IgniteCache<?, ?> that,
-        @Advice.Origin("#m") final String methodName,
-        @Advice.Argument(value = 0, optional = true) final Object key) {
-      // Ensure that we only create a span for the top-level cache method
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(IgniteCache.class);
-      if (callDepth > 0) {
-        return null;
-      }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.This final IgniteCache<?, ?> that,
+                @Advice.Origin("#m") final String methodName,
+                @Advice.Argument(value = 0, optional = true) final Object key) {
+            // Ensure that we only create a span for the top-level cache method
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(IgniteCache.class);
+            if (callDepth > 0) {
+                return null;
+            }
 
-      final AgentSpan span = startSpan("ignite-cache", IgniteCacheDecorator.OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onIgnite(
-          span, InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that));
-      DECORATE.onOperation(span, that.getName(), methodName, key);
+            final AgentSpan span = startSpan("ignite-cache", IgniteCacheDecorator.OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onIgnite(
+                    span,
+                    InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that));
+            DECORATE.onOperation(span, that.getName(), methodName, key);
 
-      // Enable async propagation, so the newly spawned task will be associated back with this
-      // original trace.
-      return activateSpan(span);
-    }
+            // Enable async propagation, so the newly spawned task will be associated back with this
+            // original trace.
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return final IgniteFuture<?> future) {
-      if (scope == null) {
-        return;
-      }
-      // If we have a scope (i.e. we were the top-level Ignite SDK invocation),
-      final AgentSpan span = spanFromScope(scope);
-      if (throwable != null) {
-        // There was a synchronous error,
-        // which means we shouldn't wait for a callback to close the span.
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        // We're calling an async operation, we still need to finish the span when it's
-        // complete and report the results; set an appropriate callback
-        future.listen(new SpanFinishingCallback(span));
-        scope.close();
-      } // else span finished in SpanFinishingCallback
-      CallDepthThreadLocalMap.reset(IgniteCache.class); // reset call depth count
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return final IgniteFuture<?> future) {
+            if (scope == null) {
+                return;
+            }
+            // If we have a scope (i.e. we were the top-level Ignite SDK invocation),
+            final AgentSpan span = spanFromScope(scope);
+            if (throwable != null) {
+                // There was a synchronous error,
+                // which means we shouldn't wait for a callback to close the span.
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                // We're calling an async operation, we still need to finish the span when it's
+                // complete and report the results; set an appropriate callback
+                future.listen(new SpanFinishingCallback(span));
+                scope.close();
+            } // else span finished in SpanFinishingCallback
+            CallDepthThreadLocalMap.reset(IgniteCache.class); // reset call depth count
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheDecorator.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheDecorator.java
index 7cd46a731e2..e704bd9581a 100644
--- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheDecorator.java
+++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheDecorator.java
@@ -14,139 +14,135 @@
 import org.apache.ignite.cache.query.SqlQuery;
 
 public class IgniteCacheDecorator extends DBTypeProcessingDatabaseClientDecorator<IgniteCache> {
-  public static final IgniteCacheDecorator DECORATE = new IgniteCacheDecorator();
-  public static final String DB_TYPE = "ignite";
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation(DB_TYPE));
-  private static final CharSequence SPAN_TYPE = InternalSpanTypes.CACHE;
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("ignite-cache");
-
-  private final boolean includeKeys;
-
-  public IgniteCacheDecorator() {
-    this(Config.get().isIgniteCacheIncludeKeys());
-  }
-
-  public IgniteCacheDecorator(boolean includeKeys) {
-    this.includeKeys = includeKeys;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"ignite"};
-  }
-
-  @Override
-  protected String service() {
-    return SpanNaming.instance().namingSchema().cache().service(DB_TYPE);
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return SPAN_TYPE;
-  }
-
-  @Override
-  protected String dbType() {
-    return DB_TYPE;
-  }
-
-  @Override
-  protected String dbUser(IgniteCache igniteCache) {
-    return null;
-  }
-
-  @Override
-  protected String dbInstance(IgniteCache igniteCache) {
-    return null;
-  }
-
-  @Override
-  protected CharSequence dbHostname(IgniteCache igniteCache) {
-    return null;
-  }
-
-  public void onOperation(final AgentSpan span, final String cacheName, final String methodName) {
-    onOperation(span, cacheName, methodName, null);
-  }
-
-  public void onQuery(
-      final AgentSpan span, final String cacheName, final String methodName, final Query query) {
-    if (methodName != null) {
-      span.setTag("ignite.operation", "cache." + methodName);
+    public static final IgniteCacheDecorator DECORATE = new IgniteCacheDecorator();
+    public static final String DB_TYPE = "ignite";
+    public static final CharSequence OPERATION_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation(DB_TYPE));
+    private static final CharSequence SPAN_TYPE = InternalSpanTypes.CACHE;
+    private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("ignite-cache");
+
+    private final boolean includeKeys;
+
+    public IgniteCacheDecorator() {
+        this(Config.get().isIgniteCacheIncludeKeys());
     }
 
-    if (cacheName != null) {
-      span.setTag("ignite.cache.name", cacheName);
+    public IgniteCacheDecorator(boolean includeKeys) {
+        this.includeKeys = includeKeys;
     }
 
-    final String queryType = query.getClass().getSimpleName();
-    span.setTag("ignite.cache.query_type", queryType);
-
-    if (query instanceof SqlFieldsQuery) {
-      IgniteQueryInfo queryInfo =
-          IgniteQueryInfo.ofPreparedStatement(((SqlFieldsQuery) query).getSql());
-
-      span.setResourceName(queryInfo.getSql());
-      span.setTag(Tags.DB_OPERATION, queryInfo.getOperation());
-    } else if (query instanceof SqlQuery) {
-      SqlQuery<?, ?> sqlQuery = (SqlQuery) query;
-      IgniteQueryInfo queryInfo =
-          IgniteQueryInfo.ofPreparedStatement(sqlQuery.getSql(), sqlQuery.getType());
-
-      span.setResourceName(queryInfo.getSql());
-      span.setTag(Tags.DB_OPERATION, queryInfo.getOperation());
-      span.setTag("ignite.cache.entity_type", sqlQuery.getType());
-    } else {
-      final StringBuilder resourceName = new StringBuilder("cache.");
-      resourceName.append(methodName);
-      resourceName.append(' ');
-      resourceName.append(queryType);
-      resourceName.append(" on ");
-      resourceName.append(cacheName);
-      span.setResourceName(resourceName);
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"ignite"};
     }
-  }
 
-  public void onOperation(
-      final AgentSpan span, final String cacheName, final String methodName, Object key) {
+    @Override
+    protected String service() {
+        return SpanNaming.instance().namingSchema().cache().service(DB_TYPE);
+    }
 
-    final StringBuilder resourceName = new StringBuilder("cache.");
-    if (methodName != null && methodName.endsWith("Long")) {
-      resourceName.append(methodName.substring(0, methodName.length() - "Long".length()));
-    } else {
-      resourceName.append(methodName);
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
     }
 
-    span.setTag("ignite.operation", resourceName.toString());
+    @Override
+    protected CharSequence spanType() {
+        return SPAN_TYPE;
+    }
 
-    if (cacheName != null) {
-      span.setTag("ignite.cache.name", cacheName);
-      resourceName.append(" on ");
-      resourceName.append(cacheName);
+    @Override
+    protected String dbType() {
+        return DB_TYPE;
     }
 
-    span.setResourceName(resourceName);
+    @Override
+    protected String dbUser(IgniteCache igniteCache) {
+        return null;
+    }
 
-    if (includeKeys && key != null) {
-      span.setTag("ignite.cache.key", key.toString());
+    @Override
+    protected String dbInstance(IgniteCache igniteCache) {
+        return null;
     }
-  }
 
-  public void onIgnite(final AgentSpan span, final Ignite ignite) {
+    @Override
+    protected CharSequence dbHostname(IgniteCache igniteCache) {
+        return null;
+    }
+
+    public void onOperation(final AgentSpan span, final String cacheName, final String methodName) {
+        onOperation(span, cacheName, methodName, null);
+    }
 
-    if (ignite == null) {
-      return;
+    public void onQuery(final AgentSpan span, final String cacheName, final String methodName, final Query query) {
+        if (methodName != null) {
+            span.setTag("ignite.operation", "cache." + methodName);
+        }
+
+        if (cacheName != null) {
+            span.setTag("ignite.cache.name", cacheName);
+        }
+
+        final String queryType = query.getClass().getSimpleName();
+        span.setTag("ignite.cache.query_type", queryType);
+
+        if (query instanceof SqlFieldsQuery) {
+            IgniteQueryInfo queryInfo = IgniteQueryInfo.ofPreparedStatement(((SqlFieldsQuery) query).getSql());
+
+            span.setResourceName(queryInfo.getSql());
+            span.setTag(Tags.DB_OPERATION, queryInfo.getOperation());
+        } else if (query instanceof SqlQuery) {
+            SqlQuery<?, ?> sqlQuery = (SqlQuery) query;
+            IgniteQueryInfo queryInfo = IgniteQueryInfo.ofPreparedStatement(sqlQuery.getSql(), sqlQuery.getType());
+
+            span.setResourceName(queryInfo.getSql());
+            span.setTag(Tags.DB_OPERATION, queryInfo.getOperation());
+            span.setTag("ignite.cache.entity_type", sqlQuery.getType());
+        } else {
+            final StringBuilder resourceName = new StringBuilder("cache.");
+            resourceName.append(methodName);
+            resourceName.append(' ');
+            resourceName.append(queryType);
+            resourceName.append(" on ");
+            resourceName.append(cacheName);
+            span.setResourceName(resourceName);
+        }
     }
 
-    if (ignite.name() != null) {
-      span.setTag("ignite.instance", ignite.name());
+    public void onOperation(final AgentSpan span, final String cacheName, final String methodName, Object key) {
+
+        final StringBuilder resourceName = new StringBuilder("cache.");
+        if (methodName != null && methodName.endsWith("Long")) {
+            resourceName.append(methodName.substring(0, methodName.length() - "Long".length()));
+        } else {
+            resourceName.append(methodName);
+        }
+
+        span.setTag("ignite.operation", resourceName.toString());
+
+        if (cacheName != null) {
+            span.setTag("ignite.cache.name", cacheName);
+            resourceName.append(" on ");
+            resourceName.append(cacheName);
+        }
+
+        span.setResourceName(resourceName);
+
+        if (includeKeys && key != null) {
+            span.setTag("ignite.cache.key", key.toString());
+        }
+    }
+
+    public void onIgnite(final AgentSpan span, final Ignite ignite) {
+
+        if (ignite == null) {
+            return;
+        }
+
+        if (ignite.name() != null) {
+            span.setTag("ignite.instance", ignite.name());
+        }
+        span.setTag("ignite.version", ignite.version().toString());
     }
-    span.setTag("ignite.version", ignite.version().toString());
-  }
 }
diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheSyncInstrumentation.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheSyncInstrumentation.java
index 29ba55521da..2040a9f42c4 100644
--- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheSyncInstrumentation.java
+++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheSyncInstrumentation.java
@@ -21,166 +21,163 @@
 
 public final class IgniteCacheSyncInstrumentation extends AbstractIgniteCacheInstrumentation {
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(
-                namedOneOf(
-                    "loadCache",
-                    "size",
-                    "sizeLong",
-                    "invokeAll",
-                    "getAll",
-                    "getEntries",
-                    "getAllOutTx",
-                    "containsKeys",
-                    "putAll",
-                    "removeAll")),
-        IgniteCacheSyncInstrumentation.class.getName() + "$IgniteAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(
-                namedOneOf(
-                    "getAndPutIfAbsent",
-                    "get",
-                    "getEntry",
-                    "containsKey",
-                    "getAndPut",
-                    "put",
-                    "putIfAbsent",
-                    "remove",
-                    "getAndRemove",
-                    "replace",
-                    "getAndReplace",
-                    "clear",
-                    "invoke")),
-        IgniteCacheSyncInstrumentation.class.getName() + "$KeyedAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("query"))
-            .and(
-                takesArgument(
-                    0,
-                    namedOneOf(
-                        "org.apache.ignite.cache.query.Query",
-                        "org.apache.ignite.cache.query.SqlFieldsQuery"))),
-        IgniteCacheSyncInstrumentation.class.getName() + "$QueryAdvice");
-  }
-
-  public static class IgniteAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.This final IgniteCache that, @Advice.Origin("#m") final String methodName) {
-      // Ensure that we only create a span for the top-level cache method
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(IgniteCache.class);
-      if (callDepth > 0) {
-        return null;
-      }
-
-      final AgentSpan span = startSpan("ignite-cache", IgniteCacheDecorator.OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onIgnite(
-          span, InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that));
-      DECORATE.onOperation(span, that.getName(), methodName);
-
-      return activateSpan(span);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(namedOneOf(
+                                "loadCache",
+                                "size",
+                                "sizeLong",
+                                "invokeAll",
+                                "getAll",
+                                "getEntries",
+                                "getAllOutTx",
+                                "containsKeys",
+                                "putAll",
+                                "removeAll")),
+                IgniteCacheSyncInstrumentation.class.getName() + "$IgniteAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(namedOneOf(
+                                "getAndPutIfAbsent",
+                                "get",
+                                "getEntry",
+                                "containsKey",
+                                "getAndPut",
+                                "put",
+                                "putIfAbsent",
+                                "remove",
+                                "getAndRemove",
+                                "replace",
+                                "getAndReplace",
+                                "clear",
+                                "invoke")),
+                IgniteCacheSyncInstrumentation.class.getName() + "$KeyedAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("query"))
+                        .and(takesArgument(
+                                0,
+                                namedOneOf(
+                                        "org.apache.ignite.cache.query.Query",
+                                        "org.apache.ignite.cache.query.SqlFieldsQuery"))),
+                IgniteCacheSyncInstrumentation.class.getName() + "$QueryAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-
-      if (scope == null) {
-        return;
-      }
-
-      AgentSpan span = spanFromScope(scope);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
-      CallDepthThreadLocalMap.reset(IgniteCache.class); // reset call depth count
-    }
-  }
-
-  public static class KeyedAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.This final IgniteCache that,
-        @Advice.Origin("#m") final String methodName,
-        @Advice.Argument(value = 0, optional = true) final Object key) {
-      // Ensure that we only create a span for the top-level cache method
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(IgniteCache.class);
-      if (callDepth > 0) {
-        return null;
-      }
-
-      final AgentSpan span = startSpan("ignite-cache", IgniteCacheDecorator.OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onIgnite(
-          span, InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that));
-      DECORATE.onOperation(span, that.getName(), methodName, key);
-
-      return activateSpan(span);
+    public static class IgniteAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.This final IgniteCache that, @Advice.Origin("#m") final String methodName) {
+            // Ensure that we only create a span for the top-level cache method
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(IgniteCache.class);
+            if (callDepth > 0) {
+                return null;
+            }
+
+            final AgentSpan span = startSpan("ignite-cache", IgniteCacheDecorator.OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onIgnite(
+                    span,
+                    InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that));
+            DECORATE.onOperation(span, that.getName(), methodName);
+
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+
+            if (scope == null) {
+                return;
+            }
+
+            AgentSpan span = spanFromScope(scope);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+            CallDepthThreadLocalMap.reset(IgniteCache.class); // reset call depth count
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-
-      AgentSpan span = spanFromScope(scope);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
-      CallDepthThreadLocalMap.reset(IgniteCache.class); // reset call depth count
-    }
-  }
-
-  public static class QueryAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.This final IgniteCache that,
-        @Advice.Origin("#m") final String methodName,
-        @Advice.Argument(0) final Query query) {
-      // Ensure that we only create a span for the top-level cache method
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(IgniteCache.class);
-      if (callDepth > 0) {
-        return null;
-      }
-
-      final AgentSpan span = startSpan("ignite-cache", IgniteCacheDecorator.OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onIgnite(
-          span, InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that));
-      DECORATE.onQuery(span, that.getName(), methodName, query);
-
-      return activateSpan(span);
+    public static class KeyedAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.This final IgniteCache that,
+                @Advice.Origin("#m") final String methodName,
+                @Advice.Argument(value = 0, optional = true) final Object key) {
+            // Ensure that we only create a span for the top-level cache method
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(IgniteCache.class);
+            if (callDepth > 0) {
+                return null;
+            }
+
+            final AgentSpan span = startSpan("ignite-cache", IgniteCacheDecorator.OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onIgnite(
+                    span,
+                    InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that));
+            DECORATE.onOperation(span, that.getName(), methodName, key);
+
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+
+            AgentSpan span = spanFromScope(scope);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+            CallDepthThreadLocalMap.reset(IgniteCache.class); // reset call depth count
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-
-      AgentSpan span = spanFromScope(scope);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
-      CallDepthThreadLocalMap.reset(IgniteCache.class); // reset call depth count
+    public static class QueryAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.This final IgniteCache that,
+                @Advice.Origin("#m") final String methodName,
+                @Advice.Argument(0) final Query query) {
+            // Ensure that we only create a span for the top-level cache method
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(IgniteCache.class);
+            if (callDepth > 0) {
+                return null;
+            }
+
+            final AgentSpan span = startSpan("ignite-cache", IgniteCacheDecorator.OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onIgnite(
+                    span,
+                    InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that));
+            DECORATE.onQuery(span, that.getName(), methodName, query);
+
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+
+            AgentSpan span = spanFromScope(scope);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+            CallDepthThreadLocalMap.reset(IgniteCache.class); // reset call depth count
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteQueryInfo.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteQueryInfo.java
index 391f63737cc..3d55eda0902 100644
--- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteQueryInfo.java
+++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteQueryInfo.java
@@ -13,131 +13,130 @@
 
 public final class IgniteQueryInfo {
 
-  private static final DDCache<Pair<String, String>, IgniteQueryInfo> CACHED_PREPARED_STATEMENTS =
-      DDCaches.newFixedSizeCache(512);
-
-  private static final Function<Pair<String, String>, IgniteQueryInfo> NORMALIZE =
-      // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
-      new Function<Pair<String, String>, IgniteQueryInfo>() {
-        @Override
-        public IgniteQueryInfo apply(Pair<String, String> Pair) {
-          return new IgniteQueryInfo(Pair.getLeft(), Pair.getRight());
-        }
-      };
-
-  private static final UTF8BytesString DEFAULT_OPERATION = UTF8BytesString.create("SELECT");
-
-  private static final Map<String, UTF8BytesString> VALID_DB_OPERATIONS;
-  private static final Map<String, UTF8BytesString> HEALTH_CHECK_STATEMENTS =
-      Collections.singletonMap("SELECT 1", UTF8BytesString.create("SELECT 1"));
-
-  public static IgniteQueryInfo ofStatement(String sql) {
-    return ofStatement(sql, null);
-  }
-
-  public static IgniteQueryInfo ofStatement(String sql, String type) {
-    return new IgniteQueryInfo(sql, type);
-  }
-
-  public static IgniteQueryInfo ofPreparedStatement(String sql) {
-    return ofPreparedStatement(sql, null);
-  }
-
-  public static IgniteQueryInfo ofPreparedStatement(String sql, String type) {
-    return CACHED_PREPARED_STATEMENTS.computeIfAbsent(Pair.of(sql, type), NORMALIZE);
-  }
-
-  static {
-    Map<String, UTF8BytesString> validDbOperations = new HashMap<>();
-    for (String op :
-        Arrays.asList(
-            "SELECT",
-            "INSERT",
-            "DELETE",
-            "UPDATE",
-            "CREATE",
-            "ALTER",
-            "DROP",
-            "TRUNCATE",
-            "GRANT",
-            "COMMIT",
-            "REVOKE",
-            "ROLLBACK",
-            "SAVEPOINT",
-            "WITH",
-            "MERGE")) {
-      validDbOperations.put(op, UTF8BytesString.create(op));
+    private static final DDCache<Pair<String, String>, IgniteQueryInfo> CACHED_PREPARED_STATEMENTS =
+            DDCaches.newFixedSizeCache(512);
+
+    private static final Function<Pair<String, String>, IgniteQueryInfo> NORMALIZE =
+            // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
+            new Function<Pair<String, String>, IgniteQueryInfo>() {
+                @Override
+                public IgniteQueryInfo apply(Pair<String, String> Pair) {
+                    return new IgniteQueryInfo(Pair.getLeft(), Pair.getRight());
+                }
+            };
+
+    private static final UTF8BytesString DEFAULT_OPERATION = UTF8BytesString.create("SELECT");
+
+    private static final Map<String, UTF8BytesString> VALID_DB_OPERATIONS;
+    private static final Map<String, UTF8BytesString> HEALTH_CHECK_STATEMENTS =
+            Collections.singletonMap("SELECT 1", UTF8BytesString.create("SELECT 1"));
+
+    public static IgniteQueryInfo ofStatement(String sql) {
+        return ofStatement(sql, null);
     }
-    VALID_DB_OPERATIONS = Collections.unmodifiableMap(validDbOperations);
-  }
 
-  private final UTF8BytesString operation;
-  private final UTF8BytesString sql;
+    public static IgniteQueryInfo ofStatement(String sql, String type) {
+        return new IgniteQueryInfo(sql, type);
+    }
 
-  public IgniteQueryInfo(String sql, String type) {
+    public static IgniteQueryInfo ofPreparedStatement(String sql) {
+        return ofPreparedStatement(sql, null);
+    }
 
-    UTF8BytesString prospectiveOperation = VALID_DB_OPERATIONS.get(extractOperation(sql));
-    boolean fragment = prospectiveOperation == null; // SQL fragment if not valid op
-    this.operation = prospectiveOperation != null ? prospectiveOperation : DEFAULT_OPERATION;
+    public static IgniteQueryInfo ofPreparedStatement(String sql, String type) {
+        return CACHED_PREPARED_STATEMENTS.computeIfAbsent(Pair.of(sql, type), NORMALIZE);
+    }
 
-    if (HEALTH_CHECK_STATEMENTS.containsKey(sql.toUpperCase())) {
-      // No need to mask health checks
-      this.sql = HEALTH_CHECK_STATEMENTS.get(sql);
+    static {
+        Map<String, UTF8BytesString> validDbOperations = new HashMap<>();
+        for (String op : Arrays.asList(
+                "SELECT",
+                "INSERT",
+                "DELETE",
+                "UPDATE",
+                "CREATE",
+                "ALTER",
+                "DROP",
+                "TRUNCATE",
+                "GRANT",
+                "COMMIT",
+                "REVOKE",
+                "ROLLBACK",
+                "SAVEPOINT",
+                "WITH",
+                "MERGE")) {
+            validDbOperations.put(op, UTF8BytesString.create(op));
+        }
+        VALID_DB_OPERATIONS = Collections.unmodifiableMap(validDbOperations);
+    }
 
-    } else {
+    private final UTF8BytesString operation;
+    private final UTF8BytesString sql;
 
-      if (!fragment) {
-        this.sql = UTF8BytesString.create(SQLNormalizer.normalize(sql));
+    public IgniteQueryInfo(String sql, String type) {
 
-      } else {
-        final StringBuilder sqlBuilder = new StringBuilder();
+        UTF8BytesString prospectiveOperation = VALID_DB_OPERATIONS.get(extractOperation(sql));
+        boolean fragment = prospectiveOperation == null; // SQL fragment if not valid op
+        this.operation = prospectiveOperation != null ? prospectiveOperation : DEFAULT_OPERATION;
 
-        sqlBuilder.append("SELECT *");
+        if (HEALTH_CHECK_STATEMENTS.containsKey(sql.toUpperCase())) {
+            // No need to mask health checks
+            this.sql = HEALTH_CHECK_STATEMENTS.get(sql);
 
-        if (type != null) {
-          sqlBuilder.append(" FROM ");
-          sqlBuilder.append(type);
-        }
+        } else {
 
-        sqlBuilder.append(" WHERE ");
+            if (!fragment) {
+                this.sql = UTF8BytesString.create(SQLNormalizer.normalize(sql));
 
-        sqlBuilder.append(SQLNormalizer.normalize(sql));
+            } else {
+                final StringBuilder sqlBuilder = new StringBuilder();
 
-        this.sql = UTF8BytesString.create(sqlBuilder);
-      }
-    }
-  }
+                sqlBuilder.append("SELECT *");
+
+                if (type != null) {
+                    sqlBuilder.append(" FROM ");
+                    sqlBuilder.append(type);
+                }
 
-  public UTF8BytesString getOperation() {
-    return operation;
-  }
+                sqlBuilder.append(" WHERE ");
 
-  public UTF8BytesString getSql() {
-    return sql;
-  }
+                sqlBuilder.append(SQLNormalizer.normalize(sql));
 
-  public static String extractOperation(CharSequence sql) {
-    if (null == sql) {
-      return null;
+                this.sql = UTF8BytesString.create(sqlBuilder);
+            }
+        }
     }
-    int start = 0;
-    for (int i = 0; i < sql.length(); ++i) {
-      if (Character.isAlphabetic(sql.charAt(i))) {
-        start = i;
-        break;
-      }
+
+    public UTF8BytesString getOperation() {
+        return operation;
     }
-    int firstWhitespace = -1;
-    for (int i = start; i < sql.length(); ++i) {
-      char c = sql.charAt(i);
-      if (Character.isWhitespace(c)) {
-        firstWhitespace = i;
-        break;
-      }
+
+    public UTF8BytesString getSql() {
+        return sql;
     }
-    if (firstWhitespace > -1) {
-      return sql.subSequence(start, firstWhitespace).toString().toUpperCase();
+
+    public static String extractOperation(CharSequence sql) {
+        if (null == sql) {
+            return null;
+        }
+        int start = 0;
+        for (int i = 0; i < sql.length(); ++i) {
+            if (Character.isAlphabetic(sql.charAt(i))) {
+                start = i;
+                break;
+            }
+        }
+        int firstWhitespace = -1;
+        for (int i = start; i < sql.length(); ++i) {
+            char c = sql.charAt(i);
+            if (Character.isWhitespace(c)) {
+                firstWhitespace = i;
+                break;
+            }
+        }
+        if (firstWhitespace > -1) {
+            return sql.subSequence(start, firstWhitespace).toString().toUpperCase();
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/SpanFinishingCallback.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/SpanFinishingCallback.java
index a73fb066cc7..53dbd477c49 100644
--- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/SpanFinishingCallback.java
+++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/SpanFinishingCallback.java
@@ -10,24 +10,24 @@
  */
 public class SpanFinishingCallback implements IgniteInClosure<IgniteFuture<?>> {
 
-  /** Span that we should finish and annotate when the future is complete. */
-  private final AgentSpan span;
+    /** Span that we should finish and annotate when the future is complete. */
+    private final AgentSpan span;
 
-  public SpanFinishingCallback(final AgentSpan span) {
-    this.span = span;
-  }
+    public SpanFinishingCallback(final AgentSpan span) {
+        this.span = span;
+    }
 
-  @Override
-  public void apply(IgniteFuture<?> igniteFuture) {
-    IgniteCacheDecorator.DECORATE.beforeFinish(span);
+    @Override
+    public void apply(IgniteFuture<?> igniteFuture) {
+        IgniteCacheDecorator.DECORATE.beforeFinish(span);
 
-    try {
-      igniteFuture.get(); // propagates failure to the catch block below
-      IgniteCacheDecorator.DECORATE.beforeFinish(span);
-    } catch (Exception e) {
-      IgniteCacheDecorator.DECORATE.onError(span, e);
-    } finally {
-      span.finish();
+        try {
+            igniteFuture.get(); // propagates failure to the catch block below
+            IgniteCacheDecorator.DECORATE.beforeFinish(span);
+        } catch (Exception e) {
+            IgniteCacheDecorator.DECORATE.onError(span, e);
+        } finally {
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1FactoryInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1FactoryInstrumentation.java
index d8700f2bb66..4f1ac5495fe 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1FactoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1FactoryInstrumentation.java
@@ -22,72 +22,70 @@
 
 @AutoService(InstrumenterModule.class)
 public class Json1FactoryInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public Json1FactoryInstrumentation() {
-    super("jackson", "jackson-1");
-  }
+    public Json1FactoryInstrumentation() {
+        super("jackson", "jackson-1");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("createJsonParser")
-            .and(isMethod())
-            .and(
-                takesArguments(String.class)
-                    .or(takesArguments(InputStream.class))
-                    .or(takesArguments(Reader.class))
-                    .or(takesArguments(URL.class))
-                    .or(takesArguments(byte[].class))),
-        Json1FactoryInstrumentation.class.getName() + "$InstrumenterAdvice");
-    transformer.applyAdvice(
-        named("createJsonParser")
-            .and(isMethod())
-            .and(isPublic().and(takesArguments(byte[].class, int.class, int.class))),
-        Json1FactoryInstrumentation.class.getName() + "$Instrumenter2Advice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("createJsonParser")
+                        .and(isMethod())
+                        .and(takesArguments(String.class)
+                                .or(takesArguments(InputStream.class))
+                                .or(takesArguments(Reader.class))
+                                .or(takesArguments(URL.class))
+                                .or(takesArguments(byte[].class))),
+                Json1FactoryInstrumentation.class.getName() + "$InstrumenterAdvice");
+        transformer.applyAdvice(
+                named("createJsonParser")
+                        .and(isMethod())
+                        .and(isPublic().and(takesArguments(byte[].class, int.class, int.class))),
+                Json1FactoryInstrumentation.class.getName() + "$Instrumenter2Advice");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.codehaus.jackson.JsonFactory";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.codehaus.jackson.JsonFactory";
+    }
 
-  public static class InstrumenterAdvice {
+    public static class InstrumenterAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.SSRF) // SSRF takes priority over the propagation one
-    public static void onExit(
-        @Advice.Argument(0) final Object input, @Advice.Return final Object parser) {
-      if (input != null) {
-        final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-        if (propagation != null) {
-          propagation.taintObjectIfTainted(parser, input);
-        }
-        if (input instanceof URL) {
-          final SsrfModule ssrf = InstrumentationBridge.SSRF;
-          if (ssrf != null) {
-            ssrf.onURLConnection(input);
-          }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.SSRF) // SSRF takes priority over the propagation one
+        public static void onExit(@Advice.Argument(0) final Object input, @Advice.Return final Object parser) {
+            if (input != null) {
+                final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+                if (propagation != null) {
+                    propagation.taintObjectIfTainted(parser, input);
+                }
+                if (input instanceof URL) {
+                    final SsrfModule ssrf = InstrumentationBridge.SSRF;
+                    if (ssrf != null) {
+                        ssrf.onURLConnection(input);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class Instrumenter2Advice {
+    public static class Instrumenter2Advice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onExit(
-        @Advice.Argument(0) final byte[] input,
-        @Advice.Argument(1) final int offset,
-        @Advice.Argument(2) final int length,
-        @Advice.Return final Object parser) {
-      if (input != null || length <= 0) {
-        final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-        if (propagation != null) {
-          propagation.taintObjectIfRangeTainted(parser, input, offset, length, false, NOT_MARKED);
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onExit(
+                @Advice.Argument(0) final byte[] input,
+                @Advice.Argument(1) final int offset,
+                @Advice.Argument(2) final int length,
+                @Advice.Return final Object parser) {
+            if (input != null || length <= 0) {
+                final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+                if (propagation != null) {
+                    propagation.taintObjectIfRangeTainted(parser, input, offset, length, false, NOT_MARKED);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1ParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1ParserInstrumentation.java
index ea6387c8908..ec9a412415b 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1ParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/src/main/java/datadog/trace/instrumentation/jackson/codehouse/core/Json1ParserInstrumentation.java
@@ -27,80 +27,77 @@
 /** TODO: keep a stack like structure pointing to the whole path */
 @AutoService(InstrumenterModule.class)
 public class Json1ParserInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  static final String JSON_PARSER = "org.codehaus.jackson.JsonParser";
+    static final String JSON_PARSER = "org.codehaus.jackson.JsonParser";
 
-  public Json1ParserInstrumentation() {
-    super("jackson", "jackson-1");
-  }
+    public Json1ParserInstrumentation() {
+        super("jackson", "jackson-1");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    final String className = Json1ParserInstrumentation.class.getName();
-    transformer.applyAdvice(
-        named("getText").and(isPublic()).and(takesNoArguments()).and(returns(String.class)),
-        className + "$GetTextAdvice");
-    transformer.applyAdvice(
-        named("getCurrentName").and(isPublic()).and(takesNoArguments()).and(returns(String.class)),
-        className + "$GetCurrentNameAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        final String className = Json1ParserInstrumentation.class.getName();
+        transformer.applyAdvice(
+                named("getText").and(isPublic()).and(takesNoArguments()).and(returns(String.class)),
+                className + "$GetTextAdvice");
+        transformer.applyAdvice(
+                named("getCurrentName").and(isPublic()).and(takesNoArguments()).and(returns(String.class)),
+                className + "$GetCurrentNameAdvice");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return JSON_PARSER;
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return JSON_PARSER;
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(
-            named(hierarchyMarkerType())
-                .and(namedNoneOf("org.codehaus.jackson.impl.JsonParserMinimalBase")))
-        .and(declaresMethod(namedOneOf("getText", "getCurrentName")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType())
+                        .and(namedNoneOf("org.codehaus.jackson.impl.JsonParserMinimalBase")))
+                .and(declaresMethod(namedOneOf("getText", "getCurrentName")));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(JSON_PARSER, "datadog.trace.bootstrap.instrumentation.iast.NamedContext");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(JSON_PARSER, "datadog.trace.bootstrap.instrumentation.iast.NamedContext");
+    }
 
-  public static class GetTextAdvice {
+    public static class GetTextAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return String result) {
-      if (jsonParser != null && result != null) {
-        final ContextStore<JsonParser, NamedContext> store =
-            InstrumentationContext.get(JsonParser.class, NamedContext.class);
-        final NamedContext context = NamedContext.getOrCreate(store, jsonParser);
-        final JsonToken current = jsonParser.getCurrentToken();
-        if (current == JsonToken.FIELD_NAME) {
-          context.taintName(result);
-        } else if (current == JsonToken.VALUE_STRING) {
-          context.taintValue(result);
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return String result) {
+            if (jsonParser != null && result != null) {
+                final ContextStore<JsonParser, NamedContext> store =
+                        InstrumentationContext.get(JsonParser.class, NamedContext.class);
+                final NamedContext context = NamedContext.getOrCreate(store, jsonParser);
+                final JsonToken current = jsonParser.getCurrentToken();
+                if (current == JsonToken.FIELD_NAME) {
+                    context.taintName(result);
+                } else if (current == JsonToken.VALUE_STRING) {
+                    context.taintValue(result);
+                }
+            }
         }
-      }
     }
-  }
 
-  /**
-   * Not all field names are caught by {@link JsonParser#getText()}.
-   *
-   * @see JsonParser#getCurrentName()
-   */
-  public static class GetCurrentNameAdvice {
+    /**
+     * Not all field names are caught by {@link JsonParser#getText()}.
+     *
+     * @see JsonParser#getCurrentName()
+     */
+    public static class GetCurrentNameAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return String result) {
-      if (jsonParser != null
-          && result != null
-          && jsonParser.getCurrentToken() == JsonToken.FIELD_NAME) {
-        final ContextStore<JsonParser, NamedContext> store =
-            InstrumentationContext.get(JsonParser.class, NamedContext.class);
-        final NamedContext context = NamedContext.getOrCreate(store, jsonParser);
-        context.taintName(result);
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return String result) {
+            if (jsonParser != null && result != null && jsonParser.getCurrentToken() == JsonToken.FIELD_NAME) {
+                final ContextStore<JsonParser, NamedContext> store =
+                        InstrumentationContext.get(JsonParser.class, NamedContext.class);
+                final NamedContext context = NamedContext.getOrCreate(store, jsonParser);
+                context.taintName(result);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/src/main/java/com/fasterxml/jackson/core/json/JsonParser2Helper.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/src/main/java/com/fasterxml/jackson/core/json/JsonParser2Helper.java
index a0f4ebdac0d..ca8d3ce3509 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/src/main/java/com/fasterxml/jackson/core/json/JsonParser2Helper.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/src/main/java/com/fasterxml/jackson/core/json/JsonParser2Helper.java
@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.core.sym.BytesToNameCanonicalizer2Helper;
 
 public final class JsonParser2Helper {
-  private JsonParser2Helper() {}
+    private JsonParser2Helper() {}
 
-  public static boolean fetchIntern(UTF8StreamJsonParser jsonParser) {
-    return BytesToNameCanonicalizer2Helper.fetchIntern(jsonParser._symbols);
-  }
+    public static boolean fetchIntern(UTF8StreamJsonParser jsonParser) {
+        return BytesToNameCanonicalizer2Helper.fetchIntern(jsonParser._symbols);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/src/main/java/com/fasterxml/jackson/core/sym/BytesToNameCanonicalizer2Helper.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/src/main/java/com/fasterxml/jackson/core/sym/BytesToNameCanonicalizer2Helper.java
index 6b4c1a2f919..6a259cd31c7 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/src/main/java/com/fasterxml/jackson/core/sym/BytesToNameCanonicalizer2Helper.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/src/main/java/com/fasterxml/jackson/core/sym/BytesToNameCanonicalizer2Helper.java
@@ -1,9 +1,9 @@
 package com.fasterxml.jackson.core.sym;
 
 public final class BytesToNameCanonicalizer2Helper {
-  private BytesToNameCanonicalizer2Helper() {}
+    private BytesToNameCanonicalizer2Helper() {}
 
-  public static boolean fetchIntern(BytesToNameCanonicalizer symbols) {
-    return symbols._intern;
-  }
+    public static boolean fetchIntern(BytesToNameCanonicalizer symbols) {
+        return symbols._intern;
+    }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/src/main/java/datadog/trace/instrumentation/jackson_2/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/src/main/java/datadog/trace/instrumentation/jackson_2/core/JsonParserInstrumentation.java
index a33452289f7..21ad6c24ff5 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/src/main/java/datadog/trace/instrumentation/jackson_2/core/JsonParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/src/main/java/datadog/trace/instrumentation/jackson_2/core/JsonParserInstrumentation.java
@@ -29,68 +29,65 @@
 
 @AutoService(InstrumenterModule.class)
 public class JsonParserInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser";
-  static final ElementMatcher.Junction<ClassLoader> VERSION_PRE_2_6_0 =
-      hasClassNamed("com.fasterxml.jackson.core.sym.BytesToNameCanonicalizer");
+    static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser";
+    static final ElementMatcher.Junction<ClassLoader> VERSION_PRE_2_6_0 =
+            hasClassNamed("com.fasterxml.jackson.core.sym.BytesToNameCanonicalizer");
 
-  public JsonParserInstrumentation() {
-    super("jackson", "jackson-2");
-  }
+    public JsonParserInstrumentation() {
+        super("jackson", "jackson-2");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    final String className = JsonParserInstrumentation.class.getName();
-    transformer.applyAdvice(
-        namedOneOf("getCurrentName", "nextFieldName")
-            .and(isPublic())
-            .and(takesNoArguments())
-            .and(returns(String.class)),
-        className + "$NameAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        final String className = JsonParserInstrumentation.class.getName();
+        transformer.applyAdvice(
+                namedOneOf("getCurrentName", "nextFieldName")
+                        .and(isPublic())
+                        .and(takesNoArguments())
+                        .and(returns(String.class)),
+                className + "$NameAdvice");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return TARGET_TYPE;
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return TARGET_TYPE;
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return declaresMethod(namedOneOf("getCurrentName", "nextFieldName"))
-        .and(
-            extendsClass(named(hierarchyMarkerType()))
-                .and(namedNoneOf("com.fasterxml.jackson.core.base.ParserMinimalBase")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return declaresMethod(namedOneOf("getCurrentName", "nextFieldName"))
+                .and(extendsClass(named(hierarchyMarkerType()))
+                        .and(namedNoneOf("com.fasterxml.jackson.core.base.ParserMinimalBase")));
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return VERSION_PRE_2_6_0;
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return VERSION_PRE_2_6_0;
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext");
+    }
 
-  public static class NameAdvice {
+    public static class NameAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return String result) {
-      if (jsonParser != null
-          && result != null
-          && jsonParser.getCurrentToken() == JsonToken.FIELD_NAME) {
-        final ContextStore<JsonParser, NamedContext> store =
-            InstrumentationContext.get(JsonParser.class, NamedContext.class);
-        final NamedContext context = NamedContext.getOrCreate(store, jsonParser);
-        if (jsonParser instanceof UTF8StreamJsonParser
-            && JsonParser2Helper.fetchIntern((UTF8StreamJsonParser) jsonParser)) {
-          context.setCurrentName(result);
-          return;
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return String result) {
+            if (jsonParser != null && result != null && jsonParser.getCurrentToken() == JsonToken.FIELD_NAME) {
+                final ContextStore<JsonParser, NamedContext> store =
+                        InstrumentationContext.get(JsonParser.class, NamedContext.class);
+                final NamedContext context = NamedContext.getOrCreate(store, jsonParser);
+                if (jsonParser instanceof UTF8StreamJsonParser
+                        && JsonParser2Helper.fetchIntern((UTF8StreamJsonParser) jsonParser)) {
+                    context.setCurrentName(result);
+                    return;
+                }
+                context.taintName(result);
+            }
         }
-        context.taintName(result);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/com/fasterxml/jackson/core/json/JsonParser212Helper.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/com/fasterxml/jackson/core/json/JsonParser212Helper.java
index 23f4b75697f..56826fdfbf4 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/com/fasterxml/jackson/core/json/JsonParser212Helper.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/com/fasterxml/jackson/core/json/JsonParser212Helper.java
@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.core.sym.ByteQuadsCanonicalizer212Helper;
 
 public final class JsonParser212Helper {
-  private JsonParser212Helper() {}
+    private JsonParser212Helper() {}
 
-  public static boolean fetchIntern(UTF8StreamJsonParser jsonParser) {
-    return ByteQuadsCanonicalizer212Helper.fetchIntern(jsonParser._symbols);
-  }
+    public static boolean fetchIntern(UTF8StreamJsonParser jsonParser) {
+        return ByteQuadsCanonicalizer212Helper.fetchIntern(jsonParser._symbols);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer212Helper.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer212Helper.java
index 67359ef7889..afc90772ce6 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer212Helper.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer212Helper.java
@@ -1,9 +1,9 @@
 package com.fasterxml.jackson.core.sym;
 
 public final class ByteQuadsCanonicalizer212Helper {
-  private ByteQuadsCanonicalizer212Helper() {}
+    private ByteQuadsCanonicalizer212Helper() {}
 
-  public static boolean fetchIntern(ByteQuadsCanonicalizer symbols) {
-    return symbols._intern;
-  }
+    public static boolean fetchIntern(ByteQuadsCanonicalizer symbols) {
+        return symbols._intern;
+    }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/datadog/trace/instrumentation/jackson_2_12/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/datadog/trace/instrumentation/jackson_2_12/core/JsonParserInstrumentation.java
index 144633ccc19..c85b8b45dba 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/datadog/trace/instrumentation/jackson_2_12/core/JsonParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/datadog/trace/instrumentation/jackson_2_12/core/JsonParserInstrumentation.java
@@ -30,69 +30,66 @@
 
 @AutoService(InstrumenterModule.class)
 public class JsonParserInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser";
-  static final ElementMatcher.Junction<ClassLoader> VERSION_POST_2_8_0_AND_PRE_2_12_0 =
-      hasClassNamed("com.fasterxml.jackson.core.StreamReadCapability")
-          .and(not(hasClassNamed("com.fasterxml.jackson.core.StreamWriteConstraints")));
+    static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser";
+    static final ElementMatcher.Junction<ClassLoader> VERSION_POST_2_8_0_AND_PRE_2_12_0 = hasClassNamed(
+                    "com.fasterxml.jackson.core.StreamReadCapability")
+            .and(not(hasClassNamed("com.fasterxml.jackson.core.StreamWriteConstraints")));
 
-  public JsonParserInstrumentation() {
-    super("jackson", "jackson-2_12");
-  }
+    public JsonParserInstrumentation() {
+        super("jackson", "jackson-2_12");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    final String className = JsonParserInstrumentation.class.getName();
-    transformer.applyAdvice(
-        namedOneOf("getCurrentName", "nextFieldName")
-            .and(isPublic())
-            .and(takesNoArguments())
-            .and(returns(String.class)),
-        className + "$NameAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        final String className = JsonParserInstrumentation.class.getName();
+        transformer.applyAdvice(
+                namedOneOf("getCurrentName", "nextFieldName")
+                        .and(isPublic())
+                        .and(takesNoArguments())
+                        .and(returns(String.class)),
+                className + "$NameAdvice");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return TARGET_TYPE;
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return TARGET_TYPE;
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return declaresMethod(namedOneOf("getCurrentName", "nextFieldName"))
-        .and(
-            extendsClass(named(hierarchyMarkerType()))
-                .and(namedNoneOf("com.fasterxml.jackson.core.base.ParserMinimalBase")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return declaresMethod(namedOneOf("getCurrentName", "nextFieldName"))
+                .and(extendsClass(named(hierarchyMarkerType()))
+                        .and(namedNoneOf("com.fasterxml.jackson.core.base.ParserMinimalBase")));
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return VERSION_POST_2_8_0_AND_PRE_2_12_0;
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return VERSION_POST_2_8_0_AND_PRE_2_12_0;
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext");
+    }
 
-  public static class NameAdvice {
+    public static class NameAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return String result) {
-      if (jsonParser != null
-          && result != null
-          && jsonParser.getCurrentToken() == JsonToken.FIELD_NAME) {
-        final ContextStore<JsonParser, NamedContext> store =
-            InstrumentationContext.get(JsonParser.class, NamedContext.class);
-        final NamedContext context = NamedContext.getOrCreate(store, jsonParser);
-        if (jsonParser instanceof UTF8StreamJsonParser
-            && JsonParser212Helper.fetchIntern((UTF8StreamJsonParser) jsonParser)) {
-          context.setCurrentName(result);
-          return;
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return String result) {
+            if (jsonParser != null && result != null && jsonParser.getCurrentToken() == JsonToken.FIELD_NAME) {
+                final ContextStore<JsonParser, NamedContext> store =
+                        InstrumentationContext.get(JsonParser.class, NamedContext.class);
+                final NamedContext context = NamedContext.getOrCreate(store, jsonParser);
+                if (jsonParser instanceof UTF8StreamJsonParser
+                        && JsonParser212Helper.fetchIntern((UTF8StreamJsonParser) jsonParser)) {
+                    context.setCurrentName(result);
+                    return;
+                }
+                context.taintName(result);
+            }
         }
-        context.taintName(result);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/com/fasterxml/jackson/core/json/JsonParser216Helper.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/com/fasterxml/jackson/core/json/JsonParser216Helper.java
index d2ef89cc015..110cf56161b 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/com/fasterxml/jackson/core/json/JsonParser216Helper.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/com/fasterxml/jackson/core/json/JsonParser216Helper.java
@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.core.sym.ByteQuadsCanonicalizer216Helper;
 
 public final class JsonParser216Helper {
-  private JsonParser216Helper() {}
+    private JsonParser216Helper() {}
 
-  public static boolean fetchInterner(UTF8StreamJsonParser jsonParser) {
-    return ByteQuadsCanonicalizer216Helper.fetchInterner(jsonParser._symbols);
-  }
+    public static boolean fetchInterner(UTF8StreamJsonParser jsonParser) {
+        return ByteQuadsCanonicalizer216Helper.fetchInterner(jsonParser._symbols);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer216Helper.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer216Helper.java
index 7c3a6794650..ad4aa82000d 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer216Helper.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer216Helper.java
@@ -1,9 +1,9 @@
 package com.fasterxml.jackson.core.sym;
 
 public final class ByteQuadsCanonicalizer216Helper {
-  private ByteQuadsCanonicalizer216Helper() {}
+    private ByteQuadsCanonicalizer216Helper() {}
 
-  public static boolean fetchInterner(ByteQuadsCanonicalizer symbols) {
-    return symbols._interner != null;
-  }
+    public static boolean fetchInterner(ByteQuadsCanonicalizer symbols) {
+        return symbols._interner != null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/datadog/trace/instrumentation/jackson_2_16/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/datadog/trace/instrumentation/jackson_2_16/core/JsonParserInstrumentation.java
index 10286709fe3..d838c2c31c5 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/datadog/trace/instrumentation/jackson_2_16/core/JsonParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/datadog/trace/instrumentation/jackson_2_16/core/JsonParserInstrumentation.java
@@ -29,68 +29,65 @@
 
 @AutoService(InstrumenterModule.class)
 public class JsonParserInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser";
-  static final ElementMatcher.Junction<ClassLoader> VERSION_POST_2_16_0 =
-      hasClassNamed("com.fasterxml.jackson.core.StreamWriteConstraints");
+    static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser";
+    static final ElementMatcher.Junction<ClassLoader> VERSION_POST_2_16_0 =
+            hasClassNamed("com.fasterxml.jackson.core.StreamWriteConstraints");
 
-  public JsonParserInstrumentation() {
-    super("jackson", "jackson-2_16");
-  }
+    public JsonParserInstrumentation() {
+        super("jackson", "jackson-2_16");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    final String className = JsonParserInstrumentation.class.getName();
-    transformer.applyAdvice(
-        namedOneOf("getCurrentName", "nextFieldName")
-            .and(isPublic())
-            .and(takesNoArguments())
-            .and(returns(String.class)),
-        className + "$NameAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        final String className = JsonParserInstrumentation.class.getName();
+        transformer.applyAdvice(
+                namedOneOf("getCurrentName", "nextFieldName")
+                        .and(isPublic())
+                        .and(takesNoArguments())
+                        .and(returns(String.class)),
+                className + "$NameAdvice");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return TARGET_TYPE;
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return TARGET_TYPE;
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return declaresMethod(namedOneOf("getCurrentName", "nextFieldName"))
-        .and(
-            extendsClass(named(hierarchyMarkerType()))
-                .and(namedNoneOf("com.fasterxml.jackson.core.base.ParserMinimalBase")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return declaresMethod(namedOneOf("getCurrentName", "nextFieldName"))
+                .and(extendsClass(named(hierarchyMarkerType()))
+                        .and(namedNoneOf("com.fasterxml.jackson.core.base.ParserMinimalBase")));
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return VERSION_POST_2_16_0;
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return VERSION_POST_2_16_0;
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext");
+    }
 
-  public static class NameAdvice {
+    public static class NameAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return String result) {
-      if (jsonParser != null
-          && result != null
-          && jsonParser.getCurrentToken() == JsonToken.FIELD_NAME) {
-        final ContextStore<JsonParser, NamedContext> store =
-            InstrumentationContext.get(JsonParser.class, NamedContext.class);
-        final NamedContext context = NamedContext.getOrCreate(store, jsonParser);
-        if (jsonParser instanceof UTF8StreamJsonParser
-            && JsonParser216Helper.fetchInterner((UTF8StreamJsonParser) jsonParser)) {
-          context.setCurrentName(result);
-          return;
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return String result) {
+            if (jsonParser != null && result != null && jsonParser.getCurrentToken() == JsonToken.FIELD_NAME) {
+                final ContextStore<JsonParser, NamedContext> store =
+                        InstrumentationContext.get(JsonParser.class, NamedContext.class);
+                final NamedContext context = NamedContext.getOrCreate(store, jsonParser);
+                if (jsonParser instanceof UTF8StreamJsonParser
+                        && JsonParser216Helper.fetchInterner((UTF8StreamJsonParser) jsonParser)) {
+                    context.setCurrentName(result);
+                    return;
+                }
+                context.taintName(result);
+            }
         }
-        context.taintName(result);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/com/fasterxml/jackson/core/json/JsonParser26Helper.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/com/fasterxml/jackson/core/json/JsonParser26Helper.java
index c429359ff7b..7561fa5f48a 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/com/fasterxml/jackson/core/json/JsonParser26Helper.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/com/fasterxml/jackson/core/json/JsonParser26Helper.java
@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.core.sym.ByteQuadsCanonicalizer26Helper;
 
 public final class JsonParser26Helper {
-  private JsonParser26Helper() {}
+    private JsonParser26Helper() {}
 
-  public static boolean fetchIntern(UTF8StreamJsonParser jsonParser) {
-    return ByteQuadsCanonicalizer26Helper.fetchIntern(jsonParser._symbols);
-  }
+    public static boolean fetchIntern(UTF8StreamJsonParser jsonParser) {
+        return ByteQuadsCanonicalizer26Helper.fetchIntern(jsonParser._symbols);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer26Helper.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer26Helper.java
index 6e3a3bf26aa..cd8e420b4c4 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer26Helper.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer26Helper.java
@@ -1,9 +1,9 @@
 package com.fasterxml.jackson.core.sym;
 
 public final class ByteQuadsCanonicalizer26Helper {
-  private ByteQuadsCanonicalizer26Helper() {}
+    private ByteQuadsCanonicalizer26Helper() {}
 
-  public static boolean fetchIntern(ByteQuadsCanonicalizer symbols) {
-    return symbols._intern;
-  }
+    public static boolean fetchIntern(ByteQuadsCanonicalizer symbols) {
+        return symbols._intern;
+    }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/datadog/trace/instrumentation/jackson_2_6/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/datadog/trace/instrumentation/jackson_2_6/core/JsonParserInstrumentation.java
index b2dc9d5915d..04bb81c1e10 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/datadog/trace/instrumentation/jackson_2_6/core/JsonParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/datadog/trace/instrumentation/jackson_2_6/core/JsonParserInstrumentation.java
@@ -30,69 +30,66 @@
 
 @AutoService(InstrumenterModule.class)
 public class JsonParserInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser";
-  static final ElementMatcher.Junction<ClassLoader> VERSION_POST_2_6_0_AND_PRE_2_8_0 =
-      hasClassNamed("com.fasterxml.jackson.core.sym.ByteQuadsCanonicalizer")
-          .and(not(hasClassNamed("com.fasterxml.jackson.core.JsonpCharacterEscapes")));
+    static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser";
+    static final ElementMatcher.Junction<ClassLoader> VERSION_POST_2_6_0_AND_PRE_2_8_0 = hasClassNamed(
+                    "com.fasterxml.jackson.core.sym.ByteQuadsCanonicalizer")
+            .and(not(hasClassNamed("com.fasterxml.jackson.core.JsonpCharacterEscapes")));
 
-  public JsonParserInstrumentation() {
-    super("jackson", "jackson-2_6");
-  }
+    public JsonParserInstrumentation() {
+        super("jackson", "jackson-2_6");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    final String className = JsonParserInstrumentation.class.getName();
-    transformer.applyAdvice(
-        namedOneOf("getCurrentName", "nextFieldName")
-            .and(isPublic())
-            .and(takesNoArguments())
-            .and(returns(String.class)),
-        className + "$NameAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        final String className = JsonParserInstrumentation.class.getName();
+        transformer.applyAdvice(
+                namedOneOf("getCurrentName", "nextFieldName")
+                        .and(isPublic())
+                        .and(takesNoArguments())
+                        .and(returns(String.class)),
+                className + "$NameAdvice");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return TARGET_TYPE;
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return TARGET_TYPE;
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return declaresMethod(namedOneOf("getCurrentName", "nextFieldName"))
-        .and(
-            extendsClass(named(hierarchyMarkerType()))
-                .and(namedNoneOf("com.fasterxml.jackson.core.base.ParserMinimalBase")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return declaresMethod(namedOneOf("getCurrentName", "nextFieldName"))
+                .and(extendsClass(named(hierarchyMarkerType()))
+                        .and(namedNoneOf("com.fasterxml.jackson.core.base.ParserMinimalBase")));
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return VERSION_POST_2_6_0_AND_PRE_2_8_0;
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return VERSION_POST_2_6_0_AND_PRE_2_8_0;
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext");
+    }
 
-  public static class NameAdvice {
+    public static class NameAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return String result) {
-      if (jsonParser != null
-          && result != null
-          && jsonParser.getCurrentToken() == JsonToken.FIELD_NAME) {
-        final ContextStore<JsonParser, NamedContext> store =
-            InstrumentationContext.get(JsonParser.class, NamedContext.class);
-        final NamedContext context = NamedContext.getOrCreate(store, jsonParser);
-        if (jsonParser instanceof UTF8StreamJsonParser
-            && JsonParser26Helper.fetchIntern((UTF8StreamJsonParser) jsonParser)) {
-          context.setCurrentName(result);
-          return;
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return String result) {
+            if (jsonParser != null && result != null && jsonParser.getCurrentToken() == JsonToken.FIELD_NAME) {
+                final ContextStore<JsonParser, NamedContext> store =
+                        InstrumentationContext.get(JsonParser.class, NamedContext.class);
+                final NamedContext context = NamedContext.getOrCreate(store, jsonParser);
+                if (jsonParser instanceof UTF8StreamJsonParser
+                        && JsonParser26Helper.fetchIntern((UTF8StreamJsonParser) jsonParser)) {
+                    context.setCurrentName(result);
+                    return;
+                }
+                context.taintName(result);
+            }
         }
-        context.taintName(result);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/com/fasterxml/jackson/core/json/JsonParser28Helper.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/com/fasterxml/jackson/core/json/JsonParser28Helper.java
index 1564447784a..c70fe30633e 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/com/fasterxml/jackson/core/json/JsonParser28Helper.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/com/fasterxml/jackson/core/json/JsonParser28Helper.java
@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.core.sym.ByteQuadsCanonicalizer28Helper;
 
 public final class JsonParser28Helper {
-  private JsonParser28Helper() {}
+    private JsonParser28Helper() {}
 
-  public static boolean fetchIntern(UTF8StreamJsonParser jsonParser) {
-    return ByteQuadsCanonicalizer28Helper.fetchIntern(jsonParser._symbols);
-  }
+    public static boolean fetchIntern(UTF8StreamJsonParser jsonParser) {
+        return ByteQuadsCanonicalizer28Helper.fetchIntern(jsonParser._symbols);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer28Helper.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer28Helper.java
index e681978d13c..f670d34167e 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer28Helper.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer28Helper.java
@@ -6,32 +6,32 @@
 import org.slf4j.LoggerFactory;
 
 public final class ByteQuadsCanonicalizer28Helper {
-  private ByteQuadsCanonicalizer28Helper() {}
+    private ByteQuadsCanonicalizer28Helper() {}
 
-  private static final Logger log = LoggerFactory.getLogger(ByteQuadsCanonicalizer28Helper.class);
+    private static final Logger log = LoggerFactory.getLogger(ByteQuadsCanonicalizer28Helper.class);
 
-  private static final Field INTERN = prepareIntern();
+    private static final Field INTERN = prepareIntern();
 
-  private static Field prepareIntern() {
-    Field _intern = null;
-    try {
-      _intern = ByteQuadsCanonicalizer.class.getDeclaredField("_intern");
-      _intern.setAccessible(true);
-    } catch (Throwable e) {
-      log.debug("Failed to get ByteQuadsCanonicalizer _intern field", e);
-      return null;
+    private static Field prepareIntern() {
+        Field _intern = null;
+        try {
+            _intern = ByteQuadsCanonicalizer.class.getDeclaredField("_intern");
+            _intern.setAccessible(true);
+        } catch (Throwable e) {
+            log.debug("Failed to get ByteQuadsCanonicalizer _intern field", e);
+            return null;
+        }
+        return _intern;
     }
-    return _intern;
-  }
 
-  public static boolean fetchIntern(ByteQuadsCanonicalizer symbols) {
-    if (INTERN == null) {
-      return false;
+    public static boolean fetchIntern(ByteQuadsCanonicalizer symbols) {
+        if (INTERN == null) {
+            return false;
+        }
+        try {
+            return (boolean) INTERN.get(symbols);
+        } catch (IllegalAccessException e) {
+            throw new UndeclaredThrowableException(e);
+        }
     }
-    try {
-      return (boolean) INTERN.get(symbols);
-    } catch (IllegalAccessException e) {
-      throw new UndeclaredThrowableException(e);
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/datadog/trace/instrumentation/jackson_2_8/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/datadog/trace/instrumentation/jackson_2_8/core/JsonParserInstrumentation.java
index da03ee6f986..bb85ca303f6 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/datadog/trace/instrumentation/jackson_2_8/core/JsonParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/datadog/trace/instrumentation/jackson_2_8/core/JsonParserInstrumentation.java
@@ -30,69 +30,66 @@
 
 @AutoService(InstrumenterModule.class)
 public class JsonParserInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser";
-  static final ElementMatcher.Junction<ClassLoader> VERSION_POST_2_8_0_AND_PRE_2_12_0 =
-      hasClassNamed("com.fasterxml.jackson.core.JsonpCharacterEscapes")
-          .and(not(hasClassNamed("com.fasterxml.jackson.core.StreamReadCapability")));
+    static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser";
+    static final ElementMatcher.Junction<ClassLoader> VERSION_POST_2_8_0_AND_PRE_2_12_0 = hasClassNamed(
+                    "com.fasterxml.jackson.core.JsonpCharacterEscapes")
+            .and(not(hasClassNamed("com.fasterxml.jackson.core.StreamReadCapability")));
 
-  public JsonParserInstrumentation() {
-    super("jackson", "jackson-2_8");
-  }
+    public JsonParserInstrumentation() {
+        super("jackson", "jackson-2_8");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    final String className = JsonParserInstrumentation.class.getName();
-    transformer.applyAdvice(
-        namedOneOf("getCurrentName", "nextFieldName")
-            .and(isPublic())
-            .and(takesNoArguments())
-            .and(returns(String.class)),
-        className + "$NameAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        final String className = JsonParserInstrumentation.class.getName();
+        transformer.applyAdvice(
+                namedOneOf("getCurrentName", "nextFieldName")
+                        .and(isPublic())
+                        .and(takesNoArguments())
+                        .and(returns(String.class)),
+                className + "$NameAdvice");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return TARGET_TYPE;
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return TARGET_TYPE;
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return declaresMethod(namedOneOf("getCurrentName", "nextFieldName"))
-        .and(
-            extendsClass(named(hierarchyMarkerType()))
-                .and(namedNoneOf("com.fasterxml.jackson.core.base.ParserMinimalBase")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return declaresMethod(namedOneOf("getCurrentName", "nextFieldName"))
+                .and(extendsClass(named(hierarchyMarkerType()))
+                        .and(namedNoneOf("com.fasterxml.jackson.core.base.ParserMinimalBase")));
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return VERSION_POST_2_8_0_AND_PRE_2_12_0;
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return VERSION_POST_2_8_0_AND_PRE_2_12_0;
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext");
+    }
 
-  public static class NameAdvice {
+    public static class NameAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return String result) {
-      if (jsonParser != null
-          && result != null
-          && jsonParser.getCurrentToken() == JsonToken.FIELD_NAME) {
-        final ContextStore<JsonParser, NamedContext> store =
-            InstrumentationContext.get(JsonParser.class, NamedContext.class);
-        final NamedContext context = NamedContext.getOrCreate(store, jsonParser);
-        if (jsonParser instanceof UTF8StreamJsonParser
-            && JsonParser28Helper.fetchIntern((UTF8StreamJsonParser) jsonParser)) {
-          context.setCurrentName(result);
-          return;
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return String result) {
+            if (jsonParser != null && result != null && jsonParser.getCurrentToken() == JsonToken.FIELD_NAME) {
+                final ContextStore<JsonParser, NamedContext> store =
+                        InstrumentationContext.get(JsonParser.class, NamedContext.class);
+                final NamedContext context = NamedContext.getOrCreate(store, jsonParser);
+                if (jsonParser instanceof UTF8StreamJsonParser
+                        && JsonParser28Helper.fetchIntern((UTF8StreamJsonParser) jsonParser)) {
+                    context.setCurrentName(result);
+                    return;
+                }
+                context.taintName(result);
+            }
         }
-        context.taintName(result);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-common/src/main/java/datadog/trace/instrumentation/jackson/core/Json2FactoryInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-common/src/main/java/datadog/trace/instrumentation/jackson/core/Json2FactoryInstrumentation.java
index ff0465fec40..62ae0e2fea2 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-common/src/main/java/datadog/trace/instrumentation/jackson/core/Json2FactoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-common/src/main/java/datadog/trace/instrumentation/jackson/core/Json2FactoryInstrumentation.java
@@ -22,74 +22,71 @@
 
 @AutoService(InstrumenterModule.class)
 public class Json2FactoryInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public Json2FactoryInstrumentation() {
-    super("jackson", "jackson-2");
-  }
+    public Json2FactoryInstrumentation() {
+        super("jackson", "jackson-2");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("createParser")
-            .and(isMethod())
-            .and(
-                isPublic()
-                    .and(
-                        takesArguments(String.class)
-                            .or(takesArguments(InputStream.class))
-                            .or(takesArguments(Reader.class))
-                            .or(takesArguments(URL.class))
-                            .or(takesArguments(byte[].class)))),
-        Json2FactoryInstrumentation.class.getName() + "$InstrumenterAdvice");
-    transformer.applyAdvice(
-        named("createParser")
-            .and(isMethod())
-            .and(isPublic().and(takesArguments(byte[].class, int.class, int.class))),
-        Json2FactoryInstrumentation.class.getName() + "$Instrumenter2Advice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("createParser")
+                        .and(isMethod())
+                        .and(isPublic()
+                                .and(takesArguments(String.class)
+                                        .or(takesArguments(InputStream.class))
+                                        .or(takesArguments(Reader.class))
+                                        .or(takesArguments(URL.class))
+                                        .or(takesArguments(byte[].class)))),
+                Json2FactoryInstrumentation.class.getName() + "$InstrumenterAdvice");
+        transformer.applyAdvice(
+                named("createParser")
+                        .and(isMethod())
+                        .and(isPublic().and(takesArguments(byte[].class, int.class, int.class))),
+                Json2FactoryInstrumentation.class.getName() + "$Instrumenter2Advice");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.fasterxml.jackson.core.JsonFactory";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.fasterxml.jackson.core.JsonFactory";
+    }
 
-  public static class InstrumenterAdvice {
+    public static class InstrumenterAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.SSRF) // it's both propagation and Sink but Sink takes priority
-    public static void onExit(
-        @Advice.Argument(0) final Object input, @Advice.Return final Object parser) {
-      if (input != null) {
-        final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-        if (propagation != null) {
-          propagation.taintObjectIfTainted(parser, input);
-        }
-        if (input instanceof URL) {
-          final SsrfModule ssrf = InstrumentationBridge.SSRF;
-          if (ssrf != null) {
-            ssrf.onURLConnection(input);
-          }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.SSRF) // it's both propagation and Sink but Sink takes priority
+        public static void onExit(@Advice.Argument(0) final Object input, @Advice.Return final Object parser) {
+            if (input != null) {
+                final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+                if (propagation != null) {
+                    propagation.taintObjectIfTainted(parser, input);
+                }
+                if (input instanceof URL) {
+                    final SsrfModule ssrf = InstrumentationBridge.SSRF;
+                    if (ssrf != null) {
+                        ssrf.onURLConnection(input);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class Instrumenter2Advice {
+    public static class Instrumenter2Advice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onExit(
-        @Advice.Argument(0) final byte[] input,
-        @Advice.Argument(1) final int offset,
-        @Advice.Argument(2) final int length,
-        @Advice.Return final Object parser) {
-      if (input != null || length <= 0) {
-        final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-        if (propagation != null) {
-          propagation.taintObjectIfRangeTainted(parser, input, offset, length, false, NOT_MARKED);
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onExit(
+                @Advice.Argument(0) final byte[] input,
+                @Advice.Argument(1) final int offset,
+                @Advice.Argument(2) final int length,
+                @Advice.Return final Object parser) {
+            if (input != null || length <= 0) {
+                final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+                if (propagation != null) {
+                    propagation.taintObjectIfRangeTainted(parser, input, offset, length, false, NOT_MARKED);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-common/src/main/java/datadog/trace/instrumentation/jackson/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-common/src/main/java/datadog/trace/instrumentation/jackson/core/JsonParserInstrumentation.java
index fc4b3f59ce2..4c6d4371495 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-common/src/main/java/datadog/trace/instrumentation/jackson/core/JsonParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-common/src/main/java/datadog/trace/instrumentation/jackson/core/JsonParserInstrumentation.java
@@ -26,59 +26,58 @@
 
 @AutoService(InstrumenterModule.class)
 public class JsonParserInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser";
+    static final String TARGET_TYPE = "com.fasterxml.jackson.core.JsonParser";
 
-  public JsonParserInstrumentation() {
-    super("jackson", "jackson-2");
-  }
+    public JsonParserInstrumentation() {
+        super("jackson", "jackson-2");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    final String className = JsonParserInstrumentation.class.getName();
-    transformer.applyAdvice(
-        namedOneOf("getText", "getValueAsString")
-            .and(isPublic())
-            .and(takesNoArguments())
-            .and(returns(String.class)),
-        className + "$TextAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        final String className = JsonParserInstrumentation.class.getName();
+        transformer.applyAdvice(
+                namedOneOf("getText", "getValueAsString")
+                        .and(isPublic())
+                        .and(takesNoArguments())
+                        .and(returns(String.class)),
+                className + "$TextAdvice");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return TARGET_TYPE;
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return TARGET_TYPE;
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return declaresMethod(namedOneOf("getText", "getValueAsString"))
-        .and(
-            extendsClass(named(hierarchyMarkerType()))
-                .and(namedNoneOf("com.fasterxml.jackson.core.base.ParserMinimalBase")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return declaresMethod(namedOneOf("getText", "getValueAsString"))
+                .and(extendsClass(named(hierarchyMarkerType()))
+                        .and(namedNoneOf("com.fasterxml.jackson.core.base.ParserMinimalBase")));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext");
+    }
 
-  public static class TextAdvice {
+    public static class TextAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return String result) {
-      if (jsonParser != null && result != null) {
-        final ContextStore<JsonParser, NamedContext> store =
-            InstrumentationContext.get(JsonParser.class, NamedContext.class);
-        final NamedContext context = NamedContext.getOrCreate(store, jsonParser);
-        final JsonToken current = jsonParser.getCurrentToken();
-        if (current == JsonToken.FIELD_NAME) {
-          context.taintName(result);
-        } else if (current == JsonToken.VALUE_STRING) {
-          context.taintValue(result);
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onExit(@Advice.This JsonParser jsonParser, @Advice.Return String result) {
+            if (jsonParser != null && result != null) {
+                final ContextStore<JsonParser, NamedContext> store =
+                        InstrumentationContext.get(JsonParser.class, NamedContext.class);
+                final NamedContext context = NamedContext.getOrCreate(store, jsonParser);
+                final JsonToken current = jsonParser.getCurrentToken();
+                if (current == JsonToken.FIELD_NAME) {
+                    context.taintName(result);
+                } else if (current == JsonToken.VALUE_STRING) {
+                    context.taintValue(result);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-common/src/main/java/datadog/trace/instrumentation/jackson/core/TokenBufferInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-common/src/main/java/datadog/trace/instrumentation/jackson/core/TokenBufferInstrumentation.java
index 81223298144..b43865aad6e 100644
--- a/dd-java-agent/instrumentation/jackson-core/jackson-core-common/src/main/java/datadog/trace/instrumentation/jackson/core/TokenBufferInstrumentation.java
+++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-common/src/main/java/datadog/trace/instrumentation/jackson/core/TokenBufferInstrumentation.java
@@ -23,35 +23,34 @@
  */
 @AutoService(InstrumenterModule.class)
 public class TokenBufferInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public TokenBufferInstrumentation() {
-    super("jackson-core");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public TokenBufferInstrumentation() {
+        super("jackson-core");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.fasterxml.jackson.databind.util.TokenBuffer";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.fasterxml.jackson.databind.util.TokenBuffer";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("asParser"))
-            .and(isPublic())
-            .and(returns(named("com.fasterxml.jackson.core.JsonParser"))),
-        TokenBufferInstrumentation.class.getName() + "$AsParserAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("asParser"))
+                        .and(isPublic())
+                        .and(returns(named("com.fasterxml.jackson.core.JsonParser"))),
+                TokenBufferInstrumentation.class.getName() + "$AsParserAdvice");
+    }
 
-  public static class AsParserAdvice {
-    @Advice.OnMethodExit
-    @Propagation
-    public static void onExit(
-        @Advice.This TokenBuffer tokenBuffer, @Advice.Return JsonParser parser) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        module.taintObjectIfTainted(parser, tokenBuffer);
-      }
+    public static class AsParserAdvice {
+        @Advice.OnMethodExit
+        @Propagation
+        public static void onExit(@Advice.This TokenBuffer tokenBuffer, @Advice.Return JsonParser parser) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                module.taintObjectIfTainted(parser, tokenBuffer);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/ClassInstrumenterInstrumentation.java b/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/ClassInstrumenterInstrumentation.java
index 7960a0ff40e..47032157e6f 100644
--- a/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/ClassInstrumenterInstrumentation.java
+++ b/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/ClassInstrumenterInstrumentation.java
@@ -16,42 +16,40 @@
 
 @AutoService(InstrumenterModule.class)
 public class ClassInstrumenterInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public ClassInstrumenterInstrumentation() {
-    super("jacoco");
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityCoverageLinesEnabled();
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.jacoco.agent.rt.IAgent";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    // The jacoco javaagent jar that is published relocates internal classes to an "obfuscated"
-    // package name ex. org.jacoco.agent.rt.internal_72ddf3b.core.internal.instr.ClassInstrumenter
-    return nameStartsWith("org.jacoco.agent.rt.internal")
-        .and(nameEndsWith(".core.internal.instr.ClassInstrumenter"));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("visitTotalProbeCount")),
-        getClass().getName() + "$VisitTotalProbeCountAdvice");
-  }
-
-  public static class VisitTotalProbeCountAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void enter(
-        @Advice.FieldValue(value = "className") final String className,
-        @Advice.Argument(0) int count) {
-      CoveragePerTestBridge.setTotalProbeCount(className, count);
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public ClassInstrumenterInstrumentation() {
+        super("jacoco");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityCoverageLinesEnabled();
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.jacoco.agent.rt.IAgent";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        // The jacoco javaagent jar that is published relocates internal classes to an "obfuscated"
+        // package name ex. org.jacoco.agent.rt.internal_72ddf3b.core.internal.instr.ClassInstrumenter
+        return nameStartsWith("org.jacoco.agent.rt.internal")
+                .and(nameEndsWith(".core.internal.instr.ClassInstrumenter"));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("visitTotalProbeCount")), getClass().getName() + "$VisitTotalProbeCountAdvice");
+    }
+
+    public static class VisitTotalProbeCountAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void enter(
+                @Advice.FieldValue(value = "className") final String className, @Advice.Argument(0) int count) {
+            CoveragePerTestBridge.setTotalProbeCount(className, count);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/CoverageDataInjector.java b/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/CoverageDataInjector.java
index 4a33f4d494c..870fdde11c3 100644
--- a/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/CoverageDataInjector.java
+++ b/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/CoverageDataInjector.java
@@ -8,18 +8,18 @@
 
 public class CoverageDataInjector {
 
-  private static final Logger log = LoggerFactory.getLogger(CoverageDataInjector.class);
+    private static final Logger log = LoggerFactory.getLogger(CoverageDataInjector.class);
 
-  static {
-    try {
-      IAgent agent = RT.getAgent();
-      CoveragePercentageBridge.registerCoverageDataSupplier(() -> agent.getExecutionData(false));
-    } catch (Exception e) {
-      log.info("Could not register coverage execution data factory", e);
+    static {
+        try {
+            IAgent agent = RT.getAgent();
+            CoveragePercentageBridge.registerCoverageDataSupplier(() -> agent.getExecutionData(false));
+        } catch (Exception e) {
+            log.info("Could not register coverage execution data factory", e);
+        }
     }
-  }
 
-  public static void init() {
-    // this is just to trigger evaluation of the static block above
-  }
+    public static void init() {
+        // this is just to trigger evaluation of the static block above
+    }
 }
diff --git a/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/InstrumenterInstrumentation.java b/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/InstrumenterInstrumentation.java
index a199e9698fe..b2fa75487ce 100644
--- a/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/InstrumenterInstrumentation.java
+++ b/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/InstrumenterInstrumentation.java
@@ -15,56 +15,55 @@
 
 @AutoService(InstrumenterModule.class)
 public class InstrumenterInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public InstrumenterInstrumentation() {
-    super("jacoco");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public InstrumenterInstrumentation() {
+        super("jacoco");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.jacoco.agent.rt.IAgent";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.jacoco.agent.rt.IAgent";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    // The jacoco javaagent jar that is published relocates internal classes to an "obfuscated"
-    // package name ex. org.jacoco.agent.rt.internal_72ddf3b.core.instr.Instrumenter
-    return nameStartsWith("org.jacoco.agent.rt.internal")
-        .and(nameEndsWith(".core.instr.Instrumenter"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        // The jacoco javaagent jar that is published relocates internal classes to an "obfuscated"
+        // package name ex. org.jacoco.agent.rt.internal_72ddf3b.core.instr.Instrumenter
+        return nameStartsWith("org.jacoco.agent.rt.internal").and(nameEndsWith(".core.instr.Instrumenter"));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("instrument")).and(takesArguments(byte[].class)),
-        getClass().getName() + "$InstrumentAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("instrument")).and(takesArguments(byte[].class)),
+                getClass().getName() + "$InstrumentAdvice");
+    }
 
-  public static class InstrumentAdvice {
-    @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class)
-    static byte[] enter(@Advice.Argument(0) byte[] bytes) {
-      // Jacoco initialization runs inside preMain of their agent which,
-      // depending on how a specific project is set up,
-      // can happen either after or _before_ our preMain.
+    public static class InstrumentAdvice {
+        @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class)
+        static byte[] enter(@Advice.Argument(0) byte[] bytes) {
+            // Jacoco initialization runs inside preMain of their agent which,
+            // depending on how a specific project is set up,
+            // can happen either after or _before_ our preMain.
 
-      // It means we cannot hook into Jacoco's init methods:
-      // even if we redefine them it will not help,
-      // as it is possible that they have already been executed
-      // by the time we do it.
+            // It means we cannot hook into Jacoco's init methods:
+            // even if we redefine them it will not help,
+            // as it is possible that they have already been executed
+            // by the time we do it.
 
-      // Therefore, we have to repeatedly call this "init" method here:
-      // when it is called the first time its class will be initialized,
-      // and our "should-run-once" logic will be triggered
-      CoverageDataInjector.init();
+            // Therefore, we have to repeatedly call this "init" method here:
+            // when it is called the first time its class will be initialized,
+            // and our "should-run-once" logic will be triggered
+            CoverageDataInjector.init();
 
-      // we cannot insert our custom Jacoco probes into classes compiled with Java older than 1.5
-      // because there is no support for pushing types onto the stack
-      int majorVersion = ((bytes[6] & 0xFF) << 8) | (bytes[7] & 0xFF);
-      if (majorVersion < 49) {
-        return bytes; // skip class instrumentation
-      } else {
-        return null; // go ahead and instrument
-      }
+            // we cannot insert our custom Jacoco probes into classes compiled with Java older than 1.5
+            // because there is no support for pushing types onto the stack
+            int majorVersion = ((bytes[6] & 0xFF) << 8) | (bytes[7] & 0xFF);
+            if (majorVersion < 49) {
+                return bytes; // skip class instrumentation
+            } else {
+                return null; // go ahead and instrument
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/MethodVisitorWrapper.java b/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/MethodVisitorWrapper.java
index 8b80d00ce30..8078c8d0613 100644
--- a/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/MethodVisitorWrapper.java
+++ b/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/MethodVisitorWrapper.java
@@ -12,115 +12,109 @@
 
 public class MethodVisitorWrapper {
 
-  private static final Logger log = LoggerFactory.getLogger(MethodVisitorWrapper.class);
-
-  private static final MethodHandle visitMethodInsnHandle;
-  private static final MethodHandle visitInsnHandle;
-  private static final MethodHandle visitIntInsnHandle;
-  private static final MethodHandle visitLdcInsnHandle;
-  private static final MethodHandle getTypeHandle;
-
-  static {
-    IAgent agent = RT.getAgent();
-    Class<? extends IAgent> agentClass = agent.getClass();
-    Package jacocoPackage = agentClass.getPackage();
-    String jacocoPackageName = jacocoPackage.getName();
-    ClassLoader jacocoClassLoader = agentClass.getClassLoader();
-
-    MethodHandles.Lookup lookup = MethodHandles.lookup();
-    Class<?> shadedMethodVisitorClass =
-        getJacocoClass(jacocoClassLoader, jacocoPackageName, ".asm.MethodVisitor");
-    visitMethodInsnHandle =
-        accessMethod(
-            lookup,
-            shadedMethodVisitorClass,
-            "visitMethodInsn",
-            int.class,
-            String.class,
-            String.class,
-            String.class,
-            boolean.class);
-    visitInsnHandle = accessMethod(lookup, shadedMethodVisitorClass, "visitInsn", int.class);
-    visitIntInsnHandle =
-        accessMethod(lookup, shadedMethodVisitorClass, "visitIntInsn", int.class, int.class);
-    visitLdcInsnHandle =
-        accessMethod(lookup, shadedMethodVisitorClass, "visitLdcInsn", Object.class);
-
-    Class<?> shadedTypeClass = getJacocoClass(jacocoClassLoader, jacocoPackageName, ".asm.Type");
-    getTypeHandle = accessMethod(lookup, shadedTypeClass, "getType", String.class);
-  }
-
-  private static Class<?> getJacocoClass(
-      ClassLoader classLoader, String jacocoPackageName, String classNameSuffix) {
-    String className = jacocoPackageName + classNameSuffix;
-    try {
-      return classLoader.loadClass(className);
-
-    } catch (Throwable throwable) {
-      log.error("Could not load Jacoco class: {}", className, throwable);
-      return null;
+    private static final Logger log = LoggerFactory.getLogger(MethodVisitorWrapper.class);
+
+    private static final MethodHandle visitMethodInsnHandle;
+    private static final MethodHandle visitInsnHandle;
+    private static final MethodHandle visitIntInsnHandle;
+    private static final MethodHandle visitLdcInsnHandle;
+    private static final MethodHandle getTypeHandle;
+
+    static {
+        IAgent agent = RT.getAgent();
+        Class<? extends IAgent> agentClass = agent.getClass();
+        Package jacocoPackage = agentClass.getPackage();
+        String jacocoPackageName = jacocoPackage.getName();
+        ClassLoader jacocoClassLoader = agentClass.getClassLoader();
+
+        MethodHandles.Lookup lookup = MethodHandles.lookup();
+        Class<?> shadedMethodVisitorClass = getJacocoClass(jacocoClassLoader, jacocoPackageName, ".asm.MethodVisitor");
+        visitMethodInsnHandle = accessMethod(
+                lookup,
+                shadedMethodVisitorClass,
+                "visitMethodInsn",
+                int.class,
+                String.class,
+                String.class,
+                String.class,
+                boolean.class);
+        visitInsnHandle = accessMethod(lookup, shadedMethodVisitorClass, "visitInsn", int.class);
+        visitIntInsnHandle = accessMethod(lookup, shadedMethodVisitorClass, "visitIntInsn", int.class, int.class);
+        visitLdcInsnHandle = accessMethod(lookup, shadedMethodVisitorClass, "visitLdcInsn", Object.class);
+
+        Class<?> shadedTypeClass = getJacocoClass(jacocoClassLoader, jacocoPackageName, ".asm.Type");
+        getTypeHandle = accessMethod(lookup, shadedTypeClass, "getType", String.class);
     }
-  }
 
-  private static MethodHandle accessMethod(
-      MethodHandles.Lookup lookup, Class<?> clazz, String methodName, Class<?>... arguments) {
-    if (clazz == null) {
-      return null;
+    private static Class<?> getJacocoClass(ClassLoader classLoader, String jacocoPackageName, String classNameSuffix) {
+        String className = jacocoPackageName + classNameSuffix;
+        try {
+            return classLoader.loadClass(className);
+
+        } catch (Throwable throwable) {
+            log.error("Could not load Jacoco class: {}", className, throwable);
+            return null;
+        }
     }
-    try {
-      Method method = clazz.getMethod(methodName, arguments);
-      method.setAccessible(true);
-      return lookup.unreflect(method);
-    } catch (Throwable throwable) {
-      log.error(
-          "Could not find method {} with arguments {} in class {}",
-          methodName,
-          Arrays.toString(arguments),
-          clazz.getName(),
-          throwable);
-      return null;
+
+    private static MethodHandle accessMethod(
+            MethodHandles.Lookup lookup, Class<?> clazz, String methodName, Class<?>... arguments) {
+        if (clazz == null) {
+            return null;
+        }
+        try {
+            Method method = clazz.getMethod(methodName, arguments);
+            method.setAccessible(true);
+            return lookup.unreflect(method);
+        } catch (Throwable throwable) {
+            log.error(
+                    "Could not find method {} with arguments {} in class {}",
+                    methodName,
+                    Arrays.toString(arguments),
+                    clazz.getName(),
+                    throwable);
+            return null;
+        }
     }
-  }
-
-  public static MethodVisitorWrapper wrap(Object mv) {
-    return new MethodVisitorWrapper(mv);
-  }
-
-  private final Object mv;
-
-  MethodVisitorWrapper(Object mv) {
-    this.mv = mv;
-  }
-
-  public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf)
-      throws Throwable {
-    visitMethodInsnHandle.invoke(mv, opcode, owner, name, desc, itf);
-  }
-
-  public void visitLdcInsn(Object cst) throws Throwable {
-    visitLdcInsnHandle.invoke(mv, cst);
-  }
-
-  /**
-   * Generates the instruction to push the given int value on the stack. Implementation taken from
-   * {@link org.objectweb.asm.commons.GeneratorAdapter#push(int)}.
-   *
-   * @param value the value to be pushed on the stack.
-   */
-  public void push(int value) throws Throwable {
-    if (value >= -1 && value <= 5) {
-      visitInsnHandle.invoke(mv, Opcodes.ICONST_0 + value);
-    } else if (value >= Byte.MIN_VALUE && value <= Byte.MAX_VALUE) {
-      visitIntInsnHandle.invoke(mv, Opcodes.BIPUSH, value);
-    } else if (value >= Short.MIN_VALUE && value <= Short.MAX_VALUE) {
-      visitIntInsnHandle.invoke(mv, Opcodes.SIPUSH, value);
-    } else {
-      visitLdcInsnHandle.invoke(mv, value);
+
+    public static MethodVisitorWrapper wrap(Object mv) {
+        return new MethodVisitorWrapper(mv);
     }
-  }
 
-  public void pushClass(String className) throws Throwable {
-    Object clazz = getTypeHandle.invoke('L' + className + ';');
-    visitLdcInsnHandle.invoke(mv, clazz);
-  }
+    private final Object mv;
+
+    MethodVisitorWrapper(Object mv) {
+        this.mv = mv;
+    }
+
+    public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) throws Throwable {
+        visitMethodInsnHandle.invoke(mv, opcode, owner, name, desc, itf);
+    }
+
+    public void visitLdcInsn(Object cst) throws Throwable {
+        visitLdcInsnHandle.invoke(mv, cst);
+    }
+
+    /**
+     * Generates the instruction to push the given int value on the stack. Implementation taken from
+     * {@link org.objectweb.asm.commons.GeneratorAdapter#push(int)}.
+     *
+     * @param value the value to be pushed on the stack.
+     */
+    public void push(int value) throws Throwable {
+        if (value >= -1 && value <= 5) {
+            visitInsnHandle.invoke(mv, Opcodes.ICONST_0 + value);
+        } else if (value >= Byte.MIN_VALUE && value <= Byte.MAX_VALUE) {
+            visitIntInsnHandle.invoke(mv, Opcodes.BIPUSH, value);
+        } else if (value >= Short.MIN_VALUE && value <= Short.MAX_VALUE) {
+            visitIntInsnHandle.invoke(mv, Opcodes.SIPUSH, value);
+        } else {
+            visitLdcInsnHandle.invoke(mv, value);
+        }
+    }
+
+    public void pushClass(String className) throws Throwable {
+        Object clazz = getTypeHandle.invoke('L' + className + ';');
+        visitLdcInsnHandle.invoke(mv, clazz);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/ProbeInserterInstrumentation.java b/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/ProbeInserterInstrumentation.java
index e68efe1ec40..a471c78d10e 100644
--- a/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/ProbeInserterInstrumentation.java
+++ b/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/ProbeInserterInstrumentation.java
@@ -26,152 +26,133 @@
 
 @AutoService(InstrumenterModule.class)
 public class ProbeInserterInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy,
-        Instrumenter.WithTypeStructure,
-        Instrumenter.HasMethodAdvice {
-  public ProbeInserterInstrumentation() {
-    super("jacoco");
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityCoverageLinesEnabled();
-  }
-
-  @SuppressForbidden
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    ElementMatcher<FieldDescription> methodVisitor = methodVisitor();
-    return declaresField(arrayStrategy())
-        .and(declaresField(methodVisitor).or(hasSuperClass(declaresField(methodVisitor))));
-  }
-
-  private ElementMatcher<FieldDescription> arrayStrategy() {
-    ElementMatcher.Junction<TypeDescription> arrayStrategyType = arrayStrategyType();
-    return named("arrayStrategy")
-        .and(fieldType(arrayStrategyType.or(implementsInterface(arrayStrategyType))));
-  }
-
-  private static ElementMatcher.Junction<TypeDescription> arrayStrategyType() {
-    return nameStartsWith("org.jacoco.agent.rt.internal")
-        .and(nameEndsWith(".core.internal.instr.IProbeArrayStrategy"));
-  }
-
-  @SuppressForbidden
-  private ElementMatcher<FieldDescription> methodVisitor() {
-    return named("mv")
-        .and(
-            fieldType(
-                nameStartsWith("org.jacoco.agent.rt.internal")
-                    .and(nameEndsWith(".asm.MethodVisitor"))
-                    .and(
-                        declaresMethod(
-                            named("visitMethodInsn")
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.WithTypeStructure, Instrumenter.HasMethodAdvice {
+    public ProbeInserterInstrumentation() {
+        super("jacoco");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityCoverageLinesEnabled();
+    }
+
+    @SuppressForbidden
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        ElementMatcher<FieldDescription> methodVisitor = methodVisitor();
+        return declaresField(arrayStrategy())
+                .and(declaresField(methodVisitor).or(hasSuperClass(declaresField(methodVisitor))));
+    }
+
+    private ElementMatcher<FieldDescription> arrayStrategy() {
+        ElementMatcher.Junction<TypeDescription> arrayStrategyType = arrayStrategyType();
+        return named("arrayStrategy").and(fieldType(arrayStrategyType.or(implementsInterface(arrayStrategyType))));
+    }
+
+    private static ElementMatcher.Junction<TypeDescription> arrayStrategyType() {
+        return nameStartsWith("org.jacoco.agent.rt.internal")
+                .and(nameEndsWith(".core.internal.instr.IProbeArrayStrategy"));
+    }
+
+    @SuppressForbidden
+    private ElementMatcher<FieldDescription> methodVisitor() {
+        return named("mv")
+                .and(fieldType(nameStartsWith("org.jacoco.agent.rt.internal")
+                        .and(nameEndsWith(".asm.MethodVisitor"))
+                        .and(declaresMethod(named("visitMethodInsn")
                                 .and(takesArguments(5))
                                 .and(takesArgument(0, int.class))
                                 .and(takesArgument(1, String.class))
                                 .and(takesArgument(2, String.class))
                                 .and(takesArgument(3, String.class))
                                 .and(takesArgument(4, boolean.class))))
-                    .and(
-                        declaresMethod(
-                            named("visitInsn")
-                                .and(takesArguments(1))
-                                .and(takesArgument(0, int.class))))
-                    .and(
-                        declaresMethod(
-                            named("visitIntInsn")
+                        .and(declaresMethod(
+                                named("visitInsn").and(takesArguments(1)).and(takesArgument(0, int.class))))
+                        .and(declaresMethod(named("visitIntInsn")
                                 .and(takesArguments(2))
                                 .and(takesArgument(0, int.class))
                                 .and(takesArgument(1, int.class))))
-                    .and(
-                        declaresMethod(
-                            named("visitLdcInsn")
-                                .and(takesArguments(1))
-                                .and(takesArgument(0, Object.class))))));
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.jacoco.agent.rt.IAgent";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    // The jacoco javaagent jar that is published relocates internal classes to an "obfuscated"
-    // package name ex. org.jacoco.agent.rt.internal_72ddf3b.core.internal.instr.ProbeInserter
-    return nameStartsWith("org.jacoco.agent.rt.internal")
-        .and(nameEndsWith(".core.internal.instr.ProbeInserter"));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("visitMaxs")).and(takesArguments(2)).and(takesArgument(0, int.class)),
-        getClass().getName() + "$VisitMaxsAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("insertProbe"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, int.class)),
-        getClass().getName() + "$InsertProbeAdvice");
-  }
-
-  public static class VisitMaxsAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void enter(@Advice.Argument(value = 0, readOnly = false) int maxStack) {
-      maxStack = maxStack + 2;
+                        .and(declaresMethod(
+                                named("visitLdcInsn").and(takesArguments(1)).and(takesArgument(0, Object.class))))));
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.jacoco.agent.rt.IAgent";
     }
-  }
-
-  public static class InsertProbeAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void exit(
-        @Advice.FieldValue(value = "mv") final Object mv,
-        @Advice.FieldValue(value = "arrayStrategy") final Object arrayStrategy,
-        @Advice.Argument(0) final int id)
-        throws Throwable {
-      Field classNameField = arrayStrategy.getClass().getDeclaredField("className");
-      classNameField.setAccessible(true);
-      String className = (String) classNameField.get(arrayStrategy);
-
-      String[] excludedPackages = Config.get().getCiVisibilityCodeCoverageExcludedPackages();
-      for (String excludedPackage : excludedPackages) {
-        if (className.startsWith(excludedPackage)) {
-          return;
-        }
-      }
-
-      String[] includedPackages = Config.get().getCiVisibilityCodeCoverageIncludedPackages();
-      if (includedPackages.length > 0) {
-        boolean included = false;
-        for (String includedPackage : includedPackages) {
-          if (className.startsWith(includedPackage)) {
-            included = true;
-            break;
-          }
-        }
-        if (!included) {
-          return;
-        }
-      }
 
-      Field classIdField = arrayStrategy.getClass().getDeclaredField("classId");
-      classIdField.setAccessible(true);
-      Long classId = classIdField.getLong(arrayStrategy);
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        // The jacoco javaagent jar that is published relocates internal classes to an "obfuscated"
+        // package name ex. org.jacoco.agent.rt.internal_72ddf3b.core.internal.instr.ProbeInserter
+        return nameStartsWith("org.jacoco.agent.rt.internal").and(nameEndsWith(".core.internal.instr.ProbeInserter"));
+    }
 
-      MethodVisitorWrapper methodVisitor = MethodVisitorWrapper.wrap(mv);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("visitMaxs")).and(takesArguments(2)).and(takesArgument(0, int.class)),
+                getClass().getName() + "$VisitMaxsAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("insertProbe")).and(takesArguments(1)).and(takesArgument(0, int.class)),
+                getClass().getName() + "$InsertProbeAdvice");
+    }
 
-      methodVisitor.pushClass(className);
-      methodVisitor.visitLdcInsn(classId);
-      methodVisitor.push(id);
+    public static class VisitMaxsAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void enter(@Advice.Argument(value = 0, readOnly = false) int maxStack) {
+            maxStack = maxStack + 2;
+        }
+    }
 
-      methodVisitor.visitMethodInsn(
-          Opcodes.INVOKESTATIC,
-          "datadog/trace/api/civisibility/coverage/CoveragePerTestBridge",
-          "recordCoverage",
-          "(Ljava/lang/Class;JI)V",
-          false);
+    public static class InsertProbeAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void exit(
+                @Advice.FieldValue(value = "mv") final Object mv,
+                @Advice.FieldValue(value = "arrayStrategy") final Object arrayStrategy,
+                @Advice.Argument(0) final int id)
+                throws Throwable {
+            Field classNameField = arrayStrategy.getClass().getDeclaredField("className");
+            classNameField.setAccessible(true);
+            String className = (String) classNameField.get(arrayStrategy);
+
+            String[] excludedPackages = Config.get().getCiVisibilityCodeCoverageExcludedPackages();
+            for (String excludedPackage : excludedPackages) {
+                if (className.startsWith(excludedPackage)) {
+                    return;
+                }
+            }
+
+            String[] includedPackages = Config.get().getCiVisibilityCodeCoverageIncludedPackages();
+            if (includedPackages.length > 0) {
+                boolean included = false;
+                for (String includedPackage : includedPackages) {
+                    if (className.startsWith(includedPackage)) {
+                        included = true;
+                        break;
+                    }
+                }
+                if (!included) {
+                    return;
+                }
+            }
+
+            Field classIdField = arrayStrategy.getClass().getDeclaredField("classId");
+            classIdField.setAccessible(true);
+            Long classId = classIdField.getLong(arrayStrategy);
+
+            MethodVisitorWrapper methodVisitor = MethodVisitorWrapper.wrap(mv);
+
+            methodVisitor.pushClass(className);
+            methodVisitor.visitLdcInsn(classId);
+            methodVisitor.push(id);
+
+            methodVisitor.visitMethodInsn(
+                    Opcodes.INVOKESTATIC,
+                    "datadog/trace/api/civisibility/coverage/CoveragePerTestBridge",
+                    "recordCoverage",
+                    "(Ljava/lang/Class;JI)V",
+                    false);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java
index a0d8211279f..95944bedb75 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java
@@ -20,51 +20,51 @@
  * duplicate checkpoint emission.
  */
 public final class AsyncTaskInstrumentation
-    implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  static final String[] CLASS_NAMES = {
-    "java.util.concurrent.CompletableFuture$AsyncSupply",
-    "java.util.concurrent.CompletableFuture$AsyncRun",
-  };
+    static final String[] CLASS_NAMES = {
+        "java.util.concurrent.CompletableFuture$AsyncSupply", "java.util.concurrent.CompletableFuture$AsyncRun",
+    };
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return CLASS_NAMES;
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
-    transformer.applyAdvice(named("run"), getClass().getName() + "$Run");
-    transformer.applyAdvice(named("cancel"), getClass().getName() + "$Cancel");
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return CLASS_NAMES;
+    }
 
-  public static class Construct {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void construct(@Advice.This ForkJoinTask<?> task) {
-      capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
+        transformer.applyAdvice(named("run"), getClass().getName() + "$Run");
+        transformer.applyAdvice(named("cancel"), getClass().getName() + "$Cancel");
     }
-  }
 
-  public static class Run {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(@Advice.This ForkJoinTask<?> zis) {
-      return startTaskScope(InstrumentationContext.get(ForkJoinTask.class, State.class), zis);
+    public static class Construct {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void construct(@Advice.This ForkJoinTask<?> task) {
+            capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      endTaskScope(scope);
+    public static class Run {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(@Advice.This ForkJoinTask<?> zis) {
+            return startTaskScope(InstrumentationContext.get(ForkJoinTask.class, State.class), zis);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 
-  public static class Cancel {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static <T> void cancel(@Advice.This ForkJoinTask<T> task) {
-      State state = InstrumentationContext.get(ForkJoinTask.class, State.class).get(task);
-      if (null != state) {
-        state.closeContinuation();
-      }
+    public static class Cancel {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static <T> void cancel(@Advice.This ForkJoinTask<T> task) {
+            State state =
+                    InstrumentationContext.get(ForkJoinTask.class, State.class).get(task);
+            if (null != state) {
+                state.closeContinuation();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureModule.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureModule.java
index 04891d10086..c1900ea29b8 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureModule.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureModule.java
@@ -22,81 +22,79 @@
 import java.util.Map;
 
 @AutoService(InstrumenterModule.class)
-public class CompletableFutureModule extends InstrumenterModule.ContextTracking
-    implements ExcludeFilterProvider {
-  public CompletableFutureModule() {
-    super("java_completablefuture", "java_concurrent");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    final Map<String, String> context = new HashMap<>();
-    context.put("java.util.concurrent.ForkJoinTask", State.class.getName());
-    context.put(UNI_COMPLETION, ConcurrentState.class.getName());
-    return context;
-  }
+public class CompletableFutureModule extends InstrumenterModule.ContextTracking implements ExcludeFilterProvider {
+    public CompletableFutureModule() {
+        super("java_completablefuture", "java_concurrent");
+    }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    EnumMap<ExcludeFilter.ExcludeType, Collection<String>> excluded =
-        new EnumMap<>(ExcludeFilter.ExcludeType.class);
-    final List<String> excludedForkJoinClass = new ArrayList<>();
-    final List<String> excludedRunnableClasses = new ArrayList<>();
-    final List<String> excludedExecutorClasses = new ArrayList<>();
-    // AsyncTaskInstrumentation
-    excludedForkJoinClass.addAll(asList(CLASS_NAMES));
-    excludedRunnableClasses.addAll(asList(CLASS_NAMES));
-    if (isEnabled()) {
-      // CompletableFutureUniCompletionInstrumentation
-      final List<String> unicompletionClasses =
-          asList(
-              // This is not a subclass of UniCompletion and doesn't have a dependent
-              // CompletableFuture
-              "java.util.concurrent.CompletableFuture$Completion",
-              "java.util.concurrent.CompletableFuture$UniCompletion",
-              "java.util.concurrent.CompletableFuture$UniApply",
-              "java.util.concurrent.CompletableFuture$UniAccept",
-              "java.util.concurrent.CompletableFuture$UniRun",
-              "java.util.concurrent.CompletableFuture$UniWhenComplete",
-              "java.util.concurrent.CompletableFuture$UniHandle",
-              "java.util.concurrent.CompletableFuture$UniExceptionally",
-              "java.util.concurrent.CompletableFuture$UniComposeExceptionally",
-              "java.util.concurrent.CompletableFuture$UniRelay",
-              "java.util.concurrent.CompletableFuture$UniCompose",
-              "java.util.concurrent.CompletableFuture$BiCompletion",
-              // This is not a subclass of UniCompletion and doesn't have a dependent
-              // CompletableFuture
-              // "java.util.concurrent.CompletableFuture$CoCompletion",
-              "java.util.concurrent.CompletableFuture$BiApply",
-              "java.util.concurrent.CompletableFuture$BiAccept",
-              "java.util.concurrent.CompletableFuture$BiRun",
-              "java.util.concurrent.CompletableFuture$BiRelay",
-              "java.util.concurrent.CompletableFuture$OrApply",
-              "java.util.concurrent.CompletableFuture$OrAccept",
-              "java.util.concurrent.CompletableFuture$OrRun"
-              // This is not a subclass of UniCompletion and doesn't have a dependent
-              // CompletableFuture
-              // "java.util.concurrent.CompletableFuture$AnyOf",
-              // This is not a subclass of UniCompletion and doesn't have a dependent
-              // CompletableFuture
-              // "java.util.concurrent.CompletableFuture$Signaller",
-              );
-      excludedRunnableClasses.addAll(unicompletionClasses);
-      excludedExecutorClasses.addAll(unicompletionClasses);
-      excludedForkJoinClass.addAll(unicompletionClasses);
+    @Override
+    public Map<String, String> contextStore() {
+        final Map<String, String> context = new HashMap<>();
+        context.put("java.util.concurrent.ForkJoinTask", State.class.getName());
+        context.put(UNI_COMPLETION, ConcurrentState.class.getName());
+        return context;
     }
 
-    excluded.put(RUNNABLE, excludedRunnableClasses);
-    excluded.put(FORK_JOIN_TASK, excludedForkJoinClass);
-    excluded.put(EXECUTOR, excludedExecutorClasses);
-    return excluded;
-  }
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        EnumMap<ExcludeFilter.ExcludeType, Collection<String>> excluded =
+                new EnumMap<>(ExcludeFilter.ExcludeType.class);
+        final List<String> excludedForkJoinClass = new ArrayList<>();
+        final List<String> excludedRunnableClasses = new ArrayList<>();
+        final List<String> excludedExecutorClasses = new ArrayList<>();
+        // AsyncTaskInstrumentation
+        excludedForkJoinClass.addAll(asList(CLASS_NAMES));
+        excludedRunnableClasses.addAll(asList(CLASS_NAMES));
+        if (isEnabled()) {
+            // CompletableFutureUniCompletionInstrumentation
+            final List<String> unicompletionClasses = asList(
+                    // This is not a subclass of UniCompletion and doesn't have a dependent
+                    // CompletableFuture
+                    "java.util.concurrent.CompletableFuture$Completion",
+                    "java.util.concurrent.CompletableFuture$UniCompletion",
+                    "java.util.concurrent.CompletableFuture$UniApply",
+                    "java.util.concurrent.CompletableFuture$UniAccept",
+                    "java.util.concurrent.CompletableFuture$UniRun",
+                    "java.util.concurrent.CompletableFuture$UniWhenComplete",
+                    "java.util.concurrent.CompletableFuture$UniHandle",
+                    "java.util.concurrent.CompletableFuture$UniExceptionally",
+                    "java.util.concurrent.CompletableFuture$UniComposeExceptionally",
+                    "java.util.concurrent.CompletableFuture$UniRelay",
+                    "java.util.concurrent.CompletableFuture$UniCompose",
+                    "java.util.concurrent.CompletableFuture$BiCompletion",
+                    // This is not a subclass of UniCompletion and doesn't have a dependent
+                    // CompletableFuture
+                    // "java.util.concurrent.CompletableFuture$CoCompletion",
+                    "java.util.concurrent.CompletableFuture$BiApply",
+                    "java.util.concurrent.CompletableFuture$BiAccept",
+                    "java.util.concurrent.CompletableFuture$BiRun",
+                    "java.util.concurrent.CompletableFuture$BiRelay",
+                    "java.util.concurrent.CompletableFuture$OrApply",
+                    "java.util.concurrent.CompletableFuture$OrAccept",
+                    "java.util.concurrent.CompletableFuture$OrRun"
+                    // This is not a subclass of UniCompletion and doesn't have a dependent
+                    // CompletableFuture
+                    // "java.util.concurrent.CompletableFuture$AnyOf",
+                    // This is not a subclass of UniCompletion and doesn't have a dependent
+                    // CompletableFuture
+                    // "java.util.concurrent.CompletableFuture$Signaller",
+                    );
+            excludedRunnableClasses.addAll(unicompletionClasses);
+            excludedExecutorClasses.addAll(unicompletionClasses);
+            excludedForkJoinClass.addAll(unicompletionClasses);
+        }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(
-        new AsyncTaskInstrumentation(),
-        new CompletableFutureUniCompletionInstrumentation(),
-        new CompletableFutureUniCompletionSubclassInstrumentation());
-  }
+        excluded.put(RUNNABLE, excludedRunnableClasses);
+        excluded.put(FORK_JOIN_TASK, excludedForkJoinClass);
+        excluded.put(EXECUTOR, excludedExecutorClasses);
+        return excluded;
+    }
+
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(
+                new AsyncTaskInstrumentation(),
+                new CompletableFutureUniCompletionInstrumentation(),
+                new CompletableFutureUniCompletionSubclassInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java
index 4110fb2d083..8147b2853ad 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java
@@ -32,19 +32,19 @@
  * taking place that decides which thread actually get to run the user code that was supplied.
  */
 public class CompletableFutureUniCompletionInstrumentation
-    implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  static final String JAVA_UTIL_CONCURRENT = "java.util.concurrent";
-  static final String COMPLETABLE_FUTURE = JAVA_UTIL_CONCURRENT + ".CompletableFuture";
-  static final String UNI_COMPLETION = COMPLETABLE_FUTURE + "$UniCompletion";
-  static final String ADVICE_BASE = JAVA_UTIL_CONCURRENT + ".CompletableFutureAdvice$";
+        implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    static final String JAVA_UTIL_CONCURRENT = "java.util.concurrent";
+    static final String COMPLETABLE_FUTURE = JAVA_UTIL_CONCURRENT + ".CompletableFuture";
+    static final String UNI_COMPLETION = COMPLETABLE_FUTURE + "$UniCompletion";
+    static final String ADVICE_BASE = JAVA_UTIL_CONCURRENT + ".CompletableFutureAdvice$";
 
-  @Override
-  public String instrumentedType() {
-    return UNI_COMPLETION;
-  }
+    @Override
+    public String instrumentedType() {
+        return UNI_COMPLETION;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), ADVICE_BASE + "UniConstructor");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), ADVICE_BASE + "UniConstructor");
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java
index 6ec93812e21..9e3e944dbb0 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java
@@ -14,23 +14,20 @@
 
 /** Described in {@link CompletableFutureUniCompletionInstrumentation} */
 public class CompletableFutureUniCompletionSubclassInstrumentation
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return nameStartsWith(COMPLETABLE_FUTURE).and(extendsClass(named(UNI_COMPLETION)));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return nameStartsWith(COMPLETABLE_FUTURE).and(extendsClass(named(UNI_COMPLETION)));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("tryFire").and(takesArguments(int.class)), ADVICE_BASE + "UniSubTryFire");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("tryFire").and(takesArguments(int.class)), ADVICE_BASE + "UniSubTryFire");
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java
index 89dd1c93e43..f968050897f 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java
@@ -28,259 +28,223 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class AsyncPropagatingDisableInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
 
-  public AsyncPropagatingDisableInstrumentation() {
-    super(EXECUTOR_INSTRUMENTATION_NAME);
-  }
+    public AsyncPropagatingDisableInstrumentation() {
+        super(EXECUTOR_INSTRUMENTATION_NAME);
+    }
 
-  private static final ElementMatcher.Junction<TypeDescription> RX_WORKERS =
-      nameStartsWith("rx.").and(extendsClass(named("rx.Scheduler$Worker")));
-  private static final ElementMatcher<TypeDescription> NETTY_UNSAFE =
-      namedOneOf(
-          "io.netty.channel.nio.AbstractNioChannel$AbstractNioUnsafe",
-          "io.grpc.netty.shaded.io.netty.channel.nio.AbstractNioChannel$AbstractNioUnsafe",
-          "io.netty.channel.epoll.AbstractEpollChannel$AbstractEpollUnsafe",
-          "io.grpc.netty.shaded.io.netty.channel.epoll.AbstractEpollChannel$AbstractEpollUnsafe",
-          "io.netty.channel.kqueue.AbstractKQueueChannel$AbstractKQueueUnsafe",
-          "io.grpc.netty.shaded.io.netty.channel.kqueue.AbstractKQueueChannel$AbstractKQueueUnsafe");
-  private static final ElementMatcher<TypeDescription> GRPC_MANAGED_CHANNEL =
-      nameEndsWith("io.grpc.internal.ManagedChannelImpl");
-  private static final ElementMatcher<TypeDescription> REACTOR_DISABLED_TYPE_INITIALIZERS =
-      namedOneOf("reactor.core.scheduler.SchedulerTask", "reactor.core.scheduler.WorkerTask");
-  private static final ElementMatcher<TypeDescription> RXJAVA2_DISABLED_TYPE_INITIALIZERS =
-      named("io.reactivex.internal.schedulers.AbstractDirectTask");
+    private static final ElementMatcher.Junction<TypeDescription> RX_WORKERS =
+            nameStartsWith("rx.").and(extendsClass(named("rx.Scheduler$Worker")));
+    private static final ElementMatcher<TypeDescription> NETTY_UNSAFE = namedOneOf(
+            "io.netty.channel.nio.AbstractNioChannel$AbstractNioUnsafe",
+            "io.grpc.netty.shaded.io.netty.channel.nio.AbstractNioChannel$AbstractNioUnsafe",
+            "io.netty.channel.epoll.AbstractEpollChannel$AbstractEpollUnsafe",
+            "io.grpc.netty.shaded.io.netty.channel.epoll.AbstractEpollChannel$AbstractEpollUnsafe",
+            "io.netty.channel.kqueue.AbstractKQueueChannel$AbstractKQueueUnsafe",
+            "io.grpc.netty.shaded.io.netty.channel.kqueue.AbstractKQueueChannel$AbstractKQueueUnsafe");
+    private static final ElementMatcher<TypeDescription> GRPC_MANAGED_CHANNEL =
+            nameEndsWith("io.grpc.internal.ManagedChannelImpl");
+    private static final ElementMatcher<TypeDescription> REACTOR_DISABLED_TYPE_INITIALIZERS =
+            namedOneOf("reactor.core.scheduler.SchedulerTask", "reactor.core.scheduler.WorkerTask");
+    private static final ElementMatcher<TypeDescription> RXJAVA2_DISABLED_TYPE_INITIALIZERS =
+            named("io.reactivex.internal.schedulers.AbstractDirectTask");
 
-  /**
-   * RxJava 3's AbstractDirectTask creates FINISHED/DISPOSED sentinel FutureTask instances in its
-   * static initializer.
-   */
-  private static final ElementMatcher<TypeDescription> RXJAVA3_DISABLED_TYPE_INITIALIZERS =
-      named("io.reactivex.rxjava3.internal.schedulers.AbstractDirectTask");
+    /**
+     * RxJava 3's AbstractDirectTask creates FINISHED/DISPOSED sentinel FutureTask instances in its
+     * static initializer.
+     */
+    private static final ElementMatcher<TypeDescription> RXJAVA3_DISABLED_TYPE_INITIALIZERS =
+            named("io.reactivex.rxjava3.internal.schedulers.AbstractDirectTask");
 
-  private static final ElementMatcher<TypeDescription> NETTY_GLOBAL_EVENT_EXECUTOR =
-      namedOneOf(
-          "io.netty.util.concurrent.GlobalEventExecutor",
-          "io.grpc.netty.shaded.io.netty.util.concurrent.GlobalEventExecutor",
-          "com.couchbase.client.deps.io.netty.util.concurrent.GlobalEventExecutor");
-  private static final ElementMatcher<TypeDescription> NETTY_IDLE_STATE_HANDLER =
-      namedOneOf(
-          "io.netty.handler.timeout.IdleStateHandler",
-          "io.grpc.netty.shaded.io.netty.handler.timeout.IdleStateHandler");
-  private static final ElementMatcher<TypeDescription> JAVA_HTTP_CLIENT =
-      extendsClass(named("java.net.http.HttpClient"));
-  private static final String LETTUCE_HANDSHAKE_HANDLER =
-      "io.lettuce.core.protocol.RedisHandshakeHandler";
-  private static final ElementMatcher<TypeDescription> PEKKO_HTTP_STREAM_STAGE =
-      nameStartsWith("org.apache.pekko.http.impl.util.StreamUtils$")
-          .and(extendsClass(named("org.apache.pekko.stream.stage.GraphStageLogic")));
+    private static final ElementMatcher<TypeDescription> NETTY_GLOBAL_EVENT_EXECUTOR = namedOneOf(
+            "io.netty.util.concurrent.GlobalEventExecutor",
+            "io.grpc.netty.shaded.io.netty.util.concurrent.GlobalEventExecutor",
+            "com.couchbase.client.deps.io.netty.util.concurrent.GlobalEventExecutor");
+    private static final ElementMatcher<TypeDescription> NETTY_IDLE_STATE_HANDLER = namedOneOf(
+            "io.netty.handler.timeout.IdleStateHandler",
+            "io.grpc.netty.shaded.io.netty.handler.timeout.IdleStateHandler");
+    private static final ElementMatcher<TypeDescription> JAVA_HTTP_CLIENT =
+            extendsClass(named("java.net.http.HttpClient"));
+    private static final String LETTUCE_HANDSHAKE_HANDLER = "io.lettuce.core.protocol.RedisHandshakeHandler";
+    private static final ElementMatcher<TypeDescription> PEKKO_HTTP_STREAM_STAGE = nameStartsWith(
+                    "org.apache.pekko.http.impl.util.StreamUtils$")
+            .and(extendsClass(named("org.apache.pekko.stream.stage.GraphStageLogic")));
 
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return false; // known type list is not complete, so always expand search to consider hierarchy
-  }
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return false; // known type list is not complete, so always expand search to consider hierarchy
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "rx.internal.operators.OperatorTimeoutBase",
-      "com.amazonaws.http.timers.request.HttpRequestTimer",
-      "io.netty.handler.timeout.WriteTimeoutHandler",
-      "java.util.concurrent.ScheduledThreadPoolExecutor",
-      "io.netty.channel.nio.AbstractNioChannel$AbstractNioUnsafe",
-      "io.grpc.netty.shaded.io.netty.channel.nio.AbstractNioChannel$AbstractNioUnsafe",
-      "io.netty.channel.epoll.AbstractEpollChannel$AbstractEpollUnsafe",
-      "io.grpc.netty.shaded.io.netty.channel.epoll.AbstractEpollChannel$AbstractEpollUnsafe",
-      "io.netty.channel.kqueue.AbstractKQueueChannel$AbstractKQueueUnsafe",
-      "io.grpc.netty.shaded.io.netty.channel.kqueue.AbstractKQueueChannel$AbstractKQueueUnsafe",
-      "rx.internal.util.ObjectPool",
-      "io.grpc.internal.ServerImpl$ServerTransportListenerImpl",
-      "okhttp3.ConnectionPool",
-      "okhttp3.internal.connection.RealConnectionPool",
-      "com.squareup.okhttp.ConnectionPool",
-      "org.elasticsearch.transport.netty4.Netty4TcpChannel",
-      "org.springframework.cglib.core.internal.LoadingCache",
-      "com.datastax.oss.driver.internal.core.channel.DefaultWriteCoalescer$Flusher",
-      "com.datastax.oss.driver.api.core.session.SessionBuilder",
-      "org.jvnet.hk2.internal.ServiceLocatorImpl",
-      "com.zaxxer.hikari.pool.HikariPool",
-      "net.sf.ehcache.store.disk.DiskStorageFactory",
-      "org.springframework.jms.listener.DefaultMessageListenerContainer",
-      "org.apache.activemq.broker.TransactionBroker",
-      "com.mongodb.internal.connection.DefaultConnectionPool$AsyncWorkManager",
-      "io.reactivex.internal.schedulers.AbstractDirectTask",
-      "io.reactivex.rxjava3.internal.schedulers.AbstractDirectTask",
-      "jdk.internal.net.http.HttpClientImpl",
-      LETTUCE_HANDSHAKE_HANDLER,
-      "io.netty.util.concurrent.GlobalEventExecutor",
-      "io.grpc.netty.shaded.io.netty.util.concurrent.GlobalEventExecutor",
-      "com.couchbase.client.deps.io.netty.util.concurrent.GlobalEventExecutor",
-      "io.netty.handler.timeout.IdleStateHandler",
-      "io.grpc.netty.shaded.io.netty.handler.timeout.IdleStateHandler",
-      "com.linecorp.armeria.client.HttpClientFactory",
-      "com.linecorp.armeria.client.HttpChannelPool",
-      "akka.http.impl.engine.server.HttpServerBluePrint$TimeoutAccessImpl"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "rx.internal.operators.OperatorTimeoutBase",
+            "com.amazonaws.http.timers.request.HttpRequestTimer",
+            "io.netty.handler.timeout.WriteTimeoutHandler",
+            "java.util.concurrent.ScheduledThreadPoolExecutor",
+            "io.netty.channel.nio.AbstractNioChannel$AbstractNioUnsafe",
+            "io.grpc.netty.shaded.io.netty.channel.nio.AbstractNioChannel$AbstractNioUnsafe",
+            "io.netty.channel.epoll.AbstractEpollChannel$AbstractEpollUnsafe",
+            "io.grpc.netty.shaded.io.netty.channel.epoll.AbstractEpollChannel$AbstractEpollUnsafe",
+            "io.netty.channel.kqueue.AbstractKQueueChannel$AbstractKQueueUnsafe",
+            "io.grpc.netty.shaded.io.netty.channel.kqueue.AbstractKQueueChannel$AbstractKQueueUnsafe",
+            "rx.internal.util.ObjectPool",
+            "io.grpc.internal.ServerImpl$ServerTransportListenerImpl",
+            "okhttp3.ConnectionPool",
+            "okhttp3.internal.connection.RealConnectionPool",
+            "com.squareup.okhttp.ConnectionPool",
+            "org.elasticsearch.transport.netty4.Netty4TcpChannel",
+            "org.springframework.cglib.core.internal.LoadingCache",
+            "com.datastax.oss.driver.internal.core.channel.DefaultWriteCoalescer$Flusher",
+            "com.datastax.oss.driver.api.core.session.SessionBuilder",
+            "org.jvnet.hk2.internal.ServiceLocatorImpl",
+            "com.zaxxer.hikari.pool.HikariPool",
+            "net.sf.ehcache.store.disk.DiskStorageFactory",
+            "org.springframework.jms.listener.DefaultMessageListenerContainer",
+            "org.apache.activemq.broker.TransactionBroker",
+            "com.mongodb.internal.connection.DefaultConnectionPool$AsyncWorkManager",
+            "io.reactivex.internal.schedulers.AbstractDirectTask",
+            "io.reactivex.rxjava3.internal.schedulers.AbstractDirectTask",
+            "jdk.internal.net.http.HttpClientImpl",
+            LETTUCE_HANDSHAKE_HANDLER,
+            "io.netty.util.concurrent.GlobalEventExecutor",
+            "io.grpc.netty.shaded.io.netty.util.concurrent.GlobalEventExecutor",
+            "com.couchbase.client.deps.io.netty.util.concurrent.GlobalEventExecutor",
+            "io.netty.handler.timeout.IdleStateHandler",
+            "io.grpc.netty.shaded.io.netty.handler.timeout.IdleStateHandler",
+            "com.linecorp.armeria.client.HttpClientFactory",
+            "com.linecorp.armeria.client.HttpChannelPool",
+            "akka.http.impl.engine.server.HttpServerBluePrint$TimeoutAccessImpl"
+        };
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // no particular marker type
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // no particular marker type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return RX_WORKERS
-        .or(GRPC_MANAGED_CHANNEL)
-        .or(REACTOR_DISABLED_TYPE_INITIALIZERS)
-        .or(RXJAVA2_DISABLED_TYPE_INITIALIZERS)
-        .or(RXJAVA3_DISABLED_TYPE_INITIALIZERS)
-        .or(JAVA_HTTP_CLIENT)
-        .or(PEKKO_HTTP_STREAM_STAGE);
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return RX_WORKERS
+                .or(GRPC_MANAGED_CHANNEL)
+                .or(REACTOR_DISABLED_TYPE_INITIALIZERS)
+                .or(RXJAVA2_DISABLED_TYPE_INITIALIZERS)
+                .or(RXJAVA3_DISABLED_TYPE_INITIALIZERS)
+                .or(JAVA_HTTP_CLIENT)
+                .or(PEKKO_HTTP_STREAM_STAGE);
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    String advice = getClass().getName() + "$DisableAsyncAdvice";
-    // Timeout cancellation is housekeeping; its request-entity future may never complete.
-    transformer.applyAdvice(
-        named("clear")
-            .and(takesNoArguments())
-            .and(
-                isDeclaredBy(
-                    named("akka.http.impl.engine.server.HttpServerBluePrint$TimeoutAccessImpl"))),
-        advice);
-    transformer.applyAdvice(named("schedulePeriodically").and(isDeclaredBy(RX_WORKERS)), advice);
-    transformer.applyAdvice(
-        named("call").and(isDeclaredBy(named("rx.internal.operators.OperatorTimeoutBase"))),
-        advice);
-    transformer.applyAdvice(named("connect").and(isDeclaredBy(NETTY_UNSAFE)), advice);
-    transformer.applyAdvice(
-        named("init")
-            .and(isDeclaredBy(named("io.grpc.internal.ServerImpl$ServerTransportListenerImpl"))),
-        advice);
-    transformer.applyAdvice(
-        named("startTimer")
-            .and(isDeclaredBy(named("com.amazonaws.http.timers.request.HttpRequestTimer"))),
-        advice);
-    transformer.applyAdvice(
-        named("scheduleTimeout")
-            .and(isDeclaredBy(named("io.netty.handler.timeout.WriteTimeoutHandler"))),
-        advice);
-    transformer.applyAdvice(
-        named("rescheduleIdleTimer").and(isDeclaredBy(GRPC_MANAGED_CHANNEL)), advice);
-    transformer.applyAdvice(
-        namedOneOf("scheduleAtFixedRate", "scheduleWithFixedDelay")
-            .and(isDeclaredBy(named("java.util.concurrent.ScheduledThreadPoolExecutor"))),
-        advice);
-    transformer.applyAdvice(
-        named("start").and(isDeclaredBy(named("rx.internal.util.ObjectPool"))), advice);
-    transformer.applyAdvice(
-        namedOneOf("addConnection", "put")
-            .and(isDeclaredBy(named("com.squareup.okhttp.ConnectionPool"))),
-        advice);
-    transformer.applyAdvice(
-        named("put").and(isDeclaredBy(named("okhttp3.ConnectionPool"))), advice);
-    transformer.applyAdvice(
-        named("put").and(isDeclaredBy(named("okhttp3.internal.connection.RealConnectionPool"))),
-        advice);
-    transformer.applyAdvice(
-        named("sendMessage")
-            .and(isDeclaredBy(named("org.elasticsearch.transport.netty4.Netty4TcpChannel"))),
-        advice);
-    transformer.applyAdvice(
-        named("createEntry")
-            .and(isDeclaredBy(named("org.springframework.cglib.core.internal.LoadingCache"))),
-        advice);
-    transformer.applyAdvice(
-        named("runOnEventLoop")
-            .and(
-                isDeclaredBy(
-                    named(
-                        "com.datastax.oss.driver.internal.core.channel.DefaultWriteCoalescer$Flusher"))),
-        advice);
-    transformer.applyAdvice(
-        named("buildAsync")
-            .and(isDeclaredBy(named("com.datastax.oss.driver.api.core.session.SessionBuilder"))),
-        advice);
-    transformer.applyAdvice(
-        namedOneOf("getInjecteeDescriptor", "getService")
-            .and(isDeclaredBy(named("org.jvnet.hk2.internal.ServiceLocatorImpl"))),
-        advice);
-    transformer.applyAdvice(
-        named("getConnection").and(isDeclaredBy(named("com.zaxxer.hikari.pool.HikariPool"))),
-        advice);
-    transformer.applyAdvice(
-        named("schedule").and(isDeclaredBy(named("net.sf.ehcache.store.disk.DiskStorageFactory"))),
-        advice);
-    transformer.applyAdvice(
-        named("doRescheduleTask")
-            .and(
-                isDeclaredBy(
-                    named("org.springframework.jms.listener.DefaultMessageListenerContainer"))),
-        advice);
-    transformer.applyAdvice(
-        named("beginTransaction")
-            .and(isDeclaredBy(named("org.apache.activemq.broker.TransactionBroker"))),
-        advice);
-    transformer.applyAdvice(
-        named("initUnlessClosed")
-            .and(
-                isDeclaredBy(
-                    named(
-                        "com.mongodb.internal.connection.DefaultConnectionPool$AsyncWorkManager"))),
-        advice);
-    transformer.applyAdvice(
-        isTypeInitializer().and(isDeclaredBy(REACTOR_DISABLED_TYPE_INITIALIZERS)), advice);
-    transformer.applyAdvice(
-        isTypeInitializer().and(isDeclaredBy(RXJAVA2_DISABLED_TYPE_INITIALIZERS)), advice);
-    transformer.applyAdvice(
-        isTypeInitializer().and(isDeclaredBy(RXJAVA3_DISABLED_TYPE_INITIALIZERS)), advice);
-    transformer.applyAdvice(
-        isTypeInitializer().and(isDeclaredBy(NETTY_GLOBAL_EVENT_EXECUTOR)), advice);
-    transformer.applyAdvice(
-        named("initialize")
-            .and(returns(void.class))
-            .and(
-                takesArgument(
-                    0,
-                    namedOneOf(
-                        "io.netty.channel.ChannelHandlerContext",
-                        "io.grpc.netty.shaded.io.netty.channel.ChannelHandlerContext")))
-            .and(isDeclaredBy(NETTY_IDLE_STATE_HANDLER)),
-        advice);
-    transformer.applyAdvice(namedOneOf("sendAsync").and(isDeclaredBy(JAVA_HTTP_CLIENT)), advice);
-    transformer.applyAdvice(
-        named("channelRegistered").and(isDeclaredBy(named(LETTUCE_HANDSHAKE_HANDLER))), advice);
-    transformer.applyAdvice(
-        named("preStart").and(takesNoArguments()).and(isDeclaredBy(PEKKO_HTTP_STREAM_STAGE)),
-        advice);
-    // armeria runs its own codec/pipeline, so the active request span captured during connection
-    // pool creation and channel connect will have no consumers.
-    transformer.applyAdvice(
-        named("pool").and(isDeclaredBy(named("com.linecorp.armeria.client.HttpClientFactory"))),
-        advice);
-    transformer.applyAdvice(
-        named("connect").and(isDeclaredBy(named("com.linecorp.armeria.client.HttpChannelPool"))),
-        advice);
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        String advice = getClass().getName() + "$DisableAsyncAdvice";
+        // Timeout cancellation is housekeeping; its request-entity future may never complete.
+        transformer.applyAdvice(
+                named("clear")
+                        .and(takesNoArguments())
+                        .and(isDeclaredBy(named("akka.http.impl.engine.server.HttpServerBluePrint$TimeoutAccessImpl"))),
+                advice);
+        transformer.applyAdvice(named("schedulePeriodically").and(isDeclaredBy(RX_WORKERS)), advice);
+        transformer.applyAdvice(
+                named("call").and(isDeclaredBy(named("rx.internal.operators.OperatorTimeoutBase"))), advice);
+        transformer.applyAdvice(named("connect").and(isDeclaredBy(NETTY_UNSAFE)), advice);
+        transformer.applyAdvice(
+                named("init").and(isDeclaredBy(named("io.grpc.internal.ServerImpl$ServerTransportListenerImpl"))),
+                advice);
+        transformer.applyAdvice(
+                named("startTimer").and(isDeclaredBy(named("com.amazonaws.http.timers.request.HttpRequestTimer"))),
+                advice);
+        transformer.applyAdvice(
+                named("scheduleTimeout").and(isDeclaredBy(named("io.netty.handler.timeout.WriteTimeoutHandler"))),
+                advice);
+        transformer.applyAdvice(named("rescheduleIdleTimer").and(isDeclaredBy(GRPC_MANAGED_CHANNEL)), advice);
+        transformer.applyAdvice(
+                namedOneOf("scheduleAtFixedRate", "scheduleWithFixedDelay")
+                        .and(isDeclaredBy(named("java.util.concurrent.ScheduledThreadPoolExecutor"))),
+                advice);
+        transformer.applyAdvice(named("start").and(isDeclaredBy(named("rx.internal.util.ObjectPool"))), advice);
+        transformer.applyAdvice(
+                namedOneOf("addConnection", "put").and(isDeclaredBy(named("com.squareup.okhttp.ConnectionPool"))),
+                advice);
+        transformer.applyAdvice(named("put").and(isDeclaredBy(named("okhttp3.ConnectionPool"))), advice);
+        transformer.applyAdvice(
+                named("put").and(isDeclaredBy(named("okhttp3.internal.connection.RealConnectionPool"))), advice);
+        transformer.applyAdvice(
+                named("sendMessage").and(isDeclaredBy(named("org.elasticsearch.transport.netty4.Netty4TcpChannel"))),
+                advice);
+        transformer.applyAdvice(
+                named("createEntry").and(isDeclaredBy(named("org.springframework.cglib.core.internal.LoadingCache"))),
+                advice);
+        transformer.applyAdvice(
+                named("runOnEventLoop")
+                        .and(isDeclaredBy(
+                                named("com.datastax.oss.driver.internal.core.channel.DefaultWriteCoalescer$Flusher"))),
+                advice);
+        transformer.applyAdvice(
+                named("buildAsync").and(isDeclaredBy(named("com.datastax.oss.driver.api.core.session.SessionBuilder"))),
+                advice);
+        transformer.applyAdvice(
+                namedOneOf("getInjecteeDescriptor", "getService")
+                        .and(isDeclaredBy(named("org.jvnet.hk2.internal.ServiceLocatorImpl"))),
+                advice);
+        transformer.applyAdvice(
+                named("getConnection").and(isDeclaredBy(named("com.zaxxer.hikari.pool.HikariPool"))), advice);
+        transformer.applyAdvice(
+                named("schedule").and(isDeclaredBy(named("net.sf.ehcache.store.disk.DiskStorageFactory"))), advice);
+        transformer.applyAdvice(
+                named("doRescheduleTask")
+                        .and(isDeclaredBy(named("org.springframework.jms.listener.DefaultMessageListenerContainer"))),
+                advice);
+        transformer.applyAdvice(
+                named("beginTransaction").and(isDeclaredBy(named("org.apache.activemq.broker.TransactionBroker"))),
+                advice);
+        transformer.applyAdvice(
+                named("initUnlessClosed")
+                        .and(isDeclaredBy(
+                                named("com.mongodb.internal.connection.DefaultConnectionPool$AsyncWorkManager"))),
+                advice);
+        transformer.applyAdvice(isTypeInitializer().and(isDeclaredBy(REACTOR_DISABLED_TYPE_INITIALIZERS)), advice);
+        transformer.applyAdvice(isTypeInitializer().and(isDeclaredBy(RXJAVA2_DISABLED_TYPE_INITIALIZERS)), advice);
+        transformer.applyAdvice(isTypeInitializer().and(isDeclaredBy(RXJAVA3_DISABLED_TYPE_INITIALIZERS)), advice);
+        transformer.applyAdvice(isTypeInitializer().and(isDeclaredBy(NETTY_GLOBAL_EVENT_EXECUTOR)), advice);
+        transformer.applyAdvice(
+                named("initialize")
+                        .and(returns(void.class))
+                        .and(takesArgument(
+                                0,
+                                namedOneOf(
+                                        "io.netty.channel.ChannelHandlerContext",
+                                        "io.grpc.netty.shaded.io.netty.channel.ChannelHandlerContext")))
+                        .and(isDeclaredBy(NETTY_IDLE_STATE_HANDLER)),
+                advice);
+        transformer.applyAdvice(namedOneOf("sendAsync").and(isDeclaredBy(JAVA_HTTP_CLIENT)), advice);
+        transformer.applyAdvice(named("channelRegistered").and(isDeclaredBy(named(LETTUCE_HANDSHAKE_HANDLER))), advice);
+        transformer.applyAdvice(
+                named("preStart").and(takesNoArguments()).and(isDeclaredBy(PEKKO_HTTP_STREAM_STAGE)), advice);
+        // armeria runs its own codec/pipeline, so the active request span captured during connection
+        // pool creation and channel connect will have no consumers.
+        transformer.applyAdvice(
+                named("pool").and(isDeclaredBy(named("com.linecorp.armeria.client.HttpClientFactory"))), advice);
+        transformer.applyAdvice(
+                named("connect").and(isDeclaredBy(named("com.linecorp.armeria.client.HttpChannelPool"))), advice);
+    }
 
-  public static class DisableAsyncAdvice {
+    public static class DisableAsyncAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static boolean before() {
-      if (isAsyncPropagationEnabled()) {
-        setAsyncPropagationEnabled(false);
-        return true;
-      }
-      return false;
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static boolean before() {
+            if (isAsyncPropagationEnabled()) {
+                setAsyncPropagationEnabled(false);
+                return true;
+            }
+            return false;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter boolean wasDisabled) {
-      if (wasDisabled) {
-        setAsyncPropagationEnabled(true);
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter boolean wasDisabled) {
+            if (wasDisabled) {
+                setAsyncPropagationEnabled(true);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/ConcurrentInstrumentationNames.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/ConcurrentInstrumentationNames.java
index 8a2cbd4381a..dc34015d352 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/ConcurrentInstrumentationNames.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/ConcurrentInstrumentationNames.java
@@ -2,7 +2,7 @@
 
 /** Defines common instrumentation names. */
 public final class ConcurrentInstrumentationNames {
-  public static final String EXECUTOR_INSTRUMENTATION_NAME = "java_concurrent";
-  public static final String FORK_JOIN_POOL_INSTRUMENTATION_NAME = "fjp";
-  public static final String RUNNABLE_INSTRUMENTATION_NAME = "runnable";
+    public static final String EXECUTOR_INSTRUMENTATION_NAME = "java_concurrent";
+    public static final String FORK_JOIN_POOL_INSTRUMENTATION_NAME = "fjp";
+    public static final String RUNNABLE_INSTRUMENTATION_NAME = "runnable";
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java
index 88fd9aeae55..d8d8982800f 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java
@@ -12,85 +12,83 @@
 
 @AutoService(InstrumenterModule.class)
 public class TaskUnwrappingInstrumentation extends InstrumenterModule.Profiling
-    implements Instrumenter.ForKnownTypes,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.WithStructuralChange {
-  public TaskUnwrappingInstrumentation() {
-    super(EXECUTOR_INSTRUMENTATION_NAME, "task-unwrapping");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasTypeAdvice, Instrumenter.WithStructuralChange {
+    public TaskUnwrappingInstrumentation() {
+        super(EXECUTOR_INSTRUMENTATION_NAME, "task-unwrapping");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled()
-        && ConfigProvider.getInstance()
-            .getBoolean(
-                ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED,
-                ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED_DEFAULT);
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled()
+                && ConfigProvider.getInstance()
+                        .getBoolean(
+                                ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED,
+                                ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED_DEFAULT);
+    }
 
-  private static final String[] TYPES_WITH_FIELDS = {
-    "java.util.concurrent.FutureTask",
-    "callable",
-    "java.util.concurrent.Executors$RunnableAdapter",
-    "task",
-    "java.util.concurrent.CompletableFuture$AsyncSupply",
-    "fn",
-    "java.util.concurrent.CompletableFuture$AsyncRun",
-    "fn",
-    "java.util.concurrent.ForkJoinTask$AdaptedRunnable",
-    "runnable",
-    "java.util.concurrent.ForkJoinTask$AdaptedCallable",
-    "callable",
-    "java.util.concurrent.ForkJoinTask$AdaptedRunnableAction",
-    "runnable",
-    "java.util.concurrent.ForkJoinTask$RunnableExecuteAction",
-    "runnable",
-    "java.util.concurrent.ForkJoinTask$AdaptedInterruptibleCallable",
-    "callable",
-    // netty
-    "io.netty.util.concurrent.PromiseTask$RunnableAdapter",
-    "task",
-    "io.netty.util.concurrent.PromiseTask",
-    "task",
-    "io.netty.channel.AbstractChannelHandlerContext$WriteTask",
-    "msg",
-    // netty shaded into gRPC
-    "io.grpc.netty.shaded.io.netty.util.concurrent.PromiseTask$RunnableAdapter",
-    "task",
-    "io.grpc.netty.shaded.io.netty.util.concurrent.PromiseTask",
-    "task",
-    "io.grpc.netty.shaded.io.netty.channel.AbstractChannelHandlerContext$WriteTask",
-    "msg",
-    "io.grpc.Context$1",
-    "val$r",
-    "io.grpc.Context$2",
-    "val$c",
-    "io.grpc.netty.WriteQueue$RunnableCommand",
-    "runnable",
-    "io.grpc.internal.LogExceptionRunnable",
-    "task",
-    "akka.dispatch.TaskInvocation",
-    "runnable",
-    "scala.concurrent.impl.CallbackRunnable",
-    "onComplete"
-  };
+    private static final String[] TYPES_WITH_FIELDS = {
+        "java.util.concurrent.FutureTask",
+        "callable",
+        "java.util.concurrent.Executors$RunnableAdapter",
+        "task",
+        "java.util.concurrent.CompletableFuture$AsyncSupply",
+        "fn",
+        "java.util.concurrent.CompletableFuture$AsyncRun",
+        "fn",
+        "java.util.concurrent.ForkJoinTask$AdaptedRunnable",
+        "runnable",
+        "java.util.concurrent.ForkJoinTask$AdaptedCallable",
+        "callable",
+        "java.util.concurrent.ForkJoinTask$AdaptedRunnableAction",
+        "runnable",
+        "java.util.concurrent.ForkJoinTask$RunnableExecuteAction",
+        "runnable",
+        "java.util.concurrent.ForkJoinTask$AdaptedInterruptibleCallable",
+        "callable",
+        // netty
+        "io.netty.util.concurrent.PromiseTask$RunnableAdapter",
+        "task",
+        "io.netty.util.concurrent.PromiseTask",
+        "task",
+        "io.netty.channel.AbstractChannelHandlerContext$WriteTask",
+        "msg",
+        // netty shaded into gRPC
+        "io.grpc.netty.shaded.io.netty.util.concurrent.PromiseTask$RunnableAdapter",
+        "task",
+        "io.grpc.netty.shaded.io.netty.util.concurrent.PromiseTask",
+        "task",
+        "io.grpc.netty.shaded.io.netty.channel.AbstractChannelHandlerContext$WriteTask",
+        "msg",
+        "io.grpc.Context$1",
+        "val$r",
+        "io.grpc.Context$2",
+        "val$c",
+        "io.grpc.netty.WriteQueue$RunnableCommand",
+        "runnable",
+        "io.grpc.internal.LogExceptionRunnable",
+        "task",
+        "akka.dispatch.TaskInvocation",
+        "runnable",
+        "scala.concurrent.impl.CallbackRunnable",
+        "onComplete"
+    };
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new UnwrappingVisitor(TYPES_WITH_FIELDS));
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new UnwrappingVisitor(TYPES_WITH_FIELDS));
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    String[] types = new String[TYPES_WITH_FIELDS.length / 2];
-    for (int i = 0; i < types.length; i++) {
-      types[i] = TYPES_WITH_FIELDS[i * 2];
+    @Override
+    public String[] knownMatchingTypes() {
+        String[] types = new String[TYPES_WITH_FIELDS.length / 2];
+        for (int i = 0; i < types.length; i++) {
+            types[i] = TYPES_WITH_FIELDS[i * 2];
+        }
+        return types;
     }
-    return types;
-  }
 
-  @Override
-  public Class<?> structuralChangeMarker() {
-    return TaskWrapper.class;
-  }
+    @Override
+    public Class<?> structuralChangeMarker() {
+        return TaskWrapper.class;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java
index 45909ebc3d8..f3d8d0e6331 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java
@@ -25,106 +25,103 @@
 
 @AutoService(InstrumenterModule.class)
 public final class WrapRunnableAsNewTaskInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public WrapRunnableAsNewTaskInstrumentation() {
-    super(EXECUTOR_INSTRUMENTATION_NAME, "new-task-for");
-  }
+        implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public WrapRunnableAsNewTaskInstrumentation() {
+        super(EXECUTOR_INSTRUMENTATION_NAME, "new-task-for");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.netty.channel.epoll.EpollEventLoop",
-      "io.netty.channel.nio.NioEventLoop",
-      "io.netty.channel.SingleThreadEventLoop",
-      "io.netty.util.concurrent.AbstractEventExecutor",
-      "io.netty.util.concurrent.AbstractScheduledEventExecutor",
-      "io.netty.util.concurrent.DefaultEventExecutor",
-      "io.netty.util.concurrent.GlobalEventExecutor",
-      "io.netty.util.concurrent.SingleThreadEventExecutor",
-      "java.util.concurrent.AbstractExecutorService",
-      "org.glassfish.grizzly.threadpool.GrizzlyExecutorService",
-      "org.jboss.threads.EnhancedQueueExecutor",
-      "io.vertx.core.impl.WorkerExecutor",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.netty.channel.epoll.EpollEventLoop",
+            "io.netty.channel.nio.NioEventLoop",
+            "io.netty.channel.SingleThreadEventLoop",
+            "io.netty.util.concurrent.AbstractEventExecutor",
+            "io.netty.util.concurrent.AbstractScheduledEventExecutor",
+            "io.netty.util.concurrent.DefaultEventExecutor",
+            "io.netty.util.concurrent.GlobalEventExecutor",
+            "io.netty.util.concurrent.SingleThreadEventExecutor",
+            "java.util.concurrent.AbstractExecutorService",
+            "org.glassfish.grizzly.threadpool.GrizzlyExecutorService",
+            "org.jboss.threads.EnhancedQueueExecutor",
+            "io.vertx.core.impl.WorkerExecutor",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    Junction<MethodDescription> hasExecute =
-        isMethod().and(named("execute").and(takesArgument(0, named(Runnable.class.getName()))));
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        Junction<MethodDescription> hasExecute =
+                isMethod().and(named("execute").and(takesArgument(0, named(Runnable.class.getName()))));
 
-    Junction<MethodDescription> hasNewTaskFor =
-        isDeclaredBy(extendsClass(named("java.util.concurrent.AbstractExecutorService")));
+        Junction<MethodDescription> hasNewTaskFor =
+                isDeclaredBy(extendsClass(named("java.util.concurrent.AbstractExecutorService")));
 
-    // executors that extend AbstractExecutorService should use 'newTaskFor' wrapper
-    transformer.applyAdvice(hasExecute.and(hasNewTaskFor), getClass().getName() + "$NewTaskFor");
+        // executors that extend AbstractExecutorService should use 'newTaskFor' wrapper
+        transformer.applyAdvice(hasExecute.and(hasNewTaskFor), getClass().getName() + "$NewTaskFor");
 
-    // use simple wrapper for executors that don't extend AbstractExecutorService
-    transformer.applyAdvice(hasExecute.and(not(hasNewTaskFor)), getClass().getName() + "$Wrap");
-  }
+        // use simple wrapper for executors that don't extend AbstractExecutorService
+        transformer.applyAdvice(hasExecute.and(not(hasNewTaskFor)), getClass().getName() + "$Wrap");
+    }
 
-  // We tolerate a bit of duplication between these advice classes because
-  // it avoids having to inject other helper classes onto the bootclasspath
+    // We tolerate a bit of duplication between these advice classes because
+    // it avoids having to inject other helper classes onto the bootclasspath
 
-  /**
-   * Wrapper that uses {@link AbstractExecutorService#newTaskFor}.
-   *
-   * <p>The placeholder 'newTaskFor' is rewritten at build time to call the real method (which has
-   * protected access so javac won't let us call it here directly). Once rewritten this advice can
-   * only be applied to types that extend {@link AbstractExecutorService} otherwise we'll get class
-   * verification errors about this call in the transformed executor.
-   */
-  @SuppressWarnings("rawtypes")
-  public static final class NewTaskFor {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static boolean execute(
-        @Advice.This Executor executor,
-        @Advice.Argument(value = 0, readOnly = false) Runnable task) {
-      if (task instanceof RunnableFuture || null == task || exclude(RUNNABLE, task)) {
-        return false;
-        // no wrapping required
-      } else if (task instanceof Comparable) {
-        task = Wrapper.wrap(task);
-      } else {
-        task = NewTaskForPlaceholder.newTaskFor(executor, task, null);
-      }
-      return true;
-    }
+    /**
+     * Wrapper that uses {@link AbstractExecutorService#newTaskFor}.
+     *
+     * <p>The placeholder 'newTaskFor' is rewritten at build time to call the real method (which has
+     * protected access so javac won't let us call it here directly). Once rewritten this advice can
+     * only be applied to types that extend {@link AbstractExecutorService} otherwise we'll get class
+     * verification errors about this call in the transformed executor.
+     */
+    @SuppressWarnings("rawtypes")
+    public static final class NewTaskFor {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static boolean execute(
+                @Advice.This Executor executor, @Advice.Argument(value = 0, readOnly = false) Runnable task) {
+            if (task instanceof RunnableFuture || null == task || exclude(RUNNABLE, task)) {
+                return false;
+                // no wrapping required
+            } else if (task instanceof Comparable) {
+                task = Wrapper.wrap(task);
+            } else {
+                task = NewTaskForPlaceholder.newTaskFor(executor, task, null);
+            }
+            return true;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void cancel(
-        @Advice.Enter boolean wrapped,
-        @Advice.Argument(0) Runnable task,
-        @Advice.Thrown Throwable error) {
-      // don't cancel unless we did the wrapping
-      if (wrapped && null != error && task instanceof RunnableFuture) {
-        // Guard against recursive cancel calls which can cause StackOverflowError
-        // when executor.execute() fails during shutdown and triggers promise notifications
-        int callDepth = CallDepthThreadLocalMap.incrementCallDepth(RunnableFuture.class);
-        try {
-          if (callDepth == 0) {
-            ((RunnableFuture) task).cancel(true);
-          }
-        } finally {
-          CallDepthThreadLocalMap.decrementCallDepth(RunnableFuture.class);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void cancel(
+                @Advice.Enter boolean wrapped, @Advice.Argument(0) Runnable task, @Advice.Thrown Throwable error) {
+            // don't cancel unless we did the wrapping
+            if (wrapped && null != error && task instanceof RunnableFuture) {
+                // Guard against recursive cancel calls which can cause StackOverflowError
+                // when executor.execute() fails during shutdown and triggers promise notifications
+                int callDepth = CallDepthThreadLocalMap.incrementCallDepth(RunnableFuture.class);
+                try {
+                    if (callDepth == 0) {
+                        ((RunnableFuture) task).cancel(true);
+                    }
+                } finally {
+                    CallDepthThreadLocalMap.decrementCallDepth(RunnableFuture.class);
+                }
+            }
         }
-      }
     }
-  }
 
-  /** More general wrapper that uses {@link Wrapper} instead of calling 'newTaskFor'. */
-  @SuppressWarnings("rawtypes")
-  public static final class Wrap {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void execute(@Advice.Argument(value = 0, readOnly = false) Runnable task) {
-      task = Wrapper.wrap(task);
-    }
+    /** More general wrapper that uses {@link Wrapper} instead of calling 'newTaskFor'. */
+    @SuppressWarnings("rawtypes")
+    public static final class Wrap {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void execute(@Advice.Argument(value = 0, readOnly = false) Runnable task) {
+            task = Wrapper.wrap(task);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void cancel(@Advice.Argument(0) Runnable task, @Advice.Thrown Throwable error) {
-      if (null != error && task instanceof Wrapper) {
-        ((Wrapper) task).cancel();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void cancel(@Advice.Argument(0) Runnable task, @Advice.Thrown Throwable error) {
+            if (null != error && task instanceof Wrapper) {
+                ((Wrapper) task).cancel();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java
index 60a6fd1c0e8..8a47e820bc5 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java
@@ -11,41 +11,41 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public abstract class AbstractExecutorInstrumentation
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.CanShortcutTypeMatching,
-        Instrumenter.ForConfiguredTypes,
-        Instrumenter.HasMethodAdvice {
-
-  /** To apply to all executors, use override setting below. */
-  private final boolean TRACE_ALL_EXECUTORS = InstrumenterConfig.get().isTraceExecutorsAll();
-
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return !TRACE_ALL_EXECUTORS;
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "kotlinx.coroutines.scheduling.CoroutineScheduler",
-      "play.api.libs.streams.Execution$trampoline$",
-      "scala.concurrent.Future$InternalCallbackExecutor$",
-      "scala.concurrent.impl.ExecutionContextImpl"
-    };
-  }
-
-  @Override
-  public Collection<String> configuredMatchingTypes() {
-    return InstrumenterConfig.get().getTraceExecutors();
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(Executor.class.getName()));
-  }
+        implements Instrumenter.ForBootstrap,
+                Instrumenter.CanShortcutTypeMatching,
+                Instrumenter.ForConfiguredTypes,
+                Instrumenter.HasMethodAdvice {
+
+    /** To apply to all executors, use override setting below. */
+    private final boolean TRACE_ALL_EXECUTORS = InstrumenterConfig.get().isTraceExecutorsAll();
+
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return !TRACE_ALL_EXECUTORS;
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "kotlinx.coroutines.scheduling.CoroutineScheduler",
+            "play.api.libs.streams.Execution$trampoline$",
+            "scala.concurrent.Future$InternalCallbackExecutor$",
+            "scala.concurrent.impl.ExecutionContextImpl"
+        };
+    }
+
+    @Override
+    public Collection<String> configuredMatchingTypes() {
+        return InstrumenterConfig.get().getTraceExecutors();
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(Executor.class.getName()));
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ExecutorModule.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ExecutorModule.java
index 05763c8d8ab..33ef411c446 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ExecutorModule.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ExecutorModule.java
@@ -23,54 +23,49 @@
 import org.slf4j.LoggerFactory;
 
 @AutoService(InstrumenterModule.class)
-public class ExecutorModule extends InstrumenterModule.ContextTracking
-    implements ExcludeFilterProvider {
-  private static final Logger log = LoggerFactory.getLogger(ExecutorModule.class);
+public class ExecutorModule extends InstrumenterModule.ContextTracking implements ExcludeFilterProvider {
+    private static final Logger log = LoggerFactory.getLogger(ExecutorModule.class);
 
-  public ExecutorModule() {
-    super(EXECUTOR_INSTRUMENTATION_NAME);
-    if (InstrumenterConfig.get().isTraceExecutorsAll()) {
-      log.warn("Tracing all executors enabled. This is not a recommended setting.");
+    public ExecutorModule() {
+        super(EXECUTOR_INSTRUMENTATION_NAME);
+        if (InstrumenterConfig.get().isTraceExecutorsAll()) {
+            log.warn("Tracing all executors enabled. This is not a recommended setting.");
+        }
     }
-  }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStore = new HashMap<>(4);
-    contextStore.put("java.util.concurrent.RunnableFuture", State.class.getName());
-    // TODO get rid of this
-    contextStore.put("java.lang.Runnable", State.class.getName());
-    return Collections.unmodifiableMap(contextStore);
-  }
-
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    Map<ExcludeFilter.ExcludeType, List<String>> map = new HashMap<>();
-    map.put(
-        RUNNABLE,
-        Arrays.asList(
-            "datadog.trace.bootstrap.instrumentation.java.concurrent.Wrapper",
-            "datadog.trace.bootstrap.instrumentation.java.concurrent.ComparableRunnable"));
-    map.put(
-        EXECUTOR,
-        Collections.singletonList("org.apache.mina.filter.executor.OrderedThreadPoolExecutor"));
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStore = new HashMap<>(4);
+        contextStore.put("java.util.concurrent.RunnableFuture", State.class.getName());
+        // TODO get rid of this
+        contextStore.put("java.lang.Runnable", State.class.getName());
+        return Collections.unmodifiableMap(contextStore);
+    }
 
-    return Collections.unmodifiableMap(map);
-  }
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        Map<ExcludeFilter.ExcludeType, List<String>> map = new HashMap<>();
+        map.put(
+                RUNNABLE,
+                Arrays.asList(
+                        "datadog.trace.bootstrap.instrumentation.java.concurrent.Wrapper",
+                        "datadog.trace.bootstrap.instrumentation.java.concurrent.ComparableRunnable"));
+        map.put(EXECUTOR, Collections.singletonList("org.apache.mina.filter.executor.OrderedThreadPoolExecutor"));
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    final List<Instrumenter> instrumenters = new ArrayList<>();
-    instrumenters.add(new JavaExecutorInstrumentation());
-    if (InstrumenterConfig.get()
-        .isIntegrationEnabled(singleton(EXECUTOR_INSTRUMENTATION_NAME + ".other"), true)) {
-      instrumenters.add(new NonStandardExecutorInstrumentation());
+        return Collections.unmodifiableMap(map);
     }
-    if (InstrumenterConfig.get()
-        .isIntegrationEnabled(singleton("rejected-execution-handler"), true)) {
-      instrumenters.add(new RejectedExecutionHandlerInstrumentation());
+
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        final List<Instrumenter> instrumenters = new ArrayList<>();
+        instrumenters.add(new JavaExecutorInstrumentation());
+        if (InstrumenterConfig.get().isIntegrationEnabled(singleton(EXECUTOR_INSTRUMENTATION_NAME + ".other"), true)) {
+            instrumenters.add(new NonStandardExecutorInstrumentation());
+        }
+        if (InstrumenterConfig.get().isIntegrationEnabled(singleton("rejected-execution-handler"), true)) {
+            instrumenters.add(new RejectedExecutionHandlerInstrumentation());
+        }
+        instrumenters.add(new ThreadPoolExecutorInstrumentation());
+        return instrumenters;
     }
-    instrumenters.add(new ThreadPoolExecutorInstrumentation());
-    return instrumenters;
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/JavaExecutorInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/JavaExecutorInstrumentation.java
index a68277cb1be..209c52922a2 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/JavaExecutorInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/JavaExecutorInstrumentation.java
@@ -16,43 +16,41 @@
 import net.bytebuddy.asm.Advice;
 
 public final class JavaExecutorInstrumentation extends AbstractExecutorInstrumentation {
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("execute").and(takesArgument(0, Runnable.class)).and(takesArguments(1)),
-        JavaExecutorInstrumentation.class.getName() + "$SetExecuteRunnableStateAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("execute").and(takesArgument(0, Runnable.class)).and(takesArguments(1)),
+                JavaExecutorInstrumentation.class.getName() + "$SetExecuteRunnableStateAdvice");
+    }
 
-  public static class SetExecuteRunnableStateAdvice {
+    public static class SetExecuteRunnableStateAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static State enterJobSubmit(
-        @Advice.Argument(value = 0, readOnly = false) Runnable task) {
-      if (task instanceof RunnableFuture) {
-        return null;
-      }
-      // there are cased like ScheduledExecutorService.submit (which we instrument)
-      // which calls ScheduledExecutorService.schedule (which we also instrument)
-      // where all of this could be dodged the second time
-      final Context context = currentContext();
-      if (context != rootContext()) {
-        final Runnable newTask = RunnableWrapper.wrapIfNeeded(task);
-        // It is important to check potentially wrapped task if we can instrument task in this
-        // executor. Some executors do not support wrapped tasks.
-        if (ExecutorInstrumentationUtils.shouldAttachStateToTask(newTask, context)) {
-          task = newTask;
-          final ContextStore<Runnable, State> contextStore =
-              InstrumentationContext.get(Runnable.class, State.class);
-          return ExecutorInstrumentationUtils.setupState(contextStore, newTask, context);
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static State enterJobSubmit(@Advice.Argument(value = 0, readOnly = false) Runnable task) {
+            if (task instanceof RunnableFuture) {
+                return null;
+            }
+            // there are cased like ScheduledExecutorService.submit (which we instrument)
+            // which calls ScheduledExecutorService.schedule (which we also instrument)
+            // where all of this could be dodged the second time
+            final Context context = currentContext();
+            if (context != rootContext()) {
+                final Runnable newTask = RunnableWrapper.wrapIfNeeded(task);
+                // It is important to check potentially wrapped task if we can instrument task in this
+                // executor. Some executors do not support wrapped tasks.
+                if (ExecutorInstrumentationUtils.shouldAttachStateToTask(newTask, context)) {
+                    task = newTask;
+                    final ContextStore<Runnable, State> contextStore =
+                            InstrumentationContext.get(Runnable.class, State.class);
+                    return ExecutorInstrumentationUtils.setupState(contextStore, newTask, context);
+                }
+            }
+            return null;
         }
-      }
-      return null;
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exitJobSubmit(
-        @Advice.Enter final State state, @Advice.Thrown final Throwable throwable) {
-      ExecutorInstrumentationUtils.cleanUpOnMethodExit(state, throwable);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exitJobSubmit(@Advice.Enter final State state, @Advice.Thrown final Throwable throwable) {
+            ExecutorInstrumentationUtils.cleanUpOnMethodExit(state, throwable);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/NonStandardExecutorInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/NonStandardExecutorInstrumentation.java
index c29752daff2..b8c0b1ee3da 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/NonStandardExecutorInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/NonStandardExecutorInstrumentation.java
@@ -5,16 +5,16 @@
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 
 public final class NonStandardExecutorInstrumentation extends AbstractExecutorInstrumentation {
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice( // kotlinx.coroutines.scheduling.CoroutineScheduler
-        named("dispatch")
-            .and(takesArgument(0, Runnable.class))
-            .and(takesArgument(1, named("kotlinx.coroutines.scheduling.TaskContext"))),
-        JavaExecutorInstrumentation.class.getName() + "$SetExecuteRunnableStateAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice( // kotlinx.coroutines.scheduling.CoroutineScheduler
+                named("dispatch")
+                        .and(takesArgument(0, Runnable.class))
+                        .and(takesArgument(1, named("kotlinx.coroutines.scheduling.TaskContext"))),
+                JavaExecutorInstrumentation.class.getName() + "$SetExecuteRunnableStateAdvice");
 
-    transformer.applyAdvice( // org.eclipse.jetty.util.thread.QueuedThreadPool
-        named("dispatch").and(takesArguments(1)).and(takesArgument(0, Runnable.class)),
-        JavaExecutorInstrumentation.class.getName() + "$SetExecuteRunnableStateAdvice");
-  }
+        transformer.applyAdvice( // org.eclipse.jetty.util.thread.QueuedThreadPool
+                named("dispatch").and(takesArguments(1)).and(takesArgument(0, Runnable.class)),
+                JavaExecutorInstrumentation.class.getName() + "$SetExecuteRunnableStateAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java
index e8b7b9effd3..53361301fa1 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java
@@ -23,88 +23,83 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class RejectedExecutionHandlerInstrumentation
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.CanShortcutTypeMatching,
-        Instrumenter.HasMethodAdvice {
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return InstrumenterConfig.get()
-        .isIntegrationShortcutMatchingEnabled(
-            asList(EXECUTOR_INSTRUMENTATION_NAME, "rejected-execution-handler"), false);
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "java.util.concurrent.ThreadPoolExecutor$AbortPolicy",
-      "java.util.concurrent.ThreadPoolExecutor$DiscardPolicy",
-      "java.util.concurrent.ThreadPoolExecutor$DiscardOldestPolicy",
-      "java.util.concurrent.ThreadPoolExecutor$CallerRunsPolicy"
-    };
-  }
+        implements Instrumenter.ForBootstrap, Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return InstrumenterConfig.get()
+                .isIntegrationShortcutMatchingEnabled(
+                        asList(EXECUTOR_INSTRUMENTATION_NAME, "rejected-execution-handler"), false);
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "java.util.concurrent.ThreadPoolExecutor$AbortPolicy",
+            "java.util.concurrent.ThreadPoolExecutor$DiscardPolicy",
+            "java.util.concurrent.ThreadPoolExecutor$DiscardOldestPolicy",
+            "java.util.concurrent.ThreadPoolExecutor$CallerRunsPolicy"
+        };
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(
-        named("java.util.concurrent.RejectedExecutionHandler")
-            .or(nameEndsWith("netty.util.concurrent.RejectedExecutionHandler")));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            // JDK or netty
-            .and(namedOneOf("rejectedExecution", "rejected"))
-            // must not constrain or use second parameter
-            .and(takesArgument(0, named("java.lang.Runnable"))),
-        getClass().getName() + "$Reject");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named("java.util.concurrent.RejectedExecutionHandler")
+                .or(nameEndsWith("netty.util.concurrent.RejectedExecutionHandler")));
+    }
 
-  public static final class Reject {
-    // remove our wrapper before calling the handler (save wrapper, so we can cancel it later)
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static Wrapper<?> handle(
-        @Advice.This Object zis, @Advice.Argument(readOnly = false, value = 0) Runnable runnable) {
-      Wrapper<?> wrapper = null;
-      if (runnable instanceof Wrapper) {
-        wrapper = (Wrapper<?>) runnable;
-        runnable = wrapper.unwrap();
-      }
-      if (Config.get().isProfilingBackPressureSamplingEnabled()) {
-        // record this event before the handler executes, which will help
-        // explain why the task is running on the submitter thread for
-        // rejection policies which run on the caller (CallerRunsPolicy or user-provided)
-        BackpressureProfiling.getInstance().process(zis.getClass(), runnable);
-      }
-      return wrapper;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        // JDK or netty
+                        .and(namedOneOf("rejectedExecution", "rejected"))
+                        // must not constrain or use second parameter
+                        .and(takesArgument(0, named("java.lang.Runnable"))),
+                getClass().getName() + "$Reject");
     }
 
-    // must execute after in case the handler actually runs the runnable,
-    // which is preferable to cancelling the continuation
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void reject(
-        @Advice.Enter Wrapper<?> wrapper, @Advice.Argument(value = 0) Runnable runnable) {
-      // not handling rejected work (which will often not manifest in an exception being thrown)
-      // leads to unclosed continuations when executors get busy
-      // note that this does not handle rejection mechanisms used in Scala, so those need to be
-      // handled another way
-      if (null != wrapper) {
-        wrapper.cancel();
-      } else {
-        if (runnable instanceof RunnableFuture) {
-          cancelTask(
-              InstrumentationContext.get(RunnableFuture.class, State.class),
-              (RunnableFuture<?>) runnable);
+    public static final class Reject {
+        // remove our wrapper before calling the handler (save wrapper, so we can cancel it later)
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static Wrapper<?> handle(
+                @Advice.This Object zis, @Advice.Argument(readOnly = false, value = 0) Runnable runnable) {
+            Wrapper<?> wrapper = null;
+            if (runnable instanceof Wrapper) {
+                wrapper = (Wrapper<?>) runnable;
+                runnable = wrapper.unwrap();
+            }
+            if (Config.get().isProfilingBackPressureSamplingEnabled()) {
+                // record this event before the handler executes, which will help
+                // explain why the task is running on the submitter thread for
+                // rejection policies which run on the caller (CallerRunsPolicy or user-provided)
+                BackpressureProfiling.getInstance().process(zis.getClass(), runnable);
+            }
+            return wrapper;
+        }
+
+        // must execute after in case the handler actually runs the runnable,
+        // which is preferable to cancelling the continuation
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void reject(@Advice.Enter Wrapper<?> wrapper, @Advice.Argument(value = 0) Runnable runnable) {
+            // not handling rejected work (which will often not manifest in an exception being thrown)
+            // leads to unclosed continuations when executors get busy
+            // note that this does not handle rejection mechanisms used in Scala, so those need to be
+            // handled another way
+            if (null != wrapper) {
+                wrapper.cancel();
+            } else {
+                if (runnable instanceof RunnableFuture) {
+                    cancelTask(InstrumentationContext.get(RunnableFuture.class, State.class), (RunnableFuture<?>)
+                            runnable);
+                }
+                // paranoid about double instrumentation until RunnableInstrumentation is removed
+                cancelTask(InstrumentationContext.get(Runnable.class, State.class), runnable);
+            }
         }
-        // paranoid about double instrumentation until RunnableInstrumentation is removed
-        cancelTask(InstrumentationContext.get(Runnable.class, State.class), runnable);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java
index 186b86ea9b3..8a89552fc2e 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java
@@ -52,156 +52,145 @@
  * }</pre>
  */
 public final class ThreadPoolExecutorInstrumentation
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  // executors which do their own wrapping before calling super,
-  // leading to double wrapping, once at the child level and once
-  // in ThreadPoolExecutor
-  private static final ElementMatcher<MethodDescription> NO_WRAPPING_BEFORE_DELEGATION =
-      not(
-          isDeclaredBy(
-              namedOneOf(
-                  "org.elasticsearch.common.util.concurrent.EsThreadPoolExecutor",
-                  "org.opensearch.common.util.concurrent.OpenSearchThreadPoolExecutor")));
+    // executors which do their own wrapping before calling super,
+    // leading to double wrapping, once at the child level and once
+    // in ThreadPoolExecutor
+    private static final ElementMatcher<MethodDescription> NO_WRAPPING_BEFORE_DELEGATION = not(isDeclaredBy(namedOneOf(
+            "org.elasticsearch.common.util.concurrent.EsThreadPoolExecutor",
+            "org.opensearch.common.util.concurrent.OpenSearchThreadPoolExecutor")));
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return not(named("java.util.concurrent.ScheduledThreadPoolExecutor"))
-        .and(extendsClass(named("java.util.concurrent.ThreadPoolExecutor")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return not(named("java.util.concurrent.ScheduledThreadPoolExecutor"))
+                .and(extendsClass(named("java.util.concurrent.ThreadPoolExecutor")));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("execute")
-            .and(isMethod())
-            .and(NO_WRAPPING_BEFORE_DELEGATION)
-            .and(takesArgument(0, named(Runnable.class.getName()))),
-        getClass().getName() + "$Execute");
-    transformer.applyAdvice(
-        named("beforeExecute")
-            .and(isMethod())
-            .and(takesArgument(1, named(Runnable.class.getName()))),
-        getClass().getName() + "$BeforeExecute");
-    transformer.applyAdvice(
-        named("afterExecute")
-            .and(isMethod())
-            .and(takesArgument(0, named(Runnable.class.getName()))),
-        getClass().getName() + "$AfterExecute");
-    transformer.applyAdvice(
-        named("remove").and(isMethod()).and(returns(Runnable.class)),
-        getClass().getName() + "$Remove");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("execute")
+                        .and(isMethod())
+                        .and(NO_WRAPPING_BEFORE_DELEGATION)
+                        .and(takesArgument(0, named(Runnable.class.getName()))),
+                getClass().getName() + "$Execute");
+        transformer.applyAdvice(
+                named("beforeExecute").and(isMethod()).and(takesArgument(1, named(Runnable.class.getName()))),
+                getClass().getName() + "$BeforeExecute");
+        transformer.applyAdvice(
+                named("afterExecute").and(isMethod()).and(takesArgument(0, named(Runnable.class.getName()))),
+                getClass().getName() + "$AfterExecute");
+        transformer.applyAdvice(
+                named("remove").and(isMethod()).and(returns(Runnable.class)),
+                getClass().getName() + "$Remove");
+    }
 
-  public static final class Execute {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void capture(
-        @Advice.This final ThreadPoolExecutor tpe,
-        @Advice.Argument(readOnly = false, value = 0) Runnable task) {
-      if (TPEHelper.shouldPropagate(tpe)) {
-        if (TPEHelper.useWrapping(task)) {
-          task = Wrapper.wrap(task);
-        } else {
-          TPEHelper.capture(InstrumentationContext.get(Runnable.class, State.class), task);
-          // queue time needs to be handled separately because there are RunnableFutures which are
-          // excluded as
-          // Runnables but it is not until now that they will be put on the executor's queue
-          if (QueueTimerHelper.isReady() && !exclude(EXECUTOR, tpe)) {
-            if (!exclude(RUNNABLE, task)) {
-              Queue<?> queue = tpe.getQueue();
-              QueueTimerHelper.startQueuingTimer(
-                  InstrumentationContext.get(Runnable.class, State.class),
-                  tpe.getClass(),
-                  queue.getClass(),
-                  queue.size(),
-                  task);
-            } else if (!exclude(RUNNABLE_FUTURE, task) && task instanceof RunnableFuture) {
-              Queue<?> queue = tpe.getQueue();
-              QueueTimerHelper.startQueuingTimer(
-                  InstrumentationContext.get(RunnableFuture.class, State.class),
-                  tpe.getClass(),
-                  queue.getClass(),
-                  queue.size(),
-                  (RunnableFuture<?>) task);
+    public static final class Execute {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void capture(
+                @Advice.This final ThreadPoolExecutor tpe,
+                @Advice.Argument(readOnly = false, value = 0) Runnable task) {
+            if (TPEHelper.shouldPropagate(tpe)) {
+                if (TPEHelper.useWrapping(task)) {
+                    task = Wrapper.wrap(task);
+                } else {
+                    TPEHelper.capture(InstrumentationContext.get(Runnable.class, State.class), task);
+                    // queue time needs to be handled separately because there are RunnableFutures which are
+                    // excluded as
+                    // Runnables but it is not until now that they will be put on the executor's queue
+                    if (QueueTimerHelper.isReady() && !exclude(EXECUTOR, tpe)) {
+                        if (!exclude(RUNNABLE, task)) {
+                            Queue<?> queue = tpe.getQueue();
+                            QueueTimerHelper.startQueuingTimer(
+                                    InstrumentationContext.get(Runnable.class, State.class),
+                                    tpe.getClass(),
+                                    queue.getClass(),
+                                    queue.size(),
+                                    task);
+                        } else if (!exclude(RUNNABLE_FUTURE, task) && task instanceof RunnableFuture) {
+                            Queue<?> queue = tpe.getQueue();
+                            QueueTimerHelper.startQueuingTimer(
+                                    InstrumentationContext.get(RunnableFuture.class, State.class),
+                                    tpe.getClass(),
+                                    queue.getClass(),
+                                    queue.size(),
+                                    (RunnableFuture<?>) task);
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 
-  public static final class BeforeExecute {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beforeExecuteEnter(
-        @Advice.This final ThreadPoolExecutor tpe,
-        @Advice.Argument(readOnly = false, value = 1) Runnable task) {
-      if (TPEHelper.shouldPropagate(tpe)) {
-        if (TPEHelper.useWrapping(task)) {
-          task = Wrapper.unwrap(task);
-        } else {
-          return TPEHelper.startScope(
-              InstrumentationContext.get(Runnable.class, State.class), task);
+    public static final class BeforeExecute {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beforeExecuteEnter(
+                @Advice.This final ThreadPoolExecutor tpe,
+                @Advice.Argument(readOnly = false, value = 1) Runnable task) {
+            if (TPEHelper.shouldPropagate(tpe)) {
+                if (TPEHelper.useWrapping(task)) {
+                    task = Wrapper.unwrap(task);
+                } else {
+                    return TPEHelper.startScope(InstrumentationContext.get(Runnable.class, State.class), task);
+                }
+            }
+            return null;
         }
-      }
-      return null;
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void beforeExecuteExit(
-        @Advice.Enter final ContextScope scope, @Advice.Argument(value = 1) Runnable task) {
-      if (scope != null) {
-        TPEHelper.setThreadLocalScope(scope, task);
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void beforeExecuteExit(
+                @Advice.Enter final ContextScope scope, @Advice.Argument(value = 1) Runnable task) {
+            if (scope != null) {
+                TPEHelper.setThreadLocalScope(scope, task);
+            }
+        }
     }
-  }
 
-  public static final class AfterExecute {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope afterExecuteEnter(
-        @Advice.This final ThreadPoolExecutor tpe,
-        @Advice.Argument(readOnly = false, value = 0) Runnable task) {
-      if (TPEHelper.shouldPropagate(tpe)) {
-        if (TPEHelper.useWrapping(task)) {
-          task = Wrapper.unwrap(task);
-        } else {
-          return TPEHelper.getAndClearThreadLocalScope(task);
+    public static final class AfterExecute {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope afterExecuteEnter(
+                @Advice.This final ThreadPoolExecutor tpe,
+                @Advice.Argument(readOnly = false, value = 0) Runnable task) {
+            if (TPEHelper.shouldPropagate(tpe)) {
+                if (TPEHelper.useWrapping(task)) {
+                    task = Wrapper.unwrap(task);
+                } else {
+                    return TPEHelper.getAndClearThreadLocalScope(task);
+                }
+            }
+            return null;
         }
-      }
-      return null;
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterExecuteExit(
-        @Advice.Enter final ContextScope scope, @Advice.Argument(value = 0) Runnable task) {
-      if (scope != null) {
-        TPEHelper.endScope(scope, task);
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterExecuteExit(
+                @Advice.Enter final ContextScope scope, @Advice.Argument(value = 0) Runnable task) {
+            if (scope != null) {
+                TPEHelper.endScope(scope, task);
+            }
+        }
     }
-  }
 
-  public static final class Remove {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void remove(
-        @Advice.This final ThreadPoolExecutor tpe,
-        @Advice.Return(readOnly = false) Runnable removed) {
-      if (TPEHelper.shouldPropagate(tpe)) {
-        if (TPEHelper.useWrapping(removed)) {
-          if (removed instanceof Wrapper) {
-            Wrapper<?> wrapper = ((Wrapper<?>) removed);
-            wrapper.cancel();
-            removed = wrapper.unwrap();
-          }
-        } else {
-          TPEHelper.cancelTask(InstrumentationContext.get(Runnable.class, State.class), removed);
+    public static final class Remove {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void remove(
+                @Advice.This final ThreadPoolExecutor tpe, @Advice.Return(readOnly = false) Runnable removed) {
+            if (TPEHelper.shouldPropagate(tpe)) {
+                if (TPEHelper.useWrapping(removed)) {
+                    if (removed instanceof Wrapper) {
+                        Wrapper<?> wrapper = ((Wrapper<?>) removed);
+                        wrapper.cancel();
+                        removed = wrapper.unwrap();
+                    }
+                } else {
+                    TPEHelper.cancelTask(InstrumentationContext.get(Runnable.class, State.class), removed);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/ForkJoinModule.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/ForkJoinModule.java
index 643f7ecdc53..a17f7cb89e7 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/ForkJoinModule.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/ForkJoinModule.java
@@ -17,31 +17,30 @@
 import java.util.Map;
 
 @AutoService(InstrumenterModule.class)
-public class ForkJoinModule extends InstrumenterModule.ContextTracking
-    implements ExcludeFilterProvider {
+public class ForkJoinModule extends InstrumenterModule.ContextTracking implements ExcludeFilterProvider {
 
-  public ForkJoinModule() {
-    super(EXECUTOR_INSTRUMENTATION_NAME, FORK_JOIN_POOL_INSTRUMENTATION_NAME);
-  }
+    public ForkJoinModule() {
+        super(EXECUTOR_INSTRUMENTATION_NAME, FORK_JOIN_POOL_INSTRUMENTATION_NAME);
+    }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    return singletonMap(
-        RUNNABLE_FUTURE,
-        asList(
-            "java.util.concurrent.ForkJoinTask$AdaptedCallable",
-            "java.util.concurrent.ForkJoinTask$AdaptedRunnable",
-            "java.util.concurrent.ForkJoinTask$AdaptedRunnableAction",
-            "java.util.concurrent.ForkJoinTask$AdaptedInterruptibleCallable"));
-  }
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        return singletonMap(
+                RUNNABLE_FUTURE,
+                asList(
+                        "java.util.concurrent.ForkJoinTask$AdaptedCallable",
+                        "java.util.concurrent.ForkJoinTask$AdaptedRunnable",
+                        "java.util.concurrent.ForkJoinTask$AdaptedRunnableAction",
+                        "java.util.concurrent.ForkJoinTask$AdaptedInterruptibleCallable"));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("java.util.concurrent.ForkJoinTask", State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("java.util.concurrent.ForkJoinTask", State.class.getName());
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(new JavaForkJoinPoolInstrumentation(), new JavaForkJoinTaskInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(new JavaForkJoinPoolInstrumentation(), new JavaForkJoinTaskInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java
index 3922218059d..1925ce3d7f7 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java
@@ -16,71 +16,66 @@
 import net.bytebuddy.asm.Advice;
 
 public class JavaForkJoinPoolInstrumentation
-    implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "java.util.concurrent.ForkJoinPool";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    String name = getClass().getName();
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("externalPush", "externalSubmit")), name + "$ExternalPush");
-    // Java 21 has a new method name and changed signature
-    transformer.applyAdvice(isMethod().and(named("poolSubmit")), name + "$PoolSubmit");
-    // Java 25 delayed tasks capture at construction and bypass the normal submission methods.
-    transformer.applyAdvice(
-        isMethod().and(named("scheduleDelayedTask")), name + "$ScheduleDelayedTask");
-  }
-
-  public static final class ExternalPush {
-    @SuppressWarnings("rawtypes")
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static <T> void externalPush(@Advice.Argument(0) ForkJoinTask<T> task) {
-      if (!exclude(FORK_JOIN_TASK, task)) {
-        ContextStore<ForkJoinTask, State> contextStore =
-            InstrumentationContext.get(ForkJoinTask.class, State.class);
-        capture(contextStore, task);
-      }
+    @Override
+    public String instrumentedType() {
+        return "java.util.concurrent.ForkJoinPool";
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static <T> void cleanup(
-        @Advice.Argument(0) ForkJoinTask<T> task, @Advice.Thrown Throwable thrown) {
-      if (null != thrown && !exclude(FORK_JOIN_TASK, task)) {
-        cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        String name = getClass().getName();
+        transformer.applyAdvice(isMethod().and(namedOneOf("externalPush", "externalSubmit")), name + "$ExternalPush");
+        // Java 21 has a new method name and changed signature
+        transformer.applyAdvice(isMethod().and(named("poolSubmit")), name + "$PoolSubmit");
+        // Java 25 delayed tasks capture at construction and bypass the normal submission methods.
+        transformer.applyAdvice(isMethod().and(named("scheduleDelayedTask")), name + "$ScheduleDelayedTask");
     }
-  }
 
-  public static final class PoolSubmit {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static <T> void poolSubmit(@Advice.Argument(1) ForkJoinTask<T> task) {
-      if (!exclude(FORK_JOIN_TASK, task)) {
-        ContextStore<ForkJoinTask, State> contextStore =
-            InstrumentationContext.get(ForkJoinTask.class, State.class);
-        capture(contextStore, task);
-      }
+    public static final class ExternalPush {
+        @SuppressWarnings("rawtypes")
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static <T> void externalPush(@Advice.Argument(0) ForkJoinTask<T> task) {
+            if (!exclude(FORK_JOIN_TASK, task)) {
+                ContextStore<ForkJoinTask, State> contextStore =
+                        InstrumentationContext.get(ForkJoinTask.class, State.class);
+                capture(contextStore, task);
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static <T> void cleanup(@Advice.Argument(0) ForkJoinTask<T> task, @Advice.Thrown Throwable thrown) {
+            if (null != thrown && !exclude(FORK_JOIN_TASK, task)) {
+                cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static <T> void cleanup(
-        @Advice.Argument(1) ForkJoinTask<T> task, @Advice.Thrown Throwable thrown) {
-      if (null != thrown && !exclude(FORK_JOIN_TASK, task)) {
-        cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
-      }
+    public static final class PoolSubmit {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static <T> void poolSubmit(@Advice.Argument(1) ForkJoinTask<T> task) {
+            if (!exclude(FORK_JOIN_TASK, task)) {
+                ContextStore<ForkJoinTask, State> contextStore =
+                        InstrumentationContext.get(ForkJoinTask.class, State.class);
+                capture(contextStore, task);
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static <T> void cleanup(@Advice.Argument(1) ForkJoinTask<T> task, @Advice.Thrown Throwable thrown) {
+            if (null != thrown && !exclude(FORK_JOIN_TASK, task)) {
+                cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+            }
+        }
     }
-  }
 
-  public static final class ScheduleDelayedTask {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void cleanup(
-        @Advice.Argument(0) ForkJoinTask<?> task, @Advice.Thrown Throwable thrown) {
-      if (thrown != null) {
-        cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
-      }
+    public static final class ScheduleDelayedTask {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void cleanup(@Advice.Argument(0) ForkJoinTask<?> task, @Advice.Thrown Throwable thrown) {
+            if (thrown != null) {
+                cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java
index 421322043cd..a0fe355c6f0 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java
@@ -30,80 +30,76 @@
  * ForkJoinPool}: JVM, Akka, Scala, Netty to name a few. This class handles JVM version.
  */
 public final class JavaForkJoinTaskInstrumentation
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return notExcludedByName(FORK_JOIN_TASK)
-        .and(declaresMethod(namedOneOf("doExec", "exec", "fork", "cancel")))
-        .and(extendsClass(named("java.util.concurrent.ForkJoinTask")));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("doExec", "exec")), getClass().getName() + "$Exec");
-    transformer.applyAdvice(isMethod().and(named("fork")), getClass().getName() + "$Fork");
-    // The delay scheduler cancels tasks internally without calling the public cancel method.
-    transformer.applyAdvice(
-        isMethod()
-            .and(
-                named("cancel")
-                    .or(
-                        named("trySetCancelled")
-                            .and(isDeclaredBy(named("java.util.concurrent.ForkJoinTask"))))),
-        getClass().getName() + "$Cancel");
-    // A delayed task can be completed before it ever executes or is cancelled.
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("complete", "quietlyComplete", "completeExceptionally"))
-            .and(isDeclaredBy(named("java.util.concurrent.ForkJoinTask"))),
-        getClass().getName() + "$Complete");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return notExcludedByName(FORK_JOIN_TASK)
+                .and(declaresMethod(namedOneOf("doExec", "exec", "fork", "cancel")))
+                .and(extendsClass(named("java.util.concurrent.ForkJoinTask")));
+    }
 
-  public static final class Exec {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static <T> ContextScope before(@Advice.This ForkJoinTask<T> task) {
-      return exclude(FORK_JOIN_TASK, task)
-          ? null
-          : startTaskScope(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("doExec", "exec")), getClass().getName() + "$Exec");
+        transformer.applyAdvice(isMethod().and(named("fork")), getClass().getName() + "$Fork");
+        // The delay scheduler cancels tasks internally without calling the public cancel method.
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("cancel")
+                                .or(named("trySetCancelled")
+                                        .and(isDeclaredBy(named("java.util.concurrent.ForkJoinTask"))))),
+                getClass().getName() + "$Cancel");
+        // A delayed task can be completed before it ever executes or is cancelled.
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("complete", "quietlyComplete", "completeExceptionally"))
+                        .and(isDeclaredBy(named("java.util.concurrent.ForkJoinTask"))),
+                getClass().getName() + "$Complete");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      endTaskScope(scope);
+    public static final class Exec {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static <T> ContextScope before(@Advice.This ForkJoinTask<T> task) {
+            return exclude(FORK_JOIN_TASK, task)
+                    ? null
+                    : startTaskScope(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 
-  public static final class Fork {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static <T> void fork(@Advice.This ForkJoinTask<T> task) {
-      if (!exclude(FORK_JOIN_TASK, task)) {
-        capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
-      }
+    public static final class Fork {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static <T> void fork(@Advice.This ForkJoinTask<T> task) {
+            if (!exclude(FORK_JOIN_TASK, task)) {
+                capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+            }
+        }
     }
-  }
 
-  public static final class Cancel {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static <T> void cancel(@Advice.This ForkJoinTask<T> task) {
-      cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+    public static final class Cancel {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static <T> void cancel(@Advice.This ForkJoinTask<T> task) {
+            cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+        }
     }
-  }
 
-  public static final class Complete {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void complete(@Advice.This ForkJoinTask<?> task) {
-      if (task.isDone()) {
-        cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
-      }
+    public static final class Complete {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void complete(@Advice.This ForkJoinTask<?> task) {
+            if (task.isDone()) {
+                cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinWorkQueueInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinWorkQueueInstrumentation.java
index 3be741c9908..3e093da466e 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinWorkQueueInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinWorkQueueInstrumentation.java
@@ -28,62 +28,60 @@
 
 @AutoService(InstrumenterModule.class)
 public class JavaForkJoinWorkQueueInstrumentation extends InstrumenterModule.Profiling
-    implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JavaForkJoinWorkQueueInstrumentation() {
-    super(
-        EXECUTOR_INSTRUMENTATION_NAME,
-        FORK_JOIN_POOL_INSTRUMENTATION_NAME,
-        FORK_JOIN_POOL_INSTRUMENTATION_NAME + "-workqueue");
-  }
+    public JavaForkJoinWorkQueueInstrumentation() {
+        super(
+                EXECUTOR_INSTRUMENTATION_NAME,
+                FORK_JOIN_POOL_INSTRUMENTATION_NAME,
+                FORK_JOIN_POOL_INSTRUMENTATION_NAME + "-workqueue");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "java.util.concurrent.ForkJoinPool$WorkQueue";
-  }
+    @Override
+    public String instrumentedType() {
+        return "java.util.concurrent.ForkJoinPool$WorkQueue";
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled()
-        && ConfigProvider.getInstance()
-            .getBoolean(
-                ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED,
-                ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED_DEFAULT);
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled()
+                && ConfigProvider.getInstance()
+                        .getBoolean(
+                                ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED,
+                                ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED_DEFAULT);
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("java.util.concurrent.ForkJoinTask", State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("java.util.concurrent.ForkJoinTask", State.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    String name = getClass().getName();
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("push"))
-            .and(takesArgument(0, named("java.util.concurrent.ForkJoinTask")))
-            .and(
-                isDeclaredBy(
-                    declaresField(fieldType(int.class).and(named("top")))
-                        .and(declaresField(fieldType(int.class).and(named("base")))))),
-        name + "$PushTask");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        String name = getClass().getName();
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("push"))
+                        .and(takesArgument(0, named("java.util.concurrent.ForkJoinTask")))
+                        .and(isDeclaredBy(declaresField(fieldType(int.class).and(named("top")))
+                                .and(declaresField(fieldType(int.class).and(named("base")))))),
+                name + "$PushTask");
+    }
 
-  public static final class PushTask {
-    @SuppressWarnings("rawtypes")
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static <T> void push(
-        @Advice.This Object workQueue,
-        @Advice.FieldValue("top") int top,
-        @Advice.FieldValue("base") int base,
-        @Advice.Argument(0) ForkJoinTask<T> task) {
-      if (!exclude(FORK_JOIN_TASK, task)) {
-        ContextStore<ForkJoinTask, State> contextStore =
-            InstrumentationContext.get(ForkJoinTask.class, State.class);
-        QueueTimerHelper.startQueuingTimer(
-            contextStore, ForkJoinPool.class, workQueue.getClass(), top - base, task);
-      }
+    public static final class PushTask {
+        @SuppressWarnings("rawtypes")
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static <T> void push(
+                @Advice.This Object workQueue,
+                @Advice.FieldValue("top") int top,
+                @Advice.FieldValue("base") int base,
+                @Advice.Argument(0) ForkJoinTask<T> task) {
+            if (!exclude(FORK_JOIN_TASK, task)) {
+                ContextStore<ForkJoinTask, State> contextStore =
+                        InstrumentationContext.get(ForkJoinTask.class, State.class);
+                QueueTimerHelper.startQueuingTimer(
+                        contextStore, ForkJoinPool.class, workQueue.getClass(), top - base, task);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java
index 5e936a80849..a6fbbf2f446 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java
@@ -27,49 +27,49 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ConsumerTaskInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ConsumerTaskInstrumentation() {
-    super(EXECUTOR_INSTRUMENTATION_NAME, "consumer-task");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "java.util.concurrent.SubmissionPublisher$ConsumerTask";
-  }
+        implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ConsumerTaskInstrumentation() {
+        super(EXECUTOR_INSTRUMENTATION_NAME, "consumer-task");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("java.util.concurrent.ForkJoinTask", State.class.getName());
-  }
+    @Override
+    public String instrumentedType() {
+        return "java.util.concurrent.SubmissionPublisher$ConsumerTask";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
-    // execution will be instrumented as ForkJoinTask
-    transformer.applyAdvice(named("run"), getClass().getName() + "$Run");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("java.util.concurrent.ForkJoinTask", State.class.getName());
+    }
 
-  public static class Construct {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void construct(@Advice.This ForkJoinTask<?> task) {
-      Context context = currentContext();
-      if (shouldCapture(context)) {
-        State state = State.FACTORY.create();
-        state.captureAndSetContinuation(context);
-        InstrumentationContext.get(ForkJoinTask.class, State.class).put(task, state);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
+        // execution will be instrumented as ForkJoinTask
+        transformer.applyAdvice(named("run"), getClass().getName() + "$Run");
     }
-  }
 
-  public static final class Run {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static <T> ContextScope before(@Advice.This ForkJoinTask<T> task) {
-      return startTaskScope(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+    public static class Construct {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void construct(@Advice.This ForkJoinTask<?> task) {
+            Context context = currentContext();
+            if (shouldCapture(context)) {
+                State state = State.FACTORY.create();
+                state.captureAndSetContinuation(context);
+                InstrumentationContext.get(ForkJoinTask.class, State.class).put(task, state);
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      endTaskScope(scope);
+    public static final class Run {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static <T> ContextScope before(@Advice.This ForkJoinTask<T> task) {
+            return startTaskScope(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java
index c9308cb307a..fdb12d7f1b0 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java
@@ -40,138 +40,127 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RunnableFutureInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice,
-        ExcludeFilterProvider {
-  public RunnableFutureInstrumentation() {
-    super(EXECUTOR_INSTRUMENTATION_NAME, "runnable-future");
-  }
+        implements Instrumenter.ForBootstrap,
+                Instrumenter.ForTypeHierarchy,
+                Instrumenter.HasMethodAdvice,
+                ExcludeFilterProvider {
+    public RunnableFutureInstrumentation() {
+        super(EXECUTOR_INSTRUMENTATION_NAME, "runnable-future");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return notExcludedByName(RUNNABLE_FUTURE)
-        .and(
-            extendsClass(
-                named("java.util.concurrent.FutureTask")
-                    .or(nameEndsWith(".netty.util.concurrent.PromiseTask"))
-                    .or(
-                        nameEndsWith(
-                            "com.google.common.util.concurrent.TrustedListenableFutureTask"))));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return notExcludedByName(RUNNABLE_FUTURE)
+                .and(extendsClass(named("java.util.concurrent.FutureTask")
+                        .or(nameEndsWith(".netty.util.concurrent.PromiseTask"))
+                        .or(nameEndsWith("com.google.common.util.concurrent.TrustedListenableFutureTask"))));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("java.util.concurrent.RunnableFuture", State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("java.util.concurrent.RunnableFuture", State.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // instrument any FutureTask or TrustedListenableFutureTask constructor,
-    // but only instrument the PromiseTask constructor with a Callable argument
-    transformer.applyAdvice(
-        isConstructor()
-            .and(
-                isDeclaredBy(
-                        named("java.util.concurrent.FutureTask")
-                            .or(
-                                nameEndsWith(
-                                    "com.google.common.util.concurrent.TrustedListenableFutureTask")))
-                    .or(
-                        isDeclaredBy(nameEndsWith(".netty.util.concurrent.PromiseTask"))
-                            .and(takesArgument(1, named(Callable.class.getName()))))),
-        getClass().getName() + "$Construct");
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
-    // Netty 4.1.44+ separates delayed scheduling in run() from execution in runTask().
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("run"))
-            .and(
-                not(
-                    isDeclaredBy(
-                        nameEndsWith(".netty.util.concurrent.ScheduledFutureTask")
-                            .and(hasSuperType(declaresMethod(named("runTask"))))))),
-        getClass().getName() + "$Run");
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("cancel", "set", "setException")),
-        getClass().getName() + "$Cancel");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // instrument any FutureTask or TrustedListenableFutureTask constructor,
+        // but only instrument the PromiseTask constructor with a Callable argument
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(isDeclaredBy(named("java.util.concurrent.FutureTask")
+                                        .or(nameEndsWith(
+                                                "com.google.common.util.concurrent.TrustedListenableFutureTask")))
+                                .or(isDeclaredBy(nameEndsWith(".netty.util.concurrent.PromiseTask"))
+                                        .and(takesArgument(1, named(Callable.class.getName()))))),
+                getClass().getName() + "$Construct");
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
+        // Netty 4.1.44+ separates delayed scheduling in run() from execution in runTask().
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("run"))
+                        .and(not(isDeclaredBy(nameEndsWith(".netty.util.concurrent.ScheduledFutureTask")
+                                .and(hasSuperType(declaresMethod(named("runTask"))))))),
+                getClass().getName() + "$Run");
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("cancel", "set", "setException")),
+                getClass().getName() + "$Cancel");
+    }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    // This is a footprint optimisation, not required for correctness.
-    // exclude as many known task implementations as possible because
-    // the fields add up. This could be removed when we stop injecting
-    // Runnables at all.
-    return singletonMap(
-        RUNNABLE,
-        Arrays.asList(
-            "com.couchbase.client.deps.io.netty.util.concurrent.PromiseTask",
-            "com.couchbase.client.deps.io.netty.util.concurrent.RunnableScheduledFutureTask",
-            "com.couchbase.client.deps.io.netty.util.concurrent.ScheduledFutureTask",
-            "com.couchbase.client.deps.io.netty.util.concurrent.UnorderedThreadPoolEventExecutor$NonNotifyRunnable",
-            "com.couchbase.client.deps.io.netty.util.concurrent.UnorderedThreadPoolEventExecutor$RunnableScheduledFutureTask",
-            "com.google.common.util.concurrent.Futures$CombinerFuture",
-            "com.google.common.util.concurrent.ListenableFutureTask",
-            "com.google.common.util.concurrent.TrustedListenableFutureTask",
-            "com.sun.jersey.client.impl.async.FutureClientResponseListener",
-            "io.grpc.netty.shaded.io.netty.util.concurrent.PromiseTask",
-            "io.grpc.netty.shaded.io.netty.util.concurrent.RunnableScheduledFutureTask",
-            "io.grpc.netty.shaded.io.netty.util.concurrent.ScheduledFutureTask",
-            "io.grpc.netty.shaded.io.netty.util.concurrent.UnorderedThreadPoolEventExecutor$NonNotifyRunnable",
-            "io.grpc.netty.shaded.io.netty.util.concurrent.UnorderedThreadPoolEventExecutor$RunnableScheduledFutureTask",
-            "io.netty.util.concurrent.PromiseTask",
-            "io.netty.util.concurrent.RunnableScheduledFutureTask",
-            "io.netty.util.concurrent.ScheduledFutureTask",
-            "io.netty.util.concurrent.UnorderedThreadPoolEventExecutor$NonNotifyRunnable",
-            "io.netty.util.concurrent.UnorderedThreadPoolEventExecutor$RunnableScheduledFutureTask",
-            "java.util.concurrent.ExecutorCompletionService$QueueingFuture",
-            "java.util.concurrent.FutureTask",
-            "java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask",
-            "jersey.repackaged.com.google.common.util.concurrent.ListenableFutureTask",
-            "org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor$LocalSessionWrapper",
-            "org.apache.http.impl.client.HttpRequestFutureTask",
-            "org.elasticsearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor$PrioritizedFutureTask",
-            "org.glassfish.enterprise.concurrent.internal.ManagedFutureTask",
-            "org.glassfish.enterprise.concurrent.internal.ManagedScheduledThreadPoolExecutor$ManagedScheduledFutureTask",
-            "org.glassfish.enterprise.concurrent.internal.ManagedScheduledThreadPoolExecutor$ManagedTriggerSingleFutureTask",
-            "org.springframework.boot.SpringApplicationShutdownHook",
-            "org.springframework.util.concurrent.ListenableFutureTask",
-            "org.springframework.util.concurrent.SettableListenableFuture$SettableTask",
-            "play.shaded.ahc.io.netty.util.concurrent.PromiseTask",
-            "play.shaded.ahc.io.netty.util.concurrent.RunnableScheduledFutureTask",
-            "play.shaded.ahc.io.netty.util.concurrent.ScheduledFutureTask"));
-  }
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        // This is a footprint optimisation, not required for correctness.
+        // exclude as many known task implementations as possible because
+        // the fields add up. This could be removed when we stop injecting
+        // Runnables at all.
+        return singletonMap(
+                RUNNABLE,
+                Arrays.asList(
+                        "com.couchbase.client.deps.io.netty.util.concurrent.PromiseTask",
+                        "com.couchbase.client.deps.io.netty.util.concurrent.RunnableScheduledFutureTask",
+                        "com.couchbase.client.deps.io.netty.util.concurrent.ScheduledFutureTask",
+                        "com.couchbase.client.deps.io.netty.util.concurrent.UnorderedThreadPoolEventExecutor$NonNotifyRunnable",
+                        "com.couchbase.client.deps.io.netty.util.concurrent.UnorderedThreadPoolEventExecutor$RunnableScheduledFutureTask",
+                        "com.google.common.util.concurrent.Futures$CombinerFuture",
+                        "com.google.common.util.concurrent.ListenableFutureTask",
+                        "com.google.common.util.concurrent.TrustedListenableFutureTask",
+                        "com.sun.jersey.client.impl.async.FutureClientResponseListener",
+                        "io.grpc.netty.shaded.io.netty.util.concurrent.PromiseTask",
+                        "io.grpc.netty.shaded.io.netty.util.concurrent.RunnableScheduledFutureTask",
+                        "io.grpc.netty.shaded.io.netty.util.concurrent.ScheduledFutureTask",
+                        "io.grpc.netty.shaded.io.netty.util.concurrent.UnorderedThreadPoolEventExecutor$NonNotifyRunnable",
+                        "io.grpc.netty.shaded.io.netty.util.concurrent.UnorderedThreadPoolEventExecutor$RunnableScheduledFutureTask",
+                        "io.netty.util.concurrent.PromiseTask",
+                        "io.netty.util.concurrent.RunnableScheduledFutureTask",
+                        "io.netty.util.concurrent.ScheduledFutureTask",
+                        "io.netty.util.concurrent.UnorderedThreadPoolEventExecutor$NonNotifyRunnable",
+                        "io.netty.util.concurrent.UnorderedThreadPoolEventExecutor$RunnableScheduledFutureTask",
+                        "java.util.concurrent.ExecutorCompletionService$QueueingFuture",
+                        "java.util.concurrent.FutureTask",
+                        "java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask",
+                        "jersey.repackaged.com.google.common.util.concurrent.ListenableFutureTask",
+                        "org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor$LocalSessionWrapper",
+                        "org.apache.http.impl.client.HttpRequestFutureTask",
+                        "org.elasticsearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor$PrioritizedFutureTask",
+                        "org.glassfish.enterprise.concurrent.internal.ManagedFutureTask",
+                        "org.glassfish.enterprise.concurrent.internal.ManagedScheduledThreadPoolExecutor$ManagedScheduledFutureTask",
+                        "org.glassfish.enterprise.concurrent.internal.ManagedScheduledThreadPoolExecutor$ManagedTriggerSingleFutureTask",
+                        "org.springframework.boot.SpringApplicationShutdownHook",
+                        "org.springframework.util.concurrent.ListenableFutureTask",
+                        "org.springframework.util.concurrent.SettableListenableFuture$SettableTask",
+                        "play.shaded.ahc.io.netty.util.concurrent.PromiseTask",
+                        "play.shaded.ahc.io.netty.util.concurrent.RunnableScheduledFutureTask",
+                        "play.shaded.ahc.io.netty.util.concurrent.ScheduledFutureTask"));
+    }
 
-  public static final class Construct {
+    public static final class Construct {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static <T> void captureScope(@Advice.This RunnableFuture<T> task) {
-      capture(InstrumentationContext.get(RunnableFuture.class, State.class), task);
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static <T> void captureScope(@Advice.This RunnableFuture<T> task) {
+            capture(InstrumentationContext.get(RunnableFuture.class, State.class), task);
+        }
     }
-  }
 
-  public static final class Run {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static <T> ContextScope activate(@Advice.This RunnableFuture<T> task) {
-      return startTaskScope(InstrumentationContext.get(RunnableFuture.class, State.class), task);
-    }
+    public static final class Run {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static <T> ContextScope activate(@Advice.This RunnableFuture<T> task) {
+            return startTaskScope(InstrumentationContext.get(RunnableFuture.class, State.class), task);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void close(@Advice.Enter ContextScope scope) {
-      endTaskScope(scope);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void close(@Advice.Enter ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 
-  public static final class Cancel {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static <T> void cancel(@Advice.This RunnableFuture<T> task) {
-      cancelTask(InstrumentationContext.get(RunnableFuture.class, State.class), task);
+    public static final class Cancel {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static <T> void cancel(@Advice.This RunnableFuture<T> task) {
+            cancelTask(InstrumentationContext.get(RunnableFuture.class, State.class), task);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java
index 32dcff9f561..ad3d19368f6 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java
@@ -28,50 +28,47 @@
 /** Instrument {@link Runnable} */
 @AutoService(InstrumenterModule.class)
 public final class RunnableInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public RunnableInstrumentation() {
-    super(EXECUTOR_INSTRUMENTATION_NAME, RUNNABLE_INSTRUMENTATION_NAME);
-  }
+    public RunnableInstrumentation() {
+        super(EXECUTOR_INSTRUMENTATION_NAME, RUNNABLE_INSTRUMENTATION_NAME);
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return notExcludedByName(RUNNABLE)
-        .and(implementsInterface(named(Runnable.class.getName())))
-        .and(not(implementsInterface(named(RunnableFuture.class.getName()))));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return notExcludedByName(RUNNABLE)
+                .and(implementsInterface(named(Runnable.class.getName())))
+                .and(not(implementsInterface(named(RunnableFuture.class.getName()))));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(Runnable.class.getName(), State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(Runnable.class.getName(), State.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("run").and(takesArguments(0)).and(isPublic()),
-        RunnableInstrumentation.class.getName() + "$RunnableAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("run").and(takesArguments(0)).and(isPublic()),
+                RunnableInstrumentation.class.getName() + "$RunnableAdvice");
+    }
 
-  public static class RunnableAdvice {
+    public static class RunnableAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(@Advice.This final Runnable thiz) {
-      final ContextStore<Runnable, State> contextStore =
-          InstrumentationContext.get(Runnable.class, State.class);
-      return AdviceUtils.startTaskScope(contextStore, thiz);
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(@Advice.This final Runnable thiz) {
+            final ContextStore<Runnable, State> contextStore = InstrumentationContext.get(Runnable.class, State.class);
+            return AdviceUtils.startTaskScope(contextStore, thiz);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Enter final ContextScope scope) {
-      AdviceUtils.endTaskScope(scope);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Enter final ContextScope scope) {
+            AdviceUtils.endTaskScope(scope);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java
index 07e3cc934e7..fb8554d4046 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java
@@ -18,45 +18,43 @@
 import net.bytebuddy.asm.Advice;
 
 public class JavaTimerInstrumentation
-    implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  @Override
-  public String instrumentedType() {
-    return "java.util.Timer";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPrivate())
-            .and(
-                named("sched")
-                    .and(takesArguments(3))
-                    .and(takesArgument(0, named("java.util.TimerTask")))
-                    .and(takesArgument(1, long.class))
-                    .and(takesArgument(2, long.class))),
-        getClass().getName() + "$TimerScheduleAdvice");
-  }
+        implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    @Override
+    public String instrumentedType() {
+        return "java.util.Timer";
+    }
 
-  public static final class TimerScheduleAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void before(@Advice.Argument(0) TimerTask task, @Advice.Argument(2) long period) {
-      // don't propagate fixed time / rate executions
-      if (period != 0) {
-        return;
-      }
-      if (!exclude(RUNNABLE, task)) {
-        ContextStore<Runnable, State> contextStore =
-            InstrumentationContext.get(Runnable.class, State.class);
-        capture(contextStore, task);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPrivate())
+                        .and(named("sched")
+                                .and(takesArguments(3))
+                                .and(takesArgument(0, named("java.util.TimerTask")))
+                                .and(takesArgument(1, long.class))
+                                .and(takesArgument(2, long.class))),
+                getClass().getName() + "$TimerScheduleAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Argument(0) TimerTask task, @Advice.Thrown Throwable thrown) {
-      if (null != thrown && !exclude(RUNNABLE, task)) {
-        cancelTask(InstrumentationContext.get(Runnable.class, State.class), task);
-      }
+    public static final class TimerScheduleAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void before(@Advice.Argument(0) TimerTask task, @Advice.Argument(2) long period) {
+            // don't propagate fixed time / rate executions
+            if (period != 0) {
+                return;
+            }
+            if (!exclude(RUNNABLE, task)) {
+                ContextStore<Runnable, State> contextStore = InstrumentationContext.get(Runnable.class, State.class);
+                capture(contextStore, task);
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Argument(0) TimerTask task, @Advice.Thrown Throwable thrown) {
+            if (null != thrown && !exclude(RUNNABLE, task)) {
+                cancelTask(InstrumentationContext.get(Runnable.class, State.class), task);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerModule.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerModule.java
index 700229b7370..7841cca321e 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerModule.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerModule.java
@@ -14,17 +14,17 @@
 
 @AutoService(InstrumenterModule.class)
 public class JavaTimerModule extends InstrumenterModule.ContextTracking {
-  public JavaTimerModule() {
-    super("java_timer", EXECUTOR_INSTRUMENTATION_NAME, RUNNABLE_INSTRUMENTATION_NAME);
-  }
+    public JavaTimerModule() {
+        super("java_timer", EXECUTOR_INSTRUMENTATION_NAME, RUNNABLE_INSTRUMENTATION_NAME);
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("java.lang.Runnable", State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("java.lang.Runnable", State.class.getName());
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(new JavaTimerInstrumentation(), new TimerTaskInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(new JavaTimerInstrumentation(), new TimerTaskInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java
index 9272ff57353..125a70f93c8 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java
@@ -22,31 +22,29 @@
  * RunnableInstrumentation}
  */
 public final class TimerTaskInstrumentation
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("java.util.TimerTask"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("java.util.TimerTask"));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("cancel").and(takesArguments(0)).and(isPublic()),
-        TimerTaskInstrumentation.class.getName() + "$CancelAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("cancel").and(takesArguments(0)).and(isPublic()),
+                TimerTaskInstrumentation.class.getName() + "$CancelAdvice");
+    }
 
-  public static class CancelAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onCancel(@Advice.This TimerTask self) {
-      AdviceUtils.cancelTask(InstrumentationContext.get(Runnable.class, State.class), self);
+    public static class CancelAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onCancel(@Advice.This TimerTask self) {
+            AdviceUtils.cancelTask(InstrumentationContext.get(Runnable.class, State.class), self);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/java/util/concurrent/CompletableFutureAdvice.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/java/util/concurrent/CompletableFutureAdvice.java
index 2f1ef4bd5b2..ed859cea0f6 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/java/util/concurrent/CompletableFutureAdvice.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/java/util/concurrent/CompletableFutureAdvice.java
@@ -15,77 +15,77 @@
 // This class is put into java.util.concurrent to allow access to package private classes.
 public final class CompletableFutureAdvice {
 
-  public static final class UniConstructor {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterInit(@Advice.This UniCompletion zis) {
-      Context context = currentContext();
-      if (zis.isLive() && context != rootContext()) {
-        ContextStore<UniCompletion, ConcurrentState> contextStore =
-            InstrumentationContext.get(UniCompletion.class, ConcurrentState.class);
-        ConcurrentState.captureContinuation(contextStore, zis, context);
-      }
-    }
+    public static final class UniConstructor {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterInit(@Advice.This UniCompletion zis) {
+            Context context = currentContext();
+            if (zis.isLive() && context != rootContext()) {
+                ContextStore<UniCompletion, ConcurrentState> contextStore =
+                        InstrumentationContext.get(UniCompletion.class, ConcurrentState.class);
+                ConcurrentState.captureContinuation(contextStore, zis, context);
+            }
+        }
 
-    private static void muzzleCheck(final UniCompletion callback) {
-      callback.exec();
+        private static void muzzleCheck(final UniCompletion callback) {
+            callback.exec();
+        }
     }
-  }
 
-  public static final class UniSubTryFire {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.This UniCompletion zis,
-        @Advice.Local("hadExecutor") boolean hadExecutor,
-        @Advice.Local("wasClaimed") boolean wasClaimed,
-        @Advice.Local("wasLive") boolean wasLive) {
-      hadExecutor = zis.executor != null;
-      wasClaimed = zis.getForkJoinTaskTag() == 1;
-      wasLive = zis.isLive();
-      // If this UniCompletion is not live, then we don't need to activate a span
-      if (!wasLive) {
-        return null;
-      }
-      ContextStore<UniCompletion, ConcurrentState> contextStore =
-          InstrumentationContext.get(UniCompletion.class, ConcurrentState.class);
-      return ConcurrentState.activateAndContinueContinuation(contextStore, zis);
-    }
+    public static final class UniSubTryFire {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.This UniCompletion zis,
+                @Advice.Local("hadExecutor") boolean hadExecutor,
+                @Advice.Local("wasClaimed") boolean wasClaimed,
+                @Advice.Local("wasLive") boolean wasLive) {
+            hadExecutor = zis.executor != null;
+            wasClaimed = zis.getForkJoinTaskTag() == 1;
+            wasLive = zis.isLive();
+            // If this UniCompletion is not live, then we don't need to activate a span
+            if (!wasLive) {
+                return null;
+            }
+            ContextStore<UniCompletion, ConcurrentState> contextStore =
+                    InstrumentationContext.get(UniCompletion.class, ConcurrentState.class);
+            return ConcurrentState.activateAndContinueContinuation(contextStore, zis);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.This UniCompletion zis,
-        @Advice.Argument(0) int mode,
-        @Advice.Local("hadExecutor") boolean hadExecutor,
-        @Advice.Local("wasClaimed") boolean wasClaimed,
-        @Advice.Local("wasLive") boolean wasLive) {
-      // If it wasn't live when we entered, then do nothing
-      if (!wasLive) {
-        return;
-      }
-      // Try to clean up if the CompletableFuture has been completed.
-      //
-      // 1) If the mode is ASYNC, it means that someone else has claimed the
-      // task for us, and we have run it to completion.
-      // 2) We have claimed the task and we will not mark it as finished since we will
-      // hand off to a `UniRelay` which can happen in `uniCompose`.
-      // 3) If `isLive` is false, then either we or someone else just completed the task.
-      ContextStore<UniCompletion, ConcurrentState> contextStore = null;
-      boolean claimed = !wasClaimed && !hadExecutor && zis.getForkJoinTaskTag() == 1;
-      if (mode == ASYNC || (mode < ASYNC && claimed) || !zis.isLive()) {
-        contextStore = InstrumentationContext.get(UniCompletion.class, ConcurrentState.class);
-        ConcurrentState.cancelAndClearContinuation(contextStore, zis);
-      }
-      if (scope != null || throwable != null) {
-        if (contextStore == null) {
-          contextStore = InstrumentationContext.get(UniCompletion.class, ConcurrentState.class);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.This UniCompletion zis,
+                @Advice.Argument(0) int mode,
+                @Advice.Local("hadExecutor") boolean hadExecutor,
+                @Advice.Local("wasClaimed") boolean wasClaimed,
+                @Advice.Local("wasLive") boolean wasLive) {
+            // If it wasn't live when we entered, then do nothing
+            if (!wasLive) {
+                return;
+            }
+            // Try to clean up if the CompletableFuture has been completed.
+            //
+            // 1) If the mode is ASYNC, it means that someone else has claimed the
+            // task for us, and we have run it to completion.
+            // 2) We have claimed the task and we will not mark it as finished since we will
+            // hand off to a `UniRelay` which can happen in `uniCompose`.
+            // 3) If `isLive` is false, then either we or someone else just completed the task.
+            ContextStore<UniCompletion, ConcurrentState> contextStore = null;
+            boolean claimed = !wasClaimed && !hadExecutor && zis.getForkJoinTaskTag() == 1;
+            if (mode == ASYNC || (mode < ASYNC && claimed) || !zis.isLive()) {
+                contextStore = InstrumentationContext.get(UniCompletion.class, ConcurrentState.class);
+                ConcurrentState.cancelAndClearContinuation(contextStore, zis);
+            }
+            if (scope != null || throwable != null) {
+                if (contextStore == null) {
+                    contextStore = InstrumentationContext.get(UniCompletion.class, ConcurrentState.class);
+                }
+                ConcurrentState.closeScope(contextStore, zis, scope, throwable);
+            }
         }
-        ConcurrentState.closeScope(contextStore, zis, scope, throwable);
-      }
-    }
 
-    private static void muzzleCheck(final UniCompletion callback) {
-      callback.exec();
+        private static void muzzleCheck(final UniCompletion callback) {
+            callback.exec();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/ToBeIgnoredExecutor.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/ToBeIgnoredExecutor.java
index 4c6ffeadc52..061e80e9f8c 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/ToBeIgnoredExecutor.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/ToBeIgnoredExecutor.java
@@ -5,7 +5,7 @@
 import java.util.concurrent.TimeUnit;
 
 public class ToBeIgnoredExecutor extends ThreadPoolExecutor {
-  public ToBeIgnoredExecutor() {
-    super(1, 1, 0, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<>(10));
-  }
+    public ToBeIgnoredExecutor() {
+        super(1, 1, 0, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<>(10));
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/Fanout.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/Fanout.java
index 9b7d77e22ca..f445ebea1d4 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/Fanout.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/Fanout.java
@@ -9,54 +9,47 @@
 
 public class Fanout {
 
-  private final Executor executor;
-  private final int tasks;
-  private final boolean traceChild;
-
-  public Fanout(Executor executor, int tasks, boolean traceChild) {
-    this.executor = executor;
-    this.tasks = tasks;
-    this.traceChild = traceChild;
-  }
-
-  public void execute() {
-    try {
-      Stream<CompletableFuture<?>> futures =
-          IntStream.range(0, tasks)
-              .mapToObj(
-                  i ->
-                      CompletableFuture.runAsync(
-                          traceChild ? this::tracedWork : this::untracedWork, executor));
-      // Wait for those threads to finish work
-      CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new)).get();
-    } catch (InterruptedException | ExecutionException e) {
-      throw new RuntimeException(e);
+    private final Executor executor;
+    private final int tasks;
+    private final boolean traceChild;
+
+    public Fanout(Executor executor, int tasks, boolean traceChild) {
+        this.executor = executor;
+        this.tasks = tasks;
+        this.traceChild = traceChild;
     }
-  }
-
-  public void executeTwoLevels() {
-    try {
-      Stream<CompletableFuture<?>> futures =
-          IntStream.range(0, tasks)
-              .mapToObj(
-                  i ->
-                      CompletableFuture.runAsync(
-                              traceChild ? this::tracedWork : this::untracedWork, executor)
-                          .thenRunAsync(
-                              traceChild ? this::tracedWork : this::untracedWork, executor));
-      // Wait for those threads to finish work
-      CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new)).get();
-    } catch (InterruptedException | ExecutionException e) {
-      throw new RuntimeException(e);
+
+    public void execute() {
+        try {
+            Stream<CompletableFuture<?>> futures = IntStream.range(0, tasks)
+                    .mapToObj(i ->
+                            CompletableFuture.runAsync(traceChild ? this::tracedWork : this::untracedWork, executor));
+            // Wait for those threads to finish work
+            CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new)).get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  private void untracedWork() {
-    assert null != activeSpan();
-  }
+    public void executeTwoLevels() {
+        try {
+            Stream<CompletableFuture<?>> futures = IntStream.range(0, tasks)
+                    .mapToObj(i -> CompletableFuture.runAsync(
+                                    traceChild ? this::tracedWork : this::untracedWork, executor)
+                            .thenRunAsync(traceChild ? this::tracedWork : this::untracedWork, executor));
+            // Wait for those threads to finish work
+            CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new)).get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
-  @Trace
-  private void tracedWork() {
-    assert null != activeSpan();
-  }
+    private void untracedWork() {
+        assert null != activeSpan();
+    }
+
+    @Trace
+    private void tracedWork() {
+        assert null != activeSpan();
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/JavaAsyncChild.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/JavaAsyncChild.java
index 67266dcb122..7f5158701e5 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/JavaAsyncChild.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/JavaAsyncChild.java
@@ -4,56 +4,56 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class JavaAsyncChild extends ForkJoinTask implements Runnable, Callable {
-  private final AtomicBoolean blockThread;
-  private final boolean doTraceableWork;
-
-  public JavaAsyncChild() {
-    this(true, false);
-  }
-
-  @Override
-  public Object getRawResult() {
-    return null;
-  }
-
-  @Override
-  protected void setRawResult(final Object value) {}
-
-  @Override
-  protected boolean exec() {
-    runImpl();
-    return true;
-  }
-
-  public JavaAsyncChild(final boolean doTraceableWork, final boolean blockThread) {
-    this.doTraceableWork = doTraceableWork;
-    this.blockThread = new AtomicBoolean(blockThread);
-  }
-
-  public void unblock() {
-    blockThread.set(false);
-  }
-
-  @Override
-  public void run() {
-    runImpl();
-  }
-
-  @Override
-  public Object call() throws Exception {
-    runImpl();
-    return null;
-  }
-
-  private void runImpl() {
-    while (blockThread.get()) {
-      // busy-wait to block thread
-    }
-    if (doTraceableWork) {
-      asyncChild();
-    }
-  }
-
-  @Trace(operationName = "asyncChild")
-  private void asyncChild() {}
+    private final AtomicBoolean blockThread;
+    private final boolean doTraceableWork;
+
+    public JavaAsyncChild() {
+        this(true, false);
+    }
+
+    @Override
+    public Object getRawResult() {
+        return null;
+    }
+
+    @Override
+    protected void setRawResult(final Object value) {}
+
+    @Override
+    protected boolean exec() {
+        runImpl();
+        return true;
+    }
+
+    public JavaAsyncChild(final boolean doTraceableWork, final boolean blockThread) {
+        this.doTraceableWork = doTraceableWork;
+        this.blockThread = new AtomicBoolean(blockThread);
+    }
+
+    public void unblock() {
+        blockThread.set(false);
+    }
+
+    @Override
+    public void run() {
+        runImpl();
+    }
+
+    @Override
+    public Object call() throws Exception {
+        runImpl();
+        return null;
+    }
+
+    private void runImpl() {
+        while (blockThread.get()) {
+            // busy-wait to block thread
+        }
+        if (doTraceableWork) {
+            asyncChild();
+        }
+    }
+
+    @Trace(operationName = "asyncChild")
+    private void asyncChild() {}
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/LambdaGenerator.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/LambdaGenerator.java
index 635e5cecb24..d97e16e2a09 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/LambdaGenerator.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/LambdaGenerator.java
@@ -1,11 +1,11 @@
 import java.util.concurrent.Callable;
 
 public class LambdaGenerator {
-  static Callable<?> wrapCallable(final Callable<?> callable) {
-    return () -> callable.call();
-  }
+    static Callable<?> wrapCallable(final Callable<?> callable) {
+        return () -> callable.call();
+    }
 
-  static Runnable wrapRunnable(final Runnable runnable) {
-    return () -> runnable.run();
-  }
+    static Runnable wrapRunnable(final Runnable runnable) {
+        return () -> runnable.run();
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/CustomThreadPoolExecutor.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/CustomThreadPoolExecutor.java
index 0aeb3aaff03..c5125a667b3 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/CustomThreadPoolExecutor.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/CustomThreadPoolExecutor.java
@@ -11,104 +11,103 @@
 
 public class CustomThreadPoolExecutor extends AbstractExecutorService {
 
-  private volatile Boolean running = true;
-  private LinkedBlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<Runnable>(10);
-  private Runnable worker =
-      new Runnable() {
+    private volatile Boolean running = true;
+    private LinkedBlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<Runnable>(10);
+    private Runnable worker = new Runnable() {
         public void run() {
-          try {
-            while (getRunning()) {
-              Runnable runnable = ((LinkedBlockingQueue<Runnable>) getWorkQueue()).take();
-              runnable.run();
+            try {
+                while (getRunning()) {
+                    Runnable runnable = ((LinkedBlockingQueue<Runnable>) getWorkQueue()).take();
+                    runnable.run();
+                }
+
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            } catch (Exception e) {
+                e.printStackTrace();
             }
+        }
+    };
+    private Thread workerThread = new Thread(worker, "ExecutorTestThread");
+
+    public CustomThreadPoolExecutor() {
+        workerThread.start();
+    }
+
+    @Override
+    public void shutdown() {
+        running = false;
+        workerThread.interrupt();
+    }
+
+    @Override
+    public List<Runnable> shutdownNow() {
+        running = false;
+        workerThread.interrupt();
+        return new ArrayList<Runnable>();
+    }
+
+    @Override
+    public boolean isShutdown() {
+        return !running;
+    }
+
+    @Override
+    public boolean isTerminated() {
+        return workerThread.isAlive();
+    }
+
+    @Override
+    public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
+        workerThread.join(unit.toMillis(timeout));
+        return true;
+    }
+
+    @Override
+    public Future<?> submit(Runnable task) {
+        RunnableFuture<Object> future = super.newTaskFor(task, null);
+        execute(future);
+        return ((Future<?>) (future));
+    }
 
-          } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-          } catch (Exception e) {
-            e.printStackTrace();
-          }
+    @Override
+    public void execute(Runnable command) {
+        try {
+            workQueue.put(command);
+        } catch (Throwable t) {
+            throw new RejectedExecutionException(t);
         }
-      };
-  private Thread workerThread = new Thread(worker, "ExecutorTestThread");
-
-  public CustomThreadPoolExecutor() {
-    workerThread.start();
-  }
-
-  @Override
-  public void shutdown() {
-    running = false;
-    workerThread.interrupt();
-  }
-
-  @Override
-  public List<Runnable> shutdownNow() {
-    running = false;
-    workerThread.interrupt();
-    return new ArrayList<Runnable>();
-  }
-
-  @Override
-  public boolean isShutdown() {
-    return !running;
-  }
-
-  @Override
-  public boolean isTerminated() {
-    return workerThread.isAlive();
-  }
-
-  @Override
-  public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
-    workerThread.join(unit.toMillis(timeout));
-    return true;
-  }
-
-  @Override
-  public Future<?> submit(Runnable task) {
-    RunnableFuture<Object> future = super.newTaskFor(task, null);
-    execute(future);
-    return ((Future<?>) (future));
-  }
-
-  @Override
-  public void execute(Runnable command) {
-    try {
-      workQueue.put(command);
-    } catch (Throwable t) {
-      throw new RejectedExecutionException(t);
-    }
-  }
-
-  public Boolean getRunning() {
-    return running;
-  }
-
-  public void setRunning(Boolean running) {
-    this.running = running;
-  }
-
-  public LinkedBlockingQueue<Runnable> getWorkQueue() {
-    return workQueue;
-  }
-
-  public void setWorkQueue(LinkedBlockingQueue<Runnable> workQueue) {
-    this.workQueue = workQueue;
-  }
-
-  public Runnable getWorker() {
-    return worker;
-  }
-
-  public void setWorker(Runnable worker) {
-    this.worker = worker;
-  }
-
-  public Thread getWorkerThread() {
-    return workerThread;
-  }
-
-  public void setWorkerThread(Thread workerThread) {
-    this.workerThread = workerThread;
-  }
+    }
+
+    public Boolean getRunning() {
+        return running;
+    }
+
+    public void setRunning(Boolean running) {
+        this.running = running;
+    }
+
+    public LinkedBlockingQueue<Runnable> getWorkQueue() {
+        return workQueue;
+    }
+
+    public void setWorkQueue(LinkedBlockingQueue<Runnable> workQueue) {
+        this.workQueue = workQueue;
+    }
+
+    public Runnable getWorker() {
+        return worker;
+    }
+
+    public void setWorker(Runnable worker) {
+        this.worker = worker;
+    }
+
+    public Thread getWorkerThread() {
+        return workerThread;
+    }
+
+    public void setWorkerThread(Thread workerThread) {
+        this.workerThread = workerThread;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/TypeAwareThreadPoolExecutor.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/TypeAwareThreadPoolExecutor.java
index d873f901ddb..79858bb13d0 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/TypeAwareThreadPoolExecutor.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/TypeAwareThreadPoolExecutor.java
@@ -6,27 +6,27 @@
 import java.util.concurrent.TimeUnit;
 
 public class TypeAwareThreadPoolExecutor extends ThreadPoolExecutor {
-  public TypeAwareThreadPoolExecutor() {
-    super(2, 2, 0, TimeUnit.MICROSECONDS, new ArrayBlockingQueue<Runnable>(100));
-  }
+    public TypeAwareThreadPoolExecutor() {
+        super(2, 2, 0, TimeUnit.MICROSECONDS, new ArrayBlockingQueue<Runnable>(100));
+    }
 
-  @Override
-  public boolean remove(Runnable task) {
-    assertNotWrapper(task);
-    return super.remove(task);
-  }
+    @Override
+    public boolean remove(Runnable task) {
+        assertNotWrapper(task);
+        return super.remove(task);
+    }
 
-  @Override
-  protected void beforeExecute(Thread t, Runnable r) {
-    assertNotWrapper(r);
-  }
+    @Override
+    protected void beforeExecute(Thread t, Runnable r) {
+        assertNotWrapper(r);
+    }
 
-  @Override
-  protected void afterExecute(Runnable r, Throwable t) {
-    assertNotWrapper(r);
-  }
+    @Override
+    protected void afterExecute(Runnable r, Throwable t) {
+        assertNotWrapper(r);
+    }
 
-  private void assertNotWrapper(Runnable r) {
-    assert !(r instanceof Wrapper);
-  }
+    private void assertNotWrapper(Runnable r) {
+        assert !(r instanceof Wrapper);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java
index a471986f41b..9d35d5ec17e 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java
@@ -9,27 +9,27 @@
 
 public class RecursiveThreadPoolExecution implements Runnable {
 
-  private final ExecutorService executor;
+    private final ExecutorService executor;
 
-  private final int maxDepth;
-  private final int depth;
+    private final int maxDepth;
+    private final int depth;
 
-  public RecursiveThreadPoolExecution(ExecutorService executor, int maxDepth, int depth) {
-    this.executor = executor;
-    this.maxDepth = maxDepth;
-    this.depth = depth;
-  }
-
-  @Override
-  public void run() {
-    if (depth == maxDepth) {
-      return;
+    public RecursiveThreadPoolExecution(ExecutorService executor, int maxDepth, int depth) {
+        this.executor = executor;
+        this.maxDepth = maxDepth;
+        this.depth = depth;
     }
-    AgentSpan span = startSpan("test", String.valueOf(depth));
-    try (ContextScope scope = activateSpan(span)) {
-      executor.execute(new RecursiveThreadPoolExecution(executor, maxDepth, depth + 1));
-    } finally {
-      span.finish();
+
+    @Override
+    public void run() {
+        if (depth == maxDepth) {
+            return;
+        }
+        AgentSpan span = startSpan("test", String.valueOf(depth));
+        try (ContextScope scope = activateSpan(span)) {
+            executor.execute(new RecursiveThreadPoolExecution(executor, maxDepth, depth + 1));
+        } finally {
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java
index 5887fd8a3a2..acf38deb4d3 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java
@@ -9,34 +9,31 @@
 
 public class RecursiveThreadPoolMixedSubmissionAndExecution implements Runnable {
 
-  private final ExecutorService executor;
+    private final ExecutorService executor;
 
-  private final int maxDepth;
-  private final int depth;
+    private final int maxDepth;
+    private final int depth;
 
-  public RecursiveThreadPoolMixedSubmissionAndExecution(
-      ExecutorService executor, int maxDepth, int depth) {
-    this.executor = executor;
-    this.maxDepth = maxDepth;
-    this.depth = depth;
-  }
-
-  @Override
-  public void run() {
-    if (depth == maxDepth) {
-      return;
+    public RecursiveThreadPoolMixedSubmissionAndExecution(ExecutorService executor, int maxDepth, int depth) {
+        this.executor = executor;
+        this.maxDepth = maxDepth;
+        this.depth = depth;
     }
-    AgentSpan span = startSpan("test", String.valueOf(depth));
-    try (ContextScope scope = activateSpan(span)) {
-      if (depth % 2 == 0) {
-        executor.submit(
-            new RecursiveThreadPoolMixedSubmissionAndExecution(executor, maxDepth, depth + 1));
-      } else {
-        executor.execute(
-            new RecursiveThreadPoolMixedSubmissionAndExecution(executor, maxDepth, depth + 1));
-      }
-    } finally {
-      span.finish();
+
+    @Override
+    public void run() {
+        if (depth == maxDepth) {
+            return;
+        }
+        AgentSpan span = startSpan("test", String.valueOf(depth));
+        try (ContextScope scope = activateSpan(span)) {
+            if (depth % 2 == 0) {
+                executor.submit(new RecursiveThreadPoolMixedSubmissionAndExecution(executor, maxDepth, depth + 1));
+            } else {
+                executor.execute(new RecursiveThreadPoolMixedSubmissionAndExecution(executor, maxDepth, depth + 1));
+            }
+        } finally {
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java
index d5e4ba967a5..52a50d370b5 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java
@@ -9,27 +9,27 @@
 
 public class RecursiveThreadPoolSubmission implements Runnable {
 
-  private final ExecutorService executor;
+    private final ExecutorService executor;
 
-  private final int maxDepth;
-  private final int depth;
+    private final int maxDepth;
+    private final int depth;
 
-  public RecursiveThreadPoolSubmission(ExecutorService executor, int maxDepth, int depth) {
-    this.executor = executor;
-    this.maxDepth = maxDepth;
-    this.depth = depth;
-  }
-
-  @Override
-  public void run() {
-    if (depth == maxDepth) {
-      return;
+    public RecursiveThreadPoolSubmission(ExecutorService executor, int maxDepth, int depth) {
+        this.executor = executor;
+        this.maxDepth = maxDepth;
+        this.depth = depth;
     }
-    AgentSpan span = startSpan("test", String.valueOf(depth));
-    try (ContextScope scope = activateSpan(span)) {
-      executor.submit(new RecursiveThreadPoolSubmission(executor, maxDepth, depth + 1));
-    } finally {
-      span.finish();
+
+    @Override
+    public void run() {
+        if (depth == maxDepth) {
+            return;
+        }
+        AgentSpan span = startSpan("test", String.valueOf(depth));
+        try (ContextScope scope = activateSpan(span)) {
+            executor.submit(new RecursiveThreadPoolSubmission(executor, maxDepth, depth + 1));
+        } finally {
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/ExecutingRejectedExecutionHandler.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/ExecutingRejectedExecutionHandler.java
index 02a25ce65c3..8f184ebf02e 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/ExecutingRejectedExecutionHandler.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/ExecutingRejectedExecutionHandler.java
@@ -4,10 +4,10 @@
 import java.util.concurrent.ThreadPoolExecutor;
 
 public class ExecutingRejectedExecutionHandler implements RejectedExecutionHandler {
-  @Override
-  public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) {
-    if (!executor.isShutdown()) {
-      r.run();
+    @Override
+    public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) {
+        if (!executor.isShutdown()) {
+            r.run();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/SwallowingRejectedExecutionHandler.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/SwallowingRejectedExecutionHandler.java
index c168f0069cc..a38f36e3fc1 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/SwallowingRejectedExecutionHandler.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/SwallowingRejectedExecutionHandler.java
@@ -5,10 +5,10 @@
 import java.util.concurrent.ThreadPoolExecutor;
 
 public class SwallowingRejectedExecutionHandler
-    implements RejectedExecutionHandler, io.netty.util.concurrent.RejectedExecutionHandler {
-  @Override
-  public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) {}
+        implements RejectedExecutionHandler, io.netty.util.concurrent.RejectedExecutionHandler {
+    @Override
+    public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) {}
 
-  @Override
-  public void rejected(Runnable task, SingleThreadEventExecutor executor) {}
+    @Override
+    public void rejected(Runnable task, SingleThreadEventExecutor executor) {}
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java
index 5482fd97bde..d4d8132c618 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java
@@ -8,38 +8,38 @@
 import java.util.concurrent.RecursiveTask;
 
 public class LinearTask extends RecursiveTask<Integer> {
-  private final int depth;
-  private final int parent;
+    private final int depth;
+    private final int parent;
 
-  public LinearTask(int depth) {
-    this(0, depth);
-  }
-
-  private LinearTask(int parent, int depth) {
-    this.parent = parent;
-    this.depth = depth;
-  }
+    public LinearTask(int depth) {
+        this(0, depth);
+    }
 
-  @Override
-  protected Integer compute() {
-    try {
-      // introduces delay to encourage parallelism
-      // which will expose problems with context propagation
-      Thread.sleep(5);
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
+    private LinearTask(int parent, int depth) {
+        this.parent = parent;
+        this.depth = depth;
     }
-    if (parent == depth) {
-      return parent;
-    } else {
-      int next = parent + 1;
-      AgentSpan span = startSpan("test", Integer.toString(next));
-      try (ContextScope scope = activateSpan(span)) {
-        LinearTask child = new LinearTask(next, depth);
-        return child.fork().join();
-      } finally {
-        span.finish();
-      }
+
+    @Override
+    protected Integer compute() {
+        try {
+            // introduces delay to encourage parallelism
+            // which will expose problems with context propagation
+            Thread.sleep(5);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+        if (parent == depth) {
+            return parent;
+        } else {
+            int next = parent + 1;
+            AgentSpan span = startSpan("test", Integer.toString(next));
+            try (ContextScope scope = activateSpan(span)) {
+                LinearTask child = new LinearTask(next, depth);
+                return child.fork().join();
+            } finally {
+                span.finish();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/PeriodicTask.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/PeriodicTask.java
index 60bbd7a5316..37e68ec2c80 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/PeriodicTask.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/PeriodicTask.java
@@ -3,30 +3,30 @@
 import datadog.trace.api.Trace;
 
 public class PeriodicTask implements Runnable {
-  private volatile int runCount;
-  private boolean finished = false;
+    private volatile int runCount;
+    private boolean finished = false;
 
-  public int getRunCount() {
-    return runCount;
-  }
+    public int getRunCount() {
+        return runCount;
+    }
 
-  public void ensureFinished() {
-    synchronized (this) {
-      this.finished = true;
+    public void ensureFinished() {
+        synchronized (this) {
+            this.finished = true;
+        }
     }
-  }
 
-  @Override
-  public void run() {
-    synchronized (this) {
-      if (!finished) {
-        periodicRun();
-      }
+    @Override
+    public void run() {
+        synchronized (this) {
+            if (!finished) {
+                periodicRun();
+            }
+        }
     }
-  }
 
-  @Trace(operationName = "periodicRun")
-  private void periodicRun() {
-    runCount++;
-  }
+    @Trace(operationName = "periodicRun")
+    private void periodicRun() {
+        runCount++;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/CheckpointTask.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/CheckpointTask.java
index 9d559546920..c6f60088092 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/CheckpointTask.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/CheckpointTask.java
@@ -7,28 +7,28 @@
 
 public class CheckpointTask implements Runnable {
 
-  private final boolean traceChild;
-  private final CountDownLatch latch;
-
-  public CheckpointTask(boolean traceChild) {
-    this(traceChild, new CountDownLatch(0));
-  }
-
-  public CheckpointTask(boolean traceChild, CountDownLatch latch) {
-    this.traceChild = traceChild;
-    this.latch = latch;
-  }
-
-  @Override
-  public void run() {
-    if (traceChild) {
-      traceableChild();
+    private final boolean traceChild;
+    private final CountDownLatch latch;
+
+    public CheckpointTask(boolean traceChild) {
+        this(traceChild, new CountDownLatch(0));
+    }
+
+    public CheckpointTask(boolean traceChild, CountDownLatch latch) {
+        this.traceChild = traceChild;
+        this.latch = latch;
     }
-    latch.countDown();
-  }
 
-  @Trace
-  private void traceableChild() {
-    assert null != activeSpan();
-  }
+    @Override
+    public void run() {
+        if (traceChild) {
+            traceableChild();
+        }
+        latch.countDown();
+    }
+
+    @Trace
+    private void traceableChild() {
+        assert null != activeSpan();
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/ComparableAsyncChild.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/ComparableAsyncChild.java
index 4decb64ccc2..2218d70ae5d 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/ComparableAsyncChild.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/ComparableAsyncChild.java
@@ -2,36 +2,36 @@
 
 public class ComparableAsyncChild implements Runnable, Comparable<ComparableAsyncChild> {
 
-  private final int priority;
-  private final Runnable task;
+    private final int priority;
+    private final Runnable task;
 
-  public ComparableAsyncChild(int priority, Runnable task) {
-    this.priority = priority;
-    this.task = task;
-  }
+    public ComparableAsyncChild(int priority, Runnable task) {
+        this.priority = priority;
+        this.task = task;
+    }
 
-  @Override
-  public int compareTo(ComparableAsyncChild o) {
-    return priority - o.priority;
-  }
+    @Override
+    public int compareTo(ComparableAsyncChild o) {
+        return priority - o.priority;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    try {
-      return this.compareTo((ComparableAsyncChild) o) == 0;
-    } catch (Exception e) {
-      return false;
+    @Override
+    public boolean equals(Object o) {
+        try {
+            return this.compareTo((ComparableAsyncChild) o) == 0;
+        } catch (Exception e) {
+            return false;
+        }
     }
-  }
 
-  @Override
-  public int hashCode() {
-    assert false : "hashCode not designed";
-    return 0;
-  }
+    @Override
+    public int hashCode() {
+        assert false : "hashCode not designed";
+        return 0;
+    }
 
-  @Override
-  public void run() {
-    task.run();
-  }
+    @Override
+    public void run() {
+        task.run();
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java
index 9df56e98cff..7b48dffb62d 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java
@@ -8,19 +8,19 @@
 
 public final class Descendant implements Runnable {
 
-  private final String parent;
+    private final String parent;
 
-  public Descendant(String parent) {
-    this.parent = parent;
-  }
+    public Descendant(String parent) {
+        this.parent = parent;
+    }
 
-  @Override
-  public void run() {
-    AgentSpan span = startSpan("test", parent + "-child");
-    try (ContextScope scope = activateSpan(span)) {
+    @Override
+    public void run() {
+        AgentSpan span = startSpan("test", parent + "-child");
+        try (ContextScope scope = activateSpan(span)) {
 
-    } finally {
-      span.finish();
+        } finally {
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/JavaAsyncChild.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/JavaAsyncChild.java
index 9faac6c347f..1024c772251 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/JavaAsyncChild.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/JavaAsyncChild.java
@@ -6,56 +6,56 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class JavaAsyncChild extends ForkJoinTask implements Runnable, Callable {
-  private final AtomicBoolean blockThread;
-  private final boolean doTraceableWork;
-
-  public JavaAsyncChild() {
-    this(true, false);
-  }
-
-  @Override
-  public Object getRawResult() {
-    return null;
-  }
-
-  @Override
-  protected void setRawResult(final Object value) {}
-
-  @Override
-  protected boolean exec() {
-    runImpl();
-    return true;
-  }
-
-  public JavaAsyncChild(final boolean doTraceableWork, final boolean blockThread) {
-    this.doTraceableWork = doTraceableWork;
-    this.blockThread = new AtomicBoolean(blockThread);
-  }
-
-  public void unblock() {
-    blockThread.set(false);
-  }
-
-  @Override
-  public void run() {
-    runImpl();
-  }
-
-  @Override
-  public Object call() throws Exception {
-    runImpl();
-    return null;
-  }
-
-  private void runImpl() {
-    while (blockThread.get()) {
-      // busy-wait to block thread
-    }
-    if (doTraceableWork) {
-      asyncChild();
-    }
-  }
-
-  @Trace(operationName = "asyncChild")
-  private void asyncChild() {}
+    private final AtomicBoolean blockThread;
+    private final boolean doTraceableWork;
+
+    public JavaAsyncChild() {
+        this(true, false);
+    }
+
+    @Override
+    public Object getRawResult() {
+        return null;
+    }
+
+    @Override
+    protected void setRawResult(final Object value) {}
+
+    @Override
+    protected boolean exec() {
+        runImpl();
+        return true;
+    }
+
+    public JavaAsyncChild(final boolean doTraceableWork, final boolean blockThread) {
+        this.doTraceableWork = doTraceableWork;
+        this.blockThread = new AtomicBoolean(blockThread);
+    }
+
+    public void unblock() {
+        blockThread.set(false);
+    }
+
+    @Override
+    public void run() {
+        runImpl();
+    }
+
+    @Override
+    public Object call() throws Exception {
+        runImpl();
+        return null;
+    }
+
+    private void runImpl() {
+        while (blockThread.get()) {
+            // busy-wait to block thread
+        }
+        if (doTraceableWork) {
+            asyncChild();
+        }
+    }
+
+    @Trace(operationName = "asyncChild")
+    private void asyncChild() {}
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/SettableFuture.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/SettableFuture.java
index 9df241918ab..d53b4ef18da 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/SettableFuture.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/SettableFuture.java
@@ -4,21 +4,20 @@
 import java.util.concurrent.FutureTask;
 
 public class SettableFuture extends FutureTask<String> {
-  SettableFuture() {
-    super(
-        new Callable<String>() {
-          @Override
-          public String call() throws Exception {
-            return "async result";
-          }
+    SettableFuture() {
+        super(new Callable<String>() {
+            @Override
+            public String call() throws Exception {
+                return "async result";
+            }
         });
-  }
+    }
 
-  public void set(String value) {
-    super.set(value);
-  }
+    public void set(String value) {
+        super.set(value);
+    }
 
-  public void setException(Throwable cause) {
-    super.setException(cause);
-  }
+    public void setException(Throwable cause) {
+        super.setException(cause);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency21/StructuredTaskScope21Instrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency21/StructuredTaskScope21Instrumentation.java
index 99573754273..aaf539583f7 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency21/StructuredTaskScope21Instrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency21/StructuredTaskScope21Instrumentation.java
@@ -23,44 +23,44 @@
 @SuppressWarnings("unused")
 @AutoService(InstrumenterModule.class)
 public class StructuredTaskScope21Instrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public StructuredTaskScope21Instrumentation() {
-    super("java_concurrent", "structured-task-scope", "structured-task-scope-21");
-  }
+    public StructuredTaskScope21Instrumentation() {
+        super("java_concurrent", "structured-task-scope", "structured-task-scope-21");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "java.util.concurrent.StructuredTaskScope$SubtaskImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "java.util.concurrent.StructuredTaskScope$SubtaskImpl";
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return isJavaVersionBetween(21, 25) && super.isEnabled();
-  }
+    @Override
+    public boolean isEnabled() {
+        return isJavaVersionBetween(21, 25) && super.isEnabled();
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(Runnable.class.getName(), State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(Runnable.class.getName(), State.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$ConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$ConstructorAdvice");
+    }
 
-  public static final class ConstructorAdvice {
-    /**
-     * Captures task scope to be restored at the start of VirtualThread.run() method by {@link
-     * Runnable} instrumentation.
-     *
-     * @param subTaskImpl The StructuredTaskScope.SubtaskImpl object (the advice are compile against
-     *     Java 8 so the type from JDK25 can't be referred, using {@link Object} instead
-     */
-    @OnMethodExit(suppress = Throwable.class)
-    public static void captureScope(@This Object subTaskImpl) {
-      ContextStore<Runnable, State> contextStore = get(Runnable.class, State.class);
-      capture(contextStore, (Runnable) subTaskImpl);
+    public static final class ConstructorAdvice {
+        /**
+         * Captures task scope to be restored at the start of VirtualThread.run() method by {@link
+         * Runnable} instrumentation.
+         *
+         * @param subTaskImpl The StructuredTaskScope.SubtaskImpl object (the advice are compile against
+         *     Java 8 so the type from JDK25 can't be referred, using {@link Object} instead
+         */
+        @OnMethodExit(suppress = Throwable.class)
+        public static void captureScope(@This Object subTaskImpl) {
+            ContextStore<Runnable, State> contextStore = get(Runnable.class, State.class);
+            capture(contextStore, (Runnable) subTaskImpl);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java
index 30e1afd9f51..53360f4eb93 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java
@@ -27,48 +27,48 @@
 @SuppressWarnings("unused")
 @AutoService(InstrumenterModule.class)
 public final class TaskRunnerInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public TaskRunnerInstrumentation() {
-    super("java_concurrent", "task-runner");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "java.util.concurrent.ThreadPerTaskExecutor$TaskRunner";
-  }
+        implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public TaskRunnerInstrumentation() {
+        super("java_concurrent", "task-runner");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return JavaVirtualMachine.isJavaVersionAtLeast(19) && super.isEnabled();
-  }
+    @Override
+    public String instrumentedType() {
+        return "java.util.concurrent.ThreadPerTaskExecutor$TaskRunner";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("java.lang.Runnable", State.class.getName());
-  }
+    @Override
+    public boolean isEnabled() {
+        return JavaVirtualMachine.isJavaVersionAtLeast(19) && super.isEnabled();
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
-    transformer.applyAdvice(isMethod().and(named("run")), getClass().getName() + "$Run");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("java.lang.Runnable", State.class.getName());
+    }
 
-  public static final class Construct {
-    @OnMethodExit(suppress = Throwable.class)
-    public static void captureScope(@Advice.This Runnable task) {
-      capture(InstrumentationContext.get(Runnable.class, State.class), task);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
+        transformer.applyAdvice(isMethod().and(named("run")), getClass().getName() + "$Run");
     }
-  }
 
-  public static final class Run {
-    @OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope activate(@Advice.This Runnable task) {
-      return startTaskScope(InstrumentationContext.get(Runnable.class, State.class), task);
+    public static final class Construct {
+        @OnMethodExit(suppress = Throwable.class)
+        public static void captureScope(@Advice.This Runnable task) {
+            capture(InstrumentationContext.get(Runnable.class, State.class), task);
+        }
     }
 
-    @OnMethodExit(suppress = Throwable.class)
-    public static void close(@Advice.Enter ContextScope scope) {
-      endTaskScope(scope);
+    public static final class Run {
+        @OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope activate(@Advice.This Runnable task) {
+            return startTaskScope(InstrumentationContext.get(Runnable.class, State.class), task);
+        }
+
+        @OnMethodExit(suppress = Throwable.class)
+        public static void close(@Advice.Enter ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/test/java/JavaAsyncChild.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/test/java/JavaAsyncChild.java
index b93e43a5fa0..af7a6d3a1ec 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/test/java/JavaAsyncChild.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/test/java/JavaAsyncChild.java
@@ -3,42 +3,42 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class JavaAsyncChild implements Runnable, Callable<Void> {
-  private final AtomicBoolean blockThread;
-  private final boolean doTraceableWork;
-
-  public JavaAsyncChild() {
-    this(true, false);
-  }
-
-  public JavaAsyncChild(final boolean doTraceableWork, final boolean blockThread) {
-    this.doTraceableWork = doTraceableWork;
-    this.blockThread = new AtomicBoolean(blockThread);
-  }
-
-  public void unblock() {
-    blockThread.set(false);
-  }
-
-  @Override
-  public void run() {
-    runImpl();
-  }
-
-  @Override
-  public Void call() {
-    runImpl();
-    return null;
-  }
-
-  private void runImpl() {
-    while (blockThread.get()) {
-      // busy-wait to block thread
+    private final AtomicBoolean blockThread;
+    private final boolean doTraceableWork;
+
+    public JavaAsyncChild() {
+        this(true, false);
+    }
+
+    public JavaAsyncChild(final boolean doTraceableWork, final boolean blockThread) {
+        this.doTraceableWork = doTraceableWork;
+        this.blockThread = new AtomicBoolean(blockThread);
+    }
+
+    public void unblock() {
+        blockThread.set(false);
     }
-    if (doTraceableWork) {
-      asyncChild();
+
+    @Override
+    public void run() {
+        runImpl();
+    }
+
+    @Override
+    public Void call() {
+        runImpl();
+        return null;
+    }
+
+    private void runImpl() {
+        while (blockThread.get()) {
+            // busy-wait to block thread
+        }
+        if (doTraceableWork) {
+            asyncChild();
+        }
     }
-  }
 
-  @Trace(operationName = "asyncChild")
-  private void asyncChild() {}
+    @Trace(operationName = "asyncChild")
+    private void asyncChild() {}
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/ScheduledForkJoinTaskInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/ScheduledForkJoinTaskInstrumentation.java
index be9f94bd293..264daebfc59 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/ScheduledForkJoinTaskInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/ScheduledForkJoinTaskInstrumentation.java
@@ -17,41 +17,41 @@
 /** Captures context for one-shot tasks scheduled through ForkJoinPool's delay scheduler. */
 @AutoService(InstrumenterModule.class)
 public final class ScheduledForkJoinTaskInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ScheduledForkJoinTaskInstrumentation() {
-    super("java_concurrent", "fjp");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "java.util.concurrent.DelayScheduler$ScheduledForkJoinTask";
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return isJavaVersionAtLeast(25) && super.isEnabled();
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("java.util.concurrent.ForkJoinTask", State.class.getName());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
-  }
-
-  public static final class Construct {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void captureContext(
-        @Advice.This ForkJoinTask<?> task,
-        @Advice.FieldValue("nextDelay") long nextDelay,
-        @Advice.FieldValue("isImmediate") boolean isImmediate) {
-      // Periodic tasks must not retain their creator; immediate tasks are internal timeout actions.
-      if (nextDelay == 0 && !isImmediate) {
-        capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
-      }
+        implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ScheduledForkJoinTaskInstrumentation() {
+        super("java_concurrent", "fjp");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "java.util.concurrent.DelayScheduler$ScheduledForkJoinTask";
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return isJavaVersionAtLeast(25) && super.isEnabled();
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("java.util.concurrent.ForkJoinTask", State.class.getName());
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
+    }
+
+    public static final class Construct {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void captureContext(
+                @Advice.This ForkJoinTask<?> task,
+                @Advice.FieldValue("nextDelay") long nextDelay,
+                @Advice.FieldValue("isImmediate") boolean isImmediate) {
+            // Periodic tasks must not retain their creator; immediate tasks are internal timeout actions.
+            if (nextDelay == 0 && !isImmediate) {
+                capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java
index 263ca03b889..5f32d8893f8 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java
@@ -28,39 +28,39 @@
 @SuppressWarnings("unused")
 @AutoService(InstrumenterModule.class)
 public class StructuredTaskScope25Instrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public StructuredTaskScope25Instrumentation() {
-    super("java_concurrent", "structured-task-scope", "structured-task-scope-25");
-  }
+    public StructuredTaskScope25Instrumentation() {
+        super("java_concurrent", "structured-task-scope", "structured-task-scope-25");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "java.util.concurrent.StructuredTaskScopeImpl$SubtaskImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "java.util.concurrent.StructuredTaskScopeImpl$SubtaskImpl";
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return isJavaVersionAtLeast(25) && super.isEnabled();
-  }
+    @Override
+    public boolean isEnabled() {
+        return isJavaVersionAtLeast(25) && super.isEnabled();
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$ConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$ConstructorAdvice");
+    }
 
-  public static final class ConstructorAdvice {
-    /**
-     * Captures task scope to be restored at the start of VirtualThread.run() method by {@link
-     * Runnable} instrumentation.
-     *
-     * @param subTaskImpl The StructuredTaskScopeImpl.SubtaskImpl object (the advice are compile
-     *     against Java 8 so the type from JDK25 can't be referred, using {@link Object} instead
-     */
-    @OnMethodExit(suppress = Throwable.class)
-    public static void captureScope(@This Object subTaskImpl) {
-      ContextStore<Runnable, State> contextStore = get(Runnable.class, State.class);
-      capture(contextStore, (Runnable) subTaskImpl);
+    public static final class ConstructorAdvice {
+        /**
+         * Captures task scope to be restored at the start of VirtualThread.run() method by {@link
+         * Runnable} instrumentation.
+         *
+         * @param subTaskImpl The StructuredTaskScopeImpl.SubtaskImpl object (the advice are compile
+         *     against Java 8 so the type from JDK25 can't be referred, using {@link Object} instead
+         */
+        @OnMethodExit(suppress = Throwable.class)
+        public static void captureScope(@This Object subTaskImpl) {
+            ContextStore<Runnable, State> contextStore = get(Runnable.class, State.class);
+            capture(contextStore, (Runnable) subTaskImpl);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/test/java/testdog/trace/instrumentation/java/concurrent/ForkJoinPoolSchedulingTest.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/test/java/testdog/trace/instrumentation/java/concurrent/ForkJoinPoolSchedulingTest.java
index 521f6f0759f..a87e58bfeab 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/test/java/testdog/trace/instrumentation/java/concurrent/ForkJoinPoolSchedulingTest.java
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/test/java/testdog/trace/instrumentation/java/concurrent/ForkJoinPoolSchedulingTest.java
@@ -31,353 +31,346 @@
 import org.junit.jupiter.params.provider.EnumSource;
 
 class ForkJoinPoolSchedulingTest extends AbstractInstrumentationTest {
-  private static final int APP_VALUE = 7;
+    private static final int APP_VALUE = 7;
 
-  enum Completion {
-    COMPLETE,
-    QUIETLY_COMPLETE,
-    COMPLETE_EXCEPTIONALLY;
+    enum Completion {
+        COMPLETE,
+        QUIETLY_COMPLETE,
+        COMPLETE_EXCEPTIONALLY;
 
-    void complete(ForkJoinTask<?> task) {
-      switch (this) {
-        case COMPLETE:
-          task.complete(null);
-          break;
-        case QUIETLY_COMPLETE:
-          task.quietlyComplete();
-          break;
-        case COMPLETE_EXCEPTIONALLY:
-          task.completeExceptionally(new IllegalStateException("external completion"));
-          break;
-      }
+        void complete(ForkJoinTask<?> task) {
+            switch (this) {
+                case COMPLETE:
+                    task.complete(null);
+                    break;
+                case QUIETLY_COMPLETE:
+                    task.quietlyComplete();
+                    break;
+                case COMPLETE_EXCEPTIONALLY:
+                    task.completeExceptionally(new IllegalStateException("external completion"));
+                    break;
+            }
+        }
     }
-  }
 
-  @ParameterizedTest
-  @EnumSource(Completion.class)
-  void externallyCompletedTaskReleasesContext(Completion completion) {
-    try (ForkJoinPool pool = new ForkJoinPool(1)) {
-      AgentSpan parent = startSpan("test", "parent");
-      ForkJoinTask<?> task;
-      try (ContextScope ignored = current().with(parent).attach()) {
-        task = (ForkJoinTask<?>) pool.schedule(() -> {}, 1, DAYS);
-      } finally {
-        parent.finish();
-      }
-      completion.complete(task);
-      // Check publication while the future is still reachable and before pool cleanup.
-      assertTraces(trace(span().root().operationName("parent")));
-      assertTrue(task.isDone());
+    @ParameterizedTest
+    @EnumSource(Completion.class)
+    void externallyCompletedTaskReleasesContext(Completion completion) {
+        try (ForkJoinPool pool = new ForkJoinPool(1)) {
+            AgentSpan parent = startSpan("test", "parent");
+            ForkJoinTask<?> task;
+            try (ContextScope ignored = current().with(parent).attach()) {
+                task = (ForkJoinTask<?>) pool.schedule(() -> {}, 1, DAYS);
+            } finally {
+                parent.finish();
+            }
+            completion.complete(task);
+            // Check publication while the future is still reachable and before pool cleanup.
+            assertTraces(trace(span().root().operationName("parent")));
+            assertTrue(task.isDone());
+        }
     }
-  }
 
-  @ParameterizedTest
-  @EnumSource(Completion.class)
-  void externalCompletionPreservesRunningTaskContext(Completion completion) throws Exception {
-    CountDownLatch release = new CountDownLatch(1);
-    try (ForkJoinPool pool = new ForkJoinPool(1)) {
-      try {
-        CountDownLatch started = new CountDownLatch(1);
-        CountDownLatch finished = new CountDownLatch(1);
-        AtomicReference<Object> observed = new AtomicReference<>();
-        AgentSpan parent = startSpan("test", "parent");
-        ForkJoinTask<?> task;
-        try (ContextScope ignored = current().with(parent).attach()) {
-          task =
-              (ForkJoinTask<?>)
-                  pool.schedule(
-                      () -> {
-                        started.countDown();
-                        try {
-                          if (release.await(10, SECONDS)) {
-                            observed.set(AgentSpan.current());
-                            startSpan("test", "child").finish();
-                          }
-                        } catch (InterruptedException e) {
-                          Thread.currentThread().interrupt();
-                        } finally {
-                          finished.countDown();
-                        }
-                      },
-                      0,
-                      MILLISECONDS);
-        } finally {
-          parent.finish();
+    @ParameterizedTest
+    @EnumSource(Completion.class)
+    void externalCompletionPreservesRunningTaskContext(Completion completion) throws Exception {
+        CountDownLatch release = new CountDownLatch(1);
+        try (ForkJoinPool pool = new ForkJoinPool(1)) {
+            try {
+                CountDownLatch started = new CountDownLatch(1);
+                CountDownLatch finished = new CountDownLatch(1);
+                AtomicReference<Object> observed = new AtomicReference<>();
+                AgentSpan parent = startSpan("test", "parent");
+                ForkJoinTask<?> task;
+                try (ContextScope ignored = current().with(parent).attach()) {
+                    task = (ForkJoinTask<?>) pool.schedule(
+                            () -> {
+                                started.countDown();
+                                try {
+                                    if (release.await(10, SECONDS)) {
+                                        observed.set(AgentSpan.current());
+                                        startSpan("test", "child").finish();
+                                    }
+                                } catch (InterruptedException e) {
+                                    Thread.currentThread().interrupt();
+                                } finally {
+                                    finished.countDown();
+                                }
+                            },
+                            0,
+                            MILLISECONDS);
+                } finally {
+                    parent.finish();
+                }
+                assertTrue(started.await(10, SECONDS));
+                completion.complete(task);
+                release.countDown();
+                assertTrue(finished.await(10, SECONDS));
+                assertSame(parent, observed.get());
+                assertTraces(trace(
+                        SORT_BY_START_TIME,
+                        span().root().operationName("parent"),
+                        span().childOfPrevious().operationName("child")));
+            } finally {
+                release.countDown();
+                pool.shutdownNow();
+            }
         }
-        assertTrue(started.await(10, SECONDS));
-        completion.complete(task);
-        release.countDown();
-        assertTrue(finished.await(10, SECONDS));
-        assertSame(parent, observed.get());
-        assertTraces(
-            trace(
-                SORT_BY_START_TIME,
-                span().root().operationName("parent"),
-                span().childOfPrevious().operationName("child")));
-      } finally {
-        release.countDown();
-        pool.shutdownNow();
-      }
     }
-  }
 
-  @Test
-  void unrelatedApplicationMethodDoesNotCancelContext() throws Exception {
-    CountDownLatch release = new CountDownLatch(1);
-    try (ForkJoinPool pool = new ForkJoinPool(1)) {
-      try {
-        CountDownLatch started = new CountDownLatch(1);
-        pool.execute(
-            () -> {
-              started.countDown();
-              try {
-                assertTrue(release.await(10, SECONDS));
-              } catch (InterruptedException e) {
-                throw new AssertionError(e);
-              }
-            });
-        assertTrue(started.await(10, SECONDS));
-        AgentSpan parent = startSpan("test", "parent");
-        ApplicationTask task = new ApplicationTask();
-        try (ContextScope ignored = current().with(parent).attach()) {
-          pool.submit(task);
-          assertEquals(APP_VALUE, task.trySetCancelled());
-        } finally {
-          parent.finish();
+    @Test
+    void unrelatedApplicationMethodDoesNotCancelContext() throws Exception {
+        CountDownLatch release = new CountDownLatch(1);
+        try (ForkJoinPool pool = new ForkJoinPool(1)) {
+            try {
+                CountDownLatch started = new CountDownLatch(1);
+                pool.execute(() -> {
+                    started.countDown();
+                    try {
+                        assertTrue(release.await(10, SECONDS));
+                    } catch (InterruptedException e) {
+                        throw new AssertionError(e);
+                    }
+                });
+                assertTrue(started.await(10, SECONDS));
+                AgentSpan parent = startSpan("test", "parent");
+                ApplicationTask task = new ApplicationTask();
+                try (ContextScope ignored = current().with(parent).attach()) {
+                    pool.submit(task);
+                    assertEquals(APP_VALUE, task.trySetCancelled());
+                } finally {
+                    parent.finish();
+                }
+                release.countDown();
+                assertSame(parent, task.get(10, SECONDS));
+                assertTraces(trace(span().root().operationName("parent")));
+            } finally {
+                release.countDown();
+                pool.shutdownNow();
+            }
         }
-        release.countDown();
-        assertSame(parent, task.get(10, SECONDS));
-        assertTraces(trace(span().root().operationName("parent")));
-      } finally {
-        release.countDown();
-        pool.shutdownNow();
-      }
     }
-  }
 
-  public static final class ApplicationTask extends ForkJoinTask<Object> {
-    private Object result;
+    public static final class ApplicationTask extends ForkJoinTask<Object> {
+        private Object result;
 
-    /** Shares the name of a package-private JDK method without overriding it. */
-    public int trySetCancelled() {
-      return APP_VALUE;
-    }
+        /** Shares the name of a package-private JDK method without overriding it. */
+        public int trySetCancelled() {
+            return APP_VALUE;
+        }
 
-    @Override
-    public Object getRawResult() {
-      return result;
-    }
+        @Override
+        public Object getRawResult() {
+            return result;
+        }
 
-    @Override
-    protected void setRawResult(Object value) {
-      result = value;
-    }
+        @Override
+        protected void setRawResult(Object value) {
+            result = value;
+        }
 
-    @Override
-    protected boolean exec() {
-      result = AgentSpan.current();
-      return true;
+        @Override
+        protected boolean exec() {
+            result = AgentSpan.current();
+            return true;
+        }
     }
-  }
 
-  @Test
-  void scheduledRunnableRetainsParentAfterScopeCloses() throws Exception {
-    try (ForkJoinPool pool = new ForkJoinPool(1)) {
-      CountDownLatch release = new CountDownLatch(1);
-      AgentSpan parent = startSpan("test", "parent");
-      Object expectedParent = parent;
-      ScheduledFuture<?> future;
-      try (ContextScope ignored = current().with(parent).attach()) {
-        future =
-            pool.schedule(
-                () -> {
-                  try {
-                    assertTrue(release.await(10, SECONDS));
-                  } catch (InterruptedException e) {
-                    throw new AssertionError(e);
-                  }
-                  assertSame(expectedParent, AgentSpan.current());
-                  startSpan("test", "child").finish();
-                },
-                1,
-                MILLISECONDS);
-      } finally {
-        parent.finish();
-        release.countDown();
-      }
-      future.get(10, SECONDS);
-      assertTraces(
-          trace(
-              SORT_BY_START_TIME,
-              span().root().operationName("parent"),
-              span().childOfPrevious().operationName("child")));
-      pool.submit(() -> assertNull(AgentSpan.current())).get(10, SECONDS);
+    @Test
+    void scheduledRunnableRetainsParentAfterScopeCloses() throws Exception {
+        try (ForkJoinPool pool = new ForkJoinPool(1)) {
+            CountDownLatch release = new CountDownLatch(1);
+            AgentSpan parent = startSpan("test", "parent");
+            Object expectedParent = parent;
+            ScheduledFuture<?> future;
+            try (ContextScope ignored = current().with(parent).attach()) {
+                future = pool.schedule(
+                        () -> {
+                            try {
+                                assertTrue(release.await(10, SECONDS));
+                            } catch (InterruptedException e) {
+                                throw new AssertionError(e);
+                            }
+                            assertSame(expectedParent, AgentSpan.current());
+                            startSpan("test", "child").finish();
+                        },
+                        1,
+                        MILLISECONDS);
+            } finally {
+                parent.finish();
+                release.countDown();
+            }
+            future.get(10, SECONDS);
+            assertTraces(trace(
+                    SORT_BY_START_TIME,
+                    span().root().operationName("parent"),
+                    span().childOfPrevious().operationName("child")));
+            pool.submit(() -> assertNull(AgentSpan.current())).get(10, SECONDS);
+        }
     }
-  }
 
-  @Test
-  void scheduledCallablePropagatesContextAndResult() throws Exception {
-    try (ForkJoinPool pool = new ForkJoinPool(1)) {
-      AgentSpan parent = startSpan("test", "parent");
-      Object expectedParent = parent;
-      try (ContextScope ignored = current().with(parent).attach()) {
-        assertEquals(
-            42,
-            pool.schedule(
-                    () -> {
-                      assertSame(expectedParent, AgentSpan.current());
-                      return 42;
-                    },
-                    0,
-                    MILLISECONDS)
-                .get(10, SECONDS));
-      } finally {
-        parent.finish();
-      }
-      assertTraces(trace(span().root().operationName("parent")));
+    @Test
+    void scheduledCallablePropagatesContextAndResult() throws Exception {
+        try (ForkJoinPool pool = new ForkJoinPool(1)) {
+            AgentSpan parent = startSpan("test", "parent");
+            Object expectedParent = parent;
+            try (ContextScope ignored = current().with(parent).attach()) {
+                assertEquals(
+                        42,
+                        pool.schedule(
+                                        () -> {
+                                            assertSame(expectedParent, AgentSpan.current());
+                                            return 42;
+                                        },
+                                        0,
+                                        MILLISECONDS)
+                                .get(10, SECONDS));
+            } finally {
+                parent.finish();
+            }
+            assertTraces(trace(span().root().operationName("parent")));
+        }
     }
-  }
 
-  @Test
-  void failingTaskReleasesContext() throws Exception {
-    try (ForkJoinPool pool = new ForkJoinPool(1)) {
-      AgentSpan parent = startSpan("test", "parent");
-      Object expectedParent = parent;
-      IllegalStateException failure = new IllegalStateException("task failure");
-      try (ContextScope ignored = current().with(parent).attach()) {
-        ScheduledFuture<?> future =
-            pool.schedule(
-                () -> {
-                  assertSame(expectedParent, AgentSpan.current());
-                  throw failure;
-                },
-                1,
-                MILLISECONDS);
-        Throwable cause =
-            assertThrows(ExecutionException.class, () -> future.get(10, SECONDS)).getCause();
-        // ForkJoinTask may reconstruct the exception when reporting it on another thread.
-        assertTrue(cause == failure || cause.getCause() == failure);
-      } finally {
-        parent.finish();
-      }
-      assertTraces(trace(span().root().operationName("parent")));
-      pool.submit(() -> assertNull(AgentSpan.current())).get(10, SECONDS);
+    @Test
+    void failingTaskReleasesContext() throws Exception {
+        try (ForkJoinPool pool = new ForkJoinPool(1)) {
+            AgentSpan parent = startSpan("test", "parent");
+            Object expectedParent = parent;
+            IllegalStateException failure = new IllegalStateException("task failure");
+            try (ContextScope ignored = current().with(parent).attach()) {
+                ScheduledFuture<?> future = pool.schedule(
+                        () -> {
+                            assertSame(expectedParent, AgentSpan.current());
+                            throw failure;
+                        },
+                        1,
+                        MILLISECONDS);
+                Throwable cause = assertThrows(ExecutionException.class, () -> future.get(10, SECONDS))
+                        .getCause();
+                // ForkJoinTask may reconstruct the exception when reporting it on another thread.
+                assertTrue(cause == failure || cause.getCause() == failure);
+            } finally {
+                parent.finish();
+            }
+            assertTraces(trace(span().root().operationName("parent")));
+            pool.submit(() -> assertNull(AgentSpan.current())).get(10, SECONDS);
+        }
     }
-  }
 
-  @Test
-  void cancelledTaskReleasesContext() {
-    try (ForkJoinPool pool = new ForkJoinPool(1)) {
-      AgentSpan parent = startSpan("test", "parent");
-      try (ContextScope ignored = current().with(parent).attach()) {
-        assertTrue(pool.schedule(() -> {}, 1, DAYS).cancel(false));
-      } finally {
-        parent.finish();
-      }
-      assertTraces(trace(span().root().operationName("parent")));
+    @Test
+    void cancelledTaskReleasesContext() {
+        try (ForkJoinPool pool = new ForkJoinPool(1)) {
+            AgentSpan parent = startSpan("test", "parent");
+            try (ContextScope ignored = current().with(parent).attach()) {
+                assertTrue(pool.schedule(() -> {}, 1, DAYS).cancel(false));
+            } finally {
+                parent.finish();
+            }
+            assertTraces(trace(span().root().operationName("parent")));
+        }
     }
-  }
 
-  @Test
-  void rejectedTaskReleasesContext() {
-    try (ForkJoinPool pool = new ForkJoinPool(1)) {
-      pool.shutdown();
-      AgentSpan parent = startSpan("test", "parent");
-      try (ContextScope ignored = current().with(parent).attach()) {
-        assertThrows(RejectedExecutionException.class, () -> pool.schedule(() -> {}, 1, DAYS));
-      } finally {
-        parent.finish();
-      }
-      assertTraces(trace(span().root().operationName("parent")));
+    @Test
+    void rejectedTaskReleasesContext() {
+        try (ForkJoinPool pool = new ForkJoinPool(1)) {
+            pool.shutdown();
+            AgentSpan parent = startSpan("test", "parent");
+            try (ContextScope ignored = current().with(parent).attach()) {
+                assertThrows(RejectedExecutionException.class, () -> pool.schedule(() -> {}, 1, DAYS));
+            } finally {
+                parent.finish();
+            }
+            assertTraces(trace(span().root().operationName("parent")));
+        }
     }
-  }
 
-  @Test
-  void shutdownCancelsDelayedTaskAndReleasesContext() throws Exception {
-    try (ForkJoinPool pool = new ForkJoinPool(1)) {
-      AgentSpan parent = startSpan("test", "parent");
-      ScheduledFuture<?> future;
-      try (ContextScope ignored = current().with(parent).attach()) {
-        future = pool.schedule(() -> {}, 1, DAYS);
-      } finally {
-        parent.finish();
-      }
-      pool.cancelDelayedTasksOnShutdown();
-      pool.shutdown();
-      assertTrue(pool.awaitTermination(10, SECONDS));
-      assertTrue(future.isCancelled());
-      assertTraces(trace(span().root().operationName("parent")));
+    @Test
+    void shutdownCancelsDelayedTaskAndReleasesContext() throws Exception {
+        try (ForkJoinPool pool = new ForkJoinPool(1)) {
+            AgentSpan parent = startSpan("test", "parent");
+            ScheduledFuture<?> future;
+            try (ContextScope ignored = current().with(parent).attach()) {
+                future = pool.schedule(() -> {}, 1, DAYS);
+            } finally {
+                parent.finish();
+            }
+            pool.cancelDelayedTasksOnShutdown();
+            pool.shutdown();
+            assertTrue(pool.awaitTermination(10, SECONDS));
+            assertTrue(future.isCancelled());
+            assertTraces(trace(span().root().operationName("parent")));
+        }
     }
-  }
 
-  @Test
-  void periodicTasksDoNotRetainParent() throws Exception {
-    try (ForkJoinPool pool = new ForkJoinPool(1)) {
-      AgentSpan parent = startSpan("test", "parent");
-      CountDownLatch ran = new CountDownLatch(2);
-      Runnable task =
-          () -> {
-            assertNull(AgentSpan.current());
-            ran.countDown();
-          };
-      ScheduledFuture<?> fixedRate;
-      ScheduledFuture<?> fixedDelay;
-      try (ContextScope ignored = current().with(parent).attach()) {
-        fixedRate = pool.scheduleAtFixedRate(task, 0, 1, DAYS);
-        fixedDelay = pool.scheduleWithFixedDelay(task, 0, 1, DAYS);
-      } finally {
-        parent.finish();
-      }
-      try {
-        assertTrue(ran.await(10, SECONDS));
-        assertTraces(trace(span().root().operationName("parent")));
-      } finally {
-        fixedRate.cancel(false);
-        fixedDelay.cancel(false);
-      }
+    @Test
+    void periodicTasksDoNotRetainParent() throws Exception {
+        try (ForkJoinPool pool = new ForkJoinPool(1)) {
+            AgentSpan parent = startSpan("test", "parent");
+            CountDownLatch ran = new CountDownLatch(2);
+            Runnable task = () -> {
+                assertNull(AgentSpan.current());
+                ran.countDown();
+            };
+            ScheduledFuture<?> fixedRate;
+            ScheduledFuture<?> fixedDelay;
+            try (ContextScope ignored = current().with(parent).attach()) {
+                fixedRate = pool.scheduleAtFixedRate(task, 0, 1, DAYS);
+                fixedDelay = pool.scheduleWithFixedDelay(task, 0, 1, DAYS);
+            } finally {
+                parent.finish();
+            }
+            try {
+                assertTrue(ran.await(10, SECONDS));
+                assertTraces(trace(span().root().operationName("parent")));
+            } finally {
+                fixedRate.cancel(false);
+                fixedDelay.cancel(false);
+            }
+        }
     }
-  }
 
-  @Test
-  void disabledPropagationDoesNotCaptureParent() throws Exception {
-    try (ForkJoinPool pool = new ForkJoinPool(1)) {
-      AgentSpan parent = startSpan("test", "parent");
-      try (ContextScope ignored = current().with(parent).attach()) {
-        boolean enabled = isAsyncPropagationEnabled();
-        setAsyncPropagationEnabled(false);
-        try {
-          pool.schedule(() -> assertNull(AgentSpan.current()), 0, MILLISECONDS).get(10, SECONDS);
-        } finally {
-          setAsyncPropagationEnabled(enabled);
+    @Test
+    void disabledPropagationDoesNotCaptureParent() throws Exception {
+        try (ForkJoinPool pool = new ForkJoinPool(1)) {
+            AgentSpan parent = startSpan("test", "parent");
+            try (ContextScope ignored = current().with(parent).attach()) {
+                boolean enabled = isAsyncPropagationEnabled();
+                setAsyncPropagationEnabled(false);
+                try {
+                    pool.schedule(() -> assertNull(AgentSpan.current()), 0, MILLISECONDS)
+                            .get(10, SECONDS);
+                } finally {
+                    setAsyncPropagationEnabled(enabled);
+                }
+            } finally {
+                parent.finish();
+            }
+            assertTraces(trace(span().root().operationName("parent")));
         }
-      } finally {
-        parent.finish();
-      }
-      assertTraces(trace(span().root().operationName("parent")));
     }
-  }
 
-  @Test
-  void internalTimeoutDoesNotRetainParentAfterTaskCompletes() throws Exception {
-    try (ForkJoinPool pool = new ForkJoinPool(1)) {
-      AgentSpan parent = startSpan("test", "parent");
-      Object expectedParent = parent;
-      try (ContextScope ignored = current().with(parent).attach()) {
-        assertEquals(
-            42,
-            pool.submitWithTimeout(
-                    () -> {
-                      assertSame(expectedParent, AgentSpan.current());
-                      return 42;
-                    },
-                    1,
-                    DAYS,
-                    null)
-                .get(10, SECONDS));
-      } finally {
-        parent.finish();
-      }
-      assertTraces(trace(span().root().operationName("parent")));
+    @Test
+    void internalTimeoutDoesNotRetainParentAfterTaskCompletes() throws Exception {
+        try (ForkJoinPool pool = new ForkJoinPool(1)) {
+            AgentSpan parent = startSpan("test", "parent");
+            Object expectedParent = parent;
+            try (ContextScope ignored = current().with(parent).attach()) {
+                assertEquals(
+                        42,
+                        pool.submitWithTimeout(
+                                        () -> {
+                                            assertSame(expectedParent, AgentSpan.current());
+                                            return 42;
+                                        },
+                                        1,
+                                        DAYS,
+                                        null)
+                                .get(10, SECONDS));
+            } finally {
+                parent.finish();
+            }
+            assertTraces(trace(span().root().operationName("parent")));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/java11Test/java/foo/bar/TestFileReaderCharsetSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/java11Test/java/foo/bar/TestFileReaderCharsetSuite.java
index d504657f80b..f812bd1f283 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/java11Test/java/foo/bar/TestFileReaderCharsetSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/java11Test/java/foo/bar/TestFileReaderCharsetSuite.java
@@ -7,13 +7,11 @@
 
 public class TestFileReaderCharsetSuite {
 
-  public static FileReader newFileReader(final String path, final Charset charset)
-      throws IOException {
-    return new FileReader(path, charset);
-  }
+    public static FileReader newFileReader(final String path, final Charset charset) throws IOException {
+        return new FileReader(path, charset);
+    }
 
-  public static FileReader newFileReader(final File file, final Charset charset)
-      throws IOException {
-    return new FileReader(file, charset);
-  }
+    public static FileReader newFileReader(final File file, final Charset charset) throws IOException {
+        return new FileReader(file, charset);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/java11Test/java/foo/bar/TestFileWriterCharsetSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/java11Test/java/foo/bar/TestFileWriterCharsetSuite.java
index ae91aa3fb27..1a062a91d7f 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/java11Test/java/foo/bar/TestFileWriterCharsetSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/java11Test/java/foo/bar/TestFileWriterCharsetSuite.java
@@ -7,23 +7,21 @@
 
 public class TestFileWriterCharsetSuite {
 
-  public static FileWriter newFileWriter(final String path, final Charset charset)
-      throws IOException {
-    return new FileWriter(path, charset);
-  }
+    public static FileWriter newFileWriter(final String path, final Charset charset) throws IOException {
+        return new FileWriter(path, charset);
+    }
 
-  public static FileWriter newFileWriter(
-      final String path, final Charset charset, final boolean append) throws IOException {
-    return new FileWriter(path, charset, append);
-  }
+    public static FileWriter newFileWriter(final String path, final Charset charset, final boolean append)
+            throws IOException {
+        return new FileWriter(path, charset, append);
+    }
 
-  public static FileWriter newFileWriter(final File file, final Charset charset)
-      throws IOException {
-    return new FileWriter(file, charset);
-  }
+    public static FileWriter newFileWriter(final File file, final Charset charset) throws IOException {
+        return new FileWriter(file, charset);
+    }
 
-  public static FileWriter newFileWriter(
-      final File file, final Charset charset, final boolean append) throws IOException {
-    return new FileWriter(file, charset, append);
-  }
+    public static FileWriter newFileWriter(final File file, final Charset charset, final boolean append)
+            throws IOException {
+        return new FileWriter(file, charset, append);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/java11Test/java/foo/bar/TestFilesJava11Suite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/java11Test/java/foo/bar/TestFilesJava11Suite.java
index af283fa8cf6..fcf3db3e62e 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/java11Test/java/foo/bar/TestFilesJava11Suite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/java11Test/java/foo/bar/TestFilesJava11Suite.java
@@ -8,25 +8,22 @@
 
 public class TestFilesJava11Suite {
 
-  public static Path writeString(
-      final Path path, final CharSequence content, final OpenOption... options) throws IOException {
-    return Files.writeString(path, content, options);
-  }
+    public static Path writeString(final Path path, final CharSequence content, final OpenOption... options)
+            throws IOException {
+        return Files.writeString(path, content, options);
+    }
 
-  public static Path writeString(
-      final Path path,
-      final CharSequence content,
-      final Charset charset,
-      final OpenOption... options)
-      throws IOException {
-    return Files.writeString(path, content, charset, options);
-  }
+    public static Path writeString(
+            final Path path, final CharSequence content, final Charset charset, final OpenOption... options)
+            throws IOException {
+        return Files.writeString(path, content, charset, options);
+    }
 
-  public static String readString(final Path path) throws IOException {
-    return Files.readString(path);
-  }
+    public static String readString(final Path path) throws IOException {
+        return Files.readString(path);
+    }
 
-  public static String readString(final Path path, final Charset charset) throws IOException {
-    return Files.readString(path, charset);
-  }
+    public static String readString(final Path path, final Charset charset) throws IOException {
+        return Files.readString(path, charset);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/java11Test/java/foo/bar/TestPathOfSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/java11Test/java/foo/bar/TestPathOfSuite.java
index 9c2f2b8cb09..6430f58ddbd 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/java11Test/java/foo/bar/TestPathOfSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/java11Test/java/foo/bar/TestPathOfSuite.java
@@ -5,11 +5,11 @@
 
 public class TestPathOfSuite {
 
-  public static Path of(final String first, final String... more) {
-    return Path.of(first, more);
-  }
+    public static Path of(final String first, final String... more) {
+        return Path.of(first, more);
+    }
 
-  public static Path of(final URI uri) {
-    return Path.of(uri);
-  }
+    public static Path of(final URI uri) {
+        return Path.of(uri);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ByteBufferCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ByteBufferCallSite.java
index f3ae16c4b9e..2b55f2c2307 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ByteBufferCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ByteBufferCallSite.java
@@ -15,39 +15,39 @@
 @CallSite(spi = IastCallSites.class)
 public class ByteBufferCallSite {
 
-  @CallSite.After("java.nio.ByteBuffer java.nio.ByteBuffer.wrap(byte[])")
-  public static ByteBuffer afterWrap(
-      @CallSite.Argument @Nullable final byte[] bytes, @CallSite.Return final ByteBuffer result) {
-    if (bytes == null || bytes.length == 0) {
-      return result;
+    @CallSite.After("java.nio.ByteBuffer java.nio.ByteBuffer.wrap(byte[])")
+    public static ByteBuffer afterWrap(
+            @CallSite.Argument @Nullable final byte[] bytes, @CallSite.Return final ByteBuffer result) {
+        if (bytes == null || bytes.length == 0) {
+            return result;
+        }
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module == null) {
+            return result;
+        }
+        try {
+            module.taintObjectIfTainted(result, bytes, true, NOT_MARKED); // keep ranges
+        } catch (final Throwable e) {
+            module.onUnexpectedException("beforeConstructor threw", e);
+        }
+        return result;
     }
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module == null) {
-      return result;
-    }
-    try {
-      module.taintObjectIfTainted(result, bytes, true, NOT_MARKED); // keep ranges
-    } catch (final Throwable e) {
-      module.onUnexpectedException("beforeConstructor threw", e);
-    }
-    return result;
-  }
 
-  @CallSite.After("byte[] java.nio.ByteBuffer.array()")
-  public static byte[] afterArray(
-      @CallSite.This @Nonnull final ByteBuffer buffer, @CallSite.Return final byte[] bytes) {
-    if (bytes == null || bytes.length == 0) {
-      return bytes;
-    }
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module == null) {
-      return bytes;
-    }
-    try {
-      module.taintObjectIfTainted(bytes, buffer, true, NOT_MARKED); // keep ranges
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterArray threw", e);
+    @CallSite.After("byte[] java.nio.ByteBuffer.array()")
+    public static byte[] afterArray(
+            @CallSite.This @Nonnull final ByteBuffer buffer, @CallSite.Return final byte[] bytes) {
+        if (bytes == null || bytes.length == 0) {
+            return bytes;
+        }
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module == null) {
+            return bytes;
+        }
+        try {
+            module.taintObjectIfTainted(bytes, buffer, true, NOT_MARKED); // keep ranges
+        } catch (final Throwable e) {
+            module.onUnexpectedException("afterArray threw", e);
+        }
+        return bytes;
     }
-    return bytes;
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileCallSite.java
index c0b49d2fbac..0477d70551c 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileCallSite.java
@@ -13,106 +13,104 @@
 
 @Sink(VulnerabilityTypes.PATH_TRAVERSAL)
 @CallSite(
-    spi = {IastCallSites.class, RaspCallSites.class},
-    helpers = FileIORaspHelper.class)
+        spi = {IastCallSites.class, RaspCallSites.class},
+        helpers = FileIORaspHelper.class)
 public class FileCallSite {
 
-  @CallSite.Before("void java.io.File.<init>(java.lang.String)")
-  public static void beforeConstructor(@CallSite.Argument @Nullable final String path) {
-    if (path != null) { // new File(null) throws NPE
-      iastCallback(path);
-      raspCallback(path);
+    @CallSite.Before("void java.io.File.<init>(java.lang.String)")
+    public static void beforeConstructor(@CallSite.Argument @Nullable final String path) {
+        if (path != null) { // new File(null) throws NPE
+            iastCallback(path);
+            raspCallback(path);
+        }
     }
-  }
 
-  @CallSite.Before("void java.io.File.<init>(java.lang.String, java.lang.String)")
-  public static void beforeConstructor(
-      @CallSite.Argument @Nullable final String parent,
-      @CallSite.Argument @Nullable final String child) {
-    if (child != null) { // new File("abc", null) throws NPE
-      final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
-      iastCallback(parent, child);
-      raspCallback(parent, child);
+    @CallSite.Before("void java.io.File.<init>(java.lang.String, java.lang.String)")
+    public static void beforeConstructor(
+            @CallSite.Argument @Nullable final String parent, @CallSite.Argument @Nullable final String child) {
+        if (child != null) { // new File("abc", null) throws NPE
+            final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
+            iastCallback(parent, child);
+            raspCallback(parent, child);
+        }
     }
-  }
 
-  @CallSite.Before("void java.io.File.<init>(java.io.File, java.lang.String)")
-  public static void beforeConstructor(
-      @CallSite.Argument @Nullable final File parent,
-      @CallSite.Argument @Nullable final String child) {
-    if (child != null) { // new File(parent, null) throws NPE
-      final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
-      iastCallback(parent, child);
-      raspCallback(parent, child);
+    @CallSite.Before("void java.io.File.<init>(java.io.File, java.lang.String)")
+    public static void beforeConstructor(
+            @CallSite.Argument @Nullable final File parent, @CallSite.Argument @Nullable final String child) {
+        if (child != null) { // new File(parent, null) throws NPE
+            final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
+            iastCallback(parent, child);
+            raspCallback(parent, child);
+        }
     }
-  }
 
-  @CallSite.Before("void java.io.File.<init>(java.net.URI)")
-  public static void beforeConstructor(@CallSite.Argument @Nullable final URI uri) {
-    if (uri != null) {
-      final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
-      iastCallback(uri);
-      raspCallback(uri);
+    @CallSite.Before("void java.io.File.<init>(java.net.URI)")
+    public static void beforeConstructor(@CallSite.Argument @Nullable final URI uri) {
+        if (uri != null) {
+            final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
+            iastCallback(uri);
+            raspCallback(uri);
+        }
     }
-  }
 
-  private static void iastCallback(String path) {
-    final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
-    if (module != null) {
-      try {
-        module.onPathTraversal(path);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeConstructor threw", e);
-      }
+    private static void iastCallback(String path) {
+        final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
+        if (module != null) {
+            try {
+                module.onPathTraversal(path);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeConstructor threw", e);
+            }
+        }
     }
-  }
 
-  private static void iastCallback(File parent, String child) {
-    final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
-    if (module != null) {
-      try {
-        module.onPathTraversal(parent, child);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeConstructor threw", e);
-      }
+    private static void iastCallback(File parent, String child) {
+        final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
+        if (module != null) {
+            try {
+                module.onPathTraversal(parent, child);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeConstructor threw", e);
+            }
+        }
     }
-  }
 
-  private static void iastCallback(String parent, String child) {
-    final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
-    if (module != null) {
-      try {
-        module.onPathTraversal(parent, child);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeConstructor threw", e);
-      }
+    private static void iastCallback(String parent, String child) {
+        final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
+        if (module != null) {
+            try {
+                module.onPathTraversal(parent, child);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeConstructor threw", e);
+            }
+        }
     }
-  }
 
-  private static void iastCallback(URI uri) {
-    final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
-    if (module != null) {
-      try {
-        module.onPathTraversal(uri);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeConstructor threw", e);
-      }
+    private static void iastCallback(URI uri) {
+        final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
+        if (module != null) {
+            try {
+                module.onPathTraversal(uri);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeConstructor threw", e);
+            }
+        }
     }
-  }
 
-  private static void raspCallback(File parent, String child) {
-    FileIORaspHelper.INSTANCE.beforeFileLoaded(parent, child);
-  }
+    private static void raspCallback(File parent, String child) {
+        FileIORaspHelper.INSTANCE.beforeFileLoaded(parent, child);
+    }
 
-  private static void raspCallback(String parent, String file) {
-    FileIORaspHelper.INSTANCE.beforeFileLoaded(parent, file);
-  }
+    private static void raspCallback(String parent, String file) {
+        FileIORaspHelper.INSTANCE.beforeFileLoaded(parent, file);
+    }
 
-  private static void raspCallback(String s) {
-    FileIORaspHelper.INSTANCE.beforeFileLoaded(s);
-  }
+    private static void raspCallback(String s) {
+        FileIORaspHelper.INSTANCE.beforeFileLoaded(s);
+    }
 
-  private static void raspCallback(URI uri) {
-    FileIORaspHelper.INSTANCE.beforeFileLoaded(uri);
-  }
+    private static void raspCallback(URI uri) {
+        FileIORaspHelper.INSTANCE.beforeFileLoaded(uri);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileChannelCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileChannelCallSite.java
index 0ba367fe853..b98f5527162 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileChannelCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileChannelCallSite.java
@@ -10,68 +10,68 @@
 import javax.annotation.Nullable;
 
 @CallSite(
-    spi = {RaspCallSites.class},
-    helpers = FileIORaspHelper.class)
+        spi = {RaspCallSites.class},
+        helpers = FileIORaspHelper.class)
 public class FileChannelCallSite {
 
-  @CallSite.Before(
-      "java.nio.channels.FileChannel java.nio.channels.FileChannel.open(java.nio.file.Path, java.nio.file.OpenOption[])")
-  public static void beforeOpenArray(
-      @CallSite.Argument(0) @Nullable final Path path,
-      @CallSite.Argument(1) @Nullable final OpenOption[] options) {
-    if (path != null) {
-      String pathStr = path.toString();
-      FileIORaspHelper.INSTANCE.beforeFileLoaded(pathStr);
-      if (hasWriteOption(options)) {
-        FileIORaspHelper.INSTANCE.beforeFileWritten(pathStr);
-      }
+    @CallSite.Before(
+            "java.nio.channels.FileChannel java.nio.channels.FileChannel.open(java.nio.file.Path, java.nio.file.OpenOption[])")
+    public static void beforeOpenArray(
+            @CallSite.Argument(0) @Nullable final Path path,
+            @CallSite.Argument(1) @Nullable final OpenOption[] options) {
+        if (path != null) {
+            String pathStr = path.toString();
+            FileIORaspHelper.INSTANCE.beforeFileLoaded(pathStr);
+            if (hasWriteOption(options)) {
+                FileIORaspHelper.INSTANCE.beforeFileWritten(pathStr);
+            }
+        }
     }
-  }
 
-  @CallSite.Before(
-      "java.nio.channels.FileChannel java.nio.channels.FileChannel.open(java.nio.file.Path, java.util.Set, java.nio.file.attribute.FileAttribute[])")
-  public static void beforeOpenSet(
-      @CallSite.Argument(0) @Nullable final Path path,
-      @CallSite.Argument(1) @Nullable final Set<? extends OpenOption> options,
-      @CallSite.Argument(2) @Nullable final FileAttribute<?>[] attrs) {
-    if (path != null) {
-      String pathStr = path.toString();
-      FileIORaspHelper.INSTANCE.beforeFileLoaded(pathStr);
-      if (hasWriteOption(options)) {
-        FileIORaspHelper.INSTANCE.beforeFileWritten(pathStr);
-      }
+    @CallSite.Before(
+            "java.nio.channels.FileChannel java.nio.channels.FileChannel.open(java.nio.file.Path, java.util.Set, java.nio.file.attribute.FileAttribute[])")
+    public static void beforeOpenSet(
+            @CallSite.Argument(0) @Nullable final Path path,
+            @CallSite.Argument(1) @Nullable final Set<? extends OpenOption> options,
+            @CallSite.Argument(2) @Nullable final FileAttribute<?>[] attrs) {
+        if (path != null) {
+            String pathStr = path.toString();
+            FileIORaspHelper.INSTANCE.beforeFileLoaded(pathStr);
+            if (hasWriteOption(options)) {
+                FileIORaspHelper.INSTANCE.beforeFileWritten(pathStr);
+            }
+        }
     }
-  }
 
-  private static boolean hasWriteOption(@Nullable final OpenOption[] options) {
-    if (options == null) {
-      return false;
+    private static boolean hasWriteOption(@Nullable final OpenOption[] options) {
+        if (options == null) {
+            return false;
+        }
+        for (OpenOption opt : options) {
+            if (isWriteOption(opt)) {
+                return true;
+            }
+        }
+        return false;
     }
-    for (OpenOption opt : options) {
-      if (isWriteOption(opt)) {
-        return true;
-      }
-    }
-    return false;
-  }
 
-  private static boolean hasWriteOption(@Nullable final Set<? extends OpenOption> options) {
-    if (options == null) {
-      return false;
-    }
-    for (OpenOption opt : options) {
-      if (isWriteOption(opt)) {
-        return true;
-      }
+    private static boolean hasWriteOption(@Nullable final Set<? extends OpenOption> options) {
+        if (options == null) {
+            return false;
+        }
+        for (OpenOption opt : options) {
+            if (isWriteOption(opt)) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 
-  private static boolean isWriteOption(final OpenOption opt) {
-    return opt == StandardOpenOption.WRITE
-        || opt == StandardOpenOption.APPEND
-        || opt == StandardOpenOption.CREATE
-        || opt == StandardOpenOption.CREATE_NEW
-        || opt == StandardOpenOption.TRUNCATE_EXISTING;
-  }
+    private static boolean isWriteOption(final OpenOption opt) {
+        return opt == StandardOpenOption.WRITE
+                || opt == StandardOpenOption.APPEND
+                || opt == StandardOpenOption.CREATE
+                || opt == StandardOpenOption.CREATE_NEW
+                || opt == StandardOpenOption.TRUNCATE_EXISTING;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileIORaspHelper.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileIORaspHelper.java
index 7dd48871dfe..ec6c4ab20ba 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileIORaspHelper.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileIORaspHelper.java
@@ -22,137 +22,137 @@
 
 public class FileIORaspHelper {
 
-  public static FileIORaspHelper INSTANCE = new FileIORaspHelper();
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(FileIORaspHelper.class);
-
-  private FileIORaspHelper() {
-    // prevent instantiation
-  }
-
-  public void beforeFileLoaded(@Nullable final String parent, @Nonnull final String child) {
-    try {
-      if (parent == null) {
-        beforeFileLoaded(child);
-        return;
-      }
-      String s = parent + FileSystems.getDefault().getSeparator() + child;
-      beforeFileLoaded(s);
-    } catch (final BlockingException e) {
-      // re-throw blocking exceptions
-      throw e;
-    } catch (final Throwable e) {
-      // suppress anything else
-      LOGGER.debug("Exception during LFI rasp callback", e);
+    public static FileIORaspHelper INSTANCE = new FileIORaspHelper();
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileIORaspHelper.class);
+
+    private FileIORaspHelper() {
+        // prevent instantiation
     }
-  }
-
-  public void beforeFileLoaded(@Nonnull final String first, @Nonnull final String[] more) {
-    try {
-      String separator = FileSystems.getDefault().getSeparator();
-      String s = first;
-      if (more.length > 0) {
-        s += separator + String.join(separator, more);
-      }
-      beforeFileLoaded(s);
-    } catch (final BlockingException e) {
-      // re-throw blocking exceptions
-      throw e;
-    } catch (final Throwable e) {
-      // suppress anything else
-      LOGGER.debug("Exception during LFI rasp callback", e);
+
+    public void beforeFileLoaded(@Nullable final String parent, @Nonnull final String child) {
+        try {
+            if (parent == null) {
+                beforeFileLoaded(child);
+                return;
+            }
+            String s = parent + FileSystems.getDefault().getSeparator() + child;
+            beforeFileLoaded(s);
+        } catch (final BlockingException e) {
+            // re-throw blocking exceptions
+            throw e;
+        } catch (final Throwable e) {
+            // suppress anything else
+            LOGGER.debug("Exception during LFI rasp callback", e);
+        }
     }
-  }
-
-  public void beforeFileLoaded(@Nonnull final URI uri) {
-    try {
-      beforeFileLoaded(uri.toString());
-    } catch (final BlockingException e) {
-      // re-throw blocking exceptions
-      throw e;
-    } catch (final Throwable e) {
-      // suppress anything else
-      LOGGER.debug("Exception during LFI rasp callback", e);
+
+    public void beforeFileLoaded(@Nonnull final String first, @Nonnull final String[] more) {
+        try {
+            String separator = FileSystems.getDefault().getSeparator();
+            String s = first;
+            if (more.length > 0) {
+                s += separator + String.join(separator, more);
+            }
+            beforeFileLoaded(s);
+        } catch (final BlockingException e) {
+            // re-throw blocking exceptions
+            throw e;
+        } catch (final Throwable e) {
+            // suppress anything else
+            LOGGER.debug("Exception during LFI rasp callback", e);
+        }
     }
-  }
-
-  public void beforeFileLoaded(@Nullable final File parent, @Nonnull final String child) {
-    try {
-      if (parent == null) {
-        beforeFileLoaded(child);
-        return;
-      }
-      String s = parent + FileSystems.getDefault().getSeparator() + child;
-      beforeFileLoaded(s);
-    } catch (final BlockingException e) {
-      // re-throw blocking exceptions
-      throw e;
-    } catch (final Throwable e) {
-      // suppress anything else
-      LOGGER.debug("Exception during LFI rasp callback", e);
+
+    public void beforeFileLoaded(@Nonnull final URI uri) {
+        try {
+            beforeFileLoaded(uri.toString());
+        } catch (final BlockingException e) {
+            // re-throw blocking exceptions
+            throw e;
+        } catch (final Throwable e) {
+            // suppress anything else
+            LOGGER.debug("Exception during LFI rasp callback", e);
+        }
     }
-  }
-
-  public void beforeFileLoaded(@Nonnull final String path) {
-    invokeRaspCallback(EVENTS.fileLoaded(), path);
-  }
-
-  public void beforeFileWritten(@Nonnull final String path) {
-    invokeRaspCallback(EVENTS.fileWritten(), path);
-  }
-
-  /**
-   * Fires {@link #beforeFileLoaded} for read modes ("r"), and both {@link #beforeFileLoaded} and
-   * {@link #beforeFileWritten} for write modes ("rw", "rws", "rwd").
-   */
-  public void beforeRandomAccessFileOpened(@Nonnull final String path, @Nonnull final String mode) {
-    // "r" = read only; "rw", "rws", "rwd" = read + write
-    beforeFileLoaded(path);
-    if (mode.length() > 1) {
-      beforeFileWritten(path);
+
+    public void beforeFileLoaded(@Nullable final File parent, @Nonnull final String child) {
+        try {
+            if (parent == null) {
+                beforeFileLoaded(child);
+                return;
+            }
+            String s = parent + FileSystems.getDefault().getSeparator() + child;
+            beforeFileLoaded(s);
+        } catch (final BlockingException e) {
+            // re-throw blocking exceptions
+            throw e;
+        } catch (final Throwable e) {
+            // suppress anything else
+            LOGGER.debug("Exception during LFI rasp callback", e);
+        }
+    }
+
+    public void beforeFileLoaded(@Nonnull final String path) {
+        invokeRaspCallback(EVENTS.fileLoaded(), path);
+    }
+
+    public void beforeFileWritten(@Nonnull final String path) {
+        invokeRaspCallback(EVENTS.fileWritten(), path);
     }
-  }
 
-  private void invokeRaspCallback(
-      EventType<BiFunction<RequestContext, String, Flow<Void>>> eventType,
-      @Nonnull final String path) {
-    if (!Config.get().isAppSecRaspEnabled()) {
-      return;
+    /**
+     * Fires {@link #beforeFileLoaded} for read modes ("r"), and both {@link #beforeFileLoaded} and
+     * {@link #beforeFileWritten} for write modes ("rw", "rws", "rwd").
+     */
+    public void beforeRandomAccessFileOpened(@Nonnull final String path, @Nonnull final String mode) {
+        // "r" = read only; "rw", "rws", "rwd" = read + write
+        beforeFileLoaded(path);
+        if (mode.length() > 1) {
+            beforeFileWritten(path);
+        }
     }
-    try {
-      final BiFunction<RequestContext, String, Flow<Void>> callback =
-          AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC).getCallback(eventType);
-
-      if (callback == null) {
-        return;
-      }
-
-      final AgentSpan span = AgentTracer.get().activeSpan();
-      if (span == null) {
-        return;
-      }
-
-      final RequestContext ctx = span.getRequestContext();
-      if (ctx == null) {
-        return;
-      }
-
-      Flow<Void> flow = callback.apply(ctx, path);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        BlockResponseFunction brf = ctx.getBlockResponseFunction();
-        if (brf != null) {
-          Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-          brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
+
+    private void invokeRaspCallback(
+            EventType<BiFunction<RequestContext, String, Flow<Void>>> eventType, @Nonnull final String path) {
+        if (!Config.get().isAppSecRaspEnabled()) {
+            return;
+        }
+        try {
+            final BiFunction<RequestContext, String, Flow<Void>> callback = AgentTracer.get()
+                    .getCallbackProvider(RequestContextSlot.APPSEC)
+                    .getCallback(eventType);
+
+            if (callback == null) {
+                return;
+            }
+
+            final AgentSpan span = AgentTracer.get().activeSpan();
+            if (span == null) {
+                return;
+            }
+
+            final RequestContext ctx = span.getRequestContext();
+            if (ctx == null) {
+                return;
+            }
+
+            Flow<Void> flow = callback.apply(ctx, path);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                BlockResponseFunction brf = ctx.getBlockResponseFunction();
+                if (brf != null) {
+                    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                    brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
+                }
+                throw new BlockingException("Blocked request (for LFI attempt)");
+            }
+        } catch (final BlockingException e) {
+            // re-throw blocking exceptions
+            throw e;
+        } catch (final Throwable e) {
+            // suppress anything else
+            LOGGER.debug("Exception during LFI rasp callback", e);
         }
-        throw new BlockingException("Blocked request (for LFI attempt)");
-      }
-    } catch (final BlockingException e) {
-      // re-throw blocking exceptions
-      throw e;
-    } catch (final Throwable e) {
-      // suppress anything else
-      LOGGER.debug("Exception during LFI rasp callback", e);
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileInputStreamCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileInputStreamCallSite.java
index 9772ebadddb..ab60ca5c714 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileInputStreamCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileInputStreamCallSite.java
@@ -12,37 +12,37 @@
 
 @Sink(VulnerabilityTypes.PATH_TRAVERSAL)
 @CallSite(
-    spi = {IastCallSites.class, RaspCallSites.class},
-    helpers = FileIORaspHelper.class)
+        spi = {IastCallSites.class, RaspCallSites.class},
+        helpers = FileIORaspHelper.class)
 public class FileInputStreamCallSite {
 
-  @CallSite.Before("void java.io.FileInputStream.<init>(java.lang.String)")
-  public static void beforeConstructor(@CallSite.Argument @Nullable final String path) {
-    if (path != null) {
-      iastCallback(path);
-      raspCallback(path);
+    @CallSite.Before("void java.io.FileInputStream.<init>(java.lang.String)")
+    public static void beforeConstructor(@CallSite.Argument @Nullable final String path) {
+        if (path != null) {
+            iastCallback(path);
+            raspCallback(path);
+        }
     }
-  }
 
-  @CallSite.Before("void java.io.FileInputStream.<init>(java.io.File)")
-  public static void beforeConstructorFile(@CallSite.Argument @Nullable final File file) {
-    if (file != null) {
-      raspCallback(file.getPath());
+    @CallSite.Before("void java.io.FileInputStream.<init>(java.io.File)")
+    public static void beforeConstructorFile(@CallSite.Argument @Nullable final File file) {
+        if (file != null) {
+            raspCallback(file.getPath());
+        }
     }
-  }
 
-  private static void iastCallback(String path) {
-    final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
-    if (module != null) {
-      try {
-        module.onPathTraversal(path);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeConstructor threw", e);
-      }
+    private static void iastCallback(String path) {
+        final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
+        if (module != null) {
+            try {
+                module.onPathTraversal(path);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeConstructor threw", e);
+            }
+        }
     }
-  }
 
-  private static void raspCallback(String path) {
-    FileIORaspHelper.INSTANCE.beforeFileLoaded(path);
-  }
+    private static void raspCallback(String path) {
+        FileIORaspHelper.INSTANCE.beforeFileLoaded(path);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileOutputStreamCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileOutputStreamCallSite.java
index 5f6dc215be3..b678e14074a 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileOutputStreamCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileOutputStreamCallSite.java
@@ -12,39 +12,39 @@
 
 @Sink(VulnerabilityTypes.PATH_TRAVERSAL)
 @CallSite(
-    spi = {IastCallSites.class, RaspCallSites.class},
-    helpers = FileIORaspHelper.class)
+        spi = {IastCallSites.class, RaspCallSites.class},
+        helpers = FileIORaspHelper.class)
 public class FileOutputStreamCallSite {
 
-  @CallSite.Before("void java.io.FileOutputStream.<init>(java.lang.String)")
-  @CallSite.Before("void java.io.FileOutputStream.<init>(java.lang.String, boolean)")
-  public static void beforeConstructor(@CallSite.Argument(0) @Nullable final String path) {
-    if (path != null) {
-      iastCallback(path);
-      raspCallback(path);
+    @CallSite.Before("void java.io.FileOutputStream.<init>(java.lang.String)")
+    @CallSite.Before("void java.io.FileOutputStream.<init>(java.lang.String, boolean)")
+    public static void beforeConstructor(@CallSite.Argument(0) @Nullable final String path) {
+        if (path != null) {
+            iastCallback(path);
+            raspCallback(path);
+        }
     }
-  }
 
-  @CallSite.Before("void java.io.FileOutputStream.<init>(java.io.File)")
-  @CallSite.Before("void java.io.FileOutputStream.<init>(java.io.File, boolean)")
-  public static void beforeConstructorFile(@CallSite.Argument(0) @Nullable final File file) {
-    if (file != null) {
-      raspCallback(file.getPath());
+    @CallSite.Before("void java.io.FileOutputStream.<init>(java.io.File)")
+    @CallSite.Before("void java.io.FileOutputStream.<init>(java.io.File, boolean)")
+    public static void beforeConstructorFile(@CallSite.Argument(0) @Nullable final File file) {
+        if (file != null) {
+            raspCallback(file.getPath());
+        }
     }
-  }
 
-  private static void iastCallback(String path) {
-    final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
-    if (module != null) {
-      try {
-        module.onPathTraversal(path);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeConstructor threw", e);
-      }
+    private static void iastCallback(String path) {
+        final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
+        if (module != null) {
+            try {
+                module.onPathTraversal(path);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeConstructor threw", e);
+            }
+        }
     }
-  }
 
-  private static void raspCallback(String path) {
-    FileIORaspHelper.INSTANCE.beforeFileWritten(path);
-  }
+    private static void raspCallback(String path) {
+        FileIORaspHelper.INSTANCE.beforeFileWritten(path);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileReaderCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileReaderCallSite.java
index 808a2b8dfcd..78b44b04a7d 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileReaderCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileReaderCallSite.java
@@ -6,29 +6,29 @@
 import javax.annotation.Nullable;
 
 @CallSite(
-    spi = {RaspCallSites.class},
-    helpers = FileIORaspHelper.class)
+        spi = {RaspCallSites.class},
+        helpers = FileIORaspHelper.class)
 public class FileReaderCallSite {
 
-  @CallSite.Before("void java.io.FileReader.<init>(java.lang.String)")
-  // Java 11+: FileReader(String, Charset)
-  @CallSite.Before("void java.io.FileReader.<init>(java.lang.String, java.nio.charset.Charset)")
-  public static void beforeConstructor(@CallSite.Argument(0) @Nullable final String path) {
-    if (path != null) {
-      raspCallback(path);
+    @CallSite.Before("void java.io.FileReader.<init>(java.lang.String)")
+    // Java 11+: FileReader(String, Charset)
+    @CallSite.Before("void java.io.FileReader.<init>(java.lang.String, java.nio.charset.Charset)")
+    public static void beforeConstructor(@CallSite.Argument(0) @Nullable final String path) {
+        if (path != null) {
+            raspCallback(path);
+        }
     }
-  }
 
-  @CallSite.Before("void java.io.FileReader.<init>(java.io.File)")
-  // Java 11+: FileReader(File, Charset)
-  @CallSite.Before("void java.io.FileReader.<init>(java.io.File, java.nio.charset.Charset)")
-  public static void beforeConstructorFile(@CallSite.Argument(0) @Nullable final File file) {
-    if (file != null) {
-      raspCallback(file.getPath());
+    @CallSite.Before("void java.io.FileReader.<init>(java.io.File)")
+    // Java 11+: FileReader(File, Charset)
+    @CallSite.Before("void java.io.FileReader.<init>(java.io.File, java.nio.charset.Charset)")
+    public static void beforeConstructorFile(@CallSite.Argument(0) @Nullable final File file) {
+        if (file != null) {
+            raspCallback(file.getPath());
+        }
     }
-  }
 
-  private static void raspCallback(final String path) {
-    FileIORaspHelper.INSTANCE.beforeFileLoaded(path);
-  }
+    private static void raspCallback(final String path) {
+        FileIORaspHelper.INSTANCE.beforeFileLoaded(path);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileWriterCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileWriterCallSite.java
index c6a4bb98acb..412ba35cc4c 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileWriterCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileWriterCallSite.java
@@ -6,35 +6,33 @@
 import javax.annotation.Nullable;
 
 @CallSite(
-    spi = {RaspCallSites.class},
-    helpers = FileIORaspHelper.class)
+        spi = {RaspCallSites.class},
+        helpers = FileIORaspHelper.class)
 public class FileWriterCallSite {
 
-  @CallSite.Before("void java.io.FileWriter.<init>(java.lang.String)")
-  @CallSite.Before("void java.io.FileWriter.<init>(java.lang.String, boolean)")
-  // Java 11+: FileWriter(String, Charset) and FileWriter(String, Charset, boolean)
-  @CallSite.Before("void java.io.FileWriter.<init>(java.lang.String, java.nio.charset.Charset)")
-  @CallSite.Before(
-      "void java.io.FileWriter.<init>(java.lang.String, java.nio.charset.Charset, boolean)")
-  public static void beforeConstructor(@CallSite.Argument(0) @Nullable final String path) {
-    if (path != null) {
-      raspCallback(path);
+    @CallSite.Before("void java.io.FileWriter.<init>(java.lang.String)")
+    @CallSite.Before("void java.io.FileWriter.<init>(java.lang.String, boolean)")
+    // Java 11+: FileWriter(String, Charset) and FileWriter(String, Charset, boolean)
+    @CallSite.Before("void java.io.FileWriter.<init>(java.lang.String, java.nio.charset.Charset)")
+    @CallSite.Before("void java.io.FileWriter.<init>(java.lang.String, java.nio.charset.Charset, boolean)")
+    public static void beforeConstructor(@CallSite.Argument(0) @Nullable final String path) {
+        if (path != null) {
+            raspCallback(path);
+        }
     }
-  }
 
-  @CallSite.Before("void java.io.FileWriter.<init>(java.io.File)")
-  @CallSite.Before("void java.io.FileWriter.<init>(java.io.File, boolean)")
-  // Java 11+: FileWriter(File, Charset) and FileWriter(File, Charset, boolean)
-  @CallSite.Before("void java.io.FileWriter.<init>(java.io.File, java.nio.charset.Charset)")
-  @CallSite.Before(
-      "void java.io.FileWriter.<init>(java.io.File, java.nio.charset.Charset, boolean)")
-  public static void beforeConstructorFile(@CallSite.Argument(0) @Nullable final File file) {
-    if (file != null) {
-      raspCallback(file.getPath());
+    @CallSite.Before("void java.io.FileWriter.<init>(java.io.File)")
+    @CallSite.Before("void java.io.FileWriter.<init>(java.io.File, boolean)")
+    // Java 11+: FileWriter(File, Charset) and FileWriter(File, Charset, boolean)
+    @CallSite.Before("void java.io.FileWriter.<init>(java.io.File, java.nio.charset.Charset)")
+    @CallSite.Before("void java.io.FileWriter.<init>(java.io.File, java.nio.charset.Charset, boolean)")
+    public static void beforeConstructorFile(@CallSite.Argument(0) @Nullable final File file) {
+        if (file != null) {
+            raspCallback(file.getPath());
+        }
     }
-  }
 
-  private static void raspCallback(final String path) {
-    FileIORaspHelper.INSTANCE.beforeFileWritten(path);
-  }
+    private static void raspCallback(final String path) {
+        FileIORaspHelper.INSTANCE.beforeFileWritten(path);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FilesCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FilesCallSite.java
index e1a5031e3ac..8469c073cb3 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FilesCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FilesCallSite.java
@@ -6,93 +6,88 @@
 import javax.annotation.Nullable;
 
 @CallSite(
-    spi = {RaspCallSites.class},
-    helpers = FileIORaspHelper.class)
+        spi = {RaspCallSites.class},
+        helpers = FileIORaspHelper.class)
 public class FilesCallSite {
 
-  // ===================== WRITE =====================
+    // ===================== WRITE =====================
 
-  @CallSite.Before(
-      "java.io.OutputStream java.nio.file.Files.newOutputStream(java.nio.file.Path, java.nio.file.OpenOption[])")
-  @CallSite.Before(
-      "java.nio.file.Path java.nio.file.Files.write(java.nio.file.Path, byte[], java.nio.file.OpenOption[])")
-  @CallSite.Before(
-      "java.nio.file.Path java.nio.file.Files.write(java.nio.file.Path, java.lang.Iterable, java.nio.charset.Charset, java.nio.file.OpenOption[])")
-  @CallSite.Before(
-      "java.nio.file.Path java.nio.file.Files.write(java.nio.file.Path, java.lang.Iterable, java.nio.file.OpenOption[])")
-  // Java 11+: Files.writeString variants
-  @CallSite.Before(
-      "java.nio.file.Path java.nio.file.Files.writeString(java.nio.file.Path, java.lang.CharSequence, java.nio.file.OpenOption[])")
-  @CallSite.Before(
-      "java.nio.file.Path java.nio.file.Files.writeString(java.nio.file.Path, java.lang.CharSequence, java.nio.charset.Charset, java.nio.file.OpenOption[])")
-  @CallSite.Before(
-      "java.io.BufferedWriter java.nio.file.Files.newBufferedWriter(java.nio.file.Path, java.nio.charset.Charset, java.nio.file.OpenOption[])")
-  @CallSite.Before(
-      "java.io.BufferedWriter java.nio.file.Files.newBufferedWriter(java.nio.file.Path, java.nio.file.OpenOption[])")
-  public static void beforeWrite(@CallSite.Argument(0) @Nullable final Path path) {
-    if (path != null) {
-      FileIORaspHelper.INSTANCE.beforeFileWritten(path.toString());
+    @CallSite.Before(
+            "java.io.OutputStream java.nio.file.Files.newOutputStream(java.nio.file.Path, java.nio.file.OpenOption[])")
+    @CallSite.Before(
+            "java.nio.file.Path java.nio.file.Files.write(java.nio.file.Path, byte[], java.nio.file.OpenOption[])")
+    @CallSite.Before(
+            "java.nio.file.Path java.nio.file.Files.write(java.nio.file.Path, java.lang.Iterable, java.nio.charset.Charset, java.nio.file.OpenOption[])")
+    @CallSite.Before(
+            "java.nio.file.Path java.nio.file.Files.write(java.nio.file.Path, java.lang.Iterable, java.nio.file.OpenOption[])")
+    // Java 11+: Files.writeString variants
+    @CallSite.Before(
+            "java.nio.file.Path java.nio.file.Files.writeString(java.nio.file.Path, java.lang.CharSequence, java.nio.file.OpenOption[])")
+    @CallSite.Before(
+            "java.nio.file.Path java.nio.file.Files.writeString(java.nio.file.Path, java.lang.CharSequence, java.nio.charset.Charset, java.nio.file.OpenOption[])")
+    @CallSite.Before(
+            "java.io.BufferedWriter java.nio.file.Files.newBufferedWriter(java.nio.file.Path, java.nio.charset.Charset, java.nio.file.OpenOption[])")
+    @CallSite.Before(
+            "java.io.BufferedWriter java.nio.file.Files.newBufferedWriter(java.nio.file.Path, java.nio.file.OpenOption[])")
+    public static void beforeWrite(@CallSite.Argument(0) @Nullable final Path path) {
+        if (path != null) {
+            FileIORaspHelper.INSTANCE.beforeFileWritten(path.toString());
+        }
     }
-  }
 
-  @CallSite.Before(
-      "long java.nio.file.Files.copy(java.io.InputStream, java.nio.file.Path, java.nio.file.CopyOption[])")
-  public static void beforeCopyFromStream(@CallSite.Argument(1) @Nullable final Path target) {
-    if (target != null) {
-      FileIORaspHelper.INSTANCE.beforeFileWritten(target.toString());
+    @CallSite.Before(
+            "long java.nio.file.Files.copy(java.io.InputStream, java.nio.file.Path, java.nio.file.CopyOption[])")
+    public static void beforeCopyFromStream(@CallSite.Argument(1) @Nullable final Path target) {
+        if (target != null) {
+            FileIORaspHelper.INSTANCE.beforeFileWritten(target.toString());
+        }
     }
-  }
 
-  @CallSite.Before(
-      "java.nio.file.Path java.nio.file.Files.copy(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption[])")
-  public static void beforeCopyPathToPath(
-      @CallSite.Argument(0) @Nullable final Path source,
-      @CallSite.Argument(1) @Nullable final Path target) {
-    if (source != null) {
-      FileIORaspHelper.INSTANCE.beforeFileLoaded(source.toString());
+    @CallSite.Before(
+            "java.nio.file.Path java.nio.file.Files.copy(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption[])")
+    public static void beforeCopyPathToPath(
+            @CallSite.Argument(0) @Nullable final Path source, @CallSite.Argument(1) @Nullable final Path target) {
+        if (source != null) {
+            FileIORaspHelper.INSTANCE.beforeFileLoaded(source.toString());
+        }
+        if (target != null) {
+            FileIORaspHelper.INSTANCE.beforeFileWritten(target.toString());
+        }
     }
-    if (target != null) {
-      FileIORaspHelper.INSTANCE.beforeFileWritten(target.toString());
-    }
-  }
 
-  @CallSite.Before(
-      "java.nio.file.Path java.nio.file.Files.move(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption[])")
-  public static void beforeMove(@CallSite.Argument(1) @Nullable final Path target) {
-    if (target != null) {
-      FileIORaspHelper.INSTANCE.beforeFileWritten(target.toString());
+    @CallSite.Before(
+            "java.nio.file.Path java.nio.file.Files.move(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption[])")
+    public static void beforeMove(@CallSite.Argument(1) @Nullable final Path target) {
+        if (target != null) {
+            FileIORaspHelper.INSTANCE.beforeFileWritten(target.toString());
+        }
     }
-  }
 
-  @CallSite.Before("long java.nio.file.Files.copy(java.nio.file.Path, java.io.OutputStream)")
-  public static void beforeCopyToStream(@CallSite.Argument(0) @Nullable final Path source) {
-    if (source != null) {
-      FileIORaspHelper.INSTANCE.beforeFileLoaded(source.toString());
+    @CallSite.Before("long java.nio.file.Files.copy(java.nio.file.Path, java.io.OutputStream)")
+    public static void beforeCopyToStream(@CallSite.Argument(0) @Nullable final Path source) {
+        if (source != null) {
+            FileIORaspHelper.INSTANCE.beforeFileLoaded(source.toString());
+        }
     }
-  }
 
-  // ===================== READ =====================
+    // ===================== READ =====================
 
-  @CallSite.Before(
-      "java.io.InputStream java.nio.file.Files.newInputStream(java.nio.file.Path, java.nio.file.OpenOption[])")
-  @CallSite.Before("byte[] java.nio.file.Files.readAllBytes(java.nio.file.Path)")
-  @CallSite.Before(
-      "java.util.List java.nio.file.Files.readAllLines(java.nio.file.Path, java.nio.charset.Charset)")
-  @CallSite.Before("java.util.List java.nio.file.Files.readAllLines(java.nio.file.Path)")
-  // Java 11+: Files.readString variants
-  @CallSite.Before("java.lang.String java.nio.file.Files.readString(java.nio.file.Path)")
-  @CallSite.Before(
-      "java.lang.String java.nio.file.Files.readString(java.nio.file.Path, java.nio.charset.Charset)")
-  @CallSite.Before(
-      "java.io.BufferedReader java.nio.file.Files.newBufferedReader(java.nio.file.Path, java.nio.charset.Charset)")
-  @CallSite.Before(
-      "java.io.BufferedReader java.nio.file.Files.newBufferedReader(java.nio.file.Path)")
-  @CallSite.Before(
-      "java.util.stream.Stream java.nio.file.Files.lines(java.nio.file.Path, java.nio.charset.Charset)")
-  @CallSite.Before("java.util.stream.Stream java.nio.file.Files.lines(java.nio.file.Path)")
-  public static void beforeRead(@CallSite.Argument(0) @Nullable final Path path) {
-    if (path != null) {
-      FileIORaspHelper.INSTANCE.beforeFileLoaded(path.toString());
+    @CallSite.Before(
+            "java.io.InputStream java.nio.file.Files.newInputStream(java.nio.file.Path, java.nio.file.OpenOption[])")
+    @CallSite.Before("byte[] java.nio.file.Files.readAllBytes(java.nio.file.Path)")
+    @CallSite.Before("java.util.List java.nio.file.Files.readAllLines(java.nio.file.Path, java.nio.charset.Charset)")
+    @CallSite.Before("java.util.List java.nio.file.Files.readAllLines(java.nio.file.Path)")
+    // Java 11+: Files.readString variants
+    @CallSite.Before("java.lang.String java.nio.file.Files.readString(java.nio.file.Path)")
+    @CallSite.Before("java.lang.String java.nio.file.Files.readString(java.nio.file.Path, java.nio.charset.Charset)")
+    @CallSite.Before(
+            "java.io.BufferedReader java.nio.file.Files.newBufferedReader(java.nio.file.Path, java.nio.charset.Charset)")
+    @CallSite.Before("java.io.BufferedReader java.nio.file.Files.newBufferedReader(java.nio.file.Path)")
+    @CallSite.Before("java.util.stream.Stream java.nio.file.Files.lines(java.nio.file.Path, java.nio.charset.Charset)")
+    @CallSite.Before("java.util.stream.Stream java.nio.file.Files.lines(java.nio.file.Path)")
+    public static void beforeRead(@CallSite.Argument(0) @Nullable final Path path) {
+        if (path != null) {
+            FileIORaspHelper.INSTANCE.beforeFileLoaded(path.toString());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java
index e78f162fffd..271c517a638 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java
@@ -18,50 +18,49 @@
 
 @AutoService(InstrumenterModule.class)
 public class InputStreamInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  private static final String[] PRELOAD_CLASS_NAMES = {"java.io.PushbackInputStream"};
+    private static final String[] PRELOAD_CLASS_NAMES = {"java.io.PushbackInputStream"};
 
-  public InputStreamInstrumentation() {
-    super("inputStream");
-  }
+    public InputStreamInstrumentation() {
+        super("inputStream");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null;
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null;
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("java.io.InputStream"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("java.io.InputStream"));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(0, InputStream.class)),
-        InputStreamInstrumentation.class.getName() + "$InputStreamAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(0, InputStream.class)),
+                InputStreamInstrumentation.class.getName() + "$InputStreamAdvice");
+    }
 
-  @Override
-  public String[] preloadClassNames() {
-    return PRELOAD_CLASS_NAMES;
-  }
+    @Override
+    public String[] preloadClassNames() {
+        return PRELOAD_CLASS_NAMES;
+    }
 
-  public static class InputStreamAdvice {
+    public static class InputStreamAdvice {
 
-    @Advice.OnMethodExit
-    @Propagation
-    public static void onExit(
-        @Advice.This final InputStream self, @Advice.Argument(0) final InputStream param) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      try {
-        if (module != null) {
-          module.taintObjectIfTainted(self, param);
+        @Advice.OnMethodExit
+        @Propagation
+        public static void onExit(@Advice.This final InputStream self, @Advice.Argument(0) final InputStream param) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            try {
+                if (module != null) {
+                    module.taintObjectIfTainted(self, param);
+                }
+            } catch (final Throwable e) {
+                module.onUnexpectedException("InputStreamAdvice onExit threw", e);
+            }
         }
-      } catch (final Throwable e) {
-        module.onUnexpectedException("InputStreamAdvice onExit threw", e);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java
index 444879d51b5..8a31122c2bc 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java
@@ -12,20 +12,19 @@
 @CallSite(spi = IastCallSites.class)
 public class InputStreamReaderCallSite {
 
-  @CallSite.After("void java.io.InputStreamReader.<init>(java.io.InputStream)")
-  @CallSite.After(
-      "void java.io.InputStreamReader.<init>(java.io.InputStream, java.nio.charset.Charset)")
-  public static InputStreamReader afterInit(
-      @CallSite.AllArguments @Nonnull final Object[] params,
-      @CallSite.Return @Nonnull final InputStreamReader result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintObjectIfTainted(result, params[0]);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterInit threw", e);
-      }
+    @CallSite.After("void java.io.InputStreamReader.<init>(java.io.InputStream)")
+    @CallSite.After("void java.io.InputStreamReader.<init>(java.io.InputStream, java.nio.charset.Charset)")
+    public static InputStreamReader afterInit(
+            @CallSite.AllArguments @Nonnull final Object[] params,
+            @CallSite.Return @Nonnull final InputStreamReader result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintObjectIfTainted(result, params[0]);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterInit threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ObjectInputStreamCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ObjectInputStreamCallSite.java
index fc2e7ed6262..a1338b16121 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ObjectInputStreamCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ObjectInputStreamCallSite.java
@@ -12,16 +12,16 @@
 @CallSite(spi = IastCallSites.class)
 public class ObjectInputStreamCallSite {
 
-  @CallSite.Before("void java.io.ObjectInputStream.<init>(java.io.InputStream)")
-  public static void beforeConstructorUntrusted(@CallSite.Argument(0) final InputStream is) {
-    final UntrustedDeserializationModule module = InstrumentationBridge.UNTRUSTED_DESERIALIZATION;
+    @CallSite.Before("void java.io.ObjectInputStream.<init>(java.io.InputStream)")
+    public static void beforeConstructorUntrusted(@CallSite.Argument(0) final InputStream is) {
+        final UntrustedDeserializationModule module = InstrumentationBridge.UNTRUSTED_DESERIALIZATION;
 
-    if (module != null) {
-      try {
-        module.onObject(is);
-      } catch (Throwable e) {
-        module.onUnexpectedException("before constructor untrusted threw", e);
-      }
+        if (module != null) {
+            try {
+                module.onObject(is);
+            } catch (Throwable e) {
+                module.onUnexpectedException("before constructor untrusted threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathCallSite.java
index 38a80b60141..a7c20670eea 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathCallSite.java
@@ -12,39 +12,39 @@
 
 @Sink(VulnerabilityTypes.PATH_TRAVERSAL)
 @CallSite(
-    spi = {IastCallSites.class, RaspCallSites.class},
-    helpers = FileIORaspHelper.class)
+        spi = {IastCallSites.class, RaspCallSites.class},
+        helpers = FileIORaspHelper.class)
 public class PathCallSite {
 
-  @CallSite.Before("java.nio.file.Path java.nio.file.Path.resolve(java.lang.String)")
-  @CallSite.Before("java.nio.file.Path java.nio.file.Path.resolveSibling(java.lang.String)")
-  public static void beforeResolve(@CallSite.Argument @Nullable final String other) {
-    if (other != null) {
-      iastCallback(other);
-      raspCallback(other);
+    @CallSite.Before("java.nio.file.Path java.nio.file.Path.resolve(java.lang.String)")
+    @CallSite.Before("java.nio.file.Path java.nio.file.Path.resolveSibling(java.lang.String)")
+    public static void beforeResolve(@CallSite.Argument @Nullable final String other) {
+        if (other != null) {
+            iastCallback(other);
+            raspCallback(other);
+        }
     }
-  }
 
-  @CallSite.Before("java.nio.file.Path java.nio.file.Path.resolve(java.nio.file.Path)")
-  @CallSite.Before("java.nio.file.Path java.nio.file.Path.resolveSibling(java.nio.file.Path)")
-  public static void beforeResolveWithPath(@CallSite.Argument @Nullable final Path other) {
-    if (other != null) {
-      raspCallback(other.toString());
+    @CallSite.Before("java.nio.file.Path java.nio.file.Path.resolve(java.nio.file.Path)")
+    @CallSite.Before("java.nio.file.Path java.nio.file.Path.resolveSibling(java.nio.file.Path)")
+    public static void beforeResolveWithPath(@CallSite.Argument @Nullable final Path other) {
+        if (other != null) {
+            raspCallback(other.toString());
+        }
     }
-  }
 
-  private static void iastCallback(String other) {
-    final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
-    if (module != null) {
-      try {
-        module.onPathTraversal(other);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeResolve threw", e);
-      }
+    private static void iastCallback(String other) {
+        final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
+        if (module != null) {
+            try {
+                module.onPathTraversal(other);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeResolve threw", e);
+            }
+        }
     }
-  }
 
-  private static void raspCallback(String other) {
-    FileIORaspHelper.INSTANCE.beforeFileLoaded(other);
-  }
+    private static void raspCallback(String other) {
+        FileIORaspHelper.INSTANCE.beforeFileLoaded(other);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathsCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathsCallSite.java
index 020635feb4e..8cff9afada3 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathsCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathsCallSite.java
@@ -12,73 +12,70 @@
 
 @Sink(VulnerabilityTypes.PATH_TRAVERSAL)
 @CallSite(
-    spi = {IastCallSites.class, RaspCallSites.class},
-    helpers = FileIORaspHelper.class)
+        spi = {IastCallSites.class, RaspCallSites.class},
+        helpers = FileIORaspHelper.class)
 public class PathsCallSite {
 
-  @CallSite.Before(
-      "java.nio.file.Path java.nio.file.Paths.get(java.lang.String, java.lang.String[])")
-  public static void beforeGet(
-      @CallSite.Argument @Nullable final String first,
-      @CallSite.Argument @Nullable final String[] more) {
-    if (first != null && more != null) { // both parameters should be not null
-      iastCallback(first, more);
-      raspCallback(first, more);
+    @CallSite.Before("java.nio.file.Path java.nio.file.Paths.get(java.lang.String, java.lang.String[])")
+    public static void beforeGet(
+            @CallSite.Argument @Nullable final String first, @CallSite.Argument @Nullable final String[] more) {
+        if (first != null && more != null) { // both parameters should be not null
+            iastCallback(first, more);
+            raspCallback(first, more);
+        }
     }
-  }
 
-  @CallSite.Before("java.nio.file.Path java.nio.file.Paths.get(java.net.URI)")
-  public static void beforeGet(@CallSite.Argument @Nullable final URI uri) {
-    if (uri != null) {
-      iastCallback(uri);
-      raspCallback(uri);
+    @CallSite.Before("java.nio.file.Path java.nio.file.Paths.get(java.net.URI)")
+    public static void beforeGet(@CallSite.Argument @Nullable final URI uri) {
+        if (uri != null) {
+            iastCallback(uri);
+            raspCallback(uri);
+        }
     }
-  }
 
-  // Java 11+: Path.of — equivalent to Paths.get but defined on the Path interface
-  @CallSite.Before("java.nio.file.Path java.nio.file.Path.of(java.lang.String, java.lang.String[])")
-  public static void beforeOf(
-      @CallSite.Argument @Nullable final String first,
-      @CallSite.Argument @Nullable final String[] more) {
-    if (first != null && more != null) {
-      raspCallback(first, more);
+    // Java 11+: Path.of — equivalent to Paths.get but defined on the Path interface
+    @CallSite.Before("java.nio.file.Path java.nio.file.Path.of(java.lang.String, java.lang.String[])")
+    public static void beforeOf(
+            @CallSite.Argument @Nullable final String first, @CallSite.Argument @Nullable final String[] more) {
+        if (first != null && more != null) {
+            raspCallback(first, more);
+        }
     }
-  }
 
-  @CallSite.Before("java.nio.file.Path java.nio.file.Path.of(java.net.URI)")
-  public static void beforeOfUri(@CallSite.Argument @Nullable final URI uri) {
-    if (uri != null) {
-      raspCallback(uri);
+    @CallSite.Before("java.nio.file.Path java.nio.file.Path.of(java.net.URI)")
+    public static void beforeOfUri(@CallSite.Argument @Nullable final URI uri) {
+        if (uri != null) {
+            raspCallback(uri);
+        }
     }
-  }
 
-  private static void iastCallback(URI uri) {
-    final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
-    if (module != null) {
-      try {
-        module.onPathTraversal(uri);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeGet threw", e);
-      }
+    private static void iastCallback(URI uri) {
+        final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
+        if (module != null) {
+            try {
+                module.onPathTraversal(uri);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeGet threw", e);
+            }
+        }
     }
-  }
 
-  private static void iastCallback(String first, String[] more) {
-    final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
-    if (module != null) {
-      try {
-        module.onPathTraversal(first, more);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeGet threw", e);
-      }
+    private static void iastCallback(String first, String[] more) {
+        final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
+        if (module != null) {
+            try {
+                module.onPathTraversal(first, more);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeGet threw", e);
+            }
+        }
     }
-  }
 
-  private static void raspCallback(String first, String[] more) {
-    FileIORaspHelper.INSTANCE.beforeFileLoaded(first, more);
-  }
+    private static void raspCallback(String first, String[] more) {
+        FileIORaspHelper.INSTANCE.beforeFileLoaded(first, more);
+    }
 
-  private static void raspCallback(URI uri) {
-    FileIORaspHelper.INSTANCE.beforeFileLoaded(uri);
-  }
+    private static void raspCallback(URI uri) {
+        FileIORaspHelper.INSTANCE.beforeFileLoaded(uri);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PrintWriterCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PrintWriterCallSite.java
index 1a6b5416db0..dc73f5f314d 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PrintWriterCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PrintWriterCallSite.java
@@ -14,68 +14,65 @@
 @CallSite(spi = IastCallSites.class)
 public class PrintWriterCallSite {
 
-  @CallSite.Before("void java.io.PrintWriter.write(java.lang.String, int, int)")
-  @CallSite.Before("void java.io.PrintWriter.write(java.lang.String)")
-  @CallSite.Before("void java.io.PrintWriter.println(java.lang.String)")
-  @CallSite.Before("void java.io.PrintWriter.print(java.lang.String)")
-  public static void beforeStringParam(@CallSite.Argument(0) @Nonnull final String s) {
-    final XssModule module = InstrumentationBridge.XSS;
-    if (module != null) {
-      try {
-        module.onXss(s);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeStringParam threw", e);
-      }
+    @CallSite.Before("void java.io.PrintWriter.write(java.lang.String, int, int)")
+    @CallSite.Before("void java.io.PrintWriter.write(java.lang.String)")
+    @CallSite.Before("void java.io.PrintWriter.println(java.lang.String)")
+    @CallSite.Before("void java.io.PrintWriter.print(java.lang.String)")
+    public static void beforeStringParam(@CallSite.Argument(0) @Nonnull final String s) {
+        final XssModule module = InstrumentationBridge.XSS;
+        if (module != null) {
+            try {
+                module.onXss(s);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeStringParam threw", e);
+            }
+        }
     }
-  }
 
-  @CallSite.Before("void java.io.PrintWriter.write(char[], int, int)")
-  @CallSite.Before("void java.io.PrintWriter.write(char[])")
-  @CallSite.Before("void java.io.PrintWriter.println(char[])")
-  @CallSite.Before("void java.io.PrintWriter.print(char[])")
-  public static void beforeCharArrayParam(@CallSite.Argument(0) @Nonnull final char[] buf) {
-    final XssModule module = InstrumentationBridge.XSS;
-    if (module != null) {
-      try {
-        module.onXss(buf);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeCharArrayParam threw", e);
-      }
+    @CallSite.Before("void java.io.PrintWriter.write(char[], int, int)")
+    @CallSite.Before("void java.io.PrintWriter.write(char[])")
+    @CallSite.Before("void java.io.PrintWriter.println(char[])")
+    @CallSite.Before("void java.io.PrintWriter.print(char[])")
+    public static void beforeCharArrayParam(@CallSite.Argument(0) @Nonnull final char[] buf) {
+        final XssModule module = InstrumentationBridge.XSS;
+        if (module != null) {
+            try {
+                module.onXss(buf);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeCharArrayParam threw", e);
+            }
+        }
     }
-  }
 
-  @CallSite.Before(
-      "java.io.PrintWriter java.io.PrintWriter.format(java.util.Locale, java.lang.String, java.lang.Object[])")
-  @CallSite.Before(
-      "java.io.PrintWriter java.io.PrintWriter.printf(java.util.Locale, java.lang.String, java.lang.Object[])")
-  public static void beforeLocaleAndStringAndObjects(
-      @CallSite.Argument(0) @Nonnull final Locale locale,
-      @CallSite.Argument(1) @Nonnull final String format,
-      @CallSite.Argument(2) @Nullable final Object[] args) {
-    final XssModule module = InstrumentationBridge.XSS;
-    if (module != null) {
-      try {
-        module.onXss(format, args);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeLocaleAndStringAndObjects threw", e);
-      }
+    @CallSite.Before(
+            "java.io.PrintWriter java.io.PrintWriter.format(java.util.Locale, java.lang.String, java.lang.Object[])")
+    @CallSite.Before(
+            "java.io.PrintWriter java.io.PrintWriter.printf(java.util.Locale, java.lang.String, java.lang.Object[])")
+    public static void beforeLocaleAndStringAndObjects(
+            @CallSite.Argument(0) @Nonnull final Locale locale,
+            @CallSite.Argument(1) @Nonnull final String format,
+            @CallSite.Argument(2) @Nullable final Object[] args) {
+        final XssModule module = InstrumentationBridge.XSS;
+        if (module != null) {
+            try {
+                module.onXss(format, args);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeLocaleAndStringAndObjects threw", e);
+            }
+        }
     }
-  }
 
-  @CallSite.Before(
-      "java.io.PrintWriter java.io.PrintWriter.format(java.lang.String, java.lang.Object[])")
-  @CallSite.Before(
-      "java.io.PrintWriter java.io.PrintWriter.printf(java.lang.String, java.lang.Object[])")
-  public static void beforeStringAndObjects(
-      @CallSite.Argument(0) @Nonnull final String format,
-      @CallSite.Argument(1) @Nullable final Object[] args) {
-    final XssModule module = InstrumentationBridge.XSS;
-    if (module != null) {
-      try {
-        module.onXss(format, args);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeStringAndObjects threw", e);
-      }
+    @CallSite.Before("java.io.PrintWriter java.io.PrintWriter.format(java.lang.String, java.lang.Object[])")
+    @CallSite.Before("java.io.PrintWriter java.io.PrintWriter.printf(java.lang.String, java.lang.Object[])")
+    public static void beforeStringAndObjects(
+            @CallSite.Argument(0) @Nonnull final String format, @CallSite.Argument(1) @Nullable final Object[] args) {
+        final XssModule module = InstrumentationBridge.XSS;
+        if (module != null) {
+            try {
+                module.onXss(format, args);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeStringAndObjects threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RandomAccessFileCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RandomAccessFileCallSite.java
index a123ef89ea8..cc00c3052de 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RandomAccessFileCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RandomAccessFileCallSite.java
@@ -6,25 +6,23 @@
 import javax.annotation.Nullable;
 
 @CallSite(
-    spi = {RaspCallSites.class},
-    helpers = FileIORaspHelper.class)
+        spi = {RaspCallSites.class},
+        helpers = FileIORaspHelper.class)
 public class RandomAccessFileCallSite {
 
-  @CallSite.Before("void java.io.RandomAccessFile.<init>(java.lang.String, java.lang.String)")
-  public static void beforeConstructor(
-      @CallSite.Argument(0) @Nullable final String name,
-      @CallSite.Argument(1) @Nullable final String mode) {
-    if (name != null && mode != null) {
-      FileIORaspHelper.INSTANCE.beforeRandomAccessFileOpened(name, mode);
+    @CallSite.Before("void java.io.RandomAccessFile.<init>(java.lang.String, java.lang.String)")
+    public static void beforeConstructor(
+            @CallSite.Argument(0) @Nullable final String name, @CallSite.Argument(1) @Nullable final String mode) {
+        if (name != null && mode != null) {
+            FileIORaspHelper.INSTANCE.beforeRandomAccessFileOpened(name, mode);
+        }
     }
-  }
 
-  @CallSite.Before("void java.io.RandomAccessFile.<init>(java.io.File, java.lang.String)")
-  public static void beforeConstructorFile(
-      @CallSite.Argument(0) @Nullable final File file,
-      @CallSite.Argument(1) @Nullable final String mode) {
-    if (file != null && mode != null) {
-      FileIORaspHelper.INSTANCE.beforeRandomAccessFileOpened(file.getPath(), mode);
+    @CallSite.Before("void java.io.RandomAccessFile.<init>(java.io.File, java.lang.String)")
+    public static void beforeConstructorFile(
+            @CallSite.Argument(0) @Nullable final File file, @CallSite.Argument(1) @Nullable final String mode) {
+        if (file != null && mode != null) {
+            FileIORaspHelper.INSTANCE.beforeRandomAccessFileOpened(file.getPath(), mode);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java
index 0a81291e2f7..8be8921510b 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java
@@ -12,18 +12,18 @@
 @CallSite(spi = IastCallSites.class)
 public class StringReaderCallSite {
 
-  @CallSite.After("void java.io.StringReader.<init>(java.lang.String)")
-  public static StringReader afterInit(
-      @CallSite.AllArguments @Nonnull final Object[] params,
-      @CallSite.Return @Nonnull final StringReader result) {
-    final PropagationModule propagationModule = InstrumentationBridge.PROPAGATION;
-    if (propagationModule != null) {
-      try {
-        propagationModule.taintObjectIfTainted(result, params[0]);
-      } catch (Throwable e) {
-        propagationModule.onUnexpectedException("afterInit threw", e);
-      }
+    @CallSite.After("void java.io.StringReader.<init>(java.lang.String)")
+    public static StringReader afterInit(
+            @CallSite.AllArguments @Nonnull final Object[] params,
+            @CallSite.Return @Nonnull final StringReader result) {
+        final PropagationModule propagationModule = InstrumentationBridge.PROPAGATION;
+        if (propagationModule != null) {
+            try {
+                propagationModule.taintObjectIfTainted(result, params[0]);
+            } catch (Throwable e) {
+                propagationModule.onUnexpectedException("afterInit threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestByteBufferSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestByteBufferSuite.java
index 2edc4a1cda4..7b3e9d2e4ad 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestByteBufferSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestByteBufferSuite.java
@@ -4,11 +4,11 @@
 
 public class TestByteBufferSuite {
 
-  public static ByteBuffer wrap(final byte[] bytes) {
-    return ByteBuffer.wrap(bytes);
-  }
+    public static ByteBuffer wrap(final byte[] bytes) {
+        return ByteBuffer.wrap(bytes);
+    }
 
-  public static byte[] array(final ByteBuffer buffer) {
-    return buffer.array();
-  }
+    public static byte[] array(final ByteBuffer buffer) {
+        return buffer.array();
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomInputStreamReader.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomInputStreamReader.java
index fb4db3d529c..f3d18b7e25e 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomInputStreamReader.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomInputStreamReader.java
@@ -7,20 +7,19 @@
 
 public class TestCustomInputStreamReader extends InputStreamReader {
 
-  public TestCustomInputStreamReader(final InputStream in) throws IOException {
-    super(in);
-  }
+    public TestCustomInputStreamReader(final InputStream in) throws IOException {
+        super(in);
+    }
 
-  public TestCustomInputStreamReader(final InputStream in, final Charset charset)
-      throws IOException {
-    // XXX: DO NOT MODIFY THIS CODE. This is testing a very specific error (APPSEC-58131).
-    // This caused the following error:
-    //   VerifyError: Inconsistent stackmap frames at branch target \d
-    //   Reason: urrent frame's stack size doesn't match stackmap.
-    // To trigger this, it is necessary to consume an argument after the super call.
-    super(in, charset);
-    if (charset != null) {
-      System.out.println("Using charset: " + charset.name());
+    public TestCustomInputStreamReader(final InputStream in, final Charset charset) throws IOException {
+        // XXX: DO NOT MODIFY THIS CODE. This is testing a very specific error (APPSEC-58131).
+        // This caused the following error:
+        //   VerifyError: Inconsistent stackmap frames at branch target \d
+        //   Reason: urrent frame's stack size doesn't match stackmap.
+        // To trigger this, it is necessary to consume an argument after the super call.
+        super(in, charset);
+        if (charset != null) {
+            System.out.println("Using charset: " + charset.name());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomObjectInputStream.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomObjectInputStream.java
index 0010d56fe9a..6b1863019cb 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomObjectInputStream.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomObjectInputStream.java
@@ -6,7 +6,7 @@
 
 public class TestCustomObjectInputStream extends ObjectInputStream {
 
-  public TestCustomObjectInputStream(final InputStream in) throws IOException {
-    super(in);
-  }
+    public TestCustomObjectInputStream(final InputStream in) throws IOException {
+        super(in);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomStringReader.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomStringReader.java
index 34082f66ad8..8be522b4e98 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomStringReader.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomStringReader.java
@@ -4,11 +4,7 @@
 
 public class TestCustomStringReader extends StringReader {
 
-  public TestCustomStringReader(String s) {
-    super(
-        "Super "
-            + s
-            + (new StringReader(
-                "New_1" + new StringReader("New_2" + new StringReader("New_3" + s)))));
-  }
+    public TestCustomStringReader(String s) {
+        super("Super " + s + (new StringReader("New_1" + new StringReader("New_2" + new StringReader("New_3" + s)))));
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileChannelSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileChannelSuite.java
index 1f5b9feb113..2b63f88aac9 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileChannelSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileChannelSuite.java
@@ -10,26 +10,22 @@
 
 public class TestFileChannelSuite {
 
-  public static FileChannel openRead(final Path path) throws IOException {
-    return FileChannel.open(path, StandardOpenOption.READ);
-  }
+    public static FileChannel openRead(final Path path) throws IOException {
+        return FileChannel.open(path, StandardOpenOption.READ);
+    }
 
-  public static FileChannel openWrite(final Path path) throws IOException {
-    return FileChannel.open(
-        path,
-        StandardOpenOption.WRITE,
-        StandardOpenOption.CREATE,
-        StandardOpenOption.TRUNCATE_EXISTING);
-  }
+    public static FileChannel openWrite(final Path path) throws IOException {
+        return FileChannel.open(
+                path, StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+    }
 
-  public static FileChannel openWithOptions(final Path path, final OpenOption... options)
-      throws IOException {
-    return FileChannel.open(path, options);
-  }
+    public static FileChannel openWithOptions(final Path path, final OpenOption... options) throws IOException {
+        return FileChannel.open(path, options);
+    }
 
-  public static FileChannel openWithSet(
-      final Path path, final Set<? extends OpenOption> options, final FileAttribute<?>... attrs)
-      throws IOException {
-    return FileChannel.open(path, options, attrs);
-  }
+    public static FileChannel openWithSet(
+            final Path path, final Set<? extends OpenOption> options, final FileAttribute<?>... attrs)
+            throws IOException {
+        return FileChannel.open(path, options, attrs);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileInputStreamSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileInputStreamSuite.java
index ab34ff21ea3..9af77964c4d 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileInputStreamSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileInputStreamSuite.java
@@ -6,11 +6,11 @@
 
 public class TestFileInputStreamSuite {
 
-  public static FileInputStream newFileInputStream(final String path) throws FileNotFoundException {
-    return new FileInputStream(path);
-  }
+    public static FileInputStream newFileInputStream(final String path) throws FileNotFoundException {
+        return new FileInputStream(path);
+    }
 
-  public static FileInputStream newFileInputStream(final File file) throws FileNotFoundException {
-    return new FileInputStream(file);
-  }
+    public static FileInputStream newFileInputStream(final File file) throws FileNotFoundException {
+        return new FileInputStream(file);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileOutputStreamSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileOutputStreamSuite.java
index b294db30e76..b983ffbeccc 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileOutputStreamSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileOutputStreamSuite.java
@@ -6,22 +6,21 @@
 
 public class TestFileOutputStreamSuite {
 
-  public static FileOutputStream newFileOutputStream(final String path)
-      throws FileNotFoundException {
-    return new FileOutputStream(path);
-  }
+    public static FileOutputStream newFileOutputStream(final String path) throws FileNotFoundException {
+        return new FileOutputStream(path);
+    }
 
-  public static FileOutputStream newFileOutputStream(final String path, final boolean append)
-      throws FileNotFoundException {
-    return new FileOutputStream(path, append);
-  }
+    public static FileOutputStream newFileOutputStream(final String path, final boolean append)
+            throws FileNotFoundException {
+        return new FileOutputStream(path, append);
+    }
 
-  public static FileOutputStream newFileOutputStream(final File file) throws FileNotFoundException {
-    return new FileOutputStream(file);
-  }
+    public static FileOutputStream newFileOutputStream(final File file) throws FileNotFoundException {
+        return new FileOutputStream(file);
+    }
 
-  public static FileOutputStream newFileOutputStream(final File file, final boolean append)
-      throws FileNotFoundException {
-    return new FileOutputStream(file, append);
-  }
+    public static FileOutputStream newFileOutputStream(final File file, final boolean append)
+            throws FileNotFoundException {
+        return new FileOutputStream(file, append);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileReaderSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileReaderSuite.java
index 4ba3c660dfb..eeb43be981b 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileReaderSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileReaderSuite.java
@@ -6,11 +6,11 @@
 
 public class TestFileReaderSuite {
 
-  public static FileReader newFileReader(final String path) throws IOException {
-    return new FileReader(path);
-  }
+    public static FileReader newFileReader(final String path) throws IOException {
+        return new FileReader(path);
+    }
 
-  public static FileReader newFileReader(final File file) throws IOException {
-    return new FileReader(file);
-  }
+    public static FileReader newFileReader(final File file) throws IOException {
+        return new FileReader(file);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileSuite.java
index 26f7cd62536..8741c4b4fe6 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileSuite.java
@@ -5,19 +5,19 @@
 
 public class TestFileSuite {
 
-  public static File newFile(final String path) {
-    return new File(path);
-  }
+    public static File newFile(final String path) {
+        return new File(path);
+    }
 
-  public static File newFile(final String parent, final String child) {
-    return new File(parent, child);
-  }
+    public static File newFile(final String parent, final String child) {
+        return new File(parent, child);
+    }
 
-  public static File newFile(final File parent, final String child) {
-    return new File(parent, child);
-  }
+    public static File newFile(final File parent, final String child) {
+        return new File(parent, child);
+    }
 
-  public static File newFile(final URI uri) {
-    return new File(uri);
-  }
+    public static File newFile(final URI uri) {
+        return new File(uri);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileWriterSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileWriterSuite.java
index 8c528d0adaa..a9313399c1f 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileWriterSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileWriterSuite.java
@@ -6,20 +6,19 @@
 
 public class TestFileWriterSuite {
 
-  public static FileWriter newFileWriter(final String path) throws IOException {
-    return new FileWriter(path);
-  }
+    public static FileWriter newFileWriter(final String path) throws IOException {
+        return new FileWriter(path);
+    }
 
-  public static FileWriter newFileWriter(final String path, final boolean append)
-      throws IOException {
-    return new FileWriter(path, append);
-  }
+    public static FileWriter newFileWriter(final String path, final boolean append) throws IOException {
+        return new FileWriter(path, append);
+    }
 
-  public static FileWriter newFileWriter(final File file) throws IOException {
-    return new FileWriter(file);
-  }
+    public static FileWriter newFileWriter(final File file) throws IOException {
+        return new FileWriter(file);
+    }
 
-  public static FileWriter newFileWriter(final File file, final boolean append) throws IOException {
-    return new FileWriter(file, append);
-  }
+    public static FileWriter newFileWriter(final File file, final boolean append) throws IOException {
+        return new FileWriter(file, append);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFilesSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFilesSuite.java
index 5393807050f..2e453378998 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFilesSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFilesSuite.java
@@ -15,95 +15,90 @@
 
 public class TestFilesSuite {
 
-  // ===================== WRITE =====================
-
-  public static OutputStream newOutputStream(final Path path, final OpenOption... options)
-      throws IOException {
-    return Files.newOutputStream(path, options);
-  }
-
-  public static long copyFromStream(
-      final InputStream in, final Path target, final CopyOption... options) throws IOException {
-    return Files.copy(in, target, options);
-  }
-
-  public static Path write(final Path path, final byte[] bytes, final OpenOption... options)
-      throws IOException {
-    return Files.write(path, bytes, options);
-  }
-
-  public static Path writeLines(
-      final Path path,
-      final Iterable<? extends CharSequence> lines,
-      final Charset cs,
-      final OpenOption... options)
-      throws IOException {
-    return Files.write(path, lines, cs, options);
-  }
-
-  public static Path writeLinesDefaultCharset(
-      final Path path, final Iterable<? extends CharSequence> lines, final OpenOption... options)
-      throws IOException {
-    return Files.write(path, lines, options);
-  }
-
-  public static BufferedWriter newBufferedWriter(
-      final Path path, final Charset cs, final OpenOption... options) throws IOException {
-    return Files.newBufferedWriter(path, cs, options);
-  }
-
-  public static BufferedWriter newBufferedWriterDefaultCharset(
-      final Path path, final OpenOption... options) throws IOException {
-    return Files.newBufferedWriter(path, options);
-  }
-
-  public static Path copyPathToPath(
-      final Path source, final Path target, final CopyOption... options) throws IOException {
-    return Files.copy(source, target, options);
-  }
-
-  public static long copyToStream(final Path source, final OutputStream out) throws IOException {
-    return Files.copy(source, out);
-  }
-
-  public static Path move(final Path source, final Path target, final CopyOption... options)
-      throws IOException {
-    return Files.move(source, target);
-  }
-
-  // ===================== READ =====================
-
-  public static InputStream newInputStream(final Path path, final OpenOption... options)
-      throws IOException {
-    return Files.newInputStream(path, options);
-  }
-
-  public static byte[] readAllBytes(final Path path) throws IOException {
-    return Files.readAllBytes(path);
-  }
-
-  public static List<String> readAllLines(final Path path, final Charset cs) throws IOException {
-    return Files.readAllLines(path, cs);
-  }
-
-  public static List<String> readAllLinesDefaultCharset(final Path path) throws IOException {
-    return Files.readAllLines(path);
-  }
-
-  public static BufferedReader newBufferedReader(final Path path, final Charset cs)
-      throws IOException {
-    return Files.newBufferedReader(path, cs);
-  }
-
-  public static BufferedReader newBufferedReaderDefaultCharset(final Path path) throws IOException {
-    return Files.newBufferedReader(path);
-  }
-
-  public static Stream<String> lines(final Path path, final Charset cs) throws IOException {
-    return Files.lines(path, cs);
-  }
-
-  public static Stream<String> linesDefaultCharset(final Path path) throws IOException {
-    return Files.lines(path);
-  }
+    // ===================== WRITE =====================
+
+    public static OutputStream newOutputStream(final Path path, final OpenOption... options) throws IOException {
+        return Files.newOutputStream(path, options);
+    }
+
+    public static long copyFromStream(final InputStream in, final Path target, final CopyOption... options)
+            throws IOException {
+        return Files.copy(in, target, options);
+    }
+
+    public static Path write(final Path path, final byte[] bytes, final OpenOption... options) throws IOException {
+        return Files.write(path, bytes, options);
+    }
+
+    public static Path writeLines(
+            final Path path,
+            final Iterable<? extends CharSequence> lines,
+            final Charset cs,
+            final OpenOption... options)
+            throws IOException {
+        return Files.write(path, lines, cs, options);
+    }
+
+    public static Path writeLinesDefaultCharset(
+            final Path path, final Iterable<? extends CharSequence> lines, final OpenOption... options)
+            throws IOException {
+        return Files.write(path, lines, options);
+    }
+
+    public static BufferedWriter newBufferedWriter(final Path path, final Charset cs, final OpenOption... options)
+            throws IOException {
+        return Files.newBufferedWriter(path, cs, options);
+    }
+
+    public static BufferedWriter newBufferedWriterDefaultCharset(final Path path, final OpenOption... options)
+            throws IOException {
+        return Files.newBufferedWriter(path, options);
+    }
+
+    public static Path copyPathToPath(final Path source, final Path target, final CopyOption... options)
+            throws IOException {
+        return Files.copy(source, target, options);
+    }
+
+    public static long copyToStream(final Path source, final OutputStream out) throws IOException {
+        return Files.copy(source, out);
+    }
+
+    public static Path move(final Path source, final Path target, final CopyOption... options) throws IOException {
+        return Files.move(source, target);
+    }
+
+    // ===================== READ =====================
+
+    public static InputStream newInputStream(final Path path, final OpenOption... options) throws IOException {
+        return Files.newInputStream(path, options);
+    }
+
+    public static byte[] readAllBytes(final Path path) throws IOException {
+        return Files.readAllBytes(path);
+    }
+
+    public static List<String> readAllLines(final Path path, final Charset cs) throws IOException {
+        return Files.readAllLines(path, cs);
+    }
+
+    public static List<String> readAllLinesDefaultCharset(final Path path) throws IOException {
+        return Files.readAllLines(path);
+    }
+
+    public static BufferedReader newBufferedReader(final Path path, final Charset cs) throws IOException {
+        return Files.newBufferedReader(path, cs);
+    }
+
+    public static BufferedReader newBufferedReaderDefaultCharset(final Path path) throws IOException {
+        return Files.newBufferedReader(path);
+    }
+
+    public static Stream<String> lines(final Path path, final Charset cs) throws IOException {
+        return Files.lines(path, cs);
+    }
+
+    public static Stream<String> linesDefaultCharset(final Path path) throws IOException {
+        return Files.lines(path);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestInputStreamReaderSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestInputStreamReaderSuite.java
index 1d79a1a7b9b..2aca520ba83 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestInputStreamReaderSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestInputStreamReaderSuite.java
@@ -6,11 +6,11 @@
 
 public class TestInputStreamReaderSuite {
 
-  public static InputStreamReader init(final InputStream in, Charset charset) {
-    return new InputStreamReader(in, charset);
-  }
+    public static InputStreamReader init(final InputStream in, Charset charset) {
+        return new InputStreamReader(in, charset);
+    }
 
-  public static InputStreamReader init(final InputStream in) {
-    return new InputStreamReader(in);
-  }
+    public static InputStreamReader init(final InputStream in) {
+        return new InputStreamReader(in);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestInputStreamSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestInputStreamSuite.java
index e88659a729f..a7df2f38034 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestInputStreamSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestInputStreamSuite.java
@@ -5,7 +5,7 @@
 
 public class TestInputStreamSuite {
 
-  public static InputStream pushbackInputStreamFromIS(final InputStream is) {
-    return new PushbackInputStream(is);
-  }
+    public static InputStream pushbackInputStreamFromIS(final InputStream is) {
+        return new PushbackInputStream(is);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestObjectInputStreamSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestObjectInputStreamSuite.java
index d6a1744b57a..aeedb11e769 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestObjectInputStreamSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestObjectInputStreamSuite.java
@@ -6,11 +6,11 @@
 
 public class TestObjectInputStreamSuite {
 
-  public static void init(final InputStream inputStream) {
-    try {
-      new ObjectInputStream(inputStream);
-    } catch (IOException e) {
-      // Irrelevant
+    public static void init(final InputStream inputStream) {
+        try {
+            new ObjectInputStream(inputStream);
+        } catch (IOException e) {
+            // Irrelevant
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPathSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPathSuite.java
index e9f7a1dc0e1..bc3d30701ee 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPathSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPathSuite.java
@@ -4,19 +4,19 @@
 
 public class TestPathSuite {
 
-  public static Path resolve(final Path parent, final String other) {
-    return parent.resolve(other);
-  }
+    public static Path resolve(final Path parent, final String other) {
+        return parent.resolve(other);
+    }
 
-  public static Path resolveSibling(final Path parent, final String other) {
-    return parent.resolveSibling(other);
-  }
+    public static Path resolveSibling(final Path parent, final String other) {
+        return parent.resolveSibling(other);
+    }
 
-  public static Path resolveWithPath(final Path parent, final Path other) {
-    return parent.resolve(other);
-  }
+    public static Path resolveWithPath(final Path parent, final Path other) {
+        return parent.resolve(other);
+    }
 
-  public static Path resolveSiblingWithPath(final Path sibling, final Path other) {
-    return sibling.resolveSibling(other);
-  }
+    public static Path resolveSiblingWithPath(final Path sibling, final Path other) {
+        return sibling.resolveSibling(other);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPathsSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPathsSuite.java
index 515a735b376..9201d0ee6e8 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPathsSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPathsSuite.java
@@ -6,11 +6,11 @@
 
 public class TestPathsSuite {
 
-  public static Path get(final String first, final String... more) {
-    return Paths.get(first, more);
-  }
+    public static Path get(final String first, final String... more) {
+        return Paths.get(first, more);
+    }
 
-  public static Path get(final URI uri) {
-    return Paths.get(uri);
-  }
+    public static Path get(final URI uri) {
+        return Paths.get(uri);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPrintWriterSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPrintWriterSuite.java
index 388fa126d3b..fb88397b456 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPrintWriterSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPrintWriterSuite.java
@@ -5,57 +5,57 @@
 
 public class TestPrintWriterSuite {
 
-  PrintWriter pw;
+    PrintWriter pw;
 
-  public TestPrintWriterSuite(final PrintWriter pw) {
-    this.pw = pw;
-  }
+    public TestPrintWriterSuite(final PrintWriter pw) {
+        this.pw = pw;
+    }
 
-  public void write(String s, int off, int len) {
-    pw.write(s, off, len);
-  }
+    public void write(String s, int off, int len) {
+        pw.write(s, off, len);
+    }
 
-  public void write(String s) {
-    pw.write(s);
-  }
+    public void write(String s) {
+        pw.write(s);
+    }
 
-  public void write(char[] buf, int off, int len) {
-    pw.write(buf, off, len);
-  }
+    public void write(char[] buf, int off, int len) {
+        pw.write(buf, off, len);
+    }
 
-  public void write(char[] buf) {
-    pw.write(buf);
-  }
+    public void write(char[] buf) {
+        pw.write(buf);
+    }
 
-  public PrintWriter format(Locale l, String format, Object... args) {
-    return pw.format(l, format, args);
-  }
+    public PrintWriter format(Locale l, String format, Object... args) {
+        return pw.format(l, format, args);
+    }
 
-  public PrintWriter format(String format, Object... args) {
-    return pw.format(format, args);
-  }
+    public PrintWriter format(String format, Object... args) {
+        return pw.format(format, args);
+    }
 
-  public PrintWriter testPrintf(String format, Object... args) {
-    return pw.printf(format, args);
-  }
+    public PrintWriter testPrintf(String format, Object... args) {
+        return pw.printf(format, args);
+    }
 
-  public PrintWriter testPrintf(Locale l, String format, Object... args) {
-    return pw.printf(l, format, args);
-  }
+    public PrintWriter testPrintf(Locale l, String format, Object... args) {
+        return pw.printf(l, format, args);
+    }
 
-  public void println(char[] x) {
-    pw.println(x);
-  }
+    public void println(char[] x) {
+        pw.println(x);
+    }
 
-  public void println(String x) {
-    pw.println(x);
-  }
+    public void println(String x) {
+        pw.println(x);
+    }
 
-  public void print(char[] s) {
-    pw.print(s);
-  }
+    public void print(char[] s) {
+        pw.print(s);
+    }
 
-  public void print(String s) {
-    pw.print(s);
-  }
+    public void print(String s) {
+        pw.print(s);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestRandomAccessFileSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestRandomAccessFileSuite.java
index e743993adee..0cf807df1a9 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestRandomAccessFileSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestRandomAccessFileSuite.java
@@ -6,13 +6,11 @@
 
 public class TestRandomAccessFileSuite {
 
-  public static RandomAccessFile newRandomAccessFile(final String name, final String mode)
-      throws IOException {
-    return new RandomAccessFile(name, mode);
-  }
+    public static RandomAccessFile newRandomAccessFile(final String name, final String mode) throws IOException {
+        return new RandomAccessFile(name, mode);
+    }
 
-  public static RandomAccessFile newRandomAccessFile(final File file, final String mode)
-      throws IOException {
-    return new RandomAccessFile(file, mode);
-  }
+    public static RandomAccessFile newRandomAccessFile(final File file, final String mode) throws IOException {
+        return new RandomAccessFile(file, mode);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestStringReaderSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestStringReaderSuite.java
index 36d5e9b330a..6c33c951fe9 100644
--- a/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestStringReaderSuite.java
+++ b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestStringReaderSuite.java
@@ -4,7 +4,7 @@
 
 public class TestStringReaderSuite {
 
-  public static void init(String input) {
-    new StringReader(input);
-  }
+    public static void init(String input) {
+        new StringReader(input);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassCallSite.java
index 12dfb2086de..f5a7d3ae27e 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassCallSite.java
@@ -13,50 +13,46 @@
 @CallSite(spi = IastCallSites.class)
 public class ClassCallSite {
 
-  @CallSite.Before("java.lang.Class java.lang.Class.forName(java.lang.String)")
-  @CallSite.Before(
-      "java.lang.Class java.lang.Class.forName(java.lang.String, boolean, java.lang.ClassLoader)")
-  public static void beforeClassReflection(@CallSite.Argument(0) @Nonnull final String className) {
-    final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
-    if (module != null) {
-      try {
-        module.onClassName(className);
-      } catch (Throwable e) {
-        module.onUnexpectedException("before class reflection threw", e);
-      }
+    @CallSite.Before("java.lang.Class java.lang.Class.forName(java.lang.String)")
+    @CallSite.Before("java.lang.Class java.lang.Class.forName(java.lang.String, boolean, java.lang.ClassLoader)")
+    public static void beforeClassReflection(@CallSite.Argument(0) @Nonnull final String className) {
+        final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
+        if (module != null) {
+            try {
+                module.onClassName(className);
+            } catch (Throwable e) {
+                module.onUnexpectedException("before class reflection threw", e);
+            }
+        }
     }
-  }
 
-  @CallSite.Before(
-      "java.lang.reflect.Method java.lang.Class.getMethod(java.lang.String, java.lang.Class[])")
-  @CallSite.Before(
-      "java.lang.reflect.Method java.lang.Class.getDeclaredMethod(java.lang.String, java.lang.Class[])")
-  public static void beforeMethodReflection(
-      @CallSite.This @Nonnull final Class<?> clazz,
-      @CallSite.Argument(0) @Nonnull final String methodName,
-      @CallSite.Argument(1) @Nullable final Class<?>... parameterTypes) {
-    final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
-    if (module != null) {
-      try {
-        module.onMethodName(clazz, methodName, parameterTypes);
-      } catch (Throwable e) {
-        module.onUnexpectedException("before method reflection threw", e);
-      }
+    @CallSite.Before("java.lang.reflect.Method java.lang.Class.getMethod(java.lang.String, java.lang.Class[])")
+    @CallSite.Before("java.lang.reflect.Method java.lang.Class.getDeclaredMethod(java.lang.String, java.lang.Class[])")
+    public static void beforeMethodReflection(
+            @CallSite.This @Nonnull final Class<?> clazz,
+            @CallSite.Argument(0) @Nonnull final String methodName,
+            @CallSite.Argument(1) @Nullable final Class<?>... parameterTypes) {
+        final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
+        if (module != null) {
+            try {
+                module.onMethodName(clazz, methodName, parameterTypes);
+            } catch (Throwable e) {
+                module.onUnexpectedException("before method reflection threw", e);
+            }
+        }
     }
-  }
 
-  @CallSite.Before("java.lang.reflect.Field java.lang.Class.getField(java.lang.String)")
-  @CallSite.Before("java.lang.reflect.Field java.lang.Class.getDeclaredField(java.lang.String)")
-  public static void beforeFieldReflection(
-      @CallSite.This @Nonnull final Class<?> clazz,
-      @CallSite.Argument(0) @Nonnull final String fieldName) {
-    final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
-    if (module != null) {
-      try {
-        module.onFieldName(clazz, fieldName);
-      } catch (Throwable e) {
-        module.onUnexpectedException("before field reflection threw", e);
-      }
+    @CallSite.Before("java.lang.reflect.Field java.lang.Class.getField(java.lang.String)")
+    @CallSite.Before("java.lang.reflect.Field java.lang.Class.getDeclaredField(java.lang.String)")
+    public static void beforeFieldReflection(
+            @CallSite.This @Nonnull final Class<?> clazz, @CallSite.Argument(0) @Nonnull final String fieldName) {
+        final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
+        if (module != null) {
+            try {
+                module.onFieldName(clazz, fieldName);
+            } catch (Throwable e) {
+                module.onUnexpectedException("before field reflection threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassLoaderCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassLoaderCallSite.java
index f45fbdc1564..de268e94488 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassLoaderCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassLoaderCallSite.java
@@ -12,15 +12,15 @@
 @CallSite(spi = IastCallSites.class)
 public class ClassLoaderCallSite {
 
-  @CallSite.Before("java.lang.Class java.lang.ClassLoader.loadClass(java.lang.String)")
-  public static void beforeLoadClass(@CallSite.Argument(0) @Nonnull final String className) {
-    final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
-    if (module != null) {
-      try {
-        module.onClassName(className);
-      } catch (Throwable e) {
-        module.onUnexpectedException("before beforeLoadClass threw", e);
-      }
+    @CallSite.Before("java.lang.Class java.lang.ClassLoader.loadClass(java.lang.String)")
+    public static void beforeLoadClass(@CallSite.Argument(0) @Nonnull final String className) {
+        final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
+        if (module != null) {
+            try {
+                module.onClassName(className);
+            } catch (Throwable e) {
+                module.onUnexpectedException("before beforeLoadClass threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/LookupCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/LookupCallSite.java
index 2f486dc2c93..39d6038eeb2 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/LookupCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/LookupCallSite.java
@@ -14,79 +14,77 @@
 @CallSite(spi = IastCallSites.class)
 public class LookupCallSite {
 
-  @CallSite.Before(
-      "java.lang.invoke.MethodHandle java.lang.invoke.MethodHandles$Lookup.findSetter(java.lang.Class, java.lang.String, java.lang.Class)")
-  @CallSite.Before(
-      "java.lang.invoke.MethodHandle java.lang.invoke.MethodHandles$Lookup.findStaticSetter(java.lang.Class, java.lang.String, java.lang.Class)")
-  @CallSite.Before(
-      "java.lang.invoke.MethodHandle java.lang.invoke.MethodHandles$Lookup.findGetter(java.lang.Class, java.lang.String, java.lang.Class)")
-  @CallSite.Before(
-      "java.lang.invoke.MethodHandle java.lang.invoke.MethodHandles$Lookup.findStaticGetter(java.lang.Class, java.lang.String, java.lang.Class)")
-  public static void beforeFindField(
-      @CallSite.Argument(0) @Nonnull final Class<?> clazz,
-      @CallSite.Argument(1) @Nonnull final String fieldName,
-      @CallSite.Argument(2) @Nullable final Class<?> parameterType) {
-    final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
-    if (module != null) {
-      try {
-        module.onFieldName(clazz, fieldName);
-      } catch (Throwable e) {
-        module.onUnexpectedException("beforeFindField threw", e);
-      }
+    @CallSite.Before(
+            "java.lang.invoke.MethodHandle java.lang.invoke.MethodHandles$Lookup.findSetter(java.lang.Class, java.lang.String, java.lang.Class)")
+    @CallSite.Before(
+            "java.lang.invoke.MethodHandle java.lang.invoke.MethodHandles$Lookup.findStaticSetter(java.lang.Class, java.lang.String, java.lang.Class)")
+    @CallSite.Before(
+            "java.lang.invoke.MethodHandle java.lang.invoke.MethodHandles$Lookup.findGetter(java.lang.Class, java.lang.String, java.lang.Class)")
+    @CallSite.Before(
+            "java.lang.invoke.MethodHandle java.lang.invoke.MethodHandles$Lookup.findStaticGetter(java.lang.Class, java.lang.String, java.lang.Class)")
+    public static void beforeFindField(
+            @CallSite.Argument(0) @Nonnull final Class<?> clazz,
+            @CallSite.Argument(1) @Nonnull final String fieldName,
+            @CallSite.Argument(2) @Nullable final Class<?> parameterType) {
+        final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
+        if (module != null) {
+            try {
+                module.onFieldName(clazz, fieldName);
+            } catch (Throwable e) {
+                module.onUnexpectedException("beforeFindField threw", e);
+            }
+        }
     }
-  }
 
-  @CallSite.Before(
-      "java.lang.invoke.MethodHandle java.lang.invoke.MethodHandles$Lookup.findStatic(java.lang.Class, java.lang.String, java.lang.invoke.MethodType)")
-  @CallSite.Before(
-      "java.lang.invoke.MethodHandle java.lang.invoke.MethodHandles$Lookup.findVirtual(java.lang.Class, java.lang.String, java.lang.invoke.MethodType)")
-  public static void beforeMethod(
-      @CallSite.Argument(0) @Nonnull final Class<?> clazz,
-      @CallSite.Argument(1) @Nonnull final String methodName,
-      @CallSite.Argument(2) @Nullable final MethodType methodType) {
-    final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
-    if (module != null) {
-      try {
-        module.onMethodName(
-            clazz, methodName, methodType != null ? methodType.parameterArray() : null);
-      } catch (Throwable e) {
-        module.onUnexpectedException("beforeMethod threw", e);
-      }
+    @CallSite.Before(
+            "java.lang.invoke.MethodHandle java.lang.invoke.MethodHandles$Lookup.findStatic(java.lang.Class, java.lang.String, java.lang.invoke.MethodType)")
+    @CallSite.Before(
+            "java.lang.invoke.MethodHandle java.lang.invoke.MethodHandles$Lookup.findVirtual(java.lang.Class, java.lang.String, java.lang.invoke.MethodType)")
+    public static void beforeMethod(
+            @CallSite.Argument(0) @Nonnull final Class<?> clazz,
+            @CallSite.Argument(1) @Nonnull final String methodName,
+            @CallSite.Argument(2) @Nullable final MethodType methodType) {
+        final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
+        if (module != null) {
+            try {
+                module.onMethodName(clazz, methodName, methodType != null ? methodType.parameterArray() : null);
+            } catch (Throwable e) {
+                module.onUnexpectedException("beforeMethod threw", e);
+            }
+        }
     }
-  }
 
-  @CallSite.Before(
-      "java.lang.invoke.MethodHandle java.lang.invoke.MethodHandles$Lookup.findSpecial(java.lang.Class, java.lang.String, java.lang.invoke.MethodType, java.lang.Class)")
-  public static void beforeSpecial(
-      @CallSite.Argument(0) @Nonnull final Class<?> clazz,
-      @CallSite.Argument(1) @Nonnull final String methodName,
-      @CallSite.Argument(2) @Nullable final MethodType methodType,
-      @CallSite.Argument(3) @Nullable final Class<?> specialCaller) {
-    final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
-    if (module != null) {
-      try {
-        module.onMethodName(
-            clazz, methodName, methodType != null ? methodType.parameterArray() : null);
-      } catch (Throwable e) {
-        module.onUnexpectedException("beforeSpecial threw", e);
-      }
+    @CallSite.Before(
+            "java.lang.invoke.MethodHandle java.lang.invoke.MethodHandles$Lookup.findSpecial(java.lang.Class, java.lang.String, java.lang.invoke.MethodType, java.lang.Class)")
+    public static void beforeSpecial(
+            @CallSite.Argument(0) @Nonnull final Class<?> clazz,
+            @CallSite.Argument(1) @Nonnull final String methodName,
+            @CallSite.Argument(2) @Nullable final MethodType methodType,
+            @CallSite.Argument(3) @Nullable final Class<?> specialCaller) {
+        final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
+        if (module != null) {
+            try {
+                module.onMethodName(clazz, methodName, methodType != null ? methodType.parameterArray() : null);
+            } catch (Throwable e) {
+                module.onUnexpectedException("beforeSpecial threw", e);
+            }
+        }
     }
-  }
 
-  @CallSite.Before(
-      "java.lang.invoke.MethodHandle java.lang.invoke.MethodHandles$Lookup.bind(java.lang.Object, java.lang.String, java.lang.invoke.MethodType)")
-  public static void beforeBind(
-      @CallSite.Argument(0) @Nonnull final Object obj,
-      @CallSite.Argument(1) @Nonnull final String methodName,
-      @CallSite.Argument(2) @Nullable final MethodType methodType) {
-    final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
-    if (module != null) {
-      try {
-        module.onMethodName(
-            obj.getClass(), methodName, methodType != null ? methodType.parameterArray() : null);
-      } catch (Throwable e) {
-        module.onUnexpectedException("beforeBind threw", e);
-      }
+    @CallSite.Before(
+            "java.lang.invoke.MethodHandle java.lang.invoke.MethodHandles$Lookup.bind(java.lang.Object, java.lang.String, java.lang.invoke.MethodType)")
+    public static void beforeBind(
+            @CallSite.Argument(0) @Nonnull final Object obj,
+            @CallSite.Argument(1) @Nonnull final String methodName,
+            @CallSite.Argument(2) @Nullable final MethodType methodType) {
+        final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
+        if (module != null) {
+            try {
+                module.onMethodName(
+                        obj.getClass(), methodName, methodType != null ? methodType.parameterArray() : null);
+            } catch (Throwable e) {
+                module.onUnexpectedException("beforeBind threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/MathCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/MathCallSite.java
index c1f30a8b47a..3ea53aec698 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/MathCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/MathCallSite.java
@@ -11,15 +11,15 @@
 @CallSite(spi = IastCallSites.class)
 public class MathCallSite {
 
-  @CallSite.Before("double java.lang.Math.random()")
-  public static void before() {
-    final WeakRandomnessModule module = InstrumentationBridge.WEAK_RANDOMNESS;
-    if (module != null) {
-      try {
-        module.onWeakRandom(Math.class);
-      } catch (Throwable e) {
-        module.onUnexpectedException("random threw", e);
-      }
+    @CallSite.Before("double java.lang.Math.random()")
+    public static void before() {
+        final WeakRandomnessModule module = InstrumentationBridge.WEAK_RANDOMNESS;
+        if (module != null) {
+            try {
+                module.onWeakRandom(Math.class);
+            } catch (Throwable e) {
+                module.onUnexpectedException("random threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSite.java
index 0d88401bdb8..31521ebefa5 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSite.java
@@ -14,22 +14,22 @@
 @CallSite(spi = IastCallSites.class)
 public class ProcessBuilderCallSite {
 
-  @CallSite.Before("java.lang.Process java.lang.ProcessBuilder.start()")
-  public static void beforeStart(@CallSite.This @Nullable final ProcessBuilder self) {
-    if (self == null) {
-      return;
-    }
-    // be careful when fetching the environment as it does mutate the instance
-    final List<String> cmd = self.command();
-    if (cmd != null && cmd.size() > 0) {
-      final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
-      if (module != null) {
-        try {
-          module.onProcessBuilderStart(cmd);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeStart threw", e);
+    @CallSite.Before("java.lang.Process java.lang.ProcessBuilder.start()")
+    public static void beforeStart(@CallSite.This @Nullable final ProcessBuilder self) {
+        if (self == null) {
+            return;
+        }
+        // be careful when fetching the environment as it does mutate the instance
+        final List<String> cmd = self.command();
+        if (cmd != null && cmd.size() > 0) {
+            final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
+            if (module != null) {
+                try {
+                    module.onProcessBuilderStart(cmd);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("beforeStart threw", e);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java
index 9aa9d8c19da..e579f01befa 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java
@@ -11,34 +11,32 @@
 
 @AutoService(InstrumenterModule.class)
 public class ProcessImplInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, Instrumenter.ForBootstrap {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, Instrumenter.ForBootstrap {
 
-  public ProcessImplInstrumentation() {
-    super("java-lang-appsec");
-  }
+    public ProcessImplInstrumentation() {
+        super("java-lang-appsec");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return super.defaultEnabled()
-        && !Platform.isNativeImageBuilder(); // not applicable in native-image
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return super.defaultEnabled() && !Platform.isNativeImageBuilder(); // not applicable in native-image
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "java.lang.ProcessImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "java.lang.ProcessImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("start")
-            .and(
-                takesArguments(
-                    String[].class,
-                    Map.class,
-                    String.class,
-                    ProcessBuilder.Redirect[].class,
-                    boolean.class)),
-        packageName + ".ProcessImplStartAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("start")
+                        .and(takesArguments(
+                                String[].class,
+                                Map.class,
+                                String.class,
+                                ProcessBuilder.Redirect[].class,
+                                boolean.class)),
+                packageName + ".ProcessImplStartAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java
index d8a324481cb..7692022c308 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java
@@ -8,46 +8,44 @@
 import net.bytebuddy.asm.Advice;
 
 class ProcessImplStartAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static AgentSpan beforeStart(
-      @Advice.Argument(0) final String[] command,
-      @Advice.Argument(1) final Map<String, String> environment) {
-
-    if (!AgentTracer.isRegistered()) {
-      return null;
-    }
-
-    String rootSessionId = Config.get().getRootSessionId();
-    if (rootSessionId != null && environment != null) {
-      environment.put("_DD_ROOT_JAVA_SESSION_ID", rootSessionId);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static AgentSpan beforeStart(
+            @Advice.Argument(0) final String[] command, @Advice.Argument(1) final Map<String, String> environment) {
+
+        if (!AgentTracer.isRegistered()) {
+            return null;
+        }
+
+        String rootSessionId = Config.get().getRootSessionId();
+        if (rootSessionId != null && environment != null) {
+            environment.put("_DD_ROOT_JAVA_SESSION_ID", rootSessionId);
+        }
+
+        if (!ProcessImplInstrumentationHelpers.ONLINE || command.length == 0) {
+            return null;
+        }
+
+        final AgentSpan span = AgentTracer.startSpan("subprocess", "command_execution");
+        span.setSpanType("system");
+        span.setResourceName(ProcessImplInstrumentationHelpers.determineResource(command));
+        span.setTag("component", "subprocess");
+        span.spanContext().setIntegrationName("subprocess");
+        ProcessImplInstrumentationHelpers.setTags(span, command);
+        ProcessImplInstrumentationHelpers.cmdiRaspCheck(command);
+        return span;
     }
 
-    if (!ProcessImplInstrumentationHelpers.ONLINE || command.length == 0) {
-      return null;
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void afterStart(@Advice.Return Process p, @Advice.Enter AgentSpan span, @Advice.Thrown Throwable t) {
+        if (span == null) {
+            return;
+        }
+        if (t != null) {
+            span.addThrowable(t);
+            span.finish();
+            return;
+        }
+
+        ProcessImplInstrumentationHelpers.addProcessCompletionHook(p, span);
     }
-
-    final AgentSpan span = AgentTracer.startSpan("subprocess", "command_execution");
-    span.setSpanType("system");
-    span.setResourceName(ProcessImplInstrumentationHelpers.determineResource(command));
-    span.setTag("component", "subprocess");
-    span.spanContext().setIntegrationName("subprocess");
-    ProcessImplInstrumentationHelpers.setTags(span, command);
-    ProcessImplInstrumentationHelpers.cmdiRaspCheck(command);
-    return span;
-  }
-
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void afterStart(
-      @Advice.Return Process p, @Advice.Enter AgentSpan span, @Advice.Thrown Throwable t) {
-    if (span == null) {
-      return;
-    }
-    if (t != null) {
-      span.addThrowable(t);
-      span.finish();
-      return;
-    }
-
-    ProcessImplInstrumentationHelpers.addProcessCompletionHook(p, span);
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeCallSite.java
index f6ae37be422..9ab7cb361c6 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeCallSite.java
@@ -13,100 +13,95 @@
 @CallSite(spi = IastCallSites.class)
 public class RuntimeCallSite {
 
-  @CallSite.Before("java.lang.Process java.lang.Runtime.exec(java.lang.String)")
-  public static void beforeStart(@CallSite.Argument @Nullable final String command) {
-    if (command != null) { // runtime fails if null
-      final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
-      if (module != null) {
-        try {
-          module.onRuntimeExec(command);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeExec threw", e);
+    @CallSite.Before("java.lang.Process java.lang.Runtime.exec(java.lang.String)")
+    public static void beforeStart(@CallSite.Argument @Nullable final String command) {
+        if (command != null) { // runtime fails if null
+            final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
+            if (module != null) {
+                try {
+                    module.onRuntimeExec(command);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("beforeExec threw", e);
+                }
+            }
         }
-      }
     }
-  }
 
-  @CallSite.Before("java.lang.Process java.lang.Runtime.exec(java.lang.String[])")
-  public static void beforeExec(@CallSite.Argument @Nullable final String[] cmdArray) {
-    if (cmdArray != null && cmdArray.length > 0) { // runtime fails if null or empty
-      final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
-      if (module != null) {
-        try {
-          module.onRuntimeExec(cmdArray);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeExec threw", e);
+    @CallSite.Before("java.lang.Process java.lang.Runtime.exec(java.lang.String[])")
+    public static void beforeExec(@CallSite.Argument @Nullable final String[] cmdArray) {
+        if (cmdArray != null && cmdArray.length > 0) { // runtime fails if null or empty
+            final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
+            if (module != null) {
+                try {
+                    module.onRuntimeExec(cmdArray);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("beforeExec threw", e);
+                }
+            }
         }
-      }
     }
-  }
 
-  @CallSite.Before("java.lang.Process java.lang.Runtime.exec(java.lang.String, java.lang.String[])")
-  public static void beforeExec(
-      @CallSite.Argument @Nullable final String command,
-      @CallSite.Argument @Nullable final String[] envp) {
-    if (command != null) { // runtime fails if null
-      final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
-      if (module != null) {
-        try {
-          module.onRuntimeExec(envp, command);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeExec threw", e);
+    @CallSite.Before("java.lang.Process java.lang.Runtime.exec(java.lang.String, java.lang.String[])")
+    public static void beforeExec(
+            @CallSite.Argument @Nullable final String command, @CallSite.Argument @Nullable final String[] envp) {
+        if (command != null) { // runtime fails if null
+            final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
+            if (module != null) {
+                try {
+                    module.onRuntimeExec(envp, command);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("beforeExec threw", e);
+                }
+            }
         }
-      }
     }
-  }
 
-  @CallSite.Before(
-      "java.lang.Process java.lang.Runtime.exec(java.lang.String[], java.lang.String[])")
-  public static void beforeExec(
-      @CallSite.Argument @Nullable final String[] cmdArray,
-      @CallSite.Argument @Nullable final String[] envp) {
-    if (cmdArray != null && cmdArray.length > 0) { // runtime fails if null or empty
-      final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
-      if (module != null) {
-        try {
-          module.onRuntimeExec(envp, cmdArray);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeExec threw", e);
+    @CallSite.Before("java.lang.Process java.lang.Runtime.exec(java.lang.String[], java.lang.String[])")
+    public static void beforeExec(
+            @CallSite.Argument @Nullable final String[] cmdArray, @CallSite.Argument @Nullable final String[] envp) {
+        if (cmdArray != null && cmdArray.length > 0) { // runtime fails if null or empty
+            final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
+            if (module != null) {
+                try {
+                    module.onRuntimeExec(envp, cmdArray);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("beforeExec threw", e);
+                }
+            }
         }
-      }
     }
-  }
 
-  @CallSite.Before(
-      "java.lang.Process java.lang.Runtime.exec(java.lang.String, java.lang.String[], java.io.File)")
-  public static void beforeExec(
-      @CallSite.Argument @Nullable final String command,
-      @CallSite.Argument @Nullable final String[] envp,
-      @CallSite.Argument @Nullable final File dir) {
-    if (command != null) { // runtime fails if null
-      final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
-      if (module != null) {
-        try {
-          module.onRuntimeExec(envp, command);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeExec threw", e);
+    @CallSite.Before("java.lang.Process java.lang.Runtime.exec(java.lang.String, java.lang.String[], java.io.File)")
+    public static void beforeExec(
+            @CallSite.Argument @Nullable final String command,
+            @CallSite.Argument @Nullable final String[] envp,
+            @CallSite.Argument @Nullable final File dir) {
+        if (command != null) { // runtime fails if null
+            final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
+            if (module != null) {
+                try {
+                    module.onRuntimeExec(envp, command);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("beforeExec threw", e);
+                }
+            }
         }
-      }
     }
-  }
 
-  @CallSite.Before(
-      "java.lang.Process java.lang.Runtime.exec(java.lang.String[], java.lang.String[], java.io.File)")
-  public static void beforeExec(
-      @CallSite.Argument @Nullable final String[] cmdArray,
-      @CallSite.Argument @Nullable final String[] envp,
-      @CallSite.Argument @Nullable final File dir) {
-    if (cmdArray != null && cmdArray.length > 0) { // runtime fails if null or empty
-      final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
-      if (module != null) {
-        try {
-          module.onRuntimeExec(envp, cmdArray);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeExec threw", e);
+    @CallSite.Before("java.lang.Process java.lang.Runtime.exec(java.lang.String[], java.lang.String[], java.io.File)")
+    public static void beforeExec(
+            @CallSite.Argument @Nullable final String[] cmdArray,
+            @CallSite.Argument @Nullable final String[] envp,
+            @CallSite.Argument @Nullable final File dir) {
+        if (cmdArray != null && cmdArray.length > 0) { // runtime fails if null or empty
+            final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
+            if (module != null) {
+                try {
+                    module.onRuntimeExec(envp, cmdArray);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("beforeExec threw", e);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeExecStringAdvice.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeExecStringAdvice.java
index 73534c26bfa..122df51c759 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeExecStringAdvice.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeExecStringAdvice.java
@@ -5,16 +5,16 @@
 import net.bytebuddy.asm.Advice;
 
 class RuntimeExecStringAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void beforeExec(@Advice.Argument(0) final String command) {
-    if (command == null || !AgentTracer.isRegistered()) {
-      return;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void beforeExec(@Advice.Argument(0) final String command) {
+        if (command == null || !AgentTracer.isRegistered()) {
+            return;
+        }
+        ProcessImplInstrumentationHelpers.shiRaspCheck(command);
     }
-    ProcessImplInstrumentationHelpers.shiRaspCheck(command);
-  }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void afterExec() {
-    ProcessImplInstrumentationHelpers.resetCheckShi();
-  }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void afterExec() {
+        ProcessImplInstrumentationHelpers.resetCheckShi();
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java
index 7474929504e..4a513e9c50f 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java
@@ -11,27 +11,26 @@
 
 @AutoService(InstrumenterModule.class)
 public class RuntimeInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, Instrumenter.ForBootstrap {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, Instrumenter.ForBootstrap {
 
-  public RuntimeInstrumentation() {
-    super("java-lang-appsec");
-  }
+    public RuntimeInstrumentation() {
+        super("java-lang-appsec");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return super.defaultEnabled()
-        && !Platform.isNativeImageBuilder(); // not applicable in native-image
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return super.defaultEnabled() && !Platform.isNativeImageBuilder(); // not applicable in native-image
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "java.lang.Runtime";
-  }
+    @Override
+    public String instrumentedType() {
+        return "java.lang.Runtime";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("exec").and(takesArguments(String.class, String[].class, File.class)),
-        packageName + ".RuntimeExecStringAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("exec").and(takesArguments(String.class, String[].class, File.class)),
+                packageName + ".RuntimeExecStringAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ShutdownInstrumentation.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ShutdownInstrumentation.java
index 9aa879ad705..716184adf8c 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ShutdownInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ShutdownInstrumentation.java
@@ -16,32 +16,31 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ShutdownInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public ShutdownInstrumentation() {
-    super("shutdown");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "java.lang.Shutdown";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isStatic()).and(named("runHooks")),
-        getClass().getName() + "$ShutdownAdvice");
-  }
-
-  public static class ShutdownAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter() {
-      // let's intercept the `runHooks` method before any of the hooks run
-      ShutdownHelper.shutdownAgent();
+        implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public ShutdownInstrumentation() {
+        super("shutdown");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "java.lang.Shutdown";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isStatic()).and(named("runHooks")), getClass().getName() + "$ShutdownAdvice");
     }
 
-    public static void muzzleCheck() {}
-  }
+    public static class ShutdownAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter() {
+            // let's intercept the `runHooks` method before any of the hooks run
+            ShutdownHelper.shutdownAgent();
+        }
+
+        public static void muzzleCheck() {}
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java
index f644d931f9f..254fa0e4773 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java
@@ -17,182 +17,176 @@
 @CallSite(spi = IastCallSites.class)
 public class StringBuilderCallSite {
 
-  @CallSite.After("void java.lang.StringBuilder.<init>(java.lang.String)")
-  @CallSite.After("void java.lang.StringBuilder.<init>(java.lang.CharSequence)")
-  @CallSite.After("void java.lang.StringBuffer.<init>(java.lang.String)")
-  @CallSite.After("void java.lang.StringBuffer.<init>(java.lang.CharSequence)")
-  @Nonnull
-  public static CharSequence afterInit(
-      @CallSite.AllArguments @Nonnull final Object[] params,
-      @CallSite.Return @Nonnull final CharSequence result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringBuilderInit(result, (CharSequence) params[0]);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterInit threw", e);
-      }
+    @CallSite.After("void java.lang.StringBuilder.<init>(java.lang.String)")
+    @CallSite.After("void java.lang.StringBuilder.<init>(java.lang.CharSequence)")
+    @CallSite.After("void java.lang.StringBuffer.<init>(java.lang.String)")
+    @CallSite.After("void java.lang.StringBuffer.<init>(java.lang.CharSequence)")
+    @Nonnull
+    public static CharSequence afterInit(
+            @CallSite.AllArguments @Nonnull final Object[] params,
+            @CallSite.Return @Nonnull final CharSequence result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringBuilderInit(result, (CharSequence) params[0]);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterInit threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.StringBuilder java.lang.StringBuilder.append(java.lang.String)")
-  @CallSite.After("java.lang.StringBuilder java.lang.StringBuilder.append(java.lang.CharSequence)")
-  @CallSite.After("java.lang.StringBuilder java.lang.StringBuilder.append(java.lang.StringBuffer)")
-  @CallSite.After("java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.String)")
-  @CallSite.After("java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.CharSequence)")
-  @CallSite.After("java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.StringBuffer)")
-  @Nonnull
-  public static CharSequence afterAppend(
-      @CallSite.This @Nonnull final CharSequence self,
-      @CallSite.Argument(0) @Nullable final CharSequence param,
-      @CallSite.Return @Nonnull final CharSequence result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringBuilderAppend(self, param);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterAppend threw", e);
-      }
+    @CallSite.After("java.lang.StringBuilder java.lang.StringBuilder.append(java.lang.String)")
+    @CallSite.After("java.lang.StringBuilder java.lang.StringBuilder.append(java.lang.CharSequence)")
+    @CallSite.After("java.lang.StringBuilder java.lang.StringBuilder.append(java.lang.StringBuffer)")
+    @CallSite.After("java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.String)")
+    @CallSite.After("java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.CharSequence)")
+    @CallSite.After("java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.StringBuffer)")
+    @Nonnull
+    public static CharSequence afterAppend(
+            @CallSite.This @Nonnull final CharSequence self,
+            @CallSite.Argument(0) @Nullable final CharSequence param,
+            @CallSite.Return @Nonnull final CharSequence result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringBuilderAppend(self, param);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterAppend threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After(
-      "java.lang.StringBuilder java.lang.StringBuilder.append(java.lang.CharSequence, int, int)")
-  @CallSite.After(
-      "java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.CharSequence, int, int)")
-  @Nonnull
-  public static CharSequence afterAppendWithSubstring(
-      @CallSite.This @Nonnull final CharSequence self,
-      @CallSite.Argument(0) @Nullable final CharSequence param,
-      @CallSite.Argument(1) final int start,
-      @CallSite.Argument(2) final int end,
-      @CallSite.Return @Nonnull final CharSequence result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringBuilderAppend(self, param, start, end);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterAppendWithSubstring threw", e);
-      }
+    @CallSite.After("java.lang.StringBuilder java.lang.StringBuilder.append(java.lang.CharSequence, int, int)")
+    @CallSite.After("java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.CharSequence, int, int)")
+    @Nonnull
+    public static CharSequence afterAppendWithSubstring(
+            @CallSite.This @Nonnull final CharSequence self,
+            @CallSite.Argument(0) @Nullable final CharSequence param,
+            @CallSite.Argument(1) final int start,
+            @CallSite.Argument(2) final int end,
+            @CallSite.Return @Nonnull final CharSequence result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringBuilderAppend(self, param, start, end);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterAppendWithSubstring threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.Around("java.lang.StringBuilder java.lang.StringBuilder.append(java.lang.Object)")
-  @CallSite.Around("java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)")
-  @Nonnull
-  @SuppressFBWarnings(
-      "NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE") // we do check for null on self
-  // parameter
-  public static Appendable aroundAppend(
-      @CallSite.This @Nullable final Appendable self,
-      @CallSite.Argument(0) @Nullable final Object param)
-      throws Throwable {
-    try {
-      if (self == null) {
-        throw new NullPointerException();
-      }
-      final String paramStr = String.valueOf(param);
-      final Appendable result = self.append(paramStr);
-      final StringModule module = InstrumentationBridge.STRING;
-      if (module != null) {
+    @CallSite.Around("java.lang.StringBuilder java.lang.StringBuilder.append(java.lang.Object)")
+    @CallSite.Around("java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)")
+    @Nonnull
+    @SuppressFBWarnings("NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE") // we do check for null on self
+    // parameter
+    public static Appendable aroundAppend(
+            @CallSite.This @Nullable final Appendable self, @CallSite.Argument(0) @Nullable final Object param)
+            throws Throwable {
         try {
-          module.onStringBuilderAppend((CharSequence) self, paramStr);
+            if (self == null) {
+                throw new NullPointerException();
+            }
+            final String paramStr = String.valueOf(param);
+            final Appendable result = self.append(paramStr);
+            final StringModule module = InstrumentationBridge.STRING;
+            if (module != null) {
+                try {
+                    module.onStringBuilderAppend((CharSequence) self, paramStr);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("aroundAppend threw", e);
+                }
+            }
+            return result;
         } catch (final Throwable e) {
-          module.onUnexpectedException("aroundAppend threw", e);
+            final String clazz = StringBuilderCallSite.class.getName();
+            throw StackUtils.filterUntil(
+                    e, s -> s.getClassName().equals(clazz) && s.getMethodName().equals("aroundAppend"));
         }
-      }
-      return result;
-    } catch (final Throwable e) {
-      final String clazz = StringBuilderCallSite.class.getName();
-      throw StackUtils.filterUntil(
-          e, s -> s.getClassName().equals(clazz) && s.getMethodName().equals("aroundAppend"));
     }
-  }
 
-  @CallSite.After("java.lang.String java.lang.StringBuilder.toString()")
-  @CallSite.After("java.lang.String java.lang.StringBuffer.toString()")
-  @Nonnull
-  public static String afterToString(
-      @CallSite.This @Nonnull final CharSequence self,
-      @CallSite.Return @Nonnull final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringBuilderToString(self, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterToString threw", e);
-      }
+    @CallSite.After("java.lang.String java.lang.StringBuilder.toString()")
+    @CallSite.After("java.lang.String java.lang.StringBuffer.toString()")
+    @Nonnull
+    public static String afterToString(
+            @CallSite.This @Nonnull final CharSequence self, @CallSite.Return @Nonnull final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringBuilderToString(self, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterToString threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String java.lang.StringBuilder.substring(int)")
-  @CallSite.After("java.lang.String java.lang.StringBuffer.substring(int)")
-  public static String afterSubstring(
-      @CallSite.This final CharSequence self,
-      @CallSite.Argument final int beginIndex,
-      @CallSite.Return final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringSubSequence(self, beginIndex, self.length(), result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterSubstring threw", e);
-      }
+    @CallSite.After("java.lang.String java.lang.StringBuilder.substring(int)")
+    @CallSite.After("java.lang.String java.lang.StringBuffer.substring(int)")
+    public static String afterSubstring(
+            @CallSite.This final CharSequence self,
+            @CallSite.Argument final int beginIndex,
+            @CallSite.Return final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringSubSequence(self, beginIndex, self.length(), result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterSubstring threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String java.lang.StringBuilder.substring(int, int)")
-  @CallSite.After("java.lang.String java.lang.StringBuffer.substring(int, int)")
-  public static String afterSubstring(
-      @CallSite.This final CharSequence self,
-      @CallSite.Argument final int beginIndex,
-      @CallSite.Argument final int endIndex,
-      @CallSite.Return final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringSubSequence(self, beginIndex, endIndex, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterSubstring threw", e);
-      }
+    @CallSite.After("java.lang.String java.lang.StringBuilder.substring(int, int)")
+    @CallSite.After("java.lang.String java.lang.StringBuffer.substring(int, int)")
+    public static String afterSubstring(
+            @CallSite.This final CharSequence self,
+            @CallSite.Argument final int beginIndex,
+            @CallSite.Argument final int endIndex,
+            @CallSite.Return final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringSubSequence(self, beginIndex, endIndex, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterSubstring threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.CharSequence java.lang.StringBuilder.subSequence(int, int)")
-  @CallSite.After("java.lang.CharSequence java.lang.StringBuffer.subSequence(int, int)")
-  public static CharSequence afterSubSequence(
-      @CallSite.This final CharSequence self,
-      @CallSite.Argument final int beginIndex,
-      @CallSite.Argument final int endIndex,
-      @CallSite.Return final CharSequence result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringSubSequence(self, beginIndex, endIndex, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterSubSequence threw", e);
-      }
+    @CallSite.After("java.lang.CharSequence java.lang.StringBuilder.subSequence(int, int)")
+    @CallSite.After("java.lang.CharSequence java.lang.StringBuffer.subSequence(int, int)")
+    public static CharSequence afterSubSequence(
+            @CallSite.This final CharSequence self,
+            @CallSite.Argument final int beginIndex,
+            @CallSite.Argument final int endIndex,
+            @CallSite.Return final CharSequence result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringSubSequence(self, beginIndex, endIndex, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterSubSequence threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("void java.lang.StringBuilder.setLength(int)")
-  @CallSite.After("void java.lang.StringBuffer.setLength(int)")
-  public static void afterSetLength(
-      @CallSite.This final CharSequence self, @CallSite.Argument final int length) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringBuilderSetLength(self, length);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterSetLength threw", e);
-      }
+    @CallSite.After("void java.lang.StringBuilder.setLength(int)")
+    @CallSite.After("void java.lang.StringBuffer.setLength(int)")
+    public static void afterSetLength(@CallSite.This final CharSequence self, @CallSite.Argument final int length) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringBuilderSetLength(self, length);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterSetLength threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java
index 7715a5321dd..3c39bf8ad5d 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java
@@ -16,302 +16,294 @@
 @CallSite(spi = IastCallSites.class)
 public class StringCallSite {
 
-  @CallSite.After("java.lang.String java.lang.String.concat(java.lang.String)")
-  @Nonnull
-  public static String afterConcat(
-      @CallSite.This @Nonnull final String self,
-      @CallSite.Argument @Nullable final String param,
-      @CallSite.Return @Nonnull final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringConcat(self, param, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afetConcat threw", e);
-      }
+    @CallSite.After("java.lang.String java.lang.String.concat(java.lang.String)")
+    @Nonnull
+    public static String afterConcat(
+            @CallSite.This @Nonnull final String self,
+            @CallSite.Argument @Nullable final String param,
+            @CallSite.Return @Nonnull final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringConcat(self, param, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afetConcat threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String java.lang.String.substring(int)")
-  public static String afterSubstring(
-      @CallSite.This final String self,
-      @CallSite.Argument final int beginIndex,
-      @CallSite.Return final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringSubSequence(self, beginIndex, self != null ? self.length() : 0, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterSubstring threw", e);
-      }
+    @CallSite.After("java.lang.String java.lang.String.substring(int)")
+    public static String afterSubstring(
+            @CallSite.This final String self,
+            @CallSite.Argument final int beginIndex,
+            @CallSite.Return final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringSubSequence(self, beginIndex, self != null ? self.length() : 0, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterSubstring threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String java.lang.String.substring(int, int)")
-  public static String afterSubstring(
-      @CallSite.This final String self,
-      @CallSite.Argument final int beginIndex,
-      @CallSite.Argument final int endIndex,
-      @CallSite.Return final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringSubSequence(self, beginIndex, endIndex, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterSubstring threw", e);
-      }
+    @CallSite.After("java.lang.String java.lang.String.substring(int, int)")
+    public static String afterSubstring(
+            @CallSite.This final String self,
+            @CallSite.Argument final int beginIndex,
+            @CallSite.Argument final int endIndex,
+            @CallSite.Return final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringSubSequence(self, beginIndex, endIndex, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterSubstring threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.CharSequence java.lang.String.subSequence(int, int)")
-  public static CharSequence afterSubSequence(
-      @CallSite.This final String self,
-      @CallSite.Argument final int beginIndex,
-      @CallSite.Argument final int endIndex,
-      @CallSite.Return final CharSequence result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringSubSequence(self, beginIndex, endIndex, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterSubSequence threw", e);
-      }
+    @CallSite.After("java.lang.CharSequence java.lang.String.subSequence(int, int)")
+    public static CharSequence afterSubSequence(
+            @CallSite.This final String self,
+            @CallSite.Argument final int beginIndex,
+            @CallSite.Argument final int endIndex,
+            @CallSite.Return final CharSequence result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringSubSequence(self, beginIndex, endIndex, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterSubSequence threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After(
-      "java.lang.String java.lang.String.join(java.lang.CharSequence, java.lang.CharSequence[])")
-  public static String afterJoin(
-      @CallSite.Argument final CharSequence delimiter,
-      @CallSite.Argument final CharSequence[] elements,
-      @CallSite.Return final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringJoin(result, delimiter, elements);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterJoin threw", e);
-      }
+    @CallSite.After("java.lang.String java.lang.String.join(java.lang.CharSequence, java.lang.CharSequence[])")
+    public static String afterJoin(
+            @CallSite.Argument final CharSequence delimiter,
+            @CallSite.Argument final CharSequence[] elements,
+            @CallSite.Return final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringJoin(result, delimiter, elements);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterJoin threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.Around(
-      "java.lang.String java.lang.String.join(java.lang.CharSequence, java.lang.Iterable)")
-  public static String aroundJoin(
-      @CallSite.Argument final CharSequence delimiter,
-      @CallSite.Argument final Iterable<? extends CharSequence> elements)
-      throws Throwable {
-    // Iterate the iterable to guarantee the default behavior for custom mutable Iterables
-    List<CharSequence> copy = new ArrayList<>();
-    String result;
-    try {
-      elements.forEach(copy::add);
-      result = String.join(delimiter, copy);
-    } catch (final Throwable e) {
-      throw StackUtils.filterDatadog(e);
+    @CallSite.Around("java.lang.String java.lang.String.join(java.lang.CharSequence, java.lang.Iterable)")
+    public static String aroundJoin(
+            @CallSite.Argument final CharSequence delimiter,
+            @CallSite.Argument final Iterable<? extends CharSequence> elements)
+            throws Throwable {
+        // Iterate the iterable to guarantee the default behavior for custom mutable Iterables
+        List<CharSequence> copy = new ArrayList<>();
+        String result;
+        try {
+            elements.forEach(copy::add);
+            result = String.join(delimiter, copy);
+        } catch (final Throwable e) {
+            throw StackUtils.filterDatadog(e);
+        }
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringJoin(result, delimiter, copy.toArray(new CharSequence[0]));
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterSubSequence threw", e);
+            }
+        }
+        return result;
     }
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringJoin(result, delimiter, copy.toArray(new CharSequence[0]));
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterSubSequence threw", e);
-      }
-    }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String java.lang.String.toUpperCase()")
-  public static String afterToUpperCase(
-      @CallSite.This final String self, @CallSite.Return final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringToUpperCase(self, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterToUppercase threw", e);
-      }
+    @CallSite.After("java.lang.String java.lang.String.toUpperCase()")
+    public static String afterToUpperCase(@CallSite.This final String self, @CallSite.Return final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringToUpperCase(self, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterToUppercase threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String java.lang.String.toUpperCase(java.util.Locale)")
-  public static String afterToUpperCase(
-      @CallSite.This final String self,
-      @CallSite.Argument final Locale locale,
-      @CallSite.Return final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringToUpperCase(self, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterToUppercase threw", e);
-      }
+    @CallSite.After("java.lang.String java.lang.String.toUpperCase(java.util.Locale)")
+    public static String afterToUpperCase(
+            @CallSite.This final String self,
+            @CallSite.Argument final Locale locale,
+            @CallSite.Return final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringToUpperCase(self, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterToUppercase threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String java.lang.String.toLowerCase()")
-  public static String afterToLowerCase(
-      @CallSite.This final String self, @CallSite.Return final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringToLowerCase(self, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterToLowerCase threw", e);
-      }
+    @CallSite.After("java.lang.String java.lang.String.toLowerCase()")
+    public static String afterToLowerCase(@CallSite.This final String self, @CallSite.Return final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringToLowerCase(self, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterToLowerCase threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String java.lang.String.toLowerCase(java.util.Locale)")
-  public static String afterToLowerCase(
-      @CallSite.This final String self,
-      @CallSite.Argument final Locale locale,
-      @CallSite.Return final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringToLowerCase(self, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterToLowerCase threw", e);
-      }
+    @CallSite.After("java.lang.String java.lang.String.toLowerCase(java.util.Locale)")
+    public static String afterToLowerCase(
+            @CallSite.This final String self,
+            @CallSite.Argument final Locale locale,
+            @CallSite.Return final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringToLowerCase(self, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterToLowerCase threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String java.lang.String.trim()")
-  public static String afterTrim(
-      @CallSite.This final String self, @CallSite.Return final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringTrim(self, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afetConcat threw", e);
-      }
+    @CallSite.After("java.lang.String java.lang.String.trim()")
+    public static String afterTrim(@CallSite.This final String self, @CallSite.Return final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringTrim(self, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afetConcat threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("void java.lang.String.<init>(java.lang.String)")
-  @CallSite.After("void java.lang.String.<init>(java.lang.StringBuffer)")
-  @CallSite.After("void java.lang.String.<init>(java.lang.StringBuilder)")
-  public static String afterStringConstructor(
-      @CallSite.AllArguments @Nonnull final Object[] params,
-      @CallSite.Return @Nonnull final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    try {
-      if (module != null) {
-        module.onStringConstructor((CharSequence) params[0], result);
-      }
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterStringConstructor threw", e);
+    @CallSite.After("void java.lang.String.<init>(java.lang.String)")
+    @CallSite.After("void java.lang.String.<init>(java.lang.StringBuffer)")
+    @CallSite.After("void java.lang.String.<init>(java.lang.StringBuilder)")
+    public static String afterStringConstructor(
+            @CallSite.AllArguments @Nonnull final Object[] params, @CallSite.Return @Nonnull final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        try {
+            if (module != null) {
+                module.onStringConstructor((CharSequence) params[0], result);
+            }
+        } catch (final Throwable e) {
+            module.onUnexpectedException("afterStringConstructor threw", e);
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String java.lang.String.format(java.lang.String, java.lang.Object[])")
-  public static String afterFormat(
-      @CallSite.Argument(0) @Nullable final String pattern,
-      @CallSite.Argument(1) @Nonnull final Object[] args,
-      @CallSite.Return @Nonnull final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    try {
-      if (module != null && pattern != null) {
-        module.onStringFormat(pattern, args, result);
-      }
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterFormat threw", e);
+    @CallSite.After("java.lang.String java.lang.String.format(java.lang.String, java.lang.Object[])")
+    public static String afterFormat(
+            @CallSite.Argument(0) @Nullable final String pattern,
+            @CallSite.Argument(1) @Nonnull final Object[] args,
+            @CallSite.Return @Nonnull final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        try {
+            if (module != null && pattern != null) {
+                module.onStringFormat(pattern, args, result);
+            }
+        } catch (final Throwable e) {
+            module.onUnexpectedException("afterFormat threw", e);
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After(
-      "java.lang.String java.lang.String.format(java.util.Locale, java.lang.String, java.lang.Object[])")
-  public static String afterFormat(
-      @CallSite.Argument(0) @Nullable final Locale locale,
-      @CallSite.Argument(1) @Nullable final String pattern,
-      @CallSite.Argument(2) @Nonnull final Object[] args,
-      @CallSite.Return @Nonnull final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    try {
-      if (module != null && pattern != null) {
-        module.onStringFormat(locale, pattern, args, result);
-      }
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterFormat threw", e);
+    @CallSite.After("java.lang.String java.lang.String.format(java.util.Locale, java.lang.String, java.lang.Object[])")
+    public static String afterFormat(
+            @CallSite.Argument(0) @Nullable final Locale locale,
+            @CallSite.Argument(1) @Nullable final String pattern,
+            @CallSite.Argument(2) @Nonnull final Object[] args,
+            @CallSite.Return @Nonnull final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        try {
+            if (module != null && pattern != null) {
+                module.onStringFormat(locale, pattern, args, result);
+            }
+        } catch (final Throwable e) {
+            module.onUnexpectedException("afterFormat threw", e);
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String[] java.lang.String.split(java.lang.String)")
-  public static String[] afterSplit(
-      @CallSite.This @Nonnull final String self,
-      @CallSite.Argument(0) @Nonnull final String regex,
-      @CallSite.Return @Nonnull final String[] result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onSplit(self, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterSplit threw", e);
-      }
+    @CallSite.After("java.lang.String[] java.lang.String.split(java.lang.String)")
+    public static String[] afterSplit(
+            @CallSite.This @Nonnull final String self,
+            @CallSite.Argument(0) @Nonnull final String regex,
+            @CallSite.Return @Nonnull final String[] result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onSplit(self, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterSplit threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String[] java.lang.String.split(java.lang.String, int)")
-  public static String[] afterSplitWithLimit(
-      @CallSite.This @Nonnull final String self,
-      @CallSite.Argument(0) @Nonnull final String regex,
-      @CallSite.Argument(1) final int pos,
-      @CallSite.Return @Nonnull final String[] result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onSplit(self, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterSplit threw", e);
-      }
+    @CallSite.After("java.lang.String[] java.lang.String.split(java.lang.String, int)")
+    public static String[] afterSplitWithLimit(
+            @CallSite.This @Nonnull final String self,
+            @CallSite.Argument(0) @Nonnull final String regex,
+            @CallSite.Argument(1) final int pos,
+            @CallSite.Return @Nonnull final String[] result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onSplit(self, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterSplit threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String java.lang.String.replace(char, char)")
-  public static String afterReplaceChar(
-      @CallSite.This @Nonnull final String self,
-      @CallSite.Argument(0) final char oldChar,
-      @CallSite.Argument(1) final char newChar,
-      @CallSite.Return @Nonnull final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringReplace(self, oldChar, newChar, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterReplaceChar threw", e);
-      }
+    @CallSite.After("java.lang.String java.lang.String.replace(char, char)")
+    public static String afterReplaceChar(
+            @CallSite.This @Nonnull final String self,
+            @CallSite.Argument(0) final char oldChar,
+            @CallSite.Argument(1) final char newChar,
+            @CallSite.Return @Nonnull final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringReplace(self, oldChar, newChar, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterReplaceChar threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String java.lang.String.valueOf(java.lang.Object)")
-  public static String afterValueOf(
-      @CallSite.Argument(0) final Object obj, @CallSite.Return final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringValueOf(obj, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterValueOf threw", e);
-      }
+    @CallSite.After("java.lang.String java.lang.String.valueOf(java.lang.Object)")
+    public static String afterValueOf(@CallSite.Argument(0) final Object obj, @CallSite.Return final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringValueOf(obj, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterValueOf threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringExperimentalCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringExperimentalCallSite.java
index 977d9ea4066..575641f09b0 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringExperimentalCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringExperimentalCallSite.java
@@ -16,107 +16,104 @@
 
 @Propagation
 @CallSite(
-    spi = IastCallSites.class,
-    enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isExperimentalPropagationEnabled"})
+        spi = IastCallSites.class,
+        enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isExperimentalPropagationEnabled"})
 public class StringExperimentalCallSite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(StringExperimentalCallSite.class);
-
-  @CallSite.After(
-      "java.lang.String java.lang.String.replace(java.lang.CharSequence, java.lang.CharSequence)")
-  public static String afterReplaceCharSeq(
-      @CallSite.This @Nonnull final String self,
-      @CallSite.Argument(0) final CharSequence oldCharSeq,
-      @CallSite.Argument(1) final CharSequence newCharSeq,
-      @CallSite.Return @Nonnull final String result) {
-    String newReplaced = "";
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        newReplaced = module.onStringReplace(self, oldCharSeq, newCharSeq);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterReplaceCharSeq threw", e);
-      }
+    private static final Logger LOGGER = LoggerFactory.getLogger(StringExperimentalCallSite.class);
+
+    @CallSite.After("java.lang.String java.lang.String.replace(java.lang.CharSequence, java.lang.CharSequence)")
+    public static String afterReplaceCharSeq(
+            @CallSite.This @Nonnull final String self,
+            @CallSite.Argument(0) final CharSequence oldCharSeq,
+            @CallSite.Argument(1) final CharSequence newCharSeq,
+            @CallSite.Return @Nonnull final String result) {
+        String newReplaced = "";
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                newReplaced = module.onStringReplace(self, oldCharSeq, newCharSeq);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterReplaceCharSeq threw", e);
+            }
+        }
+
+        IastMetricCollector.add(IastMetric.EXPERIMENTAL_PROPAGATION, 1);
+
+        if (!result.equals(newReplaced)) {
+            LOGGER.debug(
+                    SEND_TELEMETRY,
+                    "afterReplaceCharSeq failed due to a different result between original replace and new replace, originalLength: {}, newLength: {}",
+                    result.length(),
+                    newReplaced != null ? newReplaced.length() : 0);
+
+            return result;
+        }
+
+        return newReplaced;
     }
 
-    IastMetricCollector.add(IastMetric.EXPERIMENTAL_PROPAGATION, 1);
-
-    if (!result.equals(newReplaced)) {
-      LOGGER.debug(
-          SEND_TELEMETRY,
-          "afterReplaceCharSeq failed due to a different result between original replace and new replace, originalLength: {}, newLength: {}",
-          result.length(),
-          newReplaced != null ? newReplaced.length() : 0);
-
-      return result;
+    @CallSite.After("java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)")
+    @SuppressForbidden
+    public static String afterReplaceAll(
+            @CallSite.This final String self,
+            @CallSite.Argument(0) final String regex,
+            @CallSite.Argument(1) final String replacement,
+            @CallSite.Return @Nonnull final String result) {
+        String newReplaced = "";
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                newReplaced = module.onStringReplace(self, regex, replacement, Integer.MAX_VALUE);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterReplaceAll threw", e);
+            }
+        }
+
+        IastMetricCollector.add(IastMetric.EXPERIMENTAL_PROPAGATION, 1);
+
+        if (!result.equals(newReplaced)) {
+            LOGGER.debug(
+                    SEND_TELEMETRY,
+                    "afterReplaceAll failed due to a different result between original replace and new replace, originalLength: {}, newLength: {}",
+                    result.length(),
+                    newReplaced != null ? newReplaced.length() : 0);
+
+            return result;
+        }
+
+        return newReplaced;
     }
 
-    return newReplaced;
-  }
-
-  @CallSite.After(
-      "java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)")
-  @SuppressForbidden
-  public static String afterReplaceAll(
-      @CallSite.This final String self,
-      @CallSite.Argument(0) final String regex,
-      @CallSite.Argument(1) final String replacement,
-      @CallSite.Return @Nonnull final String result) {
-    String newReplaced = "";
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        newReplaced = module.onStringReplace(self, regex, replacement, Integer.MAX_VALUE);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterReplaceAll threw", e);
-      }
+    @CallSite.After("java.lang.String java.lang.String.replaceFirst(java.lang.String, java.lang.String)")
+    @SuppressForbidden
+    public static String afterReplaceFirst(
+            @CallSite.This final String self,
+            @CallSite.Argument(0) final String regex,
+            @CallSite.Argument(1) final String replacement,
+            @CallSite.Return @Nonnull final String result) {
+        String newReplaced = "";
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                newReplaced = module.onStringReplace(self, regex, replacement, 1);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterReplaceFirst threw", e);
+            }
+        }
+
+        IastMetricCollector.add(IastMetric.EXPERIMENTAL_PROPAGATION, 1);
+
+        if (!result.equals(newReplaced)) {
+            LOGGER.debug(
+                    SEND_TELEMETRY,
+                    "afterReplaceFirst failed due to a different result between original replace and new replace, originalLength: {}, newLength: {}",
+                    result.length(),
+                    newReplaced != null ? newReplaced.length() : 0);
+
+            return result;
+        }
+
+        return newReplaced;
     }
-
-    IastMetricCollector.add(IastMetric.EXPERIMENTAL_PROPAGATION, 1);
-
-    if (!result.equals(newReplaced)) {
-      LOGGER.debug(
-          SEND_TELEMETRY,
-          "afterReplaceAll failed due to a different result between original replace and new replace, originalLength: {}, newLength: {}",
-          result.length(),
-          newReplaced != null ? newReplaced.length() : 0);
-
-      return result;
-    }
-
-    return newReplaced;
-  }
-
-  @CallSite.After(
-      "java.lang.String java.lang.String.replaceFirst(java.lang.String, java.lang.String)")
-  @SuppressForbidden
-  public static String afterReplaceFirst(
-      @CallSite.This final String self,
-      @CallSite.Argument(0) final String regex,
-      @CallSite.Argument(1) final String replacement,
-      @CallSite.Return @Nonnull final String result) {
-    String newReplaced = "";
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        newReplaced = module.onStringReplace(self, regex, replacement, 1);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterReplaceFirst threw", e);
-      }
-    }
-
-    IastMetricCollector.add(IastMetric.EXPERIMENTAL_PROPAGATION, 1);
-
-    if (!result.equals(newReplaced)) {
-      LOGGER.debug(
-          SEND_TELEMETRY,
-          "afterReplaceFirst failed due to a different result between original replace and new replace, originalLength: {}, newLength: {}",
-          result.length(),
-          newReplaced != null ? newReplaced.length() : 0);
-
-      return result;
-    }
-
-    return newReplaced;
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSite.java
index 2cca8fccd62..3aa173b69d8 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSite.java
@@ -14,145 +14,141 @@
 
 @Propagation
 @CallSite(
-    spi = IastCallSites.class,
-    enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isFullDetection"})
+        spi = IastCallSites.class,
+        enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isFullDetection"})
 public class StringFullDetectionCallSite {
 
-  @CallSite.After("void java.lang.String.<init>(byte[])")
-  public static String afterByteArrayCtor(
-      @CallSite.AllArguments @Nonnull final Object[] params,
-      @CallSite.Return @Nonnull final String result) {
-    final CodecModule module = InstrumentationBridge.CODEC;
-    try {
-      if (module != null) {
-        final byte[] bytes = (byte[]) params[0];
-        if (bytes != null) {
-          module.onStringFromBytes(bytes, 0, bytes.length, null, result);
+    @CallSite.After("void java.lang.String.<init>(byte[])")
+    public static String afterByteArrayCtor(
+            @CallSite.AllArguments @Nonnull final Object[] params, @CallSite.Return @Nonnull final String result) {
+        final CodecModule module = InstrumentationBridge.CODEC;
+        try {
+            if (module != null) {
+                final byte[] bytes = (byte[]) params[0];
+                if (bytes != null) {
+                    module.onStringFromBytes(bytes, 0, bytes.length, null, result);
+                }
+            }
+        } catch (final Throwable e) {
+            module.onUnexpectedException("afterByteArrayCtor threw", e);
         }
-      }
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterByteArrayCtor threw", e);
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("void java.lang.String.<init>(byte[], java.lang.String)")
-  @CallSite.After("void java.lang.String.<init>(byte[], java.nio.charset.Charset)")
-  public static String afterByteArrayCtor2(
-      @CallSite.AllArguments @Nonnull final Object[] params,
-      @CallSite.Return @Nonnull final String result) {
-    final CodecModule module = InstrumentationBridge.CODEC;
-    try {
-      if (module != null) {
-        final byte[] bytes = (byte[]) params[0];
-        if (bytes != null) {
-          final String charset =
-              params[1] instanceof Charset ? ((Charset) params[1]).name() : (String) params[1];
-          module.onStringFromBytes(bytes, 0, bytes.length, charset, result);
+    @CallSite.After("void java.lang.String.<init>(byte[], java.lang.String)")
+    @CallSite.After("void java.lang.String.<init>(byte[], java.nio.charset.Charset)")
+    public static String afterByteArrayCtor2(
+            @CallSite.AllArguments @Nonnull final Object[] params, @CallSite.Return @Nonnull final String result) {
+        final CodecModule module = InstrumentationBridge.CODEC;
+        try {
+            if (module != null) {
+                final byte[] bytes = (byte[]) params[0];
+                if (bytes != null) {
+                    final String charset =
+                            params[1] instanceof Charset ? ((Charset) params[1]).name() : (String) params[1];
+                    module.onStringFromBytes(bytes, 0, bytes.length, charset, result);
+                }
+            }
+        } catch (final Throwable e) {
+            module.onUnexpectedException("afterByteArrayCtor2 threw", e);
         }
-      }
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterByteArrayCtor2 threw", e);
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("void java.lang.String.<init>(byte[], int, int)")
-  public static String afterByteArrayCtor3(
-      @CallSite.AllArguments @Nonnull final Object[] params,
-      @CallSite.Return @Nonnull final String result) {
-    final CodecModule module = InstrumentationBridge.CODEC;
-    try {
-      if (module != null) {
-        final byte[] bytes = (byte[]) params[0];
-        if (bytes != null) {
-          module.onStringFromBytes(bytes, (int) params[1], (int) params[2], null, result);
+    @CallSite.After("void java.lang.String.<init>(byte[], int, int)")
+    public static String afterByteArrayCtor3(
+            @CallSite.AllArguments @Nonnull final Object[] params, @CallSite.Return @Nonnull final String result) {
+        final CodecModule module = InstrumentationBridge.CODEC;
+        try {
+            if (module != null) {
+                final byte[] bytes = (byte[]) params[0];
+                if (bytes != null) {
+                    module.onStringFromBytes(bytes, (int) params[1], (int) params[2], null, result);
+                }
+            }
+        } catch (final Throwable e) {
+            module.onUnexpectedException("afterByteArrayCtor3 threw", e);
         }
-      }
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterByteArrayCtor3 threw", e);
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("void java.lang.String.<init>(byte[], int, int, java.lang.String)")
-  @CallSite.After("void java.lang.String.<init>(byte[], int, int, java.nio.charset.Charset)")
-  public static String afterByteArrayCtor4(
-      @CallSite.AllArguments @Nonnull final Object[] params,
-      @CallSite.Return @Nonnull final String result) {
-    final CodecModule module = InstrumentationBridge.CODEC;
-    try {
-      if (module != null) {
-        final byte[] bytes = (byte[]) params[0];
-        if (bytes != null) {
-          final String charset =
-              params[3] instanceof Charset ? ((Charset) params[3]).name() : (String) params[3];
-          module.onStringFromBytes(bytes, (int) params[1], (int) params[2], charset, result);
+    @CallSite.After("void java.lang.String.<init>(byte[], int, int, java.lang.String)")
+    @CallSite.After("void java.lang.String.<init>(byte[], int, int, java.nio.charset.Charset)")
+    public static String afterByteArrayCtor4(
+            @CallSite.AllArguments @Nonnull final Object[] params, @CallSite.Return @Nonnull final String result) {
+        final CodecModule module = InstrumentationBridge.CODEC;
+        try {
+            if (module != null) {
+                final byte[] bytes = (byte[]) params[0];
+                if (bytes != null) {
+                    final String charset =
+                            params[3] instanceof Charset ? ((Charset) params[3]).name() : (String) params[3];
+                    module.onStringFromBytes(bytes, (int) params[1], (int) params[2], charset, result);
+                }
+            }
+        } catch (final Throwable e) {
+            module.onUnexpectedException("afterByteArrayCtor4 threw", e);
         }
-      }
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterByteArrayCtor4 threw", e);
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("byte[] java.lang.String.getBytes()")
-  public static byte[] afterGetBytes(
-      @CallSite.This @Nonnull final String self, @CallSite.Return @Nonnull final byte[] result) {
-    final CodecModule module = InstrumentationBridge.CODEC;
-    try {
-      if (module != null) {
-        module.onStringGetBytes(self, null, result);
-      }
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterGetBytes threw", e);
+    @CallSite.After("byte[] java.lang.String.getBytes()")
+    public static byte[] afterGetBytes(
+            @CallSite.This @Nonnull final String self, @CallSite.Return @Nonnull final byte[] result) {
+        final CodecModule module = InstrumentationBridge.CODEC;
+        try {
+            if (module != null) {
+                module.onStringGetBytes(self, null, result);
+            }
+        } catch (final Throwable e) {
+            module.onUnexpectedException("afterGetBytes threw", e);
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("byte[] java.lang.String.getBytes(java.lang.String)")
-  public static byte[] afterGetBytes(
-      @CallSite.This @Nonnull final String self,
-      @CallSite.Argument @Nullable final String encoding,
-      @CallSite.Return @Nonnull final byte[] result) {
-    final CodecModule module = InstrumentationBridge.CODEC;
-    try {
-      if (module != null) {
-        module.onStringGetBytes(self, encoding, result);
-      }
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterGetBytes threw", e);
+    @CallSite.After("byte[] java.lang.String.getBytes(java.lang.String)")
+    public static byte[] afterGetBytes(
+            @CallSite.This @Nonnull final String self,
+            @CallSite.Argument @Nullable final String encoding,
+            @CallSite.Return @Nonnull final byte[] result) {
+        final CodecModule module = InstrumentationBridge.CODEC;
+        try {
+            if (module != null) {
+                module.onStringGetBytes(self, encoding, result);
+            }
+        } catch (final Throwable e) {
+            module.onUnexpectedException("afterGetBytes threw", e);
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("byte[] java.lang.String.getBytes(java.nio.charset.Charset)")
-  public static byte[] afterGetBytes(
-      @CallSite.This @Nonnull final String self,
-      @CallSite.Argument @Nullable final Charset encoding,
-      @CallSite.Return @Nonnull final byte[] result) {
-    final CodecModule module = InstrumentationBridge.CODEC;
-    try {
-      if (module != null) {
-        module.onStringGetBytes(self, encoding == null ? null : encoding.name(), result);
-      }
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterGetBytes threw", e);
+    @CallSite.After("byte[] java.lang.String.getBytes(java.nio.charset.Charset)")
+    public static byte[] afterGetBytes(
+            @CallSite.This @Nonnull final String self,
+            @CallSite.Argument @Nullable final Charset encoding,
+            @CallSite.Return @Nonnull final byte[] result) {
+        final CodecModule module = InstrumentationBridge.CODEC;
+        try {
+            if (module != null) {
+                module.onStringGetBytes(self, encoding == null ? null : encoding.name(), result);
+            }
+        } catch (final Throwable e) {
+            module.onUnexpectedException("afterGetBytes threw", e);
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("char[] java.lang.String.toCharArray()")
-  public static char[] afterToCharArray(
-      @CallSite.This @Nonnull final String self, @CallSite.Return @Nonnull final char[] result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintObjectIfTainted(result, self, true, NOT_MARKED);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterToCharArray threw", e);
-      }
+    @CallSite.After("char[] java.lang.String.toCharArray()")
+    public static char[] afterToCharArray(
+            @CallSite.This @Nonnull final String self, @CallSite.Return @Nonnull final char[] result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintObjectIfTainted(result, self, true, NOT_MARKED);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterToCharArray threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java
index 395c963bf4e..f8945432f01 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java
@@ -14,37 +14,37 @@
 
 @AutoService(InstrumenterModule.class)
 public class CustomMBeanBuilderInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForConfiguredType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForConfiguredType, Instrumenter.HasMethodAdvice {
 
-  private final String customBuilder;
+    private final String customBuilder;
 
-  public CustomMBeanBuilderInstrumentation() {
-    super("java-lang-management");
+    public CustomMBeanBuilderInstrumentation() {
+        super("java-lang-management");
 
-    customBuilder = SystemProperties.get("javax.management.builder.initial");
-  }
+        customBuilder = SystemProperties.get("javax.management.builder.initial");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && customBuilder != null && !customBuilder.isEmpty();
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && customBuilder != null && !customBuilder.isEmpty();
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("newMBeanServer")).and(returns(named("javax.management.MBeanServer"))),
-        this.getClass().getName() + "$StoreMBeanServerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("newMBeanServer")).and(returns(named("javax.management.MBeanServer"))),
+                this.getClass().getName() + "$StoreMBeanServerAdvice");
+    }
 
-  @Override
-  public String configuredMatchingType() {
-    return customBuilder;
-  }
+    @Override
+    public String configuredMatchingType() {
+        return customBuilder;
+    }
 
-  public static class StoreMBeanServerAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterCreation(@Advice.Return final MBeanServer mbeanServer) {
-      MBeanServerRegistry.putServer(mbeanServer.getClass().getName(), mbeanServer);
+    public static class StoreMBeanServerAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterCreation(@Advice.Return final MBeanServer mbeanServer) {
+            MBeanServerRegistry.putServer(mbeanServer.getClass().getName(), mbeanServer);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java
index 660a0d7bfad..22d064164a5 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java
@@ -2,25 +2,25 @@
 
 public interface TestAbstractStringBuilderSuite<E> {
 
-  E init(final String param);
+    E init(final String param);
 
-  E init(final CharSequence param);
+    E init(final CharSequence param);
 
-  void append(final E target, final String param);
+    void append(final E target, final String param);
 
-  void append(final E target, final CharSequence param);
+    void append(final E target, final CharSequence param);
 
-  void append(final E target, final CharSequence param, int start, int end);
+    void append(final E target, final CharSequence param, int start, int end);
 
-  void append(final E target, final Object param);
+    void append(final E target, final Object param);
 
-  String substring(final E self, final int beginIndex, final int endIndex);
+    String substring(final E self, final int beginIndex, final int endIndex);
 
-  String substring(final E self, final int beginIndex);
+    String substring(final E self, final int beginIndex);
 
-  CharSequence subSequence(final E self, final int beginIndex, final int endIndex);
+    CharSequence subSequence(final E self, final int beginIndex, final int endIndex);
 
-  void setLength(final E self, final int length);
+    void setLength(final E self, final int length);
 
-  String toString(final E target);
+    String toString(final E target);
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestClassLoaderSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestClassLoaderSuite.java
index d548aa8015c..db4397f9a7e 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestClassLoaderSuite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestClassLoaderSuite.java
@@ -5,12 +5,12 @@
 
 public class TestClassLoaderSuite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestClassLoaderSuite.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestClassLoaderSuite.class);
 
-  public static Class<?> loadClass(final String className) throws ClassNotFoundException {
-    LOGGER.debug("Before loadClass");
-    final Class<?> result = ClassLoader.getSystemClassLoader().loadClass(className);
-    LOGGER.debug("After loadClass {}", result);
-    return result;
-  }
+    public static Class<?> loadClass(final String className) throws ClassNotFoundException {
+        LOGGER.debug("Before loadClass");
+        final Class<?> result = ClassLoader.getSystemClassLoader().loadClass(className);
+        LOGGER.debug("After loadClass {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestClassSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestClassSuite.java
index 6229f18a7e6..1ddfbec4233 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestClassSuite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestClassSuite.java
@@ -7,55 +7,50 @@
 
 public class TestClassSuite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestClassSuite.class);
-
-  public static Class<?> forName(final String className) throws ClassNotFoundException {
-    LOGGER.debug("Before forName");
-    final Class<?> result = Class.forName(className);
-    LOGGER.debug("After forName {}", result);
-    return result;
-  }
-
-  public static Class<?> forName(
-      final String className, boolean initialize, final ClassLoader loader)
-      throws ClassNotFoundException {
-    LOGGER.debug("Before forName");
-    final Class<?> result = Class.forName(className, initialize, loader);
-    LOGGER.debug("After forName {}", result);
-    return result;
-  }
-
-  public static Method getMethod(
-      final Class<?> clazz, final String method, final Class<?>... parameterTypes)
-      throws NoSuchMethodException {
-    LOGGER.debug("Before getMethod");
-    final Method result = clazz.getMethod(method, parameterTypes);
-    LOGGER.debug("After getMethod {}", result);
-    return result;
-  }
-
-  public static Method getDeclaredMethod(
-      final Class<?> clazz, final String method, final Class<?>... parameterTypes)
-      throws NoSuchMethodException {
-    LOGGER.debug("Before getDeclaredMethod");
-    final Method result = clazz.getDeclaredMethod(method, parameterTypes);
-    LOGGER.debug("After getDeclaredMethod {}", result);
-    return result;
-  }
-
-  public static Field getField(final Class<?> clazz, final String field)
-      throws NoSuchFieldException {
-    LOGGER.debug("Before getField");
-    final Field result = clazz.getField(field);
-    LOGGER.debug("After getField {}", result);
-    return result;
-  }
-
-  public static Field getDeclaredField(final Class<?> clazz, final String field)
-      throws NoSuchFieldException {
-    LOGGER.debug("Before getDeclaredField");
-    final Field result = clazz.getDeclaredField(field);
-    LOGGER.debug("After getDeclaredField {}", result);
-    return result;
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestClassSuite.class);
+
+    public static Class<?> forName(final String className) throws ClassNotFoundException {
+        LOGGER.debug("Before forName");
+        final Class<?> result = Class.forName(className);
+        LOGGER.debug("After forName {}", result);
+        return result;
+    }
+
+    public static Class<?> forName(final String className, boolean initialize, final ClassLoader loader)
+            throws ClassNotFoundException {
+        LOGGER.debug("Before forName");
+        final Class<?> result = Class.forName(className, initialize, loader);
+        LOGGER.debug("After forName {}", result);
+        return result;
+    }
+
+    public static Method getMethod(final Class<?> clazz, final String method, final Class<?>... parameterTypes)
+            throws NoSuchMethodException {
+        LOGGER.debug("Before getMethod");
+        final Method result = clazz.getMethod(method, parameterTypes);
+        LOGGER.debug("After getMethod {}", result);
+        return result;
+    }
+
+    public static Method getDeclaredMethod(final Class<?> clazz, final String method, final Class<?>... parameterTypes)
+            throws NoSuchMethodException {
+        LOGGER.debug("Before getDeclaredMethod");
+        final Method result = clazz.getDeclaredMethod(method, parameterTypes);
+        LOGGER.debug("After getDeclaredMethod {}", result);
+        return result;
+    }
+
+    public static Field getField(final Class<?> clazz, final String field) throws NoSuchFieldException {
+        LOGGER.debug("Before getField");
+        final Field result = clazz.getField(field);
+        LOGGER.debug("After getField {}", result);
+        return result;
+    }
+
+    public static Field getDeclaredField(final Class<?> clazz, final String field) throws NoSuchFieldException {
+        LOGGER.debug("Before getDeclaredField");
+        final Field result = clazz.getDeclaredField(field);
+        LOGGER.debug("After getDeclaredField {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestLookupSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestLookupSuite.java
index 6730b5a9bb2..7db8872aece 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestLookupSuite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestLookupSuite.java
@@ -8,101 +8,94 @@
 
 public class TestLookupSuite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestLookupSuite.class);
-  private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestLookupSuite.class);
+    private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
 
-  public static void findSetter(
-      final Class<?> clazz, final String method, final Class<?> fieldsType) {
-    LOGGER.debug("Before findSetter");
-    final MethodHandle result;
-    try {
-      result = LOOKUP.findSetter(clazz, method, fieldsType);
-      LOGGER.debug("After findSetter {}", result);
-    } catch (Exception e) {
-      LOGGER.debug("Error in findSetter", e);
+    public static void findSetter(final Class<?> clazz, final String method, final Class<?> fieldsType) {
+        LOGGER.debug("Before findSetter");
+        final MethodHandle result;
+        try {
+            result = LOOKUP.findSetter(clazz, method, fieldsType);
+            LOGGER.debug("After findSetter {}", result);
+        } catch (Exception e) {
+            LOGGER.debug("Error in findSetter", e);
+        }
     }
-  }
 
-  public static void findStaticSetter(
-      final Class<?> clazz, final String method, final Class<?> fieldsType) {
-    LOGGER.debug("Before findStaticSetter");
-    final MethodHandle result;
-    try {
-      result = LOOKUP.findStaticSetter(clazz, method, fieldsType);
-      LOGGER.debug("After findStaticSetter {}", result);
-    } catch (Exception e) {
-      LOGGER.debug("Error in findStaticSetter", e);
+    public static void findStaticSetter(final Class<?> clazz, final String method, final Class<?> fieldsType) {
+        LOGGER.debug("Before findStaticSetter");
+        final MethodHandle result;
+        try {
+            result = LOOKUP.findStaticSetter(clazz, method, fieldsType);
+            LOGGER.debug("After findStaticSetter {}", result);
+        } catch (Exception e) {
+            LOGGER.debug("Error in findStaticSetter", e);
+        }
     }
-  }
 
-  public static void findGetter(
-      final Class<?> clazz, final String method, final Class<?> fieldsType) {
-    LOGGER.debug("Before findGetter");
-    final MethodHandle result;
-    try {
-      result = LOOKUP.findGetter(clazz, method, fieldsType);
-      LOGGER.debug("After findGetter {}", result);
-    } catch (Exception e) {
-      LOGGER.debug("Error in findGetter", e);
+    public static void findGetter(final Class<?> clazz, final String method, final Class<?> fieldsType) {
+        LOGGER.debug("Before findGetter");
+        final MethodHandle result;
+        try {
+            result = LOOKUP.findGetter(clazz, method, fieldsType);
+            LOGGER.debug("After findGetter {}", result);
+        } catch (Exception e) {
+            LOGGER.debug("Error in findGetter", e);
+        }
     }
-  }
 
-  public static void findStaticGetter(
-      final Class<?> clazz, final String method, final Class<?> fieldsType) {
-    LOGGER.debug("Before findStaticGetter");
-    final MethodHandle result;
-    try {
-      result = LOOKUP.findStaticGetter(clazz, method, fieldsType);
-      LOGGER.debug("After findStaticGetter {}", result);
-    } catch (Exception e) {
-      LOGGER.debug("Error in findStaticGetter", e);
+    public static void findStaticGetter(final Class<?> clazz, final String method, final Class<?> fieldsType) {
+        LOGGER.debug("Before findStaticGetter");
+        final MethodHandle result;
+        try {
+            result = LOOKUP.findStaticGetter(clazz, method, fieldsType);
+            LOGGER.debug("After findStaticGetter {}", result);
+        } catch (Exception e) {
+            LOGGER.debug("Error in findStaticGetter", e);
+        }
     }
-  }
 
-  public static void bind(final Object obj, final String methodName, final MethodType methodType) {
-    LOGGER.debug("Before bind");
-    final MethodHandle result;
-    try {
-      result = LOOKUP.bind(obj, methodName, methodType);
-      LOGGER.debug("After bind {}", result);
-    } catch (Exception e) {
-      LOGGER.debug("Error in bind", e);
+    public static void bind(final Object obj, final String methodName, final MethodType methodType) {
+        LOGGER.debug("Before bind");
+        final MethodHandle result;
+        try {
+            result = LOOKUP.bind(obj, methodName, methodType);
+            LOGGER.debug("After bind {}", result);
+        } catch (Exception e) {
+            LOGGER.debug("Error in bind", e);
+        }
     }
-  }
 
-  public static void findSpecial(
-      final Class<?> clazz, final String method, final MethodType methodType) {
-    LOGGER.debug("Before findSpecial");
-    final MethodHandle result;
-    try {
-      result = LOOKUP.findSpecial(clazz, method, methodType, Class.class);
-      LOGGER.debug("After findSpecial {}", result);
-    } catch (Exception e) {
-      LOGGER.debug("Error in findSpecial", e);
+    public static void findSpecial(final Class<?> clazz, final String method, final MethodType methodType) {
+        LOGGER.debug("Before findSpecial");
+        final MethodHandle result;
+        try {
+            result = LOOKUP.findSpecial(clazz, method, methodType, Class.class);
+            LOGGER.debug("After findSpecial {}", result);
+        } catch (Exception e) {
+            LOGGER.debug("Error in findSpecial", e);
+        }
     }
-  }
 
-  public static void findStatic(
-      final Class<?> clazz, final String method, final MethodType methodType) {
-    LOGGER.debug("Before findStatic");
-    final MethodHandle result;
-    try {
-      result = LOOKUP.findStatic(clazz, method, methodType);
-      LOGGER.debug("After findStatic {}", result);
-    } catch (Exception e) {
-      LOGGER.debug("Error in findStatic", e);
+    public static void findStatic(final Class<?> clazz, final String method, final MethodType methodType) {
+        LOGGER.debug("Before findStatic");
+        final MethodHandle result;
+        try {
+            result = LOOKUP.findStatic(clazz, method, methodType);
+            LOGGER.debug("After findStatic {}", result);
+        } catch (Exception e) {
+            LOGGER.debug("Error in findStatic", e);
+        }
     }
-  }
 
-  public static void findVirtual(
-      final Class<?> clazz, final String method, final MethodType methodType) {
-    LOGGER.debug("Before findVirtual");
-    final MethodHandle result;
-    try {
-      result = LOOKUP.findVirtual(clazz, method, methodType);
-      LOGGER.debug("After findVirtual {}", result);
-    } catch (Exception e) {
-      LOGGER.debug("Error in findVirtual", e);
+    public static void findVirtual(final Class<?> clazz, final String method, final MethodType methodType) {
+        LOGGER.debug("Before findVirtual");
+        final MethodHandle result;
+        try {
+            result = LOOKUP.findVirtual(clazz, method, methodType);
+            LOGGER.debug("After findVirtual {}", result);
+        } catch (Exception e) {
+            LOGGER.debug("Error in findVirtual", e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestMathSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestMathSuite.java
index 97b1cd65640..82170bce5e8 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestMathSuite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestMathSuite.java
@@ -5,12 +5,12 @@
 
 public class TestMathSuite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestMathSuite.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestMathSuite.class);
 
-  public static double random() {
-    LOGGER.debug("Before random");
-    final double result = Math.random();
-    LOGGER.debug("After random {}", result);
-    return result;
-  }
+    public static double random() {
+        LOGGER.debug("Before random");
+        final double result = Math.random();
+        LOGGER.debug("After random {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestProcessBuilderSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestProcessBuilderSuite.java
index 74fee0f9f96..4cb1ca65dd0 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestProcessBuilderSuite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestProcessBuilderSuite.java
@@ -7,12 +7,12 @@
 
 public class TestProcessBuilderSuite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestProcessBuilderSuite.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestProcessBuilderSuite.class);
 
-  public static Process start(final List<String> command) throws IOException {
-    LOGGER.debug("Before process builder start {}", command);
-    final Process result = new ProcessBuilder(command).start();
-    LOGGER.debug("After process builder init {}", result);
-    return result;
-  }
+    public static Process start(final List<String> command) throws IOException {
+        LOGGER.debug("Before process builder start {}", command);
+        final Process result = new ProcessBuilder(command).start();
+        LOGGER.debug("After process builder init {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestRuntimeSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestRuntimeSuite.java
index 975f6e9cb5e..f591af3d578 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestRuntimeSuite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestRuntimeSuite.java
@@ -7,55 +7,53 @@
 
 public class TestRuntimeSuite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestRuntimeSuite.class);
-
-  private final Runtime runtime;
-
-  public TestRuntimeSuite(final Runtime runtime) {
-    this.runtime = runtime;
-  }
-
-  public Process exec(final String command) throws IOException {
-    LOGGER.debug("Before runtime exec {}", command);
-    final Process result = runtime.exec(command);
-    LOGGER.debug("After runtime exec {}", result);
-    return result;
-  }
-
-  public Process exec(final String[] command) throws IOException {
-    LOGGER.debug("Before runtime exec {}", (Object) command);
-    final Process result = runtime.exec(command);
-    LOGGER.debug("After runtime exec {}", result);
-    return result;
-  }
-
-  public Process exec(final String command, final String[] envp) throws IOException {
-    LOGGER.debug("Before runtime exec {} {}", command, envp);
-    final Process result = runtime.exec(command, envp);
-    LOGGER.debug("After runtime exec {}", result);
-    return result;
-  }
-
-  public Process exec(final String[] command, final String[] envp) throws IOException {
-    LOGGER.debug("Before runtime exec {} {}", command, envp);
-    final Process result = runtime.exec(command, envp);
-    LOGGER.debug("After runtime exec {}", result);
-    return result;
-  }
-
-  public Process exec(final String command, final String[] envp, final File file)
-      throws IOException {
-    LOGGER.debug("Before runtime exec {} {} {}", command, envp, file);
-    final Process result = runtime.exec(command, envp, file);
-    LOGGER.debug("After runtime exec {}", result);
-    return result;
-  }
-
-  public Process exec(final String[] command, final String[] envp, final File file)
-      throws IOException {
-    LOGGER.debug("Before runtime exec {} {} {}", command, envp, file);
-    final Process result = runtime.exec(command, envp, file);
-    LOGGER.debug("After runtime exec {}", result);
-    return result;
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestRuntimeSuite.class);
+
+    private final Runtime runtime;
+
+    public TestRuntimeSuite(final Runtime runtime) {
+        this.runtime = runtime;
+    }
+
+    public Process exec(final String command) throws IOException {
+        LOGGER.debug("Before runtime exec {}", command);
+        final Process result = runtime.exec(command);
+        LOGGER.debug("After runtime exec {}", result);
+        return result;
+    }
+
+    public Process exec(final String[] command) throws IOException {
+        LOGGER.debug("Before runtime exec {}", (Object) command);
+        final Process result = runtime.exec(command);
+        LOGGER.debug("After runtime exec {}", result);
+        return result;
+    }
+
+    public Process exec(final String command, final String[] envp) throws IOException {
+        LOGGER.debug("Before runtime exec {} {}", command, envp);
+        final Process result = runtime.exec(command, envp);
+        LOGGER.debug("After runtime exec {}", result);
+        return result;
+    }
+
+    public Process exec(final String[] command, final String[] envp) throws IOException {
+        LOGGER.debug("Before runtime exec {} {}", command, envp);
+        final Process result = runtime.exec(command, envp);
+        LOGGER.debug("After runtime exec {}", result);
+        return result;
+    }
+
+    public Process exec(final String command, final String[] envp, final File file) throws IOException {
+        LOGGER.debug("Before runtime exec {} {} {}", command, envp, file);
+        final Process result = runtime.exec(command, envp, file);
+        LOGGER.debug("After runtime exec {}", result);
+        return result;
+    }
+
+    public Process exec(final String[] command, final String[] envp, final File file) throws IOException {
+        LOGGER.debug("Before runtime exec {} {} {}", command, envp, file);
+        final Process result = runtime.exec(command, envp, file);
+        LOGGER.debug("After runtime exec {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringBufferSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringBufferSuite.java
index 71ef6707a42..5f3a79ba783 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringBufferSuite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringBufferSuite.java
@@ -5,89 +5,88 @@
 
 public class TestStringBufferSuite implements TestAbstractStringBuilderSuite<StringBuffer> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestStringBufferSuite.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestStringBufferSuite.class);
 
-  @Override
-  public StringBuffer init(final String param) {
-    LOGGER.debug("Before new string buffer {}", param);
-    final StringBuffer result = new StringBuffer(param);
-    LOGGER.debug("After new string buffer {}", result);
-    return result;
-  }
+    @Override
+    public StringBuffer init(final String param) {
+        LOGGER.debug("Before new string buffer {}", param);
+        final StringBuffer result = new StringBuffer(param);
+        LOGGER.debug("After new string buffer {}", result);
+        return result;
+    }
 
-  @Override
-  public StringBuffer init(final CharSequence param) {
-    LOGGER.debug("Before new string buffer {}", param);
-    final StringBuffer result = new StringBuffer(param);
-    LOGGER.debug("After new string buffer {}", result);
-    return result;
-  }
+    @Override
+    public StringBuffer init(final CharSequence param) {
+        LOGGER.debug("Before new string buffer {}", param);
+        final StringBuffer result = new StringBuffer(param);
+        LOGGER.debug("After new string buffer {}", result);
+        return result;
+    }
 
-  @Override
-  public void append(final StringBuffer buffer, final String param) {
-    LOGGER.debug("Before string buffer append {}", param);
-    final StringBuffer result = buffer.append(param);
-    LOGGER.debug("After string buffer append {}", result);
-  }
+    @Override
+    public void append(final StringBuffer buffer, final String param) {
+        LOGGER.debug("Before string buffer append {}", param);
+        final StringBuffer result = buffer.append(param);
+        LOGGER.debug("After string buffer append {}", result);
+    }
 
-  @Override
-  public void append(final StringBuffer buffer, final CharSequence param) {
-    LOGGER.debug("Before string buffer append {}", param);
-    final StringBuffer result = buffer.append(param);
-    LOGGER.debug("After string buffer append {}", result);
-  }
+    @Override
+    public void append(final StringBuffer buffer, final CharSequence param) {
+        LOGGER.debug("Before string buffer append {}", param);
+        final StringBuffer result = buffer.append(param);
+        LOGGER.debug("After string buffer append {}", result);
+    }
 
-  @Override
-  public void append(final StringBuffer builder, final CharSequence param, int start, int end) {
-    LOGGER.debug("Before string buffer append {} with start {} and end {}", param, start, end);
-    final StringBuffer result = builder.append(param, start, end);
-    LOGGER.debug("After string buffer append {}", result);
-  }
+    @Override
+    public void append(final StringBuffer builder, final CharSequence param, int start, int end) {
+        LOGGER.debug("Before string buffer append {} with start {} and end {}", param, start, end);
+        final StringBuffer result = builder.append(param, start, end);
+        LOGGER.debug("After string buffer append {}", result);
+    }
 
-  @Override
-  public void append(final StringBuffer buffer, final Object param) {
-    LOGGER.debug("Before string buffer append {}", param);
-    final StringBuffer result = buffer.append(param);
-    LOGGER.debug("After string buffer append {}", result);
-  }
+    @Override
+    public void append(final StringBuffer buffer, final Object param) {
+        LOGGER.debug("Before string buffer append {}", param);
+        final StringBuffer result = buffer.append(param);
+        LOGGER.debug("After string buffer append {}", result);
+    }
 
-  @Override
-  public String toString(final StringBuffer buffer) {
-    LOGGER.debug("Before string buffer toString {}", buffer);
-    final String result = buffer.toString();
-    LOGGER.debug("After string buffer toString {}", result);
-    return result;
-  }
+    @Override
+    public String toString(final StringBuffer buffer) {
+        LOGGER.debug("Before string buffer toString {}", buffer);
+        final String result = buffer.toString();
+        LOGGER.debug("After string buffer toString {}", result);
+        return result;
+    }
 
-  @Override
-  public String substring(final StringBuffer self, final int beginIndex, final int endIndex) {
-    LOGGER.debug("Before string buffer substring {} from {} to {}", self, beginIndex, endIndex);
-    final String result = self.substring(beginIndex, endIndex);
-    LOGGER.debug("After string buffer substring {}", result);
-    return result;
-  }
+    @Override
+    public String substring(final StringBuffer self, final int beginIndex, final int endIndex) {
+        LOGGER.debug("Before string buffer substring {} from {} to {}", self, beginIndex, endIndex);
+        final String result = self.substring(beginIndex, endIndex);
+        LOGGER.debug("After string buffer substring {}", result);
+        return result;
+    }
 
-  @Override
-  public String substring(final StringBuffer self, final int beginIndex) {
-    LOGGER.debug("Before string buffer substring {} from {}", self, beginIndex);
-    final String result = self.substring(beginIndex);
-    LOGGER.debug("After string buffer substring {}", result);
-    return result;
-  }
+    @Override
+    public String substring(final StringBuffer self, final int beginIndex) {
+        LOGGER.debug("Before string buffer substring {} from {}", self, beginIndex);
+        final String result = self.substring(beginIndex);
+        LOGGER.debug("After string buffer substring {}", result);
+        return result;
+    }
 
-  @Override
-  public CharSequence subSequence(
-      final StringBuffer self, final int beginIndex, final int endIndex) {
-    LOGGER.debug("Before string buffer subSequence {} from {} to {}", self, beginIndex, endIndex);
-    final CharSequence result = self.subSequence(beginIndex, endIndex);
-    LOGGER.debug("After string buffer subSequence {}", result);
-    return result;
-  }
+    @Override
+    public CharSequence subSequence(final StringBuffer self, final int beginIndex, final int endIndex) {
+        LOGGER.debug("Before string buffer subSequence {} from {} to {}", self, beginIndex, endIndex);
+        final CharSequence result = self.subSequence(beginIndex, endIndex);
+        LOGGER.debug("After string buffer subSequence {}", result);
+        return result;
+    }
 
-  @Override
-  public void setLength(final StringBuffer self, final int length) {
-    LOGGER.debug("Before string buffer setLength {} with length {}", self, length);
-    self.setLength(length);
-    LOGGER.debug("After string buffer setLength {}", self);
-  }
+    @Override
+    public void setLength(final StringBuffer self, final int length) {
+        LOGGER.debug("Before string buffer setLength {} with length {}", self, length);
+        self.setLength(length);
+        LOGGER.debug("After string buffer setLength {}", self);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringBuilderSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringBuilderSuite.java
index 36eb5dcb900..873d73896a1 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringBuilderSuite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringBuilderSuite.java
@@ -6,113 +6,112 @@
 
 public class TestStringBuilderSuite implements TestAbstractStringBuilderSuite<StringBuilder> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestStringBuilderSuite.class);
-
-  @Override
-  public StringBuilder init(final String param) {
-    LOGGER.debug("Before new string builder {}", param);
-    final StringBuilder result = new StringBuilder(param);
-    LOGGER.debug("After new string builder {}", result);
-    return result;
-  }
-
-  @Override
-  public StringBuilder init(final CharSequence param) {
-    LOGGER.debug("Before new string builder {}", param);
-    final StringBuilder result = new StringBuilder(param);
-    LOGGER.debug("After new string builder {}", result);
-    return result;
-  }
-
-  @Override
-  public void append(final StringBuilder builder, final String param) {
-    LOGGER.debug("Before string builder append {}", param);
-    final StringBuilder result = builder.append(param);
-    LOGGER.debug("After string builder append {}", result);
-  }
-
-  @Override
-  public void append(final StringBuilder builder, final CharSequence param) {
-    LOGGER.debug("Before string builder append {}", param);
-    final StringBuilder result = builder.append(param);
-    LOGGER.debug("After string builder append {}", result);
-  }
-
-  @Override
-  public void append(final StringBuilder builder, final CharSequence param, int start, int end) {
-    LOGGER.debug("Before string builder append {} with start {} and end {}", param, start, end);
-    final StringBuilder result = builder.append(param, start, end);
-    LOGGER.debug("After string builder append {}", result);
-  }
-
-  @Override
-  public void append(final StringBuilder builder, final Object param) {
-    LOGGER.debug("Before string builder append {}", param);
-    final StringBuilder result = builder.append(param);
-    LOGGER.debug("After string builder append {}", result);
-  }
-
-  @Override
-  public String toString(final StringBuilder builder) {
-    LOGGER.debug("Before string builder toString {}", builder);
-    final String result = builder.toString();
-    LOGGER.debug("After string builder toString {}", result);
-    return result;
-  }
-
-  public String plus(final String left, final String right) {
-    LOGGER.debug("Before string plus {} {}", left, right);
-    final String result = left + right;
-    LOGGER.debug("After string builder toString {}", result);
-    return result;
-  }
-
-  public String plus(final String left, final Object right) {
-    LOGGER.debug("Before string plus {} {}", left, right);
-    final String result = left + right;
-    LOGGER.debug("After string builder toString {}", result);
-    return result;
-  }
-
-  public String plus(final Object... items) {
-    LOGGER.debug("Before string plus {}", Arrays.toString(items));
-    String result = "";
-    for (final Object item : items) {
-      result += item;
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestStringBuilderSuite.class);
+
+    @Override
+    public StringBuilder init(final String param) {
+        LOGGER.debug("Before new string builder {}", param);
+        final StringBuilder result = new StringBuilder(param);
+        LOGGER.debug("After new string builder {}", result);
+        return result;
+    }
+
+    @Override
+    public StringBuilder init(final CharSequence param) {
+        LOGGER.debug("Before new string builder {}", param);
+        final StringBuilder result = new StringBuilder(param);
+        LOGGER.debug("After new string builder {}", result);
+        return result;
+    }
+
+    @Override
+    public void append(final StringBuilder builder, final String param) {
+        LOGGER.debug("Before string builder append {}", param);
+        final StringBuilder result = builder.append(param);
+        LOGGER.debug("After string builder append {}", result);
+    }
+
+    @Override
+    public void append(final StringBuilder builder, final CharSequence param) {
+        LOGGER.debug("Before string builder append {}", param);
+        final StringBuilder result = builder.append(param);
+        LOGGER.debug("After string builder append {}", result);
+    }
+
+    @Override
+    public void append(final StringBuilder builder, final CharSequence param, int start, int end) {
+        LOGGER.debug("Before string builder append {} with start {} and end {}", param, start, end);
+        final StringBuilder result = builder.append(param, start, end);
+        LOGGER.debug("After string builder append {}", result);
+    }
+
+    @Override
+    public void append(final StringBuilder builder, final Object param) {
+        LOGGER.debug("Before string builder append {}", param);
+        final StringBuilder result = builder.append(param);
+        LOGGER.debug("After string builder append {}", result);
+    }
+
+    @Override
+    public String toString(final StringBuilder builder) {
+        LOGGER.debug("Before string builder toString {}", builder);
+        final String result = builder.toString();
+        LOGGER.debug("After string builder toString {}", result);
+        return result;
+    }
+
+    public String plus(final String left, final String right) {
+        LOGGER.debug("Before string plus {} {}", left, right);
+        final String result = left + right;
+        LOGGER.debug("After string builder toString {}", result);
+        return result;
+    }
+
+    public String plus(final String left, final Object right) {
+        LOGGER.debug("Before string plus {} {}", left, right);
+        final String result = left + right;
+        LOGGER.debug("After string builder toString {}", result);
+        return result;
+    }
+
+    public String plus(final Object... items) {
+        LOGGER.debug("Before string plus {}", Arrays.toString(items));
+        String result = "";
+        for (final Object item : items) {
+            result += item;
+        }
+        LOGGER.debug("After string builder toString {}", result);
+        return result;
+    }
+
+    @Override
+    public String substring(final StringBuilder self, final int beginIndex, final int endIndex) {
+        LOGGER.debug("Before string builder substring {} from {} to {}", self, beginIndex, endIndex);
+        final String result = self.substring(beginIndex, endIndex);
+        LOGGER.debug("After string builder substring {}", result);
+        return result;
+    }
+
+    @Override
+    public String substring(final StringBuilder self, final int beginIndex) {
+        LOGGER.debug("Before string builder substring {} from {}", self, beginIndex);
+        final String result = self.substring(beginIndex);
+        LOGGER.debug("After string builder substring {}", result);
+        return result;
+    }
+
+    @Override
+    public CharSequence subSequence(final StringBuilder self, final int beginIndex, final int endIndex) {
+        LOGGER.debug("Before string builder subSequence {} from {} to {}", self, beginIndex, endIndex);
+        final CharSequence result = self.subSequence(beginIndex, endIndex);
+        LOGGER.debug("After string builder subSequence {}", result);
+        return result;
+    }
+
+    @Override
+    public void setLength(final StringBuilder self, final int length) {
+        LOGGER.debug("Before string builder setLength {} with length {}", self, length);
+        self.setLength(length);
+        LOGGER.debug("After string builder setLength {}", self);
     }
-    LOGGER.debug("After string builder toString {}", result);
-    return result;
-  }
-
-  @Override
-  public String substring(final StringBuilder self, final int beginIndex, final int endIndex) {
-    LOGGER.debug("Before string builder substring {} from {} to {}", self, beginIndex, endIndex);
-    final String result = self.substring(beginIndex, endIndex);
-    LOGGER.debug("After string builder substring {}", result);
-    return result;
-  }
-
-  @Override
-  public String substring(final StringBuilder self, final int beginIndex) {
-    LOGGER.debug("Before string builder substring {} from {}", self, beginIndex);
-    final String result = self.substring(beginIndex);
-    LOGGER.debug("After string builder substring {}", result);
-    return result;
-  }
-
-  @Override
-  public CharSequence subSequence(
-      final StringBuilder self, final int beginIndex, final int endIndex) {
-    LOGGER.debug("Before string builder subSequence {} from {} to {}", self, beginIndex, endIndex);
-    final CharSequence result = self.subSequence(beginIndex, endIndex);
-    LOGGER.debug("After string builder subSequence {}", result);
-    return result;
-  }
-
-  @Override
-  public void setLength(final StringBuilder self, final int length) {
-    LOGGER.debug("Before string builder setLength {} with length {}", self, length);
-    self.setLength(length);
-    LOGGER.debug("After string builder setLength {}", self);
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringSuite.java
index edf1559554b..07a7cc28dbc 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringSuite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringSuite.java
@@ -8,242 +8,237 @@
 
 public class TestStringSuite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestStringSuite.class);
-
-  public static String concat(final String left, final String right) {
-    LOGGER.debug("Before string concat {} {}", left, right);
-    final String result = left.concat(right);
-    LOGGER.debug("After string concat {}", result);
-    return result;
-  }
-
-  public static String substring(String self, int beginIndex, int endIndex) {
-    LOGGER.debug("Before string substring {} from {} to {}", self, beginIndex, endIndex);
-    final String result = self.substring(beginIndex, endIndex);
-    LOGGER.debug("After string substring {}", result);
-    return result;
-  }
-
-  public static String substring(String self, int beginIndex) {
-    LOGGER.debug("Before string substring {} from {}", self, beginIndex);
-    final String result = self.substring(beginIndex);
-    LOGGER.debug("After string substring {}", result);
-    return result;
-  }
-
-  public static CharSequence subSequence(String self, Integer beginIndex, Integer endIndex) {
-    LOGGER.debug("Before string subSequence {} from {} to {}", self, beginIndex, endIndex);
-    final CharSequence result = self.subSequence(beginIndex, endIndex);
-    LOGGER.debug("After string subSequence {}", result);
-    return result;
-  }
-
-  public static String join(CharSequence delimiter, CharSequence[] elements) {
-    LOGGER.debug("Before string join {} with {}", elements, delimiter);
-    final String result = String.join(delimiter, elements);
-    LOGGER.debug("After string join {}", result);
-    return result;
-  }
-
-  public static String join(CharSequence delimiter, Iterable<? extends CharSequence> elements) {
-    LOGGER.debug("Before string join {} with {}", elements, delimiter);
-    final String result = String.join(delimiter, elements);
-    LOGGER.debug("After string join {}", result);
-    return result;
-  }
-
-  public static String stringToUpperCase(String in, Locale locale) {
-    LOGGER.debug("Before string toUppercase {} ", in);
-    if (null == locale) {
-      final String result = in.toUpperCase();
-      LOGGER.debug("After string toUppercase {}", result);
-      return result;
-    } else {
-      final String result = in.toUpperCase(locale);
-      LOGGER.debug("After string toUppercase {}", result);
-      return result;
-    }
-  }
-
-  public static String stringToLowerCase(String in, Locale locale) {
-    LOGGER.debug("Before string toLowercase {} ", in);
-    if (null == locale) {
-      final String result = in.toLowerCase();
-      LOGGER.debug("After string toLowercase {}", result);
-      return result;
-    } else {
-      final String result = in.toLowerCase(locale);
-      LOGGER.debug("After string toLowercase {}", result);
-      return result;
-    }
-  }
-
-  public static String stringTrim(final String self) {
-    LOGGER.debug("Before string trim {} ", self);
-    final String result = self.trim();
-    LOGGER.debug("After string trim {}", result);
-    return result;
-  }
-
-  public static String stringConstructor(String self) {
-    LOGGER.debug("Before string stringConstructor {}", self);
-    final String result = new String(self);
-    LOGGER.debug("After string stringConstructor {}", result);
-    return result;
-  }
-
-  public static String stringConstructor(StringBuffer self) {
-    LOGGER.debug("Before string stringConstructor {}", self);
-    final String result = new String(self);
-    LOGGER.debug("After string stringConstructor {}", result);
-    return result;
-  }
-
-  public static String stringConstructor(StringBuilder self) {
-    LOGGER.debug("Before string stringConstructor {}", self);
-    final String result = new String(self);
-    LOGGER.debug("After string stringConstructor {}", result);
-    return result;
-  }
-
-  public static String stringConstructor(final byte[] value) {
-    LOGGER.debug("Before string stringConstructor {}", value);
-    final String result = new String(value);
-    LOGGER.debug("After string stringConstructor {}", result);
-    return result;
-  }
-
-  public static String stringConstructor(final byte[] value, final int offset, final int length) {
-    LOGGER.debug("Before string stringConstructor {} {} {}", value, offset, length);
-    final String result = new String(value, offset, length);
-    LOGGER.debug("After string stringConstructor {}", result);
-    return result;
-  }
-
-  public static String stringConstructor(final byte[] value, final String charset)
-      throws UnsupportedEncodingException {
-    LOGGER.debug("Before string stringConstructor {} {}", value, charset);
-    final String result = new String(value, charset);
-    LOGGER.debug("After string stringConstructor {}", result);
-    return result;
-  }
-
-  public static String stringConstructor(
-      final byte[] value, final int offset, final int length, final String charset)
-      throws UnsupportedEncodingException {
-    LOGGER.debug("Before string stringConstructor {} {} {} {}", value, offset, length, charset);
-    final String result = new String(value, offset, length, charset);
-    LOGGER.debug("After string stringConstructor {}", result);
-    return result;
-  }
-
-  public static String stringConstructor(final byte[] value, final Charset charset) {
-    LOGGER.debug("Before string stringConstructor {} {}", value, charset);
-    final String result = new String(value, charset);
-    LOGGER.debug("After string stringConstructor {}", result);
-    return result;
-  }
-
-  public static String stringConstructor(
-      final byte[] value, final int offset, final int length, final Charset charset) {
-    LOGGER.debug("Before string stringConstructor {} {} {} {}", value, offset, length, charset);
-    final String result = new String(value, offset, length, charset);
-    LOGGER.debug("After string stringConstructor {}", result);
-    return result;
-  }
-
-  public static byte[] getBytes(final String self) {
-    LOGGER.debug("Before string getBytes {}", self);
-    final byte[] result = self.getBytes();
-    LOGGER.debug("After string getBytes {}", result);
-    return result;
-  }
-
-  public static byte[] getBytes(final String self, final String charset)
-      throws UnsupportedEncodingException {
-    LOGGER.debug("Before string getBytes {} {}", self, charset);
-    final byte[] result = self.getBytes(charset);
-    LOGGER.debug("After string getBytes {}", result);
-    return result;
-  }
-
-  public static byte[] getBytes(final String self, final Charset charset) {
-    LOGGER.debug("Before string getBytes {} {}", self, charset);
-    final byte[] result = self.getBytes(charset);
-    LOGGER.debug("After string getBytes {}", result);
-    return result;
-  }
-
-  public static String format(final String pattern, final Object... args) {
-    LOGGER.debug("Before format {} {}", pattern, args);
-    final String result = String.format(pattern, args);
-    LOGGER.debug("After format {}", result);
-    return result;
-  }
-
-  public static String format(final Locale locale, final String pattern, final Object... args) {
-    LOGGER.debug("Before format {} {} {}", locale, pattern, args);
-    final String result = String.format(locale, pattern, args);
-    LOGGER.debug("After format {}", result);
-    return result;
-  }
-
-  public static char[] toCharArray(final String string) {
-    LOGGER.debug("Before toCharArray {}", string);
-    char[] result = string.toCharArray();
-    LOGGER.debug("After toCharArray {}", result);
-    return result;
-  }
-
-  public static String[] split(final String string, final String regex) {
-    LOGGER.debug("Before split {} {}", string, regex);
-    String[] result = string.split(regex);
-    LOGGER.debug("After split {}", result);
-    return result;
-  }
-
-  public static String[] split(final String string, final String regex, final int limit) {
-    LOGGER.debug("Before split {} {} {}", string, regex, limit);
-    String[] result = string.split(regex, limit);
-    LOGGER.debug("After split {}", result);
-    return result;
-  }
-
-  public static String replace(final String string, final char oldChar, final char newChar) {
-    LOGGER.debug("Before replace {} {} {}", string, oldChar, newChar);
-    String result = string.replace(oldChar, newChar);
-    LOGGER.debug("After replace {}", result);
-    return result;
-  }
-
-  public static String replace(
-      final String string, final CharSequence oldCharSeq, final CharSequence newCharSeq) {
-    LOGGER.debug("Before replace {} {} {}", string, oldCharSeq, newCharSeq);
-    String result = string.replace(oldCharSeq, newCharSeq);
-    LOGGER.debug("After replace {}", result);
-    return result;
-  }
-
-  public static String replaceAll(
-      final String string, final String regex, final String replacement) {
-    LOGGER.debug("Before replace all {} {} {}", string, regex, replacement);
-    String result = string.replaceAll(regex, replacement);
-    LOGGER.debug("After replace all {}", result);
-    return result;
-  }
-
-  public static String replaceFirst(
-      final String string, final String regex, final String replacement) {
-    LOGGER.debug("Before replace first {} {} {}", string, regex, replacement);
-    String result = string.replaceFirst(regex, replacement);
-    LOGGER.debug("After replace first {}", result);
-    return result;
-  }
-
-  public static String valueOf(final Object param) {
-    LOGGER.debug("Before valueOf {}", param);
-    String result = String.valueOf(param);
-    LOGGER.debug("After valueOf {}", result);
-    return result;
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestStringSuite.class);
+
+    public static String concat(final String left, final String right) {
+        LOGGER.debug("Before string concat {} {}", left, right);
+        final String result = left.concat(right);
+        LOGGER.debug("After string concat {}", result);
+        return result;
+    }
+
+    public static String substring(String self, int beginIndex, int endIndex) {
+        LOGGER.debug("Before string substring {} from {} to {}", self, beginIndex, endIndex);
+        final String result = self.substring(beginIndex, endIndex);
+        LOGGER.debug("After string substring {}", result);
+        return result;
+    }
+
+    public static String substring(String self, int beginIndex) {
+        LOGGER.debug("Before string substring {} from {}", self, beginIndex);
+        final String result = self.substring(beginIndex);
+        LOGGER.debug("After string substring {}", result);
+        return result;
+    }
+
+    public static CharSequence subSequence(String self, Integer beginIndex, Integer endIndex) {
+        LOGGER.debug("Before string subSequence {} from {} to {}", self, beginIndex, endIndex);
+        final CharSequence result = self.subSequence(beginIndex, endIndex);
+        LOGGER.debug("After string subSequence {}", result);
+        return result;
+    }
+
+    public static String join(CharSequence delimiter, CharSequence[] elements) {
+        LOGGER.debug("Before string join {} with {}", elements, delimiter);
+        final String result = String.join(delimiter, elements);
+        LOGGER.debug("After string join {}", result);
+        return result;
+    }
+
+    public static String join(CharSequence delimiter, Iterable<? extends CharSequence> elements) {
+        LOGGER.debug("Before string join {} with {}", elements, delimiter);
+        final String result = String.join(delimiter, elements);
+        LOGGER.debug("After string join {}", result);
+        return result;
+    }
+
+    public static String stringToUpperCase(String in, Locale locale) {
+        LOGGER.debug("Before string toUppercase {} ", in);
+        if (null == locale) {
+            final String result = in.toUpperCase();
+            LOGGER.debug("After string toUppercase {}", result);
+            return result;
+        } else {
+            final String result = in.toUpperCase(locale);
+            LOGGER.debug("After string toUppercase {}", result);
+            return result;
+        }
+    }
+
+    public static String stringToLowerCase(String in, Locale locale) {
+        LOGGER.debug("Before string toLowercase {} ", in);
+        if (null == locale) {
+            final String result = in.toLowerCase();
+            LOGGER.debug("After string toLowercase {}", result);
+            return result;
+        } else {
+            final String result = in.toLowerCase(locale);
+            LOGGER.debug("After string toLowercase {}", result);
+            return result;
+        }
+    }
+
+    public static String stringTrim(final String self) {
+        LOGGER.debug("Before string trim {} ", self);
+        final String result = self.trim();
+        LOGGER.debug("After string trim {}", result);
+        return result;
+    }
+
+    public static String stringConstructor(String self) {
+        LOGGER.debug("Before string stringConstructor {}", self);
+        final String result = new String(self);
+        LOGGER.debug("After string stringConstructor {}", result);
+        return result;
+    }
+
+    public static String stringConstructor(StringBuffer self) {
+        LOGGER.debug("Before string stringConstructor {}", self);
+        final String result = new String(self);
+        LOGGER.debug("After string stringConstructor {}", result);
+        return result;
+    }
+
+    public static String stringConstructor(StringBuilder self) {
+        LOGGER.debug("Before string stringConstructor {}", self);
+        final String result = new String(self);
+        LOGGER.debug("After string stringConstructor {}", result);
+        return result;
+    }
+
+    public static String stringConstructor(final byte[] value) {
+        LOGGER.debug("Before string stringConstructor {}", value);
+        final String result = new String(value);
+        LOGGER.debug("After string stringConstructor {}", result);
+        return result;
+    }
+
+    public static String stringConstructor(final byte[] value, final int offset, final int length) {
+        LOGGER.debug("Before string stringConstructor {} {} {}", value, offset, length);
+        final String result = new String(value, offset, length);
+        LOGGER.debug("After string stringConstructor {}", result);
+        return result;
+    }
+
+    public static String stringConstructor(final byte[] value, final String charset)
+            throws UnsupportedEncodingException {
+        LOGGER.debug("Before string stringConstructor {} {}", value, charset);
+        final String result = new String(value, charset);
+        LOGGER.debug("After string stringConstructor {}", result);
+        return result;
+    }
+
+    public static String stringConstructor(final byte[] value, final int offset, final int length, final String charset)
+            throws UnsupportedEncodingException {
+        LOGGER.debug("Before string stringConstructor {} {} {} {}", value, offset, length, charset);
+        final String result = new String(value, offset, length, charset);
+        LOGGER.debug("After string stringConstructor {}", result);
+        return result;
+    }
+
+    public static String stringConstructor(final byte[] value, final Charset charset) {
+        LOGGER.debug("Before string stringConstructor {} {}", value, charset);
+        final String result = new String(value, charset);
+        LOGGER.debug("After string stringConstructor {}", result);
+        return result;
+    }
+
+    public static String stringConstructor(
+            final byte[] value, final int offset, final int length, final Charset charset) {
+        LOGGER.debug("Before string stringConstructor {} {} {} {}", value, offset, length, charset);
+        final String result = new String(value, offset, length, charset);
+        LOGGER.debug("After string stringConstructor {}", result);
+        return result;
+    }
+
+    public static byte[] getBytes(final String self) {
+        LOGGER.debug("Before string getBytes {}", self);
+        final byte[] result = self.getBytes();
+        LOGGER.debug("After string getBytes {}", result);
+        return result;
+    }
+
+    public static byte[] getBytes(final String self, final String charset) throws UnsupportedEncodingException {
+        LOGGER.debug("Before string getBytes {} {}", self, charset);
+        final byte[] result = self.getBytes(charset);
+        LOGGER.debug("After string getBytes {}", result);
+        return result;
+    }
+
+    public static byte[] getBytes(final String self, final Charset charset) {
+        LOGGER.debug("Before string getBytes {} {}", self, charset);
+        final byte[] result = self.getBytes(charset);
+        LOGGER.debug("After string getBytes {}", result);
+        return result;
+    }
+
+    public static String format(final String pattern, final Object... args) {
+        LOGGER.debug("Before format {} {}", pattern, args);
+        final String result = String.format(pattern, args);
+        LOGGER.debug("After format {}", result);
+        return result;
+    }
+
+    public static String format(final Locale locale, final String pattern, final Object... args) {
+        LOGGER.debug("Before format {} {} {}", locale, pattern, args);
+        final String result = String.format(locale, pattern, args);
+        LOGGER.debug("After format {}", result);
+        return result;
+    }
+
+    public static char[] toCharArray(final String string) {
+        LOGGER.debug("Before toCharArray {}", string);
+        char[] result = string.toCharArray();
+        LOGGER.debug("After toCharArray {}", result);
+        return result;
+    }
+
+    public static String[] split(final String string, final String regex) {
+        LOGGER.debug("Before split {} {}", string, regex);
+        String[] result = string.split(regex);
+        LOGGER.debug("After split {}", result);
+        return result;
+    }
+
+    public static String[] split(final String string, final String regex, final int limit) {
+        LOGGER.debug("Before split {} {} {}", string, regex, limit);
+        String[] result = string.split(regex, limit);
+        LOGGER.debug("After split {}", result);
+        return result;
+    }
+
+    public static String replace(final String string, final char oldChar, final char newChar) {
+        LOGGER.debug("Before replace {} {} {}", string, oldChar, newChar);
+        String result = string.replace(oldChar, newChar);
+        LOGGER.debug("After replace {}", result);
+        return result;
+    }
+
+    public static String replace(final String string, final CharSequence oldCharSeq, final CharSequence newCharSeq) {
+        LOGGER.debug("Before replace {} {} {}", string, oldCharSeq, newCharSeq);
+        String result = string.replace(oldCharSeq, newCharSeq);
+        LOGGER.debug("After replace {}", result);
+        return result;
+    }
+
+    public static String replaceAll(final String string, final String regex, final String replacement) {
+        LOGGER.debug("Before replace all {} {} {}", string, regex, replacement);
+        String result = string.replaceAll(regex, replacement);
+        LOGGER.debug("After replace all {}", result);
+        return result;
+    }
+
+    public static String replaceFirst(final String string, final String regex, final String replacement) {
+        LOGGER.debug("Before replace first {} {} {}", string, regex, replacement);
+        String result = string.replaceFirst(regex, replacement);
+        LOGGER.debug("After replace first {}", result);
+        return result;
+    }
+
+    public static String valueOf(final Object param) {
+        LOGGER.debug("Before valueOf {}", param);
+        String result = String.valueOf(param);
+        LOGGER.debug("After valueOf {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk11/StringCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk11/StringCallSite.java
index 2a5319c6b67..4c9a78423c8 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk11/StringCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk11/StringCallSite.java
@@ -8,51 +8,49 @@
 
 @Propagation
 @CallSite(
-    spi = IastCallSites.class,
-    enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isMajorJavaVersionAtLeast", "11"})
+        spi = IastCallSites.class,
+        enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isMajorJavaVersionAtLeast", "11"})
 public class StringCallSite {
-  @CallSite.After("java.lang.String java.lang.String.repeat(int)")
-  public static String afterRepeat(
-      @CallSite.This final String self,
-      @CallSite.Argument final int count,
-      @CallSite.Return final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    try {
-      if (module != null) {
-        module.onStringRepeat(self, count, result);
-      }
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterRepeat threw", e);
+    @CallSite.After("java.lang.String java.lang.String.repeat(int)")
+    public static String afterRepeat(
+            @CallSite.This final String self,
+            @CallSite.Argument final int count,
+            @CallSite.Return final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        try {
+            if (module != null) {
+                module.onStringRepeat(self, count, result);
+            }
+        } catch (final Throwable e) {
+            module.onUnexpectedException("afterRepeat threw", e);
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String java.lang.String.strip()")
-  @CallSite.After("java.lang.String java.lang.String.stripLeading()")
-  public static String afterStrip(
-      @CallSite.This final String self, @CallSite.Return final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    try {
-      if (module != null) {
-        module.onStringStrip(self, result, false);
-      }
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterStrip threw", e);
+    @CallSite.After("java.lang.String java.lang.String.strip()")
+    @CallSite.After("java.lang.String java.lang.String.stripLeading()")
+    public static String afterStrip(@CallSite.This final String self, @CallSite.Return final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        try {
+            if (module != null) {
+                module.onStringStrip(self, result, false);
+            }
+        } catch (final Throwable e) {
+            module.onUnexpectedException("afterStrip threw", e);
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String java.lang.String.stripTrailing()")
-  public static String afterStripTrailing(
-      @CallSite.This final String self, @CallSite.Return final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    try {
-      if (module != null) {
-        module.onStringStrip(self, result, true);
-      }
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterStripTrailing threw", e);
+    @CallSite.After("java.lang.String java.lang.String.stripTrailing()")
+    public static String afterStripTrailing(@CallSite.This final String self, @CallSite.Return final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        try {
+            if (module != null) {
+                module.onStringStrip(self, result, true);
+            }
+        } catch (final Throwable e) {
+            module.onUnexpectedException("afterStripTrailing threw", e);
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/src/test/java/foo/bar/TestStringJDK11Suite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/src/test/java/foo/bar/TestStringJDK11Suite.java
index 25e3d57e769..b5c4a80d0be 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/src/test/java/foo/bar/TestStringJDK11Suite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/src/test/java/foo/bar/TestStringJDK11Suite.java
@@ -5,35 +5,35 @@
 
 public abstract class TestStringJDK11Suite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestStringJDK11Suite.class);
-
-  private TestStringJDK11Suite() {}
-
-  public static String stringRepeat(String self, int count) {
-    LOGGER.debug("Before string repeat {} times", count);
-    final String result = self.repeat(count);
-    LOGGER.debug("After string repeat {}", result);
-    return result;
-  }
-
-  public static String stringStrip(final String self) {
-    LOGGER.debug("Before string strip {}", self);
-    final String result = self.strip();
-    LOGGER.debug("After string strip {}", result);
-    return result;
-  }
-
-  public static String stringStripLeading(final String self) {
-    LOGGER.debug("Before string stripLeading {}", self);
-    final String result = self.stripLeading();
-    LOGGER.debug("After string stripLeading {}", result);
-    return result;
-  }
-
-  public static String stringStripTrailing(final String self) {
-    LOGGER.debug("Before string stripTrailing {}", self);
-    final String result = self.stripTrailing();
-    LOGGER.debug("After string stripTrailing {}", result);
-    return result;
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestStringJDK11Suite.class);
+
+    private TestStringJDK11Suite() {}
+
+    public static String stringRepeat(String self, int count) {
+        LOGGER.debug("Before string repeat {} times", count);
+        final String result = self.repeat(count);
+        LOGGER.debug("After string repeat {}", result);
+        return result;
+    }
+
+    public static String stringStrip(final String self) {
+        LOGGER.debug("Before string strip {}", self);
+        final String result = self.strip();
+        LOGGER.debug("After string strip {}", result);
+        return result;
+    }
+
+    public static String stringStripLeading(final String self) {
+        LOGGER.debug("Before string stripLeading {}", self);
+        final String result = self.stripLeading();
+        LOGGER.debug("After string stripLeading {}", result);
+        return result;
+    }
+
+    public static String stringStripTrailing(final String self) {
+        LOGGER.debug("Before string stripTrailing {}", self);
+        final String result = self.stripTrailing();
+        LOGGER.debug("After string stripTrailing {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk15/StringCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk15/StringCallSite.java
index 8706339a849..1a6478bd4ed 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk15/StringCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk15/StringCallSite.java
@@ -8,20 +8,19 @@
 
 @Propagation
 @CallSite(
-    spi = IastCallSites.class,
-    enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isMajorJavaVersionAtLeast", "15"})
+        spi = IastCallSites.class,
+        enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isMajorJavaVersionAtLeast", "15"})
 public class StringCallSite {
-  @CallSite.After("java.lang.String java.lang.String.translateEscapes()")
-  public static String afterTranslateEscapes(
-      @CallSite.This final String self, @CallSite.Return final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    try {
-      if (module != null) {
-        module.onStringTranslateEscapes(self, result);
-      }
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterTranslateEscapes threw", e);
+    @CallSite.After("java.lang.String java.lang.String.translateEscapes()")
+    public static String afterTranslateEscapes(@CallSite.This final String self, @CallSite.Return final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        try {
+            if (module != null) {
+                module.onStringTranslateEscapes(self, result);
+            }
+        } catch (final Throwable e) {
+            module.onUnexpectedException("afterTranslateEscapes threw", e);
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/src/test/java/foo/bar/TestStringJDK15Suite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/src/test/java/foo/bar/TestStringJDK15Suite.java
index 046978c773e..014dfe6fbe0 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/src/test/java/foo/bar/TestStringJDK15Suite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/src/test/java/foo/bar/TestStringJDK15Suite.java
@@ -5,14 +5,14 @@
 
 public abstract class TestStringJDK15Suite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestStringJDK15Suite.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestStringJDK15Suite.class);
 
-  private TestStringJDK15Suite() {}
+    private TestStringJDK15Suite() {}
 
-  public static String stringTranslateEscapes(String self) {
-    LOGGER.debug("Before string translate escapes {}", self);
-    final String result = self.translateEscapes();
-    LOGGER.debug("After string translate escapes {}", result);
-    return result;
-  }
+    public static String stringTranslateEscapes(String self) {
+        LOGGER.debug("Before string translate escapes {}", self);
+        final String result = self.translateEscapes();
+        LOGGER.debug("After string translate escapes {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk17/StringCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk17/StringCallSite.java
index fb786c6fb22..0db82ae6b30 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk17/StringCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk17/StringCallSite.java
@@ -8,22 +8,22 @@
 
 @Propagation
 @CallSite(
-    spi = IastCallSites.class,
-    enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isMajorJavaVersionAtLeast", "17"})
+        spi = IastCallSites.class,
+        enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isMajorJavaVersionAtLeast", "17"})
 public class StringCallSite {
-  @CallSite.After("java.lang.String java.lang.String.indent(int)")
-  public static String afterIndent(
-      @CallSite.This final String self,
-      @CallSite.Argument final int indentation,
-      @CallSite.Return final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    try {
-      if (module != null) {
-        module.onIndent(self, indentation, result);
-      }
-    } catch (final Throwable e) {
-      module.onUnexpectedException("afterIndent threw", e);
+    @CallSite.After("java.lang.String java.lang.String.indent(int)")
+    public static String afterIndent(
+            @CallSite.This final String self,
+            @CallSite.Argument final int indentation,
+            @CallSite.Return final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        try {
+            if (module != null) {
+                module.onIndent(self, indentation, result);
+            }
+        } catch (final Throwable e) {
+            module.onUnexpectedException("afterIndent threw", e);
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/src/test/java/foo/bar/TestStringJDK17Suite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/src/test/java/foo/bar/TestStringJDK17Suite.java
index 5d9f87797c6..23a6d9f3f2d 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/src/test/java/foo/bar/TestStringJDK17Suite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/src/test/java/foo/bar/TestStringJDK17Suite.java
@@ -5,14 +5,14 @@
 
 public abstract class TestStringJDK17Suite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestStringJDK17Suite.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestStringJDK17Suite.class);
 
-  private TestStringJDK17Suite() {}
+    private TestStringJDK17Suite() {}
 
-  public static String stringIndent(String self, int indentation) {
-    LOGGER.debug("Before string indent {} indentation", indentation);
-    final String result = self.indent(indentation);
-    LOGGER.debug("After string indent {}", result);
-    return result;
-  }
+    public static String stringIndent(String self, int indentation) {
+        LOGGER.debug("Before string indent {} indentation", indentation);
+        final String result = self.indent(indentation);
+        LOGGER.debug("After string indent {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk21/VirtualThreadInstrumentation.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk21/VirtualThreadInstrumentation.java
index d1ad6e30ebc..4e394d76dcd 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk21/VirtualThreadInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk21/VirtualThreadInstrumentation.java
@@ -61,146 +61,148 @@
 @SuppressWarnings("unused")
 @AutoService(InstrumenterModule.class)
 public final class VirtualThreadInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForSingleType,
-        Instrumenter.HasMethodAdvice,
-        ExcludeFilterProvider {
-
-  // Preload classes used by Context.swap() to avoid class loading on the virtual thread mount path.
-  // DatadogClassLoader loads these from a JarFile using synchronized I/O, which pins
-  // virtual thread carrier threads and can deadlock the application.
-  private static final String[] PRELOAD_CLASS_NAMES = {
-    "datadog.trace.core.scopemanager.ScopeContext", "datadog.trace.core.scopemanager.ScopeStack"
-  };
-
-  public VirtualThreadInstrumentation() {
-    super("java-lang", "java-lang-21", "virtual-thread");
-  }
-
-  @Override
-  public String[] preloadClassNames() {
-    return PRELOAD_CLASS_NAMES;
-  }
-
-  @Override
-  public String instrumentedType() {
-    return VIRTUAL_THREAD_CLASS_NAME;
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return JavaVirtualMachine.isJavaVersionAtLeast(21) && super.isEnabled();
-  }
-
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    // VirtualThread context is managed directly across its internal lifecycle.
-    return singletonMap(RUNNABLE, singletonList(VIRTUAL_THREAD_CLASS_NAME));
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(VIRTUAL_THREAD_CLASS_NAME, VIRTUAL_THREAD_STATE_CLASS_NAME);
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
-    // JDK 22+ enters run(Runnable) after the first mount with the virtual thread current. JDK 21
-    // update releases differ, so they retain context swaps on every mount and unmount.
-    if (JavaVirtualMachine.isJavaVersionAtLeast(22)) {
-      transformer.applyAdvice(
-          isMethod().and(named("run")).and(takesArguments(Runnable.class)).and(returns(void.class)),
-          getClass().getName() + "$Run");
+        implements Instrumenter.ForBootstrap,
+                Instrumenter.ForSingleType,
+                Instrumenter.HasMethodAdvice,
+                ExcludeFilterProvider {
+
+    // Preload classes used by Context.swap() to avoid class loading on the virtual thread mount path.
+    // DatadogClassLoader loads these from a JarFile using synchronized I/O, which pins
+    // virtual thread carrier threads and can deadlock the application.
+    private static final String[] PRELOAD_CLASS_NAMES = {
+        "datadog.trace.core.scopemanager.ScopeContext", "datadog.trace.core.scopemanager.ScopeStack"
+    };
+
+    public VirtualThreadInstrumentation() {
+        super("java-lang", "java-lang-21", "virtual-thread");
     }
-    transformer.applyAdvice(isMethod().and(named("mount")), getClass().getName() + "$Mount");
-    transformer.applyAdvice(isMethod().and(named("unmount")), getClass().getName() + "$Unmount");
-    transformer.applyAdvice(
-        isMethod().and(named("afterDone")).and(takesArguments(boolean.class)),
-        getClass().getName() + "$AfterDone");
-    transformer.applyAdvice(
-        isMethod().and(named("afterTerminate")).and(takesArguments(boolean.class, boolean.class)),
-        getClass().getName() + "$AfterDone");
-  }
-
-  public static final class Construct {
-    @OnMethodExit(suppress = Throwable.class)
-    public static void afterInit(@Advice.This Object virtualThread) {
-      Context context = currentContext();
-      if (context == rootContext()) {
-        return; // No active context to propagate, avoid creating state
-      }
-      VirtualThreadState state = new VirtualThreadState(context, context.capture());
-      ContextStore<Object, Object> store =
-          InstrumentationContext.get(VIRTUAL_THREAD_CLASS_NAME, VIRTUAL_THREAD_STATE_CLASS_NAME);
-      store.put(virtualThread, state);
+
+    @Override
+    public String[] preloadClassNames() {
+        return PRELOAD_CLASS_NAMES;
+    }
+
+    @Override
+    public String instrumentedType() {
+        return VIRTUAL_THREAD_CLASS_NAME;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return JavaVirtualMachine.isJavaVersionAtLeast(21) && super.isEnabled();
+    }
+
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        // VirtualThread context is managed directly across its internal lifecycle.
+        return singletonMap(RUNNABLE, singletonList(VIRTUAL_THREAD_CLASS_NAME));
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(VIRTUAL_THREAD_CLASS_NAME, VIRTUAL_THREAD_STATE_CLASS_NAME);
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
+        // JDK 22+ enters run(Runnable) after the first mount with the virtual thread current. JDK 21
+        // update releases differ, so they retain context swaps on every mount and unmount.
+        if (JavaVirtualMachine.isJavaVersionAtLeast(22)) {
+            transformer.applyAdvice(
+                    isMethod()
+                            .and(named("run"))
+                            .and(takesArguments(Runnable.class))
+                            .and(returns(void.class)),
+                    getClass().getName() + "$Run");
+        }
+        transformer.applyAdvice(isMethod().and(named("mount")), getClass().getName() + "$Mount");
+        transformer.applyAdvice(isMethod().and(named("unmount")), getClass().getName() + "$Unmount");
+        transformer.applyAdvice(
+                isMethod().and(named("afterDone")).and(takesArguments(boolean.class)),
+                getClass().getName() + "$AfterDone");
+        transformer.applyAdvice(
+                isMethod().and(named("afterTerminate")).and(takesArguments(boolean.class, boolean.class)),
+                getClass().getName() + "$AfterDone");
     }
-  }
-
-  public static final class Run {
-    @OnMethodEnter(suppress = Throwable.class)
-    public static void onRun(
-        @Advice.This Object virtualThread,
-        @Advice.Local("virtualThreadState") VirtualThreadState state) {
-      if (!VirtualThreadState.usePerMountContext()) {
-        ContextStore<Object, VirtualThreadState> store =
-            InstrumentationContext.get(VIRTUAL_THREAD_CLASS_NAME, VIRTUAL_THREAD_STATE_CLASS_NAME);
-        state = store.get(virtualThread);
-        if (state != null) {
-          state.onRun();
+
+    public static final class Construct {
+        @OnMethodExit(suppress = Throwable.class)
+        public static void afterInit(@Advice.This Object virtualThread) {
+            Context context = currentContext();
+            if (context == rootContext()) {
+                return; // No active context to propagate, avoid creating state
+            }
+            VirtualThreadState state = new VirtualThreadState(context, context.capture());
+            ContextStore<Object, Object> store =
+                    InstrumentationContext.get(VIRTUAL_THREAD_CLASS_NAME, VIRTUAL_THREAD_STATE_CLASS_NAME);
+            store.put(virtualThread, state);
         }
-      }
     }
 
-    @OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterRun(@Advice.Local("virtualThreadState") VirtualThreadState state) {
-      if (state != null) {
-        state.afterRun();
-      }
+    public static final class Run {
+        @OnMethodEnter(suppress = Throwable.class)
+        public static void onRun(
+                @Advice.This Object virtualThread, @Advice.Local("virtualThreadState") VirtualThreadState state) {
+            if (!VirtualThreadState.usePerMountContext()) {
+                ContextStore<Object, VirtualThreadState> store =
+                        InstrumentationContext.get(VIRTUAL_THREAD_CLASS_NAME, VIRTUAL_THREAD_STATE_CLASS_NAME);
+                state = store.get(virtualThread);
+                if (state != null) {
+                    state.onRun();
+                }
+            }
+        }
+
+        @OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterRun(@Advice.Local("virtualThreadState") VirtualThreadState state) {
+            if (state != null) {
+                state.afterRun();
+            }
+        }
     }
-  }
-
-  public static final class Mount {
-    @OnMethodExit(suppress = Throwable.class)
-    public static void onMount(@Advice.This Object virtualThread) {
-      if (VirtualThreadState.usePerMountContext()) {
-        ContextStore<Object, VirtualThreadState> store =
-            InstrumentationContext.get(VIRTUAL_THREAD_CLASS_NAME, VIRTUAL_THREAD_STATE_CLASS_NAME);
-        VirtualThreadState state = store.get(virtualThread);
-        if (state != null) {
-          state.onMount();
+
+    public static final class Mount {
+        @OnMethodExit(suppress = Throwable.class)
+        public static void onMount(@Advice.This Object virtualThread) {
+            if (VirtualThreadState.usePerMountContext()) {
+                ContextStore<Object, VirtualThreadState> store =
+                        InstrumentationContext.get(VIRTUAL_THREAD_CLASS_NAME, VIRTUAL_THREAD_STATE_CLASS_NAME);
+                VirtualThreadState state = store.get(virtualThread);
+                if (state != null) {
+                    state.onMount();
+                }
+            } else {
+                VirtualThreadState.onMountWithoutStore();
+            }
         }
-      } else {
-        VirtualThreadState.onMountWithoutStore();
-      }
     }
-  }
-
-  public static final class Unmount {
-    @OnMethodEnter(suppress = Throwable.class)
-    public static void onUnmount(@Advice.This Object virtualThread) {
-      if (VirtualThreadState.usePerMountContext()) {
-        ContextStore<Object, VirtualThreadState> store =
-            InstrumentationContext.get(VIRTUAL_THREAD_CLASS_NAME, VIRTUAL_THREAD_STATE_CLASS_NAME);
-        VirtualThreadState state = store.get(virtualThread);
-        if (state != null) {
-          state.onUnmount();
+
+    public static final class Unmount {
+        @OnMethodEnter(suppress = Throwable.class)
+        public static void onUnmount(@Advice.This Object virtualThread) {
+            if (VirtualThreadState.usePerMountContext()) {
+                ContextStore<Object, VirtualThreadState> store =
+                        InstrumentationContext.get(VIRTUAL_THREAD_CLASS_NAME, VIRTUAL_THREAD_STATE_CLASS_NAME);
+                VirtualThreadState state = store.get(virtualThread);
+                if (state != null) {
+                    state.onUnmount();
+                }
+            } else {
+                VirtualThreadState.onUnmountWithoutStore();
+            }
         }
-      } else {
-        VirtualThreadState.onUnmountWithoutStore();
-      }
     }
-  }
-
-  public static final class AfterDone {
-    @OnMethodEnter(suppress = Throwable.class)
-    public static void onDone(@Advice.This Object virtualThread) {
-      ContextStore<Object, VirtualThreadState> store =
-          InstrumentationContext.get(VIRTUAL_THREAD_CLASS_NAME, VIRTUAL_THREAD_STATE_CLASS_NAME);
-      VirtualThreadState state = store.remove(virtualThread);
-      if (state != null) {
-        state.onTerminate();
-      }
+
+    public static final class AfterDone {
+        @OnMethodEnter(suppress = Throwable.class)
+        public static void onDone(@Advice.This Object virtualThread) {
+            ContextStore<Object, VirtualThreadState> store =
+                    InstrumentationContext.get(VIRTUAL_THREAD_CLASS_NAME, VIRTUAL_THREAD_STATE_CLASS_NAME);
+            VirtualThreadState state = store.remove(virtualThread);
+            if (state != null) {
+                state.onTerminate();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/JavaAsyncChild.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/JavaAsyncChild.java
index 8de6b89839d..240469b6433 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/JavaAsyncChild.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/JavaAsyncChild.java
@@ -5,42 +5,42 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class JavaAsyncChild implements Runnable, Callable<Void> {
-  private final AtomicBoolean blockThread;
-  private final boolean doTraceableWork;
-
-  public JavaAsyncChild() {
-    this(true, false);
-  }
-
-  public JavaAsyncChild(final boolean doTraceableWork, final boolean blockThread) {
-    this.doTraceableWork = doTraceableWork;
-    this.blockThread = new AtomicBoolean(blockThread);
-  }
-
-  public void unblock() {
-    blockThread.set(false);
-  }
-
-  @Override
-  public void run() {
-    runImpl();
-  }
-
-  @Override
-  public Void call() {
-    runImpl();
-    return null;
-  }
-
-  private void runImpl() {
-    while (blockThread.get()) {
-      // busy-wait to block thread
+    private final AtomicBoolean blockThread;
+    private final boolean doTraceableWork;
+
+    public JavaAsyncChild() {
+        this(true, false);
+    }
+
+    public JavaAsyncChild(final boolean doTraceableWork, final boolean blockThread) {
+        this.doTraceableWork = doTraceableWork;
+        this.blockThread = new AtomicBoolean(blockThread);
+    }
+
+    public void unblock() {
+        blockThread.set(false);
     }
-    if (doTraceableWork) {
-      asyncChild();
+
+    @Override
+    public void run() {
+        runImpl();
+    }
+
+    @Override
+    public Void call() {
+        runImpl();
+        return null;
+    }
+
+    private void runImpl() {
+        while (blockThread.get()) {
+            // busy-wait to block thread
+        }
+        if (doTraceableWork) {
+            asyncChild();
+        }
     }
-  }
 
-  @Trace(operationName = "asyncChild")
-  private void asyncChild() {}
+    @Trace(operationName = "asyncChild")
+    private void asyncChild() {}
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadApiInstrumentationForkedTest.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadApiInstrumentationForkedTest.java
index d71e4381031..c851e5c10c4 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadApiInstrumentationForkedTest.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadApiInstrumentationForkedTest.java
@@ -14,9 +14,9 @@
  */
 @WithConfig(key = "legacy.context-manager.enabled", value = "false")
 class VirtualThreadApiInstrumentationForkedTest extends VirtualThreadApiInstrumentationTest {
-  @DisplayName("test per-mount path is selected for the new context manager")
-  @Test
-  void testPerMountPathSelected() {
-    assertTrue(VirtualThreadState.usePerMountContext());
-  }
+    @DisplayName("test per-mount path is selected for the new context manager")
+    @Test
+    void testPerMountPathSelected() {
+        assertTrue(VirtualThreadState.usePerMountContext());
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadApiInstrumentationTest.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadApiInstrumentationTest.java
index 566954da9c7..5783855dad2 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadApiInstrumentationTest.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadApiInstrumentationTest.java
@@ -13,147 +13,141 @@
 
 /** Test the {@code VirtualThread} and {@code Thread.Builder} API. */
 public class VirtualThreadApiInstrumentationTest extends AbstractInstrumentationTest {
-  @DisplayName("test Thread.Builder.OfVirtual.start()")
-  @Test
-  void testBuilderOfVirtualStart() throws InterruptedException, TimeoutException {
-    Thread.Builder.OfVirtual threadBuilder = Thread.ofVirtual().name("builder - started");
-
-    new Runnable() {
-      @Override
-      @Trace(operationName = "parent")
-      public void run() {
-        // this child will have a span
-        threadBuilder.start(new JavaAsyncChild());
-        // this child won't
-        threadBuilder.start(new JavaAsyncChild(false, false));
-        blockUntilChildSpansFinished(1);
-      }
-    }.run();
-
-    assertConnectedTrace();
-  }
-
-  @DisplayName("test Thread.Builder.OfVirtual.unstarted()")
-  @Test
-  void testBuilderOfVirtualUnstarted() throws InterruptedException, TimeoutException {
-    Thread.Builder.OfVirtual threadBuilder = Thread.ofVirtual().name("builder - started");
-
-    new Runnable() {
-      @Override
-      @Trace(operationName = "parent")
-      public void run() {
-        // this child will have a span
-        threadBuilder.unstarted(new JavaAsyncChild()).start();
-        // this child won't
-        threadBuilder.unstarted(new JavaAsyncChild(false, false)).start();
-        blockUntilChildSpansFinished(1);
-      }
-    }.run();
-
-    assertConnectedTrace();
-  }
-
-  @DisplayName("test Thread.startVirtual()")
-  @Test
-  void testThreadStartVirtual() throws InterruptedException, TimeoutException {
-    new Runnable() {
-      @Override
-      @Trace(operationName = "parent")
-      public void run() {
-        // this child will have a span
-        Thread.startVirtualThread(new JavaAsyncChild());
-        // this child won't
-        Thread.startVirtualThread(new JavaAsyncChild(false, false));
-        blockUntilChildSpansFinished(1);
-      }
-    }.run();
-
-    assertConnectedTrace();
-  }
-
-  @DisplayName("test Thread.Builder.OfVirtual.factory()")
-  @Test
-  void testThreadOfVirtualFactory() throws InterruptedException, TimeoutException {
-    ThreadFactory factory = Thread.ofVirtual().factory();
-
-    new Runnable() {
-      @Override
-      @Trace(operationName = "parent")
-      public void run() {
-        // this child will have a span
-        factory.newThread(new JavaAsyncChild()).start();
-        // this child won't
-        factory.newThread(new JavaAsyncChild(false, false)).start();
-        blockUntilChildSpansFinished(1);
-      }
-    }.run();
-
-    assertConnectedTrace();
-  }
-
-  @DisplayName("test nested virtual threads")
-  @Test
-  void testNestedVirtualThreads() throws InterruptedException, TimeoutException {
-    Thread.Builder.OfVirtual threadBuilder = Thread.ofVirtual();
-
-    new Runnable() {
-      @Trace(operationName = "parent")
-      @Override
-      public void run() {
-        threadBuilder.start(
-            new Runnable() {
-              @Trace(operationName = "child")
-              @Override
-              public void run() {
-                threadBuilder.start(
-                    new Runnable() {
-                      @Trace(operationName = "great-child")
-                      @Override
-                      public void run() {
-                        threadBuilder.start(
-                            new Runnable() {
-                              @Trace(operationName = "great-great-child")
-                              @Override
-                              public void run() {
-                                System.out.println("complete");
-                              }
-                            });
-                      }
-                    });
-              }
-            });
-      }
-    }.run();
-
-    // Block test thread until child spans are reported
-    blockUntilTracesMatch(traces -> traces.size() == 1 && traces.get(0).size() == 4);
-
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("parent"),
-            span().childOfPrevious().operationName("child"),
-            span().childOfPrevious().operationName("great-child"),
-            span().childOfPrevious().operationName("great-great-child")));
-  }
-
-  /** Verifies the parent / child span relation. */
-  void assertConnectedTrace() {
-    assertTraces(
-        trace(
-            span().root().operationName("parent"),
-            span().childOfPrevious().operationName("asyncChild")));
-  }
-
-  private static void tryUnmount() {
-    try {
-      // Multiple sleeps to attempt triggering repeated park/unpark cycles.
-      // This is not guaranteed to work, but there is no API to force mount/unmount.
-      for (int i = 0; i < 5; i++) {
-        Thread.sleep(10);
-      }
-    } catch (InterruptedException e) {
-      throw new RuntimeException(e);
+    @DisplayName("test Thread.Builder.OfVirtual.start()")
+    @Test
+    void testBuilderOfVirtualStart() throws InterruptedException, TimeoutException {
+        Thread.Builder.OfVirtual threadBuilder = Thread.ofVirtual().name("builder - started");
+
+        new Runnable() {
+            @Override
+            @Trace(operationName = "parent")
+            public void run() {
+                // this child will have a span
+                threadBuilder.start(new JavaAsyncChild());
+                // this child won't
+                threadBuilder.start(new JavaAsyncChild(false, false));
+                blockUntilChildSpansFinished(1);
+            }
+        }.run();
+
+        assertConnectedTrace();
+    }
+
+    @DisplayName("test Thread.Builder.OfVirtual.unstarted()")
+    @Test
+    void testBuilderOfVirtualUnstarted() throws InterruptedException, TimeoutException {
+        Thread.Builder.OfVirtual threadBuilder = Thread.ofVirtual().name("builder - started");
+
+        new Runnable() {
+            @Override
+            @Trace(operationName = "parent")
+            public void run() {
+                // this child will have a span
+                threadBuilder.unstarted(new JavaAsyncChild()).start();
+                // this child won't
+                threadBuilder.unstarted(new JavaAsyncChild(false, false)).start();
+                blockUntilChildSpansFinished(1);
+            }
+        }.run();
+
+        assertConnectedTrace();
+    }
+
+    @DisplayName("test Thread.startVirtual()")
+    @Test
+    void testThreadStartVirtual() throws InterruptedException, TimeoutException {
+        new Runnable() {
+            @Override
+            @Trace(operationName = "parent")
+            public void run() {
+                // this child will have a span
+                Thread.startVirtualThread(new JavaAsyncChild());
+                // this child won't
+                Thread.startVirtualThread(new JavaAsyncChild(false, false));
+                blockUntilChildSpansFinished(1);
+            }
+        }.run();
+
+        assertConnectedTrace();
+    }
+
+    @DisplayName("test Thread.Builder.OfVirtual.factory()")
+    @Test
+    void testThreadOfVirtualFactory() throws InterruptedException, TimeoutException {
+        ThreadFactory factory = Thread.ofVirtual().factory();
+
+        new Runnable() {
+            @Override
+            @Trace(operationName = "parent")
+            public void run() {
+                // this child will have a span
+                factory.newThread(new JavaAsyncChild()).start();
+                // this child won't
+                factory.newThread(new JavaAsyncChild(false, false)).start();
+                blockUntilChildSpansFinished(1);
+            }
+        }.run();
+
+        assertConnectedTrace();
+    }
+
+    @DisplayName("test nested virtual threads")
+    @Test
+    void testNestedVirtualThreads() throws InterruptedException, TimeoutException {
+        Thread.Builder.OfVirtual threadBuilder = Thread.ofVirtual();
+
+        new Runnable() {
+            @Trace(operationName = "parent")
+            @Override
+            public void run() {
+                threadBuilder.start(new Runnable() {
+                    @Trace(operationName = "child")
+                    @Override
+                    public void run() {
+                        threadBuilder.start(new Runnable() {
+                            @Trace(operationName = "great-child")
+                            @Override
+                            public void run() {
+                                threadBuilder.start(new Runnable() {
+                                    @Trace(operationName = "great-great-child")
+                                    @Override
+                                    public void run() {
+                                        System.out.println("complete");
+                                    }
+                                });
+                            }
+                        });
+                    }
+                });
+            }
+        }.run();
+
+        // Block test thread until child spans are reported
+        blockUntilTracesMatch(traces -> traces.size() == 1 && traces.get(0).size() == 4);
+
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root().operationName("parent"),
+                span().childOfPrevious().operationName("child"),
+                span().childOfPrevious().operationName("great-child"),
+                span().childOfPrevious().operationName("great-great-child")));
+    }
+
+    /** Verifies the parent / child span relation. */
+    void assertConnectedTrace() {
+        assertTraces(trace(
+                span().root().operationName("parent"), span().childOfPrevious().operationName("asyncChild")));
+    }
+
+    private static void tryUnmount() {
+        try {
+            // Multiple sleeps to attempt triggering repeated park/unpark cycles.
+            // This is not guaranteed to work, but there is no API to force mount/unmount.
+            for (int i = 0; i < 5; i++) {
+                Thread.sleep(10);
+            }
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadCwsInstrumentationForkedTest.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadCwsInstrumentationForkedTest.java
index df7782db228..e69dd0fbe70 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadCwsInstrumentationForkedTest.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadCwsInstrumentationForkedTest.java
@@ -10,9 +10,9 @@
 /** Verifies that CWS retains scope-listener notifications on every virtual-thread mount. */
 @WithConfig(key = "cws.enabled", value = "true")
 class VirtualThreadCwsInstrumentationForkedTest extends VirtualThreadApiInstrumentationTest {
-  @DisplayName("test per-mount path is selected for CWS")
-  @Test
-  void testPerMountPathSelected() {
-    assertTrue(VirtualThreadState.usePerMountContext());
-  }
+    @DisplayName("test per-mount path is selected for CWS")
+    @Test
+    void testPerMountPathSelected() {
+        assertTrue(VirtualThreadState.usePerMountContext());
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadLifeCycleTest.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadLifeCycleTest.java
index 2c20740f4dc..3a52aab6a84 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadLifeCycleTest.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadLifeCycleTest.java
@@ -21,221 +21,201 @@
 
 /** Test context tracking through {@code VirtualThread} lifecycle - park/unpark (remount) cycles. */
 public class VirtualThreadLifeCycleTest extends AbstractInstrumentationTest {
-  private static final Duration TIMEOUT = Duration.ofSeconds(10);
-
-  @DisplayName("test context path selected for runtime")
-  @Test
-  void testContextPathSelectedForRuntime() {
-    assertEquals(isJavaVersion(21), VirtualThreadState.usePerMountContext());
-  }
-
-  @DisplayName("test context restored after virtual thread remounts")
-  @Test
-  void testContextRestoredAfterVirtualThreadRemount() {
-    int remountCount = 5;
-    String[] spanId = new String[1];
-    String[] spanIdBeforeUnmount = new String[1];
-    String[] spanIdsAfterRemount = new String[remountCount];
-
-    new Runnable() {
-      @Override
-      @Trace(operationName = "parent")
-      public void run() {
-        spanId[0] = GlobalTracer.get().getSpanId();
-
-        Thread thread =
-            Thread.startVirtualThread(
-                () -> {
-                  spanIdBeforeUnmount[0] = GlobalTracer.get().getSpanId();
-                  for (int remount = 0; remount < remountCount; remount++) {
-                    tryUnmount();
-                    spanIdsAfterRemount[remount] = GlobalTracer.get().getSpanId();
-                  }
+    private static final Duration TIMEOUT = Duration.ofSeconds(10);
+
+    @DisplayName("test context path selected for runtime")
+    @Test
+    void testContextPathSelectedForRuntime() {
+        assertEquals(isJavaVersion(21), VirtualThreadState.usePerMountContext());
+    }
+
+    @DisplayName("test context restored after virtual thread remounts")
+    @Test
+    void testContextRestoredAfterVirtualThreadRemount() {
+        int remountCount = 5;
+        String[] spanId = new String[1];
+        String[] spanIdBeforeUnmount = new String[1];
+        String[] spanIdsAfterRemount = new String[remountCount];
+
+        new Runnable() {
+            @Override
+            @Trace(operationName = "parent")
+            public void run() {
+                spanId[0] = GlobalTracer.get().getSpanId();
+
+                Thread thread = Thread.startVirtualThread(() -> {
+                    spanIdBeforeUnmount[0] = GlobalTracer.get().getSpanId();
+                    for (int remount = 0; remount < remountCount; remount++) {
+                        tryUnmount();
+                        spanIdsAfterRemount[remount] = GlobalTracer.get().getSpanId();
+                    }
                 });
-        try {
-          thread.join(TIMEOUT);
-        } catch (InterruptedException e) {
-          throw new RuntimeException(e);
+                try {
+                    thread.join(TIMEOUT);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }.run();
+
+        assertEquals(spanId[0], spanIdBeforeUnmount[0], "context should be inherited from the parent execution unit");
+        for (int i = 0; i < remountCount; i++) {
+            assertEquals(spanId[0], spanIdsAfterRemount[i], "context should be restored after virtual thread remounts");
         }
-      }
-    }.run();
-
-    assertEquals(
-        spanId[0],
-        spanIdBeforeUnmount[0],
-        "context should be inherited from the parent execution unit");
-    for (int i = 0; i < remountCount; i++) {
-      assertEquals(
-          spanId[0],
-          spanIdsAfterRemount[i],
-          "context should be restored after virtual thread remounts");
+
+        assertTraces(trace(span().root().operationName("parent")));
     }
 
-    assertTraces(trace(span().root().operationName("parent")));
-  }
-
-  @DisplayName("test context restored as implicit parent span after remount")
-  @Test
-  void testContextRestoredAsImplicitParentSpanAfterRemount() {
-    new Runnable() {
-      @Override
-      @Trace(operationName = "parent")
-      public void run() {
-        Thread thread =
-            Thread.startVirtualThread(
-                () -> {
-                  tryUnmount();
-                  // Runnable to create child span, not async related
-                  new Runnable() {
-                    @Override
-                    @Trace(operationName = "child")
-                    public void run() {}
-                  }.run();
+    @DisplayName("test context restored as implicit parent span after remount")
+    @Test
+    void testContextRestoredAsImplicitParentSpanAfterRemount() {
+        new Runnable() {
+            @Override
+            @Trace(operationName = "parent")
+            public void run() {
+                Thread thread = Thread.startVirtualThread(() -> {
+                    tryUnmount();
+                    // Runnable to create child span, not async related
+                    new Runnable() {
+                        @Override
+                        @Trace(operationName = "child")
+                        public void run() {}
+                    }.run();
                 });
-        try {
-          thread.join(TIMEOUT);
-        } catch (InterruptedException e) {
-          throw new RuntimeException(e);
-        }
-        blockUntilChildSpansFinished(1);
-      }
-    }.run();
-
-    assertTraces(
-        trace(
-            span().root().operationName("parent"),
-            span().childOfPrevious().operationName("child")));
-  }
-
-  @DisplayName("test concurrent virtual threads with remount")
-  @Test
-  void testConcurrentVirtualThreadsWithRemount() {
-    int threadCount = 5;
-    String[] spanId = new String[1];
-    String[] spanIdsAfterRemount = new String[threadCount];
-
-    new Runnable() {
-      @Override
-      @Trace(operationName = "parent")
-      public void run() {
-        spanId[0] = CorrelationIdentifier.getSpanId();
-
-        List<Thread> threads = new ArrayList<>();
+                try {
+                    thread.join(TIMEOUT);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+                blockUntilChildSpansFinished(1);
+            }
+        }.run();
+
+        assertTraces(trace(
+                span().root().operationName("parent"), span().childOfPrevious().operationName("child")));
+    }
+
+    @DisplayName("test concurrent virtual threads with remount")
+    @Test
+    void testConcurrentVirtualThreadsWithRemount() {
+        int threadCount = 5;
+        String[] spanId = new String[1];
+        String[] spanIdsAfterRemount = new String[threadCount];
+
+        new Runnable() {
+            @Override
+            @Trace(operationName = "parent")
+            public void run() {
+                spanId[0] = CorrelationIdentifier.getSpanId();
+
+                List<Thread> threads = new ArrayList<>();
+                for (int i = 0; i < threadCount; i++) {
+                    int index = i;
+                    threads.add(Thread.startVirtualThread(() -> {
+                        tryUnmount();
+                        spanIdsAfterRemount[index] = CorrelationIdentifier.getSpanId();
+                    }));
+                }
+
+                for (Thread thread : threads) {
+                    try {
+                        thread.join(TIMEOUT);
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }
+        }.run();
+
         for (int i = 0; i < threadCount; i++) {
-          int index = i;
-          threads.add(
-              Thread.startVirtualThread(
-                  () -> {
-                    tryUnmount();
-                    spanIdsAfterRemount[index] = CorrelationIdentifier.getSpanId();
-                  }));
+            assertEquals(
+                    spanId[0],
+                    spanIdsAfterRemount[i],
+                    "context should be restored after virtual thread #" + i + "remounts");
         }
 
-        for (Thread thread : threads) {
-          try {
-            thread.join(TIMEOUT);
-          } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-          }
-        }
-      }
-    }.run();
-
-    for (int i = 0; i < threadCount; i++) {
-      assertEquals(
-          spanId[0],
-          spanIdsAfterRemount[i],
-          "context should be restored after virtual thread #" + i + "remounts");
+        assertTraces(trace(span().root().operationName("parent")));
     }
 
-    assertTraces(trace(span().root().operationName("parent")));
-  }
-
-  @DisplayName("test no context virtual thread remount")
-  @Test
-  void testNoContextVirtualThreadRemount() throws InterruptedException {
-    AtomicReference<String> spanIdBeforeUnmount = new AtomicReference<>();
-    AtomicReference<String> spanIdAfterRemount = new AtomicReference<>();
-
-    Thread.startVirtualThread(
-            () -> {
-              spanIdBeforeUnmount.set(CorrelationIdentifier.getSpanId());
-              tryUnmount();
-              spanIdAfterRemount.set(CorrelationIdentifier.getSpanId());
-            })
-        .join(TIMEOUT);
-
-    assertEquals(
-        "0", spanIdBeforeUnmount.get(), "there should be no active context before unmount");
-    assertEquals("0", spanIdAfterRemount.get(), "there should be no active context after remount");
-  }
-
-  @DisplayName("test context ordering with child span across unmount/remount")
-  @Test
-  void testContextOrderingWithChildSpanAcrossRemount() throws InterruptedException {
-    String[] parentSpanId = new String[1];
-    String[] beforeChild = new String[1];
-    String[] insideChildBeforeUnmount = new String[1];
-    String[] insideChildAfterRemount = new String[1];
-    String[] afterChild = new String[1];
-
-    new Runnable() {
-      @Override
-      @Trace(operationName = "parent")
-      public void run() {
-        parentSpanId[0] = GlobalTracer.get().getSpanId();
-
-        Thread thread =
-            Thread.startVirtualThread(
-                () -> {
-                  beforeChild[0] = GlobalTracer.get().getSpanId();
-                  childWork(insideChildBeforeUnmount, insideChildAfterRemount);
-                  afterChild[0] = GlobalTracer.get().getSpanId();
+    @DisplayName("test no context virtual thread remount")
+    @Test
+    void testNoContextVirtualThreadRemount() throws InterruptedException {
+        AtomicReference<String> spanIdBeforeUnmount = new AtomicReference<>();
+        AtomicReference<String> spanIdAfterRemount = new AtomicReference<>();
+
+        Thread.startVirtualThread(() -> {
+                    spanIdBeforeUnmount.set(CorrelationIdentifier.getSpanId());
+                    tryUnmount();
+                    spanIdAfterRemount.set(CorrelationIdentifier.getSpanId());
+                })
+                .join(TIMEOUT);
+
+        assertEquals("0", spanIdBeforeUnmount.get(), "there should be no active context before unmount");
+        assertEquals("0", spanIdAfterRemount.get(), "there should be no active context after remount");
+    }
+
+    @DisplayName("test context ordering with child span across unmount/remount")
+    @Test
+    void testContextOrderingWithChildSpanAcrossRemount() throws InterruptedException {
+        String[] parentSpanId = new String[1];
+        String[] beforeChild = new String[1];
+        String[] insideChildBeforeUnmount = new String[1];
+        String[] insideChildAfterRemount = new String[1];
+        String[] afterChild = new String[1];
+
+        new Runnable() {
+            @Override
+            @Trace(operationName = "parent")
+            public void run() {
+                parentSpanId[0] = GlobalTracer.get().getSpanId();
+
+                Thread thread = Thread.startVirtualThread(() -> {
+                    beforeChild[0] = GlobalTracer.get().getSpanId();
+                    childWork(insideChildBeforeUnmount, insideChildAfterRemount);
+                    afterChild[0] = GlobalTracer.get().getSpanId();
                 });
+                try {
+                    thread.join();
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+                blockUntilChildSpansFinished(1);
+            }
+        }.run();
+
+        // Verify context ordering at each checkpoint
+        assertEquals(parentSpanId[0], beforeChild[0], "parent should be active before child span");
+        assertNotEquals("0", insideChildBeforeUnmount[0], "child should be active before unmount");
+        assertNotEquals(parentSpanId[0], insideChildBeforeUnmount[0], "active span should be child, not parent");
+        assertEquals(
+                insideChildBeforeUnmount[0],
+                insideChildAfterRemount[0],
+                "child should still be active after remount (no out-of-order scope close)");
+        assertEquals(parentSpanId[0], afterChild[0], "parent should be active after child span closes");
+
+        // Verify trace structure
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root().operationName("parent"),
+                span().childOfPrevious().operationName("child")));
+    }
+
+    @Trace(operationName = "child")
+    private static void childWork(String[] beforeUnmount, String[] afterRemount) {
+        beforeUnmount[0] = GlobalTracer.get().getSpanId();
+        tryUnmount();
+        afterRemount[0] = GlobalTracer.get().getSpanId();
+    }
+
+    private static void tryUnmount() {
         try {
-          thread.join();
+            // Multiple sleeps to expect triggering repeated park/unpark cycles.
+            // This is not guaranteed to work, but there is no API to force mount/unmount.
+            for (int i = 0; i < 5; i++) {
+                Thread.sleep(10);
+            }
         } catch (InterruptedException e) {
-          throw new RuntimeException(e);
+            throw new RuntimeException(e);
         }
-        blockUntilChildSpansFinished(1);
-      }
-    }.run();
-
-    // Verify context ordering at each checkpoint
-    assertEquals(parentSpanId[0], beforeChild[0], "parent should be active before child span");
-    assertNotEquals("0", insideChildBeforeUnmount[0], "child should be active before unmount");
-    assertNotEquals(
-        parentSpanId[0], insideChildBeforeUnmount[0], "active span should be child, not parent");
-    assertEquals(
-        insideChildBeforeUnmount[0],
-        insideChildAfterRemount[0],
-        "child should still be active after remount (no out-of-order scope close)");
-    assertEquals(parentSpanId[0], afterChild[0], "parent should be active after child span closes");
-
-    // Verify trace structure
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("parent"),
-            span().childOfPrevious().operationName("child")));
-  }
-
-  @Trace(operationName = "child")
-  private static void childWork(String[] beforeUnmount, String[] afterRemount) {
-    beforeUnmount[0] = GlobalTracer.get().getSpanId();
-    tryUnmount();
-    afterRemount[0] = GlobalTracer.get().getSpanId();
-  }
-
-  private static void tryUnmount() {
-    try {
-      // Multiple sleeps to expect triggering repeated park/unpark cycles.
-      // This is not guaranteed to work, but there is no API to force mount/unmount.
-      for (int i = 0; i < 5; i++) {
-        Thread.sleep(10);
-      }
-    } catch (InterruptedException e) {
-      throw new RuntimeException(e);
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadProfilingContextTest.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadProfilingContextTest.java
index da3e9b79582..825ed0e395e 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadProfilingContextTest.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/java/testdog/trace/instrumentation/java/lang/jdk21/VirtualThreadProfilingContextTest.java
@@ -29,127 +29,122 @@
 
 /** Tests profiler context binding during virtual-thread lifecycle transitions. */
 public class VirtualThreadProfilingContextTest extends AbstractInstrumentationTest {
-  private static final Duration TIMEOUT = Duration.ofSeconds(10);
-  private static final RecordingProfilingContextIntegration PROFILING_CONTEXT =
-      new RecordingProfilingContextIntegration();
-
-  @BeforeAll
-  static void installRecordingProfilingContext() {
-    tracer.close();
-    writer = new ListWriter();
-    CoreTracer coreTracer =
-        CoreTracer.builder()
-            .writer(writer)
-            .idGenerationStrategy(IdGenerationStrategy.fromName("SEQUENTIAL"))
-            .profilingContextIntegration(PROFILING_CONTEXT)
-            .build();
-    TracerInstaller.forceInstallGlobalTracer(coreTracer);
-    tracer = coreTracer;
-  }
-
-  @BeforeEach
-  void resetProfilingContext() {
-    PROFILING_CONTEXT.reset();
-  }
-
-  @Test
-  void testCapturedContextIsBoundBeforeFirstRunnableInvocation() {
-    assumeFalse(VirtualThreadState.usePerMountContext(), "requires the JDK 22+ context path");
-    assertSame(PROFILING_CONTEXT, AgentTracer.get().getProfilingContext());
-
-    AtomicLong expectedSpanId = new AtomicLong();
-    AtomicLong spanIdAtRunnableEntry = new AtomicLong();
-    AtomicReference<List<Long>> bindingsAtRunnableEntry = new AtomicReference<>();
-
-    runWithSpan(expectedSpanId, spanIdAtRunnableEntry, bindingsAtRunnableEntry);
-
-    List<Long> bindings = bindingsAtRunnableEntry.get();
-    assertTrue(bindings.size() >= 2);
-    assertEquals(
-        List.of(0L, expectedSpanId.get()),
-        bindings.subList(bindings.size() - 2, bindings.size()),
-        "the first mount should clear the carrier before run() binds the captured span");
-    assertEquals(
-        expectedSpanId.get(),
-        spanIdAtRunnableEntry.get(),
-        "the captured span must be bound before the no-park runnable starts");
-  }
-
-  @Trace(operationName = "parent")
-  private static void runWithSpan(
-      AtomicLong expectedSpanId,
-      AtomicLong spanIdAtRunnableEntry,
-      AtomicReference<List<Long>> bindingsAtRunnableEntry) {
-    expectedSpanId.set(AgentTracer.activeSpan().getSpanId());
-    PROFILING_CONTEXT.reset();
-
-    Thread thread =
-        Thread.startVirtualThread(
-            () -> {
-              spanIdAtRunnableEntry.set(PROFILING_CONTEXT.activeSpanId());
-              bindingsAtRunnableEntry.set(PROFILING_CONTEXT.bindings());
-            });
-    try {
-      assertTrue(thread.join(TIMEOUT), "virtual thread did not finish in time");
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      throw new RuntimeException(e);
-    }
-  }
-
-  private static final class RecordingProfilingContextIntegration
-      extends TestProfilingContextIntegration {
-    private final AtomicLong activeSpanId = new AtomicLong();
-    private final List<Long> bindings = new ArrayList<>();
-    private final Stateful contextManager =
-        new Stateful() {
-          @Override
-          public void close() {
-            record(0);
-          }
-
-          @Override
-          public void activate(Object context) {
-            record(((ProfilerContext) context).getSpanId());
-          }
-        };
-
-    @Override
-    public Stateful newScopeState(ProfilerContext profilerContext) {
-      return contextManager;
+    private static final Duration TIMEOUT = Duration.ofSeconds(10);
+    private static final RecordingProfilingContextIntegration PROFILING_CONTEXT =
+            new RecordingProfilingContextIntegration();
+
+    @BeforeAll
+    static void installRecordingProfilingContext() {
+        tracer.close();
+        writer = new ListWriter();
+        CoreTracer coreTracer = CoreTracer.builder()
+                .writer(writer)
+                .idGenerationStrategy(IdGenerationStrategy.fromName("SEQUENTIAL"))
+                .profilingContextIntegration(PROFILING_CONTEXT)
+                .build();
+        TracerInstaller.forceInstallGlobalTracer(coreTracer);
+        tracer = coreTracer;
     }
 
-    @Override
-    public void setContext(Context context) {
-      AgentSpan span = AgentSpan.fromContext(context);
-      if (span == null) {
-        contextManager.close();
-      } else {
-        contextManager.activate(span.spanContext());
-      }
+    @BeforeEach
+    void resetProfilingContext() {
+        PROFILING_CONTEXT.reset();
     }
 
-    @Override
-    public boolean isThreadContextBindingRequired() {
-      return true;
+    @Test
+    void testCapturedContextIsBoundBeforeFirstRunnableInvocation() {
+        assumeFalse(VirtualThreadState.usePerMountContext(), "requires the JDK 22+ context path");
+        assertSame(PROFILING_CONTEXT, AgentTracer.get().getProfilingContext());
+
+        AtomicLong expectedSpanId = new AtomicLong();
+        AtomicLong spanIdAtRunnableEntry = new AtomicLong();
+        AtomicReference<List<Long>> bindingsAtRunnableEntry = new AtomicReference<>();
+
+        runWithSpan(expectedSpanId, spanIdAtRunnableEntry, bindingsAtRunnableEntry);
+
+        List<Long> bindings = bindingsAtRunnableEntry.get();
+        assertTrue(bindings.size() >= 2);
+        assertEquals(
+                List.of(0L, expectedSpanId.get()),
+                bindings.subList(bindings.size() - 2, bindings.size()),
+                "the first mount should clear the carrier before run() binds the captured span");
+        assertEquals(
+                expectedSpanId.get(),
+                spanIdAtRunnableEntry.get(),
+                "the captured span must be bound before the no-park runnable starts");
     }
 
-    synchronized void reset() {
-      activeSpanId.set(0);
-      bindings.clear();
+    @Trace(operationName = "parent")
+    private static void runWithSpan(
+            AtomicLong expectedSpanId,
+            AtomicLong spanIdAtRunnableEntry,
+            AtomicReference<List<Long>> bindingsAtRunnableEntry) {
+        expectedSpanId.set(AgentTracer.activeSpan().getSpanId());
+        PROFILING_CONTEXT.reset();
+
+        Thread thread = Thread.startVirtualThread(() -> {
+            spanIdAtRunnableEntry.set(PROFILING_CONTEXT.activeSpanId());
+            bindingsAtRunnableEntry.set(PROFILING_CONTEXT.bindings());
+        });
+        try {
+            assertTrue(thread.join(TIMEOUT), "virtual thread did not finish in time");
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RuntimeException(e);
+        }
     }
 
-    long activeSpanId() {
-      return activeSpanId.get();
-    }
-
-    synchronized List<Long> bindings() {
-      return List.copyOf(bindings);
-    }
+    private static final class RecordingProfilingContextIntegration extends TestProfilingContextIntegration {
+        private final AtomicLong activeSpanId = new AtomicLong();
+        private final List<Long> bindings = new ArrayList<>();
+        private final Stateful contextManager = new Stateful() {
+            @Override
+            public void close() {
+                record(0);
+            }
+
+            @Override
+            public void activate(Object context) {
+                record(((ProfilerContext) context).getSpanId());
+            }
+        };
 
-    private synchronized void record(long spanId) {
-      activeSpanId.set(spanId);
-      bindings.add(spanId);
+        @Override
+        public Stateful newScopeState(ProfilerContext profilerContext) {
+            return contextManager;
+        }
+
+        @Override
+        public void setContext(Context context) {
+            AgentSpan span = AgentSpan.fromContext(context);
+            if (span == null) {
+                contextManager.close();
+            } else {
+                contextManager.activate(span.spanContext());
+            }
+        }
+
+        @Override
+        public boolean isThreadContextBindingRequired() {
+            return true;
+        }
+
+        synchronized void reset() {
+            activeSpanId.set(0);
+            bindings.clear();
+        }
+
+        long activeSpanId() {
+            return activeSpanId.get();
+        }
+
+        synchronized List<Long> bindings() {
+            return List.copyOf(bindings);
+        }
+
+        private synchronized void record(long spanId) {
+            activeSpanId.set(spanId);
+            bindings.add(spanId);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk22/FFMApiModule.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk22/FFMApiModule.java
index f49f343a555..0b4ded611ba 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk22/FFMApiModule.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk22/FFMApiModule.java
@@ -12,22 +12,23 @@
 
 @AutoService(InstrumenterModule.class)
 public class FFMApiModule extends InstrumenterModule.Tracing {
-  public FFMApiModule() {
-    super("ffm-native-tracing", "java-lang-22");
-  }
+    public FFMApiModule() {
+        super("ffm-native-tracing", "java-lang-22");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && !InstrumenterConfig.get().getTraceNativeMethods().isEmpty();
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled()
+                && !InstrumenterConfig.get().getTraceNativeMethods().isEmpty();
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("jdk.internal.loader.NativeLibrary", "java.lang.String");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("jdk.internal.loader.NativeLibrary", "java.lang.String");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(new LinkerInstrumentation(), new NativeLibraryInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(new LinkerInstrumentation(), new NativeLibraryInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk22/LinkerInstrumentation.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk22/LinkerInstrumentation.java
index 0d607adc4c4..bd267d2411f 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk22/LinkerInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk22/LinkerInstrumentation.java
@@ -7,18 +7,16 @@
 import datadog.trace.agent.tooling.Instrumenter;
 
 public class LinkerInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.ForBootstrap, Instrumenter.HasMethodAdvice {
-  @Override
-  public String instrumentedType() {
-    return "jdk.internal.foreign.abi.AbstractLinker";
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.ForBootstrap, Instrumenter.HasMethodAdvice {
+    @Override
+    public String instrumentedType() {
+        return "jdk.internal.foreign.abi.AbstractLinker";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("downcallHandle"))
-            .and(takesArgument(0, named("java.lang.foreign.MemorySegment"))),
-        "datadog.trace.instrumentation.java.lang.jdk22.DownCallWrapAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("downcallHandle")).and(takesArgument(0, named("java.lang.foreign.MemorySegment"))),
+                "datadog.trace.instrumentation.java.lang.jdk22.DownCallWrapAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk22/NativeLibraryInstrumentation.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk22/NativeLibraryInstrumentation.java
index 44b9bb56979..128bddae018 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk22/NativeLibraryInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk22/NativeLibraryInstrumentation.java
@@ -11,25 +11,23 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class NativeLibraryInstrumentation
-    implements Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice,
-        Instrumenter.ForBootstrap {
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice, Instrumenter.ForBootstrap {
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("jdk.internal.loader.NativeLibrary"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("jdk.internal.loader.NativeLibrary"));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(), "datadog.trace.instrumentation.java.lang.jdk22.CaptureLibraryNameAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("find")).and(returns(long.class)),
-        "datadog.trace.instrumentation.java.lang.jdk22.CaptureSymbolAddressAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor(), "datadog.trace.instrumentation.java.lang.jdk22.CaptureLibraryNameAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("find")).and(returns(long.class)),
+                "datadog.trace.instrumentation.java.lang.jdk22.CaptureSymbolAddressAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java25/datadog/trace/instrumentation/java/lang/jdk22/CaptureLibraryNameAdvice.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java25/datadog/trace/instrumentation/java/lang/jdk22/CaptureLibraryNameAdvice.java
index c718b9acd28..533c1b70c97 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java25/datadog/trace/instrumentation/java/lang/jdk22/CaptureLibraryNameAdvice.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java25/datadog/trace/instrumentation/java/lang/jdk22/CaptureLibraryNameAdvice.java
@@ -9,23 +9,22 @@
 import net.bytebuddy.asm.Advice;
 
 public class CaptureLibraryNameAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit(@Advice.This final Object self) {
-    // this module is not opened by default hence we are inlining this code into the target to
-    // circumvent this limitation
-    try {
-      final MethodHandle mh =
-          MethodHandles.lookup()
-              .findVirtual(self.getClass(), "name", MethodType.methodType(String.class));
-      String libraryName = (String) mh.invoke(self);
-      if (libraryName != null) {
-        libraryName = extractLibraryName(libraryName);
-      } else {
-        libraryName = "";
-      }
-      InstrumentationContext.get("jdk.internal.loader.NativeLibrary", "java.lang.String")
-          .put(self, libraryName);
-    } catch (Throwable ignored) {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(@Advice.This final Object self) {
+        // this module is not opened by default hence we are inlining this code into the target to
+        // circumvent this limitation
+        try {
+            final MethodHandle mh =
+                    MethodHandles.lookup().findVirtual(self.getClass(), "name", MethodType.methodType(String.class));
+            String libraryName = (String) mh.invoke(self);
+            if (libraryName != null) {
+                libraryName = extractLibraryName(libraryName);
+            } else {
+                libraryName = "";
+            }
+            InstrumentationContext.get("jdk.internal.loader.NativeLibrary", "java.lang.String")
+                    .put(self, libraryName);
+        } catch (Throwable ignored) {
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java25/datadog/trace/instrumentation/java/lang/jdk22/CaptureSymbolAddressAdvice.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java25/datadog/trace/instrumentation/java/lang/jdk22/CaptureSymbolAddressAdvice.java
index 236a49a82b9..a52d0c422ff 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java25/datadog/trace/instrumentation/java/lang/jdk22/CaptureSymbolAddressAdvice.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java25/datadog/trace/instrumentation/java/lang/jdk22/CaptureSymbolAddressAdvice.java
@@ -6,15 +6,14 @@
 import net.bytebuddy.asm.Advice;
 
 public class CaptureSymbolAddressAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit(
-      @Advice.Argument(0) final String symbol,
-      @Advice.This final Object self,
-      @Advice.Return final long address) {
-    final String libraryName =
-        (String)
-            InstrumentationContext.get("jdk.internal.loader.NativeLibrary", "java.lang.String")
-                .get(self);
-    onSymbolLookup(libraryName, symbol, address);
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(
+            @Advice.Argument(0) final String symbol,
+            @Advice.This final Object self,
+            @Advice.Return final long address) {
+        final String libraryName =
+                (String) InstrumentationContext.get("jdk.internal.loader.NativeLibrary", "java.lang.String")
+                        .get(self);
+        onSymbolLookup(libraryName, symbol, address);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java25/datadog/trace/instrumentation/java/lang/jdk22/DownCallWrapAdvice.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java25/datadog/trace/instrumentation/java/lang/jdk22/DownCallWrapAdvice.java
index 960f6a46212..2b22fc45995 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java25/datadog/trace/instrumentation/java/lang/jdk22/DownCallWrapAdvice.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java25/datadog/trace/instrumentation/java/lang/jdk22/DownCallWrapAdvice.java
@@ -9,18 +9,17 @@
 import net.bytebuddy.asm.Advice;
 
 public class DownCallWrapAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit(
-      @Advice.Argument(0) final MemorySegment memorySegment,
-      @Advice.Return(readOnly = false) MethodHandle handle) {
-    if (memorySegment == null) {
-      return;
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(
+            @Advice.Argument(0) final MemorySegment memorySegment,
+            @Advice.Return(readOnly = false) MethodHandle handle) {
+        if (memorySegment == null) {
+            return;
+        }
+        final Pair<String, String> libAndMethod = reverseResolveLibraryAndSymbol(memorySegment.address());
+        if (libAndMethod == null) {
+            return;
+        }
+        handle = wrap(handle, libAndMethod.getLeft(), libAndMethod.getRight());
     }
-    final Pair<String, String> libAndMethod =
-        reverseResolveLibraryAndSymbol(memorySegment.address());
-    if (libAndMethod == null) {
-      return;
-    }
-    handle = wrap(handle, libAndMethod.getLeft(), libAndMethod.getRight());
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/test/java/util/LoaderUtil.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/test/java/util/LoaderUtil.java
index d3eac010ea9..507ab212b3b 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/test/java/util/LoaderUtil.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/test/java/util/LoaderUtil.java
@@ -8,13 +8,13 @@
  * classloader
  */
 public final class LoaderUtil {
-  private LoaderUtil() {}
+    private LoaderUtil() {}
 
-  public static void loadLibrary(Path path) {
-    System.load(path.toString());
-  }
+    public static void loadLibrary(Path path) {
+        System.load(path.toString());
+    }
 
-  public static SymbolLookup loaderLookup() {
-    return SymbolLookup.loaderLookup();
-  }
+    public static SymbolLookup loaderLookup() {
+        return SymbolLookup.loaderLookup();
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSite.java
index ce6c1685cad..33076b8c8b6 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSite.java
@@ -11,38 +11,37 @@
 
 @Sink(VulnerabilityTypes.REFLECTION_INJECTION)
 @CallSite(
-    spi = IastCallSites.class,
-    enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isMajorJavaVersionAtLeast", "9"})
+        spi = IastCallSites.class,
+        enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isMajorJavaVersionAtLeast", "9"})
 public class Lookup9CallSite {
 
-  @CallSite.Before(
-      "java.lang.Class java.lang.invoke.MethodHandles$Lookup.findClass(java.lang.String)")
-  public static void beforeFindClass(@CallSite.Argument(0) @Nonnull final String className) {
-    final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
-    if (module != null) {
-      try {
-        module.onClassName(className);
-      } catch (Throwable e) {
-        module.onUnexpectedException("beforeFindClass threw", e);
-      }
+    @CallSite.Before("java.lang.Class java.lang.invoke.MethodHandles$Lookup.findClass(java.lang.String)")
+    public static void beforeFindClass(@CallSite.Argument(0) @Nonnull final String className) {
+        final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
+        if (module != null) {
+            try {
+                module.onClassName(className);
+            } catch (Throwable e) {
+                module.onUnexpectedException("beforeFindClass threw", e);
+            }
+        }
     }
-  }
 
-  @CallSite.Before(
-      "java.lang.invoke.VarHandle java.lang.invoke.MethodHandles$Lookup.findStaticVarHandle(java.lang.Class, java.lang.String, java.lang.Class)")
-  @CallSite.Before(
-      "java.lang.invoke.VarHandle java.lang.invoke.MethodHandles$Lookup.findVarHandle(java.lang.Class, java.lang.String, java.lang.Class)")
-  public static void beforeFindVar(
-      @CallSite.Argument(0) @Nonnull final Class<?> clazz,
-      @CallSite.Argument(1) @Nonnull final String fieldName,
-      @CallSite.Argument(2) @Nullable final Class<?> parameterType) {
-    final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
-    if (module != null) {
-      try {
-        module.onFieldName(clazz, fieldName);
-      } catch (Throwable e) {
-        module.onUnexpectedException("beforeFindGetter threw", e);
-      }
+    @CallSite.Before(
+            "java.lang.invoke.VarHandle java.lang.invoke.MethodHandles$Lookup.findStaticVarHandle(java.lang.Class, java.lang.String, java.lang.Class)")
+    @CallSite.Before(
+            "java.lang.invoke.VarHandle java.lang.invoke.MethodHandles$Lookup.findVarHandle(java.lang.Class, java.lang.String, java.lang.Class)")
+    public static void beforeFindVar(
+            @CallSite.Argument(0) @Nonnull final Class<?> clazz,
+            @CallSite.Argument(1) @Nonnull final String fieldName,
+            @CallSite.Argument(2) @Nullable final Class<?> parameterType) {
+        final ReflectionInjectionModule module = InstrumentationBridge.REFLECTION_INJECTION;
+        if (module != null) {
+            try {
+                module.onFieldName(clazz, fieldName);
+            } catch (Throwable e) {
+                module.onUnexpectedException("beforeFindGetter threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSite.java
index 5f92b4f6ec3..d9ba9cbdf51 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSite.java
@@ -23,174 +23,161 @@
 @SuppressForbidden
 @Propagation
 @CallSite(
-    spi = IastCallSites.class,
-    enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isMajorJavaVersionAtLeast", "9"})
+        spi = IastCallSites.class,
+        enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isMajorJavaVersionAtLeast", "9"})
 public class StringConcatFactoryCallSite {
 
-  private static final Logger LOG = LoggerFactory.getLogger(StringConcatFactoryCallSite.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StringConcatFactoryCallSite.class);
 
-  private static final char TAG_ARG = '\u0001';
-  private static final char TAG_CONST = '\u0002';
-  private static final int NULL_STR_LENGTH = "null".length();
-  private static final MethodHandle INSTRUMENTATION_BRIDGE = instrumentationBridgeMethod();
+    private static final char TAG_ARG = '\u0001';
+    private static final char TAG_CONST = '\u0002';
+    private static final int NULL_STR_LENGTH = "null".length();
+    private static final MethodHandle INSTRUMENTATION_BRIDGE = instrumentationBridgeMethod();
 
-  @CallSite.Around(
-      value =
-          "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
-      invokeDynamic = true)
-  public static java.lang.invoke.CallSite aroundMakeConcatWithConstants(
-      @CallSite.Argument final MethodHandles.Lookup lookup,
-      @CallSite.Argument final String name,
-      @CallSite.Argument final MethodType concatType,
-      @CallSite.Argument final String recipe,
-      @CallSite.Argument final Object... constants)
-      throws StringConcatException {
-    if (INSTRUMENTATION_BRIDGE == null) {
-      return makeConcatWithConstants(lookup, name, concatType, recipe, constants);
+    @CallSite.Around(
+            value =
+                    "java.lang.invoke.CallSite java.lang.invoke.StringConcatFactory.makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.String, java.lang.Object[])",
+            invokeDynamic = true)
+    public static java.lang.invoke.CallSite aroundMakeConcatWithConstants(
+            @CallSite.Argument final MethodHandles.Lookup lookup,
+            @CallSite.Argument final String name,
+            @CallSite.Argument final MethodType concatType,
+            @CallSite.Argument final String recipe,
+            @CallSite.Argument final Object... constants)
+            throws StringConcatException {
+        if (INSTRUMENTATION_BRIDGE == null) {
+            return makeConcatWithConstants(lookup, name, concatType, recipe, constants);
+        }
+        try {
+            final MethodHandle[] toStringMethods = new MethodHandle[concatType.parameterCount()];
+            final MethodType stringConcatType = lookupToStringConverters(concatType, toStringMethods);
+            java.lang.invoke.CallSite callSite =
+                    makeConcatWithConstants(lookup, name, stringConcatType, recipe, constants);
+            if (!(callSite instanceof ConstantCallSite)) {
+                // should not happen but better be prepared
+                throw new IllegalArgumentException("Expected ConstantCallSite, received " + callSite.getClass());
+            }
+            MethodHandle target = MethodHandles.insertArguments(
+                    INSTRUMENTATION_BRIDGE, 2, recipe, constants, preprocessRecipe(recipe, constants));
+            target = target.asCollector(1, String[].class, concatType.parameterCount());
+            target = MethodHandles.foldArguments(target, callSite.getTarget());
+            target = MethodHandles.filterArguments(target, 0, toStringMethods);
+            return new ConstantCallSite(target);
+        } catch (Throwable e) {
+            LOG.error("Failed to instrument makeConcatWithConstants, reverting to default concat logic", e);
+            return makeConcatWithConstants(lookup, name, concatType, recipe, constants);
+        }
     }
-    try {
-      final MethodHandle[] toStringMethods = new MethodHandle[concatType.parameterCount()];
-      final MethodType stringConcatType = lookupToStringConverters(concatType, toStringMethods);
-      java.lang.invoke.CallSite callSite =
-          makeConcatWithConstants(lookup, name, stringConcatType, recipe, constants);
-      if (!(callSite instanceof ConstantCallSite)) {
-        // should not happen but better be prepared
-        throw new IllegalArgumentException(
-            "Expected ConstantCallSite, received " + callSite.getClass());
-      }
-      MethodHandle target =
-          MethodHandles.insertArguments(
-              INSTRUMENTATION_BRIDGE, 2, recipe, constants, preprocessRecipe(recipe, constants));
-      target = target.asCollector(1, String[].class, concatType.parameterCount());
-      target = MethodHandles.foldArguments(target, callSite.getTarget());
-      target = MethodHandles.filterArguments(target, 0, toStringMethods);
-      return new ConstantCallSite(target);
-    } catch (Throwable e) {
-      LOG.error(
-          "Failed to instrument makeConcatWithConstants, reverting to default concat logic", e);
-      return makeConcatWithConstants(lookup, name, concatType, recipe, constants);
-    }
-  }
 
-  public static String onStringConcatFactory(
-      final String result,
-      final String[] arguments,
-      final String recipe,
-      final Object[] constants,
-      final int[] recipeOffsets) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringConcatFactory(result, arguments, recipe, constants, recipeOffsets);
-      } catch (final Throwable t) {
-        module.onUnexpectedException("Callback for onStringConcatFactory threw.", t);
-      }
+    public static String onStringConcatFactory(
+            final String result,
+            final String[] arguments,
+            final String recipe,
+            final Object[] constants,
+            final int[] recipeOffsets) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringConcatFactory(result, arguments, recipe, constants, recipeOffsets);
+            } catch (final Throwable t) {
+                module.onUnexpectedException("Callback for onStringConcatFactory threw.", t);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  /**
-   * Preprocess the recipe and create an array of offsets where for each offset:
-   *
-   * <ul>
-   *   <li><code>offset < 0</code> length of the current recipe chunk with sign changed
-   *   <li><code>offset >= 0</code> index of the argument
-   * </ul>
-   */
-  private static int[] preprocessRecipe(final String recipe, final Object[] constants) {
-    final List<Integer> offsets = new ArrayList<>();
-    final char[] chars = recipe.toCharArray();
-    int count = 0, argIndex = 0, constIndex = 0;
-    for (final char value : chars) {
-      switch (value) {
-        case TAG_ARG:
-          if (count > 0) {
+    /**
+     * Preprocess the recipe and create an array of offsets where for each offset:
+     *
+     * <ul>
+     *   <li><code>offset < 0</code> length of the current recipe chunk with sign changed
+     *   <li><code>offset >= 0</code> index of the argument
+     * </ul>
+     */
+    private static int[] preprocessRecipe(final String recipe, final Object[] constants) {
+        final List<Integer> offsets = new ArrayList<>();
+        final char[] chars = recipe.toCharArray();
+        int count = 0, argIndex = 0, constIndex = 0;
+        for (final char value : chars) {
+            switch (value) {
+                case TAG_ARG:
+                    if (count > 0) {
+                        offsets.add(-count);
+                        count = 0;
+                    }
+                    offsets.add(argIndex);
+                    argIndex++;
+                    break;
+                case TAG_CONST:
+                    final String constant = getConstant(constants, constIndex);
+                    constIndex++;
+                    count += getToStringLength(constant);
+                    break;
+                default:
+                    count++;
+                    break;
+            }
+        }
+        if (count > 0) {
             offsets.add(-count);
-            count = 0;
-          }
-          offsets.add(argIndex);
-          argIndex++;
-          break;
-        case TAG_CONST:
-          final String constant = getConstant(constants, constIndex);
-          constIndex++;
-          count += getToStringLength(constant);
-          break;
-        default:
-          count++;
-          break;
-      }
-    }
-    if (count > 0) {
-      offsets.add(-count);
+        }
+        final int[] result = new int[offsets.size()];
+        for (int i = 0; i < result.length; i++) {
+            result[i] = offsets.get(i);
+        }
+        return result;
     }
-    final int[] result = new int[offsets.size()];
-    for (int i = 0; i < result.length; i++) {
-      result[i] = offsets.get(i);
-    }
-    return result;
-  }
 
-  private static String getConstant(@Nullable final Object[] constants, final int index) {
-    if (constants == null) {
-      return "";
+    private static String getConstant(@Nullable final Object[] constants, final int index) {
+        if (constants == null) {
+            return "";
+        }
+        final Object result = constants[index];
+        return result instanceof String ? (String) result : result.toString();
     }
-    final Object result = constants[index];
-    return result instanceof String ? (String) result : result.toString();
-  }
 
-  private static int getToStringLength(@Nullable final String s) {
-    return s == null ? NULL_STR_LENGTH : s.length();
-  }
+    private static int getToStringLength(@Nullable final String s) {
+        return s == null ? NULL_STR_LENGTH : s.length();
+    }
 
-  private static MethodType lookupToStringConverters(
-      final MethodType concatType, final MethodHandle[] toStringMethods) {
-    MethodType result = concatType;
-    for (int i = 0; i < result.parameterCount(); i++) {
-      final Class<?> type = result.parameterType(i);
-      toStringMethods[i] = toStringConverterFor(type);
-      result = result.changeParameterType(i, String.class);
+    private static MethodType lookupToStringConverters(
+            final MethodType concatType, final MethodHandle[] toStringMethods) {
+        MethodType result = concatType;
+        for (int i = 0; i < result.parameterCount(); i++) {
+            final Class<?> type = result.parameterType(i);
+            toStringMethods[i] = toStringConverterFor(type);
+            result = result.changeParameterType(i, String.class);
+        }
+        return result;
     }
-    return result;
-  }
 
-  private static MethodHandle toStringConverterFor(final Class<?> cl) {
-    try {
-      final MethodType methodType;
-      if (cl.isPrimitive()) {
-        final Class<?> target = cl == byte.class || cl == short.class ? int.class : cl;
-        methodType = methodType(String.class, target);
-      } else {
-        methodType = methodType(String.class, Object.class);
-      }
-      final MethodHandles.Lookup lookup = MethodHandles.publicLookup();
-      final MethodHandle handle = lookup.findStatic(String.class, "valueOf", methodType);
-      return methodType.parameterType(0) == cl
-          ? handle
-          : handle.asType(methodType(String.class, cl));
-    } catch (Exception e) {
-      throw new RuntimeException("Failed to fetch string converter for " + cl, e);
+    private static MethodHandle toStringConverterFor(final Class<?> cl) {
+        try {
+            final MethodType methodType;
+            if (cl.isPrimitive()) {
+                final Class<?> target = cl == byte.class || cl == short.class ? int.class : cl;
+                methodType = methodType(String.class, target);
+            } else {
+                methodType = methodType(String.class, Object.class);
+            }
+            final MethodHandles.Lookup lookup = MethodHandles.publicLookup();
+            final MethodHandle handle = lookup.findStatic(String.class, "valueOf", methodType);
+            return methodType.parameterType(0) == cl ? handle : handle.asType(methodType(String.class, cl));
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to fetch string converter for " + cl, e);
+        }
     }
-  }
 
-  private static MethodHandle instrumentationBridgeMethod() {
-    try {
-      final MethodHandles.Lookup lookup = MethodHandles.publicLookup();
-      return lookup.findStatic(
-          StringConcatFactoryCallSite.class,
-          "onStringConcatFactory",
-          methodType(
-              String.class,
-              String.class,
-              String[].class,
-              String.class,
-              Object[].class,
-              int[].class));
-    } catch (Throwable e) {
-      LOG.error(
-          "Failed to fetch instrumentation bridge method handle, no invocations will be instrumented",
-          e);
-      return null;
+    private static MethodHandle instrumentationBridgeMethod() {
+        try {
+            final MethodHandles.Lookup lookup = MethodHandles.publicLookup();
+            return lookup.findStatic(
+                    StringConcatFactoryCallSite.class,
+                    "onStringConcatFactory",
+                    methodType(String.class, String.class, String[].class, String.class, Object[].class, int[].class));
+        } catch (Throwable e) {
+            LOG.error("Failed to fetch instrumentation bridge method handle, no invocations will be instrumented", e);
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/module/JpmsClearanceInstrumentation.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/module/JpmsClearanceInstrumentation.java
index c3997003d73..618418e10f3 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/module/JpmsClearanceInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/module/JpmsClearanceInstrumentation.java
@@ -23,57 +23,55 @@
  */
 @AutoService(InstrumenterModule.class)
 public class JpmsClearanceInstrumentation extends InstrumenterModule
-    implements Instrumenter.ForConfiguredTypes,
-        Instrumenter.ForBootstrap,
-        Instrumenter.HasMethodAdvice {
-  public JpmsClearanceInstrumentation() {
-    super("java-module");
-  }
+        implements Instrumenter.ForConfiguredTypes, Instrumenter.ForBootstrap, Instrumenter.HasMethodAdvice {
+    public JpmsClearanceInstrumentation() {
+        super("java-module");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && JavaVirtualMachine.isJavaVersionAtLeast(9);
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && JavaVirtualMachine.isJavaVersionAtLeast(9);
+    }
 
-  @Override
-  public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    return true; // not directly linked to a target system
-  }
+    @Override
+    public boolean isApplicable(Set<TargetSystem> enabledSystems) {
+        return true; // not directly linked to a target system
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$OpenModuleAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$OpenModuleAdvice");
+    }
 
-  @Override
-  public Collection<String> configuredMatchingTypes() {
-    return JpmsHelper.getAllTriggers();
-  }
+    @Override
+    public Collection<String> configuredMatchingTypes() {
+        return JpmsHelper.getAllTriggers();
+    }
 
-  public static class OpenModuleAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(@Advice.This(typing = Assigner.Typing.DYNAMIC) Object self) {
-      final Class<?> cls = self.getClass();
-      if (shouldBeOpened(cls)) {
-        final Module module = cls.getModule();
-        final String pkg = cls.getPackageName();
-        if (module != null) {
-          try {
-            // This call must be inlined into the constructor of the class belonging to that
-            // package because the JDK verifies the caller belongs to the module being opened.
-            // Moving this to a helper method will not work.
-            module.addOpens(pkg, JpmsHelper.class.getModule());
-            final ClassLoader loader = cls.getClassLoader();
-            if (loader != null) {
-              module.addOpens(pkg, loader.getUnnamedModule());
+    public static class OpenModuleAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(@Advice.This(typing = Assigner.Typing.DYNAMIC) Object self) {
+            final Class<?> cls = self.getClass();
+            if (shouldBeOpened(cls)) {
+                final Module module = cls.getModule();
+                final String pkg = cls.getPackageName();
+                if (module != null) {
+                    try {
+                        // This call must be inlined into the constructor of the class belonging to that
+                        // package because the JDK verifies the caller belongs to the module being opened.
+                        // Moving this to a helper method will not work.
+                        module.addOpens(pkg, JpmsHelper.class.getModule());
+                        final ClassLoader loader = cls.getClassLoader();
+                        if (loader != null) {
+                            module.addOpens(pkg, loader.getUnnamedModule());
+                        }
+                    } catch (Throwable t) {
+                        logFailedToOpen(pkg, t);
+                    }
+                } else {
+                    logNoNamedModule(cls);
+                }
             }
-          } catch (Throwable t) {
-            logFailedToOpen(pkg, t);
-          }
-        } else {
-          logNoNamedModule(cls);
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/java/foo/bar/TestLookup9Suite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/java/foo/bar/TestLookup9Suite.java
index d531a1cdfb0..c5d7f87e517 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/java/foo/bar/TestLookup9Suite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/java/foo/bar/TestLookup9Suite.java
@@ -7,41 +7,39 @@
 
 public class TestLookup9Suite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestLookup9Suite.class);
-  private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestLookup9Suite.class);
+    private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
 
-  public static void findClass(final String className) {
-    LOGGER.debug("Before findClass");
-    final Class<?> result;
-    try {
-      result = LOOKUP.findClass(className);
-      LOGGER.debug("After findClass {}", result);
-    } catch (Exception e) {
-      LOGGER.debug("Error in findClass", e);
+    public static void findClass(final String className) {
+        LOGGER.debug("Before findClass");
+        final Class<?> result;
+        try {
+            result = LOOKUP.findClass(className);
+            LOGGER.debug("After findClass {}", result);
+        } catch (Exception e) {
+            LOGGER.debug("Error in findClass", e);
+        }
     }
-  }
 
-  public static void findStaticVarHandle(
-      final Class<?> clazz, final String field, final Class<?> fieldType) {
-    LOGGER.debug("Before findStaticVarHandle");
-    final VarHandle result;
-    try {
-      result = LOOKUP.findStaticVarHandle(clazz, field, fieldType);
-      LOGGER.debug("After findStaticVarHandle {}", result);
-    } catch (Exception e) {
-      LOGGER.debug("Error in findStaticVarHandle", e);
+    public static void findStaticVarHandle(final Class<?> clazz, final String field, final Class<?> fieldType) {
+        LOGGER.debug("Before findStaticVarHandle");
+        final VarHandle result;
+        try {
+            result = LOOKUP.findStaticVarHandle(clazz, field, fieldType);
+            LOGGER.debug("After findStaticVarHandle {}", result);
+        } catch (Exception e) {
+            LOGGER.debug("Error in findStaticVarHandle", e);
+        }
     }
-  }
 
-  public static void findVarHandle(
-      final Class<?> clazz, final String field, final Class<?> fieldType) {
-    LOGGER.debug("Before findVarHandle");
-    final VarHandle result;
-    try {
-      result = LOOKUP.findVarHandle(clazz, field, fieldType);
-      LOGGER.debug("After findVarHandle {}", result);
-    } catch (Exception e) {
-      LOGGER.debug("Error in findVarHandle", e);
+    public static void findVarHandle(final Class<?> clazz, final String field, final Class<?> fieldType) {
+        LOGGER.debug("Before findVarHandle");
+        final VarHandle result;
+        try {
+            result = LOOKUP.findVarHandle(clazz, field, fieldType);
+            LOGGER.debug("After findVarHandle {}", result);
+        } catch (Exception e) {
+            LOGGER.debug("Error in findVarHandle", e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/java/foo/bar/TestStringConcatFactorySuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/java/foo/bar/TestStringConcatFactorySuite.java
index 2bf8ce74c84..17f4bdb8de1 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/java/foo/bar/TestStringConcatFactorySuite.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/java/foo/bar/TestStringConcatFactorySuite.java
@@ -6,109 +6,108 @@
 
 public abstract class TestStringConcatFactorySuite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestStringConcatFactorySuite.class);
-
-  private TestStringConcatFactorySuite() {}
-
-  public static String plus(final String left, final String right) {
-    LOGGER.debug("Before string plus {} {}", left, right);
-    final String result = left + right;
-    LOGGER.debug("After string plus {}", result);
-    return result;
-  }
-
-  public static String plusWithConstants(final String left, final String right) {
-    LOGGER.debug("Before string plus {} {}", left, right);
-    final String result = left + " " + right;
-    LOGGER.debug("After string plus {}", result);
-    return result;
-  }
-
-  public static String plusWithConstantsAndTags(final String left, final String right) {
-    LOGGER.debug("Before string plus {} {}", left, right);
-    final String result = "\u0001 " + left + " \u0002 " + right + ".";
-    LOGGER.debug("After string plus {}", result);
-    return result;
-  }
-
-  public static String plusWithUtfConstants(final String left, final String right) {
-    LOGGER.debug("Before string plus {} {}", left, right);
-    final String result = "𠆢" + left + "𠆢\u0001𠆢" + right + ".";
-    LOGGER.debug("After string plus {}", result);
-    return result;
-  }
-
-  public static String plus(
-      final String left, final Object right, final String third, final Object fourth) {
-    LOGGER.debug("Before string plus {} {} {} {}", left, right, third, fourth);
-    final String result = left + right + third + fourth;
-    LOGGER.debug("After string plus {}", result);
-    return result;
-  }
-
-  public static String stringPlusWithMultipleObjects(final Object... target) {
-    LOGGER.debug("Before string plus {}", Arrays.toString(target));
-    String result = "";
-    for (final Object item : target) {
-      result += item;
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestStringConcatFactorySuite.class);
+
+    private TestStringConcatFactorySuite() {}
+
+    public static String plus(final String left, final String right) {
+        LOGGER.debug("Before string plus {} {}", left, right);
+        final String result = left + right;
+        LOGGER.debug("After string plus {}", result);
+        return result;
+    }
+
+    public static String plusWithConstants(final String left, final String right) {
+        LOGGER.debug("Before string plus {} {}", left, right);
+        final String result = left + " " + right;
+        LOGGER.debug("After string plus {}", result);
+        return result;
+    }
+
+    public static String plusWithConstantsAndTags(final String left, final String right) {
+        LOGGER.debug("Before string plus {} {}", left, right);
+        final String result = "\u0001 " + left + " \u0002 " + right + ".";
+        LOGGER.debug("After string plus {}", result);
+        return result;
+    }
+
+    public static String plusWithUtfConstants(final String left, final String right) {
+        LOGGER.debug("Before string plus {} {}", left, right);
+        final String result = "𠆢" + left + "𠆢\u0001𠆢" + right + ".";
+        LOGGER.debug("After string plus {}", result);
+        return result;
+    }
+
+    public static String plus(final String left, final Object right, final String third, final Object fourth) {
+        LOGGER.debug("Before string plus {} {} {} {}", left, right, third, fourth);
+        final String result = left + right + third + fourth;
+        LOGGER.debug("After string plus {}", result);
+        return result;
+    }
+
+    public static String stringPlusWithMultipleObjects(final Object... target) {
+        LOGGER.debug("Before string plus {}", Arrays.toString(target));
+        String result = "";
+        for (final Object item : target) {
+            result += item;
+        }
+        LOGGER.debug("After string plus {}", result);
+        return result;
+    }
+
+    public static String stringPlusWithPrimitive(final String left, final int right) {
+        LOGGER.debug("Before string plus with primitive {} {}", left, right);
+        final String result = left + right;
+        LOGGER.debug("After string plus with primitive {}", result);
+        return result;
+    }
+
+    public static String stringPlusWithPrimitive(final String left, final byte right) {
+        LOGGER.debug("Before string plus with primitive {} {}", left, right);
+        final String result = left + right;
+        LOGGER.debug("After string plus with primitive {}", result);
+        return result;
+    }
+
+    public static String stringPlusWithPrimitive(final String left, final short right) {
+        LOGGER.debug("Before string plus with primitive {} {}", left, right);
+        final String result = left + right;
+        LOGGER.debug("After string plus with primitive {}", result);
+        return result;
+    }
+
+    public static String stringPlusWithPrimitive(final String left, final boolean right) {
+        LOGGER.debug("Before string plus with primitive {} {}", left, right);
+        final String result = left + right;
+        LOGGER.debug("After string plus with primitive {}", result);
+        return result;
+    }
+
+    public static String stringPlusWithPrimitive(final String left, final char right) {
+        LOGGER.debug("Before string plus with primitive {} {}", left, right);
+        final String result = left + right;
+        LOGGER.debug("After string plus with primitive {}", result);
+        return result;
+    }
+
+    public static String stringPlusWithPrimitive(final String left, final long right) {
+        LOGGER.debug("Before string plus with primitive {} {}", left, right);
+        final String result = left + right;
+        LOGGER.debug("After string plus with primitive {}", result);
+        return result;
+    }
+
+    public static String stringPlusWithPrimitive(final String left, final float right) {
+        LOGGER.debug("Before string plus with primitive {} {}", left, right);
+        final String result = left + right;
+        LOGGER.debug("After string plus with primitive {}", result);
+        return result;
+    }
+
+    public static String stringPlusWithPrimitive(final String left, final double right) {
+        LOGGER.debug("Before string plus with primitive {} {}", left, right);
+        final String result = left + right;
+        LOGGER.debug("After string plus with primitive {}", result);
+        return result;
     }
-    LOGGER.debug("After string plus {}", result);
-    return result;
-  }
-
-  public static String stringPlusWithPrimitive(final String left, final int right) {
-    LOGGER.debug("Before string plus with primitive {} {}", left, right);
-    final String result = left + right;
-    LOGGER.debug("After string plus with primitive {}", result);
-    return result;
-  }
-
-  public static String stringPlusWithPrimitive(final String left, final byte right) {
-    LOGGER.debug("Before string plus with primitive {} {}", left, right);
-    final String result = left + right;
-    LOGGER.debug("After string plus with primitive {}", result);
-    return result;
-  }
-
-  public static String stringPlusWithPrimitive(final String left, final short right) {
-    LOGGER.debug("Before string plus with primitive {} {}", left, right);
-    final String result = left + right;
-    LOGGER.debug("After string plus with primitive {}", result);
-    return result;
-  }
-
-  public static String stringPlusWithPrimitive(final String left, final boolean right) {
-    LOGGER.debug("Before string plus with primitive {} {}", left, right);
-    final String result = left + right;
-    LOGGER.debug("After string plus with primitive {}", result);
-    return result;
-  }
-
-  public static String stringPlusWithPrimitive(final String left, final char right) {
-    LOGGER.debug("Before string plus with primitive {} {}", left, right);
-    final String result = left + right;
-    LOGGER.debug("After string plus with primitive {}", result);
-    return result;
-  }
-
-  public static String stringPlusWithPrimitive(final String left, final long right) {
-    LOGGER.debug("Before string plus with primitive {} {}", left, right);
-    final String result = left + right;
-    LOGGER.debug("After string plus with primitive {}", result);
-    return result;
-  }
-
-  public static String stringPlusWithPrimitive(final String left, final float right) {
-    LOGGER.debug("Before string plus with primitive {} {}", left, right);
-    final String result = left + right;
-    LOGGER.debug("After string plus with primitive {}", result);
-    return result;
-  }
-
-  public static String stringPlusWithPrimitive(final String left, final double right) {
-    LOGGER.debug("Before string plus with primitive {} {}", left, right);
-    final String result = left + right;
-    LOGGER.debug("After string plus with primitive {}", result);
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/src/main/java/datadog/trace/instrumentation/java/lang/classloading/ClassloadingInstrumentation.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/src/main/java/datadog/trace/instrumentation/java/lang/classloading/ClassloadingInstrumentation.java
index 510eaf6ea6e..baa5f81414c 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/src/main/java/datadog/trace/instrumentation/java/lang/classloading/ClassloadingInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/src/main/java/datadog/trace/instrumentation/java/lang/classloading/ClassloadingInstrumentation.java
@@ -33,98 +33,94 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class ClassloadingInstrumentation extends InstrumenterModule
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
-  public ClassloadingInstrumentation() {
-    super("classloading");
-  }
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public ClassloadingInstrumentation() {
+        super("classloading");
+    }
 
-  @Override
-  public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    return true;
-  }
+    @Override
+    public boolean isApplicable(Set<TargetSystem> enabledSystems) {
+        return true;
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return true;
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return true;
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    // just an optimization to exclude common class loaders that are known to delegate to the
-    // bootstrap loader (or happen to _be_ the bootstrap loader)
-    return namedNoneOf("java.lang.ClassLoader", "com.ibm.oti.vm.BootstrapClassLoader")
-        .and(extendsClass(named("java.lang.ClassLoader")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        // just an optimization to exclude common class loaders that are known to delegate to the
+        // bootstrap loader (or happen to _be_ the bootstrap loader)
+        return namedNoneOf("java.lang.ClassLoader", "com.ibm.oti.vm.BootstrapClassLoader")
+                .and(extendsClass(named("java.lang.ClassLoader")));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("loadClass"))
-            .and(
-                takesArguments(1)
-                    .and(takesArgument(0, named("java.lang.String")))
-                    .or(
-                        takesArguments(2)
-                            .and(takesArgument(0, named("java.lang.String")))
-                            .and(takesArgument(1, named("boolean")))))
-            .and(isPublic().or(isProtected()))
-            .and(not(isStatic())),
-        ClassloadingInstrumentation.class.getName() + "$LoadClassAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("loadClass"))
+                        .and(takesArguments(1)
+                                .and(takesArgument(0, named("java.lang.String")))
+                                .or(takesArguments(2)
+                                        .and(takesArgument(0, named("java.lang.String")))
+                                        .and(takesArgument(1, named("boolean")))))
+                        .and(isPublic().or(isProtected()))
+                        .and(not(isStatic())),
+                ClassloadingInstrumentation.class.getName() + "$LoadClassAdvice");
+    }
 
-  public static class LoadClassAdvice {
-    @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class, suppress = Throwable.class)
-    public static Class<?> onEnter(@Advice.Argument(0) final String name) {
-      if (!name.startsWith("datadog.")) {
-        return null; // ignore packages that won't be bundled on the dd-java-agent bootstrap
-      }
+    public static class LoadClassAdvice {
+        @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class, suppress = Throwable.class)
+        public static Class<?> onEnter(@Advice.Argument(0) final String name) {
+            if (!name.startsWith("datadog.")) {
+                return null; // ignore packages that won't be bundled on the dd-java-agent bootstrap
+            }
 
-      // we must access agent types used in the call-depth block like 'Constants' before entering it
-      // - otherwise we risk loading these agent types with a non-zero call-depth, which will fail
-      final String[] bootstrapPrefixes = Constants.BOOTSTRAP_PACKAGE_PREFIXES;
+            // we must access agent types used in the call-depth block like 'Constants' before entering it
+            // - otherwise we risk loading these agent types with a non-zero call-depth, which will fail
+            final String[] bootstrapPrefixes = Constants.BOOTSTRAP_PACKAGE_PREFIXES;
 
-      // need to use call depth here to prevent re-entry from call to Class.forName() below
-      // because on some JVMs (e.g. IBM's, though IBM bootstrap loader is explicitly excluded above)
-      // Class.forName() ends up calling loadClass() on the bootstrap loader which would then come
-      // back to this instrumentation over and over, causing a StackOverflowError
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(ClassLoader.class);
-      if (callDepth > 0) {
-        return null;
-      }
-      try {
-        for (final String prefix : bootstrapPrefixes) {
-          if (name.startsWith(prefix)) {
-            return Class.forName(name, false, null);
-          }
+            // need to use call depth here to prevent re-entry from call to Class.forName() below
+            // because on some JVMs (e.g. IBM's, though IBM bootstrap loader is explicitly excluded above)
+            // Class.forName() ends up calling loadClass() on the bootstrap loader which would then come
+            // back to this instrumentation over and over, causing a StackOverflowError
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(ClassLoader.class);
+            if (callDepth > 0) {
+                return null;
+            }
+            try {
+                for (final String prefix : bootstrapPrefixes) {
+                    if (name.startsWith(prefix)) {
+                        return Class.forName(name, false, null);
+                    }
+                }
+            } catch (final ClassNotFoundException e) {
+                // bootstrap class not found, fall-back to original behaviour
+            } finally {
+                // need to reset it right away, not waiting until onExit()
+                // otherwise it will prevent this instrumentation from being applied when loadClass()
+                // ends up calling a ClassFileTransformer which ends up calling loadClass() further down the
+                // stack on one of our bootstrap packages (since the call depth check would then suppress
+                // the nested loadClass instrumentation)
+                CallDepthThreadLocalMap.reset(ClassLoader.class);
+            }
+            return null;
         }
-      } catch (final ClassNotFoundException e) {
-        // bootstrap class not found, fall-back to original behaviour
-      } finally {
-        // need to reset it right away, not waiting until onExit()
-        // otherwise it will prevent this instrumentation from being applied when loadClass()
-        // ends up calling a ClassFileTransformer which ends up calling loadClass() further down the
-        // stack on one of our bootstrap packages (since the call depth check would then suppress
-        // the nested loadClass instrumentation)
-        CallDepthThreadLocalMap.reset(ClassLoader.class);
-      }
-      return null;
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void onExit(
-        @Advice.Return(readOnly = false) Class<?> result,
-        @Advice.Enter final Class<?> resultFromBootstrapLoader) {
-      if (resultFromBootstrapLoader != null) {
-        result = resultFromBootstrapLoader;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void onExit(
+                @Advice.Return(readOnly = false) Class<?> result,
+                @Advice.Enter final Class<?> resultFromBootstrapLoader) {
+            if (resultFromBootstrapLoader != null) {
+                result = resultFromBootstrapLoader;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/src/main/java/datadog/trace/instrumentation/java/lang/classloading/DefineClassInstrumentation.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/src/main/java/datadog/trace/instrumentation/java/lang/classloading/DefineClassInstrumentation.java
index 4d62c9ce047..9d86b138367 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/src/main/java/datadog/trace/instrumentation/java/lang/classloading/DefineClassInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/src/main/java/datadog/trace/instrumentation/java/lang/classloading/DefineClassInstrumentation.java
@@ -16,48 +16,42 @@
 /** Updates j.l.ClassLoader to notify the tracer when classes are about to be defined. */
 @AutoService(InstrumenterModule.class)
 public final class DefineClassInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public DefineClassInstrumentation() {
-    super("defineclass");
-  }
+        implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public DefineClassInstrumentation() {
+        super("defineclass");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    // only enable this when memoizing type hierarchies, where it provides the most ROI
-    return super.isEnabled() && InstrumenterConfig.get().isResolverMemoizingEnabled();
-  }
+    @Override
+    public boolean isEnabled() {
+        // only enable this when memoizing type hierarchies, where it provides the most ROI
+        return super.isEnabled() && InstrumenterConfig.get().isResolverMemoizingEnabled();
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "java.lang.ClassLoader";
-  }
+    @Override
+    public String instrumentedType() {
+        return "java.lang.ClassLoader";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(
-                named("defineClass")
-                    .and(
-                        takesArguments(
-                            String.class,
-                            byte[].class,
-                            int.class,
-                            int.class,
-                            ProtectionDomain.class))),
-        DefineClassInstrumentation.class.getName() + "$DefineClassAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("defineClass")
+                                .and(takesArguments(
+                                        String.class, byte[].class, int.class, int.class, ProtectionDomain.class))),
+                DefineClassInstrumentation.class.getName() + "$DefineClassAdvice");
+    }
 
-  public static class DefineClassAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.This ClassLoader loader,
-        @Advice.Argument(1) byte[] bytecode,
-        @Advice.Argument(2) int offset,
-        @Advice.Argument(3) int length) {
-      if (null != loader && loader.getClass() != DatadogClassLoader.class) {
-        ClassDefining.begin(loader, bytecode, offset, length);
-      }
+    public static class DefineClassAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.This ClassLoader loader,
+                @Advice.Argument(1) byte[] bytecode,
+                @Advice.Argument(2) int offset,
+                @Advice.Argument(3) int length) {
+            if (null != loader && loader.getClass() != DatadogClassLoader.class) {
+                ClassDefining.begin(loader, bytecode, offset, length);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/HttpUrlConnectionInstrumentation.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/HttpUrlConnectionInstrumentation.java
index eb78b2cf27e..3ca434a53ce 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/HttpUrlConnectionInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/HttpUrlConnectionInstrumentation.java
@@ -25,96 +25,95 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpUrlConnectionInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForKnownTypes,
-        Instrumenter.ForConfiguredType,
-        Instrumenter.HasMethodAdvice {
-
-  public HttpUrlConnectionInstrumentation() {
-    super("httpurlconnection");
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    // we deliberately exclude various subclasses that are simple delegators
-    return new String[] {
-      "sun.net.www.protocol.http.HttpURLConnection",
-      "java.net.HttpURLConnection",
-      "weblogic.net.http.HttpURLConnection"
-    };
-  }
-
-  @Override
-  public String configuredMatchingType() {
-    // this won't match any class unless the property is set
-    return InstrumenterConfig.get().getHttpURLConnectionClassName();
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("java.net.HttpURLConnection", HttpUrlState.class.getName());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(namedOneOf("connect", "getOutputStream", "getInputStream")),
-        HttpUrlConnectionInstrumentation.class.getName() + "$HttpUrlConnectionAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isProtected()).and(named("plainConnect")),
-        HttpUrlConnectionInstrumentation.class.getName() + "$HttpUrlConnectionAdvice");
-  }
-
-  public static class HttpUrlConnectionAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static HttpUrlState methodEnter(
-        @Advice.This final HttpURLConnection thiz,
-        @Advice.FieldValue("connected") final boolean connected) {
-
-      final ContextStore<HttpURLConnection, HttpUrlState> contextStore =
-          InstrumentationContext.get(HttpURLConnection.class, HttpUrlState.class);
-      final HttpUrlState state = contextStore.getOrCreate(thiz, HttpUrlState.FACTORY);
-
-      synchronized (state) {
-        final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpURLConnection.class);
-        if (callDepth > 0) {
-          return null;
-        }
+        implements Instrumenter.ForBootstrap,
+                Instrumenter.ForKnownTypes,
+                Instrumenter.ForConfiguredType,
+                Instrumenter.HasMethodAdvice {
 
-        if (!state.hasSpan() && !state.isFinished()) {
-          final AgentSpan span = state.start(thiz);
-          if (!connected) {
-            DECORATE.injectContext(currentContext().with(span), thiz, SETTER);
-          }
-        }
-        return state;
-      }
+    public HttpUrlConnectionInstrumentation() {
+        super("httpurlconnection");
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        // we deliberately exclude various subclasses that are simple delegators
+        return new String[] {
+            "sun.net.www.protocol.http.HttpURLConnection",
+            "java.net.HttpURLConnection",
+            "weblogic.net.http.HttpURLConnection"
+        };
+    }
+
+    @Override
+    public String configuredMatchingType() {
+        // this won't match any class unless the property is set
+        return InstrumenterConfig.get().getHttpURLConnectionClassName();
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final HttpUrlState state,
-        @Advice.This final HttpURLConnection thiz,
-        @Advice.FieldValue("responseCode") final int responseCode,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Origin("#m") final String methodName) {
-
-      if (state == null) {
-        return;
-      }
-
-      synchronized (state) {
-        if (state.hasSpan() && !state.isFinished()) {
-          if (throwable != null) {
-            state.finishSpan(thiz, responseCode, throwable);
-          } else if ("getInputStream".equals(methodName)) {
-            state.finishSpan(thiz, responseCode);
-          }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("java.net.HttpURLConnection", HttpUrlState.class.getName());
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(namedOneOf("connect", "getOutputStream", "getInputStream")),
+                HttpUrlConnectionInstrumentation.class.getName() + "$HttpUrlConnectionAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isProtected()).and(named("plainConnect")),
+                HttpUrlConnectionInstrumentation.class.getName() + "$HttpUrlConnectionAdvice");
+    }
+
+    public static class HttpUrlConnectionAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static HttpUrlState methodEnter(
+                @Advice.This final HttpURLConnection thiz, @Advice.FieldValue("connected") final boolean connected) {
+
+            final ContextStore<HttpURLConnection, HttpUrlState> contextStore =
+                    InstrumentationContext.get(HttpURLConnection.class, HttpUrlState.class);
+            final HttpUrlState state = contextStore.getOrCreate(thiz, HttpUrlState.FACTORY);
+
+            synchronized (state) {
+                final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpURLConnection.class);
+                if (callDepth > 0) {
+                    return null;
+                }
+
+                if (!state.hasSpan() && !state.isFinished()) {
+                    final AgentSpan span = state.start(thiz);
+                    if (!connected) {
+                        DECORATE.injectContext(currentContext().with(span), thiz, SETTER);
+                    }
+                }
+                return state;
+            }
         }
-      }
 
-      CallDepthThreadLocalMap.reset(HttpURLConnection.class);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final HttpUrlState state,
+                @Advice.This final HttpURLConnection thiz,
+                @Advice.FieldValue("responseCode") final int responseCode,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Origin("#m") final String methodName) {
+
+            if (state == null) {
+                return;
+            }
+
+            synchronized (state) {
+                if (state.hasSpan() && !state.isFinished()) {
+                    if (throwable != null) {
+                        state.finishSpan(thiz, responseCode, throwable);
+                    } else if ("getInputStream".equals(methodName)) {
+                        state.finishSpan(thiz, responseCode);
+                    }
+                }
+            }
+
+            CallDepthThreadLocalMap.reset(HttpURLConnection.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/SocketConnectInstrumentation.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/SocketConnectInstrumentation.java
index 44897c867ea..947e74c25a7 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/SocketConnectInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/SocketConnectInstrumentation.java
@@ -17,55 +17,55 @@
 
 @AutoService(InstrumenterModule.class)
 public class SocketConnectInstrumentation extends InstrumenterModule.Profiling
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public SocketConnectInstrumentation() {
-    super("socket");
-  }
+    public SocketConnectInstrumentation() {
+        super("socket");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "java.net.Socket";
-  }
+    @Override
+    public String instrumentedType() {
+        return "java.net.Socket";
+    }
 
-  @Override
-  public boolean isEnabled() {
-    // only needed if wallclock profiling is enabled, which requires tracing
-    return super.isEnabled()
-        && ConfigProvider.getInstance()
-            .getBoolean(
-                PROFILING_DATADOG_PROFILER_WALL_ENABLED,
-                PROFILING_DATADOG_PROFILER_WALL_ENABLED_DEFAULT)
-        && InstrumenterConfig.get().isTraceEnabled();
-  }
+    @Override
+    public boolean isEnabled() {
+        // only needed if wallclock profiling is enabled, which requires tracing
+        return super.isEnabled()
+                && ConfigProvider.getInstance()
+                        .getBoolean(
+                                PROFILING_DATADOG_PROFILER_WALL_ENABLED,
+                                PROFILING_DATADOG_PROFILER_WALL_ENABLED_DEFAULT)
+                && InstrumenterConfig.get().isTraceEnabled();
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("connect"))
-            .and(takesArgument(0, named("java.net.SocketAddress")))
-            .and(takesArgument(1, int.class)),
-        getClass().getName() + "$DisableWallclockSampling");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("connect"))
+                        .and(takesArgument(0, named("java.net.SocketAddress")))
+                        .and(takesArgument(1, int.class)),
+                getClass().getName() + "$DisableWallclockSampling");
+    }
 
-  public static final class DisableWallclockSampling {
+    public static final class DisableWallclockSampling {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static boolean before() {
-      AgentSpan activeSpan = AgentTracer.activeSpan();
-      if (activeSpan != null) {
-        AgentTracer.get().getProfilingContext().onDetach();
-        return true;
-      }
-      return false;
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static boolean before() {
+            AgentSpan activeSpan = AgentTracer.activeSpan();
+            if (activeSpan != null) {
+                AgentTracer.get().getProfilingContext().onDetach();
+                return true;
+            }
+            return false;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter boolean wasEnabled) {
-      if (wasEnabled) {
-        AgentTracer.get().getProfilingContext().onAttach();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter boolean wasEnabled) {
+            if (wasEnabled) {
+                AgentTracer.get().getProfilingContext().onAttach();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/SslSocketInstrumentation.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/SslSocketInstrumentation.java
index c1d04ffc3aa..8671749ea08 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/SslSocketInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/SslSocketInstrumentation.java
@@ -25,68 +25,59 @@
 
 @AutoService(InstrumenterModule.class)
 public final class SslSocketInstrumentation extends InstrumenterModule.Usm
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public SslSocketInstrumentation() {
-    super("sslsocket");
-  }
+    public SslSocketInstrumentation() {
+        super("sslsocket");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null;
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null;
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("javax.net.ssl.SSLSocket")).and(concreteClass());
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("javax.net.ssl.SSLSocket")).and(concreteClass());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("close").and(takesArguments(0))),
-        SslSocketInstrumentation.class.getName() + "$CloseAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getInputStream")),
-        SslSocketInstrumentation.class.getName() + "$GetInputStreamAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getOutputStream")),
-        SslSocketInstrumentation.class.getName() + "$GetOutputStreamAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("close").and(takesArguments(0))),
+                SslSocketInstrumentation.class.getName() + "$CloseAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getInputStream")),
+                SslSocketInstrumentation.class.getName() + "$GetInputStreamAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getOutputStream")),
+                SslSocketInstrumentation.class.getName() + "$GetOutputStreamAdvice");
+    }
 
-  public static final class CloseAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void close(@Advice.This final SSLSocket socket) {
-      boolean isIPv6 = socket.getLocalAddress() instanceof Inet6Address;
-      UsmConnection connection =
-          new UsmConnection(
-              socket.getLocalAddress(),
-              socket.getLocalPort(),
-              socket.getInetAddress(),
-              socket.getPort(),
-              isIPv6);
-      UsmMessage message = UsmMessageFactory.Supplier.getCloseMessage(connection);
-      UsmExtractor.Supplier.send(message);
+    public static final class CloseAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void close(@Advice.This final SSLSocket socket) {
+            boolean isIPv6 = socket.getLocalAddress() instanceof Inet6Address;
+            UsmConnection connection = new UsmConnection(
+                    socket.getLocalAddress(), socket.getLocalPort(), socket.getInetAddress(), socket.getPort(), isIPv6);
+            UsmMessage message = UsmMessageFactory.Supplier.getCloseMessage(connection);
+            UsmExtractor.Supplier.send(message);
+        }
     }
-  }
 
-  public static final class GetOutputStreamAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void getOutputStream(
-        @Advice.This final SSLSocket socket,
-        @Advice.Return(readOnly = false) OutputStream retValue) {
-      retValue = new UsmFilterOutputStream(retValue, socket);
+    public static final class GetOutputStreamAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void getOutputStream(
+                @Advice.This final SSLSocket socket, @Advice.Return(readOnly = false) OutputStream retValue) {
+            retValue = new UsmFilterOutputStream(retValue, socket);
+        }
     }
-  }
 
-  public static final class GetInputStreamAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void getInputStream(
-        @Advice.This final SSLSocket socket,
-        @Advice.Return(readOnly = false) InputStream retValue) {
-      retValue = new UsmFilterInputStream(retValue, socket);
+    public static final class GetInputStreamAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void getInputStream(
+                @Advice.This final SSLSocket socket, @Advice.Return(readOnly = false) InputStream retValue) {
+            retValue = new UsmFilterInputStream(retValue, socket);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java
index e47ee8ea613..5dde3485600 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java
@@ -17,112 +17,108 @@
 @CallSite(spi = IastCallSites.class)
 public class URICallSite {
 
-  @CallSite.After("java.net.URI java.net.URI.create(java.lang.String)")
-  public static URI afterCreate(
-      @CallSite.Argument @Nullable final String value, @CallSite.Return @Nonnull final URI result) {
-    if (value != null) {
-      final CodecModule module = InstrumentationBridge.CODEC;
-      if (module != null) {
-        try {
-          module.onUriCreate(result, value);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("create threw", e);
+    @CallSite.After("java.net.URI java.net.URI.create(java.lang.String)")
+    public static URI afterCreate(
+            @CallSite.Argument @Nullable final String value, @CallSite.Return @Nonnull final URI result) {
+        if (value != null) {
+            final CodecModule module = InstrumentationBridge.CODEC;
+            if (module != null) {
+                try {
+                    module.onUriCreate(result, value);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("create threw", e);
+                }
+            }
         }
-      }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("void java.net.URI.<init>(java.lang.String)")
-  @CallSite.After(
-      "void java.net.URI.<init>(java.lang.String, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, java.lang.String)")
-  @CallSite.After(
-      "void java.net.URI.<init>(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)")
-  @CallSite.After(
-      "void java.net.URI.<init>(java.lang.String, java.lang.String, java.lang.String, java.lang.String)")
-  @CallSite.After("void java.net.URI.<init>(java.lang.String, java.lang.String, java.lang.String)")
-  public static URI afterCtor(
-      @CallSite.AllArguments final Object[] args, @CallSite.Return @Nonnull final URI result) {
-    if (args != null && args.length > 0) {
-      final CodecModule module = InstrumentationBridge.CODEC;
-      if (module != null) {
-        try {
-          module.onUriCreate(result, args);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("ctor threw", e);
+    @CallSite.After("void java.net.URI.<init>(java.lang.String)")
+    @CallSite.After(
+            "void java.net.URI.<init>(java.lang.String, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, java.lang.String)")
+    @CallSite.After(
+            "void java.net.URI.<init>(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)")
+    @CallSite.After("void java.net.URI.<init>(java.lang.String, java.lang.String, java.lang.String, java.lang.String)")
+    @CallSite.After("void java.net.URI.<init>(java.lang.String, java.lang.String, java.lang.String)")
+    public static URI afterCtor(
+            @CallSite.AllArguments final Object[] args, @CallSite.Return @Nonnull final URI result) {
+        if (args != null && args.length > 0) {
+            final CodecModule module = InstrumentationBridge.CODEC;
+            if (module != null) {
+                try {
+                    module.onUriCreate(result, args);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("ctor threw", e);
+                }
+            }
         }
-      }
+        return result;
     }
-    return result;
-  }
 
-  /**
-   * Internally the URI is tainted following the <code>toString</code> representation
-   *
-   * @see CodecModule#onUriCreate(URI, Object...)
-   */
-  @CallSite.After("java.lang.String java.net.URI.toString()")
-  public static String afterToString(
-      @CallSite.This final URI url, @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, url, true, NOT_MARKED);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("After toString threw", e);
-      }
+    /**
+     * Internally the URI is tainted following the <code>toString</code> representation
+     *
+     * @see CodecModule#onUriCreate(URI, Object...)
+     */
+    @CallSite.After("java.lang.String java.net.URI.toString()")
+    public static String afterToString(@CallSite.This final URI url, @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, url, true, NOT_MARKED);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("After toString threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  /**
-   * @see #afterToString(URI, String)
-   */
-  @CallSite.After("java.lang.String java.net.URI.toASCIIString()")
-  public static String afterToASCIIString(
-      @CallSite.This final URI url, @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null && result != null) {
-      try {
-        boolean keepRanges = url.toString().equals(result);
-        module.taintStringIfTainted(result, url, keepRanges, NOT_MARKED);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("After toASCIIString threw", e);
-      }
+    /**
+     * @see #afterToString(URI, String)
+     */
+    @CallSite.After("java.lang.String java.net.URI.toASCIIString()")
+    public static String afterToASCIIString(@CallSite.This final URI url, @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null && result != null) {
+            try {
+                boolean keepRanges = url.toString().equals(result);
+                module.taintStringIfTainted(result, url, keepRanges, NOT_MARKED);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("After toASCIIString threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  /**
-   * @see #afterToString(URI, String)
-   */
-  @CallSite.After("java.net.URI java.net.URI.normalize()")
-  public static URI afterNormalize(
-      @CallSite.This final URI url, @CallSite.Return final URI result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null && result != null) {
-      try {
-        boolean keepRanges = url.toString().equals(result.toString());
-        module.taintObjectIfTainted(result, url, keepRanges, NOT_MARKED);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("After toString threw", e);
-      }
+    /**
+     * @see #afterToString(URI, String)
+     */
+    @CallSite.After("java.net.URI java.net.URI.normalize()")
+    public static URI afterNormalize(@CallSite.This final URI url, @CallSite.Return final URI result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null && result != null) {
+            try {
+                boolean keepRanges = url.toString().equals(result.toString());
+                module.taintObjectIfTainted(result, url, keepRanges, NOT_MARKED);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("After toString threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @Propagation
-  @CallSite.After("java.net.URL java.net.URI.toURL()")
-  public static URL afterToURL(@CallSite.This final URI uri, @CallSite.Return final URL result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null && result != null) {
-      try {
-        boolean keepRanges = uri.toString().equals(result.toString());
-        module.taintObjectIfTainted(result, uri, keepRanges, NOT_MARKED);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("After toURL threw", e);
-      }
+    @Propagation
+    @CallSite.After("java.net.URL java.net.URI.toURL()")
+    public static URL afterToURL(@CallSite.This final URI uri, @CallSite.Return final URL result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null && result != null) {
+            try {
+                boolean keepRanges = uri.toString().equals(result.toString());
+                module.taintObjectIfTainted(result, uri, keepRanges, NOT_MARKED);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("After toURL threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java
index f3d9803a10a..2c4ef0611bb 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java
@@ -15,85 +15,81 @@
 @CallSite(spi = IastCallSites.class)
 public class URLCallSite {
 
-  @Propagation
-  @CallSite.After("void java.net.URL.<init>(java.lang.String)")
-  @CallSite.After(
-      "void java.net.URL.<init>(java.lang.String, java.lang.String, int, java.lang.String)")
-  @CallSite.After(
-      "void java.net.URL.<init>(java.lang.String, java.lang.String, int, java.lang.String, java.net.URLStreamHandler)")
-  @CallSite.After("void java.net.URL.<init>(java.lang.String, java.lang.String, java.lang.String)")
-  @CallSite.After("void java.net.URL.<init>(java.net.URL, java.lang.String)")
-  @CallSite.After(
-      "void java.net.URL.<init>(java.net.URL, java.lang.String, java.net.URLStreamHandler)")
-  public static URL afterCtor(
-      @CallSite.AllArguments final Object[] args, @CallSite.Return @Nonnull final URL result) {
-    if (args != null && args.length > 0) {
-      final CodecModule module = InstrumentationBridge.CODEC;
-      if (module != null) {
-        try {
-          module.onUrlCreate(result, args);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("ctor threw", e);
+    @Propagation
+    @CallSite.After("void java.net.URL.<init>(java.lang.String)")
+    @CallSite.After("void java.net.URL.<init>(java.lang.String, java.lang.String, int, java.lang.String)")
+    @CallSite.After(
+            "void java.net.URL.<init>(java.lang.String, java.lang.String, int, java.lang.String, java.net.URLStreamHandler)")
+    @CallSite.After("void java.net.URL.<init>(java.lang.String, java.lang.String, java.lang.String)")
+    @CallSite.After("void java.net.URL.<init>(java.net.URL, java.lang.String)")
+    @CallSite.After("void java.net.URL.<init>(java.net.URL, java.lang.String, java.net.URLStreamHandler)")
+    public static URL afterCtor(
+            @CallSite.AllArguments final Object[] args, @CallSite.Return @Nonnull final URL result) {
+        if (args != null && args.length > 0) {
+            final CodecModule module = InstrumentationBridge.CODEC;
+            if (module != null) {
+                try {
+                    module.onUrlCreate(result, args);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("ctor threw", e);
+                }
+            }
         }
-      }
+        return result;
     }
-    return result;
-  }
 
-  /**
-   * Internally the URL is tainted following the <code>toString</code> representation
-   *
-   * @see CodecModule#onUrlCreate(URL, Object...)
-   */
-  @Propagation
-  @CallSite.After("java.lang.String java.net.URL.toString()")
-  public static String afterToString(
-      @CallSite.This final URL url, @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null && result != null) {
-      try {
-        module.taintStringIfTainted(result, url, true, NOT_MARKED);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("After toString threw", e);
-      }
+    /**
+     * Internally the URL is tainted following the <code>toString</code> representation
+     *
+     * @see CodecModule#onUrlCreate(URL, Object...)
+     */
+    @Propagation
+    @CallSite.After("java.lang.String java.net.URL.toString()")
+    public static String afterToString(@CallSite.This final URL url, @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null && result != null) {
+            try {
+                module.taintStringIfTainted(result, url, true, NOT_MARKED);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("After toString threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  /**
-   * @see #afterToString(URL, String)
-   */
-  @Propagation
-  @CallSite.After("java.lang.String java.net.URL.toExternalForm()")
-  public static String afterToExternalForm(
-      @CallSite.This final URL url, @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null && result != null) {
-      try {
-        boolean keepRanges = url.toString().equals(result);
-        module.taintStringIfTainted(result, url, keepRanges, NOT_MARKED);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("After toExternalForm threw", e);
-      }
+    /**
+     * @see #afterToString(URL, String)
+     */
+    @Propagation
+    @CallSite.After("java.lang.String java.net.URL.toExternalForm()")
+    public static String afterToExternalForm(@CallSite.This final URL url, @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null && result != null) {
+            try {
+                boolean keepRanges = url.toString().equals(result);
+                module.taintStringIfTainted(result, url, keepRanges, NOT_MARKED);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("After toExternalForm threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  /**
-   * @see #afterToString(URL, String)
-   */
-  @Propagation
-  @CallSite.After("java.net.URI java.net.URL.toURI()")
-  public static URI afterToURI(@CallSite.This final URL url, @CallSite.Return final URI result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null && result != null) {
-      try {
-        boolean keepRanges = url.toString().equals(result.toString());
-        module.taintObjectIfTainted(result, url, keepRanges, NOT_MARKED);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("After toURI threw", e);
-      }
+    /**
+     * @see #afterToString(URL, String)
+     */
+    @Propagation
+    @CallSite.After("java.net.URI java.net.URL.toURI()")
+    public static URI afterToURI(@CallSite.This final URL url, @CallSite.Return final URI result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null && result != null) {
+            try {
+                boolean keepRanges = url.toString().equals(result.toString());
+                module.taintObjectIfTainted(result, url, keepRanges, NOT_MARKED);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("After toURI threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLDecoderCallSite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLDecoderCallSite.java
index 82fb80e5fbb..3fab1bc8178 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLDecoderCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLDecoderCallSite.java
@@ -11,38 +11,37 @@
 @CallSite(spi = IastCallSites.class)
 public class URLDecoderCallSite {
 
-  @CallSite.After("java.lang.String java.net.URLDecoder.decode(java.lang.String)")
-  public static String afterDecode(
-      @CallSite.Argument @Nullable final String value,
-      @CallSite.Return @Nullable final String result) {
-    if (value != null && result != null) {
-      final CodecModule module = InstrumentationBridge.CODEC;
-      if (module != null) {
-        try {
-          module.onUrlDecode(value, null, result);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("afterDecode threw", e);
+    @CallSite.After("java.lang.String java.net.URLDecoder.decode(java.lang.String)")
+    public static String afterDecode(
+            @CallSite.Argument @Nullable final String value, @CallSite.Return @Nullable final String result) {
+        if (value != null && result != null) {
+            final CodecModule module = InstrumentationBridge.CODEC;
+            if (module != null) {
+                try {
+                    module.onUrlDecode(value, null, result);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("afterDecode threw", e);
+                }
+            }
         }
-      }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String java.net.URLDecoder.decode(java.lang.String, java.lang.String)")
-  public static String afterDecode(
-      @CallSite.Argument @Nullable final String value,
-      @CallSite.Argument @Nullable final String encoding,
-      @CallSite.Return @Nullable final String result) {
-    if (value != null && result != null) {
-      final CodecModule module = InstrumentationBridge.CODEC;
-      if (module != null) {
-        try {
-          module.onUrlDecode(value, encoding, result);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("afterDecode threw", e);
+    @CallSite.After("java.lang.String java.net.URLDecoder.decode(java.lang.String, java.lang.String)")
+    public static String afterDecode(
+            @CallSite.Argument @Nullable final String value,
+            @CallSite.Argument @Nullable final String encoding,
+            @CallSite.Return @Nullable final String result) {
+        if (value != null && result != null) {
+            final CodecModule module = InstrumentationBridge.CODEC;
+            if (module != null) {
+                try {
+                    module.onUrlDecode(value, encoding, result);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("afterDecode threw", e);
+                }
+            }
         }
-      }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java
index 9e662fb5e52..ba85d9e9543 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java
@@ -11,32 +11,31 @@
 @CallSite(spi = IastCallSites.class)
 public class URLEncoderCallSite {
 
-  @CallSite.After("java.lang.String java.net.URLEncoder.encode(java.lang.String)")
-  public static String afterEncode(
-      @CallSite.Argument @Nullable final String value,
-      @CallSite.Return @Nullable final String result) {
-    return encode(result, null, value);
-  }
+    @CallSite.After("java.lang.String java.net.URLEncoder.encode(java.lang.String)")
+    public static String afterEncode(
+            @CallSite.Argument @Nullable final String value, @CallSite.Return @Nullable final String result) {
+        return encode(result, null, value);
+    }
 
-  @CallSite.After("java.lang.String java.net.URLEncoder.encode(java.lang.String, java.lang.String)")
-  public static String afterEncode(
-      @CallSite.Argument @Nullable final String value,
-      @CallSite.Argument @Nullable final String encoding,
-      @CallSite.Return @Nullable final String result) {
-    return encode(result, encoding, value);
-  }
+    @CallSite.After("java.lang.String java.net.URLEncoder.encode(java.lang.String, java.lang.String)")
+    public static String afterEncode(
+            @CallSite.Argument @Nullable final String value,
+            @CallSite.Argument @Nullable final String encoding,
+            @CallSite.Return @Nullable final String result) {
+        return encode(result, encoding, value);
+    }
 
-  private static String encode(final String result, final String encoding, final String value) {
-    if (value != null && result != null) {
-      final CodecModule module = InstrumentationBridge.CODEC;
-      if (module != null) {
-        try {
-          module.onUrlEncode(value, encoding, result);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("afterEncode threw", e);
+    private static String encode(final String result, final String encoding, final String value) {
+        if (value != null && result != null) {
+            final CodecModule module = InstrumentationBridge.CODEC;
+            if (module != null) {
+                try {
+                    module.onUrlEncode(value, encoding, result);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("afterEncode threw", e);
+                }
+            }
         }
-      }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLSinkCallSite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLSinkCallSite.java
index 7752797fa16..266f37463d7 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLSinkCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLSinkCallSite.java
@@ -27,72 +27,70 @@
 @CallSite(spi = {IastCallSites.class, RaspCallSites.class})
 public class URLSinkCallSite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(URLSinkCallSite.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(URLSinkCallSite.class);
 
-  @Sink(VulnerabilityTypes.SSRF)
-  @CallSite.Before("java.net.URLConnection java.net.URL.openConnection()")
-  @CallSite.Before("java.net.URLConnection java.net.URL.openConnection(java.net.Proxy)")
-  @CallSite.Before("java.io.InputStream java.net.URL.openStream()")
-  @CallSite.Before("java.lang.Object java.net.URL.getContent()")
-  @CallSite.Before("java.lang.Object java.net.URL.getContent(java.lang.Class[])")
-  public static void beforeOpenConnection(@CallSite.This final URL url) {
-    if (url == null) {
-      return;
+    @Sink(VulnerabilityTypes.SSRF)
+    @CallSite.Before("java.net.URLConnection java.net.URL.openConnection()")
+    @CallSite.Before("java.net.URLConnection java.net.URL.openConnection(java.net.Proxy)")
+    @CallSite.Before("java.io.InputStream java.net.URL.openStream()")
+    @CallSite.Before("java.lang.Object java.net.URL.getContent()")
+    @CallSite.Before("java.lang.Object java.net.URL.getContent(java.lang.Class[])")
+    public static void beforeOpenConnection(@CallSite.This final URL url) {
+        if (url == null) {
+            return;
+        }
+        iastCallback(url);
+        raspCallback(url);
     }
-    iastCallback(url);
-    raspCallback(url);
-  }
 
-  private static void iastCallback(@Nonnull final URL url) {
-    final SsrfModule module = InstrumentationBridge.SSRF;
-    if (module != null) {
-      try {
-        module.onURLConnection(url);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("After open connection threw", e);
-      }
+    private static void iastCallback(@Nonnull final URL url) {
+        final SsrfModule module = InstrumentationBridge.SSRF;
+        if (module != null) {
+            try {
+                module.onURLConnection(url);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("After open connection threw", e);
+            }
+        }
     }
-  }
 
-  private static void raspCallback(@Nonnull final URL url) {
-    if (!Config.get().isAppSecRaspEnabled()) {
-      return;
-    }
+    private static void raspCallback(@Nonnull final URL url) {
+        if (!Config.get().isAppSecRaspEnabled()) {
+            return;
+        }
 
-    try {
-      final BiFunction<RequestContext, HttpClientRequest, Flow<Void>> httpClientRequestCb =
-          AgentTracer.get()
-              .getCallbackProvider(RequestContextSlot.APPSEC)
-              .getCallback(EVENTS.httpClientRequest());
-      if (httpClientRequestCb == null) {
-        return;
-      }
+        try {
+            final BiFunction<RequestContext, HttpClientRequest, Flow<Void>> httpClientRequestCb = AgentTracer.get()
+                    .getCallbackProvider(RequestContextSlot.APPSEC)
+                    .getCallback(EVENTS.httpClientRequest());
+            if (httpClientRequestCb == null) {
+                return;
+            }
 
-      final AgentSpan span = AgentTracer.get().activeSpan();
-      if (span == null) {
-        return;
-      }
+            final AgentSpan span = AgentTracer.get().activeSpan();
+            if (span == null) {
+                return;
+            }
 
-      final RequestContext ctx = span.getRequestContext();
-      if (ctx == null) {
-        return;
-      }
+            final RequestContext ctx = span.getRequestContext();
+            if (ctx == null) {
+                return;
+            }
 
-      Flow<Void> flow =
-          httpClientRequestCb.apply(ctx, new HttpClientRequest(span.getSpanId(), url.toString()));
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        BlockResponseFunction brf = ctx.getBlockResponseFunction();
-        if (brf != null) {
-          Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-          brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
+            Flow<Void> flow = httpClientRequestCb.apply(ctx, new HttpClientRequest(span.getSpanId(), url.toString()));
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                BlockResponseFunction brf = ctx.getBlockResponseFunction();
+                if (brf != null) {
+                    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                    brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
+                }
+                throw new BlockingException("Blocked request (for SSRF attempt)");
+            }
+        } catch (final BlockingException e) {
+            throw e;
+        } catch (final Throwable e) {
+            LOGGER.debug("Exception during SSRF rasp callback", e);
         }
-        throw new BlockingException("Blocked request (for SSRF attempt)");
-      }
-    } catch (final BlockingException e) {
-      throw e;
-    } catch (final Throwable e) {
-      LOGGER.debug("Exception during SSRF rasp callback", e);
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java
index 0b349aff712..52df1d72b1e 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java
@@ -19,52 +19,52 @@
 
 @AutoService(InstrumenterModule.class)
 public class UrlInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public UrlInstrumentation() {
-    super("urlconnection", "httpurlconnection");
-  }
+    public UrlInstrumentation() {
+        super("urlconnection", "httpurlconnection");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return false;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "java.net.URL";
-  }
+    @Override
+    public String instrumentedType() {
+        return "java.net.URL";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("openConnection")),
-        UrlInstrumentation.class.getName() + "$ConnectionErrorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("openConnection")),
+                UrlInstrumentation.class.getName() + "$ConnectionErrorAdvice");
+    }
 
-  public static class ConnectionErrorAdvice {
+    public static class ConnectionErrorAdvice {
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void errorSpan(
-        @Advice.This final URL url,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.FieldValue("handler") final URLStreamHandler handler) {
-      if (throwable != null) {
-        String protocol = url.getProtocol();
-        protocol = protocol != null ? protocol : "url";
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void errorSpan(
+                @Advice.This final URL url,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.FieldValue("handler") final URLStreamHandler handler) {
+            if (throwable != null) {
+                String protocol = url.getProtocol();
+                protocol = protocol != null ? protocol : "url";
 
-        final AgentSpan span = startSpan("UrlConnection", DECORATE.operationName(protocol));
+                final AgentSpan span = startSpan("UrlConnection", DECORATE.operationName(protocol));
 
-        try (final ContextScope scope = activateSpan(span)) {
-          DECORATE.afterStart(span);
-          DECORATE.onURL(span, url);
-          HTTP_RESOURCE_DECORATOR.withClientPath(span, null, url.getPath());
+                try (final ContextScope scope = activateSpan(span)) {
+                    DECORATE.afterStart(span);
+                    DECORATE.onURL(span, url);
+                    HTTP_RESOURCE_DECORATOR.withClientPath(span, null, url.getPath());
 
-          span.setError(true);
-          span.addThrowable(throwable);
-          span.finish();
+                    span.setError(true);
+                    span.addThrowable(throwable);
+                    span.finish();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURICallSiteSuite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURICallSiteSuite.java
index 4dce0724886..0870586c2d8 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURICallSiteSuite.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURICallSiteSuite.java
@@ -9,109 +9,103 @@
 
 public class TestURICallSiteSuite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestURICallSiteSuite.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestURICallSiteSuite.class);
 
-  public static URI uri(final String value) {
-    try {
-      LOGGER.debug("Before ctor {}", value);
-      final URI uri = new URI(value);
-      LOGGER.debug("After ctor {}", uri);
-      return uri;
-    } catch (URISyntaxException e) {
-      throw new RuntimeException(e);
+    public static URI uri(final String value) {
+        try {
+            LOGGER.debug("Before ctor {}", value);
+            final URI uri = new URI(value);
+            LOGGER.debug("After ctor {}", uri);
+            return uri;
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  public static URI uri(
-      final String scheme,
-      final String userInfo,
-      final String host,
-      final int port,
-      final String path,
-      final String query,
-      final String fragment) {
-    try {
-      LOGGER.debug(
-          "Before ctor {} {} {} {} {} {} {}", scheme, userInfo, host, port, path, query, fragment);
-      final URI uri = new URI(scheme, userInfo, host, port, path, query, fragment);
-      LOGGER.debug("After ctor {}", uri);
-      return uri;
-    } catch (URISyntaxException e) {
-      throw new RuntimeException(e);
+    public static URI uri(
+            final String scheme,
+            final String userInfo,
+            final String host,
+            final int port,
+            final String path,
+            final String query,
+            final String fragment) {
+        try {
+            LOGGER.debug("Before ctor {} {} {} {} {} {} {}", scheme, userInfo, host, port, path, query, fragment);
+            final URI uri = new URI(scheme, userInfo, host, port, path, query, fragment);
+            LOGGER.debug("After ctor {}", uri);
+            return uri;
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  public static URI uri(
-      final String scheme,
-      final String authority,
-      final String path,
-      final String query,
-      final String fragment) {
-    try {
-      LOGGER.debug("Before ctor {} {} {} {} {}", scheme, authority, path, query, fragment);
-      final URI uri = new URI(scheme, authority, path, query, fragment);
-      LOGGER.debug("After ctor {}", uri);
-      return uri;
-    } catch (URISyntaxException e) {
-      throw new RuntimeException(e);
+    public static URI uri(
+            final String scheme, final String authority, final String path, final String query, final String fragment) {
+        try {
+            LOGGER.debug("Before ctor {} {} {} {} {}", scheme, authority, path, query, fragment);
+            final URI uri = new URI(scheme, authority, path, query, fragment);
+            LOGGER.debug("After ctor {}", uri);
+            return uri;
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  public static URI uri(
-      final String scheme, final String path, final String query, final String fragment) {
-    try {
-      LOGGER.debug("Before ctor {} {} {} {}", scheme, path, query, fragment);
-      final URI uri = new URI(scheme, path, query, fragment);
-      LOGGER.debug("After ctor {}", uri);
-      return uri;
-    } catch (URISyntaxException e) {
-      throw new RuntimeException(e);
+    public static URI uri(final String scheme, final String path, final String query, final String fragment) {
+        try {
+            LOGGER.debug("Before ctor {} {} {} {}", scheme, path, query, fragment);
+            final URI uri = new URI(scheme, path, query, fragment);
+            LOGGER.debug("After ctor {}", uri);
+            return uri;
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  public static URI uri(final String scheme, final String ssp, final String fragment) {
-    try {
-      LOGGER.debug("Before ctor {} {} {}", scheme, ssp, fragment);
-      final URI uri = new URI(scheme, ssp, fragment);
-      LOGGER.debug("After ctor {}", uri);
-      return uri;
-    } catch (URISyntaxException e) {
-      throw new RuntimeException(e);
+    public static URI uri(final String scheme, final String ssp, final String fragment) {
+        try {
+            LOGGER.debug("Before ctor {} {} {}", scheme, ssp, fragment);
+            final URI uri = new URI(scheme, ssp, fragment);
+            LOGGER.debug("After ctor {}", uri);
+            return uri;
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  public static URI create(final String str) {
-    LOGGER.debug("Before create {}", str);
-    final URI uri = URI.create(str);
-    LOGGER.debug("After create {}", uri);
-    return uri;
-  }
+    public static URI create(final String str) {
+        LOGGER.debug("Before create {}", str);
+        final URI uri = URI.create(str);
+        LOGGER.debug("After create {}", uri);
+        return uri;
+    }
 
-  public static URI normalize(final URI uri) {
-    LOGGER.debug("Before normalize {}", uri);
-    final URI result = uri.normalize();
-    LOGGER.debug("After normalize {}", result);
-    return result;
-  }
+    public static URI normalize(final URI uri) {
+        LOGGER.debug("Before normalize {}", uri);
+        final URI result = uri.normalize();
+        LOGGER.debug("After normalize {}", result);
+        return result;
+    }
 
-  public static String toString(final URI uri) {
-    LOGGER.debug("Before toString {}", uri);
-    final String result = uri.toString();
-    LOGGER.debug("After toString {}", result);
-    return result;
-  }
+    public static String toString(final URI uri) {
+        LOGGER.debug("Before toString {}", uri);
+        final String result = uri.toString();
+        LOGGER.debug("After toString {}", result);
+        return result;
+    }
 
-  public static String toASCIIString(final URI uri) {
-    LOGGER.debug("Before toAsciiString {}", uri);
-    final String result = uri.toASCIIString();
-    LOGGER.debug("After toAsciiString {}", result);
-    return result;
-  }
+    public static String toASCIIString(final URI uri) {
+        LOGGER.debug("Before toAsciiString {}", uri);
+        final String result = uri.toASCIIString();
+        LOGGER.debug("After toAsciiString {}", result);
+        return result;
+    }
 
-  public static URL toURL(final URI uri) throws MalformedURLException {
-    LOGGER.debug("Before toURL {}", uri);
-    final URL result = uri.toURL();
-    LOGGER.debug("After toURL {}", result);
-    return result;
-  }
+    public static URL toURL(final URI uri) throws MalformedURLException {
+        LOGGER.debug("Before toURL {}", uri);
+        final URL result = uri.toURL();
+        LOGGER.debug("After toURL {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLCallSiteSuite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLCallSiteSuite.java
index 87f41a19163..0d8d8f91334 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLCallSiteSuite.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLCallSiteSuite.java
@@ -14,157 +14,156 @@
 
 public class TestURLCallSiteSuite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestURLCallSiteSuite.class);
-
-  public static URL url(final String value) {
-    try {
-      LOGGER.debug("Before ctor {}", value);
-      final URL url = new URL(value);
-      LOGGER.debug("After ctor {}", url);
-      return url;
-    } catch (MalformedURLException e) {
-      throw new RuntimeException(e);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestURLCallSiteSuite.class);
+
+    public static URL url(final String value) {
+        try {
+            LOGGER.debug("Before ctor {}", value);
+            final URL url = new URL(value);
+            LOGGER.debug("After ctor {}", url);
+            return url;
+        } catch (MalformedURLException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
-
-  public static URL url(
-      final String protocol, final String host, final int port, final String file) {
-    try {
-      LOGGER.debug("Before ctor {} {} {} {}", protocol, host, port, file);
-      final URL url = new URL(protocol, host, port, file);
-      LOGGER.debug("After ctor {}", url);
-      return url;
-    } catch (MalformedURLException e) {
-      throw new RuntimeException(e);
+
+    public static URL url(final String protocol, final String host, final int port, final String file) {
+        try {
+            LOGGER.debug("Before ctor {} {} {} {}", protocol, host, port, file);
+            final URL url = new URL(protocol, host, port, file);
+            LOGGER.debug("After ctor {}", url);
+            return url;
+        } catch (MalformedURLException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
-
-  public static URL url(
-      final String protocol,
-      final String host,
-      final int port,
-      final String file,
-      final URLStreamHandler handler) {
-    try {
-      LOGGER.debug("Before ctor {} {} {} {} {}", protocol, host, port, file, handler);
-      final URL url = new URL(protocol, host, port, file, handler);
-      LOGGER.debug("After ctor {}", url);
-      return url;
-    } catch (MalformedURLException e) {
-      throw new RuntimeException(e);
+
+    public static URL url(
+            final String protocol,
+            final String host,
+            final int port,
+            final String file,
+            final URLStreamHandler handler) {
+        try {
+            LOGGER.debug("Before ctor {} {} {} {} {}", protocol, host, port, file, handler);
+            final URL url = new URL(protocol, host, port, file, handler);
+            LOGGER.debug("After ctor {}", url);
+            return url;
+        } catch (MalformedURLException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
-
-  public static URL url(final String protocol, final String host, final String file) {
-    try {
-      LOGGER.debug("Before ctor {} {} {}", protocol, host, file);
-      final URL url = new URL(protocol, host, file);
-      LOGGER.debug("After ctor {}", url);
-      return url;
-    } catch (MalformedURLException e) {
-      throw new RuntimeException(e);
+
+    public static URL url(final String protocol, final String host, final String file) {
+        try {
+            LOGGER.debug("Before ctor {} {} {}", protocol, host, file);
+            final URL url = new URL(protocol, host, file);
+            LOGGER.debug("After ctor {}", url);
+            return url;
+        } catch (MalformedURLException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
-
-  public static URL url(final URL context, final String spec) {
-    try {
-      LOGGER.debug("Before ctor {} {}", context, spec);
-      final URL url = new URL(context, spec);
-      LOGGER.debug("After ctor {}", url);
-      return url;
-    } catch (MalformedURLException e) {
-      throw new RuntimeException(e);
+
+    public static URL url(final URL context, final String spec) {
+        try {
+            LOGGER.debug("Before ctor {} {}", context, spec);
+            final URL url = new URL(context, spec);
+            LOGGER.debug("After ctor {}", url);
+            return url;
+        } catch (MalformedURLException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
-
-  public static URL url(final URL context, final String spec, final URLStreamHandler handler) {
-    try {
-      LOGGER.debug("Before ctor {} {} {}", context, spec, handler);
-      final URL url = new URL(context, spec, handler);
-      LOGGER.debug("After ctor {}", url);
-      return url;
-    } catch (MalformedURLException e) {
-      throw new RuntimeException(e);
+
+    public static URL url(final URL context, final String spec, final URLStreamHandler handler) {
+        try {
+            LOGGER.debug("Before ctor {} {} {}", context, spec, handler);
+            final URL url = new URL(context, spec, handler);
+            LOGGER.debug("After ctor {}", url);
+            return url;
+        } catch (MalformedURLException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
-
-  public static URI toURI(final URL url) {
-    try {
-      LOGGER.debug("Before toURI {}", url);
-      final URI result = url.toURI();
-      LOGGER.debug("After toURI {}", result);
-      return result;
-    } catch (URISyntaxException e) {
-      throw new RuntimeException(e);
+
+    public static URI toURI(final URL url) {
+        try {
+            LOGGER.debug("Before toURI {}", url);
+            final URI result = url.toURI();
+            LOGGER.debug("After toURI {}", result);
+            return result;
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
-
-  public static String toString(final URL url) {
-    LOGGER.debug("Before toString {}", url);
-    final String result = url.toString();
-    LOGGER.debug("After toString {}", result);
-    return result;
-  }
-
-  public static String toExternalForm(final URL url) {
-    LOGGER.debug("Before toExternalForm {}", url);
-    final String result = url.toExternalForm();
-    LOGGER.debug("After toExternalForm {}", result);
-    return result;
-  }
-
-  public static URLConnection openConnection(final URL url) {
-    try {
-      LOGGER.debug("Before openConnection {}", url);
-      final URLConnection result = url.openConnection();
-      LOGGER.debug("After openConnection {}", result);
-      return result;
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+
+    public static String toString(final URL url) {
+        LOGGER.debug("Before toString {}", url);
+        final String result = url.toString();
+        LOGGER.debug("After toString {}", result);
+        return result;
     }
-  }
-
-  public static URLConnection openConnection(final URL url, final Proxy proxy) {
-    try {
-      LOGGER.debug("Before openConnection {}", url);
-      final URLConnection result = url.openConnection(proxy);
-      LOGGER.debug("After openConnection {}", result);
-      return result;
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+
+    public static String toExternalForm(final URL url) {
+        LOGGER.debug("Before toExternalForm {}", url);
+        final String result = url.toExternalForm();
+        LOGGER.debug("After toExternalForm {}", result);
+        return result;
     }
-  }
-
-  public static InputStream openStream(final URL url) {
-    try {
-      LOGGER.debug("Before openStream {}", url);
-      final InputStream result = url.openStream();
-      LOGGER.debug("After openStream {}", result);
-      return result;
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+
+    public static URLConnection openConnection(final URL url) {
+        try {
+            LOGGER.debug("Before openConnection {}", url);
+            final URLConnection result = url.openConnection();
+            LOGGER.debug("After openConnection {}", result);
+            return result;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static URLConnection openConnection(final URL url, final Proxy proxy) {
+        try {
+            LOGGER.debug("Before openConnection {}", url);
+            final URLConnection result = url.openConnection(proxy);
+            LOGGER.debug("After openConnection {}", result);
+            return result;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
-
-  public static Object getContent(final URL url) {
-    try {
-      LOGGER.debug("Before getContent {}", url);
-      final Object result = url.getContent();
-      LOGGER.debug("After getContent {}", result);
-      return result;
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+
+    public static InputStream openStream(final URL url) {
+        try {
+            LOGGER.debug("Before openStream {}", url);
+            final InputStream result = url.openStream();
+            LOGGER.debug("After openStream {}", result);
+            return result;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
-
-  public static Object getContent(final URL url, final Class<?>... classes) {
-    try {
-      LOGGER.debug("Before getContent {} {}", url, classes);
-      final Object result = url.getContent(classes);
-      LOGGER.debug("After getContent {}", result);
-      return result;
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+
+    public static Object getContent(final URL url) {
+        try {
+            LOGGER.debug("Before getContent {}", url);
+            final Object result = url.getContent();
+            LOGGER.debug("After getContent {}", result);
+            return result;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static Object getContent(final URL url, final Class<?>... classes) {
+        try {
+            LOGGER.debug("Before getContent {} {}", url, classes);
+            final Object result = url.getContent(classes);
+            LOGGER.debug("After getContent {}", result);
+            return result;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLDecoderCallSiteSuite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLDecoderCallSiteSuite.java
index 227d30e2dc8..af98ff75dff 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLDecoderCallSiteSuite.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLDecoderCallSiteSuite.java
@@ -7,21 +7,20 @@
 
 public class TestURLDecoderCallSiteSuite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestURLDecoderCallSiteSuite.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestURLDecoderCallSiteSuite.class);
 
-  public static String decode(final String value) {
-    LOGGER.debug("Before encode {}", value);
-    @SuppressWarnings("deprecation")
-    final String result = URLDecoder.decode(value);
-    LOGGER.debug("After encode {}", result);
-    return result;
-  }
+    public static String decode(final String value) {
+        LOGGER.debug("Before encode {}", value);
+        @SuppressWarnings("deprecation")
+        final String result = URLDecoder.decode(value);
+        LOGGER.debug("After encode {}", result);
+        return result;
+    }
 
-  public static String decode(final String value, final String encoding)
-      throws UnsupportedEncodingException {
-    LOGGER.debug("Before encode {} {}", value, encoding);
-    final String result = URLDecoder.decode(value, encoding);
-    LOGGER.debug("After encode {}", result);
-    return result;
-  }
+    public static String decode(final String value, final String encoding) throws UnsupportedEncodingException {
+        LOGGER.debug("Before encode {} {}", value, encoding);
+        final String result = URLDecoder.decode(value, encoding);
+        LOGGER.debug("After encode {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLEncoderCallSiteSuite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLEncoderCallSiteSuite.java
index 2ab644fb1dc..5d9f470cccc 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLEncoderCallSiteSuite.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLEncoderCallSiteSuite.java
@@ -7,21 +7,20 @@
 
 public class TestURLEncoderCallSiteSuite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestURLEncoderCallSiteSuite.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestURLEncoderCallSiteSuite.class);
 
-  public static String encode(final String value) {
-    LOGGER.debug("Before encode {}", value);
-    @SuppressWarnings("deprecation")
-    final String result = URLEncoder.encode(value);
-    LOGGER.debug("After encode {}", result);
-    return result;
-  }
+    public static String encode(final String value) {
+        LOGGER.debug("Before encode {}", value);
+        @SuppressWarnings("deprecation")
+        final String result = URLEncoder.encode(value);
+        LOGGER.debug("After encode {}", result);
+        return result;
+    }
 
-  public static String encode(final String value, final String encoding)
-      throws UnsupportedEncodingException {
-    LOGGER.debug("Before encode {} {}", value, encoding);
-    final String result = URLEncoder.encode(value, encoding);
-    LOGGER.debug("After encode {}", result);
-    return result;
-  }
+    public static String encode(final String value, final String encoding) throws UnsupportedEncodingException {
+        LOGGER.debug("Before encode {} {}", value, encoding);
+        final String result = URLEncoder.encode(value, encoding);
+        LOGGER.debug("After encode {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java
index e0d0d6ec1e8..5814c3973d0 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java
@@ -19,64 +19,62 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public HttpClientInstrumentation() {
-    super("java-http-client");
-  }
+    public HttpClientInstrumentation() {
+        super("java-http-client");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("java.net.http.HttpClient");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("java.net.http.HttpClient");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return JavaVirtualMachine.isJavaVersionAtLeast(11) && super.isEnabled();
-  }
+    @Override
+    public boolean isEnabled() {
+        return JavaVirtualMachine.isJavaVersionAtLeast(11) && super.isEnabled();
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null;
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null;
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return nameStartsWith("java.net.")
-        .or(nameStartsWith("jdk.internal."))
-        .and(not(named("jdk.internal.net.http.HttpClientFacade")))
-        .and(extendsClass(named("java.net.http.HttpClient")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return nameStartsWith("java.net.")
+                .or(nameStartsWith("jdk.internal."))
+                .and(not(named("jdk.internal.net.http.HttpClientFacade")))
+                .and(extendsClass(named("java.net.http.HttpClient")));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".BodyHandlerWrapper",
-      packageName + ".BodyHandlerWrapper$BodySubscriberWrapper",
-      packageName + ".BodyHandlerWrapper$SubscriptionWrapper",
-      packageName + ".JavaNetClientDecorator",
-      packageName + ".ResponseConsumer"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".BodyHandlerWrapper",
+            packageName + ".BodyHandlerWrapper$BodySubscriberWrapper",
+            packageName + ".BodyHandlerWrapper$SubscriptionWrapper",
+            packageName + ".JavaNetClientDecorator",
+            packageName + ".ResponseConsumer"
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("send"))
-            .and(isPublic())
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("java.net.http.HttpRequest"))),
-        packageName + ".SendAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("send"))
+                        .and(isPublic())
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("java.net.http.HttpRequest"))),
+                packageName + ".SendAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("sendAsync"))
-            .and(isPublic())
-            .and(takesArgument(0, named("java.net.http.HttpRequest")))
-            .and(takesArgument(1, named("java.net.http.HttpResponse$BodyHandler"))),
-        packageName + ".SendAsyncAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("sendAsync"))
+                        .and(isPublic())
+                        .and(takesArgument(0, named("java.net.http.HttpRequest")))
+                        .and(takesArgument(1, named("java.net.http.HttpResponse$BodyHandler"))),
+                packageName + ".SendAsyncAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java
index 1cd09452d12..663825932cb 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java
@@ -15,45 +15,43 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpHeadersInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
-
-  public HttpHeadersInstrumentation() {
-    super("java-http-client");
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("java.net.http.HttpRequest");
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return JavaVirtualMachine.isJavaVersionAtLeast(11) && super.isEnabled();
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return null;
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return nameStartsWith("java.net.")
-        .or(nameStartsWith("jdk.internal."))
-        .and(extendsClass(named("java.net.http.HttpRequest")));
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".HttpHeadersInjectAdapter", packageName + ".JavaNetClientDecorator",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(isMethod().and(named("headers")), packageName + ".HeadersAdvice");
-  }
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public HttpHeadersInstrumentation() {
+        super("java-http-client");
+    }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("java.net.http.HttpRequest");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return JavaVirtualMachine.isJavaVersionAtLeast(11) && super.isEnabled();
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return null;
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return nameStartsWith("java.net.")
+                .or(nameStartsWith("jdk.internal."))
+                .and(extendsClass(named("java.net.http.HttpRequest")));
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".HttpHeadersInjectAdapter", packageName + ".JavaNetClientDecorator",
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(isMethod().and(named("headers")), packageName + ".HeadersAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/JpmsInetAddressInstrumentation.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/JpmsInetAddressInstrumentation.java
index 1a0c6a62a31..4063a6962ce 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/JpmsInetAddressInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/JpmsInetAddressInstrumentation.java
@@ -8,15 +8,14 @@
 import java.util.Collection;
 
 @AutoService(InstrumenterModule.class)
-public class JpmsInetAddressInstrumentation extends InstrumenterModule
-    implements JavaModuleOpenProvider {
+public class JpmsInetAddressInstrumentation extends InstrumenterModule implements JavaModuleOpenProvider {
 
-  public JpmsInetAddressInstrumentation() {
-    super("java-net");
-  }
+    public JpmsInetAddressInstrumentation() {
+        super("java-net");
+    }
 
-  @Override
-  public Collection<String> triggerClasses() {
-    return singleton("java.net.InetAddress");
-  }
+    @Override
+    public Collection<String> triggerClasses() {
+        return singleton("java.net.InetAddress");
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java
index 2aa22ccde00..9a9f72f84ba 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java
@@ -13,131 +13,130 @@
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
 public class BodyHandlerWrapper<T> implements BodyHandler<T> {
-  private final BodyHandler<T> delegate;
-  private final AgentSpan span;
-
-  public BodyHandlerWrapper(BodyHandler<T> delegate, AgentSpan span) {
-    this.delegate = delegate;
-    this.span = span;
-  }
-
-  @Override
-  public BodySubscriber<T> apply(ResponseInfo responseInfo) {
-    // Capture the continuation lazily here rather than at sendAsync() call time.
-    BodySubscriber<T> subscriber = delegate.apply(responseInfo);
-    if (subscriber instanceof BodySubscriberWrapper) {
-      return subscriber;
+    private final BodyHandler<T> delegate;
+    private final AgentSpan span;
+
+    public BodyHandlerWrapper(BodyHandler<T> delegate, AgentSpan span) {
+        this.delegate = delegate;
+        this.span = span;
     }
-    return new BodySubscriberWrapper<>(subscriber, span.captureWithContext().hold());
-  }
 
-  static class BodySubscriberWrapper<T> implements BodySubscriber<T> {
-    private static final AtomicReferenceFieldUpdater<BodySubscriberWrapper, ContextContinuation>
-        CONTINUATION =
-            AtomicReferenceFieldUpdater.newUpdater(
-                BodySubscriberWrapper.class, ContextContinuation.class, "continuation");
+    @Override
+    public BodySubscriber<T> apply(ResponseInfo responseInfo) {
+        // Capture the continuation lazily here rather than at sendAsync() call time.
+        BodySubscriber<T> subscriber = delegate.apply(responseInfo);
+        if (subscriber instanceof BodySubscriberWrapper) {
+            return subscriber;
+        }
+        return new BodySubscriberWrapper<>(subscriber, span.captureWithContext().hold());
+    }
 
-    private final BodySubscriber<T> delegate;
-    private volatile ContextContinuation continuation;
+    static class BodySubscriberWrapper<T> implements BodySubscriber<T> {
+        private static final AtomicReferenceFieldUpdater<BodySubscriberWrapper, ContextContinuation> CONTINUATION =
+                AtomicReferenceFieldUpdater.newUpdater(
+                        BodySubscriberWrapper.class, ContextContinuation.class, "continuation");
 
-    public BodySubscriberWrapper(BodySubscriber<T> delegate, ContextContinuation continuation) {
-      this.delegate = delegate;
-      this.continuation = continuation;
-    }
+        private final BodySubscriber<T> delegate;
+        private volatile ContextContinuation continuation;
 
-    public BodySubscriber<T> getDelegate() {
-      return delegate;
-    }
+        public BodySubscriberWrapper(BodySubscriber<T> delegate, ContextContinuation continuation) {
+            this.delegate = delegate;
+            this.continuation = continuation;
+        }
 
-    @Override
-    public CompletionStage<T> getBody() {
-      return delegate.getBody();
-    }
+        public BodySubscriber<T> getDelegate() {
+            return delegate;
+        }
 
-    @Override
-    public void onSubscribe(Flow.Subscription subscription) {
-      boolean completed = false;
-      try {
-        delegate.onSubscribe(new SubscriptionWrapper(subscription, this));
-        completed = true;
-      } finally {
-        if (!completed) {
-          releaseContinuation();
+        @Override
+        public CompletionStage<T> getBody() {
+            return delegate.getBody();
         }
-      }
-    }
 
-    @Override
-    public void onNext(List<ByteBuffer> item) {
-      boolean completed = false;
-      try {
-        try (ContextScope ignore = resumeContinuation()) {
-          delegate.onNext(item);
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            boolean completed = false;
+            try {
+                delegate.onSubscribe(new SubscriptionWrapper(subscription, this));
+                completed = true;
+            } finally {
+                if (!completed) {
+                    releaseContinuation();
+                }
+            }
         }
-        completed = true;
-      } finally {
-        if (!completed) {
-          releaseContinuation();
+
+        @Override
+        public void onNext(List<ByteBuffer> item) {
+            boolean completed = false;
+            try {
+                try (ContextScope ignore = resumeContinuation()) {
+                    delegate.onNext(item);
+                }
+                completed = true;
+            } finally {
+                if (!completed) {
+                    releaseContinuation();
+                }
+            }
         }
-      }
-    }
 
-    @Override
-    public void onError(Throwable throwable) {
-      try {
-        try (ContextScope ignore = resumeContinuation()) {
-          delegate.onError(throwable);
+        @Override
+        public void onError(Throwable throwable) {
+            try {
+                try (ContextScope ignore = resumeContinuation()) {
+                    delegate.onError(throwable);
+                }
+            } finally {
+                releaseContinuation();
+            }
         }
-      } finally {
-        releaseContinuation();
-      }
-    }
 
-    @Override
-    public void onComplete() {
-      try {
-        try (ContextScope ignore = resumeContinuation()) {
-          delegate.onComplete();
+        @Override
+        public void onComplete() {
+            try {
+                try (ContextScope ignore = resumeContinuation()) {
+                    delegate.onComplete();
+                }
+            } finally {
+                releaseContinuation();
+            }
         }
-      } finally {
-        releaseContinuation();
-      }
-    }
 
-    private ContextScope resumeContinuation() {
-      ContextContinuation continuation = this.continuation;
-      return continuation == null ? null : continuation.resume();
-    }
+        private ContextScope resumeContinuation() {
+            ContextContinuation continuation = this.continuation;
+            return continuation == null ? null : continuation.resume();
+        }
 
-    private void releaseContinuation() {
-      ContextContinuation continuation = CONTINUATION.getAndSet(this, null);
-      if (continuation != null) {
-        continuation.release();
-      }
+        private void releaseContinuation() {
+            ContextContinuation continuation = CONTINUATION.getAndSet(this, null);
+            if (continuation != null) {
+                continuation.release();
+            }
+        }
     }
-  }
 
-  static final class SubscriptionWrapper implements Flow.Subscription {
-    private final Flow.Subscription delegate;
-    private final BodySubscriberWrapper<?> subscriber;
+    static final class SubscriptionWrapper implements Flow.Subscription {
+        private final Flow.Subscription delegate;
+        private final BodySubscriberWrapper<?> subscriber;
 
-    SubscriptionWrapper(Flow.Subscription delegate, BodySubscriberWrapper<?> subscriber) {
-      this.delegate = delegate;
-      this.subscriber = subscriber;
-    }
+        SubscriptionWrapper(Flow.Subscription delegate, BodySubscriberWrapper<?> subscriber) {
+            this.delegate = delegate;
+            this.subscriber = subscriber;
+        }
 
-    @Override
-    public void request(long count) {
-      delegate.request(count);
-    }
+        @Override
+        public void request(long count) {
+            delegate.request(count);
+        }
 
-    @Override
-    public void cancel() {
-      try {
-        delegate.cancel();
-      } finally {
-        subscriber.releaseContinuation();
-      }
+        @Override
+        public void cancel() {
+            try {
+                delegate.cancel();
+            } finally {
+                subscriber.releaseContinuation();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java
index 86fd52493d0..9529cc8be83 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java
@@ -6,22 +6,20 @@
 
 public final class CompletableFutureWrapper {
 
-  private CompletableFutureWrapper() {}
+    private CompletableFutureWrapper() {}
 
-  public static <T> CompletableFuture<T> wrap(
-      CompletableFuture<T> future, ContextContinuation continuation) {
-    CompletableFuture<T> result = new CompletableFuture<>();
-    future.whenComplete(
-        (T value, Throwable throwable) -> {
-          try (ContextScope scope = continuation.resume()) {
-            if (throwable != null) {
-              result.completeExceptionally(throwable);
-            } else {
-              result.complete(value);
+    public static <T> CompletableFuture<T> wrap(CompletableFuture<T> future, ContextContinuation continuation) {
+        CompletableFuture<T> result = new CompletableFuture<>();
+        future.whenComplete((T value, Throwable throwable) -> {
+            try (ContextScope scope = continuation.resume()) {
+                if (throwable != null) {
+                    result.completeExceptionally(throwable);
+                } else {
+                    result.complete(value);
+                }
             }
-          }
         });
 
-    return result;
-  }
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HeadersAdvice.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HeadersAdvice.java
index 4dd8ffd96e0..24690f998c1 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HeadersAdvice.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HeadersAdvice.java
@@ -16,16 +16,16 @@
 
 @AppliesOn(CONTEXT_TRACKING)
 public class HeadersAdvice {
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void methodExit(@Advice.Return(readOnly = false) HttpHeaders headers) {
-    // Check if we should be injecting context into the headers first
-    if (DECORATE.isContextInjectionAllowed()) {
-      // Note: adding duplicate keys will throw an IllegalArgumentException so we need to dedupe
-      // case insensitively
-      final Map<String, List<String>> headerMap = new TreeMap<>(CASE_INSENSITIVE_ORDER);
-      headerMap.putAll(headers.map());
-      DECORATE.injectContext(currentContext(), headerMap, SETTER);
-      headers = HttpHeaders.of(headerMap, KEEP);
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void methodExit(@Advice.Return(readOnly = false) HttpHeaders headers) {
+        // Check if we should be injecting context into the headers first
+        if (DECORATE.isContextInjectionAllowed()) {
+            // Note: adding duplicate keys will throw an IllegalArgumentException so we need to dedupe
+            // case insensitively
+            final Map<String, List<String>> headerMap = new TreeMap<>(CASE_INSENSITIVE_ORDER);
+            headerMap.putAll(headers.map());
+            DECORATE.injectContext(currentContext(), headerMap, SETTER);
+            headers = HttpHeaders.of(headerMap, KEEP);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HttpHeadersInjectAdapter.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HttpHeadersInjectAdapter.java
index c9e95ca76c5..321c6efcb07 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HttpHeadersInjectAdapter.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HttpHeadersInjectAdapter.java
@@ -8,15 +8,15 @@
 
 public class HttpHeadersInjectAdapter implements CarrierSetter<Map<String, List<String>>> {
 
-  public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
-  public static final BiPredicate<String, String> KEEP = HttpHeadersInjectAdapter::keep;
+    public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
+    public static final BiPredicate<String, String> KEEP = HttpHeadersInjectAdapter::keep;
 
-  @Override
-  public void set(final Map<String, List<String>> carrier, final String key, final String value) {
-    carrier.put(key, Collections.singletonList(value));
-  }
+    @Override
+    public void set(final Map<String, List<String>> carrier, final String key, final String value) {
+        carrier.put(key, Collections.singletonList(value));
+    }
 
-  public static boolean keep(String key, String value) {
-    return true;
-  }
+    public static boolean keep(String key, String value) {
+        return true;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/JavaNetClientDecorator.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/JavaNetClientDecorator.java
index 45c50f2dcd3..3bac24ba30e 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/JavaNetClientDecorator.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/JavaNetClientDecorator.java
@@ -7,73 +7,72 @@
 import java.net.http.HttpResponse;
 
 public class JavaNetClientDecorator extends HttpClientDecorator<HttpRequest, HttpResponse<?>> {
-  public static final String INSTRUMENTATION_NAME = "java-http-client";
-  public static final CharSequence COMPONENT = UTF8BytesString.create(INSTRUMENTATION_NAME);
-
-  public static final JavaNetClientDecorator DECORATE = new JavaNetClientDecorator();
-
-  public static final UTF8BytesString OPERATION_NAME =
-      UTF8BytesString.create(DECORATE.operationName());
-
-  private static final ThreadLocal<Boolean> INJECT_CONTEXT = new ThreadLocal<>();
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {INSTRUMENTATION_NAME};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT;
-  }
-
-  @Override
-  protected String method(HttpRequest httpRequest) {
-    return httpRequest.method();
-  }
-
-  @Override
-  protected URI url(HttpRequest httpRequest) {
-    return httpRequest.uri();
-  }
-
-  @Override
-  protected Object sourceUrl(final HttpRequest request) {
-    return request.uri();
-  }
-
-  @Override
-  protected int status(HttpResponse<?> httpResponse) {
-    return httpResponse.statusCode();
-  }
-
-  @Override
-  protected String getRequestHeader(HttpRequest request, String headerName) {
-    return request.headers().firstValue(headerName).orElse(null);
-  }
-
-  @Override
-  protected String getResponseHeader(HttpResponse<?> response, String headerName) {
-    return response.headers().firstValue(headerName).orElse(null);
-  }
-
-  /**
-   * Checks whether context injection into HTTP headers is currently allowed.
-   *
-   * @return {@code true} if context injection is allowed for the current thread, {@code false}
-   *     otherwise
-   */
-  public boolean isContextInjectionAllowed() {
-    return INJECT_CONTEXT.get() != null && INJECT_CONTEXT.get();
-  }
-
-  /** Enables context injection into HTTP headers for the current thread. */
-  public void allowContextInjection() {
-    INJECT_CONTEXT.set(true);
-  }
-
-  /** Disables context injection into HTTP headers for the current thread. */
-  public void blockContextInjection() {
-    INJECT_CONTEXT.remove();
-  }
+    public static final String INSTRUMENTATION_NAME = "java-http-client";
+    public static final CharSequence COMPONENT = UTF8BytesString.create(INSTRUMENTATION_NAME);
+
+    public static final JavaNetClientDecorator DECORATE = new JavaNetClientDecorator();
+
+    public static final UTF8BytesString OPERATION_NAME = UTF8BytesString.create(DECORATE.operationName());
+
+    private static final ThreadLocal<Boolean> INJECT_CONTEXT = new ThreadLocal<>();
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {INSTRUMENTATION_NAME};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return COMPONENT;
+    }
+
+    @Override
+    protected String method(HttpRequest httpRequest) {
+        return httpRequest.method();
+    }
+
+    @Override
+    protected URI url(HttpRequest httpRequest) {
+        return httpRequest.uri();
+    }
+
+    @Override
+    protected Object sourceUrl(final HttpRequest request) {
+        return request.uri();
+    }
+
+    @Override
+    protected int status(HttpResponse<?> httpResponse) {
+        return httpResponse.statusCode();
+    }
+
+    @Override
+    protected String getRequestHeader(HttpRequest request, String headerName) {
+        return request.headers().firstValue(headerName).orElse(null);
+    }
+
+    @Override
+    protected String getResponseHeader(HttpResponse<?> response, String headerName) {
+        return response.headers().firstValue(headerName).orElse(null);
+    }
+
+    /**
+     * Checks whether context injection into HTTP headers is currently allowed.
+     *
+     * @return {@code true} if context injection is allowed for the current thread, {@code false}
+     *     otherwise
+     */
+    public boolean isContextInjectionAllowed() {
+        return INJECT_CONTEXT.get() != null && INJECT_CONTEXT.get();
+    }
+
+    /** Enables context injection into HTTP headers for the current thread. */
+    public void allowContextInjection() {
+        INJECT_CONTEXT.set(true);
+    }
+
+    /** Disables context injection into HTTP headers for the current thread. */
+    public void blockContextInjection() {
+        INJECT_CONTEXT.remove();
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/ResponseConsumer.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/ResponseConsumer.java
index 843cd477bca..8f1db99fde3 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/ResponseConsumer.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/ResponseConsumer.java
@@ -7,21 +7,21 @@
 import java.util.function.BiConsumer;
 
 public class ResponseConsumer implements BiConsumer<HttpResponse<?>, Throwable> {
-  private AgentSpan span;
+    private AgentSpan span;
 
-  public ResponseConsumer(AgentSpan span) {
-    this.span = span;
-  }
+    public ResponseConsumer(AgentSpan span) {
+        this.span = span;
+    }
 
-  @Override
-  public void accept(HttpResponse<?> httpResponse, Throwable throwable) {
-    if (throwable != null) {
-      DECORATE.onError(span, throwable);
-    } else {
-      DECORATE.onResponse(span, httpResponse);
+    @Override
+    public void accept(HttpResponse<?> httpResponse, Throwable throwable) {
+        if (throwable != null) {
+            DECORATE.onError(span, throwable);
+        } else {
+            DECORATE.onResponse(span, httpResponse);
+        }
+        DECORATE.beforeFinish(span);
+        span.finish();
+        span = null;
     }
-    DECORATE.beforeFinish(span);
-    span.finish();
-    span = null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java
index c57ecda7e43..a62d8b38f44 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java
@@ -17,68 +17,67 @@
 import net.bytebuddy.asm.Advice;
 
 public class SendAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope methodEnter(
-      @Advice.Argument(value = 0) final HttpRequest httpRequest) {
-    ContextScope scope = null;
-    try {
-      if (DECORATE.isAgentRequest(httpRequest)) {
-        return null;
-      }
-      // Here we avoid having the advice applied twice in case we have nested call of this
-      // intercepted method.
-      // In this particular case, in HttpClientImpl the send method is calling sendAsync under the
-      // hood, and we do not want to instrument twice.
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class);
-      if (callDepth > 0) {
-        return null;
-      }
-      DECORATE.allowContextInjection();
-      final AgentSpan span = startSpan(INSTRUMENTATION_NAME, OPERATION_NAME);
-      scope = activateSpan(span);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope methodEnter(@Advice.Argument(value = 0) final HttpRequest httpRequest) {
+        ContextScope scope = null;
+        try {
+            if (DECORATE.isAgentRequest(httpRequest)) {
+                return null;
+            }
+            // Here we avoid having the advice applied twice in case we have nested call of this
+            // intercepted method.
+            // In this particular case, in HttpClientImpl the send method is calling sendAsync under the
+            // hood, and we do not want to instrument twice.
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class);
+            if (callDepth > 0) {
+                return null;
+            }
+            DECORATE.allowContextInjection();
+            final AgentSpan span = startSpan(INSTRUMENTATION_NAME, OPERATION_NAME);
+            scope = activateSpan(span);
 
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, httpRequest);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, httpRequest);
 
-      // propagation is done by another instrumentation since Headers are immutable
-      return scope;
-    } catch (BlockingException e) {
-      CallDepthThreadLocalMap.reset(HttpClient.class);
-      DECORATE.blockContextInjection();
-      if (scope != null) {
-        final AgentSpan span = spanFromScope(scope);
-        try {
-          DECORATE.onError(span, e);
-          DECORATE.beforeFinish(span);
-        } finally {
-          scope.close();
-          span.finish();
+            // propagation is done by another instrumentation since Headers are immutable
+            return scope;
+        } catch (BlockingException e) {
+            CallDepthThreadLocalMap.reset(HttpClient.class);
+            DECORATE.blockContextInjection();
+            if (scope != null) {
+                final AgentSpan span = spanFromScope(scope);
+                try {
+                    DECORATE.onError(span, e);
+                    DECORATE.beforeFinish(span);
+                } finally {
+                    scope.close();
+                    span.finish();
+                }
+            }
+            // re-throw blocking exceptions
+            throw e;
         }
-      }
-      // re-throw blocking exceptions
-      throw e;
     }
-  }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void methodExit(
-      @Advice.Enter final ContextScope scope,
-      @Advice.Return final HttpResponse<?> httpResponse,
-      @Advice.Thrown final Throwable throwable) {
-    if (scope == null) {
-      return;
-    }
-    CallDepthThreadLocalMap.reset(HttpClient.class);
-    DECORATE.blockContextInjection();
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void methodExit(
+            @Advice.Enter final ContextScope scope,
+            @Advice.Return final HttpResponse<?> httpResponse,
+            @Advice.Thrown final Throwable throwable) {
+        if (scope == null) {
+            return;
+        }
+        CallDepthThreadLocalMap.reset(HttpClient.class);
+        DECORATE.blockContextInjection();
 
-    AgentSpan span = spanFromScope(scope);
-    if (null != throwable) {
-      DECORATE.onError(span, throwable);
-    } else {
-      DECORATE.onResponse(span, httpResponse);
+        AgentSpan span = spanFromScope(scope);
+        if (null != throwable) {
+            DECORATE.onError(span, throwable);
+        } else {
+            DECORATE.onResponse(span, httpResponse);
+        }
+        DECORATE.beforeFinish(span);
+        scope.close();
+        span.finish();
     }
-    DECORATE.beforeFinish(span);
-    scope.close();
-    span.finish();
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java
index 333596606e9..1f77726004b 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java
@@ -18,79 +18,79 @@
 import net.bytebuddy.asm.Advice;
 
 public class SendAsyncAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope methodEnter(
-      @Advice.Argument(value = 0) final HttpRequest httpRequest,
-      @Advice.Argument(value = 1, readOnly = false) HttpResponse.BodyHandler<?> bodyHandler) {
-    ContextScope scope = null;
-    try {
-      if (DECORATE.isAgentRequest(httpRequest)) {
-        return null;
-      }
-      // Here we avoid having the advice applied twice in case we have nested call of this
-      // intercepted method.
-      // In this particular case, in HttpClientImpl the send method is calling sendAsync under the
-      // hood, and we do not want to instrument twice.
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class);
-      if (callDepth > 0) {
-        return null;
-      }
-      DECORATE.allowContextInjection();
-      final AgentSpan span = startSpan(INSTRUMENTATION_NAME, OPERATION_NAME);
-      scope = activateSpan(span);
-      if (bodyHandler != null) {
-        // Pass span directly — BodyHandlerWrapper captures the continuation lazily in apply(),
-        // only once response headers arrive. This avoids leaking a continuation when the
-        // connection fails before headers are received.
-        bodyHandler = new BodyHandlerWrapper<>(bodyHandler, span);
-      }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope methodEnter(
+            @Advice.Argument(value = 0) final HttpRequest httpRequest,
+            @Advice.Argument(value = 1, readOnly = false) HttpResponse.BodyHandler<?> bodyHandler) {
+        ContextScope scope = null;
+        try {
+            if (DECORATE.isAgentRequest(httpRequest)) {
+                return null;
+            }
+            // Here we avoid having the advice applied twice in case we have nested call of this
+            // intercepted method.
+            // In this particular case, in HttpClientImpl the send method is calling sendAsync under the
+            // hood, and we do not want to instrument twice.
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class);
+            if (callDepth > 0) {
+                return null;
+            }
+            DECORATE.allowContextInjection();
+            final AgentSpan span = startSpan(INSTRUMENTATION_NAME, OPERATION_NAME);
+            scope = activateSpan(span);
+            if (bodyHandler != null) {
+                // Pass span directly — BodyHandlerWrapper captures the continuation lazily in apply(),
+                // only once response headers arrive. This avoids leaking a continuation when the
+                // connection fails before headers are received.
+                bodyHandler = new BodyHandlerWrapper<>(bodyHandler, span);
+            }
 
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, httpRequest);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, httpRequest);
 
-      // propagation is done by another instrumentation since Headers are immutable
-      return scope;
-    } catch (BlockingException e) {
-      CallDepthThreadLocalMap.reset(HttpClient.class);
-      DECORATE.blockContextInjection();
-      if (scope != null) {
-        final AgentSpan span = spanFromScope(scope);
-        try {
-          DECORATE.onError(span, e);
-          DECORATE.beforeFinish(span);
-        } finally {
-          scope.close();
-          span.finish();
+            // propagation is done by another instrumentation since Headers are immutable
+            return scope;
+        } catch (BlockingException e) {
+            CallDepthThreadLocalMap.reset(HttpClient.class);
+            DECORATE.blockContextInjection();
+            if (scope != null) {
+                final AgentSpan span = spanFromScope(scope);
+                try {
+                    DECORATE.onError(span, e);
+                    DECORATE.beforeFinish(span);
+                } finally {
+                    scope.close();
+                    span.finish();
+                }
+            }
+            // re-throw blocking exceptions
+            throw e;
         }
-      }
-      // re-throw blocking exceptions
-      throw e;
     }
-  }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void methodExit(
-      @Advice.Enter final ContextScope scope,
-      @Advice.Argument(value = 0) final HttpRequest httpRequest,
-      @Advice.Return(readOnly = false) CompletableFuture<HttpResponse<?>> future,
-      @Advice.Thrown final Throwable throwable) {
-    if (scope == null) {
-      return;
-    }
-    // clear the call depth once finished
-    CallDepthThreadLocalMap.reset(HttpClient.class);
-    DECORATE.blockContextInjection();
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void methodExit(
+            @Advice.Enter final ContextScope scope,
+            @Advice.Argument(value = 0) final HttpRequest httpRequest,
+            @Advice.Return(readOnly = false) CompletableFuture<HttpResponse<?>> future,
+            @Advice.Thrown final Throwable throwable) {
+        if (scope == null) {
+            return;
+        }
+        // clear the call depth once finished
+        CallDepthThreadLocalMap.reset(HttpClient.class);
+        DECORATE.blockContextInjection();
 
-    AgentSpan span = spanFromScope(scope);
-    if (throwable != null) {
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+        AgentSpan span = spanFromScope(scope);
+        if (throwable != null) {
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
 
-    } else {
-      future = future.whenComplete(new ResponseConsumer(span));
-      scope.close();
+        } else {
+            future = future.whenComplete(new ResponseConsumer(span));
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/java/datadog/trace/instrumentation/httpclient/BodyHandlerWrapperTest.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/java/datadog/trace/instrumentation/httpclient/BodyHandlerWrapperTest.java
index ddb930c85f6..89faabd7996 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/java/datadog/trace/instrumentation/httpclient/BodyHandlerWrapperTest.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/java/datadog/trace/instrumentation/httpclient/BodyHandlerWrapperTest.java
@@ -21,170 +21,165 @@
 
 class BodyHandlerWrapperTest {
 
-  @Test
-  void holdsContextAcrossCallbacksUntilCompletion() {
-    Context original = Context.current();
-    Context captured = original.with(ContextKey.named("response-body"), new Object());
-    ContextContinuation continuation = captured.capture();
-    RecordingSubscriber subscriber = new RecordingSubscriber();
-    BodySubscriber<Void> wrapper = wrap(subscriber, continuation);
-
-    try {
-      wrapper.onNext(List.of());
-      assertSame(captured, subscriber.callbackContexts.get(0));
-      assertSame(original, Context.current());
-
-      wrapper.onNext(List.of());
-      assertSame(captured, subscriber.callbackContexts.get(1));
-      assertSame(original, Context.current());
-
-      wrapper.onComplete();
-      assertSame(captured, subscriber.callbackContexts.get(2));
-      assertSame(original, Context.current());
-
-      // A released continuation must no longer reactivate the captured context.
-      try (ContextScope ignored = continuation.resume()) {
-        assertSame(original, Context.current());
-      }
-    } finally {
-      continuation.release();
+    @Test
+    void holdsContextAcrossCallbacksUntilCompletion() {
+        Context original = Context.current();
+        Context captured = original.with(ContextKey.named("response-body"), new Object());
+        ContextContinuation continuation = captured.capture();
+        RecordingSubscriber subscriber = new RecordingSubscriber();
+        BodySubscriber<Void> wrapper = wrap(subscriber, continuation);
+
+        try {
+            wrapper.onNext(List.of());
+            assertSame(captured, subscriber.callbackContexts.get(0));
+            assertSame(original, Context.current());
+
+            wrapper.onNext(List.of());
+            assertSame(captured, subscriber.callbackContexts.get(1));
+            assertSame(original, Context.current());
+
+            wrapper.onComplete();
+            assertSame(captured, subscriber.callbackContexts.get(2));
+            assertSame(original, Context.current());
+
+            // A released continuation must no longer reactivate the captured context.
+            try (ContextScope ignored = continuation.resume()) {
+                assertSame(original, Context.current());
+            }
+        } finally {
+            continuation.release();
+        }
     }
-  }
-
-  @Test
-  void releasesContinuationWhenOnSubscribeThrows() {
-    RecordingContinuation continuation = new RecordingContinuation();
-    RecordingSubscriber subscriber = new RecordingSubscriber();
-    subscriber.throwOnSubscribe = true;
-    BodySubscriber<Void> wrapper = wrap(subscriber, continuation);
-
-    assertThrows(
-        IllegalStateException.class, () -> wrapper.onSubscribe(new RecordingSubscription()));
-    assertEquals(1, continuation.released);
-    wrapper.onComplete();
-
-    assertEquals(1, continuation.released);
-  }
-
-  @Test
-  void releasesContinuationWhenOnNextThrows() {
-    RecordingContinuation continuation = new RecordingContinuation();
-    RecordingSubscriber subscriber = new RecordingSubscriber();
-    subscriber.throwOnNext = true;
-    BodySubscriber<Void> wrapper = wrap(subscriber, continuation);
-
-    assertThrows(IllegalStateException.class, () -> wrapper.onNext(List.of()));
-    assertEquals(1, continuation.released);
-    wrapper.onComplete();
-
-    assertEquals(1, continuation.released);
-  }
-
-  @Test
-  void releasesContinuationWhenSubscriptionIsCancelled() {
-    RecordingContinuation continuation = new RecordingContinuation();
-    RecordingSubscriber subscriber = new RecordingSubscriber();
-    BodySubscriber<Void> wrapper = wrap(subscriber, continuation);
-    RecordingSubscription subscription = new RecordingSubscription();
-
-    wrapper.onSubscribe(subscription);
-    subscriber.subscription.request(3);
-    subscriber.subscription.cancel();
-    wrapper.onComplete();
-
-    assertEquals(3, subscription.requested);
-    assertEquals(1, subscription.cancelled);
-    assertEquals(1, continuation.released);
-  }
-
-  private static BodySubscriber<Void> wrap(
-      RecordingSubscriber subscriber, ContextContinuation continuation) {
-    AgentSpan span =
-        (AgentSpan)
-            Proxy.newProxyInstance(
-                AgentSpan.class.getClassLoader(),
-                new Class<?>[] {AgentSpan.class},
-                (proxy, method, args) -> continuation);
-    return new BodyHandlerWrapper<>(ignored -> subscriber, span).apply(null);
-  }
-
-  private static final class RecordingSubscriber
-      implements java.net.http.HttpResponse.BodySubscriber<Void> {
-    private final CompletableFuture<Void> body = new CompletableFuture<>();
-    private final List<Context> callbackContexts = new ArrayList<>();
-    private Flow.Subscription subscription;
-    private boolean throwOnSubscribe;
-    private boolean throwOnNext;
-
-    @Override
-    public CompletionStage<Void> getBody() {
-      return body;
+
+    @Test
+    void releasesContinuationWhenOnSubscribeThrows() {
+        RecordingContinuation continuation = new RecordingContinuation();
+        RecordingSubscriber subscriber = new RecordingSubscriber();
+        subscriber.throwOnSubscribe = true;
+        BodySubscriber<Void> wrapper = wrap(subscriber, continuation);
+
+        assertThrows(IllegalStateException.class, () -> wrapper.onSubscribe(new RecordingSubscription()));
+        assertEquals(1, continuation.released);
+        wrapper.onComplete();
+
+        assertEquals(1, continuation.released);
     }
 
-    @Override
-    public void onSubscribe(Flow.Subscription subscription) {
-      this.subscription = subscription;
-      if (throwOnSubscribe) {
-        throw new IllegalStateException("onSubscribe");
-      }
+    @Test
+    void releasesContinuationWhenOnNextThrows() {
+        RecordingContinuation continuation = new RecordingContinuation();
+        RecordingSubscriber subscriber = new RecordingSubscriber();
+        subscriber.throwOnNext = true;
+        BodySubscriber<Void> wrapper = wrap(subscriber, continuation);
+
+        assertThrows(IllegalStateException.class, () -> wrapper.onNext(List.of()));
+        assertEquals(1, continuation.released);
+        wrapper.onComplete();
+
+        assertEquals(1, continuation.released);
     }
 
-    @Override
-    public void onNext(List<ByteBuffer> item) {
-      callbackContexts.add(Context.current());
-      if (throwOnNext) {
-        throw new IllegalStateException("onNext");
-      }
+    @Test
+    void releasesContinuationWhenSubscriptionIsCancelled() {
+        RecordingContinuation continuation = new RecordingContinuation();
+        RecordingSubscriber subscriber = new RecordingSubscriber();
+        BodySubscriber<Void> wrapper = wrap(subscriber, continuation);
+        RecordingSubscription subscription = new RecordingSubscription();
+
+        wrapper.onSubscribe(subscription);
+        subscriber.subscription.request(3);
+        subscriber.subscription.cancel();
+        wrapper.onComplete();
+
+        assertEquals(3, subscription.requested);
+        assertEquals(1, subscription.cancelled);
+        assertEquals(1, continuation.released);
     }
 
-    @Override
-    public void onError(Throwable throwable) {
-      body.completeExceptionally(throwable);
+    private static BodySubscriber<Void> wrap(RecordingSubscriber subscriber, ContextContinuation continuation) {
+        AgentSpan span = (AgentSpan) Proxy.newProxyInstance(
+                AgentSpan.class.getClassLoader(),
+                new Class<?>[] {AgentSpan.class},
+                (proxy, method, args) -> continuation);
+        return new BodyHandlerWrapper<>(ignored -> subscriber, span).apply(null);
     }
 
-    @Override
-    public void onComplete() {
-      callbackContexts.add(Context.current());
-      body.complete(null);
+    private static final class RecordingSubscriber implements java.net.http.HttpResponse.BodySubscriber<Void> {
+        private final CompletableFuture<Void> body = new CompletableFuture<>();
+        private final List<Context> callbackContexts = new ArrayList<>();
+        private Flow.Subscription subscription;
+        private boolean throwOnSubscribe;
+        private boolean throwOnNext;
+
+        @Override
+        public CompletionStage<Void> getBody() {
+            return body;
+        }
+
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            this.subscription = subscription;
+            if (throwOnSubscribe) {
+                throw new IllegalStateException("onSubscribe");
+            }
+        }
+
+        @Override
+        public void onNext(List<ByteBuffer> item) {
+            callbackContexts.add(Context.current());
+            if (throwOnNext) {
+                throw new IllegalStateException("onNext");
+            }
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            body.completeExceptionally(throwable);
+        }
+
+        @Override
+        public void onComplete() {
+            callbackContexts.add(Context.current());
+            body.complete(null);
+        }
     }
-  }
 
-  private static final class RecordingSubscription implements Flow.Subscription {
-    private long requested;
-    private int cancelled;
+    private static final class RecordingSubscription implements Flow.Subscription {
+        private long requested;
+        private int cancelled;
 
-    @Override
-    public void request(long count) {
-      requested += count;
-    }
+        @Override
+        public void request(long count) {
+            requested += count;
+        }
 
-    @Override
-    public void cancel() {
-      cancelled++;
+        @Override
+        public void cancel() {
+            cancelled++;
+        }
     }
-  }
 
-  private static final class RecordingContinuation implements ContextContinuation {
-    private int released;
+    private static final class RecordingContinuation implements ContextContinuation {
+        private int released;
 
-    @Override
-    public ContextContinuation hold() {
-      return this;
-    }
+        @Override
+        public ContextContinuation hold() {
+            return this;
+        }
 
-    @Override
-    public Context context() {
-      return null;
-    }
+        @Override
+        public Context context() {
+            return null;
+        }
 
-    @Override
-    public ContextScope resume() {
-      return null;
-    }
+        @Override
+        public ContextScope resume() {
+            return null;
+        }
 
-    @Override
-    public void release() {
-      released++;
+        @Override
+        public void release() {
+            released++;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/java/datadog/trace/instrumentation/httpclient/JpmsInetAddressDisabledForkedTest.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/java/datadog/trace/instrumentation/httpclient/JpmsInetAddressDisabledForkedTest.java
index 1bb1127aa20..d2c16c27447 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/java/datadog/trace/instrumentation/httpclient/JpmsInetAddressDisabledForkedTest.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/java/datadog/trace/instrumentation/httpclient/JpmsInetAddressDisabledForkedTest.java
@@ -18,29 +18,29 @@
 @WithConfig(key = "trace.java-module.enabled", value = "false")
 class JpmsInetAddressDisabledForkedTest extends AbstractInstrumentationTest {
 
-  /**
-   * Verifies the fallback behaviour when the JPMS instrumentation is disabled: HostNameResolver
-   * cannot reflectively read the pre-set hostname from InetAddress and falls back to a cache keyed
-   * by IP address. As a result, once a hostname has been cached for a given IP, every subsequent
-   * lookup for that IP returns the first cached value, even when the InetAddress object carries a
-   * different hostname.
-   *
-   * <p>This is the broken behaviour that the JPMS instrumentation is designed to fix.
-   */
-  @Test
-  void withoutJpmsInstrumentationIpCausesStaleHostnameToBeReturned() throws Exception {
-    assumeFalse(JavaVirtualMachine.isJ9(), "Does not work on J9");
-    // different subnet from the enabled-test to avoid cross-test cache pollution
-    byte[] ip = {(byte) 192, 0, 2, 2};
-    InetAddress addr1 = InetAddress.getByAddress("service1.example.com", ip);
-    // Prime the IP→hostname cache with service1's hostname
-    HostNameResolver.hostName(addr1, "192.0.2.2");
+    /**
+     * Verifies the fallback behaviour when the JPMS instrumentation is disabled: HostNameResolver
+     * cannot reflectively read the pre-set hostname from InetAddress and falls back to a cache keyed
+     * by IP address. As a result, once a hostname has been cached for a given IP, every subsequent
+     * lookup for that IP returns the first cached value, even when the InetAddress object carries a
+     * different hostname.
+     *
+     * <p>This is the broken behaviour that the JPMS instrumentation is designed to fix.
+     */
+    @Test
+    void withoutJpmsInstrumentationIpCausesStaleHostnameToBeReturned() throws Exception {
+        assumeFalse(JavaVirtualMachine.isJ9(), "Does not work on J9");
+        // different subnet from the enabled-test to avoid cross-test cache pollution
+        byte[] ip = {(byte) 192, 0, 2, 2};
+        InetAddress addr1 = InetAddress.getByAddress("service1.example.com", ip);
+        // Prime the IP→hostname cache with service1's hostname
+        HostNameResolver.hostName(addr1, "192.0.2.2");
 
-    // a second service with the same IP but a different hostname is resolved
-    InetAddress addr2 = InetAddress.getByAddress("service2.example.com", ip);
-    String result = HostNameResolver.hostName(addr2, "192.0.2.2");
+        // a second service with the same IP but a different hostname is resolved
+        InetAddress addr2 = InetAddress.getByAddress("service2.example.com", ip);
+        String result = HostNameResolver.hostName(addr2, "192.0.2.2");
 
-    // the stale cached hostname of service1 is returned instead of service2's
-    assertEquals("service1.example.com", result);
-  }
+        // the stale cached hostname of service1 is returned instead of service2's
+        assertEquals("service1.example.com", result);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/java/datadog/trace/instrumentation/httpclient/JpmsInetAddressForkedTest.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/java/datadog/trace/instrumentation/httpclient/JpmsInetAddressForkedTest.java
index bcbaf580dbf..eb488c12759 100644
--- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/java/datadog/trace/instrumentation/httpclient/JpmsInetAddressForkedTest.java
+++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/java/datadog/trace/instrumentation/httpclient/JpmsInetAddressForkedTest.java
@@ -12,31 +12,31 @@
 // Forked test: runs in an isolated JVM with JPMS instrumentation ENABLED (default).
 class JpmsInetAddressForkedTest extends AbstractInstrumentationTest {
 
-  /**
-   * Verifies that the JPMS instrumentation opens java.base/java.net so that HostNameResolver can
-   * bypass its IP→hostname cache and return the correct peer.hostname even when multiple services
-   * share a single IP address (e.g. services behind a reverse proxy).
-   *
-   * <p>Without the fix, HostNameResolver cannot reflectively access InetAddress$InetAddressHolder
-   * on Java 9+ and falls back to a cache keyed by IP, causing the first service's hostname to be
-   * returned for all subsequent services on the same IP.
-   */
-  @Test
-  void instrumentationOpensJavaNetSoHostnameIsResolvedCorrectlyWhenIpIsShared() throws Exception {
-    assumeFalse(JavaVirtualMachine.isJ9(), "Does not work on J9");
+    /**
+     * Verifies that the JPMS instrumentation opens java.base/java.net so that HostNameResolver can
+     * bypass its IP→hostname cache and return the correct peer.hostname even when multiple services
+     * share a single IP address (e.g. services behind a reverse proxy).
+     *
+     * <p>Without the fix, HostNameResolver cannot reflectively access InetAddress$InetAddressHolder
+     * on Java 9+ and falls back to a cache keyed by IP, causing the first service's hostname to be
+     * returned for all subsequent services on the same IP.
+     */
+    @Test
+    void instrumentationOpensJavaNetSoHostnameIsResolvedCorrectlyWhenIpIsShared() throws Exception {
+        assumeFalse(JavaVirtualMachine.isJ9(), "Does not work on J9");
 
-    // emulate an early initialisation
-    HostNameResolver.hostName(null, "192.0.2.1");
-    byte[] ip = {(byte) 192, 0, 2, 1}; // TEST-NET, will never appear in real DNS cache
-    InetAddress addr1 = InetAddress.getByAddress("service1.example.com", ip);
-    // Warm the IP→hostname cache with service1's hostname
-    HostNameResolver.hostName(addr1, "192.0.2.1");
+        // emulate an early initialisation
+        HostNameResolver.hostName(null, "192.0.2.1");
+        byte[] ip = {(byte) 192, 0, 2, 1}; // TEST-NET, will never appear in real DNS cache
+        InetAddress addr1 = InetAddress.getByAddress("service1.example.com", ip);
+        // Warm the IP→hostname cache with service1's hostname
+        HostNameResolver.hostName(addr1, "192.0.2.1");
 
-    // a second service with the same IP but different hostname is resolved
-    InetAddress addr2 = InetAddress.getByAddress("service2.example.com", ip);
-    String result = HostNameResolver.hostName(addr2, "192.0.2.1");
+        // a second service with the same IP but different hostname is resolved
+        InetAddress addr2 = InetAddress.getByAddress("service2.example.com", ip);
+        String result = HostNameResolver.hostName(addr2, "192.0.2.1");
 
-    // the hostname of addr2 is returned, not the cached hostname of addr1
-    assertEquals("service2.example.com", result);
-  }
+        // the hostname of addr2 is returned, not the cached hostname of addr1
+        assertEquals("service2.example.com", result);
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java
index db2f3a6f1fd..95fc0957617 100644
--- a/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java
@@ -17,35 +17,34 @@
 
 @AutoService(InstrumenterModule.class)
 public final class ByteBufferInstrumentation extends InstrumenterModule.Profiling
-    implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ByteBufferInstrumentation() {
-    super("allocatedirect", "directallocation");
-  }
+    public ByteBufferInstrumentation() {
+        super("allocatedirect", "directallocation");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return JavaVirtualMachine.isJavaVersionAtLeast(11)
-        && super.isEnabled()
-        && ConfigProvider.getInstance()
-            .getBoolean(
-                PROFILING_DIRECT_ALLOCATION_ENABLED, PROFILING_DIRECT_ALLOCATION_ENABLED_DEFAULT)
-        && Platform.hasJfr();
-  }
+    @Override
+    public boolean isEnabled() {
+        return JavaVirtualMachine.isJavaVersionAtLeast(11)
+                && super.isEnabled()
+                && ConfigProvider.getInstance()
+                        .getBoolean(PROFILING_DIRECT_ALLOCATION_ENABLED, PROFILING_DIRECT_ALLOCATION_ENABLED_DEFAULT)
+                && Platform.hasJfr();
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "java.nio.ByteBuffer";
-  }
+    @Override
+    public String instrumentedType() {
+        return "java.nio.ByteBuffer";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("allocateDirect"))
-            .and(isStatic())
-            .and(takesArgument(0, int.class))
-            .and(takesArguments(1)),
-        packageName + ".AllocateDirectAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("allocateDirect"))
+                        .and(isStatic())
+                        .and(takesArgument(0, int.class))
+                        .and(takesArguments(1)),
+                packageName + ".AllocateDirectAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java
index 3c3d8417d8b..a016b173d7a 100644
--- a/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java
@@ -15,34 +15,33 @@
 
 @AutoService(InstrumenterModule.class)
 public final class DirectByteBufferInstrumentation extends InstrumenterModule.Profiling
-    implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public DirectByteBufferInstrumentation() {
-    super("jni", "directallocation");
-  }
+    public DirectByteBufferInstrumentation() {
+        super("jni", "directallocation");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return JavaVirtualMachine.isJavaVersionAtLeast(11)
-        && super.isEnabled()
-        && ConfigProvider.getInstance()
-            .getBoolean(
-                PROFILING_DIRECT_ALLOCATION_ENABLED, PROFILING_DIRECT_ALLOCATION_ENABLED_DEFAULT)
-        && Platform.hasJfr();
-  }
+    @Override
+    public boolean isEnabled() {
+        return JavaVirtualMachine.isJavaVersionAtLeast(11)
+                && super.isEnabled()
+                && ConfigProvider.getInstance()
+                        .getBoolean(PROFILING_DIRECT_ALLOCATION_ENABLED, PROFILING_DIRECT_ALLOCATION_ENABLED_DEFAULT)
+                && Platform.hasJfr();
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "java.nio.DirectByteBuffer";
-  }
+    @Override
+    public String instrumentedType() {
+        return "java.nio.DirectByteBuffer";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(0, long.class))
-            .and(takesArgument(1, int.class))
-            .and(takesArguments(2)),
-        packageName + ".NewDirectByteBufferAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(0, long.class))
+                        .and(takesArgument(1, int.class))
+                        .and(takesArguments(2)),
+                packageName + ".NewDirectByteBufferAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java
index 0fac441bef8..554f446a98d 100644
--- a/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java
@@ -16,36 +16,35 @@
 
 @AutoService(InstrumenterModule.class)
 public final class FileChannelImplInstrumentation extends InstrumenterModule.Profiling
-    implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public FileChannelImplInstrumentation() {
-    super("mmap", "directallocation");
-  }
+    public FileChannelImplInstrumentation() {
+        super("mmap", "directallocation");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return JavaVirtualMachine.isJavaVersionAtLeast(11)
-        && super.isEnabled()
-        && ConfigProvider.getInstance()
-            .getBoolean(
-                PROFILING_DIRECT_ALLOCATION_ENABLED, PROFILING_DIRECT_ALLOCATION_ENABLED_DEFAULT)
-        && Platform.hasJfr();
-  }
+    @Override
+    public boolean isEnabled() {
+        return JavaVirtualMachine.isJavaVersionAtLeast(11)
+                && super.isEnabled()
+                && ConfigProvider.getInstance()
+                        .getBoolean(PROFILING_DIRECT_ALLOCATION_ENABLED, PROFILING_DIRECT_ALLOCATION_ENABLED_DEFAULT)
+                && Platform.hasJfr();
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "sun.nio.ch.FileChannelImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "sun.nio.ch.FileChannelImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("map"))
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("java.nio.channels.FileChannel$MapMode")))
-            .and(takesArgument(1, long.class))
-            .and(takesArgument(2, long.class)),
-        packageName + ".MemoryMappingAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("map"))
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("java.nio.channels.FileChannel$MapMode")))
+                        .and(takesArgument(1, long.class))
+                        .and(takesArgument(2, long.class)),
+                packageName + ".MemoryMappingAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/AllocateDirectAdvice.java b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/AllocateDirectAdvice.java
index ed023c28b6a..1f4c5146950 100644
--- a/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/AllocateDirectAdvice.java
+++ b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/AllocateDirectAdvice.java
@@ -10,25 +10,26 @@
 
 public class AllocateDirectAdvice {
 
-  @Advice.OnMethodEnter
-  public static DirectAllocationSampleEvent enter(@Advice.Argument(0) long capacity) {
-    // reporting or sampling may lead to direct allocation so we need to track the depth
-    int callDepth = CallDepthThreadLocalMap.incrementCallDepth(DirectAllocationProfiling.class);
-    if (callDepth == 0 && InstrumentationBasedProfiling.isJFRReady()) {
-      Class<?> caller = DirectAllocationProfiling.getInstance().getStackWalker().getCallerClass();
-      return DirectAllocationProfiling.getInstance().sample(ALLOCATE_DIRECT, caller, capacity);
+    @Advice.OnMethodEnter
+    public static DirectAllocationSampleEvent enter(@Advice.Argument(0) long capacity) {
+        // reporting or sampling may lead to direct allocation so we need to track the depth
+        int callDepth = CallDepthThreadLocalMap.incrementCallDepth(DirectAllocationProfiling.class);
+        if (callDepth == 0 && InstrumentationBasedProfiling.isJFRReady()) {
+            Class<?> caller =
+                    DirectAllocationProfiling.getInstance().getStackWalker().getCallerClass();
+            return DirectAllocationProfiling.getInstance().sample(ALLOCATE_DIRECT, caller, capacity);
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Advice.OnMethodExit
-  public static void exit(@Advice.Enter DirectAllocationSampleEvent sample) {
-    if (sample != null) {
-      sample.end();
-      if (sample.shouldCommit()) {
-        sample.commit();
-      }
+    @Advice.OnMethodExit
+    public static void exit(@Advice.Enter DirectAllocationSampleEvent sample) {
+        if (sample != null) {
+            sample.end();
+            if (sample.shouldCommit()) {
+                sample.commit();
+            }
+        }
+        CallDepthThreadLocalMap.decrementCallDepth(DirectAllocationProfiling.class);
     }
-    CallDepthThreadLocalMap.decrementCallDepth(DirectAllocationProfiling.class);
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/MemoryMappingAdvice.java b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/MemoryMappingAdvice.java
index 8df1776113b..2fcc950796f 100644
--- a/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/MemoryMappingAdvice.java
+++ b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/MemoryMappingAdvice.java
@@ -10,25 +10,26 @@
 
 public class MemoryMappingAdvice {
 
-  @Advice.OnMethodEnter
-  public static DirectAllocationSampleEvent enter(@Advice.Argument(2) long capacity) {
-    // reporting or sampling may lead to direct allocation so we need to track the depth
-    int callDepth = CallDepthThreadLocalMap.incrementCallDepth(DirectAllocationProfiling.class);
-    if (callDepth == 0 && InstrumentationBasedProfiling.isJFRReady()) {
-      Class<?> caller = DirectAllocationProfiling.getInstance().getStackWalker().getCallerClass();
-      return DirectAllocationProfiling.getInstance().sample(MMAP, caller, capacity);
+    @Advice.OnMethodEnter
+    public static DirectAllocationSampleEvent enter(@Advice.Argument(2) long capacity) {
+        // reporting or sampling may lead to direct allocation so we need to track the depth
+        int callDepth = CallDepthThreadLocalMap.incrementCallDepth(DirectAllocationProfiling.class);
+        if (callDepth == 0 && InstrumentationBasedProfiling.isJFRReady()) {
+            Class<?> caller =
+                    DirectAllocationProfiling.getInstance().getStackWalker().getCallerClass();
+            return DirectAllocationProfiling.getInstance().sample(MMAP, caller, capacity);
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Advice.OnMethodExit
-  public static void exit(@Advice.Enter DirectAllocationSampleEvent sample) {
-    if (sample != null) {
-      sample.end();
-      if (sample.shouldCommit()) {
-        sample.commit();
-      }
+    @Advice.OnMethodExit
+    public static void exit(@Advice.Enter DirectAllocationSampleEvent sample) {
+        if (sample != null) {
+            sample.end();
+            if (sample.shouldCommit()) {
+                sample.commit();
+            }
+        }
+        CallDepthThreadLocalMap.decrementCallDepth(DirectAllocationProfiling.class);
     }
-    CallDepthThreadLocalMap.decrementCallDepth(DirectAllocationProfiling.class);
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/NewDirectByteBufferAdvice.java b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/NewDirectByteBufferAdvice.java
index 8a19a0a2ab4..3da8b262e38 100644
--- a/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/NewDirectByteBufferAdvice.java
+++ b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/NewDirectByteBufferAdvice.java
@@ -11,19 +11,19 @@
 
 public class NewDirectByteBufferAdvice {
 
-  @Advice.OnMethodExit
-  public static void exit(@Advice.Argument(1) int capacity, @Advice.This ByteBuffer buffer) {
-    // reporting or sampling may lead to direct allocation so we need to track the depth
-    int callDepth = CallDepthThreadLocalMap.incrementCallDepth(DirectAllocationProfiling.class);
-    if (callDepth == 0 && InstrumentationBasedProfiling.isJFRReady()) {
-      DirectAllocationSampleEvent sample =
-          DirectAllocationProfiling.getInstance().sample(JNI, buffer.getClass(), capacity);
-      if (sample != null) {
-        if (sample.shouldCommit()) {
-          sample.commit();
+    @Advice.OnMethodExit
+    public static void exit(@Advice.Argument(1) int capacity, @Advice.This ByteBuffer buffer) {
+        // reporting or sampling may lead to direct allocation so we need to track the depth
+        int callDepth = CallDepthThreadLocalMap.incrementCallDepth(DirectAllocationProfiling.class);
+        if (callDepth == 0 && InstrumentationBasedProfiling.isJFRReady()) {
+            DirectAllocationSampleEvent sample =
+                    DirectAllocationProfiling.getInstance().sample(JNI, buffer.getClass(), capacity);
+            if (sample != null) {
+                if (sample.shouldCommit()) {
+                    sample.commit();
+                }
+            }
         }
-      }
+        CallDepthThreadLocalMap.decrementCallDepth(DirectAllocationProfiling.class);
     }
-    CallDepthThreadLocalMap.decrementCallDepth(DirectAllocationProfiling.class);
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java
index 303c5bd0636..b2e9872773d 100644
--- a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java
@@ -24,56 +24,53 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RmiClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public RmiClientInstrumentation() {
-    super("rmi", "rmi-client");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+    public RmiClientInstrumentation() {
+        super("rmi", "rmi-client");
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("sun.rmi.server.UnicastRef"));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("invoke"))
-            .and(takesArgument(0, named("java.rmi.Remote")))
-            .and(takesArgument(1, named("java.lang.reflect.Method"))),
-        getClass().getName() + "$RmiClientAdvice");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("sun.rmi.server.UnicastRef"));
+    }
 
-  public static class RmiClientAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(@Advice.Argument(value = 1) final Method method) {
-      if (activeSpan() == null) {
-        return null;
-      }
-      final AgentSpan span = startSpan(RMI_CLIENT.toString(), RMI_INVOKE);
-      DECORATE.afterStart(span);
-      DECORATE.onMethodInvocation(span, method);
-      return activateSpan(span);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("invoke"))
+                        .and(takesArgument(0, named("java.rmi.Remote")))
+                        .and(takesArgument(1, named("java.lang.reflect.Method"))),
+                getClass().getName() + "$RmiClientAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      DECORATE.onError(scope, throwable);
-      DECORATE.beforeFinish(scope);
-      scope.close();
-      spanFromScope(scope).finish();
+    public static class RmiClientAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(@Advice.Argument(value = 1) final Method method) {
+            if (activeSpan() == null) {
+                return null;
+            }
+            final AgentSpan span = startSpan(RMI_CLIENT.toString(), RMI_INVOKE);
+            DECORATE.afterStart(span);
+            DECORATE.onMethodInvocation(span, method);
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            DECORATE.onError(scope, throwable);
+            DECORATE.beforeFinish(scope);
+            scope.close();
+            spanFromScope(scope).finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java
index 2baea7bb86e..5480bb625a4 100644
--- a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java
@@ -45,65 +45,61 @@
  */
 @AutoService(InstrumenterModule.class)
 public class RmiClientContextInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public RmiClientContextInstrumentation() {
-    super("rmi", "rmi-context-propagator", "rmi-client-context-propagator");
-  }
+    public RmiClientContextInstrumentation() {
+        super("rmi", "rmi-context-propagator", "rmi-client-context-propagator");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return super.defaultEnabled()
-        && !Platform.isNativeImageBuilder(); // not applicable in native-image
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return super.defaultEnabled() && !Platform.isNativeImageBuilder(); // not applicable in native-image
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("sun.rmi.transport.StreamRemoteCall"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("sun.rmi.transport.StreamRemoteCall"));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    // caching if a connection can support enhanced format
-    return singletonMap("sun.rmi.transport.Connection", "java.lang.Boolean");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        // caching if a connection can support enhanced format
+        return singletonMap("sun.rmi.transport.Connection", "java.lang.Boolean");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(0, named("sun.rmi.transport.Connection")))
-            .and(takesArgument(1, named("java.rmi.server.ObjID"))),
-        getClass().getName() + "$StreamRemoteCallConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(0, named("sun.rmi.transport.Connection")))
+                        .and(takesArgument(1, named("java.rmi.server.ObjID"))),
+                getClass().getName() + "$StreamRemoteCallConstructorAdvice");
+    }
 
-  public static class StreamRemoteCallConstructorAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(value = 0) final Connection c,
-        @Advice.Argument(value = 1) final ObjID id) {
-      if (!c.isReusable()) {
-        return;
-      }
-      if (PROPAGATOR.isRMIInternalObject(id)) {
-        return;
-      }
-      final AgentSpan activeSpan = activeSpan();
-      if (activeSpan == null) {
-        return;
-      }
+    public static class StreamRemoteCallConstructorAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Argument(value = 0) final Connection c, @Advice.Argument(value = 1) final ObjID id) {
+            if (!c.isReusable()) {
+                return;
+            }
+            if (PROPAGATOR.isRMIInternalObject(id)) {
+                return;
+            }
+            final AgentSpan activeSpan = activeSpan();
+            if (activeSpan == null) {
+                return;
+            }
 
-      final ContextStore<Connection, Boolean> knownConnections =
-          InstrumentationContext.get(Connection.class, Boolean.class);
+            final ContextStore<Connection, Boolean> knownConnections =
+                    InstrumentationContext.get(Connection.class, Boolean.class);
 
-      PROPAGATOR.attemptToPropagateContext(knownConnections, c, activeSpan);
+            PROPAGATOR.attemptToPropagateContext(knownConnections, c, activeSpan);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/server/RmiServerContextInstrumentation.java b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/server/RmiServerContextInstrumentation.java
index bb479566719..6d0090ded3a 100644
--- a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/server/RmiServerContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/server/RmiServerContextInstrumentation.java
@@ -19,53 +19,50 @@
 
 @AutoService(InstrumenterModule.class)
 public class RmiServerContextInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public RmiServerContextInstrumentation() {
-    super("rmi", "rmi-context-propagator", "rmi-server-context-propagator");
-  }
+    public RmiServerContextInstrumentation() {
+        super("rmi", "rmi-context-propagator", "rmi-server-context-propagator");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return super.defaultEnabled()
-        && !Platform.isNativeImageBuilder(); // not applicable in native-image
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return super.defaultEnabled() && !Platform.isNativeImageBuilder(); // not applicable in native-image
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("sun.rmi.transport.ObjectTable"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("sun.rmi.transport.ObjectTable"));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("getTarget"))
-            .and((takesArgument(0, named("sun.rmi.transport.ObjectEndpoint")))),
-        getClass().getName() + "$ObjectTableAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("getTarget"))
+                        .and((takesArgument(0, named("sun.rmi.transport.ObjectEndpoint")))),
+                getClass().getName() + "$ObjectTableAdvice");
+    }
 
-  public static class ObjectTableAdvice {
+    public static class ObjectTableAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Argument(0) final Object oe, @Advice.Return(readOnly = false) Target result) {
-      // comparing toString() output allows us to avoid using reflection to be able to compare
-      // ObjID and ObjectEndpoint objects
-      // ObjectEndpoint#toString() only returns this.objId.toString() value which is exactly
-      // what we're interested in here.
-      if (!DD_CONTEXT_CALL_ID.toString().equals(oe.toString())) {
-        return;
-      }
-      result = ContextDispatcher.newDispatcherTarget();
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Argument(0) final Object oe, @Advice.Return(readOnly = false) Target result) {
+            // comparing toString() output allows us to avoid using reflection to be able to compare
+            // ObjID and ObjectEndpoint objects
+            // ObjectEndpoint#toString() only returns this.objId.toString() value which is exactly
+            // what we're interested in here.
+            if (!DD_CONTEXT_CALL_ID.toString().equals(oe.toString())) {
+                return;
+            }
+            result = ContextDispatcher.newDispatcherTarget();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java
index 5956b8833c2..a98b01cbdf9 100644
--- a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java
@@ -27,59 +27,55 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RmiServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public RmiServerInstrumentation() {
-    super("rmi", "rmi-server");
-  }
+    public RmiServerInstrumentation() {
+        super("rmi", "rmi-server");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("java.rmi.server.RemoteServer"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("java.rmi.server.RemoteServer"));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(not(isStatic())), getClass().getName() + "$ServerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(not(isStatic())), getClass().getName() + "$ServerAdvice");
+    }
 
-  public static class ServerAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class, inline = true)
-    public static ContextScope onEnter(
-        @Advice.This final Object thiz, @Advice.Origin final Method method) {
-      final AgentSpanContext context = THREAD_LOCAL_CONTEXT.getAndResetContext();
+    public static class ServerAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class, inline = true)
+        public static ContextScope onEnter(@Advice.This final Object thiz, @Advice.Origin final Method method) {
+            final AgentSpanContext context = THREAD_LOCAL_CONTEXT.getAndResetContext();
 
-      final AgentSpan span;
-      if (context == null) {
-        span = startSpan(RMI_SERVER.toString(), RMI_REQUEST);
-      } else {
-        span = startSpan(RMI_SERVER.toString(), RMI_REQUEST, context);
-      }
+            final AgentSpan span;
+            if (context == null) {
+                span = startSpan(RMI_SERVER.toString(), RMI_REQUEST);
+            } else {
+                span = startSpan(RMI_SERVER.toString(), RMI_REQUEST, context);
+            }
 
-      span.setResourceName(DECORATE.spanNameForMethod(method));
+            span.setResourceName(DECORATE.spanNameForMethod(method));
 
-      DECORATE.afterStart(span);
-      return activateSpan(span);
-    }
+            DECORATE.afterStart(span);
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      DECORATE.onError(scope, throwable);
-      DECORATE.beforeFinish(scope);
-      scope.close();
-      spanFromScope(scope).finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            DECORATE.onError(scope, throwable);
+            DECORATE.beforeFinish(scope);
+            scope.close();
+            spanFromScope(scope).finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/java/rmi/app/Greeter.java b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/java/rmi/app/Greeter.java
index 0e1d1d3fa8d..bb4ee5accbb 100644
--- a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/java/rmi/app/Greeter.java
+++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/java/rmi/app/Greeter.java
@@ -4,7 +4,7 @@
 import java.rmi.RemoteException;
 
 public interface Greeter extends Remote {
-  String hello(String name) throws RemoteException;
+    String hello(String name) throws RemoteException;
 
-  void exceptional() throws RemoteException, RuntimeException;
+    void exceptional() throws RemoteException, RuntimeException;
 }
diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/java/rmi/app/Server.java b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/java/rmi/app/Server.java
index 892a85f38a2..b8ce678e462 100644
--- a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/java/rmi/app/Server.java
+++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/java/rmi/app/Server.java
@@ -4,25 +4,25 @@
 import java.rmi.server.UnicastRemoteObject;
 
 public class Server extends UnicastRemoteObject implements Greeter {
-  public static String RMI_ID = Server.class.getSimpleName();
+    public static String RMI_ID = Server.class.getSimpleName();
 
-  private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-  public Server() throws RemoteException {
-    super();
-  }
+    public Server() throws RemoteException {
+        super();
+    }
 
-  @Override
-  public String hello(final String name) {
-    return someMethod(name);
-  }
+    @Override
+    public String hello(final String name) {
+        return someMethod(name);
+    }
 
-  public String someMethod(final String name) {
-    return "Hello " + name;
-  }
+    public String someMethod(final String name) {
+        return "Hello " + name;
+    }
 
-  @Override
-  public void exceptional() throws RuntimeException {
-    throw new RuntimeException("expected");
-  }
+    @Override
+    public void exceptional() throws RuntimeException {
+        throw new RuntimeException("expected");
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/java/rmi/app/ServerLegacy.java b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/java/rmi/app/ServerLegacy.java
index 7635ccd5b6b..4e47595b5f2 100644
--- a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/java/rmi/app/ServerLegacy.java
+++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/java/rmi/app/ServerLegacy.java
@@ -4,21 +4,21 @@
 import java.rmi.server.UnicastRemoteObject;
 
 public class ServerLegacy extends UnicastRemoteObject implements Greeter {
-  static String RMI_ID = ServerLegacy.class.getSimpleName();
+    static String RMI_ID = ServerLegacy.class.getSimpleName();
 
-  private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-  public ServerLegacy() throws RemoteException {
-    super();
-  }
+    public ServerLegacy() throws RemoteException {
+        super();
+    }
 
-  @Override
-  public String hello(final String name) {
-    return "Hello " + name;
-  }
+    @Override
+    public String hello(final String name) {
+        return "Hello " + name;
+    }
 
-  @Override
-  public void exceptional() throws RuntimeException {
-    throw new RuntimeException("expected");
-  }
+    @Override
+    public void exceptional() throws RuntimeException {
+        throw new RuntimeException("expected");
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakCipherInstrumentationCallSite.java b/dd-java-agent/instrumentation/java/java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakCipherInstrumentationCallSite.java
index d34a73e874d..9c69e1d757a 100644
--- a/dd-java-agent/instrumentation/java/java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakCipherInstrumentationCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakCipherInstrumentationCallSite.java
@@ -11,37 +11,33 @@
 @CallSite(spi = IastCallSites.class)
 public class WeakCipherInstrumentationCallSite {
 
-  @CallSite.Before("javax.crypto.Cipher javax.crypto.Cipher.getInstance(java.lang.String)")
-  @CallSite.Before(
-      "javax.crypto.Cipher javax.crypto.Cipher.getInstance(java.lang.String, java.lang.String)")
-  @CallSite.Before(
-      "javax.crypto.Cipher javax.crypto.Cipher.getInstance(java.lang.String, java.security.Provider)")
-  @CallSite.Before(
-      "javax.crypto.KeyGenerator  javax.crypto.KeyGenerator.getInstance(java.lang.String)")
-  @CallSite.Before(
-      "javax.crypto.KeyGenerator  javax.crypto.KeyGenerator.getInstance(java.lang.String, java.lang.String)")
-  @CallSite.Before(
-      "javax.crypto.KeyGenerator javax.crypto.KeyGenerator.getInstance(java.lang.String, java.security.Provider)")
-  @CallSite.Before(
-      "javax.crypto.SecretKeyFactory  javax.crypto.SecretKeyFactory.getInstance(java.lang.String)")
-  @CallSite.Before(
-      "javax.crypto.SecretKeyFactory  javax.crypto.SecretKeyFactory.getInstance(java.lang.String, java.lang.String)")
-  @CallSite.Before(
-      "javax.crypto.SecretKeyFactory javax.crypto.SecretKeyFactory.getInstance(java.lang.String, java.security.Provider)")
-  public static void beforeGetInstance(@CallSite.Argument final String algo) {
-    onCipherAlgorithm(algo);
-  }
+    @CallSite.Before("javax.crypto.Cipher javax.crypto.Cipher.getInstance(java.lang.String)")
+    @CallSite.Before("javax.crypto.Cipher javax.crypto.Cipher.getInstance(java.lang.String, java.lang.String)")
+    @CallSite.Before("javax.crypto.Cipher javax.crypto.Cipher.getInstance(java.lang.String, java.security.Provider)")
+    @CallSite.Before("javax.crypto.KeyGenerator  javax.crypto.KeyGenerator.getInstance(java.lang.String)")
+    @CallSite.Before(
+            "javax.crypto.KeyGenerator  javax.crypto.KeyGenerator.getInstance(java.lang.String, java.lang.String)")
+    @CallSite.Before(
+            "javax.crypto.KeyGenerator javax.crypto.KeyGenerator.getInstance(java.lang.String, java.security.Provider)")
+    @CallSite.Before("javax.crypto.SecretKeyFactory  javax.crypto.SecretKeyFactory.getInstance(java.lang.String)")
+    @CallSite.Before(
+            "javax.crypto.SecretKeyFactory  javax.crypto.SecretKeyFactory.getInstance(java.lang.String, java.lang.String)")
+    @CallSite.Before(
+            "javax.crypto.SecretKeyFactory javax.crypto.SecretKeyFactory.getInstance(java.lang.String, java.security.Provider)")
+    public static void beforeGetInstance(@CallSite.Argument final String algo) {
+        onCipherAlgorithm(algo);
+    }
 
-  private static void onCipherAlgorithm(final String algo) {
-    if (algo != null) {
-      final WeakCipherModule module = InstrumentationBridge.WEAK_CIPHER;
-      if (module != null) {
-        try {
-          module.onCipherAlgorithm(algo);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeGetInstance threw", e);
+    private static void onCipherAlgorithm(final String algo) {
+        if (algo != null) {
+            final WeakCipherModule module = InstrumentationBridge.WEAK_CIPHER;
+            if (module != null) {
+                try {
+                    module.onCipherAlgorithm(algo);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("beforeGetInstance threw", e);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakHashInstrumentationCallSite.java b/dd-java-agent/instrumentation/java/java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakHashInstrumentationCallSite.java
index 533ecb09844..bafb13cc1e1 100644
--- a/dd-java-agent/instrumentation/java/java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakHashInstrumentationCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakHashInstrumentationCallSite.java
@@ -12,36 +12,35 @@
 @CallSite(spi = IastCallSites.class)
 public class WeakHashInstrumentationCallSite {
 
-  @CallSite.Before(
-      "java.security.MessageDigest java.security.MessageDigest.getInstance(java.lang.String)")
-  public static void beforeGetInstance(@CallSite.Argument final String algo) {
-    onHashingAlgorithm(algo);
-  }
+    @CallSite.Before("java.security.MessageDigest java.security.MessageDigest.getInstance(java.lang.String)")
+    public static void beforeGetInstance(@CallSite.Argument final String algo) {
+        onHashingAlgorithm(algo);
+    }
 
-  @CallSite.Before(
-      "java.security.MessageDigest java.security.MessageDigest.getInstance(java.lang.String, java.lang.String)")
-  public static void beforeGetInstance(
-      @CallSite.Argument final String algo, @CallSite.Argument final String provider) {
-    onHashingAlgorithm(algo);
-  }
+    @CallSite.Before(
+            "java.security.MessageDigest java.security.MessageDigest.getInstance(java.lang.String, java.lang.String)")
+    public static void beforeGetInstance(
+            @CallSite.Argument final String algo, @CallSite.Argument final String provider) {
+        onHashingAlgorithm(algo);
+    }
 
-  @CallSite.Before(
-      "java.security.MessageDigest java.security.MessageDigest.getInstance(java.lang.String, java.security.Provider)")
-  public static void beforeGetInstance(
-      @CallSite.Argument final String algo, @CallSite.Argument final Provider provider) {
-    onHashingAlgorithm(algo);
-  }
+    @CallSite.Before(
+            "java.security.MessageDigest java.security.MessageDigest.getInstance(java.lang.String, java.security.Provider)")
+    public static void beforeGetInstance(
+            @CallSite.Argument final String algo, @CallSite.Argument final Provider provider) {
+        onHashingAlgorithm(algo);
+    }
 
-  private static void onHashingAlgorithm(@CallSite.Argument final String algo) {
-    if (algo != null) {
-      final WeakHashModule module = InstrumentationBridge.WEAK_HASH;
-      if (module != null) {
-        try {
-          module.onHashingAlgorithm(algo);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeGetInstance threw", e);
+    private static void onHashingAlgorithm(@CallSite.Argument final String algo) {
+        if (algo != null) {
+            final WeakHashModule module = InstrumentationBridge.WEAK_HASH;
+            if (module != null) {
+                try {
+                    module.onHashingAlgorithm(algo);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("beforeGetInstance threw", e);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-security-1.8/src/test/java/foo/bar/TestSuite.java b/dd-java-agent/instrumentation/java/java-security-1.8/src/test/java/foo/bar/TestSuite.java
index 2908049eab6..ce308e345ab 100644
--- a/dd-java-agent/instrumentation/java/java-security-1.8/src/test/java/foo/bar/TestSuite.java
+++ b/dd-java-agent/instrumentation/java/java-security-1.8/src/test/java/foo/bar/TestSuite.java
@@ -12,100 +12,97 @@
 import org.slf4j.LoggerFactory;
 
 public class TestSuite {
-  private static final Logger log = LoggerFactory.getLogger(TestSuite.class);
+    private static final Logger log = LoggerFactory.getLogger(TestSuite.class);
 
-  public Cipher getCipherInstance(String algo)
-      throws NoSuchPaddingException, NoSuchAlgorithmException {
-    log.debug("Before Cipher.getInstance");
-    Cipher c = Cipher.getInstance(algo);
-    log.debug("after Cipher.getInstance");
-    return c;
-  }
+    public Cipher getCipherInstance(String algo) throws NoSuchPaddingException, NoSuchAlgorithmException {
+        log.debug("Before Cipher.getInstance");
+        Cipher c = Cipher.getInstance(algo);
+        log.debug("after Cipher.getInstance");
+        return c;
+    }
 
-  public Cipher getCipherInstance(String algo, String provider)
-      throws NoSuchPaddingException, NoSuchAlgorithmException, NoSuchProviderException {
-    log.debug("Before Cipher.getInstance");
-    Cipher c = Cipher.getInstance(algo, provider);
-    log.debug("after Cipher.getInstance");
-    return c;
-  }
+    public Cipher getCipherInstance(String algo, String provider)
+            throws NoSuchPaddingException, NoSuchAlgorithmException, NoSuchProviderException {
+        log.debug("Before Cipher.getInstance");
+        Cipher c = Cipher.getInstance(algo, provider);
+        log.debug("after Cipher.getInstance");
+        return c;
+    }
 
-  public KeyGenerator getKeyGeneratorInstance(String algo, Provider provider)
-      throws NoSuchPaddingException, NoSuchAlgorithmException {
-    log.debug("Before KeyGenerator.getInstance");
-    KeyGenerator c = KeyGenerator.getInstance(algo, provider);
-    log.debug("after KeyGenerator.getInstance");
-    return c;
-  }
+    public KeyGenerator getKeyGeneratorInstance(String algo, Provider provider)
+            throws NoSuchPaddingException, NoSuchAlgorithmException {
+        log.debug("Before KeyGenerator.getInstance");
+        KeyGenerator c = KeyGenerator.getInstance(algo, provider);
+        log.debug("after KeyGenerator.getInstance");
+        return c;
+    }
 
-  public KeyGenerator getKeyGeneratorInstance(String algo)
-      throws NoSuchPaddingException, NoSuchAlgorithmException {
-    log.debug("Before KeyGenerator.getInstance");
-    KeyGenerator c = KeyGenerator.getInstance(algo);
-    log.debug("after KeyGenerator.getInstance");
-    return c;
-  }
+    public KeyGenerator getKeyGeneratorInstance(String algo) throws NoSuchPaddingException, NoSuchAlgorithmException {
+        log.debug("Before KeyGenerator.getInstance");
+        KeyGenerator c = KeyGenerator.getInstance(algo);
+        log.debug("after KeyGenerator.getInstance");
+        return c;
+    }
 
-  public KeyGenerator getKeyGeneratorInstance(String algo, String provider)
-      throws NoSuchPaddingException, NoSuchAlgorithmException, NoSuchProviderException {
-    log.debug("Before KeyGenerator.getInstance");
-    KeyGenerator c = KeyGenerator.getInstance(algo, provider);
-    log.debug("after KeyGenerator.getInstance");
-    return c;
-  }
+    public KeyGenerator getKeyGeneratorInstance(String algo, String provider)
+            throws NoSuchPaddingException, NoSuchAlgorithmException, NoSuchProviderException {
+        log.debug("Before KeyGenerator.getInstance");
+        KeyGenerator c = KeyGenerator.getInstance(algo, provider);
+        log.debug("after KeyGenerator.getInstance");
+        return c;
+    }
 
-  public SecretKeyFactory getSecretKeyFactoryInstance(String algo, Provider provider)
-      throws NoSuchPaddingException, NoSuchAlgorithmException {
-    log.debug("Before SecretKeyFactory.getInstance");
-    SecretKeyFactory c = SecretKeyFactory.getInstance(algo, provider);
-    log.debug("after SecretKeyFactory.getInstance");
-    return c;
-  }
+    public SecretKeyFactory getSecretKeyFactoryInstance(String algo, Provider provider)
+            throws NoSuchPaddingException, NoSuchAlgorithmException {
+        log.debug("Before SecretKeyFactory.getInstance");
+        SecretKeyFactory c = SecretKeyFactory.getInstance(algo, provider);
+        log.debug("after SecretKeyFactory.getInstance");
+        return c;
+    }
 
-  public SecretKeyFactory getSecretKeyFactoryInstance(String algo)
-      throws NoSuchPaddingException, NoSuchAlgorithmException {
-    log.debug("Before SecretKeyFactory.getInstance");
-    SecretKeyFactory c = SecretKeyFactory.getInstance(algo);
-    log.debug("after SecretKeyFactory.getInstance");
-    return c;
-  }
+    public SecretKeyFactory getSecretKeyFactoryInstance(String algo)
+            throws NoSuchPaddingException, NoSuchAlgorithmException {
+        log.debug("Before SecretKeyFactory.getInstance");
+        SecretKeyFactory c = SecretKeyFactory.getInstance(algo);
+        log.debug("after SecretKeyFactory.getInstance");
+        return c;
+    }
 
-  public SecretKeyFactory getSecretKeyFactoryInstance(String algo, String provider)
-      throws NoSuchPaddingException, NoSuchAlgorithmException, NoSuchProviderException {
-    log.debug("Before SecretKeyFactory.getInstance");
-    SecretKeyFactory c = SecretKeyFactory.getInstance(algo, provider);
-    log.debug("after SecretKeyFactory.getInstance");
-    return c;
-  }
+    public SecretKeyFactory getSecretKeyFactoryInstance(String algo, String provider)
+            throws NoSuchPaddingException, NoSuchAlgorithmException, NoSuchProviderException {
+        log.debug("Before SecretKeyFactory.getInstance");
+        SecretKeyFactory c = SecretKeyFactory.getInstance(algo, provider);
+        log.debug("after SecretKeyFactory.getInstance");
+        return c;
+    }
 
-  public Cipher getCipherInstance(String algo, Provider provider)
-      throws NoSuchPaddingException, NoSuchAlgorithmException {
-    log.debug("Before Cipher.getInstance");
-    Cipher c = Cipher.getInstance(algo, provider);
-    log.debug("after Cipher.getInstance");
-    return c;
-  }
+    public Cipher getCipherInstance(String algo, Provider provider)
+            throws NoSuchPaddingException, NoSuchAlgorithmException {
+        log.debug("Before Cipher.getInstance");
+        Cipher c = Cipher.getInstance(algo, provider);
+        log.debug("after Cipher.getInstance");
+        return c;
+    }
 
-  public MessageDigest getMessageDigestInstance(String algo) throws NoSuchAlgorithmException {
-    log.debug("before MessageDigest.getInstance");
-    MessageDigest md = MessageDigest.getInstance(algo);
-    log.debug("after MessageDigest.getInstance");
-    return md;
-  }
+    public MessageDigest getMessageDigestInstance(String algo) throws NoSuchAlgorithmException {
+        log.debug("before MessageDigest.getInstance");
+        MessageDigest md = MessageDigest.getInstance(algo);
+        log.debug("after MessageDigest.getInstance");
+        return md;
+    }
 
-  public MessageDigest getMessageDigestInstance(String algo, String provider)
-      throws NoSuchAlgorithmException, NoSuchProviderException {
-    log.debug("before MessageDigest.getInstance");
-    MessageDigest md = MessageDigest.getInstance(algo, provider);
-    log.debug("after MessageDigest.getInstance");
-    return md;
-  }
+    public MessageDigest getMessageDigestInstance(String algo, String provider)
+            throws NoSuchAlgorithmException, NoSuchProviderException {
+        log.debug("before MessageDigest.getInstance");
+        MessageDigest md = MessageDigest.getInstance(algo, provider);
+        log.debug("after MessageDigest.getInstance");
+        return md;
+    }
 
-  public MessageDigest getMessageDigestInstance(String algo, Provider provider)
-      throws NoSuchAlgorithmException {
-    log.debug("before MessageDigest.getInstance");
-    MessageDigest md = MessageDigest.getInstance(algo, provider);
-    log.debug("after MessageDigest.getInstance");
-    return md;
-  }
+    public MessageDigest getMessageDigestInstance(String algo, Provider provider) throws NoSuchAlgorithmException {
+        log.debug("before MessageDigest.getInstance");
+        MessageDigest md = MessageDigest.getInstance(algo, provider);
+        log.debug("after MessageDigest.getInstance");
+        return md;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/RandomCallSite.java b/dd-java-agent/instrumentation/java/java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/RandomCallSite.java
index 7a12f234203..4d4b79cf70d 100644
--- a/dd-java-agent/instrumentation/java/java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/RandomCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/RandomCallSite.java
@@ -12,34 +12,34 @@
 @CallSite(spi = IastCallSites.class)
 public class RandomCallSite {
 
-  @CallSite.Before("boolean java.util.Random.nextBoolean()")
-  @CallSite.Before("int java.util.Random.nextInt()")
-  @CallSite.Before("int java.util.Random.nextInt(int)")
-  @CallSite.Before("long java.util.Random.nextLong()")
-  @CallSite.Before("float java.util.Random.nextFloat()")
-  @CallSite.Before("double java.util.Random.nextDouble()")
-  @CallSite.Before("double java.util.Random.nextGaussian()")
-  @CallSite.Before("void java.util.Random.nextBytes(byte[])")
-  @CallSite.Before("java.util.stream.IntStream java.util.Random.ints()")
-  @CallSite.Before("java.util.stream.IntStream java.util.Random.ints(int, int)")
-  @CallSite.Before("java.util.stream.IntStream java.util.Random.ints(long)")
-  @CallSite.Before("java.util.stream.IntStream java.util.Random.ints(long, int, int)")
-  @CallSite.Before("java.util.stream.DoubleStream java.util.Random.doubles()")
-  @CallSite.Before("java.util.stream.DoubleStream java.util.Random.doubles(double, double)")
-  @CallSite.Before("java.util.stream.DoubleStream java.util.Random.doubles(long)")
-  @CallSite.Before("java.util.stream.DoubleStream java.util.Random.doubles(long, double, double)")
-  @CallSite.Before("java.util.stream.LongStream java.util.Random.longs()")
-  @CallSite.Before("java.util.stream.LongStream java.util.Random.longs(long)")
-  @CallSite.Before("java.util.stream.LongStream java.util.Random.longs(long, long)")
-  @CallSite.Before("java.util.stream.LongStream java.util.Random.longs(long, long, long)")
-  public static void before(@CallSite.This final Random random) {
-    final WeakRandomnessModule module = InstrumentationBridge.WEAK_RANDOMNESS;
-    if (module != null && random != null) {
-      try {
-        module.onWeakRandom(random.getClass());
-      } catch (final Throwable e) {
-        module.onUnexpectedException("random threw", e);
-      }
+    @CallSite.Before("boolean java.util.Random.nextBoolean()")
+    @CallSite.Before("int java.util.Random.nextInt()")
+    @CallSite.Before("int java.util.Random.nextInt(int)")
+    @CallSite.Before("long java.util.Random.nextLong()")
+    @CallSite.Before("float java.util.Random.nextFloat()")
+    @CallSite.Before("double java.util.Random.nextDouble()")
+    @CallSite.Before("double java.util.Random.nextGaussian()")
+    @CallSite.Before("void java.util.Random.nextBytes(byte[])")
+    @CallSite.Before("java.util.stream.IntStream java.util.Random.ints()")
+    @CallSite.Before("java.util.stream.IntStream java.util.Random.ints(int, int)")
+    @CallSite.Before("java.util.stream.IntStream java.util.Random.ints(long)")
+    @CallSite.Before("java.util.stream.IntStream java.util.Random.ints(long, int, int)")
+    @CallSite.Before("java.util.stream.DoubleStream java.util.Random.doubles()")
+    @CallSite.Before("java.util.stream.DoubleStream java.util.Random.doubles(double, double)")
+    @CallSite.Before("java.util.stream.DoubleStream java.util.Random.doubles(long)")
+    @CallSite.Before("java.util.stream.DoubleStream java.util.Random.doubles(long, double, double)")
+    @CallSite.Before("java.util.stream.LongStream java.util.Random.longs()")
+    @CallSite.Before("java.util.stream.LongStream java.util.Random.longs(long)")
+    @CallSite.Before("java.util.stream.LongStream java.util.Random.longs(long, long)")
+    @CallSite.Before("java.util.stream.LongStream java.util.Random.longs(long, long, long)")
+    public static void before(@CallSite.This final Random random) {
+        final WeakRandomnessModule module = InstrumentationBridge.WEAK_RANDOMNESS;
+        if (module != null && random != null) {
+            try {
+                module.onWeakRandom(random.getClass());
+            } catch (final Throwable e) {
+                module.onUnexpectedException("random threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSite.java b/dd-java-agent/instrumentation/java/java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSite.java
index 78a93b07477..f7ff2621f29 100644
--- a/dd-java-agent/instrumentation/java/java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSite.java
+++ b/dd-java-agent/instrumentation/java/java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSite.java
@@ -12,41 +12,35 @@
 @CallSite(spi = IastCallSites.class)
 public class ThreadLocalRandomCallSite {
 
-  @CallSite.Before("boolean java.util.concurrent.ThreadLocalRandom.nextBoolean()")
-  @CallSite.Before("int java.util.concurrent.ThreadLocalRandom.nextInt()")
-  @CallSite.Before("int java.util.concurrent.ThreadLocalRandom.nextInt(int)")
-  @CallSite.Before("long java.util.concurrent.ThreadLocalRandom.nextLong()")
-  @CallSite.Before("float java.util.concurrent.ThreadLocalRandom.nextFloat()")
-  @CallSite.Before("double java.util.concurrent.ThreadLocalRandom.nextDouble()")
-  @CallSite.Before("double java.util.concurrent.ThreadLocalRandom.nextGaussian()")
-  @CallSite.Before("void java.util.concurrent.ThreadLocalRandom.nextBytes(byte[])")
-  @CallSite.Before("java.util.stream.IntStream java.util.concurrent.ThreadLocalRandom.ints()")
-  @CallSite.Before(
-      "java.util.stream.IntStream java.util.concurrent.ThreadLocalRandom.ints(int, int)")
-  @CallSite.Before("java.util.stream.IntStream java.util.concurrent.ThreadLocalRandom.ints(long)")
-  @CallSite.Before(
-      "java.util.stream.IntStream java.util.concurrent.ThreadLocalRandom.ints(long, int, int)")
-  @CallSite.Before("java.util.stream.DoubleStream java.util.concurrent.ThreadLocalRandom.doubles()")
-  @CallSite.Before(
-      "java.util.stream.DoubleStream java.util.concurrent.ThreadLocalRandom.doubles(double, double)")
-  @CallSite.Before(
-      "java.util.stream.DoubleStream java.util.concurrent.ThreadLocalRandom.doubles(long)")
-  @CallSite.Before(
-      "java.util.stream.DoubleStream java.util.concurrent.ThreadLocalRandom.doubles(long, double, double)")
-  @CallSite.Before("java.util.stream.LongStream java.util.concurrent.ThreadLocalRandom.longs()")
-  @CallSite.Before("java.util.stream.LongStream java.util.concurrent.ThreadLocalRandom.longs(long)")
-  @CallSite.Before(
-      "java.util.stream.LongStream java.util.concurrent.ThreadLocalRandom.longs(long, long)")
-  @CallSite.Before(
-      "java.util.stream.LongStream java.util.concurrent.ThreadLocalRandom.longs(long, long, long)")
-  public static void before(@CallSite.This final ThreadLocalRandom random) {
-    final WeakRandomnessModule module = InstrumentationBridge.WEAK_RANDOMNESS;
-    if (module != null && random != null) {
-      try {
-        module.onWeakRandom(random.getClass());
-      } catch (final Throwable e) {
-        module.onUnexpectedException("thread local random threw", e);
-      }
+    @CallSite.Before("boolean java.util.concurrent.ThreadLocalRandom.nextBoolean()")
+    @CallSite.Before("int java.util.concurrent.ThreadLocalRandom.nextInt()")
+    @CallSite.Before("int java.util.concurrent.ThreadLocalRandom.nextInt(int)")
+    @CallSite.Before("long java.util.concurrent.ThreadLocalRandom.nextLong()")
+    @CallSite.Before("float java.util.concurrent.ThreadLocalRandom.nextFloat()")
+    @CallSite.Before("double java.util.concurrent.ThreadLocalRandom.nextDouble()")
+    @CallSite.Before("double java.util.concurrent.ThreadLocalRandom.nextGaussian()")
+    @CallSite.Before("void java.util.concurrent.ThreadLocalRandom.nextBytes(byte[])")
+    @CallSite.Before("java.util.stream.IntStream java.util.concurrent.ThreadLocalRandom.ints()")
+    @CallSite.Before("java.util.stream.IntStream java.util.concurrent.ThreadLocalRandom.ints(int, int)")
+    @CallSite.Before("java.util.stream.IntStream java.util.concurrent.ThreadLocalRandom.ints(long)")
+    @CallSite.Before("java.util.stream.IntStream java.util.concurrent.ThreadLocalRandom.ints(long, int, int)")
+    @CallSite.Before("java.util.stream.DoubleStream java.util.concurrent.ThreadLocalRandom.doubles()")
+    @CallSite.Before("java.util.stream.DoubleStream java.util.concurrent.ThreadLocalRandom.doubles(double, double)")
+    @CallSite.Before("java.util.stream.DoubleStream java.util.concurrent.ThreadLocalRandom.doubles(long)")
+    @CallSite.Before(
+            "java.util.stream.DoubleStream java.util.concurrent.ThreadLocalRandom.doubles(long, double, double)")
+    @CallSite.Before("java.util.stream.LongStream java.util.concurrent.ThreadLocalRandom.longs()")
+    @CallSite.Before("java.util.stream.LongStream java.util.concurrent.ThreadLocalRandom.longs(long)")
+    @CallSite.Before("java.util.stream.LongStream java.util.concurrent.ThreadLocalRandom.longs(long, long)")
+    @CallSite.Before("java.util.stream.LongStream java.util.concurrent.ThreadLocalRandom.longs(long, long, long)")
+    public static void before(@CallSite.This final ThreadLocalRandom random) {
+        final WeakRandomnessModule module = InstrumentationBridge.WEAK_RANDOMNESS;
+        if (module != null && random != null) {
+            try {
+                module.onWeakRandom(random.getClass());
+            } catch (final Throwable e) {
+                module.onUnexpectedException("thread local random threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-util-1.8/src/test/java/foo/bar/TestRandomSuite.java b/dd-java-agent/instrumentation/java/java-util-1.8/src/test/java/foo/bar/TestRandomSuite.java
index 53980cfa505..4a1f064c460 100644
--- a/dd-java-agent/instrumentation/java/java-util-1.8/src/test/java/foo/bar/TestRandomSuite.java
+++ b/dd-java-agent/instrumentation/java/java-util-1.8/src/test/java/foo/bar/TestRandomSuite.java
@@ -9,151 +9,151 @@
 
 public class TestRandomSuite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestRandomSuite.class);
-
-  private final Random random;
-
-  public TestRandomSuite(final Random random) {
-    this.random = random;
-  }
-
-  public boolean nextBoolean() {
-    LOGGER.debug("Before nextBoolean");
-    final boolean result = random.nextBoolean();
-    LOGGER.debug("After nextBoolean {}", result);
-    return result;
-  }
-
-  public int nextInt() {
-    LOGGER.debug("Before nextInt");
-    final int result = random.nextInt();
-    LOGGER.debug("After nextInt {}", result);
-    return result;
-  }
-
-  public int nextInt(final int i) {
-    LOGGER.debug("Before nextInt {}", i);
-    final int result = random.nextInt(i);
-    LOGGER.debug("After nextInt {}", result);
-    return result;
-  }
-
-  public long nextLong() {
-    LOGGER.debug("Before nextLong");
-    final long result = random.nextLong();
-    LOGGER.debug("After nextLong {}", result);
-    return result;
-  }
-
-  public float nextFloat() {
-    LOGGER.debug("Before nextFloat");
-    final float result = random.nextFloat();
-    LOGGER.debug("After nextFloat {}", result);
-    return result;
-  }
-
-  public double nextDouble() {
-    LOGGER.debug("Before nextDouble");
-    final double result = random.nextDouble();
-    LOGGER.debug("After nextDouble {}", result);
-    return result;
-  }
-
-  public double nextGaussian() {
-    LOGGER.debug("Before nextGaussian");
-    final double result = random.nextGaussian();
-    LOGGER.debug("After nextDouble {}", result);
-    return result;
-  }
-
-  public byte[] nextBytes(final byte[] bytes) {
-    LOGGER.debug("Before nextBytes {}", bytes);
-    random.nextBytes(bytes);
-    LOGGER.debug("After nextBytes");
-    return bytes;
-  }
-
-  public IntStream ints() {
-    LOGGER.debug("Before ints");
-    final IntStream result = random.ints();
-    LOGGER.debug("After ints {}", result);
-    return result;
-  }
-
-  public IntStream ints(final int origin, final int bound) {
-    LOGGER.debug("Before ints {}, {}", origin, bound);
-    final IntStream result = random.ints(origin, bound);
-    LOGGER.debug("After ints {}", result);
-    return result;
-  }
-
-  public IntStream ints(final long size) {
-    LOGGER.debug("Before ints {}", size);
-    final IntStream result = random.ints(size);
-    LOGGER.debug("After ints {}", result);
-    return result;
-  }
-
-  public IntStream ints(final long size, final int origin, final int bound) {
-    LOGGER.debug("Before ints {}, {}, {}", size, origin, bound);
-    final IntStream result = random.ints(size, origin, bound);
-    LOGGER.debug("After ints {}", result);
-    return result;
-  }
-
-  public DoubleStream doubles() {
-    LOGGER.debug("Before doubles");
-    final DoubleStream result = random.doubles();
-    LOGGER.debug("After doubles {}", result);
-    return result;
-  }
-
-  public DoubleStream doubles(final double origin, final double bound) {
-    LOGGER.debug("Before doubles {}, {}", origin, bound);
-    final DoubleStream result = random.doubles(origin, bound);
-    LOGGER.debug("After doubles {}", result);
-    return result;
-  }
-
-  public DoubleStream doubles(final long size) {
-    LOGGER.debug("Before doubles {}", size);
-    final DoubleStream result = random.doubles(size);
-    LOGGER.debug("After doubles {}", result);
-    return result;
-  }
-
-  public DoubleStream doubles(final long size, final double origin, final double bound) {
-    LOGGER.debug("Before doubles {}, {}, {}", size, origin, bound);
-    final DoubleStream result = random.doubles(size, origin, bound);
-    LOGGER.debug("After doubles {}", result);
-    return result;
-  }
-
-  public LongStream longs() {
-    LOGGER.debug("Before longs");
-    final LongStream result = random.longs();
-    LOGGER.debug("After longs {}", result);
-    return result;
-  }
-
-  public LongStream longs(final long origin, final long bound) {
-    LOGGER.debug("Before longs {}, {}", origin, bound);
-    final LongStream result = random.longs(origin, bound);
-    LOGGER.debug("After longs {}", result);
-    return result;
-  }
-
-  public LongStream longs(final long size) {
-    LOGGER.debug("Before longs {}", size);
-    final LongStream result = random.longs(size);
-    LOGGER.debug("After longs {}", result);
-    return result;
-  }
-
-  public LongStream longs(final long size, final long origin, final long bound) {
-    LOGGER.debug("Before longs {}, {}, {}", size, origin, bound);
-    final LongStream result = random.longs(size, origin, bound);
-    LOGGER.debug("After longs {}", result);
-    return result;
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestRandomSuite.class);
+
+    private final Random random;
+
+    public TestRandomSuite(final Random random) {
+        this.random = random;
+    }
+
+    public boolean nextBoolean() {
+        LOGGER.debug("Before nextBoolean");
+        final boolean result = random.nextBoolean();
+        LOGGER.debug("After nextBoolean {}", result);
+        return result;
+    }
+
+    public int nextInt() {
+        LOGGER.debug("Before nextInt");
+        final int result = random.nextInt();
+        LOGGER.debug("After nextInt {}", result);
+        return result;
+    }
+
+    public int nextInt(final int i) {
+        LOGGER.debug("Before nextInt {}", i);
+        final int result = random.nextInt(i);
+        LOGGER.debug("After nextInt {}", result);
+        return result;
+    }
+
+    public long nextLong() {
+        LOGGER.debug("Before nextLong");
+        final long result = random.nextLong();
+        LOGGER.debug("After nextLong {}", result);
+        return result;
+    }
+
+    public float nextFloat() {
+        LOGGER.debug("Before nextFloat");
+        final float result = random.nextFloat();
+        LOGGER.debug("After nextFloat {}", result);
+        return result;
+    }
+
+    public double nextDouble() {
+        LOGGER.debug("Before nextDouble");
+        final double result = random.nextDouble();
+        LOGGER.debug("After nextDouble {}", result);
+        return result;
+    }
+
+    public double nextGaussian() {
+        LOGGER.debug("Before nextGaussian");
+        final double result = random.nextGaussian();
+        LOGGER.debug("After nextDouble {}", result);
+        return result;
+    }
+
+    public byte[] nextBytes(final byte[] bytes) {
+        LOGGER.debug("Before nextBytes {}", bytes);
+        random.nextBytes(bytes);
+        LOGGER.debug("After nextBytes");
+        return bytes;
+    }
+
+    public IntStream ints() {
+        LOGGER.debug("Before ints");
+        final IntStream result = random.ints();
+        LOGGER.debug("After ints {}", result);
+        return result;
+    }
+
+    public IntStream ints(final int origin, final int bound) {
+        LOGGER.debug("Before ints {}, {}", origin, bound);
+        final IntStream result = random.ints(origin, bound);
+        LOGGER.debug("After ints {}", result);
+        return result;
+    }
+
+    public IntStream ints(final long size) {
+        LOGGER.debug("Before ints {}", size);
+        final IntStream result = random.ints(size);
+        LOGGER.debug("After ints {}", result);
+        return result;
+    }
+
+    public IntStream ints(final long size, final int origin, final int bound) {
+        LOGGER.debug("Before ints {}, {}, {}", size, origin, bound);
+        final IntStream result = random.ints(size, origin, bound);
+        LOGGER.debug("After ints {}", result);
+        return result;
+    }
+
+    public DoubleStream doubles() {
+        LOGGER.debug("Before doubles");
+        final DoubleStream result = random.doubles();
+        LOGGER.debug("After doubles {}", result);
+        return result;
+    }
+
+    public DoubleStream doubles(final double origin, final double bound) {
+        LOGGER.debug("Before doubles {}, {}", origin, bound);
+        final DoubleStream result = random.doubles(origin, bound);
+        LOGGER.debug("After doubles {}", result);
+        return result;
+    }
+
+    public DoubleStream doubles(final long size) {
+        LOGGER.debug("Before doubles {}", size);
+        final DoubleStream result = random.doubles(size);
+        LOGGER.debug("After doubles {}", result);
+        return result;
+    }
+
+    public DoubleStream doubles(final long size, final double origin, final double bound) {
+        LOGGER.debug("Before doubles {}, {}, {}", size, origin, bound);
+        final DoubleStream result = random.doubles(size, origin, bound);
+        LOGGER.debug("After doubles {}", result);
+        return result;
+    }
+
+    public LongStream longs() {
+        LOGGER.debug("Before longs");
+        final LongStream result = random.longs();
+        LOGGER.debug("After longs {}", result);
+        return result;
+    }
+
+    public LongStream longs(final long origin, final long bound) {
+        LOGGER.debug("Before longs {}, {}", origin, bound);
+        final LongStream result = random.longs(origin, bound);
+        LOGGER.debug("After longs {}", result);
+        return result;
+    }
+
+    public LongStream longs(final long size) {
+        LOGGER.debug("Before longs {}", size);
+        final LongStream result = random.longs(size);
+        LOGGER.debug("After longs {}", result);
+        return result;
+    }
+
+    public LongStream longs(final long size, final long origin, final long bound) {
+        LOGGER.debug("Before longs {}, {}, {}", size, origin, bound);
+        final LongStream result = random.longs(size, origin, bound);
+        LOGGER.debug("After longs {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/java/java-util-1.8/src/test/java/foo/bar/TestThreadLocalRandomSuite.java b/dd-java-agent/instrumentation/java/java-util-1.8/src/test/java/foo/bar/TestThreadLocalRandomSuite.java
index 6b1928e8f90..201b88f88d3 100644
--- a/dd-java-agent/instrumentation/java/java-util-1.8/src/test/java/foo/bar/TestThreadLocalRandomSuite.java
+++ b/dd-java-agent/instrumentation/java/java-util-1.8/src/test/java/foo/bar/TestThreadLocalRandomSuite.java
@@ -9,151 +9,151 @@
 
 public class TestThreadLocalRandomSuite {
 
-  private final Logger LOGGER = LoggerFactory.getLogger(TestThreadLocalRandomSuite.class);
-
-  private final ThreadLocalRandom random;
-
-  public TestThreadLocalRandomSuite(final ThreadLocalRandom random) {
-    this.random = random;
-  }
-
-  public boolean nextBoolean() {
-    LOGGER.debug("Before nextBoolean");
-    final boolean result = random.nextBoolean();
-    LOGGER.debug("After nextBoolean {}", result);
-    return result;
-  }
-
-  public int nextInt() {
-    LOGGER.debug("Before nextInt");
-    final int result = random.nextInt();
-    LOGGER.debug("After nextInt {}", result);
-    return result;
-  }
-
-  public int nextInt(final int i) {
-    LOGGER.debug("Before nextInt {}", i);
-    final int result = random.nextInt(i);
-    LOGGER.debug("After nextInt {}", result);
-    return result;
-  }
-
-  public long nextLong() {
-    LOGGER.debug("Before nextLong");
-    final long result = random.nextLong();
-    LOGGER.debug("After nextLong {}", result);
-    return result;
-  }
-
-  public float nextFloat() {
-    LOGGER.debug("Before nextFloat");
-    final float result = random.nextFloat();
-    LOGGER.debug("After nextFloat {}", result);
-    return result;
-  }
-
-  public double nextDouble() {
-    LOGGER.debug("Before nextDouble");
-    final double result = random.nextDouble();
-    LOGGER.debug("After nextDouble {}", result);
-    return result;
-  }
-
-  public double nextGaussian() {
-    LOGGER.debug("Before nextGaussian");
-    final double result = random.nextGaussian();
-    LOGGER.debug("After nextDouble {}", result);
-    return result;
-  }
-
-  public byte[] nextBytes(final byte[] bytes) {
-    LOGGER.debug("Before nextBytes {}", bytes);
-    random.nextBytes(bytes);
-    LOGGER.debug("After nextBytes");
-    return bytes;
-  }
-
-  public IntStream ints() {
-    LOGGER.debug("Before ints");
-    final IntStream result = random.ints();
-    LOGGER.debug("After ints {}", result);
-    return result;
-  }
-
-  public IntStream ints(final int origin, final int bound) {
-    LOGGER.debug("Before ints {}, {}", origin, bound);
-    final IntStream result = random.ints(origin, bound);
-    LOGGER.debug("After ints {}", result);
-    return result;
-  }
-
-  public IntStream ints(final long size) {
-    LOGGER.debug("Before ints {}", size);
-    final IntStream result = random.ints(size);
-    LOGGER.debug("After ints {}", result);
-    return result;
-  }
-
-  public IntStream ints(final long size, final int origin, final int bound) {
-    LOGGER.debug("Before ints {}, {}, {}", size, origin, bound);
-    final IntStream result = random.ints(size, origin, bound);
-    LOGGER.debug("After ints {}", result);
-    return result;
-  }
-
-  public DoubleStream doubles() {
-    LOGGER.debug("Before doubles");
-    final DoubleStream result = random.doubles();
-    LOGGER.debug("After doubles {}", result);
-    return result;
-  }
-
-  public DoubleStream doubles(final double origin, final double bound) {
-    LOGGER.debug("Before doubles {}, {}", origin, bound);
-    final DoubleStream result = random.doubles(origin, bound);
-    LOGGER.debug("After doubles {}", result);
-    return result;
-  }
-
-  public DoubleStream doubles(final long size) {
-    LOGGER.debug("Before doubles {}", size);
-    final DoubleStream result = random.doubles(size);
-    LOGGER.debug("After doubles {}", result);
-    return result;
-  }
-
-  public DoubleStream doubles(final long size, final double origin, final double bound) {
-    LOGGER.debug("Before doubles {}, {}, {}", size, origin, bound);
-    final DoubleStream result = random.doubles(size, origin, bound);
-    LOGGER.debug("After doubles {}", result);
-    return result;
-  }
-
-  public LongStream longs() {
-    LOGGER.debug("Before longs");
-    final LongStream result = random.longs();
-    LOGGER.debug("After longs {}", result);
-    return result;
-  }
-
-  public LongStream longs(final long origin, final long bound) {
-    LOGGER.debug("Before longs {}, {}", origin, bound);
-    final LongStream result = random.longs(origin, bound);
-    LOGGER.debug("After longs {}", result);
-    return result;
-  }
-
-  public LongStream longs(final long size) {
-    LOGGER.debug("Before longs {}", size);
-    final LongStream result = random.longs(size);
-    LOGGER.debug("After longs {}", result);
-    return result;
-  }
-
-  public LongStream longs(final long size, final long origin, final long bound) {
-    LOGGER.debug("Before longs {}, {}, {}", size, origin, bound);
-    final LongStream result = random.longs(size, origin, bound);
-    LOGGER.debug("After longs {}", result);
-    return result;
-  }
+    private final Logger LOGGER = LoggerFactory.getLogger(TestThreadLocalRandomSuite.class);
+
+    private final ThreadLocalRandom random;
+
+    public TestThreadLocalRandomSuite(final ThreadLocalRandom random) {
+        this.random = random;
+    }
+
+    public boolean nextBoolean() {
+        LOGGER.debug("Before nextBoolean");
+        final boolean result = random.nextBoolean();
+        LOGGER.debug("After nextBoolean {}", result);
+        return result;
+    }
+
+    public int nextInt() {
+        LOGGER.debug("Before nextInt");
+        final int result = random.nextInt();
+        LOGGER.debug("After nextInt {}", result);
+        return result;
+    }
+
+    public int nextInt(final int i) {
+        LOGGER.debug("Before nextInt {}", i);
+        final int result = random.nextInt(i);
+        LOGGER.debug("After nextInt {}", result);
+        return result;
+    }
+
+    public long nextLong() {
+        LOGGER.debug("Before nextLong");
+        final long result = random.nextLong();
+        LOGGER.debug("After nextLong {}", result);
+        return result;
+    }
+
+    public float nextFloat() {
+        LOGGER.debug("Before nextFloat");
+        final float result = random.nextFloat();
+        LOGGER.debug("After nextFloat {}", result);
+        return result;
+    }
+
+    public double nextDouble() {
+        LOGGER.debug("Before nextDouble");
+        final double result = random.nextDouble();
+        LOGGER.debug("After nextDouble {}", result);
+        return result;
+    }
+
+    public double nextGaussian() {
+        LOGGER.debug("Before nextGaussian");
+        final double result = random.nextGaussian();
+        LOGGER.debug("After nextDouble {}", result);
+        return result;
+    }
+
+    public byte[] nextBytes(final byte[] bytes) {
+        LOGGER.debug("Before nextBytes {}", bytes);
+        random.nextBytes(bytes);
+        LOGGER.debug("After nextBytes");
+        return bytes;
+    }
+
+    public IntStream ints() {
+        LOGGER.debug("Before ints");
+        final IntStream result = random.ints();
+        LOGGER.debug("After ints {}", result);
+        return result;
+    }
+
+    public IntStream ints(final int origin, final int bound) {
+        LOGGER.debug("Before ints {}, {}", origin, bound);
+        final IntStream result = random.ints(origin, bound);
+        LOGGER.debug("After ints {}", result);
+        return result;
+    }
+
+    public IntStream ints(final long size) {
+        LOGGER.debug("Before ints {}", size);
+        final IntStream result = random.ints(size);
+        LOGGER.debug("After ints {}", result);
+        return result;
+    }
+
+    public IntStream ints(final long size, final int origin, final int bound) {
+        LOGGER.debug("Before ints {}, {}, {}", size, origin, bound);
+        final IntStream result = random.ints(size, origin, bound);
+        LOGGER.debug("After ints {}", result);
+        return result;
+    }
+
+    public DoubleStream doubles() {
+        LOGGER.debug("Before doubles");
+        final DoubleStream result = random.doubles();
+        LOGGER.debug("After doubles {}", result);
+        return result;
+    }
+
+    public DoubleStream doubles(final double origin, final double bound) {
+        LOGGER.debug("Before doubles {}, {}", origin, bound);
+        final DoubleStream result = random.doubles(origin, bound);
+        LOGGER.debug("After doubles {}", result);
+        return result;
+    }
+
+    public DoubleStream doubles(final long size) {
+        LOGGER.debug("Before doubles {}", size);
+        final DoubleStream result = random.doubles(size);
+        LOGGER.debug("After doubles {}", result);
+        return result;
+    }
+
+    public DoubleStream doubles(final long size, final double origin, final double bound) {
+        LOGGER.debug("Before doubles {}, {}, {}", size, origin, bound);
+        final DoubleStream result = random.doubles(size, origin, bound);
+        LOGGER.debug("After doubles {}", result);
+        return result;
+    }
+
+    public LongStream longs() {
+        LOGGER.debug("Before longs");
+        final LongStream result = random.longs();
+        LOGGER.debug("After longs {}", result);
+        return result;
+    }
+
+    public LongStream longs(final long origin, final long bound) {
+        LOGGER.debug("Before longs {}, {}", origin, bound);
+        final LongStream result = random.longs(origin, bound);
+        LOGGER.debug("After longs {}", result);
+        return result;
+    }
+
+    public LongStream longs(final long size) {
+        LOGGER.debug("Before longs {}", size);
+        final LongStream result = random.longs(size);
+        LOGGER.debug("After longs {}", result);
+        return result;
+    }
+
+    public LongStream longs(final long size, final long origin, final long bound) {
+        LOGGER.debug("Before longs {}, {}, {}", size, origin, bound);
+        final LongStream result = random.longs(size, origin, bound);
+        LOGGER.debug("After longs {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/javax-naming-1.0/src/main/java/datadog/trace/instrumentation/javax/naming/DirContextCallSite.java b/dd-java-agent/instrumentation/javax-naming-1.0/src/main/java/datadog/trace/instrumentation/javax/naming/DirContextCallSite.java
index d9098e96044..b5d9d88caa5 100644
--- a/dd-java-agent/instrumentation/javax-naming-1.0/src/main/java/datadog/trace/instrumentation/javax/naming/DirContextCallSite.java
+++ b/dd-java-agent/instrumentation/javax-naming-1.0/src/main/java/datadog/trace/instrumentation/javax/naming/DirContextCallSite.java
@@ -16,63 +16,61 @@
 // TODO add javax.naming.ldap.InitialLdapContext
 public class DirContextCallSite {
 
-  @CallSite.Before(
-      "javax.naming.NamingEnumeration javax.naming.directory.DirContext.search(java.lang.String, java.lang.String, javax.naming.directory.SearchControls)")
-  @CallSite.Before(
-      "javax.naming.NamingEnumeration javax.naming.directory.InitialDirContext.search(java.lang.String, java.lang.String, javax.naming.directory.SearchControls)")
-  public static void beforeSearch(
-      @CallSite.Argument @Nullable final String name,
-      @CallSite.Argument @Nonnull final String filter,
-      @CallSite.Argument @Nullable final SearchControls cons) {
-    onDirContextSearch(name, filter, null);
-  }
+    @CallSite.Before(
+            "javax.naming.NamingEnumeration javax.naming.directory.DirContext.search(java.lang.String, java.lang.String, javax.naming.directory.SearchControls)")
+    @CallSite.Before(
+            "javax.naming.NamingEnumeration javax.naming.directory.InitialDirContext.search(java.lang.String, java.lang.String, javax.naming.directory.SearchControls)")
+    public static void beforeSearch(
+            @CallSite.Argument @Nullable final String name,
+            @CallSite.Argument @Nonnull final String filter,
+            @CallSite.Argument @Nullable final SearchControls cons) {
+        onDirContextSearch(name, filter, null);
+    }
 
-  @CallSite.Before(
-      "javax.naming.NamingEnumeration javax.naming.directory.DirContext.search(java.lang.String, java.lang.String, java.lang.Object[], javax.naming.directory.SearchControls)")
-  @CallSite.Before(
-      "javax.naming.NamingEnumeration javax.naming.directory.InitialDirContext.search(java.lang.String, java.lang.String, java.lang.Object[], javax.naming.directory.SearchControls)")
-  public static void beforeSearch(
-      @CallSite.Argument @Nullable final String name,
-      @CallSite.Argument @Nonnull final String filterExpr,
-      @CallSite.Argument @Nullable Object[] filterArgs,
-      @CallSite.Argument @Nullable final SearchControls cons) {
-    onDirContextSearch(name, filterExpr, filterArgs);
-  }
+    @CallSite.Before(
+            "javax.naming.NamingEnumeration javax.naming.directory.DirContext.search(java.lang.String, java.lang.String, java.lang.Object[], javax.naming.directory.SearchControls)")
+    @CallSite.Before(
+            "javax.naming.NamingEnumeration javax.naming.directory.InitialDirContext.search(java.lang.String, java.lang.String, java.lang.Object[], javax.naming.directory.SearchControls)")
+    public static void beforeSearch(
+            @CallSite.Argument @Nullable final String name,
+            @CallSite.Argument @Nonnull final String filterExpr,
+            @CallSite.Argument @Nullable Object[] filterArgs,
+            @CallSite.Argument @Nullable final SearchControls cons) {
+        onDirContextSearch(name, filterExpr, filterArgs);
+    }
 
-  @CallSite.Before(
-      "javax.naming.NamingEnumeration javax.naming.directory.DirContext.search(javax.naming.Name, java.lang.String, javax.naming.directory.SearchControls)")
-  @CallSite.Before(
-      "javax.naming.NamingEnumeration javax.naming.directory.InitialDirContext.search(javax.naming.Name, java.lang.String, javax.naming.directory.SearchControls)")
-  public static void beforeSearch(
-      @CallSite.Argument @Nullable final Name name,
-      @CallSite.Argument @Nonnull final String filter,
-      @CallSite.Argument @Nullable final SearchControls cons) {
-    onDirContextSearch(null, filter, null);
-  }
+    @CallSite.Before(
+            "javax.naming.NamingEnumeration javax.naming.directory.DirContext.search(javax.naming.Name, java.lang.String, javax.naming.directory.SearchControls)")
+    @CallSite.Before(
+            "javax.naming.NamingEnumeration javax.naming.directory.InitialDirContext.search(javax.naming.Name, java.lang.String, javax.naming.directory.SearchControls)")
+    public static void beforeSearch(
+            @CallSite.Argument @Nullable final Name name,
+            @CallSite.Argument @Nonnull final String filter,
+            @CallSite.Argument @Nullable final SearchControls cons) {
+        onDirContextSearch(null, filter, null);
+    }
 
-  @CallSite.Before(
-      "javax.naming.NamingEnumeration javax.naming.directory.DirContext.search(javax.naming.Name, java.lang.String, java.lang.Object[], javax.naming.directory.SearchControls)")
-  @CallSite.Before(
-      "javax.naming.NamingEnumeration javax.naming.directory.InitialDirContext.search(javax.naming.Name, java.lang.String, java.lang.Object[], javax.naming.directory.SearchControls)")
-  public static void beforeSearch(
-      @CallSite.Argument @Nullable final Name name,
-      @CallSite.Argument @Nonnull final String filterExpr,
-      @CallSite.Argument @Nullable Object[] filterArgs,
-      @CallSite.Argument @Nullable final SearchControls cons) {
-    onDirContextSearch(null, filterExpr, filterArgs);
-  }
+    @CallSite.Before(
+            "javax.naming.NamingEnumeration javax.naming.directory.DirContext.search(javax.naming.Name, java.lang.String, java.lang.Object[], javax.naming.directory.SearchControls)")
+    @CallSite.Before(
+            "javax.naming.NamingEnumeration javax.naming.directory.InitialDirContext.search(javax.naming.Name, java.lang.String, java.lang.Object[], javax.naming.directory.SearchControls)")
+    public static void beforeSearch(
+            @CallSite.Argument @Nullable final Name name,
+            @CallSite.Argument @Nonnull final String filterExpr,
+            @CallSite.Argument @Nullable Object[] filterArgs,
+            @CallSite.Argument @Nullable final SearchControls cons) {
+        onDirContextSearch(null, filterExpr, filterArgs);
+    }
 
-  private static void onDirContextSearch(
-      @Nullable final String name,
-      @Nonnull final String filterExpr,
-      @Nullable final Object[] filterArgs) {
-    final LdapInjectionModule module = InstrumentationBridge.LDAP_INJECTION;
-    if (module != null) {
-      try {
-        module.onDirContextSearch(name, filterExpr, filterArgs);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("onDirContextSearch threw", e);
-      }
+    private static void onDirContextSearch(
+            @Nullable final String name, @Nonnull final String filterExpr, @Nullable final Object[] filterArgs) {
+        final LdapInjectionModule module = InstrumentationBridge.LDAP_INJECTION;
+        if (module != null) {
+            try {
+                module.onDirContextSearch(name, filterExpr, filterArgs);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("onDirContextSearch threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/javax-naming-1.0/src/test/java/foo/bar/DirContextSuite.java b/dd-java-agent/instrumentation/javax-naming-1.0/src/test/java/foo/bar/DirContextSuite.java
index 7c8bb83ebc8..0a46abde66f 100644
--- a/dd-java-agent/instrumentation/javax-naming-1.0/src/test/java/foo/bar/DirContextSuite.java
+++ b/dd-java-agent/instrumentation/javax-naming-1.0/src/test/java/foo/bar/DirContextSuite.java
@@ -8,17 +8,17 @@
 
 public interface DirContextSuite {
 
-  NamingEnumeration<SearchResult> search(
-      final String name, final String filter, final SearchControls cons) throws NamingException;
+    NamingEnumeration<SearchResult> search(final String name, final String filter, final SearchControls cons)
+            throws NamingException;
 
-  NamingEnumeration<SearchResult> search(
-      final Name name, final String filter, final SearchControls cons) throws NamingException;
+    NamingEnumeration<SearchResult> search(final Name name, final String filter, final SearchControls cons)
+            throws NamingException;
 
-  NamingEnumeration<SearchResult> search(
-      final String name, final String filter, final Object[] args, final SearchControls cons)
-      throws NamingException;
+    NamingEnumeration<SearchResult> search(
+            final String name, final String filter, final Object[] args, final SearchControls cons)
+            throws NamingException;
 
-  NamingEnumeration<SearchResult> search(
-      final Name name, final String filter, final Object[] args, final SearchControls cons)
-      throws NamingException;
+    NamingEnumeration<SearchResult> search(
+            final Name name, final String filter, final Object[] args, final SearchControls cons)
+            throws NamingException;
 }
diff --git a/dd-java-agent/instrumentation/javax-naming-1.0/src/test/java/foo/bar/TestDirContextSuite.java b/dd-java-agent/instrumentation/javax-naming-1.0/src/test/java/foo/bar/TestDirContextSuite.java
index d52d0ec0220..f1243b4b9bd 100644
--- a/dd-java-agent/instrumentation/javax-naming-1.0/src/test/java/foo/bar/TestDirContextSuite.java
+++ b/dd-java-agent/instrumentation/javax-naming-1.0/src/test/java/foo/bar/TestDirContextSuite.java
@@ -11,49 +11,49 @@
 
 public class TestDirContextSuite implements DirContextSuite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestDirContextSuite.class);
-
-  private final DirContext ctx;
-
-  public TestDirContextSuite(final DirContext ctx) {
-    this.ctx = ctx;
-  }
-
-  @Override
-  public NamingEnumeration<SearchResult> search(
-      final String name, final String filter, final SearchControls cons) throws NamingException {
-    LOGGER.debug("Before DirContext search {} {} {}", name, filter, cons);
-    final NamingEnumeration<SearchResult> result = ctx.search(name, filter, cons);
-    LOGGER.debug("After DirContext search {}", result);
-    return result;
-  }
-
-  @Override
-  public NamingEnumeration<SearchResult> search(
-      final Name name, final String filter, final SearchControls cons) throws NamingException {
-    LOGGER.debug("Before DirContext search {} {} {}", name, filter, cons);
-    final NamingEnumeration<SearchResult> result = ctx.search(name, filter, cons);
-    LOGGER.debug("After DirContext search {}", result);
-    return result;
-  }
-
-  @Override
-  public NamingEnumeration<SearchResult> search(
-      final String name, final String filter, final Object[] args, final SearchControls cons)
-      throws NamingException {
-    LOGGER.debug("Before DirContext search {} {} {} {}", name, filter, args, cons);
-    final NamingEnumeration<SearchResult> result = ctx.search(name, filter, args, cons);
-    LOGGER.debug("After DirContext search {}", result);
-    return result;
-  }
-
-  @Override
-  public NamingEnumeration<SearchResult> search(
-      final Name name, final String filter, final Object[] args, final SearchControls cons)
-      throws NamingException {
-    LOGGER.debug("Before DirContext search {} {} {} {}", name, filter, args, cons);
-    final NamingEnumeration<SearchResult> result = ctx.search(name, filter, args, cons);
-    LOGGER.debug("After DirContext search {}", result);
-    return result;
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestDirContextSuite.class);
+
+    private final DirContext ctx;
+
+    public TestDirContextSuite(final DirContext ctx) {
+        this.ctx = ctx;
+    }
+
+    @Override
+    public NamingEnumeration<SearchResult> search(final String name, final String filter, final SearchControls cons)
+            throws NamingException {
+        LOGGER.debug("Before DirContext search {} {} {}", name, filter, cons);
+        final NamingEnumeration<SearchResult> result = ctx.search(name, filter, cons);
+        LOGGER.debug("After DirContext search {}", result);
+        return result;
+    }
+
+    @Override
+    public NamingEnumeration<SearchResult> search(final Name name, final String filter, final SearchControls cons)
+            throws NamingException {
+        LOGGER.debug("Before DirContext search {} {} {}", name, filter, cons);
+        final NamingEnumeration<SearchResult> result = ctx.search(name, filter, cons);
+        LOGGER.debug("After DirContext search {}", result);
+        return result;
+    }
+
+    @Override
+    public NamingEnumeration<SearchResult> search(
+            final String name, final String filter, final Object[] args, final SearchControls cons)
+            throws NamingException {
+        LOGGER.debug("Before DirContext search {} {} {} {}", name, filter, args, cons);
+        final NamingEnumeration<SearchResult> result = ctx.search(name, filter, args, cons);
+        LOGGER.debug("After DirContext search {}", result);
+        return result;
+    }
+
+    @Override
+    public NamingEnumeration<SearchResult> search(
+            final Name name, final String filter, final Object[] args, final SearchControls cons)
+            throws NamingException {
+        LOGGER.debug("Before DirContext search {} {} {} {}", name, filter, args, cons);
+        final NamingEnumeration<SearchResult> result = ctx.search(name, filter, args, cons);
+        LOGGER.debug("After DirContext search {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/javax-naming-1.0/src/test/java/foo/bar/TestInitialDirContextSuite.java b/dd-java-agent/instrumentation/javax-naming-1.0/src/test/java/foo/bar/TestInitialDirContextSuite.java
index fbef6843e8c..5d7a0784eed 100644
--- a/dd-java-agent/instrumentation/javax-naming-1.0/src/test/java/foo/bar/TestInitialDirContextSuite.java
+++ b/dd-java-agent/instrumentation/javax-naming-1.0/src/test/java/foo/bar/TestInitialDirContextSuite.java
@@ -11,49 +11,49 @@
 
 public class TestInitialDirContextSuite implements DirContextSuite {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestInitialDirContextSuite.class);
-
-  private final InitialDirContext ctx;
-
-  public TestInitialDirContextSuite(final InitialDirContext ctx) {
-    this.ctx = ctx;
-  }
-
-  @Override
-  public NamingEnumeration<SearchResult> search(
-      final String name, final String filter, final SearchControls cons) throws NamingException {
-    LOGGER.debug("Before InitialDirContext search {} {} {}", name, filter, cons);
-    final NamingEnumeration<SearchResult> result = ctx.search(name, filter, cons);
-    LOGGER.debug("After InitialDirContext search {}", result);
-    return result;
-  }
-
-  @Override
-  public NamingEnumeration<SearchResult> search(
-      final Name name, final String filter, final SearchControls cons) throws NamingException {
-    LOGGER.debug("Before InitialDirContext search {} {} {}", name, filter, cons);
-    final NamingEnumeration<SearchResult> result = ctx.search(name, filter, cons);
-    LOGGER.debug("After InitialDirContext search {}", result);
-    return result;
-  }
-
-  @Override
-  public NamingEnumeration<SearchResult> search(
-      final String name, final String filter, final Object[] args, final SearchControls cons)
-      throws NamingException {
-    LOGGER.debug("Before InitialDirContext search {} {} {} {}", name, filter, args, cons);
-    final NamingEnumeration<SearchResult> result = ctx.search(name, filter, args, cons);
-    LOGGER.debug("After InitialDirContext search {}", result);
-    return result;
-  }
-
-  @Override
-  public NamingEnumeration<SearchResult> search(
-      final Name name, final String filter, final Object[] args, final SearchControls cons)
-      throws NamingException {
-    LOGGER.debug("Before InitialDirContext search {} {} {} {}", name, filter, args, cons);
-    final NamingEnumeration<SearchResult> result = ctx.search(name, filter, args, cons);
-    LOGGER.debug("After InitialDirContext search {}", result);
-    return result;
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestInitialDirContextSuite.class);
+
+    private final InitialDirContext ctx;
+
+    public TestInitialDirContextSuite(final InitialDirContext ctx) {
+        this.ctx = ctx;
+    }
+
+    @Override
+    public NamingEnumeration<SearchResult> search(final String name, final String filter, final SearchControls cons)
+            throws NamingException {
+        LOGGER.debug("Before InitialDirContext search {} {} {}", name, filter, cons);
+        final NamingEnumeration<SearchResult> result = ctx.search(name, filter, cons);
+        LOGGER.debug("After InitialDirContext search {}", result);
+        return result;
+    }
+
+    @Override
+    public NamingEnumeration<SearchResult> search(final Name name, final String filter, final SearchControls cons)
+            throws NamingException {
+        LOGGER.debug("Before InitialDirContext search {} {} {}", name, filter, cons);
+        final NamingEnumeration<SearchResult> result = ctx.search(name, filter, cons);
+        LOGGER.debug("After InitialDirContext search {}", result);
+        return result;
+    }
+
+    @Override
+    public NamingEnumeration<SearchResult> search(
+            final String name, final String filter, final Object[] args, final SearchControls cons)
+            throws NamingException {
+        LOGGER.debug("Before InitialDirContext search {} {} {} {}", name, filter, args, cons);
+        final NamingEnumeration<SearchResult> result = ctx.search(name, filter, args, cons);
+        LOGGER.debug("After InitialDirContext search {}", result);
+        return result;
+    }
+
+    @Override
+    public NamingEnumeration<SearchResult> search(
+            final Name name, final String filter, final Object[] args, final SearchControls cons)
+            throws NamingException {
+        LOGGER.debug("Before InitialDirContext search {} {} {} {}", name, filter, args, cons);
+        final NamingEnumeration<SearchResult> result = ctx.search(name, filter, args, cons);
+        LOGGER.debug("After InitialDirContext search {}", result);
+        return result;
+    }
 }
diff --git a/dd-java-agent/instrumentation/javax-xml-1.4/src/main/java/datadog/trace/instrumentation/javax/xml/XPathCallSite.java b/dd-java-agent/instrumentation/javax-xml-1.4/src/main/java/datadog/trace/instrumentation/javax/xml/XPathCallSite.java
index 076b67c17ba..10a0bbd3c91 100644
--- a/dd-java-agent/instrumentation/javax-xml-1.4/src/main/java/datadog/trace/instrumentation/javax/xml/XPathCallSite.java
+++ b/dd-java-agent/instrumentation/javax-xml-1.4/src/main/java/datadog/trace/instrumentation/javax/xml/XPathCallSite.java
@@ -14,54 +14,50 @@
 @CallSite(spi = IastCallSites.class)
 public class XPathCallSite {
 
-  @CallSite.Before(
-      "javax.xml.xpath.XPathExpression javax.xml.xpath.XPath.compile(java.lang.String)")
-  public static void beforeCompile(@CallSite.Argument @Nullable final String expression) {
-    onExpression(expression);
-  }
+    @CallSite.Before("javax.xml.xpath.XPathExpression javax.xml.xpath.XPath.compile(java.lang.String)")
+    public static void beforeCompile(@CallSite.Argument @Nullable final String expression) {
+        onExpression(expression);
+    }
 
-  @CallSite.Before(
-      "java.lang.String javax.xml.xpath.XPath.evaluate(java.lang.String, org.xml.sax.InputSource)")
-  public static void beforeEvaluate(
-      @CallSite.Argument @Nullable final String expression,
-      @CallSite.Argument @Nullable final InputSource source) {
-    onExpression(expression);
-  }
+    @CallSite.Before("java.lang.String javax.xml.xpath.XPath.evaluate(java.lang.String, org.xml.sax.InputSource)")
+    public static void beforeEvaluate(
+            @CallSite.Argument @Nullable final String expression,
+            @CallSite.Argument @Nullable final InputSource source) {
+        onExpression(expression);
+    }
 
-  @CallSite.Before(
-      "java.lang.Object javax.xml.xpath.XPath.evaluate(java.lang.String, org.xml.sax.InputSource, javax.xml.namespace.QName)")
-  public static void beforeEvaluate(
-      @CallSite.Argument @Nullable final String expression,
-      @CallSite.Argument @Nullable final InputSource source,
-      @CallSite.Argument @Nullable final QName returnType) {
-    onExpression(expression);
-  }
+    @CallSite.Before(
+            "java.lang.Object javax.xml.xpath.XPath.evaluate(java.lang.String, org.xml.sax.InputSource, javax.xml.namespace.QName)")
+    public static void beforeEvaluate(
+            @CallSite.Argument @Nullable final String expression,
+            @CallSite.Argument @Nullable final InputSource source,
+            @CallSite.Argument @Nullable final QName returnType) {
+        onExpression(expression);
+    }
 
-  @CallSite.Before(
-      "java.lang.String javax.xml.xpath.XPath.evaluate(java.lang.String, java.lang.Object)")
-  public static void beforeEvaluate(
-      @CallSite.Argument @Nullable final String expression,
-      @CallSite.Argument @Nullable final Object item) {
-    onExpression(expression);
-  }
+    @CallSite.Before("java.lang.String javax.xml.xpath.XPath.evaluate(java.lang.String, java.lang.Object)")
+    public static void beforeEvaluate(
+            @CallSite.Argument @Nullable final String expression, @CallSite.Argument @Nullable final Object item) {
+        onExpression(expression);
+    }
 
-  @CallSite.Before(
-      "java.lang.Object javax.xml.xpath.XPath.evaluate(java.lang.String, java.lang.Object, javax.xml.namespace.QName)")
-  public static void beforeEvaluate(
-      @CallSite.Argument @Nullable final String expression,
-      @CallSite.Argument @Nullable final Object item,
-      @CallSite.Argument @Nullable final QName returnType) {
-    onExpression(expression);
-  }
+    @CallSite.Before(
+            "java.lang.Object javax.xml.xpath.XPath.evaluate(java.lang.String, java.lang.Object, javax.xml.namespace.QName)")
+    public static void beforeEvaluate(
+            @CallSite.Argument @Nullable final String expression,
+            @CallSite.Argument @Nullable final Object item,
+            @CallSite.Argument @Nullable final QName returnType) {
+        onExpression(expression);
+    }
 
-  private static void onExpression(@Nullable final String expression) {
-    final XPathInjectionModule module = InstrumentationBridge.XPATH_INJECTION;
-    if (module != null) {
-      try {
-        module.onExpression(expression);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("onExpression threw", e);
-      }
+    private static void onExpression(@Nullable final String expression) {
+        final XPathInjectionModule module = InstrumentationBridge.XPATH_INJECTION;
+        if (module != null) {
+            try {
+                module.onExpression(expression);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("onExpression threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/javax-xml-1.4/src/test/java/foo/bar/TestXPathSuite.java b/dd-java-agent/instrumentation/javax-xml-1.4/src/test/java/foo/bar/TestXPathSuite.java
index 7b97e7e490b..eb3de23de0c 100644
--- a/dd-java-agent/instrumentation/javax-xml-1.4/src/test/java/foo/bar/TestXPathSuite.java
+++ b/dd-java-agent/instrumentation/javax-xml-1.4/src/test/java/foo/bar/TestXPathSuite.java
@@ -7,32 +7,31 @@
 
 public class TestXPathSuite {
 
-  private final XPath xp;
-
-  public TestXPathSuite(final XPath xp) {
-    this.xp = xp;
-  }
-
-  public void compile(final String expression) throws XPathExpressionException {
-    xp.compile(expression);
-  }
-
-  public void evaluate(final String expression, final InputSource source)
-      throws XPathExpressionException {
-    xp.evaluate(expression, source);
-  }
-
-  public void evaluate(final String expression, final InputSource source, final QName returnType)
-      throws XPathExpressionException {
-    xp.evaluate(expression, source, returnType);
-  }
-
-  public void evaluate(final String expression, final Object item) throws XPathExpressionException {
-    xp.evaluate(expression, item);
-  }
-
-  public void evaluate(final String expression, final Object item, final QName returnType)
-      throws XPathExpressionException {
-    xp.evaluate(expression, item, returnType);
-  }
+    private final XPath xp;
+
+    public TestXPathSuite(final XPath xp) {
+        this.xp = xp;
+    }
+
+    public void compile(final String expression) throws XPathExpressionException {
+        xp.compile(expression);
+    }
+
+    public void evaluate(final String expression, final InputSource source) throws XPathExpressionException {
+        xp.evaluate(expression, source);
+    }
+
+    public void evaluate(final String expression, final InputSource source, final QName returnType)
+            throws XPathExpressionException {
+        xp.evaluate(expression, source, returnType);
+    }
+
+    public void evaluate(final String expression, final Object item) throws XPathExpressionException {
+        xp.evaluate(expression, item);
+    }
+
+    public void evaluate(final String expression, final Object item, final QName returnType)
+            throws XPathExpressionException {
+        xp.evaluate(expression, item, returnType);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/ExtLogRecordInstrumentation.java b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/ExtLogRecordInstrumentation.java
index 982c26a34bd..7dd8ee42451 100644
--- a/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/ExtLogRecordInstrumentation.java
+++ b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/ExtLogRecordInstrumentation.java
@@ -29,143 +29,140 @@
 
 @AutoService(InstrumenterModule.class)
 public class ExtLogRecordInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public ExtLogRecordInstrumentation() {
-    super("jboss-logmanager");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.jboss.logmanager.ExtLogRecord";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("org.jboss.logmanager.ExtLogRecord", AgentSpanContext.class.getName());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("getMdc")).and(takesArgument(0, String.class)),
-        ExtLogRecordInstrumentation.class.getName() + "$GetMdcAdvice");
-
-    transformer.applyAdvice(
-        isMethod().and(named("getMdcCopy")).and(takesArguments(0)),
-        ExtLogRecordInstrumentation.class.getName() + "$GetMdcCopyAdvice");
-  }
-
-  public static class GetMdcAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void getMdcValue(
-        @Advice.This ExtLogRecord record,
-        @Advice.Argument(0) String key,
-        @Advice.Return(readOnly = false) String value) {
-
-      // if the mdc had a value for the key, or the key is null (invalid for a switch)
-      // just return
-      if (value != null || key == null) {
-        return;
-      }
-
-      AgentSpanContext context =
-          InstrumentationContext.get(ExtLogRecord.class, AgentSpanContext.class).get(record);
-
-      // Nothing to add so return early
-      if (context == null && !AgentTracer.traceConfig().isLogsInjectionEnabled()) {
-        return;
-      }
-
-      switch (key) {
-        case Tags.DD_SERVICE:
-          value = Config.get().getServiceName();
-          if (null != value && value.isEmpty()) {
-            value = null;
-          }
-          break;
-        case Tags.DD_ENV:
-          value = Config.get().getEnv();
-          if (null != value && value.isEmpty()) {
-            value = null;
-          }
-          break;
-        case Tags.DD_VERSION:
-          value = Config.get().getVersion();
-          if (null != value && value.isEmpty()) {
-            value = null;
-          }
-          break;
-        case "dd.trace_id":
-          if (context != null) {
-            DDTraceId traceId = context.getTraceId();
-            if (traceId.toHighOrderLong() != 0 && Config.get().isLogs128bitTraceIdEnabled()) {
-              value = traceId.toHexString();
-            } else {
-              value = traceId.toString();
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public ExtLogRecordInstrumentation() {
+        super("jboss-logmanager");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.jboss.logmanager.ExtLogRecord";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.jboss.logmanager.ExtLogRecord", AgentSpanContext.class.getName());
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("getMdc")).and(takesArgument(0, String.class)),
+                ExtLogRecordInstrumentation.class.getName() + "$GetMdcAdvice");
+
+        transformer.applyAdvice(
+                isMethod().and(named("getMdcCopy")).and(takesArguments(0)),
+                ExtLogRecordInstrumentation.class.getName() + "$GetMdcCopyAdvice");
+    }
+
+    public static class GetMdcAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void getMdcValue(
+                @Advice.This ExtLogRecord record,
+                @Advice.Argument(0) String key,
+                @Advice.Return(readOnly = false) String value) {
+
+            // if the mdc had a value for the key, or the key is null (invalid for a switch)
+            // just return
+            if (value != null || key == null) {
+                return;
+            }
+
+            AgentSpanContext context = InstrumentationContext.get(ExtLogRecord.class, AgentSpanContext.class)
+                    .get(record);
+
+            // Nothing to add so return early
+            if (context == null && !AgentTracer.traceConfig().isLogsInjectionEnabled()) {
+                return;
+            }
+
+            switch (key) {
+                case Tags.DD_SERVICE:
+                    value = Config.get().getServiceName();
+                    if (null != value && value.isEmpty()) {
+                        value = null;
+                    }
+                    break;
+                case Tags.DD_ENV:
+                    value = Config.get().getEnv();
+                    if (null != value && value.isEmpty()) {
+                        value = null;
+                    }
+                    break;
+                case Tags.DD_VERSION:
+                    value = Config.get().getVersion();
+                    if (null != value && value.isEmpty()) {
+                        value = null;
+                    }
+                    break;
+                case "dd.trace_id":
+                    if (context != null) {
+                        DDTraceId traceId = context.getTraceId();
+                        if (traceId.toHighOrderLong() != 0 && Config.get().isLogs128bitTraceIdEnabled()) {
+                            value = traceId.toHexString();
+                        } else {
+                            value = traceId.toString();
+                        }
+                    }
+                    break;
+                case "dd.span_id":
+                    if (context != null) {
+                        value = DDSpanId.toString(context.getSpanId());
+                    }
+                    break;
+                default:
             }
-          }
-          break;
-        case "dd.span_id":
-          if (context != null) {
-            value = DDSpanId.toString(context.getSpanId());
-          }
-          break;
-        default:
-      }
+        }
     }
-  }
-
-  public static class GetMdcCopyAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This ExtLogRecord record,
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false)
-            Map<String, String> mdc) {
-
-      if (mdc instanceof UnionMap) {
-        return;
-      }
-
-      AgentSpanContext context =
-          InstrumentationContext.get(ExtLogRecord.class, AgentSpanContext.class).get(record);
-
-      // Nothing to add so return early
-      if (context == null && !AgentTracer.traceConfig().isLogsInjectionEnabled()) {
-        return;
-      }
-
-      Map<String, String> correlationValues = new HashMap<>(8);
-
-      if (context != null) {
-        DDTraceId traceId = context.getTraceId();
-        String traceIdValue =
-            Config.get().isLogs128bitTraceIdEnabled() && traceId.toHighOrderLong() != 0
-                ? traceId.toHexString()
-                : traceId.toString();
-        correlationValues.put(CorrelationIdentifier.getTraceIdKey(), traceIdValue);
-        correlationValues.put(
-            CorrelationIdentifier.getSpanIdKey(), DDSpanId.toString(context.getSpanId()));
-      }
-
-      String serviceName = Config.get().getServiceName();
-      if (null != serviceName && !serviceName.isEmpty()) {
-        correlationValues.put(Tags.DD_SERVICE, serviceName);
-      }
-      String env = Config.get().getEnv();
-      if (null != env && !env.isEmpty()) {
-        correlationValues.put(Tags.DD_ENV, env);
-      }
-      String version = Config.get().getVersion();
-      if (null != version && !version.isEmpty()) {
-        correlationValues.put(Tags.DD_VERSION, version);
-      }
-
-      mdc = null != mdc ? new UnionMap<>(mdc, correlationValues) : correlationValues;
+
+    public static class GetMdcCopyAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This ExtLogRecord record,
+                @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false) Map<String, String> mdc) {
+
+            if (mdc instanceof UnionMap) {
+                return;
+            }
+
+            AgentSpanContext context = InstrumentationContext.get(ExtLogRecord.class, AgentSpanContext.class)
+                    .get(record);
+
+            // Nothing to add so return early
+            if (context == null && !AgentTracer.traceConfig().isLogsInjectionEnabled()) {
+                return;
+            }
+
+            Map<String, String> correlationValues = new HashMap<>(8);
+
+            if (context != null) {
+                DDTraceId traceId = context.getTraceId();
+                String traceIdValue = Config.get().isLogs128bitTraceIdEnabled() && traceId.toHighOrderLong() != 0
+                        ? traceId.toHexString()
+                        : traceId.toString();
+                correlationValues.put(CorrelationIdentifier.getTraceIdKey(), traceIdValue);
+                correlationValues.put(CorrelationIdentifier.getSpanIdKey(), DDSpanId.toString(context.getSpanId()));
+            }
+
+            String serviceName = Config.get().getServiceName();
+            if (null != serviceName && !serviceName.isEmpty()) {
+                correlationValues.put(Tags.DD_SERVICE, serviceName);
+            }
+            String env = Config.get().getEnv();
+            if (null != env && !env.isEmpty()) {
+                correlationValues.put(Tags.DD_ENV, env);
+            }
+            String version = Config.get().getVersion();
+            if (null != version && !version.isEmpty()) {
+                correlationValues.put(Tags.DD_VERSION, version);
+            }
+
+            mdc = null != mdc ? new UnionMap<>(mdc, correlationValues) : correlationValues;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java
index 4e8cc81ef37..d3858078e0f 100644
--- a/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java
+++ b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java
@@ -20,53 +20,51 @@
 
 @AutoService(InstrumenterModule.class)
 public class LoggerNodeInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public LoggerNodeInstrumentation() {
-    super("jboss-logmanager");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public LoggerNodeInstrumentation() {
+        super("jboss-logmanager");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.jboss.logmanager.LoggerNode";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.jboss.logmanager.LoggerNode";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("org.jboss.logmanager.ExtLogRecord", AgentSpanContext.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.jboss.logmanager.ExtLogRecord", AgentSpanContext.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("publish"))
-            .and(takesArgument(0, named("org.jboss.logmanager.ExtLogRecord"))),
-        LoggerNodeInstrumentation.class.getName() + "$AttachContextAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("publish")).and(takesArgument(0, named("org.jboss.logmanager.ExtLogRecord"))),
+                LoggerNodeInstrumentation.class.getName() + "$AttachContextAdvice");
+    }
 
-  public static class AttachContextAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static boolean attachContext(@Advice.Argument(0) ExtLogRecord record) {
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(ExtLogRecord.class);
-      if (callDepth > 0) {
-        return false;
-      }
+    public static class AttachContextAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static boolean attachContext(@Advice.Argument(0) ExtLogRecord record) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(ExtLogRecord.class);
+            if (callDepth > 0) {
+                return false;
+            }
 
-      AgentSpan span = activeSpan();
+            AgentSpan span = activeSpan();
 
-      if (span != null && traceConfig(span).isLogsInjectionEnabled()) {
-        InstrumentationContext.get(ExtLogRecord.class, AgentSpanContext.class)
-            .put(record, span.spanContext());
-      }
+            if (span != null && traceConfig(span).isLogsInjectionEnabled()) {
+                InstrumentationContext.get(ExtLogRecord.class, AgentSpanContext.class)
+                        .put(record, span.spanContext());
+            }
 
-      return true;
-    }
+            return true;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void resetDepth(@Advice.Enter boolean shouldReset) {
-      if (shouldReset) {
-        CallDepthThreadLocalMap.reset(ExtLogRecord.class);
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void resetDepth(@Advice.Enter boolean shouldReset) {
+            if (shouldReset) {
+                CallDepthThreadLocalMap.reset(ExtLogRecord.class);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java
index 3064f508063..2b584501f63 100644
--- a/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java
+++ b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java
@@ -20,144 +20,140 @@
 
 @AutoService(InstrumenterModule.class)
 public final class ModuleInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  private static final String JBOSS_MODULES = "jboss-modules";
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    private static final String JBOSS_MODULES = "jboss-modules";
 
-  public ModuleInstrumentation() {
-    super("classloading", JBOSS_MODULES);
-  }
+    public ModuleInstrumentation() {
+        super("classloading", JBOSS_MODULES);
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.jboss.modules.Module";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.jboss.modules.Module";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("getResource"))
-            .and(takesArguments(1).and(takesArgument(0, String.class))),
-        ModuleInstrumentation.class.getName() + "$WidenGetResourceAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("getResourceAsStream"))
-            .and(takesArguments(1).and(takesArgument(0, String.class))),
-        ModuleInstrumentation.class.getName() + "$WidenGetResourceAsStreamAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("loadModuleClass"))
-            .and(
-                takesArguments(1)
-                    .and(takesArgument(0, String.class))
-                    .or(
-                        takesArguments(2)
-                            .and(takesArgument(0, String.class))
-                            .and(takesArgument(1, boolean.class)))),
-        ModuleInstrumentation.class.getName() + "$WidenLoadClassAdvice");
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureModuleNameAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("getResource")).and(takesArguments(1).and(takesArgument(0, String.class))),
+                ModuleInstrumentation.class.getName() + "$WidenGetResourceAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("getResourceAsStream"))
+                        .and(takesArguments(1).and(takesArgument(0, String.class))),
+                ModuleInstrumentation.class.getName() + "$WidenGetResourceAsStreamAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("loadModuleClass"))
+                        .and(takesArguments(1)
+                                .and(takesArgument(0, String.class))
+                                .or(takesArguments(2)
+                                        .and(takesArgument(0, String.class))
+                                        .and(takesArgument(1, boolean.class)))),
+                ModuleInstrumentation.class.getName() + "$WidenLoadClassAdvice");
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureModuleNameAdvice");
+    }
 
-  /**
-   * Bypass local visibility rules by repeating failed requests from module linked as dependencies.
-   *
-   * <p>We only do this for agent requests that require this additional visibility.
-   */
-  public static class WidenGetResourceAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This final Module module,
-        @Advice.Argument(0) final String name,
-        @Advice.Return(readOnly = false) URL result,
-        @Advice.Thrown(readOnly = false) Throwable error) {
-      if (null == result) {
-        AgentClassLoading requestType = AgentClassLoading.type();
-        if (null != requestType) {
-          requestType.end(); // avoid looping back into our advice
-          try {
-            // widen search by peeking inside module linkage
-            result = ModuleLinkageHelper.getResource(module, name);
-            if (null != result) {
-              error = null; // clear any error from original call
+    /**
+     * Bypass local visibility rules by repeating failed requests from module linked as dependencies.
+     *
+     * <p>We only do this for agent requests that require this additional visibility.
+     */
+    public static class WidenGetResourceAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This final Module module,
+                @Advice.Argument(0) final String name,
+                @Advice.Return(readOnly = false) URL result,
+                @Advice.Thrown(readOnly = false) Throwable error) {
+            if (null == result) {
+                AgentClassLoading requestType = AgentClassLoading.type();
+                if (null != requestType) {
+                    requestType.end(); // avoid looping back into our advice
+                    try {
+                        // widen search by peeking inside module linkage
+                        result = ModuleLinkageHelper.getResource(module, name);
+                        if (null != result) {
+                            error = null; // clear any error from original call
+                        }
+                    } finally {
+                        requestType.begin();
+                    }
+                }
             }
-          } finally {
-            requestType.begin();
-          }
         }
-      }
     }
-  }
 
-  /**
-   * Bypass local visibility rules by repeating failed requests from modules linked as dependencies.
-   *
-   * <p>We only do this for agent requests that require this additional visibility.
-   */
-  public static class WidenGetResourceAsStreamAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This final Module module,
-        @Advice.Argument(0) final String name,
-        @Advice.Return(readOnly = false) InputStream result,
-        @Advice.Thrown(readOnly = false) Throwable error) {
-      if (null == result) {
-        AgentClassLoading requestType = AgentClassLoading.type();
-        if (null != requestType) {
-          requestType.end(); // avoid looping back into our advice
-          try {
-            // widen search by peeking inside module linkage
-            URL resource = ModuleLinkageHelper.getResource(module, name);
-            if (null != resource) {
-              result = resource.openStream();
-              error = null; // clear any error from original call
+    /**
+     * Bypass local visibility rules by repeating failed requests from modules linked as dependencies.
+     *
+     * <p>We only do this for agent requests that require this additional visibility.
+     */
+    public static class WidenGetResourceAsStreamAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This final Module module,
+                @Advice.Argument(0) final String name,
+                @Advice.Return(readOnly = false) InputStream result,
+                @Advice.Thrown(readOnly = false) Throwable error) {
+            if (null == result) {
+                AgentClassLoading requestType = AgentClassLoading.type();
+                if (null != requestType) {
+                    requestType.end(); // avoid looping back into our advice
+                    try {
+                        // widen search by peeking inside module linkage
+                        URL resource = ModuleLinkageHelper.getResource(module, name);
+                        if (null != resource) {
+                            result = resource.openStream();
+                            error = null; // clear any error from original call
+                        }
+                    } catch (IOException e) {
+                        // ignore missing resource
+                    } finally {
+                        requestType.begin();
+                    }
+                }
             }
-          } catch (IOException e) {
-            // ignore missing resource
-          } finally {
-            requestType.begin();
-          }
         }
-      }
     }
-  }
 
-  /**
-   * Bypass local visibility rules by repeating failed requests from modules linked as dependencies.
-   *
-   * <p>We only do this for agent requests that require this additional visibility.
-   */
-  public static class WidenLoadClassAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This final Module module,
-        @Advice.Argument(0) final String name,
-        @Advice.Return(readOnly = false) Class<?> result,
-        @Advice.Thrown(readOnly = false) Throwable error) {
-      if (null == result) {
-        AgentClassLoading requestType = AgentClassLoading.type();
-        if (null != requestType) {
-          requestType.end(); // avoid looping back into our advice
-          try {
-            // widen search by peeking inside module linkage
-            result = ModuleLinkageHelper.loadClass(module, name);
-            if (null != result) {
-              error = null; // clear any error from original call
+    /**
+     * Bypass local visibility rules by repeating failed requests from modules linked as dependencies.
+     *
+     * <p>We only do this for agent requests that require this additional visibility.
+     */
+    public static class WidenLoadClassAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This final Module module,
+                @Advice.Argument(0) final String name,
+                @Advice.Return(readOnly = false) Class<?> result,
+                @Advice.Thrown(readOnly = false) Throwable error) {
+            if (null == result) {
+                AgentClassLoading requestType = AgentClassLoading.type();
+                if (null != requestType) {
+                    requestType.end(); // avoid looping back into our advice
+                    try {
+                        // widen search by peeking inside module linkage
+                        result = ModuleLinkageHelper.loadClass(module, name);
+                        if (null != result) {
+                            error = null; // clear any error from original call
+                        }
+                    } finally {
+                        requestType.begin();
+                    }
+                }
             }
-          } finally {
-            requestType.begin();
-          }
         }
-      }
     }
-  }
 
-  public static class CaptureModuleNameAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterConstruct(@Advice.This final Module module) {
-      final String name = ModuleNameHelper.extractDeploymentName(module.getClassLoader());
-      if (name != null && !name.isEmpty()) {
-        ClassloaderConfigurationOverrides.withPinnedServiceName(module.getClassLoader(), name);
-      }
+    public static class CaptureModuleNameAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterConstruct(@Advice.This final Module module) {
+            final String name = ModuleNameHelper.extractDeploymentName(module.getClassLoader());
+            if (name != null && !name.isEmpty()) {
+                ClassloaderConfigurationOverrides.withPinnedServiceName(module.getClassLoader(), name);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleNameHelper.java b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleNameHelper.java
index bc971a48767..59ac713d47c 100644
--- a/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleNameHelper.java
+++ b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleNameHelper.java
@@ -11,70 +11,67 @@
 import org.slf4j.LoggerFactory;
 
 public class ModuleNameHelper {
-  private ModuleNameHelper() {}
+    private ModuleNameHelper() {}
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ModuleNameHelper.class);
-  private static final MethodHandle MODULE_NAME_GETTER = resolveModuleNameGetter();
+    private static final Logger LOGGER = LoggerFactory.getLogger(ModuleNameHelper.class);
+    private static final MethodHandle MODULE_NAME_GETTER = resolveModuleNameGetter();
 
-  private static MethodHandle resolveModuleNameGetter() {
-    final ClassLoader classLoader = ModuleClassLoader.class.getClassLoader();
-    final MethodHandles methodHandles = new MethodHandles(classLoader);
-    MethodHandle ret = null;
-    MethodHandle getModuleIdentifierHandle = null;
-    try {
-      // before 2.2
-      getModuleIdentifierHandle = methodHandles.method(Module.class, "getIdentifier");
-      if (getModuleIdentifierHandle != null) {
-        // chains the two method handle calls
-        ret =
-            java.lang.invoke.MethodHandles.filterReturnValue(
-                getModuleIdentifierHandle,
-                methodHandles.method(
-                    Class.forName("org.jboss.modules.ModuleIdentifier", false, classLoader),
-                    "getName"));
-      }
-    } catch (Throwable ignored) {
-      // here for caution. It's already caught and logged on MethodHandles
+    private static MethodHandle resolveModuleNameGetter() {
+        final ClassLoader classLoader = ModuleClassLoader.class.getClassLoader();
+        final MethodHandles methodHandles = new MethodHandles(classLoader);
+        MethodHandle ret = null;
+        MethodHandle getModuleIdentifierHandle = null;
+        try {
+            // before 2.2
+            getModuleIdentifierHandle = methodHandles.method(Module.class, "getIdentifier");
+            if (getModuleIdentifierHandle != null) {
+                // chains the two method handle calls
+                ret = java.lang.invoke.MethodHandles.filterReturnValue(
+                        getModuleIdentifierHandle,
+                        methodHandles.method(
+                                Class.forName("org.jboss.modules.ModuleIdentifier", false, classLoader), "getName"));
+            }
+        } catch (Throwable ignored) {
+            // here for caution. It's already caught and logged on MethodHandles
+        }
+        if (ret == null) {
+            // 2.2 onward
+            try {
+                ret = methodHandles.method(Module.class, "getName");
+            } catch (Throwable ignored) {
+            }
+        }
+        if (ret == null) {
+            LOGGER.debug(
+                    "Unable to resolve a method to establish jboss module name. If enabled, jee-split-by-deployment will not work properly");
+        }
+        return ret;
     }
-    if (ret == null) {
-      // 2.2 onward
-      try {
-        ret = methodHandles.method(Module.class, "getName");
-      } catch (Throwable ignored) {
-      }
-    }
-    if (ret == null) {
-      LOGGER.debug(
-          "Unable to resolve a method to establish jboss module name. If enabled, jee-split-by-deployment will not work properly");
-    }
-    return ret;
-  }
 
-  private static final Pattern SUBDEPLOYMENT_MATCH =
-      Pattern.compile("deployment(?>.+\\.ear)?\\.(.+)\\.[j|w]ar");
+    private static final Pattern SUBDEPLOYMENT_MATCH = Pattern.compile("deployment(?>.+\\.ear)?\\.(.+)\\.[j|w]ar");
 
-  static String extractModuleName(Module module) {
-    if (MODULE_NAME_GETTER == null) {
-      return null;
+    static String extractModuleName(Module module) {
+        if (MODULE_NAME_GETTER == null) {
+            return null;
+        }
+        String moduleName = null;
+        try {
+            moduleName = (String) MODULE_NAME_GETTER.invoke(module);
+        } catch (Throwable ignored) {
+        }
+        return moduleName;
     }
-    String moduleName = null;
-    try {
-      moduleName = (String) MODULE_NAME_GETTER.invoke(module);
-    } catch (Throwable ignored) {
-    }
-    return moduleName;
-  }
 
-  public static String extractDeploymentName(@Nonnull final ModuleClassLoader classLoader) {
+    public static String extractDeploymentName(@Nonnull final ModuleClassLoader classLoader) {
 
-    final String moduleName = extractModuleName(classLoader.getModule());
-    if (moduleName == null) {
-      return null;
-    }
-    final Matcher matcher = SUBDEPLOYMENT_MATCH.matcher(moduleName);
-    if (matcher.matches()) {
-      return matcher.group(1);
+        final String moduleName = extractModuleName(classLoader.getModule());
+        if (moduleName == null) {
+            return null;
+        }
+        final Matcher matcher = SUBDEPLOYMENT_MATCH.matcher(moduleName);
+        if (matcher.matches()) {
+            return matcher.group(1);
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/org/jboss/modules/ModuleLinkageHelper.java b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/org/jboss/modules/ModuleLinkageHelper.java
index fa1a43cf823..357158fe8c6 100644
--- a/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/org/jboss/modules/ModuleLinkageHelper.java
+++ b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/org/jboss/modules/ModuleLinkageHelper.java
@@ -13,53 +13,53 @@
  */
 public final class ModuleLinkageHelper {
 
-  /** Delegates the resource request to any modules linked as dependencies. */
-  public static URL getResource(final Module module, final String resourceName) {
-    return searchDirectDependencies(
-        module,
-        // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
-        new Function<Module, URL>() {
-          @Override
-          public URL apply(Module input) {
-            return input.getResource(resourceName);
-          }
-        },
-        new HashSet<>());
-  }
+    /** Delegates the resource request to any modules linked as dependencies. */
+    public static URL getResource(final Module module, final String resourceName) {
+        return searchDirectDependencies(
+                module,
+                // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
+                new Function<Module, URL>() {
+                    @Override
+                    public URL apply(Module input) {
+                        return input.getResource(resourceName);
+                    }
+                },
+                new HashSet<>());
+    }
 
-  /** Delegates the class-load request to any modules linked as dependencies. */
-  public static Class<?> loadClass(final Module module, final String className) {
-    return searchDirectDependencies(
-        module,
-        // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
-        new Function<Module, Class<?>>() {
-          @Override
-          public Class<?> apply(Module input) {
-            return input.loadModuleClass(className, false);
-          }
-        },
-        new HashSet<>());
-  }
+    /** Delegates the class-load request to any modules linked as dependencies. */
+    public static Class<?> loadClass(final Module module, final String className) {
+        return searchDirectDependencies(
+                module,
+                // Uses inner class for predictable name for Instrumenter.Default.helperClassNames()
+                new Function<Module, Class<?>>() {
+                    @Override
+                    public Class<?> apply(Module input) {
+                        return input.loadModuleClass(className, false);
+                    }
+                },
+                new HashSet<>());
+    }
 
-  /** Searches a module's direct (module) dependencies. */
-  private static <T> T searchDirectDependencies(
-      final Module origin, final Function<Module, T> filter, final Set<ModuleIdentifier> visited) {
-    // track which modules we've visited to avoid dependency cycles
-    visited.add(origin.getIdentifier());
-    for (DependencySpec dependency : origin.getDependencies()) {
-      if (dependency instanceof ModuleDependencySpec) {
-        ModuleIdentifier identifier = ((ModuleDependencySpec) dependency).getIdentifier();
-        if (visited.add(identifier)) {
-          Module module = origin.getModuleLoader().findLoadedModuleLocal(identifier);
-          if (null != module) {
-            T result = filter.apply(module);
-            if (null != result) {
-              return result;
+    /** Searches a module's direct (module) dependencies. */
+    private static <T> T searchDirectDependencies(
+            final Module origin, final Function<Module, T> filter, final Set<ModuleIdentifier> visited) {
+        // track which modules we've visited to avoid dependency cycles
+        visited.add(origin.getIdentifier());
+        for (DependencySpec dependency : origin.getDependencies()) {
+            if (dependency instanceof ModuleDependencySpec) {
+                ModuleIdentifier identifier = ((ModuleDependencySpec) dependency).getIdentifier();
+                if (visited.add(identifier)) {
+                    Module module = origin.getModuleLoader().findLoadedModuleLocal(identifier);
+                    if (null != module) {
+                        T result = filter.apply(module);
+                        if (null != result) {
+                            return result;
+                        }
+                    }
+                }
             }
-          }
         }
-      }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/DBMCommentSizingBenchmark.java b/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/DBMCommentSizingBenchmark.java
index f078e5e64d2..cef3d6572f9 100644
--- a/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/DBMCommentSizingBenchmark.java
+++ b/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/DBMCommentSizingBenchmark.java
@@ -31,81 +31,71 @@
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @Fork(
-    value = 3,
-    jvmArgsAppend = {
-      "-Xms512m",
-      "-Xmx512m",
-      "-Ddd.service=orders",
-      "-Ddd.env=prod",
-      "-Ddd.version=1.2.3"
-    })
+        value = 3,
+        jvmArgsAppend = {"-Xms512m", "-Xmx512m", "-Ddd.service=orders", "-Ddd.env=prod", "-Ddd.version=1.2.3"})
 @Warmup(iterations = 3, time = 1)
 @Measurement(iterations = 4, time = 1)
 @Threads(1)
 @State(Scope.Thread)
 public class DBMCommentSizingBenchmark {
-  @Param({"short_service", "short_full", "long_full", "escaped_full"})
-  public String scenario;
+    @Param({"short_service", "short_full", "long_full", "escaped_full"})
+    public String scenario;
 
-  String[] services = new String[32],
-      hosts = new String[32],
-      databases = new String[32],
-      parents = new String[32],
-      queries = new String[32];
-  int index;
+    String[] services = new String[32],
+            hosts = new String[32],
+            databases = new String[32],
+            parents = new String[32],
+            queries = new String[32];
+    int index;
 
-  @Setup
-  public void setup() {
-    for (int i = 0; i < 32; i++) {
-      services[i] = "orders-db-" + i;
-      hosts[i] = "db-" + i + ".internal";
-      databases[i] = "orders_" + i;
-      parents[i] =
-          scenario.equals("short_service")
-              ? null
-              : "00-12345678901234567890123456789012"
-                  + String.format("%02x", i)
-                  + "-98765432109876"
-                  + String.format("%02x", i)
-                  + "-01";
-      if (scenario.equals("long_full")) {
-        services[i] = repeat("service", 80) + i;
-        hosts[i] = repeat("hostname", 30) + i;
-        databases[i] = repeat("database", 60) + i;
-      }
-      if (scenario.equals("escaped_full")) {
-        services[i] = repeat("café 東京 &/", 16) + i;
-        databases[i] = repeat("orders '€'", 16) + i;
-      }
-      queries[i] =
-          "SELECT * FROM orders WHERE customer_id = "
-              + i
-              + (scenario.equals("long_full") ? " /* " + repeat("query padding ", 280) + " */" : "")
-              + ";";
+    @Setup
+    public void setup() {
+        for (int i = 0; i < 32; i++) {
+            services[i] = "orders-db-" + i;
+            hosts[i] = "db-" + i + ".internal";
+            databases[i] = "orders_" + i;
+            parents[i] = scenario.equals("short_service")
+                    ? null
+                    : "00-12345678901234567890123456789012"
+                            + String.format("%02x", i)
+                            + "-98765432109876"
+                            + String.format("%02x", i)
+                            + "-01";
+            if (scenario.equals("long_full")) {
+                services[i] = repeat("service", 80) + i;
+                hosts[i] = repeat("hostname", 30) + i;
+                databases[i] = repeat("database", 60) + i;
+            }
+            if (scenario.equals("escaped_full")) {
+                services[i] = repeat("café 東京 &/", 16) + i;
+                databases[i] = repeat("orders '€'", 16) + i;
+            }
+            queries[i] = "SELECT * FROM orders WHERE customer_id = "
+                    + i
+                    + (scenario.equals("long_full") ? " /* " + repeat("query padding ", 280) + " */" : "")
+                    + ";";
+        }
     }
-  }
 
-  static String repeat(String s, int n) {
-    StringBuilder b = new StringBuilder();
-    for (int i = 0; i < n; i++) b.append(s);
-    return b.toString();
-  }
+    static String repeat(String s, int n) {
+        StringBuilder b = new StringBuilder();
+        for (int i = 0; i < n; i++) b.append(s);
+        return b.toString();
+    }
 
-  int next() {
-    return index++ & 31;
-  }
+    int next() {
+        return index++ & 31;
+    }
 
-  @Benchmark
-  public String buildComment() {
-    int i = next();
-    return SharedDBCommenter.buildComment(
-        services[i], "postgresql", hosts[i], databases[i], parents[i]);
-  }
+    @Benchmark
+    public String buildComment() {
+        int i = next();
+        return SharedDBCommenter.buildComment(services[i], "postgresql", hosts[i], databases[i], parents[i]);
+    }
 
-  @Benchmark
-  public String injectSql() {
-    int i = next();
-    return SQLCommenter.inject(
-        queries[i], services[i], "postgresql", hosts[i], databases[i], parents[i], false);
-  }
+    @Benchmark
+    public String injectSql() {
+        int i = next();
+        return SQLCommenter.inject(queries[i], services[i], "postgresql", hosts[i], databases[i], parents[i], false);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/SQLCommenterDuplicateCommentBenchmark.java b/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/SQLCommenterDuplicateCommentBenchmark.java
index 9c9a8e09a39..dbbfe0dd942 100644
--- a/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/SQLCommenterDuplicateCommentBenchmark.java
+++ b/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/SQLCommenterDuplicateCommentBenchmark.java
@@ -49,29 +49,29 @@
 @Threads(8)
 public class SQLCommenterDuplicateCommentBenchmark {
 
-  // Already-DD-commented SQL (append style, comment at the end). First needle hits at different
-  // depths: ddps first (cheap), traceparent-only (scans 8 before the match).
-  static final String[] SQL = {
-    "SELECT * FROM foo /*ddps='svc',dde='test',dddbs='mydb',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/",
-    "SELECT * FROM bar WHERE id = 42 /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/",
-  };
+    // Already-DD-commented SQL (append style, comment at the end). First needle hits at different
+    // depths: ddps first (cheap), traceparent-only (scans 8 before the match).
+    static final String[] SQL = {
+        "SELECT * FROM foo /*ddps='svc',dde='test',dddbs='mydb',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/",
+        "SELECT * FROM bar WHERE id = 42 /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/",
+    };
 
-  /** Per-thread cursor so threads don't contend on a shared index under {@code @Threads(8)}. */
-  @State(Scope.Thread)
-  public static class Cursor {
-    int index = 0;
+    /** Per-thread cursor so threads don't contend on a shared index under {@code @Threads(8)}. */
+    @State(Scope.Thread)
+    public static class Cursor {
+        int index = 0;
 
-    String next() {
-      int i = index;
-      index = (i + 1) % SQL.length;
-      return SQL[i];
+        String next() {
+            int i = index;
+            index = (i + 1) % SQL.length;
+            return SQL[i];
+        }
     }
-  }
 
-  @Benchmark
-  public boolean alreadyCommented(Cursor cursor) {
-    // dbType=null skips the first-word scan; the DD comment makes inject return early after the
-    // duplicate-comment check -- the path (B) optimizes. Returns the input sql (no new String).
-    return SQLCommenter.inject(cursor.next(), "mydb", null, "h", "n", null, true) != null;
-  }
+    @Benchmark
+    public boolean alreadyCommented(Cursor cursor) {
+        // dbType=null skips the first-word scan; the DD comment makes inject return early after the
+        // duplicate-comment check -- the path (B) optimizes. Returns the input sql (no new String).
+        return SQLCommenter.inject(cursor.next(), "mydb", null, "h", "n", null, true) != null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/SQLCommenterGetFirstWordBenchmark.java b/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/SQLCommenterGetFirstWordBenchmark.java
index 1c556646167..a7d9f932f1f 100644
--- a/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/SQLCommenterGetFirstWordBenchmark.java
+++ b/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/SQLCommenterGetFirstWordBenchmark.java
@@ -53,30 +53,30 @@
 @Threads(8)
 public class SQLCommenterGetFirstWordBenchmark {
 
-  // Representative first-word shapes: plain keywords, a stored-proc brace, a CALL, leading space.
-  static final String[] SQL = {
-    "SELECT * FROM foo WHERE id = 42",
-    "{call dogshelterProc(?, ?)}",
-    "CALL dogshelterProc(?, ?)",
-    "UPDATE accounts SET balance = balance - 100 WHERE id = 42",
-    "  INSERT INTO logs VALUES (?)",
-  };
+    // Representative first-word shapes: plain keywords, a stored-proc brace, a CALL, leading space.
+    static final String[] SQL = {
+        "SELECT * FROM foo WHERE id = 42",
+        "{call dogshelterProc(?, ?)}",
+        "CALL dogshelterProc(?, ?)",
+        "UPDATE accounts SET balance = balance - 100 WHERE id = 42",
+        "  INSERT INTO logs VALUES (?)",
+    };
 
-  /** Per-thread cursor so threads don't contend on a shared index under {@code @Threads(8)}. */
-  @State(Scope.Thread)
-  public static class Cursor {
-    int index = 0;
+    /** Per-thread cursor so threads don't contend on a shared index under {@code @Threads(8)}. */
+    @State(Scope.Thread)
+    public static class Cursor {
+        int index = 0;
 
-    String next() {
-      int i = index;
-      index = (i + 1) % SQL.length;
-      return SQL[i];
+        String next() {
+            int i = index;
+            index = (i + 1) % SQL.length;
+            return SQL[i];
+        }
     }
-  }
 
-  @Benchmark
-  public boolean firstWordCheck(Cursor cursor) {
-    // Mirrors inject(): take the first word, make a boolean decision, discard it.
-    return SQLCommenter.getFirstWord(cursor.next()).startsWith("{");
-  }
+    @Benchmark
+    public boolean firstWordCheck(Cursor cursor) {
+        // Mirrors inject(): take the first word, make a boolean decision, discard it.
+        return SQLCommenter.getFirstWord(cursor.next()).startsWith("{");
+    }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractConnectionInstrumentation.java
index cc95715c6df..0731917d3f7 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractConnectionInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractConnectionInstrumentation.java
@@ -20,40 +20,40 @@
 import net.bytebuddy.asm.Advice;
 
 public abstract class AbstractConnectionInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap, Instrumenter.HasMethodAdvice {
-  public AbstractConnectionInstrumentation(String instrumentationName, String... additionalNames) {
-    super(instrumentationName, additionalNames);
-  }
+        implements Instrumenter.ForBootstrap, Instrumenter.HasMethodAdvice {
+    public AbstractConnectionInstrumentation(String instrumentationName, String... additionalNames) {
+        super(instrumentationName, additionalNames);
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("java.sql.Statement", DBQueryInfo.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("java.sql.Statement", DBQueryInfo.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        nameStartsWith("prepare")
-            .and(takesArgument(0, String.class))
-            // Also include CallableStatement, which is a subtype of PreparedStatement
-            .and(returns(hasInterface(named("java.sql.PreparedStatement")))),
-        AbstractConnectionInstrumentation.class.getName() + "$ConnectionPrepareAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                nameStartsWith("prepare")
+                        .and(takesArgument(0, String.class))
+                        // Also include CallableStatement, which is a subtype of PreparedStatement
+                        .and(returns(hasInterface(named("java.sql.PreparedStatement")))),
+                AbstractConnectionInstrumentation.class.getName() + "$ConnectionPrepareAdvice");
+    }
 
-  public static class ConnectionPrepareAdvice {
+    public static class ConnectionPrepareAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void addDBInfo(
-        @Advice.This Connection connection,
-        @Advice.Argument(0) final String sql,
-        @Advice.Return final PreparedStatement statement) {
-      ContextStore<Statement, DBQueryInfo> contextStore =
-          InstrumentationContext.get(Statement.class, DBQueryInfo.class);
-      if (null == contextStore.get(statement)) {
-        DBQueryInfo info = DBQueryInfo.ofPreparedStatement(sql);
-        contextStore.put(statement, info);
-        logQueryInfoInjection(connection, statement, info);
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void addDBInfo(
+                @Advice.This Connection connection,
+                @Advice.Argument(0) final String sql,
+                @Advice.Return final PreparedStatement statement) {
+            ContextStore<Statement, DBQueryInfo> contextStore =
+                    InstrumentationContext.get(Statement.class, DBQueryInfo.class);
+            if (null == contextStore.get(statement)) {
+                DBQueryInfo info = DBQueryInfo.ofPreparedStatement(sql);
+                contextStore.put(statement, info);
+                logQueryInfoInjection(connection, statement, info);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java
index 5a0391064bf..3996d61a7b2 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java
@@ -32,103 +32,97 @@
 import net.bytebuddy.asm.Advice;
 
 public abstract class AbstractPreparedStatementInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.HasMethodAdvice {
 
-  public AbstractPreparedStatementInstrumentation(
-      String instrumentationName, String... additionalNames) {
-    super(instrumentationName, additionalNames);
-  }
+    public AbstractPreparedStatementInstrumentation(String instrumentationName, String... additionalNames) {
+        super(instrumentationName, additionalNames);
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStore = new HashMap<>(4);
-    contextStore.put("java.sql.Statement", DBQueryInfo.class.getName());
-    contextStore.put("java.sql.Connection", JDBCConnectionContext.class.getName());
-    return contextStore;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStore = new HashMap<>(4);
+        contextStore.put("java.sql.Statement", DBQueryInfo.class.getName());
+        contextStore.put("java.sql.Connection", JDBCConnectionContext.class.getName());
+        return contextStore;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        nameStartsWith("execute").and(takesArguments(0)).and(isPublic()),
-        AbstractPreparedStatementInstrumentation.class.getName() + "$PreparedStatementAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                nameStartsWith("execute").and(takesArguments(0)).and(isPublic()),
+                AbstractPreparedStatementInstrumentation.class.getName() + "$PreparedStatementAdvice");
+    }
 
-  public static class PreparedStatementAdvice {
+    public static class PreparedStatementAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(@Advice.This final Statement statement) {
-      int depth = CallDepthThreadLocalMap.incrementCallDepth(Statement.class);
-      if (depth > 0) {
-        return null;
-      }
-      try {
-        final Connection connection = statement.getConnection();
-        final DBQueryInfo queryInfo =
-            InstrumentationContext.get(Statement.class, DBQueryInfo.class).get(statement);
-        if (null == queryInfo) {
-          logMissingQueryInfo(statement);
-          return null;
-        }
-        final AgentSpan span;
-        final JDBCConnectionContext connectionContext =
-            JDBCDecorator.parseConnectionContext(
-                connection,
-                InstrumentationContext.get(Connection.class, JDBCConnectionContext.class));
-        final DBInfo dbInfo = connectionContext.getDbInfo();
-        final boolean injectTraceContext = DECORATE.shouldInjectTraceContext(dbInfo);
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(@Advice.This final Statement statement) {
+            int depth = CallDepthThreadLocalMap.incrementCallDepth(Statement.class);
+            if (depth > 0) {
+                return null;
+            }
+            try {
+                final Connection connection = statement.getConnection();
+                final DBQueryInfo queryInfo = InstrumentationContext.get(Statement.class, DBQueryInfo.class)
+                        .get(statement);
+                if (null == queryInfo) {
+                    logMissingQueryInfo(statement);
+                    return null;
+                }
+                final AgentSpan span;
+                final JDBCConnectionContext connectionContext = JDBCDecorator.parseConnectionContext(
+                        connection, InstrumentationContext.get(Connection.class, JDBCConnectionContext.class));
+                final DBInfo dbInfo = connectionContext.getDbInfo();
+                final boolean injectTraceContext = DECORATE.shouldInjectTraceContext(dbInfo);
 
-        final String oracleServiceHash =
-            DECORATE.setServiceHashAction(connection, connectionContext);
+                final String oracleServiceHash = DECORATE.setServiceHashAction(connection, connectionContext);
 
-        if (INJECT_COMMENT && injectTraceContext) {
-          if (DECORATE.isSqlServer(dbInfo)) {
-            // The span ID is pre-determined so that we can reference it when setting the context
-            final long spanID = DECORATE.setContextInfo(connection, connectionContext);
-            // we then force that pre-determined span ID for the span covering the actual query
-            span =
-                AgentTracer.get()
-                    .singleSpanBuilder("java-jdbc-prepared_statement", DATABASE_QUERY)
-                    .withSpanId(spanID)
-                    .start();
-            span.setTag(DBM_TRACE_INJECTED, true);
-          } else if (DECORATE.isPostgres(dbInfo) && DBM_TRACE_PREPARED_STATEMENTS) {
-            span = startSpan("java-jdbc-prepared_statement", DATABASE_QUERY);
-            DECORATE.setApplicationName(span, connection);
-          } else if (DECORATE.isOracle(dbInfo)) {
-            span = startSpan("java-jdbc-prepared_statement", DATABASE_QUERY);
-            DECORATE.setAction(span, connection);
-          } else {
-            span = startSpan("java-jdbc-prepared_statement", DATABASE_QUERY);
-          }
-        } else {
-          span = startSpan("java-jdbc-prepared_statement", DATABASE_QUERY);
-        }
-        DECORATE.afterStart(span);
-        DECORATE.onConnection(span, connectionContext);
-        DECORATE.onPreparedStatement(span, queryInfo);
-        DECORATE.withBaseHash(span, dbInfo, oracleServiceHash);
+                if (INJECT_COMMENT && injectTraceContext) {
+                    if (DECORATE.isSqlServer(dbInfo)) {
+                        // The span ID is pre-determined so that we can reference it when setting the context
+                        final long spanID = DECORATE.setContextInfo(connection, connectionContext);
+                        // we then force that pre-determined span ID for the span covering the actual query
+                        span = AgentTracer.get()
+                                .singleSpanBuilder("java-jdbc-prepared_statement", DATABASE_QUERY)
+                                .withSpanId(spanID)
+                                .start();
+                        span.setTag(DBM_TRACE_INJECTED, true);
+                    } else if (DECORATE.isPostgres(dbInfo) && DBM_TRACE_PREPARED_STATEMENTS) {
+                        span = startSpan("java-jdbc-prepared_statement", DATABASE_QUERY);
+                        DECORATE.setApplicationName(span, connection);
+                    } else if (DECORATE.isOracle(dbInfo)) {
+                        span = startSpan("java-jdbc-prepared_statement", DATABASE_QUERY);
+                        DECORATE.setAction(span, connection);
+                    } else {
+                        span = startSpan("java-jdbc-prepared_statement", DATABASE_QUERY);
+                    }
+                } else {
+                    span = startSpan("java-jdbc-prepared_statement", DATABASE_QUERY);
+                }
+                DECORATE.afterStart(span);
+                DECORATE.onConnection(span, connectionContext);
+                DECORATE.onPreparedStatement(span, queryInfo);
+                DECORATE.withBaseHash(span, dbInfo, oracleServiceHash);
 
-        return activateSpan(span);
-      } catch (SQLException e) {
-        logSQLException(e);
-        // if we can't get the connection for any reason
-        return null;
-      }
-    }
+                return activateSpan(span);
+            } catch (SQLException e) {
+                logSQLException(e);
+                // if we can't get the connection for any reason
+                return null;
+            }
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      CallDepthThreadLocalMap.decrementCallDepth(Statement.class);
-      if (scope == null) {
-        return;
-      }
-      AgentSpan span = spanFromScope(scope);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            CallDepthThreadLocalMap.decrementCallDepth(Statement.class);
+            if (scope == null) {
+                return;
+            }
+            AgentSpan span = spanFromScope(scope);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DB2ConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DB2ConnectionInstrumentation.java
index 7fc1086a53f..b99641c9c1f 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DB2ConnectionInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DB2ConnectionInstrumentation.java
@@ -11,18 +11,18 @@
 
 @AutoService(InstrumenterModule.class)
 public class DB2ConnectionInstrumentation extends AbstractConnectionInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public DB2ConnectionInstrumentation() {
-    super("jdbc", "db2");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public DB2ConnectionInstrumentation() {
+        super("jdbc", "db2");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "com.ibm.db2.jcc.DB2Connection";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "com.ibm.db2.jcc.DB2Connection";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DB2PreparedStatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DB2PreparedStatementInstrumentation.java
index 2f4a82b227b..6a9dab00698 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DB2PreparedStatementInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DB2PreparedStatementInstrumentation.java
@@ -11,18 +11,18 @@
 
 @AutoService(InstrumenterModule.class)
 public class DB2PreparedStatementInstrumentation extends AbstractPreparedStatementInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public DB2PreparedStatementInstrumentation() {
-    super("jdbc", "db2");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public DB2PreparedStatementInstrumentation() {
+        super("jdbc", "db2");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "com.ibm.db2.jcc.DB2PreparedStatement";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "com.ibm.db2.jcc.DB2PreparedStatement";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java
index efda9d4add7..6cc0c057f02 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java
@@ -30,127 +30,121 @@
 
 @AutoService(InstrumenterModule.class)
 public class DBMCompatibleConnectionInstrumentation extends AbstractConnectionInstrumentation
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  /** Instrumentation class for connections for Database Monitoring supported DBs * */
-  public DBMCompatibleConnectionInstrumentation() {
-    super("jdbc", "dbm");
-  }
+    /** Instrumentation class for connections for Database Monitoring supported DBs * */
+    public DBMCompatibleConnectionInstrumentation() {
+        super("jdbc", "dbm");
+    }
 
-  // Classes to cover all currently supported
-  // db types for the Database Monitoring product
-  static final String[] CONCRETE_TYPES = {
-    "com.microsoft.sqlserver.jdbc.SQLServerConnection",
-    // jtds (for SQL Server and Sybase)
-    "net.sourceforge.jtds.jdbc.ConnectionJDBC2", // 1.2
-    "net.sourceforge.jtds.jdbc.JtdsConnection", // 1.3
-    // postgresql seems to be complete
-    "org.postgresql.jdbc.PgConnection",
-    "org.postgresql.jdbc1.Connection",
-    "org.postgresql.jdbc1.Jdbc1Connection",
-    "org.postgresql.jdbc2.Connection",
-    "org.postgresql.jdbc2.Jdbc2Connection",
-    "org.postgresql.jdbc3.Jdbc3Connection",
-    "org.postgresql.jdbc3g.Jdbc3gConnection",
-    "org.postgresql.jdbc4.Jdbc4Connection",
-    "postgresql.Connection",
-    // EDB version of postgresql
-    "com.edb.jdbc.PgConnection",
-    // should cover Oracle
-    "oracle.jdbc.driver.PhysicalConnection",
-    // should cover mysql
-    "com.mysql.jdbc.Connection",
-    "com.mysql.jdbc.jdbc1.Connection",
-    "com.mysql.jdbc.jdbc2.Connection",
-    "com.mysql.jdbc.ConnectionImpl",
-    "com.mysql.jdbc.JDBC4Connection",
-    "com.mysql.cj.jdbc.ConnectionImpl",
-    // complete
-    "org.mariadb.jdbc.MySQLConnection",
-    // MariaDB Connector/J v2.x
-    "org.mariadb.jdbc.MariaDbConnection",
-    // MariaDB Connector/J v3.x
-    "org.mariadb.jdbc.Connection",
-    // aws-mysql-jdbc
-    "software.aws.rds.jdbc.mysql.shading.com.mysql.cj.jdbc.ConnectionImpl",
-    // for testing purposes
-    "test.TestConnection"
-  };
+    // Classes to cover all currently supported
+    // db types for the Database Monitoring product
+    static final String[] CONCRETE_TYPES = {
+        "com.microsoft.sqlserver.jdbc.SQLServerConnection",
+        // jtds (for SQL Server and Sybase)
+        "net.sourceforge.jtds.jdbc.ConnectionJDBC2", // 1.2
+        "net.sourceforge.jtds.jdbc.JtdsConnection", // 1.3
+        // postgresql seems to be complete
+        "org.postgresql.jdbc.PgConnection",
+        "org.postgresql.jdbc1.Connection",
+        "org.postgresql.jdbc1.Jdbc1Connection",
+        "org.postgresql.jdbc2.Connection",
+        "org.postgresql.jdbc2.Jdbc2Connection",
+        "org.postgresql.jdbc3.Jdbc3Connection",
+        "org.postgresql.jdbc3g.Jdbc3gConnection",
+        "org.postgresql.jdbc4.Jdbc4Connection",
+        "postgresql.Connection",
+        // EDB version of postgresql
+        "com.edb.jdbc.PgConnection",
+        // should cover Oracle
+        "oracle.jdbc.driver.PhysicalConnection",
+        // should cover mysql
+        "com.mysql.jdbc.Connection",
+        "com.mysql.jdbc.jdbc1.Connection",
+        "com.mysql.jdbc.jdbc2.Connection",
+        "com.mysql.jdbc.ConnectionImpl",
+        "com.mysql.jdbc.JDBC4Connection",
+        "com.mysql.cj.jdbc.ConnectionImpl",
+        // complete
+        "org.mariadb.jdbc.MySQLConnection",
+        // MariaDB Connector/J v2.x
+        "org.mariadb.jdbc.MariaDbConnection",
+        // MariaDB Connector/J v3.x
+        "org.mariadb.jdbc.Connection",
+        // aws-mysql-jdbc
+        "software.aws.rds.jdbc.mysql.shading.com.mysql.cj.jdbc.ConnectionImpl",
+        // for testing purposes
+        "test.TestConnection"
+    };
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return CONCRETE_TYPES;
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return CONCRETE_TYPES;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        nameStartsWith("prepare")
-            .and(takesArgument(0, String.class))
-            // Also include CallableStatement, which is a subtype of PreparedStatement
-            .and(returns(hasInterface(named("java.sql.PreparedStatement")))),
-        DBMCompatibleConnectionInstrumentation.class.getName() + "$ConnectionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                nameStartsWith("prepare")
+                        .and(takesArgument(0, String.class))
+                        // Also include CallableStatement, which is a subtype of PreparedStatement
+                        .and(returns(hasInterface(named("java.sql.PreparedStatement")))),
+                DBMCompatibleConnectionInstrumentation.class.getName() + "$ConnectionAdvice");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStore = new HashMap<>(4);
-    contextStore.put("java.sql.Statement", DBQueryInfo.class.getName());
-    contextStore.put("java.sql.Connection", JDBCConnectionContext.class.getName());
-    return contextStore;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStore = new HashMap<>(4);
+        contextStore.put("java.sql.Statement", DBQueryInfo.class.getName());
+        contextStore.put("java.sql.Connection", JDBCConnectionContext.class.getName());
+        return contextStore;
+    }
 
-  public static class ConnectionAdvice {
+    public static class ConnectionAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static String onEnter(
-        @Advice.This Connection connection,
-        @Advice.Argument(value = 0, readOnly = false) String sql) {
-      if (!INJECT_COMMENT) {
-        return sql;
-      }
-      if (CallDepthThreadLocalMap.incrementCallDepth(Connection.class) > 0) {
-        return null;
-      }
-      final String inputSql = sql;
-      final AgentSpan activeSpan = activeSpan();
-      final DBInfo dbInfo =
-          JDBCDecorator.parseConnectionContext(
-                  connection,
-                  InstrumentationContext.get(Connection.class, JDBCConnectionContext.class))
-              .getDbInfo();
-      if (!DECORATE.shouldInjectSqlComment(dbInfo)) {
-        return inputSql;
-      }
-      String dbService = DECORATE.getDbService(dbInfo);
-      if (dbService != null) {
-        dbService = traceConfig(activeSpan).getServiceMapping().getOrDefault(dbService, dbService);
-      }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static String onEnter(
+                @Advice.This Connection connection, @Advice.Argument(value = 0, readOnly = false) String sql) {
+            if (!INJECT_COMMENT) {
+                return sql;
+            }
+            if (CallDepthThreadLocalMap.incrementCallDepth(Connection.class) > 0) {
+                return null;
+            }
+            final String inputSql = sql;
+            final AgentSpan activeSpan = activeSpan();
+            final DBInfo dbInfo = JDBCDecorator.parseConnectionContext(
+                            connection, InstrumentationContext.get(Connection.class, JDBCConnectionContext.class))
+                    .getDbInfo();
+            if (!DECORATE.shouldInjectSqlComment(dbInfo)) {
+                return inputSql;
+            }
+            String dbService = DECORATE.getDbService(dbInfo);
+            if (dbService != null) {
+                dbService = traceConfig(activeSpan).getServiceMapping().getOrDefault(dbService, dbService);
+            }
 
-      boolean append =
-          DECORATE.DBM_ALWAYS_APPEND_SQL_COMMENT || "sqlserver".equals(dbInfo.getType());
-      sql =
-          SQLCommenter.inject(
-              sql, dbService, dbInfo.getType(), dbInfo.getHost(), dbInfo.getDb(), null, append);
-      return inputSql;
-    }
+            boolean append = DECORATE.DBM_ALWAYS_APPEND_SQL_COMMENT || "sqlserver".equals(dbInfo.getType());
+            sql = SQLCommenter.inject(sql, dbService, dbInfo.getType(), dbInfo.getHost(), dbInfo.getDb(), null, append);
+            return inputSql;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void addDBInfo(
-        @Advice.This Connection connection,
-        @Advice.Enter final String inputSql,
-        @Advice.Return final PreparedStatement statement) {
-      if (null == inputSql) {
-        return;
-      }
-      ContextStore<Statement, DBQueryInfo> contextStore =
-          InstrumentationContext.get(Statement.class, DBQueryInfo.class);
-      if (null != statement && null == contextStore.get(statement)) {
-        DBQueryInfo info = DBQueryInfo.ofPreparedStatement(inputSql);
-        contextStore.put(statement, info);
-        logQueryInfoInjection(connection, statement, info);
-      }
-      CallDepthThreadLocalMap.reset(Connection.class);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void addDBInfo(
+                @Advice.This Connection connection,
+                @Advice.Enter final String inputSql,
+                @Advice.Return final PreparedStatement statement) {
+            if (null == inputSql) {
+                return;
+            }
+            ContextStore<Statement, DBQueryInfo> contextStore =
+                    InstrumentationContext.get(Statement.class, DBQueryInfo.class);
+            if (null != statement && null == contextStore.get(statement)) {
+                DBQueryInfo info = DBQueryInfo.ofPreparedStatement(inputSql);
+                contextStore.put(statement, info);
+                logQueryInfoInjection(connection, statement, info);
+            }
+            CallDepthThreadLocalMap.reset(Connection.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceDecorator.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceDecorator.java
index bdfdd77b0c8..0c62f11dbde 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceDecorator.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceDecorator.java
@@ -4,25 +4,23 @@
 import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;
 
 public class DataSourceDecorator extends BaseDecorator {
-  public static final CharSequence DATABASE_CONNECTION =
-      UTF8BytesString.create("database.connection");
-  public static final CharSequence JAVA_JDBC_CONNECTION =
-      UTF8BytesString.create("java-jdbc-connection");
+    public static final CharSequence DATABASE_CONNECTION = UTF8BytesString.create("database.connection");
+    public static final CharSequence JAVA_JDBC_CONNECTION = UTF8BytesString.create("java-jdbc-connection");
 
-  public static final DataSourceDecorator DECORATE = new DataSourceDecorator();
+    public static final DataSourceDecorator DECORATE = new DataSourceDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jdbc-datasource"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jdbc-datasource"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return JAVA_JDBC_CONNECTION;
-  }
+    @Override
+    protected CharSequence component() {
+        return JAVA_JDBC_CONNECTION;
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java
index 43da1f03aa3..74ac86de7dd 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java
@@ -22,61 +22,58 @@
 
 @AutoService(InstrumenterModule.class)
 public final class DataSourceInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
-  public DataSourceInstrumentation() {
-    super("jdbc-datasource");
-  }
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public DataSourceInstrumentation() {
+        super("jdbc-datasource");
+    }
 
-  @Override
-  public boolean defaultEnabled() {
-    return false;
-  }
+    @Override
+    public boolean defaultEnabled() {
+        return false;
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named("javax.sql.DataSource"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named("javax.sql.DataSource"));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getConnection"), DataSourceInstrumentation.class.getName() + "$GetConnectionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getConnection"), DataSourceInstrumentation.class.getName() + "$GetConnectionAdvice");
+    }
 
-  public static class GetConnectionAdvice {
+    public static class GetConnectionAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope start(@Advice.This final DataSource ds) {
-      if (activeSpan() == null) {
-        // Don't want to generate a new top-level span
-        return null;
-      }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope start(@Advice.This final DataSource ds) {
+            if (activeSpan() == null) {
+                // Don't want to generate a new top-level span
+                return null;
+            }
 
-      final AgentSpan span = startSpan(JAVA_JDBC_CONNECTION.toString(), DATABASE_CONNECTION);
-      DECORATE.afterStart(span);
+            final AgentSpan span = startSpan(JAVA_JDBC_CONNECTION.toString(), DATABASE_CONNECTION);
+            DECORATE.afterStart(span);
 
-      span.setResourceName(DECORATE.spanNameForMethod(ds.getClass(), "getConnection"));
+            span.setResourceName(DECORATE.spanNameForMethod(ds.getClass(), "getConnection"));
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      DECORATE.onError(scope, throwable);
-      DECORATE.beforeFinish(scope);
-      scope.close();
-      spanFromScope(scope).finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            DECORATE.onError(scope, throwable);
+            DECORATE.beforeFinish(scope);
+            scope.close();
+            spanFromScope(scope).finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java
index 79f2ccd05a5..5211935f7e4 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java
@@ -17,52 +17,51 @@
 
 @AutoService(InstrumenterModule.class)
 public final class Dbcp2LinkedBlockingDequeInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public Dbcp2LinkedBlockingDequeInstrumentation() {
-    super("jdbc", "dbcp2");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
-  }
+    public Dbcp2LinkedBlockingDequeInstrumentation() {
+        super("jdbc", "dbcp2");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.apache.commons.pool2.impl.LinkedBlockingDeque", // standalone
-      "org.apache.tomcat.dbcp.pool2.impl.LinkedBlockingDeque" // bundled with Tomcat
-    };
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("pollFirst").and(takesArguments(1)),
-        Dbcp2LinkedBlockingDequeInstrumentation.class.getName() + "$PollFirstAdvice");
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.apache.commons.pool2.impl.LinkedBlockingDeque", // standalone
+            "org.apache.tomcat.dbcp.pool2.impl.LinkedBlockingDeque" // bundled with Tomcat
+        };
+    }
 
-  public static class PollFirstAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static AgentSpan onEnter() {
-      if (CallDepthThreadLocalMap.getCallDepth(PoolWaitingDecorator.class) > 0) {
-        AgentSpan span = startSpan(JAVA_JDBC_POOL_WAITING.toString(), POOL_WAITING);
-        DECORATE.afterStart(span);
-        span.setResourceName("dbcp2.waiting");
-        return span;
-      } else {
-        return null;
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("pollFirst").and(takesArguments(1)),
+                Dbcp2LinkedBlockingDequeInstrumentation.class.getName() + "$PollFirstAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Enter final AgentSpan span, @Advice.Thrown final Throwable throwable) {
-      if (span != null) {
-        DECORATE.onError(span, throwable);
-        span.finish();
-      }
+    public static class PollFirstAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static AgentSpan onEnter() {
+            if (CallDepthThreadLocalMap.getCallDepth(PoolWaitingDecorator.class) > 0) {
+                AgentSpan span = startSpan(JAVA_JDBC_POOL_WAITING.toString(), POOL_WAITING);
+                DECORATE.afterStart(span);
+                span.setResourceName("dbcp2.waiting");
+                return span;
+            } else {
+                return null;
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(@Advice.Enter final AgentSpan span, @Advice.Thrown final Throwable throwable) {
+            if (span != null) {
+                DECORATE.onError(span, throwable);
+                span.finish();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2ManagedConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2ManagedConnectionInstrumentation.java
index ba3941fa6d2..73a9349f0c5 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2ManagedConnectionInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2ManagedConnectionInstrumentation.java
@@ -11,41 +11,41 @@
 
 @AutoService(InstrumenterModule.class)
 public final class Dbcp2ManagedConnectionInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-
-  public Dbcp2ManagedConnectionInstrumentation() {
-    super("jdbc", "dbcp2");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.apache.commons.dbcp2.managed.ManagedConnection", // standalone
-      "org.apache.tomcat.dbcp.dbcp2.managed.ManagedConnection" // bundled with Tomcat
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("updateTransactionStatus"),
-        Dbcp2ManagedConnectionInstrumentation.class.getName() + "$UpdateTransactionStatusAdvice");
-  }
-
-  public static class UpdateTransactionStatusAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter() {
-      CallDepthThreadLocalMap.incrementCallDepth(PoolWaitingDecorator.class);
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+
+    public Dbcp2ManagedConnectionInstrumentation() {
+        super("jdbc", "dbcp2");
+    }
+
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.apache.commons.dbcp2.managed.ManagedConnection", // standalone
+            "org.apache.tomcat.dbcp.dbcp2.managed.ManagedConnection" // bundled with Tomcat
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("updateTransactionStatus"),
+                Dbcp2ManagedConnectionInstrumentation.class.getName() + "$UpdateTransactionStatusAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit() {
-      CallDepthThreadLocalMap.decrementCallDepth(PoolWaitingDecorator.class);
+    public static class UpdateTransactionStatusAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter() {
+            CallDepthThreadLocalMap.incrementCallDepth(PoolWaitingDecorator.class);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit() {
+            CallDepthThreadLocalMap.decrementCallDepth(PoolWaitingDecorator.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PerUserPoolDataSourceInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PerUserPoolDataSourceInstrumentation.java
index 303336c68bc..1660bb04359 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PerUserPoolDataSourceInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PerUserPoolDataSourceInstrumentation.java
@@ -11,42 +11,41 @@
 
 @AutoService(InstrumenterModule.class)
 public final class Dbcp2PerUserPoolDataSourceInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-
-  public Dbcp2PerUserPoolDataSourceInstrumentation() {
-    super("jdbc", "dbcp2");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.apache.commons.dbcp2.datasources.PerUserPoolDataSource", // standalone
-      "org.apache.tomcat.dbcp.dbcp2.datasources.PerUserPoolDataSource" // bundled with Tomcat
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getPooledConnectionAndInfo"),
-        Dbcp2PerUserPoolDataSourceInstrumentation.class.getName()
-            + "$GetPooledConnectionAndInfoAdvice");
-  }
-
-  public static class GetPooledConnectionAndInfoAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter() {
-      CallDepthThreadLocalMap.incrementCallDepth(PoolWaitingDecorator.class);
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+
+    public Dbcp2PerUserPoolDataSourceInstrumentation() {
+        super("jdbc", "dbcp2");
+    }
+
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.apache.commons.dbcp2.datasources.PerUserPoolDataSource", // standalone
+            "org.apache.tomcat.dbcp.dbcp2.datasources.PerUserPoolDataSource" // bundled with Tomcat
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getPooledConnectionAndInfo"),
+                Dbcp2PerUserPoolDataSourceInstrumentation.class.getName() + "$GetPooledConnectionAndInfoAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit() {
-      CallDepthThreadLocalMap.decrementCallDepth(PoolWaitingDecorator.class);
+    public static class GetPooledConnectionAndInfoAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter() {
+            CallDepthThreadLocalMap.incrementCallDepth(PoolWaitingDecorator.class);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit() {
+            CallDepthThreadLocalMap.decrementCallDepth(PoolWaitingDecorator.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDataSourceInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDataSourceInstrumentation.java
index 53a929ff0b0..d37abe27b0f 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDataSourceInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDataSourceInstrumentation.java
@@ -11,41 +11,40 @@
 
 @AutoService(InstrumenterModule.class)
 public final class Dbcp2PoolingDataSourceInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-
-  public Dbcp2PoolingDataSourceInstrumentation() {
-    super("jdbc", "dbcp2");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.apache.commons.dbcp2.PoolingDataSource", // standalone
-      "org.apache.tomcat.dbcp.dbcp2.PoolingDataSource" // bundled with Tomcat
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getConnection"),
-        Dbcp2PoolingDataSourceInstrumentation.class.getName() + "$GetConnectionAdvice");
-  }
-
-  public static class GetConnectionAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter() {
-      CallDepthThreadLocalMap.incrementCallDepth(PoolWaitingDecorator.class);
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+
+    public Dbcp2PoolingDataSourceInstrumentation() {
+        super("jdbc", "dbcp2");
+    }
+
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.apache.commons.dbcp2.PoolingDataSource", // standalone
+            "org.apache.tomcat.dbcp.dbcp2.PoolingDataSource" // bundled with Tomcat
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getConnection"), Dbcp2PoolingDataSourceInstrumentation.class.getName() + "$GetConnectionAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit() {
-      CallDepthThreadLocalMap.decrementCallDepth(PoolWaitingDecorator.class);
+    public static class GetConnectionAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter() {
+            CallDepthThreadLocalMap.incrementCallDepth(PoolWaitingDecorator.class);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit() {
+            CallDepthThreadLocalMap.decrementCallDepth(PoolWaitingDecorator.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDriverInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDriverInstrumentation.java
index f74fa678570..a17032db1c2 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDriverInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDriverInstrumentation.java
@@ -11,40 +11,39 @@
 
 @AutoService(InstrumenterModule.class)
 public final class Dbcp2PoolingDriverInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-
-  public Dbcp2PoolingDriverInstrumentation() {
-    super("jdbc", "dbcp2");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.apache.commons.dbcp2.PoolingDriver", // standalone
-      "org.apache.tomcat.dbcp.dbcp2.PoolingDriver" // bundled with Tomcat
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("connect"), Dbcp2PoolingDriverInstrumentation.class.getName() + "$ConnectAdvice");
-  }
-
-  public static class ConnectAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter() {
-      CallDepthThreadLocalMap.incrementCallDepth(PoolWaitingDecorator.class);
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+
+    public Dbcp2PoolingDriverInstrumentation() {
+        super("jdbc", "dbcp2");
+    }
+
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.apache.commons.dbcp2.PoolingDriver", // standalone
+            "org.apache.tomcat.dbcp.dbcp2.PoolingDriver" // bundled with Tomcat
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("connect"), Dbcp2PoolingDriverInstrumentation.class.getName() + "$ConnectAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit() {
-      CallDepthThreadLocalMap.decrementCallDepth(PoolWaitingDecorator.class);
+    public static class ConnectAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter() {
+            CallDepthThreadLocalMap.incrementCallDepth(PoolWaitingDecorator.class);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit() {
+            CallDepthThreadLocalMap.decrementCallDepth(PoolWaitingDecorator.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2SharedPoolDataSourceInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2SharedPoolDataSourceInstrumentation.java
index 15dc8a0dbae..f5370a91654 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2SharedPoolDataSourceInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2SharedPoolDataSourceInstrumentation.java
@@ -11,42 +11,41 @@
 
 @AutoService(InstrumenterModule.class)
 public final class Dbcp2SharedPoolDataSourceInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-
-  public Dbcp2SharedPoolDataSourceInstrumentation() {
-    super("jdbc", "dbcp2");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.apache.commons.dbcp2.datasources.SharePoolDataSource", // standalone
-      "org.apache.tomcat.dbcp.dbcp2.datasources.SharedPoolPoolDataSource" // bundled with Tomcat
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getPooledConnectionAndInfo"),
-        Dbcp2SharedPoolDataSourceInstrumentation.class.getName()
-            + "$GetPooledConnectionAndInfoAdvice");
-  }
-
-  public static class GetPooledConnectionAndInfoAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter() {
-      CallDepthThreadLocalMap.incrementCallDepth(PoolWaitingDecorator.class);
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+
+    public Dbcp2SharedPoolDataSourceInstrumentation() {
+        super("jdbc", "dbcp2");
+    }
+
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.apache.commons.dbcp2.datasources.SharePoolDataSource", // standalone
+            "org.apache.tomcat.dbcp.dbcp2.datasources.SharedPoolPoolDataSource" // bundled with Tomcat
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getPooledConnectionAndInfo"),
+                Dbcp2SharedPoolDataSourceInstrumentation.class.getName() + "$GetPooledConnectionAndInfoAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit() {
-      CallDepthThreadLocalMap.decrementCallDepth(PoolWaitingDecorator.class);
+    public static class GetPooledConnectionAndInfoAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter() {
+            CallDepthThreadLocalMap.incrementCallDepth(PoolWaitingDecorator.class);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit() {
+            CallDepthThreadLocalMap.decrementCallDepth(PoolWaitingDecorator.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DefaultConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DefaultConnectionInstrumentation.java
index f72b86a0539..0921f9df38e 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DefaultConnectionInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DefaultConnectionInstrumentation.java
@@ -7,63 +7,61 @@
 
 @AutoService(InstrumenterModule.class)
 public class DefaultConnectionInstrumentation extends AbstractConnectionInstrumentation
-    implements Instrumenter.ForKnownTypes,
-        Instrumenter.ForConfiguredType,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.ForConfiguredType, Instrumenter.HasMethodAdvice {
 
-  static final String[] CONCRETE_TYPES = {
-    // redshift
-    "com.amazon.redshift.jdbc.RedshiftConnectionImpl",
-    // jt400
-    "com.ibm.as400.access.AS400JDBCConnection",
-    // should cover derby
-    "org.apache.derby.impl.jdbc.EmbedConnection",
-    "org.apache.hive.jdbc.HiveConnection",
-    "org.apache.phoenix.jdbc.PhoenixConnection",
-    "org.apache.pinot.client.PinotConnection",
-    // complete
-    "org.h2.jdbc.JdbcConnection",
-    // GridGain's fork of H2
-    "org.gridgain.internal.h2.jdbc.JdbcConnection",
-    // complete
-    "org.hsqldb.jdbc.JDBCConnection",
-    "org.hsqldb.jdbc.jdbcConnection",
-    // sqlite seems to be complete
-    "org.sqlite.Conn",
-    "org.sqlite.jdbc3.JDBC3Connection",
-    "org.sqlite.jdbc4.JDBC4Connection",
-    // covers snowflake
-    "net.snowflake.client.jdbc.SnowflakeConnectionV1",
-    // vertica
-    "com.vertica.jdbc.common.SConnection",
-    // this covers apache calcite/drill plus the drill-all uber-jar
-    "org.apache.calcite.avatica.AvaticaConnection",
-    "oadd.org.apache.calcite.avatica.AvaticaConnection",
-    // SAP HANA in-memory DB
-    "com.sap.db.jdbc.ConnectionSapDB",
-    // IBM Informix
-    "com.informix.jdbc.IfmxConnection",
-    // Intersystems IRIS
-    "com.intersystems.jdbc.IRISConnection",
-    // Sybase
-    "com.sybase.jdbc2.jdbc.SybConnection",
-    "com.sybase.jdbc4.jdbc.SybConnection",
-    // for testing purposes
-    "test.TestConnection"
-  };
+    static final String[] CONCRETE_TYPES = {
+        // redshift
+        "com.amazon.redshift.jdbc.RedshiftConnectionImpl",
+        // jt400
+        "com.ibm.as400.access.AS400JDBCConnection",
+        // should cover derby
+        "org.apache.derby.impl.jdbc.EmbedConnection",
+        "org.apache.hive.jdbc.HiveConnection",
+        "org.apache.phoenix.jdbc.PhoenixConnection",
+        "org.apache.pinot.client.PinotConnection",
+        // complete
+        "org.h2.jdbc.JdbcConnection",
+        // GridGain's fork of H2
+        "org.gridgain.internal.h2.jdbc.JdbcConnection",
+        // complete
+        "org.hsqldb.jdbc.JDBCConnection",
+        "org.hsqldb.jdbc.jdbcConnection",
+        // sqlite seems to be complete
+        "org.sqlite.Conn",
+        "org.sqlite.jdbc3.JDBC3Connection",
+        "org.sqlite.jdbc4.JDBC4Connection",
+        // covers snowflake
+        "net.snowflake.client.jdbc.SnowflakeConnectionV1",
+        // vertica
+        "com.vertica.jdbc.common.SConnection",
+        // this covers apache calcite/drill plus the drill-all uber-jar
+        "org.apache.calcite.avatica.AvaticaConnection",
+        "oadd.org.apache.calcite.avatica.AvaticaConnection",
+        // SAP HANA in-memory DB
+        "com.sap.db.jdbc.ConnectionSapDB",
+        // IBM Informix
+        "com.informix.jdbc.IfmxConnection",
+        // Intersystems IRIS
+        "com.intersystems.jdbc.IRISConnection",
+        // Sybase
+        "com.sybase.jdbc2.jdbc.SybConnection",
+        "com.sybase.jdbc4.jdbc.SybConnection",
+        // for testing purposes
+        "test.TestConnection"
+    };
 
-  @Override
-  public String configuredMatchingType() {
-    // this won't match any class unless the property is set
-    return InstrumenterConfig.get().getJdbcConnectionClassName();
-  }
+    @Override
+    public String configuredMatchingType() {
+        // this won't match any class unless the property is set
+        return InstrumenterConfig.get().getJdbcConnectionClassName();
+    }
 
-  public DefaultConnectionInstrumentation() {
-    super("jdbc");
-  }
+    public DefaultConnectionInstrumentation() {
+        super("jdbc");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return CONCRETE_TYPES;
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return CONCRETE_TYPES;
+    }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java
index e499fdc7a8b..5b64ac1a9bb 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java
@@ -24,92 +24,89 @@
 
 @AutoService(InstrumenterModule.class)
 public final class DriverInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public DriverInstrumentation() {
-    super("jdbc");
-  }
+    public DriverInstrumentation() {
+        super("jdbc");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named("java.sql.Driver"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named("java.sql.Driver"));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("java.sql.Connection", JDBCConnectionContext.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("java.sql.Connection", JDBCConnectionContext.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        nameStartsWith("connect")
-            .and(takesArgument(0, String.class))
-            .and(takesArgument(1, Properties.class))
-            .and(returns(named("java.sql.Connection"))),
-        DriverInstrumentation.class.getName() + "$DriverAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                nameStartsWith("connect")
+                        .and(takesArgument(0, String.class))
+                        .and(takesArgument(1, Properties.class))
+                        .and(returns(named("java.sql.Connection"))),
+                DriverInstrumentation.class.getName() + "$DriverAdvice");
+    }
 
-  public static class DriverAdvice {
+    public static class DriverAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void addDBInfo(
-        @Advice.Argument(0) final String url,
-        @Advice.Argument(1) final Properties props,
-        @Advice.Return final Connection connection) {
-      if (connection == null) {
-        // Exception was probably thrown.
-        return;
-      }
-      String connectionUrl = url;
-      Properties connectionProps = props;
-      if (JDBCDecorator.FETCH_DB_METADATA_ON_CONNECT
-          && (null == props
-              || !Boolean.parseBoolean(
-                  props.getProperty("oracle.jdbc.useShardingDriverConnection")))) {
-        try {
-          DatabaseMetaData metaData = connection.getMetaData();
-          connectionUrl = metaData.getURL();
-          if (null != connectionUrl && !connectionUrl.equals(url)) {
-            // connection url was updated, check to see if user has also changed
-            String connectionUser = metaData.getUserName();
-            if (null != connectionUser
-                && (null == props || !connectionUser.equalsIgnoreCase(props.getProperty("user")))) {
-              // merge updated user with original properties
-              connectionProps = new Properties(props);
-              connectionProps.put("user", connectionUser);
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void addDBInfo(
+                @Advice.Argument(0) final String url,
+                @Advice.Argument(1) final Properties props,
+                @Advice.Return final Connection connection) {
+            if (connection == null) {
+                // Exception was probably thrown.
+                return;
             }
-          } else {
-            connectionUrl = url; // fallback in case updated url is null
-          }
-        } catch (Throwable ignored) {
-          // use original values
-        }
-      }
-      Connection connWithContext = connection;
-      if (connectionUrl.startsWith("**internally_generated**", connectionUrl.indexOf("://") + 3)) {
-        // Treat MySql multi-host connections specifically.
-        // Use the original connection URL for parsing.
-        connectionUrl = url;
-        try {
-          // Find an underlying connection object to which to attach the DBInfo. Otherwise, it may
-          // be attached to a wrapper or a proxy connection object that is different from the one
-          // available in other parts of the instrumentation, resulting in a loss of context.
-          connWithContext = connection.unwrap(Connection.class);
-        } catch (Throwable t) {
-          // ignore
+            String connectionUrl = url;
+            Properties connectionProps = props;
+            if (JDBCDecorator.FETCH_DB_METADATA_ON_CONNECT
+                    && (null == props
+                            || !Boolean.parseBoolean(props.getProperty("oracle.jdbc.useShardingDriverConnection")))) {
+                try {
+                    DatabaseMetaData metaData = connection.getMetaData();
+                    connectionUrl = metaData.getURL();
+                    if (null != connectionUrl && !connectionUrl.equals(url)) {
+                        // connection url was updated, check to see if user has also changed
+                        String connectionUser = metaData.getUserName();
+                        if (null != connectionUser
+                                && (null == props || !connectionUser.equalsIgnoreCase(props.getProperty("user")))) {
+                            // merge updated user with original properties
+                            connectionProps = new Properties(props);
+                            connectionProps.put("user", connectionUser);
+                        }
+                    } else {
+                        connectionUrl = url; // fallback in case updated url is null
+                    }
+                } catch (Throwable ignored) {
+                    // use original values
+                }
+            }
+            Connection connWithContext = connection;
+            if (connectionUrl.startsWith("**internally_generated**", connectionUrl.indexOf("://") + 3)) {
+                // Treat MySql multi-host connections specifically.
+                // Use the original connection URL for parsing.
+                connectionUrl = url;
+                try {
+                    // Find an underlying connection object to which to attach the DBInfo. Otherwise, it may
+                    // be attached to a wrapper or a proxy connection object that is different from the one
+                    // available in other parts of the instrumentation, resulting in a loss of context.
+                    connWithContext = connection.unwrap(Connection.class);
+                } catch (Throwable t) {
+                    // ignore
+                }
+            }
+            DBInfo dbInfo = JDBCConnectionUrlParser.extractDBInfo(connectionUrl, connectionProps);
+            InstrumentationContext.get(Connection.class, JDBCConnectionContext.class)
+                    .put(connWithContext, new JDBCConnectionContext(dbInfo));
         }
-      }
-      DBInfo dbInfo = JDBCConnectionUrlParser.extractDBInfo(connectionUrl, connectionProps);
-      InstrumentationContext.get(Connection.class, JDBCConnectionContext.class)
-          .put(connWithContext, new JDBCConnectionContext(dbInfo));
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariBlockedTracker.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariBlockedTracker.java
index 15c9b1e4d93..3ed7195895a 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariBlockedTracker.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariBlockedTracker.java
@@ -4,17 +4,17 @@
 
 /** Shared blocked getConnection() tracking {@link ThreadLocal} for Hikari. */
 public class HikariBlockedTracker {
-  private static final ThreadLocal<Boolean> tracker = new ThreadLocal<>();
+    private static final ThreadLocal<Boolean> tracker = new ThreadLocal<>();
 
-  public static void clearBlocked() {
-    tracker.remove();
-  }
+    public static void clearBlocked() {
+        tracker.remove();
+    }
 
-  public static void setBlocked() {
-    tracker.set(TRUE);
-  }
+    public static void setBlocked() {
+        tracker.set(TRUE);
+    }
 
-  public static boolean wasBlocked() {
-    return TRUE.equals(tracker.get());
-  }
+    public static boolean wasBlocked() {
+        return TRUE.equals(tracker.get());
+    }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariBlockedTrackingSynchronousQueue.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariBlockedTrackingSynchronousQueue.java
index 17e7c3527e4..78381962951 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariBlockedTrackingSynchronousQueue.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariBlockedTrackingSynchronousQueue.java
@@ -4,14 +4,14 @@
 import java.util.concurrent.TimeUnit;
 
 public class HikariBlockedTrackingSynchronousQueue<T> extends SynchronousQueue<T> {
-  public HikariBlockedTrackingSynchronousQueue() {
-    // This assumes the initialization of the SynchronousQueue in ConcurrentBag doesn't change
-    super(true);
-  }
+    public HikariBlockedTrackingSynchronousQueue() {
+        // This assumes the initialization of the SynchronousQueue in ConcurrentBag doesn't change
+        super(true);
+    }
 
-  @Override
-  public T poll(long timeout, TimeUnit unit) throws InterruptedException {
-    HikariBlockedTracker.setBlocked();
-    return super.poll(timeout, unit);
-  }
+    @Override
+    public T poll(long timeout, TimeUnit unit) throws InterruptedException {
+        HikariBlockedTracker.setBlocked();
+        return super.poll(timeout, unit);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagHandoffQueueInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagHandoffQueueInstrumentation.java
index 2865eef72dc..ba3f38eb86b 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagHandoffQueueInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagHandoffQueueInstrumentation.java
@@ -19,42 +19,37 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class HikariConcurrentBagHandoffQueueInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasMethodAdvice,
-        Instrumenter.WithTypeStructure {
-
-  public HikariConcurrentBagHandoffQueueInstrumentation() {
-    super("jdbc", "hikari");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.zaxxer.hikari.util.ConcurrentBag";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("handoffQueue"));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(),
-        HikariConcurrentBagHandoffQueueInstrumentation.class.getName() + "$ConstructorAdvice");
-  }
-
-  public static class ConstructorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(
-        @Advice.FieldValue(value = "handoffQueue", readOnly = false)
-            SynchronousQueue handoffQueue) {
-      handoffQueue = new HikariBlockedTrackingSynchronousQueue<>();
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, Instrumenter.WithTypeStructure {
+
+    public HikariConcurrentBagHandoffQueueInstrumentation() {
+        super("jdbc", "hikari");
+    }
+
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "com.zaxxer.hikari.util.ConcurrentBag";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("handoffQueue"));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor(), HikariConcurrentBagHandoffQueueInstrumentation.class.getName() + "$ConstructorAdvice");
+    }
+
+    public static class ConstructorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.FieldValue(value = "handoffQueue", readOnly = false) SynchronousQueue handoffQueue) {
+            handoffQueue = new HikariBlockedTrackingSynchronousQueue<>();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java
index 853865725ba..a938830c168 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java
@@ -36,69 +36,67 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class HikariConcurrentBagInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public HikariConcurrentBagInstrumentation() {
-    super("jdbc", "hikari");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
-  }
+    public HikariConcurrentBagInstrumentation() {
+        super("jdbc", "hikari");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.zaxxer.hikari.util.ConcurrentBag";
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    // The contextStore Map is populated by HikariPoolInstrumentation
-    return singletonMap("com.zaxxer.hikari.util.ConcurrentBag", String.class.getName());
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.zaxxer.hikari.util.ConcurrentBag";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("borrow"), HikariConcurrentBagInstrumentation.class.getName() + "$BorrowAdvice");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        // The contextStore Map is populated by HikariPoolInstrumentation
+        return singletonMap("com.zaxxer.hikari.util.ConcurrentBag", String.class.getName());
+    }
 
-  /**
-   * Instead of always starting and ending a span, a pool.waiting span is only created if blocking
-   * is detected when attempting to get a connection from the pool.
-   */
-  public static class BorrowAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static Long onEnter() {
-      HikariBlockedTracker.clearBlocked();
-      return System.currentTimeMillis();
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("borrow"), HikariConcurrentBagInstrumentation.class.getName() + "$BorrowAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.This ConcurrentBag thiz,
-        @Advice.Enter final Long startTimeMillis,
-        @Advice.Thrown final Throwable throwable) {
-      if (HikariBlockedTracker.wasBlocked()) {
-        final AgentSpan span =
-            startSpan(
-                JAVA_JDBC_POOL_WAITING.toString(),
-                POOL_WAITING,
-                TimeUnit.MILLISECONDS.toMicros(startTimeMillis));
-        DECORATE.afterStart(span);
-        DECORATE.onError(span, throwable);
-        span.setResourceName("hikari.waiting");
-        final String poolName =
-            InstrumentationContext.get(ConcurrentBag.class, String.class).get(thiz);
-        if (poolName != null) {
-          span.setTag(DB_POOL_NAME, poolName);
+    /**
+     * Instead of always starting and ending a span, a pool.waiting span is only created if blocking
+     * is detected when attempting to get a connection from the pool.
+     */
+    public static class BorrowAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static Long onEnter() {
+            HikariBlockedTracker.clearBlocked();
+            return System.currentTimeMillis();
         }
 
-        span.finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.This ConcurrentBag thiz,
+                @Advice.Enter final Long startTimeMillis,
+                @Advice.Thrown final Throwable throwable) {
+            if (HikariBlockedTracker.wasBlocked()) {
+                final AgentSpan span = startSpan(
+                        JAVA_JDBC_POOL_WAITING.toString(),
+                        POOL_WAITING,
+                        TimeUnit.MILLISECONDS.toMicros(startTimeMillis));
+                DECORATE.afterStart(span);
+                DECORATE.onError(span, throwable);
+                span.setResourceName("hikari.waiting");
+                final String poolName = InstrumentationContext.get(ConcurrentBag.class, String.class)
+                        .get(thiz);
+                if (poolName != null) {
+                    span.setTag(DB_POOL_NAME, poolName);
+                }
+
+                span.finish();
 
-        HikariBlockedTracker.clearBlocked();
-      }
+                HikariBlockedTracker.clearBlocked();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariDataSourceInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariDataSourceInstrumentation.java
index ecdf80c5a88..63c4d501046 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariDataSourceInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariDataSourceInstrumentation.java
@@ -17,61 +17,60 @@
 
 @AutoService(InstrumenterModule.class)
 public final class HikariDataSourceInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  private static final Logger log = LoggerFactory.getLogger(HikariDataSourceInstrumentation.class);
+    private static final Logger log = LoggerFactory.getLogger(HikariDataSourceInstrumentation.class);
 
-  public HikariDataSourceInstrumentation() {
-    super("jdbc-datasource");
-  }
+    public HikariDataSourceInstrumentation() {
+        super("jdbc-datasource");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.zaxxer.hikari.HikariDataSource";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.zaxxer.hikari.HikariDataSource";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("java.sql.Connection", JDBCConnectionContext.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("java.sql.Connection", JDBCConnectionContext.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getConnection"),
-        HikariDataSourceInstrumentation.class.getName() + "$HikariGetConnectionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getConnection"), HikariDataSourceInstrumentation.class.getName() + "$HikariGetConnectionAdvice");
+    }
 
-  public static class HikariGetConnectionAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void start(
-        @Advice.This final HikariDataSource ds, @Advice.Return Connection con) {
-      if (con == null) {
-        // Exception was probably thrown.
-        return;
-      }
-      // connection pools wraps connection with their own type (ProxyConnection in this case)
-      // jdbc drivers have a standard way to ask for the unwrapped instance (calling unwrap).
-      // we need the unwrapped version in order to be able to lookup the instrumentation context
-      // since we stored dbInfo for that instance and not for the wrapped one
-      Connection unwrapped = con;
-      try {
-        if (con.isWrapperFor(Connection.class)) {
-          unwrapped = con.unwrap(Connection.class);
+    public static class HikariGetConnectionAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void start(@Advice.This final HikariDataSource ds, @Advice.Return Connection con) {
+            if (con == null) {
+                // Exception was probably thrown.
+                return;
+            }
+            // connection pools wraps connection with their own type (ProxyConnection in this case)
+            // jdbc drivers have a standard way to ask for the unwrapped instance (calling unwrap).
+            // we need the unwrapped version in order to be able to lookup the instrumentation context
+            // since we stored dbInfo for that instance and not for the wrapped one
+            Connection unwrapped = con;
+            try {
+                if (con.isWrapperFor(Connection.class)) {
+                    unwrapped = con.unwrap(Connection.class);
+                }
+            } catch (Throwable t) {
+                return;
+            }
+            String hikariPoolname = ds.getPoolName();
+            if (unwrapped == null) {
+                return;
+            }
+            JDBCConnectionContext connectionContext = InstrumentationContext.get(
+                            Connection.class, JDBCConnectionContext.class)
+                    .get(unwrapped);
+            if (connectionContext == null) {
+                return;
+            }
+            connectionContext.setPoolName(hikariPoolname);
         }
-      } catch (Throwable t) {
-        return;
-      }
-      String hikariPoolname = ds.getPoolName();
-      if (unwrapped == null) {
-        return;
-      }
-      JDBCConnectionContext connectionContext =
-          InstrumentationContext.get(Connection.class, JDBCConnectionContext.class).get(unwrapped);
-      if (connectionContext == null) {
-        return;
-      }
-      connectionContext.setPoolName(hikariPoolname);
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariPoolInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariPoolInstrumentation.java
index 9de43ec8429..606ca62d3b4 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariPoolInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariPoolInstrumentation.java
@@ -18,39 +18,38 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class HikariPoolInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public HikariPoolInstrumentation() {
-    super("jdbc", "hikari");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.zaxxer.hikari.pool.HikariPool";
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("com.zaxxer.hikari.util.ConcurrentBag", String.class.getName());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(), HikariPoolInstrumentation.class.getName() + "$ConstructorAdvice");
-  }
-
-  public static class ConstructorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(
-        @Advice.FieldValue("connectionBag") ConcurrentBag concurrentBag,
-        @Advice.FieldValue("poolName") String poolName) {
-      InstrumentationContext.get(ConcurrentBag.class, String.class).put(concurrentBag, poolName);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public HikariPoolInstrumentation() {
+        super("jdbc", "hikari");
+    }
+
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isJdbcPoolWaitingEnabled();
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "com.zaxxer.hikari.pool.HikariPool";
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("com.zaxxer.hikari.util.ConcurrentBag", String.class.getName());
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), HikariPoolInstrumentation.class.getName() + "$ConstructorAdvice");
+    }
+
+    public static class ConstructorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(
+                @Advice.FieldValue("connectionBag") ConcurrentBag concurrentBag,
+                @Advice.FieldValue("poolName") String poolName) {
+            InstrumentationContext.get(ConcurrentBag.class, String.class).put(concurrentBag, poolName);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariQueuedSequenceSynchronizerInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariQueuedSequenceSynchronizerInstrumentation.java
index dabadf28a3a..1b1dd89af6c 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariQueuedSequenceSynchronizerInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariQueuedSequenceSynchronizerInstrumentation.java
@@ -12,31 +12,29 @@
  * to <code>synchronizer.waitUntilSequenceExceeded(startSeq, timeout)</code>.
  */
 @AutoService(InstrumenterModule.class)
-public final class HikariQueuedSequenceSynchronizerInstrumentation
-    extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class HikariQueuedSequenceSynchronizerInstrumentation extends InstrumenterModule.Tracing
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public HikariQueuedSequenceSynchronizerInstrumentation() {
-    super("jdbc", "hikari");
-  }
+    public HikariQueuedSequenceSynchronizerInstrumentation() {
+        super("jdbc", "hikari");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.zaxxer.hikari.util.QueuedSequenceSynchronizer";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.zaxxer.hikari.util.QueuedSequenceSynchronizer";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("waitUntilSequenceExceeded"),
-        HikariQueuedSequenceSynchronizerInstrumentation.class.getName()
-            + "$WaitUntilSequenceExceededAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("waitUntilSequenceExceeded"),
+                HikariQueuedSequenceSynchronizerInstrumentation.class.getName() + "$WaitUntilSequenceExceededAdvice");
+    }
 
-  public static class WaitUntilSequenceExceededAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter() {
-      HikariBlockedTracker.setBlocked();
+    public static class WaitUntilSequenceExceededAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter() {
+            HikariBlockedTracker.setBlocked();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/IastConnectionCallSite.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/IastConnectionCallSite.java
index 40a1c839bde..00ea05e542f 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/IastConnectionCallSite.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/IastConnectionCallSite.java
@@ -17,55 +17,47 @@
 
 @Sink(VulnerabilityTypes.SQL_INJECTION)
 @CallSite(
-    spi = IastCallSites.class,
-    helpers = {JDBCDecorator.class})
+        spi = IastCallSites.class,
+        helpers = {JDBCDecorator.class})
 public class IastConnectionCallSite {
 
-  private static ContextStore<Connection, JDBCConnectionContext> CONNECTION_CONTEXT_STORE = null;
+    private static ContextStore<Connection, JDBCConnectionContext> CONNECTION_CONTEXT_STORE = null;
 
-  @SuppressWarnings("unchecked")
-  @Nonnull
-  public static DBInfo getDBInfo(final Connection connection) {
-    if (CONNECTION_CONTEXT_STORE == null) {
-      final int storeId =
-          getContextStoreId(Connection.class.getName(), JDBCConnectionContext.class.getName());
-      final ContextStore<?, ?> store = getContextStore(storeId);
-      CONNECTION_CONTEXT_STORE = (ContextStore<Connection, JDBCConnectionContext>) store;
+    @SuppressWarnings("unchecked")
+    @Nonnull
+    public static DBInfo getDBInfo(final Connection connection) {
+        if (CONNECTION_CONTEXT_STORE == null) {
+            final int storeId = getContextStoreId(Connection.class.getName(), JDBCConnectionContext.class.getName());
+            final ContextStore<?, ?> store = getContextStore(storeId);
+            CONNECTION_CONTEXT_STORE = (ContextStore<Connection, JDBCConnectionContext>) store;
+        }
+        if (CONNECTION_CONTEXT_STORE == null) {
+            return JDBCDecorator.parseDBInfoFromConnection(connection);
+        } else {
+            return JDBCDecorator.parseConnectionContext(connection, CONNECTION_CONTEXT_STORE)
+                    .getDbInfo();
+        }
     }
-    if (CONNECTION_CONTEXT_STORE == null) {
-      return JDBCDecorator.parseDBInfoFromConnection(connection);
-    } else {
-      return JDBCDecorator.parseConnectionContext(connection, CONNECTION_CONTEXT_STORE).getDbInfo();
-    }
-  }
 
-  @CallSite.Before(
-      "java.sql.PreparedStatement java.sql.Connection.prepareStatement(java.lang.String)")
-  @CallSite.Before(
-      "java.sql.PreparedStatement java.sql.Connection.prepareStatement(java.lang.String, int, int)")
-  @CallSite.Before(
-      "java.sql.PreparedStatement java.sql.Connection.prepareStatement(java.lang.String, int, int, int)")
-  @CallSite.Before(
-      "java.sql.PreparedStatement java.sql.Connection.prepareStatement(java.lang.String, int)")
-  @CallSite.Before(
-      "java.sql.PreparedStatement java.sql.Connection.prepareStatement(java.lang.String, int[])")
-  @CallSite.Before(
-      "java.sql.PreparedStatement java.sql.Connection.prepareStatement(java.lang.String, java.lang.String[])")
-  @CallSite.Before("java.sql.CallableStatement java.sql.Connection.prepareCall(java.lang.String)")
-  @CallSite.Before(
-      "java.sql.CallableStatement java.sql.Connection.prepareCall(java.lang.String, int, int)")
-  @CallSite.Before(
-      "java.sql.CallableStatement java.sql.Connection.prepareCall(java.lang.String, int, int, int)")
-  public static void beforePrepare(
-      @CallSite.This final Connection conn, @CallSite.Argument(0) final String sql) {
-    final SqlInjectionModule module = InstrumentationBridge.SQL_INJECTION;
-    if (module != null) {
-      try {
-        final DBInfo dbInfo = getDBInfo(conn);
-        module.onJdbcQuery(sql, dbInfo.getType());
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforePrepare threw", e);
-      }
+    @CallSite.Before("java.sql.PreparedStatement java.sql.Connection.prepareStatement(java.lang.String)")
+    @CallSite.Before("java.sql.PreparedStatement java.sql.Connection.prepareStatement(java.lang.String, int, int)")
+    @CallSite.Before("java.sql.PreparedStatement java.sql.Connection.prepareStatement(java.lang.String, int, int, int)")
+    @CallSite.Before("java.sql.PreparedStatement java.sql.Connection.prepareStatement(java.lang.String, int)")
+    @CallSite.Before("java.sql.PreparedStatement java.sql.Connection.prepareStatement(java.lang.String, int[])")
+    @CallSite.Before(
+            "java.sql.PreparedStatement java.sql.Connection.prepareStatement(java.lang.String, java.lang.String[])")
+    @CallSite.Before("java.sql.CallableStatement java.sql.Connection.prepareCall(java.lang.String)")
+    @CallSite.Before("java.sql.CallableStatement java.sql.Connection.prepareCall(java.lang.String, int, int)")
+    @CallSite.Before("java.sql.CallableStatement java.sql.Connection.prepareCall(java.lang.String, int, int, int)")
+    public static void beforePrepare(@CallSite.This final Connection conn, @CallSite.Argument(0) final String sql) {
+        final SqlInjectionModule module = InstrumentationBridge.SQL_INJECTION;
+        if (module != null) {
+            try {
+                final DBInfo dbInfo = getDBInfo(conn);
+                module.onJdbcQuery(sql, dbInfo.getType());
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforePrepare threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/IastResultSetInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/IastResultSetInstrumentation.java
index 5a6447613ba..e50711b205d 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/IastResultSetInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/IastResultSetInstrumentation.java
@@ -30,88 +30,86 @@
 
 @AutoService(InstrumenterModule.class)
 public class IastResultSetInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public IastResultSetInstrumentation() {
-    super("jdbc", "jdbc-resultset", "iast-resultset");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "java.sql.ResultSet";
-  }
+    public IastResultSetInstrumentation() {
+        super("jdbc", "jdbc-resultset", "iast-resultset");
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named("java.sql.ResultSet"));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "java.sql.ResultSet";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("next").and(takesArguments(0))),
-        IastResultSetInstrumentation.class.getName() + "$NextAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("getString").or(named("getNString")))
-            .and(takesArguments(int.class).or(takesArguments(String.class))),
-        IastResultSetInstrumentation.class.getName() + "$GetParameterAdvice");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named("java.sql.ResultSet"));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("java.sql.ResultSet", Integer.class.getName());
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("next").and(takesArguments(0))),
+                IastResultSetInstrumentation.class.getName() + "$NextAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("getString").or(named("getNString")))
+                        .and(takesArguments(int.class).or(takesArguments(String.class))),
+                IastResultSetInstrumentation.class.getName() + "$GetParameterAdvice");
+    }
 
-  public static class NextAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(@Advice.This final ResultSet resultSet) {
-      ContextStore<ResultSet, Integer> contextStore =
-          InstrumentationContext.get(ResultSet.class, Integer.class);
-      if (contextStore.get(resultSet) != null) {
-        contextStore.put(resultSet, contextStore.get(resultSet) + 1);
-      } else {
-        // first time
-        contextStore.put(resultSet, 1);
-      }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("java.sql.ResultSet", Integer.class.getName());
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetParameterAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter() {
-      CallDepthThreadLocalMap.incrementCallDepth(ResultSet.class);
+    public static class NextAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(@Advice.This final ResultSet resultSet) {
+            ContextStore<ResultSet, Integer> contextStore = InstrumentationContext.get(ResultSet.class, Integer.class);
+            if (contextStore.get(resultSet) != null) {
+                contextStore.put(resultSet, contextStore.get(resultSet) + 1);
+            } else {
+                // first time
+                contextStore.put(resultSet, 1);
+            }
+        }
     }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.SQL_TABLE)
-    public static void onExit(
-        @Advice.Argument(0) Object argument,
-        @Advice.Return final String value,
-        @Advice.This final ResultSet resultSet,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (CallDepthThreadLocalMap.decrementCallDepth(ResultSet.class) > 0) {
-        return;
-      }
-      ContextStore<ResultSet, Integer> contextStore =
-          InstrumentationContext.get(ResultSet.class, Integer.class);
-      if (contextStore.get(resultSet) > Config.get().getIastDbRowsToTaint()) {
-        return;
-      }
-      if (value == null) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      if (argument instanceof String) {
-        module.taintString(ctx, value, SourceTypes.SQL_TABLE, (String) argument);
-      } else {
-        module.taintString(ctx, value, SourceTypes.SQL_TABLE);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetParameterAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter() {
+            CallDepthThreadLocalMap.incrementCallDepth(ResultSet.class);
+        }
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.SQL_TABLE)
+        public static void onExit(
+                @Advice.Argument(0) Object argument,
+                @Advice.Return final String value,
+                @Advice.This final ResultSet resultSet,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (CallDepthThreadLocalMap.decrementCallDepth(ResultSet.class) > 0) {
+                return;
+            }
+            ContextStore<ResultSet, Integer> contextStore = InstrumentationContext.get(ResultSet.class, Integer.class);
+            if (contextStore.get(resultSet) > Config.get().getIastDbRowsToTaint()) {
+                return;
+            }
+            if (value == null) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            if (argument instanceof String) {
+                module.taintString(ctx, value, SourceTypes.SQL_TABLE, (String) argument);
+            } else {
+                module.taintString(ctx, value, SourceTypes.SQL_TABLE);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/IastStatementCallSite.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/IastStatementCallSite.java
index 305797e2b6e..86ad7ac429d 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/IastStatementCallSite.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/IastStatementCallSite.java
@@ -13,35 +13,33 @@
 
 @Sink(VulnerabilityTypes.SQL_INJECTION)
 @CallSite(
-    spi = IastCallSites.class,
-    helpers = {JDBCDecorator.class})
+        spi = IastCallSites.class,
+        helpers = {JDBCDecorator.class})
 public class IastStatementCallSite {
 
-  @CallSite.Before("void java.sql.Statement.addBatch(java.lang.String)")
-  @CallSite.Before("java.sql.ResultSet java.sql.Statement.executeQuery(java.lang.String)")
-  @CallSite.Before("int java.sql.Statement.executeUpdate(java.lang.String)")
-  @CallSite.Before("boolean java.sql.Statement.execute(java.lang.String)")
-  @CallSite.Before("int java.sql.Statement.executeUpdate(java.lang.String, int)")
-  @CallSite.Before("int java.sql.Statement.executeUpdate(java.lang.String, int[])")
-  @CallSite.Before("int java.sql.Statement.executeUpdate(java.lang.String, java.lang.String[])")
-  @CallSite.Before("boolean java.sql.Statement.execute(java.lang.String, int)")
-  @CallSite.Before("boolean java.sql.Statement.execute(java.lang.String, int[])")
-  @CallSite.Before("boolean java.sql.Statement.execute(java.lang.String, java.lang.String[])")
-  @CallSite.Before("long java.sql.Statement.executeLargeUpdate(java.lang.String)")
-  @CallSite.Before("long java.sql.Statement.executeLargeUpdate(java.lang.String, int)")
-  @CallSite.Before("long java.sql.Statement.executeLargeUpdate(java.lang.String, int[])")
-  @CallSite.Before(
-      "long java.sql.Statement.executeLargeUpdate(java.lang.String, java.lang.String[])")
-  public static void beforeExecute(
-      @CallSite.This Statement statement, @CallSite.Argument(0) String sql) {
-    final SqlInjectionModule module = InstrumentationBridge.SQL_INJECTION;
-    if (module != null) {
-      try {
-        final DBInfo dbInfo = getDBInfo(statement.getConnection());
-        module.onJdbcQuery(sql, dbInfo.getType());
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeExecute threw", e);
-      }
+    @CallSite.Before("void java.sql.Statement.addBatch(java.lang.String)")
+    @CallSite.Before("java.sql.ResultSet java.sql.Statement.executeQuery(java.lang.String)")
+    @CallSite.Before("int java.sql.Statement.executeUpdate(java.lang.String)")
+    @CallSite.Before("boolean java.sql.Statement.execute(java.lang.String)")
+    @CallSite.Before("int java.sql.Statement.executeUpdate(java.lang.String, int)")
+    @CallSite.Before("int java.sql.Statement.executeUpdate(java.lang.String, int[])")
+    @CallSite.Before("int java.sql.Statement.executeUpdate(java.lang.String, java.lang.String[])")
+    @CallSite.Before("boolean java.sql.Statement.execute(java.lang.String, int)")
+    @CallSite.Before("boolean java.sql.Statement.execute(java.lang.String, int[])")
+    @CallSite.Before("boolean java.sql.Statement.execute(java.lang.String, java.lang.String[])")
+    @CallSite.Before("long java.sql.Statement.executeLargeUpdate(java.lang.String)")
+    @CallSite.Before("long java.sql.Statement.executeLargeUpdate(java.lang.String, int)")
+    @CallSite.Before("long java.sql.Statement.executeLargeUpdate(java.lang.String, int[])")
+    @CallSite.Before("long java.sql.Statement.executeLargeUpdate(java.lang.String, java.lang.String[])")
+    public static void beforeExecute(@CallSite.This Statement statement, @CallSite.Argument(0) String sql) {
+        final SqlInjectionModule module = InstrumentationBridge.SQL_INJECTION;
+        if (module != null) {
+            try {
+                final DBInfo dbInfo = getDBInfo(statement.getConnection());
+                module.onJdbcQuery(sql, dbInfo.getType());
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeExecute threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
index fb66f082a3c..eadcb8a81ba 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
@@ -46,481 +46,461 @@
 
 public class JDBCDecorator extends DatabaseClientDecorator<DBInfo> {
 
-  private static final Logger log = LoggerFactory.getLogger(JDBCDecorator.class);
-
-  public static final JDBCDecorator DECORATE = new JDBCDecorator();
-  public static final CharSequence JAVA_JDBC = UTF8BytesString.create("java-jdbc");
-  public static final CharSequence DATABASE_QUERY = UTF8BytesString.create("database.query");
-  private static final UTF8BytesString DB_QUERY = UTF8BytesString.create("DB Query");
-  private static final UTF8BytesString JDBC_STATEMENT =
-      UTF8BytesString.create("java-jdbc-statement");
-  private static final UTF8BytesString JDBC_PREPARED_STATEMENT =
-      UTF8BytesString.create("java-jdbc-prepared_statement");
-  private static final String DEFAULT_SERVICE_NAME =
-      SpanNaming.instance().namingSchema().database().service("jdbc");
-
-  public static final String DD_INSTRUMENTATION_PREFIX = "_DD_";
-  public static final String DD_ORACLE_SERVICE_HASH_PREFIX = "_DD_DDSH:";
-  private static final String ORACLE_ACTION_CLIENT_INFO = "OCSID.ACTION";
-
-  public static final String DBM_PROPAGATION_MODE = Config.get().getDbmPropagationMode();
-  private static final boolean DBM_INJECT_SQL_BASE_HASH = Config.get().isDbmInjectSqlBaseHash();
-  private static final boolean PROPAGATE_PROCESS_TAGS =
-      Config.get().isExperimentalPropagateProcessTagsEnabled();
-  public static final boolean INJECT_COMMENT =
-      DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_FULL)
-          || DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_STATIC)
-          || DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_DYNAMIC_SERVICE);
-  private static final boolean INJECT_TRACE_CONTEXT =
-      DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_FULL);
-  private static final boolean INJECT_ORACLE_SERVICE_HASH_ACTION =
-      DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_DYNAMIC_SERVICE)
-          && PROPAGATE_PROCESS_TAGS
-          && Config.get().isDbmPropagationOracleActionOnlyEnabled();
-  public static final boolean DBM_TRACE_PREPARED_STATEMENTS =
-      Config.get().isDbmTracePreparedStatements();
-  public static final boolean DBM_ALWAYS_APPEND_SQL_COMMENT =
-      Config.get().isDbmAlwaysAppendSqlComment();
-  public static final boolean FETCH_DB_METADATA_ON_CONNECT =
-      Config.get().isDbMetadataFetchingOnConnectEnabled();
-  private static final boolean FETCH_DB_METADATA_ON_QUERY =
-      Config.get().isDbMetadataFetchingOnQueryEnabled();
-
-  private volatile boolean warnedAboutDBMPropagationMode = false; // to log a warning only once
-  private volatile boolean loggedInjectionError = false;
-
-  public static void logMissingQueryInfo(Statement statement) throws SQLException {
-    if (log.isDebugEnabled()) {
-      log.debug(
-          "No query info in {} with {}",
-          statement.getClass(),
-          statement.getConnection().getClass());
-    }
-  }
-
-  public static void logQueryInfoInjection(
-      Connection connection, Statement statement, DBQueryInfo info) {
-    if (log.isDebugEnabled()) {
-      log.debug(
-          "injected {} into {} from {}",
-          info.getSql(),
-          statement.getClass(),
-          connection.getClass());
-    }
-  }
-
-  public static void logSQLException(SQLException ex) {
-    if (log.isDebugEnabled()) {
-      log.debug("JDBC instrumentation error", ex);
-    }
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jdbc"};
-  }
-
-  @Override
-  protected String service() {
-    return DEFAULT_SERVICE_NAME; // Overridden by onConnection
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JAVA_JDBC; // Overridden by onStatement and onPreparedStatement
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.SQL;
-  }
-
-  @Override
-  protected String dbType() {
-    return "jdbc";
-  }
-
-  @Override
-  protected String dbUser(final DBInfo info) {
-    return info.getUser();
-  }
-
-  @Override
-  protected String dbInstance(final DBInfo info) {
-    if (info.getInstance() != null) {
-      return info.getInstance();
-    } else {
-      return info.getDb();
-    }
-  }
-
-  @Override
-  protected String dbHostname(final DBInfo info) {
-    return info.getHost();
-  }
-
-  private void setTagIfPresent(final AgentSpan span, final String key, final String value) {
-    if (value != null && !value.isEmpty()) {
-      span.setTag(key, value);
-    }
-  }
-
-  public void onConnection(final AgentSpan span, final JDBCConnectionContext connectionContext) {
-    final DBInfo dbInfo = connectionContext.getDbInfo();
-    if (dbInfo != null) {
-      processDatabaseType(span, dbInfo.getType());
-
-      setTagIfPresent(span, DB_WAREHOUSE, dbInfo.getWarehouse());
-      setTagIfPresent(span, DB_SCHEMA, dbInfo.getSchema());
-      setTagIfPresent(span, DB_POOL_NAME, connectionContext.getPoolName());
-    }
-    super.onConnection(span, dbInfo);
-  }
-
-  public static JDBCConnectionContext parseConnectionContext(
-      final Connection connection, ContextStore<Connection, JDBCConnectionContext> contextStore) {
-    if (connection == null) {
-      return JDBCConnectionContext.DEFAULT;
-    }
-    JDBCConnectionContext connectionContext = contextStore.get(connection);
-    /*
-     * Logic to get the DBInfo from a JDBC Connection, if the connection was not created via
-     * Driver.connect, or it has never seen before, the connectionInfo map will return null and will
-     * attempt to extract DBInfo from the connection. If the DBInfo can't be extracted, then the
-     * connection will be stored with the DEFAULT DBInfo as the value in the connectionInfo map to
-     * avoid retry overhead.
+    private static final Logger log = LoggerFactory.getLogger(JDBCDecorator.class);
+
+    public static final JDBCDecorator DECORATE = new JDBCDecorator();
+    public static final CharSequence JAVA_JDBC = UTF8BytesString.create("java-jdbc");
+    public static final CharSequence DATABASE_QUERY = UTF8BytesString.create("database.query");
+    private static final UTF8BytesString DB_QUERY = UTF8BytesString.create("DB Query");
+    private static final UTF8BytesString JDBC_STATEMENT = UTF8BytesString.create("java-jdbc-statement");
+    private static final UTF8BytesString JDBC_PREPARED_STATEMENT =
+            UTF8BytesString.create("java-jdbc-prepared_statement");
+    private static final String DEFAULT_SERVICE_NAME =
+            SpanNaming.instance().namingSchema().database().service("jdbc");
+
+    public static final String DD_INSTRUMENTATION_PREFIX = "_DD_";
+    public static final String DD_ORACLE_SERVICE_HASH_PREFIX = "_DD_DDSH:";
+    private static final String ORACLE_ACTION_CLIENT_INFO = "OCSID.ACTION";
+
+    public static final String DBM_PROPAGATION_MODE = Config.get().getDbmPropagationMode();
+    private static final boolean DBM_INJECT_SQL_BASE_HASH = Config.get().isDbmInjectSqlBaseHash();
+    private static final boolean PROPAGATE_PROCESS_TAGS = Config.get().isExperimentalPropagateProcessTagsEnabled();
+    public static final boolean INJECT_COMMENT = DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_FULL)
+            || DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_STATIC)
+            || DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_DYNAMIC_SERVICE);
+    private static final boolean INJECT_TRACE_CONTEXT = DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_FULL);
+    private static final boolean INJECT_ORACLE_SERVICE_HASH_ACTION =
+            DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_DYNAMIC_SERVICE)
+                    && PROPAGATE_PROCESS_TAGS
+                    && Config.get().isDbmPropagationOracleActionOnlyEnabled();
+    public static final boolean DBM_TRACE_PREPARED_STATEMENTS = Config.get().isDbmTracePreparedStatements();
+    public static final boolean DBM_ALWAYS_APPEND_SQL_COMMENT = Config.get().isDbmAlwaysAppendSqlComment();
+    public static final boolean FETCH_DB_METADATA_ON_CONNECT = Config.get().isDbMetadataFetchingOnConnectEnabled();
+    private static final boolean FETCH_DB_METADATA_ON_QUERY = Config.get().isDbMetadataFetchingOnQueryEnabled();
+
+    private volatile boolean warnedAboutDBMPropagationMode = false; // to log a warning only once
+    private volatile boolean loggedInjectionError = false;
+
+    public static void logMissingQueryInfo(Statement statement) throws SQLException {
+        if (log.isDebugEnabled()) {
+            log.debug(
+                    "No query info in {} with {}",
+                    statement.getClass(),
+                    statement.getConnection().getClass());
+        }
+    }
+
+    public static void logQueryInfoInjection(Connection connection, Statement statement, DBQueryInfo info) {
+        if (log.isDebugEnabled()) {
+            log.debug("injected {} into {} from {}", info.getSql(), statement.getClass(), connection.getClass());
+        }
+    }
+
+    public static void logSQLException(SQLException ex) {
+        if (log.isDebugEnabled()) {
+            log.debug("JDBC instrumentation error", ex);
+        }
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jdbc"};
+    }
+
+    @Override
+    protected String service() {
+        return DEFAULT_SERVICE_NAME; // Overridden by onConnection
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JAVA_JDBC; // Overridden by onStatement and onPreparedStatement
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.SQL;
+    }
+
+    @Override
+    protected String dbType() {
+        return "jdbc";
+    }
+
+    @Override
+    protected String dbUser(final DBInfo info) {
+        return info.getUser();
+    }
+
+    @Override
+    protected String dbInstance(final DBInfo info) {
+        if (info.getInstance() != null) {
+            return info.getInstance();
+        } else {
+            return info.getDb();
+        }
+    }
+
+    @Override
+    protected String dbHostname(final DBInfo info) {
+        return info.getHost();
+    }
+
+    private void setTagIfPresent(final AgentSpan span, final String key, final String value) {
+        if (value != null && !value.isEmpty()) {
+            span.setTag(key, value);
+        }
+    }
+
+    public void onConnection(final AgentSpan span, final JDBCConnectionContext connectionContext) {
+        final DBInfo dbInfo = connectionContext.getDbInfo();
+        if (dbInfo != null) {
+            processDatabaseType(span, dbInfo.getType());
+
+            setTagIfPresent(span, DB_WAREHOUSE, dbInfo.getWarehouse());
+            setTagIfPresent(span, DB_SCHEMA, dbInfo.getSchema());
+            setTagIfPresent(span, DB_POOL_NAME, connectionContext.getPoolName());
+        }
+        super.onConnection(span, dbInfo);
+    }
+
+    public static JDBCConnectionContext parseConnectionContext(
+            final Connection connection, ContextStore<Connection, JDBCConnectionContext> contextStore) {
+        if (connection == null) {
+            return JDBCConnectionContext.DEFAULT;
+        }
+        JDBCConnectionContext connectionContext = contextStore.get(connection);
+        /*
+         * Logic to get the DBInfo from a JDBC Connection, if the connection was not created via
+         * Driver.connect, or it has never seen before, the connectionInfo map will return null and will
+         * attempt to extract DBInfo from the connection. If the DBInfo can't be extracted, then the
+         * connection will be stored with the DEFAULT DBInfo as the value in the connectionInfo map to
+         * avoid retry overhead.
+         */
+        {
+            if (connectionContext == null) {
+                // first look for injected connection context in wrapped delegates
+                Connection conn = connection;
+                Set<Connection> connections = new HashSet<>();
+                connections.add(conn);
+                try {
+                    while (connectionContext == null) {
+                        Connection delegate = conn.unwrap(Connection.class);
+                        if (delegate == null || !connections.add(delegate)) {
+                            // cycle detected, stop looking
+                            break;
+                        }
+                        connectionContext = contextStore.get(delegate);
+                        conn = delegate;
+                    }
+                } catch (Throwable ignore) {
+                }
+                if (connectionContext == null) {
+                    // couldn't find DBInfo from a previous call anywhere, so we try to fetch it from the DB
+                    connectionContext = new JDBCConnectionContext(parseDBInfoFromConnection(connection));
+                }
+                // store the context on the outermost connection instance to avoid future searches
+                contextStore.put(connection, connectionContext);
+            }
+        }
+        return connectionContext;
+    }
+
+    public String getDbService(final DBInfo dbInfo) {
+        if (null == dbInfo) {
+            return null;
+        }
+        // For Oracle, the URL parser sets instance (SID/service name) but never db.
+        // Without this, dddbs defaults to the generic type string "oracle" which breaks
+        // DBM trace correlation. Other databases (e.g. SQL Server) rely on the type-based
+        // service name for DBM correlation and must not be changed here.
+        if ("oracle".equals(dbInfo.getType()) && dbInfo.getInstance() != null) {
+            String service = dbClientService(dbInfo.getInstance());
+            return service != null ? service : dbInfo.getInstance();
+        }
+        return dbService(dbInfo.getType(), dbInstance(dbInfo));
+    }
+
+    public static DBInfo parseDBInfoFromConnection(final Connection connection) {
+        if (connection == null || !FETCH_DB_METADATA_ON_QUERY) {
+            // we can log here, but it risks to be too verbose
+            return DBInfo.DEFAULT;
+        }
+        DBInfo dbInfo;
+        try {
+            final DatabaseMetaData metaData = connection.getMetaData();
+            final String url;
+            if (metaData != null && (url = metaData.getURL()) != null) {
+                Properties clientInfo = null;
+                try {
+                    clientInfo = connection.getClientInfo();
+                } catch (final Throwable ex) {
+                    // getClientInfo is likely not allowed, we can still extract info from the url alone
+                    log.debug(LogCollector.EXCLUDE_TELEMETRY, "Could not get client info from DB", ex);
+                }
+                dbInfo = JDBCConnectionUrlParser.extractDBInfo(url, clientInfo);
+            } else {
+                dbInfo = DBInfo.DEFAULT;
+            }
+        } catch (final Throwable se) {
+            log.debug("Could not get metadata from DB", se);
+            dbInfo = DBInfo.DEFAULT;
+        }
+        return dbInfo;
+    }
+
+    public void onStatement(AgentSpan span, final String statement) {
+        onRawStatement(span, statement);
+        DBQueryInfo dbQueryInfo = DBQueryInfo.ofStatement(statement);
+        withQueryInfo(span, dbQueryInfo, JDBC_STATEMENT);
+    }
+
+    public void onPreparedStatement(AgentSpan span, DBQueryInfo dbQueryInfo) {
+        withQueryInfo(span, dbQueryInfo, JDBC_PREPARED_STATEMENT);
+    }
+
+    /**
+     * Sets the base hash tag on the span if DBM hash injection is enabled. This is necessary so that
+     * the span (tags) and the query can be matched in the backend.
      */
-    {
-      if (connectionContext == null) {
-        // first look for injected connection context in wrapped delegates
-        Connection conn = connection;
-        Set<Connection> connections = new HashSet<>();
-        connections.add(conn);
+    public void withBaseHash(AgentSpan span, DBInfo dbInfo, String oracleServiceHash) {
+        if (INJECT_COMMENT && DBM_INJECT_SQL_BASE_HASH && PROPAGATE_PROCESS_TAGS) {
+            final String baseHash = usesOracleServiceHashAction(dbInfo) ? oracleServiceHash : BaseHash.getBaseHashStr();
+            if (baseHash != null) {
+                span.setTag(Tags.BASE_HASH, baseHash);
+            }
+        }
+    }
+
+    private void withQueryInfo(AgentSpan span, DBQueryInfo info, CharSequence component) {
+        if (null != info) {
+            span.setResourceName(info.getSql());
+            span.setTag(DB_OPERATION, info.getOperation());
+        } else {
+            span.setResourceName(DB_QUERY);
+        }
+        span.spanContext().setIntegrationName(component);
+        span.setTag(Tags.COMPONENT, component);
+    }
+
+    public boolean isOracle(final DBInfo dbInfo) {
+        return "oracle".equals(dbInfo.getType());
+    }
+
+    public boolean isPostgres(final DBInfo dbInfo) {
+        return dbInfo.getType().startsWith("postgres");
+    }
+
+    public boolean isSqlServer(final DBInfo dbInfo) {
+        return "sqlserver".equals(dbInfo.getType());
+    }
+
+    public boolean shouldInjectSqlComment(final DBInfo dbInfo) {
+        return INJECT_COMMENT && !usesOracleServiceHashAction(dbInfo);
+    }
+
+    private boolean usesOracleServiceHashAction(final DBInfo dbInfo) {
+        return INJECT_ORACLE_SERVICE_HASH_ACTION && isOracle(dbInfo);
+    }
+
+    /**
+     * Sets the dynamic service hash in {@code v$session.action} once per Oracle session and hash.
+     *
+     * @return the hash in ACTION, or {@code null} if ACTION propagation is disabled or failed
+     */
+    public String setServiceHashAction(Connection connection, JDBCConnectionContext connectionContext) {
+        if (!usesOracleServiceHashAction(connectionContext.getDbInfo())) {
+            return null;
+        }
+
+        String baseHash = BaseHash.getBaseHashStr();
+        if (baseHash == null) {
+            return null;
+        }
+        if (!connectionContext.shouldSetOracleServiceHash(baseHash)) {
+            return connectionContext.isOracleServiceHashSet(baseHash) ? baseHash : null;
+        }
+        synchronized (connectionContext) {
+            // Re-read after taking the lock so a waiting query does not restore a stale process hash.
+            baseHash = BaseHash.getBaseHashStr();
+            if (baseHash == null) {
+                return null;
+            }
+            if (!connectionContext.shouldSetOracleServiceHash(baseHash)) {
+                return connectionContext.isOracleServiceHashSet(baseHash) ? baseHash : null;
+            }
+            try {
+                connection.setClientInfo(ORACLE_ACTION_CLIENT_INFO, DD_ORACLE_SERVICE_HASH_PREFIX + baseHash);
+                connectionContext.markOracleServiceHashSet(baseHash);
+                return baseHash;
+            } catch (Throwable e) {
+                if (isUnsupportedOracleAction(e)) {
+                    connectionContext.markOracleServiceActionUnsupported();
+                }
+                logInjectionErrorOnce("service hash action", e);
+                return null;
+            }
+        }
+    }
+
+    private static boolean isUnsupportedOracleAction(Throwable error) {
+        if (error instanceof UnsupportedOperationException || error instanceof AbstractMethodError) {
+            return true;
+        }
+        if (error instanceof SQLClientInfoException) {
+            final SQLClientInfoException clientInfoException = (SQLClientInfoException) error;
+            return clientInfoException.getFailedProperties() != null
+                    && ClientInfoStatus.REASON_UNKNOWN_PROPERTY.equals(
+                            clientInfoException.getFailedProperties().get(ORACLE_ACTION_CLIENT_INFO));
+        }
+        return false;
+    }
+
+    /**
+     * Executes `connection.setClientInfo("OCSID.ACTION", traceContext)` statement on the Oracle DB to
+     * set the trace parent in `v$session.action`. This is used because it isn't possible to propagate
+     * trace parent with the comment.
+     *
+     * @param span The span of the instrumented statement
+     * @param connection The same connection as the one that will be used for the actual statement
+     */
+    public void setAction(AgentSpan span, Connection connection) {
         try {
-          while (connectionContext == null) {
-            Connection delegate = conn.unwrap(Connection.class);
-            if (delegate == null || !connections.add(delegate)) {
-              // cycle detected, stop looking
-              break;
+
+            Integer priority = span.forceSamplingDecision();
+            if (priority == null) {
+                return;
             }
-            connectionContext = contextStore.get(delegate);
-            conn = delegate;
-          }
-        } catch (Throwable ignore) {
+            final String traceContext = DD_INSTRUMENTATION_PREFIX + W3CTraceParent.from(span);
+
+            connection.setClientInfo("OCSID.ACTION", traceContext);
+
+            span.setTag("_dd.dbm_trace_injected", true);
+        } catch (Throwable e) {
+            logInjectionErrorOnce("action", e);
+            DECORATE.onError(span, e);
         }
-        if (connectionContext == null) {
-          // couldn't find DBInfo from a previous call anywhere, so we try to fetch it from the DB
-          connectionContext = new JDBCConnectionContext(parseDBInfoFromConnection(connection));
+    }
+
+    /**
+     * Executes a `SET CONTEXT_INFO` statement on the DB with the active trace ID and the given span
+     * ID. This context will be "attached" to future queries on the same connection. See <a
+     * href="https://learn.microsoft.com/fr-fr/sql/t-sql/functions/context-info-transact-sql">MSSQL
+     * doc</a>. This is to be used where injecting trace and span in the comments with {@link
+     * SQLCommenter#inject} is not possible or convenient.
+     *
+     * <p>Upsides: still "visible" in sub-queries, does not bust caches based on full query text
+     * Downsides: takes time.
+     *
+     * @param connection The same connection as the one that will be used for the actual statement
+     * @param connectionContext metadata and state for the instrumented connection
+     * @return spanID pre-created spanID
+     */
+    public long setContextInfo(Connection connection, JDBCConnectionContext connectionContext) {
+        final byte VERSION = 0;
+        final long spanID = Config.get().getIdGenerationStrategy().generateSpanId();
+        // potentially get build span like here
+        AgentSpan instrumentationSpan = AgentTracer.get()
+                .singleSpanBuilder("java-jdbc", "set context_info")
+                .withTag("dd.instrumentation", true)
+                .start();
+        DECORATE.afterStart(instrumentationSpan);
+        DECORATE.onConnection(instrumentationSpan, connectionContext);
+        try (ContextScope scope = activateSpan(instrumentationSpan)) {
+            final byte samplingDecision = (byte) (instrumentationSpan.forceSamplingDecision() > 0 ? 1 : 0);
+            final byte versionAndSamplingDecision =
+                    (byte) ((VERSION << 4) & 0b11110000 | samplingDecision & 0b00000001);
+
+            ByteBuffer byteBuffer = ByteBuffer.allocate(1 + 3 * Long.BYTES);
+            byteBuffer.order(ByteOrder.BIG_ENDIAN);
+
+            byteBuffer.put(versionAndSamplingDecision);
+            byteBuffer.putLong(spanID);
+            final DDTraceId traceId = instrumentationSpan.getTraceId();
+            byteBuffer.putLong(traceId.toHighOrderLong());
+            byteBuffer.putLong(traceId.toLong());
+            final byte[] contextInfo = byteBuffer.array();
+            String instrumentationSql = "set context_info ?";
+            try (PreparedStatement instrumentationStatement = connection.prepareStatement(instrumentationSql)) {
+                instrumentationStatement.setBytes(1, contextInfo);
+                DECORATE.onStatement(instrumentationSpan, instrumentationSql);
+                instrumentationStatement.execute();
+            } catch (SQLException e) {
+                throw e;
+            }
+        } catch (Exception e) {
+            logInjectionErrorOnce("context_info", e);
+            DECORATE.onError(instrumentationSpan, e);
+        } finally {
+            instrumentationSpan.finish();
         }
-        // store the context on the outermost connection instance to avoid future searches
-        contextStore.put(connection, connectionContext);
-      }
-    }
-    return connectionContext;
-  }
-
-  public String getDbService(final DBInfo dbInfo) {
-    if (null == dbInfo) {
-      return null;
-    }
-    // For Oracle, the URL parser sets instance (SID/service name) but never db.
-    // Without this, dddbs defaults to the generic type string "oracle" which breaks
-    // DBM trace correlation. Other databases (e.g. SQL Server) rely on the type-based
-    // service name for DBM correlation and must not be changed here.
-    if ("oracle".equals(dbInfo.getType()) && dbInfo.getInstance() != null) {
-      String service = dbClientService(dbInfo.getInstance());
-      return service != null ? service : dbInfo.getInstance();
-    }
-    return dbService(dbInfo.getType(), dbInstance(dbInfo));
-  }
-
-  public static DBInfo parseDBInfoFromConnection(final Connection connection) {
-    if (connection == null || !FETCH_DB_METADATA_ON_QUERY) {
-      // we can log here, but it risks to be too verbose
-      return DBInfo.DEFAULT;
-    }
-    DBInfo dbInfo;
-    try {
-      final DatabaseMetaData metaData = connection.getMetaData();
-      final String url;
-      if (metaData != null && (url = metaData.getURL()) != null) {
-        Properties clientInfo = null;
+        return spanID;
+    }
+
+    /**
+     * Executes `SET application_name` statement on the Postgres DB to set the trace parent in
+     * `pg_stat_activity.application_name`. This is used for prepared statements where it isn't
+     * possible to propagate trace parent with the comment. Downside: makes an additional round trip
+     * to the database.
+     *
+     * @param span The span of the instrumented statement
+     * @param connection The same connection as the one that will be used for the actual statement
+     */
+    public void setApplicationName(AgentSpan span, Connection connection) {
+        final long startTime = System.currentTimeMillis();
         try {
-          clientInfo = connection.getClientInfo();
-        } catch (final Throwable ex) {
-          // getClientInfo is likely not allowed, we can still extract info from the url alone
-          log.debug(LogCollector.EXCLUDE_TELEMETRY, "Could not get client info from DB", ex);
+
+            Integer priority = span.forceSamplingDecision();
+            if (priority == null) {
+                return;
+            }
+            final String traceParent = W3CTraceParent.from(span);
+            final String traceContext = "_DD_" + traceParent;
+
+            connection.setClientInfo("ApplicationName", traceContext);
+        } catch (Throwable e) {
+            logInjectionErrorOnce("application_name", e);
+            DECORATE.onError(span, e);
+        } finally {
+            span.setTag(DBM_TRACE_INJECTED, true);
+            final long elapsed = System.currentTimeMillis() - startTime;
+            span.setTag(INSTRUMENTATION_TIME_MS, elapsed);
         }
-        dbInfo = JDBCConnectionUrlParser.extractDBInfo(url, clientInfo);
-      } else {
-        dbInfo = DBInfo.DEFAULT;
-      }
-    } catch (final Throwable se) {
-      log.debug("Could not get metadata from DB", se);
-      dbInfo = DBInfo.DEFAULT;
-    }
-    return dbInfo;
-  }
-
-  public void onStatement(AgentSpan span, final String statement) {
-    onRawStatement(span, statement);
-    DBQueryInfo dbQueryInfo = DBQueryInfo.ofStatement(statement);
-    withQueryInfo(span, dbQueryInfo, JDBC_STATEMENT);
-  }
-
-  public void onPreparedStatement(AgentSpan span, DBQueryInfo dbQueryInfo) {
-    withQueryInfo(span, dbQueryInfo, JDBC_PREPARED_STATEMENT);
-  }
-
-  /**
-   * Sets the base hash tag on the span if DBM hash injection is enabled. This is necessary so that
-   * the span (tags) and the query can be matched in the backend.
-   */
-  public void withBaseHash(AgentSpan span, DBInfo dbInfo, String oracleServiceHash) {
-    if (INJECT_COMMENT && DBM_INJECT_SQL_BASE_HASH && PROPAGATE_PROCESS_TAGS) {
-      final String baseHash =
-          usesOracleServiceHashAction(dbInfo) ? oracleServiceHash : BaseHash.getBaseHashStr();
-      if (baseHash != null) {
-        span.setTag(Tags.BASE_HASH, baseHash);
-      }
-    }
-  }
-
-  private void withQueryInfo(AgentSpan span, DBQueryInfo info, CharSequence component) {
-    if (null != info) {
-      span.setResourceName(info.getSql());
-      span.setTag(DB_OPERATION, info.getOperation());
-    } else {
-      span.setResourceName(DB_QUERY);
-    }
-    span.spanContext().setIntegrationName(component);
-    span.setTag(Tags.COMPONENT, component);
-  }
-
-  public boolean isOracle(final DBInfo dbInfo) {
-    return "oracle".equals(dbInfo.getType());
-  }
-
-  public boolean isPostgres(final DBInfo dbInfo) {
-    return dbInfo.getType().startsWith("postgres");
-  }
-
-  public boolean isSqlServer(final DBInfo dbInfo) {
-    return "sqlserver".equals(dbInfo.getType());
-  }
-
-  public boolean shouldInjectSqlComment(final DBInfo dbInfo) {
-    return INJECT_COMMENT && !usesOracleServiceHashAction(dbInfo);
-  }
-
-  private boolean usesOracleServiceHashAction(final DBInfo dbInfo) {
-    return INJECT_ORACLE_SERVICE_HASH_ACTION && isOracle(dbInfo);
-  }
-
-  /**
-   * Sets the dynamic service hash in {@code v$session.action} once per Oracle session and hash.
-   *
-   * @return the hash in ACTION, or {@code null} if ACTION propagation is disabled or failed
-   */
-  public String setServiceHashAction(
-      Connection connection, JDBCConnectionContext connectionContext) {
-    if (!usesOracleServiceHashAction(connectionContext.getDbInfo())) {
-      return null;
-    }
-
-    String baseHash = BaseHash.getBaseHashStr();
-    if (baseHash == null) {
-      return null;
-    }
-    if (!connectionContext.shouldSetOracleServiceHash(baseHash)) {
-      return connectionContext.isOracleServiceHashSet(baseHash) ? baseHash : null;
-    }
-    synchronized (connectionContext) {
-      // Re-read after taking the lock so a waiting query does not restore a stale process hash.
-      baseHash = BaseHash.getBaseHashStr();
-      if (baseHash == null) {
-        return null;
-      }
-      if (!connectionContext.shouldSetOracleServiceHash(baseHash)) {
-        return connectionContext.isOracleServiceHashSet(baseHash) ? baseHash : null;
-      }
-      try {
-        connection.setClientInfo(
-            ORACLE_ACTION_CLIENT_INFO, DD_ORACLE_SERVICE_HASH_PREFIX + baseHash);
-        connectionContext.markOracleServiceHashSet(baseHash);
-        return baseHash;
-      } catch (Throwable e) {
-        if (isUnsupportedOracleAction(e)) {
-          connectionContext.markOracleServiceActionUnsupported();
+    }
+
+    @Override
+    protected void postProcessServiceAndOperationName(AgentSpan span, DatabaseClientDecorator.NamingEntry namingEntry) {
+        if (namingEntry.getService() != null) {
+            span.setServiceName(namingEntry.getService(), component());
         }
-        logInjectionErrorOnce("service hash action", e);
-        return null;
-      }
-    }
-  }
-
-  private static boolean isUnsupportedOracleAction(Throwable error) {
-    if (error instanceof UnsupportedOperationException || error instanceof AbstractMethodError) {
-      return true;
-    }
-    if (error instanceof SQLClientInfoException) {
-      final SQLClientInfoException clientInfoException = (SQLClientInfoException) error;
-      return clientInfoException.getFailedProperties() != null
-          && ClientInfoStatus.REASON_UNKNOWN_PROPERTY.equals(
-              clientInfoException.getFailedProperties().get(ORACLE_ACTION_CLIENT_INFO));
-    }
-    return false;
-  }
-
-  /**
-   * Executes `connection.setClientInfo("OCSID.ACTION", traceContext)` statement on the Oracle DB to
-   * set the trace parent in `v$session.action`. This is used because it isn't possible to propagate
-   * trace parent with the comment.
-   *
-   * @param span The span of the instrumented statement
-   * @param connection The same connection as the one that will be used for the actual statement
-   */
-  public void setAction(AgentSpan span, Connection connection) {
-    try {
-
-      Integer priority = span.forceSamplingDecision();
-      if (priority == null) {
-        return;
-      }
-      final String traceContext = DD_INSTRUMENTATION_PREFIX + W3CTraceParent.from(span);
-
-      connection.setClientInfo("OCSID.ACTION", traceContext);
-
-      span.setTag("_dd.dbm_trace_injected", true);
-    } catch (Throwable e) {
-      logInjectionErrorOnce("action", e);
-      DECORATE.onError(span, e);
-    }
-  }
-
-  /**
-   * Executes a `SET CONTEXT_INFO` statement on the DB with the active trace ID and the given span
-   * ID. This context will be "attached" to future queries on the same connection. See <a
-   * href="https://learn.microsoft.com/fr-fr/sql/t-sql/functions/context-info-transact-sql">MSSQL
-   * doc</a>. This is to be used where injecting trace and span in the comments with {@link
-   * SQLCommenter#inject} is not possible or convenient.
-   *
-   * <p>Upsides: still "visible" in sub-queries, does not bust caches based on full query text
-   * Downsides: takes time.
-   *
-   * @param connection The same connection as the one that will be used for the actual statement
-   * @param connectionContext metadata and state for the instrumented connection
-   * @return spanID pre-created spanID
-   */
-  public long setContextInfo(Connection connection, JDBCConnectionContext connectionContext) {
-    final byte VERSION = 0;
-    final long spanID = Config.get().getIdGenerationStrategy().generateSpanId();
-    // potentially get build span like here
-    AgentSpan instrumentationSpan =
-        AgentTracer.get()
-            .singleSpanBuilder("java-jdbc", "set context_info")
-            .withTag("dd.instrumentation", true)
-            .start();
-    DECORATE.afterStart(instrumentationSpan);
-    DECORATE.onConnection(instrumentationSpan, connectionContext);
-    try (ContextScope scope = activateSpan(instrumentationSpan)) {
-      final byte samplingDecision =
-          (byte) (instrumentationSpan.forceSamplingDecision() > 0 ? 1 : 0);
-      final byte versionAndSamplingDecision =
-          (byte) ((VERSION << 4) & 0b11110000 | samplingDecision & 0b00000001);
-
-      ByteBuffer byteBuffer = ByteBuffer.allocate(1 + 3 * Long.BYTES);
-      byteBuffer.order(ByteOrder.BIG_ENDIAN);
-
-      byteBuffer.put(versionAndSamplingDecision);
-      byteBuffer.putLong(spanID);
-      final DDTraceId traceId = instrumentationSpan.getTraceId();
-      byteBuffer.putLong(traceId.toHighOrderLong());
-      byteBuffer.putLong(traceId.toLong());
-      final byte[] contextInfo = byteBuffer.array();
-      String instrumentationSql = "set context_info ?";
-      try (PreparedStatement instrumentationStatement =
-          connection.prepareStatement(instrumentationSql)) {
-        instrumentationStatement.setBytes(1, contextInfo);
-        DECORATE.onStatement(instrumentationSpan, instrumentationSql);
-        instrumentationStatement.execute();
-      } catch (SQLException e) {
-        throw e;
-      }
-    } catch (Exception e) {
-      logInjectionErrorOnce("context_info", e);
-      DECORATE.onError(instrumentationSpan, e);
-    } finally {
-      instrumentationSpan.finish();
-    }
-    return spanID;
-  }
-
-  /**
-   * Executes `SET application_name` statement on the Postgres DB to set the trace parent in
-   * `pg_stat_activity.application_name`. This is used for prepared statements where it isn't
-   * possible to propagate trace parent with the comment. Downside: makes an additional round trip
-   * to the database.
-   *
-   * @param span The span of the instrumented statement
-   * @param connection The same connection as the one that will be used for the actual statement
-   */
-  public void setApplicationName(AgentSpan span, Connection connection) {
-    final long startTime = System.currentTimeMillis();
-    try {
-
-      Integer priority = span.forceSamplingDecision();
-      if (priority == null) {
-        return;
-      }
-      final String traceParent = W3CTraceParent.from(span);
-      final String traceContext = "_DD_" + traceParent;
-
-      connection.setClientInfo("ApplicationName", traceContext);
-    } catch (Throwable e) {
-      logInjectionErrorOnce("application_name", e);
-      DECORATE.onError(span, e);
-    } finally {
-      span.setTag(DBM_TRACE_INJECTED, true);
-      final long elapsed = System.currentTimeMillis() - startTime;
-      span.setTag(INSTRUMENTATION_TIME_MS, elapsed);
-    }
-  }
-
-  @Override
-  protected void postProcessServiceAndOperationName(
-      AgentSpan span, DatabaseClientDecorator.NamingEntry namingEntry) {
-    if (namingEntry.getService() != null) {
-      span.setServiceName(namingEntry.getService(), component());
-    }
-    span.setOperationName(namingEntry.getOperation());
-  }
-
-  public boolean shouldInjectTraceContext(DBInfo dbInfo) {
-    if (INJECT_TRACE_CONTEXT && !dbInfo.getFullPropagationSupport()) {
-      if (!warnedAboutDBMPropagationMode) {
-        log.warn(
-            "Using DBM_PROPAGATION_MODE in 'full' mode is not supported for {}. "
-                + "See https://docs.datadoghq.com/database_monitoring/connect_dbm_and_apm/ for more info.",
-            dbInfo.getType());
-        warnedAboutDBMPropagationMode = true;
-      }
-      return false;
-    }
-    return INJECT_TRACE_CONTEXT;
-  }
-
-  private void logInjectionErrorOnce(String vessel, Throwable t) {
-    if (!loggedInjectionError) {
-      loggedInjectionError = true;
-      log.warn(
-          LogCollector.EXCLUDE_TELEMETRY, // nothing we can do on our side about this
-          "Failed to set extra DBM data in {}. "
-              + "To disable this behavior, set trace_prepared_statements to 'false'. "
-              + "See https://docs.datadoghq.com/database_monitoring/connect_dbm_and_apm/ for more info. "
-              + "Will not log again for this kind of error.\n{}",
-          vessel,
-          t);
-    }
-  }
+        span.setOperationName(namingEntry.getOperation());
+    }
+
+    public boolean shouldInjectTraceContext(DBInfo dbInfo) {
+        if (INJECT_TRACE_CONTEXT && !dbInfo.getFullPropagationSupport()) {
+            if (!warnedAboutDBMPropagationMode) {
+                log.warn(
+                        "Using DBM_PROPAGATION_MODE in 'full' mode is not supported for {}. "
+                                + "See https://docs.datadoghq.com/database_monitoring/connect_dbm_and_apm/ for more info.",
+                        dbInfo.getType());
+                warnedAboutDBMPropagationMode = true;
+            }
+            return false;
+        }
+        return INJECT_TRACE_CONTEXT;
+    }
+
+    private void logInjectionErrorOnce(String vessel, Throwable t) {
+        if (!loggedInjectionError) {
+            loggedInjectionError = true;
+            log.warn(
+                    LogCollector.EXCLUDE_TELEMETRY, // nothing we can do on our side about this
+                    "Failed to set extra DBM data in {}. "
+                            + "To disable this behavior, set trace_prepared_statements to 'false'. "
+                            + "See https://docs.datadoghq.com/database_monitoring/connect_dbm_and_apm/ for more info. "
+                            + "Will not log again for this kind of error.\n{}",
+                    vessel,
+                    t);
+        }
+    }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PoolWaitingDecorator.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PoolWaitingDecorator.java
index 8a3569209a0..7e613cf976d 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PoolWaitingDecorator.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PoolWaitingDecorator.java
@@ -4,24 +4,23 @@
 import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;
 
 public class PoolWaitingDecorator extends BaseDecorator {
-  public static final CharSequence POOL_WAITING = UTF8BytesString.create("pool.waiting");
-  public static final CharSequence JAVA_JDBC_POOL_WAITING =
-      UTF8BytesString.create("java-jdbc-pool-waiting");
+    public static final CharSequence POOL_WAITING = UTF8BytesString.create("pool.waiting");
+    public static final CharSequence JAVA_JDBC_POOL_WAITING = UTF8BytesString.create("java-jdbc-pool-waiting");
 
-  public static final PoolWaitingDecorator DECORATE = new PoolWaitingDecorator();
+    public static final PoolWaitingDecorator DECORATE = new PoolWaitingDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jdbc"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jdbc"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return JAVA_JDBC_POOL_WAITING;
-  }
+    @Override
+    protected CharSequence component() {
+        return JAVA_JDBC_POOL_WAITING;
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java
index 284d99eb0a0..766766d3fdb 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java
@@ -7,142 +7,140 @@
 
 @AutoService(InstrumenterModule.class)
 public final class PreparedStatementInstrumentation extends AbstractPreparedStatementInstrumentation
-    implements Instrumenter.ForKnownTypes,
-        Instrumenter.ForConfiguredType,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.ForConfiguredType, Instrumenter.HasMethodAdvice {
 
-  private static final String[] CONCRETE_TYPES = {
-    // redshift
-    "com.amazon.redshift.jdbc.RedshiftPreparedStatement",
-    "com.amazon.redshift.jdbc.RedshiftCallableStatement",
-    // jt400
-    "com.ibm.as400.access.AS400JDBCPreparedStatement",
-    // probably patchy cover
-    "com.microsoft.sqlserver.jdbc.SQLServerPreparedStatement",
-    "com.microsoft.sqlserver.jdbc.SQLServerCallableStatement",
-    // should cover mysql
-    "com.mysql.jdbc.PreparedStatement",
-    "com.mysql.jdbc.jdbc1.PreparedStatement",
-    "com.mysql.jdbc.jdbc2.PreparedStatement",
-    "com.mysql.jdbc.ServerPreparedStatement",
-    "com.mysql.cj.jdbc.PreparedStatement",
-    "com.mysql.cj.jdbc.ServerPreparedStatement",
-    "com.mysql.cj.jdbc.ClientPreparedStatement",
-    "com.mysql.cj.JdbcCallableStatement",
-    "com.mysql.jdbc.CallableStatement",
-    "com.mysql.jdbc.jdbc1.CallableStatement",
-    "com.mysql.jdbc.jdbc2.CallableStatement",
-    "com.mysql.cj.jdbc.CallableStatement",
-    "oracle.jdbc.driver.OracleCallableStatementWrapper",
-    "oracle.jdbc.driver.OraclePreparedStatementWrapper",
-    // covers hsqldb
-    "org.hsqldb.jdbc.JDBCPreparedStatement",
-    "org.hsqldb.jdbc.jdbcPreparedStatement",
-    "org.hsqldb.jdbc.JDBCCallableStatement",
-    "org.hsqldb.jdbc.jdbcCallableStatement",
-    // should cover derby
-    "org.apache.derby.impl.jdbc.EmbedPreparedStatement",
-    "org.apache.derby.impl.jdbc.EmbedCallableStatement",
-    // hive
-    "org.apache.hive.jdbc.HivePreparedStatement",
-    "org.apache.hive.jdbc.HiveCallableStatement",
-    "org.apache.phoenix.jdbc.PhoenixPreparedStatement",
-    "org.apache.pinot.client.PinotPreparedStatement",
-    // covers h2
-    "org.h2.jdbc.JdbcPreparedStatement",
-    "org.h2.jdbc.JdbcCallableStatement",
-    // GridGain's fork of H2
-    "org.gridgain.internal.h2.jdbc.JdbcPreparedStatement",
-    "org.gridgain.internal.h2.jdbc.JdbcCallableStatement",
-    // covers mariadb
-    "org.mariadb.jdbc.JdbcPreparedStatement",
-    "org.mariadb.jdbc.JdbcCallableStatement",
-    "org.mariadb.jdbc.MariaDbServerPreparedStatement",
-    "org.mariadb.jdbc.MariaDbClientPreparedStatement",
-    "org.mariadb.jdbc.MySQLPreparedStatement",
-    "org.mariadb.jdbc.MySQLCallableStatement",
-    "org.mariadb.jdbc.MySQLServerSidePreparedStatement",
-    // MariaDB Connector/J v2.x
-    "org.mariadb.jdbc.ServerSidePreparedStatement",
-    "org.mariadb.jdbc.ClientSidePreparedStatement",
-    // MariaDB Connector/J v3.x
-    "org.mariadb.jdbc.ServerPreparedStatement",
-    "org.mariadb.jdbc.ClientPreparedStatement",
-    // should completely cover postgresql
-    "org.postgresql.jdbc1.PreparedStatement",
-    "org.postgresql.jdbc1.CallableStatement",
-    "org.postgresql.jdbc1.Jdbc1PreparedStatement",
-    "org.postgresql.jdbc1.Jdbc1CallableStatement",
-    "org.postgresql.jdbc2.PreparedStatement",
-    "org.postgresql.jdbc2.CallableStatement",
-    "org.postgresql.jdbc2.AbstractJdbc2Statement",
-    "org.postgresql.jdbc2.Jdbc2PreparedStatement",
-    "org.postgresql.jdbc2.Jdbc2CallableStatement",
-    "org.postgresql.jdbc3.AbstractJdbc3Statement",
-    "org.postgresql.jdbc3.Jdbc3PreparedStatement",
-    "org.postgresql.jdbc3.Jdbc3CallableStatement",
-    "org.postgresql.jdbc3g.AbstractJdbc3gStatement",
-    "org.postgresql.jdbc3g.Jdbc3gPreparedStatement",
-    "org.postgresql.jdbc3g.Jdbc3gCallableStatement",
-    "org.postgresql.jdbc4.AbstractJdbc4Statement",
-    "org.postgresql.jdbc4.Jdbc4PreparedStatement",
-    "org.postgresql.jdbc4.Jdbc4CallableStatement",
-    "org.postgresql.jdbc.PgPreparedStatement",
-    "org.postgresql.jdbc.PgCallableStatement",
-    "postgresql.PreparedStatement",
-    "postgresql.CallableStatement",
-    // EDB version of postgresql
-    "com.edb.jdbc.PgPreparedStatement",
-    "com.edb.jdbc.PgCallableStatement",
-    // should completely cover sqlite
-    "org.sqlite.jdbc3.JDBC3PreparedStatement",
-    "org.sqlite.jdbc4.JDBC4PreparedStatement",
-    "org.sqlite.PrepStmt",
-    // covers snowflake
-    "net.snowflake.client.jdbc.SnowflakePreparedStatementV1",
-    // vertica
-    "com.vertica.jdbc.common.SPreparedStatement",
-    // this covers apache calcite/drill plus the drill-all uber-jar
-    "org.apache.calcite.avatica.AvaticaPreparedStatement",
-    "oadd.org.apache.calcite.avatica.AvaticaPreparedStatement",
-    // jtds (for SQL Server and Sybase)
-    "net.sourceforge.jtds.jdbc.JtdsPreparedStatement",
-    "net.sourceforge.jtds.jdbc.JtdsCallableStatement",
-    // SAP HANA in-memory DB
-    "com.sap.db.jdbc.PreparedStatementSapDB",
-    "com.sap.db.jdbc.CallableStatementSapDB",
-    // aws-mysql-jdbc
-    "software.aws.rds.jdbc.mysql.shading.com.mysql.cj.jdbc.CallableStatement",
-    "software.aws.rds.jdbc.mysql.shading.com.mysql.cj.jdbc.ClientPreparedStatement",
-    "software.aws.rds.jdbc.mysql.shading.com.mysql.cj.jdbc.PreparedStatement",
-    "software.aws.rds.jdbc.mysql.shading.com.mysql.cj.jdbc.ServerPreparedStatement",
-    "software.aws.rds.jdbc.mysql.shading.com.mysql.cj.JdbcCallableStatement",
-    // IBM Informix
-    "com.informix.jdbc.IfxPreparedStatement",
-    // Intersystems IRIS
-    "com.intersystems.jdbc.IRISPreparedStatement",
-    "com.intersystems.jdbc.IRISCallableStatement",
-    // sybase
-    "com.sybase.jdbc2.jdbc.SybPreparedStatement",
-    "com.sybase.jdbc2.jdbc.SybCallableStatement",
-    "com.sybase.jdbc4.jdbc.SybPreparedStatement",
-    "com.sybase.jdbc4.jdbc.SybCallableStatement",
-    // for testing purposes
-    "test.TestPreparedStatement"
-  };
+    private static final String[] CONCRETE_TYPES = {
+        // redshift
+        "com.amazon.redshift.jdbc.RedshiftPreparedStatement",
+        "com.amazon.redshift.jdbc.RedshiftCallableStatement",
+        // jt400
+        "com.ibm.as400.access.AS400JDBCPreparedStatement",
+        // probably patchy cover
+        "com.microsoft.sqlserver.jdbc.SQLServerPreparedStatement",
+        "com.microsoft.sqlserver.jdbc.SQLServerCallableStatement",
+        // should cover mysql
+        "com.mysql.jdbc.PreparedStatement",
+        "com.mysql.jdbc.jdbc1.PreparedStatement",
+        "com.mysql.jdbc.jdbc2.PreparedStatement",
+        "com.mysql.jdbc.ServerPreparedStatement",
+        "com.mysql.cj.jdbc.PreparedStatement",
+        "com.mysql.cj.jdbc.ServerPreparedStatement",
+        "com.mysql.cj.jdbc.ClientPreparedStatement",
+        "com.mysql.cj.JdbcCallableStatement",
+        "com.mysql.jdbc.CallableStatement",
+        "com.mysql.jdbc.jdbc1.CallableStatement",
+        "com.mysql.jdbc.jdbc2.CallableStatement",
+        "com.mysql.cj.jdbc.CallableStatement",
+        "oracle.jdbc.driver.OracleCallableStatementWrapper",
+        "oracle.jdbc.driver.OraclePreparedStatementWrapper",
+        // covers hsqldb
+        "org.hsqldb.jdbc.JDBCPreparedStatement",
+        "org.hsqldb.jdbc.jdbcPreparedStatement",
+        "org.hsqldb.jdbc.JDBCCallableStatement",
+        "org.hsqldb.jdbc.jdbcCallableStatement",
+        // should cover derby
+        "org.apache.derby.impl.jdbc.EmbedPreparedStatement",
+        "org.apache.derby.impl.jdbc.EmbedCallableStatement",
+        // hive
+        "org.apache.hive.jdbc.HivePreparedStatement",
+        "org.apache.hive.jdbc.HiveCallableStatement",
+        "org.apache.phoenix.jdbc.PhoenixPreparedStatement",
+        "org.apache.pinot.client.PinotPreparedStatement",
+        // covers h2
+        "org.h2.jdbc.JdbcPreparedStatement",
+        "org.h2.jdbc.JdbcCallableStatement",
+        // GridGain's fork of H2
+        "org.gridgain.internal.h2.jdbc.JdbcPreparedStatement",
+        "org.gridgain.internal.h2.jdbc.JdbcCallableStatement",
+        // covers mariadb
+        "org.mariadb.jdbc.JdbcPreparedStatement",
+        "org.mariadb.jdbc.JdbcCallableStatement",
+        "org.mariadb.jdbc.MariaDbServerPreparedStatement",
+        "org.mariadb.jdbc.MariaDbClientPreparedStatement",
+        "org.mariadb.jdbc.MySQLPreparedStatement",
+        "org.mariadb.jdbc.MySQLCallableStatement",
+        "org.mariadb.jdbc.MySQLServerSidePreparedStatement",
+        // MariaDB Connector/J v2.x
+        "org.mariadb.jdbc.ServerSidePreparedStatement",
+        "org.mariadb.jdbc.ClientSidePreparedStatement",
+        // MariaDB Connector/J v3.x
+        "org.mariadb.jdbc.ServerPreparedStatement",
+        "org.mariadb.jdbc.ClientPreparedStatement",
+        // should completely cover postgresql
+        "org.postgresql.jdbc1.PreparedStatement",
+        "org.postgresql.jdbc1.CallableStatement",
+        "org.postgresql.jdbc1.Jdbc1PreparedStatement",
+        "org.postgresql.jdbc1.Jdbc1CallableStatement",
+        "org.postgresql.jdbc2.PreparedStatement",
+        "org.postgresql.jdbc2.CallableStatement",
+        "org.postgresql.jdbc2.AbstractJdbc2Statement",
+        "org.postgresql.jdbc2.Jdbc2PreparedStatement",
+        "org.postgresql.jdbc2.Jdbc2CallableStatement",
+        "org.postgresql.jdbc3.AbstractJdbc3Statement",
+        "org.postgresql.jdbc3.Jdbc3PreparedStatement",
+        "org.postgresql.jdbc3.Jdbc3CallableStatement",
+        "org.postgresql.jdbc3g.AbstractJdbc3gStatement",
+        "org.postgresql.jdbc3g.Jdbc3gPreparedStatement",
+        "org.postgresql.jdbc3g.Jdbc3gCallableStatement",
+        "org.postgresql.jdbc4.AbstractJdbc4Statement",
+        "org.postgresql.jdbc4.Jdbc4PreparedStatement",
+        "org.postgresql.jdbc4.Jdbc4CallableStatement",
+        "org.postgresql.jdbc.PgPreparedStatement",
+        "org.postgresql.jdbc.PgCallableStatement",
+        "postgresql.PreparedStatement",
+        "postgresql.CallableStatement",
+        // EDB version of postgresql
+        "com.edb.jdbc.PgPreparedStatement",
+        "com.edb.jdbc.PgCallableStatement",
+        // should completely cover sqlite
+        "org.sqlite.jdbc3.JDBC3PreparedStatement",
+        "org.sqlite.jdbc4.JDBC4PreparedStatement",
+        "org.sqlite.PrepStmt",
+        // covers snowflake
+        "net.snowflake.client.jdbc.SnowflakePreparedStatementV1",
+        // vertica
+        "com.vertica.jdbc.common.SPreparedStatement",
+        // this covers apache calcite/drill plus the drill-all uber-jar
+        "org.apache.calcite.avatica.AvaticaPreparedStatement",
+        "oadd.org.apache.calcite.avatica.AvaticaPreparedStatement",
+        // jtds (for SQL Server and Sybase)
+        "net.sourceforge.jtds.jdbc.JtdsPreparedStatement",
+        "net.sourceforge.jtds.jdbc.JtdsCallableStatement",
+        // SAP HANA in-memory DB
+        "com.sap.db.jdbc.PreparedStatementSapDB",
+        "com.sap.db.jdbc.CallableStatementSapDB",
+        // aws-mysql-jdbc
+        "software.aws.rds.jdbc.mysql.shading.com.mysql.cj.jdbc.CallableStatement",
+        "software.aws.rds.jdbc.mysql.shading.com.mysql.cj.jdbc.ClientPreparedStatement",
+        "software.aws.rds.jdbc.mysql.shading.com.mysql.cj.jdbc.PreparedStatement",
+        "software.aws.rds.jdbc.mysql.shading.com.mysql.cj.jdbc.ServerPreparedStatement",
+        "software.aws.rds.jdbc.mysql.shading.com.mysql.cj.JdbcCallableStatement",
+        // IBM Informix
+        "com.informix.jdbc.IfxPreparedStatement",
+        // Intersystems IRIS
+        "com.intersystems.jdbc.IRISPreparedStatement",
+        "com.intersystems.jdbc.IRISCallableStatement",
+        // sybase
+        "com.sybase.jdbc2.jdbc.SybPreparedStatement",
+        "com.sybase.jdbc2.jdbc.SybCallableStatement",
+        "com.sybase.jdbc4.jdbc.SybPreparedStatement",
+        "com.sybase.jdbc4.jdbc.SybCallableStatement",
+        // for testing purposes
+        "test.TestPreparedStatement"
+    };
 
-  @Override
-  public String configuredMatchingType() {
-    // this won't match any class unless the property is set
-    return InstrumenterConfig.get().getJdbcPreparedStatementClassName();
-  }
+    @Override
+    public String configuredMatchingType() {
+        // this won't match any class unless the property is set
+        return InstrumenterConfig.get().getJdbcPreparedStatementClassName();
+    }
 
-  public PreparedStatementInstrumentation() {
-    super("jdbc");
-  }
+    public PreparedStatementInstrumentation() {
+        super("jdbc");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return CONCRETE_TYPES;
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return CONCRETE_TYPES;
+    }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLCommenter.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLCommenter.java
index e40b09e1a04..88b327dd7a8 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLCommenter.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLCommenter.java
@@ -4,157 +4,154 @@
 import datadog.trace.util.SubSequence;
 
 public class SQLCommenter {
-  // SQL-specific constants, rest defined in SharedDBCommenter
-  private static final char SPACE = ' ';
-  private static final String OPEN_COMMENT = "/*";
-  private static final int OPEN_COMMENT_LEN = OPEN_COMMENT.length();
-  private static final String CLOSE_COMMENT = "*/";
-
-  // Size estimation for StringBuilder pre-allocation
-  private static final int SPACE_CHARS = 2; // Leading and trailing spaces
-  private static final int COMMENT_DELIMITERS = 4; // "/*" + "*/"
-  private static final int BUFFER_EXTRA = 4;
-  private static final int SQL_COMMENT_OVERHEAD = SPACE_CHARS + COMMENT_DELIMITERS + BUFFER_EXTRA;
-
-  /**
-   * Returns the first whitespace-delimited word of {@code sql} as a zero-copy {@link SubSequence}
-   * -- avoiding a substring allocation on every {@link #inject} call, since the callers only need
-   * to {@code startsWith}/{@code equalsIgnoreCase} it.
-   *
-   * <p><b>Transient view -- do not retain.</b> The returned {@code SubSequence} references the
-   * entire {@code sql} string, so holding onto it keeps the whole query reachable (a memory hazard
-   * for large SQL). Consume it in place and discard; if the value must be retained, call {@link
-   * SubSequence#toString()} to detach a standalone copy.
-   */
-  protected static SubSequence getFirstWord(String sql) {
-    int beginIndex = 0;
-    while (beginIndex < sql.length() && Character.isWhitespace(sql.charAt(beginIndex))) {
-      beginIndex++;
-    }
-    int endIndex = beginIndex;
-    while (endIndex < sql.length() && !Character.isWhitespace(sql.charAt(endIndex))) {
-      endIndex++;
-    }
-    return SubSequence.of(sql, beginIndex, endIndex);
-  }
-
-  public static String inject(
-      String sql,
-      String dbService,
-      String dbType,
-      String hostname,
-      String dbName,
-      String traceParent,
-      boolean preferAppend) {
-    if (sql == null || sql.isEmpty()) {
-      return sql;
-    }
-    boolean appendComment = preferAppend;
-    if (dbType != null) {
-      final SubSequence firstWord = getFirstWord(sql);
-
-      // The Postgres JDBC parser doesn't allow SQL comments anywhere in a JDBC
-      // callable statements
-      // https://github.com/pgjdbc/pgjdbc/blob/master/pgjdbc/src/main/java/org/postgresql/core/Parser.java#L1038
-      // TODO: Could we inject the comment after the JDBC has been converted to
-      // standard SQL?
-      if (firstWord.startsWith("{") && dbType.startsWith("postgres")) {
-        return sql;
-      }
-
-      // Append the comment for mysql JDBC callable statements
-      if (firstWord.startsWith("{") && "mysql".equals(dbType)) {
-        appendComment = true;
-      }
-
-      // Both Postgres and MySQL are unhappy with anything before CALL in a stored
-      // procedure invocation, but they seem ok with it after so we force append mode
-      if (firstWord.equalsIgnoreCase("call")) {
-        appendComment = true;
-      }
-
-      // Append the comment in the case of a pg_hint_plan extension
-      if (dbType.startsWith("postgres") && sql.contains("/*+")) {
-        appendComment = true;
-      }
-    }
-    if (hasDDComment(sql, appendComment)) {
-      return sql;
+    // SQL-specific constants, rest defined in SharedDBCommenter
+    private static final char SPACE = ' ';
+    private static final String OPEN_COMMENT = "/*";
+    private static final int OPEN_COMMENT_LEN = OPEN_COMMENT.length();
+    private static final String CLOSE_COMMENT = "*/";
+
+    // Size estimation for StringBuilder pre-allocation
+    private static final int SPACE_CHARS = 2; // Leading and trailing spaces
+    private static final int COMMENT_DELIMITERS = 4; // "/*" + "*/"
+    private static final int BUFFER_EXTRA = 4;
+    private static final int SQL_COMMENT_OVERHEAD = SPACE_CHARS + COMMENT_DELIMITERS + BUFFER_EXTRA;
+
+    /**
+     * Returns the first whitespace-delimited word of {@code sql} as a zero-copy {@link SubSequence}
+     * -- avoiding a substring allocation on every {@link #inject} call, since the callers only need
+     * to {@code startsWith}/{@code equalsIgnoreCase} it.
+     *
+     * <p><b>Transient view -- do not retain.</b> The returned {@code SubSequence} references the
+     * entire {@code sql} string, so holding onto it keeps the whole query reachable (a memory hazard
+     * for large SQL). Consume it in place and discard; if the value must be retained, call {@link
+     * SubSequence#toString()} to detach a standalone copy.
+     */
+    protected static SubSequence getFirstWord(String sql) {
+        int beginIndex = 0;
+        while (beginIndex < sql.length() && Character.isWhitespace(sql.charAt(beginIndex))) {
+            beginIndex++;
+        }
+        int endIndex = beginIndex;
+        while (endIndex < sql.length() && !Character.isWhitespace(sql.charAt(endIndex))) {
+            endIndex++;
+        }
+        return SubSequence.of(sql, beginIndex, endIndex);
     }
 
-    String commentContent =
-        SharedDBCommenter.buildComment(dbService, dbType, hostname, dbName, traceParent);
-
-    if (commentContent == null) {
-      return sql;
-    }
-
-    // SQL-specific wrapping with /* */
-    StringBuilder sb =
-        new StringBuilder(sql.length() + commentContent.length() + SQL_COMMENT_OVERHEAD);
-    int closingSemicolonIndex = indexOfClosingSemicolon(sql);
-    if (appendComment) {
-      if (closingSemicolonIndex > -1) {
-        sb.append(sql, 0, closingSemicolonIndex);
-      } else {
-        sb.append(sql);
-      }
-      sb.append(SPACE);
+    public static String inject(
+            String sql,
+            String dbService,
+            String dbType,
+            String hostname,
+            String dbName,
+            String traceParent,
+            boolean preferAppend) {
+        if (sql == null || sql.isEmpty()) {
+            return sql;
+        }
+        boolean appendComment = preferAppend;
+        if (dbType != null) {
+            final SubSequence firstWord = getFirstWord(sql);
+
+            // The Postgres JDBC parser doesn't allow SQL comments anywhere in a JDBC
+            // callable statements
+            // https://github.com/pgjdbc/pgjdbc/blob/master/pgjdbc/src/main/java/org/postgresql/core/Parser.java#L1038
+            // TODO: Could we inject the comment after the JDBC has been converted to
+            // standard SQL?
+            if (firstWord.startsWith("{") && dbType.startsWith("postgres")) {
+                return sql;
+            }
+
+            // Append the comment for mysql JDBC callable statements
+            if (firstWord.startsWith("{") && "mysql".equals(dbType)) {
+                appendComment = true;
+            }
+
+            // Both Postgres and MySQL are unhappy with anything before CALL in a stored
+            // procedure invocation, but they seem ok with it after so we force append mode
+            if (firstWord.equalsIgnoreCase("call")) {
+                appendComment = true;
+            }
+
+            // Append the comment in the case of a pg_hint_plan extension
+            if (dbType.startsWith("postgres") && sql.contains("/*+")) {
+                appendComment = true;
+            }
+        }
+        if (hasDDComment(sql, appendComment)) {
+            return sql;
+        }
+
+        String commentContent = SharedDBCommenter.buildComment(dbService, dbType, hostname, dbName, traceParent);
+
+        if (commentContent == null) {
+            return sql;
+        }
+
+        // SQL-specific wrapping with /* */
+        StringBuilder sb = new StringBuilder(sql.length() + commentContent.length() + SQL_COMMENT_OVERHEAD);
+        int closingSemicolonIndex = indexOfClosingSemicolon(sql);
+        if (appendComment) {
+            if (closingSemicolonIndex > -1) {
+                sb.append(sql, 0, closingSemicolonIndex);
+            } else {
+                sb.append(sql);
+            }
+            sb.append(SPACE);
+        }
+
+        sb.append(OPEN_COMMENT);
+        sb.append(commentContent);
+        sb.append(CLOSE_COMMENT);
+        if (!appendComment) {
+            sb.append(SPACE);
+            sb.append(sql);
+        }
+
+        if (appendComment && closingSemicolonIndex > -1) {
+            sb.append(';');
+        }
+
+        return sb.toString();
     }
 
-    sb.append(OPEN_COMMENT);
-    sb.append(commentContent);
-    sb.append(CLOSE_COMMENT);
-    if (!appendComment) {
-      sb.append(SPACE);
-      sb.append(sql);
+    private static boolean hasDDComment(String sql, boolean appendComment) {
+        if ((!sql.endsWith(CLOSE_COMMENT) && appendComment) || ((!sql.startsWith(OPEN_COMMENT)) && !appendComment)) {
+            return false;
+        }
+
+        int startIdx;
+        int endIdx;
+        if (appendComment) {
+            startIdx = sql.lastIndexOf(OPEN_COMMENT);
+            endIdx = sql.lastIndexOf(CLOSE_COMMENT);
+        } else {
+            startIdx = sql.indexOf(OPEN_COMMENT);
+            endIdx = sql.indexOf(CLOSE_COMMENT);
+        }
+        if (startIdx != -1 && endIdx != -1 && endIdx > startIdx) {
+            // Check the comment body in place -- no substring of the comment region.
+            return SharedDBCommenter.containsTraceComment(sql, startIdx + OPEN_COMMENT_LEN, endIdx);
+        }
+        return false;
     }
 
-    if (appendComment && closingSemicolonIndex > -1) {
-      sb.append(';');
+    /**
+     * @param query SQL query
+     * @return index of the semicolon that ends the query, or -1 if none
+     */
+    private static int indexOfClosingSemicolon(String query) {
+        for (int i = query.length() - 1; i >= 0; i--) {
+            char c = query.charAt(i);
+            if (c == ';') {
+                return i;
+            } else if (Character.isWhitespace(c)) {
+                continue;
+            }
+
+            break;
+        }
+
+        return -1;
     }
-
-    return sb.toString();
-  }
-
-  private static boolean hasDDComment(String sql, boolean appendComment) {
-    if ((!sql.endsWith(CLOSE_COMMENT) && appendComment)
-        || ((!sql.startsWith(OPEN_COMMENT)) && !appendComment)) {
-      return false;
-    }
-
-    int startIdx;
-    int endIdx;
-    if (appendComment) {
-      startIdx = sql.lastIndexOf(OPEN_COMMENT);
-      endIdx = sql.lastIndexOf(CLOSE_COMMENT);
-    } else {
-      startIdx = sql.indexOf(OPEN_COMMENT);
-      endIdx = sql.indexOf(CLOSE_COMMENT);
-    }
-    if (startIdx != -1 && endIdx != -1 && endIdx > startIdx) {
-      // Check the comment body in place -- no substring of the comment region.
-      return SharedDBCommenter.containsTraceComment(sql, startIdx + OPEN_COMMENT_LEN, endIdx);
-    }
-    return false;
-  }
-
-  /**
-   * @param query SQL query
-   * @return index of the semicolon that ends the query, or -1 if none
-   */
-  private static int indexOfClosingSemicolon(String query) {
-    for (int i = query.length() - 1; i >= 0; i--) {
-      char c = query.charAt(i);
-      if (c == ';') {
-        return i;
-      } else if (Character.isWhitespace(c)) {
-        continue;
-      }
-
-      break;
-    }
-
-    return -1;
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java
index 8f00550c721..95f5b214124 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java
@@ -37,165 +37,157 @@
 
 @AutoService(InstrumenterModule.class)
 public final class StatementInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
-
-  public StatementInstrumentation() {
-    super("jdbc");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named("java.sql.Statement"));
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("java.sql.Connection", JDBCConnectionContext.class.getName());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        nameStartsWith("execute").and(takesArgument(0, String.class)).and(isPublic()),
-        StatementInstrumentation.class.getName() + "$StatementAdvice");
-  }
-
-  public static class StatementAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(value = 0, readOnly = false) String sql,
-        @Advice.AllArguments() Object[] args,
-        @Advice.This final Statement statement) {
-      // TODO consider matching known non-wrapper implementations to avoid this check
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Statement.class);
-      if (callDepth > 0) {
-        return null;
-      }
-      try {
-        final Connection connection = statement.getConnection();
-        final JDBCConnectionContext connectionContext =
-            JDBCDecorator.parseConnectionContext(
-                connection,
-                InstrumentationContext.get(Connection.class, JDBCConnectionContext.class));
-        final DBInfo dbInfo = connectionContext.getDbInfo();
-        boolean injectTraceContext = DECORATE.shouldInjectTraceContext(dbInfo);
-        final AgentSpan span;
-        final boolean isSqlServer = DECORATE.isSqlServer(dbInfo);
-        final boolean isOracle = DECORATE.isOracle(dbInfo);
-
-        final String oracleServiceHash =
-            DECORATE.setServiceHashAction(connection, connectionContext);
-
-        if (INJECT_COMMENT && injectTraceContext) {
-          if (isSqlServer) {
-            // The span ID is pre-determined so that we can reference it when setting the context
-            final long spanID = DECORATE.setContextInfo(connection, connectionContext);
-            // we then force that pre-determined span ID for the span covering the actual query
-            span =
-                AgentTracer.get()
-                    .singleSpanBuilder("java-jdbc-statement", DATABASE_QUERY)
-                    .withSpanId(spanID)
-                    .start();
-          } else if (isOracle) {
-            span = startSpan("java-jdbc-statement", DATABASE_QUERY);
-            DECORATE.setAction(span, connection);
-          } else {
-            span = startSpan("java-jdbc-statement", DATABASE_QUERY);
-          }
-        } else {
-          span = startSpan("java-jdbc-statement", DATABASE_QUERY);
-        }
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public StatementInstrumentation() {
+        super("jdbc");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named("java.sql.Statement"));
+    }
 
-        DECORATE.afterStart(span);
-        DECORATE.onConnection(span, connectionContext);
-        final String copy = sql;
-        if (span != null && DECORATE.shouldInjectSqlComment(dbInfo)) {
-          String traceParent = null;
-
-          if (injectTraceContext) {
-            Integer priority = span.forceSamplingDecision();
-            if (priority != null) {
-              if (!isSqlServer) {
-                traceParent = W3CTraceParent.from(span);
-              }
-              // set the dbm trace injected tag on the span
-              span.setTag(DBM_TRACE_INJECTED, true);
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("java.sql.Connection", JDBCConnectionContext.class.getName());
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                nameStartsWith("execute").and(takesArgument(0, String.class)).and(isPublic()),
+                StatementInstrumentation.class.getName() + "$StatementAdvice");
+    }
+
+    public static class StatementAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(value = 0, readOnly = false) String sql,
+                @Advice.AllArguments() Object[] args,
+                @Advice.This final Statement statement) {
+            // TODO consider matching known non-wrapper implementations to avoid this check
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Statement.class);
+            if (callDepth > 0) {
+                return null;
             }
-          }
-          // For SQL Server and Oracle, trace context is propagated via
-          // context_info and v$session.action respectively.
-          // we should not also inject it into SQL comments to avoid duplication
-          final boolean injectTraceInComment = injectTraceContext && !isSqlServer && !isOracle;
-
-          // prepend mode will prepend the SQL comment to the raw sql query
-          boolean appendComment = DECORATE.DBM_ALWAYS_APPEND_SQL_COMMENT;
-
-          // There is a bug in the SQL Server JDBC driver that prevents
-          // the generated keys from being returned when the
-          // SQL comment is prepended to the SQL query.
-          // We only append in this case to avoid the comment from being truncated.
-          // @see https://github.com/microsoft/mssql-jdbc/issues/2729
-          if (isSqlServer
-              && !appendComment
-              && args.length == 2
-              && args[1] instanceof Integer
-              && (Integer) args[1] == Statement.RETURN_GENERATED_KEYS) {
-            appendComment = true;
-          }
-
-          final String dbService;
-          if (isOracle) {
-            String oracleService = DECORATE.getDbService(dbInfo);
-            if (oracleService != null) {
-              oracleService =
-                  traceConfig(span).getServiceMapping().getOrDefault(oracleService, oracleService);
+            try {
+                final Connection connection = statement.getConnection();
+                final JDBCConnectionContext connectionContext = JDBCDecorator.parseConnectionContext(
+                        connection, InstrumentationContext.get(Connection.class, JDBCConnectionContext.class));
+                final DBInfo dbInfo = connectionContext.getDbInfo();
+                boolean injectTraceContext = DECORATE.shouldInjectTraceContext(dbInfo);
+                final AgentSpan span;
+                final boolean isSqlServer = DECORATE.isSqlServer(dbInfo);
+                final boolean isOracle = DECORATE.isOracle(dbInfo);
+
+                final String oracleServiceHash = DECORATE.setServiceHashAction(connection, connectionContext);
+
+                if (INJECT_COMMENT && injectTraceContext) {
+                    if (isSqlServer) {
+                        // The span ID is pre-determined so that we can reference it when setting the context
+                        final long spanID = DECORATE.setContextInfo(connection, connectionContext);
+                        // we then force that pre-determined span ID for the span covering the actual query
+                        span = AgentTracer.get()
+                                .singleSpanBuilder("java-jdbc-statement", DATABASE_QUERY)
+                                .withSpanId(spanID)
+                                .start();
+                    } else if (isOracle) {
+                        span = startSpan("java-jdbc-statement", DATABASE_QUERY);
+                        DECORATE.setAction(span, connection);
+                    } else {
+                        span = startSpan("java-jdbc-statement", DATABASE_QUERY);
+                    }
+                } else {
+                    span = startSpan("java-jdbc-statement", DATABASE_QUERY);
+                }
+
+                DECORATE.afterStart(span);
+                DECORATE.onConnection(span, connectionContext);
+                final String copy = sql;
+                if (span != null && DECORATE.shouldInjectSqlComment(dbInfo)) {
+                    String traceParent = null;
+
+                    if (injectTraceContext) {
+                        Integer priority = span.forceSamplingDecision();
+                        if (priority != null) {
+                            if (!isSqlServer) {
+                                traceParent = W3CTraceParent.from(span);
+                            }
+                            // set the dbm trace injected tag on the span
+                            span.setTag(DBM_TRACE_INJECTED, true);
+                        }
+                    }
+                    // For SQL Server and Oracle, trace context is propagated via
+                    // context_info and v$session.action respectively.
+                    // we should not also inject it into SQL comments to avoid duplication
+                    final boolean injectTraceInComment = injectTraceContext && !isSqlServer && !isOracle;
+
+                    // prepend mode will prepend the SQL comment to the raw sql query
+                    boolean appendComment = DECORATE.DBM_ALWAYS_APPEND_SQL_COMMENT;
+
+                    // There is a bug in the SQL Server JDBC driver that prevents
+                    // the generated keys from being returned when the
+                    // SQL comment is prepended to the SQL query.
+                    // We only append in this case to avoid the comment from being truncated.
+                    // @see https://github.com/microsoft/mssql-jdbc/issues/2729
+                    if (isSqlServer
+                            && !appendComment
+                            && args.length == 2
+                            && args[1] instanceof Integer
+                            && (Integer) args[1] == Statement.RETURN_GENERATED_KEYS) {
+                        appendComment = true;
+                    }
+
+                    final String dbService;
+                    if (isOracle) {
+                        String oracleService = DECORATE.getDbService(dbInfo);
+                        if (oracleService != null) {
+                            oracleService =
+                                    traceConfig(span).getServiceMapping().getOrDefault(oracleService, oracleService);
+                        }
+                        dbService = oracleService;
+                    } else {
+                        dbService = span.getServiceName();
+                    }
+                    sql = SQLCommenter.inject(
+                            sql,
+                            dbService,
+                            dbInfo.getType(),
+                            dbInfo.getHost(),
+                            dbInfo.getDb(),
+                            injectTraceInComment ? traceParent : null,
+                            appendComment);
+                }
+                DECORATE.onStatement(span, copy);
+                DECORATE.withBaseHash(span, dbInfo, oracleServiceHash);
+                return activateSpan(span);
+            } catch (SQLException e) {
+                // if we can't get the connection for any reason
+                return null;
+            } catch (BlockingException e) {
+                CallDepthThreadLocalMap.reset(Statement.class);
+                // re-throw blocking exceptions
+                throw e;
             }
-            dbService = oracleService;
-          } else {
-            dbService = span.getServiceName();
-          }
-          sql =
-              SQLCommenter.inject(
-                  sql,
-                  dbService,
-                  dbInfo.getType(),
-                  dbInfo.getHost(),
-                  dbInfo.getDb(),
-                  injectTraceInComment ? traceParent : null,
-                  appendComment);
         }
-        DECORATE.onStatement(span, copy);
-        DECORATE.withBaseHash(span, dbInfo, oracleServiceHash);
-        return activateSpan(span);
-      } catch (SQLException e) {
-        // if we can't get the connection for any reason
-        return null;
-      } catch (BlockingException e) {
-        CallDepthThreadLocalMap.reset(Statement.class);
-        // re-throw blocking exceptions
-        throw e;
-      }
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      CallDepthThreadLocalMap.decrementCallDepth(Statement.class);
-      if (scope == null) {
-        return;
-      }
-      AgentSpan span = spanFromScope(scope);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            CallDepthThreadLocalMap.decrementCallDepth(Statement.class);
+            if (scope == null) {
+                return;
+            }
+            AgentSpan span = spanFromScope(scope);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/test/groovy/test/TestDataSource.java b/dd-java-agent/instrumentation/jdbc/src/test/groovy/test/TestDataSource.java
index b5508b5dc7a..0b7a5081330 100644
--- a/dd-java-agent/instrumentation/jdbc/src/test/groovy/test/TestDataSource.java
+++ b/dd-java-agent/instrumentation/jdbc/src/test/groovy/test/TestDataSource.java
@@ -29,83 +29,83 @@
  * @author Brett Wooldridge
  */
 public class TestDataSource implements DataSource {
-  private String user;
-  private String password;
-  private PrintWriter logWriter;
-  private SQLException throwException;
-  private int loginTimeout;
-
-  public String getUser() {
-    return user;
-  }
-
-  public void setUser(String user) {
-    this.user = user;
-  }
-
-  public String getPassword() {
-    return password;
-  }
-
-  public void setURL(String url) {
-    // we don't care
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public PrintWriter getLogWriter() throws SQLException {
-    return logWriter;
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public void setLogWriter(PrintWriter out) throws SQLException {
-    this.logWriter = out;
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public void setLoginTimeout(int seconds) throws SQLException {
-    this.loginTimeout = seconds;
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public int getLoginTimeout() throws SQLException {
-    return loginTimeout;
-  }
-
-  /** {@inheritDoc} */
-  public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-    return null;
-  }
-
-  /** {@inheritDoc} */
-  @SuppressWarnings("unchecked")
-  @Override
-  public <T> T unwrap(Class<T> iface) throws SQLException {
-    if (iface.isInstance(this)) {
-      return (T) this;
+    private String user;
+    private String password;
+    private PrintWriter logWriter;
+    private SQLException throwException;
+    private int loginTimeout;
+
+    public String getUser() {
+        return user;
     }
 
-    throw new SQLException("Wrapped DataSource is not an instance of " + iface);
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public boolean isWrapperFor(Class<?> iface) throws SQLException {
-    return false;
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public Connection getConnection() throws SQLException {
-    return new TestConnection(false);
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public Connection getConnection(String username, String password) throws SQLException {
-    return new TestConnection(false);
-  }
+    public void setUser(String user) {
+        this.user = user;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setURL(String url) {
+        // we don't care
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public PrintWriter getLogWriter() throws SQLException {
+        return logWriter;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setLogWriter(PrintWriter out) throws SQLException {
+        this.logWriter = out;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setLoginTimeout(int seconds) throws SQLException {
+        this.loginTimeout = seconds;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getLoginTimeout() throws SQLException {
+        return loginTimeout;
+    }
+
+    /** {@inheritDoc} */
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        if (iface.isInstance(this)) {
+            return (T) this;
+        }
+
+        throw new SQLException("Wrapped DataSource is not an instance of " + iface);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Connection getConnection() throws SQLException {
+        return new TestConnection(false);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Connection getConnection(String username, String password) throws SQLException {
+        return new TestConnection(false);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jdbc/src/test/java/datadog/trace/instrumentation/jdbc/SQLCommenterTest.java b/dd-java-agent/instrumentation/jdbc/src/test/java/datadog/trace/instrumentation/jdbc/SQLCommenterTest.java
index 4cb5ae7b489..2c6ca96b0cb 100644
--- a/dd-java-agent/instrumentation/jdbc/src/test/java/datadog/trace/instrumentation/jdbc/SQLCommenterTest.java
+++ b/dd-java-agent/instrumentation/jdbc/src/test/java/datadog/trace/instrumentation/jdbc/SQLCommenterTest.java
@@ -23,1167 +23,1143 @@
 
 class SQLCommenterTest extends AbstractInstrumentationTest {
 
-  private static final String TRACE_PARENT =
-      "00-00000000000000007fffffffffffffff-000000024cb016ea-00";
-  private static final String TRACE_PARENT_SAMPLED =
-      "00-00000000000000007fffffffffffffff-000000024cb016ea-01";
+    private static final String TRACE_PARENT = "00-00000000000000007fffffffffffffff-000000024cb016ea-00";
+    private static final String TRACE_PARENT_SAMPLED = "00-00000000000000007fffffffffffffff-000000024cb016ea-01";
 
-  @Test
-  void buildsCommentsLargerThanTheOldInitialCapacity() {
-    configureSizingTest();
-    String database = String.join("", nCopies(2048, "d"));
-    String expected =
-        "dddbs='orders',ddh='db.internal',dddb='"
-            + database
-            + "',traceparent='"
-            + TRACE_PARENT
-            + "'";
-    assertEquals(
-        expected,
-        SharedDBCommenter.buildComment(
-            "orders", "postgresql", "db.internal", database, TRACE_PARENT));
-    assertEquals(
-        "/*" + expected + "*/ SELECT 1",
-        SQLCommenter.inject(
-            "SELECT 1", "orders", "postgresql", "db.internal", database, TRACE_PARENT, false));
-  }
+    @Test
+    void buildsCommentsLargerThanTheOldInitialCapacity() {
+        configureSizingTest();
+        String database = String.join("", nCopies(2048, "d"));
+        String expected = "dddbs='orders',ddh='db.internal',dddb='" + database + "',traceparent='" + TRACE_PARENT + "'";
+        assertEquals(
+                expected,
+                SharedDBCommenter.buildComment("orders", "postgresql", "db.internal", database, TRACE_PARENT));
+        assertEquals(
+                "/*" + expected + "*/ SELECT 1",
+                SQLCommenter.inject("SELECT 1", "orders", "postgresql", "db.internal", database, TRACE_PARENT, false));
+    }
 
-  @Test
-  void sizesCommentsAfterUrlEncodingExpandsTheValues() {
-    configureSizingTest();
-    String database = String.join("", nCopies(256, "東京 €"));
-    String encodedDatabase = String.join("", nCopies(256, "%E6%9D%B1%E4%BA%AC+%E2%82%AC"));
-    String expected = "dddbs='caf%C3%A9',ddh='host%27name',dddb='" + encodedDatabase + "'";
-    assertEquals(
-        expected, SharedDBCommenter.buildComment("café", "mysql", "host'name", database, null));
-    assertEquals(
-        "SELECT 1 /*" + expected + "*/;",
-        SQLCommenter.inject("SELECT 1;", "café", "mysql", "host'name", database, null, true));
-  }
+    @Test
+    void sizesCommentsAfterUrlEncodingExpandsTheValues() {
+        configureSizingTest();
+        String database = String.join("", nCopies(256, "東京 €"));
+        String encodedDatabase = String.join("", nCopies(256, "%E6%9D%B1%E4%BA%AC+%E2%82%AC"));
+        String expected = "dddbs='caf%C3%A9',ddh='host%27name',dddb='" + encodedDatabase + "'";
+        assertEquals(expected, SharedDBCommenter.buildComment("café", "mysql", "host'name", database, null));
+        assertEquals(
+                "SELECT 1 /*" + expected + "*/;",
+                SQLCommenter.inject("SELECT 1;", "café", "mysql", "host'name", database, null, true));
+    }
 
-  @Test
-  void preservesEmptyCommentsAndSeparatorsWithoutStaticMetadata() {
-    configureSizingTest();
-    assertNull(SharedDBCommenter.buildComment(null, "mysql", "", null, ""));
-    assertEquals("SELECT 1", SQLCommenter.inject("SELECT 1", null, "mysql", "", null, "", false));
-    assertEquals(
-        "dddb='orders'", SharedDBCommenter.buildComment("", "mysql", null, "orders", null));
-  }
+    @Test
+    void preservesEmptyCommentsAndSeparatorsWithoutStaticMetadata() {
+        configureSizingTest();
+        assertNull(SharedDBCommenter.buildComment(null, "mysql", "", null, ""));
+        assertEquals("SELECT 1", SQLCommenter.inject("SELECT 1", null, "mysql", "", null, "", false));
+        assertEquals("dddb='orders'", SharedDBCommenter.buildComment("", "mysql", null, "orders", null));
+    }
 
-  private static void configureSizingTest() {
-    injectSysConfig("service", "");
-    injectSysConfig("env", "");
-    injectSysConfig("version", "");
-    injectSysConfig("dbm.inject.sql.basehash", "false");
-    SharedDBCommenter.resetStaticPrefixForTesting();
-  }
+    private static void configureSizingTest() {
+        injectSysConfig("service", "");
+        injectSysConfig("env", "");
+        injectSysConfig("version", "");
+        injectSysConfig("dbm.inject.sql.basehash", "false");
+        SharedDBCommenter.resetStaticPrefixForTesting();
+    }
 
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("testFindFirstWordArguments")
-  void testFindFirstWord(String scenario, String sql, String firstWord) {
-    // when
-    String word = SQLCommenter.getFirstWord(sql).toString();
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("testFindFirstWordArguments")
+    void testFindFirstWord(String scenario, String sql, String firstWord) {
+        // when
+        String word = SQLCommenter.getFirstWord(sql).toString();
 
-    // then
-    assertEquals(firstWord, word);
-  }
+        // then
+        assertEquals(firstWord, word);
+    }
 
-  static Stream<Arguments> testFindFirstWordArguments() {
-    return Stream.of(
-        arguments("SELECT *", "SELECT *", "SELECT"),
-        arguments("leading spaces brace", "  { ", "{"),
-        arguments("brace", "{", "{"),
-        arguments("brace call", "{call", "{call"),
-        arguments("brace space call", "{ call", "{"),
-        arguments("CALL with args", "CALL ( ? )", "CALL"),
-        arguments("empty", "", ""),
-        arguments("blank", "   ", ""));
-  }
+    static Stream<Arguments> testFindFirstWordArguments() {
+        return Stream.of(
+                arguments("SELECT *", "SELECT *", "SELECT"),
+                arguments("leading spaces brace", "  { ", "{"),
+                arguments("brace", "{", "{"),
+                arguments("brace call", "{call", "{call"),
+                arguments("brace space call", "{ call", "{"),
+                arguments("CALL with args", "CALL ( ? )", "CALL"),
+                arguments("empty", "", ""),
+                arguments("blank", "   ", ""));
+    }
 
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("testEncodeSqlCommentArguments")
-  void testEncodeSqlComment(
-      String scenario,
-      String query,
-      String ddService,
-      String ddEnv,
-      String dbService,
-      String dbType,
-      String host,
-      String dbName,
-      String ddVersion,
-      boolean append,
-      String traceParent,
-      String expected) {
-    // setup
-    injectSysConfig("service", ddService);
-    injectSysConfig("env", ddEnv);
-    injectSysConfig("version", ddVersion);
-    SharedDBCommenter.resetStaticPrefixForTesting();
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("testEncodeSqlCommentArguments")
+    void testEncodeSqlComment(
+            String scenario,
+            String query,
+            String ddService,
+            String ddEnv,
+            String dbService,
+            String dbType,
+            String host,
+            String dbName,
+            String ddVersion,
+            boolean append,
+            String traceParent,
+            String expected) {
+        // setup
+        injectSysConfig("service", ddService);
+        injectSysConfig("env", ddEnv);
+        injectSysConfig("version", ddVersion);
+        SharedDBCommenter.resetStaticPrefixForTesting();
 
-    // when
-    String sqlWithComment =
-        SQLCommenter.inject(query, dbService, dbType, host, dbName, traceParent, append);
+        // when
+        String sqlWithComment = SQLCommenter.inject(query, dbService, dbType, host, dbName, traceParent, append);
 
-    // then
-    assertEquals(expected, sqlWithComment);
-  }
+        // then
+        assertEquals(expected, sqlWithComment);
+    }
 
-  static Stream<Arguments> testEncodeSqlCommentArguments() {
-    return Stream.of(
-        arguments(
-            "append mysql simple",
-            "SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "append mysql trailing semicolon",
-            "SELECT * FROM foo;",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/;"),
-        arguments(
-            "append mysql trailing semicolon and whitespace",
-            "SELECT * FROM foo; \t\n\r",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/;"),
-        arguments(
-            "append mysql two statements",
-            "SELECT * FROM foo; SELECT * FROM bar",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            "SELECT * FROM foo; SELECT * FROM bar /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "append mysql two statements trailing semicolon",
-            "SELECT * FROM foo; SELECT * FROM bar; ",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            "SELECT * FROM foo; SELECT * FROM bar /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/;"),
-        arguments(
-            "append postgres simple",
-            "SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "postgres",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "append mysql stored proc braces",
-            "{call dogshelterProc(?, ?)}",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            "{call dogshelterProc(?, ?)} /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "prepend mysql stored proc braces",
-            "{call dogshelterProc(?, ?)}",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            TRACE_PARENT,
-            "{call dogshelterProc(?, ?)} /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "append postgres stored proc braces unchanged",
-            "{call dogshelterProc(?, ?)}",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "postgres",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            "{call dogshelterProc(?, ?)}"),
-        arguments(
-            "prepend postgres CALL proc",
-            "CALL dogshelterProc(?, ?)",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "postgres",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            TRACE_PARENT,
-            "CALL dogshelterProc(?, ?) /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "prepend mysql CALL proc",
-            "CALL dogshelterProc(?, ?)",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            TRACE_PARENT,
-            "CALL dogshelterProc(?, ?) /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "append empty service drops ddps and dddbs",
-            "SELECT * FROM foo",
-            "",
-            "Test",
-            "",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            "SELECT * FROM foo /*dde='Test',ddpv='TestVersion',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "append empty service keeps dddbs",
-            "SELECT * FROM foo",
-            "",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            "SELECT * FROM foo /*dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "append empty host and dbName drops ddh and dddb",
-            "SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "",
-            "",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "append only env host dbName",
-            "SELECT * FROM foo",
-            "",
-            "Test",
-            "",
-            "",
-            "h",
-            "n",
-            "",
-            true,
-            TRACE_PARENT,
-            "SELECT * FROM foo /*dde='Test',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "append only host dbName",
-            "SELECT * FROM foo",
-            "",
-            "",
-            "",
-            "",
-            "h",
-            "n",
-            "",
-            true,
-            TRACE_PARENT,
-            "SELECT * FROM foo /*ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "append only traceparent",
-            "SELECT * FROM foo",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            true,
-            TRACE_PARENT,
-            "SELECT * FROM foo /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "append with line comment sampled",
-            "SELECT * from FOO -- test query",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT_SAMPLED,
-            "SELECT * from FOO -- test query /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"),
-        arguments(
-            "append with inline customer comment sampled",
-            "SELECT /* customer-comment */ * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT_SAMPLED,
-            "SELECT /* customer-comment */ * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"),
-        arguments(
-            "append null traceparent omits traceparent",
-            "SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            null,
-            "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"),
-        arguments(
-            "append oracle null traceparent",
-            "SELECT * FROM DUAL",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "oracle",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            null,
-            "SELECT * FROM DUAL /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"),
-        arguments(
-            "append sqlserver null traceparent",
-            "SELECT * FROM sys.tables",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "sqlserver",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            null,
-            "SELECT * FROM sys.tables /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"),
-        arguments(
-            "append inline customer comment null traceparent",
-            "SELECT /* customer-comment */ * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            null,
-            "SELECT /* customer-comment */ * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"),
-        arguments(
-            "append line comment null traceparent",
-            "SELECT * from FOO -- test query",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            null,
-            "SELECT * from FOO -- test query /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"),
-        arguments(
-            "append empty query stays empty",
-            "",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            ""),
-        arguments(
-            "append blank query sampled",
-            "   ",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT_SAMPLED,
-            "    /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"),
-        arguments(
-            "append empty query dbService postgres",
-            "",
-            "SqlCommenter",
-            "Test",
-            "postgres",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            ""),
-        arguments(
-            "append blank query dbService postgres sampled",
-            "   ",
-            "SqlCommenter",
-            "Test",
-            "postgres",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT_SAMPLED,
-            "    /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='postgres',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"),
-        arguments(
-            "append idempotent full existing comment",
-            "SELECT * FROM foo /*dddbs='my-service',ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            null,
-            "SELECT * FROM foo /*dddbs='my-service',ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/"),
-        arguments(
-            "append idempotent existing comment no dddbs",
-            "SELECT * FROM foo /*ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            null,
-            "SELECT * FROM foo /*ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/"),
-        arguments(
-            "append idempotent existing comment no ddh",
-            "SELECT * FROM foo /*dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            null,
-            "SELECT * FROM foo /*dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/"),
-        arguments(
-            "append idempotent existing comment no dddb",
-            "SELECT * FROM foo /*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            null,
-            "SELECT * FROM foo /*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/"),
-        arguments(
-            "append idempotent existing comment no dde",
-            "SELECT * FROM foo /*ddps='SqlCommenter',ddpv='TestVersion'*/",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            null,
-            "SELECT * FROM foo /*ddps='SqlCommenter',ddpv='TestVersion'*/"),
-        arguments(
-            "append idempotent existing comment only ddpv",
-            "SELECT * FROM foo /*ddpv='TestVersion'*/",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            null,
-            "SELECT * FROM foo /*ddpv='TestVersion'*/"),
-        arguments(
-            "append leading customer comment null traceparent",
-            "/*ddjk its a customer */ SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            null,
-            "/*ddjk its a customer */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"),
-        arguments(
-            "append existing traceparent comment unchanged",
-            "SELECT * FROM foo /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            null,
-            "SELECT * FROM foo /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"),
-        arguments(
-            "append leading customer block comment",
-            "/*customer-comment*/ SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            null,
-            "/*customer-comment*/ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"),
-        arguments(
-            "append unterminated traceparent comment",
-            "/*traceparent",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            null,
-            "/*traceparent /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"),
-        arguments(
-            "prepend mysql simple",
-            "SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            TRACE_PARENT,
-            "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"),
-        arguments(
-            "prepend empty service drops ddps and dddbs",
-            "SELECT * FROM foo",
-            "",
-            "Test",
-            "",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            TRACE_PARENT,
-            "/*dde='Test',ddpv='TestVersion',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"),
-        arguments(
-            "prepend empty service keeps dddbs",
-            "SELECT * FROM foo",
-            "",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            TRACE_PARENT,
-            "/*dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"),
-        arguments(
-            "prepend only env host dbName",
-            "SELECT * FROM foo",
-            "",
-            "Test",
-            "",
-            "",
-            "h",
-            "n",
-            "",
-            false,
-            TRACE_PARENT,
-            "/*dde='Test',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"),
-        arguments(
-            "prepend only traceparent",
-            "SELECT * FROM foo",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            false,
-            TRACE_PARENT,
-            "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"),
-        arguments(
-            "prepend line comment sampled",
-            "SELECT * from FOO -- test query",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            TRACE_PARENT_SAMPLED,
-            "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * from FOO -- test query"),
-        arguments(
-            "prepend inline customer comment sampled",
-            "SELECT /* customer-comment */ * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            TRACE_PARENT_SAMPLED,
-            "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT /* customer-comment */ * FROM foo"),
-        arguments(
-            "prepend mysql null traceparent",
-            "SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            null,
-            "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ SELECT * FROM foo"),
-        arguments(
-            "prepend inline customer comment null traceparent",
-            "SELECT /* customer-comment */ * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            null,
-            "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ SELECT /* customer-comment */ * FROM foo"),
-        arguments(
-            "prepend line comment null traceparent",
-            "SELECT * from FOO -- test query",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            null,
-            "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ SELECT * from FOO -- test query"),
-        arguments(
-            "prepend empty query stays empty",
-            "",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            TRACE_PARENT,
-            ""),
-        arguments(
-            "prepend blank query sampled",
-            "   ",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            TRACE_PARENT_SAMPLED,
-            "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/    "),
-        arguments(
-            "prepend idempotent full existing comment",
-            "/*dddbs='my-service',ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            null,
-            "/*dddbs='my-service',ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"),
-        arguments(
-            "prepend idempotent existing comment no dddbs",
-            "/*ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            null,
-            "/*ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"),
-        arguments(
-            "prepend idempotent existing comment no ddh",
-            "/*dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            null,
-            "/*dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"),
-        arguments(
-            "prepend idempotent existing comment no dddb",
-            "/*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            null,
-            "/*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"),
-        arguments(
-            "prepend idempotent existing comment no dde",
-            "/*ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            null,
-            "/*ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"),
-        arguments(
-            "prepend idempotent existing comment only ddpv",
-            "/*ddpv='TestVersion'*/ SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            null,
-            "/*ddpv='TestVersion'*/ SELECT * FROM foo"),
-        arguments(
-            "prepend leading customer comment null traceparent",
-            "/*ddjk its a customer */ SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            null,
-            "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ /*ddjk its a customer */ SELECT * FROM foo"),
-        arguments(
-            "prepend existing traceparent comment unchanged",
-            "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            null,
-            "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * FROM foo"),
-        arguments(
-            "prepend leading customer block comment",
-            "/*customer-comment*/ SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            null,
-            "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ /*customer-comment*/ SELECT * FROM foo"),
-        arguments(
-            "prepend unterminated traceparent comment",
-            "/*traceparent",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "mysql",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            null,
-            "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ /*traceparent"),
-        arguments(
-            "append postgres optimizer hint inline",
-            "SELECT /*+ SeqScan(foo) */ * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "postgres",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            "SELECT /*+ SeqScan(foo) */ * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "append postgres optimizer hint leading",
-            "/*+ SeqScan(foo) */ SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "postgres",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "postgres optimizer hint leading -- re-injecting already-commented SQL is a no-op",
-            "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "postgres",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "prepend postgres optimizer hint leading",
-            "/*+ SeqScan(foo) */ SELECT * FROM foo",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "postgres",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            TRACE_PARENT,
-            "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "prepend postgres optimizer hint with empty ddps unchanged",
-            "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps=''*/",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "postgres",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            TRACE_PARENT,
-            "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps=''*/"),
-        arguments(
-            "append postgres optimizer hint with empty ddps unchanged",
-            "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps=''*/",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "postgres",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps=''*/"),
-        arguments(
-            "prepend postgres CALL proc with empty ddps unchanged",
-            "CALL dogshelterProc(?, ?) /*ddps=''*/",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "postgres",
-            "h",
-            "n",
-            "TestVersion",
-            false,
-            TRACE_PARENT,
-            "CALL dogshelterProc(?, ?) /*ddps=''*/"),
-        arguments(
-            "append postgres CALL proc with empty ddps unchanged",
-            "CALL dogshelterProc(?, ?) /*ddps=''*/",
-            "SqlCommenter",
-            "Test",
-            "my-service",
-            "postgres",
-            "h",
-            "n",
-            "TestVersion",
-            true,
-            TRACE_PARENT,
-            "CALL dogshelterProc(?, ?) /*ddps=''*/"));
-  }
+    static Stream<Arguments> testEncodeSqlCommentArguments() {
+        return Stream.of(
+                arguments(
+                        "append mysql simple",
+                        "SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "append mysql trailing semicolon",
+                        "SELECT * FROM foo;",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/;"),
+                arguments(
+                        "append mysql trailing semicolon and whitespace",
+                        "SELECT * FROM foo; \t\n\r",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/;"),
+                arguments(
+                        "append mysql two statements",
+                        "SELECT * FROM foo; SELECT * FROM bar",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        "SELECT * FROM foo; SELECT * FROM bar /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "append mysql two statements trailing semicolon",
+                        "SELECT * FROM foo; SELECT * FROM bar; ",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        "SELECT * FROM foo; SELECT * FROM bar /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/;"),
+                arguments(
+                        "append postgres simple",
+                        "SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "postgres",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "append mysql stored proc braces",
+                        "{call dogshelterProc(?, ?)}",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        "{call dogshelterProc(?, ?)} /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "prepend mysql stored proc braces",
+                        "{call dogshelterProc(?, ?)}",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        TRACE_PARENT,
+                        "{call dogshelterProc(?, ?)} /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "append postgres stored proc braces unchanged",
+                        "{call dogshelterProc(?, ?)}",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "postgres",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        "{call dogshelterProc(?, ?)}"),
+                arguments(
+                        "prepend postgres CALL proc",
+                        "CALL dogshelterProc(?, ?)",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "postgres",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        TRACE_PARENT,
+                        "CALL dogshelterProc(?, ?) /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "prepend mysql CALL proc",
+                        "CALL dogshelterProc(?, ?)",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        TRACE_PARENT,
+                        "CALL dogshelterProc(?, ?) /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "append empty service drops ddps and dddbs",
+                        "SELECT * FROM foo",
+                        "",
+                        "Test",
+                        "",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        "SELECT * FROM foo /*dde='Test',ddpv='TestVersion',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "append empty service keeps dddbs",
+                        "SELECT * FROM foo",
+                        "",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        "SELECT * FROM foo /*dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "append empty host and dbName drops ddh and dddb",
+                        "SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "",
+                        "",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "append only env host dbName",
+                        "SELECT * FROM foo",
+                        "",
+                        "Test",
+                        "",
+                        "",
+                        "h",
+                        "n",
+                        "",
+                        true,
+                        TRACE_PARENT,
+                        "SELECT * FROM foo /*dde='Test',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "append only host dbName",
+                        "SELECT * FROM foo",
+                        "",
+                        "",
+                        "",
+                        "",
+                        "h",
+                        "n",
+                        "",
+                        true,
+                        TRACE_PARENT,
+                        "SELECT * FROM foo /*ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "append only traceparent",
+                        "SELECT * FROM foo",
+                        "",
+                        "",
+                        "",
+                        "",
+                        "",
+                        "",
+                        "",
+                        true,
+                        TRACE_PARENT,
+                        "SELECT * FROM foo /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "append with line comment sampled",
+                        "SELECT * from FOO -- test query",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT_SAMPLED,
+                        "SELECT * from FOO -- test query /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"),
+                arguments(
+                        "append with inline customer comment sampled",
+                        "SELECT /* customer-comment */ * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT_SAMPLED,
+                        "SELECT /* customer-comment */ * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"),
+                arguments(
+                        "append null traceparent omits traceparent",
+                        "SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        null,
+                        "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"),
+                arguments(
+                        "append oracle null traceparent",
+                        "SELECT * FROM DUAL",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "oracle",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        null,
+                        "SELECT * FROM DUAL /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"),
+                arguments(
+                        "append sqlserver null traceparent",
+                        "SELECT * FROM sys.tables",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "sqlserver",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        null,
+                        "SELECT * FROM sys.tables /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"),
+                arguments(
+                        "append inline customer comment null traceparent",
+                        "SELECT /* customer-comment */ * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        null,
+                        "SELECT /* customer-comment */ * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"),
+                arguments(
+                        "append line comment null traceparent",
+                        "SELECT * from FOO -- test query",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        null,
+                        "SELECT * from FOO -- test query /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"),
+                arguments(
+                        "append empty query stays empty",
+                        "",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        ""),
+                arguments(
+                        "append blank query sampled",
+                        "   ",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT_SAMPLED,
+                        "    /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"),
+                arguments(
+                        "append empty query dbService postgres",
+                        "",
+                        "SqlCommenter",
+                        "Test",
+                        "postgres",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        ""),
+                arguments(
+                        "append blank query dbService postgres sampled",
+                        "   ",
+                        "SqlCommenter",
+                        "Test",
+                        "postgres",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT_SAMPLED,
+                        "    /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='postgres',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"),
+                arguments(
+                        "append idempotent full existing comment",
+                        "SELECT * FROM foo /*dddbs='my-service',ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        null,
+                        "SELECT * FROM foo /*dddbs='my-service',ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/"),
+                arguments(
+                        "append idempotent existing comment no dddbs",
+                        "SELECT * FROM foo /*ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        null,
+                        "SELECT * FROM foo /*ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/"),
+                arguments(
+                        "append idempotent existing comment no ddh",
+                        "SELECT * FROM foo /*dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        null,
+                        "SELECT * FROM foo /*dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/"),
+                arguments(
+                        "append idempotent existing comment no dddb",
+                        "SELECT * FROM foo /*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        null,
+                        "SELECT * FROM foo /*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/"),
+                arguments(
+                        "append idempotent existing comment no dde",
+                        "SELECT * FROM foo /*ddps='SqlCommenter',ddpv='TestVersion'*/",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        null,
+                        "SELECT * FROM foo /*ddps='SqlCommenter',ddpv='TestVersion'*/"),
+                arguments(
+                        "append idempotent existing comment only ddpv",
+                        "SELECT * FROM foo /*ddpv='TestVersion'*/",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        null,
+                        "SELECT * FROM foo /*ddpv='TestVersion'*/"),
+                arguments(
+                        "append leading customer comment null traceparent",
+                        "/*ddjk its a customer */ SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        null,
+                        "/*ddjk its a customer */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"),
+                arguments(
+                        "append existing traceparent comment unchanged",
+                        "SELECT * FROM foo /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        null,
+                        "SELECT * FROM foo /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"),
+                arguments(
+                        "append leading customer block comment",
+                        "/*customer-comment*/ SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        null,
+                        "/*customer-comment*/ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"),
+                arguments(
+                        "append unterminated traceparent comment",
+                        "/*traceparent",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        null,
+                        "/*traceparent /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"),
+                arguments(
+                        "prepend mysql simple",
+                        "SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        TRACE_PARENT,
+                        "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"),
+                arguments(
+                        "prepend empty service drops ddps and dddbs",
+                        "SELECT * FROM foo",
+                        "",
+                        "Test",
+                        "",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        TRACE_PARENT,
+                        "/*dde='Test',ddpv='TestVersion',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"),
+                arguments(
+                        "prepend empty service keeps dddbs",
+                        "SELECT * FROM foo",
+                        "",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        TRACE_PARENT,
+                        "/*dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"),
+                arguments(
+                        "prepend only env host dbName",
+                        "SELECT * FROM foo",
+                        "",
+                        "Test",
+                        "",
+                        "",
+                        "h",
+                        "n",
+                        "",
+                        false,
+                        TRACE_PARENT,
+                        "/*dde='Test',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"),
+                arguments(
+                        "prepend only traceparent",
+                        "SELECT * FROM foo",
+                        "",
+                        "",
+                        "",
+                        "",
+                        "",
+                        "",
+                        "",
+                        false,
+                        TRACE_PARENT,
+                        "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"),
+                arguments(
+                        "prepend line comment sampled",
+                        "SELECT * from FOO -- test query",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        TRACE_PARENT_SAMPLED,
+                        "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * from FOO -- test query"),
+                arguments(
+                        "prepend inline customer comment sampled",
+                        "SELECT /* customer-comment */ * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        TRACE_PARENT_SAMPLED,
+                        "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT /* customer-comment */ * FROM foo"),
+                arguments(
+                        "prepend mysql null traceparent",
+                        "SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        null,
+                        "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ SELECT * FROM foo"),
+                arguments(
+                        "prepend inline customer comment null traceparent",
+                        "SELECT /* customer-comment */ * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        null,
+                        "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ SELECT /* customer-comment */ * FROM foo"),
+                arguments(
+                        "prepend line comment null traceparent",
+                        "SELECT * from FOO -- test query",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        null,
+                        "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ SELECT * from FOO -- test query"),
+                arguments(
+                        "prepend empty query stays empty",
+                        "",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        TRACE_PARENT,
+                        ""),
+                arguments(
+                        "prepend blank query sampled",
+                        "   ",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        TRACE_PARENT_SAMPLED,
+                        "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/    "),
+                arguments(
+                        "prepend idempotent full existing comment",
+                        "/*dddbs='my-service',ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        null,
+                        "/*dddbs='my-service',ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"),
+                arguments(
+                        "prepend idempotent existing comment no dddbs",
+                        "/*ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        null,
+                        "/*ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"),
+                arguments(
+                        "prepend idempotent existing comment no ddh",
+                        "/*dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        null,
+                        "/*dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"),
+                arguments(
+                        "prepend idempotent existing comment no dddb",
+                        "/*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        null,
+                        "/*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"),
+                arguments(
+                        "prepend idempotent existing comment no dde",
+                        "/*ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        null,
+                        "/*ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"),
+                arguments(
+                        "prepend idempotent existing comment only ddpv",
+                        "/*ddpv='TestVersion'*/ SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        null,
+                        "/*ddpv='TestVersion'*/ SELECT * FROM foo"),
+                arguments(
+                        "prepend leading customer comment null traceparent",
+                        "/*ddjk its a customer */ SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        null,
+                        "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ /*ddjk its a customer */ SELECT * FROM foo"),
+                arguments(
+                        "prepend existing traceparent comment unchanged",
+                        "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        null,
+                        "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * FROM foo"),
+                arguments(
+                        "prepend leading customer block comment",
+                        "/*customer-comment*/ SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        null,
+                        "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ /*customer-comment*/ SELECT * FROM foo"),
+                arguments(
+                        "prepend unterminated traceparent comment",
+                        "/*traceparent",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "mysql",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        null,
+                        "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ /*traceparent"),
+                arguments(
+                        "append postgres optimizer hint inline",
+                        "SELECT /*+ SeqScan(foo) */ * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "postgres",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        "SELECT /*+ SeqScan(foo) */ * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "append postgres optimizer hint leading",
+                        "/*+ SeqScan(foo) */ SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "postgres",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "postgres optimizer hint leading -- re-injecting already-commented SQL is a no-op",
+                        "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "postgres",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "prepend postgres optimizer hint leading",
+                        "/*+ SeqScan(foo) */ SELECT * FROM foo",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "postgres",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        TRACE_PARENT,
+                        "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "prepend postgres optimizer hint with empty ddps unchanged",
+                        "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps=''*/",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "postgres",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        TRACE_PARENT,
+                        "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps=''*/"),
+                arguments(
+                        "append postgres optimizer hint with empty ddps unchanged",
+                        "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps=''*/",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "postgres",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps=''*/"),
+                arguments(
+                        "prepend postgres CALL proc with empty ddps unchanged",
+                        "CALL dogshelterProc(?, ?) /*ddps=''*/",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "postgres",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        false,
+                        TRACE_PARENT,
+                        "CALL dogshelterProc(?, ?) /*ddps=''*/"),
+                arguments(
+                        "append postgres CALL proc with empty ddps unchanged",
+                        "CALL dogshelterProc(?, ?) /*ddps=''*/",
+                        "SqlCommenter",
+                        "Test",
+                        "my-service",
+                        "postgres",
+                        "h",
+                        "n",
+                        "TestVersion",
+                        true,
+                        TRACE_PARENT,
+                        "CALL dogshelterProc(?, ?) /*ddps=''*/"));
+    }
 
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("injectBaseHashArguments")
-  void injectBaseHash(
-      String scenario,
-      String query,
-      boolean injectHash,
-      long baseHash,
-      boolean processTagsEnabled,
-      String srv,
-      String result) {
-    // setup
-    injectSysConfig("service", srv);
-    injectSysConfig("env", "");
-    injectSysConfig("dbm.inject.sql.basehash", Boolean.toString(injectHash));
-    injectSysConfig(
-        "experimental.propagate.process.tags.enabled", Boolean.toString(processTagsEnabled));
-    ProcessTags.reset(Config.get());
-    BaseHash.updateBaseHash(baseHash);
-    SharedDBCommenter.resetStaticPrefixForTesting();
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("injectBaseHashArguments")
+    void injectBaseHash(
+            String scenario,
+            String query,
+            boolean injectHash,
+            long baseHash,
+            boolean processTagsEnabled,
+            String srv,
+            String result) {
+        // setup
+        injectSysConfig("service", srv);
+        injectSysConfig("env", "");
+        injectSysConfig("dbm.inject.sql.basehash", Boolean.toString(injectHash));
+        injectSysConfig("experimental.propagate.process.tags.enabled", Boolean.toString(processTagsEnabled));
+        ProcessTags.reset(Config.get());
+        BaseHash.updateBaseHash(baseHash);
+        SharedDBCommenter.resetStaticPrefixForTesting();
 
-    // expect
-    assertEquals(processTagsEnabled, Config.get().isExperimentalPropagateProcessTagsEnabled());
-    // and
-    assertEquals(result, SQLCommenter.inject(query, "", "", "", "", "", false));
-  }
+        // expect
+        assertEquals(processTagsEnabled, Config.get().isExperimentalPropagateProcessTagsEnabled());
+        // and
+        assertEquals(result, SQLCommenter.inject(query, "", "", "", "", "", false));
+    }
 
-  static Stream<Arguments> injectBaseHashArguments() {
-    return Stream.of(
-        arguments(
-            "hash on, no process tags, no service",
-            "SELECT *",
-            true,
-            234563L,
-            false,
-            "",
-            "SELECT *"),
-        arguments(
-            "hash on, process tags, no service",
-            "SELECT *",
-            true,
-            234563L,
-            true,
-            "",
-            "/*ddsh='234563'*/ SELECT *"),
-        arguments(
-            "hash on alt base, no process tags, no service",
-            "SELECT *",
-            true,
-            345342L,
-            false,
-            "",
-            "SELECT *"),
-        arguments(
-            "hash on alt base, process tags, no service",
-            "SELECT *",
-            true,
-            345342L,
-            true,
-            "",
-            "/*ddsh='345342'*/ SELECT *"),
-        arguments(
-            "hash on, no process tags, with service",
-            "SELECT *",
-            true,
-            234563L,
-            false,
-            "srv",
-            "/*ddps='srv'*/ SELECT *"),
-        arguments(
-            "hash on, process tags, with service",
-            "SELECT *",
-            true,
-            234563L,
-            true,
-            "srv",
-            "/*ddps='srv',ddsh='234563'*/ SELECT *"),
-        arguments(
-            "hash on alt base, no process tags, with service",
-            "SELECT *",
-            true,
-            345342L,
-            false,
-            "srv",
-            "/*ddps='srv'*/ SELECT *"),
-        arguments(
-            "hash on alt base, process tags, with service",
-            "SELECT *",
-            true,
-            345342L,
-            true,
-            "srv",
-            "/*ddps='srv',ddsh='345342'*/ SELECT *"),
-        arguments(
-            "hash off, process tags, no service", "SELECT *", false, 234563L, true, "", "SELECT *"),
-        arguments(
-            "hash off, process tags, with service",
-            "SELECT *",
-            false,
-            234563L,
-            true,
-            "srv",
-            "/*ddps='srv'*/ SELECT *"),
-        arguments(
-            "hash off alt base, process tags, with service",
-            "SELECT *",
-            false,
-            345342L,
-            true,
-            "srv",
-            "/*ddps='srv'*/ SELECT *"),
-        arguments(
-            "hash on, process tags, existing ddsh unchanged",
-            "/*ddsh='-3750763034362895579'*/ SELECT *",
-            true,
-            234563L,
-            true,
-            "",
-            "/*ddsh='-3750763034362895579'*/ SELECT *"));
-  }
+    static Stream<Arguments> injectBaseHashArguments() {
+        return Stream.of(
+                arguments("hash on, no process tags, no service", "SELECT *", true, 234563L, false, "", "SELECT *"),
+                arguments(
+                        "hash on, process tags, no service",
+                        "SELECT *",
+                        true,
+                        234563L,
+                        true,
+                        "",
+                        "/*ddsh='234563'*/ SELECT *"),
+                arguments(
+                        "hash on alt base, no process tags, no service",
+                        "SELECT *",
+                        true,
+                        345342L,
+                        false,
+                        "",
+                        "SELECT *"),
+                arguments(
+                        "hash on alt base, process tags, no service",
+                        "SELECT *",
+                        true,
+                        345342L,
+                        true,
+                        "",
+                        "/*ddsh='345342'*/ SELECT *"),
+                arguments(
+                        "hash on, no process tags, with service",
+                        "SELECT *",
+                        true,
+                        234563L,
+                        false,
+                        "srv",
+                        "/*ddps='srv'*/ SELECT *"),
+                arguments(
+                        "hash on, process tags, with service",
+                        "SELECT *",
+                        true,
+                        234563L,
+                        true,
+                        "srv",
+                        "/*ddps='srv',ddsh='234563'*/ SELECT *"),
+                arguments(
+                        "hash on alt base, no process tags, with service",
+                        "SELECT *",
+                        true,
+                        345342L,
+                        false,
+                        "srv",
+                        "/*ddps='srv'*/ SELECT *"),
+                arguments(
+                        "hash on alt base, process tags, with service",
+                        "SELECT *",
+                        true,
+                        345342L,
+                        true,
+                        "srv",
+                        "/*ddps='srv',ddsh='345342'*/ SELECT *"),
+                arguments("hash off, process tags, no service", "SELECT *", false, 234563L, true, "", "SELECT *"),
+                arguments(
+                        "hash off, process tags, with service",
+                        "SELECT *",
+                        false,
+                        234563L,
+                        true,
+                        "srv",
+                        "/*ddps='srv'*/ SELECT *"),
+                arguments(
+                        "hash off alt base, process tags, with service",
+                        "SELECT *",
+                        false,
+                        345342L,
+                        true,
+                        "srv",
+                        "/*ddps='srv'*/ SELECT *"),
+                arguments(
+                        "hash on, process tags, existing ddsh unchanged",
+                        "/*ddsh='-3750763034362895579'*/ SELECT *",
+                        true,
+                        234563L,
+                        true,
+                        "",
+                        "/*ddsh='-3750763034362895579'*/ SELECT *"));
+    }
 
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("testEncodeSqlCommentWithPeerServiceArguments")
-  void testEncodeSqlCommentWithPeerService(
-      String scenario, String dbType, String peerService, String expected) throws Exception {
-    // setup
-    injectSysConfig("service", "SqlCommenter");
-    injectSysConfig("env", "Test");
-    injectSysConfig("version", "TestVersion");
-    SharedDBCommenter.resetStaticPrefixForTesting();
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("testEncodeSqlCommentWithPeerServiceArguments")
+    void testEncodeSqlCommentWithPeerService(String scenario, String dbType, String peerService, String expected)
+            throws Exception {
+        // setup
+        injectSysConfig("service", "SqlCommenter");
+        injectSysConfig("env", "Test");
+        injectSysConfig("version", "TestVersion");
+        SharedDBCommenter.resetStaticPrefixForTesting();
 
-    // when
-    String sqlWithComment =
-        runUnderTrace(
-            "testTrace",
-            () -> {
-              AgentSpan currSpan = AgentTracer.activeSpan();
-              currSpan.setTag(Tags.PEER_SERVICE, peerService);
-              return SQLCommenter.inject(
-                  "SELECT * FROM foo",
-                  "my-service",
-                  dbType,
-                  "h",
-                  "n",
-                  "00-00000000000000007fffffffffffffff-000000024cb016ea-00",
-                  true);
-            });
+        // when
+        String sqlWithComment = runUnderTrace("testTrace", () -> {
+            AgentSpan currSpan = AgentTracer.activeSpan();
+            currSpan.setTag(Tags.PEER_SERVICE, peerService);
+            return SQLCommenter.inject(
+                    "SELECT * FROM foo",
+                    "my-service",
+                    dbType,
+                    "h",
+                    "n",
+                    "00-00000000000000007fffffffffffffff-000000024cb016ea-00",
+                    true);
+        });
 
-    // then
-    assertEquals(expected, sqlWithComment);
-  }
+        // then
+        assertEquals(expected, sqlWithComment);
+    }
 
-  static Stream<Arguments> testEncodeSqlCommentWithPeerServiceArguments() {
-    return Stream.of(
-        arguments(
-            "mysql null peer service",
-            "mysql",
-            null,
-            "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "postgres empty peer service",
-            "postgres",
-            "",
-            "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
-        arguments(
-            "postgres with peer service",
-            "postgres",
-            "testPeer",
-            "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',ddprs='testPeer',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"));
-  }
+    static Stream<Arguments> testEncodeSqlCommentWithPeerServiceArguments() {
+        return Stream.of(
+                arguments(
+                        "mysql null peer service",
+                        "mysql",
+                        null,
+                        "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "postgres empty peer service",
+                        "postgres",
+                        "",
+                        "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"),
+                arguments(
+                        "postgres with peer service",
+                        "postgres",
+                        "testPeer",
+                        "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',ddprs='testPeer',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"));
+    }
 }
diff --git a/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisClientDecorator.java b/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisClientDecorator.java
index f85167f6ba2..b46f36bab68 100644
--- a/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisClientDecorator.java
+++ b/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisClientDecorator.java
@@ -7,51 +7,51 @@
 import redis.clients.jedis.Connection;
 
 public class JedisClientDecorator extends DBTypeProcessingDatabaseClientDecorator<Connection> {
-  private static final String REDIS = "redis";
-  public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation(REDIS));
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cache().service(REDIS);
-  public static final JedisClientDecorator DECORATE = new JedisClientDecorator();
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jedis", REDIS};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.REDIS;
-  }
-
-  @Override
-  protected String dbType() {
-    return REDIS;
-  }
-
-  @Override
-  protected String dbUser(final Connection connection) {
-    return null;
-  }
-
-  @Override
-  protected String dbInstance(final Connection connection) {
-    return null;
-  }
-
-  @Override
-  protected String dbHostname(Connection connection) {
-    return connection.getHost();
-  }
+    private static final String REDIS = "redis";
+    public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
+    public static final CharSequence OPERATION_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation(REDIS));
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cache().service(REDIS);
+    public static final JedisClientDecorator DECORATE = new JedisClientDecorator();
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jedis", REDIS};
+    }
+
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.REDIS;
+    }
+
+    @Override
+    protected String dbType() {
+        return REDIS;
+    }
+
+    @Override
+    protected String dbUser(final Connection connection) {
+        return null;
+    }
+
+    @Override
+    protected String dbInstance(final Connection connection) {
+        return null;
+    }
+
+    @Override
+    protected String dbHostname(Connection connection) {
+        return connection.getHost();
+    }
 }
diff --git a/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java
index a199774f379..f69ca50c52b 100644
--- a/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java
+++ b/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java
@@ -24,61 +24,59 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JedisInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JedisInstrumentation() {
-    super("jedis", "redis");
-  }
+    public JedisInstrumentation() {
+        super("jedis", "redis");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Avoid matching Jedis 3+ which has its own instrumentation.
-    return not(hasClassNamed("redis.clients.jedis.commands.ProtocolCommand"));
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Avoid matching Jedis 3+ which has its own instrumentation.
+        return not(hasClassNamed("redis.clients.jedis.commands.ProtocolCommand"));
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "redis.clients.jedis.Connection";
-  }
+    @Override
+    public String instrumentedType() {
+        return "redis.clients.jedis.Connection";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("sendCommand"))
-            .and(takesArgument(0, named("redis.clients.jedis.Protocol$Command"))),
-        JedisInstrumentation.class.getName() + "$JedisAdvice");
-    // FIXME: This instrumentation only incorporates sending the command, not processing the result.
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("sendCommand"))
+                        .and(takesArgument(0, named("redis.clients.jedis.Protocol$Command"))),
+                JedisInstrumentation.class.getName() + "$JedisAdvice");
+        // FIXME: This instrumentation only incorporates sending the command, not processing the result.
+    }
 
-  public static class JedisAdvice {
+    public static class JedisAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final Command command, @Advice.This final Connection thiz) {
-      if (CallDepthThreadLocalMap.incrementCallDepth(Connection.class) > 0) {
-        return null;
-      }
-      final AgentSpan span =
-          startSpan(COMPONENT_NAME.toString(), JedisClientDecorator.OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onConnection(span, thiz);
-      DECORATE.onStatement(span, command.name());
-      return activateSpan(span);
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final Command command, @Advice.This final Connection thiz) {
+            if (CallDepthThreadLocalMap.incrementCallDepth(Connection.class) > 0) {
+                return null;
+            }
+            final AgentSpan span = startSpan(COMPONENT_NAME.toString(), JedisClientDecorator.OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onConnection(span, thiz);
+            DECORATE.onStatement(span, command.name());
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      CallDepthThreadLocalMap.reset(Connection.class);
-      AgentSpan span = spanFromScope(scope);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            CallDepthThreadLocalMap.reset(Connection.class);
+            AgentSpan span = spanFromScope(scope);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisClientDecorator.java b/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisClientDecorator.java
index edaaa9278b3..6c59117493c 100644
--- a/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisClientDecorator.java
+++ b/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisClientDecorator.java
@@ -7,52 +7,52 @@
 import redis.clients.jedis.Connection;
 
 public class JedisClientDecorator extends DBTypeProcessingDatabaseClientDecorator<Connection> {
-  public static final JedisClientDecorator DECORATE = new JedisClientDecorator();
-
-  private static final String REDIS = "redis";
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation(REDIS));
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cache().service(REDIS);
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jedis", REDIS};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.REDIS;
-  }
-
-  @Override
-  protected String dbType() {
-    return REDIS;
-  }
-
-  @Override
-  protected String dbUser(final Connection connection) {
-    return null;
-  }
-
-  @Override
-  protected String dbInstance(final Connection connection) {
-    return null;
-  }
-
-  @Override
-  protected String dbHostname(final Connection connection) {
-    return connection.getHost();
-  }
+    public static final JedisClientDecorator DECORATE = new JedisClientDecorator();
+
+    private static final String REDIS = "redis";
+    public static final CharSequence OPERATION_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation(REDIS));
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cache().service(REDIS);
+    private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jedis", REDIS};
+    }
+
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.REDIS;
+    }
+
+    @Override
+    protected String dbType() {
+        return REDIS;
+    }
+
+    @Override
+    protected String dbUser(final Connection connection) {
+        return null;
+    }
+
+    @Override
+    protected String dbInstance(final Connection connection) {
+        return null;
+    }
+
+    @Override
+    protected String dbHostname(final Connection connection) {
+        return connection.getHost();
+    }
 }
diff --git a/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java
index 640497d7a85..14ee2ec9441 100644
--- a/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java
+++ b/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java
@@ -21,61 +21,60 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JedisInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JedisInstrumentation() {
-    super("jedis", "redis");
-  }
+    public JedisInstrumentation() {
+        super("jedis", "redis");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "redis.clients.jedis.Connection";
-  }
+    @Override
+    public String instrumentedType() {
+        return "redis.clients.jedis.Connection";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("sendCommand"))
-            .and(takesArgument(0, named("redis.clients.jedis.commands.ProtocolCommand"))),
-        JedisInstrumentation.class.getName() + "$JedisAdvice");
-    // FIXME: This instrumentation only incorporates sending the command, not processing the result.
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("sendCommand"))
+                        .and(takesArgument(0, named("redis.clients.jedis.commands.ProtocolCommand"))),
+                JedisInstrumentation.class.getName() + "$JedisAdvice");
+        // FIXME: This instrumentation only incorporates sending the command, not processing the result.
+    }
 
-  public static class JedisAdvice {
+    public static class JedisAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final ProtocolCommand command, @Advice.This final Connection thiz) {
-      if (CallDepthThreadLocalMap.incrementCallDepth(Connection.class) > 0) {
-        return null;
-      }
-      final AgentSpan span = startSpan("redis-command", JedisClientDecorator.OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onConnection(span, thiz);
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final ProtocolCommand command, @Advice.This final Connection thiz) {
+            if (CallDepthThreadLocalMap.incrementCallDepth(Connection.class) > 0) {
+                return null;
+            }
+            final AgentSpan span = startSpan("redis-command", JedisClientDecorator.OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onConnection(span, thiz);
 
-      if (command instanceof Protocol.Command) {
-        DECORATE.onStatement(span, ((Protocol.Command) command).name());
-      } else {
-        // Protocol.Command is the only implementation in the Jedis lib as of 3.1 but this will save
-        // us if that changes
-        DECORATE.onStatement(span, new String(command.getRaw()));
-      }
-      return activateSpan(span);
-    }
+            if (command instanceof Protocol.Command) {
+                DECORATE.onStatement(span, ((Protocol.Command) command).name());
+            } else {
+                // Protocol.Command is the only implementation in the Jedis lib as of 3.1 but this will save
+                // us if that changes
+                DECORATE.onStatement(span, new String(command.getRaw()));
+            }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      CallDepthThreadLocalMap.reset(Connection.class);
-      AgentSpan span = spanFromScope(scope);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            CallDepthThreadLocalMap.reset(Connection.class);
+            AgentSpan span = spanFromScope(scope);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java
index 81d7c52a801..afc3eabc428 100644
--- a/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java
+++ b/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java
@@ -23,57 +23,55 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JedisInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JedisInstrumentation() {
-    super("jedis", "redis");
-  }
+    public JedisInstrumentation() {
+        super("jedis", "redis");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "redis.clients.jedis.Connection";
-  }
+    @Override
+    public String instrumentedType() {
+        return "redis.clients.jedis.Connection";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("executeCommand"))
-            .and(takesArgument(0, named("redis.clients.jedis.CommandObject"))),
-        JedisInstrumentation.class.getName() + "$JedisAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("executeCommand"))
+                        .and(takesArgument(0, named("redis.clients.jedis.CommandObject"))),
+                JedisInstrumentation.class.getName() + "$JedisAdvice");
+    }
 
-  public static class JedisAdvice {
+    public static class JedisAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final CommandObject<?> commandObject,
-        @Advice.This final Connection thiz) {
-      final AgentSpan span = startSpan("redis-command", JedisClientDecorator.OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onConnection(span, thiz);
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final CommandObject<?> commandObject, @Advice.This final Connection thiz) {
+            final AgentSpan span = startSpan("redis-command", JedisClientDecorator.OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onConnection(span, thiz);
 
-      final ProtocolCommand command = commandObject.getArguments().getCommand();
+            final ProtocolCommand command = commandObject.getArguments().getCommand();
 
-      if (command instanceof Protocol.Command) {
-        DECORATE.onStatement(span, ((Protocol.Command) command).name());
-      } else {
-        // Protocol.Command is the only implementation in the Jedis lib as of 3.1 but this will save
-        // us if that changes
-        DECORATE.onStatement(span, new String(command.getRaw()));
-      }
-      return activateSpan(span);
-    }
+            if (command instanceof Protocol.Command) {
+                DECORATE.onStatement(span, ((Protocol.Command) command).name());
+            } else {
+                // Protocol.Command is the only implementation in the Jedis lib as of 3.1 but this will save
+                // us if that changes
+                DECORATE.onStatement(span, new String(command.getRaw()));
+            }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      AgentSpan span = spanFromScope(scope);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            AgentSpan span = spanFromScope(scope);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/redis/clients/jedis/JedisClientDecorator.java b/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/redis/clients/jedis/JedisClientDecorator.java
index ccbfc3d3418..047051315e8 100644
--- a/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/redis/clients/jedis/JedisClientDecorator.java
+++ b/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/redis/clients/jedis/JedisClientDecorator.java
@@ -6,53 +6,53 @@
 import datadog.trace.bootstrap.instrumentation.decorator.DBTypeProcessingDatabaseClientDecorator;
 
 public class JedisClientDecorator extends DBTypeProcessingDatabaseClientDecorator<Connection> {
-  public static final JedisClientDecorator DECORATE = new JedisClientDecorator();
-
-  private static final String REDIS = "redis";
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation(REDIS));
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cache().service(REDIS);
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jedis", REDIS};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.REDIS;
-  }
-
-  @Override
-  protected String dbType() {
-    return REDIS;
-  }
-
-  @Override
-  protected String dbUser(final Connection connection) {
-    return null;
-  }
-
-  @Override
-  protected String dbInstance(final Connection connection) {
-    return null;
-  }
-
-  @Override
-  protected String dbHostname(Connection connection) {
-    // getHostAndPort is protected hence the decorator sits in the same package
-    return connection.getHostAndPort().getHost();
-  }
+    public static final JedisClientDecorator DECORATE = new JedisClientDecorator();
+
+    private static final String REDIS = "redis";
+    public static final CharSequence OPERATION_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation(REDIS));
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cache().service(REDIS);
+    private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jedis", REDIS};
+    }
+
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.REDIS;
+    }
+
+    @Override
+    protected String dbType() {
+        return REDIS;
+    }
+
+    @Override
+    protected String dbUser(final Connection connection) {
+        return null;
+    }
+
+    @Override
+    protected String dbInstance(final Connection connection) {
+        return null;
+    }
+
+    @Override
+    protected String dbHostname(Connection connection) {
+        // getHostAndPort is protected hence the decorator sits in the same package
+        return connection.getHostAndPort().getHost();
+    }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/AbstractStringReaderInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/AbstractStringReaderInstrumentation.java
index f4ee9455d0b..1de6d7676c8 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/AbstractStringReaderInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/AbstractStringReaderInstrumentation.java
@@ -20,44 +20,44 @@
 
 @AutoService(InstrumenterModule.class)
 public class AbstractStringReaderInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public AbstractStringReaderInstrumentation() {
-    super("jersey");
-  }
+    public AbstractStringReaderInstrumentation() {
+        super("jersey");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("fromString").and(isPublic().and(takesArguments(String.class))),
-        getClass().getName() + "$FromStringAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("fromString").and(isPublic().and(takesArguments(String.class))),
+                getClass().getName() + "$FromStringAdvice");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.glassfish.jersey.internal.inject.ParamConverters$AbstractStringReader",
-      "org.glassfish.jersey.server.internal.inject.ParamConverters$AbstractStringReader"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.glassfish.jersey.internal.inject.ParamConverters$AbstractStringReader",
+            "org.glassfish.jersey.server.internal.inject.ParamConverters$AbstractStringReader"
+        };
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class FromStringAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void onExit(
-        @Advice.Argument(0) final String param,
-        @Advice.Return Object result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (!(result instanceof String)) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      module.taintStringIfTainted(ctx, (String) result, param);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class FromStringAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void onExit(
+                @Advice.Argument(0) final String param,
+                @Advice.Return Object result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (!(result instanceof String)) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            module.taintStringIfTainted(ctx, (String) result, param);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/ContainerRequestInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/ContainerRequestInstrumentation.java
index 82e4bb8d976..b3ddd91c3dd 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/ContainerRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/ContainerRequestInstrumentation.java
@@ -20,49 +20,49 @@
 
 @AutoService(InstrumenterModule.class)
 public class ContainerRequestInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ContainerRequestInstrumentation() {
-    super("jersey");
-  }
+    public ContainerRequestInstrumentation() {
+        super("jersey");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    String baseName = ContainerRequestInstrumentation.class.getName();
-    transformer.applyAdvice(
-        named("setProperty").and(isPublic()).and(takesArguments(String.class, Object.class)),
-        baseName + "$SetPropertyAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        String baseName = ContainerRequestInstrumentation.class.getName();
+        transformer.applyAdvice(
+                named("setProperty").and(isPublic()).and(takesArguments(String.class, Object.class)),
+                baseName + "$SetPropertyAdvice");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.jersey.server.ContainerRequest";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.jersey.server.ContainerRequest";
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class SetPropertyAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void onExit(
-        @Advice.Argument(0) String name,
-        @Advice.Argument(1) Object value,
-        @ActiveRequestContext RequestContext reqCtx) {
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class SetPropertyAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void onExit(
+                @Advice.Argument(0) String name,
+                @Advice.Argument(1) Object value,
+                @ActiveRequestContext RequestContext reqCtx) {
 
-      if (!"jersey.config.server.representation.decoded.form".equals(name)
-          && !"jersey.config.server.representation.form".equals(name)) {
-        return;
-      }
+            if (!"jersey.config.server.representation.decoded.form".equals(name)
+                    && !"jersey.config.server.representation.form".equals(name)) {
+                return;
+            }
 
-      final PropagationModule prop = InstrumentationBridge.PROPAGATION;
-      if (prop == null) {
-        return;
-      }
+            final PropagationModule prop = InstrumentationBridge.PROPAGATION;
+            if (prop == null) {
+                return;
+            }
 
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      if (prop.isTainted(ctx, value)) {
-        return;
-      }
-      prop.taintObject(ctx, value, SourceTypes.REQUEST_BODY);
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            if (prop.isTainted(ctx, value)) {
+                return;
+            }
+            prop.taintObject(ctx, value, SourceTypes.REQUEST_BODY);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/CookieInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/CookieInstrumentation.java
index 941447506a1..d706ed5144b 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/CookieInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/CookieInstrumentation.java
@@ -21,58 +21,57 @@
 
 @AutoService(InstrumenterModule.class)
 public class CookieInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public CookieInstrumentation() {
-    super("jersey");
-  }
+    public CookieInstrumentation() {
+        super("jersey");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getName").and(isPublic()).and(takesArguments(0).and(returns(String.class))),
-        CookieInstrumentation.class.getName() + "$InstrumenterAdviceGetName");
-    transformer.applyAdvice(
-        named("getValue").and(isPublic()).and(takesArguments(0).and(returns(String.class))),
-        CookieInstrumentation.class.getName() + "$GetValueAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getName").and(isPublic()).and(takesArguments(0).and(returns(String.class))),
+                CookieInstrumentation.class.getName() + "$InstrumenterAdviceGetName");
+        transformer.applyAdvice(
+                named("getValue").and(isPublic()).and(takesArguments(0).and(returns(String.class))),
+                CookieInstrumentation.class.getName() + "$GetValueAdvice");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {"jakarta.ws.rs.core.Cookie", "javax.ws.rs.core.Cookie"};
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"jakarta.ws.rs.core.Cookie", "javax.ws.rs.core.Cookie"};
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class InstrumenterAdviceGetName {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_NAME)
-    public static void onExit(
-        @Advice.Return String cookieName,
-        @Advice.This Object self,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintStringIfTainted(
-            ctx, cookieName, self, SourceTypes.REQUEST_COOKIE_NAME, cookieName);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class InstrumenterAdviceGetName {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_NAME)
+        public static void onExit(
+                @Advice.Return String cookieName,
+                @Advice.This Object self,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintStringIfTainted(ctx, cookieName, self, SourceTypes.REQUEST_COOKIE_NAME, cookieName);
+            }
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetValueAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    public static void onExit(
-        @Advice.Return String cookieValue,
-        @Advice.FieldValue("name") String name,
-        @Advice.This Object self,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintStringIfTainted(ctx, cookieValue, self, SourceTypes.REQUEST_COOKIE_VALUE, name);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetValueAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        public static void onExit(
+                @Advice.Return String cookieValue,
+                @Advice.FieldValue("name") String name,
+                @Advice.This Object self,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintStringIfTainted(ctx, cookieValue, self, SourceTypes.REQUEST_COOKIE_VALUE, name);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/FormInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/FormInstrumentation.java
index dae3f03cf80..59621b7db96 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/FormInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/FormInstrumentation.java
@@ -23,48 +23,48 @@
 
 @AutoService(InstrumenterModule.class)
 public class FormInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public FormInstrumentation() {
-    super("jersey");
-  }
+    public FormInstrumentation() {
+        super("jersey");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("asMap").and(isPublic()).and(takesArguments(0)),
-        FormInstrumentation.class.getName() + "$AsMapAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("asMap").and(isPublic()).and(takesArguments(0)),
+                FormInstrumentation.class.getName() + "$AsMapAdvice");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {"jakarta.ws.rs.core.Form", "javax.ws.rs.core.Form"};
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"jakarta.ws.rs.core.Form", "javax.ws.rs.core.Form"};
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class AsMapAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void onExit(
-        @Advice.Return Map<String, List<String>> form,
-        @Advice.This Object self,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (form == null || form.isEmpty()) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      if (!module.isTainted(ctx, self)) {
-        return;
-      }
-      if (module.isTainted(ctx, form)) {
-        return;
-      }
-      module.taintObject(ctx, form, SourceTypes.REQUEST_PARAMETER_VALUE);
-      taintMultiValuedMap(ctx, module, SourceTypes.REQUEST_PARAMETER_VALUE, form);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class AsMapAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void onExit(
+                @Advice.Return Map<String, List<String>> form,
+                @Advice.This Object self,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (form == null || form.isEmpty()) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            if (!module.isTainted(ctx, self)) {
+                return;
+            }
+            if (module.isTainted(ctx, form)) {
+                return;
+            }
+            module.taintObject(ctx, form, SourceTypes.REQUEST_PARAMETER_VALUE);
+            taintMultiValuedMap(ctx, module, SourceTypes.REQUEST_PARAMETER_VALUE, form);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/InboundMessageContextInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/InboundMessageContextInstrumentation.java
index f3f021e5cc7..318f31e0dab 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/InboundMessageContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/InboundMessageContextInstrumentation.java
@@ -28,115 +28,112 @@
 
 @AutoService(InstrumenterModule.class)
 public class InboundMessageContextInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public InboundMessageContextInstrumentation() {
-    super("jersey");
-  }
+    public InboundMessageContextInstrumentation() {
+        super("jersey");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    String baseName = InboundMessageContextInstrumentation.class.getName();
-    transformer.applyAdvice(
-        namedOneOf("header", "headers", "remove").and(returns(named(instrumentedType()))),
-        baseName + "$SetHeadersAdvice");
-    transformer.applyAdvice(
-        named("getHeaders").and(isPublic()).and(takesArguments(0)), baseName + "$GetHeadersAdvice");
-    transformer.applyAdvice(
-        named("getRequestCookies").and(isPublic()).and(takesArguments(0)),
-        baseName + "$CookiesAdvice");
-    transformer.applyAdvice(
-        named("readEntity").and(isPublic()).and(takesArguments(4)), baseName + "$ReadEntityAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        String baseName = InboundMessageContextInstrumentation.class.getName();
+        transformer.applyAdvice(
+                namedOneOf("header", "headers", "remove").and(returns(named(instrumentedType()))),
+                baseName + "$SetHeadersAdvice");
+        transformer.applyAdvice(
+                named("getHeaders").and(isPublic()).and(takesArguments(0)), baseName + "$GetHeadersAdvice");
+        transformer.applyAdvice(
+                named("getRequestCookies").and(isPublic()).and(takesArguments(0)), baseName + "$CookiesAdvice");
+        transformer.applyAdvice(
+                named("readEntity").and(isPublic()).and(takesArguments(4)), baseName + "$ReadEntityAdvice");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.jersey.message.internal.InboundMessageContext";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.jersey.message.internal.InboundMessageContext";
+    }
 
-  /** This advice tries to skip tainting the headers before they are ready */
-  public static class SetHeadersAdvice {
+    /** This advice tries to skip tainting the headers before they are ready */
+    public static class SetHeadersAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter() {
-      CallDepthThreadLocalMap.incrementCallDepth(InboundMessageContext.class);
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter() {
+            CallDepthThreadLocalMap.incrementCallDepth(InboundMessageContext.class);
+        }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit() {
-      CallDepthThreadLocalMap.decrementCallDepth(InboundMessageContext.class);
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit() {
+            CallDepthThreadLocalMap.decrementCallDepth(InboundMessageContext.class);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetHeadersAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void onExit(
-        @Advice.Return Map<String, List<String>> headers,
-        @ActiveRequestContext RequestContext reqCtx) {
-      // ignore internal calls populating headers
-      if (CallDepthThreadLocalMap.getCallDepth(InboundMessageContext.class) != 0) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetHeadersAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void onExit(
+                @Advice.Return Map<String, List<String>> headers, @ActiveRequestContext RequestContext reqCtx) {
+            // ignore internal calls populating headers
+            if (CallDepthThreadLocalMap.getCallDepth(InboundMessageContext.class) != 0) {
+                return;
+            }
 
-      if (headers == null || headers.isEmpty()) {
-        return;
-      }
-      final PropagationModule prop = InstrumentationBridge.PROPAGATION;
-      if (prop == null) {
-        return;
-      }
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      if (prop.isTainted(ctx, headers)) {
-        return;
-      }
-      prop.taintObject(headers, SourceTypes.REQUEST_HEADER_VALUE);
-      taintMultiValuedMap(ctx, prop, SourceTypes.REQUEST_HEADER_VALUE, headers);
+            if (headers == null || headers.isEmpty()) {
+                return;
+            }
+            final PropagationModule prop = InstrumentationBridge.PROPAGATION;
+            if (prop == null) {
+                return;
+            }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            if (prop.isTainted(ctx, headers)) {
+                return;
+            }
+            prop.taintObject(headers, SourceTypes.REQUEST_HEADER_VALUE);
+            taintMultiValuedMap(ctx, prop, SourceTypes.REQUEST_HEADER_VALUE, headers);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class CookiesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    public static void onExit(
-        @Advice.Return Map<String, Object> cookies, @ActiveRequestContext RequestContext reqCtx) {
-      if (cookies == null || cookies.isEmpty()) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      for (final Map.Entry<String, Object> entry : cookies.entrySet()) {
-        module.taintObject(ctx, entry.getValue(), SourceTypes.REQUEST_COOKIE_VALUE, entry.getKey());
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class CookiesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        public static void onExit(
+                @Advice.Return Map<String, Object> cookies, @ActiveRequestContext RequestContext reqCtx) {
+            if (cookies == null || cookies.isEmpty()) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            for (final Map.Entry<String, Object> entry : cookies.entrySet()) {
+                module.taintObject(ctx, entry.getValue(), SourceTypes.REQUEST_COOKIE_VALUE, entry.getKey());
+            }
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class ReadEntityAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_BODY)
-    public static void onExit(
-        @Advice.Return Object result, @ActiveRequestContext RequestContext reqCtx) {
-      if (result == null) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      if (module.isTainted(ctx, result)) {
-        return;
-      }
-      module.taintObject(ctx, result, SourceTypes.REQUEST_BODY);
-      if (result instanceof Map) {
-        taintMap(ctx, module, SourceTypes.REQUEST_PARAMETER_VALUE, (Map<?, ?>) result);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class ReadEntityAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_BODY)
+        public static void onExit(@Advice.Return Object result, @ActiveRequestContext RequestContext reqCtx) {
+            if (result == null) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            if (module.isTainted(ctx, result)) {
+                return;
+            }
+            module.taintObject(ctx, result, SourceTypes.REQUEST_BODY);
+            if (result instanceof Map) {
+                taintMap(ctx, module, SourceTypes.REQUEST_PARAMETER_VALUE, (Map<?, ?>) result);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/JakartaWSResponseInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/JakartaWSResponseInstrumentation.java
index 4a0e6e8f57e..4e13fbff7c0 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/JakartaWSResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/JakartaWSResponseInstrumentation.java
@@ -20,64 +20,63 @@
 
 @AutoService(InstrumenterModule.class)
 public class JakartaWSResponseInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public JakartaWSResponseInstrumentation() {
-    super("jersey");
-  }
+    public JakartaWSResponseInstrumentation() {
+        super("jersey");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("header").and(isPublic().and(takesArguments(String.class, Object.class))),
-        JakartaWSResponseInstrumentation.class.getName() + "$HeaderAdvice");
-    transformer.applyAdvice(
-        named("location").and(isPublic().and(takesArguments(URI.class))),
-        JakartaWSResponseInstrumentation.class.getName() + "$RedirectionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("header").and(isPublic().and(takesArguments(String.class, Object.class))),
+                JakartaWSResponseInstrumentation.class.getName() + "$HeaderAdvice");
+        transformer.applyAdvice(
+                named("location").and(isPublic().and(takesArguments(URI.class))),
+                JakartaWSResponseInstrumentation.class.getName() + "$RedirectionAdvice");
+    }
 
-  @Override
-  protected boolean isOptOutEnabled() {
-    return true;
-  }
+    @Override
+    protected boolean isOptOutEnabled() {
+        return true;
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "jakarta.ws.rs.core.Response$ResponseBuilder";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "jakarta.ws.rs.core.Response$ResponseBuilder";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
 
-  public static class HeaderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.RESPONSE_HEADER)
-    public static void onExit(
-        @Advice.Argument(0) String headerName, @Advice.Argument(1) Object headerValue) {
-      if (null != headerValue) {
-        String value = headerValue.toString();
-        if (value.length() > 0) {
-          HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
-          if (mod != null) {
-            mod.onHeader(headerName, value);
-          }
+    public static class HeaderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.RESPONSE_HEADER)
+        public static void onExit(@Advice.Argument(0) String headerName, @Advice.Argument(1) Object headerValue) {
+            if (null != headerValue) {
+                String value = headerValue.toString();
+                if (value.length() > 0) {
+                    HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
+                    if (mod != null) {
+                        mod.onHeader(headerName, value);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class RedirectionAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
-    public static void onEnter(@Advice.Argument(0) final URI location) {
-      final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
-      if (module != null) {
-        if (null != location) {
-          module.onURIRedirect(location);
+    public static class RedirectionAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
+        public static void onEnter(@Advice.Argument(0) final URI location) {
+            final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
+            if (module != null) {
+                if (null != location) {
+                    module.onURIRedirect(location);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/JavaxWSResponseInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/JavaxWSResponseInstrumentation.java
index 2720ff63f14..400655d130e 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/JavaxWSResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/JavaxWSResponseInstrumentation.java
@@ -20,64 +20,63 @@
 
 @AutoService(InstrumenterModule.class)
 public class JavaxWSResponseInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public JavaxWSResponseInstrumentation() {
-    super("jersey");
-  }
+    public JavaxWSResponseInstrumentation() {
+        super("jersey");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("header").and(isPublic().and(takesArguments(String.class, Object.class))),
-        JavaxWSResponseInstrumentation.class.getName() + "$HeaderAdvice");
-    transformer.applyAdvice(
-        named("location").and(isPublic().and(takesArguments(URI.class))),
-        JavaxWSResponseInstrumentation.class.getName() + "$RedirectionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("header").and(isPublic().and(takesArguments(String.class, Object.class))),
+                JavaxWSResponseInstrumentation.class.getName() + "$HeaderAdvice");
+        transformer.applyAdvice(
+                named("location").and(isPublic().and(takesArguments(URI.class))),
+                JavaxWSResponseInstrumentation.class.getName() + "$RedirectionAdvice");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.ws.rs.core.Response$ResponseBuilder";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.ws.rs.core.Response$ResponseBuilder";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  protected boolean isOptOutEnabled() {
-    return true;
-  }
+    @Override
+    protected boolean isOptOutEnabled() {
+        return true;
+    }
 
-  public static class HeaderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.RESPONSE_HEADER)
-    public static void onExit(
-        @Advice.Argument(0) String headerName, @Advice.Argument(1) Object headerValue) {
-      if (null != headerValue) {
-        String value = headerValue.toString();
-        if (value.length() > 0) {
-          HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
-          if (mod != null) {
-            mod.onHeader(headerName, value);
-          }
+    public static class HeaderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.RESPONSE_HEADER)
+        public static void onExit(@Advice.Argument(0) String headerName, @Advice.Argument(1) Object headerValue) {
+            if (null != headerValue) {
+                String value = headerValue.toString();
+                if (value.length() > 0) {
+                    HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
+                    if (mod != null) {
+                        mod.onHeader(headerName, value);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class RedirectionAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
-    public static void onEnter(@Advice.Argument(0) final URI location) {
-      final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
-      if (module != null) {
-        if (null != location) {
-          module.onURIRedirect(location);
+    public static class RedirectionAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
+        public static void onEnter(@Advice.Argument(0) final URI location) {
+            final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
+            if (module != null) {
+                if (null != location) {
+                    module.onURIRedirect(location);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/JerseyTaintHelper.java b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/JerseyTaintHelper.java
index 2c7d8866428..59e19960df9 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/JerseyTaintHelper.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/JerseyTaintHelper.java
@@ -8,51 +8,48 @@
 
 public abstract class JerseyTaintHelper {
 
-  private JerseyTaintHelper() {}
+    private JerseyTaintHelper() {}
 
-  public static void taintMultiValuedMap(
-      final IastContext ctx,
-      final PropagationModule module,
-      final byte type,
-      final Map<String, List<String>> target) {
-    final byte nameType = SourceTypes.namedSource(type);
-    final boolean reportName = nameType != type;
-    for (Map.Entry<String, List<String>> entry : target.entrySet()) {
-      final String name = entry.getKey();
-      if (reportName) {
-        module.taintString(ctx, name, nameType, name);
-      }
-      for (String value : entry.getValue()) {
-        module.taintString(ctx, value, type, name);
-      }
+    public static void taintMultiValuedMap(
+            final IastContext ctx,
+            final PropagationModule module,
+            final byte type,
+            final Map<String, List<String>> target) {
+        final byte nameType = SourceTypes.namedSource(type);
+        final boolean reportName = nameType != type;
+        for (Map.Entry<String, List<String>> entry : target.entrySet()) {
+            final String name = entry.getKey();
+            if (reportName) {
+                module.taintString(ctx, name, nameType, name);
+            }
+            for (String value : entry.getValue()) {
+                module.taintString(ctx, value, type, name);
+            }
+        }
     }
-  }
 
-  public static void taintMap(
-      final IastContext ctx,
-      final PropagationModule module,
-      final byte type,
-      final Map<?, ?> target) {
-    final byte nameType = SourceTypes.namedSource(type);
-    final boolean reportName = nameType != type;
-    for (final Map.Entry<?, ?> entry : target.entrySet()) {
-      final Object key = entry.getKey();
-      if (key instanceof String) {
-        final String name = (String) key;
-        if (reportName) {
-          module.taintString(ctx, name, nameType, name);
-        }
-        final Object value = entry.getValue();
-        if (value instanceof String) {
-          module.taintString(ctx, (String) value, type, name);
-        } else if (value instanceof List) {
-          for (final Object item : (List<?>) value) {
-            if (item instanceof String) {
-              module.taintString(ctx, (String) item, type, name);
+    public static void taintMap(
+            final IastContext ctx, final PropagationModule module, final byte type, final Map<?, ?> target) {
+        final byte nameType = SourceTypes.namedSource(type);
+        final boolean reportName = nameType != type;
+        for (final Map.Entry<?, ?> entry : target.entrySet()) {
+            final Object key = entry.getKey();
+            if (key instanceof String) {
+                final String name = (String) key;
+                if (reportName) {
+                    module.taintString(ctx, name, nameType, name);
+                }
+                final Object value = entry.getValue();
+                if (value instanceof String) {
+                    module.taintString(ctx, (String) value, type, name);
+                } else if (value instanceof List) {
+                    for (final Object item : (List<?>) value) {
+                        if (item instanceof String) {
+                            module.taintString(ctx, (String) item, type, name);
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/ReaderInterceptorExecutorInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/ReaderInterceptorExecutorInstrumentation.java
index 4fdf2bc6d21..dca8a9d3a4a 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/ReaderInterceptorExecutorInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/ReaderInterceptorExecutorInstrumentation.java
@@ -20,33 +20,31 @@
 // keep in sync with jersey2 (javax packages)
 @AutoService(InstrumenterModule.class)
 public class ReaderInterceptorExecutorInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ReaderInterceptorExecutorInstrumentation() {
-    super("jersey");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ReaderInterceptorExecutorInstrumentation() {
+        super("jersey");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.jersey.message.internal.ReaderInterceptorExecutor";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.jersey.message.internal.ReaderInterceptorExecutor";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getInputStream").and(takesArguments(0)),
-        getClass().getName() + "$InstrumenterAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getInputStream").and(takesArguments(0)), getClass().getName() + "$InstrumenterAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class InstrumenterAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(
-        @Advice.Return final InputStream inputStream, @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintObject(ctx, inputStream, SourceTypes.REQUEST_BODY);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class InstrumenterAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.Return final InputStream inputStream, @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintObject(ctx, inputStream, SourceTypes.REQUEST_BODY);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/UriRoutingContextInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/UriRoutingContextInstrumentation.java
index d26ebb85062..ec55c6c8edd 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/UriRoutingContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/UriRoutingContextInstrumentation.java
@@ -23,71 +23,69 @@
 
 @AutoService(InstrumenterModule.class)
 public class UriRoutingContextInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public UriRoutingContextInstrumentation() {
-    super("jersey");
-  }
+    public UriRoutingContextInstrumentation() {
+        super("jersey");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    String baseName = UriRoutingContextInstrumentation.class.getName();
-    transformer.applyAdvice(
-        named("getPathParameters").and(isPublic().and(takesArguments(boolean.class))),
-        baseName + "$GetPathParametersAdvice");
-    transformer.applyAdvice(
-        named("getQueryParameters").and(isPublic().and(takesArguments(boolean.class))),
-        baseName + "$GetQueryParametersAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        String baseName = UriRoutingContextInstrumentation.class.getName();
+        transformer.applyAdvice(
+                named("getPathParameters").and(isPublic().and(takesArguments(boolean.class))),
+                baseName + "$GetPathParametersAdvice");
+        transformer.applyAdvice(
+                named("getQueryParameters").and(isPublic().and(takesArguments(boolean.class))),
+                baseName + "$GetQueryParametersAdvice");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.jersey.server.internal.routing.UriRoutingContext";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.jersey.server.internal.routing.UriRoutingContext";
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetPathParametersAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PATH_PARAMETER)
-    public static void onExit(
-        @Advice.Return Map<String, List<String>> pathParams,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (pathParams == null || pathParams.isEmpty()) {
-        return;
-      }
-      final PropagationModule prop = InstrumentationBridge.PROPAGATION;
-      if (prop == null) {
-        return;
-      }
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      if (prop.isTainted(ctx, pathParams)) {
-        return;
-      }
-      prop.taintObject(ctx, pathParams, SourceTypes.REQUEST_PATH_PARAMETER);
-      taintMultiValuedMap(ctx, prop, SourceTypes.REQUEST_PATH_PARAMETER, pathParams);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetPathParametersAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PATH_PARAMETER)
+        public static void onExit(
+                @Advice.Return Map<String, List<String>> pathParams, @ActiveRequestContext RequestContext reqCtx) {
+            if (pathParams == null || pathParams.isEmpty()) {
+                return;
+            }
+            final PropagationModule prop = InstrumentationBridge.PROPAGATION;
+            if (prop == null) {
+                return;
+            }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            if (prop.isTainted(ctx, pathParams)) {
+                return;
+            }
+            prop.taintObject(ctx, pathParams, SourceTypes.REQUEST_PATH_PARAMETER);
+            taintMultiValuedMap(ctx, prop, SourceTypes.REQUEST_PATH_PARAMETER, pathParams);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetQueryParametersAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void onExit(
-        @Advice.Return Map<String, List<String>> queryParams,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (queryParams == null || queryParams.isEmpty()) {
-        return;
-      }
-      final PropagationModule prop = InstrumentationBridge.PROPAGATION;
-      if (prop == null) {
-        return;
-      }
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      if (prop.isTainted(ctx, queryParams)) {
-        return;
-      }
-      prop.taintObject(ctx, queryParams, SourceTypes.REQUEST_PARAMETER_VALUE);
-      taintMultiValuedMap(ctx, prop, SourceTypes.REQUEST_PARAMETER_VALUE, queryParams);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetQueryParametersAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void onExit(
+                @Advice.Return Map<String, List<String>> queryParams, @ActiveRequestContext RequestContext reqCtx) {
+            if (queryParams == null || queryParams.isEmpty()) {
+                return;
+            }
+            final PropagationModule prop = InstrumentationBridge.PROPAGATION;
+            if (prop == null) {
+                return;
+            }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            if (prop.isTainted(ctx, queryParams)) {
+                return;
+            }
+            prop.taintObject(ctx, queryParams, SourceTypes.REQUEST_PARAMETER_VALUE);
+            taintMultiValuedMap(ctx, prop, SourceTypes.REQUEST_PARAMETER_VALUE, queryParams);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MessageBodyReaderInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MessageBodyReaderInstrumentation.java
index 58417311af4..6f0150b7b07 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MessageBodyReaderInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MessageBodyReaderInstrumentation.java
@@ -23,74 +23,71 @@
 // keep in sync with jersey3 (jakarta packages)
 @AutoService(InstrumenterModule.class)
 public class MessageBodyReaderInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public MessageBodyReaderInstrumentation() {
-    super("jersey");
-  }
+    public MessageBodyReaderInstrumentation() {
+        super("jersey");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jersey_2";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jersey_2";
+    }
 
-  // This is a caller for the MessageBodyReaders in jersey
-  // We instrument it instead of the MessageBodyReaders in order to avoid hierarchy inspections
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.jersey.message.internal.ReaderInterceptorExecutor";
-  }
+    // This is a caller for the MessageBodyReaders in jersey
+    // We instrument it instead of the MessageBodyReaders in order to avoid hierarchy inspections
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.jersey.message.internal.ReaderInterceptorExecutor";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("proceed").and(takesArguments(0)),
-        getClass().getName() + "$ReaderInterceptorExecutorProceedAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("proceed").and(takesArguments(0)),
+                getClass().getName() + "$ReaderInterceptorExecutorProceedAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class ReaderInterceptorExecutorProceedAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return final Object ret,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (ret == null || t != null) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class ReaderInterceptorExecutorProceedAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Return final Object ret,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (ret == null || t != null) {
+                return;
+            }
 
-      if (ret.getClass()
-          .getName()
-          .equals("org.glassfish.jersey.media.multipart.FormDataMultiPart")) {
-        // likely handled already by MultiPartReaderServerSideInstrumentation
-        return;
-      }
+            if (ret.getClass().getName().equals("org.glassfish.jersey.media.multipart.FormDataMultiPart")) {
+                // likely handled already by MultiPartReaderServerSideInstrumentation
+                return;
+            }
 
-      Object objToPass;
-      if (ret instanceof Form) {
-        objToPass = ((Form) ret).asMap();
-      } else {
-        objToPass = ret;
-      }
+            Object objToPass;
+            if (ret instanceof Form) {
+                objToPass = ((Form) ret).asMap();
+            } else {
+                objToPass = ret;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
 
-      Flow<Void> flow = callback.apply(reqCtx, objToPass);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba);
-          t = new BlockingException("Blocked request (for ReaderInterceptorExecutor/proceed)");
-          reqCtx.getTraceSegment().effectivelyBlocked();
+            Flow<Void> flow = callback.apply(reqCtx, objToPass);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba);
+                    t = new BlockingException("Blocked request (for ReaderInterceptorExecutor/proceed)");
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartHelper.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartHelper.java
index c57a71f63da..56c9082cebb 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartHelper.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartHelper.java
@@ -18,100 +18,100 @@
 
 public final class MultiPartHelper {
 
-  public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
-  public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
+    public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
+    public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
 
-  private MultiPartHelper() {}
+    private MultiPartHelper() {}
 
-  public static void collectBodyPart(
-      FormDataBodyPart bodyPart,
-      Map<String, List<String>> bodyMap,
-      List<String> filenames,
-      List<String> filesContent) {
-    FormDataContentDisposition cd;
-    try {
-      cd = bodyPart.getFormDataContentDisposition();
-    } catch (Exception ignored) {
-      // IllegalArgumentException on malformed Content-Disposition: skip this part gracefully
-      // so a single bad part does not abort processing of the remaining parts.
-      cd = null;
+    public static void collectBodyPart(
+            FormDataBodyPart bodyPart,
+            Map<String, List<String>> bodyMap,
+            List<String> filenames,
+            List<String> filesContent) {
+        FormDataContentDisposition cd;
+        try {
+            cd = bodyPart.getFormDataContentDisposition();
+        } catch (Exception ignored) {
+            // IllegalArgumentException on malformed Content-Disposition: skip this part gracefully
+            // so a single bad part does not abort processing of the remaining parts.
+            cd = null;
+        }
+        if (bodyMap != null
+                && cd != null
+                && MediaTypes.typeEqual(MediaType.TEXT_PLAIN_TYPE, bodyPart.getMediaType())
+                && totalBodyMapValues(bodyMap) < MAX_FILES_TO_INSPECT) {
+            // readContent() reads the part through a byte-capped decoder (MAX_CONTENT_BYTES) instead of
+            // the unbounded getValue(); the cap counts total accumulated values across all field names,
+            // not distinct keys, so repeating the same field name cannot bypass the limit. cd.getName()
+            // is a safe field accessor, unlike bodyPart.getName() which re-parses the disposition header.
+            bodyMap.computeIfAbsent(cd.getName(), k -> new ArrayList<>()).add(readContent(bodyPart));
+        }
+        // rawFilename == null  → no filename attribute → form field → skip filenames and content
+        // rawFilename == ""    → filename attribute present but empty → content YES, filenames NO
+        // rawFilename != ""    → file with name → both
+        String rawFilename = cd != null ? cd.getFileName() : null;
+        if (filenames != null && rawFilename != null && !rawFilename.isEmpty()) {
+            filenames.add(rawFilename);
+        }
+        if (filesContent != null && rawFilename != null && filesContent.size() < MAX_FILES_TO_INSPECT) {
+            filesContent.add(readFileContent(bodyPart));
+        }
     }
-    if (bodyMap != null
-        && cd != null
-        && MediaTypes.typeEqual(MediaType.TEXT_PLAIN_TYPE, bodyPart.getMediaType())
-        && totalBodyMapValues(bodyMap) < MAX_FILES_TO_INSPECT) {
-      // readContent() reads the part through a byte-capped decoder (MAX_CONTENT_BYTES) instead of
-      // the unbounded getValue(); the cap counts total accumulated values across all field names,
-      // not distinct keys, so repeating the same field name cannot bypass the limit. cd.getName()
-      // is a safe field accessor, unlike bodyPart.getName() which re-parses the disposition header.
-      bodyMap.computeIfAbsent(cd.getName(), k -> new ArrayList<>()).add(readContent(bodyPart));
-    }
-    // rawFilename == null  → no filename attribute → form field → skip filenames and content
-    // rawFilename == ""    → filename attribute present but empty → content YES, filenames NO
-    // rawFilename != ""    → file with name → both
-    String rawFilename = cd != null ? cd.getFileName() : null;
-    if (filenames != null && rawFilename != null && !rawFilename.isEmpty()) {
-      filenames.add(rawFilename);
-    }
-    if (filesContent != null && rawFilename != null && filesContent.size() < MAX_FILES_TO_INSPECT) {
-      filesContent.add(readFileContent(bodyPart));
-    }
-  }
 
-  private static int totalBodyMapValues(Map<String, List<String>> bodyMap) {
-    int total = 0;
-    for (List<String> values : bodyMap.values()) {
-      total += values.size();
+    private static int totalBodyMapValues(Map<String, List<String>> bodyMap) {
+        int total = 0;
+        for (List<String> values : bodyMap.values()) {
+            total += values.size();
+        }
+        return total;
     }
-    return total;
-  }
 
-  // Used for the body-map/text-field path: Jersey's own getValue() decodes undeclared-charset
-  // text parts as UTF-8, so this matches that default instead of MultipartContentDecoder's
-  // platform-dependent fallback.
-  public static String readContent(FormDataBodyPart bodyPart) {
-    return read(bodyPart, contentTypeWithDefaultUtf8(bodyPart.getMediaType()));
-  }
+    // Used for the body-map/text-field path: Jersey's own getValue() decodes undeclared-charset
+    // text parts as UTF-8, so this matches that default instead of MultipartContentDecoder's
+    // platform-dependent fallback.
+    public static String readContent(FormDataBodyPart bodyPart) {
+        return read(bodyPart, contentTypeWithDefaultUtf8(bodyPart.getMediaType()));
+    }
 
-  // Used for the filesContent path: keeps parity with the other multipart helpers, which all
-  // rely on MultipartContentDecoder's own charset fallback for undeclared-charset file content.
-  public static String readFileContent(FormDataBodyPart bodyPart) {
-    MediaType mediaType = bodyPart.getMediaType();
-    return read(bodyPart, mediaType != null ? mediaType.toString() : null);
-  }
+    // Used for the filesContent path: keeps parity with the other multipart helpers, which all
+    // rely on MultipartContentDecoder's own charset fallback for undeclared-charset file content.
+    public static String readFileContent(FormDataBodyPart bodyPart) {
+        MediaType mediaType = bodyPart.getMediaType();
+        return read(bodyPart, mediaType != null ? mediaType.toString() : null);
+    }
 
-  private static String read(FormDataBodyPart bodyPart, String contentType) {
-    try {
-      // getEntityAs(InputStream.class) is backed by BodyPartEntity which supports re-reading:
-      // each call creates a fresh stream from the buffered MIME part data.
-      try (InputStream is = bodyPart.getEntityAs(InputStream.class)) {
-        if (is == null) return "";
-        return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, contentType);
-      }
-    } catch (IOException ignored) {
-      return "";
+    private static String read(FormDataBodyPart bodyPart, String contentType) {
+        try {
+            // getEntityAs(InputStream.class) is backed by BodyPartEntity which supports re-reading:
+            // each call creates a fresh stream from the buffered MIME part data.
+            try (InputStream is = bodyPart.getEntityAs(InputStream.class)) {
+                if (is == null) return "";
+                return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, contentType);
+            }
+        } catch (IOException ignored) {
+            return "";
+        }
     }
-  }
 
-  private static String contentTypeWithDefaultUtf8(MediaType mediaType) {
-    String contentType = mediaType != null ? mediaType.toString() : null;
-    return MultipartContentDecoder.extractCharset(contentType) == null
-        ? (contentType == null ? "charset=UTF-8" : contentType + "; charset=UTF-8")
-        : contentType;
-  }
+    private static String contentTypeWithDefaultUtf8(MediaType mediaType) {
+        String contentType = mediaType != null ? mediaType.toString() : null;
+        return MultipartContentDecoder.extractCharset(contentType) == null
+                ? (contentType == null ? "charset=UTF-8" : contentType + "; charset=UTF-8")
+                : contentType;
+    }
 
-  public static BlockingException tryBlock(RequestContext ctx, Flow<Void> flow, String message) {
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = ctx.getBlockResponseFunction();
-      if (brf != null) {
-        brf.tryCommitBlockingResponse(ctx, rba);
-        BlockingException be = new BlockingException(message);
-        ctx.getTraceSegment().effectivelyBlocked();
-        return be;
-      }
+    public static BlockingException tryBlock(RequestContext ctx, Flow<Void> flow, String message) {
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = ctx.getBlockResponseFunction();
+            if (brf != null) {
+                brf.tryCommitBlockingResponse(ctx, rba);
+                BlockingException be = new BlockingException(message);
+                ctx.getTraceSegment().effectivelyBlocked();
+                return be;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartReaderServerSideInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartReaderServerSideInstrumentation.java
index d53c9f81b75..f56d7afdb8d 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartReaderServerSideInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartReaderServerSideInstrumentation.java
@@ -29,95 +29,91 @@
 
 @AutoService(InstrumenterModule.class)
 public class MultiPartReaderServerSideInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public MultiPartReaderServerSideInstrumentation() {
-    super("jersey");
-  }
+    public MultiPartReaderServerSideInstrumentation() {
+        super("jersey");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "multipart";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "multipart";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.jersey.media.multipart.internal.MultiPartReaderServerSide";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.jersey.media.multipart.internal.MultiPartReaderServerSide";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("readMultiPart")
-            .and(isProtected())
-            .and(returns(named("org.glassfish.jersey.media.multipart.MultiPart")))
-            .and(takesArguments(6)),
-        getClass().getName() + "$ReadMultiPartAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("readMultiPart")
+                        .and(isProtected())
+                        .and(returns(named("org.glassfish.jersey.media.multipart.MultiPart")))
+                        .and(takesArguments(6)),
+                getClass().getName() + "$ReadMultiPartAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class ReadMultiPartAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return final MultiPart ret,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (ret == null || t != null) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class ReadMultiPartAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Return final MultiPart ret,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (ret == null || t != null) {
+                return;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCallback =
-          cbp.getCallback(EVENTS.requestFilesFilenames());
-      BiFunction<RequestContext, List<String>, Flow<Void>> contentCallback =
-          cbp.getCallback(EVENTS.requestFilesContent());
-      if (callback == null && filenamesCallback == null && contentCallback == null) {
-        return;
-      }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCallback =
+                    cbp.getCallback(EVENTS.requestFilesFilenames());
+            BiFunction<RequestContext, List<String>, Flow<Void>> contentCallback =
+                    cbp.getCallback(EVENTS.requestFilesContent());
+            if (callback == null && filenamesCallback == null && contentCallback == null) {
+                return;
+            }
 
-      Map<String, List<String>> map = callback != null ? new HashMap<>() : null;
-      List<String> filenames = filenamesCallback != null ? new ArrayList<>() : null;
-      List<String> filesContent = contentCallback != null ? new ArrayList<>() : null;
-      for (BodyPart bodyPart : ret.getBodyParts()) {
-        if (!(bodyPart instanceof FormDataBodyPart)) {
-          continue;
-        }
-        MultiPartHelper.collectBodyPart((FormDataBodyPart) bodyPart, map, filenames, filesContent);
-      }
+            Map<String, List<String>> map = callback != null ? new HashMap<>() : null;
+            List<String> filenames = filenamesCallback != null ? new ArrayList<>() : null;
+            List<String> filesContent = contentCallback != null ? new ArrayList<>() : null;
+            for (BodyPart bodyPart : ret.getBodyParts()) {
+                if (!(bodyPart instanceof FormDataBodyPart)) {
+                    continue;
+                }
+                MultiPartHelper.collectBodyPart((FormDataBodyPart) bodyPart, map, filenames, filesContent);
+            }
 
-      if (map != null) {
-        Flow<Void> flow = callback.apply(reqCtx, map);
-        BlockingException be =
-            MultiPartHelper.tryBlock(
-                reqCtx, flow, "Blocked request (for MultiPartReaderServerSide/readMultiPart)");
-        if (be != null) {
-          t = be;
-        }
-      }
+            if (map != null) {
+                Flow<Void> flow = callback.apply(reqCtx, map);
+                BlockingException be = MultiPartHelper.tryBlock(
+                        reqCtx, flow, "Blocked request (for MultiPartReaderServerSide/readMultiPart)");
+                if (be != null) {
+                    t = be;
+                }
+            }
 
-      if (filenames != null && !filenames.isEmpty()) {
-        Flow<Void> filenamesFlow = filenamesCallback.apply(reqCtx, filenames);
-        if (t == null) {
-          BlockingException be =
-              MultiPartHelper.tryBlock(
-                  reqCtx, filenamesFlow, "Blocked request (multipart file upload)");
-          if (be != null) {
-            t = be;
-          }
-        }
-      }
+            if (filenames != null && !filenames.isEmpty()) {
+                Flow<Void> filenamesFlow = filenamesCallback.apply(reqCtx, filenames);
+                if (t == null) {
+                    BlockingException be =
+                            MultiPartHelper.tryBlock(reqCtx, filenamesFlow, "Blocked request (multipart file upload)");
+                    if (be != null) {
+                        t = be;
+                    }
+                }
+            }
 
-      if (t == null && filesContent != null && !filesContent.isEmpty()) {
-        Flow<Void> contentFlow = contentCallback.apply(reqCtx, filesContent);
-        BlockingException be =
-            MultiPartHelper.tryBlock(
-                reqCtx, contentFlow, "Blocked request (multipart file upload content)");
-        if (be != null) {
-          t = be;
+            if (t == null && filesContent != null && !filesContent.isEmpty()) {
+                Flow<Void> contentFlow = contentCallback.apply(reqCtx, filesContent);
+                BlockingException be = MultiPartHelper.tryBlock(
+                        reqCtx, contentFlow, "Blocked request (multipart file upload content)");
+                if (be != null) {
+                    t = be;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/ServerRuntimeResponderInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/ServerRuntimeResponderInstrumentation.java
index f7d734fa559..e4b8a3596c1 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/ServerRuntimeResponderInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/ServerRuntimeResponderInstrumentation.java
@@ -18,49 +18,49 @@
 // tested in GrizzlyTest (grizzly-http)
 @AutoService(InstrumenterModule.class)
 public class ServerRuntimeResponderInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ServerRuntimeResponderInstrumentation() {
-    super("jersey");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ServerRuntimeResponderInstrumentation() {
+        super("jersey");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "jersey_2+3";
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jersey_2+3";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.jersey.server.ServerRuntime$Responder";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.jersey.server.ServerRuntime$Responder";
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("process"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, Throwable.class))
+                        .and(not(isStatic())),
+                ServerRuntimeResponderInstrumentation.class.getName() + "$ProcessAdvice");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("process"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, Throwable.class))
-            .and(not(isStatic())),
-        ServerRuntimeResponderInstrumentation.class.getName() + "$ProcessAdvice");
-  }
+    static class ProcessAdvice {
+        @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class, suppress = Throwable.class)
+        static boolean /* skip */ before(@Advice.Argument(0) Throwable t_) {
+            Throwable t = t_;
+            if (!(t instanceof BlockingException)) {
+                if (!(t.getCause() instanceof BlockingException)) {
+                    return false;
+                }
+                t = t.getCause();
+            }
 
-  static class ProcessAdvice {
-    @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class, suppress = Throwable.class)
-    static boolean /* skip */ before(@Advice.Argument(0) Throwable t_) {
-      Throwable t = t_;
-      if (!(t instanceof BlockingException)) {
-        if (!(t.getCause() instanceof BlockingException)) {
-          return false;
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan == null) {
+                return true;
+            }
+            agentSpan.addThrowable(t);
+            return true; // skip body to avoid trying to handle the error
         }
-        t = t.getCause();
-      }
-
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan == null) {
-        return true;
-      }
-      agentSpan.addThrowable(t);
-      return true; // skip body to avoid trying to handle the error
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextGetPathSegmentsInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextGetPathSegmentsInstrumentation.java
index 73d1061b533..8f881d91a9c 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextGetPathSegmentsInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextGetPathSegmentsInstrumentation.java
@@ -14,45 +14,45 @@
 
 @AutoService(InstrumenterModule.class)
 public class UriRoutingContextGetPathSegmentsInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public UriRoutingContextGetPathSegmentsInstrumentation() {
-    super("jersey");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "jersey_server_2";
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.jersey.server.internal.routing.UriRoutingContext";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getPathSegments").and(takesArguments(1)).and(takesArgument(0, boolean.class)),
-        getClass().getName() + "$GetPathSegmentsAdvice");
-  }
-
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class GetPathSegmentsAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.This UriRoutingContext thiz,
-        @Advice.Argument(0) boolean decode,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
-
-      try {
-        // rely on instr for getPathParameters. We do lose matrix variables though
-        thiz.getPathParameters(decode);
-      } catch (Throwable it) {
-        t = it;
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public UriRoutingContextGetPathSegmentsInstrumentation() {
+        super("jersey");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "jersey_server_2";
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.jersey.server.internal.routing.UriRoutingContext";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getPathSegments").and(takesArguments(1)).and(takesArgument(0, boolean.class)),
+                getClass().getName() + "$GetPathSegmentsAdvice");
+    }
+
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class GetPathSegmentsAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.This UriRoutingContext thiz,
+                @Advice.Argument(0) boolean decode,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
+            }
+
+            try {
+                // rely on instr for getPathParameters. We do lose matrix variables though
+                thiz.getPathParameters(decode);
+            } catch (Throwable it) {
+                t = it;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextInstrumentation.java
index 43b6d3c15fa..1cf6ee2ef62 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextInstrumentation.java
@@ -24,59 +24,58 @@
 
 @AutoService(InstrumenterModule.class)
 public class UriRoutingContextInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public UriRoutingContextInstrumentation() {
-    super("jersey");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public UriRoutingContextInstrumentation() {
+        super("jersey");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jersey_2+3";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jersey_2+3";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.jersey.server.internal.routing.UriRoutingContext";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.jersey.server.internal.routing.UriRoutingContext";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getPathParameters").and(takesArguments(1)).and(takesArgument(0, boolean.class)),
-        getClass().getName() + "$GetPathParametersAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getPathParameters").and(takesArguments(1)).and(takesArgument(0, boolean.class)),
+                getClass().getName() + "$GetPathParametersAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class GetPathParametersAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return final Map<String, List<String>> ret,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (ret == null || t != null) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class GetPathParametersAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Return final Map<String, List<String>> ret,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (ret == null || t != null) {
+                return;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestPathParams());
-      if (callback == null) {
-        return;
-      }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
+                    cbp.getCallback(EVENTS.requestPathParams());
+            if (callback == null) {
+                return;
+            }
 
-      Flow<Void> flow = callback.apply(reqCtx, ret);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba);
-          t =
-              new BlockingException(
-                  "Blocked request (for UriRoutingContextInstrumentation/getPathParameters)");
-          reqCtx.getTraceSegment().effectivelyBlocked();
+            Flow<Void> flow = callback.apply(reqCtx, ret);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba);
+                    t = new BlockingException(
+                            "Blocked request (for UriRoutingContextInstrumentation/getPathParameters)");
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MessageBodyReaderInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MessageBodyReaderInstrumentation.java
index db4b8b9b012..801c4669ef4 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MessageBodyReaderInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MessageBodyReaderInstrumentation.java
@@ -23,73 +23,70 @@
 // keep in sync with jersey2 (javax packages)
 @AutoService(InstrumenterModule.class)
 public class MessageBodyReaderInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public MessageBodyReaderInstrumentation() {
-    super("jersey");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public MessageBodyReaderInstrumentation() {
+        super("jersey");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jersey-common";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jersey-common";
+    }
 
-  // This is a caller for the MessageBodyReaders in jersey
-  // We instrument it instead of the MessageBodyReaders in order to avoid hierarchy inspections
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.jersey.message.internal.ReaderInterceptorExecutor";
-  }
+    // This is a caller for the MessageBodyReaders in jersey
+    // We instrument it instead of the MessageBodyReaders in order to avoid hierarchy inspections
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.jersey.message.internal.ReaderInterceptorExecutor";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("proceed").and(takesArguments(0)),
-        getClass().getName() + "$ReaderInterceptorExecutorProceedAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("proceed").and(takesArguments(0)),
+                getClass().getName() + "$ReaderInterceptorExecutorProceedAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class ReaderInterceptorExecutorProceedAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return final Object ret,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (ret == null || t != null) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class ReaderInterceptorExecutorProceedAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Return final Object ret,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (ret == null || t != null) {
+                return;
+            }
 
-      if (ret.getClass()
-          .getName()
-          .equals("org.glassfish.jersey.media.multipart.FormDataMultiPart")) {
-        // likely handled already by MultiPartReaderServerSideInstrumentation
-        return;
-      }
+            if (ret.getClass().getName().equals("org.glassfish.jersey.media.multipart.FormDataMultiPart")) {
+                // likely handled already by MultiPartReaderServerSideInstrumentation
+                return;
+            }
 
-      Object objToPass;
-      if (ret instanceof Form) {
-        objToPass = ((Form) ret).asMap();
-      } else {
-        objToPass = ret;
-      }
+            Object objToPass;
+            if (ret instanceof Form) {
+                objToPass = ((Form) ret).asMap();
+            } else {
+                objToPass = ret;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
 
-      Flow<Void> flow = callback.apply(reqCtx, objToPass);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba);
-          t = new BlockingException("Blocked request (for ReaderInterceptorExecutor/proceed)");
-          reqCtx.getTraceSegment().effectivelyBlocked();
+            Flow<Void> flow = callback.apply(reqCtx, objToPass);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba);
+                    t = new BlockingException("Blocked request (for ReaderInterceptorExecutor/proceed)");
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartHelper.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartHelper.java
index 2ce72d215ef..87172324e85 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartHelper.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartHelper.java
@@ -18,100 +18,100 @@
 
 public final class MultiPartHelper {
 
-  public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
-  public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
+    public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
+    public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
 
-  private MultiPartHelper() {}
+    private MultiPartHelper() {}
 
-  public static void collectBodyPart(
-      FormDataBodyPart bodyPart,
-      Map<String, List<String>> bodyMap,
-      List<String> filenames,
-      List<String> filesContent) {
-    FormDataContentDisposition cd;
-    try {
-      cd = bodyPart.getFormDataContentDisposition();
-    } catch (Exception ignored) {
-      // IllegalArgumentException on malformed Content-Disposition: skip this part gracefully
-      // so a single bad part does not abort processing of the remaining parts.
-      cd = null;
+    public static void collectBodyPart(
+            FormDataBodyPart bodyPart,
+            Map<String, List<String>> bodyMap,
+            List<String> filenames,
+            List<String> filesContent) {
+        FormDataContentDisposition cd;
+        try {
+            cd = bodyPart.getFormDataContentDisposition();
+        } catch (Exception ignored) {
+            // IllegalArgumentException on malformed Content-Disposition: skip this part gracefully
+            // so a single bad part does not abort processing of the remaining parts.
+            cd = null;
+        }
+        if (bodyMap != null
+                && cd != null
+                && MediaTypes.typeEqual(MediaType.TEXT_PLAIN_TYPE, bodyPart.getMediaType())
+                && totalBodyMapValues(bodyMap) < MAX_FILES_TO_INSPECT) {
+            // readContent() reads the part through a byte-capped decoder (MAX_CONTENT_BYTES) instead of
+            // the unbounded getValue(); the cap counts total accumulated values across all field names,
+            // not distinct keys, so repeating the same field name cannot bypass the limit. cd.getName()
+            // is a safe field accessor, unlike bodyPart.getName() which re-parses the disposition header.
+            bodyMap.computeIfAbsent(cd.getName(), k -> new ArrayList<>()).add(readContent(bodyPart));
+        }
+        // rawFilename == null  → no filename attribute → form field → skip filenames and content
+        // rawFilename == ""    → filename attribute present but empty → content YES, filenames NO
+        // rawFilename != ""    → file with name → both
+        String rawFilename = cd != null ? cd.getFileName() : null;
+        if (filenames != null && rawFilename != null && !rawFilename.isEmpty()) {
+            filenames.add(rawFilename);
+        }
+        if (filesContent != null && rawFilename != null && filesContent.size() < MAX_FILES_TO_INSPECT) {
+            filesContent.add(readFileContent(bodyPart));
+        }
     }
-    if (bodyMap != null
-        && cd != null
-        && MediaTypes.typeEqual(MediaType.TEXT_PLAIN_TYPE, bodyPart.getMediaType())
-        && totalBodyMapValues(bodyMap) < MAX_FILES_TO_INSPECT) {
-      // readContent() reads the part through a byte-capped decoder (MAX_CONTENT_BYTES) instead of
-      // the unbounded getValue(); the cap counts total accumulated values across all field names,
-      // not distinct keys, so repeating the same field name cannot bypass the limit. cd.getName()
-      // is a safe field accessor, unlike bodyPart.getName() which re-parses the disposition header.
-      bodyMap.computeIfAbsent(cd.getName(), k -> new ArrayList<>()).add(readContent(bodyPart));
-    }
-    // rawFilename == null  → no filename attribute → form field → skip filenames and content
-    // rawFilename == ""    → filename attribute present but empty → content YES, filenames NO
-    // rawFilename != ""    → file with name → both
-    String rawFilename = cd != null ? cd.getFileName() : null;
-    if (filenames != null && rawFilename != null && !rawFilename.isEmpty()) {
-      filenames.add(rawFilename);
-    }
-    if (filesContent != null && rawFilename != null && filesContent.size() < MAX_FILES_TO_INSPECT) {
-      filesContent.add(readFileContent(bodyPart));
-    }
-  }
 
-  private static int totalBodyMapValues(Map<String, List<String>> bodyMap) {
-    int total = 0;
-    for (List<String> values : bodyMap.values()) {
-      total += values.size();
+    private static int totalBodyMapValues(Map<String, List<String>> bodyMap) {
+        int total = 0;
+        for (List<String> values : bodyMap.values()) {
+            total += values.size();
+        }
+        return total;
     }
-    return total;
-  }
 
-  // Used for the body-map/text-field path: Jersey's own getValue() decodes undeclared-charset
-  // text parts as UTF-8, so this matches that default instead of MultipartContentDecoder's
-  // platform-dependent fallback.
-  public static String readContent(FormDataBodyPart bodyPart) {
-    return read(bodyPart, contentTypeWithDefaultUtf8(bodyPart.getMediaType()));
-  }
+    // Used for the body-map/text-field path: Jersey's own getValue() decodes undeclared-charset
+    // text parts as UTF-8, so this matches that default instead of MultipartContentDecoder's
+    // platform-dependent fallback.
+    public static String readContent(FormDataBodyPart bodyPart) {
+        return read(bodyPart, contentTypeWithDefaultUtf8(bodyPart.getMediaType()));
+    }
 
-  // Used for the filesContent path: keeps parity with the other multipart helpers, which all
-  // rely on MultipartContentDecoder's own charset fallback for undeclared-charset file content.
-  public static String readFileContent(FormDataBodyPart bodyPart) {
-    MediaType mediaType = bodyPart.getMediaType();
-    return read(bodyPart, mediaType != null ? mediaType.toString() : null);
-  }
+    // Used for the filesContent path: keeps parity with the other multipart helpers, which all
+    // rely on MultipartContentDecoder's own charset fallback for undeclared-charset file content.
+    public static String readFileContent(FormDataBodyPart bodyPart) {
+        MediaType mediaType = bodyPart.getMediaType();
+        return read(bodyPart, mediaType != null ? mediaType.toString() : null);
+    }
 
-  private static String read(FormDataBodyPart bodyPart, String contentType) {
-    try {
-      // getEntityAs(InputStream.class) is backed by BodyPartEntity which supports re-reading:
-      // each call creates a fresh stream from the buffered MIME part data.
-      try (InputStream is = bodyPart.getEntityAs(InputStream.class)) {
-        if (is == null) return "";
-        return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, contentType);
-      }
-    } catch (IOException ignored) {
-      return "";
+    private static String read(FormDataBodyPart bodyPart, String contentType) {
+        try {
+            // getEntityAs(InputStream.class) is backed by BodyPartEntity which supports re-reading:
+            // each call creates a fresh stream from the buffered MIME part data.
+            try (InputStream is = bodyPart.getEntityAs(InputStream.class)) {
+                if (is == null) return "";
+                return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, contentType);
+            }
+        } catch (IOException ignored) {
+            return "";
+        }
     }
-  }
 
-  private static String contentTypeWithDefaultUtf8(MediaType mediaType) {
-    String contentType = mediaType != null ? mediaType.toString() : null;
-    return MultipartContentDecoder.extractCharset(contentType) == null
-        ? (contentType == null ? "charset=UTF-8" : contentType + "; charset=UTF-8")
-        : contentType;
-  }
+    private static String contentTypeWithDefaultUtf8(MediaType mediaType) {
+        String contentType = mediaType != null ? mediaType.toString() : null;
+        return MultipartContentDecoder.extractCharset(contentType) == null
+                ? (contentType == null ? "charset=UTF-8" : contentType + "; charset=UTF-8")
+                : contentType;
+    }
 
-  public static BlockingException tryBlock(RequestContext ctx, Flow<Void> flow, String message) {
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = ctx.getBlockResponseFunction();
-      if (brf != null) {
-        brf.tryCommitBlockingResponse(ctx, rba);
-        BlockingException be = new BlockingException(message);
-        ctx.getTraceSegment().effectivelyBlocked();
-        return be;
-      }
+    public static BlockingException tryBlock(RequestContext ctx, Flow<Void> flow, String message) {
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = ctx.getBlockResponseFunction();
+            if (brf != null) {
+                brf.tryCommitBlockingResponse(ctx, rba);
+                BlockingException be = new BlockingException(message);
+                ctx.getTraceSegment().effectivelyBlocked();
+                return be;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartReaderServerSideInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartReaderServerSideInstrumentation.java
index 072e5637167..0dad46bdd0d 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartReaderServerSideInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartReaderServerSideInstrumentation.java
@@ -29,95 +29,91 @@
 
 @AutoService(InstrumenterModule.class)
 public class MultiPartReaderServerSideInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public MultiPartReaderServerSideInstrumentation() {
-    super("jersey");
-  }
+    public MultiPartReaderServerSideInstrumentation() {
+        super("jersey");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "multipart";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "multipart";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.jersey.media.multipart.internal.MultiPartReaderServerSide";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.jersey.media.multipart.internal.MultiPartReaderServerSide";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("readMultiPart")
-            .and(isProtected())
-            .and(returns(named("org.glassfish.jersey.media.multipart.MultiPart")))
-            .and(takesArguments(6)),
-        getClass().getName() + "$ReadMultiPartAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("readMultiPart")
+                        .and(isProtected())
+                        .and(returns(named("org.glassfish.jersey.media.multipart.MultiPart")))
+                        .and(takesArguments(6)),
+                getClass().getName() + "$ReadMultiPartAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class ReadMultiPartAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return final MultiPart ret,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (ret == null || t != null) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class ReadMultiPartAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Return final MultiPart ret,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (ret == null || t != null) {
+                return;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCallback =
-          cbp.getCallback(EVENTS.requestFilesFilenames());
-      BiFunction<RequestContext, List<String>, Flow<Void>> contentCallback =
-          cbp.getCallback(EVENTS.requestFilesContent());
-      if (callback == null && filenamesCallback == null && contentCallback == null) {
-        return;
-      }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCallback =
+                    cbp.getCallback(EVENTS.requestFilesFilenames());
+            BiFunction<RequestContext, List<String>, Flow<Void>> contentCallback =
+                    cbp.getCallback(EVENTS.requestFilesContent());
+            if (callback == null && filenamesCallback == null && contentCallback == null) {
+                return;
+            }
 
-      Map<String, List<String>> map = callback != null ? new HashMap<>() : null;
-      List<String> filenames = filenamesCallback != null ? new ArrayList<>() : null;
-      List<String> filesContent = contentCallback != null ? new ArrayList<>() : null;
-      for (BodyPart bodyPart : ret.getBodyParts()) {
-        if (!(bodyPart instanceof FormDataBodyPart)) {
-          continue;
-        }
-        MultiPartHelper.collectBodyPart((FormDataBodyPart) bodyPart, map, filenames, filesContent);
-      }
+            Map<String, List<String>> map = callback != null ? new HashMap<>() : null;
+            List<String> filenames = filenamesCallback != null ? new ArrayList<>() : null;
+            List<String> filesContent = contentCallback != null ? new ArrayList<>() : null;
+            for (BodyPart bodyPart : ret.getBodyParts()) {
+                if (!(bodyPart instanceof FormDataBodyPart)) {
+                    continue;
+                }
+                MultiPartHelper.collectBodyPart((FormDataBodyPart) bodyPart, map, filenames, filesContent);
+            }
 
-      if (map != null) {
-        Flow<Void> flow = callback.apply(reqCtx, map);
-        BlockingException be =
-            MultiPartHelper.tryBlock(
-                reqCtx, flow, "Blocked request (for MultiPartReaderServerSide/readMultiPart)");
-        if (be != null) {
-          t = be;
-        }
-      }
+            if (map != null) {
+                Flow<Void> flow = callback.apply(reqCtx, map);
+                BlockingException be = MultiPartHelper.tryBlock(
+                        reqCtx, flow, "Blocked request (for MultiPartReaderServerSide/readMultiPart)");
+                if (be != null) {
+                    t = be;
+                }
+            }
 
-      if (filenames != null && !filenames.isEmpty()) {
-        Flow<Void> filenamesFlow = filenamesCallback.apply(reqCtx, filenames);
-        if (t == null) {
-          BlockingException be =
-              MultiPartHelper.tryBlock(
-                  reqCtx, filenamesFlow, "Blocked request (multipart file upload)");
-          if (be != null) {
-            t = be;
-          }
-        }
-      }
+            if (filenames != null && !filenames.isEmpty()) {
+                Flow<Void> filenamesFlow = filenamesCallback.apply(reqCtx, filenames);
+                if (t == null) {
+                    BlockingException be =
+                            MultiPartHelper.tryBlock(reqCtx, filenamesFlow, "Blocked request (multipart file upload)");
+                    if (be != null) {
+                        t = be;
+                    }
+                }
+            }
 
-      if (t == null && filesContent != null && !filesContent.isEmpty()) {
-        Flow<Void> contentFlow = contentCallback.apply(reqCtx, filesContent);
-        BlockingException be =
-            MultiPartHelper.tryBlock(
-                reqCtx, contentFlow, "Blocked request (multipart file upload content)");
-        if (be != null) {
-          t = be;
+            if (t == null && filesContent != null && !filesContent.isEmpty()) {
+                Flow<Void> contentFlow = contentCallback.apply(reqCtx, filesContent);
+                BlockingException be = MultiPartHelper.tryBlock(
+                        reqCtx, contentFlow, "Blocked request (multipart file upload content)");
+                if (be != null) {
+                    t = be;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/UriRoutingContextGetPathSegmentsInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/UriRoutingContextGetPathSegmentsInstrumentation.java
index 41acf68d4b6..9bc0c3cba55 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/UriRoutingContextGetPathSegmentsInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/UriRoutingContextGetPathSegmentsInstrumentation.java
@@ -14,45 +14,45 @@
 
 @AutoService(InstrumenterModule.class)
 public class UriRoutingContextGetPathSegmentsInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public UriRoutingContextGetPathSegmentsInstrumentation() {
-    super("jersey");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "jersey-server";
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.jersey.server.internal.routing.UriRoutingContext";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getPathSegments").and(takesArguments(1)).and(takesArgument(0, boolean.class)),
-        getClass().getName() + "$GetPathSegmentsAdvice");
-  }
-
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class GetPathSegmentsAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.This UriRoutingContext thiz,
-        @Advice.Argument(0) boolean decode,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
-
-      try {
-        // rely on instr for getPathParameters. We do lose matrix variables though
-        thiz.getPathParameters(decode);
-      } catch (Throwable it) {
-        t = it;
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public UriRoutingContextGetPathSegmentsInstrumentation() {
+        super("jersey");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "jersey-server";
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.jersey.server.internal.routing.UriRoutingContext";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getPathSegments").and(takesArguments(1)).and(takesArgument(0, boolean.class)),
+                getClass().getName() + "$GetPathSegmentsAdvice");
+    }
+
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class GetPathSegmentsAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.This UriRoutingContext thiz,
+                @Advice.Argument(0) boolean decode,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
+            }
+
+            try {
+                // rely on instr for getPathParameters. We do lose matrix variables though
+                thiz.getPathParameters(decode);
+            } catch (Throwable it) {
+                t = it;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-client-2.0/src/main/java/datadog/trace/instrumentation/connection_error/jersey/ClientRuntimeInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-client-2.0/src/main/java/datadog/trace/instrumentation/connection_error/jersey/ClientRuntimeInstrumentation.java
index 7aa1f32714f..6e998ad634d 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-client-2.0/src/main/java/datadog/trace/instrumentation/connection_error/jersey/ClientRuntimeInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-client-2.0/src/main/java/datadog/trace/instrumentation/connection_error/jersey/ClientRuntimeInstrumentation.java
@@ -15,39 +15,38 @@
 
 @AutoService(InstrumenterModule.class)
 public class ClientRuntimeInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ClientRuntimeInstrumentation() {
-    super("jax-rs", "jaxrs", "jax-rs-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ClientRuntimeInstrumentation() {
+        super("jax-rs", "jaxrs", "jax-rs-client");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.glassfish.jersey.client.ClientRuntime";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.glassfish.jersey.client.ClientRuntime";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("submit", "createRunnableForAsyncProcessing"))
-            .and(
-                takesArgument(0, named("org.glassfish.jersey.client.ClientRequest"))
-                    .and(takesArgument(1, named("org.glassfish.jersey.client.ResponseCallback")))),
-        "org.glassfish.jersey.client.WrappingResponseCallbackAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("invoke"))
-            .and(takesArgument(0, named("org.glassfish.jersey.client.ClientRequest"))),
-        getClass().getName() + "$HandleError");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("submit", "createRunnableForAsyncProcessing"))
+                        .and(takesArgument(0, named("org.glassfish.jersey.client.ClientRequest"))
+                                .and(takesArgument(1, named("org.glassfish.jersey.client.ResponseCallback")))),
+                "org.glassfish.jersey.client.WrappingResponseCallbackAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("invoke"))
+                        .and(takesArgument(0, named("org.glassfish.jersey.client.ClientRequest"))),
+                getClass().getName() + "$HandleError");
+    }
 
-  public static class HandleError {
-    @Advice.OnMethodExit(onThrowable = ProcessingException.class)
-    public static void handleError(
-        @Advice.Argument(0) ClientRequest request, @Advice.Thrown ProcessingException error) {
-      if (null != error) {
-        handleProcessingException(request, error);
-      }
+    public static class HandleError {
+        @Advice.OnMethodExit(onThrowable = ProcessingException.class)
+        public static void handleError(
+                @Advice.Argument(0) ClientRequest request, @Advice.Thrown ProcessingException error) {
+            if (null != error) {
+                handleProcessingException(request, error);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-client-2.0/src/main/java/org/glassfish/jersey/client/WrappingResponseCallback.java b/dd-java-agent/instrumentation/jersey/jersey-client-2.0/src/main/java/org/glassfish/jersey/client/WrappingResponseCallback.java
index 6cf90a985e3..5ef2fc3c826 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-client-2.0/src/main/java/org/glassfish/jersey/client/WrappingResponseCallback.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-client-2.0/src/main/java/org/glassfish/jersey/client/WrappingResponseCallback.java
@@ -8,36 +8,36 @@
 
 public final class WrappingResponseCallback implements ResponseCallback {
 
-  private final ResponseCallback delegate;
-  private final ClientRequest request;
-
-  public WrappingResponseCallback(ResponseCallback delegate, ClientRequest request) {
-    this.delegate = delegate;
-    this.request = request;
-  }
-
-  @Override
-  public void completed(ClientResponse response, RequestScope scope) {
-    delegate.completed(response, scope);
-  }
-
-  @Override
-  public void failed(ProcessingException error) {
-    handleProcessingException(request, error);
-    delegate.failed(error);
-  }
-
-  public static void handleProcessingException(ClientRequest request, ProcessingException error) {
-    final Object prop = request.getProperty(ClientTracingFilter.SPAN_PROPERTY_NAME);
-    if (prop instanceof AgentSpan) {
-      final AgentSpan span = (AgentSpan) prop;
-      span.addThrowable(error);
-
-      @SuppressWarnings("deprecation")
-      final boolean isJaxRsExceptionAsErrorEnabled = Config.get().isJaxRsExceptionAsErrorEnabled();
-      span.setError(isJaxRsExceptionAsErrorEnabled);
-
-      span.finish();
+    private final ResponseCallback delegate;
+    private final ClientRequest request;
+
+    public WrappingResponseCallback(ResponseCallback delegate, ClientRequest request) {
+        this.delegate = delegate;
+        this.request = request;
+    }
+
+    @Override
+    public void completed(ClientResponse response, RequestScope scope) {
+        delegate.completed(response, scope);
+    }
+
+    @Override
+    public void failed(ProcessingException error) {
+        handleProcessingException(request, error);
+        delegate.failed(error);
+    }
+
+    public static void handleProcessingException(ClientRequest request, ProcessingException error) {
+        final Object prop = request.getProperty(ClientTracingFilter.SPAN_PROPERTY_NAME);
+        if (prop instanceof AgentSpan) {
+            final AgentSpan span = (AgentSpan) prop;
+            span.addThrowable(error);
+
+            @SuppressWarnings("deprecation")
+            final boolean isJaxRsExceptionAsErrorEnabled = Config.get().isJaxRsExceptionAsErrorEnabled();
+            span.setError(isJaxRsExceptionAsErrorEnabled);
+
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-client-2.0/src/main/java/org/glassfish/jersey/client/WrappingResponseCallbackAdvice.java b/dd-java-agent/instrumentation/jersey/jersey-client-2.0/src/main/java/org/glassfish/jersey/client/WrappingResponseCallbackAdvice.java
index 4c067cbc466..a1ef984a487 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-client-2.0/src/main/java/org/glassfish/jersey/client/WrappingResponseCallbackAdvice.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-client-2.0/src/main/java/org/glassfish/jersey/client/WrappingResponseCallbackAdvice.java
@@ -3,10 +3,10 @@
 import net.bytebuddy.asm.Advice;
 
 public class WrappingResponseCallbackAdvice {
-  @Advice.OnMethodEnter
-  public static void wrap(
-      @Advice.Argument(0) ClientRequest request,
-      @Advice.Argument(value = 1, readOnly = false) ResponseCallback callback) {
-    callback = new WrappingResponseCallback(callback, request);
-  }
+    @Advice.OnMethodEnter
+    public static void wrap(
+            @Advice.Argument(0) ClientRequest request,
+            @Advice.Argument(value = 1, readOnly = false) ResponseCallback callback) {
+        callback = new WrappingResponseCallback(callback, request);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java
index ccfda136b35..d70dec19ebb 100644
--- a/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java
@@ -20,29 +20,27 @@
  */
 @AutoService(InstrumenterModule.class)
 public class JerseyRequestContextInstrumentation extends AbstractRequestContextInstrumentation {
-  public static class ContainerRequestContextAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope decorateAbortSpan(
-        @Advice.This final ContainerRequestContext context) {
-      final UriInfo uriInfo = context.getUriInfo();
+    public static class ContainerRequestContextAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope decorateAbortSpan(@Advice.This final ContainerRequestContext context) {
+            final UriInfo uriInfo = context.getUriInfo();
 
-      if (context.getProperty(JaxRsAnnotationsDecorator.ABORT_HANDLED) == null
-          && uriInfo instanceof ResourceInfo) {
+            if (context.getProperty(JaxRsAnnotationsDecorator.ABORT_HANDLED) == null
+                    && uriInfo instanceof ResourceInfo) {
 
-        final ResourceInfo resourceInfo = (ResourceInfo) uriInfo;
-        final Method method = resourceInfo.getResourceMethod();
-        final Class resourceClass = resourceInfo.getResourceClass();
+                final ResourceInfo resourceInfo = (ResourceInfo) uriInfo;
+                final Method method = resourceInfo.getResourceMethod();
+                final Class resourceClass = resourceInfo.getResourceClass();
 
-        return RequestFilterHelper.createOrUpdateAbortSpan(context, resourceClass, method);
-      }
+                return RequestFilterHelper.createOrUpdateAbortSpan(context, resourceClass, method);
+            }
 
-      return null;
-    }
+            return null;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      RequestFilterHelper.closeSpanAndScope(scope, throwable);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            RequestFilterHelper.closeSpanAndScope(scope, throwable);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/MultipartHelper.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/MultipartHelper.java
index bd813c49bff..5530a964fef 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/MultipartHelper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/MultipartHelper.java
@@ -24,134 +24,130 @@
 
 public class MultipartHelper {
 
-  public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
-  public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
+    public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
+    public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
 
-  private static final Logger log = LoggerFactory.getLogger(MultipartHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(MultipartHelper.class);
 
-  private MultipartHelper() {}
+    private MultipartHelper() {}
 
-  /**
-   * Extracts non-null, non-empty filenames from a collection of multipart {@link Part}s using
-   * {@link Part#getSubmittedFileName()} (Servlet 3.1+, Jetty 11.0.x).
-   *
-   * @return list of filenames; never {@code null}, may be empty
-   */
-  public static List<String> extractFilenames(Collection<Part> parts) {
-    if (parts == null || parts.isEmpty()) {
-      return Collections.emptyList();
-    }
-    List<String> filenames = new ArrayList<>(parts.size());
-    for (Part part : parts) {
-      try {
-        String name = part.getSubmittedFileName();
-        if (name != null && !name.isEmpty()) {
-          filenames.add(name);
+    /**
+     * Extracts non-null, non-empty filenames from a collection of multipart {@link Part}s using
+     * {@link Part#getSubmittedFileName()} (Servlet 3.1+, Jetty 11.0.x).
+     *
+     * @return list of filenames; never {@code null}, may be empty
+     */
+    public static List<String> extractFilenames(Collection<Part> parts) {
+        if (parts == null || parts.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<String> filenames = new ArrayList<>(parts.size());
+        for (Part part : parts) {
+            try {
+                String name = part.getSubmittedFileName();
+                if (name != null && !name.isEmpty()) {
+                    filenames.add(name);
+                }
+            } catch (Exception ignored) {
+                // malformed or inaccessible part — skip and continue with remaining parts
+                log.debug(EXCLUDE_TELEMETRY, "extractFilenames: skipping malformed part", ignored);
+            }
         }
-      } catch (Exception ignored) {
-        // malformed or inaccessible part — skip and continue with remaining parts
-        log.debug(EXCLUDE_TELEMETRY, "extractFilenames: skipping malformed part", ignored);
-      }
+        return filenames;
     }
-    return filenames;
-  }
 
-  /**
-   * Extracts file content from a collection of multipart {@link Part}s. Form fields (those with a
-   * {@code null} submitted filename) are skipped. Reads up to {@link #MAX_CONTENT_BYTES} bytes per
-   * part, up to {@link #MAX_FILES_TO_INSPECT} parts total.
-   *
-   * @return list of decoded content strings; never {@code null}, may be empty
-   */
-  public static List<String> extractContents(Collection<Part> parts) {
-    if (parts == null || parts.isEmpty()) {
-      return Collections.emptyList();
-    }
-    List<String> contents = new ArrayList<>(Math.min(parts.size(), MAX_FILES_TO_INSPECT));
-    for (Part part : parts) {
-      if (contents.size() >= MAX_FILES_TO_INSPECT) {
-        break;
-      }
-      try {
-        if (part.getSubmittedFileName() == null) {
-          continue; // form field — skip
+    /**
+     * Extracts file content from a collection of multipart {@link Part}s. Form fields (those with a
+     * {@code null} submitted filename) are skipped. Reads up to {@link #MAX_CONTENT_BYTES} bytes per
+     * part, up to {@link #MAX_FILES_TO_INSPECT} parts total.
+     *
+     * @return list of decoded content strings; never {@code null}, may be empty
+     */
+    public static List<String> extractContents(Collection<Part> parts) {
+        if (parts == null || parts.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<String> contents = new ArrayList<>(Math.min(parts.size(), MAX_FILES_TO_INSPECT));
+        for (Part part : parts) {
+            if (contents.size() >= MAX_FILES_TO_INSPECT) {
+                break;
+            }
+            try {
+                if (part.getSubmittedFileName() == null) {
+                    continue; // form field — skip
+                }
+                contents.add(readFileContent(part));
+            } catch (Exception ignored) {
+                log.debug(EXCLUDE_TELEMETRY, "extractContents: skipping malformed part", ignored);
+            }
         }
-        contents.add(readFileContent(part));
-      } catch (Exception ignored) {
-        log.debug(EXCLUDE_TELEMETRY, "extractContents: skipping malformed part", ignored);
-      }
+        return contents;
     }
-    return contents;
-  }
 
-  private static String readFileContent(Part part) {
-    try (InputStream is = part.getInputStream()) {
-      return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, part.getContentType());
-    } catch (Exception e) {
-      log.debug(EXCLUDE_TELEMETRY, "readFileContent: stream read failed", e);
-      return "";
+    private static String readFileContent(Part part) {
+        try (InputStream is = part.getInputStream()) {
+            return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, part.getContentType());
+        } catch (Exception e) {
+            log.debug(EXCLUDE_TELEMETRY, "readFileContent: stream read failed", e);
+            return "";
+        }
     }
-  }
 
-  /**
-   * Fires the {@code requestFilesContent} IG event and returns a {@link BlockingException} if the
-   * WAF requests blocking, or {@code null} otherwise.
-   */
-  public static BlockingException fireFilesContentEvent(
-      Collection<Part> parts, RequestContext reqCtx) {
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestFilesContent());
-    if (callback == null) {
-      return null;
-    }
-    List<String> contents = extractContents(parts);
-    if (contents.isEmpty()) {
-      return null;
-    }
-    Flow<Void> flow = callback.apply(reqCtx, contents);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
-          reqCtx.getTraceSegment().effectivelyBlocked();
-          return new BlockingException("Blocked request (multipart file content)");
+    /**
+     * Fires the {@code requestFilesContent} IG event and returns a {@link BlockingException} if the
+     * WAF requests blocking, or {@code null} otherwise.
+     */
+    public static BlockingException fireFilesContentEvent(Collection<Part> parts, RequestContext reqCtx) {
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> callback = cbp.getCallback(EVENTS.requestFilesContent());
+        if (callback == null) {
+            return null;
         }
-      }
+        List<String> contents = extractContents(parts);
+        if (contents.isEmpty()) {
+            return null;
+        }
+        Flow<Void> flow = callback.apply(reqCtx, contents);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                    return new BlockingException("Blocked request (multipart file content)");
+                }
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  /**
-   * Fires the {@code requestFilesFilenames} IG event and returns a {@link BlockingException} if the
-   * WAF requests blocking, or {@code null} otherwise.
-   */
-  public static BlockingException fireFilenamesEvent(
-      Collection<Part> parts, RequestContext reqCtx) {
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestFilesFilenames());
-    if (callback == null) {
-      return null;
-    }
-    List<String> filenames = extractFilenames(parts);
-    if (filenames.isEmpty()) {
-      return null;
-    }
-    Flow<Void> flow = callback.apply(reqCtx, filenames);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
-          reqCtx.getTraceSegment().effectivelyBlocked();
-          return new BlockingException("Blocked request (multipart file upload)");
+    /**
+     * Fires the {@code requestFilesFilenames} IG event and returns a {@link BlockingException} if the
+     * WAF requests blocking, or {@code null} otherwise.
+     */
+    public static BlockingException fireFilenamesEvent(Collection<Part> parts, RequestContext reqCtx) {
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> callback = cbp.getCallback(EVENTS.requestFilesFilenames());
+        if (callback == null) {
+            return null;
+        }
+        List<String> filenames = extractFilenames(parts);
+        if (filenames.isEmpty()) {
+            return null;
+        }
+        Flow<Void> flow = callback.apply(reqCtx, filenames);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                    return new BlockingException("Blocked request (multipart file upload)");
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestExtractContentParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestExtractContentParametersInstrumentation.java
index a8035c4ee68..3275de44097 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestExtractContentParametersInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestExtractContentParametersInstrumentation.java
@@ -31,164 +31,156 @@
 
 @AutoService(InstrumenterModule.class)
 public class RequestExtractContentParametersInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType,
-        Instrumenter.WithTypeStructure,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.WithTypeStructure, Instrumenter.HasMethodAdvice {
 
-  public RequestExtractContentParametersInstrumentation() {
-    super("jetty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.Request";
-  }
+    public RequestExtractContentParametersInstrumentation() {
+        super("jetty");
+    }
 
-  // Discriminates Jetty 11.0.x ([11.0, 12.0)):
-  //  - _contentParameters: MultiMap field exists in 11.x (excludes Jetty 12 where
-  //    org.eclipse.jetty.server.Request was removed)
-  //  - _dispatcherType: jakarta.servlet.DispatcherType in the Request bytecode (excludes
-  //    Jetty 9.4–10.x where the field type is javax.servlet.DispatcherType). Checked against
-  //    Request.class bytecode, so it works even when both javax and jakarta are on the classpath.
-  // NOTE: _multiParts changes type at 11.0.10 (MultiPartFormInputStream → MultiParts); both
-  // are handled transparently because GetFilenamesAdvice reads it with typing=DYNAMIC.
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(
-            named("_contentParameters").and(fieldType(named("org.eclipse.jetty.util.MultiMap"))))
-        .and(
-            declaresField(
-                named("_dispatcherType").and(fieldType(named("jakarta.servlet.DispatcherType")))));
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.Request";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("extractContentParameters").and(takesArguments(0)).or(named("getParts")),
-        getClass().getName() + "$ExtractContentParametersAdvice");
-    transformer.applyAdvice(
-        named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice");
-    transformer.applyAdvice(
-        named("getParts").and(takesArguments(1)),
-        getClass().getName() + "$GetFilenamesFromMultiPartAdvice");
-  }
+    // Discriminates Jetty 11.0.x ([11.0, 12.0)):
+    //  - _contentParameters: MultiMap field exists in 11.x (excludes Jetty 12 where
+    //    org.eclipse.jetty.server.Request was removed)
+    //  - _dispatcherType: jakarta.servlet.DispatcherType in the Request bytecode (excludes
+    //    Jetty 9.4–10.x where the field type is javax.servlet.DispatcherType). Checked against
+    //    Request.class bytecode, so it works even when both javax and jakarta are on the classpath.
+    // NOTE: _multiParts changes type at 11.0.10 (MultiPartFormInputStream → MultiParts); both
+    // are handled transparently because GetFilenamesAdvice reads it with typing=DYNAMIC.
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("_contentParameters").and(fieldType(named("org.eclipse.jetty.util.MultiMap"))))
+                .and(declaresField(named("_dispatcherType").and(fieldType(named("jakarta.servlet.DispatcherType")))));
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class ExtractContentParametersAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean before(@Advice.FieldValue("_contentParameters") final MultiMap<String> map) {
-      if (map != null) {
-        return false;
-      }
-      CallDepthThreadLocalMap.incrementCallDepth(Request.class);
-      return true;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("extractContentParameters").and(takesArguments(0)).or(named("getParts")),
+                getClass().getName() + "$ExtractContentParametersAdvice");
+        transformer.applyAdvice(
+                named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice");
+        transformer.applyAdvice(
+                named("getParts").and(takesArguments(1)), getClass().getName() + "$GetFilenamesFromMultiPartAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean proceed,
-        @Advice.FieldValue("_contentParameters") final MultiMap<String> map,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (!proceed) {
-        return;
-      }
-      if (CallDepthThreadLocalMap.decrementCallDepth(Request.class) != 0) {
-        return;
-      }
-      if (map == null || map.isEmpty()) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class ExtractContentParametersAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean before(@Advice.FieldValue("_contentParameters") final MultiMap<String> map) {
+            if (map != null) {
+                return false;
+            }
+            CallDepthThreadLocalMap.incrementCallDepth(Request.class);
+            return true;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter boolean proceed,
+                @Advice.FieldValue("_contentParameters") final MultiMap<String> map,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (!proceed) {
+                return;
+            }
+            if (CallDepthThreadLocalMap.decrementCallDepth(Request.class) != 0) {
+                return;
+            }
+            if (map == null || map.isEmpty()) {
+                return;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
 
-      Flow<Void> flow = callback.apply(reqCtx, map);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-          if (t == null) {
-            t = new BlockingException("Blocked request (for Request/extractContentParameters)");
-            reqCtx.getTraceSegment().effectivelyBlocked();
-          }
+            Flow<Void> flow = callback.apply(reqCtx, map);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                    if (t == null) {
+                        t = new BlockingException("Blocked request (for Request/extractContentParameters)");
+                        reqCtx.getTraceSegment().effectivelyBlocked();
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  /**
-   * Fires the {@code requestFilesFilenames} event when the application calls public {@code
-   * getParts()}. Guards prevent double-firing:
-   *
-   * <ul>
-   *   <li>{@code _contentParameters != null}: set by {@code extractContentParameters()} (the {@code
-   *       getParameterMap()} path); means filenames were already reported via {@code
-   *       GetFilenamesFromMultiPartAdvice}.
-   *   <li>{@code _multiParts != null}: set by the first {@code getParts()} call in Jetty 11.0.x;
-   *       means filenames were already reported.
-   * </ul>
-   */
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class GetFilenamesAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean before(
-        @Advice.FieldValue("_contentParameters") final MultiMap<String> contentParameters,
-        @Advice.FieldValue(value = "_multiParts", typing = Assigner.Typing.DYNAMIC)
-            final Object multiParts) {
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class);
-      return callDepth == 0 && contentParameters == null && multiParts == null;
-    }
+    /**
+     * Fires the {@code requestFilesFilenames} event when the application calls public {@code
+     * getParts()}. Guards prevent double-firing:
+     *
+     * <ul>
+     *   <li>{@code _contentParameters != null}: set by {@code extractContentParameters()} (the {@code
+     *       getParameterMap()} path); means filenames were already reported via {@code
+     *       GetFilenamesFromMultiPartAdvice}.
+     *   <li>{@code _multiParts != null}: set by the first {@code getParts()} call in Jetty 11.0.x;
+     *       means filenames were already reported.
+     * </ul>
+     */
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class GetFilenamesAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean before(
+                @Advice.FieldValue("_contentParameters") final MultiMap<String> contentParameters,
+                @Advice.FieldValue(value = "_multiParts", typing = Assigner.Typing.DYNAMIC) final Object multiParts) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class);
+            return callDepth == 0 && contentParameters == null && multiParts == null;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean proceed,
-        @Advice.Return Collection<Part> parts,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class);
-      if (!proceed || t != null || parts == null || parts.isEmpty()) {
-        return;
-      }
-      t = MultipartHelper.fireFilenamesEvent(parts, reqCtx);
-      if (t == null) {
-        t = MultipartHelper.fireFilesContentEvent(parts, reqCtx);
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter boolean proceed,
+                @Advice.Return Collection<Part> parts,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class);
+            if (!proceed || t != null || parts == null || parts.isEmpty()) {
+                return;
+            }
+            t = MultipartHelper.fireFilenamesEvent(parts, reqCtx);
+            if (t == null) {
+                t = MultipartHelper.fireFilesContentEvent(parts, reqCtx);
+            }
+        }
     }
-  }
 
-  /**
-   * Fires the {@code requestFilesFilenames} event when multipart content is parsed via the internal
-   * {@code getParts(MultiMap)} path triggered by {@code getParameter*()} / {@code
-   * getParameterMap()} — i.e. when the application never calls public {@code getParts()}.
-   */
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class GetFilenamesFromMultiPartAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean before() {
-      return CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class) == 0;
-    }
+    /**
+     * Fires the {@code requestFilesFilenames} event when multipart content is parsed via the internal
+     * {@code getParts(MultiMap)} path triggered by {@code getParameter*()} / {@code
+     * getParameterMap()} — i.e. when the application never calls public {@code getParts()}.
+     */
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class GetFilenamesFromMultiPartAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean before() {
+            return CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class) == 0;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean proceed,
-        @Advice.Return Collection<Part> parts,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class);
-      if (!proceed || t != null || parts == null || parts.isEmpty()) {
-        return;
-      }
-      t = MultipartHelper.fireFilenamesEvent(parts, reqCtx);
-      if (t == null) {
-        t = MultipartHelper.fireFilesContentEvent(parts, reqCtx);
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter boolean proceed,
+                @Advice.Return Collection<Part> parts,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class);
+            if (!proceed || t != null || parts == null || parts.isEmpty()) {
+                return;
+            }
+            t = MultipartHelper.fireFilenamesEvent(parts, reqCtx);
+            if (t == null) {
+                t = MultipartHelper.fireFilesContentEvent(parts, reqCtx);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/test/java/datadog/trace/instrumentation/jetty11/MultipartHelperTest.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/test/java/datadog/trace/instrumentation/jetty11/MultipartHelperTest.java
index 6d20a79bbb4..0f6a8575a18 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/test/java/datadog/trace/instrumentation/jetty11/MultipartHelperTest.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/test/java/datadog/trace/instrumentation/jetty11/MultipartHelperTest.java
@@ -18,130 +18,127 @@
 
 class MultipartHelperTest {
 
-  @Test
-  void returnsEmptyListForNull() {
-    assertEquals(emptyList(), MultipartHelper.extractFilenames(null));
-  }
-
-  @Test
-  void returnsEmptyListForEmpty() {
-    assertEquals(emptyList(), MultipartHelper.extractFilenames(emptyList()));
-  }
-
-  @Test
-  void returnsEmptyListWhenAllPartsHaveNullFilename() {
-    List<Part> parts = asList(part(null), part(null));
-    assertEquals(emptyList(), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void returnsEmptyListWhenAllPartsHaveEmptyFilename() {
-    List<Part> parts = asList(part(""), part(""));
-    assertEquals(emptyList(), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void extractsFilenameFromSinglePart() {
-    List<Part> parts = singletonList(part("photo.jpg"));
-    assertEquals(singletonList("photo.jpg"), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void extractsFilenamesFromMultipleParts() {
-    List<Part> parts = asList(part("a.jpg"), part("b.png"), part("c.pdf"));
-    assertEquals(asList("a.jpg", "b.png", "c.pdf"), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void skipsPartsWithNullOrEmptyFilenameAndKeepsValid() {
-    List<Part> parts = asList(part(null), part("valid.txt"), part(""), part("other.zip"));
-    assertEquals(asList("valid.txt", "other.zip"), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void preservesFilenamesWithSpacesAndSpecialCharacters() {
-    List<Part> parts = asList(part("my file.tar.gz"), part("résumé.pdf"));
-    assertEquals(asList("my file.tar.gz", "résumé.pdf"), MultipartHelper.extractFilenames(parts));
-  }
-
-  private Part part(String submittedFileName) {
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn(submittedFileName);
-    return p;
-  }
-
-  // ── extractContents ─────────────────────────────────────────────────────────
-
-  @Test
-  void extractContentsReturnsEmptyListForNull() {
-    assertEquals(emptyList(), MultipartHelper.extractContents(null));
-  }
-
-  @Test
-  void extractContentsReturnsEmptyListForEmpty() {
-    assertEquals(emptyList(), MultipartHelper.extractContents(emptyList()));
-  }
-
-  @Test
-  void extractContentsSkipsFormFieldParts() {
-    List<Part> parts = asList(part(null), part(null));
-    assertEquals(emptyList(), MultipartHelper.extractContents(parts));
-  }
-
-  @Test
-  void extractContentsIncludesFileWithEmptyFilename() throws IOException {
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn("");
-    when(p.getInputStream())
-        .thenReturn(new ByteArrayInputStream("data".getBytes(StandardCharsets.UTF_8)));
-    when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
-    assertEquals(singletonList("data"), MultipartHelper.extractContents(singletonList(p)));
-  }
-
-  @Test
-  void extractContentsReadsFileContent() throws IOException {
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn("photo.jpg");
-    when(p.getInputStream())
-        .thenReturn(new ByteArrayInputStream("file-content".getBytes(StandardCharsets.UTF_8)));
-    when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
-    assertEquals(singletonList("file-content"), MultipartHelper.extractContents(singletonList(p)));
-  }
-
-  @Test
-  void extractContentsTruncatesAtMaxContentBytes() throws IOException {
-    byte[] large = new byte[MultipartHelper.MAX_CONTENT_BYTES + 1];
-    Arrays.fill(large, (byte) 'A');
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn("big.bin");
-    when(p.getInputStream()).thenReturn(new ByteArrayInputStream(large));
-    when(p.getContentType()).thenReturn(null);
-    List<String> contents = MultipartHelper.extractContents(singletonList(p));
-    assertEquals(1, contents.size());
-    assertEquals(MultipartHelper.MAX_CONTENT_BYTES, contents.get(0).length());
-  }
-
-  @Test
-  void extractContentsReturnsEmptyStringOnIOException() throws IOException {
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn("file.txt");
-    when(p.getInputStream()).thenThrow(new IOException("simulated"));
-    assertEquals(singletonList(""), MultipartHelper.extractContents(singletonList(p)));
-  }
-
-  @Test
-  void extractContentsCappsAtMaxFilesToInspect() throws IOException {
-    int count = MultipartHelper.MAX_FILES_TO_INSPECT + 1;
-    List<Part> parts = new ArrayList<>(count);
-    for (int i = 0; i < count; i++) {
-      Part p = mock(Part.class);
-      when(p.getSubmittedFileName()).thenReturn("file" + i + ".txt");
-      when(p.getInputStream())
-          .thenReturn(new ByteArrayInputStream("c".getBytes(StandardCharsets.UTF_8)));
-      when(p.getContentType()).thenReturn(null);
-      parts.add(p);
-    }
-    List<String> contents = MultipartHelper.extractContents(parts);
-    assertEquals(MultipartHelper.MAX_FILES_TO_INSPECT, contents.size());
-  }
+    @Test
+    void returnsEmptyListForNull() {
+        assertEquals(emptyList(), MultipartHelper.extractFilenames(null));
+    }
+
+    @Test
+    void returnsEmptyListForEmpty() {
+        assertEquals(emptyList(), MultipartHelper.extractFilenames(emptyList()));
+    }
+
+    @Test
+    void returnsEmptyListWhenAllPartsHaveNullFilename() {
+        List<Part> parts = asList(part(null), part(null));
+        assertEquals(emptyList(), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void returnsEmptyListWhenAllPartsHaveEmptyFilename() {
+        List<Part> parts = asList(part(""), part(""));
+        assertEquals(emptyList(), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void extractsFilenameFromSinglePart() {
+        List<Part> parts = singletonList(part("photo.jpg"));
+        assertEquals(singletonList("photo.jpg"), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void extractsFilenamesFromMultipleParts() {
+        List<Part> parts = asList(part("a.jpg"), part("b.png"), part("c.pdf"));
+        assertEquals(asList("a.jpg", "b.png", "c.pdf"), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void skipsPartsWithNullOrEmptyFilenameAndKeepsValid() {
+        List<Part> parts = asList(part(null), part("valid.txt"), part(""), part("other.zip"));
+        assertEquals(asList("valid.txt", "other.zip"), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void preservesFilenamesWithSpacesAndSpecialCharacters() {
+        List<Part> parts = asList(part("my file.tar.gz"), part("résumé.pdf"));
+        assertEquals(asList("my file.tar.gz", "résumé.pdf"), MultipartHelper.extractFilenames(parts));
+    }
+
+    private Part part(String submittedFileName) {
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn(submittedFileName);
+        return p;
+    }
+
+    // ── extractContents ─────────────────────────────────────────────────────────
+
+    @Test
+    void extractContentsReturnsEmptyListForNull() {
+        assertEquals(emptyList(), MultipartHelper.extractContents(null));
+    }
+
+    @Test
+    void extractContentsReturnsEmptyListForEmpty() {
+        assertEquals(emptyList(), MultipartHelper.extractContents(emptyList()));
+    }
+
+    @Test
+    void extractContentsSkipsFormFieldParts() {
+        List<Part> parts = asList(part(null), part(null));
+        assertEquals(emptyList(), MultipartHelper.extractContents(parts));
+    }
+
+    @Test
+    void extractContentsIncludesFileWithEmptyFilename() throws IOException {
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn("");
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream("data".getBytes(StandardCharsets.UTF_8)));
+        when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
+        assertEquals(singletonList("data"), MultipartHelper.extractContents(singletonList(p)));
+    }
+
+    @Test
+    void extractContentsReadsFileContent() throws IOException {
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn("photo.jpg");
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream("file-content".getBytes(StandardCharsets.UTF_8)));
+        when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
+        assertEquals(singletonList("file-content"), MultipartHelper.extractContents(singletonList(p)));
+    }
+
+    @Test
+    void extractContentsTruncatesAtMaxContentBytes() throws IOException {
+        byte[] large = new byte[MultipartHelper.MAX_CONTENT_BYTES + 1];
+        Arrays.fill(large, (byte) 'A');
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn("big.bin");
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream(large));
+        when(p.getContentType()).thenReturn(null);
+        List<String> contents = MultipartHelper.extractContents(singletonList(p));
+        assertEquals(1, contents.size());
+        assertEquals(MultipartHelper.MAX_CONTENT_BYTES, contents.get(0).length());
+    }
+
+    @Test
+    void extractContentsReturnsEmptyStringOnIOException() throws IOException {
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn("file.txt");
+        when(p.getInputStream()).thenThrow(new IOException("simulated"));
+        assertEquals(singletonList(""), MultipartHelper.extractContents(singletonList(p)));
+    }
+
+    @Test
+    void extractContentsCappsAtMaxFilesToInspect() throws IOException {
+        int count = MultipartHelper.MAX_FILES_TO_INSPECT + 1;
+        List<Part> parts = new ArrayList<>(count);
+        for (int i = 0; i < count; i++) {
+            Part p = mock(Part.class);
+            when(p.getSubmittedFileName()).thenReturn("file" + i + ".txt");
+            when(p.getInputStream()).thenReturn(new ByteArrayInputStream("c".getBytes(StandardCharsets.UTF_8)));
+            when(p.getContentType()).thenReturn(null);
+            parts.add(p);
+        }
+        List<String> contents = MultipartHelper.extractContents(parts);
+        assertEquals(MultipartHelper.MAX_FILES_TO_INSPECT, contents.size());
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestExtractParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestExtractParametersInstrumentation.java
index 30c10f70a15..ffd9cc2608a 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestExtractParametersInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestExtractParametersInstrumentation.java
@@ -13,45 +13,43 @@
 
 @AutoService(InstrumenterModule.class)
 public class RequestExtractParametersInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public RequestExtractParametersInstrumentation() {
-    super("jetty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.Request";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("extractParameters").and(takesArguments(0)),
-        getClass().getName() + "$ExtractParametersAdvice");
-  }
-
-  static final Reference REQUEST_REFERENCE =
-      new Reference.Builder("org.eclipse.jetty.server.Request")
-          .withField(new String[0], 0, "_baseParameters", "Lorg/eclipse/jetty/util/MultiMap;")
-          .build();
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {REQUEST_REFERENCE};
-  }
-
-  public static class ExtractParametersAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static int before() {
-      return CallDepthThreadLocalMap.incrementCallDepth(Request.class);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public RequestExtractParametersInstrumentation() {
+        super("jetty");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(@Advice.Enter final int depth) {
-      if (depth > 0) {
-        return;
-      }
-      CallDepthThreadLocalMap.reset(Request.class);
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.Request";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("extractParameters").and(takesArguments(0)), getClass().getName() + "$ExtractParametersAdvice");
+    }
+
+    static final Reference REQUEST_REFERENCE = new Reference.Builder("org.eclipse.jetty.server.Request")
+            .withField(new String[0], 0, "_baseParameters", "Lorg/eclipse/jetty/util/MultiMap;")
+            .build();
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {REQUEST_REFERENCE};
+    }
+
+    public static class ExtractParametersAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static int before() {
+            return CallDepthThreadLocalMap.incrementCallDepth(Request.class);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(@Advice.Enter final int depth) {
+            if (depth > 0) {
+                return;
+            }
+            CallDepthThreadLocalMap.reset(Request.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/src/main/java/datadog/trace/instrumentation/jetty70/UrlEncodedInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/src/main/java/datadog/trace/instrumentation/jetty70/UrlEncodedInstrumentation.java
index 76dc3fcca64..61bc8b20990 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/src/main/java/datadog/trace/instrumentation/jetty70/UrlEncodedInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/src/main/java/datadog/trace/instrumentation/jetty70/UrlEncodedInstrumentation.java
@@ -28,88 +28,88 @@
 
 @AutoService(InstrumenterModule.class)
 public class UrlEncodedInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public UrlEncodedInstrumentation() {
-    super("jetty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.util.UrlEncoded";
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public UrlEncodedInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {REQUEST_REFERENCE};
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.util.UrlEncoded";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("decodeTo")
-            .and(takesArgument(0, InputStream.class))
-            .and(takesArgument(1, named("org.eclipse.jetty.util.MultiMap")))
-            .and(takesArgument(2, String.class))
-            // there may be a 4th argument with the limit
-            .and(isPublic()),
-        getClass().getName() + "$UrlEncodedDecodeToAdvice");
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {REQUEST_REFERENCE};
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class UrlEncodedDecodeToAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean before(
-        @Advice.Argument(value = 1, readOnly = false) MultiMap<String> map,
-        @Advice.Local("origMap") MultiMap<String> origMap) {
-      // check we're inside extractParameters in Request
-      if (CallDepthThreadLocalMap.getCallDepth(Request.class) == 0) {
-        return false;
-      }
-      if (!map.isEmpty()) {
-        origMap = map;
-        map = new MultiMap<>();
-      }
-      return true;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("decodeTo")
+                        .and(takesArgument(0, InputStream.class))
+                        .and(takesArgument(1, named("org.eclipse.jetty.util.MultiMap")))
+                        .and(takesArgument(2, String.class))
+                        // there may be a 4th argument with the limit
+                        .and(isPublic()),
+                getClass().getName() + "$UrlEncodedDecodeToAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean relevantCall,
-        @Advice.Argument(1) MultiMap<String> map, // this is our map, not the orig arg
-        @Advice.Local("origMap") MultiMap<String> origMap,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (!relevantCall) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class UrlEncodedDecodeToAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean before(
+                @Advice.Argument(value = 1, readOnly = false) MultiMap<String> map,
+                @Advice.Local("origMap") MultiMap<String> origMap) {
+            // check we're inside extractParameters in Request
+            if (CallDepthThreadLocalMap.getCallDepth(Request.class) == 0) {
+                return false;
+            }
+            if (!map.isEmpty()) {
+                origMap = map;
+                map = new MultiMap<>();
+            }
+            return true;
+        }
 
-      if (map.isEmpty()) { // nothing was written
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter boolean relevantCall,
+                @Advice.Argument(1) MultiMap<String> map, // this is our map, not the orig arg
+                @Advice.Local("origMap") MultiMap<String> origMap,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (!relevantCall) {
+                return;
+            }
 
-      try {
-        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-        BiFunction<RequestContext, Object, Flow<Void>> callback =
-            cbp.getCallback(EVENTS.requestBodyProcessed());
-        if (callback == null) {
-          return;
-        }
-        Flow<Void> flow = callback.apply(reqCtx, map);
-        Flow.Action action = flow.getAction();
-        if (action instanceof Flow.Action.RequestBlockingAction) {
-          Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-          BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-          if (blockResponseFunction != null) {
-            blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-            if (t == null) {
-              t = new BlockingException("Blocked request (for UrlEncoded/decodeTo)");
-              reqCtx.getTraceSegment().effectivelyBlocked();
+            if (map.isEmpty()) { // nothing was written
+                return;
+            }
+
+            try {
+                CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+                BiFunction<RequestContext, Object, Flow<Void>> callback =
+                        cbp.getCallback(EVENTS.requestBodyProcessed());
+                if (callback == null) {
+                    return;
+                }
+                Flow<Void> flow = callback.apply(reqCtx, map);
+                Flow.Action action = flow.getAction();
+                if (action instanceof Flow.Action.RequestBlockingAction) {
+                    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                    BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                    if (blockResponseFunction != null) {
+                        blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                        if (t == null) {
+                            t = new BlockingException("Blocked request (for UrlEncoded/decodeTo)");
+                            reqCtx.getTraceSegment().effectivelyBlocked();
+                        }
+                    }
+                }
+            } finally {
+                origMap.putAll(map);
             }
-          }
         }
-      } finally {
-        origMap.putAll(map);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/PartHelper.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/PartHelper.java
index 468a93a028d..999f7c5140f 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/PartHelper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/PartHelper.java
@@ -39,359 +39,352 @@
  */
 public class PartHelper {
 
-  private static final Logger log = LoggerFactory.getLogger(PartHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(PartHelper.class);
 
-  public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
-  public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
+    public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
+    public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
 
-  private PartHelper() {}
+    private PartHelper() {}
 
-  // Lazily resolves MultiPartInputStream.getParts() as a MethodHandle on first class access.
-  // Uses IODH so no volatile is needed; the JVM class-loading guarantee ensures safe publication.
-  private static final class MpiGetPartsHolder {
-    static final MethodHandle GET_PARTS;
+    // Lazily resolves MultiPartInputStream.getParts() as a MethodHandle on first class access.
+    // Uses IODH so no volatile is needed; the JVM class-loading guarantee ensures safe publication.
+    private static final class MpiGetPartsHolder {
+        static final MethodHandle GET_PARTS;
 
-    static {
-      MethodHandle h = null;
-      try {
-        Class<?> cls =
-            Class.forName(
-                "org.eclipse.jetty.util.MultiPartInputStream",
-                false,
-                MpiGetPartsHolder.class.getClassLoader());
-        h = MethodHandles.lookup().unreflect(cls.getMethod("getParts"));
-      } catch (Exception ignored) {
-        // class or method not available — getAllParts() falls back to singleton
-      }
-      GET_PARTS = h;
+        static {
+            MethodHandle h = null;
+            try {
+                Class<?> cls = Class.forName(
+                        "org.eclipse.jetty.util.MultiPartInputStream", false, MpiGetPartsHolder.class.getClassLoader());
+                h = MethodHandles.lookup().unreflect(cls.getMethod("getParts"));
+            } catch (Exception ignored) {
+                // class or method not available — getAllParts() falls back to singleton
+            }
+            GET_PARTS = h;
+        }
     }
-  }
 
-  /**
-   * Returns all parts from a {@code MultiPartInputStream} object (already-parsed, no re-trigger).
-   * Falls back to a singleton of {@code singlePart} if reflection fails or the collection is empty.
-   */
-  public static Collection<?> getAllParts(Object multiPartInputStream, Part singlePart) {
-    if (multiPartInputStream != null) {
-      MethodHandle mh = MpiGetPartsHolder.GET_PARTS;
-      if (mh != null) {
-        try {
-          @SuppressWarnings("unchecked")
-          Collection<?> all = (Collection<?>) mh.invoke(multiPartInputStream);
-          if (all != null && !all.isEmpty()) {
-            return all;
-          }
-        } catch (Throwable e) {
-          log.debug("getAllParts: MethodHandle invocation failed, falling back to singleton", e);
+    /**
+     * Returns all parts from a {@code MultiPartInputStream} object (already-parsed, no re-trigger).
+     * Falls back to a singleton of {@code singlePart} if reflection fails or the collection is empty.
+     */
+    public static Collection<?> getAllParts(Object multiPartInputStream, Part singlePart) {
+        if (multiPartInputStream != null) {
+            MethodHandle mh = MpiGetPartsHolder.GET_PARTS;
+            if (mh != null) {
+                try {
+                    @SuppressWarnings("unchecked")
+                    Collection<?> all = (Collection<?>) mh.invoke(multiPartInputStream);
+                    if (all != null && !all.isEmpty()) {
+                        return all;
+                    }
+                } catch (Throwable e) {
+                    log.debug("getAllParts: MethodHandle invocation failed, falling back to singleton", e);
+                }
+            }
         }
-      }
+        return singlePart != null ? Collections.singletonList(singlePart) : Collections.emptyList();
     }
-    return singlePart != null ? Collections.singletonList(singlePart) : Collections.emptyList();
-  }
 
-  /**
-   * Returns filenames found in {@code parts} by parsing each part's {@code Content-Disposition}
-   * header for a {@code filename=} parameter.
-   */
-  public static List<String> extractFilenames(Collection<?> parts) {
-    if (parts == null || parts.isEmpty()) {
-      return Collections.emptyList();
-    }
-    List<String> filenames = new ArrayList<>(parts.size());
-    for (Object obj : parts) {
-      try {
-        String filename = filenameFromPart((Part) obj);
-        if (filename != null && !filename.isEmpty()) {
-          filenames.add(filename);
+    /**
+     * Returns filenames found in {@code parts} by parsing each part's {@code Content-Disposition}
+     * header for a {@code filename=} parameter.
+     */
+    public static List<String> extractFilenames(Collection<?> parts) {
+        if (parts == null || parts.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<String> filenames = new ArrayList<>(parts.size());
+        for (Object obj : parts) {
+            try {
+                String filename = filenameFromPart((Part) obj);
+                if (filename != null && !filename.isEmpty()) {
+                    filenames.add(filename);
+                }
+            } catch (Exception e) {
+                log.debug(EXCLUDE_TELEMETRY, "extractFilenames: skipping malformed part", e);
+            }
         }
-      } catch (Exception e) {
-        log.debug(EXCLUDE_TELEMETRY, "extractFilenames: skipping malformed part", e);
-      }
+        return filenames;
     }
-    return filenames;
-  }
 
-  /**
-   * Returns a name→values map of form-field parts (those without a {@code filename=} parameter).
-   * File-upload parts are skipped to avoid reading potentially large content. Reads up to {@link
-   * #MAX_CONTENT_BYTES} bytes per field, up to {@link #MAX_FILES_TO_INSPECT} fields total — same
-   * knobs and cap pattern as {@link #extractContents} uses for file content, reused here since
-   * there is no dedicated "max form fields" config.
-   */
-  public static Map<String, List<String>> extractFormFields(Collection<?> parts) {
-    if (parts == null || parts.isEmpty()) {
-      return Collections.emptyMap();
-    }
-    Map<String, List<String>> result = new LinkedHashMap<>();
-    int count = 0;
-    for (Object obj : parts) {
-      if (count >= MAX_FILES_TO_INSPECT) {
-        break;
-      }
-      try {
-        Part part = (Part) obj;
-        if (filenameFromPart(part) != null) {
-          continue; // file-upload part — skip
-        }
-        String name = part.getName();
-        if (name == null) {
-          continue;
+    /**
+     * Returns a name→values map of form-field parts (those without a {@code filename=} parameter).
+     * File-upload parts are skipped to avoid reading potentially large content. Reads up to {@link
+     * #MAX_CONTENT_BYTES} bytes per field, up to {@link #MAX_FILES_TO_INSPECT} fields total — same
+     * knobs and cap pattern as {@link #extractContents} uses for file content, reused here since
+     * there is no dedicated "max form fields" config.
+     */
+    public static Map<String, List<String>> extractFormFields(Collection<?> parts) {
+        if (parts == null || parts.isEmpty()) {
+            return Collections.emptyMap();
         }
-        String value = readPartContent(part);
-        if (value == null) {
-          continue;
+        Map<String, List<String>> result = new LinkedHashMap<>();
+        int count = 0;
+        for (Object obj : parts) {
+            if (count >= MAX_FILES_TO_INSPECT) {
+                break;
+            }
+            try {
+                Part part = (Part) obj;
+                if (filenameFromPart(part) != null) {
+                    continue; // file-upload part — skip
+                }
+                String name = part.getName();
+                if (name == null) {
+                    continue;
+                }
+                String value = readPartContent(part);
+                if (value == null) {
+                    continue;
+                }
+                result.computeIfAbsent(name, k -> new ArrayList<>()).add(value);
+                count++;
+            } catch (Exception e) {
+                log.debug(EXCLUDE_TELEMETRY, "extractFormFields: skipping malformed part", e);
+            }
         }
-        result.computeIfAbsent(name, k -> new ArrayList<>()).add(value);
-        count++;
-      } catch (Exception e) {
-        log.debug(EXCLUDE_TELEMETRY, "extractFormFields: skipping malformed part", e);
-      }
+        return result;
     }
-    return result;
-  }
 
-  /**
-   * Extracts the {@code filename} value from a {@code Content-Disposition} header, or {@code null}
-   * if the part has no filename (i.e. it is a plain form field).
-   *
-   * <p>Uses a quote-aware parser so that semicolons inside a quoted filename (e.g. {@code
-   * filename="shell;evil.php"}) are not mistaken for parameter separators.
-   */
-  static String filenameFromPart(Part part) {
-    String cd = part.getHeader("Content-Disposition");
-    if (cd == null) {
-      return null;
-    }
-    int len = cd.length();
-    int i = 0;
-    while (i < len) {
-      // Skip separators between parameters
-      while (i < len && (cd.charAt(i) == ';' || cd.charAt(i) == ' ' || cd.charAt(i) == '\t')) {
-        i++;
-      }
-      if (i >= len) break;
-      // Read parameter name (up to '=' or ';')
-      int nameStart = i;
-      while (i < len && cd.charAt(i) != '=' && cd.charAt(i) != ';') {
-        i++;
-      }
-      boolean isFilename = "filename".equalsIgnoreCase(cd.substring(nameStart, i).trim());
-      if (i >= len || cd.charAt(i) == ';') {
-        // Value-less token (e.g. "form-data") — skip
-        continue;
-      }
-      i++; // skip '='
-      String value;
-      if (i < len && cd.charAt(i) == '"') {
-        i++; // skip opening quote
-        StringBuilder sb = new StringBuilder();
-        while (i < len && cd.charAt(i) != '"') {
-          if (cd.charAt(i) == '\\' && i + 1 < len) {
-            i++; // consume escape backslash, add next char literally
-          }
-          sb.append(cd.charAt(i++));
+    /**
+     * Extracts the {@code filename} value from a {@code Content-Disposition} header, or {@code null}
+     * if the part has no filename (i.e. it is a plain form field).
+     *
+     * <p>Uses a quote-aware parser so that semicolons inside a quoted filename (e.g. {@code
+     * filename="shell;evil.php"}) are not mistaken for parameter separators.
+     */
+    static String filenameFromPart(Part part) {
+        String cd = part.getHeader("Content-Disposition");
+        if (cd == null) {
+            return null;
         }
-        if (i < len) i++; // skip closing quote
-        value = sb.toString();
-      } else {
-        int valueStart = i;
-        while (i < len && cd.charAt(i) != ';') {
-          i++;
+        int len = cd.length();
+        int i = 0;
+        while (i < len) {
+            // Skip separators between parameters
+            while (i < len && (cd.charAt(i) == ';' || cd.charAt(i) == ' ' || cd.charAt(i) == '\t')) {
+                i++;
+            }
+            if (i >= len) break;
+            // Read parameter name (up to '=' or ';')
+            int nameStart = i;
+            while (i < len && cd.charAt(i) != '=' && cd.charAt(i) != ';') {
+                i++;
+            }
+            boolean isFilename =
+                    "filename".equalsIgnoreCase(cd.substring(nameStart, i).trim());
+            if (i >= len || cd.charAt(i) == ';') {
+                // Value-less token (e.g. "form-data") — skip
+                continue;
+            }
+            i++; // skip '='
+            String value;
+            if (i < len && cd.charAt(i) == '"') {
+                i++; // skip opening quote
+                StringBuilder sb = new StringBuilder();
+                while (i < len && cd.charAt(i) != '"') {
+                    if (cd.charAt(i) == '\\' && i + 1 < len) {
+                        i++; // consume escape backslash, add next char literally
+                    }
+                    sb.append(cd.charAt(i++));
+                }
+                if (i < len) i++; // skip closing quote
+                value = sb.toString();
+            } else {
+                int valueStart = i;
+                while (i < len && cd.charAt(i) != ';') {
+                    i++;
+                }
+                value = cd.substring(valueStart, i).trim();
+            }
+            if (isFilename) {
+                // Return empty string (not null) so callers can distinguish "filename present but empty"
+                // from "no filename parameter". extractFormFields() uses != null to skip file parts,
+                // so empty string correctly prevents buffering a file-upload body with filename="".
+                return value;
+            }
         }
-        value = cd.substring(valueStart, i).trim();
-      }
-      if (isFilename) {
-        // Return empty string (not null) so callers can distinguish "filename present but empty"
-        // from "no filename parameter". extractFormFields() uses != null to skip file parts,
-        // so empty string correctly prevents buffering a file-upload body with filename="".
-        return value;
-      }
+        return null;
     }
-    return null;
-  }
 
-  /**
-   * Fires the {@code requestBodyProcessed} IG event for form-field parts in {@code parts} and
-   * returns a {@link BlockingException} if the WAF requests blocking, or {@code null} otherwise.
-   */
-  public static BlockingException fireBodyProcessedEvent(
-      Collection<?> parts, RequestContext reqCtx) {
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, Object, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestBodyProcessed());
-    if (callback == null) {
-      return null;
-    }
-    Map<String, List<String>> formFields = extractFormFields(parts);
-    if (formFields.isEmpty()) {
-      return null;
-    }
-    Flow<Void> flow = callback.apply(reqCtx, formFields);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
-          reqCtx.getTraceSegment().effectivelyBlocked();
-          return new BlockingException("Blocked request (multipart form fields)");
+    /**
+     * Fires the {@code requestBodyProcessed} IG event for form-field parts in {@code parts} and
+     * returns a {@link BlockingException} if the WAF requests blocking, or {@code null} otherwise.
+     */
+    public static BlockingException fireBodyProcessedEvent(Collection<?> parts, RequestContext reqCtx) {
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+        if (callback == null) {
+            return null;
+        }
+        Map<String, List<String>> formFields = extractFormFields(parts);
+        if (formFields.isEmpty()) {
+            return null;
         }
-      }
+        Flow<Void> flow = callback.apply(reqCtx, formFields);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                    return new BlockingException("Blocked request (multipart form fields)");
+                }
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  /**
-   * Fires the {@code requestFilesFilenames} IG event for file-upload parts in {@code parts} and
-   * returns a {@link BlockingException} if the WAF requests blocking, or {@code null} otherwise.
-   */
-  public static BlockingException fireFilenamesEvent(Collection<?> parts, RequestContext reqCtx) {
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestFilesFilenames());
-    if (callback == null) {
-      return null;
-    }
-    List<String> filenames = extractFilenames(parts);
-    if (filenames.isEmpty()) {
-      return null;
-    }
-    Flow<Void> flow = callback.apply(reqCtx, filenames);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
-          reqCtx.getTraceSegment().effectivelyBlocked();
-          return new BlockingException("Blocked request (multipart file upload)");
+    /**
+     * Fires the {@code requestFilesFilenames} IG event for file-upload parts in {@code parts} and
+     * returns a {@link BlockingException} if the WAF requests blocking, or {@code null} otherwise.
+     */
+    public static BlockingException fireFilenamesEvent(Collection<?> parts, RequestContext reqCtx) {
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> callback = cbp.getCallback(EVENTS.requestFilesFilenames());
+        if (callback == null) {
+            return null;
         }
-      }
+        List<String> filenames = extractFilenames(parts);
+        if (filenames.isEmpty()) {
+            return null;
+        }
+        Flow<Void> flow = callback.apply(reqCtx, filenames);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                    return new BlockingException("Blocked request (multipart file upload)");
+                }
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  /**
-   * Extracts file content from a collection of multipart {@link Part}s. Form fields (those without
-   * a {@code filename} parameter in the {@code Content-Disposition} header) are skipped. Reads up
-   * to {@link #MAX_CONTENT_BYTES} bytes per part, up to {@link #MAX_FILES_TO_INSPECT} parts total.
-   *
-   * @return list of decoded content strings; never {@code null}, may be empty
-   */
-  public static List<String> extractContents(Collection<?> parts) {
-    if (parts == null || parts.isEmpty()) {
-      return Collections.emptyList();
-    }
-    List<String> contents = new ArrayList<>(Math.min(parts.size(), MAX_FILES_TO_INSPECT));
-    for (Object obj : parts) {
-      if (contents.size() >= MAX_FILES_TO_INSPECT) {
-        break;
-      }
-      try {
-        Part part = (Part) obj;
-        if (filenameFromPart(part) == null) {
-          continue; // form field — skip
+    /**
+     * Extracts file content from a collection of multipart {@link Part}s. Form fields (those without
+     * a {@code filename} parameter in the {@code Content-Disposition} header) are skipped. Reads up
+     * to {@link #MAX_CONTENT_BYTES} bytes per part, up to {@link #MAX_FILES_TO_INSPECT} parts total.
+     *
+     * @return list of decoded content strings; never {@code null}, may be empty
+     */
+    public static List<String> extractContents(Collection<?> parts) {
+        if (parts == null || parts.isEmpty()) {
+            return Collections.emptyList();
         }
-        contents.add(readFileContent(part));
-      } catch (Exception e) {
-        log.debug(EXCLUDE_TELEMETRY, "extractContents: skipping malformed part", e);
-      }
+        List<String> contents = new ArrayList<>(Math.min(parts.size(), MAX_FILES_TO_INSPECT));
+        for (Object obj : parts) {
+            if (contents.size() >= MAX_FILES_TO_INSPECT) {
+                break;
+            }
+            try {
+                Part part = (Part) obj;
+                if (filenameFromPart(part) == null) {
+                    continue; // form field — skip
+                }
+                contents.add(readFileContent(part));
+            } catch (Exception e) {
+                log.debug(EXCLUDE_TELEMETRY, "extractContents: skipping malformed part", e);
+            }
+        }
+        return contents;
     }
-    return contents;
-  }
 
-  private static String readFileContent(Part part) {
-    try (InputStream is = part.getInputStream()) {
-      return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, part.getContentType());
-    } catch (Exception e) {
-      log.debug(EXCLUDE_TELEMETRY, "readFileContent: stream read failed", e);
-      return "";
+    private static String readFileContent(Part part) {
+        try (InputStream is = part.getInputStream()) {
+            return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, part.getContentType());
+        } catch (Exception e) {
+            log.debug(EXCLUDE_TELEMETRY, "readFileContent: stream read failed", e);
+            return "";
+        }
     }
-  }
 
-  /**
-   * Fires the {@code requestFilesContent} IG event for file-upload parts in {@code parts} and
-   * returns a {@link BlockingException} if the WAF requests blocking, or {@code null} otherwise.
-   */
-  public static BlockingException fireFilesContentEvent(
-      Collection<?> parts, RequestContext reqCtx) {
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestFilesContent());
-    if (callback == null) {
-      return null;
-    }
-    List<String> contents = extractContents(parts);
-    if (contents.isEmpty()) {
-      return null;
-    }
-    Flow<Void> flow = callback.apply(reqCtx, contents);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
-          reqCtx.getTraceSegment().effectivelyBlocked();
-          return new BlockingException("Blocked request (multipart file content)");
+    /**
+     * Fires the {@code requestFilesContent} IG event for file-upload parts in {@code parts} and
+     * returns a {@link BlockingException} if the WAF requests blocking, or {@code null} otherwise.
+     */
+    public static BlockingException fireFilesContentEvent(Collection<?> parts, RequestContext reqCtx) {
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> callback = cbp.getCallback(EVENTS.requestFilesContent());
+        if (callback == null) {
+            return null;
+        }
+        List<String> contents = extractContents(parts);
+        if (contents.isEmpty()) {
+            return null;
+        }
+        Flow<Void> flow = callback.apply(reqCtx, contents);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                    return new BlockingException("Blocked request (multipart file content)");
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
 
-  private static String readPartContent(Part part) {
-    Charset charset = charsetFromContentType(part.getContentType());
-    // Bound the buffered form-field text by the file-content byte cap. There is no dedicated
-    // "max form-field bytes" config, so we intentionally reuse MAX_CONTENT_BYTES:
-    // this is the only framework that must manually buffer form-field text (Servlet 3.0 has no
-    // container-side bound), and without a cap a single huge text field could exhaust the heap.
-    try (InputStream is = part.getInputStream()) {
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      byte[] buf = new byte[4096];
-      int total = 0;
-      int read;
-      while (total < MAX_CONTENT_BYTES
-          && (read = is.read(buf, 0, Math.min(buf.length, MAX_CONTENT_BYTES - total))) != -1) {
-        baos.write(buf, 0, read);
-        total += read;
-      }
-      return new String(baos.toByteArray(), charset);
-    } catch (IOException e) {
-      log.debug(EXCLUDE_TELEMETRY, "readPartContent: stream read failed", e);
-      return null;
+    private static String readPartContent(Part part) {
+        Charset charset = charsetFromContentType(part.getContentType());
+        // Bound the buffered form-field text by the file-content byte cap. There is no dedicated
+        // "max form-field bytes" config, so we intentionally reuse MAX_CONTENT_BYTES:
+        // this is the only framework that must manually buffer form-field text (Servlet 3.0 has no
+        // container-side bound), and without a cap a single huge text field could exhaust the heap.
+        try (InputStream is = part.getInputStream()) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            byte[] buf = new byte[4096];
+            int total = 0;
+            int read;
+            while (total < MAX_CONTENT_BYTES
+                    && (read = is.read(buf, 0, Math.min(buf.length, MAX_CONTENT_BYTES - total))) != -1) {
+                baos.write(buf, 0, read);
+                total += read;
+            }
+            return new String(baos.toByteArray(), charset);
+        } catch (IOException e) {
+            log.debug(EXCLUDE_TELEMETRY, "readPartContent: stream read failed", e);
+            return null;
+        }
     }
-  }
 
-  /**
-   * Parses the {@code charset} parameter from a {@code Content-Type} header value (e.g. {@code
-   * text/plain; charset=ISO-8859-1}). Returns UTF-8 when absent, unknown, or {@code null}.
-   */
-  static Charset charsetFromContentType(String contentType) {
-    if (contentType != null) {
-      int idx = contentType.toLowerCase(Locale.ROOT).indexOf("charset=");
-      if (idx >= 0) {
-        String name = contentType.substring(idx + 8).trim();
-        if (!name.isEmpty() && name.charAt(0) == '"') {
-          name = name.substring(1);
-          int end = name.indexOf('"');
-          if (end >= 0) name = name.substring(0, end);
-        } else {
-          int end = 0;
-          while (end < name.length()
-              && name.charAt(end) != ';'
-              && !Character.isWhitespace(name.charAt(end))) {
-            end++;
-          }
-          name = name.substring(0, end);
-        }
-        try {
-          return Charset.forName(name);
-        } catch (Exception ignored) {
-          // unknown or unsupported charset name — fall back to UTF-8
+    /**
+     * Parses the {@code charset} parameter from a {@code Content-Type} header value (e.g. {@code
+     * text/plain; charset=ISO-8859-1}). Returns UTF-8 when absent, unknown, or {@code null}.
+     */
+    static Charset charsetFromContentType(String contentType) {
+        if (contentType != null) {
+            int idx = contentType.toLowerCase(Locale.ROOT).indexOf("charset=");
+            if (idx >= 0) {
+                String name = contentType.substring(idx + 8).trim();
+                if (!name.isEmpty() && name.charAt(0) == '"') {
+                    name = name.substring(1);
+                    int end = name.indexOf('"');
+                    if (end >= 0) name = name.substring(0, end);
+                } else {
+                    int end = 0;
+                    while (end < name.length()
+                            && name.charAt(end) != ';'
+                            && !Character.isWhitespace(name.charAt(end))) {
+                        end++;
+                    }
+                    name = name.substring(0, end);
+                }
+                try {
+                    return Charset.forName(name);
+                } catch (Exception ignored) {
+                    // unknown or unsupported charset name — fall back to UTF-8
+                }
+            }
         }
-      }
+        return StandardCharsets.UTF_8;
     }
-    return StandardCharsets.UTF_8;
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java
index 18c51fe344e..b052bfb3240 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java
@@ -29,171 +29,167 @@
 
 @AutoService(InstrumenterModule.class)
 public class RequestGetPartsInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public RequestGetPartsInstrumentation() {
-    super("jetty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.Request";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice");
-    transformer.applyAdvice(
-        named("getPart").and(takesArguments(1)).and(takesArgument(0, String.class)),
-        getClass().getName() + "$GetPartAdvice");
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return RequestImplementationClassLoaderMatcher.INSTANCE;
-  }
-
-  public static class RequestImplementationClassLoaderMatcher
-      extends ElementMatcher.Junction.ForNonNullValues<ClassLoader> {
-    public static final ElementMatcher.Junction<ClassLoader> INSTANCE =
-        new RequestImplementationClassLoaderMatcher();
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public RequestGetPartsInstrumentation() {
+        super("jetty");
+    }
 
     @Override
-    protected boolean doMatch(ClassLoader cl) {
-      try (InputStream is = cl.getResourceAsStream("org/eclipse/jetty/server/Request.class")) {
-        if (is == null) {
-          return false;
-        }
-        ClassReader classReader = new ClassReader(is);
-        final boolean[] foundField = new boolean[1];
-        final boolean[] foundGetParameters = new boolean[1];
-        classReader.accept(new ClassLoaderMatcherClassVisitor(foundField, foundGetParameters), 0);
-        return !foundField[0] && foundGetParameters[0];
-      } catch (IOException e) {
-        return false;
-      }
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.Request";
     }
-  }
 
-  public static class ClassLoaderMatcherClassVisitor extends ClassVisitor {
-    final boolean[] foundField;
-    final boolean[] foundGetParameters;
-
-    public ClassLoaderMatcherClassVisitor(boolean[] foundField, boolean[] foundGetParameters) {
-      super(OpenedClassReader.ASM_API);
-      this.foundField = foundField;
-      this.foundGetParameters = foundGetParameters;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice");
+        transformer.applyAdvice(
+                named("getPart").and(takesArguments(1)).and(takesArgument(0, String.class)),
+                getClass().getName() + "$GetPartAdvice");
     }
 
     @Override
-    public FieldVisitor visitField(
-        int access, String name, String descriptor, String signature, Object value) {
-      if (name.equals("_contentParameters")) {
-        foundField[0] = true;
-      }
-      return null;
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return RequestImplementationClassLoaderMatcher.INSTANCE;
     }
 
-    @Override
-    public MethodVisitor visitMethod(
-        int access, String name, String descriptor, String signature, String[] exceptions) {
-      if (name.equals("getParts") && "()Ljava/util/Collection;".equals(descriptor)) {
-        return new MethodVisitor(OpenedClassReader.ASM_API) {
-          @Override
-          public void visitMethodInsn(
-              int opcode, String owner, String name, String descriptor, boolean isInterface) {
-            if (opcode == Opcodes.INVOKEVIRTUAL
-                && name.equals("getParameters")
-                && descriptor.equals("()Lorg/eclipse/jetty/util/MultiMap;")) {
-              foundGetParameters[0] = true;
+    public static class RequestImplementationClassLoaderMatcher
+            extends ElementMatcher.Junction.ForNonNullValues<ClassLoader> {
+        public static final ElementMatcher.Junction<ClassLoader> INSTANCE =
+                new RequestImplementationClassLoaderMatcher();
+
+        @Override
+        protected boolean doMatch(ClassLoader cl) {
+            try (InputStream is = cl.getResourceAsStream("org/eclipse/jetty/server/Request.class")) {
+                if (is == null) {
+                    return false;
+                }
+                ClassReader classReader = new ClassReader(is);
+                final boolean[] foundField = new boolean[1];
+                final boolean[] foundGetParameters = new boolean[1];
+                classReader.accept(new ClassLoaderMatcherClassVisitor(foundField, foundGetParameters), 0);
+                return !foundField[0] && foundGetParameters[0];
+            } catch (IOException e) {
+                return false;
             }
-          }
-        };
-      }
-      return null;
-    }
-  }
-
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class GetFilenamesAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean before(
-        @Advice.FieldValue(value = "_multiPartInputStream", typing = Assigner.Typing.DYNAMIC)
-            final Object multiPartInputStream) {
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Collection.class);
-      // _multiPartInputStream is null before the first parse; non-null on cached repeat calls.
-      // In Jetty 9.0/9.1, getPart(String) delegates to getParts() internally, triggering both
-      // GetPartAdvice and GetFilenamesAdvice — double-firing the filename event.
-      // If GetPartAdvice is already active (Part.class depth > 0) it will handle the event; skip.
-      return callDepth == 0
-          && multiPartInputStream == null
-          && CallDepthThreadLocalMap.getCallDepth(Part.class) == 0;
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean proceed,
-        @Advice.Return Collection<?> parts,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      CallDepthThreadLocalMap.decrementCallDepth(Collection.class);
-      if (!proceed || t != null || parts == null || parts.isEmpty()) {
-        return;
-      }
-      BlockingException bodyBlock = PartHelper.fireBodyProcessedEvent(parts, reqCtx);
-      BlockingException filenamesBlock = PartHelper.fireFilenamesEvent(parts, reqCtx);
-      BlockingException contentBlock =
-          bodyBlock == null && filenamesBlock == null
-              ? PartHelper.fireFilesContentEvent(parts, reqCtx)
-              : null;
-      t = bodyBlock != null ? bodyBlock : (filenamesBlock != null ? filenamesBlock : contentBlock);
+    public static class ClassLoaderMatcherClassVisitor extends ClassVisitor {
+        final boolean[] foundField;
+        final boolean[] foundGetParameters;
+
+        public ClassLoaderMatcherClassVisitor(boolean[] foundField, boolean[] foundGetParameters) {
+            super(OpenedClassReader.ASM_API);
+            this.foundField = foundField;
+            this.foundGetParameters = foundGetParameters;
+        }
+
+        @Override
+        public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
+            if (name.equals("_contentParameters")) {
+                foundField[0] = true;
+            }
+            return null;
+        }
+
+        @Override
+        public MethodVisitor visitMethod(
+                int access, String name, String descriptor, String signature, String[] exceptions) {
+            if (name.equals("getParts") && "()Ljava/util/Collection;".equals(descriptor)) {
+                return new MethodVisitor(OpenedClassReader.ASM_API) {
+                    @Override
+                    public void visitMethodInsn(
+                            int opcode, String owner, String name, String descriptor, boolean isInterface) {
+                        if (opcode == Opcodes.INVOKEVIRTUAL
+                                && name.equals("getParameters")
+                                && descriptor.equals("()Lorg/eclipse/jetty/util/MultiMap;")) {
+                            foundGetParameters[0] = true;
+                        }
+                    }
+                };
+            }
+            return null;
+        }
     }
-  }
-
-  /**
-   * Fires AppSec events for requests whose first multipart access is {@code getPart(String)}.
-   *
-   * <p>In Jetty 8.x, {@code getPart(String)} parses and caches the entire multipart stream into
-   * {@code _multiPartInputStream} but returns only the single requested part. If the app only calls
-   * {@code getPart("field")} (a text field), any co-uploaded file parts would never reach {@code
-   * requestFilesFilenames}. We therefore read all cached parts via {@code
-   * MultiPartInputStream.getParts()} and fall back to the returned singleton only if that fails.
-   */
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class GetPartAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean before(
-        @Advice.FieldValue(value = "_multiPartInputStream", typing = Assigner.Typing.DYNAMIC)
-            Object multiPartInputStream) {
-      // _multiPartInputStream is null before the first parse. Once set, all parts are cached and
-      // events have already fired (either here or in GetFilenamesAdvice). Skip on repeat calls.
-      return CallDepthThreadLocalMap.incrementCallDepth(Part.class) == 0
-          && multiPartInputStream == null;
+
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class GetFilenamesAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean before(
+                @Advice.FieldValue(value = "_multiPartInputStream", typing = Assigner.Typing.DYNAMIC)
+                        final Object multiPartInputStream) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Collection.class);
+            // _multiPartInputStream is null before the first parse; non-null on cached repeat calls.
+            // In Jetty 9.0/9.1, getPart(String) delegates to getParts() internally, triggering both
+            // GetPartAdvice and GetFilenamesAdvice — double-firing the filename event.
+            // If GetPartAdvice is already active (Part.class depth > 0) it will handle the event; skip.
+            return callDepth == 0
+                    && multiPartInputStream == null
+                    && CallDepthThreadLocalMap.getCallDepth(Part.class) == 0;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter boolean proceed,
+                @Advice.Return Collection<?> parts,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            CallDepthThreadLocalMap.decrementCallDepth(Collection.class);
+            if (!proceed || t != null || parts == null || parts.isEmpty()) {
+                return;
+            }
+            BlockingException bodyBlock = PartHelper.fireBodyProcessedEvent(parts, reqCtx);
+            BlockingException filenamesBlock = PartHelper.fireFilenamesEvent(parts, reqCtx);
+            BlockingException contentBlock = bodyBlock == null && filenamesBlock == null
+                    ? PartHelper.fireFilesContentEvent(parts, reqCtx)
+                    : null;
+            t = bodyBlock != null ? bodyBlock : (filenamesBlock != null ? filenamesBlock : contentBlock);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean proceed,
-        @Advice.Return Part part,
-        @Advice.FieldValue(value = "_multiPartInputStream", typing = Assigner.Typing.DYNAMIC)
-            Object multiPartInputStream,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      CallDepthThreadLocalMap.decrementCallDepth(Part.class);
-      if (!proceed || t != null) {
-        return;
-      }
-      Collection<?> parts = PartHelper.getAllParts(multiPartInputStream, part);
-      if (parts.isEmpty()) {
-        return;
-      }
-      BlockingException bodyBlock = PartHelper.fireBodyProcessedEvent(parts, reqCtx);
-      BlockingException filenamesBlock = PartHelper.fireFilenamesEvent(parts, reqCtx);
-      BlockingException contentBlock =
-          bodyBlock == null && filenamesBlock == null
-              ? PartHelper.fireFilesContentEvent(parts, reqCtx)
-              : null;
-      t = bodyBlock != null ? bodyBlock : (filenamesBlock != null ? filenamesBlock : contentBlock);
+    /**
+     * Fires AppSec events for requests whose first multipart access is {@code getPart(String)}.
+     *
+     * <p>In Jetty 8.x, {@code getPart(String)} parses and caches the entire multipart stream into
+     * {@code _multiPartInputStream} but returns only the single requested part. If the app only calls
+     * {@code getPart("field")} (a text field), any co-uploaded file parts would never reach {@code
+     * requestFilesFilenames}. We therefore read all cached parts via {@code
+     * MultiPartInputStream.getParts()} and fall back to the returned singleton only if that fails.
+     */
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class GetPartAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean before(
+                @Advice.FieldValue(value = "_multiPartInputStream", typing = Assigner.Typing.DYNAMIC)
+                        Object multiPartInputStream) {
+            // _multiPartInputStream is null before the first parse. Once set, all parts are cached and
+            // events have already fired (either here or in GetFilenamesAdvice). Skip on repeat calls.
+            return CallDepthThreadLocalMap.incrementCallDepth(Part.class) == 0 && multiPartInputStream == null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter boolean proceed,
+                @Advice.Return Part part,
+                @Advice.FieldValue(value = "_multiPartInputStream", typing = Assigner.Typing.DYNAMIC)
+                        Object multiPartInputStream,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            CallDepthThreadLocalMap.decrementCallDepth(Part.class);
+            if (!proceed || t != null) {
+                return;
+            }
+            Collection<?> parts = PartHelper.getAllParts(multiPartInputStream, part);
+            if (parts.isEmpty()) {
+                return;
+            }
+            BlockingException bodyBlock = PartHelper.fireBodyProcessedEvent(parts, reqCtx);
+            BlockingException filenamesBlock = PartHelper.fireFilenamesEvent(parts, reqCtx);
+            BlockingException contentBlock = bodyBlock == null && filenamesBlock == null
+                    ? PartHelper.fireFilesContentEvent(parts, reqCtx)
+                    : null;
+            t = bodyBlock != null ? bodyBlock : (filenamesBlock != null ? filenamesBlock : contentBlock);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/test/java/datadog/trace/instrumentation/jetty8/PartHelperTest.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/test/java/datadog/trace/instrumentation/jetty8/PartHelperTest.java
index 5826698454d..4cea1e26b44 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/test/java/datadog/trace/instrumentation/jetty8/PartHelperTest.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/test/java/datadog/trace/instrumentation/jetty8/PartHelperTest.java
@@ -25,401 +25,383 @@
 
 class PartHelperTest {
 
-  // ── extractFilenames ────────────────────────────────────────────────────────
-
-  @Test
-  void extractFilenamesReturnsEmptyListForNull() {
-    assertEquals(emptyList(), PartHelper.extractFilenames(null));
-  }
-
-  @Test
-  void extractFilenamesReturnsEmptyListForEmpty() {
-    assertEquals(emptyList(), PartHelper.extractFilenames(emptyList()));
-  }
-
-  @Test
-  void extractFilenamesReturnsEmptyListWhenNoPartsHaveFilename() {
-    List<Part> parts = asList(formField("a"), formField("b"));
-    assertEquals(emptyList(), PartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void extractFilenamesExtractsFilenameFromSingleFilePart() {
-    List<Part> parts = singletonList(filePart("photo.jpg"));
-    assertEquals(singletonList("photo.jpg"), PartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void extractFilenamesExtractsFilenamesFromMultipleFileParts() {
-    List<Part> parts = asList(filePart("a.jpg"), filePart("b.png"), filePart("c.pdf"));
-    assertEquals(asList("a.jpg", "b.png", "c.pdf"), PartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void extractFilenamesSkipsFormFieldPartsAndKeepsFileParts() {
-    List<Part> parts = asList(formField("x"), filePart("upload.zip"), formField("y"));
-    assertEquals(singletonList("upload.zip"), PartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void extractFilenamesPreservesFilenamesWithSpacesAndSpecialCharacters() {
-    List<Part> parts = asList(filePart("my file.tar.gz"), filePart("résumé.pdf"));
-    assertEquals(asList("my file.tar.gz", "résumé.pdf"), PartHelper.extractFilenames(parts));
-  }
-
-  // ── filenameFromPart ────────────────────────────────────────────────────────
-
-  @Test
-  void filenameFromPartReturnsNullWhenContentDispositionHeaderIsAbsent() {
-    Part p = mock(Part.class);
-    when(p.getHeader("Content-Disposition")).thenReturn(null);
-    assertNull(PartHelper.filenameFromPart(p));
-  }
-
-  @Test
-  void filenameFromPartReturnsNullWhenThereIsNoFilenameParameter() {
-    Part p = mock(Part.class);
-    when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"field\"");
-    assertNull(PartHelper.filenameFromPart(p));
-  }
-
-  @Test
-  void filenameFromPartExtractsUnquotedFilename() {
-    Part p = mock(Part.class);
-    when(p.getHeader("Content-Disposition"))
-        .thenReturn("form-data; name=\"file\"; filename=photo.jpg");
-    assertEquals("photo.jpg", PartHelper.filenameFromPart(p));
-  }
-
-  @Test
-  void filenameFromPartStripsQuotesFromFilename() {
-    Part p = mock(Part.class);
-    when(p.getHeader("Content-Disposition"))
-        .thenReturn("form-data; name=\"file\"; filename=\"photo.jpg\"");
-    assertEquals("photo.jpg", PartHelper.filenameFromPart(p));
-  }
-
-  @Test
-  void filenameFromPartReturnsEmptyStringForEmptyQuotedFilename() {
-    Part p = mock(Part.class);
-    when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"file\"; filename=\"\"");
-    assertEquals("", PartHelper.filenameFromPart(p));
-  }
-
-  @Test
-  void filenameFromPartReturnsEmptyStringForEmptyUnquotedFilename() {
-    Part p = mock(Part.class);
-    when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"file\"; filename=");
-    assertEquals("", PartHelper.filenameFromPart(p));
-  }
-
-  @Test
-  void filenameFromPartPreservesSemicolonsInsideQuotedFilename() {
-    Part p = mock(Part.class);
-    when(p.getHeader("Content-Disposition"))
-        .thenReturn("form-data; name=\"file\"; filename=\"shell;evil.php\"");
-    assertEquals("shell;evil.php", PartHelper.filenameFromPart(p));
-  }
-
-  @Test
-  void filenameFromPartHandlesEscapedQuoteInsideFilename() {
-    Part p = mock(Part.class);
-    when(p.getHeader("Content-Disposition"))
-        .thenReturn("form-data; name=\"file\"; filename=\"file\\\"name.txt\"");
-    assertEquals("file\"name.txt", PartHelper.filenameFromPart(p));
-  }
-
-  @Test
-  void filenameFromPartHandlesFilenameBeforeOtherParameters() {
-    Part p = mock(Part.class);
-    when(p.getHeader("Content-Disposition"))
-        .thenReturn("form-data; filename=\"first.txt\"; name=\"file\"");
-    assertEquals("first.txt", PartHelper.filenameFromPart(p));
-  }
-
-  // ── charsetFromContentType ──────────────────────────────────────────────────
-
-  @Test
-  void charsetFromContentTypeReturnsUtf8ForNull() {
-    assertEquals(StandardCharsets.UTF_8, PartHelper.charsetFromContentType(null));
-  }
-
-  @Test
-  void charsetFromContentTypeReturnsUtf8WhenNoCharsetParameter() {
-    assertEquals(StandardCharsets.UTF_8, PartHelper.charsetFromContentType("text/plain"));
-  }
-
-  @Test
-  void charsetFromContentTypeParsesUnquotedCharset() {
-    assertEquals(
-        Charset.forName("ISO-8859-1"),
-        PartHelper.charsetFromContentType("text/plain; charset=ISO-8859-1"));
-  }
-
-  @Test
-  void charsetFromContentTypeParsesQuotedCharset() {
-    assertEquals(
-        Charset.forName("ISO-8859-1"),
-        PartHelper.charsetFromContentType("text/plain; charset=\"ISO-8859-1\""));
-  }
-
-  @Test
-  void charsetFromContentTypeIsCaseInsensitive() {
-    assertEquals(
-        StandardCharsets.UTF_16, PartHelper.charsetFromContentType("text/plain; CHARSET=UTF-16"));
-  }
-
-  @Test
-  void charsetFromContentTypeReturnsUtf8ForUnknownCharset() {
-    assertEquals(
-        StandardCharsets.UTF_8,
-        PartHelper.charsetFromContentType("text/plain; charset=not-a-real-charset"));
-  }
-
-  // ── extractFormFields ───────────────────────────────────────────────────────
-
-  @Test
-  void extractFormFieldsReturnsEmptyMapForNull() {
-    assertEquals(Collections.emptyMap(), PartHelper.extractFormFields(null));
-  }
-
-  @Test
-  void extractFormFieldsReturnsEmptyMapForEmpty() {
-    assertEquals(Collections.emptyMap(), PartHelper.extractFormFields(emptyList()));
-  }
-
-  @Test
-  void extractFormFieldsSkipsFileUploadParts() {
-    List<Part> parts = singletonList(filePart("evil.php"));
-    assertEquals(Collections.emptyMap(), PartHelper.extractFormFields(parts));
-  }
-
-  @Test
-  void extractFormFieldsSkipsPartWithEmptyFilename() {
-    List<Part> parts = singletonList(emptyFilenamePart("field"));
-    assertEquals(Collections.emptyMap(), PartHelper.extractFormFields(parts));
-  }
-
-  @Test
-  void extractFilenamesSkipsEmptyFilename() {
-    List<Part> parts = singletonList(emptyFilenamePart("field"));
-    assertEquals(emptyList(), PartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void extractFormFieldsExtractsSingleFormField() throws IOException {
-    List<Part> parts = singletonList(field("username", "alice"));
-    Map<String, List<String>> expected =
-        Collections.singletonMap("username", singletonList("alice"));
-    assertEquals(expected, PartHelper.extractFormFields(parts));
-  }
-
-  @Test
-  void extractFormFieldsGroupsMultipleValuesUnderSameName() throws IOException {
-    List<Part> parts = asList(field("tag", "foo"), field("tag", "bar"));
-    Map<String, List<String>> result = PartHelper.extractFormFields(parts);
-    assertEquals(asList("foo", "bar"), result.get("tag"));
-  }
-
-  @Test
-  void extractFormFieldsMixesFieldsAndSkipsFiles() throws IOException {
-    List<Part> parts = asList(field("a", "x"), filePart("upload.bin"), field("b", "y"));
-    Map<String, List<String>> result = PartHelper.extractFormFields(parts);
-    assertEquals(singletonList("x"), result.get("a"));
-    assertEquals(singletonList("y"), result.get("b"));
-    assertNull(result.get("file"));
-  }
-
-  @Test
-  void extractFormFieldsDecodesFieldUsingContentTypeCharset() throws IOException {
-    byte[] iso88591Bytes = "café".getBytes("ISO-8859-1");
-    List<Part> parts =
-        singletonList(
-            fieldWithContentType("drink", iso88591Bytes, "text/plain; charset=ISO-8859-1"));
-    Map<String, List<String>> result = PartHelper.extractFormFields(parts);
-    assertEquals(singletonList("café"), result.get("drink"));
-  }
-
-  @Test
-  void extractFormFieldsTruncatesFieldExceedingMaxContentBytes() throws IOException {
-    int maxBytes = Config.get().getAppSecMaxFileContentBytes();
-    // ASCII value larger than the cap so byte length == char length and truncation is exact.
-    char[] chars = new char[maxBytes * 2 + 123];
-    fill(chars, 'a');
-    String oversized = new String(chars);
-    List<Part> parts = singletonList(field("big", oversized));
-    Map<String, List<String>> result = PartHelper.extractFormFields(parts);
-    List<String> values = result.get("big");
-    assertEquals(1, values.size());
-    assertEquals(maxBytes, values.get(0).length());
-  }
-
-  @Test
-  void extractFormFieldsCapsAtMaxFileContentCount() throws IOException {
-    int maxFields = Config.get().getAppSecMaxFileContentCount();
-    int count = maxFields + 1;
-    Part[] parts = new Part[count];
-    for (int i = 0; i < count; i++) {
-      parts[i] = field("field" + i, "value" + i);
-    }
-    Map<String, List<String>> result = PartHelper.extractFormFields(asList(parts));
-    assertEquals(maxFields, result.size());
-  }
-
-  // ── extractContents ─────────────────────────────────────────────────────────
-
-  @Test
-  void extractContentsReturnsEmptyListForNull() {
-    assertEquals(emptyList(), PartHelper.extractContents(null));
-  }
-
-  @Test
-  void extractContentsReturnsEmptyListForEmpty() {
-    assertEquals(emptyList(), PartHelper.extractContents(emptyList()));
-  }
-
-  @Test
-  void extractContentsSkipsFormFieldParts() {
-    List<Part> parts = asList(formField("a"), formField("b"));
-    assertEquals(emptyList(), PartHelper.extractContents(parts));
-  }
-
-  @Test
-  void extractContentsIncludesFileWithEmptyFilename() throws IOException {
-    List<Part> parts = singletonList(emptyFilenamePart("upload"));
-    Part p = parts.get(0);
-    when(p.getInputStream())
-        .thenReturn(new ByteArrayInputStream("data".getBytes(StandardCharsets.UTF_8)));
-    when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
-    assertEquals(singletonList("data"), PartHelper.extractContents(parts));
-  }
-
-  @Test
-  void extractContentsReadsFileContent() throws IOException {
-    Part p = filePart("photo.jpg");
-    when(p.getInputStream())
-        .thenReturn(new ByteArrayInputStream("file-content".getBytes(StandardCharsets.UTF_8)));
-    when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
-    assertEquals(singletonList("file-content"), PartHelper.extractContents(singletonList(p)));
-  }
-
-  @Test
-  void extractContentsTruncatesAtMaxContentBytes() throws IOException {
-    byte[] large = new byte[PartHelper.MAX_CONTENT_BYTES + 1];
-    Arrays.fill(large, (byte) 'A');
-    Part p = filePart("big.bin");
-    when(p.getInputStream()).thenReturn(new ByteArrayInputStream(large));
-    when(p.getContentType()).thenReturn(null);
-    List<String> contents = PartHelper.extractContents(singletonList(p));
-    assertEquals(1, contents.size());
-    assertEquals(PartHelper.MAX_CONTENT_BYTES, contents.get(0).length());
-  }
-
-  @Test
-  void extractContentsReturnsEmptyStringOnIOException() throws IOException {
-    Part p = filePart("file.txt");
-    when(p.getInputStream()).thenThrow(new IOException("simulated"));
-    assertEquals(singletonList(""), PartHelper.extractContents(singletonList(p)));
-  }
-
-  @Test
-  void extractContentsCappsAtMaxFilesToInspect() throws IOException {
-    int count = PartHelper.MAX_FILES_TO_INSPECT + 1;
-    List<Part> parts = new ArrayList<>(count);
-    for (int i = 0; i < count; i++) {
-      Part p = filePart("file" + i + ".txt");
-      when(p.getInputStream())
-          .thenReturn(new ByteArrayInputStream("c".getBytes(StandardCharsets.UTF_8)));
-      when(p.getContentType()).thenReturn(null);
-      parts.add(p);
-    }
-    List<String> contents = PartHelper.extractContents(parts);
-    assertEquals(PartHelper.MAX_FILES_TO_INSPECT, contents.size());
-  }
-
-  // ── getAllParts ─────────────────────────────────────────────────────────────
-
-  @Test
-  void getAllPartsReturnsEmptyListWhenBothNull() {
-    assertEquals(emptyList(), PartHelper.getAllParts(null, null));
-  }
-
-  @Test
-  void getAllPartsFallsBackToSingletonWhenMultiPartInputStreamIsNull() {
-    Part part = filePart("evil.php");
-    assertEquals(singletonList(part), PartHelper.getAllParts(null, part));
-  }
-
-  @Test
-  void getAllPartsReturnsAllPartsFromMultiPartInputStream() throws Exception {
-    Part file = filePart("evil.php");
-    Part text = formField("name");
-    MultiPartInputStream mpi = mock(MultiPartInputStream.class);
-    when(mpi.getParts()).thenReturn(asList(file, text));
-    assertEquals(asList(file, text), PartHelper.getAllParts(mpi, null));
-  }
-
-  @Test
-  void getAllPartsPrefersFullCollectionOverSingleton() throws Exception {
-    Part file = filePart("evil.php");
-    Part other = formField("name");
-    MultiPartInputStream mpi = mock(MultiPartInputStream.class);
-    when(mpi.getParts()).thenReturn(asList(file, other));
-    assertEquals(asList(file, other), PartHelper.getAllParts(mpi, file));
-  }
-
-  @Test
-  void getAllPartsFallsBackToSingletonWhenGetPartsThrows() throws Exception {
-    Part part = filePart("fallback.jpg");
-    MultiPartInputStream mpi = mock(MultiPartInputStream.class);
-    when(mpi.getParts()).thenThrow(new IOException("simulated failure"));
-    assertEquals(singletonList(part), PartHelper.getAllParts(mpi, part));
-  }
-
-  // ── helpers ─────────────────────────────────────────────────────────────────
-
-  /** Creates a stub Part that looks like a plain form field (no filename). */
-  private Part field(String name, String value) throws IOException {
-    Part p = mock(Part.class);
-    when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"" + name + "\"");
-    when(p.getName()).thenReturn(name);
-    when(p.getInputStream())
-        .thenReturn(new ByteArrayInputStream(value.getBytes(StandardCharsets.UTF_8)));
-    return p;
-  }
-
-  /** Creates a stub Part with a specific Content-Type (for charset testing). */
-  private Part fieldWithContentType(String name, byte[] rawValue, String contentType)
-      throws IOException {
-    Part p = mock(Part.class);
-    when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"" + name + "\"");
-    when(p.getName()).thenReturn(name);
-    when(p.getContentType()).thenReturn(contentType);
-    when(p.getInputStream()).thenReturn(new ByteArrayInputStream(rawValue));
-    return p;
-  }
-
-  /** Creates a stub Part for extractFilenames/extractFormFields tests that only need the header. */
-  private Part formField(String name) {
-    Part p = mock(Part.class);
-    when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"" + name + "\"");
-    when(p.getName()).thenReturn(name);
-    return p;
-  }
-
-  /** Creates a stub Part that looks like a file upload with the given filename. */
-  private Part filePart(String filename) {
-    Part p = mock(Part.class);
-    when(p.getHeader("Content-Disposition"))
-        .thenReturn("form-data; name=\"file\"; filename=\"" + filename + "\"");
-    return p;
-  }
-
-  /** Creates a stub Part that has filename="" — a file input submitted with no file chosen. */
-  private Part emptyFilenamePart(String name) {
-    Part p = mock(Part.class);
-    when(p.getHeader("Content-Disposition"))
-        .thenReturn("form-data; name=\"" + name + "\"; filename=\"\"");
-    return p;
-  }
+    // ── extractFilenames ────────────────────────────────────────────────────────
+
+    @Test
+    void extractFilenamesReturnsEmptyListForNull() {
+        assertEquals(emptyList(), PartHelper.extractFilenames(null));
+    }
+
+    @Test
+    void extractFilenamesReturnsEmptyListForEmpty() {
+        assertEquals(emptyList(), PartHelper.extractFilenames(emptyList()));
+    }
+
+    @Test
+    void extractFilenamesReturnsEmptyListWhenNoPartsHaveFilename() {
+        List<Part> parts = asList(formField("a"), formField("b"));
+        assertEquals(emptyList(), PartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void extractFilenamesExtractsFilenameFromSingleFilePart() {
+        List<Part> parts = singletonList(filePart("photo.jpg"));
+        assertEquals(singletonList("photo.jpg"), PartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void extractFilenamesExtractsFilenamesFromMultipleFileParts() {
+        List<Part> parts = asList(filePart("a.jpg"), filePart("b.png"), filePart("c.pdf"));
+        assertEquals(asList("a.jpg", "b.png", "c.pdf"), PartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void extractFilenamesSkipsFormFieldPartsAndKeepsFileParts() {
+        List<Part> parts = asList(formField("x"), filePart("upload.zip"), formField("y"));
+        assertEquals(singletonList("upload.zip"), PartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void extractFilenamesPreservesFilenamesWithSpacesAndSpecialCharacters() {
+        List<Part> parts = asList(filePart("my file.tar.gz"), filePart("résumé.pdf"));
+        assertEquals(asList("my file.tar.gz", "résumé.pdf"), PartHelper.extractFilenames(parts));
+    }
+
+    // ── filenameFromPart ────────────────────────────────────────────────────────
+
+    @Test
+    void filenameFromPartReturnsNullWhenContentDispositionHeaderIsAbsent() {
+        Part p = mock(Part.class);
+        when(p.getHeader("Content-Disposition")).thenReturn(null);
+        assertNull(PartHelper.filenameFromPart(p));
+    }
+
+    @Test
+    void filenameFromPartReturnsNullWhenThereIsNoFilenameParameter() {
+        Part p = mock(Part.class);
+        when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"field\"");
+        assertNull(PartHelper.filenameFromPart(p));
+    }
+
+    @Test
+    void filenameFromPartExtractsUnquotedFilename() {
+        Part p = mock(Part.class);
+        when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"file\"; filename=photo.jpg");
+        assertEquals("photo.jpg", PartHelper.filenameFromPart(p));
+    }
+
+    @Test
+    void filenameFromPartStripsQuotesFromFilename() {
+        Part p = mock(Part.class);
+        when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"file\"; filename=\"photo.jpg\"");
+        assertEquals("photo.jpg", PartHelper.filenameFromPart(p));
+    }
+
+    @Test
+    void filenameFromPartReturnsEmptyStringForEmptyQuotedFilename() {
+        Part p = mock(Part.class);
+        when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"file\"; filename=\"\"");
+        assertEquals("", PartHelper.filenameFromPart(p));
+    }
+
+    @Test
+    void filenameFromPartReturnsEmptyStringForEmptyUnquotedFilename() {
+        Part p = mock(Part.class);
+        when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"file\"; filename=");
+        assertEquals("", PartHelper.filenameFromPart(p));
+    }
+
+    @Test
+    void filenameFromPartPreservesSemicolonsInsideQuotedFilename() {
+        Part p = mock(Part.class);
+        when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"file\"; filename=\"shell;evil.php\"");
+        assertEquals("shell;evil.php", PartHelper.filenameFromPart(p));
+    }
+
+    @Test
+    void filenameFromPartHandlesEscapedQuoteInsideFilename() {
+        Part p = mock(Part.class);
+        when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"file\"; filename=\"file\\\"name.txt\"");
+        assertEquals("file\"name.txt", PartHelper.filenameFromPart(p));
+    }
+
+    @Test
+    void filenameFromPartHandlesFilenameBeforeOtherParameters() {
+        Part p = mock(Part.class);
+        when(p.getHeader("Content-Disposition")).thenReturn("form-data; filename=\"first.txt\"; name=\"file\"");
+        assertEquals("first.txt", PartHelper.filenameFromPart(p));
+    }
+
+    // ── charsetFromContentType ──────────────────────────────────────────────────
+
+    @Test
+    void charsetFromContentTypeReturnsUtf8ForNull() {
+        assertEquals(StandardCharsets.UTF_8, PartHelper.charsetFromContentType(null));
+    }
+
+    @Test
+    void charsetFromContentTypeReturnsUtf8WhenNoCharsetParameter() {
+        assertEquals(StandardCharsets.UTF_8, PartHelper.charsetFromContentType("text/plain"));
+    }
+
+    @Test
+    void charsetFromContentTypeParsesUnquotedCharset() {
+        assertEquals(
+                Charset.forName("ISO-8859-1"), PartHelper.charsetFromContentType("text/plain; charset=ISO-8859-1"));
+    }
+
+    @Test
+    void charsetFromContentTypeParsesQuotedCharset() {
+        assertEquals(
+                Charset.forName("ISO-8859-1"), PartHelper.charsetFromContentType("text/plain; charset=\"ISO-8859-1\""));
+    }
+
+    @Test
+    void charsetFromContentTypeIsCaseInsensitive() {
+        assertEquals(StandardCharsets.UTF_16, PartHelper.charsetFromContentType("text/plain; CHARSET=UTF-16"));
+    }
+
+    @Test
+    void charsetFromContentTypeReturnsUtf8ForUnknownCharset() {
+        assertEquals(
+                StandardCharsets.UTF_8, PartHelper.charsetFromContentType("text/plain; charset=not-a-real-charset"));
+    }
+
+    // ── extractFormFields ───────────────────────────────────────────────────────
+
+    @Test
+    void extractFormFieldsReturnsEmptyMapForNull() {
+        assertEquals(Collections.emptyMap(), PartHelper.extractFormFields(null));
+    }
+
+    @Test
+    void extractFormFieldsReturnsEmptyMapForEmpty() {
+        assertEquals(Collections.emptyMap(), PartHelper.extractFormFields(emptyList()));
+    }
+
+    @Test
+    void extractFormFieldsSkipsFileUploadParts() {
+        List<Part> parts = singletonList(filePart("evil.php"));
+        assertEquals(Collections.emptyMap(), PartHelper.extractFormFields(parts));
+    }
+
+    @Test
+    void extractFormFieldsSkipsPartWithEmptyFilename() {
+        List<Part> parts = singletonList(emptyFilenamePart("field"));
+        assertEquals(Collections.emptyMap(), PartHelper.extractFormFields(parts));
+    }
+
+    @Test
+    void extractFilenamesSkipsEmptyFilename() {
+        List<Part> parts = singletonList(emptyFilenamePart("field"));
+        assertEquals(emptyList(), PartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void extractFormFieldsExtractsSingleFormField() throws IOException {
+        List<Part> parts = singletonList(field("username", "alice"));
+        Map<String, List<String>> expected = Collections.singletonMap("username", singletonList("alice"));
+        assertEquals(expected, PartHelper.extractFormFields(parts));
+    }
+
+    @Test
+    void extractFormFieldsGroupsMultipleValuesUnderSameName() throws IOException {
+        List<Part> parts = asList(field("tag", "foo"), field("tag", "bar"));
+        Map<String, List<String>> result = PartHelper.extractFormFields(parts);
+        assertEquals(asList("foo", "bar"), result.get("tag"));
+    }
+
+    @Test
+    void extractFormFieldsMixesFieldsAndSkipsFiles() throws IOException {
+        List<Part> parts = asList(field("a", "x"), filePart("upload.bin"), field("b", "y"));
+        Map<String, List<String>> result = PartHelper.extractFormFields(parts);
+        assertEquals(singletonList("x"), result.get("a"));
+        assertEquals(singletonList("y"), result.get("b"));
+        assertNull(result.get("file"));
+    }
+
+    @Test
+    void extractFormFieldsDecodesFieldUsingContentTypeCharset() throws IOException {
+        byte[] iso88591Bytes = "café".getBytes("ISO-8859-1");
+        List<Part> parts =
+                singletonList(fieldWithContentType("drink", iso88591Bytes, "text/plain; charset=ISO-8859-1"));
+        Map<String, List<String>> result = PartHelper.extractFormFields(parts);
+        assertEquals(singletonList("café"), result.get("drink"));
+    }
+
+    @Test
+    void extractFormFieldsTruncatesFieldExceedingMaxContentBytes() throws IOException {
+        int maxBytes = Config.get().getAppSecMaxFileContentBytes();
+        // ASCII value larger than the cap so byte length == char length and truncation is exact.
+        char[] chars = new char[maxBytes * 2 + 123];
+        fill(chars, 'a');
+        String oversized = new String(chars);
+        List<Part> parts = singletonList(field("big", oversized));
+        Map<String, List<String>> result = PartHelper.extractFormFields(parts);
+        List<String> values = result.get("big");
+        assertEquals(1, values.size());
+        assertEquals(maxBytes, values.get(0).length());
+    }
+
+    @Test
+    void extractFormFieldsCapsAtMaxFileContentCount() throws IOException {
+        int maxFields = Config.get().getAppSecMaxFileContentCount();
+        int count = maxFields + 1;
+        Part[] parts = new Part[count];
+        for (int i = 0; i < count; i++) {
+            parts[i] = field("field" + i, "value" + i);
+        }
+        Map<String, List<String>> result = PartHelper.extractFormFields(asList(parts));
+        assertEquals(maxFields, result.size());
+    }
+
+    // ── extractContents ─────────────────────────────────────────────────────────
+
+    @Test
+    void extractContentsReturnsEmptyListForNull() {
+        assertEquals(emptyList(), PartHelper.extractContents(null));
+    }
+
+    @Test
+    void extractContentsReturnsEmptyListForEmpty() {
+        assertEquals(emptyList(), PartHelper.extractContents(emptyList()));
+    }
+
+    @Test
+    void extractContentsSkipsFormFieldParts() {
+        List<Part> parts = asList(formField("a"), formField("b"));
+        assertEquals(emptyList(), PartHelper.extractContents(parts));
+    }
+
+    @Test
+    void extractContentsIncludesFileWithEmptyFilename() throws IOException {
+        List<Part> parts = singletonList(emptyFilenamePart("upload"));
+        Part p = parts.get(0);
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream("data".getBytes(StandardCharsets.UTF_8)));
+        when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
+        assertEquals(singletonList("data"), PartHelper.extractContents(parts));
+    }
+
+    @Test
+    void extractContentsReadsFileContent() throws IOException {
+        Part p = filePart("photo.jpg");
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream("file-content".getBytes(StandardCharsets.UTF_8)));
+        when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
+        assertEquals(singletonList("file-content"), PartHelper.extractContents(singletonList(p)));
+    }
+
+    @Test
+    void extractContentsTruncatesAtMaxContentBytes() throws IOException {
+        byte[] large = new byte[PartHelper.MAX_CONTENT_BYTES + 1];
+        Arrays.fill(large, (byte) 'A');
+        Part p = filePart("big.bin");
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream(large));
+        when(p.getContentType()).thenReturn(null);
+        List<String> contents = PartHelper.extractContents(singletonList(p));
+        assertEquals(1, contents.size());
+        assertEquals(PartHelper.MAX_CONTENT_BYTES, contents.get(0).length());
+    }
+
+    @Test
+    void extractContentsReturnsEmptyStringOnIOException() throws IOException {
+        Part p = filePart("file.txt");
+        when(p.getInputStream()).thenThrow(new IOException("simulated"));
+        assertEquals(singletonList(""), PartHelper.extractContents(singletonList(p)));
+    }
+
+    @Test
+    void extractContentsCappsAtMaxFilesToInspect() throws IOException {
+        int count = PartHelper.MAX_FILES_TO_INSPECT + 1;
+        List<Part> parts = new ArrayList<>(count);
+        for (int i = 0; i < count; i++) {
+            Part p = filePart("file" + i + ".txt");
+            when(p.getInputStream()).thenReturn(new ByteArrayInputStream("c".getBytes(StandardCharsets.UTF_8)));
+            when(p.getContentType()).thenReturn(null);
+            parts.add(p);
+        }
+        List<String> contents = PartHelper.extractContents(parts);
+        assertEquals(PartHelper.MAX_FILES_TO_INSPECT, contents.size());
+    }
+
+    // ── getAllParts ─────────────────────────────────────────────────────────────
+
+    @Test
+    void getAllPartsReturnsEmptyListWhenBothNull() {
+        assertEquals(emptyList(), PartHelper.getAllParts(null, null));
+    }
+
+    @Test
+    void getAllPartsFallsBackToSingletonWhenMultiPartInputStreamIsNull() {
+        Part part = filePart("evil.php");
+        assertEquals(singletonList(part), PartHelper.getAllParts(null, part));
+    }
+
+    @Test
+    void getAllPartsReturnsAllPartsFromMultiPartInputStream() throws Exception {
+        Part file = filePart("evil.php");
+        Part text = formField("name");
+        MultiPartInputStream mpi = mock(MultiPartInputStream.class);
+        when(mpi.getParts()).thenReturn(asList(file, text));
+        assertEquals(asList(file, text), PartHelper.getAllParts(mpi, null));
+    }
+
+    @Test
+    void getAllPartsPrefersFullCollectionOverSingleton() throws Exception {
+        Part file = filePart("evil.php");
+        Part other = formField("name");
+        MultiPartInputStream mpi = mock(MultiPartInputStream.class);
+        when(mpi.getParts()).thenReturn(asList(file, other));
+        assertEquals(asList(file, other), PartHelper.getAllParts(mpi, file));
+    }
+
+    @Test
+    void getAllPartsFallsBackToSingletonWhenGetPartsThrows() throws Exception {
+        Part part = filePart("fallback.jpg");
+        MultiPartInputStream mpi = mock(MultiPartInputStream.class);
+        when(mpi.getParts()).thenThrow(new IOException("simulated failure"));
+        assertEquals(singletonList(part), PartHelper.getAllParts(mpi, part));
+    }
+
+    // ── helpers ─────────────────────────────────────────────────────────────────
+
+    /** Creates a stub Part that looks like a plain form field (no filename). */
+    private Part field(String name, String value) throws IOException {
+        Part p = mock(Part.class);
+        when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"" + name + "\"");
+        when(p.getName()).thenReturn(name);
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream(value.getBytes(StandardCharsets.UTF_8)));
+        return p;
+    }
+
+    /** Creates a stub Part with a specific Content-Type (for charset testing). */
+    private Part fieldWithContentType(String name, byte[] rawValue, String contentType) throws IOException {
+        Part p = mock(Part.class);
+        when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"" + name + "\"");
+        when(p.getName()).thenReturn(name);
+        when(p.getContentType()).thenReturn(contentType);
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream(rawValue));
+        return p;
+    }
+
+    /** Creates a stub Part for extractFilenames/extractFormFields tests that only need the header. */
+    private Part formField(String name) {
+        Part p = mock(Part.class);
+        when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"" + name + "\"");
+        when(p.getName()).thenReturn(name);
+        return p;
+    }
+
+    /** Creates a stub Part that looks like a file upload with the given filename. */
+    private Part filePart(String filename) {
+        Part p = mock(Part.class);
+        when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"file\"; filename=\"" + filename + "\"");
+        return p;
+    }
+
+    /** Creates a stub Part that has filename="" — a file input submitted with no file chosen. */
+    private Part emptyFilenamePart(String name) {
+        Part p = mock(Part.class);
+        when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"" + name + "\"; filename=\"\"");
+        return p;
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/MultipartHelper.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/MultipartHelper.java
index 902db2d493a..36d18e343c6 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/MultipartHelper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/MultipartHelper.java
@@ -24,134 +24,130 @@
 
 public class MultipartHelper {
 
-  public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
-  public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
+    public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
+    public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
 
-  private static final Logger log = LoggerFactory.getLogger(MultipartHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(MultipartHelper.class);
 
-  private MultipartHelper() {}
+    private MultipartHelper() {}
 
-  /**
-   * Extracts non-null, non-empty filenames from a collection of multipart {@link Part}s using
-   * {@link Part#getSubmittedFileName()} (Servlet 3.1+, Jetty 9.2.x).
-   *
-   * @return list of filenames; never {@code null}, may be empty
-   */
-  public static List<String> extractFilenames(Collection<Part> parts) {
-    if (parts == null || parts.isEmpty()) {
-      return Collections.emptyList();
-    }
-    List<String> filenames = new ArrayList<>(parts.size());
-    for (Part part : parts) {
-      try {
-        String name = part.getSubmittedFileName();
-        if (name != null && !name.isEmpty()) {
-          filenames.add(name);
+    /**
+     * Extracts non-null, non-empty filenames from a collection of multipart {@link Part}s using
+     * {@link Part#getSubmittedFileName()} (Servlet 3.1+, Jetty 9.2.x).
+     *
+     * @return list of filenames; never {@code null}, may be empty
+     */
+    public static List<String> extractFilenames(Collection<Part> parts) {
+        if (parts == null || parts.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<String> filenames = new ArrayList<>(parts.size());
+        for (Part part : parts) {
+            try {
+                String name = part.getSubmittedFileName();
+                if (name != null && !name.isEmpty()) {
+                    filenames.add(name);
+                }
+            } catch (Exception ignored) {
+                // malformed or inaccessible part — skip and continue with remaining parts
+                log.debug(EXCLUDE_TELEMETRY, "extractFilenames: skipping malformed part", ignored);
+            }
         }
-      } catch (Exception ignored) {
-        // malformed or inaccessible part — skip and continue with remaining parts
-        log.debug(EXCLUDE_TELEMETRY, "extractFilenames: skipping malformed part", ignored);
-      }
+        return filenames;
     }
-    return filenames;
-  }
 
-  /**
-   * Extracts file content from a collection of multipart {@link Part}s. Form fields (those with a
-   * {@code null} submitted filename) are skipped. Reads up to {@link #MAX_CONTENT_BYTES} bytes per
-   * part, up to {@link #MAX_FILES_TO_INSPECT} parts total.
-   *
-   * @return list of decoded content strings; never {@code null}, may be empty
-   */
-  public static List<String> extractContents(Collection<Part> parts) {
-    if (parts == null || parts.isEmpty()) {
-      return Collections.emptyList();
-    }
-    List<String> contents = new ArrayList<>(Math.min(parts.size(), MAX_FILES_TO_INSPECT));
-    for (Part part : parts) {
-      if (contents.size() >= MAX_FILES_TO_INSPECT) {
-        break;
-      }
-      try {
-        if (part.getSubmittedFileName() == null) {
-          continue; // form field — skip
+    /**
+     * Extracts file content from a collection of multipart {@link Part}s. Form fields (those with a
+     * {@code null} submitted filename) are skipped. Reads up to {@link #MAX_CONTENT_BYTES} bytes per
+     * part, up to {@link #MAX_FILES_TO_INSPECT} parts total.
+     *
+     * @return list of decoded content strings; never {@code null}, may be empty
+     */
+    public static List<String> extractContents(Collection<Part> parts) {
+        if (parts == null || parts.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<String> contents = new ArrayList<>(Math.min(parts.size(), MAX_FILES_TO_INSPECT));
+        for (Part part : parts) {
+            if (contents.size() >= MAX_FILES_TO_INSPECT) {
+                break;
+            }
+            try {
+                if (part.getSubmittedFileName() == null) {
+                    continue; // form field — skip
+                }
+                contents.add(readFileContent(part));
+            } catch (Exception ignored) {
+                log.debug(EXCLUDE_TELEMETRY, "extractContents: skipping malformed part", ignored);
+            }
         }
-        contents.add(readFileContent(part));
-      } catch (Exception ignored) {
-        log.debug(EXCLUDE_TELEMETRY, "extractContents: skipping malformed part", ignored);
-      }
+        return contents;
     }
-    return contents;
-  }
 
-  private static String readFileContent(Part part) {
-    try (InputStream is = part.getInputStream()) {
-      return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, part.getContentType());
-    } catch (Exception e) {
-      log.debug(EXCLUDE_TELEMETRY, "readFileContent: stream read failed", e);
-      return "";
+    private static String readFileContent(Part part) {
+        try (InputStream is = part.getInputStream()) {
+            return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, part.getContentType());
+        } catch (Exception e) {
+            log.debug(EXCLUDE_TELEMETRY, "readFileContent: stream read failed", e);
+            return "";
+        }
     }
-  }
 
-  /**
-   * Fires the {@code requestFilesContent} IG event and returns a {@link BlockingException} if the
-   * WAF requests blocking, or {@code null} otherwise.
-   */
-  public static BlockingException fireFilesContentEvent(
-      Collection<Part> parts, RequestContext reqCtx) {
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestFilesContent());
-    if (callback == null) {
-      return null;
-    }
-    List<String> contents = extractContents(parts);
-    if (contents.isEmpty()) {
-      return null;
-    }
-    Flow<Void> flow = callback.apply(reqCtx, contents);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
-          reqCtx.getTraceSegment().effectivelyBlocked();
-          return new BlockingException("Blocked request (multipart file content)");
+    /**
+     * Fires the {@code requestFilesContent} IG event and returns a {@link BlockingException} if the
+     * WAF requests blocking, or {@code null} otherwise.
+     */
+    public static BlockingException fireFilesContentEvent(Collection<Part> parts, RequestContext reqCtx) {
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> callback = cbp.getCallback(EVENTS.requestFilesContent());
+        if (callback == null) {
+            return null;
         }
-      }
+        List<String> contents = extractContents(parts);
+        if (contents.isEmpty()) {
+            return null;
+        }
+        Flow<Void> flow = callback.apply(reqCtx, contents);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                    return new BlockingException("Blocked request (multipart file content)");
+                }
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  /**
-   * Fires the {@code requestFilesFilenames} IG event and returns a {@link BlockingException} if the
-   * WAF requests blocking, or {@code null} otherwise.
-   */
-  public static BlockingException fireFilenamesEvent(
-      Collection<Part> parts, RequestContext reqCtx) {
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestFilesFilenames());
-    if (callback == null) {
-      return null;
-    }
-    List<String> filenames = extractFilenames(parts);
-    if (filenames.isEmpty()) {
-      return null;
-    }
-    Flow<Void> flow = callback.apply(reqCtx, filenames);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
-          reqCtx.getTraceSegment().effectivelyBlocked();
-          return new BlockingException("Blocked request (multipart file upload)");
+    /**
+     * Fires the {@code requestFilesFilenames} IG event and returns a {@link BlockingException} if the
+     * WAF requests blocking, or {@code null} otherwise.
+     */
+    public static BlockingException fireFilenamesEvent(Collection<Part> parts, RequestContext reqCtx) {
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> callback = cbp.getCallback(EVENTS.requestFilesFilenames());
+        if (callback == null) {
+            return null;
+        }
+        List<String> filenames = extractFilenames(parts);
+        if (filenames.isEmpty()) {
+            return null;
+        }
+        Flow<Void> flow = callback.apply(reqCtx, filenames);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                    return new BlockingException("Blocked request (multipart file upload)");
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java
index 69b9a4591a5..841b57b6412 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java
@@ -28,188 +28,184 @@
 
 @AutoService(InstrumenterModule.class)
 public class RequestExtractContentParametersInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  private static final String MULTI_MAP_INTERNAL_NAME = "Lorg/eclipse/jetty/util/MultiMap;";
-
-  public RequestExtractContentParametersInstrumentation() {
-    super("jetty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.Request";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("extractContentParameters").and(takesArguments(0)),
-        getClass().getName() + "$ExtractContentParametersAdvice");
-    transformer.applyAdvice(
-        named("getParts")
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("org.eclipse.jetty.util.MultiMap"))),
-        getClass().getName() + "$GetPartsAdvice");
-    transformer.applyAdvice(
-        named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice");
-    transformer.applyAdvice(
-        named("getParts").and(takesArguments(1)),
-        getClass().getName() + "$GetFilenamesFromMultiPartAdvice");
-  }
-
-  private static final Reference REQUEST_REFERENCE =
-      new Reference.Builder("org.eclipse.jetty.server.Request")
-          .withMethod(new String[0], 0, "extractContentParameters", MULTI_MAP_INTERNAL_NAME)
-          .withField(new String[0], 0, "_contentParameters", MULTI_MAP_INTERNAL_NAME)
-          .build();
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {REQUEST_REFERENCE};
-  }
-
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class ExtractContentParametersAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return MultiMap<String> map,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (map == null || map.isEmpty() || t != null) {
-        return;
-      }
-
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
-      Flow<Void> flow = callback.apply(reqCtx, map);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-          t = new BlockingException("Blocked request (for Request/extractContentParameters)");
-          reqCtx.getTraceSegment().effectivelyBlocked();
-        }
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    private static final String MULTI_MAP_INTERNAL_NAME = "Lorg/eclipse/jetty/util/MultiMap;";
+
+    public RequestExtractContentParametersInstrumentation() {
+        super("jetty");
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class GetPartsAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean before(@Advice.FieldValue("_contentParameters") final MultiMap<String> map) {
-      return map == null;
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.Request";
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean proceed,
-        @Advice.FieldValue("_contentParameters") final MultiMap<String> map,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (!proceed) {
-        return;
-      }
-      if (map == null || map.isEmpty()) {
-        return;
-      }
-
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
-
-      Flow<Void> flow = callback.apply(reqCtx, map);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-          if (t == null) {
-            t = new BlockingException("Blocked request (for Request/getParts)");
-            reqCtx.getTraceSegment().effectivelyBlocked();
-          }
-        }
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("extractContentParameters").and(takesArguments(0)),
+                getClass().getName() + "$ExtractContentParametersAdvice");
+        transformer.applyAdvice(
+                named("getParts")
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("org.eclipse.jetty.util.MultiMap"))),
+                getClass().getName() + "$GetPartsAdvice");
+        transformer.applyAdvice(
+                named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice");
+        transformer.applyAdvice(
+                named("getParts").and(takesArguments(1)), getClass().getName() + "$GetFilenamesFromMultiPartAdvice");
     }
-  }
-
-  /**
-   * Fires the {@code requestFilesFilenames} event when the application calls public {@code
-   * getParts()}. Guards prevent double-firing:
-   *
-   * <ul>
-   *   <li>{@code _contentParameters != null}: set by {@code extractContentParameters()} (the {@code
-   *       getParameterMap()} path); means filenames were already reported via {@code
-   *       GetFilenamesFromMultiPartAdvice}.
-   *   <li>{@code _multiPartInputStream != null}: set by the first {@code getParts()} call in Jetty
-   *       9.2.x; means filenames were already reported.
-   * </ul>
-   */
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class GetFilenamesAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean before(
-        @Advice.FieldValue("_contentParameters") final MultiMap<String> contentParameters,
-        @Advice.FieldValue(value = "_multiPartInputStream", typing = Assigner.Typing.DYNAMIC)
-            final Object multiPartInputStream) {
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class);
-      return callDepth == 0 && contentParameters == null && multiPartInputStream == null;
+
+    private static final Reference REQUEST_REFERENCE = new Reference.Builder("org.eclipse.jetty.server.Request")
+            .withMethod(new String[0], 0, "extractContentParameters", MULTI_MAP_INTERNAL_NAME)
+            .withField(new String[0], 0, "_contentParameters", MULTI_MAP_INTERNAL_NAME)
+            .build();
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {REQUEST_REFERENCE};
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean proceed,
-        @Advice.Return Collection<Part> parts,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class);
-      if (!proceed || t != null || parts == null || parts.isEmpty()) {
-        return;
-      }
-      t = MultipartHelper.fireFilenamesEvent(parts, reqCtx);
-      if (t == null) {
-        t = MultipartHelper.fireFilesContentEvent(parts, reqCtx);
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class ExtractContentParametersAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Return MultiMap<String> map,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (map == null || map.isEmpty() || t != null) {
+                return;
+            }
+
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
+            Flow<Void> flow = callback.apply(reqCtx, map);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                    t = new BlockingException("Blocked request (for Request/extractContentParameters)");
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                }
+            }
+        }
+    }
+
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class GetPartsAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean before(@Advice.FieldValue("_contentParameters") final MultiMap<String> map) {
+            return map == null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter boolean proceed,
+                @Advice.FieldValue("_contentParameters") final MultiMap<String> map,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (!proceed) {
+                return;
+            }
+            if (map == null || map.isEmpty()) {
+                return;
+            }
+
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
+
+            Flow<Void> flow = callback.apply(reqCtx, map);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                    if (t == null) {
+                        t = new BlockingException("Blocked request (for Request/getParts)");
+                        reqCtx.getTraceSegment().effectivelyBlocked();
+                    }
+                }
+            }
+        }
     }
-  }
-
-  /**
-   * Fires the {@code requestFilesFilenames} event when multipart content is parsed via the internal
-   * {@code getParts(MultiMap)} path triggered by {@code getParameter*()} / {@code
-   * getParameterMap()} — i.e. when the application never calls public {@code getParts()}. The
-   * call-depth guard prevents double-firing when {@code getParts()} internally delegates to this
-   * method.
-   */
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class GetFilenamesFromMultiPartAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean before() {
-      return CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class) == 0;
+
+    /**
+     * Fires the {@code requestFilesFilenames} event when the application calls public {@code
+     * getParts()}. Guards prevent double-firing:
+     *
+     * <ul>
+     *   <li>{@code _contentParameters != null}: set by {@code extractContentParameters()} (the {@code
+     *       getParameterMap()} path); means filenames were already reported via {@code
+     *       GetFilenamesFromMultiPartAdvice}.
+     *   <li>{@code _multiPartInputStream != null}: set by the first {@code getParts()} call in Jetty
+     *       9.2.x; means filenames were already reported.
+     * </ul>
+     */
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class GetFilenamesAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean before(
+                @Advice.FieldValue("_contentParameters") final MultiMap<String> contentParameters,
+                @Advice.FieldValue(value = "_multiPartInputStream", typing = Assigner.Typing.DYNAMIC)
+                        final Object multiPartInputStream) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class);
+            return callDepth == 0 && contentParameters == null && multiPartInputStream == null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter boolean proceed,
+                @Advice.Return Collection<Part> parts,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class);
+            if (!proceed || t != null || parts == null || parts.isEmpty()) {
+                return;
+            }
+            t = MultipartHelper.fireFilenamesEvent(parts, reqCtx);
+            if (t == null) {
+                t = MultipartHelper.fireFilesContentEvent(parts, reqCtx);
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean proceed,
-        @Advice.Return Collection<Part> parts,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class);
-      if (!proceed || t != null || parts == null || parts.isEmpty()) {
-        return;
-      }
-      t = MultipartHelper.fireFilenamesEvent(parts, reqCtx);
-      if (t == null) {
-        t = MultipartHelper.fireFilesContentEvent(parts, reqCtx);
-      }
+    /**
+     * Fires the {@code requestFilesFilenames} event when multipart content is parsed via the internal
+     * {@code getParts(MultiMap)} path triggered by {@code getParameter*()} / {@code
+     * getParameterMap()} — i.e. when the application never calls public {@code getParts()}. The
+     * call-depth guard prevents double-firing when {@code getParts()} internally delegates to this
+     * method.
+     */
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class GetFilenamesFromMultiPartAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean before() {
+            return CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class) == 0;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter boolean proceed,
+                @Advice.Return Collection<Part> parts,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class);
+            if (!proceed || t != null || parts == null || parts.isEmpty()) {
+                return;
+            }
+            t = MultipartHelper.fireFilenamesEvent(parts, reqCtx);
+            if (t == null) {
+                t = MultipartHelper.fireFilesContentEvent(parts, reqCtx);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/test/java/datadog/trace/instrumentation/jetty92/MultipartHelperTest.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/test/java/datadog/trace/instrumentation/jetty92/MultipartHelperTest.java
index 376e1bd6305..5e10f918668 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/test/java/datadog/trace/instrumentation/jetty92/MultipartHelperTest.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/test/java/datadog/trace/instrumentation/jetty92/MultipartHelperTest.java
@@ -18,130 +18,127 @@
 
 class MultipartHelperTest {
 
-  @Test
-  void returnsEmptyListForNull() {
-    assertEquals(emptyList(), MultipartHelper.extractFilenames(null));
-  }
-
-  @Test
-  void returnsEmptyListForEmpty() {
-    assertEquals(emptyList(), MultipartHelper.extractFilenames(emptyList()));
-  }
-
-  @Test
-  void returnsEmptyListWhenAllPartsHaveNullFilename() {
-    List<Part> parts = asList(part(null), part(null));
-    assertEquals(emptyList(), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void returnsEmptyListWhenAllPartsHaveEmptyFilename() {
-    List<Part> parts = asList(part(""), part(""));
-    assertEquals(emptyList(), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void extractsFilenameFromSinglePart() {
-    List<Part> parts = singletonList(part("photo.jpg"));
-    assertEquals(singletonList("photo.jpg"), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void extractsFilenamesFromMultipleParts() {
-    List<Part> parts = asList(part("a.jpg"), part("b.png"), part("c.pdf"));
-    assertEquals(asList("a.jpg", "b.png", "c.pdf"), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void skipsPartsWithNullOrEmptyFilenameAndKeepsValid() {
-    List<Part> parts = asList(part(null), part("valid.txt"), part(""), part("other.zip"));
-    assertEquals(asList("valid.txt", "other.zip"), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void preservesFilenamesWithSpacesAndSpecialCharacters() {
-    List<Part> parts = asList(part("my file.tar.gz"), part("résumé.pdf"));
-    assertEquals(asList("my file.tar.gz", "résumé.pdf"), MultipartHelper.extractFilenames(parts));
-  }
-
-  private Part part(String submittedFileName) {
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn(submittedFileName);
-    return p;
-  }
-
-  // ── extractContents ─────────────────────────────────────────────────────────
-
-  @Test
-  void extractContentsReturnsEmptyListForNull() {
-    assertEquals(emptyList(), MultipartHelper.extractContents(null));
-  }
-
-  @Test
-  void extractContentsReturnsEmptyListForEmpty() {
-    assertEquals(emptyList(), MultipartHelper.extractContents(emptyList()));
-  }
-
-  @Test
-  void extractContentsSkipsFormFieldParts() {
-    List<Part> parts = asList(part(null), part(null));
-    assertEquals(emptyList(), MultipartHelper.extractContents(parts));
-  }
-
-  @Test
-  void extractContentsIncludesFileWithEmptyFilename() throws IOException {
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn("");
-    when(p.getInputStream())
-        .thenReturn(new ByteArrayInputStream("data".getBytes(StandardCharsets.UTF_8)));
-    when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
-    assertEquals(singletonList("data"), MultipartHelper.extractContents(singletonList(p)));
-  }
-
-  @Test
-  void extractContentsReadsFileContent() throws IOException {
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn("photo.jpg");
-    when(p.getInputStream())
-        .thenReturn(new ByteArrayInputStream("file-content".getBytes(StandardCharsets.UTF_8)));
-    when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
-    assertEquals(singletonList("file-content"), MultipartHelper.extractContents(singletonList(p)));
-  }
-
-  @Test
-  void extractContentsTruncatesAtMaxContentBytes() throws IOException {
-    byte[] large = new byte[MultipartHelper.MAX_CONTENT_BYTES + 1];
-    Arrays.fill(large, (byte) 'A');
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn("big.bin");
-    when(p.getInputStream()).thenReturn(new ByteArrayInputStream(large));
-    when(p.getContentType()).thenReturn(null);
-    List<String> contents = MultipartHelper.extractContents(singletonList(p));
-    assertEquals(1, contents.size());
-    assertEquals(MultipartHelper.MAX_CONTENT_BYTES, contents.get(0).length());
-  }
-
-  @Test
-  void extractContentsReturnsEmptyStringOnIOException() throws IOException {
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn("file.txt");
-    when(p.getInputStream()).thenThrow(new IOException("simulated"));
-    assertEquals(singletonList(""), MultipartHelper.extractContents(singletonList(p)));
-  }
-
-  @Test
-  void extractContentsCappsAtMaxFilesToInspect() throws IOException {
-    int count = MultipartHelper.MAX_FILES_TO_INSPECT + 1;
-    List<Part> parts = new ArrayList<>(count);
-    for (int i = 0; i < count; i++) {
-      Part p = mock(Part.class);
-      when(p.getSubmittedFileName()).thenReturn("file" + i + ".txt");
-      when(p.getInputStream())
-          .thenReturn(new ByteArrayInputStream("c".getBytes(StandardCharsets.UTF_8)));
-      when(p.getContentType()).thenReturn(null);
-      parts.add(p);
-    }
-    List<String> contents = MultipartHelper.extractContents(parts);
-    assertEquals(MultipartHelper.MAX_FILES_TO_INSPECT, contents.size());
-  }
+    @Test
+    void returnsEmptyListForNull() {
+        assertEquals(emptyList(), MultipartHelper.extractFilenames(null));
+    }
+
+    @Test
+    void returnsEmptyListForEmpty() {
+        assertEquals(emptyList(), MultipartHelper.extractFilenames(emptyList()));
+    }
+
+    @Test
+    void returnsEmptyListWhenAllPartsHaveNullFilename() {
+        List<Part> parts = asList(part(null), part(null));
+        assertEquals(emptyList(), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void returnsEmptyListWhenAllPartsHaveEmptyFilename() {
+        List<Part> parts = asList(part(""), part(""));
+        assertEquals(emptyList(), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void extractsFilenameFromSinglePart() {
+        List<Part> parts = singletonList(part("photo.jpg"));
+        assertEquals(singletonList("photo.jpg"), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void extractsFilenamesFromMultipleParts() {
+        List<Part> parts = asList(part("a.jpg"), part("b.png"), part("c.pdf"));
+        assertEquals(asList("a.jpg", "b.png", "c.pdf"), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void skipsPartsWithNullOrEmptyFilenameAndKeepsValid() {
+        List<Part> parts = asList(part(null), part("valid.txt"), part(""), part("other.zip"));
+        assertEquals(asList("valid.txt", "other.zip"), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void preservesFilenamesWithSpacesAndSpecialCharacters() {
+        List<Part> parts = asList(part("my file.tar.gz"), part("résumé.pdf"));
+        assertEquals(asList("my file.tar.gz", "résumé.pdf"), MultipartHelper.extractFilenames(parts));
+    }
+
+    private Part part(String submittedFileName) {
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn(submittedFileName);
+        return p;
+    }
+
+    // ── extractContents ─────────────────────────────────────────────────────────
+
+    @Test
+    void extractContentsReturnsEmptyListForNull() {
+        assertEquals(emptyList(), MultipartHelper.extractContents(null));
+    }
+
+    @Test
+    void extractContentsReturnsEmptyListForEmpty() {
+        assertEquals(emptyList(), MultipartHelper.extractContents(emptyList()));
+    }
+
+    @Test
+    void extractContentsSkipsFormFieldParts() {
+        List<Part> parts = asList(part(null), part(null));
+        assertEquals(emptyList(), MultipartHelper.extractContents(parts));
+    }
+
+    @Test
+    void extractContentsIncludesFileWithEmptyFilename() throws IOException {
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn("");
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream("data".getBytes(StandardCharsets.UTF_8)));
+        when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
+        assertEquals(singletonList("data"), MultipartHelper.extractContents(singletonList(p)));
+    }
+
+    @Test
+    void extractContentsReadsFileContent() throws IOException {
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn("photo.jpg");
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream("file-content".getBytes(StandardCharsets.UTF_8)));
+        when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
+        assertEquals(singletonList("file-content"), MultipartHelper.extractContents(singletonList(p)));
+    }
+
+    @Test
+    void extractContentsTruncatesAtMaxContentBytes() throws IOException {
+        byte[] large = new byte[MultipartHelper.MAX_CONTENT_BYTES + 1];
+        Arrays.fill(large, (byte) 'A');
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn("big.bin");
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream(large));
+        when(p.getContentType()).thenReturn(null);
+        List<String> contents = MultipartHelper.extractContents(singletonList(p));
+        assertEquals(1, contents.size());
+        assertEquals(MultipartHelper.MAX_CONTENT_BYTES, contents.get(0).length());
+    }
+
+    @Test
+    void extractContentsReturnsEmptyStringOnIOException() throws IOException {
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn("file.txt");
+        when(p.getInputStream()).thenThrow(new IOException("simulated"));
+        assertEquals(singletonList(""), MultipartHelper.extractContents(singletonList(p)));
+    }
+
+    @Test
+    void extractContentsCappsAtMaxFilesToInspect() throws IOException {
+        int count = MultipartHelper.MAX_FILES_TO_INSPECT + 1;
+        List<Part> parts = new ArrayList<>(count);
+        for (int i = 0; i < count; i++) {
+            Part p = mock(Part.class);
+            when(p.getSubmittedFileName()).thenReturn("file" + i + ".txt");
+            when(p.getInputStream()).thenReturn(new ByteArrayInputStream("c".getBytes(StandardCharsets.UTF_8)));
+            when(p.getContentType()).thenReturn(null);
+            parts.add(p);
+        }
+        List<String> contents = MultipartHelper.extractContents(parts);
+        assertEquals(MultipartHelper.MAX_FILES_TO_INSPECT, contents.size());
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/MultipartHelper.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/MultipartHelper.java
index d223d15b519..8a90acaebbb 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/MultipartHelper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/MultipartHelper.java
@@ -24,134 +24,130 @@
 
 public class MultipartHelper {
 
-  public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
-  public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
+    public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
+    public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
 
-  private static final Logger log = LoggerFactory.getLogger(MultipartHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(MultipartHelper.class);
 
-  private MultipartHelper() {}
+    private MultipartHelper() {}
 
-  /**
-   * Extracts non-null, non-empty filenames from a collection of multipart {@link Part}s using
-   * {@link Part#getSubmittedFileName()} (Servlet 3.1+, Jetty 9.3.x).
-   *
-   * @return list of filenames; never {@code null}, may be empty
-   */
-  public static List<String> extractFilenames(Collection<Part> parts) {
-    if (parts == null || parts.isEmpty()) {
-      return Collections.emptyList();
-    }
-    List<String> filenames = new ArrayList<>(parts.size());
-    for (Part part : parts) {
-      try {
-        String name = part.getSubmittedFileName();
-        if (name != null && !name.isEmpty()) {
-          filenames.add(name);
+    /**
+     * Extracts non-null, non-empty filenames from a collection of multipart {@link Part}s using
+     * {@link Part#getSubmittedFileName()} (Servlet 3.1+, Jetty 9.3.x).
+     *
+     * @return list of filenames; never {@code null}, may be empty
+     */
+    public static List<String> extractFilenames(Collection<Part> parts) {
+        if (parts == null || parts.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<String> filenames = new ArrayList<>(parts.size());
+        for (Part part : parts) {
+            try {
+                String name = part.getSubmittedFileName();
+                if (name != null && !name.isEmpty()) {
+                    filenames.add(name);
+                }
+            } catch (Exception ignored) {
+                // malformed or inaccessible part — skip and continue with remaining parts
+                log.debug(EXCLUDE_TELEMETRY, "extractFilenames: skipping malformed part", ignored);
+            }
         }
-      } catch (Exception ignored) {
-        // malformed or inaccessible part — skip and continue with remaining parts
-        log.debug(EXCLUDE_TELEMETRY, "extractFilenames: skipping malformed part", ignored);
-      }
+        return filenames;
     }
-    return filenames;
-  }
 
-  /**
-   * Extracts file content from a collection of multipart {@link Part}s. Form fields (those with a
-   * {@code null} submitted filename) are skipped. Reads up to {@link #MAX_CONTENT_BYTES} bytes per
-   * part, up to {@link #MAX_FILES_TO_INSPECT} parts total.
-   *
-   * @return list of decoded content strings; never {@code null}, may be empty
-   */
-  public static List<String> extractContents(Collection<Part> parts) {
-    if (parts == null || parts.isEmpty()) {
-      return Collections.emptyList();
-    }
-    List<String> contents = new ArrayList<>(Math.min(parts.size(), MAX_FILES_TO_INSPECT));
-    for (Part part : parts) {
-      if (contents.size() >= MAX_FILES_TO_INSPECT) {
-        break;
-      }
-      try {
-        if (part.getSubmittedFileName() == null) {
-          continue; // form field — skip
+    /**
+     * Extracts file content from a collection of multipart {@link Part}s. Form fields (those with a
+     * {@code null} submitted filename) are skipped. Reads up to {@link #MAX_CONTENT_BYTES} bytes per
+     * part, up to {@link #MAX_FILES_TO_INSPECT} parts total.
+     *
+     * @return list of decoded content strings; never {@code null}, may be empty
+     */
+    public static List<String> extractContents(Collection<Part> parts) {
+        if (parts == null || parts.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<String> contents = new ArrayList<>(Math.min(parts.size(), MAX_FILES_TO_INSPECT));
+        for (Part part : parts) {
+            if (contents.size() >= MAX_FILES_TO_INSPECT) {
+                break;
+            }
+            try {
+                if (part.getSubmittedFileName() == null) {
+                    continue; // form field — skip
+                }
+                contents.add(readFileContent(part));
+            } catch (Exception ignored) {
+                log.debug(EXCLUDE_TELEMETRY, "extractContents: skipping malformed part", ignored);
+            }
         }
-        contents.add(readFileContent(part));
-      } catch (Exception ignored) {
-        log.debug(EXCLUDE_TELEMETRY, "extractContents: skipping malformed part", ignored);
-      }
+        return contents;
     }
-    return contents;
-  }
 
-  private static String readFileContent(Part part) {
-    try (InputStream is = part.getInputStream()) {
-      return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, part.getContentType());
-    } catch (Exception e) {
-      log.debug(EXCLUDE_TELEMETRY, "readFileContent: stream read failed", e);
-      return "";
+    private static String readFileContent(Part part) {
+        try (InputStream is = part.getInputStream()) {
+            return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, part.getContentType());
+        } catch (Exception e) {
+            log.debug(EXCLUDE_TELEMETRY, "readFileContent: stream read failed", e);
+            return "";
+        }
     }
-  }
 
-  /**
-   * Fires the {@code requestFilesContent} IG event and returns a {@link BlockingException} if the
-   * WAF requests blocking, or {@code null} otherwise.
-   */
-  public static BlockingException fireFilesContentEvent(
-      Collection<Part> parts, RequestContext reqCtx) {
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestFilesContent());
-    if (callback == null) {
-      return null;
-    }
-    List<String> contents = extractContents(parts);
-    if (contents.isEmpty()) {
-      return null;
-    }
-    Flow<Void> flow = callback.apply(reqCtx, contents);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
-          reqCtx.getTraceSegment().effectivelyBlocked();
-          return new BlockingException("Blocked request (multipart file content)");
+    /**
+     * Fires the {@code requestFilesContent} IG event and returns a {@link BlockingException} if the
+     * WAF requests blocking, or {@code null} otherwise.
+     */
+    public static BlockingException fireFilesContentEvent(Collection<Part> parts, RequestContext reqCtx) {
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> callback = cbp.getCallback(EVENTS.requestFilesContent());
+        if (callback == null) {
+            return null;
         }
-      }
+        List<String> contents = extractContents(parts);
+        if (contents.isEmpty()) {
+            return null;
+        }
+        Flow<Void> flow = callback.apply(reqCtx, contents);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                    return new BlockingException("Blocked request (multipart file content)");
+                }
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  /**
-   * Fires the {@code requestFilesFilenames} IG event and returns a {@link BlockingException} if the
-   * WAF requests blocking, or {@code null} otherwise.
-   */
-  public static BlockingException fireFilenamesEvent(
-      Collection<Part> parts, RequestContext reqCtx) {
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestFilesFilenames());
-    if (callback == null) {
-      return null;
-    }
-    List<String> filenames = extractFilenames(parts);
-    if (filenames.isEmpty()) {
-      return null;
-    }
-    Flow<Void> flow = callback.apply(reqCtx, filenames);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
-          reqCtx.getTraceSegment().effectivelyBlocked();
-          return new BlockingException("Blocked request (multipart file upload)");
+    /**
+     * Fires the {@code requestFilesFilenames} IG event and returns a {@link BlockingException} if the
+     * WAF requests blocking, or {@code null} otherwise.
+     */
+    public static BlockingException fireFilenamesEvent(Collection<Part> parts, RequestContext reqCtx) {
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> callback = cbp.getCallback(EVENTS.requestFilesFilenames());
+        if (callback == null) {
+            return null;
+        }
+        List<String> filenames = extractFilenames(parts);
+        if (filenames.isEmpty()) {
+            return null;
+        }
+        Flow<Void> flow = callback.apply(reqCtx, filenames);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                    return new BlockingException("Blocked request (multipart file upload)");
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java
index 09292b7611e..2896298b7b1 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java
@@ -28,164 +28,157 @@
 
 @AutoService(InstrumenterModule.class)
 public class RequestExtractContentParametersInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  private static final String MULTI_MAP_INTERNAL_NAME = "Lorg/eclipse/jetty/util/MultiMap;";
-
-  public RequestExtractContentParametersInstrumentation() {
-    super("jetty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.Request";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("extractContentParameters").and(takesArguments(0)).or(named("getParts")),
-        getClass().getName() + "$ExtractContentParametersAdvice");
-    transformer.applyAdvice(
-        named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice");
-    transformer.applyAdvice(
-        named("getParts").and(takesArguments(1)),
-        getClass().getName() + "$GetFilenamesFromMultiPartAdvice");
-  }
-
-  // Discriminates Jetty 9.3.x–9.4.9.x ([9.3, 9.4.10)):
-  //  - _contentParameters + extractContentParameters(void) exist from 9.3+ (excludes 9.2)
-  //  - _multiPartInputStream exists in 9.3.x and early 9.4.x (< 9.4.10); replaced by _multiParts
-  //    in 9.4.10 (covered by jetty-appsec-9.4)
-  private static final Reference REQUEST_REFERENCE =
-      new Reference.Builder("org.eclipse.jetty.server.Request")
-          .withMethod(new String[0], 0, "extractContentParameters", "V")
-          .withField(new String[0], 0, "_contentParameters", MULTI_MAP_INTERNAL_NAME)
-          .withField(
-              new String[0],
-              0,
-              "_multiPartInputStream",
-              "Lorg/eclipse/jetty/util/MultiPartInputStreamParser;")
-          .build();
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {REQUEST_REFERENCE};
-  }
-
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class ExtractContentParametersAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean before(@Advice.FieldValue("_contentParameters") final MultiMap<String> map) {
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Request.class);
-      return callDepth == 0 && map == null;
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    private static final String MULTI_MAP_INTERNAL_NAME = "Lorg/eclipse/jetty/util/MultiMap;";
+
+    public RequestExtractContentParametersInstrumentation() {
+        super("jetty");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean proceed,
-        @Advice.FieldValue("_contentParameters") final MultiMap<String> map,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      CallDepthThreadLocalMap.decrementCallDepth(Request.class);
-      if (!proceed) {
-        return;
-      }
-      if (map == null || map.isEmpty()) {
-        return;
-      }
-
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
-
-      Flow<Void> flow = callback.apply(reqCtx, map);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-          if (t == null) {
-            t = new BlockingException("Blocked request (for Request/extractContentParameters)");
-            reqCtx.getTraceSegment().effectivelyBlocked();
-          }
-        }
-      }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.Request";
     }
-  }
-
-  /**
-   * Fires the {@code requestFilesFilenames} event when the application calls public {@code
-   * getParts()}. Guards prevent double-firing:
-   *
-   * <ul>
-   *   <li>{@code _contentParameters != null}: set by {@code extractContentParameters()} (the {@code
-   *       getParameterMap()} path); means filenames were already reported via {@code
-   *       GetFilenamesFromMultiPartAdvice}.
-   *   <li>{@code _multiPartInputStream != null}: set by the first {@code getParts()} call in Jetty
-   *       9.3.x; means filenames were already reported.
-   * </ul>
-   */
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class GetFilenamesAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean before(
-        @Advice.FieldValue("_contentParameters") final MultiMap<String> contentParameters,
-        @Advice.FieldValue(value = "_multiPartInputStream", typing = Assigner.Typing.DYNAMIC)
-            final Object multiPartInputStream) {
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class);
-      return callDepth == 0 && contentParameters == null && multiPartInputStream == null;
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("extractContentParameters").and(takesArguments(0)).or(named("getParts")),
+                getClass().getName() + "$ExtractContentParametersAdvice");
+        transformer.applyAdvice(
+                named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice");
+        transformer.applyAdvice(
+                named("getParts").and(takesArguments(1)), getClass().getName() + "$GetFilenamesFromMultiPartAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean proceed,
-        @Advice.Return Collection<Part> parts,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class);
-      if (!proceed || t != null || parts == null || parts.isEmpty()) {
-        return;
-      }
-      t = MultipartHelper.fireFilenamesEvent(parts, reqCtx);
-      if (t == null) {
-        t = MultipartHelper.fireFilesContentEvent(parts, reqCtx);
-      }
+    // Discriminates Jetty 9.3.x–9.4.9.x ([9.3, 9.4.10)):
+    //  - _contentParameters + extractContentParameters(void) exist from 9.3+ (excludes 9.2)
+    //  - _multiPartInputStream exists in 9.3.x and early 9.4.x (< 9.4.10); replaced by _multiParts
+    //    in 9.4.10 (covered by jetty-appsec-9.4)
+    private static final Reference REQUEST_REFERENCE = new Reference.Builder("org.eclipse.jetty.server.Request")
+            .withMethod(new String[0], 0, "extractContentParameters", "V")
+            .withField(new String[0], 0, "_contentParameters", MULTI_MAP_INTERNAL_NAME)
+            .withField(new String[0], 0, "_multiPartInputStream", "Lorg/eclipse/jetty/util/MultiPartInputStreamParser;")
+            .build();
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {REQUEST_REFERENCE};
     }
-  }
-
-  /**
-   * Fires the {@code requestFilesFilenames} event when multipart content is parsed via the internal
-   * {@code getParts(MultiMap)} path triggered by {@code getParameter*()} / {@code
-   * getParameterMap()} — i.e. when the application never calls public {@code getParts()}. In Jetty
-   * 9.3+, {@code extractContentParameters()} assigns {@code _contentParameters} before calling this
-   * method, so {@code map == null} cannot be used as a "first parse" guard here; the call-depth
-   * guard prevents double-firing when {@code getParts()} internally delegates to this method.
-   */
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class GetFilenamesFromMultiPartAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean before() {
-      return CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class) == 0;
+
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class ExtractContentParametersAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean before(@Advice.FieldValue("_contentParameters") final MultiMap<String> map) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Request.class);
+            return callDepth == 0 && map == null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter boolean proceed,
+                @Advice.FieldValue("_contentParameters") final MultiMap<String> map,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            CallDepthThreadLocalMap.decrementCallDepth(Request.class);
+            if (!proceed) {
+                return;
+            }
+            if (map == null || map.isEmpty()) {
+                return;
+            }
+
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
+
+            Flow<Void> flow = callback.apply(reqCtx, map);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                    if (t == null) {
+                        t = new BlockingException("Blocked request (for Request/extractContentParameters)");
+                        reqCtx.getTraceSegment().effectivelyBlocked();
+                    }
+                }
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean proceed,
-        @Advice.Return Collection<Part> parts,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class);
-      if (!proceed || t != null || parts == null || parts.isEmpty()) {
-        return;
-      }
-      t = MultipartHelper.fireFilenamesEvent(parts, reqCtx);
-      if (t == null) {
-        t = MultipartHelper.fireFilesContentEvent(parts, reqCtx);
-      }
+    /**
+     * Fires the {@code requestFilesFilenames} event when the application calls public {@code
+     * getParts()}. Guards prevent double-firing:
+     *
+     * <ul>
+     *   <li>{@code _contentParameters != null}: set by {@code extractContentParameters()} (the {@code
+     *       getParameterMap()} path); means filenames were already reported via {@code
+     *       GetFilenamesFromMultiPartAdvice}.
+     *   <li>{@code _multiPartInputStream != null}: set by the first {@code getParts()} call in Jetty
+     *       9.3.x; means filenames were already reported.
+     * </ul>
+     */
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class GetFilenamesAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean before(
+                @Advice.FieldValue("_contentParameters") final MultiMap<String> contentParameters,
+                @Advice.FieldValue(value = "_multiPartInputStream", typing = Assigner.Typing.DYNAMIC)
+                        final Object multiPartInputStream) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class);
+            return callDepth == 0 && contentParameters == null && multiPartInputStream == null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter boolean proceed,
+                @Advice.Return Collection<Part> parts,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class);
+            if (!proceed || t != null || parts == null || parts.isEmpty()) {
+                return;
+            }
+            t = MultipartHelper.fireFilenamesEvent(parts, reqCtx);
+            if (t == null) {
+                t = MultipartHelper.fireFilesContentEvent(parts, reqCtx);
+            }
+        }
+    }
+
+    /**
+     * Fires the {@code requestFilesFilenames} event when multipart content is parsed via the internal
+     * {@code getParts(MultiMap)} path triggered by {@code getParameter*()} / {@code
+     * getParameterMap()} — i.e. when the application never calls public {@code getParts()}. In Jetty
+     * 9.3+, {@code extractContentParameters()} assigns {@code _contentParameters} before calling this
+     * method, so {@code map == null} cannot be used as a "first parse" guard here; the call-depth
+     * guard prevents double-firing when {@code getParts()} internally delegates to this method.
+     */
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class GetFilenamesFromMultiPartAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean before() {
+            return CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class) == 0;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter boolean proceed,
+                @Advice.Return Collection<Part> parts,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class);
+            if (!proceed || t != null || parts == null || parts.isEmpty()) {
+                return;
+            }
+            t = MultipartHelper.fireFilenamesEvent(parts, reqCtx);
+            if (t == null) {
+                t = MultipartHelper.fireFilesContentEvent(parts, reqCtx);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/test/java/datadog/trace/instrumentation/jetty93/MultipartHelperTest.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/test/java/datadog/trace/instrumentation/jetty93/MultipartHelperTest.java
index 9f580412ae8..6f1f85647c9 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/test/java/datadog/trace/instrumentation/jetty93/MultipartHelperTest.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/test/java/datadog/trace/instrumentation/jetty93/MultipartHelperTest.java
@@ -18,130 +18,127 @@
 
 class MultipartHelperTest {
 
-  @Test
-  void returnsEmptyListForNull() {
-    assertEquals(emptyList(), MultipartHelper.extractFilenames(null));
-  }
-
-  @Test
-  void returnsEmptyListForEmpty() {
-    assertEquals(emptyList(), MultipartHelper.extractFilenames(emptyList()));
-  }
-
-  @Test
-  void returnsEmptyListWhenAllPartsHaveNullFilename() {
-    List<Part> parts = asList(part(null), part(null));
-    assertEquals(emptyList(), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void returnsEmptyListWhenAllPartsHaveEmptyFilename() {
-    List<Part> parts = asList(part(""), part(""));
-    assertEquals(emptyList(), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void extractsFilenameFromSinglePart() {
-    List<Part> parts = singletonList(part("photo.jpg"));
-    assertEquals(singletonList("photo.jpg"), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void extractsFilenamesFromMultipleParts() {
-    List<Part> parts = asList(part("a.jpg"), part("b.png"), part("c.pdf"));
-    assertEquals(asList("a.jpg", "b.png", "c.pdf"), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void skipsPartsWithNullOrEmptyFilenameAndKeepsValid() {
-    List<Part> parts = asList(part(null), part("valid.txt"), part(""), part("other.zip"));
-    assertEquals(asList("valid.txt", "other.zip"), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void preservesFilenamesWithSpacesAndSpecialCharacters() {
-    List<Part> parts = asList(part("my file.tar.gz"), part("résumé.pdf"));
-    assertEquals(asList("my file.tar.gz", "résumé.pdf"), MultipartHelper.extractFilenames(parts));
-  }
-
-  private Part part(String submittedFileName) {
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn(submittedFileName);
-    return p;
-  }
-
-  // ── extractContents ─────────────────────────────────────────────────────────
-
-  @Test
-  void extractContentsReturnsEmptyListForNull() {
-    assertEquals(emptyList(), MultipartHelper.extractContents(null));
-  }
-
-  @Test
-  void extractContentsReturnsEmptyListForEmpty() {
-    assertEquals(emptyList(), MultipartHelper.extractContents(emptyList()));
-  }
-
-  @Test
-  void extractContentsSkipsFormFieldParts() {
-    List<Part> parts = asList(part(null), part(null));
-    assertEquals(emptyList(), MultipartHelper.extractContents(parts));
-  }
-
-  @Test
-  void extractContentsIncludesFileWithEmptyFilename() throws IOException {
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn("");
-    when(p.getInputStream())
-        .thenReturn(new ByteArrayInputStream("data".getBytes(StandardCharsets.UTF_8)));
-    when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
-    assertEquals(singletonList("data"), MultipartHelper.extractContents(singletonList(p)));
-  }
-
-  @Test
-  void extractContentsReadsFileContent() throws IOException {
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn("photo.jpg");
-    when(p.getInputStream())
-        .thenReturn(new ByteArrayInputStream("file-content".getBytes(StandardCharsets.UTF_8)));
-    when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
-    assertEquals(singletonList("file-content"), MultipartHelper.extractContents(singletonList(p)));
-  }
-
-  @Test
-  void extractContentsTruncatesAtMaxContentBytes() throws IOException {
-    byte[] large = new byte[MultipartHelper.MAX_CONTENT_BYTES + 1];
-    Arrays.fill(large, (byte) 'A');
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn("big.bin");
-    when(p.getInputStream()).thenReturn(new ByteArrayInputStream(large));
-    when(p.getContentType()).thenReturn(null);
-    List<String> contents = MultipartHelper.extractContents(singletonList(p));
-    assertEquals(1, contents.size());
-    assertEquals(MultipartHelper.MAX_CONTENT_BYTES, contents.get(0).length());
-  }
-
-  @Test
-  void extractContentsReturnsEmptyStringOnIOException() throws IOException {
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn("file.txt");
-    when(p.getInputStream()).thenThrow(new IOException("simulated"));
-    assertEquals(singletonList(""), MultipartHelper.extractContents(singletonList(p)));
-  }
-
-  @Test
-  void extractContentsCappsAtMaxFilesToInspect() throws IOException {
-    int count = MultipartHelper.MAX_FILES_TO_INSPECT + 1;
-    List<Part> parts = new ArrayList<>(count);
-    for (int i = 0; i < count; i++) {
-      Part p = mock(Part.class);
-      when(p.getSubmittedFileName()).thenReturn("file" + i + ".txt");
-      when(p.getInputStream())
-          .thenReturn(new ByteArrayInputStream("c".getBytes(StandardCharsets.UTF_8)));
-      when(p.getContentType()).thenReturn(null);
-      parts.add(p);
-    }
-    List<String> contents = MultipartHelper.extractContents(parts);
-    assertEquals(MultipartHelper.MAX_FILES_TO_INSPECT, contents.size());
-  }
+    @Test
+    void returnsEmptyListForNull() {
+        assertEquals(emptyList(), MultipartHelper.extractFilenames(null));
+    }
+
+    @Test
+    void returnsEmptyListForEmpty() {
+        assertEquals(emptyList(), MultipartHelper.extractFilenames(emptyList()));
+    }
+
+    @Test
+    void returnsEmptyListWhenAllPartsHaveNullFilename() {
+        List<Part> parts = asList(part(null), part(null));
+        assertEquals(emptyList(), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void returnsEmptyListWhenAllPartsHaveEmptyFilename() {
+        List<Part> parts = asList(part(""), part(""));
+        assertEquals(emptyList(), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void extractsFilenameFromSinglePart() {
+        List<Part> parts = singletonList(part("photo.jpg"));
+        assertEquals(singletonList("photo.jpg"), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void extractsFilenamesFromMultipleParts() {
+        List<Part> parts = asList(part("a.jpg"), part("b.png"), part("c.pdf"));
+        assertEquals(asList("a.jpg", "b.png", "c.pdf"), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void skipsPartsWithNullOrEmptyFilenameAndKeepsValid() {
+        List<Part> parts = asList(part(null), part("valid.txt"), part(""), part("other.zip"));
+        assertEquals(asList("valid.txt", "other.zip"), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void preservesFilenamesWithSpacesAndSpecialCharacters() {
+        List<Part> parts = asList(part("my file.tar.gz"), part("résumé.pdf"));
+        assertEquals(asList("my file.tar.gz", "résumé.pdf"), MultipartHelper.extractFilenames(parts));
+    }
+
+    private Part part(String submittedFileName) {
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn(submittedFileName);
+        return p;
+    }
+
+    // ── extractContents ─────────────────────────────────────────────────────────
+
+    @Test
+    void extractContentsReturnsEmptyListForNull() {
+        assertEquals(emptyList(), MultipartHelper.extractContents(null));
+    }
+
+    @Test
+    void extractContentsReturnsEmptyListForEmpty() {
+        assertEquals(emptyList(), MultipartHelper.extractContents(emptyList()));
+    }
+
+    @Test
+    void extractContentsSkipsFormFieldParts() {
+        List<Part> parts = asList(part(null), part(null));
+        assertEquals(emptyList(), MultipartHelper.extractContents(parts));
+    }
+
+    @Test
+    void extractContentsIncludesFileWithEmptyFilename() throws IOException {
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn("");
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream("data".getBytes(StandardCharsets.UTF_8)));
+        when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
+        assertEquals(singletonList("data"), MultipartHelper.extractContents(singletonList(p)));
+    }
+
+    @Test
+    void extractContentsReadsFileContent() throws IOException {
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn("photo.jpg");
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream("file-content".getBytes(StandardCharsets.UTF_8)));
+        when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
+        assertEquals(singletonList("file-content"), MultipartHelper.extractContents(singletonList(p)));
+    }
+
+    @Test
+    void extractContentsTruncatesAtMaxContentBytes() throws IOException {
+        byte[] large = new byte[MultipartHelper.MAX_CONTENT_BYTES + 1];
+        Arrays.fill(large, (byte) 'A');
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn("big.bin");
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream(large));
+        when(p.getContentType()).thenReturn(null);
+        List<String> contents = MultipartHelper.extractContents(singletonList(p));
+        assertEquals(1, contents.size());
+        assertEquals(MultipartHelper.MAX_CONTENT_BYTES, contents.get(0).length());
+    }
+
+    @Test
+    void extractContentsReturnsEmptyStringOnIOException() throws IOException {
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn("file.txt");
+        when(p.getInputStream()).thenThrow(new IOException("simulated"));
+        assertEquals(singletonList(""), MultipartHelper.extractContents(singletonList(p)));
+    }
+
+    @Test
+    void extractContentsCappsAtMaxFilesToInspect() throws IOException {
+        int count = MultipartHelper.MAX_FILES_TO_INSPECT + 1;
+        List<Part> parts = new ArrayList<>(count);
+        for (int i = 0; i < count; i++) {
+            Part p = mock(Part.class);
+            when(p.getSubmittedFileName()).thenReturn("file" + i + ".txt");
+            when(p.getInputStream()).thenReturn(new ByteArrayInputStream("c".getBytes(StandardCharsets.UTF_8)));
+            when(p.getContentType()).thenReturn(null);
+            parts.add(p);
+        }
+        List<String> contents = MultipartHelper.extractContents(parts);
+        assertEquals(MultipartHelper.MAX_FILES_TO_INSPECT, contents.size());
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/MultipartHelper.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/MultipartHelper.java
index 0f9e2b00df2..ee49ee84353 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/MultipartHelper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/MultipartHelper.java
@@ -24,134 +24,130 @@
 
 public class MultipartHelper {
 
-  public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
-  public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
+    public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
+    public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
 
-  private static final Logger log = LoggerFactory.getLogger(MultipartHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(MultipartHelper.class);
 
-  private MultipartHelper() {}
+    private MultipartHelper() {}
 
-  /**
-   * Extracts non-null, non-empty filenames from a collection of multipart {@link Part}s using
-   * {@link Part#getSubmittedFileName()} (Servlet 3.1+, Jetty 9.4.x–10.x).
-   *
-   * @return list of filenames; never {@code null}, may be empty
-   */
-  public static List<String> extractFilenames(Collection<Part> parts) {
-    if (parts == null || parts.isEmpty()) {
-      return Collections.emptyList();
-    }
-    List<String> filenames = new ArrayList<>(parts.size());
-    for (Part part : parts) {
-      try {
-        String name = part.getSubmittedFileName();
-        if (name != null && !name.isEmpty()) {
-          filenames.add(name);
+    /**
+     * Extracts non-null, non-empty filenames from a collection of multipart {@link Part}s using
+     * {@link Part#getSubmittedFileName()} (Servlet 3.1+, Jetty 9.4.x–10.x).
+     *
+     * @return list of filenames; never {@code null}, may be empty
+     */
+    public static List<String> extractFilenames(Collection<Part> parts) {
+        if (parts == null || parts.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<String> filenames = new ArrayList<>(parts.size());
+        for (Part part : parts) {
+            try {
+                String name = part.getSubmittedFileName();
+                if (name != null && !name.isEmpty()) {
+                    filenames.add(name);
+                }
+            } catch (Exception ignored) {
+                // malformed or inaccessible part — skip and continue with remaining parts
+                log.debug(EXCLUDE_TELEMETRY, "extractFilenames: skipping malformed part", ignored);
+            }
         }
-      } catch (Exception ignored) {
-        // malformed or inaccessible part — skip and continue with remaining parts
-        log.debug(EXCLUDE_TELEMETRY, "extractFilenames: skipping malformed part", ignored);
-      }
+        return filenames;
     }
-    return filenames;
-  }
 
-  /**
-   * Extracts file content from a collection of multipart {@link Part}s. Form fields (those with a
-   * {@code null} submitted filename) are skipped. Reads up to {@link #MAX_CONTENT_BYTES} bytes per
-   * part, up to {@link #MAX_FILES_TO_INSPECT} parts total.
-   *
-   * @return list of decoded content strings; never {@code null}, may be empty
-   */
-  public static List<String> extractContents(Collection<Part> parts) {
-    if (parts == null || parts.isEmpty()) {
-      return Collections.emptyList();
-    }
-    List<String> contents = new ArrayList<>(Math.min(parts.size(), MAX_FILES_TO_INSPECT));
-    for (Part part : parts) {
-      if (contents.size() >= MAX_FILES_TO_INSPECT) {
-        break;
-      }
-      try {
-        if (part.getSubmittedFileName() == null) {
-          continue; // form field — skip
+    /**
+     * Extracts file content from a collection of multipart {@link Part}s. Form fields (those with a
+     * {@code null} submitted filename) are skipped. Reads up to {@link #MAX_CONTENT_BYTES} bytes per
+     * part, up to {@link #MAX_FILES_TO_INSPECT} parts total.
+     *
+     * @return list of decoded content strings; never {@code null}, may be empty
+     */
+    public static List<String> extractContents(Collection<Part> parts) {
+        if (parts == null || parts.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<String> contents = new ArrayList<>(Math.min(parts.size(), MAX_FILES_TO_INSPECT));
+        for (Part part : parts) {
+            if (contents.size() >= MAX_FILES_TO_INSPECT) {
+                break;
+            }
+            try {
+                if (part.getSubmittedFileName() == null) {
+                    continue; // form field — skip
+                }
+                contents.add(readFileContent(part));
+            } catch (Exception ignored) {
+                log.debug(EXCLUDE_TELEMETRY, "extractContents: skipping malformed part", ignored);
+            }
         }
-        contents.add(readFileContent(part));
-      } catch (Exception ignored) {
-        log.debug(EXCLUDE_TELEMETRY, "extractContents: skipping malformed part", ignored);
-      }
+        return contents;
     }
-    return contents;
-  }
 
-  private static String readFileContent(Part part) {
-    try (InputStream is = part.getInputStream()) {
-      return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, part.getContentType());
-    } catch (Exception e) {
-      log.debug(EXCLUDE_TELEMETRY, "readFileContent: stream read failed", e);
-      return "";
+    private static String readFileContent(Part part) {
+        try (InputStream is = part.getInputStream()) {
+            return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, part.getContentType());
+        } catch (Exception e) {
+            log.debug(EXCLUDE_TELEMETRY, "readFileContent: stream read failed", e);
+            return "";
+        }
     }
-  }
 
-  /**
-   * Fires the {@code requestFilesContent} IG event and returns a {@link BlockingException} if the
-   * WAF requests blocking, or {@code null} otherwise.
-   */
-  public static BlockingException fireFilesContentEvent(
-      Collection<Part> parts, RequestContext reqCtx) {
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestFilesContent());
-    if (callback == null) {
-      return null;
-    }
-    List<String> contents = extractContents(parts);
-    if (contents.isEmpty()) {
-      return null;
-    }
-    Flow<Void> flow = callback.apply(reqCtx, contents);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
-          reqCtx.getTraceSegment().effectivelyBlocked();
-          return new BlockingException("Blocked request (multipart file content)");
+    /**
+     * Fires the {@code requestFilesContent} IG event and returns a {@link BlockingException} if the
+     * WAF requests blocking, or {@code null} otherwise.
+     */
+    public static BlockingException fireFilesContentEvent(Collection<Part> parts, RequestContext reqCtx) {
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> callback = cbp.getCallback(EVENTS.requestFilesContent());
+        if (callback == null) {
+            return null;
         }
-      }
+        List<String> contents = extractContents(parts);
+        if (contents.isEmpty()) {
+            return null;
+        }
+        Flow<Void> flow = callback.apply(reqCtx, contents);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                    return new BlockingException("Blocked request (multipart file content)");
+                }
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  /**
-   * Fires the {@code requestFilesFilenames} IG event and returns a {@link BlockingException} if the
-   * WAF requests blocking, or {@code null} otherwise.
-   */
-  public static BlockingException fireFilenamesEvent(
-      Collection<Part> parts, RequestContext reqCtx) {
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestFilesFilenames());
-    if (callback == null) {
-      return null;
-    }
-    List<String> filenames = extractFilenames(parts);
-    if (filenames.isEmpty()) {
-      return null;
-    }
-    Flow<Void> flow = callback.apply(reqCtx, filenames);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
-          reqCtx.getTraceSegment().effectivelyBlocked();
-          return new BlockingException("Blocked request (multipart file upload)");
+    /**
+     * Fires the {@code requestFilesFilenames} IG event and returns a {@link BlockingException} if the
+     * WAF requests blocking, or {@code null} otherwise.
+     */
+    public static BlockingException fireFilenamesEvent(Collection<Part> parts, RequestContext reqCtx) {
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> callback = cbp.getCallback(EVENTS.requestFilesFilenames());
+        if (callback == null) {
+            return null;
+        }
+        List<String> filenames = extractFilenames(parts);
+        if (filenames.isEmpty()) {
+            return null;
+        }
+        Flow<Void> flow = callback.apply(reqCtx, filenames);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) {
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                    return new BlockingException("Blocked request (multipart file upload)");
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/RequestExtractContentParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/RequestExtractContentParametersInstrumentation.java
index 6fd09a33cef..a81718d832f 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/RequestExtractContentParametersInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/RequestExtractContentParametersInstrumentation.java
@@ -28,173 +28,165 @@
 
 @AutoService(InstrumenterModule.class)
 public class RequestExtractContentParametersInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  private static final String MULTI_MAP_INTERNAL_NAME = "Lorg/eclipse/jetty/util/MultiMap;";
-
-  public RequestExtractContentParametersInstrumentation() {
-    super("jetty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.Request";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("extractContentParameters").and(takesArguments(0)).or(named("getParts")),
-        getClass().getName() + "$ExtractContentParametersAdvice");
-    transformer.applyAdvice(
-        named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice");
-    transformer.applyAdvice(
-        named("getParts").and(takesArguments(1)),
-        getClass().getName() + "$GetFilenamesFromMultiPartAdvice");
-  }
-
-  // Discriminates Jetty [9.4.10, 10.0) + [10.0.0, 11.0):
-  //  - _contentParameters + extractContentParameters(void) exist from 9.3+ (excludes 9.2)
-  //  - _multiParts field exists from 9.4.10+ (excludes 9.3.x–9.4.9 covered by jetty-appsec-9.3)
-  //    - primary spec: _multiParts: MultiParts   → matches 9.4.10–9.4.x and 10.0.10+
-  //    - OR spec:      _multiParts: MultiPartFormInputStream → matches 10.0.0–10.0.9
-  //  - _dispatcherType: Ljavax/servlet/DispatcherType; in the Request bytecode (excludes Jetty 11+
-  //    where the field descriptor is Ljakarta/servlet/DispatcherType;). This check is tied to the
-  //    Request.class bytecode, NOT just classpath presence, so it works even when both
-  //    javax.servlet and jakarta.servlet are on the classpath simultaneously.
-  //  Note: GetFilenamesAdvice reads _multiParts with typing=DYNAMIC so it works for all versions.
-  private static final Reference REQUEST_REFERENCE =
-      new Reference.Builder("org.eclipse.jetty.server.Request")
-          .withMethod(new String[0], 0, "extractContentParameters", "V")
-          .withField(new String[0], 0, "_contentParameters", MULTI_MAP_INTERNAL_NAME)
-          .withField(new String[0], 0, "_multiParts", "Lorg/eclipse/jetty/server/MultiParts;")
-          .withField(new String[0], 0, "_dispatcherType", "Ljavax/servlet/DispatcherType;")
-          .or()
-          .withMethod(new String[0], 0, "extractContentParameters", "V")
-          .withField(new String[0], 0, "_contentParameters", MULTI_MAP_INTERNAL_NAME)
-          .withField(
-              new String[0],
-              0,
-              "_multiParts",
-              "Lorg/eclipse/jetty/server/MultiPartFormInputStream;")
-          .withField(new String[0], 0, "_dispatcherType", "Ljavax/servlet/DispatcherType;")
-          .build();
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {REQUEST_REFERENCE};
-  }
-
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class ExtractContentParametersAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean before(@Advice.FieldValue("_contentParameters") final MultiMap<String> map) {
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Request.class);
-      return callDepth == 0 && map == null;
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    private static final String MULTI_MAP_INTERNAL_NAME = "Lorg/eclipse/jetty/util/MultiMap;";
+
+    public RequestExtractContentParametersInstrumentation() {
+        super("jetty");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean proceed,
-        @Advice.FieldValue("_contentParameters") final MultiMap<String> map,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      CallDepthThreadLocalMap.decrementCallDepth(Request.class);
-      if (!proceed) {
-        return;
-      }
-      if (map == null || map.isEmpty()) {
-        return;
-      }
-
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
-
-      Flow<Void> flow = callback.apply(reqCtx, map);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-          if (t == null) {
-            t = new BlockingException("Blocked request (for Request/extractContentParameters)");
-            reqCtx.getTraceSegment().effectivelyBlocked();
-          }
-        }
-      }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.Request";
     }
-  }
-
-  /**
-   * Fires the {@code requestFilesFilenames} event when the application calls public {@code
-   * getParts()}. Guards prevent double-firing:
-   *
-   * <ul>
-   *   <li>{@code _contentParameters != null}: set by {@code extractContentParameters()} (the {@code
-   *       getParameterMap()} path); means filenames were already reported via {@code
-   *       GetFilenamesFromMultiPartAdvice}.
-   *   <li>{@code _multiParts != null}: set by the first {@code getParts()} call in Jetty 9.4.10+;
-   *       means filenames were already reported.
-   * </ul>
-   */
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class GetFilenamesAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean before(
-        @Advice.FieldValue("_contentParameters") final MultiMap<String> contentParameters,
-        @Advice.FieldValue(value = "_multiParts", typing = Assigner.Typing.DYNAMIC)
-            final Object multiParts) {
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class);
-      return callDepth == 0 && contentParameters == null && multiParts == null;
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("extractContentParameters").and(takesArguments(0)).or(named("getParts")),
+                getClass().getName() + "$ExtractContentParametersAdvice");
+        transformer.applyAdvice(
+                named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice");
+        transformer.applyAdvice(
+                named("getParts").and(takesArguments(1)), getClass().getName() + "$GetFilenamesFromMultiPartAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean proceed,
-        @Advice.Return Collection<Part> parts,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class);
-      if (!proceed || t != null || parts == null || parts.isEmpty()) {
-        return;
-      }
-      t = MultipartHelper.fireFilenamesEvent(parts, reqCtx);
-      if (t == null) {
-        t = MultipartHelper.fireFilesContentEvent(parts, reqCtx);
-      }
+    // Discriminates Jetty [9.4.10, 10.0) + [10.0.0, 11.0):
+    //  - _contentParameters + extractContentParameters(void) exist from 9.3+ (excludes 9.2)
+    //  - _multiParts field exists from 9.4.10+ (excludes 9.3.x–9.4.9 covered by jetty-appsec-9.3)
+    //    - primary spec: _multiParts: MultiParts   → matches 9.4.10–9.4.x and 10.0.10+
+    //    - OR spec:      _multiParts: MultiPartFormInputStream → matches 10.0.0–10.0.9
+    //  - _dispatcherType: Ljavax/servlet/DispatcherType; in the Request bytecode (excludes Jetty 11+
+    //    where the field descriptor is Ljakarta/servlet/DispatcherType;). This check is tied to the
+    //    Request.class bytecode, NOT just classpath presence, so it works even when both
+    //    javax.servlet and jakarta.servlet are on the classpath simultaneously.
+    //  Note: GetFilenamesAdvice reads _multiParts with typing=DYNAMIC so it works for all versions.
+    private static final Reference REQUEST_REFERENCE = new Reference.Builder("org.eclipse.jetty.server.Request")
+            .withMethod(new String[0], 0, "extractContentParameters", "V")
+            .withField(new String[0], 0, "_contentParameters", MULTI_MAP_INTERNAL_NAME)
+            .withField(new String[0], 0, "_multiParts", "Lorg/eclipse/jetty/server/MultiParts;")
+            .withField(new String[0], 0, "_dispatcherType", "Ljavax/servlet/DispatcherType;")
+            .or()
+            .withMethod(new String[0], 0, "extractContentParameters", "V")
+            .withField(new String[0], 0, "_contentParameters", MULTI_MAP_INTERNAL_NAME)
+            .withField(new String[0], 0, "_multiParts", "Lorg/eclipse/jetty/server/MultiPartFormInputStream;")
+            .withField(new String[0], 0, "_dispatcherType", "Ljavax/servlet/DispatcherType;")
+            .build();
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {REQUEST_REFERENCE};
     }
-  }
-
-  /**
-   * Fires the {@code requestFilesFilenames} event when multipart content is parsed via the internal
-   * {@code getParts(MultiMap)} path triggered by {@code getParameter*()} / {@code
-   * getParameterMap()} — i.e. when the application never calls public {@code getParts()}.
-   */
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class GetFilenamesFromMultiPartAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean before() {
-      return CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class) == 0;
+
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class ExtractContentParametersAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean before(@Advice.FieldValue("_contentParameters") final MultiMap<String> map) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Request.class);
+            return callDepth == 0 && map == null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter boolean proceed,
+                @Advice.FieldValue("_contentParameters") final MultiMap<String> map,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            CallDepthThreadLocalMap.decrementCallDepth(Request.class);
+            if (!proceed) {
+                return;
+            }
+            if (map == null || map.isEmpty()) {
+                return;
+            }
+
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
+
+            Flow<Void> flow = callback.apply(reqCtx, map);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                    if (t == null) {
+                        t = new BlockingException("Blocked request (for Request/extractContentParameters)");
+                        reqCtx.getTraceSegment().effectivelyBlocked();
+                    }
+                }
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean proceed,
-        @Advice.Return Collection<Part> parts,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class);
-      if (!proceed || t != null || parts == null || parts.isEmpty()) {
-        return;
-      }
-      t = MultipartHelper.fireFilenamesEvent(parts, reqCtx);
-      if (t == null) {
-        t = MultipartHelper.fireFilesContentEvent(parts, reqCtx);
-      }
+    /**
+     * Fires the {@code requestFilesFilenames} event when the application calls public {@code
+     * getParts()}. Guards prevent double-firing:
+     *
+     * <ul>
+     *   <li>{@code _contentParameters != null}: set by {@code extractContentParameters()} (the {@code
+     *       getParameterMap()} path); means filenames were already reported via {@code
+     *       GetFilenamesFromMultiPartAdvice}.
+     *   <li>{@code _multiParts != null}: set by the first {@code getParts()} call in Jetty 9.4.10+;
+     *       means filenames were already reported.
+     * </ul>
+     */
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class GetFilenamesAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean before(
+                @Advice.FieldValue("_contentParameters") final MultiMap<String> contentParameters,
+                @Advice.FieldValue(value = "_multiParts", typing = Assigner.Typing.DYNAMIC) final Object multiParts) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class);
+            return callDepth == 0 && contentParameters == null && multiParts == null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter boolean proceed,
+                @Advice.Return Collection<Part> parts,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class);
+            if (!proceed || t != null || parts == null || parts.isEmpty()) {
+                return;
+            }
+            t = MultipartHelper.fireFilenamesEvent(parts, reqCtx);
+            if (t == null) {
+                t = MultipartHelper.fireFilesContentEvent(parts, reqCtx);
+            }
+        }
+    }
+
+    /**
+     * Fires the {@code requestFilesFilenames} event when multipart content is parsed via the internal
+     * {@code getParts(MultiMap)} path triggered by {@code getParameter*()} / {@code
+     * getParameterMap()} — i.e. when the application never calls public {@code getParts()}.
+     */
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class GetFilenamesFromMultiPartAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean before() {
+            return CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class) == 0;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter boolean proceed,
+                @Advice.Return Collection<Part> parts,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class);
+            if (!proceed || t != null || parts == null || parts.isEmpty()) {
+                return;
+            }
+            t = MultipartHelper.fireFilenamesEvent(parts, reqCtx);
+            if (t == null) {
+                t = MultipartHelper.fireFilesContentEvent(parts, reqCtx);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/test/java/datadog/trace/instrumentation/jetty94/MultipartHelperTest.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/test/java/datadog/trace/instrumentation/jetty94/MultipartHelperTest.java
index a32058a8624..4f3d874d8ae 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/test/java/datadog/trace/instrumentation/jetty94/MultipartHelperTest.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/test/java/datadog/trace/instrumentation/jetty94/MultipartHelperTest.java
@@ -18,130 +18,127 @@
 
 class MultipartHelperTest {
 
-  @Test
-  void returnsEmptyListForNull() {
-    assertEquals(emptyList(), MultipartHelper.extractFilenames(null));
-  }
-
-  @Test
-  void returnsEmptyListForEmpty() {
-    assertEquals(emptyList(), MultipartHelper.extractFilenames(emptyList()));
-  }
-
-  @Test
-  void returnsEmptyListWhenAllPartsHaveNullFilename() {
-    List<Part> parts = asList(part(null), part(null));
-    assertEquals(emptyList(), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void returnsEmptyListWhenAllPartsHaveEmptyFilename() {
-    List<Part> parts = asList(part(""), part(""));
-    assertEquals(emptyList(), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void extractsFilenameFromSinglePart() {
-    List<Part> parts = singletonList(part("photo.jpg"));
-    assertEquals(singletonList("photo.jpg"), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void extractsFilenamesFromMultipleParts() {
-    List<Part> parts = asList(part("a.jpg"), part("b.png"), part("c.pdf"));
-    assertEquals(asList("a.jpg", "b.png", "c.pdf"), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void skipsPartsWithNullOrEmptyFilenameAndKeepsValid() {
-    List<Part> parts = asList(part(null), part("valid.txt"), part(""), part("other.zip"));
-    assertEquals(asList("valid.txt", "other.zip"), MultipartHelper.extractFilenames(parts));
-  }
-
-  @Test
-  void preservesFilenamesWithSpacesAndSpecialCharacters() {
-    List<Part> parts = asList(part("my file.tar.gz"), part("résumé.pdf"));
-    assertEquals(asList("my file.tar.gz", "résumé.pdf"), MultipartHelper.extractFilenames(parts));
-  }
-
-  private Part part(String submittedFileName) {
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn(submittedFileName);
-    return p;
-  }
-
-  // ── extractContents ─────────────────────────────────────────────────────────
-
-  @Test
-  void extractContentsReturnsEmptyListForNull() {
-    assertEquals(emptyList(), MultipartHelper.extractContents(null));
-  }
-
-  @Test
-  void extractContentsReturnsEmptyListForEmpty() {
-    assertEquals(emptyList(), MultipartHelper.extractContents(emptyList()));
-  }
-
-  @Test
-  void extractContentsSkipsFormFieldParts() {
-    List<Part> parts = asList(part(null), part(null));
-    assertEquals(emptyList(), MultipartHelper.extractContents(parts));
-  }
-
-  @Test
-  void extractContentsIncludesFileWithEmptyFilename() throws IOException {
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn("");
-    when(p.getInputStream())
-        .thenReturn(new ByteArrayInputStream("data".getBytes(StandardCharsets.UTF_8)));
-    when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
-    assertEquals(singletonList("data"), MultipartHelper.extractContents(singletonList(p)));
-  }
-
-  @Test
-  void extractContentsReadsFileContent() throws IOException {
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn("photo.jpg");
-    when(p.getInputStream())
-        .thenReturn(new ByteArrayInputStream("file-content".getBytes(StandardCharsets.UTF_8)));
-    when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
-    assertEquals(singletonList("file-content"), MultipartHelper.extractContents(singletonList(p)));
-  }
-
-  @Test
-  void extractContentsTruncatesAtMaxContentBytes() throws IOException {
-    byte[] large = new byte[MultipartHelper.MAX_CONTENT_BYTES + 1];
-    Arrays.fill(large, (byte) 'A');
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn("big.bin");
-    when(p.getInputStream()).thenReturn(new ByteArrayInputStream(large));
-    when(p.getContentType()).thenReturn(null);
-    List<String> contents = MultipartHelper.extractContents(singletonList(p));
-    assertEquals(1, contents.size());
-    assertEquals(MultipartHelper.MAX_CONTENT_BYTES, contents.get(0).length());
-  }
-
-  @Test
-  void extractContentsReturnsEmptyStringOnIOException() throws IOException {
-    Part p = mock(Part.class);
-    when(p.getSubmittedFileName()).thenReturn("file.txt");
-    when(p.getInputStream()).thenThrow(new IOException("simulated"));
-    assertEquals(singletonList(""), MultipartHelper.extractContents(singletonList(p)));
-  }
-
-  @Test
-  void extractContentsCappsAtMaxFilesToInspect() throws IOException {
-    int count = MultipartHelper.MAX_FILES_TO_INSPECT + 1;
-    List<Part> parts = new ArrayList<>(count);
-    for (int i = 0; i < count; i++) {
-      Part p = mock(Part.class);
-      when(p.getSubmittedFileName()).thenReturn("file" + i + ".txt");
-      when(p.getInputStream())
-          .thenReturn(new ByteArrayInputStream("c".getBytes(StandardCharsets.UTF_8)));
-      when(p.getContentType()).thenReturn(null);
-      parts.add(p);
-    }
-    List<String> contents = MultipartHelper.extractContents(parts);
-    assertEquals(MultipartHelper.MAX_FILES_TO_INSPECT, contents.size());
-  }
+    @Test
+    void returnsEmptyListForNull() {
+        assertEquals(emptyList(), MultipartHelper.extractFilenames(null));
+    }
+
+    @Test
+    void returnsEmptyListForEmpty() {
+        assertEquals(emptyList(), MultipartHelper.extractFilenames(emptyList()));
+    }
+
+    @Test
+    void returnsEmptyListWhenAllPartsHaveNullFilename() {
+        List<Part> parts = asList(part(null), part(null));
+        assertEquals(emptyList(), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void returnsEmptyListWhenAllPartsHaveEmptyFilename() {
+        List<Part> parts = asList(part(""), part(""));
+        assertEquals(emptyList(), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void extractsFilenameFromSinglePart() {
+        List<Part> parts = singletonList(part("photo.jpg"));
+        assertEquals(singletonList("photo.jpg"), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void extractsFilenamesFromMultipleParts() {
+        List<Part> parts = asList(part("a.jpg"), part("b.png"), part("c.pdf"));
+        assertEquals(asList("a.jpg", "b.png", "c.pdf"), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void skipsPartsWithNullOrEmptyFilenameAndKeepsValid() {
+        List<Part> parts = asList(part(null), part("valid.txt"), part(""), part("other.zip"));
+        assertEquals(asList("valid.txt", "other.zip"), MultipartHelper.extractFilenames(parts));
+    }
+
+    @Test
+    void preservesFilenamesWithSpacesAndSpecialCharacters() {
+        List<Part> parts = asList(part("my file.tar.gz"), part("résumé.pdf"));
+        assertEquals(asList("my file.tar.gz", "résumé.pdf"), MultipartHelper.extractFilenames(parts));
+    }
+
+    private Part part(String submittedFileName) {
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn(submittedFileName);
+        return p;
+    }
+
+    // ── extractContents ─────────────────────────────────────────────────────────
+
+    @Test
+    void extractContentsReturnsEmptyListForNull() {
+        assertEquals(emptyList(), MultipartHelper.extractContents(null));
+    }
+
+    @Test
+    void extractContentsReturnsEmptyListForEmpty() {
+        assertEquals(emptyList(), MultipartHelper.extractContents(emptyList()));
+    }
+
+    @Test
+    void extractContentsSkipsFormFieldParts() {
+        List<Part> parts = asList(part(null), part(null));
+        assertEquals(emptyList(), MultipartHelper.extractContents(parts));
+    }
+
+    @Test
+    void extractContentsIncludesFileWithEmptyFilename() throws IOException {
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn("");
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream("data".getBytes(StandardCharsets.UTF_8)));
+        when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
+        assertEquals(singletonList("data"), MultipartHelper.extractContents(singletonList(p)));
+    }
+
+    @Test
+    void extractContentsReadsFileContent() throws IOException {
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn("photo.jpg");
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream("file-content".getBytes(StandardCharsets.UTF_8)));
+        when(p.getContentType()).thenReturn("text/plain; charset=UTF-8");
+        assertEquals(singletonList("file-content"), MultipartHelper.extractContents(singletonList(p)));
+    }
+
+    @Test
+    void extractContentsTruncatesAtMaxContentBytes() throws IOException {
+        byte[] large = new byte[MultipartHelper.MAX_CONTENT_BYTES + 1];
+        Arrays.fill(large, (byte) 'A');
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn("big.bin");
+        when(p.getInputStream()).thenReturn(new ByteArrayInputStream(large));
+        when(p.getContentType()).thenReturn(null);
+        List<String> contents = MultipartHelper.extractContents(singletonList(p));
+        assertEquals(1, contents.size());
+        assertEquals(MultipartHelper.MAX_CONTENT_BYTES, contents.get(0).length());
+    }
+
+    @Test
+    void extractContentsReturnsEmptyStringOnIOException() throws IOException {
+        Part p = mock(Part.class);
+        when(p.getSubmittedFileName()).thenReturn("file.txt");
+        when(p.getInputStream()).thenThrow(new IOException("simulated"));
+        assertEquals(singletonList(""), MultipartHelper.extractContents(singletonList(p)));
+    }
+
+    @Test
+    void extractContentsCappsAtMaxFilesToInspect() throws IOException {
+        int count = MultipartHelper.MAX_FILES_TO_INSPECT + 1;
+        List<Part> parts = new ArrayList<>(count);
+        for (int i = 0; i < count; i++) {
+            Part p = mock(Part.class);
+            when(p.getSubmittedFileName()).thenReturn("file" + i + ".txt");
+            when(p.getInputStream()).thenReturn(new ByteArrayInputStream("c".getBytes(StandardCharsets.UTF_8)));
+            when(p.getContentType()).thenReturn(null);
+            parts.add(p);
+        }
+        List<String> contents = MultipartHelper.extractContents(parts);
+        assertEquals(MultipartHelper.MAX_FILES_TO_INSPECT, contents.size());
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java
index 735571296f8..f1d04e515fc 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java
@@ -20,48 +20,47 @@
 
 @AutoService(InstrumenterModule.class)
 public class JettyClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
-  public JettyClientInstrumentation() {
-    super("jetty-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
+    public JettyClientInstrumentation() {
+        super("jetty-client");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.client.HttpClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.client.HttpClient";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".JettyClientDecorator",
-      "datadog.trace.instrumentation.jetty_client.HeadersInjectAdapter",
-      packageName + ".SpanFinishingCompleteListener"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".JettyClientDecorator",
+            "datadog.trace.instrumentation.jetty_client.HeadersInjectAdapter",
+            packageName + ".SpanFinishingCompleteListener"
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("org.eclipse.jetty.client.api.Request", AgentSpan.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.eclipse.jetty.client.api.Request", AgentSpan.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("send"))
-            .and(
-                takesArgument(
-                    0,
-                    namedOneOf(
-                        "org.eclipse.jetty.client.api.Request",
-                        "org.eclipse.jetty.client.HttpRequest")))
-            .and(takesArgument(1, List.class)),
-        packageName + ".SendAdvice",
-        packageName + ".SendContextPropagationAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("send"))
+                        .and(takesArgument(
+                                0,
+                                namedOneOf(
+                                        "org.eclipse.jetty.client.api.Request",
+                                        "org.eclipse.jetty.client.HttpRequest")))
+                        .and(takesArgument(1, List.class)),
+                packageName + ".SendAdvice",
+                packageName + ".SendContextPropagationAdvice");
+    }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    return singletonMap(RUNNABLE, singletonList("org.eclipse.jetty.util.SocketAddressResolver$1"));
-  }
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        return singletonMap(RUNNABLE, singletonList("org.eclipse.jetty.util.SocketAddressResolver$1"));
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/JettyClientDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/JettyClientDecorator.java
index 494ff08937b..76a93f16467 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/JettyClientDecorator.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/JettyClientDecorator.java
@@ -7,42 +7,42 @@
 import org.eclipse.jetty.client.api.Response;
 
 public class JettyClientDecorator extends HttpClientDecorator<Request, Response> {
-  public static final CharSequence JETTY_CLIENT = UTF8BytesString.create("jetty-client");
-  public static final JettyClientDecorator DECORATE = new JettyClientDecorator();
-  public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jetty-client"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JETTY_CLIENT;
-  }
-
-  @Override
-  protected String method(final Request httpRequest) {
-    return httpRequest.getMethod();
-  }
-
-  @Override
-  protected URI url(final Request httpRequest) {
-    return httpRequest.getURI();
-  }
-
-  @Override
-  protected int status(final Response httpResponse) {
-    return httpResponse.getStatus();
-  }
-
-  @Override
-  protected String getRequestHeader(Request request, String headerName) {
-    return request.getHeaders().get(headerName);
-  }
-
-  @Override
-  protected String getResponseHeader(Response response, String headerName) {
-    return response.getHeaders().get(headerName);
-  }
+    public static final CharSequence JETTY_CLIENT = UTF8BytesString.create("jetty-client");
+    public static final JettyClientDecorator DECORATE = new JettyClientDecorator();
+    public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jetty-client"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JETTY_CLIENT;
+    }
+
+    @Override
+    protected String method(final Request httpRequest) {
+        return httpRequest.getMethod();
+    }
+
+    @Override
+    protected URI url(final Request httpRequest) {
+        return httpRequest.getURI();
+    }
+
+    @Override
+    protected int status(final Response httpResponse) {
+        return httpResponse.getStatus();
+    }
+
+    @Override
+    protected String getRequestHeader(Request request, String headerName) {
+        return request.getHeaders().get(headerName);
+    }
+
+    @Override
+    protected String getResponseHeader(Response response, String headerName) {
+        return response.getHeaders().get(headerName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SendAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SendAdvice.java
index 2e92e35f91b..6b16db3a6d8 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SendAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SendAdvice.java
@@ -12,26 +12,25 @@
 import org.eclipse.jetty.client.api.Response;
 
 public class SendAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static AgentSpan methodEnter(
-      @Advice.Argument(0) Request request,
-      @Advice.Argument(1) List<Response.ResponseListener> responseListeners) {
-    AgentSpan span = startSpan("jetty-client", HTTP_REQUEST);
-    InstrumentationContext.get(Request.class, AgentSpan.class).put(request, span);
-    // make sure the span is finished before onComplete callbacks execute
-    responseListeners.add(0, new SpanFinishingCompleteListener(span));
-    DECORATE.afterStart(span);
-    DECORATE.onRequest(span, request);
-    return span;
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static AgentSpan methodEnter(
+            @Advice.Argument(0) Request request,
+            @Advice.Argument(1) List<Response.ResponseListener> responseListeners) {
+        AgentSpan span = startSpan("jetty-client", HTTP_REQUEST);
+        InstrumentationContext.get(Request.class, AgentSpan.class).put(request, span);
+        // make sure the span is finished before onComplete callbacks execute
+        responseListeners.add(0, new SpanFinishingCompleteListener(span));
+        DECORATE.afterStart(span);
+        DECORATE.onRequest(span, request);
+        return span;
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void methodExit(
-      @Advice.Enter final AgentSpan span, @Advice.Thrown final Throwable throwable) {
-    if (throwable != null) {
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      span.finish();
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void methodExit(@Advice.Enter final AgentSpan span, @Advice.Thrown final Throwable throwable) {
+        if (throwable != null) {
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SendContextPropagationAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SendContextPropagationAdvice.java
index 1123e8d1cbd..043b480f314 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SendContextPropagationAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SendContextPropagationAdvice.java
@@ -14,13 +14,14 @@
 
 @AppliesOn(CONTEXT_TRACKING)
 public class SendContextPropagationAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void methodEnter(@Advice.Argument(0) final Request request) {
-    final AgentSpan span = InstrumentationContext.get(Request.class, AgentSpan.class).get(request);
-    Context destination = currentContext();
-    if (span != null) {
-      destination = destination.with(span);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void methodEnter(@Advice.Argument(0) final Request request) {
+        final AgentSpan span =
+                InstrumentationContext.get(Request.class, AgentSpan.class).get(request);
+        Context destination = currentContext();
+        if (span != null) {
+            destination = destination.with(span);
+        }
+        DECORATE.injectContext(destination, request, SETTER);
     }
-    DECORATE.injectContext(destination, request, SETTER);
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SpanFinishingCompleteListener.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SpanFinishingCompleteListener.java
index 685c903816e..b78479977c5 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SpanFinishingCompleteListener.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SpanFinishingCompleteListener.java
@@ -7,19 +7,19 @@
 import org.eclipse.jetty.client.api.Result;
 
 public class SpanFinishingCompleteListener implements Response.CompleteListener {
-  private final AgentSpan span;
+    private final AgentSpan span;
 
-  public SpanFinishingCompleteListener(AgentSpan span) {
-    this.span = span;
-  }
+    public SpanFinishingCompleteListener(AgentSpan span) {
+        this.span = span;
+    }
 
-  @Override
-  public void onComplete(Result result) {
-    if (result.getResponse().getStatus() <= 0) {
-      DECORATE.onError(span, result.getFailure());
+    @Override
+    public void onComplete(Result result) {
+        if (result.getResponse().getStatus() <= 0) {
+            DECORATE.onError(span, result.getFailure());
+        }
+        DECORATE.onResponse(span, result.getResponse());
+        DECORATE.beforeFinish(span);
+        span.finish();
     }
-    DECORATE.onResponse(span, result.getResponse());
-    DECORATE.beforeFinish(span);
-    span.finish();
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/JettyHttpClientInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/JettyHttpClientInstrumentation.java
index 82c1f39967b..f4ee4303e58 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/JettyHttpClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/JettyHttpClientInstrumentation.java
@@ -22,50 +22,50 @@
 
 @AutoService(InstrumenterModule.class)
 public class JettyHttpClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
-  public JettyHttpClientInstrumentation() {
-    super("jetty-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
+    public JettyHttpClientInstrumentation() {
+        super("jetty-client");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.client.transport.HttpRequest";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.client.transport.HttpRequest";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".JettyClientDecorator",
-      packageName + ".HeadersInjectAdapter",
-      packageName + ".SpanFinishingCompleteListener",
-      packageName + ".CallbackWrapper",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".JettyClientDecorator",
+            packageName + ".HeadersInjectAdapter",
+            packageName + ".SpanFinishingCompleteListener",
+            packageName + ".CallbackWrapper",
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("org.eclipse.jetty.client.Request", AgentSpan.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.eclipse.jetty.client.Request", AgentSpan.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), packageName + ".RequestCreateAdvice");
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("send"))
-            .and(takesArgument(0, named("org.eclipse.jetty.client.Response$CompleteListener"))),
-        packageName + ".SendAdvice",
-        packageName + ".SendContextPropagationAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(namedOneOf("listener", "onSuccess", "onFailure", "onComplete"))
-            .and(takesArguments(1)),
-        packageName + ".WrapListenerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), packageName + ".RequestCreateAdvice");
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("send"))
+                        .and(takesArgument(0, named("org.eclipse.jetty.client.Response$CompleteListener"))),
+                packageName + ".SendAdvice",
+                packageName + ".SendContextPropagationAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(namedOneOf("listener", "onSuccess", "onFailure", "onComplete"))
+                        .and(takesArguments(1)),
+                packageName + ".WrapListenerAdvice");
+    }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    return singletonMap(RUNNABLE, singletonList("org.eclipse.jetty.util.SocketAddressResolver$1"));
-  }
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        return singletonMap(RUNNABLE, singletonList("org.eclipse.jetty.util.SocketAddressResolver$1"));
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java
index dee754f9052..dc639dcc315 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java
@@ -11,116 +11,116 @@
 
 public class CallbackWrapper implements Response.Listener, Request.Listener {
 
-  private final AgentSpan parent;
-  private final AgentSpan span;
-  private final Object delegate;
-
-  public CallbackWrapper(AgentSpan parent, AgentSpan span, Object delegate) {
-    this.parent = parent != null ? parent : noopSpan();
-    this.span = span;
-    this.delegate = delegate;
-  }
-
-  @Override
-  public void onBegin(Response response) {
-    if (delegate instanceof Response.BeginListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Response.BeginListener) delegate).onBegin(response);
-      }
+    private final AgentSpan parent;
+    private final AgentSpan span;
+    private final Object delegate;
+
+    public CallbackWrapper(AgentSpan parent, AgentSpan span, Object delegate) {
+        this.parent = parent != null ? parent : noopSpan();
+        this.span = span;
+        this.delegate = delegate;
     }
-  }
-
-  @Override
-  public void onComplete(Result result) {
-    if (delegate instanceof Response.CompleteListener) {
-      try (ContextScope scope = activate(parent)) {
-        ((Response.CompleteListener) delegate).onComplete(result);
-      }
+
+    @Override
+    public void onBegin(Response response) {
+        if (delegate instanceof Response.BeginListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Response.BeginListener) delegate).onBegin(response);
+            }
+        }
     }
-  }
-
-  @Override
-  public void onFailure(Response response, Throwable failure) {
-    if (delegate instanceof Response.FailureListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Response.FailureListener) delegate).onFailure(response, failure);
-      }
+
+    @Override
+    public void onComplete(Result result) {
+        if (delegate instanceof Response.CompleteListener) {
+            try (ContextScope scope = activate(parent)) {
+                ((Response.CompleteListener) delegate).onComplete(result);
+            }
+        }
     }
-  }
-
-  @Override
-  public void onHeaders(Response response) {
-    if (delegate instanceof Response.HeadersListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Response.HeadersListener) delegate).onHeaders(response);
-      }
+
+    @Override
+    public void onFailure(Response response, Throwable failure) {
+        if (delegate instanceof Response.FailureListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Response.FailureListener) delegate).onFailure(response, failure);
+            }
+        }
     }
-  }
-
-  @Override
-  public void onSuccess(Response response) {
-    if (delegate instanceof Response.SuccessListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Response.SuccessListener) delegate).onSuccess(response);
-      }
+
+    @Override
+    public void onHeaders(Response response) {
+        if (delegate instanceof Response.HeadersListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Response.HeadersListener) delegate).onHeaders(response);
+            }
+        }
     }
-  }
-
-  @Override
-  public void onBegin(Request request) {
-    if (delegate instanceof Request.BeginListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Request.SuccessListener) delegate).onSuccess(request);
-      }
+
+    @Override
+    public void onSuccess(Response response) {
+        if (delegate instanceof Response.SuccessListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Response.SuccessListener) delegate).onSuccess(response);
+            }
+        }
     }
-  }
-
-  @Override
-  public void onCommit(Request request) {
-    if (delegate instanceof Request.CommitListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Request.CommitListener) delegate).onCommit(request);
-      }
+
+    @Override
+    public void onBegin(Request request) {
+        if (delegate instanceof Request.BeginListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Request.SuccessListener) delegate).onSuccess(request);
+            }
+        }
     }
-  }
-
-  @Override
-  public void onFailure(Request request, Throwable failure) {
-    if (delegate instanceof Request.FailureListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Request.FailureListener) delegate).onFailure(request, failure);
-      }
+
+    @Override
+    public void onCommit(Request request) {
+        if (delegate instanceof Request.CommitListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Request.CommitListener) delegate).onCommit(request);
+            }
+        }
     }
-  }
-
-  @Override
-  public void onHeaders(Request request) {
-    if (delegate instanceof Request.HeadersListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Request.HeadersListener) delegate).onHeaders(request);
-      }
+
+    @Override
+    public void onFailure(Request request, Throwable failure) {
+        if (delegate instanceof Request.FailureListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Request.FailureListener) delegate).onFailure(request, failure);
+            }
+        }
+    }
+
+    @Override
+    public void onHeaders(Request request) {
+        if (delegate instanceof Request.HeadersListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Request.HeadersListener) delegate).onHeaders(request);
+            }
+        }
     }
-  }
-
-  @Override
-  public void onQueued(Request request) {
-    if (delegate instanceof Request.QueuedListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Request.QueuedListener) delegate).onQueued(request);
-      }
+
+    @Override
+    public void onQueued(Request request) {
+        if (delegate instanceof Request.QueuedListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Request.QueuedListener) delegate).onQueued(request);
+            }
+        }
     }
-  }
-
-  @Override
-  public void onSuccess(Request request) {
-    if (delegate instanceof Request.SuccessListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Request.SuccessListener) delegate).onSuccess(request);
-      }
+
+    @Override
+    public void onSuccess(Request request) {
+        if (delegate instanceof Request.SuccessListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Request.SuccessListener) delegate).onSuccess(request);
+            }
+        }
     }
-  }
 
-  private ContextScope activate(AgentSpan span) {
-    return null == span ? null : activateSpan(span);
-  }
+    private ContextScope activate(AgentSpan span) {
+        return null == span ? null : activateSpan(span);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/HeadersInjectAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/HeadersInjectAdapter.java
index 1869f7da4de..e2462f7b89e 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/HeadersInjectAdapter.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/HeadersInjectAdapter.java
@@ -5,10 +5,10 @@
 
 public class HeadersInjectAdapter implements CarrierSetter<Request> {
 
-  public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter();
+    public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter();
 
-  @Override
-  public void set(final Request carrier, final String key, final String value) {
-    carrier.headers(httpFields -> httpFields.add(key, value));
-  }
+    @Override
+    public void set(final Request carrier, final String key, final String value) {
+        carrier.headers(httpFields -> httpFields.add(key, value));
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/JettyClientDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/JettyClientDecorator.java
index 28ef7bb44dd..af14be10ecf 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/JettyClientDecorator.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/JettyClientDecorator.java
@@ -7,42 +7,42 @@
 import org.eclipse.jetty.client.Response;
 
 public class JettyClientDecorator extends HttpClientDecorator<Request, Response> {
-  public static final CharSequence JETTY_CLIENT = UTF8BytesString.create("jetty-client");
-  public static final JettyClientDecorator DECORATE = new JettyClientDecorator();
-  public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jetty-client"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JETTY_CLIENT;
-  }
-
-  @Override
-  protected String method(final Request httpRequest) {
-    return httpRequest.getMethod();
-  }
-
-  @Override
-  protected URI url(final Request httpRequest) {
-    return httpRequest.getURI();
-  }
-
-  @Override
-  protected int status(final Response httpResponse) {
-    return httpResponse.getStatus();
-  }
-
-  @Override
-  protected String getRequestHeader(Request request, String headerName) {
-    return request.getHeaders().get(headerName);
-  }
-
-  @Override
-  protected String getResponseHeader(Response response, String headerName) {
-    return response.getHeaders().get(headerName);
-  }
+    public static final CharSequence JETTY_CLIENT = UTF8BytesString.create("jetty-client");
+    public static final JettyClientDecorator DECORATE = new JettyClientDecorator();
+    public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jetty-client"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JETTY_CLIENT;
+    }
+
+    @Override
+    protected String method(final Request httpRequest) {
+        return httpRequest.getMethod();
+    }
+
+    @Override
+    protected URI url(final Request httpRequest) {
+        return httpRequest.getURI();
+    }
+
+    @Override
+    protected int status(final Response httpResponse) {
+        return httpResponse.getStatus();
+    }
+
+    @Override
+    protected String getRequestHeader(Request request, String headerName) {
+        return request.getHeaders().get(headerName);
+    }
+
+    @Override
+    protected String getResponseHeader(Response response, String headerName) {
+        return response.getHeaders().get(headerName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/RequestCreateAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/RequestCreateAdvice.java
index a0e54017e6f..faa2852ab0c 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/RequestCreateAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/RequestCreateAdvice.java
@@ -7,10 +7,8 @@
 import org.eclipse.jetty.client.transport.HttpRequest;
 
 public class RequestCreateAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterCreate(@Advice.This HttpRequest self) {
-    self.onComplete(
-        new SpanFinishingCompleteListener(
-            InstrumentationContext.get(Request.class, AgentSpan.class)));
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterCreate(@Advice.This HttpRequest self) {
+        self.onComplete(new SpanFinishingCompleteListener(InstrumentationContext.get(Request.class, AgentSpan.class)));
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendAdvice.java
index 2a762481cdc..dfbd1188f39 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendAdvice.java
@@ -14,24 +14,23 @@
 import org.eclipse.jetty.client.transport.HttpRequest;
 
 public class SendAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope methodEnter(@Advice.This final HttpRequest request) {
-    AgentSpan span = startSpan("jetty-client", HTTP_REQUEST);
-    InstrumentationContext.get(Request.class, AgentSpan.class).put(request, span);
-    DECORATE.afterStart(span);
-    DECORATE.onRequest(span, request);
-    return activateSpan(span);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope methodEnter(@Advice.This final HttpRequest request) {
+        AgentSpan span = startSpan("jetty-client", HTTP_REQUEST);
+        InstrumentationContext.get(Request.class, AgentSpan.class).put(request, span);
+        DECORATE.afterStart(span);
+        DECORATE.onRequest(span, request);
+        return activateSpan(span);
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void methodExit(
-      @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-    try (scope) {
-      if (throwable != null) {
-        DECORATE.onError(scope, throwable);
-        DECORATE.beforeFinish(scope);
-        spanFromScope(scope).finish();
-      }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void methodExit(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+        try (scope) {
+            if (throwable != null) {
+                DECORATE.onError(scope, throwable);
+                DECORATE.beforeFinish(scope);
+                spanFromScope(scope).finish();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendContextPropagationAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendContextPropagationAdvice.java
index ab0a1e45132..400e41f5be6 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendContextPropagationAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendContextPropagationAdvice.java
@@ -14,12 +14,13 @@
 
 @AppliesOn(CONTEXT_TRACKING)
 public class SendContextPropagationAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void methodEnter(@Advice.This final HttpRequest request) {
-    AgentSpan span = InstrumentationContext.get(Request.class, AgentSpan.class).get(request);
-    if (span == null) {
-      return;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void methodEnter(@Advice.This final HttpRequest request) {
+        AgentSpan span =
+                InstrumentationContext.get(Request.class, AgentSpan.class).get(request);
+        if (span == null) {
+            return;
+        }
+        DECORATE.injectContext(currentContext().with(span), request, SETTER);
     }
-    DECORATE.injectContext(currentContext().with(span), request, SETTER);
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SpanFinishingCompleteListener.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SpanFinishingCompleteListener.java
index 088a782a9e4..93bc087e72c 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SpanFinishingCompleteListener.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SpanFinishingCompleteListener.java
@@ -7,23 +7,23 @@
 import org.eclipse.jetty.client.Result;
 
 public class SpanFinishingCompleteListener implements Response.CompleteListener {
-  private final ContextStore<Request, AgentSpan> contextStore;
+    private final ContextStore<Request, AgentSpan> contextStore;
 
-  public SpanFinishingCompleteListener(ContextStore<Request, AgentSpan> contextStore) {
-    this.contextStore = contextStore;
-  }
-
-  @Override
-  public void onComplete(Result result) {
-    AgentSpan span = contextStore.get(result.getRequest());
-    if (span == null) {
-      return;
+    public SpanFinishingCompleteListener(ContextStore<Request, AgentSpan> contextStore) {
+        this.contextStore = contextStore;
     }
-    if (result.getResponse().getStatus() <= 0) {
-      JettyClientDecorator.DECORATE.onError(span, result.getFailure());
+
+    @Override
+    public void onComplete(Result result) {
+        AgentSpan span = contextStore.get(result.getRequest());
+        if (span == null) {
+            return;
+        }
+        if (result.getResponse().getStatus() <= 0) {
+            JettyClientDecorator.DECORATE.onError(span, result.getFailure());
+        }
+        JettyClientDecorator.DECORATE.onResponse(span, result.getResponse());
+        JettyClientDecorator.DECORATE.beforeFinish(span);
+        span.finish();
     }
-    JettyClientDecorator.DECORATE.onResponse(span, result.getResponse());
-    JettyClientDecorator.DECORATE.beforeFinish(span);
-    span.finish();
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/WrapListenerAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/WrapListenerAdvice.java
index c8062aeba55..9f4d4eb7e5b 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/WrapListenerAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/WrapListenerAdvice.java
@@ -9,17 +9,15 @@
 import org.eclipse.jetty.client.Request;
 
 public class WrapListenerAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void methodEnter(
-      @Advice.This Request request,
-      @Advice.Argument(value = 0, readOnly = false, typing = Assigner.Typing.DYNAMIC)
-          Object listener) {
-    if (!(listener instanceof CallbackWrapper)) {
-      listener =
-          new CallbackWrapper(
-              activeSpan(),
-              InstrumentationContext.get(Request.class, AgentSpan.class).get(request),
-              listener);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void methodEnter(
+            @Advice.This Request request,
+            @Advice.Argument(value = 0, readOnly = false, typing = Assigner.Typing.DYNAMIC) Object listener) {
+        if (!(listener instanceof CallbackWrapper)) {
+            listener = new CallbackWrapper(
+                    activeSpan(),
+                    InstrumentationContext.get(Request.class, AgentSpan.class).get(request),
+                    listener);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/FutureResponseListenerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/FutureResponseListenerInstrumentation.java
index 901ea526d65..83da6059344 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/FutureResponseListenerInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/FutureResponseListenerInstrumentation.java
@@ -18,54 +18,51 @@
 
 @AutoService(InstrumenterModule.class)
 public final class FutureResponseListenerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public FutureResponseListenerInstrumentation() {
-    super("jetty-client");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.client.util.FutureResponseListener";
-  }
+    public FutureResponseListenerInstrumentation() {
+        super("jetty-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStore = new HashMap<>(4);
-    contextStore.put("org.eclipse.jetty.client.api.Request", AgentSpan.class.getName());
-    contextStore.put(
-        "org.eclipse.jetty.client.api.Response$ResponseListener",
-        "org.eclipse.jetty.client.api.Request");
-    return contextStore;
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.client.util.FutureResponseListener";
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "listener";
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStore = new HashMap<>(4);
+        contextStore.put("org.eclipse.jetty.client.api.Request", AgentSpan.class.getName());
+        contextStore.put(
+                "org.eclipse.jetty.client.api.Response$ResponseListener", "org.eclipse.jetty.client.api.Request");
+        return contextStore;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(
-                takesArgument(0, named("org.eclipse.jetty.client.api.Request"))
-                    .and(takesArguments(2))),
-        getClass().getName() + "$Link");
-  }
+    @Override
+    public String muzzleDirective() {
+        return "listener";
+    }
 
-  public static final class Link {
-    @Advice.OnMethodExit
-    public static void link(
-        @Advice.This Response.ResponseListener listener, @Advice.Argument(0) Request request) {
-      // this provides safe access to the request from higher up the class hierarchy where methods
-      // we want to instrument are defined
-      InstrumentationContext.get(Response.ResponseListener.class, Request.class)
-          .put(listener, request);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(0, named("org.eclipse.jetty.client.api.Request"))
+                                .and(takesArguments(2))),
+                getClass().getName() + "$Link");
     }
 
-    private String muzzleCheck(Request request) {
-      return request.getMethod(); // Before 9.1 returns an HttpMethod.
+    public static final class Link {
+        @Advice.OnMethodExit
+        public static void link(@Advice.This Response.ResponseListener listener, @Advice.Argument(0) Request request) {
+            // this provides safe access to the request from higher up the class hierarchy where methods
+            // we want to instrument are defined
+            InstrumentationContext.get(Response.ResponseListener.class, Request.class)
+                    .put(listener, request);
+        }
+
+        private String muzzleCheck(Request request) {
+            return request.getMethod(); // Before 9.1 returns an HttpMethod.
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyAddListenerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyAddListenerInstrumentation.java
index 1e9c9ed2307..206eccbb242 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyAddListenerInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyAddListenerInstrumentation.java
@@ -20,132 +20,132 @@
 
 @AutoService(InstrumenterModule.class)
 public class JettyAddListenerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public JettyAddListenerInstrumentation() {
-    super("jetty-client");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.client.HttpRequest";
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("org.eclipse.jetty.client.api.Request", AgentSpan.class.getName());
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {"datadog.trace.instrumentation.jetty_client.CallbackWrapper"};
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "listener";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("listener"))
-            .and(takesArgument(0, named("org.eclipse.jetty.client.api.Request$RequestListener"))),
-        JettyAddListenerInstrumentation.class.getName() + "$WrapRequestListener");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("onSuccess"))
-            .and(takesArgument(0, named("org.eclipse.jetty.client.api.Request$SuccessListener"))),
-        JettyAddListenerInstrumentation.class.getName() + "$WrapRequestSuccessListener");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("onFailure"))
-            .and(takesArgument(0, named("org.eclipse.jetty.client.api.Request$FailureListener"))),
-        JettyAddListenerInstrumentation.class.getName() + "$WrapRequestFailureListener");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("onComplete"))
-            .and(takesArgument(0, named("org.eclipse.jetty.client.api.Response$CompleteListener"))),
-        JettyAddListenerInstrumentation.class.getName() + "$WrapResponseCompleteListener");
-  }
-
-  public static class WrapRequestListener {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
-        @Advice.This Request request,
-        @Advice.Argument(value = 0, readOnly = false) Request.RequestListener listener) {
-      if (!(listener instanceof CallbackWrapper)) {
-        listener =
-            new CallbackWrapper(
-                activeSpan(),
-                InstrumentationContext.get(Request.class, AgentSpan.class).get(request),
-                listener);
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public JettyAddListenerInstrumentation() {
+        super("jetty-client");
     }
 
-    private String muzzleCheck(Request request) {
-      return request.getMethod(); // Before 9.1 returns an HttpMethod.
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.client.HttpRequest";
     }
-  }
-
-  public static class WrapRequestFailureListener {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
-        @Advice.This Request request,
-        @Advice.Argument(value = 0, readOnly = false) Request.FailureListener listener) {
-      if (!(listener instanceof CallbackWrapper)) {
-        listener =
-            new CallbackWrapper(
-                activeSpan(),
-                InstrumentationContext.get(Request.class, AgentSpan.class).get(request),
-                listener);
-      }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.eclipse.jetty.client.api.Request", AgentSpan.class.getName());
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {"datadog.trace.instrumentation.jetty_client.CallbackWrapper"};
     }
 
-    private String muzzleCheck(Request request) {
-      return request.getMethod(); // Before 9.1 returns an HttpMethod.
+    @Override
+    public String muzzleDirective() {
+        return "listener";
     }
-  }
-
-  public static class WrapRequestSuccessListener {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
-        @Advice.This Request request,
-        @Advice.Argument(value = 0, readOnly = false) Request.SuccessListener listener) {
-      if (!(listener instanceof CallbackWrapper)) {
-        listener =
-            new CallbackWrapper(
-                activeSpan(),
-                InstrumentationContext.get(Request.class, AgentSpan.class).get(request),
-                listener);
-      }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("listener"))
+                        .and(takesArgument(0, named("org.eclipse.jetty.client.api.Request$RequestListener"))),
+                JettyAddListenerInstrumentation.class.getName() + "$WrapRequestListener");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("onSuccess"))
+                        .and(takesArgument(0, named("org.eclipse.jetty.client.api.Request$SuccessListener"))),
+                JettyAddListenerInstrumentation.class.getName() + "$WrapRequestSuccessListener");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("onFailure"))
+                        .and(takesArgument(0, named("org.eclipse.jetty.client.api.Request$FailureListener"))),
+                JettyAddListenerInstrumentation.class.getName() + "$WrapRequestFailureListener");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("onComplete"))
+                        .and(takesArgument(0, named("org.eclipse.jetty.client.api.Response$CompleteListener"))),
+                JettyAddListenerInstrumentation.class.getName() + "$WrapResponseCompleteListener");
     }
 
-    private String muzzleCheck(Request request) {
-      return request.getMethod(); // Before 9.1 returns an HttpMethod.
+    public static class WrapRequestListener {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter(
+                @Advice.This Request request,
+                @Advice.Argument(value = 0, readOnly = false) Request.RequestListener listener) {
+            if (!(listener instanceof CallbackWrapper)) {
+                listener = new CallbackWrapper(
+                        activeSpan(),
+                        InstrumentationContext.get(Request.class, AgentSpan.class)
+                                .get(request),
+                        listener);
+            }
+        }
+
+        private String muzzleCheck(Request request) {
+            return request.getMethod(); // Before 9.1 returns an HttpMethod.
+        }
     }
-  }
-
-  public static class WrapResponseCompleteListener {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
-        @Advice.This Request request,
-        @Advice.Argument(value = 0, readOnly = false) Response.CompleteListener listener) {
-      if (!(listener instanceof CallbackWrapper)) {
-        listener =
-            new CallbackWrapper(
-                activeSpan(),
-                InstrumentationContext.get(Request.class, AgentSpan.class).get(request),
-                listener);
-      }
+
+    public static class WrapRequestFailureListener {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter(
+                @Advice.This Request request,
+                @Advice.Argument(value = 0, readOnly = false) Request.FailureListener listener) {
+            if (!(listener instanceof CallbackWrapper)) {
+                listener = new CallbackWrapper(
+                        activeSpan(),
+                        InstrumentationContext.get(Request.class, AgentSpan.class)
+                                .get(request),
+                        listener);
+            }
+        }
+
+        private String muzzleCheck(Request request) {
+            return request.getMethod(); // Before 9.1 returns an HttpMethod.
+        }
+    }
+
+    public static class WrapRequestSuccessListener {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter(
+                @Advice.This Request request,
+                @Advice.Argument(value = 0, readOnly = false) Request.SuccessListener listener) {
+            if (!(listener instanceof CallbackWrapper)) {
+                listener = new CallbackWrapper(
+                        activeSpan(),
+                        InstrumentationContext.get(Request.class, AgentSpan.class)
+                                .get(request),
+                        listener);
+            }
+        }
+
+        private String muzzleCheck(Request request) {
+            return request.getMethod(); // Before 9.1 returns an HttpMethod.
+        }
     }
 
-    private String muzzleCheck(Request request) {
-      return request.getMethod(); // Before 9.1 returns an HttpMethod.
+    public static class WrapResponseCompleteListener {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter(
+                @Advice.This Request request,
+                @Advice.Argument(value = 0, readOnly = false) Response.CompleteListener listener) {
+            if (!(listener instanceof CallbackWrapper)) {
+                listener = new CallbackWrapper(
+                        activeSpan(),
+                        InstrumentationContext.get(Request.class, AgentSpan.class)
+                                .get(request),
+                        listener);
+            }
+        }
+
+        private String muzzleCheck(Request request) {
+            return request.getMethod(); // Before 9.1 returns an HttpMethod.
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientDecorator.java
index a4efbec88f8..2056c5032b1 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientDecorator.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientDecorator.java
@@ -7,42 +7,42 @@
 import org.eclipse.jetty.client.api.Response;
 
 public class JettyClientDecorator extends HttpClientDecorator<Request, Response> {
-  public static final CharSequence JETTY_CLIENT = UTF8BytesString.create("jetty-client");
-  public static final JettyClientDecorator DECORATE = new JettyClientDecorator();
-  public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jetty-client"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JETTY_CLIENT;
-  }
-
-  @Override
-  protected String method(final Request httpRequest) {
-    return httpRequest.getMethod();
-  }
-
-  @Override
-  protected URI url(final Request httpRequest) {
-    return httpRequest.getURI();
-  }
-
-  @Override
-  protected int status(final Response httpResponse) {
-    return httpResponse.getStatus();
-  }
-
-  @Override
-  protected String getRequestHeader(Request request, String headerName) {
-    return request.getHeaders().get(headerName);
-  }
-
-  @Override
-  protected String getResponseHeader(Response response, String headerName) {
-    return response.getHeaders().get(headerName);
-  }
+    public static final CharSequence JETTY_CLIENT = UTF8BytesString.create("jetty-client");
+    public static final JettyClientDecorator DECORATE = new JettyClientDecorator();
+    public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jetty-client"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JETTY_CLIENT;
+    }
+
+    @Override
+    protected String method(final Request httpRequest) {
+        return httpRequest.getMethod();
+    }
+
+    @Override
+    protected URI url(final Request httpRequest) {
+        return httpRequest.getURI();
+    }
+
+    @Override
+    protected int status(final Response httpResponse) {
+        return httpResponse.getStatus();
+    }
+
+    @Override
+    protected String getRequestHeader(Request request, String headerName) {
+        return request.getHeaders().get(headerName);
+    }
+
+    @Override
+    protected String getResponseHeader(Response response, String headerName) {
+        return response.getHeaders().get(headerName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java
index 03c45052ae7..724b47b8e81 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java
@@ -32,92 +32,90 @@
 
 @AutoService(InstrumenterModule.class)
 public class JettyClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
-  public JettyClientInstrumentation() {
-    super("jetty-client");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.client.HttpClient";
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
+    public JettyClientInstrumentation() {
+        super("jetty-client");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".JettyClientDecorator",
-      "datadog.trace.instrumentation.jetty_client.HeadersInjectAdapter",
-      packageName + ".SpanFinishingCompleteListener"
-    };
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.client.HttpClient";
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "client";
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".JettyClientDecorator",
+            "datadog.trace.instrumentation.jetty_client.HeadersInjectAdapter",
+            packageName + ".SpanFinishingCompleteListener"
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("org.eclipse.jetty.client.api.Request", AgentSpan.class.getName());
-  }
+    @Override
+    public String muzzleDirective() {
+        return "client";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("send"))
-            .and(
-                takesArgument(
-                    0,
-                    namedOneOf(
-                        "org.eclipse.jetty.client.api.Request",
-                        "org.eclipse.jetty.client.HttpRequest")))
-            .and(takesArgument(1, List.class)),
-        JettyClientInstrumentation.class.getName() + "$SendAdvice",
-        JettyClientInstrumentation.class.getName() + "$ContextPropagationAdvice");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.eclipse.jetty.client.api.Request", AgentSpan.class.getName());
+    }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    return singletonMap(RUNNABLE, singletonList("org.eclipse.jetty.util.SocketAddressResolver$1"));
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("send"))
+                        .and(takesArgument(
+                                0,
+                                namedOneOf(
+                                        "org.eclipse.jetty.client.api.Request",
+                                        "org.eclipse.jetty.client.HttpRequest")))
+                        .and(takesArgument(1, List.class)),
+                JettyClientInstrumentation.class.getName() + "$SendAdvice",
+                JettyClientInstrumentation.class.getName() + "$ContextPropagationAdvice");
+    }
 
-  public static class SendAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static AgentSpan methodEnter(
-        @Advice.Argument(0) Request request,
-        @Advice.Argument(1) List<Response.ResponseListener> responseListeners) {
-      AgentSpan span = startSpan("jetty-client", HTTP_REQUEST);
-      InstrumentationContext.get(Request.class, AgentSpan.class).put(request, span);
-      // make sure the span is finished before onComplete callbacks execute
-      responseListeners.add(0, new SpanFinishingCompleteListener(span));
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, request);
-      return span;
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        return singletonMap(RUNNABLE, singletonList("org.eclipse.jetty.util.SocketAddressResolver$1"));
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final AgentSpan span, @Advice.Thrown final Throwable throwable) {
-      if (throwable != null) {
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
+    public static class SendAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static AgentSpan methodEnter(
+                @Advice.Argument(0) Request request,
+                @Advice.Argument(1) List<Response.ResponseListener> responseListeners) {
+            AgentSpan span = startSpan("jetty-client", HTTP_REQUEST);
+            InstrumentationContext.get(Request.class, AgentSpan.class).put(request, span);
+            // make sure the span is finished before onComplete callbacks execute
+            responseListeners.add(0, new SpanFinishingCompleteListener(span));
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, request);
+            return span;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(@Advice.Enter final AgentSpan span, @Advice.Thrown final Throwable throwable) {
+            if (throwable != null) {
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
+        }
     }
-  }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(@Advice.Argument(0) final Request request) {
-      final AgentSpan span =
-          InstrumentationContext.get(Request.class, AgentSpan.class).get(request);
-      Context destination = currentContext();
-      if (span != null) {
-        destination = destination.with(span);
-      }
-      DECORATE.injectContext(destination, request, SETTER);
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter(@Advice.Argument(0) final Request request) {
+            final AgentSpan span =
+                    InstrumentationContext.get(Request.class, AgentSpan.class).get(request);
+            Context destination = currentContext();
+            if (span != null) {
+                destination = destination.with(span);
+            }
+            DECORATE.injectContext(destination, request, SETTER);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/SpanFinishingCompleteListener.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/SpanFinishingCompleteListener.java
index b71d9311b4e..9afdca5636c 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/SpanFinishingCompleteListener.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/SpanFinishingCompleteListener.java
@@ -7,19 +7,19 @@
 import org.eclipse.jetty.client.api.Result;
 
 public class SpanFinishingCompleteListener implements Response.CompleteListener {
-  private final AgentSpan span;
+    private final AgentSpan span;
 
-  public SpanFinishingCompleteListener(AgentSpan span) {
-    this.span = span;
-  }
+    public SpanFinishingCompleteListener(AgentSpan span) {
+        this.span = span;
+    }
 
-  @Override
-  public void onComplete(Result result) {
-    if (result.getResponse().getStatus() <= 0) {
-      DECORATE.onError(span, result.getFailure());
+    @Override
+    public void onComplete(Result result) {
+        if (result.getResponse().getStatus() <= 0) {
+            DECORATE.onError(span, result.getFailure());
+        }
+        DECORATE.onResponse(span, result.getResponse());
+        DECORATE.beforeFinish(span);
+        span.finish();
     }
-    DECORATE.onResponse(span, result.getResponse());
-    DECORATE.beforeFinish(span);
-    span.finish();
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java
index a6408178d1f..7f70d911aec 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java
@@ -12,146 +12,146 @@
 
 public class CallbackWrapper implements Response.Listener, Request.Listener {
 
-  private final AgentSpan parent;
-  private final AgentSpan span;
-  private final Object delegate;
-
-  public CallbackWrapper(AgentSpan parent, AgentSpan span, Object delegate) {
-    this.parent = parent;
-    this.span = span;
-    this.delegate = delegate;
-  }
-
-  @Override
-  public void onBegin(Response response) {
-    if (delegate instanceof Response.BeginListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Response.BeginListener) delegate).onBegin(response);
-      }
-    }
-  }
-
-  @Override
-  public void onComplete(Result result) {
-    if (delegate instanceof Response.CompleteListener) {
-      // this probably does the wrong thing, but preserves old behaviour and is consistent
-      // with other http clients with completion callback registration
-      try (ContextScope scope = activate(parent)) {
-        ((Response.CompleteListener) delegate).onComplete(result);
-      }
-    }
-  }
-
-  @Override
-  public void onContent(Response response, ByteBuffer content) {
-    if (delegate instanceof Response.ContentListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Response.ContentListener) delegate).onContent(response, content);
-      }
-    }
-  }
-
-  @Override
-  public void onFailure(Response response, Throwable failure) {
-    if (delegate instanceof Response.FailureListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Response.FailureListener) delegate).onFailure(response, failure);
-      }
-    }
-  }
-
-  @Override
-  public boolean onHeader(Response response, HttpField field) {
-    if (delegate instanceof Response.HeaderListener) {
-      try (ContextScope scope = activate(span)) {
-        return ((Response.HeaderListener) delegate).onHeader(response, field);
-      }
-    }
-    return false;
-  }
-
-  @Override
-  public void onHeaders(Response response) {
-    if (delegate instanceof Response.HeadersListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Response.HeadersListener) delegate).onHeaders(response);
-      }
-    }
-  }
-
-  @Override
-  public void onSuccess(Response response) {
-    if (delegate instanceof Response.SuccessListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Response.SuccessListener) delegate).onSuccess(response);
-      }
-    }
-  }
-
-  @Override
-  public void onBegin(Request request) {
-    if (delegate instanceof Request.BeginListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Request.SuccessListener) delegate).onSuccess(request);
-      }
-    }
-  }
-
-  @Override
-  public void onCommit(Request request) {
-    if (delegate instanceof Request.CommitListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Request.CommitListener) delegate).onCommit(request);
-      }
-    }
-  }
-
-  @Override
-  public void onContent(Request request, ByteBuffer content) {
-    if (delegate instanceof Request.ContentListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Request.ContentListener) delegate).onContent(request, content);
-      }
-    }
-  }
-
-  @Override
-  public void onFailure(Request request, Throwable failure) {
-    if (delegate instanceof Request.FailureListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Request.FailureListener) delegate).onFailure(request, failure);
-      }
-    }
-  }
-
-  @Override
-  public void onHeaders(Request request) {
-    if (delegate instanceof Request.HeadersListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Request.HeadersListener) delegate).onHeaders(request);
-      }
-    }
-  }
-
-  @Override
-  public void onQueued(Request request) {
-    if (delegate instanceof Request.QueuedListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Request.QueuedListener) delegate).onQueued(request);
-      }
-    }
-  }
-
-  @Override
-  public void onSuccess(Request request) {
-    if (delegate instanceof Request.SuccessListener) {
-      try (ContextScope scope = activate(span)) {
-        ((Request.SuccessListener) delegate).onSuccess(request);
-      }
-    }
-  }
-
-  private ContextScope activate(AgentSpan span) {
-    return null == span ? null : activateSpan(span);
-  }
+    private final AgentSpan parent;
+    private final AgentSpan span;
+    private final Object delegate;
+
+    public CallbackWrapper(AgentSpan parent, AgentSpan span, Object delegate) {
+        this.parent = parent;
+        this.span = span;
+        this.delegate = delegate;
+    }
+
+    @Override
+    public void onBegin(Response response) {
+        if (delegate instanceof Response.BeginListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Response.BeginListener) delegate).onBegin(response);
+            }
+        }
+    }
+
+    @Override
+    public void onComplete(Result result) {
+        if (delegate instanceof Response.CompleteListener) {
+            // this probably does the wrong thing, but preserves old behaviour and is consistent
+            // with other http clients with completion callback registration
+            try (ContextScope scope = activate(parent)) {
+                ((Response.CompleteListener) delegate).onComplete(result);
+            }
+        }
+    }
+
+    @Override
+    public void onContent(Response response, ByteBuffer content) {
+        if (delegate instanceof Response.ContentListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Response.ContentListener) delegate).onContent(response, content);
+            }
+        }
+    }
+
+    @Override
+    public void onFailure(Response response, Throwable failure) {
+        if (delegate instanceof Response.FailureListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Response.FailureListener) delegate).onFailure(response, failure);
+            }
+        }
+    }
+
+    @Override
+    public boolean onHeader(Response response, HttpField field) {
+        if (delegate instanceof Response.HeaderListener) {
+            try (ContextScope scope = activate(span)) {
+                return ((Response.HeaderListener) delegate).onHeader(response, field);
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void onHeaders(Response response) {
+        if (delegate instanceof Response.HeadersListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Response.HeadersListener) delegate).onHeaders(response);
+            }
+        }
+    }
+
+    @Override
+    public void onSuccess(Response response) {
+        if (delegate instanceof Response.SuccessListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Response.SuccessListener) delegate).onSuccess(response);
+            }
+        }
+    }
+
+    @Override
+    public void onBegin(Request request) {
+        if (delegate instanceof Request.BeginListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Request.SuccessListener) delegate).onSuccess(request);
+            }
+        }
+    }
+
+    @Override
+    public void onCommit(Request request) {
+        if (delegate instanceof Request.CommitListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Request.CommitListener) delegate).onCommit(request);
+            }
+        }
+    }
+
+    @Override
+    public void onContent(Request request, ByteBuffer content) {
+        if (delegate instanceof Request.ContentListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Request.ContentListener) delegate).onContent(request, content);
+            }
+        }
+    }
+
+    @Override
+    public void onFailure(Request request, Throwable failure) {
+        if (delegate instanceof Request.FailureListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Request.FailureListener) delegate).onFailure(request, failure);
+            }
+        }
+    }
+
+    @Override
+    public void onHeaders(Request request) {
+        if (delegate instanceof Request.HeadersListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Request.HeadersListener) delegate).onHeaders(request);
+            }
+        }
+    }
+
+    @Override
+    public void onQueued(Request request) {
+        if (delegate instanceof Request.QueuedListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Request.QueuedListener) delegate).onQueued(request);
+            }
+        }
+    }
+
+    @Override
+    public void onSuccess(Request request) {
+        if (delegate instanceof Request.SuccessListener) {
+            try (ContextScope scope = activate(span)) {
+                ((Request.SuccessListener) delegate).onSuccess(request);
+            }
+        }
+    }
+
+    private ContextScope activate(AgentSpan span) {
+        return null == span ? null : activateSpan(span);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/HeadersInjectAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/HeadersInjectAdapter.java
index efad6db8fc6..5dfb8a73919 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/HeadersInjectAdapter.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/HeadersInjectAdapter.java
@@ -7,10 +7,10 @@
 @ParametersAreNonnullByDefault
 public class HeadersInjectAdapter implements CarrierSetter<Request> {
 
-  public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter();
+    public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter();
 
-  @Override
-  public void set(final Request carrier, final String key, final String value) {
-    carrier.header(key, value);
-  }
+    @Override
+    public void set(final Request carrier, final String key, final String value) {
+        carrier.header(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/ConnectionHandleRequestVisitor.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/ConnectionHandleRequestVisitor.java
index 3c808faaf33..fa814e7a5df 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/ConnectionHandleRequestVisitor.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/ConnectionHandleRequestVisitor.java
@@ -4,39 +4,31 @@
 import net.bytebuddy.jar.asm.MethodVisitor;
 
 public class ConnectionHandleRequestVisitor extends ClassVisitor {
-  private final String connClassInternalName;
-  private int classVersion;
+    private final String connClassInternalName;
+    private int classVersion;
 
-  public ConnectionHandleRequestVisitor(
-      int api, ClassVisitor classVisitor, String connClassInternalName) {
-    super(api, classVisitor);
-    this.connClassInternalName = connClassInternalName;
-  }
+    public ConnectionHandleRequestVisitor(int api, ClassVisitor classVisitor, String connClassInternalName) {
+        super(api, classVisitor);
+        this.connClassInternalName = connClassInternalName;
+    }
 
-  @Override
-  public void visit(
-      int version,
-      int access,
-      String name,
-      String signature,
-      String superName,
-      String[] interfaces) {
-    this.classVersion = version & 0x00FF;
-    super.visit(version, access, name, signature, superName, interfaces);
-  }
+    @Override
+    public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+        this.classVersion = version & 0x00FF;
+        super.visit(version, access, name, signature, superName, interfaces);
+    }
 
-  @Override
-  public MethodVisitor visitMethod(
-      int access, String name, String descriptor, String signature, String[] exceptions) {
-    MethodVisitor superVisitor = super.visitMethod(access, name, descriptor, signature, exceptions);
-    if (name.equals("handleRequest") && descriptor.equals("()V")) {
-      MethodVisitor mcfMv = new MergeConsecutiveFramesMethodVisitor(this.api, superVisitor);
-      DelayLoadsMethodVisitor delayLoadsMethodVisitor =
-          new DelayLoadsMethodVisitor(this.api, mcfMv);
-      return new HandleRequestVisitor(
-          this.api, this.classVersion, delayLoadsMethodVisitor, this.connClassInternalName);
-    } else {
-      return superVisitor;
+    @Override
+    public MethodVisitor visitMethod(
+            int access, String name, String descriptor, String signature, String[] exceptions) {
+        MethodVisitor superVisitor = super.visitMethod(access, name, descriptor, signature, exceptions);
+        if (name.equals("handleRequest") && descriptor.equals("()V")) {
+            MethodVisitor mcfMv = new MergeConsecutiveFramesMethodVisitor(this.api, superVisitor);
+            DelayLoadsMethodVisitor delayLoadsMethodVisitor = new DelayLoadsMethodVisitor(this.api, mcfMv);
+            return new HandleRequestVisitor(
+                    this.api, this.classVersion, delayLoadsMethodVisitor, this.connClassInternalName);
+        } else {
+            return superVisitor;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/DelayLoadsMethodVisitor.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/DelayLoadsMethodVisitor.java
index 874fdc0a2b5..4294682e798 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/DelayLoadsMethodVisitor.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/DelayLoadsMethodVisitor.java
@@ -10,190 +10,184 @@
 import net.bytebuddy.jar.asm.TypePath;
 
 public class DelayLoadsMethodVisitor extends MethodVisitor {
-  private final List<Integer> heldLoads = new ArrayList();
-
-  public DelayLoadsMethodVisitor(int api, MethodVisitor methodVisitor) {
-    super(api, methodVisitor);
-  }
-
-  public void commitLoads(List<Integer> heldLoads) {
-    for (Integer idx : heldLoads) {
-      super.visitVarInsn(Opcodes.ALOAD, idx);
-    }
-    heldLoads.clear();
-  }
-
-  public List<Integer> transferLoads() {
-    ArrayList<Integer> copy = new ArrayList<>(this.heldLoads);
-    this.heldLoads.clear();
-    return copy;
-  }
-
-  private void commitLoads() {
-    commitLoads(this.heldLoads);
-  }
-
-  @Override
-  public void visitFrame(int type, int numLocal, Object[] local, int numStack, Object[] stack) {
-    commitLoads();
-    super.visitFrame(type, numLocal, local, numStack, stack);
-  }
-
-  @Override
-  public void visitInsn(int opcode) {
-    commitLoads();
-    super.visitInsn(opcode);
-  }
-
-  @Override
-  public void visitIntInsn(int opcode, int operand) {
-    commitLoads();
-    super.visitIntInsn(opcode, operand);
-  }
-
-  @Override
-  public void visitVarInsn(int opcode, int varIndex) {
-    if (opcode == Opcodes.ALOAD) {
-      heldLoads.add(varIndex);
-    } else {
-      commitLoads();
-      super.visitVarInsn(opcode, varIndex);
-    }
-  }
-
-  @Override
-  public void visitTypeInsn(int opcode, String type) {
-    commitLoads();
-    super.visitTypeInsn(opcode, type);
-  }
-
-  @Override
-  public void visitFieldInsn(int opcode, String owner, String name, String descriptor) {
-    commitLoads();
-    super.visitFieldInsn(opcode, owner, name, descriptor);
-  }
-
-  @Override
-  public void visitMethodInsn(int opcode, String owner, String name, String descriptor) {
-    commitLoads();
-    super.visitMethodInsn(opcode, owner, name, descriptor);
-  }
-
-  @Override
-  public void visitMethodInsn(
-      int opcode, String owner, String name, String descriptor, boolean isInterface) {
-    commitLoads();
-    super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-  }
-
-  @Override
-  public void visitInvokeDynamicInsn(
-      String name,
-      String descriptor,
-      Handle bootstrapMethodHandle,
-      Object... bootstrapMethodArguments) {
-    commitLoads();
-    super.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
-  }
-
-  @Override
-  public void visitJumpInsn(int opcode, Label label) {
-    commitLoads();
-    super.visitJumpInsn(opcode, label);
-  }
-
-  @Override
-  public void visitLabel(Label label) {
-    commitLoads();
-    super.visitLabel(label);
-  }
-
-  @Override
-  public void visitLdcInsn(Object value) {
-    commitLoads();
-    super.visitLdcInsn(value);
-  }
-
-  @Override
-  public void visitIincInsn(int varIndex, int increment) {
-    commitLoads();
-    super.visitIincInsn(varIndex, increment);
-  }
-
-  @Override
-  public void visitTableSwitchInsn(int min, int max, Label dflt, Label... labels) {
-    commitLoads();
-    super.visitTableSwitchInsn(min, max, dflt, labels);
-  }
-
-  @Override
-  public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
-    commitLoads();
-    super.visitLookupSwitchInsn(dflt, keys, labels);
-  }
-
-  @Override
-  public void visitMultiANewArrayInsn(String descriptor, int numDimensions) {
-    commitLoads();
-    super.visitMultiANewArrayInsn(descriptor, numDimensions);
-  }
-
-  @Override
-  public AnnotationVisitor visitInsnAnnotation(
-      int typeRef, TypePath typePath, String descriptor, boolean visible) {
-    commitLoads();
-    return super.visitInsnAnnotation(typeRef, typePath, descriptor, visible);
-  }
-
-  @Override
-  public void visitTryCatchBlock(Label start, Label end, Label handler, String type) {
-    commitLoads();
-    super.visitTryCatchBlock(start, end, handler, type);
-  }
-
-  @Override
-  public AnnotationVisitor visitTryCatchAnnotation(
-      int typeRef, TypePath typePath, String descriptor, boolean visible) {
-    commitLoads();
-    return super.visitTryCatchAnnotation(typeRef, typePath, descriptor, visible);
-  }
-
-  @Override
-  public void visitLocalVariable(
-      String name, String descriptor, String signature, Label start, Label end, int index) {
-    commitLoads();
-    super.visitLocalVariable(name, descriptor, signature, start, end, index);
-  }
-
-  @Override
-  public AnnotationVisitor visitLocalVariableAnnotation(
-      int typeRef,
-      TypePath typePath,
-      Label[] start,
-      Label[] end,
-      int[] index,
-      String descriptor,
-      boolean visible) {
-    commitLoads();
-    return super.visitLocalVariableAnnotation(
-        typeRef, typePath, start, end, index, descriptor, visible);
-  }
-
-  @Override
-  public void visitLineNumber(int line, Label start) {
-    commitLoads();
-    super.visitLineNumber(line, start);
-  }
-
-  @Override
-  public void visitMaxs(int maxStack, int maxLocals) {
-    commitLoads();
-    super.visitMaxs(maxStack, maxLocals);
-  }
-
-  @Override
-  public void visitEnd() {
-    commitLoads();
-    super.visitEnd();
-  }
+    private final List<Integer> heldLoads = new ArrayList();
+
+    public DelayLoadsMethodVisitor(int api, MethodVisitor methodVisitor) {
+        super(api, methodVisitor);
+    }
+
+    public void commitLoads(List<Integer> heldLoads) {
+        for (Integer idx : heldLoads) {
+            super.visitVarInsn(Opcodes.ALOAD, idx);
+        }
+        heldLoads.clear();
+    }
+
+    public List<Integer> transferLoads() {
+        ArrayList<Integer> copy = new ArrayList<>(this.heldLoads);
+        this.heldLoads.clear();
+        return copy;
+    }
+
+    private void commitLoads() {
+        commitLoads(this.heldLoads);
+    }
+
+    @Override
+    public void visitFrame(int type, int numLocal, Object[] local, int numStack, Object[] stack) {
+        commitLoads();
+        super.visitFrame(type, numLocal, local, numStack, stack);
+    }
+
+    @Override
+    public void visitInsn(int opcode) {
+        commitLoads();
+        super.visitInsn(opcode);
+    }
+
+    @Override
+    public void visitIntInsn(int opcode, int operand) {
+        commitLoads();
+        super.visitIntInsn(opcode, operand);
+    }
+
+    @Override
+    public void visitVarInsn(int opcode, int varIndex) {
+        if (opcode == Opcodes.ALOAD) {
+            heldLoads.add(varIndex);
+        } else {
+            commitLoads();
+            super.visitVarInsn(opcode, varIndex);
+        }
+    }
+
+    @Override
+    public void visitTypeInsn(int opcode, String type) {
+        commitLoads();
+        super.visitTypeInsn(opcode, type);
+    }
+
+    @Override
+    public void visitFieldInsn(int opcode, String owner, String name, String descriptor) {
+        commitLoads();
+        super.visitFieldInsn(opcode, owner, name, descriptor);
+    }
+
+    @Override
+    public void visitMethodInsn(int opcode, String owner, String name, String descriptor) {
+        commitLoads();
+        super.visitMethodInsn(opcode, owner, name, descriptor);
+    }
+
+    @Override
+    public void visitMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) {
+        commitLoads();
+        super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+    }
+
+    @Override
+    public void visitInvokeDynamicInsn(
+            String name, String descriptor, Handle bootstrapMethodHandle, Object... bootstrapMethodArguments) {
+        commitLoads();
+        super.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
+    }
+
+    @Override
+    public void visitJumpInsn(int opcode, Label label) {
+        commitLoads();
+        super.visitJumpInsn(opcode, label);
+    }
+
+    @Override
+    public void visitLabel(Label label) {
+        commitLoads();
+        super.visitLabel(label);
+    }
+
+    @Override
+    public void visitLdcInsn(Object value) {
+        commitLoads();
+        super.visitLdcInsn(value);
+    }
+
+    @Override
+    public void visitIincInsn(int varIndex, int increment) {
+        commitLoads();
+        super.visitIincInsn(varIndex, increment);
+    }
+
+    @Override
+    public void visitTableSwitchInsn(int min, int max, Label dflt, Label... labels) {
+        commitLoads();
+        super.visitTableSwitchInsn(min, max, dflt, labels);
+    }
+
+    @Override
+    public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
+        commitLoads();
+        super.visitLookupSwitchInsn(dflt, keys, labels);
+    }
+
+    @Override
+    public void visitMultiANewArrayInsn(String descriptor, int numDimensions) {
+        commitLoads();
+        super.visitMultiANewArrayInsn(descriptor, numDimensions);
+    }
+
+    @Override
+    public AnnotationVisitor visitInsnAnnotation(int typeRef, TypePath typePath, String descriptor, boolean visible) {
+        commitLoads();
+        return super.visitInsnAnnotation(typeRef, typePath, descriptor, visible);
+    }
+
+    @Override
+    public void visitTryCatchBlock(Label start, Label end, Label handler, String type) {
+        commitLoads();
+        super.visitTryCatchBlock(start, end, handler, type);
+    }
+
+    @Override
+    public AnnotationVisitor visitTryCatchAnnotation(
+            int typeRef, TypePath typePath, String descriptor, boolean visible) {
+        commitLoads();
+        return super.visitTryCatchAnnotation(typeRef, typePath, descriptor, visible);
+    }
+
+    @Override
+    public void visitLocalVariable(
+            String name, String descriptor, String signature, Label start, Label end, int index) {
+        commitLoads();
+        super.visitLocalVariable(name, descriptor, signature, start, end, index);
+    }
+
+    @Override
+    public AnnotationVisitor visitLocalVariableAnnotation(
+            int typeRef,
+            TypePath typePath,
+            Label[] start,
+            Label[] end,
+            int[] index,
+            String descriptor,
+            boolean visible) {
+        commitLoads();
+        return super.visitLocalVariableAnnotation(typeRef, typePath, start, end, index, descriptor, visible);
+    }
+
+    @Override
+    public void visitLineNumber(int line, Label start) {
+        commitLoads();
+        super.visitLineNumber(line, start);
+    }
+
+    @Override
+    public void visitMaxs(int maxStack, int maxLocals) {
+        commitLoads();
+        super.visitMaxs(maxStack, maxLocals);
+    }
+
+    @Override
+    public void visitEnd() {
+        commitLoads();
+        super.visitEnd();
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/HandleRequestVisitor.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/HandleRequestVisitor.java
index 4c832fa4891..496dbbe6258 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/HandleRequestVisitor.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/HandleRequestVisitor.java
@@ -27,102 +27,97 @@
  * <p>It needs first to get the index of the context variable that's set when a new span is created.
  */
 public class HandleRequestVisitor extends MethodVisitor {
-  private static final Logger log = LoggerFactory.getLogger(HandleRequestVisitor.class);
+    private static final Logger log = LoggerFactory.getLogger(HandleRequestVisitor.class);
 
-  private final int classVersion;
-  private final String connClassInternalName;
-  private boolean success;
+    private final int classVersion;
+    private final String connClassInternalName;
+    private boolean success;
 
-  public HandleRequestVisitor(
-      int api,
-      int classVersion,
-      DelayLoadsMethodVisitor methodVisitor,
-      String connClassInternalName) {
-    super(api, methodVisitor);
-    this.classVersion = classVersion;
-    this.connClassInternalName = connClassInternalName;
-  }
+    public HandleRequestVisitor(
+            int api, int classVersion, DelayLoadsMethodVisitor methodVisitor, String connClassInternalName) {
+        super(api, methodVisitor);
+        this.classVersion = classVersion;
+        this.connClassInternalName = connClassInternalName;
+    }
 
-  DelayLoadsMethodVisitor delayVisitorDelegate() {
-    return (DelayLoadsMethodVisitor) this.mv;
-  }
+    DelayLoadsMethodVisitor delayVisitorDelegate() {
+        return (DelayLoadsMethodVisitor) this.mv;
+    }
 
-  @Override
-  public void visitMethodInsn(
-      int opcode, String owner, String name, String descriptor, boolean isInterface) {
-    if (opcode == Opcodes.INVOKEVIRTUAL
-        && owner.equals("org/eclipse/jetty/server/Server")
-        && name.equals("handle")
-        && descriptor.equals("(L" + this.connClassInternalName + ";)V")) {
-      DelayLoadsMethodVisitor mv = delayVisitorDelegate();
-      List<Integer> savedLoads = mv.transferLoads();
-      if (savedLoads.size() != 2) {
-        mv.commitLoads(savedLoads);
-        super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-        return;
-      }
+    @Override
+    public void visitMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) {
+        if (opcode == Opcodes.INVOKEVIRTUAL
+                && owner.equals("org/eclipse/jetty/server/Server")
+                && name.equals("handle")
+                && descriptor.equals("(L" + this.connClassInternalName + ";)V")) {
+            DelayLoadsMethodVisitor mv = delayVisitorDelegate();
+            List<Integer> savedLoads = mv.transferLoads();
+            if (savedLoads.size() != 2) {
+                mv.commitLoads(savedLoads);
+                super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+                return;
+            }
 
-      Label afterHandle = new Label();
+            Label afterHandle = new Label();
 
-      // Add Request, Response and Context onto the stack
-      super.visitVarInsn(Opcodes.ALOAD, 0);
-      super.visitMethodInsn(
-          Opcodes.INVOKEVIRTUAL,
-          this.connClassInternalName,
-          "getRequest",
-          "()Lorg/eclipse/jetty/server/Request;",
-          false);
-      super.visitVarInsn(Opcodes.ALOAD, 0);
-      super.visitMethodInsn(
-          Opcodes.INVOKEVIRTUAL,
-          this.connClassInternalName,
-          "getResponse",
-          "()Lorg/eclipse/jetty/server/Response;",
-          false);
+            // Add Request, Response and Context onto the stack
+            super.visitVarInsn(Opcodes.ALOAD, 0);
+            super.visitMethodInsn(
+                    Opcodes.INVOKEVIRTUAL,
+                    this.connClassInternalName,
+                    "getRequest",
+                    "()Lorg/eclipse/jetty/server/Request;",
+                    false);
+            super.visitVarInsn(Opcodes.ALOAD, 0);
+            super.visitMethodInsn(
+                    Opcodes.INVOKEVIRTUAL,
+                    this.connClassInternalName,
+                    "getResponse",
+                    "()Lorg/eclipse/jetty/server/Response;",
+                    false);
 
-      super.visitMethodInsn(
-          INVOKESTATIC,
-          Type.getInternalName(Java8BytecodeBridge.class),
-          "currentContext",
-          "()Ldatadog/context/Context;",
-          false);
-      // Call JettyBlockingHelper.block(request, response, context)
-      super.visitMethodInsn(
-          Opcodes.INVOKESTATIC,
-          Type.getInternalName(JettyBlockingHelper.class),
-          "block",
-          "(Lorg/eclipse/jetty/server/Request;Lorg/eclipse/jetty/server/Response;"
-              + Type.getDescriptor(Context.class)
-              + ")Z",
-          false);
-      // Jump after handle if blocked
-      super.visitJumpInsn(Opcodes.IFNE, afterHandle);
+            super.visitMethodInsn(
+                    INVOKESTATIC,
+                    Type.getInternalName(Java8BytecodeBridge.class),
+                    "currentContext",
+                    "()Ldatadog/context/Context;",
+                    false);
+            // Call JettyBlockingHelper.block(request, response, context)
+            super.visitMethodInsn(
+                    Opcodes.INVOKESTATIC,
+                    Type.getInternalName(JettyBlockingHelper.class),
+                    "block",
+                    "(Lorg/eclipse/jetty/server/Request;Lorg/eclipse/jetty/server/Response;"
+                            + Type.getDescriptor(Context.class)
+                            + ")Z",
+                    false);
+            // Jump after handle if blocked
+            super.visitJumpInsn(Opcodes.IFNE, afterHandle);
 
-      // Inject default handle instructions
-      mv.commitLoads(savedLoads);
-      super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-      // Add after handle label
-      super.visitLabel(afterHandle);
-      if (needsStackFrames()) {
-        super.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
-      }
-      this.success = true;
-      return;
-    }
+            // Inject default handle instructions
+            mv.commitLoads(savedLoads);
+            super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+            // Add after handle label
+            super.visitLabel(afterHandle);
+            if (needsStackFrames()) {
+                super.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
+            }
+            this.success = true;
+            return;
+        }
 
-    super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-  }
+        super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+    }
 
-  @Override
-  public void visitEnd() {
-    if (!success) {
-      log.warn(
-          "Transformation of Jetty's connection class was not successful. Blocking will likely not work");
+    @Override
+    public void visitEnd() {
+        if (!success) {
+            log.warn("Transformation of Jetty's connection class was not successful. Blocking will likely not work");
+        }
+        super.visitEnd();
     }
-    super.visitEnd();
-  }
 
-  private boolean needsStackFrames() {
-    return this.classVersion >= 50; // 1.6
-  }
+    private boolean needsStackFrames() {
+        return this.classVersion >= 50; // 1.6
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockResponseFunction.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockResponseFunction.java
index 5775d5b687d..0bb0434a297 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockResponseFunction.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockResponseFunction.java
@@ -8,21 +8,21 @@
 import org.eclipse.jetty.server.Response;
 
 public class JettyBlockResponseFunction implements BlockResponseFunction {
-  private final Request request;
+    private final Request request;
 
-  public JettyBlockResponseFunction(Request request) {
-    this.request = request;
-  }
+    public JettyBlockResponseFunction(Request request) {
+        this.request = request;
+    }
 
-  @Override
-  public boolean tryCommitBlockingResponse(
-      TraceSegment segment,
-      int statusCode,
-      BlockingContentType templateType,
-      Map<String, String> extraHeaders,
-      String securityResponseId) {
-    Response response = request.getResponse();
-    return JettyBlockingHelper.block(
-        segment, request, response, statusCode, templateType, extraHeaders, securityResponseId);
-  }
+    @Override
+    public boolean tryCommitBlockingResponse(
+            TraceSegment segment,
+            int statusCode,
+            BlockingContentType templateType,
+            Map<String, String> extraHeaders,
+            String securityResponseId) {
+        Response response = request.getResponse();
+        return JettyBlockingHelper.block(
+                segment, request, response, statusCode, templateType, extraHeaders, securityResponseId);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockingHelper.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockingHelper.java
index c8704f5f895..1d0f486c713 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockingHelper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockingHelper.java
@@ -27,230 +27,210 @@
 import org.slf4j.LoggerFactory;
 
 public class JettyBlockingHelper {
-  private static final Logger log = LoggerFactory.getLogger(JettyBlockingHelper.class);
-  private static final MethodHandle GET_OUTPUT_STREAM;
-  private static final MethodHandle CLOSE_OUTPUT;
-  private static final MethodHandle GET_ASYNC_CONTEXT;
-  private static final MethodHandle COMPLETE;
-  private static final MethodHandle IS_ASYNC_STARTED;
-  private static final MethodHandle ABORT;
-  private static final boolean INITIALIZED;
-
-  static {
-    MethodHandle getOutputStreamMH = null;
-    MethodHandle closeOutputMH = null;
-    MethodHandle getAsyncContextMH = null;
-    MethodHandle completeMH = null;
-    MethodHandle isAsyncStartedMH = null;
-    MethodHandle abortMH = null;
-
-    try {
-      Method getOutputStream = Response.class.getMethod("getOutputStream");
-      getOutputStreamMH = lookup().unreflect(getOutputStream);
-    } catch (IllegalAccessException | NoSuchMethodException | RuntimeException e) {
-      log.error("Lookup of getOutputStream failed. Will be unable to commit blocking response", e);
-    }
-    try {
-      closeOutputMH = lookup().findVirtual(Response.class, "complete", methodType(void.class));
-    } catch (IllegalAccessException | NoSuchMethodException | RuntimeException e) {
-      try {
-        closeOutputMH = lookup().findVirtual(Response.class, "closeOutput", methodType(void.class));
-      } catch (IllegalAccessException | NoSuchMethodException | RuntimeException e2) {
-        log.error(
-            "Lookup of closeOutput/complete failed. Will be unable to commit blocking response",
-            e2);
-      }
-    }
-    try {
-      // return value varies between versions
-      Method getAsyncContext = Request.class.getMethod("getAsyncContext");
-      getAsyncContextMH = lookup().unreflect(getAsyncContext);
-      completeMH =
-          lookup()
-              .findVirtual(
-                  getAsyncContextMH.type().returnType(), "complete", methodType(void.class));
-    } catch (IllegalAccessException | NoSuchMethodException | RuntimeException e) {
-      log.error("Lookup of getAsyncContext failed. Will be unable to commit blocking response", e);
-    }
-    try {
-      isAsyncStartedMH =
-          lookup().findVirtual(Request.class, "isAsyncStarted", methodType(boolean.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
-      log.debug("Could not find {}#isAsyncStarted()", Request.class.getName());
+    private static final Logger log = LoggerFactory.getLogger(JettyBlockingHelper.class);
+    private static final MethodHandle GET_OUTPUT_STREAM;
+    private static final MethodHandle CLOSE_OUTPUT;
+    private static final MethodHandle GET_ASYNC_CONTEXT;
+    private static final MethodHandle COMPLETE;
+    private static final MethodHandle IS_ASYNC_STARTED;
+    private static final MethodHandle ABORT;
+    private static final boolean INITIALIZED;
+
+    static {
+        MethodHandle getOutputStreamMH = null;
+        MethodHandle closeOutputMH = null;
+        MethodHandle getAsyncContextMH = null;
+        MethodHandle completeMH = null;
+        MethodHandle isAsyncStartedMH = null;
+        MethodHandle abortMH = null;
+
+        try {
+            Method getOutputStream = Response.class.getMethod("getOutputStream");
+            getOutputStreamMH = lookup().unreflect(getOutputStream);
+        } catch (IllegalAccessException | NoSuchMethodException | RuntimeException e) {
+            log.error("Lookup of getOutputStream failed. Will be unable to commit blocking response", e);
+        }
+        try {
+            closeOutputMH = lookup().findVirtual(Response.class, "complete", methodType(void.class));
+        } catch (IllegalAccessException | NoSuchMethodException | RuntimeException e) {
+            try {
+                closeOutputMH = lookup().findVirtual(Response.class, "closeOutput", methodType(void.class));
+            } catch (IllegalAccessException | NoSuchMethodException | RuntimeException e2) {
+                log.error("Lookup of closeOutput/complete failed. Will be unable to commit blocking response", e2);
+            }
+        }
+        try {
+            // return value varies between versions
+            Method getAsyncContext = Request.class.getMethod("getAsyncContext");
+            getAsyncContextMH = lookup().unreflect(getAsyncContext);
+            completeMH =
+                    lookup().findVirtual(getAsyncContextMH.type().returnType(), "complete", methodType(void.class));
+        } catch (IllegalAccessException | NoSuchMethodException | RuntimeException e) {
+            log.error("Lookup of getAsyncContext failed. Will be unable to commit blocking response", e);
+        }
+        try {
+            isAsyncStartedMH = lookup().findVirtual(Request.class, "isAsyncStarted", methodType(boolean.class));
+        } catch (NoSuchMethodException | IllegalAccessException e) {
+            log.debug("Could not find {}#isAsyncStarted()", Request.class.getName());
+
+            try {
+                Class<?> asyncContinuationCls = Class.forName(
+                        "org.eclipse.jetty.server.AsyncContinuation", true, JettyBlockingHelper.class.getClassLoader());
+                MethodHandle getAsyncContinuation =
+                        lookup().findVirtual(Request.class, "getAsyncContinuation", methodType(asyncContinuationCls));
+                MethodHandle isAsyncStarted =
+                        lookup().findVirtual(asyncContinuationCls, "isAsyncStarted", methodType(boolean.class));
+                isAsyncStartedMH = MethodHandles.filterArguments(isAsyncStarted, 0, getAsyncContinuation);
+            } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException ex) {
+                log.error(
+                        "Could not build method handle for calling request.getAsyncContinuation.isAsyncStarted. "
+                                + "Will be unable to commit blocking response",
+                        e);
+            }
+        }
+        try {
+            Class<?> httpConnectionCls;
+            try {
+                httpConnectionCls = Class.forName(
+                        "org.eclipse.jetty.server.AbstractHttpConnection",
+                        true,
+                        JettyBlockingHelper.class.getClassLoader());
+            } catch (ClassNotFoundException cnfe) {
+                httpConnectionCls = Class.forName(
+                        "org.eclipse.jetty.server.HttpConnection", true, JettyBlockingHelper.class.getClassLoader());
+            }
+            MethodHandle getConnection =
+                    lookup().findVirtual(Request.class, "getConnection", methodType(httpConnectionCls));
+            MethodHandle getEndPoint =
+                    lookup().findVirtual(httpConnectionCls, "getEndPoint", MethodType.methodType(EndPoint.class));
+            MethodHandle close = lookup().findVirtual(EndPoint.class, "close", methodType(void.class));
+            abortMH = collectArguments(collectArguments(close, 0, getEndPoint), 0, getConnection);
+        } catch (NoSuchMethodException | IllegalAccessException | ClassNotFoundException e) {
+            try {
+                Class<?> httpChannelCls = Class.forName(
+                        "org.eclipse.jetty.server.HttpChannel", true, JettyBlockingHelper.class.getClassLoader());
+                MethodHandle getHttpChannel =
+                        lookup().findVirtual(Request.class, "getHttpChannel", methodType(httpChannelCls));
+                MethodHandle getEndPoint =
+                        lookup().findVirtual(httpChannelCls, "getEndPoint", methodType(EndPoint.class));
+                MethodHandle close = lookup().findVirtual(EndPoint.class, "close", methodType(void.class));
+                abortMH = collectArguments(collectArguments(close, 0, getEndPoint), 0, getHttpChannel);
+            } catch (ClassNotFoundException | IllegalAccessException | NoSuchMethodException ex) {
+                log.debug("No endpoint closing sequence of operations was valid");
+            }
+        }
 
-      try {
-        Class<?> asyncContinuationCls =
-            Class.forName(
-                "org.eclipse.jetty.server.AsyncContinuation",
-                true,
-                JettyBlockingHelper.class.getClassLoader());
-        MethodHandle getAsyncContinuation =
-            lookup()
-                .findVirtual(
-                    Request.class, "getAsyncContinuation", methodType(asyncContinuationCls));
-        MethodHandle isAsyncStarted =
-            lookup().findVirtual(asyncContinuationCls, "isAsyncStarted", methodType(boolean.class));
-        isAsyncStartedMH = MethodHandles.filterArguments(isAsyncStarted, 0, getAsyncContinuation);
-      } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException ex) {
-        log.error(
-            "Could not build method handle for calling request.getAsyncContinuation.isAsyncStarted. "
-                + "Will be unable to commit blocking response",
-            e);
-      }
-    }
-    try {
-      Class<?> httpConnectionCls;
-      try {
-        httpConnectionCls =
-            Class.forName(
-                "org.eclipse.jetty.server.AbstractHttpConnection",
-                true,
-                JettyBlockingHelper.class.getClassLoader());
-      } catch (ClassNotFoundException cnfe) {
-        httpConnectionCls =
-            Class.forName(
-                "org.eclipse.jetty.server.HttpConnection",
-                true,
-                JettyBlockingHelper.class.getClassLoader());
-      }
-      MethodHandle getConnection =
-          lookup().findVirtual(Request.class, "getConnection", methodType(httpConnectionCls));
-      MethodHandle getEndPoint =
-          lookup()
-              .findVirtual(httpConnectionCls, "getEndPoint", MethodType.methodType(EndPoint.class));
-      MethodHandle close = lookup().findVirtual(EndPoint.class, "close", methodType(void.class));
-      abortMH = collectArguments(collectArguments(close, 0, getEndPoint), 0, getConnection);
-    } catch (NoSuchMethodException | IllegalAccessException | ClassNotFoundException e) {
-      try {
-        Class<?> httpChannelCls =
-            Class.forName(
-                "org.eclipse.jetty.server.HttpChannel",
-                true,
-                JettyBlockingHelper.class.getClassLoader());
-        MethodHandle getHttpChannel =
-            lookup().findVirtual(Request.class, "getHttpChannel", methodType(httpChannelCls));
-        MethodHandle getEndPoint =
-            lookup().findVirtual(httpChannelCls, "getEndPoint", methodType(EndPoint.class));
-        MethodHandle close = lookup().findVirtual(EndPoint.class, "close", methodType(void.class));
-        abortMH = collectArguments(collectArguments(close, 0, getEndPoint), 0, getHttpChannel);
-      } catch (ClassNotFoundException | IllegalAccessException | NoSuchMethodException ex) {
-        log.debug("No endpoint closing sequence of operations was valid");
-      }
+        GET_OUTPUT_STREAM = getOutputStreamMH;
+        CLOSE_OUTPUT = closeOutputMH;
+        GET_ASYNC_CONTEXT = getAsyncContextMH;
+        COMPLETE = completeMH;
+        IS_ASYNC_STARTED = isAsyncStartedMH;
+        ABORT = abortMH; // excluded from INITIALIZED
+        INITIALIZED = getAsyncContextMH != null
+                && closeOutputMH != null
+                && getAsyncContextMH != null
+                && completeMH != null
+                && isAsyncStartedMH != null;
     }
 
-    GET_OUTPUT_STREAM = getOutputStreamMH;
-    CLOSE_OUTPUT = closeOutputMH;
-    GET_ASYNC_CONTEXT = getAsyncContextMH;
-    COMPLETE = completeMH;
-    IS_ASYNC_STARTED = isAsyncStartedMH;
-    ABORT = abortMH; // excluded from INITIALIZED
-    INITIALIZED =
-        getAsyncContextMH != null
-            && closeOutputMH != null
-            && getAsyncContextMH != null
-            && completeMH != null
-            && isAsyncStartedMH != null;
-  }
-
-  private JettyBlockingHelper() {}
+    private JettyBlockingHelper() {}
+
+    public static boolean block(
+            TraceSegment segment,
+            Request request,
+            Response response,
+            int statusCode,
+            BlockingContentType bct,
+            Map<String, String> extraHeaders,
+            String securityResponseId) {
+        if (!INITIALIZED) {
+            return false;
+        }
+        if (response.isCommitted()) {
+            return true;
+        }
 
-  public static boolean block(
-      TraceSegment segment,
-      Request request,
-      Response response,
-      int statusCode,
-      BlockingContentType bct,
-      Map<String, String> extraHeaders,
-      String securityResponseId) {
-    if (!INITIALIZED) {
-      return false;
-    }
-    if (response.isCommitted()) {
-      return true;
+        request.setAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE, Boolean.TRUE);
+
+        try {
+            response.reset();
+            response.setStatus(BlockingActionHelper.getHttpCode(statusCode));
+            String acceptHeader = request.getHeader("Accept");
+
+            for (Map.Entry<String, String> e : extraHeaders.entrySet()) {
+                response.setHeader(e.getKey(), e.getValue());
+            }
+
+            if (bct != BlockingContentType.NONE) {
+                BlockingActionHelper.TemplateType type = BlockingActionHelper.determineTemplateType(bct, acceptHeader);
+                response.setCharacterEncoding("utf-8");
+                response.setHeader("Content-type", BlockingActionHelper.getContentType(type));
+                byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+
+                if (!response.isWriting()) {
+                    response.setHeader("Content-length", Integer.toString(template.length));
+                    OutputStream os = (OutputStream) GET_OUTPUT_STREAM.invoke(response);
+                    os.write(template);
+                    os.close();
+                } else {
+                    PrintWriter writer = response.getWriter();
+                    String respBody = new String(template, StandardCharsets.UTF_8);
+                    // this might be problematic because the encoding of the writer may not be utf-8
+                    String respEncoding = response.getCharacterEncoding();
+                    if ("utf-8".equalsIgnoreCase(respEncoding)) {
+                        response.setHeader("Content-length", Integer.toString(template.length));
+                    } // otherwise we don't really know the size after encoding, so don't set the header
+                    writer.write(respBody);
+                    writer.close();
+                }
+            }
+            segment.effectivelyBlocked();
+            CLOSE_OUTPUT.invoke(response);
+            if (ABORT != null) {
+                // needed by jetty 9.0.0-9.1.3
+                // see https://github.com/eclipse/jetty.project/commit/0d1fca545c0
+                ABORT.invoke(request);
+            }
+            try {
+                if ((boolean) IS_ASYNC_STARTED.invoke(request)) {
+                    Object asyncContext = GET_ASYNC_CONTEXT.invoke(request);
+                    if (asyncContext != null) {
+                        COMPLETE.invoke(asyncContext);
+                    }
+                }
+            } catch (IllegalStateException ise) {
+                log.debug("Error calling asyncContext.complete() conditioned on async started", ise);
+            }
+        } catch (Throwable e) {
+            log.info("Error committing blocking response", e);
+        }
+        return true;
     }
 
-    request.setAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE, Boolean.TRUE);
-
-    try {
-      response.reset();
-      response.setStatus(BlockingActionHelper.getHttpCode(statusCode));
-      String acceptHeader = request.getHeader("Accept");
-
-      for (Map.Entry<String, String> e : extraHeaders.entrySet()) {
-        response.setHeader(e.getKey(), e.getValue());
-      }
-
-      if (bct != BlockingContentType.NONE) {
-        BlockingActionHelper.TemplateType type =
-            BlockingActionHelper.determineTemplateType(bct, acceptHeader);
-        response.setCharacterEncoding("utf-8");
-        response.setHeader("Content-type", BlockingActionHelper.getContentType(type));
-        byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
-
-        if (!response.isWriting()) {
-          response.setHeader("Content-length", Integer.toString(template.length));
-          OutputStream os = (OutputStream) GET_OUTPUT_STREAM.invoke(response);
-          os.write(template);
-          os.close();
-        } else {
-          PrintWriter writer = response.getWriter();
-          String respBody = new String(template, StandardCharsets.UTF_8);
-          // this might be problematic because the encoding of the writer may not be utf-8
-          String respEncoding = response.getCharacterEncoding();
-          if ("utf-8".equalsIgnoreCase(respEncoding)) {
-            response.setHeader("Content-length", Integer.toString(template.length));
-          } // otherwise we don't really know the size after encoding, so don't set the header
-          writer.write(respBody);
-          writer.close();
-        }
-      }
-      segment.effectivelyBlocked();
-      CLOSE_OUTPUT.invoke(response);
-      if (ABORT != null) {
-        // needed by jetty 9.0.0-9.1.3
-        // see https://github.com/eclipse/jetty.project/commit/0d1fca545c0
-        ABORT.invoke(request);
-      }
-      try {
-        if ((boolean) IS_ASYNC_STARTED.invoke(request)) {
-          Object asyncContext = GET_ASYNC_CONTEXT.invoke(request);
-          if (asyncContext != null) {
-            COMPLETE.invoke(asyncContext);
-          }
+    public static boolean block(Request request, Response response, Context context) {
+        AgentSpan span = AgentSpan.fromContext(context);
+        Flow.Action.RequestBlockingAction rba;
+        if (span == null || (rba = span.getRequestBlockingAction()) == null) {
+            return false;
         }
-      } catch (IllegalStateException ise) {
-        log.debug("Error calling asyncContext.complete() conditioned on async started", ise);
-      }
-    } catch (Throwable e) {
-      log.info("Error committing blocking response", e);
+        return block(
+                span.getRequestContext().getTraceSegment(),
+                request,
+                response,
+                rba.getStatusCode(),
+                rba.getBlockingContentType(),
+                rba.getExtraHeaders(),
+                rba.getSecurityResponseId());
     }
-    return true;
-  }
 
-  public static boolean block(Request request, Response response, Context context) {
-    AgentSpan span = AgentSpan.fromContext(context);
-    Flow.Action.RequestBlockingAction rba;
-    if (span == null || (rba = span.getRequestBlockingAction()) == null) {
-      return false;
+    public static boolean hasRequestBlockingAction(Context context) {
+        AgentSpan span = AgentSpan.fromContext(context);
+        return span != null && span.getRequestBlockingAction() != null;
     }
-    return block(
-        span.getRequestContext().getTraceSegment(),
-        request,
-        response,
-        rba.getStatusCode(),
-        rba.getBlockingContentType(),
-        rba.getExtraHeaders(),
-        rba.getSecurityResponseId());
-  }
 
-  public static boolean hasRequestBlockingAction(Context context) {
-    AgentSpan span = AgentSpan.fromContext(context);
-    return span != null && span.getRequestBlockingAction() != null;
-  }
-
-  public static void blockAndThrowOnFailure(Request request, Response response, Context context) {
-    if (!block(request, response, context)) {
-      throw new BlockingException("Throwing after being unable to commit blocking response");
+    public static void blockAndThrowOnFailure(Request request, Response response, Context context) {
+        if (!block(request, response, context)) {
+            throw new BlockingException("Throwing after being unable to commit blocking response");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/MergeConsecutiveFramesMethodVisitor.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/MergeConsecutiveFramesMethodVisitor.java
index 1154470bb77..23280e90773 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/MergeConsecutiveFramesMethodVisitor.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/MergeConsecutiveFramesMethodVisitor.java
@@ -9,144 +9,140 @@
 
 /** If it sees an F_SAME frame together with another one, it suppresses the F_SAME one. */
 public class MergeConsecutiveFramesMethodVisitor extends MethodVisitor {
-  private final List<FrameVisitation> heldFrames = new ArrayList<>();
-
-  static class FrameVisitation {
-    final int type;
-    final int numLocal;
-    final Object[] local;
-    final int numStack;
-    final Object[] stack;
-
-    FrameVisitation(int type, int numLocal, Object[] local, int numStack, Object[] stack) {
-      this.type = type;
-      this.numLocal = numLocal;
-      this.local = local == null ? null : local.clone();
-      this.numStack = numStack;
-      this.stack = stack == null ? null : stack.clone();
-    }
-
-    boolean isFSame() {
-      return type == Opcodes.F_SAME;
-    }
-
-    void commit(MethodVisitor mv) {
-      mv.visitFrame(type, numLocal, local, numStack, stack);
-    }
-  }
-
-  public MergeConsecutiveFramesMethodVisitor(int api, MethodVisitor methodVisitor) {
-    super(api, methodVisitor);
-  }
-
-  private void commitFrames() {
-    if (heldFrames.isEmpty()) {
-      return;
-    }
-
-    if (heldFrames.size() > 1) {
-      FrameVisitation firstFrame = heldFrames.get(0);
-      heldFrames.removeIf(FrameVisitation::isFSame);
-      if (heldFrames.isEmpty()) {
-        heldFrames.add(firstFrame); // add back one if all we have is F_SAME
-      }
-    }
-
-    heldFrames.forEach(f -> f.commit(this.mv));
-    heldFrames.clear();
-  }
-
-  @Override
-  public void visitFrame(int type, int numLocal, Object[] local, int numStack, Object[] stack) {
-    heldFrames.add(new FrameVisitation(type, numLocal, local, numStack, stack));
-  }
-
-  @Override
-  public void visitInsn(int opcode) {
-    commitFrames();
-    super.visitInsn(opcode);
-  }
-
-  @Override
-  public void visitIntInsn(int opcode, int operand) {
-    commitFrames();
-    super.visitIntInsn(opcode, operand);
-  }
-
-  @Override
-  public void visitVarInsn(int opcode, int varIndex) {
-    commitFrames();
-    super.visitVarInsn(opcode, varIndex);
-  }
-
-  @Override
-  public void visitTypeInsn(int opcode, String type) {
-    commitFrames();
-    super.visitTypeInsn(opcode, type);
-  }
-
-  @Override
-  public void visitFieldInsn(int opcode, String owner, String name, String descriptor) {
-    commitFrames();
-    super.visitFieldInsn(opcode, owner, name, descriptor);
-  }
-
-  @Override
-  public void visitMethodInsn(
-      int opcode, String owner, String name, String descriptor, boolean isInterface) {
-    commitFrames();
-    super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-  }
-
-  @Override
-  public void visitInvokeDynamicInsn(
-      String name,
-      String descriptor,
-      Handle bootstrapMethodHandle,
-      Object... bootstrapMethodArguments) {
-    commitFrames();
-    super.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
-  }
-
-  @Override
-  public void visitJumpInsn(int opcode, Label label) {
-    commitFrames();
-    super.visitJumpInsn(opcode, label);
-  }
-
-  @Override
-  public void visitLdcInsn(Object value) {
-    commitFrames();
-    super.visitLdcInsn(value);
-  }
-
-  @Override
-  public void visitIincInsn(int varIndex, int increment) {
-    commitFrames();
-    super.visitIincInsn(varIndex, increment);
-  }
-
-  @Override
-  public void visitTableSwitchInsn(int min, int max, Label dflt, Label... labels) {
-    commitFrames();
-    super.visitTableSwitchInsn(min, max, dflt, labels);
-  }
-
-  @Override
-  public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
-    commitFrames();
-    super.visitLookupSwitchInsn(dflt, keys, labels);
-  }
-
-  @Override
-  public void visitMultiANewArrayInsn(String descriptor, int numDimensions) {
-    commitFrames();
-    super.visitMultiANewArrayInsn(descriptor, numDimensions);
-  }
-
-  @Override
-  public void visitEnd() {
-    commitFrames();
-    super.visitEnd();
-  }
+    private final List<FrameVisitation> heldFrames = new ArrayList<>();
+
+    static class FrameVisitation {
+        final int type;
+        final int numLocal;
+        final Object[] local;
+        final int numStack;
+        final Object[] stack;
+
+        FrameVisitation(int type, int numLocal, Object[] local, int numStack, Object[] stack) {
+            this.type = type;
+            this.numLocal = numLocal;
+            this.local = local == null ? null : local.clone();
+            this.numStack = numStack;
+            this.stack = stack == null ? null : stack.clone();
+        }
+
+        boolean isFSame() {
+            return type == Opcodes.F_SAME;
+        }
+
+        void commit(MethodVisitor mv) {
+            mv.visitFrame(type, numLocal, local, numStack, stack);
+        }
+    }
+
+    public MergeConsecutiveFramesMethodVisitor(int api, MethodVisitor methodVisitor) {
+        super(api, methodVisitor);
+    }
+
+    private void commitFrames() {
+        if (heldFrames.isEmpty()) {
+            return;
+        }
+
+        if (heldFrames.size() > 1) {
+            FrameVisitation firstFrame = heldFrames.get(0);
+            heldFrames.removeIf(FrameVisitation::isFSame);
+            if (heldFrames.isEmpty()) {
+                heldFrames.add(firstFrame); // add back one if all we have is F_SAME
+            }
+        }
+
+        heldFrames.forEach(f -> f.commit(this.mv));
+        heldFrames.clear();
+    }
+
+    @Override
+    public void visitFrame(int type, int numLocal, Object[] local, int numStack, Object[] stack) {
+        heldFrames.add(new FrameVisitation(type, numLocal, local, numStack, stack));
+    }
+
+    @Override
+    public void visitInsn(int opcode) {
+        commitFrames();
+        super.visitInsn(opcode);
+    }
+
+    @Override
+    public void visitIntInsn(int opcode, int operand) {
+        commitFrames();
+        super.visitIntInsn(opcode, operand);
+    }
+
+    @Override
+    public void visitVarInsn(int opcode, int varIndex) {
+        commitFrames();
+        super.visitVarInsn(opcode, varIndex);
+    }
+
+    @Override
+    public void visitTypeInsn(int opcode, String type) {
+        commitFrames();
+        super.visitTypeInsn(opcode, type);
+    }
+
+    @Override
+    public void visitFieldInsn(int opcode, String owner, String name, String descriptor) {
+        commitFrames();
+        super.visitFieldInsn(opcode, owner, name, descriptor);
+    }
+
+    @Override
+    public void visitMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) {
+        commitFrames();
+        super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+    }
+
+    @Override
+    public void visitInvokeDynamicInsn(
+            String name, String descriptor, Handle bootstrapMethodHandle, Object... bootstrapMethodArguments) {
+        commitFrames();
+        super.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
+    }
+
+    @Override
+    public void visitJumpInsn(int opcode, Label label) {
+        commitFrames();
+        super.visitJumpInsn(opcode, label);
+    }
+
+    @Override
+    public void visitLdcInsn(Object value) {
+        commitFrames();
+        super.visitLdcInsn(value);
+    }
+
+    @Override
+    public void visitIincInsn(int varIndex, int increment) {
+        commitFrames();
+        super.visitIincInsn(varIndex, increment);
+    }
+
+    @Override
+    public void visitTableSwitchInsn(int min, int max, Label dflt, Label... labels) {
+        commitFrames();
+        super.visitTableSwitchInsn(min, max, dflt, labels);
+    }
+
+    @Override
+    public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
+        commitFrames();
+        super.visitLookupSwitchInsn(dflt, keys, labels);
+    }
+
+    @Override
+    public void visitMultiANewArrayInsn(String descriptor, int numDimensions) {
+        commitFrames();
+        super.visitMultiANewArrayInsn(descriptor, numDimensions);
+    }
+
+    @Override
+    public void visitEnd() {
+        commitFrames();
+        super.visitEnd();
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/DelayCertainInsMethodVisitor.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/DelayCertainInsMethodVisitor.java
index 3efe79f571a..284b38fb0d9 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/DelayCertainInsMethodVisitor.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/DelayCertainInsMethodVisitor.java
@@ -22,297 +22,289 @@
  * #commitVisitations(List)}.
  */
 public class DelayCertainInsMethodVisitor extends MethodVisitor {
-  private final List<Runnable> heldVisitations = new ArrayList<>();
-
-  public DelayCertainInsMethodVisitor(int api, MethodVisitor methodVisitor) {
-    super(api, methodVisitor);
-  }
-
-  public void commitVisitations(List<Runnable> heldVisitations) {
-    for (Runnable r : heldVisitations) {
-      r.run();
-    }
-    heldVisitations.clear();
-  }
-
-  public List<Runnable> transferVisitations() {
-    ArrayList<Runnable> copy = new ArrayList<>(this.heldVisitations);
-    this.heldVisitations.clear();
-    return copy;
-  }
-
-  private void commitVisitations() {
-    commitVisitations(this.heldVisitations);
-  }
-
-  @Override
-  public void visitFrame(int type, int numLocal, Object[] local, int numStack, Object[] stack) {
-    commitVisitations();
-    super.visitFrame(type, numLocal, local, numStack, stack);
-  }
-
-  @Override
-  public void visitInsn(int opcode) {
-    commitVisitations();
-    super.visitInsn(opcode);
-  }
-
-  @Override
-  public void visitIntInsn(int opcode, int operand) {
-    commitVisitations();
-    super.visitIntInsn(opcode, operand);
-  }
-
-  @Override
-  public void visitVarInsn(final int opcode, final int varIndex) {
-    if (opcode == Opcodes.ALOAD) {
-      heldVisitations.add(new ALoadVarInsn(opcode, varIndex));
-    } else {
-      commitVisitations();
-      super.visitVarInsn(opcode, varIndex);
-    }
-  }
-
-  @Override
-  public void visitTypeInsn(int opcode, String type) {
-    commitVisitations();
-    super.visitTypeInsn(opcode, type);
-  }
-
-  @Override
-  public void visitFieldInsn(
-      final int opcode, final String owner, final String name, final String descriptor) {
-    if (opcode == Opcodes.GETSTATIC) {
-      heldVisitations.add(new GetStaticFieldInsn(opcode, owner, name, descriptor));
-    } else if (opcode == Opcodes.GETFIELD) {
-      heldVisitations.add(new GetFieldInsn(opcode, owner, name, descriptor));
-    } else {
-      commitVisitations();
-      super.visitFieldInsn(opcode, owner, name, descriptor);
-    }
-  }
-
-  @Override
-  public void visitMethodInsn(
-      final int opcode,
-      final String owner,
-      final String name,
-      final String descriptor,
-      final boolean isInterface) {
-    if (opcode == Opcodes.INVOKEVIRTUAL) {
-      heldVisitations.add(new VirtualMethodInsn(opcode, owner, name, descriptor, isInterface));
-    } else {
-      commitVisitations();
-      super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-    }
-  }
-
-  @Override
-  public void visitInvokeDynamicInsn(
-      final String name,
-      final String descriptor,
-      final Handle bootstrapMethodHandle,
-      final Object... bootstrapMethodArguments) {
-    heldVisitations.add(
-        new InvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments));
-  }
-
-  @Override
-  public void visitJumpInsn(int opcode, Label label) {
-    commitVisitations();
-    super.visitJumpInsn(opcode, label);
-  }
-
-  @Override
-  public void visitLabel(Label label) {
-    commitVisitations();
-    super.visitLabel(label);
-  }
-
-  @Override
-  public void visitLdcInsn(Object value) {
-    commitVisitations();
-    super.visitLdcInsn(value);
-  }
-
-  @Override
-  public void visitIincInsn(int varIndex, int increment) {
-    commitVisitations();
-    super.visitIincInsn(varIndex, increment);
-  }
-
-  @Override
-  public void visitTableSwitchInsn(int min, int max, Label dflt, Label... labels) {
-    commitVisitations();
-    super.visitTableSwitchInsn(min, max, dflt, labels);
-  }
-
-  @Override
-  public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
-    commitVisitations();
-    super.visitLookupSwitchInsn(dflt, keys, labels);
-  }
-
-  @Override
-  public void visitMultiANewArrayInsn(String descriptor, int numDimensions) {
-    commitVisitations();
-    super.visitMultiANewArrayInsn(descriptor, numDimensions);
-  }
-
-  @Override
-  public AnnotationVisitor visitInsnAnnotation(
-      int typeRef, TypePath typePath, String descriptor, boolean visible) {
-    commitVisitations();
-    return super.visitInsnAnnotation(typeRef, typePath, descriptor, visible);
-  }
-
-  @Override
-  public void visitTryCatchBlock(Label start, Label end, Label handler, String type) {
-    commitVisitations();
-    super.visitTryCatchBlock(start, end, handler, type);
-  }
-
-  @Override
-  public AnnotationVisitor visitTryCatchAnnotation(
-      int typeRef, TypePath typePath, String descriptor, boolean visible) {
-    commitVisitations();
-    return super.visitTryCatchAnnotation(typeRef, typePath, descriptor, visible);
-  }
-
-  @Override
-  public void visitLocalVariable(
-      String name, String descriptor, String signature, Label start, Label end, int index) {
-    commitVisitations();
-    super.visitLocalVariable(name, descriptor, signature, start, end, index);
-  }
-
-  @Override
-  public AnnotationVisitor visitLocalVariableAnnotation(
-      int typeRef,
-      TypePath typePath,
-      Label[] start,
-      Label[] end,
-      int[] index,
-      String descriptor,
-      boolean visible) {
-    commitVisitations();
-    return super.visitLocalVariableAnnotation(
-        typeRef, typePath, start, end, index, descriptor, visible);
-  }
-
-  @Override
-  public void visitLineNumber(int line, Label start) {
-    commitVisitations();
-    super.visitLineNumber(line, start);
-  }
-
-  @Override
-  public void visitMaxs(int maxStack, int maxLocals) {
-    commitVisitations();
-    super.visitMaxs(maxStack, maxLocals);
-  }
-
-  @Override
-  public void visitEnd() {
-    commitVisitations();
-    super.visitEnd();
-  }
-
-  public class InvokeDynamicInsn implements Runnable {
-    public final String name;
-    public final String descriptor;
-    public final Handle bootstrapMethodHandle;
-    public final Object[] bootstrapMethodArguments;
-
-    public InvokeDynamicInsn(
-        String name,
-        String descriptor,
-        Handle bootstrapMethodHandle,
-        Object... bootstrapMethodArguments) {
-      this.name = name;
-      this.descriptor = descriptor;
-      this.bootstrapMethodHandle = bootstrapMethodHandle;
-      this.bootstrapMethodArguments = bootstrapMethodArguments;
+    private final List<Runnable> heldVisitations = new ArrayList<>();
+
+    public DelayCertainInsMethodVisitor(int api, MethodVisitor methodVisitor) {
+        super(api, methodVisitor);
+    }
+
+    public void commitVisitations(List<Runnable> heldVisitations) {
+        for (Runnable r : heldVisitations) {
+            r.run();
+        }
+        heldVisitations.clear();
+    }
+
+    public List<Runnable> transferVisitations() {
+        ArrayList<Runnable> copy = new ArrayList<>(this.heldVisitations);
+        this.heldVisitations.clear();
+        return copy;
+    }
+
+    private void commitVisitations() {
+        commitVisitations(this.heldVisitations);
     }
 
     @Override
-    public void run() {
-      mv.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
+    public void visitFrame(int type, int numLocal, Object[] local, int numStack, Object[] stack) {
+        commitVisitations();
+        super.visitFrame(type, numLocal, local, numStack, stack);
     }
-  }
 
-  public class VirtualMethodInsn implements Runnable {
-    public final int opcode;
-    public final String owner;
-    public final String name;
-    public final String descriptor;
-    public final boolean isInterface;
+    @Override
+    public void visitInsn(int opcode) {
+        commitVisitations();
+        super.visitInsn(opcode);
+    }
 
-    public VirtualMethodInsn(
-        int opcode, String owner, String name, String descriptor, boolean isInterface) {
-      this.opcode = opcode;
-      this.owner = owner;
-      this.name = name;
-      this.descriptor = descriptor;
-      this.isInterface = isInterface;
+    @Override
+    public void visitIntInsn(int opcode, int operand) {
+        commitVisitations();
+        super.visitIntInsn(opcode, operand);
     }
 
     @Override
-    public void run() {
-      mv.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+    public void visitVarInsn(final int opcode, final int varIndex) {
+        if (opcode == Opcodes.ALOAD) {
+            heldVisitations.add(new ALoadVarInsn(opcode, varIndex));
+        } else {
+            commitVisitations();
+            super.visitVarInsn(opcode, varIndex);
+        }
     }
-  }
 
-  public class GetStaticFieldInsn implements Runnable {
-    public final int opcode;
-    public final String owner;
-    public final String name;
-    public final String descriptor;
+    @Override
+    public void visitTypeInsn(int opcode, String type) {
+        commitVisitations();
+        super.visitTypeInsn(opcode, type);
+    }
 
-    public GetStaticFieldInsn(int opcode, String owner, String name, String descriptor) {
-      this.opcode = opcode;
-      this.owner = owner;
-      this.name = name;
-      this.descriptor = descriptor;
+    @Override
+    public void visitFieldInsn(final int opcode, final String owner, final String name, final String descriptor) {
+        if (opcode == Opcodes.GETSTATIC) {
+            heldVisitations.add(new GetStaticFieldInsn(opcode, owner, name, descriptor));
+        } else if (opcode == Opcodes.GETFIELD) {
+            heldVisitations.add(new GetFieldInsn(opcode, owner, name, descriptor));
+        } else {
+            commitVisitations();
+            super.visitFieldInsn(opcode, owner, name, descriptor);
+        }
     }
 
     @Override
-    public void run() {
-      mv.visitFieldInsn(opcode, owner, name, descriptor);
+    public void visitMethodInsn(
+            final int opcode,
+            final String owner,
+            final String name,
+            final String descriptor,
+            final boolean isInterface) {
+        if (opcode == Opcodes.INVOKEVIRTUAL) {
+            heldVisitations.add(new VirtualMethodInsn(opcode, owner, name, descriptor, isInterface));
+        } else {
+            commitVisitations();
+            super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+        }
     }
-  }
 
-  public class GetFieldInsn implements Runnable {
-    public final int opcode;
-    public final String owner;
-    public final String name;
-    public final String descriptor;
+    @Override
+    public void visitInvokeDynamicInsn(
+            final String name,
+            final String descriptor,
+            final Handle bootstrapMethodHandle,
+            final Object... bootstrapMethodArguments) {
+        heldVisitations.add(new InvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments));
+    }
 
-    public GetFieldInsn(int opcode, String owner, String name, String descriptor) {
-      this.opcode = opcode;
-      this.owner = owner;
-      this.name = name;
-      this.descriptor = descriptor;
+    @Override
+    public void visitJumpInsn(int opcode, Label label) {
+        commitVisitations();
+        super.visitJumpInsn(opcode, label);
     }
 
     @Override
-    public void run() {
-      mv.visitFieldInsn(opcode, owner, name, descriptor);
+    public void visitLabel(Label label) {
+        commitVisitations();
+        super.visitLabel(label);
     }
-  }
 
-  public class ALoadVarInsn implements Runnable {
-    public final int opcode;
-    public final int varIndex;
+    @Override
+    public void visitLdcInsn(Object value) {
+        commitVisitations();
+        super.visitLdcInsn(value);
+    }
+
+    @Override
+    public void visitIincInsn(int varIndex, int increment) {
+        commitVisitations();
+        super.visitIincInsn(varIndex, increment);
+    }
+
+    @Override
+    public void visitTableSwitchInsn(int min, int max, Label dflt, Label... labels) {
+        commitVisitations();
+        super.visitTableSwitchInsn(min, max, dflt, labels);
+    }
 
-    public ALoadVarInsn(int opcode, int varIndex) {
-      this.opcode = opcode;
-      this.varIndex = varIndex;
+    @Override
+    public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
+        commitVisitations();
+        super.visitLookupSwitchInsn(dflt, keys, labels);
+    }
+
+    @Override
+    public void visitMultiANewArrayInsn(String descriptor, int numDimensions) {
+        commitVisitations();
+        super.visitMultiANewArrayInsn(descriptor, numDimensions);
+    }
+
+    @Override
+    public AnnotationVisitor visitInsnAnnotation(int typeRef, TypePath typePath, String descriptor, boolean visible) {
+        commitVisitations();
+        return super.visitInsnAnnotation(typeRef, typePath, descriptor, visible);
     }
 
     @Override
-    public void run() {
-      mv.visitVarInsn(opcode, varIndex);
+    public void visitTryCatchBlock(Label start, Label end, Label handler, String type) {
+        commitVisitations();
+        super.visitTryCatchBlock(start, end, handler, type);
+    }
+
+    @Override
+    public AnnotationVisitor visitTryCatchAnnotation(
+            int typeRef, TypePath typePath, String descriptor, boolean visible) {
+        commitVisitations();
+        return super.visitTryCatchAnnotation(typeRef, typePath, descriptor, visible);
+    }
+
+    @Override
+    public void visitLocalVariable(
+            String name, String descriptor, String signature, Label start, Label end, int index) {
+        commitVisitations();
+        super.visitLocalVariable(name, descriptor, signature, start, end, index);
+    }
+
+    @Override
+    public AnnotationVisitor visitLocalVariableAnnotation(
+            int typeRef,
+            TypePath typePath,
+            Label[] start,
+            Label[] end,
+            int[] index,
+            String descriptor,
+            boolean visible) {
+        commitVisitations();
+        return super.visitLocalVariableAnnotation(typeRef, typePath, start, end, index, descriptor, visible);
+    }
+
+    @Override
+    public void visitLineNumber(int line, Label start) {
+        commitVisitations();
+        super.visitLineNumber(line, start);
+    }
+
+    @Override
+    public void visitMaxs(int maxStack, int maxLocals) {
+        commitVisitations();
+        super.visitMaxs(maxStack, maxLocals);
+    }
+
+    @Override
+    public void visitEnd() {
+        commitVisitations();
+        super.visitEnd();
+    }
+
+    public class InvokeDynamicInsn implements Runnable {
+        public final String name;
+        public final String descriptor;
+        public final Handle bootstrapMethodHandle;
+        public final Object[] bootstrapMethodArguments;
+
+        public InvokeDynamicInsn(
+                String name, String descriptor, Handle bootstrapMethodHandle, Object... bootstrapMethodArguments) {
+            this.name = name;
+            this.descriptor = descriptor;
+            this.bootstrapMethodHandle = bootstrapMethodHandle;
+            this.bootstrapMethodArguments = bootstrapMethodArguments;
+        }
+
+        @Override
+        public void run() {
+            mv.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
+        }
+    }
+
+    public class VirtualMethodInsn implements Runnable {
+        public final int opcode;
+        public final String owner;
+        public final String name;
+        public final String descriptor;
+        public final boolean isInterface;
+
+        public VirtualMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) {
+            this.opcode = opcode;
+            this.owner = owner;
+            this.name = name;
+            this.descriptor = descriptor;
+            this.isInterface = isInterface;
+        }
+
+        @Override
+        public void run() {
+            mv.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+        }
+    }
+
+    public class GetStaticFieldInsn implements Runnable {
+        public final int opcode;
+        public final String owner;
+        public final String name;
+        public final String descriptor;
+
+        public GetStaticFieldInsn(int opcode, String owner, String name, String descriptor) {
+            this.opcode = opcode;
+            this.owner = owner;
+            this.name = name;
+            this.descriptor = descriptor;
+        }
+
+        @Override
+        public void run() {
+            mv.visitFieldInsn(opcode, owner, name, descriptor);
+        }
+    }
+
+    public class GetFieldInsn implements Runnable {
+        public final int opcode;
+        public final String owner;
+        public final String name;
+        public final String descriptor;
+
+        public GetFieldInsn(int opcode, String owner, String name, String descriptor) {
+            this.opcode = opcode;
+            this.owner = owner;
+            this.name = name;
+            this.descriptor = descriptor;
+        }
+
+        @Override
+        public void run() {
+            mv.visitFieldInsn(opcode, owner, name, descriptor);
+        }
+    }
+
+    public class ALoadVarInsn implements Runnable {
+        public final int opcode;
+        public final int varIndex;
+
+        public ALoadVarInsn(int opcode, int varIndex) {
+            this.opcode = opcode;
+            this.varIndex = varIndex;
+        }
+
+        @Override
+        public void run() {
+            mv.visitVarInsn(opcode, varIndex);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HandleVisitor.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HandleVisitor.java
index 44cd32cf7e5..1ca4d3354e1 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HandleVisitor.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HandleVisitor.java
@@ -108,241 +108,239 @@
  * </pre>
  */
 public class HandleVisitor extends MethodVisitor {
-  private static final Logger log = LoggerFactory.getLogger(HandleVisitor.class);
+    private static final Logger log = LoggerFactory.getLogger(HandleVisitor.class);
 
-  /** Whether the handle() method injection was successful . */
-  private boolean success;
+    /** Whether the handle() method injection was successful . */
+    private boolean success;
 
-  private final String methodName;
+    private final String methodName;
 
-  public HandleVisitor(int api, DelayCertainInsMethodVisitor methodVisitor, String methodName) {
-    super(api, methodVisitor);
-    this.methodName = methodName;
-  }
+    public HandleVisitor(int api, DelayCertainInsMethodVisitor methodVisitor, String methodName) {
+        super(api, methodVisitor);
+        this.methodName = methodName;
+    }
 
-  DelayCertainInsMethodVisitor delayVisitorDelegate() {
-    return (DelayCertainInsMethodVisitor) this.mv;
-  }
+    DelayCertainInsMethodVisitor delayVisitorDelegate() {
+        return (DelayCertainInsMethodVisitor) this.mv;
+    }
 
-  @Override
-  public void visitMethodInsn(
-      int opcode, String owner, String name, String descriptor, boolean isInterface) {
-    if (!success
-        && opcode == INVOKEVIRTUAL
-        && owner.equals("org/eclipse/jetty/server/Server")
-        && name.equals("handle")
-        && descriptor.equals("(Lorg/eclipse/jetty/server/HttpChannel;)V")) {
-      DelayCertainInsMethodVisitor mv = delayVisitorDelegate();
-      List<Runnable> savedVisitations = mv.transferVisitations();
-      /*
-       * Saved visitations should be for:
-       *
-       * aload_0
-       * invokevirtual #78                 // Method getServer:()Lorg/eclipse/jetty/server/Server;
-       * aload_0
-       */
-      if (savedVisitations.size() != 3) {
-        mv.commitVisitations(savedVisitations);
-        super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-        return;
-      }
+    @Override
+    public void visitMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) {
+        if (!success
+                && opcode == INVOKEVIRTUAL
+                && owner.equals("org/eclipse/jetty/server/Server")
+                && name.equals("handle")
+                && descriptor.equals("(Lorg/eclipse/jetty/server/HttpChannel;)V")) {
+            DelayCertainInsMethodVisitor mv = delayVisitorDelegate();
+            List<Runnable> savedVisitations = mv.transferVisitations();
+            /*
+             * Saved visitations should be for:
+             *
+             * aload_0
+             * invokevirtual #78                 // Method getServer:()Lorg/eclipse/jetty/server/Server;
+             * aload_0
+             */
+            if (savedVisitations.size() != 3) {
+                mv.commitVisitations(savedVisitations);
+                super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+                return;
+            }
 
-      // Declare label to insert after Server.handle() call
-      Label afterHandle = new Label();
-      // Inject blocking helper call and get its three parameters onto the stack:
-      // - Request
-      // - Response
-      // - Context -- retrieved from current as attached just earlier from tracing instrumentation
-      super.visitVarInsn(ALOAD, 0);
-      super.visitMethodInsn(
-          INVOKEVIRTUAL,
-          "org/eclipse/jetty/server/HttpChannel",
-          "getRequest",
-          "()Lorg/eclipse/jetty/server/Request;",
-          false);
-      super.visitVarInsn(ALOAD, 0);
-      super.visitMethodInsn(
-          INVOKEVIRTUAL,
-          "org/eclipse/jetty/server/HttpChannel",
-          "getResponse",
-          "()Lorg/eclipse/jetty/server/Response;",
-          false);
-      super.visitMethodInsn(
-          INVOKESTATIC,
-          Type.getInternalName(Java8BytecodeBridge.class),
-          "currentContext",
-          "()Ldatadog/context/Context;",
-          false);
-      super.visitMethodInsn(
-          INVOKESTATIC,
-          Type.getInternalName(JettyBlockingHelper.class),
-          "block",
-          "(Lorg/eclipse/jetty/server/Request;Lorg/eclipse/jetty/server/Response;"
-              + Type.getDescriptor(Context.class)
-              + ")Z",
-          false);
-      // Inject jump to after Server.handle() call if blocked
-      super.visitJumpInsn(IFNE, afterHandle);
-      // Inject getServer() and Server.handle() calls
-      mv.commitVisitations(savedVisitations);
-      super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-      // Inject label after Server.handle() call to jump here when blocked
-      super.visitLabel(afterHandle);
-      super.visitFrame(F_SAME, 0, null, 0, null);
-      this.success = true;
-      return;
-    } else if (!success
-        && (opcode == Opcodes.INVOKESPECIAL || opcode == INVOKEVIRTUAL)
-        && owner.equals("org/eclipse/jetty/server/HttpChannel")
-        && name.equals("dispatch")
-        && (descriptor.equals(
-                "(Ljavax/servlet/DispatcherType;Lorg/eclipse/jetty/server/HttpChannel$Dispatchable;)V")
-            || descriptor.equals(
-                "(Ljakarta/servlet/DispatcherType;Lorg/eclipse/jetty/server/HttpChannel$Dispatchable;)V"))) {
+            // Declare label to insert after Server.handle() call
+            Label afterHandle = new Label();
+            // Inject blocking helper call and get its three parameters onto the stack:
+            // - Request
+            // - Response
+            // - Context -- retrieved from current as attached just earlier from tracing instrumentation
+            super.visitVarInsn(ALOAD, 0);
+            super.visitMethodInsn(
+                    INVOKEVIRTUAL,
+                    "org/eclipse/jetty/server/HttpChannel",
+                    "getRequest",
+                    "()Lorg/eclipse/jetty/server/Request;",
+                    false);
+            super.visitVarInsn(ALOAD, 0);
+            super.visitMethodInsn(
+                    INVOKEVIRTUAL,
+                    "org/eclipse/jetty/server/HttpChannel",
+                    "getResponse",
+                    "()Lorg/eclipse/jetty/server/Response;",
+                    false);
+            super.visitMethodInsn(
+                    INVOKESTATIC,
+                    Type.getInternalName(Java8BytecodeBridge.class),
+                    "currentContext",
+                    "()Ldatadog/context/Context;",
+                    false);
+            super.visitMethodInsn(
+                    INVOKESTATIC,
+                    Type.getInternalName(JettyBlockingHelper.class),
+                    "block",
+                    "(Lorg/eclipse/jetty/server/Request;Lorg/eclipse/jetty/server/Response;"
+                            + Type.getDescriptor(Context.class)
+                            + ")Z",
+                    false);
+            // Inject jump to after Server.handle() call if blocked
+            super.visitJumpInsn(IFNE, afterHandle);
+            // Inject getServer() and Server.handle() calls
+            mv.commitVisitations(savedVisitations);
+            super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+            // Inject label after Server.handle() call to jump here when blocked
+            super.visitLabel(afterHandle);
+            super.visitFrame(F_SAME, 0, null, 0, null);
+            this.success = true;
+            return;
+        } else if (!success
+                && (opcode == Opcodes.INVOKESPECIAL || opcode == INVOKEVIRTUAL)
+                && owner.equals("org/eclipse/jetty/server/HttpChannel")
+                && name.equals("dispatch")
+                && (descriptor.equals(
+                                "(Ljavax/servlet/DispatcherType;Lorg/eclipse/jetty/server/HttpChannel$Dispatchable;)V")
+                        || descriptor.equals(
+                                "(Ljakarta/servlet/DispatcherType;Lorg/eclipse/jetty/server/HttpChannel$Dispatchable;)V"))) {
 
-      DelayCertainInsMethodVisitor mv = delayVisitorDelegate();
-      List<Runnable> savedVisitations = mv.transferVisitations();
+            DelayCertainInsMethodVisitor mv = delayVisitorDelegate();
+            List<Runnable> savedVisitations = mv.transferVisitations();
 
-      // check that we've queued up what we're supposed to
-      if (!checkDispatchMethodState(savedVisitations)) {
-        super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-        return;
-      }
+            // check that we've queued up what we're supposed to
+            if (!checkDispatchMethodState(savedVisitations)) {
+                super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+                return;
+            }
+
+            Label beforeRegularDispatch = new Label();
+            Label afterRegularDispatch = new Label();
 
-      Label beforeRegularDispatch = new Label();
-      Label afterRegularDispatch = new Label();
+            // Add current context to the stack
+            super.visitMethodInsn(
+                    INVOKESTATIC,
+                    Type.getInternalName(Java8BytecodeBridge.class),
+                    "currentContext",
+                    "()Ldatadog/context/Context;",
+                    false);
+            // Call JettyBlockingHelper.hasRequestBlockingAction(context)
+            super.visitMethodInsn(
+                    INVOKESTATIC,
+                    Type.getInternalName(JettyBlockingHelper.class),
+                    "hasRequestBlockingAction",
+                    "(" + Type.getDescriptor(Context.class) + ")Z",
+                    false);
+            // If no request blocking action, jump before the regular dispatch
+            super.visitJumpInsn(IFEQ, beforeRegularDispatch);
 
-      // Add current context to the stack
-      super.visitMethodInsn(
-          INVOKESTATIC,
-          Type.getInternalName(Java8BytecodeBridge.class),
-          "currentContext",
-          "()Ldatadog/context/Context;",
-          false);
-      // Call JettyBlockingHelper.hasRequestBlockingAction(context)
-      super.visitMethodInsn(
-          INVOKESTATIC,
-          Type.getInternalName(JettyBlockingHelper.class),
-          "hasRequestBlockingAction",
-          "(" + Type.getDescriptor(Context.class) + ")Z",
-          false);
-      // If no request blocking action, jump before the regular dispatch
-      super.visitJumpInsn(IFEQ, beforeRegularDispatch);
+            // dispatch with a Dispatchable created from JettyBlockingHelper::block
+            // first set up the first two arguments to dispatch (this and DispatcherType.REQUEST)
+            List<Runnable> loadThisAndEnum = new ArrayList<>(savedVisitations.subList(0, 2));
+            mv.commitVisitations(loadThisAndEnum);
+            // set up the arguments to the method underlying the lambda (Request, Response, Context)
+            super.visitVarInsn(ALOAD, 0);
+            super.visitMethodInsn(
+                    INVOKEVIRTUAL,
+                    "org/eclipse/jetty/server/HttpChannel",
+                    "getRequest",
+                    "()Lorg/eclipse/jetty/server/Request;",
+                    false);
+            super.visitVarInsn(ALOAD, 0);
+            super.visitMethodInsn(
+                    INVOKEVIRTUAL,
+                    "org/eclipse/jetty/server/HttpChannel",
+                    "getResponse",
+                    "()Lorg/eclipse/jetty/server/Response;",
+                    false);
+            super.visitMethodInsn(
+                    INVOKESTATIC,
+                    Type.getInternalName(Java8BytecodeBridge.class),
+                    "currentContext",
+                    "()Ldatadog/context/Context;",
+                    false);
 
-      // dispatch with a Dispatchable created from JettyBlockingHelper::block
-      // first set up the first two arguments to dispatch (this and DispatcherType.REQUEST)
-      List<Runnable> loadThisAndEnum = new ArrayList<>(savedVisitations.subList(0, 2));
-      mv.commitVisitations(loadThisAndEnum);
-      // set up the arguments to the method underlying the lambda (Request, Response, Context)
-      super.visitVarInsn(ALOAD, 0);
-      super.visitMethodInsn(
-          INVOKEVIRTUAL,
-          "org/eclipse/jetty/server/HttpChannel",
-          "getRequest",
-          "()Lorg/eclipse/jetty/server/Request;",
-          false);
-      super.visitVarInsn(ALOAD, 0);
-      super.visitMethodInsn(
-          INVOKEVIRTUAL,
-          "org/eclipse/jetty/server/HttpChannel",
-          "getResponse",
-          "()Lorg/eclipse/jetty/server/Response;",
-          false);
-      super.visitMethodInsn(
-          INVOKESTATIC,
-          Type.getInternalName(Java8BytecodeBridge.class),
-          "currentContext",
-          "()Ldatadog/context/Context;",
-          false);
+            // create the lambda
+            super.visitInvokeDynamicInsn(
+                    "dispatch",
+                    "(Lorg/eclipse/jetty/server/Request;Lorg/eclipse/jetty/server/Response;"
+                            + Type.getDescriptor(Context.class)
+                            + ")Lorg/eclipse/jetty/server/HttpChannel$Dispatchable;",
+                    new Handle(
+                            H_INVOKESTATIC,
+                            "java/lang/invoke/LambdaMetafactory",
+                            "metafactory",
+                            "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;",
+                            false),
+                    new Object[] {
+                        Type.getType("()V"),
+                        new Handle(
+                                H_INVOKESTATIC,
+                                Type.getInternalName(JettyBlockingHelper.class),
+                                "blockAndThrowOnFailure",
+                                "(Lorg/eclipse/jetty/server/Request;Lorg/eclipse/jetty/server/Response;"
+                                        + Type.getDescriptor(Context.class)
+                                        + ")V",
+                                false),
+                        Type.getType("()V")
+                    });
 
-      // create the lambda
-      super.visitInvokeDynamicInsn(
-          "dispatch",
-          "(Lorg/eclipse/jetty/server/Request;Lorg/eclipse/jetty/server/Response;"
-              + Type.getDescriptor(Context.class)
-              + ")Lorg/eclipse/jetty/server/HttpChannel$Dispatchable;",
-          new Handle(
-              H_INVOKESTATIC,
-              "java/lang/invoke/LambdaMetafactory",
-              "metafactory",
-              "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;",
-              false),
-          new Object[] {
-            Type.getType("()V"),
-            new Handle(
-                H_INVOKESTATIC,
-                Type.getInternalName(JettyBlockingHelper.class),
-                "blockAndThrowOnFailure",
-                "(Lorg/eclipse/jetty/server/Request;Lorg/eclipse/jetty/server/Response;"
-                    + Type.getDescriptor(Context.class)
-                    + ")V",
-                false),
-            Type.getType("()V")
-          });
+            // invoke the dispatch method
+            super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
 
-      // invoke the dispatch method
-      super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+            super.visitJumpInsn(GOTO, afterRegularDispatch);
 
-      super.visitJumpInsn(GOTO, afterRegularDispatch);
+            super.visitLabel(beforeRegularDispatch);
+            super.visitFrame(F_SAME, 0, null, 0, null);
+            mv.commitVisitations(savedVisitations);
+            super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+            super.visitLabel(afterRegularDispatch);
+            super.visitFrame(F_SAME, 0, null, 0, null);
+            this.success = true;
+            return;
+        }
 
-      super.visitLabel(beforeRegularDispatch);
-      super.visitFrame(F_SAME, 0, null, 0, null);
-      mv.commitVisitations(savedVisitations);
-      super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-      super.visitLabel(afterRegularDispatch);
-      super.visitFrame(F_SAME, 0, null, 0, null);
-      this.success = true;
-      return;
+        super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
     }
 
-    super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-  }
+    private boolean checkDispatchMethodState(final List<Runnable> savedVisitations) {
+        if (savedVisitations.size() != 4) {
+            return false;
+        }
+        // push this to the stack
+        if (!(savedVisitations.get(0) instanceof DelayCertainInsMethodVisitor.ALoadVarInsn)) {
+            return false;
+        }
 
-  private boolean checkDispatchMethodState(final List<Runnable> savedVisitations) {
-    if (savedVisitations.size() != 4) {
-      return false;
-    }
-    // push this to the stack
-    if (!(savedVisitations.get(0) instanceof DelayCertainInsMethodVisitor.ALoadVarInsn)) {
-      return false;
-    }
+        // push DispatcherType.REQUEST to the stack
+        if (!(savedVisitations.get(1) instanceof DelayCertainInsMethodVisitor.GetStaticFieldInsn)) {
+            return false;
+        }
+        DelayCertainInsMethodVisitor.GetStaticFieldInsn getStaticFieldInsn =
+                (DelayCertainInsMethodVisitor.GetStaticFieldInsn) savedVisitations.get(1);
+        if ((!getStaticFieldInsn.owner.equals("javax/servlet/DispatcherType")
+                        && !getStaticFieldInsn.owner.equals("jakarta/servlet/DispatcherType"))
+                || !getStaticFieldInsn.name.equals("REQUEST")) {
+            return false;
+        }
 
-    // push DispatcherType.REQUEST to the stack
-    if (!(savedVisitations.get(1) instanceof DelayCertainInsMethodVisitor.GetStaticFieldInsn)) {
-      return false;
-    }
-    DelayCertainInsMethodVisitor.GetStaticFieldInsn getStaticFieldInsn =
-        (DelayCertainInsMethodVisitor.GetStaticFieldInsn) savedVisitations.get(1);
-    if ((!getStaticFieldInsn.owner.equals("javax/servlet/DispatcherType")
-            && !getStaticFieldInsn.owner.equals("jakarta/servlet/DispatcherType"))
-        || !getStaticFieldInsn.name.equals("REQUEST")) {
-      return false;
-    }
+        // push this to the stack (to create the lambda or access the instance field, which depends on
+        // this)
+        if (!(savedVisitations.get(2) instanceof DelayCertainInsMethodVisitor.ALoadVarInsn)) {
+            return false;
+        }
 
-    // push this to the stack (to create the lambda or access the instance field, which depends on
-    // this)
-    if (!(savedVisitations.get(2) instanceof DelayCertainInsMethodVisitor.ALoadVarInsn)) {
-      return false;
-    }
+        final Runnable last = savedVisitations.get(3);
+        // jetty < 11.16.0
+        //  this.dispatch(DispatcherType.REQUEST, () -> { ... });
+        if (last instanceof DelayCertainInsMethodVisitor.InvokeDynamicInsn) {
+            return true;
+        }
 
-    final Runnable last = savedVisitations.get(3);
-    // jetty < 11.16.0
-    //  this.dispatch(DispatcherType.REQUEST, () -> { ... });
-    if (last instanceof DelayCertainInsMethodVisitor.InvokeDynamicInsn) {
-      return true;
+        // jetty >= 11.16.0
+        // this.dispatch(DispatcherType.REQUEST, this._requestDispatcher);
+        return last instanceof DelayCertainInsMethodVisitor.GetFieldInsn;
     }
 
-    // jetty >= 11.16.0
-    // this.dispatch(DispatcherType.REQUEST, this._requestDispatcher);
-    return last instanceof DelayCertainInsMethodVisitor.GetFieldInsn;
-  }
-
-  @Override
-  public void visitEnd() {
-    if (!success && !"run".equals(methodName)) {
-      log.warn(
-          "Transformation of Jetty's connection class was not successful. Blocking will likely not work");
+    @Override
+    public void visitEnd() {
+        if (!success && !"run".equals(methodName)) {
+            log.warn("Transformation of Jetty's connection class was not successful. Blocking will likely not work");
+        }
+        super.visitEnd();
     }
-    super.visitEnd();
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HttpChannelHandleVisitor.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HttpChannelHandleVisitor.java
index ffa257fa827..da8a22697c7 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HttpChannelHandleVisitor.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HttpChannelHandleVisitor.java
@@ -5,22 +5,20 @@
 import net.bytebuddy.jar.asm.MethodVisitor;
 
 public class HttpChannelHandleVisitor extends ClassVisitor {
-  public HttpChannelHandleVisitor(int api, ClassVisitor classVisitor) {
-    super(api, classVisitor);
-  }
+    public HttpChannelHandleVisitor(int api, ClassVisitor classVisitor) {
+        super(api, classVisitor);
+    }
 
-  @Override
-  public MethodVisitor visitMethod(
-      int access, String name, String descriptor, String signature, String[] exceptions) {
-    MethodVisitor superVisitor = super.visitMethod(access, name, descriptor, signature, exceptions);
-    if ((name.equals("run") || name.equals("handle"))
-        && (descriptor.equals("()V") || descriptor.equals("()Z"))) {
-      MethodVisitor mcfMv = new MergeConsecutiveFramesMethodVisitor(this.api, superVisitor);
-      DelayCertainInsMethodVisitor delayLoadsMethodVisitor =
-          new DelayCertainInsMethodVisitor(this.api, mcfMv);
-      return new HandleVisitor(this.api, delayLoadsMethodVisitor, name);
-    } else {
-      return superVisitor;
+    @Override
+    public MethodVisitor visitMethod(
+            int access, String name, String descriptor, String signature, String[] exceptions) {
+        MethodVisitor superVisitor = super.visitMethod(access, name, descriptor, signature, exceptions);
+        if ((name.equals("run") || name.equals("handle")) && (descriptor.equals("()V") || descriptor.equals("()Z"))) {
+            MethodVisitor mcfMv = new MergeConsecutiveFramesMethodVisitor(this.api, superVisitor);
+            DelayCertainInsMethodVisitor delayLoadsMethodVisitor = new DelayCertainInsMethodVisitor(this.api, mcfMv);
+            return new HandleVisitor(this.api, delayLoadsMethodVisitor, name);
+        } else {
+            return superVisitor;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java
index 557104f5215..2c4958112e6 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java
@@ -12,55 +12,55 @@
 
 @AutoService(InstrumenterModule.class)
 public class DispatchableInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public DispatchableInstrumentation() {
-    super("jetty");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public DispatchableInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "named_dispatches";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "named_dispatches";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      new Reference.Builder("org.eclipse.jetty.server.HttpChannel$RequestDispatchable")
-          .withField(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC,
-              "this$0",
-              "Lorg/eclipse/jetty/server/HttpChannel;")
-          .build(),
-      new Reference.Builder("org.eclipse.jetty.server.HttpChannel$AsyncDispatchable")
-          .withField(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC,
-              "this$0",
-              "Lorg/eclipse/jetty/server/HttpChannel;")
-          .build(),
-    };
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            new Reference.Builder("org.eclipse.jetty.server.HttpChannel$RequestDispatchable")
+                    .withField(
+                            new String[0],
+                            Reference.EXPECTS_NON_STATIC,
+                            "this$0",
+                            "Lorg/eclipse/jetty/server/HttpChannel;")
+                    .build(),
+            new Reference.Builder("org.eclipse.jetty.server.HttpChannel$AsyncDispatchable")
+                    .withField(
+                            new String[0],
+                            Reference.EXPECTS_NON_STATIC,
+                            "this$0",
+                            "Lorg/eclipse/jetty/server/HttpChannel;")
+                    .build(),
+        };
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+        };
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.eclipse.jetty.server.HttpChannel$RequestDispatchable",
-      "org.eclipse.jetty.server.HttpChannel$RequestAsyncDispatchable",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.eclipse.jetty.server.HttpChannel$RequestDispatchable",
+            "org.eclipse.jetty.server.HttpChannel$RequestAsyncDispatchable",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("dispatch")).and(isPublic()).and(takesArguments(0)),
-        packageName + ".DispatchableAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("dispatch")).and(isPublic()).and(takesArguments(0)),
+                packageName + ".DispatchableAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java
index 57bdb56474d..b727cb6124c 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java
@@ -11,91 +11,91 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JettyCommitResponseInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JettyCommitResponseInstrumentation() {
-    super("jetty");
-  }
+    public JettyCommitResponseInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "after_10";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "after_10";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      new Reference.Builder("org.eclipse.jetty.server.HttpChannel")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
-              "sendResponse",
-              "Z",
-              "Lorg/eclipse/jetty/http/MetaData$Response;",
-              "Ljava/nio/ByteBuffer;",
-              "Z",
-              "Lorg/eclipse/jetty/util/Callback;")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
-              "commit",
-              "V",
-              "Lorg/eclipse/jetty/http/MetaData$Response;")
-          .withField(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC,
-              "_transport",
-              "Lorg/eclipse/jetty/server/HttpTransport;")
-          .build(),
-      new Reference.Builder("org.eclipse.jetty.server.Response")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
-              "newResponseMetaData",
-              "Lorg/eclipse/jetty/http/MetaData$Response;")
-          .build(),
-      new Reference.Builder("org.eclipse.jetty.http.HttpFields$Mutable")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC,
-              "put",
-              "Lorg/eclipse/jetty/http/HttpFields$Mutable;",
-              "Ljava/lang/String;",
-              "Ljava/lang/String;")
-          .build()
-    };
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            new Reference.Builder("org.eclipse.jetty.server.HttpChannel")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
+                            "sendResponse",
+                            "Z",
+                            "Lorg/eclipse/jetty/http/MetaData$Response;",
+                            "Ljava/nio/ByteBuffer;",
+                            "Z",
+                            "Lorg/eclipse/jetty/util/Callback;")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
+                            "commit",
+                            "V",
+                            "Lorg/eclipse/jetty/http/MetaData$Response;")
+                    .withField(
+                            new String[0],
+                            Reference.EXPECTS_NON_STATIC,
+                            "_transport",
+                            "Lorg/eclipse/jetty/server/HttpTransport;")
+                    .build(),
+            new Reference.Builder("org.eclipse.jetty.server.Response")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
+                            "newResponseMetaData",
+                            "Lorg/eclipse/jetty/http/MetaData$Response;")
+                    .build(),
+            new Reference.Builder("org.eclipse.jetty.http.HttpFields$Mutable")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_NON_STATIC,
+                            "put",
+                            "Lorg/eclipse/jetty/http/HttpFields$Mutable;",
+                            "Ljava/lang/String;",
+                            "Ljava/lang/String;")
+                    .build()
+        };
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.HttpChannel";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.HttpChannel";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".JettyDecorator",
-      "datadog.trace.instrumentation.jetty9.RequestURIDataAdapter",
-      packageName + ".JettyCommitResponseHelper",
-      packageName + ".JettyOnCommitBlockingHelper",
-      packageName + ".JettyOnCommitBlockingHelper$CloseCallback",
-      "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".JettyDecorator",
+            "datadog.trace.instrumentation.jetty9.RequestURIDataAdapter",
+            packageName + ".JettyCommitResponseHelper",
+            packageName + ".JettyOnCommitBlockingHelper",
+            packageName + ".JettyOnCommitBlockingHelper$CloseCallback",
+            "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("sendResponse")
-            .and(takesArguments(4))
-            .and(takesArgument(0, named("org.eclipse.jetty.http.MetaData$Response")))
-            .and(takesArgument(1, named("java.nio.ByteBuffer")))
-            .and(takesArgument(2, boolean.class))
-            .and(takesArgument(3, named("org.eclipse.jetty.util.Callback"))),
-        packageName + ".SendResponseCbAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("sendResponse")
+                        .and(takesArguments(4))
+                        .and(takesArgument(0, named("org.eclipse.jetty.http.MetaData$Response")))
+                        .and(takesArgument(1, named("java.nio.ByteBuffer")))
+                        .and(takesArgument(2, boolean.class))
+                        .and(takesArgument(3, named("org.eclipse.jetty.util.Callback"))),
+                packageName + ".SendResponseCbAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyServerInstrumentation.java
index f8d0d62ae10..91e78cce2b7 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyServerInstrumentation.java
@@ -33,114 +33,114 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JettyServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice,
-        ExcludeFilterProvider {
-
-  public JettyServerInstrumentation() {
-    super("jetty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.HttpChannel";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".JettyDecorator",
-      packageName + ".JettyDecorator$OnResponse",
-      "datadog.trace.instrumentation.jetty9.RequestURIDataAdapter",
-      "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-    };
-  }
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      new Reference.Builder("org.eclipse.jetty.server.HttpChannel")
-          .withMethod(new String[0], Reference.EXPECTS_NON_STATIC, "handle", "Z")
-          .withMethod(new String[0], Reference.EXPECTS_NON_STATIC, "recycle", "V")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC,
-              "handleException",
-              "V",
-              "Ljava/lang/Throwable;")
-          .build()
-    };
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "10_series";
-  }
-
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new HttpChannelHandleVisitorWrapper());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        takesNoArguments().and(named("handle")),
-        packageName + ".HandleAdvice$ContextTrackingAdvice",
-        packageName + ".HandleAdvice");
-    transformer.applyAdvice(named("recycle").and(takesNoArguments()), packageName + ".ResetAdvice");
-
-    if (InstrumenterConfig.get().getAppSecActivation() != ProductActivation.FULLY_DISABLED) {
-      transformer.applyAdvice(
-          named("handleException").and(takesArguments(1)).and(takesArgument(0, Throwable.class)),
-          packageName + ".HandleExceptionAdvice");
+        implements Instrumenter.ForSingleType,
+                Instrumenter.HasTypeAdvice,
+                Instrumenter.HasMethodAdvice,
+                ExcludeFilterProvider {
+
+    public JettyServerInstrumentation() {
+        super("jetty");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.HttpChannel";
     }
-  }
-
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    return Collections.singletonMap(
-        RUNNABLE,
-        Arrays.asList(
-            "org.eclipse.jetty.util.thread.strategy.ProduceConsume",
-            "org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume",
-            "org.eclipse.jetty.io.ManagedSelector",
-            "org.eclipse.jetty.util.thread.TimerScheduler",
-            "org.eclipse.jetty.util.thread.TimerScheduler$SimpleTask"));
-  }
-
-  public static class HttpChannelHandleVisitorWrapper implements AsmVisitorWrapper {
 
     @Override
-    public int mergeWriter(int flags) {
-      return flags | ClassWriter.COMPUTE_MAXS;
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".JettyDecorator",
+            packageName + ".JettyDecorator$OnResponse",
+            "datadog.trace.instrumentation.jetty9.RequestURIDataAdapter",
+            "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+        };
     }
 
     @Override
-    public int mergeReader(int flags) {
-      return flags;
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            new Reference.Builder("org.eclipse.jetty.server.HttpChannel")
+                    .withMethod(new String[0], Reference.EXPECTS_NON_STATIC, "handle", "Z")
+                    .withMethod(new String[0], Reference.EXPECTS_NON_STATIC, "recycle", "V")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_NON_STATIC,
+                            "handleException",
+                            "V",
+                            "Ljava/lang/Throwable;")
+                    .build()
+        };
     }
 
     @Override
-    public ClassVisitor wrap(
-        TypeDescription instrumentedType,
-        ClassVisitor classVisitor,
-        Implementation.Context implementationContext,
-        TypePool typePool,
-        FieldList<FieldDescription.InDefinedShape> fields,
-        MethodList<?> methods,
-        int writerFlags,
-        int readerFlags) {
-      if (Config.get().getAppSecActivation() == ProductActivation.FULLY_DISABLED) {
-        return classVisitor;
-      }
-
-      return new HttpChannelHandleVisitor(Opcodes.ASM7, classVisitor);
+    public String muzzleDirective() {
+        return "10_series";
+    }
+
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new HttpChannelHandleVisitorWrapper());
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                takesNoArguments().and(named("handle")),
+                packageName + ".HandleAdvice$ContextTrackingAdvice",
+                packageName + ".HandleAdvice");
+        transformer.applyAdvice(named("recycle").and(takesNoArguments()), packageName + ".ResetAdvice");
+
+        if (InstrumenterConfig.get().getAppSecActivation() != ProductActivation.FULLY_DISABLED) {
+            transformer.applyAdvice(
+                    named("handleException").and(takesArguments(1)).and(takesArgument(0, Throwable.class)),
+                    packageName + ".HandleExceptionAdvice");
+        }
+    }
+
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        return Collections.singletonMap(
+                RUNNABLE,
+                Arrays.asList(
+                        "org.eclipse.jetty.util.thread.strategy.ProduceConsume",
+                        "org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume",
+                        "org.eclipse.jetty.io.ManagedSelector",
+                        "org.eclipse.jetty.util.thread.TimerScheduler",
+                        "org.eclipse.jetty.util.thread.TimerScheduler$SimpleTask"));
+    }
+
+    public static class HttpChannelHandleVisitorWrapper implements AsmVisitorWrapper {
+
+        @Override
+        public int mergeWriter(int flags) {
+            return flags | ClassWriter.COMPUTE_MAXS;
+        }
+
+        @Override
+        public int mergeReader(int flags) {
+            return flags;
+        }
+
+        @Override
+        public ClassVisitor wrap(
+                TypeDescription instrumentedType,
+                ClassVisitor classVisitor,
+                Implementation.Context implementationContext,
+                TypePool typePool,
+                FieldList<FieldDescription.InDefinedShape> fields,
+                MethodList<?> methods,
+                int writerFlags,
+                int readerFlags) {
+            if (Config.get().getAppSecActivation() == ProductActivation.FULLY_DISABLED) {
+                return classVisitor;
+            }
+
+            return new HttpChannelHandleVisitor(Opcodes.ASM7, classVisitor);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java
index 8cc1645787b..6c79fb4a25f 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java
@@ -9,31 +9,29 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RequestInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public RequestInstrumentation() {
-    super("jetty");
-  }
+    public RequestInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.Request";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.Request";
+    }
 
-  public String muzzleDirective() {
-    return "10_series";
-  }
+    public String muzzleDirective() {
+        return "10_series";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("setContextPath").and(takesArgument(0, String.class)),
-        packageName + ".SetContextPathAdvice");
-    transformer.applyAdvice(
-        named("setServletPath").and(takesArgument(0, String.class)),
-        packageName + ".SetServletPathAdvice");
-    transformer.applyAdvice(
-        named("setRequestedSessionId").and(takesArgument(0, String.class)),
-        packageName + ".SetRequestedSessionIdAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("setContextPath").and(takesArgument(0, String.class)), packageName + ".SetContextPathAdvice");
+        transformer.applyAdvice(
+                named("setServletPath").and(takesArgument(0, String.class)), packageName + ".SetServletPathAdvice");
+        transformer.applyAdvice(
+                named("setRequestedSessionId").and(takesArgument(0, String.class)),
+                packageName + ".SetRequestedSessionIdAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/ServerHandleInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/ServerHandleInstrumentation.java
index de756bb60a4..88cd2c4aba8 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/ServerHandleInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/ServerHandleInstrumentation.java
@@ -10,41 +10,41 @@
 
 @AutoService(InstrumenterModule.class)
 public class ServerHandleInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ServerHandleInstrumentation() {
-    super("jetty");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ServerHandleInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "after_10";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "after_10";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.Server";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.Server";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".JettyDecorator",
-      "datadog.trace.instrumentation.jetty9.RequestURIDataAdapter",
-      "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".JettyDecorator",
+            "datadog.trace.instrumentation.jetty9.RequestURIDataAdapter",
+            "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("handle")
-            .or(named("handleAsync"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("org.eclipse.jetty.server.HttpChannel"))),
-        packageName + ".ServerHandleAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("handle")
+                        .or(named("handleAsync"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("org.eclipse.jetty.server.HttpChannel"))),
+                packageName + ".ServerHandleAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/DispatchableAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/DispatchableAdvice.java
index fe009a75de4..25ad9eeda72 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/DispatchableAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/DispatchableAdvice.java
@@ -7,8 +7,8 @@
 import org.eclipse.jetty.server.HttpChannel;
 
 public class DispatchableAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-  public static boolean /* skip */ before(@Advice.FieldValue("this$0") HttpChannel channel) {
-    return JettyBlockingHelper.block(channel.getRequest(), channel.getResponse(), currentContext());
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+    public static boolean /* skip */ before(@Advice.FieldValue("this$0") HttpChannel channel) {
+        return JettyBlockingHelper.block(channel.getRequest(), channel.getResponse(), currentContext());
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/ExtractAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/ExtractAdapter.java
index e9950ecf291..b807606f1ab 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/ExtractAdapter.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/ExtractAdapter.java
@@ -7,37 +7,37 @@
 // source code is identical to the one in jetty9, but result is not
 // binary compatible because HttpFields became an interface
 public abstract class ExtractAdapter<T> implements AgentPropagation.ContextVisitor<T> {
-  abstract HttpFields getHttpFields(T t);
+    abstract HttpFields getHttpFields(T t);
 
-  @Override
-  public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-    HttpFields headers = getHttpFields(carrier);
-    if (headers == null) {
-      return;
-    }
-    for (int i = 0; i < headers.size(); ++i) {
-      HttpField field = headers.getField(i);
-      if (field != null && !classifier.accept(field.getName(), field.getValue())) {
-        return;
-      }
+    @Override
+    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+        HttpFields headers = getHttpFields(carrier);
+        if (headers == null) {
+            return;
+        }
+        for (int i = 0; i < headers.size(); ++i) {
+            HttpField field = headers.getField(i);
+            if (field != null && !classifier.accept(field.getName(), field.getValue())) {
+                return;
+            }
+        }
     }
-  }
 
-  public static final class Request extends ExtractAdapter<org.eclipse.jetty.server.Request> {
-    public static final Request GETTER = new Request();
+    public static final class Request extends ExtractAdapter<org.eclipse.jetty.server.Request> {
+        public static final Request GETTER = new Request();
 
-    @Override
-    HttpFields getHttpFields(org.eclipse.jetty.server.Request request) {
-      return request.getHttpFields();
+        @Override
+        HttpFields getHttpFields(org.eclipse.jetty.server.Request request) {
+            return request.getHttpFields();
+        }
     }
-  }
 
-  public static final class Response extends ExtractAdapter<org.eclipse.jetty.server.Response> {
-    public static final Response GETTER = new Response();
+    public static final class Response extends ExtractAdapter<org.eclipse.jetty.server.Response> {
+        public static final Response GETTER = new Response();
 
-    @Override
-    HttpFields getHttpFields(org.eclipse.jetty.server.Response response) {
-      return response.getHttpFields();
+        @Override
+        HttpFields getHttpFields(org.eclipse.jetty.server.Response response) {
+            return response.getHttpFields();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/HandleAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/HandleAdvice.java
index fea6f678dac..b513fecf60d 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/HandleAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/HandleAdvice.java
@@ -18,61 +18,60 @@
 
 public class HandleAdvice {
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextTrackingAdvice {
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextTrackingAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.This final HttpChannel channel,
-        @Advice.Local("parentScope") ContextScope parentScope) {
-      Request req = channel.getRequest();
-      if (req.getAttribute(DD_CONTEXT_ATTRIBUTE) instanceof Context) {
-        return; // re-entry: HandleAdvice will attach existing context
-      }
-      Context parentContext = DECORATE.extract(req);
-      req.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
-      parentScope = parentContext.attach();
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.This final HttpChannel channel, @Advice.Local("parentScope") ContextScope parentScope) {
+            Request req = channel.getRequest();
+            if (req.getAttribute(DD_CONTEXT_ATTRIBUTE) instanceof Context) {
+                return; // re-entry: HandleAdvice will attach existing context
+            }
+            Context parentContext = DECORATE.extract(req);
+            req.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
+            parentScope = parentContext.attach();
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Local("parentScope") ContextScope parentScope) {
-      if (parentScope != null) {
-        parentScope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Local("parentScope") ContextScope parentScope) {
+            if (parentScope != null) {
+                parentScope.close();
+            }
+        }
     }
-  }
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(
-      @Advice.This final HttpChannel channel, @Advice.Local("agentSpan") AgentSpan span) {
-    Request req = channel.getRequest();
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(
+            @Advice.This final HttpChannel channel, @Advice.Local("agentSpan") AgentSpan span) {
+        Request req = channel.getRequest();
 
-    Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-    if (existingContext instanceof Context) {
-      return ((Context) existingContext).attach();
-    }
+        Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+        if (existingContext instanceof Context) {
+            return ((Context) existingContext).attach();
+        }
 
-    final Object parentContextObj = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
-    final Context parentContext =
-        (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
-    final Context context = DECORATE.startSpan(req, parentContext);
-    span = spanFromContext(context);
-    DECORATE.afterStart(span);
-    DECORATE.onRequest(span, req, req, parentContext);
+        final Object parentContextObj = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
+        final Context parentContext =
+                (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
+        final Context context = DECORATE.startSpan(req, parentContext);
+        span = spanFromContext(context);
+        DECORATE.afterStart(span);
+        DECORATE.onRequest(span, req, req, parentContext);
 
-    final ContextScope scope = context.attach();
-    req.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
-    req.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
-    req.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
-    return scope;
-  }
+        final ContextScope scope = context.attach();
+        req.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
+        req.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+        req.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+        return scope;
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void closeScope(@Advice.Enter final ContextScope scope) {
-    scope.close();
-  }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void closeScope(@Advice.Enter final ContextScope scope) {
+        scope.close();
+    }
 
-  private void muzzleCheck(Request r) {
-    r.getAsyncContext(); // there must be a getAsyncContext returning a javax AsyncContext
-  }
+    private void muzzleCheck(Request r) {
+        r.getAsyncContext(); // there must be a getAsyncContext returning a javax AsyncContext
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/HandleExceptionAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/HandleExceptionAdvice.java
index 7b615c30649..1a117d93071 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/HandleExceptionAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/HandleExceptionAdvice.java
@@ -6,16 +6,16 @@
 import net.bytebuddy.asm.Advice;
 
 class HandleExceptionAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  static void enter(@Advice.Argument(0) Throwable t) {
-    if (!(t instanceof BlockingException)) {
-      return;
-    }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static void enter(@Advice.Argument(0) Throwable t) {
+        if (!(t instanceof BlockingException)) {
+            return;
+        }
 
-    AgentSpan agentSpan = AgentTracer.activeSpan();
-    if (agentSpan == null) {
-      return;
+        AgentSpan agentSpan = AgentTracer.activeSpan();
+        if (agentSpan == null) {
+            return;
+        }
+        JettyDecorator.DECORATE.onError(agentSpan, t);
     }
-    JettyDecorator.DECORATE.onError(agentSpan, t);
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/JettyCommitResponseHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/JettyCommitResponseHelper.java
index be0be6eaa3a..c0a83fdbab1 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/JettyCommitResponseHelper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/JettyCommitResponseHelper.java
@@ -20,87 +20,86 @@
 import org.slf4j.LoggerFactory;
 
 public class JettyCommitResponseHelper {
-  private static final Logger log = LoggerFactory.getLogger(JettyCommitResponseHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(JettyCommitResponseHelper.class);
 
-  public static boolean /* skip */ before(
-      HttpChannel connection,
-      MetaData.Response metaDataResponse /* nullable */,
-      HttpTransport transport,
-      Callback cb) {
+    public static boolean /* skip */ before(
+            HttpChannel connection,
+            MetaData.Response metaDataResponse /* nullable */,
+            HttpTransport transport,
+            Callback cb) {
 
-    HttpChannelState state = connection.getState();
-    boolean committing = state.commitResponse();
-    if (!committing) {
-      return false;
-    }
-    // henceforth we need to reset the state
+        HttpChannelState state = connection.getState();
+        boolean committing = state.commitResponse();
+        if (!committing) {
+            return false;
+        }
+        // henceforth we need to reset the state
 
-    if (metaDataResponse == null) {
-      metaDataResponse = newMetaDataResponse(connection.getResponse());
-      if (metaDataResponse == null) {
-        state.partialResponse();
-        return false;
-      }
-    }
+        if (metaDataResponse == null) {
+            metaDataResponse = newMetaDataResponse(connection.getResponse());
+            if (metaDataResponse == null) {
+                state.partialResponse();
+                return false;
+            }
+        }
 
-    if (metaDataResponse.getStatus() >= 100 && metaDataResponse.getStatus() < 200) {
-      state.partialResponse();
-      return false;
-    }
+        if (metaDataResponse.getStatus() >= 100 && metaDataResponse.getStatus() < 200) {
+            state.partialResponse();
+            return false;
+        }
 
-    Request req = connection.getRequest();
+        Request req = connection.getRequest();
 
-    if (req.getAttribute(DD_IGNORE_COMMIT_ATTRIBUTE) != null) {
-      state.partialResponse();
-      return false;
-    }
+        if (req.getAttribute(DD_IGNORE_COMMIT_ATTRIBUTE) != null) {
+            state.partialResponse();
+            return false;
+        }
 
-    Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-    if (!(contextObj instanceof Context)) {
-      state.partialResponse();
-      return false;
-    }
+        Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+        if (!(contextObj instanceof Context)) {
+            state.partialResponse();
+            return false;
+        }
 
-    Context context = (Context) contextObj;
-    AgentSpan span = AgentSpan.fromContext(context);
-    if (span == null) {
-      state.partialResponse();
-      return false;
-    }
+        Context context = (Context) contextObj;
+        AgentSpan span = AgentSpan.fromContext(context);
+        if (span == null) {
+            state.partialResponse();
+            return false;
+        }
 
-    RequestContext requestContext = span.getRequestContext();
-    if (requestContext == null) {
-      state.partialResponse();
-      return false;
-    }
+        RequestContext requestContext = span.getRequestContext();
+        if (requestContext == null) {
+            state.partialResponse();
+            return false;
+        }
 
-    Response resp = connection.getResponse();
-    Flow<Void> flow =
-        JettyDecorator.DECORATE.callIGCallbackResponseAndHeaders(
-            span, resp, resp.getStatus(), ExtractAdapter.Response.GETTER);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      boolean success = JettyOnCommitBlockingHelper.block(connection, transport, rba, cb);
-      if (success) {
-        requestContext.getTraceSegment().effectivelyBlocked();
-        return true;
-      }
-    }
+        Response resp = connection.getResponse();
+        Flow<Void> flow = JettyDecorator.DECORATE.callIGCallbackResponseAndHeaders(
+                span, resp, resp.getStatus(), ExtractAdapter.Response.GETTER);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            boolean success = JettyOnCommitBlockingHelper.block(connection, transport, rba, cb);
+            if (success) {
+                requestContext.getTraceSegment().effectivelyBlocked();
+                return true;
+            }
+        }
 
-    state.partialResponse();
-    return false;
-  }
+        state.partialResponse();
+        return false;
+    }
 
-  private static MetaData.Response newMetaDataResponse(Response resp) {
-    Method newMetaDataResponse;
-    try {
-      newMetaDataResponse = Response.class.getDeclaredMethod("newResponseMetaData");
-      newMetaDataResponse.setAccessible(true);
-      return (MetaData.Response) newMetaDataResponse.invoke(resp);
-    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-      log.debug("Failed creating new MetaData.Response", e);
-      return null;
+    private static MetaData.Response newMetaDataResponse(Response resp) {
+        Method newMetaDataResponse;
+        try {
+            newMetaDataResponse = Response.class.getDeclaredMethod("newResponseMetaData");
+            newMetaDataResponse.setAccessible(true);
+            return (MetaData.Response) newMetaDataResponse.invoke(resp);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            log.debug("Failed creating new MetaData.Response", e);
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/JettyDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/JettyDecorator.java
index 2caf9cf2754..f034ab8c35b 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/JettyDecorator.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/JettyDecorator.java
@@ -17,112 +17,111 @@
 import org.eclipse.jetty.server.Response;
 
 public class JettyDecorator extends HttpServerDecorator<Request, Request, Response, Request> {
-  public static final CharSequence JETTY_SERVER = UTF8BytesString.create("jetty-server");
-  public static final JettyDecorator DECORATE = new JettyDecorator();
-  public static final CharSequence SERVLET_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-  public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
-  public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
-  public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jetty"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JETTY_SERVER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Request> getter() {
-    return ExtractAdapter.Request.GETTER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Response> responseGetter() {
-    return ExtractAdapter.Response.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return SERVLET_REQUEST;
-  }
-
-  @Override
-  protected String method(final Request request) {
-    return request.getMethod();
-  }
-
-  @Override
-  protected URIDataAdapter url(final Request request) {
-    return new RequestURIDataAdapter(request);
-  }
-
-  @Override
-  protected String peerHostIP(final Request request) {
-    // Avoid Request.getRemoteAddr() since ForwardedRequestCustomizer overrides it with
-    // the value resolved from x-forwarded-for and similar proxy headers. Peer information
-    // must be the actual socket peer.
-    HttpChannel channel = request.getHttpChannel();
-    if (channel != null) {
-      InetSocketAddress remote = channel.getRemoteAddress();
-      if (remote != null && remote.getAddress() != null) {
-        return remote.getAddress().getHostAddress();
-      }
+    public static final CharSequence JETTY_SERVER = UTF8BytesString.create("jetty-server");
+    public static final JettyDecorator DECORATE = new JettyDecorator();
+    public static final CharSequence SERVLET_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+    public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
+    public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
+    public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jetty"};
     }
-    return request.getRemoteAddr();
-  }
-
-  @Override
-  protected int peerPort(final Request request) {
-    HttpChannel channel = request.getHttpChannel();
-    if (channel != null) {
-      InetSocketAddress remote = channel.getRemoteAddress();
-      if (remote != null) {
-        return remote.getPort();
-      }
+
+    @Override
+    protected CharSequence component() {
+        return JETTY_SERVER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Request> getter() {
+        return ExtractAdapter.Request.GETTER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Response> responseGetter() {
+        return ExtractAdapter.Response.GETTER;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return SERVLET_REQUEST;
+    }
+
+    @Override
+    protected String method(final Request request) {
+        return request.getMethod();
+    }
+
+    @Override
+    protected URIDataAdapter url(final Request request) {
+        return new RequestURIDataAdapter(request);
+    }
+
+    @Override
+    protected String peerHostIP(final Request request) {
+        // Avoid Request.getRemoteAddr() since ForwardedRequestCustomizer overrides it with
+        // the value resolved from x-forwarded-for and similar proxy headers. Peer information
+        // must be the actual socket peer.
+        HttpChannel channel = request.getHttpChannel();
+        if (channel != null) {
+            InetSocketAddress remote = channel.getRemoteAddress();
+            if (remote != null && remote.getAddress() != null) {
+                return remote.getAddress().getHostAddress();
+            }
+        }
+        return request.getRemoteAddr();
+    }
+
+    @Override
+    protected int peerPort(final Request request) {
+        HttpChannel channel = request.getHttpChannel();
+        if (channel != null) {
+            InetSocketAddress remote = channel.getRemoteAddress();
+            if (remote != null) {
+                return remote.getPort();
+            }
+        }
+        return request.getRemotePort();
     }
-    return request.getRemotePort();
-  }
-
-  @Override
-  protected int status(final Response response) {
-    return response.getStatus();
-  }
-
-  @Override
-  protected boolean isAppSecOnResponseSeparate() {
-    return true;
-  }
-
-  @Override
-  protected String getRequestHeader(final Request request, String key) {
-    return request.getHeader(key);
-  }
-
-  @Override
-  protected BlockResponseFunction createBlockResponseFunction(Request request, Request connection) {
-    return new JettyBlockResponseFunction(request);
-  }
-
-  public static final class OnResponse {
-    public static void onResponse(AgentSpan span, HttpChannel channel) {
-      Request request = channel.getRequest();
-      Response response = channel.getResponse();
-      if (Config.get().isServletPrincipalEnabled() && request.getUserPrincipal() != null) {
-        span.setTag(DDTags.USER_NAME, request.getUserPrincipal().getName());
-      }
-      Object ex = request.getAttribute("javax.servlet.error.exception");
-      if (ex instanceof Throwable) {
-        Throwable throwable = (Throwable) ex;
-        if (throwable instanceof ServletException) {
-          throwable = ((ServletException) throwable).getRootCause();
+
+    @Override
+    protected int status(final Response response) {
+        return response.getStatus();
+    }
+
+    @Override
+    protected boolean isAppSecOnResponseSeparate() {
+        return true;
+    }
+
+    @Override
+    protected String getRequestHeader(final Request request, String key) {
+        return request.getHeader(key);
+    }
+
+    @Override
+    protected BlockResponseFunction createBlockResponseFunction(Request request, Request connection) {
+        return new JettyBlockResponseFunction(request);
+    }
+
+    public static final class OnResponse {
+        public static void onResponse(AgentSpan span, HttpChannel channel) {
+            Request request = channel.getRequest();
+            Response response = channel.getResponse();
+            if (Config.get().isServletPrincipalEnabled() && request.getUserPrincipal() != null) {
+                span.setTag(DDTags.USER_NAME, request.getUserPrincipal().getName());
+            }
+            Object ex = request.getAttribute("javax.servlet.error.exception");
+            if (ex instanceof Throwable) {
+                Throwable throwable = (Throwable) ex;
+                if (throwable instanceof ServletException) {
+                    throwable = ((ServletException) throwable).getRootCause();
+                }
+                JettyDecorator.DECORATE.onError(span, throwable);
+            }
+            DECORATE.onResponse(span, response);
         }
-        JettyDecorator.DECORATE.onError(span, throwable);
-      }
-      DECORATE.onResponse(span, response);
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/JettyOnCommitBlockingHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/JettyOnCommitBlockingHelper.java
index 7b8ccc4fb6e..5788633b77d 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/JettyOnCommitBlockingHelper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/JettyOnCommitBlockingHelper.java
@@ -22,155 +22,149 @@
 
 public class JettyOnCommitBlockingHelper {
 
-  private static final Logger log = LoggerFactory.getLogger(JettyOnCommitBlockingHelper.class);
-  private static final ByteBuffer EMPTY_BB = ByteBuffer.allocate(0);
-
-  public static boolean block(
-      HttpChannel channel,
-      HttpTransport transport,
-      Flow.Action.RequestBlockingAction rba,
-      Callback cb) {
-    if (!isInitialized()) {
-      return false;
-    }
+    private static final Logger log = LoggerFactory.getLogger(JettyOnCommitBlockingHelper.class);
+    private static final ByteBuffer EMPTY_BB = ByteBuffer.allocate(0);
 
-    Request request = channel.getRequest();
-    Response response = channel.getResponse();
-    request.setAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE, Boolean.TRUE);
-
-    try {
-      int statusCode = BlockingActionHelper.getHttpCode(rba.getStatusCode());
-
-      String acceptHeader = request.getHeader("Accept");
-      HttpFields fields = HttpFields.build();
-      for (Map.Entry<String, String> e : rba.getExtraHeaders().entrySet()) {
-        putHeader(fields, e.getKey(), e.getValue());
-      }
-
-      BlockingContentType bct = rba.getBlockingContentType();
-      MetaData.Response info;
-      Callback closeCb = new CloseCallback(cb, channel);
-      if (bct != BlockingContentType.NONE && !request.isHead()) {
-        BlockingActionHelper.TemplateType type =
-            BlockingActionHelper.determineTemplateType(bct, acceptHeader);
-        putHeader(fields, "Content-type", BlockingActionHelper.getContentType(type));
-        byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
-        putHeader(fields, "Content-length", Integer.toString(template.length));
-
-        info = new MetaData.Response(request.getHttpVersion(), statusCode, fields, template.length);
-        if (!commit(channel, info)) {
-          return false;
+    public static boolean block(
+            HttpChannel channel, HttpTransport transport, Flow.Action.RequestBlockingAction rba, Callback cb) {
+        if (!isInitialized()) {
+            return false;
         }
 
-        // we need to update the upper layers too
-        // so that the correct status code/headers get reported correctly on the span`
-        reset(channel);
-        response.setStatus(statusCode);
-        response.setContentType(BlockingActionHelper.getContentType(type));
-        response.setContentLength(template.length);
-
-        request.onResponseCommit();
-        log.debug("Sending blocking response (non-empty body)");
-        transport.send(request.getMetaData(), info, ByteBuffer.wrap(template), true, closeCb);
-      } else {
-        info = new MetaData.Response(request.getHttpVersion(), statusCode, fields);
-
-        reset(channel);
-        response.setStatus(statusCode);
-
-        request.onResponseCommit();
-        transport.send(request.getMetaData(), info, EMPTY_BB, true, closeCb);
-      }
-    } catch (Exception x) {
-      log.warn("Error committing blocking response", x);
-      return false;
+        Request request = channel.getRequest();
+        Response response = channel.getResponse();
+        request.setAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE, Boolean.TRUE);
+
+        try {
+            int statusCode = BlockingActionHelper.getHttpCode(rba.getStatusCode());
+
+            String acceptHeader = request.getHeader("Accept");
+            HttpFields fields = HttpFields.build();
+            for (Map.Entry<String, String> e : rba.getExtraHeaders().entrySet()) {
+                putHeader(fields, e.getKey(), e.getValue());
+            }
+
+            BlockingContentType bct = rba.getBlockingContentType();
+            MetaData.Response info;
+            Callback closeCb = new CloseCallback(cb, channel);
+            if (bct != BlockingContentType.NONE && !request.isHead()) {
+                BlockingActionHelper.TemplateType type = BlockingActionHelper.determineTemplateType(bct, acceptHeader);
+                putHeader(fields, "Content-type", BlockingActionHelper.getContentType(type));
+                byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
+                putHeader(fields, "Content-length", Integer.toString(template.length));
+
+                info = new MetaData.Response(request.getHttpVersion(), statusCode, fields, template.length);
+                if (!commit(channel, info)) {
+                    return false;
+                }
+
+                // we need to update the upper layers too
+                // so that the correct status code/headers get reported correctly on the span`
+                reset(channel);
+                response.setStatus(statusCode);
+                response.setContentType(BlockingActionHelper.getContentType(type));
+                response.setContentLength(template.length);
+
+                request.onResponseCommit();
+                log.debug("Sending blocking response (non-empty body)");
+                transport.send(request.getMetaData(), info, ByteBuffer.wrap(template), true, closeCb);
+            } else {
+                info = new MetaData.Response(request.getHttpVersion(), statusCode, fields);
+
+                reset(channel);
+                response.setStatus(statusCode);
+
+                request.onResponseCommit();
+                transport.send(request.getMetaData(), info, EMPTY_BB, true, closeCb);
+            }
+        } catch (Exception x) {
+            log.warn("Error committing blocking response", x);
+            return false;
+        }
+        return true;
     }
-    return true;
-  }
-
-  private static final MethodHandle PUT_HEADER;
-
-  static {
-    MethodHandle mh = null;
-    try {
-      Class<?> mutableCls =
-          Class.forName(
-              "org.eclipse.jetty.http.HttpFields$Mutable",
-              false,
-              JettyOnCommitBlockingHelper.class.getClassLoader());
-      Method put = mutableCls.getDeclaredMethod("put", String.class, String.class);
-      put.setAccessible(true);
-      mh = MethodHandles.lookup().unreflect(put);
-    } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) {
-      log.warn(
-          "Could not find method HttpFields$Mutable.put(String,String). "
-              + "Blocking on responses will be unavailable");
+
+    private static final MethodHandle PUT_HEADER;
+
+    static {
+        MethodHandle mh = null;
+        try {
+            Class<?> mutableCls = Class.forName(
+                    "org.eclipse.jetty.http.HttpFields$Mutable",
+                    false,
+                    JettyOnCommitBlockingHelper.class.getClassLoader());
+            Method put = mutableCls.getDeclaredMethod("put", String.class, String.class);
+            put.setAccessible(true);
+            mh = MethodHandles.lookup().unreflect(put);
+        } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) {
+            log.warn("Could not find method HttpFields$Mutable.put(String,String). "
+                    + "Blocking on responses will be unavailable");
+        }
+        PUT_HEADER = mh;
     }
-    PUT_HEADER = mh;
-  }
-
-  public static boolean isInitialized() {
-    return PUT_HEADER != null;
-  }
-
-  private static void putHeader(HttpFields fields, String key, String value) {
-    try {
-      PUT_HEADER.invoke(fields, key, value);
-    } catch (Throwable e) {
-      throw new RuntimeException(e);
+
+    public static boolean isInitialized() {
+        return PUT_HEADER != null;
     }
-  }
-
-  private static void reset(HttpChannel channel) {
-    if (channel.getState().partialResponse()) {
-      channel.getResponse().reset();
-      channel.getState().commitResponse();
-    } else {
-      log.debug("Failed resetting response");
+
+    private static void putHeader(HttpFields fields, String key, String value) {
+        try {
+            PUT_HEADER.invoke(fields, key, value);
+        } catch (Throwable e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
-
-  private static boolean commit(HttpChannel channel, MetaData.Response info) {
-    try {
-      Method commit = HttpChannel.class.getDeclaredMethod("commit", MetaData.Response.class);
-      commit.setAccessible(true);
-      commit.invoke(channel, info);
-    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-      log.warn("Failed calling commit(MetaData.Response) when writing blocking response", e);
-      return false;
+
+    private static void reset(HttpChannel channel) {
+        if (channel.getState().partialResponse()) {
+            channel.getResponse().reset();
+            channel.getState().commitResponse();
+        } else {
+            log.debug("Failed resetting response");
+        }
     }
-    return true;
-  }
 
-  public static final class CloseCallback implements Callback {
-    private static final Logger log = LoggerFactory.getLogger(CloseCallback.class);
+    private static boolean commit(HttpChannel channel, MetaData.Response info) {
+        try {
+            Method commit = HttpChannel.class.getDeclaredMethod("commit", MetaData.Response.class);
+            commit.setAccessible(true);
+            commit.invoke(channel, info);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            log.warn("Failed calling commit(MetaData.Response) when writing blocking response", e);
+            return false;
+        }
+        return true;
+    }
 
-    private final Callback delegate;
-    private final HttpChannel channel;
+    public static final class CloseCallback implements Callback {
+        private static final Logger log = LoggerFactory.getLogger(CloseCallback.class);
 
-    public CloseCallback(Callback delegate, HttpChannel channel) {
-      this.delegate = delegate;
-      this.channel = channel;
-    }
+        private final Callback delegate;
+        private final HttpChannel channel;
 
-    private void close() {
-      channel.getResponse().getHttpOutput().completed(null);
-      channel.getEndPoint().close();
-    }
+        public CloseCallback(Callback delegate, HttpChannel channel) {
+            this.delegate = delegate;
+            this.channel = channel;
+        }
 
-    @Override
-    public void succeeded() {
-      close();
-      delegate.succeeded();
-      log.debug("State after blocking {}", channel.getState());
-    }
+        private void close() {
+            channel.getResponse().getHttpOutput().completed(null);
+            channel.getEndPoint().close();
+        }
+
+        @Override
+        public void succeeded() {
+            close();
+            delegate.succeeded();
+            log.debug("State after blocking {}", channel.getState());
+        }
 
-    @Override
-    public void failed(final Throwable x) {
-      log.debug("Exception sending blocking response", x);
-      close();
-      delegate.failed(x);
-      log.debug("State after blocking {}", channel.getState());
+        @Override
+        public void failed(final Throwable x) {
+            log.debug("Exception sending blocking response", x);
+            close();
+            delegate.failed(x);
+            log.debug("State after blocking {}", channel.getState());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/ResetAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/ResetAdvice.java
index 9c8a8a688a9..7b7049cbbe6 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/ResetAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/ResetAdvice.java
@@ -15,19 +15,19 @@
  * reliable point to finish the server span at the last possible moment.
  */
 public class ResetAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void stopSpan(@Advice.This final HttpChannel channel) {
-    Request req = channel.getRequest();
-    Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-    if (!(contextObj instanceof Context)) {
-      return;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void stopSpan(@Advice.This final HttpChannel channel) {
+        Request req = channel.getRequest();
+        Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+        if (!(contextObj instanceof Context)) {
+            return;
+        }
+        final Context context = (Context) contextObj;
+        final AgentSpan span = spanFromContext(context);
+        if (span != null) {
+            JettyDecorator.OnResponse.onResponse(span, channel);
+            span.finish();
+        }
+        DECORATE.beforeFinish(context);
     }
-    final Context context = (Context) contextObj;
-    final AgentSpan span = spanFromContext(context);
-    if (span != null) {
-      JettyDecorator.OnResponse.onResponse(span, channel);
-      span.finish();
-    }
-    DECORATE.beforeFinish(context);
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/SendResponseCbAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/SendResponseCbAdvice.java
index 5b9bcbf17c6..81b85677d53 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/SendResponseCbAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/SendResponseCbAdvice.java
@@ -7,12 +7,12 @@
 import org.eclipse.jetty.util.Callback;
 
 public class SendResponseCbAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-  public static boolean /* skip */ before(
-      @Advice.This HttpChannel connection,
-      @Advice.Argument(0) MetaData.Response responseInfo,
-      @Advice.Argument(3) Callback cb,
-      @Advice.FieldValue("_transport") HttpTransport _transport) {
-    return JettyCommitResponseHelper.before(connection, responseInfo, _transport, cb);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+    public static boolean /* skip */ before(
+            @Advice.This HttpChannel connection,
+            @Advice.Argument(0) MetaData.Response responseInfo,
+            @Advice.Argument(3) Callback cb,
+            @Advice.FieldValue("_transport") HttpTransport _transport) {
+        return JettyCommitResponseHelper.before(connection, responseInfo, _transport, cb);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/ServerHandleAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/ServerHandleAdvice.java
index eeeec5dd611..4b6b21e08e7 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/ServerHandleAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/ServerHandleAdvice.java
@@ -12,70 +12,70 @@
 import org.eclipse.jetty.server.Request;
 
 class ServerHandleAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  static ContextScope onEnter(
-      @Advice.Argument(0) HttpChannel channel,
-      @Advice.Local("request") Request req,
-      @Advice.Local("agentSpan") AgentSpan span) {
-    req = channel.getRequest();
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static ContextScope onEnter(
+            @Advice.Argument(0) HttpChannel channel,
+            @Advice.Local("request") Request req,
+            @Advice.Local("agentSpan") AgentSpan span) {
+        req = channel.getRequest();
 
-    // First check if there's an existing context in the request (from main server span)
-    Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+        // First check if there's an existing context in the request (from main server span)
+        Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
 
-    // same logic as in Servlet3Advice. We need to activate/finish the dispatch span here
-    // because we don't know if a servlet is going to be called and therefore whether
-    // Servlet3Advice will have an opportunity to run.
-    // If there is no servlet involved, the span would not be finished.
-    Object dispatchSpan;
-    synchronized (req) {
-      dispatchSpan = req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
-    }
-    if (dispatchSpan instanceof AgentSpan) {
-      // this is not great, but we leave the attribute. This is because
-      // Set{Servlet,Context}PathAdvice
-      // looks for this attribute, and we need a way to tell Servlet3Advice not to activate
-      // the root span, stored in DD_CONTEXT_ATTRIBUTE.
-      // req.removeAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
-      span = (AgentSpan) dispatchSpan;
-
-      // If we have an existing context, create a new context with the dispatch span
-      // Otherwise just attach the dispatch span
-      if (existingContext instanceof Context) {
-        Context contextWithDispatchSpan = ((Context) existingContext).with(span);
-        return contextWithDispatchSpan.attach();
-      } else {
-        return span.attach();
-      }
-    }
+        // same logic as in Servlet3Advice. We need to activate/finish the dispatch span here
+        // because we don't know if a servlet is going to be called and therefore whether
+        // Servlet3Advice will have an opportunity to run.
+        // If there is no servlet involved, the span would not be finished.
+        Object dispatchSpan;
+        synchronized (req) {
+            dispatchSpan = req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
+        }
+        if (dispatchSpan instanceof AgentSpan) {
+            // this is not great, but we leave the attribute. This is because
+            // Set{Servlet,Context}PathAdvice
+            // looks for this attribute, and we need a way to tell Servlet3Advice not to activate
+            // the root span, stored in DD_CONTEXT_ATTRIBUTE.
+            // req.removeAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
+            span = (AgentSpan) dispatchSpan;
 
-    return null;
-  }
+            // If we have an existing context, create a new context with the dispatch span
+            // Otherwise just attach the dispatch span
+            if (existingContext instanceof Context) {
+                Context contextWithDispatchSpan = ((Context) existingContext).with(span);
+                return contextWithDispatchSpan.attach();
+            } else {
+                return span.attach();
+            }
+        }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void onExit(
-      @Advice.Enter final ContextScope scope,
-      @Advice.Local("request") Request req,
-      @Advice.Local("agentSpan") AgentSpan span,
-      @Advice.Thrown Throwable t) {
-    if (scope == null) {
-      return;
+        return null;
     }
 
-    if (t != null) {
-      DECORATE.onError(span, t);
-    }
-    if (!req.isAsyncStarted()) {
-      // finish will be handled by the async listener
-      // Use the full context from the scope for beforeFinish
-      DECORATE.beforeFinish(scope.context());
-      scope.close();
-      span.finish();
-    } else {
-      scope.close();
-    }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void onExit(
+            @Advice.Enter final ContextScope scope,
+            @Advice.Local("request") Request req,
+            @Advice.Local("agentSpan") AgentSpan span,
+            @Advice.Thrown Throwable t) {
+        if (scope == null) {
+            return;
+        }
+
+        if (t != null) {
+            DECORATE.onError(span, t);
+        }
+        if (!req.isAsyncStarted()) {
+            // finish will be handled by the async listener
+            // Use the full context from the scope for beforeFinish
+            DECORATE.beforeFinish(scope.context());
+            scope.close();
+            span.finish();
+        } else {
+            scope.close();
+        }
 
-    synchronized (req) {
-      req.removeAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
+        synchronized (req) {
+            req.removeAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/SetContextPathAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/SetContextPathAdvice.java
index 6c0540843d9..efcf0ba2f0e 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/SetContextPathAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/SetContextPathAdvice.java
@@ -16,20 +16,19 @@
  * when it is actually set.
  */
 public class SetContextPathAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void updateContextPath(
-      @Advice.This final Request req, @Advice.Argument(0) final String contextPath) {
-    if (contextPath != null) {
-      Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      // Don't want to update while being dispatched to new servlet
-      if (contextObj instanceof Context && req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) == null) {
-        Context context = (Context) contextObj;
-        AgentSpan span = spanFromContext(context);
-        if (span != null) {
-          span.setTag(SERVLET_CONTEXT, contextPath);
-          req.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, contextPath);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void updateContextPath(@Advice.This final Request req, @Advice.Argument(0) final String contextPath) {
+        if (contextPath != null) {
+            Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            // Don't want to update while being dispatched to new servlet
+            if (contextObj instanceof Context && req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) == null) {
+                Context context = (Context) contextObj;
+                AgentSpan span = spanFromContext(context);
+                if (span != null) {
+                    span.setTag(SERVLET_CONTEXT, contextPath);
+                    req.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, contextPath);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/SetRequestedSessionIdAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/SetRequestedSessionIdAdvice.java
index 3a2a3655dc0..f00485cadb2 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/SetRequestedSessionIdAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/SetRequestedSessionIdAdvice.java
@@ -19,25 +19,24 @@
  */
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 public class SetRequestedSessionIdAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void setRequestedSessionId(
-      @ActiveRequestContext RequestContext reqCtx,
-      @Advice.Argument(0) final String requestedSessionId) {
-    if (requestedSessionId != null && reqCtx != null) {
-      final CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      if (cbp == null) {
-        return;
-      }
-      final BiFunction<RequestContext, String, Flow<Void>> addrCallback =
-          cbp.getCallback(EVENTS.requestSession());
-      if (addrCallback == null) {
-        return;
-      }
-      final Flow<Void> flow = addrCallback.apply(reqCtx, requestedSessionId);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        throw new BlockingException("Blocked request (for sessionId)");
-      }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void setRequestedSessionId(
+            @ActiveRequestContext RequestContext reqCtx, @Advice.Argument(0) final String requestedSessionId) {
+        if (requestedSessionId != null && reqCtx != null) {
+            final CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            if (cbp == null) {
+                return;
+            }
+            final BiFunction<RequestContext, String, Flow<Void>> addrCallback =
+                    cbp.getCallback(EVENTS.requestSession());
+            if (addrCallback == null) {
+                return;
+            }
+            final Flow<Void> flow = addrCallback.apply(reqCtx, requestedSessionId);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                throw new BlockingException("Blocked request (for sessionId)");
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/SetServletPathAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/SetServletPathAdvice.java
index af307de6144..743d9423e21 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/SetServletPathAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/SetServletPathAdvice.java
@@ -19,26 +19,25 @@
  * when it is actually set.
  */
 public class SetServletPathAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void updateServletPath(
-      @Advice.This final Request req, @Advice.Argument(0) final String servletPath) {
-    if (servletPath != null && !servletPath.isEmpty()) { // bypass cleanup
-      Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      // Don't want to update while being dispatched to new servlet
-      if (contextObj instanceof Context && req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) == null) {
-        Context context = (Context) contextObj;
-        AgentSpan span = spanFromContext(context);
-        if (span != null) {
-          span.setTag(SERVLET_PATH, servletPath);
-          req.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, servletPath);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void updateServletPath(@Advice.This final Request req, @Advice.Argument(0) final String servletPath) {
+        if (servletPath != null && !servletPath.isEmpty()) { // bypass cleanup
+            Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            // Don't want to update while being dispatched to new servlet
+            if (contextObj instanceof Context && req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) == null) {
+                Context context = (Context) contextObj;
+                AgentSpan span = spanFromContext(context);
+                if (span != null) {
+                    span.setTag(SERVLET_PATH, servletPath);
+                    req.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, servletPath);
+                }
+            }
         }
-      }
     }
-  }
 
-  private void muzzleCheck(HttpChannel connection, HttpServletRequest request, HttpFields fields) {
-    connection.run();
-    request.getContextPath();
-    fields.getField(0);
-  }
+    private void muzzleCheck(HttpChannel connection, HttpServletRequest request, HttpFields fields) {
+        connection.run();
+        request.getContextPath();
+        fields.getField(0);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/test/groovy/datadog/trace/instrumentation/jetty10/Jetty10EarlyDepForkedTest.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/test/groovy/datadog/trace/instrumentation/jetty10/Jetty10EarlyDepForkedTest.java
index 47cbde9736c..de771a7123c 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/test/groovy/datadog/trace/instrumentation/jetty10/Jetty10EarlyDepForkedTest.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/test/groovy/datadog/trace/instrumentation/jetty10/Jetty10EarlyDepForkedTest.java
@@ -13,46 +13,44 @@
  * {@code earlyDep10ForkedTest} Gradle task (Jetty 10.0.9).
  */
 @EnabledIfSystemProperty(named = "test.dd.earlyJetty10", matches = ".+")
-class Jetty10EarlyDepV0ForkedTest extends Jetty10Test
-    implements TestingGenericHttpNamingConventions.ServerV0 {
-
-  @Override
-  public int version() {
-    return 0;
-  }
-
-  @Override
-  public String service() {
-    return null;
-  }
-
-  @Override
-  public String operation() {
-    return "servlet.request";
-  }
+class Jetty10EarlyDepV0ForkedTest extends Jetty10Test implements TestingGenericHttpNamingConventions.ServerV0 {
+
+    @Override
+    public int version() {
+        return 0;
+    }
+
+    @Override
+    public String service() {
+        return null;
+    }
+
+    @Override
+    public String operation() {
+        return "servlet.request";
+    }
 }
 
 @EnabledIfSystemProperty(named = "test.dd.earlyJetty10", matches = ".+")
-class Jetty10EarlyDepV1ForkedTest extends Jetty10Test
-    implements TestingGenericHttpNamingConventions.ServerV1 {
-
-  @Override
-  public int version() {
-    return 1;
-  }
-
-  @Override
-  public String service() {
-    return null;
-  }
-
-  @Override
-  public String operation() {
-    return "http.server.request";
-  }
-
-  @Override
-  protected boolean useWebsocketPojoEndpoint() {
-    return false;
-  }
+class Jetty10EarlyDepV1ForkedTest extends Jetty10Test implements TestingGenericHttpNamingConventions.ServerV1 {
+
+    @Override
+    public int version() {
+        return 1;
+    }
+
+    @Override
+    public String service() {
+        return null;
+    }
+
+    @Override
+    public String operation() {
+        return "http.server.request";
+    }
+
+    @Override
+    protected boolean useWebsocketPojoEndpoint() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java
index 9a4c7f133d8..595870c0a4b 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java
@@ -29,87 +29,87 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JettyServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice,
-        ExcludeFilterProvider {
+        implements Instrumenter.ForSingleType,
+                Instrumenter.HasTypeAdvice,
+                Instrumenter.HasMethodAdvice,
+                ExcludeFilterProvider {
 
-  public JettyServerInstrumentation() {
-    super("jetty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.HttpChannel";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".JettyDecorator",
-      packageName + ".RequestURIDataAdapter",
-      "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-    };
-  }
-
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new HttpChannelHandleVisitorWrapper());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        takesNoArguments().and(named("handle")),
-        packageName + ".JettyServerAdvice$ContextTrackingAdvice",
-        packageName + ".JettyServerAdvice$HandleAdvice");
-    transformer.applyAdvice(
-        named("recycle").and(takesNoArguments()), packageName + ".JettyServerAdvice$ResetAdvice");
-  }
+    public JettyServerInstrumentation() {
+        super("jetty");
+    }
 
-  public static class HttpChannelHandleVisitorWrapper implements AsmVisitorWrapper {
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.HttpChannel";
+    }
 
     @Override
-    public int mergeWriter(int flags) {
-      return flags | ClassWriter.COMPUTE_MAXS;
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".JettyDecorator",
+            packageName + ".RequestURIDataAdapter",
+            "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+        };
     }
 
     @Override
-    public int mergeReader(int flags) {
-      return flags;
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new HttpChannelHandleVisitorWrapper());
     }
 
     @Override
-    public ClassVisitor wrap(
-        TypeDescription instrumentedType,
-        ClassVisitor classVisitor,
-        Implementation.Context implementationContext,
-        TypePool typePool,
-        FieldList<FieldDescription.InDefinedShape> fields,
-        MethodList<?> methods,
-        int writerFlags,
-        int readerFlags) {
-      if (Config.get().getAppSecActivation() == ProductActivation.FULLY_DISABLED) {
-        return classVisitor;
-      }
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                takesNoArguments().and(named("handle")),
+                packageName + ".JettyServerAdvice$ContextTrackingAdvice",
+                packageName + ".JettyServerAdvice$HandleAdvice");
+        transformer.applyAdvice(
+                named("recycle").and(takesNoArguments()), packageName + ".JettyServerAdvice$ResetAdvice");
+    }
+
+    public static class HttpChannelHandleVisitorWrapper implements AsmVisitorWrapper {
+
+        @Override
+        public int mergeWriter(int flags) {
+            return flags | ClassWriter.COMPUTE_MAXS;
+        }
+
+        @Override
+        public int mergeReader(int flags) {
+            return flags;
+        }
 
-      return new HttpChannelHandleVisitor(Opcodes.ASM7, classVisitor);
+        @Override
+        public ClassVisitor wrap(
+                TypeDescription instrumentedType,
+                ClassVisitor classVisitor,
+                Implementation.Context implementationContext,
+                TypePool typePool,
+                FieldList<FieldDescription.InDefinedShape> fields,
+                MethodList<?> methods,
+                int writerFlags,
+                int readerFlags) {
+            if (Config.get().getAppSecActivation() == ProductActivation.FULLY_DISABLED) {
+                return classVisitor;
+            }
+
+            return new HttpChannelHandleVisitor(Opcodes.ASM7, classVisitor);
+        }
     }
-  }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    return Collections.singletonMap(
-        RUNNABLE,
-        Arrays.asList(
-            "org.eclipse.jetty.util.thread.strategy.ProduceConsume",
-            "org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume",
-            "org.eclipse.jetty.io.ManagedSelector",
-            "org.eclipse.jetty.util.thread.TimerScheduler",
-            "org.eclipse.jetty.util.thread.TimerScheduler$SimpleTask"));
-  }
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        return Collections.singletonMap(
+                RUNNABLE,
+                Arrays.asList(
+                        "org.eclipse.jetty.util.thread.strategy.ProduceConsume",
+                        "org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume",
+                        "org.eclipse.jetty.io.ManagedSelector",
+                        "org.eclipse.jetty.util.thread.TimerScheduler",
+                        "org.eclipse.jetty.util.thread.TimerScheduler$SimpleTask"));
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java
index 215ea920aff..cabdf4087bc 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java
@@ -9,26 +9,26 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RequestInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public RequestInstrumentation() {
-    super("jetty");
-  }
+    public RequestInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.Request";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.Request";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("setContext")
-            .and(takesArgument(0, named("org.eclipse.jetty.server.handler.ContextHandler$Context")))
-            .and(takesArgument(1, String.class)),
-        packageName + ".SetContextPathAdvice");
-    transformer.applyAdvice(
-        named("setRequestedSessionId").and(takesArgument(0, String.class)),
-        packageName + ".SetRequestedSessionIdAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("setContext")
+                        .and(takesArgument(0, named("org.eclipse.jetty.server.handler.ContextHandler$Context")))
+                        .and(takesArgument(1, String.class)),
+                packageName + ".SetContextPathAdvice");
+        transformer.applyAdvice(
+                named("setRequestedSessionId").and(takesArgument(0, String.class)),
+                packageName + ".SetRequestedSessionIdAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/ExtractAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/ExtractAdapter.java
index e9737a2870e..ff51fdc51af 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/ExtractAdapter.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/ExtractAdapter.java
@@ -5,37 +5,37 @@
 import org.eclipse.jetty.http.HttpFields;
 
 public abstract class ExtractAdapter<T> implements AgentPropagation.ContextVisitor<T> {
-  abstract HttpFields getHttpFields(T t);
+    abstract HttpFields getHttpFields(T t);
 
-  @Override
-  public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-    HttpFields headers = getHttpFields(carrier);
-    if (headers == null) {
-      return;
-    }
-    for (int i = 0; i < headers.size(); ++i) {
-      HttpField field = headers.getField(i);
-      if (field != null && !classifier.accept(field.getName(), field.getValue())) {
-        return;
-      }
+    @Override
+    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+        HttpFields headers = getHttpFields(carrier);
+        if (headers == null) {
+            return;
+        }
+        for (int i = 0; i < headers.size(); ++i) {
+            HttpField field = headers.getField(i);
+            if (field != null && !classifier.accept(field.getName(), field.getValue())) {
+                return;
+            }
+        }
     }
-  }
 
-  public static final class Request extends ExtractAdapter<org.eclipse.jetty.server.Request> {
-    public static final Request GETTER = new Request();
+    public static final class Request extends ExtractAdapter<org.eclipse.jetty.server.Request> {
+        public static final Request GETTER = new Request();
 
-    @Override
-    HttpFields getHttpFields(org.eclipse.jetty.server.Request request) {
-      return request.getHttpFields();
+        @Override
+        HttpFields getHttpFields(org.eclipse.jetty.server.Request request) {
+            return request.getHttpFields();
+        }
     }
-  }
 
-  public static final class Response extends ExtractAdapter<org.eclipse.jetty.server.Response> {
-    public static final Response GETTER = new Response();
+    public static final class Response extends ExtractAdapter<org.eclipse.jetty.server.Response> {
+        public static final Response GETTER = new Response();
 
-    @Override
-    HttpFields getHttpFields(org.eclipse.jetty.server.Response response) {
-      return response.getHttpFields();
+        @Override
+        HttpFields getHttpFields(org.eclipse.jetty.server.Response response) {
+            return response.getHttpFields();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/JettyDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/JettyDecorator.java
index 0003f085225..cd9d4bf15f9 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/JettyDecorator.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/JettyDecorator.java
@@ -16,111 +16,110 @@
 import org.eclipse.jetty.server.Response;
 
 public class JettyDecorator extends HttpServerDecorator<Request, Request, Response, Request> {
-  public static final CharSequence JETTY_SERVER = UTF8BytesString.create("jetty-server");
-  public static final JettyDecorator DECORATE = new JettyDecorator();
-  public static final CharSequence SERVLET_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-
-  public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
-  public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
-  public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jetty"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JETTY_SERVER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Request> getter() {
-    return ExtractAdapter.Request.GETTER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Response> responseGetter() {
-    return ExtractAdapter.Response.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return SERVLET_REQUEST;
-  }
-
-  @Override
-  protected String method(final Request request) {
-    return request.getMethod();
-  }
-
-  @Override
-  protected URIDataAdapter url(final Request request) {
-    return new RequestURIDataAdapter(request);
-  }
-
-  @Override
-  protected String peerHostIP(final Request request) {
-    // Avoid Request.getRemoteAddr() since ForwardedRequestCustomizer overrides it with
-    // the value resolved from x-forwarded-for and similar proxy headers. Peer information
-    // must be the actual socket peer.
-    HttpChannel channel = request.getHttpChannel();
-    if (channel != null) {
-      InetSocketAddress remote = channel.getRemoteAddress();
-      if (remote != null && remote.getAddress() != null) {
-        return remote.getAddress().getHostAddress();
-      }
+    public static final CharSequence JETTY_SERVER = UTF8BytesString.create("jetty-server");
+    public static final JettyDecorator DECORATE = new JettyDecorator();
+    public static final CharSequence SERVLET_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
+    public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
+    public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jetty"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JETTY_SERVER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Request> getter() {
+        return ExtractAdapter.Request.GETTER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Response> responseGetter() {
+        return ExtractAdapter.Response.GETTER;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return SERVLET_REQUEST;
+    }
+
+    @Override
+    protected String method(final Request request) {
+        return request.getMethod();
     }
-    return request.getRemoteAddr();
-  }
-
-  @Override
-  protected int peerPort(final Request request) {
-    HttpChannel channel = request.getHttpChannel();
-    if (channel != null) {
-      InetSocketAddress remote = channel.getRemoteAddress();
-      if (remote != null) {
-        return remote.getPort();
-      }
+
+    @Override
+    protected URIDataAdapter url(final Request request) {
+        return new RequestURIDataAdapter(request);
+    }
+
+    @Override
+    protected String peerHostIP(final Request request) {
+        // Avoid Request.getRemoteAddr() since ForwardedRequestCustomizer overrides it with
+        // the value resolved from x-forwarded-for and similar proxy headers. Peer information
+        // must be the actual socket peer.
+        HttpChannel channel = request.getHttpChannel();
+        if (channel != null) {
+            InetSocketAddress remote = channel.getRemoteAddress();
+            if (remote != null && remote.getAddress() != null) {
+                return remote.getAddress().getHostAddress();
+            }
+        }
+        return request.getRemoteAddr();
+    }
+
+    @Override
+    protected int peerPort(final Request request) {
+        HttpChannel channel = request.getHttpChannel();
+        if (channel != null) {
+            InetSocketAddress remote = channel.getRemoteAddress();
+            if (remote != null) {
+                return remote.getPort();
+            }
+        }
+        return request.getRemotePort();
+    }
+
+    @Override
+    protected int status(final Response response) {
+        return response.getStatus();
+    }
+
+    @Override
+    protected boolean isAppSecOnResponseSeparate() {
+        return true;
     }
-    return request.getRemotePort();
-  }
-
-  @Override
-  protected int status(final Response response) {
-    return response.getStatus();
-  }
-
-  @Override
-  protected boolean isAppSecOnResponseSeparate() {
-    return true;
-  }
-
-  @Override
-  protected String getRequestHeader(final Request request, String key) {
-    return request.getHeader(key);
-  }
-
-  public void onResponse(AgentSpan span, HttpChannel channel) {
-    Request request = channel.getRequest();
-    Response response = channel.getResponse();
-    if (Config.get().isServletPrincipalEnabled() && request.getUserPrincipal() != null) {
-      span.setTag(DDTags.USER_NAME, request.getUserPrincipal().getName());
+
+    @Override
+    protected String getRequestHeader(final Request request, String key) {
+        return request.getHeader(key);
     }
-    Object ex = request.getAttribute("jakarta.servlet.error.exception");
-    if (ex instanceof Throwable) {
-      Throwable throwable = (Throwable) ex;
-      if (throwable instanceof ServletException) {
-        throwable = ((ServletException) throwable).getRootCause();
-      }
-      onError(span, throwable);
+
+    public void onResponse(AgentSpan span, HttpChannel channel) {
+        Request request = channel.getRequest();
+        Response response = channel.getResponse();
+        if (Config.get().isServletPrincipalEnabled() && request.getUserPrincipal() != null) {
+            span.setTag(DDTags.USER_NAME, request.getUserPrincipal().getName());
+        }
+        Object ex = request.getAttribute("jakarta.servlet.error.exception");
+        if (ex instanceof Throwable) {
+            Throwable throwable = (Throwable) ex;
+            if (throwable instanceof ServletException) {
+                throwable = ((ServletException) throwable).getRootCause();
+            }
+            onError(span, throwable);
+        }
+        super.onResponse(span, response);
     }
-    super.onResponse(span, response);
-  }
 
-  @Override
-  protected BlockResponseFunction createBlockResponseFunction(Request request, Request request1) {
-    return new JettyBlockResponseFunction(request);
-  }
+    @Override
+    protected BlockResponseFunction createBlockResponseFunction(Request request, Request request1) {
+        return new JettyBlockResponseFunction(request);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java
index 06aca2ae484..32b78afb4e4 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java
@@ -18,90 +18,89 @@
 
 public class JettyServerAdvice {
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextTrackingAdvice {
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextTrackingAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.This final HttpChannel channel,
-        @Advice.Local("parentScope") ContextScope parentScope) {
-      Request req = channel.getRequest();
-      if (req.getAttribute(DD_CONTEXT_ATTRIBUTE) instanceof Context) {
-        return; // re-entry: HandleAdvice will attach existing context
-      }
-      Context parentContext = DECORATE.extract(req);
-      req.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
-      parentScope = parentContext.attach();
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.This final HttpChannel channel, @Advice.Local("parentScope") ContextScope parentScope) {
+            Request req = channel.getRequest();
+            if (req.getAttribute(DD_CONTEXT_ATTRIBUTE) instanceof Context) {
+                return; // re-entry: HandleAdvice will attach existing context
+            }
+            Context parentContext = DECORATE.extract(req);
+            req.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
+            parentScope = parentContext.attach();
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Local("parentScope") ContextScope parentScope) {
-      if (parentScope != null) {
-        parentScope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Local("parentScope") ContextScope parentScope) {
+            if (parentScope != null) {
+                parentScope.close();
+            }
+        }
     }
-  }
 
-  public static class HandleAdvice {
+    public static class HandleAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.This final HttpChannel channel, @Advice.Local("agentSpan") AgentSpan span) {
-      Request req = channel.getRequest();
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.This final HttpChannel channel, @Advice.Local("agentSpan") AgentSpan span) {
+            Request req = channel.getRequest();
 
-      Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (existingContext instanceof Context) {
-        return ((Context) existingContext).attach();
-      }
+            Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (existingContext instanceof Context) {
+                return ((Context) existingContext).attach();
+            }
 
-      final Object parentContextObj = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
-      final Context parentContext =
-          (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
-      final Context context = DECORATE.startSpan(req, parentContext);
-      final ContextScope scope = context.attach();
-      span = fromContext(context);
-      span.setMeasured(true);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, req, req, parentContext);
+            final Object parentContextObj = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
+            final Context parentContext =
+                    (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
+            final Context context = DECORATE.startSpan(req, parentContext);
+            final ContextScope scope = context.attach();
+            span = fromContext(context);
+            span.setMeasured(true);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, req, req, parentContext);
 
-      req.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
-      req.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
-      req.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
-      return scope;
-    }
+            req.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
+            req.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+            req.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+            return scope;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      scope.close();
-    }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            scope.close();
+        }
 
-    private void muzzleCheck(Request r) {
-      r.getAsyncContext(); // there must be a getAsyncContext returning a jakarta AsyncContext
+        private void muzzleCheck(Request r) {
+            r.getAsyncContext(); // there must be a getAsyncContext returning a jakarta AsyncContext
+        }
     }
-  }
 
-  /**
-   * Jetty ensures that connections are reset immediately after the response is sent. This provides
-   * a reliable point to finish the server span at the last possible moment.
-   */
-  public static class ResetAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void stopSpan(@Advice.This final HttpChannel channel) {
-      Request req = channel.getRequest();
-      Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (contextObj instanceof Context) {
-        final Context context = (Context) contextObj;
-        final AgentSpan span = fromContext(context);
-        if (span != null) {
-          DECORATE.onResponse(span, channel);
-          DECORATE.beforeFinish(context);
-          span.finish();
+    /**
+     * Jetty ensures that connections are reset immediately after the response is sent. This provides
+     * a reliable point to finish the server span at the last possible moment.
+     */
+    public static class ResetAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void stopSpan(@Advice.This final HttpChannel channel) {
+            Request req = channel.getRequest();
+            Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (contextObj instanceof Context) {
+                final Context context = (Context) contextObj;
+                final AgentSpan span = fromContext(context);
+                if (span != null) {
+                    DECORATE.onResponse(span, channel);
+                    DECORATE.beforeFinish(context);
+                    span.finish();
+                }
+            }
         }
-      }
-    }
 
-    private void muzzleCheck(HttpChannel connection) {
-      connection.run();
+        private void muzzleCheck(HttpChannel connection) {
+            connection.run();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/RequestURIDataAdapter.java
index 147b3519fd2..26f8baf9f20 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/RequestURIDataAdapter.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/RequestURIDataAdapter.java
@@ -5,39 +5,39 @@
 
 final class RequestURIDataAdapter extends URIRawDataAdapter {
 
-  private final HttpServletRequest request;
-
-  RequestURIDataAdapter(HttpServletRequest request) {
-    this.request = request;
-  }
-
-  @Override
-  public String scheme() {
-    return request.getScheme();
-  }
-
-  @Override
-  public String host() {
-    return request.getServerName();
-  }
-
-  @Override
-  public int port() {
-    return request.getServerPort();
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return request.getRequestURI();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return request.getQueryString();
-  }
+    private final HttpServletRequest request;
+
+    RequestURIDataAdapter(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    @Override
+    public String scheme() {
+        return request.getScheme();
+    }
+
+    @Override
+    public String host() {
+        return request.getServerName();
+    }
+
+    @Override
+    public int port() {
+        return request.getServerPort();
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return request.getRequestURI();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return request.getQueryString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/SetContextPathAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/SetContextPathAdvice.java
index 8308ade5098..f574740bfa9 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/SetContextPathAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/SetContextPathAdvice.java
@@ -19,31 +19,30 @@
  * when it is actually set.
  */
 public class SetContextPathAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void updateContextPath(
-      @Advice.This final Request req,
-      @Advice.Argument(0) final ContextHandler.Context context,
-      @Advice.Argument(1) final String pathInContext) {
-    Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-    // Don't want to update while being dispatched to new servlet
-    if (!(contextObj instanceof Context) || req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) != null) {
-      return;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void updateContextPath(
+            @Advice.This final Request req,
+            @Advice.Argument(0) final ContextHandler.Context context,
+            @Advice.Argument(1) final String pathInContext) {
+        Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+        // Don't want to update while being dispatched to new servlet
+        if (!(contextObj instanceof Context) || req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) != null) {
+            return;
+        }
+        Context ctx = (Context) contextObj;
+        AgentSpan span = spanFromContext(ctx);
+        if (span == null || context == null || context.getContextPath() == null) {
+            return;
+        }
+        final String servletContext = context.getContextPath();
+        span.setTag(SERVLET_CONTEXT, servletContext);
+        req.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, servletContext);
+        if (pathInContext != null) {
+            final String relativePath = pathInContext.startsWith(servletContext)
+                    ? pathInContext.substring(servletContext.length())
+                    : pathInContext;
+            span.setTag(SERVLET_PATH, relativePath);
+            req.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, relativePath);
+        }
     }
-    Context ctx = (Context) contextObj;
-    AgentSpan span = spanFromContext(ctx);
-    if (span == null || context == null || context.getContextPath() == null) {
-      return;
-    }
-    final String servletContext = context.getContextPath();
-    span.setTag(SERVLET_CONTEXT, servletContext);
-    req.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, servletContext);
-    if (pathInContext != null) {
-      final String relativePath =
-          pathInContext.startsWith(servletContext)
-              ? pathInContext.substring(servletContext.length())
-              : pathInContext;
-      span.setTag(SERVLET_PATH, relativePath);
-      req.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, relativePath);
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/SetRequestedSessionIdAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/SetRequestedSessionIdAdvice.java
index 992c2bbe0bd..b0557631ea6 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/SetRequestedSessionIdAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/SetRequestedSessionIdAdvice.java
@@ -19,25 +19,24 @@
  */
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 public class SetRequestedSessionIdAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void setRequestedSessionId(
-      @ActiveRequestContext RequestContext reqCtx,
-      @Advice.Argument(0) final String requestedSessionId) {
-    if (requestedSessionId != null && reqCtx != null) {
-      final CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      if (cbp == null) {
-        return;
-      }
-      final BiFunction<RequestContext, String, Flow<Void>> addrCallback =
-          cbp.getCallback(EVENTS.requestSession());
-      if (addrCallback == null) {
-        return;
-      }
-      final Flow<Void> flow = addrCallback.apply(reqCtx, requestedSessionId);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        throw new BlockingException("Blocked request (for sessionId)");
-      }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void setRequestedSessionId(
+            @ActiveRequestContext RequestContext reqCtx, @Advice.Argument(0) final String requestedSessionId) {
+        if (requestedSessionId != null && reqCtx != null) {
+            final CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            if (cbp == null) {
+                return;
+            }
+            final BiFunction<RequestContext, String, Flow<Void>> addrCallback =
+                    cbp.getCallback(EVENTS.requestSession());
+            if (addrCallback == null) {
+                return;
+            }
+            final Flow<Void> flow = addrCallback.apply(reqCtx, requestedSessionId);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                throw new BlockingException("Blocked request (for sessionId)");
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java
index 653014f1d82..06d03a3af33 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java
@@ -11,29 +11,29 @@
 
 @AutoService(InstrumenterModule.class)
 public final class AbstractSessionManagerInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public AbstractSessionManagerInstrumentation() {
-    super("jetty");
-  }
+    public AbstractSessionManagerInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jetty-session";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jetty-session";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.session.AbstractSessionManager";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.session.AbstractSessionManager";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("resolveRequestedSessionId")
-            .and(isProtected())
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("org.eclipse.jetty.server.Request"))),
-        packageName + ".ResolveRequestedSessionIdAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("resolveRequestedSessionId")
+                        .and(isProtected())
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("org.eclipse.jetty.server.Request"))),
+                packageName + ".ResolveRequestedSessionIdAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/ContextHandlerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/ContextHandlerInstrumentation.java
index c1ef8ff2722..a6bfb6a93d2 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/ContextHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/ContextHandlerInstrumentation.java
@@ -13,28 +13,26 @@
 
 @AutoService(InstrumenterModule.class)
 public final class ContextHandlerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public ContextHandlerInstrumentation() {
-    super("jetty");
-  }
+    public ContextHandlerInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.eclipse.jetty.server.handler.ContextHandler";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.eclipse.jetty.server.handler.ContextHandler";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("handle")
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("org.eclipse.jetty.server.Request"))),
-        packageName + ".SetContextPathAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("handle").and(takesArguments(3)).and(takesArgument(0, named("org.eclipse.jetty.server.Request"))),
+                packageName + ".SetContextPathAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java
index 04a88ad1f19..40a3bc0d618 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java
@@ -17,50 +17,50 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JettyServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
 
-  public JettyServerInstrumentation() {
-    super("jetty");
-  }
+    public JettyServerInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.internal.HttpChannelState";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.internal.HttpChannelState";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".JettyDecorator",
-      packageName + ".RequestURIDataAdapter",
-      packageName + ".JettyRunnableWrapper"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".JettyDecorator",
+            packageName + ".RequestURIDataAdapter",
+            packageName + ".JettyRunnableWrapper"
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        named("onRequest").and(takesArguments(1)),
-        packageName + ".JettyServerAdvice$HandleAdvice",
-        // note this is last while it should be first because this instrumentation advices on exit
-        packageName + ".JettyServerAdvice$ContextTrackingAdvice");
-    transformer.applyAdvice(
-        named("recycle").and(takesNoArguments()), packageName + ".JettyServerAdvice$ResetAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                named("onRequest").and(takesArguments(1)),
+                packageName + ".JettyServerAdvice$HandleAdvice",
+                // note this is last while it should be first because this instrumentation advices on exit
+                packageName + ".JettyServerAdvice$ContextTrackingAdvice");
+        transformer.applyAdvice(
+                named("recycle").and(takesNoArguments()), packageName + ".JettyServerAdvice$ResetAdvice");
+    }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    return Collections.singletonMap(
-        RUNNABLE,
-        Arrays.asList(
-            "org.eclipse.jetty.util.thread.strategy.ProduceConsume",
-            "org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume",
-            "org.eclipse.jetty.io.ManagedSelector",
-            "org.eclipse.jetty.util.thread.TimerScheduler",
-            "org.eclipse.jetty.util.thread.TimerScheduler$SimpleTask",
-            "org.eclipse.jetty.util.thread.SerializedInvoker$NamedRunnable"));
-  }
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        return Collections.singletonMap(
+                RUNNABLE,
+                Arrays.asList(
+                        "org.eclipse.jetty.util.thread.strategy.ProduceConsume",
+                        "org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume",
+                        "org.eclipse.jetty.io.ManagedSelector",
+                        "org.eclipse.jetty.util.thread.TimerScheduler",
+                        "org.eclipse.jetty.util.thread.TimerScheduler$SimpleTask",
+                        "org.eclipse.jetty.util.thread.SerializedInvoker$NamedRunnable"));
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/ExtractAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/ExtractAdapter.java
index ab932e3abc1..3143c0eae8a 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/ExtractAdapter.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/ExtractAdapter.java
@@ -5,37 +5,37 @@
 import org.eclipse.jetty.http.HttpFields;
 
 public abstract class ExtractAdapter<T> implements AgentPropagation.ContextVisitor<T> {
-  abstract HttpFields getHttpFields(T t);
+    abstract HttpFields getHttpFields(T t);
 
-  @Override
-  public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-    HttpFields headers = getHttpFields(carrier);
-    if (headers == null) {
-      return;
-    }
-    for (int i = 0; i < headers.size(); ++i) {
-      HttpField field = headers.getField(i);
-      if (field != null && !classifier.accept(field.getName(), field.getValue())) {
-        return;
-      }
+    @Override
+    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+        HttpFields headers = getHttpFields(carrier);
+        if (headers == null) {
+            return;
+        }
+        for (int i = 0; i < headers.size(); ++i) {
+            HttpField field = headers.getField(i);
+            if (field != null && !classifier.accept(field.getName(), field.getValue())) {
+                return;
+            }
+        }
     }
-  }
 
-  public static final class Request extends ExtractAdapter<org.eclipse.jetty.server.Request> {
-    public static final Request GETTER = new Request();
+    public static final class Request extends ExtractAdapter<org.eclipse.jetty.server.Request> {
+        public static final Request GETTER = new Request();
 
-    @Override
-    HttpFields getHttpFields(org.eclipse.jetty.server.Request request) {
-      return request.getHeaders();
+        @Override
+        HttpFields getHttpFields(org.eclipse.jetty.server.Request request) {
+            return request.getHeaders();
+        }
     }
-  }
 
-  public static final class Response extends ExtractAdapter<org.eclipse.jetty.server.Response> {
-    public static final Response GETTER = new Response();
+    public static final class Response extends ExtractAdapter<org.eclipse.jetty.server.Response> {
+        public static final Response GETTER = new Response();
 
-    @Override
-    HttpFields getHttpFields(org.eclipse.jetty.server.Response response) {
-      return response.getHeaders();
+        @Override
+        HttpFields getHttpFields(org.eclipse.jetty.server.Response response) {
+            return response.getHeaders();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyDecorator.java
index bfa8d3bb1dd..ef3d67e12ef 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyDecorator.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyDecorator.java
@@ -18,143 +18,139 @@
 import org.eclipse.jetty.server.internal.HttpChannelState;
 
 public class JettyDecorator extends HttpServerDecorator<Request, Request, Response, Request> {
-  public static final CharSequence JETTY_SERVER = UTF8BytesString.create("jetty-server");
-  public static final JettyDecorator DECORATE = new JettyDecorator();
-  public static final CharSequence SERVLET_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-
-  public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
-  public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
-  public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
-
-  private static final Class<?> JAVAX_SERVLET_EXCEPTION_CLS =
-      findClassIfExists("javax.servlet.ServletException");
-  private static final Class<?> JAKARTA_SERVLET_EXCEPTION_CLS =
-      findClassIfExists("jakarta.servlet.ServletException");
-
-  private static Class<?> findClassIfExists(final String name) {
-    try {
-      return Class.forName(name, false, JettyDecorator.class.getClassLoader());
-    } catch (ClassNotFoundException e) {
+    public static final CharSequence JETTY_SERVER = UTF8BytesString.create("jetty-server");
+    public static final JettyDecorator DECORATE = new JettyDecorator();
+    public static final CharSequence SERVLET_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
+    public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
+    public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
+
+    private static final Class<?> JAVAX_SERVLET_EXCEPTION_CLS = findClassIfExists("javax.servlet.ServletException");
+    private static final Class<?> JAKARTA_SERVLET_EXCEPTION_CLS = findClassIfExists("jakarta.servlet.ServletException");
+
+    private static Class<?> findClassIfExists(final String name) {
+        try {
+            return Class.forName(name, false, JettyDecorator.class.getClassLoader());
+        } catch (ClassNotFoundException e) {
+        }
+        return null;
     }
-    return null;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jetty"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JETTY_SERVER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Request> getter() {
-    return ExtractAdapter.Request.GETTER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Response> responseGetter() {
-    return ExtractAdapter.Response.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return SERVLET_REQUEST;
-  }
-
-  @Override
-  protected String method(final Request request) {
-    return request.getMethod();
-  }
-
-  @Override
-  protected URIDataAdapter url(final Request request) {
-    return new RequestURIDataAdapter(request);
-  }
-
-  @Override
-  protected String peerHostIP(final Request request) {
-    // Avoid Request.getRemoteAddr() since ForwardedRequestCustomizer wraps
-    // ConnectionMetaData.getRemoteSocketAddress() with the value resolved from
-    // x-forwarded-for and similar proxy headers. Peer information must be the actual
-    // socket peer.
-    final InetSocketAddress remote = remoteSocketAddress(request);
-    if (remote != null) {
-      final InetAddress address = remote.getAddress();
-      if (address != null) {
-        return address.getHostAddress();
-      }
-      return Request.getRemoteAddr(request);
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jetty"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JETTY_SERVER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Request> getter() {
+        return ExtractAdapter.Request.GETTER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Response> responseGetter() {
+        return ExtractAdapter.Response.GETTER;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return SERVLET_REQUEST;
     }
-    return Request.getRemoteAddr(request);
-  }
-
-  @Override
-  protected int peerPort(final Request request) {
-    final InetSocketAddress remote = remoteSocketAddress(request);
-    if (remote != null) {
-      return remote.getPort();
+
+    @Override
+    protected String method(final Request request) {
+        return request.getMethod();
     }
-    return Request.getRemotePort(request);
-  }
 
-  private static InetSocketAddress remoteSocketAddress(final Request request) {
-    final ConnectionMetaData metaData = request.getConnectionMetaData();
-    if (metaData == null) {
-      return null;
+    @Override
+    protected URIDataAdapter url(final Request request) {
+        return new RequestURIDataAdapter(request);
     }
-    final Connection connection = metaData.getConnection();
-    if (connection == null) {
-      return null;
+
+    @Override
+    protected String peerHostIP(final Request request) {
+        // Avoid Request.getRemoteAddr() since ForwardedRequestCustomizer wraps
+        // ConnectionMetaData.getRemoteSocketAddress() with the value resolved from
+        // x-forwarded-for and similar proxy headers. Peer information must be the actual
+        // socket peer.
+        final InetSocketAddress remote = remoteSocketAddress(request);
+        if (remote != null) {
+            final InetAddress address = remote.getAddress();
+            if (address != null) {
+                return address.getHostAddress();
+            }
+            return Request.getRemoteAddr(request);
+        }
+        return Request.getRemoteAddr(request);
     }
-    final EndPoint endPoint = connection.getEndPoint();
-    if (endPoint == null) {
-      return null;
+
+    @Override
+    protected int peerPort(final Request request) {
+        final InetSocketAddress remote = remoteSocketAddress(request);
+        if (remote != null) {
+            return remote.getPort();
+        }
+        return Request.getRemotePort(request);
     }
-    final SocketAddress remote = endPoint.getRemoteSocketAddress();
-    if (remote instanceof InetSocketAddress) {
-      return (InetSocketAddress) remote;
+
+    private static InetSocketAddress remoteSocketAddress(final Request request) {
+        final ConnectionMetaData metaData = request.getConnectionMetaData();
+        if (metaData == null) {
+            return null;
+        }
+        final Connection connection = metaData.getConnection();
+        if (connection == null) {
+            return null;
+        }
+        final EndPoint endPoint = connection.getEndPoint();
+        if (endPoint == null) {
+            return null;
+        }
+        final SocketAddress remote = endPoint.getRemoteSocketAddress();
+        if (remote instanceof InetSocketAddress) {
+            return (InetSocketAddress) remote;
+        }
+        return null;
     }
-    return null;
-  }
-
-  @Override
-  protected int status(final Response response) {
-    return response.getStatus();
-  }
-
-  @Override
-  protected String getRequestHeader(final Request request, String key) {
-    return request.getHeaders().get(key);
-  }
-
-  public void onResponse(AgentSpan span, HttpChannelState channel) {
-    Request request = channel.getRequest();
-    Response response = channel.getResponse();
-    if (Config.get().isServletPrincipalEnabled()) {
-      final Request.AuthenticationState authenticationState =
-          Request.getAuthenticationState(request);
-      if (authenticationState != null && authenticationState.getUserPrincipal() != null) {
-        span.setTag(DDTags.USER_NAME, authenticationState.getUserPrincipal().getName());
-      }
+
+    @Override
+    protected int status(final Response response) {
+        return response.getStatus();
     }
-    Object ex = request.getAttribute("jakarta.servlet.error.exception");
-    if (ex == null) {
-      ex = request.getAttribute("javax.servlet.error.exception");
+
+    @Override
+    protected String getRequestHeader(final Request request, String key) {
+        return request.getHeaders().get(key);
     }
-    if (ex instanceof Throwable) {
-      Throwable throwable = (Throwable) ex;
-      if ((JAVAX_SERVLET_EXCEPTION_CLS != null && JAVAX_SERVLET_EXCEPTION_CLS.isInstance(throwable))
-          || (JAKARTA_SERVLET_EXCEPTION_CLS != null
-              && JAKARTA_SERVLET_EXCEPTION_CLS.isInstance(throwable))) {
-        // unwrap using getCause that's equivalent to servletException.getRootCause
-        throwable = throwable.getCause();
-      }
-      onError(span, throwable);
+
+    public void onResponse(AgentSpan span, HttpChannelState channel) {
+        Request request = channel.getRequest();
+        Response response = channel.getResponse();
+        if (Config.get().isServletPrincipalEnabled()) {
+            final Request.AuthenticationState authenticationState = Request.getAuthenticationState(request);
+            if (authenticationState != null && authenticationState.getUserPrincipal() != null) {
+                span.setTag(
+                        DDTags.USER_NAME, authenticationState.getUserPrincipal().getName());
+            }
+        }
+        Object ex = request.getAttribute("jakarta.servlet.error.exception");
+        if (ex == null) {
+            ex = request.getAttribute("javax.servlet.error.exception");
+        }
+        if (ex instanceof Throwable) {
+            Throwable throwable = (Throwable) ex;
+            if ((JAVAX_SERVLET_EXCEPTION_CLS != null && JAVAX_SERVLET_EXCEPTION_CLS.isInstance(throwable))
+                    || (JAKARTA_SERVLET_EXCEPTION_CLS != null && JAKARTA_SERVLET_EXCEPTION_CLS.isInstance(throwable))) {
+                // unwrap using getCause that's equivalent to servletException.getRootCause
+                throwable = throwable.getCause();
+            }
+            onError(span, throwable);
+        }
+        super.onResponse(span, response);
     }
-    super.onResponse(span, response);
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java
index 94299a1e141..c6cf8609bdf 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java
@@ -10,34 +10,34 @@
 
 public class JettyRunnableWrapper implements Runnable, Invocable {
 
-  private Runnable runnable;
-  private ContextContinuation continuation;
-
-  public JettyRunnableWrapper(Runnable runnable, ContextContinuation continuation) {
-    this.runnable = runnable;
-    this.continuation = continuation;
-  }
-
-  @Override
-  public InvocationType getInvocationType() {
-    return Invocable.getInvocationType(runnable);
-  }
-
-  @Override
-  public void run() {
-    try (ContextScope scope = continuation.resume()) {
-      runnable.run();
+    private Runnable runnable;
+    private ContextContinuation continuation;
+
+    public JettyRunnableWrapper(Runnable runnable, ContextContinuation continuation) {
+        this.runnable = runnable;
+        this.continuation = continuation;
+    }
+
+    @Override
+    public InvocationType getInvocationType() {
+        return Invocable.getInvocationType(runnable);
     }
-  }
 
-  public static Runnable wrapIfNeeded(final Runnable task) {
-    if (task instanceof JettyRunnableWrapper || exclude(RUNNABLE, task)) {
-      return task;
+    @Override
+    public void run() {
+        try (ContextScope scope = continuation.resume()) {
+            runnable.run();
+        }
     }
-    ContextContinuation continuation = Context.current().capture();
-    if (continuation.context() != Context.root()) {
-      return new JettyRunnableWrapper(task, continuation);
+
+    public static Runnable wrapIfNeeded(final Runnable task) {
+        if (task instanceof JettyRunnableWrapper || exclude(RUNNABLE, task)) {
+            return task;
+        }
+        ContextContinuation continuation = Context.current().capture();
+        if (continuation.context() != Context.root()) {
+            return new JettyRunnableWrapper(task, continuation);
+        }
+        return task; // don't wrap unless there is a scope to propagate
     }
-    return task; // don't wrap unless there is a scope to propagate
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java
index e0c507071c5..db35df0bbe0 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java
@@ -18,71 +18,70 @@
 
 public class JettyServerAdvice {
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextTrackingAdvice {
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextTrackingAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(@Advice.This final HttpChannelState channel) {
-      Request req = channel.getRequest();
-      if (req.getAttribute(DD_CONTEXT_ATTRIBUTE) instanceof Context) {
-        return; // re-entry: HandleAdvice will attach existing context
-      }
-      Context parentContext = DECORATE.extract(req);
-      req.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(@Advice.This final HttpChannelState channel) {
+            Request req = channel.getRequest();
+            if (req.getAttribute(DD_CONTEXT_ATTRIBUTE) instanceof Context) {
+                return; // re-entry: HandleAdvice will attach existing context
+            }
+            Context parentContext = DECORATE.extract(req);
+            req.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
+        }
     }
-  }
 
-  public static class HandleAdvice {
+    public static class HandleAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This final HttpChannelState channel,
-        @Advice.Return(readOnly = false) Runnable ret) {
-      Request req = channel.getRequest();
-      Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (existingContext instanceof Context) {
-        try (final ContextScope scope = ((Context) existingContext).attach()) {
-          ret = JettyRunnableWrapper.wrapIfNeeded(ret);
-          return;
-        }
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This final HttpChannelState channel, @Advice.Return(readOnly = false) Runnable ret) {
+            Request req = channel.getRequest();
+            Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (existingContext instanceof Context) {
+                try (final ContextScope scope = ((Context) existingContext).attach()) {
+                    ret = JettyRunnableWrapper.wrapIfNeeded(ret);
+                    return;
+                }
+            }
 
-      final Object parentContextObj = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
-      final Context parentContext =
-          (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
-      final Context context = DECORATE.startSpan(req, parentContext);
-      try (final ContextScope ignored = context.attach()) {
-        final AgentSpan span = fromContext(context);
-        span.setMeasured(true);
-        DECORATE.afterStart(span);
-        DECORATE.onRequest(span, req, req, parentContext);
+            final Object parentContextObj = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
+            final Context parentContext =
+                    (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
+            final Context context = DECORATE.startSpan(req, parentContext);
+            try (final ContextScope ignored = context.attach()) {
+                final AgentSpan span = fromContext(context);
+                span.setMeasured(true);
+                DECORATE.afterStart(span);
+                DECORATE.onRequest(span, req, req, parentContext);
 
-        req.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
-        req.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
-        req.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
-        ret = JettyRunnableWrapper.wrapIfNeeded(ret);
-      }
+                req.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
+                req.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+                req.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+                ret = JettyRunnableWrapper.wrapIfNeeded(ret);
+            }
+        }
     }
-  }
 
-  /**
-   * Jetty ensures that connections are reset immediately after the response is sent. This provides
-   * a reliable point to finish the server span at the last possible moment.
-   */
-  public static class ResetAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void stopSpan(@Advice.This final HttpChannelState channel) {
-      Request req = channel.getRequest();
-      Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (contextObj instanceof Context) {
-        final Context context = (Context) contextObj;
-        final AgentSpan span = fromContext(context);
-        if (span != null) {
-          DECORATE.onResponse(span, channel);
-          DECORATE.beforeFinish(context);
-          span.finish();
+    /**
+     * Jetty ensures that connections are reset immediately after the response is sent. This provides
+     * a reliable point to finish the server span at the last possible moment.
+     */
+    public static class ResetAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void stopSpan(@Advice.This final HttpChannelState channel) {
+            Request req = channel.getRequest();
+            Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (contextObj instanceof Context) {
+                final Context context = (Context) contextObj;
+                final AgentSpan span = fromContext(context);
+                if (span != null) {
+                    DECORATE.onResponse(span, channel);
+                    DECORATE.beforeFinish(context);
+                    span.finish();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/RequestURIDataAdapter.java
index 5b1a5c14a69..cb628faba50 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/RequestURIDataAdapter.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/RequestURIDataAdapter.java
@@ -5,39 +5,39 @@
 
 final class RequestURIDataAdapter extends URIRawDataAdapter {
 
-  private final Request request;
-
-  RequestURIDataAdapter(Request request) {
-    this.request = request;
-  }
-
-  @Override
-  public String scheme() {
-    return request.getHttpURI().getScheme();
-  }
-
-  @Override
-  public String host() {
-    return Request.getServerName(request);
-  }
-
-  @Override
-  public int port() {
-    return Request.getServerPort(request);
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return Request.getPathInContext(request);
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return request.getHttpURI().getQuery();
-  }
+    private final Request request;
+
+    RequestURIDataAdapter(Request request) {
+        this.request = request;
+    }
+
+    @Override
+    public String scheme() {
+        return request.getHttpURI().getScheme();
+    }
+
+    @Override
+    public String host() {
+        return Request.getServerName(request);
+    }
+
+    @Override
+    public int port() {
+        return Request.getServerPort(request);
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return Request.getPathInContext(request);
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return request.getHttpURI().getQuery();
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/ResolveRequestedSessionIdAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/ResolveRequestedSessionIdAdvice.java
index 1ad0a38e8ef..366b3db8810 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/ResolveRequestedSessionIdAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/ResolveRequestedSessionIdAdvice.java
@@ -20,27 +20,25 @@
  */
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 public class ResolveRequestedSessionIdAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void resolveRequestedSessionId(
-      @ActiveRequestContext RequestContext reqCtx,
-      @Advice.Return final RequestedSession requestedSession) {
-    final String requestedSessionId =
-        requestedSession == null ? null : requestedSession.sessionId();
-    if (requestedSessionId != null && reqCtx != null) {
-      final CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      if (cbp == null) {
-        return;
-      }
-      final BiFunction<RequestContext, String, Flow<Void>> addrCallback =
-          cbp.getCallback(EVENTS.requestSession());
-      if (addrCallback == null) {
-        return;
-      }
-      final Flow<Void> flow = addrCallback.apply(reqCtx, requestedSessionId);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        throw new BlockingException("Blocked request (for sessionId)");
-      }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void resolveRequestedSessionId(
+            @ActiveRequestContext RequestContext reqCtx, @Advice.Return final RequestedSession requestedSession) {
+        final String requestedSessionId = requestedSession == null ? null : requestedSession.sessionId();
+        if (requestedSessionId != null && reqCtx != null) {
+            final CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            if (cbp == null) {
+                return;
+            }
+            final BiFunction<RequestContext, String, Flow<Void>> addrCallback =
+                    cbp.getCallback(EVENTS.requestSession());
+            if (addrCallback == null) {
+                return;
+            }
+            final Flow<Void> flow = addrCallback.apply(reqCtx, requestedSessionId);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                throw new BlockingException("Blocked request (for sessionId)");
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/SetContextPathAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/SetContextPathAdvice.java
index 0db494383ec..3a10dae131b 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/SetContextPathAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/SetContextPathAdvice.java
@@ -20,42 +20,41 @@
  * when it is actually set.
  */
 public class SetContextPathAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void updateContextPath(
-      @Advice.This final ContextHandler contextHandler, @Advice.Argument(0) final Request req) {
-    Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-    // Don't want to update while being dispatched to new servlet
-    if (!(contextObj instanceof Context) || req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) != null) {
-      return;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void updateContextPath(
+            @Advice.This final ContextHandler contextHandler, @Advice.Argument(0) final Request req) {
+        Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+        // Don't want to update while being dispatched to new servlet
+        if (!(contextObj instanceof Context) || req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) != null) {
+            return;
+        }
+        Context context = (Context) contextObj;
+        AgentSpan span = spanFromContext(context);
+        if (span == null || contextHandler == null || contextHandler.getContextPath() == null) {
+            return;
+        }
+        final String servletContext = contextHandler.getContextPath();
+        final String pathInContext;
+        final HttpURI uri = req.getHttpURI();
+        if (contextHandler.getContext() != null && uri != null && uri.getDecodedPath() != null) {
+            pathInContext = contextHandler.getContext().getPathInContext(uri.getDecodedPath());
+        } else {
+            pathInContext = null;
+        }
+        span.setTag(SERVLET_CONTEXT, servletContext);
+        req.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, servletContext);
+        if (pathInContext != null) {
+            // the following can be cached however than can be issues for application having
+            // dynamically generated URL
+            // since a bounded cache might collide
+            String relativePath = pathInContext.startsWith(servletContext)
+                    ? pathInContext.substring(servletContext.length())
+                    : pathInContext;
+            if (relativePath.isEmpty() || relativePath.charAt(0) != '/') {
+                relativePath = "/" + relativePath;
+            }
+            span.setTag(SERVLET_PATH, relativePath);
+            req.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, relativePath);
+        }
     }
-    Context context = (Context) contextObj;
-    AgentSpan span = spanFromContext(context);
-    if (span == null || contextHandler == null || contextHandler.getContextPath() == null) {
-      return;
-    }
-    final String servletContext = contextHandler.getContextPath();
-    final String pathInContext;
-    final HttpURI uri = req.getHttpURI();
-    if (contextHandler.getContext() != null && uri != null && uri.getDecodedPath() != null) {
-      pathInContext = contextHandler.getContext().getPathInContext(uri.getDecodedPath());
-    } else {
-      pathInContext = null;
-    }
-    span.setTag(SERVLET_CONTEXT, servletContext);
-    req.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, servletContext);
-    if (pathInContext != null) {
-      // the following can be cached however than can be issues for application having
-      // dynamically generated URL
-      // since a bounded cache might collide
-      String relativePath =
-          pathInContext.startsWith(servletContext)
-              ? pathInContext.substring(servletContext.length())
-              : pathInContext;
-      if (relativePath.isEmpty() || relativePath.charAt(0) != '/') {
-        relativePath = "/" + relativePath;
-      }
-      span.setTag(SERVLET_PATH, relativePath);
-      req.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, relativePath);
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/java/datadog/trace/instrumentation/jetty12/JettyRunnableWrapperTest.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/java/datadog/trace/instrumentation/jetty12/JettyRunnableWrapperTest.java
index 8d5e91244e6..fcf1cd28678 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/java/datadog/trace/instrumentation/jetty12/JettyRunnableWrapperTest.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/java/datadog/trace/instrumentation/jetty12/JettyRunnableWrapperTest.java
@@ -19,87 +19,74 @@
 import org.junit.jupiter.params.provider.EnumSource;
 
 class JettyRunnableWrapperTest {
-  private static final Context REQUEST = Context.root().with(ContextKey.named("request"), "jetty");
+    private static final Context REQUEST = Context.root().with(ContextKey.named("request"), "jetty");
 
-  @ParameterizedTest
-  @EnumSource(InvocationType.class)
-  void preservesInvocationTypeAndContext(InvocationType type) {
-    Context caller = Context.current();
-    AtomicBoolean ran = new AtomicBoolean();
-    Runnable task =
-        wrap(
-            Invocable.from(
-                type,
-                () -> {
-                  assertSame(REQUEST, Context.current());
-                  ran.set(true);
-                }));
+    @ParameterizedTest
+    @EnumSource(InvocationType.class)
+    void preservesInvocationTypeAndContext(InvocationType type) {
+        Context caller = Context.current();
+        AtomicBoolean ran = new AtomicBoolean();
+        Runnable task = wrap(Invocable.from(type, () -> {
+            assertSame(REQUEST, Context.current());
+            ran.set(true);
+        }));
 
-    assertEquals(type, Invocable.getInvocationType(task));
-    assertSame(caller, Context.current());
-    task.run();
-    assertTrue(ran.get());
-    assertSame(caller, Context.current());
-  }
+        assertEquals(type, Invocable.getInvocationType(task));
+        assertSame(caller, Context.current());
+        task.run();
+        assertTrue(ran.get());
+        assertSame(caller, Context.current());
+    }
 
-  @Test
-  void plainRunnableRemainsBlocking() {
-    Runnable task = wrap(() -> {});
-    assertEquals(InvocationType.BLOCKING, Invocable.getInvocationType(task));
-    task.run();
-  }
+    @Test
+    void plainRunnableRemainsBlocking() {
+        Runnable task = wrap(() -> {});
+        assertEquals(InvocationType.BLOCKING, Invocable.getInvocationType(task));
+        task.run();
+    }
 
-  @Test
-  void restoresContextWhenTaskThrows() {
-    Context caller = Context.current();
-    RuntimeException failure = new RuntimeException("task failed");
-    Runnable task =
-        wrap(
-            Invocable.from(
-                InvocationType.NON_BLOCKING,
-                () -> {
-                  assertSame(REQUEST, Context.current());
-                  throw failure;
-                }));
-    assertSame(failure, assertThrows(RuntimeException.class, task::run));
-    assertSame(caller, Context.current());
-  }
+    @Test
+    void restoresContextWhenTaskThrows() {
+        Context caller = Context.current();
+        RuntimeException failure = new RuntimeException("task failed");
+        Runnable task = wrap(Invocable.from(InvocationType.NON_BLOCKING, () -> {
+            assertSame(REQUEST, Context.current());
+            throw failure;
+        }));
+        assertSame(failure, assertThrows(RuntimeException.class, task::run));
+        assertSame(caller, Context.current());
+    }
 
-  @Test
-  void nonBlockingTaskRunsWithoutExecutorHandoff() throws Exception {
-    Queue<Runnable> produced = new ArrayDeque<>();
-    Queue<Runnable> dispatched = new ArrayDeque<>();
-    AtomicBoolean ran = new AtomicBoolean();
-    Thread producer = Thread.currentThread();
-    produced.add(
-        wrap(
-            Invocable.from(
-                InvocationType.NON_BLOCKING,
-                () -> {
-                  assertSame(producer, Thread.currentThread());
-                  assertSame(REQUEST, Context.current());
-                  ran.set(true);
-                })));
-    AdaptiveExecutionStrategy strategy =
-        new AdaptiveExecutionStrategy(produced::poll, dispatched::add);
-    Context caller = Context.current();
-    strategy.start();
-    try {
-      strategy.produce();
-      assertTrue(ran.get());
-      assertTrue(dispatched.isEmpty(), "nonblocking tasks should run on the producer");
-      assertSame(caller, Context.current());
-    } finally {
-      strategy.stop();
-      while (!dispatched.isEmpty()) {
-        dispatched.remove().run();
-      }
+    @Test
+    void nonBlockingTaskRunsWithoutExecutorHandoff() throws Exception {
+        Queue<Runnable> produced = new ArrayDeque<>();
+        Queue<Runnable> dispatched = new ArrayDeque<>();
+        AtomicBoolean ran = new AtomicBoolean();
+        Thread producer = Thread.currentThread();
+        produced.add(wrap(Invocable.from(InvocationType.NON_BLOCKING, () -> {
+            assertSame(producer, Thread.currentThread());
+            assertSame(REQUEST, Context.current());
+            ran.set(true);
+        })));
+        AdaptiveExecutionStrategy strategy = new AdaptiveExecutionStrategy(produced::poll, dispatched::add);
+        Context caller = Context.current();
+        strategy.start();
+        try {
+            strategy.produce();
+            assertTrue(ran.get());
+            assertTrue(dispatched.isEmpty(), "nonblocking tasks should run on the producer");
+            assertSame(caller, Context.current());
+        } finally {
+            strategy.stop();
+            while (!dispatched.isEmpty()) {
+                dispatched.remove().run();
+            }
+        }
     }
-  }
 
-  private static Runnable wrap(Runnable task) {
-    try (ContextScope ignored = REQUEST.attach()) {
-      return JettyRunnableWrapper.wrapIfNeeded(task);
+    private static Runnable wrap(Runnable task) {
+        try (ContextScope ignored = REQUEST.attach()) {
+            return JettyRunnableWrapper.wrapIfNeeded(task);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ExtractAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ExtractAdapter.java
index 9de5eebc3e4..7c98b6d9705 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ExtractAdapter.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ExtractAdapter.java
@@ -4,37 +4,37 @@
 import org.eclipse.jetty.http.HttpFields;
 
 public abstract class ExtractAdapter<T> implements AgentPropagation.ContextVisitor<T> {
-  abstract HttpFields getHttpFields(T t);
+    abstract HttpFields getHttpFields(T t);
 
-  @Override
-  public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-    HttpFields headers = getHttpFields(carrier);
-    if (headers == null) {
-      return;
-    }
-    for (int i = 0; i < headers.size(); ++i) {
-      HttpFields.Field field = headers.getField(i);
-      if (field != null && !classifier.accept(field.getName(), field.getValue())) {
-        return;
-      }
+    @Override
+    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+        HttpFields headers = getHttpFields(carrier);
+        if (headers == null) {
+            return;
+        }
+        for (int i = 0; i < headers.size(); ++i) {
+            HttpFields.Field field = headers.getField(i);
+            if (field != null && !classifier.accept(field.getName(), field.getValue())) {
+                return;
+            }
+        }
     }
-  }
 
-  public static final class Request extends ExtractAdapter<org.eclipse.jetty.server.Request> {
-    public static final Request GETTER = new Request();
+    public static final class Request extends ExtractAdapter<org.eclipse.jetty.server.Request> {
+        public static final Request GETTER = new Request();
 
-    @Override
-    HttpFields getHttpFields(org.eclipse.jetty.server.Request request) {
-      return request.getConnection().getRequestFields();
+        @Override
+        HttpFields getHttpFields(org.eclipse.jetty.server.Request request) {
+            return request.getConnection().getRequestFields();
+        }
     }
-  }
 
-  public static final class Response extends ExtractAdapter<org.eclipse.jetty.server.Response> {
-    public static final Response GETTER = new Response();
+    public static final class Response extends ExtractAdapter<org.eclipse.jetty.server.Response> {
+        public static final Response GETTER = new Response();
 
-    @Override
-    HttpFields getHttpFields(org.eclipse.jetty.server.Response response) {
-      return response.getHttpFields();
+        @Override
+        HttpFields getHttpFields(org.eclipse.jetty.server.Response response) {
+            return response.getHttpFields();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyCommitResponseInstrumentation.java
index 85a7b630035..f05530d43f7 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyCommitResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyCommitResponseInstrumentation.java
@@ -24,87 +24,86 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JettyCommitResponseInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JettyCommitResponseInstrumentation() {
-    super("jetty");
-  }
+    public JettyCommitResponseInstrumentation() {
+        super("jetty");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.HttpConnection";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.HttpConnection";
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".JettyDecorator",
+            packageName + ".RequestURIDataAdapter",
+            "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+        };
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".JettyDecorator",
-      packageName + ".RequestURIDataAdapter",
-      "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-    };
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("commitResponse")
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, boolean.class))
+                        .or(named("completeResponse").and(takesArguments(0))),
+                JettyCommitResponseInstrumentation.class.getName() + "$CommitResponseAdvice");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("commitResponse")
-            .and(takesArguments(1))
-            .and(takesArgument(0, boolean.class))
-            .or(named("completeResponse").and(takesArguments(0))),
-        JettyCommitResponseInstrumentation.class.getName() + "$CommitResponseAdvice");
-  }
+    static class CommitResponseAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+        static boolean /* skip */ before(@Advice.This HttpConnection connection) {
+            Generator generator = connection.getGenerator();
+            if (generator.isCommitted()) {
+                return false;
+            }
 
-  static class CommitResponseAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-    static boolean /* skip */ before(@Advice.This HttpConnection connection) {
-      Generator generator = connection.getGenerator();
-      if (generator.isCommitted()) {
-        return false;
-      }
+            Request req = connection.getRequest();
 
-      Request req = connection.getRequest();
+            if (req.getAttribute(DD_IGNORE_COMMIT_ATTRIBUTE) != null) {
+                return false;
+            }
 
-      if (req.getAttribute(DD_IGNORE_COMMIT_ATTRIBUTE) != null) {
-        return false;
-      }
+            Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (!(contextObj instanceof Context)) {
+                return false;
+            }
+            Context context = (Context) contextObj;
+            AgentSpan span = spanFromContext(context);
+            if (span == null) {
+                return false;
+            }
+            RequestContext requestContext = span.getRequestContext();
+            if (requestContext == null) {
+                return false;
+            }
 
-      Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (!(contextObj instanceof Context)) {
-        return false;
-      }
-      Context context = (Context) contextObj;
-      AgentSpan span = spanFromContext(context);
-      if (span == null) {
-        return false;
-      }
-      RequestContext requestContext = span.getRequestContext();
-      if (requestContext == null) {
-        return false;
-      }
+            Response resp = connection.getResponse();
 
-      Response resp = connection.getResponse();
+            Flow<Void> flow = DECORATE.callIGCallbackResponseAndHeaders(
+                    span, resp, resp.getStatus(), ExtractAdapter.Response.GETTER);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction brf = requestContext.getBlockResponseFunction();
+                if (brf != null) {
+                    boolean res = brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
+                    if (res) {
+                        requestContext.getTraceSegment().effectivelyBlocked();
+                        return true;
+                    }
+                }
+            }
 
-      Flow<Void> flow =
-          DECORATE.callIGCallbackResponseAndHeaders(
-              span, resp, resp.getStatus(), ExtractAdapter.Response.GETTER);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction brf = requestContext.getBlockResponseFunction();
-        if (brf != null) {
-          boolean res = brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
-          if (res) {
-            requestContext.getTraceSegment().effectivelyBlocked();
-            return true;
-          }
+            return false;
         }
-      }
-
-      return false;
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyDecorator.java
index 14cd00c493d..a0c8249cea5 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyDecorator.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyDecorator.java
@@ -16,113 +16,112 @@
 import org.eclipse.jetty.server.Response;
 
 public class JettyDecorator extends HttpServerDecorator<Request, Request, Response, Request> {
-  public static final CharSequence JETTY_SERVER = UTF8BytesString.create("jetty-server");
-  public static final JettyDecorator DECORATE = new JettyDecorator();
-  public static final CharSequence SERVLET_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-  public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
-  public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
-  public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jetty"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JETTY_SERVER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Request> getter() {
-    return ExtractAdapter.Request.GETTER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Response> responseGetter() {
-    return ExtractAdapter.Response.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return SERVLET_REQUEST;
-  }
-
-  @Override
-  protected String method(final Request request) {
-    return request.getMethod();
-  }
-
-  @Override
-  protected URIDataAdapter url(final Request request) {
-    return new RequestURIDataAdapter(request);
-  }
-
-  @Override
-  protected String peerHostIP(final Request request) {
-    // Avoid Request.getRemoteAddr() since ForwardedRequestCustomizer overrides it with
-    // the value resolved from x-forwarded-for and similar proxy headers. Peer information
-    // must be the actual socket peer.
-    final HttpConnection connection = request.getConnection();
-    if (connection != null) {
-      final EndPoint endPoint = connection.getEndPoint();
-      if (endPoint != null) {
-        final String remoteAddr = endPoint.getRemoteAddr();
-        if (remoteAddr != null) {
-          return remoteAddr;
+    public static final CharSequence JETTY_SERVER = UTF8BytesString.create("jetty-server");
+    public static final JettyDecorator DECORATE = new JettyDecorator();
+    public static final CharSequence SERVLET_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+    public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
+    public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
+    public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jetty"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JETTY_SERVER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Request> getter() {
+        return ExtractAdapter.Request.GETTER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Response> responseGetter() {
+        return ExtractAdapter.Response.GETTER;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return SERVLET_REQUEST;
+    }
+
+    @Override
+    protected String method(final Request request) {
+        return request.getMethod();
+    }
+
+    @Override
+    protected URIDataAdapter url(final Request request) {
+        return new RequestURIDataAdapter(request);
+    }
+
+    @Override
+    protected String peerHostIP(final Request request) {
+        // Avoid Request.getRemoteAddr() since ForwardedRequestCustomizer overrides it with
+        // the value resolved from x-forwarded-for and similar proxy headers. Peer information
+        // must be the actual socket peer.
+        final HttpConnection connection = request.getConnection();
+        if (connection != null) {
+            final EndPoint endPoint = connection.getEndPoint();
+            if (endPoint != null) {
+                final String remoteAddr = endPoint.getRemoteAddr();
+                if (remoteAddr != null) {
+                    return remoteAddr;
+                }
+            }
+        }
+        return request.getRemoteAddr();
+    }
+
+    @Override
+    protected int peerPort(final Request request) {
+        final HttpConnection connection = request.getConnection();
+        if (connection != null) {
+            final EndPoint endPoint = connection.getEndPoint();
+            if (endPoint != null) {
+                return endPoint.getRemotePort();
+            }
         }
-      }
+        return request.getRemotePort();
+    }
+
+    @Override
+    protected int status(final Response response) {
+        return response.getStatus();
     }
-    return request.getRemoteAddr();
-  }
-
-  @Override
-  protected int peerPort(final Request request) {
-    final HttpConnection connection = request.getConnection();
-    if (connection != null) {
-      final EndPoint endPoint = connection.getEndPoint();
-      if (endPoint != null) {
-        return endPoint.getRemotePort();
-      }
+
+    @Override
+    protected boolean isAppSecOnResponseSeparate() {
+        return true;
     }
-    return request.getRemotePort();
-  }
-
-  @Override
-  protected int status(final Response response) {
-    return response.getStatus();
-  }
-
-  @Override
-  protected boolean isAppSecOnResponseSeparate() {
-    return true;
-  }
-
-  @Override
-  protected String getRequestHeader(final Request request, String key) {
-    return request.getHeader(key);
-  }
-
-  public void onResponse(AgentSpan span, HttpConnection channel) {
-    Request request = channel.getRequest();
-    Response response = channel.getResponse();
-    if (Config.get().isServletPrincipalEnabled() && request.getUserPrincipal() != null) {
-      span.setTag(DDTags.USER_NAME, request.getUserPrincipal().getName());
+
+    @Override
+    protected String getRequestHeader(final Request request, String key) {
+        return request.getHeader(key);
     }
-    Object ex = request.getAttribute("javax.servlet.error.exception");
-    if (ex instanceof Throwable) {
-      Throwable throwable = (Throwable) ex;
-      if (throwable instanceof ServletException) {
-        throwable = ((ServletException) throwable).getRootCause();
-      }
-      onError(span, throwable);
+
+    public void onResponse(AgentSpan span, HttpConnection channel) {
+        Request request = channel.getRequest();
+        Response response = channel.getResponse();
+        if (Config.get().isServletPrincipalEnabled() && request.getUserPrincipal() != null) {
+            span.setTag(DDTags.USER_NAME, request.getUserPrincipal().getName());
+        }
+        Object ex = request.getAttribute("javax.servlet.error.exception");
+        if (ex instanceof Throwable) {
+            Throwable throwable = (Throwable) ex;
+            if (throwable instanceof ServletException) {
+                throwable = ((ServletException) throwable).getRootCause();
+            }
+            onError(span, throwable);
+        }
+        super.onResponse(span, response);
     }
-    super.onResponse(span, response);
-  }
 
-  @Override
-  protected BlockResponseFunction createBlockResponseFunction(Request request, Request connection) {
-    return new JettyBlockResponseFunction(request);
-  }
+    @Override
+    protected BlockResponseFunction createBlockResponseFunction(Request request, Request connection) {
+        return new JettyBlockResponseFunction(request);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyGeneratorInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyGeneratorInstrumentation.java
index 3b4d9ee49e7..ba75601e79e 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyGeneratorInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyGeneratorInstrumentation.java
@@ -17,51 +17,51 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JettyGeneratorInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JettyGeneratorInstrumentation() {
-    super("jetty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.http.AbstractGenerator";
-  }
+    public JettyGeneratorInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    // The lifecycle of these objects are aligned, and are recycled by jetty, minimizing leak risk.
-    return singletonMap("org.eclipse.jetty.http.Generator", "org.eclipse.jetty.server.Response");
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.http.AbstractGenerator";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("setResponse").and(takesArgument(0, int.class)),
-        JettyGeneratorInstrumentation.class.getName() + "$SetResponseAdvice");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        // The lifecycle of these objects are aligned, and are recycled by jetty, minimizing leak risk.
+        return singletonMap("org.eclipse.jetty.http.Generator", "org.eclipse.jetty.server.Response");
+    }
 
-  /**
-   * The generator is what writes out the final bytes that are sent back to the requestor. We read
-   * the status code from the response in ResetAdvice, but in some cases the final status code is
-   * only set in the generator directly, not the response. (For example, this happens when an
-   * exception is thrown and jetty must send a 500 status.) We use this instrumentation to ensure
-   * that the response is updated when the generator is. Since the status on the response is reset
-   * when the connection is reset, this minor change in behavior is inconsequential.
-   */
-  public static class SetResponseAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void updateResponse(
-        @Advice.This final AbstractGenerator generator, @Advice.Argument(0) final int status) {
-      Response response =
-          InstrumentationContext.get(Generator.class, Response.class).get(generator);
-      if (response != null) {
-        response.setStatus(status);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("setResponse").and(takesArgument(0, int.class)),
+                JettyGeneratorInstrumentation.class.getName() + "$SetResponseAdvice");
     }
 
-    private void muzzleCheck(HttpConnection connection) {
-      connection.getGenerator();
+    /**
+     * The generator is what writes out the final bytes that are sent back to the requestor. We read
+     * the status code from the response in ResetAdvice, but in some cases the final status code is
+     * only set in the generator directly, not the response. (For example, this happens when an
+     * exception is thrown and jetty must send a 500 status.) We use this instrumentation to ensure
+     * that the response is updated when the generator is. Since the status on the response is reset
+     * when the connection is reset, this minor change in behavior is inconsequential.
+     */
+    public static class SetResponseAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void updateResponse(
+                @Advice.This final AbstractGenerator generator, @Advice.Argument(0) final int status) {
+            Response response =
+                    InstrumentationContext.get(Generator.class, Response.class).get(generator);
+            if (response != null) {
+                response.setStatus(status);
+            }
+        }
+
+        private void muzzleCheck(HttpConnection connection) {
+            connection.getGenerator();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java
index 24cb4ac4f2d..de186cb138b 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java
@@ -43,187 +43,183 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JettyServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
-
-  public JettyServerInstrumentation() {
-    super("jetty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.HttpConnection";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".JettyDecorator",
-      packageName + ".RequestURIDataAdapter",
-      "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-    };
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    // The lifecycle of these objects are aligned, and are recycled by jetty, minimizing leak risk.
-    return singletonMap("org.eclipse.jetty.http.Generator", "org.eclipse.jetty.server.Response");
-  }
-
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new ConnectionHandleRequestVisitorWrapper());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(), JettyServerInstrumentation.class.getName() + "$ConstructorAdvice");
-    transformer.applyAdvices(
-        named("handleRequest").and(takesNoArguments()),
-        JettyServerInstrumentation.class.getName() + "$ContextTrackingAdvice",
-        JettyServerInstrumentation.class.getName() + "$HandleRequestAdvice");
-    transformer.applyAdvice(
-        named("reset").and(takesArgument(0, boolean.class)),
-        JettyServerInstrumentation.class.getName() + "$ResetAdvice");
-  }
-
-  public static class ConnectionHandleRequestVisitorWrapper implements AsmVisitorWrapper {
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
+
+    public JettyServerInstrumentation() {
+        super("jetty");
+    }
 
     @Override
-    public int mergeWriter(int flags) {
-      return flags | ClassWriter.COMPUTE_MAXS;
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.HttpConnection";
     }
 
     @Override
-    public int mergeReader(int flags) {
-      return flags;
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".JettyDecorator",
+            packageName + ".RequestURIDataAdapter",
+            "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+        };
     }
 
     @Override
-    public ClassVisitor wrap(
-        TypeDescription instrumentedType,
-        ClassVisitor classVisitor,
-        Implementation.Context implementationContext,
-        TypePool typePool,
-        FieldList<FieldDescription.InDefinedShape> fields,
-        MethodList<?> methods,
-        int writerFlags,
-        int readerFlags) {
-      if (Config.get().getAppSecActivation() == ProductActivation.FULLY_DISABLED) {
-        return classVisitor;
-      }
-
-      return new ConnectionHandleRequestVisitor(
-          Opcodes.ASM7, classVisitor, "org/eclipse/jetty/server/HttpConnection");
+    public Map<String, String> contextStore() {
+        // The lifecycle of these objects are aligned, and are recycled by jetty, minimizing leak risk.
+        return singletonMap("org.eclipse.jetty.http.Generator", "org.eclipse.jetty.server.Response");
     }
-  }
-
-  /**
-   * HttpConnection's have both a generator and a response instance. The generator is what writes
-   * out the final bytes that are sent back to the requestor. We read the status code from the
-   * response in ResetAdvice, but in some cases the final status code is only set in the generator
-   * directly, not the response. (For example, this happens when an exception is thrown and jetty
-   * must send a 500 status.) We use the JettyGeneratorInstrumentation to ensure that the response
-   * is updated when the generator is. Since the status on the response is reset when the connection
-   * is reset, this minor change in behavior is inconsequential. This advice provides the needed
-   * link between generator -> response to enable this.
-   */
-  public static class ConstructorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void link(
-        @Advice.FieldValue("_generator") final Generator generator,
-        @Advice.FieldValue("_response") final Response response) {
-      InstrumentationContext.get(Generator.class, Response.class).put(generator, response);
+
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new ConnectionHandleRequestVisitorWrapper());
     }
-  }
-
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextTrackingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.This final HttpConnection connection,
-        @Advice.Local("parentScope") ContextScope parentScope) {
-      Request req = connection.getRequest();
-      Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (existingContext instanceof Context) {
-        return; // re-entry: HandleRequestAdvice will attach existing context
-      }
-      Context parentContext = DECORATE.extract(req);
-      req.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
-      parentScope = parentContext.attach();
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), JettyServerInstrumentation.class.getName() + "$ConstructorAdvice");
+        transformer.applyAdvices(
+                named("handleRequest").and(takesNoArguments()),
+                JettyServerInstrumentation.class.getName() + "$ContextTrackingAdvice",
+                JettyServerInstrumentation.class.getName() + "$HandleRequestAdvice");
+        transformer.applyAdvice(
+                named("reset").and(takesArgument(0, boolean.class)),
+                JettyServerInstrumentation.class.getName() + "$ResetAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Local("parentScope") ContextScope parentScope) {
-      if (parentScope != null) {
-        parentScope.close();
-      }
+    public static class ConnectionHandleRequestVisitorWrapper implements AsmVisitorWrapper {
+
+        @Override
+        public int mergeWriter(int flags) {
+            return flags | ClassWriter.COMPUTE_MAXS;
+        }
+
+        @Override
+        public int mergeReader(int flags) {
+            return flags;
+        }
+
+        @Override
+        public ClassVisitor wrap(
+                TypeDescription instrumentedType,
+                ClassVisitor classVisitor,
+                Implementation.Context implementationContext,
+                TypePool typePool,
+                FieldList<FieldDescription.InDefinedShape> fields,
+                MethodList<?> methods,
+                int writerFlags,
+                int readerFlags) {
+            if (Config.get().getAppSecActivation() == ProductActivation.FULLY_DISABLED) {
+                return classVisitor;
+            }
+
+            return new ConnectionHandleRequestVisitor(
+                    Opcodes.ASM7, classVisitor, "org/eclipse/jetty/server/HttpConnection");
+        }
     }
-  }
-
-  /**
-   * The handleRequest call denotes the earliest point at which the incoming request is fully
-   * parsed. This allows us to read the headers from the request to extract propagation info.
-   */
-  public static class HandleRequestAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.This final HttpConnection connection, @Advice.Local("agentSpan") AgentSpan span) {
-      Request req = connection.getRequest();
-
-      Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (existingContext instanceof Context) {
-        // Request already gone through initial processing, so just activate the context.
-        return ((Context) existingContext).attach();
-      }
-
-      final Object parentContextObj = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
-      final Context parentContext =
-          (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
-      final Context context = DECORATE.startSpan(req, parentContext);
-      final ContextScope scope = context.attach();
-      span = spanFromContext(context);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, req, req, parentContext);
-
-      req.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
-      req.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
-      req.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
-      return scope;
+
+    /**
+     * HttpConnection's have both a generator and a response instance. The generator is what writes
+     * out the final bytes that are sent back to the requestor. We read the status code from the
+     * response in ResetAdvice, but in some cases the final status code is only set in the generator
+     * directly, not the response. (For example, this happens when an exception is thrown and jetty
+     * must send a 500 status.) We use the JettyGeneratorInstrumentation to ensure that the response
+     * is updated when the generator is. Since the status on the response is reset when the connection
+     * is reset, this minor change in behavior is inconsequential. This advice provides the needed
+     * link between generator -> response to enable this.
+     */
+    public static class ConstructorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void link(
+                @Advice.FieldValue("_generator") final Generator generator,
+                @Advice.FieldValue("_response") final Response response) {
+            InstrumentationContext.get(Generator.class, Response.class).put(generator, response);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      // Span is finished when the connection is reset, so we only need to close the scope here.
-      scope.close();
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextTrackingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.This final HttpConnection connection, @Advice.Local("parentScope") ContextScope parentScope) {
+            Request req = connection.getRequest();
+            Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (existingContext instanceof Context) {
+                return; // re-entry: HandleRequestAdvice will attach existing context
+            }
+            Context parentContext = DECORATE.extract(req);
+            req.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
+            parentScope = parentContext.attach();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Local("parentScope") ContextScope parentScope) {
+            if (parentScope != null) {
+                parentScope.close();
+            }
+        }
     }
-  }
-
-  /**
-   * Jetty ensures that connections are reset immediately after the response is sent. This provides
-   * a reliable point to finish the server span at the last possible moment.
-   */
-  public static class ResetAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void stopSpan(@Advice.This final HttpConnection channel) {
-      Request req = channel.getRequest();
-      Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (contextObj instanceof Context) {
-        final Context context = (Context) contextObj;
-        final AgentSpan span = spanFromContext(context);
-        if (span != null) {
-          DECORATE.onResponse(span, channel);
-          DECORATE.beforeFinish(context);
-          span.finish();
+
+    /**
+     * The handleRequest call denotes the earliest point at which the incoming request is fully
+     * parsed. This allows us to read the headers from the request to extract propagation info.
+     */
+    public static class HandleRequestAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.This final HttpConnection connection, @Advice.Local("agentSpan") AgentSpan span) {
+            Request req = connection.getRequest();
+
+            Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (existingContext instanceof Context) {
+                // Request already gone through initial processing, so just activate the context.
+                return ((Context) existingContext).attach();
+            }
+
+            final Object parentContextObj = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
+            final Context parentContext =
+                    (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
+            final Context context = DECORATE.startSpan(req, parentContext);
+            final ContextScope scope = context.attach();
+            span = spanFromContext(context);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, req, req, parentContext);
+
+            req.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
+            req.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+            req.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+            return scope;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            // Span is finished when the connection is reset, so we only need to close the scope here.
+            scope.close();
+        }
+    }
+
+    /**
+     * Jetty ensures that connections are reset immediately after the response is sent. This provides
+     * a reliable point to finish the server span at the last possible moment.
+     */
+    public static class ResetAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void stopSpan(@Advice.This final HttpConnection channel) {
+            Request req = channel.getRequest();
+            Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (contextObj instanceof Context) {
+                final Context context = (Context) contextObj;
+                final AgentSpan span = spanFromContext(context);
+                if (span != null) {
+                    DECORATE.onResponse(span, channel);
+                    DECORATE.beforeFinish(context);
+                    span.finish();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java
index a79b766affd..88972ea627f 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java
@@ -31,107 +31,105 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RequestInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public RequestInstrumentation() {
-    super("jetty");
-  }
+    public RequestInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.Request";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.Request";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("setContextPath").and(takesArgument(0, String.class)),
-        RequestInstrumentation.class.getName() + "$SetContextPathAdvice");
-    transformer.applyAdvice(
-        named("setServletPath").and(takesArgument(0, String.class)),
-        RequestInstrumentation.class.getName() + "$SetServletPathAdvice");
-    transformer.applyAdvice(
-        named("setRequestedSessionId").and(takesArgument(0, String.class)),
-        RequestInstrumentation.class.getName() + "$SetRequestedSessionId");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("setContextPath").and(takesArgument(0, String.class)),
+                RequestInstrumentation.class.getName() + "$SetContextPathAdvice");
+        transformer.applyAdvice(
+                named("setServletPath").and(takesArgument(0, String.class)),
+                RequestInstrumentation.class.getName() + "$SetServletPathAdvice");
+        transformer.applyAdvice(
+                named("setRequestedSessionId").and(takesArgument(0, String.class)),
+                RequestInstrumentation.class.getName() + "$SetRequestedSessionId");
+    }
 
-  /**
-   * Because we are processing the initial request before the contextPath is set, we must update it
-   * when it is actually set.
-   */
-  public static class SetContextPathAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void updateContextPath(
-        @Advice.This final Request req, @Advice.Argument(0) final String contextPath) {
-      if (contextPath != null) {
-        Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-        // Don't want to update while being dispatched to new servlet
-        if (contextObj instanceof Context && req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) == null) {
-          Context context = (Context) contextObj;
-          AgentSpan span = spanFromContext(context);
-          if (span != null) {
-            span.setTag(SERVLET_CONTEXT, contextPath);
-            req.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, contextPath);
-          }
+    /**
+     * Because we are processing the initial request before the contextPath is set, we must update it
+     * when it is actually set.
+     */
+    public static class SetContextPathAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void updateContextPath(
+                @Advice.This final Request req, @Advice.Argument(0) final String contextPath) {
+            if (contextPath != null) {
+                Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+                // Don't want to update while being dispatched to new servlet
+                if (contextObj instanceof Context && req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) == null) {
+                    Context context = (Context) contextObj;
+                    AgentSpan span = spanFromContext(context);
+                    if (span != null) {
+                        span.setTag(SERVLET_CONTEXT, contextPath);
+                        req.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, contextPath);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  /**
-   * Because we are processing the initial request before the servletPath is set, we must update it
-   * when it is actually set.
-   */
-  public static class SetServletPathAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void updateServletPath(
-        @Advice.This final Request req, @Advice.Argument(0) final String servletPath) {
-      if (servletPath != null && !servletPath.isEmpty()) { // bypass cleanup
-        Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-        // Don't want to update while being dispatched to new servlet
-        if (contextObj instanceof Context && req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) == null) {
-          Context context = (Context) contextObj;
-          AgentSpan span = spanFromContext(context);
-          if (span != null) {
-            span.setTag(SERVLET_PATH, servletPath);
-            req.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, servletPath);
-          }
+    /**
+     * Because we are processing the initial request before the servletPath is set, we must update it
+     * when it is actually set.
+     */
+    public static class SetServletPathAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void updateServletPath(
+                @Advice.This final Request req, @Advice.Argument(0) final String servletPath) {
+            if (servletPath != null && !servletPath.isEmpty()) { // bypass cleanup
+                Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+                // Don't want to update while being dispatched to new servlet
+                if (contextObj instanceof Context && req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) == null) {
+                    Context context = (Context) contextObj;
+                    AgentSpan span = spanFromContext(context);
+                    if (span != null) {
+                        span.setTag(SERVLET_PATH, servletPath);
+                        req.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, servletPath);
+                    }
+                }
+            }
         }
-      }
-    }
 
-    private void muzzleCheck(HttpConnection connection) {
-      connection.getGenerator();
+        private void muzzleCheck(HttpConnection connection) {
+            connection.getGenerator();
+        }
     }
-  }
 
-  /**
-   * Because we are processing the initial request before the requestedSessionId is set, we must
-   * update it when it is actually set.
-   */
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class SetRequestedSessionId {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void updateContextPath(
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Argument(0) final String requestedSessionId) {
-      if (requestedSessionId != null && reqCtx != null) {
-        final CallbackProvider cbp =
-            AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-        if (cbp == null) {
-          return;
-        }
-        final BiFunction<RequestContext, String, Flow<Void>> addrCallback =
-            cbp.getCallback(EVENTS.requestSession());
-        if (addrCallback == null) {
-          return;
-        }
-        final Flow<Void> flow = addrCallback.apply(reqCtx, requestedSessionId);
-        Flow.Action action = flow.getAction();
-        if (action instanceof Flow.Action.RequestBlockingAction) {
-          throw new BlockingException("Blocked request (for sessionId)");
+    /**
+     * Because we are processing the initial request before the requestedSessionId is set, we must
+     * update it when it is actually set.
+     */
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class SetRequestedSessionId {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void updateContextPath(
+                @ActiveRequestContext RequestContext reqCtx, @Advice.Argument(0) final String requestedSessionId) {
+            if (requestedSessionId != null && reqCtx != null) {
+                final CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+                if (cbp == null) {
+                    return;
+                }
+                final BiFunction<RequestContext, String, Flow<Void>> addrCallback =
+                        cbp.getCallback(EVENTS.requestSession());
+                if (addrCallback == null) {
+                    return;
+                }
+                final Flow<Void> flow = addrCallback.apply(reqCtx, requestedSessionId);
+                Flow.Action action = flow.getAction();
+                if (action instanceof Flow.Action.RequestBlockingAction) {
+                    throw new BlockingException("Blocked request (for sessionId)");
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestURIDataAdapter.java
index 54f178fa790..ff803a2c54a 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestURIDataAdapter.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestURIDataAdapter.java
@@ -5,39 +5,39 @@
 
 final class RequestURIDataAdapter extends URIRawDataAdapter {
 
-  private final HttpServletRequest request;
-
-  RequestURIDataAdapter(HttpServletRequest request) {
-    this.request = request;
-  }
-
-  @Override
-  public String scheme() {
-    return request.getScheme();
-  }
-
-  @Override
-  public String host() {
-    return request.getServerName();
-  }
-
-  @Override
-  public int port() {
-    return request.getServerPort();
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return request.getRequestURI();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return request.getQueryString();
-  }
+    private final HttpServletRequest request;
+
+    RequestURIDataAdapter(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    @Override
+    public String scheme() {
+        return request.getScheme();
+    }
+
+    @Override
+    public String host() {
+        return request.getServerName();
+    }
+
+    @Override
+    public int port() {
+        return request.getServerPort();
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return request.getRequestURI();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return request.getQueryString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ServerHandleInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ServerHandleInstrumentation.java
index b0a96a784cc..c2d3fb367b0 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ServerHandleInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ServerHandleInstrumentation.java
@@ -19,97 +19,97 @@
 
 @AutoService(InstrumenterModule.class)
 public class ServerHandleInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ServerHandleInstrumentation() {
-    super("jetty");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ServerHandleInstrumentation() {
+        super("jetty");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.Server";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.Server";
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".JettyDecorator",
+            packageName + ".RequestURIDataAdapter",
+            "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+        };
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".JettyDecorator",
-      packageName + ".RequestURIDataAdapter",
-      "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-    };
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("handle")
+                        .or(named("handleAsync"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("org.eclipse.jetty.server.HttpConnection"))),
+                ServerHandleInstrumentation.class.getName() + "$HandleAdvice");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("handle")
-            .or(named("handleAsync"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("org.eclipse.jetty.server.HttpConnection"))),
-        ServerHandleInstrumentation.class.getName() + "$HandleAdvice");
-  }
+    static class HandleAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static ContextScope onEnter(
+                @Advice.Argument(0) HttpConnection connection,
+                @Advice.Local("request") Request req,
+                @Advice.Local("agentSpan") AgentSpan span) {
+            req = connection.getRequest();
 
-  static class HandleAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static ContextScope onEnter(
-        @Advice.Argument(0) HttpConnection connection,
-        @Advice.Local("request") Request req,
-        @Advice.Local("agentSpan") AgentSpan span) {
-      req = connection.getRequest();
+            // First check if there's an existing context in the request (from main server span)
+            Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
 
-      // First check if there's an existing context in the request (from main server span)
-      Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            // see comments in HandleRequestAdvice for jetty-9
+            Object dispatchSpan;
+            synchronized (req) {
+                dispatchSpan = req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
+            }
+            if (dispatchSpan instanceof AgentSpan) {
+                span = (AgentSpan) dispatchSpan;
 
-      // see comments in HandleRequestAdvice for jetty-9
-      Object dispatchSpan;
-      synchronized (req) {
-        dispatchSpan = req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
-      }
-      if (dispatchSpan instanceof AgentSpan) {
-        span = (AgentSpan) dispatchSpan;
+                // If we have an existing context, create a new context with the dispatch span
+                // Otherwise just attach the dispatch span
+                if (existingContext instanceof Context) {
+                    Context contextWithDispatchSpan = ((Context) existingContext).with(span);
+                    return contextWithDispatchSpan.attach();
+                } else {
+                    return span.attach();
+                }
+            }
 
-        // If we have an existing context, create a new context with the dispatch span
-        // Otherwise just attach the dispatch span
-        if (existingContext instanceof Context) {
-          Context contextWithDispatchSpan = ((Context) existingContext).with(span);
-          return contextWithDispatchSpan.attach();
-        } else {
-          return span.attach();
+            return null;
         }
-      }
-
-      return null;
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Local("request") Request req,
-        @Advice.Local("agentSpan") AgentSpan span,
-        @Advice.Thrown Throwable t) {
-      if (scope == null) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Local("request") Request req,
+                @Advice.Local("agentSpan") AgentSpan span,
+                @Advice.Thrown Throwable t) {
+            if (scope == null) {
+                return;
+            }
 
-      if (t != null) {
-        DECORATE.onError(span, t);
-      }
-      if (!req.getAsyncContinuation().isAsyncStarted()) {
-        // finish will be handled by the async listener
-        // Use the full context from the scope for beforeFinish
-        DECORATE.beforeFinish(scope.context());
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
+            if (t != null) {
+                DECORATE.onError(span, t);
+            }
+            if (!req.getAsyncContinuation().isAsyncStarted()) {
+                // finish will be handled by the async listener
+                // Use the full context from the scope for beforeFinish
+                DECORATE.beforeFinish(scope.context());
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
 
-      synchronized (req) {
-        req.removeAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
-      }
+            synchronized (req) {
+                req.removeAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ExtractAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ExtractAdapter.java
index 96ad73d8bc4..78b28c124f8 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ExtractAdapter.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ExtractAdapter.java
@@ -4,37 +4,37 @@
 import org.eclipse.jetty.http.HttpFields;
 
 public abstract class ExtractAdapter<T> implements AgentPropagation.ContextVisitor<T> {
-  abstract HttpFields getHttpFields(T t);
+    abstract HttpFields getHttpFields(T t);
 
-  @Override
-  public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-    HttpFields headers = getHttpFields(carrier);
-    if (headers == null) {
-      return;
-    }
-    for (int i = 0; i < headers.size(); ++i) {
-      HttpFields.Field field = headers.getField(i);
-      if (field != null && !classifier.accept(field.getName(), field.getValue())) {
-        return;
-      }
+    @Override
+    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+        HttpFields headers = getHttpFields(carrier);
+        if (headers == null) {
+            return;
+        }
+        for (int i = 0; i < headers.size(); ++i) {
+            HttpFields.Field field = headers.getField(i);
+            if (field != null && !classifier.accept(field.getName(), field.getValue())) {
+                return;
+            }
+        }
     }
-  }
 
-  public static final class Request extends ExtractAdapter<org.eclipse.jetty.server.Request> {
-    public static final Request GETTER = new Request();
+    public static final class Request extends ExtractAdapter<org.eclipse.jetty.server.Request> {
+        public static final Request GETTER = new Request();
 
-    @Override
-    HttpFields getHttpFields(org.eclipse.jetty.server.Request request) {
-      return request.getConnection().getRequestFields();
+        @Override
+        HttpFields getHttpFields(org.eclipse.jetty.server.Request request) {
+            return request.getConnection().getRequestFields();
+        }
     }
-  }
 
-  public static final class Response extends ExtractAdapter<org.eclipse.jetty.server.Response> {
-    public static final Response GETTER = new Response();
+    public static final class Response extends ExtractAdapter<org.eclipse.jetty.server.Response> {
+        public static final Response GETTER = new Response();
 
-    @Override
-    HttpFields getHttpFields(org.eclipse.jetty.server.Response response) {
-      return response.getHttpFields();
+        @Override
+        HttpFields getHttpFields(org.eclipse.jetty.server.Response response) {
+            return response.getHttpFields();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyCommitResponseInstrumentation.java
index fbe8fd6cf6f..85507a4ecc6 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyCommitResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyCommitResponseInstrumentation.java
@@ -25,93 +25,92 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JettyCommitResponseInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JettyCommitResponseInstrumentation() {
-    super("jetty");
-  }
+    public JettyCommitResponseInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.AbstractHttpConnection";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.AbstractHttpConnection";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".JettyDecorator",
-      packageName + ".RequestURIDataAdapter",
-      "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".JettyDecorator",
+            packageName + ".RequestURIDataAdapter",
+            "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+        };
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      new Reference.Builder("org.eclipse.jetty.server.AbstractHttpConnection")
-          .withMethod(new String[0], Reference.EXPECTS_NON_STATIC, "commitResponse", "V", "Z")
-          .withMethod(new String[0], Reference.EXPECTS_NON_STATIC, "completeResponse", "V")
-          .build(),
-    };
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            new Reference.Builder("org.eclipse.jetty.server.AbstractHttpConnection")
+                    .withMethod(new String[0], Reference.EXPECTS_NON_STATIC, "commitResponse", "V", "Z")
+                    .withMethod(new String[0], Reference.EXPECTS_NON_STATIC, "completeResponse", "V")
+                    .build(),
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("commitResponse")
-            .and(takesArguments(1))
-            .and(takesArgument(0, boolean.class))
-            .or(named("completeResponse").and(takesArguments(0))),
-        JettyCommitResponseInstrumentation.class.getName() + "$CommitResponseAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("commitResponse")
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, boolean.class))
+                        .or(named("completeResponse").and(takesArguments(0))),
+                JettyCommitResponseInstrumentation.class.getName() + "$CommitResponseAdvice");
+    }
 
-  static class CommitResponseAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-    static boolean /* skip */ before(@Advice.This AbstractHttpConnection connection) {
-      Generator generator = connection.getGenerator();
-      if (generator.isCommitted()) {
-        return false;
-      }
+    static class CommitResponseAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+        static boolean /* skip */ before(@Advice.This AbstractHttpConnection connection) {
+            Generator generator = connection.getGenerator();
+            if (generator.isCommitted()) {
+                return false;
+            }
 
-      Request req = connection.getRequest();
+            Request req = connection.getRequest();
 
-      if (req.getAttribute(DD_IGNORE_COMMIT_ATTRIBUTE) != null) {
-        return false;
-      }
+            if (req.getAttribute(DD_IGNORE_COMMIT_ATTRIBUTE) != null) {
+                return false;
+            }
 
-      Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (!(contextObj instanceof Context)) {
-        return false;
-      }
-      Context context = (Context) contextObj;
-      AgentSpan span = spanFromContext(context);
-      RequestContext requestContext;
-      if (span == null || (requestContext = span.getRequestContext()) == null) {
-        return false;
-      }
+            Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (!(contextObj instanceof Context)) {
+                return false;
+            }
+            Context context = (Context) contextObj;
+            AgentSpan span = spanFromContext(context);
+            RequestContext requestContext;
+            if (span == null || (requestContext = span.getRequestContext()) == null) {
+                return false;
+            }
 
-      Response resp = connection.getResponse();
-      if (resp.getStatus() == 100) {
-        return false;
-      }
+            Response resp = connection.getResponse();
+            if (resp.getStatus() == 100) {
+                return false;
+            }
 
-      Flow<Void> flow =
-          DECORATE.callIGCallbackResponseAndHeaders(
-              span, resp, resp.getStatus(), ExtractAdapter.Response.GETTER);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction brf = requestContext.getBlockResponseFunction();
-        if (brf != null) {
-          return brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
-        }
-      }
+            Flow<Void> flow = DECORATE.callIGCallbackResponseAndHeaders(
+                    span, resp, resp.getStatus(), ExtractAdapter.Response.GETTER);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction brf = requestContext.getBlockResponseFunction();
+                if (brf != null) {
+                    return brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
+                }
+            }
 
-      return false;
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyDecorator.java
index 26817ff246e..f3ff30dcb97 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyDecorator.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyDecorator.java
@@ -16,113 +16,112 @@
 import org.eclipse.jetty.server.Response;
 
 public class JettyDecorator extends HttpServerDecorator<Request, Request, Response, Request> {
-  public static final CharSequence JETTY_SERVER = UTF8BytesString.create("jetty-server");
-  public static final JettyDecorator DECORATE = new JettyDecorator();
-  public static final CharSequence SERVLET_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-  public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
-  public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
-  public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jetty"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JETTY_SERVER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Request> getter() {
-    return ExtractAdapter.Request.GETTER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Response> responseGetter() {
-    return ExtractAdapter.Response.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return SERVLET_REQUEST;
-  }
-
-  @Override
-  protected String method(final Request request) {
-    return request.getMethod();
-  }
-
-  @Override
-  protected URIDataAdapter url(final Request request) {
-    return new RequestURIDataAdapter(request);
-  }
-
-  @Override
-  protected String peerHostIP(final Request request) {
-    // Avoid Request.getRemoteAddr() since ForwardedRequestCustomizer overrides it with
-    // the value resolved from x-forwarded-for and similar proxy headers. Peer information
-    // must be the actual socket peer.
-    final AbstractHttpConnection connection = request.getConnection();
-    if (connection != null) {
-      final EndPoint endPoint = connection.getEndPoint();
-      if (endPoint != null) {
-        final String remoteAddr = endPoint.getRemoteAddr();
-        if (remoteAddr != null) {
-          return remoteAddr;
+    public static final CharSequence JETTY_SERVER = UTF8BytesString.create("jetty-server");
+    public static final JettyDecorator DECORATE = new JettyDecorator();
+    public static final CharSequence SERVLET_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+    public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
+    public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
+    public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jetty"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JETTY_SERVER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Request> getter() {
+        return ExtractAdapter.Request.GETTER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Response> responseGetter() {
+        return ExtractAdapter.Response.GETTER;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return SERVLET_REQUEST;
+    }
+
+    @Override
+    protected String method(final Request request) {
+        return request.getMethod();
+    }
+
+    @Override
+    protected URIDataAdapter url(final Request request) {
+        return new RequestURIDataAdapter(request);
+    }
+
+    @Override
+    protected String peerHostIP(final Request request) {
+        // Avoid Request.getRemoteAddr() since ForwardedRequestCustomizer overrides it with
+        // the value resolved from x-forwarded-for and similar proxy headers. Peer information
+        // must be the actual socket peer.
+        final AbstractHttpConnection connection = request.getConnection();
+        if (connection != null) {
+            final EndPoint endPoint = connection.getEndPoint();
+            if (endPoint != null) {
+                final String remoteAddr = endPoint.getRemoteAddr();
+                if (remoteAddr != null) {
+                    return remoteAddr;
+                }
+            }
+        }
+        return request.getRemoteAddr();
+    }
+
+    @Override
+    protected int peerPort(final Request request) {
+        final AbstractHttpConnection connection = request.getConnection();
+        if (connection != null) {
+            final EndPoint endPoint = connection.getEndPoint();
+            if (endPoint != null) {
+                return endPoint.getRemotePort();
+            }
         }
-      }
+        return request.getRemotePort();
+    }
+
+    @Override
+    protected int status(final Response response) {
+        return response.getStatus();
     }
-    return request.getRemoteAddr();
-  }
-
-  @Override
-  protected int peerPort(final Request request) {
-    final AbstractHttpConnection connection = request.getConnection();
-    if (connection != null) {
-      final EndPoint endPoint = connection.getEndPoint();
-      if (endPoint != null) {
-        return endPoint.getRemotePort();
-      }
+
+    @Override
+    protected boolean isAppSecOnResponseSeparate() {
+        return true;
     }
-    return request.getRemotePort();
-  }
-
-  @Override
-  protected int status(final Response response) {
-    return response.getStatus();
-  }
-
-  @Override
-  protected boolean isAppSecOnResponseSeparate() {
-    return true;
-  }
-
-  @Override
-  protected String getRequestHeader(final Request request, String key) {
-    return request.getHeader(key);
-  }
-
-  public void onResponse(AgentSpan span, AbstractHttpConnection connection) {
-    Request request = connection.getRequest();
-    Response response = connection.getResponse();
-    if (Config.get().isServletPrincipalEnabled() && request.getUserPrincipal() != null) {
-      span.setTag(DDTags.USER_NAME, request.getUserPrincipal().getName());
+
+    @Override
+    protected String getRequestHeader(final Request request, String key) {
+        return request.getHeader(key);
     }
-    Object ex = request.getAttribute("javax.servlet.error.exception");
-    if (ex instanceof Throwable) {
-      Throwable throwable = (Throwable) ex;
-      if (throwable instanceof ServletException) {
-        throwable = ((ServletException) throwable).getRootCause();
-      }
-      onError(span, throwable);
+
+    public void onResponse(AgentSpan span, AbstractHttpConnection connection) {
+        Request request = connection.getRequest();
+        Response response = connection.getResponse();
+        if (Config.get().isServletPrincipalEnabled() && request.getUserPrincipal() != null) {
+            span.setTag(DDTags.USER_NAME, request.getUserPrincipal().getName());
+        }
+        Object ex = request.getAttribute("javax.servlet.error.exception");
+        if (ex instanceof Throwable) {
+            Throwable throwable = (Throwable) ex;
+            if (throwable instanceof ServletException) {
+                throwable = ((ServletException) throwable).getRootCause();
+            }
+            onError(span, throwable);
+        }
+        super.onResponse(span, response);
     }
-    super.onResponse(span, response);
-  }
 
-  @Override
-  protected BlockResponseFunction createBlockResponseFunction(Request request, Request connection) {
-    return new JettyBlockResponseFunction(request);
-  }
+    @Override
+    protected BlockResponseFunction createBlockResponseFunction(Request request, Request connection) {
+        return new JettyBlockResponseFunction(request);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyGeneratorInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyGeneratorInstrumentation.java
index 63214189b67..c3fafac5647 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyGeneratorInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyGeneratorInstrumentation.java
@@ -17,51 +17,51 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JettyGeneratorInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JettyGeneratorInstrumentation() {
-    super("jetty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.http.AbstractGenerator";
-  }
+    public JettyGeneratorInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    // The lifecycle of these objects are aligned, and are recycled by jetty, minimizing leak risk.
-    return singletonMap("org.eclipse.jetty.http.Generator", "org.eclipse.jetty.server.Response");
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.http.AbstractGenerator";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("setResponse").and(takesArgument(0, int.class)),
-        JettyGeneratorInstrumentation.class.getName() + "$SetResponseAdvice");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        // The lifecycle of these objects are aligned, and are recycled by jetty, minimizing leak risk.
+        return singletonMap("org.eclipse.jetty.http.Generator", "org.eclipse.jetty.server.Response");
+    }
 
-  /**
-   * The generator is what writes out the final bytes that are sent back to the requestor. We read
-   * the status code from the response in ResetAdvice, but in some cases the final status code is
-   * only set in the generator directly, not the response. (For example, this happens when an
-   * exception is thrown and jetty must send a 500 status.) We use this instrumentation to ensure
-   * that the response is updated when the generator is. Since the status on the response is reset
-   * when the connection is reset, this minor change in behavior is inconsequential.
-   */
-  public static class SetResponseAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void updateResponse(
-        @Advice.This final AbstractGenerator generator, @Advice.Argument(0) final int status) {
-      Response response =
-          InstrumentationContext.get(Generator.class, Response.class).get(generator);
-      if (response != null) {
-        response.setStatus(status);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("setResponse").and(takesArgument(0, int.class)),
+                JettyGeneratorInstrumentation.class.getName() + "$SetResponseAdvice");
     }
 
-    private void muzzleCheck(AbstractHttpConnection connection) {
-      connection.getGenerator();
+    /**
+     * The generator is what writes out the final bytes that are sent back to the requestor. We read
+     * the status code from the response in ResetAdvice, but in some cases the final status code is
+     * only set in the generator directly, not the response. (For example, this happens when an
+     * exception is thrown and jetty must send a 500 status.) We use this instrumentation to ensure
+     * that the response is updated when the generator is. Since the status on the response is reset
+     * when the connection is reset, this minor change in behavior is inconsequential.
+     */
+    public static class SetResponseAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void updateResponse(
+                @Advice.This final AbstractGenerator generator, @Advice.Argument(0) final int status) {
+            Response response =
+                    InstrumentationContext.get(Generator.class, Response.class).get(generator);
+            if (response != null) {
+                response.setStatus(status);
+            }
+        }
+
+        private void muzzleCheck(AbstractHttpConnection connection) {
+            connection.getGenerator();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java
index bba94900b2e..e1d089bf6c9 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java
@@ -43,195 +43,190 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JettyServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
-
-  public JettyServerInstrumentation() {
-    super("jetty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.AbstractHttpConnection";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".JettyDecorator",
-      packageName + ".RequestURIDataAdapter",
-      "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-    };
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    // The lifecycle of these objects are aligned, and are recycled by jetty, minimizing leak risk.
-    return singletonMap("org.eclipse.jetty.http.Generator", "org.eclipse.jetty.server.Response");
-  }
-
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new ConnectionHandleRequestVisitorWrapper());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(), JettyServerInstrumentation.class.getName() + "$ConstructorAdvice");
-    transformer.applyAdvices(
-        named("handleRequest").and(takesNoArguments()),
-        JettyServerInstrumentation.class.getName() + "$ContextTrackingAdvice",
-        JettyServerInstrumentation.class.getName() + "$HandleRequestAdvice");
-    transformer.applyAdvice(
-        named("reset").and(takesNoArguments()),
-        JettyServerInstrumentation.class.getName() + "$ResetAdvice");
-  }
-
-  public static class ConnectionHandleRequestVisitorWrapper implements AsmVisitorWrapper {
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
+
+    public JettyServerInstrumentation() {
+        super("jetty");
+    }
 
     @Override
-    public int mergeWriter(int flags) {
-      return flags | ClassWriter.COMPUTE_MAXS;
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.AbstractHttpConnection";
     }
 
     @Override
-    public int mergeReader(int flags) {
-      return flags;
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".JettyDecorator",
+            packageName + ".RequestURIDataAdapter",
+            "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+        };
     }
 
     @Override
-    public ClassVisitor wrap(
-        TypeDescription instrumentedType,
-        ClassVisitor classVisitor,
-        Implementation.Context implementationContext,
-        TypePool typePool,
-        FieldList<FieldDescription.InDefinedShape> fields,
-        MethodList<?> methods,
-        int writerFlags,
-        int readerFlags) {
-      if (Config.get().getAppSecActivation() == ProductActivation.FULLY_DISABLED) {
-        return classVisitor;
-      }
-
-      return new ConnectionHandleRequestVisitor(
-          Opcodes.ASM7, classVisitor, "org/eclipse/jetty/server/AbstractHttpConnection");
+    public Map<String, String> contextStore() {
+        // The lifecycle of these objects are aligned, and are recycled by jetty, minimizing leak risk.
+        return singletonMap("org.eclipse.jetty.http.Generator", "org.eclipse.jetty.server.Response");
     }
-  }
-
-  /**
-   * HttpConnection's have both a generator and a response instance. The generator is what writes
-   * out the final bytes that are sent back to the requestor. We read the status code from the
-   * response in ResetAdvice, but in some cases the final status code is only set in the generator
-   * directly, not the response. (For example, this happens when an exception is thrown and jetty
-   * must send a 500 status.) We use the JettyGeneratorInstrumentation to ensure that the response
-   * is updated when the generator is. Since the status on the response is reset when the connection
-   * is reset, this minor change in behavior is inconsequential. This advice provides the needed
-   * link between generator -> response to enable this.
-   */
-  public static class ConstructorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void link(
-        @Advice.FieldValue("_generator") final Generator generator,
-        @Advice.FieldValue("_response") final Response response) {
-      InstrumentationContext.get(Generator.class, Response.class).put(generator, response);
+
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new ConnectionHandleRequestVisitorWrapper());
     }
-  }
-
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextTrackingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.This final AbstractHttpConnection connection,
-        @Advice.Local("parentScope") ContextScope parentScope) {
-      Request req = connection.getRequest();
-      Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (existingContext instanceof Context) {
-        return; // re-entry: HandleRequestAdvice will attach existing context
-      }
-      Context parentContext = DECORATE.extract(req);
-      req.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
-      parentScope = parentContext.attach();
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), JettyServerInstrumentation.class.getName() + "$ConstructorAdvice");
+        transformer.applyAdvices(
+                named("handleRequest").and(takesNoArguments()),
+                JettyServerInstrumentation.class.getName() + "$ContextTrackingAdvice",
+                JettyServerInstrumentation.class.getName() + "$HandleRequestAdvice");
+        transformer.applyAdvice(
+                named("reset").and(takesNoArguments()), JettyServerInstrumentation.class.getName() + "$ResetAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Local("parentScope") ContextScope parentScope) {
-      if (parentScope != null) {
-        parentScope.close();
-      }
+    public static class ConnectionHandleRequestVisitorWrapper implements AsmVisitorWrapper {
+
+        @Override
+        public int mergeWriter(int flags) {
+            return flags | ClassWriter.COMPUTE_MAXS;
+        }
+
+        @Override
+        public int mergeReader(int flags) {
+            return flags;
+        }
+
+        @Override
+        public ClassVisitor wrap(
+                TypeDescription instrumentedType,
+                ClassVisitor classVisitor,
+                Implementation.Context implementationContext,
+                TypePool typePool,
+                FieldList<FieldDescription.InDefinedShape> fields,
+                MethodList<?> methods,
+                int writerFlags,
+                int readerFlags) {
+            if (Config.get().getAppSecActivation() == ProductActivation.FULLY_DISABLED) {
+                return classVisitor;
+            }
+
+            return new ConnectionHandleRequestVisitor(
+                    Opcodes.ASM7, classVisitor, "org/eclipse/jetty/server/AbstractHttpConnection");
+        }
     }
-  }
-
-  /**
-   * The handleRequest call denotes the earliest point at which the incoming request is fully
-   * parsed. This allows us to read the headers from the request to extract propagation info.
-   */
-  public static class HandleRequestAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.This final AbstractHttpConnection connection,
-        @Advice.Local("newSpan") AgentSpan span) {
-      Request req = connection.getRequest();
-
-      Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (existingContext instanceof Context) {
-        // Request already gone through initial processing, so just activate the context.
-        return ((Context) existingContext).attach();
-      }
-
-      final Object parentContextObj = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
-      final Context parentContext =
-          (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
-      final Context context = DECORATE.startSpan(req, parentContext);
-      final ContextScope scope = context.attach();
-      span = spanFromContext(context);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, req, req, parentContext);
-
-      req.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
-      req.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
-      req.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
-      return scope;
+
+    /**
+     * HttpConnection's have both a generator and a response instance. The generator is what writes
+     * out the final bytes that are sent back to the requestor. We read the status code from the
+     * response in ResetAdvice, but in some cases the final status code is only set in the generator
+     * directly, not the response. (For example, this happens when an exception is thrown and jetty
+     * must send a 500 status.) We use the JettyGeneratorInstrumentation to ensure that the response
+     * is updated when the generator is. Since the status on the response is reset when the connection
+     * is reset, this minor change in behavior is inconsequential. This advice provides the needed
+     * link between generator -> response to enable this.
+     */
+    public static class ConstructorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void link(
+                @Advice.FieldValue("_generator") final Generator generator,
+                @Advice.FieldValue("_response") final Response response) {
+            InstrumentationContext.get(Generator.class, Response.class).put(generator, response);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      // Span is finished when the connection is reset, so we only need to close the scope here.
-      scope.close();
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextTrackingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.This final AbstractHttpConnection connection,
+                @Advice.Local("parentScope") ContextScope parentScope) {
+            Request req = connection.getRequest();
+            Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (existingContext instanceof Context) {
+                return; // re-entry: HandleRequestAdvice will attach existing context
+            }
+            Context parentContext = DECORATE.extract(req);
+            req.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
+            parentScope = parentContext.attach();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Local("parentScope") ContextScope parentScope) {
+            if (parentScope != null) {
+                parentScope.close();
+            }
+        }
     }
-  }
-
-  /**
-   * Jetty ensures that connections are reset immediately after the response is sent. This provides
-   * a reliable point to finish the server span at the last possible moment.
-   */
-  public static class ResetAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void stopSpan(@Advice.This final AbstractHttpConnection connection) {
-      Request req = connection.getRequest();
-      Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (contextObj instanceof Context) {
-        final Context context = (Context) contextObj;
-        final AgentSpan span = spanFromContext(context);
-        if (span != null) {
-          DECORATE.onResponse(span, connection);
-          DECORATE.beforeFinish(context);
-          span.finish();
+
+    /**
+     * The handleRequest call denotes the earliest point at which the incoming request is fully
+     * parsed. This allows us to read the headers from the request to extract propagation info.
+     */
+    public static class HandleRequestAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.This final AbstractHttpConnection connection, @Advice.Local("newSpan") AgentSpan span) {
+            Request req = connection.getRequest();
+
+            Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (existingContext instanceof Context) {
+                // Request already gone through initial processing, so just activate the context.
+                return ((Context) existingContext).attach();
+            }
+
+            final Object parentContextObj = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
+            final Context parentContext =
+                    (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
+            final Context context = DECORATE.startSpan(req, parentContext);
+            final ContextScope scope = context.attach();
+            span = spanFromContext(context);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, req, req, parentContext);
+
+            req.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
+            req.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+            req.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+            return scope;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            // Span is finished when the connection is reset, so we only need to close the scope here.
+            scope.close();
+        }
+    }
+
+    /**
+     * Jetty ensures that connections are reset immediately after the response is sent. This provides
+     * a reliable point to finish the server span at the last possible moment.
+     */
+    public static class ResetAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void stopSpan(@Advice.This final AbstractHttpConnection connection) {
+            Request req = connection.getRequest();
+            Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (contextObj instanceof Context) {
+                final Context context = (Context) contextObj;
+                final AgentSpan span = spanFromContext(context);
+                if (span != null) {
+                    DECORATE.onResponse(span, connection);
+                    DECORATE.beforeFinish(context);
+                    span.finish();
+                }
+            }
+
+            // Jetty doesn't always call async listeners
+            // Finish the dispatch listener span if it hasn't already
+            Runnable r = (Runnable) req.getAttribute(DD_FIN_DISP_LIST_SPAN_ATTRIBUTE);
+            if (r != null) {
+                r.run();
+            }
         }
-      }
-
-      // Jetty doesn't always call async listeners
-      // Finish the dispatch listener span if it hasn't already
-      Runnable r = (Runnable) req.getAttribute(DD_FIN_DISP_LIST_SPAN_ATTRIBUTE);
-      if (r != null) {
-        r.run();
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java
index 346ec1b0e84..a5e9f8948e3 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java
@@ -31,107 +31,105 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RequestInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public RequestInstrumentation() {
-    super("jetty");
-  }
+    public RequestInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.Request";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.Request";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("setContextPath").and(takesArgument(0, String.class)),
-        RequestInstrumentation.class.getName() + "$SetContextPathAdvice");
-    transformer.applyAdvice(
-        named("setServletPath").and(takesArgument(0, String.class)),
-        RequestInstrumentation.class.getName() + "$SetServletPathAdvice");
-    transformer.applyAdvice(
-        named("setRequestedSessionId").and(takesArgument(0, String.class)),
-        RequestInstrumentation.class.getName() + "$SetRequestedSessionId");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("setContextPath").and(takesArgument(0, String.class)),
+                RequestInstrumentation.class.getName() + "$SetContextPathAdvice");
+        transformer.applyAdvice(
+                named("setServletPath").and(takesArgument(0, String.class)),
+                RequestInstrumentation.class.getName() + "$SetServletPathAdvice");
+        transformer.applyAdvice(
+                named("setRequestedSessionId").and(takesArgument(0, String.class)),
+                RequestInstrumentation.class.getName() + "$SetRequestedSessionId");
+    }
 
-  /**
-   * Because we are processing the initial request before the contextPath is set, we must update it
-   * when it is actually set.
-   */
-  public static class SetContextPathAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void updateContextPath(
-        @Advice.This final Request req, @Advice.Argument(0) final String contextPath) {
-      if (contextPath != null) {
-        Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-        // Don't want to update while being dispatched to new servlet
-        if (contextObj instanceof Context && req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) == null) {
-          Context context = (Context) contextObj;
-          AgentSpan span = spanFromContext(context);
-          if (span != null) {
-            span.setTag(SERVLET_CONTEXT, contextPath);
-            req.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, contextPath);
-          }
+    /**
+     * Because we are processing the initial request before the contextPath is set, we must update it
+     * when it is actually set.
+     */
+    public static class SetContextPathAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void updateContextPath(
+                @Advice.This final Request req, @Advice.Argument(0) final String contextPath) {
+            if (contextPath != null) {
+                Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+                // Don't want to update while being dispatched to new servlet
+                if (contextObj instanceof Context && req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) == null) {
+                    Context context = (Context) contextObj;
+                    AgentSpan span = spanFromContext(context);
+                    if (span != null) {
+                        span.setTag(SERVLET_CONTEXT, contextPath);
+                        req.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, contextPath);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  /**
-   * Because we are processing the initial request before the servletPath is set, we must update it
-   * when it is actually set.
-   */
-  public static class SetServletPathAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void updateServletPath(
-        @Advice.This final Request req, @Advice.Argument(0) final String servletPath) {
-      if (servletPath != null && !servletPath.isEmpty()) { // bypass cleanup
-        Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-        // Don't want to update while being dispatched to new servlet
-        if (contextObj instanceof Context && req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) == null) {
-          Context context = (Context) contextObj;
-          AgentSpan span = spanFromContext(context);
-          if (span != null) {
-            span.setTag(SERVLET_PATH, servletPath);
-            req.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, servletPath);
-          }
+    /**
+     * Because we are processing the initial request before the servletPath is set, we must update it
+     * when it is actually set.
+     */
+    public static class SetServletPathAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void updateServletPath(
+                @Advice.This final Request req, @Advice.Argument(0) final String servletPath) {
+            if (servletPath != null && !servletPath.isEmpty()) { // bypass cleanup
+                Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+                // Don't want to update while being dispatched to new servlet
+                if (contextObj instanceof Context && req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) == null) {
+                    Context context = (Context) contextObj;
+                    AgentSpan span = spanFromContext(context);
+                    if (span != null) {
+                        span.setTag(SERVLET_PATH, servletPath);
+                        req.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, servletPath);
+                    }
+                }
+            }
         }
-      }
-    }
 
-    private void muzzleCheck(AbstractHttpConnection connection) {
-      connection.getGenerator();
+        private void muzzleCheck(AbstractHttpConnection connection) {
+            connection.getGenerator();
+        }
     }
-  }
 
-  /**
-   * Because we are processing the initial request before the requestedSessionId is set, we must
-   * update it when it is actually set.
-   */
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class SetRequestedSessionId {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void updateContextPath(
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Argument(0) final String requestedSessionId) {
-      if (requestedSessionId != null && reqCtx != null) {
-        final CallbackProvider cbp =
-            AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-        if (cbp == null) {
-          return;
-        }
-        final BiFunction<RequestContext, String, Flow<Void>> addrCallback =
-            cbp.getCallback(EVENTS.requestSession());
-        if (addrCallback == null) {
-          return;
-        }
-        final Flow<Void> flow = addrCallback.apply(reqCtx, requestedSessionId);
-        Flow.Action action = flow.getAction();
-        if (action instanceof Flow.Action.RequestBlockingAction) {
-          throw new BlockingException("Blocked request (for sessionId)");
+    /**
+     * Because we are processing the initial request before the requestedSessionId is set, we must
+     * update it when it is actually set.
+     */
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class SetRequestedSessionId {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void updateContextPath(
+                @ActiveRequestContext RequestContext reqCtx, @Advice.Argument(0) final String requestedSessionId) {
+            if (requestedSessionId != null && reqCtx != null) {
+                final CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+                if (cbp == null) {
+                    return;
+                }
+                final BiFunction<RequestContext, String, Flow<Void>> addrCallback =
+                        cbp.getCallback(EVENTS.requestSession());
+                if (addrCallback == null) {
+                    return;
+                }
+                final Flow<Void> flow = addrCallback.apply(reqCtx, requestedSessionId);
+                Flow.Action action = flow.getAction();
+                if (action instanceof Flow.Action.RequestBlockingAction) {
+                    throw new BlockingException("Blocked request (for sessionId)");
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestURIDataAdapter.java
index bab8072aca3..7801814249d 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestURIDataAdapter.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestURIDataAdapter.java
@@ -5,39 +5,39 @@
 
 final class RequestURIDataAdapter extends URIRawDataAdapter {
 
-  private final HttpServletRequest request;
-
-  RequestURIDataAdapter(HttpServletRequest request) {
-    this.request = request;
-  }
-
-  @Override
-  public String scheme() {
-    return request.getScheme();
-  }
-
-  @Override
-  public String host() {
-    return request.getServerName();
-  }
-
-  @Override
-  public int port() {
-    return request.getServerPort();
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return request.getRequestURI();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return request.getQueryString();
-  }
+    private final HttpServletRequest request;
+
+    RequestURIDataAdapter(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    @Override
+    public String scheme() {
+        return request.getScheme();
+    }
+
+    @Override
+    public String host() {
+        return request.getServerName();
+    }
+
+    @Override
+    public int port() {
+        return request.getServerPort();
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return request.getRequestURI();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return request.getQueryString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ServerHandleInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ServerHandleInstrumentation.java
index 06833e9820a..f30061bb5b9 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ServerHandleInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ServerHandleInstrumentation.java
@@ -19,97 +19,97 @@
 
 @AutoService(InstrumenterModule.class)
 public class ServerHandleInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ServerHandleInstrumentation() {
-    super("jetty");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ServerHandleInstrumentation() {
+        super("jetty");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.Server";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.Server";
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".JettyDecorator",
+            packageName + ".RequestURIDataAdapter",
+            "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+        };
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".JettyDecorator",
-      packageName + ".RequestURIDataAdapter",
-      "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-    };
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("handle")
+                        .or(named("handleAsync"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("org.eclipse.jetty.server.AbstractHttpConnection"))),
+                ServerHandleInstrumentation.class.getName() + "$HandleAdvice");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("handle")
-            .or(named("handleAsync"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("org.eclipse.jetty.server.AbstractHttpConnection"))),
-        ServerHandleInstrumentation.class.getName() + "$HandleAdvice");
-  }
+    static class HandleAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static ContextScope onEnter(
+                @Advice.Argument(0) AbstractHttpConnection connection,
+                @Advice.Local("request") Request req,
+                @Advice.Local("agentSpan") AgentSpan span) {
+            req = connection.getRequest();
 
-  static class HandleAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static ContextScope onEnter(
-        @Advice.Argument(0) AbstractHttpConnection connection,
-        @Advice.Local("request") Request req,
-        @Advice.Local("agentSpan") AgentSpan span) {
-      req = connection.getRequest();
+            // First check if there's an existing context in the request (from main server span)
+            Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
 
-      // First check if there's an existing context in the request (from main server span)
-      Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            // see comments in HandleRequestAdvice for jetty-9
+            Object dispatchSpan;
+            synchronized (req) {
+                dispatchSpan = req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
+            }
+            if (dispatchSpan instanceof AgentSpan) {
+                span = (AgentSpan) dispatchSpan;
 
-      // see comments in HandleRequestAdvice for jetty-9
-      Object dispatchSpan;
-      synchronized (req) {
-        dispatchSpan = req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
-      }
-      if (dispatchSpan instanceof AgentSpan) {
-        span = (AgentSpan) dispatchSpan;
+                // If we have an existing context, create a new context with the dispatch span
+                // Otherwise just attach the dispatch span
+                if (existingContext instanceof Context) {
+                    Context contextWithDispatchSpan = ((Context) existingContext).with(span);
+                    return contextWithDispatchSpan.attach();
+                } else {
+                    return span.attach();
+                }
+            }
 
-        // If we have an existing context, create a new context with the dispatch span
-        // Otherwise just attach the dispatch span
-        if (existingContext instanceof Context) {
-          Context contextWithDispatchSpan = ((Context) existingContext).with(span);
-          return contextWithDispatchSpan.attach();
-        } else {
-          return span.attach();
+            return null;
         }
-      }
-
-      return null;
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Local("agentSpan") AgentSpan span,
-        @Advice.Local("request") Request req,
-        @Advice.Thrown Throwable t) {
-      if (scope == null) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Local("agentSpan") AgentSpan span,
+                @Advice.Local("request") Request req,
+                @Advice.Thrown Throwable t) {
+            if (scope == null) {
+                return;
+            }
 
-      if (t != null) {
-        DECORATE.onError(span, t);
-      }
-      if (!req.getAsyncContinuation().isAsyncStarted()) {
-        // finish will be handled by the async listener
-        // Use the full context from the scope for beforeFinish
-        DECORATE.beforeFinish(scope.context());
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
+            if (t != null) {
+                DECORATE.onError(span, t);
+            }
+            if (!req.getAsyncContinuation().isAsyncStarted()) {
+                // finish will be handled by the async listener
+                // Use the full context from the scope for beforeFinish
+                DECORATE.beforeFinish(scope.context());
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
 
-      synchronized (req) {
-        req.removeAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
-      }
+            synchronized (req) {
+                req.removeAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/test/groovy/Jetty8LatestDepForkedTest.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/test/groovy/Jetty8LatestDepForkedTest.java
index 2188513a81c..62f09953b08 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/test/groovy/Jetty8LatestDepForkedTest.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/test/groovy/Jetty8LatestDepForkedTest.java
@@ -23,116 +23,110 @@
  */
 abstract class Jetty8LatestDepForkedTest extends Jetty76Test {
 
-  @Override
-  public AbstractHandler handler() {
-    return new Jetty8TestHandler();
-  }
-
-  @Override
-  public boolean testBodyMultipart() {
-    return true;
-  }
-
-  @Override
-  public boolean testBodyFilenames() {
-    return true;
-  }
-
-  @Override
-  public boolean testBodyFilenamesCalledOnce() {
-    // Jetty 8.x has no _multiParts field guard; getParts() called multiple times
-    // (BODY_MULTIPART_REPEATED) fires the event more than once.
-    return false;
-  }
-
-  @Override
-  public boolean testBodyFilenamesCalledOnceCombined() {
-    // Jetty 8.x has no _contentParameters field guard; BODY_MULTIPART_COMBINED
-    // fires the event on the getParts() call regardless of prior parameterMap access.
-    return false;
-  }
-
-  @Override
-  public boolean testBodyFilesContent() {
-    return true;
-  }
-
-  static class Jetty8TestHandler extends AbstractHandler {
-    private static final MultipartConfigElement MULTIPART_CONFIG =
-        new MultipartConfigElement(System.getProperty("java.io.tmpdir"));
+    @Override
+    public AbstractHandler handler() {
+        return new Jetty8TestHandler();
+    }
 
     @Override
-    public void handle(
-        String target,
-        Request baseRequest,
-        HttpServletRequest request,
-        HttpServletResponse response)
-        throws IOException, ServletException {
-      if (!baseRequest.getDispatcherType().name().equals("ERROR")) {
-        // Enable Servlet 3.0 multipart processing for all requests.
-        request.setAttribute("org.eclipse.jetty.multipartConfig", MULTIPART_CONFIG);
-        request.setAttribute("org.eclipse.multipartConfig", MULTIPART_CONFIG);
-
-        // Jetty 8.x does not populate getParameterMap() from multipart form fields without a
-        // prior getParts() call (unlike 9.3+ where extractContentParameters() does this).
-        // Pre-call getParts() for BODY_MULTIPART so the servlet can read form fields via
-        // getParameterMap(). Skip for BODY_MULTIPART_REPEATED and BODY_MULTIPART_COMBINED,
-        // which call getParts() themselves and rely on the first call triggering filenames.
-        HttpServerTest.ServerEndpoint endpoint =
-            HttpServerTest.ServerEndpoint.forPath(request.getRequestURI());
-        if (endpoint == HttpServerTest.ServerEndpoint.BODY_MULTIPART) {
-          try {
-            request.getParts();
-          } catch (IOException | ServletException ignored) {
-          }
-        }
+    public boolean testBodyMultipart() {
+        return true;
+    }
+
+    @Override
+    public boolean testBodyFilenames() {
+        return true;
+    }
+
+    @Override
+    public boolean testBodyFilenamesCalledOnce() {
+        // Jetty 8.x has no _multiParts field guard; getParts() called multiple times
+        // (BODY_MULTIPART_REPEATED) fires the event more than once.
+        return false;
+    }
 
-        Jetty76Test.TestHandler.handleRequest(baseRequest, response);
-        baseRequest.setHandled(true);
-      } else {
-        ((AbstractHandler) Jetty76Test.getErrorHandler())
-            .handle(target, baseRequest, request, response);
-      }
+    @Override
+    public boolean testBodyFilenamesCalledOnceCombined() {
+        // Jetty 8.x has no _contentParameters field guard; BODY_MULTIPART_COMBINED
+        // fires the event on the getParts() call regardless of prior parameterMap access.
+        return false;
+    }
+
+    @Override
+    public boolean testBodyFilesContent() {
+        return true;
+    }
+
+    static class Jetty8TestHandler extends AbstractHandler {
+        private static final MultipartConfigElement MULTIPART_CONFIG =
+                new MultipartConfigElement(System.getProperty("java.io.tmpdir"));
+
+        @Override
+        public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
+                throws IOException, ServletException {
+            if (!baseRequest.getDispatcherType().name().equals("ERROR")) {
+                // Enable Servlet 3.0 multipart processing for all requests.
+                request.setAttribute("org.eclipse.jetty.multipartConfig", MULTIPART_CONFIG);
+                request.setAttribute("org.eclipse.multipartConfig", MULTIPART_CONFIG);
+
+                // Jetty 8.x does not populate getParameterMap() from multipart form fields without a
+                // prior getParts() call (unlike 9.3+ where extractContentParameters() does this).
+                // Pre-call getParts() for BODY_MULTIPART so the servlet can read form fields via
+                // getParameterMap(). Skip for BODY_MULTIPART_REPEATED and BODY_MULTIPART_COMBINED,
+                // which call getParts() themselves and rely on the first call triggering filenames.
+                HttpServerTest.ServerEndpoint endpoint = HttpServerTest.ServerEndpoint.forPath(request.getRequestURI());
+                if (endpoint == HttpServerTest.ServerEndpoint.BODY_MULTIPART) {
+                    try {
+                        request.getParts();
+                    } catch (IOException | ServletException ignored) {
+                    }
+                }
+
+                Jetty76Test.TestHandler.handleRequest(baseRequest, response);
+                baseRequest.setHandled(true);
+            } else {
+                ((AbstractHandler) Jetty76Test.getErrorHandler()).handle(target, baseRequest, request, response);
+            }
+        }
     }
-  }
 }
 
 @EnabledIfSystemProperty(named = "test.dd.filenames", matches = ".+")
 class Jetty8V0LatestDepForkedTest extends Jetty8LatestDepForkedTest
-    implements TestingGenericHttpNamingConventions.ServerV0 {
-
-  @Override
-  public int version() {
-    return 0;
-  }
-
-  @Override
-  public String service() {
-    return null;
-  }
-
-  @Override
-  public String operation() {
-    return "servlet.request";
-  }
+        implements TestingGenericHttpNamingConventions.ServerV0 {
+
+    @Override
+    public int version() {
+        return 0;
+    }
+
+    @Override
+    public String service() {
+        return null;
+    }
+
+    @Override
+    public String operation() {
+        return "servlet.request";
+    }
 }
 
 @EnabledIfSystemProperty(named = "test.dd.filenames", matches = ".+")
 class Jetty8V1LatestDepForkedTest extends Jetty8LatestDepForkedTest
-    implements TestingGenericHttpNamingConventions.ServerV1 {
-
-  @Override
-  public int version() {
-    return 1;
-  }
-
-  @Override
-  public String service() {
-    return null;
-  }
-
-  @Override
-  public String operation() {
-    return "http.server.request";
-  }
+        implements TestingGenericHttpNamingConventions.ServerV1 {
+
+    @Override
+    public int version() {
+        return 1;
+    }
+
+    @Override
+    public String service() {
+        return null;
+    }
+
+    @Override
+    public String operation() {
+        return "http.server.request";
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseHelper.java
index 964f6e7a524..f65049eacec 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseHelper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseHelper.java
@@ -22,85 +22,84 @@
 import org.slf4j.LoggerFactory;
 
 public class JettyCommitResponseHelper {
-  private static final Logger log = LoggerFactory.getLogger(JettyCommitResponseHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(JettyCommitResponseHelper.class);
 
-  public static boolean /* skip */ before(
-      HttpChannel connection,
-      HttpGenerator.ResponseInfo responseInfo /* nullable */,
-      HttpTransport transport,
-      AtomicBoolean _committed,
-      Callback cb) {
-    if (responseInfo == null) {
-      responseInfo = newResponseInfo(connection);
-      if (responseInfo == null) {
-        return false;
-      }
-    }
+    public static boolean /* skip */ before(
+            HttpChannel connection,
+            HttpGenerator.ResponseInfo responseInfo /* nullable */,
+            HttpTransport transport,
+            AtomicBoolean _committed,
+            Callback cb) {
+        if (responseInfo == null) {
+            responseInfo = newResponseInfo(connection);
+            if (responseInfo == null) {
+                return false;
+            }
+        }
 
-    if (responseInfo.getStatus() == 100) {
-      return false;
-    }
-    boolean wasCommitted = !_committed.compareAndSet(false, true);
-    if (wasCommitted) {
-      return false;
-    }
+        if (responseInfo.getStatus() == 100) {
+            return false;
+        }
+        boolean wasCommitted = !_committed.compareAndSet(false, true);
+        if (wasCommitted) {
+            return false;
+        }
 
-    // henceforth we need to reset _committed to false when we don't want to skip the body
+        // henceforth we need to reset _committed to false when we don't want to skip the body
 
-    Request req = connection.getRequest();
+        Request req = connection.getRequest();
 
-    if (req.getAttribute(DD_IGNORE_COMMIT_ATTRIBUTE) != null) {
-      _committed.set(false);
-      return false;
-    }
-    Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-    if (!(contextObj instanceof Context)) {
-      _committed.set(false);
-      return false;
-    }
-    Context context = (Context) contextObj;
-    AgentSpan span = AgentSpan.fromContext(context);
-    if (span == null) {
-      _committed.set(false);
-      return false;
-    }
-    RequestContext requestContext = span.getRequestContext();
-    if (requestContext == null) {
-      _committed.set(false);
-      return false;
-    }
+        if (req.getAttribute(DD_IGNORE_COMMIT_ATTRIBUTE) != null) {
+            _committed.set(false);
+            return false;
+        }
+        Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+        if (!(contextObj instanceof Context)) {
+            _committed.set(false);
+            return false;
+        }
+        Context context = (Context) contextObj;
+        AgentSpan span = AgentSpan.fromContext(context);
+        if (span == null) {
+            _committed.set(false);
+            return false;
+        }
+        RequestContext requestContext = span.getRequestContext();
+        if (requestContext == null) {
+            _committed.set(false);
+            return false;
+        }
 
-    Response resp = connection.getResponse();
+        Response resp = connection.getResponse();
 
-    Flow<Void> flow =
-        DECORATE.callIGCallbackResponseAndHeaders(
-            span, resp, resp.getStatus(), ExtractAdapter.Response.GETTER);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      _committed.set(false);
-      boolean success = JettyOnCommitBlockingHelper.block(connection, transport, rba, cb);
-      if (success) {
-        _committed.set(true);
-        requestContext.getTraceSegment().effectivelyBlocked();
-        return true;
-      }
-    }
+        Flow<Void> flow =
+                DECORATE.callIGCallbackResponseAndHeaders(span, resp, resp.getStatus(), ExtractAdapter.Response.GETTER);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            _committed.set(false);
+            boolean success = JettyOnCommitBlockingHelper.block(connection, transport, rba, cb);
+            if (success) {
+                _committed.set(true);
+                requestContext.getTraceSegment().effectivelyBlocked();
+                return true;
+            }
+        }
 
-    _committed.set(false);
-    return false;
-  }
+        _committed.set(false);
+        return false;
+    }
 
-  private static HttpGenerator.ResponseInfo newResponseInfo(HttpChannel connection) {
-    Response response = connection.getResponse();
-    Method newResponseInfo;
-    try {
-      newResponseInfo = Response.class.getDeclaredMethod("newResponseInfo");
-      newResponseInfo.setAccessible(true);
-      return (HttpGenerator.ResponseInfo) newResponseInfo.invoke(response);
-    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-      log.debug("Failed creating new ResponseInfo", e);
-      return null;
+    private static HttpGenerator.ResponseInfo newResponseInfo(HttpChannel connection) {
+        Response response = connection.getResponse();
+        Method newResponseInfo;
+        try {
+            newResponseInfo = Response.class.getDeclaredMethod("newResponseInfo");
+            newResponseInfo.setAccessible(true);
+            return (HttpGenerator.ResponseInfo) newResponseInfo.invoke(response);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            log.debug("Failed creating new ResponseInfo", e);
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseInstrumentation.java
index 9dbb03c9a06..9d60f3f2bc8 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseInstrumentation.java
@@ -11,80 +11,80 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JettyCommitResponseInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JettyCommitResponseInstrumentation() {
-    super("jetty");
-  }
+    public JettyCommitResponseInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      new Reference.Builder("org.eclipse.jetty.server.HttpChannel")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
-              "sendResponse",
-              "Z",
-              "Lorg/eclipse/jetty/http/HttpGenerator$ResponseInfo;",
-              "Ljava/nio/ByteBuffer;",
-              "Z",
-              "Lorg/eclipse/jetty/util/Callback;")
-          .withField(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC,
-              "_committed",
-              "Ljava/util/concurrent/atomic/AtomicBoolean;")
-          .withField(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC,
-              "_transport",
-              "Lorg/eclipse/jetty/server/HttpTransport;")
-          .build(),
-      new Reference.Builder("org.eclipse.jetty.server.Response")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
-              "newResponseInfo",
-              "Lorg/eclipse/jetty/http/HttpGenerator$ResponseInfo;")
-          .build(),
-      new Reference.Builder("org.eclipse.jetty.server.HttpOutput")
-          .withMethod(new String[0], Reference.EXPECTS_NON_STATIC, "closed", "V")
-          .build(),
-    };
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            new Reference.Builder("org.eclipse.jetty.server.HttpChannel")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
+                            "sendResponse",
+                            "Z",
+                            "Lorg/eclipse/jetty/http/HttpGenerator$ResponseInfo;",
+                            "Ljava/nio/ByteBuffer;",
+                            "Z",
+                            "Lorg/eclipse/jetty/util/Callback;")
+                    .withField(
+                            new String[0],
+                            Reference.EXPECTS_NON_STATIC,
+                            "_committed",
+                            "Ljava/util/concurrent/atomic/AtomicBoolean;")
+                    .withField(
+                            new String[0],
+                            Reference.EXPECTS_NON_STATIC,
+                            "_transport",
+                            "Lorg/eclipse/jetty/server/HttpTransport;")
+                    .build(),
+            new Reference.Builder("org.eclipse.jetty.server.Response")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
+                            "newResponseInfo",
+                            "Lorg/eclipse/jetty/http/HttpGenerator$ResponseInfo;")
+                    .build(),
+            new Reference.Builder("org.eclipse.jetty.server.HttpOutput")
+                    .withMethod(new String[0], Reference.EXPECTS_NON_STATIC, "closed", "V")
+                    .build(),
+        };
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.HttpChannel";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.HttpChannel";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    String pkg9 = "datadog.trace.instrumentation.jetty9";
-    return new String[] {
-      pkg9 + ".ExtractAdapter",
-      pkg9 + ".ExtractAdapter$Request",
-      pkg9 + ".ExtractAdapter$Response",
-      pkg9 + ".JettyDecorator",
-      pkg9 + ".RequestURIDataAdapter",
-      "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-      packageName + ".JettyCommitResponseHelper",
-      packageName + ".JettyOnCommitBlockingHelper",
-      packageName + ".JettyOnCommitBlockingHelper$CloseCallback",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        String pkg9 = "datadog.trace.instrumentation.jetty9";
+        return new String[] {
+            pkg9 + ".ExtractAdapter",
+            pkg9 + ".ExtractAdapter$Request",
+            pkg9 + ".ExtractAdapter$Response",
+            pkg9 + ".JettyDecorator",
+            pkg9 + ".RequestURIDataAdapter",
+            "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+            packageName + ".JettyCommitResponseHelper",
+            packageName + ".JettyOnCommitBlockingHelper",
+            packageName + ".JettyOnCommitBlockingHelper$CloseCallback",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("sendResponse")
-            .and(takesArguments(4))
-            .and(takesArgument(0, named("org.eclipse.jetty.http.HttpGenerator$ResponseInfo")))
-            .and(takesArgument(1, named("java.nio.ByteBuffer")))
-            .and(takesArgument(2, boolean.class))
-            .and(takesArgument(3, named("org.eclipse.jetty.util.Callback"))),
-        packageName + ".SendResponseCbAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("sendResponse")
+                        .and(takesArguments(4))
+                        .and(takesArgument(0, named("org.eclipse.jetty.http.HttpGenerator$ResponseInfo")))
+                        .and(takesArgument(1, named("java.nio.ByteBuffer")))
+                        .and(takesArgument(2, boolean.class))
+                        .and(takesArgument(3, named("org.eclipse.jetty.util.Callback"))),
+                packageName + ".SendResponseCbAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/JettyOnCommitBlockingHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/JettyOnCommitBlockingHelper.java
index 1f2f770170a..1c346913803 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/JettyOnCommitBlockingHelper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/JettyOnCommitBlockingHelper.java
@@ -24,128 +24,120 @@
 
 public class JettyOnCommitBlockingHelper {
 
-  private static final Logger log = LoggerFactory.getLogger(JettyOnCommitBlockingHelper.class);
-  private static final ByteBuffer EMPTY_BB = ByteBuffer.allocate(0);
-
-  public static boolean block(
-      HttpChannel channel,
-      HttpTransport transport,
-      Flow.Action.RequestBlockingAction rba,
-      Callback cb) {
-    if (!isInitialized()) {
-      return false;
+    private static final Logger log = LoggerFactory.getLogger(JettyOnCommitBlockingHelper.class);
+    private static final ByteBuffer EMPTY_BB = ByteBuffer.allocate(0);
+
+    public static boolean block(
+            HttpChannel channel, HttpTransport transport, Flow.Action.RequestBlockingAction rba, Callback cb) {
+        if (!isInitialized()) {
+            return false;
+        }
+
+        Request request = channel.getRequest();
+        Response response = channel.getResponse();
+        request.setAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE, Boolean.TRUE);
+
+        try {
+            int statusCode = BlockingActionHelper.getHttpCode(rba.getStatusCode());
+
+            String acceptHeader = request.getHeader("Accept");
+            HttpFields fields = new HttpFields();
+            for (Map.Entry<String, String> e : rba.getExtraHeaders().entrySet()) {
+                fields.put(e.getKey(), e.getValue());
+            }
+
+            BlockingContentType bct = rba.getBlockingContentType();
+            HttpGenerator.ResponseInfo info;
+            Callback closeCb = new CloseCallback(cb, channel);
+            if (bct != BlockingContentType.NONE && !request.isHead()) {
+                BlockingActionHelper.TemplateType type = BlockingActionHelper.determineTemplateType(bct, acceptHeader);
+                fields.put("Content-type", BlockingActionHelper.getContentType(type));
+                byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
+                fields.put("Content-length", Integer.toString(template.length));
+
+                info = new HttpGenerator.ResponseInfo(
+                        request.getHttpVersion(), fields, template.length, statusCode, null, false);
+
+                // we need to update the upper layers too
+                // so that the correct status code/headers get reported correctly on the span`
+                response.reset();
+                response.setStatus(statusCode);
+                response.setContentType(BlockingActionHelper.getContentType(type));
+                response.setContentLength(template.length);
+
+                log.debug("Sending blocking response (non-empty body)");
+                transport.send(info, ByteBuffer.wrap(template), true, closeCb);
+            } else {
+                info = new HttpGenerator.ResponseInfo(
+                        request.getHttpVersion(), fields, 0, statusCode, null, request.isHead());
+
+                response.reset();
+                response.setStatus(statusCode);
+
+                transport.send(info, EMPTY_BB, true, closeCb);
+            }
+        } catch (Exception x) {
+            log.warn("Error committing blocking response", x);
+            return false;
+        }
+        return true;
     }
 
-    Request request = channel.getRequest();
-    Response response = channel.getResponse();
-    request.setAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE, Boolean.TRUE);
-
-    try {
-      int statusCode = BlockingActionHelper.getHttpCode(rba.getStatusCode());
-
-      String acceptHeader = request.getHeader("Accept");
-      HttpFields fields = new HttpFields();
-      for (Map.Entry<String, String> e : rba.getExtraHeaders().entrySet()) {
-        fields.put(e.getKey(), e.getValue());
-      }
-
-      BlockingContentType bct = rba.getBlockingContentType();
-      HttpGenerator.ResponseInfo info;
-      Callback closeCb = new CloseCallback(cb, channel);
-      if (bct != BlockingContentType.NONE && !request.isHead()) {
-        BlockingActionHelper.TemplateType type =
-            BlockingActionHelper.determineTemplateType(bct, acceptHeader);
-        fields.put("Content-type", BlockingActionHelper.getContentType(type));
-        byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
-        fields.put("Content-length", Integer.toString(template.length));
-
-        info =
-            new HttpGenerator.ResponseInfo(
-                request.getHttpVersion(), fields, template.length, statusCode, null, false);
-
-        // we need to update the upper layers too
-        // so that the correct status code/headers get reported correctly on the span`
-        response.reset();
-        response.setStatus(statusCode);
-        response.setContentType(BlockingActionHelper.getContentType(type));
-        response.setContentLength(template.length);
-
-        log.debug("Sending blocking response (non-empty body)");
-        transport.send(info, ByteBuffer.wrap(template), true, closeCb);
-      } else {
-        info =
-            new HttpGenerator.ResponseInfo(
-                request.getHttpVersion(), fields, 0, statusCode, null, request.isHead());
-
-        response.reset();
-        response.setStatus(statusCode);
-
-        transport.send(info, EMPTY_BB, true, closeCb);
-      }
-    } catch (Exception x) {
-      log.warn("Error committing blocking response", x);
-      return false;
+    public static final class CloseCallback implements org.eclipse.jetty.util.Callback {
+        private static final Logger log = LoggerFactory.getLogger(CloseCallback.class);
+        private final Callback delegate;
+        private final HttpChannel channel;
+
+        public CloseCallback(Callback delegate, HttpChannel channel) {
+            this.delegate = delegate;
+            this.channel = channel;
+        }
+
+        /**
+         * @see org.eclipse.jetty.server.HttpChannel.CommitCallback
+         */
+        private void close() {
+            closed(channel.getResponse().getHttpOutput());
+            channel.getEndPoint().close();
+        }
+
+        private static final MethodHandle CLOSED;
+
+        static {
+            MethodHandle mh = null;
+            try {
+                Method closed = HttpOutput.class.getDeclaredMethod("closed");
+                closed.setAccessible(true);
+                mh = MethodHandles.lookup().unreflect(closed);
+            } catch (NoSuchMethodException | IllegalAccessException e) {
+                log.warn("Could not find HttpOutput#closed(). " + "Blocking for responses will not be available", e);
+            }
+            CLOSED = mh;
+        }
+
+        public static boolean isInitialized() {
+            return CLOSED != null;
+        }
+
+        private void closed(HttpOutput httpOutput) {
+            try {
+                CLOSED.invoke(httpOutput);
+            } catch (Throwable e) {
+                log.debug("Error invoked closed()", e);
+            }
+        }
+
+        @Override
+        public void succeeded() {
+            close();
+            delegate.succeeded();
+        }
+
+        @Override
+        public void failed(final Throwable x) {
+            log.debug("Exception sending blocking response", x);
+            close();
+            delegate.failed(x);
+        }
     }
-    return true;
-  }
-
-  public static final class CloseCallback implements org.eclipse.jetty.util.Callback {
-    private static final Logger log = LoggerFactory.getLogger(CloseCallback.class);
-    private final Callback delegate;
-    private final HttpChannel channel;
-
-    public CloseCallback(Callback delegate, HttpChannel channel) {
-      this.delegate = delegate;
-      this.channel = channel;
-    }
-
-    /**
-     * @see org.eclipse.jetty.server.HttpChannel.CommitCallback
-     */
-    private void close() {
-      closed(channel.getResponse().getHttpOutput());
-      channel.getEndPoint().close();
-    }
-
-    private static final MethodHandle CLOSED;
-
-    static {
-      MethodHandle mh = null;
-      try {
-        Method closed = HttpOutput.class.getDeclaredMethod("closed");
-        closed.setAccessible(true);
-        mh = MethodHandles.lookup().unreflect(closed);
-      } catch (NoSuchMethodException | IllegalAccessException e) {
-        log.warn(
-            "Could not find HttpOutput#closed(). " + "Blocking for responses will not be available",
-            e);
-      }
-      CLOSED = mh;
-    }
-
-    public static boolean isInitialized() {
-      return CLOSED != null;
-    }
-
-    private void closed(HttpOutput httpOutput) {
-      try {
-        CLOSED.invoke(httpOutput);
-      } catch (Throwable e) {
-        log.debug("Error invoked closed()", e);
-      }
-    }
-
-    @Override
-    public void succeeded() {
-      close();
-      delegate.succeeded();
-    }
-
-    @Override
-    public void failed(final Throwable x) {
-      log.debug("Exception sending blocking response", x);
-      close();
-      delegate.failed(x);
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/SendResponseCbAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/SendResponseCbAdvice.java
index 6855774f04f..184572cee10 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/SendResponseCbAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/SendResponseCbAdvice.java
@@ -8,13 +8,13 @@
 import org.eclipse.jetty.util.Callback;
 
 public class SendResponseCbAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-  public static boolean /* skip */ before(
-      @Advice.This HttpChannel connection,
-      @Advice.Argument(0) HttpGenerator.ResponseInfo responseInfo,
-      @Advice.Argument(3) Callback cb,
-      @Advice.FieldValue("_committed") AtomicBoolean _committed,
-      @Advice.FieldValue("_transport") HttpTransport _transport) {
-    return JettyCommitResponseHelper.before(connection, responseInfo, _transport, _committed, cb);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+    public static boolean /* skip */ before(
+            @Advice.This HttpChannel connection,
+            @Advice.Argument(0) HttpGenerator.ResponseInfo responseInfo,
+            @Advice.Argument(3) Callback cb,
+            @Advice.FieldValue("_committed") AtomicBoolean _committed,
+            @Advice.FieldValue("_transport") HttpTransport _transport) {
+        return JettyCommitResponseHelper.before(connection, responseInfo, _transport, _committed, cb);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty92LatestDepForkedTest.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty92LatestDepForkedTest.java
index cbddff84bec..8dd38ceb320 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty92LatestDepForkedTest.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty92LatestDepForkedTest.java
@@ -15,68 +15,68 @@
  */
 abstract class Jetty92LatestDepForkedTest extends Jetty9Test {
 
-  @Override
-  public boolean testBodyMultipart() {
-    return true;
-  }
+    @Override
+    public boolean testBodyMultipart() {
+        return true;
+    }
 
-  @Override
-  public boolean testBodyFilenames() {
-    return true;
-  }
+    @Override
+    public boolean testBodyFilenames() {
+        return true;
+    }
 
-  @Override
-  public boolean testBodyFilenamesCalledOnce() {
-    return true;
-  }
+    @Override
+    public boolean testBodyFilenamesCalledOnce() {
+        return true;
+    }
 
-  @Override
-  public boolean testBodyFilenamesCalledOnceCombined() {
-    return true;
-  }
+    @Override
+    public boolean testBodyFilenamesCalledOnceCombined() {
+        return true;
+    }
 
-  @Override
-  public boolean testBodyFilesContent() {
-    return true;
-  }
+    @Override
+    public boolean testBodyFilesContent() {
+        return true;
+    }
 }
 
 @EnabledIfSystemProperty(named = "test.dd.jetty92", matches = ".+")
 class Jetty92V0LatestDepForkedTest extends Jetty92LatestDepForkedTest
-    implements TestingGenericHttpNamingConventions.ServerV0 {
+        implements TestingGenericHttpNamingConventions.ServerV0 {
 
-  @Override
-  public int version() {
-    return 0;
-  }
+    @Override
+    public int version() {
+        return 0;
+    }
 
-  @Override
-  public String service() {
-    return null;
-  }
+    @Override
+    public String service() {
+        return null;
+    }
 
-  @Override
-  public String operation() {
-    return "servlet.request";
-  }
+    @Override
+    public String operation() {
+        return "servlet.request";
+    }
 }
 
 @EnabledIfSystemProperty(named = "test.dd.jetty92", matches = ".+")
 class Jetty92V1LatestDepForkedTest extends Jetty92LatestDepForkedTest
-    implements TestingGenericHttpNamingConventions.ServerV1 {
+        implements TestingGenericHttpNamingConventions.ServerV1 {
 
-  @Override
-  public int version() {
-    return 1;
-  }
+    @Override
+    public int version() {
+        return 1;
+    }
 
-  @Override
-  public String service() {
-    return null;
-  }
+    @Override
+    public String service() {
+        return null;
+    }
 
-  @Override
-  public String operation() {
-    return "http.server.request";
-  }
+    @Override
+    public String operation() {
+        return "http.server.request";
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/ExtractAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/ExtractAdapter.java
index a9952dac1b1..33a4352b885 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/ExtractAdapter.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/ExtractAdapter.java
@@ -5,37 +5,37 @@
 import org.eclipse.jetty.http.HttpFields;
 
 public abstract class ExtractAdapter<T> implements AgentPropagation.ContextVisitor<T> {
-  abstract HttpFields getHttpFields(T t);
+    abstract HttpFields getHttpFields(T t);
 
-  @Override
-  public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-    HttpFields headers = getHttpFields(carrier);
-    if (headers == null) {
-      return;
-    }
-    for (int i = 0; i < headers.size(); ++i) {
-      HttpField field = headers.getField(i);
-      if (field != null && !classifier.accept(field.getName(), field.getValue())) {
-        return;
-      }
+    @Override
+    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+        HttpFields headers = getHttpFields(carrier);
+        if (headers == null) {
+            return;
+        }
+        for (int i = 0; i < headers.size(); ++i) {
+            HttpField field = headers.getField(i);
+            if (field != null && !classifier.accept(field.getName(), field.getValue())) {
+                return;
+            }
+        }
     }
-  }
 
-  public static final class Request extends ExtractAdapter<org.eclipse.jetty.server.Request> {
-    public static final Request GETTER = new Request();
+    public static final class Request extends ExtractAdapter<org.eclipse.jetty.server.Request> {
+        public static final Request GETTER = new Request();
 
-    @Override
-    HttpFields getHttpFields(org.eclipse.jetty.server.Request request) {
-      return request.getHttpFields();
+        @Override
+        HttpFields getHttpFields(org.eclipse.jetty.server.Request request) {
+            return request.getHttpFields();
+        }
     }
-  }
 
-  public static final class Response extends ExtractAdapter<org.eclipse.jetty.server.Response> {
-    public static final Response GETTER = new Response();
+    public static final class Response extends ExtractAdapter<org.eclipse.jetty.server.Response> {
+        public static final Response GETTER = new Response();
 
-    @Override
-    HttpFields getHttpFields(org.eclipse.jetty.server.Response response) {
-      return response.getHttpFields();
+        @Override
+        HttpFields getHttpFields(org.eclipse.jetty.server.Response response) {
+            return response.getHttpFields();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyCommitResponseInstrumentation.java
index ebb0c9e1eec..7e00026be67 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyCommitResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyCommitResponseInstrumentation.java
@@ -26,113 +26,112 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JettyCommitResponseInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public JettyCommitResponseInstrumentation() {
-    super("jetty");
-  }
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      new Reference.Builder("org.eclipse.jetty.server.HttpChannel")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
-              "commitResponse",
-              "Z",
-              "Lorg/eclipse/jetty/http/HttpGenerator$ResponseInfo;",
-              "Ljava/nio/ByteBuffer;",
-              "Z")
-          .build()
-    };
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.HttpChannel";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".JettyDecorator",
-      packageName + ".RequestURIDataAdapter",
-      "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-    };
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "before_904";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("commitResponse")
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("org.eclipse.jetty.http.HttpGenerator$ResponseInfo")))
-            .and(takesArgument(1, named("java.nio.ByteBuffer")))
-            .and(takesArgument(2, boolean.class)),
-        JettyCommitResponseInstrumentation.class.getName() + "$CommitResponseAdvice");
-  }
-
-  static class CommitResponseAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-    static boolean /* skip */ before(
-        @Advice.This HttpChannel connection,
-        @Advice.Argument(0) HttpGenerator.ResponseInfo responseInfo,
-        @Advice.FieldValue("_committed") AtomicBoolean _committed) {
-      if (responseInfo.getStatus() == 100) {
-        return false;
-      }
-      boolean wasCommitted = !_committed.compareAndSet(false, true);
-      if (wasCommitted) {
-        return false;
-      }
-
-      // henceforth we need to reset _committed to false when we don't want to skip the body
-
-      Request req = connection.getRequest();
-
-      Object contextObj;
-      Context context;
-      AgentSpan span;
-      RequestContext requestContext;
-      if (req.getAttribute(DD_IGNORE_COMMIT_ATTRIBUTE) != null
-          || !((contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE)) instanceof Context)
-          || (span = spanFromContext(context = (Context) contextObj)) == null
-          || (requestContext = span.getRequestContext()) == null) {
-        _committed.set(false);
-        return false;
-      }
-
-      Response resp = connection.getResponse();
-
-      Flow<Void> flow =
-          DECORATE.callIGCallbackResponseAndHeaders(
-              span, resp, resp.getStatus(), ExtractAdapter.Response.GETTER);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction brf = requestContext.getBlockResponseFunction();
-        if (brf != null) {
-          _committed.set(false);
-          boolean res = brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
-          if (res && _committed.get()) {
-            requestContext.getTraceSegment().effectivelyBlocked();
-            return true;
-          }
-        }
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public JettyCommitResponseInstrumentation() {
+        super("jetty");
+    }
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            new Reference.Builder("org.eclipse.jetty.server.HttpChannel")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
+                            "commitResponse",
+                            "Z",
+                            "Lorg/eclipse/jetty/http/HttpGenerator$ResponseInfo;",
+                            "Ljava/nio/ByteBuffer;",
+                            "Z")
+                    .build()
+        };
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.HttpChannel";
+    }
 
-      _committed.set(false);
-      return false;
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".JettyDecorator",
+            packageName + ".RequestURIDataAdapter",
+            "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+        };
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "before_904";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("commitResponse")
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("org.eclipse.jetty.http.HttpGenerator$ResponseInfo")))
+                        .and(takesArgument(1, named("java.nio.ByteBuffer")))
+                        .and(takesArgument(2, boolean.class)),
+                JettyCommitResponseInstrumentation.class.getName() + "$CommitResponseAdvice");
+    }
+
+    static class CommitResponseAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+        static boolean /* skip */ before(
+                @Advice.This HttpChannel connection,
+                @Advice.Argument(0) HttpGenerator.ResponseInfo responseInfo,
+                @Advice.FieldValue("_committed") AtomicBoolean _committed) {
+            if (responseInfo.getStatus() == 100) {
+                return false;
+            }
+            boolean wasCommitted = !_committed.compareAndSet(false, true);
+            if (wasCommitted) {
+                return false;
+            }
+
+            // henceforth we need to reset _committed to false when we don't want to skip the body
+
+            Request req = connection.getRequest();
+
+            Object contextObj;
+            Context context;
+            AgentSpan span;
+            RequestContext requestContext;
+            if (req.getAttribute(DD_IGNORE_COMMIT_ATTRIBUTE) != null
+                    || !((contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE)) instanceof Context)
+                    || (span = spanFromContext(context = (Context) contextObj)) == null
+                    || (requestContext = span.getRequestContext()) == null) {
+                _committed.set(false);
+                return false;
+            }
+
+            Response resp = connection.getResponse();
+
+            Flow<Void> flow = DECORATE.callIGCallbackResponseAndHeaders(
+                    span, resp, resp.getStatus(), ExtractAdapter.Response.GETTER);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction brf = requestContext.getBlockResponseFunction();
+                if (brf != null) {
+                    _committed.set(false);
+                    boolean res = brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
+                    if (res && _committed.get()) {
+                        requestContext.getTraceSegment().effectivelyBlocked();
+                        return true;
+                    }
+                }
+            }
+
+            _committed.set(false);
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyDecorator.java
index ca99c88fead..d9710031d26 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyDecorator.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyDecorator.java
@@ -16,110 +16,109 @@
 import org.eclipse.jetty.server.Response;
 
 public class JettyDecorator extends HttpServerDecorator<Request, Request, Response, Request> {
-  public static final CharSequence JETTY_SERVER = UTF8BytesString.create("jetty-server");
-  public static final JettyDecorator DECORATE = new JettyDecorator();
-  public static final CharSequence SERVLET_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-  public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
-  public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
-  public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jetty"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JETTY_SERVER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Request> getter() {
-    return ExtractAdapter.Request.GETTER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Response> responseGetter() {
-    return ExtractAdapter.Response.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return SERVLET_REQUEST;
-  }
-
-  @Override
-  protected String method(final Request request) {
-    return request.getMethod();
-  }
-
-  @Override
-  protected URIDataAdapter url(final Request request) {
-    return new RequestURIDataAdapter(request);
-  }
-
-  @Override
-  protected String peerHostIP(final Request request) {
-    // Avoid Request.getRemoteAddr() since ForwardedRequestCustomizer (used by default in
-    // Dropwizard) overrides it with the value resolved from x-forwarded-for and similar
-    // proxy headers. Peer information must be the actual socket peer.
-    HttpChannel<?> channel = request.getHttpChannel();
-    if (channel != null) {
-      InetSocketAddress remote = channel.getRemoteAddress();
-      if (remote != null && remote.getAddress() != null) {
-        return remote.getAddress().getHostAddress();
-      }
+    public static final CharSequence JETTY_SERVER = UTF8BytesString.create("jetty-server");
+    public static final JettyDecorator DECORATE = new JettyDecorator();
+    public static final CharSequence SERVLET_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+    public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
+    public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
+    public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jetty"};
     }
-    return request.getRemoteAddr();
-  }
-
-  @Override
-  protected int peerPort(final Request request) {
-    HttpChannel<?> channel = request.getHttpChannel();
-    if (channel != null) {
-      InetSocketAddress remote = channel.getRemoteAddress();
-      if (remote != null) {
-        return remote.getPort();
-      }
+
+    @Override
+    protected CharSequence component() {
+        return JETTY_SERVER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Request> getter() {
+        return ExtractAdapter.Request.GETTER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Response> responseGetter() {
+        return ExtractAdapter.Response.GETTER;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return SERVLET_REQUEST;
+    }
+
+    @Override
+    protected String method(final Request request) {
+        return request.getMethod();
+    }
+
+    @Override
+    protected URIDataAdapter url(final Request request) {
+        return new RequestURIDataAdapter(request);
     }
-    return request.getRemotePort();
-  }
-
-  @Override
-  protected int status(final Response response) {
-    return response.getStatus();
-  }
-
-  @Override
-  protected boolean isAppSecOnResponseSeparate() {
-    return true;
-  }
-
-  @Override
-  protected String getRequestHeader(final Request request, String key) {
-    return request.getHeader(key);
-  }
-
-  public void onResponse(AgentSpan span, HttpChannel<?> channel) {
-    Request request = channel.getRequest();
-    Response response = channel.getResponse();
-    if (Config.get().isServletPrincipalEnabled() && request.getUserPrincipal() != null) {
-      span.setTag(DDTags.USER_NAME, request.getUserPrincipal().getName());
+
+    @Override
+    protected String peerHostIP(final Request request) {
+        // Avoid Request.getRemoteAddr() since ForwardedRequestCustomizer (used by default in
+        // Dropwizard) overrides it with the value resolved from x-forwarded-for and similar
+        // proxy headers. Peer information must be the actual socket peer.
+        HttpChannel<?> channel = request.getHttpChannel();
+        if (channel != null) {
+            InetSocketAddress remote = channel.getRemoteAddress();
+            if (remote != null && remote.getAddress() != null) {
+                return remote.getAddress().getHostAddress();
+            }
+        }
+        return request.getRemoteAddr();
+    }
+
+    @Override
+    protected int peerPort(final Request request) {
+        HttpChannel<?> channel = request.getHttpChannel();
+        if (channel != null) {
+            InetSocketAddress remote = channel.getRemoteAddress();
+            if (remote != null) {
+                return remote.getPort();
+            }
+        }
+        return request.getRemotePort();
     }
-    Object ex = request.getAttribute("javax.servlet.error.exception");
-    if (ex instanceof Throwable) {
-      Throwable throwable = (Throwable) ex;
-      if (throwable instanceof ServletException) {
-        throwable = ((ServletException) throwable).getRootCause();
-      }
-      onError(span, throwable);
+
+    @Override
+    protected int status(final Response response) {
+        return response.getStatus();
+    }
+
+    @Override
+    protected boolean isAppSecOnResponseSeparate() {
+        return true;
     }
-    super.onResponse(span, response);
-  }
 
-  @Override
-  protected BlockResponseFunction createBlockResponseFunction(Request request, Request connection) {
-    return new JettyBlockResponseFunction(request);
-  }
+    @Override
+    protected String getRequestHeader(final Request request, String key) {
+        return request.getHeader(key);
+    }
+
+    public void onResponse(AgentSpan span, HttpChannel<?> channel) {
+        Request request = channel.getRequest();
+        Response response = channel.getResponse();
+        if (Config.get().isServletPrincipalEnabled() && request.getUserPrincipal() != null) {
+            span.setTag(DDTags.USER_NAME, request.getUserPrincipal().getName());
+        }
+        Object ex = request.getAttribute("javax.servlet.error.exception");
+        if (ex instanceof Throwable) {
+            Throwable throwable = (Throwable) ex;
+            if (throwable instanceof ServletException) {
+                throwable = ((ServletException) throwable).getRootCause();
+            }
+            onError(span, throwable);
+        }
+        super.onResponse(span, response);
+    }
+
+    @Override
+    protected BlockResponseFunction createBlockResponseFunction(Request request, Request connection) {
+        return new JettyBlockResponseFunction(request);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java
index 67a6e85d9d4..b0858cd3c7b 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java
@@ -51,202 +51,199 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JettyServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice,
-        ExcludeFilterProvider {
-
-  public JettyServerInstrumentation() {
-    super("jetty");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "9_full_series";
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.HttpChannel";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".JettyDecorator",
-      packageName + ".RequestURIDataAdapter",
-      "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-    };
-  }
-
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new HttpChannelHandleVisitorWrapper());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        takesNoArguments()
-            .and(
-                named("handle")
-                    .or(
-                        // In 9.0.3 the handle logic was extracted out to "handle"
-                        // but we still want to instrument run in case handle is missing
-                        // (without the risk of double instrumenting).
-                        named("run").and(isDeclaredBy(not(declaresMethod(named("handle"))))))),
-        JettyServerInstrumentation.class.getName() + "$ContextTrackingAdvice",
-        JettyServerInstrumentation.class.getName() + "$HandleAdvice");
-    transformer.applyAdvice(
-        // name changed to recycle in 9.3.0
-        namedOneOf("reset", "recycle").and(takesNoArguments()),
-        JettyServerInstrumentation.class.getName() + "$ResetAdvice");
-
-    if (InstrumenterConfig.get().getAppSecActivation() != ProductActivation.FULLY_DISABLED) {
-      transformer.applyAdvice(
-          named("handleException").and(takesArguments(1)).and(takesArgument(0, Throwable.class)),
-          JettyServerInstrumentation.class.getName() + "$HandleExceptionAdvice");
+        implements Instrumenter.ForSingleType,
+                Instrumenter.HasTypeAdvice,
+                Instrumenter.HasMethodAdvice,
+                ExcludeFilterProvider {
+
+    public JettyServerInstrumentation() {
+        super("jetty");
     }
-  }
-
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    return Collections.singletonMap(
-        RUNNABLE,
-        Arrays.asList(
-            "org.eclipse.jetty.util.thread.strategy.ProduceConsume",
-            "org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume",
-            "org.eclipse.jetty.io.ManagedSelector",
-            "org.eclipse.jetty.util.thread.TimerScheduler",
-            "org.eclipse.jetty.util.thread.TimerScheduler$SimpleTask"));
-  }
-
-  public static class HttpChannelHandleVisitorWrapper implements AsmVisitorWrapper {
 
     @Override
-    public int mergeWriter(int flags) {
-      return flags | ClassWriter.COMPUTE_MAXS;
+    public String muzzleDirective() {
+        return "9_full_series";
     }
 
     @Override
-    public int mergeReader(int flags) {
-      return flags;
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.HttpChannel";
     }
 
     @Override
-    public ClassVisitor wrap(
-        TypeDescription instrumentedType,
-        ClassVisitor classVisitor,
-        Implementation.Context implementationContext,
-        TypePool typePool,
-        FieldList<FieldDescription.InDefinedShape> fields,
-        MethodList<?> methods,
-        int writerFlags,
-        int readerFlags) {
-      if (Config.get().getAppSecActivation() == ProductActivation.FULLY_DISABLED) {
-        return classVisitor;
-      }
-
-      return new HttpChannelHandleVisitor(Opcodes.ASM7, classVisitor);
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".JettyDecorator",
+            packageName + ".RequestURIDataAdapter",
+            "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+        };
     }
-  }
-
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextTrackingAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void extractParent(
-        @Advice.This final HttpChannel<?> channel,
-        @Advice.Local("parentScope") ContextScope parentScope) {
-      Request req = channel.getRequest();
-      if (req.getAttribute(DD_CONTEXT_ATTRIBUTE) instanceof Context) {
-        return; // skip re-entry: span already created for this request
-      }
-      final Context parentContext = DECORATE.extract(req);
-      req.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
-      parentScope = parentContext.attach();
+
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new HttpChannelHandleVisitorWrapper());
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeParentScope(@Advice.Local("parentScope") ContextScope parentScope) {
-      if (parentScope != null) parentScope.close();
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                takesNoArguments()
+                        .and(named("handle")
+                                .or(
+                                        // In 9.0.3 the handle logic was extracted out to "handle"
+                                        // but we still want to instrument run in case handle is missing
+                                        // (without the risk of double instrumenting).
+                                        named("run").and(isDeclaredBy(not(declaresMethod(named("handle"))))))),
+                JettyServerInstrumentation.class.getName() + "$ContextTrackingAdvice",
+                JettyServerInstrumentation.class.getName() + "$HandleAdvice");
+        transformer.applyAdvice(
+                // name changed to recycle in 9.3.0
+                namedOneOf("reset", "recycle").and(takesNoArguments()),
+                JettyServerInstrumentation.class.getName() + "$ResetAdvice");
+
+        if (InstrumenterConfig.get().getAppSecActivation() != ProductActivation.FULLY_DISABLED) {
+            transformer.applyAdvice(
+                    named("handleException").and(takesArguments(1)).and(takesArgument(0, Throwable.class)),
+                    JettyServerInstrumentation.class.getName() + "$HandleExceptionAdvice");
+        }
     }
-  }
-
-  public static class HandleAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.This final HttpChannel<?> channel, @Advice.Local("agentSpan") AgentSpan span) {
-      Request req = channel.getRequest();
-
-      Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (existingContext instanceof Context) {
-        return ((Context) existingContext).attach();
-      }
-
-      Object parentContextObj = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
-      Context parentContext =
-          (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
-      final Context context = DECORATE.startSpan(req, parentContext);
-      final ContextScope scope = context.attach();
-      span = spanFromContext(context);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, req, req, parentContext);
-
-      req.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
-      req.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
-      req.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
-      return scope;
+
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        return Collections.singletonMap(
+                RUNNABLE,
+                Arrays.asList(
+                        "org.eclipse.jetty.util.thread.strategy.ProduceConsume",
+                        "org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume",
+                        "org.eclipse.jetty.io.ManagedSelector",
+                        "org.eclipse.jetty.util.thread.TimerScheduler",
+                        "org.eclipse.jetty.util.thread.TimerScheduler$SimpleTask"));
+    }
+
+    public static class HttpChannelHandleVisitorWrapper implements AsmVisitorWrapper {
+
+        @Override
+        public int mergeWriter(int flags) {
+            return flags | ClassWriter.COMPUTE_MAXS;
+        }
+
+        @Override
+        public int mergeReader(int flags) {
+            return flags;
+        }
+
+        @Override
+        public ClassVisitor wrap(
+                TypeDescription instrumentedType,
+                ClassVisitor classVisitor,
+                Implementation.Context implementationContext,
+                TypePool typePool,
+                FieldList<FieldDescription.InDefinedShape> fields,
+                MethodList<?> methods,
+                int writerFlags,
+                int readerFlags) {
+            if (Config.get().getAppSecActivation() == ProductActivation.FULLY_DISABLED) {
+                return classVisitor;
+            }
+
+            return new HttpChannelHandleVisitor(Opcodes.ASM7, classVisitor);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      scope.close();
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextTrackingAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void extractParent(
+                @Advice.This final HttpChannel<?> channel, @Advice.Local("parentScope") ContextScope parentScope) {
+            Request req = channel.getRequest();
+            if (req.getAttribute(DD_CONTEXT_ATTRIBUTE) instanceof Context) {
+                return; // skip re-entry: span already created for this request
+            }
+            final Context parentContext = DECORATE.extract(req);
+            req.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
+            parentScope = parentContext.attach();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeParentScope(@Advice.Local("parentScope") ContextScope parentScope) {
+            if (parentScope != null) parentScope.close();
+        }
     }
-  }
-
-  /**
-   * Jetty ensures that connections are reset immediately after the response is sent. This provides
-   * a reliable point to finish the server span at the last possible moment.
-   */
-  public static class ResetAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void stopSpan(@Advice.This final HttpChannel<?> channel) {
-      Request req = channel.getRequest();
-      Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (contextObj instanceof Context) {
-        final Context context = (Context) contextObj;
-        final AgentSpan span = spanFromContext(context);
-        if (span != null) {
-          DECORATE.onResponse(span, channel);
-          DECORATE.beforeFinish(context);
-          span.finish();
+
+    public static class HandleAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.This final HttpChannel<?> channel, @Advice.Local("agentSpan") AgentSpan span) {
+            Request req = channel.getRequest();
+
+            Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (existingContext instanceof Context) {
+                return ((Context) existingContext).attach();
+            }
+
+            Object parentContextObj = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
+            Context parentContext = (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
+            final Context context = DECORATE.startSpan(req, parentContext);
+            final ContextScope scope = context.attach();
+            span = spanFromContext(context);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, req, req, parentContext);
+
+            req.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
+            req.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+            req.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+            return scope;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            scope.close();
         }
-      }
     }
 
-    private void muzzleCheck(HttpChannel<?> connection) {
-      connection.run();
+    /**
+     * Jetty ensures that connections are reset immediately after the response is sent. This provides
+     * a reliable point to finish the server span at the last possible moment.
+     */
+    public static class ResetAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void stopSpan(@Advice.This final HttpChannel<?> channel) {
+            Request req = channel.getRequest();
+            Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (contextObj instanceof Context) {
+                final Context context = (Context) contextObj;
+                final AgentSpan span = spanFromContext(context);
+                if (span != null) {
+                    DECORATE.onResponse(span, channel);
+                    DECORATE.beforeFinish(context);
+                    span.finish();
+                }
+            }
+        }
+
+        private void muzzleCheck(HttpChannel<?> connection) {
+            connection.run();
+        }
     }
-  }
-
-  static class HandleExceptionAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void enter(@Advice.Argument(0) Throwable t) {
-      if (!(t instanceof BlockingException)) {
-        return;
-      }
-
-      AgentSpan agentSpan = AgentTracer.activeSpan();
-      if (agentSpan == null) {
-        return;
-      }
-      JettyDecorator.DECORATE.onError(agentSpan, t);
+
+    static class HandleExceptionAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void enter(@Advice.Argument(0) Throwable t) {
+            if (!(t instanceof BlockingException)) {
+                return;
+            }
+
+            AgentSpan agentSpan = AgentTracer.activeSpan();
+            if (agentSpan == null) {
+                return;
+            }
+            JettyDecorator.DECORATE.onError(agentSpan, t);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java
index 996596c4008..4323330d7d8 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java
@@ -33,115 +33,112 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RequestInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public RequestInstrumentation() {
-    super("jetty");
-  }
+    public RequestInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "9_full_series";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "9_full_series";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.Request";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.Request";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("setContextPath").and(takesArgument(0, String.class)),
-        RequestInstrumentation.class.getName() + "$SetContextPathAdvice");
-    transformer.applyAdvice(
-        named("setServletPath").and(takesArgument(0, String.class)),
-        RequestInstrumentation.class.getName() + "$SetServletPathAdvice");
-    transformer.applyAdvice(
-        named("setRequestedSessionId").and(takesArgument(0, String.class)),
-        RequestInstrumentation.class.getName() + "$SetRequestedSessionIdAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("setContextPath").and(takesArgument(0, String.class)),
+                RequestInstrumentation.class.getName() + "$SetContextPathAdvice");
+        transformer.applyAdvice(
+                named("setServletPath").and(takesArgument(0, String.class)),
+                RequestInstrumentation.class.getName() + "$SetServletPathAdvice");
+        transformer.applyAdvice(
+                named("setRequestedSessionId").and(takesArgument(0, String.class)),
+                RequestInstrumentation.class.getName() + "$SetRequestedSessionIdAdvice");
+    }
 
-  /**
-   * Because we are processing the initial request before the contextPath is set, we must update it
-   * when it is actually set.
-   */
-  public static class SetContextPathAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void updateContextPath(
-        @Advice.This final Request req, @Advice.Argument(0) final String contextPath) {
-      if (contextPath != null) {
-        Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-        // Don't want to update while being dispatched to new servlet
-        if (contextObj instanceof Context && req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) == null) {
-          Context context = (Context) contextObj;
-          AgentSpan span = spanFromContext(context);
-          if (span != null) {
-            span.setTag(SERVLET_CONTEXT, contextPath);
-            req.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, contextPath);
-          }
+    /**
+     * Because we are processing the initial request before the contextPath is set, we must update it
+     * when it is actually set.
+     */
+    public static class SetContextPathAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void updateContextPath(
+                @Advice.This final Request req, @Advice.Argument(0) final String contextPath) {
+            if (contextPath != null) {
+                Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+                // Don't want to update while being dispatched to new servlet
+                if (contextObj instanceof Context && req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) == null) {
+                    Context context = (Context) contextObj;
+                    AgentSpan span = spanFromContext(context);
+                    if (span != null) {
+                        span.setTag(SERVLET_CONTEXT, contextPath);
+                        req.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, contextPath);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  /**
-   * Because we are processing the initial request before the servletPath is set, we must update it
-   * when it is actually set.
-   */
-  public static class SetServletPathAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void updateServletPath(
-        @Advice.This final Request req, @Advice.Argument(0) final String servletPath) {
-      if (servletPath != null && !servletPath.isEmpty()) { // bypass cleanup
-        Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-        // Don't want to update while being dispatched to new servlet
-        if (contextObj instanceof Context && req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) == null) {
-          Context context = (Context) contextObj;
-          AgentSpan span = spanFromContext(context);
-          if (span != null) {
-            span.setTag(SERVLET_PATH, servletPath);
-            req.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, servletPath);
-          }
+    /**
+     * Because we are processing the initial request before the servletPath is set, we must update it
+     * when it is actually set.
+     */
+    public static class SetServletPathAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void updateServletPath(
+                @Advice.This final Request req, @Advice.Argument(0) final String servletPath) {
+            if (servletPath != null && !servletPath.isEmpty()) { // bypass cleanup
+                Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+                // Don't want to update while being dispatched to new servlet
+                if (contextObj instanceof Context && req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE) == null) {
+                    Context context = (Context) contextObj;
+                    AgentSpan span = spanFromContext(context);
+                    if (span != null) {
+                        span.setTag(SERVLET_PATH, servletPath);
+                        req.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, servletPath);
+                    }
+                }
+            }
         }
-      }
-    }
 
-    private void muzzleCheck(
-        HttpChannel<?> connection, HttpServletRequest request, HttpFields fields) {
-      connection.run();
-      request.getContextPath();
-      fields.getField(0);
+        private void muzzleCheck(HttpChannel<?> connection, HttpServletRequest request, HttpFields fields) {
+            connection.run();
+            request.getContextPath();
+            fields.getField(0);
+        }
     }
-  }
 
-  /**
-   * Because we are processing the initial request before the requestedSessionId is set, we must
-   * update it when it is actually set.
-   */
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class SetRequestedSessionIdAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void updateContextPath(
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Argument(0) final String requestedSessionId) {
-      if (requestedSessionId != null && reqCtx != null) {
-        final CallbackProvider cbp =
-            AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-        if (cbp == null) {
-          return;
-        }
-        final BiFunction<RequestContext, String, Flow<Void>> addrCallback =
-            cbp.getCallback(EVENTS.requestSession());
-        if (addrCallback == null) {
-          return;
-        }
-        final Flow<Void> flow = addrCallback.apply(reqCtx, requestedSessionId);
-        Flow.Action action = flow.getAction();
-        if (action instanceof Flow.Action.RequestBlockingAction) {
-          throw new BlockingException("Blocked request (for sessionId)");
+    /**
+     * Because we are processing the initial request before the requestedSessionId is set, we must
+     * update it when it is actually set.
+     */
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class SetRequestedSessionIdAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void updateContextPath(
+                @ActiveRequestContext RequestContext reqCtx, @Advice.Argument(0) final String requestedSessionId) {
+            if (requestedSessionId != null && reqCtx != null) {
+                final CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+                if (cbp == null) {
+                    return;
+                }
+                final BiFunction<RequestContext, String, Flow<Void>> addrCallback =
+                        cbp.getCallback(EVENTS.requestSession());
+                if (addrCallback == null) {
+                    return;
+                }
+                final Flow<Void> flow = addrCallback.apply(reqCtx, requestedSessionId);
+                Flow.Action action = flow.getAction();
+                if (action instanceof Flow.Action.RequestBlockingAction) {
+                    throw new BlockingException("Blocked request (for sessionId)");
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/RequestURIDataAdapter.java
index d5eb021e917..cf995d903dd 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/RequestURIDataAdapter.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/RequestURIDataAdapter.java
@@ -5,39 +5,39 @@
 
 public final class RequestURIDataAdapter extends URIRawDataAdapter {
 
-  private final Request request;
-
-  public RequestURIDataAdapter(Request request) {
-    this.request = request;
-  }
-
-  @Override
-  public String scheme() {
-    return request.getScheme();
-  }
-
-  @Override
-  public String host() {
-    return request.getServerName();
-  }
-
-  @Override
-  public int port() {
-    return request.getServerPort();
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return request.getRequestURI();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return request.getQueryString();
-  }
+    private final Request request;
+
+    public RequestURIDataAdapter(Request request) {
+        this.request = request;
+    }
+
+    @Override
+    public String scheme() {
+        return request.getScheme();
+    }
+
+    @Override
+    public String host() {
+        return request.getServerName();
+    }
+
+    @Override
+    public int port() {
+        return request.getServerPort();
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return request.getRequestURI();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return request.getQueryString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/ServerHandleInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/ServerHandleInstrumentation.java
index 113bfa54151..44a2d5063f1 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/ServerHandleInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/ServerHandleInstrumentation.java
@@ -30,125 +30,125 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ServerHandleInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ServerHandleInstrumentation() {
-    super("jetty");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "9_full_series";
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.Server";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".JettyDecorator",
-      packageName + ".RequestURIDataAdapter",
-      "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("handle")
-            .or(named("handleAsync"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("org.eclipse.jetty.server.HttpChannel"))),
-        ServerHandleInstrumentation.class.getName() + "$HandleAdvice");
-  }
-
-  static class HandleAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static ContextScope onEnter(
-        @Advice.Argument(0) HttpChannel<?> channel,
-        @Advice.Local("agentSpan") AgentSpan span,
-        @Advice.Local("request") Request req) {
-      req = channel.getRequest();
-
-      // First check if there's an existing context in the request (from main server span)
-      Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-
-      // same logic as in Servlet3Advice. We need to activate/finish the dispatch span here
-      // because we don't know if a servlet is going to be called and therefore whether
-      // Servlet3Advice will have an opportunity to run.
-      // If there is no servlet involved, the span would not be finished.
-
-      Object dispatchSpan;
-      synchronized (req) {
-        // see AsyncContextInstrumentation on the servlet instrumentation for the creation
-        // of this dispatch span.
-        // Unfortunately, not all jetty dispatches are detected by the servlet
-        // instrumentation, like internal error dispatches
-        dispatchSpan = req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
-      }
-      if (dispatchSpan instanceof AgentSpan) {
-        // this is not great, but we leave the attribute. This is because
-        // Set{Servlet,Context}PathAdvice
-        // looks for this attribute, and we need a way to tell Servlet3Advice not to activate
-        // the root span, stored in DD_CONTEXT_ATTRIBUTE.
-        // req.removeAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
-        span = (AgentSpan) dispatchSpan;
-
-        // If we have an existing context, create a new context with the dispatch span
-        // Otherwise just attach the dispatch span
-        if (existingContext instanceof Context) {
-          Context contextWithDispatchSpan = ((Context) existingContext).with(span);
-          return contextWithDispatchSpan.attach();
-        } else {
-          return span.attach();
-        }
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ServerHandleInstrumentation() {
+        super("jetty");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "9_full_series";
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.Server";
+    }
 
-      return null;
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".JettyDecorator",
+            packageName + ".RequestURIDataAdapter",
+            "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+        };
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Local("request") Request req,
-        @Advice.Local("agentSpan") AgentSpan span,
-        @Advice.Thrown Throwable t) {
-      if (scope == null) {
-        return;
-      }
-
-      boolean registeredFinishListener;
-      synchronized (req) {
-        req.removeAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
-        // the async finish listener may not have been registered. The listener
-        // is not registered upon dispatch to avoid ConcurrentModificationException
-        // (see AsyncContextInstrumentation), only when the dispatch is handled
-        // (see Servlet3Advice).
-        // However, it's possible that the dispatch never passes through servlets,
-        // so the listener is never registered. In that case, we handle the dispatch
-        // finish here (the reason we cannot handle dispatch finish solely here is
-        // because we can't detect async timeouts here)
-        registeredFinishListener = req.getAttribute(DD_FIN_DISP_LIST_SPAN_ATTRIBUTE) != null;
-      }
-
-      if (t != null) {
-        DECORATE.onError(span, t);
-      }
-      if (!(req.isAsyncStarted() && registeredFinishListener)) {
-        // finish will be handled by the async listener
-        // Use the full context from the scope for beforeFinish
-        DECORATE.beforeFinish(scope.context());
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("handle")
+                        .or(named("handleAsync"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("org.eclipse.jetty.server.HttpChannel"))),
+                ServerHandleInstrumentation.class.getName() + "$HandleAdvice");
+    }
+
+    static class HandleAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static ContextScope onEnter(
+                @Advice.Argument(0) HttpChannel<?> channel,
+                @Advice.Local("agentSpan") AgentSpan span,
+                @Advice.Local("request") Request req) {
+            req = channel.getRequest();
+
+            // First check if there's an existing context in the request (from main server span)
+            Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+
+            // same logic as in Servlet3Advice. We need to activate/finish the dispatch span here
+            // because we don't know if a servlet is going to be called and therefore whether
+            // Servlet3Advice will have an opportunity to run.
+            // If there is no servlet involved, the span would not be finished.
+
+            Object dispatchSpan;
+            synchronized (req) {
+                // see AsyncContextInstrumentation on the servlet instrumentation for the creation
+                // of this dispatch span.
+                // Unfortunately, not all jetty dispatches are detected by the servlet
+                // instrumentation, like internal error dispatches
+                dispatchSpan = req.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
+            }
+            if (dispatchSpan instanceof AgentSpan) {
+                // this is not great, but we leave the attribute. This is because
+                // Set{Servlet,Context}PathAdvice
+                // looks for this attribute, and we need a way to tell Servlet3Advice not to activate
+                // the root span, stored in DD_CONTEXT_ATTRIBUTE.
+                // req.removeAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
+                span = (AgentSpan) dispatchSpan;
+
+                // If we have an existing context, create a new context with the dispatch span
+                // Otherwise just attach the dispatch span
+                if (existingContext instanceof Context) {
+                    Context contextWithDispatchSpan = ((Context) existingContext).with(span);
+                    return contextWithDispatchSpan.attach();
+                } else {
+                    return span.attach();
+                }
+            }
+
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Local("request") Request req,
+                @Advice.Local("agentSpan") AgentSpan span,
+                @Advice.Thrown Throwable t) {
+            if (scope == null) {
+                return;
+            }
+
+            boolean registeredFinishListener;
+            synchronized (req) {
+                req.removeAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
+                // the async finish listener may not have been registered. The listener
+                // is not registered upon dispatch to avoid ConcurrentModificationException
+                // (see AsyncContextInstrumentation), only when the dispatch is handled
+                // (see Servlet3Advice).
+                // However, it's possible that the dispatch never passes through servlets,
+                // so the listener is never registered. In that case, we handle the dispatch
+                // finish here (the reason we cannot handle dispatch finish solely here is
+                // because we can't detect async timeouts here)
+                registeredFinishListener = req.getAttribute(DD_FIN_DISP_LIST_SPAN_ATTRIBUTE) != null;
+            }
+
+            if (t != null) {
+                DECORATE.onError(span, t);
+            }
+            if (!(req.isAsyncStarted() && registeredFinishListener)) {
+                // finish will be handled by the async listener
+                // Use the full context from the scope for beforeFinish
+                DECORATE.beforeFinish(scope.context());
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/WebSocketSessionInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/WebSocketSessionInstrumentation.java
index 449aa1c125f..23bc972b5e4 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/WebSocketSessionInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/WebSocketSessionInstrumentation.java
@@ -20,75 +20,72 @@
 
 @AutoService(InstrumenterModule.class)
 public class WebSocketSessionInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public WebSocketSessionInstrumentation() {
-    super("jetty", "jetty-websocket", "websocket");
-  }
+    public WebSocketSessionInstrumentation() {
+        super("jetty", "jetty-websocket", "websocket");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.websocket.common.WebSocketSession";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.websocket.common.WebSocketSession";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "javax.websocket.Session",
-        "datadog.trace.bootstrap.instrumentation.websocket.HandlerContext$Sender");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(
+                "javax.websocket.Session", "datadog.trace.bootstrap.instrumentation.websocket.HandlerContext$Sender");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jetty-websocket";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jetty-websocket";
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("org.eclipse.jetty.websocket.jsr356.JsrSession");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("org.eclipse.jetty.websocket.jsr356.JsrSession");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isWebsocketTracingEnabled();
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isWebsocketTracingEnabled();
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("close").and(takesNoArguments()), getClass().getName() + "$CloseAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("close").and(takesNoArguments()), getClass().getName() + "$CloseAdvice");
+    }
 
-  public static class CloseAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(
-        @Advice.This final Object session,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
+    public static class CloseAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(
+                @Advice.This final Object session,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
 
-      // that class is not implementing javax.websocket.Session but hides the close() method
-      // hence we need an ad hoc advice
-      handlerContext =
-          (HandlerContext.Sender)
-              InstrumentationContext.get(
-                      "javax.websocket.Session",
-                      "datadog.trace.bootstrap.instrumentation.websocket.HandlerContext$Sender")
-                  .remove(session);
-      if (handlerContext == null) {
-        return null;
-      }
-      return activateSpan(DECORATE.startOutboundCloseSpan(handlerContext, null, 1000));
-    }
+            // that class is not implementing javax.websocket.Session but hides the close() method
+            // hence we need an ad hoc advice
+            handlerContext = (HandlerContext.Sender) InstrumentationContext.get(
+                            "javax.websocket.Session",
+                            "datadog.trace.bootstrap.instrumentation.websocket.HandlerContext$Sender")
+                    .remove(session);
+            if (handlerContext == null) {
+                return null;
+            }
+            return activateSpan(DECORATE.startOutboundCloseSpan(handlerContext, null, 1000));
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable thrown,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
-      if (scope != null) {
-        DECORATE.onError(scope, thrown);
-        DECORATE.onFrameEnd(handlerContext);
-        scope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable thrown,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
+            if (scope != null) {
+                DECORATE.onError(scope, thrown);
+                DECORATE.onFrameEnd(handlerContext);
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseHelper.java
index 9eb5a286891..8dc47b82985 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseHelper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseHelper.java
@@ -22,74 +22,73 @@
 import org.slf4j.LoggerFactory;
 
 public class JettyCommitResponseHelper {
-  private static final Logger log = LoggerFactory.getLogger(JettyCommitResponseHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(JettyCommitResponseHelper.class);
 
-  public static boolean /* skip */ before(
-      HttpChannel connection,
-      MetaData.Response metaDataResponse /* nullable */,
-      HttpTransport transport,
-      AtomicBoolean _committed,
-      Callback cb) {
-    if (metaDataResponse == null) {
-      metaDataResponse = newMetaDataResponse(connection.getResponse());
-      if (metaDataResponse == null) {
-        return false;
-      }
-    }
+    public static boolean /* skip */ before(
+            HttpChannel connection,
+            MetaData.Response metaDataResponse /* nullable */,
+            HttpTransport transport,
+            AtomicBoolean _committed,
+            Callback cb) {
+        if (metaDataResponse == null) {
+            metaDataResponse = newMetaDataResponse(connection.getResponse());
+            if (metaDataResponse == null) {
+                return false;
+            }
+        }
 
-    if (metaDataResponse.getStatus() == 100) {
-      return false;
-    }
-    boolean wasCommitted = !_committed.compareAndSet(false, true);
-    if (wasCommitted) {
-      return false;
-    }
+        if (metaDataResponse.getStatus() == 100) {
+            return false;
+        }
+        boolean wasCommitted = !_committed.compareAndSet(false, true);
+        if (wasCommitted) {
+            return false;
+        }
 
-    // henceforth we need to reset _committed to false when we don't want to skip the body
+        // henceforth we need to reset _committed to false when we don't want to skip the body
 
-    Request req = connection.getRequest();
+        Request req = connection.getRequest();
 
-    Object contextObj;
-    Context context;
-    AgentSpan span;
-    RequestContext requestContext;
-    if (req.getAttribute(DD_IGNORE_COMMIT_ATTRIBUTE) != null
-        || !((contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE)) instanceof Context)
-        || (span = AgentSpan.fromContext(context = (Context) contextObj)) == null
-        || (requestContext = span.getRequestContext()) == null) {
-      _committed.set(false);
-      return false;
-    }
+        Object contextObj;
+        Context context;
+        AgentSpan span;
+        RequestContext requestContext;
+        if (req.getAttribute(DD_IGNORE_COMMIT_ATTRIBUTE) != null
+                || !((contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE)) instanceof Context)
+                || (span = AgentSpan.fromContext(context = (Context) contextObj)) == null
+                || (requestContext = span.getRequestContext()) == null) {
+            _committed.set(false);
+            return false;
+        }
 
-    Response resp = connection.getResponse();
-    Flow<Void> flow =
-        DECORATE.callIGCallbackResponseAndHeaders(
-            span, resp, resp.getStatus(), ExtractAdapter.Response.GETTER);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      _committed.set(false);
-      boolean success = JettyOnCommitBlockingHelper.block(connection, transport, rba, cb);
-      if (success) {
-        _committed.set(true);
-        requestContext.getTraceSegment().effectivelyBlocked();
-        return true;
-      }
-    }
+        Response resp = connection.getResponse();
+        Flow<Void> flow =
+                DECORATE.callIGCallbackResponseAndHeaders(span, resp, resp.getStatus(), ExtractAdapter.Response.GETTER);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            _committed.set(false);
+            boolean success = JettyOnCommitBlockingHelper.block(connection, transport, rba, cb);
+            if (success) {
+                _committed.set(true);
+                requestContext.getTraceSegment().effectivelyBlocked();
+                return true;
+            }
+        }
 
-    _committed.set(false);
-    return false;
-  }
+        _committed.set(false);
+        return false;
+    }
 
-  private static MetaData.Response newMetaDataResponse(Response resp) {
-    Method newMetaDataResponse;
-    try {
-      newMetaDataResponse = Response.class.getDeclaredMethod("newResponseMetaData");
-      newMetaDataResponse.setAccessible(true);
-      return (MetaData.Response) newMetaDataResponse.invoke(resp);
-    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-      log.debug("Failed creating new MetaData.Response", e);
-      return null;
+    private static MetaData.Response newMetaDataResponse(Response resp) {
+        Method newMetaDataResponse;
+        try {
+            newMetaDataResponse = Response.class.getDeclaredMethod("newResponseMetaData");
+            newMetaDataResponse.setAccessible(true);
+            return (MetaData.Response) newMetaDataResponse.invoke(resp);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            log.debug("Failed creating new MetaData.Response", e);
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseInstrumentation.java
index 61ea4856ffe..272450d6c3c 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseInstrumentation.java
@@ -11,86 +11,86 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JettyCommitResponseInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JettyCommitResponseInstrumentation() {
-    super("jetty");
-  }
+    public JettyCommitResponseInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      new Reference.Builder("org.eclipse.jetty.server.HttpChannel")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
-              "sendResponse",
-              "Z",
-              "Lorg/eclipse/jetty/http/MetaData$Response;",
-              "Ljava/nio/ByteBuffer;",
-              "Z",
-              "Lorg/eclipse/jetty/util/Callback;")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
-              "commit",
-              "V",
-              "Lorg/eclipse/jetty/http/MetaData$Response;")
-          .withField(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC,
-              "_committed",
-              "Ljava/util/concurrent/atomic/AtomicBoolean;")
-          .withField(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC,
-              "_transport",
-              "Lorg/eclipse/jetty/server/HttpTransport;")
-          .build(),
-      new Reference.Builder("org.eclipse.jetty.server.Response")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
-              "newResponseMetaData",
-              "Lorg/eclipse/jetty/http/MetaData$Response;")
-          .build(),
-      new Reference.Builder("org.eclipse.jetty.server.HttpOutput")
-          .withMethod(new String[0], Reference.EXPECTS_NON_STATIC, "closed", "V")
-          .build(),
-    };
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            new Reference.Builder("org.eclipse.jetty.server.HttpChannel")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
+                            "sendResponse",
+                            "Z",
+                            "Lorg/eclipse/jetty/http/MetaData$Response;",
+                            "Ljava/nio/ByteBuffer;",
+                            "Z",
+                            "Lorg/eclipse/jetty/util/Callback;")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
+                            "commit",
+                            "V",
+                            "Lorg/eclipse/jetty/http/MetaData$Response;")
+                    .withField(
+                            new String[0],
+                            Reference.EXPECTS_NON_STATIC,
+                            "_committed",
+                            "Ljava/util/concurrent/atomic/AtomicBoolean;")
+                    .withField(
+                            new String[0],
+                            Reference.EXPECTS_NON_STATIC,
+                            "_transport",
+                            "Lorg/eclipse/jetty/server/HttpTransport;")
+                    .build(),
+            new Reference.Builder("org.eclipse.jetty.server.Response")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
+                            "newResponseMetaData",
+                            "Lorg/eclipse/jetty/http/MetaData$Response;")
+                    .build(),
+            new Reference.Builder("org.eclipse.jetty.server.HttpOutput")
+                    .withMethod(new String[0], Reference.EXPECTS_NON_STATIC, "closed", "V")
+                    .build(),
+        };
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.HttpChannel";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.HttpChannel";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    String pkg9 = "datadog.trace.instrumentation.jetty9";
-    return new String[] {
-      pkg9 + ".ExtractAdapter",
-      pkg9 + ".ExtractAdapter$Request",
-      pkg9 + ".ExtractAdapter$Response",
-      pkg9 + ".JettyDecorator",
-      pkg9 + ".RequestURIDataAdapter",
-      "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-      packageName + ".JettyCommitResponseHelper",
-      packageName + ".JettyOnCommitBlockingHelper",
-      packageName + ".JettyOnCommitBlockingHelper$CloseCallback",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        String pkg9 = "datadog.trace.instrumentation.jetty9";
+        return new String[] {
+            pkg9 + ".ExtractAdapter",
+            pkg9 + ".ExtractAdapter$Request",
+            pkg9 + ".ExtractAdapter$Response",
+            pkg9 + ".JettyDecorator",
+            pkg9 + ".RequestURIDataAdapter",
+            "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+            packageName + ".JettyCommitResponseHelper",
+            packageName + ".JettyOnCommitBlockingHelper",
+            packageName + ".JettyOnCommitBlockingHelper$CloseCallback",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("sendResponse")
-            .and(takesArguments(4))
-            .and(takesArgument(0, named("org.eclipse.jetty.http.MetaData$Response")))
-            .and(takesArgument(1, named("java.nio.ByteBuffer")))
-            .and(takesArgument(2, boolean.class))
-            .and(takesArgument(3, named("org.eclipse.jetty.util.Callback"))),
-        packageName + ".SendResponseCbAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("sendResponse")
+                        .and(takesArguments(4))
+                        .and(takesArgument(0, named("org.eclipse.jetty.http.MetaData$Response")))
+                        .and(takesArgument(1, named("java.nio.ByteBuffer")))
+                        .and(takesArgument(2, boolean.class))
+                        .and(takesArgument(3, named("org.eclipse.jetty.util.Callback"))),
+                packageName + ".SendResponseCbAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/JettyOnCommitBlockingHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/JettyOnCommitBlockingHelper.java
index c12168089f7..e3ad5eb8063 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/JettyOnCommitBlockingHelper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/JettyOnCommitBlockingHelper.java
@@ -23,135 +23,129 @@
 
 public class JettyOnCommitBlockingHelper {
 
-  private static final Logger log = LoggerFactory.getLogger(JettyOnCommitBlockingHelper.class);
-  private static final ByteBuffer EMPTY_BB = ByteBuffer.allocate(0);
-
-  public static boolean block(
-      HttpChannel channel,
-      HttpTransport transport,
-      Flow.Action.RequestBlockingAction rba,
-      Callback cb) {
-    if (!CloseCallback.isInitialized()) {
-      return false;
-    }
+    private static final Logger log = LoggerFactory.getLogger(JettyOnCommitBlockingHelper.class);
+    private static final ByteBuffer EMPTY_BB = ByteBuffer.allocate(0);
 
-    Request request = channel.getRequest();
-    Response response = channel.getResponse();
-    request.setAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE, Boolean.TRUE);
-
-    try {
-      int statusCode = BlockingActionHelper.getHttpCode(rba.getStatusCode());
-
-      String acceptHeader = request.getHeader("Accept");
-      HttpFields fields = new HttpFields();
-      for (Map.Entry<String, String> e : rba.getExtraHeaders().entrySet()) {
-        fields.put(e.getKey(), e.getValue());
-      }
-
-      BlockingContentType bct = rba.getBlockingContentType();
-      MetaData.Response info;
-      Callback closeCb = new CloseCallback(cb, channel);
-      if (bct != BlockingContentType.NONE && !request.isHead()) {
-        BlockingActionHelper.TemplateType type =
-            BlockingActionHelper.determineTemplateType(bct, acceptHeader);
-        fields.put("Content-type", BlockingActionHelper.getContentType(type));
-        byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
-        fields.put("Content-length", Integer.toString(template.length));
-
-        info = new MetaData.Response(request.getHttpVersion(), statusCode, fields, template.length);
-        if (!commit(channel, info)) {
-          return false;
+    public static boolean block(
+            HttpChannel channel, HttpTransport transport, Flow.Action.RequestBlockingAction rba, Callback cb) {
+        if (!CloseCallback.isInitialized()) {
+            return false;
         }
 
-        // we need to update the upper layers too
-        // so that the correct status code/headers get reported correctly on the span`
-        response.reset();
-        response.setStatus(statusCode);
-        response.setContentType(BlockingActionHelper.getContentType(type));
-        response.setContentLength(template.length);
-
-        log.debug("Sending blocking response (non-empty body)");
-        transport.send(info, false, ByteBuffer.wrap(template), true, closeCb);
-      } else {
-        info = new MetaData.Response(request.getHttpVersion(), statusCode, fields);
-
-        response.reset();
-        response.setStatus(statusCode);
-
-        transport.send(info, request.isHead(), EMPTY_BB, true, closeCb);
-      }
-    } catch (Exception x) {
-      log.warn("Error committing blocking response", x);
-      return false;
-    }
-    return true;
-  }
-
-  private static boolean commit(HttpChannel channel, MetaData.Response info) {
-    try {
-      Method commit = HttpChannel.class.getDeclaredMethod("commit", MetaData.Response.class);
-      commit.setAccessible(true);
-      commit.invoke(channel, info);
-    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-      log.warn("Failed calling commit(MetaData.Response) when writing blocking response", e);
-      return false;
-    }
-    return true;
-  }
-
-  public static final class CloseCallback implements Callback {
-    private static final Logger log = LoggerFactory.getLogger(CloseCallback.class);
-    private static final MethodHandle CLOSED;
-    private final Callback delegate;
-    private final HttpChannel channel;
-
-    static {
-      MethodHandle mh = null;
-      try {
-        Method closed = HttpOutput.class.getDeclaredMethod("closed");
-        closed.setAccessible(true);
-        mh = MethodHandles.lookup().unreflect(closed);
-      } catch (NoSuchMethodException | IllegalAccessException e) {
-        log.warn(
-            "Could not find HttpOutput#closed(). " + "Blocking for responses will not be available",
-            e);
-      }
-      CLOSED = mh;
+        Request request = channel.getRequest();
+        Response response = channel.getResponse();
+        request.setAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE, Boolean.TRUE);
+
+        try {
+            int statusCode = BlockingActionHelper.getHttpCode(rba.getStatusCode());
+
+            String acceptHeader = request.getHeader("Accept");
+            HttpFields fields = new HttpFields();
+            for (Map.Entry<String, String> e : rba.getExtraHeaders().entrySet()) {
+                fields.put(e.getKey(), e.getValue());
+            }
+
+            BlockingContentType bct = rba.getBlockingContentType();
+            MetaData.Response info;
+            Callback closeCb = new CloseCallback(cb, channel);
+            if (bct != BlockingContentType.NONE && !request.isHead()) {
+                BlockingActionHelper.TemplateType type = BlockingActionHelper.determineTemplateType(bct, acceptHeader);
+                fields.put("Content-type", BlockingActionHelper.getContentType(type));
+                byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
+                fields.put("Content-length", Integer.toString(template.length));
+
+                info = new MetaData.Response(request.getHttpVersion(), statusCode, fields, template.length);
+                if (!commit(channel, info)) {
+                    return false;
+                }
+
+                // we need to update the upper layers too
+                // so that the correct status code/headers get reported correctly on the span`
+                response.reset();
+                response.setStatus(statusCode);
+                response.setContentType(BlockingActionHelper.getContentType(type));
+                response.setContentLength(template.length);
+
+                log.debug("Sending blocking response (non-empty body)");
+                transport.send(info, false, ByteBuffer.wrap(template), true, closeCb);
+            } else {
+                info = new MetaData.Response(request.getHttpVersion(), statusCode, fields);
+
+                response.reset();
+                response.setStatus(statusCode);
+
+                transport.send(info, request.isHead(), EMPTY_BB, true, closeCb);
+            }
+        } catch (Exception x) {
+            log.warn("Error committing blocking response", x);
+            return false;
+        }
+        return true;
     }
 
-    public static boolean isInitialized() {
-      return CLOSED != null;
+    private static boolean commit(HttpChannel channel, MetaData.Response info) {
+        try {
+            Method commit = HttpChannel.class.getDeclaredMethod("commit", MetaData.Response.class);
+            commit.setAccessible(true);
+            commit.invoke(channel, info);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            log.warn("Failed calling commit(MetaData.Response) when writing blocking response", e);
+            return false;
+        }
+        return true;
     }
 
-    public CloseCallback(Callback delegate, HttpChannel channel) {
-      this.delegate = delegate;
-      this.channel = channel;
-    }
+    public static final class CloseCallback implements Callback {
+        private static final Logger log = LoggerFactory.getLogger(CloseCallback.class);
+        private static final MethodHandle CLOSED;
+        private final Callback delegate;
+        private final HttpChannel channel;
+
+        static {
+            MethodHandle mh = null;
+            try {
+                Method closed = HttpOutput.class.getDeclaredMethod("closed");
+                closed.setAccessible(true);
+                mh = MethodHandles.lookup().unreflect(closed);
+            } catch (NoSuchMethodException | IllegalAccessException e) {
+                log.warn("Could not find HttpOutput#closed(). " + "Blocking for responses will not be available", e);
+            }
+            CLOSED = mh;
+        }
 
-    private void close() {
-      closed(channel.getResponse().getHttpOutput());
-      channel.getEndPoint().close();
-    }
+        public static boolean isInitialized() {
+            return CLOSED != null;
+        }
 
-    private void closed(HttpOutput httpOutput) {
-      try {
-        CLOSED.invoke(httpOutput);
-      } catch (Throwable e) {
-        log.debug("Error invoked closed()", e);
-      }
-    }
+        public CloseCallback(Callback delegate, HttpChannel channel) {
+            this.delegate = delegate;
+            this.channel = channel;
+        }
 
-    @Override
-    public void succeeded() {
-      close();
-      delegate.succeeded();
-    }
+        private void close() {
+            closed(channel.getResponse().getHttpOutput());
+            channel.getEndPoint().close();
+        }
 
-    @Override
-    public void failed(final Throwable x) {
-      log.debug("Exception sending blocking response", x);
-      close();
-      delegate.failed(x);
+        private void closed(HttpOutput httpOutput) {
+            try {
+                CLOSED.invoke(httpOutput);
+            } catch (Throwable e) {
+                log.debug("Error invoked closed()", e);
+            }
+        }
+
+        @Override
+        public void succeeded() {
+            close();
+            delegate.succeeded();
+        }
+
+        @Override
+        public void failed(final Throwable x) {
+            log.debug("Exception sending blocking response", x);
+            close();
+            delegate.failed(x);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/SendResponseCbAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/SendResponseCbAdvice.java
index 2954ae988d4..9e9f5a517cc 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/SendResponseCbAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/SendResponseCbAdvice.java
@@ -8,13 +8,13 @@
 import org.eclipse.jetty.util.Callback;
 
 public class SendResponseCbAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-  public static boolean /* skip */ before(
-      @Advice.This HttpChannel connection,
-      @Advice.Argument(0) MetaData.Response responseInfo,
-      @Advice.Argument(3) Callback cb,
-      @Advice.FieldValue("_committed") AtomicBoolean _committed,
-      @Advice.FieldValue("_transport") HttpTransport _transport) {
-    return JettyCommitResponseHelper.before(connection, responseInfo, _transport, _committed, cb);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+    public static boolean /* skip */ before(
+            @Advice.This HttpChannel connection,
+            @Advice.Argument(0) MetaData.Response responseInfo,
+            @Advice.Argument(3) Callback cb,
+            @Advice.FieldValue("_committed") AtomicBoolean _committed,
+            @Advice.FieldValue("_transport") HttpTransport _transport) {
+        return JettyCommitResponseHelper.before(connection, responseInfo, _transport, _committed, cb);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseHelper.java
index c51be7f1b20..c0bd8be13e1 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseHelper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseHelper.java
@@ -22,75 +22,74 @@
 import org.slf4j.LoggerFactory;
 
 public class JettyCommitResponseHelper {
-  private static final Logger log = LoggerFactory.getLogger(JettyCommitResponseHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(JettyCommitResponseHelper.class);
 
-  public static boolean /* skip */ before(
-      HttpChannel connection,
-      MetaData.Response metaDataResponse /* nullable */,
-      HttpTransport transport,
-      Callback cb) {
+    public static boolean /* skip */ before(
+            HttpChannel connection,
+            MetaData.Response metaDataResponse /* nullable */,
+            HttpTransport transport,
+            Callback cb) {
 
-    HttpChannelState state = connection.getState();
-    boolean committing = state.commitResponse();
-    if (!committing) {
-      return false;
-    }
-    // henceforth we need to reset the state
+        HttpChannelState state = connection.getState();
+        boolean committing = state.commitResponse();
+        if (!committing) {
+            return false;
+        }
+        // henceforth we need to reset the state
 
-    if (metaDataResponse == null) {
-      metaDataResponse = newMetaDataResponse(connection.getResponse());
-      if (metaDataResponse == null) {
-        state.partialResponse();
-        return false;
-      }
-    }
+        if (metaDataResponse == null) {
+            metaDataResponse = newMetaDataResponse(connection.getResponse());
+            if (metaDataResponse == null) {
+                state.partialResponse();
+                return false;
+            }
+        }
 
-    if (metaDataResponse.getStatus() >= 100 && metaDataResponse.getStatus() < 200) {
-      state.partialResponse();
-      return false;
-    }
+        if (metaDataResponse.getStatus() >= 100 && metaDataResponse.getStatus() < 200) {
+            state.partialResponse();
+            return false;
+        }
 
-    Request req = connection.getRequest();
+        Request req = connection.getRequest();
 
-    Object contextObj;
-    Context context;
-    AgentSpan span;
-    RequestContext requestContext;
-    if (req.getAttribute(DD_IGNORE_COMMIT_ATTRIBUTE) != null
-        || !((contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE)) instanceof Context)
-        || (span = AgentSpan.fromContext(context = (Context) contextObj)) == null
-        || (requestContext = span.getRequestContext()) == null) {
-      state.partialResponse();
-      return false;
-    }
+        Object contextObj;
+        Context context;
+        AgentSpan span;
+        RequestContext requestContext;
+        if (req.getAttribute(DD_IGNORE_COMMIT_ATTRIBUTE) != null
+                || !((contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE)) instanceof Context)
+                || (span = AgentSpan.fromContext(context = (Context) contextObj)) == null
+                || (requestContext = span.getRequestContext()) == null) {
+            state.partialResponse();
+            return false;
+        }
 
-    Response resp = connection.getResponse();
-    Flow<Void> flow =
-        DECORATE.callIGCallbackResponseAndHeaders(
-            span, resp, resp.getStatus(), ExtractAdapter.Response.GETTER);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      boolean success = JettyOnCommitBlockingHelper.block(connection, transport, rba, cb);
-      if (success) {
-        requestContext.getTraceSegment().effectivelyBlocked();
-        return true;
-      }
-    }
+        Response resp = connection.getResponse();
+        Flow<Void> flow =
+                DECORATE.callIGCallbackResponseAndHeaders(span, resp, resp.getStatus(), ExtractAdapter.Response.GETTER);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            boolean success = JettyOnCommitBlockingHelper.block(connection, transport, rba, cb);
+            if (success) {
+                requestContext.getTraceSegment().effectivelyBlocked();
+                return true;
+            }
+        }
 
-    state.partialResponse();
-    return false;
-  }
+        state.partialResponse();
+        return false;
+    }
 
-  private static MetaData.Response newMetaDataResponse(Response resp) {
-    Method newMetaDataResponse;
-    try {
-      newMetaDataResponse = Response.class.getDeclaredMethod("newResponseMetaData");
-      newMetaDataResponse.setAccessible(true);
-      return (MetaData.Response) newMetaDataResponse.invoke(resp);
-    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-      log.debug("Failed creating new MetaData.Response", e);
-      return null;
+    private static MetaData.Response newMetaDataResponse(Response resp) {
+        Method newMetaDataResponse;
+        try {
+            newMetaDataResponse = Response.class.getDeclaredMethod("newResponseMetaData");
+            newMetaDataResponse.setAccessible(true);
+            return (MetaData.Response) newMetaDataResponse.invoke(resp);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            log.debug("Failed creating new MetaData.Response", e);
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseInstrumentation.java
index 94d503250ac..fba2a247091 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseInstrumentation.java
@@ -11,93 +11,88 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JettyCommitResponseInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JettyCommitResponseInstrumentation() {
-    super("jetty");
-  }
+    public JettyCommitResponseInstrumentation() {
+        super("jetty");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "between_9421_and_10";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "between_9421_and_10";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      new Reference.Builder("org.eclipse.jetty.server.HttpChannel")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
-              "sendResponse",
-              "Z",
-              "Lorg/eclipse/jetty/http/MetaData$Response;",
-              "Ljava/nio/ByteBuffer;",
-              "Z",
-              "Lorg/eclipse/jetty/util/Callback;")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
-              "commit",
-              "V",
-              "Lorg/eclipse/jetty/http/MetaData$Response;")
-          .withField(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC,
-              "_transport",
-              "Lorg/eclipse/jetty/server/HttpTransport;")
-          .build(),
-      new Reference.Builder("org.eclipse.jetty.server.Response")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
-              "newResponseMetaData",
-              "Lorg/eclipse/jetty/http/MetaData$Response;")
-          .build(),
-      new Reference.Builder("org.eclipse.jetty.server.HttpOutput")
-          .withMethod(new String[0], Reference.EXPECTS_NON_STATIC, "closed", "V")
-          .or()
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC,
-              "completed",
-              "V",
-              "Ljava/lang/Throwable;")
-          .build(),
-    };
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            new Reference.Builder("org.eclipse.jetty.server.HttpChannel")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
+                            "sendResponse",
+                            "Z",
+                            "Lorg/eclipse/jetty/http/MetaData$Response;",
+                            "Ljava/nio/ByteBuffer;",
+                            "Z",
+                            "Lorg/eclipse/jetty/util/Callback;")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
+                            "commit",
+                            "V",
+                            "Lorg/eclipse/jetty/http/MetaData$Response;")
+                    .withField(
+                            new String[0],
+                            Reference.EXPECTS_NON_STATIC,
+                            "_transport",
+                            "Lorg/eclipse/jetty/server/HttpTransport;")
+                    .build(),
+            new Reference.Builder("org.eclipse.jetty.server.Response")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_PUBLIC_OR_PROTECTED | Reference.EXPECTS_NON_STATIC,
+                            "newResponseMetaData",
+                            "Lorg/eclipse/jetty/http/MetaData$Response;")
+                    .build(),
+            new Reference.Builder("org.eclipse.jetty.server.HttpOutput")
+                    .withMethod(new String[0], Reference.EXPECTS_NON_STATIC, "closed", "V")
+                    .or()
+                    .withMethod(new String[0], Reference.EXPECTS_NON_STATIC, "completed", "V", "Ljava/lang/Throwable;")
+                    .build(),
+        };
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.server.HttpChannel";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.server.HttpChannel";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    String pkg9 = "datadog.trace.instrumentation.jetty9";
-    return new String[] {
-      pkg9 + ".ExtractAdapter",
-      pkg9 + ".ExtractAdapter$Request",
-      pkg9 + ".ExtractAdapter$Response",
-      pkg9 + ".JettyDecorator",
-      pkg9 + ".RequestURIDataAdapter",
-      "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
-      "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
-      packageName + ".JettyCommitResponseHelper",
-      packageName + ".JettyOnCommitBlockingHelper",
-      packageName + ".JettyOnCommitBlockingHelper$CloseCallback",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        String pkg9 = "datadog.trace.instrumentation.jetty9";
+        return new String[] {
+            pkg9 + ".ExtractAdapter",
+            pkg9 + ".ExtractAdapter$Request",
+            pkg9 + ".ExtractAdapter$Response",
+            pkg9 + ".JettyDecorator",
+            pkg9 + ".RequestURIDataAdapter",
+            "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
+            "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
+            packageName + ".JettyCommitResponseHelper",
+            packageName + ".JettyOnCommitBlockingHelper",
+            packageName + ".JettyOnCommitBlockingHelper$CloseCallback",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("sendResponse")
-            .and(takesArguments(4))
-            .and(takesArgument(0, named("org.eclipse.jetty.http.MetaData$Response")))
-            .and(takesArgument(1, named("java.nio.ByteBuffer")))
-            .and(takesArgument(2, boolean.class))
-            .and(takesArgument(3, named("org.eclipse.jetty.util.Callback"))),
-        packageName + ".SendResponseCbAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("sendResponse")
+                        .and(takesArguments(4))
+                        .and(takesArgument(0, named("org.eclipse.jetty.http.MetaData$Response")))
+                        .and(takesArgument(1, named("java.nio.ByteBuffer")))
+                        .and(takesArgument(2, boolean.class))
+                        .and(takesArgument(3, named("org.eclipse.jetty.util.Callback"))),
+                packageName + ".SendResponseCbAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/JettyOnCommitBlockingHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/JettyOnCommitBlockingHelper.java
index 10282df2415..6f4c56f67fa 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/JettyOnCommitBlockingHelper.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/JettyOnCommitBlockingHelper.java
@@ -23,178 +23,168 @@
 
 public class JettyOnCommitBlockingHelper {
 
-  private static final Logger log = LoggerFactory.getLogger(JettyOnCommitBlockingHelper.class);
-  private static final ByteBuffer EMPTY_BB = ByteBuffer.allocate(0);
-
-  public static boolean block(
-      HttpChannel channel,
-      HttpTransport transport,
-      Flow.Action.RequestBlockingAction rba,
-      Callback cb) {
-    if (!isInitialized()) {
-      return false;
-    }
+    private static final Logger log = LoggerFactory.getLogger(JettyOnCommitBlockingHelper.class);
+    private static final ByteBuffer EMPTY_BB = ByteBuffer.allocate(0);
 
-    Request request = channel.getRequest();
-    Response response = channel.getResponse();
-    request.setAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE, Boolean.TRUE);
-
-    try {
-      int statusCode = BlockingActionHelper.getHttpCode(rba.getStatusCode());
-
-      String acceptHeader = request.getHeader("Accept");
-      HttpFields fields = new HttpFields();
-      for (Map.Entry<String, String> e : rba.getExtraHeaders().entrySet()) {
-        fields.put(e.getKey(), e.getValue());
-      }
-
-      BlockingContentType bct = rba.getBlockingContentType();
-      MetaData.Response info;
-      Callback closeCb = new CloseCallback(cb, channel);
-      if (bct != BlockingContentType.NONE && !request.isHead()) {
-        BlockingActionHelper.TemplateType type =
-            BlockingActionHelper.determineTemplateType(bct, acceptHeader);
-        fields.put("Content-type", BlockingActionHelper.getContentType(type));
-        byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
-        fields.put("Content-length", Integer.toString(template.length));
-
-        info = new MetaData.Response(request.getHttpVersion(), statusCode, fields, template.length);
-        if (!commit(channel, info)) {
-          return false;
+    public static boolean block(
+            HttpChannel channel, HttpTransport transport, Flow.Action.RequestBlockingAction rba, Callback cb) {
+        if (!isInitialized()) {
+            return false;
         }
 
-        // we need to update the upper layers too
-        // so that the correct status code/headers get reported correctly on the span`
-        reset(channel);
-        response.setStatus(statusCode);
-        response.setContentType(BlockingActionHelper.getContentType(type));
-        response.setContentLength(template.length);
-
-        request.onResponseCommit();
-        log.debug("Sending blocking response (non-empty body)");
-        transport.send(info, false, ByteBuffer.wrap(template), true, closeCb);
-      } else {
-        info = new MetaData.Response(request.getHttpVersion(), statusCode, fields);
-
-        reset(channel);
-        response.setStatus(statusCode);
-
-        request.onResponseCommit();
-        transport.send(info, request.isHead(), EMPTY_BB, true, closeCb);
-      }
-    } catch (Exception x) {
-      log.warn("Error committing blocking response", x);
-      return false;
-    }
-    return true;
-  }
-
-  private static final MethodHandle COMMIT_METADATA;
-
-  static {
-    MethodHandle commitMh = null;
-    try {
-      Method commit = HttpChannel.class.getDeclaredMethod("commit", MetaData.Response.class);
-      commit.setAccessible(true);
-      commitMh = MethodHandles.lookup().unreflect(commit);
-    } catch (NoSuchMethodException | IllegalAccessException e) {
-      log.warn(
-          "Could not find method HttpChannel#commit(MetaData.Response). "
-              + "Blocking on responses will be unavailable");
-    }
-    COMMIT_METADATA = commitMh;
-  }
-
-  public static boolean isInitialized() {
-    return COMMIT_METADATA != null;
-  }
-
-  private static void reset(HttpChannel channel) {
-    if (channel.getState().partialResponse()) {
-      channel.getResponse().reset();
-      channel.getState().commitResponse();
-    } else {
-      log.debug("Failed resetting response");
-    }
-  }
-
-  private static boolean commit(HttpChannel channel, MetaData.Response info) {
-    try {
-      COMMIT_METADATA.invoke(channel, info);
-    } catch (Throwable t) {
-      log.warn("Failed calling commit(MetaData.Response) when writing blocking response", t);
-      return false;
-    }
-    return true;
-  }
-
-  public static final class CloseCallback implements Callback {
-    private static final Logger log = LoggerFactory.getLogger(CloseCallback.class);
-    private final Callback delegate;
-    private final HttpChannel channel;
-
-    public CloseCallback(Callback delegate, HttpChannel channel) {
-      this.delegate = delegate;
-      this.channel = channel;
-    }
+        Request request = channel.getRequest();
+        Response response = channel.getResponse();
+        request.setAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE, Boolean.TRUE);
 
-    private void close() {
-      closed(channel.getResponse().getHttpOutput());
-      channel.getEndPoint().close();
+        try {
+            int statusCode = BlockingActionHelper.getHttpCode(rba.getStatusCode());
+
+            String acceptHeader = request.getHeader("Accept");
+            HttpFields fields = new HttpFields();
+            for (Map.Entry<String, String> e : rba.getExtraHeaders().entrySet()) {
+                fields.put(e.getKey(), e.getValue());
+            }
+
+            BlockingContentType bct = rba.getBlockingContentType();
+            MetaData.Response info;
+            Callback closeCb = new CloseCallback(cb, channel);
+            if (bct != BlockingContentType.NONE && !request.isHead()) {
+                BlockingActionHelper.TemplateType type = BlockingActionHelper.determineTemplateType(bct, acceptHeader);
+                fields.put("Content-type", BlockingActionHelper.getContentType(type));
+                byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
+                fields.put("Content-length", Integer.toString(template.length));
+
+                info = new MetaData.Response(request.getHttpVersion(), statusCode, fields, template.length);
+                if (!commit(channel, info)) {
+                    return false;
+                }
+
+                // we need to update the upper layers too
+                // so that the correct status code/headers get reported correctly on the span`
+                reset(channel);
+                response.setStatus(statusCode);
+                response.setContentType(BlockingActionHelper.getContentType(type));
+                response.setContentLength(template.length);
+
+                request.onResponseCommit();
+                log.debug("Sending blocking response (non-empty body)");
+                transport.send(info, false, ByteBuffer.wrap(template), true, closeCb);
+            } else {
+                info = new MetaData.Response(request.getHttpVersion(), statusCode, fields);
+
+                reset(channel);
+                response.setStatus(statusCode);
+
+                request.onResponseCommit();
+                transport.send(info, request.isHead(), EMPTY_BB, true, closeCb);
+            }
+        } catch (Exception x) {
+            log.warn("Error committing blocking response", x);
+            return false;
+        }
+        return true;
     }
 
-    private static final MethodHandle CLOSED;
+    private static final MethodHandle COMMIT_METADATA;
 
     static {
-      MethodHandle mh = null;
-      try {
-        mh =
-            MethodHandles.lookup()
-                .findVirtual(HttpOutput.class, "closed", MethodType.methodType(void.class));
-      } catch (NoSuchMethodException | IllegalAccessException e) {
+        MethodHandle commitMh = null;
         try {
-          mh =
-              MethodHandles.lookup()
-                  .findVirtual(
-                      HttpOutput.class,
-                      "completed",
-                      MethodType.methodType(void.class, Throwable.class));
-          mh = MethodHandles.insertArguments(mh, 1, new Object[] {null});
-        } catch (NoSuchMethodException | IllegalAccessException e2) {
-          log.warn(
-              "Can't find either closed() or completed() on HttpOutput. "
-                  + "No blocking on responses will be possible",
-              e2);
+            Method commit = HttpChannel.class.getDeclaredMethod("commit", MetaData.Response.class);
+            commit.setAccessible(true);
+            commitMh = MethodHandles.lookup().unreflect(commit);
+        } catch (NoSuchMethodException | IllegalAccessException e) {
+            log.warn("Could not find method HttpChannel#commit(MetaData.Response). "
+                    + "Blocking on responses will be unavailable");
         }
-      }
-      CLOSED = mh;
+        COMMIT_METADATA = commitMh;
     }
 
     public static boolean isInitialized() {
-      return CLOSED != null;
+        return COMMIT_METADATA != null;
     }
 
-    private void closed(HttpOutput httpOutput) {
-      try {
-        CLOSED.invoke(httpOutput);
-      } catch (Throwable e) {
-        log.debug("Call to closed()/completed() failed", e);
-      }
+    private static void reset(HttpChannel channel) {
+        if (channel.getState().partialResponse()) {
+            channel.getResponse().reset();
+            channel.getState().commitResponse();
+        } else {
+            log.debug("Failed resetting response");
+        }
     }
 
-    @Override
-    public void succeeded() {
-      close();
-      delegate.succeeded();
-      log.debug("State after blocking {}", channel.getState());
+    private static boolean commit(HttpChannel channel, MetaData.Response info) {
+        try {
+            COMMIT_METADATA.invoke(channel, info);
+        } catch (Throwable t) {
+            log.warn("Failed calling commit(MetaData.Response) when writing blocking response", t);
+            return false;
+        }
+        return true;
     }
 
-    @Override
-    public void failed(final Throwable x) {
-      log.debug("Exception sending blocking response", x);
-      close();
-      delegate.failed(x);
-      log.debug("State after blocking {}", channel.getState());
+    public static final class CloseCallback implements Callback {
+        private static final Logger log = LoggerFactory.getLogger(CloseCallback.class);
+        private final Callback delegate;
+        private final HttpChannel channel;
+
+        public CloseCallback(Callback delegate, HttpChannel channel) {
+            this.delegate = delegate;
+            this.channel = channel;
+        }
+
+        private void close() {
+            closed(channel.getResponse().getHttpOutput());
+            channel.getEndPoint().close();
+        }
+
+        private static final MethodHandle CLOSED;
+
+        static {
+            MethodHandle mh = null;
+            try {
+                mh = MethodHandles.lookup().findVirtual(HttpOutput.class, "closed", MethodType.methodType(void.class));
+            } catch (NoSuchMethodException | IllegalAccessException e) {
+                try {
+                    mh = MethodHandles.lookup()
+                            .findVirtual(
+                                    HttpOutput.class, "completed", MethodType.methodType(void.class, Throwable.class));
+                    mh = MethodHandles.insertArguments(mh, 1, new Object[] {null});
+                } catch (NoSuchMethodException | IllegalAccessException e2) {
+                    log.warn(
+                            "Can't find either closed() or completed() on HttpOutput. "
+                                    + "No blocking on responses will be possible",
+                            e2);
+                }
+            }
+            CLOSED = mh;
+        }
+
+        public static boolean isInitialized() {
+            return CLOSED != null;
+        }
+
+        private void closed(HttpOutput httpOutput) {
+            try {
+                CLOSED.invoke(httpOutput);
+            } catch (Throwable e) {
+                log.debug("Call to closed()/completed() failed", e);
+            }
+        }
+
+        @Override
+        public void succeeded() {
+            close();
+            delegate.succeeded();
+            log.debug("State after blocking {}", channel.getState());
+        }
+
+        @Override
+        public void failed(final Throwable x) {
+            log.debug("Exception sending blocking response", x);
+            close();
+            delegate.failed(x);
+            log.debug("State after blocking {}", channel.getState());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/SendResponseCbAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/SendResponseCbAdvice.java
index 5e99a5f1623..c22fb4705b1 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/SendResponseCbAdvice.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/SendResponseCbAdvice.java
@@ -7,12 +7,12 @@
 import org.eclipse.jetty.util.Callback;
 
 public class SendResponseCbAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-  public static boolean /* skip */ before(
-      @Advice.This HttpChannel connection,
-      @Advice.Argument(0) MetaData.Response responseInfo,
-      @Advice.Argument(3) Callback cb,
-      @Advice.FieldValue("_transport") HttpTransport _transport) {
-    return JettyCommitResponseHelper.before(connection, responseInfo, _transport, cb);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+    public static boolean /* skip */ before(
+            @Advice.This HttpChannel connection,
+            @Advice.Argument(0) MetaData.Response responseInfo,
+            @Advice.Argument(3) Callback cb,
+            @Advice.FieldValue("_transport") HttpTransport _transport) {
+        return JettyCommitResponseHelper.before(connection, responseInfo, _transport, cb);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/src/main/java/datadog/trace/instrumentation/jetty_util/QueuedThreadPoolInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/src/main/java/datadog/trace/instrumentation/jetty_util/QueuedThreadPoolInstrumentation.java
index d6aa363430a..9ad9c7ec999 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/src/main/java/datadog/trace/instrumentation/jetty_util/QueuedThreadPoolInstrumentation.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/src/main/java/datadog/trace/instrumentation/jetty_util/QueuedThreadPoolInstrumentation.java
@@ -10,25 +10,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class QueuedThreadPoolInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public QueuedThreadPoolInstrumentation() {
-    super("jetty-concurrent");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public QueuedThreadPoolInstrumentation() {
+        super("jetty-concurrent");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.eclipse.jetty.util.thread.QueuedThreadPool";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.eclipse.jetty.util.thread.QueuedThreadPool";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(namedOneOf("dispatch", "execute"), getClass().getName() + "$Wrap");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(namedOneOf("dispatch", "execute"), getClass().getName() + "$Wrap");
+    }
 
-  public static final class Wrap {
-    @Advice.OnMethodEnter
-    public static void wrap(@Advice.Argument(value = 0, readOnly = false) Runnable task) {
-      task = Wrapper.wrap(task);
+    public static final class Wrap {
+        @Advice.OnMethodEnter
+        public static void wrap(@Advice.Argument(value = 0, readOnly = false) Runnable task) {
+            task = Wrapper.wrap(task);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/src/test/java/JavaAsyncChild.java b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/src/test/java/JavaAsyncChild.java
index 67266dcb122..7f5158701e5 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/src/test/java/JavaAsyncChild.java
+++ b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/src/test/java/JavaAsyncChild.java
@@ -4,56 +4,56 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class JavaAsyncChild extends ForkJoinTask implements Runnable, Callable {
-  private final AtomicBoolean blockThread;
-  private final boolean doTraceableWork;
-
-  public JavaAsyncChild() {
-    this(true, false);
-  }
-
-  @Override
-  public Object getRawResult() {
-    return null;
-  }
-
-  @Override
-  protected void setRawResult(final Object value) {}
-
-  @Override
-  protected boolean exec() {
-    runImpl();
-    return true;
-  }
-
-  public JavaAsyncChild(final boolean doTraceableWork, final boolean blockThread) {
-    this.doTraceableWork = doTraceableWork;
-    this.blockThread = new AtomicBoolean(blockThread);
-  }
-
-  public void unblock() {
-    blockThread.set(false);
-  }
-
-  @Override
-  public void run() {
-    runImpl();
-  }
-
-  @Override
-  public Object call() throws Exception {
-    runImpl();
-    return null;
-  }
-
-  private void runImpl() {
-    while (blockThread.get()) {
-      // busy-wait to block thread
-    }
-    if (doTraceableWork) {
-      asyncChild();
-    }
-  }
-
-  @Trace(operationName = "asyncChild")
-  private void asyncChild() {}
+    private final AtomicBoolean blockThread;
+    private final boolean doTraceableWork;
+
+    public JavaAsyncChild() {
+        this(true, false);
+    }
+
+    @Override
+    public Object getRawResult() {
+        return null;
+    }
+
+    @Override
+    protected void setRawResult(final Object value) {}
+
+    @Override
+    protected boolean exec() {
+        runImpl();
+        return true;
+    }
+
+    public JavaAsyncChild(final boolean doTraceableWork, final boolean blockThread) {
+        this.doTraceableWork = doTraceableWork;
+        this.blockThread = new AtomicBoolean(blockThread);
+    }
+
+    public void unblock() {
+        blockThread.set(false);
+    }
+
+    @Override
+    public void run() {
+        runImpl();
+    }
+
+    @Override
+    public Object call() throws Exception {
+        runImpl();
+        return null;
+    }
+
+    private void runImpl() {
+        while (blockThread.get()) {
+            // busy-wait to block thread
+        }
+        if (doTraceableWork) {
+            asyncChild();
+        }
+    }
+
+    @Trace(operationName = "asyncChild")
+    private void asyncChild() {}
 }
diff --git a/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/src/main/java/datadog/trace/instrumentation/jms/JakartaJmsModule.java b/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/src/main/java/datadog/trace/instrumentation/jms/JakartaJmsModule.java
index 7b8ead719b5..aa2183aef7b 100644
--- a/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/src/main/java/datadog/trace/instrumentation/jms/JakartaJmsModule.java
+++ b/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/src/main/java/datadog/trace/instrumentation/jms/JakartaJmsModule.java
@@ -8,17 +8,17 @@
 
 @AutoService(InstrumenterModule.class)
 public class JakartaJmsModule extends JavaxJmsModule {
-  public JakartaJmsModule() {
-    super("jakarta", "jakarta-jms", "jms");
-  }
+    public JakartaJmsModule() {
+        super("jakarta", "jakarta-jms", "jms");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jakarta.jms";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jakarta.jms";
+    }
 
-  @Override
-  public Map<String, String> adviceShading() {
-    return singletonMap("javax", "jakarta");
-  }
+    @Override
+    public Map<String, String> adviceShading() {
+        return singletonMap("javax", "jakarta");
+    }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java
index 991d4823fc6..fc8b40207c6 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java
@@ -22,65 +22,62 @@
 
 public class DatadogMessageListener implements MessageListener {
 
-  private final ContextStore<Message, SessionState> messageAckStore;
-  private final MessageConsumerState consumerState;
-  private final MessageListener messageListener;
+    private final ContextStore<Message, SessionState> messageAckStore;
+    private final MessageConsumerState consumerState;
+    private final MessageListener messageListener;
 
-  public DatadogMessageListener(
-      ContextStore<Message, SessionState> messageAckStore,
-      MessageConsumerState consumerState,
-      MessageListener messageListener) {
-    this.messageAckStore = messageAckStore;
-    this.consumerState = consumerState;
-    this.messageListener = messageListener;
-  }
-
-  @Override
-  public void onMessage(Message message) {
-    AgentSpan span;
-    AgentSpanContext propagatedContext = null;
-    if (!consumerState.isPropagationDisabled()) {
-      propagatedContext = extractContextAndGetSpanContext(message, GETTER);
-    }
-    long startMillis = GETTER.extractTimeInQueueStart(message);
-    if (startMillis == 0 || !TIME_IN_QUEUE_ENABLED) {
-      span = startSpan("jms", JMS_CONSUME, propagatedContext);
-    } else {
-      long batchId = GETTER.extractMessageBatchId(message);
-      AgentSpan timeInQueue = consumerState.getTimeInQueueSpan(batchId);
-      if (null == timeInQueue) {
-        timeInQueue =
-            startSpan("jms", JMS_DELIVER, propagatedContext, MILLISECONDS.toMicros(startMillis));
-        BROKER_DECORATE.afterStart(timeInQueue);
-        BROKER_DECORATE.onTimeInQueue(
-            timeInQueue,
-            consumerState.getBrokerResourceName(),
-            consumerState.getBrokerServiceName());
-        consumerState.setTimeInQueueSpan(batchId, timeInQueue);
-      }
-      span = startSpan("jms", JMS_CONSUME, timeInQueue.spanContext());
+    public DatadogMessageListener(
+            ContextStore<Message, SessionState> messageAckStore,
+            MessageConsumerState consumerState,
+            MessageListener messageListener) {
+        this.messageAckStore = messageAckStore;
+        this.consumerState = consumerState;
+        this.messageListener = messageListener;
     }
-    CONSUMER_DECORATE.afterStart(span);
-    CONSUMER_DECORATE.onConsume(span, message, consumerState.getConsumerResourceName());
-    SessionState sessionState = consumerState.getSessionState();
-    if (sessionState.isClientAcknowledge()) {
-      // consumed spans will be finished by a call to Message.acknowledge
-      sessionState.finishOnAcknowledge(span);
-      messageAckStore.put(message, sessionState);
-    } else if (sessionState.isTransactedSession()) {
-      // span will be finished by Session.commit/rollback/close
-      sessionState.finishOnCommit(span);
-    }
-    try (ContextScope scope = activateSpan(span)) {
-      messageListener.onMessage(message);
-    } catch (RuntimeException | Error thrown) {
-      CONSUMER_DECORATE.onError(span, thrown);
-      throw thrown;
-    } finally {
-      if (sessionState.isAutoAcknowledge()) {
-        span.finish();
-        consumerState.finishTimeInQueueSpan(false);
-      }
+
+    @Override
+    public void onMessage(Message message) {
+        AgentSpan span;
+        AgentSpanContext propagatedContext = null;
+        if (!consumerState.isPropagationDisabled()) {
+            propagatedContext = extractContextAndGetSpanContext(message, GETTER);
+        }
+        long startMillis = GETTER.extractTimeInQueueStart(message);
+        if (startMillis == 0 || !TIME_IN_QUEUE_ENABLED) {
+            span = startSpan("jms", JMS_CONSUME, propagatedContext);
+        } else {
+            long batchId = GETTER.extractMessageBatchId(message);
+            AgentSpan timeInQueue = consumerState.getTimeInQueueSpan(batchId);
+            if (null == timeInQueue) {
+                timeInQueue = startSpan("jms", JMS_DELIVER, propagatedContext, MILLISECONDS.toMicros(startMillis));
+                BROKER_DECORATE.afterStart(timeInQueue);
+                BROKER_DECORATE.onTimeInQueue(
+                        timeInQueue, consumerState.getBrokerResourceName(), consumerState.getBrokerServiceName());
+                consumerState.setTimeInQueueSpan(batchId, timeInQueue);
+            }
+            span = startSpan("jms", JMS_CONSUME, timeInQueue.spanContext());
+        }
+        CONSUMER_DECORATE.afterStart(span);
+        CONSUMER_DECORATE.onConsume(span, message, consumerState.getConsumerResourceName());
+        SessionState sessionState = consumerState.getSessionState();
+        if (sessionState.isClientAcknowledge()) {
+            // consumed spans will be finished by a call to Message.acknowledge
+            sessionState.finishOnAcknowledge(span);
+            messageAckStore.put(message, sessionState);
+        } else if (sessionState.isTransactedSession()) {
+            // span will be finished by Session.commit/rollback/close
+            sessionState.finishOnCommit(span);
+        }
+        try (ContextScope scope = activateSpan(span)) {
+            messageListener.onMessage(message);
+        } catch (RuntimeException | Error thrown) {
+            CONSUMER_DECORATE.onError(span, thrown);
+            throw thrown;
+        } finally {
+            if (sessionState.isAutoAcknowledge()) {
+                span.finish();
+                consumerState.finishTimeInQueueSpan(false);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSDecorator.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSDecorator.java
index c9dd753b3da..3f1ea0f7365 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSDecorator.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSDecorator.java
@@ -30,292 +30,275 @@
 import org.slf4j.LoggerFactory;
 
 public final class JMSDecorator extends MessagingClientDecorator {
-  private static final Logger log = LoggerFactory.getLogger(JMSDecorator.class);
-
-  public static final CharSequence JMS = UTF8BytesString.create("jms");
-  public static final CharSequence JMS_CONSUME =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().messaging().inboundOperation(JMS.toString()));
-  public static final CharSequence JMS_PRODUCE =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().messaging().outboundOperation(JMS.toString()));
-  public static final CharSequence JMS_DELIVER = UTF8BytesString.create("jms.deliver");
-
-  public static final boolean JMS_LEGACY_TRACING = Config.get().isJmsLegacyTracingEnabled();
-
-  public static final boolean TIME_IN_QUEUE_ENABLED =
-      Config.get().isTimeInQueueEnabled(!JMS_LEGACY_TRACING, "jms");
-  public static final String JMS_PRODUCED_KEY = "x_datadog_jms_produced";
-  public static final String JMS_BATCH_ID_KEY = "x_datadog_jms_batch_id";
-
-  private static final Join QUEUE_JOINER = PrefixJoin.of("Queue ");
-  private static final Join TOPIC_JOINER = PrefixJoin.of("Topic ");
-
-  private final DDCache<CharSequence, CharSequence> resourceNameCache =
-      DDCaches.newFixedSizeCache(32);
-
-  private final String resourcePrefix;
-
-  private final UTF8BytesString queueTempResourceName;
-  private final UTF8BytesString topicTempResourceName;
-
-  private final Function<CharSequence, CharSequence> queueResourceJoiner;
-  private final Function<CharSequence, CharSequence> topicResourceJoiner;
-
-  private final String spanKind;
-  private final CharSequence spanType;
-  private final Supplier<String> serviceNameSupplier;
-
-  public static final JMSDecorator PRODUCER_DECORATE =
-      new JMSDecorator(
-          "Produced for ",
-          Tags.SPAN_KIND_PRODUCER,
-          InternalSpanTypes.MESSAGE_PRODUCER,
-          SpanNaming.instance()
-              .namingSchema()
-              .messaging()
-              .outboundService("jms", JMS_LEGACY_TRACING));
-
-  public static final JMSDecorator CONSUMER_DECORATE =
-      new JMSDecorator(
-          "Consumed from ",
-          Tags.SPAN_KIND_CONSUMER,
-          InternalSpanTypes.MESSAGE_CONSUMER,
-          SpanNaming.instance()
-              .namingSchema()
-              .messaging()
-              .inboundService("jms", JMS_LEGACY_TRACING));
-
-  public static final JMSDecorator BROKER_DECORATE =
-      new JMSDecorator(
-          "",
-          Tags.SPAN_KIND_BROKER,
-          InternalSpanTypes.MESSAGE_BROKER,
-          SpanNaming.instance().namingSchema().messaging().timeInQueueService(JMS.toString()));
-
-  public JMSDecorator(
-      String resourcePrefix,
-      String spanKind,
-      CharSequence spanType,
-      Supplier<String> serviceNameSupplier) {
-    this.resourcePrefix = resourcePrefix;
-
-    this.queueTempResourceName = UTF8BytesString.create(resourcePrefix + "Temporary Queue");
-    this.topicTempResourceName = UTF8BytesString.create(resourcePrefix + "Temporary Topic");
-
-    this.queueResourceJoiner = QUEUE_JOINER.curry(resourcePrefix);
-    this.topicResourceJoiner = TOPIC_JOINER.curry(resourcePrefix);
-
-    this.spanKind = spanKind;
-    this.spanType = spanType;
-    this.serviceNameSupplier = serviceNameSupplier;
-  }
-
-  public static void logJMSException(JMSException ex) {
-    if (log.isDebugEnabled()) {
-      log.debug("JMS exception during instrumentation", ex);
-    }
-  }
+    private static final Logger log = LoggerFactory.getLogger(JMSDecorator.class);
 
-  public static String messageTechnology(Message m) {
-    if (null == m) {
-      return "null";
-    }
+    public static final CharSequence JMS = UTF8BytesString.create("jms");
+    public static final CharSequence JMS_CONSUME = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().messaging().inboundOperation(JMS.toString()));
+    public static final CharSequence JMS_PRODUCE = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().messaging().outboundOperation(JMS.toString()));
+    public static final CharSequence JMS_DELIVER = UTF8BytesString.create("jms.deliver");
+
+    public static final boolean JMS_LEGACY_TRACING = Config.get().isJmsLegacyTracingEnabled();
+
+    public static final boolean TIME_IN_QUEUE_ENABLED = Config.get().isTimeInQueueEnabled(!JMS_LEGACY_TRACING, "jms");
+    public static final String JMS_PRODUCED_KEY = "x_datadog_jms_produced";
+    public static final String JMS_BATCH_ID_KEY = "x_datadog_jms_batch_id";
+
+    private static final Join QUEUE_JOINER = PrefixJoin.of("Queue ");
+    private static final Join TOPIC_JOINER = PrefixJoin.of("Topic ");
+
+    private final DDCache<CharSequence, CharSequence> resourceNameCache = DDCaches.newFixedSizeCache(32);
+
+    private final String resourcePrefix;
+
+    private final UTF8BytesString queueTempResourceName;
+    private final UTF8BytesString topicTempResourceName;
+
+    private final Function<CharSequence, CharSequence> queueResourceJoiner;
+    private final Function<CharSequence, CharSequence> topicResourceJoiner;
+
+    private final String spanKind;
+    private final CharSequence spanType;
+    private final Supplier<String> serviceNameSupplier;
+
+    public static final JMSDecorator PRODUCER_DECORATE = new JMSDecorator(
+            "Produced for ",
+            Tags.SPAN_KIND_PRODUCER,
+            InternalSpanTypes.MESSAGE_PRODUCER,
+            SpanNaming.instance().namingSchema().messaging().outboundService("jms", JMS_LEGACY_TRACING));
+
+    public static final JMSDecorator CONSUMER_DECORATE = new JMSDecorator(
+            "Consumed from ",
+            Tags.SPAN_KIND_CONSUMER,
+            InternalSpanTypes.MESSAGE_CONSUMER,
+            SpanNaming.instance().namingSchema().messaging().inboundService("jms", JMS_LEGACY_TRACING));
+
+    public static final JMSDecorator BROKER_DECORATE = new JMSDecorator(
+            "",
+            Tags.SPAN_KIND_BROKER,
+            InternalSpanTypes.MESSAGE_BROKER,
+            SpanNaming.instance().namingSchema().messaging().timeInQueueService(JMS.toString()));
+
+    public JMSDecorator(
+            String resourcePrefix, String spanKind, CharSequence spanType, Supplier<String> serviceNameSupplier) {
+        this.resourcePrefix = resourcePrefix;
 
-    String messageClass = m.getClass().getName();
+        this.queueTempResourceName = UTF8BytesString.create(resourcePrefix + "Temporary Queue");
+        this.topicTempResourceName = UTF8BytesString.create(resourcePrefix + "Temporary Topic");
 
-    if (messageClass.startsWith("com.amazon.sqs")) {
-      return "sqs";
-    } else if (messageClass.startsWith("com.ibm")) {
-      return "ibmmq";
-    } else {
-      return "unknown";
+        this.queueResourceJoiner = QUEUE_JOINER.curry(resourcePrefix);
+        this.topicResourceJoiner = TOPIC_JOINER.curry(resourcePrefix);
+
+        this.spanKind = spanKind;
+        this.spanType = spanType;
+        this.serviceNameSupplier = serviceNameSupplier;
     }
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jms"};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return spanType;
-  }
-
-  @Override
-  protected String service() {
-    return serviceNameSupplier.get();
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JMS;
-  }
-
-  @Override
-  protected String spanKind() {
-    return spanKind;
-  }
-
-  public void onConsume(AgentSpan span, Message message, CharSequence resourceName) {
-    if (null != resourceName) {
-      span.setResourceName(resourceName);
+
+    public static void logJMSException(JMSException ex) {
+        if (log.isDebugEnabled()) {
+            log.debug("JMS exception during instrumentation", ex);
+        }
     }
 
-    try {
-      final long produceTime = message.getJMSTimestamp();
-      if (produceTime > 0) {
-        final long consumeTime = TimeUnit.NANOSECONDS.toMillis(span.getStartTime());
-        span.setTag(RECORD_QUEUE_TIME_MS, Math.max(0L, consumeTime - produceTime));
-      }
-    } catch (Exception e) {
-      log.debug("Unable to get jms timestamp", e);
+    public static String messageTechnology(Message m) {
+        if (null == m) {
+            return "null";
+        }
+
+        String messageClass = m.getClass().getName();
+
+        if (messageClass.startsWith("com.amazon.sqs")) {
+            return "sqs";
+        } else if (messageClass.startsWith("com.ibm")) {
+            return "ibmmq";
+        } else {
+            return "unknown";
+        }
     }
-  }
 
-  public void onProduce(AgentSpan span, CharSequence resourceName) {
-    if (null != resourceName) {
-      span.setResourceName(resourceName);
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jms"};
     }
-  }
 
-  public static boolean canInject(Message message) {
-    // JMS->SQS already stores the trace context in 'X-Amzn-Trace-Id' / 'AWSTraceHeader',
-    // so skip storing same context again to avoid SQS limit of 10 attributes per message.
-    return !message.getClass().getName().startsWith("com.amazon.sqs.javamessaging");
-  }
+    @Override
+    protected CharSequence spanType() {
+        return spanType;
+    }
 
-  public void onTimeInQueue(AgentSpan span, CharSequence resourceName, String serviceName) {
-    if (null != resourceName) {
-      span.setResourceName(resourceName);
+    @Override
+    protected String service() {
+        return serviceNameSupplier.get();
     }
-    if (null != serviceName) {
-      span.setServiceName(serviceName, component());
+
+    @Override
+    protected CharSequence component() {
+        return JMS;
     }
-  }
-
-  private static final String TIBCO_TMP_PREFIX = "$TMP$";
-
-  /**
-   * Sanitizes destination names to remove Kafka Connect schema-derived suffixes. When Kafka
-   * Connect's IBM MQ connectors are used with schema converters (Protobuf/JSON Schema), union or
-   * optional fields may get index suffixes like _messagebody_0 appended to the queue name.
-   */
-  private static String sanitizeDestinationName(String name) {
-    if (name == null || name.isEmpty()) {
-      return name;
+
+    @Override
+    protected String spanKind() {
+        return spanKind;
     }
 
-    int len = name.length();
+    public void onConsume(AgentSpan span, Message message, CharSequence resourceName) {
+        if (null != resourceName) {
+            span.setResourceName(resourceName);
+        }
 
-    // Check if name ends with digits (the schema index suffix)
-    if (!Character.isDigit(name.charAt(len - 1))) {
-      return name;
+        try {
+            final long produceTime = message.getJMSTimestamp();
+            if (produceTime > 0) {
+                final long consumeTime = TimeUnit.NANOSECONDS.toMillis(span.getStartTime());
+                span.setTag(RECORD_QUEUE_TIME_MS, Math.max(0L, consumeTime - produceTime));
+            }
+        } catch (Exception e) {
+            log.debug("Unable to get jms timestamp", e);
+        }
     }
 
-    // Find the underscore before the trailing digits
-    int underscoreBeforeDigits = name.lastIndexOf('_');
-    if (underscoreBeforeDigits <= 0) {
-      return name;
+    public void onProduce(AgentSpan span, CharSequence resourceName) {
+        if (null != resourceName) {
+            span.setResourceName(resourceName);
+        }
     }
 
-    // Verify all characters after the underscore are digits
-    for (int i = underscoreBeforeDigits + 1; i < len; i++) {
-      if (!Character.isDigit(name.charAt(i))) {
-        return name;
-      }
+    public static boolean canInject(Message message) {
+        // JMS->SQS already stores the trace context in 'X-Amzn-Trace-Id' / 'AWSTraceHeader',
+        // so skip storing same context again to avoid SQS limit of 10 attributes per message.
+        return !message.getClass().getName().startsWith("com.amazon.sqs.javamessaging");
     }
 
-    // Find the underscore before the suffix word
-    int underscoreBeforeSuffix = name.lastIndexOf('_', underscoreBeforeDigits - 1);
-    if (underscoreBeforeSuffix < 0) {
-      return name;
+    public void onTimeInQueue(AgentSpan span, CharSequence resourceName, String serviceName) {
+        if (null != resourceName) {
+            span.setResourceName(resourceName);
+        }
+        if (null != serviceName) {
+            span.setServiceName(serviceName, component());
+        }
     }
 
-    // Check if the suffix word is one of our known Kafka Connect schema suffixes (case insensitive)
-    int suffixStart = underscoreBeforeSuffix + 1;
-    int suffixLen = underscoreBeforeDigits - suffixStart;
+    private static final String TIBCO_TMP_PREFIX = "$TMP$";
 
-    if (isKnownKafkaConnectSuffix(name, suffixStart, suffixLen)) {
-      return name.substring(0, underscoreBeforeSuffix);
-    }
+    /**
+     * Sanitizes destination names to remove Kafka Connect schema-derived suffixes. When Kafka
+     * Connect's IBM MQ connectors are used with schema converters (Protobuf/JSON Schema), union or
+     * optional fields may get index suffixes like _messagebody_0 appended to the queue name.
+     */
+    private static String sanitizeDestinationName(String name) {
+        if (name == null || name.isEmpty()) {
+            return name;
+        }
 
-    return name;
-  }
+        int len = name.length();
 
-  private static boolean isKnownKafkaConnectSuffix(String name, int start, int len) {
-    return (len == 11 && name.regionMatches(true, start, "messagebody", 0, 11))
-        || (len == 4 && name.regionMatches(true, start, "text", 0, 4))
-        || (len == 5 && name.regionMatches(true, start, "bytes", 0, 5))
-        || (len == 5 && name.regionMatches(true, start, "value", 0, 5))
-        || (len == 3 && name.regionMatches(true, start, "map", 0, 3));
-  }
+        // Check if name ends with digits (the schema index suffix)
+        if (!Character.isDigit(name.charAt(len - 1))) {
+            return name;
+        }
 
-  public CharSequence toResourceName(String destinationName, boolean isQueue) {
-    if (null == destinationName) {
-      return isQueue ? queueTempResourceName : topicTempResourceName;
-    }
-    Function<CharSequence, CharSequence> joiner =
-        isQueue ? queueResourceJoiner : topicResourceJoiner;
-    // some systems may have queues and topics with the same name - since we won't know which was
-    // cached first we check the character after the initial prefix to see if it's Q (for Queue) -
-    // if that's what we expect we can use the cached value, otherwise generate the correct name
-    CharSequence resourceName = resourceNameCache.computeIfAbsent(destinationName, joiner);
-    if ((resourceName.charAt(resourcePrefix.length()) == 'Q') == isQueue) {
-      return resourceName;
+        // Find the underscore before the trailing digits
+        int underscoreBeforeDigits = name.lastIndexOf('_');
+        if (underscoreBeforeDigits <= 0) {
+            return name;
+        }
+
+        // Verify all characters after the underscore are digits
+        for (int i = underscoreBeforeDigits + 1; i < len; i++) {
+            if (!Character.isDigit(name.charAt(i))) {
+                return name;
+            }
+        }
+
+        // Find the underscore before the suffix word
+        int underscoreBeforeSuffix = name.lastIndexOf('_', underscoreBeforeDigits - 1);
+        if (underscoreBeforeSuffix < 0) {
+            return name;
+        }
+
+        // Check if the suffix word is one of our known Kafka Connect schema suffixes (case insensitive)
+        int suffixStart = underscoreBeforeSuffix + 1;
+        int suffixLen = underscoreBeforeDigits - suffixStart;
+
+        if (isKnownKafkaConnectSuffix(name, suffixStart, suffixLen)) {
+            return name.substring(0, underscoreBeforeSuffix);
+        }
+
+        return name;
     }
-    return joiner.apply(destinationName);
-  }
-
-  public Destination getDestination(final MessageProducer messageProducer) throws JMSException {
-    try {
-      return messageProducer.getDestination(); // >= 1.1
-    } catch (AbstractMethodError ignored) {
-      // <=1.1 getDestination is not available so we need to pay an additional instanceOf
-      if (messageProducer instanceof QueueSender) {
-        return ((QueueSender) messageProducer).getQueue();
-      }
-      return ((TopicPublisher) messageProducer).getTopic();
+
+    private static boolean isKnownKafkaConnectSuffix(String name, int start, int len) {
+        return (len == 11 && name.regionMatches(true, start, "messagebody", 0, 11))
+                || (len == 4 && name.regionMatches(true, start, "text", 0, 4))
+                || (len == 5 && name.regionMatches(true, start, "bytes", 0, 5))
+                || (len == 5 && name.regionMatches(true, start, "value", 0, 5))
+                || (len == 3 && name.regionMatches(true, start, "map", 0, 3));
     }
-  }
-
-  public String getDestinationName(Destination destination) {
-    String name = null;
-    try {
-      if (destination instanceof Queue) {
-        // WebLogic mixes all JMS Destination interfaces in a single base type which means we can't
-        // rely on instanceof and have to instead check the result of getQueueName vs getTopicName
-        if (!(destination instanceof TemporaryQueue) || isWebLogicDestination(destination)) {
-          name = ((Queue) destination).getQueueName();
+
+    public CharSequence toResourceName(String destinationName, boolean isQueue) {
+        if (null == destinationName) {
+            return isQueue ? queueTempResourceName : topicTempResourceName;
         }
-      }
-      // check Topic name if Queue name is null because this might be a WebLogic destination
-      if (null == name && destination instanceof Topic) {
-        if (!(destination instanceof TemporaryTopic) || isWebLogicDestination(destination)) {
-          name = ((Topic) destination).getTopicName();
+        Function<CharSequence, CharSequence> joiner = isQueue ? queueResourceJoiner : topicResourceJoiner;
+        // some systems may have queues and topics with the same name - since we won't know which was
+        // cached first we check the character after the initial prefix to see if it's Q (for Queue) -
+        // if that's what we expect we can use the cached value, otherwise generate the correct name
+        CharSequence resourceName = resourceNameCache.computeIfAbsent(destinationName, joiner);
+        if ((resourceName.charAt(resourcePrefix.length()) == 'Q') == isQueue) {
+            return resourceName;
         }
-      }
-    } catch (Exception e) {
-      log.debug("Unable to get jms destination name", e);
+        return joiner.apply(destinationName);
     }
-    if (null != name && !name.startsWith(TIBCO_TMP_PREFIX)) {
-      // Sanitize Kafka Connect schema-derived suffixes from queue/topic names
-      return sanitizeDestinationName(name);
+
+    public Destination getDestination(final MessageProducer messageProducer) throws JMSException {
+        try {
+            return messageProducer.getDestination(); // >= 1.1
+        } catch (AbstractMethodError ignored) {
+            // <=1.1 getDestination is not available so we need to pay an additional instanceOf
+            if (messageProducer instanceof QueueSender) {
+                return ((QueueSender) messageProducer).getQueue();
+            }
+            return ((TopicPublisher) messageProducer).getTopic();
+        }
     }
-    return null;
-  }
-
-  public boolean isQueue(Destination destination) {
-    try {
-      // handle WebLogic by treating everything as a Queue unless it's a Topic with a name
-      return !(destination instanceof Topic) || null == ((Topic) destination).getTopicName();
-    } catch (Exception e) {
-      return true; // assume it's a Queue if we can't check the details
+
+    public String getDestinationName(Destination destination) {
+        String name = null;
+        try {
+            if (destination instanceof Queue) {
+                // WebLogic mixes all JMS Destination interfaces in a single base type which means we can't
+                // rely on instanceof and have to instead check the result of getQueueName vs getTopicName
+                if (!(destination instanceof TemporaryQueue) || isWebLogicDestination(destination)) {
+                    name = ((Queue) destination).getQueueName();
+                }
+            }
+            // check Topic name if Queue name is null because this might be a WebLogic destination
+            if (null == name && destination instanceof Topic) {
+                if (!(destination instanceof TemporaryTopic) || isWebLogicDestination(destination)) {
+                    name = ((Topic) destination).getTopicName();
+                }
+            }
+        } catch (Exception e) {
+            log.debug("Unable to get jms destination name", e);
+        }
+        if (null != name && !name.startsWith(TIBCO_TMP_PREFIX)) {
+            // Sanitize Kafka Connect schema-derived suffixes from queue/topic names
+            return sanitizeDestinationName(name);
+        }
+        return null;
+    }
+
+    public boolean isQueue(Destination destination) {
+        try {
+            // handle WebLogic by treating everything as a Queue unless it's a Topic with a name
+            return !(destination instanceof Topic) || null == ((Topic) destination).getTopicName();
+        } catch (Exception e) {
+            return true; // assume it's a Queue if we can't check the details
+        }
     }
-  }
 
-  private static boolean isWebLogicDestination(Destination destination) {
-    return destination.getClass().getName().startsWith("weblogic.jms.common.");
-  }
+    private static boolean isWebLogicDestination(Destination destination) {
+        return destination.getClass().getName().startsWith("weblogic.jms.common.");
+    }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSLogger.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSLogger.java
index 6618045254d..48362659d2b 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSLogger.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSLogger.java
@@ -5,9 +5,9 @@
 import org.slf4j.LoggerFactory;
 
 public class JMSLogger {
-  private static final Logger log = LoggerFactory.getLogger(JMSLogger.class);
+    private static final Logger log = LoggerFactory.getLogger(JMSLogger.class);
 
-  public static void logIterationSpan(AgentSpan span) {
-    log.debug("Expecting the following `ITERATION` span to be finished {}", span);
-  }
+    public static void logIterationSpan(AgentSpan span) {
+        log.debug("Expecting the following `ITERATION` span to be finished {}", span);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java
index 06d53e1ba3b..38f16375369 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java
@@ -44,201 +44,197 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public final class JMSMessageConsumerInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  private final String namespace;
-
-  public JMSMessageConsumerInstrumentation(String namespace) {
-    this.namespace = namespace;
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return namespace + ".jms.MessageConsumer";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("receive").and(takesArguments(0).or(takesArguments(1))).and(isPublic()),
-        JMSMessageConsumerInstrumentation.class.getName() + "$ConsumerAdvice");
-    transformer.applyAdvice(
-        named("receiveNoWait").and(takesArguments(0)).and(isPublic()),
-        JMSMessageConsumerInstrumentation.class.getName() + "$ConsumerAdvice");
-    transformer.applyAdvice(
-        named("close").and(takesArguments(0)).and(isPublic()),
-        JMSMessageConsumerInstrumentation.class.getName() + "$Close");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("setMessageListener"))
-            .and(takesArgument(0, hasInterface(named(namespace + ".jms.MessageListener")))),
-        getClass().getName() + "$DecorateMessageListener");
-  }
-
-  public static class ConsumerAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static MessageConsumerState beforeReceive(@Advice.This final MessageConsumer consumer) {
-      MessageConsumerState consumerState =
-          InstrumentationContext.get(MessageConsumer.class, MessageConsumerState.class)
-              .get(consumer);
-
-      // ignore consumers who aren't bound to a tracked session via consumerState
-      if (null == consumerState) {
-        return null;
-      }
-
-      boolean finishSpan = consumerState.getSessionState().isAutoAcknowledge();
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        closePrevious(finishSpan);
-      } else {
-        final AgentSpan previousSpan = spanFromContext(rootContext().swap());
-        if (previousSpan != null) {
-          CONSUMER_DECORATE.beforeFinish(previousSpan);
-          previousSpan.finishWithEndToEnd();
-        }
-      }
-      if (finishSpan) {
-        consumerState.finishTimeInQueueSpan(false);
-      }
-
-      // don't create spans for nested receive calls, even if different consumers are involved
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MessageConsumer.class);
-      if (callDepth > 0) {
-        return null;
-      }
-
-      return consumerState;
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    private final String namespace;
+
+    public JMSMessageConsumerInstrumentation(String namespace) {
+        this.namespace = namespace;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterReceive(
-        @Advice.Enter final MessageConsumerState consumerState,
-        @Advice.This final MessageConsumer consumer,
-        @Advice.Return final Message message,
-        @Advice.Thrown final Throwable throwable) {
-
-      if (consumerState == null) {
-        // either we're not tracking the consumer or this is a nested receive
-        return;
-      }
-
-      // outermost receive call - make sure we reset call-depth before returning
-      CallDepthThreadLocalMap.reset(MessageConsumer.class);
-
-      if (message == null) {
-        // don't create spans (traces) for each poll if the queue is empty
-        return;
-      }
-
-      AgentSpan span;
-      AgentSpanContext propagatedContext = null;
-      if (!consumerState.isPropagationDisabled()) {
-        propagatedContext = extractContextAndGetSpanContext(message, GETTER);
-      }
-      long startMillis = GETTER.extractTimeInQueueStart(message);
-      if (startMillis == 0 || !TIME_IN_QUEUE_ENABLED) {
-        span = startSpan("jms", JMS_CONSUME, propagatedContext);
-      } else {
-        long batchId = GETTER.extractMessageBatchId(message);
-        AgentSpan timeInQueue = consumerState.getTimeInQueueSpan(batchId);
-        if (null == timeInQueue) {
-          timeInQueue =
-              startSpan("jms", JMS_DELIVER, propagatedContext, MILLISECONDS.toMicros(startMillis));
-          BROKER_DECORATE.afterStart(timeInQueue);
-          BROKER_DECORATE.onTimeInQueue(
-              timeInQueue,
-              consumerState.getBrokerResourceName(),
-              consumerState.getBrokerServiceName());
-          consumerState.setTimeInQueueSpan(batchId, timeInQueue);
-        }
-        span = startSpan("jms", JMS_CONSUME, timeInQueue.spanContext());
-      }
-
-      CONSUMER_DECORATE.afterStart(span);
-      CONSUMER_DECORATE.onConsume(span, message, consumerState.getConsumerResourceName());
-
-      if (Config.get().isDataStreamsEnabled()) {
-        final String tech = messageTechnology(message);
-        if ("ibmmq".equals(tech)) { // Initial release only supports DSM in JMS for IBM MQ
-          DataStreamsTags tags =
-              create(tech, INBOUND, consumerState.getConsumerBaseResourceName().toString());
-          DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
-          AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, dsmContext);
-        }
-      }
+    @Override
+    public String hierarchyMarkerType() {
+        return namespace + ".jms.MessageConsumer";
+    }
 
-      CONSUMER_DECORATE.onError(span, throwable);
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        activateNext(span); // scope is left open until next message or it times out
-      } else {
-        final AgentSpan previousSpan = spanFromContext(span.swap());
-        if (previousSpan != null) {
-          CONSUMER_DECORATE.beforeFinish(previousSpan);
-          previousSpan.finishWithEndToEnd();
-        }
-      }
-      JMSLogger.logIterationSpan(span);
-
-      SessionState sessionState = consumerState.getSessionState();
-      if (sessionState.isClientAcknowledge()) {
-        // consumed spans will be finished by a call to Message.acknowledge
-        sessionState.finishOnAcknowledge(span);
-        InstrumentationContext.get(Message.class, SessionState.class).put(message, sessionState);
-      } else if (sessionState.isTransactedSession()) {
-        // span will be finished by Session.commit/rollback/close
-        sessionState.finishOnCommit(span);
-      }
-      // for AUTO_ACKNOWLEDGE, span is not finished until next call to receive, or close
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("receive").and(takesArguments(0).or(takesArguments(1))).and(isPublic()),
+                JMSMessageConsumerInstrumentation.class.getName() + "$ConsumerAdvice");
+        transformer.applyAdvice(
+                named("receiveNoWait").and(takesArguments(0)).and(isPublic()),
+                JMSMessageConsumerInstrumentation.class.getName() + "$ConsumerAdvice");
+        transformer.applyAdvice(
+                named("close").and(takesArguments(0)).and(isPublic()),
+                JMSMessageConsumerInstrumentation.class.getName() + "$Close");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("setMessageListener"))
+                        .and(takesArgument(0, hasInterface(named(namespace + ".jms.MessageListener")))),
+                getClass().getName() + "$DecorateMessageListener");
     }
-  }
-
-  public static class Close {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void beforeClose(@Advice.This final MessageConsumer consumer) {
-      MessageConsumerState consumerState =
-          InstrumentationContext.get(MessageConsumer.class, MessageConsumerState.class)
-              .get(consumer);
-      if (null != consumerState) {
-        boolean finishSpan = consumerState.getSessionState().isAutoAcknowledge();
-        if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-          closePrevious(finishSpan);
-        } else {
-          final AgentSpan previousSpan = spanFromContext(rootContext().swap());
-          if (previousSpan != null) {
-            CONSUMER_DECORATE.beforeFinish(previousSpan);
-            previousSpan.finishWithEndToEnd();
-          }
+
+    public static class ConsumerAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static MessageConsumerState beforeReceive(@Advice.This final MessageConsumer consumer) {
+            MessageConsumerState consumerState = InstrumentationContext.get(
+                            MessageConsumer.class, MessageConsumerState.class)
+                    .get(consumer);
+
+            // ignore consumers who aren't bound to a tracked session via consumerState
+            if (null == consumerState) {
+                return null;
+            }
+
+            boolean finishSpan = consumerState.getSessionState().isAutoAcknowledge();
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                closePrevious(finishSpan);
+            } else {
+                final AgentSpan previousSpan = spanFromContext(rootContext().swap());
+                if (previousSpan != null) {
+                    CONSUMER_DECORATE.beforeFinish(previousSpan);
+                    previousSpan.finishWithEndToEnd();
+                }
+            }
+            if (finishSpan) {
+                consumerState.finishTimeInQueueSpan(false);
+            }
+
+            // don't create spans for nested receive calls, even if different consumers are involved
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MessageConsumer.class);
+            if (callDepth > 0) {
+                return null;
+            }
+
+            return consumerState;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterReceive(
+                @Advice.Enter final MessageConsumerState consumerState,
+                @Advice.This final MessageConsumer consumer,
+                @Advice.Return final Message message,
+                @Advice.Thrown final Throwable throwable) {
+
+            if (consumerState == null) {
+                // either we're not tracking the consumer or this is a nested receive
+                return;
+            }
+
+            // outermost receive call - make sure we reset call-depth before returning
+            CallDepthThreadLocalMap.reset(MessageConsumer.class);
+
+            if (message == null) {
+                // don't create spans (traces) for each poll if the queue is empty
+                return;
+            }
+
+            AgentSpan span;
+            AgentSpanContext propagatedContext = null;
+            if (!consumerState.isPropagationDisabled()) {
+                propagatedContext = extractContextAndGetSpanContext(message, GETTER);
+            }
+            long startMillis = GETTER.extractTimeInQueueStart(message);
+            if (startMillis == 0 || !TIME_IN_QUEUE_ENABLED) {
+                span = startSpan("jms", JMS_CONSUME, propagatedContext);
+            } else {
+                long batchId = GETTER.extractMessageBatchId(message);
+                AgentSpan timeInQueue = consumerState.getTimeInQueueSpan(batchId);
+                if (null == timeInQueue) {
+                    timeInQueue = startSpan("jms", JMS_DELIVER, propagatedContext, MILLISECONDS.toMicros(startMillis));
+                    BROKER_DECORATE.afterStart(timeInQueue);
+                    BROKER_DECORATE.onTimeInQueue(
+                            timeInQueue, consumerState.getBrokerResourceName(), consumerState.getBrokerServiceName());
+                    consumerState.setTimeInQueueSpan(batchId, timeInQueue);
+                }
+                span = startSpan("jms", JMS_CONSUME, timeInQueue.spanContext());
+            }
+
+            CONSUMER_DECORATE.afterStart(span);
+            CONSUMER_DECORATE.onConsume(span, message, consumerState.getConsumerResourceName());
+
+            if (Config.get().isDataStreamsEnabled()) {
+                final String tech = messageTechnology(message);
+                if ("ibmmq".equals(tech)) { // Initial release only supports DSM in JMS for IBM MQ
+                    DataStreamsTags tags = create(
+                            tech,
+                            INBOUND,
+                            consumerState.getConsumerBaseResourceName().toString());
+                    DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
+                    AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, dsmContext);
+                }
+            }
+
+            CONSUMER_DECORATE.onError(span, throwable);
+
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                activateNext(span); // scope is left open until next message or it times out
+            } else {
+                final AgentSpan previousSpan = spanFromContext(span.swap());
+                if (previousSpan != null) {
+                    CONSUMER_DECORATE.beforeFinish(previousSpan);
+                    previousSpan.finishWithEndToEnd();
+                }
+            }
+            JMSLogger.logIterationSpan(span);
+
+            SessionState sessionState = consumerState.getSessionState();
+            if (sessionState.isClientAcknowledge()) {
+                // consumed spans will be finished by a call to Message.acknowledge
+                sessionState.finishOnAcknowledge(span);
+                InstrumentationContext.get(Message.class, SessionState.class).put(message, sessionState);
+            } else if (sessionState.isTransactedSession()) {
+                // span will be finished by Session.commit/rollback/close
+                sessionState.finishOnCommit(span);
+            }
+            // for AUTO_ACKNOWLEDGE, span is not finished until next call to receive, or close
         }
-        if (finishSpan) {
-          consumerState.finishTimeInQueueSpan(true);
+    }
+
+    public static class Close {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void beforeClose(@Advice.This final MessageConsumer consumer) {
+            MessageConsumerState consumerState = InstrumentationContext.get(
+                            MessageConsumer.class, MessageConsumerState.class)
+                    .get(consumer);
+            if (null != consumerState) {
+                boolean finishSpan = consumerState.getSessionState().isAutoAcknowledge();
+                if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                    closePrevious(finishSpan);
+                } else {
+                    final AgentSpan previousSpan = spanFromContext(rootContext().swap());
+                    if (previousSpan != null) {
+                        CONSUMER_DECORATE.beforeFinish(previousSpan);
+                        previousSpan.finishWithEndToEnd();
+                    }
+                }
+                if (finishSpan) {
+                    consumerState.finishTimeInQueueSpan(true);
+                }
+            }
         }
-      }
     }
-  }
-
-  public static class DecorateMessageListener {
-    @Advice.OnMethodEnter
-    public static void setMessageListener(
-        @Advice.This MessageConsumer messageConsumer,
-        @Advice.Argument(value = 0, readOnly = false) MessageListener listener) {
-      if (null != listener && !(listener instanceof DatadogMessageListener)) {
-        MessageConsumerState consumerState =
-            InstrumentationContext.get(MessageConsumer.class, MessageConsumerState.class)
-                .get(messageConsumer);
-        if (null != consumerState) {
-          listener =
-              new DatadogMessageListener(
-                  InstrumentationContext.get(Message.class, SessionState.class),
-                  consumerState,
-                  listener);
+
+    public static class DecorateMessageListener {
+        @Advice.OnMethodEnter
+        public static void setMessageListener(
+                @Advice.This MessageConsumer messageConsumer,
+                @Advice.Argument(value = 0, readOnly = false) MessageListener listener) {
+            if (null != listener && !(listener instanceof DatadogMessageListener)) {
+                MessageConsumerState consumerState = InstrumentationContext.get(
+                                MessageConsumer.class, MessageConsumerState.class)
+                        .get(messageConsumer);
+                if (null != consumerState) {
+                    listener = new DatadogMessageListener(
+                            InstrumentationContext.get(Message.class, SessionState.class), consumerState, listener);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java
index 3a2d482de8a..3f20a062dfb 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java
@@ -38,197 +38,195 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public final class JMSMessageProducerInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  private final String namespace;
-
-  public JMSMessageProducerInstrumentation(String namespace) {
-    this.namespace = namespace;
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return namespace + ".jms.MessageProducer";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        named("send").and(takesArgument(0, named(namespace + ".jms.Message"))).and(isPublic()),
-        JMSMessageProducerInstrumentation.class.getName() + "$ProducerAdvice",
-        JMSMessageProducerInstrumentation.class.getName() + "$ProducerContextPropagationAdvice");
-    transformer.applyAdvices(
-        named("send")
-            .and(takesArgument(0, hasInterface(named(namespace + ".jms.Destination"))))
-            .and(takesArgument(1, named(namespace + ".jms.Message")))
-            .and(isPublic()),
-        JMSMessageProducerInstrumentation.class.getName() + "$ProducerWithDestinationAdvice",
-        JMSMessageProducerInstrumentation.class.getName()
-            + "$ProducerWithDestinationContextPropagationAdvice");
-  }
-
-  public static class ProducerAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beforeSend(
-        @Advice.Argument(0) final Message message, @Advice.This final MessageProducer producer) {
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MessageProducer.class);
-      if (callDepth > 0) {
-        return null;
-      }
-
-      MessageProducerState producerState =
-          InstrumentationContext.get(MessageProducer.class, MessageProducerState.class)
-              .get(producer);
-
-      CharSequence resourceName;
-      String destinationName;
-      try {
-        // fall-back when producer wasn't created via standard Session.createProducer API
-        if (null != producerState) {
-          resourceName = producerState.getResourceName();
-          Destination destination = PRODUCER_DECORATE.getDestination(producer);
-          destinationName = PRODUCER_DECORATE.getDestinationName(destination);
-        } else {
-          Destination destination = PRODUCER_DECORATE.getDestination(producer);
-          destinationName = PRODUCER_DECORATE.getDestinationName(destination);
-          boolean isQueue = PRODUCER_DECORATE.isQueue(destination);
-          resourceName = PRODUCER_DECORATE.toResourceName(destinationName, isQueue);
-        }
-      } catch (Exception ignored) {
-        resourceName = "Unknown Destination";
-        destinationName = "";
-      }
-
-      final AgentSpan span = startSpan("jms", JMS_PRODUCE);
-      PRODUCER_DECORATE.afterStart(span);
-      PRODUCER_DECORATE.onProduce(span, resourceName);
-
-      if (null != destinationName
-          && !destinationName.isEmpty()
-          && Config.get().isDataStreamsEnabled()) {
-        final String tech = messageTechnology(message);
-        if ("ibmmq".equals(tech)) { // Initial release only supports DSM in JMS for IBM MQ
-          DataStreamsTags tags = create(tech, OUTBOUND, destinationName);
-          DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
-          AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, dsmContext);
-        }
-      }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    private final String namespace;
 
-      if (JMSDecorator.canInject(message) && TIME_IN_QUEUE_ENABLED && null != producerState) {
-        SETTER.injectTimeInQueue(message, producerState);
-      }
-      return activateSpan(span);
+    public JMSMessageProducerInstrumentation(String namespace) {
+        this.namespace = namespace;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterSend(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      PRODUCER_DECORATE.onError(scope, throwable);
-      PRODUCER_DECORATE.beforeFinish(scope);
-      scope.close();
-      spanFromScope(scope).finish();
-      CallDepthThreadLocalMap.reset(MessageProducer.class);
+    @Override
+    public String hierarchyMarkerType() {
+        return namespace + ".jms.MessageProducer";
     }
-  }
-
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ProducerContextPropagationAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) final Message message, @Advice.This final MessageProducer producer) {
-      AgentSpan span = activeSpan();
-      if (span == null) return;
-      if (JMSDecorator.canInject(message) && Config.get().isJmsPropagationEnabled()) {
-        MessageProducerState producerState =
-            InstrumentationContext.get(MessageProducer.class, MessageProducerState.class)
-                .get(producer);
-        if (null == producerState || !producerState.isPropagationDisabled()) {
-          defaultPropagator().inject(span, message, SETTER);
-        }
-      }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
     }
-  }
-
-  public static class ProducerWithDestinationAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beforeSend(
-        @Advice.Argument(0) final Destination destination,
-        @Advice.Argument(1) final Message message,
-        @Advice.This final MessageProducer producer) {
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MessageProducer.class);
-      if (callDepth > 0) {
-        return null;
-      }
-
-      boolean isQueue = PRODUCER_DECORATE.isQueue(destination);
-      String destinationName = PRODUCER_DECORATE.getDestinationName(destination);
-      CharSequence resourceName = PRODUCER_DECORATE.toResourceName(destinationName, isQueue);
-
-      final AgentSpan span = startSpan("jms", JMS_PRODUCE);
-      PRODUCER_DECORATE.afterStart(span);
-      PRODUCER_DECORATE.onProduce(span, resourceName);
-
-      if (null != destinationName
-          && !destinationName.isEmpty()
-          && Config.get().isDataStreamsEnabled()) {
-        final String tech = messageTechnology(message);
-        if ("ibmmq".equals(tech)) { // Initial release only supports DSM in JMS for IBM MQ
-          DataStreamsTags tags = create(tech, OUTBOUND, destinationName);
-          DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
-          AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, dsmContext);
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                named("send")
+                        .and(takesArgument(0, named(namespace + ".jms.Message")))
+                        .and(isPublic()),
+                JMSMessageProducerInstrumentation.class.getName() + "$ProducerAdvice",
+                JMSMessageProducerInstrumentation.class.getName() + "$ProducerContextPropagationAdvice");
+        transformer.applyAdvices(
+                named("send")
+                        .and(takesArgument(0, hasInterface(named(namespace + ".jms.Destination"))))
+                        .and(takesArgument(1, named(namespace + ".jms.Message")))
+                        .and(isPublic()),
+                JMSMessageProducerInstrumentation.class.getName() + "$ProducerWithDestinationAdvice",
+                JMSMessageProducerInstrumentation.class.getName() + "$ProducerWithDestinationContextPropagationAdvice");
+    }
+
+    public static class ProducerAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beforeSend(
+                @Advice.Argument(0) final Message message, @Advice.This final MessageProducer producer) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MessageProducer.class);
+            if (callDepth > 0) {
+                return null;
+            }
+
+            MessageProducerState producerState = InstrumentationContext.get(
+                            MessageProducer.class, MessageProducerState.class)
+                    .get(producer);
+
+            CharSequence resourceName;
+            String destinationName;
+            try {
+                // fall-back when producer wasn't created via standard Session.createProducer API
+                if (null != producerState) {
+                    resourceName = producerState.getResourceName();
+                    Destination destination = PRODUCER_DECORATE.getDestination(producer);
+                    destinationName = PRODUCER_DECORATE.getDestinationName(destination);
+                } else {
+                    Destination destination = PRODUCER_DECORATE.getDestination(producer);
+                    destinationName = PRODUCER_DECORATE.getDestinationName(destination);
+                    boolean isQueue = PRODUCER_DECORATE.isQueue(destination);
+                    resourceName = PRODUCER_DECORATE.toResourceName(destinationName, isQueue);
+                }
+            } catch (Exception ignored) {
+                resourceName = "Unknown Destination";
+                destinationName = "";
+            }
+
+            final AgentSpan span = startSpan("jms", JMS_PRODUCE);
+            PRODUCER_DECORATE.afterStart(span);
+            PRODUCER_DECORATE.onProduce(span, resourceName);
+
+            if (null != destinationName
+                    && !destinationName.isEmpty()
+                    && Config.get().isDataStreamsEnabled()) {
+                final String tech = messageTechnology(message);
+                if ("ibmmq".equals(tech)) { // Initial release only supports DSM in JMS for IBM MQ
+                    DataStreamsTags tags = create(tech, OUTBOUND, destinationName);
+                    DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
+                    AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, dsmContext);
+                }
+            }
+
+            if (JMSDecorator.canInject(message) && TIME_IN_QUEUE_ENABLED && null != producerState) {
+                SETTER.injectTimeInQueue(message, producerState);
+            }
+            return activateSpan(span);
         }
-      }
-
-      if (JMSDecorator.canInject(message) && TIME_IN_QUEUE_ENABLED) {
-        MessageProducerState producerState =
-            InstrumentationContext.get(MessageProducer.class, MessageProducerState.class)
-                .get(producer);
-        if (null != producerState) {
-          SETTER.injectTimeInQueue(message, producerState);
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterSend(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            PRODUCER_DECORATE.onError(scope, throwable);
+            PRODUCER_DECORATE.beforeFinish(scope);
+            scope.close();
+            spanFromScope(scope).finish();
+            CallDepthThreadLocalMap.reset(MessageProducer.class);
         }
-      }
-      return activateSpan(span);
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterSend(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      PRODUCER_DECORATE.onError(scope, throwable);
-      PRODUCER_DECORATE.beforeFinish(scope);
-      scope.close();
-      spanFromScope(scope).finish();
-      CallDepthThreadLocalMap.reset(MessageProducer.class);
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ProducerContextPropagationAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Argument(0) final Message message, @Advice.This final MessageProducer producer) {
+            AgentSpan span = activeSpan();
+            if (span == null) return;
+            if (JMSDecorator.canInject(message) && Config.get().isJmsPropagationEnabled()) {
+                MessageProducerState producerState = InstrumentationContext.get(
+                                MessageProducer.class, MessageProducerState.class)
+                        .get(producer);
+                if (null == producerState || !producerState.isPropagationDisabled()) {
+                    defaultPropagator().inject(span, message, SETTER);
+                }
+            }
+        }
     }
-  }
-
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ProducerWithDestinationContextPropagationAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) final Destination destination,
-        @Advice.Argument(1) final Message message) {
-      AgentSpan span = activeSpan();
-      if (span == null) return;
-      if (JMSDecorator.canInject(message) && Config.get().isJmsPropagationEnabled()) {
-        String destinationName = PRODUCER_DECORATE.getDestinationName(destination);
-        if (!Config.get().isJmsPropagationDisabledForDestination(destinationName)) {
-          defaultPropagator().inject(span, message, SETTER);
+
+    public static class ProducerWithDestinationAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beforeSend(
+                @Advice.Argument(0) final Destination destination,
+                @Advice.Argument(1) final Message message,
+                @Advice.This final MessageProducer producer) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MessageProducer.class);
+            if (callDepth > 0) {
+                return null;
+            }
+
+            boolean isQueue = PRODUCER_DECORATE.isQueue(destination);
+            String destinationName = PRODUCER_DECORATE.getDestinationName(destination);
+            CharSequence resourceName = PRODUCER_DECORATE.toResourceName(destinationName, isQueue);
+
+            final AgentSpan span = startSpan("jms", JMS_PRODUCE);
+            PRODUCER_DECORATE.afterStart(span);
+            PRODUCER_DECORATE.onProduce(span, resourceName);
+
+            if (null != destinationName
+                    && !destinationName.isEmpty()
+                    && Config.get().isDataStreamsEnabled()) {
+                final String tech = messageTechnology(message);
+                if ("ibmmq".equals(tech)) { // Initial release only supports DSM in JMS for IBM MQ
+                    DataStreamsTags tags = create(tech, OUTBOUND, destinationName);
+                    DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
+                    AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, dsmContext);
+                }
+            }
+
+            if (JMSDecorator.canInject(message) && TIME_IN_QUEUE_ENABLED) {
+                MessageProducerState producerState = InstrumentationContext.get(
+                                MessageProducer.class, MessageProducerState.class)
+                        .get(producer);
+                if (null != producerState) {
+                    SETTER.injectTimeInQueue(message, producerState);
+                }
+            }
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterSend(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            PRODUCER_DECORATE.onError(scope, throwable);
+            PRODUCER_DECORATE.beforeFinish(scope);
+            scope.close();
+            spanFromScope(scope).finish();
+            CallDepthThreadLocalMap.reset(MessageProducer.class);
+        }
+    }
+
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ProducerWithDestinationContextPropagationAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Argument(0) final Destination destination, @Advice.Argument(1) final Message message) {
+            AgentSpan span = activeSpan();
+            if (span == null) return;
+            if (JMSDecorator.canInject(message) && Config.get().isJmsPropagationEnabled()) {
+                String destinationName = PRODUCER_DECORATE.getDestinationName(destination);
+                if (!Config.get().isJmsPropagationDisabledForDestination(destinationName)) {
+                    defaultPropagator().inject(span, message, SETTER);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JavaxJmsModule.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JavaxJmsModule.java
index 1bc43bb5657..fc63c12160c 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JavaxJmsModule.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JavaxJmsModule.java
@@ -13,39 +13,39 @@
 
 @AutoService(InstrumenterModule.class)
 public class JavaxJmsModule extends InstrumenterModule.Tracing {
-  private final String namespace;
+    private final String namespace;
 
-  public JavaxJmsModule() {
-    this("javax", "jms", "jms-1", "jms-2");
-  }
+    public JavaxJmsModule() {
+        this("javax", "jms", "jms-1", "jms-2");
+    }
 
-  public JavaxJmsModule(String namespace, String instrumentationName, String... additionalNames) {
-    super(instrumentationName, additionalNames);
-    this.namespace = namespace;
-  }
+    public JavaxJmsModule(String namespace, String instrumentationName, String... additionalNames) {
+        super(instrumentationName, additionalNames);
+        this.namespace = namespace;
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "javax.jms";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "javax.jms";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStore = new HashMap<>(4);
-    contextStore.put(namespace + ".jms.MessageConsumer", MessageConsumerState.class.getName());
-    contextStore.put(namespace + ".jms.MessageProducer", MessageProducerState.class.getName());
-    contextStore.put(namespace + ".jms.Message", SessionState.class.getName());
-    contextStore.put(namespace + ".jms.Session", SessionState.class.getName());
-    return contextStore;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStore = new HashMap<>(4);
+        contextStore.put(namespace + ".jms.MessageConsumer", MessageConsumerState.class.getName());
+        contextStore.put(namespace + ".jms.MessageProducer", MessageProducerState.class.getName());
+        contextStore.put(namespace + ".jms.Message", SessionState.class.getName());
+        contextStore.put(namespace + ".jms.Session", SessionState.class.getName());
+        return contextStore;
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new JMSMessageConsumerInstrumentation(namespace),
-        new JMSMessageProducerInstrumentation(namespace),
-        new MDBMessageConsumerInstrumentation(namespace),
-        new MessageInstrumentation(namespace),
-        new SessionInstrumentation(namespace));
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(
+                new JMSMessageConsumerInstrumentation(namespace),
+                new JMSMessageProducerInstrumentation(namespace),
+                new MDBMessageConsumerInstrumentation(namespace),
+                new MessageInstrumentation(namespace),
+                new SessionInstrumentation(namespace));
+    }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java
index c8b04c89c97..9a4f584a94b 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java
@@ -33,83 +33,81 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public final class MDBMessageConsumerInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  private final String namespace;
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    private final String namespace;
 
-  public MDBMessageConsumerInstrumentation(String namespace) {
-    this.namespace = namespace;
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return namespace + ".jms.MessageListener";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        .and(
-            hasSuperType(declaresAnnotation(named(namespace + ".ejb.MessageDriven")))
-                .or(implementsInterface(named(namespace + ".ejb.MessageDrivenBean"))));
-  }
+    public MDBMessageConsumerInstrumentation(String namespace) {
+        this.namespace = namespace;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(isPublic())
-            .and(named("onMessage"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, (named(namespace + ".jms.Message")))),
-        getClass().getName() + "$ContextPropagationAdvice",
-        getClass().getName() + "$MDBAdvice");
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return namespace + ".jms.MessageListener";
+    }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) final Message message, @Advice.Local("ctxScope") ContextScope scope) {
-      scope = defaultPropagator().extract(rootContext(), message, GETTER).attach();
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                .and(hasSuperType(declaresAnnotation(named(namespace + ".ejb.MessageDriven")))
+                        .or(implementsInterface(named(namespace + ".ejb.MessageDrivenBean"))));
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(@Advice.Local("ctxScope") ContextScope scope) {
-      if (scope != null) scope.close();
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("onMessage"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, (named(namespace + ".jms.Message")))),
+                getClass().getName() + "$ContextPropagationAdvice",
+                getClass().getName() + "$MDBAdvice");
     }
-  }
 
-  public static class MDBAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(@Advice.Argument(0) final Message message) {
-      if (CallDepthThreadLocalMap.incrementCallDepth(MessageListener.class) > 0) {
-        return null;
-      }
-      AgentSpan span = startSpan("jms", JMS_CONSUME);
-      CONSUMER_DECORATE.afterStart(span);
-      CharSequence consumerResourceName;
-      try {
-        Destination destination = message.getJMSDestination();
-        boolean isQueue = CONSUMER_DECORATE.isQueue(destination);
-        String destinationName = CONSUMER_DECORATE.getDestinationName(destination);
-        consumerResourceName = CONSUMER_DECORATE.toResourceName(destinationName, isQueue);
-      } catch (JMSException e) {
-        logJMSException(e);
-        consumerResourceName = "unknown JMS destination";
-      }
-      CONSUMER_DECORATE.onConsume(span, message, consumerResourceName);
-      return activateSpan(span);
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Argument(0) final Message message, @Advice.Local("ctxScope") ContextScope scope) {
+            scope = defaultPropagator().extract(rootContext(), message, GETTER).attach();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(@Advice.Local("ctxScope") ContextScope scope) {
+            if (scope != null) scope.close();
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (null != scope) {
-        CallDepthThreadLocalMap.reset(MessageListener.class);
-        CONSUMER_DECORATE.onError(scope, throwable);
-        scope.close();
-        spanFromScope(scope).finish();
-      }
+    public static class MDBAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(@Advice.Argument(0) final Message message) {
+            if (CallDepthThreadLocalMap.incrementCallDepth(MessageListener.class) > 0) {
+                return null;
+            }
+            AgentSpan span = startSpan("jms", JMS_CONSUME);
+            CONSUMER_DECORATE.afterStart(span);
+            CharSequence consumerResourceName;
+            try {
+                Destination destination = message.getJMSDestination();
+                boolean isQueue = CONSUMER_DECORATE.isQueue(destination);
+                String destinationName = CONSUMER_DECORATE.getDestinationName(destination);
+                consumerResourceName = CONSUMER_DECORATE.toResourceName(destinationName, isQueue);
+            } catch (JMSException e) {
+                logJMSException(e);
+                consumerResourceName = "unknown JMS destination";
+            }
+            CONSUMER_DECORATE.onConsume(span, message, consumerResourceName);
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(@Advice.Enter ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (null != scope) {
+                CallDepthThreadLocalMap.reset(MessageListener.class);
+                CONSUMER_DECORATE.onError(scope, throwable);
+                scope.close();
+                spanFromScope(scope).finish();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MessageExtractAdapter.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MessageExtractAdapter.java
index 6d233e3c276..d31c440dd4b 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MessageExtractAdapter.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MessageExtractAdapter.java
@@ -16,66 +16,65 @@
 import org.slf4j.LoggerFactory;
 
 public final class MessageExtractAdapter implements AgentPropagation.ContextVisitor<Message> {
-  private static final Logger log = LoggerFactory.getLogger(MessageExtractAdapter.class);
-  private static final Function<String, String> KEY_MAPPER =
-      new Function<String, String>() {
+    private static final Logger log = LoggerFactory.getLogger(MessageExtractAdapter.class);
+    private static final Function<String, String> KEY_MAPPER = new Function<String, String>() {
         @SuppressForbidden
         @Override
         public String apply(String key) {
-          return key.replace("__dash__", "-").replace('$', '-').toLowerCase(Locale.ROOT);
+            return key.replace("__dash__", "-").replace('$', '-').toLowerCase(Locale.ROOT);
         }
-      };
+    };
 
-  private final DDCache<String, String> cache = DDCaches.newFixedSizeCache(32);
+    private final DDCache<String, String> cache = DDCaches.newFixedSizeCache(32);
 
-  public static final MessageExtractAdapter GETTER = new MessageExtractAdapter();
+    public static final MessageExtractAdapter GETTER = new MessageExtractAdapter();
 
-  @Override
-  public void forEachKey(Message carrier, AgentPropagation.KeyClassifier classifier) {
-    try {
-      final Enumeration<?> enumeration = carrier.getPropertyNames();
-      if (null != enumeration) {
-        while (enumeration.hasMoreElements()) {
-          String key = ((String) enumeration.nextElement());
-          String lowerCaseKey = cache.computeIfAbsent(key, KEY_MAPPER);
-          Object value = null;
-          try {
-            value = carrier.getObjectProperty(key);
-          } catch (Throwable t) {
-            // log and ignore if we cannot access this property but don't break the instrumentation
-            if (log.isDebugEnabled()) {
-              log.debug("Error accessing message property {}", key, t);
+    @Override
+    public void forEachKey(Message carrier, AgentPropagation.KeyClassifier classifier) {
+        try {
+            final Enumeration<?> enumeration = carrier.getPropertyNames();
+            if (null != enumeration) {
+                while (enumeration.hasMoreElements()) {
+                    String key = ((String) enumeration.nextElement());
+                    String lowerCaseKey = cache.computeIfAbsent(key, KEY_MAPPER);
+                    Object value = null;
+                    try {
+                        value = carrier.getObjectProperty(key);
+                    } catch (Throwable t) {
+                        // log and ignore if we cannot access this property but don't break the instrumentation
+                        if (log.isDebugEnabled()) {
+                            log.debug("Error accessing message property {}", key, t);
+                        }
+                    }
+                    if (value instanceof String && !classifier.accept(lowerCaseKey, (String) value)) {
+                        return;
+                    }
+                }
             }
-          }
-          if (value instanceof String && !classifier.accept(lowerCaseKey, (String) value)) {
-            return;
-          }
+        } catch (JMSException e) {
+            throw new RuntimeException(e);
         }
-      }
-    } catch (JMSException e) {
-      throw new RuntimeException(e);
     }
-  }
 
-  public long extractTimeInQueueStart(final Message carrier) {
-    try {
-      if (carrier.propertyExists(JMS_PRODUCED_KEY)) {
-        return carrier.getLongProperty(JMS_PRODUCED_KEY);
-      }
-    } catch (Exception e) {
-      log.debug("Unable to get jms produced time", e);
+    public long extractTimeInQueueStart(final Message carrier) {
+        try {
+            if (carrier.propertyExists(JMS_PRODUCED_KEY)) {
+                return carrier.getLongProperty(JMS_PRODUCED_KEY);
+            }
+        } catch (Exception e) {
+            log.debug("Unable to get jms produced time", e);
+        }
+        return 0;
     }
-    return 0;
-  }
 
-  public long extractMessageBatchId(final Message carrier) {
-    try {
-      if (carrier.propertyExists(JMS_BATCH_ID_KEY)) {
-        return carrier.getLongProperty(JMS_BATCH_ID_KEY);
-      }
-    } catch (Exception e) {
-      log.debug("Unable to get jms batch id", e);
+    public long extractMessageBatchId(final Message carrier) {
+        try {
+            if (carrier.propertyExists(JMS_BATCH_ID_KEY)) {
+                return carrier.getLongProperty(JMS_BATCH_ID_KEY);
+            }
+        } catch (Exception e) {
+            log.debug("Unable to get jms batch id", e);
+        }
+        return 0;
     }
-    return 0;
-  }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MessageInjectAdapter.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MessageInjectAdapter.java
index 7d2e558fc79..6418f5f7bd2 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MessageInjectAdapter.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MessageInjectAdapter.java
@@ -13,33 +13,33 @@
 import org.slf4j.LoggerFactory;
 
 public class MessageInjectAdapter implements CarrierSetter<Message> {
-  private static final Logger log = LoggerFactory.getLogger(MessageInjectAdapter.class);
+    private static final Logger log = LoggerFactory.getLogger(MessageInjectAdapter.class);
 
-  public static final MessageInjectAdapter SETTER = new MessageInjectAdapter();
+    public static final MessageInjectAdapter SETTER = new MessageInjectAdapter();
 
-  @ParametersAreNonnullByDefault
-  @SuppressForbidden
-  @Override
-  public void set(final Message carrier, final String key, final String value) {
-    final String propName = key.replace("-", "__dash__");
-    try {
-      carrier.setStringProperty(propName, value);
-    } catch (Exception e) {
-      log.debug("Failure setting jms property: {}", propName, e);
+    @ParametersAreNonnullByDefault
+    @SuppressForbidden
+    @Override
+    public void set(final Message carrier, final String key, final String value) {
+        final String propName = key.replace("-", "__dash__");
+        try {
+            carrier.setStringProperty(propName, value);
+        } catch (Exception e) {
+            log.debug("Failure setting jms property: {}", propName, e);
+        }
     }
-  }
 
-  public void injectTimeInQueue(final Message carrier, final MessageProducerState producerState) {
-    try {
-      if (producerState.getSessionState().isTransactedSession()) {
-        MessageBatchState batchState = producerState.currentBatchState();
-        carrier.setLongProperty(JMS_BATCH_ID_KEY, batchState.getBatchId());
-        carrier.setLongProperty(JMS_PRODUCED_KEY, batchState.getStartMillis());
-      } else {
-        carrier.setLongProperty(JMS_PRODUCED_KEY, System.currentTimeMillis());
-      }
-    } catch (Exception e) {
-      log.debug("Failure setting jms batch details", e);
+    public void injectTimeInQueue(final Message carrier, final MessageProducerState producerState) {
+        try {
+            if (producerState.getSessionState().isTransactedSession()) {
+                MessageBatchState batchState = producerState.currentBatchState();
+                carrier.setLongProperty(JMS_BATCH_ID_KEY, batchState.getBatchId());
+                carrier.setLongProperty(JMS_PRODUCED_KEY, batchState.getStartMillis());
+            } else {
+                carrier.setLongProperty(JMS_PRODUCED_KEY, System.currentTimeMillis());
+            }
+        } catch (Exception e) {
+            log.debug("Failure setting jms batch details", e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MessageInstrumentation.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MessageInstrumentation.java
index 8bfda025d32..af8200e1edb 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MessageInstrumentation.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MessageInstrumentation.java
@@ -15,39 +15,38 @@
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
-public class MessageInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  private final String namespace;
-
-  public MessageInstrumentation(String namespace) {
-    this.namespace = namespace;
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return namespace + ".jms.Message";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        nameStartsWith("acknowledge").and(isMethod()).and(isPublic()).and(takesNoArguments()),
-        getClass().getName() + "$Acknowledge");
-  }
-
-  public static final class Acknowledge {
-    @Advice.OnMethodExit
-    public static void acknowledge(@Advice.This Message message) {
-      SessionState sessionState =
-          InstrumentationContext.get(Message.class, SessionState.class).get(message);
-      if (null != sessionState && sessionState.isClientAcknowledge()) {
-        sessionState.onAcknowledgeOrRecover();
-      }
+public class MessageInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    private final String namespace;
+
+    public MessageInstrumentation(String namespace) {
+        this.namespace = namespace;
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return namespace + ".jms.Message";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                nameStartsWith("acknowledge").and(isMethod()).and(isPublic()).and(takesNoArguments()),
+                getClass().getName() + "$Acknowledge");
+    }
+
+    public static final class Acknowledge {
+        @Advice.OnMethodExit
+        public static void acknowledge(@Advice.This Message message) {
+            SessionState sessionState = InstrumentationContext.get(Message.class, SessionState.class)
+                    .get(message);
+            if (null != sessionState && sessionState.isClientAcknowledge()) {
+                sessionState.onAcknowledgeOrRecover();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/SessionInstrumentation.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/SessionInstrumentation.java
index e3e657fb5d0..8d3e1be9a60 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/SessionInstrumentation.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/SessionInstrumentation.java
@@ -28,191 +28,188 @@
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
-public class SessionInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  private final String namespace;
-
-  public SessionInstrumentation(String namespace) {
-    this.namespace = namespace;
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return namespace + ".jms.Session";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("createProducer"))
-            .and(isPublic())
-            .and(takesArgument(0, named(namespace + ".jms.Destination"))),
-        getClass().getName() + "$CreateProducer");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("createSender"))
-            .and(isPublic())
-            .and(takesArgument(0, named(namespace + ".jms.Queue"))),
-        getClass().getName() + "$CreateProducer");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("createPublisher"))
-            .and(isPublic())
-            .and(takesArgument(0, named(namespace + ".jms.Topic"))),
-        getClass().getName() + "$CreateProducer");
-
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("createConsumer"))
-            .and(isPublic())
-            .and(takesArgument(0, named(namespace + ".jms.Destination"))),
-        getClass().getName() + "$CreateConsumer");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("createReceiver"))
-            .and(isPublic())
-            .and(takesArgument(0, named(namespace + ".jms.Queue"))),
-        getClass().getName() + "$CreateConsumer");
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("createSubscriber", "createDurableSubscriber"))
-            .and(isPublic())
-            .and(takesArgument(0, named(namespace + ".jms.Topic"))),
-        getClass().getName() + "$CreateConsumer");
-
-    transformer.applyAdvice(
-        namedOneOf("recover").and(takesNoArguments()), getClass().getName() + "$Recover");
-    transformer.applyAdvice(
-        namedOneOf("commit", "rollback").and(takesNoArguments()), getClass().getName() + "$Commit");
-    transformer.applyAdvice(
-        named("close").and(takesNoArguments()), getClass().getName() + "$Close");
-  }
-
-  public static final class CreateProducer {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void bindProducerState(
-        @Advice.This Session session,
-        @Advice.Argument(0) Destination destination,
-        @Advice.Return MessageProducer producer) {
-
-      ContextStore<MessageProducer, MessageProducerState> producerStateStore =
-          InstrumentationContext.get(MessageProducer.class, MessageProducerState.class);
-
-      // avoid doing the same thing more than once when there is delegation to overloads
-      if (producerStateStore.get(producer) == null) {
-        ContextStore<Session, SessionState> sessionStateStore =
-            InstrumentationContext.get(Session.class, SessionState.class);
-
-        SessionState sessionState = sessionStateStore.get(session);
-        if (null == sessionState) {
-          int ackMode;
-          try {
-            ackMode = session.getAcknowledgeMode();
-          } catch (Throwable ignored) {
-            ackMode = Session.AUTO_ACKNOWLEDGE;
-          }
-          sessionState =
-              sessionStateStore.getOrPut(session, new SessionState(ackMode, TIME_IN_QUEUE_ENABLED));
-        }
+public class SessionInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    private final String namespace;
 
-        boolean isQueue = PRODUCER_DECORATE.isQueue(destination);
-        String destinationName = PRODUCER_DECORATE.getDestinationName(destination);
-        CharSequence resourceName = PRODUCER_DECORATE.toResourceName(destinationName, isQueue);
+    public SessionInstrumentation(String namespace) {
+        this.namespace = namespace;
+    }
 
-        boolean propagationDisabled =
-            Config.get().isJmsPropagationDisabledForDestination(destinationName);
+    @Override
+    public String hierarchyMarkerType() {
+        return namespace + ".jms.Session";
+    }
 
-        producerStateStore.put(
-            producer, new MessageProducerState(sessionState, resourceName, propagationDisabled));
-      }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
     }
-  }
-
-  public static final class CreateConsumer {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void bindConsumerState(
-        @Advice.This Session session,
-        @Advice.Argument(0) Destination destination,
-        @Advice.Return MessageConsumer consumer) {
-
-      ContextStore<MessageConsumer, MessageConsumerState> consumerStateStore =
-          InstrumentationContext.get(MessageConsumer.class, MessageConsumerState.class);
-
-      // avoid doing the same thing more than once when there is delegation to overloads
-      if (consumerStateStore.get(consumer) == null) {
-        ContextStore<Session, SessionState> sessionStateStore =
-            InstrumentationContext.get(Session.class, SessionState.class);
-
-        SessionState sessionState = sessionStateStore.get(session);
-        if (null == sessionState) {
-          int ackMode;
-          try {
-            ackMode = session.getAcknowledgeMode();
-          } catch (Throwable ignored) {
-            ackMode = Session.AUTO_ACKNOWLEDGE;
-          }
-          sessionState =
-              sessionStateStore.getOrPut(session, new SessionState(ackMode, TIME_IN_QUEUE_ENABLED));
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("createProducer"))
+                        .and(isPublic())
+                        .and(takesArgument(0, named(namespace + ".jms.Destination"))),
+                getClass().getName() + "$CreateProducer");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("createSender"))
+                        .and(isPublic())
+                        .and(takesArgument(0, named(namespace + ".jms.Queue"))),
+                getClass().getName() + "$CreateProducer");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("createPublisher"))
+                        .and(isPublic())
+                        .and(takesArgument(0, named(namespace + ".jms.Topic"))),
+                getClass().getName() + "$CreateProducer");
+
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("createConsumer"))
+                        .and(isPublic())
+                        .and(takesArgument(0, named(namespace + ".jms.Destination"))),
+                getClass().getName() + "$CreateConsumer");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("createReceiver"))
+                        .and(isPublic())
+                        .and(takesArgument(0, named(namespace + ".jms.Queue"))),
+                getClass().getName() + "$CreateConsumer");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("createSubscriber", "createDurableSubscriber"))
+                        .and(isPublic())
+                        .and(takesArgument(0, named(namespace + ".jms.Topic"))),
+                getClass().getName() + "$CreateConsumer");
+
+        transformer.applyAdvice(
+                namedOneOf("recover").and(takesNoArguments()), getClass().getName() + "$Recover");
+        transformer.applyAdvice(
+                namedOneOf("commit", "rollback").and(takesNoArguments()),
+                getClass().getName() + "$Commit");
+        transformer.applyAdvice(
+                named("close").and(takesNoArguments()), getClass().getName() + "$Close");
+    }
+
+    public static final class CreateProducer {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void bindProducerState(
+                @Advice.This Session session,
+                @Advice.Argument(0) Destination destination,
+                @Advice.Return MessageProducer producer) {
+
+            ContextStore<MessageProducer, MessageProducerState> producerStateStore =
+                    InstrumentationContext.get(MessageProducer.class, MessageProducerState.class);
+
+            // avoid doing the same thing more than once when there is delegation to overloads
+            if (producerStateStore.get(producer) == null) {
+                ContextStore<Session, SessionState> sessionStateStore =
+                        InstrumentationContext.get(Session.class, SessionState.class);
+
+                SessionState sessionState = sessionStateStore.get(session);
+                if (null == sessionState) {
+                    int ackMode;
+                    try {
+                        ackMode = session.getAcknowledgeMode();
+                    } catch (Throwable ignored) {
+                        ackMode = Session.AUTO_ACKNOWLEDGE;
+                    }
+                    sessionState =
+                            sessionStateStore.getOrPut(session, new SessionState(ackMode, TIME_IN_QUEUE_ENABLED));
+                }
+
+                boolean isQueue = PRODUCER_DECORATE.isQueue(destination);
+                String destinationName = PRODUCER_DECORATE.getDestinationName(destination);
+                CharSequence resourceName = PRODUCER_DECORATE.toResourceName(destinationName, isQueue);
+
+                boolean propagationDisabled = Config.get().isJmsPropagationDisabledForDestination(destinationName);
+
+                producerStateStore.put(
+                        producer, new MessageProducerState(sessionState, resourceName, propagationDisabled));
+            }
         }
+    }
 
-        boolean isQueue = CONSUMER_DECORATE.isQueue(destination);
-        String destinationName = CONSUMER_DECORATE.getDestinationName(destination);
-        CharSequence brokerResourceName =
-            JMS_LEGACY_TRACING ? "jms" : BROKER_DECORATE.toResourceName(destinationName, isQueue);
-        CharSequence consumerResourceName =
-            CONSUMER_DECORATE.toResourceName(destinationName, isQueue);
-
-        boolean propagationDisabled =
-            Config.get().isJmsPropagationDisabledForDestination(destinationName);
-
-        consumerStateStore.put(
-            consumer,
-            new MessageConsumerState(
-                sessionState,
-                brokerResourceName,
-                destinationName,
-                consumerResourceName,
-                propagationDisabled));
-      }
+    public static final class CreateConsumer {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void bindConsumerState(
+                @Advice.This Session session,
+                @Advice.Argument(0) Destination destination,
+                @Advice.Return MessageConsumer consumer) {
+
+            ContextStore<MessageConsumer, MessageConsumerState> consumerStateStore =
+                    InstrumentationContext.get(MessageConsumer.class, MessageConsumerState.class);
+
+            // avoid doing the same thing more than once when there is delegation to overloads
+            if (consumerStateStore.get(consumer) == null) {
+                ContextStore<Session, SessionState> sessionStateStore =
+                        InstrumentationContext.get(Session.class, SessionState.class);
+
+                SessionState sessionState = sessionStateStore.get(session);
+                if (null == sessionState) {
+                    int ackMode;
+                    try {
+                        ackMode = session.getAcknowledgeMode();
+                    } catch (Throwable ignored) {
+                        ackMode = Session.AUTO_ACKNOWLEDGE;
+                    }
+                    sessionState =
+                            sessionStateStore.getOrPut(session, new SessionState(ackMode, TIME_IN_QUEUE_ENABLED));
+                }
+
+                boolean isQueue = CONSUMER_DECORATE.isQueue(destination);
+                String destinationName = CONSUMER_DECORATE.getDestinationName(destination);
+                CharSequence brokerResourceName =
+                        JMS_LEGACY_TRACING ? "jms" : BROKER_DECORATE.toResourceName(destinationName, isQueue);
+                CharSequence consumerResourceName = CONSUMER_DECORATE.toResourceName(destinationName, isQueue);
+
+                boolean propagationDisabled = Config.get().isJmsPropagationDisabledForDestination(destinationName);
+
+                consumerStateStore.put(
+                        consumer,
+                        new MessageConsumerState(
+                                sessionState,
+                                brokerResourceName,
+                                destinationName,
+                                consumerResourceName,
+                                propagationDisabled));
+            }
+        }
     }
-  }
-
-  public static final class Recover {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void recover(@Advice.This Session session) {
-      SessionState sessionState =
-          InstrumentationContext.get(Session.class, SessionState.class).get(session);
-      if (null != sessionState && sessionState.isClientAcknowledge()) {
-        sessionState.onAcknowledgeOrRecover();
-      }
+
+    public static final class Recover {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void recover(@Advice.This Session session) {
+            SessionState sessionState = InstrumentationContext.get(Session.class, SessionState.class)
+                    .get(session);
+            if (null != sessionState && sessionState.isClientAcknowledge()) {
+                sessionState.onAcknowledgeOrRecover();
+            }
+        }
     }
-  }
-
-  public static final class Commit {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void commit(@Advice.This Session session) {
-      SessionState sessionState =
-          InstrumentationContext.get(Session.class, SessionState.class).get(session);
-      if (null != sessionState && sessionState.isTransactedSession()) {
-        sessionState.onCommitOrRollback();
-      }
+
+    public static final class Commit {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void commit(@Advice.This Session session) {
+            SessionState sessionState = InstrumentationContext.get(Session.class, SessionState.class)
+                    .get(session);
+            if (null != sessionState && sessionState.isTransactedSession()) {
+                sessionState.onCommitOrRollback();
+            }
+        }
     }
-  }
-
-  public static final class Close {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void close(@Advice.This Session session) {
-      SessionState sessionState =
-          InstrumentationContext.get(Session.class, SessionState.class).get(session);
-      if (null != sessionState) {
-        sessionState.onClose();
-      }
+
+    public static final class Close {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void close(@Advice.This Session session) {
+            SessionState sessionState = InstrumentationContext.get(Session.class, SessionState.class)
+                    .get(session);
+            if (null != sessionState) {
+                sessionState.onClose();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10Connection.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10Connection.java
index 0f8721a2b89..f7ad87351dc 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10Connection.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10Connection.java
@@ -17,114 +17,105 @@
 
 /** Wraps a real {@link Connection} but simulates a JMS 1.0 provider. */
 public class Jms10Connection implements QueueConnection, TopicConnection {
-  private final Connection delegate;
-
-  public Jms10Connection(Connection delegate) {
-    this.delegate = delegate;
-  }
-
-  // --- JMS 1.1-only unified Connection method ---
-
-  @Override
-  public Session createSession(boolean transacted, int acknowledgeMode) throws JMSException {
-    throw new AbstractMethodError(
-        "JMS 1.0 provider does not implement createSession(boolean, int) on Connection");
-  }
-
-  // --- JMS 1.0 QueueConnection methods ---
-
-  @Override
-  public QueueSession createQueueSession(boolean transacted, int acknowledgeMode)
-      throws JMSException {
-    return new Jms10Session(delegate.createSession(transacted, acknowledgeMode));
-  }
-
-  // --- JMS 1.0 TopicConnection methods ---
-
-  @Override
-  public TopicSession createTopicSession(boolean transacted, int acknowledgeMode)
-      throws JMSException {
-    return new Jms10Session(delegate.createSession(transacted, acknowledgeMode));
-  }
-
-  // --- Common Connection methods ---
-
-  @Override
-  public String getClientID() throws JMSException {
-    return delegate.getClientID();
-  }
-
-  @Override
-  public void setClientID(String clientID) throws JMSException {
-    delegate.setClientID(clientID);
-  }
-
-  @Override
-  public ConnectionMetaData getMetaData() throws JMSException {
-    return delegate.getMetaData();
-  }
-
-  @Override
-  public ExceptionListener getExceptionListener() throws JMSException {
-    return delegate.getExceptionListener();
-  }
-
-  @Override
-  public void setExceptionListener(ExceptionListener listener) throws JMSException {
-    delegate.setExceptionListener(listener);
-  }
-
-  @Override
-  public void start() throws JMSException {
-    delegate.start();
-  }
-
-  @Override
-  public void stop() throws JMSException {
-    delegate.stop();
-  }
-
-  @Override
-  public void close() throws JMSException {
-    delegate.close();
-  }
-
-  // --- ConnectionConsumer methods — not commonly used, throw for JMS 1.1 unified form ---
-
-  @Override
-  public ConnectionConsumer createConnectionConsumer(
-      Destination destination,
-      String messageSelector,
-      ServerSessionPool sessionPool,
-      int maxMessages)
-      throws JMSException {
-    throw new AbstractMethodError(
-        "JMS 1.0 provider does not implement createConnectionConsumer(Destination, ...)");
-  }
-
-  @Override
-  public ConnectionConsumer createConnectionConsumer(
-      Queue queue, String messageSelector, ServerSessionPool sessionPool, int maxMessages)
-      throws JMSException {
-    return delegate.createConnectionConsumer(queue, messageSelector, sessionPool, maxMessages);
-  }
-
-  @Override
-  public ConnectionConsumer createConnectionConsumer(
-      Topic topic, String messageSelector, ServerSessionPool sessionPool, int maxMessages)
-      throws JMSException {
-    return delegate.createConnectionConsumer(topic, messageSelector, sessionPool, maxMessages);
-  }
-
-  @Override
-  public ConnectionConsumer createDurableConnectionConsumer(
-      Topic topic,
-      String subscriptionName,
-      String messageSelector,
-      ServerSessionPool sessionPool,
-      int maxMessages)
-      throws JMSException {
-    return delegate.createDurableConnectionConsumer(
-        topic, subscriptionName, messageSelector, sessionPool, maxMessages);
-  }
+    private final Connection delegate;
+
+    public Jms10Connection(Connection delegate) {
+        this.delegate = delegate;
+    }
+
+    // --- JMS 1.1-only unified Connection method ---
+
+    @Override
+    public Session createSession(boolean transacted, int acknowledgeMode) throws JMSException {
+        throw new AbstractMethodError("JMS 1.0 provider does not implement createSession(boolean, int) on Connection");
+    }
+
+    // --- JMS 1.0 QueueConnection methods ---
+
+    @Override
+    public QueueSession createQueueSession(boolean transacted, int acknowledgeMode) throws JMSException {
+        return new Jms10Session(delegate.createSession(transacted, acknowledgeMode));
+    }
+
+    // --- JMS 1.0 TopicConnection methods ---
+
+    @Override
+    public TopicSession createTopicSession(boolean transacted, int acknowledgeMode) throws JMSException {
+        return new Jms10Session(delegate.createSession(transacted, acknowledgeMode));
+    }
+
+    // --- Common Connection methods ---
+
+    @Override
+    public String getClientID() throws JMSException {
+        return delegate.getClientID();
+    }
+
+    @Override
+    public void setClientID(String clientID) throws JMSException {
+        delegate.setClientID(clientID);
+    }
+
+    @Override
+    public ConnectionMetaData getMetaData() throws JMSException {
+        return delegate.getMetaData();
+    }
+
+    @Override
+    public ExceptionListener getExceptionListener() throws JMSException {
+        return delegate.getExceptionListener();
+    }
+
+    @Override
+    public void setExceptionListener(ExceptionListener listener) throws JMSException {
+        delegate.setExceptionListener(listener);
+    }
+
+    @Override
+    public void start() throws JMSException {
+        delegate.start();
+    }
+
+    @Override
+    public void stop() throws JMSException {
+        delegate.stop();
+    }
+
+    @Override
+    public void close() throws JMSException {
+        delegate.close();
+    }
+
+    // --- ConnectionConsumer methods — not commonly used, throw for JMS 1.1 unified form ---
+
+    @Override
+    public ConnectionConsumer createConnectionConsumer(
+            Destination destination, String messageSelector, ServerSessionPool sessionPool, int maxMessages)
+            throws JMSException {
+        throw new AbstractMethodError("JMS 1.0 provider does not implement createConnectionConsumer(Destination, ...)");
+    }
+
+    @Override
+    public ConnectionConsumer createConnectionConsumer(
+            Queue queue, String messageSelector, ServerSessionPool sessionPool, int maxMessages) throws JMSException {
+        return delegate.createConnectionConsumer(queue, messageSelector, sessionPool, maxMessages);
+    }
+
+    @Override
+    public ConnectionConsumer createConnectionConsumer(
+            Topic topic, String messageSelector, ServerSessionPool sessionPool, int maxMessages) throws JMSException {
+        return delegate.createConnectionConsumer(topic, messageSelector, sessionPool, maxMessages);
+    }
+
+    @Override
+    public ConnectionConsumer createDurableConnectionConsumer(
+            Topic topic,
+            String subscriptionName,
+            String messageSelector,
+            ServerSessionPool sessionPool,
+            int maxMessages)
+            throws JMSException {
+        return delegate.createDurableConnectionConsumer(
+                topic, subscriptionName, messageSelector, sessionPool, maxMessages);
+    }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10ConnectionFactory.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10ConnectionFactory.java
index 1660765f731..69dc17459e7 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10ConnectionFactory.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10ConnectionFactory.java
@@ -16,46 +16,44 @@
  * {@code createConnection()} methods are JMS 1.1 additions that this wrapper does not support.
  */
 public class Jms10ConnectionFactory implements QueueConnectionFactory, TopicConnectionFactory {
-  private final ConnectionFactory delegate;
-
-  public Jms10ConnectionFactory(ConnectionFactory delegate) {
-    this.delegate = delegate;
-  }
-
-  // --- JMS 1.1-only unified ConnectionFactory methods ---
-
-  @Override
-  public Connection createConnection() throws JMSException {
-    return delegate.createConnection();
-  }
-
-  @Override
-  public Connection createConnection(String userName, String password) throws JMSException {
-    return delegate.createConnection(userName, password);
-  }
-
-  // --- JMS 1.0 QueueConnectionFactory methods ---
-  @Override
-  public QueueConnection createQueueConnection() throws JMSException {
-    return new Jms10Connection(delegate.createConnection());
-  }
-
-  @Override
-  public QueueConnection createQueueConnection(String userName, String password)
-      throws JMSException {
-    return new Jms10Connection(delegate.createConnection(userName, password));
-  }
-
-  // --- JMS 1.0 TopicConnectionFactory methods ---
-
-  @Override
-  public TopicConnection createTopicConnection() throws JMSException {
-    return new Jms10Connection(delegate.createConnection());
-  }
-
-  @Override
-  public TopicConnection createTopicConnection(String userName, String password)
-      throws JMSException {
-    return new Jms10Connection(delegate.createConnection(userName, password));
-  }
+    private final ConnectionFactory delegate;
+
+    public Jms10ConnectionFactory(ConnectionFactory delegate) {
+        this.delegate = delegate;
+    }
+
+    // --- JMS 1.1-only unified ConnectionFactory methods ---
+
+    @Override
+    public Connection createConnection() throws JMSException {
+        return delegate.createConnection();
+    }
+
+    @Override
+    public Connection createConnection(String userName, String password) throws JMSException {
+        return delegate.createConnection(userName, password);
+    }
+
+    // --- JMS 1.0 QueueConnectionFactory methods ---
+    @Override
+    public QueueConnection createQueueConnection() throws JMSException {
+        return new Jms10Connection(delegate.createConnection());
+    }
+
+    @Override
+    public QueueConnection createQueueConnection(String userName, String password) throws JMSException {
+        return new Jms10Connection(delegate.createConnection(userName, password));
+    }
+
+    // --- JMS 1.0 TopicConnectionFactory methods ---
+
+    @Override
+    public TopicConnection createTopicConnection() throws JMSException {
+        return new Jms10Connection(delegate.createConnection());
+    }
+
+    @Override
+    public TopicConnection createTopicConnection(String userName, String password) throws JMSException {
+        return new Jms10Connection(delegate.createConnection(userName, password));
+    }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10QueueReceiver.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10QueueReceiver.java
index 92b8f8ec93b..7d4eb270ab1 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10QueueReceiver.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10QueueReceiver.java
@@ -9,51 +9,51 @@
 
 /** Wraps a real {@link MessageConsumer} but simulates a JMS 1.0 provider. */
 public class Jms10QueueReceiver implements QueueReceiver {
-  private final MessageConsumer delegate;
-  private final Queue queue;
-
-  public Jms10QueueReceiver(MessageConsumer delegate, Queue queue) {
-    this.delegate = delegate;
-    this.queue = queue;
-  }
-
-  @Override
-  public Queue getQueue() {
-    return queue;
-  }
-
-  @Override
-  public String getMessageSelector() throws JMSException {
-    return delegate.getMessageSelector();
-  }
-
-  @Override
-  public MessageListener getMessageListener() throws JMSException {
-    return delegate.getMessageListener();
-  }
-
-  @Override
-  public void setMessageListener(MessageListener listener) throws JMSException {
-    delegate.setMessageListener(listener);
-  }
-
-  @Override
-  public Message receive() throws JMSException {
-    return delegate.receive();
-  }
-
-  @Override
-  public Message receive(long timeout) throws JMSException {
-    return delegate.receive(timeout);
-  }
-
-  @Override
-  public Message receiveNoWait() throws JMSException {
-    return delegate.receiveNoWait();
-  }
-
-  @Override
-  public void close() throws JMSException {
-    delegate.close();
-  }
+    private final MessageConsumer delegate;
+    private final Queue queue;
+
+    public Jms10QueueReceiver(MessageConsumer delegate, Queue queue) {
+        this.delegate = delegate;
+        this.queue = queue;
+    }
+
+    @Override
+    public Queue getQueue() {
+        return queue;
+    }
+
+    @Override
+    public String getMessageSelector() throws JMSException {
+        return delegate.getMessageSelector();
+    }
+
+    @Override
+    public MessageListener getMessageListener() throws JMSException {
+        return delegate.getMessageListener();
+    }
+
+    @Override
+    public void setMessageListener(MessageListener listener) throws JMSException {
+        delegate.setMessageListener(listener);
+    }
+
+    @Override
+    public Message receive() throws JMSException {
+        return delegate.receive();
+    }
+
+    @Override
+    public Message receive(long timeout) throws JMSException {
+        return delegate.receive(timeout);
+    }
+
+    @Override
+    public Message receiveNoWait() throws JMSException {
+        return delegate.receiveNoWait();
+    }
+
+    @Override
+    public void close() throws JMSException {
+        delegate.close();
+    }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10QueueSender.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10QueueSender.java
index 1f888203483..db0a9bba1f5 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10QueueSender.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10QueueSender.java
@@ -9,116 +9,114 @@
 
 /** Wraps a real {@link MessageProducer} but simulates a JMS 1.0 provider. */
 public class Jms10QueueSender implements QueueSender {
-  private final MessageProducer delegate;
-  private final Queue queue;
-
-  public Jms10QueueSender(MessageProducer delegate, Queue queue) {
-    this.delegate = delegate;
-    this.queue = queue;
-  }
-
-  // --- JMS 1.1-only methods — not present in JMS 1.0 ---
-
-  @Override
-  public Destination getDestination() {
-    throw new AbstractMethodError("JMS 1.0 provider does not implement getDestination()");
-  }
-
-  @Override
-  public void send(Destination destination, Message message) throws JMSException {
-    delegate.send(destination, message);
-  }
-
-  @Override
-  public void send(
-      Destination destination, Message message, int deliveryMode, int priority, long timeToLive)
-      throws JMSException {
-    delegate.send(destination, message, deliveryMode, priority, timeToLive);
-  }
-
-  // --- JMS 1.0 QueueSender methods ---
-
-  @Override
-  public Queue getQueue() {
-    return queue;
-  }
-
-  @Override
-  public void send(Message message) throws JMSException {
-    delegate.send(message);
-  }
-
-  @Override
-  public void send(Message message, int deliveryMode, int priority, long timeToLive)
-      throws JMSException {
-    delegate.send(message, deliveryMode, priority, timeToLive);
-  }
-
-  @Override
-  public void send(Queue queue, Message message) throws JMSException {
-    delegate.send(queue, message);
-  }
-
-  @Override
-  public void send(Queue queue, Message message, int deliveryMode, int priority, long timeToLive)
-      throws JMSException {
-    delegate.send(queue, message, deliveryMode, priority, timeToLive);
-  }
-
-  // --- MessageProducer config methods ---
-
-  @Override
-  public void close() throws JMSException {
-    delegate.close();
-  }
-
-  @Override
-  public void setDisableMessageID(boolean value) throws JMSException {
-    delegate.setDisableMessageID(value);
-  }
-
-  @Override
-  public boolean getDisableMessageID() throws JMSException {
-    return delegate.getDisableMessageID();
-  }
-
-  @Override
-  public void setDisableMessageTimestamp(boolean value) throws JMSException {
-    delegate.setDisableMessageTimestamp(value);
-  }
-
-  @Override
-  public boolean getDisableMessageTimestamp() throws JMSException {
-    return delegate.getDisableMessageTimestamp();
-  }
-
-  @Override
-  public void setDeliveryMode(int deliveryMode) throws JMSException {
-    delegate.setDeliveryMode(deliveryMode);
-  }
-
-  @Override
-  public int getDeliveryMode() throws JMSException {
-    return delegate.getDeliveryMode();
-  }
-
-  @Override
-  public void setPriority(int defaultPriority) throws JMSException {
-    delegate.setPriority(defaultPriority);
-  }
-
-  @Override
-  public int getPriority() throws JMSException {
-    return delegate.getPriority();
-  }
-
-  @Override
-  public void setTimeToLive(long timeToLive) throws JMSException {
-    delegate.setTimeToLive(timeToLive);
-  }
-
-  @Override
-  public long getTimeToLive() throws JMSException {
-    return delegate.getTimeToLive();
-  }
+    private final MessageProducer delegate;
+    private final Queue queue;
+
+    public Jms10QueueSender(MessageProducer delegate, Queue queue) {
+        this.delegate = delegate;
+        this.queue = queue;
+    }
+
+    // --- JMS 1.1-only methods — not present in JMS 1.0 ---
+
+    @Override
+    public Destination getDestination() {
+        throw new AbstractMethodError("JMS 1.0 provider does not implement getDestination()");
+    }
+
+    @Override
+    public void send(Destination destination, Message message) throws JMSException {
+        delegate.send(destination, message);
+    }
+
+    @Override
+    public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive)
+            throws JMSException {
+        delegate.send(destination, message, deliveryMode, priority, timeToLive);
+    }
+
+    // --- JMS 1.0 QueueSender methods ---
+
+    @Override
+    public Queue getQueue() {
+        return queue;
+    }
+
+    @Override
+    public void send(Message message) throws JMSException {
+        delegate.send(message);
+    }
+
+    @Override
+    public void send(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException {
+        delegate.send(message, deliveryMode, priority, timeToLive);
+    }
+
+    @Override
+    public void send(Queue queue, Message message) throws JMSException {
+        delegate.send(queue, message);
+    }
+
+    @Override
+    public void send(Queue queue, Message message, int deliveryMode, int priority, long timeToLive)
+            throws JMSException {
+        delegate.send(queue, message, deliveryMode, priority, timeToLive);
+    }
+
+    // --- MessageProducer config methods ---
+
+    @Override
+    public void close() throws JMSException {
+        delegate.close();
+    }
+
+    @Override
+    public void setDisableMessageID(boolean value) throws JMSException {
+        delegate.setDisableMessageID(value);
+    }
+
+    @Override
+    public boolean getDisableMessageID() throws JMSException {
+        return delegate.getDisableMessageID();
+    }
+
+    @Override
+    public void setDisableMessageTimestamp(boolean value) throws JMSException {
+        delegate.setDisableMessageTimestamp(value);
+    }
+
+    @Override
+    public boolean getDisableMessageTimestamp() throws JMSException {
+        return delegate.getDisableMessageTimestamp();
+    }
+
+    @Override
+    public void setDeliveryMode(int deliveryMode) throws JMSException {
+        delegate.setDeliveryMode(deliveryMode);
+    }
+
+    @Override
+    public int getDeliveryMode() throws JMSException {
+        return delegate.getDeliveryMode();
+    }
+
+    @Override
+    public void setPriority(int defaultPriority) throws JMSException {
+        delegate.setPriority(defaultPriority);
+    }
+
+    @Override
+    public int getPriority() throws JMSException {
+        return delegate.getPriority();
+    }
+
+    @Override
+    public void setTimeToLive(long timeToLive) throws JMSException {
+        delegate.setTimeToLive(timeToLive);
+    }
+
+    @Override
+    public long getTimeToLive() throws JMSException {
+        return delegate.getTimeToLive();
+    }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10Session.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10Session.java
index 65629319237..484e82ea006 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10Session.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10Session.java
@@ -27,203 +27,200 @@
 
 /** Wraps a real {@link Session} but simulates a JMS 1.0 provider. */
 public class Jms10Session implements QueueSession, TopicSession {
-  private final Session delegate;
-
-  public Jms10Session(Session delegate) {
-    this.delegate = delegate;
-  }
-
-  // --- JMS 1.1-only unified Session methods — not present in JMS 1.0 ---
-
-  @Override
-  public MessageProducer createProducer(Destination destination) throws JMSException {
-    return delegate.createProducer(destination);
-  }
-
-  @Override
-  public MessageConsumer createConsumer(Destination destination) throws JMSException {
-    return delegate.createConsumer(destination);
-  }
-
-  @Override
-  public MessageConsumer createConsumer(Destination destination, String messageSelector)
-      throws JMSException {
-    return delegate.createConsumer(destination, messageSelector);
-  }
-
-  @Override
-  public MessageConsumer createConsumer(
-      Destination destination, String messageSelector, boolean noLocal) throws JMSException {
-    return delegate.createConsumer(destination, messageSelector, noLocal);
-  }
-
-  // --- JMS 1.0 QueueSession methods ---
-
-  @Override
-  public Queue createQueue(String queueName) throws JMSException {
-    return delegate.createQueue(queueName);
-  }
-
-  @Override
-  public QueueReceiver createReceiver(Queue queue) throws JMSException {
-    return new Jms10QueueReceiver(delegate.createConsumer(queue), queue);
-  }
-
-  @Override
-  public QueueReceiver createReceiver(Queue queue, String messageSelector) throws JMSException {
-    return new Jms10QueueReceiver(delegate.createConsumer(queue, messageSelector), queue);
-  }
-
-  @Override
-  public QueueSender createSender(Queue queue) throws JMSException {
-    return new Jms10QueueSender(delegate.createProducer(queue), queue);
-  }
-
-  @Override
-  public QueueBrowser createBrowser(Queue queue) throws JMSException {
-    return delegate.createBrowser(queue);
-  }
-
-  @Override
-  public QueueBrowser createBrowser(Queue queue, String messageSelector) throws JMSException {
-    return delegate.createBrowser(queue, messageSelector);
-  }
-
-  @Override
-  public TemporaryQueue createTemporaryQueue() throws JMSException {
-    return delegate.createTemporaryQueue();
-  }
-
-  // --- JMS 1.0 TopicSession methods ---
-
-  @Override
-  public Topic createTopic(String topicName) throws JMSException {
-    return delegate.createTopic(topicName);
-  }
-
-  @Override
-  public TopicSubscriber createSubscriber(Topic topic) throws JMSException {
-    return new Jms10TopicSubscriber(delegate.createConsumer(topic), topic, false);
-  }
-
-  @Override
-  public TopicSubscriber createSubscriber(Topic topic, String messageSelector, boolean noLocal)
-      throws JMSException {
-    return new Jms10TopicSubscriber(
-        delegate.createConsumer(topic, messageSelector, noLocal), topic, noLocal);
-  }
-
-  @Override
-  public TopicSubscriber createDurableSubscriber(Topic topic, String name) throws JMSException {
-    return new Jms10TopicSubscriber(delegate.createDurableSubscriber(topic, name), topic, false);
-  }
-
-  @Override
-  public TopicSubscriber createDurableSubscriber(
-      Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException {
-    return new Jms10TopicSubscriber(
-        delegate.createDurableSubscriber(topic, name, messageSelector, noLocal), topic, noLocal);
-  }
-
-  @Override
-  public TopicPublisher createPublisher(Topic topic) throws JMSException {
-    return new Jms10TopicPublisher(delegate.createProducer(topic), topic);
-  }
-
-  @Override
-  public TemporaryTopic createTemporaryTopic() throws JMSException {
-    return delegate.createTemporaryTopic();
-  }
-
-  @Override
-  public void unsubscribe(String name) throws JMSException {
-    delegate.unsubscribe(name);
-  }
-
-  // --- Common Session methods ---
-
-  @Override
-  public BytesMessage createBytesMessage() throws JMSException {
-    return delegate.createBytesMessage();
-  }
-
-  @Override
-  public MapMessage createMapMessage() throws JMSException {
-    return delegate.createMapMessage();
-  }
-
-  @Override
-  public Message createMessage() throws JMSException {
-    return delegate.createMessage();
-  }
-
-  @Override
-  public ObjectMessage createObjectMessage() throws JMSException {
-    return delegate.createObjectMessage();
-  }
-
-  @Override
-  public ObjectMessage createObjectMessage(Serializable object) throws JMSException {
-    return delegate.createObjectMessage(object);
-  }
-
-  @Override
-  public StreamMessage createStreamMessage() throws JMSException {
-    return delegate.createStreamMessage();
-  }
-
-  @Override
-  public TextMessage createTextMessage() throws JMSException {
-    return delegate.createTextMessage();
-  }
-
-  @Override
-  public TextMessage createTextMessage(String text) throws JMSException {
-    return delegate.createTextMessage(text);
-  }
-
-  @Override
-  public boolean getTransacted() throws JMSException {
-    return delegate.getTransacted();
-  }
-
-  @Override
-  public int getAcknowledgeMode() {
-    throw new AbstractMethodError("JMS 1.0 provider does not implement getAcknowledgeMode()");
-  }
-
-  @Override
-  public void commit() throws JMSException {
-    delegate.commit();
-  }
-
-  @Override
-  public void rollback() throws JMSException {
-    delegate.rollback();
-  }
-
-  @Override
-  public void close() throws JMSException {
-    delegate.close();
-  }
-
-  @Override
-  public void recover() throws JMSException {
-    delegate.recover();
-  }
-
-  @Override
-  public MessageListener getMessageListener() throws JMSException {
-    return delegate.getMessageListener();
-  }
-
-  @Override
-  public void setMessageListener(MessageListener listener) throws JMSException {
-    delegate.setMessageListener(listener);
-  }
-
-  @Override
-  public void run() {
-    delegate.run();
-  }
+    private final Session delegate;
+
+    public Jms10Session(Session delegate) {
+        this.delegate = delegate;
+    }
+
+    // --- JMS 1.1-only unified Session methods — not present in JMS 1.0 ---
+
+    @Override
+    public MessageProducer createProducer(Destination destination) throws JMSException {
+        return delegate.createProducer(destination);
+    }
+
+    @Override
+    public MessageConsumer createConsumer(Destination destination) throws JMSException {
+        return delegate.createConsumer(destination);
+    }
+
+    @Override
+    public MessageConsumer createConsumer(Destination destination, String messageSelector) throws JMSException {
+        return delegate.createConsumer(destination, messageSelector);
+    }
+
+    @Override
+    public MessageConsumer createConsumer(Destination destination, String messageSelector, boolean noLocal)
+            throws JMSException {
+        return delegate.createConsumer(destination, messageSelector, noLocal);
+    }
+
+    // --- JMS 1.0 QueueSession methods ---
+
+    @Override
+    public Queue createQueue(String queueName) throws JMSException {
+        return delegate.createQueue(queueName);
+    }
+
+    @Override
+    public QueueReceiver createReceiver(Queue queue) throws JMSException {
+        return new Jms10QueueReceiver(delegate.createConsumer(queue), queue);
+    }
+
+    @Override
+    public QueueReceiver createReceiver(Queue queue, String messageSelector) throws JMSException {
+        return new Jms10QueueReceiver(delegate.createConsumer(queue, messageSelector), queue);
+    }
+
+    @Override
+    public QueueSender createSender(Queue queue) throws JMSException {
+        return new Jms10QueueSender(delegate.createProducer(queue), queue);
+    }
+
+    @Override
+    public QueueBrowser createBrowser(Queue queue) throws JMSException {
+        return delegate.createBrowser(queue);
+    }
+
+    @Override
+    public QueueBrowser createBrowser(Queue queue, String messageSelector) throws JMSException {
+        return delegate.createBrowser(queue, messageSelector);
+    }
+
+    @Override
+    public TemporaryQueue createTemporaryQueue() throws JMSException {
+        return delegate.createTemporaryQueue();
+    }
+
+    // --- JMS 1.0 TopicSession methods ---
+
+    @Override
+    public Topic createTopic(String topicName) throws JMSException {
+        return delegate.createTopic(topicName);
+    }
+
+    @Override
+    public TopicSubscriber createSubscriber(Topic topic) throws JMSException {
+        return new Jms10TopicSubscriber(delegate.createConsumer(topic), topic, false);
+    }
+
+    @Override
+    public TopicSubscriber createSubscriber(Topic topic, String messageSelector, boolean noLocal) throws JMSException {
+        return new Jms10TopicSubscriber(delegate.createConsumer(topic, messageSelector, noLocal), topic, noLocal);
+    }
+
+    @Override
+    public TopicSubscriber createDurableSubscriber(Topic topic, String name) throws JMSException {
+        return new Jms10TopicSubscriber(delegate.createDurableSubscriber(topic, name), topic, false);
+    }
+
+    @Override
+    public TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal)
+            throws JMSException {
+        return new Jms10TopicSubscriber(
+                delegate.createDurableSubscriber(topic, name, messageSelector, noLocal), topic, noLocal);
+    }
+
+    @Override
+    public TopicPublisher createPublisher(Topic topic) throws JMSException {
+        return new Jms10TopicPublisher(delegate.createProducer(topic), topic);
+    }
+
+    @Override
+    public TemporaryTopic createTemporaryTopic() throws JMSException {
+        return delegate.createTemporaryTopic();
+    }
+
+    @Override
+    public void unsubscribe(String name) throws JMSException {
+        delegate.unsubscribe(name);
+    }
+
+    // --- Common Session methods ---
+
+    @Override
+    public BytesMessage createBytesMessage() throws JMSException {
+        return delegate.createBytesMessage();
+    }
+
+    @Override
+    public MapMessage createMapMessage() throws JMSException {
+        return delegate.createMapMessage();
+    }
+
+    @Override
+    public Message createMessage() throws JMSException {
+        return delegate.createMessage();
+    }
+
+    @Override
+    public ObjectMessage createObjectMessage() throws JMSException {
+        return delegate.createObjectMessage();
+    }
+
+    @Override
+    public ObjectMessage createObjectMessage(Serializable object) throws JMSException {
+        return delegate.createObjectMessage(object);
+    }
+
+    @Override
+    public StreamMessage createStreamMessage() throws JMSException {
+        return delegate.createStreamMessage();
+    }
+
+    @Override
+    public TextMessage createTextMessage() throws JMSException {
+        return delegate.createTextMessage();
+    }
+
+    @Override
+    public TextMessage createTextMessage(String text) throws JMSException {
+        return delegate.createTextMessage(text);
+    }
+
+    @Override
+    public boolean getTransacted() throws JMSException {
+        return delegate.getTransacted();
+    }
+
+    @Override
+    public int getAcknowledgeMode() {
+        throw new AbstractMethodError("JMS 1.0 provider does not implement getAcknowledgeMode()");
+    }
+
+    @Override
+    public void commit() throws JMSException {
+        delegate.commit();
+    }
+
+    @Override
+    public void rollback() throws JMSException {
+        delegate.rollback();
+    }
+
+    @Override
+    public void close() throws JMSException {
+        delegate.close();
+    }
+
+    @Override
+    public void recover() throws JMSException {
+        delegate.recover();
+    }
+
+    @Override
+    public MessageListener getMessageListener() throws JMSException {
+        return delegate.getMessageListener();
+    }
+
+    @Override
+    public void setMessageListener(MessageListener listener) throws JMSException {
+        delegate.setMessageListener(listener);
+    }
+
+    @Override
+    public void run() {
+        delegate.run();
+    }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10TopicPublisher.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10TopicPublisher.java
index 6f3c1e38663..cbb1d5caf1d 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10TopicPublisher.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10TopicPublisher.java
@@ -9,129 +9,126 @@
 
 /** Wraps a real {@link MessageProducer} but simulates a JMS 1.0 provider. */
 public class Jms10TopicPublisher implements TopicPublisher {
-  private final MessageProducer delegate;
-  private final Topic topic;
-
-  public Jms10TopicPublisher(MessageProducer delegate, Topic topic) {
-    this.delegate = delegate;
-    this.topic = topic;
-  }
-
-  // --- JMS 1.1-only methods — not present in JMS 1.0 ---
-
-  @Override
-  public Destination getDestination() {
-    throw new AbstractMethodError("JMS 1.0 provider does not implement getDestination()");
-  }
-
-  @Override
-  public void send(Destination destination, Message message) throws JMSException {
-    delegate.send(destination, message);
-  }
-
-  @Override
-  public void send(
-      Destination destination, Message message, int deliveryMode, int priority, long timeToLive)
-      throws JMSException {
-    delegate.send(destination, message, deliveryMode, priority, timeToLive);
-  }
-
-  // --- JMS 1.0 TopicPublisher methods ---
-
-  @Override
-  public Topic getTopic() {
-    return topic;
-  }
-
-  @Override
-  public void publish(Message message) throws JMSException {
-    delegate.send(message);
-  }
-
-  @Override
-  public void publish(Message message, int deliveryMode, int priority, long timeToLive)
-      throws JMSException {
-    delegate.send(message, deliveryMode, priority, timeToLive);
-  }
-
-  @Override
-  public void publish(Topic topic, Message message) throws JMSException {
-    delegate.send(topic, message);
-  }
-
-  @Override
-  public void publish(Topic topic, Message message, int deliveryMode, int priority, long timeToLive)
-      throws JMSException {
-    delegate.send(topic, message, deliveryMode, priority, timeToLive);
-  }
-
-  // --- MessageProducer send methods (also available via publish in 1.0) ---
-
-  @Override
-  public void send(Message message) throws JMSException {
-    delegate.send(message);
-  }
-
-  @Override
-  public void send(Message message, int deliveryMode, int priority, long timeToLive)
-      throws JMSException {
-    delegate.send(message, deliveryMode, priority, timeToLive);
-  }
-
-  // --- MessageProducer config methods ---
-
-  @Override
-  public void close() throws JMSException {
-    delegate.close();
-  }
-
-  @Override
-  public void setDisableMessageID(boolean value) throws JMSException {
-    delegate.setDisableMessageID(value);
-  }
-
-  @Override
-  public boolean getDisableMessageID() throws JMSException {
-    return delegate.getDisableMessageID();
-  }
-
-  @Override
-  public void setDisableMessageTimestamp(boolean value) throws JMSException {
-    delegate.setDisableMessageTimestamp(value);
-  }
-
-  @Override
-  public boolean getDisableMessageTimestamp() throws JMSException {
-    return delegate.getDisableMessageTimestamp();
-  }
-
-  @Override
-  public void setDeliveryMode(int deliveryMode) throws JMSException {
-    delegate.setDeliveryMode(deliveryMode);
-  }
-
-  @Override
-  public int getDeliveryMode() throws JMSException {
-    return delegate.getDeliveryMode();
-  }
-
-  @Override
-  public void setPriority(int defaultPriority) throws JMSException {
-    delegate.setPriority(defaultPriority);
-  }
-
-  @Override
-  public int getPriority() throws JMSException {
-    return delegate.getPriority();
-  }
-
-  @Override
-  public void setTimeToLive(long timeToLive) throws JMSException {
-    delegate.setTimeToLive(timeToLive);
-  }
-
-  @Override
-  public long getTimeToLive() throws JMSException {
-    return delegate.getTimeToLive();
-  }
+    private final MessageProducer delegate;
+    private final Topic topic;
+
+    public Jms10TopicPublisher(MessageProducer delegate, Topic topic) {
+        this.delegate = delegate;
+        this.topic = topic;
+    }
+
+    // --- JMS 1.1-only methods — not present in JMS 1.0 ---
+
+    @Override
+    public Destination getDestination() {
+        throw new AbstractMethodError("JMS 1.0 provider does not implement getDestination()");
+    }
+
+    @Override
+    public void send(Destination destination, Message message) throws JMSException {
+        delegate.send(destination, message);
+    }
+
+    @Override
+    public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive)
+            throws JMSException {
+        delegate.send(destination, message, deliveryMode, priority, timeToLive);
+    }
+
+    // --- JMS 1.0 TopicPublisher methods ---
+
+    @Override
+    public Topic getTopic() {
+        return topic;
+    }
+
+    @Override
+    public void publish(Message message) throws JMSException {
+        delegate.send(message);
+    }
+
+    @Override
+    public void publish(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException {
+        delegate.send(message, deliveryMode, priority, timeToLive);
+    }
+
+    @Override
+    public void publish(Topic topic, Message message) throws JMSException {
+        delegate.send(topic, message);
+    }
+
+    @Override
+    public void publish(Topic topic, Message message, int deliveryMode, int priority, long timeToLive)
+            throws JMSException {
+        delegate.send(topic, message, deliveryMode, priority, timeToLive);
+    }
+
+    // --- MessageProducer send methods (also available via publish in 1.0) ---
+
+    @Override
+    public void send(Message message) throws JMSException {
+        delegate.send(message);
+    }
+
+    @Override
+    public void send(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException {
+        delegate.send(message, deliveryMode, priority, timeToLive);
+    }
+
+    // --- MessageProducer config methods ---
+
+    @Override
+    public void close() throws JMSException {
+        delegate.close();
+    }
+
+    @Override
+    public void setDisableMessageID(boolean value) throws JMSException {
+        delegate.setDisableMessageID(value);
+    }
+
+    @Override
+    public boolean getDisableMessageID() throws JMSException {
+        return delegate.getDisableMessageID();
+    }
+
+    @Override
+    public void setDisableMessageTimestamp(boolean value) throws JMSException {
+        delegate.setDisableMessageTimestamp(value);
+    }
+
+    @Override
+    public boolean getDisableMessageTimestamp() throws JMSException {
+        return delegate.getDisableMessageTimestamp();
+    }
+
+    @Override
+    public void setDeliveryMode(int deliveryMode) throws JMSException {
+        delegate.setDeliveryMode(deliveryMode);
+    }
+
+    @Override
+    public int getDeliveryMode() throws JMSException {
+        return delegate.getDeliveryMode();
+    }
+
+    @Override
+    public void setPriority(int defaultPriority) throws JMSException {
+        delegate.setPriority(defaultPriority);
+    }
+
+    @Override
+    public int getPriority() throws JMSException {
+        return delegate.getPriority();
+    }
+
+    @Override
+    public void setTimeToLive(long timeToLive) throws JMSException {
+        delegate.setTimeToLive(timeToLive);
+    }
+
+    @Override
+    public long getTimeToLive() throws JMSException {
+        return delegate.getTimeToLive();
+    }
 }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10TopicSubscriber.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10TopicSubscriber.java
index 97ca5ea2343..1ca12ee0c1b 100644
--- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10TopicSubscriber.java
+++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/testFixtures/java/jms10mock/Jms10TopicSubscriber.java
@@ -9,58 +9,58 @@
 
 /** Wraps a real {@link MessageConsumer} but simulates a JMS 1.0 provider. */
 public class Jms10TopicSubscriber implements TopicSubscriber {
-  private final MessageConsumer delegate;
-  private final Topic topic;
-  private final boolean noLocal;
+    private final MessageConsumer delegate;
+    private final Topic topic;
+    private final boolean noLocal;
 
-  public Jms10TopicSubscriber(MessageConsumer delegate, Topic topic, boolean noLocal) {
-    this.delegate = delegate;
-    this.topic = topic;
-    this.noLocal = noLocal;
-  }
+    public Jms10TopicSubscriber(MessageConsumer delegate, Topic topic, boolean noLocal) {
+        this.delegate = delegate;
+        this.topic = topic;
+        this.noLocal = noLocal;
+    }
 
-  @Override
-  public Topic getTopic() {
-    return topic;
-  }
+    @Override
+    public Topic getTopic() {
+        return topic;
+    }
 
-  @Override
-  public boolean getNoLocal() {
-    return noLocal;
-  }
+    @Override
+    public boolean getNoLocal() {
+        return noLocal;
+    }
 
-  @Override
-  public String getMessageSelector() throws JMSException {
-    return delegate.getMessageSelector();
-  }
+    @Override
+    public String getMessageSelector() throws JMSException {
+        return delegate.getMessageSelector();
+    }
 
-  @Override
-  public MessageListener getMessageListener() throws JMSException {
-    return delegate.getMessageListener();
-  }
+    @Override
+    public MessageListener getMessageListener() throws JMSException {
+        return delegate.getMessageListener();
+    }
 
-  @Override
-  public void setMessageListener(MessageListener listener) throws JMSException {
-    delegate.setMessageListener(listener);
-  }
+    @Override
+    public void setMessageListener(MessageListener listener) throws JMSException {
+        delegate.setMessageListener(listener);
+    }
 
-  @Override
-  public Message receive() throws JMSException {
-    return delegate.receive();
-  }
+    @Override
+    public Message receive() throws JMSException {
+        return delegate.receive();
+    }
 
-  @Override
-  public Message receive(long timeout) throws JMSException {
-    return delegate.receive(timeout);
-  }
+    @Override
+    public Message receive(long timeout) throws JMSException {
+        return delegate.receive(timeout);
+    }
 
-  @Override
-  public Message receiveNoWait() throws JMSException {
-    return delegate.receiveNoWait();
-  }
+    @Override
+    public Message receiveNoWait() throws JMSException {
+        return delegate.receiveNoWait();
+    }
 
-  @Override
-  public void close() throws JMSException {
-    delegate.close();
-  }
+    @Override
+    public void close() throws JMSException {
+        delegate.close();
+    }
 }
diff --git a/dd-java-agent/instrumentation/jose-jwt-4.0/src/main/java/datadog/trace/instrumentation/josejwt/JSONObjectUtilsInstrumentation.java b/dd-java-agent/instrumentation/jose-jwt-4.0/src/main/java/datadog/trace/instrumentation/josejwt/JSONObjectUtilsInstrumentation.java
index 4d5a895bec3..60aa4500506 100644
--- a/dd-java-agent/instrumentation/jose-jwt-4.0/src/main/java/datadog/trace/instrumentation/josejwt/JSONObjectUtilsInstrumentation.java
+++ b/dd-java-agent/instrumentation/jose-jwt-4.0/src/main/java/datadog/trace/instrumentation/josejwt/JSONObjectUtilsInstrumentation.java
@@ -21,45 +21,45 @@
 
 @AutoService(InstrumenterModule.class)
 public class JSONObjectUtilsInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JSONObjectUtilsInstrumentation() {
-    super("jwt", "jose-jwt");
-  }
+    public JSONObjectUtilsInstrumentation() {
+        super("jwt", "jose-jwt");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("parse").and(isPublic().and(takesArguments(String.class))),
-        JSONObjectUtilsInstrumentation.class.getName() + "$InstrumenterAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("parse").and(isPublic().and(takesArguments(String.class))),
+                JSONObjectUtilsInstrumentation.class.getName() + "$InstrumenterAdvice");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.nimbusds.jose.util.JSONObjectUtils";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.nimbusds.jose.util.JSONObjectUtils";
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class InstrumenterAdvice {
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class InstrumenterAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void onEnter(
-        @Advice.Return Map<String, Object> map, @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void onEnter(
+                @Advice.Return Map<String, Object> map, @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
 
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        for (Map.Entry<String, Object> entry : map.entrySet()) {
-          final String name = entry.getKey();
-          final Object value = entry.getValue();
-          if (value instanceof String) {
-            // TODO: We could represent this source more accurately, perhaps tracking the original
-            // source, or using a special name.
-            module.taintString(ctx, (String) value, SourceTypes.REQUEST_HEADER_VALUE, name);
-          }
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                for (Map.Entry<String, Object> entry : map.entrySet()) {
+                    final String name = entry.getKey();
+                    final Object value = entry.getValue();
+                    if (value instanceof String) {
+                        // TODO: We could represent this source more accurately, perhaps tracking the original
+                        // source, or using a special name.
+                        module.taintString(ctx, (String) value, SourceTypes.REQUEST_HEADER_VALUE, name);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jose-jwt-4.0/src/main/java/datadog/trace/instrumentation/josejwt/JWTParserInstrumentation.java b/dd-java-agent/instrumentation/jose-jwt-4.0/src/main/java/datadog/trace/instrumentation/josejwt/JWTParserInstrumentation.java
index 0ac9db1b102..ca67e1187ad 100644
--- a/dd-java-agent/instrumentation/jose-jwt-4.0/src/main/java/datadog/trace/instrumentation/josejwt/JWTParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/jose-jwt-4.0/src/main/java/datadog/trace/instrumentation/josejwt/JWTParserInstrumentation.java
@@ -20,39 +20,38 @@
 
 @AutoService(InstrumenterModule.class)
 public class JWTParserInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public JWTParserInstrumentation() {
-    super("jwt", "auth0-jwt");
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("parsePayload").and(isPublic().and(takesArguments(String.class))),
-        JWTParserInstrumentation.class.getName() + "$InstrumenterAdvice");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.auth0.jwt.impl.JWTParser";
-  }
-
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class InstrumenterAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void onEnter(
-        @Advice.Argument(0) String json, @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-
-      if (module != null) {
-        // TODO: We could represent this source more accurately, perhaps tracking the original
-        // source, or using a special name.
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintString(ctx, json, SourceTypes.REQUEST_HEADER_VALUE);
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public JWTParserInstrumentation() {
+        super("jwt", "auth0-jwt");
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("parsePayload").and(isPublic().and(takesArguments(String.class))),
+                JWTParserInstrumentation.class.getName() + "$InstrumenterAdvice");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "com.auth0.jwt.impl.JWTParser";
+    }
+
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class InstrumenterAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void onEnter(@Advice.Argument(0) String json, @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+
+            if (module != null) {
+                // TODO: We could represent this source more accurately, perhaps tracking the original
+                // source, or using a special name.
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintString(ctx, json, SourceTypes.REQUEST_HEADER_VALUE);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPDecorator.java b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPDecorator.java
index fdea60ec215..71d6a80c9a7 100644
--- a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPDecorator.java
+++ b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPDecorator.java
@@ -12,70 +12,75 @@
 import org.apache.jasper.JspCompilationContext;
 
 public class JSPDecorator extends BaseDecorator {
-  public static final CharSequence JSP_COMPILE = UTF8BytesString.create("jsp.compile");
-  public static final CharSequence JSP_RENDER = UTF8BytesString.create("jsp.render");
-  public static final CharSequence JSP_HTTP_SERVLET = UTF8BytesString.create("jsp-http-servlet");
-  public static JSPDecorator DECORATE = new JSPDecorator();
+    public static final CharSequence JSP_COMPILE = UTF8BytesString.create("jsp.compile");
+    public static final CharSequence JSP_RENDER = UTF8BytesString.create("jsp.render");
+    public static final CharSequence JSP_HTTP_SERVLET = UTF8BytesString.create("jsp-http-servlet");
+    public static JSPDecorator DECORATE = new JSPDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jsp"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jsp"};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return JSP_HTTP_SERVLET;
-  }
+    @Override
+    protected CharSequence component() {
+        return JSP_HTTP_SERVLET;
+    }
 
-  public void onCompile(
-      final ContextScope scope, final JspCompilationContext jspCompilationContext) {
-    if (jspCompilationContext != null) {
-      final AgentSpan span = spanFromScope(scope);
-      span.setResourceName(jspCompilationContext.getJspFile());
+    public void onCompile(final ContextScope scope, final JspCompilationContext jspCompilationContext) {
+        if (jspCompilationContext != null) {
+            final AgentSpan span = spanFromScope(scope);
+            span.setResourceName(jspCompilationContext.getJspFile());
 
-      if (jspCompilationContext.getServletContext() != null) {
-        span.setTag("servlet.context", jspCompilationContext.getServletContext().getContextPath());
-      }
+            if (jspCompilationContext.getServletContext() != null) {
+                span.setTag(
+                        "servlet.context",
+                        jspCompilationContext.getServletContext().getContextPath());
+            }
 
-      if (jspCompilationContext.getCompiler() != null) {
-        span.setTag("jsp.compiler", jspCompilationContext.getCompiler().getClass().getName());
-      }
-      span.setTag("jsp.classFQCN", jspCompilationContext.getFQCN());
+            if (jspCompilationContext.getCompiler() != null) {
+                span.setTag(
+                        "jsp.compiler",
+                        jspCompilationContext.getCompiler().getClass().getName());
+            }
+            span.setTag("jsp.classFQCN", jspCompilationContext.getFQCN());
+        }
     }
-  }
 
-  public void onRender(final AgentSpan span, final HttpServletRequest req) {
-    // get the JSP file name being rendered in an include action
-    final Object includeServletPath = req.getAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH);
-    String resourceName = req.getServletPath();
-    if (includeServletPath instanceof String) {
-      resourceName = includeServletPath.toString();
-    }
-    span.setResourceName(resourceName);
+    public void onRender(final AgentSpan span, final HttpServletRequest req) {
+        // get the JSP file name being rendered in an include action
+        final Object includeServletPath = req.getAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH);
+        String resourceName = req.getServletPath();
+        if (includeServletPath instanceof String) {
+            resourceName = includeServletPath.toString();
+        }
+        span.setResourceName(resourceName);
 
-    final Object forwardOrigin = req.getAttribute(RequestDispatcher.FORWARD_SERVLET_PATH);
-    if (forwardOrigin instanceof String) {
-      span.setTag("jsp.forwardOrigin", forwardOrigin.toString());
-    }
+        final Object forwardOrigin = req.getAttribute(RequestDispatcher.FORWARD_SERVLET_PATH);
+        if (forwardOrigin instanceof String) {
+            span.setTag("jsp.forwardOrigin", forwardOrigin.toString());
+        }
 
-    // add the request URL as a tag to provide better context when looking at spans produced by
-    // actions. Tomcat 9 has relative path symbols in the value returned from
-    // HttpServletRequest#getRequestURL(),
-    // normalizing the URL should remove those symbols for readability and consistency
-    try {
-      // note: getRequestURL is supposed to always be nonnull - however servlet wrapping can happen
-      // and we never know if ever this can happen
-      final StringBuffer requestURL = req.getRequestURL();
-      if (requestURL != null && requestURL.length() > 0) {
-        span.setTag("jsp.requestURL", (new URI(requestURL.toString())).normalize().toString());
-      }
-    } catch (final Throwable ignored) {
-      // logging here will be too verbose
+        // add the request URL as a tag to provide better context when looking at spans produced by
+        // actions. Tomcat 9 has relative path symbols in the value returned from
+        // HttpServletRequest#getRequestURL(),
+        // normalizing the URL should remove those symbols for readability and consistency
+        try {
+            // note: getRequestURL is supposed to always be nonnull - however servlet wrapping can happen
+            // and we never know if ever this can happen
+            final StringBuffer requestURL = req.getRequestURL();
+            if (requestURL != null && requestURL.length() > 0) {
+                span.setTag(
+                        "jsp.requestURL",
+                        (new URI(requestURL.toString())).normalize().toString());
+            }
+        } catch (final Throwable ignored) {
+            // logging here will be too verbose
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java
index 9e42256114b..bf1dc5968ec 100644
--- a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java
+++ b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java
@@ -23,52 +23,50 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JSPInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public JSPInstrumentation() {
-    super("jsp", "jsp-render");
-  }
+    public JSPInstrumentation() {
+        super("jsp", "jsp-render");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.jsp.HttpJspPage";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.jsp.HttpJspPage";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("_jspService")
-            .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest")))
-            .and(takesArgument(1, named("javax.servlet.http.HttpServletResponse")))
-            .and(isPublic()),
-        JSPInstrumentation.class.getName() + "$HttpJspPageAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("_jspService")
+                        .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest")))
+                        .and(takesArgument(1, named("javax.servlet.http.HttpServletResponse")))
+                        .and(isPublic()),
+                JSPInstrumentation.class.getName() + "$HttpJspPageAdvice");
+    }
 
-  public static class HttpJspPageAdvice {
+    public static class HttpJspPageAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.This final Object obj, @Advice.Argument(0) final HttpServletRequest req) {
-      final AgentSpan span =
-          startSpan(JSP_HTTP_SERVLET.toString(), JSP_RENDER)
-              .setTag("servlet.context", req.getContextPath());
-      DECORATE.afterStart(span);
-      DECORATE.onRender(span, req);
-      return activateSpan(span);
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.This final Object obj, @Advice.Argument(0) final HttpServletRequest req) {
+            final AgentSpan span =
+                    startSpan(JSP_HTTP_SERVLET.toString(), JSP_RENDER).setTag("servlet.context", req.getContextPath());
+            DECORATE.afterStart(span);
+            DECORATE.onRender(span, req);
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      DECORATE.onError(scope, throwable);
-      DECORATE.beforeFinish(scope);
-      scope.close();
-      spanFromScope(scope).finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            DECORATE.onError(scope, throwable);
+            DECORATE.beforeFinish(scope);
+            scope.close();
+            spanFromScope(scope).finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java
index b46a6b91feb..9cf857c6fee 100644
--- a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java
@@ -20,46 +20,45 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JasperJSPCompilationContextInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JasperJSPCompilationContextInstrumentation() {
-    super("jsp", "jsp-compile");
-  }
+    public JasperJSPCompilationContextInstrumentation() {
+        super("jsp", "jsp-compile");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.jasper.JspCompilationContext";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.jasper.JspCompilationContext";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("compile").and(takesArguments(0)).and(isPublic()),
-        JasperJSPCompilationContextInstrumentation.class.getName()
-            + "$JasperJspCompilationContext");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("compile").and(takesArguments(0)).and(isPublic()),
+                JasperJSPCompilationContextInstrumentation.class.getName() + "$JasperJspCompilationContext");
+    }
 
-  public static class JasperJspCompilationContext {
+    public static class JasperJspCompilationContext {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter() {
-      final AgentSpan span = startSpan(JSP_HTTP_SERVLET.toString(), JSP_COMPILE);
-      DECORATE.afterStart(span);
-      return activateSpan(span);
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter() {
+            final AgentSpan span = startSpan(JSP_HTTP_SERVLET.toString(), JSP_COMPILE);
+            DECORATE.afterStart(span);
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.This final JspCompilationContext jspCompilationContext,
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable) {
-      DECORATE.onCompile(scope, jspCompilationContext);
-      // ^ Decorate on return because additional properties are available
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.This final JspCompilationContext jspCompilationContext,
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable) {
+            DECORATE.onCompile(scope, jspCompilationContext);
+            // ^ Decorate on return because additional properties are available
 
-      DECORATE.onError(scope, throwable);
-      DECORATE.beforeFinish(scope);
-      scope.close();
-      spanFromScope(scope).finish();
+            DECORATE.onError(scope, throwable);
+            DECORATE.beforeFinish(scope);
+            scope.close();
+            spanFromScope(scope).finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java
index ad193f9d870..7e01f5e4f8f 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java
@@ -23,190 +23,189 @@
 @RunListener.ThreadSafe
 public class CucumberTracingListener extends TracingListener {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(CucumberTracingListener.class);
-
-  public static final String FRAMEWORK_NAME = "cucumber";
-  public static final String FRAMEWORK_VERSION = CucumberUtils.getVersion();
-
-  private final ContextStore<Description, TestExecutionTracker> executionTrackers;
-  private final Map<Object, Pickle> pickleById;
-
-  public CucumberTracingListener(
-      ContextStore<Description, TestExecutionTracker> executionTrackers,
-      List<ParentRunner<?>> featureRunners) {
-    this.executionTrackers = executionTrackers;
-    pickleById = CucumberUtils.getPicklesById(featureRunners);
-  }
-
-  @Override
-  public void testSuiteStarted(final Description description) {
-    if (isFeature(description)) {
-      TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description);
-      String testSuiteName = CucumberUtils.getTestSuiteNameForFeature(description);
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.CUCUMBER)
-          .onTestSuiteStart(
-              suiteDescriptor,
-              testSuiteName,
-              FRAMEWORK_NAME,
-              FRAMEWORK_VERSION,
-              null,
-              Collections.emptyList(),
-              false,
-              TestFrameworkInstrumentation.CUCUMBER,
-              null);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CucumberTracingListener.class);
+
+    public static final String FRAMEWORK_NAME = "cucumber";
+    public static final String FRAMEWORK_VERSION = CucumberUtils.getVersion();
+
+    private final ContextStore<Description, TestExecutionTracker> executionTrackers;
+    private final Map<Object, Pickle> pickleById;
+
+    public CucumberTracingListener(
+            ContextStore<Description, TestExecutionTracker> executionTrackers, List<ParentRunner<?>> featureRunners) {
+        this.executionTrackers = executionTrackers;
+        pickleById = CucumberUtils.getPicklesById(featureRunners);
+    }
+
+    @Override
+    public void testSuiteStarted(final Description description) {
+        if (isFeature(description)) {
+            TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description);
+            String testSuiteName = CucumberUtils.getTestSuiteNameForFeature(description);
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.CUCUMBER)
+                    .onTestSuiteStart(
+                            suiteDescriptor,
+                            testSuiteName,
+                            FRAMEWORK_NAME,
+                            FRAMEWORK_VERSION,
+                            null,
+                            Collections.emptyList(),
+                            false,
+                            TestFrameworkInstrumentation.CUCUMBER,
+                            null);
+        }
+    }
+
+    @Override
+    public void testSuiteFinished(final Description description) {
+        if (isFeature(description)) {
+            TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description);
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.CUCUMBER)
+                    .onTestSuiteFinish(suiteDescriptor, null);
+        }
     }
-  }
-
-  @Override
-  public void testSuiteFinished(final Description description) {
-    if (isFeature(description)) {
-      TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description);
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.CUCUMBER)
-          .onTestSuiteFinish(suiteDescriptor, null);
+
+    @Override
+    public void testStarted(final Description description) {
+        String testSuiteName = CucumberUtils.getTestSuiteNameForScenario(description);
+        String testName = CucumberUtils.getTestNameForScenario(description);
+        List<String> categories = getCategories(description);
+
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.CUCUMBER)
+                .onTestStart(
+                        new TestSuiteDescriptor(testSuiteName, null),
+                        CucumberUtils.toTestDescriptor(description),
+                        testName,
+                        FRAMEWORK_NAME,
+                        FRAMEWORK_VERSION,
+                        null,
+                        categories,
+                        TestSourceData.UNKNOWN,
+                        null,
+                        executionTrackers.get(description));
+
+        recordFeatureFileCodeCoverage(description);
     }
-  }
-
-  @Override
-  public void testStarted(final Description description) {
-    String testSuiteName = CucumberUtils.getTestSuiteNameForScenario(description);
-    String testName = CucumberUtils.getTestNameForScenario(description);
-    List<String> categories = getCategories(description);
-
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.CUCUMBER)
-        .onTestStart(
-            new TestSuiteDescriptor(testSuiteName, null),
-            CucumberUtils.toTestDescriptor(description),
-            testName,
-            FRAMEWORK_NAME,
-            FRAMEWORK_VERSION,
-            null,
-            categories,
-            TestSourceData.UNKNOWN,
-            null,
-            executionTrackers.get(description));
-
-    recordFeatureFileCodeCoverage(description);
-  }
-
-  private static void recordFeatureFileCodeCoverage(Description scenarioDescription) {
-    try {
-      URI pickleUri = CucumberUtils.getPickleUri(scenarioDescription);
-      String featureRelativePath = pickleUri.getSchemeSpecificPart();
-      CoveragePerTestBridge.recordCoverage(featureRelativePath);
-    } catch (Exception e) {
-      LOGGER.error("Could not record feature file coverage for {}", scenarioDescription, e);
+
+    private static void recordFeatureFileCodeCoverage(Description scenarioDescription) {
+        try {
+            URI pickleUri = CucumberUtils.getPickleUri(scenarioDescription);
+            String featureRelativePath = pickleUri.getSchemeSpecificPart();
+            CoveragePerTestBridge.recordCoverage(featureRelativePath);
+        } catch (Exception e) {
+            LOGGER.error("Could not record feature file coverage for {}", scenarioDescription, e);
+        }
     }
-  }
-
-  @Override
-  public void testFinished(final Description description) {
-    TestDescriptor testDescriptor = CucumberUtils.toTestDescriptor(description);
-    TestExecutionTracker executionTracker = executionTrackers.get(description);
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.CUCUMBER)
-        .onTestFinish(testDescriptor, null, executionTracker);
-  }
-
-  // same callback is executed both for test cases and test suites (for setup/teardown errors)
-  @Override
-  public void testFailure(final Failure failure) {
-    Description description = failure.getDescription();
-    if (isFeature(description)) {
-      TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description);
-      Throwable throwable = failure.getException();
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.CUCUMBER)
-          .onTestSuiteFailure(suiteDescriptor, throwable);
-    } else {
-      TestDescriptor testDescriptor = CucumberUtils.toTestDescriptor(description);
-      Throwable throwable = failure.getException();
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.CUCUMBER)
-          .onTestFailure(testDescriptor, throwable);
+
+    @Override
+    public void testFinished(final Description description) {
+        TestDescriptor testDescriptor = CucumberUtils.toTestDescriptor(description);
+        TestExecutionTracker executionTracker = executionTrackers.get(description);
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.CUCUMBER)
+                .onTestFinish(testDescriptor, null, executionTracker);
     }
-  }
-
-  @Override
-  public void testAssumptionFailure(final Failure failure) {
-    String reason;
-    Throwable throwable = failure.getException();
-    if (throwable != null) {
-      reason = throwable.getMessage();
-    } else {
-      reason = null;
+
+    // same callback is executed both for test cases and test suites (for setup/teardown errors)
+    @Override
+    public void testFailure(final Failure failure) {
+        Description description = failure.getDescription();
+        if (isFeature(description)) {
+            TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description);
+            Throwable throwable = failure.getException();
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.CUCUMBER)
+                    .onTestSuiteFailure(suiteDescriptor, throwable);
+        } else {
+            TestDescriptor testDescriptor = CucumberUtils.toTestDescriptor(description);
+            Throwable throwable = failure.getException();
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.CUCUMBER)
+                    .onTestFailure(testDescriptor, throwable);
+        }
     }
 
-    Description description = failure.getDescription();
-    if (isFeature(description)) {
-      TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description);
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.CUCUMBER)
-          .onTestSuiteSkip(suiteDescriptor, reason);
-    } else {
-      TestDescriptor testDescriptor = CucumberUtils.toTestDescriptor(description);
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.CUCUMBER)
-          .onTestSkip(testDescriptor, reason);
+    @Override
+    public void testAssumptionFailure(final Failure failure) {
+        String reason;
+        Throwable throwable = failure.getException();
+        if (throwable != null) {
+            reason = throwable.getMessage();
+        } else {
+            reason = null;
+        }
+
+        Description description = failure.getDescription();
+        if (isFeature(description)) {
+            TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description);
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.CUCUMBER)
+                    .onTestSuiteSkip(suiteDescriptor, reason);
+        } else {
+            TestDescriptor testDescriptor = CucumberUtils.toTestDescriptor(description);
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.CUCUMBER)
+                    .onTestSkip(testDescriptor, reason);
+        }
     }
-  }
-
-  @Override
-  public void testIgnored(final Description description) {
-    Ignore ignore = description.getAnnotation(Ignore.class);
-    String reason = ignore != null ? ignore.value() : null;
-
-    if (isFeature(description)) {
-      TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description);
-      String testSuiteName = CucumberUtils.getTestSuiteNameForFeature(description);
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.CUCUMBER)
-          .onTestSuiteStart(
-              suiteDescriptor,
-              testSuiteName,
-              FRAMEWORK_NAME,
-              FRAMEWORK_VERSION,
-              null,
-              Collections.emptyList(),
-              false,
-              TestFrameworkInstrumentation.CUCUMBER,
-              null);
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.CUCUMBER)
-          .onTestSuiteSkip(suiteDescriptor, reason);
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.CUCUMBER)
-          .onTestSuiteFinish(suiteDescriptor, null);
-    } else {
-      String testSuiteName = CucumberUtils.getTestSuiteNameForScenario(description);
-      String testName = CucumberUtils.getTestNameForScenario(description);
-      List<String> categories = getCategories(description);
-
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.CUCUMBER)
-          .onTestIgnore(
-              new TestSuiteDescriptor(testSuiteName, null),
-              CucumberUtils.toTestDescriptor(description),
-              testName,
-              FRAMEWORK_NAME,
-              FRAMEWORK_VERSION,
-              null,
-              categories,
-              TestSourceData.UNKNOWN,
-              reason,
-              executionTrackers.get(description));
+
+    @Override
+    public void testIgnored(final Description description) {
+        Ignore ignore = description.getAnnotation(Ignore.class);
+        String reason = ignore != null ? ignore.value() : null;
+
+        if (isFeature(description)) {
+            TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description);
+            String testSuiteName = CucumberUtils.getTestSuiteNameForFeature(description);
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.CUCUMBER)
+                    .onTestSuiteStart(
+                            suiteDescriptor,
+                            testSuiteName,
+                            FRAMEWORK_NAME,
+                            FRAMEWORK_VERSION,
+                            null,
+                            Collections.emptyList(),
+                            false,
+                            TestFrameworkInstrumentation.CUCUMBER,
+                            null);
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.CUCUMBER)
+                    .onTestSuiteSkip(suiteDescriptor, reason);
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.CUCUMBER)
+                    .onTestSuiteFinish(suiteDescriptor, null);
+        } else {
+            String testSuiteName = CucumberUtils.getTestSuiteNameForScenario(description);
+            String testName = CucumberUtils.getTestNameForScenario(description);
+            List<String> categories = getCategories(description);
+
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.CUCUMBER)
+                    .onTestIgnore(
+                            new TestSuiteDescriptor(testSuiteName, null),
+                            CucumberUtils.toTestDescriptor(description),
+                            testName,
+                            FRAMEWORK_NAME,
+                            FRAMEWORK_VERSION,
+                            null,
+                            categories,
+                            TestSourceData.UNKNOWN,
+                            reason,
+                            executionTrackers.get(description));
+        }
     }
-  }
 
-  private static boolean isFeature(final Description description) {
-    Object uniqueId = JUnit4Utils.getUniqueId(description);
-    return uniqueId != null && uniqueId.toString().endsWith(".feature");
-  }
+    private static boolean isFeature(final Description description) {
+        Object uniqueId = JUnit4Utils.getUniqueId(description);
+        return uniqueId != null && uniqueId.toString().endsWith(".feature");
+    }
 
-  private List<String> getCategories(Description description) {
-    Pickle pickle = pickleById.get(JUnit4Utils.getUniqueId(description));
-    return CucumberUtils.getCategories(pickle);
-  }
+    private List<String> getCategories(Description description) {
+        Pickle pickle = pickleById.get(JUnit4Utils.getUniqueId(description));
+        return CucumberUtils.getCategories(pickle);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java
index 7587e58373d..21346d88ada 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java
@@ -27,219 +27,214 @@
 
 public abstract class CucumberUtils {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(CucumberUtils.class);
-
-  private static final ClassLoader CUCUMBER_CLASS_LOADER = ClassLoaders.getDefaultClassLoader();
-
-  public static String getVersion() {
-    try (InputStream cucumberPropsStream =
-        CUCUMBER_CLASS_LOADER.getResourceAsStream(
-            "META-INF/maven/io.cucumber/cucumber-junit/pom.properties")) {
-      Properties cucumberProps = new Properties();
-      cucumberProps.load(cucumberPropsStream);
-      String version = cucumberProps.getProperty("version");
-      if (Strings.isNotBlank(version)) {
-        return version;
-      }
-    } catch (Exception e) {
-      // fallback below
-    }
-    return "unknown";
-  }
-
-  private static final String NO_STEP_PICKLE_RUNNER_CLASSNAME =
-      "io.cucumber.junit.PickleRunners$NoStepDescriptions";
-  private static final String WITH_STEP_PICKLE_RUNNER_CLASSNAME =
-      "io.cucumber.junit.PickleRunners$WithStepDescriptions";
-
-  private static final MethodHandles REFLECTION = new MethodHandles(CUCUMBER_CLASS_LOADER);
-  private static final MethodHandle FEATURE_GETTER =
-      REFLECTION.privateFieldGetter("io.cucumber.junit.FeatureRunner", "feature");
-  private static final MethodHandle PICKLE_ID_CONSTRUCTOR =
-      REFLECTION.constructor("io.cucumber.junit.PickleRunners$PickleId", Pickle.class);
-  private static final MethodHandle PICKLE_ID_URI_GETTER =
-      REFLECTION.privateFieldGetter("io.cucumber.junit.PickleRunners$PickleId", "uri");
-  private static final MethodHandle PICKLE_ID_LINE_GETTER =
-      REFLECTION.privateFieldGetter("io.cucumber.junit.PickleRunners$PickleId", "pickleLine");
-  private static final MethodHandle PICKLE_RUNNER_GET_DESCRIPTION =
-      REFLECTION.method("io.cucumber.junit.PickleRunners$PickleRunner", "getDescription");
-  private static final MethodHandle PICKLE_RUNNER_NO_STEP_GET_PICKLE =
-      REFLECTION.privateFieldGetter(NO_STEP_PICKLE_RUNNER_CLASSNAME, "pickle");
-  private static final MethodHandle PICKLE_RUNNER_WITH_STEP_GET_PICKLE =
-      REFLECTION.privateFieldGetter(WITH_STEP_PICKLE_RUNNER_CLASSNAME, "pickle");
-
-  public static final List<LibraryCapability> CAPABILITIES =
-      Arrays.asList(
-          LibraryCapability.TIA,
-          LibraryCapability.ATR,
-          LibraryCapability.EFD,
-          LibraryCapability.FTR,
-          LibraryCapability.QUARANTINE,
-          LibraryCapability.DISABLED,
-          LibraryCapability.ATTEMPT_TO_FIX);
-
-  private CucumberUtils() {}
-
-  public static Map<Object, Pickle> getPicklesById(List<ParentRunner<?>> featureRunners) {
-    Map<Object, Pickle> pickleById = new HashMap<>();
-    for (ParentRunner<?> featureRunner : featureRunners) {
-      Feature feature = REFLECTION.invoke(FEATURE_GETTER, featureRunner);
-      for (Pickle pickle : feature.getPickles()) {
-        Object pickleId = REFLECTION.invoke(PICKLE_ID_CONSTRUCTOR, pickle);
-        pickleById.put(pickleId, pickle);
-      }
-    }
-    return pickleById;
-  }
-
-  public static URI getPickleUri(Description scenarioDescription) {
-    Object pickleId = JUnit4Utils.getUniqueId(scenarioDescription);
-    return REFLECTION.invoke(PICKLE_ID_URI_GETTER, pickleId);
-  }
-
-  public static Integer getPickleLine(Description scenarioDescription) {
-    Object pickleId = JUnit4Utils.getUniqueId(scenarioDescription);
-    return REFLECTION.invoke(PICKLE_ID_LINE_GETTER, pickleId);
-  }
-
-  public static String getTestSuiteNameForFeature(Description featureDescription) {
-    Object uniqueId = JUnit4Utils.getUniqueId(featureDescription);
-    return (uniqueId != null ? uniqueId + ":" : "") + featureDescription.getClassName();
-  }
-
-  public static String getTestSuiteNameForScenario(Description scenarioDescription) {
-    URI featureUri = getFeatureUri(scenarioDescription);
-    return (featureUri != null ? featureUri + ":" : "")
-        + getFeatureNameForScenario(scenarioDescription);
-  }
-
-  private static String getFeatureNameForScenario(Description scenarioDescription) {
-    String scenarioDescriptionString = scenarioDescription.toString();
-    int featureNameStart = getFeatureNameStartIdx(scenarioDescriptionString);
-    if (featureNameStart >= 0) {
-      int descriptionLength = scenarioDescriptionString.length();
-      // feature name is wrapped in brackets, hence the +1/-1
-      return scenarioDescriptionString.substring(featureNameStart + 1, descriptionLength - 1);
-    } else {
-      // fallback to default method
-      return scenarioDescription.getClassName();
-    }
-  }
-
-  public static String getTestNameForScenario(Description scenarioDescription) {
-    String scenarioDescriptionString = scenarioDescription.toString();
-    int featureNameStart = getFeatureNameStartIdx(scenarioDescriptionString);
-    if (featureNameStart > 0) { // if featureNameStart == 0, then test name is empty and of no use
-      return scenarioDescriptionString.substring(0, featureNameStart);
-    }
-
-    // fallback to default method
-    String methodName = scenarioDescription.getMethodName();
-    if (Strings.isNotBlank(methodName)) {
-      return methodName;
-    }
-
-    Integer pickleLine = getPickleLine(scenarioDescription);
-    if (pickleLine != null) {
-      return "LINE:" + pickleLine;
-    }
-
-    return "EMPTY_NAME";
-  }
-
-  /**
-   * JUnit 4 expects description string to have the form {@code "Scenario Name(Feature Name)"} The
-   * standard {@link Description#getClassName()} and {@link Description#getMethodName()} methods use
-   * a regex to split the name parts. This does not work correctly when feature or scenario names
-   * have bracket characters in them.
-   */
-  private static int getFeatureNameStartIdx(String scenarioDescriptionString) {
-    int openBrackets = 0;
-    for (int i = scenarioDescriptionString.length() - 1; i >= 0; i--) {
-      char c = scenarioDescriptionString.charAt(i);
-      if (c == ')') {
-        openBrackets++;
-      } else if (c == '(') {
-        if (--openBrackets == 0) {
-          return i;
+    private static final Logger LOGGER = LoggerFactory.getLogger(CucumberUtils.class);
+
+    private static final ClassLoader CUCUMBER_CLASS_LOADER = ClassLoaders.getDefaultClassLoader();
+
+    public static String getVersion() {
+        try (InputStream cucumberPropsStream =
+                CUCUMBER_CLASS_LOADER.getResourceAsStream("META-INF/maven/io.cucumber/cucumber-junit/pom.properties")) {
+            Properties cucumberProps = new Properties();
+            cucumberProps.load(cucumberPropsStream);
+            String version = cucumberProps.getProperty("version");
+            if (Strings.isNotBlank(version)) {
+                return version;
+            }
+        } catch (Exception e) {
+            // fallback below
         }
-      }
-    }
-    return -1;
-  }
-
-  private static URI getFeatureUri(Description scenarioDescription) {
-    try {
-      Object pickleId = JUnit4Utils.getUniqueId(scenarioDescription);
-      return REFLECTION.invoke(PICKLE_ID_URI_GETTER, pickleId);
-    } catch (Exception e) {
-      LOGGER.error(
-          "Could not retrieve unique ID from scenario description {}", scenarioDescription, e);
-      return null;
-    }
-  }
-
-  public static Description getPickleRunnerDescription(
-      Object /* io.cucumber.junit.PickleRunners.PickleRunner */ runner) {
-    return REFLECTION.invoke(PICKLE_RUNNER_GET_DESCRIPTION, runner);
-  }
-
-  public static TestIdentifier toTestIdentifier(Description description) {
-    String suite = getTestSuiteNameForScenario(description);
-    String name = getTestNameForScenario(description);
-    return new TestIdentifier(suite, name, null);
-  }
-
-  public static TestDescriptor toTestDescriptor(Description description) {
-    String suite = getTestSuiteNameForScenario(description);
-    String name = getTestNameForScenario(description);
-    return new TestDescriptor(suite, null, name, null, null);
-  }
-
-  public static TestSuiteDescriptor toSuiteDescriptor(Description description) {
-    String testSuiteName = CucumberUtils.getTestSuiteNameForFeature(description);
-    return new TestSuiteDescriptor(testSuiteName, null);
-  }
-
-  public static Collection<String> getPickleRunnerTags(Object pickleRunner) {
-    Pickle pickle = getPickle(pickleRunner);
-    return getCategories(pickle);
-  }
-
-  private static Pickle getPickle(Object pickleRunner) {
-    try {
-      if (pickleRunner.getClass().getName().equals(NO_STEP_PICKLE_RUNNER_CLASSNAME)) {
-        return REFLECTION.invoke(PICKLE_RUNNER_NO_STEP_GET_PICKLE, pickleRunner);
-      } else {
-        return REFLECTION.invoke(PICKLE_RUNNER_WITH_STEP_GET_PICKLE, pickleRunner);
-      }
-    } catch (Exception e) {
-      return null;
-    }
-  }
-
-  public static List<String> getCategories(Pickle pickle) {
-    List<String> pickleTags = pickle.getTags();
-    List<String> categories = new ArrayList<>(pickleTags.size());
-    for (String tag : pickleTags) {
-      categories.add(tag.substring(1)); // remove leading "@"
-    }
-    return categories;
-  }
-
-  public static final class MuzzleHelper {
-    public static Reference[] additionalMuzzleReferences() {
-      return new Reference[] {
-        new Reference.Builder("io.cucumber.junit.FeatureRunner")
-            .withField(new String[0], 0, "feature", "Lio/cucumber/core/gherkin/Feature;")
-            .build(),
-        new Reference.Builder("io.cucumber.junit.PickleRunners$PickleId")
-            .withField(new String[0], 0, "uri", "Ljava/net/URI;")
-            .build(),
-        new Reference.Builder("io.cucumber.junit.PickleRunners$PickleRunner")
-            .withMethod(new String[0], 0, "getDescription", "Lorg/junit/runner/Description;")
-            .build()
-      };
-    }
-  }
+        return "unknown";
+    }
+
+    private static final String NO_STEP_PICKLE_RUNNER_CLASSNAME = "io.cucumber.junit.PickleRunners$NoStepDescriptions";
+    private static final String WITH_STEP_PICKLE_RUNNER_CLASSNAME =
+            "io.cucumber.junit.PickleRunners$WithStepDescriptions";
+
+    private static final MethodHandles REFLECTION = new MethodHandles(CUCUMBER_CLASS_LOADER);
+    private static final MethodHandle FEATURE_GETTER =
+            REFLECTION.privateFieldGetter("io.cucumber.junit.FeatureRunner", "feature");
+    private static final MethodHandle PICKLE_ID_CONSTRUCTOR =
+            REFLECTION.constructor("io.cucumber.junit.PickleRunners$PickleId", Pickle.class);
+    private static final MethodHandle PICKLE_ID_URI_GETTER =
+            REFLECTION.privateFieldGetter("io.cucumber.junit.PickleRunners$PickleId", "uri");
+    private static final MethodHandle PICKLE_ID_LINE_GETTER =
+            REFLECTION.privateFieldGetter("io.cucumber.junit.PickleRunners$PickleId", "pickleLine");
+    private static final MethodHandle PICKLE_RUNNER_GET_DESCRIPTION =
+            REFLECTION.method("io.cucumber.junit.PickleRunners$PickleRunner", "getDescription");
+    private static final MethodHandle PICKLE_RUNNER_NO_STEP_GET_PICKLE =
+            REFLECTION.privateFieldGetter(NO_STEP_PICKLE_RUNNER_CLASSNAME, "pickle");
+    private static final MethodHandle PICKLE_RUNNER_WITH_STEP_GET_PICKLE =
+            REFLECTION.privateFieldGetter(WITH_STEP_PICKLE_RUNNER_CLASSNAME, "pickle");
+
+    public static final List<LibraryCapability> CAPABILITIES = Arrays.asList(
+            LibraryCapability.TIA,
+            LibraryCapability.ATR,
+            LibraryCapability.EFD,
+            LibraryCapability.FTR,
+            LibraryCapability.QUARANTINE,
+            LibraryCapability.DISABLED,
+            LibraryCapability.ATTEMPT_TO_FIX);
+
+    private CucumberUtils() {}
+
+    public static Map<Object, Pickle> getPicklesById(List<ParentRunner<?>> featureRunners) {
+        Map<Object, Pickle> pickleById = new HashMap<>();
+        for (ParentRunner<?> featureRunner : featureRunners) {
+            Feature feature = REFLECTION.invoke(FEATURE_GETTER, featureRunner);
+            for (Pickle pickle : feature.getPickles()) {
+                Object pickleId = REFLECTION.invoke(PICKLE_ID_CONSTRUCTOR, pickle);
+                pickleById.put(pickleId, pickle);
+            }
+        }
+        return pickleById;
+    }
+
+    public static URI getPickleUri(Description scenarioDescription) {
+        Object pickleId = JUnit4Utils.getUniqueId(scenarioDescription);
+        return REFLECTION.invoke(PICKLE_ID_URI_GETTER, pickleId);
+    }
+
+    public static Integer getPickleLine(Description scenarioDescription) {
+        Object pickleId = JUnit4Utils.getUniqueId(scenarioDescription);
+        return REFLECTION.invoke(PICKLE_ID_LINE_GETTER, pickleId);
+    }
+
+    public static String getTestSuiteNameForFeature(Description featureDescription) {
+        Object uniqueId = JUnit4Utils.getUniqueId(featureDescription);
+        return (uniqueId != null ? uniqueId + ":" : "") + featureDescription.getClassName();
+    }
+
+    public static String getTestSuiteNameForScenario(Description scenarioDescription) {
+        URI featureUri = getFeatureUri(scenarioDescription);
+        return (featureUri != null ? featureUri + ":" : "") + getFeatureNameForScenario(scenarioDescription);
+    }
+
+    private static String getFeatureNameForScenario(Description scenarioDescription) {
+        String scenarioDescriptionString = scenarioDescription.toString();
+        int featureNameStart = getFeatureNameStartIdx(scenarioDescriptionString);
+        if (featureNameStart >= 0) {
+            int descriptionLength = scenarioDescriptionString.length();
+            // feature name is wrapped in brackets, hence the +1/-1
+            return scenarioDescriptionString.substring(featureNameStart + 1, descriptionLength - 1);
+        } else {
+            // fallback to default method
+            return scenarioDescription.getClassName();
+        }
+    }
+
+    public static String getTestNameForScenario(Description scenarioDescription) {
+        String scenarioDescriptionString = scenarioDescription.toString();
+        int featureNameStart = getFeatureNameStartIdx(scenarioDescriptionString);
+        if (featureNameStart > 0) { // if featureNameStart == 0, then test name is empty and of no use
+            return scenarioDescriptionString.substring(0, featureNameStart);
+        }
+
+        // fallback to default method
+        String methodName = scenarioDescription.getMethodName();
+        if (Strings.isNotBlank(methodName)) {
+            return methodName;
+        }
+
+        Integer pickleLine = getPickleLine(scenarioDescription);
+        if (pickleLine != null) {
+            return "LINE:" + pickleLine;
+        }
+
+        return "EMPTY_NAME";
+    }
+
+    /**
+     * JUnit 4 expects description string to have the form {@code "Scenario Name(Feature Name)"} The
+     * standard {@link Description#getClassName()} and {@link Description#getMethodName()} methods use
+     * a regex to split the name parts. This does not work correctly when feature or scenario names
+     * have bracket characters in them.
+     */
+    private static int getFeatureNameStartIdx(String scenarioDescriptionString) {
+        int openBrackets = 0;
+        for (int i = scenarioDescriptionString.length() - 1; i >= 0; i--) {
+            char c = scenarioDescriptionString.charAt(i);
+            if (c == ')') {
+                openBrackets++;
+            } else if (c == '(') {
+                if (--openBrackets == 0) {
+                    return i;
+                }
+            }
+        }
+        return -1;
+    }
+
+    private static URI getFeatureUri(Description scenarioDescription) {
+        try {
+            Object pickleId = JUnit4Utils.getUniqueId(scenarioDescription);
+            return REFLECTION.invoke(PICKLE_ID_URI_GETTER, pickleId);
+        } catch (Exception e) {
+            LOGGER.error("Could not retrieve unique ID from scenario description {}", scenarioDescription, e);
+            return null;
+        }
+    }
+
+    public static Description getPickleRunnerDescription(
+            Object /* io.cucumber.junit.PickleRunners.PickleRunner */ runner) {
+        return REFLECTION.invoke(PICKLE_RUNNER_GET_DESCRIPTION, runner);
+    }
+
+    public static TestIdentifier toTestIdentifier(Description description) {
+        String suite = getTestSuiteNameForScenario(description);
+        String name = getTestNameForScenario(description);
+        return new TestIdentifier(suite, name, null);
+    }
+
+    public static TestDescriptor toTestDescriptor(Description description) {
+        String suite = getTestSuiteNameForScenario(description);
+        String name = getTestNameForScenario(description);
+        return new TestDescriptor(suite, null, name, null, null);
+    }
+
+    public static TestSuiteDescriptor toSuiteDescriptor(Description description) {
+        String testSuiteName = CucumberUtils.getTestSuiteNameForFeature(description);
+        return new TestSuiteDescriptor(testSuiteName, null);
+    }
+
+    public static Collection<String> getPickleRunnerTags(Object pickleRunner) {
+        Pickle pickle = getPickle(pickleRunner);
+        return getCategories(pickle);
+    }
+
+    private static Pickle getPickle(Object pickleRunner) {
+        try {
+            if (pickleRunner.getClass().getName().equals(NO_STEP_PICKLE_RUNNER_CLASSNAME)) {
+                return REFLECTION.invoke(PICKLE_RUNNER_NO_STEP_GET_PICKLE, pickleRunner);
+            } else {
+                return REFLECTION.invoke(PICKLE_RUNNER_WITH_STEP_GET_PICKLE, pickleRunner);
+            }
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public static List<String> getCategories(Pickle pickle) {
+        List<String> pickleTags = pickle.getTags();
+        List<String> categories = new ArrayList<>(pickleTags.size());
+        for (String tag : pickleTags) {
+            categories.add(tag.substring(1)); // remove leading "@"
+        }
+        return categories;
+    }
+
+    public static final class MuzzleHelper {
+        public static Reference[] additionalMuzzleReferences() {
+            return new Reference[] {
+                new Reference.Builder("io.cucumber.junit.FeatureRunner")
+                        .withField(new String[0], 0, "feature", "Lio/cucumber/core/gherkin/Feature;")
+                        .build(),
+                new Reference.Builder("io.cucumber.junit.PickleRunners$PickleId")
+                        .withField(new String[0], 0, "uri", "Ljava/net/URI;")
+                        .build(),
+                new Reference.Builder("io.cucumber.junit.PickleRunners$PickleRunner")
+                        .withMethod(new String[0], 0, "getDescription", "Lorg/junit/runner/Description;")
+                        .build()
+            };
+        }
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java
index 165adcfc144..7a0d4b4702f 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java
@@ -21,75 +21,71 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit4CucumberInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JUnit4CucumberInstrumentation() {
-    super("ci-visibility", "junit-4", "junit-4-cucumber");
-  }
+    public JUnit4CucumberInstrumentation() {
+        super("ci-visibility", "junit-4", "junit-4-cucumber");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.cucumber.junit.Cucumber";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.cucumber.junit.Cucumber";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".CucumberUtils",
-      packageName + ".TestEventsHandlerHolder",
-      packageName + ".SkippedByDatadog",
-      packageName + ".JUnit4Utils",
-      packageName + ".TracingListener",
-      packageName + ".CucumberTracingListener",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".CucumberUtils",
+            packageName + ".TestEventsHandlerHolder",
+            packageName + ".SkippedByDatadog",
+            packageName + ".JUnit4Utils",
+            packageName + ".TracingListener",
+            packageName + ".CucumberTracingListener",
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.junit.runner.Description", TestExecutionTracker.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.junit.runner.Description", TestExecutionTracker.class.getName());
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return CucumberUtils.MuzzleHelper.additionalMuzzleReferences();
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return CucumberUtils.MuzzleHelper.additionalMuzzleReferences();
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("childrenInvoker")
-            .and(takesArgument(0, named("org.junit.runner.notification.RunNotifier"))),
-        JUnit4CucumberInstrumentation.class.getName() + "$CucumberAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("childrenInvoker").and(takesArgument(0, named("org.junit.runner.notification.RunNotifier"))),
+                JUnit4CucumberInstrumentation.class.getName() + "$CucumberAdvice");
+    }
 
-  public static class CucumberAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void addTracingListener(
-        @Advice.FieldValue("children") List<ParentRunner<?>> children,
-        @Advice.Argument(value = 0, readOnly = false) RunNotifier runNotifier) {
+    public static class CucumberAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void addTracingListener(
+                @Advice.FieldValue("children") List<ParentRunner<?>> children,
+                @Advice.Argument(value = 0, readOnly = false) RunNotifier runNotifier) {
 
-      RunNotifier replacedNotifier = new RunNotifier();
+            RunNotifier replacedNotifier = new RunNotifier();
 
-      // copy listeners to new notifier
-      List<RunListener> runListeners = JUnit4Utils.runListenersFromRunNotifier(runNotifier);
-      if (runListeners != null) {
-        for (RunListener listener : runListeners) {
-          RunListener tracingListener = JUnit4Utils.toTracingListener(listener);
-          // skip JUnit 4 listener, we will install Cucumber listener instead
-          if (tracingListener == null) {
-            replacedNotifier.addListener(listener);
-          }
-        }
-      }
+            // copy listeners to new notifier
+            List<RunListener> runListeners = JUnit4Utils.runListenersFromRunNotifier(runNotifier);
+            if (runListeners != null) {
+                for (RunListener listener : runListeners) {
+                    RunListener tracingListener = JUnit4Utils.toTracingListener(listener);
+                    // skip JUnit 4 listener, we will install Cucumber listener instead
+                    if (tracingListener == null) {
+                        replacedNotifier.addListener(listener);
+                    }
+                }
+            }
 
-      TestEventsHandlerHolder.start(
-          TestFrameworkInstrumentation.CUCUMBER, CucumberUtils.CAPABILITIES);
+            TestEventsHandlerHolder.start(TestFrameworkInstrumentation.CUCUMBER, CucumberUtils.CAPABILITIES);
 
-      replacedNotifier.addListener(
-          new CucumberTracingListener(
-              InstrumentationContext.get(Description.class, TestExecutionTracker.class), children));
-      runNotifier = replacedNotifier;
+            replacedNotifier.addListener(new CucumberTracingListener(
+                    InstrumentationContext.get(Description.class, TestExecutionTracker.class), children));
+            runNotifier = replacedNotifier;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java
index 18ff1661285..000c3485494 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java
@@ -26,82 +26,81 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit4CucumberSkipInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public JUnit4CucumberSkipInstrumentation() {
-    super("ci-visibility", "junit-4", "junit-4-cucumber");
-  }
+    public JUnit4CucumberSkipInstrumentation() {
+        super("ci-visibility", "junit-4", "junit-4-cucumber");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled()
-        && (Config.get().isCiVisibilityTestSkippingEnabled()
-            || Config.get().isCiVisibilityTestManagementEnabled());
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled()
+                && (Config.get().isCiVisibilityTestSkippingEnabled()
+                        || Config.get().isCiVisibilityTestManagementEnabled());
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.cucumber.junit.PickleRunners$PickleRunner";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.cucumber.junit.PickleRunners$PickleRunner";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".CucumberUtils",
-      packageName + ".TestEventsHandlerHolder",
-      packageName + ".SkippedByDatadog",
-      packageName + ".JUnit4Utils",
-      packageName + ".TracingListener",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".CucumberUtils",
+            packageName + ".TestEventsHandlerHolder",
+            packageName + ".SkippedByDatadog",
+            packageName + ".JUnit4Utils",
+            packageName + ".TracingListener",
+        };
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return CucumberUtils.MuzzleHelper.additionalMuzzleReferences();
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return CucumberUtils.MuzzleHelper.additionalMuzzleReferences();
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("run").and(takesArgument(0, named("org.junit.runner.notification.RunNotifier"))),
+                JUnit4CucumberSkipInstrumentation.class.getName() + "$CucumberSkipAdvice");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("run").and(takesArgument(0, named("org.junit.runner.notification.RunNotifier"))),
-        JUnit4CucumberSkipInstrumentation.class.getName() + "$CucumberSkipAdvice");
-  }
+    public static class CucumberSkipAdvice {
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @SuppressFBWarnings("NP_BOOLEAN_RETURN_NULL")
+        @Advice.OnMethodEnter(skipOn = Boolean.class)
+        public static Boolean run(
+                @Advice.FieldValue("pickle") Pickle pickle,
+                @Advice.FieldValue("description") Description description,
+                @Advice.Argument(0) RunNotifier notifier) {
 
-  public static class CucumberSkipAdvice {
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @SuppressFBWarnings("NP_BOOLEAN_RETURN_NULL")
-    @Advice.OnMethodEnter(skipOn = Boolean.class)
-    public static Boolean run(
-        @Advice.FieldValue("pickle") Pickle pickle,
-        @Advice.FieldValue("description") Description description,
-        @Advice.Argument(0) RunNotifier notifier) {
+            TestIdentifier test = CucumberUtils.toTestIdentifier(description);
+            SkipReason skipReason = TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.CUCUMBER)
+                    .skipReason(test);
+            if (skipReason == null) {
+                return null;
+            }
 
-      TestIdentifier test = CucumberUtils.toTestIdentifier(description);
-      SkipReason skipReason =
-          TestEventsHandlerHolder.HANDLERS
-              .get(TestFrameworkInstrumentation.CUCUMBER)
-              .skipReason(test);
-      if (skipReason == null) {
-        return null;
-      }
+            if (skipReason == SkipReason.ITR) {
+                List<String> tags = pickle.getTags();
+                for (String tag : tags) {
+                    if (tag.endsWith(CIConstants.Tags.ITR_UNSKIPPABLE_TAG)) {
+                        return null;
+                    }
+                }
+            }
 
-      if (skipReason == SkipReason.ITR) {
-        List<String> tags = pickle.getTags();
-        for (String tag : tags) {
-          if (tag.endsWith(CIConstants.Tags.ITR_UNSKIPPABLE_TAG)) {
-            return null;
-          }
+            notifier.fireTestAssumptionFailed(
+                    new Failure(description, new AssumptionViolatedException(skipReason.getDescription())));
+            return Boolean.FALSE;
         }
-      }
-
-      notifier.fireTestAssumptionFailed(
-          new Failure(description, new AssumptionViolatedException(skipReason.getDescription())));
-      return Boolean.FALSE;
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java
index b2a6d90c4e9..9b757ea3be0 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java
@@ -30,96 +30,94 @@
 
 @AutoService(InstrumenterModule.class)
 public class Cucumber4ExecutionInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  private final String parentPackageName = Strings.getPackageName(JUnit4Utils.class.getName());
-
-  public Cucumber4ExecutionInstrumentation() {
-    super("ci-visibility", "junit-4", "junit-4-cucumber", "test-retry");
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "io.cucumber.junit.FeatureRunner";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      parentPackageName + ".SkippedByDatadog",
-      parentPackageName + ".CucumberUtils",
-      parentPackageName + ".JUnit4Utils",
-      parentPackageName + ".TracingListener",
-      parentPackageName + ".TestEventsHandlerHolder",
-      packageName + ".FailureSuppressingNotifier",
-    };
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.junit.runner.Description", TestExecutionTracker.class.getName());
-  }
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return CucumberUtils.MuzzleHelper.additionalMuzzleReferences();
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("runChild")
-            .and(takesArgument(0, named("io.cucumber.junit.PickleRunners$PickleRunner")))
-            .and(takesArgument(1, named("org.junit.runner.notification.RunNotifier"))),
-        Cucumber4ExecutionInstrumentation.class.getName() + "$ExecutionAdvice");
-  }
-
-  public static class ExecutionAdvice {
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @SuppressFBWarnings("NP_BOOLEAN_RETURN_NULL")
-    @Advice.OnMethodEnter(skipOn = Boolean.class)
-    public static Boolean execute(
-        @Advice.SelfCallHandle(bound = false) MethodHandle runPickle,
-        @Advice.This ParentRunner<?> /* io.cucumber.junit.FeatureRunner */ featureRunner,
-        @Advice.Argument(0) Object /* io.cucumber.junit.PickleRunners.PickleRunner */ pickleRunner,
-        @Advice.Argument(1) RunNotifier notifier) {
-      if (notifier instanceof FailureSuppressingNotifier) {
-        // notifier already wrapped, run original method
-        return null;
-      }
-
-      Description description = CucumberUtils.getPickleRunnerDescription(pickleRunner);
-      TestIdentifier testIdentifier = CucumberUtils.toTestIdentifier(description);
-      Collection<String> testTags = CucumberUtils.getPickleRunnerTags(pickleRunner);
-      TestExecutionPolicy executionPolicy =
-          TestEventsHandlerHolder.HANDLERS
-              .get(TestFrameworkInstrumentation.CUCUMBER)
-              .executionPolicy(testIdentifier, TestSourceData.UNKNOWN, testTags);
-      if (!executionPolicy.applicable()) {
-        // retries not applicable, run original method
-        return null;
-      }
-
-      InstrumentationContext.get(Description.class, TestExecutionTracker.class)
-          .put(description, executionPolicy);
-
-      FailureSuppressingNotifier failureSuppressingNotifier =
-          new FailureSuppressingNotifier(executionPolicy, notifier);
-      do {
-        try {
-          runPickle.invokeWithArguments(featureRunner, pickleRunner, failureSuppressingNotifier);
-        } catch (Throwable ignored) {
-        }
-      } while (executionPolicy.applicable());
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    private final String parentPackageName = Strings.getPackageName(JUnit4Utils.class.getName());
 
-      // skip original method
-      return Boolean.TRUE;
+    public Cucumber4ExecutionInstrumentation() {
+        super("ci-visibility", "junit-4", "junit-4-cucumber", "test-retry");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "io.cucumber.junit.FeatureRunner";
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            parentPackageName + ".SkippedByDatadog",
+            parentPackageName + ".CucumberUtils",
+            parentPackageName + ".JUnit4Utils",
+            parentPackageName + ".TracingListener",
+            parentPackageName + ".TestEventsHandlerHolder",
+            packageName + ".FailureSuppressingNotifier",
+        };
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.junit.runner.Description", TestExecutionTracker.class.getName());
+    }
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return CucumberUtils.MuzzleHelper.additionalMuzzleReferences();
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("runChild")
+                        .and(takesArgument(0, named("io.cucumber.junit.PickleRunners$PickleRunner")))
+                        .and(takesArgument(1, named("org.junit.runner.notification.RunNotifier"))),
+                Cucumber4ExecutionInstrumentation.class.getName() + "$ExecutionAdvice");
+    }
+
+    public static class ExecutionAdvice {
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @SuppressFBWarnings("NP_BOOLEAN_RETURN_NULL")
+        @Advice.OnMethodEnter(skipOn = Boolean.class)
+        public static Boolean execute(
+                @Advice.SelfCallHandle(bound = false) MethodHandle runPickle,
+                @Advice.This ParentRunner<?> /* io.cucumber.junit.FeatureRunner */ featureRunner,
+                @Advice.Argument(0) Object /* io.cucumber.junit.PickleRunners.PickleRunner */ pickleRunner,
+                @Advice.Argument(1) RunNotifier notifier) {
+            if (notifier instanceof FailureSuppressingNotifier) {
+                // notifier already wrapped, run original method
+                return null;
+            }
+
+            Description description = CucumberUtils.getPickleRunnerDescription(pickleRunner);
+            TestIdentifier testIdentifier = CucumberUtils.toTestIdentifier(description);
+            Collection<String> testTags = CucumberUtils.getPickleRunnerTags(pickleRunner);
+            TestExecutionPolicy executionPolicy = TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.CUCUMBER)
+                    .executionPolicy(testIdentifier, TestSourceData.UNKNOWN, testTags);
+            if (!executionPolicy.applicable()) {
+                // retries not applicable, run original method
+                return null;
+            }
+
+            InstrumentationContext.get(Description.class, TestExecutionTracker.class)
+                    .put(description, executionPolicy);
+
+            FailureSuppressingNotifier failureSuppressingNotifier =
+                    new FailureSuppressingNotifier(executionPolicy, notifier);
+            do {
+                try {
+                    runPickle.invokeWithArguments(featureRunner, pickleRunner, failureSuppressingNotifier);
+                } catch (Throwable ignored) {
+                }
+            } while (executionPolicy.applicable());
+
+            // skip original method
+            return Boolean.TRUE;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
index 06b3d55281b..fc115eca6d1 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
@@ -12,104 +12,104 @@
 
 public class CalculatorSteps {
 
-  private Calculator calc;
-
-  @Given("a calculator I just turned on")
-  public void a_calculator_I_just_turned_on() {
-    calc = new Calculator();
-  }
-
-  @When("I add {int} and {int}")
-  public void adding(int arg1, int arg2) {
-    calc.push(arg1);
-    calc.push(arg2);
-    calc.push("+");
-  }
-
-  @When("I slowly add {int} and {int}")
-  public void addingSlow(int arg1, int arg2) throws InterruptedException {
-    Thread.sleep(1100);
-    calc.push(arg1);
-    calc.push(arg2);
-    calc.push("+");
-  }
-
-  @Given("^I press (.+)$")
-  public void I_press(String what) {
-    calc.push(what);
-  }
-
-  @Then("the result is {int}")
-  public void the_result_is(double expected) {
-    assertEquals(expected, calc.value());
-  }
-
-  @Given("the previous entries:")
-  public void thePreviousEntries(List<Entry> entries) {
-    for (Entry entry : entries) {
-      calc.push(entry.first);
-      calc.push(entry.second);
-      calc.push(entry.operation);
-    }
-  }
-
-  static final class Entry {
-
-    private Integer first;
-    private Integer second;
-    private String operation;
+    private Calculator calc;
 
-    public Integer getFirst() {
-      return first;
+    @Given("a calculator I just turned on")
+    public void a_calculator_I_just_turned_on() {
+        calc = new Calculator();
     }
 
-    public void setFirst(Integer first) {
-      this.first = first;
+    @When("I add {int} and {int}")
+    public void adding(int arg1, int arg2) {
+        calc.push(arg1);
+        calc.push(arg2);
+        calc.push("+");
     }
 
-    public Integer getSecond() {
-      return second;
+    @When("I slowly add {int} and {int}")
+    public void addingSlow(int arg1, int arg2) throws InterruptedException {
+        Thread.sleep(1100);
+        calc.push(arg1);
+        calc.push(arg2);
+        calc.push("+");
     }
 
-    public void setSecond(Integer second) {
-      this.second = second;
+    @Given("^I press (.+)$")
+    public void I_press(String what) {
+        calc.push(what);
     }
 
-    public String getOperation() {
-      return operation;
+    @Then("the result is {int}")
+    public void the_result_is(double expected) {
+        assertEquals(expected, calc.value());
     }
 
-    public void setOperation(String operation) {
-      this.operation = operation;
+    @Given("the previous entries:")
+    public void thePreviousEntries(List<Entry> entries) {
+        for (Entry entry : entries) {
+            calc.push(entry.first);
+            calc.push(entry.second);
+            calc.push(entry.operation);
+        }
     }
-  }
-
-  static class Calculator {
-    private static final List<String> OPS = asList("-", "+", "*", "/");
-    private final Deque<Number> stack = new LinkedList<>();
-
-    public void push(Object arg) {
-      if (OPS.contains(arg)) {
-        Number y = stack.removeLast();
-        Number x = stack.isEmpty() ? 0 : stack.removeLast();
-        Double val = null;
-        if (arg.equals("-")) {
-          val = x.doubleValue() - y.doubleValue();
-        } else if (arg.equals("+")) {
-          val = x.doubleValue() + y.doubleValue();
-        } else if (arg.equals("*")) {
-          val = x.doubleValue() * y.doubleValue();
-        } else if (arg.equals("/")) {
-          val = x.doubleValue() / y.doubleValue();
+
+    static final class Entry {
+
+        private Integer first;
+        private Integer second;
+        private String operation;
+
+        public Integer getFirst() {
+            return first;
+        }
+
+        public void setFirst(Integer first) {
+            this.first = first;
+        }
+
+        public Integer getSecond() {
+            return second;
+        }
+
+        public void setSecond(Integer second) {
+            this.second = second;
+        }
+
+        public String getOperation() {
+            return operation;
+        }
+
+        public void setOperation(String operation) {
+            this.operation = operation;
         }
-        push(val);
-      } else {
-        stack.add((Number) arg);
-      }
     }
 
-    public Number value() {
-      return stack.getLast();
+    static class Calculator {
+        private static final List<String> OPS = asList("-", "+", "*", "/");
+        private final Deque<Number> stack = new LinkedList<>();
+
+        public void push(Object arg) {
+            if (OPS.contains(arg)) {
+                Number y = stack.removeLast();
+                Number x = stack.isEmpty() ? 0 : stack.removeLast();
+                Double val = null;
+                if (arg.equals("-")) {
+                    val = x.doubleValue() - y.doubleValue();
+                } else if (arg.equals("+")) {
+                    val = x.doubleValue() + y.doubleValue();
+                } else if (arg.equals("*")) {
+                    val = x.doubleValue() * y.doubleValue();
+                } else if (arg.equals("/")) {
+                    val = x.doubleValue() / y.doubleValue();
+                }
+                push(val);
+            } else {
+                stack.add((Number) arg);
+            }
+        }
+
+        public Number value() {
+            return stack.getLast();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/java/org/example/cucumber/calculator/ParameterTypes.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/java/org/example/cucumber/calculator/ParameterTypes.java
index f9f38c0b085..3d3ef6c1fed 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/java/org/example/cucumber/calculator/ParameterTypes.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/java/org/example/cucumber/calculator/ParameterTypes.java
@@ -8,12 +8,12 @@
 
 public class ParameterTypes {
 
-  private final ObjectMapper objectMapper = new ObjectMapper();
+    private final ObjectMapper objectMapper = new ObjectMapper();
 
-  @DefaultParameterTransformer
-  @DefaultDataTableEntryTransformer
-  @DefaultDataTableCellTransformer
-  public Object transformer(Object fromValue, Type toValueType) {
-    return objectMapper.convertValue(fromValue, objectMapper.constructType(toValueType));
-  }
+    @DefaultParameterTransformer
+    @DefaultDataTableEntryTransformer
+    @DefaultDataTableCellTransformer
+    public Object transformer(Object fromValue, Type toValueType) {
+        return objectMapper.convertValue(fromValue, objectMapper.constructType(toValueType));
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java
index c45dc29e054..94a7f9d4ac8 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java
@@ -19,67 +19,64 @@
 
 @AutoService(InstrumenterModule.class)
 public class MUnitInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public MUnitInstrumentation() {
-    super("ci-visibility", "junit-4", "junit-4-munit");
-  }
+    public MUnitInstrumentation() {
+        super("ci-visibility", "junit-4", "junit-4-munit");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "munit.MUnitRunner";
-  }
+    @Override
+    public String instrumentedType() {
+        return "munit.MUnitRunner";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".TestEventsHandlerHolder",
-      packageName + ".SkippedByDatadog",
-      packageName + ".JUnit4Utils",
-      packageName + ".MUnitUtils",
-      packageName + ".TracingListener",
-      packageName + ".MUnitTracingListener",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".TestEventsHandlerHolder",
+            packageName + ".SkippedByDatadog",
+            packageName + ".JUnit4Utils",
+            packageName + ".MUnitUtils",
+            packageName + ".TracingListener",
+            packageName + ".MUnitTracingListener",
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.junit.runner.Description", TestExecutionTracker.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.junit.runner.Description", TestExecutionTracker.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("run").and(takesArgument(0, named("org.junit.runner.notification.RunNotifier"))),
-        MUnitInstrumentation.class.getName() + "$MUnitAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("run").and(takesArgument(0, named("org.junit.runner.notification.RunNotifier"))),
+                MUnitInstrumentation.class.getName() + "$MUnitAdvice");
+    }
 
-  public static class MUnitAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void addTracingListener(
-        @Advice.Argument(value = 0, readOnly = false) RunNotifier runNotifier) {
+    public static class MUnitAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void addTracingListener(@Advice.Argument(value = 0, readOnly = false) RunNotifier runNotifier) {
 
-      RunNotifier replacedNotifier = new RunNotifier();
+            RunNotifier replacedNotifier = new RunNotifier();
 
-      // copy listeners to new notifier
-      List<RunListener> runListeners = JUnit4Utils.runListenersFromRunNotifier(runNotifier);
-      if (runListeners != null) {
-        for (RunListener listener : runListeners) {
-          RunListener tracingListener = JUnit4Utils.toTracingListener(listener);
-          // skip JUnit 4 listener, we will install MUnit listener instead
-          if (tracingListener == null) {
-            replacedNotifier.addListener(listener);
-          }
-        }
-      }
+            // copy listeners to new notifier
+            List<RunListener> runListeners = JUnit4Utils.runListenersFromRunNotifier(runNotifier);
+            if (runListeners != null) {
+                for (RunListener listener : runListeners) {
+                    RunListener tracingListener = JUnit4Utils.toTracingListener(listener);
+                    // skip JUnit 4 listener, we will install MUnit listener instead
+                    if (tracingListener == null) {
+                        replacedNotifier.addListener(listener);
+                    }
+                }
+            }
 
-      TestEventsHandlerHolder.start(TestFrameworkInstrumentation.MUNIT, MUnitUtils.CAPABILITIES);
+            TestEventsHandlerHolder.start(TestFrameworkInstrumentation.MUNIT, MUnitUtils.CAPABILITIES);
 
-      replacedNotifier.addListener(
-          new MUnitTracingListener(
-              InstrumentationContext.get(Description.class, TestExecutionTracker.class)));
-      runNotifier = replacedNotifier;
+            replacedNotifier.addListener(new MUnitTracingListener(
+                    InstrumentationContext.get(Description.class, TestExecutionTracker.class)));
+            runNotifier = replacedNotifier;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java
index 51518bd1e3f..43467c71df1 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java
@@ -17,249 +17,249 @@
 
 public class MUnitTracingListener extends TracingListener {
 
-  public static final String FRAMEWORK_NAME = "munit";
-  public static final String FRAMEWORK_VERSION = getVersion();
-  private final ContextStore<Description, TestExecutionTracker> executionTrackers;
+    public static final String FRAMEWORK_NAME = "munit";
+    public static final String FRAMEWORK_VERSION = getVersion();
+    private final ContextStore<Description, TestExecutionTracker> executionTrackers;
 
-  public MUnitTracingListener(ContextStore<Description, TestExecutionTracker> executionTrackers) {
-    this.executionTrackers = executionTrackers;
-  }
-
-  public static String getVersion() {
-    Package munitPackage = Suite.class.getPackage();
-    return munitPackage.getImplementationVersion();
-  }
+    public MUnitTracingListener(ContextStore<Description, TestExecutionTracker> executionTrackers) {
+        this.executionTrackers = executionTrackers;
+    }
 
-  public void testSuiteStarted(final Description description) {
-    if (!isSuiteContainingChildren(description)) {
-      // Not all test suites contain tests.
-      // Given that test suites can be nested in other test suites,
-      // we are only interested in the innermost ones where the actual test cases reside
-      return;
+    public static String getVersion() {
+        Package munitPackage = Suite.class.getPackage();
+        return munitPackage.getImplementationVersion();
     }
 
-    TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description);
-    Class<?> testClass = description.getTestClass();
-    String testSuiteName = description.getClassName();
-    List<String> categories = MUnitUtils.getCategories(description);
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.MUNIT)
-        .onTestSuiteStart(
-            suiteDescriptor,
-            testSuiteName,
-            FRAMEWORK_NAME,
-            FRAMEWORK_VERSION,
-            testClass,
-            categories,
-            false,
-            TestFrameworkInstrumentation.MUNIT,
-            null);
-  }
+    public void testSuiteStarted(final Description description) {
+        if (!isSuiteContainingChildren(description)) {
+            // Not all test suites contain tests.
+            // Given that test suites can be nested in other test suites,
+            // we are only interested in the innermost ones where the actual test cases reside
+            return;
+        }
 
-  public void testSuiteFinished(final Description description) {
-    if (!isSuiteContainingChildren(description)) {
-      // Not all test suites contain tests.
-      // Given that test suites can be nested in other test suites,
-      // we are only interested in the innermost ones where the actual test cases reside
-      return;
+        TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description);
+        Class<?> testClass = description.getTestClass();
+        String testSuiteName = description.getClassName();
+        List<String> categories = MUnitUtils.getCategories(description);
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.MUNIT)
+                .onTestSuiteStart(
+                        suiteDescriptor,
+                        testSuiteName,
+                        FRAMEWORK_NAME,
+                        FRAMEWORK_VERSION,
+                        testClass,
+                        categories,
+                        false,
+                        TestFrameworkInstrumentation.MUNIT,
+                        null);
     }
 
-    TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description);
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.MUNIT)
-        .onTestSuiteFinish(suiteDescriptor, null);
-  }
+    public void testSuiteFinished(final Description description) {
+        if (!isSuiteContainingChildren(description)) {
+            // Not all test suites contain tests.
+            // Given that test suites can be nested in other test suites,
+            // we are only interested in the innermost ones where the actual test cases reside
+            return;
+        }
 
-  @Override
-  public void testStarted(final Description description) {
-    TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description);
-    TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description);
-    String testName = description.getMethodName();
-    List<String> categories = MUnitUtils.getCategories(description);
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.MUNIT)
-        .onTestStart(
-            suiteDescriptor,
-            testDescriptor,
-            testName,
-            FRAMEWORK_NAME,
-            FRAMEWORK_VERSION,
-            null,
-            categories,
-            JUnit4Utils.toTestSourceData(description),
-            null,
-            executionTrackers.get(description));
-  }
-
-  @Override
-  public void testFinished(final Description description) {
-    TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description);
-    TestExecutionTracker executionTracker = executionTrackers.get(description);
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.MUNIT)
-        .onTestFinish(testDescriptor, null, executionTracker);
-  }
+        TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description);
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.MUNIT)
+                .onTestSuiteFinish(suiteDescriptor, null);
+    }
 
-  // same callback is executed both for test cases and test suites (for setup/teardown errors)
-  @Override
-  public void testFailure(final Failure failure) {
-    Throwable throwable = failure.getException();
-    Description description = failure.getDescription();
+    @Override
+    public void testStarted(final Description description) {
+        TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description);
+        TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description);
+        String testName = description.getMethodName();
+        List<String> categories = MUnitUtils.getCategories(description);
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.MUNIT)
+                .onTestStart(
+                        suiteDescriptor,
+                        testDescriptor,
+                        testName,
+                        FRAMEWORK_NAME,
+                        FRAMEWORK_VERSION,
+                        null,
+                        categories,
+                        JUnit4Utils.toTestSourceData(description),
+                        null,
+                        executionTrackers.get(description));
+    }
 
-    String testName = description.getMethodName();
-    if (Strings.isNotBlank(testName)) {
-      TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description);
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.MUNIT)
-          .onTestFailure(testDescriptor, throwable);
-    } else {
-      TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description);
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.MUNIT)
-          .onTestSuiteFailure(suiteDescriptor, throwable);
+    @Override
+    public void testFinished(final Description description) {
+        TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description);
+        TestExecutionTracker executionTracker = executionTrackers.get(description);
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.MUNIT)
+                .onTestFinish(testDescriptor, null, executionTracker);
     }
-  }
 
-  @Override
-  public void testAssumptionFailure(final Failure failure) {
-    String reason;
-    Throwable throwable = failure.getException();
-    if (throwable != null) {
-      reason = throwable.getMessage();
-    } else {
-      reason = null;
+    // same callback is executed both for test cases and test suites (for setup/teardown errors)
+    @Override
+    public void testFailure(final Failure failure) {
+        Throwable throwable = failure.getException();
+        Description description = failure.getDescription();
+
+        String testName = description.getMethodName();
+        if (Strings.isNotBlank(testName)) {
+            TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description);
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.MUNIT)
+                    .onTestFailure(testDescriptor, throwable);
+        } else {
+            TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description);
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.MUNIT)
+                    .onTestSuiteFailure(suiteDescriptor, throwable);
+        }
     }
 
-    Description description = failure.getDescription();
-    Class<?> testClass = description.getTestClass();
-    String testName = description.getMethodName();
+    @Override
+    public void testAssumptionFailure(final Failure failure) {
+        String reason;
+        Throwable throwable = failure.getException();
+        if (throwable != null) {
+            reason = throwable.getMessage();
+        } else {
+            reason = null;
+        }
+
+        Description description = failure.getDescription();
+        Class<?> testClass = description.getTestClass();
+        String testName = description.getMethodName();
 
-    if (Strings.isNotBlank(testName)) {
-      TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description);
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.MUNIT)
-          .onTestSkip(testDescriptor, reason);
+        if (Strings.isNotBlank(testName)) {
+            TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description);
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.MUNIT)
+                    .onTestSkip(testDescriptor, reason);
 
-    } else if (testClass != null) {
-      TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description);
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.MUNIT)
-          .onTestSuiteSkip(suiteDescriptor, reason);
-      for (Description child : description.getChildren()) {
-        testCaseIgnored(child);
-      }
+        } else if (testClass != null) {
+            TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description);
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.MUNIT)
+                    .onTestSuiteSkip(suiteDescriptor, reason);
+            for (Description child : description.getChildren()) {
+                testCaseIgnored(child);
+            }
+        }
     }
-  }
 
-  @Override
-  public void testIgnored(final Description description) {
-    Class<?> testClass = description.getTestClass();
-    String testName = description.getMethodName();
+    @Override
+    public void testIgnored(final Description description) {
+        Class<?> testClass = description.getTestClass();
+        String testName = description.getMethodName();
 
-    if (Strings.isNotBlank(testName)) {
-      TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description);
-      if (!isSpanInProgress(InternalSpanTypes.TEST)) {
-        // earlier versions of MUnit (e.g. 0.7.28) trigger "testStarted" event for ignored tests,
-        // while newer versions don't
-        TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description);
-        List<String> categories = MUnitUtils.getCategories(description);
-        TestEventsHandlerHolder.HANDLERS
-            .get(TestFrameworkInstrumentation.MUNIT)
-            .onTestStart(
-                suiteDescriptor,
-                testDescriptor,
-                testName,
-                FRAMEWORK_NAME,
-                FRAMEWORK_VERSION,
-                null,
-                categories,
-                JUnit4Utils.toTestSourceData(description),
-                null,
-                null);
-      }
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.MUNIT)
-          .onTestSkip(testDescriptor, null);
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.MUNIT)
-          .onTestFinish(testDescriptor, null, executionTrackers.get(description));
+        if (Strings.isNotBlank(testName)) {
+            TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description);
+            if (!isSpanInProgress(InternalSpanTypes.TEST)) {
+                // earlier versions of MUnit (e.g. 0.7.28) trigger "testStarted" event for ignored tests,
+                // while newer versions don't
+                TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description);
+                List<String> categories = MUnitUtils.getCategories(description);
+                TestEventsHandlerHolder.HANDLERS
+                        .get(TestFrameworkInstrumentation.MUNIT)
+                        .onTestStart(
+                                suiteDescriptor,
+                                testDescriptor,
+                                testName,
+                                FRAMEWORK_NAME,
+                                FRAMEWORK_VERSION,
+                                null,
+                                categories,
+                                JUnit4Utils.toTestSourceData(description),
+                                null,
+                                null);
+            }
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.MUNIT)
+                    .onTestSkip(testDescriptor, null);
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.MUNIT)
+                    .onTestFinish(testDescriptor, null, executionTrackers.get(description));
 
-    } else if (testClass != null) {
-      TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description);
+        } else if (testClass != null) {
+            TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description);
 
-      boolean suiteStarted = isSpanInProgress(InternalSpanTypes.TEST_SUITE_END);
-      if (!suiteStarted) {
-        // there is a bug in MUnit 1.0.1+: start/finish events are not fired for skipped suites
-        String testSuiteName = description.getClassName();
-        List<String> categories = MUnitUtils.getCategories(description);
-        TestEventsHandlerHolder.HANDLERS
-            .get(TestFrameworkInstrumentation.MUNIT)
-            .onTestSuiteStart(
-                suiteDescriptor,
-                testSuiteName,
-                FRAMEWORK_NAME,
-                FRAMEWORK_VERSION,
-                testClass,
-                categories,
-                false,
-                TestFrameworkInstrumentation.MUNIT,
-                null);
-      }
+            boolean suiteStarted = isSpanInProgress(InternalSpanTypes.TEST_SUITE_END);
+            if (!suiteStarted) {
+                // there is a bug in MUnit 1.0.1+: start/finish events are not fired for skipped suites
+                String testSuiteName = description.getClassName();
+                List<String> categories = MUnitUtils.getCategories(description);
+                TestEventsHandlerHolder.HANDLERS
+                        .get(TestFrameworkInstrumentation.MUNIT)
+                        .onTestSuiteStart(
+                                suiteDescriptor,
+                                testSuiteName,
+                                FRAMEWORK_NAME,
+                                FRAMEWORK_VERSION,
+                                testClass,
+                                categories,
+                                false,
+                                TestFrameworkInstrumentation.MUNIT,
+                                null);
+            }
 
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.MUNIT)
-          .onTestSuiteSkip(suiteDescriptor, null);
-      for (Description child : description.getChildren()) {
-        testCaseIgnored(child);
-      }
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.MUNIT)
+                    .onTestSuiteSkip(suiteDescriptor, null);
+            for (Description child : description.getChildren()) {
+                testCaseIgnored(child);
+            }
 
-      if (!suiteStarted) {
-        TestEventsHandlerHolder.HANDLERS
-            .get(TestFrameworkInstrumentation.MUNIT)
-            .onTestSuiteFinish(suiteDescriptor, null);
-      }
+            if (!suiteStarted) {
+                TestEventsHandlerHolder.HANDLERS
+                        .get(TestFrameworkInstrumentation.MUNIT)
+                        .onTestSuiteFinish(suiteDescriptor, null);
+            }
+        }
     }
-  }
 
-  private static boolean isSpanInProgress(UTF8BytesString type) {
-    final AgentSpan span = AgentTracer.activeSpan();
-    if (span == null) {
-      return false;
+    private static boolean isSpanInProgress(UTF8BytesString type) {
+        final AgentSpan span = AgentTracer.activeSpan();
+        if (span == null) {
+            return false;
+        }
+        String spanType = span.getSpanType();
+        return spanType != null && spanType.contentEquals(type);
     }
-    String spanType = span.getSpanType();
-    return spanType != null && spanType.contentEquals(type);
-  }
 
-  private void testCaseIgnored(final Description description) {
-    TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description);
-    TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description);
-    String testName = description.getMethodName();
-    List<String> categories = MUnitUtils.getCategories(description);
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.MUNIT)
-        .onTestIgnore(
-            suiteDescriptor,
-            testDescriptor,
-            testName,
-            FRAMEWORK_NAME,
-            FRAMEWORK_VERSION,
-            null,
-            categories,
-            JUnit4Utils.toTestSourceData(description),
-            null,
-            executionTrackers.get(description));
-  }
-
-  private static boolean isSuiteContainingChildren(final Description description) {
-    Class<?> testClass = description.getTestClass();
-    if (testClass == null) {
-      return false;
+    private void testCaseIgnored(final Description description) {
+        TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description);
+        TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description);
+        String testName = description.getMethodName();
+        List<String> categories = MUnitUtils.getCategories(description);
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.MUNIT)
+                .onTestIgnore(
+                        suiteDescriptor,
+                        testDescriptor,
+                        testName,
+                        FRAMEWORK_NAME,
+                        FRAMEWORK_VERSION,
+                        null,
+                        categories,
+                        JUnit4Utils.toTestSourceData(description),
+                        null,
+                        executionTrackers.get(description));
     }
-    for (Description child : description.getChildren()) {
-      if (Strings.isNotBlank(child.getMethodName())) {
-        return true;
-      }
+
+    private static boolean isSuiteContainingChildren(final Description description) {
+        Class<?> testClass = description.getTestClass();
+        if (testClass == null) {
+            return false;
+        }
+        for (Description child : description.getChildren()) {
+            if (Strings.isNotBlank(child.getMethodName())) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java
index 3ba001c3ba4..a2856e7414d 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java
@@ -15,49 +15,45 @@
 
 public abstract class MUnitUtils {
 
-  private static final MethodHandles METHOD_HANDLES =
-      new MethodHandles(MUnitRunner.class.getClassLoader());
-  private static final MethodHandle RUNNER_CREATE_TEST_DESCRIPTION =
-      METHOD_HANDLES.method(
-          MUnitRunner.class,
-          m -> "createTestDescription".equals(m.getName()) && m.getParameterCount() == 1);
-
-  public static final List<LibraryCapability> CAPABILITIES =
-      Arrays.asList(
-          LibraryCapability.ATR,
-          LibraryCapability.EFD,
-          LibraryCapability.IMPACTED,
-          LibraryCapability.FTR,
-          LibraryCapability.QUARANTINE,
-          LibraryCapability.ATTEMPT_TO_FIX);
-
-  private MUnitUtils() {}
-
-  public static Description createDescription(MUnitRunner runner, Object test) {
-    return METHOD_HANDLES.invoke(RUNNER_CREATE_TEST_DESCRIPTION, runner, test);
-  }
-
-  public static TestDescriptor toTestDescriptor(Description description) {
-    String testSuiteName = description.getClassName();
-    Class<?> testClass = description.getTestClass();
-    String testName = description.getMethodName();
-    return new TestDescriptor(testSuiteName, testClass, testName, null, null);
-  }
-
-  public static TestSuiteDescriptor toSuiteDescriptor(Description description) {
-    Class<?> testClass = description.getTestClass();
-    String testSuiteName = description.getClassName();
-    return new TestSuiteDescriptor(testSuiteName, testClass);
-  }
-
-  public static List<String> getCategories(Description description) {
-    List<String> categories = new ArrayList<>();
-    for (Annotation annotation : description.getAnnotations()) {
-      if (annotation.annotationType() == Tag.class) {
-        Tag tag = (Tag) annotation;
-        categories.add(tag.value());
-      }
+    private static final MethodHandles METHOD_HANDLES = new MethodHandles(MUnitRunner.class.getClassLoader());
+    private static final MethodHandle RUNNER_CREATE_TEST_DESCRIPTION = METHOD_HANDLES.method(
+            MUnitRunner.class, m -> "createTestDescription".equals(m.getName()) && m.getParameterCount() == 1);
+
+    public static final List<LibraryCapability> CAPABILITIES = Arrays.asList(
+            LibraryCapability.ATR,
+            LibraryCapability.EFD,
+            LibraryCapability.IMPACTED,
+            LibraryCapability.FTR,
+            LibraryCapability.QUARANTINE,
+            LibraryCapability.ATTEMPT_TO_FIX);
+
+    private MUnitUtils() {}
+
+    public static Description createDescription(MUnitRunner runner, Object test) {
+        return METHOD_HANDLES.invoke(RUNNER_CREATE_TEST_DESCRIPTION, runner, test);
+    }
+
+    public static TestDescriptor toTestDescriptor(Description description) {
+        String testSuiteName = description.getClassName();
+        Class<?> testClass = description.getTestClass();
+        String testName = description.getMethodName();
+        return new TestDescriptor(testSuiteName, testClass, testName, null, null);
+    }
+
+    public static TestSuiteDescriptor toSuiteDescriptor(Description description) {
+        Class<?> testClass = description.getTestClass();
+        String testSuiteName = description.getClassName();
+        return new TestSuiteDescriptor(testSuiteName, testClass);
+    }
+
+    public static List<String> getCategories(Description description) {
+        List<String> categories = new ArrayList<>();
+        for (Annotation annotation : description.getAnnotations()) {
+            if (annotation.annotationType() == Tag.class) {
+                Tag tag = (Tag) annotation;
+                categories.add(tag.value());
+            }
+        }
+        return categories;
     }
-    return categories;
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/main/java/datadog/trace/instrumentation/junit4/execution/MUnitExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/main/java/datadog/trace/instrumentation/junit4/execution/MUnitExecutionInstrumentation.java
index 8016269af6a..9e9dcd944c1 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/main/java/datadog/trace/instrumentation/junit4/execution/MUnitExecutionInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/main/java/datadog/trace/instrumentation/junit4/execution/MUnitExecutionInstrumentation.java
@@ -29,103 +29,100 @@
 
 @AutoService(InstrumenterModule.class)
 public class MUnitExecutionInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  private final String parentPackageName = Strings.getPackageName(JUnit4Utils.class.getName());
-
-  public MUnitExecutionInstrumentation() {
-    super("ci-visibility", "junit-4", "junit-4-munit", "test-retry");
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "munit.MUnitRunner";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      parentPackageName + ".MUnitUtils",
-      parentPackageName + ".SkippedByDatadog",
-      parentPackageName + ".JUnit4Utils",
-      parentPackageName + ".TracingListener",
-      parentPackageName + ".TestEventsHandlerHolder",
-      packageName + ".FailureSuppressingNotifier"
-    };
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.junit.runner.Description", TestExecutionTracker.class.getName());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("runTest").and(takesArgument(0, named("org.junit.runner.notification.RunNotifier"))),
-        MUnitExecutionInstrumentation.class.getName() + "$ExecutionAdvice");
-  }
-
-  public static class ExecutionAdvice {
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @Advice.OnMethodEnter(skipOn = Future.class)
-    public static Future<?> apply(
-        @Advice.Origin Method runTest,
-        @Advice.This MUnitRunner runner,
-        @Advice.Argument(0) RunNotifier notifier,
-        @Advice.Argument(1) Object test) {
-      if (notifier instanceof FailureSuppressingNotifier) {
-        // notifier already wrapped, run original method
-        return null;
-      }
-
-      Description description = MUnitUtils.createDescription(runner, test);
-      TestIdentifier testIdentifier = JUnit4Utils.toTestIdentifier(description);
-      TestSourceData testSourceData = JUnit4Utils.toTestSourceData(description);
-      Collection<String> testTags = MUnitUtils.getCategories(description);
-
-      TestExecutionPolicy executionPolicy =
-          TestEventsHandlerHolder.HANDLERS
-              .get(TestFrameworkInstrumentation.MUNIT)
-              .executionPolicy(testIdentifier, testSourceData, testTags);
-      if (!executionPolicy.applicable()) {
-        // retries not applicable, run original method
-        return null;
-      }
-
-      InstrumentationContext.get(Description.class, TestExecutionTracker.class)
-          .put(description, executionPolicy);
-
-      Future<?> result = Future.successful(false);
-
-      FailureSuppressingNotifier failureSuppressingNotifier =
-          new FailureSuppressingNotifier(executionPolicy, notifier);
-      do {
-        try {
-          runTest.setAccessible(true);
-          result = (Future<?>) runTest.invoke(runner, failureSuppressingNotifier, test);
-        } catch (Throwable ignored) {
-        }
-      } while (executionPolicy.applicable());
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    private final String parentPackageName = Strings.getPackageName(JUnit4Utils.class.getName());
+
+    public MUnitExecutionInstrumentation() {
+        super("ci-visibility", "junit-4", "junit-4-munit", "test-retry");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "munit.MUnitRunner";
+    }
 
-      // skip original method
-      return result;
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            parentPackageName + ".MUnitUtils",
+            parentPackageName + ".SkippedByDatadog",
+            parentPackageName + ".JUnit4Utils",
+            parentPackageName + ".TracingListener",
+            parentPackageName + ".TestEventsHandlerHolder",
+            packageName + ".FailureSuppressingNotifier"
+        };
     }
 
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @Advice.OnMethodExit
-    public static void returnResult(
-        @Advice.Enter Future<?> overriddenResult,
-        @Advice.Return(readOnly = false) Future<?> result) {
-      if (overriddenResult != null) {
-        result = overriddenResult;
-      }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.junit.runner.Description", TestExecutionTracker.class.getName());
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("runTest").and(takesArgument(0, named("org.junit.runner.notification.RunNotifier"))),
+                MUnitExecutionInstrumentation.class.getName() + "$ExecutionAdvice");
+    }
+
+    public static class ExecutionAdvice {
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @Advice.OnMethodEnter(skipOn = Future.class)
+        public static Future<?> apply(
+                @Advice.Origin Method runTest,
+                @Advice.This MUnitRunner runner,
+                @Advice.Argument(0) RunNotifier notifier,
+                @Advice.Argument(1) Object test) {
+            if (notifier instanceof FailureSuppressingNotifier) {
+                // notifier already wrapped, run original method
+                return null;
+            }
+
+            Description description = MUnitUtils.createDescription(runner, test);
+            TestIdentifier testIdentifier = JUnit4Utils.toTestIdentifier(description);
+            TestSourceData testSourceData = JUnit4Utils.toTestSourceData(description);
+            Collection<String> testTags = MUnitUtils.getCategories(description);
+
+            TestExecutionPolicy executionPolicy = TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.MUNIT)
+                    .executionPolicy(testIdentifier, testSourceData, testTags);
+            if (!executionPolicy.applicable()) {
+                // retries not applicable, run original method
+                return null;
+            }
+
+            InstrumentationContext.get(Description.class, TestExecutionTracker.class)
+                    .put(description, executionPolicy);
+
+            Future<?> result = Future.successful(false);
+
+            FailureSuppressingNotifier failureSuppressingNotifier =
+                    new FailureSuppressingNotifier(executionPolicy, notifier);
+            do {
+                try {
+                    runTest.setAccessible(true);
+                    result = (Future<?>) runTest.invoke(runner, failureSuppressingNotifier, test);
+                } catch (Throwable ignored) {
+                }
+            } while (executionPolicy.applicable());
+
+            // skip original method
+            return result;
+        }
+
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @Advice.OnMethodExit
+        public static void returnResult(
+                @Advice.Enter Future<?> overriddenResult, @Advice.Return(readOnly = false) Future<?> result) {
+            if (overriddenResult != null) {
+                result = overriddenResult;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java
index 8fdf749a5aa..63dc3375c7e 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java
@@ -28,110 +28,103 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit4Instrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  static final int ORDER = 0;
-
-  public JUnit4Instrumentation() {
-    super("ci-visibility", "junit-4");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.junit.runner.Runner";
-  }
-
-  @Override
-  public int order() {
-    return ORDER;
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()))
-        // do not instrument our internal runner
-        // that is used to run instrumentation integration tests
-        .and(not(extendsClass(named("datadog.trace.agent.test.SpockRunner"))))
-        // do not instrument Karate JUnit 4 runner
-        // since Karate has a dedicated instrumentation
-        .and(not(extendsClass(named("com.intuit.karate.junit4.Karate"))))
-        // do not instrument MUnit-JUnit 4 interface runner
-        // since MUnit has a dedicated instrumentation
-        .and(not(extendsClass(nameStartsWith("munit"))))
-        // PowerMock runner is being instrumented,
-        // so do not instrument its internal delegates
-        .and(
-            not(
-                implementsInterface(
-                    named(
-                        "org.powermock.modules.junit4.common.internal.PowerMockJUnitRunnerDelegate"))));
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.junit.runner.Description", TestExecutionTracker.class.getName());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(), JUnit4Instrumentation.class.getName() + "$HandlerAdvice");
-    transformer.applyAdvice(
-        named("run").and(takesArgument(0, named("org.junit.runner.notification.RunNotifier"))),
-        JUnit4Instrumentation.class.getName() + "$JUnit4Advice");
-  }
-
-  public static class HandlerAdvice {
-    @Advice.OnMethodExit
-    public static void onRunnerCreation(@Advice.This final Runner runner) {
-      if (!JUnit4Utils.runnerToFramework(runner).equals(TestFrameworkInstrumentation.JUNIT4)) {
-        // checking class names in hierarchyMatcher alone is not enough:
-        // for example, Karate calls #run method of its super class,
-        // that was transformed
-        return;
-      }
-
-      TestEventsHandlerHolder.start(
-          TestFrameworkInstrumentation.JUNIT4, JUnit4Utils.capabilities(false));
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    static final int ORDER = 0;
+
+    public JUnit4Instrumentation() {
+        super("ci-visibility", "junit-4");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.junit.runner.Runner";
+    }
+
+    @Override
+    public int order() {
+        return ORDER;
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()))
+                // do not instrument our internal runner
+                // that is used to run instrumentation integration tests
+                .and(not(extendsClass(named("datadog.trace.agent.test.SpockRunner"))))
+                // do not instrument Karate JUnit 4 runner
+                // since Karate has a dedicated instrumentation
+                .and(not(extendsClass(named("com.intuit.karate.junit4.Karate"))))
+                // do not instrument MUnit-JUnit 4 interface runner
+                // since MUnit has a dedicated instrumentation
+                .and(not(extendsClass(nameStartsWith("munit"))))
+                // PowerMock runner is being instrumented,
+                // so do not instrument its internal delegates
+                .and(not(implementsInterface(
+                        named("org.powermock.modules.junit4.common.internal.PowerMockJUnitRunnerDelegate"))));
     }
-  }
-
-  public static class JUnit4Advice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void addTracingListener(
-        @Advice.This final Runner runner, @Advice.Argument(0) final RunNotifier runNotifier) {
-      if (!JUnit4Utils.runnerToFramework(runner).equals(TestFrameworkInstrumentation.JUNIT4)) {
-        // checking class names in hierarchyMatcher alone is not enough:
-        // for example, Karate calls #run method of its super class,
-        // that was transformed
-        return;
-      }
-
-      // No public accessor to get already installed listeners.
-      // The installed RunListeners list are obtained using reflection.
-      final List<RunListener> runListeners = JUnit4Utils.runListenersFromRunNotifier(runNotifier);
-      if (runListeners == null) {
-        return;
-      }
-
-      for (final RunListener listener : runListeners) {
-        RunListener tracingListener = JUnit4Utils.toTracingListener(listener);
-        if (tracingListener != null) {
-          // prevents installing TracingListener multiple times
-          return;
-        }
-      }
 
-      final TracingListener tracingListener =
-          new JUnit4TracingListener(
-              InstrumentationContext.get(Description.class, TestExecutionTracker.class));
-      runNotifier.addListener(tracingListener);
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.junit.runner.Description", TestExecutionTracker.class.getName());
     }
 
-    // JUnit 4.10 and above
-    public static void muzzleCheck(final RuleChain ruleChain) {
-      ruleChain.apply(null, null);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), JUnit4Instrumentation.class.getName() + "$HandlerAdvice");
+        transformer.applyAdvice(
+                named("run").and(takesArgument(0, named("org.junit.runner.notification.RunNotifier"))),
+                JUnit4Instrumentation.class.getName() + "$JUnit4Advice");
+    }
+
+    public static class HandlerAdvice {
+        @Advice.OnMethodExit
+        public static void onRunnerCreation(@Advice.This final Runner runner) {
+            if (!JUnit4Utils.runnerToFramework(runner).equals(TestFrameworkInstrumentation.JUNIT4)) {
+                // checking class names in hierarchyMatcher alone is not enough:
+                // for example, Karate calls #run method of its super class,
+                // that was transformed
+                return;
+            }
+
+            TestEventsHandlerHolder.start(TestFrameworkInstrumentation.JUNIT4, JUnit4Utils.capabilities(false));
+        }
+    }
+
+    public static class JUnit4Advice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void addTracingListener(
+                @Advice.This final Runner runner, @Advice.Argument(0) final RunNotifier runNotifier) {
+            if (!JUnit4Utils.runnerToFramework(runner).equals(TestFrameworkInstrumentation.JUNIT4)) {
+                // checking class names in hierarchyMatcher alone is not enough:
+                // for example, Karate calls #run method of its super class,
+                // that was transformed
+                return;
+            }
+
+            // No public accessor to get already installed listeners.
+            // The installed RunListeners list are obtained using reflection.
+            final List<RunListener> runListeners = JUnit4Utils.runListenersFromRunNotifier(runNotifier);
+            if (runListeners == null) {
+                return;
+            }
+
+            for (final RunListener listener : runListeners) {
+                RunListener tracingListener = JUnit4Utils.toTracingListener(listener);
+                if (tracingListener != null) {
+                    // prevents installing TracingListener multiple times
+                    return;
+                }
+            }
+
+            final TracingListener tracingListener = new JUnit4TracingListener(
+                    InstrumentationContext.get(Description.class, TestExecutionTracker.class));
+            runNotifier.addListener(tracingListener);
+        }
+
+        // JUnit 4.10 and above
+        public static void muzzleCheck(final RuleChain ruleChain) {
+            ruleChain.apply(null, null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java
index 5fcbf53ea9e..981b15a2f75 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java
@@ -28,87 +28,86 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit4SkipInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public JUnit4SkipInstrumentation() {
-    super("ci-visibility", "junit-4");
-  }
+    public JUnit4SkipInstrumentation() {
+        super("ci-visibility", "junit-4");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled()
-        && (Config.get().isCiVisibilityTestSkippingEnabled()
-            || Config.get().isCiVisibilityTestManagementEnabled());
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled()
+                && (Config.get().isCiVisibilityTestSkippingEnabled()
+                        || Config.get().isCiVisibilityTestManagementEnabled());
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.junit.runners.ParentRunner";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.junit.runners.ParentRunner";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()))
-        // ITR skipping for Cucumber is done in a dedicated instrumentation
-        .and(not(extendsClass(named("io.cucumber.junit.FeatureRunner"))));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()))
+                // ITR skipping for Cucumber is done in a dedicated instrumentation
+                .and(not(extendsClass(named("io.cucumber.junit.FeatureRunner"))));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("runChild")
-            .and(takesArguments(2))
-            .and(takesArgument(1, named("org.junit.runner.notification.RunNotifier"))),
-        JUnit4SkipInstrumentation.class.getName() + "$JUnit4SkipInstrumentationAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("runChild")
+                        .and(takesArguments(2))
+                        .and(takesArgument(1, named("org.junit.runner.notification.RunNotifier"))),
+                JUnit4SkipInstrumentation.class.getName() + "$JUnit4SkipInstrumentationAdvice");
+    }
 
-  public static class JUnit4SkipInstrumentationAdvice {
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @SuppressFBWarnings("NP_BOOLEAN_RETURN_NULL")
-    @Advice.OnMethodEnter(skipOn = Boolean.class)
-    public static Boolean runChild(
-        @Advice.This ParentRunner<?> runner,
-        @Advice.Argument(0) Object child,
-        @Advice.Argument(1) RunNotifier notifier) {
-      Description description = JUnit4Utils.getDescription(runner, child);
-      if (description == null || !description.isTest()) {
-        return null;
-      }
+    public static class JUnit4SkipInstrumentationAdvice {
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @SuppressFBWarnings("NP_BOOLEAN_RETURN_NULL")
+        @Advice.OnMethodEnter(skipOn = Boolean.class)
+        public static Boolean runChild(
+                @Advice.This ParentRunner<?> runner,
+                @Advice.Argument(0) Object child,
+                @Advice.Argument(1) RunNotifier notifier) {
+            Description description = JUnit4Utils.getDescription(runner, child);
+            if (description == null || !description.isTest()) {
+                return null;
+            }
 
-      Ignore ignoreAnnotation = description.getAnnotation(Ignore.class);
-      if (ignoreAnnotation != null) {
-        // class is ignored
-        return null;
-      }
+            Ignore ignoreAnnotation = description.getAnnotation(Ignore.class);
+            if (ignoreAnnotation != null) {
+                // class is ignored
+                return null;
+            }
 
-      TestIdentifier test = JUnit4Utils.toTestIdentifier(description);
-      SkipReason skipReason =
-          TestEventsHandlerHolder.HANDLERS
-              .get(TestFrameworkInstrumentation.JUNIT4)
-              .skipReason(test);
-      if (skipReason == null) {
-        return null;
-      }
+            TestIdentifier test = JUnit4Utils.toTestIdentifier(description);
+            SkipReason skipReason = TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.JUNIT4)
+                    .skipReason(test);
+            if (skipReason == null) {
+                return null;
+            }
 
-      if (skipReason == SkipReason.ITR) {
-        Class<?> testClass = description.getTestClass();
-        Method testMethod = JUnit4Utils.getTestMethod(description);
-        List<String> categories = JUnit4Utils.getCategories(testClass, testMethod);
-        for (String category : categories) {
-          if (category.endsWith(CIConstants.Tags.ITR_UNSKIPPABLE_TAG)) {
-            return null;
-          }
-        }
-      }
+            if (skipReason == SkipReason.ITR) {
+                Class<?> testClass = description.getTestClass();
+                Method testMethod = JUnit4Utils.getTestMethod(description);
+                List<String> categories = JUnit4Utils.getCategories(testClass, testMethod);
+                for (String category : categories) {
+                    if (category.endsWith(CIConstants.Tags.ITR_UNSKIPPABLE_TAG)) {
+                        return null;
+                    }
+                }
+            }
 
-      Description skippedDescription = JUnit4Utils.getSkippedDescription(description, skipReason);
-      notifier.fireTestIgnored(skippedDescription);
-      return Boolean.FALSE;
-    }
+            Description skippedDescription = JUnit4Utils.getSkippedDescription(description, skipReason);
+            notifier.fireTestIgnored(skippedDescription);
+            return Boolean.FALSE;
+        }
 
-    // JUnit 4.10 and above
-    public static void muzzleCheck(final RuleChain ruleChain) {
-      ruleChain.apply(null, null);
+        // JUnit 4.10 and above
+        public static void muzzleCheck(final RuleChain ruleChain) {
+            ruleChain.apply(null, null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java
index a7159caac8c..e61b9aae615 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java
@@ -20,72 +20,69 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit4SuiteEventsInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public JUnit4SuiteEventsInstrumentation() {
-    super("ci-visibility", "junit-4");
-  }
+    public JUnit4SuiteEventsInstrumentation() {
+        super("ci-visibility", "junit-4");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.junit.runners.ParentRunner";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.junit.runners.ParentRunner";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("run")
-            .and(
-                takesArgument(
-                    0,
-                    named("org.junit.runner.notification.RunNotifier")
-                        .and(not(declaresMethod(named("fireTestSuiteStarted")))))),
-        JUnit4SuiteEventsInstrumentation.class.getName() + "$JUnit4SuiteEventsAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("run")
+                        .and(takesArgument(
+                                0,
+                                named("org.junit.runner.notification.RunNotifier")
+                                        .and(not(declaresMethod(named("fireTestSuiteStarted")))))),
+                JUnit4SuiteEventsInstrumentation.class.getName() + "$JUnit4SuiteEventsAdvice");
+    }
 
-  public static class JUnit4SuiteEventsAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void fireSuiteStartedEvent(
-        @Advice.Argument(0) final RunNotifier runNotifier,
-        @Advice.This final ParentRunner<?> runner) {
-      final List<RunListener> runListeners = JUnit4Utils.runListenersFromRunNotifier(runNotifier);
-      if (runListeners == null) {
-        return;
-      }
+    public static class JUnit4SuiteEventsAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void fireSuiteStartedEvent(
+                @Advice.Argument(0) final RunNotifier runNotifier, @Advice.This final ParentRunner<?> runner) {
+            final List<RunListener> runListeners = JUnit4Utils.runListenersFromRunNotifier(runNotifier);
+            if (runListeners == null) {
+                return;
+            }
 
-      for (final RunListener listener : runListeners) {
-        TracingListener tracingListener = JUnit4Utils.toTracingListener(listener);
-        if (tracingListener != null) {
-          tracingListener.testSuiteStarted(runner.getDescription());
+            for (final RunListener listener : runListeners) {
+                TracingListener tracingListener = JUnit4Utils.toTracingListener(listener);
+                if (tracingListener != null) {
+                    tracingListener.testSuiteStarted(runner.getDescription());
+                }
+            }
         }
-      }
-    }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void fireSuiteFinishedEvent(
-        @Advice.Argument(0) final RunNotifier runNotifier,
-        @Advice.This final ParentRunner<?> runner) {
-      final List<RunListener> runListeners = JUnit4Utils.runListenersFromRunNotifier(runNotifier);
-      if (runListeners == null) {
-        return;
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void fireSuiteFinishedEvent(
+                @Advice.Argument(0) final RunNotifier runNotifier, @Advice.This final ParentRunner<?> runner) {
+            final List<RunListener> runListeners = JUnit4Utils.runListenersFromRunNotifier(runNotifier);
+            if (runListeners == null) {
+                return;
+            }
 
-      for (final RunListener listener : runListeners) {
-        TracingListener tracingListener = JUnit4Utils.toTracingListener(listener);
-        if (tracingListener != null) {
-          tracingListener.testSuiteFinished(runner.getDescription());
+            for (final RunListener listener : runListeners) {
+                TracingListener tracingListener = JUnit4Utils.toTracingListener(listener);
+                if (tracingListener != null) {
+                    tracingListener.testSuiteFinished(runner.getDescription());
+                }
+            }
         }
-      }
-    }
 
-    // JUnit 4.10 and above
-    public static void muzzleCheck(final RuleChain ruleChain) {
-      ruleChain.apply(null, null);
+        // JUnit 4.10 and above
+        public static void muzzleCheck(final RuleChain ruleChain) {
+            ruleChain.apply(null, null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java
index afa43e45493..d0b20cd8150 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java
@@ -14,228 +14,228 @@
 
 public class JUnit4TracingListener extends TracingListener {
 
-  private static final String FRAMEWORK_NAME = "junit4";
-  private static final String FRAMEWORK_VERSION = JUnit4Utils.getVersion();
+    private static final String FRAMEWORK_NAME = "junit4";
+    private static final String FRAMEWORK_VERSION = JUnit4Utils.getVersion();
 
-  private final ContextStore<Description, TestExecutionTracker> executionTrackers;
+    private final ContextStore<Description, TestExecutionTracker> executionTrackers;
 
-  public JUnit4TracingListener(ContextStore<Description, TestExecutionTracker> executionTrackers) {
-    this.executionTrackers = executionTrackers;
-  }
-
-  public void testSuiteStarted(final Description description) {
-    if (!JUnit4Utils.isSuiteContainingChildren(description)) {
-      // Not all test suites contain tests.
-      // Given that test suites can be nested in other test suites,
-      // we are only interested in the innermost ones where the actual test cases reside
-      return;
+    public JUnit4TracingListener(ContextStore<Description, TestExecutionTracker> executionTrackers) {
+        this.executionTrackers = executionTrackers;
     }
 
-    TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description);
-    Class<?> testClass = description.getTestClass();
-    String testSuiteName = JUnit4Utils.getSuiteName(testClass, description);
-    List<String> categories = JUnit4Utils.getCategories(testClass, null);
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.JUNIT4)
-        .onTestSuiteStart(
-            suiteDescriptor,
-            testSuiteName,
-            FRAMEWORK_NAME,
-            FRAMEWORK_VERSION,
-            testClass,
-            categories,
-            false,
-            TestFrameworkInstrumentation.JUNIT4,
-            null);
-  }
-
-  public void testSuiteFinished(final Description description) {
-    if (!JUnit4Utils.isSuiteContainingChildren(description)) {
-      // Not all test suites contain tests.
-      // Given that test suites can be nested in other test suites,
-      // we are only interested in the innermost ones where the actual test cases reside
-      return;
+    public void testSuiteStarted(final Description description) {
+        if (!JUnit4Utils.isSuiteContainingChildren(description)) {
+            // Not all test suites contain tests.
+            // Given that test suites can be nested in other test suites,
+            // we are only interested in the innermost ones where the actual test cases reside
+            return;
+        }
+
+        TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description);
+        Class<?> testClass = description.getTestClass();
+        String testSuiteName = JUnit4Utils.getSuiteName(testClass, description);
+        List<String> categories = JUnit4Utils.getCategories(testClass, null);
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.JUNIT4)
+                .onTestSuiteStart(
+                        suiteDescriptor,
+                        testSuiteName,
+                        FRAMEWORK_NAME,
+                        FRAMEWORK_VERSION,
+                        testClass,
+                        categories,
+                        false,
+                        TestFrameworkInstrumentation.JUNIT4,
+                        null);
     }
 
-    TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description);
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.JUNIT4)
-        .onTestSuiteFinish(suiteDescriptor, null);
-  }
-
-  @Override
-  public void testStarted(final Description description) {
-    if (JUnit4Utils.isJUnitPlatformRunnerTest(description)) {
-      return;
+    public void testSuiteFinished(final Description description) {
+        if (!JUnit4Utils.isSuiteContainingChildren(description)) {
+            // Not all test suites contain tests.
+            // Given that test suites can be nested in other test suites,
+            // we are only interested in the innermost ones where the actual test cases reside
+            return;
+        }
+
+        TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description);
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.JUNIT4)
+                .onTestSuiteFinish(suiteDescriptor, null);
     }
 
-    TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description);
-    TestDescriptor testDescriptor = JUnit4Utils.toTestDescriptor(description);
-    TestSourceData testSourceData = JUnit4Utils.toTestSourceData(description);
-
-    String testName = JUnit4Utils.getTestName(description, testSourceData.getTestMethod());
-    String testParameters = JUnit4Utils.getParameters(description);
-    List<String> categories =
-        JUnit4Utils.getCategories(testSourceData.getTestClass(), testSourceData.getTestMethod());
-
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.JUNIT4)
-        .onTestStart(
-            suiteDescriptor,
-            testDescriptor,
-            testName,
-            FRAMEWORK_NAME,
-            FRAMEWORK_VERSION,
-            testParameters,
-            categories,
-            testSourceData,
-            null,
-            executionTrackers.get(description));
-  }
-
-  @Override
-  public void testFinished(final Description description) {
-    if (JUnit4Utils.isJUnitPlatformRunnerTest(description)) {
-      return;
+    @Override
+    public void testStarted(final Description description) {
+        if (JUnit4Utils.isJUnitPlatformRunnerTest(description)) {
+            return;
+        }
+
+        TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description);
+        TestDescriptor testDescriptor = JUnit4Utils.toTestDescriptor(description);
+        TestSourceData testSourceData = JUnit4Utils.toTestSourceData(description);
+
+        String testName = JUnit4Utils.getTestName(description, testSourceData.getTestMethod());
+        String testParameters = JUnit4Utils.getParameters(description);
+        List<String> categories =
+                JUnit4Utils.getCategories(testSourceData.getTestClass(), testSourceData.getTestMethod());
+
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.JUNIT4)
+                .onTestStart(
+                        suiteDescriptor,
+                        testDescriptor,
+                        testName,
+                        FRAMEWORK_NAME,
+                        FRAMEWORK_VERSION,
+                        testParameters,
+                        categories,
+                        testSourceData,
+                        null,
+                        executionTrackers.get(description));
     }
 
-    TestDescriptor testDescriptor = JUnit4Utils.toTestDescriptor(description);
-    TestExecutionTracker executionTracker = executionTrackers.get(description);
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.JUNIT4)
-        .onTestFinish(testDescriptor, null, executionTracker);
-  }
-
-  // same callback is executed both for test cases and test suites (for setup/teardown errors)
-  @Override
-  public void testFailure(final Failure failure) {
-    Description description = failure.getDescription();
-    if (JUnit4Utils.isJUnitPlatformRunnerTest(description)) {
-      return;
+    @Override
+    public void testFinished(final Description description) {
+        if (JUnit4Utils.isJUnitPlatformRunnerTest(description)) {
+            return;
+        }
+
+        TestDescriptor testDescriptor = JUnit4Utils.toTestDescriptor(description);
+        TestExecutionTracker executionTracker = executionTrackers.get(description);
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.JUNIT4)
+                .onTestFinish(testDescriptor, null, executionTracker);
     }
 
-    if (JUnit4Utils.isTestSuiteDescription(description)) {
-      TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description);
-      Throwable throwable = failure.getException();
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.JUNIT4)
-          .onTestSuiteFailure(suiteDescriptor, throwable);
-    } else {
-      TestDescriptor testDescriptor = JUnit4Utils.toTestDescriptor(description);
-      Throwable throwable = failure.getException();
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.JUNIT4)
-          .onTestFailure(testDescriptor, throwable);
+    // same callback is executed both for test cases and test suites (for setup/teardown errors)
+    @Override
+    public void testFailure(final Failure failure) {
+        Description description = failure.getDescription();
+        if (JUnit4Utils.isJUnitPlatformRunnerTest(description)) {
+            return;
+        }
+
+        if (JUnit4Utils.isTestSuiteDescription(description)) {
+            TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description);
+            Throwable throwable = failure.getException();
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.JUNIT4)
+                    .onTestSuiteFailure(suiteDescriptor, throwable);
+        } else {
+            TestDescriptor testDescriptor = JUnit4Utils.toTestDescriptor(description);
+            Throwable throwable = failure.getException();
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.JUNIT4)
+                    .onTestFailure(testDescriptor, throwable);
+        }
     }
-  }
 
-  @Override
-  public void testAssumptionFailure(final Failure failure) {
-    Description description = failure.getDescription();
-    if (JUnit4Utils.isJUnitPlatformRunnerTest(description)) {
-      return;
+    @Override
+    public void testAssumptionFailure(final Failure failure) {
+        Description description = failure.getDescription();
+        if (JUnit4Utils.isJUnitPlatformRunnerTest(description)) {
+            return;
+        }
+
+        String reason;
+        Throwable throwable = failure.getException();
+        if (throwable != null) {
+            reason = throwable.getMessage();
+        } else {
+            reason = null;
+        }
+
+        if (JUnit4Utils.isTestSuiteDescription(description)) {
+            TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description);
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.JUNIT4)
+                    .onTestSuiteSkip(suiteDescriptor, reason);
+
+            List<Method> testMethods = JUnit4Utils.getTestMethods(description.getTestClass());
+            for (Method testMethod : testMethods) {
+                testIgnored(description, testMethod, reason);
+            }
+        } else {
+            TestDescriptor testDescriptor = JUnit4Utils.toTestDescriptor(description);
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.JUNIT4)
+                    .onTestSkip(testDescriptor, reason);
+        }
     }
 
-    String reason;
-    Throwable throwable = failure.getException();
-    if (throwable != null) {
-      reason = throwable.getMessage();
-    } else {
-      reason = null;
+    @Override
+    public void testIgnored(final Description description) {
+        if (JUnit4Utils.isJUnitPlatformRunnerTest(description)) {
+            return;
+        }
+
+        final Ignore ignore = description.getAnnotation(Ignore.class);
+        final String reason = ignore != null ? ignore.value() : null;
+
+        if (JUnit4Utils.isTestCaseDescription(description)) {
+            Method testMethod = JUnit4Utils.getTestMethod(description);
+            testIgnored(description, testMethod, reason);
+
+        } else if (JUnit4Utils.isTestSuiteDescription(description)) {
+
+            TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description);
+            Class<?> testClass = description.getTestClass();
+            String testSuiteName = JUnit4Utils.getSuiteName(testClass, description);
+            List<String> categories = JUnit4Utils.getCategories(testClass, null);
+
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.JUNIT4)
+                    .onTestSuiteStart(
+                            suiteDescriptor,
+                            testSuiteName,
+                            FRAMEWORK_NAME,
+                            FRAMEWORK_VERSION,
+                            testClass,
+                            categories,
+                            false,
+                            TestFrameworkInstrumentation.JUNIT4,
+                            null);
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.JUNIT4)
+                    .onTestSuiteSkip(suiteDescriptor, reason);
+
+            List<Method> testMethods = JUnit4Utils.getTestMethods(testClass);
+            for (Method testMethod : testMethods) {
+                testIgnored(description, testMethod, reason);
+            }
+
+            TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.JUNIT4)
+                    .onTestSuiteFinish(suiteDescriptor, null);
+        }
     }
 
-    if (JUnit4Utils.isTestSuiteDescription(description)) {
-      TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description);
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.JUNIT4)
-          .onTestSuiteSkip(suiteDescriptor, reason);
-
-      List<Method> testMethods = JUnit4Utils.getTestMethods(description.getTestClass());
-      for (Method testMethod : testMethods) {
-        testIgnored(description, testMethod, reason);
-      }
-    } else {
-      TestDescriptor testDescriptor = JUnit4Utils.toTestDescriptor(description);
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.JUNIT4)
-          .onTestSkip(testDescriptor, reason);
+    private void testIgnored(Description description, Method testMethod, String reason) {
+        if (JUnit4Utils.isJUnitPlatformRunnerTest(description)) {
+            return;
+        }
+
+        TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description);
+        TestDescriptor testDescriptor = JUnit4Utils.toTestDescriptor(description);
+
+        Class<?> testClass = description.getTestClass();
+        String testMethodName = testMethod != null ? testMethod.getName() : null;
+        TestSourceData testSourceData = new TestSourceData(testClass, testMethod, testMethodName);
+
+        String testName = JUnit4Utils.getTestName(description, testMethod);
+        String testParameters = JUnit4Utils.getParameters(description);
+        List<String> categories = JUnit4Utils.getCategories(testClass, testMethod);
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.JUNIT4)
+                .onTestIgnore(
+                        suiteDescriptor,
+                        testDescriptor,
+                        testName,
+                        FRAMEWORK_NAME,
+                        FRAMEWORK_VERSION,
+                        testParameters,
+                        categories,
+                        testSourceData,
+                        reason,
+                        executionTrackers.get(description));
     }
-  }
-
-  @Override
-  public void testIgnored(final Description description) {
-    if (JUnit4Utils.isJUnitPlatformRunnerTest(description)) {
-      return;
-    }
-
-    final Ignore ignore = description.getAnnotation(Ignore.class);
-    final String reason = ignore != null ? ignore.value() : null;
-
-    if (JUnit4Utils.isTestCaseDescription(description)) {
-      Method testMethod = JUnit4Utils.getTestMethod(description);
-      testIgnored(description, testMethod, reason);
-
-    } else if (JUnit4Utils.isTestSuiteDescription(description)) {
-
-      TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description);
-      Class<?> testClass = description.getTestClass();
-      String testSuiteName = JUnit4Utils.getSuiteName(testClass, description);
-      List<String> categories = JUnit4Utils.getCategories(testClass, null);
-
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.JUNIT4)
-          .onTestSuiteStart(
-              suiteDescriptor,
-              testSuiteName,
-              FRAMEWORK_NAME,
-              FRAMEWORK_VERSION,
-              testClass,
-              categories,
-              false,
-              TestFrameworkInstrumentation.JUNIT4,
-              null);
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.JUNIT4)
-          .onTestSuiteSkip(suiteDescriptor, reason);
-
-      List<Method> testMethods = JUnit4Utils.getTestMethods(testClass);
-      for (Method testMethod : testMethods) {
-        testIgnored(description, testMethod, reason);
-      }
-
-      TestEventsHandlerHolder.HANDLERS
-          .get(TestFrameworkInstrumentation.JUNIT4)
-          .onTestSuiteFinish(suiteDescriptor, null);
-    }
-  }
-
-  private void testIgnored(Description description, Method testMethod, String reason) {
-    if (JUnit4Utils.isJUnitPlatformRunnerTest(description)) {
-      return;
-    }
-
-    TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description);
-    TestDescriptor testDescriptor = JUnit4Utils.toTestDescriptor(description);
-
-    Class<?> testClass = description.getTestClass();
-    String testMethodName = testMethod != null ? testMethod.getName() : null;
-    TestSourceData testSourceData = new TestSourceData(testClass, testMethod, testMethodName);
-
-    String testName = JUnit4Utils.getTestName(description, testMethod);
-    String testParameters = JUnit4Utils.getParameters(description);
-    List<String> categories = JUnit4Utils.getCategories(testClass, testMethod);
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.JUNIT4)
-        .onTestIgnore(
-            suiteDescriptor,
-            testDescriptor,
-            testName,
-            FRAMEWORK_NAME,
-            FRAMEWORK_VERSION,
-            testParameters,
-            categories,
-            testSourceData,
-            reason,
-            executionTrackers.get(description));
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java
index ca6f383c2cf..8bf17426a21 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java
@@ -37,402 +37,395 @@
 
 public abstract class JUnit4Utils {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(JUnit4Utils.class);
-
-  private static final String SYNCHRONIZED_LISTENER =
-      "org.junit.runner.notification.SynchronizedRunListener";
-  private static final String BAZEL_RUN_NOTIFIER_WRAPPER =
-      "com.google.testing.junit.junit4.runner.RunNotifierWrapper";
-
-  // Regex for the final brackets with its content in the test name. E.g. test_name[0] --> [0]
-  private static final Pattern testNameNormalizerRegex = Pattern.compile("\\[[^\\[]*\\]$");
-
-  private static final Pattern METHOD_AND_CLASS_NAME_PATTERN =
-      Pattern.compile("([\\s\\S]*)\\((.*)\\)");
-
-  private static final MethodHandles METHOD_HANDLES =
-      new MethodHandles(ParentRunner.class.getClassLoader());
-  private static final MethodHandle PARENT_RUNNER_DESCRIBE_CHILD =
-      METHOD_HANDLES.method(ParentRunner.class, "describeChild", Object.class);
-  private static final MethodHandle RUN_NOTIFIER_LISTENERS = accessListenersFieldInRunNotifier();
-  private static final MethodHandle INNER_SYNCHRONIZED_LISTENER =
-      accessListenerFieldInSynchronizedListener();
-  private static final MethodHandle BAZEL_RUN_NOTIFIER_WRAPPER_DELEGATE =
-      accessDelegateFieldInBazelRunNotifierWrapper();
-  private static final MethodHandle DESCRIPTION_UNIQUE_ID =
-      METHOD_HANDLES.privateFieldGetter(Description.class, "fUniqueId");
-
-  public static final ComparableVersion junitV413 = new ComparableVersion("4.13");
-  public static final List<LibraryCapability> BASE_CAPABILITIES =
-      Arrays.asList(
-          LibraryCapability.TIA,
-          LibraryCapability.ATR,
-          LibraryCapability.EFD,
-          LibraryCapability.IMPACTED,
-          LibraryCapability.FTR,
-          LibraryCapability.QUARANTINE,
-          LibraryCapability.DISABLED,
-          LibraryCapability.ATTEMPT_TO_FIX);
-
-  private static MethodHandle accessListenersFieldInRunNotifier() {
-    MethodHandle listeners = METHOD_HANDLES.privateFieldGetter(RunNotifier.class, "listeners");
-    if (listeners != null) {
-      return listeners;
+    private static final Logger LOGGER = LoggerFactory.getLogger(JUnit4Utils.class);
+
+    private static final String SYNCHRONIZED_LISTENER = "org.junit.runner.notification.SynchronizedRunListener";
+    private static final String BAZEL_RUN_NOTIFIER_WRAPPER =
+            "com.google.testing.junit.junit4.runner.RunNotifierWrapper";
+
+    // Regex for the final brackets with its content in the test name. E.g. test_name[0] --> [0]
+    private static final Pattern testNameNormalizerRegex = Pattern.compile("\\[[^\\[]*\\]$");
+
+    private static final Pattern METHOD_AND_CLASS_NAME_PATTERN = Pattern.compile("([\\s\\S]*)\\((.*)\\)");
+
+    private static final MethodHandles METHOD_HANDLES = new MethodHandles(ParentRunner.class.getClassLoader());
+    private static final MethodHandle PARENT_RUNNER_DESCRIBE_CHILD =
+            METHOD_HANDLES.method(ParentRunner.class, "describeChild", Object.class);
+    private static final MethodHandle RUN_NOTIFIER_LISTENERS = accessListenersFieldInRunNotifier();
+    private static final MethodHandle INNER_SYNCHRONIZED_LISTENER = accessListenerFieldInSynchronizedListener();
+    private static final MethodHandle BAZEL_RUN_NOTIFIER_WRAPPER_DELEGATE =
+            accessDelegateFieldInBazelRunNotifierWrapper();
+    private static final MethodHandle DESCRIPTION_UNIQUE_ID =
+            METHOD_HANDLES.privateFieldGetter(Description.class, "fUniqueId");
+
+    public static final ComparableVersion junitV413 = new ComparableVersion("4.13");
+    public static final List<LibraryCapability> BASE_CAPABILITIES = Arrays.asList(
+            LibraryCapability.TIA,
+            LibraryCapability.ATR,
+            LibraryCapability.EFD,
+            LibraryCapability.IMPACTED,
+            LibraryCapability.FTR,
+            LibraryCapability.QUARANTINE,
+            LibraryCapability.DISABLED,
+            LibraryCapability.ATTEMPT_TO_FIX);
+
+    private static MethodHandle accessListenersFieldInRunNotifier() {
+        MethodHandle listeners = METHOD_HANDLES.privateFieldGetter(RunNotifier.class, "listeners");
+        if (listeners != null) {
+            return listeners;
+        }
+        // Before JUnit 4.12, the field is called "fListeners"
+        return METHOD_HANDLES.privateFieldGetter(RunNotifier.class, "fListeners");
     }
-    // Before JUnit 4.12, the field is called "fListeners"
-    return METHOD_HANDLES.privateFieldGetter(RunNotifier.class, "fListeners");
-  }
-
-  private static MethodHandle accessListenerFieldInSynchronizedListener() {
-    MethodHandle handle = METHOD_HANDLES.privateFieldGetter(SYNCHRONIZED_LISTENER, "listener");
-    if (handle != null) {
-      return handle;
+
+    private static MethodHandle accessListenerFieldInSynchronizedListener() {
+        MethodHandle handle = METHOD_HANDLES.privateFieldGetter(SYNCHRONIZED_LISTENER, "listener");
+        if (handle != null) {
+            return handle;
+        }
+        ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        return new MethodHandles(contextClassLoader).privateFieldGetter(SYNCHRONIZED_LISTENER, "listener");
     }
-    ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-    return new MethodHandles(contextClassLoader)
-        .privateFieldGetter(SYNCHRONIZED_LISTENER, "listener");
-  }
-
-  private static MethodHandle accessDelegateFieldInBazelRunNotifierWrapper() {
-    MethodHandle handle = METHOD_HANDLES.privateFieldGetter(BAZEL_RUN_NOTIFIER_WRAPPER, "delegate");
-    if (handle != null) {
-      return handle;
+
+    private static MethodHandle accessDelegateFieldInBazelRunNotifierWrapper() {
+        MethodHandle handle = METHOD_HANDLES.privateFieldGetter(BAZEL_RUN_NOTIFIER_WRAPPER, "delegate");
+        if (handle != null) {
+            return handle;
+        }
+        ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        return new MethodHandles(contextClassLoader).privateFieldGetter(BAZEL_RUN_NOTIFIER_WRAPPER, "delegate");
     }
-    ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-    return new MethodHandles(contextClassLoader)
-        .privateFieldGetter(BAZEL_RUN_NOTIFIER_WRAPPER, "delegate");
-  }
-
-  public static List<RunListener> runListenersFromRunNotifier(final RunNotifier runNotifier) {
-    return METHOD_HANDLES.invoke(RUN_NOTIFIER_LISTENERS, unwrapRunNotifier(runNotifier));
-  }
-
-  /**
-   * Walks through {@link RunNotifier} wrappers (e.g. Bazel's {@code RunNotifierWrapper}) and
-   * returns the inner notifier whose {@code listeners} field actually receives {@code addListener}
-   * calls. Returns the input untouched when it is not a known wrapper.
-   */
-  public static RunNotifier unwrapRunNotifier(RunNotifier notifier) {
-    RunNotifier current = notifier;
-    for (int i = 0; i < 8 && current != null; i++) {
-      if (!isBazelRunNotifierWrapper(current)) {
-        return current;
-      }
-      RunNotifier delegate = METHOD_HANDLES.invoke(BAZEL_RUN_NOTIFIER_WRAPPER_DELEGATE, current);
-      if (delegate == null || delegate == current) {
-        return current;
-      }
-      current = delegate;
+
+    public static List<RunListener> runListenersFromRunNotifier(final RunNotifier runNotifier) {
+        return METHOD_HANDLES.invoke(RUN_NOTIFIER_LISTENERS, unwrapRunNotifier(runNotifier));
     }
-    return current;
-  }
-
-  private static boolean isBazelRunNotifierWrapper(RunNotifier notifier) {
-    Class<?> cls = notifier.getClass();
-    while (cls != null && cls != Object.class) {
-      if (BAZEL_RUN_NOTIFIER_WRAPPER.equals(cls.getName())) {
-        return true;
-      }
-      cls = cls.getSuperclass();
+
+    /**
+     * Walks through {@link RunNotifier} wrappers (e.g. Bazel's {@code RunNotifierWrapper}) and
+     * returns the inner notifier whose {@code listeners} field actually receives {@code addListener}
+     * calls. Returns the input untouched when it is not a known wrapper.
+     */
+    public static RunNotifier unwrapRunNotifier(RunNotifier notifier) {
+        RunNotifier current = notifier;
+        for (int i = 0; i < 8 && current != null; i++) {
+            if (!isBazelRunNotifierWrapper(current)) {
+                return current;
+            }
+            RunNotifier delegate = METHOD_HANDLES.invoke(BAZEL_RUN_NOTIFIER_WRAPPER_DELEGATE, current);
+            if (delegate == null || delegate == current) {
+                return current;
+            }
+            current = delegate;
+        }
+        return current;
     }
-    return false;
-  }
-
-  public static TracingListener toTracingListener(final RunListener listener) {
-    // Since JUnit 4.12, the RunListener are wrapped by a SynchronizedRunListener object.
-    if (SYNCHRONIZED_LISTENER.equals(listener.getClass().getName())) {
-      RunListener innerListener = METHOD_HANDLES.invoke(INNER_SYNCHRONIZED_LISTENER, listener);
-      if (innerListener instanceof TracingListener) {
-        return (TracingListener) innerListener;
-      }
+
+    private static boolean isBazelRunNotifierWrapper(RunNotifier notifier) {
+        Class<?> cls = notifier.getClass();
+        while (cls != null && cls != Object.class) {
+            if (BAZEL_RUN_NOTIFIER_WRAPPER.equals(cls.getName())) {
+                return true;
+            }
+            cls = cls.getSuperclass();
+        }
+        return false;
     }
-    if (listener instanceof TracingListener) {
-      return (TracingListener) listener;
+
+    public static TracingListener toTracingListener(final RunListener listener) {
+        // Since JUnit 4.12, the RunListener are wrapped by a SynchronizedRunListener object.
+        if (SYNCHRONIZED_LISTENER.equals(listener.getClass().getName())) {
+            RunListener innerListener = METHOD_HANDLES.invoke(INNER_SYNCHRONIZED_LISTENER, listener);
+            if (innerListener instanceof TracingListener) {
+                return (TracingListener) innerListener;
+            }
+        }
+        if (listener instanceof TracingListener) {
+            return (TracingListener) listener;
+        }
+        return null;
     }
-    return null;
-  }
-
-  @Nullable
-  public static Method getTestMethod(final Description description) {
-    Class<?> testClass = description.getTestClass();
-    if (testClass == null) {
-      return null;
+
+    @Nullable
+    public static Method getTestMethod(final Description description) {
+        Class<?> testClass = description.getTestClass();
+        if (testClass == null) {
+            return null;
+        }
+
+        String methodName = description.getMethodName();
+        if (methodName == null || methodName.isEmpty()) {
+            return null;
+        }
+
+        RunWith runWith = testClass.getAnnotation(RunWith.class);
+        boolean isJunitParamsTestCase = runWith != null
+                && "junitparams.JUnitParamsRunner".equals(runWith.value().getName());
+        int junitParamsStartIdx;
+        if (isJunitParamsTestCase && (junitParamsStartIdx = methodName.indexOf('(')) >= 0) {
+            // assuming this is a parameterized test case that uses use pl.pragmatists.JUnitParams
+            // in that case method name will have the following structure:
+            // methodName(param1, param2, param3) [test case number]
+            // e.g. test_parameterized(1, 2, 3) [0]
+
+            int parameterCount = countCharacter(methodName, ',') + 1;
+            methodName = methodName.substring(0, junitParamsStartIdx);
+
+            // below is a best-effort attempt to find a matching method with the information we have
+            // this is not terribly efficient, but this case should be rare
+            for (Method declaredMethod : testClass.getDeclaredMethods()) {
+                if (!declaredMethod.getName().equals(methodName)) {
+                    continue;
+                }
+
+                if (declaredMethod.getParameterCount() != parameterCount) {
+                    continue;
+                }
+
+                for (Annotation annotation : declaredMethod.getAnnotations()) {
+                    // comparing by name to avoid having to add JUnitParams dependency
+                    if (annotation.annotationType().getName().equals("junitparams.Parameters")) {
+                        return declaredMethod;
+                    }
+                }
+            }
+        } else if (methodName.contains("[")) {
+            methodName = testNameNormalizerRegex.matcher(methodName).replaceAll("");
+        }
+
+        try {
+            return testClass.getMethod(methodName);
+        } catch (NoSuchMethodException e) {
+            LOGGER.debug("Could not get method named {} in class {}", methodName, testClass, e);
+            return null;
+        }
     }
 
-    String methodName = description.getMethodName();
-    if (methodName == null || methodName.isEmpty()) {
-      return null;
+    private static int countCharacter(String s, char countedChar) {
+        int count = 0;
+        for (char c : s.toCharArray()) {
+            if (c == countedChar) {
+                count++;
+            }
+        }
+        return count;
     }
 
-    RunWith runWith = testClass.getAnnotation(RunWith.class);
-    boolean isJunitParamsTestCase =
-        runWith != null && "junitparams.JUnitParamsRunner".equals(runWith.value().getName());
-    int junitParamsStartIdx;
-    if (isJunitParamsTestCase && (junitParamsStartIdx = methodName.indexOf('(')) >= 0) {
-      // assuming this is a parameterized test case that uses use pl.pragmatists.JUnitParams
-      // in that case method name will have the following structure:
-      // methodName(param1, param2, param3) [test case number]
-      // e.g. test_parameterized(1, 2, 3) [0]
-
-      int parameterCount = countCharacter(methodName, ',') + 1;
-      methodName = methodName.substring(0, junitParamsStartIdx);
-
-      // below is a best-effort attempt to find a matching method with the information we have
-      // this is not terribly efficient, but this case should be rare
-      for (Method declaredMethod : testClass.getDeclaredMethods()) {
-        if (!declaredMethod.getName().equals(methodName)) {
-          continue;
+    public static String getTestName(final Description description, final Method testMethod) {
+        final String methodName = description.getMethodName();
+        if (methodName != null && !methodName.isEmpty()) {
+            int actualMethodNameStart, actualMethodNameEnd;
+            if (methodName.startsWith("[")
+                    && (actualMethodNameStart = methodName.indexOf('(')) > 0
+                    && (actualMethodNameEnd = methodName.indexOf(')', actualMethodNameStart)) > 0) {
+                // assuming this is a parameterized test case that uses use pl.pragmatists.JUnitParams
+                // in that case method name will have the following structure:
+                // [test case number] param1, param2, param3 (methodName)
+                // e.g. [0] 2, 2, 4 (shouldReturnCorrectSum)
+                return methodName.substring(actualMethodNameStart + 1, actualMethodNameEnd);
+
+            } else {
+                // For "regular" parameterized tests, the test name contains a custom test name
+                // within the brackets. e.g. parameterized_test[0].
+                // For the test.name tag, we need to normalize the test names.
+                // "parameterized_test[0]" must be "parameterized_test".
+
+                // We could use a simple .endsWith function for pure JUnit4 tests,
+                // however, we need to use a regex to find the trailing brackets specifically because if the
+                // test is based on Spock v1 (that runs JUnit4 listeners under the hood)
+                // there are no test name restrictions (it can be any string).
+                return testNameNormalizerRegex.matcher(methodName).replaceAll("");
+            }
         }
 
-        if (declaredMethod.getParameterCount() != parameterCount) {
-          continue;
+        if (testMethod != null && !testMethod.getName().isEmpty()) {
+            return testMethod.getName();
         }
 
-        for (Annotation annotation : declaredMethod.getAnnotations()) {
-          // comparing by name to avoid having to add JUnitParams dependency
-          if (annotation.annotationType().getName().equals("junitparams.Parameters")) {
-            return declaredMethod;
-          }
+        String displayName = description.getDisplayName();
+        if (displayName != null && !displayName.isEmpty()) {
+            // This extra fallback avoids reporting empty names when using Cucumber.
+            // A Description generated by a Cucumber Scenario doesn't have a test or
+            // method name but does have a display name.
+            return description.getDisplayName();
         }
-      }
-    } else if (methodName.contains("[")) {
-      methodName = testNameNormalizerRegex.matcher(methodName).replaceAll("");
+
+        return null;
     }
 
-    try {
-      return testClass.getMethod(methodName);
-    } catch (NoSuchMethodException e) {
-      LOGGER.debug("Could not get method named {} in class {}", methodName, testClass, e);
-      return null;
+    public static String getParameters(final Description description) {
+        final String methodName = description.getMethodName();
+        if (methodName == null || !methodName.contains("[")) {
+            return null;
+        }
+
+        // No public access to the test parameters map in JUnit4.
+        // In this case, we store the fullTestName in the "metadata.test_name" object.
+        return "{\"metadata\":{\"test_name\":" + toJson(methodName) + "}}";
     }
-  }
-
-  private static int countCharacter(String s, char countedChar) {
-    int count = 0;
-    for (char c : s.toCharArray()) {
-      if (c == countedChar) {
-        count++;
-      }
+
+    public static List<String> getCategories(Class<?> testClass, @Nullable Method testMethod) {
+        List<String> categories = new ArrayList<>();
+        while (testClass != null) {
+            Category categoryAnnotation = testClass.getAnnotation(Category.class);
+            if (categoryAnnotation != null) {
+                for (Class<?> category : categoryAnnotation.value()) {
+                    categories.add(category.getName());
+                }
+            }
+            // Category annotation is not inherited in versions before 4.12
+            testClass = testClass.getSuperclass();
+        }
+
+        if (testMethod != null) {
+            Category categoryAnnotation = testMethod.getAnnotation(Category.class);
+            if (categoryAnnotation != null) {
+                for (Class<?> category : categoryAnnotation.value()) {
+                    categories.add(category.getName());
+                }
+            }
+        }
+
+        return categories;
     }
-    return count;
-  }
-
-  public static String getTestName(final Description description, final Method testMethod) {
-    final String methodName = description.getMethodName();
-    if (methodName != null && !methodName.isEmpty()) {
-      int actualMethodNameStart, actualMethodNameEnd;
-      if (methodName.startsWith("[")
-          && (actualMethodNameStart = methodName.indexOf('(')) > 0
-          && (actualMethodNameEnd = methodName.indexOf(')', actualMethodNameStart)) > 0) {
-        // assuming this is a parameterized test case that uses use pl.pragmatists.JUnitParams
-        // in that case method name will have the following structure:
-        // [test case number] param1, param2, param3 (methodName)
-        // e.g. [0] 2, 2, 4 (shouldReturnCorrectSum)
-        return methodName.substring(actualMethodNameStart + 1, actualMethodNameEnd);
-
-      } else {
-        // For "regular" parameterized tests, the test name contains a custom test name
-        // within the brackets. e.g. parameterized_test[0].
-        // For the test.name tag, we need to normalize the test names.
-        // "parameterized_test[0]" must be "parameterized_test".
-
-        // We could use a simple .endsWith function for pure JUnit4 tests,
-        // however, we need to use a regex to find the trailing brackets specifically because if the
-        // test is based on Spock v1 (that runs JUnit4 listeners under the hood)
-        // there are no test name restrictions (it can be any string).
-        return testNameNormalizerRegex.matcher(methodName).replaceAll("");
-      }
+
+    public static boolean isTestCaseDescription(final Description description) {
+        return description.getMethodName() != null && !"".equals(description.getMethodName());
     }
 
-    if (testMethod != null && !testMethod.getName().isEmpty()) {
-      return testMethod.getName();
+    public static boolean isTestSuiteDescription(final Description description) {
+        return description.getTestClass() != null && !isTestCaseDescription(description);
     }
 
-    String displayName = description.getDisplayName();
-    if (displayName != null && !displayName.isEmpty()) {
-      // This extra fallback avoids reporting empty names when using Cucumber.
-      // A Description generated by a Cucumber Scenario doesn't have a test or
-      // method name but does have a display name.
-      return description.getDisplayName();
+    public static boolean isSuiteContainingChildren(final Description description) {
+        Class<?> testClass = description.getTestClass();
+        if (testClass == null) {
+            return false;
+        }
+        for (Method method : testClass.getMethods()) {
+            if (method.getAnnotation(Test.class) != null) {
+                return true;
+            }
+        }
+        return TestCase.class.isAssignableFrom(testClass);
     }
 
-    return null;
-  }
+    public static Object getUniqueId(final Description description) {
+        return METHOD_HANDLES.invoke(DESCRIPTION_UNIQUE_ID, description);
+    }
 
-  public static String getParameters(final Description description) {
-    final String methodName = description.getMethodName();
-    if (methodName == null || !methodName.contains("[")) {
-      return null;
+    public static String getSuiteName(final Class<?> testClass, final Description description) {
+        return testClass != null ? testClass.getName() : description.getClassName();
     }
 
-    // No public access to the test parameters map in JUnit4.
-    // In this case, we store the fullTestName in the "metadata.test_name" object.
-    return "{\"metadata\":{\"test_name\":" + toJson(methodName) + "}}";
-  }
-
-  public static List<String> getCategories(Class<?> testClass, @Nullable Method testMethod) {
-    List<String> categories = new ArrayList<>();
-    while (testClass != null) {
-      Category categoryAnnotation = testClass.getAnnotation(Category.class);
-      if (categoryAnnotation != null) {
-        for (Class<?> category : categoryAnnotation.value()) {
-          categories.add(category.getName());
+    public static List<Method> getTestMethods(final Class<?> testClass) {
+        final List<Method> testMethods = new ArrayList<>();
+
+        final Method[] methods = testClass.getMethods();
+        for (final Method method : methods) {
+            if (method.getAnnotation(Test.class) != null) {
+                testMethods.add(method);
+            }
         }
-      }
-      // Category annotation is not inherited in versions before 4.12
-      testClass = testClass.getSuperclass();
+        return testMethods;
     }
 
-    if (testMethod != null) {
-      Category categoryAnnotation = testMethod.getAnnotation(Category.class);
-      if (categoryAnnotation != null) {
-        for (Class<?> category : categoryAnnotation.value()) {
-          categories.add(category.getName());
-        }
-      }
+    public static Description getDescription(ParentRunner<?> runner, Object child) {
+        return METHOD_HANDLES.invoke(PARENT_RUNNER_DESCRIBE_CHILD, runner, child);
     }
 
-    return categories;
-  }
+    public static Description getSkippedDescription(Description description, SkipReason skipReason) {
+        Collection<Annotation> annotations = description.getAnnotations();
+        Annotation[] updatedAnnotations = new Annotation[annotations.size() + 1];
+        int idx = 0;
+        for (Annotation annotation : annotations) {
+            updatedAnnotations[idx++] = annotation;
+        }
+        updatedAnnotations[idx] = new SkippedByDatadog(skipReason.getDescription());
+
+        String displayName = description.getDisplayName();
+        Class<?> testClass = description.getTestClass();
+        Matcher matcher = METHOD_AND_CLASS_NAME_PATTERN.matcher(displayName);
+        String name = matcher.matches() ? matcher.group(1) : getTestName(description, null);
+        return Description.createTestDescription(testClass, name, updatedAnnotations);
+    }
 
-  public static boolean isTestCaseDescription(final Description description) {
-    return description.getMethodName() != null && !"".equals(description.getMethodName());
-  }
+    public static TestIdentifier toTestIdentifier(Description description) {
+        Method testMethod = getTestMethod(description);
+        String suite = description.getClassName();
+        String name = getTestName(description, testMethod);
+        String parameters = getParameters(description);
+        return new TestIdentifier(suite, name, parameters);
+    }
 
-  public static boolean isTestSuiteDescription(final Description description) {
-    return description.getTestClass() != null && !isTestCaseDescription(description);
-  }
+    public static TestSourceData toTestSourceData(Description description) {
+        Class<?> testClass = description.getTestClass();
+        Method testMethod = getTestMethod(description);
+        return new TestSourceData(testClass, testMethod);
+    }
 
-  public static boolean isSuiteContainingChildren(final Description description) {
-    Class<?> testClass = description.getTestClass();
-    if (testClass == null) {
-      return false;
+    public static TestDescriptor toTestDescriptor(Description description) {
+        Class<?> testClass = description.getTestClass();
+        Method testMethod = getTestMethod(description);
+        String testSuiteName = getSuiteName(testClass, description);
+        String testName = getTestName(description, testMethod);
+        String testParameters = getParameters(description);
+        return new TestDescriptor(testSuiteName, testClass, testName, testParameters, null);
     }
-    for (Method method : testClass.getMethods()) {
-      if (method.getAnnotation(Test.class) != null) {
-        return true;
-      }
+
+    public static TestSuiteDescriptor toSuiteDescriptor(Description description) {
+        Class<?> testClass = description.getTestClass();
+        String testSuiteName = getSuiteName(testClass, description);
+        // relying exclusively on class name: some runners (such as PowerMock) may redefine test classes
+        return new TestSuiteDescriptor(testSuiteName, null);
     }
-    return TestCase.class.isAssignableFrom(testClass);
-  }
 
-  public static Object getUniqueId(final Description description) {
-    return METHOD_HANDLES.invoke(DESCRIPTION_UNIQUE_ID, description);
-  }
+    public static TestFrameworkInstrumentation runnerToFramework(Runner runner) {
+        String runnerClassName = runner.getClass().getName();
+        if ("datadog.trace.agent.test.SpockRunner".equals(runnerClassName)) {
+            return TestFrameworkInstrumentation.SPOCK;
+        } else if (runnerClassName.startsWith("com.intuit.karate")) {
+            return TestFrameworkInstrumentation.KARATE;
+        } else if (runnerClassName.startsWith("io.cucumber")) {
+            return TestFrameworkInstrumentation.CUCUMBER;
+        } else if (runnerClassName.startsWith("munit")) {
+            return TestFrameworkInstrumentation.MUNIT;
+        } else {
+            return TestFrameworkInstrumentation.JUNIT4;
+        }
+    }
 
-  public static String getSuiteName(final Class<?> testClass, final Description description) {
-    return testClass != null ? testClass.getName() : description.getClassName();
-  }
+    public static TestFrameworkInstrumentation classToFramework(Class<?> testClass) {
+        Runner runner = Request.aClass(testClass).getRunner();
+        return runnerToFramework(runner);
+    }
 
-  public static List<Method> getTestMethods(final Class<?> testClass) {
-    final List<Method> testMethods = new ArrayList<>();
+    public static List<Description> getClassChildren(Class<?> testClass) {
+        Runner runner = Request.aClass(testClass).getRunner();
+        return runner.getDescription().getChildren();
+    }
 
-    final Method[] methods = testClass.getMethods();
-    for (final Method method : methods) {
-      if (method.getAnnotation(Test.class) != null) {
-        testMethods.add(method);
-      }
+    public static String getVersion() {
+        return Version.id();
     }
-    return testMethods;
-  }
-
-  public static Description getDescription(ParentRunner<?> runner, Object child) {
-    return METHOD_HANDLES.invoke(PARENT_RUNNER_DESCRIBE_CHILD, runner, child);
-  }
-
-  public static Description getSkippedDescription(Description description, SkipReason skipReason) {
-    Collection<Annotation> annotations = description.getAnnotations();
-    Annotation[] updatedAnnotations = new Annotation[annotations.size() + 1];
-    int idx = 0;
-    for (Annotation annotation : annotations) {
-      updatedAnnotations[idx++] = annotation;
+
+    public static boolean isTestOrderingSupported(String version) {
+        return version != null && junitV413.compareTo(new ComparableVersion(version)) <= 0;
     }
-    updatedAnnotations[idx] = new SkippedByDatadog(skipReason.getDescription());
-
-    String displayName = description.getDisplayName();
-    Class<?> testClass = description.getTestClass();
-    Matcher matcher = METHOD_AND_CLASS_NAME_PATTERN.matcher(displayName);
-    String name = matcher.matches() ? matcher.group(1) : getTestName(description, null);
-    return Description.createTestDescription(testClass, name, updatedAnnotations);
-  }
-
-  public static TestIdentifier toTestIdentifier(Description description) {
-    Method testMethod = getTestMethod(description);
-    String suite = description.getClassName();
-    String name = getTestName(description, testMethod);
-    String parameters = getParameters(description);
-    return new TestIdentifier(suite, name, parameters);
-  }
-
-  public static TestSourceData toTestSourceData(Description description) {
-    Class<?> testClass = description.getTestClass();
-    Method testMethod = getTestMethod(description);
-    return new TestSourceData(testClass, testMethod);
-  }
-
-  public static TestDescriptor toTestDescriptor(Description description) {
-    Class<?> testClass = description.getTestClass();
-    Method testMethod = getTestMethod(description);
-    String testSuiteName = getSuiteName(testClass, description);
-    String testName = getTestName(description, testMethod);
-    String testParameters = getParameters(description);
-    return new TestDescriptor(testSuiteName, testClass, testName, testParameters, null);
-  }
-
-  public static TestSuiteDescriptor toSuiteDescriptor(Description description) {
-    Class<?> testClass = description.getTestClass();
-    String testSuiteName = getSuiteName(testClass, description);
-    // relying exclusively on class name: some runners (such as PowerMock) may redefine test classes
-    return new TestSuiteDescriptor(testSuiteName, null);
-  }
-
-  public static TestFrameworkInstrumentation runnerToFramework(Runner runner) {
-    String runnerClassName = runner.getClass().getName();
-    if ("datadog.trace.agent.test.SpockRunner".equals(runnerClassName)) {
-      return TestFrameworkInstrumentation.SPOCK;
-    } else if (runnerClassName.startsWith("com.intuit.karate")) {
-      return TestFrameworkInstrumentation.KARATE;
-    } else if (runnerClassName.startsWith("io.cucumber")) {
-      return TestFrameworkInstrumentation.CUCUMBER;
-    } else if (runnerClassName.startsWith("munit")) {
-      return TestFrameworkInstrumentation.MUNIT;
-    } else {
-      return TestFrameworkInstrumentation.JUNIT4;
+
+    public static List<LibraryCapability> capabilities(boolean classOrdering) {
+        List<LibraryCapability> capabilities = new ArrayList<>(BASE_CAPABILITIES);
+        if (classOrdering || isTestOrderingSupported(getVersion())) {
+            capabilities.add(LibraryCapability.FAIL_FAST);
+        }
+        return capabilities;
     }
-  }
-
-  public static TestFrameworkInstrumentation classToFramework(Class<?> testClass) {
-    Runner runner = Request.aClass(testClass).getRunner();
-    return runnerToFramework(runner);
-  }
-
-  public static List<Description> getClassChildren(Class<?> testClass) {
-    Runner runner = Request.aClass(testClass).getRunner();
-    return runner.getDescription().getChildren();
-  }
-
-  public static String getVersion() {
-    return Version.id();
-  }
-
-  public static boolean isTestOrderingSupported(String version) {
-    return version != null && junitV413.compareTo(new ComparableVersion(version)) <= 0;
-  }
-
-  public static List<LibraryCapability> capabilities(boolean classOrdering) {
-    List<LibraryCapability> capabilities = new ArrayList<>(BASE_CAPABILITIES);
-    if (classOrdering || isTestOrderingSupported(getVersion())) {
-      capabilities.add(LibraryCapability.FAIL_FAST);
+
+    /**
+     * Is JUnit 5 test that is executed with JUnit 4
+     * using @RunWith(org.junit.platform.runner.JUnitPlatform.class)
+     */
+    public static boolean isJUnitPlatformRunnerTest(Description description) {
+        Object uniqueId = getUniqueId(description);
+        return uniqueId != null && uniqueId.toString().contains("[engine:");
     }
-    return capabilities;
-  }
-
-  /**
-   * Is JUnit 5 test that is executed with JUnit 4
-   * using @RunWith(org.junit.platform.runner.JUnitPlatform.class)
-   */
-  public static boolean isJUnitPlatformRunnerTest(Description description) {
-    Object uniqueId = getUniqueId(description);
-    return uniqueId != null && uniqueId.toString().contains("[engine:");
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java
index d77684a2884..97ccfeecad1 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java
@@ -20,70 +20,69 @@
  */
 @AutoService(InstrumenterModule.class)
 public class JUnitLegacySuiteEventsInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public JUnitLegacySuiteEventsInstrumentation() {
-    super("ci-visibility", "junit-4", "junit-38", "powermock");
-  }
+    public JUnitLegacySuiteEventsInstrumentation() {
+        super("ci-visibility", "junit-4", "junit-38", "powermock");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.junit.internal.runners.JUnit38ClassRunner",
-      "org.powermock.modules.junit4.PowerMockRunner"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.junit.internal.runners.JUnit38ClassRunner", "org.powermock.modules.junit4.PowerMockRunner"
+        };
+    }
 
-  @Override
-  public int order() {
-    // Should be applied after datadog.trace.instrumentation.junit4.JUnit4Instrumentation,
-    // because it relies on JUnit4TracingListener to be registered
-    return JUnit4Instrumentation.ORDER + 1;
-  }
+    @Override
+    public int order() {
+        // Should be applied after datadog.trace.instrumentation.junit4.JUnit4Instrumentation,
+        // because it relies on JUnit4TracingListener to be registered
+        return JUnit4Instrumentation.ORDER + 1;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("run").and(takesArgument(0, named("org.junit.runner.notification.RunNotifier"))),
-        JUnitLegacySuiteEventsInstrumentation.class.getName() + "$JUnitLegacySuiteEventsAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("run").and(takesArgument(0, named("org.junit.runner.notification.RunNotifier"))),
+                JUnitLegacySuiteEventsInstrumentation.class.getName() + "$JUnitLegacySuiteEventsAdvice");
+    }
 
-  public static class JUnitLegacySuiteEventsAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void fireSuiteStartedEvent(
-        @Advice.Argument(0) final RunNotifier runNotifier, @Advice.This final Runner runner) {
-      final List<RunListener> runListeners = JUnit4Utils.runListenersFromRunNotifier(runNotifier);
-      if (runListeners == null) {
-        return;
-      }
+    public static class JUnitLegacySuiteEventsAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void fireSuiteStartedEvent(
+                @Advice.Argument(0) final RunNotifier runNotifier, @Advice.This final Runner runner) {
+            final List<RunListener> runListeners = JUnit4Utils.runListenersFromRunNotifier(runNotifier);
+            if (runListeners == null) {
+                return;
+            }
 
-      for (final RunListener listener : runListeners) {
-        TracingListener tracingListener = JUnit4Utils.toTracingListener(listener);
-        if (tracingListener != null) {
-          tracingListener.testSuiteStarted(runner.getDescription());
+            for (final RunListener listener : runListeners) {
+                TracingListener tracingListener = JUnit4Utils.toTracingListener(listener);
+                if (tracingListener != null) {
+                    tracingListener.testSuiteStarted(runner.getDescription());
+                }
+            }
         }
-      }
-    }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void fireSuiteFinishedEvent(
-        @Advice.Argument(0) final RunNotifier runNotifier, @Advice.This final Runner runner) {
-      final List<RunListener> runListeners = JUnit4Utils.runListenersFromRunNotifier(runNotifier);
-      if (runListeners == null) {
-        return;
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void fireSuiteFinishedEvent(
+                @Advice.Argument(0) final RunNotifier runNotifier, @Advice.This final Runner runner) {
+            final List<RunListener> runListeners = JUnit4Utils.runListenersFromRunNotifier(runNotifier);
+            if (runListeners == null) {
+                return;
+            }
 
-      for (final RunListener listener : runListeners) {
-        TracingListener tracingListener = JUnit4Utils.toTracingListener(listener);
-        if (tracingListener != null) {
-          tracingListener.testSuiteFinished(runner.getDescription());
+            for (final RunListener listener : runListeners) {
+                TracingListener tracingListener = JUnit4Utils.toTracingListener(listener);
+                if (tracingListener != null) {
+                    tracingListener.testSuiteFinished(runner.getDescription());
+                }
+            }
         }
-      }
-    }
 
-    // JUnit 4.10 and above
-    public static void muzzleCheck(final RuleChain ruleChain) {
-      ruleChain.apply(null, null);
+        // JUnit 4.10 and above
+        public static void muzzleCheck(final RuleChain ruleChain) {
+            ruleChain.apply(null, null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/SkippedByDatadog.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/SkippedByDatadog.java
index 57eadfff031..6bd4fac5c34 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/SkippedByDatadog.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/SkippedByDatadog.java
@@ -5,19 +5,19 @@
 
 public final class SkippedByDatadog implements Ignore {
 
-  private final String description;
+    private final String description;
 
-  public SkippedByDatadog(String description) {
-    this.description = description;
-  }
+    public SkippedByDatadog(String description) {
+        this.description = description;
+    }
 
-  @Override
-  public String value() {
-    return description;
-  }
+    @Override
+    public String value() {
+        return description;
+    }
 
-  @Override
-  public Class<? extends Annotation> annotationType() {
-    return Ignore.class;
-  }
+    @Override
+    public Class<? extends Annotation> annotationType() {
+        return Ignore.class;
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java
index bba41f2463f..be90697d21a 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java
@@ -13,35 +13,34 @@
 
 public abstract class TestEventsHandlerHolder {
 
-  // store one handler per framework running
-  public static final Map<
-          TestFrameworkInstrumentation, TestEventsHandler<TestSuiteDescriptor, TestDescriptor>>
-      HANDLERS = new ConcurrentEnumMap<>(TestFrameworkInstrumentation.class);
+    // store one handler per framework running
+    public static final Map<TestFrameworkInstrumentation, TestEventsHandler<TestSuiteDescriptor, TestDescriptor>>
+            HANDLERS = new ConcurrentEnumMap<>(TestFrameworkInstrumentation.class);
 
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification = "Holder class not exposed to application code; locking on its Class is safe")
-  public static synchronized void start(
-      TestFrameworkInstrumentation framework, Collection<LibraryCapability> capabilities) {
-    TestEventsHandler<TestSuiteDescriptor, TestDescriptor> handler = HANDLERS.get(framework);
-    if (handler == null) {
-      HANDLERS.put(
-          framework,
-          InstrumentationBridge.createTestEventsHandler(
-              framework.name().toLowerCase(), null, null, capabilities));
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Holder class not exposed to application code; locking on its Class is safe")
+    public static synchronized void start(
+            TestFrameworkInstrumentation framework, Collection<LibraryCapability> capabilities) {
+        TestEventsHandler<TestSuiteDescriptor, TestDescriptor> handler = HANDLERS.get(framework);
+        if (handler == null) {
+            HANDLERS.put(
+                    framework,
+                    InstrumentationBridge.createTestEventsHandler(
+                            framework.name().toLowerCase(), null, null, capabilities));
+        }
     }
-  }
 
-  /** Used by instrumentation tests */
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification = "Holder class not exposed to application code; locking on its Class is safe")
-  public static synchronized void stop(TestFrameworkInstrumentation framework) {
-    TestEventsHandler<TestSuiteDescriptor, TestDescriptor> handler = HANDLERS.remove(framework);
-    if (handler != null) {
-      handler.close();
+    /** Used by instrumentation tests */
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Holder class not exposed to application code; locking on its Class is safe")
+    public static synchronized void stop(TestFrameworkInstrumentation framework) {
+        TestEventsHandler<TestSuiteDescriptor, TestDescriptor> handler = HANDLERS.remove(framework);
+        if (handler != null) {
+            handler.close();
+        }
     }
-  }
 
-  private TestEventsHandlerHolder() {}
+    private TestEventsHandlerHolder() {}
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TracingListener.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TracingListener.java
index 3026b79ffdd..b346130b836 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TracingListener.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TracingListener.java
@@ -6,9 +6,9 @@
 
 public abstract class TracingListener extends RunListener {
 
-  public abstract void testFailure(Failure failure);
+    public abstract void testFailure(Failure failure);
 
-  public abstract void testSuiteStarted(final Description description);
+    public abstract void testSuiteStarted(final Description description);
 
-  public abstract void testSuiteFinished(final Description description);
+    public abstract void testSuiteFinished(final Description description);
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/FailureSuppressingNotifier.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/FailureSuppressingNotifier.java
index 4002cbd5016..552e31dcb97 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/FailureSuppressingNotifier.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/FailureSuppressingNotifier.java
@@ -10,34 +10,34 @@
 
 public class FailureSuppressingNotifier extends RunNotifier {
 
-  private final TestExecutionPolicy executionPolicy;
+    private final TestExecutionPolicy executionPolicy;
 
-  public FailureSuppressingNotifier(TestExecutionPolicy executionPolicy, RunNotifier notifier) {
-    this.executionPolicy = executionPolicy;
+    public FailureSuppressingNotifier(TestExecutionPolicy executionPolicy, RunNotifier notifier) {
+        this.executionPolicy = executionPolicy;
 
-    List<RunListener> listeners = JUnit4Utils.runListenersFromRunNotifier(notifier);
-    for (RunListener listener : listeners) {
-      addListener(listener);
+        List<RunListener> listeners = JUnit4Utils.runListenersFromRunNotifier(notifier);
+        for (RunListener listener : listeners) {
+            addListener(listener);
+        }
     }
-  }
 
-  @Override
-  public void fireTestFailure(Failure failure) {
-    if (!executionPolicy.suppressFailures()) {
-      super.fireTestFailure(failure);
-      return;
-    }
+    @Override
+    public void fireTestFailure(Failure failure) {
+        if (!executionPolicy.suppressFailures()) {
+            super.fireTestFailure(failure);
+            return;
+        }
 
-    List<RunListener> listeners = JUnit4Utils.runListenersFromRunNotifier(this);
-    for (RunListener listener : listeners) {
-      TracingListener tracingListener = JUnit4Utils.toTracingListener(listener);
-      if (tracingListener != null) {
-        tracingListener.testFailure(failure);
-      } else {
-        // Converting failure into assumption failure,
-        // so that the build does not fail.
-        listener.testAssumptionFailure(failure);
-      }
+        List<RunListener> listeners = JUnit4Utils.runListenersFromRunNotifier(this);
+        for (RunListener listener : listeners) {
+            TracingListener tracingListener = JUnit4Utils.toTracingListener(listener);
+            if (tracingListener != null) {
+                tracingListener.testFailure(failure);
+            } else {
+                // Converting failure into assumption failure,
+                // so that the build does not fail.
+                listener.testAssumptionFailure(failure);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java
index c72a52a86c7..5ae4f0f221e 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java
@@ -33,93 +33,91 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit4ExecutionInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  private final String parentPackageName = Strings.getPackageName(JUnit4Utils.class.getName());
-
-  public JUnit4ExecutionInstrumentation() {
-    super("ci-visibility", "junit-4", "test-retry");
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.junit.runners.ParentRunner";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.junit.runner.Description", TestExecutionTracker.class.getName());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("runLeaf")
-            .and(takesArgument(0, named("org.junit.runners.model.Statement")))
-            .and(takesArgument(1, named("org.junit.runner.Description")))
-            .and(takesArgument(2, named("org.junit.runner.notification.RunNotifier"))),
-        JUnit4ExecutionInstrumentation.class.getName() + "$ExecutionAdvice");
-  }
-
-  public static class ExecutionAdvice {
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @SuppressFBWarnings("NP_BOOLEAN_RETURN_NULL")
-    @Advice.OnMethodEnter(skipOn = Boolean.class)
-    public static Boolean apply(
-        @Advice.Origin Method runTest,
-        @Advice.This ParentRunner<?> runner,
-        @Advice.Argument(0) Statement statement,
-        @Advice.Argument(1) Description description,
-        @Advice.Argument(2) RunNotifier notifier) {
-      if (notifier instanceof FailureSuppressingNotifier) {
-        // notifier already wrapped, run original method
-        return null;
-      }
-
-      TestIdentifier testIdentifier = JUnit4Utils.toTestIdentifier(description);
-      TestSourceData testSourceData = JUnit4Utils.toTestSourceData(description);
-      Collection<String> testTags =
-          JUnit4Utils.getCategories(testSourceData.getTestClass(), testSourceData.getTestMethod());
-      TestExecutionPolicy executionPolicy =
-          TestEventsHandlerHolder.HANDLERS
-              .get(TestFrameworkInstrumentation.JUNIT4)
-              .executionPolicy(testIdentifier, testSourceData, testTags);
-      if (!executionPolicy.applicable()) {
-        // retries not applicable, run original method
-        return null;
-      }
-
-      InstrumentationContext.get(Description.class, TestExecutionTracker.class)
-          .put(description, executionPolicy);
-
-      FailureSuppressingNotifier failureSuppressingNotifier =
-          new FailureSuppressingNotifier(executionPolicy, notifier);
-      do {
-        try {
-          runTest.setAccessible(true);
-          runTest.invoke(runner, statement, description, failureSuppressingNotifier);
-        } catch (Throwable ignored) {
-        }
-      } while (executionPolicy.applicable());
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    private final String parentPackageName = Strings.getPackageName(JUnit4Utils.class.getName());
+
+    public JUnit4ExecutionInstrumentation() {
+        super("ci-visibility", "junit-4", "test-retry");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.junit.runners.ParentRunner";
+    }
 
-      // skip original method
-      return Boolean.TRUE;
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
     }
 
-    // JUnit 4.10 and above
-    public static void muzzleCheck(final RuleChain ruleChain) {
-      ruleChain.apply(null, null);
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.junit.runner.Description", TestExecutionTracker.class.getName());
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("runLeaf")
+                        .and(takesArgument(0, named("org.junit.runners.model.Statement")))
+                        .and(takesArgument(1, named("org.junit.runner.Description")))
+                        .and(takesArgument(2, named("org.junit.runner.notification.RunNotifier"))),
+                JUnit4ExecutionInstrumentation.class.getName() + "$ExecutionAdvice");
+    }
+
+    public static class ExecutionAdvice {
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @SuppressFBWarnings("NP_BOOLEAN_RETURN_NULL")
+        @Advice.OnMethodEnter(skipOn = Boolean.class)
+        public static Boolean apply(
+                @Advice.Origin Method runTest,
+                @Advice.This ParentRunner<?> runner,
+                @Advice.Argument(0) Statement statement,
+                @Advice.Argument(1) Description description,
+                @Advice.Argument(2) RunNotifier notifier) {
+            if (notifier instanceof FailureSuppressingNotifier) {
+                // notifier already wrapped, run original method
+                return null;
+            }
+
+            TestIdentifier testIdentifier = JUnit4Utils.toTestIdentifier(description);
+            TestSourceData testSourceData = JUnit4Utils.toTestSourceData(description);
+            Collection<String> testTags =
+                    JUnit4Utils.getCategories(testSourceData.getTestClass(), testSourceData.getTestMethod());
+            TestExecutionPolicy executionPolicy = TestEventsHandlerHolder.HANDLERS
+                    .get(TestFrameworkInstrumentation.JUNIT4)
+                    .executionPolicy(testIdentifier, testSourceData, testTags);
+            if (!executionPolicy.applicable()) {
+                // retries not applicable, run original method
+                return null;
+            }
+
+            InstrumentationContext.get(Description.class, TestExecutionTracker.class)
+                    .put(description, executionPolicy);
+
+            FailureSuppressingNotifier failureSuppressingNotifier =
+                    new FailureSuppressingNotifier(executionPolicy, notifier);
+            do {
+                try {
+                    runTest.setAccessible(true);
+                    runTest.invoke(runner, statement, description, failureSuppressingNotifier);
+                } catch (Throwable ignored) {
+                }
+            } while (executionPolicy.applicable());
+
+            // skip original method
+            return Boolean.TRUE;
+        }
+
+        // JUnit 4.10 and above
+        public static void muzzleCheck(final RuleChain ruleChain) {
+            ruleChain.apply(null, null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4FailFastClassOrderer.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4FailFastClassOrderer.java
index 90cef497140..b5fa35b8d61 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4FailFastClassOrderer.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4FailFastClassOrderer.java
@@ -14,36 +14,37 @@
 
 public class JUnit4FailFastClassOrderer implements Comparator<Class<?>> {
 
-  @Nullable private final TestEventsHandler<TestSuiteDescriptor, TestDescriptor> testEventsHandler;
+    @Nullable
+    private final TestEventsHandler<TestSuiteDescriptor, TestDescriptor> testEventsHandler;
 
-  public JUnit4FailFastClassOrderer(
-      @Nullable TestEventsHandler<TestSuiteDescriptor, TestDescriptor> testEventsHandler) {
-    this.testEventsHandler = testEventsHandler;
-  }
-
-  public int classExecutionPriority(Class<?> clazz) {
-    TestFrameworkInstrumentation framework = JUnit4Utils.classToFramework(clazz);
-    if (testEventsHandler == null || framework != TestFrameworkInstrumentation.JUNIT4) {
-      return 0;
+    public JUnit4FailFastClassOrderer(
+            @Nullable TestEventsHandler<TestSuiteDescriptor, TestDescriptor> testEventsHandler) {
+        this.testEventsHandler = testEventsHandler;
     }
 
-    List<Method> children = JUnit4Utils.getTestMethods(clazz);
-    if (children.isEmpty()) {
-      return 0;
+    public int classExecutionPriority(Class<?> clazz) {
+        TestFrameworkInstrumentation framework = JUnit4Utils.classToFramework(clazz);
+        if (testEventsHandler == null || framework != TestFrameworkInstrumentation.JUNIT4) {
+            return 0;
+        }
+
+        List<Method> children = JUnit4Utils.getTestMethods(clazz);
+        if (children.isEmpty()) {
+            return 0;
+        }
+
+        int childrenPrioritySum = 0;
+        for (Method child : children) {
+            TestIdentifier testIdentifier = new TestIdentifier(clazz.getName(), child.getName(), null);
+            TestSourceData testSourceData = new TestSourceData(clazz, child);
+            childrenPrioritySum += testEventsHandler.executionPriority(testIdentifier, testSourceData);
+        }
+
+        return childrenPrioritySum / children.size();
     }
 
-    int childrenPrioritySum = 0;
-    for (Method child : children) {
-      TestIdentifier testIdentifier = new TestIdentifier(clazz.getName(), child.getName(), null);
-      TestSourceData testSourceData = new TestSourceData(clazz, child);
-      childrenPrioritySum += testEventsHandler.executionPriority(testIdentifier, testSourceData);
+    @Override
+    public int compare(Class<?> o1, Class<?> o2) {
+        return classExecutionPriority(o2) - classExecutionPriority(o1);
     }
-
-    return childrenPrioritySum / children.size();
-  }
-
-  @Override
-  public int compare(Class<?> o1, Class<?> o2) {
-    return classExecutionPriority(o2) - classExecutionPriority(o1);
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/BaseTestInheritance.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/BaseTestInheritance.java
index d974122fecc..1798ade5d20 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/BaseTestInheritance.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/BaseTestInheritance.java
@@ -6,8 +6,8 @@
 
 public abstract class BaseTestInheritance {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestAssumption.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestAssumption.java
index d39fe0b69ae..589c9f5f62e 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestAssumption.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestAssumption.java
@@ -5,8 +5,8 @@
 import org.junit.Test;
 
 public class TestAssumption {
-  @Test
-  public void test_fail_assumption() {
-    assumeTrue(1 > 2);
-  }
+    @Test
+    public void test_fail_assumption() {
+        assumeTrue(1 > 2);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestAssumptionAndSucceed.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestAssumptionAndSucceed.java
index bff4fcc0e56..d68d35b0f27 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestAssumptionAndSucceed.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestAssumptionAndSucceed.java
@@ -7,13 +7,13 @@
 
 public class TestAssumptionAndSucceed {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_fail_assumption() {
-    assumeTrue(1 > 2);
-  }
+    @Test
+    public void test_fail_assumption() {
+        assumeTrue(1 > 2);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestDisableTestTrace.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestDisableTestTrace.java
index 5b5bbfb246e..68ac2324db8 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestDisableTestTrace.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestDisableTestTrace.java
@@ -8,8 +8,8 @@
 @DisableTestTrace
 public class TestDisableTestTrace {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestError.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestError.java
index 96b5b807a94..86cdc4a8161 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestError.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestError.java
@@ -3,8 +3,8 @@
 import org.junit.Test;
 
 public class TestError {
-  @Test
-  public void test_error() {
-    throw new IllegalArgumentException("This exception is an example");
-  }
+    @Test
+    public void test_error() {
+        throw new IllegalArgumentException("This exception is an example");
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailed.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailed.java
index e59cff08f85..a779e349866 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailed.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailed.java
@@ -6,8 +6,8 @@
 
 public class TestFailed {
 
-  @Test
-  public void test_failed() {
-    assertTrue(false);
-  }
+    @Test
+    public void test_failed() {
+        assertTrue(false);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedAndSucceed.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedAndSucceed.java
index bea0fb59397..fdacb8bbe4a 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedAndSucceed.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedAndSucceed.java
@@ -6,18 +6,18 @@
 
 public class TestFailedAndSucceed {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_failed() {
-    assertTrue(false);
-  }
+    @Test
+    public void test_failed() {
+        assertTrue(false);
+    }
 
-  @Test
-  public void test_another_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_another_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedParameterized.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedParameterized.java
index 273c9661840..ec5bd9a6720 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedParameterized.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedParameterized.java
@@ -11,23 +11,23 @@
 @RunWith(Parameterized.class)
 public class TestFailedParameterized {
 
-  @Parameterized.Parameters(name = "{0} {1} {2}")
-  public static Collection<Object[]> data() {
-    return Arrays.asList(new Object[][] {{0, 0, 42}, {21, 21, 42}});
-  }
+    @Parameterized.Parameters(name = "{0} {1} {2}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][] {{0, 0, 42}, {21, 21, 42}});
+    }
 
-  private final int a;
-  private final int b;
-  private final int c;
+    private final int a;
+    private final int b;
+    private final int c;
 
-  public TestFailedParameterized(int a, int b, int c) {
-    this.a = a;
-    this.b = b;
-    this.c = c;
-  }
+    public TestFailedParameterized(int a, int b, int c) {
+        this.a = a;
+        this.b = b;
+        this.c = c;
+    }
 
-  @Test
-  public void test_failed_parameterized() {
-    assertEquals(a + b, c);
-  }
+    @Test
+    public void test_failed_parameterized() {
+        assertEquals(a + b, c);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedSuiteSetUpAssumption.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedSuiteSetUpAssumption.java
index 9c6b72ddf5d..1dccd2e6742 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedSuiteSetUpAssumption.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedSuiteSetUpAssumption.java
@@ -8,13 +8,13 @@
 
 public class TestFailedSuiteSetUpAssumption {
 
-  @BeforeClass
-  public static void suiteSetup() {
-    assumeTrue(1 > 2);
-  }
+    @BeforeClass
+    public static void suiteSetup() {
+        assumeTrue(1 > 2);
+    }
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedSuiteSetup.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedSuiteSetup.java
index fbae30a8ae3..d6d58b7fbec 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedSuiteSetup.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedSuiteSetup.java
@@ -7,13 +7,13 @@
 
 public class TestFailedSuiteSetup {
 
-  @BeforeClass
-  public static void suiteSetup() {
-    throw new RuntimeException("suite set up failed");
-  }
+    @BeforeClass
+    public static void suiteSetup() {
+        throw new RuntimeException("suite set up failed");
+    }
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedSuiteTearDown.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedSuiteTearDown.java
index c01311e7845..5dfe00b6ed3 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedSuiteTearDown.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedSuiteTearDown.java
@@ -7,18 +7,18 @@
 
 public class TestFailedSuiteTearDown {
 
-  @AfterClass
-  public static void suiteTearDown() {
-    throw new RuntimeException("suite tear down failed");
-  }
+    @AfterClass
+    public static void suiteTearDown() {
+        throw new RuntimeException("suite tear down failed");
+    }
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_another_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_another_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedThenSucceed.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedThenSucceed.java
index 94220ba0bd5..ba3273c01c6 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedThenSucceed.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedThenSucceed.java
@@ -11,30 +11,30 @@
 
 public class TestFailedThenSucceed {
 
-  public static int TEST_EXECUTIONS_COUNT = 0;
+    public static int TEST_EXECUTIONS_COUNT = 0;
 
-  @Before
-  public void setUp() {
-    AgentTracer.TracerAPI agentTracer = AgentTracer.get();
-    AgentSpan span = agentTracer.buildSpan("junit-manual", "set-up").start();
-    try (ContextScope scope = agentTracer.activateManualSpan(span)) {
-      // tracing setup to verify that it is executed for every retry
+    @Before
+    public void setUp() {
+        AgentTracer.TracerAPI agentTracer = AgentTracer.get();
+        AgentSpan span = agentTracer.buildSpan("junit-manual", "set-up").start();
+        try (ContextScope scope = agentTracer.activateManualSpan(span)) {
+            // tracing setup to verify that it is executed for every retry
+        }
+        span.finish();
     }
-    span.finish();
-  }
 
-  @Test
-  public void test_failed_then_succeed() {
-    assertTrue(++TEST_EXECUTIONS_COUNT > 3);
-  }
+    @Test
+    public void test_failed_then_succeed() {
+        assertTrue(++TEST_EXECUTIONS_COUNT > 3);
+    }
 
-  @After
-  public void tearDown() {
-    AgentTracer.TracerAPI agentTracer = AgentTracer.get();
-    AgentSpan span = agentTracer.buildSpan("junit-manual", "tear-down").start();
-    try (ContextScope scope = agentTracer.activateManualSpan(span)) {
-      // tracing teardown to verify that it is executed for every retry
+    @After
+    public void tearDown() {
+        AgentTracer.TracerAPI agentTracer = AgentTracer.get();
+        AgentSpan span = agentTracer.buildSpan("junit-manual", "tear-down").start();
+        try (ContextScope scope = agentTracer.activateManualSpan(span)) {
+            // tracing teardown to verify that it is executed for every retry
+        }
+        span.finish();
     }
-    span.finish();
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestParameterized.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestParameterized.java
index 4ddfbab870e..283f91f0266 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestParameterized.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestParameterized.java
@@ -11,18 +11,17 @@
 @RunWith(Parameterized.class)
 public class TestParameterized {
 
-  @Parameterized.Parameters(name = "{1}")
-  public static Collection<Object[]> data() {
-    return Arrays.asList(
-        new Object[][] {{new ParamObject(), "str1", 0}, {new ParamObject(), "\"str2\"", 1}});
-  }
+    @Parameterized.Parameters(name = "{1}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][] {{new ParamObject(), "str1", 0}, {new ParamObject(), "\"str2\"", 1}});
+    }
 
-  public TestParameterized(final ParamObject param1, final String param2, final int param3) {}
+    public TestParameterized(final ParamObject param1, final String param2, final int param3) {}
 
-  @Test
-  public void parameterized_test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void parameterized_test_succeed() {
+        assertTrue(true);
+    }
 
-  private static class ParamObject {}
+    private static class ParamObject {}
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestParameterizedJUnitParams.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestParameterizedJUnitParams.java
index 8a586d867d2..9044cf4b4a5 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestParameterizedJUnitParams.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestParameterizedJUnitParams.java
@@ -10,9 +10,9 @@
 @RunWith(JUnitParamsRunner.class)
 public class TestParameterizedJUnitParams {
 
-  @Test
-  @Parameters({"1, 2, 3", "2, 2, 4"})
-  public void test_parameterized(int a, int b, int expectedValue) {
-    assertEquals(expectedValue, a + b);
-  }
+    @Test
+    @Parameters({"1, 2, 3", "2, 2, 4"})
+    public void test_parameterized(int a, int b, int expectedValue) {
+        assertEquals(expectedValue, a + b);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSkipped.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSkipped.java
index 12e9cf1348b..46c56c309f1 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSkipped.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSkipped.java
@@ -5,7 +5,7 @@
 
 public class TestSkipped {
 
-  @Ignore("Ignore reason in test")
-  @Test
-  public void test_skipped() {}
+    @Ignore("Ignore reason in test")
+    @Test
+    public void test_skipped() {}
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSkippedClass.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSkippedClass.java
index fe82275d90e..e074563c159 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSkippedClass.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSkippedClass.java
@@ -6,9 +6,9 @@
 @Ignore("Ignore reason in class")
 public class TestSkippedClass {
 
-  @Test
-  public void test_class_skipped() {}
+    @Test
+    public void test_class_skipped() {}
 
-  @Test
-  public void test_class_another_skipped() {}
+    @Test
+    public void test_class_another_skipped() {}
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceed.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceed.java
index 9fcd9017ac3..e7f77bc72b6 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceed.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceed.java
@@ -6,8 +6,8 @@
 
 public class TestSucceed {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedAndSkipped.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedAndSkipped.java
index 1851ac54a38..f836fd62fe5 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedAndSkipped.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedAndSkipped.java
@@ -7,12 +7,12 @@
 
 public class TestSucceedAndSkipped {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Ignore("Ignore reason in test")
-  @Test
-  public void test_skipped() {}
+    @Ignore("Ignore reason in test")
+    @Test
+    public void test_skipped() {}
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedExpectedException.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedExpectedException.java
index 425988da1de..f708693f4bb 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedExpectedException.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedExpectedException.java
@@ -4,8 +4,8 @@
 
 public class TestSucceedExpectedException {
 
-  @Test(expected = IllegalArgumentException.class)
-  public void test_succeed() {
-    throw new IllegalArgumentException("expected");
-  }
+    @Test(expected = IllegalArgumentException.class)
+    public void test_succeed() {
+        throw new IllegalArgumentException("expected");
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedLegacy.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedLegacy.java
index d2ec6e1cf51..b3e01998bdd 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedLegacy.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedLegacy.java
@@ -4,7 +4,7 @@
 
 public class TestSucceedLegacy extends TestCase {
 
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedSkipEfd.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedSkipEfd.java
index 9104e505a5d..b73026069ec 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedSkipEfd.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedSkipEfd.java
@@ -7,11 +7,11 @@
 
 public class TestSucceedSkipEfd {
 
-  @Category(datadog_efd_disable.class)
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Category(datadog_efd_disable.class)
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  public interface datadog_efd_disable {}
+    public interface datadog_efd_disable {}
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedSlow.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedSlow.java
index 06deb5818f8..f7885875fa1 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedSlow.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedSlow.java
@@ -6,9 +6,9 @@
 
 public class TestSucceedSlow {
 
-  @Test
-  public void test_succeed() throws InterruptedException {
-    Thread.sleep(1100);
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() throws InterruptedException {
+        Thread.sleep(1100);
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedSuite.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedSuite.java
index de7b67ba250..1d7b232e16e 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedSuite.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedSuite.java
@@ -10,17 +10,17 @@
 @RunWith(Suite.class)
 @Suite.SuiteClasses({TestSucceedSuite.FirstTest.class, TestSucceedSuite.SecondTest.class})
 public class TestSucceedSuite {
-  public static class FirstTest {
-    @Test
-    public void testAddition() {
-      assertEquals(5, 2 + 3);
+    public static class FirstTest {
+        @Test
+        public void testAddition() {
+            assertEquals(5, 2 + 3);
+        }
     }
-  }
 
-  public static class SecondTest {
-    @Test
-    public void testSubtraction() {
-      assertNotEquals(1, 5 - 3);
+    public static class SecondTest {
+        @Test
+        public void testSubtraction() {
+            assertNotEquals(1, 5 - 3);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedUnskippable.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedUnskippable.java
index 5f0242e164c..78821bd7364 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedUnskippable.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedUnskippable.java
@@ -7,11 +7,11 @@
 
 public class TestSucceedUnskippable {
 
-  @Category(datadog_itr_unskippable.class)
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Category(datadog_itr_unskippable.class)
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  public interface datadog_itr_unskippable {}
+    public interface datadog_itr_unskippable {}
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedUnskippableSuite.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedUnskippableSuite.java
index 974f52cc24c..c06e4f8ec75 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedUnskippableSuite.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedUnskippableSuite.java
@@ -8,10 +8,10 @@
 @Category(TestSucceedUnskippableSuite.datadog_itr_unskippable.class)
 public class TestSucceedUnskippableSuite {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  public interface datadog_itr_unskippable {}
+    public interface datadog_itr_unskippable {}
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedVerySlow.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedVerySlow.java
index 0374f0c03e1..e04b3e211f1 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedVerySlow.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedVerySlow.java
@@ -6,9 +6,9 @@
 
 public class TestSucceedVerySlow {
 
-  @Test
-  public void test_succeed() throws InterruptedException {
-    Thread.sleep(2100);
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() throws InterruptedException {
+        Thread.sleep(2100);
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedWithCategories.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedWithCategories.java
index 572712c13a7..a6552603f09 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedWithCategories.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestSucceedWithCategories.java
@@ -8,11 +8,11 @@
 @Category({Slow.class, Flaky.class})
 public class TestSucceedWithCategories {
 
-  @Category({End2End.class, Browser.class})
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Category({End2End.class, Browser.class})
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
 
 class End2End {}
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/BazelRunNotifierWrapperInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/BazelRunNotifierWrapperInstrumentation.java
index 782e6e1ebf8..88467b1dc4b 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/BazelRunNotifierWrapperInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/BazelRunNotifierWrapperInstrumentation.java
@@ -31,84 +31,82 @@
  */
 @AutoService(InstrumenterModule.class)
 public class BazelRunNotifierWrapperInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public BazelRunNotifierWrapperInstrumentation() {
-    super("ci-visibility", "junit-4");
-  }
+    public BazelRunNotifierWrapperInstrumentation() {
+        super("ci-visibility", "junit-4");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.junit.runner.notification.RunNotifier";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.junit.runner.notification.RunNotifier";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".JUnit4Utils",
-      packageName + ".TracingListener",
-      packageName + ".SkippedByDatadog",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".JUnit4Utils", packageName + ".TracingListener", packageName + ".SkippedByDatadog",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("fireTestSuiteStarted").and(takesArgument(0, named("org.junit.runner.Description"))),
-        BazelRunNotifierWrapperInstrumentation.class.getName() + "$FireSuiteStartedAdvice");
-    transformer.applyAdvice(
-        named("fireTestSuiteFinished").and(takesArgument(0, named("org.junit.runner.Description"))),
-        BazelRunNotifierWrapperInstrumentation.class.getName() + "$FireSuiteFinishedAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("fireTestSuiteStarted").and(takesArgument(0, named("org.junit.runner.Description"))),
+                BazelRunNotifierWrapperInstrumentation.class.getName() + "$FireSuiteStartedAdvice");
+        transformer.applyAdvice(
+                named("fireTestSuiteFinished").and(takesArgument(0, named("org.junit.runner.Description"))),
+                BazelRunNotifierWrapperInstrumentation.class.getName() + "$FireSuiteFinishedAdvice");
+    }
 
-  public static class FireSuiteStartedAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void fireOnTracingListener(
-        @Advice.This final RunNotifier self, @Advice.Argument(0) final Description description) {
-      RunNotifier inner = JUnit4Utils.unwrapRunNotifier(self);
-      if (inner == null || inner == self) {
-        return;
-      }
-      List<RunListener> listeners = JUnit4Utils.runListenersFromRunNotifier(inner);
-      if (listeners == null) {
-        return;
-      }
-      for (RunListener listener : listeners) {
-        TracingListener tracingListener = JUnit4Utils.toTracingListener(listener);
-        if (tracingListener != null) {
-          tracingListener.testSuiteStarted(description);
+    public static class FireSuiteStartedAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void fireOnTracingListener(
+                @Advice.This final RunNotifier self, @Advice.Argument(0) final Description description) {
+            RunNotifier inner = JUnit4Utils.unwrapRunNotifier(self);
+            if (inner == null || inner == self) {
+                return;
+            }
+            List<RunListener> listeners = JUnit4Utils.runListenersFromRunNotifier(inner);
+            if (listeners == null) {
+                return;
+            }
+            for (RunListener listener : listeners) {
+                TracingListener tracingListener = JUnit4Utils.toTracingListener(listener);
+                if (tracingListener != null) {
+                    tracingListener.testSuiteStarted(description);
+                }
+            }
         }
-      }
-    }
 
-    // JUnit 4.13 muzzle marker: fireTestSuiteStarted exists from 4.13.
-    public static void muzzleCheck(final RunNotifier notifier) {
-      notifier.fireTestSuiteStarted(null);
+        // JUnit 4.13 muzzle marker: fireTestSuiteStarted exists from 4.13.
+        public static void muzzleCheck(final RunNotifier notifier) {
+            notifier.fireTestSuiteStarted(null);
+        }
     }
-  }
 
-  public static class FireSuiteFinishedAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void fireOnTracingListener(
-        @Advice.This final RunNotifier self, @Advice.Argument(0) final Description description) {
-      RunNotifier inner = JUnit4Utils.unwrapRunNotifier(self);
-      if (inner == null || inner == self) {
-        return;
-      }
-      List<RunListener> listeners = JUnit4Utils.runListenersFromRunNotifier(inner);
-      if (listeners == null) {
-        return;
-      }
-      for (RunListener listener : listeners) {
-        TracingListener tracingListener = JUnit4Utils.toTracingListener(listener);
-        if (tracingListener != null) {
-          tracingListener.testSuiteFinished(description);
+    public static class FireSuiteFinishedAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void fireOnTracingListener(
+                @Advice.This final RunNotifier self, @Advice.Argument(0) final Description description) {
+            RunNotifier inner = JUnit4Utils.unwrapRunNotifier(self);
+            if (inner == null || inner == self) {
+                return;
+            }
+            List<RunListener> listeners = JUnit4Utils.runListenersFromRunNotifier(inner);
+            if (listeners == null) {
+                return;
+            }
+            for (RunListener listener : listeners) {
+                TracingListener tracingListener = JUnit4Utils.toTracingListener(listener);
+                if (tracingListener != null) {
+                    tracingListener.testSuiteFinished(description);
+                }
+            }
         }
-      }
-    }
 
-    public static void muzzleCheck(final RunNotifier notifier) {
-      notifier.fireTestSuiteFinished(null);
+        public static void muzzleCheck(final RunNotifier notifier) {
+            notifier.fireTestSuiteFinished(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java
index f80047673fd..feceef01db6 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java
@@ -14,49 +14,48 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit4BeforeAfterInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-
-  public JUnit4BeforeAfterInstrumentation() {
-    super("ci-visibility", "junit-4", "setup-teardown");
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.junit.internal.runners.statements.RunBefores",
-      "org.junit.internal.runners.statements.RunAfters",
-      "org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters$RunBeforeParams",
-      "org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters$RunAfterParams",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("invokeMethod")
-            .and(takesArgument(0, named("org.junit.runners.model.FrameworkMethod"))),
-        JUnit4BeforeAfterInstrumentation.class.getName() + "$RunBeforesAftersAdvice");
-  }
-
-  public static class RunBeforesAftersAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope startCallSpan(@Advice.Argument(0) final FrameworkMethod method) {
-      return JUnit4BeforeAfterOperationsTracer.startTrace(method.getMethod());
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+
+    public JUnit4BeforeAfterInstrumentation() {
+        super("ci-visibility", "junit-4", "setup-teardown");
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.junit.internal.runners.statements.RunBefores",
+            "org.junit.internal.runners.statements.RunAfters",
+            "org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters$RunBeforeParams",
+            "org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters$RunAfterParams",
+        };
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void finishCallSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      JUnit4BeforeAfterOperationsTracer.endTrace(scope, throwable);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("invokeMethod").and(takesArgument(0, named("org.junit.runners.model.FrameworkMethod"))),
+                JUnit4BeforeAfterInstrumentation.class.getName() + "$RunBeforesAftersAdvice");
     }
 
-    // JUnit 4.13 and above
-    public static void muzzleCheck(final Ordering ord) {
-      try {
-        ord.apply(null);
-      } catch (InvalidOrderingException e) {
-        throw new RuntimeException(e);
-      }
+    public static class RunBeforesAftersAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope startCallSpan(@Advice.Argument(0) final FrameworkMethod method) {
+            return JUnit4BeforeAfterOperationsTracer.startTrace(method.getMethod());
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void finishCallSpan(
+                @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            JUnit4BeforeAfterOperationsTracer.endTrace(scope, throwable);
+        }
+
+        // JUnit 4.13 and above
+        public static void muzzleCheck(final Ordering ord) {
+            try {
+                ord.apply(null);
+            } catch (InvalidOrderingException e) {
+                throw new RuntimeException(e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterOperationsTracer.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterOperationsTracer.java
index 01602f656c3..16eceba505d 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterOperationsTracer.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterOperationsTracer.java
@@ -14,30 +14,30 @@
 import org.junit.runners.Parameterized;
 
 public class JUnit4BeforeAfterOperationsTracer {
-  public static ContextScope startTrace(final Method method) {
-    final AgentSpan span = AgentTracer.startSpan("junit", method.getName());
-    if (method.isAnnotationPresent(Before.class)) {
-      span.setTag(Tags.TEST_CALLBACK, "Before");
-    } else if (method.isAnnotationPresent(After.class)) {
-      span.setTag(Tags.TEST_CALLBACK, "After");
-    } else if (method.isAnnotationPresent(BeforeClass.class)) {
-      span.setTag(Tags.TEST_CALLBACK, "BeforeClass");
-    } else if (method.isAnnotationPresent(AfterClass.class)) {
-      span.setTag(Tags.TEST_CALLBACK, "AfterClass");
-    } else if (method.isAnnotationPresent(Parameterized.BeforeParam.class)) {
-      span.setTag(Tags.TEST_CALLBACK, "BeforeParam");
-    } else if (method.isAnnotationPresent(Parameterized.AfterParam.class)) {
-      span.setTag(Tags.TEST_CALLBACK, "AfterParam");
+    public static ContextScope startTrace(final Method method) {
+        final AgentSpan span = AgentTracer.startSpan("junit", method.getName());
+        if (method.isAnnotationPresent(Before.class)) {
+            span.setTag(Tags.TEST_CALLBACK, "Before");
+        } else if (method.isAnnotationPresent(After.class)) {
+            span.setTag(Tags.TEST_CALLBACK, "After");
+        } else if (method.isAnnotationPresent(BeforeClass.class)) {
+            span.setTag(Tags.TEST_CALLBACK, "BeforeClass");
+        } else if (method.isAnnotationPresent(AfterClass.class)) {
+            span.setTag(Tags.TEST_CALLBACK, "AfterClass");
+        } else if (method.isAnnotationPresent(Parameterized.BeforeParam.class)) {
+            span.setTag(Tags.TEST_CALLBACK, "BeforeParam");
+        } else if (method.isAnnotationPresent(Parameterized.AfterParam.class)) {
+            span.setTag(Tags.TEST_CALLBACK, "AfterParam");
+        }
+        return AgentTracer.activateSpan(span);
     }
-    return AgentTracer.activateSpan(span);
-  }
 
-  public static void endTrace(final ContextScope scope, final Throwable throwable) {
-    final AgentSpan span = spanFromScope(scope);
-    if (throwable != null) {
-      span.addThrowable(throwable);
+    public static void endTrace(final ContextScope scope, final Throwable throwable) {
+        final AgentSpan span = spanFromScope(scope);
+        if (throwable != null) {
+            span.addThrowable(throwable);
+        }
+        scope.close();
+        span.finish();
     }
-    scope.close();
-    span.finish();
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/FailFastDescriptionComparator.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/FailFastDescriptionComparator.java
index 50741f60564..f05e7952afb 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/FailFastDescriptionComparator.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/FailFastDescriptionComparator.java
@@ -11,21 +11,20 @@
 
 public class FailFastDescriptionComparator implements Comparator<Description> {
 
-  private final TestEventsHandler<TestSuiteDescriptor, TestDescriptor> handler;
+    private final TestEventsHandler<TestSuiteDescriptor, TestDescriptor> handler;
 
-  public FailFastDescriptionComparator(
-      TestEventsHandler<TestSuiteDescriptor, TestDescriptor> handler) {
-    this.handler = handler;
-  }
+    public FailFastDescriptionComparator(TestEventsHandler<TestSuiteDescriptor, TestDescriptor> handler) {
+        this.handler = handler;
+    }
 
-  private int executionPriority(Description description) {
-    TestIdentifier testIdentifier = JUnit4Utils.toTestIdentifier(description);
-    TestSourceData testSourceData = JUnit4Utils.toTestSourceData(description);
-    return handler.executionPriority(testIdentifier, testSourceData);
-  }
+    private int executionPriority(Description description) {
+        TestIdentifier testIdentifier = JUnit4Utils.toTestIdentifier(description);
+        TestSourceData testSourceData = JUnit4Utils.toTestSourceData(description);
+        return handler.executionPriority(testIdentifier, testSourceData);
+    }
 
-  @Override
-  public int compare(Description o1, Description o2) {
-    return executionPriority(o2) - executionPriority(o1);
-  }
+    @Override
+    public int compare(Description o1, Description o2) {
+        return executionPriority(o2) - executionPriority(o1);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4TestOrdererInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4TestOrdererInstrumentation.java
index 0453d5c1997..171dd926f8d 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4TestOrdererInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4TestOrdererInstrumentation.java
@@ -22,58 +22,56 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit4TestOrdererInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  private final String parentPackageName =
-      Strings.getPackageName(JUnit4Instrumentation.class.getName());
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    private final String parentPackageName = Strings.getPackageName(JUnit4Instrumentation.class.getName());
 
-  public JUnit4TestOrdererInstrumentation() {
-    super("ci-visibility", "junit-4", "test-order");
-  }
+    public JUnit4TestOrdererInstrumentation() {
+        super("ci-visibility", "junit-4", "test-order");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.junit.runner.manipulation.Orderer";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.junit.runner.manipulation.Orderer";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      parentPackageName + ".SkippedByDatadog",
-      parentPackageName + ".TracingListener",
-      parentPackageName + ".JUnit4Utils",
-      parentPackageName + ".TestEventsHandlerHolder",
-      packageName + ".FailFastDescriptionComparator",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            parentPackageName + ".SkippedByDatadog",
+            parentPackageName + ".TracingListener",
+            parentPackageName + ".JUnit4Utils",
+            parentPackageName + ".TestEventsHandlerHolder",
+            packageName + ".FailFastDescriptionComparator",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("order"), JUnit4TestOrdererInstrumentation.class.getName() + "$OrderAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("order"), JUnit4TestOrdererInstrumentation.class.getName() + "$OrderAdvice");
+    }
 
-  public static class OrderAdvice {
-    @SuppressFBWarnings(
-        value = "UC_USELESS_OBJECT",
-        justification = "descriptions is the return value of the instrumented method")
-    @Advice.OnMethodExit
-    public static void onOrdering(@Advice.Return(readOnly = false) List<Description> descriptions) {
-      String testOrder = Config.get().getCiVisibilityTestOrder();
-      TestEventsHandler<TestSuiteDescriptor, TestDescriptor> handler =
-          TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT4);
-      if (CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder) && handler != null) {
-        // sort descriptions after the user's sorting method (if any) has been applied
-        List<Description> sorted = new ArrayList<Description>(descriptions);
-        sorted.sort(new FailFastDescriptionComparator(handler));
-        descriptions = sorted;
-      } else {
-        throw new IllegalArgumentException("Unknown test order: " + testOrder);
-      }
+    public static class OrderAdvice {
+        @SuppressFBWarnings(
+                value = "UC_USELESS_OBJECT",
+                justification = "descriptions is the return value of the instrumented method")
+        @Advice.OnMethodExit
+        public static void onOrdering(@Advice.Return(readOnly = false) List<Description> descriptions) {
+            String testOrder = Config.get().getCiVisibilityTestOrder();
+            TestEventsHandler<TestSuiteDescriptor, TestDescriptor> handler =
+                    TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT4);
+            if (CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder) && handler != null) {
+                // sort descriptions after the user's sorting method (if any) has been applied
+                List<Description> sorted = new ArrayList<Description>(descriptions);
+                sorted.sort(new FailFastDescriptionComparator(handler));
+                descriptions = sorted;
+            } else {
+                throw new IllegalArgumentException("Unknown test order: " + testOrder);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4TestSorterInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4TestSorterInstrumentation.java
index eb6e56db785..15c7ae9f70b 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4TestSorterInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4TestSorterInstrumentation.java
@@ -24,60 +24,59 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit4TestSorterInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  private final String parentPackageName =
-      Strings.getPackageName(JUnit4Instrumentation.class.getName());
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    private final String parentPackageName = Strings.getPackageName(JUnit4Instrumentation.class.getName());
 
-  public JUnit4TestSorterInstrumentation() {
-    super("ci-visibility", "junit-4", "test-order");
-  }
+    public JUnit4TestSorterInstrumentation() {
+        super("ci-visibility", "junit-4", "test-order");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.junit.runner.Runner";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.junit.runner.Runner";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()))
-        .and(implementsInterface(named("org.junit.runner.manipulation.Sortable")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()))
+                .and(implementsInterface(named("org.junit.runner.manipulation.Sortable")));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      parentPackageName + ".SkippedByDatadog",
-      parentPackageName + ".TracingListener",
-      parentPackageName + ".JUnit4Utils",
-      parentPackageName + ".TestEventsHandlerHolder",
-      packageName + ".FailFastDescriptionComparator",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            parentPackageName + ".SkippedByDatadog",
+            parentPackageName + ".TracingListener",
+            parentPackageName + ".JUnit4Utils",
+            parentPackageName + ".TestEventsHandlerHolder",
+            packageName + ".FailFastDescriptionComparator",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("sort").and(takesArgument(0, named("org.junit.runner.manipulation.Sorter"))),
-        JUnit4TestSorterInstrumentation.class.getName() + "$SorterAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("sort").and(takesArgument(0, named("org.junit.runner.manipulation.Sorter"))),
+                JUnit4TestSorterInstrumentation.class.getName() + "$SorterAdvice");
+    }
 
-  public static class SorterAdvice {
-    @Advice.OnMethodEnter
-    public static void onOrdering(@Advice.Argument(value = 0, readOnly = false) Sorter sorter) {
-      String testOrder = Config.get().getCiVisibilityTestOrder();
-      TestEventsHandler<TestSuiteDescriptor, TestDescriptor> handler =
-          TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT4);
-      if (CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder) && handler != null) {
-        // use sorter provided when elements are equal (same execution priority)
-        sorter = new Sorter(new FailFastDescriptionComparator(handler).thenComparing(sorter));
-      } else {
-        throw new IllegalArgumentException("Unknown test order: " + testOrder);
-      }
+    public static class SorterAdvice {
+        @Advice.OnMethodEnter
+        public static void onOrdering(@Advice.Argument(value = 0, readOnly = false) Sorter sorter) {
+            String testOrder = Config.get().getCiVisibilityTestOrder();
+            TestEventsHandler<TestSuiteDescriptor, TestDescriptor> handler =
+                    TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT4);
+            if (CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder) && handler != null) {
+                // use sorter provided when elements are equal (same execution priority)
+                sorter = new Sorter(new FailFastDescriptionComparator(handler).thenComparing(sorter));
+            } else {
+                throw new IllegalArgumentException("Unknown test order: " + testOrder);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/ReverseAlphanumeric.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/ReverseAlphanumeric.java
index 52cddefe9e2..f6ef718eba0 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/ReverseAlphanumeric.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/ReverseAlphanumeric.java
@@ -8,20 +8,20 @@
 import org.junit.runner.manipulation.Ordering;
 
 public class ReverseAlphanumeric implements Ordering.Factory {
-  private static final Comparator<Description> COMPARATOR =
-      (o1, o2) -> o2.getDisplayName().compareTo(o1.getDisplayName());
+    private static final Comparator<Description> COMPARATOR =
+            (o1, o2) -> o2.getDisplayName().compareTo(o1.getDisplayName());
 
-  public static class ReverseAlphanumericOrdering extends Ordering {
-    @Override
-    public List<Description> orderItems(Collection<Description> descriptions) {
-      List<Description> sorted = new ArrayList<>(descriptions);
-      sorted.sort(COMPARATOR);
-      return sorted;
+    public static class ReverseAlphanumericOrdering extends Ordering {
+        @Override
+        public List<Description> orderItems(Collection<Description> descriptions) {
+            List<Description> sorted = new ArrayList<>(descriptions);
+            sorted.sort(COMPARATOR);
+            return sorted;
+        }
     }
-  }
 
-  @Override
-  public Ordering create(Ordering.Context context) {
-    return new ReverseAlphanumericOrdering();
-  }
+    @Override
+    public Ordering create(Ordering.Context context) {
+        return new ReverseAlphanumericOrdering();
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedAfter.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedAfter.java
index 7581a79c5ca..13ebafb9480 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedAfter.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedAfter.java
@@ -6,18 +6,18 @@
 import org.junit.Test;
 
 public class TestFailedAfter {
-  @After
-  public void tearDown() {
-    throw new RuntimeException("testcase teardown failed");
-  }
+    @After
+    public void tearDown() {
+        throw new RuntimeException("testcase teardown failed");
+    }
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void another_test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void another_test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedAfterClass.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedAfterClass.java
index 24470257301..00a228bad34 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedAfterClass.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedAfterClass.java
@@ -6,18 +6,18 @@
 import org.junit.Test;
 
 public class TestFailedAfterClass {
-  @AfterClass
-  public static void tearDown() {
-    throw new RuntimeException("suite teardown failed");
-  }
+    @AfterClass
+    public static void tearDown() {
+        throw new RuntimeException("suite teardown failed");
+    }
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void another_test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void another_test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedAfterParam.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedAfterParam.java
index 6faee23ed5d..8a487a55bb5 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedAfterParam.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedAfterParam.java
@@ -10,31 +10,31 @@
 
 @RunWith(Parameterized.class)
 public class TestFailedAfterParam {
-  private final int num1;
-  private final int num2;
-  private final int sum;
-
-  public TestFailedAfterParam(final int num1, final int num2, final int sum) {
-    this.num1 = num1;
-    this.num2 = num2;
-    this.sum = sum;
-  }
-
-  @Parameterized.BeforeParam
-  public static void setup() {}
-
-  @Parameterized.AfterParam
-  public static void tearDown() {
-    throw new RuntimeException("after param setup failed");
-  }
-
-  @Parameterized.Parameters
-  public static Collection<Object[]> data() {
-    return Arrays.asList(new Object[][] {{0, 0, 0}, {1, 1, 2}});
-  }
-
-  @Test
-  public void parameterized_test_succeed() {
-    assertEquals(num1 + num2, sum);
-  }
+    private final int num1;
+    private final int num2;
+    private final int sum;
+
+    public TestFailedAfterParam(final int num1, final int num2, final int sum) {
+        this.num1 = num1;
+        this.num2 = num2;
+        this.sum = sum;
+    }
+
+    @Parameterized.BeforeParam
+    public static void setup() {}
+
+    @Parameterized.AfterParam
+    public static void tearDown() {
+        throw new RuntimeException("after param setup failed");
+    }
+
+    @Parameterized.Parameters
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][] {{0, 0, 0}, {1, 1, 2}});
+    }
+
+    @Test
+    public void parameterized_test_succeed() {
+        assertEquals(num1 + num2, sum);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedBefore.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedBefore.java
index bca82898209..f851a060d0c 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedBefore.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedBefore.java
@@ -6,18 +6,18 @@
 import org.junit.Test;
 
 public class TestFailedBefore {
-  @Before
-  public void setup() {
-    throw new RuntimeException("testcase setup failed");
-  }
+    @Before
+    public void setup() {
+        throw new RuntimeException("testcase setup failed");
+    }
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void another_test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void another_test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedBeforeClass.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedBeforeClass.java
index a7b0c38b059..c91255c0ffe 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedBeforeClass.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedBeforeClass.java
@@ -6,18 +6,18 @@
 import org.junit.Test;
 
 public class TestFailedBeforeClass {
-  @BeforeClass
-  public static void setup() {
-    throw new RuntimeException("suite setup failed");
-  }
+    @BeforeClass
+    public static void setup() {
+        throw new RuntimeException("suite setup failed");
+    }
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void another_test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void another_test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedBeforeParam.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedBeforeParam.java
index 77f5b1a682b..97bf491a09d 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedBeforeParam.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestFailedBeforeParam.java
@@ -10,31 +10,31 @@
 
 @RunWith(Parameterized.class)
 public class TestFailedBeforeParam {
-  private final int num1;
-  private final int num2;
-  private final int sum;
-
-  public TestFailedBeforeParam(final int num1, final int num2, final int sum) {
-    this.num1 = num1;
-    this.num2 = num2;
-    this.sum = sum;
-  }
-
-  @Parameterized.BeforeParam
-  public static void setup() {
-    throw new RuntimeException("before param setup failed");
-  }
-
-  @Parameterized.AfterParam
-  public static void tearDown() {}
-
-  @Parameterized.Parameters
-  public static Collection<Object[]> data() {
-    return Arrays.asList(new Object[][] {{0, 0, 0}, {1, 1, 2}});
-  }
-
-  @Test
-  public void parameterized_test_succeed() {
-    assertEquals(num1 + num2, sum);
-  }
+    private final int num1;
+    private final int num2;
+    private final int sum;
+
+    public TestFailedBeforeParam(final int num1, final int num2, final int sum) {
+        this.num1 = num1;
+        this.num2 = num2;
+        this.sum = sum;
+    }
+
+    @Parameterized.BeforeParam
+    public static void setup() {
+        throw new RuntimeException("before param setup failed");
+    }
+
+    @Parameterized.AfterParam
+    public static void tearDown() {}
+
+    @Parameterized.Parameters
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][] {{0, 0, 0}, {1, 1, 2}});
+    }
+
+    @Test
+    public void parameterized_test_succeed() {
+        assertEquals(num1 + num2, sum);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestOrderer.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestOrderer.java
index d49929d26c0..852edb71dc0 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestOrderer.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestOrderer.java
@@ -7,18 +7,18 @@
 
 @OrderWith(ReverseAlphanumeric.class)
 public class TestOrderer {
-  @Test
-  public void test_succeed_1() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed_1() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_succeed_2() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed_2() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_succeed_3() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed_3() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSorter.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSorter.java
index f1b9dff833a..e0a953b4078 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSorter.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSorter.java
@@ -8,18 +8,18 @@
 
 @OrderWith(Alphanumeric.class)
 public class TestSorter {
-  @Test
-  public void test_succeed_1() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed_1() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_succeed_2() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed_2() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_succeed_3() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed_3() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSucceed.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSucceed.java
index 9fcd9017ac3..e7f77bc72b6 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSucceed.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSucceed.java
@@ -6,8 +6,8 @@
 
 public class TestSucceed {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSucceedBeforeAfter.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSucceedBeforeAfter.java
index 347c4ce185c..d564620c54a 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSucceedBeforeAfter.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSucceedBeforeAfter.java
@@ -7,19 +7,19 @@
 import org.junit.Test;
 
 public class TestSucceedBeforeAfter {
-  @Before
-  public void setup() {}
+    @Before
+    public void setup() {}
 
-  @After
-  public void tearDown() {}
+    @After
+    public void tearDown() {}
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void another_test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void another_test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSucceedBeforeClassAfterClass.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSucceedBeforeClassAfterClass.java
index 6c39c071486..69adba5499e 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSucceedBeforeClassAfterClass.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSucceedBeforeClassAfterClass.java
@@ -7,19 +7,19 @@
 import org.junit.Test;
 
 public class TestSucceedBeforeClassAfterClass {
-  @BeforeClass
-  public static void setup() {}
+    @BeforeClass
+    public static void setup() {}
 
-  @AfterClass
-  public static void tearDown() {}
+    @AfterClass
+    public static void tearDown() {}
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void another_test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void another_test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSucceedBeforeParamAfterParam.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSucceedBeforeParamAfterParam.java
index a5ffd17a693..49bd70f0c6e 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSucceedBeforeParamAfterParam.java
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/test/java/org/example/TestSucceedBeforeParamAfterParam.java
@@ -10,29 +10,29 @@
 
 @RunWith(Parameterized.class)
 public class TestSucceedBeforeParamAfterParam {
-  private final int num1;
-  private final int num2;
-  private final int sum;
-
-  public TestSucceedBeforeParamAfterParam(final int num1, final int num2, final int sum) {
-    this.num1 = num1;
-    this.num2 = num2;
-    this.sum = sum;
-  }
-
-  @Parameterized.BeforeParam
-  public static void setup() {}
-
-  @Parameterized.AfterParam
-  public static void tearDown() {}
-
-  @Parameterized.Parameters
-  public static Collection<Object[]> data() {
-    return Arrays.asList(new Object[][] {{0, 0, 0}, {1, 1, 2}});
-  }
-
-  @Test
-  public void parameterized_test_succeed() {
-    assertEquals(num1 + num2, sum);
-  }
+    private final int num1;
+    private final int num2;
+    private final int sum;
+
+    public TestSucceedBeforeParamAfterParam(final int num1, final int num2, final int sum) {
+        this.num1 = num1;
+        this.num2 = num2;
+        this.sum = sum;
+    }
+
+    @Parameterized.BeforeParam
+    public static void setup() {}
+
+    @Parameterized.AfterParam
+    public static void tearDown() {}
+
+    @Parameterized.Parameters
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][] {{0, 0, 0}, {1, 1, 2}});
+    }
+
+    @Test
+    public void parameterized_test_succeed() {
+        assertEquals(num1 + num2, sum);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/CucumberRetryDescriptorFactory.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/CucumberRetryDescriptorFactory.java
index 449f3068ec2..f85e394bebb 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/CucumberRetryDescriptorFactory.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/CucumberRetryDescriptorFactory.java
@@ -17,93 +17,83 @@
  */
 public final class CucumberRetryDescriptorFactory implements RetryDescriptorFactory {
 
-  private static final MethodHandles METHOD_HANDLES =
-      new MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
+    private static final MethodHandles METHOD_HANDLES = new MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
 
-  private static final String PACKAGE = "io.cucumber.junit.platform.engine.";
+    private static final String PACKAGE = "io.cucumber.junit.platform.engine.";
 
-  private static final MethodHandle CONSTRUCTOR_7_24 =
-      METHOD_HANDLES.constructor(
-          PACKAGE + "CucumberTestDescriptor$PickleDescriptor",
-          JUnitPlatformUtils.loadClass(PACKAGE + "CucumberConfiguration"),
-          UniqueId.class,
-          String.class,
-          TestSource.class,
-          Pickle.class);
-  private static final MethodHandle CONSTRUCTOR_7_7 =
-      METHOD_HANDLES.constructor(
-          PACKAGE + "NodeDescriptor$PickleDescriptor",
-          ConfigurationParameters.class,
-          UniqueId.class,
-          String.class,
-          TestSource.class,
-          Pickle.class);
-  private static final MethodHandle CONSTRUCTOR_6_0 =
-      METHOD_HANDLES.constructor(
-          PACKAGE + "PickleDescriptor",
-          ConfigurationParameters.class,
-          UniqueId.class,
-          String.class,
-          TestSource.class,
-          Pickle.class);
-  private static final MethodHandle CONSTRUCTOR_5_4 =
-      METHOD_HANDLES.constructor(
-          PACKAGE + "PickleDescriptor",
-          UniqueId.class,
-          String.class,
-          TestSource.class,
-          Pickle.class);
+    private static final MethodHandle CONSTRUCTOR_7_24 = METHOD_HANDLES.constructor(
+            PACKAGE + "CucumberTestDescriptor$PickleDescriptor",
+            JUnitPlatformUtils.loadClass(PACKAGE + "CucumberConfiguration"),
+            UniqueId.class,
+            String.class,
+            TestSource.class,
+            Pickle.class);
+    private static final MethodHandle CONSTRUCTOR_7_7 = METHOD_HANDLES.constructor(
+            PACKAGE + "NodeDescriptor$PickleDescriptor",
+            ConfigurationParameters.class,
+            UniqueId.class,
+            String.class,
+            TestSource.class,
+            Pickle.class);
+    private static final MethodHandle CONSTRUCTOR_6_0 = METHOD_HANDLES.constructor(
+            PACKAGE + "PickleDescriptor",
+            ConfigurationParameters.class,
+            UniqueId.class,
+            String.class,
+            TestSource.class,
+            Pickle.class);
+    private static final MethodHandle CONSTRUCTOR_5_4 = METHOD_HANDLES.constructor(
+            PACKAGE + "PickleDescriptor", UniqueId.class, String.class, TestSource.class, Pickle.class);
 
-  // 7.24+ stores the configuration on the descriptor, read it back for the reconstruction.
-  private static final MethodHandle CONFIGURATION_GETTER =
-      METHOD_HANDLES.privateFieldGetter(
-          PACKAGE + "CucumberTestDescriptor$PickleDescriptor", "configuration");
+    // 7.24+ stores the configuration on the descriptor, read it back for the reconstruction.
+    private static final MethodHandle CONFIGURATION_GETTER =
+            METHOD_HANDLES.privateFieldGetter(PACKAGE + "CucumberTestDescriptor$PickleDescriptor", "configuration");
 
-  // The Pickle field was renamed pickleEvent -> pickle; resolved lazily off the descriptor's class.
-  private volatile MethodHandle pickleGetter;
+    // The Pickle field was renamed pickleEvent -> pickle; resolved lazily off the descriptor's class.
+    private volatile MethodHandle pickleGetter;
 
-  @Override
-  public TestDescriptor copy(TestDescriptor original, UnaryOperator<UniqueId> idTransform) {
-    if (!"PickleDescriptor".equals(original.getClass().getSimpleName())) {
-      return null; // only the leaf scenario descriptor is retried; containers are filtered earlier
-    }
-    Object pickle = readPickle(original);
-    if (pickle == null) {
-      return null;
-    }
-    UniqueId newId = idTransform.apply(original.getUniqueId());
-    String name = original.getDisplayName();
-    TestSource source = original.getSource().orElse(null);
+    @Override
+    public TestDescriptor copy(TestDescriptor original, UnaryOperator<UniqueId> idTransform) {
+        if (!"PickleDescriptor".equals(original.getClass().getSimpleName())) {
+            return null; // only the leaf scenario descriptor is retried; containers are filtered earlier
+        }
+        Object pickle = readPickle(original);
+        if (pickle == null) {
+            return null;
+        }
+        UniqueId newId = idTransform.apply(original.getUniqueId());
+        String name = original.getDisplayName();
+        TestSource source = original.getSource().orElse(null);
 
-    if (CONSTRUCTOR_7_24 != null) {
-      Object configuration = METHOD_HANDLES.invoke(CONFIGURATION_GETTER, original);
-      return configuration == null
-          ? null
-          : METHOD_HANDLES.invoke(CONSTRUCTOR_7_24, configuration, newId, name, source, pickle);
-    }
-    if (CONSTRUCTOR_7_7 != null) {
-      return METHOD_HANDLES.invoke(
-          CONSTRUCTOR_7_7, new EmptyConfigurationParameters(), newId, name, source, pickle);
-    }
-    if (CONSTRUCTOR_6_0 != null) {
-      return METHOD_HANDLES.invoke(
-          CONSTRUCTOR_6_0, new EmptyConfigurationParameters(), newId, name, source, pickle);
-    }
-    if (CONSTRUCTOR_5_4 != null) {
-      return METHOD_HANDLES.invoke(CONSTRUCTOR_5_4, newId, name, source, pickle);
+        if (CONSTRUCTOR_7_24 != null) {
+            Object configuration = METHOD_HANDLES.invoke(CONFIGURATION_GETTER, original);
+            return configuration == null
+                    ? null
+                    : METHOD_HANDLES.invoke(CONSTRUCTOR_7_24, configuration, newId, name, source, pickle);
+        }
+        if (CONSTRUCTOR_7_7 != null) {
+            return METHOD_HANDLES.invoke(
+                    CONSTRUCTOR_7_7, new EmptyConfigurationParameters(), newId, name, source, pickle);
+        }
+        if (CONSTRUCTOR_6_0 != null) {
+            return METHOD_HANDLES.invoke(
+                    CONSTRUCTOR_6_0, new EmptyConfigurationParameters(), newId, name, source, pickle);
+        }
+        if (CONSTRUCTOR_5_4 != null) {
+            return METHOD_HANDLES.invoke(CONSTRUCTOR_5_4, newId, name, source, pickle);
+        }
+        return null; // unknown cucumber version -> fall back to the generic clone
     }
-    return null; // unknown cucumber version -> fall back to the generic clone
-  }
 
-  private Object readPickle(TestDescriptor descriptor) {
-    MethodHandle getter = pickleGetter;
-    if (getter == null) {
-      getter = METHOD_HANDLES.privateFieldGetter(descriptor.getClass(), "pickle");
-      if (getter == null) {
-        getter = METHOD_HANDLES.privateFieldGetter(descriptor.getClass(), "pickleEvent");
-      }
-      pickleGetter = getter;
+    private Object readPickle(TestDescriptor descriptor) {
+        MethodHandle getter = pickleGetter;
+        if (getter == null) {
+            getter = METHOD_HANDLES.privateFieldGetter(descriptor.getClass(), "pickle");
+            if (getter == null) {
+                getter = METHOD_HANDLES.privateFieldGetter(descriptor.getClass(), "pickleEvent");
+            }
+            pickleGetter = getter;
+        }
+        return getter != null ? METHOD_HANDLES.invoke(getter, descriptor) : null;
     }
-    return getter != null ? METHOD_HANDLES.invoke(getter, descriptor) : null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java
index c6888b3b3b6..ea0c5ec7ce0 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java
@@ -19,184 +19,178 @@
 
 public class CucumberTracingListener implements EngineExecutionListener {
 
-  private final String testFramework;
-  private final String testFrameworkVersion;
-
-  public CucumberTracingListener(TestEngine testEngine) {
-    testFramework = testEngine.getId();
-    testFrameworkVersion = CucumberUtils.getCucumberVersion(testEngine);
-  }
-
-  @Override
-  public void dynamicTestRegistered(TestDescriptor testDescriptor) {
-    // no op
-  }
-
-  @Override
-  public void reportingEntryPublished(TestDescriptor testDescriptor, ReportEntry entry) {
-    // no op
-  }
-
-  @Override
-  public void executionStarted(final TestDescriptor descriptor) {
-    if (descriptor.isContainer()) {
-      containerExecutionStarted(descriptor);
-    } else if (descriptor.isTest()) {
-      testCaseExecutionStarted(descriptor);
+    private final String testFramework;
+    private final String testFrameworkVersion;
+
+    public CucumberTracingListener(TestEngine testEngine) {
+        testFramework = testEngine.getId();
+        testFrameworkVersion = CucumberUtils.getCucumberVersion(testEngine);
     }
-  }
-
-  @Override
-  public void executionFinished(
-      TestDescriptor descriptor, TestExecutionResult testExecutionResult) {
-    if (descriptor.isContainer()) {
-      containerExecutionFinished(descriptor, testExecutionResult);
-    } else if (descriptor.isTest()) {
-      testCaseExecutionFinished(descriptor, testExecutionResult);
+
+    @Override
+    public void dynamicTestRegistered(TestDescriptor testDescriptor) {
+        // no op
     }
-  }
 
-  private void containerExecutionStarted(final TestDescriptor suiteDescriptor) {
-    UniqueId uniqueId = suiteDescriptor.getUniqueId();
-    if (!CucumberUtils.isFeature(uniqueId)) {
-      return;
+    @Override
+    public void reportingEntryPublished(TestDescriptor testDescriptor, ReportEntry entry) {
+        // no op
     }
 
-    String testSuiteName = CucumberUtils.getFeatureName(suiteDescriptor);
-    List<String> tags =
-        suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.CUCUMBER)
-        .onTestSuiteStart(
-            suiteDescriptor,
-            testSuiteName,
-            testFramework,
-            testFrameworkVersion,
-            null,
-            tags,
-            false,
-            TestFrameworkInstrumentation.CUCUMBER,
-            null);
-  }
-
-  private void containerExecutionFinished(
-      final TestDescriptor suiteDescriptor, final TestExecutionResult testExecutionResult) {
-    if (!CucumberUtils.isFeature(suiteDescriptor.getUniqueId())) {
-      return;
+    @Override
+    public void executionStarted(final TestDescriptor descriptor) {
+        if (descriptor.isContainer()) {
+            containerExecutionStarted(descriptor);
+        } else if (descriptor.isTest()) {
+            testCaseExecutionStarted(descriptor);
+        }
     }
 
-    Throwable throwable = testExecutionResult.getThrowable().orElse(null);
-    if (throwable != null) {
-      if (JUnitPlatformUtils.isAssumptionFailure(throwable)) {
-        String reason = throwable.getMessage();
-        TestEventsHandlerHolder.HANDLERS
-            .get(TestFrameworkInstrumentation.CUCUMBER)
-            .onTestSuiteSkip(suiteDescriptor, reason);
+    @Override
+    public void executionFinished(TestDescriptor descriptor, TestExecutionResult testExecutionResult) {
+        if (descriptor.isContainer()) {
+            containerExecutionFinished(descriptor, testExecutionResult);
+        } else if (descriptor.isTest()) {
+            testCaseExecutionFinished(descriptor, testExecutionResult);
+        }
+    }
 
-        for (TestDescriptor child : suiteDescriptor.getChildren()) {
-          executionSkipped(child, reason);
+    private void containerExecutionStarted(final TestDescriptor suiteDescriptor) {
+        UniqueId uniqueId = suiteDescriptor.getUniqueId();
+        if (!CucumberUtils.isFeature(uniqueId)) {
+            return;
         }
-      } else {
+
+        String testSuiteName = CucumberUtils.getFeatureName(suiteDescriptor);
+        List<String> tags =
+                suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
         TestEventsHandlerHolder.HANDLERS
-            .get(TestFrameworkInstrumentation.CUCUMBER)
-            .onTestSuiteFailure(suiteDescriptor, throwable);
-      }
+                .get(TestFrameworkInstrumentation.CUCUMBER)
+                .onTestSuiteStart(
+                        suiteDescriptor,
+                        testSuiteName,
+                        testFramework,
+                        testFrameworkVersion,
+                        null,
+                        tags,
+                        false,
+                        TestFrameworkInstrumentation.CUCUMBER,
+                        null);
     }
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.CUCUMBER)
-        .onTestSuiteFinish(suiteDescriptor, null);
-  }
-
-  private void testCaseExecutionStarted(final TestDescriptor testDescriptor) {
-    TestSource testSource = testDescriptor.getSource().orElse(null);
-    if (testSource instanceof ClasspathResourceSource) {
-      testResourceExecutionStarted(testDescriptor, (ClasspathResourceSource) testSource);
+
+    private void containerExecutionFinished(
+            final TestDescriptor suiteDescriptor, final TestExecutionResult testExecutionResult) {
+        if (!CucumberUtils.isFeature(suiteDescriptor.getUniqueId())) {
+            return;
+        }
+
+        Throwable throwable = testExecutionResult.getThrowable().orElse(null);
+        if (throwable != null) {
+            if (JUnitPlatformUtils.isAssumptionFailure(throwable)) {
+                String reason = throwable.getMessage();
+                TestEventsHandlerHolder.HANDLERS
+                        .get(TestFrameworkInstrumentation.CUCUMBER)
+                        .onTestSuiteSkip(suiteDescriptor, reason);
+
+                for (TestDescriptor child : suiteDescriptor.getChildren()) {
+                    executionSkipped(child, reason);
+                }
+            } else {
+                TestEventsHandlerHolder.HANDLERS
+                        .get(TestFrameworkInstrumentation.CUCUMBER)
+                        .onTestSuiteFailure(suiteDescriptor, throwable);
+            }
+        }
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.CUCUMBER)
+                .onTestSuiteFinish(suiteDescriptor, null);
     }
-  }
-
-  private void testResourceExecutionStarted(
-      TestDescriptor testDescriptor, ClasspathResourceSource testSource) {
-    TestDescriptor suiteDescriptor = CucumberUtils.getFeatureDescriptor(testDescriptor);
-    String classpathResourceName = testSource.getClasspathResourceName();
-    Pair<String, String> names =
-        CucumberUtils.getFeatureAndScenarioNames(testDescriptor, classpathResourceName);
-    String testName = names.getRight();
-    List<String> tags = JUnitPlatformUtils.getTags(testDescriptor);
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.CUCUMBER)
-        .onTestStart(
-            suiteDescriptor,
-            testDescriptor,
-            testName,
-            testFramework,
-            testFrameworkVersion,
-            null,
-            tags,
-            TestSourceData.UNKNOWN,
-            null,
-            TestEventsHandlerHolder.getExecutionTracker(testDescriptor));
-
-    CoveragePerTestBridge.recordCoverage(classpathResourceName);
-  }
-
-  private void testCaseExecutionFinished(
-      final TestDescriptor testDescriptor, final TestExecutionResult testExecutionResult) {
-    TestSource testSource = testDescriptor.getSource().orElse(null);
-    if (testSource instanceof ClasspathResourceSource) {
-      testResourceExecutionFinished(testDescriptor, testExecutionResult);
+
+    private void testCaseExecutionStarted(final TestDescriptor testDescriptor) {
+        TestSource testSource = testDescriptor.getSource().orElse(null);
+        if (testSource instanceof ClasspathResourceSource) {
+            testResourceExecutionStarted(testDescriptor, (ClasspathResourceSource) testSource);
+        }
     }
-  }
 
-  private void testResourceExecutionFinished(
-      TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) {
-    Throwable throwable = testExecutionResult.getThrowable().orElse(null);
-    if (throwable != null) {
-      if (JUnitPlatformUtils.isAssumptionFailure(throwable)) {
+    private void testResourceExecutionStarted(TestDescriptor testDescriptor, ClasspathResourceSource testSource) {
+        TestDescriptor suiteDescriptor = CucumberUtils.getFeatureDescriptor(testDescriptor);
+        String classpathResourceName = testSource.getClasspathResourceName();
+        Pair<String, String> names = CucumberUtils.getFeatureAndScenarioNames(testDescriptor, classpathResourceName);
+        String testName = names.getRight();
+        List<String> tags = JUnitPlatformUtils.getTags(testDescriptor);
         TestEventsHandlerHolder.HANDLERS
-            .get(TestFrameworkInstrumentation.CUCUMBER)
-            .onTestSkip(testDescriptor, throwable.getMessage());
-      } else {
+                .get(TestFrameworkInstrumentation.CUCUMBER)
+                .onTestStart(
+                        suiteDescriptor,
+                        testDescriptor,
+                        testName,
+                        testFramework,
+                        testFrameworkVersion,
+                        null,
+                        tags,
+                        TestSourceData.UNKNOWN,
+                        null,
+                        TestEventsHandlerHolder.getExecutionTracker(testDescriptor));
+
+        CoveragePerTestBridge.recordCoverage(classpathResourceName);
+    }
+
+    private void testCaseExecutionFinished(
+            final TestDescriptor testDescriptor, final TestExecutionResult testExecutionResult) {
+        TestSource testSource = testDescriptor.getSource().orElse(null);
+        if (testSource instanceof ClasspathResourceSource) {
+            testResourceExecutionFinished(testDescriptor, testExecutionResult);
+        }
+    }
+
+    private void testResourceExecutionFinished(TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) {
+        Throwable throwable = testExecutionResult.getThrowable().orElse(null);
+        if (throwable != null) {
+            if (JUnitPlatformUtils.isAssumptionFailure(throwable)) {
+                TestEventsHandlerHolder.HANDLERS
+                        .get(TestFrameworkInstrumentation.CUCUMBER)
+                        .onTestSkip(testDescriptor, throwable.getMessage());
+            } else {
+                TestEventsHandlerHolder.HANDLERS
+                        .get(TestFrameworkInstrumentation.CUCUMBER)
+                        .onTestFailure(testDescriptor, throwable);
+            }
+        }
+        TestExecutionTracker executionTracker = TestEventsHandlerHolder.getExecutionTracker(testDescriptor);
         TestEventsHandlerHolder.HANDLERS
-            .get(TestFrameworkInstrumentation.CUCUMBER)
-            .onTestFailure(testDescriptor, throwable);
-      }
+                .get(TestFrameworkInstrumentation.CUCUMBER)
+                .onTestFinish(testDescriptor, null, executionTracker);
+    }
+
+    @Override
+    public void executionSkipped(final TestDescriptor descriptor, final String reason) {
+        TestSource testSource = descriptor.getSource().orElse(null);
+        if (testSource instanceof ClasspathResourceSource) {
+            testResourceExecutionSkipped(descriptor, (ClasspathResourceSource) testSource, reason);
+        }
     }
-    TestExecutionTracker executionTracker =
-        TestEventsHandlerHolder.getExecutionTracker(testDescriptor);
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.CUCUMBER)
-        .onTestFinish(testDescriptor, null, executionTracker);
-  }
-
-  @Override
-  public void executionSkipped(final TestDescriptor descriptor, final String reason) {
-    TestSource testSource = descriptor.getSource().orElse(null);
-    if (testSource instanceof ClasspathResourceSource) {
-      testResourceExecutionSkipped(descriptor, (ClasspathResourceSource) testSource, reason);
+
+    private void testResourceExecutionSkipped(
+            TestDescriptor testDescriptor, ClasspathResourceSource testSource, String reason) {
+        TestDescriptor suiteDescriptor = CucumberUtils.getFeatureDescriptor(testDescriptor);
+        String classpathResourceName = testSource.getClasspathResourceName();
+        Pair<String, String> names = CucumberUtils.getFeatureAndScenarioNames(testDescriptor, classpathResourceName);
+        String testName = names.getRight();
+        List<String> tags =
+                testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.CUCUMBER)
+                .onTestIgnore(
+                        suiteDescriptor,
+                        testDescriptor,
+                        testName,
+                        testFramework,
+                        testFrameworkVersion,
+                        null,
+                        tags,
+                        TestSourceData.UNKNOWN,
+                        reason,
+                        TestEventsHandlerHolder.getExecutionTracker(testDescriptor));
     }
-  }
-
-  private void testResourceExecutionSkipped(
-      TestDescriptor testDescriptor, ClasspathResourceSource testSource, String reason) {
-    TestDescriptor suiteDescriptor = CucumberUtils.getFeatureDescriptor(testDescriptor);
-    String classpathResourceName = testSource.getClasspathResourceName();
-    Pair<String, String> names =
-        CucumberUtils.getFeatureAndScenarioNames(testDescriptor, classpathResourceName);
-    String testName = names.getRight();
-    List<String> tags =
-        testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.CUCUMBER)
-        .onTestIgnore(
-            suiteDescriptor,
-            testDescriptor,
-            testName,
-            testFramework,
-            testFrameworkVersion,
-            null,
-            tags,
-            TestSourceData.UNKNOWN,
-            reason,
-            TestEventsHandlerHolder.getExecutionTracker(testDescriptor));
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java
index c199f4be4e1..9f01791dd47 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java
@@ -20,111 +20,107 @@
 
 public abstract class CucumberUtils {
 
-  static {
-    TestDataFactory.register(
-        JUnitPlatformUtils.ENGINE_ID_CUCUMBER,
-        CucumberUtils::toTestIdentifier,
-        d -> TestSourceData.UNKNOWN,
-        null);
-    RetryDescriptorFactories.register(
-        JUnitPlatformUtils.ENGINE_ID_CUCUMBER, new CucumberRetryDescriptorFactory());
-  }
-
-  public static @Nullable String getCucumberVersion(TestEngine cucumberEngine) {
-    try (InputStream cucumberPropsStream =
-        cucumberEngine
-            .getClass()
-            .getClassLoader()
-            .getResourceAsStream(
-                "META-INF/maven/io.cucumber/cucumber-junit-platform-engine/pom.properties")) {
-      Properties cucumberProps = new Properties();
-      cucumberProps.load(cucumberPropsStream);
-      String version = cucumberProps.getProperty("version");
-      if (version != null) {
-        return version;
-      }
-    } catch (Exception e) {
-      // fallback below
+    static {
+        TestDataFactory.register(
+                JUnitPlatformUtils.ENGINE_ID_CUCUMBER,
+                CucumberUtils::toTestIdentifier,
+                d -> TestSourceData.UNKNOWN,
+                null);
+        RetryDescriptorFactories.register(JUnitPlatformUtils.ENGINE_ID_CUCUMBER, new CucumberRetryDescriptorFactory());
     }
-    return cucumberEngine.getVersion().orElse(null);
-  }
-
-  public static Pair<String, String> getFeatureAndScenarioNames(
-      TestDescriptor testDescriptor, String fallbackFeatureName) {
-    String featureName = fallbackFeatureName;
-
-    Deque<TestDescriptor> scenarioDescriptors = new ArrayDeque<>();
-    scenarioDescriptors.push(testDescriptor);
-
-    TestDescriptor current = testDescriptor;
-    while (true) {
-      Optional<TestDescriptor> parent = current.getParent();
-      if (!parent.isPresent()) {
-        break;
-      }
-
-      current = parent.get();
-      UniqueId currentId = current.getUniqueId();
-      if (isFeature(currentId)) {
-        featureName = currentId.getLastSegment().getValue() + ":" + current.getDisplayName();
-        break;
-
-      } else {
-        scenarioDescriptors.push(current);
-      }
+
+    public static @Nullable String getCucumberVersion(TestEngine cucumberEngine) {
+        try (InputStream cucumberPropsStream = cucumberEngine
+                .getClass()
+                .getClassLoader()
+                .getResourceAsStream("META-INF/maven/io.cucumber/cucumber-junit-platform-engine/pom.properties")) {
+            Properties cucumberProps = new Properties();
+            cucumberProps.load(cucumberPropsStream);
+            String version = cucumberProps.getProperty("version");
+            if (version != null) {
+                return version;
+            }
+        } catch (Exception e) {
+            // fallback below
+        }
+        return cucumberEngine.getVersion().orElse(null);
     }
 
-    StringBuilder scenarioName = new StringBuilder();
-    while (!scenarioDescriptors.isEmpty()) {
-      TestDescriptor descriptor = scenarioDescriptors.pop();
-      scenarioName.append(descriptor.getDisplayName());
-      if (!scenarioDescriptors.isEmpty()) {
-        scenarioName.append('.');
-      }
+    public static Pair<String, String> getFeatureAndScenarioNames(
+            TestDescriptor testDescriptor, String fallbackFeatureName) {
+        String featureName = fallbackFeatureName;
+
+        Deque<TestDescriptor> scenarioDescriptors = new ArrayDeque<>();
+        scenarioDescriptors.push(testDescriptor);
+
+        TestDescriptor current = testDescriptor;
+        while (true) {
+            Optional<TestDescriptor> parent = current.getParent();
+            if (!parent.isPresent()) {
+                break;
+            }
+
+            current = parent.get();
+            UniqueId currentId = current.getUniqueId();
+            if (isFeature(currentId)) {
+                featureName = currentId.getLastSegment().getValue() + ":" + current.getDisplayName();
+                break;
+
+            } else {
+                scenarioDescriptors.push(current);
+            }
+        }
+
+        StringBuilder scenarioName = new StringBuilder();
+        while (!scenarioDescriptors.isEmpty()) {
+            TestDescriptor descriptor = scenarioDescriptors.pop();
+            scenarioName.append(descriptor.getDisplayName());
+            if (!scenarioDescriptors.isEmpty()) {
+                scenarioName.append('.');
+            }
+        }
+
+        return Pair.of(featureName, scenarioName.toString());
     }
 
-    return Pair.of(featureName, scenarioName.toString());
-  }
-
-  public static String getFeatureName(TestDescriptor testDescriptor) {
-    UniqueId uniqueId = testDescriptor.getUniqueId();
-    List<UniqueId.Segment> segments = uniqueId.getSegments();
-    ListIterator<UniqueId.Segment> it = segments.listIterator(segments.size());
-    while (it.hasPrevious()) {
-      UniqueId.Segment segment = it.previous();
-      if ("feature".equals(segment.getType())) {
-        return segment.getValue() + ":" + testDescriptor.getLegacyReportingName();
-      }
+    public static String getFeatureName(TestDescriptor testDescriptor) {
+        UniqueId uniqueId = testDescriptor.getUniqueId();
+        List<UniqueId.Segment> segments = uniqueId.getSegments();
+        ListIterator<UniqueId.Segment> it = segments.listIterator(segments.size());
+        while (it.hasPrevious()) {
+            UniqueId.Segment segment = it.previous();
+            if ("feature".equals(segment.getType())) {
+                return segment.getValue() + ":" + testDescriptor.getLegacyReportingName();
+            }
+        }
+        return testDescriptor.getLegacyReportingName();
     }
-    return testDescriptor.getLegacyReportingName();
-  }
 
-  public static boolean isFeature(UniqueId uniqueId) {
-    UniqueId.Segment lastSegment = uniqueId.getLastSegment();
-    return "feature".equals(lastSegment.getType());
-  }
+    public static boolean isFeature(UniqueId uniqueId) {
+        UniqueId.Segment lastSegment = uniqueId.getLastSegment();
+        return "feature".equals(lastSegment.getType());
+    }
 
-  public static TestDescriptor getFeatureDescriptor(TestDescriptor testDescriptor) {
-    while (testDescriptor != null && !isFeature(testDescriptor.getUniqueId())) {
-      testDescriptor = testDescriptor.getParent().orElse(null);
+    public static TestDescriptor getFeatureDescriptor(TestDescriptor testDescriptor) {
+        while (testDescriptor != null && !isFeature(testDescriptor.getUniqueId())) {
+            testDescriptor = testDescriptor.getParent().orElse(null);
+        }
+        return testDescriptor;
     }
-    return testDescriptor;
-  }
-
-  public static TestIdentifier toTestIdentifier(TestDescriptor testDescriptor) {
-    TestSource testSource = testDescriptor.getSource().orElse(null);
-    if (testSource instanceof ClasspathResourceSource) {
-      ClasspathResourceSource classpathResourceSource = (ClasspathResourceSource) testSource;
-      String classpathResourceName = classpathResourceSource.getClasspathResourceName();
-
-      Pair<String, String> names =
-          getFeatureAndScenarioNames(testDescriptor, classpathResourceName);
-      String testSuiteName = names.getLeft();
-      String testName = names.getRight();
-      return new TestIdentifier(testSuiteName, testName, null);
-
-    } else {
-      return null;
+
+    public static TestIdentifier toTestIdentifier(TestDescriptor testDescriptor) {
+        TestSource testSource = testDescriptor.getSource().orElse(null);
+        if (testSource instanceof ClasspathResourceSource) {
+            ClasspathResourceSource classpathResourceSource = (ClasspathResourceSource) testSource;
+            String classpathResourceName = classpathResourceSource.getClasspathResourceName();
+
+            Pair<String, String> names = getFeatureAndScenarioNames(testDescriptor, classpathResourceName);
+            String testSuiteName = names.getLeft();
+            String testName = names.getRight();
+            return new TestIdentifier(testSuiteName, testName, null);
+
+        } else {
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/EmptyConfigurationParameters.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/EmptyConfigurationParameters.java
index 17bda38f082..5413b58d30e 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/EmptyConfigurationParameters.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/EmptyConfigurationParameters.java
@@ -13,22 +13,22 @@
 @SuppressWarnings("deprecation") // ConfigurationParameters#size() is deprecated in newer platforms
 public final class EmptyConfigurationParameters implements ConfigurationParameters {
 
-  @Override
-  public Optional<String> get(String key) {
-    return Optional.empty();
-  }
+    @Override
+    public Optional<String> get(String key) {
+        return Optional.empty();
+    }
 
-  @Override
-  public Optional<Boolean> getBoolean(String key) {
-    return Optional.empty();
-  }
+    @Override
+    public Optional<Boolean> getBoolean(String key) {
+        return Optional.empty();
+    }
 
-  @Override
-  public int size() {
-    return 0;
-  }
+    @Override
+    public int size() {
+        return 0;
+    }
 
-  public Set<String> keySet() {
-    return Collections.emptySet();
-  }
+    public Set<String> keySet() {
+        return Collections.emptySet();
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java
index 2ddb230ea86..fc83d6dde1b 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java
@@ -18,83 +18,81 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit5CucumberInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JUnit5CucumberInstrumentation() {
-    super("ci-visibility", "junit-5", "junit-5-cucumber");
-  }
+    public JUnit5CucumberInstrumentation() {
+        super("ci-visibility", "junit-5", "junit-5-cucumber");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("io.cucumber.junit.platform.engine.CucumberTestEngine");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("io.cucumber.junit.platform.engine.CucumberTestEngine");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".TestDataFactory",
-      packageName + ".JUnitPlatformUtils",
-      packageName + ".execution.RetryDescriptorFactory",
-      packageName + ".execution.RetryDescriptorFactories",
-      packageName + ".EmptyConfigurationParameters",
-      packageName + ".CucumberRetryDescriptorFactory",
-      packageName + ".CucumberUtils",
-      packageName + ".TestEventsHandlerHolder",
-      packageName + ".CucumberTracingListener",
-      packageName + ".CompositeEngineListener",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".TestDataFactory",
+            packageName + ".JUnitPlatformUtils",
+            packageName + ".execution.RetryDescriptorFactory",
+            packageName + ".execution.RetryDescriptorFactories",
+            packageName + ".EmptyConfigurationParameters",
+            packageName + ".CucumberRetryDescriptorFactory",
+            packageName + ".CucumberUtils",
+            packageName + ".TestEventsHandlerHolder",
+            packageName + ".CucumberTracingListener",
+            packageName + ".CompositeEngineListener",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("execute").and(takesArgument(0, named("org.junit.platform.engine.ExecutionRequest"))),
-        JUnit5CucumberInstrumentation.class.getName() + "$CucumberAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("execute").and(takesArgument(0, named("org.junit.platform.engine.ExecutionRequest"))),
+                JUnit5CucumberInstrumentation.class.getName() + "$CucumberAdvice");
+    }
 
-  @SuppressFBWarnings(
-      value = "UC_USELESS_OBJECT",
-      justification = "executionRequest is the argument of the original method")
-  public static class CucumberAdvice {
+    @SuppressFBWarnings(
+            value = "UC_USELESS_OBJECT",
+            justification = "executionRequest is the argument of the original method")
+    public static class CucumberAdvice {
 
-    @Advice.OnMethodEnter
-    public static void addTracingListener(
-        @Advice.This TestEngine testEngine,
-        @Advice.Argument(value = 0, readOnly = false) ExecutionRequest executionRequest) {
-      if (!(testEngine instanceof CucumberTestEngine)) {
-        // wrong test engine
-        return;
-      }
+        @Advice.OnMethodEnter
+        public static void addTracingListener(
+                @Advice.This TestEngine testEngine,
+                @Advice.Argument(value = 0, readOnly = false) ExecutionRequest executionRequest) {
+            if (!(testEngine instanceof CucumberTestEngine)) {
+                // wrong test engine
+                return;
+            }
 
-      if (JUnitPlatformUtils.isTestInProgress()) {
-        // a test case that is in progress starts a new JUnit instance.
-        // It might be done in order to achieve classloader isolation
-        // (for example, spring-boot uses this technique).
-        // We are already tracking the active test case,
-        // and do not want to report the "embedded" JUnit execution
-        // as a separate module
-        return;
-      }
+            if (JUnitPlatformUtils.isTestInProgress()) {
+                // a test case that is in progress starts a new JUnit instance.
+                // It might be done in order to achieve classloader isolation
+                // (for example, spring-boot uses this technique).
+                // We are already tracking the active test case,
+                // and do not want to report the "embedded" JUnit execution
+                // as a separate module
+                return;
+            }
 
-      CucumberTracingListener tracingListener = new CucumberTracingListener(testEngine);
-      EngineExecutionListener originalListener = executionRequest.getEngineExecutionListener();
-      EngineExecutionListener compositeListener =
-          new CompositeEngineListener(tracingListener, originalListener);
-      executionRequest =
-          new ExecutionRequest(
-              executionRequest.getRootTestDescriptor(),
-              compositeListener,
-              executionRequest.getConfigurationParameters());
-    }
+            CucumberTracingListener tracingListener = new CucumberTracingListener(testEngine);
+            EngineExecutionListener originalListener = executionRequest.getEngineExecutionListener();
+            EngineExecutionListener compositeListener = new CompositeEngineListener(tracingListener, originalListener);
+            executionRequest = new ExecutionRequest(
+                    executionRequest.getRootTestDescriptor(),
+                    compositeListener,
+                    executionRequest.getConfigurationParameters());
+        }
 
-    // JUnit 5.3.0 and above
-    public static void muzzleCheck(final SameThreadHierarchicalTestExecutorService service) {
-      service.invokeAll(null);
+        // JUnit 5.3.0 and above
+        public static void muzzleCheck(final SameThreadHierarchicalTestExecutorService service) {
+            service.invokeAll(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java
index 1833f955f40..66f996ef9c5 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java
@@ -25,110 +25,107 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit5CucumberSkipInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public JUnit5CucumberSkipInstrumentation() {
-    super("ci-visibility", "junit-5", "junit-5-cucumber");
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("io.cucumber.junit.platform.engine.CucumberTestEngine");
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled()
-        && (Config.get().isCiVisibilityTestSkippingEnabled()
-            || Config.get().isCiVisibilityTestManagementEnabled());
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.cucumber.junit.platform.engine.CucumberTestEngine";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("io.cucumber.junit.platform.engine.NodeDescriptor"))
-        // legacy Cucumber versions
-        .or(extendsClass(named("io.cucumber.junit.platform.engine.PickleDescriptor")))
-        // Cucumber 7.24+
-        .or(
-            extendsClass(
-                named(
-                    "io.cucumber.junit.platform.engine.CucumberTestDescriptor$PickleDescriptor")));
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".TestDataFactory",
-      packageName + ".JUnitPlatformUtils",
-      packageName + ".execution.RetryDescriptorFactory",
-      packageName + ".execution.RetryDescriptorFactories",
-      packageName + ".EmptyConfigurationParameters",
-      packageName + ".CucumberRetryDescriptorFactory",
-      packageName + ".CucumberUtils",
-      packageName + ".TestEventsHandlerHolder",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("shouldBeSkipped").and(takesArguments(1)),
-        JUnit5CucumberSkipInstrumentation.class.getName() + "$JUnit5SkipAdvice");
-  }
-
-  /**
-   * !!!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!!!! Do not use or refer to any classes from {@code
-   * org.junit.platform.launcher} package in here: in some Gradle projects this package is not
-   * available in CL where this instrumentation is injected
-   */
-  public static class JUnit5SkipAdvice {
-    @Advice.OnMethodExit
-    public static void shouldBeSkipped(
-        @Advice.This TestDescriptor testDescriptor,
-        @Advice.Return(readOnly = false) Node.SkipResult skipResult) {
-      if (skipResult.isSkipped()) {
-        return;
-      }
-
-      TestEventsHandler<TestDescriptor, TestDescriptor> testEventsHandler =
-          TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.CUCUMBER);
-
-      if (testEventsHandler == null) {
-        // should only happen in integration tests
-        // because we cannot avoid instrumenting ourselves
-        return;
-      }
-
-      TestIdentifier test = CucumberUtils.toTestIdentifier(testDescriptor);
-      if (test == null) {
-        return;
-      }
-
-      SkipReason skipReason = testEventsHandler.skipReason(test);
-      if (skipReason == null) {
-        return;
-      }
-
-      if (skipReason == SkipReason.ITR) {
-        Collection<TestTag> tags = testDescriptor.getTags();
-        for (TestTag tag : tags) {
-          if (CIConstants.Tags.ITR_UNSKIPPABLE_TAG.equals(tag.getName())) {
-            return;
-          }
-        }
-      }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public JUnit5CucumberSkipInstrumentation() {
+        super("ci-visibility", "junit-5", "junit-5-cucumber");
+    }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("io.cucumber.junit.platform.engine.CucumberTestEngine");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled()
+                && (Config.get().isCiVisibilityTestSkippingEnabled()
+                        || Config.get().isCiVisibilityTestManagementEnabled());
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.cucumber.junit.platform.engine.CucumberTestEngine";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("io.cucumber.junit.platform.engine.NodeDescriptor"))
+                // legacy Cucumber versions
+                .or(extendsClass(named("io.cucumber.junit.platform.engine.PickleDescriptor")))
+                // Cucumber 7.24+
+                .or(extendsClass(named("io.cucumber.junit.platform.engine.CucumberTestDescriptor$PickleDescriptor")));
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".TestDataFactory",
+            packageName + ".JUnitPlatformUtils",
+            packageName + ".execution.RetryDescriptorFactory",
+            packageName + ".execution.RetryDescriptorFactories",
+            packageName + ".EmptyConfigurationParameters",
+            packageName + ".CucumberRetryDescriptorFactory",
+            packageName + ".CucumberUtils",
+            packageName + ".TestEventsHandlerHolder",
+        };
+    }
 
-      skipResult = Node.SkipResult.skip(skipReason.getDescription());
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("shouldBeSkipped").and(takesArguments(1)),
+                JUnit5CucumberSkipInstrumentation.class.getName() + "$JUnit5SkipAdvice");
     }
 
-    // JUnit 5.3.0 and above
-    public static void muzzleCheck(final SameThreadHierarchicalTestExecutorService service) {
-      service.invokeAll(null);
+    /**
+     * !!!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!!!! Do not use or refer to any classes from {@code
+     * org.junit.platform.launcher} package in here: in some Gradle projects this package is not
+     * available in CL where this instrumentation is injected
+     */
+    public static class JUnit5SkipAdvice {
+        @Advice.OnMethodExit
+        public static void shouldBeSkipped(
+                @Advice.This TestDescriptor testDescriptor,
+                @Advice.Return(readOnly = false) Node.SkipResult skipResult) {
+            if (skipResult.isSkipped()) {
+                return;
+            }
+
+            TestEventsHandler<TestDescriptor, TestDescriptor> testEventsHandler =
+                    TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.CUCUMBER);
+
+            if (testEventsHandler == null) {
+                // should only happen in integration tests
+                // because we cannot avoid instrumenting ourselves
+                return;
+            }
+
+            TestIdentifier test = CucumberUtils.toTestIdentifier(testDescriptor);
+            if (test == null) {
+                return;
+            }
+
+            SkipReason skipReason = testEventsHandler.skipReason(test);
+            if (skipReason == null) {
+                return;
+            }
+
+            if (skipReason == SkipReason.ITR) {
+                Collection<TestTag> tags = testDescriptor.getTags();
+                for (TestTag tag : tags) {
+                    if (CIConstants.Tags.ITR_UNSKIPPABLE_TAG.equals(tag.getName())) {
+                        return;
+                    }
+                }
+            }
+
+            skipResult = Node.SkipResult.skip(skipReason.getDescription());
+        }
+
+        // JUnit 5.3.0 and above
+        public static void muzzleCheck(final SameThreadHierarchicalTestExecutorService service) {
+            service.invokeAll(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
index 0af346fee0f..f52aca1a072 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
@@ -12,123 +12,123 @@
 
 public class CalculatorSteps {
 
-  private Calculator calc;
-
-  private static int flakyCounter = 0;
-
-  @Given("a calculator I just turned on")
-  public void a_calculator_I_just_turned_on() {
-    calc = new Calculator();
-  }
-
-  @Given("a flaky calculator I just turned on")
-  public void a_flaky_calculator_I_just_turned_on() {
-    calc = new Calculator(++flakyCounter < 3);
-  }
-
-  @When("I add {int} and {int}")
-  public void adding(int arg1, int arg2) {
-    calc.push(arg1);
-    calc.push(arg2);
-    calc.push("+");
-  }
-
-  @When("I slowly add {int} and {int}")
-  public void addingSlow(int arg1, int arg2) throws InterruptedException {
-    Thread.sleep(1100);
-    calc.push(arg1);
-    calc.push(arg2);
-    calc.push("+");
-  }
-
-  @Given("^I press (.+)$")
-  public void I_press(String what) {
-    calc.push(what);
-  }
-
-  @Then("the result is {int}")
-  public void the_result_is(double expected) {
-    assertEquals(expected, calc.value());
-  }
-
-  @Given("the previous entries:")
-  public void thePreviousEntries(List<Entry> entries) {
-    for (Entry entry : entries) {
-      calc.push(entry.first);
-      calc.push(entry.second);
-      calc.push(entry.operation);
-    }
-  }
+    private Calculator calc;
 
-  static final class Entry {
+    private static int flakyCounter = 0;
 
-    private Integer first;
-    private Integer second;
-    private String operation;
+    @Given("a calculator I just turned on")
+    public void a_calculator_I_just_turned_on() {
+        calc = new Calculator();
+    }
 
-    public Integer getFirst() {
-      return first;
+    @Given("a flaky calculator I just turned on")
+    public void a_flaky_calculator_I_just_turned_on() {
+        calc = new Calculator(++flakyCounter < 3);
     }
 
-    public void setFirst(Integer first) {
-      this.first = first;
+    @When("I add {int} and {int}")
+    public void adding(int arg1, int arg2) {
+        calc.push(arg1);
+        calc.push(arg2);
+        calc.push("+");
     }
 
-    public Integer getSecond() {
-      return second;
+    @When("I slowly add {int} and {int}")
+    public void addingSlow(int arg1, int arg2) throws InterruptedException {
+        Thread.sleep(1100);
+        calc.push(arg1);
+        calc.push(arg2);
+        calc.push("+");
     }
 
-    public void setSecond(Integer second) {
-      this.second = second;
+    @Given("^I press (.+)$")
+    public void I_press(String what) {
+        calc.push(what);
     }
 
-    public String getOperation() {
-      return operation;
+    @Then("the result is {int}")
+    public void the_result_is(double expected) {
+        assertEquals(expected, calc.value());
     }
 
-    public void setOperation(String operation) {
-      this.operation = operation;
+    @Given("the previous entries:")
+    public void thePreviousEntries(List<Entry> entries) {
+        for (Entry entry : entries) {
+            calc.push(entry.first);
+            calc.push(entry.second);
+            calc.push(entry.operation);
+        }
     }
-  }
 
-  static class Calculator {
-    private static final List<String> OPS = asList("-", "+", "*", "/");
-    private final Deque<Number> stack = new LinkedList<>();
-    private final boolean broken;
+    static final class Entry {
 
-    public Calculator() {
-      this(false);
-    }
+        private Integer first;
+        private Integer second;
+        private String operation;
 
-    public Calculator(boolean broken) {
-      this.broken = broken;
-    }
+        public Integer getFirst() {
+            return first;
+        }
+
+        public void setFirst(Integer first) {
+            this.first = first;
+        }
+
+        public Integer getSecond() {
+            return second;
+        }
+
+        public void setSecond(Integer second) {
+            this.second = second;
+        }
+
+        public String getOperation() {
+            return operation;
+        }
 
-    public void push(Object arg) {
-      if (OPS.contains(arg)) {
-        Number y = stack.removeLast();
-        Number x = stack.isEmpty() ? 0 : stack.removeLast();
-        Double val = null;
-        if (arg.equals("-")) {
-          val = x.doubleValue() - y.doubleValue();
-        } else if (arg.equals("+")) {
-          val = x.doubleValue() + y.doubleValue();
-        } else if (arg.equals("*")) {
-          val = x.doubleValue() * y.doubleValue();
-        } else if (arg.equals("/")) {
-          val = x.doubleValue() / y.doubleValue();
+        public void setOperation(String operation) {
+            this.operation = operation;
         }
-        push(val);
-      } else {
-        stack.add((Number) arg);
-      }
     }
 
-    public Number value() {
-      if (broken) {
-        throw new RuntimeException("This test is flaky");
-      }
-      return stack.getLast();
+    static class Calculator {
+        private static final List<String> OPS = asList("-", "+", "*", "/");
+        private final Deque<Number> stack = new LinkedList<>();
+        private final boolean broken;
+
+        public Calculator() {
+            this(false);
+        }
+
+        public Calculator(boolean broken) {
+            this.broken = broken;
+        }
+
+        public void push(Object arg) {
+            if (OPS.contains(arg)) {
+                Number y = stack.removeLast();
+                Number x = stack.isEmpty() ? 0 : stack.removeLast();
+                Double val = null;
+                if (arg.equals("-")) {
+                    val = x.doubleValue() - y.doubleValue();
+                } else if (arg.equals("+")) {
+                    val = x.doubleValue() + y.doubleValue();
+                } else if (arg.equals("*")) {
+                    val = x.doubleValue() * y.doubleValue();
+                } else if (arg.equals("/")) {
+                    val = x.doubleValue() / y.doubleValue();
+                }
+                push(val);
+            } else {
+                stack.add((Number) arg);
+            }
+        }
+
+        public Number value() {
+            if (broken) {
+                throw new RuntimeException("This test is flaky");
+            }
+            return stack.getLast();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/java/org/example/cucumber/calculator/ParameterTypes.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/java/org/example/cucumber/calculator/ParameterTypes.java
index f9f38c0b085..3d3ef6c1fed 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/java/org/example/cucumber/calculator/ParameterTypes.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/java/org/example/cucumber/calculator/ParameterTypes.java
@@ -8,12 +8,12 @@
 
 public class ParameterTypes {
 
-  private final ObjectMapper objectMapper = new ObjectMapper();
+    private final ObjectMapper objectMapper = new ObjectMapper();
 
-  @DefaultParameterTransformer
-  @DefaultDataTableEntryTransformer
-  @DefaultDataTableCellTransformer
-  public Object transformer(Object fromValue, Type toValueType) {
-    return objectMapper.convertValue(fromValue, objectMapper.constructType(toValueType));
-  }
+    @DefaultParameterTransformer
+    @DefaultDataTableEntryTransformer
+    @DefaultDataTableCellTransformer
+    public Object transformer(Object fromValue, Type toValueType) {
+        return objectMapper.convertValue(fromValue, objectMapper.constructType(toValueType));
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java
index 2871d8ff26d..8fcfe4f0d0d 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java
@@ -18,82 +18,80 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit5SpockInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JUnit5SpockInstrumentation() {
-    super("ci-visibility", "junit-5", "junit-5-spock");
-  }
+    public JUnit5SpockInstrumentation() {
+        super("ci-visibility", "junit-5", "junit-5-spock");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("org.spockframework.runtime.SpockEngine");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("org.spockframework.runtime.SpockEngine");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".JUnitPlatformUtils",
-      packageName + ".TestDataFactory",
-      packageName + ".execution.RetryDescriptorFactory",
-      packageName + ".execution.RetryDescriptorFactories",
-      packageName + ".SpockRetryDescriptorFactory",
-      packageName + ".SpockUtils",
-      packageName + ".TestEventsHandlerHolder",
-      packageName + ".SpockTracingListener",
-      packageName + ".CompositeEngineListener",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".JUnitPlatformUtils",
+            packageName + ".TestDataFactory",
+            packageName + ".execution.RetryDescriptorFactory",
+            packageName + ".execution.RetryDescriptorFactories",
+            packageName + ".SpockRetryDescriptorFactory",
+            packageName + ".SpockUtils",
+            packageName + ".TestEventsHandlerHolder",
+            packageName + ".SpockTracingListener",
+            packageName + ".CompositeEngineListener",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("execute").and(takesArgument(0, named("org.junit.platform.engine.ExecutionRequest"))),
-        JUnit5SpockInstrumentation.class.getName() + "$SpockAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("execute").and(takesArgument(0, named("org.junit.platform.engine.ExecutionRequest"))),
+                JUnit5SpockInstrumentation.class.getName() + "$SpockAdvice");
+    }
 
-  @SuppressFBWarnings(
-      value = "UC_USELESS_OBJECT",
-      justification = "executionRequest is the argument of the original method")
-  public static class SpockAdvice {
+    @SuppressFBWarnings(
+            value = "UC_USELESS_OBJECT",
+            justification = "executionRequest is the argument of the original method")
+    public static class SpockAdvice {
 
-    @Advice.OnMethodEnter
-    public static void addTracingListener(
-        @Advice.This TestEngine testEngine,
-        @Advice.Argument(value = 0, readOnly = false) ExecutionRequest executionRequest) {
-      if (!(testEngine instanceof SpockEngine)) {
-        // wrong test engine
-        return;
-      }
+        @Advice.OnMethodEnter
+        public static void addTracingListener(
+                @Advice.This TestEngine testEngine,
+                @Advice.Argument(value = 0, readOnly = false) ExecutionRequest executionRequest) {
+            if (!(testEngine instanceof SpockEngine)) {
+                // wrong test engine
+                return;
+            }
 
-      if (JUnitPlatformUtils.isTestInProgress()) {
-        // a test case that is in progress starts a new JUnit instance.
-        // It might be done in order to achieve classloader isolation
-        // (for example, spring-boot uses this technique).
-        // We are already tracking the active test case,
-        // and do not want to report the "embedded" JUnit execution
-        // as a separate module
-        return;
-      }
+            if (JUnitPlatformUtils.isTestInProgress()) {
+                // a test case that is in progress starts a new JUnit instance.
+                // It might be done in order to achieve classloader isolation
+                // (for example, spring-boot uses this technique).
+                // We are already tracking the active test case,
+                // and do not want to report the "embedded" JUnit execution
+                // as a separate module
+                return;
+            }
 
-      SpockTracingListener tracingListener = new SpockTracingListener(testEngine);
-      EngineExecutionListener originalListener = executionRequest.getEngineExecutionListener();
-      EngineExecutionListener compositeListener =
-          new CompositeEngineListener(tracingListener, originalListener);
-      executionRequest =
-          new ExecutionRequest(
-              executionRequest.getRootTestDescriptor(),
-              compositeListener,
-              executionRequest.getConfigurationParameters());
-    }
+            SpockTracingListener tracingListener = new SpockTracingListener(testEngine);
+            EngineExecutionListener originalListener = executionRequest.getEngineExecutionListener();
+            EngineExecutionListener compositeListener = new CompositeEngineListener(tracingListener, originalListener);
+            executionRequest = new ExecutionRequest(
+                    executionRequest.getRootTestDescriptor(),
+                    compositeListener,
+                    executionRequest.getConfigurationParameters());
+        }
 
-    // JUnit 5.3.0 and above
-    public static void muzzleCheck(final SameThreadHierarchicalTestExecutorService service) {
-      service.invokeAll(null);
+        // JUnit 5.3.0 and above
+        public static void muzzleCheck(final SameThreadHierarchicalTestExecutorService service) {
+            service.invokeAll(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockSkipInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockSkipInstrumentation.java
index 023f0d53ac5..0e6c2375e5f 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockSkipInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockSkipInstrumentation.java
@@ -26,143 +26,142 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit5SpockSkipInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public JUnit5SpockSkipInstrumentation() {
-    super("ci-visibility", "junit-5", "junit-5-spock");
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("org.spockframework.runtime.SpockEngine");
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled()
-        && (Config.get().isCiVisibilityTestSkippingEnabled()
-            || Config.get().isCiVisibilityTestManagementEnabled());
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.spockframework.runtime.SpockNode";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".JUnitPlatformUtils",
-      packageName + ".TestDataFactory",
-      packageName + ".execution.RetryDescriptorFactory",
-      packageName + ".execution.RetryDescriptorFactories",
-      packageName + ".SpockRetryDescriptorFactory",
-      packageName + ".SpockUtils",
-      packageName + ".TestEventsHandlerHolder",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("shouldBeSkipped").and(takesArguments(1)),
-        JUnit5SpockSkipInstrumentation.class.getName() + "$JUnit5SkipAdvice");
-  }
-
-  /**
-   * !!!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!!!! Do not use or refer to any classes from {@code
-   * org.junit.platform.launcher} package in here: in some Gradle projects this package is not
-   * available in CL where this instrumentation is injected
-   */
-  public static class JUnit5SkipAdvice {
-
-    @Advice.OnMethodEnter
-    public static void beforeSkipCheck() {
-      CallDepthThreadLocalMap.incrementCallDepth(SpockNode.class);
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public JUnit5SpockSkipInstrumentation() {
+        super("ci-visibility", "junit-5", "junit-5-spock");
     }
 
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @Advice.OnMethodExit
-    public static void shouldBeSkipped(
-        @Advice.This SpockNode<?> spockNode,
-        @Advice.Return(readOnly = false) Node.SkipResult skipResult) {
-      if (CallDepthThreadLocalMap.decrementCallDepth(SpockNode.class) > 0) {
-        // nested call
-        return;
-      }
-
-      if (skipResult.isSkipped()) {
-        return;
-      }
-
-      TestEventsHandler<TestDescriptor, TestDescriptor> testEventsHandler =
-          TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.SPOCK);
-
-      if (testEventsHandler == null) {
-        // should only happen in integration tests
-        // because we cannot avoid instrumenting ourselves
-        return;
-      }
-
-      if (spockNode instanceof SpecNode) {
-        // suite
-        SpecNode specNode = (SpecNode) spockNode;
-        Set<? extends TestDescriptor> features = specNode.getChildren();
-
-        SkipReason suiteSkipReason = null;
-        for (TestDescriptor feature : features) {
-          if (feature instanceof SpockNode && SpockUtils.isItrUnskippable((SpockNode<?>) feature)) {
-            return;
-          }
-
-          TestIdentifier featureIdentifier = SpockUtils.toTestIdentifier(feature);
-          if (featureIdentifier == null) {
-            return;
-          }
-          SkipReason skipReason = testEventsHandler.skipReason(featureIdentifier);
-          if (skipReason == null) {
-            return;
-          }
-          if (suiteSkipReason != null && suiteSkipReason != skipReason) {
-            // we cannot have a mix of skip reasons in the suite for technical reasons
-            return;
-          }
-          suiteSkipReason = skipReason;
-        }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("org.spockframework.runtime.SpockEngine");
+    }
 
-        if (suiteSkipReason == null) {
-          return;
-        }
-        if (suiteSkipReason == SkipReason.ITR && SpockUtils.isItrUnskippable(specNode)) {
-          return;
-        }
-        skipResult = Node.SkipResult.skip(suiteSkipReason.getDescription());
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled()
+                && (Config.get().isCiVisibilityTestSkippingEnabled()
+                        || Config.get().isCiVisibilityTestManagementEnabled());
+    }
 
-      } else {
-        // individual test case
-        TestIdentifier test = SpockUtils.toTestIdentifier(spockNode);
-        if (test == null) {
-          return;
-        }
-        SkipReason skipReason = testEventsHandler.skipReason(test);
-        if (skipReason == null) {
-          return;
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.spockframework.runtime.SpockNode";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".JUnitPlatformUtils",
+            packageName + ".TestDataFactory",
+            packageName + ".execution.RetryDescriptorFactory",
+            packageName + ".execution.RetryDescriptorFactories",
+            packageName + ".SpockRetryDescriptorFactory",
+            packageName + ".SpockUtils",
+            packageName + ".TestEventsHandlerHolder",
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("shouldBeSkipped").and(takesArguments(1)),
+                JUnit5SpockSkipInstrumentation.class.getName() + "$JUnit5SkipAdvice");
+    }
+
+    /**
+     * !!!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!!!! Do not use or refer to any classes from {@code
+     * org.junit.platform.launcher} package in here: in some Gradle projects this package is not
+     * available in CL where this instrumentation is injected
+     */
+    public static class JUnit5SkipAdvice {
+
+        @Advice.OnMethodEnter
+        public static void beforeSkipCheck() {
+            CallDepthThreadLocalMap.incrementCallDepth(SpockNode.class);
         }
-        if (skipReason == SkipReason.ITR && SpockUtils.isItrUnskippable(spockNode)) {
-          return;
+
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @Advice.OnMethodExit
+        public static void shouldBeSkipped(
+                @Advice.This SpockNode<?> spockNode, @Advice.Return(readOnly = false) Node.SkipResult skipResult) {
+            if (CallDepthThreadLocalMap.decrementCallDepth(SpockNode.class) > 0) {
+                // nested call
+                return;
+            }
+
+            if (skipResult.isSkipped()) {
+                return;
+            }
+
+            TestEventsHandler<TestDescriptor, TestDescriptor> testEventsHandler =
+                    TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.SPOCK);
+
+            if (testEventsHandler == null) {
+                // should only happen in integration tests
+                // because we cannot avoid instrumenting ourselves
+                return;
+            }
+
+            if (spockNode instanceof SpecNode) {
+                // suite
+                SpecNode specNode = (SpecNode) spockNode;
+                Set<? extends TestDescriptor> features = specNode.getChildren();
+
+                SkipReason suiteSkipReason = null;
+                for (TestDescriptor feature : features) {
+                    if (feature instanceof SpockNode && SpockUtils.isItrUnskippable((SpockNode<?>) feature)) {
+                        return;
+                    }
+
+                    TestIdentifier featureIdentifier = SpockUtils.toTestIdentifier(feature);
+                    if (featureIdentifier == null) {
+                        return;
+                    }
+                    SkipReason skipReason = testEventsHandler.skipReason(featureIdentifier);
+                    if (skipReason == null) {
+                        return;
+                    }
+                    if (suiteSkipReason != null && suiteSkipReason != skipReason) {
+                        // we cannot have a mix of skip reasons in the suite for technical reasons
+                        return;
+                    }
+                    suiteSkipReason = skipReason;
+                }
+
+                if (suiteSkipReason == null) {
+                    return;
+                }
+                if (suiteSkipReason == SkipReason.ITR && SpockUtils.isItrUnskippable(specNode)) {
+                    return;
+                }
+                skipResult = Node.SkipResult.skip(suiteSkipReason.getDescription());
+
+            } else {
+                // individual test case
+                TestIdentifier test = SpockUtils.toTestIdentifier(spockNode);
+                if (test == null) {
+                    return;
+                }
+                SkipReason skipReason = testEventsHandler.skipReason(test);
+                if (skipReason == null) {
+                    return;
+                }
+                if (skipReason == SkipReason.ITR && SpockUtils.isItrUnskippable(spockNode)) {
+                    return;
+                }
+                skipResult = Node.SkipResult.skip(skipReason.getDescription());
+            }
         }
-        skipResult = Node.SkipResult.skip(skipReason.getDescription());
-      }
-    }
 
-    // JUnit 5.3.0 and above
-    public static void muzzleCheck(final SameThreadHierarchicalTestExecutorService service) {
-      service.invokeAll(null);
+        // JUnit 5.3.0 and above
+        public static void muzzleCheck(final SameThreadHierarchicalTestExecutorService service) {
+            service.invokeAll(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/SpockRetryDescriptorFactory.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/SpockRetryDescriptorFactory.java
index 8c87bf0b775..18ca082c036 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/SpockRetryDescriptorFactory.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/SpockRetryDescriptorFactory.java
@@ -23,77 +23,67 @@
  */
 public final class SpockRetryDescriptorFactory implements RetryDescriptorFactory {
 
-  private static final MethodHandles METHOD_HANDLES =
-      new MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
+    private static final MethodHandles METHOD_HANDLES = new MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
 
-  private static final MethodHandle SIMPLE_FEATURE_NODE_CONSTRUCTOR =
-      METHOD_HANDLES.constructor(
-          SimpleFeatureNode.class,
-          UniqueId.class,
-          RunnerConfiguration.class,
-          FeatureInfo.class,
-          IterationNode.class);
+    private static final MethodHandle SIMPLE_FEATURE_NODE_CONSTRUCTOR = METHOD_HANDLES.constructor(
+            SimpleFeatureNode.class, UniqueId.class, RunnerConfiguration.class, FeatureInfo.class, IterationNode.class);
 
-  private static final MethodHandle ITERATION_NODE_CONSTRUCTOR =
-      METHOD_HANDLES.constructor(
-          IterationNode.class, UniqueId.class, RunnerConfiguration.class, IterationInfo.class);
+    private static final MethodHandle ITERATION_NODE_CONSTRUCTOR = METHOD_HANDLES.constructor(
+            IterationNode.class, UniqueId.class, RunnerConfiguration.class, IterationInfo.class);
 
-  private static final MethodHandle SIMPLE_FEATURE_NODE_DELEGATE =
-      METHOD_HANDLES.privateFieldGetter(SimpleFeatureNode.class, "delegate");
+    private static final MethodHandle SIMPLE_FEATURE_NODE_DELEGATE =
+            METHOD_HANDLES.privateFieldGetter(SimpleFeatureNode.class, "delegate");
 
-  private static final MethodHandle ITERATION_NODE_INFO =
-      METHOD_HANDLES.privateFieldGetter(IterationNode.class, "iterationInfo");
+    private static final MethodHandle ITERATION_NODE_INFO =
+            METHOD_HANDLES.privateFieldGetter(IterationNode.class, "iterationInfo");
 
-  @Override
-  public TestDescriptor copy(TestDescriptor original, UnaryOperator<UniqueId> idTransform) {
-    if (original instanceof SimpleFeatureNode) {
-      return copySimpleFeatureNode((SimpleFeatureNode) original, idTransform);
+    @Override
+    public TestDescriptor copy(TestDescriptor original, UnaryOperator<UniqueId> idTransform) {
+        if (original instanceof SimpleFeatureNode) {
+            return copySimpleFeatureNode((SimpleFeatureNode) original, idTransform);
+        }
+        if (original instanceof IterationNode) {
+            return copyIterationNode((IterationNode) original, idTransform);
+        }
+        return null; // unknown Spock node type -> fall back to the generic clone
     }
-    if (original instanceof IterationNode) {
-      return copyIterationNode((IterationNode) original, idTransform);
-    }
-    return null; // unknown Spock node type -> fall back to the generic clone
-  }
 
-  private static TestDescriptor copySimpleFeatureNode(
-      SimpleFeatureNode original, UnaryOperator<UniqueId> idTransform) {
-    if (SIMPLE_FEATURE_NODE_CONSTRUCTOR == null || ITERATION_NODE_CONSTRUCTOR == null) {
-      return null;
-    }
-    RunnerConfiguration configuration = original.getConfiguration();
-    FeatureInfo featureInfo = original.getNodeInfo();
-    IterationNode originalDelegate = METHOD_HANDLES.invoke(SIMPLE_FEATURE_NODE_DELEGATE, original);
-    if (originalDelegate == null) {
-      return null;
-    }
-    IterationInfo iterationInfo = METHOD_HANDLES.invoke(ITERATION_NODE_INFO, originalDelegate);
+    private static TestDescriptor copySimpleFeatureNode(
+            SimpleFeatureNode original, UnaryOperator<UniqueId> idTransform) {
+        if (SIMPLE_FEATURE_NODE_CONSTRUCTOR == null || ITERATION_NODE_CONSTRUCTOR == null) {
+            return null;
+        }
+        RunnerConfiguration configuration = original.getConfiguration();
+        FeatureInfo featureInfo = original.getNodeInfo();
+        IterationNode originalDelegate = METHOD_HANDLES.invoke(SIMPLE_FEATURE_NODE_DELEGATE, original);
+        if (originalDelegate == null) {
+            return null;
+        }
+        IterationInfo iterationInfo = METHOD_HANDLES.invoke(ITERATION_NODE_INFO, originalDelegate);
 
-    UniqueId newId = idTransform.apply(original.getUniqueId());
-    // keep the delegate a proper child of the copy and distinct across attempts
-    UniqueId.Segment delegateSegment = originalDelegate.getUniqueId().getLastSegment();
-    UniqueId newDelegateId = newId.append(delegateSegment.getType(), delegateSegment.getValue());
+        UniqueId newId = idTransform.apply(original.getUniqueId());
+        // keep the delegate a proper child of the copy and distinct across attempts
+        UniqueId.Segment delegateSegment = originalDelegate.getUniqueId().getLastSegment();
+        UniqueId newDelegateId = newId.append(delegateSegment.getType(), delegateSegment.getValue());
 
-    IterationNode delegate =
-        METHOD_HANDLES.invoke(
-            ITERATION_NODE_CONSTRUCTOR, newDelegateId, configuration, iterationInfo);
-    if (delegate == null) {
-      return null;
+        IterationNode delegate =
+                METHOD_HANDLES.invoke(ITERATION_NODE_CONSTRUCTOR, newDelegateId, configuration, iterationInfo);
+        if (delegate == null) {
+            return null;
+        }
+        return METHOD_HANDLES.invoke(SIMPLE_FEATURE_NODE_CONSTRUCTOR, newId, configuration, featureInfo, delegate);
     }
-    return METHOD_HANDLES.invoke(
-        SIMPLE_FEATURE_NODE_CONSTRUCTOR, newId, configuration, featureInfo, delegate);
-  }
 
-  private static TestDescriptor copyIterationNode(
-      IterationNode original, UnaryOperator<UniqueId> idTransform) {
-    if (ITERATION_NODE_CONSTRUCTOR == null) {
-      return null;
-    }
-    RunnerConfiguration configuration = original.getConfiguration();
-    IterationInfo iterationInfo = METHOD_HANDLES.invoke(ITERATION_NODE_INFO, original);
-    if (iterationInfo == null) {
-      return null;
+    private static TestDescriptor copyIterationNode(IterationNode original, UnaryOperator<UniqueId> idTransform) {
+        if (ITERATION_NODE_CONSTRUCTOR == null) {
+            return null;
+        }
+        RunnerConfiguration configuration = original.getConfiguration();
+        IterationInfo iterationInfo = METHOD_HANDLES.invoke(ITERATION_NODE_INFO, original);
+        if (iterationInfo == null) {
+            return null;
+        }
+        UniqueId newId = idTransform.apply(original.getUniqueId());
+        return METHOD_HANDLES.invoke(ITERATION_NODE_CONSTRUCTOR, newId, configuration, iterationInfo);
     }
-    UniqueId newId = idTransform.apply(original.getUniqueId());
-    return METHOD_HANDLES.invoke(ITERATION_NODE_CONSTRUCTOR, newId, configuration, iterationInfo);
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java
index d6319c0fc5d..67ae197f5b1 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java
@@ -17,229 +17,221 @@
 
 public class SpockTracingListener implements EngineExecutionListener {
 
-  private final String testFramework;
-  private final String testFrameworkVersion;
-
-  public SpockTracingListener(TestEngine testEngine) {
-    testFramework = testEngine.getId();
-    testFrameworkVersion = JUnitPlatformUtils.getFrameworkVersion(testEngine);
-  }
-
-  @Override
-  public void dynamicTestRegistered(TestDescriptor testDescriptor) {
-    // no op
-  }
-
-  @Override
-  public void reportingEntryPublished(TestDescriptor testDescriptor, ReportEntry entry) {
-    // no op
-  }
-
-  @Override
-  public void executionStarted(final TestDescriptor descriptor) {
-    if (descriptor.isContainer()) {
-      containerExecutionStarted(descriptor);
-    } else if (descriptor.isTest()) {
-      testCaseExecutionStarted(descriptor);
+    private final String testFramework;
+    private final String testFrameworkVersion;
+
+    public SpockTracingListener(TestEngine testEngine) {
+        testFramework = testEngine.getId();
+        testFrameworkVersion = JUnitPlatformUtils.getFrameworkVersion(testEngine);
     }
-  }
-
-  @Override
-  public void executionFinished(
-      TestDescriptor descriptor, TestExecutionResult testExecutionResult) {
-    if (descriptor.isContainer()) {
-      containerExecutionFinished(descriptor, testExecutionResult);
-    } else if (descriptor.isTest()) {
-      testCaseExecutionFinished(descriptor, testExecutionResult);
+
+    @Override
+    public void dynamicTestRegistered(TestDescriptor testDescriptor) {
+        // no op
     }
-  }
 
-  private void containerExecutionStarted(final TestDescriptor suiteDescriptor) {
-    if (!SpockUtils.isSpec(suiteDescriptor)) {
-      return;
+    @Override
+    public void reportingEntryPublished(TestDescriptor testDescriptor, ReportEntry entry) {
+        // no op
+    }
+
+    @Override
+    public void executionStarted(final TestDescriptor descriptor) {
+        if (descriptor.isContainer()) {
+            containerExecutionStarted(descriptor);
+        } else if (descriptor.isTest()) {
+            testCaseExecutionStarted(descriptor);
+        }
     }
 
-    Class<?> testClass = JUnitPlatformUtils.getJavaClass(suiteDescriptor);
-    String testSuiteName =
-        testClass != null ? testClass.getName() : suiteDescriptor.getLegacyReportingName();
-    List<String> tags =
-        suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.SPOCK)
-        .onTestSuiteStart(
-            suiteDescriptor,
-            testSuiteName,
-            testFramework,
-            testFrameworkVersion,
-            testClass,
-            tags,
-            false,
-            TestFrameworkInstrumentation.SPOCK,
-            null);
-  }
-
-  private void containerExecutionFinished(
-      final TestDescriptor suiteDescriptor, final TestExecutionResult testExecutionResult) {
-    if (!SpockUtils.isSpec(suiteDescriptor)) {
-      return;
+    @Override
+    public void executionFinished(TestDescriptor descriptor, TestExecutionResult testExecutionResult) {
+        if (descriptor.isContainer()) {
+            containerExecutionFinished(descriptor, testExecutionResult);
+        } else if (descriptor.isTest()) {
+            testCaseExecutionFinished(descriptor, testExecutionResult);
+        }
     }
 
-    Throwable throwable = testExecutionResult.getThrowable().orElse(null);
-    if (throwable != null) {
-      if (JUnitPlatformUtils.isAssumptionFailure(throwable)) {
+    private void containerExecutionStarted(final TestDescriptor suiteDescriptor) {
+        if (!SpockUtils.isSpec(suiteDescriptor)) {
+            return;
+        }
 
-        String reason = throwable.getMessage();
+        Class<?> testClass = JUnitPlatformUtils.getJavaClass(suiteDescriptor);
+        String testSuiteName = testClass != null ? testClass.getName() : suiteDescriptor.getLegacyReportingName();
+        List<String> tags =
+                suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
         TestEventsHandlerHolder.HANDLERS
-            .get(TestFrameworkInstrumentation.SPOCK)
-            .onTestSuiteSkip(suiteDescriptor, reason);
+                .get(TestFrameworkInstrumentation.SPOCK)
+                .onTestSuiteStart(
+                        suiteDescriptor,
+                        testSuiteName,
+                        testFramework,
+                        testFrameworkVersion,
+                        testClass,
+                        tags,
+                        false,
+                        TestFrameworkInstrumentation.SPOCK,
+                        null);
+    }
 
-        for (TestDescriptor child : suiteDescriptor.getChildren()) {
-          executionSkipped(child, reason);
+    private void containerExecutionFinished(
+            final TestDescriptor suiteDescriptor, final TestExecutionResult testExecutionResult) {
+        if (!SpockUtils.isSpec(suiteDescriptor)) {
+            return;
+        }
+
+        Throwable throwable = testExecutionResult.getThrowable().orElse(null);
+        if (throwable != null) {
+            if (JUnitPlatformUtils.isAssumptionFailure(throwable)) {
+
+                String reason = throwable.getMessage();
+                TestEventsHandlerHolder.HANDLERS
+                        .get(TestFrameworkInstrumentation.SPOCK)
+                        .onTestSuiteSkip(suiteDescriptor, reason);
+
+                for (TestDescriptor child : suiteDescriptor.getChildren()) {
+                    executionSkipped(child, reason);
+                }
+
+            } else {
+                TestEventsHandlerHolder.HANDLERS
+                        .get(TestFrameworkInstrumentation.SPOCK)
+                        .onTestSuiteFailure(suiteDescriptor, throwable);
+            }
         }
 
-      } else {
         TestEventsHandlerHolder.HANDLERS
-            .get(TestFrameworkInstrumentation.SPOCK)
-            .onTestSuiteFailure(suiteDescriptor, throwable);
-      }
+                .get(TestFrameworkInstrumentation.SPOCK)
+                .onTestSuiteFinish(suiteDescriptor, null);
     }
 
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.SPOCK)
-        .onTestSuiteFinish(suiteDescriptor, null);
-  }
+    private void testCaseExecutionStarted(final TestDescriptor testDescriptor) {
+        TestSource testSource = testDescriptor.getSource().orElse(null);
+        if (testSource instanceof MethodSource) {
+            testMethodExecutionStarted(testDescriptor, (MethodSource) testSource);
+        }
+    }
+
+    private void testMethodExecutionStarted(TestDescriptor testDescriptor, MethodSource testSource) {
+        TestDescriptor suiteDescriptor = SpockUtils.getSpecDescriptor(testDescriptor);
+        String displayName = testDescriptor.getDisplayName();
+        String testParameters = JUnitPlatformUtils.getParameters(testDescriptor, testSource, displayName);
+        List<String> tags = JUnitPlatformUtils.getTags(testDescriptor);
+        TestSourceData testSourceData = SpockUtils.toTestSourceData(testDescriptor);
 
-  private void testCaseExecutionStarted(final TestDescriptor testDescriptor) {
-    TestSource testSource = testDescriptor.getSource().orElse(null);
-    if (testSource instanceof MethodSource) {
-      testMethodExecutionStarted(testDescriptor, (MethodSource) testSource);
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.SPOCK)
+                .onTestStart(
+                        suiteDescriptor,
+                        testDescriptor,
+                        displayName,
+                        testFramework,
+                        testFrameworkVersion,
+                        testParameters,
+                        tags,
+                        testSourceData,
+                        null,
+                        TestEventsHandlerHolder.getExecutionTracker(testDescriptor));
     }
-  }
-
-  private void testMethodExecutionStarted(TestDescriptor testDescriptor, MethodSource testSource) {
-    TestDescriptor suiteDescriptor = SpockUtils.getSpecDescriptor(testDescriptor);
-    String displayName = testDescriptor.getDisplayName();
-    String testParameters =
-        JUnitPlatformUtils.getParameters(testDescriptor, testSource, displayName);
-    List<String> tags = JUnitPlatformUtils.getTags(testDescriptor);
-    TestSourceData testSourceData = SpockUtils.toTestSourceData(testDescriptor);
-
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.SPOCK)
-        .onTestStart(
-            suiteDescriptor,
-            testDescriptor,
-            displayName,
-            testFramework,
-            testFrameworkVersion,
-            testParameters,
-            tags,
-            testSourceData,
-            null,
-            TestEventsHandlerHolder.getExecutionTracker(testDescriptor));
-  }
-
-  private void testCaseExecutionFinished(
-      final TestDescriptor testDescriptor, final TestExecutionResult testExecutionResult) {
-    TestSource testSource = testDescriptor.getSource().orElse(null);
-    if (testSource instanceof MethodSource) {
-      testMethodExecutionFinished(testDescriptor, testExecutionResult);
+
+    private void testCaseExecutionFinished(
+            final TestDescriptor testDescriptor, final TestExecutionResult testExecutionResult) {
+        TestSource testSource = testDescriptor.getSource().orElse(null);
+        if (testSource instanceof MethodSource) {
+            testMethodExecutionFinished(testDescriptor, testExecutionResult);
+        }
     }
-  }
 
-  private void testMethodExecutionFinished(
-      TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) {
-    Throwable throwable = testExecutionResult.getThrowable().orElse(null);
-    if (throwable != null) {
-      if (JUnitPlatformUtils.isAssumptionFailure(throwable)) {
-        TestEventsHandlerHolder.HANDLERS
-            .get(TestFrameworkInstrumentation.SPOCK)
-            .onTestSkip(testDescriptor, throwable.getMessage());
-      } else {
+    private void testMethodExecutionFinished(TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) {
+        Throwable throwable = testExecutionResult.getThrowable().orElse(null);
+        if (throwable != null) {
+            if (JUnitPlatformUtils.isAssumptionFailure(throwable)) {
+                TestEventsHandlerHolder.HANDLERS
+                        .get(TestFrameworkInstrumentation.SPOCK)
+                        .onTestSkip(testDescriptor, throwable.getMessage());
+            } else {
+                TestEventsHandlerHolder.HANDLERS
+                        .get(TestFrameworkInstrumentation.SPOCK)
+                        .onTestFailure(testDescriptor, throwable);
+            }
+        }
+        TestExecutionTracker executionTracker = TestEventsHandlerHolder.getExecutionTracker(testDescriptor);
         TestEventsHandlerHolder.HANDLERS
-            .get(TestFrameworkInstrumentation.SPOCK)
-            .onTestFailure(testDescriptor, throwable);
-      }
+                .get(TestFrameworkInstrumentation.SPOCK)
+                .onTestFinish(testDescriptor, null, executionTracker);
     }
-    TestExecutionTracker executionTracker =
-        TestEventsHandlerHolder.getExecutionTracker(testDescriptor);
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.SPOCK)
-        .onTestFinish(testDescriptor, null, executionTracker);
-  }
-
-  @Override
-  public void executionSkipped(final TestDescriptor descriptor, final String reason) {
-    TestSource testSource = descriptor.getSource().orElse(null);
-    if (testSource instanceof ClassSource) {
-      // The annotation @Disabled is kept at type level.
-      containerExecutionSkipped(descriptor, reason);
-
-    } else if (testSource instanceof MethodSource) {
-      // The annotation @Disabled is kept at method level.
-      testMethodExecutionSkipped(descriptor, (MethodSource) testSource, reason);
-    }
-  }
 
-  private void containerExecutionSkipped(
-      final TestDescriptor suiteDescriptor, final String reason) {
-    if (!SpockUtils.isSpec(suiteDescriptor)) {
-      return;
+    @Override
+    public void executionSkipped(final TestDescriptor descriptor, final String reason) {
+        TestSource testSource = descriptor.getSource().orElse(null);
+        if (testSource instanceof ClassSource) {
+            // The annotation @Disabled is kept at type level.
+            containerExecutionSkipped(descriptor, reason);
+
+        } else if (testSource instanceof MethodSource) {
+            // The annotation @Disabled is kept at method level.
+            testMethodExecutionSkipped(descriptor, (MethodSource) testSource, reason);
+        }
     }
 
-    Class<?> testClass = JUnitPlatformUtils.getJavaClass(suiteDescriptor);
-    String testSuiteName =
-        testClass != null ? testClass.getName() : suiteDescriptor.getLegacyReportingName();
-    List<String> tags =
-        suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
-
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.SPOCK)
-        .onTestSuiteStart(
-            suiteDescriptor,
-            testSuiteName,
-            testFramework,
-            testFrameworkVersion,
-            testClass,
-            tags,
-            false,
-            TestFrameworkInstrumentation.SPOCK,
-            null);
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.SPOCK)
-        .onTestSuiteSkip(suiteDescriptor, reason);
-
-    for (TestDescriptor child : suiteDescriptor.getChildren()) {
-      executionSkipped(child, reason);
+    private void containerExecutionSkipped(final TestDescriptor suiteDescriptor, final String reason) {
+        if (!SpockUtils.isSpec(suiteDescriptor)) {
+            return;
+        }
+
+        Class<?> testClass = JUnitPlatformUtils.getJavaClass(suiteDescriptor);
+        String testSuiteName = testClass != null ? testClass.getName() : suiteDescriptor.getLegacyReportingName();
+        List<String> tags =
+                suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
+
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.SPOCK)
+                .onTestSuiteStart(
+                        suiteDescriptor,
+                        testSuiteName,
+                        testFramework,
+                        testFrameworkVersion,
+                        testClass,
+                        tags,
+                        false,
+                        TestFrameworkInstrumentation.SPOCK,
+                        null);
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.SPOCK)
+                .onTestSuiteSkip(suiteDescriptor, reason);
+
+        for (TestDescriptor child : suiteDescriptor.getChildren()) {
+            executionSkipped(child, reason);
+        }
+
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.SPOCK)
+                .onTestSuiteFinish(suiteDescriptor, null);
     }
 
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.SPOCK)
-        .onTestSuiteFinish(suiteDescriptor, null);
-  }
-
-  private void testMethodExecutionSkipped(
-      final TestDescriptor testDescriptor, final MethodSource methodSource, final String reason) {
-    TestDescriptor suiteDescriptor = SpockUtils.getSpecDescriptor(testDescriptor);
-    String displayName = testDescriptor.getDisplayName();
-    String testParameters =
-        JUnitPlatformUtils.getParameters(testDescriptor, methodSource, displayName);
-    List<String> tags =
-        testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
-    TestSourceData testSourceData = SpockUtils.toTestSourceData(testDescriptor);
-
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.SPOCK)
-        .onTestIgnore(
-            suiteDescriptor,
-            testDescriptor,
-            displayName,
-            testFramework,
-            testFrameworkVersion,
-            testParameters,
-            tags,
-            testSourceData,
-            reason,
-            TestEventsHandlerHolder.getExecutionTracker(testDescriptor));
-  }
+    private void testMethodExecutionSkipped(
+            final TestDescriptor testDescriptor, final MethodSource methodSource, final String reason) {
+        TestDescriptor suiteDescriptor = SpockUtils.getSpecDescriptor(testDescriptor);
+        String displayName = testDescriptor.getDisplayName();
+        String testParameters = JUnitPlatformUtils.getParameters(testDescriptor, methodSource, displayName);
+        List<String> tags =
+                testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
+        TestSourceData testSourceData = SpockUtils.toTestSourceData(testDescriptor);
+
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.SPOCK)
+                .onTestIgnore(
+                        suiteDescriptor,
+                        testDescriptor,
+                        displayName,
+                        testFramework,
+                        testFrameworkVersion,
+                        testParameters,
+                        tags,
+                        testSourceData,
+                        reason,
+                        TestEventsHandlerHolder.getExecutionTracker(testDescriptor));
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java
index 19796973732..8b07ecb6208 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java
@@ -27,141 +27,142 @@
 
 public class SpockUtils {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(SpockUtils.class);
-
-  private static final datadog.trace.util.MethodHandles METHOD_HANDLES =
-      new datadog.trace.util.MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
-
-  private static final MethodHandle GET_TEST_TAGS =
-      METHOD_HANDLES.method("org.spockframework.runtime.model.ITestTaggable", "getTestTags");
-
-  private static final MethodHandle GET_TEST_TAG_VALUE =
-      METHOD_HANDLES.method("org.spockframework.runtime.model.TestTag", "getValue");
-
-  static {
-    TestDataFactory.register(
-        JUnitPlatformUtils.ENGINE_ID_SPOCK,
-        SpockUtils::toTestIdentifier,
-        SpockUtils::toTestSourceData,
-        SpockUtils::shouldBeTraced);
-    RetryDescriptorFactories.register(
-        JUnitPlatformUtils.ENGINE_ID_SPOCK, new SpockRetryDescriptorFactory());
-  }
-
-  /*
-   * ITestTaggable and TestTag classes are accessed via reflection
-   * since they're available starting with Spock 2.2,
-   * and we support Spock 2.0
-   */
-  public static Collection<TestTag> getTags(SpockNode<?> spockNode) {
-    try {
-      Collection<TestTag> junitPlatformTestTags = new ArrayList<>();
-      SpecElementInfo<?, ?> nodeInfo = spockNode.getNodeInfo();
-      if (!(nodeInfo instanceof FeatureInfo)) {
-        return Collections.emptyList();
-      }
-
-      Collection<?> testTags = (Collection<?>) GET_TEST_TAGS.invoke(nodeInfo);
-      for (Object testTag : testTags) {
-        String tagValue = (String) GET_TEST_TAG_VALUE.invoke(testTag);
-        TestTag junitPlatformTestTag = TestTag.create(tagValue);
-        junitPlatformTestTags.add(junitPlatformTestTag);
-      }
-      return junitPlatformTestTags;
-
-    } catch (Throwable throwable) {
-      LOGGER.warn("Could not get tags from a spock node", throwable);
-      return Collections.emptyList();
+    private static final Logger LOGGER = LoggerFactory.getLogger(SpockUtils.class);
+
+    private static final datadog.trace.util.MethodHandles METHOD_HANDLES =
+            new datadog.trace.util.MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
+
+    private static final MethodHandle GET_TEST_TAGS =
+            METHOD_HANDLES.method("org.spockframework.runtime.model.ITestTaggable", "getTestTags");
+
+    private static final MethodHandle GET_TEST_TAG_VALUE =
+            METHOD_HANDLES.method("org.spockframework.runtime.model.TestTag", "getValue");
+
+    static {
+        TestDataFactory.register(
+                JUnitPlatformUtils.ENGINE_ID_SPOCK,
+                SpockUtils::toTestIdentifier,
+                SpockUtils::toTestSourceData,
+                SpockUtils::shouldBeTraced);
+        RetryDescriptorFactories.register(JUnitPlatformUtils.ENGINE_ID_SPOCK, new SpockRetryDescriptorFactory());
     }
-  }
-
-  public static boolean isItrUnskippable(SpockNode<?> spockNode) {
-    Collection<TestTag> tags = getTags(spockNode);
-    for (TestTag tag : tags) {
-      if (CIConstants.Tags.ITR_UNSKIPPABLE_TAG.equals(tag.getName())) {
-        return true;
-      }
+
+    /*
+     * ITestTaggable and TestTag classes are accessed via reflection
+     * since they're available starting with Spock 2.2,
+     * and we support Spock 2.0
+     */
+    public static Collection<TestTag> getTags(SpockNode<?> spockNode) {
+        try {
+            Collection<TestTag> junitPlatformTestTags = new ArrayList<>();
+            SpecElementInfo<?, ?> nodeInfo = spockNode.getNodeInfo();
+            if (!(nodeInfo instanceof FeatureInfo)) {
+                return Collections.emptyList();
+            }
+
+            Collection<?> testTags = (Collection<?>) GET_TEST_TAGS.invoke(nodeInfo);
+            for (Object testTag : testTags) {
+                String tagValue = (String) GET_TEST_TAG_VALUE.invoke(testTag);
+                TestTag junitPlatformTestTag = TestTag.create(tagValue);
+                junitPlatformTestTags.add(junitPlatformTestTag);
+            }
+            return junitPlatformTestTags;
+
+        } catch (Throwable throwable) {
+            LOGGER.warn("Could not get tags from a spock node", throwable);
+            return Collections.emptyList();
+        }
     }
-    return false;
-  }
-
-  public static TestIdentifier toTestIdentifier(TestDescriptor testDescriptor) {
-    TestSource testSource = testDescriptor.getSource().orElse(null);
-    if (testSource instanceof MethodSource && testDescriptor instanceof SpockNode) {
-      SpockNode spockNode = (SpockNode) testDescriptor;
-      MethodSource methodSource = (MethodSource) testSource;
-      String testSuiteName = methodSource.getClassName();
-      String displayName = spockNode.getDisplayName();
-      String testParameters =
-          JUnitPlatformUtils.getParameters(testDescriptor, methodSource, displayName);
-      return new TestIdentifier(testSuiteName, displayName, testParameters);
-
-    } else {
-      return null;
+
+    public static boolean isItrUnskippable(SpockNode<?> spockNode) {
+        Collection<TestTag> tags = getTags(spockNode);
+        for (TestTag tag : tags) {
+            if (CIConstants.Tags.ITR_UNSKIPPABLE_TAG.equals(tag.getName())) {
+                return true;
+            }
+        }
+        return false;
     }
-  }
-
-  public static TestSourceData toTestSourceData(TestDescriptor testDescriptor) {
-    TestSource testSource = testDescriptor.getSource().orElse(null);
-    if (testSource instanceof MethodSource) {
-      MethodSource methodSource = (MethodSource) testSource;
-      Class<?> testClass = methodSource.getJavaClass();
-      Method testMethod = getTestMethod(methodSource);
-      String testMethodName = methodSource.getMethodName();
-      return new TestSourceData(testClass, testMethod, testMethodName);
-    } else {
-      return TestSourceData.UNKNOWN;
+
+    public static TestIdentifier toTestIdentifier(TestDescriptor testDescriptor) {
+        TestSource testSource = testDescriptor.getSource().orElse(null);
+        if (testSource instanceof MethodSource && testDescriptor instanceof SpockNode) {
+            SpockNode spockNode = (SpockNode) testDescriptor;
+            MethodSource methodSource = (MethodSource) testSource;
+            String testSuiteName = methodSource.getClassName();
+            String displayName = spockNode.getDisplayName();
+            String testParameters = JUnitPlatformUtils.getParameters(testDescriptor, methodSource, displayName);
+            return new TestIdentifier(testSuiteName, displayName, testParameters);
+
+        } else {
+            return null;
+        }
     }
-  }
-
-  public static boolean shouldBeTraced(TestDescriptor testDescriptor) {
-    // Spock 2.4 quirks: both FeatureNode and IterationNode are reported as tests.
-    // We want to filter out iteration nodes to avoid reporting the same test twice,
-    // but keep them for parameterized tests to report each set of parameters as a separate test.
-    return !(testDescriptor instanceof IterationNode)
-        || testDescriptor.getParent().map(c -> c instanceof ParameterizedFeatureNode).orElse(false);
-  }
-
-  private static Method getTestMethod(MethodSource methodSource) {
-    String methodName = methodSource.getMethodName();
-    if (methodName == null) {
-      return null;
+
+    public static TestSourceData toTestSourceData(TestDescriptor testDescriptor) {
+        TestSource testSource = testDescriptor.getSource().orElse(null);
+        if (testSource instanceof MethodSource) {
+            MethodSource methodSource = (MethodSource) testSource;
+            Class<?> testClass = methodSource.getJavaClass();
+            Method testMethod = getTestMethod(methodSource);
+            String testMethodName = methodSource.getMethodName();
+            return new TestSourceData(testClass, testMethod, testMethodName);
+        } else {
+            return TestSourceData.UNKNOWN;
+        }
     }
 
-    Class<?> testClass = methodSource.getJavaClass();
-    if (testClass == null) {
-      return null;
+    public static boolean shouldBeTraced(TestDescriptor testDescriptor) {
+        // Spock 2.4 quirks: both FeatureNode and IterationNode are reported as tests.
+        // We want to filter out iteration nodes to avoid reporting the same test twice,
+        // but keep them for parameterized tests to report each set of parameters as a separate test.
+        return !(testDescriptor instanceof IterationNode)
+                || testDescriptor
+                        .getParent()
+                        .map(c -> c instanceof ParameterizedFeatureNode)
+                        .orElse(false);
     }
 
-    try {
-      for (Method declaredMethod : testClass.getDeclaredMethods()) {
-        FeatureMetadata featureMetadata = declaredMethod.getAnnotation(FeatureMetadata.class);
-        if (featureMetadata == null) {
-          continue;
+    private static Method getTestMethod(MethodSource methodSource) {
+        String methodName = methodSource.getMethodName();
+        if (methodName == null) {
+            return null;
         }
 
-        if (methodName.equals(featureMetadata.name())) {
-          return declaredMethod;
+        Class<?> testClass = methodSource.getJavaClass();
+        if (testClass == null) {
+            return null;
         }
-      }
 
-    } catch (Throwable e) {
-      LOGGER.warn("Could not get test method from method source", e);
+        try {
+            for (Method declaredMethod : testClass.getDeclaredMethods()) {
+                FeatureMetadata featureMetadata = declaredMethod.getAnnotation(FeatureMetadata.class);
+                if (featureMetadata == null) {
+                    continue;
+                }
+
+                if (methodName.equals(featureMetadata.name())) {
+                    return declaredMethod;
+                }
+            }
+
+        } catch (Throwable e) {
+            LOGGER.warn("Could not get test method from method source", e);
+        }
+        return null;
     }
-    return null;
-  }
-
-  public static boolean isSpec(TestDescriptor testDescriptor) {
-    UniqueId uniqueId = testDescriptor.getUniqueId();
-    List<UniqueId.Segment> segments = uniqueId.getSegments();
-    UniqueId.Segment lastSegment = segments.get(segments.size() - 1);
-    return "spec".equals(lastSegment.getType());
-  }
-
-  public static TestDescriptor getSpecDescriptor(TestDescriptor testDescriptor) {
-    while (testDescriptor != null && !isSpec(testDescriptor)) {
-      testDescriptor = testDescriptor.getParent().orElse(null);
+
+    public static boolean isSpec(TestDescriptor testDescriptor) {
+        UniqueId uniqueId = testDescriptor.getUniqueId();
+        List<UniqueId.Segment> segments = uniqueId.getSegments();
+        UniqueId.Segment lastSegment = segments.get(segments.size() - 1);
+        return "spec".equals(lastSegment.getType());
+    }
+
+    public static TestDescriptor getSpecDescriptor(TestDescriptor testDescriptor) {
+        while (testDescriptor != null && !isSpec(testDescriptor)) {
+            testDescriptor = testDescriptor.getParent().orElse(null);
+        }
+        return testDescriptor;
     }
-    return testDescriptor;
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5SpockParameterizedExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5SpockParameterizedExecutionInstrumentation.java
index 2a672217bcf..46fca9720e4 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5SpockParameterizedExecutionInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5SpockParameterizedExecutionInstrumentation.java
@@ -19,52 +19,49 @@
  * parameterized tests
  */
 @AutoService(InstrumenterModule.class)
-public class JUnit5SpockParameterizedExecutionInstrumentation
-    extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class JUnit5SpockParameterizedExecutionInstrumentation extends InstrumenterModule.CiVisibility
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  private final String parentPackageName =
-      Strings.getPackageName(JUnitPlatformUtils.class.getName());
+    private final String parentPackageName = Strings.getPackageName(JUnitPlatformUtils.class.getName());
 
-  public JUnit5SpockParameterizedExecutionInstrumentation() {
-    super("ci-visibility", "junit-5", "junit-5-spock", "test-retry");
-  }
+    public JUnit5SpockParameterizedExecutionInstrumentation() {
+        super("ci-visibility", "junit-5", "junit-5-spock", "test-retry");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.spockframework.runtime.ParameterizedFeatureChildExecutor";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.spockframework.runtime.ParameterizedFeatureChildExecutor";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      parentPackageName + ".JUnitPlatformUtils",
-      packageName + ".SpockParameterizedExecutionListener",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            parentPackageName + ".JUnitPlatformUtils", packageName + ".SpockParameterizedExecutionListener",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(),
-        JUnit5SpockParameterizedExecutionInstrumentation.class.getName()
-            + "$SpockParameterizedExecutionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor(),
+                JUnit5SpockParameterizedExecutionInstrumentation.class.getName()
+                        + "$SpockParameterizedExecutionAdvice");
+    }
 
-  public static class SpockParameterizedExecutionAdvice {
+    public static class SpockParameterizedExecutionAdvice {
 
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @Advice.OnMethodExit
-    public static void afterConstructor(
-        @Advice.FieldValue(value = "executionListener", readOnly = false)
-            EngineExecutionListener executionListener,
-        @Advice.FieldValue("pending") Map<TestDescriptor, CompletableFuture<?>> pending) {
-      executionListener = new SpockParameterizedExecutionListener(executionListener, pending);
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @Advice.OnMethodExit
+        public static void afterConstructor(
+                @Advice.FieldValue(value = "executionListener", readOnly = false)
+                        EngineExecutionListener executionListener,
+                @Advice.FieldValue("pending") Map<TestDescriptor, CompletableFuture<?>> pending) {
+            executionListener = new SpockParameterizedExecutionListener(executionListener, pending);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/execution/SpockParameterizedExecutionListener.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/execution/SpockParameterizedExecutionListener.java
index 1fd3649a079..9558e7945b1 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/execution/SpockParameterizedExecutionListener.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/main/java/datadog/trace/instrumentation/junit5/execution/SpockParameterizedExecutionListener.java
@@ -9,42 +9,41 @@
 import org.junit.platform.engine.reporting.ReportEntry;
 
 public class SpockParameterizedExecutionListener implements EngineExecutionListener {
-  private final EngineExecutionListener delegate;
-  private final Map<TestDescriptor, CompletableFuture<?>> pending;
-
-  public SpockParameterizedExecutionListener(
-      EngineExecutionListener delegate, Map<TestDescriptor, CompletableFuture<?>> pending) {
-    this.delegate = delegate;
-    this.pending = pending;
-  }
-
-  @Override
-  public void dynamicTestRegistered(TestDescriptor testDescriptor) {
-    delegate.dynamicTestRegistered(testDescriptor);
-    if (JUnitPlatformUtils.isRetry(testDescriptor)) {
-      // register generated retry descriptor
-      pending.put(testDescriptor, new CompletableFuture<>());
+    private final EngineExecutionListener delegate;
+    private final Map<TestDescriptor, CompletableFuture<?>> pending;
+
+    public SpockParameterizedExecutionListener(
+            EngineExecutionListener delegate, Map<TestDescriptor, CompletableFuture<?>> pending) {
+        this.delegate = delegate;
+        this.pending = pending;
+    }
+
+    @Override
+    public void dynamicTestRegistered(TestDescriptor testDescriptor) {
+        delegate.dynamicTestRegistered(testDescriptor);
+        if (JUnitPlatformUtils.isRetry(testDescriptor)) {
+            // register generated retry descriptor
+            pending.put(testDescriptor, new CompletableFuture<>());
+        }
+    }
+
+    @Override
+    public void executionSkipped(TestDescriptor testDescriptor, String reason) {
+        delegate.executionSkipped(testDescriptor, reason);
+    }
+
+    @Override
+    public void executionStarted(TestDescriptor testDescriptor) {
+        delegate.executionStarted(testDescriptor);
+    }
+
+    @Override
+    public void executionFinished(TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) {
+        delegate.executionFinished(testDescriptor, testExecutionResult);
+    }
+
+    @Override
+    public void reportingEntryPublished(TestDescriptor testDescriptor, ReportEntry entry) {
+        delegate.reportingEntryPublished(testDescriptor, entry);
     }
-  }
-
-  @Override
-  public void executionSkipped(TestDescriptor testDescriptor, String reason) {
-    delegate.executionSkipped(testDescriptor, reason);
-  }
-
-  @Override
-  public void executionStarted(TestDescriptor testDescriptor) {
-    delegate.executionStarted(testDescriptor);
-  }
-
-  @Override
-  public void executionFinished(
-      TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) {
-    delegate.executionFinished(testDescriptor, testExecutionResult);
-  }
-
-  @Override
-  public void reportingEntryPublished(TestDescriptor testDescriptor, ReportEntry entry) {
-    delegate.reportingEntryPublished(testDescriptor, entry);
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/CompositeEngineListener.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/CompositeEngineListener.java
index 934d89e072a..e983d12d3e0 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/CompositeEngineListener.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/CompositeEngineListener.java
@@ -7,52 +7,50 @@
 
 public class CompositeEngineListener implements EngineExecutionListener {
 
-  private final EngineExecutionListener tracingListener;
-  private final EngineExecutionListener delegate;
-
-  public CompositeEngineListener(
-      EngineExecutionListener tracingListener, EngineExecutionListener delegate) {
-    this.tracingListener = tracingListener;
-    this.delegate = delegate;
-  }
-
-  @Override
-  public void dynamicTestRegistered(TestDescriptor testDescriptor) {
-    // tracing listener is not interested in this event
-    delegate.dynamicTestRegistered(testDescriptor);
-  }
-
-  @Override
-  public void reportingEntryPublished(TestDescriptor testDescriptor, ReportEntry entry) {
-    // tracing listener is not interested in this event
-    delegate.reportingEntryPublished(testDescriptor, entry);
-  }
-
-  @Override
-  public void executionStarted(TestDescriptor testDescriptor) {
-    if (!TestDataFactory.shouldBeTraced(testDescriptor)) {
-      return;
+    private final EngineExecutionListener tracingListener;
+    private final EngineExecutionListener delegate;
+
+    public CompositeEngineListener(EngineExecutionListener tracingListener, EngineExecutionListener delegate) {
+        this.tracingListener = tracingListener;
+        this.delegate = delegate;
     }
-    tracingListener.executionStarted(testDescriptor);
-    delegate.executionStarted(testDescriptor);
-  }
-
-  @Override
-  public void executionSkipped(TestDescriptor testDescriptor, String reason) {
-    if (!TestDataFactory.shouldBeTraced(testDescriptor)) {
-      return;
+
+    @Override
+    public void dynamicTestRegistered(TestDescriptor testDescriptor) {
+        // tracing listener is not interested in this event
+        delegate.dynamicTestRegistered(testDescriptor);
     }
-    tracingListener.executionSkipped(testDescriptor, reason);
-    delegate.executionSkipped(testDescriptor, reason);
-  }
-
-  @Override
-  public void executionFinished(
-      TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) {
-    if (!TestDataFactory.shouldBeTraced(testDescriptor)) {
-      return;
+
+    @Override
+    public void reportingEntryPublished(TestDescriptor testDescriptor, ReportEntry entry) {
+        // tracing listener is not interested in this event
+        delegate.reportingEntryPublished(testDescriptor, entry);
+    }
+
+    @Override
+    public void executionStarted(TestDescriptor testDescriptor) {
+        if (!TestDataFactory.shouldBeTraced(testDescriptor)) {
+            return;
+        }
+        tracingListener.executionStarted(testDescriptor);
+        delegate.executionStarted(testDescriptor);
+    }
+
+    @Override
+    public void executionSkipped(TestDescriptor testDescriptor, String reason) {
+        if (!TestDataFactory.shouldBeTraced(testDescriptor)) {
+            return;
+        }
+        tracingListener.executionSkipped(testDescriptor, reason);
+        delegate.executionSkipped(testDescriptor, reason);
+    }
+
+    @Override
+    public void executionFinished(TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) {
+        if (!TestDataFactory.shouldBeTraced(testDescriptor)) {
+            return;
+        }
+        tracingListener.executionFinished(testDescriptor, testExecutionResult);
+        delegate.executionFinished(testDescriptor, testExecutionResult);
     }
-    tracingListener.executionFinished(testDescriptor, testExecutionResult);
-    delegate.executionFinished(testDescriptor, testExecutionResult);
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/ExecutionRequestFactory.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/ExecutionRequestFactory.java
index 41c8bc4d78e..c81362f724e 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/ExecutionRequestFactory.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/ExecutionRequestFactory.java
@@ -13,196 +13,179 @@
 
 public class ExecutionRequestFactory {
 
-  private static final MethodHandles METHOD_HANDLES =
-      new MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
-
-  /*
-   * From 5.13.0 onwards ExecutionRequest requires two additional arguments on creation.
-   * - OutputDirectoryProvider outputDirectoryProvider
-   * - NamespacedHierarchicalStore<Namespace> requestLevelStore
-   */
-  private static final MethodHandle GET_OUTPUT_DIRECTORY_PROVIDER =
-      METHOD_HANDLES.method(ExecutionRequest.class, "getOutputDirectoryProvider");
-  private static final MethodHandle GET_STORE =
-      METHOD_HANDLES.method(ExecutionRequest.class, "getStore");
-  /*
-   * From 6.0.0 onwards CancellationToken is also required.
-   */
-  private static final MethodHandle GET_CANCELLATION_TOKEN =
-      METHOD_HANDLES.method(ExecutionRequest.class, "getCancellationToken");
-  /*
-   * From 6.0.0 onwards (also applicable for 5.14.0 onwards) OutputDirectoryProvider is deprecated in favor of OutputDirectoryCreator
-   */
-  private static final MethodHandle GET_OUTPUT_DIRECTORY_CREATOR =
-      METHOD_HANDLES.method(ExecutionRequest.class, "getOutputDirectoryCreator");
-
-  private static final String[] PARAMETERS_JUNIT6 =
-      new String[] {
+    private static final MethodHandles METHOD_HANDLES = new MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
+
+    /*
+     * From 5.13.0 onwards ExecutionRequest requires two additional arguments on creation.
+     * - OutputDirectoryProvider outputDirectoryProvider
+     * - NamespacedHierarchicalStore<Namespace> requestLevelStore
+     */
+    private static final MethodHandle GET_OUTPUT_DIRECTORY_PROVIDER =
+            METHOD_HANDLES.method(ExecutionRequest.class, "getOutputDirectoryProvider");
+    private static final MethodHandle GET_STORE = METHOD_HANDLES.method(ExecutionRequest.class, "getStore");
+    /*
+     * From 6.0.0 onwards CancellationToken is also required.
+     */
+    private static final MethodHandle GET_CANCELLATION_TOKEN =
+            METHOD_HANDLES.method(ExecutionRequest.class, "getCancellationToken");
+    /*
+     * From 6.0.0 onwards (also applicable for 5.14.0 onwards) OutputDirectoryProvider is deprecated in favor of OutputDirectoryCreator
+     */
+    private static final MethodHandle GET_OUTPUT_DIRECTORY_CREATOR =
+            METHOD_HANDLES.method(ExecutionRequest.class, "getOutputDirectoryCreator");
+
+    private static final String[] PARAMETERS_JUNIT6 = new String[] {
         "org.junit.platform.engine.TestDescriptor",
         "org.junit.platform.engine.EngineExecutionListener",
         "org.junit.platform.engine.ConfigurationParameters",
         "org.junit.platform.engine.OutputDirectoryCreator",
         "org.junit.platform.engine.support.store.NamespacedHierarchicalStore",
         "org.junit.platform.engine.CancellationToken"
-      };
+    };
 
-  private static final String[] PARAMETERS_JUNIT514 =
-      new String[] {
+    private static final String[] PARAMETERS_JUNIT514 = new String[] {
         "org.junit.platform.engine.TestDescriptor",
         "org.junit.platform.engine.EngineExecutionListener",
         "org.junit.platform.engine.ConfigurationParameters",
         "org.junit.platform.engine.OutputDirectoryCreator",
         "org.junit.platform.engine.support.store.NamespacedHierarchicalStore",
-      };
+    };
 
-  private static final String[] PARAMETERS_JUNIT513 =
-      new String[] {
+    private static final String[] PARAMETERS_JUNIT513 = new String[] {
         "org.junit.platform.engine.TestDescriptor",
         "org.junit.platform.engine.EngineExecutionListener",
         "org.junit.platform.engine.ConfigurationParameters",
         "org.junit.platform.engine.reporting.OutputDirectoryProvider",
         "org.junit.platform.engine.support.store.NamespacedHierarchicalStore",
-      };
+    };
 
-  private static final String[] PARAMETERS_FALLBACK =
-      new String[] {
+    private static final String[] PARAMETERS_FALLBACK = new String[] {
         "org.junit.platform.engine.TestDescriptor",
         "org.junit.platform.engine.EngineExecutionListener",
         "org.junit.platform.engine.ConfigurationParameters",
-      };
+    };
 
-  private static final BiFunction<ExecutionRequest, EngineExecutionListener, ExecutionRequest>
-      EXECUTION_REQUEST_CREATE = createExecutionRequestHandle();
+    private static final BiFunction<ExecutionRequest, EngineExecutionListener, ExecutionRequest>
+            EXECUTION_REQUEST_CREATE = createExecutionRequestHandle();
 
-  private static BiFunction<ExecutionRequest, EngineExecutionListener, ExecutionRequest>
-      createExecutionRequestHandle() {
-    BiFunction<ExecutionRequest, EngineExecutionListener, ExecutionRequest> factory;
+    private static BiFunction<ExecutionRequest, EngineExecutionListener, ExecutionRequest>
+            createExecutionRequestHandle() {
+        BiFunction<ExecutionRequest, EngineExecutionListener, ExecutionRequest> factory;
 
-    factory = junit6Factory();
-    if (factory != null) {
-      return factory;
-    }
+        factory = junit6Factory();
+        if (factory != null) {
+            return factory;
+        }
 
-    factory = junit514Factory();
-    if (factory != null) {
-      return factory;
-    }
+        factory = junit514Factory();
+        if (factory != null) {
+            return factory;
+        }
 
-    factory = junit513Factory();
-    if (factory != null) {
-      return factory;
-    }
+        factory = junit513Factory();
+        if (factory != null) {
+            return factory;
+        }
 
-    return fallbackFactory();
-  }
-
-  private static BiFunction<ExecutionRequest, EngineExecutionListener, ExecutionRequest>
-      junit6Factory() {
-    if (GET_OUTPUT_DIRECTORY_CREATOR == null
-        || GET_STORE == null
-        || GET_CANCELLATION_TOKEN == null) {
-      return null;
+        return fallbackFactory();
     }
 
-    MethodHandle createMethod = findCreateMethod(PARAMETERS_JUNIT6);
-    if (createMethod == null) {
-      return null;
+    private static BiFunction<ExecutionRequest, EngineExecutionListener, ExecutionRequest> junit6Factory() {
+        if (GET_OUTPUT_DIRECTORY_CREATOR == null || GET_STORE == null || GET_CANCELLATION_TOKEN == null) {
+            return null;
+        }
+
+        MethodHandle createMethod = findCreateMethod(PARAMETERS_JUNIT6);
+        if (createMethod == null) {
+            return null;
+        }
+
+        return (request, listener) -> {
+            Object creator = METHOD_HANDLES.invoke(GET_OUTPUT_DIRECTORY_CREATOR, request);
+            Object store = METHOD_HANDLES.invoke(GET_STORE, request);
+            Object cancellationToken = METHOD_HANDLES.invoke(GET_CANCELLATION_TOKEN, request);
+            return METHOD_HANDLES.invoke(
+                    createMethod,
+                    request.getRootTestDescriptor(),
+                    listener,
+                    request.getConfigurationParameters(),
+                    creator,
+                    store,
+                    cancellationToken);
+        };
     }
 
-    return (request, listener) -> {
-      Object creator = METHOD_HANDLES.invoke(GET_OUTPUT_DIRECTORY_CREATOR, request);
-      Object store = METHOD_HANDLES.invoke(GET_STORE, request);
-      Object cancellationToken = METHOD_HANDLES.invoke(GET_CANCELLATION_TOKEN, request);
-      return METHOD_HANDLES.invoke(
-          createMethod,
-          request.getRootTestDescriptor(),
-          listener,
-          request.getConfigurationParameters(),
-          creator,
-          store,
-          cancellationToken);
-    };
-  }
-
-  private static BiFunction<ExecutionRequest, EngineExecutionListener, ExecutionRequest>
-      junit514Factory() {
-    if (GET_OUTPUT_DIRECTORY_CREATOR == null || GET_STORE == null) {
-      return null;
+    private static BiFunction<ExecutionRequest, EngineExecutionListener, ExecutionRequest> junit514Factory() {
+        if (GET_OUTPUT_DIRECTORY_CREATOR == null || GET_STORE == null) {
+            return null;
+        }
+
+        MethodHandle createMethod = findCreateMethod(PARAMETERS_JUNIT514);
+        if (createMethod == null) {
+            return null;
+        }
+
+        return (request, listener) -> {
+            Object creator = METHOD_HANDLES.invoke(GET_OUTPUT_DIRECTORY_CREATOR, request);
+            Object store = METHOD_HANDLES.invoke(GET_STORE, request);
+            return METHOD_HANDLES.invoke(
+                    createMethod,
+                    request.getRootTestDescriptor(),
+                    listener,
+                    request.getConfigurationParameters(),
+                    creator,
+                    store);
+        };
     }
 
-    MethodHandle createMethod = findCreateMethod(PARAMETERS_JUNIT514);
-    if (createMethod == null) {
-      return null;
+    private static BiFunction<ExecutionRequest, EngineExecutionListener, ExecutionRequest> junit513Factory() {
+        if (GET_OUTPUT_DIRECTORY_PROVIDER == null || GET_STORE == null) {
+            return null;
+        }
+
+        MethodHandle createMethod = findCreateMethod(PARAMETERS_JUNIT513);
+        if (createMethod == null) {
+            return null;
+        }
+
+        return (request, listener) -> {
+            Object provider = METHOD_HANDLES.invoke(GET_OUTPUT_DIRECTORY_PROVIDER, request);
+            Object store = METHOD_HANDLES.invoke(GET_STORE, request);
+            return METHOD_HANDLES.invoke(
+                    createMethod,
+                    request.getRootTestDescriptor(),
+                    listener,
+                    request.getConfigurationParameters(),
+                    provider,
+                    store);
+        };
     }
 
-    return (request, listener) -> {
-      Object creator = METHOD_HANDLES.invoke(GET_OUTPUT_DIRECTORY_CREATOR, request);
-      Object store = METHOD_HANDLES.invoke(GET_STORE, request);
-      return METHOD_HANDLES.invoke(
-          createMethod,
-          request.getRootTestDescriptor(),
-          listener,
-          request.getConfigurationParameters(),
-          creator,
-          store);
-    };
-  }
+    private static BiFunction<ExecutionRequest, EngineExecutionListener, ExecutionRequest> fallbackFactory() {
+        MethodHandle constructor = METHOD_HANDLES.constructor(
+                ExecutionRequest.class,
+                TestDescriptor.class,
+                EngineExecutionListener.class,
+                ConfigurationParameters.class);
 
-  private static BiFunction<ExecutionRequest, EngineExecutionListener, ExecutionRequest>
-      junit513Factory() {
-    if (GET_OUTPUT_DIRECTORY_PROVIDER == null || GET_STORE == null) {
-      return null;
+        return (request, listener) -> METHOD_HANDLES.invoke(
+                constructor, request.getRootTestDescriptor(), listener, request.getConfigurationParameters());
     }
 
-    MethodHandle createMethod = findCreateMethod(PARAMETERS_JUNIT513);
-    if (createMethod == null) {
-      return null;
+    @Nullable
+    private static MethodHandle findCreateMethod(String... parameterTypes) {
+        return METHOD_HANDLES.method(
+                ExecutionRequest.class,
+                m -> "create".equals(m.getName())
+                        && m.getParameterCount() == parameterTypes.length
+                        && Arrays.equals(
+                                Arrays.stream(m.getParameterTypes())
+                                        .map(Class::getName)
+                                        .toArray(),
+                                parameterTypes));
     }
 
-    return (request, listener) -> {
-      Object provider = METHOD_HANDLES.invoke(GET_OUTPUT_DIRECTORY_PROVIDER, request);
-      Object store = METHOD_HANDLES.invoke(GET_STORE, request);
-      return METHOD_HANDLES.invoke(
-          createMethod,
-          request.getRootTestDescriptor(),
-          listener,
-          request.getConfigurationParameters(),
-          provider,
-          store);
-    };
-  }
-
-  private static BiFunction<ExecutionRequest, EngineExecutionListener, ExecutionRequest>
-      fallbackFactory() {
-    MethodHandle constructor =
-        METHOD_HANDLES.constructor(
-            ExecutionRequest.class,
-            TestDescriptor.class,
-            EngineExecutionListener.class,
-            ConfigurationParameters.class);
-
-    return (request, listener) ->
-        METHOD_HANDLES.invoke(
-            constructor,
-            request.getRootTestDescriptor(),
-            listener,
-            request.getConfigurationParameters());
-  }
-
-  @Nullable
-  private static MethodHandle findCreateMethod(String... parameterTypes) {
-    return METHOD_HANDLES.method(
-        ExecutionRequest.class,
-        m ->
-            "create".equals(m.getName())
-                && m.getParameterCount() == parameterTypes.length
-                && Arrays.equals(
-                    Arrays.stream(m.getParameterTypes()).map(Class::getName).toArray(),
-                    parameterTypes));
-  }
-
-  public static ExecutionRequest createExecutionRequest(
-      ExecutionRequest request, EngineExecutionListener listener) {
-    return EXECUTION_REQUEST_CREATE.apply(request, listener);
-  }
+    public static ExecutionRequest createExecutionRequest(ExecutionRequest request, EngineExecutionListener listener) {
+        return EXECUTION_REQUEST_CREATE.apply(request, listener);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java
index 3019de1f927..ad385a7b001 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java
@@ -24,88 +24,84 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit5Instrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public JUnit5Instrumentation() {
-    super("ci-visibility", "junit-5");
-  }
+    public JUnit5Instrumentation() {
+        super("ci-visibility", "junit-5");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.junit.platform.engine.TestEngine";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.junit.platform.engine.TestEngine";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        // JUnit 4 has a dedicated instrumentation
-        .and(not(named("org.junit.vintage.engine.VintageTestEngine")))
-        // suites are only used to organize other test engines
-        .and(not(named("org.junit.platform.suite.engine.SuiteTestEngine")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                // JUnit 4 has a dedicated instrumentation
+                .and(not(named("org.junit.vintage.engine.VintageTestEngine")))
+                // suites are only used to organize other test engines
+                .and(not(named("org.junit.platform.suite.engine.SuiteTestEngine")));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("org.junit.platform.engine.TestDescriptor", "java.lang.Object");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.junit.platform.engine.TestDescriptor", "java.lang.Object");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("discover")
-            .and(
-                takesArgument(0, named("org.junit.platform.engine.EngineDiscoveryRequest"))
-                    .and(takesArgument(1, named("org.junit.platform.engine.UniqueId")))),
-        JUnit5Instrumentation.class.getName() + "$ContextStoreAdvice");
-    transformer.applyAdvice(
-        named("execute").and(takesArgument(0, named("org.junit.platform.engine.ExecutionRequest"))),
-        JUnit5Instrumentation.class.getName() + "$JUnit5Advice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("discover")
+                        .and(takesArgument(0, named("org.junit.platform.engine.EngineDiscoveryRequest"))
+                                .and(takesArgument(1, named("org.junit.platform.engine.UniqueId")))),
+                JUnit5Instrumentation.class.getName() + "$ContextStoreAdvice");
+        transformer.applyAdvice(
+                named("execute").and(takesArgument(0, named("org.junit.platform.engine.ExecutionRequest"))),
+                JUnit5Instrumentation.class.getName() + "$JUnit5Advice");
+    }
 
-  public static class ContextStoreAdvice {
-    @Advice.OnMethodEnter
-    public static void setContextStores(@Advice.This TestEngine testEngine) {
-      ContextStore<TestDescriptor, Object> contextStore =
-          InstrumentationContext.get(TestDescriptor.class, Object.class);
-      TestEventsHandlerHolder.start(
-          testEngine, (ContextStore) contextStore, (ContextStore) contextStore);
+    public static class ContextStoreAdvice {
+        @Advice.OnMethodEnter
+        public static void setContextStores(@Advice.This TestEngine testEngine) {
+            ContextStore<TestDescriptor, Object> contextStore =
+                    InstrumentationContext.get(TestDescriptor.class, Object.class);
+            TestEventsHandlerHolder.start(testEngine, (ContextStore) contextStore, (ContextStore) contextStore);
+        }
     }
-  }
 
-  public static class JUnit5Advice {
-    @Advice.OnMethodEnter
-    public static void addTracingListener(
-        @Advice.This TestEngine testEngine,
-        @Advice.Argument(value = 0, readOnly = false) ExecutionRequest executionRequest) {
-      if (JUnitPlatformUtils.engineToFramework(testEngine) != TestFrameworkInstrumentation.JUNIT5) {
-        // Cucumber and Spock have dedicated instrumentations.
-        // We can only filter out calls to their engines at runtime,
-        // since they do not declare their own "execute" method,
-        // but inherit it from their parent class
-        return;
-      }
+    public static class JUnit5Advice {
+        @Advice.OnMethodEnter
+        public static void addTracingListener(
+                @Advice.This TestEngine testEngine,
+                @Advice.Argument(value = 0, readOnly = false) ExecutionRequest executionRequest) {
+            if (JUnitPlatformUtils.engineToFramework(testEngine) != TestFrameworkInstrumentation.JUNIT5) {
+                // Cucumber and Spock have dedicated instrumentations.
+                // We can only filter out calls to their engines at runtime,
+                // since they do not declare their own "execute" method,
+                // but inherit it from their parent class
+                return;
+            }
 
-      if (JUnitPlatformUtils.isTestInProgress()) {
-        // a test case that is in progress starts a new JUnit instance.
-        // It might be done in order to achieve classloader isolation
-        // (for example, spring-boot uses this technique).
-        // We are already tracking the active test case,
-        // and do not want to report the "embedded" JUnit execution
-        // as a separate module
-        return;
-      }
+            if (JUnitPlatformUtils.isTestInProgress()) {
+                // a test case that is in progress starts a new JUnit instance.
+                // It might be done in order to achieve classloader isolation
+                // (for example, spring-boot uses this technique).
+                // We are already tracking the active test case,
+                // and do not want to report the "embedded" JUnit execution
+                // as a separate module
+                return;
+            }
 
-      TracingListener tracingListener = new TracingListener(testEngine);
-      EngineExecutionListener originalListener = executionRequest.getEngineExecutionListener();
-      EngineExecutionListener compositeListener =
-          new CompositeEngineListener(tracingListener, originalListener);
-      executionRequest =
-          ExecutionRequestFactory.createExecutionRequest(executionRequest, compositeListener);
-    }
+            TracingListener tracingListener = new TracingListener(testEngine);
+            EngineExecutionListener originalListener = executionRequest.getEngineExecutionListener();
+            EngineExecutionListener compositeListener = new CompositeEngineListener(tracingListener, originalListener);
+            executionRequest = ExecutionRequestFactory.createExecutionRequest(executionRequest, compositeListener);
+        }
 
-    // JUnit 5.3.0 and above
-    public static void muzzleCheck(final SameThreadHierarchicalTestExecutorService service) {
-      service.invokeAll(null);
+        // JUnit 5.3.0 and above
+        public static void muzzleCheck(final SameThreadHierarchicalTestExecutorService service) {
+            service.invokeAll(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java
index d2810e6b689..30eba7c8092 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java
@@ -26,88 +26,88 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit5SkipInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public JUnit5SkipInstrumentation() {
-    super("ci-visibility", "junit-5");
-  }
+    public JUnit5SkipInstrumentation() {
+        super("ci-visibility", "junit-5");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled()
-        && (Config.get().isCiVisibilityTestSkippingEnabled()
-            || Config.get().isCiVisibilityTestManagementEnabled());
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled()
+                && (Config.get().isCiVisibilityTestSkippingEnabled()
+                        || Config.get().isCiVisibilityTestManagementEnabled());
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.junit.platform.engine.support.hierarchical.Node";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.junit.platform.engine.support.hierarchical.Node";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        .and(implementsInterface(named("org.junit.platform.engine.TestDescriptor")))
-        // Cucumber has a dedicated instrumentation
-        .and(not(nameStartsWith("io.cucumber")))
-        // Spock has a dedicated instrumentation
-        .and(not(nameStartsWith("org.spockframework")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                .and(implementsInterface(named("org.junit.platform.engine.TestDescriptor")))
+                // Cucumber has a dedicated instrumentation
+                .and(not(nameStartsWith("io.cucumber")))
+                // Spock has a dedicated instrumentation
+                .and(not(nameStartsWith("org.spockframework")));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("shouldBeSkipped").and(takesArguments(1)),
-        JUnit5SkipInstrumentation.class.getName() + "$JUnit5SkipAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("shouldBeSkipped").and(takesArguments(1)),
+                JUnit5SkipInstrumentation.class.getName() + "$JUnit5SkipAdvice");
+    }
 
-  /**
-   * !!!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!!!! Do not use or refer to any classes from {@code
-   * org.junit.platform.launcher} package in here: in some Gradle projects this package is not
-   * available in CL where this instrumentation is injected
-   */
-  public static class JUnit5SkipAdvice {
-    @Advice.OnMethodExit
-    public static void shouldBeSkipped(
-        @Advice.This TestDescriptor testDescriptor,
-        @Advice.Return(readOnly = false) Node.SkipResult skipResult) {
-      if (skipResult.isSkipped()) {
-        return;
-      }
+    /**
+     * !!!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!!!! Do not use or refer to any classes from {@code
+     * org.junit.platform.launcher} package in here: in some Gradle projects this package is not
+     * available in CL where this instrumentation is injected
+     */
+    public static class JUnit5SkipAdvice {
+        @Advice.OnMethodExit
+        public static void shouldBeSkipped(
+                @Advice.This TestDescriptor testDescriptor,
+                @Advice.Return(readOnly = false) Node.SkipResult skipResult) {
+            if (skipResult.isSkipped()) {
+                return;
+            }
 
-      TestEventsHandler<TestDescriptor, TestDescriptor> testEventsHandler =
-          TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT5);
+            TestEventsHandler<TestDescriptor, TestDescriptor> testEventsHandler =
+                    TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT5);
 
-      if (testEventsHandler == null) {
-        // should only happen in integration tests
-        // because we cannot avoid instrumenting ourselves
-        return;
-      }
+            if (testEventsHandler == null) {
+                // should only happen in integration tests
+                // because we cannot avoid instrumenting ourselves
+                return;
+            }
 
-      TestIdentifier test = JUnitPlatformUtils.toTestIdentifier(testDescriptor);
-      if (test == null) {
-        return;
-      }
-      SkipReason skipReason = testEventsHandler.skipReason(test);
-      if (skipReason == null) {
-        return;
-      }
+            TestIdentifier test = JUnitPlatformUtils.toTestIdentifier(testDescriptor);
+            if (test == null) {
+                return;
+            }
+            SkipReason skipReason = testEventsHandler.skipReason(test);
+            if (skipReason == null) {
+                return;
+            }
 
-      if (skipReason == SkipReason.ITR) {
-        Collection<TestTag> tags = testDescriptor.getTags();
-        for (TestTag tag : tags) {
-          if (CIConstants.Tags.ITR_UNSKIPPABLE_TAG.equals(tag.getName())) {
-            return;
-          }
-        }
-      }
+            if (skipReason == SkipReason.ITR) {
+                Collection<TestTag> tags = testDescriptor.getTags();
+                for (TestTag tag : tags) {
+                    if (CIConstants.Tags.ITR_UNSKIPPABLE_TAG.equals(tag.getName())) {
+                        return;
+                    }
+                }
+            }
 
-      skipResult = Node.SkipResult.skip(skipReason.getDescription());
-    }
+            skipResult = Node.SkipResult.skip(skipReason.getDescription());
+        }
 
-    // JUnit 5.3.0 and above
-    public static void muzzleCheck(final SameThreadHierarchicalTestExecutorService service) {
-      service.invokeAll(null);
+        // JUnit 5.3.0 and above
+        public static void muzzleCheck(final SameThreadHierarchicalTestExecutorService service) {
+            service.invokeAll(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java
index e3bd1d58eca..55dd698b7cf 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java
@@ -41,307 +41,297 @@
  */
 public abstract class JUnitPlatformUtils {
 
-  public static final String RETRY_DESCRIPTOR_ID_SUFFIX = "retry-attempt";
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(JUnitPlatformUtils.class);
-
-  public static final String ENGINE_ID_CUCUMBER = "cucumber";
-  public static final String ENGINE_ID_SPOCK = "spock";
-
-  public static final ComparableVersion junitV58 = new ComparableVersion("5.8");
-
-  public static final List<LibraryCapability> JUNIT_CAPABILITIES_BASE =
-      Arrays.asList(
-          LibraryCapability.TIA,
-          LibraryCapability.ATR,
-          LibraryCapability.EFD,
-          LibraryCapability.IMPACTED,
-          LibraryCapability.FTR,
-          LibraryCapability.QUARANTINE,
-          LibraryCapability.DISABLED,
-          LibraryCapability.ATTEMPT_TO_FIX);
-
-  public static final List<LibraryCapability> JUNIT_CAPABILITIES_ORDERING =
-      Arrays.asList(
-          LibraryCapability.TIA,
-          LibraryCapability.ATR,
-          LibraryCapability.EFD,
-          LibraryCapability.IMPACTED,
-          LibraryCapability.FTR,
-          LibraryCapability.QUARANTINE,
-          LibraryCapability.DISABLED,
-          LibraryCapability.ATTEMPT_TO_FIX,
-          LibraryCapability.FAIL_FAST);
-
-  public static final List<LibraryCapability> SPOCK_CAPABILITIES =
-      Arrays.asList(
-          LibraryCapability.TIA,
-          LibraryCapability.ATR,
-          LibraryCapability.EFD,
-          LibraryCapability.IMPACTED,
-          LibraryCapability.FTR,
-          LibraryCapability.QUARANTINE,
-          LibraryCapability.DISABLED,
-          LibraryCapability.ATTEMPT_TO_FIX);
-
-  public static final List<LibraryCapability> CUCUMBER_CAPABILITIES =
-      Arrays.asList(
-          LibraryCapability.TIA,
-          LibraryCapability.ATR,
-          LibraryCapability.EFD,
-          LibraryCapability.FTR,
-          LibraryCapability.QUARANTINE,
-          LibraryCapability.DISABLED,
-          LibraryCapability.ATTEMPT_TO_FIX);
-
-  private JUnitPlatformUtils() {}
-
-  private static final MethodHandles METHOD_HANDLES =
-      new MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
-
-  /**
-   * Loads a class by name from the default class loader, returning {@code null} if it is absent.
-   */
-  @Nullable
-  public static Class<?> loadClass(String className) {
-    try {
-      return ClassLoaderUtils.getDefaultClassLoader().loadClass(className);
-    } catch (Throwable t) {
-      return null;
+    public static final String RETRY_DESCRIPTOR_ID_SUFFIX = "retry-attempt";
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(JUnitPlatformUtils.class);
+
+    public static final String ENGINE_ID_CUCUMBER = "cucumber";
+    public static final String ENGINE_ID_SPOCK = "spock";
+
+    public static final ComparableVersion junitV58 = new ComparableVersion("5.8");
+
+    public static final List<LibraryCapability> JUNIT_CAPABILITIES_BASE = Arrays.asList(
+            LibraryCapability.TIA,
+            LibraryCapability.ATR,
+            LibraryCapability.EFD,
+            LibraryCapability.IMPACTED,
+            LibraryCapability.FTR,
+            LibraryCapability.QUARANTINE,
+            LibraryCapability.DISABLED,
+            LibraryCapability.ATTEMPT_TO_FIX);
+
+    public static final List<LibraryCapability> JUNIT_CAPABILITIES_ORDERING = Arrays.asList(
+            LibraryCapability.TIA,
+            LibraryCapability.ATR,
+            LibraryCapability.EFD,
+            LibraryCapability.IMPACTED,
+            LibraryCapability.FTR,
+            LibraryCapability.QUARANTINE,
+            LibraryCapability.DISABLED,
+            LibraryCapability.ATTEMPT_TO_FIX,
+            LibraryCapability.FAIL_FAST);
+
+    public static final List<LibraryCapability> SPOCK_CAPABILITIES = Arrays.asList(
+            LibraryCapability.TIA,
+            LibraryCapability.ATR,
+            LibraryCapability.EFD,
+            LibraryCapability.IMPACTED,
+            LibraryCapability.FTR,
+            LibraryCapability.QUARANTINE,
+            LibraryCapability.DISABLED,
+            LibraryCapability.ATTEMPT_TO_FIX);
+
+    public static final List<LibraryCapability> CUCUMBER_CAPABILITIES = Arrays.asList(
+            LibraryCapability.TIA,
+            LibraryCapability.ATR,
+            LibraryCapability.EFD,
+            LibraryCapability.FTR,
+            LibraryCapability.QUARANTINE,
+            LibraryCapability.DISABLED,
+            LibraryCapability.ATTEMPT_TO_FIX);
+
+    private JUnitPlatformUtils() {}
+
+    private static final MethodHandles METHOD_HANDLES = new MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
+
+    /**
+     * Loads a class by name from the default class loader, returning {@code null} if it is absent.
+     */
+    @Nullable
+    public static Class<?> loadClass(String className) {
+        try {
+            return ClassLoaderUtils.getDefaultClassLoader().loadClass(className);
+        } catch (Throwable t) {
+            return null;
+        }
     }
-  }
-
-  /*
-   * We have to support older versions of JUnit 5 that do not have certain methods that we would
-   * like to use. We try to get method handles in runtime, and if we fail to do it there's a
-   * fallback to alternative (less efficient) ways of getting the required info
-   */
-  private static final MethodHandle GET_JAVA_CLASS =
-      METHOD_HANDLES.method(MethodSource.class, "getJavaClass");
-  private static final MethodHandle GET_JAVA_METHOD =
-      METHOD_HANDLES.method(MethodSource.class, "getJavaMethod");
-
-  private static Class<?> getTestClass(MethodSource methodSource) {
-    Class<?> javaClass = METHOD_HANDLES.invoke(GET_JAVA_CLASS, methodSource);
-    if (javaClass != null) {
-      return javaClass;
+
+    /*
+     * We have to support older versions of JUnit 5 that do not have certain methods that we would
+     * like to use. We try to get method handles in runtime, and if we fail to do it there's a
+     * fallback to alternative (less efficient) ways of getting the required info
+     */
+    private static final MethodHandle GET_JAVA_CLASS = METHOD_HANDLES.method(MethodSource.class, "getJavaClass");
+    private static final MethodHandle GET_JAVA_METHOD = METHOD_HANDLES.method(MethodSource.class, "getJavaMethod");
+
+    private static Class<?> getTestClass(MethodSource methodSource) {
+        Class<?> javaClass = METHOD_HANDLES.invoke(GET_JAVA_CLASS, methodSource);
+        if (javaClass != null) {
+            return javaClass;
+        }
+        try {
+            return ClassLoaderUtils.getDefaultClassLoader().loadClass(methodSource.getClassName());
+        } catch (ClassNotFoundException e) {
+            return null;
+        }
     }
-    try {
-      return ClassLoaderUtils.getDefaultClassLoader().loadClass(methodSource.getClassName());
-    } catch (ClassNotFoundException e) {
-      return null;
+
+    private static Method getTestMethod(MethodSource methodSource) {
+        Method javaMethod = METHOD_HANDLES.invoke(GET_JAVA_METHOD, methodSource);
+        if (javaMethod != null) {
+            return javaMethod;
+        }
+
+        Class<?> testClass = getTestClass(methodSource);
+        if (testClass == null) {
+            return null;
+        }
+
+        String methodName = methodSource.getMethodName();
+        if (methodName == null || methodName.isEmpty()) {
+            return null;
+        }
+
+        try {
+            return ReflectionUtils.findMethod(testClass, methodName, methodSource.getMethodParameterTypes())
+                    .orElse(null);
+        } catch (JUnitException e) {
+            LOGGER.debug("Could not find method {} in class {}", methodName, testClass, e);
+            LOGGER.warn("Could not find test method");
+            return null;
+        }
     }
-  }
 
-  private static Method getTestMethod(MethodSource methodSource) {
-    Method javaMethod = METHOD_HANDLES.invoke(GET_JAVA_METHOD, methodSource);
-    if (javaMethod != null) {
-      return javaMethod;
+    public static String getParameters(TestDescriptor testDescriptor, MethodSource methodSource, String displayName) {
+        if (isDynamicTest(testDescriptor)
+                || (methodSource.getMethodParameterTypes() != null
+                        && !methodSource.getMethodParameterTypes().isEmpty())) {
+            return "{\"metadata\":{\"test_name\":" + toJson(displayName) + "}}";
+        }
+        return null;
     }
 
-    Class<?> testClass = getTestClass(methodSource);
-    if (testClass == null) {
-      return null;
+    @Nullable
+    public static TestIdentifier toTestIdentifier(TestDescriptor testDescriptor) {
+        TestSource testSource = testDescriptor.getSource().orElse(null);
+        if (testSource instanceof MethodSource) {
+            MethodSource methodSource = (MethodSource) testSource;
+            String testSuiteName = methodSource.getClassName();
+            String testName = methodSource.getMethodName();
+            String displayName = testDescriptor.getDisplayName();
+            String testParameters = getParameters(testDescriptor, methodSource, displayName);
+            return new TestIdentifier(testSuiteName, testName, testParameters);
+
+        } else {
+            return null;
+        }
     }
 
-    String methodName = methodSource.getMethodName();
-    if (methodName == null || methodName.isEmpty()) {
-      return null;
+    @Nonnull
+    public static TestSourceData toTestSourceData(TestDescriptor testDescriptor) {
+        TestSource testSource = testDescriptor.getSource().orElse(null);
+        if (!(testSource instanceof MethodSource)) {
+            return TestSourceData.UNKNOWN;
+        }
+
+        MethodSource methodSource = (MethodSource) testSource;
+        TestDescriptor suiteDescriptor = getSuiteDescriptor(testDescriptor);
+        Class<?> testClass = suiteDescriptor != null ? getJavaClass(suiteDescriptor) : getTestClass(methodSource);
+        Method testMethod = getTestMethod(methodSource);
+        String testMethodName = methodSource.getMethodName();
+        return new TestSourceData(testClass, testMethod, testMethodName);
     }
 
-    try {
-      return ReflectionUtils.findMethod(
-              testClass, methodName, methodSource.getMethodParameterTypes())
-          .orElse(null);
-    } catch (JUnitException e) {
-      LOGGER.debug("Could not find method {} in class {}", methodName, testClass, e);
-      LOGGER.warn("Could not find test method");
-      return null;
+    public static boolean isAssumptionFailure(Throwable throwable) {
+        switch (throwable.getClass().getName()) {
+            case "org.junit.AssumptionViolatedException":
+            case "org.junit.internal.AssumptionViolatedException":
+            case "org.opentest4j.TestAbortedException":
+            case "org.opentest4j.TestSkippedException":
+                // If the test assumption fails, one of the following exceptions will be thrown.
+                // The consensus is to treat "assumptions failure" as skipped tests.
+                return true;
+            default:
+                return false;
+        }
     }
-  }
-
-  public static String getParameters(
-      TestDescriptor testDescriptor, MethodSource methodSource, String displayName) {
-    if (isDynamicTest(testDescriptor)
-        || (methodSource.getMethodParameterTypes() != null
-            && !methodSource.getMethodParameterTypes().isEmpty())) {
-      return "{\"metadata\":{\"test_name\":" + toJson(displayName) + "}}";
+
+    public static boolean isTestInProgress() {
+        AgentSpan span = AgentTracer.activeSpan();
+        if (span == null) {
+            return false;
+        }
+        return InternalSpanTypes.TEST.toString().equals(span.getSpanType());
     }
-    return null;
-  }
-
-  @Nullable
-  public static TestIdentifier toTestIdentifier(TestDescriptor testDescriptor) {
-    TestSource testSource = testDescriptor.getSource().orElse(null);
-    if (testSource instanceof MethodSource) {
-      MethodSource methodSource = (MethodSource) testSource;
-      String testSuiteName = methodSource.getClassName();
-      String testName = methodSource.getMethodName();
-      String displayName = testDescriptor.getDisplayName();
-      String testParameters = getParameters(testDescriptor, methodSource, displayName);
-      return new TestIdentifier(testSuiteName, testName, testParameters);
-
-    } else {
-      return null;
+
+    public static Class<?> getJavaClass(TestDescriptor testDescriptor) {
+        TestSource testSource = testDescriptor.getSource().orElse(null);
+        if (testSource instanceof ClassSource) {
+            ClassSource classSource = (ClassSource) testSource;
+            return classSource.getJavaClass();
+
+        } else if (testSource instanceof MethodSource) {
+            MethodSource methodSource = (MethodSource) testSource;
+            return getTestClass(methodSource);
+
+        } else {
+            return null;
+        }
     }
-  }
 
-  @Nonnull
-  public static TestSourceData toTestSourceData(TestDescriptor testDescriptor) {
-    TestSource testSource = testDescriptor.getSource().orElse(null);
-    if (!(testSource instanceof MethodSource)) {
-      return TestSourceData.UNKNOWN;
+    public static boolean isSuite(TestDescriptor testDescriptor) {
+        UniqueId uniqueId = testDescriptor.getUniqueId();
+        List<UniqueId.Segment> segments = uniqueId.getSegments();
+        UniqueId.Segment lastSegment = segments.get(segments.size() - 1);
+        return "class".equals(lastSegment.getType()) // "regular" JUnit test class
+                || "nested-class".equals(lastSegment.getType()); // nested JUnit test class
     }
 
-    MethodSource methodSource = (MethodSource) testSource;
-    TestDescriptor suiteDescriptor = getSuiteDescriptor(testDescriptor);
-    Class<?> testClass =
-        suiteDescriptor != null ? getJavaClass(suiteDescriptor) : getTestClass(methodSource);
-    Method testMethod = getTestMethod(methodSource);
-    String testMethodName = methodSource.getMethodName();
-    return new TestSourceData(testClass, testMethod, testMethodName);
-  }
-
-  public static boolean isAssumptionFailure(Throwable throwable) {
-    switch (throwable.getClass().getName()) {
-      case "org.junit.AssumptionViolatedException":
-      case "org.junit.internal.AssumptionViolatedException":
-      case "org.opentest4j.TestAbortedException":
-      case "org.opentest4j.TestSkippedException":
-        // If the test assumption fails, one of the following exceptions will be thrown.
-        // The consensus is to treat "assumptions failure" as skipped tests.
-        return true;
-      default:
-        return false;
+    public static boolean isParameterizedTest(TestDescriptor testDescriptor) {
+        UniqueId uniqueId = testDescriptor.getUniqueId();
+        List<UniqueId.Segment> segments = uniqueId.getSegments();
+        UniqueId.Segment lastSegment = segments.get(segments.size() - 1);
+        return "test-template".equals(lastSegment.getType());
     }
-  }
 
-  public static boolean isTestInProgress() {
-    AgentSpan span = AgentTracer.activeSpan();
-    if (span == null) {
-      return false;
+    public static boolean isDynamicTest(TestDescriptor testDescriptor) {
+        // retries add a "retry-attempt" segment at the end of the uniqueId, so the "dynamic-test"
+        // segment might not be found in position (segments.size() - 1)
+        return getIDSegmentValue(testDescriptor, "dynamic-test") != null;
     }
-    return InternalSpanTypes.TEST.toString().equals(span.getSpanType());
-  }
 
-  public static Class<?> getJavaClass(TestDescriptor testDescriptor) {
-    TestSource testSource = testDescriptor.getSource().orElse(null);
-    if (testSource instanceof ClassSource) {
-      ClassSource classSource = (ClassSource) testSource;
-      return classSource.getJavaClass();
+    public static boolean isRetry(TestDescriptor testDescriptor) {
+        return getIDSegmentValue(testDescriptor, RETRY_DESCRIPTOR_ID_SUFFIX) != null;
+    }
 
-    } else if (testSource instanceof MethodSource) {
-      MethodSource methodSource = (MethodSource) testSource;
-      return getTestClass(methodSource);
+    private static String getIDSegmentValue(TestDescriptor testDescriptor, String segmentName) {
+        UniqueId uniqueId = testDescriptor.getUniqueId();
+        List<UniqueId.Segment> segments = uniqueId.getSegments();
+        for (UniqueId.Segment segment : segments) {
+            if (segmentName.equals(segment.getType())) {
+                return segment.getValue();
+            }
+        }
+        return null;
+    }
 
-    } else {
-      return null;
+    public static TestDescriptor getSuiteDescriptor(TestDescriptor testDescriptor) {
+        while (testDescriptor != null && !isSuite(testDescriptor)) {
+            testDescriptor = testDescriptor.getParent().orElse(null);
+        }
+        return testDescriptor;
     }
-  }
-
-  public static boolean isSuite(TestDescriptor testDescriptor) {
-    UniqueId uniqueId = testDescriptor.getUniqueId();
-    List<UniqueId.Segment> segments = uniqueId.getSegments();
-    UniqueId.Segment lastSegment = segments.get(segments.size() - 1);
-    return "class".equals(lastSegment.getType()) // "regular" JUnit test class
-        || "nested-class".equals(lastSegment.getType()); // nested JUnit test class
-  }
-
-  public static boolean isParameterizedTest(TestDescriptor testDescriptor) {
-    UniqueId uniqueId = testDescriptor.getUniqueId();
-    List<UniqueId.Segment> segments = uniqueId.getSegments();
-    UniqueId.Segment lastSegment = segments.get(segments.size() - 1);
-    return "test-template".equals(lastSegment.getType());
-  }
-
-  public static boolean isDynamicTest(TestDescriptor testDescriptor) {
-    // retries add a "retry-attempt" segment at the end of the uniqueId, so the "dynamic-test"
-    // segment might not be found in position (segments.size() - 1)
-    return getIDSegmentValue(testDescriptor, "dynamic-test") != null;
-  }
-
-  public static boolean isRetry(TestDescriptor testDescriptor) {
-    return getIDSegmentValue(testDescriptor, RETRY_DESCRIPTOR_ID_SUFFIX) != null;
-  }
-
-  private static String getIDSegmentValue(TestDescriptor testDescriptor, String segmentName) {
-    UniqueId uniqueId = testDescriptor.getUniqueId();
-    List<UniqueId.Segment> segments = uniqueId.getSegments();
-    for (UniqueId.Segment segment : segments) {
-      if (segmentName.equals(segment.getType())) {
-        return segment.getValue();
-      }
+
+    public static TestFrameworkInstrumentation engineToFramework(TestEngine testEngine) {
+        String testEngineClassName = testEngine.getClass().getName();
+        if (testEngineClassName.startsWith("io.cucumber")) {
+            return TestFrameworkInstrumentation.CUCUMBER;
+        } else if (testEngineClassName.startsWith("org.spockframework")) {
+            return TestFrameworkInstrumentation.SPOCK;
+        } else {
+            return TestFrameworkInstrumentation.JUNIT5;
+        }
     }
-    return null;
-  }
 
-  public static TestDescriptor getSuiteDescriptor(TestDescriptor testDescriptor) {
-    while (testDescriptor != null && !isSuite(testDescriptor)) {
-      testDescriptor = testDescriptor.getParent().orElse(null);
+    public static String getEngineId(TestDescriptor testDescriptor) {
+        UniqueId uniqueId = testDescriptor.getUniqueId();
+        List<UniqueId.Segment> segments = uniqueId.getSegments();
+        ListIterator<UniqueId.Segment> it = segments.listIterator(segments.size());
+        while (it.hasPrevious()) {
+            UniqueId.Segment segment = it.previous();
+            if ("engine".equals(segment.getType())) {
+                return segment.getValue();
+            }
+        }
+        return null;
     }
-    return testDescriptor;
-  }
-
-  public static TestFrameworkInstrumentation engineToFramework(TestEngine testEngine) {
-    String testEngineClassName = testEngine.getClass().getName();
-    if (testEngineClassName.startsWith("io.cucumber")) {
-      return TestFrameworkInstrumentation.CUCUMBER;
-    } else if (testEngineClassName.startsWith("org.spockframework")) {
-      return TestFrameworkInstrumentation.SPOCK;
-    } else {
-      return TestFrameworkInstrumentation.JUNIT5;
+
+    public static TestFrameworkInstrumentation engineIdToFramework(String engineId) {
+        if (ENGINE_ID_CUCUMBER.equals(engineId)) {
+            return TestFrameworkInstrumentation.CUCUMBER;
+        } else if (ENGINE_ID_SPOCK.equals(engineId)) {
+            return TestFrameworkInstrumentation.SPOCK;
+        } else {
+            return TestFrameworkInstrumentation.JUNIT5;
+        }
     }
-  }
-
-  public static String getEngineId(TestDescriptor testDescriptor) {
-    UniqueId uniqueId = testDescriptor.getUniqueId();
-    List<UniqueId.Segment> segments = uniqueId.getSegments();
-    ListIterator<UniqueId.Segment> it = segments.listIterator(segments.size());
-    while (it.hasPrevious()) {
-      UniqueId.Segment segment = it.previous();
-      if ("engine".equals(segment.getType())) {
-        return segment.getValue();
-      }
+
+    // only used in junit5 and spock, cucumber has its own utils method
+    @Nullable
+    public static String getFrameworkVersion(TestEngine testEngine) {
+        return testEngine.getVersion().orElse(null);
     }
-    return null;
-  }
-
-  public static TestFrameworkInstrumentation engineIdToFramework(String engineId) {
-    if (ENGINE_ID_CUCUMBER.equals(engineId)) {
-      return TestFrameworkInstrumentation.CUCUMBER;
-    } else if (ENGINE_ID_SPOCK.equals(engineId)) {
-      return TestFrameworkInstrumentation.SPOCK;
-    } else {
-      return TestFrameworkInstrumentation.JUNIT5;
+
+    public static boolean isJunitTestOrderingSupported(String version) {
+        return version != null && junitV58.compareTo(new ComparableVersion(version)) <= 0;
     }
-  }
-
-  // only used in junit5 and spock, cucumber has its own utils method
-  @Nullable
-  public static String getFrameworkVersion(TestEngine testEngine) {
-    return testEngine.getVersion().orElse(null);
-  }
-
-  public static boolean isJunitTestOrderingSupported(String version) {
-    return version != null && junitV58.compareTo(new ComparableVersion(version)) <= 0;
-  }
-
-  public static List<LibraryCapability> capabilities(TestEngine testEngine) {
-    TestFrameworkInstrumentation framework = engineToFramework(testEngine);
-    if (framework.equals(TestFrameworkInstrumentation.CUCUMBER)) {
-      return CUCUMBER_CAPABILITIES;
-    } else if (framework.equals(TestFrameworkInstrumentation.SPOCK)) {
-      return SPOCK_CAPABILITIES;
-    } else {
-      if (isJunitTestOrderingSupported(getFrameworkVersion(testEngine))) {
-        return JUNIT_CAPABILITIES_ORDERING;
-      } else {
-        return JUNIT_CAPABILITIES_BASE;
-      }
+
+    public static List<LibraryCapability> capabilities(TestEngine testEngine) {
+        TestFrameworkInstrumentation framework = engineToFramework(testEngine);
+        if (framework.equals(TestFrameworkInstrumentation.CUCUMBER)) {
+            return CUCUMBER_CAPABILITIES;
+        } else if (framework.equals(TestFrameworkInstrumentation.SPOCK)) {
+            return SPOCK_CAPABILITIES;
+        } else {
+            if (isJunitTestOrderingSupported(getFrameworkVersion(testEngine))) {
+                return JUNIT_CAPABILITIES_ORDERING;
+            } else {
+                return JUNIT_CAPABILITIES_BASE;
+            }
+        }
     }
-  }
 
-  public static List<String> getTags(TestDescriptor testDescriptor) {
-    return testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
-  }
+    public static List<String> getTags(TestDescriptor testDescriptor) {
+        return testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestDataFactory.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestDataFactory.java
index b2a04c2b113..28e4cfe43b8 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestDataFactory.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestDataFactory.java
@@ -14,72 +14,72 @@
 
 public abstract class TestDataFactory {
 
-  private TestDataFactory() {}
+    private TestDataFactory() {}
 
-  private static volatile Map<String, Function<TestDescriptor, TestIdentifier>>
-      TEST_IDENTIFIER_FACTORY_BY_ENGINE_ID = Collections.emptyMap();
+    private static volatile Map<String, Function<TestDescriptor, TestIdentifier>> TEST_IDENTIFIER_FACTORY_BY_ENGINE_ID =
+            Collections.emptyMap();
 
-  private static volatile Map<String, Function<TestDescriptor, TestSourceData>>
-      TEST_SOURCE_DATA_FACTORY_BY_ENGINE_ID = Collections.emptyMap();
+    private static volatile Map<String, Function<TestDescriptor, TestSourceData>>
+            TEST_SOURCE_DATA_FACTORY_BY_ENGINE_ID = Collections.emptyMap();
 
-  private static volatile Map<String, Predicate<TestDescriptor>>
-      TEST_DESCRIPTOR_FILTER_BY_ENGINE_ID = Collections.emptyMap();
+    private static volatile Map<String, Predicate<TestDescriptor>> TEST_DESCRIPTOR_FILTER_BY_ENGINE_ID =
+            Collections.emptyMap();
 
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification = "Holder class not exposed to application code; locking on its Class is safe")
-  public static synchronized void register(
-      String engineId,
-      Function<TestDescriptor, TestIdentifier> testIdentifierFactory,
-      Function<TestDescriptor, TestSourceData> testSourceDataFactory,
-      @Nullable Predicate<TestDescriptor> testDescriptorFilter) {
-    TEST_IDENTIFIER_FACTORY_BY_ENGINE_ID =
-        addEntry(TEST_IDENTIFIER_FACTORY_BY_ENGINE_ID, engineId, testIdentifierFactory);
-    TEST_SOURCE_DATA_FACTORY_BY_ENGINE_ID =
-        addEntry(TEST_SOURCE_DATA_FACTORY_BY_ENGINE_ID, engineId, testSourceDataFactory);
-    if (testDescriptorFilter != null) {
-      TEST_DESCRIPTOR_FILTER_BY_ENGINE_ID =
-          addEntry(TEST_DESCRIPTOR_FILTER_BY_ENGINE_ID, engineId, testDescriptorFilter);
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Holder class not exposed to application code; locking on its Class is safe")
+    public static synchronized void register(
+            String engineId,
+            Function<TestDescriptor, TestIdentifier> testIdentifierFactory,
+            Function<TestDescriptor, TestSourceData> testSourceDataFactory,
+            @Nullable Predicate<TestDescriptor> testDescriptorFilter) {
+        TEST_IDENTIFIER_FACTORY_BY_ENGINE_ID =
+                addEntry(TEST_IDENTIFIER_FACTORY_BY_ENGINE_ID, engineId, testIdentifierFactory);
+        TEST_SOURCE_DATA_FACTORY_BY_ENGINE_ID =
+                addEntry(TEST_SOURCE_DATA_FACTORY_BY_ENGINE_ID, engineId, testSourceDataFactory);
+        if (testDescriptorFilter != null) {
+            TEST_DESCRIPTOR_FILTER_BY_ENGINE_ID =
+                    addEntry(TEST_DESCRIPTOR_FILTER_BY_ENGINE_ID, engineId, testDescriptorFilter);
+        }
     }
-  }
 
-  private static <K, V> Map<K, V> addEntry(Map<K, V> originalMap, K key, V value) {
-    Map<K, V> updatedMap = new HashMap<>(originalMap);
-    updatedMap.put(key, value);
-    return updatedMap;
-  }
+    private static <K, V> Map<K, V> addEntry(Map<K, V> originalMap, K key, V value) {
+        Map<K, V> updatedMap = new HashMap<>(originalMap);
+        updatedMap.put(key, value);
+        return updatedMap;
+    }
 
-  public static TestIdentifier createTestIdentifier(TestDescriptor testDescriptor) {
-    return engineId(testDescriptor)
-        .map(TEST_IDENTIFIER_FACTORY_BY_ENGINE_ID::get)
-        .orElse(JUnitPlatformUtils::toTestIdentifier)
-        .apply(testDescriptor);
-  }
+    public static TestIdentifier createTestIdentifier(TestDescriptor testDescriptor) {
+        return engineId(testDescriptor)
+                .map(TEST_IDENTIFIER_FACTORY_BY_ENGINE_ID::get)
+                .orElse(JUnitPlatformUtils::toTestIdentifier)
+                .apply(testDescriptor);
+    }
 
-  public static TestSourceData createTestSourceData(TestDescriptor testDescriptor) {
-    return engineId(testDescriptor)
-        .map(TEST_SOURCE_DATA_FACTORY_BY_ENGINE_ID::get)
-        .orElse(JUnitPlatformUtils::toTestSourceData)
-        .apply(testDescriptor);
-  }
+    public static TestSourceData createTestSourceData(TestDescriptor testDescriptor) {
+        return engineId(testDescriptor)
+                .map(TEST_SOURCE_DATA_FACTORY_BY_ENGINE_ID::get)
+                .orElse(JUnitPlatformUtils::toTestSourceData)
+                .apply(testDescriptor);
+    }
 
-  public static boolean shouldBeTraced(TestDescriptor testDescriptor) {
-    return engineId(testDescriptor)
-        .map(TEST_DESCRIPTOR_FILTER_BY_ENGINE_ID::get)
-        .map(filter -> filter.test(testDescriptor))
-        .orElse(true);
-  }
+    public static boolean shouldBeTraced(TestDescriptor testDescriptor) {
+        return engineId(testDescriptor)
+                .map(TEST_DESCRIPTOR_FILTER_BY_ENGINE_ID::get)
+                .map(filter -> filter.test(testDescriptor))
+                .orElse(true);
+    }
 
-  /**
-   * Resolves the innermost {@code engine} segment rather than the root one returned by the JUnit
-   * Platform {@code UniqueId#getEngineId()}.
-   *
-   * <p>Per-engine factories are registered under leaf engine ids ({@code cucumber}, {@code spock},
-   * ...). When a framework runs nested under {@code junit-platform-suite-engine}, the unique id is
-   * rooted at the suite engine (e.g. {@code
-   * [engine:junit-platform-suite]/[suite:...]/[engine:cucumber]/...}).
-   */
-  private static Optional<String> engineId(TestDescriptor testDescriptor) {
-    return Optional.ofNullable(JUnitPlatformUtils.getEngineId(testDescriptor));
-  }
+    /**
+     * Resolves the innermost {@code engine} segment rather than the root one returned by the JUnit
+     * Platform {@code UniqueId#getEngineId()}.
+     *
+     * <p>Per-engine factories are registered under leaf engine ids ({@code cucumber}, {@code spock},
+     * ...). When a framework runs nested under {@code junit-platform-suite-engine}, the unique id is
+     * rooted at the suite engine (e.g. {@code
+     * [engine:junit-platform-suite]/[suite:...]/[engine:cucumber]/...}).
+     */
+    private static Optional<String> engineId(TestDescriptor testDescriptor) {
+        return Optional.ofNullable(JUnitPlatformUtils.getEngineId(testDescriptor));
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java
index 1c8656a07cd..8b690524276 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java
@@ -15,69 +15,62 @@
 
 public abstract class TestEventsHandlerHolder {
 
-  // store one handler per framework running
-  public static final Map<
-          TestFrameworkInstrumentation, TestEventsHandler<TestDescriptor, TestDescriptor>>
-      HANDLERS = new ConcurrentEnumMap<>(TestFrameworkInstrumentation.class);
+    // store one handler per framework running
+    public static final Map<TestFrameworkInstrumentation, TestEventsHandler<TestDescriptor, TestDescriptor>> HANDLERS =
+            new ConcurrentEnumMap<>(TestFrameworkInstrumentation.class);
 
-  private static volatile ContextStore<TestDescriptor, TestExecutionTracker>
-      EXECUTION_TRACKER_STORE;
+    private static volatile ContextStore<TestDescriptor, TestExecutionTracker> EXECUTION_TRACKER_STORE;
 
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification = "Holder class not exposed to application code; locking on its Class is safe")
-  public static synchronized void setExecutionTrackerStore(
-      ContextStore<TestDescriptor, TestExecutionTracker> executionTrackerStore) {
-    if (EXECUTION_TRACKER_STORE == null) {
-      EXECUTION_TRACKER_STORE = executionTrackerStore;
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Holder class not exposed to application code; locking on its Class is safe")
+    public static synchronized void setExecutionTrackerStore(
+            ContextStore<TestDescriptor, TestExecutionTracker> executionTrackerStore) {
+        if (EXECUTION_TRACKER_STORE == null) {
+            EXECUTION_TRACKER_STORE = executionTrackerStore;
+        }
     }
-  }
 
-  public static void setExecutionTracker(
-      TestDescriptor testDescriptor, TestExecutionTracker tracker) {
-    if (EXECUTION_TRACKER_STORE != null) {
-      EXECUTION_TRACKER_STORE.put(testDescriptor, tracker);
+    public static void setExecutionTracker(TestDescriptor testDescriptor, TestExecutionTracker tracker) {
+        if (EXECUTION_TRACKER_STORE != null) {
+            EXECUTION_TRACKER_STORE.put(testDescriptor, tracker);
+        }
     }
-  }
 
-  public static TestExecutionTracker getExecutionTracker(TestDescriptor testDescriptor) {
-    if (EXECUTION_TRACKER_STORE != null) {
-      return EXECUTION_TRACKER_STORE.get(testDescriptor);
-    } else {
-      return null;
+    public static TestExecutionTracker getExecutionTracker(TestDescriptor testDescriptor) {
+        if (EXECUTION_TRACKER_STORE != null) {
+            return EXECUTION_TRACKER_STORE.get(testDescriptor);
+        } else {
+            return null;
+        }
     }
-  }
 
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification = "Holder class not exposed to application code; locking on its Class is safe")
-  public static synchronized void start(
-      TestEngine testEngine,
-      ContextStore<TestDescriptor, DDTestSuite> suiteStore,
-      ContextStore<TestDescriptor, DDTest> testStore) {
-    TestFrameworkInstrumentation framework = JUnitPlatformUtils.engineToFramework(testEngine);
-    TestEventsHandler<TestDescriptor, TestDescriptor> handler = HANDLERS.get(framework);
-    if (handler == null) {
-      handler =
-          InstrumentationBridge.createTestEventsHandler(
-              framework.name().toLowerCase(),
-              suiteStore,
-              testStore,
-              JUnitPlatformUtils.capabilities(testEngine));
-      HANDLERS.put(framework, handler);
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Holder class not exposed to application code; locking on its Class is safe")
+    public static synchronized void start(
+            TestEngine testEngine,
+            ContextStore<TestDescriptor, DDTestSuite> suiteStore,
+            ContextStore<TestDescriptor, DDTest> testStore) {
+        TestFrameworkInstrumentation framework = JUnitPlatformUtils.engineToFramework(testEngine);
+        TestEventsHandler<TestDescriptor, TestDescriptor> handler = HANDLERS.get(framework);
+        if (handler == null) {
+            handler = InstrumentationBridge.createTestEventsHandler(
+                    framework.name().toLowerCase(), suiteStore, testStore, JUnitPlatformUtils.capabilities(testEngine));
+            HANDLERS.put(framework, handler);
+        }
     }
-  }
 
-  /** Used by instrumentation tests */
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification = "Holder class not exposed to application code; locking on its Class is safe")
-  public static synchronized void stop() {
-    for (TestEventsHandler<TestDescriptor, TestDescriptor> handler : HANDLERS.values()) {
-      handler.close();
+    /** Used by instrumentation tests */
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Holder class not exposed to application code; locking on its Class is safe")
+    public static synchronized void stop() {
+        for (TestEventsHandler<TestDescriptor, TestDescriptor> handler : HANDLERS.values()) {
+            handler.close();
+        }
+        HANDLERS.clear();
     }
-    HANDLERS.clear();
-  }
 
-  private TestEventsHandlerHolder() {}
+    private TestEventsHandlerHolder() {}
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java
index f8909b651ff..905dbeae719 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java
@@ -20,246 +20,238 @@
 
 public class TracingListener implements EngineExecutionListener {
 
-  private final String testFramework;
-  private final String testFrameworkVersion;
-
-  public TracingListener(TestEngine testEngine) {
-    String engineId = testEngine.getId();
-    testFramework = engineId == null || engineId.startsWith("junit") ? "junit5" : engineId;
-    testFrameworkVersion = JUnitPlatformUtils.getFrameworkVersion(testEngine);
-  }
-
-  @Override
-  public void dynamicTestRegistered(TestDescriptor testDescriptor) {
-    // no op
-  }
-
-  @Override
-  public void reportingEntryPublished(TestDescriptor testDescriptor, ReportEntry entry) {
-    // no op
-  }
-
-  @Override
-  public void executionStarted(final TestDescriptor descriptor) {
-    if (descriptor.isContainer()) {
-      containerExecutionStarted(descriptor);
-    } else if (descriptor.isTest()) {
-      testCaseExecutionStarted(descriptor);
+    private final String testFramework;
+    private final String testFrameworkVersion;
+
+    public TracingListener(TestEngine testEngine) {
+        String engineId = testEngine.getId();
+        testFramework = engineId == null || engineId.startsWith("junit") ? "junit5" : engineId;
+        testFrameworkVersion = JUnitPlatformUtils.getFrameworkVersion(testEngine);
     }
-  }
-
-  @Override
-  public void executionFinished(
-      TestDescriptor descriptor, TestExecutionResult testExecutionResult) {
-    if (descriptor.isContainer()) {
-      containerExecutionFinished(descriptor, testExecutionResult);
-    } else if (descriptor.isTest()) {
-      testCaseExecutionFinished(descriptor, testExecutionResult);
+
+    @Override
+    public void dynamicTestRegistered(TestDescriptor testDescriptor) {
+        // no op
     }
-  }
 
-  private void containerExecutionStarted(final TestDescriptor suiteDescriptor) {
-    if (!JUnitPlatformUtils.isSuite(suiteDescriptor)) {
-      return;
+    @Override
+    public void reportingEntryPublished(TestDescriptor testDescriptor, ReportEntry entry) {
+        // no op
+    }
+
+    @Override
+    public void executionStarted(final TestDescriptor descriptor) {
+        if (descriptor.isContainer()) {
+            containerExecutionStarted(descriptor);
+        } else if (descriptor.isTest()) {
+            testCaseExecutionStarted(descriptor);
+        }
     }
 
-    Class<?> testClass = JUnitPlatformUtils.getJavaClass(suiteDescriptor);
-    String testSuiteName =
-        testClass != null ? testClass.getName() : suiteDescriptor.getLegacyReportingName();
-    List<String> tags =
-        suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.JUNIT5)
-        .onTestSuiteStart(
-            suiteDescriptor,
-            testSuiteName,
-            testFramework,
-            testFrameworkVersion,
-            testClass,
-            tags,
-            false,
-            TestFrameworkInstrumentation.JUNIT5,
-            null);
-  }
-
-  private void containerExecutionFinished(
-      final TestDescriptor suiteDescriptor, final TestExecutionResult testExecutionResult) {
-    if (!JUnitPlatformUtils.isSuite(suiteDescriptor)) {
-      return;
+    @Override
+    public void executionFinished(TestDescriptor descriptor, TestExecutionResult testExecutionResult) {
+        if (descriptor.isContainer()) {
+            containerExecutionFinished(descriptor, testExecutionResult);
+        } else if (descriptor.isTest()) {
+            testCaseExecutionFinished(descriptor, testExecutionResult);
+        }
     }
 
-    Throwable throwable = testExecutionResult.getThrowable().orElse(null);
-    if (throwable != null) {
-      if (JUnitPlatformUtils.isAssumptionFailure(throwable)) {
-        String reason = throwable.getMessage();
+    private void containerExecutionStarted(final TestDescriptor suiteDescriptor) {
+        if (!JUnitPlatformUtils.isSuite(suiteDescriptor)) {
+            return;
+        }
+
+        Class<?> testClass = JUnitPlatformUtils.getJavaClass(suiteDescriptor);
+        String testSuiteName = testClass != null ? testClass.getName() : suiteDescriptor.getLegacyReportingName();
+        List<String> tags =
+                suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
         TestEventsHandlerHolder.HANDLERS
-            .get(TestFrameworkInstrumentation.JUNIT5)
-            .onTestSuiteSkip(suiteDescriptor, reason);
+                .get(TestFrameworkInstrumentation.JUNIT5)
+                .onTestSuiteStart(
+                        suiteDescriptor,
+                        testSuiteName,
+                        testFramework,
+                        testFrameworkVersion,
+                        testClass,
+                        tags,
+                        false,
+                        TestFrameworkInstrumentation.JUNIT5,
+                        null);
+    }
 
-        for (TestDescriptor child : suiteDescriptor.getChildren()) {
-          executionSkipped(child, reason);
+    private void containerExecutionFinished(
+            final TestDescriptor suiteDescriptor, final TestExecutionResult testExecutionResult) {
+        if (!JUnitPlatformUtils.isSuite(suiteDescriptor)) {
+            return;
+        }
+
+        Throwable throwable = testExecutionResult.getThrowable().orElse(null);
+        if (throwable != null) {
+            if (JUnitPlatformUtils.isAssumptionFailure(throwable)) {
+                String reason = throwable.getMessage();
+                TestEventsHandlerHolder.HANDLERS
+                        .get(TestFrameworkInstrumentation.JUNIT5)
+                        .onTestSuiteSkip(suiteDescriptor, reason);
+
+                for (TestDescriptor child : suiteDescriptor.getChildren()) {
+                    executionSkipped(child, reason);
+                }
+            } else {
+                TestEventsHandlerHolder.HANDLERS
+                        .get(TestFrameworkInstrumentation.JUNIT5)
+                        .onTestSuiteFailure(suiteDescriptor, throwable);
+            }
         }
-      } else {
         TestEventsHandlerHolder.HANDLERS
-            .get(TestFrameworkInstrumentation.JUNIT5)
-            .onTestSuiteFailure(suiteDescriptor, throwable);
-      }
+                .get(TestFrameworkInstrumentation.JUNIT5)
+                .onTestSuiteFinish(suiteDescriptor, null);
     }
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.JUNIT5)
-        .onTestSuiteFinish(suiteDescriptor, null);
-  }
-
-  private void testCaseExecutionStarted(final TestDescriptor testDescriptor) {
-    TestSource testSource = testDescriptor.getSource().orElse(null);
-    if (testSource instanceof MethodSource) {
-      testMethodExecutionStarted(testDescriptor, (MethodSource) testSource);
+
+    private void testCaseExecutionStarted(final TestDescriptor testDescriptor) {
+        TestSource testSource = testDescriptor.getSource().orElse(null);
+        if (testSource instanceof MethodSource) {
+            testMethodExecutionStarted(testDescriptor, (MethodSource) testSource);
+        }
     }
-  }
-
-  private void testMethodExecutionStarted(TestDescriptor testDescriptor, MethodSource testSource) {
-    TestDescriptor suiteDescriptor = JUnitPlatformUtils.getSuiteDescriptor(testDescriptor);
-
-    String displayName = testDescriptor.getDisplayName();
-    String testName = testSource.getMethodName();
-    String testParameters =
-        JUnitPlatformUtils.getParameters(testDescriptor, testSource, displayName);
-    List<String> tags = JUnitPlatformUtils.getTags(testDescriptor);
-    TestSourceData testSourceData = JUnitPlatformUtils.toTestSourceData(testDescriptor);
-
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.JUNIT5)
-        .onTestStart(
-            suiteDescriptor,
-            testDescriptor,
-            testName,
-            testFramework,
-            testFrameworkVersion,
-            testParameters,
-            tags,
-            testSourceData,
-            null,
-            TestEventsHandlerHolder.getExecutionTracker(testDescriptor));
-
-    if (JUnitPlatformUtils.isDynamicTest(testDescriptor)) {
-      AgentSpan span = AgentTracer.activeSpan();
-      if (span != null) {
-        span.setTag(Tags.TEST_JUNIT_IS_DYNAMIC, true);
-      }
+
+    private void testMethodExecutionStarted(TestDescriptor testDescriptor, MethodSource testSource) {
+        TestDescriptor suiteDescriptor = JUnitPlatformUtils.getSuiteDescriptor(testDescriptor);
+
+        String displayName = testDescriptor.getDisplayName();
+        String testName = testSource.getMethodName();
+        String testParameters = JUnitPlatformUtils.getParameters(testDescriptor, testSource, displayName);
+        List<String> tags = JUnitPlatformUtils.getTags(testDescriptor);
+        TestSourceData testSourceData = JUnitPlatformUtils.toTestSourceData(testDescriptor);
+
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.JUNIT5)
+                .onTestStart(
+                        suiteDescriptor,
+                        testDescriptor,
+                        testName,
+                        testFramework,
+                        testFrameworkVersion,
+                        testParameters,
+                        tags,
+                        testSourceData,
+                        null,
+                        TestEventsHandlerHolder.getExecutionTracker(testDescriptor));
+
+        if (JUnitPlatformUtils.isDynamicTest(testDescriptor)) {
+            AgentSpan span = AgentTracer.activeSpan();
+            if (span != null) {
+                span.setTag(Tags.TEST_JUNIT_IS_DYNAMIC, true);
+            }
+        }
     }
-  }
 
-  private void testCaseExecutionFinished(
-      final TestDescriptor testDescriptor, final TestExecutionResult testExecutionResult) {
-    TestSource testSource = testDescriptor.getSource().orElse(null);
-    if (testSource instanceof MethodSource) {
-      testMethodExecutionFinished(testDescriptor, testExecutionResult);
+    private void testCaseExecutionFinished(
+            final TestDescriptor testDescriptor, final TestExecutionResult testExecutionResult) {
+        TestSource testSource = testDescriptor.getSource().orElse(null);
+        if (testSource instanceof MethodSource) {
+            testMethodExecutionFinished(testDescriptor, testExecutionResult);
+        }
     }
-  }
 
-  private void testMethodExecutionFinished(
-      TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) {
-    Throwable throwable = testExecutionResult.getThrowable().orElse(null);
-    if (throwable != null) {
-      if (JUnitPlatformUtils.isAssumptionFailure(throwable)) {
-        TestEventsHandlerHolder.HANDLERS
-            .get(TestFrameworkInstrumentation.JUNIT5)
-            .onTestSkip(testDescriptor, throwable.getMessage());
-      } else {
+    private void testMethodExecutionFinished(TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) {
+        Throwable throwable = testExecutionResult.getThrowable().orElse(null);
+        if (throwable != null) {
+            if (JUnitPlatformUtils.isAssumptionFailure(throwable)) {
+                TestEventsHandlerHolder.HANDLERS
+                        .get(TestFrameworkInstrumentation.JUNIT5)
+                        .onTestSkip(testDescriptor, throwable.getMessage());
+            } else {
+                TestEventsHandlerHolder.HANDLERS
+                        .get(TestFrameworkInstrumentation.JUNIT5)
+                        .onTestFailure(testDescriptor, throwable);
+            }
+        }
+        TestExecutionTracker executionTracker = TestEventsHandlerHolder.getExecutionTracker(testDescriptor);
         TestEventsHandlerHolder.HANDLERS
-            .get(TestFrameworkInstrumentation.JUNIT5)
-            .onTestFailure(testDescriptor, throwable);
-      }
-    }
-    TestExecutionTracker executionTracker =
-        TestEventsHandlerHolder.getExecutionTracker(testDescriptor);
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.JUNIT5)
-        .onTestFinish(testDescriptor, null, executionTracker);
-  }
-
-  @Override
-  public void executionSkipped(final TestDescriptor descriptor, final String reason) {
-    TestSource testSource = descriptor.getSource().orElse(null);
-
-    if (testSource instanceof ClassSource) {
-      // The annotation @Disabled is kept at type level.
-      containerExecutionSkipped(descriptor, reason);
-
-    } else if (testSource instanceof MethodSource) {
-      // The annotation @Disabled is kept at method level.
-      testMethodExecutionSkipped(descriptor, (MethodSource) testSource, reason);
+                .get(TestFrameworkInstrumentation.JUNIT5)
+                .onTestFinish(testDescriptor, null, executionTracker);
     }
-  }
 
-  private void containerExecutionSkipped(
-      final TestDescriptor suiteDescriptor, final String reason) {
-    if (!JUnitPlatformUtils.isSuite(suiteDescriptor)) {
-      return;
+    @Override
+    public void executionSkipped(final TestDescriptor descriptor, final String reason) {
+        TestSource testSource = descriptor.getSource().orElse(null);
+
+        if (testSource instanceof ClassSource) {
+            // The annotation @Disabled is kept at type level.
+            containerExecutionSkipped(descriptor, reason);
+
+        } else if (testSource instanceof MethodSource) {
+            // The annotation @Disabled is kept at method level.
+            testMethodExecutionSkipped(descriptor, (MethodSource) testSource, reason);
+        }
     }
 
-    Class<?> testClass = JUnitPlatformUtils.getJavaClass(suiteDescriptor);
-    String testSuiteName =
-        testClass != null ? testClass.getName() : suiteDescriptor.getLegacyReportingName();
-    List<String> tags =
-        suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
-
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.JUNIT5)
-        .onTestSuiteStart(
-            suiteDescriptor,
-            testSuiteName,
-            testFramework,
-            testFrameworkVersion,
-            testClass,
-            tags,
-            false,
-            TestFrameworkInstrumentation.JUNIT5,
-            null);
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.JUNIT5)
-        .onTestSuiteSkip(suiteDescriptor, reason);
-
-    for (TestDescriptor child : suiteDescriptor.getChildren()) {
-      executionSkipped(child, reason);
+    private void containerExecutionSkipped(final TestDescriptor suiteDescriptor, final String reason) {
+        if (!JUnitPlatformUtils.isSuite(suiteDescriptor)) {
+            return;
+        }
+
+        Class<?> testClass = JUnitPlatformUtils.getJavaClass(suiteDescriptor);
+        String testSuiteName = testClass != null ? testClass.getName() : suiteDescriptor.getLegacyReportingName();
+        List<String> tags =
+                suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
+
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.JUNIT5)
+                .onTestSuiteStart(
+                        suiteDescriptor,
+                        testSuiteName,
+                        testFramework,
+                        testFrameworkVersion,
+                        testClass,
+                        tags,
+                        false,
+                        TestFrameworkInstrumentation.JUNIT5,
+                        null);
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.JUNIT5)
+                .onTestSuiteSkip(suiteDescriptor, reason);
+
+        for (TestDescriptor child : suiteDescriptor.getChildren()) {
+            executionSkipped(child, reason);
+        }
+
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.JUNIT5)
+                .onTestSuiteFinish(suiteDescriptor, null);
     }
 
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.JUNIT5)
-        .onTestSuiteFinish(suiteDescriptor, null);
-  }
-
-  private void testMethodExecutionSkipped(
-      final TestDescriptor testDescriptor, final MethodSource testSource, final String reason) {
-    TestDescriptor suiteDescriptor = JUnitPlatformUtils.getSuiteDescriptor(testDescriptor);
-
-    String displayName = testDescriptor.getDisplayName();
-    String testName = testSource.getMethodName();
-    String testParameters =
-        JUnitPlatformUtils.getParameters(testDescriptor, testSource, displayName);
-    List<String> tags =
-        testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
-    TestSourceData testSourceData = JUnitPlatformUtils.toTestSourceData(testDescriptor);
-
-    TestEventsHandlerHolder.HANDLERS
-        .get(TestFrameworkInstrumentation.JUNIT5)
-        .onTestIgnore(
-            suiteDescriptor,
-            testDescriptor,
-            testName,
-            testFramework,
-            testFrameworkVersion,
-            testParameters,
-            tags,
-            testSourceData,
-            reason,
-            TestEventsHandlerHolder.getExecutionTracker(testDescriptor));
-
-    if (JUnitPlatformUtils.isDynamicTest(testDescriptor)) {
-      AgentSpan span = AgentTracer.activeSpan();
-      if (span != null) {
-        span.setTag(Tags.TEST_JUNIT_IS_DYNAMIC, true);
-      }
+    private void testMethodExecutionSkipped(
+            final TestDescriptor testDescriptor, final MethodSource testSource, final String reason) {
+        TestDescriptor suiteDescriptor = JUnitPlatformUtils.getSuiteDescriptor(testDescriptor);
+
+        String displayName = testDescriptor.getDisplayName();
+        String testName = testSource.getMethodName();
+        String testParameters = JUnitPlatformUtils.getParameters(testDescriptor, testSource, displayName);
+        List<String> tags =
+                testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList());
+        TestSourceData testSourceData = JUnitPlatformUtils.toTestSourceData(testDescriptor);
+
+        TestEventsHandlerHolder.HANDLERS
+                .get(TestFrameworkInstrumentation.JUNIT5)
+                .onTestIgnore(
+                        suiteDescriptor,
+                        testDescriptor,
+                        testName,
+                        testFramework,
+                        testFrameworkVersion,
+                        testParameters,
+                        tags,
+                        testSourceData,
+                        reason,
+                        TestEventsHandlerHolder.getExecutionTracker(testDescriptor));
+
+        if (JUnitPlatformUtils.isDynamicTest(testDescriptor)) {
+            AgentSpan span = AgentTracer.activeSpan();
+            if (span != null) {
+                span.setTag(Tags.TEST_JUNIT_IS_DYNAMIC, true);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java
index 0bdaced5842..f356e5e7011 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java
@@ -33,150 +33,142 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit5ExecutionInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public JUnit5ExecutionInstrumentation() {
-    super("ci-visibility", "junit-5", "test-retry");
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.junit.platform.engine.support.hierarchical.NodeTestTask";
-  }
-
-  @Override
-  public ReferenceProvider runtimeMuzzleReferences() {
-    return new TestTaskHandle.MuzzleHelper();
-  }
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    List<Reference> additionalReferences = new ArrayList<>();
-    additionalReferences.addAll(TestDescriptorHandle.MuzzleHelper.compileReferences());
-    additionalReferences.addAll(TestTaskHandle.MuzzleHelper.compileReferences());
-    additionalReferences.add(
-        new Reference.Builder("org.junit.platform.engine.support.hierarchical.NodeTestTask")
-            .withMethod(new String[0], 0, "prepare", "V")
-            .withMethod(new String[0], 0, "execute", "V")
-            .build());
-    return additionalReferences.toArray(new Reference[0]);
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(
-                takesArgument(
-                    3,
-                    named(
-                        "org.junit.platform.engine.support.hierarchical.ThrowableCollector.Factory"))),
-        JUnit5ExecutionInstrumentation.class.getName() + "$BeforeTaskConstructor");
-    transformer.applyAdvice(
-        named("execute").and(takesNoArguments()),
-        JUnit5ExecutionInstrumentation.class.getName() + "$ExecutionAdvice");
-  }
-
-  public static class BeforeTaskConstructor {
-    @Advice.OnMethodEnter
-    public static void replaceThrowableCollectorFactory(
-        @Advice.Argument(value = 3, readOnly = false)
-            ThrowableCollector.Factory throwableCollectorFactory) {
-      throwableCollectorFactory = new ThrowableCollectorFactoryWrapper(throwableCollectorFactory);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public JUnit5ExecutionInstrumentation() {
+        super("ci-visibility", "junit-5", "test-retry");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.junit.platform.engine.support.hierarchical.NodeTestTask";
+    }
+
+    @Override
+    public ReferenceProvider runtimeMuzzleReferences() {
+        return new TestTaskHandle.MuzzleHelper();
     }
-  }
-
-  public static class ExecutionAdvice {
-    @SuppressFBWarnings("NP_BOOLEAN_RETURN_NULL")
-    @Advice.OnMethodEnter(skipOn = Boolean.class)
-    public static Boolean execute(@Advice.This HierarchicalTestExecutorService.TestTask testTask) {
-
-      if (CallDepthThreadLocalMap.getCallDepth(HierarchicalTestExecutorService.TestTask.class)
-          != 0) {
-        // nested call
-        return null;
-      }
-
-      TestTaskHandle taskHandle = new TestTaskHandle(testTask);
-      TestDescriptor testDescriptor = taskHandle.getTestDescriptor();
-      if (testDescriptor.isContainer()) {
-        // Parameterized tests have a container descriptor for the test case as a whole,
-        // which contains a child descriptor for each set of parameters.
-        // Below we are creating a TestIdentifier without the parameters,
-        // so the identifier created from the container descriptor would be exactly the same
-        // as the identifier created from any of the children.
-        // Therefore, we need to filter out the container descriptors here.
-        return null;
-      }
-
-      if (!TestDataFactory.shouldBeTraced(testDescriptor)) {
-        return null;
-      }
-
-      String engineId = JUnitPlatformUtils.getEngineId(testDescriptor);
-      TestFrameworkInstrumentation framework = JUnitPlatformUtils.engineIdToFramework(engineId);
-
-      if (TestEventsHandlerHolder.HANDLERS.get(framework) == null) {
-        // is possible when running tracer's instrumentation tests
-        return null;
-      }
-
-      TestIdentifier testIdentifier = TestDataFactory.createTestIdentifier(testDescriptor);
-      TestSourceData testSource = TestDataFactory.createTestSourceData(testDescriptor);
-      Collection<String> testTags = JUnitPlatformUtils.getTags(testDescriptor);
-      TestExecutionPolicy executionPolicy =
-          TestEventsHandlerHolder.HANDLERS
-              .get(framework)
-              .executionPolicy(testIdentifier, testSource, testTags);
-      if (!executionPolicy.applicable()) {
-        return null;
-      }
-
-      TestEventsHandlerHolder.setExecutionTracker(testDescriptor, executionPolicy);
-
-      ThrowableCollectorFactoryWrapper factory =
-          (ThrowableCollectorFactoryWrapper) taskHandle.getThrowableCollectorFactory();
-      EngineExecutionContext parentContext = taskHandle.getParentContext();
-      TestDescriptorHandle descriptorHandle = new TestDescriptorHandle(testDescriptor);
-
-      HierarchicalTestExecutorService.TestTask currentTask = testTask;
-      int retryAttemptIdx = 0;
-      while (true) {
-        factory.setSuppressFailures(executionPolicy.suppressFailures());
-
-        CallDepthThreadLocalMap.incrementCallDepth(HierarchicalTestExecutorService.TestTask.class);
-        currentTask.execute();
-        CallDepthThreadLocalMap.decrementCallDepth(HierarchicalTestExecutorService.TestTask.class);
-
-        factory.setSuppressFailures(false); // restore default behavior
-
-        if (!executionPolicy.applicable()) {
-          break;
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        List<Reference> additionalReferences = new ArrayList<>();
+        additionalReferences.addAll(TestDescriptorHandle.MuzzleHelper.compileReferences());
+        additionalReferences.addAll(TestTaskHandle.MuzzleHelper.compileReferences());
+        additionalReferences.add(new Reference.Builder("org.junit.platform.engine.support.hierarchical.NodeTestTask")
+                .withMethod(new String[0], 0, "prepare", "V")
+                .withMethod(new String[0], 0, "execute", "V")
+                .build());
+        return additionalReferences.toArray(new Reference[0]);
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(
+                                3, named("org.junit.platform.engine.support.hierarchical.ThrowableCollector.Factory"))),
+                JUnit5ExecutionInstrumentation.class.getName() + "$BeforeTaskConstructor");
+        transformer.applyAdvice(
+                named("execute").and(takesNoArguments()),
+                JUnit5ExecutionInstrumentation.class.getName() + "$ExecutionAdvice");
+    }
+
+    public static class BeforeTaskConstructor {
+        @Advice.OnMethodEnter
+        public static void replaceThrowableCollectorFactory(
+                @Advice.Argument(value = 3, readOnly = false) ThrowableCollector.Factory throwableCollectorFactory) {
+            throwableCollectorFactory = new ThrowableCollectorFactoryWrapper(throwableCollectorFactory);
         }
+    }
 
-        /*
-         * Some event listeners (notably the one used by Gradle)
-         * require every test execution to have a distinct unique ID.
-         * Rerunning a test with the ID that was executed previously will cause errors.
-         */
-        Map<String, Object> suffix =
-            Collections.singletonMap(
-                JUnitPlatformUtils.RETRY_DESCRIPTOR_ID_SUFFIX, String.valueOf(++retryAttemptIdx));
-
-        TestDescriptor retryDescriptor = descriptorHandle.withIdSuffix(suffix);
-        taskHandle.getListener().dynamicTestRegistered(retryDescriptor);
-        TestEventsHandlerHolder.setExecutionTracker(retryDescriptor, executionPolicy);
-
-        // build a fresh task for the retry and reuse the original parent context, since execution
-        // overwrites it with null
-        currentTask = taskHandle.createRetryTask(retryDescriptor, parentContext);
-      }
-      return Boolean.TRUE; // skip original method execution
+    public static class ExecutionAdvice {
+        @SuppressFBWarnings("NP_BOOLEAN_RETURN_NULL")
+        @Advice.OnMethodEnter(skipOn = Boolean.class)
+        public static Boolean execute(@Advice.This HierarchicalTestExecutorService.TestTask testTask) {
+
+            if (CallDepthThreadLocalMap.getCallDepth(HierarchicalTestExecutorService.TestTask.class) != 0) {
+                // nested call
+                return null;
+            }
+
+            TestTaskHandle taskHandle = new TestTaskHandle(testTask);
+            TestDescriptor testDescriptor = taskHandle.getTestDescriptor();
+            if (testDescriptor.isContainer()) {
+                // Parameterized tests have a container descriptor for the test case as a whole,
+                // which contains a child descriptor for each set of parameters.
+                // Below we are creating a TestIdentifier without the parameters,
+                // so the identifier created from the container descriptor would be exactly the same
+                // as the identifier created from any of the children.
+                // Therefore, we need to filter out the container descriptors here.
+                return null;
+            }
+
+            if (!TestDataFactory.shouldBeTraced(testDescriptor)) {
+                return null;
+            }
+
+            String engineId = JUnitPlatformUtils.getEngineId(testDescriptor);
+            TestFrameworkInstrumentation framework = JUnitPlatformUtils.engineIdToFramework(engineId);
+
+            if (TestEventsHandlerHolder.HANDLERS.get(framework) == null) {
+                // is possible when running tracer's instrumentation tests
+                return null;
+            }
+
+            TestIdentifier testIdentifier = TestDataFactory.createTestIdentifier(testDescriptor);
+            TestSourceData testSource = TestDataFactory.createTestSourceData(testDescriptor);
+            Collection<String> testTags = JUnitPlatformUtils.getTags(testDescriptor);
+            TestExecutionPolicy executionPolicy = TestEventsHandlerHolder.HANDLERS
+                    .get(framework)
+                    .executionPolicy(testIdentifier, testSource, testTags);
+            if (!executionPolicy.applicable()) {
+                return null;
+            }
+
+            TestEventsHandlerHolder.setExecutionTracker(testDescriptor, executionPolicy);
+
+            ThrowableCollectorFactoryWrapper factory =
+                    (ThrowableCollectorFactoryWrapper) taskHandle.getThrowableCollectorFactory();
+            EngineExecutionContext parentContext = taskHandle.getParentContext();
+            TestDescriptorHandle descriptorHandle = new TestDescriptorHandle(testDescriptor);
+
+            HierarchicalTestExecutorService.TestTask currentTask = testTask;
+            int retryAttemptIdx = 0;
+            while (true) {
+                factory.setSuppressFailures(executionPolicy.suppressFailures());
+
+                CallDepthThreadLocalMap.incrementCallDepth(HierarchicalTestExecutorService.TestTask.class);
+                currentTask.execute();
+                CallDepthThreadLocalMap.decrementCallDepth(HierarchicalTestExecutorService.TestTask.class);
+
+                factory.setSuppressFailures(false); // restore default behavior
+
+                if (!executionPolicy.applicable()) {
+                    break;
+                }
+
+                /*
+                 * Some event listeners (notably the one used by Gradle)
+                 * require every test execution to have a distinct unique ID.
+                 * Rerunning a test with the ID that was executed previously will cause errors.
+                 */
+                Map<String, Object> suffix = Collections.singletonMap(
+                        JUnitPlatformUtils.RETRY_DESCRIPTOR_ID_SUFFIX, String.valueOf(++retryAttemptIdx));
+
+                TestDescriptor retryDescriptor = descriptorHandle.withIdSuffix(suffix);
+                taskHandle.getListener().dynamicTestRegistered(retryDescriptor);
+                TestEventsHandlerHolder.setExecutionTracker(retryDescriptor, executionPolicy);
+
+                // build a fresh task for the retry and reuse the original parent context, since execution
+                // overwrites it with null
+                currentTask = taskHandle.createRetryTask(retryDescriptor, parentContext);
+            }
+            return Boolean.TRUE; // skip original method execution
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java
index b7b9bdcfb39..708d1d3fd86 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java
@@ -24,57 +24,55 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit5ExecutionStoreInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  private final String parentPackageName =
-      Strings.getPackageName(JUnitPlatformUtils.class.getName());
+    private final String parentPackageName = Strings.getPackageName(JUnitPlatformUtils.class.getName());
 
-  public JUnit5ExecutionStoreInstrumentation() {
-    super("ci-visibility", "junit-5", "test-retry");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.junit.platform.engine.TestEngine";
-  }
+    public JUnit5ExecutionStoreInstrumentation() {
+        super("ci-visibility", "junit-5", "test-retry");
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        // JUnit 4 has a dedicated instrumentation
-        .and(not(named("org.junit.vintage.engine.VintageTestEngine")))
-        // suites are only used to organize other test engines
-        .and(not(named("org.junit.platform.suite.engine.SuiteTestEngine")));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.junit.platform.engine.TestEngine";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.junit.platform.engine.TestDescriptor",
-        "datadog.trace.api.civisibility.execution.TestExecutionTracker");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                // JUnit 4 has a dedicated instrumentation
+                .and(not(named("org.junit.vintage.engine.VintageTestEngine")))
+                // suites are only used to organize other test engines
+                .and(not(named("org.junit.platform.suite.engine.SuiteTestEngine")));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("discover")
-            .and(
-                takesArgument(0, named("org.junit.platform.engine.EngineDiscoveryRequest"))
-                    .and(takesArgument(1, named("org.junit.platform.engine.UniqueId")))),
-        JUnit5ExecutionStoreInstrumentation.class.getName() + "$ContextStoreAdvice");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(
+                "org.junit.platform.engine.TestDescriptor",
+                "datadog.trace.api.civisibility.execution.TestExecutionTracker");
+    }
 
-  public static class ContextStoreAdvice {
-    @Advice.OnMethodEnter
-    public static void setContextStores() {
-      ContextStore<TestDescriptor, TestExecutionTracker> contextStore =
-          InstrumentationContext.get(TestDescriptor.class, TestExecutionTracker.class);
-      TestEventsHandlerHolder.setExecutionTrackerStore(contextStore);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("discover")
+                        .and(takesArgument(0, named("org.junit.platform.engine.EngineDiscoveryRequest"))
+                                .and(takesArgument(1, named("org.junit.platform.engine.UniqueId")))),
+                JUnit5ExecutionStoreInstrumentation.class.getName() + "$ContextStoreAdvice");
     }
 
-    // JUnit 5.3.0 and above
-    public static void muzzleCheck(final SameThreadHierarchicalTestExecutorService service) {
-      service.invokeAll(null);
+    public static class ContextStoreAdvice {
+        @Advice.OnMethodEnter
+        public static void setContextStores() {
+            ContextStore<TestDescriptor, TestExecutionTracker> contextStore =
+                    InstrumentationContext.get(TestDescriptor.class, TestExecutionTracker.class);
+            TestEventsHandlerHolder.setExecutionTrackerStore(contextStore);
+        }
+
+        // JUnit 5.3.0 and above
+        public static void muzzleCheck(final SameThreadHierarchicalTestExecutorService service) {
+            service.invokeAll(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5NodeTestTaskContextInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5NodeTestTaskContextInstrumentation.java
index f935746cb3b..e3d9e2d076f 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5NodeTestTaskContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5NodeTestTaskContextInstrumentation.java
@@ -14,38 +14,36 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit5NodeTestTaskContextInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  private final String parentPackageName =
-      Strings.getPackageName(JUnitPlatformUtils.class.getName());
-
-  public JUnit5NodeTestTaskContextInstrumentation() {
-    super("ci-visibility", "junit-5", "test-retry");
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.junit.platform.engine.support.hierarchical.NodeTestTaskContext";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(),
-        JUnit5NodeTestTaskContextInstrumentation.class.getName() + "$BeforeConstructor");
-  }
-
-  public static class BeforeConstructor {
-    @Advice.OnMethodEnter
-    public static void replaceThrowableCollectorFactory(
-        @Advice.Argument(value = 2, readOnly = false, typing = Assigner.Typing.DYNAMIC)
-            ThrowableCollector.Factory throwableCollectorFactory) {
-      throwableCollectorFactory = new ThrowableCollectorFactoryWrapper(throwableCollectorFactory);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    private final String parentPackageName = Strings.getPackageName(JUnitPlatformUtils.class.getName());
+
+    public JUnit5NodeTestTaskContextInstrumentation() {
+        super("ci-visibility", "junit-5", "test-retry");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.junit.platform.engine.support.hierarchical.NodeTestTaskContext";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor(), JUnit5NodeTestTaskContextInstrumentation.class.getName() + "$BeforeConstructor");
+    }
+
+    public static class BeforeConstructor {
+        @Advice.OnMethodEnter
+        public static void replaceThrowableCollectorFactory(
+                @Advice.Argument(value = 2, readOnly = false, typing = Assigner.Typing.DYNAMIC)
+                        ThrowableCollector.Factory throwableCollectorFactory) {
+            throwableCollectorFactory = new ThrowableCollectorFactoryWrapper(throwableCollectorFactory);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/RetryDescriptorFactories.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/RetryDescriptorFactories.java
index 4d4eb3885ab..78caf6ef5c6 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/RetryDescriptorFactories.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/RetryDescriptorFactories.java
@@ -10,15 +10,15 @@
  */
 public final class RetryDescriptorFactories {
 
-  private static final Map<String, RetryDescriptorFactory> BY_ENGINE_ID = new ConcurrentHashMap<>();
+    private static final Map<String, RetryDescriptorFactory> BY_ENGINE_ID = new ConcurrentHashMap<>();
 
-  private RetryDescriptorFactories() {}
+    private RetryDescriptorFactories() {}
 
-  public static void register(String engineId, RetryDescriptorFactory factory) {
-    BY_ENGINE_ID.put(engineId, factory);
-  }
+    public static void register(String engineId, RetryDescriptorFactory factory) {
+        BY_ENGINE_ID.put(engineId, factory);
+    }
 
-  public static RetryDescriptorFactory forEngine(String engineId) {
-    return engineId != null ? BY_ENGINE_ID.get(engineId) : null;
-  }
+    public static RetryDescriptorFactory forEngine(String engineId) {
+        return engineId != null ? BY_ENGINE_ID.get(engineId) : null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/RetryDescriptorFactory.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/RetryDescriptorFactory.java
index e1fc99fa8a1..b431db8a090 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/RetryDescriptorFactory.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/RetryDescriptorFactory.java
@@ -10,9 +10,9 @@
  */
 public interface RetryDescriptorFactory {
 
-  /**
-   * @return a reconstructed, re-executable copy with the transformed id, or {@code null} to fall
-   *     back to the generic (Unsafe/reflection) clone.
-   */
-  TestDescriptor copy(TestDescriptor original, UnaryOperator<UniqueId> idTransform);
+    /**
+     * @return a reconstructed, re-executable copy with the transformed id, or {@code null} to fall
+     *     back to the generic (Unsafe/reflection) clone.
+     */
+    TestDescriptor copy(TestDescriptor original, UnaryOperator<UniqueId> idTransform);
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/TestDescriptorHandle.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/TestDescriptorHandle.java
index 63de4af1367..39e75ccaf16 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/TestDescriptorHandle.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/TestDescriptorHandle.java
@@ -16,110 +16,102 @@
 
 public class TestDescriptorHandle {
 
-  private static final MethodHandles METHOD_HANDLES =
-      new MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
+    private static final MethodHandles METHOD_HANDLES = new MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
 
-  private static final String JUPITER_TEST_DESCRIPTOR =
-      "org.junit.jupiter.engine.descriptor.JupiterTestDescriptor";
-  private static final Class<?> JUPITER_TEST_DESCRIPTOR_CLASS =
-      JUnitPlatformUtils.loadClass(JUPITER_TEST_DESCRIPTOR);
+    private static final String JUPITER_TEST_DESCRIPTOR = "org.junit.jupiter.engine.descriptor.JupiterTestDescriptor";
+    private static final Class<?> JUPITER_TEST_DESCRIPTOR_CLASS = JUnitPlatformUtils.loadClass(JUPITER_TEST_DESCRIPTOR);
 
-  /** {@code JupiterTestDescriptor#copyIncludingDescendants(UnaryOperator<UniqueId>)} (5.13+) */
-  private static final MethodHandle COPY_INCLUDING_DESCENDANTS =
-      METHOD_HANDLES.method(
-          JUPITER_TEST_DESCRIPTOR, "copyIncludingDescendants", UnaryOperator.class);
+    /** {@code JupiterTestDescriptor#copyIncludingDescendants(UnaryOperator<UniqueId>)} (5.13+) */
+    private static final MethodHandle COPY_INCLUDING_DESCENDANTS =
+            METHOD_HANDLES.method(JUPITER_TEST_DESCRIPTOR, "copyIncludingDescendants", UnaryOperator.class);
 
-  // Legacy fallback used when copyIncludingDescendants is unavailable.
-  // Overwrites the final unique ID field by reflection. Lazily created to avoid JEP 500 warnings.
-  private static volatile MethodHandle uniqueIdSetter;
+    // Legacy fallback used when copyIncludingDescendants is unavailable.
+    // Overwrites the final unique ID field by reflection. Lazily created to avoid JEP 500 warnings.
+    private static volatile MethodHandle uniqueIdSetter;
 
-  private static MethodHandle uniqueIdSetter() {
-    MethodHandle handle = uniqueIdSetter;
-    if (handle == null) {
-      handle = METHOD_HANDLES.privateFieldSetter(AbstractTestDescriptor.class, "uniqueId");
-      uniqueIdSetter = handle;
+    private static MethodHandle uniqueIdSetter() {
+        MethodHandle handle = uniqueIdSetter;
+        if (handle == null) {
+            handle = METHOD_HANDLES.privateFieldSetter(AbstractTestDescriptor.class, "uniqueId");
+            uniqueIdSetter = handle;
+        }
+        return handle;
     }
-    return handle;
-  }
 
-  public static final class MuzzleHelper {
-    public static Collection<? extends Reference> compileReferences() {
-      return Collections.singletonList(
-          new Reference.Builder(AbstractTestDescriptor.class.getName())
-              .withField(new String[0], 0, "uniqueId", "Lorg/junit/platform/engine/UniqueId;")
-              .build());
+    public static final class MuzzleHelper {
+        public static Collection<? extends Reference> compileReferences() {
+            return Collections.singletonList(new Reference.Builder(AbstractTestDescriptor.class.getName())
+                    .withField(new String[0], 0, "uniqueId", "Lorg/junit/platform/engine/UniqueId;")
+                    .build());
+        }
     }
-  }
 
-  private final TestDescriptor testDescriptor;
+    private final TestDescriptor testDescriptor;
 
-  public TestDescriptorHandle(TestDescriptor testDescriptor) {
-    /*
-     * We're copying the descriptor to preserve its original state:
-     * JUnit will modify some of its fields during and after test execution
-     * (one example is parameterized test descriptor,
-     * whose invocation context is overwritten with null).
-     * The snapshot is taken before the first execution so that every retry
-     * can be derived from the pristine state.
-     */
-    this.testDescriptor = copy(testDescriptor, UnaryOperator.identity());
-  }
+    public TestDescriptorHandle(TestDescriptor testDescriptor) {
+        /*
+         * We're copying the descriptor to preserve its original state:
+         * JUnit will modify some of its fields during and after test execution
+         * (one example is parameterized test descriptor,
+         * whose invocation context is overwritten with null).
+         * The snapshot is taken before the first execution so that every retry
+         * can be derived from the pristine state.
+         */
+        this.testDescriptor = copy(testDescriptor, UnaryOperator.identity());
+    }
 
-  public TestDescriptor withIdSuffix(Map<String, Object> suffices) {
-    return copy(
-        testDescriptor,
-        id -> {
-          UniqueId updatedId = id;
-          for (Map.Entry<String, Object> e : suffices.entrySet()) {
-            updatedId = updatedId.append(e.getKey(), String.valueOf(e.getValue()));
-          }
-          return updatedId;
+    public TestDescriptor withIdSuffix(Map<String, Object> suffices) {
+        return copy(testDescriptor, id -> {
+            UniqueId updatedId = id;
+            for (Map.Entry<String, Object> e : suffices.entrySet()) {
+                updatedId = updatedId.append(e.getKey(), String.valueOf(e.getValue()));
+            }
+            return updatedId;
         });
-  }
+    }
 
-  private static TestDescriptor copy(
-      TestDescriptor testDescriptor, UnaryOperator<UniqueId> idTransform) {
-    if (COPY_INCLUDING_DESCENDANTS != null
-        && JUPITER_TEST_DESCRIPTOR_CLASS != null
-        && JUPITER_TEST_DESCRIPTOR_CLASS.isInstance(testDescriptor)) {
-      TestDescriptor copy =
-          METHOD_HANDLES.invoke(COPY_INCLUDING_DESCENDANTS, testDescriptor, idTransform);
-      if (copy != null) {
-        // copyIncludingDescendants returns a detached copy so we link it back to its suite
-        if (copy instanceof AbstractTestDescriptor) {
-          ((AbstractTestDescriptor) copy).setParent(testDescriptor.getParent().orElse(null));
+    private static TestDescriptor copy(TestDescriptor testDescriptor, UnaryOperator<UniqueId> idTransform) {
+        if (COPY_INCLUDING_DESCENDANTS != null
+                && JUPITER_TEST_DESCRIPTOR_CLASS != null
+                && JUPITER_TEST_DESCRIPTOR_CLASS.isInstance(testDescriptor)) {
+            TestDescriptor copy = METHOD_HANDLES.invoke(COPY_INCLUDING_DESCENDANTS, testDescriptor, idTransform);
+            if (copy != null) {
+                // copyIncludingDescendants returns a detached copy so we link it back to its suite
+                if (copy instanceof AbstractTestDescriptor) {
+                    ((AbstractTestDescriptor) copy)
+                            .setParent(testDescriptor.getParent().orElse(null));
+                }
+                return copy;
+            }
         }
-        return copy;
-      }
-    }
 
-    // per-engine reconstruction (Spock, Cucumber)
-    RetryDescriptorFactory factory =
-        RetryDescriptorFactories.forEngine(JUnitPlatformUtils.getEngineId(testDescriptor));
-    if (factory != null) {
-      TestDescriptor copy = factory.copy(testDescriptor, idTransform);
-      if (copy != null) {
-        // reconstructed descriptors are detached, so we link them back to the original's suite
-        if (copy instanceof AbstractTestDescriptor) {
-          ((AbstractTestDescriptor) copy).setParent(testDescriptor.getParent().orElse(null));
+        // per-engine reconstruction (Spock, Cucumber)
+        RetryDescriptorFactory factory =
+                RetryDescriptorFactories.forEngine(JUnitPlatformUtils.getEngineId(testDescriptor));
+        if (factory != null) {
+            TestDescriptor copy = factory.copy(testDescriptor, idTransform);
+            if (copy != null) {
+                // reconstructed descriptors are detached, so we link them back to the original's suite
+                if (copy instanceof AbstractTestDescriptor) {
+                    ((AbstractTestDescriptor) copy)
+                            .setParent(testDescriptor.getParent().orElse(null));
+                }
+                return copy;
+            }
         }
-        return copy;
-      }
+        return legacyCopy(testDescriptor, idTransform);
     }
-    return legacyCopy(testDescriptor, idTransform);
-  }
 
-  /**
-   * Fallback for engines without {@code copyIncludingDescendants}: shallow-clone the descriptor and
-   * overwrite the cloned unique ID field by reflection. Not JEP 500 compliant.
-   */
-  private static TestDescriptor legacyCopy(
-      TestDescriptor testDescriptor, UnaryOperator<UniqueId> idTransform) {
-    TestDescriptor descriptorClone = UnsafeUtils.tryShallowClone(testDescriptor);
-    UniqueId updatedId = idTransform.apply(testDescriptor.getUniqueId());
-    if (descriptorClone != testDescriptor && !updatedId.equals(testDescriptor.getUniqueId())) {
-      METHOD_HANDLES.invoke(uniqueIdSetter(), descriptorClone, updatedId);
+    /**
+     * Fallback for engines without {@code copyIncludingDescendants}: shallow-clone the descriptor and
+     * overwrite the cloned unique ID field by reflection. Not JEP 500 compliant.
+     */
+    private static TestDescriptor legacyCopy(TestDescriptor testDescriptor, UnaryOperator<UniqueId> idTransform) {
+        TestDescriptor descriptorClone = UnsafeUtils.tryShallowClone(testDescriptor);
+        UniqueId updatedId = idTransform.apply(testDescriptor.getUniqueId());
+        if (descriptorClone != testDescriptor && !updatedId.equals(testDescriptor.getUniqueId())) {
+            METHOD_HANDLES.invoke(uniqueIdSetter(), descriptorClone, updatedId);
+        }
+        return descriptorClone;
     }
-    return descriptorClone;
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/TestTaskHandle.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/TestTaskHandle.java
index adf7c364ea5..d22d19a841c 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/TestTaskHandle.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/TestTaskHandle.java
@@ -18,171 +18,157 @@
 
 public class TestTaskHandle {
 
-  private static final MethodHandles METHOD_HANDLES =
-      new MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
-
-  private static final String TEST_TASK_CLASS =
-      "org.junit.platform.engine.support.hierarchical.NodeTestTask";
-  private static final String TEST_TASK_CONTEXT_CLASS =
-      "org.junit.platform.engine.support.hierarchical.NodeTestTaskContext";
-
-  private static final MethodHandle TEST_DESCRIPTOR_GETTER =
-      METHOD_HANDLES.privateFieldGetter(TEST_TASK_CLASS, "testDescriptor");
-
-  private static final MethodHandle PARENT_CONTEXT_GETTER =
-      METHOD_HANDLES.privateFieldGetter(TEST_TASK_CLASS, "parentContext");
-  private static final MethodHandle PARENT_CONTEXT_SETTER =
-      METHOD_HANDLES.privateFieldSetter(TEST_TASK_CLASS, "parentContext");
-
-  /** NodeTestTask's {@code (NodeTestTaskContext, TestDescriptor)} constructor (1.3.1+) */
-  private static final Class<?> TEST_TASK_CONTEXT_CLASS_REF =
-      JUnitPlatformUtils.loadClass(TEST_TASK_CONTEXT_CLASS);
-
-  private static final MethodHandle TEST_TASK_CONSTRUCTOR =
-      TEST_TASK_CONTEXT_CLASS_REF != null
-          ? METHOD_HANDLES.constructor(
-              TEST_TASK_CLASS, TEST_TASK_CONTEXT_CLASS_REF, TestDescriptor.class)
-          : null;
-
-  // Legacy fallback setters, lazily created to avoid JEP 500 warnings, only used on 1.3.0
-  private static volatile MethodHandle testDescriptorSetter;
-  private static volatile MethodHandle nodeSetter;
-
-  private static MethodHandle testDescriptorSetter() {
-    MethodHandle handle = testDescriptorSetter;
-    if (handle == null) {
-      handle = METHOD_HANDLES.privateFieldSetter(TEST_TASK_CLASS, "testDescriptor");
-      testDescriptorSetter = handle;
+    private static final MethodHandles METHOD_HANDLES = new MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
+
+    private static final String TEST_TASK_CLASS = "org.junit.platform.engine.support.hierarchical.NodeTestTask";
+    private static final String TEST_TASK_CONTEXT_CLASS =
+            "org.junit.platform.engine.support.hierarchical.NodeTestTaskContext";
+
+    private static final MethodHandle TEST_DESCRIPTOR_GETTER =
+            METHOD_HANDLES.privateFieldGetter(TEST_TASK_CLASS, "testDescriptor");
+
+    private static final MethodHandle PARENT_CONTEXT_GETTER =
+            METHOD_HANDLES.privateFieldGetter(TEST_TASK_CLASS, "parentContext");
+    private static final MethodHandle PARENT_CONTEXT_SETTER =
+            METHOD_HANDLES.privateFieldSetter(TEST_TASK_CLASS, "parentContext");
+
+    /** NodeTestTask's {@code (NodeTestTaskContext, TestDescriptor)} constructor (1.3.1+) */
+    private static final Class<?> TEST_TASK_CONTEXT_CLASS_REF = JUnitPlatformUtils.loadClass(TEST_TASK_CONTEXT_CLASS);
+
+    private static final MethodHandle TEST_TASK_CONSTRUCTOR = TEST_TASK_CONTEXT_CLASS_REF != null
+            ? METHOD_HANDLES.constructor(TEST_TASK_CLASS, TEST_TASK_CONTEXT_CLASS_REF, TestDescriptor.class)
+            : null;
+
+    // Legacy fallback setters, lazily created to avoid JEP 500 warnings, only used on 1.3.0
+    private static volatile MethodHandle testDescriptorSetter;
+    private static volatile MethodHandle nodeSetter;
+
+    private static MethodHandle testDescriptorSetter() {
+        MethodHandle handle = testDescriptorSetter;
+        if (handle == null) {
+            handle = METHOD_HANDLES.privateFieldSetter(TEST_TASK_CLASS, "testDescriptor");
+            testDescriptorSetter = handle;
+        }
+        return handle;
     }
-    return handle;
-  }
-
-  private static MethodHandle nodeSetter() {
-    MethodHandle handle = nodeSetter;
-    if (handle == null) {
-      handle = METHOD_HANDLES.privateFieldSetter(TEST_TASK_CLASS, "node");
-      nodeSetter = handle;
+
+    private static MethodHandle nodeSetter() {
+        MethodHandle handle = nodeSetter;
+        if (handle == null) {
+            handle = METHOD_HANDLES.privateFieldSetter(TEST_TASK_CLASS, "node");
+            nodeSetter = handle;
+        }
+        return handle;
+    }
+
+    private static final MethodHandle THROWABLE_COLLECTOR_FACTORY_GETTER =
+            METHOD_HANDLES.privateFieldGetter(TEST_TASK_CLASS, "throwableCollectorFactory");
+    private static final MethodHandle TASK_CONTEXT_THROWABLE_COLLECTOR_FACTORY_GETTER =
+            METHOD_HANDLES.privateFieldGetter(TEST_TASK_CONTEXT_CLASS, "throwableCollectorFactory");
+
+    private static final MethodHandle EXECUTION_LISTENER_GETTER =
+            METHOD_HANDLES.privateFieldGetter(TEST_TASK_CLASS, "listener");
+    private static final MethodHandle TASK_CONTEXT_GETTER =
+            METHOD_HANDLES.privateFieldGetter(TEST_TASK_CLASS, "taskContext");
+    private static final MethodHandle TASK_CONTEXT_EXECUTION_LISTENER_GETTER =
+            METHOD_HANDLES.privateFieldGetter(TEST_TASK_CONTEXT_CLASS, "listener");
+
+    public static final class MuzzleHelper implements ReferenceProvider {
+        @Override
+        public Iterable<Reference> buildReferences(TypePool typePool) {
+            if (typePool.describe(TEST_TASK_CONTEXT_CLASS).isResolved()) {
+                // junit-platform-engine 1.3.1+
+                return Arrays.asList(
+                        new Reference.Builder(TEST_TASK_CLASS)
+                                .withField(
+                                        new String[0],
+                                        0,
+                                        "taskContext",
+                                        'L' + TEST_TASK_CONTEXT_CLASS.replace('.', '/') + ';')
+                                .build(),
+                        new Reference.Builder(TEST_TASK_CONTEXT_CLASS)
+                                .withField(
+                                        new String[0],
+                                        0,
+                                        "listener",
+                                        "Lorg/junit/platform/engine/EngineExecutionListener;")
+                                .build());
+            } else {
+                // junit-platform-engine 1.3.0 and earlier
+                return Collections.singletonList(new Reference.Builder(TEST_TASK_CLASS)
+                        .withField(new String[0], 0, "listener", "Lorg/junit/platform/engine/EngineExecutionListener;")
+                        .build());
+            }
+        }
+
+        public static Collection<? extends Reference> compileReferences() {
+            return Collections.singletonList(new Reference.Builder(TEST_TASK_CLASS)
+                    .withField(new String[0], 0, "testDescriptor", "Lorg/junit/platform/engine/TestDescriptor;")
+                    .withField(new String[0], 0, "node", "Lorg/junit/platform/engine/support/hierarchical/Node;")
+                    .withField(
+                            new String[0],
+                            0,
+                            "parentContext",
+                            "Lorg/junit/platform/engine/support/hierarchical/EngineExecutionContext;")
+                    .withField(
+                            new String[0],
+                            0,
+                            "throwableCollector",
+                            "Lorg/junit/platform/engine/support/hierarchical/ThrowableCollector;")
+                    .build());
+        }
+    }
+
+    private final HierarchicalTestExecutorService.TestTask testTask;
+    private final Object /* org.junit.platform.engine.support.hierarchical.NodeTestTaskContext */ testTaskContext;
+
+    public TestTaskHandle(HierarchicalTestExecutorService.TestTask testTask) {
+        this.testTask = testTask;
+        this.testTaskContext = METHOD_HANDLES.invoke(TASK_CONTEXT_GETTER, testTask);
+    }
+
+    public TestDescriptor getTestDescriptor() {
+        return METHOD_HANDLES.invoke(TEST_DESCRIPTOR_GETTER, testTask);
+    }
+
+    public EngineExecutionContext getParentContext() {
+        return METHOD_HANDLES.invoke(PARENT_CONTEXT_GETTER, testTask);
     }
-    return handle;
-  }
-
-  private static final MethodHandle THROWABLE_COLLECTOR_FACTORY_GETTER =
-      METHOD_HANDLES.privateFieldGetter(TEST_TASK_CLASS, "throwableCollectorFactory");
-  private static final MethodHandle TASK_CONTEXT_THROWABLE_COLLECTOR_FACTORY_GETTER =
-      METHOD_HANDLES.privateFieldGetter(TEST_TASK_CONTEXT_CLASS, "throwableCollectorFactory");
-
-  private static final MethodHandle EXECUTION_LISTENER_GETTER =
-      METHOD_HANDLES.privateFieldGetter(TEST_TASK_CLASS, "listener");
-  private static final MethodHandle TASK_CONTEXT_GETTER =
-      METHOD_HANDLES.privateFieldGetter(TEST_TASK_CLASS, "taskContext");
-  private static final MethodHandle TASK_CONTEXT_EXECUTION_LISTENER_GETTER =
-      METHOD_HANDLES.privateFieldGetter(TEST_TASK_CONTEXT_CLASS, "listener");
-
-  public static final class MuzzleHelper implements ReferenceProvider {
-    @Override
-    public Iterable<Reference> buildReferences(TypePool typePool) {
-      if (typePool.describe(TEST_TASK_CONTEXT_CLASS).isResolved()) {
-        // junit-platform-engine 1.3.1+
-        return Arrays.asList(
-            new Reference.Builder(TEST_TASK_CLASS)
-                .withField(
-                    new String[0],
-                    0,
-                    "taskContext",
-                    'L' + TEST_TASK_CONTEXT_CLASS.replace('.', '/') + ';')
-                .build(),
-            new Reference.Builder(TEST_TASK_CONTEXT_CLASS)
-                .withField(
-                    new String[0],
-                    0,
-                    "listener",
-                    "Lorg/junit/platform/engine/EngineExecutionListener;")
-                .build());
-      } else {
-        // junit-platform-engine 1.3.0 and earlier
-        return Collections.singletonList(
-            new Reference.Builder(TEST_TASK_CLASS)
-                .withField(
-                    new String[0],
-                    0,
-                    "listener",
-                    "Lorg/junit/platform/engine/EngineExecutionListener;")
-                .build());
-      }
+
+    /**
+     * Returns a task that will execute the given retry descriptor. If possible, a brand-new
+     * NodeTestTask is constructed; otherwise we fall back to overwriting the current task's fields
+     * (non-compliant with JEP500).
+     */
+    public HierarchicalTestExecutorService.TestTask createRetryTask(
+            TestDescriptor descriptor, EngineExecutionContext parentContext) {
+        if (TEST_TASK_CONSTRUCTOR != null && testTaskContext != null) {
+            Object retryTask = METHOD_HANDLES.invoke(TEST_TASK_CONSTRUCTOR, testTaskContext, descriptor);
+            if (retryTask != null) {
+                METHOD_HANDLES.invoke(PARENT_CONTEXT_SETTER, retryTask, parentContext);
+                return (HierarchicalTestExecutorService.TestTask) retryTask;
+            }
+        }
+        // fallback (< 1.3.1): reuse the current task by overwriting its final fields.
+        METHOD_HANDLES.invoke(testDescriptorSetter(), testTask, descriptor);
+        METHOD_HANDLES.invoke(nodeSetter(), testTask, descriptor);
+        METHOD_HANDLES.invoke(PARENT_CONTEXT_SETTER, testTask, parentContext);
+        return testTask;
     }
 
-    public static Collection<? extends Reference> compileReferences() {
-      return Collections.singletonList(
-          new Reference.Builder(TEST_TASK_CLASS)
-              .withField(
-                  new String[0], 0, "testDescriptor", "Lorg/junit/platform/engine/TestDescriptor;")
-              .withField(
-                  new String[0], 0, "node", "Lorg/junit/platform/engine/support/hierarchical/Node;")
-              .withField(
-                  new String[0],
-                  0,
-                  "parentContext",
-                  "Lorg/junit/platform/engine/support/hierarchical/EngineExecutionContext;")
-              .withField(
-                  new String[0],
-                  0,
-                  "throwableCollector",
-                  "Lorg/junit/platform/engine/support/hierarchical/ThrowableCollector;")
-              .build());
+    public EngineExecutionListener getListener() {
+        return testTaskContext != null
+                ? METHOD_HANDLES.invoke(TASK_CONTEXT_EXECUTION_LISTENER_GETTER, testTaskContext)
+                : METHOD_HANDLES.invoke(EXECUTION_LISTENER_GETTER, testTask);
     }
-  }
-
-  private final HierarchicalTestExecutorService.TestTask testTask;
-  private final Object /* org.junit.platform.engine.support.hierarchical.NodeTestTaskContext */
-      testTaskContext;
-
-  public TestTaskHandle(HierarchicalTestExecutorService.TestTask testTask) {
-    this.testTask = testTask;
-    this.testTaskContext = METHOD_HANDLES.invoke(TASK_CONTEXT_GETTER, testTask);
-  }
-
-  public TestDescriptor getTestDescriptor() {
-    return METHOD_HANDLES.invoke(TEST_DESCRIPTOR_GETTER, testTask);
-  }
-
-  public EngineExecutionContext getParentContext() {
-    return METHOD_HANDLES.invoke(PARENT_CONTEXT_GETTER, testTask);
-  }
-
-  /**
-   * Returns a task that will execute the given retry descriptor. If possible, a brand-new
-   * NodeTestTask is constructed; otherwise we fall back to overwriting the current task's fields
-   * (non-compliant with JEP500).
-   */
-  public HierarchicalTestExecutorService.TestTask createRetryTask(
-      TestDescriptor descriptor, EngineExecutionContext parentContext) {
-    if (TEST_TASK_CONSTRUCTOR != null && testTaskContext != null) {
-      Object retryTask = METHOD_HANDLES.invoke(TEST_TASK_CONSTRUCTOR, testTaskContext, descriptor);
-      if (retryTask != null) {
-        METHOD_HANDLES.invoke(PARENT_CONTEXT_SETTER, retryTask, parentContext);
-        return (HierarchicalTestExecutorService.TestTask) retryTask;
-      }
+
+    public ThrowableCollector.Factory getThrowableCollectorFactory() {
+        return testTaskContext != null
+                ? METHOD_HANDLES.invoke(TASK_CONTEXT_THROWABLE_COLLECTOR_FACTORY_GETTER, testTaskContext)
+                : METHOD_HANDLES.invoke(THROWABLE_COLLECTOR_FACTORY_GETTER, testTask);
+    }
+
+    public void execute() {
+        testTask.execute();
     }
-    // fallback (< 1.3.1): reuse the current task by overwriting its final fields.
-    METHOD_HANDLES.invoke(testDescriptorSetter(), testTask, descriptor);
-    METHOD_HANDLES.invoke(nodeSetter(), testTask, descriptor);
-    METHOD_HANDLES.invoke(PARENT_CONTEXT_SETTER, testTask, parentContext);
-    return testTask;
-  }
-
-  public EngineExecutionListener getListener() {
-    return testTaskContext != null
-        ? METHOD_HANDLES.invoke(TASK_CONTEXT_EXECUTION_LISTENER_GETTER, testTaskContext)
-        : METHOD_HANDLES.invoke(EXECUTION_LISTENER_GETTER, testTask);
-  }
-
-  public ThrowableCollector.Factory getThrowableCollectorFactory() {
-    return testTaskContext != null
-        ? METHOD_HANDLES.invoke(TASK_CONTEXT_THROWABLE_COLLECTOR_FACTORY_GETTER, testTaskContext)
-        : METHOD_HANDLES.invoke(THROWABLE_COLLECTOR_FACTORY_GETTER, testTask);
-  }
-
-  public void execute() {
-    testTask.execute();
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/ThrowableCollectorFactoryWrapper.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/ThrowableCollectorFactoryWrapper.java
index f9f0dc23c17..d32120d6859 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/ThrowableCollectorFactoryWrapper.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/ThrowableCollectorFactoryWrapper.java
@@ -4,34 +4,34 @@
 
 public class ThrowableCollectorFactoryWrapper implements ThrowableCollector.Factory {
 
-  private final ThrowableCollector.Factory delegate;
-  private final ThreadLocal<Boolean> suppressFailures = ThreadLocal.withInitial(() -> false);
-  private final ThreadLocal<ThrowableCollector> collector = new ThreadLocal<>();
+    private final ThrowableCollector.Factory delegate;
+    private final ThreadLocal<Boolean> suppressFailures = ThreadLocal.withInitial(() -> false);
+    private final ThreadLocal<ThrowableCollector> collector = new ThreadLocal<>();
 
-  public ThrowableCollectorFactoryWrapper(ThrowableCollector.Factory delegate) {
-    this.delegate = delegate;
-  }
+    public ThrowableCollectorFactoryWrapper(ThrowableCollector.Factory delegate) {
+        this.delegate = delegate;
+    }
 
-  public void setSuppressFailures(boolean suppressFailures) {
-    this.suppressFailures.set(suppressFailures);
-  }
+    public void setSuppressFailures(boolean suppressFailures) {
+        this.suppressFailures.set(suppressFailures);
+    }
 
-  public ThrowableCollector getCollector() {
-    return collector.get();
-  }
+    public ThrowableCollector getCollector() {
+        return collector.get();
+    }
 
-  @Override
-  public ThrowableCollector create() {
-    /*
-     * If suppressFailures is set, treat every exception as an assumption error,
-     * so that when asked for test execution status,
-     * "aborted" is returned instead of "failed".
-     * This is needed to avoid failing the build,
-     * since the build will fail as long as there are failed tests.
-     */
-    ThrowableCollector throwableCollector =
-        suppressFailures.get() ? new ThrowableCollector(t -> true) : delegate.create();
-    collector.set(throwableCollector);
-    return throwableCollector;
-  }
+    @Override
+    public ThrowableCollector create() {
+        /*
+         * If suppressFailures is set, treat every exception as an assumption error,
+         * so that when asked for test execution status,
+         * "aborted" is returned instead of "failed".
+         * This is needed to avoid failing the build,
+         * since the build will fail as long as there are failed tests.
+         */
+        ThrowableCollector throwableCollector =
+                suppressFailures.get() ? new ThrowableCollector(t -> true) : delegate.create();
+        collector.set(throwableCollector);
+        return throwableCollector;
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/BaseTestInheritance.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/BaseTestInheritance.java
index 939ab1008bf..30834487615 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/BaseTestInheritance.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/BaseTestInheritance.java
@@ -6,8 +6,8 @@
 
 public class BaseTestInheritance {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestAssumption.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestAssumption.java
index 7692998b8b7..05626a0c2f5 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestAssumption.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestAssumption.java
@@ -6,8 +6,8 @@
 
 public class TestAssumption {
 
-  @Test
-  public void test_fail_assumption() {
-    assumeTrue(1 > 2);
-  }
+    @Test
+    public void test_fail_assumption() {
+        assumeTrue(1 > 2);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestAssumptionAndSucceed.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestAssumptionAndSucceed.java
index 7d105ed4afc..4b07dbf5d91 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestAssumptionAndSucceed.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestAssumptionAndSucceed.java
@@ -7,13 +7,13 @@
 
 public class TestAssumptionAndSucceed {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_fail_assumption() {
-    assumeTrue(1 > 2);
-  }
+    @Test
+    public void test_fail_assumption() {
+        assumeTrue(1 > 2);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestAssumptionLegacy.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestAssumptionLegacy.java
index 1c3e58c31e9..61863848fc8 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestAssumptionLegacy.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestAssumptionLegacy.java
@@ -5,9 +5,9 @@
 
 public class TestAssumptionLegacy {
 
-  @Test
-  public void test_fail_assumption_legacy() {
-    // Throw exception from legacy JUnit4 library.
-    throw new AssumptionViolatedException("assumption is not fulfilled");
-  }
+    @Test
+    public void test_fail_assumption_legacy() {
+        // Throw exception from legacy JUnit4 library.
+        throw new AssumptionViolatedException("assumption is not fulfilled");
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestError.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestError.java
index 5d96005f7be..6f446d922b3 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestError.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestError.java
@@ -4,8 +4,8 @@
 
 public class TestError {
 
-  @Test
-  public void test_error() {
-    throw new IllegalArgumentException("This exception is an example");
-  }
+    @Test
+    public void test_error() {
+        throw new IllegalArgumentException("This exception is an example");
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFactory.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFactory.java
index d4058921a26..c250ef0b93f 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFactory.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFactory.java
@@ -7,10 +7,10 @@
 
 public class TestFactory {
 
-  @org.junit.jupiter.api.TestFactory
-  public Iterable<DynamicTest> test_factory() {
-    return Arrays.asList(
-        DynamicTest.dynamicTest("dynamic_test_succeed", () -> assertEquals(0, 0)),
-        DynamicTest.dynamicTest("dynamic_test_succeed", () -> assertEquals(2, 1 + 1)));
-  }
+    @org.junit.jupiter.api.TestFactory
+    public Iterable<DynamicTest> test_factory() {
+        return Arrays.asList(
+                DynamicTest.dynamicTest("dynamic_test_succeed", () -> assertEquals(0, 0)),
+                DynamicTest.dynamicTest("dynamic_test_succeed", () -> assertEquals(2, 1 + 1)));
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailed.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailed.java
index 554141bdc46..9dff1098dde 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailed.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailed.java
@@ -6,8 +6,8 @@
 
 public class TestFailed {
 
-  @Test
-  public void test_failed() {
-    assertTrue(false);
-  }
+    @Test
+    public void test_failed() {
+        assertTrue(false);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedAndSucceed.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedAndSucceed.java
index 45c233f7a36..06c92dc1782 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedAndSucceed.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedAndSucceed.java
@@ -6,18 +6,18 @@
 
 public class TestFailedAndSucceed {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_failed() {
-    assertTrue(false);
-  }
+    @Test
+    public void test_failed() {
+        assertTrue(false);
+    }
 
-  @Test
-  public void test_another_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_another_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedFactory.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedFactory.java
index ef5e73c41af..b440c2e9963 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedFactory.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedFactory.java
@@ -7,10 +7,10 @@
 
 public class TestFailedFactory {
 
-  @org.junit.jupiter.api.TestFactory
-  public Iterable<DynamicTest> test_factory() {
-    return Arrays.asList(
-        DynamicTest.dynamicTest("dynamic_test_succeed", () -> assertEquals(0, 0)),
-        DynamicTest.dynamicTest("dynamic_test_failed", () -> assertEquals(2, 1 + 1 + 1)));
-  }
+    @org.junit.jupiter.api.TestFactory
+    public Iterable<DynamicTest> test_factory() {
+        return Arrays.asList(
+                DynamicTest.dynamicTest("dynamic_test_succeed", () -> assertEquals(0, 0)),
+                DynamicTest.dynamicTest("dynamic_test_failed", () -> assertEquals(2, 1 + 1 + 1)));
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedParameterized.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedParameterized.java
index f93d6b9f57d..cb6cb8141b9 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedParameterized.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedParameterized.java
@@ -10,14 +10,14 @@
 
 public class TestFailedParameterized {
 
-  static List<Arguments> parameters() {
-    return Arrays.asList(() -> new Object[] {0, 0, 42}, () -> new Object[] {1, 1, 42});
-  }
+    static List<Arguments> parameters() {
+        return Arrays.asList(() -> new Object[] {0, 0, 42}, () -> new Object[] {1, 1, 42});
+    }
 
-  @ParameterizedTest
-  @MethodSource("parameters")
-  public void test_failed_parameterized(final int first, final int second, final int expectedSum) {
-    final int actualSum = first + second;
-    assertEquals(expectedSum, actualSum);
-  }
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_failed_parameterized(final int first, final int second, final int expectedSum) {
+        final int actualSum = first + second;
+        assertEquals(expectedSum, actualSum);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedSuiteSetup.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedSuiteSetup.java
index c19a550191c..1a4721aa07f 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedSuiteSetup.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedSuiteSetup.java
@@ -7,18 +7,18 @@
 
 public class TestFailedSuiteSetup {
 
-  @BeforeAll
-  public static void suiteSetup() {
-    throw new RuntimeException("suite set up failed");
-  }
+    @BeforeAll
+    public static void suiteSetup() {
+        throw new RuntimeException("suite set up failed");
+    }
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_another_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_another_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedSuiteTearDown.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedSuiteTearDown.java
index 10001522c96..8a9c675a48a 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedSuiteTearDown.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedSuiteTearDown.java
@@ -7,18 +7,18 @@
 
 public class TestFailedSuiteTearDown {
 
-  @AfterAll
-  public static void suiteTearDown() {
-    throw new RuntimeException("suite tear down failed");
-  }
+    @AfterAll
+    public static void suiteTearDown() {
+        throw new RuntimeException("suite tear down failed");
+    }
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_another_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_another_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedTemplate.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedTemplate.java
index 489429e409f..e847d7eccfc 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedTemplate.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedTemplate.java
@@ -16,77 +16,74 @@
 
 public class TestFailedTemplate {
 
-  @org.junit.jupiter.api.TestTemplate
-  @ExtendWith(SampleInvocationContextProvider.class)
-  public void test_template(final SampleTestCase testCase) {
-    assertEquals(testCase.result, testCase.a + testCase.b);
-  }
-
-  public static class SampleTestCase {
-    private final String displayName;
-    private final int a;
-    private final int b;
-    private final int result;
-
-    public SampleTestCase(final String displayName, final int a, final int b, final int result) {
-      this.displayName = displayName;
-      this.a = a;
-      this.b = b;
-      this.result = result;
+    @org.junit.jupiter.api.TestTemplate
+    @ExtendWith(SampleInvocationContextProvider.class)
+    public void test_template(final SampleTestCase testCase) {
+        assertEquals(testCase.result, testCase.a + testCase.b);
     }
-  }
 
-  public static class SampleInvocationContextProvider
-      implements TestTemplateInvocationContextProvider {
+    public static class SampleTestCase {
+        private final String displayName;
+        private final int a;
+        private final int b;
+        private final int result;
 
-    @Override
-    public boolean supportsTestTemplate(final ExtensionContext context) {
-      return true;
+        public SampleTestCase(final String displayName, final int a, final int b, final int result) {
+            this.displayName = displayName;
+            this.a = a;
+            this.b = b;
+            this.result = result;
+        }
     }
 
-    @Override
-    public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContexts(
-        final ExtensionContext context) {
-      return Stream.of(
-          featureEnabledContext(new SampleTestCase("test_template_failed", 0, 0, 42)),
-          featureEnabledContext(new SampleTestCase("test_template_succeed", 1, 1, 2)));
-    }
+    public static class SampleInvocationContextProvider implements TestTemplateInvocationContextProvider {
 
-    private TestTemplateInvocationContext featureEnabledContext(
-        final SampleTestCase sampleTestCase) {
-      return new TestTemplateInvocationContext() {
         @Override
-        public String getDisplayName(final int invocationIndex) {
-          return sampleTestCase.displayName;
+        public boolean supportsTestTemplate(final ExtensionContext context) {
+            return true;
         }
 
         @Override
-        public List<Extension> getAdditionalExtensions() {
-          return asList(new GenericTypedParameterResolver(sampleTestCase));
+        public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContexts(
+                final ExtensionContext context) {
+            return Stream.of(
+                    featureEnabledContext(new SampleTestCase("test_template_failed", 0, 0, 42)),
+                    featureEnabledContext(new SampleTestCase("test_template_succeed", 1, 1, 2)));
         }
-      };
-    }
-  }
 
-  public static class GenericTypedParameterResolver<T> implements ParameterResolver {
-    T data;
+        private TestTemplateInvocationContext featureEnabledContext(final SampleTestCase sampleTestCase) {
+            return new TestTemplateInvocationContext() {
+                @Override
+                public String getDisplayName(final int invocationIndex) {
+                    return sampleTestCase.displayName;
+                }
 
-    public GenericTypedParameterResolver(final T data) {
-      this.data = data;
+                @Override
+                public List<Extension> getAdditionalExtensions() {
+                    return asList(new GenericTypedParameterResolver(sampleTestCase));
+                }
+            };
+        }
     }
 
-    @Override
-    public boolean supportsParameter(
-        final ParameterContext parameterContext, final ExtensionContext extensionContext)
-        throws ParameterResolutionException {
-      return parameterContext.getParameter().getType().isInstance(data);
-    }
+    public static class GenericTypedParameterResolver<T> implements ParameterResolver {
+        T data;
 
-    @Override
-    public Object resolveParameter(
-        final ParameterContext parameterContext, final ExtensionContext extensionContext)
-        throws ParameterResolutionException {
-      return data;
+        public GenericTypedParameterResolver(final T data) {
+            this.data = data;
+        }
+
+        @Override
+        public boolean supportsParameter(
+                final ParameterContext parameterContext, final ExtensionContext extensionContext)
+                throws ParameterResolutionException {
+            return parameterContext.getParameter().getType().isInstance(data);
+        }
+
+        @Override
+        public Object resolveParameter(final ParameterContext parameterContext, final ExtensionContext extensionContext)
+                throws ParameterResolutionException {
+            return data;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedThenSucceed.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedThenSucceed.java
index cac99b64d40..23263be4184 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedThenSucceed.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedThenSucceed.java
@@ -11,30 +11,30 @@
 
 public class TestFailedThenSucceed {
 
-  public static int TEST_EXECUTIONS_COUNT = 0;
+    public static int TEST_EXECUTIONS_COUNT = 0;
 
-  @BeforeEach
-  public void setUp() {
-    AgentTracer.TracerAPI agentTracer = AgentTracer.get();
-    AgentSpan span = agentTracer.buildSpan("junit-manual", "set-up").start();
-    try (ContextScope scope = agentTracer.activateManualSpan(span)) {
-      // tracing setup to verify that it is executed for every retry
+    @BeforeEach
+    public void setUp() {
+        AgentTracer.TracerAPI agentTracer = AgentTracer.get();
+        AgentSpan span = agentTracer.buildSpan("junit-manual", "set-up").start();
+        try (ContextScope scope = agentTracer.activateManualSpan(span)) {
+            // tracing setup to verify that it is executed for every retry
+        }
+        span.finish();
     }
-    span.finish();
-  }
 
-  @Test
-  public void test_failed_then_succeed() {
-    assertTrue(++TEST_EXECUTIONS_COUNT > 3);
-  }
+    @Test
+    public void test_failed_then_succeed() {
+        assertTrue(++TEST_EXECUTIONS_COUNT > 3);
+    }
 
-  @AfterEach
-  public void tearDown() {
-    AgentTracer.TracerAPI agentTracer = AgentTracer.get();
-    AgentSpan span = agentTracer.buildSpan("junit-manual", "tear-down").start();
-    try (ContextScope scope = agentTracer.activateManualSpan(span)) {
-      // tracing teardown to verify that it is executed for every retry
+    @AfterEach
+    public void tearDown() {
+        AgentTracer.TracerAPI agentTracer = AgentTracer.get();
+        AgentSpan span = agentTracer.buildSpan("junit-manual", "tear-down").start();
+        try (ContextScope scope = agentTracer.activateManualSpan(span)) {
+            // tracing teardown to verify that it is executed for every retry
+        }
+        span.finish();
     }
-    span.finish();
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestParameterized.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestParameterized.java
index c905257da9d..41e9a9c3bf4 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestParameterized.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestParameterized.java
@@ -11,18 +11,16 @@
 
 public class TestParameterized {
 
-  static List<Arguments> parameters() {
-    return Arrays.asList(
-        () -> new Object[] {0, 0, "0", "some:\"parameter\""},
-        () -> new Object[] {1, 1, 2, "some:\"parameter\""});
-  }
+    static List<Arguments> parameters() {
+        return Arrays.asList(() -> new Object[] {0, 0, "0", "some:\"parameter\""}, () ->
+                new Object[] {1, 1, 2, "some:\"parameter\""});
+    }
 
-  @ParameterizedTest
-  @MethodSource("parameters")
-  public void test_parameterized(
-      final int first, final int second, final int expectedSum, final String message) {
-    final int actualSum = first + second;
-    assertEquals(expectedSum, actualSum);
-    assertNotNull(message);
-  }
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_parameterized(final int first, final int second, final int expectedSum, final String message) {
+        final int actualSum = first + second;
+        assertEquals(expectedSum, actualSum);
+        assertNotNull(message);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestRepeated.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestRepeated.java
index 3c517bccaed..472f03fd6f1 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestRepeated.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestRepeated.java
@@ -6,8 +6,8 @@
 
 public class TestRepeated {
 
-  @RepeatedTest(2)
-  public void test_repeated() {
-    assertTrue(true);
-  }
+    @RepeatedTest(2)
+    public void test_repeated() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSkipped.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSkipped.java
index 2a30488475d..f3bf790e17e 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSkipped.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSkipped.java
@@ -5,7 +5,7 @@
 
 public class TestSkipped {
 
-  @Disabled("Ignore reason in test")
-  @Test
-  public void test_skipped() {}
+    @Disabled("Ignore reason in test")
+    @Test
+    public void test_skipped() {}
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSkippedClass.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSkippedClass.java
index cdc084f7ba8..f9c380cdb9b 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSkippedClass.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSkippedClass.java
@@ -17,33 +17,32 @@
 @Disabled("Ignore reason in class")
 public class TestSkippedClass {
 
-  @Test
-  public void test_case_skipped() {}
-
-  @org.junit.jupiter.api.TestFactory
-  public Iterable<DynamicTest> test_factory_skipped() {
-    return Arrays.asList(
-        DynamicTest.dynamicTest("dynamic_test_succeed", () -> assertEquals(0, 0)),
-        DynamicTest.dynamicTest("dynamic_test_succeed", () -> assertEquals(2, 1 + 1)));
-  }
-
-  @ParameterizedTest
-  @MethodSource("parameters")
-  public void test_parameterized_skipped(
-      final int first, final int second, final int expectedSum, final String message) {
-    final int actualSum = first + second;
-    assertEquals(expectedSum, actualSum);
-    assertNotNull(message);
-  }
-
-  static List<Arguments> parameters() {
-    return Arrays.asList(
-        () -> new Object[] {0, 0, "0", "some:\"parameter\""},
-        () -> new Object[] {1, 1, 2, "some:\"parameter\""});
-  }
-
-  @RepeatedTest(2)
-  public void test_repeated_skipped() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_case_skipped() {}
+
+    @org.junit.jupiter.api.TestFactory
+    public Iterable<DynamicTest> test_factory_skipped() {
+        return Arrays.asList(
+                DynamicTest.dynamicTest("dynamic_test_succeed", () -> assertEquals(0, 0)),
+                DynamicTest.dynamicTest("dynamic_test_succeed", () -> assertEquals(2, 1 + 1)));
+    }
+
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_parameterized_skipped(
+            final int first, final int second, final int expectedSum, final String message) {
+        final int actualSum = first + second;
+        assertEquals(expectedSum, actualSum);
+        assertNotNull(message);
+    }
+
+    static List<Arguments> parameters() {
+        return Arrays.asList(() -> new Object[] {0, 0, "0", "some:\"parameter\""}, () ->
+                new Object[] {1, 1, 2, "some:\"parameter\""});
+    }
+
+    @RepeatedTest(2)
+    public void test_repeated_skipped() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSkippedNested.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSkippedNested.java
index a9fde121295..c05bcfd2383 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSkippedNested.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSkippedNested.java
@@ -9,16 +9,16 @@
 @Disabled("Ignore reason in class")
 public class TestSkippedNested {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
-
-  @Nested
-  class NestedSuite {
     @Test
-    public void test_succeed_nested() {
-      assertTrue(true);
+    public void test_succeed() {
+        assertTrue(true);
+    }
+
+    @Nested
+    class NestedSuite {
+        @Test
+        public void test_succeed_nested() {
+            assertTrue(true);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceed.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceed.java
index 17434ed370c..2319ad8579f 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceed.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceed.java
@@ -6,8 +6,8 @@
 
 public class TestSucceed {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedAndSkipped.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedAndSkipped.java
index c1e025dabf5..1fa113aaaa7 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedAndSkipped.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedAndSkipped.java
@@ -7,12 +7,12 @@
 
 public class TestSucceedAndSkipped {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Disabled("Ignore reason in test")
-  @Test
-  public void test_skipped() {}
+    @Disabled("Ignore reason in test")
+    @Test
+    public void test_skipped() {}
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedExpectedException.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedExpectedException.java
index 899235c95e0..d97ef82dbfd 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedExpectedException.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedExpectedException.java
@@ -6,12 +6,10 @@
 
 public class TestSucceedExpectedException {
 
-  @Test
-  public void test_succeed() {
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> {
-          throw new IllegalArgumentException("expected exception");
+    @Test
+    public void test_succeed() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            throw new IllegalArgumentException("expected exception");
         });
-  }
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedNested.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedNested.java
index 8c38e13327e..3e46aabc42d 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedNested.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedNested.java
@@ -7,16 +7,16 @@
 
 public class TestSucceedNested {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
-
-  @Nested
-  class NestedSuite {
     @Test
-    public void test_succeed_nested() {
-      assertTrue(true);
+    public void test_succeed() {
+        assertTrue(true);
+    }
+
+    @Nested
+    class NestedSuite {
+        @Test
+        public void test_succeed_nested() {
+            assertTrue(true);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedSkipEfd.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedSkipEfd.java
index 5d75f1bde1b..98daa537b3d 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedSkipEfd.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedSkipEfd.java
@@ -9,9 +9,9 @@
 
 public class TestSucceedSkipEfd {
 
-  @Test
-  @Tags({@Tag(CIConstants.Tags.EFD_DISABLE_TAG)})
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    @Tags({@Tag(CIConstants.Tags.EFD_DISABLE_TAG)})
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedSlow.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedSlow.java
index c92ad786e02..0b303a4f16a 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedSlow.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedSlow.java
@@ -6,9 +6,9 @@
 
 public class TestSucceedSlow {
 
-  @Test
-  public void test_succeed() throws InterruptedException {
-    Thread.sleep(1100);
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() throws InterruptedException {
+        Thread.sleep(1100);
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedUnskippable.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedUnskippable.java
index 99f2c356ab8..6ad93dc1cf1 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedUnskippable.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedUnskippable.java
@@ -9,9 +9,9 @@
 
 public class TestSucceedUnskippable {
 
-  @Test
-  @Tags({@Tag(CIConstants.Tags.ITR_UNSKIPPABLE_TAG)})
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    @Tags({@Tag(CIConstants.Tags.ITR_UNSKIPPABLE_TAG)})
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedUnskippableSuite.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedUnskippableSuite.java
index 761f6fbfe54..67e0d0d9479 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedUnskippableSuite.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedUnskippableSuite.java
@@ -10,8 +10,8 @@
 @Tags({@Tag(CIConstants.Tags.ITR_UNSKIPPABLE_TAG)})
 public class TestSucceedUnskippableSuite {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedVerySlow.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedVerySlow.java
index 072f5b2d90c..f41eb6d6f0f 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedVerySlow.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedVerySlow.java
@@ -6,9 +6,9 @@
 
 public class TestSucceedVerySlow {
 
-  @Test
-  public void test_succeed() throws InterruptedException {
-    Thread.sleep(2100);
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() throws InterruptedException {
+        Thread.sleep(2100);
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedWithCategories.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedWithCategories.java
index e5c658ed014..86b27010986 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedWithCategories.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedWithCategories.java
@@ -9,9 +9,9 @@
 @Tags({@Tag("Slow"), @Tag("Flaky")})
 public class TestSucceedWithCategories {
 
-  @Test
-  @Tags({@Tag("End2end"), @Tag("Browser")})
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    @Tags({@Tag("End2end"), @Tag("Browser")})
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedWithReportEntry.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedWithReportEntry.java
index 92738b2739d..f495608ae2e 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedWithReportEntry.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSucceedWithReportEntry.java
@@ -5,8 +5,8 @@
 
 public class TestSucceedWithReportEntry {
 
-  @Test
-  public void test_succeed_with_report_entry(TestReporter reporter) {
-    reporter.publishEntry("key", "value");
-  }
+    @Test
+    public void test_succeed_with_report_entry(TestReporter reporter) {
+        reporter.publishEntry("key", "value");
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSuiteSetUpAssumption.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSuiteSetUpAssumption.java
index 024aa7a1f72..1cff1ee4934 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSuiteSetUpAssumption.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestSuiteSetUpAssumption.java
@@ -8,13 +8,13 @@
 
 public class TestSuiteSetUpAssumption {
 
-  @BeforeAll
-  public static void suiteSetup() {
-    assumeTrue(1 > 2);
-  }
+    @BeforeAll
+    public static void suiteSetup() {
+        assumeTrue(1 > 2);
+    }
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestTemplate.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestTemplate.java
index de63c1ce0af..4493d45bb7a 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestTemplate.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestTemplate.java
@@ -16,77 +16,74 @@
 
 public class TestTemplate {
 
-  @org.junit.jupiter.api.TestTemplate
-  @ExtendWith(SampleInvocationContextProvider.class)
-  public void test_template(final SampleTestCase testCase) {
-    assertEquals(testCase.result, testCase.a + testCase.b);
-  }
-
-  public static class SampleTestCase {
-    private final String displayName;
-    private final int a;
-    private final int b;
-    private final int result;
-
-    public SampleTestCase(final String displayName, final int a, final int b, final int result) {
-      this.displayName = displayName;
-      this.a = a;
-      this.b = b;
-      this.result = result;
+    @org.junit.jupiter.api.TestTemplate
+    @ExtendWith(SampleInvocationContextProvider.class)
+    public void test_template(final SampleTestCase testCase) {
+        assertEquals(testCase.result, testCase.a + testCase.b);
     }
-  }
 
-  public static class SampleInvocationContextProvider
-      implements TestTemplateInvocationContextProvider {
+    public static class SampleTestCase {
+        private final String displayName;
+        private final int a;
+        private final int b;
+        private final int result;
 
-    @Override
-    public boolean supportsTestTemplate(final ExtensionContext context) {
-      return true;
+        public SampleTestCase(final String displayName, final int a, final int b, final int result) {
+            this.displayName = displayName;
+            this.a = a;
+            this.b = b;
+            this.result = result;
+        }
     }
 
-    @Override
-    public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContexts(
-        final ExtensionContext context) {
-      return Stream.of(
-          featureEnabledContext(new SampleTestCase("test_template_1", 0, 0, 0)),
-          featureEnabledContext(new SampleTestCase("test_template_2", 1, 1, 2)));
-    }
+    public static class SampleInvocationContextProvider implements TestTemplateInvocationContextProvider {
 
-    private TestTemplateInvocationContext featureEnabledContext(
-        final SampleTestCase sampleTestCase) {
-      return new TestTemplateInvocationContext() {
         @Override
-        public String getDisplayName(final int invocationIndex) {
-          return sampleTestCase.displayName;
+        public boolean supportsTestTemplate(final ExtensionContext context) {
+            return true;
         }
 
         @Override
-        public List<Extension> getAdditionalExtensions() {
-          return asList(new GenericTypedParameterResolver(sampleTestCase));
+        public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContexts(
+                final ExtensionContext context) {
+            return Stream.of(
+                    featureEnabledContext(new SampleTestCase("test_template_1", 0, 0, 0)),
+                    featureEnabledContext(new SampleTestCase("test_template_2", 1, 1, 2)));
         }
-      };
-    }
-  }
 
-  public static class GenericTypedParameterResolver<T> implements ParameterResolver {
-    T data;
+        private TestTemplateInvocationContext featureEnabledContext(final SampleTestCase sampleTestCase) {
+            return new TestTemplateInvocationContext() {
+                @Override
+                public String getDisplayName(final int invocationIndex) {
+                    return sampleTestCase.displayName;
+                }
 
-    public GenericTypedParameterResolver(final T data) {
-      this.data = data;
+                @Override
+                public List<Extension> getAdditionalExtensions() {
+                    return asList(new GenericTypedParameterResolver(sampleTestCase));
+                }
+            };
+        }
     }
 
-    @Override
-    public boolean supportsParameter(
-        final ParameterContext parameterContext, final ExtensionContext extensionContext)
-        throws ParameterResolutionException {
-      return parameterContext.getParameter().getType().isInstance(data);
-    }
+    public static class GenericTypedParameterResolver<T> implements ParameterResolver {
+        T data;
 
-    @Override
-    public Object resolveParameter(
-        final ParameterContext parameterContext, final ExtensionContext extensionContext)
-        throws ParameterResolutionException {
-      return data;
+        public GenericTypedParameterResolver(final T data) {
+            this.data = data;
+        }
+
+        @Override
+        public boolean supportsParameter(
+                final ParameterContext parameterContext, final ExtensionContext extensionContext)
+                throws ParameterResolutionException {
+            return parameterContext.getParameter().getType().isInstance(data);
+        }
+
+        @Override
+        public Object resolveParameter(final ParameterContext parameterContext, final ExtensionContext extensionContext)
+                throws ParameterResolutionException {
+            return data;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java
index 99448382196..4d23b62f4d7 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java
@@ -11,53 +11,53 @@
 
 public class BeforeAfterOperationsTracer implements InvocationInterceptor {
 
-  @Override
-  public void interceptBeforeAllMethod(
-      Invocation<Void> invocation,
-      ReflectiveInvocationContext<Method> invocationContext,
-      ExtensionContext extensionContext)
-      throws Throwable {
-    traceInvocation(invocation, invocationContext.getExecutable(), "BeforeAll");
-  }
+    @Override
+    public void interceptBeforeAllMethod(
+            Invocation<Void> invocation,
+            ReflectiveInvocationContext<Method> invocationContext,
+            ExtensionContext extensionContext)
+            throws Throwable {
+        traceInvocation(invocation, invocationContext.getExecutable(), "BeforeAll");
+    }
 
-  @Override
-  public void interceptBeforeEachMethod(
-      Invocation<Void> invocation,
-      ReflectiveInvocationContext<Method> invocationContext,
-      ExtensionContext extensionContext)
-      throws Throwable {
-    traceInvocation(invocation, invocationContext.getExecutable(), "BeforeEach");
-  }
+    @Override
+    public void interceptBeforeEachMethod(
+            Invocation<Void> invocation,
+            ReflectiveInvocationContext<Method> invocationContext,
+            ExtensionContext extensionContext)
+            throws Throwable {
+        traceInvocation(invocation, invocationContext.getExecutable(), "BeforeEach");
+    }
 
-  @Override
-  public void interceptAfterEachMethod(
-      Invocation<Void> invocation,
-      ReflectiveInvocationContext<Method> invocationContext,
-      ExtensionContext extensionContext)
-      throws Throwable {
-    traceInvocation(invocation, invocationContext.getExecutable(), "AfterEach");
-  }
+    @Override
+    public void interceptAfterEachMethod(
+            Invocation<Void> invocation,
+            ReflectiveInvocationContext<Method> invocationContext,
+            ExtensionContext extensionContext)
+            throws Throwable {
+        traceInvocation(invocation, invocationContext.getExecutable(), "AfterEach");
+    }
 
-  @Override
-  public void interceptAfterAllMethod(
-      Invocation<Void> invocation,
-      ReflectiveInvocationContext<Method> invocationContext,
-      ExtensionContext extensionContext)
-      throws Throwable {
-    traceInvocation(invocation, invocationContext.getExecutable(), "AfterAll");
-  }
+    @Override
+    public void interceptAfterAllMethod(
+            Invocation<Void> invocation,
+            ReflectiveInvocationContext<Method> invocationContext,
+            ExtensionContext extensionContext)
+            throws Throwable {
+        traceInvocation(invocation, invocationContext.getExecutable(), "AfterAll");
+    }
 
-  private static void traceInvocation(
-      Invocation<Void> invocation, Method executable, String operationName) throws Throwable {
-    AgentSpan agentSpan = AgentTracer.startSpan("junit", executable.getName());
-    agentSpan.setTag(Tags.TEST_CALLBACK, operationName);
-    try (ContextScope scope = AgentTracer.activateSpan(agentSpan)) {
-      invocation.proceed();
-    } catch (Throwable t) {
-      agentSpan.addThrowable(t);
-      throw t;
-    } finally {
-      agentSpan.finish();
+    private static void traceInvocation(Invocation<Void> invocation, Method executable, String operationName)
+            throws Throwable {
+        AgentSpan agentSpan = AgentTracer.startSpan("junit", executable.getName());
+        agentSpan.setTag(Tags.TEST_CALLBACK, operationName);
+        try (ContextScope scope = AgentTracer.activateSpan(agentSpan)) {
+            invocation.proceed();
+        } catch (Throwable t) {
+            agentSpan.addThrowable(t);
+            throw t;
+        } finally {
+            agentSpan.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/JUnit5BeforeAfterInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/JUnit5BeforeAfterInstrumentation.java
index bc283e72294..18c7b89c583 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/JUnit5BeforeAfterInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/JUnit5BeforeAfterInstrumentation.java
@@ -14,33 +14,32 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit5BeforeAfterInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public JUnit5BeforeAfterInstrumentation() {
-    super("ci-visibility", "junit-5", "setup-teardown");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.junit.jupiter.engine.extension.ExtensionRegistrar";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(),
-        JUnit5BeforeAfterInstrumentation.class.getName() + "$RegisterExtensionAdvice");
-  }
-
-  public static class RegisterExtensionAdvice {
-    @Advice.OnMethodExit
-    public static void registerExtension(@Advice.This ExtensionRegistrar extensionRegistrar) {
-      extensionRegistrar.registerExtension(BeforeAfterOperationsTracer.class);
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public JUnit5BeforeAfterInstrumentation() {
+        super("ci-visibility", "junit-5", "setup-teardown");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.junit.jupiter.engine.extension.ExtensionRegistrar";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor(), JUnit5BeforeAfterInstrumentation.class.getName() + "$RegisterExtensionAdvice");
+    }
+
+    public static class RegisterExtensionAdvice {
+        @Advice.OnMethodExit
+        public static void registerExtension(@Advice.This ExtensionRegistrar extensionRegistrar) {
+            extensionRegistrar.registerExtension(BeforeAfterOperationsTracer.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastClassOrderer.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastClassOrderer.java
index 01709b6211f..bb2ab8d146f 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastClassOrderer.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastClassOrderer.java
@@ -14,56 +14,56 @@
 
 public class FailFastClassOrderer implements ClassOrderer {
 
-  private final TestEventsHandler<TestDescriptor, TestDescriptor> testEventsHandler;
-  private final @Nullable ClassOrderer delegate;
-  private final Comparator<ClassDescriptor> executionOrderComparator;
+    private final TestEventsHandler<TestDescriptor, TestDescriptor> testEventsHandler;
+    private final @Nullable ClassOrderer delegate;
+    private final Comparator<ClassDescriptor> executionOrderComparator;
 
-  public FailFastClassOrderer(
-      TestEventsHandler<TestDescriptor, TestDescriptor> testEventsHandler,
-      @Nullable ClassOrderer delegate) {
-    this.testEventsHandler = testEventsHandler;
-    this.delegate = delegate;
-    this.executionOrderComparator = Comparator.comparing(this::classExecutionPriority).reversed();
-  }
-
-  private int classExecutionPriority(ClassDescriptor classDescriptor) {
-    TestDescriptor testDescriptor = JUnit5OrderUtils.getTestDescriptor(classDescriptor);
-    return executionPriority(testDescriptor);
-  }
-
-  private int executionPriority(TestDescriptor testDescriptor) {
-    if (testDescriptor == null) {
-      return 0;
+    public FailFastClassOrderer(
+            TestEventsHandler<TestDescriptor, TestDescriptor> testEventsHandler, @Nullable ClassOrderer delegate) {
+        this.testEventsHandler = testEventsHandler;
+        this.delegate = delegate;
+        this.executionOrderComparator =
+                Comparator.comparing(this::classExecutionPriority).reversed();
     }
 
-    if (testDescriptor.isTest() || JUnitPlatformUtils.isParameterizedTest(testDescriptor)) {
-      TestIdentifier testIdentifier = JUnitPlatformUtils.toTestIdentifier(testDescriptor);
-      TestSourceData testSourceData = JUnitPlatformUtils.toTestSourceData(testDescriptor);
-      return testEventsHandler.executionPriority(testIdentifier, testSourceData);
+    private int classExecutionPriority(ClassDescriptor classDescriptor) {
+        TestDescriptor testDescriptor = JUnit5OrderUtils.getTestDescriptor(classDescriptor);
+        return executionPriority(testDescriptor);
     }
 
-    Set<? extends TestDescriptor> children = testDescriptor.getChildren();
-    if (children.isEmpty()) {
-      return 0;
-    }
+    private int executionPriority(TestDescriptor testDescriptor) {
+        if (testDescriptor == null) {
+            return 0;
+        }
+
+        if (testDescriptor.isTest() || JUnitPlatformUtils.isParameterizedTest(testDescriptor)) {
+            TestIdentifier testIdentifier = JUnitPlatformUtils.toTestIdentifier(testDescriptor);
+            TestSourceData testSourceData = JUnitPlatformUtils.toTestSourceData(testDescriptor);
+            return testEventsHandler.executionPriority(testIdentifier, testSourceData);
+        }
+
+        Set<? extends TestDescriptor> children = testDescriptor.getChildren();
+        if (children.isEmpty()) {
+            return 0;
+        }
 
-    // there's no specific meaning to the average of children priorities,
-    // it is just a heuristic to try to favor classes with higher percentage of failure-prone tests
-    int childrenPrioritySum = 0;
-    for (TestDescriptor child : children) {
-      childrenPrioritySum += executionPriority(child);
+        // there's no specific meaning to the average of children priorities,
+        // it is just a heuristic to try to favor classes with higher percentage of failure-prone tests
+        int childrenPrioritySum = 0;
+        for (TestDescriptor child : children) {
+            childrenPrioritySum += executionPriority(child);
+        }
+        return childrenPrioritySum / children.size();
     }
-    return childrenPrioritySum / children.size();
-  }
 
-  @Override
-  public void orderClasses(ClassOrdererContext classOrdererContext) {
-    if (delegate != null) {
-      // first use delegate if available
-      delegate.orderClasses(classOrdererContext);
+    @Override
+    public void orderClasses(ClassOrdererContext classOrdererContext) {
+        if (delegate != null) {
+            // first use delegate if available
+            delegate.orderClasses(classOrdererContext);
+        }
+        // then apply our ordering (since sorting is stable, delegate's ordering will be preserved for
+        // classes with the same "known/stable" status)
+        classOrdererContext.getClassDescriptors().sort(executionOrderComparator);
     }
-    // then apply our ordering (since sorting is stable, delegate's ordering will be preserved for
-    // classes with the same "known/stable" status)
-    classOrdererContext.getClassDescriptors().sort(executionOrderComparator);
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastMethodOrderer.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastMethodOrderer.java
index 4c990fec64f..15307b93c20 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastMethodOrderer.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastMethodOrderer.java
@@ -13,36 +13,36 @@
 
 public class FailFastMethodOrderer implements MethodOrderer {
 
-  private final TestEventsHandler<TestDescriptor, TestDescriptor> testEventsHandler;
-  private final @Nullable MethodOrderer delegate;
-  private final Comparator<MethodDescriptor> executionOrderComparator;
+    private final TestEventsHandler<TestDescriptor, TestDescriptor> testEventsHandler;
+    private final @Nullable MethodOrderer delegate;
+    private final Comparator<MethodDescriptor> executionOrderComparator;
 
-  public FailFastMethodOrderer(
-      TestEventsHandler<TestDescriptor, TestDescriptor> testEventsHandler,
-      @Nullable MethodOrderer delegate) {
-    this.testEventsHandler = testEventsHandler;
-    this.delegate = delegate;
-    this.executionOrderComparator = Comparator.comparing(this::executionPriority).reversed();
-  }
+    public FailFastMethodOrderer(
+            TestEventsHandler<TestDescriptor, TestDescriptor> testEventsHandler, @Nullable MethodOrderer delegate) {
+        this.testEventsHandler = testEventsHandler;
+        this.delegate = delegate;
+        this.executionOrderComparator =
+                Comparator.comparing(this::executionPriority).reversed();
+    }
 
-  private int executionPriority(MethodDescriptor methodDescriptor) {
-    TestDescriptor testDescriptor = JUnit5OrderUtils.getTestDescriptor(methodDescriptor);
-    if (testDescriptor == null) {
-      return 0;
+    private int executionPriority(MethodDescriptor methodDescriptor) {
+        TestDescriptor testDescriptor = JUnit5OrderUtils.getTestDescriptor(methodDescriptor);
+        if (testDescriptor == null) {
+            return 0;
+        }
+        TestIdentifier testIdentifier = JUnitPlatformUtils.toTestIdentifier(testDescriptor);
+        TestSourceData testSourceData = JUnitPlatformUtils.toTestSourceData(testDescriptor);
+        return testEventsHandler.executionPriority(testIdentifier, testSourceData);
     }
-    TestIdentifier testIdentifier = JUnitPlatformUtils.toTestIdentifier(testDescriptor);
-    TestSourceData testSourceData = JUnitPlatformUtils.toTestSourceData(testDescriptor);
-    return testEventsHandler.executionPriority(testIdentifier, testSourceData);
-  }
 
-  @Override
-  public void orderMethods(MethodOrdererContext methodOrdererContext) {
-    if (delegate != null) {
-      // first use delegate if available
-      delegate.orderMethods(methodOrdererContext);
+    @Override
+    public void orderMethods(MethodOrdererContext methodOrdererContext) {
+        if (delegate != null) {
+            // first use delegate if available
+            delegate.orderMethods(methodOrdererContext);
+        }
+        // then apply our ordering (since sorting is stable, delegate's ordering will be preserved for
+        // methods with the same "known/stable" status)
+        methodOrdererContext.getMethodDescriptors().sort(executionOrderComparator);
     }
-    // then apply our ordering (since sorting is stable, delegate's ordering will be preserved for
-    // methods with the same "known/stable" status)
-    methodOrdererContext.getMethodDescriptors().sort(executionOrderComparator);
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5OrderUtils.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5OrderUtils.java
index 8fcd20ef126..15c242b05ca 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5OrderUtils.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5OrderUtils.java
@@ -9,19 +9,16 @@
 
 public class JUnit5OrderUtils {
 
-  private static final MethodHandles METHOD_HANDLES =
-      new MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
+    private static final MethodHandles METHOD_HANDLES = new MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
 
-  private static final MethodHandle GET_TEST_DESCRIPTOR =
-      METHOD_HANDLES.privateFieldGetter(
-          "org.junit.jupiter.engine.discovery.AbstractAnnotatedDescriptorWrapper",
-          "testDescriptor");
+    private static final MethodHandle GET_TEST_DESCRIPTOR = METHOD_HANDLES.privateFieldGetter(
+            "org.junit.jupiter.engine.discovery.AbstractAnnotatedDescriptorWrapper", "testDescriptor");
 
-  public static TestDescriptor getTestDescriptor(ClassDescriptor classDescriptor) {
-    return METHOD_HANDLES.invoke(GET_TEST_DESCRIPTOR, classDescriptor);
-  }
+    public static TestDescriptor getTestDescriptor(ClassDescriptor classDescriptor) {
+        return METHOD_HANDLES.invoke(GET_TEST_DESCRIPTOR, classDescriptor);
+    }
 
-  public static TestDescriptor getTestDescriptor(MethodDescriptor methodDescriptor) {
-    return METHOD_HANDLES.invoke(GET_TEST_DESCRIPTOR, methodDescriptor);
-  }
+    public static TestDescriptor getTestDescriptor(MethodDescriptor methodDescriptor) {
+        return METHOD_HANDLES.invoke(GET_TEST_DESCRIPTOR, methodDescriptor);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java
index e0945439d74..5e5bbcd6db4 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java
@@ -23,100 +23,94 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit5TestOrderInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  private final String parentPackageName =
-      Strings.getPackageName(JUnitPlatformUtils.class.getName());
+    private final String parentPackageName = Strings.getPackageName(JUnitPlatformUtils.class.getName());
 
-  public JUnit5TestOrderInstrumentation() {
-    super("ci-visibility", "junit-5", "test-order");
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.junit.jupiter.engine.config.JupiterConfiguration";
-  }
+    public JUnit5TestOrderInstrumentation() {
+        super("ci-visibility", "junit-5", "test-order");
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      parentPackageName + ".JUnitPlatformUtils",
-      parentPackageName + ".TestEventsHandlerHolder",
-      packageName + ".JUnit5OrderUtils",
-      packageName + ".FailFastClassOrderer",
-      packageName + ".FailFastMethodOrderer",
-    };
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.junit.jupiter.engine.config.JupiterConfiguration";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getDefaultTestClassOrderer"),
-        JUnit5TestOrderInstrumentation.class.getName() + "$ClassOrdererAdvice");
-    transformer.applyAdvice(
-        named("getDefaultTestMethodOrderer"),
-        JUnit5TestOrderInstrumentation.class.getName() + "$MethodOrdererAdvice");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  public static class ClassOrdererAdvice {
-    @Advice.OnMethodEnter
-    public static void onGetClassOrdererEnter() {
-      CallDepthThreadLocalMap.incrementCallDepth(JupiterConfiguration.class);
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            parentPackageName + ".JUnitPlatformUtils",
+            parentPackageName + ".TestEventsHandlerHolder",
+            packageName + ".JUnit5OrderUtils",
+            packageName + ".FailFastClassOrderer",
+            packageName + ".FailFastMethodOrderer",
+        };
     }
 
-    @Advice.OnMethodExit
-    public static void onGetClassOrdererExit(
-        @Advice.Return(readOnly = false) Optional<ClassOrderer> classOrderer) {
-      if (CallDepthThreadLocalMap.decrementCallDepth(JupiterConfiguration.class) != 0) {
-        // nested call
-        return;
-      }
-      String testOrder = Config.get().getCiVisibilityTestOrder();
-      if (CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) {
-        classOrderer =
-            Optional.of(
-                new FailFastClassOrderer(
-                    TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT5),
-                    classOrderer.orElse(null)));
-      } else {
-        throw new IllegalArgumentException("Unknown test order: " + testOrder);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getDefaultTestClassOrderer"),
+                JUnit5TestOrderInstrumentation.class.getName() + "$ClassOrdererAdvice");
+        transformer.applyAdvice(
+                named("getDefaultTestMethodOrderer"),
+                JUnit5TestOrderInstrumentation.class.getName() + "$MethodOrdererAdvice");
     }
-  }
 
-  public static class MethodOrdererAdvice {
-    @Advice.OnMethodEnter
-    public static void onGetMethodOrdererEnter() {
-      CallDepthThreadLocalMap.incrementCallDepth(JupiterConfiguration.class);
+    public static class ClassOrdererAdvice {
+        @Advice.OnMethodEnter
+        public static void onGetClassOrdererEnter() {
+            CallDepthThreadLocalMap.incrementCallDepth(JupiterConfiguration.class);
+        }
+
+        @Advice.OnMethodExit
+        public static void onGetClassOrdererExit(@Advice.Return(readOnly = false) Optional<ClassOrderer> classOrderer) {
+            if (CallDepthThreadLocalMap.decrementCallDepth(JupiterConfiguration.class) != 0) {
+                // nested call
+                return;
+            }
+            String testOrder = Config.get().getCiVisibilityTestOrder();
+            if (CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) {
+                classOrderer = Optional.of(new FailFastClassOrderer(
+                        TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT5),
+                        classOrderer.orElse(null)));
+            } else {
+                throw new IllegalArgumentException("Unknown test order: " + testOrder);
+            }
+        }
     }
 
-    @Advice.OnMethodExit
-    public static void onGetMethodOrdererExit(
-        @Advice.Return(readOnly = false) Optional<MethodOrderer> methodOrderer) {
-      if (CallDepthThreadLocalMap.decrementCallDepth(JupiterConfiguration.class) != 0) {
-        // nested call
-        return;
-      }
-      String testOrder = Config.get().getCiVisibilityTestOrder();
-      if (CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) {
-        methodOrderer =
-            Optional.of(
-                new FailFastMethodOrderer(
-                    TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT5),
-                    methodOrderer.orElse(null)));
-      } else {
-        throw new IllegalArgumentException("Unknown test order: " + testOrder);
-      }
+    public static class MethodOrdererAdvice {
+        @Advice.OnMethodEnter
+        public static void onGetMethodOrdererEnter() {
+            CallDepthThreadLocalMap.incrementCallDepth(JupiterConfiguration.class);
+        }
+
+        @Advice.OnMethodExit
+        public static void onGetMethodOrdererExit(
+                @Advice.Return(readOnly = false) Optional<MethodOrderer> methodOrderer) {
+            if (CallDepthThreadLocalMap.decrementCallDepth(JupiterConfiguration.class) != 0) {
+                // nested call
+                return;
+            }
+            String testOrder = Config.get().getCiVisibilityTestOrder();
+            if (CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) {
+                methodOrderer = Optional.of(new FailFastMethodOrderer(
+                        TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT5),
+                        methodOrderer.orElse(null)));
+            } else {
+                throw new IllegalArgumentException("Unknown test order: " + testOrder);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestFailedAfterAll.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestFailedAfterAll.java
index b4ba2f5513c..bdd6da1cde0 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestFailedAfterAll.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestFailedAfterAll.java
@@ -7,18 +7,18 @@
 
 public class TestFailedAfterAll {
 
-  @AfterAll
-  public static void tearDown() {
-    throw new RuntimeException("suite teardown failed");
-  }
+    @AfterAll
+    public static void tearDown() {
+        throw new RuntimeException("suite teardown failed");
+    }
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void another_test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void another_test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestFailedAfterEach.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestFailedAfterEach.java
index 8aac75d89c3..a5759170b10 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestFailedAfterEach.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestFailedAfterEach.java
@@ -7,18 +7,18 @@
 
 public class TestFailedAfterEach {
 
-  @AfterEach
-  public void tearDown() {
-    throw new RuntimeException("testcase teardown failed");
-  }
+    @AfterEach
+    public void tearDown() {
+        throw new RuntimeException("testcase teardown failed");
+    }
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void another_test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void another_test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestFailedBeforeAll.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestFailedBeforeAll.java
index 28687830add..d11b6ef2ca9 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestFailedBeforeAll.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestFailedBeforeAll.java
@@ -7,18 +7,18 @@
 
 public class TestFailedBeforeAll {
 
-  @BeforeAll
-  public static void setUp() {
-    throw new RuntimeException("suite setup failed");
-  }
+    @BeforeAll
+    public static void setUp() {
+        throw new RuntimeException("suite setup failed");
+    }
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void another_test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void another_test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestFailedBeforeEach.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestFailedBeforeEach.java
index 122c43d22a2..ebfdd74463b 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestFailedBeforeEach.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestFailedBeforeEach.java
@@ -7,18 +7,18 @@
 
 public class TestFailedBeforeEach {
 
-  @BeforeEach
-  public void setUp() {
-    throw new RuntimeException("testcase setup failed");
-  }
+    @BeforeEach
+    public void setUp() {
+        throw new RuntimeException("testcase setup failed");
+    }
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void another_test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void another_test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestParameterized.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestParameterized.java
index 0b28259cfa5..005ee477005 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestParameterized.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestParameterized.java
@@ -11,25 +11,24 @@
 
 public class TestParameterized {
 
-  static List<Arguments> parameters() {
-    return Collections.singletonList(() -> new Object[] {0, 0, "0", "some:\"parameter\""});
-  }
+    static List<Arguments> parameters() {
+        return Collections.singletonList(() -> new Object[] {0, 0, "0", "some:\"parameter\""});
+    }
 
-  @ParameterizedTest
-  @MethodSource("parameters")
-  public void test_parameterized(
-      final int first, final int second, final int expectedSum, final String message) {
-    final int actualSum = first + second;
-    assertEquals(expectedSum, actualSum);
-    assertNotNull(message);
-  }
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_parameterized(final int first, final int second, final int expectedSum, final String message) {
+        final int actualSum = first + second;
+        assertEquals(expectedSum, actualSum);
+        assertNotNull(message);
+    }
 
-  @ParameterizedTest
-  @MethodSource("parameters")
-  public void test_another_parameterized(
-      final int first, final int second, final int expectedSum, final String message) {
-    final int actualSum = first + second;
-    assertEquals(expectedSum, actualSum);
-    assertNotNull(message);
-  }
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_another_parameterized(
+            final int first, final int second, final int expectedSum, final String message) {
+        final int actualSum = first + second;
+        assertEquals(expectedSum, actualSum);
+        assertNotNull(message);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestSucceed.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestSucceed.java
index 22907b66d3e..ee107fb1e9e 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestSucceed.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestSucceed.java
@@ -6,13 +6,13 @@
 
 public class TestSucceed {
 
-  @Test
-  public void test_succeed_1() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed_1() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_succeed_2() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed_2() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestSucceedAnother.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestSucceedAnother.java
index f336cac5c27..9d86c4ea385 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestSucceedAnother.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestSucceedAnother.java
@@ -6,8 +6,8 @@
 
 public class TestSucceedAnother {
 
-  @Test
-  public void test_succeed_1() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed_1() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestSucceedBeforeAllAfterAll.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestSucceedBeforeAllAfterAll.java
index f228dedd839..1ef65df1155 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestSucceedBeforeAllAfterAll.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestSucceedBeforeAllAfterAll.java
@@ -8,19 +8,19 @@
 
 public class TestSucceedBeforeAllAfterAll {
 
-  @BeforeAll
-  public static void setUp() {}
+    @BeforeAll
+    public static void setUp() {}
 
-  @AfterAll
-  public static void tearDown() {}
+    @AfterAll
+    public static void tearDown() {}
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void another_test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void another_test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestSucceedBeforeEachAfterEach.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestSucceedBeforeEachAfterEach.java
index ece36cc39e2..a7732ef2da3 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestSucceedBeforeEachAfterEach.java
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/test/java/org/example/TestSucceedBeforeEachAfterEach.java
@@ -8,19 +8,19 @@
 
 public class TestSucceedBeforeEachAfterEach {
 
-  @BeforeEach
-  public void setUp() {}
+    @BeforeEach
+    public void setUp() {}
 
-  @AfterEach
-  public void tearDown() {}
+    @AfterEach
+    public void tearDown() {}
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void another_test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void another_test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java
index 57de8c42ff3..15778e948f6 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java
@@ -27,150 +27,149 @@
 
 @AutoService(InstrumenterModule.class)
 public final class ConsumerCoordinatorInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public ConsumerCoordinatorInstrumentation() {
-    super("kafka", "kafka-0.11");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "before-3.8";
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return not(hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy")); // < 3.8
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>();
-    contextStores.put(
-        "org.apache.kafka.clients.Metadata",
-        "datadog.trace.instrumentation.kafka_common.MetadataState");
-    contextStores.put(
-        "org.apache.kafka.clients.consumer.internals.ConsumerCoordinator",
-        KafkaConsumerInfo.class.getName());
-    return contextStores;
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.kafka.clients.consumer.internals.ConsumerCoordinator";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".KafkaConsumerInfo",
-      "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
-      "datadog.trace.instrumentation.kafka_common.PendingConfig",
-      "datadog.trace.instrumentation.kafka_common.MetadataState",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("sendOffsetCommitRequest")).and(takesArguments(1)),
-        ConsumerCoordinatorInstrumentation.class.getName() + "$CommitOffsetAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("onJoinComplete")).and(takesArguments(4)),
-        ConsumerCoordinatorInstrumentation.class.getName() + "$JoinGroupAdvice");
-  }
-
-  public static class CommitOffsetAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void trackCommitOffset(
-        @Advice.This ConsumerCoordinator coordinator,
-        @Advice.Return RequestFuture<Void> requestFuture,
-        @Advice.Argument(0) final Map<TopicPartition, OffsetAndMetadata> offsets) {
-      if (requestFuture == null || requestFuture.failed()) {
-        return;
-      }
-      if (offsets == null) {
-        return;
-      }
-      KafkaConsumerInfo kafkaConsumerInfo =
-          InstrumentationContext.get(ConsumerCoordinator.class, KafkaConsumerInfo.class)
-              .get(coordinator);
-
-      if (kafkaConsumerInfo == null) {
-        return;
-      }
-
-      String consumerGroup = kafkaConsumerInfo.getConsumerGroup();
-      Metadata consumerMetadata = kafkaConsumerInfo.getClientMetadata();
-      String clusterId = null;
-      if (consumerMetadata != null) {
-        MetadataState metadataState =
-            InstrumentationContext.get(Metadata.class, MetadataState.class).get(consumerMetadata);
-        clusterId = metadataState != null ? metadataState.clusterId : null;
-      }
-
-      for (Map.Entry<TopicPartition, OffsetAndMetadata> entry : offsets.entrySet()) {
-        if (consumerGroup == null) {
-          consumerGroup = "";
-        }
-        if (entry.getKey() == null || entry.getValue() == null) {
-          continue;
-        }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public ConsumerCoordinatorInstrumentation() {
+        super("kafka", "kafka-0.11");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "before-3.8";
+    }
 
-        DataStreamsTags tags =
-            DataStreamsTags.createWithPartition(
-                "kafka_commit",
-                entry.getKey().topic(),
-                String.valueOf(entry.getKey().partition()),
-                clusterId,
-                consumerGroup);
-        AgentTracer.get().getDataStreamsMonitoring().trackBacklog(tags, entry.getValue().offset());
-      }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return not(hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy")); // < 3.8
     }
 
-    public static void muzzleCheck(ConsumerRecord record) {
-      // KafkaConsumerInstrumentation only applies for kafka versions with headers
-      // Make an explicit call so ConsumerCoordinatorInstrumentation does the same
-      record.headers();
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>();
+        contextStores.put(
+                "org.apache.kafka.clients.Metadata", "datadog.trace.instrumentation.kafka_common.MetadataState");
+        contextStores.put(
+                "org.apache.kafka.clients.consumer.internals.ConsumerCoordinator", KafkaConsumerInfo.class.getName());
+        return contextStores;
     }
-  }
-
-  public static class JoinGroupAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void trackJoinGroup(
-        @Advice.This ConsumerCoordinator coordinator,
-        @Advice.Argument(0) final int generationId,
-        @Advice.Argument(1) final String memberId,
-        @Advice.Argument(2) final String memberProtocol) {
-      if (memberId == null || memberId.isEmpty()) {
-        return;
-      }
-      KafkaConsumerInfo kafkaConsumerInfo =
-          InstrumentationContext.get(ConsumerCoordinator.class, KafkaConsumerInfo.class)
-              .get(coordinator);
-      if (kafkaConsumerInfo == null) {
-        return;
-      }
-      if (!kafkaConsumerInfo.hasMembershipChanged(memberId, generationId)) {
-        return;
-      }
-
-      String consumerGroup = kafkaConsumerInfo.getConsumerGroup();
-      Metadata consumerMetadata = kafkaConsumerInfo.getClientMetadata();
-      String clusterId = null;
-      if (consumerMetadata != null) {
-        MetadataState metadataState =
-            InstrumentationContext.get(Metadata.class, MetadataState.class).get(consumerMetadata);
-        clusterId = metadataState != null ? metadataState.clusterId : null;
-      }
-      if (KafkaConfigHelper.reportConsumerGroupMember(
-          clusterId, consumerGroup, memberId, generationId, memberProtocol)) {
-        kafkaConsumerInfo.setLastReportedMembership(memberId, generationId);
-      }
+
+    @Override
+    public String instrumentedType() {
+        return "org.apache.kafka.clients.consumer.internals.ConsumerCoordinator";
     }
 
-    public static void muzzleCheck(ConsumerRecord record) {
-      record.headers();
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".KafkaConsumerInfo",
+            "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
+            "datadog.trace.instrumentation.kafka_common.PendingConfig",
+            "datadog.trace.instrumentation.kafka_common.MetadataState",
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("sendOffsetCommitRequest")).and(takesArguments(1)),
+                ConsumerCoordinatorInstrumentation.class.getName() + "$CommitOffsetAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("onJoinComplete")).and(takesArguments(4)),
+                ConsumerCoordinatorInstrumentation.class.getName() + "$JoinGroupAdvice");
+    }
+
+    public static class CommitOffsetAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void trackCommitOffset(
+                @Advice.This ConsumerCoordinator coordinator,
+                @Advice.Return RequestFuture<Void> requestFuture,
+                @Advice.Argument(0) final Map<TopicPartition, OffsetAndMetadata> offsets) {
+            if (requestFuture == null || requestFuture.failed()) {
+                return;
+            }
+            if (offsets == null) {
+                return;
+            }
+            KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(
+                            ConsumerCoordinator.class, KafkaConsumerInfo.class)
+                    .get(coordinator);
+
+            if (kafkaConsumerInfo == null) {
+                return;
+            }
+
+            String consumerGroup = kafkaConsumerInfo.getConsumerGroup();
+            Metadata consumerMetadata = kafkaConsumerInfo.getClientMetadata();
+            String clusterId = null;
+            if (consumerMetadata != null) {
+                MetadataState metadataState = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                        .get(consumerMetadata);
+                clusterId = metadataState != null ? metadataState.clusterId : null;
+            }
+
+            for (Map.Entry<TopicPartition, OffsetAndMetadata> entry : offsets.entrySet()) {
+                if (consumerGroup == null) {
+                    consumerGroup = "";
+                }
+                if (entry.getKey() == null || entry.getValue() == null) {
+                    continue;
+                }
+
+                DataStreamsTags tags = DataStreamsTags.createWithPartition(
+                        "kafka_commit",
+                        entry.getKey().topic(),
+                        String.valueOf(entry.getKey().partition()),
+                        clusterId,
+                        consumerGroup);
+                AgentTracer.get()
+                        .getDataStreamsMonitoring()
+                        .trackBacklog(tags, entry.getValue().offset());
+            }
+        }
+
+        public static void muzzleCheck(ConsumerRecord record) {
+            // KafkaConsumerInstrumentation only applies for kafka versions with headers
+            // Make an explicit call so ConsumerCoordinatorInstrumentation does the same
+            record.headers();
+        }
+    }
+
+    public static class JoinGroupAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void trackJoinGroup(
+                @Advice.This ConsumerCoordinator coordinator,
+                @Advice.Argument(0) final int generationId,
+                @Advice.Argument(1) final String memberId,
+                @Advice.Argument(2) final String memberProtocol) {
+            if (memberId == null || memberId.isEmpty()) {
+                return;
+            }
+            KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(
+                            ConsumerCoordinator.class, KafkaConsumerInfo.class)
+                    .get(coordinator);
+            if (kafkaConsumerInfo == null) {
+                return;
+            }
+            if (!kafkaConsumerInfo.hasMembershipChanged(memberId, generationId)) {
+                return;
+            }
+
+            String consumerGroup = kafkaConsumerInfo.getConsumerGroup();
+            Metadata consumerMetadata = kafkaConsumerInfo.getClientMetadata();
+            String clusterId = null;
+            if (consumerMetadata != null) {
+                MetadataState metadataState = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                        .get(consumerMetadata);
+                clusterId = metadataState != null ? metadataState.clusterId : null;
+            }
+            if (KafkaConfigHelper.reportConsumerGroupMember(
+                    clusterId, consumerGroup, memberId, generationId, memberProtocol)) {
+                kafkaConsumerInfo.setLastReportedMembership(memberId, generationId);
+            }
+        }
+
+        public static void muzzleCheck(ConsumerRecord record) {
+            record.headers();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfo.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfo.java
index 2cd25004a2c..215f037b192 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfo.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfo.java
@@ -5,61 +5,60 @@
 import org.apache.kafka.clients.Metadata;
 
 public class KafkaConsumerInfo {
-  private final String consumerGroup;
-  private final Metadata clientMetadata;
-  private final String bootstrapServers;
-  private volatile String lastReportedMemberId;
-  private volatile int lastReportedGenerationId = Integer.MIN_VALUE;
+    private final String consumerGroup;
+    private final Metadata clientMetadata;
+    private final String bootstrapServers;
+    private volatile String lastReportedMemberId;
+    private volatile int lastReportedGenerationId = Integer.MIN_VALUE;
 
-  public KafkaConsumerInfo(String consumerGroup, Metadata clientMetadata, String bootstrapServers) {
-    this.consumerGroup = consumerGroup;
-    this.clientMetadata = clientMetadata;
-    this.bootstrapServers = bootstrapServers;
-  }
+    public KafkaConsumerInfo(String consumerGroup, Metadata clientMetadata, String bootstrapServers) {
+        this.consumerGroup = consumerGroup;
+        this.clientMetadata = clientMetadata;
+        this.bootstrapServers = bootstrapServers;
+    }
 
-  public KafkaConsumerInfo(String consumerGroup, String bootstrapServers) {
-    this.consumerGroup = consumerGroup;
-    this.clientMetadata = null;
-    this.bootstrapServers = bootstrapServers;
-  }
+    public KafkaConsumerInfo(String consumerGroup, String bootstrapServers) {
+        this.consumerGroup = consumerGroup;
+        this.clientMetadata = null;
+        this.bootstrapServers = bootstrapServers;
+    }
 
-  @Nullable
-  public String getConsumerGroup() {
-    return consumerGroup;
-  }
+    @Nullable
+    public String getConsumerGroup() {
+        return consumerGroup;
+    }
 
-  @Nullable
-  public Metadata getClientMetadata() {
-    return clientMetadata;
-  }
+    @Nullable
+    public Metadata getClientMetadata() {
+        return clientMetadata;
+    }
 
-  @Nullable
-  public String getBootstrapServers() {
-    return bootstrapServers;
-  }
+    @Nullable
+    public String getBootstrapServers() {
+        return bootstrapServers;
+    }
 
-  public boolean hasMembershipChanged(String memberId, int generationId) {
-    return !Objects.equals(memberId, lastReportedMemberId)
-        || generationId != lastReportedGenerationId;
-  }
+    public boolean hasMembershipChanged(String memberId, int generationId) {
+        return !Objects.equals(memberId, lastReportedMemberId) || generationId != lastReportedGenerationId;
+    }
 
-  public void setLastReportedMembership(String memberId, int generationId) {
-    this.lastReportedMemberId = memberId;
-    this.lastReportedGenerationId = generationId;
-  }
+    public void setLastReportedMembership(String memberId, int generationId) {
+        this.lastReportedMemberId = memberId;
+        this.lastReportedGenerationId = generationId;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    KafkaConsumerInfo consumerInfo = (KafkaConsumerInfo) o;
-    return Objects.equals(consumerGroup, consumerInfo.consumerGroup)
-        && Objects.equals(clientMetadata, consumerInfo.clientMetadata);
-  }
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        KafkaConsumerInfo consumerInfo = (KafkaConsumerInfo) o;
+        return Objects.equals(consumerGroup, consumerInfo.consumerGroup)
+                && Objects.equals(clientMetadata, consumerInfo.clientMetadata);
+    }
 
-  @Override
-  public int hashCode() {
-    return 31 * (null == consumerGroup ? 0 : consumerGroup.hashCode())
-        + (null == clientMetadata ? 0 : clientMetadata.hashCode());
-  }
+    @Override
+    public int hashCode() {
+        return 31 * (null == consumerGroup ? 0 : consumerGroup.hashCode())
+                + (null == clientMetadata ? 0 : clientMetadata.hashCode());
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java
index 0ba96be626d..5e4d189a90c 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java
@@ -46,249 +46,234 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class KafkaConsumerInfoInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public KafkaConsumerInfoInstrumentation() {
-    super("kafka", "kafka-0.11");
-  }
+    public KafkaConsumerInfoInstrumentation() {
+        super("kafka", "kafka-0.11");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "before-3.8";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "before-3.8";
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return not(hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy")); // < 3.8
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return not(hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy")); // < 3.8
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>();
-    contextStores.put(
-        "org.apache.kafka.clients.Metadata",
-        "datadog.trace.instrumentation.kafka_common.MetadataState");
-    contextStores.put(
-        "org.apache.kafka.clients.consumer.ConsumerRecords", KafkaConsumerInfo.class.getName());
-    contextStores.put(
-        "org.apache.kafka.clients.consumer.internals.ConsumerCoordinator",
-        KafkaConsumerInfo.class.getName());
-    contextStores.put(
-        "org.apache.kafka.clients.consumer.KafkaConsumer", KafkaConsumerInfo.class.getName());
-    return contextStores;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>();
+        contextStores.put(
+                "org.apache.kafka.clients.Metadata", "datadog.trace.instrumentation.kafka_common.MetadataState");
+        contextStores.put("org.apache.kafka.clients.consumer.ConsumerRecords", KafkaConsumerInfo.class.getName());
+        contextStores.put(
+                "org.apache.kafka.clients.consumer.internals.ConsumerCoordinator", KafkaConsumerInfo.class.getName());
+        contextStores.put("org.apache.kafka.clients.consumer.KafkaConsumer", KafkaConsumerInfo.class.getName());
+        return contextStores;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.kafka.clients.consumer.KafkaConsumer";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.kafka.clients.consumer.KafkaConsumer";
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".KafkaDecorator",
+            packageName + ".KafkaConsumerInfo",
+            "datadog.trace.instrumentation.kafka_common.ClusterIdHolder",
+            "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
+            "datadog.trace.instrumentation.kafka_common.PendingConfig",
+            "datadog.trace.instrumentation.kafka_common.MetadataState",
+        };
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".KafkaDecorator",
-      packageName + ".KafkaConsumerInfo",
-      "datadog.trace.instrumentation.kafka_common.ClusterIdHolder",
-      "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
-      "datadog.trace.instrumentation.kafka_common.PendingConfig",
-      "datadog.trace.instrumentation.kafka_common.MetadataState",
-    };
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(0, named("org.apache.kafka.clients.consumer.ConsumerConfig")))
+                        .and(takesArgument(1, named("org.apache.kafka.common.serialization.Deserializer")))
+                        .and(takesArgument(2, named("org.apache.kafka.common.serialization.Deserializer"))),
+                KafkaConsumerInfoInstrumentation.class.getName() + "$ConstructorAdviceNot27");
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(0, named("org.apache.kafka.clients.consumer.ConsumerConfig")))
-            .and(takesArgument(1, named("org.apache.kafka.common.serialization.Deserializer")))
-            .and(takesArgument(2, named("org.apache.kafka.common.serialization.Deserializer"))),
-        KafkaConsumerInfoInstrumentation.class.getName() + "$ConstructorAdviceNot27");
+        // Note: On some Kafka versions, both constructors will be instrumented. This is OK as we will
+        // override the context,
+        // and the instrumentation will still work as expected.
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(0, Map.class))
+                        .and(takesArgument(1, named("org.apache.kafka.common.serialization.Deserializer")))
+                        .and(takesArgument(2, named("org.apache.kafka.common.serialization.Deserializer"))),
+                KafkaConsumerInfoInstrumentation.class.getName() + "$ConstructorAdvice27");
 
-    // Note: On some Kafka versions, both constructors will be instrumented. This is OK as we will
-    // override the context,
-    // and the instrumentation will still work as expected.
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(0, Map.class))
-            .and(takesArgument(1, named("org.apache.kafka.common.serialization.Deserializer")))
-            .and(takesArgument(2, named("org.apache.kafka.common.serialization.Deserializer"))),
-        KafkaConsumerInfoInstrumentation.class.getName() + "$ConstructorAdvice27");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("poll"))
+                        .and(takesArguments(1))
+                        .and(returns(named("org.apache.kafka.clients.consumer.ConsumerRecords"))),
+                KafkaConsumerInfoInstrumentation.class.getName() + "$RecordsAdvice");
+    }
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("poll"))
-            .and(takesArguments(1))
-            .and(returns(named("org.apache.kafka.clients.consumer.ConsumerRecords"))),
-        KafkaConsumerInfoInstrumentation.class.getName() + "$RecordsAdvice");
-  }
+    public static class ConstructorAdviceNot27 {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void captureGroup(
+                @Advice.This KafkaConsumer consumer,
+                @Advice.FieldValue("metadata") Metadata metadata,
+                @Advice.FieldValue("coordinator") ConsumerCoordinator coordinator,
+                @Advice.Argument(0) ConsumerConfig consumerConfig) {
+            String consumerGroup = consumerConfig.getString(ConsumerConfig.GROUP_ID_CONFIG);
+            String normalizedConsumerGroup = consumerGroup != null && !consumerGroup.isEmpty() ? consumerGroup : null;
 
-  public static class ConstructorAdviceNot27 {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void captureGroup(
-        @Advice.This KafkaConsumer consumer,
-        @Advice.FieldValue("metadata") Metadata metadata,
-        @Advice.FieldValue("coordinator") ConsumerCoordinator coordinator,
-        @Advice.Argument(0) ConsumerConfig consumerConfig) {
-      String consumerGroup = consumerConfig.getString(ConsumerConfig.GROUP_ID_CONFIG);
-      String normalizedConsumerGroup =
-          consumerGroup != null && !consumerGroup.isEmpty() ? consumerGroup : null;
+            List<String> bootstrapServersList = consumerConfig.getList(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG);
+            String bootstrapServers = null;
+            if (bootstrapServersList != null && !bootstrapServersList.isEmpty()) {
+                bootstrapServers = String.join(",", bootstrapServersList);
+            }
 
-      List<String> bootstrapServersList =
-          consumerConfig.getList(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG);
-      String bootstrapServers = null;
-      if (bootstrapServersList != null && !bootstrapServersList.isEmpty()) {
-        bootstrapServers = String.join(",", bootstrapServersList);
-      }
+            KafkaConsumerInfo kafkaConsumerInfo;
+            if (Config.get().isDataStreamsEnabled()) {
+                kafkaConsumerInfo = new KafkaConsumerInfo(normalizedConsumerGroup, metadata, bootstrapServers);
+            } else {
+                kafkaConsumerInfo = new KafkaConsumerInfo(normalizedConsumerGroup, bootstrapServers);
+            }
 
-      KafkaConsumerInfo kafkaConsumerInfo;
-      if (Config.get().isDataStreamsEnabled()) {
-        kafkaConsumerInfo =
-            new KafkaConsumerInfo(normalizedConsumerGroup, metadata, bootstrapServers);
-      } else {
-        kafkaConsumerInfo = new KafkaConsumerInfo(normalizedConsumerGroup, bootstrapServers);
-      }
+            if (kafkaConsumerInfo.getConsumerGroup() != null || kafkaConsumerInfo.getClientMetadata() != null) {
+                InstrumentationContext.get(KafkaConsumer.class, KafkaConsumerInfo.class)
+                        .put(consumer, kafkaConsumerInfo);
+                if (coordinator != null) {
+                    InstrumentationContext.get(ConsumerCoordinator.class, KafkaConsumerInfo.class)
+                            .put(coordinator, kafkaConsumerInfo);
+                }
+            }
 
-      if (kafkaConsumerInfo.getConsumerGroup() != null
-          || kafkaConsumerInfo.getClientMetadata() != null) {
-        InstrumentationContext.get(KafkaConsumer.class, KafkaConsumerInfo.class)
-            .put(consumer, kafkaConsumerInfo);
-        if (coordinator != null) {
-          InstrumentationContext.get(ConsumerCoordinator.class, KafkaConsumerInfo.class)
-              .put(coordinator, kafkaConsumerInfo);
+            if (Config.get().isDataStreamsEnabled()) {
+                MetadataState state = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                        .getOrCreate(metadata, MetadataState::new);
+                KafkaConfigHelper.storePendingConsumerConfig(
+                        state, normalizedConsumerGroup, KafkaConfigHelper.extractConsumerConfig(consumerConfig));
+            }
         }
-      }
 
-      if (Config.get().isDataStreamsEnabled()) {
-        MetadataState state =
-            InstrumentationContext.get(Metadata.class, MetadataState.class)
-                .getOrCreate(metadata, MetadataState::new);
-        KafkaConfigHelper.storePendingConsumerConfig(
-            state,
-            normalizedConsumerGroup,
-            KafkaConfigHelper.extractConsumerConfig(consumerConfig));
-      }
+        public static void muzzleCheck(ConsumerRecord record) {
+            // KafkaConsumerInstrumentation only applies for kafka versions with headers
+            // Make an explicit call so KafkaConsumerGroupInstrumentation does the same
+            record.headers();
+        }
     }
 
-    public static void muzzleCheck(ConsumerRecord record) {
-      // KafkaConsumerInstrumentation only applies for kafka versions with headers
-      // Make an explicit call so KafkaConsumerGroupInstrumentation does the same
-      record.headers();
-    }
-  }
+    public static class ConstructorAdvice27 {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void captureGroup(
+                @Advice.This KafkaConsumer consumer,
+                @Advice.FieldValue("metadata") Metadata metadata,
+                @Advice.FieldValue("coordinator") ConsumerCoordinator coordinator,
+                @Advice.Argument(0) Map<String, Object> consumerConfig) {
+            Object groupID = consumerConfig.get(ConsumerConfig.GROUP_ID_CONFIG);
+            String consumerGroup = groupID instanceof String ? (String) groupID : null;
+            String normalizedConsumerGroup = consumerGroup != null && !consumerGroup.isEmpty() ? consumerGroup : null;
 
-  public static class ConstructorAdvice27 {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void captureGroup(
-        @Advice.This KafkaConsumer consumer,
-        @Advice.FieldValue("metadata") Metadata metadata,
-        @Advice.FieldValue("coordinator") ConsumerCoordinator coordinator,
-        @Advice.Argument(0) Map<String, Object> consumerConfig) {
-      Object groupID = consumerConfig.get(ConsumerConfig.GROUP_ID_CONFIG);
-      String consumerGroup = groupID instanceof String ? (String) groupID : null;
-      String normalizedConsumerGroup =
-          consumerGroup != null && !consumerGroup.isEmpty() ? consumerGroup : null;
+            String bootstrapServers = null;
+            Object bootstrapServersObj = consumerConfig.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG);
+            if (bootstrapServersObj instanceof String) {
+                bootstrapServers = (String) bootstrapServersObj;
+            }
+            KafkaConsumerInfo kafkaConsumerInfo;
+            if (Config.get().isDataStreamsEnabled()) {
+                kafkaConsumerInfo = new KafkaConsumerInfo(normalizedConsumerGroup, metadata, bootstrapServers);
+            } else {
+                kafkaConsumerInfo = new KafkaConsumerInfo(normalizedConsumerGroup, bootstrapServers);
+            }
 
-      String bootstrapServers = null;
-      Object bootstrapServersObj = consumerConfig.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG);
-      if (bootstrapServersObj instanceof String) {
-        bootstrapServers = (String) bootstrapServersObj;
-      }
-      KafkaConsumerInfo kafkaConsumerInfo;
-      if (Config.get().isDataStreamsEnabled()) {
-        kafkaConsumerInfo =
-            new KafkaConsumerInfo(normalizedConsumerGroup, metadata, bootstrapServers);
-      } else {
-        kafkaConsumerInfo = new KafkaConsumerInfo(normalizedConsumerGroup, bootstrapServers);
-      }
+            if (kafkaConsumerInfo.getConsumerGroup() != null || kafkaConsumerInfo.getClientMetadata() != null) {
+                InstrumentationContext.get(KafkaConsumer.class, KafkaConsumerInfo.class)
+                        .put(consumer, kafkaConsumerInfo);
+                if (coordinator != null) {
+                    InstrumentationContext.get(ConsumerCoordinator.class, KafkaConsumerInfo.class)
+                            .put(coordinator, kafkaConsumerInfo);
+                }
+            }
 
-      if (kafkaConsumerInfo.getConsumerGroup() != null
-          || kafkaConsumerInfo.getClientMetadata() != null) {
-        InstrumentationContext.get(KafkaConsumer.class, KafkaConsumerInfo.class)
-            .put(consumer, kafkaConsumerInfo);
-        if (coordinator != null) {
-          InstrumentationContext.get(ConsumerCoordinator.class, KafkaConsumerInfo.class)
-              .put(coordinator, kafkaConsumerInfo);
+            if (Config.get().isDataStreamsEnabled()) {
+                MetadataState state = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                        .getOrCreate(metadata, MetadataState::new);
+                KafkaConfigHelper.storePendingConsumerConfig(
+                        state, normalizedConsumerGroup, KafkaConfigHelper.extractConsumerConfigFromMap(consumerConfig));
+            }
         }
-      }
 
-      if (Config.get().isDataStreamsEnabled()) {
-        MetadataState state =
-            InstrumentationContext.get(Metadata.class, MetadataState.class)
-                .getOrCreate(metadata, MetadataState::new);
-        KafkaConfigHelper.storePendingConsumerConfig(
-            state,
-            normalizedConsumerGroup,
-            KafkaConfigHelper.extractConsumerConfigFromMap(consumerConfig));
-      }
+        public static void muzzleCheck(ConsumerRecord record) {
+            // KafkaConsumerInstrumentation only applies for kafka versions with headers
+            // Make an explicit call so KafkaConsumerGroupInstrumentation does the same
+            record.headers();
+        }
     }
 
-    public static void muzzleCheck(ConsumerRecord record) {
-      // KafkaConsumerInstrumentation only applies for kafka versions with headers
-      // Make an explicit call so KafkaConsumerGroupInstrumentation does the same
-      record.headers();
-    }
-  }
+    /**
+     * this method transfers the consumer group from the KafkaConsumer class key to the
+     * ConsumerRecords key. This is necessary because in the poll method, we don't have access to the
+     * KafkaConsumer class.
+     */
+    public static class RecordsAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(@Advice.This KafkaConsumer consumer) {
+            // Set cluster ID in ClusterIdHolder for Schema Registry instrumentation
+            KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(
+                            KafkaConsumer.class, KafkaConsumerInfo.class)
+                    .get(consumer);
+            if (kafkaConsumerInfo != null && Config.get().isDataStreamsEnabled()) {
+                Metadata consumerMetadata = kafkaConsumerInfo.getClientMetadata();
+                if (consumerMetadata != null) {
+                    MetadataState metadataState = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                            .get(consumerMetadata);
+                    String clusterId = metadataState != null ? metadataState.clusterId : null;
+                    if (clusterId != null) {
+                        ClusterIdHolder.set(clusterId);
+                    }
+                }
+            }
 
-  /**
-   * this method transfers the consumer group from the KafkaConsumer class key to the
-   * ConsumerRecords key. This is necessary because in the poll method, we don't have access to the
-   * KafkaConsumer class.
-   */
-  public static class RecordsAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(@Advice.This KafkaConsumer consumer) {
-      // Set cluster ID in ClusterIdHolder for Schema Registry instrumentation
-      KafkaConsumerInfo kafkaConsumerInfo =
-          InstrumentationContext.get(KafkaConsumer.class, KafkaConsumerInfo.class).get(consumer);
-      if (kafkaConsumerInfo != null && Config.get().isDataStreamsEnabled()) {
-        Metadata consumerMetadata = kafkaConsumerInfo.getClientMetadata();
-        if (consumerMetadata != null) {
-          MetadataState metadataState =
-              InstrumentationContext.get(Metadata.class, MetadataState.class).get(consumerMetadata);
-          String clusterId = metadataState != null ? metadataState.clusterId : null;
-          if (clusterId != null) {
-            ClusterIdHolder.set(clusterId);
-          }
+            if (traceConfig().isDataStreamsEnabled()) {
+                final AgentSpan span = startSpan(JAVA_KAFKA.toString(), KAFKA_POLL);
+                return activateSpan(span);
+            }
+            return null;
         }
-      }
 
-      if (traceConfig().isDataStreamsEnabled()) {
-        final AgentSpan span = startSpan(JAVA_KAFKA.toString(), KAFKA_POLL);
-        return activateSpan(span);
-      }
-      return null;
-    }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void captureGroup(
+                @Advice.Enter final ContextScope scope,
+                @Advice.This KafkaConsumer consumer,
+                @Advice.Return ConsumerRecords records,
+                @Advice.Thrown Throwable throwable) {
+            int recordsCount = 0;
+            if (records != null) {
+                KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(
+                                KafkaConsumer.class, KafkaConsumerInfo.class)
+                        .get(consumer);
+                if (kafkaConsumerInfo != null) {
+                    InstrumentationContext.get(ConsumerRecords.class, KafkaConsumerInfo.class)
+                            .put(records, kafkaConsumerInfo);
+                }
+                recordsCount = records.count();
+            }
+            // Clear cluster ID from Schema Registry instrumentation
+            ClusterIdHolder.clear();
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void captureGroup(
-        @Advice.Enter final ContextScope scope,
-        @Advice.This KafkaConsumer consumer,
-        @Advice.Return ConsumerRecords records,
-        @Advice.Thrown Throwable throwable) {
-      int recordsCount = 0;
-      if (records != null) {
-        KafkaConsumerInfo kafkaConsumerInfo =
-            InstrumentationContext.get(KafkaConsumer.class, KafkaConsumerInfo.class).get(consumer);
-        if (kafkaConsumerInfo != null) {
-          InstrumentationContext.get(ConsumerRecords.class, KafkaConsumerInfo.class)
-              .put(records, kafkaConsumerInfo);
+            if (scope == null) {
+                return;
+            }
+            AgentSpan span = spanFromScope(scope);
+            span.setTag(KAFKA_RECORDS_COUNT, recordsCount);
+            if (!(throwable instanceof WakeupException)) {
+                span.addThrowable(throwable);
+            }
+            scope.close();
+            span.finish();
         }
-        recordsCount = records.count();
-      }
-      // Clear cluster ID from Schema Registry instrumentation
-      ClusterIdHolder.clear();
-
-      if (scope == null) {
-        return;
-      }
-      AgentSpan span = spanFromScope(scope);
-      span.setTag(KAFKA_RECORDS_COUNT, recordsCount);
-      if (!(throwable instanceof WakeupException)) {
-        span.addThrowable(throwable);
-      }
-      scope.close();
-      span.finish();
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java
index 756f59aad4b..48b8d695d7c 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java
@@ -28,147 +28,139 @@
 
 @AutoService(InstrumenterModule.class)
 public final class KafkaConsumerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public KafkaConsumerInstrumentation() {
-    super("kafka", "kafka-0.11");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "before-3.8";
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return not(hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy")); // < 3.8
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>(2);
-    contextStores.put(
-        "org.apache.kafka.clients.Metadata",
-        "datadog.trace.instrumentation.kafka_common.MetadataState");
-    contextStores.put(
-        "org.apache.kafka.clients.consumer.ConsumerRecords", KafkaConsumerInfo.class.getName());
-    return contextStores;
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.kafka.clients.consumer.ConsumerRecords";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".TextMapInjectAdapterInterface",
-      packageName + ".KafkaConsumerInfo",
-      packageName + ".KafkaConsumerInstrumentationHelper",
-      packageName + ".KafkaDecorator",
-      packageName + ".TextMapExtractAdapter",
-      packageName + ".TracingIterableDelegator",
-      packageName + ".TracingIterable",
-      packageName + ".TracingIterator",
-      packageName + ".TracingList",
-      packageName + ".TracingListIterator",
-      packageName + ".TextMapInjectAdapter",
-      "datadog.trace.instrumentation.kafka_common.Utils",
-      "datadog.trace.instrumentation.kafka_common.StreamingContext",
-      "datadog.trace.instrumentation.kafka_common.PendingConfig",
-      "datadog.trace.instrumentation.kafka_common.MetadataState",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("records"))
-            .and(takesArgument(0, String.class))
-            .and(returns(Iterable.class)),
-        KafkaConsumerInstrumentation.class.getName() + "$IterableAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("records"))
-            .and(takesArgument(0, named("org.apache.kafka.common.TopicPartition")))
-            .and(returns(List.class)),
-        KafkaConsumerInstrumentation.class.getName() + "$ListAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("iterator"))
-            .and(takesArguments(0))
-            .and(returns(Iterator.class)),
-        KafkaConsumerInstrumentation.class.getName() + "$IteratorAdvice");
-  }
-
-  public static class IterableAdvice {
-
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void wrap(
-        @Advice.Return(readOnly = false) Iterable<ConsumerRecord<?, ?>> iterable,
-        @Advice.This ConsumerRecords records) {
-      if (iterable != null) {
-        KafkaConsumerInfo kafkaConsumerInfo =
-            InstrumentationContext.get(ConsumerRecords.class, KafkaConsumerInfo.class).get(records);
-        String group = KafkaConsumerInstrumentationHelper.extractGroup(kafkaConsumerInfo);
-        String clusterId =
-            KafkaConsumerInstrumentationHelper.extractClusterId(
-                kafkaConsumerInfo, InstrumentationContext.get(Metadata.class, MetadataState.class));
-        String bootstrapServers =
-            KafkaConsumerInstrumentationHelper.extractBootstrapServers(kafkaConsumerInfo);
-        iterable =
-            new TracingIterable(
-                iterable, KAFKA_CONSUME, CONSUMER_DECORATE, group, clusterId, bootstrapServers);
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public KafkaConsumerInstrumentation() {
+        super("kafka", "kafka-0.11");
     }
-  }
-
-  public static class ListAdvice {
-
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void wrap(
-        @Advice.Return(readOnly = false) List<ConsumerRecord<?, ?>> iterable,
-        @Advice.This ConsumerRecords records) {
-      if (iterable != null) {
-        KafkaConsumerInfo kafkaConsumerInfo =
-            InstrumentationContext.get(ConsumerRecords.class, KafkaConsumerInfo.class).get(records);
-        String group = KafkaConsumerInstrumentationHelper.extractGroup(kafkaConsumerInfo);
-        String clusterId =
-            KafkaConsumerInstrumentationHelper.extractClusterId(
-                kafkaConsumerInfo, InstrumentationContext.get(Metadata.class, MetadataState.class));
-        String bootstrapServers =
-            KafkaConsumerInstrumentationHelper.extractBootstrapServers(kafkaConsumerInfo);
-        iterable =
-            new TracingList(
-                iterable, KAFKA_CONSUME, CONSUMER_DECORATE, group, clusterId, bootstrapServers);
-      }
+
+    @Override
+    public String muzzleDirective() {
+        return "before-3.8";
     }
-  }
-
-  public static class IteratorAdvice {
-
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void wrap(
-        @Advice.Return(readOnly = false) Iterator<ConsumerRecord<?, ?>> iterator,
-        @Advice.This ConsumerRecords records) {
-      if (iterator != null) {
-        KafkaConsumerInfo kafkaConsumerInfo =
-            InstrumentationContext.get(ConsumerRecords.class, KafkaConsumerInfo.class).get(records);
-        String group = KafkaConsumerInstrumentationHelper.extractGroup(kafkaConsumerInfo);
-        String clusterId =
-            KafkaConsumerInstrumentationHelper.extractClusterId(
-                kafkaConsumerInfo, InstrumentationContext.get(Metadata.class, MetadataState.class));
-        String bootstrapServers =
-            KafkaConsumerInstrumentationHelper.extractBootstrapServers(kafkaConsumerInfo);
-        iterator =
-            new TracingIterator(
-                iterator, KAFKA_CONSUME, CONSUMER_DECORATE, group, clusterId, bootstrapServers);
-      }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return not(hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy")); // < 3.8
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>(2);
+        contextStores.put(
+                "org.apache.kafka.clients.Metadata", "datadog.trace.instrumentation.kafka_common.MetadataState");
+        contextStores.put("org.apache.kafka.clients.consumer.ConsumerRecords", KafkaConsumerInfo.class.getName());
+        return contextStores;
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.apache.kafka.clients.consumer.ConsumerRecords";
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".TextMapInjectAdapterInterface",
+            packageName + ".KafkaConsumerInfo",
+            packageName + ".KafkaConsumerInstrumentationHelper",
+            packageName + ".KafkaDecorator",
+            packageName + ".TextMapExtractAdapter",
+            packageName + ".TracingIterableDelegator",
+            packageName + ".TracingIterable",
+            packageName + ".TracingIterator",
+            packageName + ".TracingList",
+            packageName + ".TracingListIterator",
+            packageName + ".TextMapInjectAdapter",
+            "datadog.trace.instrumentation.kafka_common.Utils",
+            "datadog.trace.instrumentation.kafka_common.StreamingContext",
+            "datadog.trace.instrumentation.kafka_common.PendingConfig",
+            "datadog.trace.instrumentation.kafka_common.MetadataState",
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("records"))
+                        .and(takesArgument(0, String.class))
+                        .and(returns(Iterable.class)),
+                KafkaConsumerInstrumentation.class.getName() + "$IterableAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("records"))
+                        .and(takesArgument(0, named("org.apache.kafka.common.TopicPartition")))
+                        .and(returns(List.class)),
+                KafkaConsumerInstrumentation.class.getName() + "$ListAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("iterator"))
+                        .and(takesArguments(0))
+                        .and(returns(Iterator.class)),
+                KafkaConsumerInstrumentation.class.getName() + "$IteratorAdvice");
+    }
+
+    public static class IterableAdvice {
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void wrap(
+                @Advice.Return(readOnly = false) Iterable<ConsumerRecord<?, ?>> iterable,
+                @Advice.This ConsumerRecords records) {
+            if (iterable != null) {
+                KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(
+                                ConsumerRecords.class, KafkaConsumerInfo.class)
+                        .get(records);
+                String group = KafkaConsumerInstrumentationHelper.extractGroup(kafkaConsumerInfo);
+                String clusterId = KafkaConsumerInstrumentationHelper.extractClusterId(
+                        kafkaConsumerInfo, InstrumentationContext.get(Metadata.class, MetadataState.class));
+                String bootstrapServers = KafkaConsumerInstrumentationHelper.extractBootstrapServers(kafkaConsumerInfo);
+                iterable = new TracingIterable(
+                        iterable, KAFKA_CONSUME, CONSUMER_DECORATE, group, clusterId, bootstrapServers);
+            }
+        }
+    }
+
+    public static class ListAdvice {
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void wrap(
+                @Advice.Return(readOnly = false) List<ConsumerRecord<?, ?>> iterable,
+                @Advice.This ConsumerRecords records) {
+            if (iterable != null) {
+                KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(
+                                ConsumerRecords.class, KafkaConsumerInfo.class)
+                        .get(records);
+                String group = KafkaConsumerInstrumentationHelper.extractGroup(kafkaConsumerInfo);
+                String clusterId = KafkaConsumerInstrumentationHelper.extractClusterId(
+                        kafkaConsumerInfo, InstrumentationContext.get(Metadata.class, MetadataState.class));
+                String bootstrapServers = KafkaConsumerInstrumentationHelper.extractBootstrapServers(kafkaConsumerInfo);
+                iterable =
+                        new TracingList(iterable, KAFKA_CONSUME, CONSUMER_DECORATE, group, clusterId, bootstrapServers);
+            }
+        }
+    }
+
+    public static class IteratorAdvice {
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void wrap(
+                @Advice.Return(readOnly = false) Iterator<ConsumerRecord<?, ?>> iterator,
+                @Advice.This ConsumerRecords records) {
+            if (iterator != null) {
+                KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(
+                                ConsumerRecords.class, KafkaConsumerInfo.class)
+                        .get(records);
+                String group = KafkaConsumerInstrumentationHelper.extractGroup(kafkaConsumerInfo);
+                String clusterId = KafkaConsumerInstrumentationHelper.extractClusterId(
+                        kafkaConsumerInfo, InstrumentationContext.get(Metadata.class, MetadataState.class));
+                String bootstrapServers = KafkaConsumerInstrumentationHelper.extractBootstrapServers(kafkaConsumerInfo);
+                iterator = new TracingIterator(
+                        iterator, KAFKA_CONSUME, CONSUMER_DECORATE, group, clusterId, bootstrapServers);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentationHelper.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentationHelper.java
index 685a4d4f03f..506157266de 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentationHelper.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentationHelper.java
@@ -5,27 +5,26 @@
 import org.apache.kafka.clients.Metadata;
 
 public class KafkaConsumerInstrumentationHelper {
-  public static String extractGroup(KafkaConsumerInfo kafkaConsumerInfo) {
-    if (kafkaConsumerInfo != null) {
-      return kafkaConsumerInfo.getConsumerGroup();
+    public static String extractGroup(KafkaConsumerInfo kafkaConsumerInfo) {
+        if (kafkaConsumerInfo != null) {
+            return kafkaConsumerInfo.getConsumerGroup();
+        }
+        return null;
     }
-    return null;
-  }
 
-  public static String extractClusterId(
-      KafkaConsumerInfo kafkaConsumerInfo,
-      ContextStore<Metadata, MetadataState> metadataContextStore) {
-    if (kafkaConsumerInfo != null) {
-      Metadata consumerMetadata = kafkaConsumerInfo.getClientMetadata();
-      if (consumerMetadata != null) {
-        MetadataState state = metadataContextStore.get(consumerMetadata);
-        return state != null ? state.clusterId : null;
-      }
+    public static String extractClusterId(
+            KafkaConsumerInfo kafkaConsumerInfo, ContextStore<Metadata, MetadataState> metadataContextStore) {
+        if (kafkaConsumerInfo != null) {
+            Metadata consumerMetadata = kafkaConsumerInfo.getClientMetadata();
+            if (consumerMetadata != null) {
+                MetadataState state = metadataContextStore.get(consumerMetadata);
+                return state != null ? state.clusterId : null;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  public static String extractBootstrapServers(KafkaConsumerInfo kafkaConsumerInfo) {
-    return kafkaConsumerInfo == null ? null : kafkaConsumerInfo.getBootstrapServers();
-  }
+    public static String extractBootstrapServers(KafkaConsumerInfo kafkaConsumerInfo) {
+        return kafkaConsumerInfo == null ? null : kafkaConsumerInfo.getBootstrapServers();
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDecorator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDecorator.java
index 53c579a4dee..0bb454a2cbb 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDecorator.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDecorator.java
@@ -28,154 +28,140 @@
 import org.apache.kafka.common.record.TimestampType;
 
 public class KafkaDecorator extends MessagingClientDecorator {
-  private static final String KAFKA = "kafka";
-  public static final CharSequence JAVA_KAFKA = UTF8BytesString.create("java-kafka");
-  public static final CharSequence KAFKA_CONSUME =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().messaging().inboundOperation(KAFKA));
-
-  public static final CharSequence KAFKA_POLL = UTF8BytesString.create("kafka.poll");
-  public static final CharSequence KAFKA_PRODUCE =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().messaging().outboundOperation(KAFKA));
-  public static final CharSequence KAFKA_DELIVER = UTF8BytesString.create("kafka.deliver");
-  public static final boolean KAFKA_LEGACY_TRACING = Config.get().isKafkaLegacyTracingEnabled();
-  public static final boolean TIME_IN_QUEUE_ENABLED =
-      Config.get().isTimeInQueueEnabled(!KAFKA_LEGACY_TRACING, KAFKA);
-  public static final String KAFKA_PRODUCED_KEY = "x_datadog_kafka_produced";
-  private final String spanKind;
-  private final CharSequence spanType;
-  private final Supplier<String> serviceNameSupplier;
-
-  private static final DDCache<CharSequence, CharSequence> PRODUCER_RESOURCE_NAME_CACHE =
-      DDCaches.newFixedSizeCache(32);
-  private static final Functions.Prefix PRODUCER_PREFIX = new Functions.Prefix("Produce Topic ");
-  private static final DDCache<CharSequence, CharSequence> CONSUMER_RESOURCE_NAME_CACHE =
-      DDCaches.newFixedSizeCache(32);
-  private static final DDCache<ProducerConfig, CharSequence> PRODUCER_BOOSTRAP_SERVERS_CACHE =
-      DDCaches.newFixedSizeWeakKeyCache(16);
-  private static final Function<ProducerConfig, CharSequence> BOOTSTRAP_SERVERS_JOINER =
-      pc -> String.join(",", pc.getList(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG));
-  private static final Functions.Prefix CONSUMER_PREFIX = new Functions.Prefix("Consume Topic ");
-
-  public static final KafkaDecorator PRODUCER_DECORATE =
-      new KafkaDecorator(
-          Tags.SPAN_KIND_PRODUCER,
-          InternalSpanTypes.MESSAGE_PRODUCER,
-          SpanNaming.instance()
-              .namingSchema()
-              .messaging()
-              .outboundService(KAFKA, KAFKA_LEGACY_TRACING));
-
-  public static final KafkaDecorator CONSUMER_DECORATE =
-      new KafkaDecorator(
-          Tags.SPAN_KIND_CONSUMER,
-          InternalSpanTypes.MESSAGE_CONSUMER,
-          SpanNaming.instance()
-              .namingSchema()
-              .messaging()
-              .inboundService(KAFKA, KAFKA_LEGACY_TRACING));
-
-  public static final KafkaDecorator BROKER_DECORATE =
-      new KafkaDecorator(
-          Tags.SPAN_KIND_BROKER,
-          InternalSpanTypes.MESSAGE_BROKER,
-          SpanNaming.instance().namingSchema().messaging().timeInQueueService(KAFKA));
-
-  protected KafkaDecorator(
-      String spanKind, CharSequence spanType, Supplier<String> serviceNameSupplier) {
-    this.spanKind = spanKind;
-    this.spanType = spanType;
-    this.serviceNameSupplier = serviceNameSupplier;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return spanType;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"kafka"};
-  }
-
-  @Override
-  protected String service() {
-    return serviceNameSupplier.get();
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JAVA_KAFKA;
-  }
-
-  @Override
-  protected String spanKind() {
-    return spanKind;
-  }
-
-  public void onConsume(
-      final AgentSpan span,
-      final ConsumerRecord record,
-      String consumerGroup,
-      String clusterId,
-      String bootstrapServers) {
-    if (record != null) {
-      final String topic = record.topic() == null ? "kafka" : record.topic();
-      span.setResourceName(CONSUMER_RESOURCE_NAME_CACHE.computeIfAbsent(topic, CONSUMER_PREFIX));
-      span.setTag(PARTITION, record.partition());
-      span.setTag(OFFSET, record.offset());
-      span.setTag(MESSAGING_DESTINATION_NAME, topic);
-      if (consumerGroup != null) {
-        span.setTag(CONSUMER_GROUP, consumerGroup);
-      }
-      if (clusterId != null) {
-        span.setTag(KAFKA_CLUSTER_ID, clusterId);
-      }
-      if (bootstrapServers != null) {
-        span.setTag(KAFKA_BOOTSTRAP_SERVERS, bootstrapServers);
-      }
-      // TODO - do we really need both? This mechanism already adds a lot of... baggage.
-      // check to not record a duration if the message was sent from an old Kafka client
-      if (record.timestampType() != TimestampType.NO_TIMESTAMP_TYPE) {
-        long consumeTime = NANOSECONDS.toMillis(span.getStartTime());
-        final long produceTime = record.timestamp();
-        span.setTag(RECORD_QUEUE_TIME_MS, Math.max(0L, consumeTime - produceTime));
-      }
+    private static final String KAFKA = "kafka";
+    public static final CharSequence JAVA_KAFKA = UTF8BytesString.create("java-kafka");
+    public static final CharSequence KAFKA_CONSUME = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().messaging().inboundOperation(KAFKA));
+
+    public static final CharSequence KAFKA_POLL = UTF8BytesString.create("kafka.poll");
+    public static final CharSequence KAFKA_PRODUCE = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().messaging().outboundOperation(KAFKA));
+    public static final CharSequence KAFKA_DELIVER = UTF8BytesString.create("kafka.deliver");
+    public static final boolean KAFKA_LEGACY_TRACING = Config.get().isKafkaLegacyTracingEnabled();
+    public static final boolean TIME_IN_QUEUE_ENABLED = Config.get().isTimeInQueueEnabled(!KAFKA_LEGACY_TRACING, KAFKA);
+    public static final String KAFKA_PRODUCED_KEY = "x_datadog_kafka_produced";
+    private final String spanKind;
+    private final CharSequence spanType;
+    private final Supplier<String> serviceNameSupplier;
+
+    private static final DDCache<CharSequence, CharSequence> PRODUCER_RESOURCE_NAME_CACHE =
+            DDCaches.newFixedSizeCache(32);
+    private static final Functions.Prefix PRODUCER_PREFIX = new Functions.Prefix("Produce Topic ");
+    private static final DDCache<CharSequence, CharSequence> CONSUMER_RESOURCE_NAME_CACHE =
+            DDCaches.newFixedSizeCache(32);
+    private static final DDCache<ProducerConfig, CharSequence> PRODUCER_BOOSTRAP_SERVERS_CACHE =
+            DDCaches.newFixedSizeWeakKeyCache(16);
+    private static final Function<ProducerConfig, CharSequence> BOOTSTRAP_SERVERS_JOINER =
+            pc -> String.join(",", pc.getList(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG));
+    private static final Functions.Prefix CONSUMER_PREFIX = new Functions.Prefix("Consume Topic ");
+
+    public static final KafkaDecorator PRODUCER_DECORATE = new KafkaDecorator(
+            Tags.SPAN_KIND_PRODUCER,
+            InternalSpanTypes.MESSAGE_PRODUCER,
+            SpanNaming.instance().namingSchema().messaging().outboundService(KAFKA, KAFKA_LEGACY_TRACING));
+
+    public static final KafkaDecorator CONSUMER_DECORATE = new KafkaDecorator(
+            Tags.SPAN_KIND_CONSUMER,
+            InternalSpanTypes.MESSAGE_CONSUMER,
+            SpanNaming.instance().namingSchema().messaging().inboundService(KAFKA, KAFKA_LEGACY_TRACING));
+
+    public static final KafkaDecorator BROKER_DECORATE = new KafkaDecorator(
+            Tags.SPAN_KIND_BROKER,
+            InternalSpanTypes.MESSAGE_BROKER,
+            SpanNaming.instance().namingSchema().messaging().timeInQueueService(KAFKA));
+
+    protected KafkaDecorator(String spanKind, CharSequence spanType, Supplier<String> serviceNameSupplier) {
+        this.spanKind = spanKind;
+        this.spanType = spanType;
+        this.serviceNameSupplier = serviceNameSupplier;
     }
-  }
-
-  public void onTimeInQueue(final AgentSpan span, final ConsumerRecord record) {
-    if (record != null) {
-      String topic = record.topic() == null ? "kafka" : record.topic();
-      span.setResourceName(topic);
-      if (Config.get().isMessageBrokerSplitByDestination()) {
-        span.setServiceName(topic, MESSAGE_BROKER_SPLIT_BY_DESTINATION);
-      }
+
+    @Override
+    protected CharSequence spanType() {
+        return spanType;
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"kafka"};
+    }
+
+    @Override
+    protected String service() {
+        return serviceNameSupplier.get();
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JAVA_KAFKA;
     }
-  }
-
-  public void onProduce(
-      final AgentSpan span,
-      final ProducerRecord record,
-      final ProducerConfig producerConfig,
-      final String clusterId) {
-    if (record != null) {
-      if (record.partition() != null) {
-        span.setTag(PARTITION, record.partition());
-      }
-      if (producerConfig != null) {
-        span.setTag(
-            KAFKA_BOOTSTRAP_SERVERS,
-            PRODUCER_BOOSTRAP_SERVERS_CACHE.computeIfAbsent(
-                producerConfig, BOOTSTRAP_SERVERS_JOINER));
-      }
-      if (clusterId != null) {
-        span.setTag(KAFKA_CLUSTER_ID, clusterId);
-      }
-      final String topic = record.topic() == null ? "kafka" : record.topic();
-      span.setResourceName(PRODUCER_RESOURCE_NAME_CACHE.computeIfAbsent(topic, PRODUCER_PREFIX));
-      span.setTag(MESSAGING_DESTINATION_NAME, topic);
+
+    @Override
+    protected String spanKind() {
+        return spanKind;
+    }
+
+    public void onConsume(
+            final AgentSpan span,
+            final ConsumerRecord record,
+            String consumerGroup,
+            String clusterId,
+            String bootstrapServers) {
+        if (record != null) {
+            final String topic = record.topic() == null ? "kafka" : record.topic();
+            span.setResourceName(CONSUMER_RESOURCE_NAME_CACHE.computeIfAbsent(topic, CONSUMER_PREFIX));
+            span.setTag(PARTITION, record.partition());
+            span.setTag(OFFSET, record.offset());
+            span.setTag(MESSAGING_DESTINATION_NAME, topic);
+            if (consumerGroup != null) {
+                span.setTag(CONSUMER_GROUP, consumerGroup);
+            }
+            if (clusterId != null) {
+                span.setTag(KAFKA_CLUSTER_ID, clusterId);
+            }
+            if (bootstrapServers != null) {
+                span.setTag(KAFKA_BOOTSTRAP_SERVERS, bootstrapServers);
+            }
+            // TODO - do we really need both? This mechanism already adds a lot of... baggage.
+            // check to not record a duration if the message was sent from an old Kafka client
+            if (record.timestampType() != TimestampType.NO_TIMESTAMP_TYPE) {
+                long consumeTime = NANOSECONDS.toMillis(span.getStartTime());
+                final long produceTime = record.timestamp();
+                span.setTag(RECORD_QUEUE_TIME_MS, Math.max(0L, consumeTime - produceTime));
+            }
+        }
+    }
+
+    public void onTimeInQueue(final AgentSpan span, final ConsumerRecord record) {
+        if (record != null) {
+            String topic = record.topic() == null ? "kafka" : record.topic();
+            span.setResourceName(topic);
+            if (Config.get().isMessageBrokerSplitByDestination()) {
+                span.setServiceName(topic, MESSAGE_BROKER_SPLIT_BY_DESTINATION);
+            }
+        }
+    }
+
+    public void onProduce(
+            final AgentSpan span,
+            final ProducerRecord record,
+            final ProducerConfig producerConfig,
+            final String clusterId) {
+        if (record != null) {
+            if (record.partition() != null) {
+                span.setTag(PARTITION, record.partition());
+            }
+            if (producerConfig != null) {
+                span.setTag(
+                        KAFKA_BOOTSTRAP_SERVERS,
+                        PRODUCER_BOOSTRAP_SERVERS_CACHE.computeIfAbsent(producerConfig, BOOTSTRAP_SERVERS_JOINER));
+            }
+            if (clusterId != null) {
+                span.setTag(KAFKA_CLUSTER_ID, clusterId);
+            }
+            final String topic = record.topic() == null ? "kafka" : record.topic();
+            span.setResourceName(PRODUCER_RESOURCE_NAME_CACHE.computeIfAbsent(topic, PRODUCER_PREFIX));
+            span.setTag(MESSAGING_DESTINATION_NAME, topic);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDeserializerInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDeserializerInstrumentation.java
index 06079061e86..4d54a37f2fe 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDeserializerInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDeserializerInstrumentation.java
@@ -24,151 +24,149 @@
 
 @AutoService(InstrumenterModule.class)
 public class KafkaDeserializerInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  private static final String DESERIALIZER_CLASS =
-      "org.apache.kafka.common.serialization.Deserializer";
-
-  /** Ensure same compatibility as the tracer */
-  static final Reference[] MUZZLE_CHECK = {
-    new Reference.Builder("org.apache.kafka.clients.consumer.ConsumerRecord")
-        .withMethod(
-            new String[0],
-            Reference.EXPECTS_PUBLIC | Reference.EXPECTS_NON_STATIC,
-            "headers",
-            "Lorg/apache/kafka/common/header/Headers;")
-        .build()
-  };
-
-  public KafkaDeserializerInstrumentation() {
-    super("kafka");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "since-0.11";
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return DESERIALIZER_CLASS;
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return hasInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(DESERIALIZER_CLASS, Boolean.class.getName());
-  }
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MUZZLE_CHECK;
-  }
-
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    final String baseName = KafkaDeserializerInstrumentation.class.getName();
-    transformer.applyAdvice(
-        named("configure").and(takesArguments(Map.class, boolean.class)),
-        baseName + "$ConfigureAdvice");
-    transformer.applyAdvice(
-        named("deserialize").and(takesArguments(2)).and(takesArgument(1, byte[].class)),
-        baseName + "$Deserialize2Advice");
-    transformer.applyAdvice(
-        named("deserialize").and(takesArguments(3)).and(takesArgument(2, byte[].class)),
-        baseName + "$Deserialize3Advice");
-    transformer.applyAdvice(
-        named("deserialize").and(takesArguments(3)).and(takesArgument(2, ByteBuffer.class)),
-        baseName + "$DeserializeByteBufferAdvice");
-  }
-
-  @SuppressWarnings("rawtypes")
-  public static class ConfigureAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void configure(
-        @Advice.This final Deserializer<?> deserializer, @Advice.Argument(1) final boolean isKey) {
-      final ContextStore<Deserializer, Boolean> store =
-          InstrumentationContext.get(Deserializer.class, Boolean.class);
-      KafkaIastHelper.configure(store, deserializer, isKey);
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    private static final String DESERIALIZER_CLASS = "org.apache.kafka.common.serialization.Deserializer";
+
+    /** Ensure same compatibility as the tracer */
+    static final Reference[] MUZZLE_CHECK = {
+        new Reference.Builder("org.apache.kafka.clients.consumer.ConsumerRecord")
+                .withMethod(
+                        new String[0],
+                        Reference.EXPECTS_PUBLIC | Reference.EXPECTS_NON_STATIC,
+                        "headers",
+                        "Lorg/apache/kafka/common/header/Headers;")
+                .build()
+    };
+
+    public KafkaDeserializerInstrumentation() {
+        super("kafka");
     }
-  }
-
-  @SuppressWarnings("rawtypes")
-  public static class Deserialize2Advice {
-
-    @Source(SourceTypes.KAFKA_MESSAGE)
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void deserialize(
-        @Advice.This final Deserializer<?> deserializer,
-        @Advice.Argument(1) byte[] data,
-        @Advice.Local("iastCtx") IastContext ctx) {
-      final ContextStore<Deserializer, Boolean> store =
-          InstrumentationContext.get(Deserializer.class, Boolean.class);
-      ctx = KafkaIastHelper.beforeDeserialize(store, deserializer, data);
+
+    @Override
+    public String muzzleDirective() {
+        return "since-0.11";
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return DESERIALIZER_CLASS;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterDeserialize(
-        @Advice.This final Deserializer<?> deserializer,
-        @Advice.Return Object result,
-        @Advice.Local("iastCtx") IastContext ctx) {
-      final ContextStore<Deserializer, Boolean> store =
-          InstrumentationContext.get(Deserializer.class, Boolean.class);
-      KafkaIastHelper.afterDeserialize(ctx, store, deserializer, result);
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return hasInterface(named(hierarchyMarkerType()));
     }
-  }
-
-  @SuppressWarnings({"rawtypes", "JavaExistingMethodCanBeUsed"})
-  public static class Deserialize3Advice {
-
-    @Source(SourceTypes.KAFKA_MESSAGE)
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void deserialize(
-        @Advice.This final Deserializer<?> deserializer,
-        @Advice.Argument(2) byte[] data,
-        @Advice.Local("iastCtx") IastContext ctx) {
-      final ContextStore<Deserializer, Boolean> store =
-          InstrumentationContext.get(Deserializer.class, Boolean.class);
-      ctx = KafkaIastHelper.beforeDeserialize(store, deserializer, data);
+
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(DESERIALIZER_CLASS, Boolean.class.getName());
+    }
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MUZZLE_CHECK;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterDeserialize(
-        @Advice.This final Deserializer<?> deserializer,
-        @Advice.Return Object result,
-        @Advice.Local("iastCtx") IastContext ctx) {
-      final ContextStore<Deserializer, Boolean> store =
-          InstrumentationContext.get(Deserializer.class, Boolean.class);
-      KafkaIastHelper.afterDeserialize(ctx, store, deserializer, result);
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        final String baseName = KafkaDeserializerInstrumentation.class.getName();
+        transformer.applyAdvice(
+                named("configure").and(takesArguments(Map.class, boolean.class)), baseName + "$ConfigureAdvice");
+        transformer.applyAdvice(
+                named("deserialize").and(takesArguments(2)).and(takesArgument(1, byte[].class)),
+                baseName + "$Deserialize2Advice");
+        transformer.applyAdvice(
+                named("deserialize").and(takesArguments(3)).and(takesArgument(2, byte[].class)),
+                baseName + "$Deserialize3Advice");
+        transformer.applyAdvice(
+                named("deserialize").and(takesArguments(3)).and(takesArgument(2, ByteBuffer.class)),
+                baseName + "$DeserializeByteBufferAdvice");
     }
-  }
-
-  @SuppressWarnings({"rawtypes", "JavaExistingMethodCanBeUsed"})
-  public static class DeserializeByteBufferAdvice {
-
-    @Source(SourceTypes.KAFKA_MESSAGE)
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void deserialize(
-        @Advice.This final Deserializer<?> deserializer,
-        @Advice.Argument(2) ByteBuffer data,
-        @Advice.Local("iastCtx") IastContext ctx) {
-      final ContextStore<Deserializer, Boolean> store =
-          InstrumentationContext.get(Deserializer.class, Boolean.class);
-      ctx = KafkaIastHelper.beforeDeserialize(store, deserializer, data);
+
+    @SuppressWarnings("rawtypes")
+    public static class ConfigureAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void configure(
+                @Advice.This final Deserializer<?> deserializer, @Advice.Argument(1) final boolean isKey) {
+            final ContextStore<Deserializer, Boolean> store =
+                    InstrumentationContext.get(Deserializer.class, Boolean.class);
+            KafkaIastHelper.configure(store, deserializer, isKey);
+        }
+    }
+
+    @SuppressWarnings("rawtypes")
+    public static class Deserialize2Advice {
+
+        @Source(SourceTypes.KAFKA_MESSAGE)
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void deserialize(
+                @Advice.This final Deserializer<?> deserializer,
+                @Advice.Argument(1) byte[] data,
+                @Advice.Local("iastCtx") IastContext ctx) {
+            final ContextStore<Deserializer, Boolean> store =
+                    InstrumentationContext.get(Deserializer.class, Boolean.class);
+            ctx = KafkaIastHelper.beforeDeserialize(store, deserializer, data);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterDeserialize(
+                @Advice.This final Deserializer<?> deserializer,
+                @Advice.Return Object result,
+                @Advice.Local("iastCtx") IastContext ctx) {
+            final ContextStore<Deserializer, Boolean> store =
+                    InstrumentationContext.get(Deserializer.class, Boolean.class);
+            KafkaIastHelper.afterDeserialize(ctx, store, deserializer, result);
+        }
+    }
+
+    @SuppressWarnings({"rawtypes", "JavaExistingMethodCanBeUsed"})
+    public static class Deserialize3Advice {
+
+        @Source(SourceTypes.KAFKA_MESSAGE)
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void deserialize(
+                @Advice.This final Deserializer<?> deserializer,
+                @Advice.Argument(2) byte[] data,
+                @Advice.Local("iastCtx") IastContext ctx) {
+            final ContextStore<Deserializer, Boolean> store =
+                    InstrumentationContext.get(Deserializer.class, Boolean.class);
+            ctx = KafkaIastHelper.beforeDeserialize(store, deserializer, data);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterDeserialize(
+                @Advice.This final Deserializer<?> deserializer,
+                @Advice.Return Object result,
+                @Advice.Local("iastCtx") IastContext ctx) {
+            final ContextStore<Deserializer, Boolean> store =
+                    InstrumentationContext.get(Deserializer.class, Boolean.class);
+            KafkaIastHelper.afterDeserialize(ctx, store, deserializer, result);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterDeserialize(
-        @Advice.This final Deserializer<?> deserializer,
-        @Advice.Return final Object result,
-        @Advice.Local("iastCtx") IastContext ctx) {
-      final ContextStore<Deserializer, Boolean> store =
-          InstrumentationContext.get(Deserializer.class, Boolean.class);
-      KafkaIastHelper.afterDeserialize(ctx, store, deserializer, result);
+    @SuppressWarnings({"rawtypes", "JavaExistingMethodCanBeUsed"})
+    public static class DeserializeByteBufferAdvice {
+
+        @Source(SourceTypes.KAFKA_MESSAGE)
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void deserialize(
+                @Advice.This final Deserializer<?> deserializer,
+                @Advice.Argument(2) ByteBuffer data,
+                @Advice.Local("iastCtx") IastContext ctx) {
+            final ContextStore<Deserializer, Boolean> store =
+                    InstrumentationContext.get(Deserializer.class, Boolean.class);
+            ctx = KafkaIastHelper.beforeDeserialize(store, deserializer, data);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterDeserialize(
+                @Advice.This final Deserializer<?> deserializer,
+                @Advice.Return final Object result,
+                @Advice.Local("iastCtx") IastContext ctx) {
+            final ContextStore<Deserializer, Boolean> store =
+                    InstrumentationContext.get(Deserializer.class, Boolean.class);
+            KafkaIastHelper.afterDeserialize(ctx, store, deserializer, result);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaIastHelper.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaIastHelper.java
index 4063904a4d6..525925d027f 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaIastHelper.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaIastHelper.java
@@ -14,98 +14,93 @@
 @SuppressWarnings("rawtypes")
 public class KafkaIastHelper {
 
-  public static void configure(
-      final ContextStore<Deserializer, Boolean> store,
-      final Deserializer<?> deserializer,
-      final boolean isKey) {
-    if (store != null) {
-      store.put(deserializer, isKey);
+    public static void configure(
+            final ContextStore<Deserializer, Boolean> store, final Deserializer<?> deserializer, final boolean isKey) {
+        if (store != null) {
+            store.put(deserializer, isKey);
+        }
     }
-  }
 
-  public static IastContext beforeDeserialize(
-      final ContextStore<Deserializer, Boolean> store,
-      final Deserializer<?> deserializer,
-      final Object data) {
-    CallDepthThreadLocalMap.incrementCallDepth(Deserializer.class);
-    if (data == null) {
-      return null;
+    public static IastContext beforeDeserialize(
+            final ContextStore<Deserializer, Boolean> store, final Deserializer<?> deserializer, final Object data) {
+        CallDepthThreadLocalMap.incrementCallDepth(Deserializer.class);
+        if (data == null) {
+            return null;
+        }
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module == null) {
+            return null;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return null;
+        }
+        if (module.isTainted(ctx, data)) {
+            return ctx; // prevent double tainting on reentrant calls
+        }
+        final byte source = getSource(store, deserializer);
+        if (data instanceof String) {
+            module.taintString(ctx, (String) data, source);
+        } else {
+            module.taintObject(ctx, data, source);
+        }
+        return ctx;
     }
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module == null) {
-      return null;
-    }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return null;
-    }
-    if (module.isTainted(ctx, data)) {
-      return ctx; // prevent double tainting on reentrant calls
-    }
-    final byte source = getSource(store, deserializer);
-    if (data instanceof String) {
-      module.taintString(ctx, (String) data, source);
-    } else {
-      module.taintObject(ctx, data, source);
-    }
-    return ctx;
-  }
 
-  public static IastContext beforeDeserialize(
-      final ContextStore<Deserializer, Boolean> store,
-      final Deserializer<?> deserializer,
-      final ByteBuffer data) {
-    CallDepthThreadLocalMap.incrementCallDepth(Deserializer.class);
-    if (data == null || data.remaining() == 0) {
-      return null;
-    }
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module == null) {
-      return null;
+    public static IastContext beforeDeserialize(
+            final ContextStore<Deserializer, Boolean> store,
+            final Deserializer<?> deserializer,
+            final ByteBuffer data) {
+        CallDepthThreadLocalMap.incrementCallDepth(Deserializer.class);
+        if (data == null || data.remaining() == 0) {
+            return null;
+        }
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module == null) {
+            return null;
+        }
+        final IastContext ctx = IastContext.Provider.get();
+        if (ctx == null) {
+            return null;
+        }
+        if (module.isTainted(ctx, data)) {
+            return ctx; // prevent double tainting on reentrant calls
+        }
+        final byte source = getSource(store, deserializer);
+        int start = data.position();
+        if (data.hasArray()) {
+            start += data.arrayOffset();
+        }
+        module.taintObjectRange(ctx, data, source, start, data.remaining());
+        return ctx;
     }
-    final IastContext ctx = IastContext.Provider.get();
-    if (ctx == null) {
-      return null;
-    }
-    if (module.isTainted(ctx, data)) {
-      return ctx; // prevent double tainting on reentrant calls
-    }
-    final byte source = getSource(store, deserializer);
-    int start = data.position();
-    if (data.hasArray()) {
-      start += data.arrayOffset();
-    }
-    module.taintObjectRange(ctx, data, source, start, data.remaining());
-    return ctx;
-  }
 
-  public static void afterDeserialize(
-      final IastContext ctx,
-      final ContextStore<Deserializer, Boolean> store,
-      final Deserializer<?> deserializer,
-      final Object result) {
-    // final exit of the method
-    if (CallDepthThreadLocalMap.decrementCallDepth(Deserializer.class) != 0) {
-      return;
-    }
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module == null) {
-      return;
-    }
-    final byte source = getSource(store, deserializer);
-    if (result instanceof String) {
-      module.taintString(ctx, (String) result, source);
-    } else {
-      module.taintObject(ctx, result, source);
+    public static void afterDeserialize(
+            final IastContext ctx,
+            final ContextStore<Deserializer, Boolean> store,
+            final Deserializer<?> deserializer,
+            final Object result) {
+        // final exit of the method
+        if (CallDepthThreadLocalMap.decrementCallDepth(Deserializer.class) != 0) {
+            return;
+        }
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module == null) {
+            return;
+        }
+        final byte source = getSource(store, deserializer);
+        if (result instanceof String) {
+            module.taintString(ctx, (String) result, source);
+        } else {
+            module.taintObject(ctx, result, source);
+        }
     }
-  }
 
-  private static byte getSource(
-      final ContextStore<Deserializer, Boolean> store, final Deserializer<?> deserializer) {
-    if (store == null) {
-      return KAFKA_MESSAGE_VALUE;
+    private static byte getSource(final ContextStore<Deserializer, Boolean> store, final Deserializer<?> deserializer) {
+        if (store == null) {
+            return KAFKA_MESSAGE_VALUE;
+        }
+        final Boolean key = store.get(deserializer);
+        return key != null && key ? KAFKA_MESSAGE_KEY : KAFKA_MESSAGE_VALUE;
     }
-    final Boolean key = store.get(deserializer);
-    return key != null && key ? KAFKA_MESSAGE_KEY : KAFKA_MESSAGE_VALUE;
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java
index c536e147e77..2cc1b65d833 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java
@@ -14,51 +14,45 @@
 import org.apache.kafka.clients.producer.RecordMetadata;
 
 public class KafkaProducerCallback implements Callback {
-  private final Callback callback;
-  private final AgentSpan parent;
-  private final AgentSpan span;
-  @Nullable private final String clusterId;
+    private final Callback callback;
+    private final AgentSpan parent;
+    private final AgentSpan span;
 
-  public KafkaProducerCallback(
-      final Callback callback,
-      final AgentSpan parent,
-      final AgentSpan span,
-      @Nullable final String clusterId) {
-    this.callback = callback;
-    this.parent = parent;
-    this.span = span;
-    this.clusterId = clusterId;
-  }
+    @Nullable
+    private final String clusterId;
 
-  @Override
-  public void onCompletion(final RecordMetadata metadata, final Exception exception) {
-    if (metadata != null) {
-      span.setTag(PARTITION, metadata.partition());
-      span.setTag(OFFSET, metadata.offset());
+    public KafkaProducerCallback(
+            final Callback callback, final AgentSpan parent, final AgentSpan span, @Nullable final String clusterId) {
+        this.callback = callback;
+        this.parent = parent;
+        this.span = span;
+        this.clusterId = clusterId;
     }
-    PRODUCER_DECORATE.onError(span, exception);
-    PRODUCER_DECORATE.beforeFinish(span);
-    span.finish();
-    if (callback != null) {
-      if (parent != null) {
-        try (final ContextScope scope = activateSpan(parent)) {
-          callback.onCompletion(metadata, exception);
+
+    @Override
+    public void onCompletion(final RecordMetadata metadata, final Exception exception) {
+        if (metadata != null) {
+            span.setTag(PARTITION, metadata.partition());
+            span.setTag(OFFSET, metadata.offset());
+        }
+        PRODUCER_DECORATE.onError(span, exception);
+        PRODUCER_DECORATE.beforeFinish(span);
+        span.finish();
+        if (callback != null) {
+            if (parent != null) {
+                try (final ContextScope scope = activateSpan(parent)) {
+                    callback.onCompletion(metadata, exception);
+                }
+            } else {
+                callback.onCompletion(metadata, exception);
+            }
+        }
+        if (metadata == null) {
+            return;
         }
-      } else {
-        callback.onCompletion(metadata, exception);
-      }
-    }
-    if (metadata == null) {
-      return;
-    }
 
-    DataStreamsTags tags =
-        DataStreamsTags.createWithPartition(
-            "kafka_produce",
-            metadata.topic(),
-            String.valueOf(metadata.partition()),
-            clusterId,
-            null);
-    AgentTracer.get().getDataStreamsMonitoring().trackBacklog(tags, metadata.offset());
-  }
+        DataStreamsTags tags = DataStreamsTags.createWithPartition(
+                "kafka_produce", metadata.topic(), String.valueOf(metadata.partition()), clusterId, null);
+        AgentTracer.get().getDataStreamsMonitoring().trackBacklog(tags, metadata.offset());
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java
index 98e415b4cd4..f028d9bed65 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java
@@ -59,248 +59,242 @@
 
 @AutoService(InstrumenterModule.class)
 public final class KafkaProducerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public KafkaProducerInstrumentation() {
-    super("kafka", "kafka-0.11");
-  }
+    public KafkaProducerInstrumentation() {
+        super("kafka", "kafka-0.11");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "before-3.8";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "before-3.8";
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return not(hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy")); // < 3.8
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return not(hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy")); // < 3.8
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.kafka.clients.producer.KafkaProducer";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.kafka.clients.producer.KafkaProducer";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".KafkaDecorator",
-      packageName + ".TextMapInjectAdapterInterface",
-      packageName + ".TextMapInjectAdapter",
-      packageName + ".TextMapExtractAdapter",
-      packageName + ".NoopTextMapInjectAdapter",
-      packageName + ".KafkaProducerCallback",
-      "datadog.trace.instrumentation.kafka_common.StreamingContext",
-      "datadog.trace.instrumentation.kafka_common.ClusterIdHolder",
-      "datadog.trace.instrumentation.kafka_common.Utils",
-      "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
-      "datadog.trace.instrumentation.kafka_common.PendingConfig",
-      "datadog.trace.instrumentation.kafka_common.MetadataState",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".KafkaDecorator",
+            packageName + ".TextMapInjectAdapterInterface",
+            packageName + ".TextMapInjectAdapter",
+            packageName + ".TextMapExtractAdapter",
+            packageName + ".NoopTextMapInjectAdapter",
+            packageName + ".KafkaProducerCallback",
+            "datadog.trace.instrumentation.kafka_common.StreamingContext",
+            "datadog.trace.instrumentation.kafka_common.ClusterIdHolder",
+            "datadog.trace.instrumentation.kafka_common.Utils",
+            "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
+            "datadog.trace.instrumentation.kafka_common.PendingConfig",
+            "datadog.trace.instrumentation.kafka_common.MetadataState",
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(
-        "org.apache.kafka.clients.Metadata",
-        "datadog.trace.instrumentation.kafka_common.MetadataState");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(
+                "org.apache.kafka.clients.Metadata", "datadog.trace.instrumentation.kafka_common.MetadataState");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(0, named("org.apache.kafka.clients.producer.ProducerConfig")))
-            .and(takesArgument(1, named("org.apache.kafka.common.serialization.Serializer")))
-            .and(takesArgument(2, named("org.apache.kafka.common.serialization.Serializer"))),
-        KafkaProducerInstrumentation.class.getName() + "$ProducerConstructorAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(0, named("org.apache.kafka.clients.producer.ProducerConfig")))
+                        .and(takesArgument(1, named("org.apache.kafka.common.serialization.Serializer")))
+                        .and(takesArgument(2, named("org.apache.kafka.common.serialization.Serializer"))),
+                KafkaProducerInstrumentation.class.getName() + "$ProducerConstructorAdvice");
 
-    transformer.applyAdvices(
-        isMethod()
-            .and(isPublic())
-            .and(named("send"))
-            .and(takesArgument(0, named("org.apache.kafka.clients.producer.ProducerRecord")))
-            .and(takesArgument(1, named("org.apache.kafka.clients.producer.Callback"))),
-        KafkaProducerInstrumentation.class.getName() + "$ProducerAdvice",
-        KafkaProducerInstrumentation.class.getName() + "$ContextPropagationAdvice");
+        transformer.applyAdvices(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("send"))
+                        .and(takesArgument(0, named("org.apache.kafka.clients.producer.ProducerRecord")))
+                        .and(takesArgument(1, named("org.apache.kafka.clients.producer.Callback"))),
+                KafkaProducerInstrumentation.class.getName() + "$ProducerAdvice",
+                KafkaProducerInstrumentation.class.getName() + "$ContextPropagationAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPrivate())
-            .and(takesArgument(0, int.class))
-            .and(named("ensureValidRecordSize")), // intercepting this call allows us to see the
-        // estimated message size
-        KafkaProducerInstrumentation.class.getName() + "$PayloadSizeAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPrivate())
+                        .and(takesArgument(0, int.class))
+                        .and(named("ensureValidRecordSize")), // intercepting this call allows us to see the
+                // estimated message size
+                KafkaProducerInstrumentation.class.getName() + "$PayloadSizeAdvice");
+    }
 
-  public static class ProducerAdvice {
+    public static class ProducerAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.FieldValue("producerConfig") ProducerConfig producerConfig,
-        @Advice.FieldValue("sender") Sender sender,
-        @Advice.FieldValue("metadata") Metadata metadata,
-        @Advice.Argument(value = 0, readOnly = false) ProducerRecord record,
-        @Advice.Argument(value = 1, readOnly = false) Callback callback) {
-      MetadataState metadataState =
-          InstrumentationContext.get(Metadata.class, MetadataState.class).get(metadata);
-      String clusterId = metadataState != null ? metadataState.clusterId : null;
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.FieldValue("producerConfig") ProducerConfig producerConfig,
+                @Advice.FieldValue("sender") Sender sender,
+                @Advice.FieldValue("metadata") Metadata metadata,
+                @Advice.Argument(value = 0, readOnly = false) ProducerRecord record,
+                @Advice.Argument(value = 1, readOnly = false) Callback callback) {
+            MetadataState metadataState = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                    .get(metadata);
+            String clusterId = metadataState != null ? metadataState.clusterId : null;
 
-      // Set cluster ID for Schema Registry instrumentation
-      if (clusterId != null) {
-        ClusterIdHolder.set(clusterId);
-      }
+            // Set cluster ID for Schema Registry instrumentation
+            if (clusterId != null) {
+                ClusterIdHolder.set(clusterId);
+            }
 
-      // Try to extract existing trace context from record headers
-      final AgentSpanContext extractedContext =
-          extractContextAndGetSpanContext(record.headers(), TextMapExtractAdapter.GETTER);
+            // Try to extract existing trace context from record headers
+            final AgentSpanContext extractedContext =
+                    extractContextAndGetSpanContext(record.headers(), TextMapExtractAdapter.GETTER);
 
-      final AgentSpan localActiveSpan = activeSpan();
+            final AgentSpan localActiveSpan = activeSpan();
 
-      final AgentSpan span;
-      final AgentSpan callbackParentSpan;
+            final AgentSpan span;
+            final AgentSpan callbackParentSpan;
 
-      if (extractedContext != null) {
-        span = startSpan(JAVA_KAFKA.toString(), KAFKA_PRODUCE, extractedContext);
-        callbackParentSpan = span;
-      } else {
-        span = startSpan(JAVA_KAFKA.toString(), KAFKA_PRODUCE);
-        callbackParentSpan = localActiveSpan;
-      }
-      PRODUCER_DECORATE.afterStart(span);
-      PRODUCER_DECORATE.onProduce(span, record, producerConfig, clusterId);
+            if (extractedContext != null) {
+                span = startSpan(JAVA_KAFKA.toString(), KAFKA_PRODUCE, extractedContext);
+                callbackParentSpan = span;
+            } else {
+                span = startSpan(JAVA_KAFKA.toString(), KAFKA_PRODUCE);
+                callbackParentSpan = localActiveSpan;
+            }
+            PRODUCER_DECORATE.afterStart(span);
+            PRODUCER_DECORATE.onProduce(span, record, producerConfig, clusterId);
 
-      callback = new KafkaProducerCallback(callback, callbackParentSpan, span, clusterId);
+            callback = new KafkaProducerCallback(callback, callbackParentSpan, span, clusterId);
 
-      if (record.value() == null) {
-        span.setTag(InstrumentationTags.TOMBSTONE, true);
-      }
+            if (record.value() == null) {
+                span.setTag(InstrumentationTags.TOMBSTONE, true);
+            }
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      // Clear cluster ID from Schema Registry instrumentation
-      ClusterIdHolder.clear();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            // Clear cluster ID from Schema Registry instrumentation
+            ClusterIdHolder.clear();
 
-      PRODUCER_DECORATE.onError(scope, throwable);
-      PRODUCER_DECORATE.beforeFinish(scope);
-      scope.close();
+            PRODUCER_DECORATE.onError(scope, throwable);
+            PRODUCER_DECORATE.beforeFinish(scope);
+            scope.close();
+        }
     }
-  }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextPropagationAdvice {
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextPropagationAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.FieldValue("apiVersions") final ApiVersions apiVersions,
-        @Advice.FieldValue("metadata") Metadata metadata,
-        @Advice.Argument(value = 0, readOnly = false) ProducerRecord record) {
-      AgentSpan span = activeSpan();
-      if (span == null) return;
-      MetadataState metadataState =
-          InstrumentationContext.get(Metadata.class, MetadataState.class).get(metadata);
-      String clusterId = metadataState != null ? metadataState.clusterId : null;
-      TextMapInjectAdapterInterface setter = NoopTextMapInjectAdapter.NOOP_SETTER;
-      // Do not inject headers for batch versions below 2
-      // This is how similar check is being done in Kafka client itself:
-      // https://github.com/apache/kafka/blob/05fcfde8f69b0349216553f711fdfc3f0259c601/clients/src/main/java/org/apache/kafka/common/record/MemoryRecordsBuilder.java#L411-L412
-      // Also, do not inject headers if specified by JVM option or environment variable
-      // This can help in mixed client environments where clients < 0.11 that do not support
-      // headers attempt to read messages that were produced by clients > 0.11 and the magic
-      // value of the broker(s) is >= 2
-      if (apiVersions.maxUsableProduceMagic() >= RecordBatch.MAGIC_VALUE_V2
-          && Config.get().isKafkaClientPropagationEnabled()
-          && !Config.get().isKafkaClientPropagationDisabledForTopic(record.topic())) {
-        setter = TextMapInjectAdapter.SETTER;
-      }
-      DataStreamsTags tags = createWithClusterId("kafka", OUTBOUND, record.topic(), clusterId);
-      try {
-        defaultPropagator().inject(span, record.headers(), setter);
-        if (STREAMING_CONTEXT.isDisabledForTopic(record.topic())
-            || STREAMING_CONTEXT.isSinkTopic(record.topic())) {
-          // inject the context in the headers, but delay sending the stats until we know the
-          // message size.
-          // The stats are saved in the pathway context and sent in PayloadSizeAdvice.
-          Propagator dsmPropagator = Propagators.forConcern(DSM_CONCERN);
-          DataStreamsContext dsmContext = fromTagsWithoutCheckpoint(tags);
-          dsmPropagator.inject(span.with(dsmContext), record.headers(), setter);
-        }
-      } catch (final IllegalStateException e) {
-        // headers must be read-only from reused record. try again with new one.
-        record =
-            new ProducerRecord<>(
-                record.topic(),
-                record.partition(),
-                record.timestamp(),
-                record.key(),
-                record.value(),
-                record.headers());
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.FieldValue("apiVersions") final ApiVersions apiVersions,
+                @Advice.FieldValue("metadata") Metadata metadata,
+                @Advice.Argument(value = 0, readOnly = false) ProducerRecord record) {
+            AgentSpan span = activeSpan();
+            if (span == null) return;
+            MetadataState metadataState = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                    .get(metadata);
+            String clusterId = metadataState != null ? metadataState.clusterId : null;
+            TextMapInjectAdapterInterface setter = NoopTextMapInjectAdapter.NOOP_SETTER;
+            // Do not inject headers for batch versions below 2
+            // This is how similar check is being done in Kafka client itself:
+            // https://github.com/apache/kafka/blob/05fcfde8f69b0349216553f711fdfc3f0259c601/clients/src/main/java/org/apache/kafka/common/record/MemoryRecordsBuilder.java#L411-L412
+            // Also, do not inject headers if specified by JVM option or environment variable
+            // This can help in mixed client environments where clients < 0.11 that do not support
+            // headers attempt to read messages that were produced by clients > 0.11 and the magic
+            // value of the broker(s) is >= 2
+            if (apiVersions.maxUsableProduceMagic() >= RecordBatch.MAGIC_VALUE_V2
+                    && Config.get().isKafkaClientPropagationEnabled()
+                    && !Config.get().isKafkaClientPropagationDisabledForTopic(record.topic())) {
+                setter = TextMapInjectAdapter.SETTER;
+            }
+            DataStreamsTags tags = createWithClusterId("kafka", OUTBOUND, record.topic(), clusterId);
+            try {
+                defaultPropagator().inject(span, record.headers(), setter);
+                if (STREAMING_CONTEXT.isDisabledForTopic(record.topic())
+                        || STREAMING_CONTEXT.isSinkTopic(record.topic())) {
+                    // inject the context in the headers, but delay sending the stats until we know the
+                    // message size.
+                    // The stats are saved in the pathway context and sent in PayloadSizeAdvice.
+                    Propagator dsmPropagator = Propagators.forConcern(DSM_CONCERN);
+                    DataStreamsContext dsmContext = fromTagsWithoutCheckpoint(tags);
+                    dsmPropagator.inject(span.with(dsmContext), record.headers(), setter);
+                }
+            } catch (final IllegalStateException e) {
+                // headers must be read-only from reused record. try again with new one.
+                record = new ProducerRecord<>(
+                        record.topic(),
+                        record.partition(),
+                        record.timestamp(),
+                        record.key(),
+                        record.value(),
+                        record.headers());
 
-        defaultPropagator().inject(span, record.headers(), setter);
-        if (STREAMING_CONTEXT.isDisabledForTopic(record.topic())
-            || STREAMING_CONTEXT.isSinkTopic(record.topic())) {
-          Propagator dsmPropagator = Propagators.forConcern(DSM_CONCERN);
-          DataStreamsContext dsmContext = fromTagsWithoutCheckpoint(tags);
-          dsmPropagator.inject(span.with(dsmContext), record.headers(), setter);
+                defaultPropagator().inject(span, record.headers(), setter);
+                if (STREAMING_CONTEXT.isDisabledForTopic(record.topic())
+                        || STREAMING_CONTEXT.isSinkTopic(record.topic())) {
+                    Propagator dsmPropagator = Propagators.forConcern(DSM_CONCERN);
+                    DataStreamsContext dsmContext = fromTagsWithoutCheckpoint(tags);
+                    dsmPropagator.inject(span.with(dsmContext), record.headers(), setter);
+                }
+            }
+            if (TIME_IN_QUEUE_ENABLED) {
+                setter.injectTimeInQueue(record.headers());
+            }
+            AgentTracer.get()
+                    .getDataStreamsMonitoring()
+                    .trackTransaction(
+                            span,
+                            DataStreamsTransactionExtractor.Type.KAFKA_PRODUCE_HEADERS,
+                            record.headers(),
+                            DSM_TRANSACTION_SOURCE_READER);
         }
-      }
-      if (TIME_IN_QUEUE_ENABLED) {
-        setter.injectTimeInQueue(record.headers());
-      }
-      AgentTracer.get()
-          .getDataStreamsMonitoring()
-          .trackTransaction(
-              span,
-              DataStreamsTransactionExtractor.Type.KAFKA_PRODUCE_HEADERS,
-              record.headers(),
-              DSM_TRANSACTION_SOURCE_READER);
     }
-  }
 
-  public static class ProducerConstructorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void captureConfiguration(
-        @Advice.FieldValue("metadata") Metadata metadata,
-        @Advice.Argument(0) ProducerConfig producerConfig) {
-      MetadataState state =
-          InstrumentationContext.get(Metadata.class, MetadataState.class)
-              .getOrCreate(metadata, MetadataState::new);
-      if (Config.get().isDataStreamsEnabled()) {
-        KafkaConfigHelper.storePendingProducerConfig(
-            state, KafkaConfigHelper.extractProducerConfig(producerConfig));
-      }
+    public static class ProducerConstructorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void captureConfiguration(
+                @Advice.FieldValue("metadata") Metadata metadata, @Advice.Argument(0) ProducerConfig producerConfig) {
+            MetadataState state = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                    .getOrCreate(metadata, MetadataState::new);
+            if (Config.get().isDataStreamsEnabled()) {
+                KafkaConfigHelper.storePendingProducerConfig(
+                        state, KafkaConfigHelper.extractProducerConfig(producerConfig));
+            }
+        }
     }
-  }
 
-  public static class PayloadSizeAdvice {
+    public static class PayloadSizeAdvice {
 
-    /**
-     * Instrumentation for the method KafkaProducer.ensureValidRecordSize that is called as part of
-     * sending a kafka payload. This gives us access to an estimate of the payload size "for free",
-     * that we send as a metric.
-     */
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(value = 0) int estimatedPayloadSize) {
-      StatsPoint saved = activeSpan().spanContext().getPathwayContext().getSavedStats();
-      if (saved != null) {
-        // create new stats including the payload size
-        StatsPoint updated =
-            new StatsPoint(
-                saved.getTags(),
-                saved.getHash(),
-                saved.getParentHash(),
-                saved.getAggregationHash(),
-                saved.getTimestampNanos(),
-                saved.getPathwayLatencyNano(),
-                saved.getEdgeLatencyNano(),
-                estimatedPayloadSize,
-                saved.getServiceNameOverride());
-        // then send the point
-        AgentTracer.get().getDataStreamsMonitoring().add(updated);
-      }
+        /**
+         * Instrumentation for the method KafkaProducer.ensureValidRecordSize that is called as part of
+         * sending a kafka payload. This gives us access to an estimate of the payload size "for free",
+         * that we send as a metric.
+         */
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(value = 0) int estimatedPayloadSize) {
+            StatsPoint saved = activeSpan().spanContext().getPathwayContext().getSavedStats();
+            if (saved != null) {
+                // create new stats including the payload size
+                StatsPoint updated = new StatsPoint(
+                        saved.getTags(),
+                        saved.getHash(),
+                        saved.getParentHash(),
+                        saved.getAggregationHash(),
+                        saved.getTimestampNanos(),
+                        saved.getPathwayLatencyNano(),
+                        saved.getEdgeLatencyNano(),
+                        estimatedPayloadSize,
+                        saved.getServiceNameOverride());
+                // then send the point
+                AgentTracer.get().getDataStreamsMonitoring().add(updated);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java
index 4b565b42b6f..a7ec3c65b3d 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java
@@ -25,101 +25,95 @@
 
 @AutoService(InstrumenterModule.class)
 public class MetadataInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public MetadataInstrumentation() {
-    super("kafka", "kafka-0.11");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "before-3.8";
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return not(hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy")); // < 3.8
-  }
+    public MetadataInstrumentation() {
+        super("kafka", "kafka-0.11");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.kafka.clients.Metadata";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "before-3.8";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return not(hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy")); // < 3.8
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
-      "datadog.trace.instrumentation.kafka_common.PendingConfig",
-      "datadog.trace.instrumentation.kafka_common.MetadataState",
-    };
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.kafka.clients.Metadata";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(
-        "org.apache.kafka.clients.Metadata",
-        "datadog.trace.instrumentation.kafka_common.MetadataState");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("update"))
-            .and(takesArgument(0, named("org.apache.kafka.common.Cluster"))),
-        MetadataInstrumentation.class.getName() + "$MetadataUpdateBefore22Advice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("update"))
-            .and(takesArgument(1, named("org.apache.kafka.common.requests.MetadataResponse"))),
-        MetadataInstrumentation.class.getName() + "$MetadataUpdate22AndAfterAdvice");
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
+            "datadog.trace.instrumentation.kafka_common.PendingConfig",
+            "datadog.trace.instrumentation.kafka_common.MetadataState",
+        };
+    }
 
-  public static class MetadataUpdateBefore22Advice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.This final Metadata metadata, @Advice.Argument(0) final Cluster newCluster) {
-      if (newCluster != null && !newCluster.isBootstrapConfigured()) {
-        String clusterId = newCluster.clusterResource().clusterId();
-        MetadataState state =
-            InstrumentationContext.get(Metadata.class, MetadataState.class)
-                .getOrCreate(metadata, MetadataState::new);
-        state.clusterId = clusterId;
-        KafkaConfigHelper.reportPendingConfig(state, clusterId);
-      }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(
+                "org.apache.kafka.clients.Metadata", "datadog.trace.instrumentation.kafka_common.MetadataState");
     }
 
-    public static void muzzleCheck(ConsumerRecord record) {
-      // KafkaConsumerInstrumentation only applies for kafka versions with headers
-      // Make an explicit call so MetadataInstrumentation does the same
-      record.headers();
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("update")).and(takesArgument(0, named("org.apache.kafka.common.Cluster"))),
+                MetadataInstrumentation.class.getName() + "$MetadataUpdateBefore22Advice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("update"))
+                        .and(takesArgument(1, named("org.apache.kafka.common.requests.MetadataResponse"))),
+                MetadataInstrumentation.class.getName() + "$MetadataUpdate22AndAfterAdvice");
     }
-  }
 
-  public static class MetadataUpdate22AndAfterAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.This final Metadata metadata, @Advice.Argument(1) final MetadataResponse response) {
-      if (response != null) {
-        String clusterId = response.clusterId();
-        MetadataState state =
-            InstrumentationContext.get(Metadata.class, MetadataState.class)
-                .getOrCreate(metadata, MetadataState::new);
-        state.clusterId = clusterId;
-        KafkaConfigHelper.reportPendingConfig(state, clusterId);
-      }
+    public static class MetadataUpdateBefore22Advice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.This final Metadata metadata, @Advice.Argument(0) final Cluster newCluster) {
+            if (newCluster != null && !newCluster.isBootstrapConfigured()) {
+                String clusterId = newCluster.clusterResource().clusterId();
+                MetadataState state = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                        .getOrCreate(metadata, MetadataState::new);
+                state.clusterId = clusterId;
+                KafkaConfigHelper.reportPendingConfig(state, clusterId);
+            }
+        }
+
+        public static void muzzleCheck(ConsumerRecord record) {
+            // KafkaConsumerInstrumentation only applies for kafka versions with headers
+            // Make an explicit call so MetadataInstrumentation does the same
+            record.headers();
+        }
     }
 
-    public static void muzzleCheck(ConsumerRecord record) {
-      // KafkaConsumerInstrumentation only applies for kafka versions with headers
-      // Make an explicit call so MetadataInstrumentation does the same
-      record.headers();
+    public static class MetadataUpdate22AndAfterAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.This final Metadata metadata, @Advice.Argument(1) final MetadataResponse response) {
+            if (response != null) {
+                String clusterId = response.clusterId();
+                MetadataState state = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                        .getOrCreate(metadata, MetadataState::new);
+                state.clusterId = clusterId;
+                KafkaConfigHelper.reportPendingConfig(state, clusterId);
+            }
+        }
+
+        public static void muzzleCheck(ConsumerRecord record) {
+            // KafkaConsumerInstrumentation only applies for kafka versions with headers
+            // Make an explicit call so MetadataInstrumentation does the same
+            record.headers();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/NoopTextMapInjectAdapter.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/NoopTextMapInjectAdapter.java
index afd4e89a561..22e59830bae 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/NoopTextMapInjectAdapter.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/NoopTextMapInjectAdapter.java
@@ -5,10 +5,10 @@
 
 @ParametersAreNonnullByDefault
 public class NoopTextMapInjectAdapter implements TextMapInjectAdapterInterface {
-  public static final NoopTextMapInjectAdapter NOOP_SETTER = new NoopTextMapInjectAdapter();
+    public static final NoopTextMapInjectAdapter NOOP_SETTER = new NoopTextMapInjectAdapter();
 
-  @Override
-  public void set(final Headers headers, final String key, final String value) {}
+    @Override
+    public void set(final Headers headers, final String key, final String value) {}
 
-  public void injectTimeInQueue(Headers headers) {}
+    public void injectTimeInQueue(Headers headers) {}
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TextMapExtractAdapter.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TextMapExtractAdapter.java
index 429038773ba..21c0571ae5d 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TextMapExtractAdapter.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TextMapExtractAdapter.java
@@ -17,55 +17,55 @@
 import org.slf4j.LoggerFactory;
 
 public class TextMapExtractAdapter implements ContextVisitor<Headers> {
-  private static final Logger log = LoggerFactory.getLogger(TextMapExtractAdapter.class);
+    private static final Logger log = LoggerFactory.getLogger(TextMapExtractAdapter.class);
 
-  public static final TextMapExtractAdapter GETTER =
-      new TextMapExtractAdapter(Config.get().isKafkaClientBase64DecodingEnabled());
+    public static final TextMapExtractAdapter GETTER =
+            new TextMapExtractAdapter(Config.get().isKafkaClientBase64DecodingEnabled());
 
-  private final Function<byte[], String> headerValueTransformer;
-  private final Base64.Decoder decoder;
+    private final Function<byte[], String> headerValueTransformer;
+    private final Base64.Decoder decoder;
 
-  public TextMapExtractAdapter(boolean decodeBase64Headers) {
-    if (decodeBase64Headers) {
-      this.headerValueTransformer = BASE64_DECODE;
-      this.decoder = Base64.getDecoder();
-    } else {
-      this.headerValueTransformer = UTF8_BYTES_TO_STRING;
-      this.decoder = null;
+    public TextMapExtractAdapter(boolean decodeBase64Headers) {
+        if (decodeBase64Headers) {
+            this.headerValueTransformer = BASE64_DECODE;
+            this.decoder = Base64.getDecoder();
+        } else {
+            this.headerValueTransformer = UTF8_BYTES_TO_STRING;
+            this.decoder = null;
+        }
     }
-  }
 
-  @Override
-  public void forEachKey(Headers carrier, AgentPropagation.KeyClassifier classifier) {
-    for (Header header : carrier) {
-      String key = header.key();
-      byte[] value = header.value();
-      if (null == value) {
-        continue;
-      }
-      String decoded = headerValueTransformer.apply(value);
-      if (decoded == null) {
-        log.debug(EXCLUDE_TELEMETRY, "Failed to Base64-decode Kafka header '{}', skipping", key);
-        continue;
-      }
-      if (!classifier.accept(key, decoded)) {
-        return;
-      }
+    @Override
+    public void forEachKey(Headers carrier, AgentPropagation.KeyClassifier classifier) {
+        for (Header header : carrier) {
+            String key = header.key();
+            byte[] value = header.value();
+            if (null == value) {
+                continue;
+            }
+            String decoded = headerValueTransformer.apply(value);
+            if (decoded == null) {
+                log.debug(EXCLUDE_TELEMETRY, "Failed to Base64-decode Kafka header '{}', skipping", key);
+                continue;
+            }
+            if (!classifier.accept(key, decoded)) {
+                return;
+            }
+        }
     }
-  }
 
-  public long extractTimeInQueueStart(Headers carrier) {
-    Header header = carrier.lastHeader(KAFKA_PRODUCED_KEY);
-    if (null != header) {
-      try {
-        ByteBuffer buf = ByteBuffer.allocate(8);
-        buf.put(decoder != null ? decoder.decode(header.value()) : header.value());
-        buf.flip();
-        return buf.getLong();
-      } catch (Exception e) {
-        log.debug(EXCLUDE_TELEMETRY, "Unable to get kafka produced time", e);
-      }
+    public long extractTimeInQueueStart(Headers carrier) {
+        Header header = carrier.lastHeader(KAFKA_PRODUCED_KEY);
+        if (null != header) {
+            try {
+                ByteBuffer buf = ByteBuffer.allocate(8);
+                buf.put(decoder != null ? decoder.decode(header.value()) : header.value());
+                buf.flip();
+                return buf.getLong();
+            } catch (Exception e) {
+                log.debug(EXCLUDE_TELEMETRY, "Unable to get kafka produced time", e);
+            }
+        }
+        return 0;
     }
-    return 0;
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TextMapInjectAdapter.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TextMapInjectAdapter.java
index d1ce9a000bf..17307db0378 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TextMapInjectAdapter.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TextMapInjectAdapter.java
@@ -9,16 +9,16 @@
 
 @ParametersAreNonnullByDefault
 public class TextMapInjectAdapter implements TextMapInjectAdapterInterface {
-  public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
+    public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
 
-  @Override
-  public void set(final Headers headers, final String key, final String value) {
-    headers.remove(key).add(key, value.getBytes(UTF_8));
-  }
+    @Override
+    public void set(final Headers headers, final String key, final String value) {
+        headers.remove(key).add(key, value.getBytes(UTF_8));
+    }
 
-  public void injectTimeInQueue(Headers headers) {
-    ByteBuffer buf = ByteBuffer.allocate(8);
-    buf.putLong(System.currentTimeMillis());
-    headers.add(KAFKA_PRODUCED_KEY, buf.array());
-  }
+    public void injectTimeInQueue(Headers headers) {
+        ByteBuffer buf = ByteBuffer.allocate(8);
+        buf.putLong(System.currentTimeMillis());
+        headers.add(KAFKA_PRODUCED_KEY, buf.array());
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TextMapInjectAdapterInterface.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TextMapInjectAdapterInterface.java
index 466be384c52..16577bc2f35 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TextMapInjectAdapterInterface.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TextMapInjectAdapterInterface.java
@@ -4,5 +4,5 @@
 import org.apache.kafka.common.header.Headers;
 
 public interface TextMapInjectAdapterInterface extends CarrierSetter<Headers> {
-  void injectTimeInQueue(Headers headers);
+    void injectTimeInQueue(Headers headers);
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterable.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterable.java
index 5f05996b3e9..d8dd9b9a593 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterable.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterable.java
@@ -4,37 +4,36 @@
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 
 public class TracingIterable implements Iterable<ConsumerRecord<?, ?>>, TracingIterableDelegator {
-  private final Iterable<ConsumerRecord<?, ?>> delegate;
-  private final CharSequence operationName;
-  private final KafkaDecorator decorator;
-  private final String group;
-  private final String clusterId;
-  private final String bootstrapServers;
+    private final Iterable<ConsumerRecord<?, ?>> delegate;
+    private final CharSequence operationName;
+    private final KafkaDecorator decorator;
+    private final String group;
+    private final String clusterId;
+    private final String bootstrapServers;
 
-  public TracingIterable(
-      final Iterable<ConsumerRecord<?, ?>> delegate,
-      final CharSequence operationName,
-      final KafkaDecorator decorator,
-      String group,
-      String clusterId,
-      String bootstrapServers) {
-    this.delegate = delegate;
-    this.operationName = operationName;
-    this.decorator = decorator;
-    this.group = group;
-    this.clusterId = clusterId;
-    this.bootstrapServers = bootstrapServers;
-  }
+    public TracingIterable(
+            final Iterable<ConsumerRecord<?, ?>> delegate,
+            final CharSequence operationName,
+            final KafkaDecorator decorator,
+            String group,
+            String clusterId,
+            String bootstrapServers) {
+        this.delegate = delegate;
+        this.operationName = operationName;
+        this.decorator = decorator;
+        this.group = group;
+        this.clusterId = clusterId;
+        this.bootstrapServers = bootstrapServers;
+    }
 
-  @Override
-  public Iterator<ConsumerRecord<?, ?>> iterator() {
-    // every iteration will add spans. Not only the very first one
-    return new TracingIterator(
-        delegate.iterator(), operationName, decorator, group, clusterId, bootstrapServers);
-  }
+    @Override
+    public Iterator<ConsumerRecord<?, ?>> iterator() {
+        // every iteration will add spans. Not only the very first one
+        return new TracingIterator(delegate.iterator(), operationName, decorator, group, clusterId, bootstrapServers);
+    }
 
-  @Override
-  public Iterable<ConsumerRecord<?, ?>> getDelegate() {
-    return delegate;
-  }
+    @Override
+    public Iterable<ConsumerRecord<?, ?>> getDelegate() {
+        return delegate;
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterableDelegator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterableDelegator.java
index 7e71be99edd..249030e3433 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterableDelegator.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterableDelegator.java
@@ -3,6 +3,6 @@
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 
 public interface TracingIterableDelegator {
-  // Used by the streams instrumentation to unwrap (disable) the iteration advice.
-  Iterable<ConsumerRecord<?, ?>> getDelegate();
+    // Used by the streams instrumentation to unwrap (disable) the iteration advice.
+    Iterable<ConsumerRecord<?, ?>> getDelegate();
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java
index 93179e4e3f2..ed85d0a2ce3 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java
@@ -39,141 +39,140 @@
 
 public class TracingIterator implements Iterator<ConsumerRecord<?, ?>> {
 
-  private static final Logger log = LoggerFactory.getLogger(TracingIterator.class);
+    private static final Logger log = LoggerFactory.getLogger(TracingIterator.class);
 
-  private final Iterator<ConsumerRecord<?, ?>> delegateIterator;
-  private final CharSequence operationName;
-  private final KafkaDecorator decorator;
-  private final String group;
-  private final String clusterId;
-  private final String bootstrapServers;
+    private final Iterator<ConsumerRecord<?, ?>> delegateIterator;
+    private final CharSequence operationName;
+    private final KafkaDecorator decorator;
+    private final String group;
+    private final String clusterId;
+    private final String bootstrapServers;
 
-  public TracingIterator(
-      final Iterator<ConsumerRecord<?, ?>> delegateIterator,
-      final CharSequence operationName,
-      final KafkaDecorator decorator,
-      String group,
-      String clusterId,
-      String bootstrapServers) {
-    this.delegateIterator = delegateIterator;
-    this.operationName = operationName;
-    this.decorator = decorator;
-    this.group = group;
-    this.clusterId = clusterId;
-    this.bootstrapServers = bootstrapServers;
-  }
+    public TracingIterator(
+            final Iterator<ConsumerRecord<?, ?>> delegateIterator,
+            final CharSequence operationName,
+            final KafkaDecorator decorator,
+            String group,
+            String clusterId,
+            String bootstrapServers) {
+        this.delegateIterator = delegateIterator;
+        this.operationName = operationName;
+        this.decorator = decorator;
+        this.group = group;
+        this.clusterId = clusterId;
+        this.bootstrapServers = bootstrapServers;
+    }
 
-  @Override
-  public boolean hasNext() {
-    boolean moreRecords = delegateIterator.hasNext();
-    if (!moreRecords) {
-      // no more records, use this as a signal to close the last iteration scope
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        closePrevious(true);
-      } else {
-        final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
-        if (previousSpan != null) {
-          previousSpan.finishWithEndToEnd();
+    @Override
+    public boolean hasNext() {
+        boolean moreRecords = delegateIterator.hasNext();
+        if (!moreRecords) {
+            // no more records, use this as a signal to close the last iteration scope
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                closePrevious(true);
+            } else {
+                final AgentSpan previousSpan =
+                        AgentSpan.fromContext(Context.root().swap());
+                if (previousSpan != null) {
+                    previousSpan.finishWithEndToEnd();
+                }
+            }
         }
-      }
+        return moreRecords;
+    }
+
+    @Override
+    public ConsumerRecord<?, ?> next() {
+        final ConsumerRecord<?, ?> next = delegateIterator.next();
+        startNewRecordSpan(next);
+        return next;
     }
-    return moreRecords;
-  }
 
-  @Override
-  public ConsumerRecord<?, ?> next() {
-    final ConsumerRecord<?, ?> next = delegateIterator.next();
-    startNewRecordSpan(next);
-    return next;
-  }
+    protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {
+        try {
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                closePrevious(true);
+            } else if (val == null) { // previous message span was the last
+                final AgentSpan previousSpan =
+                        AgentSpan.fromContext(Context.root().swap());
+                if (previousSpan != null) {
+                    previousSpan.finishWithEndToEnd();
+                }
+            }
+            AgentSpan span, queueSpan = null;
+            if (val != null) {
+                if (!Config.get().isKafkaClientPropagationDisabledForTopic(val.topic())) {
+                    final AgentSpanContext spanContext = extractContextAndGetSpanContext(val.headers(), GETTER);
+                    long timeInQueueStart = GETTER.extractTimeInQueueStart(val.headers());
+                    if (timeInQueueStart == 0 || !TIME_IN_QUEUE_ENABLED) {
+                        span = startSpan(JAVA_KAFKA.toString(), operationName, spanContext);
+                    } else {
+                        queueSpan = startSpan(
+                                JAVA_KAFKA.toString(),
+                                KAFKA_DELIVER,
+                                spanContext,
+                                MILLISECONDS.toMicros(timeInQueueStart));
+                        BROKER_DECORATE.afterStart(queueSpan);
+                        BROKER_DECORATE.onTimeInQueue(queueSpan, val);
+                        span = startSpan(JAVA_KAFKA.toString(), operationName, queueSpan.spanContext());
+                        BROKER_DECORATE.beforeFinish(queueSpan);
+                        // The queueSpan will be finished after inner span has been activated to ensure that
+                        // spans are written out together by TraceStructureWriter when running in strict mode
+                    }
 
-  protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {
-    try {
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        closePrevious(true);
-      } else if (val == null) { // previous message span was the last
-        final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
-        if (previousSpan != null) {
-          previousSpan.finishWithEndToEnd();
-        }
-      }
-      AgentSpan span, queueSpan = null;
-      if (val != null) {
-        if (!Config.get().isKafkaClientPropagationDisabledForTopic(val.topic())) {
-          final AgentSpanContext spanContext =
-              extractContextAndGetSpanContext(val.headers(), GETTER);
-          long timeInQueueStart = GETTER.extractTimeInQueueStart(val.headers());
-          if (timeInQueueStart == 0 || !TIME_IN_QUEUE_ENABLED) {
-            span = startSpan(JAVA_KAFKA.toString(), operationName, spanContext);
-          } else {
-            queueSpan =
-                startSpan(
-                    JAVA_KAFKA.toString(),
-                    KAFKA_DELIVER,
-                    spanContext,
-                    MILLISECONDS.toMicros(timeInQueueStart));
-            BROKER_DECORATE.afterStart(queueSpan);
-            BROKER_DECORATE.onTimeInQueue(queueSpan, val);
-            span = startSpan(JAVA_KAFKA.toString(), operationName, queueSpan.spanContext());
-            BROKER_DECORATE.beforeFinish(queueSpan);
-            // The queueSpan will be finished after inner span has been activated to ensure that
-            // spans are written out together by TraceStructureWriter when running in strict mode
-          }
+                    DataStreamsTags tags = create("kafka", INBOUND, val.topic(), group, clusterId);
+                    final long payloadSize = traceConfig().isDataStreamsEnabled() ? computePayloadSizeBytes(val) : 0;
+                    if (STREAMING_CONTEXT.isDisabledForTopic(val.topic())) {
+                        AgentTracer.get()
+                                .getDataStreamsMonitoring()
+                                .setCheckpoint(span, create(tags, val.timestamp(), payloadSize));
+                    } else {
+                        // when we're in a streaming context we want to consume only from source topics
+                        if (STREAMING_CONTEXT.isSourceTopic(val.topic())) {
+                            // We have to inject the context to headers here,
+                            // since the data received from the source may leave the topology on
+                            // some other instance of the application, breaking the context propagation
+                            // for DSM users
+                            Propagator dsmPropagator = Propagators.forConcern(DSM_CONCERN);
+                            DataStreamsContext dsmContext = create(tags, val.timestamp(), payloadSize);
+                            dsmPropagator.inject(span.with(dsmContext), val.headers(), SETTER);
+                        }
+                    }
+                } else {
+                    span = startSpan(JAVA_KAFKA.toString(), operationName, null);
+                }
+                if (val.value() == null) {
+                    span.setTag(InstrumentationTags.TOMBSTONE, true);
+                }
+                decorator.afterStart(span);
+                decorator.onConsume(span, val, group, clusterId, bootstrapServers);
+                if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                    activateNext(span);
+                } else {
+                    final AgentSpan previousSpan = AgentSpan.fromContext(span.swap());
+                    if (previousSpan != null) {
+                        previousSpan.finishWithEndToEnd();
+                    }
+                }
+                if (null != queueSpan) {
+                    queueSpan.finish();
+                }
 
-          DataStreamsTags tags = create("kafka", INBOUND, val.topic(), group, clusterId);
-          final long payloadSize =
-              traceConfig().isDataStreamsEnabled() ? computePayloadSizeBytes(val) : 0;
-          if (STREAMING_CONTEXT.isDisabledForTopic(val.topic())) {
-            AgentTracer.get()
-                .getDataStreamsMonitoring()
-                .setCheckpoint(span, create(tags, val.timestamp(), payloadSize));
-          } else {
-            // when we're in a streaming context we want to consume only from source topics
-            if (STREAMING_CONTEXT.isSourceTopic(val.topic())) {
-              // We have to inject the context to headers here,
-              // since the data received from the source may leave the topology on
-              // some other instance of the application, breaking the context propagation
-              // for DSM users
-              Propagator dsmPropagator = Propagators.forConcern(DSM_CONCERN);
-              DataStreamsContext dsmContext = create(tags, val.timestamp(), payloadSize);
-              dsmPropagator.inject(span.with(dsmContext), val.headers(), SETTER);
+                AgentTracer.get()
+                        .getDataStreamsMonitoring()
+                        .trackTransaction(
+                                span,
+                                DataStreamsTransactionExtractor.Type.KAFKA_CONSUME_HEADERS,
+                                val.headers(),
+                                DSM_TRANSACTION_SOURCE_READER);
             }
-          }
-        } else {
-          span = startSpan(JAVA_KAFKA.toString(), operationName, null);
+        } catch (final Exception e) {
+            log.debug("Error starting new record span", e);
         }
-        if (val.value() == null) {
-          span.setTag(InstrumentationTags.TOMBSTONE, true);
-        }
-        decorator.afterStart(span);
-        decorator.onConsume(span, val, group, clusterId, bootstrapServers);
-        if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-          activateNext(span);
-        } else {
-          final AgentSpan previousSpan = AgentSpan.fromContext(span.swap());
-          if (previousSpan != null) {
-            previousSpan.finishWithEndToEnd();
-          }
-        }
-        if (null != queueSpan) {
-          queueSpan.finish();
-        }
-
-        AgentTracer.get()
-            .getDataStreamsMonitoring()
-            .trackTransaction(
-                span,
-                DataStreamsTransactionExtractor.Type.KAFKA_CONSUME_HEADERS,
-                val.headers(),
-                DSM_TRANSACTION_SOURCE_READER);
-      }
-    } catch (final Exception e) {
-      log.debug("Error starting new record span", e);
     }
-  }
 
-  @Override
-  public void remove() {
-    delegateIterator.remove();
-  }
+    @Override
+    public void remove() {
+        delegateIterator.remove();
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingList.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingList.java
index 2cb5f4c698f..1974122b6f4 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingList.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingList.java
@@ -8,154 +8,149 @@
 
 public class TracingList implements List<ConsumerRecord<?, ?>>, TracingIterableDelegator {
 
-  private final List<ConsumerRecord<?, ?>> delegate;
-  private final CharSequence operationName;
-  private final KafkaDecorator decorator;
-  private final String group;
-  private final String clusterId;
-  private final String bootstrapServers;
-
-  public TracingList(
-      final List<ConsumerRecord<?, ?>> delegate,
-      final CharSequence operationName,
-      final KafkaDecorator decorator,
-      String group,
-      String clusterId,
-      String bootstrapServers) {
-    this.operationName = operationName;
-    this.decorator = decorator;
-    this.delegate = delegate;
-    this.group = group;
-    this.clusterId = clusterId;
-    this.bootstrapServers = bootstrapServers;
-  }
-
-  @Override
-  public int size() {
-    return delegate.size();
-  }
-
-  @Override
-  public boolean isEmpty() {
-    return delegate.isEmpty();
-  }
-
-  @Override
-  public boolean contains(final Object o) {
-    return delegate.contains(o);
-  }
-
-  @Override
-  public Iterator<ConsumerRecord<?, ?>> iterator() {
-    return listIterator(0);
-  }
-
-  @Override
-  public Object[] toArray() {
-    return delegate.toArray();
-  }
-
-  @Override
-  public <T> T[] toArray(final T[] a) {
-    return delegate.toArray(a);
-  }
-
-  @Override
-  public boolean add(final ConsumerRecord consumerRecord) {
-    return delegate.add(consumerRecord);
-  }
-
-  @Override
-  public boolean remove(final Object o) {
-    return delegate.remove(o);
-  }
-
-  @Override
-  public boolean containsAll(final Collection<?> c) {
-    return delegate.containsAll(c);
-  }
-
-  @Override
-  public boolean addAll(final Collection<? extends ConsumerRecord<?, ?>> c) {
-    return delegate.addAll(c);
-  }
-
-  @Override
-  public boolean addAll(final int index, final Collection<? extends ConsumerRecord<?, ?>> c) {
-    return delegate.addAll(index, c);
-  }
-
-  @Override
-  public boolean removeAll(final Collection<?> c) {
-    return delegate.removeAll(c);
-  }
-
-  @Override
-  public boolean retainAll(final Collection<?> c) {
-    return delegate.retainAll(c);
-  }
-
-  @Override
-  public void clear() {
-    delegate.clear();
-  }
-
-  @Override
-  public ConsumerRecord get(final int index) {
-    // TODO: should this be instrumented as well?
-    return delegate.get(index);
-  }
-
-  @Override
-  public ConsumerRecord set(final int index, final ConsumerRecord element) {
-    return delegate.set(index, element);
-  }
-
-  @Override
-  public void add(final int index, final ConsumerRecord element) {
-    delegate.add(index, element);
-  }
-
-  @Override
-  public ConsumerRecord remove(final int index) {
-    return delegate.remove(index);
-  }
-
-  @Override
-  public int indexOf(final Object o) {
-    return delegate.indexOf(o);
-  }
-
-  @Override
-  public int lastIndexOf(final Object o) {
-    return delegate.lastIndexOf(o);
-  }
-
-  @Override
-  public ListIterator<ConsumerRecord<?, ?>> listIterator() {
-    return listIterator(0);
-  }
-
-  @Override
-  public ListIterator<ConsumerRecord<?, ?>> listIterator(final int index) {
-    // every iteration will add spans. Not only the very first one
-    return new TracingListIterator(
-        delegate.listIterator(index), operationName, decorator, group, clusterId, bootstrapServers);
-  }
-
-  @Override
-  public List<ConsumerRecord<?, ?>> subList(final int fromIndex, final int toIndex) {
-    return new TracingList(
-        delegate.subList(fromIndex, toIndex),
-        operationName,
-        decorator,
-        group,
-        clusterId,
-        bootstrapServers);
-  }
-
-  @Override
-  public List<ConsumerRecord<?, ?>> getDelegate() {
-    return delegate;
-  }
+    private final List<ConsumerRecord<?, ?>> delegate;
+    private final CharSequence operationName;
+    private final KafkaDecorator decorator;
+    private final String group;
+    private final String clusterId;
+    private final String bootstrapServers;
+
+    public TracingList(
+            final List<ConsumerRecord<?, ?>> delegate,
+            final CharSequence operationName,
+            final KafkaDecorator decorator,
+            String group,
+            String clusterId,
+            String bootstrapServers) {
+        this.operationName = operationName;
+        this.decorator = decorator;
+        this.delegate = delegate;
+        this.group = group;
+        this.clusterId = clusterId;
+        this.bootstrapServers = bootstrapServers;
+    }
+
+    @Override
+    public int size() {
+        return delegate.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return delegate.isEmpty();
+    }
+
+    @Override
+    public boolean contains(final Object o) {
+        return delegate.contains(o);
+    }
+
+    @Override
+    public Iterator<ConsumerRecord<?, ?>> iterator() {
+        return listIterator(0);
+    }
+
+    @Override
+    public Object[] toArray() {
+        return delegate.toArray();
+    }
+
+    @Override
+    public <T> T[] toArray(final T[] a) {
+        return delegate.toArray(a);
+    }
+
+    @Override
+    public boolean add(final ConsumerRecord consumerRecord) {
+        return delegate.add(consumerRecord);
+    }
+
+    @Override
+    public boolean remove(final Object o) {
+        return delegate.remove(o);
+    }
+
+    @Override
+    public boolean containsAll(final Collection<?> c) {
+        return delegate.containsAll(c);
+    }
+
+    @Override
+    public boolean addAll(final Collection<? extends ConsumerRecord<?, ?>> c) {
+        return delegate.addAll(c);
+    }
+
+    @Override
+    public boolean addAll(final int index, final Collection<? extends ConsumerRecord<?, ?>> c) {
+        return delegate.addAll(index, c);
+    }
+
+    @Override
+    public boolean removeAll(final Collection<?> c) {
+        return delegate.removeAll(c);
+    }
+
+    @Override
+    public boolean retainAll(final Collection<?> c) {
+        return delegate.retainAll(c);
+    }
+
+    @Override
+    public void clear() {
+        delegate.clear();
+    }
+
+    @Override
+    public ConsumerRecord get(final int index) {
+        // TODO: should this be instrumented as well?
+        return delegate.get(index);
+    }
+
+    @Override
+    public ConsumerRecord set(final int index, final ConsumerRecord element) {
+        return delegate.set(index, element);
+    }
+
+    @Override
+    public void add(final int index, final ConsumerRecord element) {
+        delegate.add(index, element);
+    }
+
+    @Override
+    public ConsumerRecord remove(final int index) {
+        return delegate.remove(index);
+    }
+
+    @Override
+    public int indexOf(final Object o) {
+        return delegate.indexOf(o);
+    }
+
+    @Override
+    public int lastIndexOf(final Object o) {
+        return delegate.lastIndexOf(o);
+    }
+
+    @Override
+    public ListIterator<ConsumerRecord<?, ?>> listIterator() {
+        return listIterator(0);
+    }
+
+    @Override
+    public ListIterator<ConsumerRecord<?, ?>> listIterator(final int index) {
+        // every iteration will add spans. Not only the very first one
+        return new TracingListIterator(
+                delegate.listIterator(index), operationName, decorator, group, clusterId, bootstrapServers);
+    }
+
+    @Override
+    public List<ConsumerRecord<?, ?>> subList(final int fromIndex, final int toIndex) {
+        return new TracingList(
+                delegate.subList(fromIndex, toIndex), operationName, decorator, group, clusterId, bootstrapServers);
+    }
+
+    @Override
+    public List<ConsumerRecord<?, ?>> getDelegate() {
+        return delegate;
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingListIterator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingListIterator.java
index 34e7bbe00df..6cea43b1927 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingListIterator.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingListIterator.java
@@ -8,68 +8,68 @@
 import java.util.ListIterator;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 
-public class TracingListIterator extends TracingIterator
-    implements ListIterator<ConsumerRecord<?, ?>> {
+public class TracingListIterator extends TracingIterator implements ListIterator<ConsumerRecord<?, ?>> {
 
-  private final ListIterator<ConsumerRecord<?, ?>> delegateIterator;
+    private final ListIterator<ConsumerRecord<?, ?>> delegateIterator;
 
-  public TracingListIterator(
-      ListIterator<ConsumerRecord<?, ?>> delegateIterator,
-      CharSequence operationName,
-      KafkaDecorator decorator,
-      String group,
-      String clusterId,
-      String bootstrapServers) {
-    super(delegateIterator, operationName, decorator, group, clusterId, bootstrapServers);
-    this.delegateIterator = delegateIterator;
-  }
+    public TracingListIterator(
+            ListIterator<ConsumerRecord<?, ?>> delegateIterator,
+            CharSequence operationName,
+            KafkaDecorator decorator,
+            String group,
+            String clusterId,
+            String bootstrapServers) {
+        super(delegateIterator, operationName, decorator, group, clusterId, bootstrapServers);
+        this.delegateIterator = delegateIterator;
+    }
 
-  @Override
-  public boolean hasPrevious() {
-    boolean moreRecords = delegateIterator.hasPrevious();
-    if (!moreRecords) {
-      // no more records, use this as a signal to close the last iteration scope
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        closePrevious(true);
-      } else {
-        final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
-        if (previousSpan != null) {
-          previousSpan.finishWithEndToEnd();
+    @Override
+    public boolean hasPrevious() {
+        boolean moreRecords = delegateIterator.hasPrevious();
+        if (!moreRecords) {
+            // no more records, use this as a signal to close the last iteration scope
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                closePrevious(true);
+            } else {
+                final AgentSpan previousSpan =
+                        AgentSpan.fromContext(Context.root().swap());
+                if (previousSpan != null) {
+                    previousSpan.finishWithEndToEnd();
+                }
+            }
         }
-      }
+        return moreRecords;
     }
-    return moreRecords;
-  }
 
-  @Override
-  public ConsumerRecord<?, ?> previous() {
-    final ConsumerRecord<?, ?> prev = delegateIterator.previous();
-    startNewRecordSpan(prev);
-    return prev;
-  }
+    @Override
+    public ConsumerRecord<?, ?> previous() {
+        final ConsumerRecord<?, ?> prev = delegateIterator.previous();
+        startNewRecordSpan(prev);
+        return prev;
+    }
 
-  @Override
-  public int nextIndex() {
-    return delegateIterator.nextIndex();
-  }
+    @Override
+    public int nextIndex() {
+        return delegateIterator.nextIndex();
+    }
 
-  @Override
-  public int previousIndex() {
-    return delegateIterator.previousIndex();
-  }
+    @Override
+    public int previousIndex() {
+        return delegateIterator.previousIndex();
+    }
 
-  /*
-   * org.apache.kafka.clients.consumer.ConsumerRecords::records(TopicPartition) always returns
-   * UnmodifiableList. Modifiable operations will lead to exception
-   */
+    /*
+     * org.apache.kafka.clients.consumer.ConsumerRecords::records(TopicPartition) always returns
+     * UnmodifiableList. Modifiable operations will lead to exception
+     */
 
-  @Override
-  public void set(ConsumerRecord<?, ?> consumerRecord) {
-    delegateIterator.set(consumerRecord);
-  }
+    @Override
+    public void set(ConsumerRecord<?, ?> consumerRecord) {
+        delegateIterator.set(consumerRecord);
+    }
 
-  @Override
-  public void add(ConsumerRecord<?, ?> consumerRecord) {
-    delegateIterator.add(consumerRecord);
-  }
+    @Override
+    public void add(ConsumerRecord<?, ?> consumerRecord) {
+        delegateIterator.add(consumerRecord);
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java
index f2d99348473..92ef517ddb2 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java
@@ -14,51 +14,48 @@
 
 @AutoService(InstrumenterModule.class)
 public final class ConsumerCoordinatorInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public ConsumerCoordinatorInstrumentation() {
-    super("kafka", "kafka-3.8");
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>(2);
-    contextStores.put(
-        "org.apache.kafka.clients.Metadata",
-        "datadog.trace.instrumentation.kafka_common.MetadataState");
-    contextStores.put(
-        "org.apache.kafka.clients.consumer.internals.ConsumerCoordinator",
-        KafkaConsumerInfo.class.getName());
-    return contextStores;
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.kafka.clients.consumer.internals.ConsumerCoordinator";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".KafkaConsumerInfo",
-      "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
-      "datadog.trace.instrumentation.kafka_common.PendingConfig",
-      "datadog.trace.instrumentation.kafka_common.MetadataState",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("sendOffsetCommitRequest")).and(takesArguments(1)),
-        packageName + ".ConsumerCoordinatorAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("onJoinComplete")).and(takesArguments(4)),
-        packageName + ".JoinGroupAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public ConsumerCoordinatorInstrumentation() {
+        super("kafka", "kafka-3.8");
+    }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>(2);
+        contextStores.put(
+                "org.apache.kafka.clients.Metadata", "datadog.trace.instrumentation.kafka_common.MetadataState");
+        contextStores.put(
+                "org.apache.kafka.clients.consumer.internals.ConsumerCoordinator", KafkaConsumerInfo.class.getName());
+        return contextStores;
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.apache.kafka.clients.consumer.internals.ConsumerCoordinator";
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".KafkaConsumerInfo",
+            "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
+            "datadog.trace.instrumentation.kafka_common.PendingConfig",
+            "datadog.trace.instrumentation.kafka_common.MetadataState",
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("sendOffsetCommitRequest")).and(takesArguments(1)),
+                packageName + ".ConsumerCoordinatorAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("onJoinComplete")).and(takesArguments(4)), packageName + ".JoinGroupAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java
index c94c49369ed..97fbb35fbd8 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java
@@ -25,80 +25,75 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class KafkaConsumerInfoInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice,
-        Instrumenter.WithTypeStructure {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice, Instrumenter.WithTypeStructure {
 
-  public KafkaConsumerInfoInstrumentation() {
-    super("kafka", "kafka-3.8");
-  }
+    public KafkaConsumerInfoInstrumentation() {
+        super("kafka", "kafka-3.8");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>(4);
-    contextStores.put(
-        "org.apache.kafka.clients.Metadata",
-        "datadog.trace.instrumentation.kafka_common.MetadataState");
-    contextStores.put(
-        "org.apache.kafka.clients.consumer.ConsumerRecords", KafkaConsumerInfo.class.getName());
-    // new- here we are storing the callbackinvoker and consumerdelegate in the context store
-    // as opposed to the old consumercoordinator and kafkaconsumer
-    contextStores.put(
-        "org.apache.kafka.clients.consumer.internals.OffsetCommitCallbackInvoker",
-        KafkaConsumerInfo.class.getName());
-    contextStores.put(
-        "org.apache.kafka.clients.consumer.internals.ConsumerDelegate",
-        KafkaConsumerInfo.class.getName());
-    return contextStores;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>(4);
+        contextStores.put(
+                "org.apache.kafka.clients.Metadata", "datadog.trace.instrumentation.kafka_common.MetadataState");
+        contextStores.put("org.apache.kafka.clients.consumer.ConsumerRecords", KafkaConsumerInfo.class.getName());
+        // new- here we are storing the callbackinvoker and consumerdelegate in the context store
+        // as opposed to the old consumercoordinator and kafkaconsumer
+        contextStores.put(
+                "org.apache.kafka.clients.consumer.internals.OffsetCommitCallbackInvoker",
+                KafkaConsumerInfo.class.getName());
+        contextStores.put(
+                "org.apache.kafka.clients.consumer.internals.ConsumerDelegate", KafkaConsumerInfo.class.getName());
+        return contextStores;
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.kafka.clients.consumer.internals.ConsumerDelegate";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.kafka.clients.consumer.internals.ConsumerDelegate";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("offsetCommitCallbackInvoker"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("offsetCommitCallbackInvoker"));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".KafkaDecorator",
-      packageName + ".KafkaConsumerInfo",
-      packageName + ".KafkaConsumerInstrumentationHelper",
-      "datadog.trace.instrumentation.kafka_common.ClusterIdHolder",
-      "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
-      "datadog.trace.instrumentation.kafka_common.PendingConfig",
-      "datadog.trace.instrumentation.kafka_common.MetadataState",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".KafkaDecorator",
+            packageName + ".KafkaConsumerInfo",
+            packageName + ".KafkaConsumerInstrumentationHelper",
+            "datadog.trace.instrumentation.kafka_common.ClusterIdHolder",
+            "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
+            "datadog.trace.instrumentation.kafka_common.PendingConfig",
+            "datadog.trace.instrumentation.kafka_common.MetadataState",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(0, named("org.apache.kafka.clients.consumer.ConsumerConfig")))
-            .and(takesArgument(1, named("org.apache.kafka.common.serialization.Deserializer")))
-            .and(takesArgument(2, named("org.apache.kafka.common.serialization.Deserializer"))),
-        packageName + ".ConstructorAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("poll"))
-            .and(takesArguments(1))
-            .and(returns(named("org.apache.kafka.clients.consumer.ConsumerRecords"))),
-        packageName + ".RecordsAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(0, named("org.apache.kafka.clients.consumer.ConsumerConfig")))
+                        .and(takesArgument(1, named("org.apache.kafka.common.serialization.Deserializer")))
+                        .and(takesArgument(2, named("org.apache.kafka.common.serialization.Deserializer"))),
+                packageName + ".ConstructorAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("poll"))
+                        .and(takesArguments(1))
+                        .and(returns(named("org.apache.kafka.clients.consumer.ConsumerRecords"))),
+                packageName + ".RecordsAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java
index 70f3f6dbc92..838c4e8fb99 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java
@@ -20,77 +20,76 @@
 
 @AutoService(InstrumenterModule.class)
 public final class KafkaConsumerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public KafkaConsumerInstrumentation() {
-    super("kafka", "kafka-3.8");
-  }
+    public KafkaConsumerInstrumentation() {
+        super("kafka", "kafka-3.8");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>(2);
-    contextStores.put(
-        "org.apache.kafka.clients.Metadata",
-        "datadog.trace.instrumentation.kafka_common.MetadataState");
-    contextStores.put(
-        "org.apache.kafka.clients.consumer.ConsumerRecords",
-        "datadog.trace.instrumentation.kafka_clients38.KafkaConsumerInfo");
-    return Collections.unmodifiableMap(contextStores);
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>(2);
+        contextStores.put(
+                "org.apache.kafka.clients.Metadata", "datadog.trace.instrumentation.kafka_common.MetadataState");
+        contextStores.put(
+                "org.apache.kafka.clients.consumer.ConsumerRecords",
+                "datadog.trace.instrumentation.kafka_clients38.KafkaConsumerInfo");
+        return Collections.unmodifiableMap(contextStores);
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.kafka.clients.consumer.ConsumerRecords";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.kafka.clients.consumer.ConsumerRecords";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".TextMapInjectAdapterInterface",
-      packageName + ".KafkaConsumerInfo",
-      packageName + ".KafkaConsumerInstrumentationHelper",
-      packageName + ".KafkaDecorator",
-      packageName + ".TextMapExtractAdapter",
-      packageName + ".TracingIterableDelegator",
-      packageName + ".TracingIterable",
-      packageName + ".TracingIterator",
-      packageName + ".TracingList",
-      packageName + ".TracingListIterator",
-      packageName + ".TextMapInjectAdapter",
-      "datadog.trace.instrumentation.kafka_common.Utils",
-      "datadog.trace.instrumentation.kafka_common.StreamingContext",
-      "datadog.trace.instrumentation.kafka_common.PendingConfig",
-      "datadog.trace.instrumentation.kafka_common.MetadataState",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".TextMapInjectAdapterInterface",
+            packageName + ".KafkaConsumerInfo",
+            packageName + ".KafkaConsumerInstrumentationHelper",
+            packageName + ".KafkaDecorator",
+            packageName + ".TextMapExtractAdapter",
+            packageName + ".TracingIterableDelegator",
+            packageName + ".TracingIterable",
+            packageName + ".TracingIterator",
+            packageName + ".TracingList",
+            packageName + ".TracingListIterator",
+            packageName + ".TextMapInjectAdapter",
+            "datadog.trace.instrumentation.kafka_common.Utils",
+            "datadog.trace.instrumentation.kafka_common.StreamingContext",
+            "datadog.trace.instrumentation.kafka_common.PendingConfig",
+            "datadog.trace.instrumentation.kafka_common.MetadataState",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("records"))
-            .and(takesArgument(0, String.class))
-            .and(returns(Iterable.class)),
-        packageName + ".IterableAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("records"))
-            .and(takesArgument(0, named("org.apache.kafka.common.TopicPartition")))
-            .and(returns(List.class)),
-        packageName + ".ListAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("iterator"))
-            .and(takesArguments(0))
-            .and(returns(Iterator.class)),
-        packageName + ".IteratorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("records"))
+                        .and(takesArgument(0, String.class))
+                        .and(returns(Iterable.class)),
+                packageName + ".IterableAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("records"))
+                        .and(takesArgument(0, named("org.apache.kafka.common.TopicPartition")))
+                        .and(returns(List.class)),
+                packageName + ".ListAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("iterator"))
+                        .and(takesArguments(0))
+                        .and(returns(Iterator.class)),
+                packageName + ".IteratorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java
index 529ff7ebce8..ef7f0f56baf 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java
@@ -17,71 +17,70 @@
 
 @AutoService(InstrumenterModule.class)
 public final class KafkaProducerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public KafkaProducerInstrumentation() {
-    super("kafka", "kafka-3.8");
-  }
+    public KafkaProducerInstrumentation() {
+        super("kafka", "kafka-3.8");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.kafka.clients.producer.KafkaProducer";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.kafka.clients.producer.KafkaProducer";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".KafkaDecorator",
-      packageName + ".TextMapInjectAdapterInterface",
-      packageName + ".TextMapInjectAdapter",
-      packageName + ".TextMapExtractAdapter",
-      packageName + ".NoopTextMapInjectAdapter",
-      packageName + ".KafkaProducerCallback",
-      "datadog.trace.instrumentation.kafka_common.StreamingContext",
-      "datadog.trace.instrumentation.kafka_common.ClusterIdHolder",
-      "datadog.trace.instrumentation.kafka_common.Utils",
-      "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
-      "datadog.trace.instrumentation.kafka_common.PendingConfig",
-      "datadog.trace.instrumentation.kafka_common.MetadataState",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".KafkaDecorator",
+            packageName + ".TextMapInjectAdapterInterface",
+            packageName + ".TextMapInjectAdapter",
+            packageName + ".TextMapExtractAdapter",
+            packageName + ".NoopTextMapInjectAdapter",
+            packageName + ".KafkaProducerCallback",
+            "datadog.trace.instrumentation.kafka_common.StreamingContext",
+            "datadog.trace.instrumentation.kafka_common.ClusterIdHolder",
+            "datadog.trace.instrumentation.kafka_common.Utils",
+            "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
+            "datadog.trace.instrumentation.kafka_common.PendingConfig",
+            "datadog.trace.instrumentation.kafka_common.MetadataState",
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(
-        "org.apache.kafka.clients.Metadata",
-        "datadog.trace.instrumentation.kafka_common.MetadataState");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(
+                "org.apache.kafka.clients.Metadata", "datadog.trace.instrumentation.kafka_common.MetadataState");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(0, named("org.apache.kafka.clients.producer.ProducerConfig")))
-            .and(takesArgument(1, named("org.apache.kafka.common.serialization.Serializer")))
-            .and(takesArgument(2, named("org.apache.kafka.common.serialization.Serializer"))),
-        packageName + ".ProducerConstructorAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(0, named("org.apache.kafka.clients.producer.ProducerConfig")))
+                        .and(takesArgument(1, named("org.apache.kafka.common.serialization.Serializer")))
+                        .and(takesArgument(2, named("org.apache.kafka.common.serialization.Serializer"))),
+                packageName + ".ProducerConstructorAdvice");
 
-    transformer.applyAdvices(
-        isMethod()
-            .and(isPublic())
-            .and(named("send"))
-            .and(takesArgument(0, named("org.apache.kafka.clients.producer.ProducerRecord")))
-            .and(takesArgument(1, named("org.apache.kafka.clients.producer.Callback"))),
-        packageName + ".ProducerAdvice",
-        packageName + ".ProducerContextPropagationAdvice");
+        transformer.applyAdvices(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("send"))
+                        .and(takesArgument(0, named("org.apache.kafka.clients.producer.ProducerRecord")))
+                        .and(takesArgument(1, named("org.apache.kafka.clients.producer.Callback"))),
+                packageName + ".ProducerAdvice",
+                packageName + ".ProducerContextPropagationAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPrivate())
-            .and(takesArgument(0, int.class))
-            .and(named("ensureValidRecordSize")), // intercepting this call allows us to see the
-        // estimated message size
-        packageName + ".PayloadSizeAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPrivate())
+                        .and(takesArgument(0, int.class))
+                        .and(named("ensureValidRecordSize")), // intercepting this call allows us to see the
+                // estimated message size
+                packageName + ".PayloadSizeAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java
index dd36ff1d934..a1b217c6be6 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java
@@ -25,80 +25,74 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class LegacyKafkaConsumerInfoInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice,
-        Instrumenter.WithTypeStructure {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice, Instrumenter.WithTypeStructure {
 
-  public LegacyKafkaConsumerInfoInstrumentation() {
-    super("kafka", "kafka-3.8");
-  }
+    public LegacyKafkaConsumerInfoInstrumentation() {
+        super("kafka", "kafka-3.8");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>(4);
-    contextStores.put(
-        "org.apache.kafka.clients.Metadata",
-        "datadog.trace.instrumentation.kafka_common.MetadataState");
-    contextStores.put(
-        "org.apache.kafka.clients.consumer.ConsumerRecords", KafkaConsumerInfo.class.getName());
-    contextStores.put(
-        "org.apache.kafka.clients.consumer.internals.ConsumerCoordinator",
-        KafkaConsumerInfo.class.getName());
-    // new - we are storing the ConsumerDelegate instead of the KafkaConsumer
-    contextStores.put(
-        "org.apache.kafka.clients.consumer.internals.ConsumerDelegate",
-        KafkaConsumerInfo.class.getName());
-    return contextStores;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>(4);
+        contextStores.put(
+                "org.apache.kafka.clients.Metadata", "datadog.trace.instrumentation.kafka_common.MetadataState");
+        contextStores.put("org.apache.kafka.clients.consumer.ConsumerRecords", KafkaConsumerInfo.class.getName());
+        contextStores.put(
+                "org.apache.kafka.clients.consumer.internals.ConsumerCoordinator", KafkaConsumerInfo.class.getName());
+        // new - we are storing the ConsumerDelegate instead of the KafkaConsumer
+        contextStores.put(
+                "org.apache.kafka.clients.consumer.internals.ConsumerDelegate", KafkaConsumerInfo.class.getName());
+        return contextStores;
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.kafka.clients.consumer.internals.ConsumerDelegate";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.kafka.clients.consumer.internals.ConsumerDelegate";
+    }
 
-  // new - we are instrumenting the ConsumerDelegate class instead of the KafkaConsumer class
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    // new - we are instrumenting the ConsumerDelegate class instead of the KafkaConsumer class
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("coordinator"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("coordinator"));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".KafkaDecorator",
-      packageName + ".KafkaConsumerInfo",
-      packageName + ".KafkaConsumerInstrumentationHelper",
-      "datadog.trace.instrumentation.kafka_common.ClusterIdHolder",
-      "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
-      "datadog.trace.instrumentation.kafka_common.PendingConfig",
-      "datadog.trace.instrumentation.kafka_common.MetadataState",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".KafkaDecorator",
+            packageName + ".KafkaConsumerInfo",
+            packageName + ".KafkaConsumerInstrumentationHelper",
+            "datadog.trace.instrumentation.kafka_common.ClusterIdHolder",
+            "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
+            "datadog.trace.instrumentation.kafka_common.PendingConfig",
+            "datadog.trace.instrumentation.kafka_common.MetadataState",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(0, named("org.apache.kafka.clients.consumer.ConsumerConfig")))
-            .and(takesArgument(1, named("org.apache.kafka.common.serialization.Deserializer")))
-            .and(takesArgument(2, named("org.apache.kafka.common.serialization.Deserializer"))),
-        packageName + ".LegacyConstructorAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("poll"))
-            .and(takesArguments(1))
-            .and(returns(named("org.apache.kafka.clients.consumer.ConsumerRecords"))),
-        packageName + ".RecordsAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(0, named("org.apache.kafka.clients.consumer.ConsumerConfig")))
+                        .and(takesArgument(1, named("org.apache.kafka.common.serialization.Deserializer")))
+                        .and(takesArgument(2, named("org.apache.kafka.common.serialization.Deserializer"))),
+                packageName + ".LegacyConstructorAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("poll"))
+                        .and(takesArguments(1))
+                        .and(returns(named("org.apache.kafka.clients.consumer.ConsumerRecords"))),
+                packageName + ".RecordsAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MessageListenerInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MessageListenerInstrumentation.java
index da17835a1a2..034e5ed54e0 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MessageListenerInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MessageListenerInstrumentation.java
@@ -14,36 +14,36 @@
 
 @AutoService(InstrumenterModule.class)
 public class MessageListenerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public MessageListenerInstrumentation() {
-    super("kafka", "kafka-3.8");
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return InstrumenterConfig.get().isCodeOriginEnabled() && super.isEnabled();
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.kafka.listener.MessageListener";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("onMessage")),
-        datadog.trace.instrumentation.codeorigin.EntrySpanOriginAdvice.class.getName());
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public MessageListenerInstrumentation() {
+        super("kafka", "kafka-3.8");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return InstrumenterConfig.get().isCodeOriginEnabled() && super.isEnabled();
+    }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.kafka.listener.MessageListener";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("onMessage")),
+                datadog.trace.instrumentation.codeorigin.EntrySpanOriginAdvice.class.getName());
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java
index 7d2d2b9ca61..3b1e12fe577 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java
@@ -16,54 +16,51 @@
 
 @AutoService(InstrumenterModule.class)
 public class MetadataInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public MetadataInstrumentation() {
-    super("kafka", "kafka-3.8");
-  }
+    public MetadataInstrumentation() {
+        super("kafka", "kafka-3.8");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.kafka.clients.Metadata";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.kafka.clients.Metadata";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
-      "datadog.trace.instrumentation.kafka_common.PendingConfig",
-      "datadog.trace.instrumentation.kafka_common.MetadataState",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
+            "datadog.trace.instrumentation.kafka_common.PendingConfig",
+            "datadog.trace.instrumentation.kafka_common.MetadataState",
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(
-        "org.apache.kafka.clients.Metadata",
-        "datadog.trace.instrumentation.kafka_common.MetadataState");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(
+                "org.apache.kafka.clients.Metadata", "datadog.trace.instrumentation.kafka_common.MetadataState");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("update"))
-            .and(takesArgument(0, named("org.apache.kafka.common.Cluster"))),
-        packageName + ".MetadataUpdateBefore22Advice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("update"))
-            .and(takesArgument(1, named("org.apache.kafka.common.requests.MetadataResponse"))),
-        packageName + ".MetadataUpdate22AndAfterAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("update")).and(takesArgument(0, named("org.apache.kafka.common.Cluster"))),
+                packageName + ".MetadataUpdateBefore22Advice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("update"))
+                        .and(takesArgument(1, named("org.apache.kafka.common.requests.MetadataResponse"))),
+                packageName + ".MetadataUpdate22AndAfterAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java
index e64beeb1ebd..f934858e4b3 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java
@@ -11,25 +11,25 @@
 // new - this instrumentation is completely new.
 // the purpose of this class is to provide us with information on consumer group and cluster ID
 public class OffsetCommitCallbackInvokerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public OffsetCommitCallbackInvokerInstrumentation() {
-    super("kafka", "kafka-3.8");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public OffsetCommitCallbackInvokerInstrumentation() {
+        super("kafka", "kafka-3.8");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.kafka.clients.consumer.internals.OffsetCommitCallbackInvoker";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.kafka.clients.consumer.internals.OffsetCommitCallbackInvoker";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("enqueueUserCallbackInvocation")),
-        packageName + ".OffsetCommitCallbackInvokerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("enqueueUserCallbackInvocation")),
+                packageName + ".OffsetCommitCallbackInvokerAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ConstructorAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ConstructorAdvice.java
index 085fb7ba866..a2d36e53c27 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ConstructorAdvice.java
@@ -14,60 +14,55 @@
 import org.apache.kafka.clients.consumer.internals.OffsetCommitCallbackInvoker;
 
 public class ConstructorAdvice {
-  // new - capturing OffsetCommitCallbackInvoker instead of the old ConsumerCoordinator
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void captureGroup(
-      @Advice.This ConsumerDelegate consumer,
-      @Advice.Argument(0) ConsumerConfig consumerConfig,
-      @Advice.FieldValue("offsetCommitCallbackInvoker")
-          OffsetCommitCallbackInvoker offsetCommitCallbackInvoker,
-      @Advice.FieldValue("metadata") Metadata metadata) {
-    ConsumerGroupMetadata groupMetadata = consumer.groupMetadata();
-    String consumerGroup = consumerConfig.getString(ConsumerConfig.GROUP_ID_CONFIG);
-    String normalizedConsumerGroup =
-        consumerGroup != null && !consumerGroup.isEmpty() ? consumerGroup : null;
-    if (normalizedConsumerGroup == null) {
-      if (groupMetadata != null) {
-        normalizedConsumerGroup = groupMetadata.groupId();
-      }
-    }
-    List<String> bootstrapServersList =
-        consumerConfig.getList(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG);
-    String bootstrapServers = null;
-    if (bootstrapServersList != null && !bootstrapServersList.isEmpty()) {
-      bootstrapServers = String.join(",", bootstrapServersList);
-    }
-    KafkaConsumerInfo kafkaConsumerInfo;
-    if (Config.get().isDataStreamsEnabled()) {
-      kafkaConsumerInfo =
-          new KafkaConsumerInfo(normalizedConsumerGroup, metadata, bootstrapServers);
-    } else {
-      kafkaConsumerInfo = new KafkaConsumerInfo(normalizedConsumerGroup, bootstrapServers);
-    }
-    // new - searching context for ConsumerDelegate and OffsetCommitCallbackInvoker instead of
-    // ConsumerCoordinator and KafkaConsumer
-    if (kafkaConsumerInfo.getConsumerGroup().isPresent()
-        || kafkaConsumerInfo.getmetadata().isPresent()) {
-      InstrumentationContext.get(ConsumerDelegate.class, KafkaConsumerInfo.class)
-          .put(consumer, kafkaConsumerInfo);
-    }
-    if (offsetCommitCallbackInvoker != null) {
-      InstrumentationContext.get(OffsetCommitCallbackInvoker.class, KafkaConsumerInfo.class)
-          .put(offsetCommitCallbackInvoker, kafkaConsumerInfo);
-    }
+    // new - capturing OffsetCommitCallbackInvoker instead of the old ConsumerCoordinator
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void captureGroup(
+            @Advice.This ConsumerDelegate consumer,
+            @Advice.Argument(0) ConsumerConfig consumerConfig,
+            @Advice.FieldValue("offsetCommitCallbackInvoker") OffsetCommitCallbackInvoker offsetCommitCallbackInvoker,
+            @Advice.FieldValue("metadata") Metadata metadata) {
+        ConsumerGroupMetadata groupMetadata = consumer.groupMetadata();
+        String consumerGroup = consumerConfig.getString(ConsumerConfig.GROUP_ID_CONFIG);
+        String normalizedConsumerGroup = consumerGroup != null && !consumerGroup.isEmpty() ? consumerGroup : null;
+        if (normalizedConsumerGroup == null) {
+            if (groupMetadata != null) {
+                normalizedConsumerGroup = groupMetadata.groupId();
+            }
+        }
+        List<String> bootstrapServersList = consumerConfig.getList(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG);
+        String bootstrapServers = null;
+        if (bootstrapServersList != null && !bootstrapServersList.isEmpty()) {
+            bootstrapServers = String.join(",", bootstrapServersList);
+        }
+        KafkaConsumerInfo kafkaConsumerInfo;
+        if (Config.get().isDataStreamsEnabled()) {
+            kafkaConsumerInfo = new KafkaConsumerInfo(normalizedConsumerGroup, metadata, bootstrapServers);
+        } else {
+            kafkaConsumerInfo = new KafkaConsumerInfo(normalizedConsumerGroup, bootstrapServers);
+        }
+        // new - searching context for ConsumerDelegate and OffsetCommitCallbackInvoker instead of
+        // ConsumerCoordinator and KafkaConsumer
+        if (kafkaConsumerInfo.getConsumerGroup().isPresent()
+                || kafkaConsumerInfo.getmetadata().isPresent()) {
+            InstrumentationContext.get(ConsumerDelegate.class, KafkaConsumerInfo.class)
+                    .put(consumer, kafkaConsumerInfo);
+        }
+        if (offsetCommitCallbackInvoker != null) {
+            InstrumentationContext.get(OffsetCommitCallbackInvoker.class, KafkaConsumerInfo.class)
+                    .put(offsetCommitCallbackInvoker, kafkaConsumerInfo);
+        }
 
-    if (Config.get().isDataStreamsEnabled()) {
-      MetadataState state =
-          InstrumentationContext.get(Metadata.class, MetadataState.class)
-              .getOrCreate(metadata, MetadataState::new);
-      KafkaConfigHelper.storePendingConsumerConfig(
-          state, normalizedConsumerGroup, KafkaConfigHelper.extractConsumerConfig(consumerConfig));
+        if (Config.get().isDataStreamsEnabled()) {
+            MetadataState state = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                    .getOrCreate(metadata, MetadataState::new);
+            KafkaConfigHelper.storePendingConsumerConfig(
+                    state, normalizedConsumerGroup, KafkaConfigHelper.extractConsumerConfig(consumerConfig));
+        }
     }
-  }
 
-  public static void muzzleCheck(ConsumerRecord record) {
-    // KafkaConsumerInstrumentation only applies for kafka versions with headers
-    // Make an explicit call so KafkaConsumerGroupInstrumentation does the same
-    record.headers();
-  }
+    public static void muzzleCheck(ConsumerRecord record) {
+        // KafkaConsumerInstrumentation only applies for kafka versions with headers
+        // Make an explicit call so KafkaConsumerGroupInstrumentation does the same
+        record.headers();
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorAdvice.java
index 075590d2206..9f2c61c1277 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorAdvice.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorAdvice.java
@@ -14,55 +14,56 @@
 import org.apache.kafka.common.TopicPartition;
 
 public class ConsumerCoordinatorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void trackCommitOffset(
-      @Advice.This ConsumerCoordinator coordinator,
-      @Advice.Return RequestFuture<Void> requestFuture,
-      @Advice.Argument(0) final Map<TopicPartition, OffsetAndMetadata> offsets) {
-    if (requestFuture == null || requestFuture.failed()) {
-      return;
-    }
-    if (offsets == null) {
-      return;
-    }
-    KafkaConsumerInfo kafkaConsumerInfo =
-        InstrumentationContext.get(ConsumerCoordinator.class, KafkaConsumerInfo.class)
-            .get(coordinator);
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void trackCommitOffset(
+            @Advice.This ConsumerCoordinator coordinator,
+            @Advice.Return RequestFuture<Void> requestFuture,
+            @Advice.Argument(0) final Map<TopicPartition, OffsetAndMetadata> offsets) {
+        if (requestFuture == null || requestFuture.failed()) {
+            return;
+        }
+        if (offsets == null) {
+            return;
+        }
+        KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(
+                        ConsumerCoordinator.class, KafkaConsumerInfo.class)
+                .get(coordinator);
 
-    if (kafkaConsumerInfo == null) {
-      return;
-    }
+        if (kafkaConsumerInfo == null) {
+            return;
+        }
 
-    String consumerGroup = kafkaConsumerInfo.getConsumerGroup().orElse(null);
-    Metadata consumerMetadata = kafkaConsumerInfo.getmetadata().orElse(null);
-    String clusterId = null;
-    if (consumerMetadata != null) {
-      MetadataState metadataState =
-          InstrumentationContext.get(Metadata.class, MetadataState.class).get(consumerMetadata);
-      clusterId = metadataState != null ? metadataState.clusterId : null;
-    }
+        String consumerGroup = kafkaConsumerInfo.getConsumerGroup().orElse(null);
+        Metadata consumerMetadata = kafkaConsumerInfo.getmetadata().orElse(null);
+        String clusterId = null;
+        if (consumerMetadata != null) {
+            MetadataState metadataState = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                    .get(consumerMetadata);
+            clusterId = metadataState != null ? metadataState.clusterId : null;
+        }
 
-    for (Map.Entry<TopicPartition, OffsetAndMetadata> entry : offsets.entrySet()) {
-      if (consumerGroup == null) {
-        consumerGroup = "";
-      }
-      if (entry.getKey() == null || entry.getValue() == null) {
-        continue;
-      }
-      DataStreamsTags tags =
-          DataStreamsTags.createWithPartition(
-              "kafka_commit",
-              entry.getKey().topic(),
-              String.valueOf(entry.getKey().partition()),
-              clusterId,
-              consumerGroup);
-      AgentTracer.get().getDataStreamsMonitoring().trackBacklog(tags, entry.getValue().offset());
+        for (Map.Entry<TopicPartition, OffsetAndMetadata> entry : offsets.entrySet()) {
+            if (consumerGroup == null) {
+                consumerGroup = "";
+            }
+            if (entry.getKey() == null || entry.getValue() == null) {
+                continue;
+            }
+            DataStreamsTags tags = DataStreamsTags.createWithPartition(
+                    "kafka_commit",
+                    entry.getKey().topic(),
+                    String.valueOf(entry.getKey().partition()),
+                    clusterId,
+                    consumerGroup);
+            AgentTracer.get()
+                    .getDataStreamsMonitoring()
+                    .trackBacklog(tags, entry.getValue().offset());
+        }
     }
-  }
 
-  public static void muzzleCheck(ConsumerRecord record) {
-    // KafkaConsumerInstrumentation only applies for kafka versions with headers
-    // Make an explicit call so ConsumerCoordinatorInstrumentation does the same
-    record.headers();
-  }
+    public static void muzzleCheck(ConsumerRecord record) {
+        // KafkaConsumerInstrumentation only applies for kafka versions with headers
+        // Make an explicit call so ConsumerCoordinatorInstrumentation does the same
+        record.headers();
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/DDOffsetCommitCallback.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/DDOffsetCommitCallback.java
index c1eeb0141d0..33e1bf5372c 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/DDOffsetCommitCallback.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/DDOffsetCommitCallback.java
@@ -11,45 +11,45 @@
 import org.apache.kafka.common.TopicPartition;
 
 public class DDOffsetCommitCallback implements OffsetCommitCallback {
-  OffsetCommitCallback callback;
-  KafkaConsumerInfo kafkaConsumerInfo;
+    OffsetCommitCallback callback;
+    KafkaConsumerInfo kafkaConsumerInfo;
 
-  public DDOffsetCommitCallback(
-      OffsetCommitCallback callback, KafkaConsumerInfo kafkaConsumerInfo) {
-    this.callback = callback;
-    this.kafkaConsumerInfo = kafkaConsumerInfo;
-  }
-
-  @Override
-  public void onComplete(Map<TopicPartition, OffsetAndMetadata> map, Exception e) {
-    if (callback != null) {
-      callback.onComplete(map, e);
+    public DDOffsetCommitCallback(OffsetCommitCallback callback, KafkaConsumerInfo kafkaConsumerInfo) {
+        this.callback = callback;
+        this.kafkaConsumerInfo = kafkaConsumerInfo;
     }
-    for (Map.Entry<TopicPartition, OffsetAndMetadata> entry : map.entrySet()) {
-      if (entry.getKey() == null || entry.getValue() == null) {
-        continue;
-      }
-      String consumerGroup = null;
-      String clusterId = null;
 
-      if (kafkaConsumerInfo != null) {
-        consumerGroup = kafkaConsumerInfo.getConsumerGroup().orElse(null);
-        Metadata consumerMetadata = kafkaConsumerInfo.getmetadata().orElse(null);
-        if (consumerMetadata != null) {
-          MetadataState metadataState =
-              InstrumentationContext.get(Metadata.class, MetadataState.class).get(consumerMetadata);
-          clusterId = metadataState != null ? metadataState.clusterId : null;
+    @Override
+    public void onComplete(Map<TopicPartition, OffsetAndMetadata> map, Exception e) {
+        if (callback != null) {
+            callback.onComplete(map, e);
         }
-      }
+        for (Map.Entry<TopicPartition, OffsetAndMetadata> entry : map.entrySet()) {
+            if (entry.getKey() == null || entry.getValue() == null) {
+                continue;
+            }
+            String consumerGroup = null;
+            String clusterId = null;
+
+            if (kafkaConsumerInfo != null) {
+                consumerGroup = kafkaConsumerInfo.getConsumerGroup().orElse(null);
+                Metadata consumerMetadata = kafkaConsumerInfo.getmetadata().orElse(null);
+                if (consumerMetadata != null) {
+                    MetadataState metadataState = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                            .get(consumerMetadata);
+                    clusterId = metadataState != null ? metadataState.clusterId : null;
+                }
+            }
 
-      DataStreamsTags tags =
-          DataStreamsTags.createWithPartition(
-              "kafka_commit",
-              entry.getKey().topic(),
-              String.valueOf(entry.getKey().partition()),
-              clusterId,
-              consumerGroup);
-      AgentTracer.get().getDataStreamsMonitoring().trackBacklog(tags, entry.getValue().offset());
+            DataStreamsTags tags = DataStreamsTags.createWithPartition(
+                    "kafka_commit",
+                    entry.getKey().topic(),
+                    String.valueOf(entry.getKey().partition()),
+                    clusterId,
+                    consumerGroup);
+            AgentTracer.get()
+                    .getDataStreamsMonitoring()
+                    .trackBacklog(tags, entry.getValue().offset());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/IterableAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/IterableAdvice.java
index c6cc52a3d9e..ae688fc903a 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/IterableAdvice.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/IterableAdvice.java
@@ -9,27 +9,25 @@
 
 public class IterableAdvice {
 
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void wrap(
-      @Advice.Return(readOnly = false) Iterable<ConsumerRecord<?, ?>> iterable,
-      @Advice.This ConsumerRecords records) {
-    if (iterable != null) {
-      KafkaConsumerInfo kafkaConsumerInfo =
-          InstrumentationContext.get(ConsumerRecords.class, KafkaConsumerInfo.class).get(records);
-      String group = KafkaConsumerInstrumentationHelper.extractGroup(kafkaConsumerInfo);
-      String clusterId =
-          KafkaConsumerInstrumentationHelper.extractClusterId(
-              kafkaConsumerInfo, InstrumentationContext.get(Metadata.class, MetadataState.class));
-      String bootstrapServers =
-          KafkaConsumerInstrumentationHelper.extractBootstrapServers(kafkaConsumerInfo);
-      iterable =
-          new TracingIterable(
-              iterable,
-              KafkaDecorator.KAFKA_CONSUME,
-              KafkaDecorator.CONSUMER_DECORATE,
-              group,
-              clusterId,
-              bootstrapServers);
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void wrap(
+            @Advice.Return(readOnly = false) Iterable<ConsumerRecord<?, ?>> iterable,
+            @Advice.This ConsumerRecords records) {
+        if (iterable != null) {
+            KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(
+                            ConsumerRecords.class, KafkaConsumerInfo.class)
+                    .get(records);
+            String group = KafkaConsumerInstrumentationHelper.extractGroup(kafkaConsumerInfo);
+            String clusterId = KafkaConsumerInstrumentationHelper.extractClusterId(
+                    kafkaConsumerInfo, InstrumentationContext.get(Metadata.class, MetadataState.class));
+            String bootstrapServers = KafkaConsumerInstrumentationHelper.extractBootstrapServers(kafkaConsumerInfo);
+            iterable = new TracingIterable(
+                    iterable,
+                    KafkaDecorator.KAFKA_CONSUME,
+                    KafkaDecorator.CONSUMER_DECORATE,
+                    group,
+                    clusterId,
+                    bootstrapServers);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/IteratorAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/IteratorAdvice.java
index 39859c20e19..74f771c1878 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/IteratorAdvice.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/IteratorAdvice.java
@@ -10,27 +10,25 @@
 
 public class IteratorAdvice {
 
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void wrap(
-      @Advice.Return(readOnly = false) Iterator<ConsumerRecord<?, ?>> iterator,
-      @Advice.This ConsumerRecords records) {
-    if (iterator != null) {
-      KafkaConsumerInfo kafkaConsumerInfo =
-          InstrumentationContext.get(ConsumerRecords.class, KafkaConsumerInfo.class).get(records);
-      String group = KafkaConsumerInstrumentationHelper.extractGroup(kafkaConsumerInfo);
-      String clusterId =
-          KafkaConsumerInstrumentationHelper.extractClusterId(
-              kafkaConsumerInfo, InstrumentationContext.get(Metadata.class, MetadataState.class));
-      String bootstrapServers =
-          KafkaConsumerInstrumentationHelper.extractBootstrapServers(kafkaConsumerInfo);
-      iterator =
-          new TracingIterator(
-              iterator,
-              KafkaDecorator.KAFKA_CONSUME,
-              KafkaDecorator.CONSUMER_DECORATE,
-              group,
-              clusterId,
-              bootstrapServers);
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void wrap(
+            @Advice.Return(readOnly = false) Iterator<ConsumerRecord<?, ?>> iterator,
+            @Advice.This ConsumerRecords records) {
+        if (iterator != null) {
+            KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(
+                            ConsumerRecords.class, KafkaConsumerInfo.class)
+                    .get(records);
+            String group = KafkaConsumerInstrumentationHelper.extractGroup(kafkaConsumerInfo);
+            String clusterId = KafkaConsumerInstrumentationHelper.extractClusterId(
+                    kafkaConsumerInfo, InstrumentationContext.get(Metadata.class, MetadataState.class));
+            String bootstrapServers = KafkaConsumerInstrumentationHelper.extractBootstrapServers(kafkaConsumerInfo);
+            iterator = new TracingIterator(
+                    iterator,
+                    KafkaDecorator.KAFKA_CONSUME,
+                    KafkaDecorator.CONSUMER_DECORATE,
+                    group,
+                    clusterId,
+                    bootstrapServers);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/JoinGroupAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/JoinGroupAdvice.java
index 41a3ed170be..5e21b348191 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/JoinGroupAdvice.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/JoinGroupAdvice.java
@@ -9,40 +9,40 @@
 import org.apache.kafka.clients.consumer.internals.ConsumerCoordinator;
 
 public class JoinGroupAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void trackJoinGroup(
-      @Advice.This ConsumerCoordinator coordinator,
-      @Advice.Argument(0) final int generationId,
-      @Advice.Argument(1) final String memberId,
-      @Advice.Argument(2) final String memberProtocol) {
-    if (memberId == null || memberId.isEmpty()) {
-      return;
-    }
-    KafkaConsumerInfo kafkaConsumerInfo =
-        InstrumentationContext.get(ConsumerCoordinator.class, KafkaConsumerInfo.class)
-            .get(coordinator);
-    if (kafkaConsumerInfo == null) {
-      return;
-    }
-    if (!kafkaConsumerInfo.hasMembershipChanged(memberId, generationId)) {
-      return;
-    }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void trackJoinGroup(
+            @Advice.This ConsumerCoordinator coordinator,
+            @Advice.Argument(0) final int generationId,
+            @Advice.Argument(1) final String memberId,
+            @Advice.Argument(2) final String memberProtocol) {
+        if (memberId == null || memberId.isEmpty()) {
+            return;
+        }
+        KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(
+                        ConsumerCoordinator.class, KafkaConsumerInfo.class)
+                .get(coordinator);
+        if (kafkaConsumerInfo == null) {
+            return;
+        }
+        if (!kafkaConsumerInfo.hasMembershipChanged(memberId, generationId)) {
+            return;
+        }
 
-    String consumerGroup = kafkaConsumerInfo.getConsumerGroup().orElse(null);
-    Metadata consumerMetadata = kafkaConsumerInfo.getmetadata().orElse(null);
-    String clusterId = null;
-    if (consumerMetadata != null) {
-      MetadataState metadataState =
-          InstrumentationContext.get(Metadata.class, MetadataState.class).get(consumerMetadata);
-      clusterId = metadataState != null ? metadataState.clusterId : null;
+        String consumerGroup = kafkaConsumerInfo.getConsumerGroup().orElse(null);
+        Metadata consumerMetadata = kafkaConsumerInfo.getmetadata().orElse(null);
+        String clusterId = null;
+        if (consumerMetadata != null) {
+            MetadataState metadataState = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                    .get(consumerMetadata);
+            clusterId = metadataState != null ? metadataState.clusterId : null;
+        }
+        if (KafkaConfigHelper.reportConsumerGroupMember(
+                clusterId, consumerGroup, memberId, generationId, memberProtocol)) {
+            kafkaConsumerInfo.setLastReportedMembership(memberId, generationId);
+        }
     }
-    if (KafkaConfigHelper.reportConsumerGroupMember(
-        clusterId, consumerGroup, memberId, generationId, memberProtocol)) {
-      kafkaConsumerInfo.setLastReportedMembership(memberId, generationId);
-    }
-  }
 
-  public static void muzzleCheck(ConsumerRecord record) {
-    record.headers();
-  }
+    public static void muzzleCheck(ConsumerRecord record) {
+        record.headers();
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfo.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfo.java
index 8b6f78cd672..bb980a3d2a7 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfo.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfo.java
@@ -5,58 +5,57 @@
 import org.apache.kafka.clients.Metadata;
 
 public class KafkaConsumerInfo {
-  private final String consumerGroup;
-  private final Metadata metadata;
-  private final String bootstrapServers;
-  private volatile String lastReportedMemberId;
-  private volatile int lastReportedGenerationId = Integer.MIN_VALUE;
-
-  public KafkaConsumerInfo(String consumerGroup, Metadata metadata, String bootstrapServers) {
-    this.consumerGroup = consumerGroup;
-    this.metadata = metadata;
-    this.bootstrapServers = bootstrapServers;
-  }
-
-  public KafkaConsumerInfo(String consumerGroup, String bootstrapServers) {
-    this.consumerGroup = consumerGroup;
-    this.metadata = null;
-    this.bootstrapServers = bootstrapServers;
-  }
-
-  public Optional<String> getConsumerGroup() {
-    return Optional.ofNullable(consumerGroup);
-  }
-
-  public Optional<Metadata> getmetadata() {
-    return Optional.ofNullable(metadata);
-  }
-
-  public Optional<String> getBootstrapServers() {
-    return Optional.ofNullable(bootstrapServers);
-  }
-
-  public boolean hasMembershipChanged(String memberId, int generationId) {
-    return !Objects.equals(memberId, lastReportedMemberId)
-        || generationId != lastReportedGenerationId;
-  }
-
-  public void setLastReportedMembership(String memberId, int generationId) {
-    this.lastReportedMemberId = memberId;
-    this.lastReportedGenerationId = generationId;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    KafkaConsumerInfo consumerInfo = (KafkaConsumerInfo) o;
-    return Objects.equals(consumerGroup, consumerInfo.consumerGroup)
-        && Objects.equals(metadata, consumerInfo.metadata);
-  }
-
-  @Override
-  public int hashCode() {
-    return 31 * (null == consumerGroup ? 0 : consumerGroup.hashCode())
-        + (null == metadata ? 0 : metadata.hashCode());
-  }
+    private final String consumerGroup;
+    private final Metadata metadata;
+    private final String bootstrapServers;
+    private volatile String lastReportedMemberId;
+    private volatile int lastReportedGenerationId = Integer.MIN_VALUE;
+
+    public KafkaConsumerInfo(String consumerGroup, Metadata metadata, String bootstrapServers) {
+        this.consumerGroup = consumerGroup;
+        this.metadata = metadata;
+        this.bootstrapServers = bootstrapServers;
+    }
+
+    public KafkaConsumerInfo(String consumerGroup, String bootstrapServers) {
+        this.consumerGroup = consumerGroup;
+        this.metadata = null;
+        this.bootstrapServers = bootstrapServers;
+    }
+
+    public Optional<String> getConsumerGroup() {
+        return Optional.ofNullable(consumerGroup);
+    }
+
+    public Optional<Metadata> getmetadata() {
+        return Optional.ofNullable(metadata);
+    }
+
+    public Optional<String> getBootstrapServers() {
+        return Optional.ofNullable(bootstrapServers);
+    }
+
+    public boolean hasMembershipChanged(String memberId, int generationId) {
+        return !Objects.equals(memberId, lastReportedMemberId) || generationId != lastReportedGenerationId;
+    }
+
+    public void setLastReportedMembership(String memberId, int generationId) {
+        this.lastReportedMemberId = memberId;
+        this.lastReportedGenerationId = generationId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        KafkaConsumerInfo consumerInfo = (KafkaConsumerInfo) o;
+        return Objects.equals(consumerGroup, consumerInfo.consumerGroup)
+                && Objects.equals(metadata, consumerInfo.metadata);
+    }
+
+    @Override
+    public int hashCode() {
+        return 31 * (null == consumerGroup ? 0 : consumerGroup.hashCode())
+                + (null == metadata ? 0 : metadata.hashCode());
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentationHelper.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentationHelper.java
index 57e0baa7edd..334d5beee3f 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentationHelper.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentationHelper.java
@@ -6,27 +6,28 @@
 import org.apache.kafka.clients.Metadata;
 
 public class KafkaConsumerInstrumentationHelper {
-  public static String extractGroup(KafkaConsumerInfo kafkaConsumerInfo) {
-    if (kafkaConsumerInfo != null) {
-      return kafkaConsumerInfo.getConsumerGroup().orElse(null);
+    public static String extractGroup(KafkaConsumerInfo kafkaConsumerInfo) {
+        if (kafkaConsumerInfo != null) {
+            return kafkaConsumerInfo.getConsumerGroup().orElse(null);
+        }
+        return null;
     }
-    return null;
-  }
 
-  public static String extractClusterId(
-      KafkaConsumerInfo kafkaConsumerInfo,
-      ContextStore<Metadata, MetadataState> metadataContextStore) {
-    if (kafkaConsumerInfo != null) {
-      Optional<Metadata> metadata = kafkaConsumerInfo.getmetadata();
-      if (metadata.isPresent()) {
-        MetadataState state = metadataContextStore.get(metadata.get());
-        return state != null ? state.clusterId : null;
-      }
+    public static String extractClusterId(
+            KafkaConsumerInfo kafkaConsumerInfo, ContextStore<Metadata, MetadataState> metadataContextStore) {
+        if (kafkaConsumerInfo != null) {
+            Optional<Metadata> metadata = kafkaConsumerInfo.getmetadata();
+            if (metadata.isPresent()) {
+                MetadataState state = metadataContextStore.get(metadata.get());
+                return state != null ? state.clusterId : null;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  public static String extractBootstrapServers(KafkaConsumerInfo kafkaConsumerInfo) {
-    return kafkaConsumerInfo == null ? null : kafkaConsumerInfo.getBootstrapServers().orElse(null);
-  }
+    public static String extractBootstrapServers(KafkaConsumerInfo kafkaConsumerInfo) {
+        return kafkaConsumerInfo == null
+                ? null
+                : kafkaConsumerInfo.getBootstrapServers().orElse(null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaDecorator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaDecorator.java
index d2d6f53b8a9..1833bc52d8e 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaDecorator.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaDecorator.java
@@ -28,154 +28,140 @@
 import org.apache.kafka.common.record.TimestampType;
 
 public class KafkaDecorator extends MessagingClientDecorator {
-  private static final String KAFKA = "kafka";
-  public static final CharSequence JAVA_KAFKA = UTF8BytesString.create("java-kafka");
-  public static final CharSequence KAFKA_CONSUME =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().messaging().inboundOperation(KAFKA));
-
-  public static final CharSequence KAFKA_POLL = UTF8BytesString.create("kafka.poll");
-  public static final CharSequence KAFKA_PRODUCE =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().messaging().outboundOperation(KAFKA));
-  public static final CharSequence KAFKA_DELIVER = UTF8BytesString.create("kafka.deliver");
-  public static final boolean KAFKA_LEGACY_TRACING = Config.get().isKafkaLegacyTracingEnabled();
-  public static final boolean TIME_IN_QUEUE_ENABLED =
-      Config.get().isTimeInQueueEnabled(!KAFKA_LEGACY_TRACING, KAFKA);
-  public static final String KAFKA_PRODUCED_KEY = "x_datadog_kafka_produced";
-  private final String spanKind;
-  private final CharSequence spanType;
-  private final Supplier<String> serviceNameSupplier;
-
-  private static final DDCache<CharSequence, CharSequence> PRODUCER_RESOURCE_NAME_CACHE =
-      DDCaches.newFixedSizeCache(32);
-  private static final Functions.Prefix PRODUCER_PREFIX = new Functions.Prefix("Produce Topic ");
-  private static final DDCache<CharSequence, CharSequence> CONSUMER_RESOURCE_NAME_CACHE =
-      DDCaches.newFixedSizeCache(32);
-  private static final DDCache<ProducerConfig, CharSequence> PRODUCER_BOOSTRAP_SERVERS_CACHE =
-      DDCaches.newFixedSizeWeakKeyCache(16);
-  private static final Function<ProducerConfig, CharSequence> BOOTSTRAP_SERVERS_JOINER =
-      pc -> String.join(",", pc.getList(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG));
-  private static final Functions.Prefix CONSUMER_PREFIX = new Functions.Prefix("Consume Topic ");
-
-  public static final KafkaDecorator PRODUCER_DECORATE =
-      new KafkaDecorator(
-          Tags.SPAN_KIND_PRODUCER,
-          InternalSpanTypes.MESSAGE_PRODUCER,
-          SpanNaming.instance()
-              .namingSchema()
-              .messaging()
-              .outboundService(KAFKA, KAFKA_LEGACY_TRACING));
-
-  public static final KafkaDecorator CONSUMER_DECORATE =
-      new KafkaDecorator(
-          Tags.SPAN_KIND_CONSUMER,
-          InternalSpanTypes.MESSAGE_CONSUMER,
-          SpanNaming.instance()
-              .namingSchema()
-              .messaging()
-              .inboundService(KAFKA, KAFKA_LEGACY_TRACING));
-
-  public static final KafkaDecorator BROKER_DECORATE =
-      new KafkaDecorator(
-          Tags.SPAN_KIND_BROKER,
-          InternalSpanTypes.MESSAGE_BROKER,
-          SpanNaming.instance().namingSchema().messaging().timeInQueueService(KAFKA));
-
-  protected KafkaDecorator(
-      String spanKind, CharSequence spanType, Supplier<String> serviceNameSupplier) {
-    this.spanKind = spanKind;
-    this.spanType = spanType;
-    this.serviceNameSupplier = serviceNameSupplier;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return spanType;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"kafka"};
-  }
-
-  @Override
-  protected String service() {
-    return serviceNameSupplier.get();
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JAVA_KAFKA;
-  }
-
-  @Override
-  protected String spanKind() {
-    return spanKind;
-  }
-
-  public void onConsume(
-      final AgentSpan span,
-      final ConsumerRecord record,
-      String consumerGroup,
-      String clusterId,
-      String bootstrapServers) {
-    if (record != null) {
-      final String topic = record.topic() == null ? "kafka" : record.topic();
-      span.setResourceName(CONSUMER_RESOURCE_NAME_CACHE.computeIfAbsent(topic, CONSUMER_PREFIX));
-      span.setTag(PARTITION, record.partition());
-      span.setTag(OFFSET, record.offset());
-      span.setTag(MESSAGING_DESTINATION_NAME, topic);
-      if (consumerGroup != null) {
-        span.setTag(CONSUMER_GROUP, consumerGroup);
-      }
-      if (clusterId != null) {
-        span.setTag(KAFKA_CLUSTER_ID, clusterId);
-      }
-      if (bootstrapServers != null) {
-        span.setTag(KAFKA_BOOTSTRAP_SERVERS, bootstrapServers);
-      }
-      // TODO - do we really need both? This mechanism already adds a lot of... baggage.
-      // check to not record a duration if the message was sent from an old Kafka client
-      if (record.timestampType() != TimestampType.NO_TIMESTAMP_TYPE) {
-        long consumeTime = NANOSECONDS.toMillis(span.getStartTime());
-        final long produceTime = record.timestamp();
-        span.setTag(RECORD_QUEUE_TIME_MS, Math.max(0L, consumeTime - produceTime));
-      }
+    private static final String KAFKA = "kafka";
+    public static final CharSequence JAVA_KAFKA = UTF8BytesString.create("java-kafka");
+    public static final CharSequence KAFKA_CONSUME = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().messaging().inboundOperation(KAFKA));
+
+    public static final CharSequence KAFKA_POLL = UTF8BytesString.create("kafka.poll");
+    public static final CharSequence KAFKA_PRODUCE = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().messaging().outboundOperation(KAFKA));
+    public static final CharSequence KAFKA_DELIVER = UTF8BytesString.create("kafka.deliver");
+    public static final boolean KAFKA_LEGACY_TRACING = Config.get().isKafkaLegacyTracingEnabled();
+    public static final boolean TIME_IN_QUEUE_ENABLED = Config.get().isTimeInQueueEnabled(!KAFKA_LEGACY_TRACING, KAFKA);
+    public static final String KAFKA_PRODUCED_KEY = "x_datadog_kafka_produced";
+    private final String spanKind;
+    private final CharSequence spanType;
+    private final Supplier<String> serviceNameSupplier;
+
+    private static final DDCache<CharSequence, CharSequence> PRODUCER_RESOURCE_NAME_CACHE =
+            DDCaches.newFixedSizeCache(32);
+    private static final Functions.Prefix PRODUCER_PREFIX = new Functions.Prefix("Produce Topic ");
+    private static final DDCache<CharSequence, CharSequence> CONSUMER_RESOURCE_NAME_CACHE =
+            DDCaches.newFixedSizeCache(32);
+    private static final DDCache<ProducerConfig, CharSequence> PRODUCER_BOOSTRAP_SERVERS_CACHE =
+            DDCaches.newFixedSizeWeakKeyCache(16);
+    private static final Function<ProducerConfig, CharSequence> BOOTSTRAP_SERVERS_JOINER =
+            pc -> String.join(",", pc.getList(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG));
+    private static final Functions.Prefix CONSUMER_PREFIX = new Functions.Prefix("Consume Topic ");
+
+    public static final KafkaDecorator PRODUCER_DECORATE = new KafkaDecorator(
+            Tags.SPAN_KIND_PRODUCER,
+            InternalSpanTypes.MESSAGE_PRODUCER,
+            SpanNaming.instance().namingSchema().messaging().outboundService(KAFKA, KAFKA_LEGACY_TRACING));
+
+    public static final KafkaDecorator CONSUMER_DECORATE = new KafkaDecorator(
+            Tags.SPAN_KIND_CONSUMER,
+            InternalSpanTypes.MESSAGE_CONSUMER,
+            SpanNaming.instance().namingSchema().messaging().inboundService(KAFKA, KAFKA_LEGACY_TRACING));
+
+    public static final KafkaDecorator BROKER_DECORATE = new KafkaDecorator(
+            Tags.SPAN_KIND_BROKER,
+            InternalSpanTypes.MESSAGE_BROKER,
+            SpanNaming.instance().namingSchema().messaging().timeInQueueService(KAFKA));
+
+    protected KafkaDecorator(String spanKind, CharSequence spanType, Supplier<String> serviceNameSupplier) {
+        this.spanKind = spanKind;
+        this.spanType = spanType;
+        this.serviceNameSupplier = serviceNameSupplier;
     }
-  }
-
-  public void onTimeInQueue(final AgentSpan span, final ConsumerRecord record) {
-    if (record != null) {
-      String topic = record.topic() == null ? "kafka" : record.topic();
-      span.setResourceName(topic);
-      if (Config.get().isMessageBrokerSplitByDestination()) {
-        span.setServiceName(topic, MESSAGE_BROKER_SPLIT_BY_DESTINATION);
-      }
+
+    @Override
+    protected CharSequence spanType() {
+        return spanType;
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"kafka"};
+    }
+
+    @Override
+    protected String service() {
+        return serviceNameSupplier.get();
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JAVA_KAFKA;
     }
-  }
-
-  public void onProduce(
-      final AgentSpan span,
-      final ProducerRecord record,
-      final ProducerConfig producerConfig,
-      final String clusterId) {
-    if (record != null) {
-      if (record.partition() != null) {
-        span.setTag(PARTITION, record.partition());
-      }
-      if (producerConfig != null) {
-        span.setTag(
-            KAFKA_BOOTSTRAP_SERVERS,
-            PRODUCER_BOOSTRAP_SERVERS_CACHE.computeIfAbsent(
-                producerConfig, BOOTSTRAP_SERVERS_JOINER));
-      }
-      if (clusterId != null) {
-        span.setTag(KAFKA_CLUSTER_ID, clusterId);
-      }
-      final String topic = record.topic() == null ? "kafka" : record.topic();
-      span.setResourceName(PRODUCER_RESOURCE_NAME_CACHE.computeIfAbsent(topic, PRODUCER_PREFIX));
-      span.setTag(MESSAGING_DESTINATION_NAME, topic);
+
+    @Override
+    protected String spanKind() {
+        return spanKind;
+    }
+
+    public void onConsume(
+            final AgentSpan span,
+            final ConsumerRecord record,
+            String consumerGroup,
+            String clusterId,
+            String bootstrapServers) {
+        if (record != null) {
+            final String topic = record.topic() == null ? "kafka" : record.topic();
+            span.setResourceName(CONSUMER_RESOURCE_NAME_CACHE.computeIfAbsent(topic, CONSUMER_PREFIX));
+            span.setTag(PARTITION, record.partition());
+            span.setTag(OFFSET, record.offset());
+            span.setTag(MESSAGING_DESTINATION_NAME, topic);
+            if (consumerGroup != null) {
+                span.setTag(CONSUMER_GROUP, consumerGroup);
+            }
+            if (clusterId != null) {
+                span.setTag(KAFKA_CLUSTER_ID, clusterId);
+            }
+            if (bootstrapServers != null) {
+                span.setTag(KAFKA_BOOTSTRAP_SERVERS, bootstrapServers);
+            }
+            // TODO - do we really need both? This mechanism already adds a lot of... baggage.
+            // check to not record a duration if the message was sent from an old Kafka client
+            if (record.timestampType() != TimestampType.NO_TIMESTAMP_TYPE) {
+                long consumeTime = NANOSECONDS.toMillis(span.getStartTime());
+                final long produceTime = record.timestamp();
+                span.setTag(RECORD_QUEUE_TIME_MS, Math.max(0L, consumeTime - produceTime));
+            }
+        }
+    }
+
+    public void onTimeInQueue(final AgentSpan span, final ConsumerRecord record) {
+        if (record != null) {
+            String topic = record.topic() == null ? "kafka" : record.topic();
+            span.setResourceName(topic);
+            if (Config.get().isMessageBrokerSplitByDestination()) {
+                span.setServiceName(topic, MESSAGE_BROKER_SPLIT_BY_DESTINATION);
+            }
+        }
+    }
+
+    public void onProduce(
+            final AgentSpan span,
+            final ProducerRecord record,
+            final ProducerConfig producerConfig,
+            final String clusterId) {
+        if (record != null) {
+            if (record.partition() != null) {
+                span.setTag(PARTITION, record.partition());
+            }
+            if (producerConfig != null) {
+                span.setTag(
+                        KAFKA_BOOTSTRAP_SERVERS,
+                        PRODUCER_BOOSTRAP_SERVERS_CACHE.computeIfAbsent(producerConfig, BOOTSTRAP_SERVERS_JOINER));
+            }
+            if (clusterId != null) {
+                span.setTag(KAFKA_CLUSTER_ID, clusterId);
+            }
+            final String topic = record.topic() == null ? "kafka" : record.topic();
+            span.setResourceName(PRODUCER_RESOURCE_NAME_CACHE.computeIfAbsent(topic, PRODUCER_PREFIX));
+            span.setTag(MESSAGING_DESTINATION_NAME, topic);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java
index dd7bb52989c..9ad7d5d3a3a 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java
@@ -13,50 +13,42 @@
 import org.apache.kafka.clients.producer.RecordMetadata;
 
 public class KafkaProducerCallback implements Callback {
-  private final Callback callback;
-  private final AgentSpan parent;
-  private final AgentSpan span;
-  private final String clusterId;
+    private final Callback callback;
+    private final AgentSpan parent;
+    private final AgentSpan span;
+    private final String clusterId;
 
-  public KafkaProducerCallback(
-      final Callback callback,
-      final AgentSpan parent,
-      final AgentSpan span,
-      final String clusterId) {
-    this.callback = callback;
-    this.parent = parent;
-    this.span = span;
-    this.clusterId = clusterId;
-  }
-
-  @Override
-  public void onCompletion(final RecordMetadata metadata, final Exception exception) {
-    if (metadata != null) {
-      span.setTag(PARTITION, metadata.partition());
-      span.setTag(OFFSET, metadata.offset());
+    public KafkaProducerCallback(
+            final Callback callback, final AgentSpan parent, final AgentSpan span, final String clusterId) {
+        this.callback = callback;
+        this.parent = parent;
+        this.span = span;
+        this.clusterId = clusterId;
     }
-    PRODUCER_DECORATE.onError(span, exception);
-    PRODUCER_DECORATE.beforeFinish(span);
-    span.finish();
-    if (callback != null) {
-      if (parent != null) {
-        try (final ContextScope scope = activateSpan(parent)) {
-          callback.onCompletion(metadata, exception);
+
+    @Override
+    public void onCompletion(final RecordMetadata metadata, final Exception exception) {
+        if (metadata != null) {
+            span.setTag(PARTITION, metadata.partition());
+            span.setTag(OFFSET, metadata.offset());
         }
-      } else {
-        callback.onCompletion(metadata, exception);
-      }
-    }
-    if (metadata == null) {
-      return;
+        PRODUCER_DECORATE.onError(span, exception);
+        PRODUCER_DECORATE.beforeFinish(span);
+        span.finish();
+        if (callback != null) {
+            if (parent != null) {
+                try (final ContextScope scope = activateSpan(parent)) {
+                    callback.onCompletion(metadata, exception);
+                }
+            } else {
+                callback.onCompletion(metadata, exception);
+            }
+        }
+        if (metadata == null) {
+            return;
+        }
+        DataStreamsTags tags = DataStreamsTags.createWithPartition(
+                "kafka_produce", metadata.topic(), String.valueOf(metadata.partition()), clusterId, null);
+        AgentTracer.get().getDataStreamsMonitoring().trackBacklog(tags, metadata.offset());
     }
-    DataStreamsTags tags =
-        DataStreamsTags.createWithPartition(
-            "kafka_produce",
-            metadata.topic(),
-            String.valueOf(metadata.partition()),
-            clusterId,
-            null);
-    AgentTracer.get().getDataStreamsMonitoring().trackBacklog(tags, metadata.offset());
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/LegacyConstructorAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/LegacyConstructorAdvice.java
index 35ebb9f8564..b8ec2d4db80 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/LegacyConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/LegacyConstructorAdvice.java
@@ -14,53 +14,50 @@
 import org.apache.kafka.clients.consumer.internals.ConsumerDelegate;
 
 public class LegacyConstructorAdvice {
-  // new - capture the ConsumerDelegate instead of KafkaConsumer
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void captureGroup(
-      @Advice.This ConsumerDelegate consumer,
-      @Advice.Argument(0) ConsumerConfig consumerConfig,
-      @Advice.FieldValue("coordinator") ConsumerCoordinator coordinator,
-      @Advice.FieldValue("metadata") Metadata metadata) {
-    ConsumerGroupMetadata groupMetadata = consumer.groupMetadata();
-    String consumerGroup = consumerConfig.getString(ConsumerConfig.GROUP_ID_CONFIG);
-    String normalizedConsumerGroup =
-        consumerGroup != null && !consumerGroup.isEmpty() ? consumerGroup : null;
-    if (normalizedConsumerGroup == null) {
-      if (groupMetadata != null) {
-        normalizedConsumerGroup = groupMetadata.groupId();
-      }
-    }
-    List<String> bootstrapServersList =
-        consumerConfig.getList(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG);
-    String bootstrapServers = null;
-    if (bootstrapServersList != null && !bootstrapServersList.isEmpty()) {
-      bootstrapServers = String.join(",", bootstrapServersList);
-    }
-    KafkaConsumerInfo kafkaConsumerInfo;
-    kafkaConsumerInfo = new KafkaConsumerInfo(normalizedConsumerGroup, metadata, bootstrapServers);
-    // new - search for the ConsumerDelegate instead of KafkaConsumer
-    if (kafkaConsumerInfo.getConsumerGroup().isPresent()
-        || kafkaConsumerInfo.getmetadata().isPresent()) {
-      InstrumentationContext.get(ConsumerDelegate.class, KafkaConsumerInfo.class)
-          .put(consumer, kafkaConsumerInfo);
-      if (coordinator != null) {
-        InstrumentationContext.get(ConsumerCoordinator.class, KafkaConsumerInfo.class)
-            .put(coordinator, kafkaConsumerInfo);
-      }
-    }
+    // new - capture the ConsumerDelegate instead of KafkaConsumer
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void captureGroup(
+            @Advice.This ConsumerDelegate consumer,
+            @Advice.Argument(0) ConsumerConfig consumerConfig,
+            @Advice.FieldValue("coordinator") ConsumerCoordinator coordinator,
+            @Advice.FieldValue("metadata") Metadata metadata) {
+        ConsumerGroupMetadata groupMetadata = consumer.groupMetadata();
+        String consumerGroup = consumerConfig.getString(ConsumerConfig.GROUP_ID_CONFIG);
+        String normalizedConsumerGroup = consumerGroup != null && !consumerGroup.isEmpty() ? consumerGroup : null;
+        if (normalizedConsumerGroup == null) {
+            if (groupMetadata != null) {
+                normalizedConsumerGroup = groupMetadata.groupId();
+            }
+        }
+        List<String> bootstrapServersList = consumerConfig.getList(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG);
+        String bootstrapServers = null;
+        if (bootstrapServersList != null && !bootstrapServersList.isEmpty()) {
+            bootstrapServers = String.join(",", bootstrapServersList);
+        }
+        KafkaConsumerInfo kafkaConsumerInfo;
+        kafkaConsumerInfo = new KafkaConsumerInfo(normalizedConsumerGroup, metadata, bootstrapServers);
+        // new - search for the ConsumerDelegate instead of KafkaConsumer
+        if (kafkaConsumerInfo.getConsumerGroup().isPresent()
+                || kafkaConsumerInfo.getmetadata().isPresent()) {
+            InstrumentationContext.get(ConsumerDelegate.class, KafkaConsumerInfo.class)
+                    .put(consumer, kafkaConsumerInfo);
+            if (coordinator != null) {
+                InstrumentationContext.get(ConsumerCoordinator.class, KafkaConsumerInfo.class)
+                        .put(coordinator, kafkaConsumerInfo);
+            }
+        }
 
-    if (Config.get().isDataStreamsEnabled()) {
-      MetadataState state =
-          InstrumentationContext.get(Metadata.class, MetadataState.class)
-              .getOrCreate(metadata, MetadataState::new);
-      KafkaConfigHelper.storePendingConsumerConfig(
-          state, normalizedConsumerGroup, KafkaConfigHelper.extractConsumerConfig(consumerConfig));
+        if (Config.get().isDataStreamsEnabled()) {
+            MetadataState state = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                    .getOrCreate(metadata, MetadataState::new);
+            KafkaConfigHelper.storePendingConsumerConfig(
+                    state, normalizedConsumerGroup, KafkaConfigHelper.extractConsumerConfig(consumerConfig));
+        }
     }
-  }
 
-  public static void muzzleCheck(ConsumerRecord record) {
-    // KafkaConsumerInstrumentation only applies for kafka versions with headers
-    // Make an explicit call so KafkaConsumerGroupInstrumentation does the same
-    record.headers();
-  }
+    public static void muzzleCheck(ConsumerRecord record) {
+        // KafkaConsumerInstrumentation only applies for kafka versions with headers
+        // Make an explicit call so KafkaConsumerGroupInstrumentation does the same
+        record.headers();
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ListAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ListAdvice.java
index 1c65b8a2ccd..3948ba34dbb 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ListAdvice.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ListAdvice.java
@@ -13,22 +13,19 @@
 
 public class ListAdvice {
 
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void wrap(
-      @Advice.Return(readOnly = false) List<ConsumerRecord<?, ?>> iterable,
-      @Advice.This ConsumerRecords records) {
-    if (iterable != null) {
-      KafkaConsumerInfo kafkaConsumerInfo =
-          InstrumentationContext.get(ConsumerRecords.class, KafkaConsumerInfo.class).get(records);
-      String group = KafkaConsumerInstrumentationHelper.extractGroup(kafkaConsumerInfo);
-      String clusterId =
-          KafkaConsumerInstrumentationHelper.extractClusterId(
-              kafkaConsumerInfo, InstrumentationContext.get(Metadata.class, MetadataState.class));
-      String bootstrapServers =
-          KafkaConsumerInstrumentationHelper.extractBootstrapServers(kafkaConsumerInfo);
-      iterable =
-          new TracingList(
-              iterable, KAFKA_CONSUME, CONSUMER_DECORATE, group, clusterId, bootstrapServers);
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void wrap(
+            @Advice.Return(readOnly = false) List<ConsumerRecord<?, ?>> iterable,
+            @Advice.This ConsumerRecords records) {
+        if (iterable != null) {
+            KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(
+                            ConsumerRecords.class, KafkaConsumerInfo.class)
+                    .get(records);
+            String group = KafkaConsumerInstrumentationHelper.extractGroup(kafkaConsumerInfo);
+            String clusterId = KafkaConsumerInstrumentationHelper.extractClusterId(
+                    kafkaConsumerInfo, InstrumentationContext.get(Metadata.class, MetadataState.class));
+            String bootstrapServers = KafkaConsumerInstrumentationHelper.extractBootstrapServers(kafkaConsumerInfo);
+            iterable = new TracingList(iterable, KAFKA_CONSUME, CONSUMER_DECORATE, group, clusterId, bootstrapServers);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/MetadataUpdate22AndAfterAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/MetadataUpdate22AndAfterAdvice.java
index af2a8ce62ee..205f359eddc 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/MetadataUpdate22AndAfterAdvice.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/MetadataUpdate22AndAfterAdvice.java
@@ -9,22 +9,21 @@
 import org.apache.kafka.common.requests.MetadataResponse;
 
 public class MetadataUpdate22AndAfterAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void onEnter(
-      @Advice.This final Metadata metadata, @Advice.Argument(1) final MetadataResponse response) {
-    if (response != null) {
-      String clusterId = response.clusterId();
-      MetadataState state =
-          InstrumentationContext.get(Metadata.class, MetadataState.class)
-              .getOrCreate(metadata, MetadataState::new);
-      state.clusterId = clusterId;
-      KafkaConfigHelper.reportPendingConfig(state, clusterId);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void onEnter(
+            @Advice.This final Metadata metadata, @Advice.Argument(1) final MetadataResponse response) {
+        if (response != null) {
+            String clusterId = response.clusterId();
+            MetadataState state = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                    .getOrCreate(metadata, MetadataState::new);
+            state.clusterId = clusterId;
+            KafkaConfigHelper.reportPendingConfig(state, clusterId);
+        }
     }
-  }
 
-  public static void muzzleCheck(ConsumerRecord record) {
-    // KafkaConsumerInstrumentation only applies for kafka versions with headers
-    // Make an explicit call so MetadataInstrumentation does the same
-    record.headers();
-  }
+    public static void muzzleCheck(ConsumerRecord record) {
+        // KafkaConsumerInstrumentation only applies for kafka versions with headers
+        // Make an explicit call so MetadataInstrumentation does the same
+        record.headers();
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/MetadataUpdateBefore22Advice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/MetadataUpdateBefore22Advice.java
index f5eab61835c..bf0adebd398 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/MetadataUpdateBefore22Advice.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/MetadataUpdateBefore22Advice.java
@@ -9,22 +9,20 @@
 import org.apache.kafka.common.Cluster;
 
 public class MetadataUpdateBefore22Advice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void onEnter(
-      @Advice.This final Metadata metadata, @Advice.Argument(0) final Cluster newCluster) {
-    if (newCluster != null && !newCluster.isBootstrapConfigured()) {
-      String clusterId = newCluster.clusterResource().clusterId();
-      MetadataState state =
-          InstrumentationContext.get(Metadata.class, MetadataState.class)
-              .getOrCreate(metadata, MetadataState::new);
-      state.clusterId = clusterId;
-      KafkaConfigHelper.reportPendingConfig(state, clusterId);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void onEnter(@Advice.This final Metadata metadata, @Advice.Argument(0) final Cluster newCluster) {
+        if (newCluster != null && !newCluster.isBootstrapConfigured()) {
+            String clusterId = newCluster.clusterResource().clusterId();
+            MetadataState state = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                    .getOrCreate(metadata, MetadataState::new);
+            state.clusterId = clusterId;
+            KafkaConfigHelper.reportPendingConfig(state, clusterId);
+        }
     }
-  }
 
-  public static void muzzleCheck(ConsumerRecord record) {
-    // KafkaConsumerInstrumentation only applies for kafka versions with headers
-    // Make an explicit call so MetadataInstrumentation does the same
-    record.headers();
-  }
+    public static void muzzleCheck(ConsumerRecord record) {
+        // KafkaConsumerInstrumentation only applies for kafka versions with headers
+        // Make an explicit call so MetadataInstrumentation does the same
+        record.headers();
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/NoopTextMapInjectAdapter.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/NoopTextMapInjectAdapter.java
index 653d382184c..24aeefb9c5a 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/NoopTextMapInjectAdapter.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/NoopTextMapInjectAdapter.java
@@ -4,10 +4,10 @@
 
 public class NoopTextMapInjectAdapter implements TextMapInjectAdapterInterface {
 
-  public static final NoopTextMapInjectAdapter NOOP_SETTER = new NoopTextMapInjectAdapter();
+    public static final NoopTextMapInjectAdapter NOOP_SETTER = new NoopTextMapInjectAdapter();
 
-  @Override
-  public void set(final Headers headers, final String key, final String value) {}
+    @Override
+    public void set(final Headers headers, final String key, final String value) {}
 
-  public void injectTimeInQueue(Headers headers) {}
+    public void injectTimeInQueue(Headers headers) {}
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerAdvice.java
index fc58fff319d..689a0787901 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerAdvice.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerAdvice.java
@@ -6,13 +6,13 @@
 import org.apache.kafka.clients.consumer.internals.OffsetCommitCallbackInvoker;
 
 public class OffsetCommitCallbackInvokerAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void onEnqueue(
-      @Advice.Argument(value = 0, readOnly = false) OffsetCommitCallback callback,
-      @Advice.This OffsetCommitCallbackInvoker callbackInvoker) {
-    KafkaConsumerInfo kafkaConsumerInfo =
-        InstrumentationContext.get(OffsetCommitCallbackInvoker.class, KafkaConsumerInfo.class)
-            .get(callbackInvoker);
-    callback = new DDOffsetCommitCallback(callback, kafkaConsumerInfo);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void onEnqueue(
+            @Advice.Argument(value = 0, readOnly = false) OffsetCommitCallback callback,
+            @Advice.This OffsetCommitCallbackInvoker callbackInvoker) {
+        KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(
+                        OffsetCommitCallbackInvoker.class, KafkaConsumerInfo.class)
+                .get(callbackInvoker);
+        callback = new DDOffsetCommitCallback(callback, kafkaConsumerInfo);
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java
index 3b4effb3979..37e379174da 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java
@@ -8,29 +8,28 @@
 
 public class PayloadSizeAdvice {
 
-  /**
-   * Instrumentation for the method KafkaProducer.ensureValidRecordSize that is called as part of
-   * sending a kafka payload. This gives us access to an estimate of the payload size "for free",
-   * that we send as a metric.
-   */
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void onEnter(@Advice.Argument(value = 0) int estimatedPayloadSize) {
-    StatsPoint saved = activeSpan().spanContext().getPathwayContext().getSavedStats();
-    if (saved != null) {
-      // create new stats including the payload size
-      StatsPoint updated =
-          new StatsPoint(
-              saved.getTags(),
-              saved.getHash(),
-              saved.getParentHash(),
-              saved.getAggregationHash(),
-              saved.getTimestampNanos(),
-              saved.getPathwayLatencyNano(),
-              saved.getEdgeLatencyNano(),
-              estimatedPayloadSize,
-              saved.getServiceNameOverride());
-      // then send the point
-      AgentTracer.get().getDataStreamsMonitoring().add(updated);
+    /**
+     * Instrumentation for the method KafkaProducer.ensureValidRecordSize that is called as part of
+     * sending a kafka payload. This gives us access to an estimate of the payload size "for free",
+     * that we send as a metric.
+     */
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void onEnter(@Advice.Argument(value = 0) int estimatedPayloadSize) {
+        StatsPoint saved = activeSpan().spanContext().getPathwayContext().getSavedStats();
+        if (saved != null) {
+            // create new stats including the payload size
+            StatsPoint updated = new StatsPoint(
+                    saved.getTags(),
+                    saved.getHash(),
+                    saved.getParentHash(),
+                    saved.getAggregationHash(),
+                    saved.getTimestampNanos(),
+                    saved.getPathwayLatencyNano(),
+                    saved.getEdgeLatencyNano(),
+                    estimatedPayloadSize,
+                    saved.getServiceNameOverride());
+            // then send the point
+            AgentTracer.get().getDataStreamsMonitoring().add(updated);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerAdvice.java
index 716683d7011..3b40a2d0cf1 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerAdvice.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerAdvice.java
@@ -24,58 +24,57 @@
 
 public class ProducerAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(
-      @Advice.FieldValue("producerConfig") ProducerConfig producerConfig,
-      @Advice.FieldValue("sender") Sender sender,
-      @Advice.FieldValue("metadata") Metadata metadata,
-      @Advice.Argument(value = 0, readOnly = false) ProducerRecord record,
-      @Advice.Argument(value = 1, readOnly = false) Callback callback) {
-    MetadataState metadataState =
-        InstrumentationContext.get(Metadata.class, MetadataState.class).get(metadata);
-    String clusterId = metadataState != null ? metadataState.clusterId : null;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(
+            @Advice.FieldValue("producerConfig") ProducerConfig producerConfig,
+            @Advice.FieldValue("sender") Sender sender,
+            @Advice.FieldValue("metadata") Metadata metadata,
+            @Advice.Argument(value = 0, readOnly = false) ProducerRecord record,
+            @Advice.Argument(value = 1, readOnly = false) Callback callback) {
+        MetadataState metadataState =
+                InstrumentationContext.get(Metadata.class, MetadataState.class).get(metadata);
+        String clusterId = metadataState != null ? metadataState.clusterId : null;
 
-    // Set cluster ID for Schema Registry instrumentation
-    if (clusterId != null) {
-      ClusterIdHolder.set(clusterId);
-    }
+        // Set cluster ID for Schema Registry instrumentation
+        if (clusterId != null) {
+            ClusterIdHolder.set(clusterId);
+        }
 
-    // Try to extract existing trace context from record headers
-    final AgentSpanContext extractedContext =
-        extractContextAndGetSpanContext(record.headers(), TextMapExtractAdapter.GETTER);
+        // Try to extract existing trace context from record headers
+        final AgentSpanContext extractedContext =
+                extractContextAndGetSpanContext(record.headers(), TextMapExtractAdapter.GETTER);
 
-    final AgentSpan localActiveSpan = activeSpan();
+        final AgentSpan localActiveSpan = activeSpan();
 
-    final AgentSpan span;
-    final AgentSpan callbackParentSpan;
+        final AgentSpan span;
+        final AgentSpan callbackParentSpan;
 
-    if (extractedContext != null) {
-      span = startSpan(JAVA_KAFKA.toString(), KAFKA_PRODUCE, extractedContext);
-      callbackParentSpan = span;
-    } else {
-      span = startSpan(JAVA_KAFKA.toString(), KAFKA_PRODUCE);
-      callbackParentSpan = localActiveSpan;
-    }
-    PRODUCER_DECORATE.afterStart(span);
-    PRODUCER_DECORATE.onProduce(span, record, producerConfig, clusterId);
+        if (extractedContext != null) {
+            span = startSpan(JAVA_KAFKA.toString(), KAFKA_PRODUCE, extractedContext);
+            callbackParentSpan = span;
+        } else {
+            span = startSpan(JAVA_KAFKA.toString(), KAFKA_PRODUCE);
+            callbackParentSpan = localActiveSpan;
+        }
+        PRODUCER_DECORATE.afterStart(span);
+        PRODUCER_DECORATE.onProduce(span, record, producerConfig, clusterId);
 
-    callback = new KafkaProducerCallback(callback, callbackParentSpan, span, clusterId);
+        callback = new KafkaProducerCallback(callback, callbackParentSpan, span, clusterId);
 
-    if (record.value() == null) {
-      span.setTag(InstrumentationTags.TOMBSTONE, true);
-    }
+        if (record.value() == null) {
+            span.setTag(InstrumentationTags.TOMBSTONE, true);
+        }
 
-    return activateSpan(span);
-  }
+        return activateSpan(span);
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void stopSpan(
-      @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-    // Clear cluster ID from Schema Registry instrumentation
-    ClusterIdHolder.clear();
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+        // Clear cluster ID from Schema Registry instrumentation
+        ClusterIdHolder.clear();
 
-    PRODUCER_DECORATE.onError(scope, throwable);
-    PRODUCER_DECORATE.beforeFinish(scope);
-    scope.close();
-  }
+        PRODUCER_DECORATE.onError(scope, throwable);
+        PRODUCER_DECORATE.beforeFinish(scope);
+        scope.close();
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerConstructorAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerConstructorAdvice.java
index ddff8190bcb..237d88a49ed 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerConstructorAdvice.java
@@ -10,16 +10,14 @@
 
 public class ProducerConstructorAdvice {
 
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void captureConfiguration(
-      @Advice.FieldValue("metadata") Metadata metadata,
-      @Advice.Argument(0) ProducerConfig producerConfig) {
-    MetadataState state =
-        InstrumentationContext.get(Metadata.class, MetadataState.class)
-            .getOrCreate(metadata, MetadataState::new);
-    if (Config.get().isDataStreamsEnabled()) {
-      KafkaConfigHelper.storePendingProducerConfig(
-          state, KafkaConfigHelper.extractProducerConfig(producerConfig));
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void captureConfiguration(
+            @Advice.FieldValue("metadata") Metadata metadata, @Advice.Argument(0) ProducerConfig producerConfig) {
+        MetadataState state = InstrumentationContext.get(Metadata.class, MetadataState.class)
+                .getOrCreate(metadata, MetadataState::new);
+        if (Config.get().isDataStreamsEnabled()) {
+            KafkaConfigHelper.storePendingProducerConfig(
+                    state, KafkaConfigHelper.extractProducerConfig(producerConfig));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerContextPropagationAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerContextPropagationAdvice.java
index e3094e44e0d..abcc8e3046f 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerContextPropagationAdvice.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerContextPropagationAdvice.java
@@ -26,54 +26,51 @@
 @AppliesOn(CONTEXT_TRACKING)
 public class ProducerContextPropagationAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void onEnter(
-      @Advice.FieldValue("metadata") Metadata metadata,
-      @Advice.Argument(value = 0, readOnly = false) ProducerRecord record) {
-    AgentSpan span = activeSpan();
-    if (span == null) return;
-    MetadataState metadataState =
-        InstrumentationContext.get(Metadata.class, MetadataState.class).get(metadata);
-    String clusterId = metadataState != null ? metadataState.clusterId : null;
-    TextMapInjectAdapterInterface setter = NoopTextMapInjectAdapter.NOOP_SETTER;
-    // Please note that the minimum magic for kafka 3.8+ is 2 so there is no need to check this
-    if (Config.get().isKafkaClientPropagationEnabled()
-        && !Config.get().isKafkaClientPropagationDisabledForTopic(record.topic())) {
-      setter = TextMapInjectAdapter.SETTER;
-    }
-    DataStreamsTags tags = create("kafka", OUTBOUND, record.topic(), null, clusterId);
-    try {
-      defaultPropagator().inject(span, record.headers(), setter);
-      if (STREAMING_CONTEXT.isDisabledForTopic(record.topic())
-          || STREAMING_CONTEXT.isSinkTopic(record.topic())) {
-        // inject the context in the headers, but delay sending the stats until we know the
-        // message size.
-        // The stats are saved in the pathway context and sent in PayloadSizeAdvice.
-        Propagator dsmPropagator = Propagators.forConcern(DSM_CONCERN);
-        DataStreamsContext dsmContext = fromTagsWithoutCheckpoint(tags);
-        dsmPropagator.inject(span.with(dsmContext), record.headers(), setter);
-      }
-    } catch (final IllegalStateException e) {
-      // headers must be read-only from reused record. try again with new one.
-      record =
-          new ProducerRecord<>(
-              record.topic(),
-              record.partition(),
-              record.timestamp(),
-              record.key(),
-              record.value(),
-              record.headers());
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void onEnter(
+            @Advice.FieldValue("metadata") Metadata metadata,
+            @Advice.Argument(value = 0, readOnly = false) ProducerRecord record) {
+        AgentSpan span = activeSpan();
+        if (span == null) return;
+        MetadataState metadataState =
+                InstrumentationContext.get(Metadata.class, MetadataState.class).get(metadata);
+        String clusterId = metadataState != null ? metadataState.clusterId : null;
+        TextMapInjectAdapterInterface setter = NoopTextMapInjectAdapter.NOOP_SETTER;
+        // Please note that the minimum magic for kafka 3.8+ is 2 so there is no need to check this
+        if (Config.get().isKafkaClientPropagationEnabled()
+                && !Config.get().isKafkaClientPropagationDisabledForTopic(record.topic())) {
+            setter = TextMapInjectAdapter.SETTER;
+        }
+        DataStreamsTags tags = create("kafka", OUTBOUND, record.topic(), null, clusterId);
+        try {
+            defaultPropagator().inject(span, record.headers(), setter);
+            if (STREAMING_CONTEXT.isDisabledForTopic(record.topic()) || STREAMING_CONTEXT.isSinkTopic(record.topic())) {
+                // inject the context in the headers, but delay sending the stats until we know the
+                // message size.
+                // The stats are saved in the pathway context and sent in PayloadSizeAdvice.
+                Propagator dsmPropagator = Propagators.forConcern(DSM_CONCERN);
+                DataStreamsContext dsmContext = fromTagsWithoutCheckpoint(tags);
+                dsmPropagator.inject(span.with(dsmContext), record.headers(), setter);
+            }
+        } catch (final IllegalStateException e) {
+            // headers must be read-only from reused record. try again with new one.
+            record = new ProducerRecord<>(
+                    record.topic(),
+                    record.partition(),
+                    record.timestamp(),
+                    record.key(),
+                    record.value(),
+                    record.headers());
 
-      defaultPropagator().inject(span, record.headers(), setter);
-      if (STREAMING_CONTEXT.isDisabledForTopic(record.topic())
-          || STREAMING_CONTEXT.isSinkTopic(record.topic())) {
-        Propagator dsmPropagator = Propagators.forConcern(DSM_CONCERN);
-        DataStreamsContext dsmContext = fromTagsWithoutCheckpoint(tags);
-        dsmPropagator.inject(span.with(dsmContext), record.headers(), setter);
-      }
-    }
-    if (TIME_IN_QUEUE_ENABLED) {
-      setter.injectTimeInQueue(record.headers());
+            defaultPropagator().inject(span, record.headers(), setter);
+            if (STREAMING_CONTEXT.isDisabledForTopic(record.topic()) || STREAMING_CONTEXT.isSinkTopic(record.topic())) {
+                Propagator dsmPropagator = Propagators.forConcern(DSM_CONCERN);
+                DataStreamsContext dsmContext = fromTagsWithoutCheckpoint(tags);
+                dsmPropagator.inject(span.with(dsmContext), record.headers(), setter);
+            }
+        }
+        if (TIME_IN_QUEUE_ENABLED) {
+            setter.injectTimeInQueue(record.headers());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/RecordsAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/RecordsAdvice.java
index 418966c4cb8..54bf2f364c7 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/RecordsAdvice.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/RecordsAdvice.java
@@ -26,57 +26,58 @@
  * class.
  */
 public class RecordsAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(@Advice.This ConsumerDelegate consumer) {
-    // Set cluster ID in ClusterIdHolder for Schema Registry instrumentation
-    KafkaConsumerInfo kafkaConsumerInfo =
-        InstrumentationContext.get(ConsumerDelegate.class, KafkaConsumerInfo.class).get(consumer);
-    if (kafkaConsumerInfo != null && Config.get().isDataStreamsEnabled()) {
-      String clusterId =
-          KafkaConsumerInstrumentationHelper.extractClusterId(
-              kafkaConsumerInfo, InstrumentationContext.get(Metadata.class, MetadataState.class));
-      if (clusterId != null) {
-        ClusterIdHolder.set(clusterId);
-      }
-    }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(@Advice.This ConsumerDelegate consumer) {
+        // Set cluster ID in ClusterIdHolder for Schema Registry instrumentation
+        KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(
+                        ConsumerDelegate.class, KafkaConsumerInfo.class)
+                .get(consumer);
+        if (kafkaConsumerInfo != null && Config.get().isDataStreamsEnabled()) {
+            String clusterId = KafkaConsumerInstrumentationHelper.extractClusterId(
+                    kafkaConsumerInfo, InstrumentationContext.get(Metadata.class, MetadataState.class));
+            if (clusterId != null) {
+                ClusterIdHolder.set(clusterId);
+            }
+        }
 
-    if (traceConfig().isDataStreamsEnabled()) {
-      final AgentSpan span = startSpan(JAVA_KAFKA.toString(), KAFKA_POLL);
-      return activateSpan(span);
+        if (traceConfig().isDataStreamsEnabled()) {
+            final AgentSpan span = startSpan(JAVA_KAFKA.toString(), KAFKA_POLL);
+            return activateSpan(span);
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void captureGroup(
-      @Advice.Enter final ContextScope scope,
-      @Advice.This ConsumerDelegate consumer,
-      @Advice.Return ConsumerRecords records,
-      @Advice.Thrown Throwable throwable) {
-    int recordsCount = 0;
-    if (records != null) {
-      // new - we are getting the KafkaConsumerInfo from the ConsumerDelegate instead of
-      // KafkaConsumer
-      KafkaConsumerInfo kafkaConsumerInfo =
-          InstrumentationContext.get(ConsumerDelegate.class, KafkaConsumerInfo.class).get(consumer);
-      if (kafkaConsumerInfo != null) {
-        InstrumentationContext.get(ConsumerRecords.class, KafkaConsumerInfo.class)
-            .put(records, kafkaConsumerInfo);
-      }
-      recordsCount = records.count();
-    }
-    // Clear cluster ID from Schema Registry instrumentation
-    ClusterIdHolder.clear();
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void captureGroup(
+            @Advice.Enter final ContextScope scope,
+            @Advice.This ConsumerDelegate consumer,
+            @Advice.Return ConsumerRecords records,
+            @Advice.Thrown Throwable throwable) {
+        int recordsCount = 0;
+        if (records != null) {
+            // new - we are getting the KafkaConsumerInfo from the ConsumerDelegate instead of
+            // KafkaConsumer
+            KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(
+                            ConsumerDelegate.class, KafkaConsumerInfo.class)
+                    .get(consumer);
+            if (kafkaConsumerInfo != null) {
+                InstrumentationContext.get(ConsumerRecords.class, KafkaConsumerInfo.class)
+                        .put(records, kafkaConsumerInfo);
+            }
+            recordsCount = records.count();
+        }
+        // Clear cluster ID from Schema Registry instrumentation
+        ClusterIdHolder.clear();
 
-    if (scope == null) {
-      return;
-    }
-    AgentSpan span = spanFromScope(scope);
-    span.setTag(KAFKA_RECORDS_COUNT, recordsCount);
-    if (!(throwable instanceof WakeupException)) {
-      span.addThrowable(throwable);
+        if (scope == null) {
+            return;
+        }
+        AgentSpan span = spanFromScope(scope);
+        span.setTag(KAFKA_RECORDS_COUNT, recordsCount);
+        if (!(throwable instanceof WakeupException)) {
+            span.addThrowable(throwable);
+        }
+        scope.close();
+        span.finish();
     }
-    scope.close();
-    span.finish();
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TextMapExtractAdapter.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TextMapExtractAdapter.java
index 30b35216a4b..0d858a63295 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TextMapExtractAdapter.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TextMapExtractAdapter.java
@@ -16,55 +16,55 @@
 import org.slf4j.LoggerFactory;
 
 public class TextMapExtractAdapter implements ContextVisitor<Headers> {
-  private static final Logger log = LoggerFactory.getLogger(TextMapExtractAdapter.class);
+    private static final Logger log = LoggerFactory.getLogger(TextMapExtractAdapter.class);
 
-  public static final TextMapExtractAdapter GETTER =
-      new TextMapExtractAdapter(Config.get().isKafkaClientBase64DecodingEnabled());
+    public static final TextMapExtractAdapter GETTER =
+            new TextMapExtractAdapter(Config.get().isKafkaClientBase64DecodingEnabled());
 
-  private final Function<byte[], String> headerValueTransformer;
-  private final Base64.Decoder decoder;
+    private final Function<byte[], String> headerValueTransformer;
+    private final Base64.Decoder decoder;
 
-  public TextMapExtractAdapter(boolean decodeBase64Headers) {
-    if (decodeBase64Headers) {
-      this.headerValueTransformer = BASE64_DECODE;
-      this.decoder = Base64.getDecoder();
-    } else {
-      this.headerValueTransformer = UTF8_BYTES_TO_STRING;
-      this.decoder = null;
+    public TextMapExtractAdapter(boolean decodeBase64Headers) {
+        if (decodeBase64Headers) {
+            this.headerValueTransformer = BASE64_DECODE;
+            this.decoder = Base64.getDecoder();
+        } else {
+            this.headerValueTransformer = UTF8_BYTES_TO_STRING;
+            this.decoder = null;
+        }
     }
-  }
 
-  @Override
-  public void forEachKey(Headers carrier, AgentPropagation.KeyClassifier classifier) {
-    for (Header header : carrier) {
-      String key = header.key();
-      byte[] value = header.value();
-      if (null == value) {
-        continue;
-      }
-      String decoded = headerValueTransformer.apply(value);
-      if (decoded == null) {
-        log.debug(EXCLUDE_TELEMETRY, "Failed to Base64-decode Kafka header '{}', skipping", key);
-        continue;
-      }
-      if (!classifier.accept(key, decoded)) {
-        return;
-      }
+    @Override
+    public void forEachKey(Headers carrier, AgentPropagation.KeyClassifier classifier) {
+        for (Header header : carrier) {
+            String key = header.key();
+            byte[] value = header.value();
+            if (null == value) {
+                continue;
+            }
+            String decoded = headerValueTransformer.apply(value);
+            if (decoded == null) {
+                log.debug(EXCLUDE_TELEMETRY, "Failed to Base64-decode Kafka header '{}', skipping", key);
+                continue;
+            }
+            if (!classifier.accept(key, decoded)) {
+                return;
+            }
+        }
     }
-  }
 
-  public long extractTimeInQueueStart(Headers carrier) {
-    Header header = carrier.lastHeader(KafkaDecorator.KAFKA_PRODUCED_KEY);
-    if (null != header) {
-      try {
-        ByteBuffer buf = ByteBuffer.allocate(8);
-        buf.put(decoder != null ? decoder.decode(header.value()) : header.value());
-        buf.flip();
-        return buf.getLong();
-      } catch (Exception e) {
-        log.debug(EXCLUDE_TELEMETRY, "Unable to get kafka produced time", e);
-      }
+    public long extractTimeInQueueStart(Headers carrier) {
+        Header header = carrier.lastHeader(KafkaDecorator.KAFKA_PRODUCED_KEY);
+        if (null != header) {
+            try {
+                ByteBuffer buf = ByteBuffer.allocate(8);
+                buf.put(decoder != null ? decoder.decode(header.value()) : header.value());
+                buf.flip();
+                return buf.getLong();
+            } catch (Exception e) {
+                log.debug(EXCLUDE_TELEMETRY, "Unable to get kafka produced time", e);
+            }
+        }
+        return 0;
     }
-    return 0;
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TextMapInjectAdapter.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TextMapInjectAdapter.java
index 2b58ff6bae4..1bf7bb0a6f8 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TextMapInjectAdapter.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TextMapInjectAdapter.java
@@ -6,16 +6,16 @@
 import org.apache.kafka.common.header.Headers;
 
 public class TextMapInjectAdapter implements TextMapInjectAdapterInterface {
-  public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
+    public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
 
-  @Override
-  public void set(final Headers headers, final String key, final String value) {
-    headers.remove(key).add(key, value.getBytes(UTF_8));
-  }
+    @Override
+    public void set(final Headers headers, final String key, final String value) {
+        headers.remove(key).add(key, value.getBytes(UTF_8));
+    }
 
-  public void injectTimeInQueue(Headers headers) {
-    ByteBuffer buf = ByteBuffer.allocate(8);
-    buf.putLong(System.currentTimeMillis());
-    headers.add(KafkaDecorator.KAFKA_PRODUCED_KEY, buf.array());
-  }
+    public void injectTimeInQueue(Headers headers) {
+        ByteBuffer buf = ByteBuffer.allocate(8);
+        buf.putLong(System.currentTimeMillis());
+        headers.add(KafkaDecorator.KAFKA_PRODUCED_KEY, buf.array());
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TextMapInjectAdapterInterface.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TextMapInjectAdapterInterface.java
index 869613c656b..4cd04846524 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TextMapInjectAdapterInterface.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TextMapInjectAdapterInterface.java
@@ -4,5 +4,5 @@
 import org.apache.kafka.common.header.Headers;
 
 public interface TextMapInjectAdapterInterface extends CarrierSetter<Headers> {
-  void injectTimeInQueue(Headers headers);
+    void injectTimeInQueue(Headers headers);
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterable.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterable.java
index 59b53b1c363..8b5062901eb 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterable.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterable.java
@@ -4,37 +4,36 @@
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 
 public class TracingIterable implements Iterable<ConsumerRecord<?, ?>>, TracingIterableDelegator {
-  private final Iterable<ConsumerRecord<?, ?>> delegate;
-  private final CharSequence operationName;
-  private final KafkaDecorator decorator;
-  private final String group;
-  private final String clusterId;
-  private final String bootstrapServers;
+    private final Iterable<ConsumerRecord<?, ?>> delegate;
+    private final CharSequence operationName;
+    private final KafkaDecorator decorator;
+    private final String group;
+    private final String clusterId;
+    private final String bootstrapServers;
 
-  public TracingIterable(
-      final Iterable<ConsumerRecord<?, ?>> delegate,
-      final CharSequence operationName,
-      final KafkaDecorator decorator,
-      String group,
-      String clusterId,
-      String bootstrapServers) {
-    this.delegate = delegate;
-    this.operationName = operationName;
-    this.decorator = decorator;
-    this.group = group;
-    this.clusterId = clusterId;
-    this.bootstrapServers = bootstrapServers;
-  }
+    public TracingIterable(
+            final Iterable<ConsumerRecord<?, ?>> delegate,
+            final CharSequence operationName,
+            final KafkaDecorator decorator,
+            String group,
+            String clusterId,
+            String bootstrapServers) {
+        this.delegate = delegate;
+        this.operationName = operationName;
+        this.decorator = decorator;
+        this.group = group;
+        this.clusterId = clusterId;
+        this.bootstrapServers = bootstrapServers;
+    }
 
-  @Override
-  public Iterator<ConsumerRecord<?, ?>> iterator() {
-    // every iteration will add spans. Not only the very first one
-    return new TracingIterator(
-        delegate.iterator(), operationName, decorator, group, clusterId, bootstrapServers);
-  }
+    @Override
+    public Iterator<ConsumerRecord<?, ?>> iterator() {
+        // every iteration will add spans. Not only the very first one
+        return new TracingIterator(delegate.iterator(), operationName, decorator, group, clusterId, bootstrapServers);
+    }
 
-  @Override
-  public Iterable<ConsumerRecord<?, ?>> getDelegate() {
-    return delegate;
-  }
+    @Override
+    public Iterable<ConsumerRecord<?, ?>> getDelegate() {
+        return delegate;
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterableDelegator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterableDelegator.java
index 8b9f94a3e4f..2f64073adef 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterableDelegator.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterableDelegator.java
@@ -3,6 +3,6 @@
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 
 public interface TracingIterableDelegator {
-  // Used by the streams instrumentation to unwrap (disable) the iteration advice.
-  Iterable<ConsumerRecord<?, ?>> getDelegate();
+    // Used by the streams instrumentation to unwrap (disable) the iteration advice.
+    Iterable<ConsumerRecord<?, ?>> getDelegate();
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java
index 7beba848473..195828311cd 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java
@@ -35,141 +35,141 @@
 
 public class TracingIterator implements Iterator<ConsumerRecord<?, ?>> {
 
-  private static final Logger log = LoggerFactory.getLogger(TracingIterator.class);
+    private static final Logger log = LoggerFactory.getLogger(TracingIterator.class);
 
-  private final Iterator<ConsumerRecord<?, ?>> delegateIterator;
-  private final CharSequence operationName;
-  private final KafkaDecorator decorator;
-  private final String group;
-  private final String clusterId;
-  private final String bootstrapServers;
+    private final Iterator<ConsumerRecord<?, ?>> delegateIterator;
+    private final CharSequence operationName;
+    private final KafkaDecorator decorator;
+    private final String group;
+    private final String clusterId;
+    private final String bootstrapServers;
 
-  public TracingIterator(
-      final Iterator<ConsumerRecord<?, ?>> delegateIterator,
-      final CharSequence operationName,
-      final KafkaDecorator decorator,
-      String group,
-      String clusterId,
-      String bootstrapServers) {
-    this.delegateIterator = delegateIterator;
-    this.operationName = operationName;
-    this.decorator = decorator;
-    this.group = group;
-    this.clusterId = clusterId;
-    this.bootstrapServers = bootstrapServers;
-  }
+    public TracingIterator(
+            final Iterator<ConsumerRecord<?, ?>> delegateIterator,
+            final CharSequence operationName,
+            final KafkaDecorator decorator,
+            String group,
+            String clusterId,
+            String bootstrapServers) {
+        this.delegateIterator = delegateIterator;
+        this.operationName = operationName;
+        this.decorator = decorator;
+        this.group = group;
+        this.clusterId = clusterId;
+        this.bootstrapServers = bootstrapServers;
+    }
 
-  @Override
-  public boolean hasNext() {
-    boolean moreRecords = delegateIterator.hasNext();
-    if (!moreRecords) {
-      // no more records, use this as a signal to close the last iteration scope
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        closePrevious(true);
-      } else {
-        final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
-        if (previousSpan != null) {
-          previousSpan.finishWithEndToEnd();
+    @Override
+    public boolean hasNext() {
+        boolean moreRecords = delegateIterator.hasNext();
+        if (!moreRecords) {
+            // no more records, use this as a signal to close the last iteration scope
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                closePrevious(true);
+            } else {
+                final AgentSpan previousSpan =
+                        AgentSpan.fromContext(Context.root().swap());
+                if (previousSpan != null) {
+                    previousSpan.finishWithEndToEnd();
+                }
+            }
         }
-      }
+        return moreRecords;
+    }
+
+    @Override
+    public ConsumerRecord<?, ?> next() {
+        final ConsumerRecord<?, ?> next = delegateIterator.next();
+        startNewRecordSpan(next);
+        return next;
     }
-    return moreRecords;
-  }
 
-  @Override
-  public ConsumerRecord<?, ?> next() {
-    final ConsumerRecord<?, ?> next = delegateIterator.next();
-    startNewRecordSpan(next);
-    return next;
-  }
+    protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {
+        try {
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                closePrevious(true);
+            } else if (val == null) { // previous message span was the last
+                final AgentSpan previousSpan =
+                        AgentSpan.fromContext(Context.root().swap());
+                if (previousSpan != null) {
+                    previousSpan.finishWithEndToEnd();
+                }
+            }
+            AgentSpan span, queueSpan = null;
+            if (val != null) {
+                if (!Config.get().isKafkaClientPropagationDisabledForTopic(val.topic())) {
+                    final AgentSpanContext spanContext = extractContextAndGetSpanContext(val.headers(), GETTER);
+                    long timeInQueueStart = GETTER.extractTimeInQueueStart(val.headers());
+                    if (timeInQueueStart == 0 || !KafkaDecorator.TIME_IN_QUEUE_ENABLED) {
+                        span = startSpan(JAVA_KAFKA.toString(), operationName, spanContext);
+                    } else {
+                        queueSpan = startSpan(
+                                JAVA_KAFKA.toString(),
+                                KafkaDecorator.KAFKA_DELIVER,
+                                spanContext,
+                                MILLISECONDS.toMicros(timeInQueueStart));
+                        KafkaDecorator.BROKER_DECORATE.afterStart(queueSpan);
+                        KafkaDecorator.BROKER_DECORATE.onTimeInQueue(queueSpan, val);
+                        span = startSpan(JAVA_KAFKA.toString(), operationName, queueSpan.spanContext());
+                        KafkaDecorator.BROKER_DECORATE.beforeFinish(queueSpan);
+                        // The queueSpan will be finished after inner span has been activated to ensure that
+                        // spans are written out together by TraceStructureWriter when running in strict mode
+                    }
 
-  protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {
-    try {
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        closePrevious(true);
-      } else if (val == null) { // previous message span was the last
-        final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
-        if (previousSpan != null) {
-          previousSpan.finishWithEndToEnd();
-        }
-      }
-      AgentSpan span, queueSpan = null;
-      if (val != null) {
-        if (!Config.get().isKafkaClientPropagationDisabledForTopic(val.topic())) {
-          final AgentSpanContext spanContext =
-              extractContextAndGetSpanContext(val.headers(), GETTER);
-          long timeInQueueStart = GETTER.extractTimeInQueueStart(val.headers());
-          if (timeInQueueStart == 0 || !KafkaDecorator.TIME_IN_QUEUE_ENABLED) {
-            span = startSpan(JAVA_KAFKA.toString(), operationName, spanContext);
-          } else {
-            queueSpan =
-                startSpan(
-                    JAVA_KAFKA.toString(),
-                    KafkaDecorator.KAFKA_DELIVER,
-                    spanContext,
-                    MILLISECONDS.toMicros(timeInQueueStart));
-            KafkaDecorator.BROKER_DECORATE.afterStart(queueSpan);
-            KafkaDecorator.BROKER_DECORATE.onTimeInQueue(queueSpan, val);
-            span = startSpan(JAVA_KAFKA.toString(), operationName, queueSpan.spanContext());
-            KafkaDecorator.BROKER_DECORATE.beforeFinish(queueSpan);
-            // The queueSpan will be finished after inner span has been activated to ensure that
-            // spans are written out together by TraceStructureWriter when running in strict mode
-          }
+                    DataStreamsTags tags = create("kafka", INBOUND, val.topic(), group, clusterId);
+                    final long payloadSize =
+                            traceConfig().isDataStreamsEnabled() ? Utils.computePayloadSizeBytes(val) : 0;
+                    if (StreamingContext.STREAMING_CONTEXT.isDisabledForTopic(val.topic())) {
+                        AgentTracer.get()
+                                .getDataStreamsMonitoring()
+                                .setCheckpoint(span, create(tags, val.timestamp(), payloadSize));
+                    } else {
+                        // when we're in a streaming context we want to consume only from source topics
+                        if (StreamingContext.STREAMING_CONTEXT.isSourceTopic(val.topic())) {
+                            // We have to inject the context to headers here,
+                            // since the data received from the source may leave the topology on
+                            // some other instance of the application, breaking the context propagation
+                            // for DSM users
+                            Propagator dsmPropagator = Propagators.forConcern(DSM_CONCERN);
+                            DataStreamsContext dsmContext = create(tags, val.timestamp(), payloadSize);
+                            dsmPropagator.inject(span.with(dsmContext), val.headers(), SETTER);
+                        }
+                    }
+                } else {
+                    span = startSpan(JAVA_KAFKA.toString(), operationName, null);
+                }
+                if (val.value() == null) {
+                    span.setTag(InstrumentationTags.TOMBSTONE, true);
+                }
+                decorator.afterStart(span);
+                decorator.onConsume(span, val, group, clusterId, bootstrapServers);
+                if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                    activateNext(span);
+                } else {
+                    final AgentSpan previousSpan = AgentSpan.fromContext(span.swap());
+                    if (previousSpan != null) {
+                        previousSpan.finishWithEndToEnd();
+                    }
+                }
+                if (null != queueSpan) {
+                    queueSpan.finish();
+                }
 
-          DataStreamsTags tags = create("kafka", INBOUND, val.topic(), group, clusterId);
-          final long payloadSize =
-              traceConfig().isDataStreamsEnabled() ? Utils.computePayloadSizeBytes(val) : 0;
-          if (StreamingContext.STREAMING_CONTEXT.isDisabledForTopic(val.topic())) {
-            AgentTracer.get()
-                .getDataStreamsMonitoring()
-                .setCheckpoint(span, create(tags, val.timestamp(), payloadSize));
-          } else {
-            // when we're in a streaming context we want to consume only from source topics
-            if (StreamingContext.STREAMING_CONTEXT.isSourceTopic(val.topic())) {
-              // We have to inject the context to headers here,
-              // since the data received from the source may leave the topology on
-              // some other instance of the application, breaking the context propagation
-              // for DSM users
-              Propagator dsmPropagator = Propagators.forConcern(DSM_CONCERN);
-              DataStreamsContext dsmContext = create(tags, val.timestamp(), payloadSize);
-              dsmPropagator.inject(span.with(dsmContext), val.headers(), SETTER);
+                AgentTracer.get()
+                        .getDataStreamsMonitoring()
+                        .trackTransaction(
+                                span,
+                                DataStreamsTransactionExtractor.Type.KAFKA_CONSUME_HEADERS,
+                                val.headers(),
+                                Utils.DSM_TRANSACTION_SOURCE_READER);
             }
-          }
-        } else {
-          span = startSpan(JAVA_KAFKA.toString(), operationName, null);
+        } catch (final Exception e) {
+            log.debug("Error starting new record span", e);
         }
-        if (val.value() == null) {
-          span.setTag(InstrumentationTags.TOMBSTONE, true);
-        }
-        decorator.afterStart(span);
-        decorator.onConsume(span, val, group, clusterId, bootstrapServers);
-        if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-          activateNext(span);
-        } else {
-          final AgentSpan previousSpan = AgentSpan.fromContext(span.swap());
-          if (previousSpan != null) {
-            previousSpan.finishWithEndToEnd();
-          }
-        }
-        if (null != queueSpan) {
-          queueSpan.finish();
-        }
-
-        AgentTracer.get()
-            .getDataStreamsMonitoring()
-            .trackTransaction(
-                span,
-                DataStreamsTransactionExtractor.Type.KAFKA_CONSUME_HEADERS,
-                val.headers(),
-                Utils.DSM_TRANSACTION_SOURCE_READER);
-      }
-    } catch (final Exception e) {
-      log.debug("Error starting new record span", e);
     }
-  }
 
-  @Override
-  public void remove() {
-    delegateIterator.remove();
-  }
+    @Override
+    public void remove() {
+        delegateIterator.remove();
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingList.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingList.java
index 24cd318d175..04f25001945 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingList.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingList.java
@@ -8,154 +8,149 @@
 
 public class TracingList implements List<ConsumerRecord<?, ?>>, TracingIterableDelegator {
 
-  private final List<ConsumerRecord<?, ?>> delegate;
-  private final CharSequence operationName;
-  private final KafkaDecorator decorator;
-  private final String group;
-  private final String clusterId;
-  private final String bootstrapServers;
-
-  public TracingList(
-      final List<ConsumerRecord<?, ?>> delegate,
-      final CharSequence operationName,
-      final KafkaDecorator decorator,
-      String group,
-      String clusterId,
-      String bootstrapServers) {
-    this.operationName = operationName;
-    this.decorator = decorator;
-    this.delegate = delegate;
-    this.group = group;
-    this.clusterId = clusterId;
-    this.bootstrapServers = bootstrapServers;
-  }
-
-  @Override
-  public int size() {
-    return delegate.size();
-  }
-
-  @Override
-  public boolean isEmpty() {
-    return delegate.isEmpty();
-  }
-
-  @Override
-  public boolean contains(final Object o) {
-    return delegate.contains(o);
-  }
-
-  @Override
-  public Iterator<ConsumerRecord<?, ?>> iterator() {
-    return listIterator(0);
-  }
-
-  @Override
-  public Object[] toArray() {
-    return delegate.toArray();
-  }
-
-  @Override
-  public <T> T[] toArray(final T[] a) {
-    return delegate.toArray(a);
-  }
-
-  @Override
-  public boolean add(final ConsumerRecord consumerRecord) {
-    return delegate.add(consumerRecord);
-  }
-
-  @Override
-  public boolean remove(final Object o) {
-    return delegate.remove(o);
-  }
-
-  @Override
-  public boolean containsAll(final Collection<?> c) {
-    return delegate.containsAll(c);
-  }
-
-  @Override
-  public boolean addAll(final Collection<? extends ConsumerRecord<?, ?>> c) {
-    return delegate.addAll(c);
-  }
-
-  @Override
-  public boolean addAll(final int index, final Collection<? extends ConsumerRecord<?, ?>> c) {
-    return delegate.addAll(index, c);
-  }
-
-  @Override
-  public boolean removeAll(final Collection<?> c) {
-    return delegate.removeAll(c);
-  }
-
-  @Override
-  public boolean retainAll(final Collection<?> c) {
-    return delegate.retainAll(c);
-  }
-
-  @Override
-  public void clear() {
-    delegate.clear();
-  }
-
-  @Override
-  public ConsumerRecord get(final int index) {
-    // TODO: should this be instrumented as well?
-    return delegate.get(index);
-  }
-
-  @Override
-  public ConsumerRecord set(final int index, final ConsumerRecord element) {
-    return delegate.set(index, element);
-  }
-
-  @Override
-  public void add(final int index, final ConsumerRecord element) {
-    delegate.add(index, element);
-  }
-
-  @Override
-  public ConsumerRecord remove(final int index) {
-    return delegate.remove(index);
-  }
-
-  @Override
-  public int indexOf(final Object o) {
-    return delegate.indexOf(o);
-  }
-
-  @Override
-  public int lastIndexOf(final Object o) {
-    return delegate.lastIndexOf(o);
-  }
-
-  @Override
-  public ListIterator<ConsumerRecord<?, ?>> listIterator() {
-    return listIterator(0);
-  }
-
-  @Override
-  public ListIterator<ConsumerRecord<?, ?>> listIterator(final int index) {
-    // every iteration will add spans. Not only the very first one
-    return new TracingListIterator(
-        delegate.listIterator(index), operationName, decorator, group, clusterId, bootstrapServers);
-  }
-
-  @Override
-  public List<ConsumerRecord<?, ?>> subList(final int fromIndex, final int toIndex) {
-    return new TracingList(
-        delegate.subList(fromIndex, toIndex),
-        operationName,
-        decorator,
-        group,
-        clusterId,
-        bootstrapServers);
-  }
-
-  @Override
-  public List<ConsumerRecord<?, ?>> getDelegate() {
-    return delegate;
-  }
+    private final List<ConsumerRecord<?, ?>> delegate;
+    private final CharSequence operationName;
+    private final KafkaDecorator decorator;
+    private final String group;
+    private final String clusterId;
+    private final String bootstrapServers;
+
+    public TracingList(
+            final List<ConsumerRecord<?, ?>> delegate,
+            final CharSequence operationName,
+            final KafkaDecorator decorator,
+            String group,
+            String clusterId,
+            String bootstrapServers) {
+        this.operationName = operationName;
+        this.decorator = decorator;
+        this.delegate = delegate;
+        this.group = group;
+        this.clusterId = clusterId;
+        this.bootstrapServers = bootstrapServers;
+    }
+
+    @Override
+    public int size() {
+        return delegate.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return delegate.isEmpty();
+    }
+
+    @Override
+    public boolean contains(final Object o) {
+        return delegate.contains(o);
+    }
+
+    @Override
+    public Iterator<ConsumerRecord<?, ?>> iterator() {
+        return listIterator(0);
+    }
+
+    @Override
+    public Object[] toArray() {
+        return delegate.toArray();
+    }
+
+    @Override
+    public <T> T[] toArray(final T[] a) {
+        return delegate.toArray(a);
+    }
+
+    @Override
+    public boolean add(final ConsumerRecord consumerRecord) {
+        return delegate.add(consumerRecord);
+    }
+
+    @Override
+    public boolean remove(final Object o) {
+        return delegate.remove(o);
+    }
+
+    @Override
+    public boolean containsAll(final Collection<?> c) {
+        return delegate.containsAll(c);
+    }
+
+    @Override
+    public boolean addAll(final Collection<? extends ConsumerRecord<?, ?>> c) {
+        return delegate.addAll(c);
+    }
+
+    @Override
+    public boolean addAll(final int index, final Collection<? extends ConsumerRecord<?, ?>> c) {
+        return delegate.addAll(index, c);
+    }
+
+    @Override
+    public boolean removeAll(final Collection<?> c) {
+        return delegate.removeAll(c);
+    }
+
+    @Override
+    public boolean retainAll(final Collection<?> c) {
+        return delegate.retainAll(c);
+    }
+
+    @Override
+    public void clear() {
+        delegate.clear();
+    }
+
+    @Override
+    public ConsumerRecord get(final int index) {
+        // TODO: should this be instrumented as well?
+        return delegate.get(index);
+    }
+
+    @Override
+    public ConsumerRecord set(final int index, final ConsumerRecord element) {
+        return delegate.set(index, element);
+    }
+
+    @Override
+    public void add(final int index, final ConsumerRecord element) {
+        delegate.add(index, element);
+    }
+
+    @Override
+    public ConsumerRecord remove(final int index) {
+        return delegate.remove(index);
+    }
+
+    @Override
+    public int indexOf(final Object o) {
+        return delegate.indexOf(o);
+    }
+
+    @Override
+    public int lastIndexOf(final Object o) {
+        return delegate.lastIndexOf(o);
+    }
+
+    @Override
+    public ListIterator<ConsumerRecord<?, ?>> listIterator() {
+        return listIterator(0);
+    }
+
+    @Override
+    public ListIterator<ConsumerRecord<?, ?>> listIterator(final int index) {
+        // every iteration will add spans. Not only the very first one
+        return new TracingListIterator(
+                delegate.listIterator(index), operationName, decorator, group, clusterId, bootstrapServers);
+    }
+
+    @Override
+    public List<ConsumerRecord<?, ?>> subList(final int fromIndex, final int toIndex) {
+        return new TracingList(
+                delegate.subList(fromIndex, toIndex), operationName, decorator, group, clusterId, bootstrapServers);
+    }
+
+    @Override
+    public List<ConsumerRecord<?, ?>> getDelegate() {
+        return delegate;
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingListIterator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingListIterator.java
index 3b17006d562..a1d3b42c062 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingListIterator.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingListIterator.java
@@ -8,68 +8,68 @@
 import java.util.ListIterator;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 
-public class TracingListIterator extends TracingIterator
-    implements ListIterator<ConsumerRecord<?, ?>> {
+public class TracingListIterator extends TracingIterator implements ListIterator<ConsumerRecord<?, ?>> {
 
-  private final ListIterator<ConsumerRecord<?, ?>> delegateIterator;
+    private final ListIterator<ConsumerRecord<?, ?>> delegateIterator;
 
-  public TracingListIterator(
-      ListIterator<ConsumerRecord<?, ?>> delegateIterator,
-      CharSequence operationName,
-      KafkaDecorator decorator,
-      String group,
-      String clusterId,
-      String bootstrapServers) {
-    super(delegateIterator, operationName, decorator, group, clusterId, bootstrapServers);
-    this.delegateIterator = delegateIterator;
-  }
+    public TracingListIterator(
+            ListIterator<ConsumerRecord<?, ?>> delegateIterator,
+            CharSequence operationName,
+            KafkaDecorator decorator,
+            String group,
+            String clusterId,
+            String bootstrapServers) {
+        super(delegateIterator, operationName, decorator, group, clusterId, bootstrapServers);
+        this.delegateIterator = delegateIterator;
+    }
 
-  @Override
-  public boolean hasPrevious() {
-    boolean moreRecords = delegateIterator.hasPrevious();
-    if (!moreRecords) {
-      // no more records, use this as a signal to close the last iteration scope
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        closePrevious(true);
-      } else {
-        final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
-        if (previousSpan != null) {
-          previousSpan.finishWithEndToEnd();
+    @Override
+    public boolean hasPrevious() {
+        boolean moreRecords = delegateIterator.hasPrevious();
+        if (!moreRecords) {
+            // no more records, use this as a signal to close the last iteration scope
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                closePrevious(true);
+            } else {
+                final AgentSpan previousSpan =
+                        AgentSpan.fromContext(Context.root().swap());
+                if (previousSpan != null) {
+                    previousSpan.finishWithEndToEnd();
+                }
+            }
         }
-      }
+        return moreRecords;
     }
-    return moreRecords;
-  }
 
-  @Override
-  public ConsumerRecord<?, ?> previous() {
-    final ConsumerRecord<?, ?> prev = delegateIterator.previous();
-    startNewRecordSpan(prev);
-    return prev;
-  }
+    @Override
+    public ConsumerRecord<?, ?> previous() {
+        final ConsumerRecord<?, ?> prev = delegateIterator.previous();
+        startNewRecordSpan(prev);
+        return prev;
+    }
 
-  @Override
-  public int nextIndex() {
-    return delegateIterator.nextIndex();
-  }
+    @Override
+    public int nextIndex() {
+        return delegateIterator.nextIndex();
+    }
 
-  @Override
-  public int previousIndex() {
-    return delegateIterator.previousIndex();
-  }
+    @Override
+    public int previousIndex() {
+        return delegateIterator.previousIndex();
+    }
 
-  /*
-   * org.apache.kafka.clients.consumer.ConsumerRecords::records(TopicPartition) always returns
-   * UnmodifiableList. Modifiable operations will lead to exception
-   */
+    /*
+     * org.apache.kafka.clients.consumer.ConsumerRecords::records(TopicPartition) always returns
+     * UnmodifiableList. Modifiable operations will lead to exception
+     */
 
-  @Override
-  public void set(ConsumerRecord<?, ?> consumerRecord) {
-    delegateIterator.set(consumerRecord);
-  }
+    @Override
+    public void set(ConsumerRecord<?, ?> consumerRecord) {
+        delegateIterator.set(consumerRecord);
+    }
 
-  @Override
-  public void add(ConsumerRecord<?, ?> consumerRecord) {
-    delegateIterator.add(consumerRecord);
-  }
+    @Override
+    public void add(ConsumerRecord<?, ?> consumerRecord) {
+        delegateIterator.add(consumerRecord);
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentationHelperTest.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentationHelperTest.java
index dee19831317..553d28925d5 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentationHelperTest.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentationHelperTest.java
@@ -12,83 +12,71 @@
 
 class KafkaConsumerInstrumentationHelperTest {
 
-  @SuppressWarnings("unchecked")
-  private final ContextStore<Metadata, MetadataState> metadataContextStore =
-      mock(ContextStore.class);
+    @SuppressWarnings("unchecked")
+    private final ContextStore<Metadata, MetadataState> metadataContextStore = mock(ContextStore.class);
 
-  @Test
-  void extractGroupReturnsNullForNullKafkaConsumerInfo() {
-    assertNull(KafkaConsumerInstrumentationHelper.extractGroup(null));
-  }
+    @Test
+    void extractGroupReturnsNullForNullKafkaConsumerInfo() {
+        assertNull(KafkaConsumerInstrumentationHelper.extractGroup(null));
+    }
 
-  @Test
-  void extractGroupReturnsNullWhenConsumerGroupIsNull() {
-    KafkaConsumerInfo kafkaConsumerInfo = new KafkaConsumerInfo(null, null, "localhost:9092");
-    assertNull(KafkaConsumerInstrumentationHelper.extractGroup(kafkaConsumerInfo));
-  }
+    @Test
+    void extractGroupReturnsNullWhenConsumerGroupIsNull() {
+        KafkaConsumerInfo kafkaConsumerInfo = new KafkaConsumerInfo(null, null, "localhost:9092");
+        assertNull(KafkaConsumerInstrumentationHelper.extractGroup(kafkaConsumerInfo));
+    }
 
-  @Test
-  void extractGroupReturnsConsumerGroupWhenPresent() {
-    KafkaConsumerInfo kafkaConsumerInfo =
-        new KafkaConsumerInfo("test-group", null, "localhost:9092");
-    assertEquals("test-group", KafkaConsumerInstrumentationHelper.extractGroup(kafkaConsumerInfo));
-  }
+    @Test
+    void extractGroupReturnsConsumerGroupWhenPresent() {
+        KafkaConsumerInfo kafkaConsumerInfo = new KafkaConsumerInfo("test-group", null, "localhost:9092");
+        assertEquals("test-group", KafkaConsumerInstrumentationHelper.extractGroup(kafkaConsumerInfo));
+    }
 
-  @Test
-  void extractBootstrapServersReturnsNullForNullKafkaConsumerInfo() {
-    assertNull(KafkaConsumerInstrumentationHelper.extractBootstrapServers(null));
-  }
+    @Test
+    void extractBootstrapServersReturnsNullForNullKafkaConsumerInfo() {
+        assertNull(KafkaConsumerInstrumentationHelper.extractBootstrapServers(null));
+    }
 
-  @Test
-  void extractBootstrapServersReturnsNullWhenBootstrapServersIsNull() {
-    KafkaConsumerInfo kafkaConsumerInfo = new KafkaConsumerInfo("test-group", null, null);
-    assertNull(KafkaConsumerInstrumentationHelper.extractBootstrapServers(kafkaConsumerInfo));
-  }
+    @Test
+    void extractBootstrapServersReturnsNullWhenBootstrapServersIsNull() {
+        KafkaConsumerInfo kafkaConsumerInfo = new KafkaConsumerInfo("test-group", null, null);
+        assertNull(KafkaConsumerInstrumentationHelper.extractBootstrapServers(kafkaConsumerInfo));
+    }
 
-  @Test
-  void extractBootstrapServersReturnsValueWhenPresent() {
-    KafkaConsumerInfo kafkaConsumerInfo =
-        new KafkaConsumerInfo("test-group", null, "localhost:9092");
-    assertEquals(
-        "localhost:9092",
-        KafkaConsumerInstrumentationHelper.extractBootstrapServers(kafkaConsumerInfo));
-  }
+    @Test
+    void extractBootstrapServersReturnsValueWhenPresent() {
+        KafkaConsumerInfo kafkaConsumerInfo = new KafkaConsumerInfo("test-group", null, "localhost:9092");
+        assertEquals("localhost:9092", KafkaConsumerInstrumentationHelper.extractBootstrapServers(kafkaConsumerInfo));
+    }
 
-  @Test
-  void extractClusterIdReturnsNullForNullKafkaConsumerInfo() {
-    assertNull(KafkaConsumerInstrumentationHelper.extractClusterId(null, metadataContextStore));
-  }
+    @Test
+    void extractClusterIdReturnsNullForNullKafkaConsumerInfo() {
+        assertNull(KafkaConsumerInstrumentationHelper.extractClusterId(null, metadataContextStore));
+    }
 
-  @Test
-  void extractClusterIdReturnsNullWhenMetadataIsNull() {
-    KafkaConsumerInfo kafkaConsumerInfo = new KafkaConsumerInfo("test-group", "localhost:9092");
-    assertNull(
-        KafkaConsumerInstrumentationHelper.extractClusterId(
-            kafkaConsumerInfo, metadataContextStore));
-  }
+    @Test
+    void extractClusterIdReturnsNullWhenMetadataIsNull() {
+        KafkaConsumerInfo kafkaConsumerInfo = new KafkaConsumerInfo("test-group", "localhost:9092");
+        assertNull(KafkaConsumerInstrumentationHelper.extractClusterId(kafkaConsumerInfo, metadataContextStore));
+    }
 
-  @Test
-  void extractClusterIdReturnsNullWhenNoStateForMetadata() {
-    Metadata metadata = mock(Metadata.class);
-    KafkaConsumerInfo kafkaConsumerInfo =
-        new KafkaConsumerInfo("test-group", metadata, "localhost:9092");
-    when(metadataContextStore.get(metadata)).thenReturn(null);
-    assertNull(
-        KafkaConsumerInstrumentationHelper.extractClusterId(
-            kafkaConsumerInfo, metadataContextStore));
-  }
+    @Test
+    void extractClusterIdReturnsNullWhenNoStateForMetadata() {
+        Metadata metadata = mock(Metadata.class);
+        KafkaConsumerInfo kafkaConsumerInfo = new KafkaConsumerInfo("test-group", metadata, "localhost:9092");
+        when(metadataContextStore.get(metadata)).thenReturn(null);
+        assertNull(KafkaConsumerInstrumentationHelper.extractClusterId(kafkaConsumerInfo, metadataContextStore));
+    }
 
-  @Test
-  void extractClusterIdReturnsClusterIdWhenStatePresent() {
-    Metadata metadata = mock(Metadata.class);
-    KafkaConsumerInfo kafkaConsumerInfo =
-        new KafkaConsumerInfo("test-group", metadata, "localhost:9092");
-    MetadataState state = new MetadataState();
-    state.clusterId = "cluster-1";
-    when(metadataContextStore.get(metadata)).thenReturn(state);
-    assertEquals(
-        "cluster-1",
-        KafkaConsumerInstrumentationHelper.extractClusterId(
-            kafkaConsumerInfo, metadataContextStore));
-  }
+    @Test
+    void extractClusterIdReturnsClusterIdWhenStatePresent() {
+        Metadata metadata = mock(Metadata.class);
+        KafkaConsumerInfo kafkaConsumerInfo = new KafkaConsumerInfo("test-group", metadata, "localhost:9092");
+        MetadataState state = new MetadataState();
+        state.clusterId = "cluster-1";
+        when(metadataContextStore.get(metadata)).thenReturn(state);
+        assertEquals(
+                "cluster-1",
+                KafkaConsumerInstrumentationHelper.extractClusterId(kafkaConsumerInfo, metadataContextStore));
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/ClusterIdHolder.java b/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/ClusterIdHolder.java
index fa0b90eebce..e59949466b3 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/ClusterIdHolder.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/ClusterIdHolder.java
@@ -6,17 +6,17 @@
  * registry serializer/deserializer instrumentation reads it.
  */
 public class ClusterIdHolder {
-  private static final ThreadLocal<String> CLUSTER_ID = new ThreadLocal<>();
+    private static final ThreadLocal<String> CLUSTER_ID = new ThreadLocal<>();
 
-  public static void set(String clusterId) {
-    CLUSTER_ID.set(clusterId);
-  }
+    public static void set(String clusterId) {
+        CLUSTER_ID.set(clusterId);
+    }
 
-  public static String get() {
-    return CLUSTER_ID.get();
-  }
+    public static String get() {
+        return CLUSTER_ID.get();
+    }
 
-  public static void clear() {
-    CLUSTER_ID.set(null);
-  }
+    public static void clear() {
+        CLUSTER_ID.set(null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/KafkaConfigHelper.java b/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/KafkaConfigHelper.java
index 2ffbf11f46f..be3ecc5131a 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/KafkaConfigHelper.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/KafkaConfigHelper.java
@@ -14,170 +14,162 @@
 
 /** Helper to extract Kafka producer/consumer configuration as string maps for DSM reporting. */
 public class KafkaConfigHelper {
-  private static final Logger log = LoggerFactory.getLogger(KafkaConfigHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(KafkaConfigHelper.class);
 
-  public static final String MASKED_VALUE = "****";
+    public static final String MASKED_VALUE = "****";
 
-  /**
-   * Config keys that are safe to capture with their values. Other keys are captured with masked
-   * values.
-   */
-  public static final Set<String> ALLOWED_KEYS =
-      new HashSet<>(
-          Arrays.asList(
-              // Common client configs
-              "bootstrap.servers",
-              "client.id",
-              "client.dns.lookup",
-              "client.rack",
-              "metadata.max.age.ms",
-              "metadata.max.idle.ms",
-              "request.timeout.ms",
-              "connections.max.idle.ms",
-              "reconnect.backoff.ms",
-              "reconnect.backoff.max.ms",
-              "retry.backoff.ms",
-              "retry.backoff.max.ms",
-              "send.buffer.bytes",
-              "receive.buffer.bytes",
-              "socket.connection.setup.timeout.ms",
-              "socket.connection.setup.timeout.max.ms",
-              "security.protocol",
-              "metrics.sample.window.ms",
-              "metrics.num.samples",
-              "metrics.recording.level",
-              // Producer configs
-              "batch.size",
-              "acks",
-              "linger.ms",
-              "buffer.memory",
-              "max.request.size",
-              "max.block.ms",
-              "compression.type",
-              "delivery.timeout.ms",
-              "enable.idempotence",
-              "max.in.flight.requests.per.connection",
-              "transaction.timeout.ms",
-              "transactional.id",
-              "retries",
-              "partitioner.class",
-              "partitioner.ignore.keys",
-              "partitioner.adaptive.partitioning.enable",
-              "partitioner.availability.timeout.ms",
-              "key.serializer",
-              "value.serializer",
-              // Consumer configs
-              "group.id",
-              "group.instance.id",
-              "group.protocol",
-              "group.remote.assignor",
-              "max.poll.records",
-              "max.poll.interval.ms",
-              "session.timeout.ms",
-              "heartbeat.interval.ms",
-              "enable.auto.commit",
-              "auto.commit.interval.ms",
-              "auto.offset.reset",
-              "partition.assignment.strategy",
-              "fetch.min.bytes",
-              "fetch.max.bytes",
-              "fetch.max.wait.ms",
-              "max.partition.fetch.bytes",
-              "check.crcs",
-              "key.deserializer",
-              "value.deserializer",
-              "exclude.internal.topics",
-              "isolation.level",
-              "allow.auto.create.topics",
-              "default.api.timeout.ms"));
+    /**
+     * Config keys that are safe to capture with their values. Other keys are captured with masked
+     * values.
+     */
+    public static final Set<String> ALLOWED_KEYS = new HashSet<>(Arrays.asList(
+            // Common client configs
+            "bootstrap.servers",
+            "client.id",
+            "client.dns.lookup",
+            "client.rack",
+            "metadata.max.age.ms",
+            "metadata.max.idle.ms",
+            "request.timeout.ms",
+            "connections.max.idle.ms",
+            "reconnect.backoff.ms",
+            "reconnect.backoff.max.ms",
+            "retry.backoff.ms",
+            "retry.backoff.max.ms",
+            "send.buffer.bytes",
+            "receive.buffer.bytes",
+            "socket.connection.setup.timeout.ms",
+            "socket.connection.setup.timeout.max.ms",
+            "security.protocol",
+            "metrics.sample.window.ms",
+            "metrics.num.samples",
+            "metrics.recording.level",
+            // Producer configs
+            "batch.size",
+            "acks",
+            "linger.ms",
+            "buffer.memory",
+            "max.request.size",
+            "max.block.ms",
+            "compression.type",
+            "delivery.timeout.ms",
+            "enable.idempotence",
+            "max.in.flight.requests.per.connection",
+            "transaction.timeout.ms",
+            "transactional.id",
+            "retries",
+            "partitioner.class",
+            "partitioner.ignore.keys",
+            "partitioner.adaptive.partitioning.enable",
+            "partitioner.availability.timeout.ms",
+            "key.serializer",
+            "value.serializer",
+            // Consumer configs
+            "group.id",
+            "group.instance.id",
+            "group.protocol",
+            "group.remote.assignor",
+            "max.poll.records",
+            "max.poll.interval.ms",
+            "session.timeout.ms",
+            "heartbeat.interval.ms",
+            "enable.auto.commit",
+            "auto.commit.interval.ms",
+            "auto.offset.reset",
+            "partition.assignment.strategy",
+            "fetch.min.bytes",
+            "fetch.max.bytes",
+            "fetch.max.wait.ms",
+            "max.partition.fetch.bytes",
+            "check.crcs",
+            "key.deserializer",
+            "value.deserializer",
+            "exclude.internal.topics",
+            "isolation.level",
+            "allow.auto.create.topics",
+            "default.api.timeout.ms"));
 
-  /** Store a producer config to be reported once the cluster ID is known from metadata. */
-  public static void storePendingProducerConfig(MetadataState state, Map<String, String> config) {
-    state.setPendingConfig(new PendingConfig("kafka_producer", "", config));
-    log.debug("Stored pending producer config (cluster ID not yet known)");
-  }
-
-  /** Store a consumer config to be reported once the cluster ID is known from metadata. */
-  public static void storePendingConsumerConfig(
-      MetadataState state, String consumerGroup, Map<String, String> config) {
-    state.setPendingConfig(
-        new PendingConfig("kafka_consumer", consumerGroup != null ? consumerGroup : "", config));
-    log.debug("Stored pending consumer config (cluster ID not yet known)");
-  }
+    /** Store a producer config to be reported once the cluster ID is known from metadata. */
+    public static void storePendingProducerConfig(MetadataState state, Map<String, String> config) {
+        state.setPendingConfig(new PendingConfig("kafka_producer", "", config));
+        log.debug("Stored pending producer config (cluster ID not yet known)");
+    }
 
-  public static boolean reportConsumerGroupMember(
-      String clusterId,
-      String consumerGroup,
-      String memberId,
-      int generationId,
-      String memberProtocol) {
-    if (memberId == null || memberId.isEmpty() || clusterId == null || clusterId.isEmpty()) {
-      return false;
+    /** Store a consumer config to be reported once the cluster ID is known from metadata. */
+    public static void storePendingConsumerConfig(
+            MetadataState state, String consumerGroup, Map<String, String> config) {
+        state.setPendingConfig(new PendingConfig("kafka_consumer", consumerGroup != null ? consumerGroup : "", config));
+        log.debug("Stored pending consumer config (cluster ID not yet known)");
     }
-    if (Config.get().isDataStreamsEnabled()) {
-      AgentTracer.get()
-          .getDataStreamsMonitoring()
-          .reportKafkaConsumerGroupMember(
-              clusterId,
-              consumerGroup != null ? consumerGroup : "",
-              memberId,
-              generationId,
-              memberProtocol != null ? memberProtocol : "");
+
+    public static boolean reportConsumerGroupMember(
+            String clusterId, String consumerGroup, String memberId, int generationId, String memberProtocol) {
+        if (memberId == null || memberId.isEmpty() || clusterId == null || clusterId.isEmpty()) {
+            return false;
+        }
+        if (Config.get().isDataStreamsEnabled()) {
+            AgentTracer.get()
+                    .getDataStreamsMonitoring()
+                    .reportKafkaConsumerGroupMember(
+                            clusterId,
+                            consumerGroup != null ? consumerGroup : "",
+                            memberId,
+                            generationId,
+                            memberProtocol != null ? memberProtocol : "");
+        }
+        return true;
     }
-    return true;
-  }
 
-  /** Called from metadata update advice when the cluster ID becomes available. */
-  public static void reportPendingConfig(MetadataState state, String clusterId) {
-    PendingConfig pending = state.takePendingConfig();
-    if (pending != null) {
-      log.debug("Received cluster ID, reporting {} config", pending.type);
-      if (Config.get().isDataStreamsEnabled()) {
-        AgentTracer.get()
-            .getDataStreamsMonitoring()
-            .reportKafkaConfig(pending.type, clusterId, pending.consumerGroup, pending.config);
-      }
+    /** Called from metadata update advice when the cluster ID becomes available. */
+    public static void reportPendingConfig(MetadataState state, String clusterId) {
+        PendingConfig pending = state.takePendingConfig();
+        if (pending != null) {
+            log.debug("Received cluster ID, reporting {} config", pending.type);
+            if (Config.get().isDataStreamsEnabled()) {
+                AgentTracer.get()
+                        .getDataStreamsMonitoring()
+                        .reportKafkaConfig(pending.type, clusterId, pending.consumerGroup, pending.config);
+            }
+        }
     }
-  }
 
-  public static Map<String, String> extractProducerConfig(ProducerConfig producerConfig) {
-    try {
-      return convertToStringMap(producerConfig.values());
-    } catch (Exception e) {
-      log.debug("Error extracting producer configuration", e);
-      return new LinkedHashMap<>();
+    public static Map<String, String> extractProducerConfig(ProducerConfig producerConfig) {
+        try {
+            return convertToStringMap(producerConfig.values());
+        } catch (Exception e) {
+            log.debug("Error extracting producer configuration", e);
+            return new LinkedHashMap<>();
+        }
     }
-  }
 
-  public static Map<String, String> extractConsumerConfig(ConsumerConfig consumerConfig) {
-    try {
-      return convertToStringMap(consumerConfig.values());
-    } catch (Exception e) {
-      log.debug("Error extracting consumer configuration", e);
-      return new LinkedHashMap<>();
+    public static Map<String, String> extractConsumerConfig(ConsumerConfig consumerConfig) {
+        try {
+            return convertToStringMap(consumerConfig.values());
+        } catch (Exception e) {
+            log.debug("Error extracting consumer configuration", e);
+            return new LinkedHashMap<>();
+        }
     }
-  }
 
-  public static Map<String, String> extractConsumerConfigFromMap(
-      Map<String, Object> consumerConfig) {
-    try {
-      return convertToStringMap(consumerConfig);
-    } catch (Exception e) {
-      log.debug("Error extracting consumer configuration from map", e);
-      return new LinkedHashMap<>();
+    public static Map<String, String> extractConsumerConfigFromMap(Map<String, Object> consumerConfig) {
+        try {
+            return convertToStringMap(consumerConfig);
+        } catch (Exception e) {
+            log.debug("Error extracting consumer configuration from map", e);
+            return new LinkedHashMap<>();
+        }
     }
-  }
 
-  private static Map<String, String> convertToStringMap(Map<String, ?> config) {
-    Map<String, String> result = new LinkedHashMap<>();
-    for (Map.Entry<String, ?> entry : config.entrySet()) {
-      if (ALLOWED_KEYS.contains(entry.getKey())) {
-        Object value = entry.getValue();
-        result.put(entry.getKey(), value != null ? String.valueOf(value) : "");
-      } else {
-        result.put(entry.getKey(), MASKED_VALUE);
-      }
+    private static Map<String, String> convertToStringMap(Map<String, ?> config) {
+        Map<String, String> result = new LinkedHashMap<>();
+        for (Map.Entry<String, ?> entry : config.entrySet()) {
+            if (ALLOWED_KEYS.contains(entry.getKey())) {
+                Object value = entry.getValue();
+                result.put(entry.getKey(), value != null ? String.valueOf(value) : "");
+            } else {
+                result.put(entry.getKey(), MASKED_VALUE);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/MetadataState.java b/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/MetadataState.java
index a4444a844ce..d81cc26b477 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/MetadataState.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/MetadataState.java
@@ -4,15 +4,15 @@
 
 /** Composite state attached to Kafka Metadata objects via contextStore. */
 public class MetadataState {
-  public volatile String clusterId;
-  private final AtomicReference<PendingConfig> pendingConfig = new AtomicReference<>();
+    public volatile String clusterId;
+    private final AtomicReference<PendingConfig> pendingConfig = new AtomicReference<>();
 
-  public void setPendingConfig(PendingConfig config) {
-    pendingConfig.set(config);
-  }
+    public void setPendingConfig(PendingConfig config) {
+        pendingConfig.set(config);
+    }
 
-  /** Atomically retrieves and clears the pending config. */
-  public PendingConfig takePendingConfig() {
-    return pendingConfig.getAndSet(null);
-  }
+    /** Atomically retrieves and clears the pending config. */
+    public PendingConfig takePendingConfig() {
+        return pendingConfig.getAndSet(null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/PendingConfig.java b/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/PendingConfig.java
index e0798d00ecf..b11f9a7fb7e 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/PendingConfig.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/PendingConfig.java
@@ -4,13 +4,13 @@
 
 /** Holds pending Kafka config info until the cluster ID becomes available from metadata. */
 public class PendingConfig {
-  public final String type;
-  public final String consumerGroup;
-  public final Map<String, String> config;
+    public final String type;
+    public final String consumerGroup;
+    public final Map<String, String> config;
 
-  public PendingConfig(String type, String consumerGroup, Map<String, String> config) {
-    this.type = type;
-    this.consumerGroup = consumerGroup;
-    this.config = config;
-  }
+    public PendingConfig(String type, String consumerGroup, Map<String, String> config) {
+        this.type = type;
+        this.consumerGroup = consumerGroup;
+        this.config = config;
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/StreamingContext.java b/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/StreamingContext.java
index bb93674a7fc..88da92437f6 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/StreamingContext.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/StreamingContext.java
@@ -6,75 +6,73 @@
 
 /// StreamingContext holds the KStreams topology information
 public class StreamingContext {
-  private static final Integer UNKNOWN_TOPIC = 0;
-  private static final Integer SOURCE_TOPIC = 1;
-  private static final Integer INTERNAL_TOPIC = 2;
-  private static final Integer SINK_TOPIC = 3;
-  // at max we store each topic 2 times, there are 3 types of topics.
-  // each topic may be up to 256bytes in size, which results in:
-  // 2 * 3 * 500 * 256 = 750KB in the worst case.
-  private static final Integer MAX_TOPICS_PER_TYPE = 500;
-
-  public static final StreamingContext STREAMING_CONTEXT = new StreamingContext();
-
-  private void addAllLimit(Set<String> from, Set<String> to) {
-    for (String item : from) {
-      if (to.size() > StreamingContext.MAX_TOPICS_PER_TYPE) {
-        return;
-      }
-      to.add(item);
-    }
-  }
-
-  public void registerTopics(
-      Set<String> sourceTopics, Set<String> sinkTopics, Set<String> internalTopics) {
-    addAllLimit(sourceTopics, allSourceTopics);
-    addAllLimit(sinkTopics, allSinkTopics);
-    addAllLimit(internalTopics, allInternalTopics);
-
-    // remap source/sink between sub topologies
-    ConcurrentHashMap<String, Integer> newTopics = new ConcurrentHashMap<>();
-    for (String sourceTopic : allSourceTopics) {
-      if (allSinkTopics.contains(sourceTopic)) {
-        newTopics.put(sourceTopic, INTERNAL_TOPIC);
-      } else {
-        newTopics.put(sourceTopic, SOURCE_TOPIC);
-      }
+    private static final Integer UNKNOWN_TOPIC = 0;
+    private static final Integer SOURCE_TOPIC = 1;
+    private static final Integer INTERNAL_TOPIC = 2;
+    private static final Integer SINK_TOPIC = 3;
+    // at max we store each topic 2 times, there are 3 types of topics.
+    // each topic may be up to 256bytes in size, which results in:
+    // 2 * 3 * 500 * 256 = 750KB in the worst case.
+    private static final Integer MAX_TOPICS_PER_TYPE = 500;
+
+    public static final StreamingContext STREAMING_CONTEXT = new StreamingContext();
+
+    private void addAllLimit(Set<String> from, Set<String> to) {
+        for (String item : from) {
+            if (to.size() > StreamingContext.MAX_TOPICS_PER_TYPE) {
+                return;
+            }
+            to.add(item);
+        }
     }
 
-    for (String sinkTopic : allSinkTopics) {
-      if (!allSourceTopics.contains(sinkTopic)) {
-        newTopics.put(sinkTopic, SINK_TOPIC);
-      }
+    public void registerTopics(Set<String> sourceTopics, Set<String> sinkTopics, Set<String> internalTopics) {
+        addAllLimit(sourceTopics, allSourceTopics);
+        addAllLimit(sinkTopics, allSinkTopics);
+        addAllLimit(internalTopics, allInternalTopics);
+
+        // remap source/sink between sub topologies
+        ConcurrentHashMap<String, Integer> newTopics = new ConcurrentHashMap<>();
+        for (String sourceTopic : allSourceTopics) {
+            if (allSinkTopics.contains(sourceTopic)) {
+                newTopics.put(sourceTopic, INTERNAL_TOPIC);
+            } else {
+                newTopics.put(sourceTopic, SOURCE_TOPIC);
+            }
+        }
+
+        for (String sinkTopic : allSinkTopics) {
+            if (!allSourceTopics.contains(sinkTopic)) {
+                newTopics.put(sinkTopic, SINK_TOPIC);
+            }
+        }
+
+        // add internal topics
+        for (String internalTopic : allInternalTopics) {
+            newTopics.put(internalTopic, INTERNAL_TOPIC);
+        }
+
+        topics = newTopics;
     }
 
-    // add internal topics
-    for (String internalTopic : allInternalTopics) {
-      newTopics.put(internalTopic, INTERNAL_TOPIC);
+    public boolean isSinkTopic(final String topic) {
+        return Objects.equals(topics.getOrDefault(topic, UNKNOWN_TOPIC), SINK_TOPIC);
     }
 
-    topics = newTopics;
-  }
-
-  public boolean isSinkTopic(final String topic) {
-    return Objects.equals(topics.getOrDefault(topic, UNKNOWN_TOPIC), SINK_TOPIC);
-  }
-
-  public boolean isSourceTopic(final String topic) {
-    return Objects.equals(topics.getOrDefault(topic, UNKNOWN_TOPIC), SOURCE_TOPIC);
-  }
+    public boolean isSourceTopic(final String topic) {
+        return Objects.equals(topics.getOrDefault(topic, UNKNOWN_TOPIC), SOURCE_TOPIC);
+    }
 
-  // Checks if this topic is a part of a streaming topology
-  public boolean isDisabledForTopic(final String topic) {
-    return topics.isEmpty()
-        || Objects.equals(topics.getOrDefault(topic, UNKNOWN_TOPIC), UNKNOWN_TOPIC);
-  }
+    // Checks if this topic is a part of a streaming topology
+    public boolean isDisabledForTopic(final String topic) {
+        return topics.isEmpty() || Objects.equals(topics.getOrDefault(topic, UNKNOWN_TOPIC), UNKNOWN_TOPIC);
+    }
 
-  private final Set<String> allSourceTopics = ConcurrentHashMap.newKeySet();
+    private final Set<String> allSourceTopics = ConcurrentHashMap.newKeySet();
 
-  private final Set<String> allSinkTopics = ConcurrentHashMap.newKeySet();
+    private final Set<String> allSinkTopics = ConcurrentHashMap.newKeySet();
 
-  private final Set<String> allInternalTopics = ConcurrentHashMap.newKeySet();
+    private final Set<String> allInternalTopics = ConcurrentHashMap.newKeySet();
 
-  private ConcurrentHashMap<String, Integer> topics = new ConcurrentHashMap<>();
+    private ConcurrentHashMap<String, Integer> topics = new ConcurrentHashMap<>();
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/Utils.java b/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/Utils.java
index d0f7eb4fcea..965e6b975bd 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/Utils.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/Utils.java
@@ -7,27 +7,26 @@
 import org.apache.kafka.common.header.Headers;
 
 public final class Utils {
-  private Utils() {} // prevent instantiation
+    private Utils() {} // prevent instantiation
 
-  public static DataStreamsTransactionTracker.TransactionSourceReader
-      DSM_TRANSACTION_SOURCE_READER =
-          (source, headerName) -> {
-            try {
-              return new String(((Headers) source).lastHeader(headerName).value());
-            } catch (Throwable ignored) {
-              return null;
-            }
-          };
+    public static DataStreamsTransactionTracker.TransactionSourceReader DSM_TRANSACTION_SOURCE_READER =
+            (source, headerName) -> {
+                try {
+                    return new String(((Headers) source).lastHeader(headerName).value());
+                } catch (Throwable ignored) {
+                    return null;
+                }
+            };
 
-  // this method is used in kafka-clients and kafka-streams instrumentations
-  public static long computePayloadSizeBytes(ConsumerRecord<?, ?> val) {
-    long headersSize = 0;
-    Headers headers = val.headers();
-    if (headers != null)
-      for (Header h : headers) {
-        int valueSize = h.value() == null ? 0 : h.value().length;
-        headersSize += valueSize + h.key().getBytes(StandardCharsets.UTF_8).length;
-      }
-    return headersSize + val.serializedKeySize() + val.serializedValueSize();
-  }
+    // this method is used in kafka-clients and kafka-streams instrumentations
+    public static long computePayloadSizeBytes(ConsumerRecord<?, ?> val) {
+        long headersSize = 0;
+        Headers headers = val.headers();
+        if (headers != null)
+            for (Header h : headers) {
+                int valueSize = h.value() == null ? 0 : h.value().length;
+                headersSize += valueSize + h.key().getBytes(StandardCharsets.UTF_8).length;
+            }
+        return headersSize + val.serializedKeySize() + val.serializedValueSize();
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/src/main/java/datadog/trace/instrumentation/kafka_connect/ConnectWorkerInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/src/main/java/datadog/trace/instrumentation/kafka_connect/ConnectWorkerInstrumentation.java
index 088a9b62d4a..a6c188412e7 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/src/main/java/datadog/trace/instrumentation/kafka_connect/ConnectWorkerInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/src/main/java/datadog/trace/instrumentation/kafka_connect/ConnectWorkerInstrumentation.java
@@ -17,46 +17,46 @@
 
 @AutoService(InstrumenterModule.class)
 public final class ConnectWorkerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  static final String TARGET_TYPE = "org.apache.kafka.connect.runtime.WorkerTask";
-
-  public ConnectWorkerInstrumentation() {
-    super("kafka", "kafka-connect");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return TARGET_TYPE;
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(0, named("org.apache.kafka.connect.util.ConnectorTaskId")))
-            .and(takesArgument(1, named("org.apache.kafka.connect.runtime.TaskStatus$Listener"))),
-        ConnectWorkerInstrumentation.class.getName() + "$ConstructorAdvice");
-  }
-
-  public static class ConstructorAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void wrap(
-        @Advice.Argument(value = 0, readOnly = true) ConnectorTaskId id,
-        @Advice.Argument(value = 1, readOnly = false) Listener statusListener) {
-      statusListener = new TaskListener(statusListener);
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    static final String TARGET_TYPE = "org.apache.kafka.connect.runtime.WorkerTask";
+
+    public ConnectWorkerInstrumentation() {
+        super("kafka", "kafka-connect");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return TARGET_TYPE;
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(0, named("org.apache.kafka.connect.util.ConnectorTaskId")))
+                        .and(takesArgument(1, named("org.apache.kafka.connect.runtime.TaskStatus$Listener"))),
+                ConnectWorkerInstrumentation.class.getName() + "$ConstructorAdvice");
     }
 
-    public static void muzzleCheck(ConsumerRecord record) {
-      // KafkaConsumerInstrumentation only applies for kafka versions with headers
-      // Make an explicit call so ConsumerCoordinatorInstrumentation does the same
-      record.headers();
+    public static class ConstructorAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void wrap(
+                @Advice.Argument(value = 0, readOnly = true) ConnectorTaskId id,
+                @Advice.Argument(value = 1, readOnly = false) Listener statusListener) {
+            statusListener = new TaskListener(statusListener);
+        }
+
+        public static void muzzleCheck(ConsumerRecord record) {
+            // KafkaConsumerInstrumentation only applies for kafka versions with headers
+            // Make an explicit call so ConsumerCoordinatorInstrumentation does the same
+            record.headers();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/src/main/java/datadog/trace/instrumentation/kafka_connect/TaskListener.java b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/src/main/java/datadog/trace/instrumentation/kafka_connect/TaskListener.java
index c30ab4062e1..050aeedb784 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/src/main/java/datadog/trace/instrumentation/kafka_connect/TaskListener.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/src/main/java/datadog/trace/instrumentation/kafka_connect/TaskListener.java
@@ -5,48 +5,48 @@
 import org.apache.kafka.connect.util.ConnectorTaskId;
 
 public class TaskListener implements Listener {
-  private final Listener delegate;
-
-  public TaskListener(Listener delegate) {
-    this.delegate = delegate;
-  }
-
-  @Override
-  public void onStartup(ConnectorTaskId connectorTaskId) {
-    AgentTracer.get().getDataStreamsMonitoring().setThreadServiceName(connectorTaskId.connector());
-    delegate.onStartup(connectorTaskId);
-  }
-
-  @Override
-  public void onPause(ConnectorTaskId connectorTaskId) {
-    try {
-      delegate.onPause(connectorTaskId);
-    } finally {
-      AgentTracer.get().getDataStreamsMonitoring().clearThreadServiceName();
+    private final Listener delegate;
+
+    public TaskListener(Listener delegate) {
+        this.delegate = delegate;
     }
-  }
-
-  @Override
-  public void onResume(ConnectorTaskId connectorTaskId) {
-    AgentTracer.get().getDataStreamsMonitoring().setThreadServiceName(connectorTaskId.connector());
-    delegate.onResume(connectorTaskId);
-  }
-
-  @Override
-  public void onFailure(ConnectorTaskId connectorTaskId, Throwable throwable) {
-    try {
-      delegate.onFailure(connectorTaskId, throwable);
-    } finally {
-      AgentTracer.get().getDataStreamsMonitoring().clearThreadServiceName();
+
+    @Override
+    public void onStartup(ConnectorTaskId connectorTaskId) {
+        AgentTracer.get().getDataStreamsMonitoring().setThreadServiceName(connectorTaskId.connector());
+        delegate.onStartup(connectorTaskId);
     }
-  }
-
-  @Override
-  public void onShutdown(ConnectorTaskId connectorTaskId) {
-    try {
-      delegate.onShutdown(connectorTaskId);
-    } finally {
-      AgentTracer.get().getDataStreamsMonitoring().clearThreadServiceName();
+
+    @Override
+    public void onPause(ConnectorTaskId connectorTaskId) {
+        try {
+            delegate.onPause(connectorTaskId);
+        } finally {
+            AgentTracer.get().getDataStreamsMonitoring().clearThreadServiceName();
+        }
+    }
+
+    @Override
+    public void onResume(ConnectorTaskId connectorTaskId) {
+        AgentTracer.get().getDataStreamsMonitoring().setThreadServiceName(connectorTaskId.connector());
+        delegate.onResume(connectorTaskId);
+    }
+
+    @Override
+    public void onFailure(ConnectorTaskId connectorTaskId, Throwable throwable) {
+        try {
+            delegate.onFailure(connectorTaskId, throwable);
+        } finally {
+            AgentTracer.get().getDataStreamsMonitoring().clearThreadServiceName();
+        }
+    }
+
+    @Override
+    public void onShutdown(ConnectorTaskId connectorTaskId) {
+        try {
+            delegate.onShutdown(connectorTaskId);
+        } finally {
+            AgentTracer.get().getDataStreamsMonitoring().clearThreadServiceName();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java
index 1131bf8b710..1c1fd3338c9 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java
@@ -58,367 +58,354 @@
 
 @AutoService(InstrumenterModule.class)
 public class KafkaStreamTaskInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public KafkaStreamTaskInstrumentation() {
-    super("kafka", "kafka-streams");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.kafka.streams.processor.internals.StreamTask";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.kafka_clients.TracingIterableDelegator",
-      "datadog.trace.instrumentation.kafka_common.Utils",
-      "datadog.trace.instrumentation.kafka_common.StreamingContext",
-      packageName + ".KafkaStreamsDecorator",
-      packageName + ".ProcessorRecordContextHeadersAccess",
-      packageName + ".ProcessorRecordContextVisitor",
-      packageName + ".ProcessorRecordContextSetter",
-      packageName + ".StampedRecordContextVisitor",
-      packageName + ".StampedRecordContextSetter",
-      packageName + ".StreamTaskContext",
-    };
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(
-        "org.apache.kafka.streams.processor.internals.StreamTask",
-        packageName + ".StreamTaskContext");
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // StreamsConfig was the 4th input argument to StreamTask's constructor in kafka versions 2.6 to
-    // 3.1.
-    // Starting from 3.2 StreamsConfig was no longer an input argument into StreamTask.
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(4, named("org.apache.kafka.streams.StreamsConfig"))),
-        KafkaStreamTaskInstrumentation.class.getName() + "$Constructor4Advice");
-
-    // StreamsConfig was the 5th input argument to StreamTask's constructor in kafka versions 1.1 to
-    // 2.5
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(5, named("org.apache.kafka.streams.StreamsConfig"))),
-        KafkaStreamTaskInstrumentation.class.getName() + "$Constructor5Advice");
-
-    // StreamsConfig was the 6th input argument to StreamTask's constructor in kafka versions 0.11
-    // to 1.0.
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(6, named("org.apache.kafka.streams.StreamsConfig"))),
-        KafkaStreamTaskInstrumentation.class.getName() + "$Constructor6Advice");
-
-    transformer.applyAdvice(
-        isMethod().and(named("addRecords")).and(takesArgument(1, named("java.lang.Iterable"))),
-        KafkaStreamTaskInstrumentation.class.getName() + "$UnwrapIterableAdvice");
-
-    // Before 2.7
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("updateProcessorContext"))
-            .and(
-                takesArgument(
-                    0, named("org.apache.kafka.streams.processor.internals.StampedRecord")))
-            .and(
-                takesArgument(
-                    1, named("org.apache.kafka.streams.processor.internals.ProcessorNode"))),
-        KafkaStreamTaskInstrumentation.class.getName() + "$ContextPropagationAdvice",
-        KafkaStreamTaskInstrumentation.class.getName() + "$StartSpanAdvice");
-    // After 2.7
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("updateProcessorContext"))
-            .and(
-                takesArgument(
-                    0, named("org.apache.kafka.streams.processor.internals.ProcessorNode")))
-            .and(
-                takesArgument(
-                    2,
-                    named("org.apache.kafka.streams.processor.internals.ProcessorRecordContext"))),
-        KafkaStreamTaskInstrumentation.class.getName() + "$ContextPropagationAdvice27",
-        KafkaStreamTaskInstrumentation.class.getName() + "$StartSpanAdvice27");
-
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("process"))
-            // Method signature changed in 2.6.
-            .and(takesArguments(0).or(takesArguments(1).and(takesArgument(0, long.class)))),
-        KafkaStreamTaskInstrumentation.class.getName() + "$StopSpanAdvice");
-  }
-
-  public static class Constructor4Advice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void captureGroup(
-        @Advice.This StreamTask task, @Advice.Argument(4) StreamsConfig streamsConfig) {
-      String applicationId = streamsConfig.getString(StreamsConfig.APPLICATION_ID_CONFIG);
-
-      if (applicationId != null && !applicationId.isEmpty()) {
-        StreamTaskContext context =
-            InstrumentationContext.get(StreamTask.class, StreamTaskContext.class).get(task);
-        if (context == null) {
-          context = new StreamTaskContext();
-        }
-        context.setApplicationId(applicationId);
-        InstrumentationContext.get(StreamTask.class, StreamTaskContext.class).put(task, context);
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public KafkaStreamTaskInstrumentation() {
+        super("kafka", "kafka-streams");
     }
-  }
-
-  public static class Constructor5Advice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void captureGroup(
-        @Advice.This StreamTask task, @Advice.Argument(5) StreamsConfig streamsConfig) {
-      String applicationId = streamsConfig.getString(StreamsConfig.APPLICATION_ID_CONFIG);
-
-      if (applicationId != null && !applicationId.isEmpty()) {
-        StreamTaskContext context =
-            InstrumentationContext.get(StreamTask.class, StreamTaskContext.class).get(task);
-        if (context == null) {
-          context = new StreamTaskContext();
-        }
-        context.setApplicationId(applicationId);
-        InstrumentationContext.get(StreamTask.class, StreamTaskContext.class).put(task, context);
-      }
+
+    @Override
+    public String instrumentedType() {
+        return "org.apache.kafka.streams.processor.internals.StreamTask";
     }
-  }
-
-  public static class Constructor6Advice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void captureGroup(
-        @Advice.This StreamTask task, @Advice.Argument(6) StreamsConfig streamsConfig) {
-      String applicationId = streamsConfig.getString(StreamsConfig.APPLICATION_ID_CONFIG);
-
-      if (applicationId != null && !applicationId.isEmpty()) {
-        StreamTaskContext context =
-            InstrumentationContext.get(StreamTask.class, StreamTaskContext.class).get(task);
-        if (context == null) {
-          context = new StreamTaskContext();
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.kafka_clients.TracingIterableDelegator",
+            "datadog.trace.instrumentation.kafka_common.Utils",
+            "datadog.trace.instrumentation.kafka_common.StreamingContext",
+            packageName + ".KafkaStreamsDecorator",
+            packageName + ".ProcessorRecordContextHeadersAccess",
+            packageName + ".ProcessorRecordContextVisitor",
+            packageName + ".ProcessorRecordContextSetter",
+            packageName + ".StampedRecordContextVisitor",
+            packageName + ".StampedRecordContextSetter",
+            packageName + ".StreamTaskContext",
+        };
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(
+                "org.apache.kafka.streams.processor.internals.StreamTask", packageName + ".StreamTaskContext");
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // StreamsConfig was the 4th input argument to StreamTask's constructor in kafka versions 2.6 to
+        // 3.1.
+        // Starting from 3.2 StreamsConfig was no longer an input argument into StreamTask.
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(4, named("org.apache.kafka.streams.StreamsConfig"))),
+                KafkaStreamTaskInstrumentation.class.getName() + "$Constructor4Advice");
+
+        // StreamsConfig was the 5th input argument to StreamTask's constructor in kafka versions 1.1 to
+        // 2.5
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(5, named("org.apache.kafka.streams.StreamsConfig"))),
+                KafkaStreamTaskInstrumentation.class.getName() + "$Constructor5Advice");
+
+        // StreamsConfig was the 6th input argument to StreamTask's constructor in kafka versions 0.11
+        // to 1.0.
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(6, named("org.apache.kafka.streams.StreamsConfig"))),
+                KafkaStreamTaskInstrumentation.class.getName() + "$Constructor6Advice");
+
+        transformer.applyAdvice(
+                isMethod().and(named("addRecords")).and(takesArgument(1, named("java.lang.Iterable"))),
+                KafkaStreamTaskInstrumentation.class.getName() + "$UnwrapIterableAdvice");
+
+        // Before 2.7
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("updateProcessorContext"))
+                        .and(takesArgument(0, named("org.apache.kafka.streams.processor.internals.StampedRecord")))
+                        .and(takesArgument(1, named("org.apache.kafka.streams.processor.internals.ProcessorNode"))),
+                KafkaStreamTaskInstrumentation.class.getName() + "$ContextPropagationAdvice",
+                KafkaStreamTaskInstrumentation.class.getName() + "$StartSpanAdvice");
+        // After 2.7
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("updateProcessorContext"))
+                        .and(takesArgument(0, named("org.apache.kafka.streams.processor.internals.ProcessorNode")))
+                        .and(takesArgument(
+                                2, named("org.apache.kafka.streams.processor.internals.ProcessorRecordContext"))),
+                KafkaStreamTaskInstrumentation.class.getName() + "$ContextPropagationAdvice27",
+                KafkaStreamTaskInstrumentation.class.getName() + "$StartSpanAdvice27");
+
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("process"))
+                        // Method signature changed in 2.6.
+                        .and(takesArguments(0).or(takesArguments(1).and(takesArgument(0, long.class)))),
+                KafkaStreamTaskInstrumentation.class.getName() + "$StopSpanAdvice");
+    }
+
+    public static class Constructor4Advice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void captureGroup(@Advice.This StreamTask task, @Advice.Argument(4) StreamsConfig streamsConfig) {
+            String applicationId = streamsConfig.getString(StreamsConfig.APPLICATION_ID_CONFIG);
+
+            if (applicationId != null && !applicationId.isEmpty()) {
+                StreamTaskContext context = InstrumentationContext.get(StreamTask.class, StreamTaskContext.class)
+                        .get(task);
+                if (context == null) {
+                    context = new StreamTaskContext();
+                }
+                context.setApplicationId(applicationId);
+                InstrumentationContext.get(StreamTask.class, StreamTaskContext.class)
+                        .put(task, context);
+            }
         }
-        context.setApplicationId(applicationId);
-        InstrumentationContext.get(StreamTask.class, StreamTaskContext.class).put(task, context);
-      }
     }
-  }
-
-  public static class UnwrapIterableAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(value = 1, readOnly = false) Iterable<ConsumerRecord<?, ?>> records) {
-      // This method adds the records to a queue, so we want to bypass the kafka instrumentation
-      // since the resulting spans are very short and uninteresting.
-      // KafkaStreamsProcessorInstrumentation will create a new span instead.
-
-      // Expecting a TracingList because TaskManager.addRecordsToTasks calls records(partition).
-      if (records instanceof TracingIterableDelegator) {
-        records = ((TracingIterableDelegator) records).getDelegate();
-      }
+
+    public static class Constructor5Advice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void captureGroup(@Advice.This StreamTask task, @Advice.Argument(5) StreamsConfig streamsConfig) {
+            String applicationId = streamsConfig.getString(StreamsConfig.APPLICATION_ID_CONFIG);
+
+            if (applicationId != null && !applicationId.isEmpty()) {
+                StreamTaskContext context = InstrumentationContext.get(StreamTask.class, StreamTaskContext.class)
+                        .get(task);
+                if (context == null) {
+                    context = new StreamTaskContext();
+                }
+                context.setApplicationId(applicationId);
+                InstrumentationContext.get(StreamTask.class, StreamTaskContext.class)
+                        .put(task, context);
+            }
+        }
     }
-  }
-
-  /** Context propagation for updateProcessorContext before 2.7 (StampedRecord). */
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) final StampedRecord record,
-        @Advice.Local("ctxScope") ContextScope scope) {
-      if (record == null || record.partition() == -1 || record.offset() == -1) {
-        return;
-      }
-      if (!Config.get().isKafkaClientPropagationDisabledForTopic(record.topic())) {
-        scope = defaultPropagator().extract(rootContext(), record, SR_GETTER).attach();
-      }
+
+    public static class Constructor6Advice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void captureGroup(@Advice.This StreamTask task, @Advice.Argument(6) StreamsConfig streamsConfig) {
+            String applicationId = streamsConfig.getString(StreamsConfig.APPLICATION_ID_CONFIG);
+
+            if (applicationId != null && !applicationId.isEmpty()) {
+                StreamTaskContext context = InstrumentationContext.get(StreamTask.class, StreamTaskContext.class)
+                        .get(task);
+                if (context == null) {
+                    context = new StreamTaskContext();
+                }
+                context.setApplicationId(applicationId);
+                InstrumentationContext.get(StreamTask.class, StreamTaskContext.class)
+                        .put(task, context);
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(@Advice.Local("ctxScope") ContextScope scope) {
-      if (scope != null) scope.close();
+    public static class UnwrapIterableAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Argument(value = 1, readOnly = false) Iterable<ConsumerRecord<?, ?>> records) {
+            // This method adds the records to a queue, so we want to bypass the kafka instrumentation
+            // since the resulting spans are very short and uninteresting.
+            // KafkaStreamsProcessorInstrumentation will create a new span instead.
+
+            // Expecting a TracingList because TaskManager.addRecordsToTasks calls records(partition).
+            if (records instanceof TracingIterableDelegator) {
+                records = ((TracingIterableDelegator) records).getDelegate();
+            }
+        }
     }
-  }
-
-  /** Context propagation for updateProcessorContext after 2.7 (ProcessorRecordContext). */
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextPropagationAdvice27 {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(2) final ProcessorRecordContext record,
-        @Advice.Local("ctxScope") ContextScope scope) {
-      if (record == null || record.partition() == -1 || record.offset() == -1) {
-        return;
-      }
-      if (!Config.get().isKafkaClientPropagationDisabledForTopic(record.topic())) {
-        scope = defaultPropagator().extract(rootContext(), record, PR_GETTER).attach();
-      }
+
+    /** Context propagation for updateProcessorContext before 2.7 (StampedRecord). */
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Argument(0) final StampedRecord record, @Advice.Local("ctxScope") ContextScope scope) {
+            if (record == null || record.partition() == -1 || record.offset() == -1) {
+                return;
+            }
+            if (!Config.get().isKafkaClientPropagationDisabledForTopic(record.topic())) {
+                scope = defaultPropagator()
+                        .extract(rootContext(), record, SR_GETTER)
+                        .attach();
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(@Advice.Local("ctxScope") ContextScope scope) {
+            if (scope != null) scope.close();
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(@Advice.Local("ctxScope") ContextScope scope) {
-      if (scope != null) scope.close();
+    /** Context propagation for updateProcessorContext after 2.7 (ProcessorRecordContext). */
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextPropagationAdvice27 {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Argument(2) final ProcessorRecordContext record, @Advice.Local("ctxScope") ContextScope scope) {
+            if (record == null || record.partition() == -1 || record.offset() == -1) {
+                return;
+            }
+            if (!Config.get().isKafkaClientPropagationDisabledForTopic(record.topic())) {
+                scope = defaultPropagator()
+                        .extract(rootContext(), record, PR_GETTER)
+                        .attach();
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(@Advice.Local("ctxScope") ContextScope scope) {
+            if (scope != null) scope.close();
+        }
     }
-  }
-
-  /** Very similar to StartSpanAdvice27, but with a different argument type for record. */
-  public static class StartSpanAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void start(
-        @Advice.Argument(0) final StampedRecord record,
-        @Advice.Argument(1) final ProcessorNode node,
-        @Advice.This StreamTask task) {
-      if (record == null || record.partition() == -1 || record.offset() == -1) {
-        // partition|offset == -1 -> punctuation call.
-        return;
-      }
-
-      AgentSpan span, queueSpan = null;
-      StreamTaskContext streamTaskContext =
-          InstrumentationContext.get(StreamTask.class, StreamTaskContext.class).get(task);
-      long timeInQueueStart = SR_GETTER.extractTimeInQueueStart(record);
-      if (timeInQueueStart == 0 || !TIME_IN_QUEUE_ENABLED) {
-        span = startSpan(JAVA_KAFKA.toString(), KAFKA_CONSUME);
-      } else {
-        queueSpan =
-            startSpan(
-                JAVA_KAFKA.toString(), KAFKA_DELIVER, MILLISECONDS.toMicros(timeInQueueStart));
-        BROKER_DECORATE.afterStart(queueSpan);
-        BROKER_DECORATE.onTimeInQueue(queueSpan, record);
-        span = startSpan(JAVA_KAFKA.toString(), KAFKA_CONSUME, queueSpan.spanContext());
-        BROKER_DECORATE.beforeFinish(queueSpan);
-        // The queueSpan will be finished after inner span has been activated to ensure that
-        // spans are written out together by TraceStructureWriter when running in strict mode
-      }
-
-      String applicationId = null;
-      if (streamTaskContext != null) {
-        applicationId = streamTaskContext.getApplicationId();
-      }
-      DataStreamsTags tags = createWithGroup("kafka", INBOUND, applicationId, record.topic());
-
-      final long payloadSize =
-          traceConfig().isDataStreamsEnabled() ? computePayloadSizeBytes(record.value) : 0;
-      if (STREAMING_CONTEXT.isDisabledForTopic(record.topic())) {
-        AgentTracer.get()
-            .getDataStreamsMonitoring()
-            .setCheckpoint(span, create(tags, record.timestamp, payloadSize));
-      } else {
-        if (STREAMING_CONTEXT.isSourceTopic(record.topic())) {
-          Propagator dsmPropagator = Propagators.forConcern(DSM_CONCERN);
-          DataStreamsContext dsmContext = create(tags, record.timestamp, payloadSize);
-          dsmPropagator.inject(span.with(dsmContext), record, SR_SETTER);
+
+    /** Very similar to StartSpanAdvice27, but with a different argument type for record. */
+    public static class StartSpanAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void start(
+                @Advice.Argument(0) final StampedRecord record,
+                @Advice.Argument(1) final ProcessorNode node,
+                @Advice.This StreamTask task) {
+            if (record == null || record.partition() == -1 || record.offset() == -1) {
+                // partition|offset == -1 -> punctuation call.
+                return;
+            }
+
+            AgentSpan span, queueSpan = null;
+            StreamTaskContext streamTaskContext = InstrumentationContext.get(StreamTask.class, StreamTaskContext.class)
+                    .get(task);
+            long timeInQueueStart = SR_GETTER.extractTimeInQueueStart(record);
+            if (timeInQueueStart == 0 || !TIME_IN_QUEUE_ENABLED) {
+                span = startSpan(JAVA_KAFKA.toString(), KAFKA_CONSUME);
+            } else {
+                queueSpan = startSpan(JAVA_KAFKA.toString(), KAFKA_DELIVER, MILLISECONDS.toMicros(timeInQueueStart));
+                BROKER_DECORATE.afterStart(queueSpan);
+                BROKER_DECORATE.onTimeInQueue(queueSpan, record);
+                span = startSpan(JAVA_KAFKA.toString(), KAFKA_CONSUME, queueSpan.spanContext());
+                BROKER_DECORATE.beforeFinish(queueSpan);
+                // The queueSpan will be finished after inner span has been activated to ensure that
+                // spans are written out together by TraceStructureWriter when running in strict mode
+            }
+
+            String applicationId = null;
+            if (streamTaskContext != null) {
+                applicationId = streamTaskContext.getApplicationId();
+            }
+            DataStreamsTags tags = createWithGroup("kafka", INBOUND, applicationId, record.topic());
+
+            final long payloadSize = traceConfig().isDataStreamsEnabled() ? computePayloadSizeBytes(record.value) : 0;
+            if (STREAMING_CONTEXT.isDisabledForTopic(record.topic())) {
+                AgentTracer.get()
+                        .getDataStreamsMonitoring()
+                        .setCheckpoint(span, create(tags, record.timestamp, payloadSize));
+            } else {
+                if (STREAMING_CONTEXT.isSourceTopic(record.topic())) {
+                    Propagator dsmPropagator = Propagators.forConcern(DSM_CONCERN);
+                    DataStreamsContext dsmContext = create(tags, record.timestamp, payloadSize);
+                    dsmPropagator.inject(span.with(dsmContext), record, SR_SETTER);
+                }
+            }
+
+            CONSUMER_DECORATE.afterStart(span);
+            CONSUMER_DECORATE.onConsume(span, record, node);
+            ContextScope scope = activateSpan(span);
+            if (null != queueSpan) {
+                queueSpan.finish();
+            }
+
+            if (streamTaskContext == null) {
+                streamTaskContext = new StreamTaskContext();
+            }
+            streamTaskContext.setScope(scope);
+            InstrumentationContext.get(StreamTask.class, StreamTaskContext.class)
+                    .put(task, streamTaskContext);
         }
-      }
-
-      CONSUMER_DECORATE.afterStart(span);
-      CONSUMER_DECORATE.onConsume(span, record, node);
-      ContextScope scope = activateSpan(span);
-      if (null != queueSpan) {
-        queueSpan.finish();
-      }
-
-      if (streamTaskContext == null) {
-        streamTaskContext = new StreamTaskContext();
-      }
-      streamTaskContext.setScope(scope);
-      InstrumentationContext.get(StreamTask.class, StreamTaskContext.class)
-          .put(task, streamTaskContext);
     }
-  }
-
-  /** Very similar to StartSpanAdvice, but with a different argument type for record. */
-  public static class StartSpanAdvice27 {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void start(
-        @Advice.Argument(0) final ProcessorNode node,
-        @Advice.Argument(2) final ProcessorRecordContext record,
-        @Advice.This StreamTask task) {
-      if (record == null || record.partition() == -1 || record.offset() == -1) {
-        // partition|offset == -1 -> punctuation call.
-        return;
-      }
-
-      AgentSpan span, queueSpan = null;
-      StreamTaskContext streamTaskContext =
-          InstrumentationContext.get(StreamTask.class, StreamTaskContext.class).get(task);
-      long timeInQueueStart = PR_GETTER.extractTimeInQueueStart(record);
-      if (timeInQueueStart == 0 || !TIME_IN_QUEUE_ENABLED) {
-        span = startSpan(JAVA_KAFKA.toString(), KAFKA_CONSUME);
-      } else {
-        queueSpan =
-            startSpan(
-                JAVA_KAFKA.toString(), KAFKA_DELIVER, MILLISECONDS.toMicros(timeInQueueStart));
-        BROKER_DECORATE.afterStart(queueSpan);
-        BROKER_DECORATE.onTimeInQueue(queueSpan, record);
-        span = startSpan(JAVA_KAFKA.toString(), KAFKA_CONSUME, queueSpan.spanContext());
-        BROKER_DECORATE.beforeFinish(queueSpan);
-        // The queueSpan will be finished after inner span has been activated to ensure that
-        // spans are written out together by TraceStructureWriter when running in strict mode
-      }
-
-      String applicationId = null;
-      if (streamTaskContext != null) {
-        applicationId = streamTaskContext.getApplicationId();
-      }
-      DataStreamsTags tags = createWithGroup("kafka", INBOUND, applicationId, record.topic());
-
-      long payloadSize = 0;
-      // we have to go through Object to get the RecordMetadata here because the class of `record`
-      // only implements it after 2.7 (and this class is only used if v >= 2.7)
-      if ((Object) record instanceof RecordMetadata) { // should always be true
-        RecordMetadata metadata = (RecordMetadata) (Object) record;
-        payloadSize = metadata.serializedKeySize() + metadata.serializedValueSize();
-      }
-
-      if (STREAMING_CONTEXT.isDisabledForTopic(record.topic())) {
-        AgentTracer.get()
-            .getDataStreamsMonitoring()
-            .setCheckpoint(span, create(tags, record.timestamp(), payloadSize));
-      } else {
-        if (STREAMING_CONTEXT.isSourceTopic(record.topic())) {
-          Propagator dsmPropagator = Propagators.forConcern(DSM_CONCERN);
-          DataStreamsContext dsmContext = create(tags, record.timestamp(), payloadSize);
-          dsmPropagator.inject(span.with(dsmContext), record, PR_SETTER);
+
+    /** Very similar to StartSpanAdvice, but with a different argument type for record. */
+    public static class StartSpanAdvice27 {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void start(
+                @Advice.Argument(0) final ProcessorNode node,
+                @Advice.Argument(2) final ProcessorRecordContext record,
+                @Advice.This StreamTask task) {
+            if (record == null || record.partition() == -1 || record.offset() == -1) {
+                // partition|offset == -1 -> punctuation call.
+                return;
+            }
+
+            AgentSpan span, queueSpan = null;
+            StreamTaskContext streamTaskContext = InstrumentationContext.get(StreamTask.class, StreamTaskContext.class)
+                    .get(task);
+            long timeInQueueStart = PR_GETTER.extractTimeInQueueStart(record);
+            if (timeInQueueStart == 0 || !TIME_IN_QUEUE_ENABLED) {
+                span = startSpan(JAVA_KAFKA.toString(), KAFKA_CONSUME);
+            } else {
+                queueSpan = startSpan(JAVA_KAFKA.toString(), KAFKA_DELIVER, MILLISECONDS.toMicros(timeInQueueStart));
+                BROKER_DECORATE.afterStart(queueSpan);
+                BROKER_DECORATE.onTimeInQueue(queueSpan, record);
+                span = startSpan(JAVA_KAFKA.toString(), KAFKA_CONSUME, queueSpan.spanContext());
+                BROKER_DECORATE.beforeFinish(queueSpan);
+                // The queueSpan will be finished after inner span has been activated to ensure that
+                // spans are written out together by TraceStructureWriter when running in strict mode
+            }
+
+            String applicationId = null;
+            if (streamTaskContext != null) {
+                applicationId = streamTaskContext.getApplicationId();
+            }
+            DataStreamsTags tags = createWithGroup("kafka", INBOUND, applicationId, record.topic());
+
+            long payloadSize = 0;
+            // we have to go through Object to get the RecordMetadata here because the class of `record`
+            // only implements it after 2.7 (and this class is only used if v >= 2.7)
+            if ((Object) record instanceof RecordMetadata) { // should always be true
+                RecordMetadata metadata = (RecordMetadata) (Object) record;
+                payloadSize = metadata.serializedKeySize() + metadata.serializedValueSize();
+            }
+
+            if (STREAMING_CONTEXT.isDisabledForTopic(record.topic())) {
+                AgentTracer.get()
+                        .getDataStreamsMonitoring()
+                        .setCheckpoint(span, create(tags, record.timestamp(), payloadSize));
+            } else {
+                if (STREAMING_CONTEXT.isSourceTopic(record.topic())) {
+                    Propagator dsmPropagator = Propagators.forConcern(DSM_CONCERN);
+                    DataStreamsContext dsmContext = create(tags, record.timestamp(), payloadSize);
+                    dsmPropagator.inject(span.with(dsmContext), record, PR_SETTER);
+                }
+            }
+
+            CONSUMER_DECORATE.afterStart(span);
+            CONSUMER_DECORATE.onConsume(span, record, node);
+            ContextScope scope = activateSpan(span);
+            if (null != queueSpan) {
+                queueSpan.finish();
+            }
+
+            if (streamTaskContext == null) {
+                streamTaskContext = new StreamTaskContext();
+            }
+            streamTaskContext.setScope(scope);
+            InstrumentationContext.get(StreamTask.class, StreamTaskContext.class)
+                    .put(task, streamTaskContext);
         }
-      }
-
-      CONSUMER_DECORATE.afterStart(span);
-      CONSUMER_DECORATE.onConsume(span, record, node);
-      ContextScope scope = activateSpan(span);
-      if (null != queueSpan) {
-        queueSpan.finish();
-      }
-
-      if (streamTaskContext == null) {
-        streamTaskContext = new StreamTaskContext();
-      }
-      streamTaskContext.setScope(scope);
-      InstrumentationContext.get(StreamTask.class, StreamTaskContext.class)
-          .put(task, streamTaskContext);
     }
-  }
-
-  public static class StopSpanAdvice {
-
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stop(
-        @Advice.Thrown final Throwable throwable, @Advice.This StreamTask task) {
-      StreamTaskContext streamTaskContext =
-          InstrumentationContext.get(StreamTask.class, StreamTaskContext.class).get(task);
-      if (streamTaskContext != null) {
-        ContextScope scope = streamTaskContext.getScope();
-        if (scope != null) {
-          AgentSpan span = spanFromScope(scope);
-          CONSUMER_DECORATE.onError(span, throwable);
-          CONSUMER_DECORATE.beforeFinish(span);
-          scope.close();
-          span.finish();
-          streamTaskContext.setScope(null);
+
+    public static class StopSpanAdvice {
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stop(@Advice.Thrown final Throwable throwable, @Advice.This StreamTask task) {
+            StreamTaskContext streamTaskContext = InstrumentationContext.get(StreamTask.class, StreamTaskContext.class)
+                    .get(task);
+            if (streamTaskContext != null) {
+                ContextScope scope = streamTaskContext.getScope();
+                if (scope != null) {
+                    AgentSpan span = spanFromScope(scope);
+                    CONSUMER_DECORATE.onError(span, throwable);
+                    CONSUMER_DECORATE.beforeFinish(span);
+                    scope.close();
+                    span.finish();
+                    streamTaskContext.setScope(null);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsDecorator.java b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsDecorator.java
index 97f52bae52c..0d6aa5802ba 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsDecorator.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsDecorator.java
@@ -21,115 +21,103 @@
 import org.apache.kafka.streams.processor.internals.StampedRecord;
 
 public class KafkaStreamsDecorator extends MessagingClientDecorator {
-  private static final String KAFKA = "kafka";
-  public static final CharSequence JAVA_KAFKA = UTF8BytesString.create("java-kafka-streams");
-  public static final CharSequence KAFKA_CONSUME =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().messaging().inboundOperation(KAFKA));
-  public static final CharSequence KAFKA_DELIVER = UTF8BytesString.create("kafka.deliver");
-
-  public static final boolean KAFKA_LEGACY_TRACING = Config.get().isKafkaLegacyTracingEnabled();
-  public static final boolean TIME_IN_QUEUE_ENABLED =
-      Config.get().isTimeInQueueEnabled(!KAFKA_LEGACY_TRACING, KAFKA);
-  public static final String KAFKA_PRODUCED_KEY = "x_datadog_kafka_produced";
-
-  private final String spanKind;
-  private final CharSequence spanType;
-  private final Supplier<String> serviceNameSupplier;
-
-  private static final DDCache<CharSequence, CharSequence> RESOURCE_NAME_CACHE =
-      DDCaches.newFixedSizeCache(32);
-  private static final Functions.Prefix PREFIX = new Functions.Prefix("Consume Topic ");
-
-  public static final KafkaStreamsDecorator CONSUMER_DECORATE =
-      new KafkaStreamsDecorator(
-          Tags.SPAN_KIND_CONSUMER,
-          InternalSpanTypes.MESSAGE_CONSUMER,
-          SpanNaming.instance()
-              .namingSchema()
-              .messaging()
-              .inboundService(KAFKA, KAFKA_LEGACY_TRACING));
-
-  public static final KafkaStreamsDecorator BROKER_DECORATE =
-      new KafkaStreamsDecorator(
-          Tags.SPAN_KIND_BROKER,
-          InternalSpanTypes.MESSAGE_BROKER,
-          SpanNaming.instance().namingSchema().messaging().timeInQueueService(KAFKA));
-
-  protected KafkaStreamsDecorator(
-      String spanKind, CharSequence spanType, Supplier<String> serviceNameSupplier) {
-    this.spanKind = spanKind;
-    this.spanType = spanType;
-    this.serviceNameSupplier = serviceNameSupplier;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"kafka", "kafka-streams"};
-  }
-
-  @Override
-  protected String service() {
-    return serviceNameSupplier.get();
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JAVA_KAFKA;
-  }
-
-  @Override
-  protected String spanKind() {
-    return spanKind;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return spanType;
-  }
-
-  public void onConsume(
-      final AgentSpan span, final StampedRecord record, final ProcessorNode node) {
-    if (record != null) {
-      onConsume(span, record.topic(), record.partition(), record.offset(), node);
+    private static final String KAFKA = "kafka";
+    public static final CharSequence JAVA_KAFKA = UTF8BytesString.create("java-kafka-streams");
+    public static final CharSequence KAFKA_CONSUME = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().messaging().inboundOperation(KAFKA));
+    public static final CharSequence KAFKA_DELIVER = UTF8BytesString.create("kafka.deliver");
+
+    public static final boolean KAFKA_LEGACY_TRACING = Config.get().isKafkaLegacyTracingEnabled();
+    public static final boolean TIME_IN_QUEUE_ENABLED = Config.get().isTimeInQueueEnabled(!KAFKA_LEGACY_TRACING, KAFKA);
+    public static final String KAFKA_PRODUCED_KEY = "x_datadog_kafka_produced";
+
+    private final String spanKind;
+    private final CharSequence spanType;
+    private final Supplier<String> serviceNameSupplier;
+
+    private static final DDCache<CharSequence, CharSequence> RESOURCE_NAME_CACHE = DDCaches.newFixedSizeCache(32);
+    private static final Functions.Prefix PREFIX = new Functions.Prefix("Consume Topic ");
+
+    public static final KafkaStreamsDecorator CONSUMER_DECORATE = new KafkaStreamsDecorator(
+            Tags.SPAN_KIND_CONSUMER,
+            InternalSpanTypes.MESSAGE_CONSUMER,
+            SpanNaming.instance().namingSchema().messaging().inboundService(KAFKA, KAFKA_LEGACY_TRACING));
+
+    public static final KafkaStreamsDecorator BROKER_DECORATE = new KafkaStreamsDecorator(
+            Tags.SPAN_KIND_BROKER,
+            InternalSpanTypes.MESSAGE_BROKER,
+            SpanNaming.instance().namingSchema().messaging().timeInQueueService(KAFKA));
+
+    protected KafkaStreamsDecorator(String spanKind, CharSequence spanType, Supplier<String> serviceNameSupplier) {
+        this.spanKind = spanKind;
+        this.spanType = spanType;
+        this.serviceNameSupplier = serviceNameSupplier;
     }
-  }
 
-  public void onConsume(
-      final AgentSpan span, final ProcessorRecordContext record, final ProcessorNode node) {
-    if (record != null) {
-      onConsume(span, record.topic(), record.partition(), record.offset(), node);
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"kafka", "kafka-streams"};
     }
-  }
-
-  private void onConsume(
-      AgentSpan span, String topic2, int partition, long offset, ProcessorNode node) {
-    String topic = topic2 == null ? "kafka" : topic2;
-    span.setResourceName(RESOURCE_NAME_CACHE.computeIfAbsent(topic, PREFIX));
-    span.setTag(PARTITION, partition);
-    span.setTag(OFFSET, offset);
-    if (node != null) {
-      span.setTag(PROCESSOR_NAME, node.name());
+
+    @Override
+    protected String service() {
+        return serviceNameSupplier.get();
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JAVA_KAFKA;
+    }
+
+    @Override
+    protected String spanKind() {
+        return spanKind;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return spanType;
+    }
+
+    public void onConsume(final AgentSpan span, final StampedRecord record, final ProcessorNode node) {
+        if (record != null) {
+            onConsume(span, record.topic(), record.partition(), record.offset(), node);
+        }
+    }
+
+    public void onConsume(final AgentSpan span, final ProcessorRecordContext record, final ProcessorNode node) {
+        if (record != null) {
+            onConsume(span, record.topic(), record.partition(), record.offset(), node);
+        }
+    }
+
+    private void onConsume(AgentSpan span, String topic2, int partition, long offset, ProcessorNode node) {
+        String topic = topic2 == null ? "kafka" : topic2;
+        span.setResourceName(RESOURCE_NAME_CACHE.computeIfAbsent(topic, PREFIX));
+        span.setTag(PARTITION, partition);
+        span.setTag(OFFSET, offset);
+        if (node != null) {
+            span.setTag(PROCESSOR_NAME, node.name());
+        }
     }
-  }
 
-  public void onTimeInQueue(final AgentSpan span, final StampedRecord record) {
-    if (record != null) {
-      onTimeInQueue(span, record.topic());
+    public void onTimeInQueue(final AgentSpan span, final StampedRecord record) {
+        if (record != null) {
+            onTimeInQueue(span, record.topic());
+        }
     }
-  }
 
-  public void onTimeInQueue(final AgentSpan span, final ProcessorRecordContext record) {
-    if (record != null) {
-      onTimeInQueue(span, record.topic());
+    public void onTimeInQueue(final AgentSpan span, final ProcessorRecordContext record) {
+        if (record != null) {
+            onTimeInQueue(span, record.topic());
+        }
     }
-  }
 
-  public void onTimeInQueue(final AgentSpan span, final String topic2) {
-    String topic = topic2 == null ? "kafka" : topic2;
-    span.setResourceName(topic);
-    if (Config.get().isMessageBrokerSplitByDestination()) {
-      span.setServiceName(topic, MESSAGE_BROKER_SPLIT_BY_DESTINATION);
+    public void onTimeInQueue(final AgentSpan span, final String topic2) {
+        String topic = topic2 == null ? "kafka" : topic2;
+        span.setResourceName(topic);
+        if (Config.get().isMessageBrokerSplitByDestination()) {
+            span.setServiceName(topic, MESSAGE_BROKER_SPLIT_BY_DESTINATION);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsSourceNodeRecordDeserializerInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsSourceNodeRecordDeserializerInstrumentation.java
index 81348490676..fddee3c9ccc 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsSourceNodeRecordDeserializerInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsSourceNodeRecordDeserializerInstrumentation.java
@@ -15,50 +15,47 @@
 
 // This is necessary because SourceNodeRecordDeserializer drops the headers.  :-(
 @AutoService(InstrumenterModule.class)
-public class KafkaStreamsSourceNodeRecordDeserializerInstrumentation
-    extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class KafkaStreamsSourceNodeRecordDeserializerInstrumentation extends InstrumenterModule.Tracing
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public KafkaStreamsSourceNodeRecordDeserializerInstrumentation() {
-    super("kafka", "kafka-streams");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.kafka.streams.processor.internals.SourceNodeRecordDeserializer";
-  }
+    public KafkaStreamsSourceNodeRecordDeserializerInstrumentation() {
+        super("kafka", "kafka-streams");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("deserialize"))
-            .and(takesArgument(0, named("org.apache.kafka.clients.consumer.ConsumerRecord")))
-            .and(returns(named("org.apache.kafka.clients.consumer.ConsumerRecord"))),
-        KafkaStreamsSourceNodeRecordDeserializerInstrumentation.class.getName()
-            + "$SaveHeadersAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.kafka.streams.processor.internals.SourceNodeRecordDeserializer";
+    }
 
-  public static class SaveHeadersAdvice {
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("deserialize"))
+                        .and(takesArgument(0, named("org.apache.kafka.clients.consumer.ConsumerRecord")))
+                        .and(returns(named("org.apache.kafka.clients.consumer.ConsumerRecord"))),
+                KafkaStreamsSourceNodeRecordDeserializerInstrumentation.class.getName() + "$SaveHeadersAdvice");
+    }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void saveHeaders(
-        @Advice.Argument(0) final ConsumerRecord incoming,
-        @Advice.Return(readOnly = false) ConsumerRecord result) {
-      result =
-          new ConsumerRecord<>(
-              result.topic(),
-              result.partition(),
-              result.offset(),
-              result.timestamp(),
-              TimestampType.CREATE_TIME,
-              result.checksum(),
-              result.serializedKeySize(),
-              result.serializedValueSize(),
-              result.key(),
-              result.value(),
-              incoming.headers());
+    public static class SaveHeadersAdvice {
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void saveHeaders(
+                @Advice.Argument(0) final ConsumerRecord incoming,
+                @Advice.Return(readOnly = false) ConsumerRecord result) {
+            result = new ConsumerRecord<>(
+                    result.topic(),
+                    result.partition(),
+                    result.offset(),
+                    result.timestamp(),
+                    TimestampType.CREATE_TIME,
+                    result.checksum(),
+                    result.serializedKeySize(),
+                    result.serializedValueSize(),
+                    result.key(),
+                    result.value(),
+                    incoming.headers());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextHeadersAccess.java b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextHeadersAccess.java
index 8cde81d5775..f553ee8ed0d 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextHeadersAccess.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextHeadersAccess.java
@@ -9,22 +9,19 @@
 import org.slf4j.LoggerFactory;
 
 public class ProcessorRecordContextHeadersAccess {
-  private static final Logger log =
-      LoggerFactory.getLogger(ProcessorRecordContextHeadersAccess.class);
+    private static final Logger log = LoggerFactory.getLogger(ProcessorRecordContextHeadersAccess.class);
 
-  public static final MethodHandle HEADERS_METHOD;
+    public static final MethodHandle HEADERS_METHOD;
 
-  static {
-    MethodHandle method;
-    try {
-      method =
-          MethodHandles.publicLookup()
-              .findVirtual(
-                  ProcessorRecordContext.class, "headers", MethodType.methodType(Headers.class));
-    } catch (Throwable e) {
-      log.debug("Exception loading MethodHandle", e);
-      method = null;
+    static {
+        MethodHandle method;
+        try {
+            method = MethodHandles.publicLookup()
+                    .findVirtual(ProcessorRecordContext.class, "headers", MethodType.methodType(Headers.class));
+        } catch (Throwable e) {
+            log.debug("Exception loading MethodHandle", e);
+            method = null;
+        }
+        HEADERS_METHOD = method;
     }
-    HEADERS_METHOD = method;
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextSetter.java b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextSetter.java
index a444871f409..953ddba716b 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextSetter.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextSetter.java
@@ -10,21 +10,21 @@
 import org.slf4j.LoggerFactory;
 
 public class ProcessorRecordContextSetter implements CarrierSetter<ProcessorRecordContext> {
-  private static final Logger log = LoggerFactory.getLogger(ProcessorRecordContextSetter.class);
+    private static final Logger log = LoggerFactory.getLogger(ProcessorRecordContextSetter.class);
 
-  public static final ProcessorRecordContextSetter PR_SETTER = new ProcessorRecordContextSetter();
+    public static final ProcessorRecordContextSetter PR_SETTER = new ProcessorRecordContextSetter();
 
-  @Override
-  public void set(ProcessorRecordContext carrier, String key, String value) {
-    if (HEADERS_METHOD == null) {
-      return;
+    @Override
+    public void set(ProcessorRecordContext carrier, String key, String value) {
+        if (HEADERS_METHOD == null) {
+            return;
+        }
+        try {
+            Headers headers = (Headers) HEADERS_METHOD.invokeExact(carrier);
+            byte[] bytes = value.getBytes(UTF_8);
+            headers.remove(key).add(key, bytes);
+        } catch (Throwable e) {
+            log.debug("Unable to set value", e);
+        }
     }
-    try {
-      Headers headers = (Headers) HEADERS_METHOD.invokeExact(carrier);
-      byte[] bytes = value.getBytes(UTF_8);
-      headers.remove(key).add(key, bytes);
-    } catch (Throwable e) {
-      log.debug("Unable to set value", e);
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextVisitor.java b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextVisitor.java
index e7aca6cea23..bd05e251e0b 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextVisitor.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/ProcessorRecordContextVisitor.java
@@ -14,48 +14,47 @@
 import org.slf4j.LoggerFactory;
 
 public class ProcessorRecordContextVisitor implements ContextVisitor<ProcessorRecordContext> {
-  private static final Logger log = LoggerFactory.getLogger(ProcessorRecordContextVisitor.class);
+    private static final Logger log = LoggerFactory.getLogger(ProcessorRecordContextVisitor.class);
 
-  public static final ProcessorRecordContextVisitor PR_GETTER = new ProcessorRecordContextVisitor();
+    public static final ProcessorRecordContextVisitor PR_GETTER = new ProcessorRecordContextVisitor();
 
-  @Override
-  public void forEachKey(
-      ProcessorRecordContext carrier, AgentPropagation.KeyClassifier classifier) {
-    if (HEADERS_METHOD == null) {
-      return;
-    }
-    try {
-      Headers headers = (Headers) HEADERS_METHOD.invokeExact(carrier);
-      for (Header header : headers) {
-        String key = header.key();
-        byte[] value = header.value();
-        if (null != value) {
-          if (!classifier.accept(key, new String(header.value(), UTF_8))) {
+    @Override
+    public void forEachKey(ProcessorRecordContext carrier, AgentPropagation.KeyClassifier classifier) {
+        if (HEADERS_METHOD == null) {
             return;
-          }
         }
-      }
-    } catch (Throwable ex) {
-      log.debug("Exception getting headers", ex);
+        try {
+            Headers headers = (Headers) HEADERS_METHOD.invokeExact(carrier);
+            for (Header header : headers) {
+                String key = header.key();
+                byte[] value = header.value();
+                if (null != value) {
+                    if (!classifier.accept(key, new String(header.value(), UTF_8))) {
+                        return;
+                    }
+                }
+            }
+        } catch (Throwable ex) {
+            log.debug("Exception getting headers", ex);
+        }
     }
-  }
 
-  public long extractTimeInQueueStart(ProcessorRecordContext carrier) {
-    if (HEADERS_METHOD == null) {
-      return 0;
-    }
-    try {
-      Headers headers = (Headers) HEADERS_METHOD.invokeExact(carrier);
-      Header header = headers.lastHeader(KAFKA_PRODUCED_KEY);
-      if (null != header) {
-        ByteBuffer buf = ByteBuffer.allocate(8);
-        buf.put(header.value());
-        buf.flip();
-        return buf.getLong();
-      }
-    } catch (Throwable e) {
-      log.debug("Unable to get kafka produced time", e);
+    public long extractTimeInQueueStart(ProcessorRecordContext carrier) {
+        if (HEADERS_METHOD == null) {
+            return 0;
+        }
+        try {
+            Headers headers = (Headers) HEADERS_METHOD.invokeExact(carrier);
+            Header header = headers.lastHeader(KAFKA_PRODUCED_KEY);
+            if (null != header) {
+                ByteBuffer buf = ByteBuffer.allocate(8);
+                buf.put(header.value());
+                buf.flip();
+                return buf.getLong();
+            }
+        } catch (Throwable e) {
+            log.debug("Unable to get kafka produced time", e);
+        }
+        return 0;
     }
-    return 0;
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StampedRecordContextSetter.java b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StampedRecordContextSetter.java
index 88d88cbb959..1ee7e2ac3be 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StampedRecordContextSetter.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StampedRecordContextSetter.java
@@ -7,13 +7,13 @@
 import org.apache.kafka.streams.processor.internals.StampedRecord;
 
 public class StampedRecordContextSetter implements CarrierSetter<StampedRecord> {
-  public static final StampedRecordContextSetter SR_SETTER = new StampedRecordContextSetter();
+    public static final StampedRecordContextSetter SR_SETTER = new StampedRecordContextSetter();
 
-  @Override
-  public void set(StampedRecord carrier, String key, String value) {
-    Headers headers = carrier.value.headers();
-    if (headers != null) {
-      headers.remove(key).add(key, value.getBytes(UTF_8));
+    @Override
+    public void set(StampedRecord carrier, String key, String value) {
+        Headers headers = carrier.value.headers();
+        if (headers != null) {
+            headers.remove(key).add(key, value.getBytes(UTF_8));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StampedRecordContextVisitor.java b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StampedRecordContextVisitor.java
index 70a00f1f9e6..87508a1c0a0 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StampedRecordContextVisitor.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StampedRecordContextVisitor.java
@@ -13,35 +13,35 @@
 
 public class StampedRecordContextVisitor implements ContextVisitor<StampedRecord> {
 
-  private static final Logger log = LoggerFactory.getLogger(StampedRecordContextVisitor.class);
+    private static final Logger log = LoggerFactory.getLogger(StampedRecordContextVisitor.class);
 
-  public static final StampedRecordContextVisitor SR_GETTER = new StampedRecordContextVisitor();
+    public static final StampedRecordContextVisitor SR_GETTER = new StampedRecordContextVisitor();
 
-  @Override
-  public void forEachKey(StampedRecord carrier, AgentPropagation.KeyClassifier classifier) {
-    for (Header header : carrier.value.headers()) {
-      String key = header.key();
-      byte[] value = header.value();
-      if (null != value) {
-        if (!classifier.accept(key, new String(header.value(), UTF_8))) {
-          return;
+    @Override
+    public void forEachKey(StampedRecord carrier, AgentPropagation.KeyClassifier classifier) {
+        for (Header header : carrier.value.headers()) {
+            String key = header.key();
+            byte[] value = header.value();
+            if (null != value) {
+                if (!classifier.accept(key, new String(header.value(), UTF_8))) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 
-  public long extractTimeInQueueStart(StampedRecord carrier) {
-    try {
-      Header header = carrier.value.headers().lastHeader(KAFKA_PRODUCED_KEY);
-      if (null != header) {
-        ByteBuffer buf = ByteBuffer.allocate(8);
-        buf.put(header.value());
-        buf.flip();
-        return buf.getLong();
-      }
-    } catch (Exception e) {
-      log.debug("Unable to get kafka produced time", e);
+    public long extractTimeInQueueStart(StampedRecord carrier) {
+        try {
+            Header header = carrier.value.headers().lastHeader(KAFKA_PRODUCED_KEY);
+            if (null != header) {
+                ByteBuffer buf = ByteBuffer.allocate(8);
+                buf.put(header.value());
+                buf.flip();
+                return buf.getLong();
+            }
+        } catch (Exception e) {
+            log.debug("Unable to get kafka produced time", e);
+        }
+        return 0;
     }
-    return 0;
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StreamTaskContext.java b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StreamTaskContext.java
index e1f6a8f5b3c..09fa8b92403 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StreamTaskContext.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StreamTaskContext.java
@@ -3,24 +3,24 @@
 import datadog.context.ContextScope;
 
 public class StreamTaskContext {
-  private ContextScope scope;
-  private String applicationId;
+    private ContextScope scope;
+    private String applicationId;
 
-  public StreamTaskContext() {}
+    public StreamTaskContext() {}
 
-  public void setScope(ContextScope scope) {
-    this.scope = scope;
-  }
+    public void setScope(ContextScope scope) {
+        this.scope = scope;
+    }
 
-  public ContextScope getScope() {
-    return scope;
-  }
+    public ContextScope getScope() {
+        return scope;
+    }
 
-  public void setApplicationId(String applicationId) {
-    this.applicationId = applicationId;
-  }
+    public void setApplicationId(String applicationId) {
+        this.applicationId = applicationId;
+    }
 
-  public String getApplicationId() {
-    return applicationId;
-  }
+    public String getApplicationId() {
+        return applicationId;
+    }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/InternalTopologyBuilderInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/InternalTopologyBuilderInstrumentation.java
index 07271bb7904..a97cbb1de4c 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/InternalTopologyBuilderInstrumentation.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/InternalTopologyBuilderInstrumentation.java
@@ -13,36 +13,35 @@
 
 @AutoService(InstrumenterModule.class)
 public class InternalTopologyBuilderInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public InternalTopologyBuilderInstrumentation() {
-    super("kafka", "kafka-streams");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.kafka.streams.processor.internals.InternalTopologyBuilder";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".StreamingContextUpdater",
-      "datadog.trace.instrumentation.kafka_common.StreamingContext"
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("build")).and(isPrivate()).and(takesArguments(1)),
-        InternalTopologyBuilderInstrumentation.class.getName() + "$BuildAdvice");
-  }
-
-  public static class BuildAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void exit(@Advice.Return final ProcessorTopology topology) {
-      StreamingContextUpdater.updateWithTopology(topology);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public InternalTopologyBuilderInstrumentation() {
+        super("kafka", "kafka-streams");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.apache.kafka.streams.processor.internals.InternalTopologyBuilder";
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".StreamingContextUpdater", "datadog.trace.instrumentation.kafka_common.StreamingContext"
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("build")).and(isPrivate()).and(takesArguments(1)),
+                InternalTopologyBuilderInstrumentation.class.getName() + "$BuildAdvice");
+    }
+
+    public static class BuildAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void exit(@Advice.Return final ProcessorTopology topology) {
+            StreamingContextUpdater.updateWithTopology(topology);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/StreamingContextUpdater.java b/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/StreamingContextUpdater.java
index 6dc766cdf5c..9292bc7052a 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/StreamingContextUpdater.java
+++ b/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/src/main/java/datadog/trace/instrumentation/kafka_streams10/StreamingContextUpdater.java
@@ -10,17 +10,16 @@
 
 public class StreamingContextUpdater {
 
-  public static void updateWithTopology(ProcessorTopology topology) {
-    Set<String> internalTopics = ConcurrentHashMap.newKeySet();
-    Map<String, String> storeToChanglogMap = topology.storeToChangelogTopic();
+    public static void updateWithTopology(ProcessorTopology topology) {
+        Set<String> internalTopics = ConcurrentHashMap.newKeySet();
+        Map<String, String> storeToChanglogMap = topology.storeToChangelogTopic();
 
-    for (StateStore store : topology.stateStores()) {
-      if (storeToChanglogMap.containsKey(store.name())) {
-        internalTopics.add(storeToChanglogMap.get(store.name()));
-      }
-    }
+        for (StateStore store : topology.stateStores()) {
+            if (storeToChanglogMap.containsKey(store.name())) {
+                internalTopics.add(storeToChanglogMap.get(store.name()));
+            }
+        }
 
-    STREAMING_CONTEXT.registerTopics(
-        topology.sourceTopics(), topology.sinkTopics(), internalTopics);
-  }
+        STREAMING_CONTEXT.registerTopics(topology.sourceTopics(), topology.sinkTopics(), internalTopics);
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/ExecutionContext.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/ExecutionContext.java
index cf909a85e89..1be1d6b7f37 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/ExecutionContext.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/ExecutionContext.java
@@ -8,30 +8,29 @@
 
 public class ExecutionContext {
 
-  private final TestExecutionPolicy executionPolicy;
-  private boolean suppressFailures;
-
-  public ExecutionContext(TestExecutionPolicy executionPolicy) {
-    this.executionPolicy = executionPolicy;
-  }
-
-  public void setSuppressFailures(boolean suppressFailures) {
-    this.suppressFailures = suppressFailures;
-  }
-
-  public boolean shouldSuppressFailures() {
-    return suppressFailures;
-  }
-
-  public TestExecutionPolicy getExecutionPolicy() {
-    return executionPolicy;
-  }
-
-  public static ExecutionContext create(Scenario scenario) {
-    TestIdentifier testIdentifier = KarateUtils.toTestIdentifier(scenario);
-    Collection<String> testTags = scenario.getTagsEffective().getTagKeys();
-    return new ExecutionContext(
-        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.executionPolicy(
-            testIdentifier, TestSourceData.UNKNOWN, testTags));
-  }
+    private final TestExecutionPolicy executionPolicy;
+    private boolean suppressFailures;
+
+    public ExecutionContext(TestExecutionPolicy executionPolicy) {
+        this.executionPolicy = executionPolicy;
+    }
+
+    public void setSuppressFailures(boolean suppressFailures) {
+        this.suppressFailures = suppressFailures;
+    }
+
+    public boolean shouldSuppressFailures() {
+        return suppressFailures;
+    }
+
+    public TestExecutionPolicy getExecutionPolicy() {
+        return executionPolicy;
+    }
+
+    public static ExecutionContext create(Scenario scenario) {
+        TestIdentifier testIdentifier = KarateUtils.toTestIdentifier(scenario);
+        Collection<String> testTags = scenario.getTagsEffective().getTagKeys();
+        return new ExecutionContext(TestEventsHandlerHolder.TEST_EVENTS_HANDLER.executionPolicy(
+                testIdentifier, TestSourceData.UNKNOWN, testTags));
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateExecutionInstrumentation.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateExecutionInstrumentation.java
index d3070ecdde2..d56f11c9c04 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateExecutionInstrumentation.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateExecutionInstrumentation.java
@@ -24,140 +24,133 @@
 
 @AutoService(InstrumenterModule.class)
 public class KarateExecutionInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-
-  public KarateExecutionInstrumentation() {
-    super("ci-visibility", "karate", "test-retry");
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "com.intuit.karate.core.ScenarioRuntime", "com.intuit.karate.core.ScenarioResult"
-    };
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "com.intuit.karate.core.Scenario", packageName + ".ExecutionContext");
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // ScenarioRuntime
-    transformer.applyAdvice(
-        named("run").and(takesNoArguments()),
-        KarateExecutionInstrumentation.class.getName() + "$RetryAdvice");
-
-    // ScenarioResult
-    transformer.applyAdvice(
-        named("addStepResult")
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("com.intuit.karate.core.StepResult"))),
-        KarateExecutionInstrumentation.class.getName() + "$SuppressErrorAdvice");
-  }
-
-  public static class RetryAdvice {
-    @Advice.OnMethodEnter
-    public static void beforeExecute(@Advice.This ScenarioRuntime scenarioRuntime) {
-      if (KarateTracingHook.skipTracking(scenarioRuntime)) {
-        return;
-      }
-
-      ExecutionContext executionContext =
-          InstrumentationContext.get(Scenario.class, ExecutionContext.class)
-              .getOrCompute(scenarioRuntime.scenario, ExecutionContext::create);
-
-      // Indicate beforehand if the failures should be suppressed. This aligns the ordering with the
-      // rest of the frameworks
-      TestExecutionPolicy executionPolicy = executionContext.getExecutionPolicy();
-      executionContext.setSuppressFailures(executionPolicy.suppressFailures());
-
-      scenarioRuntime.magicVariables.putIfAbsent(
-          KarateUtils.EXECUTION_TRACKER_MAGICVARIABLE, executionPolicy);
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+
+    public KarateExecutionInstrumentation() {
+        super("ci-visibility", "karate", "test-retry");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
     }
 
-    @Advice.OnMethodExit
-    public static void afterExecute(@Advice.This ScenarioRuntime scenarioRuntime) {
-      if (KarateTracingHook.skipTracking(scenarioRuntime)) {
-        return;
-      }
-
-      if (CallDepthThreadLocalMap.incrementCallDepth(ScenarioRuntime.class) > 0) {
-        // nested call
-        return;
-      }
-
-      Scenario scenario = scenarioRuntime.scenario;
-      ExecutionContext context =
-          InstrumentationContext.get(Scenario.class, ExecutionContext.class).get(scenario);
-      if (context == null) {
-        return;
-      }
-
-      ScenarioResult originalResult = scenarioRuntime.result;
-      ScenarioResult finalResult = originalResult;
-
-      TestExecutionPolicy executionPolicy = context.getExecutionPolicy();
-      while (executionPolicy.applicable()) {
-        ScenarioRuntime retry =
-            new ScenarioRuntime(scenarioRuntime.featureRuntime, scenarioRuntime.scenario);
-        retry.magicVariables.put(KarateUtils.EXECUTION_TRACKER_MAGICVARIABLE, executionPolicy);
-        retry.run();
-        retry.featureRuntime.result.addResult(retry.result);
-        finalResult = retry.result;
-      }
-
-      // When the scenario is retried, the original runtime's result must reflect the final
-      // attempt's outcome. To avoid final field modifications, the final attempt's failure is
-      // reflected onto the original result via addStepResult
-      if (finalResult.isFailed() && !originalResult.isFailed()) {
-        originalResult.addStepResult(finalResult.getFailedStep());
-      }
-
-      CallDepthThreadLocalMap.reset(ScenarioRuntime.class);
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"com.intuit.karate.core.ScenarioRuntime", "com.intuit.karate.core.ScenarioResult"};
     }
 
-    // Karate 1.0.0 and above
-    public static void muzzleCheck(RuntimeHook runtimeHook) {
-      runtimeHook.beforeSuite(null);
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("com.intuit.karate.core.Scenario", packageName + ".ExecutionContext");
     }
-  }
-
-  public static class SuppressErrorAdvice {
-    @Advice.OnMethodEnter
-    public static void onAddingStepResult(
-        @Advice.Argument(value = 0, readOnly = false) StepResult stepResult,
-        @Advice.FieldValue("scenario") Scenario scenario) {
-
-      Result result = stepResult.getResult();
-      if (result.isFailed()) {
-        ExecutionContext executionContext =
-            InstrumentationContext.get(Scenario.class, ExecutionContext.class).get(scenario);
-        if (executionContext == null) {
-          return;
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // ScenarioRuntime
+        transformer.applyAdvice(
+                named("run").and(takesNoArguments()), KarateExecutionInstrumentation.class.getName() + "$RetryAdvice");
+
+        // ScenarioResult
+        transformer.applyAdvice(
+                named("addStepResult")
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("com.intuit.karate.core.StepResult"))),
+                KarateExecutionInstrumentation.class.getName() + "$SuppressErrorAdvice");
+    }
+
+    public static class RetryAdvice {
+        @Advice.OnMethodEnter
+        public static void beforeExecute(@Advice.This ScenarioRuntime scenarioRuntime) {
+            if (KarateTracingHook.skipTracking(scenarioRuntime)) {
+                return;
+            }
+
+            ExecutionContext executionContext = InstrumentationContext.get(Scenario.class, ExecutionContext.class)
+                    .getOrCompute(scenarioRuntime.scenario, ExecutionContext::create);
+
+            // Indicate beforehand if the failures should be suppressed. This aligns the ordering with the
+            // rest of the frameworks
+            TestExecutionPolicy executionPolicy = executionContext.getExecutionPolicy();
+            executionContext.setSuppressFailures(executionPolicy.suppressFailures());
+
+            scenarioRuntime.magicVariables.putIfAbsent(KarateUtils.EXECUTION_TRACKER_MAGICVARIABLE, executionPolicy);
+        }
+
+        @Advice.OnMethodExit
+        public static void afterExecute(@Advice.This ScenarioRuntime scenarioRuntime) {
+            if (KarateTracingHook.skipTracking(scenarioRuntime)) {
+                return;
+            }
+
+            if (CallDepthThreadLocalMap.incrementCallDepth(ScenarioRuntime.class) > 0) {
+                // nested call
+                return;
+            }
+
+            Scenario scenario = scenarioRuntime.scenario;
+            ExecutionContext context = InstrumentationContext.get(Scenario.class, ExecutionContext.class)
+                    .get(scenario);
+            if (context == null) {
+                return;
+            }
+
+            ScenarioResult originalResult = scenarioRuntime.result;
+            ScenarioResult finalResult = originalResult;
+
+            TestExecutionPolicy executionPolicy = context.getExecutionPolicy();
+            while (executionPolicy.applicable()) {
+                ScenarioRuntime retry = new ScenarioRuntime(scenarioRuntime.featureRuntime, scenarioRuntime.scenario);
+                retry.magicVariables.put(KarateUtils.EXECUTION_TRACKER_MAGICVARIABLE, executionPolicy);
+                retry.run();
+                retry.featureRuntime.result.addResult(retry.result);
+                finalResult = retry.result;
+            }
+
+            // When the scenario is retried, the original runtime's result must reflect the final
+            // attempt's outcome. To avoid final field modifications, the final attempt's failure is
+            // reflected onto the original result via addStepResult
+            if (finalResult.isFailed() && !originalResult.isFailed()) {
+                originalResult.addStepResult(finalResult.getFailedStep());
+            }
+
+            CallDepthThreadLocalMap.reset(ScenarioRuntime.class);
         }
 
-        // Suppress every failing step of a to-be-retried attempt (not just the first): with
-        // continueOnStepFailure a single attempt can add multiple failing steps, and any leak would
-        // mark the original runtime's result failed
-        if (executionContext.shouldSuppressFailures()) {
-          stepResult = new StepResult(stepResult.getStep(), KarateUtils.abortedResult());
-          stepResult.setFailedReason(result.getError());
-          stepResult.setErrorIgnored(true);
+        // Karate 1.0.0 and above
+        public static void muzzleCheck(RuntimeHook runtimeHook) {
+            runtimeHook.beforeSuite(null);
         }
-      }
     }
 
-    // Karate 1.0.0 and above
-    public static void muzzleCheck(RuntimeHook runtimeHook) {
-      runtimeHook.beforeSuite(null);
+    public static class SuppressErrorAdvice {
+        @Advice.OnMethodEnter
+        public static void onAddingStepResult(
+                @Advice.Argument(value = 0, readOnly = false) StepResult stepResult,
+                @Advice.FieldValue("scenario") Scenario scenario) {
+
+            Result result = stepResult.getResult();
+            if (result.isFailed()) {
+                ExecutionContext executionContext = InstrumentationContext.get(Scenario.class, ExecutionContext.class)
+                        .get(scenario);
+                if (executionContext == null) {
+                    return;
+                }
+
+                // Suppress every failing step of a to-be-retried attempt (not just the first): with
+                // continueOnStepFailure a single attempt can add multiple failing steps, and any leak would
+                // mark the original runtime's result failed
+                if (executionContext.shouldSuppressFailures()) {
+                    stepResult = new StepResult(stepResult.getStep(), KarateUtils.abortedResult());
+                    stepResult.setFailedReason(result.getError());
+                    stepResult.setErrorIgnored(true);
+                }
+            }
+        }
+
+        // Karate 1.0.0 and above
+        public static void muzzleCheck(RuntimeHook runtimeHook) {
+            runtimeHook.beforeSuite(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateInstrumentation.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateInstrumentation.java
index 481e4602a0a..134a8e0b2e2 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateInstrumentation.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateInstrumentation.java
@@ -16,40 +16,38 @@
 
 @AutoService(InstrumenterModule.class)
 public class KarateInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public KarateInstrumentation() {
-    super("ci-visibility", "karate");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.intuit.karate.Runner$Builder";
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("com.intuit.karate.core.FeatureRuntime", "java.lang.Boolean");
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(), KarateInstrumentation.class.getName() + "$KarateAdvice");
-  }
-
-  public static class KarateAdvice {
-    @Advice.OnMethodExit
-    public static void onRunnerBuilderConstructorExit(
-        @Advice.This Runner.Builder<?> runnerBuilder) {
-      ContextStore<FeatureRuntime, Boolean> featureRuntimeContextStore =
-          InstrumentationContext.get(FeatureRuntime.class, Boolean.class);
-      runnerBuilder.hook(new KarateTracingHook(featureRuntimeContextStore));
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public KarateInstrumentation() {
+        super("ci-visibility", "karate");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "com.intuit.karate.Runner$Builder";
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("com.intuit.karate.core.FeatureRuntime", "java.lang.Boolean");
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), KarateInstrumentation.class.getName() + "$KarateAdvice");
     }
 
-    // Karate 1.0.0 and above
-    public static void muzzleCheck(RuntimeHook runtimeHook) {
-      runtimeHook.beforeSuite(null);
+    public static class KarateAdvice {
+        @Advice.OnMethodExit
+        public static void onRunnerBuilderConstructorExit(@Advice.This Runner.Builder<?> runnerBuilder) {
+            ContextStore<FeatureRuntime, Boolean> featureRuntimeContextStore =
+                    InstrumentationContext.get(FeatureRuntime.class, Boolean.class);
+            runnerBuilder.hook(new KarateTracingHook(featureRuntimeContextStore));
+        }
+
+        // Karate 1.0.0 and above
+        public static void muzzleCheck(RuntimeHook runtimeHook) {
+            runtimeHook.beforeSuite(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java
index 4542e816c92..76f45f4071b 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java
@@ -30,219 +30,215 @@
 
 public class KarateTracingHook implements RuntimeHook {
 
-  private static final String FRAMEWORK_NAME = "karate";
-  public static final String FRAMEWORK_VERSION = KarateUtils.getKarateVersion();
-  public static final String KARATE_STEP_SPAN_NAME = "karate.step";
+    private static final String FRAMEWORK_NAME = "karate";
+    public static final String FRAMEWORK_VERSION = KarateUtils.getKarateVersion();
+    public static final String KARATE_STEP_SPAN_NAME = "karate.step";
 
-  private final ContextStore<FeatureRuntime, Boolean> manualFeatureHooks;
+    private final ContextStore<FeatureRuntime, Boolean> manualFeatureHooks;
 
-  public KarateTracingHook(ContextStore<FeatureRuntime, Boolean> manualFeatureHooks) {
-    this.manualFeatureHooks = manualFeatureHooks;
-  }
-
-  @Override
-  public boolean beforeFeature(FeatureRuntime fr) {
-    if (skipTracking(fr)) {
-      return true;
-    }
-    Suite suite = fr.suite;
-    TestSuiteDescriptor suiteDescriptor = KarateUtils.toSuiteDescriptor(fr);
-    Feature feature = KarateUtils.getFeature(fr);
-    TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart(
-        suiteDescriptor,
-        feature.getNameForReport(),
-        FRAMEWORK_NAME,
-        FRAMEWORK_VERSION,
-        null,
-        KarateUtils.getCategories(feature.getTags()),
-        suite.parallel,
-        TestFrameworkInstrumentation.KARATE,
-        null);
-
-    if (!isFeatureContainingScenarios(fr)) {
-      // Karate will not trigger the afterFeature hook if suite has no scenarios
-      TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, null);
-      TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null);
+    public KarateTracingHook(ContextStore<FeatureRuntime, Boolean> manualFeatureHooks) {
+        this.manualFeatureHooks = manualFeatureHooks;
     }
 
-    return true;
-  }
-
-  private boolean isFeatureContainingScenarios(FeatureRuntime fr) {
-    // cannot use existing iterator (FeatureRuntime#scenarios) because it may have been traversed
-    // already
-    // (likely, when scheduling parallel execution of scenarios)
-    return new ScenarioIterator(fr).filterSelected().iterator().hasNext();
-  }
-
-  @Override
-  public void afterFeature(FeatureRuntime fr) {
-    if (skipTracking(fr)) {
-      return;
-    }
-    TestSuiteDescriptor suiteDescriptor = KarateUtils.toSuiteDescriptor(fr);
-    FeatureResult result = fr.result;
-    if (result.isFailed()) {
-      KarateException throwable = result.getErrorMessagesCombined();
-      TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(suiteDescriptor, throwable);
-    } else if (result.isEmpty()) {
-      TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, null);
+    @Override
+    public boolean beforeFeature(FeatureRuntime fr) {
+        if (skipTracking(fr)) {
+            return true;
+        }
+        Suite suite = fr.suite;
+        TestSuiteDescriptor suiteDescriptor = KarateUtils.toSuiteDescriptor(fr);
+        Feature feature = KarateUtils.getFeature(fr);
+        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart(
+                suiteDescriptor,
+                feature.getNameForReport(),
+                FRAMEWORK_NAME,
+                FRAMEWORK_VERSION,
+                null,
+                KarateUtils.getCategories(feature.getTags()),
+                suite.parallel,
+                TestFrameworkInstrumentation.KARATE,
+                null);
+
+        if (!isFeatureContainingScenarios(fr)) {
+            // Karate will not trigger the afterFeature hook if suite has no scenarios
+            TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, null);
+            TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null);
+        }
+
+        return true;
     }
-    TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null);
-  }
 
-  @Override
-  public boolean beforeScenario(ScenarioRuntime sr) {
-    if (skipTracking(sr)) {
-      return true;
+    private boolean isFeatureContainingScenarios(FeatureRuntime fr) {
+        // cannot use existing iterator (FeatureRuntime#scenarios) because it may have been traversed
+        // already
+        // (likely, when scheduling parallel execution of scenarios)
+        return new ScenarioIterator(fr).filterSelected().iterator().hasNext();
     }
-    Scenario scenario = sr.scenario;
-
-    // There are cases when Karate does not call "beforeFeature" hooks,
-    // for example when using built-in retries
-    boolean beforeFeatureHookExecuted = KarateUtils.isBeforeHookExecuted(sr.featureRuntime);
-    if (!beforeFeatureHookExecuted) {
-      beforeFeature(sr.featureRuntime);
-      manualFeatureHooks.put(sr.featureRuntime, true);
+
+    @Override
+    public void afterFeature(FeatureRuntime fr) {
+        if (skipTracking(fr)) {
+            return;
+        }
+        TestSuiteDescriptor suiteDescriptor = KarateUtils.toSuiteDescriptor(fr);
+        FeatureResult result = fr.result;
+        if (result.isFailed()) {
+            KarateException throwable = result.getErrorMessagesCombined();
+            TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(suiteDescriptor, throwable);
+        } else if (result.isEmpty()) {
+            TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, null);
+        }
+        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null);
     }
 
-    TestSuiteDescriptor suiteDescriptor = KarateUtils.toSuiteDescriptor(sr.featureRuntime);
-    TestDescriptor testDescriptor = KarateUtils.toTestDescriptor(sr);
-    String scenarioName = KarateUtils.getScenarioName(scenario);
-    String parameters = KarateUtils.getParameters(scenario);
-    Collection<String> categories = scenario.getTagsEffective().getTagKeys();
+    @Override
+    public boolean beforeScenario(ScenarioRuntime sr) {
+        if (skipTracking(sr)) {
+            return true;
+        }
+        Scenario scenario = sr.scenario;
+
+        // There are cases when Karate does not call "beforeFeature" hooks,
+        // for example when using built-in retries
+        boolean beforeFeatureHookExecuted = KarateUtils.isBeforeHookExecuted(sr.featureRuntime);
+        if (!beforeFeatureHookExecuted) {
+            beforeFeature(sr.featureRuntime);
+            manualFeatureHooks.put(sr.featureRuntime, true);
+        }
+
+        TestSuiteDescriptor suiteDescriptor = KarateUtils.toSuiteDescriptor(sr.featureRuntime);
+        TestDescriptor testDescriptor = KarateUtils.toTestDescriptor(sr);
+        String scenarioName = KarateUtils.getScenarioName(scenario);
+        String parameters = KarateUtils.getParameters(scenario);
+        Collection<String> categories = scenario.getTagsEffective().getTagKeys();
+
+        if (Config.get().isCiVisibilityTestSkippingEnabled() || Config.get().isCiVisibilityTestManagementEnabled()) {
+            TestIdentifier skippableTest = KarateUtils.toTestIdentifier(scenario);
+            SkipReason skipReason = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(skippableTest);
+
+            if (skipReason != null
+                    && !(skipReason == SkipReason.ITR && categories.contains(CIConstants.Tags.ITR_UNSKIPPABLE_TAG))) {
+                TestExecutionTracker executionTracker =
+                        (TestExecutionTracker) sr.magicVariables.get(KarateUtils.EXECUTION_TRACKER_MAGICVARIABLE);
+                TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore(
+                        suiteDescriptor,
+                        testDescriptor,
+                        scenarioName,
+                        FRAMEWORK_NAME,
+                        FRAMEWORK_VERSION,
+                        parameters,
+                        categories,
+                        TestSourceData.UNKNOWN,
+                        skipReason.getDescription(),
+                        executionTracker);
+                return false;
+            }
+        }
+
+        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart(
+                suiteDescriptor,
+                testDescriptor,
+                scenarioName,
+                FRAMEWORK_NAME,
+                FRAMEWORK_VERSION,
+                parameters,
+                categories,
+                TestSourceData.UNKNOWN,
+                null,
+                (TestExecutionTracker) sr.magicVariables.get(KarateUtils.EXECUTION_TRACKER_MAGICVARIABLE));
+        return true;
+    }
 
-    if (Config.get().isCiVisibilityTestSkippingEnabled()
-        || Config.get().isCiVisibilityTestManagementEnabled()) {
-      TestIdentifier skippableTest = KarateUtils.toTestIdentifier(scenario);
-      SkipReason skipReason = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(skippableTest);
+    @Override
+    public void afterScenario(ScenarioRuntime sr) {
+        if (skipTracking(sr)) {
+            return;
+        }
+        ScenarioResult result = sr.result;
+        Throwable failedReason = getFailedReason(result);
+        TestDescriptor testDescriptor = KarateUtils.toTestDescriptor(sr);
+        if (result.isFailed() || failedReason != null) {
+            TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, failedReason);
+        } else if (result.getStepResults().isEmpty()) {
+            TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip(testDescriptor, null);
+        }
 
-      if (skipReason != null
-          && !(skipReason == SkipReason.ITR
-              && categories.contains(CIConstants.Tags.ITR_UNSKIPPABLE_TAG))) {
         TestExecutionTracker executionTracker =
-            (TestExecutionTracker)
-                sr.magicVariables.get(KarateUtils.EXECUTION_TRACKER_MAGICVARIABLE);
-        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore(
-            suiteDescriptor,
-            testDescriptor,
-            scenarioName,
-            FRAMEWORK_NAME,
-            FRAMEWORK_VERSION,
-            parameters,
-            categories,
-            TestSourceData.UNKNOWN,
-            skipReason.getDescription(),
-            executionTracker);
-        return false;
-      }
+                (TestExecutionTracker) sr.magicVariables.get(KarateUtils.EXECUTION_TRACKER_MAGICVARIABLE);
+        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish(testDescriptor, null, executionTracker);
+
+        Boolean runHooksManually = manualFeatureHooks.remove(sr.featureRuntime);
+        if (runHooksManually != null && runHooksManually) {
+            afterFeature(sr.featureRuntime);
+            KarateUtils.resetBeforeHook(sr.featureRuntime);
+        }
     }
 
-    TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart(
-        suiteDescriptor,
-        testDescriptor,
-        scenarioName,
-        FRAMEWORK_NAME,
-        FRAMEWORK_VERSION,
-        parameters,
-        categories,
-        TestSourceData.UNKNOWN,
-        null,
-        (TestExecutionTracker) sr.magicVariables.get(KarateUtils.EXECUTION_TRACKER_MAGICVARIABLE));
-    return true;
-  }
-
-  @Override
-  public void afterScenario(ScenarioRuntime sr) {
-    if (skipTracking(sr)) {
-      return;
+    private Throwable getFailedReason(ScenarioResult result) {
+        Throwable error = result.getError();
+        if (error != null) {
+            return error;
+        }
+        // check if any step result has a "suppressed" error
+        // (manually set by flaky test retries logic - to avoid failing the build)
+        List<StepResult> stepResults = result.getStepResults();
+        for (StepResult stepResult : stepResults) {
+            Throwable failedReason = stepResult.getFailedReason();
+            if (failedReason != null) {
+                return failedReason;
+            }
+        }
+        return null;
     }
-    ScenarioResult result = sr.result;
-    Throwable failedReason = getFailedReason(result);
-    TestDescriptor testDescriptor = KarateUtils.toTestDescriptor(sr);
-    if (result.isFailed() || failedReason != null) {
-      TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, failedReason);
-    } else if (result.getStepResults().isEmpty()) {
-      TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip(testDescriptor, null);
+
+    @Override
+    public boolean beforeStep(Step step, ScenarioRuntime sr) {
+        if (skipTracking(step)) {
+            return true;
+        }
+        AgentSpan span = AgentTracer.startSpan("karate", KARATE_STEP_SPAN_NAME);
+        AgentTracer.activateSpanWithoutScope(span);
+        String stepName = step.getPrefix() + " " + step.getText();
+        span.setResourceName(stepName);
+        span.setTag(Tags.COMPONENT, "karate");
+        span.spanContext().setIntegrationName("karate");
+        span.setTag("step.name", stepName);
+        span.setTag("step.startLine", step.getLine());
+        span.setTag("step.endLine", step.getEndLine());
+        span.setTag("step.docString", step.getDocString());
+        return true;
     }
 
-    TestExecutionTracker executionTracker =
-        (TestExecutionTracker) sr.magicVariables.get(KarateUtils.EXECUTION_TRACKER_MAGICVARIABLE);
-    TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish(
-        testDescriptor, null, executionTracker);
+    @Override
+    public void afterStep(StepResult result, ScenarioRuntime sr) {
+        if (skipTracking(result.getStep())) {
+            return;
+        }
 
-    Boolean runHooksManually = manualFeatureHooks.remove(sr.featureRuntime);
-    if (runHooksManually != null && runHooksManually) {
-      afterFeature(sr.featureRuntime);
-      KarateUtils.resetBeforeHook(sr.featureRuntime);
-    }
-  }
+        AgentSpan span = AgentTracer.activeSpan();
+        if (span == null) {
+            return;
+        }
 
-  private Throwable getFailedReason(ScenarioResult result) {
-    Throwable error = result.getError();
-    if (error != null) {
-      return error;
+        AgentTracer.closeActive();
+        span.finish();
     }
-    // check if any step result has a "suppressed" error
-    // (manually set by flaky test retries logic - to avoid failing the build)
-    List<StepResult> stepResults = result.getStepResults();
-    for (StepResult stepResult : stepResults) {
-      Throwable failedReason = stepResult.getFailedReason();
-      if (failedReason != null) {
-        return failedReason;
-      }
-    }
-    return null;
-  }
 
-  @Override
-  public boolean beforeStep(Step step, ScenarioRuntime sr) {
-    if (skipTracking(step)) {
-      return true;
-    }
-    AgentSpan span = AgentTracer.startSpan("karate", KARATE_STEP_SPAN_NAME);
-    AgentTracer.activateSpanWithoutScope(span);
-    String stepName = step.getPrefix() + " " + step.getText();
-    span.setResourceName(stepName);
-    span.setTag(Tags.COMPONENT, "karate");
-    span.spanContext().setIntegrationName("karate");
-    span.setTag("step.name", stepName);
-    span.setTag("step.startLine", step.getLine());
-    span.setTag("step.endLine", step.getEndLine());
-    span.setTag("step.docString", step.getDocString());
-    return true;
-  }
-
-  @Override
-  public void afterStep(StepResult result, ScenarioRuntime sr) {
-    if (skipTracking(result.getStep())) {
-      return;
+    private static boolean skipTracking(FeatureRuntime fr) {
+        // do not track nested feature calls
+        return !fr.caller.isNone();
     }
 
-    AgentSpan span = AgentTracer.activeSpan();
-    if (span == null) {
-      return;
+    public static boolean skipTracking(ScenarioRuntime sr) {
+        // do not track nested scenario calls and setup scenarios
+        return !sr.caller.isNone() || sr.tags.getTagKeys().contains("setup");
     }
 
-    AgentTracer.closeActive();
-    span.finish();
-  }
-
-  private static boolean skipTracking(FeatureRuntime fr) {
-    // do not track nested feature calls
-    return !fr.caller.isNone();
-  }
-
-  public static boolean skipTracking(ScenarioRuntime sr) {
-    // do not track nested scenario calls and setup scenarios
-    return !sr.caller.isNone() || sr.tags.getTagKeys().contains("setup");
-  }
-
-  private static boolean skipTracking(Step step) {
-    // do not track steps that are not children of a tracked scenario or another tracked step
-    AgentSpan activeSpan = AgentTracer.activeSpan();
-    return activeSpan == null
-        || (!KARATE_STEP_SPAN_NAME.contentEquals(activeSpan.getSpanName())
-            && !Tags.SPAN_KIND_TEST.contentEquals(activeSpan.getSpanType()));
-  }
+    private static boolean skipTracking(Step step) {
+        // do not track steps that are not children of a tracked scenario or another tracked step
+        AgentSpan activeSpan = AgentTracer.activeSpan();
+        return activeSpan == null
+                || (!KARATE_STEP_SPAN_NAME.contentEquals(activeSpan.getSpanName())
+                        && !Tags.SPAN_KIND_TEST.contentEquals(activeSpan.getSpanType()));
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java
index 1525d5dd741..08e65b940d9 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java
@@ -24,149 +24,143 @@
 
 public abstract class KarateUtils {
 
-  public static final String EXECUTION_TRACKER_MAGICVARIABLE = "__datadog_execution_tracker";
-
-  private KarateUtils() {}
-
-  private static final MethodHandles METHOD_HANDLES =
-      new MethodHandles(FeatureRuntime.class.getClassLoader());
-  private static final MethodHandle FEATURE_RUNTIME_FEATURE_GETTER =
-      METHOD_HANDLES.privateFieldGetter(FeatureRuntime.class, "feature");
-  private static final MethodHandle FEATURE_RUNTIME_FEATURE_CALL_GETTER =
-      METHOD_HANDLES.privateFieldGetter(FeatureRuntime.class, "featureCall");
-  private static final MethodHandle FEATURE_RUNTIME_BEFORE_HOOK_DONE_GETTER =
-      METHOD_HANDLES.privateFieldGetter(FeatureRuntime.class, "beforeHookDone");
-  private static final MethodHandle FEATURE_RUNTIME_BEFORE_HOOK_DONE_SETTER =
-      METHOD_HANDLES.privateFieldSetter(FeatureRuntime.class, "beforeHookDone");
-  private static final MethodHandle FEATURE_CALL_FEATURE_GETTER =
-      METHOD_HANDLES.privateFieldGetter("com.intuit.karate.core.FeatureCall", "feature");
-  private static final MethodHandle ABORTED_RESULT_DURATION_NANOS =
-      METHOD_HANDLES.method(Result.class, "aborted", long.class);
-  // static method to create aborted result has a different signature starting with Karate 1.4.1
-  private static final MethodHandle ABORTED_RESULT_STARTTIME_DURATION_NANOS =
-      METHOD_HANDLES.method(Result.class, "aborted", long.class, long.class);
-
-  private static final ComparableVersion karateV12 = new ComparableVersion("1.2.0");
-  private static final ComparableVersion karateV13 = new ComparableVersion("1.3.0");
-
-  public static final List<LibraryCapability> CAPABILITIES_BASE =
-      Arrays.asList(
-          LibraryCapability.ATR,
-          LibraryCapability.EFD,
-          LibraryCapability.FTR,
-          LibraryCapability.QUARANTINE,
-          LibraryCapability.ATTEMPT_TO_FIX);
-
-  public static final List<LibraryCapability> CAPABILITIES_SKIPPING =
-      Arrays.asList(
-          LibraryCapability.ATR,
-          LibraryCapability.EFD,
-          LibraryCapability.FTR,
-          LibraryCapability.QUARANTINE,
-          LibraryCapability.ATTEMPT_TO_FIX,
-          LibraryCapability.TIA,
-          LibraryCapability.DISABLED);
-
-  public static Feature getFeature(FeatureRuntime featureRuntime) {
-    if (FEATURE_RUNTIME_FEATURE_CALL_GETTER != null) {
-      Object featureCall =
-          METHOD_HANDLES.invoke(FEATURE_RUNTIME_FEATURE_CALL_GETTER, featureRuntime);
-      if (featureCall != null && FEATURE_CALL_FEATURE_GETTER != null) {
-        return METHOD_HANDLES.invoke(FEATURE_CALL_FEATURE_GETTER, featureCall);
-      }
-    } else if (FEATURE_RUNTIME_FEATURE_GETTER != null) {
-      // Karate versions prior to 1.3.0
-      return METHOD_HANDLES.invoke(FEATURE_RUNTIME_FEATURE_GETTER, featureRuntime);
+    public static final String EXECUTION_TRACKER_MAGICVARIABLE = "__datadog_execution_tracker";
+
+    private KarateUtils() {}
+
+    private static final MethodHandles METHOD_HANDLES = new MethodHandles(FeatureRuntime.class.getClassLoader());
+    private static final MethodHandle FEATURE_RUNTIME_FEATURE_GETTER =
+            METHOD_HANDLES.privateFieldGetter(FeatureRuntime.class, "feature");
+    private static final MethodHandle FEATURE_RUNTIME_FEATURE_CALL_GETTER =
+            METHOD_HANDLES.privateFieldGetter(FeatureRuntime.class, "featureCall");
+    private static final MethodHandle FEATURE_RUNTIME_BEFORE_HOOK_DONE_GETTER =
+            METHOD_HANDLES.privateFieldGetter(FeatureRuntime.class, "beforeHookDone");
+    private static final MethodHandle FEATURE_RUNTIME_BEFORE_HOOK_DONE_SETTER =
+            METHOD_HANDLES.privateFieldSetter(FeatureRuntime.class, "beforeHookDone");
+    private static final MethodHandle FEATURE_CALL_FEATURE_GETTER =
+            METHOD_HANDLES.privateFieldGetter("com.intuit.karate.core.FeatureCall", "feature");
+    private static final MethodHandle ABORTED_RESULT_DURATION_NANOS =
+            METHOD_HANDLES.method(Result.class, "aborted", long.class);
+    // static method to create aborted result has a different signature starting with Karate 1.4.1
+    private static final MethodHandle ABORTED_RESULT_STARTTIME_DURATION_NANOS =
+            METHOD_HANDLES.method(Result.class, "aborted", long.class, long.class);
+
+    private static final ComparableVersion karateV12 = new ComparableVersion("1.2.0");
+    private static final ComparableVersion karateV13 = new ComparableVersion("1.3.0");
+
+    public static final List<LibraryCapability> CAPABILITIES_BASE = Arrays.asList(
+            LibraryCapability.ATR,
+            LibraryCapability.EFD,
+            LibraryCapability.FTR,
+            LibraryCapability.QUARANTINE,
+            LibraryCapability.ATTEMPT_TO_FIX);
+
+    public static final List<LibraryCapability> CAPABILITIES_SKIPPING = Arrays.asList(
+            LibraryCapability.ATR,
+            LibraryCapability.EFD,
+            LibraryCapability.FTR,
+            LibraryCapability.QUARANTINE,
+            LibraryCapability.ATTEMPT_TO_FIX,
+            LibraryCapability.TIA,
+            LibraryCapability.DISABLED);
+
+    public static Feature getFeature(FeatureRuntime featureRuntime) {
+        if (FEATURE_RUNTIME_FEATURE_CALL_GETTER != null) {
+            Object featureCall = METHOD_HANDLES.invoke(FEATURE_RUNTIME_FEATURE_CALL_GETTER, featureRuntime);
+            if (featureCall != null && FEATURE_CALL_FEATURE_GETTER != null) {
+                return METHOD_HANDLES.invoke(FEATURE_CALL_FEATURE_GETTER, featureCall);
+            }
+        } else if (FEATURE_RUNTIME_FEATURE_GETTER != null) {
+            // Karate versions prior to 1.3.0
+            return METHOD_HANDLES.invoke(FEATURE_RUNTIME_FEATURE_GETTER, featureRuntime);
+        }
+        return null;
     }
-    return null;
-  }
-
-  public static String getScenarioName(Scenario scenario) {
-    String scenarioName = scenario.getName();
-    if (Strings.isNotBlank(scenarioName)) {
-      return scenarioName;
-    } else {
-      return scenario.getRefId();
+
+    public static String getScenarioName(Scenario scenario) {
+        String scenarioName = scenario.getName();
+        if (Strings.isNotBlank(scenarioName)) {
+            return scenarioName;
+        } else {
+            return scenario.getRefId();
+        }
+    }
+
+    public static List<String> getCategories(List<Tag> tags) {
+        if (tags == null) {
+            return Collections.emptyList();
+        }
+
+        List<String> categories = new ArrayList<>(tags.size());
+        for (Tag tag : tags) {
+            categories.add(tag.getName());
+        }
+        return categories;
     }
-  }
 
-  public static List<String> getCategories(List<Tag> tags) {
-    if (tags == null) {
-      return Collections.emptyList();
+    public static String getParameters(Scenario scenario) {
+        return scenario.getExampleData() != null ? toJson(scenario.getExampleData()) : null;
     }
 
-    List<String> categories = new ArrayList<>(tags.size());
-    for (Tag tag : tags) {
-      categories.add(tag.getName());
+    public static TestIdentifier toTestIdentifier(Scenario scenario) {
+        Feature feature = scenario.getFeature();
+        String featureName = feature.getNameForReport();
+        String scenarioName = KarateUtils.getScenarioName(scenario);
+        String parameters = KarateUtils.getParameters(scenario);
+        return new TestIdentifier(featureName, scenarioName, parameters);
     }
-    return categories;
-  }
-
-  public static String getParameters(Scenario scenario) {
-    return scenario.getExampleData() != null ? toJson(scenario.getExampleData()) : null;
-  }
-
-  public static TestIdentifier toTestIdentifier(Scenario scenario) {
-    Feature feature = scenario.getFeature();
-    String featureName = feature.getNameForReport();
-    String scenarioName = KarateUtils.getScenarioName(scenario);
-    String parameters = KarateUtils.getParameters(scenario);
-    return new TestIdentifier(featureName, scenarioName, parameters);
-  }
-
-  public static TestDescriptor toTestDescriptor(ScenarioRuntime scenarioRuntime) {
-    Scenario scenario = scenarioRuntime.scenario;
-    Feature feature = scenario.getFeature();
-    String featureName = feature.getNameForReport();
-    String scenarioName = KarateUtils.getScenarioName(scenario);
-    String parameters = KarateUtils.getParameters(scenario);
-    return new TestDescriptor(featureName, null, scenarioName, parameters, scenarioRuntime);
-  }
-
-  public static TestSuiteDescriptor toSuiteDescriptor(FeatureRuntime featureRuntime) {
-    String featureName = KarateUtils.getFeature(featureRuntime).getNameForReport();
-    return new TestSuiteDescriptor(featureName, null);
-  }
-
-  public static Result abortedResult() {
-    if (ABORTED_RESULT_STARTTIME_DURATION_NANOS != null) {
-      long startTime = System.currentTimeMillis();
-      long durationNanos = 1;
-      return METHOD_HANDLES.invoke(
-          ABORTED_RESULT_STARTTIME_DURATION_NANOS, startTime, durationNanos);
-    } else {
-      long durationNanos = 1;
-      return METHOD_HANDLES.invoke(ABORTED_RESULT_DURATION_NANOS, durationNanos);
+
+    public static TestDescriptor toTestDescriptor(ScenarioRuntime scenarioRuntime) {
+        Scenario scenario = scenarioRuntime.scenario;
+        Feature feature = scenario.getFeature();
+        String featureName = feature.getNameForReport();
+        String scenarioName = KarateUtils.getScenarioName(scenario);
+        String parameters = KarateUtils.getParameters(scenario);
+        return new TestDescriptor(featureName, null, scenarioName, parameters, scenarioRuntime);
+    }
+
+    public static TestSuiteDescriptor toSuiteDescriptor(FeatureRuntime featureRuntime) {
+        String featureName = KarateUtils.getFeature(featureRuntime).getNameForReport();
+        return new TestSuiteDescriptor(featureName, null);
     }
-  }
 
-  public static boolean isBeforeHookExecuted(FeatureRuntime featureRuntime) {
-    Boolean beforeHookDone =
-        METHOD_HANDLES.invoke(FEATURE_RUNTIME_BEFORE_HOOK_DONE_GETTER, featureRuntime);
-    return beforeHookDone != null ? beforeHookDone : true;
-  }
+    public static Result abortedResult() {
+        if (ABORTED_RESULT_STARTTIME_DURATION_NANOS != null) {
+            long startTime = System.currentTimeMillis();
+            long durationNanos = 1;
+            return METHOD_HANDLES.invoke(ABORTED_RESULT_STARTTIME_DURATION_NANOS, startTime, durationNanos);
+        } else {
+            long durationNanos = 1;
+            return METHOD_HANDLES.invoke(ABORTED_RESULT_DURATION_NANOS, durationNanos);
+        }
+    }
 
-  public static void resetBeforeHook(FeatureRuntime featureRuntime) {
-    METHOD_HANDLES.invoke(FEATURE_RUNTIME_BEFORE_HOOK_DONE_SETTER, featureRuntime, false);
-  }
+    public static boolean isBeforeHookExecuted(FeatureRuntime featureRuntime) {
+        Boolean beforeHookDone = METHOD_HANDLES.invoke(FEATURE_RUNTIME_BEFORE_HOOK_DONE_GETTER, featureRuntime);
+        return beforeHookDone != null ? beforeHookDone : true;
+    }
 
-  public static String getKarateVersion() {
-    return FileUtils.KARATE_VERSION;
-  }
+    public static void resetBeforeHook(FeatureRuntime featureRuntime) {
+        METHOD_HANDLES.invoke(FEATURE_RUNTIME_BEFORE_HOOK_DONE_SETTER, featureRuntime, false);
+    }
 
-  public static boolean isSkippingSupported(String version) {
-    return version != null && karateV12.compareTo(new ComparableVersion(version)) <= 0;
-  }
+    public static String getKarateVersion() {
+        return FileUtils.KARATE_VERSION;
+    }
 
-  public static boolean isSetupTagSupported(String version) {
-    return version != null && karateV13.compareTo(new ComparableVersion(version)) <= 0;
-  }
+    public static boolean isSkippingSupported(String version) {
+        return version != null && karateV12.compareTo(new ComparableVersion(version)) <= 0;
+    }
 
-  public static List<LibraryCapability> capabilities(String frameworkVersion) {
-    if (isSkippingSupported(frameworkVersion)) {
-      return CAPABILITIES_SKIPPING;
+    public static boolean isSetupTagSupported(String version) {
+        return version != null && karateV13.compareTo(new ComparableVersion(version)) <= 0;
     }
 
-    return CAPABILITIES_BASE;
-  }
+    public static List<LibraryCapability> capabilities(String frameworkVersion) {
+        if (isSkippingSupported(frameworkVersion)) {
+            return CAPABILITIES_SKIPPING;
+        }
+
+        return CAPABILITIES_BASE;
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/TestEventsHandlerHolder.java
index 6d9c65cd400..291233dc2fd 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/TestEventsHandlerHolder.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/TestEventsHandlerHolder.java
@@ -8,26 +8,25 @@
 
 public abstract class TestEventsHandlerHolder {
 
-  @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
-  public static volatile TestEventsHandler<TestSuiteDescriptor, TestDescriptor> TEST_EVENTS_HANDLER;
+    @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
+    public static volatile TestEventsHandler<TestSuiteDescriptor, TestDescriptor> TEST_EVENTS_HANDLER;
 
-  static {
-    start();
-  }
+    static {
+        start();
+    }
 
-  public static void start() {
-    TEST_EVENTS_HANDLER =
-        InstrumentationBridge.createTestEventsHandler(
-            "karate", null, null, KarateUtils.capabilities(KarateTracingHook.FRAMEWORK_VERSION));
-  }
+    public static void start() {
+        TEST_EVENTS_HANDLER = InstrumentationBridge.createTestEventsHandler(
+                "karate", null, null, KarateUtils.capabilities(KarateTracingHook.FRAMEWORK_VERSION));
+    }
 
-  /** Used by instrumentation tests */
-  public static void stop() {
-    if (TEST_EVENTS_HANDLER != null) {
-      TEST_EVENTS_HANDLER.close();
-      TEST_EVENTS_HANDLER = null;
+    /** Used by instrumentation tests */
+    public static void stop() {
+        if (TEST_EVENTS_HANDLER != null) {
+            TEST_EVENTS_HANDLER.close();
+            TEST_EVENTS_HANDLER = null;
+        }
     }
-  }
 
-  private TestEventsHandlerHolder() {}
+    private TestEventsHandlerHolder() {}
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/Flaky.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/Flaky.java
index 2a474c24299..8c887ea0cfd 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/Flaky.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/Flaky.java
@@ -4,17 +4,17 @@
 
 public class Flaky {
 
-  private static int counter = 0;
-  private static int stepCounter = 0;
+    private static int counter = 0;
+    private static int stepCounter = 0;
 
-  // Fails the first two attempts, passes from the third onwards.
-  public static void flake() {
-    assertTrue(++counter >= 3);
-  }
+    // Fails the first two attempts, passes from the third onwards.
+    public static void flake() {
+        assertTrue(++counter >= 3);
+    }
 
-  // Same flaky behavior exposed as a value, for continueOnStepFailure scenarios that assert it in
-  // several steps. Uses a separate counter because both helpers run in the same test JVM.
-  public static boolean shouldPass() {
-    return ++stepCounter >= 3;
-  }
+    // Same flaky behavior exposed as a value, for continueOnStepFailure scenarios that assert it in
+    // several steps. Uses a separate counter because both helpers run in the same test JVM.
+    public static boolean shouldPass() {
+        return ++stepCounter >= 3;
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/Slow.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/Slow.java
index 23a8bcd6d7e..8b121656a41 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/Slow.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/Slow.java
@@ -2,11 +2,11 @@
 
 public class Slow {
 
-  public static void stall() {
-    try {
-      Thread.sleep(1100);
-    } catch (InterruptedException e) {
-      throw new RuntimeException(e);
+    public static void stall() {
+        try {
+            Thread.sleep(1100);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestContinueOnStepFailureKarate.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestContinueOnStepFailureKarate.java
index 7aa9d4c435a..756b96db91a 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestContinueOnStepFailureKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestContinueOnStepFailureKarate.java
@@ -4,8 +4,8 @@
 
 public class TestContinueOnStepFailureKarate {
 
-  @Karate.Test
-  public Karate test() {
-    return Karate.run("classpath:org/example/test_continue_on_step_failure.feature");
-  }
+    @Karate.Test
+    public Karate test() {
+        return Karate.run("classpath:org/example/test_continue_on_step_failure.feature");
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestFailedBuiltInRetryKarate.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestFailedBuiltInRetryKarate.java
index 3e1b9b6ae57..989e985a4a9 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestFailedBuiltInRetryKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestFailedBuiltInRetryKarate.java
@@ -10,15 +10,16 @@
 
 public class TestFailedBuiltInRetryKarate {
 
-  @Test
-  public void testSucceed() {
-    Results results = Runner.path("classpath:org/example/test_failed.feature").parallel(1);
+    @Test
+    public void testSucceed() {
+        Results results =
+                Runner.path("classpath:org/example/test_failed.feature").parallel(1);
 
-    List<ScenarioResult> failed =
-        results.getScenarioResults().filter(ScenarioResult::isFailed).collect(Collectors.toList());
-    for (ScenarioResult scenarioResult : failed) {
-      Scenario scenario = scenarioResult.getScenario();
-      results.getSuite().retryScenario(scenario);
+        List<ScenarioResult> failed =
+                results.getScenarioResults().filter(ScenarioResult::isFailed).collect(Collectors.toList());
+        for (ScenarioResult scenarioResult : failed) {
+            Scenario scenario = scenarioResult.getScenario();
+            results.getSuite().retryScenario(scenario);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestFailedKarate.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestFailedKarate.java
index 06ae4bb6ddb..0051465a6a1 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestFailedKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestFailedKarate.java
@@ -4,8 +4,8 @@
 
 public class TestFailedKarate {
 
-  @Karate.Test
-  public Karate testFailed() {
-    return Karate.run("classpath:org/example/test_failed.feature");
-  }
+    @Karate.Test
+    public Karate testFailed() {
+        return Karate.run("classpath:org/example/test_failed.feature");
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestFailedParameterizedKarate.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestFailedParameterizedKarate.java
index d63a878bdd9..6d8dfbeecb2 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestFailedParameterizedKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestFailedParameterizedKarate.java
@@ -4,8 +4,8 @@
 
 public class TestFailedParameterizedKarate {
 
-  @Karate.Test
-  public Karate testSucceed() {
-    return Karate.run("classpath:org/example/test_failed_parameterized.feature");
-  }
+    @Karate.Test
+    public Karate testSucceed() {
+        return Karate.run("classpath:org/example/test_failed_parameterized.feature");
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestFailedThenSucceedKarate.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestFailedThenSucceedKarate.java
index 341b654262c..868f80f2a8c 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestFailedThenSucceedKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestFailedThenSucceedKarate.java
@@ -4,8 +4,8 @@
 
 public class TestFailedThenSucceedKarate {
 
-  @Karate.Test
-  public Karate testFailed() {
-    return Karate.run("classpath:org/example/test_failed_then_succeed.feature");
-  }
+    @Karate.Test
+    public Karate testFailed() {
+        return Karate.run("classpath:org/example/test_failed_then_succeed.feature");
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestParameterizedKarate.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestParameterizedKarate.java
index 7f2fb53dccc..9a0512b0ab9 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestParameterizedKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestParameterizedKarate.java
@@ -4,8 +4,8 @@
 
 public class TestParameterizedKarate {
 
-  @Karate.Test
-  public Karate testSucceed() {
-    return Karate.run("classpath:org/example/test_parameterized.feature");
-  }
+    @Karate.Test
+    public Karate testSucceed() {
+        return Karate.run("classpath:org/example/test_parameterized.feature");
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestParameterizedMoreCasesKarate.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestParameterizedMoreCasesKarate.java
index a20512a5626..eab067bb16e 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestParameterizedMoreCasesKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestParameterizedMoreCasesKarate.java
@@ -4,8 +4,8 @@
 
 public class TestParameterizedMoreCasesKarate {
 
-  @Karate.Test
-  public Karate testSucceed() {
-    return Karate.run("classpath:org/example/test_parameterized_more_cases.feature");
-  }
+    @Karate.Test
+    public Karate testSucceed() {
+        return Karate.run("classpath:org/example/test_parameterized_more_cases.feature");
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSkippedFeatureKarate.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSkippedFeatureKarate.java
index 74d246bd98f..941f766b3f1 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSkippedFeatureKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSkippedFeatureKarate.java
@@ -8,12 +8,11 @@
 
 public class TestSkippedFeatureKarate {
 
-  @Test
-  void testParallel() {
-    Results results =
-        Runner.path("classpath:org/example/test_succeed.feature")
-            .systemProperty("karate.options", "--tags ~@foo")
-            .parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    void testParallel() {
+        Results results = Runner.path("classpath:org/example/test_succeed.feature")
+                .systemProperty("karate.options", "--tags ~@foo")
+                .parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedCalledFeatureKarate.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedCalledFeatureKarate.java
index f0db64756aa..7bd3a17e5b0 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedCalledFeatureKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedCalledFeatureKarate.java
@@ -4,8 +4,8 @@
 
 public class TestSucceedCalledFeatureKarate {
 
-  @Karate.Test
-  public Karate testCalledFeature() {
-    return Karate.run("classpath:org/example/test_called_feature.feature");
-  }
+    @Karate.Test
+    public Karate testCalledFeature() {
+        return Karate.run("classpath:org/example/test_called_feature.feature");
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedKarate.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedKarate.java
index 33003ddccf4..87138faf1ac 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedKarate.java
@@ -4,8 +4,8 @@
 
 public class TestSucceedKarate {
 
-  @Karate.Test
-  public Karate testSucceed() {
-    return Karate.run("classpath:org/example/test_succeed.feature");
-  }
+    @Karate.Test
+    public Karate testSucceed() {
+        return Karate.run("classpath:org/example/test_succeed.feature");
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedKarateSkipEfd.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedKarateSkipEfd.java
index acbcbb9f73b..21e2c54db8b 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedKarateSkipEfd.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedKarateSkipEfd.java
@@ -4,8 +4,8 @@
 
 public class TestSucceedKarateSkipEfd {
 
-  @Karate.Test
-  public Karate testSucceed() {
-    return Karate.run("classpath:org/example/test_succeed_skip_efd.feature");
-  }
+    @Karate.Test
+    public Karate testSucceed() {
+        return Karate.run("classpath:org/example/test_succeed_skip_efd.feature");
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedKarateSlow.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedKarateSlow.java
index f250a136a83..b3488300f00 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedKarateSlow.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedKarateSlow.java
@@ -4,8 +4,8 @@
 
 public class TestSucceedKarateSlow {
 
-  @Karate.Test
-  public Karate testSucceed() {
-    return Karate.run("classpath:org/example/test_succeed_slow.feature");
-  }
+    @Karate.Test
+    public Karate testSucceed() {
+        return Karate.run("classpath:org/example/test_succeed_slow.feature");
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedOneCaseKarate.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedOneCaseKarate.java
index 999fc017be8..bf7cdd07622 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedOneCaseKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedOneCaseKarate.java
@@ -4,8 +4,8 @@
 
 public class TestSucceedOneCaseKarate {
 
-  @Karate.Test
-  public Karate testSucceed() {
-    return Karate.run("classpath:org/example/test_succeed_one_case.feature");
-  }
+    @Karate.Test
+    public Karate testSucceed() {
+        return Karate.run("classpath:org/example/test_succeed_one_case.feature");
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedParallelKarate.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedParallelKarate.java
index f180ca3ba02..a0739544573 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedParallelKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestSucceedParallelKarate.java
@@ -8,9 +8,10 @@
 
 public class TestSucceedParallelKarate {
 
-  @Test
-  public void testSucceed() {
-    Results results = Runner.path("classpath:org/example/test_succeed.feature").parallel(4);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void testSucceed() {
+        Results results =
+                Runner.path("classpath:org/example/test_succeed.feature").parallel(4);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestUnskippableKarate.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestUnskippableKarate.java
index 9b33ccc4027..6d4afe5f651 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestUnskippableKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestUnskippableKarate.java
@@ -4,8 +4,8 @@
 
 public class TestUnskippableKarate {
 
-  @Karate.Test
-  public Karate testSucceed() {
-    return Karate.run("classpath:org/example/test_unskippable.feature");
-  }
+    @Karate.Test
+    public Karate testSucceed() {
+        return Karate.run("classpath:org/example/test_unskippable.feature");
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestWithSetupKarate.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestWithSetupKarate.java
index 4bea15c32f8..905181f3187 100644
--- a/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestWithSetupKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/test/java/org/example/TestWithSetupKarate.java
@@ -4,8 +4,8 @@
 
 public class TestWithSetupKarate {
 
-  @Karate.Test
-  public Karate testSucceed() {
-    return Karate.run("classpath:org/example/test_with_setup.feature");
-  }
+    @Karate.Test
+    public Karate testSucceed() {
+        return Karate.run("classpath:org/example/test_with_setup.feature");
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java/datadog/trace/instrumentation/karate2/KarateExecutionInstrumentation.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java/datadog/trace/instrumentation/karate2/KarateExecutionInstrumentation.java
index f1329621fcb..41b40f6780d 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java/datadog/trace/instrumentation/karate2/KarateExecutionInstrumentation.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java/datadog/trace/instrumentation/karate2/KarateExecutionInstrumentation.java
@@ -30,49 +30,48 @@
  */
 @AutoService(InstrumenterModule.class)
 public class KarateExecutionInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public KarateExecutionInstrumentation() {
-    super("ci-visibility", "karate", "test-retry");
-  }
+    public KarateExecutionInstrumentation() {
+        super("ci-visibility", "karate", "test-retry");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {"io.karatelabs.core.ScenarioRuntime", "io.karatelabs.core.ScenarioResult"};
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"io.karatelabs.core.ScenarioRuntime", "io.karatelabs.core.ScenarioResult"};
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".KarateUtils",
-      packageName + ".TestEventsHandlerHolder",
-      packageName + ".ExecutionContext",
-      packageName + ".KarateTracingListener"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".KarateUtils",
+            packageName + ".TestEventsHandlerHolder",
+            packageName + ".ExecutionContext",
+            packageName + ".KarateTracingListener"
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "io.karatelabs.gherkin.Scenario", packageName + ".ExecutionContext");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("io.karatelabs.gherkin.Scenario", packageName + ".ExecutionContext");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // ScenarioRuntime#call() is the run()-equivalent; match the concrete ScenarioResult-returning
-    // method, not the synthetic Callable#call() bridge.
-    transformer.applyAdvice(
-        named("call")
-            .and(takesNoArguments())
-            .and(returns(named("io.karatelabs.core.ScenarioResult")))
-            .and(not(isBridge())),
-        packageName + ".KarateScenarioAdvice$RetryAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // ScenarioRuntime#call() is the run()-equivalent; match the concrete ScenarioResult-returning
+        // method, not the synthetic Callable#call() bridge.
+        transformer.applyAdvice(
+                named("call")
+                        .and(takesNoArguments())
+                        .and(returns(named("io.karatelabs.core.ScenarioResult")))
+                        .and(not(isBridge())),
+                packageName + ".KarateScenarioAdvice$RetryAdvice");
 
-    // ScenarioResult#addStepResult(StepResult)
-    transformer.applyAdvice(
-        named("addStepResult")
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("io.karatelabs.core.StepResult"))),
-        packageName + ".KarateScenarioAdvice$SuppressErrorAdvice");
-  }
+        // ScenarioResult#addStepResult(StepResult)
+        transformer.applyAdvice(
+                named("addStepResult")
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("io.karatelabs.core.StepResult"))),
+                packageName + ".KarateScenarioAdvice$SuppressErrorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java/datadog/trace/instrumentation/karate2/KarateInstrumentation.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java/datadog/trace/instrumentation/karate2/KarateInstrumentation.java
index c7f1abc0725..cff1ebfb2b6 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java/datadog/trace/instrumentation/karate2/KarateInstrumentation.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java/datadog/trace/instrumentation/karate2/KarateInstrumentation.java
@@ -18,35 +18,34 @@
  */
 @AutoService(InstrumenterModule.class)
 public class KarateInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public KarateInstrumentation() {
-    super("ci-visibility", "karate");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "io.karatelabs.core.Runner$Builder";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".KarateUtils",
-      packageName + ".TestEventsHandlerHolder",
-      packageName + ".ExecutionContext",
-      packageName + ".KarateTracingListener"
-    };
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "io.karatelabs.gherkin.Scenario", packageName + ".ExecutionContext");
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), packageName + ".KarateBuilderAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public KarateInstrumentation() {
+        super("ci-visibility", "karate");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "io.karatelabs.core.Runner$Builder";
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".KarateUtils",
+            packageName + ".TestEventsHandlerHolder",
+            packageName + ".ExecutionContext",
+            packageName + ".KarateTracingListener"
+        };
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("io.karatelabs.gherkin.Scenario", packageName + ".ExecutionContext");
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), packageName + ".KarateBuilderAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/ExecutionContext.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/ExecutionContext.java
index 3057e6b8ca2..2d2b42e48ac 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/ExecutionContext.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/ExecutionContext.java
@@ -8,58 +8,57 @@
 
 public class ExecutionContext {
 
-  private final TestExecutionPolicy executionPolicy;
-  private boolean suppressFailures;
-  private Throwable suppressedError;
-  private boolean testStarted;
+    private final TestExecutionPolicy executionPolicy;
+    private boolean suppressFailures;
+    private Throwable suppressedError;
+    private boolean testStarted;
 
-  public ExecutionContext(TestExecutionPolicy executionPolicy) {
-    this.executionPolicy = executionPolicy;
-  }
+    public ExecutionContext(TestExecutionPolicy executionPolicy) {
+        this.executionPolicy = executionPolicy;
+    }
 
-  public void setSuppressFailures(boolean suppressFailures) {
-    this.suppressFailures = suppressFailures;
-  }
+    public void setSuppressFailures(boolean suppressFailures) {
+        this.suppressFailures = suppressFailures;
+    }
 
-  public boolean shouldSuppressFailures() {
-    return suppressFailures;
-  }
+    public boolean shouldSuppressFailures() {
+        return suppressFailures;
+    }
 
-  public TestExecutionPolicy getExecutionPolicy() {
-    return executionPolicy;
-  }
+    public TestExecutionPolicy getExecutionPolicy() {
+        return executionPolicy;
+    }
 
-  public void setTestStarted(boolean testStarted) {
-    this.testStarted = testStarted;
-  }
+    public void setTestStarted(boolean testStarted) {
+        this.testStarted = testStarted;
+    }
 
-  public boolean isTestStarted() {
-    return testStarted;
-  }
+    public boolean isTestStarted() {
+        return testStarted;
+    }
 
-  /**
-   * Karate v2 {@code StepResult} is immutable (no {@code setFailedReason}/{@code setErrorIgnored}),
-   * so a failure that was suppressed for retry purposes cannot be carried on the replacement step.
-   * We stash it here instead, so the tracing listener can still report the failure to CI
-   * Visibility.
-   */
-  public void setSuppressedError(Throwable suppressedError) {
-    if (this.suppressedError == null) {
-      this.suppressedError = suppressedError;
+    /**
+     * Karate v2 {@code StepResult} is immutable (no {@code setFailedReason}/{@code setErrorIgnored}),
+     * so a failure that was suppressed for retry purposes cannot be carried on the replacement step.
+     * We stash it here instead, so the tracing listener can still report the failure to CI
+     * Visibility.
+     */
+    public void setSuppressedError(Throwable suppressedError) {
+        if (this.suppressedError == null) {
+            this.suppressedError = suppressedError;
+        }
     }
-  }
 
-  public Throwable getAndClearSuppressedError() {
-    Throwable suppressedError = this.suppressedError;
-    this.suppressedError = null;
-    return suppressedError;
-  }
+    public Throwable getAndClearSuppressedError() {
+        Throwable suppressedError = this.suppressedError;
+        this.suppressedError = null;
+        return suppressedError;
+    }
 
-  public static ExecutionContext create(Scenario scenario) {
-    TestIdentifier testIdentifier = KarateUtils.toTestIdentifier(scenario);
-    Collection<String> testTags = KarateUtils.getCategories(scenario.getTagsEffective());
-    return new ExecutionContext(
-        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.executionPolicy(
-            testIdentifier, TestSourceData.UNKNOWN, testTags));
-  }
+    public static ExecutionContext create(Scenario scenario) {
+        TestIdentifier testIdentifier = KarateUtils.toTestIdentifier(scenario);
+        Collection<String> testTags = KarateUtils.getCategories(scenario.getTagsEffective());
+        return new ExecutionContext(TestEventsHandlerHolder.TEST_EVENTS_HANDLER.executionPolicy(
+                testIdentifier, TestSourceData.UNKNOWN, testTags));
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/KarateBuilderAdvice.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/KarateBuilderAdvice.java
index 54bda255b9c..6105bed42f1 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/KarateBuilderAdvice.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/KarateBuilderAdvice.java
@@ -11,15 +11,15 @@
 /** Advice for the {@code io.karatelabs.core.Runner.Builder} constructor. */
 public class KarateBuilderAdvice {
 
-  @Advice.OnMethodExit
-  public static void onRunnerBuilderConstructorExit(@Advice.This Runner.Builder builder) {
-    ContextStore<Scenario, ExecutionContext> scenarioContext =
-        InstrumentationContext.get(Scenario.class, ExecutionContext.class);
-    builder.listener(new KarateTracingListener(scenarioContext));
-  }
+    @Advice.OnMethodExit
+    public static void onRunnerBuilderConstructorExit(@Advice.This Runner.Builder builder) {
+        ContextStore<Scenario, ExecutionContext> scenarioContext =
+                InstrumentationContext.get(Scenario.class, ExecutionContext.class);
+        builder.listener(new KarateTracingListener(scenarioContext));
+    }
 
-  // Karate 2.0.0 and above
-  public static void muzzleCheck(RunListener runListener) {
-    runListener.onEvent((RunEvent) null);
-  }
+    // Karate 2.0.0 and above
+    public static void muzzleCheck(RunListener runListener) {
+        runListener.onEvent((RunEvent) null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/KarateScenarioAdvice.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/KarateScenarioAdvice.java
index f950a077085..16836633b5c 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/KarateScenarioAdvice.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/KarateScenarioAdvice.java
@@ -14,104 +14,101 @@
 /** Advice classes for {@code io.karatelabs.core.ScenarioRuntime}/{@code ScenarioResult}. */
 public class KarateScenarioAdvice {
 
-  public static class RetryAdvice {
-    @Advice.OnMethodEnter
-    public static void beforeExecute(@Advice.This ScenarioRuntime scenarioRuntime) {
-      if (KarateTracingListener.skipTracking(scenarioRuntime)) {
-        return;
-      }
-
-      ExecutionContext executionContext =
-          InstrumentationContext.get(Scenario.class, ExecutionContext.class)
-              .getOrCompute(scenarioRuntime.getScenario(), ExecutionContext::create);
-      executionContext.setTestStarted(false);
-
-      // Indicate beforehand whether failures should be suppressed. This aligns the ordering with
-      // the rest of the frameworks.
-      TestExecutionPolicy executionPolicy = executionContext.getExecutionPolicy();
-      executionContext.setSuppressFailures(executionPolicy.suppressFailures());
-    }
+    public static class RetryAdvice {
+        @Advice.OnMethodEnter
+        public static void beforeExecute(@Advice.This ScenarioRuntime scenarioRuntime) {
+            if (KarateTracingListener.skipTracking(scenarioRuntime)) {
+                return;
+            }
+
+            ExecutionContext executionContext = InstrumentationContext.get(Scenario.class, ExecutionContext.class)
+                    .getOrCompute(scenarioRuntime.getScenario(), ExecutionContext::create);
+            executionContext.setTestStarted(false);
+
+            // Indicate beforehand whether failures should be suppressed. This aligns the ordering with
+            // the rest of the frameworks.
+            TestExecutionPolicy executionPolicy = executionContext.getExecutionPolicy();
+            executionContext.setSuppressFailures(executionPolicy.suppressFailures());
+        }
 
-    @Advice.OnMethodExit
-    public static void afterExecute(
-        @Advice.This ScenarioRuntime scenarioRuntime,
-        @Advice.Return(readOnly = false) ScenarioResult result) {
-      if (KarateTracingListener.skipTracking(scenarioRuntime)) {
-        return;
-      }
-
-      Scenario scenario = scenarioRuntime.getScenario();
-      ExecutionContext context =
-          InstrumentationContext.get(Scenario.class, ExecutionContext.class).get(scenario);
-      if (context == null || !context.isTestStarted()) {
-        // avoid retrying an aborted scenario that did not start, as the execution policy will not
-        // advance and loop
-        return;
-      }
-      KarateTracingListener.afterScenario(scenarioRuntime, result, context);
-
-      if (CallDepthThreadLocalMap.incrementCallDepth(ScenarioRuntime.class) > 0) {
-        // retry invoked below
-        return;
-      }
-
-      try {
-        ScenarioResult finalResult = result;
-        TestExecutionPolicy executionPolicy = context.getExecutionPolicy();
-        while (executionPolicy.applicable()) {
-          ScenarioRuntime retry =
-              new ScenarioRuntime(scenarioRuntime.getFeatureRuntime(), scenario);
-          ScenarioResult retryResult = retry.call();
-          if (!context.isTestStarted()) {
-            break;
-          }
-          finalResult = retryResult;
+        @Advice.OnMethodExit
+        public static void afterExecute(
+                @Advice.This ScenarioRuntime scenarioRuntime, @Advice.Return(readOnly = false) ScenarioResult result) {
+            if (KarateTracingListener.skipTracking(scenarioRuntime)) {
+                return;
+            }
+
+            Scenario scenario = scenarioRuntime.getScenario();
+            ExecutionContext context = InstrumentationContext.get(Scenario.class, ExecutionContext.class)
+                    .get(scenario);
+            if (context == null || !context.isTestStarted()) {
+                // avoid retrying an aborted scenario that did not start, as the execution policy will not
+                // advance and loop
+                return;
+            }
+            KarateTracingListener.afterScenario(scenarioRuntime, result, context);
+
+            if (CallDepthThreadLocalMap.incrementCallDepth(ScenarioRuntime.class) > 0) {
+                // retry invoked below
+                return;
+            }
+
+            try {
+                ScenarioResult finalResult = result;
+                TestExecutionPolicy executionPolicy = context.getExecutionPolicy();
+                while (executionPolicy.applicable()) {
+                    ScenarioRuntime retry = new ScenarioRuntime(scenarioRuntime.getFeatureRuntime(), scenario);
+                    ScenarioResult retryResult = retry.call();
+                    if (!context.isTestStarted()) {
+                        break;
+                    }
+                    finalResult = retryResult;
+                }
+
+                // override the return value so the final attempt is the one recorded.
+                result = finalResult;
+            } finally {
+                CallDepthThreadLocalMap.reset(ScenarioRuntime.class);
+            }
         }
 
-        // override the return value so the final attempt is the one recorded.
-        result = finalResult;
-      } finally {
-        CallDepthThreadLocalMap.reset(ScenarioRuntime.class);
-      }
+        // Karate 2.0.0 and above
+        public static void muzzleCheck(RunListener runListener) {
+            runListener.onEvent((RunEvent) null);
+        }
     }
 
-    // Karate 2.0.0 and above
-    public static void muzzleCheck(RunListener runListener) {
-      runListener.onEvent((RunEvent) null);
-    }
-  }
-
-  public static class SuppressErrorAdvice {
-    @Advice.OnMethodEnter
-    public static void onAddingStepResult(
-        @Advice.Argument(value = 0, readOnly = false) StepResult stepResult,
-        @Advice.FieldValue("scenario") Scenario scenario) {
-
-      // Keep expected failures intact so Karate can apply the @fail result inversion.
-      if (stepResult.isFailed() && !scenario.isFail()) {
-        ExecutionContext executionContext =
-            InstrumentationContext.get(Scenario.class, ExecutionContext.class).get(scenario);
-        if (executionContext == null) {
-          return;
+    public static class SuppressErrorAdvice {
+        @Advice.OnMethodEnter
+        public static void onAddingStepResult(
+                @Advice.Argument(value = 0, readOnly = false) StepResult stepResult,
+                @Advice.FieldValue("scenario") Scenario scenario) {
+
+            // Keep expected failures intact so Karate can apply the @fail result inversion.
+            if (stepResult.isFailed() && !scenario.isFail()) {
+                ExecutionContext executionContext = InstrumentationContext.get(Scenario.class, ExecutionContext.class)
+                        .get(scenario);
+                if (executionContext == null) {
+                    return;
+                }
+
+                // Suppress every failing step of a to-be-retried attempt (not just the first): with
+                // continueOnStepFailure a single attempt can add multiple failing steps, and any leak
+                // would mark the retry attempt's result failed.
+                if (executionContext.shouldSuppressFailures()) {
+                    // v2 StepResult is immutable: preserve the error out-of-band, then replace the failing
+                    // step with a skipped one so the scenario no longer counts as failed.
+                    executionContext.setSuppressedError(stepResult.getError());
+                    stepResult = StepResult.skipped(stepResult.getStep(), stepResult.getStartTime());
+                }
+            }
         }
 
-        // Suppress every failing step of a to-be-retried attempt (not just the first): with
-        // continueOnStepFailure a single attempt can add multiple failing steps, and any leak
-        // would mark the retry attempt's result failed.
-        if (executionContext.shouldSuppressFailures()) {
-          // v2 StepResult is immutable: preserve the error out-of-band, then replace the failing
-          // step with a skipped one so the scenario no longer counts as failed.
-          executionContext.setSuppressedError(stepResult.getError());
-          stepResult = StepResult.skipped(stepResult.getStep(), stepResult.getStartTime());
+        // Karate 2.0.0 and above
+        public static void muzzleCheck(RunListener runListener) {
+            runListener.onEvent((RunEvent) null);
         }
-      }
-    }
-
-    // Karate 2.0.0 and above
-    public static void muzzleCheck(RunListener runListener) {
-      runListener.onEvent((RunEvent) null);
     }
-  }
 
-  private KarateScenarioAdvice() {}
+    private KarateScenarioAdvice() {}
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/KarateTracingListener.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/KarateTracingListener.java
index 84a5adbd524..23cd3cd60e2 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/KarateTracingListener.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/KarateTracingListener.java
@@ -32,242 +32,236 @@
 
 public class KarateTracingListener implements RunListener {
 
-  private static final String FRAMEWORK_NAME = "karate";
-  public static final String FRAMEWORK_VERSION = KarateUtils.getKarateVersion();
-  public static final String KARATE_STEP_SPAN_NAME = "karate.step";
+    private static final String FRAMEWORK_NAME = "karate";
+    public static final String FRAMEWORK_VERSION = KarateUtils.getKarateVersion();
+    public static final String KARATE_STEP_SPAN_NAME = "karate.step";
 
-  private final ContextStore<Scenario, ExecutionContext> scenarioContext;
+    private final ContextStore<Scenario, ExecutionContext> scenarioContext;
 
-  public KarateTracingListener(ContextStore<Scenario, ExecutionContext> scenarioContext) {
-    this.scenarioContext = scenarioContext;
-  }
-
-  @Override
-  public boolean onEvent(RunEvent event) {
-    RunEventType type = event.getType();
-    if (type == RunEventType.FEATURE_ENTER) {
-      return beforeFeature((FeatureRunEvent) event);
-    } else if (type == RunEventType.FEATURE_EXIT) {
-      afterFeature((FeatureRunEvent) event);
-    } else if (type == RunEventType.SCENARIO_ENTER) {
-      return beforeScenario((ScenarioRunEvent) event);
-    } else if (type == RunEventType.SCENARIO_EXIT) {
-      afterScenario((ScenarioRunEvent) event);
-    } else if (type == RunEventType.STEP_ENTER) {
-      beforeStep((StepRunEvent) event);
-    } else if (type == RunEventType.STEP_EXIT) {
-      afterStep((StepRunEvent) event);
+    public KarateTracingListener(ContextStore<Scenario, ExecutionContext> scenarioContext) {
+        this.scenarioContext = scenarioContext;
     }
-    return true;
-  }
 
-  private void afterScenario(ScenarioRunEvent event) {
-    ScenarioRuntime sr = event.source();
-    Scenario scenario = sr.getScenario();
-    // A context means call advice will finish the test after scenario post-processing.
-    if (scenarioContext.get(scenario) == null) {
-      afterScenario(sr, event.result(), null);
+    @Override
+    public boolean onEvent(RunEvent event) {
+        RunEventType type = event.getType();
+        if (type == RunEventType.FEATURE_ENTER) {
+            return beforeFeature((FeatureRunEvent) event);
+        } else if (type == RunEventType.FEATURE_EXIT) {
+            afterFeature((FeatureRunEvent) event);
+        } else if (type == RunEventType.SCENARIO_ENTER) {
+            return beforeScenario((ScenarioRunEvent) event);
+        } else if (type == RunEventType.SCENARIO_EXIT) {
+            afterScenario((ScenarioRunEvent) event);
+        } else if (type == RunEventType.STEP_ENTER) {
+            beforeStep((StepRunEvent) event);
+        } else if (type == RunEventType.STEP_EXIT) {
+            afterStep((StepRunEvent) event);
+        }
+        return true;
     }
-  }
 
-  private boolean beforeFeature(FeatureRunEvent event) {
-    FeatureRuntime fr = event.source();
-    if (skipTracking(fr)) {
-      return true;
+    private void afterScenario(ScenarioRunEvent event) {
+        ScenarioRuntime sr = event.source();
+        Scenario scenario = sr.getScenario();
+        // A context means call advice will finish the test after scenario post-processing.
+        if (scenarioContext.get(scenario) == null) {
+            afterScenario(sr, event.result(), null);
+        }
     }
-    TestSuiteDescriptor suiteDescriptor = KarateUtils.toSuiteDescriptor(fr);
-    Feature feature = fr.getFeature();
-    TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart(
-        suiteDescriptor,
-        KarateUtils.getFeatureNameForReport(feature),
-        FRAMEWORK_NAME,
-        FRAMEWORK_VERSION,
-        null,
-        KarateUtils.getCategories(feature.getTags()),
-        isParallel(fr),
-        TestFrameworkInstrumentation.KARATE,
-        null);
-    return true;
-  }
 
-  private void afterFeature(FeatureRunEvent event) {
-    FeatureRuntime fr = event.source();
-    if (skipTracking(fr)) {
-      return;
-    }
-    TestSuiteDescriptor suiteDescriptor = KarateUtils.toSuiteDescriptor(fr);
-    FeatureResult result = event.result();
-    if (result != null && result.isFailed()) {
-      TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(
-          suiteDescriptor, suiteThrowable(result));
-    } else if (result != null && result.isEmpty()) {
-      TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, null);
+    private boolean beforeFeature(FeatureRunEvent event) {
+        FeatureRuntime fr = event.source();
+        if (skipTracking(fr)) {
+            return true;
+        }
+        TestSuiteDescriptor suiteDescriptor = KarateUtils.toSuiteDescriptor(fr);
+        Feature feature = fr.getFeature();
+        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart(
+                suiteDescriptor,
+                KarateUtils.getFeatureNameForReport(feature),
+                FRAMEWORK_NAME,
+                FRAMEWORK_VERSION,
+                null,
+                KarateUtils.getCategories(feature.getTags()),
+                isParallel(fr),
+                TestFrameworkInstrumentation.KARATE,
+                null);
+        return true;
     }
-    TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null);
-  }
 
-  private boolean beforeScenario(ScenarioRunEvent event) {
-    ScenarioRuntime sr = event.source();
-    if (skipTracking(sr)) {
-      return true;
+    private void afterFeature(FeatureRunEvent event) {
+        FeatureRuntime fr = event.source();
+        if (skipTracking(fr)) {
+            return;
+        }
+        TestSuiteDescriptor suiteDescriptor = KarateUtils.toSuiteDescriptor(fr);
+        FeatureResult result = event.result();
+        if (result != null && result.isFailed()) {
+            TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(suiteDescriptor, suiteThrowable(result));
+        } else if (result != null && result.isEmpty()) {
+            TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, null);
+        }
+        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null);
     }
-    Scenario scenario = sr.getScenario();
-    TestSuiteDescriptor suiteDescriptor = KarateUtils.toSuiteDescriptor(sr.getFeatureRuntime());
-    TestDescriptor testDescriptor = KarateUtils.toTestDescriptor(sr);
-    String scenarioName = KarateUtils.getScenarioName(scenario);
-    String parameters = KarateUtils.getParameters(scenario);
-    Collection<String> categories = KarateUtils.getCategories(scenario.getTagsEffective());
 
-    ExecutionContext context = scenarioContext.get(scenario);
-    TestExecutionTracker executionTracker = context != null ? context.getExecutionPolicy() : null;
+    private boolean beforeScenario(ScenarioRunEvent event) {
+        ScenarioRuntime sr = event.source();
+        if (skipTracking(sr)) {
+            return true;
+        }
+        Scenario scenario = sr.getScenario();
+        TestSuiteDescriptor suiteDescriptor = KarateUtils.toSuiteDescriptor(sr.getFeatureRuntime());
+        TestDescriptor testDescriptor = KarateUtils.toTestDescriptor(sr);
+        String scenarioName = KarateUtils.getScenarioName(scenario);
+        String parameters = KarateUtils.getParameters(scenario);
+        Collection<String> categories = KarateUtils.getCategories(scenario.getTagsEffective());
 
-    if (Config.get().isCiVisibilityTestSkippingEnabled()
-        || Config.get().isCiVisibilityTestManagementEnabled()) {
-      TestIdentifier skippableTest = KarateUtils.toTestIdentifier(scenario);
-      SkipReason skipReason = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(skippableTest);
+        ExecutionContext context = scenarioContext.get(scenario);
+        TestExecutionTracker executionTracker = context != null ? context.getExecutionPolicy() : null;
 
-      if (skipReason != null
-          && !(skipReason == SkipReason.ITR
-              && categories.contains(CIConstants.Tags.ITR_UNSKIPPABLE_TAG))) {
-        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore(
-            suiteDescriptor,
-            testDescriptor,
-            scenarioName,
-            FRAMEWORK_NAME,
-            FRAMEWORK_VERSION,
-            parameters,
-            categories,
-            TestSourceData.UNKNOWN,
-            skipReason.getDescription(),
-            executionTracker);
-        return false;
-      }
-    }
+        if (Config.get().isCiVisibilityTestSkippingEnabled() || Config.get().isCiVisibilityTestManagementEnabled()) {
+            TestIdentifier skippableTest = KarateUtils.toTestIdentifier(scenario);
+            SkipReason skipReason = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(skippableTest);
 
-    TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart(
-        suiteDescriptor,
-        testDescriptor,
-        scenarioName,
-        FRAMEWORK_NAME,
-        FRAMEWORK_VERSION,
-        parameters,
-        categories,
-        TestSourceData.UNKNOWN,
-        null,
-        executionTracker);
-    if (context != null) {
-      context.setTestStarted(true);
-    }
-    return true;
-  }
+            if (skipReason != null
+                    && !(skipReason == SkipReason.ITR && categories.contains(CIConstants.Tags.ITR_UNSKIPPABLE_TAG))) {
+                TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore(
+                        suiteDescriptor,
+                        testDescriptor,
+                        scenarioName,
+                        FRAMEWORK_NAME,
+                        FRAMEWORK_VERSION,
+                        parameters,
+                        categories,
+                        TestSourceData.UNKNOWN,
+                        skipReason.getDescription(),
+                        executionTracker);
+                return false;
+            }
+        }
 
-  public static void afterScenario(
-      ScenarioRuntime sr, ScenarioResult result, ExecutionContext context) {
-    if (skipTracking(sr)) {
-      return;
+        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart(
+                suiteDescriptor,
+                testDescriptor,
+                scenarioName,
+                FRAMEWORK_NAME,
+                FRAMEWORK_VERSION,
+                parameters,
+                categories,
+                TestSourceData.UNKNOWN,
+                null,
+                executionTracker);
+        if (context != null) {
+            context.setTestStarted(true);
+        }
+        return true;
     }
-    Scenario scenario = sr.getScenario();
-    TestDescriptor testDescriptor = KarateUtils.toTestDescriptor(sr);
 
-    Throwable suppressedError = context != null ? context.getAndClearSuppressedError() : null;
-    // @fail retains the expected step error even when the final result passes, so only inspect
-    // failed results for an error
-    boolean resultFailed = result != null && result.isFailed();
-    Throwable failedReason =
-        resultFailed ? getFailedReason(result, suppressedError) : suppressedError;
+    public static void afterScenario(ScenarioRuntime sr, ScenarioResult result, ExecutionContext context) {
+        if (skipTracking(sr)) {
+            return;
+        }
+        Scenario scenario = sr.getScenario();
+        TestDescriptor testDescriptor = KarateUtils.toTestDescriptor(sr);
 
-    if (resultFailed || failedReason != null) {
-      TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, failedReason);
-    } else if (result == null || result.getStepResults().isEmpty()) {
-      TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip(testDescriptor, null);
-    }
+        Throwable suppressedError = context != null ? context.getAndClearSuppressedError() : null;
+        // @fail retains the expected step error even when the final result passes, so only inspect
+        // failed results for an error
+        boolean resultFailed = result != null && result.isFailed();
+        Throwable failedReason = resultFailed ? getFailedReason(result, suppressedError) : suppressedError;
 
-    TestExecutionTracker executionTracker = context != null ? context.getExecutionPolicy() : null;
-    TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish(
-        testDescriptor, null, executionTracker);
-  }
+        if (resultFailed || failedReason != null) {
+            TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, failedReason);
+        } else if (result == null || result.getStepResults().isEmpty()) {
+            TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip(testDescriptor, null);
+        }
 
-  private void beforeStep(StepRunEvent event) {
-    Step step = event.step();
-    if (skipTracking(step)) {
-      return;
+        TestExecutionTracker executionTracker = context != null ? context.getExecutionPolicy() : null;
+        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish(testDescriptor, null, executionTracker);
     }
-    AgentSpan span = AgentTracer.startSpan("karate", KARATE_STEP_SPAN_NAME);
-    AgentTracer.activateSpanWithoutScope(span);
-    String stepName = step.getPrefix() + " " + step.getText();
-    span.setResourceName(stepName);
-    span.setTag(Tags.COMPONENT, "karate");
-    span.spanContext().setIntegrationName("karate");
-    span.setTag("step.name", stepName);
-    span.setTag("step.startLine", step.getLine());
-    span.setTag("step.endLine", step.getEndLine());
-    span.setTag("step.docString", step.getDocString());
-  }
 
-  private void afterStep(StepRunEvent event) {
-    if (skipTracking(event.step())) {
-      return;
+    private void beforeStep(StepRunEvent event) {
+        Step step = event.step();
+        if (skipTracking(step)) {
+            return;
+        }
+        AgentSpan span = AgentTracer.startSpan("karate", KARATE_STEP_SPAN_NAME);
+        AgentTracer.activateSpanWithoutScope(span);
+        String stepName = step.getPrefix() + " " + step.getText();
+        span.setResourceName(stepName);
+        span.setTag(Tags.COMPONENT, "karate");
+        span.spanContext().setIntegrationName("karate");
+        span.setTag("step.name", stepName);
+        span.setTag("step.startLine", step.getLine());
+        span.setTag("step.endLine", step.getEndLine());
+        span.setTag("step.docString", step.getDocString());
     }
 
-    AgentSpan span = AgentTracer.activeSpan();
-    if (span == null) {
-      return;
-    }
+    private void afterStep(StepRunEvent event) {
+        if (skipTracking(event.step())) {
+            return;
+        }
+
+        AgentSpan span = AgentTracer.activeSpan();
+        if (span == null) {
+            return;
+        }
 
-    AgentTracer.closeActive();
-    span.finish();
-  }
+        AgentTracer.closeActive();
+        span.finish();
+    }
 
-  private static Throwable getFailedReason(ScenarioResult result, Throwable suppressedError) {
-    if (result != null) {
-      Throwable error = result.getError();
-      if (error != null) {
-        return error;
-      }
-      for (StepResult stepResult : result.getStepResults()) {
-        if (stepResult.getError() != null) {
-          return stepResult.getError();
+    private static Throwable getFailedReason(ScenarioResult result, Throwable suppressedError) {
+        if (result != null) {
+            Throwable error = result.getError();
+            if (error != null) {
+                return error;
+            }
+            for (StepResult stepResult : result.getStepResults()) {
+                if (stepResult.getError() != null) {
+                    return stepResult.getError();
+                }
+            }
         }
-      }
+        // a failure that was suppressed by the retry logic (the failing step was replaced with a
+        // skipped one) is carried out-of-band on the ExecutionContext
+        return suppressedError;
     }
-    // a failure that was suppressed by the retry logic (the failing step was replaced with a
-    // skipped one) is carried out-of-band on the ExecutionContext
-    return suppressedError;
-  }
 
-  private static Throwable suiteThrowable(FeatureResult result) {
-    List<ScenarioResult> scenarioResults = result.getScenarioResults();
-    if (scenarioResults != null) {
-      for (ScenarioResult scenarioResult : scenarioResults) {
-        Throwable error = scenarioResult.getError();
-        if (error != null) {
-          return error;
+    private static Throwable suiteThrowable(FeatureResult result) {
+        List<ScenarioResult> scenarioResults = result.getScenarioResults();
+        if (scenarioResults != null) {
+            for (ScenarioResult scenarioResult : scenarioResults) {
+                Throwable error = scenarioResult.getError();
+                if (error != null) {
+                    return error;
+                }
+            }
         }
-      }
+        return new RuntimeException(result.getFailureMessage());
     }
-    return new RuntimeException(result.getFailureMessage());
-  }
 
-  private static boolean isParallel(FeatureRuntime fr) {
-    return fr.getSuite() != null && fr.getSuite().parallel;
-  }
+    private static boolean isParallel(FeatureRuntime fr) {
+        return fr.getSuite() != null && fr.getSuite().parallel;
+    }
 
-  private static boolean skipTracking(FeatureRuntime fr) {
-    // do not track nested (called) feature runs
-    return fr.getCaller() != null;
-  }
+    private static boolean skipTracking(FeatureRuntime fr) {
+        // do not track nested (called) feature runs
+        return fr.getCaller() != null;
+    }
 
-  public static boolean skipTracking(ScenarioRuntime sr) {
-    // do not track nested (called) scenario runs and setup scenarios
-    FeatureRuntime fr = sr.getFeatureRuntime();
-    return fr == null || fr.getCaller() != null || sr.getScenario().isSetup();
-  }
+    public static boolean skipTracking(ScenarioRuntime sr) {
+        // do not track nested (called) scenario runs and setup scenarios
+        FeatureRuntime fr = sr.getFeatureRuntime();
+        return fr == null || fr.getCaller() != null || sr.getScenario().isSetup();
+    }
 
-  private static boolean skipTracking(Step step) {
-    // do not track steps that are not children of a tracked scenario or another tracked step
-    AgentSpan activeSpan = AgentTracer.activeSpan();
-    return activeSpan == null
-        || (!KARATE_STEP_SPAN_NAME.contentEquals(activeSpan.getSpanName())
-            && !Tags.SPAN_KIND_TEST.contentEquals(activeSpan.getSpanType()));
-  }
+    private static boolean skipTracking(Step step) {
+        // do not track steps that are not children of a tracked scenario or another tracked step
+        AgentSpan activeSpan = AgentTracer.activeSpan();
+        return activeSpan == null
+                || (!KARATE_STEP_SPAN_NAME.contentEquals(activeSpan.getSpanName())
+                        && !Tags.SPAN_KIND_TEST.contentEquals(activeSpan.getSpanType()));
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/KarateUtils.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/KarateUtils.java
index 7a8b4bb4e7c..56f328bf596 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/KarateUtils.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/KarateUtils.java
@@ -24,155 +24,151 @@
 
 public abstract class KarateUtils {
 
-  private KarateUtils() {}
-
-  public static final List<LibraryCapability> CAPABILITIES = Collections.emptyList();
-
-  private static final ConcurrentHashMap<URI, String> CLASSPATH_NAME_CACHE =
-      new ConcurrentHashMap<>();
-
-  public static Feature getFeature(FeatureRuntime featureRuntime) {
-    return featureRuntime.getFeature();
-  }
-
-  /**
-   * Produces the karate-1.0-compatible suite identifier {@code "[<classpath-relative-path>]
-   * <name>"} (e.g. {@code "[org/example/test_succeed] test succeed"}).
-   *
-   * <p>We can't use v2's {@code Feature.getNameForReport()} directly: it derives the path from
-   * {@code Resource.getRelativePath()}, which v2 relativizes against the JVM working directory and
-   * falls back to the absolute path when the file is outside it.
-   *
-   * <p>We recover that form by asking the classloader to resolve progressively longer suffixes of
-   * the feature's path; the shortest suffix that resolves back to the same file is the
-   * classpath-relative name. Falls back to Karate's working-directory-relative path if nothing
-   * resolves.
-   */
-  public static String getFeatureNameForReport(Feature feature) {
-    if (feature == null) {
-      return null;
+    private KarateUtils() {}
+
+    public static final List<LibraryCapability> CAPABILITIES = Collections.emptyList();
+
+    private static final ConcurrentHashMap<URI, String> CLASSPATH_NAME_CACHE = new ConcurrentHashMap<>();
+
+    public static Feature getFeature(FeatureRuntime featureRuntime) {
+        return featureRuntime.getFeature();
     }
-    String classpathPath = resolveClasspathRelativeName(feature);
-    String name = feature.getName();
-    if (name == null || name.isEmpty()) {
-      return "[" + classpathPath + "]";
+
+    /**
+     * Produces the karate-1.0-compatible suite identifier {@code "[<classpath-relative-path>]
+     * <name>"} (e.g. {@code "[org/example/test_succeed] test succeed"}).
+     *
+     * <p>We can't use v2's {@code Feature.getNameForReport()} directly: it derives the path from
+     * {@code Resource.getRelativePath()}, which v2 relativizes against the JVM working directory and
+     * falls back to the absolute path when the file is outside it.
+     *
+     * <p>We recover that form by asking the classloader to resolve progressively longer suffixes of
+     * the feature's path; the shortest suffix that resolves back to the same file is the
+     * classpath-relative name. Falls back to Karate's working-directory-relative path if nothing
+     * resolves.
+     */
+    public static String getFeatureNameForReport(Feature feature) {
+        if (feature == null) {
+            return null;
+        }
+        String classpathPath = resolveClasspathRelativeName(feature);
+        String name = feature.getName();
+        if (name == null || name.isEmpty()) {
+            return "[" + classpathPath + "]";
+        }
+        return "[" + classpathPath + "] " + name;
     }
-    return "[" + classpathPath + "] " + name;
-  }
-
-  private static String resolveClasspathRelativeName(Feature feature) {
-    URI uri = feature.getResource() != null ? feature.getResource().getUri() : null;
-    // use Karate's own relative path as fallback for anything the classloader can't resolve
-    String fallback = resourceRelativeName(feature);
-    if (uri == null) {
-      return fallback;
+
+    private static String resolveClasspathRelativeName(Feature feature) {
+        URI uri = feature.getResource() != null ? feature.getResource().getUri() : null;
+        // use Karate's own relative path as fallback for anything the classloader can't resolve
+        String fallback = resourceRelativeName(feature);
+        if (uri == null) {
+            return fallback;
+        }
+        return CLASSPATH_NAME_CACHE.computeIfAbsent(uri, u -> computeClasspathRelativeName(u, fallback));
     }
-    return CLASSPATH_NAME_CACHE.computeIfAbsent(
-        uri, u -> computeClasspathRelativeName(u, fallback));
-  }
-
-  private static String resourceRelativeName(Feature feature) {
-    String relativePath =
-        feature.getResource() != null ? feature.getResource().getRelativePath() : null;
-    if (relativePath != null && !relativePath.isEmpty()) {
-      return stripFeatureExtension(relativePath);
+
+    private static String resourceRelativeName(Feature feature) {
+        String relativePath =
+                feature.getResource() != null ? feature.getResource().getRelativePath() : null;
+        if (relativePath != null && !relativePath.isEmpty()) {
+            return stripFeatureExtension(relativePath);
+        }
+        return feature.getName() != null ? feature.getName() : "";
     }
-    return feature.getName() != null ? feature.getName() : "";
-  }
-
-  private static String computeClasspathRelativeName(URI uri, String fallback) {
-    Path path;
-    try {
-      path = Paths.get(uri);
-    } catch (Exception e) {
-      // non-file URI (e.g. a feature packaged inside a jar): can't walk filesystem segments
-      return fallback;
+
+    private static String computeClasspathRelativeName(URI uri, String fallback) {
+        Path path;
+        try {
+            path = Paths.get(uri);
+        } catch (Exception e) {
+            // non-file URI (e.g. a feature packaged inside a jar): can't walk filesystem segments
+            return fallback;
+        }
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        if (cl == null) {
+            cl = Feature.class.getClassLoader();
+        }
+        int segments = path.getNameCount();
+        for (int start = segments - 1; start >= 0; start--) {
+            StringBuilder candidate = new StringBuilder();
+            for (int i = start; i < segments; i++) {
+                if (i > start) {
+                    candidate.append('/');
+                }
+                candidate.append(path.getName(i).toString());
+            }
+            URL resolved = cl.getResource(candidate.toString());
+            if (resolved != null) {
+                try {
+                    if (Paths.get(resolved.toURI()).equals(path)) {
+                        return stripFeatureExtension(candidate.toString());
+                    }
+                } catch (Exception ignored) {
+                    // continue searching
+                }
+            }
+        }
+        return fallback;
     }
-    ClassLoader cl = Thread.currentThread().getContextClassLoader();
-    if (cl == null) {
-      cl = Feature.class.getClassLoader();
+
+    private static String stripFeatureExtension(String path) {
+        return path.endsWith(".feature") ? path.substring(0, path.length() - ".feature".length()) : path;
     }
-    int segments = path.getNameCount();
-    for (int start = segments - 1; start >= 0; start--) {
-      StringBuilder candidate = new StringBuilder();
-      for (int i = start; i < segments; i++) {
-        if (i > start) {
-          candidate.append('/');
+
+    public static String getScenarioName(Scenario scenario) {
+        String scenarioName = scenario.getName();
+        if (Strings.isNotBlank(scenarioName)) {
+            return scenarioName;
+        } else {
+            return scenario.getRefId();
         }
-        candidate.append(path.getName(i).toString());
-      }
-      URL resolved = cl.getResource(candidate.toString());
-      if (resolved != null) {
-        try {
-          if (Paths.get(resolved.toURI()).equals(path)) {
-            return stripFeatureExtension(candidate.toString());
-          }
-        } catch (Exception ignored) {
-          // continue searching
+    }
+
+    public static List<String> getCategories(List<Tag> tags) {
+        if (tags == null) {
+            return Collections.emptyList();
+        }
+
+        List<String> categories = new ArrayList<>(tags.size());
+        for (Tag tag : tags) {
+            categories.add(tag.getName());
         }
-      }
+        return categories;
     }
-    return fallback;
-  }
-
-  private static String stripFeatureExtension(String path) {
-    return path.endsWith(".feature")
-        ? path.substring(0, path.length() - ".feature".length())
-        : path;
-  }
-
-  public static String getScenarioName(Scenario scenario) {
-    String scenarioName = scenario.getName();
-    if (Strings.isNotBlank(scenarioName)) {
-      return scenarioName;
-    } else {
-      return scenario.getRefId();
+
+    public static String getParameters(Scenario scenario) {
+        return scenario.getExampleData() != null ? toJson(scenario.getExampleData()) : null;
+    }
+
+    public static TestIdentifier toTestIdentifier(Scenario scenario) {
+        Feature feature = scenario.getFeature();
+        String featureName = getFeatureNameForReport(feature);
+        String scenarioName = getScenarioName(scenario);
+        String parameters = getParameters(scenario);
+        return new TestIdentifier(featureName, scenarioName, parameters);
+    }
+
+    public static TestDescriptor toTestDescriptor(ScenarioRuntime scenarioRuntime) {
+        Scenario scenario = scenarioRuntime.getScenario();
+        Feature feature = scenario.getFeature();
+        String featureName = getFeatureNameForReport(feature);
+        String scenarioName = getScenarioName(scenario);
+        String parameters = getParameters(scenario);
+        return new TestDescriptor(featureName, null, scenarioName, parameters, scenarioRuntime);
+    }
+
+    public static TestSuiteDescriptor toSuiteDescriptor(FeatureRuntime featureRuntime) {
+        String featureName = getFeatureNameForReport(featureRuntime.getFeature());
+        return new TestSuiteDescriptor(featureName, null);
     }
-  }
 
-  public static List<String> getCategories(List<Tag> tags) {
-    if (tags == null) {
-      return Collections.emptyList();
+    public static String getKarateVersion() {
+        return Globals.KARATE_VERSION;
     }
 
-    List<String> categories = new ArrayList<>(tags.size());
-    for (Tag tag : tags) {
-      categories.add(tag.getName());
+    public static List<LibraryCapability> capabilities() {
+        return CAPABILITIES;
     }
-    return categories;
-  }
-
-  public static String getParameters(Scenario scenario) {
-    return scenario.getExampleData() != null ? toJson(scenario.getExampleData()) : null;
-  }
-
-  public static TestIdentifier toTestIdentifier(Scenario scenario) {
-    Feature feature = scenario.getFeature();
-    String featureName = getFeatureNameForReport(feature);
-    String scenarioName = getScenarioName(scenario);
-    String parameters = getParameters(scenario);
-    return new TestIdentifier(featureName, scenarioName, parameters);
-  }
-
-  public static TestDescriptor toTestDescriptor(ScenarioRuntime scenarioRuntime) {
-    Scenario scenario = scenarioRuntime.getScenario();
-    Feature feature = scenario.getFeature();
-    String featureName = getFeatureNameForReport(feature);
-    String scenarioName = getScenarioName(scenario);
-    String parameters = getParameters(scenario);
-    return new TestDescriptor(featureName, null, scenarioName, parameters, scenarioRuntime);
-  }
-
-  public static TestSuiteDescriptor toSuiteDescriptor(FeatureRuntime featureRuntime) {
-    String featureName = getFeatureNameForReport(featureRuntime.getFeature());
-    return new TestSuiteDescriptor(featureName, null);
-  }
-
-  public static String getKarateVersion() {
-    return Globals.KARATE_VERSION;
-  }
-
-  public static List<LibraryCapability> capabilities() {
-    return CAPABILITIES;
-  }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/TestEventsHandlerHolder.java
index d2c4c495cab..87938f76df2 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/TestEventsHandlerHolder.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java21/datadog/trace/instrumentation/karate2/TestEventsHandlerHolder.java
@@ -8,25 +8,24 @@
 
 public abstract class TestEventsHandlerHolder {
 
-  public static volatile TestEventsHandler<TestSuiteDescriptor, TestDescriptor> TEST_EVENTS_HANDLER;
+    public static volatile TestEventsHandler<TestSuiteDescriptor, TestDescriptor> TEST_EVENTS_HANDLER;
 
-  static {
-    start();
-  }
+    static {
+        start();
+    }
 
-  public static void start() {
-    TEST_EVENTS_HANDLER =
-        InstrumentationBridge.createTestEventsHandler(
-            "karate", null, null, KarateUtils.capabilities());
-  }
+    public static void start() {
+        TEST_EVENTS_HANDLER =
+                InstrumentationBridge.createTestEventsHandler("karate", null, null, KarateUtils.capabilities());
+    }
 
-  @VisibleForTesting
-  public static void stop() {
-    if (TEST_EVENTS_HANDLER != null) {
-      TEST_EVENTS_HANDLER.close();
-      TEST_EVENTS_HANDLER = null;
+    @VisibleForTesting
+    public static void stop() {
+        if (TEST_EVENTS_HANDLER != null) {
+            TEST_EVENTS_HANDLER.close();
+            TEST_EVENTS_HANDLER = null;
+        }
     }
-  }
 
-  private TestEventsHandlerHolder() {}
+    private TestEventsHandlerHolder() {}
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/KarateStandaloneScenarioTest.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/KarateStandaloneScenarioTest.java
index 15f2c4f2db9..33417ac818a 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/KarateStandaloneScenarioTest.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/KarateStandaloneScenarioTest.java
@@ -10,14 +10,14 @@
 
 public class KarateStandaloneScenarioTest {
 
-  @Test
-  public void testStandaloneScenarioRuntime() {
-    Resource resource = Resource.path("classpath:org/example/test_succeed_one_case.feature");
-    Feature feature = Feature.read(resource);
-    Scenario scenario = feature.getSections().getFirst().getScenario();
+    @Test
+    public void testStandaloneScenarioRuntime() {
+        Resource resource = Resource.path("classpath:org/example/test_succeed_one_case.feature");
+        Feature feature = Feature.read(resource);
+        Scenario scenario = feature.getSections().getFirst().getScenario();
 
-    ScenarioResult result = new ScenarioRuntime(new KarateJs(resource), scenario).call();
+        ScenarioResult result = new ScenarioRuntime(new KarateJs(resource), scenario).call();
 
-    assertTrue(result.isPassed());
-  }
+        assertTrue(result.isPassed());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/Flaky.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/Flaky.java
index 59b938aaf57..22167e013d7 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/Flaky.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/Flaky.java
@@ -4,9 +4,9 @@
 
 public class Flaky {
 
-  private static int counter = 0;
+    private static int counter = 0;
 
-  public static void flake() {
-    assertTrue(++counter >= 3);
-  }
+    public static void flake() {
+        assertTrue(++counter >= 3);
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/Slow.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/Slow.java
index 23a8bcd6d7e..8b121656a41 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/Slow.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/Slow.java
@@ -2,11 +2,11 @@
 
 public class Slow {
 
-  public static void stall() {
-    try {
-      Thread.sleep(1100);
-    } catch (InterruptedException e) {
-      throw new RuntimeException(e);
+    public static void stall() {
+        try {
+            Thread.sleep(1100);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedAbortSuiteKarate.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedAbortSuiteKarate.java
index 3f1547afafa..fb4e9a9b710 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedAbortSuiteKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedAbortSuiteKarate.java
@@ -8,9 +8,10 @@
 
 public class TestFailedAbortSuiteKarate {
 
-  @Test
-  public void test() {
-    Results results = Runner.path("classpath:org/example/test_abort_suite.feature").parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void test() {
+        Results results =
+                Runner.path("classpath:org/example/test_abort_suite.feature").parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedAfterScenarioKarate.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedAfterScenarioKarate.java
index 410721d5b98..855abc848f9 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedAfterScenarioKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedAfterScenarioKarate.java
@@ -8,10 +8,10 @@
 
 public class TestFailedAfterScenarioKarate {
 
-  @Test
-  public void test() {
-    Results results =
-        Runner.path("classpath:org/example/test_after_scenario_failed.feature").parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void test() {
+        Results results = Runner.path("classpath:org/example/test_after_scenario_failed.feature")
+                .parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedExpectedKarate.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedExpectedKarate.java
index 06febe5e671..b248d1a7b12 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedExpectedKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedExpectedKarate.java
@@ -8,9 +8,10 @@
 
 public class TestFailedExpectedKarate {
 
-  @Test
-  public void test() {
-    Results results = Runner.path("classpath:org/example/test_fail_expected.feature").parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void test() {
+        Results results =
+                Runner.path("classpath:org/example/test_fail_expected.feature").parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedKarate.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedKarate.java
index 0aa667d0a7d..10acfb0d3d3 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedKarate.java
@@ -8,9 +8,10 @@
 
 public class TestFailedKarate {
 
-  @Test
-  public void test() {
-    Results results = Runner.path("classpath:org/example/test_failed.feature").parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void test() {
+        Results results =
+                Runner.path("classpath:org/example/test_failed.feature").parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedParameterizedKarate.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedParameterizedKarate.java
index 026f47875ed..243cafaa04b 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedParameterizedKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedParameterizedKarate.java
@@ -8,10 +8,10 @@
 
 public class TestFailedParameterizedKarate {
 
-  @Test
-  public void test() {
-    Results results =
-        Runner.path("classpath:org/example/test_failed_parameterized.feature").parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void test() {
+        Results results = Runner.path("classpath:org/example/test_failed_parameterized.feature")
+                .parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedThenSucceedKarate.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedThenSucceedKarate.java
index 9ce500bd482..03ce91d0b43 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedThenSucceedKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedThenSucceedKarate.java
@@ -8,10 +8,10 @@
 
 public class TestFailedThenSucceedKarate {
 
-  @Test
-  public void test() {
-    Results results =
-        Runner.path("classpath:org/example/test_failed_then_succeed.feature").parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void test() {
+        Results results = Runner.path("classpath:org/example/test_failed_then_succeed.feature")
+                .parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedUnexpectedKarate.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedUnexpectedKarate.java
index acb5c40c5aa..f79c619c6f9 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedUnexpectedKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestFailedUnexpectedKarate.java
@@ -8,9 +8,10 @@
 
 public class TestFailedUnexpectedKarate {
 
-  @Test
-  public void test() {
-    Results results = Runner.path("classpath:org/example/test_fail_unexpected.feature").parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void test() {
+        Results results = Runner.path("classpath:org/example/test_fail_unexpected.feature")
+                .parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestParameterizedKarate.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestParameterizedKarate.java
index 3d849359504..ad470ce9a92 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestParameterizedKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestParameterizedKarate.java
@@ -8,9 +8,10 @@
 
 public class TestParameterizedKarate {
 
-  @Test
-  public void test() {
-    Results results = Runner.path("classpath:org/example/test_parameterized.feature").parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void test() {
+        Results results =
+                Runner.path("classpath:org/example/test_parameterized.feature").parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestParameterizedMoreCasesKarate.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestParameterizedMoreCasesKarate.java
index 7a0a9af41a4..a2cf31bc931 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestParameterizedMoreCasesKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestParameterizedMoreCasesKarate.java
@@ -8,10 +8,10 @@
 
 public class TestParameterizedMoreCasesKarate {
 
-  @Test
-  public void test() {
-    Results results =
-        Runner.path("classpath:org/example/test_parameterized_more_cases.feature").parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void test() {
+        Results results = Runner.path("classpath:org/example/test_parameterized_more_cases.feature")
+                .parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSkippedFeatureKarate.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSkippedFeatureKarate.java
index 74d246bd98f..941f766b3f1 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSkippedFeatureKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSkippedFeatureKarate.java
@@ -8,12 +8,11 @@
 
 public class TestSkippedFeatureKarate {
 
-  @Test
-  void testParallel() {
-    Results results =
-        Runner.path("classpath:org/example/test_succeed.feature")
-            .systemProperty("karate.options", "--tags ~@foo")
-            .parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    void testParallel() {
+        Results results = Runner.path("classpath:org/example/test_succeed.feature")
+                .systemProperty("karate.options", "--tags ~@foo")
+                .parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedCalledFeatureKarate.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedCalledFeatureKarate.java
index df87c42a593..31340f66ffd 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedCalledFeatureKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedCalledFeatureKarate.java
@@ -8,9 +8,10 @@
 
 public class TestSucceedCalledFeatureKarate {
 
-  @Test
-  public void test() {
-    Results results = Runner.path("classpath:org/example/test_called_feature.feature").parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void test() {
+        Results results =
+                Runner.path("classpath:org/example/test_called_feature.feature").parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedKarate.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedKarate.java
index 3c3ae82182d..5387c178040 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedKarate.java
@@ -8,9 +8,10 @@
 
 public class TestSucceedKarate {
 
-  @Test
-  public void test() {
-    Results results = Runner.path("classpath:org/example/test_succeed.feature").parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void test() {
+        Results results =
+                Runner.path("classpath:org/example/test_succeed.feature").parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedKarateSkipEfd.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedKarateSkipEfd.java
index c13e94725c9..79930eb275d 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedKarateSkipEfd.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedKarateSkipEfd.java
@@ -8,10 +8,10 @@
 
 public class TestSucceedKarateSkipEfd {
 
-  @Test
-  public void test() {
-    Results results =
-        Runner.path("classpath:org/example/test_succeed_skip_efd.feature").parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void test() {
+        Results results = Runner.path("classpath:org/example/test_succeed_skip_efd.feature")
+                .parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedKarateSlow.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedKarateSlow.java
index b5b41c94657..5e88e10b7ab 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedKarateSlow.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedKarateSlow.java
@@ -8,9 +8,10 @@
 
 public class TestSucceedKarateSlow {
 
-  @Test
-  public void test() {
-    Results results = Runner.path("classpath:org/example/test_succeed_slow.feature").parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void test() {
+        Results results =
+                Runner.path("classpath:org/example/test_succeed_slow.feature").parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedOneCaseKarate.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedOneCaseKarate.java
index 2158105d49e..35955dfcd56 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedOneCaseKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedOneCaseKarate.java
@@ -8,10 +8,10 @@
 
 public class TestSucceedOneCaseKarate {
 
-  @Test
-  public void test() {
-    Results results =
-        Runner.path("classpath:org/example/test_succeed_one_case.feature").parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void test() {
+        Results results = Runner.path("classpath:org/example/test_succeed_one_case.feature")
+                .parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedParallelKarate.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedParallelKarate.java
index f180ca3ba02..a0739544573 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedParallelKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestSucceedParallelKarate.java
@@ -8,9 +8,10 @@
 
 public class TestSucceedParallelKarate {
 
-  @Test
-  public void testSucceed() {
-    Results results = Runner.path("classpath:org/example/test_succeed.feature").parallel(4);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void testSucceed() {
+        Results results =
+                Runner.path("classpath:org/example/test_succeed.feature").parallel(4);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestUnskippableKarate.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestUnskippableKarate.java
index fd82915bc7b..7c4d4ea418d 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestUnskippableKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestUnskippableKarate.java
@@ -8,9 +8,10 @@
 
 public class TestUnskippableKarate {
 
-  @Test
-  public void test() {
-    Results results = Runner.path("classpath:org/example/test_unskippable.feature").parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void test() {
+        Results results =
+                Runner.path("classpath:org/example/test_unskippable.feature").parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestWithSetupKarate.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestWithSetupKarate.java
index 86a5d703884..984ea26477a 100644
--- a/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestWithSetupKarate.java
+++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/test/java/org/example/TestWithSetupKarate.java
@@ -8,9 +8,10 @@
 
 public class TestWithSetupKarate {
 
-  @Test
-  public void test() {
-    Results results = Runner.path("classpath:org/example/test_with_setup.feature").parallel(1);
-    assertEquals(0, results.getFailCount(), results.getErrorMessages());
-  }
+    @Test
+    public void test() {
+        Results results =
+                Runner.path("classpath:org/example/test_with_setup.feature").parallel(1);
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 }
diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/CoroutineContextInstrumentation.java b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/CoroutineContextInstrumentation.java
index 6fd209caeaf..fd4ed52b87d 100644
--- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/CoroutineContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/CoroutineContextInstrumentation.java
@@ -8,30 +8,28 @@
 import net.bytebuddy.asm.Advice;
 
 /** Adds {@link DatadogThreadContextElement} to every coroutine context. */
-public class CoroutineContextInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class CoroutineContextInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "kotlinx.coroutines.CoroutineContextKt";
-  }
+    @Override
+    public String instrumentedType() {
+        return "kotlinx.coroutines.CoroutineContextKt";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("newCoroutineContext")
-            .and(takesArgument(0, named("kotlinx.coroutines.CoroutineScope")))
-            .and(takesArgument(1, named("kotlin.coroutines.CoroutineContext"))),
-        this.getClass().getName() + "$ContextAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("newCoroutineContext")
+                        .and(takesArgument(0, named("kotlinx.coroutines.CoroutineScope")))
+                        .and(takesArgument(1, named("kotlin.coroutines.CoroutineContext"))),
+                this.getClass().getName() + "$ContextAdvice");
+    }
 
-  public static class ContextAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(
-        @Advice.Argument(value = 1, readOnly = false) CoroutineContext coroutineContext) {
-      if (coroutineContext != null) {
-        coroutineContext = DatadogThreadContextElement.addDatadogElement(coroutineContext);
-      }
+    public static class ContextAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(@Advice.Argument(value = 1, readOnly = false) CoroutineContext coroutineContext) {
+            if (coroutineContext != null) {
+                coroutineContext = DatadogThreadContextElement.addDatadogElement(coroutineContext);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/CoroutineInstrumentation.java b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/CoroutineInstrumentation.java
index 87dab50a525..7f23e769a80 100644
--- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/CoroutineInstrumentation.java
+++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/CoroutineInstrumentation.java
@@ -11,36 +11,33 @@
  * Captures the Datadog context when non-lazy coroutines are constructed. Also cancels the captured
  * Datadog context when any coroutine completes (regardless whether it is lazy or non-lazy).
  */
-public class CoroutineInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class CoroutineInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "kotlinx.coroutines.AbstractCoroutine";
-  }
+    @Override
+    public String instrumentedType() {
+        return "kotlinx.coroutines.AbstractCoroutine";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(), CoroutineInstrumentation.class.getName() + "$ConstructorAdvice");
-    transformer.applyAdvice(
-        named("onCompletionInternal"),
-        CoroutineInstrumentation.class.getName() + "$OnCompletionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), CoroutineInstrumentation.class.getName() + "$ConstructorAdvice");
+        transformer.applyAdvice(
+                named("onCompletionInternal"), CoroutineInstrumentation.class.getName() + "$OnCompletionAdvice");
+    }
 
-  public static class ConstructorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterConstruction(@Advice.This AbstractCoroutine<?> coroutine) {
-      if (coroutine.isActive()) {
-        DatadogThreadContextElement.captureDatadogContext(coroutine);
-      }
+    public static class ConstructorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterConstruction(@Advice.This AbstractCoroutine<?> coroutine) {
+            if (coroutine.isActive()) {
+                DatadogThreadContextElement.captureDatadogContext(coroutine);
+            }
+        }
     }
-  }
 
-  public static class OnCompletionAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterCompletion(@Advice.This AbstractCoroutine<?> coroutine) {
-      DatadogThreadContextElement.cancelDatadogContext(coroutine);
+    public static class OnCompletionAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterCompletion(@Advice.This AbstractCoroutine<?> coroutine) {
+            DatadogThreadContextElement.cancelDatadogContext(coroutine);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/DatadogThreadContextElement.java b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/DatadogThreadContextElement.java
index 55516db89e0..e9b7b786c28 100644
--- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/DatadogThreadContextElement.java
+++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/DatadogThreadContextElement.java
@@ -12,88 +12,84 @@
 
 /** Manages the Datadog context for coroutines, switching contexts as coroutines switch threads. */
 public final class DatadogThreadContextElement implements ThreadContextElement<Context> {
-  private static final AtomicReferenceFieldUpdater<DatadogThreadContextElement, ContextContinuation>
-      CONTINUATION =
-          AtomicReferenceFieldUpdater.newUpdater(
-              DatadogThreadContextElement.class, ContextContinuation.class, "continuation");
+    private static final AtomicReferenceFieldUpdater<DatadogThreadContextElement, ContextContinuation> CONTINUATION =
+            AtomicReferenceFieldUpdater.newUpdater(
+                    DatadogThreadContextElement.class, ContextContinuation.class, "continuation");
 
-  private static final CoroutineContext.Key<DatadogThreadContextElement> DATADOG_KEY =
-      new CoroutineContext.Key<DatadogThreadContextElement>() {};
+    private static final CoroutineContext.Key<DatadogThreadContextElement> DATADOG_KEY =
+            new CoroutineContext.Key<DatadogThreadContextElement>() {};
 
-  public static CoroutineContext addDatadogElement(CoroutineContext coroutineContext) {
-    if (coroutineContext.get(DATADOG_KEY) != null) {
-      return coroutineContext; // already added
+    public static CoroutineContext addDatadogElement(CoroutineContext coroutineContext) {
+        if (coroutineContext.get(DATADOG_KEY) != null) {
+            return coroutineContext; // already added
+        }
+        return coroutineContext.plus(new DatadogThreadContextElement());
     }
-    return coroutineContext.plus(new DatadogThreadContextElement());
-  }
 
-  private Context context;
-  private volatile ContextContinuation continuation;
+    private Context context;
+    private volatile ContextContinuation continuation;
 
-  @Nonnull
-  @Override
-  public Key<?> getKey() {
-    return DATADOG_KEY;
-  }
+    @Nonnull
+    @Override
+    public Key<?> getKey() {
+        return DATADOG_KEY;
+    }
 
-  public static void captureDatadogContext(@Nonnull AbstractCoroutine<?> coroutine) {
-    DatadogThreadContextElement datadog = coroutine.getContext().get(DATADOG_KEY);
-    if (datadog != null && datadog.context == null) {
-      // record context to use for this coroutine
-      datadog.context = Context.current();
-      // stop enclosing trace from finishing early
-      datadog.continuation = datadog.context.capture();
+    public static void captureDatadogContext(@Nonnull AbstractCoroutine<?> coroutine) {
+        DatadogThreadContextElement datadog = coroutine.getContext().get(DATADOG_KEY);
+        if (datadog != null && datadog.context == null) {
+            // record context to use for this coroutine
+            datadog.context = Context.current();
+            // stop enclosing trace from finishing early
+            datadog.continuation = datadog.context.capture();
+        }
     }
-  }
 
-  public static void cancelDatadogContext(@Nonnull AbstractCoroutine<?> coroutine) {
-    DatadogThreadContextElement datadog = coroutine.getContext().get(DATADOG_KEY);
-    ContextContinuation continuation =
-        datadog == null ? null : CONTINUATION.getAndSet(datadog, null);
-    if (continuation != null) {
-      // release enclosing trace now the coroutine has completed
-      continuation.release();
+    public static void cancelDatadogContext(@Nonnull AbstractCoroutine<?> coroutine) {
+        DatadogThreadContextElement datadog = coroutine.getContext().get(DATADOG_KEY);
+        ContextContinuation continuation = datadog == null ? null : CONTINUATION.getAndSet(datadog, null);
+        if (continuation != null) {
+            // release enclosing trace now the coroutine has completed
+            continuation.release();
+        }
     }
-  }
 
-  @Override
-  public Context updateThreadContext(@Nonnull CoroutineContext coroutineContext) {
-    if (context == null) {
-      // record context to use for this coroutine
-      context = Context.current();
-      // stop enclosing trace from finishing early
-      continuation = context.capture();
+    @Override
+    public Context updateThreadContext(@Nonnull CoroutineContext coroutineContext) {
+        if (context == null) {
+            // record context to use for this coroutine
+            context = Context.current();
+            // stop enclosing trace from finishing early
+            continuation = context.capture();
+        }
+        return context.swap();
     }
-    return context.swap();
-  }
 
-  @Override
-  public void restoreThreadContext(
-      @Nonnull CoroutineContext coroutineContext, Context originalContext) {
-    context = originalContext.swap();
-  }
+    @Override
+    public void restoreThreadContext(@Nonnull CoroutineContext coroutineContext, Context originalContext) {
+        context = originalContext.swap();
+    }
 
-  @Nonnull
-  @Override
-  public CoroutineContext plus(@Nonnull CoroutineContext coroutineContext) {
-    return CoroutineContext.DefaultImpls.plus(this, coroutineContext);
-  }
+    @Nonnull
+    @Override
+    public CoroutineContext plus(@Nonnull CoroutineContext coroutineContext) {
+        return CoroutineContext.DefaultImpls.plus(this, coroutineContext);
+    }
 
-  @Override
-  public <R> R fold(
-      R initial, @Nonnull Function2<? super R, ? super Element, ? extends R> operation) {
-    return CoroutineContext.Element.DefaultImpls.fold(this, initial, operation);
-  }
+    @Override
+    public <R> R fold(R initial, @Nonnull Function2<? super R, ? super Element, ? extends R> operation) {
+        return CoroutineContext.Element.DefaultImpls.fold(this, initial, operation);
+    }
 
-  @Nullable
-  @Override
-  public <E extends Element> E get(@Nonnull Key<E> key) {
-    return CoroutineContext.Element.DefaultImpls.get(this, key);
-  }
+    @Nullable
+    @Override
+    public <E extends Element> E get(@Nonnull Key<E> key) {
+        return CoroutineContext.Element.DefaultImpls.get(this, key);
+    }
 
-  @Nonnull
-  @Override
-  public CoroutineContext minusKey(@Nonnull Key<?> key) {
-    return CoroutineContext.Element.DefaultImpls.minusKey(this, key);
-  }
+    @Nonnull
+    @Override
+    public CoroutineContext minusKey(@Nonnull Key<?> key) {
+        return CoroutineContext.Element.DefaultImpls.minusKey(this, key);
+    }
 }
diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/KotlinCoroutinesModule.java b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/KotlinCoroutinesModule.java
index 23d202ec40d..6b39b9e97ba 100644
--- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/KotlinCoroutinesModule.java
+++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/KotlinCoroutinesModule.java
@@ -8,15 +8,15 @@
 
 @AutoService(InstrumenterModule.class)
 public class KotlinCoroutinesModule extends InstrumenterModule.ContextTracking {
-  public KotlinCoroutinesModule() {
-    super("kotlin_coroutine");
-  }
+    public KotlinCoroutinesModule() {
+        super("kotlin_coroutine");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new CoroutineContextInstrumentation(),
-        new CoroutineInstrumentation(),
-        new LazyCoroutineInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(
+                new CoroutineContextInstrumentation(),
+                new CoroutineInstrumentation(),
+                new LazyCoroutineInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/LazyCoroutineInstrumentation.java b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/LazyCoroutineInstrumentation.java
index a629a3fdcb4..47312b000da 100644
--- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/LazyCoroutineInstrumentation.java
+++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/LazyCoroutineInstrumentation.java
@@ -12,30 +12,29 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 /** Captures the Datadog context when lazy coroutines start. */
-public class LazyCoroutineInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+public class LazyCoroutineInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "kotlinx.coroutines.AbstractCoroutine";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "kotlinx.coroutines.AbstractCoroutine";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("onStart")).and(takesNoArguments()),
-        LazyCoroutineInstrumentation.class.getName() + "$OnStartAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("onStart")).and(takesNoArguments()),
+                LazyCoroutineInstrumentation.class.getName() + "$OnStartAdvice");
+    }
 
-  public static class OnStartAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onStart(@Advice.This AbstractCoroutine<?> coroutine) {
-      DatadogThreadContextElement.captureDatadogContext(coroutine);
+    public static class OnStartAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onStart(@Advice.This AbstractCoroutine<?> coroutine) {
+            DatadogThreadContextElement.captureDatadogContext(coroutine);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java
index d5ffcc60dc7..9d4be6fb2d0 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java
@@ -27,111 +27,107 @@
 
 public final class InstrumentationPoints {
 
-  private static final Set<CommandType> NON_INSTRUMENTING_COMMANDS = EnumSet.of(SHUTDOWN, DEBUG);
+    private static final Set<CommandType> NON_INSTRUMENTING_COMMANDS = EnumSet.of(SHUTDOWN, DEBUG);
 
-  private static final Set<CommandType> AGENT_CRASHING_COMMANDS =
-      EnumSet.of(CLIENT, CLUSTER, COMMAND, CONFIG, DEBUG, SCRIPT);
+    private static final Set<CommandType> AGENT_CRASHING_COMMANDS =
+            EnumSet.of(CLIENT, CLUSTER, COMMAND, CONFIG, DEBUG, SCRIPT);
 
-  public static final String AGENT_CRASHING_COMMAND_PREFIX = "COMMAND-NAME:";
+    public static final String AGENT_CRASHING_COMMAND_PREFIX = "COMMAND-NAME:";
 
-  public static ContextScope beforeCommand(
-      final RedisCommand<?, ?, ?> command, final RedisURI redisURI) {
-    final AgentSpan span =
-        startSpan(REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME);
-    DECORATE.afterStart(span);
-    DECORATE.onConnection(span, redisURI);
-    DECORATE.onCommand(span, command);
-    return activateSpan(span);
-  }
+    public static ContextScope beforeCommand(final RedisCommand<?, ?, ?> command, final RedisURI redisURI) {
+        final AgentSpan span = startSpan(REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME);
+        DECORATE.afterStart(span);
+        DECORATE.onConnection(span, redisURI);
+        DECORATE.onCommand(span, command);
+        return activateSpan(span);
+    }
 
-  public static void afterCommand(
-      final RedisCommand<?, ?, ?> command,
-      final ContextScope scope,
-      final Throwable throwable,
-      final AsyncCommand<?, ?, ?> asyncCommand) {
-    final AgentSpan span = spanFromScope(scope);
-    if (throwable != null) {
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
-    } else if (expectsResponse(command)) {
-      // Register the callback before closing the scope so the active span is correct when
-      // the CompletableFuture instrumentation captures context for the finishing lambda.
-      asyncCommand.handleAsync(
-          (value, ex) -> {
-            if (ex instanceof CancellationException) {
-              span.setTag("db.command.cancelled", true);
-            } else {
-              DECORATE.onError(span, ex);
-            }
+    public static void afterCommand(
+            final RedisCommand<?, ?, ?> command,
+            final ContextScope scope,
+            final Throwable throwable,
+            final AsyncCommand<?, ?, ?> asyncCommand) {
+        final AgentSpan span = spanFromScope(scope);
+        if (throwable != null) {
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        } else if (expectsResponse(command)) {
+            // Register the callback before closing the scope so the active span is correct when
+            // the CompletableFuture instrumentation captures context for the finishing lambda.
+            asyncCommand.handleAsync((value, ex) -> {
+                if (ex instanceof CancellationException) {
+                    span.setTag("db.command.cancelled", true);
+                } else {
+                    DECORATE.onError(span, ex);
+                }
+                DECORATE.beforeFinish(span);
+                span.finish();
+                return null;
+            });
+            scope.close();
+        } else {
+            // No response is expected, so we must finish the span now.
             DECORATE.beforeFinish(span);
+            scope.close();
             span.finish();
-            return null;
-          });
-      scope.close();
-    } else {
-      // No response is expected, so we must finish the span now.
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+        }
+        // span may be finished by handleAsync call above.
     }
-    // span may be finished by handleAsync call above.
-  }
 
-  public static ContextScope beforeConnect(final RedisURI redisURI) {
-    final AgentSpan span =
-        startSpan(REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME);
-    DECORATE.afterStart(span);
-    DECORATE.onConnection(span, redisURI);
-    span.setResourceName(DECORATE.resourceNameForConnection(redisURI));
-    return activateSpan(span);
-  }
+    public static ContextScope beforeConnect(final RedisURI redisURI) {
+        final AgentSpan span = startSpan(REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME);
+        DECORATE.afterStart(span);
+        DECORATE.onConnection(span, redisURI);
+        span.setResourceName(DECORATE.resourceNameForConnection(redisURI));
+        return activateSpan(span);
+    }
 
-  public static void afterConnect(final ContextScope scope, final Throwable throwable) {
-    final AgentSpan span = spanFromScope(scope);
-    if (throwable != null) {
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
+    public static void afterConnect(final ContextScope scope, final Throwable throwable) {
+        final AgentSpan span = spanFromScope(scope);
+        if (throwable != null) {
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+        }
+        scope.close();
+        span.finish();
     }
-    scope.close();
-    span.finish();
-  }
 
-  /**
-   * Determines whether a redis command should finish its relevant span early (as soon as tags are
-   * added and the command is executed) because these commands have no return values/call backs, so
-   * we must close the span early in order to provide info for the users
-   *
-   * @param command
-   * @return false if the span should finish early (the command will not have a return value)
-   */
-  public static boolean expectsResponse(final RedisCommand<?, ?, ?> command) {
-    final ProtocolKeyword keyword = command.getType();
-    return !(isNonInstrumentingCommand(keyword) || isNonInstrumentingKeyword(keyword));
-  }
+    /**
+     * Determines whether a redis command should finish its relevant span early (as soon as tags are
+     * added and the command is executed) because these commands have no return values/call backs, so
+     * we must close the span early in order to provide info for the users
+     *
+     * @param command
+     * @return false if the span should finish early (the command will not have a return value)
+     */
+    public static boolean expectsResponse(final RedisCommand<?, ?, ?> command) {
+        final ProtocolKeyword keyword = command.getType();
+        return !(isNonInstrumentingCommand(keyword) || isNonInstrumentingKeyword(keyword));
+    }
 
-  private static boolean isNonInstrumentingCommand(final ProtocolKeyword keyword) {
-    return keyword instanceof CommandType && NON_INSTRUMENTING_COMMANDS.contains(keyword);
-  }
+    private static boolean isNonInstrumentingCommand(final ProtocolKeyword keyword) {
+        return keyword instanceof CommandType && NON_INSTRUMENTING_COMMANDS.contains(keyword);
+    }
 
-  private static boolean isNonInstrumentingKeyword(final ProtocolKeyword keyword) {
-    return keyword == SEGFAULT;
-  }
+    private static boolean isNonInstrumentingKeyword(final ProtocolKeyword keyword) {
+        return keyword == SEGFAULT;
+    }
 
-  /**
-   * Workaround to keep trace agent from crashing Currently the commands in AGENT_CRASHING_COMMANDS
-   * will crash the trace agent and traces with these commands as the resource name will not be
-   * processed by the trace agent
-   *
-   * @param keyword the actual redis command
-   * @return the redis command with a prefix if it is a command that will crash the trace agent,
-   *     otherwise, the original command is returned.
-   */
-  public static String getCommandResourceName(final ProtocolKeyword keyword) {
-    if (keyword instanceof CommandType && AGENT_CRASHING_COMMANDS.contains(keyword)) {
-      return AGENT_CRASHING_COMMAND_PREFIX + keyword.name();
+    /**
+     * Workaround to keep trace agent from crashing Currently the commands in AGENT_CRASHING_COMMANDS
+     * will crash the trace agent and traces with these commands as the resource name will not be
+     * processed by the trace agent
+     *
+     * @param keyword the actual redis command
+     * @return the redis command with a prefix if it is a command that will crash the trace agent,
+     *     otherwise, the original command is returned.
+     */
+    public static String getCommandResourceName(final ProtocolKeyword keyword) {
+        if (keyword instanceof CommandType && AGENT_CRASHING_COMMANDS.contains(keyword)) {
+            return AGENT_CRASHING_COMMAND_PREFIX + keyword.name();
+        }
+        return keyword.name();
     }
-    return keyword.name();
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsAdvice.java
index 0f7656fd81b..1cf4914cefc 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsAdvice.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsAdvice.java
@@ -11,22 +11,21 @@
 
 public class LettuceAsyncCommandsAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(
-      @Advice.Argument(0) final RedisCommand<?, ?, ?> command,
-      @Advice.This AbstractRedisAsyncCommands thiz) {
-    return InstrumentationPoints.beforeCommand(
-        command,
-        InstrumentationContext.get(StatefulConnection.class, RedisURI.class)
-            .get(thiz.getConnection()));
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(
+            @Advice.Argument(0) final RedisCommand<?, ?, ?> command, @Advice.This AbstractRedisAsyncCommands thiz) {
+        return InstrumentationPoints.beforeCommand(
+                command,
+                InstrumentationContext.get(StatefulConnection.class, RedisURI.class)
+                        .get(thiz.getConnection()));
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void onExit(
-      @Advice.Argument(0) final RedisCommand<?, ?, ?> command,
-      @Advice.Enter final ContextScope scope,
-      @Advice.Thrown final Throwable throwable,
-      @Advice.Return final AsyncCommand<?, ?, ?> asyncCommand) {
-    InstrumentationPoints.afterCommand(command, scope, throwable, asyncCommand);
-  }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void onExit(
+            @Advice.Argument(0) final RedisCommand<?, ?, ?> command,
+            @Advice.Enter final ContextScope scope,
+            @Advice.Thrown final Throwable throwable,
+            @Advice.Return final AsyncCommand<?, ?, ?> asyncCommand) {
+        InstrumentationPoints.afterCommand(command, scope, throwable, asyncCommand);
+    }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsInstrumentation.java
index 3028ffa0e82..3a78f5019ab 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsInstrumentation.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsInstrumentation.java
@@ -12,30 +12,30 @@
 
 @AutoService(InstrumenterModule.class)
 public class LettuceAsyncCommandsInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public LettuceAsyncCommandsInstrumentation() {
-    super("lettuce", "lettuce-4", "lettuce-4-async");
-  }
+    public LettuceAsyncCommandsInstrumentation() {
+        super("lettuce", "lettuce-4", "lettuce-4-async");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.lambdaworks.redis.AbstractRedisAsyncCommands";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.lambdaworks.redis.AbstractRedisAsyncCommands";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "com.lambdaworks.redis.api.StatefulConnection", "com.lambdaworks.redis.RedisURI");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(
+                "com.lambdaworks.redis.api.StatefulConnection", "com.lambdaworks.redis.RedisURI");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("dispatch"))
-            .and(takesArgument(0, named("com.lambdaworks.redis.protocol.RedisCommand"))),
-        // Cannot reference class directly here because it would lead to class load failure on Java7
-        packageName + ".LettuceAsyncCommandsAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("dispatch"))
+                        .and(takesArgument(0, named("com.lambdaworks.redis.protocol.RedisCommand"))),
+                // Cannot reference class directly here because it would lead to class load failure on Java7
+                packageName + ".LettuceAsyncCommandsAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientDecorator.java b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientDecorator.java
index f05371cdab8..87845838908 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientDecorator.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientDecorator.java
@@ -12,74 +12,68 @@
 
 public class LettuceClientDecorator extends DBTypeProcessingDatabaseClientDecorator<RedisURI> {
 
-  public static final CharSequence REDIS_CLIENT = UTF8BytesString.create("redis-client");
-
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation("redis"));
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cache().service("redis");
-  public static final LettuceClientDecorator DECORATE = new LettuceClientDecorator();
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"lettuce"};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return REDIS_CLIENT;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.REDIS;
-  }
-
-  @Override
-  protected String dbType() {
-    return "redis";
-  }
-
-  @Override
-  protected String dbUser(final RedisURI connection) {
-    return null;
-  }
-
-  @Override
-  protected String dbInstance(final RedisURI connection) {
-    return null;
-  }
-
-  @Override
-  protected String dbHostname(RedisURI redisURI) {
-    return redisURI.getHost();
-  }
-
-  @Override
-  public void onConnection(final AgentSpan span, final RedisURI connection) {
-    if (connection != null) {
-      setPeerPort(span, connection.getPort());
-      span.setTag("db.redis.dbIndex", connection.getDatabase());
+    public static final CharSequence REDIS_CLIENT = UTF8BytesString.create("redis-client");
+
+    public static final CharSequence OPERATION_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation("redis"));
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cache().service("redis");
+    public static final LettuceClientDecorator DECORATE = new LettuceClientDecorator();
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"lettuce"};
+    }
+
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return REDIS_CLIENT;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.REDIS;
+    }
+
+    @Override
+    protected String dbType() {
+        return "redis";
+    }
+
+    @Override
+    protected String dbUser(final RedisURI connection) {
+        return null;
+    }
+
+    @Override
+    protected String dbInstance(final RedisURI connection) {
+        return null;
+    }
+
+    @Override
+    protected String dbHostname(RedisURI redisURI) {
+        return redisURI.getHost();
+    }
+
+    @Override
+    public void onConnection(final AgentSpan span, final RedisURI connection) {
+        if (connection != null) {
+            setPeerPort(span, connection.getPort());
+            span.setTag("db.redis.dbIndex", connection.getDatabase());
+        }
+        super.onConnection(span, connection);
+    }
+
+    public void onCommand(final AgentSpan span, final RedisCommand<?, ?, ?> command) {
+        span.setResourceName(null == command ? "Redis Command" : getCommandResourceName(command.getType()));
+    }
+
+    public String resourceNameForConnection(final RedisURI redisURI) {
+        return "CONNECT:" + redisURI.getHost() + ":" + redisURI.getPort() + "/" + redisURI.getDatabase();
     }
-    super.onConnection(span, connection);
-  }
-
-  public void onCommand(final AgentSpan span, final RedisCommand<?, ?, ?> command) {
-    span.setResourceName(
-        null == command ? "Redis Command" : getCommandResourceName(command.getType()));
-  }
-
-  public String resourceNameForConnection(final RedisURI redisURI) {
-    return "CONNECT:"
-        + redisURI.getHost()
-        + ":"
-        + redisURI.getPort()
-        + "/"
-        + redisURI.getDatabase();
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientInstrumentation.java
index c053eade633..bf228e1cfe1 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientInstrumentation.java
@@ -11,28 +11,28 @@
 
 @AutoService(InstrumenterModule.class)
 public final class LettuceClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public LettuceClientInstrumentation() {
-    super("lettuce", "lettuce-4");
-  }
+    public LettuceClientInstrumentation() {
+        super("lettuce", "lettuce-4");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.lambdaworks.redis.RedisClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.lambdaworks.redis.RedisClient";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "com.lambdaworks.redis.api.StatefulConnection", "com.lambdaworks.redis.RedisURI");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(
+                "com.lambdaworks.redis.api.StatefulConnection", "com.lambdaworks.redis.RedisURI");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("connectStandalone")),
-        // Cannot reference class directly here because it would lead to class load failure on Java7
-        packageName + ".RedisConnectionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("connectStandalone")),
+                // Cannot reference class directly here because it would lead to class load failure on Java7
+                packageName + ".RedisConnectionAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/RedisConnectionAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/RedisConnectionAdvice.java
index 905132a1faa..5211851799c 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/RedisConnectionAdvice.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/RedisConnectionAdvice.java
@@ -9,21 +9,20 @@
 
 public class RedisConnectionAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(@Advice.Argument(1) final RedisURI redisURI) {
-    return InstrumentationPoints.beforeConnect(redisURI);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(@Advice.Argument(1) final RedisURI redisURI) {
+        return InstrumentationPoints.beforeConnect(redisURI);
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void onExit(
-      @Advice.Argument(1) final RedisURI redisURI,
-      @Advice.Enter final ContextScope scope,
-      @Advice.Thrown final Throwable throwable,
-      @Advice.Return final StatefulRedisConnection connection) {
-    if (connection != null) {
-      InstrumentationContext.get(StatefulConnection.class, RedisURI.class)
-          .put(connection, redisURI);
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void onExit(
+            @Advice.Argument(1) final RedisURI redisURI,
+            @Advice.Enter final ContextScope scope,
+            @Advice.Thrown final Throwable throwable,
+            @Advice.Return final StatefulRedisConnection connection) {
+        if (connection != null) {
+            InstrumentationContext.get(StatefulConnection.class, RedisURI.class).put(connection, redisURI);
+        }
+        InstrumentationPoints.afterConnect(scope, throwable);
     }
-    InstrumentationPoints.afterConnect(scope, throwable);
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/jmh/java/datadog/trace/instrumentation/lettuce5/LettuceCommandMatchingBenchmark.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/jmh/java/datadog/trace/instrumentation/lettuce5/LettuceCommandMatchingBenchmark.java
index cb25f25e216..d2ee5c1f2bf 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/jmh/java/datadog/trace/instrumentation/lettuce5/LettuceCommandMatchingBenchmark.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/jmh/java/datadog/trace/instrumentation/lettuce5/LettuceCommandMatchingBenchmark.java
@@ -38,149 +38,147 @@
 @Threads(1)
 public class LettuceCommandMatchingBenchmark {
 
-  /** Byte-for-byte reproduction of the {@code Set<String>}-based check this replaces. */
-  private static final String[] NON_INSTRUMENTING_COMMAND_WORDS =
-      new String[] {"SHUTDOWN", "DEBUG", "OOM", "SEGFAULT"};
-
-  private static final Set<String> NON_INSTRUMENTING_COMMANDS_OLD =
-      new HashSet<>(Arrays.asList(NON_INSTRUMENTING_COMMAND_WORDS));
-
-  private static boolean oldExpectsResponse(final RedisCommand command) {
-    String commandName = "Redis Command";
-    if (command != null && command.getType() != null) {
-      commandName = command.getType().toString().trim();
-    }
-    return !NON_INSTRUMENTING_COMMANDS_OLD.contains(commandName);
-  }
-
-  /** Minimal {@link RedisCommand} stub -- only {@link #getType()} is ever exercised here. */
-  private static final class FakeRedisCommand implements RedisCommand<Object, Object, Object> {
-    private final ProtocolKeyword type;
-
-    FakeRedisCommand(final ProtocolKeyword type) {
-      this.type = type;
-    }
-
-    @Override
-    public ProtocolKeyword getType() {
-      return type;
-    }
-
-    @Override
-    public CommandOutput<Object, Object, Object> getOutput() {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void complete() {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean completeExceptionally(final Throwable throwable) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void cancel() {
-      throw new UnsupportedOperationException();
+    /** Byte-for-byte reproduction of the {@code Set<String>}-based check this replaces. */
+    private static final String[] NON_INSTRUMENTING_COMMAND_WORDS =
+            new String[] {"SHUTDOWN", "DEBUG", "OOM", "SEGFAULT"};
+
+    private static final Set<String> NON_INSTRUMENTING_COMMANDS_OLD =
+            new HashSet<>(Arrays.asList(NON_INSTRUMENTING_COMMAND_WORDS));
+
+    private static boolean oldExpectsResponse(final RedisCommand command) {
+        String commandName = "Redis Command";
+        if (command != null && command.getType() != null) {
+            commandName = command.getType().toString().trim();
+        }
+        return !NON_INSTRUMENTING_COMMANDS_OLD.contains(commandName);
     }
 
-    @Override
-    public CommandArgs<Object, Object> getArgs() {
-      throw new UnsupportedOperationException();
+    /** Minimal {@link RedisCommand} stub -- only {@link #getType()} is ever exercised here. */
+    private static final class FakeRedisCommand implements RedisCommand<Object, Object, Object> {
+        private final ProtocolKeyword type;
+
+        FakeRedisCommand(final ProtocolKeyword type) {
+            this.type = type;
+        }
+
+        @Override
+        public ProtocolKeyword getType() {
+            return type;
+        }
+
+        @Override
+        public CommandOutput<Object, Object, Object> getOutput() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void complete() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean completeExceptionally(final Throwable throwable) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void cancel() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public CommandArgs<Object, Object> getArgs() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void encode(final ByteBuf buf) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean isCancelled() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean isDone() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void setOutput(final CommandOutput<Object, Object, Object> output) {
+            throw new UnsupportedOperationException();
+        }
     }
 
-    @Override
-    public void encode(final ByteBuf buf) {
-      throw new UnsupportedOperationException();
+    // Representative production traffic: ordinary data commands, none of which ever match
+    // NON_INSTRUMENTING_COMMANDS.
+    private static final RedisCommand[] MISS_COMMANDS = Arrays.stream(new CommandType[] {
+                CommandType.GET,
+                CommandType.SET,
+                CommandType.EXISTS,
+                CommandType.EXPIRE,
+                CommandType.HSET,
+                CommandType.LPUSH,
+                CommandType.INCR,
+            })
+            .map(FakeRedisCommand::new)
+            .toArray(RedisCommand[]::new);
+
+    // Rare admin commands that always match NON_INSTRUMENTING_COMMANDS. Not representative of real
+    // traffic volume -- included only to exercise the hit path.
+    private static final RedisCommand[] HIT_COMMANDS = Arrays.stream(
+                    new CommandType[] {CommandType.DEBUG, CommandType.SHUTDOWN})
+            .map(FakeRedisCommand::new)
+            .toArray(RedisCommand[]::new);
+
+    private abstract static class Cursor {
+        int index = 0;
+
+        abstract RedisCommand[] commands();
+
+        RedisCommand next() {
+            final RedisCommand[] commands = commands();
+            final int i = index;
+            index = (i + 1) % commands.length;
+            return commands[i];
+        }
     }
 
-    @Override
-    public boolean isCancelled() {
-      throw new UnsupportedOperationException();
+    @State(Scope.Thread)
+    public static class MissCursor extends Cursor {
+        @Override
+        RedisCommand[] commands() {
+            return MISS_COMMANDS;
+        }
     }
 
-    @Override
-    public boolean isDone() {
-      throw new UnsupportedOperationException();
+    @State(Scope.Thread)
+    public static class HitCursor extends Cursor {
+        @Override
+        RedisCommand[] commands() {
+            return HIT_COMMANDS;
+        }
     }
 
-    @Override
-    public void setOutput(final CommandOutput<Object, Object, Object> output) {
-      throw new UnsupportedOperationException();
+    @Benchmark
+    public boolean missOld(final MissCursor cursor) {
+        return oldExpectsResponse(cursor.next());
     }
-  }
 
-  // Representative production traffic: ordinary data commands, none of which ever match
-  // NON_INSTRUMENTING_COMMANDS.
-  private static final RedisCommand[] MISS_COMMANDS =
-      Arrays.stream(
-              new CommandType[] {
-                CommandType.GET,
-                CommandType.SET,
-                CommandType.EXISTS,
-                CommandType.EXPIRE,
-                CommandType.HSET,
-                CommandType.LPUSH,
-                CommandType.INCR,
-              })
-          .map(FakeRedisCommand::new)
-          .toArray(RedisCommand[]::new);
-
-  // Rare admin commands that always match NON_INSTRUMENTING_COMMANDS. Not representative of real
-  // traffic volume -- included only to exercise the hit path.
-  private static final RedisCommand[] HIT_COMMANDS =
-      Arrays.stream(new CommandType[] {CommandType.DEBUG, CommandType.SHUTDOWN})
-          .map(FakeRedisCommand::new)
-          .toArray(RedisCommand[]::new);
-
-  private abstract static class Cursor {
-    int index = 0;
-
-    abstract RedisCommand[] commands();
-
-    RedisCommand next() {
-      final RedisCommand[] commands = commands();
-      final int i = index;
-      index = (i + 1) % commands.length;
-      return commands[i];
+    @Benchmark
+    public boolean missNew(final MissCursor cursor) {
+        return LettuceInstrumentationUtil.expectsResponse(cursor.next());
     }
-  }
 
-  @State(Scope.Thread)
-  public static class MissCursor extends Cursor {
-    @Override
-    RedisCommand[] commands() {
-      return MISS_COMMANDS;
+    @Benchmark
+    public boolean hitOld(final HitCursor cursor) {
+        return oldExpectsResponse(cursor.next());
     }
-  }
 
-  @State(Scope.Thread)
-  public static class HitCursor extends Cursor {
-    @Override
-    RedisCommand[] commands() {
-      return HIT_COMMANDS;
+    @Benchmark
+    public boolean hitNew(final HitCursor cursor) {
+        return LettuceInstrumentationUtil.expectsResponse(cursor.next());
     }
-  }
-
-  @Benchmark
-  public boolean missOld(final MissCursor cursor) {
-    return oldExpectsResponse(cursor.next());
-  }
-
-  @Benchmark
-  public boolean missNew(final MissCursor cursor) {
-    return LettuceInstrumentationUtil.expectsResponse(cursor.next());
-  }
-
-  @Benchmark
-  public boolean hitOld(final HitCursor cursor) {
-    return oldExpectsResponse(cursor.next());
-  }
-
-  @Benchmark
-  public boolean hitNew(final HitCursor cursor) {
-    return LettuceInstrumentationUtil.expectsResponse(cursor.next());
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/AsyncCommandInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/AsyncCommandInstrumentation.java
index c427ac15a14..e7eeabc0cc8 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/AsyncCommandInstrumentation.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/AsyncCommandInstrumentation.java
@@ -29,66 +29,62 @@
  */
 @AutoService(InstrumenterModule.class)
 public class AsyncCommandInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public AsyncCommandInstrumentation() {
-    super("lettuce", "lettuce-5", "lettuce-5-async");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public AsyncCommandInstrumentation() {
+        super("lettuce", "lettuce-5", "lettuce-5-async");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.lettuce.core.protocol.AsyncCommand";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.lettuce.core.protocol.AsyncCommand";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("io.lettuce.core.protocol.AsyncCommand", State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("io.lettuce.core.protocol.AsyncCommand", State.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(
-                takesArguments(1)
-                    .and(takesArgument(0, named("io.lettuce.core.protocol.RedisCommand")))),
-        getClass().getName() + "$Capture");
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("complete", "completeExceptionally", "onComplete", "encode")),
-        getClass().getName() + "$Activate");
-    transformer.applyAdvice(
-        isMethod().and(named("cancel")).and(takesArguments(boolean.class)),
-        getClass().getName() + "$Cancel");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArguments(1).and(takesArgument(0, named("io.lettuce.core.protocol.RedisCommand")))),
+                getClass().getName() + "$Capture");
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("complete", "completeExceptionally", "onComplete", "encode")),
+                getClass().getName() + "$Activate");
+        transformer.applyAdvice(
+                isMethod().and(named("cancel")).and(takesArguments(boolean.class)),
+                getClass().getName() + "$Cancel");
+    }
 
-  public static final class Capture {
+    public static final class Capture {
 
-    @SuppressWarnings("rawtypes")
-    @Advice.OnMethodExit
-    public static void after(@Advice.This AsyncCommand asyncCommand) {
-      capture(InstrumentationContext.get(AsyncCommand.class, State.class), asyncCommand);
+        @SuppressWarnings("rawtypes")
+        @Advice.OnMethodExit
+        public static void after(@Advice.This AsyncCommand asyncCommand) {
+            capture(InstrumentationContext.get(AsyncCommand.class, State.class), asyncCommand);
+        }
     }
-  }
 
-  public static final class Activate {
-    @SuppressWarnings("rawtypes")
-    @Advice.OnMethodEnter
-    public static ContextScope before(@Advice.This AsyncCommand asyncCommand) {
-      return startTaskScope(
-          InstrumentationContext.get(AsyncCommand.class, State.class), asyncCommand);
-    }
+    public static final class Activate {
+        @SuppressWarnings("rawtypes")
+        @Advice.OnMethodEnter
+        public static ContextScope before(@Advice.This AsyncCommand asyncCommand) {
+            return startTaskScope(InstrumentationContext.get(AsyncCommand.class, State.class), asyncCommand);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      endTaskScope(scope);
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 
-  public static final class Cancel {
-    @SuppressWarnings("rawtypes")
-    @Advice.OnMethodEnter
-    public static void before(@Advice.This AsyncCommand asyncCommand) {
-      AdviceUtils.cancelTask(
-          InstrumentationContext.get(AsyncCommand.class, State.class), asyncCommand);
+    public static final class Cancel {
+        @SuppressWarnings("rawtypes")
+        @Advice.OnMethodEnter
+        public static void before(@Advice.This AsyncCommand asyncCommand) {
+            AdviceUtils.cancelTask(InstrumentationContext.get(AsyncCommand.class, State.class), asyncCommand);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ClusterConnectionContextFunction.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ClusterConnectionContextFunction.java
index cc6b1fb25e5..eddb718fe40 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ClusterConnectionContextFunction.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ClusterConnectionContextFunction.java
@@ -8,46 +8,45 @@
 import java.net.SocketAddress;
 import java.util.function.Function;
 
-public class ClusterConnectionContextFunction<T extends StatefulConnection>
-    implements Function<T, T> {
-
-  private final ConnectionFuture<? extends StatefulConnection> connectionFuture;
-  private final ContextStore<StatefulConnection, RedisURI> contextStore;
-
-  public ClusterConnectionContextFunction(
-      final ConnectionFuture<? extends StatefulConnection> connectionFuture,
-      final ContextStore<StatefulConnection, RedisURI> contextStore) {
-    this.connectionFuture = connectionFuture;
-    this.contextStore = contextStore;
-  }
-
-  @Override
-  public T apply(final T connection) {
-    if (connection == null) {
-      return null;
-    }
+public class ClusterConnectionContextFunction<T extends StatefulConnection> implements Function<T, T> {
 
-    try {
-      final RedisURI connectionURI = redisUriFromConnectionFuture();
-      if (connectionURI != null) {
-        contextStore.put(connection, connectionURI);
-      }
-    } catch (final Throwable ignored) {
-    }
-    return connection;
-  }
+    private final ConnectionFuture<? extends StatefulConnection> connectionFuture;
+    private final ContextStore<StatefulConnection, RedisURI> contextStore;
 
-  private RedisURI redisUriFromConnectionFuture() {
-    if (connectionFuture == null) {
-      return null;
+    public ClusterConnectionContextFunction(
+            final ConnectionFuture<? extends StatefulConnection> connectionFuture,
+            final ContextStore<StatefulConnection, RedisURI> contextStore) {
+        this.connectionFuture = connectionFuture;
+        this.contextStore = contextStore;
     }
 
-    final SocketAddress socketAddress = connectionFuture.getRemoteAddress();
-    if (socketAddress instanceof InetSocketAddress) {
-      final InetSocketAddress inetSocketAddress = (InetSocketAddress) socketAddress;
-      return RedisURI.create(inetSocketAddress.getHostString(), inetSocketAddress.getPort());
+    @Override
+    public T apply(final T connection) {
+        if (connection == null) {
+            return null;
+        }
+
+        try {
+            final RedisURI connectionURI = redisUriFromConnectionFuture();
+            if (connectionURI != null) {
+                contextStore.put(connection, connectionURI);
+            }
+        } catch (final Throwable ignored) {
+        }
+        return connection;
     }
 
-    return null;
-  }
+    private RedisURI redisUriFromConnectionFuture() {
+        if (connectionFuture == null) {
+            return null;
+        }
+
+        final SocketAddress socketAddress = connectionFuture.getRemoteAddress();
+        if (socketAddress instanceof InetSocketAddress) {
+            final InetSocketAddress inetSocketAddress = (InetSocketAddress) socketAddress;
+            return RedisURI.create(inetSocketAddress.getHostString(), inetSocketAddress.getPort());
+        }
+
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/CommandHandlerInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/CommandHandlerInstrumentation.java
index 177c6d8f595..32434b0bfb1 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/CommandHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/CommandHandlerInstrumentation.java
@@ -24,48 +24,48 @@
  */
 @AutoService(InstrumenterModule.class)
 public class CommandHandlerInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public CommandHandlerInstrumentation() {
-    super("lettuce", "lettuce-5", "lettuce-5-async");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "io.lettuce.core.protocol.CommandHandler";
-  }
+    public CommandHandlerInstrumentation() {
+        super("lettuce", "lettuce-5", "lettuce-5-async");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("io.lettuce.core.protocol.AsyncCommand", State.class.getName());
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.lettuce.core.protocol.CommandHandler";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("decode"))
-            .and(takesArgument(0, named("io.netty.channel.ChannelHandlerContext")))
-            .and(takesArgument(1, named("io.netty.buffer.ByteBuf")))
-            .and(takesArgument(2, named("io.lettuce.core.protocol.RedisCommand"))),
-        getClass().getName() + "$Decode");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("io.lettuce.core.protocol.AsyncCommand", State.class.getName());
+    }
 
-  public static class Decode {
-    @SuppressWarnings("rawtypes")
-    @Advice.OnMethodEnter
-    public static ContextScope before(@Advice.Argument(2) RedisCommand command) {
-      // if it's something we're tracing, it will always be an AsyncCommand
-      if (command instanceof AsyncCommand) {
-        return startTaskScope(
-            InstrumentationContext.get(AsyncCommand.class, State.class), (AsyncCommand) command);
-      }
-      return null;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("decode"))
+                        .and(takesArgument(0, named("io.netty.channel.ChannelHandlerContext")))
+                        .and(takesArgument(1, named("io.netty.buffer.ByteBuf")))
+                        .and(takesArgument(2, named("io.lettuce.core.protocol.RedisCommand"))),
+                getClass().getName() + "$Decode");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      endTaskScope(scope);
+    public static class Decode {
+        @SuppressWarnings("rawtypes")
+        @Advice.OnMethodEnter
+        public static ContextScope before(@Advice.Argument(2) RedisCommand command) {
+            // if it's something we're tracing, it will always be an AsyncCommand
+            if (command instanceof AsyncCommand) {
+                return startTaskScope(
+                        InstrumentationContext.get(AsyncCommand.class, State.class), (AsyncCommand) command);
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionContextBiConsumer.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionContextBiConsumer.java
index aebb3aabe84..6f9e5472b29 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionContextBiConsumer.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionContextBiConsumer.java
@@ -7,19 +7,18 @@
 
 public class ConnectionContextBiConsumer implements BiConsumer<StatefulConnection, Throwable> {
 
-  private final RedisURI redisURI;
-  private final ContextStore<StatefulConnection, RedisURI> contextStore;
+    private final RedisURI redisURI;
+    private final ContextStore<StatefulConnection, RedisURI> contextStore;
 
-  public ConnectionContextBiConsumer(
-      RedisURI redisURI, ContextStore<StatefulConnection, RedisURI> contextStore) {
-    this.redisURI = redisURI;
-    this.contextStore = contextStore;
-  }
+    public ConnectionContextBiConsumer(RedisURI redisURI, ContextStore<StatefulConnection, RedisURI> contextStore) {
+        this.redisURI = redisURI;
+        this.contextStore = contextStore;
+    }
 
-  @Override
-  public void accept(StatefulConnection statefulConnection, Throwable throwable) {
-    if (statefulConnection != null) {
-      contextStore.put(statefulConnection, redisURI);
+    @Override
+    public void accept(StatefulConnection statefulConnection, Throwable throwable) {
+        if (statefulConnection != null) {
+            contextStore.put(statefulConnection, redisURI);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java
index 7c468f73b92..3d59050e364 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java
@@ -14,38 +14,34 @@
 import net.bytebuddy.asm.Advice;
 
 public class ConnectionFutureAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(@Advice.Argument(1) final RedisURI redisUri) {
-    final AgentSpan span =
-        startSpan(
-            LettuceClientDecorator.REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME);
-    DECORATE.afterStart(span);
-    span.setResourceName(DECORATE.resourceNameForConnection(redisUri));
-    DECORATE.onConnection(span, redisUri);
-    return activateSpan(span);
-  }
-
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void stopSpan(
-      @Advice.Enter final ContextScope scope,
-      @Advice.Thrown final Throwable throwable,
-      @Advice.Argument(1) final RedisURI redisUri,
-      @Advice.Return(readOnly = false)
-          ConnectionFuture<? extends StatefulConnection> connectionFuture) {
-    final AgentSpan span = spanFromScope(scope);
-    if (throwable != null) {
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
-      return;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(@Advice.Argument(1) final RedisURI redisUri) {
+        final AgentSpan span =
+                startSpan(LettuceClientDecorator.REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME);
+        DECORATE.afterStart(span);
+        span.setResourceName(DECORATE.resourceNameForConnection(redisUri));
+        DECORATE.onConnection(span, redisUri);
+        return activateSpan(span);
     }
-    connectionFuture =
-        connectionFuture.whenComplete(
-            new ConnectionContextBiConsumer(
-                    redisUri, InstrumentationContext.get(StatefulConnection.class, RedisURI.class))
+
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void stopSpan(
+            @Advice.Enter final ContextScope scope,
+            @Advice.Thrown final Throwable throwable,
+            @Advice.Argument(1) final RedisURI redisUri,
+            @Advice.Return(readOnly = false) ConnectionFuture<? extends StatefulConnection> connectionFuture) {
+        final AgentSpan span = spanFromScope(scope);
+        if (throwable != null) {
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+            return;
+        }
+        connectionFuture = connectionFuture.whenComplete(new ConnectionContextBiConsumer(
+                        redisUri, InstrumentationContext.get(StatefulConnection.class, RedisURI.class))
                 .andThen(new LettuceAsyncBiConsumer<>(span)));
-    scope.close();
-    // span finished by LettuceAsyncBiConsumer
-  }
+        scope.close();
+        // span finished by LettuceAsyncBiConsumer
+    }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncBiConsumer.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncBiConsumer.java
index c4c03cf12b3..843c6ad2cbf 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncBiConsumer.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncBiConsumer.java
@@ -15,23 +15,22 @@
  * @param <R> the return type, should be null since nothing else should happen from tracing
  *     standpoint after the span is closed
  */
-public class LettuceAsyncBiConsumer<T extends Object, U extends Throwable>
-    implements BiConsumer<T, Throwable> {
+public class LettuceAsyncBiConsumer<T extends Object, U extends Throwable> implements BiConsumer<T, Throwable> {
 
-  private final AgentSpan span;
+    private final AgentSpan span;
 
-  public LettuceAsyncBiConsumer(final AgentSpan span) {
-    this.span = span;
-  }
+    public LettuceAsyncBiConsumer(final AgentSpan span) {
+        this.span = span;
+    }
 
-  @Override
-  public void accept(final T t, final Throwable throwable) {
-    if (throwable instanceof CancellationException) {
-      span.setTag("db.command.cancelled", true);
-    } else {
-      DECORATE.onError(span, throwable);
+    @Override
+    public void accept(final T t, final Throwable throwable) {
+        if (throwable instanceof CancellationException) {
+            span.setTag("db.command.cancelled", true);
+        } else {
+            DECORATE.onError(span, throwable);
+        }
+        DECORATE.beforeFinish(span);
+        span.finish();
     }
-    DECORATE.beforeFinish(span);
-    span.finish();
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java
index 2018dcd1a9c..abf91e0a868 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java
@@ -18,48 +18,46 @@
 
 public class LettuceAsyncCommandsAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(
-      @Advice.Argument(0) final RedisCommand command,
-      @Advice.This final AbstractRedisAsyncCommands thiz) {
-
-    final AgentSpan span =
-        startSpan(
-            LettuceClientDecorator.REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME);
-    DECORATE.afterStart(span);
-    DECORATE.onConnection(
-        span,
-        InstrumentationContext.get(StatefulConnection.class, RedisURI.class)
-            .get(thiz.getConnection()));
-    DECORATE.onCommand(span, command);
-
-    return activateSpan(span);
-  }
-
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void stopSpan(
-      @Advice.Argument(0) final RedisCommand command,
-      @Advice.Enter final ContextScope scope,
-      @Advice.Thrown final Throwable throwable,
-      @Advice.Return AsyncCommand<?, ?, ?> asyncCommand) {
-
-    final AgentSpan span = spanFromScope(scope);
-    if (throwable != null) {
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
-      return;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(
+            @Advice.Argument(0) final RedisCommand command, @Advice.This final AbstractRedisAsyncCommands thiz) {
+
+        final AgentSpan span =
+                startSpan(LettuceClientDecorator.REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME);
+        DECORATE.afterStart(span);
+        DECORATE.onConnection(
+                span,
+                InstrumentationContext.get(StatefulConnection.class, RedisURI.class)
+                        .get(thiz.getConnection()));
+        DECORATE.onCommand(span, command);
+
+        return activateSpan(span);
     }
 
-    // close spans on error or normal completion
-    if (expectsResponse(command)) {
-      asyncCommand.whenComplete(new LettuceAsyncBiConsumer<>(span));
-    } else {
-      DECORATE.beforeFinish(span);
-      span.finish();
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void stopSpan(
+            @Advice.Argument(0) final RedisCommand command,
+            @Advice.Enter final ContextScope scope,
+            @Advice.Thrown final Throwable throwable,
+            @Advice.Return AsyncCommand<?, ?, ?> asyncCommand) {
+
+        final AgentSpan span = spanFromScope(scope);
+        if (throwable != null) {
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+            return;
+        }
+
+        // close spans on error or normal completion
+        if (expectsResponse(command)) {
+            asyncCommand.whenComplete(new LettuceAsyncBiConsumer<>(span));
+        } else {
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
+        scope.close();
+        // span may be finished by LettuceAsyncBiConsumer
     }
-    scope.close();
-    // span may be finished by LettuceAsyncBiConsumer
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsInstrumentation.java
index 7c64531792f..f63f8eb4644 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsInstrumentation.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsInstrumentation.java
@@ -12,30 +12,27 @@
 
 @AutoService(InstrumenterModule.class)
 public class LettuceAsyncCommandsInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public LettuceAsyncCommandsInstrumentation() {
-    super("lettuce", "lettuce-5", "lettuce-5-async");
-  }
+    public LettuceAsyncCommandsInstrumentation() {
+        super("lettuce", "lettuce-5", "lettuce-5-async");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.lettuce.core.AbstractRedisAsyncCommands";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.lettuce.core.AbstractRedisAsyncCommands";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("dispatch"))
-            .and(takesArgument(0, named("io.lettuce.core.protocol.RedisCommand"))),
-        // Cannot reference class directly here because it would lead to class load failure on Java7
-        packageName + ".LettuceAsyncCommandsAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("dispatch")).and(takesArgument(0, named("io.lettuce.core.protocol.RedisCommand"))),
+                // Cannot reference class directly here because it would lead to class load failure on Java7
+                packageName + ".LettuceAsyncCommandsAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientDecorator.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientDecorator.java
index 2107b74faa5..1422b567878 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientDecorator.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientDecorator.java
@@ -9,73 +9,68 @@
 import io.lettuce.core.protocol.RedisCommand;
 
 public class LettuceClientDecorator extends DBTypeProcessingDatabaseClientDecorator<RedisURI> {
-  public static final CharSequence REDIS_CLIENT = UTF8BytesString.create("redis-client");
-  public static final LettuceClientDecorator DECORATE = new LettuceClientDecorator();
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation("redis"));
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cache().service("redis");
+    public static final CharSequence REDIS_CLIENT = UTF8BytesString.create("redis-client");
+    public static final LettuceClientDecorator DECORATE = new LettuceClientDecorator();
+    public static final CharSequence OPERATION_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation("redis"));
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cache().service("redis");
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"lettuce"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"lettuce"};
+    }
 
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return REDIS_CLIENT;
-  }
+    @Override
+    protected CharSequence component() {
+        return REDIS_CLIENT;
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.REDIS;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.REDIS;
+    }
 
-  @Override
-  protected String dbType() {
-    return "redis";
-  }
+    @Override
+    protected String dbType() {
+        return "redis";
+    }
 
-  @Override
-  protected String dbUser(final RedisURI connection) {
-    return null;
-  }
+    @Override
+    protected String dbUser(final RedisURI connection) {
+        return null;
+    }
 
-  @Override
-  protected String dbInstance(final RedisURI connection) {
-    return null;
-  }
+    @Override
+    protected String dbInstance(final RedisURI connection) {
+        return null;
+    }
 
-  @Override
-  protected String dbHostname(RedisURI redisURI) {
-    return redisURI.getHost();
-  }
+    @Override
+    protected String dbHostname(RedisURI redisURI) {
+        return redisURI.getHost();
+    }
 
-  @Override
-  public void onConnection(final AgentSpan span, final RedisURI connection) {
-    if (connection != null) {
-      setPeerPort(span, connection.getPort());
+    @Override
+    public void onConnection(final AgentSpan span, final RedisURI connection) {
+        if (connection != null) {
+            setPeerPort(span, connection.getPort());
 
-      span.setTag("db.redis.dbIndex", connection.getDatabase());
+            span.setTag("db.redis.dbIndex", connection.getDatabase());
+        }
+        super.onConnection(span, connection);
     }
-    super.onConnection(span, connection);
-  }
 
-  public void onCommand(final AgentSpan span, final RedisCommand command) {
-    span.setResourceName(LettuceInstrumentationUtil.getCommandResourceName(command));
-  }
+    public void onCommand(final AgentSpan span, final RedisCommand command) {
+        span.setResourceName(LettuceInstrumentationUtil.getCommandResourceName(command));
+    }
 
-  public String resourceNameForConnection(final RedisURI redisURI) {
-    return "CONNECT:"
-        + redisURI.getHost()
-        + ":"
-        + redisURI.getPort()
-        + "/"
-        + redisURI.getDatabase();
-  }
+    public String resourceNameForConnection(final RedisURI redisURI) {
+        return "CONNECT:" + redisURI.getHost() + ":" + redisURI.getPort() + "/" + redisURI.getDatabase();
+    }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientInstrumentation.java
index 6da8529dc2c..3c7a88b4b39 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientInstrumentation.java
@@ -16,33 +16,32 @@
 
 @AutoService(InstrumenterModule.class)
 public final class LettuceClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public LettuceClientInstrumentation() {
-    super("lettuce", "lettuce-5");
-  }
+    public LettuceClientInstrumentation() {
+        super("lettuce", "lettuce-5");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.lettuce.core.RedisClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.lettuce.core.RedisClient";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPrivate())
-            .and(returns(named("io.lettuce.core.ConnectionFuture")))
-            .and(nameStartsWith("connect"))
-            .and(nameEndsWith("Async"))
-            .and(takesArgument(1, named("io.lettuce.core.RedisURI"))),
-        // Cannot reference class directly here because it would lead to class load failure on Java7
-        packageName + ".ConnectionFutureAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPrivate())
+                        .and(returns(named("io.lettuce.core.ConnectionFuture")))
+                        .and(nameStartsWith("connect"))
+                        .and(nameEndsWith("Async"))
+                        .and(takesArgument(1, named("io.lettuce.core.RedisURI"))),
+                // Cannot reference class directly here because it would lead to class load failure on Java7
+                packageName + ".ConnectionFutureAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceInstrumentationUtil.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceInstrumentationUtil.java
index 92d89d97ecc..2f9c713179f 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceInstrumentationUtil.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceInstrumentationUtil.java
@@ -9,98 +9,94 @@
 
 public class LettuceInstrumentationUtil {
 
-  // DEBUG covers `DEBUG OOM`/`DEBUG SEGFAULT`: Lettuce sends those as command type DEBUG with
-  // "OOM"/SEGFAULT as an argument, not as the command type.
-  public static final Set<CommandType> NON_INSTRUMENTING_COMMANDS =
-      EnumSet.of(CommandType.SHUTDOWN, CommandType.DEBUG);
+    // DEBUG covers `DEBUG OOM`/`DEBUG SEGFAULT`: Lettuce sends those as command type DEBUG with
+    // "OOM"/SEGFAULT as an argument, not as the command type.
+    public static final Set<CommandType> NON_INSTRUMENTING_COMMANDS =
+            EnumSet.of(CommandType.SHUTDOWN, CommandType.DEBUG);
 
-  public static final Set<CommandType> AGENT_CRASHING_COMMANDS =
-      EnumSet.of(
-          CommandType.CLIENT,
-          CommandType.CLUSTER,
-          CommandType.COMMAND,
-          CommandType.CONFIG,
-          CommandType.DEBUG,
-          CommandType.SCRIPT);
+    public static final Set<CommandType> AGENT_CRASHING_COMMANDS = EnumSet.of(
+            CommandType.CLIENT,
+            CommandType.CLUSTER,
+            CommandType.COMMAND,
+            CommandType.CONFIG,
+            CommandType.DEBUG,
+            CommandType.SCRIPT);
 
-  public static final String AGENT_CRASHING_COMMAND_PREFIX = "COMMAND-NAME:";
+    public static final String AGENT_CRASHING_COMMAND_PREFIX = "COMMAND-NAME:";
 
-  // Fallback for custom (non-CommandType) ProtocolKeyword implementations.
-  private static final Set<String> NON_INSTRUMENTING_COMMAND_NAMES =
-      commandNames(NON_INSTRUMENTING_COMMANDS);
+    // Fallback for custom (non-CommandType) ProtocolKeyword implementations.
+    private static final Set<String> NON_INSTRUMENTING_COMMAND_NAMES = commandNames(NON_INSTRUMENTING_COMMANDS);
 
-  private static final Set<String> AGENT_CRASHING_COMMAND_NAMES =
-      commandNames(AGENT_CRASHING_COMMANDS);
+    private static final Set<String> AGENT_CRASHING_COMMAND_NAMES = commandNames(AGENT_CRASHING_COMMANDS);
 
-  private static Set<String> commandNames(final Set<CommandType> commands) {
-    final Set<String> names = new HashSet<>();
-    for (final CommandType command : commands) {
-      names.add(command.toString());
+    private static Set<String> commandNames(final Set<CommandType> commands) {
+        final Set<String> names = new HashSet<>();
+        for (final CommandType command : commands) {
+            names.add(command.toString());
+        }
+        return names;
     }
-    return names;
-  }
 
-  /**
-   * Determines whether a redis command should finish its relevant span early (as soon as tags are
-   * added and the command is executed) because these commands have no return values/call backs, so
-   * we must close the span early in order to provide info for the users
-   *
-   * @param command
-   * @return false if the span should finish early (the command will not have a return value)
-   */
-  public static boolean expectsResponse(final RedisCommand command) {
-    if (command == null) {
-      return true;
+    /**
+     * Determines whether a redis command should finish its relevant span early (as soon as tags are
+     * added and the command is executed) because these commands have no return values/call backs, so
+     * we must close the span early in order to provide info for the users
+     *
+     * @param command
+     * @return false if the span should finish early (the command will not have a return value)
+     */
+    public static boolean expectsResponse(final RedisCommand command) {
+        if (command == null) {
+            return true;
+        }
+        final ProtocolKeyword type = command.getType();
+        if (type == null) {
+            return true;
+        }
+        if (type instanceof CommandType) {
+            return !NON_INSTRUMENTING_COMMANDS.contains(type);
+        }
+        return !NON_INSTRUMENTING_COMMAND_NAMES.contains(type.toString().trim());
     }
-    final ProtocolKeyword type = command.getType();
-    if (type == null) {
-      return true;
-    }
-    if (type instanceof CommandType) {
-      return !NON_INSTRUMENTING_COMMANDS.contains(type);
-    }
-    return !NON_INSTRUMENTING_COMMAND_NAMES.contains(type.toString().trim());
-  }
 
-  /**
-   * Workaround to keep trace agent from crashing Currently the commands in AGENT_CRASHING_COMMANDS
-   * will crash the trace agent and traces with these commands as the resource name will not be
-   * processed by the trace agent
-   * https://github.com/DataDog/datadog-trace-agent/blob/master/quantizer/redis.go#L18 has list of
-   * commands that will currently fail at the trace agent level.
-   *
-   * @param command the lettuce RedisCommand object
-   * @return the redis command with a prefix if it is a command that will crash the trace agent,
-   *     otherwise, the original command is returned.
-   */
-  public static String getCommandResourceName(final RedisCommand command) {
-    final String commandName = getCommandName(command);
-    final ProtocolKeyword type = command == null ? null : command.getType();
-    final boolean crashesAgent =
-        type instanceof CommandType
-            ? AGENT_CRASHING_COMMANDS.contains(type)
-            : type != null && AGENT_CRASHING_COMMAND_NAMES.contains(commandName);
-    if (crashesAgent) {
-      return AGENT_CRASHING_COMMAND_PREFIX + commandName;
+    /**
+     * Workaround to keep trace agent from crashing Currently the commands in AGENT_CRASHING_COMMANDS
+     * will crash the trace agent and traces with these commands as the resource name will not be
+     * processed by the trace agent
+     * https://github.com/DataDog/datadog-trace-agent/blob/master/quantizer/redis.go#L18 has list of
+     * commands that will currently fail at the trace agent level.
+     *
+     * @param command the lettuce RedisCommand object
+     * @return the redis command with a prefix if it is a command that will crash the trace agent,
+     *     otherwise, the original command is returned.
+     */
+    public static String getCommandResourceName(final RedisCommand command) {
+        final String commandName = getCommandName(command);
+        final ProtocolKeyword type = command == null ? null : command.getType();
+        final boolean crashesAgent = type instanceof CommandType
+                ? AGENT_CRASHING_COMMANDS.contains(type)
+                : type != null && AGENT_CRASHING_COMMAND_NAMES.contains(commandName);
+        if (crashesAgent) {
+            return AGENT_CRASHING_COMMAND_PREFIX + commandName;
+        }
+        return commandName;
     }
-    return commandName;
-  }
 
-  /**
-   * Retrieves the actual redis command name from a RedisCommand object
-   *
-   * @param command the lettuce RedisCommand object
-   * @return the redis command as a string
-   */
-  public static String getCommandName(final RedisCommand command) {
-    String commandName = "Redis Command";
-    if (command != null) {
+    /**
+     * Retrieves the actual redis command name from a RedisCommand object
+     *
+     * @param command the lettuce RedisCommand object
+     * @return the redis command as a string
+     */
+    public static String getCommandName(final RedisCommand command) {
+        String commandName = "Redis Command";
+        if (command != null) {
 
-      // get the redis command name (i.e. GET, SET, HMSET, etc)
-      if (command.getType() != null) {
-        commandName = command.getType().toString().trim();
-      }
+            // get the redis command name (i.e. GET, SET, HMSET, etc)
+            if (command.getType() != null) {
+                commandName = command.getType().toString().trim();
+            }
+        }
+        return commandName;
     }
-    return commandName;
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java
index a86c7e69e36..ce741e61ff1 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java
@@ -46,76 +46,72 @@
  */
 @AutoService(InstrumenterModule.class)
 public class LettuceReactiveClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public LettuceReactiveClientInstrumentation() {
-    super("lettuce", "lettuce-5", "lettuce-5-rx");
-  }
+    public LettuceReactiveClientInstrumentation() {
+        super("lettuce", "lettuce-5", "lettuce-5-rx");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.lettuce.core.RedisPublisher$RedisSubscription",
-      "io.lettuce.core.RedisPublisher$SubscriptionCommand",
-      "io.lettuce.core.AbstractRedisReactiveCommands"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.lettuce.core.RedisPublisher$RedisSubscription",
+            "io.lettuce.core.RedisPublisher$SubscriptionCommand",
+            "io.lettuce.core.AbstractRedisReactiveCommands"
+        };
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".rx.RedisSubscriptionSubscribeAdvice",
-      packageName + ".rx.RedisSubscriptionSubscribeAdvice$State",
-      packageName + ".rx.RedisSubscriptionState",
-      packageName + ".LettuceInstrumentationUtil",
-      packageName + ".LettuceClientDecorator"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".rx.RedisSubscriptionSubscribeAdvice",
+            packageName + ".rx.RedisSubscriptionSubscribeAdvice$State",
+            packageName + ".rx.RedisSubscriptionState",
+            packageName + ".LettuceInstrumentationUtil",
+            packageName + ".LettuceClientDecorator"
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> store = new HashMap<>(3);
-    store.put(
-        "io.lettuce.core.RedisPublisher$RedisSubscription",
-        packageName + ".rx.RedisSubscriptionState");
-    store.put("io.lettuce.core.protocol.RedisCommand", AgentSpan.class.getName());
-    store.put("io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI");
-    return store;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> store = new HashMap<>(3);
+        store.put("io.lettuce.core.RedisPublisher$RedisSubscription", packageName + ".rx.RedisSubscriptionState");
+        store.put("io.lettuce.core.protocol.RedisCommand", AgentSpan.class.getName());
+        store.put("io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI");
+        return store;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("subscribe")), packageName + ".rx.RedisSubscriptionSubscribeAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isDeclaredBy(named("io.lettuce.core.RedisPublisher$RedisSubscription")))
-            .and(named("dispatchCommand")),
-        packageName + ".rx.RedisSubscriptionDispatchAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("onNext")), packageName + ".rx.RedisSubscriptionAdvanceAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isDeclaredBy(named("io.lettuce.core.RedisPublisher$SubscriptionCommand")))
-            .and(namedOneOf("complete", "cancel")),
-        packageName + ".rx.RedisSubscriptionCommandCompleteAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("subscribe")), packageName + ".rx.RedisSubscriptionSubscribeAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isDeclaredBy(named("io.lettuce.core.RedisPublisher$RedisSubscription")))
+                        .and(named("dispatchCommand")),
+                packageName + ".rx.RedisSubscriptionDispatchAdvice");
+        transformer.applyAdvice(isMethod().and(named("onNext")), packageName + ".rx.RedisSubscriptionAdvanceAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isDeclaredBy(named("io.lettuce.core.RedisPublisher$SubscriptionCommand")))
+                        .and(namedOneOf("complete", "cancel")),
+                packageName + ".rx.RedisSubscriptionCommandCompleteAdvice");
 
-    transformer.applyAdvice(
-        isConstructor()
-            .and(isDeclaredBy(named("io.lettuce.core.RedisPublisher$RedisSubscription"))),
-        packageName + ".rx.RedisSubscriptionConnectionContextAdvice");
+        transformer.applyAdvice(
+                isConstructor().and(isDeclaredBy(named("io.lettuce.core.RedisPublisher$RedisSubscription"))),
+                packageName + ".rx.RedisSubscriptionConnectionContextAdvice");
 
-    // SubscriptionCommand structure has changed due to
-    // https://github.com/lettuce-io/lettuce-core/issues/1576 in 5.3.6
-    transformer.applyAdvice(
-        isMethod()
-            .and(isDeclaredBy(named("io.lettuce.core.RedisPublisher$SubscriptionCommand")))
-            .and(namedOneOf("doOnComplete")),
-        packageName + ".rx.RedisSubscriptionCommandOnCompleteAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isDeclaredBy(named("io.lettuce.core.RedisPublisher$SubscriptionCommand")))
-            .and(named("onError")),
-        packageName + ".rx.RedisSubscriptionCommandErrorAdvice");
-  }
+        // SubscriptionCommand structure has changed due to
+        // https://github.com/lettuce-io/lettuce-core/issues/1576 in 5.3.6
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isDeclaredBy(named("io.lettuce.core.RedisPublisher$SubscriptionCommand")))
+                        .and(namedOneOf("doOnComplete")),
+                packageName + ".rx.RedisSubscriptionCommandOnCompleteAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isDeclaredBy(named("io.lettuce.core.RedisPublisher$SubscriptionCommand")))
+                        .and(named("onError")),
+                packageName + ".rx.RedisSubscriptionCommandErrorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionHelper.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionHelper.java
index 3a33fedddc7..e84d0546d28 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionHelper.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionHelper.java
@@ -11,42 +11,41 @@
 
 public final class MasterReplicaConnectionHelper {
 
-  private MasterReplicaConnectionHelper() {}
-
-  public static boolean isRedisClientSpan(final AgentSpan span) {
-    return span != null && LettuceClientDecorator.REDIS_CLIENT.equals(span.getTag(Tags.COMPONENT));
-  }
-
-  public static void onConnection(
-      final AgentSpan span,
-      final StatefulConnection connection,
-      final ContextStore<StatefulConnection, RedisURI> contextStore) {
-    if (connection == null) {
-      return;
-    }
+    private MasterReplicaConnectionHelper() {}
 
-    final RedisURI redisURI = contextStore.get(connection);
-    if (redisURI != null) {
-      DECORATE.onConnection(span, redisURI);
+    public static boolean isRedisClientSpan(final AgentSpan span) {
+        return span != null && LettuceClientDecorator.REDIS_CLIENT.equals(span.getTag(Tags.COMPONENT));
     }
-  }
-
-  public static <T extends StatefulConnection> CompletableFuture<T> onConnectionFuture(
-      final AgentSpan span,
-      final CompletableFuture<T> connectionFuture,
-      final ContextStore<StatefulConnection, RedisURI> contextStore) {
-    if (connectionFuture.isDone()) {
-      if (!connectionFuture.isCompletedExceptionally() && !connectionFuture.isCancelled()) {
-        onConnection(span, connectionFuture.getNow(null), contextStore);
-      }
-      return connectionFuture;
+
+    public static void onConnection(
+            final AgentSpan span,
+            final StatefulConnection connection,
+            final ContextStore<StatefulConnection, RedisURI> contextStore) {
+        if (connection == null) {
+            return;
+        }
+
+        final RedisURI redisURI = contextStore.get(connection);
+        if (redisURI != null) {
+            DECORATE.onConnection(span, redisURI);
+        }
     }
 
-    return connectionFuture.whenComplete(
-        (connection, throwable) -> {
-          if (throwable == null) {
-            onConnection(span, connection, contextStore);
-          }
+    public static <T extends StatefulConnection> CompletableFuture<T> onConnectionFuture(
+            final AgentSpan span,
+            final CompletableFuture<T> connectionFuture,
+            final ContextStore<StatefulConnection, RedisURI> contextStore) {
+        if (connectionFuture.isDone()) {
+            if (!connectionFuture.isCompletedExceptionally() && !connectionFuture.isCancelled()) {
+                onConnection(span, connectionFuture.getNow(null), contextStore);
+            }
+            return connectionFuture;
+        }
+
+        return connectionFuture.whenComplete((connection, throwable) -> {
+            if (throwable == null) {
+                onConnection(span, connection, contextStore);
+            }
         });
-  }
+    }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionProviderInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionProviderInstrumentation.java
index 8aac3d3a22c..e04dc2e7a1a 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionProviderInstrumentation.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionProviderInstrumentation.java
@@ -29,78 +29,74 @@
  */
 @AutoService(InstrumenterModule.class)
 public class MasterReplicaConnectionProviderInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public MasterReplicaConnectionProviderInstrumentation() {
-    super("lettuce", "lettuce-5");
-  }
+    public MasterReplicaConnectionProviderInstrumentation() {
+        super("lettuce", "lettuce-5");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      // Legacy Lettuce 5.x
-      "io.lettuce.core.masterslave.MasterSlaveConnectionProvider",
-      // Transitional Lettuce 6.0 provider
-      "io.lettuce.core.masterreplica.UpstreamReplicaConnectionProvider",
-      // Lettuce 6.1+
-      "io.lettuce.core.masterreplica.MasterReplicaConnectionProvider"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            // Legacy Lettuce 5.x
+            "io.lettuce.core.masterslave.MasterSlaveConnectionProvider",
+            // Transitional Lettuce 6.0 provider
+            "io.lettuce.core.masterreplica.UpstreamReplicaConnectionProvider",
+            // Lettuce 6.1+
+            "io.lettuce.core.masterreplica.MasterReplicaConnectionProvider"
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // Intent argument types move across Lettuce versions, but only the returned connection is used.
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("getConnection"))
-            .and(takesArguments(1))
-            .and(returns(named("io.lettuce.core.api.StatefulRedisConnection"))),
-        MasterReplicaConnectionProviderInstrumentation.class.getName() + "$SyncAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("getConnectionAsync"))
-            .and(takesArguments(1))
-            .and(returns(named("java.util.concurrent.CompletableFuture"))),
-        MasterReplicaConnectionProviderInstrumentation.class.getName() + "$AsyncAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // Intent argument types move across Lettuce versions, but only the returned connection is used.
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("getConnection"))
+                        .and(takesArguments(1))
+                        .and(returns(named("io.lettuce.core.api.StatefulRedisConnection"))),
+                MasterReplicaConnectionProviderInstrumentation.class.getName() + "$SyncAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("getConnectionAsync"))
+                        .and(takesArguments(1))
+                        .and(returns(named("java.util.concurrent.CompletableFuture"))),
+                MasterReplicaConnectionProviderInstrumentation.class.getName() + "$AsyncAdvice");
+    }
 
-  public static class SyncAdvice {
+    public static class SyncAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(@Advice.Return final StatefulRedisConnection<?, ?> connection) {
-      final AgentSpan span = activeSpan();
-      if (!MasterReplicaConnectionHelper.isRedisClientSpan(span)) {
-        return;
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(@Advice.Return final StatefulRedisConnection<?, ?> connection) {
+            final AgentSpan span = activeSpan();
+            if (!MasterReplicaConnectionHelper.isRedisClientSpan(span)) {
+                return;
+            }
 
-      MasterReplicaConnectionHelper.onConnection(
-          span, connection, InstrumentationContext.get(StatefulConnection.class, RedisURI.class));
+            MasterReplicaConnectionHelper.onConnection(
+                    span, connection, InstrumentationContext.get(StatefulConnection.class, RedisURI.class));
+        }
     }
-  }
 
-  public static class AsyncAdvice {
+    public static class AsyncAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static <T extends StatefulConnection> void onExit(
-        @Advice.Return(readOnly = false) CompletableFuture<T> connectionFuture) {
-      final AgentSpan span = activeSpan();
-      if (!MasterReplicaConnectionHelper.isRedisClientSpan(span) || connectionFuture == null) {
-        return;
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static <T extends StatefulConnection> void onExit(
+                @Advice.Return(readOnly = false) CompletableFuture<T> connectionFuture) {
+            final AgentSpan span = activeSpan();
+            if (!MasterReplicaConnectionHelper.isRedisClientSpan(span) || connectionFuture == null) {
+                return;
+            }
 
-      connectionFuture =
-          MasterReplicaConnectionHelper.onConnectionFuture(
-              span,
-              connectionFuture,
-              InstrumentationContext.get(StatefulConnection.class, RedisURI.class));
+            connectionFuture = MasterReplicaConnectionHelper.onConnectionFuture(
+                    span, connectionFuture, InstrumentationContext.get(StatefulConnection.class, RedisURI.class));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/PooledClusterConnectionProviderInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/PooledClusterConnectionProviderInstrumentation.java
index 8844a516310..840cc0c4fb8 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/PooledClusterConnectionProviderInstrumentation.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/PooledClusterConnectionProviderInstrumentation.java
@@ -29,51 +29,47 @@
  */
 @AutoService(InstrumenterModule.class)
 public class PooledClusterConnectionProviderInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public PooledClusterConnectionProviderInstrumentation() {
-    super("lettuce", "lettuce-5");
-  }
+    public PooledClusterConnectionProviderInstrumentation() {
+        super("lettuce", "lettuce-5");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.lettuce.core.cluster.PooledClusterConnectionProvider";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.lettuce.core.cluster.PooledClusterConnectionProvider";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            // Synchronous getConnection delegates here after resolving the command slot.
-            .and(named("getConnectionAsync"))
-            .and(takesArguments(2))
-            .and(takesArgument(1, int.class))
-            .and(returns(named("java.util.concurrent.CompletableFuture"))),
-        PooledClusterConnectionProviderInstrumentation.class.getName() + "$ConnectionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        // Synchronous getConnection delegates here after resolving the command slot.
+                        .and(named("getConnectionAsync"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(1, int.class))
+                        .and(returns(named("java.util.concurrent.CompletableFuture"))),
+                PooledClusterConnectionProviderInstrumentation.class.getName() + "$ConnectionAdvice");
+    }
 
-  public static class ConnectionAdvice {
+    public static class ConnectionAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static <T extends StatefulConnection> void onExit(
-        @Advice.Return(readOnly = false) CompletableFuture<T> connectionFuture) {
-      final AgentSpan span = activeSpan();
-      if (!MasterReplicaConnectionHelper.isRedisClientSpan(span) || connectionFuture == null) {
-        return;
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static <T extends StatefulConnection> void onExit(
+                @Advice.Return(readOnly = false) CompletableFuture<T> connectionFuture) {
+            final AgentSpan span = activeSpan();
+            if (!MasterReplicaConnectionHelper.isRedisClientSpan(span) || connectionFuture == null) {
+                return;
+            }
 
-      connectionFuture =
-          MasterReplicaConnectionHelper.onConnectionFuture(
-              span,
-              connectionFuture,
-              InstrumentationContext.get(StatefulConnection.class, RedisURI.class));
+            connectionFuture = MasterReplicaConnectionHelper.onConnectionFuture(
+                    span, connectionFuture, InstrumentationContext.get(StatefulConnection.class, RedisURI.class));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/RedisClusterClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/RedisClusterClientInstrumentation.java
index f5ad7e37ae7..0f935ab5e03 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/RedisClusterClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/RedisClusterClientInstrumentation.java
@@ -19,48 +19,44 @@
 
 @AutoService(InstrumenterModule.class)
 public class RedisClusterClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public RedisClusterClientInstrumentation() {
-    super("lettuce", "lettuce-5");
-  }
+    public RedisClusterClientInstrumentation() {
+        super("lettuce", "lettuce-5");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.lettuce.core.cluster.RedisClusterClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.lettuce.core.cluster.RedisClusterClient";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("connectToNodeAsync"))
-            .and(takesArguments(4))
-            .and(takesArgument(1, String.class))
-            .and(returns(named("io.lettuce.core.ConnectionFuture"))),
-        RedisClusterClientInstrumentation.class.getName() + "$ConnectToNodeAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("connectToNodeAsync"))
+                        .and(takesArguments(4))
+                        .and(takesArgument(1, String.class))
+                        .and(returns(named("io.lettuce.core.ConnectionFuture"))),
+                RedisClusterClientInstrumentation.class.getName() + "$ConnectToNodeAdvice");
+    }
 
-  public static class ConnectToNodeAdvice {
+    public static class ConnectToNodeAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static <T extends StatefulConnection> void onExit(
-        @Advice.Return(readOnly = false) ConnectionFuture<T> connectionFuture) {
-      if (connectionFuture == null) {
-        return;
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static <T extends StatefulConnection> void onExit(
+                @Advice.Return(readOnly = false) ConnectionFuture<T> connectionFuture) {
+            if (connectionFuture == null) {
+                return;
+            }
 
-      connectionFuture =
-          connectionFuture.thenApply(
-              new ClusterConnectionContextFunction<T>(
-                  connectionFuture,
-                  InstrumentationContext.get(StatefulConnection.class, RedisURI.class)));
+            connectionFuture = connectionFuture.thenApply(new ClusterConnectionContextFunction<T>(
+                    connectionFuture, InstrumentationContext.get(StatefulConnection.class, RedisURI.class)));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceFlowTracker.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceFlowTracker.java
index 36d27ba2ce0..e62a427c0b3 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceFlowTracker.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceFlowTracker.java
@@ -5,19 +5,19 @@
 import java.util.function.Consumer;
 
 public final class LettuceFlowTracker<R> implements Consumer<R> {
-  public final AgentSpan flowSpan;
+    public final AgentSpan flowSpan;
 
-  public LettuceFlowTracker(AgentSpan flowSpan) {
-    this.flowSpan = flowSpan;
-  }
+    public LettuceFlowTracker(AgentSpan flowSpan) {
+        this.flowSpan = flowSpan;
+    }
 
-  @Override
-  public void accept(R r) {
-    if (flowSpan != null) {
-      AgentSpan previousSpan = AgentTracer.activeSpan();
-      if (flowSpan != previousSpan) {
-        AgentTracer.activateSpan(flowSpan);
-      }
+    @Override
+    public void accept(R r) {
+        if (flowSpan != null) {
+            AgentSpan previousSpan = AgentTracer.activeSpan();
+            if (flowSpan != previousSpan) {
+                AgentTracer.activateSpan(flowSpan);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceFluxCreationAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceFluxCreationAdvice.java
index c0dfc5e611f..7f838ade0c8 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceFluxCreationAdvice.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceFluxCreationAdvice.java
@@ -8,17 +8,16 @@
 
 public class LettuceFluxCreationAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static RedisCommand extractCommandName(
-      @Advice.Argument(0) final Supplier<RedisCommand> supplier) {
-    return supplier.get();
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static RedisCommand extractCommandName(@Advice.Argument(0) final Supplier<RedisCommand> supplier) {
+        return supplier.get();
+    }
 
-  // throwables wouldn't matter here, because no spans have been started due to redis command not
-  // being run until the user subscribes to the Mono publisher
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterCreateFlux(@Advice.Return(readOnly = false) Flux<?> publisher) {
-    LettuceFlowTracker tracker = new LettuceFlowTracker(AgentTracer.activeSpan());
-    publisher = publisher.doOnSubscribe(tracker);
-  }
+    // throwables wouldn't matter here, because no spans have been started due to redis command not
+    // being run until the user subscribes to the Mono publisher
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterCreateFlux(@Advice.Return(readOnly = false) Flux<?> publisher) {
+        LettuceFlowTracker tracker = new LettuceFlowTracker(AgentTracer.activeSpan());
+        publisher = publisher.doOnSubscribe(tracker);
+    }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceMonoCreationAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceMonoCreationAdvice.java
index 9cff6bbcc9c..6e86e23650e 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceMonoCreationAdvice.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceMonoCreationAdvice.java
@@ -8,17 +8,16 @@
 
 public class LettuceMonoCreationAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static RedisCommand extractCommandName(
-      @Advice.Argument(0) final Supplier<RedisCommand> supplier) {
-    return supplier.get();
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static RedisCommand extractCommandName(@Advice.Argument(0) final Supplier<RedisCommand> supplier) {
+        return supplier.get();
+    }
 
-  // throwables wouldn't matter here, because no spans have been started due to redis command not
-  // being run until the user subscribes to the Mono publisher
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterCreateMono(@Advice.Return(readOnly = false) Mono<?> publisher) {
-    LettuceFlowTracker tracker = new LettuceFlowTracker(AgentTracer.activeSpan());
-    publisher = publisher.doOnSubscribe(tracker);
-  }
+    // throwables wouldn't matter here, because no spans have been started due to redis command not
+    // being run until the user subscribes to the Mono publisher
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterCreateMono(@Advice.Return(readOnly = false) Mono<?> publisher) {
+        LettuceFlowTracker tracker = new LettuceFlowTracker(AgentTracer.activeSpan());
+        publisher = publisher.doOnSubscribe(tracker);
+    }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionAdvanceAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionAdvanceAdvice.java
index fd518c7331f..1d477b9ff09 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionAdvanceAdvice.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionAdvanceAdvice.java
@@ -8,24 +8,23 @@
 
 public class RedisSubscriptionAdvanceAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void beforeOnNext(
-      @Advice.This Subscription subscription, @Advice.FieldValue("command") RedisCommand command) {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void beforeOnNext(
+            @Advice.This Subscription subscription, @Advice.FieldValue("command") RedisCommand command) {
 
-    ContextStore<Subscription, RedisSubscriptionState> store =
-        InstrumentationContext.get(
-            "io.lettuce.core.RedisPublisher$RedisSubscription",
-            "datadog.trace.instrumentation.lettuce5.rx.RedisSubscriptionState");
-    RedisSubscriptionState value = store.get(subscription);
-    if (value == null) {
-      value = new RedisSubscriptionState();
-      store.put(subscription, value);
+        ContextStore<Subscription, RedisSubscriptionState> store = InstrumentationContext.get(
+                "io.lettuce.core.RedisPublisher$RedisSubscription",
+                "datadog.trace.instrumentation.lettuce5.rx.RedisSubscriptionState");
+        RedisSubscriptionState value = store.get(subscription);
+        if (value == null) {
+            value = new RedisSubscriptionState();
+            store.put(subscription, value);
+        }
+        if (command.isCancelled()) {
+            value.cancelled = true;
+        }
+        if (!value.cancelled) {
+            value.count++;
+        }
     }
-    if (command.isCancelled()) {
-      value.cancelled = true;
-    }
-    if (!value.cancelled) {
-      value.count++;
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionCommandCompleteAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionCommandCompleteAdvice.java
index ea04ed01cbf..789b1186614 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionCommandCompleteAdvice.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionCommandCompleteAdvice.java
@@ -12,34 +12,34 @@
 
 public class RedisSubscriptionCommandCompleteAdvice {
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void afterComplete(
-      @Advice.Origin("#m") String method,
-      @Advice.This RedisCommand command,
-      @Advice.FieldValue("subscription") Subscription subscription) {
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void afterComplete(
+            @Advice.Origin("#m") String method,
+            @Advice.This RedisCommand command,
+            @Advice.FieldValue("subscription") Subscription subscription) {
 
-    AgentSpan span = InstrumentationContext.get(RedisCommand.class, AgentSpan.class).get(command);
+        AgentSpan span =
+                InstrumentationContext.get(RedisCommand.class, AgentSpan.class).get(command);
 
-    if (span != null) {
-      ContextStore<Subscription, RedisSubscriptionState> store =
-          InstrumentationContext.get(
-              "io.lettuce.core.RedisPublisher$RedisSubscription",
-              "datadog.trace.instrumentation.lettuce5.rx.RedisSubscriptionState");
+        if (span != null) {
+            ContextStore<Subscription, RedisSubscriptionState> store = InstrumentationContext.get(
+                    "io.lettuce.core.RedisPublisher$RedisSubscription",
+                    "datadog.trace.instrumentation.lettuce5.rx.RedisSubscriptionState");
 
-      RedisSubscriptionState state = store.get(subscription);
-      if (state != null) {
-        if (state.count > 1) {
-          span.setTag("db.command.results.count", state.count);
+            RedisSubscriptionState state = store.get(subscription);
+            if (state != null) {
+                if (state.count > 1) {
+                    span.setTag("db.command.results.count", state.count);
+                }
+            }
+            if (state != null && state.cancelled) {
+                span.setTag("db.command.cancelled", true);
+            }
+            if (expectsResponse(command) || "cancel".equals(method)) {
+                DECORATE.beforeFinish(span);
+                span.finish();
+                store.put(subscription, null);
+            }
         }
-      }
-      if (state != null && state.cancelled) {
-        span.setTag("db.command.cancelled", true);
-      }
-      if (expectsResponse(command) || "cancel".equals(method)) {
-        DECORATE.beforeFinish(span);
-        span.finish();
-        store.put(subscription, null);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionCommandErrorAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionCommandErrorAdvice.java
index 0977eb92f5f..e899517d364 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionCommandErrorAdvice.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionCommandErrorAdvice.java
@@ -9,18 +9,16 @@
 import net.bytebuddy.asm.Advice;
 
 public class RedisSubscriptionCommandErrorAdvice {
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void afterError(
-      @Advice.This RedisCommand command, @Advice.Argument(value = 0) Throwable throwable) {
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void afterError(@Advice.This RedisCommand command, @Advice.Argument(value = 0) Throwable throwable) {
 
-    ContextStore<RedisCommand, AgentSpan> ctx =
-        InstrumentationContext.get(RedisCommand.class, AgentSpan.class);
-    AgentSpan span = ctx.get(command);
-    if (span != null) {
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      span.finish();
+        ContextStore<RedisCommand, AgentSpan> ctx = InstrumentationContext.get(RedisCommand.class, AgentSpan.class);
+        AgentSpan span = ctx.get(command);
+        if (span != null) {
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
+        ctx.put(command, null);
     }
-    ctx.put(command, null);
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionCommandOnCompleteAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionCommandOnCompleteAdvice.java
index ca0951bc1ca..cb2b752a11e 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionCommandOnCompleteAdvice.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionCommandOnCompleteAdvice.java
@@ -13,32 +13,31 @@
 /** Instrumentation for SubscriptionCommand in version 5.3.6 and later */
 public class RedisSubscriptionCommandOnCompleteAdvice {
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void afterComplete(
-      @Advice.This RedisCommand command,
-      @Advice.FieldValue("subscription") Subscription subscription) {
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void afterComplete(
+            @Advice.This RedisCommand command, @Advice.FieldValue("subscription") Subscription subscription) {
 
-    AgentSpan span = InstrumentationContext.get(RedisCommand.class, AgentSpan.class).get(command);
+        AgentSpan span =
+                InstrumentationContext.get(RedisCommand.class, AgentSpan.class).get(command);
 
-    if (span != null) {
-      ContextStore<Subscription, RedisSubscriptionState> store =
-          InstrumentationContext.get(
-              "io.lettuce.core.RedisPublisher$RedisSubscription",
-              "datadog.trace.instrumentation.lettuce5.rx.RedisSubscriptionState");
-      RedisSubscriptionState state = store.get(subscription);
-      if (state != null) {
-        if (state.count > 1) {
-          span.setTag("db.command.results.count", state.count);
+        if (span != null) {
+            ContextStore<Subscription, RedisSubscriptionState> store = InstrumentationContext.get(
+                    "io.lettuce.core.RedisPublisher$RedisSubscription",
+                    "datadog.trace.instrumentation.lettuce5.rx.RedisSubscriptionState");
+            RedisSubscriptionState state = store.get(subscription);
+            if (state != null) {
+                if (state.count > 1) {
+                    span.setTag("db.command.results.count", state.count);
+                }
+            }
+            if (state != null && state.cancelled) {
+                span.setTag("db.command.cancelled", true);
+            }
+            if (expectsResponse(command)) {
+                DECORATE.beforeFinish(span);
+                span.finish();
+                store.put(subscription, null);
+            }
         }
-      }
-      if (state != null && state.cancelled) {
-        span.setTag("db.command.cancelled", true);
-      }
-      if (expectsResponse(command)) {
-        DECORATE.beforeFinish(span);
-        span.finish();
-        store.put(subscription, null);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionConnectionContextAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionConnectionContextAdvice.java
index a973f8a2be7..bf793edca0a 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionConnectionContextAdvice.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionConnectionContextAdvice.java
@@ -7,19 +7,17 @@
 import org.reactivestreams.Subscription;
 
 public class RedisSubscriptionConnectionContextAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterConstruct(
-      @Advice.This final Subscription subscription,
-      @Advice.Argument(0) final StatefulConnection connection) {
-    final ContextStore<Subscription, RedisSubscriptionState> store =
-        InstrumentationContext.get(
-            "io.lettuce.core.RedisPublisher$RedisSubscription",
-            "datadog.trace.instrumentation.lettuce5.rx.RedisSubscriptionState");
-    RedisSubscriptionState value = store.get(subscription);
-    if (value == null) {
-      value = new RedisSubscriptionState();
-      value.connection = connection;
-      store.put(subscription, value);
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterConstruct(
+            @Advice.This final Subscription subscription, @Advice.Argument(0) final StatefulConnection connection) {
+        final ContextStore<Subscription, RedisSubscriptionState> store = InstrumentationContext.get(
+                "io.lettuce.core.RedisPublisher$RedisSubscription",
+                "datadog.trace.instrumentation.lettuce5.rx.RedisSubscriptionState");
+        RedisSubscriptionState value = store.get(subscription);
+        if (value == null) {
+            value = new RedisSubscriptionState();
+            value.connection = connection;
+            store.put(subscription, value);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionDispatchAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionDispatchAdvice.java
index 8efd5f75325..4959ef7666b 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionDispatchAdvice.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionDispatchAdvice.java
@@ -10,18 +10,18 @@
 
 public class RedisSubscriptionDispatchAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope beforeDispatch(
-      @Advice.FieldValue("subscriptionCommand") RedisCommand subscriptionCommand) {
-    AgentSpan span =
-        InstrumentationContext.get(RedisCommand.class, AgentSpan.class).get(subscriptionCommand);
-    return span != null ? activateSpan(span) : null;
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope beforeDispatch(
+            @Advice.FieldValue("subscriptionCommand") RedisCommand subscriptionCommand) {
+        AgentSpan span =
+                InstrumentationContext.get(RedisCommand.class, AgentSpan.class).get(subscriptionCommand);
+        return span != null ? activateSpan(span) : null;
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void afterDispatch(@Advice.Enter ContextScope scope) {
-    if (scope != null) {
-      scope.close();
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void afterDispatch(@Advice.Enter ContextScope scope) {
+        if (scope != null) {
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionState.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionState.java
index b41ea907f8d..60a35dbd4ca 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionState.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionState.java
@@ -4,8 +4,8 @@
 import io.lettuce.core.api.StatefulConnection;
 
 public final class RedisSubscriptionState {
-  public boolean cancelled = false;
-  public int count = 0;
-  public AgentSpan parentSpan;
-  public StatefulConnection<?, ?> connection;
+    public boolean cancelled = false;
+    public int count = 0;
+    public AgentSpan parentSpan;
+    public StatefulConnection<?, ?> connection;
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java
index 4f7124e35a6..8fbf721e27e 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java
@@ -16,64 +16,60 @@
 import org.reactivestreams.Subscription;
 
 public class RedisSubscriptionSubscribeAdvice {
-  public static final class State {
-    public final ContextScope parentScope;
-    public final AgentSpan span;
+    public static final class State {
+        public final ContextScope parentScope;
+        public final AgentSpan span;
 
-    public State(ContextScope parentScope, AgentSpan span) {
-      this.parentScope = parentScope;
-      this.span = span;
+        public State(ContextScope parentScope, AgentSpan span) {
+            this.parentScope = parentScope;
+            this.span = span;
+        }
     }
-  }
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static State beforeSubscribe(
-      @Advice.This Subscription subscription,
-      @Advice.FieldValue("command") RedisCommand command,
-      @Advice.FieldValue("subscriptionCommand") RedisCommand subscriptionCommand) {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static State beforeSubscribe(
+            @Advice.This Subscription subscription,
+            @Advice.FieldValue("command") RedisCommand command,
+            @Advice.FieldValue("subscriptionCommand") RedisCommand subscriptionCommand) {
 
-    ContextScope parentScope = null;
-    RedisSubscriptionState state =
-        (RedisSubscriptionState)
-            InstrumentationContext.get(
-                    "io.lettuce.core.RedisPublisher$RedisSubscription",
-                    "datadog.trace.instrumentation.lettuce5.rx.RedisSubscriptionState")
+        ContextScope parentScope = null;
+        RedisSubscriptionState state = (RedisSubscriptionState) InstrumentationContext.get(
+                        "io.lettuce.core.RedisPublisher$RedisSubscription",
+                        "datadog.trace.instrumentation.lettuce5.rx.RedisSubscriptionState")
                 .get(subscription);
-    AgentSpan parentSpan = state != null ? state.parentSpan : null;
-    if (parentSpan != null) {
-      parentScope = activateSpan(parentSpan);
-    }
-    AgentSpan span =
-        startSpan(
-            LettuceClientDecorator.REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME);
-    InstrumentationContext.get(RedisCommand.class, AgentSpan.class).put(subscriptionCommand, span);
-    DECORATE.afterStart(span);
-    if (state != null && state.connection != null) {
-      DECORATE.onConnection(
-          span,
-          InstrumentationContext.get(StatefulConnection.class, RedisURI.class)
-              .get(state.connection));
-    }
-    DECORATE.onCommand(span, command);
+        AgentSpan parentSpan = state != null ? state.parentSpan : null;
+        if (parentSpan != null) {
+            parentScope = activateSpan(parentSpan);
+        }
+        AgentSpan span =
+                startSpan(LettuceClientDecorator.REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME);
+        InstrumentationContext.get(RedisCommand.class, AgentSpan.class).put(subscriptionCommand, span);
+        DECORATE.afterStart(span);
+        if (state != null && state.connection != null) {
+            DECORATE.onConnection(
+                    span,
+                    InstrumentationContext.get(StatefulConnection.class, RedisURI.class)
+                            .get(state.connection));
+        }
+        DECORATE.onCommand(span, command);
 
-    return new State(parentScope, span);
-  }
-
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void afterSubscribe(
-      @Advice.FieldValue("command") RedisCommand command,
-      @Advice.FieldValue("subscriptionCommand") RedisCommand subscriptionCommand,
-      @Advice.Enter State state,
-      @Advice.Thrown Throwable throwable) {
-    if (throwable != null || !expectsResponse(command)) {
-      DECORATE.onError(state.span, throwable);
-      DECORATE.beforeFinish(state.span);
-      state.span.finish();
-      InstrumentationContext.get(RedisCommand.class, AgentSpan.class)
-          .put(subscriptionCommand, null);
+        return new State(parentScope, span);
     }
-    if (state.parentScope != null) {
-      state.parentScope.close();
+
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void afterSubscribe(
+            @Advice.FieldValue("command") RedisCommand command,
+            @Advice.FieldValue("subscriptionCommand") RedisCommand subscriptionCommand,
+            @Advice.Enter State state,
+            @Advice.Thrown Throwable throwable) {
+        if (throwable != null || !expectsResponse(command)) {
+            DECORATE.onError(state.span, throwable);
+            DECORATE.beforeFinish(state.span);
+            state.span.finish();
+            InstrumentationContext.get(RedisCommand.class, AgentSpan.class).put(subscriptionCommand, null);
+        }
+        if (state.parentScope != null) {
+            state.parentScope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/java/Lettuce5ClusterTest.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/java/Lettuce5ClusterTest.java
index 70f56efaf5f..4729cfa2b84 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/java/Lettuce5ClusterTest.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/java/Lettuce5ClusterTest.java
@@ -29,274 +29,262 @@
 import org.testcontainers.utility.DockerImageName;
 
 class Lettuce5ClusterTest extends AbstractInstrumentationTest {
-  private static final String TEST_SET_KEY = "TESTSETKEY";
-  private static final String TEST_SET_VALUE = "TESTSETVAL";
-  private static final int MAX_TCP_PORT = 65535;
-  private static final int CLUSTER_BUS_PORT_OFFSET = 10000;
-  private static final int MAX_CLUSTER_DATA_PORT = MAX_TCP_PORT - CLUSTER_BUS_PORT_OFFSET;
+    private static final String TEST_SET_KEY = "TESTSETKEY";
+    private static final String TEST_SET_VALUE = "TESTSETVAL";
+    private static final int MAX_TCP_PORT = 65535;
+    private static final int CLUSTER_BUS_PORT_OFFSET = 10000;
+    private static final int MAX_CLUSTER_DATA_PORT = MAX_TCP_PORT - CLUSTER_BUS_PORT_OFFSET;
 
-  private GenericContainer<?> redisCluster;
-  private RedisClusterClient redisClient;
-  private StatefulRedisClusterConnection<String, String> connection;
-  private int redisClusterMasterPort;
-  private int redisClusterReplicaPort;
+    private GenericContainer<?> redisCluster;
+    private RedisClusterClient redisClient;
+    private StatefulRedisClusterConnection<String, String> connection;
+    private int redisClusterMasterPort;
+    private int redisClusterReplicaPort;
 
-  @BeforeEach
-  void setUpRedis() throws Exception {
-    redisClusterMasterPort = randomClusterPort(MAX_CLUSTER_DATA_PORT);
-    redisClusterReplicaPort = randomClusterPort(MAX_CLUSTER_DATA_PORT);
-    while (redisClusterMasterPort == redisClusterReplicaPort
-        || redisClusterMasterPort + CLUSTER_BUS_PORT_OFFSET == redisClusterReplicaPort
-        || redisClusterReplicaPort + CLUSTER_BUS_PORT_OFFSET == redisClusterMasterPort) {
-      redisClusterReplicaPort = randomClusterPort(MAX_CLUSTER_DATA_PORT);
-    }
-
-    // Redis cluster discovery returns the announced node port, so the host-side port must be
-    // stable. Use the same random ports inside the container so cluster nodes can also reach each
-    // other at their announced addresses.
-    redisCluster =
-        new GenericContainer<>(DockerImageName.parse(System.getProperty("test.redis.image")));
-    redisCluster.setPortBindings(
-        Arrays.asList(
-            redisClusterMasterPort + ":" + redisClusterMasterPort,
-            redisClusterReplicaPort + ":" + redisClusterReplicaPort));
-    redisCluster
-        .withExposedPorts(redisClusterMasterPort, redisClusterReplicaPort)
-        .withCommand(
-            "sh", "-c", redisClusterCommand(redisClusterMasterPort, redisClusterReplicaPort))
-        .waitingFor(Wait.forLogMessage(".*CLUSTER_READY.*\\n", 1));
-    redisCluster.start();
+    @BeforeEach
+    void setUpRedis() throws Exception {
+        redisClusterMasterPort = randomClusterPort(MAX_CLUSTER_DATA_PORT);
+        redisClusterReplicaPort = randomClusterPort(MAX_CLUSTER_DATA_PORT);
+        while (redisClusterMasterPort == redisClusterReplicaPort
+                || redisClusterMasterPort + CLUSTER_BUS_PORT_OFFSET == redisClusterReplicaPort
+                || redisClusterReplicaPort + CLUSTER_BUS_PORT_OFFSET == redisClusterMasterPort) {
+            redisClusterReplicaPort = randomClusterPort(MAX_CLUSTER_DATA_PORT);
+        }
 
-    RedisURI redisURI =
-        RedisURI.Builder.redis(redisCluster.getHost(), redisClusterMasterPort).build();
-    redisClient = RedisClusterClient.create(redisURI);
-    redisClient.setOptions(ClusterClientOptions.builder().build());
-    connection = redisClient.connect();
-    new PollingConditions(30)
-        .delay(0.5)
-        .eventually(
-            () ->
-                assertEquals(
-                    "OK",
-                    connection.sync().set("DD_CLUSTER_READY", "1"),
-                    "Redis cluster did not become ready"));
+        // Redis cluster discovery returns the announced node port, so the host-side port must be
+        // stable. Use the same random ports inside the container so cluster nodes can also reach each
+        // other at their announced addresses.
+        redisCluster = new GenericContainer<>(DockerImageName.parse(System.getProperty("test.redis.image")));
+        redisCluster.setPortBindings(Arrays.asList(
+                redisClusterMasterPort + ":" + redisClusterMasterPort,
+                redisClusterReplicaPort + ":" + redisClusterReplicaPort));
+        redisCluster
+                .withExposedPorts(redisClusterMasterPort, redisClusterReplicaPort)
+                .withCommand("sh", "-c", redisClusterCommand(redisClusterMasterPort, redisClusterReplicaPort))
+                .waitingFor(Wait.forLogMessage(".*CLUSTER_READY.*\\n", 1));
+        redisCluster.start();
 
-    tracer.flush();
-    writer.clear();
-  }
+        RedisURI redisURI = RedisURI.Builder.redis(redisCluster.getHost(), redisClusterMasterPort)
+                .build();
+        redisClient = RedisClusterClient.create(redisURI);
+        redisClient.setOptions(ClusterClientOptions.builder().build());
+        connection = redisClient.connect();
+        new PollingConditions(30)
+                .delay(0.5)
+                .eventually(() -> assertEquals(
+                        "OK", connection.sync().set("DD_CLUSTER_READY", "1"), "Redis cluster did not become ready"));
 
-  @AfterEach
-  void cleanUpRedis() {
-    if (connection != null) {
-      connection.close();
+        tracer.flush();
+        writer.clear();
     }
 
-    if (redisClient != null) {
-      redisClient.shutdown(5, 10, TimeUnit.SECONDS);
-    }
+    @AfterEach
+    void cleanUpRedis() {
+        if (connection != null) {
+            connection.close();
+        }
 
-    if (redisCluster != null) {
-      redisCluster.close();
+        if (redisClient != null) {
+            redisClient.shutdown(5, 10, TimeUnit.SECONDS);
+        }
+
+        if (redisCluster != null) {
+            redisCluster.close();
+        }
     }
-  }
 
-  @Test
-  void clusterCommandSpanHasPeerHostname() throws Exception {
-    String result = connection.sync().set(TEST_SET_KEY, TEST_SET_VALUE);
+    @Test
+    void clusterCommandSpanHasPeerHostname() throws Exception {
+        String result = connection.sync().set(TEST_SET_KEY, TEST_SET_VALUE);
 
-    assertEquals("OK", result);
-    assertSetSpanHasPeerHostname();
-  }
+        assertEquals("OK", result);
+        assertSetSpanHasPeerHostname();
+    }
 
-  @Test
-  void asyncClusterCommandSpanHasPeerHostname() throws Exception {
-    RedisFuture<String> redisFuture = connection.async().set(TEST_SET_KEY, TEST_SET_VALUE);
-    String result = redisFuture.get(3, TimeUnit.SECONDS);
+    @Test
+    void asyncClusterCommandSpanHasPeerHostname() throws Exception {
+        RedisFuture<String> redisFuture = connection.async().set(TEST_SET_KEY, TEST_SET_VALUE);
+        String result = redisFuture.get(3, TimeUnit.SECONDS);
 
-    assertEquals("OK", result);
-    assertSetSpanHasPeerHostname();
-  }
+        assertEquals("OK", result);
+        assertSetSpanHasPeerHostname();
+    }
 
-  @Test
-  void reactiveClusterCommandSpanHasPeerHostname() {
-    String result = connection.reactive().set(TEST_SET_KEY, TEST_SET_VALUE).block();
+    @Test
+    void reactiveClusterCommandSpanHasPeerHostname() {
+        String result = connection.reactive().set(TEST_SET_KEY, TEST_SET_VALUE).block();
 
-    assertEquals("OK", result);
-    assertSetSpanHasPeerHostname();
-  }
+        assertEquals("OK", result);
+        assertSetSpanHasPeerHostname();
+    }
 
-  @Test
-  void clusterReadCommandSpanUsesReplicaPeerWithReadFromReplica() throws Exception {
-    assertEquals("OK", connection.sync().set(TEST_SET_KEY, TEST_SET_VALUE));
-    connection.setReadFrom(ReadFrom.SLAVE);
-    new PollingConditions(30)
-        .delay(0.5)
-        .eventually(
-            () -> {
-              redisClient.reloadPartitions();
-              assertEquals(TEST_SET_VALUE, connection.sync().get(TEST_SET_KEY));
-            });
+    @Test
+    void clusterReadCommandSpanUsesReplicaPeerWithReadFromReplica() throws Exception {
+        assertEquals("OK", connection.sync().set(TEST_SET_KEY, TEST_SET_VALUE));
+        connection.setReadFrom(ReadFrom.SLAVE);
+        new PollingConditions(30).delay(0.5).eventually(() -> {
+            redisClient.reloadPartitions();
+            assertEquals(TEST_SET_VALUE, connection.sync().get(TEST_SET_KEY));
+        });
 
-    blockUntilTracesMatch(traces -> !findCommandSpans(traces, "GET").isEmpty());
-    tracer.flush();
-    writer.clear();
+        blockUntilTracesMatch(traces -> !findCommandSpans(traces, "GET").isEmpty());
+        tracer.flush();
+        writer.clear();
 
-    String result = connection.sync().get(TEST_SET_KEY);
+        String result = connection.sync().get(TEST_SET_KEY);
 
-    assertEquals(TEST_SET_VALUE, result);
-    assertGetSpanHasReplicaPeer();
-  }
+        assertEquals(TEST_SET_VALUE, result);
+        assertGetSpanHasReplicaPeer();
+    }
 
-  private void assertSetSpanHasPeerHostname() {
-    blockUntilTracesMatch(traces -> !findCommandSpans(traces, "SET").isEmpty());
+    private void assertSetSpanHasPeerHostname() {
+        blockUntilTracesMatch(traces -> !findCommandSpans(traces, "SET").isEmpty());
 
-    RedisClusterNode expectedNode =
-        connection.getPartitions().getPartitionBySlot(SlotHash.getSlot(TEST_SET_KEY));
-    assertNotNull(expectedNode, "expected a cluster node for the command key slot");
+        RedisClusterNode expectedNode = connection.getPartitions().getPartitionBySlot(SlotHash.getSlot(TEST_SET_KEY));
+        assertNotNull(expectedNode, "expected a cluster node for the command key slot");
 
-    List<DDSpan> setSpans = findCommandSpans(writer, "SET");
-    assertFalse(setSpans.isEmpty(), "expected at least one SET command span");
-    for (DDSpan span : setSpans) {
-      assertEquals("SET", String.valueOf(span.getResourceName()));
-      assertEquals("redis-client", String.valueOf(span.getTag(Tags.COMPONENT)));
-      assertEquals("redis", span.getTag(Tags.DB_TYPE));
-      assertNotNull(span.getTag(Tags.PEER_HOSTNAME), "command span should include peer.hostname");
-      assertEquals(expectedNode.getUri().getHost(), span.getTag(Tags.PEER_HOSTNAME));
+        List<DDSpan> setSpans = findCommandSpans(writer, "SET");
+        assertFalse(setSpans.isEmpty(), "expected at least one SET command span");
+        for (DDSpan span : setSpans) {
+            assertEquals("SET", String.valueOf(span.getResourceName()));
+            assertEquals("redis-client", String.valueOf(span.getTag(Tags.COMPONENT)));
+            assertEquals("redis", span.getTag(Tags.DB_TYPE));
+            assertNotNull(span.getTag(Tags.PEER_HOSTNAME), "command span should include peer.hostname");
+            assertEquals(expectedNode.getUri().getHost(), span.getTag(Tags.PEER_HOSTNAME));
+        }
     }
-  }
 
-  private void assertGetSpanHasReplicaPeer() {
-    blockUntilTracesMatch(traces -> !findCommandSpans(traces, "GET").isEmpty());
+    private void assertGetSpanHasReplicaPeer() {
+        blockUntilTracesMatch(traces -> !findCommandSpans(traces, "GET").isEmpty());
 
-    RedisClusterNode master =
-        connection.getPartitions().getPartitionBySlot(SlotHash.getSlot(TEST_SET_KEY));
-    assertNotNull(master, "expected a cluster master node for the command key slot");
+        RedisClusterNode master = connection.getPartitions().getPartitionBySlot(SlotHash.getSlot(TEST_SET_KEY));
+        assertNotNull(master, "expected a cluster master node for the command key slot");
 
-    RedisClusterNode replica = findReplicaOf(master);
-    assertNotNull(replica, "expected a replica for the command key slot");
-    assertNotEquals(
-        master.getUri().getPort(),
-        replica.getUri().getPort(),
-        "test must use different master and replica endpoints");
+        RedisClusterNode replica = findReplicaOf(master);
+        assertNotNull(replica, "expected a replica for the command key slot");
+        assertNotEquals(
+                master.getUri().getPort(),
+                replica.getUri().getPort(),
+                "test must use different master and replica endpoints");
 
-    List<DDSpan> getSpans = findCommandSpans(writer, "GET");
-    assertFalse(getSpans.isEmpty(), "expected at least one GET command span");
-    for (DDSpan span : getSpans) {
-      assertEquals("GET", String.valueOf(span.getResourceName()));
-      assertEquals("redis-client", String.valueOf(span.getTag(Tags.COMPONENT)));
-      assertEquals("redis", span.getTag(Tags.DB_TYPE));
-      assertEquals(replica.getUri().getPort(), span.getTag(Tags.PEER_PORT));
-      assertEquals(replica.getUri().getHost(), span.getTag(Tags.PEER_HOSTNAME));
+        List<DDSpan> getSpans = findCommandSpans(writer, "GET");
+        assertFalse(getSpans.isEmpty(), "expected at least one GET command span");
+        for (DDSpan span : getSpans) {
+            assertEquals("GET", String.valueOf(span.getResourceName()));
+            assertEquals("redis-client", String.valueOf(span.getTag(Tags.COMPONENT)));
+            assertEquals("redis", span.getTag(Tags.DB_TYPE));
+            assertEquals(replica.getUri().getPort(), span.getTag(Tags.PEER_PORT));
+            assertEquals(replica.getUri().getHost(), span.getTag(Tags.PEER_HOSTNAME));
+        }
     }
-  }
 
-  private RedisClusterNode findReplicaOf(RedisClusterNode master) {
-    for (RedisClusterNode node : connection.getPartitions()) {
-      if (master.getNodeId().equals(node.getSlaveOf())) {
-        return node;
-      }
+    private RedisClusterNode findReplicaOf(RedisClusterNode master) {
+        for (RedisClusterNode node : connection.getPartitions()) {
+            if (master.getNodeId().equals(node.getSlaveOf())) {
+                return node;
+            }
+        }
+        fail("No replica found for master " + master);
+        return null;
     }
-    fail("No replica found for master " + master);
-    return null;
-  }
 
-  private static List<DDSpan> findCommandSpans(Iterable<List<DDSpan>> traces, String command) {
-    List<DDSpan> commandSpans = new ArrayList<>();
-    for (List<DDSpan> trace : traces) {
-      for (DDSpan span : trace) {
-        if (command.contentEquals(span.getResourceName())
-            && "redis-client".equals(String.valueOf(span.getTag(Tags.COMPONENT)))) {
-          commandSpans.add(span);
+    private static List<DDSpan> findCommandSpans(Iterable<List<DDSpan>> traces, String command) {
+        List<DDSpan> commandSpans = new ArrayList<>();
+        for (List<DDSpan> trace : traces) {
+            for (DDSpan span : trace) {
+                if (command.contentEquals(span.getResourceName())
+                        && "redis-client".equals(String.valueOf(span.getTag(Tags.COMPONENT)))) {
+                    commandSpans.add(span);
+                }
+            }
         }
-      }
+        return commandSpans;
     }
-    return commandSpans;
-  }
 
-  private static int randomClusterPort(int maxPort) {
-    int port = randomOpenPort();
-    while (port > maxPort) {
-      port = randomOpenPort();
+    private static int randomClusterPort(int maxPort) {
+        int port = randomOpenPort();
+        while (port > maxPort) {
+            port = randomOpenPort();
+        }
+        return port;
     }
-    return port;
-  }
 
-  private static String redisClusterCommand(int masterPort, int replicaPort) {
-    return "set -e; "
-        + "mkdir -p /tmp/redis-cluster; "
-        // Start the slot-owning master on its announced data and cluster bus ports.
-        + "redis-server --port "
-        + masterPort
-        + " --dir /tmp/redis-cluster --cluster-enabled yes --cluster-config-file nodes-"
-        + masterPort
-        + ".conf --cluster-node-timeout 5000 --appendonly no --protected-mode no"
-        + " --cluster-announce-ip 127.0.0.1 --cluster-announce-port "
-        + masterPort
-        + " --cluster-announce-bus-port "
-        + (masterPort + CLUSTER_BUS_PORT_OFFSET)
-        + " --daemonize yes; "
-        // Start the replica on its own announced data and cluster bus ports.
-        + "redis-server --port "
-        + replicaPort
-        + " --dir /tmp/redis-cluster --cluster-enabled yes --cluster-config-file nodes-"
-        + replicaPort
-        + ".conf --cluster-node-timeout 5000 --appendonly no --protected-mode no"
-        + " --cluster-announce-ip 127.0.0.1 --cluster-announce-port "
-        + replicaPort
-        + " --cluster-announce-bus-port "
-        + (replicaPort + CLUSTER_BUS_PORT_OFFSET)
-        + " --daemonize yes; "
-        // Wait until both Redis server processes accept commands.
-        + "until redis-cli -p "
-        + masterPort
-        + " ping; do sleep 0.1; done; "
-        + "until redis-cli -p "
-        + replicaPort
-        + " ping; do sleep 0.1; done; "
-        // Assign every slot to one master so the test cluster is valid with a single shard.
-        + "redis-cli -p "
-        + masterPort
-        + " cluster addslots $(seq 0 16383); "
-        // Introduce the replica node to the master's cluster view.
-        + "redis-cli -p "
-        + replicaPort
-        + " cluster meet 127.0.0.1 "
-        + masterPort
-        + "; "
-        // Capture stable node IDs needed for replication checks.
-        + "master_id=$(redis-cli -p "
-        + masterPort
-        + " cluster myid); "
-        + "replica_id=$(redis-cli -p "
-        + replicaPort
-        + " cluster myid); "
-        // Wait until the replica sees the master before requesting replication.
-        + "until redis-cli -p "
-        + replicaPort
-        + " cluster nodes | grep \"$master_id\"; do sleep 0.1; done; "
-        // Convert the second node into a replica of the slot-owning master.
-        + "redis-cli -p "
-        + replicaPort
-        + " cluster replicate \"$master_id\"; "
-        // Wait until the master's cluster view records the replica relationship.
-        + "until redis-cli -p "
-        + masterPort
-        + " cluster nodes | grep \"$replica_id\" | grep \"$master_id\" | grep -q slave; do sleep 0.1; done; "
-        // Wait until the replica's local cluster view records its replica role.
-        + "until redis-cli -p "
-        + replicaPort
-        + " cluster nodes | grep \"$replica_id\" | grep \"$master_id\" | grep -q myself,slave; do sleep 0.1; done; "
-        // Wait until Redis reports the process role as replica.
-        + "until redis-cli -p "
-        + replicaPort
-        + " role | grep -q slave; do sleep 0.1; done; "
-        // Wait until the cluster is usable before releasing the Testcontainers wait strategy.
-        + "until redis-cli -p "
-        + masterPort
-        + " cluster info | grep -q cluster_state:ok; do sleep 0.1; done; "
-        // Signal readiness to the Java test.
-        + "echo CLUSTER_READY; "
-        // Keep the container alive for the duration of the test.
-        + "tail -f /dev/null";
-  }
+    private static String redisClusterCommand(int masterPort, int replicaPort) {
+        return "set -e; "
+                + "mkdir -p /tmp/redis-cluster; "
+                // Start the slot-owning master on its announced data and cluster bus ports.
+                + "redis-server --port "
+                + masterPort
+                + " --dir /tmp/redis-cluster --cluster-enabled yes --cluster-config-file nodes-"
+                + masterPort
+                + ".conf --cluster-node-timeout 5000 --appendonly no --protected-mode no"
+                + " --cluster-announce-ip 127.0.0.1 --cluster-announce-port "
+                + masterPort
+                + " --cluster-announce-bus-port "
+                + (masterPort + CLUSTER_BUS_PORT_OFFSET)
+                + " --daemonize yes; "
+                // Start the replica on its own announced data and cluster bus ports.
+                + "redis-server --port "
+                + replicaPort
+                + " --dir /tmp/redis-cluster --cluster-enabled yes --cluster-config-file nodes-"
+                + replicaPort
+                + ".conf --cluster-node-timeout 5000 --appendonly no --protected-mode no"
+                + " --cluster-announce-ip 127.0.0.1 --cluster-announce-port "
+                + replicaPort
+                + " --cluster-announce-bus-port "
+                + (replicaPort + CLUSTER_BUS_PORT_OFFSET)
+                + " --daemonize yes; "
+                // Wait until both Redis server processes accept commands.
+                + "until redis-cli -p "
+                + masterPort
+                + " ping; do sleep 0.1; done; "
+                + "until redis-cli -p "
+                + replicaPort
+                + " ping; do sleep 0.1; done; "
+                // Assign every slot to one master so the test cluster is valid with a single shard.
+                + "redis-cli -p "
+                + masterPort
+                + " cluster addslots $(seq 0 16383); "
+                // Introduce the replica node to the master's cluster view.
+                + "redis-cli -p "
+                + replicaPort
+                + " cluster meet 127.0.0.1 "
+                + masterPort
+                + "; "
+                // Capture stable node IDs needed for replication checks.
+                + "master_id=$(redis-cli -p "
+                + masterPort
+                + " cluster myid); "
+                + "replica_id=$(redis-cli -p "
+                + replicaPort
+                + " cluster myid); "
+                // Wait until the replica sees the master before requesting replication.
+                + "until redis-cli -p "
+                + replicaPort
+                + " cluster nodes | grep \"$master_id\"; do sleep 0.1; done; "
+                // Convert the second node into a replica of the slot-owning master.
+                + "redis-cli -p "
+                + replicaPort
+                + " cluster replicate \"$master_id\"; "
+                // Wait until the master's cluster view records the replica relationship.
+                + "until redis-cli -p "
+                + masterPort
+                + " cluster nodes | grep \"$replica_id\" | grep \"$master_id\" | grep -q slave; do sleep 0.1; done; "
+                // Wait until the replica's local cluster view records its replica role.
+                + "until redis-cli -p "
+                + replicaPort
+                + " cluster nodes | grep \"$replica_id\" | grep \"$master_id\" | grep -q myself,slave; do sleep 0.1; done; "
+                // Wait until Redis reports the process role as replica.
+                + "until redis-cli -p "
+                + replicaPort
+                + " role | grep -q slave; do sleep 0.1; done; "
+                // Wait until the cluster is usable before releasing the Testcontainers wait strategy.
+                + "until redis-cli -p "
+                + masterPort
+                + " cluster info | grep -q cluster_state:ok; do sleep 0.1; done; "
+                // Signal readiness to the Java test.
+                + "echo CLUSTER_READY; "
+                // Keep the container alive for the duration of the test.
+                + "tail -f /dev/null";
+    }
 }
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/java/Lettuce5MasterReplicaTest.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/java/Lettuce5MasterReplicaTest.java
index c7f01bbd0f4..863ebf08efb 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/java/Lettuce5MasterReplicaTest.java
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/java/Lettuce5MasterReplicaTest.java
@@ -24,110 +24,107 @@
 import org.testcontainers.utility.DockerImageName;
 
 class Lettuce5MasterReplicaTest extends AbstractInstrumentationTest {
-  private RedisContainer redisServer;
-  private RedisClient redisClient;
-  private StatefulRedisConnection<String, String> connection;
-  private String host;
-  private int port;
+    private RedisContainer redisServer;
+    private RedisClient redisClient;
+    private StatefulRedisConnection<String, String> connection;
+    private String host;
+    private int port;
 
-  @BeforeEach
-  void setUpRedis() throws Exception {
-    redisServer =
-        new RedisContainer(
-                DockerImageName.parse(System.getProperty("test.redis.image"))
-                    .asCompatibleSubstituteFor("redis"))
-            .waitingFor(Wait.forListeningPort());
-    redisServer.start();
+    @BeforeEach
+    void setUpRedis() throws Exception {
+        redisServer = new RedisContainer(DockerImageName.parse(System.getProperty("test.redis.image"))
+                        .asCompatibleSubstituteFor("redis"))
+                .waitingFor(Wait.forListeningPort());
+        redisServer.start();
 
-    host = redisServer.getHost();
-    port = redisServer.getFirstMappedPort();
+        host = redisServer.getHost();
+        port = redisServer.getFirstMappedPort();
 
-    RedisURI redisURI = RedisURI.Builder.redis(host, port).withDatabase(0).build();
-    redisClient = RedisClient.create();
-    redisClient.setOptions(ClientOptions.builder().autoReconnect(false).build());
-    connection = connectMasterReplica(redisClient, redisURI);
-    connection.sync().ping();
+        RedisURI redisURI = RedisURI.Builder.redis(host, port).withDatabase(0).build();
+        redisClient = RedisClient.create();
+        redisClient.setOptions(ClientOptions.builder().autoReconnect(false).build());
+        connection = connectMasterReplica(redisClient, redisURI);
+        connection.sync().ping();
 
-    writer.waitForTraces(2);
-    tracer.flush();
-    writer.clear();
-  }
-
-  @AfterEach
-  void cleanUpRedis() {
-    if (connection != null) {
-      connection.close();
+        writer.waitForTraces(2);
+        tracer.flush();
+        writer.clear();
     }
 
-    if (redisClient != null) {
-      redisClient.shutdown(5, 10, TimeUnit.SECONDS);
-    }
+    @AfterEach
+    void cleanUpRedis() {
+        if (connection != null) {
+            connection.close();
+        }
 
-    if (redisServer != null) {
-      redisServer.stop();
+        if (redisClient != null) {
+            redisClient.shutdown(5, 10, TimeUnit.SECONDS);
+        }
+
+        if (redisServer != null) {
+            redisServer.stop();
+        }
     }
-  }
 
-  @Test
-  void staticMasterReplicaCommandSpanHasPeerHostname() throws Exception {
-    String result = connection.sync().set("TESTSETKEY", "TESTSETVAL");
+    @Test
+    void staticMasterReplicaCommandSpanHasPeerHostname() throws Exception {
+        String result = connection.sync().set("TESTSETKEY", "TESTSETVAL");
 
-    assertEquals("OK", result);
-    List<DDSpan> setSpans = waitForSetSpans();
+        assertEquals("OK", result);
+        List<DDSpan> setSpans = waitForSetSpans();
 
-    assertEquals(1, setSpans.size(), "expected exactly one SET command span");
-    DDSpan span = setSpans.get(0);
-    assertEquals("SET", String.valueOf(span.getResourceName()));
-    assertEquals("redis-client", String.valueOf(span.getTag(Tags.COMPONENT)));
-    assertEquals("redis", span.getTag(Tags.DB_TYPE));
-    assertNotNull(span.getTag(Tags.PEER_HOSTNAME), "command span should include peer.hostname");
-    assertEquals(host, span.getTag(Tags.PEER_HOSTNAME));
-  }
+        assertEquals(1, setSpans.size(), "expected exactly one SET command span");
+        DDSpan span = setSpans.get(0);
+        assertEquals("SET", String.valueOf(span.getResourceName()));
+        assertEquals("redis-client", String.valueOf(span.getTag(Tags.COMPONENT)));
+        assertEquals("redis", span.getTag(Tags.DB_TYPE));
+        assertNotNull(span.getTag(Tags.PEER_HOSTNAME), "command span should include peer.hostname");
+        assertEquals(host, span.getTag(Tags.PEER_HOSTNAME));
+    }
 
-  private List<DDSpan> waitForSetSpans() {
-    blockUntilTracesMatch(traces -> !findSetSpans(traces).isEmpty());
-    return findSetSpans(writer);
-  }
+    private List<DDSpan> waitForSetSpans() {
+        blockUntilTracesMatch(traces -> !findSetSpans(traces).isEmpty());
+        return findSetSpans(writer);
+    }
 
-  private static List<DDSpan> findSetSpans(Iterable<List<DDSpan>> traces) {
-    List<DDSpan> setSpans = new ArrayList<>();
-    for (List<DDSpan> trace : traces) {
-      for (DDSpan span : trace) {
-        if ("SET".contentEquals(span.getResourceName())
-            && "redis-client".equals(String.valueOf(span.getTag(Tags.COMPONENT)))) {
-          setSpans.add(span);
+    private static List<DDSpan> findSetSpans(Iterable<List<DDSpan>> traces) {
+        List<DDSpan> setSpans = new ArrayList<>();
+        for (List<DDSpan> trace : traces) {
+            for (DDSpan span : trace) {
+                if ("SET".contentEquals(span.getResourceName())
+                        && "redis-client".equals(String.valueOf(span.getTag(Tags.COMPONENT)))) {
+                    setSpans.add(span);
+                }
+            }
         }
-      }
+        return setSpans;
     }
-    return setSpans;
-  }
 
-  @SuppressWarnings("unchecked")
-  private static StatefulRedisConnection<String, String> connectMasterReplica(
-      RedisClient redisClient, RedisURI redisURI) throws Exception {
-    // Prefer the newer MasterReplica facade when this source is compiled for latestDepTest, but
-    // resolve both APIs reflectively so the same test still compiles with the Lettuce 5.0 baseline
-    // and can keep compiling if the deprecated MasterSlave facade disappears later.
-    Class<?> facade;
-    try {
-      facade = Class.forName("io.lettuce.core.masterreplica.MasterReplica");
-    } catch (ClassNotFoundException ignored) {
-      facade = Class.forName("io.lettuce.core.masterslave.MasterSlave");
-    }
-    Method connect =
-        facade.getMethod("connect", RedisClient.class, RedisCodec.class, Iterable.class);
-    try {
-      return (StatefulRedisConnection<String, String>)
-          connect.invoke(null, redisClient, StringCodec.UTF8, singletonList(redisURI));
-    } catch (InvocationTargetException e) {
-      Throwable cause = e.getCause();
-      if (cause instanceof Exception) {
-        throw (Exception) cause;
-      }
-      if (cause instanceof Error) {
-        throw (Error) cause;
-      }
-      throw e;
+    @SuppressWarnings("unchecked")
+    private static StatefulRedisConnection<String, String> connectMasterReplica(
+            RedisClient redisClient, RedisURI redisURI) throws Exception {
+        // Prefer the newer MasterReplica facade when this source is compiled for latestDepTest, but
+        // resolve both APIs reflectively so the same test still compiles with the Lettuce 5.0 baseline
+        // and can keep compiling if the deprecated MasterSlave facade disappears later.
+        Class<?> facade;
+        try {
+            facade = Class.forName("io.lettuce.core.masterreplica.MasterReplica");
+        } catch (ClassNotFoundException ignored) {
+            facade = Class.forName("io.lettuce.core.masterslave.MasterSlave");
+        }
+        Method connect = facade.getMethod("connect", RedisClient.class, RedisCodec.class, Iterable.class);
+        try {
+            return (StatefulRedisConnection<String, String>)
+                    connect.invoke(null, redisClient, StringCodec.UTF8, singletonList(redisURI));
+        } catch (InvocationTargetException e) {
+            Throwable cause = e.getCause();
+            if (cause instanceof Exception) {
+                throw (Exception) cause;
+            }
+            if (cause instanceof Error) {
+                throw (Error) cause;
+            }
+            throw e;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ArrayOfTypeMatcher.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ArrayOfTypeMatcher.java
index 2c605f711ff..aab8dec0a4b 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ArrayOfTypeMatcher.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ArrayOfTypeMatcher.java
@@ -7,20 +7,19 @@
 import net.bytebuddy.description.type.TypeDefinition;
 import net.bytebuddy.matcher.ElementMatcher;
 
-public class ArrayOfTypeMatcher<T extends TypeDefinition>
-    extends ElementMatcher.Junction.ForNonNullValues<T> {
-  private final NameMatchers.Named<NamedElement> componentMatcher;
+public class ArrayOfTypeMatcher<T extends TypeDefinition> extends ElementMatcher.Junction.ForNonNullValues<T> {
+    private final NameMatchers.Named<NamedElement> componentMatcher;
 
-  public ArrayOfTypeMatcher(String typeName) {
-    this.componentMatcher = named(typeName);
-  }
+    public ArrayOfTypeMatcher(String typeName) {
+        this.componentMatcher = named(typeName);
+    }
 
-  protected boolean doMatch(T target) {
-    return target.isArray() && componentMatcher.matches(target.getComponentType());
-  }
+    protected boolean doMatch(T target) {
+        return target.isArray() && componentMatcher.matches(target.getComponentType());
+    }
 
-  @Override
-  public String toString() {
-    return "isArrayOfType(" + componentMatcher + ")";
-  }
+    @Override
+    public String toString() {
+        return "isArrayOfType(" + componentMatcher + ")";
+    }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/BundleNameHelper.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/BundleNameHelper.java
index 6acbed6647b..1eee2bf62af 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/BundleNameHelper.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/BundleNameHelper.java
@@ -3,19 +3,19 @@
 import com.ibm.ws.classloading.internal.ThreadContextClassLoader;
 
 public class BundleNameHelper {
-  private BundleNameHelper() {}
+    private BundleNameHelper() {}
 
-  public static String extractDeploymentName(final ThreadContextClassLoader classLoader) {
-    final String id = classLoader.getKey();
-    // id is something like <type>:name#somethingelse
-    final int head = id.indexOf(':');
-    if (head < 0) {
-      return null;
+    public static String extractDeploymentName(final ThreadContextClassLoader classLoader) {
+        final String id = classLoader.getKey();
+        // id is something like <type>:name#somethingelse
+        final int head = id.indexOf(':');
+        if (head < 0) {
+            return null;
+        }
+        final int tail = id.lastIndexOf('#');
+        if (tail <= head) {
+            return null;
+        }
+        return id.substring(head + 1, tail);
     }
-    final int tail = id.lastIndexOf('#');
-    if (tail <= head) {
-      return null;
-    }
-    return id.substring(head + 1, tail);
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/GetPartsInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/GetPartsInstrumentation.java
index 5156f4cbceb..0e4cb5d6eb4 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/GetPartsInstrumentation.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/GetPartsInstrumentation.java
@@ -25,60 +25,59 @@
 
 @AutoService(InstrumenterModule.class)
 public class GetPartsInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public GetPartsInstrumentation() {
-    super("liberty");
-  }
+    public GetPartsInstrumentation() {
+        super("liberty");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "com.ibm.ws.webcontainer.srt.SRTServletRequest",
-      "com.ibm.ws.webcontainer31.srt.SRTServletRequest31",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "com.ibm.ws.webcontainer.srt.SRTServletRequest", "com.ibm.ws.webcontainer31.srt.SRTServletRequest31",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("getParts")).and(isPublic()).and(takesArguments(0)),
-        GetPartsInstrumentation.class.getName() + "$GetFilenamesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("getParts")).and(isPublic()).and(takesArguments(0)),
+                GetPartsInstrumentation.class.getName() + "$GetFilenamesAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class GetFilenamesAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return Collection<?> parts,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
-      List<String> filenames = PartHelper.extractFilenames(parts);
-      if (filenames.isEmpty()) {
-        return;
-      }
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, List<String>, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestFilesFilenames());
-      if (callback == null) {
-        return;
-      }
-      Flow<Void> flow = callback.apply(reqCtx, filenames);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-        if (brf != null) {
-          brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-          if (t == null) {
-            t = new BlockingException("Blocked request (multipart file upload)");
-            reqCtx.getTraceSegment().effectivelyBlocked();
-          }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class GetFilenamesAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Return Collection<?> parts,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
+            }
+            List<String> filenames = PartHelper.extractFilenames(parts);
+            if (filenames.isEmpty()) {
+                return;
+            }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, List<String>, Flow<Void>> callback =
+                    cbp.getCallback(EVENTS.requestFilesFilenames());
+            if (callback == null) {
+                return;
+            }
+            Flow<Void> flow = callback.apply(reqCtx, filenames);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+                if (brf != null) {
+                    brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                    if (t == null) {
+                        t = new BlockingException("Blocked request (multipart file upload)");
+                        reqCtx.getTraceSegment().effectivelyBlocked();
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/HttpInboundServiceContextImplInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/HttpInboundServiceContextImplInstrumentation.java
index 52d222d5ef9..ea3c653b1f6 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/HttpInboundServiceContextImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/HttpInboundServiceContextImplInstrumentation.java
@@ -22,68 +22,62 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpInboundServiceContextImplInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public static final String REQUEST_MSG_TYPE =
-      "com.ibm.ws.http.channel.internal.HttpRequestMessageImpl";
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public static final String REQUEST_MSG_TYPE = "com.ibm.ws.http.channel.internal.HttpRequestMessageImpl";
 
-  public HttpInboundServiceContextImplInstrumentation() {
-    super("liberty");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        REQUEST_MSG_TYPE, "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
-  }
+    public HttpInboundServiceContextImplInstrumentation() {
+        super("liberty");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(namedOneOf("sendResponseBody", "finishResponseMessage"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, new ArrayOfTypeMatcher("com.ibm.wsspi.bytebuffer.WsByteBuffer")))
-            .and(returns(void.class)),
-        HttpInboundServiceContextImplInstrumentation.class.getName() + "$SyncAdviceBuffer");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(REQUEST_MSG_TYPE, "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.ws.http.channel.internal.inbound.HttpInboundServiceContextImpl";
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(namedOneOf("sendResponseBody", "finishResponseMessage"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, new ArrayOfTypeMatcher("com.ibm.wsspi.bytebuffer.WsByteBuffer")))
+                        .and(returns(void.class)),
+                HttpInboundServiceContextImplInstrumentation.class.getName() + "$SyncAdviceBuffer");
+    }
 
-  /**
-   * @see HttpInboundServiceContextImpl#sendResponseBody(WsByteBuffer[])
-   * @see HttpInboundServiceContextImpl#finishResponseMessage(WsByteBuffer[])
-   */
-  static class SyncAdviceBuffer {
-    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-    static BlockingException /* skip */ before(
-        @Advice.This HttpInboundServiceContextImpl thiz,
-        @Advice.Argument(0) WsByteBuffer[] buffers) {
-      final int callDepth =
-          CallDepthThreadLocalMap.incrementCallDepth(HttpInboundServiceContextImpl.class);
-      if (callDepth > 0) {
-        return null;
-      }
-      ContextStore store =
-          InstrumentationContext.get(
-              REQUEST_MSG_TYPE, "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
-      Object o = store.get(thiz.getRequest());
-      if (o == null) {
-        return null;
-      }
-      return LibertyBlockingHelper.syncBufferEnter(thiz, buffers, (AgentSpan) o);
+    @Override
+    public String instrumentedType() {
+        return "com.ibm.ws.http.channel.internal.inbound.HttpInboundServiceContextImpl";
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter BlockingException blockingException,
-        @Advice.Thrown(readOnly = false) Throwable thrown) {
-      CallDepthThreadLocalMap.decrementCallDepth(HttpInboundServiceContextImpl.class);
-      if (blockingException != null) {
-        thrown = blockingException;
-      }
+    /**
+     * @see HttpInboundServiceContextImpl#sendResponseBody(WsByteBuffer[])
+     * @see HttpInboundServiceContextImpl#finishResponseMessage(WsByteBuffer[])
+     */
+    static class SyncAdviceBuffer {
+        @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+        static BlockingException /* skip */ before(
+                @Advice.This HttpInboundServiceContextImpl thiz, @Advice.Argument(0) WsByteBuffer[] buffers) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpInboundServiceContextImpl.class);
+            if (callDepth > 0) {
+                return null;
+            }
+            ContextStore store = InstrumentationContext.get(
+                    REQUEST_MSG_TYPE, "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
+            Object o = store.get(thiz.getRequest());
+            if (o == null) {
+                return null;
+            }
+            return LibertyBlockingHelper.syncBufferEnter(thiz, buffers, (AgentSpan) o);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter BlockingException blockingException, @Advice.Thrown(readOnly = false) Throwable thrown) {
+            CallDepthThreadLocalMap.decrementCallDepth(HttpInboundServiceContextImpl.class);
+            if (blockingException != null) {
+                thrown = blockingException;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/HttpServletExtractAdapter.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/HttpServletExtractAdapter.java
index 85c0417b590..8ef30ed5479 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/HttpServletExtractAdapter.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/HttpServletExtractAdapter.java
@@ -8,57 +8,57 @@
 import javax.servlet.http.HttpServletResponse;
 
 public abstract class HttpServletExtractAdapter<T> implements AgentPropagation.ContextVisitor<T> {
-  abstract Enumeration<String> getHeaderNames(T t);
+    abstract Enumeration<String> getHeaderNames(T t);
 
-  abstract String getHeader(T t, String name);
+    abstract String getHeader(T t, String name);
 
-  @Override
-  public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-    Enumeration<String> headerNames = getHeaderNames(carrier);
-    while (headerNames.hasMoreElements()) {
-      String header = headerNames.nextElement();
-      if (!classifier.accept(header, getHeader(carrier, header))) {
-        break;
-      }
+    @Override
+    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+        Enumeration<String> headerNames = getHeaderNames(carrier);
+        while (headerNames.hasMoreElements()) {
+            String header = headerNames.nextElement();
+            if (!classifier.accept(header, getHeader(carrier, header))) {
+                break;
+            }
+        }
     }
-  }
 
-  public static final class Request extends HttpServletExtractAdapter<HttpServletRequest> {
-    public static final Request GETTER = new Request();
+    public static final class Request extends HttpServletExtractAdapter<HttpServletRequest> {
+        public static final Request GETTER = new Request();
 
-    @Override
-    Enumeration<String> getHeaderNames(HttpServletRequest request) {
-      return request.getHeaderNames();
-    }
+        @Override
+        Enumeration<String> getHeaderNames(HttpServletRequest request) {
+            return request.getHeaderNames();
+        }
 
-    @Override
-    String getHeader(HttpServletRequest request, String name) {
-      return request.getHeader(name);
+        @Override
+        String getHeader(HttpServletRequest request, String name) {
+            return request.getHeader(name);
+        }
     }
-  }
 
-  @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
-  public static final class Response extends HttpServletExtractAdapter<HttpServletResponse> {
-    public static final Response GETTER = new Response();
+    @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
+    public static final class Response extends HttpServletExtractAdapter<HttpServletResponse> {
+        public static final Response GETTER = new Response();
 
-    @Override
-    Enumeration<String> getHeaderNames(HttpServletResponse response) {
-      try {
-        return Collections.enumeration(response.getHeaderNames());
-      } catch (NullPointerException e) {
-        // SRTServletResponse#getHeaderNames() will throw NPE if called after response close.
-        return Collections.emptyEnumeration();
-      }
-    }
+        @Override
+        Enumeration<String> getHeaderNames(HttpServletResponse response) {
+            try {
+                return Collections.enumeration(response.getHeaderNames());
+            } catch (NullPointerException e) {
+                // SRTServletResponse#getHeaderNames() will throw NPE if called after response close.
+                return Collections.emptyEnumeration();
+            }
+        }
 
-    @Override
-    String getHeader(HttpServletResponse request, String name) {
-      try {
-        return request.getHeader(name);
-      } catch (NullPointerException e) {
-        // SRTServletResponse#getHeader(name) will throw NPE if called after response close.
-        return null;
-      }
+        @Override
+        String getHeader(HttpServletResponse request, String name) {
+            try {
+                return request.getHeader(name);
+            } catch (NullPointerException e) {
+                // SRTServletResponse#getHeader(name) will throw NPE if called after response close.
+                return null;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyBlockingHelper.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyBlockingHelper.java
index 719ba39378b..93d9e775420 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyBlockingHelper.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyBlockingHelper.java
@@ -27,461 +27,457 @@
 import org.slf4j.LoggerFactory;
 
 public class LibertyBlockingHelper {
-  private static final Logger log = LoggerFactory.getLogger(LibertyBlockingHelper.class);
-  private static final WsByteBuffer[] EMPTY_BUFFER_ARRAY = new WsByteBuffer[0];
-
-  public static BlockingException syncBufferEnter(
-      HttpInboundServiceContextImpl thiz, WsByteBuffer[] buffers, AgentSpan span) {
-    if (thiz.isMessageSent() || thiz.headersSent()) {
-      return null;
-    }
-
-    if (span == null) {
-      span = activeSpan();
-    }
-    if (span == null) {
-      return null;
-    }
-    RequestContext requestContext = span.getRequestContext();
-    if (requestContext == null) {
-      return null;
-    }
-
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    if (cbp == null) {
-      return null;
-    }
-
-    HttpResponseMessage response = thiz.getResponse();
-
-    BiFunction<RequestContext, Integer, Flow<Void>> respStartedCallback =
-        cbp.getCallback(EVENTS.responseStarted());
-    if (respStartedCallback != null) {
-      respStartedCallback.apply(requestContext, response.getStatusCodeAsInt());
-    }
-    TriConsumer<RequestContext, String, String> headerCallback =
-        cbp.getCallback(EVENTS.responseHeader());
-    Function<RequestContext, Flow<Void>> headersDoneCallback =
-        cbp.getCallback(EVENTS.responseHeaderDone());
-    if (headerCallback == null || headersDoneCallback == null) {
-      return null;
-    }
-    for (HeaderField hf : response.getAllHeaders()) {
-      headerCallback.accept(requestContext, hf.getName(), hf.asString());
-    }
-    Flow<Void> flow = headersDoneCallback.apply(requestContext);
-    Flow.Action action = flow.getAction();
-    if (!(action instanceof Flow.Action.RequestBlockingAction)) {
-      return null;
-    }
-
-    // block
-    response.clear();
-
-    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-    response.setStatusCode(rba.getStatusCode());
-    for (Map.Entry<String, String> e : rba.getExtraHeaders().entrySet()) {
-      response.setHeader(e.getKey(), e.getValue());
-    }
-
-    BlockingContentType bct = rba.getBlockingContentType();
-    final WsByteBuffer[] bufferArray;
-    if (bct != BlockingContentType.NONE) {
-      BlockingActionHelper.TemplateType type =
-          BlockingActionHelper.determineTemplateType(
-              bct, thiz.getRequest().getHeader("Accept").asString());
-      byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
-      response.setHeader("Content-length", Integer.toString(template.length));
-      response.setHeader("Content-type", BlockingActionHelper.getContentType(type));
-      WsByteBufferImpl buffer = new WsByteBufferImpl(ByteBuffer.wrap(template));
-      bufferArray = new WsByteBuffer[] {buffer};
-    } else {
-      bufferArray = EMPTY_BUFFER_ARRAY;
-    }
-
-    BlockingException be = new BlockingException("Blocked response (syncBufferEnter)");
-    try {
-      thiz.reinit(thiz.getTSC()); // parsingComplete()
-      thiz.finishResponseMessage(bufferArray);
-    } catch (Exception e) {
-      log.warn("Error committing blocking response", e);
-    }
-
-    requestContext.getTraceSegment().effectivelyBlocked();
-
-    span.addThrowable(be);
-    span.setTag(Tags.HTTP_STATUS, rba.getStatusCode());
-
-    return be;
-  }
-
-  static class WsByteBufferImpl implements WsByteBuffer {
-    final ByteBuffer bb;
-
-    WsByteBufferImpl(ByteBuffer bb) {
-      this.bb = bb;
-    }
-
-    @Override
-    public boolean setBufferAction(int i) {
-      return false;
-    }
-
-    @Override
-    public byte[] array() {
-      return this.bb.array();
-    }
-
-    @Override
-    public int arrayOffset() {
-      return this.bb.arrayOffset();
-    }
-
-    @Override
-    public WsByteBuffer compact() {
-      this.bb.compact();
-      return this;
-    }
-
-    @Override
-    public int compareTo(Object o) {
-      ByteBuffer other = ((WsByteBuffer) o).getWrappedByteBufferNonSafe();
-      return this.bb.compareTo(other);
-    }
-
-    @Override
-    public char getChar() {
-      return this.bb.getChar();
-    }
-
-    @Override
-    public char getChar(int i) {
-      return this.bb.getChar(i);
-    }
-
-    @Override
-    public WsByteBuffer putChar(char c) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putChar(int i, char c) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putChar(char[] chars) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putChar(char[] chars, int i, int i1) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public double getDouble() {
-      return this.bb.getDouble();
-    }
-
-    @Override
-    public double getDouble(int i) {
-      return this.bb.getDouble(i);
-    }
-
-    @Override
-    public WsByteBuffer putDouble(double v) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putDouble(int i, double v) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public float getFloat() {
-      return this.bb.getFloat();
-    }
-
-    @Override
-    public float getFloat(int i) {
-      return this.bb.getFloat(i);
-    }
-
-    @Override
-    public WsByteBuffer putFloat(float v) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putFloat(int i, float v) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public int getInt() {
-      return this.bb.get();
-    }
-
-    @Override
-    public int getInt(int i) {
-      return this.bb.getInt(i);
-    }
-
-    @Override
-    public WsByteBuffer putInt(int i) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putInt(int i, int i1) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public long getLong() {
-      return this.bb.getLong();
-    }
-
-    @Override
-    public long getLong(int i) {
-      return this.bb.getLong(i);
-    }
-
-    @Override
-    public WsByteBuffer putLong(long l) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putLong(int i, long l) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public short getShort() {
-      return this.bb.getShort();
-    }
-
-    @Override
-    public short getShort(int i) {
-      return this.bb.getShort(i);
-    }
-
-    @Override
-    public WsByteBuffer putShort(short i) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putShort(int i, short i1) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putString(String s) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public boolean hasArray() {
-      return true;
-    }
-
-    @Override
-    public ByteOrder order() {
-      return this.bb.order();
-    }
-
-    @Override
-    public WsByteBuffer order(ByteOrder byteOrder) {
-      this.bb.order(byteOrder);
-      return this;
-    }
-
-    @Override
-    public WsByteBuffer clear() {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public int capacity() {
-      return this.bb.capacity();
-    }
-
-    @Override
-    public WsByteBuffer flip() {
-      this.bb.flip();
-      return this;
-    }
-
-    @Override
-    public byte get() {
-      return this.bb.get();
-    }
-
-    @Override
-    public int position() {
-      return this.bb.position();
-    }
-
-    @Override
-    public WsByteBuffer position(int i) {
-      this.bb.position(i);
-      return this;
-    }
-
-    @Override
-    public WsByteBuffer limit(int i) {
-      this.bb.limit(i);
-      return this;
-    }
-
-    @Override
-    public int limit() {
-      return this.bb.limit();
-    }
-
-    @Override
-    public int remaining() {
-      return this.bb.remaining();
-    }
-
-    @Override
-    public WsByteBuffer mark() {
-      this.bb.mark();
-      return this;
-    }
-
-    @Override
-    public WsByteBuffer reset() {
-      this.bb.reset();
-      return this;
-    }
-
-    @Override
-    public WsByteBuffer rewind() {
-      this.bb.rewind();
-      return this;
-    }
-
-    @Override
-    public boolean isReadOnly() {
-      return true;
-    }
-
-    @Override
-    public boolean hasRemaining() {
-      return this.bb.hasRemaining();
-    }
-
-    @Override
-    public WsByteBuffer duplicate() {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer slice() {
-      return new WsByteBufferImpl(this.bb.slice());
-    }
-
-    @Override
-    public WsByteBuffer get(byte[] bytes) {
-      this.bb.get(bytes);
-      return this;
-    }
-
-    @Override
-    public WsByteBuffer get(byte[] bytes, int i, int i1) {
-      this.bb.get(bytes, i, i1);
-      return this;
-    }
-
-    @Override
-    public byte get(int i) {
-      return this.bb.get(i);
-    }
-
-    @Override
-    public boolean isDirect() {
-      return this.bb.isDirect();
-    }
-
-    @Override
-    public WsByteBuffer put(byte b) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer put(byte[] bytes) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer put(byte[] bytes, int i, int i1) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer put(int i, byte b) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer put(ByteBuffer byteBuffer) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer put(WsByteBuffer wsByteBuffer) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer put(WsByteBuffer[] wsByteBuffers) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public ByteBuffer getWrappedByteBuffer() {
-      return this.bb;
-    }
-
-    @Override
-    public ByteBuffer getWrappedByteBufferNonSafe() {
-      return this.bb;
-    }
-
-    @Override
-    public void setReadOnly(boolean b) {}
-
-    @Override
-    public boolean getReadOnly() {
-      return true;
-    }
-
-    @Override
-    public void removeFromLeakDetection() {}
-
-    @Override
-    public void release() {}
-
-    @Override
-    public int getType() {
-      return 0;
-    }
-
-    private int status = 1;
-
-    @Override
-    public int getStatus() {
-      return this.status;
-    }
-
-    @Override
-    public void setStatus(int i) {
-      this.status = i;
+    private static final Logger log = LoggerFactory.getLogger(LibertyBlockingHelper.class);
+    private static final WsByteBuffer[] EMPTY_BUFFER_ARRAY = new WsByteBuffer[0];
+
+    public static BlockingException syncBufferEnter(
+            HttpInboundServiceContextImpl thiz, WsByteBuffer[] buffers, AgentSpan span) {
+        if (thiz.isMessageSent() || thiz.headersSent()) {
+            return null;
+        }
+
+        if (span == null) {
+            span = activeSpan();
+        }
+        if (span == null) {
+            return null;
+        }
+        RequestContext requestContext = span.getRequestContext();
+        if (requestContext == null) {
+            return null;
+        }
+
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        if (cbp == null) {
+            return null;
+        }
+
+        HttpResponseMessage response = thiz.getResponse();
+
+        BiFunction<RequestContext, Integer, Flow<Void>> respStartedCallback = cbp.getCallback(EVENTS.responseStarted());
+        if (respStartedCallback != null) {
+            respStartedCallback.apply(requestContext, response.getStatusCodeAsInt());
+        }
+        TriConsumer<RequestContext, String, String> headerCallback = cbp.getCallback(EVENTS.responseHeader());
+        Function<RequestContext, Flow<Void>> headersDoneCallback = cbp.getCallback(EVENTS.responseHeaderDone());
+        if (headerCallback == null || headersDoneCallback == null) {
+            return null;
+        }
+        for (HeaderField hf : response.getAllHeaders()) {
+            headerCallback.accept(requestContext, hf.getName(), hf.asString());
+        }
+        Flow<Void> flow = headersDoneCallback.apply(requestContext);
+        Flow.Action action = flow.getAction();
+        if (!(action instanceof Flow.Action.RequestBlockingAction)) {
+            return null;
+        }
+
+        // block
+        response.clear();
+
+        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+        response.setStatusCode(rba.getStatusCode());
+        for (Map.Entry<String, String> e : rba.getExtraHeaders().entrySet()) {
+            response.setHeader(e.getKey(), e.getValue());
+        }
+
+        BlockingContentType bct = rba.getBlockingContentType();
+        final WsByteBuffer[] bufferArray;
+        if (bct != BlockingContentType.NONE) {
+            BlockingActionHelper.TemplateType type = BlockingActionHelper.determineTemplateType(
+                    bct, thiz.getRequest().getHeader("Accept").asString());
+            byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
+            response.setHeader("Content-length", Integer.toString(template.length));
+            response.setHeader("Content-type", BlockingActionHelper.getContentType(type));
+            WsByteBufferImpl buffer = new WsByteBufferImpl(ByteBuffer.wrap(template));
+            bufferArray = new WsByteBuffer[] {buffer};
+        } else {
+            bufferArray = EMPTY_BUFFER_ARRAY;
+        }
+
+        BlockingException be = new BlockingException("Blocked response (syncBufferEnter)");
+        try {
+            thiz.reinit(thiz.getTSC()); // parsingComplete()
+            thiz.finishResponseMessage(bufferArray);
+        } catch (Exception e) {
+            log.warn("Error committing blocking response", e);
+        }
+
+        requestContext.getTraceSegment().effectivelyBlocked();
+
+        span.addThrowable(be);
+        span.setTag(Tags.HTTP_STATUS, rba.getStatusCode());
+
+        return be;
+    }
+
+    static class WsByteBufferImpl implements WsByteBuffer {
+        final ByteBuffer bb;
+
+        WsByteBufferImpl(ByteBuffer bb) {
+            this.bb = bb;
+        }
+
+        @Override
+        public boolean setBufferAction(int i) {
+            return false;
+        }
+
+        @Override
+        public byte[] array() {
+            return this.bb.array();
+        }
+
+        @Override
+        public int arrayOffset() {
+            return this.bb.arrayOffset();
+        }
+
+        @Override
+        public WsByteBuffer compact() {
+            this.bb.compact();
+            return this;
+        }
+
+        @Override
+        public int compareTo(Object o) {
+            ByteBuffer other = ((WsByteBuffer) o).getWrappedByteBufferNonSafe();
+            return this.bb.compareTo(other);
+        }
+
+        @Override
+        public char getChar() {
+            return this.bb.getChar();
+        }
+
+        @Override
+        public char getChar(int i) {
+            return this.bb.getChar(i);
+        }
+
+        @Override
+        public WsByteBuffer putChar(char c) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putChar(int i, char c) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putChar(char[] chars) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putChar(char[] chars, int i, int i1) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public double getDouble() {
+            return this.bb.getDouble();
+        }
+
+        @Override
+        public double getDouble(int i) {
+            return this.bb.getDouble(i);
+        }
+
+        @Override
+        public WsByteBuffer putDouble(double v) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putDouble(int i, double v) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public float getFloat() {
+            return this.bb.getFloat();
+        }
+
+        @Override
+        public float getFloat(int i) {
+            return this.bb.getFloat(i);
+        }
+
+        @Override
+        public WsByteBuffer putFloat(float v) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putFloat(int i, float v) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public int getInt() {
+            return this.bb.get();
+        }
+
+        @Override
+        public int getInt(int i) {
+            return this.bb.getInt(i);
+        }
+
+        @Override
+        public WsByteBuffer putInt(int i) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putInt(int i, int i1) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public long getLong() {
+            return this.bb.getLong();
+        }
+
+        @Override
+        public long getLong(int i) {
+            return this.bb.getLong(i);
+        }
+
+        @Override
+        public WsByteBuffer putLong(long l) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putLong(int i, long l) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public short getShort() {
+            return this.bb.getShort();
+        }
+
+        @Override
+        public short getShort(int i) {
+            return this.bb.getShort(i);
+        }
+
+        @Override
+        public WsByteBuffer putShort(short i) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putShort(int i, short i1) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putString(String s) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public boolean hasArray() {
+            return true;
+        }
+
+        @Override
+        public ByteOrder order() {
+            return this.bb.order();
+        }
+
+        @Override
+        public WsByteBuffer order(ByteOrder byteOrder) {
+            this.bb.order(byteOrder);
+            return this;
+        }
+
+        @Override
+        public WsByteBuffer clear() {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public int capacity() {
+            return this.bb.capacity();
+        }
+
+        @Override
+        public WsByteBuffer flip() {
+            this.bb.flip();
+            return this;
+        }
+
+        @Override
+        public byte get() {
+            return this.bb.get();
+        }
+
+        @Override
+        public int position() {
+            return this.bb.position();
+        }
+
+        @Override
+        public WsByteBuffer position(int i) {
+            this.bb.position(i);
+            return this;
+        }
+
+        @Override
+        public WsByteBuffer limit(int i) {
+            this.bb.limit(i);
+            return this;
+        }
+
+        @Override
+        public int limit() {
+            return this.bb.limit();
+        }
+
+        @Override
+        public int remaining() {
+            return this.bb.remaining();
+        }
+
+        @Override
+        public WsByteBuffer mark() {
+            this.bb.mark();
+            return this;
+        }
+
+        @Override
+        public WsByteBuffer reset() {
+            this.bb.reset();
+            return this;
+        }
+
+        @Override
+        public WsByteBuffer rewind() {
+            this.bb.rewind();
+            return this;
+        }
+
+        @Override
+        public boolean isReadOnly() {
+            return true;
+        }
+
+        @Override
+        public boolean hasRemaining() {
+            return this.bb.hasRemaining();
+        }
+
+        @Override
+        public WsByteBuffer duplicate() {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer slice() {
+            return new WsByteBufferImpl(this.bb.slice());
+        }
+
+        @Override
+        public WsByteBuffer get(byte[] bytes) {
+            this.bb.get(bytes);
+            return this;
+        }
+
+        @Override
+        public WsByteBuffer get(byte[] bytes, int i, int i1) {
+            this.bb.get(bytes, i, i1);
+            return this;
+        }
+
+        @Override
+        public byte get(int i) {
+            return this.bb.get(i);
+        }
+
+        @Override
+        public boolean isDirect() {
+            return this.bb.isDirect();
+        }
+
+        @Override
+        public WsByteBuffer put(byte b) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer put(byte[] bytes) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer put(byte[] bytes, int i, int i1) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer put(int i, byte b) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer put(ByteBuffer byteBuffer) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer put(WsByteBuffer wsByteBuffer) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer put(WsByteBuffer[] wsByteBuffers) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public ByteBuffer getWrappedByteBuffer() {
+            return this.bb;
+        }
+
+        @Override
+        public ByteBuffer getWrappedByteBufferNonSafe() {
+            return this.bb;
+        }
+
+        @Override
+        public void setReadOnly(boolean b) {}
+
+        @Override
+        public boolean getReadOnly() {
+            return true;
+        }
+
+        @Override
+        public void removeFromLeakDetection() {}
+
+        @Override
+        public void release() {}
+
+        @Override
+        public int getType() {
+            return 0;
+        }
+
+        private int status = 1;
+
+        @Override
+        public int getStatus() {
+            return this.status;
+        }
+
+        @Override
+        public void setStatus(int i) {
+            this.status = i;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyDecorator.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyDecorator.java
index 83ba6b19456..9fea7c220b9 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyDecorator.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyDecorator.java
@@ -28,194 +28,192 @@
 import org.slf4j.LoggerFactory;
 
 public class LibertyDecorator
-    extends HttpServerDecorator<
-        HttpServletRequest, HttpServletRequest, HttpServletResponse, HttpServletRequest> {
-
-  public static final Logger log = LoggerFactory.getLogger(LibertyDecorator.class);
-  public static final CharSequence LIBERTY_SERVER = UTF8BytesString.create("liberty-server");
-  public static final LibertyDecorator DECORATE = new LibertyDecorator();
-  public static final CharSequence SERVLET_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-  public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
-  public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
-  public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"liberty"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return LIBERTY_SERVER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpServletRequest> getter() {
-    return Request.GETTER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpServletResponse> responseGetter() {
-    return Response.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return SERVLET_REQUEST;
-  }
-
-  @Override
-  protected String method(final HttpServletRequest request) {
-    return request.getMethod();
-  }
-
-  @Override
-  protected URIDataAdapter url(final HttpServletRequest request) {
-    return new RequestURIDataAdapter(request);
-  }
-
-  @Override
-  protected String peerHostIP(final HttpServletRequest request) {
-    return request.getRemoteAddr();
-  }
-
-  @Override
-  protected int peerPort(final HttpServletRequest request) {
-    return request.getRemotePort();
-  }
-
-  @Override
-  protected int status(final HttpServletResponse response) {
-    return response.getStatus();
-  }
-
-  @Override
-  protected String requestedSessionId(final HttpServletRequest request) {
-    return request.getRequestedSessionId();
-  }
-
-  @Override
-  protected void doOnResponseStatus(AgentSpan span, int status) {
-    Integer currentStatus = (Integer) span.getTag(Tags.HTTP_STATUS);
-    // do not set status if the tag is already there and it's an error span
-    // we may have the status during response blocking, but in that case
-    // the status code is not propagated to the servlet layer
-    if (currentStatus == null || !span.isError()) {
-      super.doOnResponseStatus(span, status);
-    }
-  }
-
-  public void getPath(AgentSpan span, HttpServletRequest request) {
-    if (request != null) {
-      String contextPath = request.getContextPath();
-      String servletPath = request.getServletPath();
-
-      if (null != contextPath && !contextPath.isEmpty()) {
-        span.setTag("servlet.context", contextPath);
-      }
-      if (null != servletPath && !servletPath.isEmpty()) {
-        span.setTag("servlet.path", servletPath);
-      }
-
-      request.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, contextPath);
-      request.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, servletPath);
-    }
-  }
-
-  @Override
-  protected boolean isAppSecOnResponseSeparate() {
-    return true;
-  }
-
-  public void onSRTResponse(AgentSpan span, SRTServletResponse response) {
-    try {
-      doOnSRTResponse(span, response);
-    } catch (BlockingException e) {
-      throw e;
-    } catch (Throwable t) {
-      log.debug("Failed to decorate span on response", t);
-    }
-  }
-
-  private void doOnSRTResponse(AgentSpan span, SRTServletResponse response) {
-    HttpServletRequest req = response.getRequest();
-
-    if (Config.get().isServletPrincipalEnabled() && req.getUserPrincipal() != null) {
-      span.setTag(DDTags.USER_NAME, req.getUserPrincipal().getName());
-    }
-    doOnResponse(span, response);
-
-    Object ex = req.getAttribute("javax.servlet.error.exception");
-    Object report;
-    Object errorMessage;
-    Throwable throwable = null;
-    if (ex instanceof Throwable) {
-      throwable = (Throwable) ex;
-      if (throwable instanceof ServletException) {
-        throwable = ((ServletException) throwable).getRootCause();
-      }
-      onError(span, throwable);
-    } else if ((report = req.getAttribute("ErrorReport")) instanceof WebAppErrorReport) {
-      // overwrite the HTTP status codes, and if a custom error report is provided by liberty server
-      WebAppErrorReport errReport = (WebAppErrorReport) report;
-      onError(span, errReport, throwable);
-    } else if ((errorMessage = req.getAttribute("javax.servlet.error.message")) instanceof String) {
-      span.setError(true);
-      span.setTag(DDTags.ERROR_MSG, (String) errorMessage);
-    }
-  }
-
-  public void onError(AgentSpan span, WebAppErrorReport report, Throwable servletThrowable) {
-    span.setError(true);
-    // make sure the two reported throwables are different throwables
-    if (report.getCause() != null
-        && (servletThrowable == null || servletThrowable.getCause() != report.getCause())) {
-      span.addThrowable(report.getCause());
-    }
-    span.setTag(DDTags.ERROR_MSG, report.getMessage());
-  }
-
-  public static class LibertyBlockResponseFunction implements BlockResponseFunction {
-    private static final Logger log = LoggerFactory.getLogger(LibertyBlockResponseFunction.class);
-    private final HttpServletRequest request;
-
-    public LibertyBlockResponseFunction(HttpServletRequest request) {
-      this.request = request;
+        extends HttpServerDecorator<HttpServletRequest, HttpServletRequest, HttpServletResponse, HttpServletRequest> {
+
+    public static final Logger log = LoggerFactory.getLogger(LibertyDecorator.class);
+    public static final CharSequence LIBERTY_SERVER = UTF8BytesString.create("liberty-server");
+    public static final LibertyDecorator DECORATE = new LibertyDecorator();
+    public static final CharSequence SERVLET_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+    public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
+    public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
+    public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"liberty"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return LIBERTY_SERVER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpServletRequest> getter() {
+        return Request.GETTER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpServletResponse> responseGetter() {
+        return Response.GETTER;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return SERVLET_REQUEST;
+    }
+
+    @Override
+    protected String method(final HttpServletRequest request) {
+        return request.getMethod();
+    }
+
+    @Override
+    protected URIDataAdapter url(final HttpServletRequest request) {
+        return new RequestURIDataAdapter(request);
+    }
+
+    @Override
+    protected String peerHostIP(final HttpServletRequest request) {
+        return request.getRemoteAddr();
+    }
+
+    @Override
+    protected int peerPort(final HttpServletRequest request) {
+        return request.getRemotePort();
+    }
+
+    @Override
+    protected int status(final HttpServletResponse response) {
+        return response.getStatus();
+    }
+
+    @Override
+    protected String requestedSessionId(final HttpServletRequest request) {
+        return request.getRequestedSessionId();
+    }
+
+    @Override
+    protected void doOnResponseStatus(AgentSpan span, int status) {
+        Integer currentStatus = (Integer) span.getTag(Tags.HTTP_STATUS);
+        // do not set status if the tag is already there and it's an error span
+        // we may have the status during response blocking, but in that case
+        // the status code is not propagated to the servlet layer
+        if (currentStatus == null || !span.isError()) {
+            super.doOnResponseStatus(span, status);
+        }
+    }
+
+    public void getPath(AgentSpan span, HttpServletRequest request) {
+        if (request != null) {
+            String contextPath = request.getContextPath();
+            String servletPath = request.getServletPath();
+
+            if (null != contextPath && !contextPath.isEmpty()) {
+                span.setTag("servlet.context", contextPath);
+            }
+            if (null != servletPath && !servletPath.isEmpty()) {
+                span.setTag("servlet.path", servletPath);
+            }
+
+            request.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, contextPath);
+            request.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, servletPath);
+        }
     }
 
     @Override
-    public boolean tryCommitBlockingResponse(
-        TraceSegment segment,
-        int statusCode,
-        BlockingContentType bct,
-        Map<String, String> extraHeaders,
-        String securityResponseId) {
-      if (!(request instanceof SRTServletRequest)) {
-        log.warn("Can't block; request not of type SRTServletRequest");
-        return false;
-      }
-      IExtendedResponse response = ((SRTServletRequest) request).getResponse();
-      if (!(response instanceof HttpServletResponse)) {
-        log.warn("Can't block; response not of type HttpServletResponse");
-        return false;
-      }
-      ServletBlockingHelper.commitBlockingResponse(
-          segment,
-          request,
-          (HttpServletResponse) response,
-          statusCode,
-          bct,
-          extraHeaders,
-          securityResponseId);
-
-      return true;
-    }
-  }
-
-  @Override
-  protected BlockResponseFunction createBlockResponseFunction(
-      HttpServletRequest httpServletRequest, HttpServletRequest connection) {
-    return new LibertyBlockResponseFunction(httpServletRequest);
-  }
+    protected boolean isAppSecOnResponseSeparate() {
+        return true;
+    }
+
+    public void onSRTResponse(AgentSpan span, SRTServletResponse response) {
+        try {
+            doOnSRTResponse(span, response);
+        } catch (BlockingException e) {
+            throw e;
+        } catch (Throwable t) {
+            log.debug("Failed to decorate span on response", t);
+        }
+    }
+
+    private void doOnSRTResponse(AgentSpan span, SRTServletResponse response) {
+        HttpServletRequest req = response.getRequest();
+
+        if (Config.get().isServletPrincipalEnabled() && req.getUserPrincipal() != null) {
+            span.setTag(DDTags.USER_NAME, req.getUserPrincipal().getName());
+        }
+        doOnResponse(span, response);
+
+        Object ex = req.getAttribute("javax.servlet.error.exception");
+        Object report;
+        Object errorMessage;
+        Throwable throwable = null;
+        if (ex instanceof Throwable) {
+            throwable = (Throwable) ex;
+            if (throwable instanceof ServletException) {
+                throwable = ((ServletException) throwable).getRootCause();
+            }
+            onError(span, throwable);
+        } else if ((report = req.getAttribute("ErrorReport")) instanceof WebAppErrorReport) {
+            // overwrite the HTTP status codes, and if a custom error report is provided by liberty server
+            WebAppErrorReport errReport = (WebAppErrorReport) report;
+            onError(span, errReport, throwable);
+        } else if ((errorMessage = req.getAttribute("javax.servlet.error.message")) instanceof String) {
+            span.setError(true);
+            span.setTag(DDTags.ERROR_MSG, (String) errorMessage);
+        }
+    }
+
+    public void onError(AgentSpan span, WebAppErrorReport report, Throwable servletThrowable) {
+        span.setError(true);
+        // make sure the two reported throwables are different throwables
+        if (report.getCause() != null
+                && (servletThrowable == null || servletThrowable.getCause() != report.getCause())) {
+            span.addThrowable(report.getCause());
+        }
+        span.setTag(DDTags.ERROR_MSG, report.getMessage());
+    }
+
+    public static class LibertyBlockResponseFunction implements BlockResponseFunction {
+        private static final Logger log = LoggerFactory.getLogger(LibertyBlockResponseFunction.class);
+        private final HttpServletRequest request;
+
+        public LibertyBlockResponseFunction(HttpServletRequest request) {
+            this.request = request;
+        }
+
+        @Override
+        public boolean tryCommitBlockingResponse(
+                TraceSegment segment,
+                int statusCode,
+                BlockingContentType bct,
+                Map<String, String> extraHeaders,
+                String securityResponseId) {
+            if (!(request instanceof SRTServletRequest)) {
+                log.warn("Can't block; request not of type SRTServletRequest");
+                return false;
+            }
+            IExtendedResponse response = ((SRTServletRequest) request).getResponse();
+            if (!(response instanceof HttpServletResponse)) {
+                log.warn("Can't block; response not of type HttpServletResponse");
+                return false;
+            }
+            ServletBlockingHelper.commitBlockingResponse(
+                    segment,
+                    request,
+                    (HttpServletResponse) response,
+                    statusCode,
+                    bct,
+                    extraHeaders,
+                    securityResponseId);
+
+            return true;
+        }
+    }
+
+    @Override
+    protected BlockResponseFunction createBlockResponseFunction(
+            HttpServletRequest httpServletRequest, HttpServletRequest connection) {
+        return new LibertyBlockResponseFunction(httpServletRequest);
+    }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java
index 162a13970f4..eef55b80844 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java
@@ -40,166 +40,161 @@
 
 @AutoService(InstrumenterModule.class)
 public final class LibertyServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public LibertyServerInstrumentation() {
-    super("liberty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.ws.webcontainer.filter.WebAppFilterManager";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".HttpServletExtractAdapter",
-      packageName + ".HttpServletExtractAdapter$Request",
-      packageName + ".HttpServletExtractAdapter$Response",
-      packageName + ".LibertyDecorator",
-      packageName + ".LibertyDecorator$LibertyBlockResponseFunction",
-      packageName + ".RequestURIDataAdapter",
-      "datadog.trace.instrumentation.servlet.ServletBlockingHelper",
-      packageName + ".RequestMessageFromServletRequestHelper",
-    };
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        REQUEST_MSG_TYPE, "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("invokeFilters"))
-            .and(takesArgument(0, named("javax.servlet.ServletRequest")))
-            .and(takesArgument(1, named("javax.servlet.ServletResponse")))
-            .and(takesArgument(2, named("com.ibm.wsspi.webcontainer.servlet.IServletContext")))
-            .and(takesArgument(3, named("com.ibm.wsspi.webcontainer.RequestProcessor")))
-            .and(takesArgument(4, EnumSet.class))
-            .and(takesArgument(5, named("com.ibm.wsspi.http.HttpInboundConnection"))),
-        LibertyServerInstrumentation.class.getName() + "$ContextTrackingAdvice",
-        LibertyServerInstrumentation.class.getName() + "$HandleRequestAdvice");
-  }
-
-  @AppliesOn(CONTEXT_TRACKING)
-  @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
-  public static class ContextTrackingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Local("parentScope") ContextScope parentScope,
-        @Advice.Argument(0) ServletRequest req) {
-      if (!(req instanceof SRTServletRequest)) {
-        return;
-      }
-      SRTServletRequest request = (SRTServletRequest) req;
-      try {
-        if (request.getAttribute(DD_CONTEXT_ATTRIBUTE) instanceof Context) {
-          return; // skip re-entry
-        }
-      } catch (NullPointerException e) {
-      }
-      Context parentContext = DECORATE.extract(request);
-      request.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
-      parentScope = parentContext.attach();
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public LibertyServerInstrumentation() {
+        super("liberty");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Local("parentScope") ContextScope parentScope) {
-      if (parentScope != null) parentScope.close();
+    @Override
+    public String instrumentedType() {
+        return "com.ibm.ws.webcontainer.filter.WebAppFilterManager";
     }
-  }
-
-  @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
-  public static class HandleRequestAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-    public static boolean /* skip */ onEnter(
-        @Advice.Local("contextScope") ContextScope scope,
-        @Advice.Argument(0) ServletRequest req,
-        @Advice.Argument(1) ServletResponse resp) {
-      if (!(req instanceof SRTServletRequest)) return false;
-      SRTServletRequest request = (SRTServletRequest) req;
-
-      // if we try to get an attribute that doesn't exist open liberty might complain with an
-      // exception
-      try {
-        Object existingContext = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-        if (existingContext instanceof Context) {
-          scope = ((Context) existingContext).attach();
-          return false;
-        }
-      } catch (NullPointerException e) {
-      }
-
-      Object parentContextObj = request.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
-      final Context parentContext =
-          (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
-      final Context context = DECORATE.startSpan(request, parentContext);
-      scope = context.attach();
-      final AgentSpan span = fromContext(context);
-      if (Config.get().isJeeSplitByDeployment()) {
-        final IWebAppDispatcherContext dispatcherContext = request.getWebAppDispatcherContext();
-        if (dispatcherContext != null) {
-          final WebApp webapp = dispatcherContext.getWebApp();
-          if (webapp != null) {
-            final ClassLoader cl = webapp.getClassLoader();
-            if (cl != null) {
-              ClassloaderConfigurationOverrides.maybeEnrichSpan(span, cl);
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".HttpServletExtractAdapter",
+            packageName + ".HttpServletExtractAdapter$Request",
+            packageName + ".HttpServletExtractAdapter$Response",
+            packageName + ".LibertyDecorator",
+            packageName + ".LibertyDecorator$LibertyBlockResponseFunction",
+            packageName + ".RequestURIDataAdapter",
+            "datadog.trace.instrumentation.servlet.ServletBlockingHelper",
+            packageName + ".RequestMessageFromServletRequestHelper",
+        };
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(REQUEST_MSG_TYPE, "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("invokeFilters"))
+                        .and(takesArgument(0, named("javax.servlet.ServletRequest")))
+                        .and(takesArgument(1, named("javax.servlet.ServletResponse")))
+                        .and(takesArgument(2, named("com.ibm.wsspi.webcontainer.servlet.IServletContext")))
+                        .and(takesArgument(3, named("com.ibm.wsspi.webcontainer.RequestProcessor")))
+                        .and(takesArgument(4, EnumSet.class))
+                        .and(takesArgument(5, named("com.ibm.wsspi.http.HttpInboundConnection"))),
+                LibertyServerInstrumentation.class.getName() + "$ContextTrackingAdvice",
+                LibertyServerInstrumentation.class.getName() + "$HandleRequestAdvice");
+    }
+
+    @AppliesOn(CONTEXT_TRACKING)
+    @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
+    public static class ContextTrackingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Local("parentScope") ContextScope parentScope, @Advice.Argument(0) ServletRequest req) {
+            if (!(req instanceof SRTServletRequest)) {
+                return;
+            }
+            SRTServletRequest request = (SRTServletRequest) req;
+            try {
+                if (request.getAttribute(DD_CONTEXT_ATTRIBUTE) instanceof Context) {
+                    return; // skip re-entry
+                }
+            } catch (NullPointerException e) {
             }
-          }
+            Context parentContext = DECORATE.extract(request);
+            request.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
+            parentScope = parentContext.attach();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Local("parentScope") ContextScope parentScope) {
+            if (parentScope != null) parentScope.close();
         }
-      }
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, request, request, parentContext);
-      request.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
-      request.setAttribute(
-          CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
-      request.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
-
-      if (ActiveSubsystems.APPSEC_ACTIVE) {
-        ContextStore store =
-            InstrumentationContext.get(
-                REQUEST_MSG_TYPE, "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
-        // Provide the span to lower layers
-        // The span is associated with the c.i.w.http.channel.internal.HttpRequestMessageImpl object
-        store.put(RequestMessageFromServletRequestHelper.getHttpRequestMessage(request), span);
-      }
-
-      Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
-      if (rba != null) {
-        ServletBlockingHelper.commitBlockingResponse(
-            span.getRequestContext().getTraceSegment(), request, (SRTServletResponse) resp, rba);
-        // prevent caching of the handler
-        req.setAttribute(
-            "javax.servlet.error.status_code", ((SRTServletResponse) resp).getStatusCode());
-        span.getRequestContext().getTraceSegment().effectivelyBlocked();
-        return true; // skip method body
-      }
-
-      return false;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(
-        @Advice.Local("contextScope") final ContextScope scope,
-        @Advice.Argument(value = 0) ServletRequest req) {
-      if (!(req instanceof SRTServletRequest)) return;
-      SRTServletRequest request = (SRTServletRequest) req;
-
-      if (scope != null) {
-        // we cannot get path at the start because the path/context attributes are not yet
-        // initialized
-        // this has the unfortunate consequence that service name (as set via the tag interceptor)
-        // of the top span won't match that of its child spans, because it's instead the original
-        // one that will propagate
-        DECORATE.getPath(fromContext(scope.context()), request);
-        scope.close();
-      }
+    @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
+    public static class HandleRequestAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+        public static boolean /* skip */ onEnter(
+                @Advice.Local("contextScope") ContextScope scope,
+                @Advice.Argument(0) ServletRequest req,
+                @Advice.Argument(1) ServletResponse resp) {
+            if (!(req instanceof SRTServletRequest)) return false;
+            SRTServletRequest request = (SRTServletRequest) req;
+
+            // if we try to get an attribute that doesn't exist open liberty might complain with an
+            // exception
+            try {
+                Object existingContext = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+                if (existingContext instanceof Context) {
+                    scope = ((Context) existingContext).attach();
+                    return false;
+                }
+            } catch (NullPointerException e) {
+            }
+
+            Object parentContextObj = request.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
+            final Context parentContext =
+                    (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
+            final Context context = DECORATE.startSpan(request, parentContext);
+            scope = context.attach();
+            final AgentSpan span = fromContext(context);
+            if (Config.get().isJeeSplitByDeployment()) {
+                final IWebAppDispatcherContext dispatcherContext = request.getWebAppDispatcherContext();
+                if (dispatcherContext != null) {
+                    final WebApp webapp = dispatcherContext.getWebApp();
+                    if (webapp != null) {
+                        final ClassLoader cl = webapp.getClassLoader();
+                        if (cl != null) {
+                            ClassloaderConfigurationOverrides.maybeEnrichSpan(span, cl);
+                        }
+                    }
+                }
+            }
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, request, request, parentContext);
+            request.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
+            request.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+            request.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+
+            if (ActiveSubsystems.APPSEC_ACTIVE) {
+                ContextStore store = InstrumentationContext.get(
+                        REQUEST_MSG_TYPE, "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
+                // Provide the span to lower layers
+                // The span is associated with the c.i.w.http.channel.internal.HttpRequestMessageImpl object
+                store.put(RequestMessageFromServletRequestHelper.getHttpRequestMessage(request), span);
+            }
+
+            Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
+            if (rba != null) {
+                ServletBlockingHelper.commitBlockingResponse(
+                        span.getRequestContext().getTraceSegment(), request, (SRTServletResponse) resp, rba);
+                // prevent caching of the handler
+                req.setAttribute("javax.servlet.error.status_code", ((SRTServletResponse) resp).getStatusCode());
+                span.getRequestContext().getTraceSegment().effectivelyBlocked();
+                return true; // skip method body
+            }
+
+            return false;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(
+                @Advice.Local("contextScope") final ContextScope scope,
+                @Advice.Argument(value = 0) ServletRequest req) {
+            if (!(req instanceof SRTServletRequest)) return;
+            SRTServletRequest request = (SRTServletRequest) req;
+
+            if (scope != null) {
+                // we cannot get path at the start because the path/context attributes are not yet
+                // initialized
+                // this has the unfortunate consequence that service name (as set via the tag interceptor)
+                // of the top span won't match that of its child spans, because it's instead the original
+                // one that will propagate
+                DECORATE.getPath(fromContext(scope.context()), request);
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ParameterCollector.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ParameterCollector.java
index dc894ad3fc5..9f51dd7cdb5 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ParameterCollector.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ParameterCollector.java
@@ -6,46 +6,46 @@
 
 public interface ParameterCollector {
 
-  boolean isEmpty();
+    boolean isEmpty();
 
-  void put(String key, String[] value);
+    void put(String key, String[] value);
 
-  Map<String, String[]> getMap();
+    Map<String, String[]> getMap();
 
-  class ParameterCollectorNoop implements ParameterCollector {
-    public static final ParameterCollector INSTANCE = new ParameterCollectorNoop();
+    class ParameterCollectorNoop implements ParameterCollector {
+        public static final ParameterCollector INSTANCE = new ParameterCollectorNoop();
 
-    @Override
-    public boolean isEmpty() {
-      return true;
-    }
+        @Override
+        public boolean isEmpty() {
+            return true;
+        }
 
-    @Override
-    public void put(String key, String[] value) {}
+        @Override
+        public void put(String key, String[] value) {}
 
-    @Override
-    public Map<String, String[]> getMap() {
-      return Collections.emptyMap();
+        @Override
+        public Map<String, String[]> getMap() {
+            return Collections.emptyMap();
+        }
     }
-  }
 
-  class ParameterCollectorImpl implements ParameterCollector {
-    public Map<String, String[]> map;
+    class ParameterCollectorImpl implements ParameterCollector {
+        public Map<String, String[]> map;
 
-    public boolean isEmpty() {
-      return map == null;
-    }
+        public boolean isEmpty() {
+            return map == null;
+        }
 
-    public void put(String key, String[] value) {
-      if (map == null) {
-        map = new HashMap<>();
-      }
-      map.put(key, value);
-    }
+        public void put(String key, String[] value) {
+            if (map == null) {
+                map = new HashMap<>();
+            }
+            map.put(key, value);
+        }
 
-    @Override
-    public Map<String, String[]> getMap() {
-      return map;
+        @Override
+        public Map<String, String[]> getMap() {
+            return map;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ParseParametersInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ParseParametersInstrumentation.java
index 877fc5e361e..4cdd15f72da 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ParseParametersInstrumentation.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ParseParametersInstrumentation.java
@@ -36,166 +36,162 @@
 
 @AutoService(InstrumenterModule.class)
 public class ParseParametersInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
-  public ParseParametersInstrumentation() {
-    super("liberty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.ws.webcontainer.srt.SRTServletRequest";
-  }
-
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new ParseParametersVisitorWrapper());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("parseParameters"))
-            .and(isPublic().or(isProtected()))
-            .and(takesArguments(0))
-            .and(returns(void.class)),
-        ParseParametersInstrumentation.class.getName() + "$ParseParametersAdvice");
-  }
-
-  static class ParseParametersAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void before(
-        @Advice.Local("collector") ParameterCollector collector,
-        @Advice.Local("reqCtx") RequestContext reqCtx) {
-      AgentSpan agentSpan = AgentTracer.activeSpan();
-      if (agentSpan != null) {
-        RequestContext requestContext = agentSpan.getRequestContext();
-        if (requestContext != null && requestContext.getData(RequestContextSlot.APPSEC) != null) {
-          reqCtx = requestContext;
-          collector = new ParameterCollector.ParameterCollectorImpl();
-          return;
-        }
-      }
-      // this variable is used in the custom instrumentation below
-      collector = ParameterCollector.ParameterCollectorNoop.INSTANCE;
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
+    public ParseParametersInstrumentation() {
+        super("liberty");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Local("collector") ParameterCollector collector,
-        @Advice.Local("reqCtx") RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null || reqCtx == null || collector.isEmpty()) {
-        return;
-      }
-
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
-
-      Flow<Void> flow = callback.apply(reqCtx, collector.getMap());
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-          t = new BlockingException("Blocked request (for SRTServletRequest/parseParameters)");
-          reqCtx.getTraceSegment().effectivelyBlocked();
-        }
-      }
-    }
-  }
-
-  public static class ParseParametersVisitorWrapper implements AsmVisitorWrapper {
     @Override
-    public int mergeWriter(int flags) {
-      return flags | ClassWriter.COMPUTE_MAXS;
+    public String instrumentedType() {
+        return "com.ibm.ws.webcontainer.srt.SRTServletRequest";
     }
 
     @Override
-    public int mergeReader(int flags) {
-      return flags;
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new ParseParametersVisitorWrapper());
     }
 
     @Override
-    public ClassVisitor wrap(
-        TypeDescription instrumentedType,
-        ClassVisitor classVisitor,
-        Implementation.Context implementationContext,
-        TypePool typePool,
-        FieldList<FieldDescription.InDefinedShape> fields,
-        MethodList<?> methods,
-        int writerFlags,
-        int readerFlags) {
-      return new RequestClassVisitor(Opcodes.ASM8, classVisitor);
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("parseParameters"))
+                        .and(isPublic().or(isProtected()))
+                        .and(takesArguments(0))
+                        .and(returns(void.class)),
+                ParseParametersInstrumentation.class.getName() + "$ParseParametersAdvice");
     }
-  }
 
-  public static class RequestClassVisitor extends ClassVisitor {
-    public RequestClassVisitor(int api, ClassVisitor cv) {
-      super(api, cv);
-    }
+    static class ParseParametersAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void before(
+                @Advice.Local("collector") ParameterCollector collector,
+                @Advice.Local("reqCtx") RequestContext reqCtx) {
+            AgentSpan agentSpan = AgentTracer.activeSpan();
+            if (agentSpan != null) {
+                RequestContext requestContext = agentSpan.getRequestContext();
+                if (requestContext != null && requestContext.getData(RequestContextSlot.APPSEC) != null) {
+                    reqCtx = requestContext;
+                    collector = new ParameterCollector.ParameterCollectorImpl();
+                    return;
+                }
+            }
+            // this variable is used in the custom instrumentation below
+            collector = ParameterCollector.ParameterCollectorNoop.INSTANCE;
+        }
 
-    @Override
-    public MethodVisitor visitMethod(
-        int access, String name, String descriptor, String signature, String[] exceptions) {
-      MethodVisitor superMv = super.visitMethod(access, name, descriptor, signature, exceptions);
-      if ("parseParameters".equals(name) && "()V".equals(descriptor)) {
-        return new ParseParametersMethodVisitor(api, superMv);
-      } else {
-        return superMv;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Local("collector") ParameterCollector collector,
+                @Advice.Local("reqCtx") RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null || reqCtx == null || collector.isEmpty()) {
+                return;
+            }
+
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
+
+            Flow<Void> flow = callback.apply(reqCtx, collector.getMap());
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                    t = new BlockingException("Blocked request (for SRTServletRequest/parseParameters)");
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                }
+            }
+        }
     }
-  }
 
-  public static class ParseParametersMethodVisitor extends MethodVisitor {
-    private boolean afterGetParametersCall;
+    public static class ParseParametersVisitorWrapper implements AsmVisitorWrapper {
+        @Override
+        public int mergeWriter(int flags) {
+            return flags | ClassWriter.COMPUTE_MAXS;
+        }
 
-    public ParseParametersMethodVisitor(int api, MethodVisitor superMv) {
-      super(api, superMv);
+        @Override
+        public int mergeReader(int flags) {
+            return flags;
+        }
+
+        @Override
+        public ClassVisitor wrap(
+                TypeDescription instrumentedType,
+                ClassVisitor classVisitor,
+                Implementation.Context implementationContext,
+                TypePool typePool,
+                FieldList<FieldDescription.InDefinedShape> fields,
+                MethodList<?> methods,
+                int writerFlags,
+                int readerFlags) {
+            return new RequestClassVisitor(Opcodes.ASM8, classVisitor);
+        }
     }
 
-    @Override
-    public void visitMethodInsn(
-        int opcode, String owner, String name, String descriptor, boolean isInterface) {
-      if (!afterGetParametersCall) {
-        if (opcode == Opcodes.INVOKEVIRTUAL
-            && name.equals("getParameters")
-            && owner.equals("com/ibm/ws/webcontainer/srt/SRTServletRequestThreadData")
-            && descriptor.equals("()Ljava/util/Map;")) {
-          afterGetParametersCall = true;
+    public static class RequestClassVisitor extends ClassVisitor {
+        public RequestClassVisitor(int api, ClassVisitor cv) {
+            super(api, cv);
         }
-      } else if (afterGetParametersCall) {
-        afterGetParametersCall = false;
-        if (opcode == Opcodes.INVOKEINTERFACE
-            && owner.equals("java/util/Map")
-            && name.equals("put")
-            && descriptor.equals("(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;")) {
-          super.visitVarInsn(Opcodes.ALOAD, 1);
-          // stack: ..., key, value, collParams
-          super.visitInsn(Opcodes.DUP_X2);
-          // stack: ..., collParams, key, value, collParams
-          super.visitInsn(Opcodes.POP);
-          // stack: ..., collParams, key, value
-          super.visitInsn(Opcodes.DUP2_X1);
-          // stack: ..., key, value, collParams, key, value
-          super.visitMethodInsn(
-              Opcodes.INVOKEINTERFACE,
-              Type.getInternalName(ParameterCollector.class),
-              "put",
-              "(Ljava/lang/String;[Ljava/lang/String;)V",
-              true);
-          // original stack
+
+        @Override
+        public MethodVisitor visitMethod(
+                int access, String name, String descriptor, String signature, String[] exceptions) {
+            MethodVisitor superMv = super.visitMethod(access, name, descriptor, signature, exceptions);
+            if ("parseParameters".equals(name) && "()V".equals(descriptor)) {
+                return new ParseParametersMethodVisitor(api, superMv);
+            } else {
+                return superMv;
+            }
         }
-      }
+    }
 
-      super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+    public static class ParseParametersMethodVisitor extends MethodVisitor {
+        private boolean afterGetParametersCall;
+
+        public ParseParametersMethodVisitor(int api, MethodVisitor superMv) {
+            super(api, superMv);
+        }
+
+        @Override
+        public void visitMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) {
+            if (!afterGetParametersCall) {
+                if (opcode == Opcodes.INVOKEVIRTUAL
+                        && name.equals("getParameters")
+                        && owner.equals("com/ibm/ws/webcontainer/srt/SRTServletRequestThreadData")
+                        && descriptor.equals("()Ljava/util/Map;")) {
+                    afterGetParametersCall = true;
+                }
+            } else if (afterGetParametersCall) {
+                afterGetParametersCall = false;
+                if (opcode == Opcodes.INVOKEINTERFACE
+                        && owner.equals("java/util/Map")
+                        && name.equals("put")
+                        && descriptor.equals("(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;")) {
+                    super.visitVarInsn(Opcodes.ALOAD, 1);
+                    // stack: ..., key, value, collParams
+                    super.visitInsn(Opcodes.DUP_X2);
+                    // stack: ..., collParams, key, value, collParams
+                    super.visitInsn(Opcodes.POP);
+                    // stack: ..., collParams, key, value
+                    super.visitInsn(Opcodes.DUP2_X1);
+                    // stack: ..., key, value, collParams, key, value
+                    super.visitMethodInsn(
+                            Opcodes.INVOKEINTERFACE,
+                            Type.getInternalName(ParameterCollector.class),
+                            "put",
+                            "(Ljava/lang/String;[Ljava/lang/String;)V",
+                            true);
+                    // original stack
+                }
+            }
+
+            super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ParsePostDataInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ParsePostDataInstrumentation.java
index 4fa50a6a58f..2d0dbf807fc 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ParsePostDataInstrumentation.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ParsePostDataInstrumentation.java
@@ -26,59 +26,57 @@
 
 @AutoService(InstrumenterModule.class)
 public class ParsePostDataInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public ParsePostDataInstrumentation() {
-    super("liberty");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public ParsePostDataInstrumentation() {
+        super("liberty");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "com.ibm.ws.webcontainer.srt.SRTServletRequest",
-      "com.ibm.ws.webcontainer31.srt.SRTServletRequest31",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "com.ibm.ws.webcontainer.srt.SRTServletRequest", "com.ibm.ws.webcontainer31.srt.SRTServletRequest31",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("parsePostData"))
-            .and(isPublic().or(isProtected()))
-            .and(takesArguments(0))
-            .and(returns(Hashtable.class)),
-        ParsePostDataInstrumentation.class.getName() + "$ParsePostDataAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("parsePostData"))
+                        .and(isPublic().or(isProtected()))
+                        .and(takesArguments(0))
+                        .and(returns(Hashtable.class)),
+                ParsePostDataInstrumentation.class.getName() + "$ParsePostDataAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  static class ParsePostDataAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return Hashtable<String, String[]> retval,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (retval == null || retval.isEmpty() || t != null) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    static class ParsePostDataAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Return Hashtable<String, String[]> retval,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (retval == null || retval.isEmpty() || t != null) {
+                return;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
 
-      Flow<Void> flow = callback.apply(reqCtx, retval);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-          t = new BlockingException("Blocked request (for SRTServletRequest/parsePostData)");
-          reqCtx.getTraceSegment().effectivelyBlocked();
+            Flow<Void> flow = callback.apply(reqCtx, retval);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                    t = new BlockingException("Blocked request (for SRTServletRequest/parsePostData)");
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/PartHelper.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/PartHelper.java
index 5fb6e4403dc..62f5c9e4f10 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/PartHelper.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/PartHelper.java
@@ -9,68 +9,68 @@
 
 public class PartHelper {
 
-  public static List<String> extractFilenames(Collection<?> parts) {
-    if (parts == null || parts.isEmpty()) {
-      return Collections.emptyList();
-    }
-    Class<?> partClass = parts.iterator().next().getClass();
-    Method getSubmittedFileName = resolveMethod(partClass, "getSubmittedFileName");
-    Method getHeader = resolveMethod(partClass, "getHeader", String.class);
+    public static List<String> extractFilenames(Collection<?> parts) {
+        if (parts == null || parts.isEmpty()) {
+            return Collections.emptyList();
+        }
+        Class<?> partClass = parts.iterator().next().getClass();
+        Method getSubmittedFileName = resolveMethod(partClass, "getSubmittedFileName");
+        Method getHeader = resolveMethod(partClass, "getHeader", String.class);
 
-    List<String> filenames = new ArrayList<>();
-    for (Object part : parts) {
-      String name = getSubmittedFilename(getSubmittedFileName, part);
-      if (name == null) {
-        name = getFilenameFromContentDisposition(getHeader, part);
-      }
-      if (name != null && !name.isEmpty()) {
-        filenames.add(name);
-      }
+        List<String> filenames = new ArrayList<>();
+        for (Object part : parts) {
+            String name = getSubmittedFilename(getSubmittedFileName, part);
+            if (name == null) {
+                name = getFilenameFromContentDisposition(getHeader, part);
+            }
+            if (name != null && !name.isEmpty()) {
+                filenames.add(name);
+            }
+        }
+        return filenames;
     }
-    return filenames;
-  }
 
-  private static Method resolveMethod(Class<?> clazz, String name, Class<?>... params) {
-    try {
-      return clazz.getMethod(name, params);
-    } catch (Exception ignored) {
-      return null;
+    private static Method resolveMethod(Class<?> clazz, String name, Class<?>... params) {
+        try {
+            return clazz.getMethod(name, params);
+        } catch (Exception ignored) {
+            return null;
+        }
     }
-  }
 
-  private static String getSubmittedFilename(Method method, Object part) {
-    if (method == null) {
-      return null;
-    }
-    try {
-      return (String) method.invoke(part);
-    } catch (Exception ignored) {
-      return null;
+    private static String getSubmittedFilename(Method method, Object part) {
+        if (method == null) {
+            return null;
+        }
+        try {
+            return (String) method.invoke(part);
+        } catch (Exception ignored) {
+            return null;
+        }
     }
-  }
 
-  @SuppressForbidden // split on single-character uses a fast path
-  private static String getFilenameFromContentDisposition(Method getHeader, Object part) {
-    if (getHeader == null) {
-      return null;
-    }
-    try {
-      String cd = (String) getHeader.invoke(part, "content-disposition");
-      if (cd == null) {
-        return null;
-      }
-      for (String tok : cd.split(";")) {
-        tok = tok.trim();
-        if (tok.startsWith("filename=")) {
-          String name = tok.substring(9).trim();
-          if (name.startsWith("\"") && name.endsWith("\"")) {
-            name = name.substring(1, name.length() - 1);
-          }
-          return name;
+    @SuppressForbidden // split on single-character uses a fast path
+    private static String getFilenameFromContentDisposition(Method getHeader, Object part) {
+        if (getHeader == null) {
+            return null;
         }
-      }
-    } catch (Exception ignored) {
+        try {
+            String cd = (String) getHeader.invoke(part, "content-disposition");
+            if (cd == null) {
+                return null;
+            }
+            for (String tok : cd.split(";")) {
+                tok = tok.trim();
+                if (tok.startsWith("filename=")) {
+                    String name = tok.substring(9).trim();
+                    if (name.startsWith("\"") && name.endsWith("\"")) {
+                        name = name.substring(1, name.length() - 1);
+                    }
+                    return name;
+                }
+            }
+        } catch (Exception ignored) {
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/RequestFinishInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/RequestFinishInstrumentation.java
index 5721601b61b..9ebf0ceeecd 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/RequestFinishInstrumentation.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/RequestFinishInstrumentation.java
@@ -19,52 +19,52 @@
 
 @AutoService(InstrumenterModule.class)
 public class RequestFinishInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public RequestFinishInstrumentation() {
-    super("liberty");
-  }
+    public RequestFinishInstrumentation() {
+        super("liberty");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.ws.webcontainer.srt.SRTServletRequest";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.ibm.ws.webcontainer.srt.SRTServletRequest";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("finish").and(takesNoArguments()),
-        RequestFinishInstrumentation.class.getName() + "$RequestFinishAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("finish").and(takesNoArguments()),
+                RequestFinishInstrumentation.class.getName() + "$RequestFinishAdvice");
+    }
 
-  /** The function finish is called when a server receives and sends out a request */
-  @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
-  public static class RequestFinishAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(@Advice.This SRTServletRequest req) {
-      IExtendedResponse resp = req.getResponse();
+    /** The function finish is called when a server receives and sends out a request */
+    @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
+    public static class RequestFinishAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.This SRTServletRequest req) {
+            IExtendedResponse resp = req.getResponse();
 
-      // this should be a servlet response
-      if (resp instanceof SRTServletResponse) {
-        SRTServletResponse httpResp = (SRTServletResponse) resp;
-        Object contextObj = null;
-        try {
-          contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-        } catch (NullPointerException e) {
-          // OpenLiberty will throw NPE on getAttribute if the response has already been closed.
-        }
+            // this should be a servlet response
+            if (resp instanceof SRTServletResponse) {
+                SRTServletResponse httpResp = (SRTServletResponse) resp;
+                Object contextObj = null;
+                try {
+                    contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+                } catch (NullPointerException e) {
+                    // OpenLiberty will throw NPE on getAttribute if the response has already been closed.
+                }
 
-        if (contextObj instanceof Context) {
-          req.setAttribute(DD_CONTEXT_ATTRIBUTE, null);
-          final Context context = (Context) contextObj;
-          final AgentSpan span = fromContext(context);
-          if (span != null) {
-            DECORATE.onSRTResponse(span, httpResp);
-            DECORATE.beforeFinish(context);
-            span.finish();
-          }
+                if (contextObj instanceof Context) {
+                    req.setAttribute(DD_CONTEXT_ATTRIBUTE, null);
+                    final Context context = (Context) contextObj;
+                    final AgentSpan span = fromContext(context);
+                    if (span != null) {
+                        DECORATE.onSRTResponse(span, httpResp);
+                        DECORATE.beforeFinish(context);
+                        span.finish();
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/RequestMessageFromServletRequestHelper.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/RequestMessageFromServletRequestHelper.java
index fb5bd70780e..81df2d52510 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/RequestMessageFromServletRequestHelper.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/RequestMessageFromServletRequestHelper.java
@@ -10,33 +10,29 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 public class RequestMessageFromServletRequestHelper {
-  private static final ConcurrentHashMap<Class<?>, MethodHandle> FIELD_CACHE =
-      new ConcurrentHashMap<>();
+    private static final ConcurrentHashMap<Class<?>, MethodHandle> FIELD_CACHE = new ConcurrentHashMap<>();
 
-  public static Object getHttpRequestMessage(SRTServletRequest request) {
-    IRequest iRequest = request.getIRequest();
-    if (iRequest instanceof IRequestExtended) {
-      HttpRequest transportRequest =
-          ((IRequestExtended) iRequest).getHttpInboundConnection().getRequest();
-      try {
-        MethodHandle messageGetter =
-            FIELD_CACHE.computeIfAbsent(
-                transportRequest.getClass(),
-                clazz -> {
-                  Field messageField;
-                  try {
-                    messageField = clazz.getDeclaredField("message");
-                    messageField.setAccessible(true);
-                    return MethodHandles.lookup().unreflectGetter(messageField);
-                  } catch (NoSuchFieldException | IllegalAccessException e) {
-                    throw new RuntimeException(e);
-                  }
+    public static Object getHttpRequestMessage(SRTServletRequest request) {
+        IRequest iRequest = request.getIRequest();
+        if (iRequest instanceof IRequestExtended) {
+            HttpRequest transportRequest =
+                    ((IRequestExtended) iRequest).getHttpInboundConnection().getRequest();
+            try {
+                MethodHandle messageGetter = FIELD_CACHE.computeIfAbsent(transportRequest.getClass(), clazz -> {
+                    Field messageField;
+                    try {
+                        messageField = clazz.getDeclaredField("message");
+                        messageField.setAccessible(true);
+                        return MethodHandles.lookup().unreflectGetter(messageField);
+                    } catch (NoSuchFieldException | IllegalAccessException e) {
+                        throw new RuntimeException(e);
+                    }
                 });
-        return messageGetter.invoke(transportRequest);
-      } catch (Throwable e) {
-        throw new RuntimeException(e);
-      }
+                return messageGetter.invoke(transportRequest);
+            } catch (Throwable e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/RequestURIDataAdapter.java
index a1789a8c721..a8ad40bed66 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/RequestURIDataAdapter.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/RequestURIDataAdapter.java
@@ -5,39 +5,39 @@
 
 final class RequestURIDataAdapter extends URIRawDataAdapter {
 
-  private final HttpServletRequest request;
-
-  RequestURIDataAdapter(HttpServletRequest request) {
-    this.request = request;
-  }
-
-  @Override
-  public String scheme() {
-    return request.getScheme();
-  }
-
-  @Override
-  public String host() {
-    return request.getServerName();
-  }
-
-  @Override
-  public int port() {
-    return request.getServerPort();
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return request.getRequestURI();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return request.getQueryString();
-  }
+    private final HttpServletRequest request;
+
+    RequestURIDataAdapter(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    @Override
+    public String scheme() {
+        return request.getScheme();
+    }
+
+    @Override
+    public String host() {
+        return request.getServerName();
+    }
+
+    @Override
+    public int port() {
+        return request.getServerPort();
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return request.getRequestURI();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return request.getQueryString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ResponseFinishInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ResponseFinishInstrumentation.java
index cdb0cb18b54..2915a156188 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ResponseFinishInstrumentation.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ResponseFinishInstrumentation.java
@@ -28,81 +28,80 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ResponseFinishInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ResponseFinishInstrumentation() {
-    super("liberty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.ws.webcontainer.srt.SRTServletResponse";
-  }
+    public ResponseFinishInstrumentation() {
+        super("liberty");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("finish").and(takesNoArguments()),
-        ResponseFinishInstrumentation.class.getName() + "$ResponseFinishAdvice");
-    transformer.applyAdvice(
-        named("closeResponseOutput").and(takesArguments(1)).and(takesArgument(0, boolean.class)),
-        ResponseFinishInstrumentation.class.getName() + "$SetCompletedAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.ibm.ws.webcontainer.srt.SRTServletResponse";
+    }
 
-  /**
-   * Older versions have the inserted code conditioned on <code>
-   * reqState.getCurrentThreadsIExtendedRequest() == this.getRequest()</code>, though not in all
-   * code paths (for instance, not when getOutputStream() was called instead of getWriter). This
-   * inconsistency, together with the fact that newer versions don't have this condition anymore,
-   * suggests it is a bug. Without this inserted advice, async requests are not completed when
-   * blocking async requests.
-   */
-  static class SetCompletedAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(@Advice.Argument(0) boolean releaseChannel) {
-      WebContainerRequestState reqState = WebContainerRequestState.getInstance(true);
-      if (releaseChannel && !reqState.isCompleted()) {
-        reqState.setCompleted(true);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("finish").and(takesNoArguments()),
+                ResponseFinishInstrumentation.class.getName() + "$ResponseFinishAdvice");
+        transformer.applyAdvice(
+                named("closeResponseOutput").and(takesArguments(1)).and(takesArgument(0, boolean.class)),
+                ResponseFinishInstrumentation.class.getName() + "$SetCompletedAdvice");
     }
-  }
 
-  @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
-  public static class ResponseFinishAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static Context onEnter(@Advice.This SRTServletResponse resp) {
-      // this is the last opportunity to have any meaningful
-      // interaction with the response
-      Context context = null;
-      IExtendedRequest req = resp.getRequest();
-      try {
-        Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-        if (contextObj instanceof Context) {
-          context = (Context) contextObj;
-          req.setAttribute(DD_CONTEXT_ATTRIBUTE, null);
-          AgentSpan span = fromContext(context);
-          if (span != null) {
-            DECORATE.onSRTResponse(span, resp);
-          }
+    /**
+     * Older versions have the inserted code conditioned on <code>
+     * reqState.getCurrentThreadsIExtendedRequest() == this.getRequest()</code>, though not in all
+     * code paths (for instance, not when getOutputStream() was called instead of getWriter). This
+     * inconsistency, together with the fact that newer versions don't have this condition anymore,
+     * suggests it is a bug. Without this inserted advice, async requests are not completed when
+     * blocking async requests.
+     */
+    static class SetCompletedAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.Argument(0) boolean releaseChannel) {
+            WebContainerRequestState reqState = WebContainerRequestState.getInstance(true);
+            if (releaseChannel && !reqState.isCompleted()) {
+                reqState.setCompleted(true);
+            }
         }
-      } catch (NullPointerException e) {
-        // OpenLiberty will throw NPE on getAttribute if the response has already been closed.
-      }
-
-      return context;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.This SRTServletResponse resp, @Advice.Enter Context context) {
-      if (context == null) {
-        return;
-      }
-      AgentSpan span = fromContext(context);
-      if (span != null) {
-        DECORATE.beforeFinish(context);
-        span.finish();
-      }
+    @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
+    public static class ResponseFinishAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static Context onEnter(@Advice.This SRTServletResponse resp) {
+            // this is the last opportunity to have any meaningful
+            // interaction with the response
+            Context context = null;
+            IExtendedRequest req = resp.getRequest();
+            try {
+                Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+                if (contextObj instanceof Context) {
+                    context = (Context) contextObj;
+                    req.setAttribute(DD_CONTEXT_ATTRIBUTE, null);
+                    AgentSpan span = fromContext(context);
+                    if (span != null) {
+                        DECORATE.onSRTResponse(span, resp);
+                    }
+                }
+            } catch (NullPointerException e) {
+                // OpenLiberty will throw NPE on getAttribute if the response has already been closed.
+            }
+
+            return context;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.This SRTServletResponse resp, @Advice.Enter Context context) {
+            if (context == null) {
+                return;
+            }
+            AgentSpan span = fromContext(context);
+            if (span != null) {
+                DECORATE.beforeFinish(context);
+                span.finish();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ThreadContextClassloaderInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ThreadContextClassloaderInstrumentation.java
index 10f496f3bd3..1111adc1482 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ThreadContextClassloaderInstrumentation.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ThreadContextClassloaderInstrumentation.java
@@ -11,32 +11,31 @@
 
 @AutoService(InstrumenterModule.class)
 public class ThreadContextClassloaderInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  private static final String LIBERTY = "liberty";
-
-  public ThreadContextClassloaderInstrumentation() {
-    super(LIBERTY, "liberty-classloading");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.ws.classloading.internal.ThreadContextClassLoader";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(), getClass().getName() + "$ThreadContextClassloaderAdvice");
-  }
-
-  public static class ThreadContextClassloaderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterConstruct(@Advice.This ThreadContextClassLoader self) {
-      final String name = BundleNameHelper.extractDeploymentName(self);
-      if (name != null && !name.isEmpty()) {
-        ClassloaderConfigurationOverrides.withPinnedServiceName(self, name);
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    private static final String LIBERTY = "liberty";
+
+    public ThreadContextClassloaderInstrumentation() {
+        super(LIBERTY, "liberty-classloading");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "com.ibm.ws.classloading.internal.ThreadContextClassLoader";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$ThreadContextClassloaderAdvice");
+    }
+
+    public static class ThreadContextClassloaderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterConstruct(@Advice.This ThreadContextClassLoader self) {
+            final String name = BundleNameHelper.extractDeploymentName(self);
+            if (name != null && !name.isEmpty()) {
+                ClassloaderConfigurationOverrides.withPinnedServiceName(self, name);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/WebAppHandleExceptionInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/WebAppHandleExceptionInstrumentation.java
index 1f6a73e9511..ff7b17eddf2 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/WebAppHandleExceptionInstrumentation.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/WebAppHandleExceptionInstrumentation.java
@@ -20,38 +20,38 @@
  */
 @AutoService(InstrumenterModule.class)
 public class WebAppHandleExceptionInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public WebAppHandleExceptionInstrumentation() {
-    super("liberty");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public WebAppHandleExceptionInstrumentation() {
+        super("liberty");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.ws.webcontainer.webapp.WebApp";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.ibm.ws.webcontainer.webapp.WebApp";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("handleException"))
-            .and(takesArguments(4))
-            .and(takesArgument(0, Throwable.class))
-            .and(returns(void.class)),
-        WebAppHandleExceptionInstrumentation.class.getName() + "$HandleExceptionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("handleException"))
+                        .and(takesArguments(4))
+                        .and(takesArgument(0, Throwable.class))
+                        .and(returns(void.class)),
+                WebAppHandleExceptionInstrumentation.class.getName() + "$HandleExceptionAdvice");
+    }
 
-  static class HandleExceptionAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-    static boolean /* skip */ before(@Advice.Argument(0) Throwable throwable_) {
-      Throwable throwable = throwable_;
-      if (throwable instanceof WebAppErrorReport) {
-        throwable = throwable.getCause();
-      }
-      if (throwable instanceof BlockingException) {
-        return throwable.getMessage().startsWith("Blocked response");
-      }
-      return false;
+    static class HandleExceptionAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+        static boolean /* skip */ before(@Advice.Argument(0) Throwable throwable_) {
+            Throwable throwable = throwable_;
+            if (throwable instanceof WebAppErrorReport) {
+                throwable = throwable.getCause();
+            }
+            if (throwable instanceof BlockingException) {
+                return throwable.getMessage().startsWith("Blocked response");
+            }
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/webapp/java/datadog/trace/instrumentation/liberty20/AsyncServlet3.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/webapp/java/datadog/trace/instrumentation/liberty20/AsyncServlet3.java
index 5fe02eef377..11d5a8ac00e 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/webapp/java/datadog/trace/instrumentation/liberty20/AsyncServlet3.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/webapp/java/datadog/trace/instrumentation/liberty20/AsyncServlet3.java
@@ -30,194 +30,184 @@
 import javax.servlet.http.HttpServletResponseWrapper;
 
 @WebServlet(
-    urlPatterns = {
-      "/async/success",
-      "/async/created",
-      "/async/created_input_stream",
-      "/async/body-urlencoded",
-      "/async/body-multipart",
-      "/async/body-json",
-      "/async/redirect",
-      "/async/forwarded",
-      "/async/error-status",
-      "/async/exception",
-      "/async/custom-exception",
-      "/async/not-here",
-      "/async/timeout",
-      "/async/timeout_error",
-      "/async/query",
-      "/async/encoded path query",
-      "/async/encoded_query",
-      "/async/user-block",
-      "/async/session",
-    },
-    asyncSupported = true)
-@MultipartConfig(
-    maxFileSize = 10 * 1024 * 1024,
-    maxRequestSize = 20 * 1024 * 1024,
-    fileSizeThreshold = 5 * 1024 * 1024)
+        urlPatterns = {
+            "/async/success",
+            "/async/created",
+            "/async/created_input_stream",
+            "/async/body-urlencoded",
+            "/async/body-multipart",
+            "/async/body-json",
+            "/async/redirect",
+            "/async/forwarded",
+            "/async/error-status",
+            "/async/exception",
+            "/async/custom-exception",
+            "/async/not-here",
+            "/async/timeout",
+            "/async/timeout_error",
+            "/async/query",
+            "/async/encoded path query",
+            "/async/encoded_query",
+            "/async/user-block",
+            "/async/session",
+        },
+        asyncSupported = true)
+@MultipartConfig(maxFileSize = 10 * 1024 * 1024, maxRequestSize = 20 * 1024 * 1024, fileSizeThreshold = 5 * 1024 * 1024)
 public class AsyncServlet3 extends HttpServlet {
-  datadog.trace.instrumentation.servlet3.TestServlet3.Sync delegate;
-
-  {
-    try {
-      delegate =
-          new datadog.trace.instrumentation.servlet3.TestServlet3.Sync() {
-            @Override
-            public HttpServerTest.ServerEndpoint determineEndpoint(HttpServletRequest req) {
-              return HttpServerTest.ServerEndpoint.forPath(
-                  req.getRequestURI().substring(req.getRequestURI().lastIndexOf('/')));
-            }
-          };
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+    datadog.trace.instrumentation.servlet3.TestServlet3.Sync delegate;
+
+    {
+        try {
+            delegate = new datadog.trace.instrumentation.servlet3.TestServlet3.Sync() {
+                @Override
+                public HttpServerTest.ServerEndpoint determineEndpoint(HttpServletRequest req) {
+                    return HttpServerTest.ServerEndpoint.forPath(
+                            req.getRequestURI().substring(req.getRequestURI().lastIndexOf('/')));
+                }
+            };
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
-
-  @Override
-  public void service(ServletRequest req, final ServletResponse res)
-      throws ServletException, IOException {
-    Object attribute = req.getAttribute("ddog.dispatched");
-
-    if (attribute == null) {
-      AsyncContext asyncContext = req.startAsync();
-      req.setAttribute("ddog.dispatched", 1);
-      asyncContext.dispatch();
-    } else {
-      HttpServerTest.ServerEndpoint serverEndpoint =
-          delegate.determineEndpoint((HttpServletRequest) req);
-      if (serverEndpoint == BODY_MULTIPART) {
-        // needed to trigger reading the body on openliberty
-        ((HttpServletRequest) req).getParts();
-      } else if (serverEndpoint == ERROR
-          || serverEndpoint == QUERY_ENCODED_BOTH
-          || serverEndpoint == SESSION_ID) {
-        delegate.service(req, res);
-        return;
-      }
-
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      PrintWriter writer = new PrintWriter(baos);
-      HttpServletResponseWrapper wrappedRes =
-          new HttpServletResponseWrapper((HttpServletResponse) res) {
-            @Override
-            public PrintWriter getWriter() throws IOException {
-              return writer;
-            }
-          };
-
-      delegate.service(req, wrappedRes);
-      writer.flush();
-
-      AsyncContext asyncContext = req.startAsync();
-      asyncContext.setTimeout(1000);
-      asyncContext.addListener(
-          new AsyncListener() {
-            @Override
-            public void onComplete(AsyncEvent event) throws IOException {
-              log("onComplete");
-            }
 
-            @Override
-            public void onTimeout(AsyncEvent event) throws IOException {
-              log("onTimeout");
+    @Override
+    public void service(ServletRequest req, final ServletResponse res) throws ServletException, IOException {
+        Object attribute = req.getAttribute("ddog.dispatched");
+
+        if (attribute == null) {
+            AsyncContext asyncContext = req.startAsync();
+            req.setAttribute("ddog.dispatched", 1);
+            asyncContext.dispatch();
+        } else {
+            HttpServerTest.ServerEndpoint serverEndpoint = delegate.determineEndpoint((HttpServletRequest) req);
+            if (serverEndpoint == BODY_MULTIPART) {
+                // needed to trigger reading the body on openliberty
+                ((HttpServletRequest) req).getParts();
+            } else if (serverEndpoint == ERROR
+                    || serverEndpoint == QUERY_ENCODED_BOTH
+                    || serverEndpoint == SESSION_ID) {
+                delegate.service(req, res);
+                return;
             }
 
-            @Override
-            public void onError(AsyncEvent event) throws IOException {
-              log("onError", event.getThrowable());
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            PrintWriter writer = new PrintWriter(baos);
+            HttpServletResponseWrapper wrappedRes = new HttpServletResponseWrapper((HttpServletResponse) res) {
+                @Override
+                public PrintWriter getWriter() throws IOException {
+                    return writer;
+                }
+            };
+
+            delegate.service(req, wrappedRes);
+            writer.flush();
+
+            AsyncContext asyncContext = req.startAsync();
+            asyncContext.setTimeout(1000);
+            asyncContext.addListener(new AsyncListener() {
+                @Override
+                public void onComplete(AsyncEvent event) throws IOException {
+                    log("onComplete");
+                }
+
+                @Override
+                public void onTimeout(AsyncEvent event) throws IOException {
+                    log("onTimeout");
+                }
+
+                @Override
+                public void onError(AsyncEvent event) throws IOException {
+                    log("onError", event.getThrowable());
+                }
+
+                @Override
+                public void onStartAsync(AsyncEvent event) throws IOException {
+                    event.getAsyncContext().addListener(this);
+                }
+            });
+
+            ServletOutputStream outputStream;
+            try {
+                outputStream = res.getOutputStream();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
             }
 
-            @Override
-            public void onStartAsync(AsyncEvent event) throws IOException {
-              event.getAsyncContext().addListener(this);
-            }
-          });
-
-      ServletOutputStream outputStream;
-      try {
-        outputStream = res.getOutputStream();
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-
-      WriteListener listener =
-          new WriteListener() {
-            @Override
-            public void onWritePossible() throws IOException {
-              outputStream.write(baos.toByteArray());
-              asyncContext.complete();
+            WriteListener listener = new WriteListener() {
+                @Override
+                public void onWritePossible() throws IOException {
+                    outputStream.write(baos.toByteArray());
+                    asyncContext.complete();
+                }
+
+                @Override
+                public void onError(Throwable e) {
+                    log("onError", e);
+                    asyncContext.complete();
+                }
+            };
+
+            try {
+                Method setWriteListener = ServletOutputStream.class.getMethod("setWriteListener", WriteListener.class);
+                setWriteListener.invoke(outputStream, listener);
+            } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+                throw new RuntimeException(e);
             }
+        }
+    }
 
-            @Override
-            public void onError(Throwable e) {
-              log("onError", e);
-              asyncContext.complete();
-            }
-          };
-
-      try {
-        Method setWriteListener =
-            ServletOutputStream.class.getMethod("setWriteListener", WriteListener.class);
-        setWriteListener.invoke(outputStream, listener);
-      } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-        throw new RuntimeException(e);
-      }
+    @Override
+    public void destroy() {
+        delegate.destroy();
+    }
+
+    @Override
+    public String getInitParameter(String name) {
+        return delegate.getInitParameter(name);
+    }
+
+    @Override
+    public Enumeration<String> getInitParameterNames() {
+        return delegate.getInitParameterNames();
+    }
+
+    @Override
+    public ServletConfig getServletConfig() {
+        return delegate.getServletConfig();
+    }
+
+    @Override
+    public ServletContext getServletContext() {
+        return delegate.getServletContext();
+    }
+
+    @Override
+    public String getServletInfo() {
+        return delegate.getServletInfo();
+    }
+
+    @Override
+    public void init() throws ServletException {
+        delegate.init();
+    }
+
+    @Override
+    public void init(ServletConfig config) throws ServletException {
+        delegate.init(config);
+    }
+
+    @Override
+    public String getServletName() {
+        return delegate.getServletName();
+    }
+
+    @Override
+    public void log(String msg) {
+        delegate.log(msg);
+    }
+
+    @Override
+    public void log(String msg, Throwable t) {
+        delegate.log(msg, t);
     }
-  }
-
-  @Override
-  public void destroy() {
-    delegate.destroy();
-  }
-
-  @Override
-  public String getInitParameter(String name) {
-    return delegate.getInitParameter(name);
-  }
-
-  @Override
-  public Enumeration<String> getInitParameterNames() {
-    return delegate.getInitParameterNames();
-  }
-
-  @Override
-  public ServletConfig getServletConfig() {
-    return delegate.getServletConfig();
-  }
-
-  @Override
-  public ServletContext getServletContext() {
-    return delegate.getServletContext();
-  }
-
-  @Override
-  public String getServletInfo() {
-    return delegate.getServletInfo();
-  }
-
-  @Override
-  public void init() throws ServletException {
-    delegate.init();
-  }
-
-  @Override
-  public void init(ServletConfig config) throws ServletException {
-    delegate.init(config);
-  }
-
-  @Override
-  public String getServletName() {
-    return delegate.getServletName();
-  }
-
-  @Override
-  public void log(String msg) {
-    delegate.log(msg);
-  }
-
-  @Override
-  public void log(String msg, Throwable t) {
-    delegate.log(msg, t);
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/webapp/java/datadog/trace/instrumentation/liberty20/PassthruSyncServlet3.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/webapp/java/datadog/trace/instrumentation/liberty20/PassthruSyncServlet3.java
index e9ce34cacc4..19fe3227db8 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/webapp/java/datadog/trace/instrumentation/liberty20/PassthruSyncServlet3.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/webapp/java/datadog/trace/instrumentation/liberty20/PassthruSyncServlet3.java
@@ -15,114 +15,110 @@
 import javax.servlet.http.HttpServletRequest;
 
 @WebServlet(
-    urlPatterns = {
-      "/success",
-      "/created",
-      "/created_input_stream",
-      "/body-urlencoded",
-      "/body-multipart",
-      "/body-json",
-      "/redirect",
-      "/forwarded",
-      "/error-status",
-      "/exception",
-      "/custom-exception",
-      "/not-here",
-      "/timeout",
-      "/timeout_error",
-      "/query",
-      "/encoded path query",
-      "/encoded_query",
-      "/user-block",
-      "/session",
-    })
-@MultipartConfig(
-    maxFileSize = 10 * 1024 * 1024,
-    maxRequestSize = 20 * 1024 * 1024,
-    fileSizeThreshold = 5 * 1024 * 1024)
+        urlPatterns = {
+            "/success",
+            "/created",
+            "/created_input_stream",
+            "/body-urlencoded",
+            "/body-multipart",
+            "/body-json",
+            "/redirect",
+            "/forwarded",
+            "/error-status",
+            "/exception",
+            "/custom-exception",
+            "/not-here",
+            "/timeout",
+            "/timeout_error",
+            "/query",
+            "/encoded path query",
+            "/encoded_query",
+            "/user-block",
+            "/session",
+        })
+@MultipartConfig(maxFileSize = 10 * 1024 * 1024, maxRequestSize = 20 * 1024 * 1024, fileSizeThreshold = 5 * 1024 * 1024)
 public class PassthruSyncServlet3 extends HttpServlet {
-  datadog.trace.instrumentation.servlet3.TestServlet3.Sync delegate;
+    datadog.trace.instrumentation.servlet3.TestServlet3.Sync delegate;
+
+    {
+        try {
+            delegate = new datadog.trace.instrumentation.servlet3.TestServlet3.Sync();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {
+        if (delegate.determineEndpoint((HttpServletRequest) req) == BODY_MULTIPART) {
+            // needed to trigger reading the body on openliberty
+            ((HttpServletRequest) req).getParts();
+        }
+        try {
+            delegate.service(req, res);
+        } catch (Throwable t) {
+            throw t;
+        } finally {
+            if (((HttpServletRequest) req).getHeader("x-commit-during-response") != null) {
+                res.flushBuffer();
+                res.getWriter().close();
+                throw new RuntimeException("should not be reached");
+            }
+        }
+    }
 
-  {
-    try {
-      delegate = new datadog.trace.instrumentation.servlet3.TestServlet3.Sync();
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+    @Override
+    public void destroy() {
+        delegate.destroy();
     }
-  }
-
-  @Override
-  public void service(ServletRequest req, ServletResponse res)
-      throws ServletException, IOException {
-    if (delegate.determineEndpoint((HttpServletRequest) req) == BODY_MULTIPART) {
-      // needed to trigger reading the body on openliberty
-      ((HttpServletRequest) req).getParts();
+
+    @Override
+    public String getInitParameter(String name) {
+        return delegate.getInitParameter(name);
+    }
+
+    @Override
+    public Enumeration<String> getInitParameterNames() {
+        return delegate.getInitParameterNames();
     }
-    try {
-      delegate.service(req, res);
-    } catch (Throwable t) {
-      throw t;
-    } finally {
-      if (((HttpServletRequest) req).getHeader("x-commit-during-response") != null) {
-        res.flushBuffer();
-        res.getWriter().close();
-        throw new RuntimeException("should not be reached");
-      }
+
+    @Override
+    public ServletConfig getServletConfig() {
+        return delegate.getServletConfig();
+    }
+
+    @Override
+    public ServletContext getServletContext() {
+        return delegate.getServletContext();
+    }
+
+    @Override
+    public String getServletInfo() {
+        return delegate.getServletInfo();
+    }
+
+    @Override
+    public void init() throws ServletException {
+        delegate.init();
+    }
+
+    @Override
+    public void init(ServletConfig config) throws ServletException {
+        delegate.init(config);
+    }
+
+    @Override
+    public String getServletName() {
+        return delegate.getServletName();
+    }
+
+    @Override
+    public void log(String msg) {
+        delegate.log(msg);
+    }
+
+    @Override
+    public void log(String msg, Throwable t) {
+        delegate.log(msg, t);
     }
-  }
-
-  @Override
-  public void destroy() {
-    delegate.destroy();
-  }
-
-  @Override
-  public String getInitParameter(String name) {
-    return delegate.getInitParameter(name);
-  }
-
-  @Override
-  public Enumeration<String> getInitParameterNames() {
-    return delegate.getInitParameterNames();
-  }
-
-  @Override
-  public ServletConfig getServletConfig() {
-    return delegate.getServletConfig();
-  }
-
-  @Override
-  public ServletContext getServletContext() {
-    return delegate.getServletContext();
-  }
-
-  @Override
-  public String getServletInfo() {
-    return delegate.getServletInfo();
-  }
-
-  @Override
-  public void init() throws ServletException {
-    delegate.init();
-  }
-
-  @Override
-  public void init(ServletConfig config) throws ServletException {
-    delegate.init(config);
-  }
-
-  @Override
-  public String getServletName() {
-    return delegate.getServletName();
-  }
-
-  @Override
-  public void log(String msg) {
-    delegate.log(msg);
-  }
-
-  @Override
-  public void log(String msg, Throwable t) {
-    delegate.log(msg, t);
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ArrayOfTypeMatcher.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ArrayOfTypeMatcher.java
index f0f20f08ce9..59c6b808049 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ArrayOfTypeMatcher.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ArrayOfTypeMatcher.java
@@ -7,21 +7,20 @@
 import net.bytebuddy.description.type.TypeDefinition;
 import net.bytebuddy.matcher.ElementMatcher;
 
-public class ArrayOfTypeMatcher<T extends TypeDefinition>
-    extends ElementMatcher.Junction.ForNonNullValues<T> {
-  private final NameMatchers.Named<NamedElement> componentMatcher;
+public class ArrayOfTypeMatcher<T extends TypeDefinition> extends ElementMatcher.Junction.ForNonNullValues<T> {
+    private final NameMatchers.Named<NamedElement> componentMatcher;
 
-  public ArrayOfTypeMatcher(String typeName) {
-    this.componentMatcher = named(typeName);
-  }
+    public ArrayOfTypeMatcher(String typeName) {
+        this.componentMatcher = named(typeName);
+    }
 
-  @Override
-  protected boolean doMatch(T target) {
-    return target.isArray() && componentMatcher.matches(target.getComponentType());
-  }
+    @Override
+    protected boolean doMatch(T target) {
+        return target.isArray() && componentMatcher.matches(target.getComponentType());
+    }
 
-  @Override
-  public String toString() {
-    return "isArrayOfType(" + componentMatcher + ")";
-  }
+    @Override
+    public String toString() {
+        return "isArrayOfType(" + componentMatcher + ")";
+    }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/HttpInboundServiceContextImplInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/HttpInboundServiceContextImplInstrumentation.java
index d3e0bf4ef9a..cf81012a3de 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/HttpInboundServiceContextImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/HttpInboundServiceContextImplInstrumentation.java
@@ -22,68 +22,62 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpInboundServiceContextImplInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public static final String REQUEST_MSG_TYPE =
-      "com.ibm.ws.http.channel.internal.HttpRequestMessageImpl";
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public static final String REQUEST_MSG_TYPE = "com.ibm.ws.http.channel.internal.HttpRequestMessageImpl";
 
-  public HttpInboundServiceContextImplInstrumentation() {
-    super("liberty");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        REQUEST_MSG_TYPE, "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
-  }
+    public HttpInboundServiceContextImplInstrumentation() {
+        super("liberty");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(namedOneOf("sendResponseBody", "finishResponseMessage"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, new ArrayOfTypeMatcher("com.ibm.wsspi.bytebuffer.WsByteBuffer")))
-            .and(returns(void.class)),
-        HttpInboundServiceContextImplInstrumentation.class.getName() + "$SyncAdviceBuffer");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(REQUEST_MSG_TYPE, "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.ws.http.channel.internal.inbound.HttpInboundServiceContextImpl";
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(namedOneOf("sendResponseBody", "finishResponseMessage"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, new ArrayOfTypeMatcher("com.ibm.wsspi.bytebuffer.WsByteBuffer")))
+                        .and(returns(void.class)),
+                HttpInboundServiceContextImplInstrumentation.class.getName() + "$SyncAdviceBuffer");
+    }
 
-  /**
-   * @see HttpInboundServiceContextImpl#sendResponseBody(WsByteBuffer[])
-   * @see HttpInboundServiceContextImpl#finishResponseMessage(WsByteBuffer[])
-   */
-  static class SyncAdviceBuffer {
-    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-    static BlockingException /* skip */ before(
-        @Advice.This HttpInboundServiceContextImpl thiz,
-        @Advice.Argument(0) WsByteBuffer[] buffers) {
-      final int callDepth =
-          CallDepthThreadLocalMap.incrementCallDepth(HttpInboundServiceContextImpl.class);
-      if (callDepth > 0) {
-        return null;
-      }
-      ContextStore store =
-          InstrumentationContext.get(
-              REQUEST_MSG_TYPE, "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
-      Object o = store.get(thiz.getRequest());
-      if (o == null) {
-        return null;
-      }
-      return LibertyBlockingHelper.syncBufferEnter(thiz, buffers, (AgentSpan) o);
+    @Override
+    public String instrumentedType() {
+        return "com.ibm.ws.http.channel.internal.inbound.HttpInboundServiceContextImpl";
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter BlockingException blockingException,
-        @Advice.Thrown(readOnly = false) Throwable thrown) {
-      CallDepthThreadLocalMap.decrementCallDepth(HttpInboundServiceContextImpl.class);
-      if (blockingException != null) {
-        thrown = blockingException;
-      }
+    /**
+     * @see HttpInboundServiceContextImpl#sendResponseBody(WsByteBuffer[])
+     * @see HttpInboundServiceContextImpl#finishResponseMessage(WsByteBuffer[])
+     */
+    static class SyncAdviceBuffer {
+        @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+        static BlockingException /* skip */ before(
+                @Advice.This HttpInboundServiceContextImpl thiz, @Advice.Argument(0) WsByteBuffer[] buffers) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpInboundServiceContextImpl.class);
+            if (callDepth > 0) {
+                return null;
+            }
+            ContextStore store = InstrumentationContext.get(
+                    REQUEST_MSG_TYPE, "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
+            Object o = store.get(thiz.getRequest());
+            if (o == null) {
+                return null;
+            }
+            return LibertyBlockingHelper.syncBufferEnter(thiz, buffers, (AgentSpan) o);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter BlockingException blockingException, @Advice.Thrown(readOnly = false) Throwable thrown) {
+            CallDepthThreadLocalMap.decrementCallDepth(HttpInboundServiceContextImpl.class);
+            if (blockingException != null) {
+                thrown = blockingException;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/HttpServletExtractAdapter.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/HttpServletExtractAdapter.java
index 811b65085bc..4bba0a64e38 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/HttpServletExtractAdapter.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/HttpServletExtractAdapter.java
@@ -8,57 +8,57 @@
 import java.util.Enumeration;
 
 public abstract class HttpServletExtractAdapter<T> implements AgentPropagation.ContextVisitor<T> {
-  abstract Enumeration<String> getHeaderNames(T t);
+    abstract Enumeration<String> getHeaderNames(T t);
 
-  abstract String getHeader(T t, String name);
+    abstract String getHeader(T t, String name);
 
-  @Override
-  public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-    Enumeration<String> headerNames = getHeaderNames(carrier);
-    while (headerNames.hasMoreElements()) {
-      String header = headerNames.nextElement();
-      if (!classifier.accept(header, getHeader(carrier, header))) {
-        break;
-      }
+    @Override
+    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+        Enumeration<String> headerNames = getHeaderNames(carrier);
+        while (headerNames.hasMoreElements()) {
+            String header = headerNames.nextElement();
+            if (!classifier.accept(header, getHeader(carrier, header))) {
+                break;
+            }
+        }
     }
-  }
 
-  public static final class Request extends HttpServletExtractAdapter<HttpServletRequest> {
-    public static final Request GETTER = new Request();
+    public static final class Request extends HttpServletExtractAdapter<HttpServletRequest> {
+        public static final Request GETTER = new Request();
 
-    @Override
-    Enumeration<String> getHeaderNames(HttpServletRequest request) {
-      return request.getHeaderNames();
-    }
+        @Override
+        Enumeration<String> getHeaderNames(HttpServletRequest request) {
+            return request.getHeaderNames();
+        }
 
-    @Override
-    String getHeader(HttpServletRequest request, String name) {
-      return request.getHeader(name);
+        @Override
+        String getHeader(HttpServletRequest request, String name) {
+            return request.getHeader(name);
+        }
     }
-  }
 
-  @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
-  public static final class Response extends HttpServletExtractAdapter<HttpServletResponse> {
-    public static final Response GETTER = new Response();
+    @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
+    public static final class Response extends HttpServletExtractAdapter<HttpServletResponse> {
+        public static final Response GETTER = new Response();
 
-    @Override
-    Enumeration<String> getHeaderNames(HttpServletResponse response) {
-      try {
-        return Collections.enumeration(response.getHeaderNames());
-      } catch (NullPointerException e) {
-        // SRTServletResponse#getHeaderNames() will throw NPE if called after response close.
-        return Collections.emptyEnumeration();
-      }
-    }
+        @Override
+        Enumeration<String> getHeaderNames(HttpServletResponse response) {
+            try {
+                return Collections.enumeration(response.getHeaderNames());
+            } catch (NullPointerException e) {
+                // SRTServletResponse#getHeaderNames() will throw NPE if called after response close.
+                return Collections.emptyEnumeration();
+            }
+        }
 
-    @Override
-    String getHeader(HttpServletResponse request, String name) {
-      try {
-        return request.getHeader(name);
-      } catch (NullPointerException e) {
-        // SRTServletResponse#getHeader(name) will throw NPE if called after response close.
-        return null;
-      }
+        @Override
+        String getHeader(HttpServletResponse request, String name) {
+            try {
+                return request.getHeader(name);
+            } catch (NullPointerException e) {
+                // SRTServletResponse#getHeader(name) will throw NPE if called after response close.
+                return null;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/LibertyBlockingHelper.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/LibertyBlockingHelper.java
index bc35ec1ef3c..026d83071a4 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/LibertyBlockingHelper.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/LibertyBlockingHelper.java
@@ -27,461 +27,457 @@
 import org.slf4j.LoggerFactory;
 
 public class LibertyBlockingHelper {
-  private static final Logger log = LoggerFactory.getLogger(LibertyBlockingHelper.class);
-  private static final WsByteBuffer[] EMPTY_BUFFER_ARRAY = new WsByteBuffer[0];
-
-  public static BlockingException syncBufferEnter(
-      HttpInboundServiceContextImpl thiz, WsByteBuffer[] buffers, AgentSpan span) {
-    if (thiz.isMessageSent() || thiz.headersSent()) {
-      return null;
-    }
-
-    if (span == null) {
-      span = activeSpan();
-    }
-    if (span == null) {
-      return null;
-    }
-    RequestContext requestContext = span.getRequestContext();
-    if (requestContext == null) {
-      return null;
-    }
-
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    if (cbp == null) {
-      return null;
-    }
-
-    HttpResponseMessage response = thiz.getResponse();
-
-    BiFunction<RequestContext, Integer, Flow<Void>> respStartedCallback =
-        cbp.getCallback(EVENTS.responseStarted());
-    if (respStartedCallback != null) {
-      respStartedCallback.apply(requestContext, response.getStatusCodeAsInt());
-    }
-    TriConsumer<RequestContext, String, String> headerCallback =
-        cbp.getCallback(EVENTS.responseHeader());
-    Function<RequestContext, Flow<Void>> headersDoneCallback =
-        cbp.getCallback(EVENTS.responseHeaderDone());
-    if (headerCallback == null || headersDoneCallback == null) {
-      return null;
-    }
-    for (HeaderField hf : response.getAllHeaders()) {
-      headerCallback.accept(requestContext, hf.getName(), hf.asString());
-    }
-    Flow<Void> flow = headersDoneCallback.apply(requestContext);
-    Flow.Action action = flow.getAction();
-    if (!(action instanceof Flow.Action.RequestBlockingAction)) {
-      return null;
-    }
-
-    // block
-    response.clear();
-
-    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-    response.setStatusCode(rba.getStatusCode());
-    for (Map.Entry<String, String> e : rba.getExtraHeaders().entrySet()) {
-      response.setHeader(e.getKey(), e.getValue());
-    }
-
-    BlockingContentType bct = rba.getBlockingContentType();
-    final WsByteBuffer[] bufferArray;
-    if (bct != BlockingContentType.NONE) {
-      BlockingActionHelper.TemplateType type =
-          BlockingActionHelper.determineTemplateType(
-              bct, thiz.getRequest().getHeader("Accept").asString());
-      byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
-      response.setHeader("Content-length", Integer.toString(template.length));
-      response.setHeader("Content-type", BlockingActionHelper.getContentType(type));
-      WsByteBufferImpl buffer = new WsByteBufferImpl(ByteBuffer.wrap(template));
-      bufferArray = new WsByteBuffer[] {buffer};
-    } else {
-      bufferArray = EMPTY_BUFFER_ARRAY;
-    }
-
-    BlockingException be = new BlockingException("Blocked response (syncBufferEnter)");
-    try {
-      thiz.reinit(thiz.getTSC()); // parsingComplete()
-      thiz.finishResponseMessage(bufferArray);
-    } catch (Exception e) {
-      log.warn("Error committing blocking response", e);
-    }
-
-    requestContext.getTraceSegment().effectivelyBlocked();
-
-    span.addThrowable(be);
-    span.setTag(Tags.HTTP_STATUS, rba.getStatusCode());
-
-    return be;
-  }
-
-  static class WsByteBufferImpl implements WsByteBuffer {
-    final ByteBuffer bb;
-
-    WsByteBufferImpl(ByteBuffer bb) {
-      this.bb = bb;
-    }
-
-    @Override
-    public boolean setBufferAction(int i) {
-      return false;
-    }
-
-    @Override
-    public byte[] array() {
-      return this.bb.array();
-    }
-
-    @Override
-    public int arrayOffset() {
-      return this.bb.arrayOffset();
-    }
-
-    @Override
-    public WsByteBuffer compact() {
-      this.bb.compact();
-      return this;
-    }
-
-    @Override
-    public int compareTo(Object o) {
-      ByteBuffer other = ((WsByteBuffer) o).getWrappedByteBufferNonSafe();
-      return this.bb.compareTo(other);
-    }
-
-    @Override
-    public char getChar() {
-      return this.bb.getChar();
-    }
-
-    @Override
-    public char getChar(int i) {
-      return this.bb.getChar(i);
-    }
-
-    @Override
-    public WsByteBuffer putChar(char c) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putChar(int i, char c) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putChar(char[] chars) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putChar(char[] chars, int i, int i1) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public double getDouble() {
-      return this.bb.getDouble();
-    }
-
-    @Override
-    public double getDouble(int i) {
-      return this.bb.getDouble(i);
-    }
-
-    @Override
-    public WsByteBuffer putDouble(double v) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putDouble(int i, double v) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public float getFloat() {
-      return this.bb.getFloat();
-    }
-
-    @Override
-    public float getFloat(int i) {
-      return this.bb.getFloat(i);
-    }
-
-    @Override
-    public WsByteBuffer putFloat(float v) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putFloat(int i, float v) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public int getInt() {
-      return this.bb.get();
-    }
-
-    @Override
-    public int getInt(int i) {
-      return this.bb.getInt(i);
-    }
-
-    @Override
-    public WsByteBuffer putInt(int i) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putInt(int i, int i1) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public long getLong() {
-      return this.bb.getLong();
-    }
-
-    @Override
-    public long getLong(int i) {
-      return this.bb.getLong(i);
-    }
-
-    @Override
-    public WsByteBuffer putLong(long l) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putLong(int i, long l) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public short getShort() {
-      return this.bb.getShort();
-    }
-
-    @Override
-    public short getShort(int i) {
-      return this.bb.getShort(i);
-    }
-
-    @Override
-    public WsByteBuffer putShort(short i) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putShort(int i, short i1) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer putString(String s) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public boolean hasArray() {
-      return true;
-    }
-
-    @Override
-    public ByteOrder order() {
-      return this.bb.order();
-    }
-
-    @Override
-    public WsByteBuffer order(ByteOrder byteOrder) {
-      this.bb.order(byteOrder);
-      return this;
-    }
-
-    @Override
-    public WsByteBuffer clear() {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public int capacity() {
-      return this.bb.capacity();
-    }
-
-    @Override
-    public WsByteBuffer flip() {
-      this.bb.flip();
-      return this;
-    }
-
-    @Override
-    public byte get() {
-      return this.bb.get();
-    }
-
-    @Override
-    public int position() {
-      return this.bb.position();
-    }
-
-    @Override
-    public WsByteBuffer position(int i) {
-      this.bb.position(i);
-      return this;
-    }
-
-    @Override
-    public WsByteBuffer limit(int i) {
-      this.bb.limit(i);
-      return this;
-    }
-
-    @Override
-    public int limit() {
-      return this.bb.limit();
-    }
-
-    @Override
-    public int remaining() {
-      return this.bb.remaining();
-    }
-
-    @Override
-    public WsByteBuffer mark() {
-      this.bb.mark();
-      return this;
-    }
-
-    @Override
-    public WsByteBuffer reset() {
-      this.bb.reset();
-      return this;
-    }
-
-    @Override
-    public WsByteBuffer rewind() {
-      this.bb.rewind();
-      return this;
-    }
-
-    @Override
-    public boolean isReadOnly() {
-      return true;
-    }
-
-    @Override
-    public boolean hasRemaining() {
-      return this.bb.hasRemaining();
-    }
-
-    @Override
-    public WsByteBuffer duplicate() {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer slice() {
-      return new WsByteBufferImpl(this.bb.slice());
-    }
-
-    @Override
-    public WsByteBuffer get(byte[] bytes) {
-      this.bb.get(bytes);
-      return this;
-    }
-
-    @Override
-    public WsByteBuffer get(byte[] bytes, int i, int i1) {
-      this.bb.get(bytes, i, i1);
-      return this;
-    }
-
-    @Override
-    public byte get(int i) {
-      return this.bb.get(i);
-    }
-
-    @Override
-    public boolean isDirect() {
-      return this.bb.isDirect();
-    }
-
-    @Override
-    public WsByteBuffer put(byte b) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer put(byte[] bytes) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer put(byte[] bytes, int i, int i1) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer put(int i, byte b) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer put(ByteBuffer byteBuffer) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer put(WsByteBuffer wsByteBuffer) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public WsByteBuffer put(WsByteBuffer[] wsByteBuffers) {
-      throw new UnsupportedOperationException("read-only");
-    }
-
-    @Override
-    public ByteBuffer getWrappedByteBuffer() {
-      return this.bb;
-    }
-
-    @Override
-    public ByteBuffer getWrappedByteBufferNonSafe() {
-      return this.bb;
-    }
-
-    @Override
-    public void setReadOnly(boolean b) {}
-
-    @Override
-    public boolean getReadOnly() {
-      return true;
-    }
-
-    @Override
-    public void removeFromLeakDetection() {}
-
-    @Override
-    public void release() {}
-
-    @Override
-    public int getType() {
-      return 0;
-    }
-
-    private int status = 1;
-
-    @Override
-    public int getStatus() {
-      return this.status;
-    }
-
-    @Override
-    public void setStatus(int i) {
-      this.status = i;
+    private static final Logger log = LoggerFactory.getLogger(LibertyBlockingHelper.class);
+    private static final WsByteBuffer[] EMPTY_BUFFER_ARRAY = new WsByteBuffer[0];
+
+    public static BlockingException syncBufferEnter(
+            HttpInboundServiceContextImpl thiz, WsByteBuffer[] buffers, AgentSpan span) {
+        if (thiz.isMessageSent() || thiz.headersSent()) {
+            return null;
+        }
+
+        if (span == null) {
+            span = activeSpan();
+        }
+        if (span == null) {
+            return null;
+        }
+        RequestContext requestContext = span.getRequestContext();
+        if (requestContext == null) {
+            return null;
+        }
+
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        if (cbp == null) {
+            return null;
+        }
+
+        HttpResponseMessage response = thiz.getResponse();
+
+        BiFunction<RequestContext, Integer, Flow<Void>> respStartedCallback = cbp.getCallback(EVENTS.responseStarted());
+        if (respStartedCallback != null) {
+            respStartedCallback.apply(requestContext, response.getStatusCodeAsInt());
+        }
+        TriConsumer<RequestContext, String, String> headerCallback = cbp.getCallback(EVENTS.responseHeader());
+        Function<RequestContext, Flow<Void>> headersDoneCallback = cbp.getCallback(EVENTS.responseHeaderDone());
+        if (headerCallback == null || headersDoneCallback == null) {
+            return null;
+        }
+        for (HeaderField hf : response.getAllHeaders()) {
+            headerCallback.accept(requestContext, hf.getName(), hf.asString());
+        }
+        Flow<Void> flow = headersDoneCallback.apply(requestContext);
+        Flow.Action action = flow.getAction();
+        if (!(action instanceof Flow.Action.RequestBlockingAction)) {
+            return null;
+        }
+
+        // block
+        response.clear();
+
+        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+        response.setStatusCode(rba.getStatusCode());
+        for (Map.Entry<String, String> e : rba.getExtraHeaders().entrySet()) {
+            response.setHeader(e.getKey(), e.getValue());
+        }
+
+        BlockingContentType bct = rba.getBlockingContentType();
+        final WsByteBuffer[] bufferArray;
+        if (bct != BlockingContentType.NONE) {
+            BlockingActionHelper.TemplateType type = BlockingActionHelper.determineTemplateType(
+                    bct, thiz.getRequest().getHeader("Accept").asString());
+            byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
+            response.setHeader("Content-length", Integer.toString(template.length));
+            response.setHeader("Content-type", BlockingActionHelper.getContentType(type));
+            WsByteBufferImpl buffer = new WsByteBufferImpl(ByteBuffer.wrap(template));
+            bufferArray = new WsByteBuffer[] {buffer};
+        } else {
+            bufferArray = EMPTY_BUFFER_ARRAY;
+        }
+
+        BlockingException be = new BlockingException("Blocked response (syncBufferEnter)");
+        try {
+            thiz.reinit(thiz.getTSC()); // parsingComplete()
+            thiz.finishResponseMessage(bufferArray);
+        } catch (Exception e) {
+            log.warn("Error committing blocking response", e);
+        }
+
+        requestContext.getTraceSegment().effectivelyBlocked();
+
+        span.addThrowable(be);
+        span.setTag(Tags.HTTP_STATUS, rba.getStatusCode());
+
+        return be;
+    }
+
+    static class WsByteBufferImpl implements WsByteBuffer {
+        final ByteBuffer bb;
+
+        WsByteBufferImpl(ByteBuffer bb) {
+            this.bb = bb;
+        }
+
+        @Override
+        public boolean setBufferAction(int i) {
+            return false;
+        }
+
+        @Override
+        public byte[] array() {
+            return this.bb.array();
+        }
+
+        @Override
+        public int arrayOffset() {
+            return this.bb.arrayOffset();
+        }
+
+        @Override
+        public WsByteBuffer compact() {
+            this.bb.compact();
+            return this;
+        }
+
+        @Override
+        public int compareTo(Object o) {
+            ByteBuffer other = ((WsByteBuffer) o).getWrappedByteBufferNonSafe();
+            return this.bb.compareTo(other);
+        }
+
+        @Override
+        public char getChar() {
+            return this.bb.getChar();
+        }
+
+        @Override
+        public char getChar(int i) {
+            return this.bb.getChar(i);
+        }
+
+        @Override
+        public WsByteBuffer putChar(char c) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putChar(int i, char c) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putChar(char[] chars) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putChar(char[] chars, int i, int i1) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public double getDouble() {
+            return this.bb.getDouble();
+        }
+
+        @Override
+        public double getDouble(int i) {
+            return this.bb.getDouble(i);
+        }
+
+        @Override
+        public WsByteBuffer putDouble(double v) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putDouble(int i, double v) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public float getFloat() {
+            return this.bb.getFloat();
+        }
+
+        @Override
+        public float getFloat(int i) {
+            return this.bb.getFloat(i);
+        }
+
+        @Override
+        public WsByteBuffer putFloat(float v) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putFloat(int i, float v) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public int getInt() {
+            return this.bb.get();
+        }
+
+        @Override
+        public int getInt(int i) {
+            return this.bb.getInt(i);
+        }
+
+        @Override
+        public WsByteBuffer putInt(int i) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putInt(int i, int i1) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public long getLong() {
+            return this.bb.getLong();
+        }
+
+        @Override
+        public long getLong(int i) {
+            return this.bb.getLong(i);
+        }
+
+        @Override
+        public WsByteBuffer putLong(long l) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putLong(int i, long l) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public short getShort() {
+            return this.bb.getShort();
+        }
+
+        @Override
+        public short getShort(int i) {
+            return this.bb.getShort(i);
+        }
+
+        @Override
+        public WsByteBuffer putShort(short i) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putShort(int i, short i1) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer putString(String s) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public boolean hasArray() {
+            return true;
+        }
+
+        @Override
+        public ByteOrder order() {
+            return this.bb.order();
+        }
+
+        @Override
+        public WsByteBuffer order(ByteOrder byteOrder) {
+            this.bb.order(byteOrder);
+            return this;
+        }
+
+        @Override
+        public WsByteBuffer clear() {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public int capacity() {
+            return this.bb.capacity();
+        }
+
+        @Override
+        public WsByteBuffer flip() {
+            this.bb.flip();
+            return this;
+        }
+
+        @Override
+        public byte get() {
+            return this.bb.get();
+        }
+
+        @Override
+        public int position() {
+            return this.bb.position();
+        }
+
+        @Override
+        public WsByteBuffer position(int i) {
+            this.bb.position(i);
+            return this;
+        }
+
+        @Override
+        public WsByteBuffer limit(int i) {
+            this.bb.limit(i);
+            return this;
+        }
+
+        @Override
+        public int limit() {
+            return this.bb.limit();
+        }
+
+        @Override
+        public int remaining() {
+            return this.bb.remaining();
+        }
+
+        @Override
+        public WsByteBuffer mark() {
+            this.bb.mark();
+            return this;
+        }
+
+        @Override
+        public WsByteBuffer reset() {
+            this.bb.reset();
+            return this;
+        }
+
+        @Override
+        public WsByteBuffer rewind() {
+            this.bb.rewind();
+            return this;
+        }
+
+        @Override
+        public boolean isReadOnly() {
+            return true;
+        }
+
+        @Override
+        public boolean hasRemaining() {
+            return this.bb.hasRemaining();
+        }
+
+        @Override
+        public WsByteBuffer duplicate() {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer slice() {
+            return new WsByteBufferImpl(this.bb.slice());
+        }
+
+        @Override
+        public WsByteBuffer get(byte[] bytes) {
+            this.bb.get(bytes);
+            return this;
+        }
+
+        @Override
+        public WsByteBuffer get(byte[] bytes, int i, int i1) {
+            this.bb.get(bytes, i, i1);
+            return this;
+        }
+
+        @Override
+        public byte get(int i) {
+            return this.bb.get(i);
+        }
+
+        @Override
+        public boolean isDirect() {
+            return this.bb.isDirect();
+        }
+
+        @Override
+        public WsByteBuffer put(byte b) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer put(byte[] bytes) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer put(byte[] bytes, int i, int i1) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer put(int i, byte b) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer put(ByteBuffer byteBuffer) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer put(WsByteBuffer wsByteBuffer) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public WsByteBuffer put(WsByteBuffer[] wsByteBuffers) {
+            throw new UnsupportedOperationException("read-only");
+        }
+
+        @Override
+        public ByteBuffer getWrappedByteBuffer() {
+            return this.bb;
+        }
+
+        @Override
+        public ByteBuffer getWrappedByteBufferNonSafe() {
+            return this.bb;
+        }
+
+        @Override
+        public void setReadOnly(boolean b) {}
+
+        @Override
+        public boolean getReadOnly() {
+            return true;
+        }
+
+        @Override
+        public void removeFromLeakDetection() {}
+
+        @Override
+        public void release() {}
+
+        @Override
+        public int getType() {
+            return 0;
+        }
+
+        private int status = 1;
+
+        @Override
+        public int getStatus() {
+            return this.status;
+        }
+
+        @Override
+        public void setStatus(int i) {
+            this.status = i;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/LibertyDecorator.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/LibertyDecorator.java
index 89193969ab8..b7ea7b4a56c 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/LibertyDecorator.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/LibertyDecorator.java
@@ -28,195 +28,192 @@
 import org.slf4j.LoggerFactory;
 
 public class LibertyDecorator
-    extends HttpServerDecorator<
-        HttpServletRequest, HttpServletRequest, HttpServletResponse, HttpServletRequest> {
-
-  public static final Logger log = LoggerFactory.getLogger(LibertyDecorator.class);
-  public static final CharSequence LIBERTY_SERVER = UTF8BytesString.create("liberty-server");
-  public static final LibertyDecorator DECORATE = new LibertyDecorator();
-  public static final CharSequence SERVLET_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-  public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
-  public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
-  public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"liberty"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return LIBERTY_SERVER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpServletRequest> getter() {
-    return Request.GETTER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpServletResponse> responseGetter() {
-    return Response.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return SERVLET_REQUEST;
-  }
-
-  @Override
-  protected String method(final HttpServletRequest request) {
-    return request.getMethod();
-  }
-
-  @Override
-  protected URIDataAdapter url(final HttpServletRequest request) {
-    return new RequestURIDataAdapter(request);
-  }
-
-  @Override
-  protected String peerHostIP(final HttpServletRequest request) {
-    return request.getRemoteAddr();
-  }
-
-  @Override
-  protected int peerPort(final HttpServletRequest request) {
-    return request.getRemotePort();
-  }
-
-  @Override
-  protected int status(final HttpServletResponse response) {
-    return response.getStatus();
-  }
-
-  @Override
-  protected String requestedSessionId(final HttpServletRequest request) {
-    return request.getRequestedSessionId();
-  }
-
-  @Override
-  protected void doOnResponseStatus(AgentSpan span, int status) {
-    Integer currentStatus = (Integer) span.getTag(Tags.HTTP_STATUS);
-    // do not set status if the tag is already there and it's an error span
-    // we may have the status during response blocking, but in that case
-    // the status code is not propagated to the servlet layer
-    if (currentStatus == null || !span.isError()) {
-      super.doOnResponseStatus(span, status);
-    }
-  }
-
-  public void getPath(AgentSpan span, HttpServletRequest request) {
-    if (request != null) {
-      String contextPath = request.getContextPath();
-      String servletPath = request.getServletPath();
-
-      if (null != contextPath && !contextPath.isEmpty()) {
-        span.setTag("servlet.context", contextPath);
-      }
-      if (null != servletPath && !servletPath.isEmpty()) {
-        span.setTag("servlet.path", servletPath);
-      }
-
-      request.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, contextPath);
-      request.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, servletPath);
-    }
-  }
-
-  @Override
-  protected boolean isAppSecOnResponseSeparate() {
-    return true;
-  }
-
-  public void onSRTResponse(AgentSpan span, SRTServletResponse response) {
-    try {
-      doOnSRTResponse(span, response);
-    } catch (BlockingException e) {
-      throw e;
-    } catch (Throwable t) {
-      log.debug("Failed to decorate span on response", t);
-    }
-  }
-
-  private void doOnSRTResponse(AgentSpan span, SRTServletResponse response) {
-    HttpServletRequest req = response.getRequest();
-
-    if (Config.get().isServletPrincipalEnabled() && req.getUserPrincipal() != null) {
-      span.setTag(DDTags.USER_NAME, req.getUserPrincipal().getName());
-    }
-    doOnResponse(span, response);
-
-    Object ex = req.getAttribute("jakarta.servlet.error.exception");
-    Object report;
-    Object errorMessage;
-    Throwable throwable = null;
-    if (ex instanceof Throwable) {
-      throwable = (Throwable) ex;
-      if (throwable instanceof ServletException) {
-        throwable = ((ServletException) throwable).getRootCause();
-      }
-      onError(span, throwable);
-    } else if ((report = req.getAttribute("ErrorReport")) instanceof WebAppErrorReport) {
-      // overwrite the HTTP status codes, and if a custom error report is provided by liberty server
-      WebAppErrorReport errReport = (WebAppErrorReport) report;
-      onError(span, errReport, throwable);
-    } else if ((errorMessage = req.getAttribute("jakarta.servlet.error.message"))
-        instanceof String) {
-      span.setError(true);
-      span.setTag(DDTags.ERROR_MSG, (String) errorMessage);
-    }
-  }
-
-  public void onError(AgentSpan span, WebAppErrorReport report, Throwable servletThrowable) {
-    span.setError(true);
-    // make sure the two reported throwables are different throwables
-    if (report.getCause() != null
-        && (servletThrowable == null || servletThrowable.getCause() != report.getCause())) {
-      span.addThrowable(report.getCause());
-    }
-    span.setTag(DDTags.ERROR_MSG, report.getMessage());
-  }
-
-  public static class LibertyBlockResponseFunction implements BlockResponseFunction {
-    private static final Logger log = LoggerFactory.getLogger(LibertyBlockResponseFunction.class);
-    private final HttpServletRequest request;
-
-    public LibertyBlockResponseFunction(HttpServletRequest request) {
-      this.request = request;
+        extends HttpServerDecorator<HttpServletRequest, HttpServletRequest, HttpServletResponse, HttpServletRequest> {
+
+    public static final Logger log = LoggerFactory.getLogger(LibertyDecorator.class);
+    public static final CharSequence LIBERTY_SERVER = UTF8BytesString.create("liberty-server");
+    public static final LibertyDecorator DECORATE = new LibertyDecorator();
+    public static final CharSequence SERVLET_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+    public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
+    public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
+    public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"liberty"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return LIBERTY_SERVER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpServletRequest> getter() {
+        return Request.GETTER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpServletResponse> responseGetter() {
+        return Response.GETTER;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return SERVLET_REQUEST;
+    }
+
+    @Override
+    protected String method(final HttpServletRequest request) {
+        return request.getMethod();
+    }
+
+    @Override
+    protected URIDataAdapter url(final HttpServletRequest request) {
+        return new RequestURIDataAdapter(request);
+    }
+
+    @Override
+    protected String peerHostIP(final HttpServletRequest request) {
+        return request.getRemoteAddr();
+    }
+
+    @Override
+    protected int peerPort(final HttpServletRequest request) {
+        return request.getRemotePort();
+    }
+
+    @Override
+    protected int status(final HttpServletResponse response) {
+        return response.getStatus();
+    }
+
+    @Override
+    protected String requestedSessionId(final HttpServletRequest request) {
+        return request.getRequestedSessionId();
+    }
+
+    @Override
+    protected void doOnResponseStatus(AgentSpan span, int status) {
+        Integer currentStatus = (Integer) span.getTag(Tags.HTTP_STATUS);
+        // do not set status if the tag is already there and it's an error span
+        // we may have the status during response blocking, but in that case
+        // the status code is not propagated to the servlet layer
+        if (currentStatus == null || !span.isError()) {
+            super.doOnResponseStatus(span, status);
+        }
+    }
+
+    public void getPath(AgentSpan span, HttpServletRequest request) {
+        if (request != null) {
+            String contextPath = request.getContextPath();
+            String servletPath = request.getServletPath();
+
+            if (null != contextPath && !contextPath.isEmpty()) {
+                span.setTag("servlet.context", contextPath);
+            }
+            if (null != servletPath && !servletPath.isEmpty()) {
+                span.setTag("servlet.path", servletPath);
+            }
+
+            request.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, contextPath);
+            request.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, servletPath);
+        }
     }
 
     @Override
-    public boolean tryCommitBlockingResponse(
-        TraceSegment segment,
-        int statusCode,
-        BlockingContentType bct,
-        Map<String, String> extraHeaders,
-        String securityResponseId) {
-      if (!(request instanceof SRTServletRequest)) {
-        log.warn("Can't block; request not of type SRTServletRequest");
-        return false;
-      }
-      IExtendedResponse response = ((SRTServletRequest) request).getResponse();
-      if (!(response instanceof HttpServletResponse)) {
-        log.warn("Can't block; response not of type HttpServletResponse");
-        return false;
-      }
-      JakartaServletBlockingHelper.commitBlockingResponse(
-          segment,
-          request,
-          (HttpServletResponse) response,
-          statusCode,
-          bct,
-          extraHeaders,
-          securityResponseId);
-
-      return true;
-    }
-  }
-
-  @Override
-  protected BlockResponseFunction createBlockResponseFunction(
-      HttpServletRequest httpServletRequest, HttpServletRequest connection) {
-    return new LibertyBlockResponseFunction(httpServletRequest);
-  }
+    protected boolean isAppSecOnResponseSeparate() {
+        return true;
+    }
+
+    public void onSRTResponse(AgentSpan span, SRTServletResponse response) {
+        try {
+            doOnSRTResponse(span, response);
+        } catch (BlockingException e) {
+            throw e;
+        } catch (Throwable t) {
+            log.debug("Failed to decorate span on response", t);
+        }
+    }
+
+    private void doOnSRTResponse(AgentSpan span, SRTServletResponse response) {
+        HttpServletRequest req = response.getRequest();
+
+        if (Config.get().isServletPrincipalEnabled() && req.getUserPrincipal() != null) {
+            span.setTag(DDTags.USER_NAME, req.getUserPrincipal().getName());
+        }
+        doOnResponse(span, response);
+
+        Object ex = req.getAttribute("jakarta.servlet.error.exception");
+        Object report;
+        Object errorMessage;
+        Throwable throwable = null;
+        if (ex instanceof Throwable) {
+            throwable = (Throwable) ex;
+            if (throwable instanceof ServletException) {
+                throwable = ((ServletException) throwable).getRootCause();
+            }
+            onError(span, throwable);
+        } else if ((report = req.getAttribute("ErrorReport")) instanceof WebAppErrorReport) {
+            // overwrite the HTTP status codes, and if a custom error report is provided by liberty server
+            WebAppErrorReport errReport = (WebAppErrorReport) report;
+            onError(span, errReport, throwable);
+        } else if ((errorMessage = req.getAttribute("jakarta.servlet.error.message")) instanceof String) {
+            span.setError(true);
+            span.setTag(DDTags.ERROR_MSG, (String) errorMessage);
+        }
+    }
+
+    public void onError(AgentSpan span, WebAppErrorReport report, Throwable servletThrowable) {
+        span.setError(true);
+        // make sure the two reported throwables are different throwables
+        if (report.getCause() != null
+                && (servletThrowable == null || servletThrowable.getCause() != report.getCause())) {
+            span.addThrowable(report.getCause());
+        }
+        span.setTag(DDTags.ERROR_MSG, report.getMessage());
+    }
+
+    public static class LibertyBlockResponseFunction implements BlockResponseFunction {
+        private static final Logger log = LoggerFactory.getLogger(LibertyBlockResponseFunction.class);
+        private final HttpServletRequest request;
+
+        public LibertyBlockResponseFunction(HttpServletRequest request) {
+            this.request = request;
+        }
+
+        @Override
+        public boolean tryCommitBlockingResponse(
+                TraceSegment segment,
+                int statusCode,
+                BlockingContentType bct,
+                Map<String, String> extraHeaders,
+                String securityResponseId) {
+            if (!(request instanceof SRTServletRequest)) {
+                log.warn("Can't block; request not of type SRTServletRequest");
+                return false;
+            }
+            IExtendedResponse response = ((SRTServletRequest) request).getResponse();
+            if (!(response instanceof HttpServletResponse)) {
+                log.warn("Can't block; response not of type HttpServletResponse");
+                return false;
+            }
+            JakartaServletBlockingHelper.commitBlockingResponse(
+                    segment,
+                    request,
+                    (HttpServletResponse) response,
+                    statusCode,
+                    bct,
+                    extraHeaders,
+                    securityResponseId);
+
+            return true;
+        }
+    }
+
+    @Override
+    protected BlockResponseFunction createBlockResponseFunction(
+            HttpServletRequest httpServletRequest, HttpServletRequest connection) {
+        return new LibertyBlockResponseFunction(httpServletRequest);
+    }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java
index 220085c4d55..914b11809a4 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java
@@ -40,168 +40,163 @@
 
 @AutoService(InstrumenterModule.class)
 public final class LibertyServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public LibertyServerInstrumentation() {
-    super("liberty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.ws.webcontainer.filter.WebAppFilterManager";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".HttpServletExtractAdapter",
-      packageName + ".HttpServletExtractAdapter$Request",
-      packageName + ".HttpServletExtractAdapter$Response",
-      packageName + ".LibertyDecorator",
-      packageName + ".LibertyDecorator$LibertyBlockResponseFunction",
-      packageName + ".RequestURIDataAdapter",
-      "datadog.trace.instrumentation.servlet5.JakartaServletBlockingHelper",
-      packageName + ".RequestMessageFromServletRequestHelper",
-    };
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        REQUEST_MSG_TYPE, "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("invokeFilters"))
-            .and(takesArgument(0, named("jakarta.servlet.ServletRequest")))
-            .and(takesArgument(1, named("jakarta.servlet.ServletResponse")))
-            .and(takesArgument(2, named("com.ibm.wsspi.webcontainer.servlet.IServletContext")))
-            .and(takesArgument(3, named("com.ibm.wsspi.webcontainer.RequestProcessor")))
-            .and(takesArgument(4, EnumSet.class))
-            .and(takesArgument(5, named("com.ibm.wsspi.http.HttpInboundConnection"))),
-        LibertyServerInstrumentation.class.getName() + "$ContextTrackingAdvice",
-        LibertyServerInstrumentation.class.getName() + "$HandleRequestAdvice");
-  }
-
-  @AppliesOn(CONTEXT_TRACKING)
-  @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
-  public static class ContextTrackingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Local("parentScope") ContextScope parentScope,
-        @Advice.Argument(0) ServletRequest req) {
-      if (!(req instanceof SRTServletRequest)) {
-        return;
-      }
-      SRTServletRequest request = (SRTServletRequest) req;
-      try {
-        if (request.getAttribute(DD_CONTEXT_ATTRIBUTE) instanceof Context) {
-          return; // skip re-entry
-        }
-      } catch (NullPointerException e) {
-      }
-      Context parentContext = DECORATE.extract(request);
-      request.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
-      parentScope = parentContext.attach();
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public LibertyServerInstrumentation() {
+        super("liberty");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Local("parentScope") ContextScope parentScope) {
-      if (parentScope != null) parentScope.close();
+    @Override
+    public String instrumentedType() {
+        return "com.ibm.ws.webcontainer.filter.WebAppFilterManager";
     }
-  }
-
-  @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
-  public static class HandleRequestAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-    public static boolean /* skip */ onEnter(
-        @Advice.Local("contextScope") ContextScope scope,
-        @Advice.Argument(0) ServletRequest req,
-        @Advice.Argument(1) ServletResponse resp) {
-      if (!(req instanceof SRTServletRequest)) {
-        return false;
-      }
-      SRTServletRequest request = (SRTServletRequest) req;
-
-      // if we try to get an attribute that doesn't exist open liberty might complain with an
-      // exception
-      try {
-        Object existingContext = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-        if (existingContext instanceof Context) {
-          scope = ((Context) existingContext).attach();
-          return false;
-        }
-      } catch (NullPointerException e) {
-      }
-
-      Object parentContextObj = request.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
-      final Context parentContext =
-          (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
-      final Context context = DECORATE.startSpan(request, parentContext);
-      scope = context.attach();
-      final AgentSpan span = fromContext(context);
-      if (Config.get().isJeeSplitByDeployment()) {
-        final IWebAppDispatcherContext dispatcherContext = request.getWebAppDispatcherContext();
-        if (dispatcherContext != null) {
-          final WebApp webapp = dispatcherContext.getWebApp();
-          if (webapp != null) {
-            final ClassLoader cl = webapp.getClassLoader();
-            if (cl != null) {
-              ClassloaderConfigurationOverrides.maybeEnrichSpan(span, cl);
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".HttpServletExtractAdapter",
+            packageName + ".HttpServletExtractAdapter$Request",
+            packageName + ".HttpServletExtractAdapter$Response",
+            packageName + ".LibertyDecorator",
+            packageName + ".LibertyDecorator$LibertyBlockResponseFunction",
+            packageName + ".RequestURIDataAdapter",
+            "datadog.trace.instrumentation.servlet5.JakartaServletBlockingHelper",
+            packageName + ".RequestMessageFromServletRequestHelper",
+        };
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(REQUEST_MSG_TYPE, "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("invokeFilters"))
+                        .and(takesArgument(0, named("jakarta.servlet.ServletRequest")))
+                        .and(takesArgument(1, named("jakarta.servlet.ServletResponse")))
+                        .and(takesArgument(2, named("com.ibm.wsspi.webcontainer.servlet.IServletContext")))
+                        .and(takesArgument(3, named("com.ibm.wsspi.webcontainer.RequestProcessor")))
+                        .and(takesArgument(4, EnumSet.class))
+                        .and(takesArgument(5, named("com.ibm.wsspi.http.HttpInboundConnection"))),
+                LibertyServerInstrumentation.class.getName() + "$ContextTrackingAdvice",
+                LibertyServerInstrumentation.class.getName() + "$HandleRequestAdvice");
+    }
+
+    @AppliesOn(CONTEXT_TRACKING)
+    @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
+    public static class ContextTrackingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Local("parentScope") ContextScope parentScope, @Advice.Argument(0) ServletRequest req) {
+            if (!(req instanceof SRTServletRequest)) {
+                return;
             }
-          }
+            SRTServletRequest request = (SRTServletRequest) req;
+            try {
+                if (request.getAttribute(DD_CONTEXT_ATTRIBUTE) instanceof Context) {
+                    return; // skip re-entry
+                }
+            } catch (NullPointerException e) {
+            }
+            Context parentContext = DECORATE.extract(request);
+            request.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
+            parentScope = parentContext.attach();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Local("parentScope") ContextScope parentScope) {
+            if (parentScope != null) parentScope.close();
         }
-      }
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, request, request, parentContext);
-      request.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
-      request.setAttribute(
-          CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
-      request.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
-      if (ActiveSubsystems.APPSEC_ACTIVE) {
-        ContextStore store =
-            InstrumentationContext.get(
-                REQUEST_MSG_TYPE, "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
-        // Provide the span to lower layers
-        // The span is associated with the c.i.w.http.channel.internal.HttpRequestMessageImpl object
-        store.put(RequestMessageFromServletRequestHelper.getHttpRequestMessage(request), span);
-      }
-      Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
-      if (rba != null) {
-        JakartaServletBlockingHelper.commitBlockingResponse(
-            span.getRequestContext().getTraceSegment(), request, (SRTServletResponse) resp, rba);
-        // prevent caching of the handler
-        req.setAttribute(
-            "javax.servlet.error.status_code", ((SRTServletResponse) resp).getStatusCode());
-        span.getRequestContext().getTraceSegment().effectivelyBlocked();
-        return true; // skip method body
-      }
-
-      return false;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(
-        @Advice.Local("contextScope") final ContextScope scope,
-        @Advice.Argument(value = 0) ServletRequest req) {
-      if (!(req instanceof SRTServletRequest)) {
-        return;
-      }
-      SRTServletRequest request = (SRTServletRequest) req;
-
-      if (scope != null) {
-        // we cannot get path at the start because the path/context attributes are not yet
-        // initialized
-        // this has the unfortunate consequence that service name (as set via the tag interceptor)
-        // of the top span won't match that of its child spans, because it's instead the original
-        // one that will propagate
-        DECORATE.getPath(fromContext(scope.context()), request);
-        scope.close();
-      }
+    @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
+    public static class HandleRequestAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+        public static boolean /* skip */ onEnter(
+                @Advice.Local("contextScope") ContextScope scope,
+                @Advice.Argument(0) ServletRequest req,
+                @Advice.Argument(1) ServletResponse resp) {
+            if (!(req instanceof SRTServletRequest)) {
+                return false;
+            }
+            SRTServletRequest request = (SRTServletRequest) req;
+
+            // if we try to get an attribute that doesn't exist open liberty might complain with an
+            // exception
+            try {
+                Object existingContext = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+                if (existingContext instanceof Context) {
+                    scope = ((Context) existingContext).attach();
+                    return false;
+                }
+            } catch (NullPointerException e) {
+            }
+
+            Object parentContextObj = request.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
+            final Context parentContext =
+                    (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
+            final Context context = DECORATE.startSpan(request, parentContext);
+            scope = context.attach();
+            final AgentSpan span = fromContext(context);
+            if (Config.get().isJeeSplitByDeployment()) {
+                final IWebAppDispatcherContext dispatcherContext = request.getWebAppDispatcherContext();
+                if (dispatcherContext != null) {
+                    final WebApp webapp = dispatcherContext.getWebApp();
+                    if (webapp != null) {
+                        final ClassLoader cl = webapp.getClassLoader();
+                        if (cl != null) {
+                            ClassloaderConfigurationOverrides.maybeEnrichSpan(span, cl);
+                        }
+                    }
+                }
+            }
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, request, request, parentContext);
+            request.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
+            request.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+            request.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+            if (ActiveSubsystems.APPSEC_ACTIVE) {
+                ContextStore store = InstrumentationContext.get(
+                        REQUEST_MSG_TYPE, "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
+                // Provide the span to lower layers
+                // The span is associated with the c.i.w.http.channel.internal.HttpRequestMessageImpl object
+                store.put(RequestMessageFromServletRequestHelper.getHttpRequestMessage(request), span);
+            }
+            Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
+            if (rba != null) {
+                JakartaServletBlockingHelper.commitBlockingResponse(
+                        span.getRequestContext().getTraceSegment(), request, (SRTServletResponse) resp, rba);
+                // prevent caching of the handler
+                req.setAttribute("javax.servlet.error.status_code", ((SRTServletResponse) resp).getStatusCode());
+                span.getRequestContext().getTraceSegment().effectivelyBlocked();
+                return true; // skip method body
+            }
+
+            return false;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(
+                @Advice.Local("contextScope") final ContextScope scope,
+                @Advice.Argument(value = 0) ServletRequest req) {
+            if (!(req instanceof SRTServletRequest)) {
+                return;
+            }
+            SRTServletRequest request = (SRTServletRequest) req;
+
+            if (scope != null) {
+                // we cannot get path at the start because the path/context attributes are not yet
+                // initialized
+                // this has the unfortunate consequence that service name (as set via the tag interceptor)
+                // of the top span won't match that of its child spans, because it's instead the original
+                // one that will propagate
+                DECORATE.getPath(fromContext(scope.context()), request);
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ParameterCollector.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ParameterCollector.java
index 5cbbc4ab82e..8fda6d5fd51 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ParameterCollector.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ParameterCollector.java
@@ -6,48 +6,48 @@
 
 public interface ParameterCollector {
 
-  boolean isEmpty();
+    boolean isEmpty();
 
-  void put(String key, String[] value);
+    void put(String key, String[] value);
 
-  Map<String, String[]> getMap();
+    Map<String, String[]> getMap();
 
-  class ParameterCollectorNoop implements ParameterCollector {
-    public static final ParameterCollector INSTANCE = new ParameterCollectorNoop();
+    class ParameterCollectorNoop implements ParameterCollector {
+        public static final ParameterCollector INSTANCE = new ParameterCollectorNoop();
 
-    @Override
-    public boolean isEmpty() {
-      return true;
-    }
-
-    @Override
-    public void put(String key, String[] value) {}
-
-    @Override
-    public Map<String, String[]> getMap() {
-      return Collections.emptyMap();
-    }
-  }
-
-  class ParameterCollectorImpl implements ParameterCollector {
-    public Map<String, String[]> map;
+        @Override
+        public boolean isEmpty() {
+            return true;
+        }
 
-    @Override
-    public boolean isEmpty() {
-      return map == null;
-    }
+        @Override
+        public void put(String key, String[] value) {}
 
-    @Override
-    public void put(String key, String[] value) {
-      if (map == null) {
-        map = new HashMap<>();
-      }
-      map.put(key, value);
+        @Override
+        public Map<String, String[]> getMap() {
+            return Collections.emptyMap();
+        }
     }
 
-    @Override
-    public Map<String, String[]> getMap() {
-      return map;
+    class ParameterCollectorImpl implements ParameterCollector {
+        public Map<String, String[]> map;
+
+        @Override
+        public boolean isEmpty() {
+            return map == null;
+        }
+
+        @Override
+        public void put(String key, String[] value) {
+            if (map == null) {
+                map = new HashMap<>();
+            }
+            map.put(key, value);
+        }
+
+        @Override
+        public Map<String, String[]> getMap() {
+            return map;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ParseParametersInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ParseParametersInstrumentation.java
index 32226f503e8..25473a46809 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ParseParametersInstrumentation.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ParseParametersInstrumentation.java
@@ -36,166 +36,162 @@
 
 @AutoService(InstrumenterModule.class)
 public class ParseParametersInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
-  public ParseParametersInstrumentation() {
-    super("liberty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.ws.webcontainer.srt.SRTServletRequest";
-  }
-
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new ParseParametersVisitorWrapper());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("parseParameters"))
-            .and(isPublic().or(isProtected()))
-            .and(takesArguments(0))
-            .and(returns(void.class)),
-        ParseParametersInstrumentation.class.getName() + "$ParseParametersAdvice");
-  }
-
-  static class ParseParametersAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void before(
-        @Advice.Local("collector") ParameterCollector collector,
-        @Advice.Local("reqCtx") RequestContext reqCtx) {
-      AgentSpan agentSpan = AgentTracer.activeSpan();
-      if (agentSpan != null) {
-        RequestContext requestContext = agentSpan.getRequestContext();
-        if (requestContext != null && requestContext.getData(RequestContextSlot.APPSEC) != null) {
-          reqCtx = requestContext;
-          collector = new ParameterCollector.ParameterCollectorImpl();
-          return;
-        }
-      }
-      // this variable is used in the custom instrumentation below
-      collector = ParameterCollector.ParameterCollectorNoop.INSTANCE;
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
+    public ParseParametersInstrumentation() {
+        super("liberty");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Local("collector") ParameterCollector collector,
-        @Advice.Local("reqCtx") RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null || reqCtx == null || collector.isEmpty()) {
-        return;
-      }
-
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
-
-      Flow<Void> flow = callback.apply(reqCtx, collector.getMap());
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-          t = new BlockingException("Blocked request (for SRTServletRequest/parseParameters)");
-          reqCtx.getTraceSegment().effectivelyBlocked();
-        }
-      }
-    }
-  }
-
-  public static class ParseParametersVisitorWrapper implements AsmVisitorWrapper {
     @Override
-    public int mergeWriter(int flags) {
-      return flags | ClassWriter.COMPUTE_MAXS;
+    public String instrumentedType() {
+        return "com.ibm.ws.webcontainer.srt.SRTServletRequest";
     }
 
     @Override
-    public int mergeReader(int flags) {
-      return flags;
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new ParseParametersVisitorWrapper());
     }
 
     @Override
-    public ClassVisitor wrap(
-        TypeDescription instrumentedType,
-        ClassVisitor classVisitor,
-        Implementation.Context implementationContext,
-        TypePool typePool,
-        FieldList<FieldDescription.InDefinedShape> fields,
-        MethodList<?> methods,
-        int writerFlags,
-        int readerFlags) {
-      return new RequestClassVisitor(Opcodes.ASM8, classVisitor);
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("parseParameters"))
+                        .and(isPublic().or(isProtected()))
+                        .and(takesArguments(0))
+                        .and(returns(void.class)),
+                ParseParametersInstrumentation.class.getName() + "$ParseParametersAdvice");
     }
-  }
 
-  public static class RequestClassVisitor extends ClassVisitor {
-    public RequestClassVisitor(int api, ClassVisitor cv) {
-      super(api, cv);
-    }
+    static class ParseParametersAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void before(
+                @Advice.Local("collector") ParameterCollector collector,
+                @Advice.Local("reqCtx") RequestContext reqCtx) {
+            AgentSpan agentSpan = AgentTracer.activeSpan();
+            if (agentSpan != null) {
+                RequestContext requestContext = agentSpan.getRequestContext();
+                if (requestContext != null && requestContext.getData(RequestContextSlot.APPSEC) != null) {
+                    reqCtx = requestContext;
+                    collector = new ParameterCollector.ParameterCollectorImpl();
+                    return;
+                }
+            }
+            // this variable is used in the custom instrumentation below
+            collector = ParameterCollector.ParameterCollectorNoop.INSTANCE;
+        }
 
-    @Override
-    public MethodVisitor visitMethod(
-        int access, String name, String descriptor, String signature, String[] exceptions) {
-      MethodVisitor superMv = super.visitMethod(access, name, descriptor, signature, exceptions);
-      if ("parseParameters".equals(name) && "()V".equals(descriptor)) {
-        return new ParseParametersMethodVisitor(api, superMv);
-      } else {
-        return superMv;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Local("collector") ParameterCollector collector,
+                @Advice.Local("reqCtx") RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null || reqCtx == null || collector.isEmpty()) {
+                return;
+            }
+
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
+
+            Flow<Void> flow = callback.apply(reqCtx, collector.getMap());
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                    t = new BlockingException("Blocked request (for SRTServletRequest/parseParameters)");
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                }
+            }
+        }
     }
-  }
 
-  public static class ParseParametersMethodVisitor extends MethodVisitor {
-    private boolean afterGetParametersCall;
+    public static class ParseParametersVisitorWrapper implements AsmVisitorWrapper {
+        @Override
+        public int mergeWriter(int flags) {
+            return flags | ClassWriter.COMPUTE_MAXS;
+        }
 
-    public ParseParametersMethodVisitor(int api, MethodVisitor superMv) {
-      super(api, superMv);
+        @Override
+        public int mergeReader(int flags) {
+            return flags;
+        }
+
+        @Override
+        public ClassVisitor wrap(
+                TypeDescription instrumentedType,
+                ClassVisitor classVisitor,
+                Implementation.Context implementationContext,
+                TypePool typePool,
+                FieldList<FieldDescription.InDefinedShape> fields,
+                MethodList<?> methods,
+                int writerFlags,
+                int readerFlags) {
+            return new RequestClassVisitor(Opcodes.ASM8, classVisitor);
+        }
     }
 
-    @Override
-    public void visitMethodInsn(
-        int opcode, String owner, String name, String descriptor, boolean isInterface) {
-      if (!afterGetParametersCall) {
-        if (opcode == Opcodes.INVOKEVIRTUAL
-            && name.equals("getParameters")
-            && owner.equals("com/ibm/ws/webcontainer/srt/SRTServletRequestThreadData")
-            && descriptor.equals("()Ljava/util/Map;")) {
-          afterGetParametersCall = true;
+    public static class RequestClassVisitor extends ClassVisitor {
+        public RequestClassVisitor(int api, ClassVisitor cv) {
+            super(api, cv);
         }
-      } else if (afterGetParametersCall) {
-        afterGetParametersCall = false;
-        if (opcode == Opcodes.INVOKEINTERFACE
-            && owner.equals("java/util/Map")
-            && name.equals("put")
-            && descriptor.equals("(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;")) {
-          super.visitVarInsn(Opcodes.ALOAD, 1);
-          // stack: ..., key, value, collParams
-          super.visitInsn(Opcodes.DUP_X2);
-          // stack: ..., collParams, key, value, collParams
-          super.visitInsn(Opcodes.POP);
-          // stack: ..., collParams, key, value
-          super.visitInsn(Opcodes.DUP2_X1);
-          // stack: ..., key, value, collParams, key, value
-          super.visitMethodInsn(
-              Opcodes.INVOKEINTERFACE,
-              Type.getInternalName(ParameterCollector.class),
-              "put",
-              "(Ljava/lang/String;[Ljava/lang/String;)V",
-              true);
-          // original stack
+
+        @Override
+        public MethodVisitor visitMethod(
+                int access, String name, String descriptor, String signature, String[] exceptions) {
+            MethodVisitor superMv = super.visitMethod(access, name, descriptor, signature, exceptions);
+            if ("parseParameters".equals(name) && "()V".equals(descriptor)) {
+                return new ParseParametersMethodVisitor(api, superMv);
+            } else {
+                return superMv;
+            }
         }
-      }
+    }
 
-      super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+    public static class ParseParametersMethodVisitor extends MethodVisitor {
+        private boolean afterGetParametersCall;
+
+        public ParseParametersMethodVisitor(int api, MethodVisitor superMv) {
+            super(api, superMv);
+        }
+
+        @Override
+        public void visitMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) {
+            if (!afterGetParametersCall) {
+                if (opcode == Opcodes.INVOKEVIRTUAL
+                        && name.equals("getParameters")
+                        && owner.equals("com/ibm/ws/webcontainer/srt/SRTServletRequestThreadData")
+                        && descriptor.equals("()Ljava/util/Map;")) {
+                    afterGetParametersCall = true;
+                }
+            } else if (afterGetParametersCall) {
+                afterGetParametersCall = false;
+                if (opcode == Opcodes.INVOKEINTERFACE
+                        && owner.equals("java/util/Map")
+                        && name.equals("put")
+                        && descriptor.equals("(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;")) {
+                    super.visitVarInsn(Opcodes.ALOAD, 1);
+                    // stack: ..., key, value, collParams
+                    super.visitInsn(Opcodes.DUP_X2);
+                    // stack: ..., collParams, key, value, collParams
+                    super.visitInsn(Opcodes.POP);
+                    // stack: ..., collParams, key, value
+                    super.visitInsn(Opcodes.DUP2_X1);
+                    // stack: ..., key, value, collParams, key, value
+                    super.visitMethodInsn(
+                            Opcodes.INVOKEINTERFACE,
+                            Type.getInternalName(ParameterCollector.class),
+                            "put",
+                            "(Ljava/lang/String;[Ljava/lang/String;)V",
+                            true);
+                    // original stack
+                }
+            }
+
+            super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ParsePostDataInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ParsePostDataInstrumentation.java
index 6c5cfda83d8..1308dc095cb 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ParsePostDataInstrumentation.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ParsePostDataInstrumentation.java
@@ -26,59 +26,57 @@
 
 @AutoService(InstrumenterModule.class)
 public class ParsePostDataInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public ParsePostDataInstrumentation() {
-    super("liberty");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public ParsePostDataInstrumentation() {
+        super("liberty");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "com.ibm.ws.webcontainer.srt.SRTServletRequest",
-      "com.ibm.ws.webcontainer31.srt.SRTServletRequest31",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "com.ibm.ws.webcontainer.srt.SRTServletRequest", "com.ibm.ws.webcontainer31.srt.SRTServletRequest31",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("parsePostData"))
-            .and(isPublic().or(isProtected()))
-            .and(takesArguments(0))
-            .and(returns(Hashtable.class)),
-        ParsePostDataInstrumentation.class.getName() + "$ParsePostDataAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("parsePostData"))
+                        .and(isPublic().or(isProtected()))
+                        .and(takesArguments(0))
+                        .and(returns(Hashtable.class)),
+                ParsePostDataInstrumentation.class.getName() + "$ParsePostDataAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  static class ParsePostDataAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return Hashtable<String, String[]> retval,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (retval == null || retval.isEmpty() || t != null) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    static class ParsePostDataAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Return Hashtable<String, String[]> retval,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (retval == null || retval.isEmpty() || t != null) {
+                return;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
 
-      Flow<Void> flow = callback.apply(reqCtx, retval);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-          t = new BlockingException("Blocked request (for SRTServletRequest/parsePostData)");
-          reqCtx.getTraceSegment().effectivelyBlocked();
+            Flow<Void> flow = callback.apply(reqCtx, retval);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                    t = new BlockingException("Blocked request (for SRTServletRequest/parsePostData)");
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/RequestFinishInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/RequestFinishInstrumentation.java
index 32e955e0197..e8eb5efc050 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/RequestFinishInstrumentation.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/RequestFinishInstrumentation.java
@@ -19,52 +19,52 @@
 
 @AutoService(InstrumenterModule.class)
 public class RequestFinishInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public RequestFinishInstrumentation() {
-    super("liberty");
-  }
+    public RequestFinishInstrumentation() {
+        super("liberty");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.ws.webcontainer.srt.SRTServletRequest";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.ibm.ws.webcontainer.srt.SRTServletRequest";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("finish").and(takesNoArguments()),
-        RequestFinishInstrumentation.class.getName() + "$RequestFinishAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("finish").and(takesNoArguments()),
+                RequestFinishInstrumentation.class.getName() + "$RequestFinishAdvice");
+    }
 
-  /** The function finish is called when a server receives and sends out a request */
-  @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
-  public static class RequestFinishAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(@Advice.This SRTServletRequest req) {
-      IExtendedResponse resp = req.getResponse();
+    /** The function finish is called when a server receives and sends out a request */
+    @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
+    public static class RequestFinishAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.This SRTServletRequest req) {
+            IExtendedResponse resp = req.getResponse();
 
-      // this should be a servlet response
-      if (resp instanceof SRTServletResponse) {
-        SRTServletResponse httpResp = (SRTServletResponse) resp;
-        Object contextObj = null;
-        try {
-          contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-        } catch (NullPointerException e) {
-          // OpenLiberty will throw NPE on getAttribute if the response has already been closed.
-        }
+            // this should be a servlet response
+            if (resp instanceof SRTServletResponse) {
+                SRTServletResponse httpResp = (SRTServletResponse) resp;
+                Object contextObj = null;
+                try {
+                    contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+                } catch (NullPointerException e) {
+                    // OpenLiberty will throw NPE on getAttribute if the response has already been closed.
+                }
 
-        if (contextObj instanceof Context) {
-          req.setAttribute(DD_CONTEXT_ATTRIBUTE, null);
-          final Context context = (Context) contextObj;
-          final AgentSpan span = fromContext(context);
-          if (span != null) {
-            DECORATE.onSRTResponse(span, httpResp);
-            DECORATE.beforeFinish(context);
-            span.finish();
-          }
+                if (contextObj instanceof Context) {
+                    req.setAttribute(DD_CONTEXT_ATTRIBUTE, null);
+                    final Context context = (Context) contextObj;
+                    final AgentSpan span = fromContext(context);
+                    if (span != null) {
+                        DECORATE.onSRTResponse(span, httpResp);
+                        DECORATE.beforeFinish(context);
+                        span.finish();
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/RequestMessageFromServletRequestHelper.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/RequestMessageFromServletRequestHelper.java
index feb6ac7c6af..4bec7e933be 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/RequestMessageFromServletRequestHelper.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/RequestMessageFromServletRequestHelper.java
@@ -10,33 +10,29 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 public class RequestMessageFromServletRequestHelper {
-  private static final ConcurrentHashMap<Class<?>, MethodHandle> FIELD_CACHE =
-      new ConcurrentHashMap<>();
+    private static final ConcurrentHashMap<Class<?>, MethodHandle> FIELD_CACHE = new ConcurrentHashMap<>();
 
-  public static Object getHttpRequestMessage(SRTServletRequest request) {
-    IRequest iRequest = request.getIRequest();
-    if (iRequest instanceof IRequestExtended) {
-      HttpRequest transportRequest =
-          ((IRequestExtended) iRequest).getHttpInboundConnection().getRequest();
-      try {
-        MethodHandle messageGetter =
-            FIELD_CACHE.computeIfAbsent(
-                transportRequest.getClass(),
-                clazz -> {
-                  Field messageField;
-                  try {
-                    messageField = clazz.getDeclaredField("message");
-                    messageField.setAccessible(true);
-                    return MethodHandles.lookup().unreflectGetter(messageField);
-                  } catch (NoSuchFieldException | IllegalAccessException e) {
-                    throw new RuntimeException(e);
-                  }
+    public static Object getHttpRequestMessage(SRTServletRequest request) {
+        IRequest iRequest = request.getIRequest();
+        if (iRequest instanceof IRequestExtended) {
+            HttpRequest transportRequest =
+                    ((IRequestExtended) iRequest).getHttpInboundConnection().getRequest();
+            try {
+                MethodHandle messageGetter = FIELD_CACHE.computeIfAbsent(transportRequest.getClass(), clazz -> {
+                    Field messageField;
+                    try {
+                        messageField = clazz.getDeclaredField("message");
+                        messageField.setAccessible(true);
+                        return MethodHandles.lookup().unreflectGetter(messageField);
+                    } catch (NoSuchFieldException | IllegalAccessException e) {
+                        throw new RuntimeException(e);
+                    }
                 });
-        return messageGetter.invoke(transportRequest);
-      } catch (Throwable e) {
-        throw new RuntimeException(e);
-      }
+                return messageGetter.invoke(transportRequest);
+            } catch (Throwable e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/RequestURIDataAdapter.java
index c5c11c08f59..15968b98c71 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/RequestURIDataAdapter.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/RequestURIDataAdapter.java
@@ -5,39 +5,39 @@
 
 final class RequestURIDataAdapter extends URIRawDataAdapter {
 
-  private final HttpServletRequest request;
-
-  RequestURIDataAdapter(HttpServletRequest request) {
-    this.request = request;
-  }
-
-  @Override
-  public String scheme() {
-    return request.getScheme();
-  }
-
-  @Override
-  public String host() {
-    return request.getServerName();
-  }
-
-  @Override
-  public int port() {
-    return request.getServerPort();
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return request.getRequestURI();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return request.getQueryString();
-  }
+    private final HttpServletRequest request;
+
+    RequestURIDataAdapter(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    @Override
+    public String scheme() {
+        return request.getScheme();
+    }
+
+    @Override
+    public String host() {
+        return request.getServerName();
+    }
+
+    @Override
+    public int port() {
+        return request.getServerPort();
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return request.getRequestURI();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return request.getQueryString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ResponseFinishInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ResponseFinishInstrumentation.java
index 07876198ba6..dcd7bdebb72 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ResponseFinishInstrumentation.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ResponseFinishInstrumentation.java
@@ -28,81 +28,80 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ResponseFinishInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ResponseFinishInstrumentation() {
-    super("liberty");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.ws.webcontainer.srt.SRTServletResponse";
-  }
+    public ResponseFinishInstrumentation() {
+        super("liberty");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("finish").and(takesNoArguments()),
-        ResponseFinishInstrumentation.class.getName() + "$ResponseFinishAdvice");
-    transformer.applyAdvice(
-        named("closeResponseOutput").and(takesArguments(1)).and(takesArgument(0, boolean.class)),
-        ResponseFinishInstrumentation.class.getName() + "$SetCompletedAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.ibm.ws.webcontainer.srt.SRTServletResponse";
+    }
 
-  /**
-   * Older versions have the inserted code conditioned on <code>
-   * reqState.getCurrentThreadsIExtendedRequest() == this.getRequest()</code>, though not in all
-   * code paths (for instance, not when getOutputStream() was called instead of getWriter). This
-   * inconsistency, together with the fact that newer versions don't have this condition anymore,
-   * suggests it is a bug. Without this inserted advice, async requests are not completed when
-   * blocking async requests.
-   */
-  static class SetCompletedAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(@Advice.Argument(0) boolean releaseChannel) {
-      WebContainerRequestState reqState = WebContainerRequestState.getInstance(true);
-      if (releaseChannel && !reqState.isCompleted()) {
-        reqState.setCompleted(true);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("finish").and(takesNoArguments()),
+                ResponseFinishInstrumentation.class.getName() + "$ResponseFinishAdvice");
+        transformer.applyAdvice(
+                named("closeResponseOutput").and(takesArguments(1)).and(takesArgument(0, boolean.class)),
+                ResponseFinishInstrumentation.class.getName() + "$SetCompletedAdvice");
     }
-  }
 
-  @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
-  public static class ResponseFinishAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static Context onEnter(@Advice.This SRTServletResponse resp) {
-      // this is the last opportunity to have any meaningful
-      // interaction with the response
-      Context context = null;
-      IExtendedRequest req = resp.getRequest();
-      try {
-        Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-        if (contextObj instanceof Context) {
-          context = (Context) contextObj;
-          req.setAttribute(DD_CONTEXT_ATTRIBUTE, null);
-          AgentSpan span = fromContext(context);
-          if (span != null) {
-            DECORATE.onSRTResponse(span, resp);
-          }
+    /**
+     * Older versions have the inserted code conditioned on <code>
+     * reqState.getCurrentThreadsIExtendedRequest() == this.getRequest()</code>, though not in all
+     * code paths (for instance, not when getOutputStream() was called instead of getWriter). This
+     * inconsistency, together with the fact that newer versions don't have this condition anymore,
+     * suggests it is a bug. Without this inserted advice, async requests are not completed when
+     * blocking async requests.
+     */
+    static class SetCompletedAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.Argument(0) boolean releaseChannel) {
+            WebContainerRequestState reqState = WebContainerRequestState.getInstance(true);
+            if (releaseChannel && !reqState.isCompleted()) {
+                reqState.setCompleted(true);
+            }
         }
-      } catch (NullPointerException e) {
-        // OpenLiberty will throw NPE on getAttribute if the response has already been closed.
-      }
-
-      return context;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.This SRTServletResponse resp, @Advice.Enter Context context) {
-      if (context == null) {
-        return;
-      }
-      AgentSpan span = fromContext(context);
-      if (span != null) {
-        DECORATE.beforeFinish(context);
-        span.finish();
-      }
+    @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION")
+    public static class ResponseFinishAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static Context onEnter(@Advice.This SRTServletResponse resp) {
+            // this is the last opportunity to have any meaningful
+            // interaction with the response
+            Context context = null;
+            IExtendedRequest req = resp.getRequest();
+            try {
+                Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+                if (contextObj instanceof Context) {
+                    context = (Context) contextObj;
+                    req.setAttribute(DD_CONTEXT_ATTRIBUTE, null);
+                    AgentSpan span = fromContext(context);
+                    if (span != null) {
+                        DECORATE.onSRTResponse(span, resp);
+                    }
+                }
+            } catch (NullPointerException e) {
+                // OpenLiberty will throw NPE on getAttribute if the response has already been closed.
+            }
+
+            return context;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.This SRTServletResponse resp, @Advice.Enter Context context) {
+            if (context == null) {
+                return;
+            }
+            AgentSpan span = fromContext(context);
+            if (span != null) {
+                DECORATE.beforeFinish(context);
+                span.finish();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/WebAppHandleExceptionInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/WebAppHandleExceptionInstrumentation.java
index 87ce505313c..9b8c291f319 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/WebAppHandleExceptionInstrumentation.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/WebAppHandleExceptionInstrumentation.java
@@ -20,38 +20,38 @@
  */
 @AutoService(InstrumenterModule.class)
 public class WebAppHandleExceptionInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public WebAppHandleExceptionInstrumentation() {
-    super("liberty");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public WebAppHandleExceptionInstrumentation() {
+        super("liberty");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.ws.webcontainer.webapp.WebApp";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.ibm.ws.webcontainer.webapp.WebApp";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("handleException"))
-            .and(takesArguments(4))
-            .and(takesArgument(0, Throwable.class))
-            .and(returns(void.class)),
-        WebAppHandleExceptionInstrumentation.class.getName() + "$HandleExceptionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("handleException"))
+                        .and(takesArguments(4))
+                        .and(takesArgument(0, Throwable.class))
+                        .and(returns(void.class)),
+                WebAppHandleExceptionInstrumentation.class.getName() + "$HandleExceptionAdvice");
+    }
 
-  static class HandleExceptionAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-    static boolean /* skip */ before(@Advice.Argument(0) Throwable throwable_) {
-      Throwable throwable = throwable_;
-      if (throwable instanceof WebAppErrorReport) {
-        throwable = throwable.getCause();
-      }
-      if (throwable instanceof BlockingException) {
-        return throwable.getMessage().startsWith("Blocked response");
-      }
-      return false;
+    static class HandleExceptionAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+        static boolean /* skip */ before(@Advice.Argument(0) Throwable throwable_) {
+            Throwable throwable = throwable_;
+            if (throwable instanceof WebAppErrorReport) {
+                throwable = throwable.getCause();
+            }
+            if (throwable instanceof BlockingException) {
+                return throwable.getMessage().startsWith("Blocked response");
+            }
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/webapp/java/datadog/trace/instrumentation/liberty23/AsyncServlet5.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/webapp/java/datadog/trace/instrumentation/liberty23/AsyncServlet5.java
index e18e38d308a..6fd0a81c4f7 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/webapp/java/datadog/trace/instrumentation/liberty23/AsyncServlet5.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/webapp/java/datadog/trace/instrumentation/liberty23/AsyncServlet5.java
@@ -30,194 +30,184 @@
 import java.util.Enumeration;
 
 @WebServlet(
-    urlPatterns = {
-      "/async/success",
-      "/async/created",
-      "/async/created_input_stream",
-      "/async/body-urlencoded",
-      "/async/body-multipart",
-      "/async/body-json",
-      "/async/redirect",
-      "/async/forwarded",
-      "/async/error-status",
-      "/async/exception",
-      "/async/custom-exception",
-      "/async/not-here",
-      "/async/timeout",
-      "/async/timeout_error",
-      "/async/query",
-      "/async/encoded path query",
-      "/async/encoded_query",
-      "/async/user-block",
-      "/async/session",
-    },
-    asyncSupported = true)
-@MultipartConfig(
-    maxFileSize = 10 * 1024 * 1024,
-    maxRequestSize = 20 * 1024 * 1024,
-    fileSizeThreshold = 5 * 1024 * 1024)
+        urlPatterns = {
+            "/async/success",
+            "/async/created",
+            "/async/created_input_stream",
+            "/async/body-urlencoded",
+            "/async/body-multipart",
+            "/async/body-json",
+            "/async/redirect",
+            "/async/forwarded",
+            "/async/error-status",
+            "/async/exception",
+            "/async/custom-exception",
+            "/async/not-here",
+            "/async/timeout",
+            "/async/timeout_error",
+            "/async/query",
+            "/async/encoded path query",
+            "/async/encoded_query",
+            "/async/user-block",
+            "/async/session",
+        },
+        asyncSupported = true)
+@MultipartConfig(maxFileSize = 10 * 1024 * 1024, maxRequestSize = 20 * 1024 * 1024, fileSizeThreshold = 5 * 1024 * 1024)
 public class AsyncServlet5 extends HttpServlet {
-  datadog.trace.instrumentation.servlet5.TestServlet5 delegate;
-
-  {
-    try {
-      delegate =
-          new datadog.trace.instrumentation.servlet5.TestServlet5() {
-            @Override
-            public HttpServerTest.ServerEndpoint determineEndpoint(HttpServletRequest req) {
-              return HttpServerTest.ServerEndpoint.forPath(
-                  req.getRequestURI().substring(req.getRequestURI().lastIndexOf('/')));
-            }
-          };
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+    datadog.trace.instrumentation.servlet5.TestServlet5 delegate;
+
+    {
+        try {
+            delegate = new datadog.trace.instrumentation.servlet5.TestServlet5() {
+                @Override
+                public HttpServerTest.ServerEndpoint determineEndpoint(HttpServletRequest req) {
+                    return HttpServerTest.ServerEndpoint.forPath(
+                            req.getRequestURI().substring(req.getRequestURI().lastIndexOf('/')));
+                }
+            };
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
-
-  @Override
-  public void service(ServletRequest req, final ServletResponse res)
-      throws ServletException, IOException {
-    Object attribute = req.getAttribute("ddog.dispatched");
-
-    if (attribute == null) {
-      AsyncContext asyncContext = req.startAsync();
-      req.setAttribute("ddog.dispatched", 1);
-      asyncContext.dispatch();
-    } else {
-      HttpServerTest.ServerEndpoint serverEndpoint =
-          delegate.determineEndpoint((HttpServletRequest) req);
-      if (serverEndpoint == BODY_MULTIPART) {
-        // needed to trigger reading the body on openliberty
-        ((HttpServletRequest) req).getParts();
-      } else if (serverEndpoint == ERROR
-          || serverEndpoint == QUERY_ENCODED_BOTH
-          || serverEndpoint == SESSION_ID) {
-        delegate.service(req, res);
-        return;
-      }
-
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      PrintWriter writer = new PrintWriter(baos);
-      HttpServletResponseWrapper wrappedRes =
-          new HttpServletResponseWrapper((HttpServletResponse) res) {
-            @Override
-            public PrintWriter getWriter() throws IOException {
-              return writer;
-            }
-          };
-
-      delegate.service(req, wrappedRes);
-      writer.flush();
-
-      AsyncContext asyncContext = req.startAsync();
-      asyncContext.setTimeout(1000);
-      asyncContext.addListener(
-          new AsyncListener() {
-            @Override
-            public void onComplete(AsyncEvent event) throws IOException {
-              log("onComplete");
-            }
 
-            @Override
-            public void onTimeout(AsyncEvent event) throws IOException {
-              log("onTimeout");
+    @Override
+    public void service(ServletRequest req, final ServletResponse res) throws ServletException, IOException {
+        Object attribute = req.getAttribute("ddog.dispatched");
+
+        if (attribute == null) {
+            AsyncContext asyncContext = req.startAsync();
+            req.setAttribute("ddog.dispatched", 1);
+            asyncContext.dispatch();
+        } else {
+            HttpServerTest.ServerEndpoint serverEndpoint = delegate.determineEndpoint((HttpServletRequest) req);
+            if (serverEndpoint == BODY_MULTIPART) {
+                // needed to trigger reading the body on openliberty
+                ((HttpServletRequest) req).getParts();
+            } else if (serverEndpoint == ERROR
+                    || serverEndpoint == QUERY_ENCODED_BOTH
+                    || serverEndpoint == SESSION_ID) {
+                delegate.service(req, res);
+                return;
             }
 
-            @Override
-            public void onError(AsyncEvent event) throws IOException {
-              log("onError", event.getThrowable());
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            PrintWriter writer = new PrintWriter(baos);
+            HttpServletResponseWrapper wrappedRes = new HttpServletResponseWrapper((HttpServletResponse) res) {
+                @Override
+                public PrintWriter getWriter() throws IOException {
+                    return writer;
+                }
+            };
+
+            delegate.service(req, wrappedRes);
+            writer.flush();
+
+            AsyncContext asyncContext = req.startAsync();
+            asyncContext.setTimeout(1000);
+            asyncContext.addListener(new AsyncListener() {
+                @Override
+                public void onComplete(AsyncEvent event) throws IOException {
+                    log("onComplete");
+                }
+
+                @Override
+                public void onTimeout(AsyncEvent event) throws IOException {
+                    log("onTimeout");
+                }
+
+                @Override
+                public void onError(AsyncEvent event) throws IOException {
+                    log("onError", event.getThrowable());
+                }
+
+                @Override
+                public void onStartAsync(AsyncEvent event) throws IOException {
+                    event.getAsyncContext().addListener(this);
+                }
+            });
+
+            ServletOutputStream outputStream;
+            try {
+                outputStream = res.getOutputStream();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
             }
 
-            @Override
-            public void onStartAsync(AsyncEvent event) throws IOException {
-              event.getAsyncContext().addListener(this);
-            }
-          });
-
-      ServletOutputStream outputStream;
-      try {
-        outputStream = res.getOutputStream();
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-
-      WriteListener listener =
-          new WriteListener() {
-            @Override
-            public void onWritePossible() throws IOException {
-              outputStream.write(baos.toByteArray());
-              asyncContext.complete();
+            WriteListener listener = new WriteListener() {
+                @Override
+                public void onWritePossible() throws IOException {
+                    outputStream.write(baos.toByteArray());
+                    asyncContext.complete();
+                }
+
+                @Override
+                public void onError(Throwable e) {
+                    log("onError", e);
+                    asyncContext.complete();
+                }
+            };
+
+            try {
+                Method setWriteListener = ServletOutputStream.class.getMethod("setWriteListener", WriteListener.class);
+                setWriteListener.invoke(outputStream, listener);
+            } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+                throw new RuntimeException(e);
             }
+        }
+    }
 
-            @Override
-            public void onError(Throwable e) {
-              log("onError", e);
-              asyncContext.complete();
-            }
-          };
-
-      try {
-        Method setWriteListener =
-            ServletOutputStream.class.getMethod("setWriteListener", WriteListener.class);
-        setWriteListener.invoke(outputStream, listener);
-      } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-        throw new RuntimeException(e);
-      }
+    @Override
+    public void destroy() {
+        delegate.destroy();
+    }
+
+    @Override
+    public String getInitParameter(String name) {
+        return delegate.getInitParameter(name);
+    }
+
+    @Override
+    public Enumeration<String> getInitParameterNames() {
+        return delegate.getInitParameterNames();
+    }
+
+    @Override
+    public ServletConfig getServletConfig() {
+        return delegate.getServletConfig();
+    }
+
+    @Override
+    public ServletContext getServletContext() {
+        return delegate.getServletContext();
+    }
+
+    @Override
+    public String getServletInfo() {
+        return delegate.getServletInfo();
+    }
+
+    @Override
+    public void init() throws ServletException {
+        delegate.init();
+    }
+
+    @Override
+    public void init(ServletConfig config) throws ServletException {
+        delegate.init(config);
+    }
+
+    @Override
+    public String getServletName() {
+        return delegate.getServletName();
+    }
+
+    @Override
+    public void log(String msg) {
+        delegate.log(msg);
+    }
+
+    @Override
+    public void log(String msg, Throwable t) {
+        delegate.log(msg, t);
     }
-  }
-
-  @Override
-  public void destroy() {
-    delegate.destroy();
-  }
-
-  @Override
-  public String getInitParameter(String name) {
-    return delegate.getInitParameter(name);
-  }
-
-  @Override
-  public Enumeration<String> getInitParameterNames() {
-    return delegate.getInitParameterNames();
-  }
-
-  @Override
-  public ServletConfig getServletConfig() {
-    return delegate.getServletConfig();
-  }
-
-  @Override
-  public ServletContext getServletContext() {
-    return delegate.getServletContext();
-  }
-
-  @Override
-  public String getServletInfo() {
-    return delegate.getServletInfo();
-  }
-
-  @Override
-  public void init() throws ServletException {
-    delegate.init();
-  }
-
-  @Override
-  public void init(ServletConfig config) throws ServletException {
-    delegate.init(config);
-  }
-
-  @Override
-  public String getServletName() {
-    return delegate.getServletName();
-  }
-
-  @Override
-  public void log(String msg) {
-    delegate.log(msg);
-  }
-
-  @Override
-  public void log(String msg, Throwable t) {
-    delegate.log(msg, t);
-  }
 }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/webapp/java/datadog/trace/instrumentation/liberty23/PassthruSyncServlet5.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/webapp/java/datadog/trace/instrumentation/liberty23/PassthruSyncServlet5.java
index c9d7476c78f..640bdf066d7 100644
--- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/webapp/java/datadog/trace/instrumentation/liberty23/PassthruSyncServlet5.java
+++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/webapp/java/datadog/trace/instrumentation/liberty23/PassthruSyncServlet5.java
@@ -15,114 +15,110 @@
 import java.util.Enumeration;
 
 @WebServlet(
-    urlPatterns = {
-      "/success",
-      "/created",
-      "/created_input_stream",
-      "/body-urlencoded",
-      "/body-multipart",
-      "/body-json",
-      "/redirect",
-      "/forwarded",
-      "/error-status",
-      "/exception",
-      "/custom-exception",
-      "/not-here",
-      "/timeout",
-      "/timeout_error",
-      "/query",
-      "/encoded path query",
-      "/encoded_query",
-      "/user-block",
-      "/session",
-    })
-@MultipartConfig(
-    maxFileSize = 10 * 1024 * 1024,
-    maxRequestSize = 20 * 1024 * 1024,
-    fileSizeThreshold = 5 * 1024 * 1024)
+        urlPatterns = {
+            "/success",
+            "/created",
+            "/created_input_stream",
+            "/body-urlencoded",
+            "/body-multipart",
+            "/body-json",
+            "/redirect",
+            "/forwarded",
+            "/error-status",
+            "/exception",
+            "/custom-exception",
+            "/not-here",
+            "/timeout",
+            "/timeout_error",
+            "/query",
+            "/encoded path query",
+            "/encoded_query",
+            "/user-block",
+            "/session",
+        })
+@MultipartConfig(maxFileSize = 10 * 1024 * 1024, maxRequestSize = 20 * 1024 * 1024, fileSizeThreshold = 5 * 1024 * 1024)
 public class PassthruSyncServlet5 extends HttpServlet {
-  datadog.trace.instrumentation.servlet5.TestServlet5 delegate;
+    datadog.trace.instrumentation.servlet5.TestServlet5 delegate;
+
+    {
+        try {
+            delegate = new datadog.trace.instrumentation.servlet5.TestServlet5();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {
+        if (delegate.determineEndpoint((HttpServletRequest) req) == BODY_MULTIPART) {
+            // needed to trigger reading the body on openliberty
+            ((HttpServletRequest) req).getParts();
+        }
+        try {
+            delegate.service(req, res);
+        } catch (Throwable t) {
+            throw t;
+        } finally {
+            if (((HttpServletRequest) req).getHeader("x-commit-during-response") != null) {
+                res.flushBuffer();
+                res.getWriter().close();
+                throw new RuntimeException("should not be reached");
+            }
+        }
+    }
 
-  {
-    try {
-      delegate = new datadog.trace.instrumentation.servlet5.TestServlet5();
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+    @Override
+    public void destroy() {
+        delegate.destroy();
     }
-  }
-
-  @Override
-  public void service(ServletRequest req, ServletResponse res)
-      throws ServletException, IOException {
-    if (delegate.determineEndpoint((HttpServletRequest) req) == BODY_MULTIPART) {
-      // needed to trigger reading the body on openliberty
-      ((HttpServletRequest) req).getParts();
+
+    @Override
+    public String getInitParameter(String name) {
+        return delegate.getInitParameter(name);
+    }
+
+    @Override
+    public Enumeration<String> getInitParameterNames() {
+        return delegate.getInitParameterNames();
     }
-    try {
-      delegate.service(req, res);
-    } catch (Throwable t) {
-      throw t;
-    } finally {
-      if (((HttpServletRequest) req).getHeader("x-commit-during-response") != null) {
-        res.flushBuffer();
-        res.getWriter().close();
-        throw new RuntimeException("should not be reached");
-      }
+
+    @Override
+    public ServletConfig getServletConfig() {
+        return delegate.getServletConfig();
+    }
+
+    @Override
+    public ServletContext getServletContext() {
+        return delegate.getServletContext();
+    }
+
+    @Override
+    public String getServletInfo() {
+        return delegate.getServletInfo();
+    }
+
+    @Override
+    public void init() throws ServletException {
+        delegate.init();
+    }
+
+    @Override
+    public void init(ServletConfig config) throws ServletException {
+        delegate.init(config);
+    }
+
+    @Override
+    public String getServletName() {
+        return delegate.getServletName();
+    }
+
+    @Override
+    public void log(String msg) {
+        delegate.log(msg);
+    }
+
+    @Override
+    public void log(String msg, Throwable t) {
+        delegate.log(msg, t);
     }
-  }
-
-  @Override
-  public void destroy() {
-    delegate.destroy();
-  }
-
-  @Override
-  public String getInitParameter(String name) {
-    return delegate.getInitParameter(name);
-  }
-
-  @Override
-  public Enumeration<String> getInitParameterNames() {
-    return delegate.getInitParameterNames();
-  }
-
-  @Override
-  public ServletConfig getServletConfig() {
-    return delegate.getServletConfig();
-  }
-
-  @Override
-  public ServletContext getServletContext() {
-    return delegate.getServletContext();
-  }
-
-  @Override
-  public String getServletInfo() {
-    return delegate.getServletInfo();
-  }
-
-  @Override
-  public void init() throws ServletException {
-    delegate.init();
-  }
-
-  @Override
-  public void init(ServletConfig config) throws ServletException {
-    delegate.init(config);
-  }
-
-  @Override
-  public String getServletName() {
-    return delegate.getServletName();
-  }
-
-  @Override
-  public void log(String msg) {
-    delegate.log(msg);
-  }
-
-  @Override
-  public void log(String msg, Throwable t) {
-    delegate.log(msg, t);
-  }
 }
diff --git a/dd-java-agent/instrumentation/log4j/log4j-1.2.4/src/main/java/datadog/trace/instrumentation/log4j1/CategoryInstrumentation.java b/dd-java-agent/instrumentation/log4j/log4j-1.2.4/src/main/java/datadog/trace/instrumentation/log4j1/CategoryInstrumentation.java
index a7273e8beeb..6a2596680f7 100644
--- a/dd-java-agent/instrumentation/log4j/log4j-1.2.4/src/main/java/datadog/trace/instrumentation/log4j1/CategoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/log4j/log4j-1.2.4/src/main/java/datadog/trace/instrumentation/log4j1/CategoryInstrumentation.java
@@ -26,41 +26,41 @@
 
 @AutoService(InstrumenterModule.class)
 public class CategoryInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public CategoryInstrumentation() {
-    super("log4j", "log4j-1");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public CategoryInstrumentation() {
+        super("log4j", "log4j-1");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.log4j.Category";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.log4j.Category";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("org.apache.log4j.spi.LoggingEvent", AgentSpanContext.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.apache.log4j.spi.LoggingEvent", AgentSpanContext.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("callAppenders"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("org.apache.log4j.spi.LoggingEvent"))),
-        CategoryInstrumentation.class.getName() + "$CallAppendersAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("callAppenders"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("org.apache.log4j.spi.LoggingEvent"))),
+                CategoryInstrumentation.class.getName() + "$CallAppendersAdvice");
+    }
 
-  public static class CallAppendersAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(0) LoggingEvent event) {
-      AgentSpan span = activeSpan();
+    public static class CallAppendersAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(0) LoggingEvent event) {
+            AgentSpan span = activeSpan();
 
-      if (span != null && traceConfig(span).isLogsInjectionEnabled()) {
-        InstrumentationContext.get(LoggingEvent.class, AgentSpanContext.class)
-            .put(event, span.spanContext());
-      }
+            if (span != null && traceConfig(span).isLogsInjectionEnabled()) {
+                InstrumentationContext.get(LoggingEvent.class, AgentSpanContext.class)
+                        .put(event, span.spanContext());
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/log4j/log4j-1.2.4/src/main/java/datadog/trace/instrumentation/log4j1/LoggingEventInstrumentation.java b/dd-java-agent/instrumentation/log4j/log4j-1.2.4/src/main/java/datadog/trace/instrumentation/log4j1/LoggingEventInstrumentation.java
index bb9607d2bb2..fc449065ebd 100644
--- a/dd-java-agent/instrumentation/log4j/log4j-1.2.4/src/main/java/datadog/trace/instrumentation/log4j1/LoggingEventInstrumentation.java
+++ b/dd-java-agent/instrumentation/log4j/log4j-1.2.4/src/main/java/datadog/trace/instrumentation/log4j1/LoggingEventInstrumentation.java
@@ -24,147 +24,145 @@
 
 @AutoService(InstrumenterModule.class)
 public class LoggingEventInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public LoggingEventInstrumentation() {
-    super("log4j", "log4j-1");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.log4j.spi.LoggingEvent";
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("org.apache.log4j.spi.LoggingEvent", AgentSpanContext.class.getName());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("getMDC")).and(takesArgument(0, String.class)),
-        LoggingEventInstrumentation.class.getName() + "$GetMdcAdvice");
-
-    transformer.applyAdvice(
-        isMethod().and(named("getMDCCopy")).and(takesArguments(0)),
-        LoggingEventInstrumentation.class.getName() + "$GetMdcCopyAdvice");
-  }
-
-  public static class GetMdcAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void getMdcValue(
-        @Advice.This LoggingEvent event,
-        @Advice.Argument(0) String key,
-        @Advice.Return(readOnly = false) Object value) {
-
-      // The mdc has priority over our tags
-      // if the mdc had a value for the key, or the key is null (invalid for a switch)
-      // just return
-      if (value != null || key == null) {
-        return;
-      }
-
-      AgentSpanContext context =
-          InstrumentationContext.get(LoggingEvent.class, AgentSpanContext.class).get(event);
-
-      // Nothing to add so return early
-      if (context == null && !AgentTracer.traceConfig().isLogsInjectionEnabled()) {
-        return;
-      }
-
-      switch (key) {
-        case Tags.DD_SERVICE:
-          value = Config.get().getServiceName();
-          if (null != value && ((String) value).isEmpty()) {
-            value = null;
-          }
-          break;
-        case Tags.DD_ENV:
-          value = Config.get().getEnv();
-          if (null != value && ((String) value).isEmpty()) {
-            value = null;
-          }
-          break;
-        case Tags.DD_VERSION:
-          value = Config.get().getVersion();
-          if (null != value && ((String) value).isEmpty()) {
-            value = null;
-          }
-          break;
-        case "dd.trace_id":
-          if (context != null) {
-            DDTraceId traceId = context.getTraceId();
-            if (traceId.toHighOrderLong() != 0 && Config.get().isLogs128bitTraceIdEnabled()) {
-              value = traceId.toHexString();
-            } else {
-              value = traceId.toString();
-            }
-          }
-          break;
-        case "dd.span_id":
-          if (context != null) {
-            value = DDSpanId.toString(context.getSpanId());
-          }
-          break;
-        default:
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public LoggingEventInstrumentation() {
+        super("log4j", "log4j-1");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.apache.log4j.spi.LoggingEvent";
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.apache.log4j.spi.LoggingEvent", AgentSpanContext.class.getName());
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("getMDC")).and(takesArgument(0, String.class)),
+                LoggingEventInstrumentation.class.getName() + "$GetMdcAdvice");
+
+        transformer.applyAdvice(
+                isMethod().and(named("getMDCCopy")).and(takesArguments(0)),
+                LoggingEventInstrumentation.class.getName() + "$GetMdcCopyAdvice");
     }
-  }
-
-  public static class GetMdcCopyAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static boolean onEnter(
-        @Advice.This LoggingEvent event,
-        @Advice.FieldValue(value = "mdcCopyLookupRequired", readOnly = false)
-            boolean copyRequired) {
-      if (!copyRequired) {
-        return false;
-      }
-      AgentSpanContext context =
-          InstrumentationContext.get(LoggingEvent.class, AgentSpanContext.class).get(event);
-
-      return (context != null || AgentTracer.traceConfig().isLogsInjectionEnabled());
+
+    public static class GetMdcAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void getMdcValue(
+                @Advice.This LoggingEvent event,
+                @Advice.Argument(0) String key,
+                @Advice.Return(readOnly = false) Object value) {
+
+            // The mdc has priority over our tags
+            // if the mdc had a value for the key, or the key is null (invalid for a switch)
+            // just return
+            if (value != null || key == null) {
+                return;
+            }
+
+            AgentSpanContext context = InstrumentationContext.get(LoggingEvent.class, AgentSpanContext.class)
+                    .get(event);
+
+            // Nothing to add so return early
+            if (context == null && !AgentTracer.traceConfig().isLogsInjectionEnabled()) {
+                return;
+            }
+
+            switch (key) {
+                case Tags.DD_SERVICE:
+                    value = Config.get().getServiceName();
+                    if (null != value && ((String) value).isEmpty()) {
+                        value = null;
+                    }
+                    break;
+                case Tags.DD_ENV:
+                    value = Config.get().getEnv();
+                    if (null != value && ((String) value).isEmpty()) {
+                        value = null;
+                    }
+                    break;
+                case Tags.DD_VERSION:
+                    value = Config.get().getVersion();
+                    if (null != value && ((String) value).isEmpty()) {
+                        value = null;
+                    }
+                    break;
+                case "dd.trace_id":
+                    if (context != null) {
+                        DDTraceId traceId = context.getTraceId();
+                        if (traceId.toHighOrderLong() != 0 && Config.get().isLogs128bitTraceIdEnabled()) {
+                            value = traceId.toHexString();
+                        } else {
+                            value = traceId.toString();
+                        }
+                    }
+                    break;
+                case "dd.span_id":
+                    if (context != null) {
+                        value = DDSpanId.toString(context.getSpanId());
+                    }
+                    break;
+                default:
+            }
+        }
     }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This LoggingEvent event,
-        @Advice.Enter() boolean injectionRequired,
-        @Advice.FieldValue(value = "mdcCopy") Hashtable mdc) {
-      if (!injectionRequired) {
-        return;
-      }
-      if (mdc == null) {
-        // this.mdcCopy can be null when MDC.getContext() returns null
-        return;
-      }
-      // at this point the mdc has been shallow copied. No need to replace with a new hashtable.
-      // Just add our info
-      String serviceName = Config.get().getServiceName();
-      if (null != serviceName && !serviceName.isEmpty()) {
-        mdc.put(Tags.DD_SERVICE, serviceName);
-      }
-      String env = Config.get().getEnv();
-      if (null != env && !env.isEmpty()) {
-        mdc.put(Tags.DD_ENV, env);
-      }
-      String version = Config.get().getVersion();
-      if (null != version && !version.isEmpty()) {
-        mdc.put(Tags.DD_VERSION, version);
-      }
-
-      AgentSpanContext context =
-          InstrumentationContext.get(LoggingEvent.class, AgentSpanContext.class).get(event);
-
-      if (context != null) {
-        DDTraceId traceId = context.getTraceId();
-        String traceIdValue =
-            Config.get().isLogs128bitTraceIdEnabled() && traceId.toHighOrderLong() != 0
-                ? traceId.toHexString()
-                : traceId.toString();
-        mdc.put(CorrelationIdentifier.getTraceIdKey(), traceIdValue);
-        mdc.put(CorrelationIdentifier.getSpanIdKey(), DDSpanId.toString(context.getSpanId()));
-      }
+    public static class GetMdcCopyAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static boolean onEnter(
+                @Advice.This LoggingEvent event,
+                @Advice.FieldValue(value = "mdcCopyLookupRequired", readOnly = false) boolean copyRequired) {
+            if (!copyRequired) {
+                return false;
+            }
+            AgentSpanContext context = InstrumentationContext.get(LoggingEvent.class, AgentSpanContext.class)
+                    .get(event);
+
+            return (context != null || AgentTracer.traceConfig().isLogsInjectionEnabled());
+        }
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This LoggingEvent event,
+                @Advice.Enter() boolean injectionRequired,
+                @Advice.FieldValue(value = "mdcCopy") Hashtable mdc) {
+            if (!injectionRequired) {
+                return;
+            }
+            if (mdc == null) {
+                // this.mdcCopy can be null when MDC.getContext() returns null
+                return;
+            }
+            // at this point the mdc has been shallow copied. No need to replace with a new hashtable.
+            // Just add our info
+            String serviceName = Config.get().getServiceName();
+            if (null != serviceName && !serviceName.isEmpty()) {
+                mdc.put(Tags.DD_SERVICE, serviceName);
+            }
+            String env = Config.get().getEnv();
+            if (null != env && !env.isEmpty()) {
+                mdc.put(Tags.DD_ENV, env);
+            }
+            String version = Config.get().getVersion();
+            if (null != version && !version.isEmpty()) {
+                mdc.put(Tags.DD_VERSION, version);
+            }
+
+            AgentSpanContext context = InstrumentationContext.get(LoggingEvent.class, AgentSpanContext.class)
+                    .get(event);
+
+            if (context != null) {
+                DDTraceId traceId = context.getTraceId();
+                String traceIdValue = Config.get().isLogs128bitTraceIdEnabled() && traceId.toHighOrderLong() != 0
+                        ? traceId.toHexString()
+                        : traceId.toString();
+                mdc.put(CorrelationIdentifier.getTraceIdKey(), traceIdValue);
+                mdc.put(CorrelationIdentifier.getSpanIdKey(), DDSpanId.toString(context.getSpanId()));
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/DatadogAppender.java b/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/DatadogAppender.java
index 5a151f90d11..c638734f494 100644
--- a/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/DatadogAppender.java
+++ b/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/DatadogAppender.java
@@ -13,75 +13,74 @@
 
 public class DatadogAppender extends AbstractAppender {
 
-  private static final int MAX_STACKTRACE_STRING_LENGTH = 16 * 1_024;
+    private static final int MAX_STACKTRACE_STRING_LENGTH = 16 * 1_024;
 
-  private final boolean appLogsCollectionEnabled;
+    private final boolean appLogsCollectionEnabled;
 
-  public DatadogAppender(String name, Filter filter, Config config) {
-    super(name, filter, null);
-    this.appLogsCollectionEnabled = config.isAppLogsCollectionEnabled();
-  }
+    public DatadogAppender(String name, Filter filter, Config config) {
+        super(name, filter, null);
+        this.appLogsCollectionEnabled = config.isAppLogsCollectionEnabled();
+    }
 
-  @Override
-  public void append(final LogEvent event) {
-    LogsIntake.log(map(event));
-  }
+    @Override
+    public void append(final LogEvent event) {
+        LogsIntake.log(map(event));
+    }
 
-  /**
-   * This method follows the structure and naming of Log4j's JSON layout. The idea is that logs
-   * backend already knows how to parse logs coming from Log4j so the same format is used here. The
-   * reason for re-implementing this rather than using the existing layout class is that the latter
-   * requires additional dependencies that may or may not be present in the traced application.
-   */
-  private Map<String, Object> map(final LogEvent event) {
-    Map<String, Object> log = new HashMap<>();
-    log.put("thread", event.getThreadName());
-    log.put("level", event.getLevel().name());
-    log.put("loggerName", event.getLoggerName());
-    log.put("message", event.getMessage().getFormattedMessage());
+    /**
+     * This method follows the structure and naming of Log4j's JSON layout. The idea is that logs
+     * backend already knows how to parse logs coming from Log4j so the same format is used here. The
+     * reason for re-implementing this rather than using the existing layout class is that the latter
+     * requires additional dependencies that may or may not be present in the traced application.
+     */
+    private Map<String, Object> map(final LogEvent event) {
+        Map<String, Object> log = new HashMap<>();
+        log.put("thread", event.getThreadName());
+        log.put("level", event.getLevel().name());
+        log.put("loggerName", event.getLoggerName());
+        log.put("message", event.getMessage().getFormattedMessage());
 
-    Throwable thrown = event.getThrown();
-    if (thrown != null) {
-      Map<String, Object> thrownLog = new HashMap<>();
-      thrownLog.put("message", thrown.getMessage());
-      thrownLog.put("name", thrown.getClass().getCanonicalName());
-      // TODO consider using structured stack trace layout
-      //  (see
-      // org.apache.logging.log4j.layout.template.json.resolver.ExceptionResolver#createStackTraceResolver)
-      StringWriter stringWriter = new StringWriter();
-      PrintWriter printWriter = new PrintWriter(stringWriter);
-      thrown.printStackTrace(printWriter);
-      StringBuffer stackTraceBuffer = stringWriter.getBuffer();
-      String stackTraceString =
-          stackTraceBuffer.substring(
-              0, Math.min(stackTraceBuffer.length(), MAX_STACKTRACE_STRING_LENGTH));
-      thrownLog.put("extendedStackTrace", stackTraceString);
+        Throwable thrown = event.getThrown();
+        if (thrown != null) {
+            Map<String, Object> thrownLog = new HashMap<>();
+            thrownLog.put("message", thrown.getMessage());
+            thrownLog.put("name", thrown.getClass().getCanonicalName());
+            // TODO consider using structured stack trace layout
+            //  (see
+            // org.apache.logging.log4j.layout.template.json.resolver.ExceptionResolver#createStackTraceResolver)
+            StringWriter stringWriter = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(stringWriter);
+            thrown.printStackTrace(printWriter);
+            StringBuffer stackTraceBuffer = stringWriter.getBuffer();
+            String stackTraceString =
+                    stackTraceBuffer.substring(0, Math.min(stackTraceBuffer.length(), MAX_STACKTRACE_STRING_LENGTH));
+            thrownLog.put("extendedStackTrace", stackTraceString);
 
-      log.put("thrown", thrownLog);
-    }
-    log.put("endOfBatch", event.isEndOfBatch());
-    log.put("loggerFqcn", event.getLoggerFqcn());
-    if (appLogsCollectionEnabled) {
-      // skip log source for now as this is expensive
-      // will be later introduce with Log Origin and optimisations
-      String traceId = CorrelationIdentifier.getTraceId();
-      if (traceId != null && !traceId.equals("0")) {
-        log.put("dd.trace_id", traceId);
-      }
-      String spanId = CorrelationIdentifier.getSpanId();
-      if (spanId != null && !spanId.equals("0")) {
-        log.put("dd.span_id", spanId);
-      }
-    } else {
-      log.put("contextMap", event.getContextMap());
-      StackTraceElement source = event.getSource();
-      Map<String, Object> sourceLog = new HashMap<>();
-      sourceLog.put("class", source.getClassName());
-      sourceLog.put("method", source.getMethodName());
-      sourceLog.put("file", source.getFileName());
-      sourceLog.put("line", source.getLineNumber());
-      log.put("source", sourceLog);
+            log.put("thrown", thrownLog);
+        }
+        log.put("endOfBatch", event.isEndOfBatch());
+        log.put("loggerFqcn", event.getLoggerFqcn());
+        if (appLogsCollectionEnabled) {
+            // skip log source for now as this is expensive
+            // will be later introduce with Log Origin and optimisations
+            String traceId = CorrelationIdentifier.getTraceId();
+            if (traceId != null && !traceId.equals("0")) {
+                log.put("dd.trace_id", traceId);
+            }
+            String spanId = CorrelationIdentifier.getSpanId();
+            if (spanId != null && !spanId.equals("0")) {
+                log.put("dd.span_id", spanId);
+            }
+        } else {
+            log.put("contextMap", event.getContextMap());
+            StackTraceElement source = event.getSource();
+            Map<String, Object> sourceLog = new HashMap<>();
+            sourceLog.put("class", source.getClassName());
+            sourceLog.put("method", source.getMethodName());
+            sourceLog.put("file", source.getFileName());
+            sourceLog.put("line", source.getLineNumber());
+            log.put("source", sourceLog);
+        }
+        return log;
     }
-    return log;
-  }
 }
diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java b/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java
index 9ff173f256c..bb17f973e61 100644
--- a/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java
+++ b/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java
@@ -16,62 +16,61 @@
 
 @AutoService(InstrumenterModule.class)
 public class LoggerConfigInstrumentation extends InstrumenterModule
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public LoggerConfigInstrumentation() {
-    super("log4j", "log4j-2", "logs-intake", "logs-intake-log4j-2");
-  }
+    public LoggerConfigInstrumentation() {
+        super("log4j", "log4j-2", "logs-intake", "logs-intake-log4j-2");
+    }
 
-  @Override
-  public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    // this advice applicability is not completely apriori so we need to load every time and do
-    // enablement at runtime.
-    return true;
-  }
+    @Override
+    public boolean isApplicable(Set<TargetSystem> enabledSystems) {
+        // this advice applicability is not completely apriori so we need to load every time and do
+        // enablement at runtime.
+        return true;
+    }
 
-  @Override
-  public boolean isEnabled() {
-    final InstrumenterConfig cfg = InstrumenterConfig.get();
-    return super.isEnabled()
-        && ((cfg.isTraceEnabled() && cfg.isAgentlessLogSubmissionEnabled())
-            || cfg.isAppLogsCollectionEnabled());
-  }
+    @Override
+    public boolean isEnabled() {
+        final InstrumenterConfig cfg = InstrumenterConfig.get();
+        return super.isEnabled()
+                && ((cfg.isTraceEnabled() && cfg.isAgentlessLogSubmissionEnabled())
+                        || cfg.isAppLogsCollectionEnabled());
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.logging.log4j.core.config.LoggerConfig";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.logging.log4j.core.config.LoggerConfig";
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "logs-intake";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "logs-intake";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(),
-        LoggerConfigInstrumentation.class.getName() + "$LoggerConfigConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor(), LoggerConfigInstrumentation.class.getName() + "$LoggerConfigConstructorAdvice");
+    }
 
-  public static class LoggerConfigConstructorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(@Advice.This LoggerConfig loggerConfig) {
-      Map<String, Appender> appenders = loggerConfig.getAppenders();
-      if (appenders != null) {
-        for (Appender appender : appenders.values()) {
-          if (appender instanceof DatadogAppender) {
-            return;
-          }
-        }
-      }
+    public static class LoggerConfigConstructorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(@Advice.This LoggerConfig loggerConfig) {
+            Map<String, Appender> appenders = loggerConfig.getAppenders();
+            if (appenders != null) {
+                for (Appender appender : appenders.values()) {
+                    if (appender instanceof DatadogAppender) {
+                        return;
+                    }
+                }
+            }
 
-      Config config = Config.get();
-      DatadogAppender appender = new DatadogAppender("datadog", null, config);
-      appender.start();
+            Config config = Config.get();
+            DatadogAppender appender = new DatadogAppender("datadog", null, config);
+            appender.start();
 
-      Level level = Level.valueOf(config.getAgentlessLogSubmissionLevel());
-      loggerConfig.addAppender(appender, level, null);
+            Level level = Level.valueOf(config.getAgentlessLogSubmissionLevel());
+            loggerConfig.addAppender(appender, level, null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextInstrumentation.java b/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextInstrumentation.java
index 43c12cff0a0..9bebe52ac5d 100644
--- a/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextInstrumentation.java
@@ -13,39 +13,39 @@
 
 @AutoService(InstrumenterModule.class)
 public class ThreadContextInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  private static final String TYPE_NAME = "org.apache.logging.log4j.ThreadContext";
-
-  public ThreadContextInstrumentation() {
-    super("log4j", "log4j-2");
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Avoid matching log4j 2.7+ which has its own instrumentation.
-    return not(hasClassNamed("org.apache.logging.log4j.core.impl.ContextDataInjectorFactory"));
-  }
-
-  @Override
-  public String instrumentedType() {
-    return TYPE_NAME;
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isTypeInitializer(), ThreadContextInstrumentation.class.getName() + "$ThreadContextAdvice");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "default";
-  }
-
-  public static class ThreadContextAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void mdcClassInitialized() {
-      WithGlobalTracer.registerOrExecute(new ThreadContextUpdater());
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    private static final String TYPE_NAME = "org.apache.logging.log4j.ThreadContext";
+
+    public ThreadContextInstrumentation() {
+        super("log4j", "log4j-2");
+    }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Avoid matching log4j 2.7+ which has its own instrumentation.
+        return not(hasClassNamed("org.apache.logging.log4j.core.impl.ContextDataInjectorFactory"));
+    }
+
+    @Override
+    public String instrumentedType() {
+        return TYPE_NAME;
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isTypeInitializer(), ThreadContextInstrumentation.class.getName() + "$ThreadContextAdvice");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "default";
+    }
+
+    public static class ThreadContextAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void mdcClassInitialized() {
+            WithGlobalTracer.registerOrExecute(new ThreadContextUpdater());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextUpdater.java b/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextUpdater.java
index 78832cf821c..6c184979b45 100644
--- a/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextUpdater.java
+++ b/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextUpdater.java
@@ -4,13 +4,13 @@
 import org.apache.logging.log4j.ThreadContext;
 
 public class ThreadContextUpdater extends LogContextScopeListener {
-  @Override
-  public void add(String key, String value) {
-    ThreadContext.put(key, value);
-  }
+    @Override
+    public void add(String key, String value) {
+        ThreadContext.put(key, value);
+    }
 
-  @Override
-  public void remove(String key) {
-    ThreadContext.remove(key);
-  }
+    @Override
+    public void remove(String key) {
+        ThreadContext.remove(key);
+    }
 }
diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/ContextDataInjectorFactoryInstrumentation.java b/dd-java-agent/instrumentation/log4j/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/ContextDataInjectorFactoryInstrumentation.java
index 8051db2bf3e..f8dcd03ccfa 100644
--- a/dd-java-agent/instrumentation/log4j/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/ContextDataInjectorFactoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/log4j/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/ContextDataInjectorFactoryInstrumentation.java
@@ -20,33 +20,32 @@
 
 @AutoService(InstrumenterModule.class)
 public class ContextDataInjectorFactoryInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ContextDataInjectorFactoryInstrumentation() {
-    super("log4j", "log4j-2");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ContextDataInjectorFactoryInstrumentation() {
+        super("log4j", "log4j-2");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.logging.log4j.core.impl.ContextDataInjectorFactory";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.logging.log4j.core.impl.ContextDataInjectorFactory";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(isStatic())
-            .and(named("createInjector"))
-            .and(returns(named("org.apache.logging.log4j.core.ContextDataInjector"))),
-        ContextDataInjectorFactoryInstrumentation.class.getName() + "$CreateInjectorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(isStatic())
+                        .and(named("createInjector"))
+                        .and(returns(named("org.apache.logging.log4j.core.ContextDataInjector"))),
+                ContextDataInjectorFactoryInstrumentation.class.getName() + "$CreateInjectorAdvice");
+    }
 
-  public static class CreateInjectorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false)
-            ContextDataInjector injector) {
-      injector = new SpanDecoratingContextDataInjector(injector);
+    public static class CreateInjectorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false) ContextDataInjector injector) {
+            injector = new SpanDecoratingContextDataInjector(injector);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/SpanDecoratingContextDataInjector.java b/dd-java-agent/instrumentation/log4j/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/SpanDecoratingContextDataInjector.java
index f3e73b6e6d2..04dbb5506a6 100644
--- a/dd-java-agent/instrumentation/log4j/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/SpanDecoratingContextDataInjector.java
+++ b/dd-java-agent/instrumentation/log4j/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/SpanDecoratingContextDataInjector.java
@@ -21,55 +21,55 @@
 import org.apache.logging.log4j.util.StringMap;
 
 public final class SpanDecoratingContextDataInjector implements ContextDataInjector {
-  private final ContextDataInjector delegate;
+    private final ContextDataInjector delegate;
 
-  public SpanDecoratingContextDataInjector(ContextDataInjector delegate) {
-    this.delegate = delegate;
-  }
+    public SpanDecoratingContextDataInjector(ContextDataInjector delegate) {
+        this.delegate = delegate;
+    }
 
-  @Override
-  public StringMap injectContextData(List<Property> list, StringMap reusable) {
-    StringMap contextData = delegate.injectContextData(list, reusable);
+    @Override
+    public StringMap injectContextData(List<Property> list, StringMap reusable) {
+        StringMap contextData = delegate.injectContextData(list, reusable);
 
-    AgentSpan span = activeSpan();
+        AgentSpan span = activeSpan();
 
-    if (!traceConfig(span).isLogsInjectionEnabled()) {
-      return contextData;
-    }
+        if (!traceConfig(span).isLogsInjectionEnabled()) {
+            return contextData;
+        }
 
-    // We're at most adding 5 tags
-    StringMap newContextData = new SortedArrayStringMap(contextData.size() + 5);
+        // We're at most adding 5 tags
+        StringMap newContextData = new SortedArrayStringMap(contextData.size() + 5);
 
-    String env = Config.get().getEnv();
-    if (null != env && !env.isEmpty()) {
-      newContextData.putValue(Tags.DD_ENV, env);
-    }
-    String serviceName = Config.get().getServiceName();
-    if (null != serviceName && !serviceName.isEmpty()) {
-      newContextData.putValue(Tags.DD_SERVICE, serviceName);
-    }
-    String version = Config.get().getVersion();
-    if (null != version && !version.isEmpty()) {
-      newContextData.putValue(Tags.DD_VERSION, version);
-    }
+        String env = Config.get().getEnv();
+        if (null != env && !env.isEmpty()) {
+            newContextData.putValue(Tags.DD_ENV, env);
+        }
+        String serviceName = Config.get().getServiceName();
+        if (null != serviceName && !serviceName.isEmpty()) {
+            newContextData.putValue(Tags.DD_SERVICE, serviceName);
+        }
+        String version = Config.get().getVersion();
+        if (null != version && !version.isEmpty()) {
+            newContextData.putValue(Tags.DD_VERSION, version);
+        }
 
-    if (span != null) {
-      DDTraceId traceId = span.spanContext().getTraceId();
-      String traceIdValue =
-          Config.get().isLogs128bitTraceIdEnabled() && traceId.toHighOrderLong() != 0
-              ? traceId.toHexString()
-              : traceId.toString();
-      newContextData.putValue(CorrelationIdentifier.getTraceIdKey(), traceIdValue);
-      newContextData.putValue(
-          CorrelationIdentifier.getSpanIdKey(), DDSpanId.toString(span.spanContext().getSpanId()));
-    }
+        if (span != null) {
+            DDTraceId traceId = span.spanContext().getTraceId();
+            String traceIdValue = Config.get().isLogs128bitTraceIdEnabled() && traceId.toHighOrderLong() != 0
+                    ? traceId.toHexString()
+                    : traceId.toString();
+            newContextData.putValue(CorrelationIdentifier.getTraceIdKey(), traceIdValue);
+            newContextData.putValue(
+                    CorrelationIdentifier.getSpanIdKey(),
+                    DDSpanId.toString(span.spanContext().getSpanId()));
+        }
 
-    newContextData.putAll(contextData);
-    return newContextData;
-  }
+        newContextData.putAll(contextData);
+        return newContextData;
+    }
 
-  @Override
-  public ReadOnlyStringMap rawContextData() {
-    return delegate.rawContextData();
-  }
+    @Override
+    public ReadOnlyStringMap rawContextData() {
+        return delegate.rawContextData();
+    }
 }
diff --git a/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java b/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java
index 51fb2870370..d43bfec8cb5 100644
--- a/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java
+++ b/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java
@@ -27,72 +27,71 @@
 
 @AutoService(InstrumenterModule.class)
 public class LogbackLoggerInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public LogbackLoggerInstrumentation() {
-    super("logback", "logs-intake", "logs-intake-logback");
-  }
+    public LogbackLoggerInstrumentation() {
+        super("logback", "logs-intake", "logs-intake-logback");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "ch.qos.logback.classic.Logger";
-  }
+    @Override
+    public String instrumentedType() {
+        return "ch.qos.logback.classic.Logger";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(
-        "ch.qos.logback.classic.spi.ILoggingEvent", AgentSpanContext.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("ch.qos.logback.classic.spi.ILoggingEvent", AgentSpanContext.class.getName());
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {LogsIntakeHelper.class.getName()};
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {LogsIntakeHelper.class.getName()};
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("callAppenders"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("ch.qos.logback.classic.spi.ILoggingEvent"))),
-        LogbackLoggerInstrumentation.class.getName() + "$CallAppendersAdvice");
-    // this can be moved into a always on instrumenter module if one day context tracking can be
-    // deactivated by config
-    if (InstrumenterConfig.get().isAppLogsCollectionEnabled()) {
-      transformer.applyAdvice(
-          isMethod()
-              .and(isPublic())
-              .and(named("callAppenders"))
-              .and(takesArguments(1))
-              .and(takesArgument(0, named("ch.qos.logback.classic.spi.ILoggingEvent"))),
-          LogbackLoggerInstrumentation.class.getName() + "$CallAppendersAdvice2");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("callAppenders"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("ch.qos.logback.classic.spi.ILoggingEvent"))),
+                LogbackLoggerInstrumentation.class.getName() + "$CallAppendersAdvice");
+        // this can be moved into a always on instrumenter module if one day context tracking can be
+        // deactivated by config
+        if (InstrumenterConfig.get().isAppLogsCollectionEnabled()) {
+            transformer.applyAdvice(
+                    isMethod()
+                            .and(isPublic())
+                            .and(named("callAppenders"))
+                            .and(takesArguments(1))
+                            .and(takesArgument(0, named("ch.qos.logback.classic.spi.ILoggingEvent"))),
+                    LogbackLoggerInstrumentation.class.getName() + "$CallAppendersAdvice2");
+        }
     }
-  }
 
-  public static class CallAppendersAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(0) ILoggingEvent event) {
-      if (event == null) {
-        return;
-      }
-      AgentSpan span = activeSpan();
+    public static class CallAppendersAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(0) ILoggingEvent event) {
+            if (event == null) {
+                return;
+            }
+            AgentSpan span = activeSpan();
 
-      if (span != null && traceConfig(span).isLogsInjectionEnabled()) {
-        InstrumentationContext.get(ILoggingEvent.class, AgentSpanContext.class)
-            .put(event, span.spanContext());
-      }
+            if (span != null && traceConfig(span).isLogsInjectionEnabled()) {
+                InstrumentationContext.get(ILoggingEvent.class, AgentSpanContext.class)
+                        .put(event, span.spanContext());
+            }
+        }
     }
-  }
 
-  public static class CallAppendersAdvice2 {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(0) ILoggingEvent event) {
-      if (event == null) {
-        return;
-      }
-      LogsIntakeHelper.log(event);
+    public static class CallAppendersAdvice2 {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(0) ILoggingEvent event) {
+            if (event == null) {
+                return;
+            }
+            LogsIntakeHelper.log(event);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LoggingEventInstrumentation.java b/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LoggingEventInstrumentation.java
index 2d78ccb8336..c3f01cdf939 100644
--- a/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LoggingEventInstrumentation.java
+++ b/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LoggingEventInstrumentation.java
@@ -28,80 +28,76 @@
 
 @AutoService(InstrumenterModule.class)
 public class LoggingEventInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public LoggingEventInstrumentation() {
-    super("logback");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public LoggingEventInstrumentation() {
+        super("logback");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "ch.qos.logback.classic.spi.ILoggingEvent";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "ch.qos.logback.classic.spi.ILoggingEvent";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(
-        "ch.qos.logback.classic.spi.ILoggingEvent", AgentSpanContext.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("ch.qos.logback.classic.spi.ILoggingEvent", AgentSpanContext.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("getMDCPropertyMap").or(named("getMdc"))).and(takesArguments(0)),
-        LoggingEventInstrumentation.class.getName() + "$GetMdcAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("getMDCPropertyMap").or(named("getMdc"))).and(takesArguments(0)),
+                LoggingEventInstrumentation.class.getName() + "$GetMdcAdvice");
+    }
 
-  public static class GetMdcAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This ILoggingEvent event,
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false)
-            Map<String, String> mdc) {
+    public static class GetMdcAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This ILoggingEvent event,
+                @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false) Map<String, String> mdc) {
 
-      if (mdc instanceof UnionMap) {
-        return;
-      }
+            if (mdc instanceof UnionMap) {
+                return;
+            }
 
-      AgentSpanContext context =
-          InstrumentationContext.get(ILoggingEvent.class, AgentSpanContext.class).get(event);
+            AgentSpanContext context = InstrumentationContext.get(ILoggingEvent.class, AgentSpanContext.class)
+                    .get(event);
 
-      // Nothing to add so return early
-      if (context == null && !AgentTracer.traceConfig().isLogsInjectionEnabled()) {
-        return;
-      }
+            // Nothing to add so return early
+            if (context == null && !AgentTracer.traceConfig().isLogsInjectionEnabled()) {
+                return;
+            }
 
-      Map<String, String> correlationValues = new HashMap<>(8);
+            Map<String, String> correlationValues = new HashMap<>(8);
 
-      if (context != null) {
-        DDTraceId traceId = context.getTraceId();
-        String traceIdValue =
-            Config.get().isLogs128bitTraceIdEnabled() && traceId.toHighOrderLong() != 0
-                ? traceId.toHexString()
-                : traceId.toString();
-        correlationValues.put(CorrelationIdentifier.getTraceIdKey(), traceIdValue);
-        correlationValues.put(
-            CorrelationIdentifier.getSpanIdKey(), DDSpanId.toString(context.getSpanId()));
-      }
+            if (context != null) {
+                DDTraceId traceId = context.getTraceId();
+                String traceIdValue = Config.get().isLogs128bitTraceIdEnabled() && traceId.toHighOrderLong() != 0
+                        ? traceId.toHexString()
+                        : traceId.toString();
+                correlationValues.put(CorrelationIdentifier.getTraceIdKey(), traceIdValue);
+                correlationValues.put(CorrelationIdentifier.getSpanIdKey(), DDSpanId.toString(context.getSpanId()));
+            }
 
-      String serviceName = Config.get().getServiceName();
-      if (null != serviceName && !serviceName.isEmpty()) {
-        correlationValues.put(Tags.DD_SERVICE, serviceName);
-      }
-      String env = Config.get().getEnv();
-      if (null != env && !env.isEmpty()) {
-        correlationValues.put(Tags.DD_ENV, env);
-      }
-      String version = Config.get().getVersion();
-      if (null != version && !version.isEmpty()) {
-        correlationValues.put(Tags.DD_VERSION, version);
-      }
+            String serviceName = Config.get().getServiceName();
+            if (null != serviceName && !serviceName.isEmpty()) {
+                correlationValues.put(Tags.DD_SERVICE, serviceName);
+            }
+            String env = Config.get().getEnv();
+            if (null != env && !env.isEmpty()) {
+                correlationValues.put(Tags.DD_ENV, env);
+            }
+            String version = Config.get().getVersion();
+            if (null != version && !version.isEmpty()) {
+                correlationValues.put(Tags.DD_VERSION, version);
+            }
 
-      mdc = null != mdc ? new UnionMap<>(mdc, correlationValues) : correlationValues;
+            mdc = null != mdc ? new UnionMap<>(mdc, correlationValues) : correlationValues;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogsIntakeHelper.java b/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogsIntakeHelper.java
index 593acd82508..1b33fb70451 100644
--- a/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogsIntakeHelper.java
+++ b/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogsIntakeHelper.java
@@ -11,35 +11,34 @@
 
 public class LogsIntakeHelper {
 
-  public static void log(ILoggingEvent event) {
-    LogsIntake.log(map(event));
-  }
-
-  private static Map<String, Object> map(ILoggingEvent event) {
-    Map<String, Object> log = new HashMap<>();
-    log.put("thread", event.getThreadName());
-    log.put("level", event.getLevel().levelStr);
-    log.put("loggerName", event.getLoggerName());
-    log.put("message", event.getFormattedMessage());
-    if (event.getThrowableProxy() != null) {
-      Map<String, Object> thrownLog = new HashMap<>();
-      thrownLog.put("message", event.getThrowableProxy().getMessage());
-      thrownLog.put("name", event.getThrowableProxy().getClassName());
-      String stackTraceString =
-          Arrays.stream(event.getThrowableProxy().getStackTraceElementProxyArray())
-              .map(StackTraceElementProxy::getSTEAsString)
-              .collect(Collectors.joining(" "));
-      thrownLog.put("extendedStackTrace", stackTraceString);
-      log.put("thrown", thrownLog);
-    }
-    String traceId = CorrelationIdentifier.getTraceId();
-    if (traceId != null && !traceId.equals("0")) {
-      log.put("dd.trace_id", traceId);
+    public static void log(ILoggingEvent event) {
+        LogsIntake.log(map(event));
     }
-    String spanId = CorrelationIdentifier.getSpanId();
-    if (spanId != null && !spanId.equals("0")) {
-      log.put("dd.span_id", spanId);
+
+    private static Map<String, Object> map(ILoggingEvent event) {
+        Map<String, Object> log = new HashMap<>();
+        log.put("thread", event.getThreadName());
+        log.put("level", event.getLevel().levelStr);
+        log.put("loggerName", event.getLoggerName());
+        log.put("message", event.getFormattedMessage());
+        if (event.getThrowableProxy() != null) {
+            Map<String, Object> thrownLog = new HashMap<>();
+            thrownLog.put("message", event.getThrowableProxy().getMessage());
+            thrownLog.put("name", event.getThrowableProxy().getClassName());
+            String stackTraceString = Arrays.stream(event.getThrowableProxy().getStackTraceElementProxyArray())
+                    .map(StackTraceElementProxy::getSTEAsString)
+                    .collect(Collectors.joining(" "));
+            thrownLog.put("extendedStackTrace", stackTraceString);
+            log.put("thrown", thrownLog);
+        }
+        String traceId = CorrelationIdentifier.getTraceId();
+        if (traceId != null && !traceId.equals("0")) {
+            log.put("dd.trace_id", traceId);
+        }
+        String spanId = CorrelationIdentifier.getSpanId();
+        if (spanId != null && !spanId.equals("0")) {
+            log.put("dd.span_id", spanId);
+        }
+        return log;
     }
-    return log;
-  }
 }
diff --git a/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/src/main/java/datadog/trace/instrumentation/jakarta/mail/JakartaMailInstrumentation.java b/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/src/main/java/datadog/trace/instrumentation/jakarta/mail/JakartaMailInstrumentation.java
index 3cb3c857909..46d5f2d1041 100644
--- a/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/src/main/java/datadog/trace/instrumentation/jakarta/mail/JakartaMailInstrumentation.java
+++ b/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/src/main/java/datadog/trace/instrumentation/jakarta/mail/JakartaMailInstrumentation.java
@@ -21,49 +21,48 @@
 
 @AutoService(InstrumenterModule.class)
 public class JakartaMailInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  private static Logger LOGGER = LoggerFactory.getLogger(JakartaMailInstrumentation.class);
+    private static Logger LOGGER = LoggerFactory.getLogger(JakartaMailInstrumentation.class);
 
-  public JakartaMailInstrumentation() {
-    super("jakarta-mail", "jakarta-mail-transport");
-  }
+    public JakartaMailInstrumentation() {
+        super("jakarta-mail", "jakarta-mail-transport");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("send0").and(takesArgument(0, named("jakarta.mail.Message"))),
-        JakartaMailInstrumentation.class.getName() + "$MailInjectionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("send0").and(takesArgument(0, named("jakarta.mail.Message"))),
+                JakartaMailInstrumentation.class.getName() + "$MailInjectionAdvice");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "jakarta.mail.Transport";
-  }
+    @Override
+    public String instrumentedType() {
+        return "jakarta.mail.Transport";
+    }
 
-  public static class MailInjectionAdvice {
-    @Sink(VulnerabilityTypes.EMAIL_HTML_INJECTION)
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onSend(@Advice.Argument(0) final Message message)
-        throws MessagingException, IOException {
-      EmailInjectionModule emailInjectionModule = InstrumentationBridge.EMAIL_INJECTION;
-      if (emailInjectionModule == null) {
-        return;
-      }
-      if (message == null || message.getContent() == null) {
-        return;
-      }
-      if (message.isMimeType("text/html")) {
-        emailInjectionModule.onSendEmail(message.getContent());
-      } else if (message.isMimeType("multipart/*")) {
-        Multipart parts = (Multipart) message.getContent();
-        for (int i = 0; i < parts.getCount(); i++) {
-          final Part part = parts.getBodyPart(i);
-          if (part != null && part.isMimeType("text/html")) {
-            emailInjectionModule.onSendEmail(part.getContent());
-          }
+    public static class MailInjectionAdvice {
+        @Sink(VulnerabilityTypes.EMAIL_HTML_INJECTION)
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onSend(@Advice.Argument(0) final Message message) throws MessagingException, IOException {
+            EmailInjectionModule emailInjectionModule = InstrumentationBridge.EMAIL_INJECTION;
+            if (emailInjectionModule == null) {
+                return;
+            }
+            if (message == null || message.getContent() == null) {
+                return;
+            }
+            if (message.isMimeType("text/html")) {
+                emailInjectionModule.onSendEmail(message.getContent());
+            } else if (message.isMimeType("multipart/*")) {
+                Multipart parts = (Multipart) message.getContent();
+                for (int i = 0; i < parts.getCount(); i++) {
+                    final Part part = parts.getBodyPart(i);
+                    if (part != null && part.isMimeType("text/html")) {
+                        emailInjectionModule.onSendEmail(part.getContent());
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/src/main/java/datadog/trace/instrumentation/jakarta/mail/JakartaMailPartInstrumentation.java b/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/src/main/java/datadog/trace/instrumentation/jakarta/mail/JakartaMailPartInstrumentation.java
index cfdb4ffd8be..98b3ae51564 100644
--- a/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/src/main/java/datadog/trace/instrumentation/jakarta/mail/JakartaMailPartInstrumentation.java
+++ b/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/src/main/java/datadog/trace/instrumentation/jakarta/mail/JakartaMailPartInstrumentation.java
@@ -17,52 +17,51 @@
 
 @AutoService(InstrumenterModule.class)
 public class JakartaMailPartInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public JakartaMailPartInstrumentation() {
-    super("jakarta-mail", "jakarta-mail-body");
-  }
+    public JakartaMailPartInstrumentation() {
+        super("jakarta-mail", "jakarta-mail-body");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("setContent").and(takesArgument(0, Object.class)),
-        JakartaMailPartInstrumentation.class.getName() + "$ContentInjectionAdvice");
-    transformer.applyAdvice(
-        named("setText").and(takesArgument(0, String.class)),
-        JakartaMailPartInstrumentation.class.getName() + "$TextInjectionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("setContent").and(takesArgument(0, Object.class)),
+                JakartaMailPartInstrumentation.class.getName() + "$ContentInjectionAdvice");
+        transformer.applyAdvice(
+                named("setText").and(takesArgument(0, String.class)),
+                JakartaMailPartInstrumentation.class.getName() + "$TextInjectionAdvice");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "jakarta.mail.Part";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "jakarta.mail.Part";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  public static class ContentInjectionAdvice {
-    @Propagation
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    private static void onSetContent(
-        @Advice.This Part part, @Advice.Argument(0) final Object content) {
-      PropagationModule propagationModule = InstrumentationBridge.PROPAGATION;
-      if (propagationModule != null && content != null) {
-        propagationModule.taintObjectIfTainted(part, content);
-      }
+    public static class ContentInjectionAdvice {
+        @Propagation
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        private static void onSetContent(@Advice.This Part part, @Advice.Argument(0) final Object content) {
+            PropagationModule propagationModule = InstrumentationBridge.PROPAGATION;
+            if (propagationModule != null && content != null) {
+                propagationModule.taintObjectIfTainted(part, content);
+            }
+        }
     }
-  }
 
-  public static class TextInjectionAdvice {
-    @Propagation
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    private static void onSetText(@Advice.This Part part, @Advice.Argument(0) final String text) {
-      PropagationModule propagationModule = InstrumentationBridge.PROPAGATION;
-      if (propagationModule != null && text != null) {
-        propagationModule.taintObjectIfTainted(part, text);
-      }
+    public static class TextInjectionAdvice {
+        @Propagation
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        private static void onSetText(@Advice.This Part part, @Advice.Argument(0) final String text) {
+            PropagationModule propagationModule = InstrumentationBridge.PROPAGATION;
+            if (propagationModule != null && text != null) {
+                propagationModule.taintObjectIfTainted(part, text);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/src/test/java/MockTransport.java b/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/src/test/java/MockTransport.java
index 9b0c9eb7b8e..94944bdc94f 100644
--- a/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/src/test/java/MockTransport.java
+++ b/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/src/test/java/MockTransport.java
@@ -7,34 +7,33 @@
 import java.util.Properties;
 
 public class MockTransport extends Transport {
-  public MockTransport(Session session, URLName urlname) {
-    super(session, urlname);
-  }
+    public MockTransport(Session session, URLName urlname) {
+        super(session, urlname);
+    }
 
-  public MockTransport() {
-    this(Session.getInstance(new Properties()), null);
-  }
+    public MockTransport() {
+        this(Session.getInstance(new Properties()), null);
+    }
 
-  public MockTransport(Session session) {
-    this(session, null);
-  }
+    public MockTransport(Session session) {
+        this(session, null);
+    }
 
-  public static Transport newInstance(Session session) {
-    return new MockTransport(session, null);
-  }
+    public static Transport newInstance(Session session) {
+        return new MockTransport(session, null);
+    }
 
-  public void sendMessage(Message msg, Address[] addresses) throws MessagingException {
-    for (Address a : addresses) {
-      this.notifyTransportListeners(1, addresses, new Address[0], new Address[0], msg);
+    public void sendMessage(Message msg, Address[] addresses) throws MessagingException {
+        for (Address a : addresses) {
+            this.notifyTransportListeners(1, addresses, new Address[0], new Address[0], msg);
+        }
     }
-  }
 
-  @Override
-  public void connect() {
-    this.setConnected(true);
-    this.notifyConnectionListeners(1);
-  }
+    @Override
+    public void connect() {
+        this.setConnected(true);
+        this.notifyConnectionListeners(1);
+    }
 
-  public synchronized void connect(String host, int port, String user, String password)
-      throws MessagingException {}
+    public synchronized void connect(String host, int port, String user, String password) throws MessagingException {}
 }
diff --git a/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/src/main/java/datadog/trace/instrumentation/javax/mail/JavaxMailInstrumentation.java b/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/src/main/java/datadog/trace/instrumentation/javax/mail/JavaxMailInstrumentation.java
index 89df51adfd5..2bd40a97f82 100644
--- a/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/src/main/java/datadog/trace/instrumentation/javax/mail/JavaxMailInstrumentation.java
+++ b/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/src/main/java/datadog/trace/instrumentation/javax/mail/JavaxMailInstrumentation.java
@@ -21,49 +21,48 @@
 
 @AutoService(InstrumenterModule.class)
 public class JavaxMailInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  private static Logger LOGGER = LoggerFactory.getLogger(JavaxMailInstrumentation.class);
+    private static Logger LOGGER = LoggerFactory.getLogger(JavaxMailInstrumentation.class);
 
-  public JavaxMailInstrumentation() {
-    super("javax-mail", "javax-mail-transport");
-  }
+    public JavaxMailInstrumentation() {
+        super("javax-mail", "javax-mail-transport");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("send0").and(takesArgument(0, named("javax.mail.Message"))),
-        JavaxMailInstrumentation.class.getName() + "$MailInjectionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("send0").and(takesArgument(0, named("javax.mail.Message"))),
+                JavaxMailInstrumentation.class.getName() + "$MailInjectionAdvice");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "javax.mail.Transport";
-  }
+    @Override
+    public String instrumentedType() {
+        return "javax.mail.Transport";
+    }
 
-  public static class MailInjectionAdvice {
-    @Sink(VulnerabilityTypes.EMAIL_HTML_INJECTION)
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onSend(@Advice.Argument(0) final Message message)
-        throws MessagingException, IOException {
-      EmailInjectionModule emailInjectionModule = InstrumentationBridge.EMAIL_INJECTION;
-      if (emailInjectionModule == null) {
-        return;
-      }
-      if (message == null || message.getContent() == null) {
-        return;
-      }
-      if (message.isMimeType("text/html")) {
-        emailInjectionModule.onSendEmail(message.getContent());
-      } else if (message.isMimeType("multipart/*")) {
-        Multipart parts = (Multipart) message.getContent();
-        for (int i = 0; i < parts.getCount(); i++) {
-          final Part part = parts.getBodyPart(i);
-          if (part != null && part.isMimeType("text/html")) {
-            emailInjectionModule.onSendEmail(part.getContent());
-          }
+    public static class MailInjectionAdvice {
+        @Sink(VulnerabilityTypes.EMAIL_HTML_INJECTION)
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onSend(@Advice.Argument(0) final Message message) throws MessagingException, IOException {
+            EmailInjectionModule emailInjectionModule = InstrumentationBridge.EMAIL_INJECTION;
+            if (emailInjectionModule == null) {
+                return;
+            }
+            if (message == null || message.getContent() == null) {
+                return;
+            }
+            if (message.isMimeType("text/html")) {
+                emailInjectionModule.onSendEmail(message.getContent());
+            } else if (message.isMimeType("multipart/*")) {
+                Multipart parts = (Multipart) message.getContent();
+                for (int i = 0; i < parts.getCount(); i++) {
+                    final Part part = parts.getBodyPart(i);
+                    if (part != null && part.isMimeType("text/html")) {
+                        emailInjectionModule.onSendEmail(part.getContent());
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/src/main/java/datadog/trace/instrumentation/javax/mail/JavaxMailPartInstrumentation.java b/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/src/main/java/datadog/trace/instrumentation/javax/mail/JavaxMailPartInstrumentation.java
index 1e1126541df..ed28de468d0 100644
--- a/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/src/main/java/datadog/trace/instrumentation/javax/mail/JavaxMailPartInstrumentation.java
+++ b/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/src/main/java/datadog/trace/instrumentation/javax/mail/JavaxMailPartInstrumentation.java
@@ -17,52 +17,51 @@
 
 @AutoService(InstrumenterModule.class)
 public class JavaxMailPartInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public JavaxMailPartInstrumentation() {
-    super("javax-mail", "javax-mail-body");
-  }
+    public JavaxMailPartInstrumentation() {
+        super("javax-mail", "javax-mail-body");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("setContent").and(takesArgument(0, Object.class)),
-        JavaxMailPartInstrumentation.class.getName() + "$ContentInjectionAdvice");
-    transformer.applyAdvice(
-        named("setText").and(takesArgument(0, String.class)),
-        JavaxMailPartInstrumentation.class.getName() + "$TextInjectionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("setContent").and(takesArgument(0, Object.class)),
+                JavaxMailPartInstrumentation.class.getName() + "$ContentInjectionAdvice");
+        transformer.applyAdvice(
+                named("setText").and(takesArgument(0, String.class)),
+                JavaxMailPartInstrumentation.class.getName() + "$TextInjectionAdvice");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.mail.Part";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.mail.Part";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  public static class ContentInjectionAdvice {
-    @Propagation
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    private static void onSetContent(
-        @Advice.This Part part, @Advice.Argument(0) final Object content) {
-      PropagationModule propagationModule = InstrumentationBridge.PROPAGATION;
-      if (propagationModule != null && content != null) {
-        propagationModule.taintObjectIfTainted(part, content);
-      }
+    public static class ContentInjectionAdvice {
+        @Propagation
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        private static void onSetContent(@Advice.This Part part, @Advice.Argument(0) final Object content) {
+            PropagationModule propagationModule = InstrumentationBridge.PROPAGATION;
+            if (propagationModule != null && content != null) {
+                propagationModule.taintObjectIfTainted(part, content);
+            }
+        }
     }
-  }
 
-  public static class TextInjectionAdvice {
-    @Propagation
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    private static void onSetText(@Advice.This Part part, @Advice.Argument(0) final String text) {
-      PropagationModule propagationModule = InstrumentationBridge.PROPAGATION;
-      if (propagationModule != null && text != null) {
-        propagationModule.taintObjectIfTainted(part, text);
-      }
+    public static class TextInjectionAdvice {
+        @Propagation
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        private static void onSetText(@Advice.This Part part, @Advice.Argument(0) final String text) {
+            PropagationModule propagationModule = InstrumentationBridge.PROPAGATION;
+            if (propagationModule != null && text != null) {
+                propagationModule.taintObjectIfTainted(part, text);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/src/test/java/MockTransport.java b/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/src/test/java/MockTransport.java
index ad7fd030fff..2fe671871ab 100644
--- a/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/src/test/java/MockTransport.java
+++ b/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/src/test/java/MockTransport.java
@@ -7,34 +7,33 @@
 import javax.mail.URLName;
 
 public class MockTransport extends Transport {
-  public MockTransport(Session session, URLName urlname) {
-    super(session, urlname);
-  }
+    public MockTransport(Session session, URLName urlname) {
+        super(session, urlname);
+    }
 
-  public MockTransport() {
-    this(Session.getInstance(new Properties()), null);
-  }
+    public MockTransport() {
+        this(Session.getInstance(new Properties()), null);
+    }
 
-  public MockTransport(Session session) {
-    this(session, null);
-  }
+    public MockTransport(Session session) {
+        this(session, null);
+    }
 
-  public static Transport newInstance(Session session) {
-    return new MockTransport(session, null);
-  }
+    public static Transport newInstance(Session session) {
+        return new MockTransport(session, null);
+    }
 
-  public void sendMessage(Message msg, Address[] addresses) throws MessagingException {
-    for (Address a : addresses) {
-      this.notifyTransportListeners(1, addresses, new Address[0], new Address[0], msg);
+    public void sendMessage(Message msg, Address[] addresses) throws MessagingException {
+        for (Address a : addresses) {
+            this.notifyTransportListeners(1, addresses, new Address[0], new Address[0], msg);
+        }
     }
-  }
 
-  @Override
-  public void connect() {
-    this.setConnected(true);
-    this.notifyConnectionListeners(1);
-  }
+    @Override
+    public void connect() {
+        this.setConnected(true);
+        this.notifyConnectionListeners(1);
+    }
 
-  public synchronized void connect(String host, int port, String user, String password)
-      throws MessagingException {}
+    public synchronized void connect(String host, int port, String user, String password) throws MessagingException {}
 }
diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenExecutionListener.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenExecutionListener.java
index 9151c608f37..36682de2aac 100644
--- a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenExecutionListener.java
+++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenExecutionListener.java
@@ -28,162 +28,148 @@
 
 public class MavenExecutionListener extends AbstractExecutionListener {
 
-  private static final Logger log = LoggerFactory.getLogger(MavenExecutionListener.class);
-  private static final String TESTS_SKIPPED_BY_CONFIGURATION_REASON =
-      "Tests were skipped by Maven configuration";
+    private static final Logger log = LoggerFactory.getLogger(MavenExecutionListener.class);
+    private static final String TESTS_SKIPPED_BY_CONFIGURATION_REASON = "Tests were skipped by Maven configuration";
 
-  private final BuildEventsHandler<MavenExecutionRequest> buildEventsHandler;
+    private final BuildEventsHandler<MavenExecutionRequest> buildEventsHandler;
 
-  public MavenExecutionListener(BuildEventsHandler<MavenExecutionRequest> buildEventsHandler) {
-    this.buildEventsHandler = buildEventsHandler;
-  }
+    public MavenExecutionListener(BuildEventsHandler<MavenExecutionRequest> buildEventsHandler) {
+        this.buildEventsHandler = buildEventsHandler;
+    }
 
-  @Override
-  public void sessionEnded(ExecutionEvent event) {
-    MavenSession session = event.getSession();
-    MavenExecutionRequest request = session.getRequest();
+    @Override
+    public void sessionEnded(ExecutionEvent event) {
+        MavenSession session = event.getSession();
+        MavenExecutionRequest request = session.getRequest();
 
-    MavenExecutionResult result = session.getResult();
-    if (result.hasExceptions()) {
-      Throwable exception = MavenUtils.getException(result);
-      buildEventsHandler.onTestSessionFail(request, exception);
-    }
+        MavenExecutionResult result = session.getResult();
+        if (result.hasExceptions()) {
+            Throwable exception = MavenUtils.getException(result);
+            buildEventsHandler.onTestSessionFail(request, exception);
+        }
 
-    buildEventsHandler.onTestSessionFinish(request);
-  }
-
-  @Override
-  public void mojoSkipped(ExecutionEvent event) {
-    MojoExecution mojoExecution = event.getMojoExecution();
-    if (MavenUtils.isTestExecution(mojoExecution)) {
-      MavenSession session = event.getSession();
-      MavenExecutionRequest request = session.getRequest();
-      MavenProject project = event.getProject();
-      String moduleName = MavenUtils.getUniqueModuleName(project, mojoExecution);
-
-      mojoStarted(event);
-      buildEventsHandler.onTestModuleSkip(request, moduleName, null);
-      mojoSucceeded(event);
-    } else {
-      mojoStarted(event);
-      mojoSucceeded(event);
-    }
-  }
-
-  @Override
-  public void mojoStarted(ExecutionEvent event) {
-    MojoExecution mojoExecution = event.getMojoExecution();
-    MavenSession session = event.getSession();
-    MavenExecutionRequest request = session.getRequest();
-    MavenProject project = event.getProject();
-    String moduleName = MavenUtils.getUniqueModuleName(project, mojoExecution);
-
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      Map<String, Object> additionalTags = new HashMap<>();
-      additionalTags.put("project", project.getName());
-      additionalTags.put("plugin", mojoExecution.getArtifactId());
-      additionalTags.put("execution", mojoExecution.getExecutionId());
-      buildEventsHandler.onBuildTaskStart(request, moduleName, additionalTags);
-      return;
+        buildEventsHandler.onTestSessionFinish(request);
     }
 
-    Build build = project.getBuild();
-    SourceSet classes =
-        getSourceSet(SourceSet.Type.CODE, build.getSourceDirectory(), build.getOutputDirectory());
-    SourceSet tests =
-        getSourceSet(
-            SourceSet.Type.TEST, build.getTestSourceDirectory(), build.getTestOutputDirectory());
-    BuildModuleLayout moduleLayout = new BuildModuleLayout(Arrays.asList(classes, tests));
-
-    Path forkedJvmPath = MavenUtils.getForkedJvmPath(session, mojoExecution);
-    List<Path> classpath = MavenUtils.getClasspath(session, mojoExecution);
-    String executionId =
-        mojoExecution.getPlugin().getArtifactId()
-            + ":"
-            + mojoExecution.getGoal()
-            + ":"
-            + mojoExecution.getExecutionId();
-    Map<String, Object> additionalTags = Collections.singletonMap(Tags.TEST_EXECUTION, executionId);
-    JavaAgent jacocoAgent = MavenUtils.getJacocoAgent(session, project, mojoExecution);
-
-    BuildModuleSettings moduleSettings =
-        buildEventsHandler.onTestModuleStart(
-            request,
-            moduleName,
-            moduleLayout,
-            forkedJvmPath,
-            classpath,
-            jacocoAgent,
-            additionalTags);
-
-    String forkCount = MavenUtils.getConfigurationValue(session, mojoExecution, "forkCount");
-    if ("0".equals(forkCount)) {
-      log.warn(
-          "Tests execution {} does not run in a forked JVM, this configuration is not supported",
-          executionId);
-      return;
+    @Override
+    public void mojoSkipped(ExecutionEvent event) {
+        MojoExecution mojoExecution = event.getMojoExecution();
+        if (MavenUtils.isTestExecution(mojoExecution)) {
+            MavenSession session = event.getSession();
+            MavenExecutionRequest request = session.getRequest();
+            MavenProject project = event.getProject();
+            String moduleName = MavenUtils.getUniqueModuleName(project, mojoExecution);
+
+            mojoStarted(event);
+            buildEventsHandler.onTestModuleSkip(request, moduleName, null);
+            mojoSucceeded(event);
+        } else {
+            mojoStarted(event);
+            mojoSucceeded(event);
+        }
     }
 
-    Map<String, String> systemProperties = moduleSettings.getSystemProperties();
-    MavenProjectConfigurator.INSTANCE.configureTracer(
-        session, project, mojoExecution, systemProperties, Config.get());
-  }
+    @Override
+    public void mojoStarted(ExecutionEvent event) {
+        MojoExecution mojoExecution = event.getMojoExecution();
+        MavenSession session = event.getSession();
+        MavenExecutionRequest request = session.getRequest();
+        MavenProject project = event.getProject();
+        String moduleName = MavenUtils.getUniqueModuleName(project, mojoExecution);
+
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            Map<String, Object> additionalTags = new HashMap<>();
+            additionalTags.put("project", project.getName());
+            additionalTags.put("plugin", mojoExecution.getArtifactId());
+            additionalTags.put("execution", mojoExecution.getExecutionId());
+            buildEventsHandler.onBuildTaskStart(request, moduleName, additionalTags);
+            return;
+        }
+
+        Build build = project.getBuild();
+        SourceSet classes = getSourceSet(SourceSet.Type.CODE, build.getSourceDirectory(), build.getOutputDirectory());
+        SourceSet tests =
+                getSourceSet(SourceSet.Type.TEST, build.getTestSourceDirectory(), build.getTestOutputDirectory());
+        BuildModuleLayout moduleLayout = new BuildModuleLayout(Arrays.asList(classes, tests));
+
+        Path forkedJvmPath = MavenUtils.getForkedJvmPath(session, mojoExecution);
+        List<Path> classpath = MavenUtils.getClasspath(session, mojoExecution);
+        String executionId = mojoExecution.getPlugin().getArtifactId()
+                + ":"
+                + mojoExecution.getGoal()
+                + ":"
+                + mojoExecution.getExecutionId();
+        Map<String, Object> additionalTags = Collections.singletonMap(Tags.TEST_EXECUTION, executionId);
+        JavaAgent jacocoAgent = MavenUtils.getJacocoAgent(session, project, mojoExecution);
+
+        BuildModuleSettings moduleSettings = buildEventsHandler.onTestModuleStart(
+                request, moduleName, moduleLayout, forkedJvmPath, classpath, jacocoAgent, additionalTags);
+
+        String forkCount = MavenUtils.getConfigurationValue(session, mojoExecution, "forkCount");
+        if ("0".equals(forkCount)) {
+            log.warn(
+                    "Tests execution {} does not run in a forked JVM, this configuration is not supported",
+                    executionId);
+            return;
+        }
+
+        Map<String, String> systemProperties = moduleSettings.getSystemProperties();
+        MavenProjectConfigurator.INSTANCE.configureTracer(
+                session, project, mojoExecution, systemProperties, Config.get());
+    }
 
-  @Nullable
-  private SourceSet getSourceSet(SourceSet.Type type, String source, String output) {
-    if (source == null || output == null) {
-      return null;
+    @Nullable
+    private SourceSet getSourceSet(SourceSet.Type type, String source, String output) {
+        if (source == null || output == null) {
+            return null;
+        }
+        return new SourceSet(type, Collections.singleton(new File(source)), Collections.singleton(new File(output)));
     }
-    return new SourceSet(
-        type, Collections.singleton(new File(source)), Collections.singleton(new File(output)));
-  }
-
-  @Override
-  public void mojoSucceeded(ExecutionEvent event) {
-    MojoExecution mojoExecution = event.getMojoExecution();
-    MavenSession session = event.getSession();
-    MavenExecutionRequest request = session.getRequest();
-    MavenProject project = event.getProject();
-    String moduleName = MavenUtils.getUniqueModuleName(project, mojoExecution);
-
-    if (MavenUtils.isTestExecution(mojoExecution)) {
-      // Surefire/Failsafe complete successfully when explicitly configured to skip tests;
-      // Maven does not send mojoSkipped for these executions. Read the resolved plugin
-      // configuration, since a POM can override the command-line skip properties.
-      if (Boolean.parseBoolean(
-              MavenUtils.getConfigurationValue(session, mojoExecution, "skipTests"))
-          || Boolean.parseBoolean(MavenUtils.getConfigurationValue(session, mojoExecution, "skip"))
-          || (("maven-surefire-plugin".equals(mojoExecution.getArtifactId())
-                  || "maven-failsafe-plugin".equals(mojoExecution.getArtifactId()))
-              && Boolean.parseBoolean(
-                  MavenUtils.getConfigurationValue(session, mojoExecution, "skipExec")))
-          || ("maven-failsafe-plugin".equals(mojoExecution.getArtifactId())
-              && Boolean.parseBoolean(
-                  MavenUtils.getConfigurationValue(session, mojoExecution, "skipITs")))) {
-        buildEventsHandler.onTestModuleSkip(
-            request, moduleName, TESTS_SKIPPED_BY_CONFIGURATION_REASON);
-      }
-      buildEventsHandler.onTestModuleFinish(request, moduleName);
-    } else {
-      buildEventsHandler.onBuildTaskFinish(request, moduleName);
+
+    @Override
+    public void mojoSucceeded(ExecutionEvent event) {
+        MojoExecution mojoExecution = event.getMojoExecution();
+        MavenSession session = event.getSession();
+        MavenExecutionRequest request = session.getRequest();
+        MavenProject project = event.getProject();
+        String moduleName = MavenUtils.getUniqueModuleName(project, mojoExecution);
+
+        if (MavenUtils.isTestExecution(mojoExecution)) {
+            // Surefire/Failsafe complete successfully when explicitly configured to skip tests;
+            // Maven does not send mojoSkipped for these executions. Read the resolved plugin
+            // configuration, since a POM can override the command-line skip properties.
+            if (Boolean.parseBoolean(MavenUtils.getConfigurationValue(session, mojoExecution, "skipTests"))
+                    || Boolean.parseBoolean(MavenUtils.getConfigurationValue(session, mojoExecution, "skip"))
+                    || (("maven-surefire-plugin".equals(mojoExecution.getArtifactId())
+                                    || "maven-failsafe-plugin".equals(mojoExecution.getArtifactId()))
+                            && Boolean.parseBoolean(
+                                    MavenUtils.getConfigurationValue(session, mojoExecution, "skipExec")))
+                    || ("maven-failsafe-plugin".equals(mojoExecution.getArtifactId())
+                            && Boolean.parseBoolean(
+                                    MavenUtils.getConfigurationValue(session, mojoExecution, "skipITs")))) {
+                buildEventsHandler.onTestModuleSkip(request, moduleName, TESTS_SKIPPED_BY_CONFIGURATION_REASON);
+            }
+            buildEventsHandler.onTestModuleFinish(request, moduleName);
+        } else {
+            buildEventsHandler.onBuildTaskFinish(request, moduleName);
+        }
     }
-  }
-
-  @Override
-  public void mojoFailed(ExecutionEvent event) {
-    MojoExecution mojoExecution = event.getMojoExecution();
-    MavenSession session = event.getSession();
-    MavenExecutionRequest request = session.getRequest();
-    MavenProject project = event.getProject();
-    String moduleName = MavenUtils.getUniqueModuleName(project, mojoExecution);
-    Exception exception = event.getException();
-
-    if (MavenUtils.isTestExecution(mojoExecution)) {
-      buildEventsHandler.onTestModuleFail(request, moduleName, exception);
-      buildEventsHandler.onTestModuleFinish(request, moduleName);
-    } else {
-      buildEventsHandler.onBuildTaskFail(request, moduleName, exception);
-      buildEventsHandler.onBuildTaskFinish(request, moduleName);
+
+    @Override
+    public void mojoFailed(ExecutionEvent event) {
+        MojoExecution mojoExecution = event.getMojoExecution();
+        MavenSession session = event.getSession();
+        MavenExecutionRequest request = session.getRequest();
+        MavenProject project = event.getProject();
+        String moduleName = MavenUtils.getUniqueModuleName(project, mojoExecution);
+        Exception exception = event.getException();
+
+        if (MavenUtils.isTestExecution(mojoExecution)) {
+            buildEventsHandler.onTestModuleFail(request, moduleName, exception);
+            buildEventsHandler.onTestModuleFinish(request, moduleName);
+        } else {
+            buildEventsHandler.onBuildTaskFail(request, moduleName, exception);
+            buildEventsHandler.onBuildTaskFinish(request, moduleName);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenInstrumentation.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenInstrumentation.java
index 0945fed638d..3853f34760c 100644
--- a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenInstrumentation.java
+++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenInstrumentation.java
@@ -16,40 +16,38 @@
 
 @AutoService(InstrumenterModule.class)
 public class MavenInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public MavenInstrumentation() {
-    super("maven");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.maven.cli.MavenCli";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled();
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("customizeContainer")
-            .and(takesArgument(0, named("org.codehaus.plexus.PlexusContainer"))),
-        MavenInstrumentation.class.getName() + "$MavenAdvice");
-  }
-
-  public static class MavenAdvice {
-    @Advice.OnMethodEnter
-    public static void addLifecycleExtension(@Advice.Argument(0) final PlexusContainer container) {
-      container.addComponent(
-          new MavenLifecycleParticipant(), AbstractMavenLifecycleParticipant.class, null);
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public MavenInstrumentation() {
+        super("maven");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.maven.cli.MavenCli";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled();
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("customizeContainer").and(takesArgument(0, named("org.codehaus.plexus.PlexusContainer"))),
+                MavenInstrumentation.class.getName() + "$MavenAdvice");
+    }
+
+    public static class MavenAdvice {
+        @Advice.OnMethodEnter
+        public static void addLifecycleExtension(@Advice.Argument(0) final PlexusContainer container) {
+            container.addComponent(new MavenLifecycleParticipant(), AbstractMavenLifecycleParticipant.class, null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenLifecycleParticipant.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenLifecycleParticipant.java
index 4572555b6cd..8461363ac86 100644
--- a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenLifecycleParticipant.java
+++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenLifecycleParticipant.java
@@ -27,112 +27,109 @@
 
 public class MavenLifecycleParticipant extends AbstractMavenLifecycleParticipant {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(MavenLifecycleParticipant.class);
-
-  private final BuildEventsHandler<MavenExecutionRequest> buildEventsHandler =
-      InstrumentationBridge.createBuildEventsHandler();
-
-  @Override
-  public void afterSessionStart(MavenSession session) {
-    if (!Config.get().isCiVisibilityEnabled()) {
-      return;
-    }
-
-    ExecutionListener originalExecutionListener = session.getRequest().getExecutionListener();
-    ExecutionListener spyExecutionListener = new MavenExecutionListener(buildEventsHandler);
-
-    // We cannot add an ExecutionListener to the request, we can only replace the existing one.
-    // Since we want to preserve the original listener, the solution is to use a "splitter",
-    // that will forward each event both to the original listener and to our custom one.
-    // Since ExecutionListener may (and does) change depending on Maven version,
-    // we use a dynamic proxy instead of implementing the interface
-    InvocationHandler invocationHandler =
-        (Object target, Method method, Object[] args) -> {
-          method.invoke(spyExecutionListener, args);
-          return method.invoke(originalExecutionListener, args);
+    private static final Logger LOGGER = LoggerFactory.getLogger(MavenLifecycleParticipant.class);
+
+    private final BuildEventsHandler<MavenExecutionRequest> buildEventsHandler =
+            InstrumentationBridge.createBuildEventsHandler();
+
+    @Override
+    public void afterSessionStart(MavenSession session) {
+        if (!Config.get().isCiVisibilityEnabled()) {
+            return;
+        }
+
+        ExecutionListener originalExecutionListener = session.getRequest().getExecutionListener();
+        ExecutionListener spyExecutionListener = new MavenExecutionListener(buildEventsHandler);
+
+        // We cannot add an ExecutionListener to the request, we can only replace the existing one.
+        // Since we want to preserve the original listener, the solution is to use a "splitter",
+        // that will forward each event both to the original listener and to our custom one.
+        // Since ExecutionListener may (and does) change depending on Maven version,
+        // we use a dynamic proxy instead of implementing the interface
+        InvocationHandler invocationHandler = (Object target, Method method, Object[] args) -> {
+            method.invoke(spyExecutionListener, args);
+            return method.invoke(originalExecutionListener, args);
         };
-    ExecutionListener proxyExecutionListener =
-        (ExecutionListener)
-            Proxy.newProxyInstance(
+        ExecutionListener proxyExecutionListener = (ExecutionListener) Proxy.newProxyInstance(
                 MavenLifecycleParticipant.class.getClassLoader(),
                 new Class[] {ExecutionListener.class},
                 invocationHandler);
-    session.getRequest().setExecutionListener(proxyExecutionListener);
-  }
-
-  @Override
-  public void afterProjectsRead(MavenSession session) {
-    Config config = Config.get();
-    if (!config.isCiVisibilityEnabled()) {
-      return;
+        session.getRequest().setExecutionListener(proxyExecutionListener);
     }
 
-    MavenProject rootProject = session.getTopLevelProject();
-    Path projectRoot = rootProject.getBasedir().toPath();
-
-    MavenExecutionRequest request = session.getRequest();
-    String projectName = rootProject.getName();
-    String startCommand = MavenUtils.getCommandLine(session);
-    String mavenVersion = MavenUtils.getMavenVersion(session);
-    buildEventsHandler.onTestSessionStart(
-        request, projectName, projectRoot, startCommand, "maven", mavenVersion, null);
-
-    List<MavenProject> projects = session.getProjects();
-    for (MavenProject project : projects) {
-      Properties projectProperties = project.getProperties();
-      String projectArgLine = projectProperties.getProperty("argLine");
-      if (projectArgLine == null) {
-        // otherwise reference to "@{argLine}" that we add when configuring tracer
-        // might cause failure
-        projectProperties.setProperty("argLine", "");
-      }
+    @Override
+    public void afterProjectsRead(MavenSession session) {
+        Config config = Config.get();
+        if (!config.isCiVisibilityEnabled()) {
+            return;
+        }
+
+        MavenProject rootProject = session.getTopLevelProject();
+        Path projectRoot = rootProject.getBasedir().toPath();
+
+        MavenExecutionRequest request = session.getRequest();
+        String projectName = rootProject.getName();
+        String startCommand = MavenUtils.getCommandLine(session);
+        String mavenVersion = MavenUtils.getMavenVersion(session);
+        buildEventsHandler.onTestSessionStart(
+                request, projectName, projectRoot, startCommand, "maven", mavenVersion, null);
+
+        List<MavenProject> projects = session.getProjects();
+        for (MavenProject project : projects) {
+            Properties projectProperties = project.getProperties();
+            String projectArgLine = projectProperties.getProperty("argLine");
+            if (projectArgLine == null) {
+                // otherwise reference to "@{argLine}" that we add when configuring tracer
+                // might cause failure
+                projectProperties.setProperty("argLine", "");
+            }
+        }
+
+        if (!config.isCiVisibilityAutoConfigurationEnabled()) {
+            return;
+        }
+
+        ExecutorService projectConfigurationPool = createProjectConfigurationPool(projects.size());
+        configureProjects(projectConfigurationPool, session, projects);
+        projectConfigurationPool.shutdown();
     }
 
-    if (!config.isCiVisibilityAutoConfigurationEnabled()) {
-      return;
+    private static ExecutorService createProjectConfigurationPool(int projectsCount) {
+        int projectConfigurationPoolSize =
+                Math.min(projectsCount, Runtime.getRuntime().availableProcessors() * 2);
+        AgentThreadFactory threadFactory =
+                new AgentThreadFactory(AgentThreadFactory.AgentThread.CI_PROJECT_CONFIGURATOR);
+        return Executors.newFixedThreadPool(projectConfigurationPoolSize, threadFactory);
     }
 
-    ExecutorService projectConfigurationPool = createProjectConfigurationPool(projects.size());
-    configureProjects(projectConfigurationPool, session, projects);
-    projectConfigurationPool.shutdown();
-  }
-
-  private static ExecutorService createProjectConfigurationPool(int projectsCount) {
-    int projectConfigurationPoolSize =
-        Math.min(projectsCount, Runtime.getRuntime().availableProcessors() * 2);
-    AgentThreadFactory threadFactory =
-        new AgentThreadFactory(AgentThreadFactory.AgentThread.CI_PROJECT_CONFIGURATOR);
-    return Executors.newFixedThreadPool(projectConfigurationPoolSize, threadFactory);
-  }
-
-  private void configureProjects(
-      ExecutorService projectConfigurationPool, MavenSession session, List<MavenProject> projects) {
-    CompletionService<Void> testExecutionsCompletionService =
-        new ExecutorCompletionService<>(projectConfigurationPool);
-    for (MavenProject project : projects) {
-      testExecutionsCompletionService.submit(() -> configureProject(session, project));
+    private void configureProjects(
+            ExecutorService projectConfigurationPool, MavenSession session, List<MavenProject> projects) {
+        CompletionService<Void> testExecutionsCompletionService =
+                new ExecutorCompletionService<>(projectConfigurationPool);
+        for (MavenProject project : projects) {
+            testExecutionsCompletionService.submit(() -> configureProject(session, project));
+        }
+
+        for (int i = 0; i < projects.size(); i++) {
+            try {
+                Future<Void> future = testExecutionsCompletionService.take();
+                future.get();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                LOGGER.error("Interrupted while configuring projects", e);
+            } catch (ExecutionException e) {
+                LOGGER.error("Error while configuring projects", e);
+            }
+        }
     }
 
-    for (int i = 0; i < projects.size(); i++) {
-      try {
-        Future<Void> future = testExecutionsCompletionService.take();
-        future.get();
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-        LOGGER.error("Interrupted while configuring projects", e);
-      } catch (ExecutionException e) {
-        LOGGER.error("Error while configuring projects", e);
-      }
-    }
-  }
-
-  private Void configureProject(MavenSession session, MavenProject project) {
-    MavenProjectConfigurator.INSTANCE.configureCompilerPlugin(project);
+    private Void configureProject(MavenSession session, MavenProject project) {
+        MavenProjectConfigurator.INSTANCE.configureCompilerPlugin(project);
 
-    MavenExecutionRequest request = session.getRequest();
-    BuildSessionSettings sessionSettings = buildEventsHandler.getSessionSettings(request);
-    MavenProjectConfigurator.INSTANCE.configureJacoco(session, project, sessionSettings);
+        MavenExecutionRequest request = session.getRequest();
+        BuildSessionSettings sessionSettings = buildEventsHandler.getSessionSettings(request);
+        MavenProjectConfigurator.INSTANCE.configureJacoco(session, project, sessionSettings);
 
-    return null;
-  }
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java
index dd63e02b0e0..179821aa6e4 100644
--- a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java
+++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java
@@ -30,356 +30,341 @@
 
 class MavenProjectConfigurator {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(MavenProjectConfigurator.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(MavenProjectConfigurator.class);
 
-  static final MavenProjectConfigurator INSTANCE = new MavenProjectConfigurator();
+    static final MavenProjectConfigurator INSTANCE = new MavenProjectConfigurator();
 
-  private static final String MAVEN_COMPILER_PLUGIN_KEY =
-      "org.apache.maven.plugins:maven-compiler-plugin";
+    private static final String MAVEN_COMPILER_PLUGIN_KEY = "org.apache.maven.plugins:maven-compiler-plugin";
 
-  private static final String DATADOG_GROUP_ID = "com.datadoghq";
-  private static final String DATADOG_JAVAC_PLUGIN_ARTIFACT_ID = "dd-javac-plugin";
-  private static final String DATADOG_JAVAC_PLUGIN_CLIENT_ARTIFACT_ID = "dd-javac-plugin-client";
-  private static final String JAVAC_COMPILER_ID = "javac";
-  private static final String DATADOG_COMPILER_PLUGIN_ID = "DatadogCompilerPlugin";
+    private static final String DATADOG_GROUP_ID = "com.datadoghq";
+    private static final String DATADOG_JAVAC_PLUGIN_ARTIFACT_ID = "dd-javac-plugin";
+    private static final String DATADOG_JAVAC_PLUGIN_CLIENT_ARTIFACT_ID = "dd-javac-plugin-client";
+    private static final String JAVAC_COMPILER_ID = "javac";
+    private static final String DATADOG_COMPILER_PLUGIN_ID = "DatadogCompilerPlugin";
 
-  private static final String JACOCO_EXCL_CLASS_LOADERS_PROPERTY = "jacoco.exclClassLoaders";
+    private static final String JACOCO_EXCL_CLASS_LOADERS_PROPERTY = "jacoco.exclClassLoaders";
 
-  public void configureTracer(
-      MavenSession session,
-      MavenProject project,
-      MojoExecution mojoExecution,
-      Map<String, String> systemProperties,
-      Config config) {
-    if (!config.isCiVisibilityAutoConfigurationEnabled()) {
-      return;
-    }
+    public void configureTracer(
+            MavenSession session,
+            MavenProject project,
+            MojoExecution mojoExecution,
+            Map<String, String> systemProperties,
+            Config config) {
+        if (!config.isCiVisibilityAutoConfigurationEnabled()) {
+            return;
+        }
 
-    StringBuilder addedArgLine = new StringBuilder();
-    for (Map.Entry<String, String> e : systemProperties.entrySet()) {
-      addedArgLine
-          .append("-D")
-          .append(e.getKey())
-          .append('=')
-          .append(escapeForCommandLine(e.getValue()))
-          .append(' ');
-    }
+        StringBuilder addedArgLine = new StringBuilder();
+        for (Map.Entry<String, String> e : systemProperties.entrySet()) {
+            addedArgLine
+                    .append("-D")
+                    .append(e.getKey())
+                    .append('=')
+                    .append(escapeForCommandLine(e.getValue()))
+                    .append(' ');
+        }
 
-    Integer ciVisibilityDebugPort = config.getCiVisibilityDebugPort();
-    if (ciVisibilityDebugPort != null) {
-      addedArgLine
-          .append("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=")
-          .append(ciVisibilityDebugPort)
-          .append(' ');
-    }
+        Integer ciVisibilityDebugPort = config.getCiVisibilityDebugPort();
+        if (ciVisibilityDebugPort != null) {
+            addedArgLine
+                    .append("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=")
+                    .append(ciVisibilityDebugPort)
+                    .append(' ');
+        }
 
-    String additionalArgs = config.getCiVisibilityAdditionalChildProcessJvmArgs();
-    if (additionalArgs != null) {
-      addedArgLine.append(additionalArgs).append(' ');
-    }
+        String additionalArgs = config.getCiVisibilityAdditionalChildProcessJvmArgs();
+        if (additionalArgs != null) {
+            addedArgLine.append(additionalArgs).append(' ');
+        }
 
-    File agentJar = config.getCiVisibilityAgentJarFile();
-    addedArgLine
-        .append("-javaagent:")
-        .append(escapeForCommandLine(String.valueOf(agentJar.toPath())));
-
-    String existingArgLine = MavenUtils.getArgLine(session, project, mojoExecution);
-    String updatedArgLine =
-        (existingArgLine != null ? existingArgLine + " " : "")
-            +
-            // -javaagent that injects the tracer
-            // has to be the last one,
-            // since if there are other agents
-            // we want to be able to instrument their code
-            // (namely Jacoco's)
-            addedArgLine;
-
-    Xpp3Dom configuration = mojoExecution.getConfiguration();
-    mojoExecution.setConfiguration(
-        MavenUtils.setXmlConfigurationValue(updatedArgLine, configuration, "argLine"));
-  }
-
-  private String escapeForCommandLine(String value) {
-    return "'" + value.replace("'", "'\\''") + "'";
-  }
-
-  void configureCompilerPlugin(MavenProject project) {
-    Config config = Config.get();
-    if (!config.isCiVisibilityCompilerPluginAutoConfigurationEnabled()) {
-      return;
+        File agentJar = config.getCiVisibilityAgentJarFile();
+        addedArgLine.append("-javaagent:").append(escapeForCommandLine(String.valueOf(agentJar.toPath())));
+
+        String existingArgLine = MavenUtils.getArgLine(session, project, mojoExecution);
+        String updatedArgLine = (existingArgLine != null ? existingArgLine + " " : "")
+                +
+                // -javaagent that injects the tracer
+                // has to be the last one,
+                // since if there are other agents
+                // we want to be able to instrument their code
+                // (namely Jacoco's)
+                addedArgLine;
+
+        Xpp3Dom configuration = mojoExecution.getConfiguration();
+        mojoExecution.setConfiguration(MavenUtils.setXmlConfigurationValue(updatedArgLine, configuration, "argLine"));
     }
 
-    Plugin compilerPlugin = project.getPlugin(MAVEN_COMPILER_PLUGIN_KEY);
-    if (compilerPlugin == null) {
-      return;
+    private String escapeForCommandLine(String value) {
+        return "'" + value.replace("'", "'\\''") + "'";
     }
 
-    String compilerPluginVersion = config.getCiVisibilityCompilerPluginVersion();
-    if (compilerPluginVersion == null) {
-      return;
-    }
+    void configureCompilerPlugin(MavenProject project) {
+        Config config = Config.get();
+        if (!config.isCiVisibilityCompilerPluginAutoConfigurationEnabled()) {
+            return;
+        }
 
-    Xpp3Dom pluginConfiguration = (Xpp3Dom) compilerPlugin.getConfiguration();
-    String pluginCompilerId =
-        MavenUtils.getXmlConfigurationValue(pluginConfiguration, "compilerId");
-    if (pluginCompilerId != null && !JAVAC_COMPILER_ID.equals(pluginCompilerId)) {
-      return;
-    }
+        Plugin compilerPlugin = project.getPlugin(MAVEN_COMPILER_PLUGIN_KEY);
+        if (compilerPlugin == null) {
+            return;
+        }
 
-    for (PluginExecution execution : compilerPlugin.getExecutions()) {
-      Xpp3Dom configuration = (Xpp3Dom) execution.getConfiguration();
-
-      String compilerId = MavenUtils.getXmlConfigurationValue(configuration, "compilerId");
-      if (compilerId != null && !JAVAC_COMPILER_ID.equals(compilerId)) {
-        // Javac plugin does not work with other compilers
-        continue;
-      }
-
-      Dependency javacPluginClientDependency = new Dependency();
-      javacPluginClientDependency.setGroupId(DATADOG_GROUP_ID);
-      javacPluginClientDependency.setArtifactId(DATADOG_JAVAC_PLUGIN_CLIENT_ARTIFACT_ID);
-      javacPluginClientDependency.setVersion(compilerPluginVersion);
-
-      List<Dependency> projectDependencies = project.getDependencies();
-      addOrUpdate(projectDependencies, javacPluginClientDependency);
-
-      // if <annotationProcessorPaths> section is present,
-      // we have to add the plugin in there,
-      // otherwise it's best to add it as a regular dependency
-      if (configuration != null && configuration.getChild("annotationProcessorPaths") != null) {
-        configuration =
-            addAnnotationProcessorPath(
-                configuration,
-                DATADOG_GROUP_ID,
-                DATADOG_JAVAC_PLUGIN_ARTIFACT_ID,
-                compilerPluginVersion);
-
-      } else {
-        Dependency javacPluginDependency = new Dependency();
-        javacPluginDependency.setGroupId(DATADOG_GROUP_ID);
-        javacPluginDependency.setArtifactId(DATADOG_JAVAC_PLUGIN_ARTIFACT_ID);
-        javacPluginDependency.setVersion(compilerPluginVersion);
-
-        addOrUpdate(projectDependencies, javacPluginDependency);
-      }
-
-      configuration = addCompilerArg(configuration, "-Xplugin:" + DATADOG_COMPILER_PLUGIN_ID);
-
-      // disable compiler warnings related to annotation processing,
-      // since "fail-on-warning" linters might complain about the annotation that the compiler
-      // plugin injects
-      configuration = addCompilerArg(configuration, "-Xlint:-processing");
-
-      execution.setConfiguration(configuration);
-    }
-  }
+        String compilerPluginVersion = config.getCiVisibilityCompilerPluginVersion();
+        if (compilerPluginVersion == null) {
+            return;
+        }
 
-  private static void addOrUpdate(List<Dependency> projectDependencies, Dependency dependency) {
-    ComparableVersion dependencyVersion = new ComparableVersion(dependency.getVersion());
+        Xpp3Dom pluginConfiguration = (Xpp3Dom) compilerPlugin.getConfiguration();
+        String pluginCompilerId = MavenUtils.getXmlConfigurationValue(pluginConfiguration, "compilerId");
+        if (pluginCompilerId != null && !JAVAC_COMPILER_ID.equals(pluginCompilerId)) {
+            return;
+        }
 
-    for (Dependency projectDependency : projectDependencies) {
-      if (projectDependency.getGroupId().equals(dependency.getGroupId())
-          && projectDependency.getArtifactId().equals(dependency.getArtifactId())) {
+        for (PluginExecution execution : compilerPlugin.getExecutions()) {
+            Xpp3Dom configuration = (Xpp3Dom) execution.getConfiguration();
 
-        ComparableVersion projectDependencyVersion =
-            new ComparableVersion(projectDependency.getVersion());
-        if (dependencyVersion.compareTo(projectDependencyVersion) > 0) {
-          projectDependency.setVersion(dependency.getVersion());
-        }
+            String compilerId = MavenUtils.getXmlConfigurationValue(configuration, "compilerId");
+            if (compilerId != null && !JAVAC_COMPILER_ID.equals(compilerId)) {
+                // Javac plugin does not work with other compilers
+                continue;
+            }
 
-        return;
-      }
-    }
-    projectDependencies.add(dependency);
-  }
+            Dependency javacPluginClientDependency = new Dependency();
+            javacPluginClientDependency.setGroupId(DATADOG_GROUP_ID);
+            javacPluginClientDependency.setArtifactId(DATADOG_JAVAC_PLUGIN_CLIENT_ARTIFACT_ID);
+            javacPluginClientDependency.setVersion(compilerPluginVersion);
 
-  private static Xpp3Dom addCompilerArg(Xpp3Dom configuration, String argValue) {
-    if (configuration == null) {
-      configuration = new Xpp3Dom("configuration");
-    }
+            List<Dependency> projectDependencies = project.getDependencies();
+            addOrUpdate(projectDependencies, javacPluginClientDependency);
+
+            // if <annotationProcessorPaths> section is present,
+            // we have to add the plugin in there,
+            // otherwise it's best to add it as a regular dependency
+            if (configuration != null && configuration.getChild("annotationProcessorPaths") != null) {
+                configuration = addAnnotationProcessorPath(
+                        configuration, DATADOG_GROUP_ID, DATADOG_JAVAC_PLUGIN_ARTIFACT_ID, compilerPluginVersion);
 
-    Xpp3Dom compilerArgs = configuration.getChild("compilerArgs");
-    if (compilerArgs == null) {
-      compilerArgs = new Xpp3Dom("compilerArgs");
-      configuration.addChild(compilerArgs);
+            } else {
+                Dependency javacPluginDependency = new Dependency();
+                javacPluginDependency.setGroupId(DATADOG_GROUP_ID);
+                javacPluginDependency.setArtifactId(DATADOG_JAVAC_PLUGIN_ARTIFACT_ID);
+                javacPluginDependency.setVersion(compilerPluginVersion);
+
+                addOrUpdate(projectDependencies, javacPluginDependency);
+            }
+
+            configuration = addCompilerArg(configuration, "-Xplugin:" + DATADOG_COMPILER_PLUGIN_ID);
+
+            // disable compiler warnings related to annotation processing,
+            // since "fail-on-warning" linters might complain about the annotation that the compiler
+            // plugin injects
+            configuration = addCompilerArg(configuration, "-Xlint:-processing");
+
+            execution.setConfiguration(configuration);
+        }
     }
 
-    Xpp3Dom arg = new Xpp3Dom("arg");
-    arg.setValue(argValue);
-    compilerArgs.addChild(arg);
+    private static void addOrUpdate(List<Dependency> projectDependencies, Dependency dependency) {
+        ComparableVersion dependencyVersion = new ComparableVersion(dependency.getVersion());
+
+        for (Dependency projectDependency : projectDependencies) {
+            if (projectDependency.getGroupId().equals(dependency.getGroupId())
+                    && projectDependency.getArtifactId().equals(dependency.getArtifactId())) {
 
-    return configuration;
-  }
+                ComparableVersion projectDependencyVersion = new ComparableVersion(projectDependency.getVersion());
+                if (dependencyVersion.compareTo(projectDependencyVersion) > 0) {
+                    projectDependency.setVersion(dependency.getVersion());
+                }
 
-  private static Xpp3Dom addAnnotationProcessorPath(
-      Xpp3Dom configuration, String groupId, String artifactId, String version) {
-    if (configuration == null) {
-      configuration = new Xpp3Dom("configuration");
+                return;
+            }
+        }
+        projectDependencies.add(dependency);
     }
 
-    Xpp3Dom annotationProcessorPaths = configuration.getChild("annotationProcessorPaths");
-    if (annotationProcessorPaths == null) {
-      annotationProcessorPaths = new Xpp3Dom("annotationProcessorPaths");
-      configuration.addChild(annotationProcessorPaths);
+    private static Xpp3Dom addCompilerArg(Xpp3Dom configuration, String argValue) {
+        if (configuration == null) {
+            configuration = new Xpp3Dom("configuration");
+        }
+
+        Xpp3Dom compilerArgs = configuration.getChild("compilerArgs");
+        if (compilerArgs == null) {
+            compilerArgs = new Xpp3Dom("compilerArgs");
+            configuration.addChild(compilerArgs);
+        }
+
+        Xpp3Dom arg = new Xpp3Dom("arg");
+        arg.setValue(argValue);
+        compilerArgs.addChild(arg);
+
+        return configuration;
     }
 
-    Xpp3Dom annotationProcessorPath = new Xpp3Dom("annotationProcessorPath");
+    private static Xpp3Dom addAnnotationProcessorPath(
+            Xpp3Dom configuration, String groupId, String artifactId, String version) {
+        if (configuration == null) {
+            configuration = new Xpp3Dom("configuration");
+        }
 
-    Xpp3Dom groupIdElement = new Xpp3Dom("groupId");
-    groupIdElement.setValue(groupId);
-    annotationProcessorPath.addChild(groupIdElement);
+        Xpp3Dom annotationProcessorPaths = configuration.getChild("annotationProcessorPaths");
+        if (annotationProcessorPaths == null) {
+            annotationProcessorPaths = new Xpp3Dom("annotationProcessorPaths");
+            configuration.addChild(annotationProcessorPaths);
+        }
 
-    Xpp3Dom artifactIdElement = new Xpp3Dom("artifactId");
-    artifactIdElement.setValue(artifactId);
-    annotationProcessorPath.addChild(artifactIdElement);
+        Xpp3Dom annotationProcessorPath = new Xpp3Dom("annotationProcessorPath");
 
-    Xpp3Dom versionElement = new Xpp3Dom("version");
-    versionElement.setValue(version);
-    annotationProcessorPath.addChild(versionElement);
+        Xpp3Dom groupIdElement = new Xpp3Dom("groupId");
+        groupIdElement.setValue(groupId);
+        annotationProcessorPath.addChild(groupIdElement);
 
-    annotationProcessorPaths.addChild(annotationProcessorPath);
+        Xpp3Dom artifactIdElement = new Xpp3Dom("artifactId");
+        artifactIdElement.setValue(artifactId);
+        annotationProcessorPath.addChild(artifactIdElement);
 
-    return configuration;
-  }
+        Xpp3Dom versionElement = new Xpp3Dom("version");
+        versionElement.setValue(version);
+        annotationProcessorPath.addChild(versionElement);
 
-  void configureJacoco(
-      MavenSession session, MavenProject project, BuildSessionSettings sessionSettings) {
-    excludeDatadogClassLoaderFromJacocoInstrumentation(project);
-    if (!Config.get().isCiVisibilityJacocoPluginVersionProvided()
-        && !sessionSettings.isCoverageReportUploadEnabled()) {
-      return;
-    }
+        annotationProcessorPaths.addChild(annotationProcessorPath);
 
-    if (runsWithJacoco(session, project)) {
-      // Jacoco is already configured for this project
-      return;
+        return configuration;
     }
 
-    configureJacocoPlugin(project, sessionSettings);
-  }
-
-  private boolean runsWithJacoco(MavenSession session, MavenProject project) {
-    try {
-      List<String> goals = session.getGoals();
-      List<Object> tasks = new ArrayList<>(goals.size());
-      for (String goal : goals) {
-        if (goal.indexOf(':') >= 0) {
-          // a plugin goal, e.g. "surefire:test"
-          tasks.add(new GoalTask(goal));
-        } else {
-          // a lifecycle phase, e.g. "clean"
-          tasks.add(new LifecycleTask(goal));
+    void configureJacoco(MavenSession session, MavenProject project, BuildSessionSettings sessionSettings) {
+        excludeDatadogClassLoaderFromJacocoInstrumentation(project);
+        if (!Config.get().isCiVisibilityJacocoPluginVersionProvided()
+                && !sessionSettings.isCoverageReportUploadEnabled()) {
+            return;
         }
-      }
-      PlexusContainer container = MavenUtils.getContainer(session);
-      LifecycleExecutionPlanCalculator planCalculator =
-          container.lookup(LifecycleExecutionPlanCalculator.class);
-      MavenExecutionPlan executionPlan =
-          planCalculator.calculateExecutionPlan(session, project, tasks);
-      for (MojoExecution mojoExecution : executionPlan.getMojoExecutions()) {
-        if (MavenUtils.isJacocoInstrumentationExecution(mojoExecution)) {
-          return true;
+
+        if (runsWithJacoco(session, project)) {
+            // Jacoco is already configured for this project
+            return;
         }
-      }
-      return false;
 
-    } catch (Exception e) {
-      LOGGER.warn("Error while calculation execution plan for project {}", project.getName(), e);
-      return false;
+        configureJacocoPlugin(project, sessionSettings);
     }
-  }
-
-  private static void excludeDatadogClassLoaderFromJacocoInstrumentation(MavenProject project) {
-    String datadogClassLoaderName = DatadogClassLoader.class.getName();
-
-    Properties projectProperties = project.getProperties();
-    String currentValue = projectProperties.getProperty(JACOCO_EXCL_CLASS_LOADERS_PROPERTY);
-    if (Strings.isNotBlank(currentValue)) {
-      if (!currentValue.contains(datadogClassLoaderName)) {
-        projectProperties.setProperty(
-            JACOCO_EXCL_CLASS_LOADERS_PROPERTY, currentValue + ":" + datadogClassLoaderName);
-      }
-    } else {
-      projectProperties.setProperty(JACOCO_EXCL_CLASS_LOADERS_PROPERTY, datadogClassLoaderName);
+
+    private boolean runsWithJacoco(MavenSession session, MavenProject project) {
+        try {
+            List<String> goals = session.getGoals();
+            List<Object> tasks = new ArrayList<>(goals.size());
+            for (String goal : goals) {
+                if (goal.indexOf(':') >= 0) {
+                    // a plugin goal, e.g. "surefire:test"
+                    tasks.add(new GoalTask(goal));
+                } else {
+                    // a lifecycle phase, e.g. "clean"
+                    tasks.add(new LifecycleTask(goal));
+                }
+            }
+            PlexusContainer container = MavenUtils.getContainer(session);
+            LifecycleExecutionPlanCalculator planCalculator = container.lookup(LifecycleExecutionPlanCalculator.class);
+            MavenExecutionPlan executionPlan = planCalculator.calculateExecutionPlan(session, project, tasks);
+            for (MojoExecution mojoExecution : executionPlan.getMojoExecutions()) {
+                if (MavenUtils.isJacocoInstrumentationExecution(mojoExecution)) {
+                    return true;
+                }
+            }
+            return false;
+
+        } catch (Exception e) {
+            LOGGER.warn("Error while calculation execution plan for project {}", project.getName(), e);
+            return false;
+        }
     }
-  }
-
-  private static void configureJacocoPlugin(
-      MavenProject project, BuildSessionSettings sessionSettings) {
-    Plugin jacocoPlugin = getJacocoPlugin(project);
-    for (PluginExecution execution : jacocoPlugin.getExecutions()) {
-      if (execution.getGoals().contains("prepare-agent")) {
-        // prepare-agent goal is already configured
-        return;
-      }
+
+    private static void excludeDatadogClassLoaderFromJacocoInstrumentation(MavenProject project) {
+        String datadogClassLoaderName = DatadogClassLoader.class.getName();
+
+        Properties projectProperties = project.getProperties();
+        String currentValue = projectProperties.getProperty(JACOCO_EXCL_CLASS_LOADERS_PROPERTY);
+        if (Strings.isNotBlank(currentValue)) {
+            if (!currentValue.contains(datadogClassLoaderName)) {
+                projectProperties.setProperty(
+                        JACOCO_EXCL_CLASS_LOADERS_PROPERTY, currentValue + ":" + datadogClassLoaderName);
+            }
+        } else {
+            projectProperties.setProperty(JACOCO_EXCL_CLASS_LOADERS_PROPERTY, datadogClassLoaderName);
+        }
     }
 
-    PluginExecution prepareAgentExecution = new PluginExecution();
-    prepareAgentExecution.addGoal("prepare-agent");
-    jacocoPlugin.addExecution(prepareAgentExecution);
+    private static void configureJacocoPlugin(MavenProject project, BuildSessionSettings sessionSettings) {
+        Plugin jacocoPlugin = getJacocoPlugin(project);
+        for (PluginExecution execution : jacocoPlugin.getExecutions()) {
+            if (execution.getGoals().contains("prepare-agent")) {
+                // prepare-agent goal is already configured
+                return;
+            }
+        }
 
-    configureJacocoInstrumentedPackages(
-        prepareAgentExecution,
-        sessionSettings.getCoverageIncludedPackages(),
-        sessionSettings.getCoverageExcludedPackages());
-  }
+        PluginExecution prepareAgentExecution = new PluginExecution();
+        prepareAgentExecution.addGoal("prepare-agent");
+        jacocoPlugin.addExecution(prepareAgentExecution);
 
-  private static Plugin getJacocoPlugin(MavenProject project) {
-    Plugin existingPlugin = project.getPlugin("org.jacoco:jacoco-maven-plugin");
-    if (existingPlugin != null) {
-      return existingPlugin;
+        configureJacocoInstrumentedPackages(
+                prepareAgentExecution,
+                sessionSettings.getCoverageIncludedPackages(),
+                sessionSettings.getCoverageExcludedPackages());
     }
 
-    Config config = Config.get();
-
-    Plugin jacocoPlugin = new Plugin();
-    jacocoPlugin.setGroupId("org.jacoco");
-    jacocoPlugin.setArtifactId("jacoco-maven-plugin");
-    jacocoPlugin.setVersion(config.getCiVisibilityJacocoPluginVersion());
-
-    // a little trick to avoid triggering
-    // Maven Enforcer Plugin's "Require Plugin Versions" rule:
-    // we're making it look like version was specified explicitly
-    // in the project's config files
-    InputSource versionSource = new InputSource();
-    versionSource.setLocation("injected-by-dd-java-agent");
-    versionSource.setModelId("injected-by-dd-java-agent");
-    InputLocation versionLocation = new InputLocation(0, 0, versionSource);
-    jacocoPlugin.setLocation("version", versionLocation);
-
-    Build build = project.getBuild();
-    build.addPlugin(jacocoPlugin);
-
-    return jacocoPlugin;
-  }
-
-  private static void configureJacocoInstrumentedPackages(
-      PluginExecution execution, List<String> includedPackages, List<String> excludedPackages) {
-    Xpp3Dom configuration = new Xpp3Dom("configuration");
-    execution.setConfiguration(configuration);
-
-    if (!includedPackages.isEmpty()) {
-      Xpp3Dom includes = new Xpp3Dom("includes");
-      for (String instrumentedPackage : includedPackages) {
-        if (Strings.isNotBlank(instrumentedPackage)) {
-          Xpp3Dom include = new Xpp3Dom("include");
-          include.setValue(instrumentedPackage);
-          includes.addChild(include);
+    private static Plugin getJacocoPlugin(MavenProject project) {
+        Plugin existingPlugin = project.getPlugin("org.jacoco:jacoco-maven-plugin");
+        if (existingPlugin != null) {
+            return existingPlugin;
         }
-      }
-      configuration.addChild(includes);
+
+        Config config = Config.get();
+
+        Plugin jacocoPlugin = new Plugin();
+        jacocoPlugin.setGroupId("org.jacoco");
+        jacocoPlugin.setArtifactId("jacoco-maven-plugin");
+        jacocoPlugin.setVersion(config.getCiVisibilityJacocoPluginVersion());
+
+        // a little trick to avoid triggering
+        // Maven Enforcer Plugin's "Require Plugin Versions" rule:
+        // we're making it look like version was specified explicitly
+        // in the project's config files
+        InputSource versionSource = new InputSource();
+        versionSource.setLocation("injected-by-dd-java-agent");
+        versionSource.setModelId("injected-by-dd-java-agent");
+        InputLocation versionLocation = new InputLocation(0, 0, versionSource);
+        jacocoPlugin.setLocation("version", versionLocation);
+
+        Build build = project.getBuild();
+        build.addPlugin(jacocoPlugin);
+
+        return jacocoPlugin;
     }
 
-    if (!excludedPackages.isEmpty()) {
-      Xpp3Dom excludes = new Xpp3Dom("excludes");
-      for (String excludedPackage : excludedPackages) {
-        if (Strings.isNotBlank(excludedPackage)) {
-          Xpp3Dom exclude = new Xpp3Dom("exclude");
-          exclude.setValue(excludedPackage);
-          excludes.addChild(exclude);
+    private static void configureJacocoInstrumentedPackages(
+            PluginExecution execution, List<String> includedPackages, List<String> excludedPackages) {
+        Xpp3Dom configuration = new Xpp3Dom("configuration");
+        execution.setConfiguration(configuration);
+
+        if (!includedPackages.isEmpty()) {
+            Xpp3Dom includes = new Xpp3Dom("includes");
+            for (String instrumentedPackage : includedPackages) {
+                if (Strings.isNotBlank(instrumentedPackage)) {
+                    Xpp3Dom include = new Xpp3Dom("include");
+                    include.setValue(instrumentedPackage);
+                    includes.addChild(include);
+                }
+            }
+            configuration.addChild(includes);
+        }
+
+        if (!excludedPackages.isEmpty()) {
+            Xpp3Dom excludes = new Xpp3Dom("excludes");
+            for (String excludedPackage : excludedPackages) {
+                if (Strings.isNotBlank(excludedPackage)) {
+                    Xpp3Dom exclude = new Xpp3Dom("exclude");
+                    exclude.setValue(excludedPackage);
+                    excludes.addChild(exclude);
+                }
+            }
+            configuration.addChild(excludes);
         }
-      }
-      configuration.addChild(excludes);
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenTestExecution.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenTestExecution.java
index 2d28349bc24..ce39011ca98 100644
--- a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenTestExecution.java
+++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenTestExecution.java
@@ -5,32 +5,32 @@
 import org.apache.maven.project.MavenProject;
 
 public final class MavenTestExecution {
-  private final MavenProject project;
-  private final MojoExecution execution;
-  private final Path forkedJvmPath;
-  private final boolean runsWithJacoco;
+    private final MavenProject project;
+    private final MojoExecution execution;
+    private final Path forkedJvmPath;
+    private final boolean runsWithJacoco;
 
-  public MavenTestExecution(
-      MavenProject project, MojoExecution execution, Path forkedJvmPath, boolean runsWithJacoco) {
-    this.project = project;
-    this.execution = execution;
-    this.forkedJvmPath = forkedJvmPath;
-    this.runsWithJacoco = runsWithJacoco;
-  }
+    public MavenTestExecution(
+            MavenProject project, MojoExecution execution, Path forkedJvmPath, boolean runsWithJacoco) {
+        this.project = project;
+        this.execution = execution;
+        this.forkedJvmPath = forkedJvmPath;
+        this.runsWithJacoco = runsWithJacoco;
+    }
 
-  public MavenProject getProject() {
-    return project;
-  }
+    public MavenProject getProject() {
+        return project;
+    }
 
-  public MojoExecution getExecution() {
-    return execution;
-  }
+    public MojoExecution getExecution() {
+        return execution;
+    }
 
-  public Path getForkedJvmPath() {
-    return forkedJvmPath;
-  }
+    public Path getForkedJvmPath() {
+        return forkedJvmPath;
+    }
 
-  public boolean isRunsWithJacoco() {
-    return runsWithJacoco;
-  }
+    public boolean isRunsWithJacoco() {
+        return runsWithJacoco;
+    }
 }
diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenUtils.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenUtils.java
index c2ed31af284..e4598825753 100644
--- a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenUtils.java
+++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenUtils.java
@@ -50,610 +50,579 @@
 
 public abstract class MavenUtils {
 
-  private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(MavenUtils.class);
+    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(MavenUtils.class);
 
-  private static final String MAVEN_CMD_LINE_ARGS_ENVIRONMENT_VAR = "MAVEN_CMD_LINE_ARGS";
+    private static final String MAVEN_CMD_LINE_ARGS_ENVIRONMENT_VAR = "MAVEN_CMD_LINE_ARGS";
 
-  private static final String MAVEN_VERSION_SYSTEM_PROPERTY = "maven.version";
+    private static final String MAVEN_VERSION_SYSTEM_PROPERTY = "maven.version";
 
-  private static final String MVN_CMD_LINE_INVOCATION = "mvn";
+    private static final String MVN_CMD_LINE_INVOCATION = "mvn";
 
-  private static final String JAVAAGENT_PREFIX = "-javaagent:";
+    private static final String JAVAAGENT_PREFIX = "-javaagent:";
 
-  /**
-   * Returns command line used to start the build. Depending on Maven version the actual command
-   * line might not be available, in which case we will do our best to recreate one using the state
-   * of the request object
-   */
-  public static String getCommandLine(MavenSession session) {
-    String mavenCmdLineArgsEnvVar = ConfigHelper.env(MAVEN_CMD_LINE_ARGS_ENVIRONMENT_VAR);
-    if (mavenCmdLineArgsEnvVar != null) {
-      return MVN_CMD_LINE_INVOCATION + mavenCmdLineArgsEnvVar;
-    }
+    /**
+     * Returns command line used to start the build. Depending on Maven version the actual command
+     * line might not be available, in which case we will do our best to recreate one using the state
+     * of the request object
+     */
+    public static String getCommandLine(MavenSession session) {
+        String mavenCmdLineArgsEnvVar = ConfigHelper.env(MAVEN_CMD_LINE_ARGS_ENVIRONMENT_VAR);
+        if (mavenCmdLineArgsEnvVar != null) {
+            return MVN_CMD_LINE_INVOCATION + mavenCmdLineArgsEnvVar;
+        }
 
-    Properties sessionSystemProperties = session.getSystemProperties();
-    String mavenCmdLineArgsProp =
-        sessionSystemProperties.getProperty("env." + MAVEN_CMD_LINE_ARGS_ENVIRONMENT_VAR);
-    if (mavenCmdLineArgsProp != null) {
-      return MVN_CMD_LINE_INVOCATION + mavenCmdLineArgsProp;
-    }
+        Properties sessionSystemProperties = session.getSystemProperties();
+        String mavenCmdLineArgsProp = sessionSystemProperties.getProperty("env." + MAVEN_CMD_LINE_ARGS_ENVIRONMENT_VAR);
+        if (mavenCmdLineArgsProp != null) {
+            return MVN_CMD_LINE_INVOCATION + mavenCmdLineArgsProp;
+        }
 
-    MavenExecutionRequest request = session.getRequest();
-    StringBuilder command = new StringBuilder(MVN_CMD_LINE_INVOCATION);
+        MavenExecutionRequest request = session.getRequest();
+        StringBuilder command = new StringBuilder(MVN_CMD_LINE_INVOCATION);
 
-    if (!request.isInteractiveMode()) {
-      command.append(" -").append(CLIManager.BATCH_MODE);
-    }
+        if (!request.isInteractiveMode()) {
+            command.append(" -").append(CLIManager.BATCH_MODE);
+        }
 
-    if (request.getGlobalChecksumPolicy() != null) {
-      switch (request.getGlobalChecksumPolicy()) {
-        case "fail":
-          command.append(" -").append(CLIManager.CHECKSUM_FAILURE_POLICY);
-          break;
-        case "warn":
-          command.append(" -").append(CLIManager.CHECKSUM_WARNING_POLICY);
-          break;
-        default:
-          break;
-      }
-    }
+        if (request.getGlobalChecksumPolicy() != null) {
+            switch (request.getGlobalChecksumPolicy()) {
+                case "fail":
+                    command.append(" -").append(CLIManager.CHECKSUM_FAILURE_POLICY);
+                    break;
+                case "warn":
+                    command.append(" -").append(CLIManager.CHECKSUM_WARNING_POLICY);
+                    break;
+                default:
+                    break;
+            }
+        }
 
-    if (request.getMakeBehavior() != null) {
-      switch (request.getMakeBehavior()) {
-        case "make-upstream":
-          command.append(" -").append(CLIManager.ALSO_MAKE);
-          break;
-        case "make-downstream":
-          command.append(" -").append(CLIManager.ALSO_MAKE_DEPENDENTS);
-          break;
-        case "make-both":
-          command.append(" -").append(CLIManager.ALSO_MAKE);
-          command.append(" -").append(CLIManager.ALSO_MAKE_DEPENDENTS);
-          break;
-        default:
-          break;
-      }
-    }
+        if (request.getMakeBehavior() != null) {
+            switch (request.getMakeBehavior()) {
+                case "make-upstream":
+                    command.append(" -").append(CLIManager.ALSO_MAKE);
+                    break;
+                case "make-downstream":
+                    command.append(" -").append(CLIManager.ALSO_MAKE_DEPENDENTS);
+                    break;
+                case "make-both":
+                    command.append(" -").append(CLIManager.ALSO_MAKE);
+                    command.append(" -").append(CLIManager.ALSO_MAKE_DEPENDENTS);
+                    break;
+                default:
+                    break;
+            }
+        }
 
-    if (request.isShowErrors()) {
-      command.append(" -").append(CLIManager.ERRORS);
-    }
+        if (request.isShowErrors()) {
+            command.append(" -").append(CLIManager.ERRORS);
+        }
 
-    if (!Objects.equals(request.getPom().getParent(), request.getBaseDirectory())
-        || !Objects.equals(request.getPom().getName(), "pom.xml")) {
-      command
-          .append(" -")
-          .append(CLIManager.ALTERNATE_POM_FILE)
-          .append('=')
-          .append(request.getPom());
-    }
+        if (!Objects.equals(request.getPom().getParent(), request.getBaseDirectory())
+                || !Objects.equals(request.getPom().getName(), "pom.xml")) {
+            command.append(" -")
+                    .append(CLIManager.ALTERNATE_POM_FILE)
+                    .append('=')
+                    .append(request.getPom());
+        }
 
-    if (request.getReactorFailureBehavior() != null) {
-      switch (request.getReactorFailureBehavior()) {
-        case "FAIL_AT_END":
-          command.append(" -").append(CLIManager.FAIL_AT_END);
-          break;
-        case "FAIL_NEVER":
-          command.append(" -").append(CLIManager.FAIL_NEVER);
-          break;
-        default:
-          break;
-      }
-    }
+        if (request.getReactorFailureBehavior() != null) {
+            switch (request.getReactorFailureBehavior()) {
+                case "FAIL_AT_END":
+                    command.append(" -").append(CLIManager.FAIL_AT_END);
+                    break;
+                case "FAIL_NEVER":
+                    command.append(" -").append(CLIManager.FAIL_NEVER);
+                    break;
+                default:
+                    break;
+            }
+        }
 
-    int loggingLevel = request.getLoggingLevel();
-    switch (loggingLevel) {
-      case Logger.LEVEL_DEBUG:
-        command.append(" -").append(CLIManager.DEBUG);
-        break;
-      case Logger.LEVEL_ERROR:
-        command.append(" -").append(CLIManager.QUIET);
-        break;
-      default:
-        break;
-    }
+        int loggingLevel = request.getLoggingLevel();
+        switch (loggingLevel) {
+            case Logger.LEVEL_DEBUG:
+                command.append(" -").append(CLIManager.DEBUG);
+                break;
+            case Logger.LEVEL_ERROR:
+                command.append(" -").append(CLIManager.QUIET);
+                break;
+            default:
+                break;
+        }
 
-    if (!request.isRecursive()) {
-      command.append(" -").append(CLIManager.NON_RECURSIVE);
-    }
+        if (!request.isRecursive()) {
+            command.append(" -").append(CLIManager.NON_RECURSIVE);
+        }
 
-    if (request.isUpdateSnapshots()) {
-      command.append(" -").append(CLIManager.UPDATE_SNAPSHOTS);
-    }
+        if (request.isUpdateSnapshots()) {
+            command.append(" -").append(CLIManager.UPDATE_SNAPSHOTS);
+        }
 
-    if (request.isNoSnapshotUpdates()) {
-      command.append(" -").append(CLIManager.SUPRESS_SNAPSHOT_UPDATES);
-    }
+        if (request.isNoSnapshotUpdates()) {
+            command.append(" -").append(CLIManager.SUPRESS_SNAPSHOT_UPDATES);
+        }
 
-    if (request.isOffline()) {
-      command.append(" -").append(CLIManager.OFFLINE);
-    }
+        if (request.isOffline()) {
+            command.append(" -").append(CLIManager.OFFLINE);
+        }
 
-    if (request.getDegreeOfConcurrency() != 1) {
-      command.append(" -").append(CLIManager.THREADS).append(request.getDegreeOfConcurrency());
-    }
+        if (request.getDegreeOfConcurrency() != 1) {
+            command.append(" -").append(CLIManager.THREADS).append(request.getDegreeOfConcurrency());
+        }
 
-    if (!request.getSelectedProjects().isEmpty()) {
-      command.append(" -").append(CLIManager.PROJECT_LIST).append('=');
-      Iterator<String> it = request.getSelectedProjects().iterator();
-      while (it.hasNext()) {
-        command.append(it.next());
-        if (it.hasNext()) {
-          command.append(',');
+        if (!request.getSelectedProjects().isEmpty()) {
+            command.append(" -").append(CLIManager.PROJECT_LIST).append('=');
+            Iterator<String> it = request.getSelectedProjects().iterator();
+            while (it.hasNext()) {
+                command.append(it.next());
+                if (it.hasNext()) {
+                    command.append(',');
+                }
+            }
+        }
+
+        if (request.getResumeFrom() != null && !request.getResumeFrom().isEmpty()) {
+            command.append(" -").append(CLIManager.RESUME_FROM).append('=').append(request.getResumeFrom());
+        }
+
+        List<String> goals = request.getGoals();
+        for (String goal : goals) {
+            command.append(' ').append(goal);
         }
-      }
-    }
 
-    if (request.getResumeFrom() != null && !request.getResumeFrom().isEmpty()) {
-      command
-          .append(" -")
-          .append(CLIManager.RESUME_FROM)
-          .append('=')
-          .append(request.getResumeFrom());
+        if (!request.getActiveProfiles().isEmpty()) {
+            command.append(" -").append(CLIManager.ACTIVATE_PROFILES);
+            Iterator<String> it = request.getActiveProfiles().iterator();
+            while (it.hasNext()) {
+                command.append(it.next());
+                if (it.hasNext()) {
+                    command.append(',');
+                }
+            }
+        }
+
+        return command.toString();
     }
 
-    List<String> goals = request.getGoals();
-    for (String goal : goals) {
-      command.append(' ').append(goal);
+    public static String getMavenVersion(MavenSession session) {
+        Properties sessionSystemProperties = session.getSystemProperties();
+        return sessionSystemProperties.getProperty(MAVEN_VERSION_SYSTEM_PROPERTY);
     }
 
-    if (!request.getActiveProfiles().isEmpty()) {
-      command.append(" -").append(CLIManager.ACTIVATE_PROFILES);
-      Iterator<String> it = request.getActiveProfiles().iterator();
-      while (it.hasNext()) {
-        command.append(it.next());
-        if (it.hasNext()) {
-          command.append(',');
+    public static Throwable getException(MavenExecutionResult result) {
+        if (!result.hasExceptions()) {
+            return null;
+        }
+        List<Throwable> exceptions = result.getExceptions();
+        if (exceptions.size() == 1) {
+            return exceptions.iterator().next();
+        } else {
+            MavenProject project = result.getProject();
+            Throwable t =
+                    new BuildFailureException("Build failed" + (project != null ? " for " + project.getName() : ""));
+            for (Throwable e : exceptions) {
+                t.addSuppressed(e);
+            }
+            return t;
         }
-      }
     }
 
-    return command.toString();
-  }
-
-  public static String getMavenVersion(MavenSession session) {
-    Properties sessionSystemProperties = session.getSystemProperties();
-    return sessionSystemProperties.getProperty(MAVEN_VERSION_SYSTEM_PROPERTY);
-  }
+    public static boolean isTestExecution(MojoExecution mojoExecution) {
+        Plugin plugin = mojoExecution.getPlugin();
+        String artifactId = plugin.getArtifactId();
+        String groupId = plugin.getGroupId();
+        String goal = mojoExecution.getGoal();
+        return "maven-surefire-plugin".equals(artifactId)
+                        && "org.apache.maven.plugins".equals(groupId)
+                        && "test".equals(goal)
+                || "maven-failsafe-plugin".equals(artifactId)
+                        && "org.apache.maven.plugins".equals(groupId)
+                        && "integration-test".equals(goal)
+                || "tycho-surefire-plugin".equals(artifactId)
+                        && "org.eclipse.tycho".equals(groupId)
+                        && ("test".equals(goal) || "plugin-test".equals(goal) || "bnd-test".equals(goal));
+    }
+
+    public static boolean isJacocoInstrumentationExecution(MojoExecution mojoExecution) {
+        Plugin plugin = mojoExecution.getPlugin();
+        String artifactId = plugin.getArtifactId();
+        String groupId = plugin.getGroupId();
+        String goal = mojoExecution.getGoal();
+        return "jacoco-maven-plugin".equals(artifactId) && "org.jacoco".equals(groupId) && "prepare-agent".equals(goal);
+    }
+
+    public static String getXmlConfigurationValue(Xpp3Dom configuration, String... path) {
+        if (configuration == null) {
+            return null;
+        }
 
-  public static Throwable getException(MavenExecutionResult result) {
-    if (!result.hasExceptions()) {
-      return null;
-    }
-    List<Throwable> exceptions = result.getExceptions();
-    if (exceptions.size() == 1) {
-      return exceptions.iterator().next();
-    } else {
-      MavenProject project = result.getProject();
-      Throwable t =
-          new BuildFailureException(
-              "Build failed" + (project != null ? " for " + project.getName() : ""));
-      for (Throwable e : exceptions) {
-        t.addSuppressed(e);
-      }
-      return t;
-    }
-  }
-
-  public static boolean isTestExecution(MojoExecution mojoExecution) {
-    Plugin plugin = mojoExecution.getPlugin();
-    String artifactId = plugin.getArtifactId();
-    String groupId = plugin.getGroupId();
-    String goal = mojoExecution.getGoal();
-    return "maven-surefire-plugin".equals(artifactId)
-            && "org.apache.maven.plugins".equals(groupId)
-            && "test".equals(goal)
-        || "maven-failsafe-plugin".equals(artifactId)
-            && "org.apache.maven.plugins".equals(groupId)
-            && "integration-test".equals(goal)
-        || "tycho-surefire-plugin".equals(artifactId)
-            && "org.eclipse.tycho".equals(groupId)
-            && ("test".equals(goal) || "plugin-test".equals(goal) || "bnd-test".equals(goal));
-  }
-
-  public static boolean isJacocoInstrumentationExecution(MojoExecution mojoExecution) {
-    Plugin plugin = mojoExecution.getPlugin();
-    String artifactId = plugin.getArtifactId();
-    String groupId = plugin.getGroupId();
-    String goal = mojoExecution.getGoal();
-    return "jacoco-maven-plugin".equals(artifactId)
-        && "org.jacoco".equals(groupId)
-        && "prepare-agent".equals(goal);
-  }
-
-  public static String getXmlConfigurationValue(Xpp3Dom configuration, String... path) {
-    if (configuration == null) {
-      return null;
+        Xpp3Dom current = getChild(configuration, path, false);
+        return current != null ? current.getValue() : null;
     }
 
-    Xpp3Dom current = getChild(configuration, path, false);
-    return current != null ? current.getValue() : null;
-  }
+    public static Xpp3Dom setXmlConfigurationValue(String value, Xpp3Dom configuration, String... path) {
+        if (configuration == null) {
+            configuration = new Xpp3Dom("configuration");
+        }
 
-  public static Xpp3Dom setXmlConfigurationValue(
-      String value, Xpp3Dom configuration, String... path) {
-    if (configuration == null) {
-      configuration = new Xpp3Dom("configuration");
+        Xpp3Dom current = getChild(configuration, path, true);
+        current.setValue(value);
+
+        return configuration;
+    }
+
+    private static Xpp3Dom getChild(Xpp3Dom parent, String[] path, boolean createIfNeeded) {
+        Xpp3Dom current = parent;
+        for (String name : path) {
+            Xpp3Dom child = current.getChild(name);
+            if (child == null) {
+                if (createIfNeeded) {
+                    child = new Xpp3Dom(name);
+                    current.addChild(child);
+                } else {
+                    return null;
+                }
+            }
+            current = child;
+        }
+        return current;
     }
 
-    Xpp3Dom current = getChild(configuration, path, true);
-    current.setValue(value);
+    public static String getUniqueModuleName(MavenProject project, MojoExecution mojoExecution) {
+        return project.getName() + " " + mojoExecution.getArtifactId() + " " + mojoExecution.getExecutionId();
+    }
 
-    return configuration;
-  }
+    private static final MethodHandles METHOD_HANDLES = new MethodHandles(PlexusContainer.class.getClassLoader());
+    private static final MethodHandle SESSION_FIELD = METHOD_HANDLES.privateFieldGetter(MavenSession.class, "session");
+    private static final MethodHandle LOOKUP_FIELD =
+            METHOD_HANDLES.privateFieldGetter("org.apache.maven.internal.impl.AbstractSession", "lookup");
+    private static final MethodHandle ALTERNATIVE_LOOKUP_FIELD =
+            METHOD_HANDLES.privateFieldGetter("org.apache.maven.internal.impl.DefaultSession", "lookup");
+    private static final MethodHandle LOOKUP_METHOD =
+            METHOD_HANDLES.method("org.apache.maven.api.services.Lookup", "lookup", Class.class);
 
-  private static Xpp3Dom getChild(Xpp3Dom parent, String[] path, boolean createIfNeeded) {
-    Xpp3Dom current = parent;
-    for (String name : path) {
-      Xpp3Dom child = current.getChild(name);
-      if (child == null) {
-        if (createIfNeeded) {
-          child = new Xpp3Dom(name);
-          current.addChild(child);
+    public static PlexusContainer getContainer(MavenSession mavenSession) {
+        PlexusContainer container = mavenSession.getContainer();
+        if (container != null) {
+            return container;
+        }
+        Object /* org.apache.maven.internal.impl.DefaultSession */ session =
+                METHOD_HANDLES.invoke(SESSION_FIELD, mavenSession);
+        Object /* org.apache.maven.api.services.Lookup */ lookup;
+        if (LOOKUP_FIELD != null) {
+            lookup = METHOD_HANDLES.invoke(LOOKUP_FIELD, session);
         } else {
-          return null;
+            lookup = METHOD_HANDLES.invoke(ALTERNATIVE_LOOKUP_FIELD, session);
         }
-      }
-      current = child;
-    }
-    return current;
-  }
-
-  public static String getUniqueModuleName(MavenProject project, MojoExecution mojoExecution) {
-    return project.getName()
-        + " "
-        + mojoExecution.getArtifactId()
-        + " "
-        + mojoExecution.getExecutionId();
-  }
-
-  private static final MethodHandles METHOD_HANDLES =
-      new MethodHandles(PlexusContainer.class.getClassLoader());
-  private static final MethodHandle SESSION_FIELD =
-      METHOD_HANDLES.privateFieldGetter(MavenSession.class, "session");
-  private static final MethodHandle LOOKUP_FIELD =
-      METHOD_HANDLES.privateFieldGetter("org.apache.maven.internal.impl.AbstractSession", "lookup");
-  private static final MethodHandle ALTERNATIVE_LOOKUP_FIELD =
-      METHOD_HANDLES.privateFieldGetter("org.apache.maven.internal.impl.DefaultSession", "lookup");
-  private static final MethodHandle LOOKUP_METHOD =
-      METHOD_HANDLES.method("org.apache.maven.api.services.Lookup", "lookup", Class.class);
-
-  public static PlexusContainer getContainer(MavenSession mavenSession) {
-    PlexusContainer container = mavenSession.getContainer();
-    if (container != null) {
-      return container;
+        return METHOD_HANDLES.invoke(LOOKUP_METHOD, lookup, PlexusContainer.class);
     }
-    Object /* org.apache.maven.internal.impl.DefaultSession */ session =
-        METHOD_HANDLES.invoke(SESSION_FIELD, mavenSession);
-    Object /* org.apache.maven.api.services.Lookup */ lookup;
-    if (LOOKUP_FIELD != null) {
-      lookup = METHOD_HANDLES.invoke(LOOKUP_FIELD, session);
-    } else {
-      lookup = METHOD_HANDLES.invoke(ALTERNATIVE_LOOKUP_FIELD, session);
+
+    @Nullable
+    public static List<Path> getClasspath(MavenSession session, MojoExecution mojoExecution) {
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            return null;
+        }
+        try {
+            Mojo mojo = getConfiguredMojo(session, mojoExecution);
+            if (mojo == null) {
+                return null;
+            }
+
+            MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
+            PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
+            ClassRealm pluginRealm = pluginDescriptor.getClassRealm();
+            MethodHandles methodHandles = new MethodHandles(pluginRealm);
+
+            MethodHandle generateTestClasspathMethod =
+                    findMethod(methodHandles, mojo.getClass(), "generateTestClasspath", true);
+            if (generateTestClasspathMethod == null) {
+                LOGGER.debug(
+                        "Could not find generateTestClasspathMethod method in {} class",
+                        mojo.getClass().getName());
+                return null;
+            }
+
+            Object /* org.apache.maven.surefire.booter.Classpath */ classPath;
+
+            Object generatedClassPath = methodHandles.invoke(generateTestClasspathMethod, mojo);
+            if ("org.apache.maven.surefire.booter.Classpath"
+                    .equals(generatedClassPath.getClass().getName())) {
+                classPath = generatedClassPath;
+            } else {
+                /* org.apache.maven.plugin.surefire.TestClassPath */
+                MethodHandle toClasspathMethod =
+                        findMethod(methodHandles, generatedClassPath.getClass(), "toClasspath");
+                if (toClasspathMethod == null) {
+                    LOGGER.debug(
+                            "Could not find toClasspath method in {} class",
+                            generatedClassPath.getClass().getName());
+                    return null;
+                }
+                classPath = methodHandles.invoke(toClasspathMethod, generatedClassPath);
+            }
+
+            MethodHandle getClassPathMethod = findMethod(methodHandles, classPath.getClass(), "getClassPath");
+            if (getClassPathMethod == null) {
+                LOGGER.debug(
+                        "Could not find getClassPath method in {} class",
+                        classPath.getClass().getName());
+                return null;
+            }
+
+            List<String> classpath = methodHandles.invoke(getClassPathMethod, classPath);
+            return classpath.stream().map(Paths::get).collect(Collectors.toList());
+
+        } catch (Exception e) {
+            LOGGER.debug("Error while getting classpath for mojoExecution {}", mojoExecution, e);
+            return null;
+        }
     }
-    return METHOD_HANDLES.invoke(LOOKUP_METHOD, lookup, PlexusContainer.class);
-  }
 
-  @Nullable
-  public static List<Path> getClasspath(MavenSession session, MojoExecution mojoExecution) {
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      return null;
+    @Nullable
+    public static Path getForkedJvmPath(MavenSession session, MojoExecution mojoExecution) {
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            return null;
+        }
+        try {
+            Mojo mojo = getConfiguredMojo(session, mojoExecution);
+            String forkedJvm = getEffectiveJvm(mojoExecution, mojo);
+            if (forkedJvm == null) {
+                forkedJvm = getEffectiveJvmFallback(session, mojoExecution);
+            }
+            return forkedJvm != null ? Paths.get(forkedJvm) : null;
+
+        } catch (Exception e) {
+            LOGGER.debug("Error while getting effective JVM for mojoExecution {}", mojoExecution, e);
+            return null;
+        }
     }
-    try {
-      Mojo mojo = getConfiguredMojo(session, mojoExecution);
-      if (mojo == null) {
-        return null;
-      }
-
-      MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
-      PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
-      ClassRealm pluginRealm = pluginDescriptor.getClassRealm();
-      MethodHandles methodHandles = new MethodHandles(pluginRealm);
-
-      MethodHandle generateTestClasspathMethod =
-          findMethod(methodHandles, mojo.getClass(), "generateTestClasspath", true);
-      if (generateTestClasspathMethod == null) {
-        LOGGER.debug(
-            "Could not find generateTestClasspathMethod method in {} class",
-            mojo.getClass().getName());
-        return null;
-      }
-
-      Object /* org.apache.maven.surefire.booter.Classpath */ classPath;
-
-      Object generatedClassPath = methodHandles.invoke(generateTestClasspathMethod, mojo);
-      if ("org.apache.maven.surefire.booter.Classpath"
-          .equals(generatedClassPath.getClass().getName())) {
-        classPath = generatedClassPath;
-      } else {
-        /* org.apache.maven.plugin.surefire.TestClassPath */
-        MethodHandle toClasspathMethod =
-            findMethod(methodHandles, generatedClassPath.getClass(), "toClasspath");
-        if (toClasspathMethod == null) {
-          LOGGER.debug(
-              "Could not find toClasspath method in {} class",
-              generatedClassPath.getClass().getName());
-          return null;
-        }
-        classPath = methodHandles.invoke(toClasspathMethod, generatedClassPath);
-      }
-
-      MethodHandle getClassPathMethod =
-          findMethod(methodHandles, classPath.getClass(), "getClassPath");
-      if (getClassPathMethod == null) {
-        LOGGER.debug(
-            "Could not find getClassPath method in {} class", classPath.getClass().getName());
-        return null;
-      }
 
-      List<String> classpath = methodHandles.invoke(getClassPathMethod, classPath);
-      return classpath.stream().map(Paths::get).collect(Collectors.toList());
+    private static Mojo getConfiguredMojo(MavenSession session, MojoExecution mojoExecution)
+            throws ComponentLookupException, PluginResolutionException, PluginManagerException {
+        PlexusContainer container = getContainer(session);
 
-    } catch (Exception e) {
-      LOGGER.debug("Error while getting classpath for mojoExecution {}", mojoExecution, e);
-      return null;
-    }
-  }
+        BuildPluginManager buildPluginManager = container.lookup(BuildPluginManager.class);
+        MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
+        PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
+        // ensure plugin realm is loaded in container
+        buildPluginManager.getPluginRealm(session, pluginDescriptor);
 
-  @Nullable
-  public static Path getForkedJvmPath(MavenSession session, MojoExecution mojoExecution) {
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      return null;
-    }
-    try {
-      Mojo mojo = getConfiguredMojo(session, mojoExecution);
-      String forkedJvm = getEffectiveJvm(mojoExecution, mojo);
-      if (forkedJvm == null) {
-        forkedJvm = getEffectiveJvmFallback(session, mojoExecution);
-      }
-      return forkedJvm != null ? Paths.get(forkedJvm) : null;
-
-    } catch (Exception e) {
-      LOGGER.debug("Error while getting effective JVM for mojoExecution {}", mojoExecution, e);
-      return null;
-    }
-  }
-
-  private static Mojo getConfiguredMojo(MavenSession session, MojoExecution mojoExecution)
-      throws ComponentLookupException, PluginResolutionException, PluginManagerException {
-    PlexusContainer container = getContainer(session);
-
-    BuildPluginManager buildPluginManager = container.lookup(BuildPluginManager.class);
-    MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
-    PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
-    // ensure plugin realm is loaded in container
-    buildPluginManager.getPluginRealm(session, pluginDescriptor);
-
-    MavenPluginManager mavenPluginManager = container.lookup(MavenPluginManager.class);
-    try {
-      return mavenPluginManager.getConfiguredMojo(Mojo.class, session, mojoExecution);
-    } catch (Exception e) {
-      LOGGER.debug("Error while getting effective JVM for mojoExecution {}", mojoExecution, e);
-      return null;
+        MavenPluginManager mavenPluginManager = container.lookup(MavenPluginManager.class);
+        try {
+            return mavenPluginManager.getConfiguredMojo(Mojo.class, session, mojoExecution);
+        } catch (Exception e) {
+            LOGGER.debug("Error while getting effective JVM for mojoExecution {}", mojoExecution, e);
+            return null;
+        }
     }
-  }
 
-  private static String getEffectiveJvm(MojoExecution mojoExecution, Mojo mojo) {
-    if (mojo == null) {
-      return null;
-    }
+    private static String getEffectiveJvm(MojoExecution mojoExecution, Mojo mojo) {
+        if (mojo == null) {
+            return null;
+        }
 
-    MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
-    PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
-    ClassRealm pluginRealm = pluginDescriptor.getClassRealm();
-    MethodHandles methodHandles = new MethodHandles(pluginRealm);
+        MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
+        PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
+        ClassRealm pluginRealm = pluginDescriptor.getClassRealm();
+        MethodHandles methodHandles = new MethodHandles(pluginRealm);
 
-    MethodHandle getEffectiveJvmMethod =
-        findMethod(methodHandles, mojo.getClass(), "getEffectiveJvm");
-    if (getEffectiveJvmMethod == null) {
-      LOGGER.debug("Could not find getEffectiveJvm method in {} class", mojo.getClass().getName());
-      return null;
+        MethodHandle getEffectiveJvmMethod = findMethod(methodHandles, mojo.getClass(), "getEffectiveJvm");
+        if (getEffectiveJvmMethod == null) {
+            LOGGER.debug(
+                    "Could not find getEffectiveJvm method in {} class",
+                    mojo.getClass().getName());
+            return null;
+        }
+        try {
+            // result type differs based on Surefire plugin version
+            Object effectiveJvm = methodHandles.invoke(getEffectiveJvmMethod, mojo);
+
+            if (effectiveJvm instanceof String) {
+                return (String) effectiveJvm;
+            } else if (effectiveJvm instanceof File) {
+                return ((File) effectiveJvm).getAbsolutePath();
+            }
+
+            Class<?> effectiveJvmClass = effectiveJvm.getClass();
+            Method getJvmExecutableMethod = effectiveJvmClass.getMethod("getJvmExecutable");
+            Object jvmExecutable = getJvmExecutableMethod.invoke(effectiveJvm);
+
+            if (jvmExecutable instanceof String) {
+                return (String) jvmExecutable;
+            } else if (jvmExecutable instanceof File) {
+                return ((File) jvmExecutable).getAbsolutePath();
+            } else if (jvmExecutable == null) {
+                LOGGER.debug("Configured JVM executable is null");
+                return null;
+            } else {
+                LOGGER.debug(
+                        "Unexpected JVM executable type {}, returning null",
+                        jvmExecutable.getClass().getName());
+                return null;
+            }
+
+        } catch (Exception e) {
+            LOGGER.debug("Error while getting effective JVM for mojo {}", mojo, e);
+            return null;
+        }
     }
-    try {
-      // result type differs based on Surefire plugin version
-      Object effectiveJvm = methodHandles.invoke(getEffectiveJvmMethod, mojo);
-
-      if (effectiveJvm instanceof String) {
-        return (String) effectiveJvm;
-      } else if (effectiveJvm instanceof File) {
-        return ((File) effectiveJvm).getAbsolutePath();
-      }
-
-      Class<?> effectiveJvmClass = effectiveJvm.getClass();
-      Method getJvmExecutableMethod = effectiveJvmClass.getMethod("getJvmExecutable");
-      Object jvmExecutable = getJvmExecutableMethod.invoke(effectiveJvm);
-
-      if (jvmExecutable instanceof String) {
-        return (String) jvmExecutable;
-      } else if (jvmExecutable instanceof File) {
-        return ((File) jvmExecutable).getAbsolutePath();
-      } else if (jvmExecutable == null) {
-        LOGGER.debug("Configured JVM executable is null");
-        return null;
-      } else {
-        LOGGER.debug(
-            "Unexpected JVM executable type {}, returning null",
-            jvmExecutable.getClass().getName());
-        return null;
-      }
 
-    } catch (Exception e) {
-      LOGGER.debug("Error while getting effective JVM for mojo {}", mojo, e);
-      return null;
+    private static MethodHandle findMethod(MethodHandles methodHandles, Class<?> mojoClass, String methodName) {
+        return findMethod(methodHandles, mojoClass, methodName, false);
     }
-  }
-
-  private static MethodHandle findMethod(
-      MethodHandles methodHandles, Class<?> mojoClass, String methodName) {
-    return findMethod(methodHandles, mojoClass, methodName, false);
-  }
-
-  private static MethodHandle findMethod(
-      MethodHandles methodHandles, Class<?> mojoClass, String methodName, boolean acceptVarargs) {
-    for (Class<?> clazz = mojoClass; clazz != null; clazz = clazz.getSuperclass()) {
-      MethodHandle handle = methodHandles.method(clazz, methodName);
-      if (handle != null) {
-        return handle;
-      }
-    }
-    if (!acceptVarargs) {
-      return null;
+
+    private static MethodHandle findMethod(
+            MethodHandles methodHandles, Class<?> mojoClass, String methodName, boolean acceptVarargs) {
+        for (Class<?> clazz = mojoClass; clazz != null; clazz = clazz.getSuperclass()) {
+            MethodHandle handle = methodHandles.method(clazz, methodName);
+            if (handle != null) {
+                return handle;
+            }
+        }
+        if (!acceptVarargs) {
+            return null;
+        }
+        // fallback to a varargs method of the same name, which can also be invoked without arguments:
+        // our MethodHandles#invoke delegates to MethodHandle#invokeWithArguments, which collects the
+        // missing trailing varargs into an empty array. Necessary for:
+        // - AbstractSurefireMojo#generateTestClasspath() in >= 3.6.0-M1: added "ArtifactFilter..."
+        // param
+        for (Class<?> clazz = mojoClass; clazz != null; clazz = clazz.getSuperclass()) {
+            MethodHandle handle = methodHandles.method(clazz, m -> m.getName().equals(methodName) && m.isVarArgs());
+            if (handle != null) {
+                return handle;
+            }
+        }
+        return null;
     }
-    // fallback to a varargs method of the same name, which can also be invoked without arguments:
-    // our MethodHandles#invoke delegates to MethodHandle#invokeWithArguments, which collects the
-    // missing trailing varargs into an empty array. Necessary for:
-    // - AbstractSurefireMojo#generateTestClasspath() in >= 3.6.0-M1: added "ArtifactFilter..."
-    // param
-    for (Class<?> clazz = mojoClass; clazz != null; clazz = clazz.getSuperclass()) {
-      MethodHandle handle =
-          methodHandles.method(clazz, m -> m.getName().equals(methodName) && m.isVarArgs());
-      if (handle != null) {
-        return handle;
-      }
+
+    /** Fallback method that attempts to recreate the logic used by Maven Surefire plugin */
+    static String getEffectiveJvmFallback(MavenSession session, MojoExecution mojoExecution) {
+        try {
+            String jvm = getConfigurationValue(session, mojoExecution, "jvm");
+            if (Strings.isNotBlank(jvm)) {
+                return jvm;
+            }
+
+            PlexusConfiguration configuration = getConfiguration(mojoExecution);
+            PlexusConfiguration jdkToolchain = configuration.getChild("jdkToolchain");
+            if (jdkToolchain != null) {
+                ExpressionEvaluator expressionEvaluator =
+                        new PluginParameterExpressionEvaluator(session, mojoExecution);
+                Map<String, String> toolchainConfig = new HashMap<>();
+                for (PlexusConfiguration child : jdkToolchain.getChildren()) {
+                    Object value = expressionEvaluator.evaluate(child.getValue());
+                    if (value != null && Strings.isNotBlank(String.valueOf(value))) {
+                        toolchainConfig.put(child.getName(), String.valueOf(value));
+                    }
+                }
+
+                if (!toolchainConfig.isEmpty()) {
+                    PlexusContainer container = MavenUtils.getContainer(session);
+                    ToolchainManager toolchainManager = container.lookup(ToolchainManager.class);
+
+                    MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
+                    PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
+                    ClassRealm pluginRealm = pluginDescriptor.getClassRealm();
+                    MethodHandles methodHandles = new MethodHandles(pluginRealm);
+                    MethodHandle getToolchains = methodHandles.method(
+                            ToolchainManager.class, "getToolchains", MavenSession.class, String.class, Map.class);
+                    List<Toolchain> toolchains =
+                            methodHandles.invoke(getToolchains, toolchainManager, session, "jdk", toolchainConfig);
+                    if (toolchains.isEmpty()) {
+                        LOGGER.debug("Could not find toolchains for {}", toolchainConfig);
+                        return null;
+                    }
+
+                    Toolchain toolchain = toolchains.iterator().next();
+                    return toolchain.findTool("java");
+                }
+            }
+            return null;
+
+        } catch (Exception e) {
+            LOGGER.debug("Error while getting effective JVM for mojo {}", mojoExecution, e);
+            return null;
+        }
     }
-    return null;
-  }
-
-  /** Fallback method that attempts to recreate the logic used by Maven Surefire plugin */
-  static String getEffectiveJvmFallback(MavenSession session, MojoExecution mojoExecution) {
-    try {
-      String jvm = getConfigurationValue(session, mojoExecution, "jvm");
-      if (Strings.isNotBlank(jvm)) {
-        return jvm;
-      }
-
-      PlexusConfiguration configuration = getConfiguration(mojoExecution);
-      PlexusConfiguration jdkToolchain = configuration.getChild("jdkToolchain");
-      if (jdkToolchain != null) {
-        ExpressionEvaluator expressionEvaluator =
-            new PluginParameterExpressionEvaluator(session, mojoExecution);
-        Map<String, String> toolchainConfig = new HashMap<>();
-        for (PlexusConfiguration child : jdkToolchain.getChildren()) {
-          Object value = expressionEvaluator.evaluate(child.getValue());
-          if (value != null && Strings.isNotBlank(String.valueOf(value))) {
-            toolchainConfig.put(child.getName(), String.valueOf(value));
-          }
-        }
-
-        if (!toolchainConfig.isEmpty()) {
-          PlexusContainer container = MavenUtils.getContainer(session);
-          ToolchainManager toolchainManager = container.lookup(ToolchainManager.class);
-
-          MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
-          PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
-          ClassRealm pluginRealm = pluginDescriptor.getClassRealm();
-          MethodHandles methodHandles = new MethodHandles(pluginRealm);
-          MethodHandle getToolchains =
-              methodHandles.method(
-                  ToolchainManager.class,
-                  "getToolchains",
-                  MavenSession.class,
-                  String.class,
-                  Map.class);
-          List<Toolchain> toolchains =
-              methodHandles.invoke(
-                  getToolchains, toolchainManager, session, "jdk", toolchainConfig);
-          if (toolchains.isEmpty()) {
-            LOGGER.debug("Could not find toolchains for {}", toolchainConfig);
+
+    @SuppressForbidden // splitting by " " does not involve regexes
+    public static JavaAgent getJacocoAgent(MavenSession session, MavenProject project, MojoExecution mojoExecution) {
+        String resolvedArgLineValue = getArgLine(session, project, mojoExecution);
+        if (resolvedArgLineValue == null) {
             return null;
-          }
+        }
 
-          Toolchain toolchain = toolchains.iterator().next();
-          return toolchain.findTool("java");
+        String[] args = resolvedArgLineValue.split(" ");
+        for (String arg : args) {
+            if (arg.startsWith(JAVAAGENT_PREFIX)) {
+                int agentArgsBegin = arg.indexOf('=');
+                if (agentArgsBegin < 0) {
+                    return new JavaAgent(arg.substring(JAVAAGENT_PREFIX.length()), null);
+                } else {
+                    String path = arg.substring(JAVAAGENT_PREFIX.length(), agentArgsBegin);
+                    if (path.contains("jacoco")) {
+                        String agentArgs = arg.substring(agentArgsBegin + 1);
+                        return new JavaAgent(path, agentArgs);
+                    }
+                }
+            }
         }
-      }
-      return null;
+        return null;
+    }
 
-    } catch (Exception e) {
-      LOGGER.debug("Error while getting effective JVM for mojo {}", mojoExecution, e);
-      return null;
+    @Nullable
+    public static String getArgLine(MavenSession session, MavenProject project, MojoExecution mojoExecution) {
+        try {
+            String resolvedArgLineValue = getConfigurationValue(session, mojoExecution, "argLine");
+            if (resolvedArgLineValue == null) {
+                return null;
+            }
+
+            // The @{propName} syntax is specific to Surefire/Failsafe plugins
+            // so standard expression evaluators won't handle the resolution.
+            Properties projectProperties = project.getModel().getProperties();
+            for (String key : projectProperties.stringPropertyNames()) {
+                String field = "@{" + key + "}";
+                if (resolvedArgLineValue.contains(field)) {
+                    resolvedArgLineValue = resolvedArgLineValue.replace(field, projectProperties.getProperty(key, ""));
+                }
+            }
+            return resolvedArgLineValue;
+
+        } catch (Exception e) {
+            LOGGER.warn("Error while trying to resolve arg line for mojo {}", mojoExecution, e);
+            return null;
+        }
     }
-  }
-
-  @SuppressForbidden // splitting by " " does not involve regexes
-  public static JavaAgent getJacocoAgent(
-      MavenSession session, MavenProject project, MojoExecution mojoExecution) {
-    String resolvedArgLineValue = getArgLine(session, project, mojoExecution);
-    if (resolvedArgLineValue == null) {
-      return null;
+
+    @Nullable
+    public static String getConfigurationValue(MavenSession session, MojoExecution mojoExecution, String propertyName) {
+        try {
+            PlexusConfiguration pomConfiguration = MavenUtils.getConfiguration(mojoExecution);
+            PlexusConfiguration property = pomConfiguration.getChild(propertyName);
+            if (property == null) {
+                return null;
+            }
+
+            String propertyValue = property.getValue();
+            TypeAwareExpressionEvaluator expressionEvaluator =
+                    new PluginParameterExpressionEvaluator(session, mojoExecution);
+            return (String) expressionEvaluator.evaluate(propertyValue, String.class);
+
+        } catch (ExpressionEvaluationException e) {
+            LOGGER.warn("Error while trying to resolve {} config property for mojo {}", propertyName, mojoExecution, e);
+            return null;
+        }
     }
 
-    String[] args = resolvedArgLineValue.split(" ");
-    for (String arg : args) {
-      if (arg.startsWith(JAVAAGENT_PREFIX)) {
-        int agentArgsBegin = arg.indexOf('=');
-        if (agentArgsBegin < 0) {
-          return new JavaAgent(arg.substring(JAVAAGENT_PREFIX.length()), null);
+    private static PlexusConfiguration getConfiguration(MojoExecution mojoExecution) {
+        Xpp3Dom configuration = mojoExecution.getConfiguration();
+        if (configuration == null) {
+            return new XmlPlexusConfiguration("configuration");
         } else {
-          String path = arg.substring(JAVAAGENT_PREFIX.length(), agentArgsBegin);
-          if (path.contains("jacoco")) {
-            String agentArgs = arg.substring(agentArgsBegin + 1);
-            return new JavaAgent(path, agentArgs);
-          }
+            return new XmlPlexusConfiguration(configuration);
         }
-      }
-    }
-    return null;
-  }
-
-  @Nullable
-  public static String getArgLine(
-      MavenSession session, MavenProject project, MojoExecution mojoExecution) {
-    try {
-      String resolvedArgLineValue = getConfigurationValue(session, mojoExecution, "argLine");
-      if (resolvedArgLineValue == null) {
-        return null;
-      }
-
-      // The @{propName} syntax is specific to Surefire/Failsafe plugins
-      // so standard expression evaluators won't handle the resolution.
-      Properties projectProperties = project.getModel().getProperties();
-      for (String key : projectProperties.stringPropertyNames()) {
-        String field = "@{" + key + "}";
-        if (resolvedArgLineValue.contains(field)) {
-          resolvedArgLineValue =
-              resolvedArgLineValue.replace(field, projectProperties.getProperty(key, ""));
-        }
-      }
-      return resolvedArgLineValue;
-
-    } catch (Exception e) {
-      LOGGER.warn("Error while trying to resolve arg line for mojo {}", mojoExecution, e);
-      return null;
-    }
-  }
-
-  @Nullable
-  public static String getConfigurationValue(
-      MavenSession session, MojoExecution mojoExecution, String propertyName) {
-    try {
-      PlexusConfiguration pomConfiguration = MavenUtils.getConfiguration(mojoExecution);
-      PlexusConfiguration property = pomConfiguration.getChild(propertyName);
-      if (property == null) {
-        return null;
-      }
-
-      String propertyValue = property.getValue();
-      TypeAwareExpressionEvaluator expressionEvaluator =
-          new PluginParameterExpressionEvaluator(session, mojoExecution);
-      return (String) expressionEvaluator.evaluate(propertyValue, String.class);
-
-    } catch (ExpressionEvaluationException e) {
-      LOGGER.warn(
-          "Error while trying to resolve {} config property for mojo {}",
-          propertyName,
-          mojoExecution,
-          e);
-      return null;
-    }
-  }
-
-  private static PlexusConfiguration getConfiguration(MojoExecution mojoExecution) {
-    Xpp3Dom configuration = mojoExecution.getConfiguration();
-    if (configuration == null) {
-      return new XmlPlexusConfiguration("configuration");
-    } else {
-      return new XmlPlexusConfiguration(configuration);
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/AbstractMavenTest.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/AbstractMavenTest.java
index 5c61e3ea06f..b28c6fde998 100644
--- a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/AbstractMavenTest.java
+++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/AbstractMavenTest.java
@@ -19,90 +19,88 @@
 import org.junit.jupiter.api.io.TempDir;
 
 public abstract class AbstractMavenTest {
-  @TempDir static Path WORKING_DIRECTORY;
+    @TempDir
+    static Path WORKING_DIRECTORY;
 
-  protected AbstractMavenTest() {
-    System.setProperty(
-        "maven.multiModuleProjectDirectory", WORKING_DIRECTORY.toAbsolutePath().toString());
-  }
+    protected AbstractMavenTest() {
+        System.setProperty(
+                "maven.multiModuleProjectDirectory",
+                WORKING_DIRECTORY.toAbsolutePath().toString());
+    }
 
-  protected void executeMaven(
-      Function<ExecutionEvent, Boolean> mojoStartedHandler,
-      String pomPath,
-      String goal,
-      String... additionalArgs)
-      throws Exception {
-    executeMaven(mojoStartedHandler, pomPath, goal, null, null, additionalArgs);
-  }
+    protected void executeMaven(
+            Function<ExecutionEvent, Boolean> mojoStartedHandler, String pomPath, String goal, String... additionalArgs)
+            throws Exception {
+        executeMaven(mojoStartedHandler, pomPath, goal, null, null, additionalArgs);
+    }
 
-  protected void executeMaven(
-      Function<ExecutionEvent, Boolean> mojoStartedHandler,
-      String pomPath,
-      String goal,
-      PrintStream stdOut,
-      PrintStream stderr,
-      String... additionalArgs)
-      throws Exception {
-    MojoStartedSpy spy = new MojoStartedSpy(mojoStartedHandler);
-    MavenCli mavenCli =
-        new MavenCli() {
-          @Override
-          protected void customizeContainer(PlexusContainer container) {
-            container.addComponent(spy, EventSpy.class, null);
-          }
+    protected void executeMaven(
+            Function<ExecutionEvent, Boolean> mojoStartedHandler,
+            String pomPath,
+            String goal,
+            PrintStream stdOut,
+            PrintStream stderr,
+            String... additionalArgs)
+            throws Exception {
+        MojoStartedSpy spy = new MojoStartedSpy(mojoStartedHandler);
+        MavenCli mavenCli = new MavenCli() {
+            @Override
+            protected void customizeContainer(PlexusContainer container) {
+                container.addComponent(spy, EventSpy.class, null);
+            }
         };
 
-    File pomFile = new File(AbstractMavenTest.class.getResource(pomPath).toURI());
+        File pomFile = new File(AbstractMavenTest.class.getResource(pomPath).toURI());
 
-    List<String> arguments = new ArrayList<>();
-    addAll(arguments, "-f", pomFile.getAbsolutePath(), goal);
-    // Cap Aether's HTTP read timeout so a stalled Maven Central fetch fails fast.
-    // Default is 30 min, which exceeds the 20-min Gradle test task timeout and turns
-    // a network stall into an opaque "Timeout has been exceeded" task abort.
-    arguments.add("-Daether.connector.requestTimeout=60000");
-    if (System.getenv("MAVEN_REPOSITORY_PROXY") != null) {
-      File settingsFile =
-          new File(AbstractMavenTest.class.getResource("/settings.mirror.xml").toURI());
-      addAll(arguments, "-s", settingsFile.getAbsolutePath());
-    }
-    addAll(arguments, additionalArgs);
+        List<String> arguments = new ArrayList<>();
+        addAll(arguments, "-f", pomFile.getAbsolutePath(), goal);
+        // Cap Aether's HTTP read timeout so a stalled Maven Central fetch fails fast.
+        // Default is 30 min, which exceeds the 20-min Gradle test task timeout and turns
+        // a network stall into an opaque "Timeout has been exceeded" task abort.
+        arguments.add("-Daether.connector.requestTimeout=60000");
+        if (System.getenv("MAVEN_REPOSITORY_PROXY") != null) {
+            File settingsFile = new File(
+                    AbstractMavenTest.class.getResource("/settings.mirror.xml").toURI());
+            addAll(arguments, "-s", settingsFile.getAbsolutePath());
+        }
+        addAll(arguments, additionalArgs);
 
-    mavenCli.doMain(
-        arguments.toArray(new String[0]),
-        WORKING_DIRECTORY.toAbsolutePath().toString(),
-        stdOut,
-        stderr);
+        mavenCli.doMain(
+                arguments.toArray(new String[0]),
+                WORKING_DIRECTORY.toAbsolutePath().toString(),
+                stdOut,
+                stderr);
 
-    Exception error = spy.handlerError.get();
-    if (error != null) {
-      throw error;
+        Exception error = spy.handlerError.get();
+        if (error != null) {
+            throw error;
+        }
+        assertTrue(spy.handlerRan.get());
     }
-    assertTrue(spy.handlerRan.get());
-  }
 
-  private static final class MojoStartedSpy extends AbstractEventSpy {
-    private final Function<ExecutionEvent, Boolean> mojoStartedHandler;
-    private final AtomicBoolean handlerRan = new AtomicBoolean(false);
-    private final AtomicReference<Exception> handlerError = new AtomicReference<>(null);
+    private static final class MojoStartedSpy extends AbstractEventSpy {
+        private final Function<ExecutionEvent, Boolean> mojoStartedHandler;
+        private final AtomicBoolean handlerRan = new AtomicBoolean(false);
+        private final AtomicReference<Exception> handlerError = new AtomicReference<>(null);
 
-    private MojoStartedSpy(Function<ExecutionEvent, Boolean> mojoStartedHandler) {
-      this.mojoStartedHandler = mojoStartedHandler;
-    }
+        private MojoStartedSpy(Function<ExecutionEvent, Boolean> mojoStartedHandler) {
+            this.mojoStartedHandler = mojoStartedHandler;
+        }
 
-    @Override
-    public void onEvent(Object o) {
-      if (!(o instanceof ExecutionEvent)) {
-        return;
-      }
-      ExecutionEvent executionEvent = (ExecutionEvent) o;
-      if (executionEvent.getType() != ExecutionEvent.Type.MojoStarted) {
-        return;
-      }
-      try {
-        handlerRan.compareAndSet(false, mojoStartedHandler.apply(executionEvent));
-      } catch (Exception error) {
-        handlerError.compareAndSet(null, error);
-      }
+        @Override
+        public void onEvent(Object o) {
+            if (!(o instanceof ExecutionEvent)) {
+                return;
+            }
+            ExecutionEvent executionEvent = (ExecutionEvent) o;
+            if (executionEvent.getType() != ExecutionEvent.Type.MojoStarted) {
+                return;
+            }
+            try {
+                handlerRan.compareAndSet(false, mojoStartedHandler.apply(executionEvent));
+            } catch (Exception error) {
+                handlerError.compareAndSet(null, error);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenProjectConfiguratorTest.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenProjectConfiguratorTest.java
index 231ea0f2726..2cc63f9ff87 100644
--- a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenProjectConfiguratorTest.java
+++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenProjectConfiguratorTest.java
@@ -26,83 +26,78 @@
 
 public class MavenProjectConfiguratorTest extends AbstractMavenTest {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(MavenProjectConfiguratorTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(MavenProjectConfiguratorTest.class);
 
-  public static Stream<Arguments> surefireVersions() {
-    return Stream.of(
-        Arguments.of(
-            "sampleProject/pom.xml", "test", new String[] {"-X", "-DargLine=-DmyArgLineProp=true"}),
-        Arguments.of(
-            "sampleProject/pom.xml",
-            "surefire:test",
-            new String[] {"-X", "-DargLine=-DmyArgLineProp=true"}),
-        Arguments.of("sampleProjectArgLine/pom.xml", "test", new String[] {"-X"}),
-        Arguments.of("sampleProjectArgLine/pom.xml", "surefire:test", new String[] {"-X"}),
-        Arguments.of("sampleProjectSurefireArgLine/pom.xml", "test", new String[] {"-X"}),
-        Arguments.of("sampleProjectSurefireArgLine/pom.xml", "surefire:test", new String[] {"-X"}),
-        Arguments.of(
-            "sampleProjectSurefireLateProcessingArgLine/pom.xml", "test", new String[] {"-X"}));
-  }
+    public static Stream<Arguments> surefireVersions() {
+        return Stream.of(
+                Arguments.of("sampleProject/pom.xml", "test", new String[] {"-X", "-DargLine=-DmyArgLineProp=true"}),
+                Arguments.of(
+                        "sampleProject/pom.xml", "surefire:test", new String[] {"-X", "-DargLine=-DmyArgLineProp=true"
+                        }),
+                Arguments.of("sampleProjectArgLine/pom.xml", "test", new String[] {"-X"}),
+                Arguments.of("sampleProjectArgLine/pom.xml", "surefire:test", new String[] {"-X"}),
+                Arguments.of("sampleProjectSurefireArgLine/pom.xml", "test", new String[] {"-X"}),
+                Arguments.of("sampleProjectSurefireArgLine/pom.xml", "surefire:test", new String[] {"-X"}),
+                Arguments.of("sampleProjectSurefireLateProcessingArgLine/pom.xml", "test", new String[] {"-X"}));
+    }
 
-  @ParameterizedTest
-  @MethodSource("surefireVersions")
-  public void testTracerInjection(String pomPath, String goal, String[] additionalCmdLineArgs)
-      throws Exception {
-    ByteArrayOutputStream stdOutBaos = new ByteArrayOutputStream();
-    PrintStream buildOutput = new PrintStream(stdOutBaos);
+    @ParameterizedTest
+    @MethodSource("surefireVersions")
+    public void testTracerInjection(String pomPath, String goal, String[] additionalCmdLineArgs) throws Exception {
+        ByteArrayOutputStream stdOutBaos = new ByteArrayOutputStream();
+        PrintStream buildOutput = new PrintStream(stdOutBaos);
 
-    ByteArrayOutputStream stdErrBaos = new ByteArrayOutputStream();
-    PrintStream buildError = new PrintStream(stdErrBaos);
+        ByteArrayOutputStream stdErrBaos = new ByteArrayOutputStream();
+        PrintStream buildError = new PrintStream(stdErrBaos);
 
-    try {
-      executeMaven(
-          this::injectTracer, pomPath, goal, buildOutput, buildError, additionalCmdLineArgs);
+        try {
+            executeMaven(this::injectTracer, pomPath, goal, buildOutput, buildError, additionalCmdLineArgs);
 
-      boolean javaAgentInjected = false;
-      boolean argLinePreserved = false;
+            boolean javaAgentInjected = false;
+            boolean argLinePreserved = false;
 
-      byte[] buildOutputBytes = stdOutBaos.toByteArray();
-      BufferedReader buildOutputReader =
-          new BufferedReader(new InputStreamReader(new ByteArrayInputStream(buildOutputBytes)));
-      String buildOutputLine;
-      while ((buildOutputLine = buildOutputReader.readLine()) != null) {
-        javaAgentInjected |= buildOutputLine.contains("TEST JAVA AGENT STARTED");
-        argLinePreserved |=
-            buildOutputLine.contains("surefire")
-                && buildOutputLine.contains("Forking command line")
-                && buildOutputLine.contains("-DmyArgLineProp=true");
-      }
+            byte[] buildOutputBytes = stdOutBaos.toByteArray();
+            BufferedReader buildOutputReader =
+                    new BufferedReader(new InputStreamReader(new ByteArrayInputStream(buildOutputBytes)));
+            String buildOutputLine;
+            while ((buildOutputLine = buildOutputReader.readLine()) != null) {
+                javaAgentInjected |= buildOutputLine.contains("TEST JAVA AGENT STARTED");
+                argLinePreserved |= buildOutputLine.contains("surefire")
+                        && buildOutputLine.contains("Forking command line")
+                        && buildOutputLine.contains("-DmyArgLineProp=true");
+            }
 
-      assertTrue(javaAgentInjected, "Tracer wasn't injected");
-      assertTrue(argLinePreserved, "Original argLine was not preserved");
+            assertTrue(javaAgentInjected, "Tracer wasn't injected");
+            assertTrue(argLinePreserved, "Original argLine was not preserved");
 
-    } catch (Exception | Error e) {
-      LOGGER.info("Build output:\n\n{}", stdOutBaos);
-      LOGGER.info("Build error:\n\n{}", stdErrBaos);
-      throw e;
+        } catch (Exception | Error e) {
+            LOGGER.info("Build output:\n\n{}", stdOutBaos);
+            LOGGER.info("Build error:\n\n{}", stdErrBaos);
+            throw e;
+        }
     }
-  }
 
-  private boolean injectTracer(ExecutionEvent executionEvent) {
-    MojoExecution mojoExecution = executionEvent.getMojoExecution();
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      return false;
-    }
-    MavenSession session = executionEvent.getSession();
-    MavenProject project = executionEvent.getProject();
+    private boolean injectTracer(ExecutionEvent executionEvent) {
+        MojoExecution mojoExecution = executionEvent.getMojoExecution();
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            return false;
+        }
+        MavenSession session = executionEvent.getSession();
+        MavenProject project = executionEvent.getProject();
 
-    try {
-      Config config = mock(Config.class);
-      when(config.isCiVisibilityAutoConfigurationEnabled()).thenReturn(true);
-      when(config.getCiVisibilityDebugPort()).thenReturn(null);
-      when(config.getCiVisibilityAgentJarFile())
-          .thenReturn(new File(MavenUtilsTest.class.getResource("simple-agent.jar").toURI()));
-      MavenProjectConfigurator.INSTANCE.configureTracer(
-          session, project, mojoExecution, Collections.emptyMap(), config);
-      return true;
+        try {
+            Config config = mock(Config.class);
+            when(config.isCiVisibilityAutoConfigurationEnabled()).thenReturn(true);
+            when(config.getCiVisibilityDebugPort()).thenReturn(null);
+            when(config.getCiVisibilityAgentJarFile())
+                    .thenReturn(new File(
+                            MavenUtilsTest.class.getResource("simple-agent.jar").toURI()));
+            MavenProjectConfigurator.INSTANCE.configureTracer(
+                    session, project, mojoExecution, Collections.emptyMap(), config);
+            return true;
 
-    } catch (URISyntaxException e) {
-      throw new RuntimeException(e);
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenUtilsTest.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenUtilsTest.java
index 6d7fad46e8a..a2b8c7e63e0 100644
--- a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenUtilsTest.java
+++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenUtilsTest.java
@@ -38,465 +38,429 @@
 
 public class MavenUtilsTest extends AbstractMavenTest {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(MavenUtilsTest.class);
-
-  private static final Configuration FREEMARKER = new Configuration(Configuration.VERSION_2_3_30);
-
-  static {
-    FREEMARKER.setClassForTemplateLoading(MavenUtilsTest.class, "");
-    FREEMARKER.setDefaultEncoding("UTF-8");
-    FREEMARKER.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
-    FREEMARKER.setLogTemplateExceptions(true);
-    FREEMARKER.setWrapUncheckedExceptions(true);
-  }
-
-  private static final ComparableVersion SUREFIRE_3_0_0 = new ComparableVersion("3.0.0");
-  private static final ComparableVersion SUREFIRE_3_2_0 = new ComparableVersion("3.2.0");
-  private static final ComparableVersion MAVEN_3_3_1 = new ComparableVersion("3.3.1");
-
-  public static Stream<Arguments> surefireVersions() {
-    return Stream.of(
-        Arguments.of(new ComparableVersion("2.17"), new ComparableVersion("3.0.0")),
-        Arguments.of(new ComparableVersion("2.21.0"), new ComparableVersion("3.0.0")),
-        Arguments.of(new ComparableVersion("3.0.0"), new ComparableVersion("3.0.0")),
-        Arguments.of(new ComparableVersion("3.5.0"), new ComparableVersion("3.6.3")),
-        Arguments.of(
-            new ComparableVersion(getLatestMavenSurefireVersion()),
-            new ComparableVersion("3.6.3")));
-  }
-
-  private ComparableVersion getCurrentMavenVersion() {
-    return new ComparableVersion(MavenSession.class.getPackage().getImplementationVersion());
-  }
-
-  @ParameterizedTest
-  @MethodSource("surefireVersions")
-  public void testGetMojoConfigValueReturnsNullIfValueNotSet(
-      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
-      throws Exception {
-    assumeTrue(
-        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
-        "Newer maven version required to run chosen version of Surefire plugin");
-    executeMaven(
-        this::assertGetMojoConfigValueReturnsNullIfValueNotSet,
-        "samplePom.xml",
-        String.format(
-            "org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
-  }
-
-  private boolean assertGetMojoConfigValueReturnsNullIfValueNotSet(ExecutionEvent executionEvent) {
-    MojoExecution mojoExecution = executionEvent.getMojoExecution();
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      return false;
-    }
-    MavenSession session = executionEvent.getSession();
-    String forkCount = MavenUtils.getConfigurationValue(session, mojoExecution, "forkCount");
-    assertNull(forkCount);
-    return true;
-  }
-
-  @ParameterizedTest
-  @MethodSource("surefireVersions")
-  public void testGetMojoConfigValueReturnsConfiguredValue(
-      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
-      throws Exception {
-    assumeTrue(
-        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
-        "Newer maven version required to run chosen version of Surefire plugin");
-    executeMaven(
-        this::assertGetMojoConfigValueReturnsConfiguredValue,
-        "samplePom.xml",
-        String.format(
-            "org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
-  }
-
-  private boolean assertGetMojoConfigValueReturnsConfiguredValue(ExecutionEvent executionEvent) {
-    MojoExecution mojoExecution = executionEvent.getMojoExecution();
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      return false;
-    }
-    MavenSession session = executionEvent.getSession();
-    String threadCount = MavenUtils.getConfigurationValue(session, mojoExecution, "threadCount");
-    assertEquals("112", threadCount);
-    return true;
-  }
-
-  @ParameterizedTest
-  @MethodSource("surefireVersions")
-  public void testGetMojoConfigValueResolvesPropertyPlaceholders(
-      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
-      throws Exception {
-    assumeTrue(
-        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
-        "Newer maven version required to run chosen version of Surefire plugin");
-    executeMaven(
-        this::assertGetMojoConfigValueResolvesPropertyPlaceholders,
-        "samplePom.xml",
-        String.format(
-            "org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
-  }
-
-  private boolean assertGetMojoConfigValueResolvesPropertyPlaceholders(
-      ExecutionEvent executionEvent) {
-    MojoExecution mojoExecution = executionEvent.getMojoExecution();
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      return false;
-    }
-    MavenSession session = executionEvent.getSession();
-    String forkedProcessExitTimeoutInSeconds =
-        MavenUtils.getConfigurationValue(session, mojoExecution, "forkedProcessTimeoutInSeconds");
-    assertEquals("887", forkedProcessExitTimeoutInSeconds);
-    return true;
-  }
-
-  @ParameterizedTest
-  @MethodSource("surefireVersions")
-  public void testGetMojoConfigValueResolvesPropertiesSuppliedViaCmdLine(
-      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
-      throws Exception {
-    assumeTrue(
-        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
-        "Newer maven version required to run chosen version of Surefire plugin");
-    executeMaven(
-        this::assertGetMojoConfigValueResolvesPropertiesSuppliedViaCmdLine,
-        "samplePom.xml",
-        String.format(
-            "org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion),
-        "-Dsurefire.parallel.timeout=112233");
-  }
-
-  private boolean assertGetMojoConfigValueResolvesPropertiesSuppliedViaCmdLine(
-      ExecutionEvent executionEvent) {
-    MojoExecution mojoExecution = executionEvent.getMojoExecution();
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      return false;
-    }
-    MavenSession session = executionEvent.getSession();
-    String parallelTestsTimeoutInSeconds =
-        MavenUtils.getConfigurationValue(session, mojoExecution, "parallelTestsTimeoutInSeconds");
-    assertEquals("112233", parallelTestsTimeoutInSeconds);
-    return true;
-  }
-
-  @ParameterizedTest
-  @MethodSource("surefireVersions")
-  public void testGetArgLineResolvesLatePropertyPlaceholders(
-      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
-      throws Exception {
-    assumeTrue(
-        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
-        "Newer maven version required to run chosen version of Surefire plugin");
-    executeMaven(
-        this::assertGetArgLineResolvesLatePropertyPlaceholders,
-        "samplePom.xml",
-        String.format(
-            "org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
-  }
-
-  private boolean assertGetArgLineResolvesLatePropertyPlaceholders(ExecutionEvent executionEvent) {
-    MojoExecution mojoExecution = executionEvent.getMojoExecution();
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      return false;
-    }
-    MavenSession session = executionEvent.getSession();
-    MavenProject project = executionEvent.getProject();
-    String argLine = MavenUtils.getArgLine(session, project, mojoExecution);
-    assertEquals("-Xms128m -Xmx2g", argLine);
-    return true;
-  }
-
-  @ParameterizedTest
-  @MethodSource("surefireVersions")
-  public void testGetJacocoAgent(
-      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
-      throws Exception {
-    assumeTrue(
-        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
-        "Newer maven version required to run chosen version of Surefire plugin");
-    executeMaven(this::assertGetJacocoAgent, "samplePomJacoco.xml", "test");
-  }
-
-  private boolean assertGetJacocoAgent(ExecutionEvent executionEvent) {
-    MojoExecution mojoExecution = executionEvent.getMojoExecution();
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      return false;
-    }
-    MavenSession session = executionEvent.getSession();
-    MavenProject project = executionEvent.getProject();
-    JavaAgent jacocoAgent = MavenUtils.getJacocoAgent(session, project, mojoExecution);
-    assertNotNull(jacocoAgent);
-    assertTrue(jacocoAgent.getPath().endsWith("org.jacoco.agent-0.8.11-runtime.jar"));
-    assertNotNull(jacocoAgent.getArguments());
-    return true;
-  }
-
-  @ParameterizedTest
-  @MethodSource("surefireVersions")
-  public void testGetEffectiveJvmFallbackUsesJvmProperty(
-      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
-      throws Exception {
-    assumeTrue(
-        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
-        "Newer maven version required to run chosen version of Surefire plugin");
-    executeMaven(
-        this::assertGetEffectiveJvmFallbackUsesJvmProperty,
-        "samplePom.xml",
-        String.format(
-            "org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
-  }
-
-  private boolean assertGetEffectiveJvmFallbackUsesJvmProperty(ExecutionEvent executionEvent) {
-    MojoExecution mojoExecution = executionEvent.getMojoExecution();
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      return false;
-    }
-    MavenSession session = executionEvent.getSession();
-    String effectiveJvm = MavenUtils.getEffectiveJvmFallback(session, mojoExecution);
-    assertEquals("jvm-config-property-value", effectiveJvm);
-    return true;
-  }
-
-  @ParameterizedTest
-  @MethodSource("surefireVersions")
-  public void testGetEffectiveJvmFallbackUsesToolchains(
-      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
-      throws Exception {
-    assumeTrue(
-        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
-        "Newer maven version required to run chosen version of Surefire plugin");
-    assumeTrue(surefirePluginVersion.compareTo(SUREFIRE_3_0_0) >= 0);
-    assumeTrue(getCurrentMavenVersion().compareTo(MAVEN_3_3_1) >= 0);
-
-    File toolchainsFile = createToolchainsFile();
-    executeMaven(
-        this::assertGetEffectiveJvmFallbackUsesToolchains,
-        "samplePomToolchains.xml",
-        String.format(
-            "org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion),
-        "--global-toolchains",
-        toolchainsFile.getAbsolutePath());
-  }
-
-  private boolean assertGetEffectiveJvmFallbackUsesToolchains(ExecutionEvent executionEvent) {
-    MojoExecution mojoExecution = executionEvent.getMojoExecution();
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      return false;
-    }
-
-    MavenSession session = executionEvent.getSession();
-    String effectiveJvm = MavenUtils.getEffectiveJvmFallback(session, mojoExecution);
-    assertNotNull(effectiveJvm);
-    assertTrue(effectiveJvm.endsWith("/my-jdk-home/bin/java"));
-    return true;
-  }
-
-  /**
-   * "jdkHome" in toolchains.xml has to point to an existing folder, so this method processes
-   * toolchains template, substituting the path to the real my-jdk-home directory.
-   */
-  private static File createToolchainsFile()
-      throws URISyntaxException, IOException, TemplateException {
-    File toolchainJdkHome = new File(MavenUtilsTest.class.getResource("my-jdk-home").toURI());
-    Map<String, String> replacements =
-        Collections.singletonMap("my_jdk_home_path", toolchainJdkHome.getAbsolutePath());
-
-    File toolchainsFile = WORKING_DIRECTORY.resolve("toolchains.xml").toFile();
-    try (FileWriter toolchainsFileWriter = new FileWriter(toolchainsFile)) {
-      Template coveragesTemplate = FREEMARKER.getTemplate("sampleToolchains.ftl");
-      coveragesTemplate.process(replacements, toolchainsFileWriter);
-    }
-    return toolchainsFile;
-  }
-
-  @ParameterizedTest
-  @MethodSource("surefireVersions")
-  public void testGetForkedJvmPath(
-      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
-      throws Exception {
-    assumeTrue(
-        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
-        "Newer maven version required to run chosen version of Surefire plugin");
-    executeMaven(
-        this::assertGetForkedJvmPath,
-        "samplePomJacoco.xml",
-        String.format(
-            "org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
-  }
-
-  private boolean assertGetForkedJvmPath(ExecutionEvent executionEvent) {
-    MojoExecution mojoExecution = executionEvent.getMojoExecution();
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      return false;
-    }
-    MavenSession session = executionEvent.getSession();
-    Path jvmPath = MavenUtils.getForkedJvmPath(session, mojoExecution);
-    assertNotNull(jvmPath);
-    assertTrue(jvmPath.toString().endsWith("/java"));
-    return true;
-  }
-
-  @ParameterizedTest
-  @MethodSource("surefireVersions")
-  public void testGetClasspath(
-      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
-      throws Exception {
-    assumeTrue(
-        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
-        "Newer maven version required to run chosen version of Surefire plugin");
-    executeMaven(
-        this::assertGetClasspath,
-        "samplePom.xml",
-        String.format(
-            "org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
-  }
-
-  private void assertClasspath(Collection<Path> classpath, String... suffixes) {
-    assertNotNull(classpath);
-    assertEquals(suffixes.length, classpath.size());
-
-    for (String suffix : suffixes) {
-      assertFalse(
-          classpath.stream().noneMatch(c -> c.toString().endsWith(suffix)),
-          "Missing entry: " + suffix);
-    }
-  }
-
-  private boolean assertGetClasspath(ExecutionEvent executionEvent) {
-    MojoExecution mojoExecution = executionEvent.getMojoExecution();
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      return false;
-    }
-
-    MavenSession session = executionEvent.getSession();
-    List<Path> classpath = MavenUtils.getClasspath(session, mojoExecution);
-    assertClasspath(
-        classpath,
-        "/test-classes",
-        "/classes",
-        "/junit-4.13.2.jar",
-        "/hamcrest-core-1.3.jar",
-        "/commons-lang3-3.17.0.jar");
-    return true;
-  }
-
-  @ParameterizedTest
-  @MethodSource("surefireVersions")
-  public void testGetClasspathConsidersAdditionalClasspathDependencies(
-      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
-      throws Exception {
-    assumeTrue(
-        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
-        "Newer maven version required to run chosen version of Surefire plugin");
-    assumeTrue(surefirePluginVersion.compareTo(SUREFIRE_3_2_0) >= 0);
-    executeMaven(
-        this::assertGetClasspathConsidersAdditionalClasspathDependencies,
-        "samplePomAdditionalClasspathDependencies.xml",
-        String.format(
-            "org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
-  }
-
-  private boolean assertGetClasspathConsidersAdditionalClasspathDependencies(
-      ExecutionEvent executionEvent) {
-    MojoExecution mojoExecution = executionEvent.getMojoExecution();
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      return false;
-    }
-
-    MavenSession session = executionEvent.getSession();
-    List<Path> classpath = MavenUtils.getClasspath(session, mojoExecution);
-    assertClasspath(
-        classpath,
-        "/test-classes",
-        "/classes",
-        "/junit-4.13.2.jar",
-        "/hamcrest-core-1.3.jar",
-        "/commons-io-2.16.1.jar");
-    return true;
-  }
-
-  @ParameterizedTest
-  @MethodSource("surefireVersions")
-  public void testGetClasspathConsidersAdditionalClasspathElements(
-      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
-      throws Exception {
-    assumeTrue(
-        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
-        "Newer maven version required to run chosen version of Surefire plugin");
-    executeMaven(
-        this::assertGetClasspathConsidersAdditionalClasspathElements,
-        "samplePomAdditionalClasspathElements.xml",
-        String.format(
-            "org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
-  }
-
-  private boolean assertGetClasspathConsidersAdditionalClasspathElements(
-      ExecutionEvent executionEvent) {
-    MojoExecution mojoExecution = executionEvent.getMojoExecution();
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      return false;
-    }
-
-    MavenSession session = executionEvent.getSession();
-    List<Path> classpath = MavenUtils.getClasspath(session, mojoExecution);
-    assertClasspath(
-        classpath,
-        "/test-classes",
-        "/classes",
-        "/junit-4.13.2.jar",
-        "/hamcrest-core-1.3.jar",
-        "/path/to/additional/classpath/element",
-        "/path/to/another/additional/classpath/element");
-    return true;
-  }
-
-  @ParameterizedTest
-  @MethodSource("surefireVersions")
-  public void testGetContainer(
-      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
-      throws Exception {
-    assumeTrue(
-        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
-        "Newer maven version required to run chosen version of Surefire plugin");
-    executeMaven(
-        this::assertGetContainer,
-        "samplePom.xml",
-        String.format(
-            "org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
-  }
-
-  private boolean assertGetContainer(ExecutionEvent executionEvent) {
-    MojoExecution mojoExecution = executionEvent.getMojoExecution();
-    if (!MavenUtils.isTestExecution(mojoExecution)) {
-      return false;
-    }
-    MavenSession session = executionEvent.getSession();
-    PlexusContainer container = MavenUtils.getContainer(session);
-    assertNotNull(container);
-    return true;
-  }
-
-  private static String getLatestMavenSurefireVersion() {
-    // The pinned value is bumped on a schedule by the update-smoke-test-latest-versions workflow.
-    // See latest-tool-versions.properties.
-    String version = loadLatestToolVersions().getProperty("maven-surefire.latest");
-    LOGGER.info("Will run the 'latest' tests with Maven Surefire version {}", version);
-    return version;
-  }
-
-  private static Properties loadLatestToolVersions() {
-    Properties properties = new Properties();
-    try (InputStream stream =
-        MavenUtilsTest.class
-            .getClassLoader()
-            .getResourceAsStream("latest-tool-versions.properties")) {
-      if (stream == null) {
-        throw new IllegalStateException(
-            "Could not find latest-tool-versions.properties on classpath");
-      }
-      properties.load(stream);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-    return properties;
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(MavenUtilsTest.class);
+
+    private static final Configuration FREEMARKER = new Configuration(Configuration.VERSION_2_3_30);
+
+    static {
+        FREEMARKER.setClassForTemplateLoading(MavenUtilsTest.class, "");
+        FREEMARKER.setDefaultEncoding("UTF-8");
+        FREEMARKER.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
+        FREEMARKER.setLogTemplateExceptions(true);
+        FREEMARKER.setWrapUncheckedExceptions(true);
+    }
+
+    private static final ComparableVersion SUREFIRE_3_0_0 = new ComparableVersion("3.0.0");
+    private static final ComparableVersion SUREFIRE_3_2_0 = new ComparableVersion("3.2.0");
+    private static final ComparableVersion MAVEN_3_3_1 = new ComparableVersion("3.3.1");
+
+    public static Stream<Arguments> surefireVersions() {
+        return Stream.of(
+                Arguments.of(new ComparableVersion("2.17"), new ComparableVersion("3.0.0")),
+                Arguments.of(new ComparableVersion("2.21.0"), new ComparableVersion("3.0.0")),
+                Arguments.of(new ComparableVersion("3.0.0"), new ComparableVersion("3.0.0")),
+                Arguments.of(new ComparableVersion("3.5.0"), new ComparableVersion("3.6.3")),
+                Arguments.of(new ComparableVersion(getLatestMavenSurefireVersion()), new ComparableVersion("3.6.3")));
+    }
+
+    private ComparableVersion getCurrentMavenVersion() {
+        return new ComparableVersion(MavenSession.class.getPackage().getImplementationVersion());
+    }
+
+    @ParameterizedTest
+    @MethodSource("surefireVersions")
+    public void testGetMojoConfigValueReturnsNullIfValueNotSet(
+            ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion) throws Exception {
+        assumeTrue(
+                minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+                "Newer maven version required to run chosen version of Surefire plugin");
+        executeMaven(
+                this::assertGetMojoConfigValueReturnsNullIfValueNotSet,
+                "samplePom.xml",
+                String.format("org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
+    }
+
+    private boolean assertGetMojoConfigValueReturnsNullIfValueNotSet(ExecutionEvent executionEvent) {
+        MojoExecution mojoExecution = executionEvent.getMojoExecution();
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            return false;
+        }
+        MavenSession session = executionEvent.getSession();
+        String forkCount = MavenUtils.getConfigurationValue(session, mojoExecution, "forkCount");
+        assertNull(forkCount);
+        return true;
+    }
+
+    @ParameterizedTest
+    @MethodSource("surefireVersions")
+    public void testGetMojoConfigValueReturnsConfiguredValue(
+            ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion) throws Exception {
+        assumeTrue(
+                minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+                "Newer maven version required to run chosen version of Surefire plugin");
+        executeMaven(
+                this::assertGetMojoConfigValueReturnsConfiguredValue,
+                "samplePom.xml",
+                String.format("org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
+    }
+
+    private boolean assertGetMojoConfigValueReturnsConfiguredValue(ExecutionEvent executionEvent) {
+        MojoExecution mojoExecution = executionEvent.getMojoExecution();
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            return false;
+        }
+        MavenSession session = executionEvent.getSession();
+        String threadCount = MavenUtils.getConfigurationValue(session, mojoExecution, "threadCount");
+        assertEquals("112", threadCount);
+        return true;
+    }
+
+    @ParameterizedTest
+    @MethodSource("surefireVersions")
+    public void testGetMojoConfigValueResolvesPropertyPlaceholders(
+            ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion) throws Exception {
+        assumeTrue(
+                minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+                "Newer maven version required to run chosen version of Surefire plugin");
+        executeMaven(
+                this::assertGetMojoConfigValueResolvesPropertyPlaceholders,
+                "samplePom.xml",
+                String.format("org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
+    }
+
+    private boolean assertGetMojoConfigValueResolvesPropertyPlaceholders(ExecutionEvent executionEvent) {
+        MojoExecution mojoExecution = executionEvent.getMojoExecution();
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            return false;
+        }
+        MavenSession session = executionEvent.getSession();
+        String forkedProcessExitTimeoutInSeconds =
+                MavenUtils.getConfigurationValue(session, mojoExecution, "forkedProcessTimeoutInSeconds");
+        assertEquals("887", forkedProcessExitTimeoutInSeconds);
+        return true;
+    }
+
+    @ParameterizedTest
+    @MethodSource("surefireVersions")
+    public void testGetMojoConfigValueResolvesPropertiesSuppliedViaCmdLine(
+            ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion) throws Exception {
+        assumeTrue(
+                minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+                "Newer maven version required to run chosen version of Surefire plugin");
+        executeMaven(
+                this::assertGetMojoConfigValueResolvesPropertiesSuppliedViaCmdLine,
+                "samplePom.xml",
+                String.format("org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion),
+                "-Dsurefire.parallel.timeout=112233");
+    }
+
+    private boolean assertGetMojoConfigValueResolvesPropertiesSuppliedViaCmdLine(ExecutionEvent executionEvent) {
+        MojoExecution mojoExecution = executionEvent.getMojoExecution();
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            return false;
+        }
+        MavenSession session = executionEvent.getSession();
+        String parallelTestsTimeoutInSeconds =
+                MavenUtils.getConfigurationValue(session, mojoExecution, "parallelTestsTimeoutInSeconds");
+        assertEquals("112233", parallelTestsTimeoutInSeconds);
+        return true;
+    }
+
+    @ParameterizedTest
+    @MethodSource("surefireVersions")
+    public void testGetArgLineResolvesLatePropertyPlaceholders(
+            ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion) throws Exception {
+        assumeTrue(
+                minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+                "Newer maven version required to run chosen version of Surefire plugin");
+        executeMaven(
+                this::assertGetArgLineResolvesLatePropertyPlaceholders,
+                "samplePom.xml",
+                String.format("org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
+    }
+
+    private boolean assertGetArgLineResolvesLatePropertyPlaceholders(ExecutionEvent executionEvent) {
+        MojoExecution mojoExecution = executionEvent.getMojoExecution();
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            return false;
+        }
+        MavenSession session = executionEvent.getSession();
+        MavenProject project = executionEvent.getProject();
+        String argLine = MavenUtils.getArgLine(session, project, mojoExecution);
+        assertEquals("-Xms128m -Xmx2g", argLine);
+        return true;
+    }
+
+    @ParameterizedTest
+    @MethodSource("surefireVersions")
+    public void testGetJacocoAgent(ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+            throws Exception {
+        assumeTrue(
+                minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+                "Newer maven version required to run chosen version of Surefire plugin");
+        executeMaven(this::assertGetJacocoAgent, "samplePomJacoco.xml", "test");
+    }
+
+    private boolean assertGetJacocoAgent(ExecutionEvent executionEvent) {
+        MojoExecution mojoExecution = executionEvent.getMojoExecution();
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            return false;
+        }
+        MavenSession session = executionEvent.getSession();
+        MavenProject project = executionEvent.getProject();
+        JavaAgent jacocoAgent = MavenUtils.getJacocoAgent(session, project, mojoExecution);
+        assertNotNull(jacocoAgent);
+        assertTrue(jacocoAgent.getPath().endsWith("org.jacoco.agent-0.8.11-runtime.jar"));
+        assertNotNull(jacocoAgent.getArguments());
+        return true;
+    }
+
+    @ParameterizedTest
+    @MethodSource("surefireVersions")
+    public void testGetEffectiveJvmFallbackUsesJvmProperty(
+            ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion) throws Exception {
+        assumeTrue(
+                minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+                "Newer maven version required to run chosen version of Surefire plugin");
+        executeMaven(
+                this::assertGetEffectiveJvmFallbackUsesJvmProperty,
+                "samplePom.xml",
+                String.format("org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
+    }
+
+    private boolean assertGetEffectiveJvmFallbackUsesJvmProperty(ExecutionEvent executionEvent) {
+        MojoExecution mojoExecution = executionEvent.getMojoExecution();
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            return false;
+        }
+        MavenSession session = executionEvent.getSession();
+        String effectiveJvm = MavenUtils.getEffectiveJvmFallback(session, mojoExecution);
+        assertEquals("jvm-config-property-value", effectiveJvm);
+        return true;
+    }
+
+    @ParameterizedTest
+    @MethodSource("surefireVersions")
+    public void testGetEffectiveJvmFallbackUsesToolchains(
+            ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion) throws Exception {
+        assumeTrue(
+                minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+                "Newer maven version required to run chosen version of Surefire plugin");
+        assumeTrue(surefirePluginVersion.compareTo(SUREFIRE_3_0_0) >= 0);
+        assumeTrue(getCurrentMavenVersion().compareTo(MAVEN_3_3_1) >= 0);
+
+        File toolchainsFile = createToolchainsFile();
+        executeMaven(
+                this::assertGetEffectiveJvmFallbackUsesToolchains,
+                "samplePomToolchains.xml",
+                String.format("org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion),
+                "--global-toolchains",
+                toolchainsFile.getAbsolutePath());
+    }
+
+    private boolean assertGetEffectiveJvmFallbackUsesToolchains(ExecutionEvent executionEvent) {
+        MojoExecution mojoExecution = executionEvent.getMojoExecution();
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            return false;
+        }
+
+        MavenSession session = executionEvent.getSession();
+        String effectiveJvm = MavenUtils.getEffectiveJvmFallback(session, mojoExecution);
+        assertNotNull(effectiveJvm);
+        assertTrue(effectiveJvm.endsWith("/my-jdk-home/bin/java"));
+        return true;
+    }
+
+    /**
+     * "jdkHome" in toolchains.xml has to point to an existing folder, so this method processes
+     * toolchains template, substituting the path to the real my-jdk-home directory.
+     */
+    private static File createToolchainsFile() throws URISyntaxException, IOException, TemplateException {
+        File toolchainJdkHome =
+                new File(MavenUtilsTest.class.getResource("my-jdk-home").toURI());
+        Map<String, String> replacements =
+                Collections.singletonMap("my_jdk_home_path", toolchainJdkHome.getAbsolutePath());
+
+        File toolchainsFile = WORKING_DIRECTORY.resolve("toolchains.xml").toFile();
+        try (FileWriter toolchainsFileWriter = new FileWriter(toolchainsFile)) {
+            Template coveragesTemplate = FREEMARKER.getTemplate("sampleToolchains.ftl");
+            coveragesTemplate.process(replacements, toolchainsFileWriter);
+        }
+        return toolchainsFile;
+    }
+
+    @ParameterizedTest
+    @MethodSource("surefireVersions")
+    public void testGetForkedJvmPath(ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+            throws Exception {
+        assumeTrue(
+                minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+                "Newer maven version required to run chosen version of Surefire plugin");
+        executeMaven(
+                this::assertGetForkedJvmPath,
+                "samplePomJacoco.xml",
+                String.format("org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
+    }
+
+    private boolean assertGetForkedJvmPath(ExecutionEvent executionEvent) {
+        MojoExecution mojoExecution = executionEvent.getMojoExecution();
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            return false;
+        }
+        MavenSession session = executionEvent.getSession();
+        Path jvmPath = MavenUtils.getForkedJvmPath(session, mojoExecution);
+        assertNotNull(jvmPath);
+        assertTrue(jvmPath.toString().endsWith("/java"));
+        return true;
+    }
+
+    @ParameterizedTest
+    @MethodSource("surefireVersions")
+    public void testGetClasspath(ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+            throws Exception {
+        assumeTrue(
+                minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+                "Newer maven version required to run chosen version of Surefire plugin");
+        executeMaven(
+                this::assertGetClasspath,
+                "samplePom.xml",
+                String.format("org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
+    }
+
+    private void assertClasspath(Collection<Path> classpath, String... suffixes) {
+        assertNotNull(classpath);
+        assertEquals(suffixes.length, classpath.size());
+
+        for (String suffix : suffixes) {
+            assertFalse(classpath.stream().noneMatch(c -> c.toString().endsWith(suffix)), "Missing entry: " + suffix);
+        }
+    }
+
+    private boolean assertGetClasspath(ExecutionEvent executionEvent) {
+        MojoExecution mojoExecution = executionEvent.getMojoExecution();
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            return false;
+        }
+
+        MavenSession session = executionEvent.getSession();
+        List<Path> classpath = MavenUtils.getClasspath(session, mojoExecution);
+        assertClasspath(
+                classpath,
+                "/test-classes",
+                "/classes",
+                "/junit-4.13.2.jar",
+                "/hamcrest-core-1.3.jar",
+                "/commons-lang3-3.17.0.jar");
+        return true;
+    }
+
+    @ParameterizedTest
+    @MethodSource("surefireVersions")
+    public void testGetClasspathConsidersAdditionalClasspathDependencies(
+            ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion) throws Exception {
+        assumeTrue(
+                minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+                "Newer maven version required to run chosen version of Surefire plugin");
+        assumeTrue(surefirePluginVersion.compareTo(SUREFIRE_3_2_0) >= 0);
+        executeMaven(
+                this::assertGetClasspathConsidersAdditionalClasspathDependencies,
+                "samplePomAdditionalClasspathDependencies.xml",
+                String.format("org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
+    }
+
+    private boolean assertGetClasspathConsidersAdditionalClasspathDependencies(ExecutionEvent executionEvent) {
+        MojoExecution mojoExecution = executionEvent.getMojoExecution();
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            return false;
+        }
+
+        MavenSession session = executionEvent.getSession();
+        List<Path> classpath = MavenUtils.getClasspath(session, mojoExecution);
+        assertClasspath(
+                classpath,
+                "/test-classes",
+                "/classes",
+                "/junit-4.13.2.jar",
+                "/hamcrest-core-1.3.jar",
+                "/commons-io-2.16.1.jar");
+        return true;
+    }
+
+    @ParameterizedTest
+    @MethodSource("surefireVersions")
+    public void testGetClasspathConsidersAdditionalClasspathElements(
+            ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion) throws Exception {
+        assumeTrue(
+                minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+                "Newer maven version required to run chosen version of Surefire plugin");
+        executeMaven(
+                this::assertGetClasspathConsidersAdditionalClasspathElements,
+                "samplePomAdditionalClasspathElements.xml",
+                String.format("org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
+    }
+
+    private boolean assertGetClasspathConsidersAdditionalClasspathElements(ExecutionEvent executionEvent) {
+        MojoExecution mojoExecution = executionEvent.getMojoExecution();
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            return false;
+        }
+
+        MavenSession session = executionEvent.getSession();
+        List<Path> classpath = MavenUtils.getClasspath(session, mojoExecution);
+        assertClasspath(
+                classpath,
+                "/test-classes",
+                "/classes",
+                "/junit-4.13.2.jar",
+                "/hamcrest-core-1.3.jar",
+                "/path/to/additional/classpath/element",
+                "/path/to/another/additional/classpath/element");
+        return true;
+    }
+
+    @ParameterizedTest
+    @MethodSource("surefireVersions")
+    public void testGetContainer(ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+            throws Exception {
+        assumeTrue(
+                minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+                "Newer maven version required to run chosen version of Surefire plugin");
+        executeMaven(
+                this::assertGetContainer,
+                "samplePom.xml",
+                String.format("org.apache.maven.plugins:maven-surefire-plugin:%s:test", surefirePluginVersion));
+    }
+
+    private boolean assertGetContainer(ExecutionEvent executionEvent) {
+        MojoExecution mojoExecution = executionEvent.getMojoExecution();
+        if (!MavenUtils.isTestExecution(mojoExecution)) {
+            return false;
+        }
+        MavenSession session = executionEvent.getSession();
+        PlexusContainer container = MavenUtils.getContainer(session);
+        assertNotNull(container);
+        return true;
+    }
+
+    private static String getLatestMavenSurefireVersion() {
+        // The pinned value is bumped on a schedule by the update-smoke-test-latest-versions workflow.
+        // See latest-tool-versions.properties.
+        String version = loadLatestToolVersions().getProperty("maven-surefire.latest");
+        LOGGER.info("Will run the 'latest' tests with Maven Surefire version {}", version);
+        return version;
+    }
+
+    private static Properties loadLatestToolVersions() {
+        Properties properties = new Properties();
+        try (InputStream stream =
+                MavenUtilsTest.class.getClassLoader().getResourceAsStream("latest-tool-versions.properties")) {
+            if (stream == null) {
+                throw new IllegalStateException("Could not find latest-tool-versions.properties on classpath");
+            }
+            properties.load(stream);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return properties;
+    }
 }
diff --git a/dd-java-agent/instrumentation/maven/maven-surefire-3.0/src/main/java/datadog/trace/instrumentation/maven/surefire/junit4/JUnit4ClassOrderInstrumentation.java b/dd-java-agent/instrumentation/maven/maven-surefire-3.0/src/main/java/datadog/trace/instrumentation/maven/surefire/junit4/JUnit4ClassOrderInstrumentation.java
index 61046265961..4211c4bab1e 100644
--- a/dd-java-agent/instrumentation/maven/maven-surefire-3.0/src/main/java/datadog/trace/instrumentation/maven/surefire/junit4/JUnit4ClassOrderInstrumentation.java
+++ b/dd-java-agent/instrumentation/maven/maven-surefire-3.0/src/main/java/datadog/trace/instrumentation/maven/surefire/junit4/JUnit4ClassOrderInstrumentation.java
@@ -21,69 +21,66 @@
 
 @AutoService(InstrumenterModule.class)
 public class JUnit4ClassOrderInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public JUnit4ClassOrderInstrumentation() {
-    super("ci-visibility", "maven", "surefire", "junit4");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public JUnit4ClassOrderInstrumentation() {
+        super("ci-visibility", "maven", "surefire", "junit4");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.apache.maven.surefire.junit4.JUnit4Provider",
-      "org.apache.maven.surefire.junitcore.JUnitCoreProvider",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.apache.maven.surefire.junit4.JUnit4Provider", "org.apache.maven.surefire.junitcore.JUnitCoreProvider",
+        };
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      JUnit4Instrumentation.class.getPackage().getName() + ".JUnit4Utils",
-      JUnit4Instrumentation.class.getPackage().getName() + ".TestEventsHandlerHolder",
-      JUnit4Instrumentation.class.getPackage().getName() + ".SkippedByDatadog",
-      JUnit4Instrumentation.class.getPackage().getName() + ".TracingListener",
-      JUnit4Instrumentation.class.getPackage().getName() + ".order.JUnit4FailFastClassOrderer",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            JUnit4Instrumentation.class.getPackage().getName() + ".JUnit4Utils",
+            JUnit4Instrumentation.class.getPackage().getName() + ".TestEventsHandlerHolder",
+            JUnit4Instrumentation.class.getPackage().getName() + ".SkippedByDatadog",
+            JUnit4Instrumentation.class.getPackage().getName() + ".TracingListener",
+            JUnit4Instrumentation.class.getPackage().getName() + ".order.JUnit4FailFastClassOrderer",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("setTestsToRun"),
-        JUnit4ClassOrderInstrumentation.class.getName() + "$TestsToRunAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("setTestsToRun"), JUnit4ClassOrderInstrumentation.class.getName() + "$TestsToRunAdvice");
+    }
 
-  public static class TestsToRunAdvice {
-    @SuppressFBWarnings(
-        value = "UC_USELESS_OBJECT",
-        justification = "testsToRun is the field value modified by the advice")
-    @Advice.OnMethodExit
-    public static void onSetTestsToRun(
-        @Advice.FieldValue(value = "testsToRun", readOnly = false) TestsToRun testsToRun) {
-      String testOrder = Config.get().getCiVisibilityTestOrder();
-      if (!CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) {
-        throw new IllegalArgumentException("Unknown test order: " + testOrder);
-      }
+    public static class TestsToRunAdvice {
+        @SuppressFBWarnings(
+                value = "UC_USELESS_OBJECT",
+                justification = "testsToRun is the field value modified by the advice")
+        @Advice.OnMethodExit
+        public static void onSetTestsToRun(
+                @Advice.FieldValue(value = "testsToRun", readOnly = false) TestsToRun testsToRun) {
+            String testOrder = Config.get().getCiVisibilityTestOrder();
+            if (!CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) {
+                throw new IllegalArgumentException("Unknown test order: " + testOrder);
+            }
 
-      List<Class<?>> testClasses = new ArrayList<>();
+            List<Class<?>> testClasses = new ArrayList<>();
 
-      for (Class<?> testClass : testsToRun) {
-        testClasses.add(testClass);
-        TestFrameworkInstrumentation framework = JUnit4Utils.classToFramework(testClass);
-        if (framework == TestFrameworkInstrumentation.JUNIT4) {
-          TestEventsHandlerHolder.start(framework, JUnit4Utils.capabilities(true));
-        }
-      }
+            for (Class<?> testClass : testsToRun) {
+                testClasses.add(testClass);
+                TestFrameworkInstrumentation framework = JUnit4Utils.classToFramework(testClass);
+                if (framework == TestFrameworkInstrumentation.JUNIT4) {
+                    TestEventsHandlerHolder.start(framework, JUnit4Utils.capabilities(true));
+                }
+            }
 
-      testClasses.sort(
-          new JUnit4FailFastClassOrderer(
-              TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT4)));
+            testClasses.sort(new JUnit4FailFastClassOrderer(
+                    TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT4)));
 
-      testsToRun = new TestsToRun(new LinkedHashSet<>(testClasses));
+            testsToRun = new TestsToRun(new LinkedHashSet<>(testClasses));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/src/main/java/datadog/trace/instrumentation/micronaut/v2_0/MicronautInstrumentation.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/src/main/java/datadog/trace/instrumentation/micronaut/v2_0/MicronautInstrumentation.java
index 335ef4749aa..d5d24d1e31b 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/src/main/java/datadog/trace/instrumentation/micronaut/v2_0/MicronautInstrumentation.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/src/main/java/datadog/trace/instrumentation/micronaut/v2_0/MicronautInstrumentation.java
@@ -10,57 +10,57 @@
 
 @AutoService(InstrumenterModule.class)
 public final class MicronautInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public MicronautInstrumentation() {
-    super("micronaut", "micronaut-http-server-netty", "micronaut-http-server-netty-2");
-  }
+    public MicronautInstrumentation() {
+        super("micronaut", "micronaut-http-server-netty", "micronaut-http-server-netty-2");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.micronaut.http.server.netty.RoutingInBoundHandler";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.micronaut.http.server.netty.RoutingInBoundHandler";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("channelRead0"))
-            .and(takesArgument(0, named("io.netty.channel.ChannelHandlerContext")))
-            .and(takesArgument(1, named("io.micronaut.http.HttpRequest"))),
-        "datadog.trace.instrumentation.micronaut.ChannelRead0Advice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("channelRead0"))
+                        .and(takesArgument(0, named("io.netty.channel.ChannelHandlerContext")))
+                        .and(takesArgument(1, named("io.micronaut.http.HttpRequest"))),
+                "datadog.trace.instrumentation.micronaut.ChannelRead0Advice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("handleRouteMatch"))
-            .and(takesArgument(0, named("io.micronaut.web.router.RouteMatch")))
-            .and(takesArgument(1, named("io.micronaut.http.server.netty.NettyHttpRequest")))
-            .and(takesArgument(2, named("io.netty.channel.ChannelHandlerContext")))
-            .and(takesArgument(3, named("boolean"))),
-        "datadog.trace.instrumentation.micronaut.HandleRouteMatchAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("handleRouteMatch"))
+                        .and(takesArgument(0, named("io.micronaut.web.router.RouteMatch")))
+                        .and(takesArgument(1, named("io.micronaut.http.server.netty.NettyHttpRequest")))
+                        .and(takesArgument(2, named("io.netty.channel.ChannelHandlerContext")))
+                        .and(takesArgument(3, named("boolean"))),
+                "datadog.trace.instrumentation.micronaut.HandleRouteMatchAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("writeFinalNettyResponse"))
-            .and(takesArgument(0, named("io.micronaut.http.MutableHttpResponse")))
-            .and(takesArgument(1, named("io.micronaut.http.HttpRequest")))
-            .and(takesArgument(2, named("io.netty.channel.ChannelHandlerContext"))),
-        "datadog.trace.instrumentation.micronaut.WriteFinalNettyResponseAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("writeFinalNettyResponse"))
+                        .and(takesArgument(0, named("io.micronaut.http.MutableHttpResponse")))
+                        .and(takesArgument(1, named("io.micronaut.http.HttpRequest")))
+                        .and(takesArgument(2, named("io.netty.channel.ChannelHandlerContext"))),
+                "datadog.trace.instrumentation.micronaut.WriteFinalNettyResponseAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("writeDefaultErrorResponse"))
-            .and(takesArgument(0, named("io.netty.channel.ChannelHandlerContext")))
-            .and(takesArgument(1, named("io.micronaut.http.server.netty.NettyHttpRequest")))
-            .and(takesArgument(2, named("java.lang.Throwable")))
-            .and(takesArgument(3, named("boolean"))),
-        packageName + ".WriteDefaultErrorResponseAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("writeDefaultErrorResponse"))
+                        .and(takesArgument(0, named("io.netty.channel.ChannelHandlerContext")))
+                        .and(takesArgument(1, named("io.micronaut.http.server.netty.NettyHttpRequest")))
+                        .and(takesArgument(2, named("java.lang.Throwable")))
+                        .and(takesArgument(3, named("boolean"))),
+                packageName + ".WriteDefaultErrorResponseAdvice");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.micronaut.MicronautDecorator",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.micronaut.MicronautDecorator",
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/src/main/java/datadog/trace/instrumentation/micronaut/v2_0/WriteDefaultErrorResponseAdvice.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/src/main/java/datadog/trace/instrumentation/micronaut/v2_0/WriteDefaultErrorResponseAdvice.java
index 874afb810e8..f374f0aa533 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/src/main/java/datadog/trace/instrumentation/micronaut/v2_0/WriteDefaultErrorResponseAdvice.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/src/main/java/datadog/trace/instrumentation/micronaut/v2_0/WriteDefaultErrorResponseAdvice.java
@@ -10,21 +10,21 @@
 import net.bytebuddy.asm.Advice;
 
 public class WriteDefaultErrorResponseAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void beginRequest(
-      @Advice.Argument(1) final NettyHttpRequest nettyHttpRequest,
-      @Advice.Argument(2) final Throwable cause) {
-    AgentSpan span = nettyHttpRequest.getAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
-    if (null == span) {
-      return;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void beginRequest(
+            @Advice.Argument(1) final NettyHttpRequest nettyHttpRequest, @Advice.Argument(2) final Throwable cause) {
+        AgentSpan span =
+                nettyHttpRequest.getAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
+        if (null == span) {
+            return;
+        }
+        DECORATE.onError(span, cause);
     }
-    DECORATE.onError(span, cause);
-  }
 
-  private static void muzzleCheck(MediaTypeConverter mediaTypeConverter) {
-    // Added in 2.0.0
-    HttpVersion version = HttpVersion.HTTP_2_0;
-    // Removed in 3.0.0
-    mediaTypeConverter.convert(null, null);
-  }
+    private static void muzzleCheck(MediaTypeConverter mediaTypeConverter) {
+        // Added in 2.0.0
+        HttpVersion version = HttpVersion.HTTP_2_0;
+        // Removed in 3.0.0
+        mediaTypeConverter.convert(null, null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/src/test/java/test/TestController.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/src/test/java/test/TestController.java
index 00d56c2e084..c81b4758520 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/src/test/java/test/TestController.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/src/test/java/test/TestController.java
@@ -24,99 +24,84 @@
 
 @Controller("/")
 class TestController {
-  @Get(uri = "/success", produces = MediaType.TEXT_PLAIN)
-  public Single<String> success() {
-    return HttpServerTest.controller(
-        SUCCESS,
-        new Closure<Single<String>>(null) {
-          public Single<String> doCall() {
-            return Single.just(SUCCESS.getBody());
-          }
+    @Get(uri = "/success", produces = MediaType.TEXT_PLAIN)
+    public Single<String> success() {
+        return HttpServerTest.controller(SUCCESS, new Closure<Single<String>>(null) {
+            public Single<String> doCall() {
+                return Single.just(SUCCESS.getBody());
+            }
         });
-  }
+    }
 
-  @Get(uri = "/exception", produces = MediaType.TEXT_PLAIN)
-  public Single<String> exception() {
-    return HttpServerTest.controller(
-        EXCEPTION,
-        new Closure<Single<String>>(null) {
-          public Single<String> doCall() throws Exception {
-            throw new Exception(EXCEPTION.getBody());
-          }
+    @Get(uri = "/exception", produces = MediaType.TEXT_PLAIN)
+    public Single<String> exception() {
+        return HttpServerTest.controller(EXCEPTION, new Closure<Single<String>>(null) {
+            public Single<String> doCall() throws Exception {
+                throw new Exception(EXCEPTION.getBody());
+            }
         });
-  }
+    }
 
-  @Get(uri = "/error-status", produces = MediaType.TEXT_PLAIN)
-  public HttpResponse<String> error(final HttpRequest<?> request) {
-    return HttpServerTest.controller(
-        ERROR,
-        new Closure<HttpResponse<String>>(null) {
-          public HttpResponse<String> doCall() {
-            return HttpResponse.serverError(ERROR.getBody());
-          }
+    @Get(uri = "/error-status", produces = MediaType.TEXT_PLAIN)
+    public HttpResponse<String> error(final HttpRequest<?> request) {
+        return HttpServerTest.controller(ERROR, new Closure<HttpResponse<String>>(null) {
+            public HttpResponse<String> doCall() {
+                return HttpResponse.serverError(ERROR.getBody());
+            }
         });
-  }
+    }
 
-  @Get(uri = "/forwarded", produces = MediaType.TEXT_PLAIN)
-  public HttpResponse<String> forwarded(final HttpRequest<?> request) {
-    return HttpServerTest.controller(
-        FORWARDED,
-        new Closure<HttpResponse<String>>(null) {
-          public HttpResponse<String> doCall() {
-            return HttpResponse.ok(
-                request.getHeaders().get("x-forwarded-for", String.class, "unknown"));
-          }
+    @Get(uri = "/forwarded", produces = MediaType.TEXT_PLAIN)
+    public HttpResponse<String> forwarded(final HttpRequest<?> request) {
+        return HttpServerTest.controller(FORWARDED, new Closure<HttpResponse<String>>(null) {
+            public HttpResponse<String> doCall() {
+                return HttpResponse.ok(request.getHeaders().get("x-forwarded-for", String.class, "unknown"));
+            }
         });
-  }
+    }
 
-  @Get(uri = "/redirect", produces = MediaType.TEXT_PLAIN)
-  public MutableHttpResponse<Object> redirect(final HttpRequest<?> request) {
-    return HttpServerTest.controller(
-        REDIRECT,
-        new Closure<MutableHttpResponse<Object>>(null) {
-          public MutableHttpResponse<Object> doCall() {
-            return HttpResponse.status(HttpStatus.valueOf(REDIRECT.getStatus()))
-                .header("location", REDIRECT.getBody());
-          }
+    @Get(uri = "/redirect", produces = MediaType.TEXT_PLAIN)
+    public MutableHttpResponse<Object> redirect(final HttpRequest<?> request) {
+        return HttpServerTest.controller(REDIRECT, new Closure<MutableHttpResponse<Object>>(null) {
+            public MutableHttpResponse<Object> doCall() {
+                return HttpResponse.status(HttpStatus.valueOf(REDIRECT.getStatus()))
+                        .header("location", REDIRECT.getBody());
+            }
         });
-  }
+    }
 
-  @Get(uri = "/path/{id}/param", produces = MediaType.TEXT_PLAIN)
-  public Single<Integer> path_param(@NotBlank final Integer id) {
-    return HttpServerTest.controller(
-        PATH_PARAM,
-        new Closure<Single<Integer>>(null) {
-          public Single<Integer> doCall() {
-            return Single.just(id);
-          }
+    @Get(uri = "/path/{id}/param", produces = MediaType.TEXT_PLAIN)
+    public Single<Integer> path_param(@NotBlank final Integer id) {
+        return HttpServerTest.controller(PATH_PARAM, new Closure<Single<Integer>>(null) {
+            public Single<Integer> doCall() {
+                return Single.just(id);
+            }
         });
-  }
+    }
 
-  @Get(uri = "/query", produces = MediaType.TEXT_PLAIN)
-  public HttpResponse<String> query_param(final HttpRequest<?> request) {
-    return handle_query(QUERY_PARAM, request);
-  }
+    @Get(uri = "/query", produces = MediaType.TEXT_PLAIN)
+    public HttpResponse<String> query_param(final HttpRequest<?> request) {
+        return handle_query(QUERY_PARAM, request);
+    }
 
-  @Get(uri = "/encoded_query", produces = MediaType.TEXT_PLAIN)
-  public HttpResponse<String> query_encoded_query(final HttpRequest<?> request) {
-    return handle_query(QUERY_ENCODED_QUERY, request);
-  }
+    @Get(uri = "/encoded_query", produces = MediaType.TEXT_PLAIN)
+    public HttpResponse<String> query_encoded_query(final HttpRequest<?> request) {
+        return handle_query(QUERY_ENCODED_QUERY, request);
+    }
 
-  @Get(uri = "/encoded%20path%20query", produces = MediaType.TEXT_PLAIN)
-  public HttpResponse<String> query_encoded_both(final HttpRequest<?> request) {
-    return handle_query(QUERY_ENCODED_BOTH, request);
-  }
+    @Get(uri = "/encoded%20path%20query", produces = MediaType.TEXT_PLAIN)
+    public HttpResponse<String> query_encoded_both(final HttpRequest<?> request) {
+        return handle_query(QUERY_ENCODED_BOTH, request);
+    }
 
-  private HttpResponse<String> handle_query(
-      final HttpServerTest.ServerEndpoint endpoint, final HttpRequest<?> request) {
-    return HttpServerTest.controller(
-        endpoint,
-        new Closure<HttpResponse<String>>(null) {
-          public HttpResponse<String> doCall() {
-            String query =
-                "some=" + request.getParameters().getFirst("some", String.class).orElse("bad");
-            return HttpResponse.ok(endpoint.bodyForQuery(query));
-          }
+    private HttpResponse<String> handle_query(
+            final HttpServerTest.ServerEndpoint endpoint, final HttpRequest<?> request) {
+        return HttpServerTest.controller(endpoint, new Closure<HttpResponse<String>>(null) {
+            public HttpResponse<String> doCall() {
+                String query = "some="
+                        + request.getParameters().getFirst("some", String.class).orElse("bad");
+                return HttpResponse.ok(endpoint.bodyForQuery(query));
+            }
         });
-  }
+    }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/src/test/java/test/TestFilter.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/src/test/java/test/TestFilter.java
index d6fd3e7563c..030d1abb40c 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/src/test/java/test/TestFilter.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/src/test/java/test/TestFilter.java
@@ -11,15 +11,10 @@
 
 @Filter(Filter.MATCH_ALL_PATTERN)
 public class TestFilter implements HttpServerFilter {
-  @Override
-  public Publisher<MutableHttpResponse<?>> doFilter(
-      HttpRequest<?> request, ServerFilterChain chain) {
-    return Flowable.fromPublisher(chain.proceed(request))
-        .doOnNext(
-            res ->
-                res.getHeaders()
-                    .add(
-                        HttpServerTest.getIG_RESPONSE_HEADER(),
-                        HttpServerTest.getIG_RESPONSE_HEADER_VALUE()));
-  }
+    @Override
+    public Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request, ServerFilterChain chain) {
+        return Flowable.fromPublisher(chain.proceed(request))
+                .doOnNext(res -> res.getHeaders()
+                        .add(HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE()));
+    }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/src/main/java/datadog/trace/instrumentation/micronaut/v3_0/CreateDefaultErrorResponseAdvice.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/src/main/java/datadog/trace/instrumentation/micronaut/v3_0/CreateDefaultErrorResponseAdvice.java
index df126aa1b90..4e995770fc8 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/src/main/java/datadog/trace/instrumentation/micronaut/v3_0/CreateDefaultErrorResponseAdvice.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/src/main/java/datadog/trace/instrumentation/micronaut/v3_0/CreateDefaultErrorResponseAdvice.java
@@ -10,22 +10,21 @@
 import net.bytebuddy.asm.Advice;
 
 public class CreateDefaultErrorResponseAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void beginRequest(
-      @Advice.Argument(0) final HttpRequest httpRequest,
-      @Advice.Argument(1) final Throwable cause) {
-    AgentSpan span = httpRequest.getAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
-    if (null == span) {
-      return;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void beginRequest(
+            @Advice.Argument(0) final HttpRequest httpRequest, @Advice.Argument(1) final Throwable cause) {
+        AgentSpan span =
+                httpRequest.getAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
+        if (null == span) {
+            return;
+        }
+        DECORATE.onError(span, cause);
     }
-    DECORATE.onError(span, cause);
-  }
 
-  private static void muzzleCheck(
-      RouteExecutor routeExecutor, HttpDataReference httpDataReference) {
-    // Added in 3.0.0
-    routeExecutor.createDefaultErrorResponse(null, null);
-    // Removed in 4.0.0
-    httpDataReference.getContentType();
-  }
+    private static void muzzleCheck(RouteExecutor routeExecutor, HttpDataReference httpDataReference) {
+        // Added in 3.0.0
+        routeExecutor.createDefaultErrorResponse(null, null);
+        // Removed in 4.0.0
+        httpDataReference.getContentType();
+    }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/src/main/java/datadog/trace/instrumentation/micronaut/v3_0/MicronautInstrumentation.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/src/main/java/datadog/trace/instrumentation/micronaut/v3_0/MicronautInstrumentation.java
index b0fa733d433..cca76c62a69 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/src/main/java/datadog/trace/instrumentation/micronaut/v3_0/MicronautInstrumentation.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/src/main/java/datadog/trace/instrumentation/micronaut/v3_0/MicronautInstrumentation.java
@@ -10,57 +10,56 @@
 
 @AutoService(InstrumenterModule.class)
 public final class MicronautInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public MicronautInstrumentation() {
-    super("micronaut", "micronaut-http-server-netty", "micronaut-http-server-netty-3");
-  }
+    public MicronautInstrumentation() {
+        super("micronaut", "micronaut-http-server-netty", "micronaut-http-server-netty-3");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.micronaut.http.server.netty.RoutingInBoundHandler",
-      "io.micronaut.http.server.RouteExecutor"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.micronaut.http.server.netty.RoutingInBoundHandler", "io.micronaut.http.server.RouteExecutor"
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("channelRead0"))
-            .and(takesArgument(0, named("io.netty.channel.ChannelHandlerContext")))
-            .and(takesArgument(1, named("io.micronaut.http.HttpRequest"))),
-        "datadog.trace.instrumentation.micronaut.ChannelRead0Advice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("channelRead0"))
+                        .and(takesArgument(0, named("io.netty.channel.ChannelHandlerContext")))
+                        .and(takesArgument(1, named("io.micronaut.http.HttpRequest"))),
+                "datadog.trace.instrumentation.micronaut.ChannelRead0Advice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("handleRouteMatch"))
-            .and(takesArgument(0, named("io.micronaut.web.router.RouteMatch")))
-            .and(takesArgument(1, named("io.micronaut.http.server.netty.NettyHttpRequest")))
-            .and(takesArgument(2, named("io.netty.channel.ChannelHandlerContext"))),
-        "datadog.trace.instrumentation.micronaut.HandleRouteMatchAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("handleRouteMatch"))
+                        .and(takesArgument(0, named("io.micronaut.web.router.RouteMatch")))
+                        .and(takesArgument(1, named("io.micronaut.http.server.netty.NettyHttpRequest")))
+                        .and(takesArgument(2, named("io.netty.channel.ChannelHandlerContext"))),
+                "datadog.trace.instrumentation.micronaut.HandleRouteMatchAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("writeFinalNettyResponse"))
-            .and(takesArgument(0, named("io.micronaut.http.MutableHttpResponse")))
-            .and(takesArgument(1, named("io.micronaut.http.HttpRequest")))
-            .and(takesArgument(2, named("io.netty.channel.ChannelHandlerContext"))),
-        "datadog.trace.instrumentation.micronaut.WriteFinalNettyResponseAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("writeFinalNettyResponse"))
+                        .and(takesArgument(0, named("io.micronaut.http.MutableHttpResponse")))
+                        .and(takesArgument(1, named("io.micronaut.http.HttpRequest")))
+                        .and(takesArgument(2, named("io.netty.channel.ChannelHandlerContext"))),
+                "datadog.trace.instrumentation.micronaut.WriteFinalNettyResponseAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("createDefaultErrorResponse"))
-            .and(takesArgument(0, named("io.micronaut.http.HttpRequest")))
-            .and(takesArgument(1, named("java.lang.Throwable"))),
-        packageName + ".CreateDefaultErrorResponseAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("createDefaultErrorResponse"))
+                        .and(takesArgument(0, named("io.micronaut.http.HttpRequest")))
+                        .and(takesArgument(1, named("java.lang.Throwable"))),
+                packageName + ".CreateDefaultErrorResponseAdvice");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.micronaut.MicronautDecorator",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.micronaut.MicronautDecorator",
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/src/test/java/test/TestController.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/src/test/java/test/TestController.java
index 6bb3bf7e3e0..94d83020375 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/src/test/java/test/TestController.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/src/test/java/test/TestController.java
@@ -24,99 +24,84 @@
 
 @Controller("/")
 class TestController {
-  @Get(uri = "/success", produces = MediaType.TEXT_PLAIN)
-  public Mono<String> success() {
-    return HttpServerTest.controller(
-        SUCCESS,
-        new Closure<Mono<String>>(null) {
-          public Mono<String> doCall() {
-            return Mono.just(SUCCESS.getBody());
-          }
+    @Get(uri = "/success", produces = MediaType.TEXT_PLAIN)
+    public Mono<String> success() {
+        return HttpServerTest.controller(SUCCESS, new Closure<Mono<String>>(null) {
+            public Mono<String> doCall() {
+                return Mono.just(SUCCESS.getBody());
+            }
         });
-  }
+    }
 
-  @Get(uri = "/exception", produces = MediaType.TEXT_PLAIN)
-  public Mono<String> exception() {
-    return HttpServerTest.controller(
-        EXCEPTION,
-        new Closure<Mono<String>>(null) {
-          public Mono<String> doCall() throws Exception {
-            throw new Exception(EXCEPTION.getBody());
-          }
+    @Get(uri = "/exception", produces = MediaType.TEXT_PLAIN)
+    public Mono<String> exception() {
+        return HttpServerTest.controller(EXCEPTION, new Closure<Mono<String>>(null) {
+            public Mono<String> doCall() throws Exception {
+                throw new Exception(EXCEPTION.getBody());
+            }
         });
-  }
+    }
 
-  @Get(uri = "/error-status", produces = MediaType.TEXT_PLAIN)
-  public HttpResponse<String> error(final HttpRequest<?> request) {
-    return HttpServerTest.controller(
-        ERROR,
-        new Closure<HttpResponse<String>>(null) {
-          public HttpResponse<String> doCall() {
-            return HttpResponse.serverError(ERROR.getBody());
-          }
+    @Get(uri = "/error-status", produces = MediaType.TEXT_PLAIN)
+    public HttpResponse<String> error(final HttpRequest<?> request) {
+        return HttpServerTest.controller(ERROR, new Closure<HttpResponse<String>>(null) {
+            public HttpResponse<String> doCall() {
+                return HttpResponse.serverError(ERROR.getBody());
+            }
         });
-  }
+    }
 
-  @Get(uri = "/forwarded", produces = MediaType.TEXT_PLAIN)
-  public HttpResponse<String> forwarded(final HttpRequest<?> request) {
-    return HttpServerTest.controller(
-        FORWARDED,
-        new Closure<HttpResponse<String>>(null) {
-          public HttpResponse<String> doCall() {
-            return HttpResponse.ok(
-                request.getHeaders().get("x-forwarded-for", String.class, "unknown"));
-          }
+    @Get(uri = "/forwarded", produces = MediaType.TEXT_PLAIN)
+    public HttpResponse<String> forwarded(final HttpRequest<?> request) {
+        return HttpServerTest.controller(FORWARDED, new Closure<HttpResponse<String>>(null) {
+            public HttpResponse<String> doCall() {
+                return HttpResponse.ok(request.getHeaders().get("x-forwarded-for", String.class, "unknown"));
+            }
         });
-  }
+    }
 
-  @Get(uri = "/redirect", produces = MediaType.TEXT_PLAIN)
-  public MutableHttpResponse<Object> redirect(final HttpRequest<?> request) {
-    return HttpServerTest.controller(
-        REDIRECT,
-        new Closure<MutableHttpResponse<Object>>(null) {
-          public MutableHttpResponse<Object> doCall() {
-            return HttpResponse.status(HttpStatus.valueOf(REDIRECT.getStatus()))
-                .header("location", REDIRECT.getBody());
-          }
+    @Get(uri = "/redirect", produces = MediaType.TEXT_PLAIN)
+    public MutableHttpResponse<Object> redirect(final HttpRequest<?> request) {
+        return HttpServerTest.controller(REDIRECT, new Closure<MutableHttpResponse<Object>>(null) {
+            public MutableHttpResponse<Object> doCall() {
+                return HttpResponse.status(HttpStatus.valueOf(REDIRECT.getStatus()))
+                        .header("location", REDIRECT.getBody());
+            }
         });
-  }
+    }
 
-  @Get(uri = "/path/{id}/param", produces = MediaType.TEXT_PLAIN)
-  public Mono<Integer> path_param(@NotBlank final Integer id) {
-    return HttpServerTest.controller(
-        PATH_PARAM,
-        new Closure<Mono<Integer>>(null) {
-          public Mono<Integer> doCall() {
-            return Mono.just(id);
-          }
+    @Get(uri = "/path/{id}/param", produces = MediaType.TEXT_PLAIN)
+    public Mono<Integer> path_param(@NotBlank final Integer id) {
+        return HttpServerTest.controller(PATH_PARAM, new Closure<Mono<Integer>>(null) {
+            public Mono<Integer> doCall() {
+                return Mono.just(id);
+            }
         });
-  }
+    }
 
-  @Get(uri = "/query", produces = MediaType.TEXT_PLAIN)
-  public HttpResponse<String> query_param(final HttpRequest<?> request) {
-    return handle_query(QUERY_PARAM, request);
-  }
+    @Get(uri = "/query", produces = MediaType.TEXT_PLAIN)
+    public HttpResponse<String> query_param(final HttpRequest<?> request) {
+        return handle_query(QUERY_PARAM, request);
+    }
 
-  @Get(uri = "/encoded_query", produces = MediaType.TEXT_PLAIN)
-  public HttpResponse<String> query_encoded_query(final HttpRequest<?> request) {
-    return handle_query(QUERY_ENCODED_QUERY, request);
-  }
+    @Get(uri = "/encoded_query", produces = MediaType.TEXT_PLAIN)
+    public HttpResponse<String> query_encoded_query(final HttpRequest<?> request) {
+        return handle_query(QUERY_ENCODED_QUERY, request);
+    }
 
-  @Get(uri = "/encoded%20path%20query", produces = MediaType.TEXT_PLAIN)
-  public HttpResponse<String> query_encoded_both(final HttpRequest<?> request) {
-    return handle_query(QUERY_ENCODED_BOTH, request);
-  }
+    @Get(uri = "/encoded%20path%20query", produces = MediaType.TEXT_PLAIN)
+    public HttpResponse<String> query_encoded_both(final HttpRequest<?> request) {
+        return handle_query(QUERY_ENCODED_BOTH, request);
+    }
 
-  private HttpResponse<String> handle_query(
-      final HttpServerTest.ServerEndpoint endpoint, final HttpRequest<?> request) {
-    return HttpServerTest.controller(
-        endpoint,
-        new Closure<HttpResponse<String>>(null) {
-          public HttpResponse<String> doCall() {
-            String query =
-                "some=" + request.getParameters().getFirst("some", String.class).orElse("bad");
-            return HttpResponse.ok(endpoint.bodyForQuery(query));
-          }
+    private HttpResponse<String> handle_query(
+            final HttpServerTest.ServerEndpoint endpoint, final HttpRequest<?> request) {
+        return HttpServerTest.controller(endpoint, new Closure<HttpResponse<String>>(null) {
+            public HttpResponse<String> doCall() {
+                String query = "some="
+                        + request.getParameters().getFirst("some", String.class).orElse("bad");
+                return HttpResponse.ok(endpoint.bodyForQuery(query));
+            }
         });
-  }
+    }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/src/test/java/test/TestFilter.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/src/test/java/test/TestFilter.java
index 1fbe20a53cb..761419360c2 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/src/test/java/test/TestFilter.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/src/test/java/test/TestFilter.java
@@ -11,16 +11,11 @@
 
 @Filter(Filter.MATCH_ALL_PATTERN)
 public class TestFilter implements HttpServerFilter {
-  @Override
-  public Publisher<MutableHttpResponse<?>> doFilter(
-      HttpRequest<?> request, ServerFilterChain chain) {
+    @Override
+    public Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request, ServerFilterChain chain) {
 
-    return Flux.from(chain.proceed(request))
-        .doOnNext(
-            res ->
-                res.getHeaders()
-                    .add(
-                        HttpServerTest.getIG_RESPONSE_HEADER(),
-                        HttpServerTest.getIG_RESPONSE_HEADER_VALUE()));
-  }
+        return Flux.from(chain.proceed(request))
+                .doOnNext(res -> res.getHeaders()
+                        .add(HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE()));
+    }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java/datadog/trace/instrumentation/micronaut/v4_0/MicronautInstrumentation.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java/datadog/trace/instrumentation/micronaut/v4_0/MicronautInstrumentation.java
index 63ab1f9a733..66e8d98c56e 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java/datadog/trace/instrumentation/micronaut/v4_0/MicronautInstrumentation.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java/datadog/trace/instrumentation/micronaut/v4_0/MicronautInstrumentation.java
@@ -13,78 +13,74 @@
 
 @AutoService(InstrumenterModule.class)
 public final class MicronautInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public MicronautInstrumentation() {
-    super("micronaut", "micronaut-http-server-netty", "micronaut-http-server-netty-4");
-  }
+    public MicronautInstrumentation() {
+        super("micronaut", "micronaut-http-server-netty", "micronaut-http-server-netty-4");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.micronaut.http.server.netty.RoutingInBoundHandler",
-      // starting with 4.8.0, encodeHttpResponse methods have been moved from 👆 to 👇
-      "io.micronaut.http.server.ResponseLifecycle",
-      "io.micronaut.http.server.RouteExecutor",
-      "io.micronaut.http.server.netty.NettyRequestLifecycle",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.micronaut.http.server.netty.RoutingInBoundHandler",
+            // starting with 4.8.0, encodeHttpResponse methods have been moved from 👆 to 👇
+            "io.micronaut.http.server.ResponseLifecycle",
+            "io.micronaut.http.server.RouteExecutor",
+            "io.micronaut.http.server.netty.NettyRequestLifecycle",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("handleNormal")).and(takesNoArguments()),
-        packageName + ".ChannelAcceptAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("handleNormal"))
-            .and(takesArgument(0, named("io.micronaut.http.server.netty.NettyHttpRequest"))),
-        packageName + ".ChannelAcceptAdvice2");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("handleNormal")).and(takesNoArguments()), packageName + ".ChannelAcceptAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("handleNormal"))
+                        .and(takesArgument(0, named("io.micronaut.http.server.netty.NettyHttpRequest"))),
+                packageName + ".ChannelAcceptAdvice2");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("findRouteMatch"))
-            .and(takesArgument(0, named("io.micronaut.http.HttpRequest")))
-            .and(returns(named("io.micronaut.web.router.UriRouteMatch"))),
-        packageName + ".HandleRouteMatchAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("findRouteMatch"))
+                        .and(takesArgument(0, named("io.micronaut.http.HttpRequest")))
+                        .and(returns(named("io.micronaut.web.router.UriRouteMatch"))),
+                packageName + ".HandleRouteMatchAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("createDefaultErrorResponse"))
-            .and(takesArgument(0, named("io.micronaut.http.HttpRequest")))
-            .and(takesArgument(1, named("java.lang.Throwable"))),
-        packageName + ".CreateDefaultErrorResponseAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("createDefaultErrorResponse"))
+                        .and(takesArgument(0, named("io.micronaut.http.HttpRequest")))
+                        .and(takesArgument(1, named("java.lang.Throwable"))),
+                packageName + ".CreateDefaultErrorResponseAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("encodeHttpResponse"))
-            .and(takesArgument(1, named("io.micronaut.http.server.netty.NettyHttpRequest")))
-            .and(
-                takesArgument(
-                    2,
-                    namedOneOf(
-                        "io.micronaut.http.MutableHttpResponse",
-                        "io.micronaut.http.HttpResponse"))),
-        packageName + ".EncodeHttpResponseAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("encodeHttpResponse"))
-            .and(takesArgument(0, named("io.micronaut.http.server.netty.NettyHttpRequest")))
-            .and(takesArgument(1, named("io.micronaut.http.HttpResponse"))),
-        packageName + ".EncodeHttpResponseAdvice2");
-    // for micronaut 4.8 onwards
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("encodeHttpResponse"))
-            .and(takesArgument(0, named("io.micronaut.http.HttpRequest")))
-            .and(takesArgument(1, named("io.micronaut.http.HttpResponse"))),
-        packageName + ".EncodeHttpResponseAdvice3");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("encodeHttpResponse"))
+                        .and(takesArgument(1, named("io.micronaut.http.server.netty.NettyHttpRequest")))
+                        .and(takesArgument(
+                                2,
+                                namedOneOf("io.micronaut.http.MutableHttpResponse", "io.micronaut.http.HttpResponse"))),
+                packageName + ".EncodeHttpResponseAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("encodeHttpResponse"))
+                        .and(takesArgument(0, named("io.micronaut.http.server.netty.NettyHttpRequest")))
+                        .and(takesArgument(1, named("io.micronaut.http.HttpResponse"))),
+                packageName + ".EncodeHttpResponseAdvice2");
+        // for micronaut 4.8 onwards
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("encodeHttpResponse"))
+                        .and(takesArgument(0, named("io.micronaut.http.HttpRequest")))
+                        .and(takesArgument(1, named("io.micronaut.http.HttpResponse"))),
+                packageName + ".EncodeHttpResponseAdvice3");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".MicronautDecorator",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".MicronautDecorator",
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/ChannelAcceptAdvice.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/ChannelAcceptAdvice.java
index 498e902b215..3c7e78ad664 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/ChannelAcceptAdvice.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/ChannelAcceptAdvice.java
@@ -13,26 +13,26 @@
 import net.bytebuddy.asm.Advice;
 
 public class ChannelAcceptAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope beginRequest(
-      @Advice.FieldValue("nettyRequest") final NettyHttpRequest request) {
-    final AgentSpan nettySpan = activeSpan();
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope beginRequest(@Advice.FieldValue("nettyRequest") final NettyHttpRequest request) {
+        final AgentSpan nettySpan = activeSpan();
 
-    if (request == null || nettySpan == null) {
-      return null;
-    }
-    final AgentSpan span = startSpan("micronaut-controller", DECORATE.spanName()).setMeasured(true);
-    DECORATE.afterStart(span);
-    request.setAttribute(SPAN_ATTRIBUTE, span);
-    request.setAttribute(PARENT_SPAN_ATTRIBUTE, nettySpan);
+        if (request == null || nettySpan == null) {
+            return null;
+        }
+        final AgentSpan span =
+                startSpan("micronaut-controller", DECORATE.spanName()).setMeasured(true);
+        DECORATE.afterStart(span);
+        request.setAttribute(SPAN_ATTRIBUTE, span);
+        request.setAttribute(PARENT_SPAN_ATTRIBUTE, nettySpan);
 
-    return activateSpan(span);
-  }
+        return activateSpan(span);
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void endRequest(@Advice.Enter final ContextScope scope) {
-    if (scope != null) {
-      scope.close();
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void endRequest(@Advice.Enter final ContextScope scope) {
+        if (scope != null) {
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/ChannelAcceptAdvice2.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/ChannelAcceptAdvice2.java
index ccc86cfa320..c00d502495f 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/ChannelAcceptAdvice2.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/ChannelAcceptAdvice2.java
@@ -13,25 +13,26 @@
 import net.bytebuddy.asm.Advice;
 
 public class ChannelAcceptAdvice2 {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope beginRequest(@Advice.Argument(0) final NettyHttpRequest request) {
-    final AgentSpan nettySpan = activeSpan();
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope beginRequest(@Advice.Argument(0) final NettyHttpRequest request) {
+        final AgentSpan nettySpan = activeSpan();
 
-    if (request == null || nettySpan == null) {
-      return null;
-    }
-    final AgentSpan span = startSpan("micronaut-controller", DECORATE.spanName()).setMeasured(true);
-    DECORATE.afterStart(span);
-    request.setAttribute(SPAN_ATTRIBUTE, span);
-    request.setAttribute(PARENT_SPAN_ATTRIBUTE, nettySpan);
+        if (request == null || nettySpan == null) {
+            return null;
+        }
+        final AgentSpan span =
+                startSpan("micronaut-controller", DECORATE.spanName()).setMeasured(true);
+        DECORATE.afterStart(span);
+        request.setAttribute(SPAN_ATTRIBUTE, span);
+        request.setAttribute(PARENT_SPAN_ATTRIBUTE, nettySpan);
 
-    return activateSpan(span);
-  }
+        return activateSpan(span);
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void endRequest(@Advice.Enter final ContextScope scope) {
-    if (scope != null) {
-      scope.close();
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void endRequest(@Advice.Enter final ContextScope scope) {
+        if (scope != null) {
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/CreateDefaultErrorResponseAdvice.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/CreateDefaultErrorResponseAdvice.java
index 28274d48d5d..59907829e67 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/CreateDefaultErrorResponseAdvice.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/CreateDefaultErrorResponseAdvice.java
@@ -8,14 +8,14 @@
 import net.bytebuddy.asm.Advice;
 
 public class CreateDefaultErrorResponseAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void captureError(
-      @Advice.Argument(0) final HttpRequest httpRequest,
-      @Advice.Argument(1) final Throwable cause) {
-    AgentSpan span = httpRequest.getAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
-    if (null == span) {
-      return;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void captureError(
+            @Advice.Argument(0) final HttpRequest httpRequest, @Advice.Argument(1) final Throwable cause) {
+        AgentSpan span =
+                httpRequest.getAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
+        if (null == span) {
+            return;
+        }
+        DECORATE.onError(span, cause);
     }
-    DECORATE.onError(span, cause);
-  }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice.java
index 8cb199cb8e6..075b9a2bab9 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice.java
@@ -12,19 +12,20 @@
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
 
 public class EncodeHttpResponseAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void finishHandlerSpan(
-      @Advice.Argument(1) final NettyHttpRequest<?> request,
-      @Advice.Argument(value = 2, typing = Assigner.Typing.DYNAMIC) final HttpResponse<?> message) {
-    AgentSpan span = request.removeAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
-    if (null == span) {
-      return;
-    }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void finishHandlerSpan(
+            @Advice.Argument(1) final NettyHttpRequest<?> request,
+            @Advice.Argument(value = 2, typing = Assigner.Typing.DYNAMIC) final HttpResponse<?> message) {
+        AgentSpan span =
+                request.removeAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
+        if (null == span) {
+            return;
+        }
 
-    try (final ContextScope scope = activateSpan(span)) {
-      DECORATE.onResponse(span, message);
-      DECORATE.beforeFinish(span);
-      span.finish();
+        try (final ContextScope scope = activateSpan(span)) {
+            DECORATE.onResponse(span, message);
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice2.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice2.java
index 0b522672828..05907e25046 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice2.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice2.java
@@ -11,19 +11,19 @@
 import net.bytebuddy.asm.Advice;
 
 public class EncodeHttpResponseAdvice2 {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void finishHandlerSpan(
-      @Advice.Argument(0) final NettyHttpRequest<?> request,
-      @Advice.Argument(1) final HttpResponse<?> message) {
-    AgentSpan span = request.removeAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
-    if (null == span) {
-      return;
-    }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void finishHandlerSpan(
+            @Advice.Argument(0) final NettyHttpRequest<?> request, @Advice.Argument(1) final HttpResponse<?> message) {
+        AgentSpan span =
+                request.removeAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
+        if (null == span) {
+            return;
+        }
 
-    try (final ContextScope scope = activateSpan(span)) {
-      DECORATE.onResponse(span, message);
-      DECORATE.beforeFinish(span);
-      span.finish();
+        try (final ContextScope scope = activateSpan(span)) {
+            DECORATE.onResponse(span, message);
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice3.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice3.java
index cd9bfae612a..8da70f5ad2f 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice3.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice3.java
@@ -11,19 +11,19 @@
 import net.bytebuddy.asm.Advice;
 
 public class EncodeHttpResponseAdvice3 {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void finishHandlerSpan(
-      @Advice.Argument(0) final HttpRequest<?> request,
-      @Advice.Argument(1) final HttpResponse<?> message) {
-    AgentSpan span = request.removeAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
-    if (null == span) {
-      return;
-    }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void finishHandlerSpan(
+            @Advice.Argument(0) final HttpRequest<?> request, @Advice.Argument(1) final HttpResponse<?> message) {
+        AgentSpan span =
+                request.removeAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
+        if (null == span) {
+            return;
+        }
 
-    try (final ContextScope scope = activateSpan(span)) {
-      DECORATE.onResponse(span, message);
-      DECORATE.beforeFinish(span);
-      span.finish();
+        try (final ContextScope scope = activateSpan(span)) {
+            DECORATE.onResponse(span, message);
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/HandleRouteMatchAdvice.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/HandleRouteMatchAdvice.java
index 8ca80b25f24..bf4f456ad36 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/HandleRouteMatchAdvice.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/HandleRouteMatchAdvice.java
@@ -10,21 +10,20 @@
 import net.bytebuddy.asm.Advice;
 
 public class HandleRouteMatchAdvice {
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void captureRoute(
-      @Advice.Argument(0) final HttpRequest<?> request,
-      @Advice.Return final UriRouteMatch routeMatch) {
-    if (routeMatch == null) {
-      return;
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void captureRoute(
+            @Advice.Argument(0) final HttpRequest<?> request, @Advice.Return final UriRouteMatch routeMatch) {
+        if (routeMatch == null) {
+            return;
+        }
+        AgentSpan span = request.getAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
+        if (span == null) {
+            return;
+        }
+        final AgentSpan nettySpan =
+                request.getAttribute(PARENT_SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
+        if (nettySpan != null) {
+            DECORATE.onMicronautSpan(span, nettySpan, request, routeMatch);
+        }
     }
-    AgentSpan span = request.getAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
-    if (span == null) {
-      return;
-    }
-    final AgentSpan nettySpan =
-        request.getAttribute(PARENT_SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
-    if (nettySpan != null) {
-      DECORATE.onMicronautSpan(span, nettySpan, request, routeMatch);
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/MicronautDecorator.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/MicronautDecorator.java
index c1197e41f3e..7d8ae11e1da 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/MicronautDecorator.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/MicronautDecorator.java
@@ -12,84 +12,80 @@
 import io.micronaut.http.HttpResponse;
 import io.micronaut.web.router.UriRouteMatch;
 
-public class MicronautDecorator
-    extends HttpServerDecorator<HttpRequest, HttpRequest, HttpResponse, Void> {
-  private static final CharSequence MICRONAUT_CONTROLLER =
-      UTF8BytesString.create("micronaut-controller");
-  public static final String SPAN_ATTRIBUTE = "datadog.trace.instrumentation.micronaut-netty.Span";
-  public static final String PARENT_SPAN_ATTRIBUTE =
-      "datadog.trace.instrumentation.micronaut-netty.ParentSpan";
-
-  public static MicronautDecorator DECORATE = new MicronautDecorator();
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"micronaut"};
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Void> getter() {
-    return null;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
-    return null;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return MICRONAUT_CONTROLLER;
-  }
-
-  @Override
-  protected String method(HttpRequest httpRequest) {
-    return httpRequest.getMethod().name();
-  }
-
-  @Override
-  protected URIDataAdapter url(HttpRequest httpRequest) {
-    return null;
-  }
-
-  @Override
-  protected String peerHostIP(HttpRequest httpRequest) {
-    return null;
-  }
-
-  @Override
-  protected int peerPort(HttpRequest httpRequest) {
-    return 0;
-  }
-
-  @Override
-  protected int status(HttpResponse mutableHttpResponse) {
-    return mutableHttpResponse.getStatus().getCode();
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.HTTP_SERVER;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return MICRONAUT_CONTROLLER;
-  }
-
-  public void onMicronautSpan(
-      final AgentSpan span,
-      final AgentSpan parent,
-      final HttpRequest<?> request,
-      final UriRouteMatch uriRouteMatch) {
-    String route = null;
-    if (uriRouteMatch.getRouteInfo() != null
-        && uriRouteMatch.getRouteInfo().getUriMatchTemplate() != null) {
-      route = uriRouteMatch.getRouteInfo().getUriMatchTemplate().toPathString();
+public class MicronautDecorator extends HttpServerDecorator<HttpRequest, HttpRequest, HttpResponse, Void> {
+    private static final CharSequence MICRONAUT_CONTROLLER = UTF8BytesString.create("micronaut-controller");
+    public static final String SPAN_ATTRIBUTE = "datadog.trace.instrumentation.micronaut-netty.Span";
+    public static final String PARENT_SPAN_ATTRIBUTE = "datadog.trace.instrumentation.micronaut-netty.ParentSpan";
+
+    public static MicronautDecorator DECORATE = new MicronautDecorator();
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"micronaut"};
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Void> getter() {
+        return null;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
+        return null;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return MICRONAUT_CONTROLLER;
+    }
+
+    @Override
+    protected String method(HttpRequest httpRequest) {
+        return httpRequest.getMethod().name();
+    }
+
+    @Override
+    protected URIDataAdapter url(HttpRequest httpRequest) {
+        return null;
     }
-    if (null != route) {
-      HTTP_RESOURCE_DECORATOR.withRoute(parent, request.getMethod().name(), route);
+
+    @Override
+    protected String peerHostIP(HttpRequest httpRequest) {
+        return null;
+    }
+
+    @Override
+    protected int peerPort(HttpRequest httpRequest) {
+        return 0;
+    }
+
+    @Override
+    protected int status(HttpResponse mutableHttpResponse) {
+        return mutableHttpResponse.getStatus().getCode();
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.HTTP_SERVER;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return MICRONAUT_CONTROLLER;
+    }
+
+    public void onMicronautSpan(
+            final AgentSpan span,
+            final AgentSpan parent,
+            final HttpRequest<?> request,
+            final UriRouteMatch uriRouteMatch) {
+        String route = null;
+        if (uriRouteMatch.getRouteInfo() != null && uriRouteMatch.getRouteInfo().getUriMatchTemplate() != null) {
+            route = uriRouteMatch.getRouteInfo().getUriMatchTemplate().toPathString();
+        }
+        if (null != route) {
+            HTTP_RESOURCE_DECORATOR.withRoute(parent, request.getMethod().name(), route);
+        }
+        span.setResourceName(DECORATE.spanNameForMethod(uriRouteMatch.getTargetMethod()));
     }
-    span.setResourceName(DECORATE.spanNameForMethod(uriRouteMatch.getTargetMethod()));
-  }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/test/java/test/TestController.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/test/java/test/TestController.java
index 896979ab07b..65f366f028e 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/test/java/test/TestController.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/test/java/test/TestController.java
@@ -23,99 +23,84 @@
 
 @Controller("/")
 class TestController {
-  @Get(uri = "/success", produces = MediaType.TEXT_PLAIN)
-  public Mono<String> success() {
-    return HttpServerTest.controller(
-        SUCCESS,
-        new Closure<Mono<String>>(null) {
-          public Mono<String> doCall() {
-            return Mono.just(SUCCESS.getBody());
-          }
+    @Get(uri = "/success", produces = MediaType.TEXT_PLAIN)
+    public Mono<String> success() {
+        return HttpServerTest.controller(SUCCESS, new Closure<Mono<String>>(null) {
+            public Mono<String> doCall() {
+                return Mono.just(SUCCESS.getBody());
+            }
         });
-  }
+    }
 
-  @Get(uri = "/exception", produces = MediaType.TEXT_PLAIN)
-  public Mono<String> exception() {
-    return HttpServerTest.controller(
-        EXCEPTION,
-        new Closure<Mono<String>>(null) {
-          public Mono<String> doCall() throws Exception {
-            throw new Exception(EXCEPTION.getBody());
-          }
+    @Get(uri = "/exception", produces = MediaType.TEXT_PLAIN)
+    public Mono<String> exception() {
+        return HttpServerTest.controller(EXCEPTION, new Closure<Mono<String>>(null) {
+            public Mono<String> doCall() throws Exception {
+                throw new Exception(EXCEPTION.getBody());
+            }
         });
-  }
+    }
 
-  @Get(uri = "/error-status", produces = MediaType.TEXT_PLAIN)
-  public HttpResponse<String> error(final HttpRequest<?> request) {
-    return HttpServerTest.controller(
-        ERROR,
-        new Closure<HttpResponse<String>>(null) {
-          public HttpResponse<String> doCall() {
-            return HttpResponse.serverError(ERROR.getBody());
-          }
+    @Get(uri = "/error-status", produces = MediaType.TEXT_PLAIN)
+    public HttpResponse<String> error(final HttpRequest<?> request) {
+        return HttpServerTest.controller(ERROR, new Closure<HttpResponse<String>>(null) {
+            public HttpResponse<String> doCall() {
+                return HttpResponse.serverError(ERROR.getBody());
+            }
         });
-  }
+    }
 
-  @Get(uri = "/forwarded", produces = MediaType.TEXT_PLAIN)
-  public HttpResponse<String> forwarded(final HttpRequest<?> request) {
-    return HttpServerTest.controller(
-        FORWARDED,
-        new Closure<HttpResponse<String>>(null) {
-          public HttpResponse<String> doCall() {
-            return HttpResponse.ok(
-                request.getHeaders().get("x-forwarded-for", String.class, "unknown"));
-          }
+    @Get(uri = "/forwarded", produces = MediaType.TEXT_PLAIN)
+    public HttpResponse<String> forwarded(final HttpRequest<?> request) {
+        return HttpServerTest.controller(FORWARDED, new Closure<HttpResponse<String>>(null) {
+            public HttpResponse<String> doCall() {
+                return HttpResponse.ok(request.getHeaders().get("x-forwarded-for", String.class, "unknown"));
+            }
         });
-  }
+    }
 
-  @Get(uri = "/redirect", produces = MediaType.TEXT_PLAIN)
-  public MutableHttpResponse<Object> redirect(final HttpRequest<?> request) {
-    return HttpServerTest.controller(
-        REDIRECT,
-        new Closure<MutableHttpResponse<Object>>(null) {
-          public MutableHttpResponse<Object> doCall() {
-            return HttpResponse.status(HttpStatus.valueOf(REDIRECT.getStatus()))
-                .header("location", REDIRECT.getBody());
-          }
+    @Get(uri = "/redirect", produces = MediaType.TEXT_PLAIN)
+    public MutableHttpResponse<Object> redirect(final HttpRequest<?> request) {
+        return HttpServerTest.controller(REDIRECT, new Closure<MutableHttpResponse<Object>>(null) {
+            public MutableHttpResponse<Object> doCall() {
+                return HttpResponse.status(HttpStatus.valueOf(REDIRECT.getStatus()))
+                        .header("location", REDIRECT.getBody());
+            }
         });
-  }
+    }
 
-  @Get(uri = "/path/{id}/param", produces = MediaType.TEXT_PLAIN)
-  public Mono<Integer> path_param(final Integer id) {
-    return HttpServerTest.controller(
-        PATH_PARAM,
-        new Closure<Mono<Integer>>(null) {
-          public Mono<Integer> doCall() {
-            return Mono.just(id);
-          }
+    @Get(uri = "/path/{id}/param", produces = MediaType.TEXT_PLAIN)
+    public Mono<Integer> path_param(final Integer id) {
+        return HttpServerTest.controller(PATH_PARAM, new Closure<Mono<Integer>>(null) {
+            public Mono<Integer> doCall() {
+                return Mono.just(id);
+            }
         });
-  }
+    }
 
-  @Get(uri = "/query", produces = MediaType.TEXT_PLAIN)
-  public HttpResponse<String> query_param(final HttpRequest<?> request) {
-    return handle_query(QUERY_PARAM, request);
-  }
+    @Get(uri = "/query", produces = MediaType.TEXT_PLAIN)
+    public HttpResponse<String> query_param(final HttpRequest<?> request) {
+        return handle_query(QUERY_PARAM, request);
+    }
 
-  @Get(uri = "/encoded_query", produces = MediaType.TEXT_PLAIN)
-  public HttpResponse<String> query_encoded_query(final HttpRequest<?> request) {
-    return handle_query(QUERY_ENCODED_QUERY, request);
-  }
+    @Get(uri = "/encoded_query", produces = MediaType.TEXT_PLAIN)
+    public HttpResponse<String> query_encoded_query(final HttpRequest<?> request) {
+        return handle_query(QUERY_ENCODED_QUERY, request);
+    }
 
-  @Get(uri = "/encoded%20path%20query", produces = MediaType.TEXT_PLAIN)
-  public HttpResponse<String> query_encoded_both(final HttpRequest<?> request) {
-    return handle_query(QUERY_ENCODED_BOTH, request);
-  }
+    @Get(uri = "/encoded%20path%20query", produces = MediaType.TEXT_PLAIN)
+    public HttpResponse<String> query_encoded_both(final HttpRequest<?> request) {
+        return handle_query(QUERY_ENCODED_BOTH, request);
+    }
 
-  private HttpResponse<String> handle_query(
-      final HttpServerTest.ServerEndpoint endpoint, final HttpRequest<?> request) {
-    return HttpServerTest.controller(
-        endpoint,
-        new Closure<HttpResponse<String>>(null) {
-          public HttpResponse<String> doCall() {
-            String query =
-                "some=" + request.getParameters().getFirst("some", String.class).orElse("bad");
-            return HttpResponse.ok(endpoint.bodyForQuery(query));
-          }
+    private HttpResponse<String> handle_query(
+            final HttpServerTest.ServerEndpoint endpoint, final HttpRequest<?> request) {
+        return HttpServerTest.controller(endpoint, new Closure<HttpResponse<String>>(null) {
+            public HttpResponse<String> doCall() {
+                String query = "some="
+                        + request.getParameters().getFirst("some", String.class).orElse("bad");
+                return HttpResponse.ok(endpoint.bodyForQuery(query));
+            }
         });
-  }
+    }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/test/java/test/TestFilter.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/test/java/test/TestFilter.java
index 1fbe20a53cb..761419360c2 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/test/java/test/TestFilter.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/test/java/test/TestFilter.java
@@ -11,16 +11,11 @@
 
 @Filter(Filter.MATCH_ALL_PATTERN)
 public class TestFilter implements HttpServerFilter {
-  @Override
-  public Publisher<MutableHttpResponse<?>> doFilter(
-      HttpRequest<?> request, ServerFilterChain chain) {
+    @Override
+    public Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request, ServerFilterChain chain) {
 
-    return Flux.from(chain.proceed(request))
-        .doOnNext(
-            res ->
-                res.getHeaders()
-                    .add(
-                        HttpServerTest.getIG_RESPONSE_HEADER(),
-                        HttpServerTest.getIG_RESPONSE_HEADER_VALUE()));
-  }
+        return Flux.from(chain.proceed(request))
+                .doOnNext(res -> res.getHeaders()
+                        .add(HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE()));
+    }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/ChannelRead0Advice.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/ChannelRead0Advice.java
index 4643d580e9b..8a9d33aaba0 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/ChannelRead0Advice.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/ChannelRead0Advice.java
@@ -13,25 +13,26 @@
 import net.bytebuddy.asm.Advice;
 
 public class ChannelRead0Advice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope beginRequest(@Advice.Argument(1) final HttpRequest<?> request) {
-    final AgentSpan nettySpan = activeSpan();
-    if (null == nettySpan) {
-      // Micronaut-netty uses Netty so there needs to be a Netty span
-      return null;
-    }
-    final AgentSpan span = startSpan("micronaut-controller", DECORATE.spanName()).setMeasured(true);
-    DECORATE.afterStart(span);
-    request.setAttribute(SPAN_ATTRIBUTE, span);
-    request.setAttribute(PARENT_SPAN_ATTRIBUTE, nettySpan);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope beginRequest(@Advice.Argument(1) final HttpRequest<?> request) {
+        final AgentSpan nettySpan = activeSpan();
+        if (null == nettySpan) {
+            // Micronaut-netty uses Netty so there needs to be a Netty span
+            return null;
+        }
+        final AgentSpan span =
+                startSpan("micronaut-controller", DECORATE.spanName()).setMeasured(true);
+        DECORATE.afterStart(span);
+        request.setAttribute(SPAN_ATTRIBUTE, span);
+        request.setAttribute(PARENT_SPAN_ATTRIBUTE, nettySpan);
 
-    return activateSpan(span);
-  }
+        return activateSpan(span);
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void endRequest(@Advice.Enter final ContextScope scope) {
-    if (scope != null) {
-      scope.close();
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void endRequest(@Advice.Enter final ContextScope scope) {
+        if (scope != null) {
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/HandleRouteMatchAdvice.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/HandleRouteMatchAdvice.java
index df55247866d..24dfbafecfe 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/HandleRouteMatchAdvice.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/HandleRouteMatchAdvice.java
@@ -10,17 +10,16 @@
 import net.bytebuddy.asm.Advice;
 
 public class HandleRouteMatchAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void beginRequest(
-      @Advice.Argument(0) final RouteMatch<?> route,
-      @Advice.Argument(1) final NettyHttpRequest<?> request) {
-    AgentSpan span = request.getAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
-    if (null == span) {
-      return;
-    }
-    final AgentSpan nettySpan =
-        request.getAttribute(PARENT_SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void beginRequest(
+            @Advice.Argument(0) final RouteMatch<?> route, @Advice.Argument(1) final NettyHttpRequest<?> request) {
+        AgentSpan span = request.getAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
+        if (null == span) {
+            return;
+        }
+        final AgentSpan nettySpan =
+                request.getAttribute(PARENT_SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
 
-    DECORATE.onMicronautSpan(span, nettySpan, request, route);
-  }
+        DECORATE.onMicronautSpan(span, nettySpan, request, route);
+    }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/MicronautCodeOriginInstrumentation.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/MicronautCodeOriginInstrumentation.java
index 67094a62106..0e49aafb326 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/MicronautCodeOriginInstrumentation.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/MicronautCodeOriginInstrumentation.java
@@ -10,27 +10,26 @@
 @AutoService(InstrumenterModule.class)
 public class MicronautCodeOriginInstrumentation extends CodeOriginInstrumentation {
 
-  public static final String IO_MICRONAUT_HTTP_ANNOTATION = "io.micronaut.http.annotation.";
+    public static final String IO_MICRONAUT_HTTP_ANNOTATION = "io.micronaut.http.annotation.";
 
-  public MicronautCodeOriginInstrumentation() {
-    super("micronaut", "micronaut-span-origin");
-  }
+    public MicronautCodeOriginInstrumentation() {
+        super("micronaut", "micronaut-span-origin");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "micronaut-common";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "micronaut-common";
+    }
 
-  @Override
-  protected Set<String> getAnnotations() {
-    return new HashSet<>(
-        Arrays.asList(
-            IO_MICRONAUT_HTTP_ANNOTATION + "Get",
-            IO_MICRONAUT_HTTP_ANNOTATION + "Post",
-            IO_MICRONAUT_HTTP_ANNOTATION + "Put",
-            IO_MICRONAUT_HTTP_ANNOTATION + "Delete",
-            IO_MICRONAUT_HTTP_ANNOTATION + "Patch",
-            IO_MICRONAUT_HTTP_ANNOTATION + "Head",
-            IO_MICRONAUT_HTTP_ANNOTATION + "Options"));
-  }
+    @Override
+    protected Set<String> getAnnotations() {
+        return new HashSet<>(Arrays.asList(
+                IO_MICRONAUT_HTTP_ANNOTATION + "Get",
+                IO_MICRONAUT_HTTP_ANNOTATION + "Post",
+                IO_MICRONAUT_HTTP_ANNOTATION + "Put",
+                IO_MICRONAUT_HTTP_ANNOTATION + "Delete",
+                IO_MICRONAUT_HTTP_ANNOTATION + "Patch",
+                IO_MICRONAUT_HTTP_ANNOTATION + "Head",
+                IO_MICRONAUT_HTTP_ANNOTATION + "Options"));
+    }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/MicronautDecorator.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/MicronautDecorator.java
index e503ec161b7..3cb978688b5 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/MicronautDecorator.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/MicronautDecorator.java
@@ -14,93 +14,90 @@
 import io.micronaut.web.router.RouteMatch;
 import io.micronaut.web.router.UriRouteMatch;
 
-public class MicronautDecorator
-    extends HttpServerDecorator<HttpRequest, HttpRequest, MutableHttpResponse, Void> {
-  private static final CharSequence MICRONAUT_CONTROLLER =
-      UTF8BytesString.create("micronaut-controller");
-  public static final String SPAN_ATTRIBUTE = "datadog.trace.instrumentation.micronaut-netty.Span";
-  public static final String PARENT_SPAN_ATTRIBUTE =
-      "datadog.trace.instrumentation.micronaut-netty.ParentSpan";
-
-  public static MicronautDecorator DECORATE = new MicronautDecorator();
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"micronaut"};
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Void> getter() {
-    return null;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<MutableHttpResponse> responseGetter() {
-    return null;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return MICRONAUT_CONTROLLER;
-  }
-
-  @Override
-  protected String method(HttpRequest httpRequest) {
-    return httpRequest.getMethod().name();
-  }
-
-  @Override
-  protected URIDataAdapter url(HttpRequest httpRequest) {
-    return null;
-  }
-
-  @Override
-  protected String peerHostIP(HttpRequest httpRequest) {
-    return null;
-  }
-
-  @Override
-  protected int peerPort(HttpRequest httpRequest) {
-    return 0;
-  }
-
-  @Override
-  protected int status(MutableHttpResponse mutableHttpResponse) {
-    return mutableHttpResponse.getStatus().getCode();
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.HTTP_SERVER;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return MICRONAUT_CONTROLLER;
-  }
-
-  public void onMicronautSpan(
-      final AgentSpan span,
-      final AgentSpan parent,
-      final HttpRequest<?> request,
-      final RouteMatch<?> routeMatch) {
-    CharSequence resourceName;
-    String route = null;
-
-    if (routeMatch instanceof UriRouteMatch) {
-      UriRouteMatch uriRouteMatch = (UriRouteMatch) routeMatch;
-      resourceName = DECORATE.spanNameForMethod(uriRouteMatch.getTargetMethod());
-      route = uriRouteMatch.getRoute().getUriMatchTemplate().toPathString();
-    } else if (routeMatch instanceof MethodBasedRouteMatch) {
-      MethodBasedRouteMatch methodBasedRouteMatch = (MethodBasedRouteMatch) routeMatch;
-      resourceName = DECORATE.spanNameForMethod(methodBasedRouteMatch.getTargetMethod());
-    } else {
-      resourceName = DECORATE.className(routeMatch.getDeclaringType());
+public class MicronautDecorator extends HttpServerDecorator<HttpRequest, HttpRequest, MutableHttpResponse, Void> {
+    private static final CharSequence MICRONAUT_CONTROLLER = UTF8BytesString.create("micronaut-controller");
+    public static final String SPAN_ATTRIBUTE = "datadog.trace.instrumentation.micronaut-netty.Span";
+    public static final String PARENT_SPAN_ATTRIBUTE = "datadog.trace.instrumentation.micronaut-netty.ParentSpan";
+
+    public static MicronautDecorator DECORATE = new MicronautDecorator();
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"micronaut"};
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Void> getter() {
+        return null;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<MutableHttpResponse> responseGetter() {
+        return null;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return MICRONAUT_CONTROLLER;
+    }
+
+    @Override
+    protected String method(HttpRequest httpRequest) {
+        return httpRequest.getMethod().name();
+    }
+
+    @Override
+    protected URIDataAdapter url(HttpRequest httpRequest) {
+        return null;
+    }
+
+    @Override
+    protected String peerHostIP(HttpRequest httpRequest) {
+        return null;
+    }
+
+    @Override
+    protected int peerPort(HttpRequest httpRequest) {
+        return 0;
+    }
+
+    @Override
+    protected int status(MutableHttpResponse mutableHttpResponse) {
+        return mutableHttpResponse.getStatus().getCode();
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.HTTP_SERVER;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return MICRONAUT_CONTROLLER;
     }
 
-    if (null != route) {
-      HTTP_RESOURCE_DECORATOR.withRoute(parent, request.getMethod().name(), route);
+    public void onMicronautSpan(
+            final AgentSpan span,
+            final AgentSpan parent,
+            final HttpRequest<?> request,
+            final RouteMatch<?> routeMatch) {
+        CharSequence resourceName;
+        String route = null;
+
+        if (routeMatch instanceof UriRouteMatch) {
+            UriRouteMatch uriRouteMatch = (UriRouteMatch) routeMatch;
+            resourceName = DECORATE.spanNameForMethod(uriRouteMatch.getTargetMethod());
+            route = uriRouteMatch.getRoute().getUriMatchTemplate().toPathString();
+        } else if (routeMatch instanceof MethodBasedRouteMatch) {
+            MethodBasedRouteMatch methodBasedRouteMatch = (MethodBasedRouteMatch) routeMatch;
+            resourceName = DECORATE.spanNameForMethod(methodBasedRouteMatch.getTargetMethod());
+        } else {
+            resourceName = DECORATE.className(routeMatch.getDeclaringType());
+        }
+
+        if (null != route) {
+            HTTP_RESOURCE_DECORATOR.withRoute(parent, request.getMethod().name(), route);
+        }
+        span.setResourceName(resourceName);
     }
-    span.setResourceName(resourceName);
-  }
 }
diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/WriteFinalNettyResponseAdvice.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/WriteFinalNettyResponseAdvice.java
index 002c8f18335..e69b61eb014 100644
--- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/WriteFinalNettyResponseAdvice.java
+++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/WriteFinalNettyResponseAdvice.java
@@ -10,19 +10,19 @@
 import net.bytebuddy.asm.Advice;
 
 public class WriteFinalNettyResponseAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void beginRequest(
-      @Advice.Argument(0) final MutableHttpResponse<?> message,
-      @Advice.Argument(1) final HttpRequest<?> request) {
-    AgentSpan span = request.getAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
-    if (null == span) {
-      return;
-    }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void beginRequest(
+            @Advice.Argument(0) final MutableHttpResponse<?> message,
+            @Advice.Argument(1) final HttpRequest<?> request) {
+        AgentSpan span = request.getAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
+        if (null == span) {
+            return;
+        }
 
-    try (final ContextScope scope = span.attachWithContext()) {
-      DECORATE.onResponse(span, message);
-      DECORATE.beforeFinish(scope.context());
-      span.finish();
+        try (final ContextScope scope = span.attachWithContext()) {
+            DECORATE.onResponse(span, message);
+            DECORATE.beforeFinish(scope.context());
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber.java b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber.java
index c0227475548..a76370643ec 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber.java
@@ -4,9 +4,9 @@
 
 /** A shared interface for the bson scrubbers used in the mongo instrumentations */
 public interface BsonScrubber extends AutoCloseable {
-  void pipe(BsonReader reader);
+    void pipe(BsonReader reader);
 
-  void close();
+    void close();
 
-  String getResourceName();
+    String getResourceName();
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/Context.java b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/Context.java
index 6dd632e0018..bd3cd5a1346 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/Context.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/Context.java
@@ -2,118 +2,118 @@
 
 final class Context {
 
-  private static final int MAX_DEPTH = 64;
-  private static final int MAX_SEQUENCE_LENGTH = 256;
+    private static final int MAX_DEPTH = 64;
+    private static final int MAX_SEQUENCE_LENGTH = 256;
 
-  private final StringBuilder buffer = new StringBuilder();
+    private final StringBuilder buffer = new StringBuilder();
 
-  // specifies the depth below which everything must be discarded,
-  // e.g. because we're inside an $in clause we want to collapse
-  private int discardDepth = MAX_DEPTH;
-  private int keepDepth = MAX_DEPTH;
-  private int depth;
+    // specifies the depth below which everything must be discarded,
+    // e.g. because we're inside an $in clause we want to collapse
+    private int discardDepth = MAX_DEPTH;
+    private int keepDepth = MAX_DEPTH;
+    private int depth;
 
-  // tracks sequence element counts at each depth level to limit long arrays
-  private final int[] sequenceCounts = new int[MAX_DEPTH];
+    // tracks sequence element counts at each depth level to limit long arrays
+    private final int[] sequenceCounts = new int[MAX_DEPTH];
 
-  public void discardSubTree() {
-    if (depth < discardDepth) {
-      this.discardDepth = depth;
+    public void discardSubTree() {
+        if (depth < discardDepth) {
+            this.discardDepth = depth;
+        }
     }
-  }
 
-  public void keepSubTree() {
-    if (depth < keepDepth) {
-      this.keepDepth = depth;
+    public void keepSubTree() {
+        if (depth < keepDepth) {
+            this.keepDepth = depth;
+        }
     }
-  }
 
-  public void startDocument() {
-    ++depth;
-  }
-
-  public void endDocument() {
-    --depth;
-    if (discardDepth == depth) {
-      discardDepth = MAX_DEPTH;
+    public void startDocument() {
+        ++depth;
     }
-    if (keepDepth == depth) {
-      keepDepth = MAX_DEPTH;
+
+    public void endDocument() {
+        --depth;
+        if (discardDepth == depth) {
+            discardDepth = MAX_DEPTH;
+        }
+        if (keepDepth == depth) {
+            keepDepth = MAX_DEPTH;
+        }
     }
-  }
 
-  public void startArray() {
-    if (depth < MAX_DEPTH) {
-      sequenceCounts[depth] = 0;
+    public void startArray() {
+        if (depth < MAX_DEPTH) {
+            sequenceCounts[depth] = 0;
+        }
+        // note: nothing to do at the end of the array
     }
-    // note: nothing to do at the end of the array
-  }
 
-  /**
-   * Signals that a new element is being processed in the current array. Returns true if this
-   * element should be written, false if the sequence limit has been reached.
-   */
-  public boolean nextSequenceElement() {
-    // checking depth just to make sure we don't access the array out of bounds, but it should never
-    // be the case since we stop processing the document before reaching this code.
-    if (depth < MAX_DEPTH) {
-      sequenceCounts[depth]++;
-      return sequenceCounts[depth] <= MAX_SEQUENCE_LENGTH;
+    /**
+     * Signals that a new element is being processed in the current array. Returns true if this
+     * element should be written, false if the sequence limit has been reached.
+     */
+    public boolean nextSequenceElement() {
+        // checking depth just to make sure we don't access the array out of bounds, but it should never
+        // be the case since we stop processing the document before reaching this code.
+        if (depth < MAX_DEPTH) {
+            sequenceCounts[depth]++;
+            return sequenceCounts[depth] <= MAX_SEQUENCE_LENGTH;
+        }
+        return false; // theoretically unreachable
     }
-    return false; // theoretically unreachable
-  }
 
-  public boolean disableObfuscation() {
-    return depth > keepDepth;
-  }
+    public boolean disableObfuscation() {
+        return depth > keepDepth;
+    }
 
-  public boolean ignoreSubTree() {
-    return depth > discardDepth;
-  }
+    public boolean ignoreSubTree() {
+        return depth > discardDepth;
+    }
 
-  private boolean tooDeep() {
-    // this means we are parsing a huge document, which we will truncate anyway
-    // note that MongoDB sets a default max nested depth of 100, and MongoDB users
-    // are generally advised to avoid deep nesting for the sake of database performance
-    return depth >= MAX_DEPTH;
-  }
+    private boolean tooDeep() {
+        // this means we are parsing a huge document, which we will truncate anyway
+        // note that MongoDB sets a default max nested depth of 100, and MongoDB users
+        // are generally advised to avoid deep nesting for the sake of database performance
+        return depth >= MAX_DEPTH;
+    }
 
-  private boolean shouldWrite() {
-    return !tooDeep() && (depth > keepDepth || depth < discardDepth + 1);
-  }
+    private boolean shouldWrite() {
+        return !tooDeep() && (depth > keepDepth || depth < discardDepth + 1);
+    }
 
-  public void write(char symbol) {
-    if (shouldWrite()) {
-      buffer.append(symbol);
+    public void write(char symbol) {
+        if (shouldWrite()) {
+            buffer.append(symbol);
+        }
     }
-  }
 
-  public void write(long number) {
-    if (shouldWrite()) {
-      buffer.append(number);
+    public void write(long number) {
+        if (shouldWrite()) {
+            buffer.append(number);
+        }
     }
-  }
 
-  public void write(boolean value) {
-    if (shouldWrite()) {
-      buffer.append(value);
+    public void write(boolean value) {
+        if (shouldWrite()) {
+            buffer.append(value);
+        }
     }
-  }
 
-  public void write(String string) {
-    if (shouldWrite()) {
-      buffer.append(string);
+    public void write(String string) {
+        if (shouldWrite()) {
+            buffer.append(string);
+        }
     }
-  }
 
-  public void clear() {
-    buffer.setLength(0);
-    depth = 0;
-    discardDepth = MAX_DEPTH;
-    keepDepth = MAX_DEPTH;
-  }
+    public void clear() {
+        buffer.setLength(0);
+        depth = 0;
+        discardDepth = MAX_DEPTH;
+        keepDepth = MAX_DEPTH;
+    }
 
-  public String asString() {
-    return buffer.toString();
-  }
+    public String asString() {
+        return buffer.toString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java
index c5e7f366a13..c065fae8902 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java
@@ -28,160 +28,156 @@
 import org.bson.ByteBuf;
 
 public final class MongoCommandListener implements CommandListener {
-  public static final class SpanEntry {
-    public final AgentSpan span;
+    public static final class SpanEntry {
+        public final AgentSpan span;
 
-    public SpanEntry(AgentSpan span) {
-      this.span = span;
+        public SpanEntry(AgentSpan span) {
+            this.span = span;
+        }
+
+        @Override
+        public String toString() {
+            return "SpanEntry{" + "span=" + span + '}';
+        }
     }
 
-    @Override
-    public String toString() {
-      return "SpanEntry{" + "span=" + span + '}';
+    private static final DDCache<String, UTF8BytesString> COMMAND_NAMES = DDCaches.newUnboundedCache(16);
+
+    private final Map<Integer, SpanEntry> spanMap = new ConcurrentHashMap<>();
+    private final ContextStore<BsonDocument, ByteBuf> byteBufAccessor;
+    private final MongoDecorator decorator;
+    private final ContextStore<ConnectionDescription, CommandListener> listenerAccessor;
+    private volatile String applicationName;
+    private final int priority;
+
+    public MongoCommandListener(int priority, MongoDecorator decorator) {
+        this(priority, decorator, null, null);
     }
-  }
-
-  private static final DDCache<String, UTF8BytesString> COMMAND_NAMES =
-      DDCaches.newUnboundedCache(16);
-
-  private final Map<Integer, SpanEntry> spanMap = new ConcurrentHashMap<>();
-  private final ContextStore<BsonDocument, ByteBuf> byteBufAccessor;
-  private final MongoDecorator decorator;
-  private final ContextStore<ConnectionDescription, CommandListener> listenerAccessor;
-  private volatile String applicationName;
-  private final int priority;
-
-  public MongoCommandListener(int priority, MongoDecorator decorator) {
-    this(priority, decorator, null, null);
-  }
-
-  public MongoCommandListener(
-      int priority,
-      MongoDecorator decorator,
-      ContextStore<BsonDocument, ByteBuf> byteBufAccessor,
-      ContextStore<ConnectionDescription, CommandListener> listenerAccessor) {
-    this.priority = priority;
-    this.decorator = decorator;
-    this.byteBufAccessor = byteBufAccessor;
-    this.listenerAccessor = listenerAccessor;
-  }
-
-  public void setApplicationName(final String applicationName) {
-    this.applicationName = applicationName;
-  }
-
-  /**
-   * Provides an effective 'instrumentation layering'. A listener with the higher priority will
-   * replace any previously registered instance. Likewise, a listener with a lower priority will
-   * never be registered over the one with higher priority.
-   *
-   * @return a relative priority number
-   */
-  public int getPriority() {
-    return priority;
-  }
-
-  /**
-   * A convenience method to register a listener instance and obeying the priority. There will ever
-   * only be 1 MongoCommandListener in the List of listeners.
-   *
-   * @param listener the instance to register
-   * @param listeners the existing collection of listeners
-   * @return the registered instance or {@literal null}
-   */
-  public static MongoCommandListener tryRegister(
-      MongoCommandListener listener, List<CommandListener> listeners) {
-    // Short circuit if the list is empty. Extra code > extra objects
-    if (listeners.isEmpty()) {
-      listeners.add(listener);
-      return listener;
+
+    public MongoCommandListener(
+            int priority,
+            MongoDecorator decorator,
+            ContextStore<BsonDocument, ByteBuf> byteBufAccessor,
+            ContextStore<ConnectionDescription, CommandListener> listenerAccessor) {
+        this.priority = priority;
+        this.decorator = decorator;
+        this.byteBufAccessor = byteBufAccessor;
+        this.listenerAccessor = listenerAccessor;
+    }
+
+    public void setApplicationName(final String applicationName) {
+        this.applicationName = applicationName;
     }
 
-    ListIterator<CommandListener> iterator = listeners.listIterator();
-    while (iterator.hasNext()) {
-      CommandListener current = iterator.next();
-      if (current instanceof MongoCommandListener) {
-        if (((MongoCommandListener) current).getPriority() < listener.getPriority()) {
-          // Remove the lower priority MongoCommandListener
-          iterator.remove();
-          listeners.add(listener);
-          return listener;
-        } else {
-          // Ignore this listener since there is a higher priority MongoCommandListener
-          return null;
+    /**
+     * Provides an effective 'instrumentation layering'. A listener with the higher priority will
+     * replace any previously registered instance. Likewise, a listener with a lower priority will
+     * never be registered over the one with higher priority.
+     *
+     * @return a relative priority number
+     */
+    public int getPriority() {
+        return priority;
+    }
+
+    /**
+     * A convenience method to register a listener instance and obeying the priority. There will ever
+     * only be 1 MongoCommandListener in the List of listeners.
+     *
+     * @param listener the instance to register
+     * @param listeners the existing collection of listeners
+     * @return the registered instance or {@literal null}
+     */
+    public static MongoCommandListener tryRegister(MongoCommandListener listener, List<CommandListener> listeners) {
+        // Short circuit if the list is empty. Extra code > extra objects
+        if (listeners.isEmpty()) {
+            listeners.add(listener);
+            return listener;
+        }
+
+        ListIterator<CommandListener> iterator = listeners.listIterator();
+        while (iterator.hasNext()) {
+            CommandListener current = iterator.next();
+            if (current instanceof MongoCommandListener) {
+                if (((MongoCommandListener) current).getPriority() < listener.getPriority()) {
+                    // Remove the lower priority MongoCommandListener
+                    iterator.remove();
+                    listeners.add(listener);
+                    return listener;
+                } else {
+                    // Ignore this listener since there is a higher priority MongoCommandListener
+                    return null;
+                }
+            }
         }
-      }
+
+        // This is the first MongoCommandListener so add it
+        listeners.add(listener);
+        return listener;
     }
 
-    // This is the first MongoCommandListener so add it
-    listeners.add(listener);
-    return listener;
-  }
+    @Override
+    public void commandStarted(final CommandStartedEvent event) {
+        if (listenerAccessor != null) {
+            listenerAccessor.getOrPut(event.getConnectionDescription(), this);
+        }
+
+        // If DBM comment injection is enabled, the span is created on the connection instrumentation
+        // this is required because the comment injection needs to happen before the command is sent
+        AgentSpan span = activeSpan();
+        boolean shouldForceCloseSpanScope = true;
+        if (span == null || span.getSpanName() != MongoDecorator.OPERATION_NAME) {
+            span = startSpan("java-mongo", MongoDecorator.OPERATION_NAME);
+            shouldForceCloseSpanScope = false;
+        }
+
+        try (final ContextScope scope = activateSpan(span)) {
+            decorator.afterStart(span);
+            decorator.onConnection(span, event);
+            // overlay Mongo application name if we have it (replaces the deprecated cluster description)
+            if (applicationName != null) {
+                span.setTag(Tags.DB_INSTANCE, applicationName);
+                if (Config.get().isDbClientSplitByInstance()) {
+                    span.setServiceName(applicationName, decorator.component());
+                }
+            }
+            if (event.getConnectionDescription() != null
+                    && event.getConnectionDescription().getServerAddress() != null) {
+                // cannot use onPeerConnection because ServerAddress.getSocketAddress()
+                // may do a DNS lookup
+                ServerAddress serverAddress = event.getConnectionDescription().getServerAddress();
+                span.setTag(Tags.PEER_HOSTNAME, serverAddress.getHost())
+                        .setTag(Tags.PEER_PORT, serverAddress.getPort())
+                        .setTag(Tags.DB_OPERATION, COMMAND_NAMES.computeIfAbsent(event.getCommandName(), UTF8_ENCODE));
+            }
+            decorator.onStatement(span, event.getCommand(), byteBufAccessor);
+            spanMap.put(event.getRequestId(), new SpanEntry(span));
+
+            if (shouldForceCloseSpanScope) {
+                closeActive();
+            }
+        }
+    }
 
-  @Override
-  public void commandStarted(final CommandStartedEvent event) {
-    if (listenerAccessor != null) {
-      listenerAccessor.getOrPut(event.getConnectionDescription(), this);
+    @Override
+    public void commandSucceeded(final CommandSucceededEvent event) {
+        finishSpan(event.getRequestId(), null);
     }
 
-    // If DBM comment injection is enabled, the span is created on the connection instrumentation
-    // this is required because the comment injection needs to happen before the command is sent
-    AgentSpan span = activeSpan();
-    boolean shouldForceCloseSpanScope = true;
-    if (span == null || span.getSpanName() != MongoDecorator.OPERATION_NAME) {
-      span = startSpan("java-mongo", MongoDecorator.OPERATION_NAME);
-      shouldForceCloseSpanScope = false;
+    @Override
+    public void commandFailed(final CommandFailedEvent event) {
+        finishSpan(event.getRequestId(), event.getThrowable());
     }
 
-    try (final ContextScope scope = activateSpan(span)) {
-      decorator.afterStart(span);
-      decorator.onConnection(span, event);
-      // overlay Mongo application name if we have it (replaces the deprecated cluster description)
-      if (applicationName != null) {
-        span.setTag(Tags.DB_INSTANCE, applicationName);
-        if (Config.get().isDbClientSplitByInstance()) {
-          span.setServiceName(applicationName, decorator.component());
+    private void finishSpan(int requestId, Throwable t) {
+        final SpanEntry entry = spanMap.remove(requestId);
+        final AgentSpan span = entry != null ? entry.span : null;
+        if (span != null) {
+            if (t != null) {
+                decorator.onError(span, t);
+            }
+            decorator.beforeFinish(span);
+            span.finish();
         }
-      }
-      if (event.getConnectionDescription() != null
-          && event.getConnectionDescription().getServerAddress() != null) {
-        // cannot use onPeerConnection because ServerAddress.getSocketAddress()
-        // may do a DNS lookup
-        ServerAddress serverAddress = event.getConnectionDescription().getServerAddress();
-        span.setTag(Tags.PEER_HOSTNAME, serverAddress.getHost())
-            .setTag(Tags.PEER_PORT, serverAddress.getPort())
-            .setTag(
-                Tags.DB_OPERATION,
-                COMMAND_NAMES.computeIfAbsent(event.getCommandName(), UTF8_ENCODE));
-      }
-      decorator.onStatement(span, event.getCommand(), byteBufAccessor);
-      spanMap.put(event.getRequestId(), new SpanEntry(span));
-
-      if (shouldForceCloseSpanScope) {
-        closeActive();
-      }
-    }
-  }
-
-  @Override
-  public void commandSucceeded(final CommandSucceededEvent event) {
-    finishSpan(event.getRequestId(), null);
-  }
-
-  @Override
-  public void commandFailed(final CommandFailedEvent event) {
-    finishSpan(event.getRequestId(), event.getThrowable());
-  }
-
-  private void finishSpan(int requestId, Throwable t) {
-    final SpanEntry entry = spanMap.remove(requestId);
-    final AgentSpan span = entry != null ? entry.span : null;
-    if (span != null) {
-      if (t != null) {
-        decorator.onError(span, t);
-      }
-      decorator.beforeFinish(span);
-      span.finish();
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommentInjector.java b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommentInjector.java
index 0e268d07a68..3ef18220369 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommentInjector.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommentInjector.java
@@ -19,97 +19,97 @@
  * and merging for MongoDB BSON commands.
  */
 public class MongoCommentInjector {
-  private static final Logger log = LoggerFactory.getLogger(MongoCommentInjector.class);
+    private static final Logger log = LoggerFactory.getLogger(MongoCommentInjector.class);
 
-  public static final boolean INJECT_COMMENT = Config.get().isDbmCommentInjectionEnabled();
+    public static final boolean INJECT_COMMENT = Config.get().isDbmCommentInjectionEnabled();
 
-  /** Main entry point for MongoDB command comment injection */
-  public static BsonDocument injectComment(String dbmComment, BsonDocument originalBsonDocument) {
-    if (!INJECT_COMMENT) {
-      return originalBsonDocument;
-    }
-
-    BsonDocument command = originalBsonDocument;
-    if (!originalBsonDocument.getClass().equals(BsonDocument.class)) {
-      // Create a mutable copy by constructing a new BsonDocument and copying all entries
-      // This handles both regular BsonDocument and immutable RawBsonDocument/ByteBufBsonDocument
-      command = new BsonDocument();
-      command.putAll(originalBsonDocument);
-    }
+    /** Main entry point for MongoDB command comment injection */
+    public static BsonDocument injectComment(String dbmComment, BsonDocument originalBsonDocument) {
+        if (!INJECT_COMMENT) {
+            return originalBsonDocument;
+        }
 
-    try {
-      for (String commentKey : new String[] {"comment", "$comment"}) {
-        if (command.containsKey(commentKey)) {
-          BsonValue merged = mergeComment(command.get(commentKey), dbmComment);
-          command.put(commentKey, merged);
-          return command;
+        BsonDocument command = originalBsonDocument;
+        if (!originalBsonDocument.getClass().equals(BsonDocument.class)) {
+            // Create a mutable copy by constructing a new BsonDocument and copying all entries
+            // This handles both regular BsonDocument and immutable RawBsonDocument/ByteBufBsonDocument
+            command = new BsonDocument();
+            command.putAll(originalBsonDocument);
         }
-      }
-
-      // No existing comment found, default to adding a "comment" field
-      command.put("comment", new BsonString(dbmComment));
-      return command;
-    } catch (Exception e) {
-      log.warn(
-          "Linking Database Monitoring profiles to spans is not supported for the following query type: {}. "
-              + "To disable this feature please set the following environment variable: DD_DBM_PROPAGATION_MODE=disabled",
-          originalBsonDocument.getClass().getSimpleName());
-      return originalBsonDocument;
-    }
-  }
 
-  /** Build comment content using SharedDBCommenter */
-  public static String buildComment(AgentSpan dbSpan, String hostname, String dbName) {
-    if (!INJECT_COMMENT) {
-      return null;
+        try {
+            for (String commentKey : new String[] {"comment", "$comment"}) {
+                if (command.containsKey(commentKey)) {
+                    BsonValue merged = mergeComment(command.get(commentKey), dbmComment);
+                    command.put(commentKey, merged);
+                    return command;
+                }
+            }
+
+            // No existing comment found, default to adding a "comment" field
+            command.put("comment", new BsonString(dbmComment));
+            return command;
+        } catch (Exception e) {
+            log.warn(
+                    "Linking Database Monitoring profiles to spans is not supported for the following query type: {}. "
+                            + "To disable this feature please set the following environment variable: DD_DBM_PROPAGATION_MODE=disabled",
+                    originalBsonDocument.getClass().getSimpleName());
+            return originalBsonDocument;
+        }
     }
 
-    if (dbSpan.forceSamplingDecision() == null) {
-      return null;
-    }
+    /** Build comment content using SharedDBCommenter */
+    public static String buildComment(AgentSpan dbSpan, String hostname, String dbName) {
+        if (!INJECT_COMMENT) {
+            return null;
+        }
 
-    // Set the DBM trace injected tag
-    dbSpan.setTag(DBM_TRACE_INJECTED, true);
+        if (dbSpan.forceSamplingDecision() == null) {
+            return null;
+        }
 
-    // Extract connection details
-    String dbService = dbSpan.getServiceName();
-    String traceParent =
-        Config.get().getDbmPropagationMode().equals(DBM_PROPAGATION_MODE_FULL)
-            ? W3CTraceParent.from(dbSpan)
-            : null;
+        // Set the DBM trace injected tag
+        dbSpan.setTag(DBM_TRACE_INJECTED, true);
 
-    // Use shared comment builder directly
-    return SharedDBCommenter.buildComment(dbService, "mongodb", hostname, dbName, traceParent);
-  }
+        // Extract connection details
+        String dbService = dbSpan.getServiceName();
+        String traceParent = Config.get().getDbmPropagationMode().equals(DBM_PROPAGATION_MODE_FULL)
+                ? W3CTraceParent.from(dbSpan)
+                : null;
 
-  /** Merge comment with existing comment values */
-  private static BsonValue mergeComment(BsonValue existingComment, String dbmComment) {
-    if (existingComment == null) {
-      return new BsonString(dbmComment);
+        // Use shared comment builder directly
+        return SharedDBCommenter.buildComment(dbService, "mongodb", hostname, dbName, traceParent);
     }
 
-    if (existingComment.isString()) {
-      String existingStr = existingComment.asString().getValue();
-      if (SharedDBCommenter.containsTraceComment(existingStr)) {
-        return existingComment; // Already has trace comment, avoid duplication
-      }
-      // String concatenation with comma separator
-      return new BsonString(existingStr + "," + dbmComment);
-    } else if (existingComment.isArray()) {
-      BsonArray commentArray = existingComment.asArray().clone();
-      // Check if any array element already contains trace comment
-      for (BsonValue element : commentArray) {
-        if (element.isString()
-            && SharedDBCommenter.containsTraceComment(element.asString().getValue())) {
-          return existingComment; // Already has trace comment, avoid duplication
+    /** Merge comment with existing comment values */
+    private static BsonValue mergeComment(BsonValue existingComment, String dbmComment) {
+        if (existingComment == null) {
+            return new BsonString(dbmComment);
         }
-      }
-      // Append to existing array
-      commentArray.add(new BsonString(dbmComment));
-      return commentArray;
-    }
 
-    // Incompatible type, preserve existing comment unchanged
-    return existingComment;
-  }
+        if (existingComment.isString()) {
+            String existingStr = existingComment.asString().getValue();
+            if (SharedDBCommenter.containsTraceComment(existingStr)) {
+                return existingComment; // Already has trace comment, avoid duplication
+            }
+            // String concatenation with comma separator
+            return new BsonString(existingStr + "," + dbmComment);
+        } else if (existingComment.isArray()) {
+            BsonArray commentArray = existingComment.asArray().clone();
+            // Check if any array element already contains trace comment
+            for (BsonValue element : commentArray) {
+                if (element.isString()
+                        && SharedDBCommenter.containsTraceComment(
+                                element.asString().getValue())) {
+                    return existingComment; // Already has trace comment, avoid duplication
+                }
+            }
+            // Append to existing array
+            commentArray.add(new BsonString(dbmComment));
+            return commentArray;
+        }
+
+        // Incompatible type, preserve existing comment unchanged
+        return existingComment;
+    }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator.java b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator.java
index 2f882c1ac47..4f621baa551 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator.java
@@ -18,104 +18,101 @@
 import org.bson.BsonDocumentReader;
 import org.bson.ByteBuf;
 
-public abstract class MongoDecorator
-    extends DBTypeProcessingDatabaseClientDecorator<CommandStartedEvent> {
-  private static final String DB_TYPE =
-      SpanNaming.instance().namingSchema().database().normalizedName("mongo");
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().database().service(DB_TYPE);
-  public static final UTF8BytesString OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
+public abstract class MongoDecorator extends DBTypeProcessingDatabaseClientDecorator<CommandStartedEvent> {
+    private static final String DB_TYPE =
+            SpanNaming.instance().namingSchema().database().normalizedName("mongo");
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().database().service(DB_TYPE);
+    public static final UTF8BytesString OPERATION_NAME = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
 
-  @Override
-  protected final String[] instrumentationNames() {
-    return new String[] {"mongo"};
-  }
-
-  @Override
-  protected final String service() {
-    return SERVICE_NAME;
-  }
+    @Override
+    protected final String[] instrumentationNames() {
+        return new String[] {"mongo"};
+    }
 
-  @Override
-  protected final CharSequence component() {
-    return "java-mongo";
-  }
+    @Override
+    protected final String service() {
+        return SERVICE_NAME;
+    }
 
-  @Override
-  protected final CharSequence spanType() {
-    return InternalSpanTypes.MONGO;
-  }
+    @Override
+    protected final CharSequence component() {
+        return "java-mongo";
+    }
 
-  @Override
-  protected final String dbType() {
-    return DB_TYPE;
-  }
+    @Override
+    protected final CharSequence spanType() {
+        return InternalSpanTypes.MONGO;
+    }
 
-  @Override
-  protected final String dbUser(final CommandStartedEvent event) {
-    return null;
-  }
+    @Override
+    protected final String dbType() {
+        return DB_TYPE;
+    }
 
-  @Override
-  protected final String dbHostname(CommandStartedEvent event) {
-    final ConnectionDescription connectionDescription = event.getConnectionDescription();
-    if (connectionDescription != null) {
-      return connectionDescription.getServerAddress().getHost();
+    @Override
+    protected final String dbUser(final CommandStartedEvent event) {
+        return null;
     }
 
-    return null;
-  }
+    @Override
+    protected final String dbHostname(CommandStartedEvent event) {
+        final ConnectionDescription connectionDescription = event.getConnectionDescription();
+        if (connectionDescription != null) {
+            return connectionDescription.getServerAddress().getHost();
+        }
 
-  public final void onStatement(
-      @Nonnull final AgentSpan span, @Nonnull final BsonDocument statement) {
-    onStatement(span, statement, null);
-  }
+        return null;
+    }
+
+    public final void onStatement(@Nonnull final AgentSpan span, @Nonnull final BsonDocument statement) {
+        onStatement(span, statement, null);
+    }
 
-  public final void onStatement(
-      @Nonnull final AgentSpan span,
-      @Nonnull final BsonDocument statement,
-      @Nullable ContextStore<BsonDocument, ByteBuf> byteBufAccessor) {
-    // scrub the Mongo command so that parameters are removed from the string
-    span.setResourceName(scrub(statement, byteBufAccessor));
-  }
+    public final void onStatement(
+            @Nonnull final AgentSpan span,
+            @Nonnull final BsonDocument statement,
+            @Nullable ContextStore<BsonDocument, ByteBuf> byteBufAccessor) {
+        // scrub the Mongo command so that parameters are removed from the string
+        span.setResourceName(scrub(statement, byteBufAccessor));
+    }
 
-  @Override
-  protected final String dbInstance(final CommandStartedEvent event) {
-    // Use description if set.
-    final ConnectionDescription connectionDescription = event.getConnectionDescription();
-    if (connectionDescription != null) {
-      final ConnectionId connectionId = connectionDescription.getConnectionId();
-      if (connectionId != null) {
-        final ServerId serverId = connectionId.getServerId();
-        if (serverId != null) {
-          final ClusterId clusterId = serverId.getClusterId();
-          if (clusterId != null) {
-            final String description = clusterId.getDescription();
-            if (description != null) {
-              return description;
+    @Override
+    protected final String dbInstance(final CommandStartedEvent event) {
+        // Use description if set.
+        final ConnectionDescription connectionDescription = event.getConnectionDescription();
+        if (connectionDescription != null) {
+            final ConnectionId connectionId = connectionDescription.getConnectionId();
+            if (connectionId != null) {
+                final ServerId serverId = connectionId.getServerId();
+                if (serverId != null) {
+                    final ClusterId clusterId = serverId.getClusterId();
+                    if (clusterId != null) {
+                        final String description = clusterId.getDescription();
+                        if (description != null) {
+                            return description;
+                        }
+                    }
+                }
             }
-          }
         }
-      }
+        // Fallback to db name.
+        return event.getDatabaseName();
     }
-    // Fallback to db name.
-    return event.getDatabaseName();
-  }
 
-  protected abstract BsonScrubber newScrubber();
+    protected abstract BsonScrubber newScrubber();
 
-  private String scrub(
-      @Nonnull final BsonDocument origin,
-      @Nullable ContextStore<BsonDocument, ByteBuf> byteBufAccessor) {
-    try (BsonScrubber scrubber = newScrubber()) {
-      ByteBuf byteBuf = byteBufAccessor != null ? byteBufAccessor.get(origin) : null;
-      if (null == byteBuf) {
-        scrubber.pipe(new BsonDocumentReader(origin));
-      } else {
-        scrubber.pipe(new BsonBinaryReader(byteBuf.duplicate().asNIO()));
-      }
-      return scrubber.getResourceName();
+    private String scrub(
+            @Nonnull final BsonDocument origin, @Nullable ContextStore<BsonDocument, ByteBuf> byteBufAccessor) {
+        try (BsonScrubber scrubber = newScrubber()) {
+            ByteBuf byteBuf = byteBufAccessor != null ? byteBufAccessor.get(origin) : null;
+            if (null == byteBuf) {
+                scrubber.pipe(new BsonDocumentReader(origin));
+            } else {
+                scrubber.pipe(new BsonBinaryReader(byteBuf.duplicate().asNIO()));
+            }
+            return scrubber.getResourceName();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/src/testFixtures/java/datadog/trace/instrumentation/mongo/BsonBinaryScrubberTestSupport.java b/dd-java-agent/instrumentation/mongo/mongo-common/src/testFixtures/java/datadog/trace/instrumentation/mongo/BsonBinaryScrubberTestSupport.java
index d3edc18e724..a7e8dd19002 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-common/src/testFixtures/java/datadog/trace/instrumentation/mongo/BsonBinaryScrubberTestSupport.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-common/src/testFixtures/java/datadog/trace/instrumentation/mongo/BsonBinaryScrubberTestSupport.java
@@ -18,73 +18,67 @@
 import org.junit.jupiter.api.Test;
 
 public abstract class BsonBinaryScrubberTestSupport {
-  protected abstract BsonScrubber newScrubber();
+    protected abstract BsonScrubber newScrubber();
 
-  private static byte[] encode(BsonDocument document) {
-    try (BasicOutputBuffer output = new BasicOutputBuffer();
-        BsonBinaryWriter writer = new BsonBinaryWriter(output)) {
-      new BsonDocumentCodec().encode(writer, document, EncoderContext.builder().build());
-      return output.toByteArray();
+    private static byte[] encode(BsonDocument document) {
+        try (BasicOutputBuffer output = new BasicOutputBuffer();
+                BsonBinaryWriter writer = new BsonBinaryWriter(output)) {
+            new BsonDocumentCodec()
+                    .encode(writer, document, EncoderContext.builder().build());
+            return output.toByteArray();
+        }
     }
-  }
 
-  private String scrubBinary(BsonDocument document) {
-    try (BsonScrubber scrubber = newScrubber();
-        BsonBinaryReader reader =
-            new BsonBinaryReader(ByteBuffer.wrap(encode(document))) {
-              @Override
-              protected BsonBinary doReadBinaryData() {
-                throw new AssertionError("Redacted binary data must not be materialized");
-              }
-            }) {
-      scrubber.pipe(reader);
-      return scrubber.getResourceName();
+    private String scrubBinary(BsonDocument document) {
+        try (BsonScrubber scrubber = newScrubber();
+                BsonBinaryReader reader = new BsonBinaryReader(ByteBuffer.wrap(encode(document))) {
+                    @Override
+                    protected BsonBinary doReadBinaryData() {
+                        throw new AssertionError("Redacted binary data must not be materialized");
+                    }
+                }) {
+            scrubber.pipe(reader);
+            return scrubber.getResourceName();
+        }
     }
-  }
 
-  private String scrubDocument(BsonDocument document) {
-    try (BsonScrubber scrubber = newScrubber();
-        BsonDocumentReader reader = new BsonDocumentReader(document)) {
-      scrubber.pipe(reader);
-      return scrubber.getResourceName();
+    private String scrubDocument(BsonDocument document) {
+        try (BsonScrubber scrubber = newScrubber();
+                BsonDocumentReader reader = new BsonDocumentReader(document)) {
+            scrubber.pipe(reader);
+            return scrubber.getResourceName();
+        }
     }
-  }
 
-  @Test
-  void skipsBinarySubtypesAndContinuesReadingFields() {
-    for (byte subtype : new byte[] {0, 1, 2, 3, 4, 5, (byte) 0x80, (byte) 0xff}) {
-      BsonDocument document =
-          new BsonDocument("find", new BsonString("items"))
-              .append("payload", new BsonBinary(subtype, new byte[16]))
-              .append("ordered", BsonBoolean.TRUE);
-      assertEquals(
-          "{\"find\": \"items\", \"payload\": \"?\", \"ordered\": true}", scrubBinary(document));
+    @Test
+    void skipsBinarySubtypesAndContinuesReadingFields() {
+        for (byte subtype : new byte[] {0, 1, 2, 3, 4, 5, (byte) 0x80, (byte) 0xff}) {
+            BsonDocument document = new BsonDocument("find", new BsonString("items"))
+                    .append("payload", new BsonBinary(subtype, new byte[16]))
+                    .append("ordered", BsonBoolean.TRUE);
+            assertEquals("{\"find\": \"items\", \"payload\": \"?\", \"ordered\": true}", scrubBinary(document));
+        }
     }
-  }
 
-  @Test
-  void handlesEmptyAndLargeBinaryValues() {
-    for (int size : new int[] {0, 16, 4096, 1024 * 1024}) {
-      BsonDocument document =
-          new BsonDocument("payload", new BsonBinary(new byte[size]))
-              .append("find", new BsonString("items"));
-      assertEquals("{\"payload\": \"?\", \"find\": \"items\"}", scrubBinary(document));
+    @Test
+    void handlesEmptyAndLargeBinaryValues() {
+        for (int size : new int[] {0, 16, 4096, 1024 * 1024}) {
+            BsonDocument document =
+                    new BsonDocument("payload", new BsonBinary(new byte[size])).append("find", new BsonString("items"));
+            assertEquals("{\"payload\": \"?\", \"find\": \"items\"}", scrubBinary(document));
+        }
     }
-  }
 
-  @Test
-  void preservesArrayAndSubtreeObfuscation() {
-    BsonBinary binary = new BsonBinary(new byte[128]);
-    BsonDocument document =
-        new BsonDocument("find", new BsonString("items"))
-            .append("filter", new BsonDocument("values", new BsonArray(asList(binary, binary))))
-            .append(
-                "writeConcern",
-                new BsonDocument("payload", binary).append("ordered", BsonBoolean.TRUE))
-            .append("documents", new BsonArray(asList(new BsonDocument("payload", binary))))
-            .append("ordered", BsonBoolean.FALSE);
-    String expected = scrubDocument(document);
-    assertEquals(expected, scrubBinary(document));
-    assertEquals(expected, scrubBinary(document));
-  }
+    @Test
+    void preservesArrayAndSubtreeObfuscation() {
+        BsonBinary binary = new BsonBinary(new byte[128]);
+        BsonDocument document = new BsonDocument("find", new BsonString("items"))
+                .append("filter", new BsonDocument("values", new BsonArray(asList(binary, binary))))
+                .append("writeConcern", new BsonDocument("payload", binary).append("ordered", BsonBoolean.TRUE))
+                .append("documents", new BsonArray(asList(new BsonDocument("payload", binary))))
+                .append("ordered", BsonBoolean.FALSE);
+        String expected = scrubDocument(document);
+        assertEquals(expected, scrubBinary(document));
+        assertEquals(expected, scrubBinary(document));
+    }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber31.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber31.java
index 58d9f11a024..b76c042ee56 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber31.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber31.java
@@ -16,547 +16,545 @@
 
 public final class BsonScrubber31 implements BsonWriter, BsonScrubber {
 
-  private static final ThreadLocal<Context> CONTEXT =
-      new ThreadLocal<Context>() {
+    private static final ThreadLocal<Context> CONTEXT = new ThreadLocal<Context>() {
         @Override
         protected Context initialValue() {
-          return new Context();
+            return new Context();
         }
-      };
-
-  private final Context context;
-  private boolean obfuscate = true;
-
-  public BsonScrubber31() {
-    this.context = CONTEXT.get();
-  }
-
-  @Override
-  public void close() {
-    context.clear();
-  }
-
-  public String getResourceName() {
-    return context.asString();
-  }
-
-  private void applyObfuscationPolicy(String name) {
-    if (null != name && !context.ignoreSubTree()) {
-      switch (name) {
-        case "documents":
-        case "deletes":
-        case "updates": // we don't want to record data in resource names!
-        case "$in":
-        case "$setOnInsert":
-        case "$set":
-        case "arrayFilters": // collapse long lists
-          context.discardSubTree();
-          obfuscate = true;
-          break;
-        case "writeConcern":
-        case "readConcern":
-          context.keepSubTree();
-          obfuscate = false;
-          break;
-        case "$explain":
-        case "$db":
-        case "ordered":
-        case "delete":
-        case "insert":
-        case "upsert":
-        case "update":
-        case "find":
-        case "count":
-        case "create":
-          obfuscate = false;
-          break;
-        default:
-          obfuscate = !context.disableObfuscation();
-      }
-    }
-  }
-
-  @Override
-  public void flush() {}
-
-  private void writeObfuscated() {
-    context.write("\"?\"");
-  }
-
-  @Override
-  public void writeBinaryData(BsonBinary binary) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeBinaryData(String name, BsonBinary binary) {
-    writeName(name);
-    writeBinaryData(binary);
-  }
-
-  @Override
-  public void writeBoolean(boolean value) {
-    if (obfuscate) {
-      writeObfuscated();
-    } else {
-      context.write(value);
-    }
-  }
-
-  @Override
-  public void writeBoolean(String name, boolean value) {
-    writeName(name);
-    writeBoolean(value);
-  }
-
-  @Override
-  public void writeDateTime(long value) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeDateTime(String name, long value) {
-    writeName(name);
-    writeDateTime(value);
-  }
-
-  @Override
-  public void writeDBPointer(BsonDbPointer value) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeDBPointer(String name, BsonDbPointer value) {
-    writeName(name);
-    writeDBPointer(value);
-  }
-
-  @Override
-  public void writeDouble(double value) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeDouble(String name, double value) {
-    writeName(name);
-    writeDouble(value);
-  }
-
-  @Override
-  public void writeEndArray() {
-    context.write(']');
-  }
-
-  @Override
-  public void writeEndDocument() {
-    context.write('}');
-    context.endDocument();
-  }
-
-  @Override
-  public void writeInt32(int value) {
-    if (obfuscate) {
-      writeObfuscated();
-    } else {
-      context.write(value);
-    }
-  }
-
-  @Override
-  public void writeInt32(String name, int value) {
-    writeName(name);
-    writeInt32(value);
-  }
-
-  @Override
-  public void writeInt64(long value) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeInt64(String name, long value) {
-    writeName(name);
-    writeInt64(value);
-  }
-
-  @Override
-  public void writeJavaScript(String code) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeJavaScript(String name, String code) {
-    writeName(name);
-    writeJavaScript(code);
-  }
-
-  @Override
-  public void writeJavaScriptWithScope(String code) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeJavaScriptWithScope(String name, String code) {
-    writeName(name);
-    writeJavaScriptWithScope(code);
-  }
-
-  @Override
-  public void writeMaxKey() {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeMaxKey(String name) {
-    writeName(name);
-    writeMaxKey();
-  }
-
-  @Override
-  public void writeMinKey() {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeMinKey(String name) {
-    writeName(name);
-    writeMinKey();
-  }
-
-  @Override
-  public void writeName(String name) {
-    applyObfuscationPolicy(name);
-    if (name != null) {
-      context.write('\"');
-      context.write(name);
-      context.write('\"');
-      context.write(':');
-      context.write(' ');
-    }
-  }
-
-  @Override
-  public void writeNull() {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeNull(String name) {
-    writeName(name);
-    writeNull();
-  }
-
-  @Override
-  public void writeObjectId(ObjectId objectId) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeObjectId(String name, ObjectId objectId) {
-    writeName(name);
-    writeObjectId(objectId);
-  }
-
-  @Override
-  public void writeRegularExpression(BsonRegularExpression regularExpression) {
-    writeString(regularExpression.getPattern());
-  }
-
-  @Override
-  public void writeRegularExpression(String name, BsonRegularExpression regularExpression) {
-    writeName(name);
-    writeRegularExpression(regularExpression);
-  }
-
-  @Override
-  public void writeStartArray() {
-    context.startArray();
-    context.write('[');
-  }
-
-  @Override
-  public void writeStartArray(String name) {
-    writeName(name);
-    writeStartArray();
-  }
-
-  @Override
-  public void writeStartDocument() {
-    context.startDocument();
-    context.write('{');
-  }
-
-  @Override
-  public void writeStartDocument(String name) {
-    writeName(name);
-    writeStartDocument();
-  }
-
-  @Override
-  public void writeString(String value) {
-    if (value.startsWith("$")) {
-      context.write(value);
-    } else if (obfuscate) {
-      writeObfuscated();
-    } else {
-      context.write('\"');
-      context.write(value);
-      context.write('\"');
-    }
-  }
-
-  @Override
-  public void writeString(String name, String value) {
-    writeName(name);
-    writeString(value);
-  }
-
-  @Override
-  public void writeSymbol(String value) {
-    writeString(value);
-  }
-
-  @Override
-  public void writeSymbol(String name, String value) {
-    writeName(name);
-    writeSymbol(value);
-  }
-
-  @Override
-  public void writeTimestamp(BsonTimestamp value) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeTimestamp(String name, BsonTimestamp value) {
-    writeName(name);
-    writeTimestamp(value);
-  }
-
-  @Override
-  public void writeUndefined() {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeUndefined(String name) {
-    writeName(name);
-    writeUndefined();
-  }
-
-  @Override
-  public void pipe(BsonReader reader) {
-    pipeDocument(null, reader);
-  }
-
-  private void pipeDocument(String attribute, final BsonReader reader) {
-    reader.readStartDocument();
-    if (null == attribute) {
-      writeStartDocument();
-    } else {
-      writeStartDocument(attribute);
-    }
-    BsonType type = reader.readBsonType();
-    while (type != BsonType.END_OF_DOCUMENT) {
-      pipeValue(reader.readName(), reader);
-      type = reader.readBsonType();
-      nextValue(type);
-    }
-    reader.readEndDocument();
-    writeEndDocument();
-  }
-
-  private void pipeJavascriptWithScope(String attribute, BsonReader reader) {
-    writeJavaScriptWithScope(attribute, reader.readJavaScriptWithScope());
-    pipeDocument(attribute, reader);
-  }
-
-  private void pipeValue(String attribute, BsonReader reader) {
-    switch (reader.getCurrentBsonType()) {
-      case DOCUMENT:
-        pipeDocument(attribute, reader);
-        break;
-      case ARRAY:
-        pipeArray(attribute, reader);
-        break;
-      case DOUBLE:
-        writeDouble(attribute, reader.readDouble());
-        break;
-      case STRING:
-        writeString(attribute, reader.readString());
-        break;
-      case BINARY:
-        reader.skipValue();
-        writeBinaryData(attribute, null);
-        break;
-      case UNDEFINED:
-        reader.readUndefined();
-        writeUndefined();
-        break;
-      case OBJECT_ID:
-        writeObjectId(attribute, reader.readObjectId());
-        break;
-      case BOOLEAN:
-        writeBoolean(attribute, reader.readBoolean());
-        break;
-      case DATE_TIME:
-        writeDateTime(attribute, reader.readDateTime());
-        break;
-      case NULL:
-        reader.readNull();
-        writeNull(attribute);
-        break;
-      case REGULAR_EXPRESSION:
-        writeRegularExpression(attribute, reader.readRegularExpression());
-        break;
-      case JAVASCRIPT:
-        writeJavaScript(attribute, reader.readJavaScript());
-        break;
-      case SYMBOL:
-        writeSymbol(attribute, reader.readSymbol());
-        break;
-      case JAVASCRIPT_WITH_SCOPE:
-        pipeJavascriptWithScope(attribute, reader);
-        break;
-      case INT32:
-        writeInt32(attribute, reader.readInt32());
-        break;
-      case TIMESTAMP:
-        writeTimestamp(attribute, reader.readTimestamp());
-        break;
-      case INT64:
-        writeInt64(attribute, reader.readInt64());
-        break;
-      case MIN_KEY:
-        reader.readMinKey();
-        writeMinKey(attribute);
-        break;
-      case DB_POINTER:
-        writeDBPointer(attribute, reader.readDBPointer());
-        break;
-      case MAX_KEY:
-        reader.readMaxKey();
-        writeMaxKey(attribute);
-        break;
-      default:
-        reader.skipValue();
-        writeUndefined(attribute);
-    }
-  }
-
-  private void pipeDocument(String attribute, BsonDocument value) {
-    writeStartDocument(attribute);
-    for (Map.Entry<String, BsonValue> cur : value.entrySet()) {
-      pipeValue(cur.getKey(), cur.getValue());
-    }
-    writeEndDocument();
-  }
-
-  private void pipeArray(String attribute, BsonReader reader) {
-    reader.readStartArray();
-    writeStartArray(attribute);
-    BsonType type = reader.readBsonType();
-    while (type != BsonType.END_OF_DOCUMENT) {
-      if (context.nextSequenceElement()) {
-        pipeValue(null, reader);
-      } else {
-        reader.skipValue();
-      }
-      type = reader.readBsonType();
-      nextValue(type);
-    }
-    reader.readEndArray();
-    writeEndArray();
-  }
-
-  private void pipeArray(String attribute, final BsonArray array) {
-    writeStartArray(attribute);
-    for (BsonValue cur : array) {
-      if (!context.nextSequenceElement()) {
-        break;
-      }
-      pipeValue(null, cur);
-    }
-    writeEndArray();
-  }
-
-  private void pipeJavascriptWithScope(
-      String attribute, final BsonJavaScriptWithScope javaScriptWithScope) {
-    writeJavaScriptWithScope(javaScriptWithScope.getCode());
-    pipeDocument(attribute, javaScriptWithScope.getScope());
-  }
-
-  private void pipeValue(String attribute, final BsonValue value) {
-    switch (value.getBsonType()) {
-      case DOCUMENT:
-        pipeDocument(attribute, value.asDocument());
-        break;
-      case ARRAY:
-        pipeArray(attribute, value.asArray());
-        break;
-      case DOUBLE:
-        writeDouble(attribute, value.asDouble().getValue());
-        break;
-      case STRING:
-        writeString(attribute, value.asString().getValue());
-        break;
-      case BINARY:
-        writeBinaryData(attribute, null);
-        break;
-      case UNDEFINED:
-        writeUndefined();
-        break;
-      case OBJECT_ID:
-        writeObjectId(attribute, value.asObjectId().getValue());
-        break;
-      case BOOLEAN:
-        writeBoolean(attribute, value.asBoolean().getValue());
-        break;
-      case DATE_TIME:
-        writeDateTime(attribute, value.asDateTime().getValue());
-        break;
-      case NULL:
+    };
+
+    private final Context context;
+    private boolean obfuscate = true;
+
+    public BsonScrubber31() {
+        this.context = CONTEXT.get();
+    }
+
+    @Override
+    public void close() {
+        context.clear();
+    }
+
+    public String getResourceName() {
+        return context.asString();
+    }
+
+    private void applyObfuscationPolicy(String name) {
+        if (null != name && !context.ignoreSubTree()) {
+            switch (name) {
+                case "documents":
+                case "deletes":
+                case "updates": // we don't want to record data in resource names!
+                case "$in":
+                case "$setOnInsert":
+                case "$set":
+                case "arrayFilters": // collapse long lists
+                    context.discardSubTree();
+                    obfuscate = true;
+                    break;
+                case "writeConcern":
+                case "readConcern":
+                    context.keepSubTree();
+                    obfuscate = false;
+                    break;
+                case "$explain":
+                case "$db":
+                case "ordered":
+                case "delete":
+                case "insert":
+                case "upsert":
+                case "update":
+                case "find":
+                case "count":
+                case "create":
+                    obfuscate = false;
+                    break;
+                default:
+                    obfuscate = !context.disableObfuscation();
+            }
+        }
+    }
+
+    @Override
+    public void flush() {}
+
+    private void writeObfuscated() {
+        context.write("\"?\"");
+    }
+
+    @Override
+    public void writeBinaryData(BsonBinary binary) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeBinaryData(String name, BsonBinary binary) {
+        writeName(name);
+        writeBinaryData(binary);
+    }
+
+    @Override
+    public void writeBoolean(boolean value) {
+        if (obfuscate) {
+            writeObfuscated();
+        } else {
+            context.write(value);
+        }
+    }
+
+    @Override
+    public void writeBoolean(String name, boolean value) {
+        writeName(name);
+        writeBoolean(value);
+    }
+
+    @Override
+    public void writeDateTime(long value) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeDateTime(String name, long value) {
+        writeName(name);
+        writeDateTime(value);
+    }
+
+    @Override
+    public void writeDBPointer(BsonDbPointer value) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeDBPointer(String name, BsonDbPointer value) {
+        writeName(name);
+        writeDBPointer(value);
+    }
+
+    @Override
+    public void writeDouble(double value) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeDouble(String name, double value) {
+        writeName(name);
+        writeDouble(value);
+    }
+
+    @Override
+    public void writeEndArray() {
+        context.write(']');
+    }
+
+    @Override
+    public void writeEndDocument() {
+        context.write('}');
+        context.endDocument();
+    }
+
+    @Override
+    public void writeInt32(int value) {
+        if (obfuscate) {
+            writeObfuscated();
+        } else {
+            context.write(value);
+        }
+    }
+
+    @Override
+    public void writeInt32(String name, int value) {
+        writeName(name);
+        writeInt32(value);
+    }
+
+    @Override
+    public void writeInt64(long value) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeInt64(String name, long value) {
+        writeName(name);
+        writeInt64(value);
+    }
+
+    @Override
+    public void writeJavaScript(String code) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeJavaScript(String name, String code) {
+        writeName(name);
+        writeJavaScript(code);
+    }
+
+    @Override
+    public void writeJavaScriptWithScope(String code) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeJavaScriptWithScope(String name, String code) {
+        writeName(name);
+        writeJavaScriptWithScope(code);
+    }
+
+    @Override
+    public void writeMaxKey() {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeMaxKey(String name) {
+        writeName(name);
+        writeMaxKey();
+    }
+
+    @Override
+    public void writeMinKey() {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeMinKey(String name) {
+        writeName(name);
+        writeMinKey();
+    }
+
+    @Override
+    public void writeName(String name) {
+        applyObfuscationPolicy(name);
+        if (name != null) {
+            context.write('\"');
+            context.write(name);
+            context.write('\"');
+            context.write(':');
+            context.write(' ');
+        }
+    }
+
+    @Override
+    public void writeNull() {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeNull(String name) {
+        writeName(name);
         writeNull();
-        break;
-      case REGULAR_EXPRESSION:
-        writeRegularExpression(attribute, value.asRegularExpression());
-        break;
-      case JAVASCRIPT:
-        writeJavaScript(attribute, value.asJavaScript().getCode());
-        break;
-      case SYMBOL:
-        writeSymbol(attribute, value.asSymbol().getSymbol());
-        break;
-      case JAVASCRIPT_WITH_SCOPE:
-        pipeJavascriptWithScope(attribute, value.asJavaScriptWithScope());
-        break;
-      case INT32:
-        writeInt32(attribute, value.asInt32().getValue());
-        break;
-      case TIMESTAMP:
-        writeTimestamp(attribute, value.asTimestamp());
-        break;
-      case INT64:
-        writeInt64(attribute, value.asInt64().getValue());
-        break;
-      case MIN_KEY:
-        writeMinKey(attribute);
-        break;
-      case DB_POINTER:
-        writeDBPointer(attribute, value.asDBPointer());
-        break;
-      case MAX_KEY:
-        writeMaxKey(attribute);
-        break;
-      default:
-        writeUndefined(attribute);
-    }
-  }
-
-  private void nextValue(BsonType type) {
-    if (type != BsonType.END_OF_DOCUMENT) {
-      context.write(',');
-      context.write(' ');
-    }
-  }
+    }
+
+    @Override
+    public void writeObjectId(ObjectId objectId) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeObjectId(String name, ObjectId objectId) {
+        writeName(name);
+        writeObjectId(objectId);
+    }
+
+    @Override
+    public void writeRegularExpression(BsonRegularExpression regularExpression) {
+        writeString(regularExpression.getPattern());
+    }
+
+    @Override
+    public void writeRegularExpression(String name, BsonRegularExpression regularExpression) {
+        writeName(name);
+        writeRegularExpression(regularExpression);
+    }
+
+    @Override
+    public void writeStartArray() {
+        context.startArray();
+        context.write('[');
+    }
+
+    @Override
+    public void writeStartArray(String name) {
+        writeName(name);
+        writeStartArray();
+    }
+
+    @Override
+    public void writeStartDocument() {
+        context.startDocument();
+        context.write('{');
+    }
+
+    @Override
+    public void writeStartDocument(String name) {
+        writeName(name);
+        writeStartDocument();
+    }
+
+    @Override
+    public void writeString(String value) {
+        if (value.startsWith("$")) {
+            context.write(value);
+        } else if (obfuscate) {
+            writeObfuscated();
+        } else {
+            context.write('\"');
+            context.write(value);
+            context.write('\"');
+        }
+    }
+
+    @Override
+    public void writeString(String name, String value) {
+        writeName(name);
+        writeString(value);
+    }
+
+    @Override
+    public void writeSymbol(String value) {
+        writeString(value);
+    }
+
+    @Override
+    public void writeSymbol(String name, String value) {
+        writeName(name);
+        writeSymbol(value);
+    }
+
+    @Override
+    public void writeTimestamp(BsonTimestamp value) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeTimestamp(String name, BsonTimestamp value) {
+        writeName(name);
+        writeTimestamp(value);
+    }
+
+    @Override
+    public void writeUndefined() {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeUndefined(String name) {
+        writeName(name);
+        writeUndefined();
+    }
+
+    @Override
+    public void pipe(BsonReader reader) {
+        pipeDocument(null, reader);
+    }
+
+    private void pipeDocument(String attribute, final BsonReader reader) {
+        reader.readStartDocument();
+        if (null == attribute) {
+            writeStartDocument();
+        } else {
+            writeStartDocument(attribute);
+        }
+        BsonType type = reader.readBsonType();
+        while (type != BsonType.END_OF_DOCUMENT) {
+            pipeValue(reader.readName(), reader);
+            type = reader.readBsonType();
+            nextValue(type);
+        }
+        reader.readEndDocument();
+        writeEndDocument();
+    }
+
+    private void pipeJavascriptWithScope(String attribute, BsonReader reader) {
+        writeJavaScriptWithScope(attribute, reader.readJavaScriptWithScope());
+        pipeDocument(attribute, reader);
+    }
+
+    private void pipeValue(String attribute, BsonReader reader) {
+        switch (reader.getCurrentBsonType()) {
+            case DOCUMENT:
+                pipeDocument(attribute, reader);
+                break;
+            case ARRAY:
+                pipeArray(attribute, reader);
+                break;
+            case DOUBLE:
+                writeDouble(attribute, reader.readDouble());
+                break;
+            case STRING:
+                writeString(attribute, reader.readString());
+                break;
+            case BINARY:
+                reader.skipValue();
+                writeBinaryData(attribute, null);
+                break;
+            case UNDEFINED:
+                reader.readUndefined();
+                writeUndefined();
+                break;
+            case OBJECT_ID:
+                writeObjectId(attribute, reader.readObjectId());
+                break;
+            case BOOLEAN:
+                writeBoolean(attribute, reader.readBoolean());
+                break;
+            case DATE_TIME:
+                writeDateTime(attribute, reader.readDateTime());
+                break;
+            case NULL:
+                reader.readNull();
+                writeNull(attribute);
+                break;
+            case REGULAR_EXPRESSION:
+                writeRegularExpression(attribute, reader.readRegularExpression());
+                break;
+            case JAVASCRIPT:
+                writeJavaScript(attribute, reader.readJavaScript());
+                break;
+            case SYMBOL:
+                writeSymbol(attribute, reader.readSymbol());
+                break;
+            case JAVASCRIPT_WITH_SCOPE:
+                pipeJavascriptWithScope(attribute, reader);
+                break;
+            case INT32:
+                writeInt32(attribute, reader.readInt32());
+                break;
+            case TIMESTAMP:
+                writeTimestamp(attribute, reader.readTimestamp());
+                break;
+            case INT64:
+                writeInt64(attribute, reader.readInt64());
+                break;
+            case MIN_KEY:
+                reader.readMinKey();
+                writeMinKey(attribute);
+                break;
+            case DB_POINTER:
+                writeDBPointer(attribute, reader.readDBPointer());
+                break;
+            case MAX_KEY:
+                reader.readMaxKey();
+                writeMaxKey(attribute);
+                break;
+            default:
+                reader.skipValue();
+                writeUndefined(attribute);
+        }
+    }
+
+    private void pipeDocument(String attribute, BsonDocument value) {
+        writeStartDocument(attribute);
+        for (Map.Entry<String, BsonValue> cur : value.entrySet()) {
+            pipeValue(cur.getKey(), cur.getValue());
+        }
+        writeEndDocument();
+    }
+
+    private void pipeArray(String attribute, BsonReader reader) {
+        reader.readStartArray();
+        writeStartArray(attribute);
+        BsonType type = reader.readBsonType();
+        while (type != BsonType.END_OF_DOCUMENT) {
+            if (context.nextSequenceElement()) {
+                pipeValue(null, reader);
+            } else {
+                reader.skipValue();
+            }
+            type = reader.readBsonType();
+            nextValue(type);
+        }
+        reader.readEndArray();
+        writeEndArray();
+    }
+
+    private void pipeArray(String attribute, final BsonArray array) {
+        writeStartArray(attribute);
+        for (BsonValue cur : array) {
+            if (!context.nextSequenceElement()) {
+                break;
+            }
+            pipeValue(null, cur);
+        }
+        writeEndArray();
+    }
+
+    private void pipeJavascriptWithScope(String attribute, final BsonJavaScriptWithScope javaScriptWithScope) {
+        writeJavaScriptWithScope(javaScriptWithScope.getCode());
+        pipeDocument(attribute, javaScriptWithScope.getScope());
+    }
+
+    private void pipeValue(String attribute, final BsonValue value) {
+        switch (value.getBsonType()) {
+            case DOCUMENT:
+                pipeDocument(attribute, value.asDocument());
+                break;
+            case ARRAY:
+                pipeArray(attribute, value.asArray());
+                break;
+            case DOUBLE:
+                writeDouble(attribute, value.asDouble().getValue());
+                break;
+            case STRING:
+                writeString(attribute, value.asString().getValue());
+                break;
+            case BINARY:
+                writeBinaryData(attribute, null);
+                break;
+            case UNDEFINED:
+                writeUndefined();
+                break;
+            case OBJECT_ID:
+                writeObjectId(attribute, value.asObjectId().getValue());
+                break;
+            case BOOLEAN:
+                writeBoolean(attribute, value.asBoolean().getValue());
+                break;
+            case DATE_TIME:
+                writeDateTime(attribute, value.asDateTime().getValue());
+                break;
+            case NULL:
+                writeNull();
+                break;
+            case REGULAR_EXPRESSION:
+                writeRegularExpression(attribute, value.asRegularExpression());
+                break;
+            case JAVASCRIPT:
+                writeJavaScript(attribute, value.asJavaScript().getCode());
+                break;
+            case SYMBOL:
+                writeSymbol(attribute, value.asSymbol().getSymbol());
+                break;
+            case JAVASCRIPT_WITH_SCOPE:
+                pipeJavascriptWithScope(attribute, value.asJavaScriptWithScope());
+                break;
+            case INT32:
+                writeInt32(attribute, value.asInt32().getValue());
+                break;
+            case TIMESTAMP:
+                writeTimestamp(attribute, value.asTimestamp());
+                break;
+            case INT64:
+                writeInt64(attribute, value.asInt64().getValue());
+                break;
+            case MIN_KEY:
+                writeMinKey(attribute);
+                break;
+            case DB_POINTER:
+                writeDBPointer(attribute, value.asDBPointer());
+                break;
+            case MAX_KEY:
+                writeMaxKey(attribute);
+                break;
+            default:
+                writeUndefined(attribute);
+        }
+    }
+
+    private void nextValue(BsonType type) {
+        if (type != BsonType.END_OF_DOCUMENT) {
+            context.write(',');
+            context.write(' ');
+        }
+    }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/ByteBufBsonDocumentInstrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/ByteBufBsonDocumentInstrumentation.java
index b86ff449d5b..e07f5fc92ee 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/ByteBufBsonDocumentInstrumentation.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/ByteBufBsonDocumentInstrumentation.java
@@ -19,48 +19,45 @@
 
 @AutoService(InstrumenterModule.class)
 public class ByteBufBsonDocumentInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType,
-        Instrumenter.WithTypeStructure,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.WithTypeStructure, Instrumenter.HasMethodAdvice {
 
-  public ByteBufBsonDocumentInstrumentation() {
-    super("mongo");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.mongodb.connection.ByteBufBsonDocument";
-  }
+    public ByteBufBsonDocumentInstrumentation() {
+        super("mongo");
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("byteBuf"));
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.mongodb.connection.ByteBufBsonDocument";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("org.bson.BsonDocument", "org.bson.ByteBuf");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("byteBuf"));
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "driver-only";
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.bson.BsonDocument", "org.bson.ByteBuf");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$ExposeBuffer");
-  }
+    @Override
+    public String muzzleDirective() {
+        return "driver-only";
+    }
 
-  public static final class ExposeBuffer {
-    @Advice.OnMethodExit
-    public static void exposeBuffer(
-        @Advice.This BsonDocument doc, @Advice.FieldValue("byteBuf") ByteBuf byteBuf) {
-      InstrumentationContext.get(BsonDocument.class, ByteBuf.class).put(doc, byteBuf);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$ExposeBuffer");
     }
 
-    public static void muzzleCheck() {
-      MongoClientOptions.builder().addCommandListener(null).build();
+    public static final class ExposeBuffer {
+        @Advice.OnMethodExit
+        public static void exposeBuffer(@Advice.This BsonDocument doc, @Advice.FieldValue("byteBuf") ByteBuf byteBuf) {
+            InstrumentationContext.get(BsonDocument.class, ByteBuf.class).put(doc, byteBuf);
+        }
+
+        public static void muzzleCheck() {
+            MongoClientOptions.builder().addCommandListener(null).build();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoClient31Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoClient31Instrumentation.java
index 52386319458..43dc7995cf5 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoClient31Instrumentation.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoClient31Instrumentation.java
@@ -25,105 +25,102 @@
 
 @AutoService(InstrumenterModule.class)
 public final class MongoClient31Instrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes,
-        Instrumenter.WithTypeStructure,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.WithTypeStructure, Instrumenter.HasMethodAdvice {
 
-  public MongoClient31Instrumentation() {
-    super("mongo", "mongo-3.1");
-  }
+    public MongoClient31Instrumentation() {
+        super("mongo", "mongo-3.1");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "com.mongodb.MongoClientOptions$Builder",
-      "com.mongodb.async.client.MongoClientSettings$Builder",
-      "com.mongodb.MongoClientSettings$Builder"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "com.mongodb.MongoClientOptions$Builder",
+            "com.mongodb.async.client.MongoClientSettings$Builder",
+            "com.mongodb.MongoClientSettings$Builder"
+        };
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("commandListeners"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("commandListeners"));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".BsonScrubber",
-      packageName + ".BsonScrubber31",
-      packageName + ".BsonScrubber31$1",
-      packageName + ".BsonScrubber31$2",
-      packageName + ".MongoDecorator",
-      packageName + ".MongoDecorator31",
-      packageName + ".Context",
-      packageName + ".MongoCommandListener",
-      packageName + ".MongoCommandListener$SpanEntry"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".BsonScrubber",
+            packageName + ".BsonScrubber31",
+            packageName + ".BsonScrubber31$1",
+            packageName + ".BsonScrubber31$2",
+            packageName + ".MongoDecorator",
+            packageName + ".MongoDecorator31",
+            packageName + ".Context",
+            packageName + ".MongoCommandListener",
+            packageName + ".MongoCommandListener$SpanEntry"
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> map = new HashMap<>(2);
-    map.put("org.bson.BsonDocument", "org.bson.ByteBuf");
-    map.put("com.mongodb.connection.ConnectionDescription", "com.mongodb.event.CommandListener");
-    return map;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> map = new HashMap<>(2);
+        map.put("org.bson.BsonDocument", "org.bson.ByteBuf");
+        map.put("com.mongodb.connection.ConnectionDescription", "com.mongodb.event.CommandListener");
+        return map;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("build"))
-            .and(takesArguments(0))
-            .and(isDeclaredBy(declaresField(named("applicationName")))),
-        MongoClient31Instrumentation.class.getName() + "$MongoClientAdviceAppName");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("build"))
-            .and(takesArguments(0))
-            .and(not(isDeclaredBy(declaresField(named("applicationName"))))),
-        MongoClient31Instrumentation.class.getName() + "$MongoClientAdviceNoAppName");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("build"))
+                        .and(takesArguments(0))
+                        .and(isDeclaredBy(declaresField(named("applicationName")))),
+                MongoClient31Instrumentation.class.getName() + "$MongoClientAdviceAppName");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("build"))
+                        .and(takesArguments(0))
+                        .and(not(isDeclaredBy(declaresField(named("applicationName"))))),
+                MongoClient31Instrumentation.class.getName() + "$MongoClientAdviceNoAppName");
+    }
 
-  public static class MongoClientAdviceAppName {
+    public static class MongoClientAdviceAppName {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static MongoCommandListener injectTraceListener(
-        @Advice.FieldValue("commandListeners") List<CommandListener> listeners) {
-      return MongoCommandListener.tryRegister(
-          new MongoCommandListener(
-              1,
-              MongoDecorator31.INSTANCE,
-              InstrumentationContext.get(BsonDocument.class, ByteBuf.class),
-              InstrumentationContext.get(ConnectionDescription.class, CommandListener.class)),
-          listeners);
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static MongoCommandListener injectTraceListener(
+                @Advice.FieldValue("commandListeners") List<CommandListener> listeners) {
+            return MongoCommandListener.tryRegister(
+                    new MongoCommandListener(
+                            1,
+                            MongoDecorator31.INSTANCE,
+                            InstrumentationContext.get(BsonDocument.class, ByteBuf.class),
+                            InstrumentationContext.get(ConnectionDescription.class, CommandListener.class)),
+                    listeners);
+        }
 
-    @Advice.OnMethodExit
-    public static void updateApplicationName(
-        @Advice.Enter final MongoCommandListener listener,
-        @Advice.FieldValue(value = "applicationName") String applicationName) {
-      if (listener != null) {
-        listener.setApplicationName(applicationName);
-      }
+        @Advice.OnMethodExit
+        public static void updateApplicationName(
+                @Advice.Enter final MongoCommandListener listener,
+                @Advice.FieldValue(value = "applicationName") String applicationName) {
+            if (listener != null) {
+                listener.setApplicationName(applicationName);
+            }
+        }
     }
-  }
 
-  public static class MongoClientAdviceNoAppName {
+    public static class MongoClientAdviceNoAppName {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void injectTraceListener(
-        @Advice.FieldValue("commandListeners") List<CommandListener> listeners) {
-      MongoCommandListener.tryRegister(
-          new MongoCommandListener(
-              1,
-              MongoDecorator31.INSTANCE,
-              InstrumentationContext.get(BsonDocument.class, ByteBuf.class),
-              InstrumentationContext.get(ConnectionDescription.class, CommandListener.class)),
-          listeners);
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void injectTraceListener(@Advice.FieldValue("commandListeners") List<CommandListener> listeners) {
+            MongoCommandListener.tryRegister(
+                    new MongoCommandListener(
+                            1,
+                            MongoDecorator31.INSTANCE,
+                            InstrumentationContext.get(BsonDocument.class, ByteBuf.class),
+                            InstrumentationContext.get(ConnectionDescription.class, CommandListener.class)),
+                    listeners);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator31.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator31.java
index fb8195dc8ab..bf21b6dafb7 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator31.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator31.java
@@ -1,10 +1,10 @@
 package datadog.trace.instrumentation.mongo;
 
 public final class MongoDecorator31 extends MongoDecorator {
-  public static final MongoDecorator31 INSTANCE = new MongoDecorator31();
+    public static final MongoDecorator31 INSTANCE = new MongoDecorator31();
 
-  @Override
-  protected BsonScrubber newScrubber() {
-    return new BsonScrubber31();
-  }
+    @Override
+    protected BsonScrubber newScrubber() {
+        return new BsonScrubber31();
+    }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/test/java/datadog/trace/instrumentation/mongo/BsonBinaryScrubber31Test.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/test/java/datadog/trace/instrumentation/mongo/BsonBinaryScrubber31Test.java
index 61e5f5e37e0..72f114a87dd 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/test/java/datadog/trace/instrumentation/mongo/BsonBinaryScrubber31Test.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/test/java/datadog/trace/instrumentation/mongo/BsonBinaryScrubber31Test.java
@@ -1,8 +1,8 @@
 package datadog.trace.instrumentation.mongo;
 
 class BsonBinaryScrubber31Test extends BsonBinaryScrubberTestSupport {
-  @Override
-  protected BsonScrubber newScrubber() {
-    return new BsonScrubber31();
-  }
+    @Override
+    protected BsonScrubber newScrubber() {
+        return new BsonScrubber31();
+    }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber34.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber34.java
index eccf2781986..bb946493e7e 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber34.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber34.java
@@ -17,561 +17,559 @@
 
 public class BsonScrubber34 implements BsonWriter, BsonScrubber {
 
-  private static final ThreadLocal<Context> CONTEXT =
-      new ThreadLocal<Context>() {
+    private static final ThreadLocal<Context> CONTEXT = new ThreadLocal<Context>() {
         @Override
         protected Context initialValue() {
-          return new Context();
+            return new Context();
         }
-      };
-
-  private final Context context = CONTEXT.get();
-  private boolean obfuscate = true;
-
-  @Override
-  public void close() {
-    context.clear();
-  }
-
-  public String getResourceName() {
-    return context.asString();
-  }
-
-  private void applyObfuscationPolicy(String name) {
-    if (null != name && !context.ignoreSubTree()) {
-      switch (name) {
-        case "documents":
-        case "deletes":
-        case "updates": // we don't want to record data in resource names!
-        case "$in":
-        case "$setOnInsert":
-        case "$set":
-        case "arrayFilters": // collapse long lists
-          context.discardSubTree();
-          obfuscate = true;
-          break;
-        case "writeConcern":
-        case "readConcern":
-          context.keepSubTree();
-          obfuscate = false;
-          break;
-        case "$explain":
-        case "$db":
-        case "ordered":
-        case "delete":
-        case "insert":
-        case "upsert":
-        case "update":
-        case "find":
-        case "count":
-        case "create":
-          obfuscate = false;
-          break;
-        default:
-          obfuscate = !context.disableObfuscation();
-      }
-    }
-  }
-
-  @Override
-  public void flush() {}
-
-  private void writeObfuscated() {
-    context.write("\"?\"");
-  }
-
-  @Override
-  public void writeBinaryData(BsonBinary binary) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeBinaryData(String name, BsonBinary binary) {
-    writeName(name);
-    writeBinaryData(binary);
-  }
-
-  @Override
-  public void writeBoolean(boolean value) {
-    if (obfuscate) {
-      writeObfuscated();
-    } else {
-      context.write(value);
-    }
-  }
-
-  @Override
-  public void writeBoolean(String name, boolean value) {
-    writeName(name);
-    writeBoolean(value);
-  }
-
-  @Override
-  public void writeDateTime(long value) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeDateTime(String name, long value) {
-    writeName(name);
-    writeDateTime(value);
-  }
-
-  @Override
-  public void writeDBPointer(BsonDbPointer value) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeDBPointer(String name, BsonDbPointer value) {
-    writeName(name);
-    writeDBPointer(value);
-  }
-
-  @Override
-  public void writeDouble(double value) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeDouble(String name, double value) {
-    writeName(name);
-    writeDouble(value);
-  }
-
-  @Override
-  public void writeEndArray() {
-    // overwrites an eagerly added comma
-    context.write(']');
-  }
-
-  @Override
-  public void writeEndDocument() {
-    context.write('}');
-    context.endDocument();
-  }
-
-  @Override
-  public void writeInt32(int value) {
-    if (obfuscate) {
-      writeObfuscated();
-    } else {
-      context.write(value);
-    }
-  }
-
-  @Override
-  public void writeInt32(String name, int value) {
-    writeName(name);
-    writeInt32(value);
-  }
-
-  @Override
-  public void writeInt64(long value) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeInt64(String name, long value) {
-    writeName(name);
-    writeInt64(value);
-  }
-
-  @Override
-  public void writeDecimal128(Decimal128 value) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeDecimal128(String name, Decimal128 value) {
-    writeName(name);
-    writeDecimal128(value);
-  }
-
-  @Override
-  public void writeJavaScript(String code) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeJavaScript(String name, String code) {
-    writeName(name);
-    writeJavaScript(code);
-  }
-
-  @Override
-  public void writeJavaScriptWithScope(String code) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeJavaScriptWithScope(String name, String code) {
-    writeName(name);
-    writeJavaScriptWithScope(code);
-  }
-
-  @Override
-  public void writeMaxKey() {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeMaxKey(String name) {
-    writeName(name);
-    writeMaxKey();
-  }
-
-  @Override
-  public void writeMinKey() {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeMinKey(String name) {
-    writeName(name);
-    writeMinKey();
-  }
-
-  @Override
-  public void writeName(String name) {
-    applyObfuscationPolicy(name);
-    if (name != null) {
-      context.write('\"');
-      context.write(name);
-      context.write('\"');
-      context.write(':');
-      context.write(' ');
-    }
-  }
-
-  @Override
-  public void writeNull() {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeNull(String name) {
-    writeName(name);
-    writeNull();
-  }
-
-  @Override
-  public void writeObjectId(ObjectId objectId) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeObjectId(String name, ObjectId objectId) {
-    writeName(name);
-    writeObjectId(objectId);
-  }
-
-  @Override
-  public void writeRegularExpression(BsonRegularExpression regularExpression) {
-    writeString(regularExpression.getPattern());
-  }
-
-  @Override
-  public void writeRegularExpression(String name, BsonRegularExpression regularExpression) {
-    writeName(name);
-    writeRegularExpression(regularExpression);
-  }
-
-  @Override
-  public void writeStartArray() {
-    context.startArray();
-    context.write('[');
-  }
-
-  @Override
-  public void writeStartArray(String name) {
-    writeName(name);
-    writeStartArray();
-  }
-
-  @Override
-  public void writeStartDocument() {
-    context.startDocument();
-    context.write('{');
-  }
-
-  @Override
-  public void writeStartDocument(String name) {
-    writeName(name);
-    writeStartDocument();
-  }
-
-  @Override
-  public void writeString(String value) {
-    if (value.startsWith("$")) {
-      context.write(value);
-    } else if (obfuscate) {
-      writeObfuscated();
-    } else {
-      context.write('\"');
-      context.write(value);
-      context.write('\"');
-    }
-  }
-
-  @Override
-  public void writeString(String name, String value) {
-    writeName(name);
-    writeString(value);
-  }
-
-  @Override
-  public void writeSymbol(String value) {
-    writeString(value);
-  }
-
-  @Override
-  public void writeSymbol(String name, String value) {
-    writeName(name);
-    writeSymbol(value);
-  }
-
-  @Override
-  public void writeTimestamp(BsonTimestamp value) {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeTimestamp(String name, BsonTimestamp value) {
-    writeName(name);
-    writeTimestamp(value);
-  }
-
-  @Override
-  public void writeUndefined() {
-    writeObfuscated();
-  }
-
-  @Override
-  public void writeUndefined(String name) {
-    writeName(name);
-    writeUndefined();
-  }
-
-  @Override
-  public void pipe(BsonReader reader) {
-    pipeDocument(null, reader);
-  }
-
-  private void pipeDocument(String attribute, final BsonReader reader) {
-    reader.readStartDocument();
-    if (null == attribute) {
-      writeStartDocument();
-    } else {
-      writeStartDocument(attribute);
-    }
-    BsonType type = reader.readBsonType();
-    while (type != BsonType.END_OF_DOCUMENT) {
-      pipeValue(reader.readName(), reader);
-      type = reader.readBsonType();
-      nextValue(type);
-    }
-    reader.readEndDocument();
-    writeEndDocument();
-  }
-
-  private void pipeJavascriptWithScope(String attribute, BsonReader reader) {
-    writeJavaScriptWithScope(attribute, reader.readJavaScriptWithScope());
-    pipeDocument(attribute, reader);
-  }
-
-  private void pipeValue(String attribute, BsonReader reader) {
-    switch (reader.getCurrentBsonType()) {
-      case DOCUMENT:
-        pipeDocument(attribute, reader);
-        break;
-      case ARRAY:
-        pipeArray(attribute, reader);
-        break;
-      case DOUBLE:
-        writeDouble(attribute, reader.readDouble());
-        break;
-      case STRING:
-        writeString(attribute, reader.readString());
-        break;
-      case BINARY:
-        reader.skipValue();
-        writeBinaryData(attribute, null);
-        break;
-      case UNDEFINED:
-        reader.readUndefined();
-        writeUndefined();
-        break;
-      case OBJECT_ID:
-        writeObjectId(attribute, reader.readObjectId());
-        break;
-      case BOOLEAN:
-        writeBoolean(attribute, reader.readBoolean());
-        break;
-      case DECIMAL128:
-        writeDecimal128(attribute, reader.readDecimal128());
-        break;
-      case DATE_TIME:
-        writeDateTime(attribute, reader.readDateTime());
-        break;
-      case NULL:
-        reader.readNull();
-        writeNull(attribute);
-        break;
-      case REGULAR_EXPRESSION:
-        writeRegularExpression(attribute, reader.readRegularExpression());
-        break;
-      case JAVASCRIPT:
-        writeJavaScript(attribute, reader.readJavaScript());
-        break;
-      case SYMBOL:
-        writeSymbol(attribute, reader.readSymbol());
-        break;
-      case JAVASCRIPT_WITH_SCOPE:
-        pipeJavascriptWithScope(attribute, reader);
-        break;
-      case INT32:
-        writeInt32(attribute, reader.readInt32());
-        break;
-      case TIMESTAMP:
-        writeTimestamp(attribute, reader.readTimestamp());
-        break;
-      case INT64:
-        writeInt64(attribute, reader.readInt64());
-        break;
-      case MIN_KEY:
-        reader.readMinKey();
-        writeMinKey(attribute);
-        break;
-      case DB_POINTER:
-        writeDBPointer(attribute, reader.readDBPointer());
-        break;
-      case MAX_KEY:
-        reader.readMaxKey();
-        writeMaxKey(attribute);
-        break;
-      default:
-        reader.skipValue();
-        writeUndefined(attribute);
-    }
-  }
-
-  private void pipeDocument(String attribute, BsonDocument value) {
-    writeStartDocument(attribute);
-    for (Map.Entry<String, BsonValue> cur : value.entrySet()) {
-      pipeValue(cur.getKey(), cur.getValue());
-    }
-    writeEndDocument();
-  }
-
-  private void pipeArray(String attribute, BsonReader reader) {
-    reader.readStartArray();
-    writeStartArray(attribute);
-    BsonType type = reader.readBsonType();
-    while (type != BsonType.END_OF_DOCUMENT) {
-      if (context.nextSequenceElement()) {
-        pipeValue(null, reader);
-      } else {
-        reader.skipValue();
-      }
-      type = reader.readBsonType();
-      nextValue(type);
-    }
-    reader.readEndArray();
-    writeEndArray();
-  }
-
-  private void pipeArray(String attribute, final BsonArray array) {
-    writeStartArray(attribute);
-    for (BsonValue cur : array) {
-      if (!context.nextSequenceElement()) {
-        break;
-      }
-      pipeValue(null, cur);
-    }
-    writeEndArray();
-  }
-
-  private void pipeJavascriptWithScope(
-      String attribute, final BsonJavaScriptWithScope javaScriptWithScope) {
-    writeJavaScriptWithScope(javaScriptWithScope.getCode());
-    pipeDocument(attribute, javaScriptWithScope.getScope());
-  }
-
-  private void pipeValue(String attribute, final BsonValue value) {
-    switch (value.getBsonType()) {
-      case DOCUMENT:
-        pipeDocument(attribute, value.asDocument());
-        break;
-      case ARRAY:
-        pipeArray(attribute, value.asArray());
-        break;
-      case DOUBLE:
-        writeDouble(attribute, value.asDouble().getValue());
-        break;
-      case STRING:
-        writeString(attribute, value.asString().getValue());
-        break;
-      case BINARY:
-        writeBinaryData(attribute, null);
-        break;
-      case UNDEFINED:
-        writeUndefined();
-        break;
-      case OBJECT_ID:
-        writeObjectId(attribute, value.asObjectId().getValue());
-        break;
-      case BOOLEAN:
-        writeBoolean(attribute, value.asBoolean().getValue());
-        break;
-      case DECIMAL128:
-        writeDecimal128(attribute, value.asDecimal128().getValue());
-        break;
-      case DATE_TIME:
-        writeDateTime(attribute, value.asDateTime().getValue());
-        break;
-      case NULL:
+    };
+
+    private final Context context = CONTEXT.get();
+    private boolean obfuscate = true;
+
+    @Override
+    public void close() {
+        context.clear();
+    }
+
+    public String getResourceName() {
+        return context.asString();
+    }
+
+    private void applyObfuscationPolicy(String name) {
+        if (null != name && !context.ignoreSubTree()) {
+            switch (name) {
+                case "documents":
+                case "deletes":
+                case "updates": // we don't want to record data in resource names!
+                case "$in":
+                case "$setOnInsert":
+                case "$set":
+                case "arrayFilters": // collapse long lists
+                    context.discardSubTree();
+                    obfuscate = true;
+                    break;
+                case "writeConcern":
+                case "readConcern":
+                    context.keepSubTree();
+                    obfuscate = false;
+                    break;
+                case "$explain":
+                case "$db":
+                case "ordered":
+                case "delete":
+                case "insert":
+                case "upsert":
+                case "update":
+                case "find":
+                case "count":
+                case "create":
+                    obfuscate = false;
+                    break;
+                default:
+                    obfuscate = !context.disableObfuscation();
+            }
+        }
+    }
+
+    @Override
+    public void flush() {}
+
+    private void writeObfuscated() {
+        context.write("\"?\"");
+    }
+
+    @Override
+    public void writeBinaryData(BsonBinary binary) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeBinaryData(String name, BsonBinary binary) {
+        writeName(name);
+        writeBinaryData(binary);
+    }
+
+    @Override
+    public void writeBoolean(boolean value) {
+        if (obfuscate) {
+            writeObfuscated();
+        } else {
+            context.write(value);
+        }
+    }
+
+    @Override
+    public void writeBoolean(String name, boolean value) {
+        writeName(name);
+        writeBoolean(value);
+    }
+
+    @Override
+    public void writeDateTime(long value) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeDateTime(String name, long value) {
+        writeName(name);
+        writeDateTime(value);
+    }
+
+    @Override
+    public void writeDBPointer(BsonDbPointer value) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeDBPointer(String name, BsonDbPointer value) {
+        writeName(name);
+        writeDBPointer(value);
+    }
+
+    @Override
+    public void writeDouble(double value) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeDouble(String name, double value) {
+        writeName(name);
+        writeDouble(value);
+    }
+
+    @Override
+    public void writeEndArray() {
+        // overwrites an eagerly added comma
+        context.write(']');
+    }
+
+    @Override
+    public void writeEndDocument() {
+        context.write('}');
+        context.endDocument();
+    }
+
+    @Override
+    public void writeInt32(int value) {
+        if (obfuscate) {
+            writeObfuscated();
+        } else {
+            context.write(value);
+        }
+    }
+
+    @Override
+    public void writeInt32(String name, int value) {
+        writeName(name);
+        writeInt32(value);
+    }
+
+    @Override
+    public void writeInt64(long value) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeInt64(String name, long value) {
+        writeName(name);
+        writeInt64(value);
+    }
+
+    @Override
+    public void writeDecimal128(Decimal128 value) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeDecimal128(String name, Decimal128 value) {
+        writeName(name);
+        writeDecimal128(value);
+    }
+
+    @Override
+    public void writeJavaScript(String code) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeJavaScript(String name, String code) {
+        writeName(name);
+        writeJavaScript(code);
+    }
+
+    @Override
+    public void writeJavaScriptWithScope(String code) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeJavaScriptWithScope(String name, String code) {
+        writeName(name);
+        writeJavaScriptWithScope(code);
+    }
+
+    @Override
+    public void writeMaxKey() {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeMaxKey(String name) {
+        writeName(name);
+        writeMaxKey();
+    }
+
+    @Override
+    public void writeMinKey() {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeMinKey(String name) {
+        writeName(name);
+        writeMinKey();
+    }
+
+    @Override
+    public void writeName(String name) {
+        applyObfuscationPolicy(name);
+        if (name != null) {
+            context.write('\"');
+            context.write(name);
+            context.write('\"');
+            context.write(':');
+            context.write(' ');
+        }
+    }
+
+    @Override
+    public void writeNull() {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeNull(String name) {
+        writeName(name);
         writeNull();
-        break;
-      case REGULAR_EXPRESSION:
-        writeRegularExpression(attribute, value.asRegularExpression());
-        break;
-      case JAVASCRIPT:
-        writeJavaScript(attribute, value.asJavaScript().getCode());
-        break;
-      case SYMBOL:
-        writeSymbol(attribute, value.asSymbol().getSymbol());
-        break;
-      case JAVASCRIPT_WITH_SCOPE:
-        pipeJavascriptWithScope(attribute, value.asJavaScriptWithScope());
-        break;
-      case INT32:
-        writeInt32(attribute, value.asInt32().getValue());
-        break;
-      case TIMESTAMP:
-        writeTimestamp(attribute, value.asTimestamp());
-        break;
-      case INT64:
-        writeInt64(attribute, value.asInt64().getValue());
-        break;
-      case MIN_KEY:
-        writeMinKey(attribute);
-        break;
-      case DB_POINTER:
-        writeDBPointer(attribute, value.asDBPointer());
-        break;
-      case MAX_KEY:
-        writeMaxKey(attribute);
-        break;
-      default:
-        writeUndefined(attribute);
-    }
-  }
-
-  private void nextValue(BsonType type) {
-    if (type != BsonType.END_OF_DOCUMENT) {
-      context.write(',');
-      context.write(' ');
-    }
-  }
+    }
+
+    @Override
+    public void writeObjectId(ObjectId objectId) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeObjectId(String name, ObjectId objectId) {
+        writeName(name);
+        writeObjectId(objectId);
+    }
+
+    @Override
+    public void writeRegularExpression(BsonRegularExpression regularExpression) {
+        writeString(regularExpression.getPattern());
+    }
+
+    @Override
+    public void writeRegularExpression(String name, BsonRegularExpression regularExpression) {
+        writeName(name);
+        writeRegularExpression(regularExpression);
+    }
+
+    @Override
+    public void writeStartArray() {
+        context.startArray();
+        context.write('[');
+    }
+
+    @Override
+    public void writeStartArray(String name) {
+        writeName(name);
+        writeStartArray();
+    }
+
+    @Override
+    public void writeStartDocument() {
+        context.startDocument();
+        context.write('{');
+    }
+
+    @Override
+    public void writeStartDocument(String name) {
+        writeName(name);
+        writeStartDocument();
+    }
+
+    @Override
+    public void writeString(String value) {
+        if (value.startsWith("$")) {
+            context.write(value);
+        } else if (obfuscate) {
+            writeObfuscated();
+        } else {
+            context.write('\"');
+            context.write(value);
+            context.write('\"');
+        }
+    }
+
+    @Override
+    public void writeString(String name, String value) {
+        writeName(name);
+        writeString(value);
+    }
+
+    @Override
+    public void writeSymbol(String value) {
+        writeString(value);
+    }
+
+    @Override
+    public void writeSymbol(String name, String value) {
+        writeName(name);
+        writeSymbol(value);
+    }
+
+    @Override
+    public void writeTimestamp(BsonTimestamp value) {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeTimestamp(String name, BsonTimestamp value) {
+        writeName(name);
+        writeTimestamp(value);
+    }
+
+    @Override
+    public void writeUndefined() {
+        writeObfuscated();
+    }
+
+    @Override
+    public void writeUndefined(String name) {
+        writeName(name);
+        writeUndefined();
+    }
+
+    @Override
+    public void pipe(BsonReader reader) {
+        pipeDocument(null, reader);
+    }
+
+    private void pipeDocument(String attribute, final BsonReader reader) {
+        reader.readStartDocument();
+        if (null == attribute) {
+            writeStartDocument();
+        } else {
+            writeStartDocument(attribute);
+        }
+        BsonType type = reader.readBsonType();
+        while (type != BsonType.END_OF_DOCUMENT) {
+            pipeValue(reader.readName(), reader);
+            type = reader.readBsonType();
+            nextValue(type);
+        }
+        reader.readEndDocument();
+        writeEndDocument();
+    }
+
+    private void pipeJavascriptWithScope(String attribute, BsonReader reader) {
+        writeJavaScriptWithScope(attribute, reader.readJavaScriptWithScope());
+        pipeDocument(attribute, reader);
+    }
+
+    private void pipeValue(String attribute, BsonReader reader) {
+        switch (reader.getCurrentBsonType()) {
+            case DOCUMENT:
+                pipeDocument(attribute, reader);
+                break;
+            case ARRAY:
+                pipeArray(attribute, reader);
+                break;
+            case DOUBLE:
+                writeDouble(attribute, reader.readDouble());
+                break;
+            case STRING:
+                writeString(attribute, reader.readString());
+                break;
+            case BINARY:
+                reader.skipValue();
+                writeBinaryData(attribute, null);
+                break;
+            case UNDEFINED:
+                reader.readUndefined();
+                writeUndefined();
+                break;
+            case OBJECT_ID:
+                writeObjectId(attribute, reader.readObjectId());
+                break;
+            case BOOLEAN:
+                writeBoolean(attribute, reader.readBoolean());
+                break;
+            case DECIMAL128:
+                writeDecimal128(attribute, reader.readDecimal128());
+                break;
+            case DATE_TIME:
+                writeDateTime(attribute, reader.readDateTime());
+                break;
+            case NULL:
+                reader.readNull();
+                writeNull(attribute);
+                break;
+            case REGULAR_EXPRESSION:
+                writeRegularExpression(attribute, reader.readRegularExpression());
+                break;
+            case JAVASCRIPT:
+                writeJavaScript(attribute, reader.readJavaScript());
+                break;
+            case SYMBOL:
+                writeSymbol(attribute, reader.readSymbol());
+                break;
+            case JAVASCRIPT_WITH_SCOPE:
+                pipeJavascriptWithScope(attribute, reader);
+                break;
+            case INT32:
+                writeInt32(attribute, reader.readInt32());
+                break;
+            case TIMESTAMP:
+                writeTimestamp(attribute, reader.readTimestamp());
+                break;
+            case INT64:
+                writeInt64(attribute, reader.readInt64());
+                break;
+            case MIN_KEY:
+                reader.readMinKey();
+                writeMinKey(attribute);
+                break;
+            case DB_POINTER:
+                writeDBPointer(attribute, reader.readDBPointer());
+                break;
+            case MAX_KEY:
+                reader.readMaxKey();
+                writeMaxKey(attribute);
+                break;
+            default:
+                reader.skipValue();
+                writeUndefined(attribute);
+        }
+    }
+
+    private void pipeDocument(String attribute, BsonDocument value) {
+        writeStartDocument(attribute);
+        for (Map.Entry<String, BsonValue> cur : value.entrySet()) {
+            pipeValue(cur.getKey(), cur.getValue());
+        }
+        writeEndDocument();
+    }
+
+    private void pipeArray(String attribute, BsonReader reader) {
+        reader.readStartArray();
+        writeStartArray(attribute);
+        BsonType type = reader.readBsonType();
+        while (type != BsonType.END_OF_DOCUMENT) {
+            if (context.nextSequenceElement()) {
+                pipeValue(null, reader);
+            } else {
+                reader.skipValue();
+            }
+            type = reader.readBsonType();
+            nextValue(type);
+        }
+        reader.readEndArray();
+        writeEndArray();
+    }
+
+    private void pipeArray(String attribute, final BsonArray array) {
+        writeStartArray(attribute);
+        for (BsonValue cur : array) {
+            if (!context.nextSequenceElement()) {
+                break;
+            }
+            pipeValue(null, cur);
+        }
+        writeEndArray();
+    }
+
+    private void pipeJavascriptWithScope(String attribute, final BsonJavaScriptWithScope javaScriptWithScope) {
+        writeJavaScriptWithScope(javaScriptWithScope.getCode());
+        pipeDocument(attribute, javaScriptWithScope.getScope());
+    }
+
+    private void pipeValue(String attribute, final BsonValue value) {
+        switch (value.getBsonType()) {
+            case DOCUMENT:
+                pipeDocument(attribute, value.asDocument());
+                break;
+            case ARRAY:
+                pipeArray(attribute, value.asArray());
+                break;
+            case DOUBLE:
+                writeDouble(attribute, value.asDouble().getValue());
+                break;
+            case STRING:
+                writeString(attribute, value.asString().getValue());
+                break;
+            case BINARY:
+                writeBinaryData(attribute, null);
+                break;
+            case UNDEFINED:
+                writeUndefined();
+                break;
+            case OBJECT_ID:
+                writeObjectId(attribute, value.asObjectId().getValue());
+                break;
+            case BOOLEAN:
+                writeBoolean(attribute, value.asBoolean().getValue());
+                break;
+            case DECIMAL128:
+                writeDecimal128(attribute, value.asDecimal128().getValue());
+                break;
+            case DATE_TIME:
+                writeDateTime(attribute, value.asDateTime().getValue());
+                break;
+            case NULL:
+                writeNull();
+                break;
+            case REGULAR_EXPRESSION:
+                writeRegularExpression(attribute, value.asRegularExpression());
+                break;
+            case JAVASCRIPT:
+                writeJavaScript(attribute, value.asJavaScript().getCode());
+                break;
+            case SYMBOL:
+                writeSymbol(attribute, value.asSymbol().getSymbol());
+                break;
+            case JAVASCRIPT_WITH_SCOPE:
+                pipeJavascriptWithScope(attribute, value.asJavaScriptWithScope());
+                break;
+            case INT32:
+                writeInt32(attribute, value.asInt32().getValue());
+                break;
+            case TIMESTAMP:
+                writeTimestamp(attribute, value.asTimestamp());
+                break;
+            case INT64:
+                writeInt64(attribute, value.asInt64().getValue());
+                break;
+            case MIN_KEY:
+                writeMinKey(attribute);
+                break;
+            case DB_POINTER:
+                writeDBPointer(attribute, value.asDBPointer());
+                break;
+            case MAX_KEY:
+                writeMaxKey(attribute);
+                break;
+            default:
+                writeUndefined(attribute);
+        }
+    }
+
+    private void nextValue(BsonType type) {
+        if (type != BsonType.END_OF_DOCUMENT) {
+            context.write(',');
+            context.write(' ');
+        }
+    }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoClient34Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoClient34Instrumentation.java
index 7a52308bed4..3259d081ca7 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoClient34Instrumentation.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoClient34Instrumentation.java
@@ -37,113 +37,110 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class MongoClient34Instrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes,
-        Instrumenter.WithTypeStructure,
-        Instrumenter.HasMethodAdvice {
-
-  public MongoClient34Instrumentation() {
-    super("mongo", "mongo-3.4");
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "com.mongodb.MongoClientOptions$Builder",
-      "com.mongodb.async.client.MongoClientSettings$Builder",
-      "com.mongodb.MongoClientSettings$Builder"
-    };
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("commandListeners"));
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".BsonScrubber",
-      packageName + ".BsonScrubber34",
-      packageName + ".BsonScrubber34$1",
-      packageName + ".BsonScrubber34$2",
-      packageName + ".MongoDecorator",
-      packageName + ".MongoDecorator34",
-      packageName + ".Context",
-      packageName + ".MongoCommandListener",
-      packageName + ".MongoCommandListener$SpanEntry"
-    };
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> map = new HashMap<>(2);
-    map.put("org.bson.BsonDocument", "org.bson.ByteBuf");
-    map.put("com.mongodb.connection.ConnectionDescription", "com.mongodb.event.CommandListener");
-    return map;
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("build"))
-            .and(takesArguments(0))
-            .and(isDeclaredBy(declaresField(named("applicationName")))),
-        MongoClient34Instrumentation.class.getName() + "$MongoClientAdviceAppName");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("build"))
-            .and(takesArguments(0))
-            .and(not(isDeclaredBy(declaresField(named("applicationName"))))),
-        MongoClient34Instrumentation.class.getName() + "$MongoClientAdviceNoAppName");
-  }
-
-  public static class MongoClientAdviceAppName {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static MongoCommandListener injectTraceListener(
-        @Advice.FieldValue("commandListeners") List<CommandListener> listeners) {
-      return MongoCommandListener.tryRegister(
-          new MongoCommandListener(
-              2,
-              MongoDecorator34.INSTANCE,
-              InstrumentationContext.get(BsonDocument.class, ByteBuf.class),
-              InstrumentationContext.get(ConnectionDescription.class, CommandListener.class)),
-          listeners);
+        implements Instrumenter.ForKnownTypes, Instrumenter.WithTypeStructure, Instrumenter.HasMethodAdvice {
+
+    public MongoClient34Instrumentation() {
+        super("mongo", "mongo-3.4");
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "com.mongodb.MongoClientOptions$Builder",
+            "com.mongodb.async.client.MongoClientSettings$Builder",
+            "com.mongodb.MongoClientSettings$Builder"
+        };
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("commandListeners"));
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".BsonScrubber",
+            packageName + ".BsonScrubber34",
+            packageName + ".BsonScrubber34$1",
+            packageName + ".BsonScrubber34$2",
+            packageName + ".MongoDecorator",
+            packageName + ".MongoDecorator34",
+            packageName + ".Context",
+            packageName + ".MongoCommandListener",
+            packageName + ".MongoCommandListener$SpanEntry"
+        };
     }
 
-    @Advice.OnMethodExit
-    public static void updateApplicationName(
-        @Advice.Enter final MongoCommandListener listener,
-        @Advice.FieldValue(value = "applicationName") String applicationName) {
-      if (listener != null) {
-        listener.setApplicationName(applicationName);
-      }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> map = new HashMap<>(2);
+        map.put("org.bson.BsonDocument", "org.bson.ByteBuf");
+        map.put("com.mongodb.connection.ConnectionDescription", "com.mongodb.event.CommandListener");
+        return map;
     }
 
-    public static void muzzleCheck(BsonWriter writer) {
-      writer.writeDecimal128(null);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("build"))
+                        .and(takesArguments(0))
+                        .and(isDeclaredBy(declaresField(named("applicationName")))),
+                MongoClient34Instrumentation.class.getName() + "$MongoClientAdviceAppName");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("build"))
+                        .and(takesArguments(0))
+                        .and(not(isDeclaredBy(declaresField(named("applicationName"))))),
+                MongoClient34Instrumentation.class.getName() + "$MongoClientAdviceNoAppName");
     }
-  }
-
-  public static class MongoClientAdviceNoAppName {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void injectTraceListener(
-        @Advice.FieldValue("commandListeners") List<CommandListener> listeners) {
-      MongoCommandListener.tryRegister(
-          new MongoCommandListener(
-              2,
-              MongoDecorator34.INSTANCE,
-              InstrumentationContext.get(BsonDocument.class, ByteBuf.class),
-              InstrumentationContext.get(ConnectionDescription.class, CommandListener.class)),
-          listeners);
+
+    public static class MongoClientAdviceAppName {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static MongoCommandListener injectTraceListener(
+                @Advice.FieldValue("commandListeners") List<CommandListener> listeners) {
+            return MongoCommandListener.tryRegister(
+                    new MongoCommandListener(
+                            2,
+                            MongoDecorator34.INSTANCE,
+                            InstrumentationContext.get(BsonDocument.class, ByteBuf.class),
+                            InstrumentationContext.get(ConnectionDescription.class, CommandListener.class)),
+                    listeners);
+        }
+
+        @Advice.OnMethodExit
+        public static void updateApplicationName(
+                @Advice.Enter final MongoCommandListener listener,
+                @Advice.FieldValue(value = "applicationName") String applicationName) {
+            if (listener != null) {
+                listener.setApplicationName(applicationName);
+            }
+        }
+
+        public static void muzzleCheck(BsonWriter writer) {
+            writer.writeDecimal128(null);
+        }
     }
 
-    public static void muzzleCheck(BsonWriter writer) {
-      writer.writeDecimal128(null);
+    public static class MongoClientAdviceNoAppName {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void injectTraceListener(@Advice.FieldValue("commandListeners") List<CommandListener> listeners) {
+            MongoCommandListener.tryRegister(
+                    new MongoCommandListener(
+                            2,
+                            MongoDecorator34.INSTANCE,
+                            InstrumentationContext.get(BsonDocument.class, ByteBuf.class),
+                            InstrumentationContext.get(ConnectionDescription.class, CommandListener.class)),
+                    listeners);
+        }
+
+        public static void muzzleCheck(BsonWriter writer) {
+            writer.writeDecimal128(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator34.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator34.java
index 48529d279b7..5f020899ca0 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator34.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator34.java
@@ -1,10 +1,10 @@
 package datadog.trace.instrumentation.mongo;
 
 public final class MongoDecorator34 extends MongoDecorator {
-  public static final MongoDecorator34 INSTANCE = new MongoDecorator34();
+    public static final MongoDecorator34 INSTANCE = new MongoDecorator34();
 
-  @Override
-  protected BsonScrubber newScrubber() {
-    return new BsonScrubber34();
-  }
+    @Override
+    protected BsonScrubber newScrubber() {
+        return new BsonScrubber34();
+    }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/test/java/datadog/trace/instrumentation/mongo/BsonBinaryScrubber34Test.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/test/java/datadog/trace/instrumentation/mongo/BsonBinaryScrubber34Test.java
index db9d02ee1a1..a6d8f88c74c 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/test/java/datadog/trace/instrumentation/mongo/BsonBinaryScrubber34Test.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/test/java/datadog/trace/instrumentation/mongo/BsonBinaryScrubber34Test.java
@@ -1,8 +1,8 @@
 package datadog.trace.instrumentation.mongo;
 
 class BsonBinaryScrubber34Test extends BsonBinaryScrubberTestSupport {
-  @Override
-  protected BsonScrubber newScrubber() {
-    return new BsonScrubber34();
-  }
+    @Override
+    protected BsonScrubber newScrubber() {
+        return new BsonScrubber34();
+    }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection36Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection36Instrumentation.java
index c476b425d4d..99bff72a740 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection36Instrumentation.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection36Instrumentation.java
@@ -18,81 +18,79 @@
 
 @AutoService(InstrumenterModule.class)
 public class DefaultServerConnection36Instrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public DefaultServerConnection36Instrumentation() {
-    super("mongo", "mongo-3.6");
-  }
+    public DefaultServerConnection36Instrumentation() {
+        super("mongo", "mongo-3.6");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.mongodb.connection.DefaultServerConnection";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.mongodb.connection.DefaultServerConnection";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".BsonScrubber",
-      packageName + ".MongoCommentInjector",
-      packageName + ".MongoDecorator",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".BsonScrubber", packageName + ".MongoCommentInjector", packageName + ".MongoDecorator",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("command"))
-            .and(takesArgument(0, String.class))
-            .and(takesArgument(1, named("org.bson.BsonDocument"))),
-        DefaultServerConnection36Instrumentation.class.getName() + "$CommandAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("command"))
+                        .and(takesArgument(0, String.class))
+                        .and(takesArgument(1, named("org.bson.BsonDocument"))),
+                DefaultServerConnection36Instrumentation.class.getName() + "$CommandAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("commandAsync"))
-            .and(takesArgument(0, String.class))
-            .and(takesArgument(1, named("org.bson.BsonDocument"))),
-        DefaultServerConnection36Instrumentation.class.getName() + "$CommandAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("commandAsync"))
+                        .and(takesArgument(0, String.class))
+                        .and(takesArgument(1, named("org.bson.BsonDocument"))),
+                DefaultServerConnection36Instrumentation.class.getName() + "$CommandAdvice");
+    }
 
-  public static class CommandAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.This Connection connection,
-        @Advice.Argument(value = 0) String dbName,
-        @Advice.Argument(value = 1, readOnly = false) BsonDocument originalBsonDocument) {
-      if (!MongoCommentInjector.INJECT_COMMENT) {
-        return;
-      }
+    public static class CommandAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.This Connection connection,
+                @Advice.Argument(value = 0) String dbName,
+                @Advice.Argument(value = 1, readOnly = false) BsonDocument originalBsonDocument) {
+            if (!MongoCommentInjector.INJECT_COMMENT) {
+                return;
+            }
 
-      if (CallDepthThreadLocalMap.incrementCallDepth(Connection.class) > 0) {
-        // write commands go through an overload, so we don't run the instrumentation multiple times
-        return;
-      }
+            if (CallDepthThreadLocalMap.incrementCallDepth(Connection.class) > 0) {
+                // write commands go through an overload, so we don't run the instrumentation multiple times
+                return;
+            }
 
-      AgentSpan span = startSpan("java-mongo", MongoDecorator.OPERATION_NAME);
-      // scope is going to be closed by the MongoCommandListener
-      activateSpanWithoutScope(span);
+            AgentSpan span = startSpan("java-mongo", MongoDecorator.OPERATION_NAME);
+            // scope is going to be closed by the MongoCommandListener
+            activateSpanWithoutScope(span);
 
-      String hostname = null;
-      ConnectionDescription connectionDescription = connection.getDescription();
-      if (connectionDescription != null && connectionDescription.getServerAddress() != null) {
-        hostname = connectionDescription.getServerAddress().getHost();
-      }
+            String hostname = null;
+            ConnectionDescription connectionDescription = connection.getDescription();
+            if (connectionDescription != null && connectionDescription.getServerAddress() != null) {
+                hostname = connectionDescription.getServerAddress().getHost();
+            }
 
-      String dbmComment = MongoCommentInjector.buildComment(span, hostname, dbName);
-      if (dbmComment != null) {
-        originalBsonDocument = MongoCommentInjector.injectComment(dbmComment, originalBsonDocument);
-      }
-    }
+            String dbmComment = MongoCommentInjector.buildComment(span, hostname, dbName);
+            if (dbmComment != null) {
+                originalBsonDocument = MongoCommentInjector.injectComment(dbmComment, originalBsonDocument);
+            }
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit() {
-      if (!MongoCommentInjector.INJECT_COMMENT) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit() {
+            if (!MongoCommentInjector.INJECT_COMMENT) {
+                return;
+            }
 
-      CallDepthThreadLocalMap.decrementCallDepth(Connection.class);
+            CallDepthThreadLocalMap.decrementCallDepth(Connection.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection38Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection38Instrumentation.java
index cd22d87c42e..4937bf5a770 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection38Instrumentation.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection38Instrumentation.java
@@ -18,81 +18,79 @@
 
 @AutoService(InstrumenterModule.class)
 public class DefaultServerConnection38Instrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public DefaultServerConnection38Instrumentation() {
-    super("mongo", "mongo-3.8");
-  }
+    public DefaultServerConnection38Instrumentation() {
+        super("mongo", "mongo-3.8");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.mongodb.internal.connection.DefaultServerConnection";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.mongodb.internal.connection.DefaultServerConnection";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".MongoDecorator",
-      packageName + ".MongoCommentInjector",
-      packageName + ".BsonScrubber",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".MongoDecorator", packageName + ".MongoCommentInjector", packageName + ".BsonScrubber",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("command"))
-            .and(takesArgument(0, String.class))
-            .and(takesArgument(1, named("org.bson.BsonDocument"))),
-        DefaultServerConnection38Instrumentation.class.getName() + "$CommandAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("command"))
+                        .and(takesArgument(0, String.class))
+                        .and(takesArgument(1, named("org.bson.BsonDocument"))),
+                DefaultServerConnection38Instrumentation.class.getName() + "$CommandAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("commandAsync"))
-            .and(takesArgument(0, String.class))
-            .and(takesArgument(1, named("org.bson.BsonDocument"))),
-        DefaultServerConnection38Instrumentation.class.getName() + "$CommandAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("commandAsync"))
+                        .and(takesArgument(0, String.class))
+                        .and(takesArgument(1, named("org.bson.BsonDocument"))),
+                DefaultServerConnection38Instrumentation.class.getName() + "$CommandAdvice");
+    }
 
-  public static class CommandAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.This DefaultServerConnection connection,
-        @Advice.Argument(value = 0) String dbName,
-        @Advice.Argument(value = 1, readOnly = false) BsonDocument originalBsonDocument) {
-      if (!MongoCommentInjector.INJECT_COMMENT) {
-        return;
-      }
+    public static class CommandAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.This DefaultServerConnection connection,
+                @Advice.Argument(value = 0) String dbName,
+                @Advice.Argument(value = 1, readOnly = false) BsonDocument originalBsonDocument) {
+            if (!MongoCommentInjector.INJECT_COMMENT) {
+                return;
+            }
 
-      if (CallDepthThreadLocalMap.incrementCallDepth(DefaultServerConnection.class) > 0) {
-        // write commands go through an overload, so we don't run the instrumentation multiple times
-        return;
-      }
+            if (CallDepthThreadLocalMap.incrementCallDepth(DefaultServerConnection.class) > 0) {
+                // write commands go through an overload, so we don't run the instrumentation multiple times
+                return;
+            }
 
-      AgentSpan span = startSpan("java-mongo", MongoDecorator.OPERATION_NAME);
-      // scope is going to be closed by the MongoCommandListener
-      activateSpanWithoutScope(span);
+            AgentSpan span = startSpan("java-mongo", MongoDecorator.OPERATION_NAME);
+            // scope is going to be closed by the MongoCommandListener
+            activateSpanWithoutScope(span);
 
-      String hostname = null;
-      ConnectionDescription connectionDescription = connection.getDescription();
-      if (connectionDescription != null && connectionDescription.getServerAddress() != null) {
-        hostname = connectionDescription.getServerAddress().getHost();
-      }
+            String hostname = null;
+            ConnectionDescription connectionDescription = connection.getDescription();
+            if (connectionDescription != null && connectionDescription.getServerAddress() != null) {
+                hostname = connectionDescription.getServerAddress().getHost();
+            }
 
-      String dbmComment = MongoCommentInjector.buildComment(span, hostname, dbName);
-      if (dbmComment != null) {
-        originalBsonDocument = MongoCommentInjector.injectComment(dbmComment, originalBsonDocument);
-      }
-    }
+            String dbmComment = MongoCommentInjector.buildComment(span, hostname, dbName);
+            if (dbmComment != null) {
+                originalBsonDocument = MongoCommentInjector.injectComment(dbmComment, originalBsonDocument);
+            }
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit() {
-      if (!MongoCommentInjector.INJECT_COMMENT) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit() {
+            if (!MongoCommentInjector.INJECT_COMMENT) {
+                return;
+            }
 
-      CallDepthThreadLocalMap.decrementCallDepth(DefaultServerConnection.class);
+            CallDepthThreadLocalMap.decrementCallDepth(DefaultServerConnection.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg0Advice.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg0Advice.java
index bf66e3db9c4..d5d48442084 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg0Advice.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg0Advice.java
@@ -4,9 +4,8 @@
 import net.bytebuddy.asm.Advice;
 
 public class Arg0Advice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void wrap(
-      @Advice.Argument(value = 0, readOnly = false) SingleResultCallback<Object> callback) {
-    callback = CallbackWrapper.wrapIfRequired(callback);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void wrap(@Advice.Argument(value = 0, readOnly = false) SingleResultCallback<Object> callback) {
+        callback = CallbackWrapper.wrapIfRequired(callback);
+    }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg1Advice.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg1Advice.java
index 1a7b3ab2dc1..e34d52ad47f 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg1Advice.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg1Advice.java
@@ -4,9 +4,8 @@
 import net.bytebuddy.asm.Advice;
 
 public class Arg1Advice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void wrap(
-      @Advice.Argument(value = 1, readOnly = false) SingleResultCallback<Object> callback) {
-    callback = CallbackWrapper.wrapIfRequired(callback);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void wrap(@Advice.Argument(value = 1, readOnly = false) SingleResultCallback<Object> callback) {
+        callback = CallbackWrapper.wrapIfRequired(callback);
+    }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg2Advice.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg2Advice.java
index 74192949461..b74457d303c 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg2Advice.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg2Advice.java
@@ -4,9 +4,8 @@
 import net.bytebuddy.asm.Advice;
 
 public class Arg2Advice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void wrap(
-      @Advice.Argument(value = 2, readOnly = false) SingleResultCallback<Object> callback) {
-    callback = CallbackWrapper.wrapIfRequired(callback);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void wrap(@Advice.Argument(value = 2, readOnly = false) SingleResultCallback<Object> callback) {
+        callback = CallbackWrapper.wrapIfRequired(callback);
+    }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseCluster410Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseCluster410Instrumentation.java
index 15c27d8200b..47a99678b10 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseCluster410Instrumentation.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseCluster410Instrumentation.java
@@ -10,22 +10,22 @@
 
 @AutoService(InstrumenterModule.class)
 public class BaseCluster410Instrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public BaseCluster410Instrumentation() {
-    super("mongo", "mongo-reactivestreams");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public BaseCluster410Instrumentation() {
+        super("mongo", "mongo-reactivestreams");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.mongodb.internal.connection.BaseCluster";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.mongodb.internal.connection.BaseCluster";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("selectServerAsync"))
-            .and(takesArgument(2, named("com.mongodb.internal.async.SingleResultCallback"))),
-        packageName + ".Arg2Advice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("selectServerAsync"))
+                        .and(takesArgument(2, named("com.mongodb.internal.async.SingleResultCallback"))),
+                packageName + ".Arg2Advice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation.java
index 610496f609f..ecf30b2e1f8 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation.java
@@ -10,22 +10,22 @@
 
 @AutoService(InstrumenterModule.class)
 public class BaseClusterInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public BaseClusterInstrumentation() {
-    super("mongo", "mongo-reactivestreams");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public BaseClusterInstrumentation() {
+        super("mongo", "mongo-reactivestreams");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.mongodb.internal.connection.BaseCluster";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.mongodb.internal.connection.BaseCluster";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("selectServerAsync"))
-            .and(takesArgument(1, named("com.mongodb.internal.async.SingleResultCallback"))),
-        packageName + ".Arg1Advice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("selectServerAsync"))
+                        .and(takesArgument(1, named("com.mongodb.internal.async.SingleResultCallback"))),
+                packageName + ".Arg1Advice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/CallbackWrapper.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/CallbackWrapper.java
index d95043e823d..2ac029fb883 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/CallbackWrapper.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/CallbackWrapper.java
@@ -7,63 +7,61 @@
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
 public class CallbackWrapper<T> implements SingleResultCallback<Object> {
-  private static final AtomicReferenceFieldUpdater<CallbackWrapper, ContextContinuation>
-      CONTINUATION =
-          AtomicReferenceFieldUpdater.newUpdater(
-              CallbackWrapper.class, ContextContinuation.class, "continuation");
+    private static final AtomicReferenceFieldUpdater<CallbackWrapper, ContextContinuation> CONTINUATION =
+            AtomicReferenceFieldUpdater.newUpdater(CallbackWrapper.class, ContextContinuation.class, "continuation");
 
-  private volatile ContextContinuation continuation = null;
-  private final SingleResultCallback<Object> wrapped;
+    private volatile ContextContinuation continuation = null;
+    private final SingleResultCallback<Object> wrapped;
 
-  public CallbackWrapper(ContextContinuation continuation, SingleResultCallback<Object> wrapped) {
-    CONTINUATION.set(this, continuation);
-    this.wrapped = wrapped;
-  }
+    public CallbackWrapper(ContextContinuation continuation, SingleResultCallback<Object> wrapped) {
+        CONTINUATION.set(this, continuation);
+        this.wrapped = wrapped;
+    }
 
-  @Override
-  public void onResult(Object result, Throwable t) {
-    ContextContinuation continuation = getAndResetContinuation();
-    if (null != continuation) {
-      ContextScope scope = continuation.resume();
-      try {
-        wrapped.onResult(result, t);
-      } finally {
-        scope.close();
-      }
-    } else {
-      wrapped.onResult(result, t);
+    @Override
+    public void onResult(Object result, Throwable t) {
+        ContextContinuation continuation = getAndResetContinuation();
+        if (null != continuation) {
+            ContextScope scope = continuation.resume();
+            try {
+                wrapped.onResult(result, t);
+            } finally {
+                scope.close();
+            }
+        } else {
+            wrapped.onResult(result, t);
+        }
     }
-  }
 
-  private void cancel() {
-    ContextContinuation continuation = getAndResetContinuation();
-    if (null != continuation) {
-      continuation.release();
+    private void cancel() {
+        ContextContinuation continuation = getAndResetContinuation();
+        if (null != continuation) {
+            continuation.release();
+        }
     }
-  }
 
-  private ContextContinuation getAndResetContinuation() {
-    ContextContinuation continuation = this.continuation;
-    if (continuation != null) {
-      if (CONTINUATION.compareAndSet(this, continuation, null)) {
-        return continuation;
-      }
+    private ContextContinuation getAndResetContinuation() {
+        ContextContinuation continuation = this.continuation;
+        if (continuation != null) {
+            if (CONTINUATION.compareAndSet(this, continuation, null)) {
+                return continuation;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  public static SingleResultCallback<Object> wrapIfRequired(SingleResultCallback<Object> callback) {
-    ContextContinuation continuation = Context.current().capture();
-    if (continuation.context() != Context.root()) {
-      return new CallbackWrapper<>(continuation, callback);
+    public static SingleResultCallback<Object> wrapIfRequired(SingleResultCallback<Object> callback) {
+        ContextContinuation continuation = Context.current().capture();
+        if (continuation.context() != Context.root()) {
+            return new CallbackWrapper<>(continuation, callback);
+        }
+        return callback;
     }
-    return callback;
-  }
 
-  public static void cancel(SingleResultCallback<Object> callback) {
-    if (callback instanceof CallbackWrapper) {
-      CallbackWrapper<Object> wrapped = (CallbackWrapper<Object>) callback;
-      wrapped.cancel();
+    public static void cancel(SingleResultCallback<Object> callback) {
+        if (callback instanceof CallbackWrapper) {
+            CallbackWrapper<Object> wrapped = (CallbackWrapper<Object>) callback;
+            wrapped.cancel();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPool410Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPool410Instrumentation.java
index 7ccb11f3b32..ce62a3899a2 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPool410Instrumentation.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPool410Instrumentation.java
@@ -10,22 +10,22 @@
 
 @AutoService(InstrumenterModule.class)
 public class DefaultConnectionPool410Instrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public DefaultConnectionPool410Instrumentation() {
-    super("mongo", "mongo-reactivestreams");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public DefaultConnectionPool410Instrumentation() {
+        super("mongo", "mongo-reactivestreams");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.mongodb.internal.connection.DefaultConnectionPool";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.mongodb.internal.connection.DefaultConnectionPool";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("getAsync"))
-            .and(takesArgument(1, named("com.mongodb.internal.async.SingleResultCallback"))),
-        packageName + ".Arg1Advice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("getAsync"))
+                        .and(takesArgument(1, named("com.mongodb.internal.async.SingleResultCallback"))),
+                packageName + ".Arg1Advice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation.java
index 07147ffbcf6..79d17bf8c51 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation.java
@@ -10,22 +10,22 @@
 
 @AutoService(InstrumenterModule.class)
 public class DefaultConnectionPoolInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public DefaultConnectionPoolInstrumentation() {
-    super("mongo", "mongo-reactivestreams");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public DefaultConnectionPoolInstrumentation() {
+        super("mongo", "mongo-reactivestreams");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.mongodb.internal.connection.DefaultConnectionPool";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.mongodb.internal.connection.DefaultConnectionPool";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("getAsync"))
-            .and(takesArgument(0, named("com.mongodb.internal.async.SingleResultCallback"))),
-        packageName + ".Arg0Advice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("getAsync"))
+                        .and(takesArgument(0, named("com.mongodb.internal.async.SingleResultCallback"))),
+                packageName + ".Arg0Advice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/InternalStreamConnectionInstrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/InternalStreamConnectionInstrumentation.java
index edb7065821b..6fbd2a09aa9 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/InternalStreamConnectionInstrumentation.java
+++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/InternalStreamConnectionInstrumentation.java
@@ -12,80 +12,78 @@
 
 @AutoService(InstrumenterModule.class)
 public class InternalStreamConnectionInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public InternalStreamConnectionInstrumentation() {
-    super("mongo", "mongo-reactivestreams");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.mongodb.internal.connection.InternalStreamConnection";
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public InternalStreamConnectionInstrumentation() {
+        super("mongo", "mongo-reactivestreams");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("readAsync"))
-            .and(takesArgument(1, named("com.mongodb.internal.async.SingleResultCallback"))),
-        packageName + ".Arg1Advice");
+    @Override
+    public String instrumentedType() {
+        return "com.mongodb.internal.connection.InternalStreamConnection";
+    }
 
-    // this advice is applied on v5.2.0+ of the client where an extra parameter has been introduced
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("readAsync"))
-            .and(takesArgument(2, named("com.mongodb.internal.async.SingleResultCallback"))),
-        packageName + ".Arg2Advice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("readAsync"))
+                        .and(takesArgument(1, named("com.mongodb.internal.async.SingleResultCallback"))),
+                packageName + ".Arg1Advice");
 
-    // THESE COULD END WITH AN EXCEPTION AND THE callback.onResult NOT CALLED so the continuation is
-    // not cancelled/activated. FIXED in:
-    // https://github.com/mongodb/mongo-java-driver/pull/783
-    // https://github.com/mongodb/mongo-java-driver/commit/0eac1f09b9006899b2aed677dbcfdfe0ce94ab45
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("openAsync"))
-            .and(takesArgument(0, named("com.mongodb.internal.async.SingleResultCallback"))),
-        InternalStreamConnectionInstrumentation.class.getName() + "$OpenAsyncAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("writeAsync"))
-            .and(takesArgument(1, named("com.mongodb.internal.async.SingleResultCallback"))),
-        InternalStreamConnectionInstrumentation.class.getName() + "$WriteAsyncAdvice");
-  }
+        // this advice is applied on v5.2.0+ of the client where an extra parameter has been introduced
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("readAsync"))
+                        .and(takesArgument(2, named("com.mongodb.internal.async.SingleResultCallback"))),
+                packageName + ".Arg2Advice");
 
-  private static class OpenAsyncAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static SingleResultCallback<Object> wrap(
-        @Advice.Argument(value = 0, readOnly = false) SingleResultCallback<Object> callback) {
-      callback = CallbackWrapper.wrapIfRequired(callback);
-      return callback;
+        // THESE COULD END WITH AN EXCEPTION AND THE callback.onResult NOT CALLED so the continuation is
+        // not cancelled/activated. FIXED in:
+        // https://github.com/mongodb/mongo-java-driver/pull/783
+        // https://github.com/mongodb/mongo-java-driver/commit/0eac1f09b9006899b2aed677dbcfdfe0ce94ab45
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("openAsync"))
+                        .and(takesArgument(0, named("com.mongodb.internal.async.SingleResultCallback"))),
+                InternalStreamConnectionInstrumentation.class.getName() + "$OpenAsyncAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("writeAsync"))
+                        .and(takesArgument(1, named("com.mongodb.internal.async.SingleResultCallback"))),
+                InternalStreamConnectionInstrumentation.class.getName() + "$WriteAsyncAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void exit(
-        @Advice.Enter final SingleResultCallback<Object> callback,
-        @Advice.Thrown Throwable thrown) {
-      if (null != thrown) {
-        CallbackWrapper.cancel(callback);
-      }
-    }
-  }
+    private static class OpenAsyncAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static SingleResultCallback<Object> wrap(
+                @Advice.Argument(value = 0, readOnly = false) SingleResultCallback<Object> callback) {
+            callback = CallbackWrapper.wrapIfRequired(callback);
+            return callback;
+        }
 
-  private static class WriteAsyncAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static SingleResultCallback<Object> wrap(
-        @Advice.Argument(value = 1, readOnly = false) SingleResultCallback<Object> callback) {
-      callback = CallbackWrapper.wrapIfRequired(callback);
-      return callback;
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void exit(
+                @Advice.Enter final SingleResultCallback<Object> callback, @Advice.Thrown Throwable thrown) {
+            if (null != thrown) {
+                CallbackWrapper.cancel(callback);
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void exit(
-        @Advice.Enter final SingleResultCallback<Object> callback,
-        @Advice.Thrown Throwable thrown) {
-      if (null != thrown) {
-        CallbackWrapper.cancel(callback);
-      }
+    private static class WriteAsyncAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static SingleResultCallback<Object> wrap(
+                @Advice.Argument(value = 1, readOnly = false) SingleResultCallback<Object> callback) {
+            callback = CallbackWrapper.wrapIfRequired(callback);
+            return callback;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void exit(
+                @Advice.Enter final SingleResultCallback<Object> callback, @Advice.Thrown Throwable thrown) {
+            if (null != thrown) {
+                CallbackWrapper.cancel(callback);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mule-4.5/application/src/main/java/mule4/HttpServerTestHandler.java b/dd-java-agent/instrumentation/mule-4.5/application/src/main/java/mule4/HttpServerTestHandler.java
index 5f46e923370..9fb2f315d35 100644
--- a/dd-java-agent/instrumentation/mule-4.5/application/src/main/java/mule4/HttpServerTestHandler.java
+++ b/dd-java-agent/instrumentation/mule-4.5/application/src/main/java/mule4/HttpServerTestHandler.java
@@ -2,40 +2,40 @@
 
 public class HttpServerTestHandler {
 
-  public Response handle(String requestPath) {
-    return new Response(testHandle(requestPath));
-  }
-
-  // This method will be instrumented to do a call to the actual test code, so we
-  // can circumvent the rigid class loader isolation in Mule
-  public static Object[] testHandle(String requestPath) {
-    return new Object[] {"Unavailable for failing test instrumentation: " + requestPath, 451};
-  }
-
-  public static final class Response {
-    private final String body;
-    private final int status;
-
-    public Response(String body, int status) {
-      this.body = body;
-      this.status = status;
+    public Response handle(String requestPath) {
+        return new Response(testHandle(requestPath));
     }
 
-    public Response(Object[] response) {
-      this(String.valueOf(response[0]), (Integer) response[1]);
+    // This method will be instrumented to do a call to the actual test code, so we
+    // can circumvent the rigid class loader isolation in Mule
+    public static Object[] testHandle(String requestPath) {
+        return new Object[] {"Unavailable for failing test instrumentation: " + requestPath, 451};
     }
 
-    @Override
-    public String toString() {
-      return "Response [body=" + body + ", status=" + status + "]";
-    }
+    public static final class Response {
+        private final String body;
+        private final int status;
 
-    public String getBody() {
-      return body;
-    }
+        public Response(String body, int status) {
+            this.body = body;
+            this.status = status;
+        }
+
+        public Response(Object[] response) {
+            this(String.valueOf(response[0]), (Integer) response[1]);
+        }
+
+        @Override
+        public String toString() {
+            return "Response [body=" + body + ", status=" + status + "]";
+        }
+
+        public String getBody() {
+            return body;
+        }
 
-    public int getCode() {
-      return status;
+        public int getCode() {
+            return status;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/AbstractMuleInstrumentation.java b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/AbstractMuleInstrumentation.java
index f2f66275dd2..4a2df306fba 100644
--- a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/AbstractMuleInstrumentation.java
+++ b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/AbstractMuleInstrumentation.java
@@ -5,22 +5,21 @@
 import java.util.Map;
 
 public abstract class AbstractMuleInstrumentation extends InstrumenterModule.Tracing {
-  public AbstractMuleInstrumentation() {
-    super("mule");
-  }
+    public AbstractMuleInstrumentation() {
+        super("mule");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return false;
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    final Map<String, String> contextStore = new HashMap<>();
-    contextStore.put("org.mule.runtime.api.event.EventContext", packageName + ".SpanState");
-    contextStore.put(
-        "org.mule.runtime.tracer.api.span.info.InitialSpanInfo",
-        "org.mule.runtime.api.component.Component");
-    return contextStore;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        final Map<String, String> contextStore = new HashMap<>();
+        contextStore.put("org.mule.runtime.api.event.EventContext", packageName + ".SpanState");
+        contextStore.put(
+                "org.mule.runtime.tracer.api.span.info.InitialSpanInfo", "org.mule.runtime.api.component.Component");
+        return contextStore;
+    }
 }
diff --git a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/ComponentMessageProcessorInstrumentation.java b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/ComponentMessageProcessorInstrumentation.java
index 9e6c894cc32..55cb242b559 100644
--- a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/ComponentMessageProcessorInstrumentation.java
+++ b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/ComponentMessageProcessorInstrumentation.java
@@ -24,47 +24,47 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ComponentMessageProcessorInstrumentation extends AbstractMuleInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "org.mule.runtime.module.extension.internal.runtime.operation.ComponentMessageProcessor";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("onEvent", "onEventSynchronous", "prepareAndExecuteOperation"))
-            .and(takesArgument(0, named("org.mule.runtime.core.api.event.CoreEvent"))),
-        getClass().getName() + "$ProcessAdvice");
-  }
-
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ProcessAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(@Advice.Argument(0) final CoreEvent event) {
-      if (event == null || event.getContext() == null) {
-        return null;
-      }
-      SpanState spanState =
-          InstrumentationContext.get(EventContext.class, SpanState.class).get(event.getContext());
-      if (spanState != null && spanState.getEventContextSpan() != null) {
-        return activateSpan(spanState.getSpanContextSpan());
-      }
-      return null;
+    @Override
+    public String instrumentedType() {
+        return "org.mule.runtime.module.extension.internal.runtime.operation.ComponentMessageProcessor";
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("onEvent", "onEventSynchronous", "prepareAndExecuteOperation"))
+                        .and(takesArgument(0, named("org.mule.runtime.core.api.event.CoreEvent"))),
+                getClass().getName() + "$ProcessAdvice");
     }
 
-    private static void muzzleCheck(final EventTracer<?> tracer) {
-      // introduced in 4.5.0
-      tracer.endCurrentSpan(null);
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ProcessAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(@Advice.Argument(0) final CoreEvent event) {
+            if (event == null || event.getContext() == null) {
+                return null;
+            }
+            SpanState spanState = InstrumentationContext.get(EventContext.class, SpanState.class)
+                    .get(event.getContext());
+            if (spanState != null && spanState.getEventContextSpan() != null) {
+                return activateSpan(spanState.getSpanContextSpan());
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
+
+        private static void muzzleCheck(final EventTracer<?> tracer) {
+            // introduced in 4.5.0
+            tracer.endCurrentSpan(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/DDEventTracer.java b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/DDEventTracer.java
index e771a940c4a..62444bc531a 100644
--- a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/DDEventTracer.java
+++ b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/DDEventTracer.java
@@ -28,196 +28,195 @@
  * ones.
  */
 public class DDEventTracer implements EventTracer<CoreEvent> {
-  /** Holds the link between mule event context <-> ddSpan */
-  private final ContextStore<EventContext, SpanState> eventContextStore;
-
-  private final ContextStore<InitialSpanInfo, Component> componentContextStore;
-
-  private final EventTracer<CoreEvent> delegate;
-
-  public DDEventTracer(
-      ContextStore<EventContext, SpanState> eventContextStore,
-      ContextStore<InitialSpanInfo, Component> componentContextStore,
-      EventTracer<CoreEvent> delegate) {
-    this.eventContextStore = eventContextStore;
-    this.componentContextStore = componentContextStore;
-    this.delegate = delegate;
-  }
-
-  private AgentSpan maybeExtractCurrentSpan(final CoreEvent coreEvent) {
-    if (coreEvent == null || coreEvent.getContext() == null) {
-      return null;
-    }
-    SpanState spanState = eventContextStore.get(coreEvent.getContext());
-    return spanState != null ? spanState.getSpanContextSpan() : null;
-  }
-
-  private AgentSpan findParent(final EventContext eventContext) {
-    SpanState spanState = eventContextStore.get(eventContext);
-    if (spanState != null) {
-      return spanState.getEventContextSpan();
-    }
-    return activeSpan();
-  }
-
-  private Component findComponent(final InitialSpanInfo initialSpanInfo) {
-    if (initialSpanInfo instanceof ExecutionInitialSpanInfo) {
-      return componentContextStore.get(initialSpanInfo);
-    } else if (initialSpanInfo instanceof LazyInitialSpanInfo) {
-      return findComponent(((LazyInitialSpanInfo) initialSpanInfo).getDelegate());
-    } else if (initialSpanInfo instanceof EnrichedInitialSpanInfo) {
-      return findComponent(((EnrichedInitialSpanInfo) initialSpanInfo).getBaseInitialSpanInfo());
-    }
-    return null;
-  }
-
-  private void linkToContext(@Nonnull final EventContext eventContext, final AgentSpan span) {
-    final SpanState previousState = eventContextStore.get(eventContext);
-    final AgentSpan spanToLink;
-    if (span != null) {
-      spanToLink = span;
-    } else if (previousState != null) {
-      spanToLink = previousState.getEventContextSpan();
-    } else {
-      spanToLink = null;
-    }
-
-    eventContextStore.put(
-        eventContext, new SpanState(spanToLink, previousState).withSpanContextSpan(span));
-  }
-
-  private void handleNewSpan(CoreEvent event, InitialSpanInfo spanInfo) {
-    if (event == null || event.getContext() == null) {
-      // we cannot store properly the span in the context.
-      return;
-    }
-
-    final EventContext eventContext = event.getContext();
-
-    final AgentSpan span =
-        DECORATE.startMuleSpan(findParent(eventContext), spanInfo, event, findComponent(spanInfo));
-    linkToContext(eventContext, span);
-  }
-
-  private void handleEndOfSpan(CoreEvent event) {
-    if (event == null || event.getContext() == null) {
-      return;
-    }
-    final EventContext eventContext = event.getContext();
-    final SpanState spanState = eventContextStore.get(eventContext);
-    if (spanState == null) {
-      return;
-    }
-    if (spanState.getSpanContextSpan() != null) {
-      final AgentSpan span = spanState.getSpanContextSpan();
-      DECORATE.beforeFinish(span);
-      span.finish();
-    }
-    eventContextStore.put(eventContext, spanState.getPreviousState());
-  }
-
-  @Override
-  public Optional<Span> startSpan(CoreEvent event, InitialSpanInfo spanInfo) {
-    handleNewSpan(event, spanInfo);
-    final Optional<Span> span = delegate.startSpan(event, spanInfo);
-    if (span.isPresent()) {
-      return span;
-    }
-    return NoopMuleSpan.INSTANCE;
-  }
-
-  @Override
-  public Optional<Span> startSpan(CoreEvent event, InitialSpanInfo spanInfo, Assertion assertion) {
-    handleNewSpan(event, spanInfo);
-    final Optional<Span> span = delegate.startSpan(event, spanInfo, assertion);
-    if (span.isPresent()) {
-      return span;
-    }
-    return NoopMuleSpan.INSTANCE;
-  }
-
-  @Override
-  public void endCurrentSpan(CoreEvent event) {
-    try {
-      delegate.endCurrentSpan(event);
-    } finally {
-      handleEndOfSpan(event);
-    }
-  }
-
-  @Override
-  public void endCurrentSpan(CoreEvent event, Assertion condition) {
-    try {
-      delegate.endCurrentSpan(event, condition);
-    } finally {
-      handleEndOfSpan(event);
-    }
-  }
-
-  @Override
-  public void injectDistributedTraceContext(
-      EventContext eventContext, DistributedTraceContextGetter distributedTraceContextGetter) {
-    // TODO: we do not use it today since we've our injectors. However it can be handy in case we do
-    // not support some connectors
-    delegate.injectDistributedTraceContext(eventContext, distributedTraceContextGetter);
-  }
-
-  @Override
-  public void recordErrorAtCurrentSpan(
-      CoreEvent event, Supplier<Error> errorSupplier, boolean isErrorEscapingCurrentSpan) {
-    try {
-      delegate.recordErrorAtCurrentSpan(event, errorSupplier, isErrorEscapingCurrentSpan);
-    } finally {
-      final AgentSpan span = maybeExtractCurrentSpan(event);
-      if (span != null) {
-        final Error error = errorSupplier.get();
-        if (error != null && error.getCause() != null) {
-          DECORATE.onError(span, error.getCause());
-        }
-      }
-    }
-  }
-
-  @Override
-  public void setCurrentSpanName(CoreEvent event, String name) {
-    try {
-      delegate.setCurrentSpanName(event, name);
-    } finally {
-      final AgentSpan span = maybeExtractCurrentSpan(event);
-      if (span != null) {
-        span.setResourceName(name);
-      }
-    }
-  }
-
-  @Override
-  public void addCurrentSpanAttribute(CoreEvent event, String key, String value) {
-    try {
-      delegate.addCurrentSpanAttribute(event, key, value);
-    } finally {
-      final AgentSpan span = maybeExtractCurrentSpan(event);
-      if (span != null) {
-        span.setTag(key, value);
-      }
-    }
-  }
-
-  @Override
-  public void addCurrentSpanAttributes(CoreEvent event, Map<String, String> attributes) {
-    try {
-      delegate.addCurrentSpanAttributes(event, attributes);
-    } finally {
-      final AgentSpan span = maybeExtractCurrentSpan(event);
-      if (span != null) {
-        for (Map.Entry<String, String> entry : attributes.entrySet()) {
-          span.setTag(entry.getKey(), entry.getValue());
-        }
-      }
-    }
-  }
-
-  @Override
-  public SpanSnifferManager getSpanSnifferManager() {
-    return delegate.getSpanSnifferManager();
-  }
+    /** Holds the link between mule event context <-> ddSpan */
+    private final ContextStore<EventContext, SpanState> eventContextStore;
+
+    private final ContextStore<InitialSpanInfo, Component> componentContextStore;
+
+    private final EventTracer<CoreEvent> delegate;
+
+    public DDEventTracer(
+            ContextStore<EventContext, SpanState> eventContextStore,
+            ContextStore<InitialSpanInfo, Component> componentContextStore,
+            EventTracer<CoreEvent> delegate) {
+        this.eventContextStore = eventContextStore;
+        this.componentContextStore = componentContextStore;
+        this.delegate = delegate;
+    }
+
+    private AgentSpan maybeExtractCurrentSpan(final CoreEvent coreEvent) {
+        if (coreEvent == null || coreEvent.getContext() == null) {
+            return null;
+        }
+        SpanState spanState = eventContextStore.get(coreEvent.getContext());
+        return spanState != null ? spanState.getSpanContextSpan() : null;
+    }
+
+    private AgentSpan findParent(final EventContext eventContext) {
+        SpanState spanState = eventContextStore.get(eventContext);
+        if (spanState != null) {
+            return spanState.getEventContextSpan();
+        }
+        return activeSpan();
+    }
+
+    private Component findComponent(final InitialSpanInfo initialSpanInfo) {
+        if (initialSpanInfo instanceof ExecutionInitialSpanInfo) {
+            return componentContextStore.get(initialSpanInfo);
+        } else if (initialSpanInfo instanceof LazyInitialSpanInfo) {
+            return findComponent(((LazyInitialSpanInfo) initialSpanInfo).getDelegate());
+        } else if (initialSpanInfo instanceof EnrichedInitialSpanInfo) {
+            return findComponent(((EnrichedInitialSpanInfo) initialSpanInfo).getBaseInitialSpanInfo());
+        }
+        return null;
+    }
+
+    private void linkToContext(@Nonnull final EventContext eventContext, final AgentSpan span) {
+        final SpanState previousState = eventContextStore.get(eventContext);
+        final AgentSpan spanToLink;
+        if (span != null) {
+            spanToLink = span;
+        } else if (previousState != null) {
+            spanToLink = previousState.getEventContextSpan();
+        } else {
+            spanToLink = null;
+        }
+
+        eventContextStore.put(eventContext, new SpanState(spanToLink, previousState).withSpanContextSpan(span));
+    }
+
+    private void handleNewSpan(CoreEvent event, InitialSpanInfo spanInfo) {
+        if (event == null || event.getContext() == null) {
+            // we cannot store properly the span in the context.
+            return;
+        }
+
+        final EventContext eventContext = event.getContext();
+
+        final AgentSpan span =
+                DECORATE.startMuleSpan(findParent(eventContext), spanInfo, event, findComponent(spanInfo));
+        linkToContext(eventContext, span);
+    }
+
+    private void handleEndOfSpan(CoreEvent event) {
+        if (event == null || event.getContext() == null) {
+            return;
+        }
+        final EventContext eventContext = event.getContext();
+        final SpanState spanState = eventContextStore.get(eventContext);
+        if (spanState == null) {
+            return;
+        }
+        if (spanState.getSpanContextSpan() != null) {
+            final AgentSpan span = spanState.getSpanContextSpan();
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
+        eventContextStore.put(eventContext, spanState.getPreviousState());
+    }
+
+    @Override
+    public Optional<Span> startSpan(CoreEvent event, InitialSpanInfo spanInfo) {
+        handleNewSpan(event, spanInfo);
+        final Optional<Span> span = delegate.startSpan(event, spanInfo);
+        if (span.isPresent()) {
+            return span;
+        }
+        return NoopMuleSpan.INSTANCE;
+    }
+
+    @Override
+    public Optional<Span> startSpan(CoreEvent event, InitialSpanInfo spanInfo, Assertion assertion) {
+        handleNewSpan(event, spanInfo);
+        final Optional<Span> span = delegate.startSpan(event, spanInfo, assertion);
+        if (span.isPresent()) {
+            return span;
+        }
+        return NoopMuleSpan.INSTANCE;
+    }
+
+    @Override
+    public void endCurrentSpan(CoreEvent event) {
+        try {
+            delegate.endCurrentSpan(event);
+        } finally {
+            handleEndOfSpan(event);
+        }
+    }
+
+    @Override
+    public void endCurrentSpan(CoreEvent event, Assertion condition) {
+        try {
+            delegate.endCurrentSpan(event, condition);
+        } finally {
+            handleEndOfSpan(event);
+        }
+    }
+
+    @Override
+    public void injectDistributedTraceContext(
+            EventContext eventContext, DistributedTraceContextGetter distributedTraceContextGetter) {
+        // TODO: we do not use it today since we've our injectors. However it can be handy in case we do
+        // not support some connectors
+        delegate.injectDistributedTraceContext(eventContext, distributedTraceContextGetter);
+    }
+
+    @Override
+    public void recordErrorAtCurrentSpan(
+            CoreEvent event, Supplier<Error> errorSupplier, boolean isErrorEscapingCurrentSpan) {
+        try {
+            delegate.recordErrorAtCurrentSpan(event, errorSupplier, isErrorEscapingCurrentSpan);
+        } finally {
+            final AgentSpan span = maybeExtractCurrentSpan(event);
+            if (span != null) {
+                final Error error = errorSupplier.get();
+                if (error != null && error.getCause() != null) {
+                    DECORATE.onError(span, error.getCause());
+                }
+            }
+        }
+    }
+
+    @Override
+    public void setCurrentSpanName(CoreEvent event, String name) {
+        try {
+            delegate.setCurrentSpanName(event, name);
+        } finally {
+            final AgentSpan span = maybeExtractCurrentSpan(event);
+            if (span != null) {
+                span.setResourceName(name);
+            }
+        }
+    }
+
+    @Override
+    public void addCurrentSpanAttribute(CoreEvent event, String key, String value) {
+        try {
+            delegate.addCurrentSpanAttribute(event, key, value);
+        } finally {
+            final AgentSpan span = maybeExtractCurrentSpan(event);
+            if (span != null) {
+                span.setTag(key, value);
+            }
+        }
+    }
+
+    @Override
+    public void addCurrentSpanAttributes(CoreEvent event, Map<String, String> attributes) {
+        try {
+            delegate.addCurrentSpanAttributes(event, attributes);
+        } finally {
+            final AgentSpan span = maybeExtractCurrentSpan(event);
+            if (span != null) {
+                for (Map.Entry<String, String> entry : attributes.entrySet()) {
+                    span.setTag(entry.getKey(), entry.getValue());
+                }
+            }
+        }
+    }
+
+    @Override
+    public SpanSnifferManager getSpanSnifferManager() {
+        return delegate.getSpanSnifferManager();
+    }
 }
diff --git a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/EventContextCreationAdvice.java b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/EventContextCreationAdvice.java
index 478584e33bb..098454fba5c 100644
--- a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/EventContextCreationAdvice.java
+++ b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/EventContextCreationAdvice.java
@@ -11,44 +11,42 @@
 import org.mule.runtime.tracer.api.EventTracer;
 
 public class EventContextCreationAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static int onEnter() {
-    return CallDepthThreadLocalMap.incrementCallDepth(EventContext.class);
-  }
-
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit(
-      @Advice.This final EventContext zis,
-      @Advice.Argument(0) final Object arg,
-      @Advice.Enter final int depth) {
-    // Only do work when exiting the topmost constructor
-    if (depth > 0) {
-      return;
-    }
-    CallDepthThreadLocalMap.reset(EventContext.class);
-
-    final ContextStore<EventContext, SpanState> contextStore =
-        InstrumentationContext.get(EventContext.class, SpanState.class);
-    SpanState spanState = null;
-
-    // This is a roundabout way to know if we are in the constructor for DefaultEventContext or
-    // ChildContext. Since ChildContext is is a private inner class, we can't access it from here.
-    if (zis instanceof DefaultEventContext) {
-      spanState = new SpanState(activeSpan(), null);
-    } else if (arg instanceof EventContext) {
-      // This means that we are in the constructor for ChildContext and we should copy the span
-      // from the parent EventContext which is the first argument.
-      final SpanState parentState = contextStore.get((EventContext) arg);
-      if (parentState != null) {
-        spanState = new SpanState(parentState.getEventContextSpan(), null);
-      }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static int onEnter() {
+        return CallDepthThreadLocalMap.incrementCallDepth(EventContext.class);
     }
 
-    contextStore.put(zis, spanState);
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(
+            @Advice.This final EventContext zis, @Advice.Argument(0) final Object arg, @Advice.Enter final int depth) {
+        // Only do work when exiting the topmost constructor
+        if (depth > 0) {
+            return;
+        }
+        CallDepthThreadLocalMap.reset(EventContext.class);
+
+        final ContextStore<EventContext, SpanState> contextStore =
+                InstrumentationContext.get(EventContext.class, SpanState.class);
+        SpanState spanState = null;
+
+        // This is a roundabout way to know if we are in the constructor for DefaultEventContext or
+        // ChildContext. Since ChildContext is is a private inner class, we can't access it from here.
+        if (zis instanceof DefaultEventContext) {
+            spanState = new SpanState(activeSpan(), null);
+        } else if (arg instanceof EventContext) {
+            // This means that we are in the constructor for ChildContext and we should copy the span
+            // from the parent EventContext which is the first argument.
+            final SpanState parentState = contextStore.get((EventContext) arg);
+            if (parentState != null) {
+                spanState = new SpanState(parentState.getEventContextSpan(), null);
+            }
+        }
+
+        contextStore.put(zis, spanState);
+    }
 
-  private static void muzzleCheck(final EventTracer<?> tracer) {
-    // introduced in 4.5.0
-    tracer.endCurrentSpan(null);
-  }
+    private static void muzzleCheck(final EventTracer<?> tracer) {
+        // introduced in 4.5.0
+        tracer.endCurrentSpan(null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/EventContextInstrumentation.java b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/EventContextInstrumentation.java
index a3be24b149b..b8fe805166e 100644
--- a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/EventContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/EventContextInstrumentation.java
@@ -13,23 +13,23 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class EventContextInstrumentation extends AbstractMuleInstrumentation
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.mule.runtime.core.internal.event.DefaultEventContext",
-      "org.mule.runtime.core.internal.event.DefaultEventContext$ChildEventContext"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.mule.runtime.core.internal.event.DefaultEventContext",
+            "org.mule.runtime.core.internal.event.DefaultEventContext$ChildEventContext"
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), packageName + ".EventContextCreationAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), packageName + ".EventContextCreationAdvice");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "before-4.5.0";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "before-4.5.0";
+    }
 }
diff --git a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/EventTracerInstrumentation.java b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/EventTracerInstrumentation.java
index f149881d438..f4b2de51b1d 100644
--- a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/EventTracerInstrumentation.java
+++ b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/EventTracerInstrumentation.java
@@ -14,30 +14,28 @@
 
 @AutoService(InstrumenterModule.class)
 public class EventTracerInstrumentation extends AbstractMuleInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "org.mule.runtime.tracer.impl.SelectableCoreEventTracer";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.mule.runtime.tracer.impl.SelectableCoreEventTracer";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        NameMatchers.named("updateSelectedCoreEventTracer"),
-        getClass().getName() + "$SwapCoreTracerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                NameMatchers.named("updateSelectedCoreEventTracer"), getClass().getName() + "$SwapCoreTracerAdvice");
+    }
 
-  public static class SwapCoreTracerAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterInit(
-        @Advice.FieldValue(value = "selectedCoreEventTracer", readOnly = false)
-            EventTracer<CoreEvent> eventTracer) {
-      eventTracer =
-          new DDEventTracer(
-              InstrumentationContext.get(EventContext.class, SpanState.class),
-              InstrumentationContext.get(InitialSpanInfo.class, Component.class),
-              eventTracer);
+    public static class SwapCoreTracerAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterInit(
+                @Advice.FieldValue(value = "selectedCoreEventTracer", readOnly = false)
+                        EventTracer<CoreEvent> eventTracer) {
+            eventTracer = new DDEventTracer(
+                    InstrumentationContext.get(EventContext.class, SpanState.class),
+                    InstrumentationContext.get(InitialSpanInfo.class, Component.class),
+                    eventTracer);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/ExecutionInitialSpanInfoInstrumentation.java b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/ExecutionInitialSpanInfoInstrumentation.java
index 445789b4fb1..60798b7376a 100644
--- a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/ExecutionInitialSpanInfoInstrumentation.java
+++ b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/ExecutionInitialSpanInfoInstrumentation.java
@@ -15,25 +15,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class ExecutionInitialSpanInfoInstrumentation extends AbstractMuleInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "org.mule.runtime.tracer.customization.impl.info.ExecutionInitialSpanInfo";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.mule.runtime.tracer.customization.impl.info.ExecutionInitialSpanInfo";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(0, named("org.mule.runtime.api.component.Component"))),
-        getClass().getName() + "$StoreComponentAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(0, named("org.mule.runtime.api.component.Component"))),
+                getClass().getName() + "$StoreComponentAdvice");
+    }
 
-  public static class StoreComponentAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterConstruct(
-        @Advice.This ExecutionInitialSpanInfo self, @Advice.Argument(0) final Component component) {
-      InstrumentationContext.get(InitialSpanInfo.class, Component.class).put(self, component);
+    public static class StoreComponentAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterConstruct(
+                @Advice.This ExecutionInitialSpanInfo self, @Advice.Argument(0) final Component component) {
+            InstrumentationContext.get(InitialSpanInfo.class, Component.class).put(self, component);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/JpmsMuleInstrumentation.java b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/JpmsMuleInstrumentation.java
index 171181670f8..98fdc011363 100644
--- a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/JpmsMuleInstrumentation.java
+++ b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/JpmsMuleInstrumentation.java
@@ -11,34 +11,34 @@
 
 @AutoService(InstrumenterModule.class)
 public class JpmsMuleInstrumentation extends InstrumenterModule implements JavaModuleOpenProvider {
-  public JpmsMuleInstrumentation() {
-    super("mule", "mule-jpms");
-  }
+    public JpmsMuleInstrumentation() {
+        super("mule", "mule-jpms");
+    }
 
-  @Override
-  public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    return true;
-  }
+    @Override
+    public boolean isApplicable(Set<TargetSystem> enabledSystems) {
+        return true;
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      // added in 4.5.0
-      new Reference.Builder("org.mule.runtime.tracer.api.EventTracer")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC | Reference.EXPECTS_PUBLIC,
-              "endCurrentSpan",
-              "V",
-              "Lorg/mule/runtime/api/event/Event;")
-          .build(),
-    };
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            // added in 4.5.0
+            new Reference.Builder("org.mule.runtime.tracer.api.EventTracer")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_NON_STATIC | Reference.EXPECTS_PUBLIC,
+                            "endCurrentSpan",
+                            "V",
+                            "Lorg/mule/runtime/api/event/Event;")
+                    .build(),
+        };
+    }
 
-  @Override
-  public Collection<String> triggerClasses() {
-    return asList(
-        "org.mule.runtime.tracer.customization.impl.info.ExecutionInitialSpanInfo",
-        "org.mule.runtime.tracer.customization.impl.provider.LazyInitialSpanInfo");
-  }
+    @Override
+    public Collection<String> triggerClasses() {
+        return asList(
+                "org.mule.runtime.tracer.customization.impl.info.ExecutionInitialSpanInfo",
+                "org.mule.runtime.tracer.customization.impl.provider.LazyInitialSpanInfo");
+    }
 }
diff --git a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java
index 57985e88b2f..bdaefc107f9 100644
--- a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java
+++ b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java
@@ -19,78 +19,76 @@
 import org.mule.runtime.tracer.api.span.info.InitialSpanInfo;
 
 public class MuleDecorator extends BaseDecorator {
-  private static final CharSequence MULE = UTF8BytesString.create("mule");
-  private static final CharSequence OPERATION_NAME = UTF8BytesString.create("mule.action");
-  public static final MuleDecorator DECORATE = new MuleDecorator();
-  private static final DDCache<CharSequence, String> TAG_CACHE = DDCaches.newFixedSizeCache(128);
-  private static final Function<CharSequence, String> TAG_ADDER =
-      new Functions.Prefix("mule.").andThen(new Functions.ToString<>());
-  private static final DDCache<Component, String> COMPONENT_DOC_CACHE =
-      DDCaches.newFixedSizeCache(1014);
-  private static final Function<Component, String> COMPONENT_DOC_ADDER =
-      component -> {
+    private static final CharSequence MULE = UTF8BytesString.create("mule");
+    private static final CharSequence OPERATION_NAME = UTF8BytesString.create("mule.action");
+    public static final MuleDecorator DECORATE = new MuleDecorator();
+    private static final DDCache<CharSequence, String> TAG_CACHE = DDCaches.newFixedSizeCache(128);
+    private static final Function<CharSequence, String> TAG_ADDER =
+            new Functions.Prefix("mule.").andThen(new Functions.ToString<>());
+    private static final DDCache<Component, String> COMPONENT_DOC_CACHE = DDCaches.newFixedSizeCache(1014);
+    private static final Function<Component, String> COMPONENT_DOC_ADDER = component -> {
         final Object ret = component.getAnnotation(Component.Annotations.NAME_ANNOTATION_KEY);
         if (ret != null) {
-          return ret.toString();
+            return ret.toString();
         }
         return null;
-      };
+    };
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {MULE.toString()};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.MULE;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return MULE;
-  }
-
-  @Override
-  protected void doAfterStart(final @Nonnull AgentSpan span) {
-    span.setMeasured(true);
-    span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_INTERNAL);
-    super.doAfterStart(span);
-  }
-
-  public AgentSpan startMuleSpan(
-      AgentSpan parentSpan, InitialSpanInfo spanInfo, CoreEvent event, Component component) {
-    // we stick with the same level of detail of OTEL exporter.
-    // if not exportable we're not going to create a real span but we still need to track those
-    // spans to keep a correct hierarchy.
-    if (spanInfo.getInitialExportInfo() != null
-        && !spanInfo.getInitialExportInfo().isExportable()) {
-      return null;
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {MULE.toString()};
     }
-    final AgentSpan span;
-    if (parentSpan == null) {
-      span = startSpan("mule", OPERATION_NAME);
-    } else {
-      span = startSpan("mule", OPERATION_NAME, parentSpan.spanContext());
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.MULE;
     }
-    // here we have to use the forEachAttribute since each specialized InitialSpanInfo class can add
-    // different things through this method. Using the map version is not the same.
-    spanInfo.forEachAttribute((s, s2) -> span.setTag(TAG_CACHE.computeIfAbsent(s, TAG_ADDER), s2));
-    span.setTag(MULE_CORRELATION_ID, event.getCorrelationId());
-    // cache the resource name might be complex since it depends on a couple of keys
-    String extraDetail = null;
-    if (component != null) {
-      extraDetail = COMPONENT_DOC_CACHE.computeIfAbsent(component, COMPONENT_DOC_ADDER);
+
+    @Override
+    protected CharSequence component() {
+        return MULE;
     }
-    if (extraDetail == null) {
-      extraDetail = (String) span.getTag(MULE_LOCATION);
+
+    @Override
+    protected void doAfterStart(final @Nonnull AgentSpan span) {
+        span.setMeasured(true);
+        span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_INTERNAL);
+        super.doAfterStart(span);
     }
-    if (extraDetail != null) {
-      span.setResourceName(spanInfo.getName() + " " + extraDetail);
-    } else {
-      span.setResourceName(spanInfo.getName());
+
+    public AgentSpan startMuleSpan(
+            AgentSpan parentSpan, InitialSpanInfo spanInfo, CoreEvent event, Component component) {
+        // we stick with the same level of detail of OTEL exporter.
+        // if not exportable we're not going to create a real span but we still need to track those
+        // spans to keep a correct hierarchy.
+        if (spanInfo.getInitialExportInfo() != null
+                && !spanInfo.getInitialExportInfo().isExportable()) {
+            return null;
+        }
+        final AgentSpan span;
+        if (parentSpan == null) {
+            span = startSpan("mule", OPERATION_NAME);
+        } else {
+            span = startSpan("mule", OPERATION_NAME, parentSpan.spanContext());
+        }
+        // here we have to use the forEachAttribute since each specialized InitialSpanInfo class can add
+        // different things through this method. Using the map version is not the same.
+        spanInfo.forEachAttribute((s, s2) -> span.setTag(TAG_CACHE.computeIfAbsent(s, TAG_ADDER), s2));
+        span.setTag(MULE_CORRELATION_ID, event.getCorrelationId());
+        // cache the resource name might be complex since it depends on a couple of keys
+        String extraDetail = null;
+        if (component != null) {
+            extraDetail = COMPONENT_DOC_CACHE.computeIfAbsent(component, COMPONENT_DOC_ADDER);
+        }
+        if (extraDetail == null) {
+            extraDetail = (String) span.getTag(MULE_LOCATION);
+        }
+        if (extraDetail != null) {
+            span.setResourceName(spanInfo.getName() + " " + extraDetail);
+        } else {
+            span.setResourceName(spanInfo.getName());
+        }
+        afterStart(span);
+        return span;
     }
-    afterStart(span);
-    return span;
-  }
 }
diff --git a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/NoopMuleSpan.java b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/NoopMuleSpan.java
index c5aa1cc8ca4..6f951dbc361 100644
--- a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/NoopMuleSpan.java
+++ b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/NoopMuleSpan.java
@@ -9,35 +9,35 @@
 import org.mule.runtime.api.profiling.tracing.SpanIdentifier;
 
 public class NoopMuleSpan implements Span {
-  public static final Optional<Span> INSTANCE = Optional.of(new NoopMuleSpan());
-
-  @Override
-  public Span getParent() {
-    return null;
-  }
-
-  @Override
-  public SpanIdentifier getIdentifier() {
-    return SpanIdentifier.INVALID_SPAN_IDENTIFIER;
-  }
-
-  @Override
-  public String getName() {
-    return "";
-  }
-
-  @Override
-  public SpanDuration getDuration() {
-    return null;
-  }
-
-  @Override
-  public List<SpanError> getErrors() {
-    return Collections.emptyList();
-  }
-
-  @Override
-  public boolean hasErrors() {
-    return false;
-  }
+    public static final Optional<Span> INSTANCE = Optional.of(new NoopMuleSpan());
+
+    @Override
+    public Span getParent() {
+        return null;
+    }
+
+    @Override
+    public SpanIdentifier getIdentifier() {
+        return SpanIdentifier.INVALID_SPAN_IDENTIFIER;
+    }
+
+    @Override
+    public String getName() {
+        return "";
+    }
+
+    @Override
+    public SpanDuration getDuration() {
+        return null;
+    }
+
+    @Override
+    public List<SpanError> getErrors() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public boolean hasErrors() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/SpanState.java b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/SpanState.java
index 2a531689289..2e09798610d 100644
--- a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/SpanState.java
+++ b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/SpanState.java
@@ -3,41 +3,41 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 
 public class SpanState {
-  private final AgentSpan eventContextSpan;
-  private final SpanState previousState;
-  private AgentSpan spanContextSpan;
-
-  public SpanState(AgentSpan eventContextSpan, SpanState previousState) {
-    this.eventContextSpan = eventContextSpan;
-    this.previousState = previousState;
-  }
-
-  public AgentSpan getEventContextSpan() {
-    return eventContextSpan;
-  }
-
-  public SpanState getPreviousState() {
-    return previousState;
-  }
-
-  public AgentSpan getSpanContextSpan() {
-    return spanContextSpan;
-  }
-
-  public SpanState withSpanContextSpan(AgentSpan spanContextSpan) {
-    this.spanContextSpan = spanContextSpan;
-    return this;
-  }
-
-  @Override
-  public String toString() {
-    return "SpanState{"
-        + "eventContextSpan="
-        + eventContextSpan
-        + ", previousState="
-        + previousState
-        + ", spanContextSpan="
-        + spanContextSpan
-        + '}';
-  }
+    private final AgentSpan eventContextSpan;
+    private final SpanState previousState;
+    private AgentSpan spanContextSpan;
+
+    public SpanState(AgentSpan eventContextSpan, SpanState previousState) {
+        this.eventContextSpan = eventContextSpan;
+        this.previousState = previousState;
+    }
+
+    public AgentSpan getEventContextSpan() {
+        return eventContextSpan;
+    }
+
+    public SpanState getPreviousState() {
+        return previousState;
+    }
+
+    public AgentSpan getSpanContextSpan() {
+        return spanContextSpan;
+    }
+
+    public SpanState withSpanContextSpan(AgentSpan spanContextSpan) {
+        this.spanContextSpan = spanContextSpan;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "SpanState{"
+                + "eventContextSpan="
+                + eventContextSpan
+                + ", previousState="
+                + previousState
+                + ", spanContextSpan="
+                + spanContextSpan
+                + '}';
+    }
 }
diff --git a/dd-java-agent/instrumentation/mule-4.5/src/test/groovy/mule4/HttpServerTestHandlerAdvice.java b/dd-java-agent/instrumentation/mule-4.5/src/test/groovy/mule4/HttpServerTestHandlerAdvice.java
index 03f82f2dfdf..51ba9c2df55 100644
--- a/dd-java-agent/instrumentation/mule-4.5/src/test/groovy/mule4/HttpServerTestHandlerAdvice.java
+++ b/dd-java-agent/instrumentation/mule-4.5/src/test/groovy/mule4/HttpServerTestHandlerAdvice.java
@@ -5,10 +5,8 @@
 
 // Advice to call the bridge code that interacts with the test code
 public class HttpServerTestHandlerAdvice {
-  @Advice.OnMethodExit()
-  static void onExit(
-      @Advice.Argument(value = 0) String requestPath,
-      @Advice.Return(readOnly = false) Object[] ret) {
-    ret = HttpServerTestBridge.testHandle(requestPath);
-  }
+    @Advice.OnMethodExit()
+    static void onExit(@Advice.Argument(value = 0) String requestPath, @Advice.Return(readOnly = false) Object[] ret) {
+        ret = HttpServerTestBridge.testHandle(requestPath);
+    }
 }
diff --git a/dd-java-agent/instrumentation/mule-4.5/src/test/java/mule4/HttpServerTestHandlerInstrumentation.java b/dd-java-agent/instrumentation/mule-4.5/src/test/java/mule4/HttpServerTestHandlerInstrumentation.java
index 4b907abc0e8..0478cee7b2f 100644
--- a/dd-java-agent/instrumentation/mule-4.5/src/test/java/mule4/HttpServerTestHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/mule-4.5/src/test/java/mule4/HttpServerTestHandlerInstrumentation.java
@@ -14,20 +14,19 @@
  */
 @AutoService(InstrumenterModule.class)
 public class HttpServerTestHandlerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public HttpServerTestHandlerInstrumentation() {
-    super("mule4-http-server-test-handler");
-  }
+    public HttpServerTestHandlerInstrumentation() {
+        super("mule4-http-server-test-handler");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "mule4.HttpServerTestHandler";
-  }
+    @Override
+    public String instrumentedType() {
+        return "mule4.HttpServerTestHandler";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("testHandle").and(isStatic()), "mule4.HttpServerTestHandlerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("testHandle").and(isStatic()), "mule4.HttpServerTestHandlerAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/mule-4.5/src/test/java/mule4/MuleTestContainer.java b/dd-java-agent/instrumentation/mule-4.5/src/test/java/mule4/MuleTestContainer.java
index 5b249d35759..7ad7f18d554 100644
--- a/dd-java-agent/instrumentation/mule-4.5/src/test/java/mule4/MuleTestContainer.java
+++ b/dd-java-agent/instrumentation/mule-4.5/src/test/java/mule4/MuleTestContainer.java
@@ -16,54 +16,53 @@
  * mule directory.
  */
 public class MuleTestContainer {
-  DefaultMuleContainer container;
+    DefaultMuleContainer container;
 
-  public MuleTestContainer(File muleBaseDirectory) throws IOException {
-    if (!muleBaseDirectory.exists()) {
-      muleBaseDirectory.mkdirs();
+    public MuleTestContainer(File muleBaseDirectory) throws IOException {
+        if (!muleBaseDirectory.exists()) {
+            muleBaseDirectory.mkdirs();
+        }
+        String basePath = muleBaseDirectory.getCanonicalPath();
+        // Makes sure that Mule doesn't try to configure its own logging
+        System.setProperty(MuleSystemProperties.MULE_SIMPLE_LOG, "true");
+        // This is the Mule runtime folder where files are stored
+        System.setProperty(MuleProperties.MULE_BASE_DIRECTORY_PROPERTY, basePath);
+        System.setProperty(MuleProperties.MULE_HOME_DIRECTORY_PROPERTY, basePath);
+        System.setProperty("mule.classloader.container.jpmsModuleLayer", "false");
+        // Mule is a bit picky with some directories existing, so let's create them
+        for (String dirName : new String[] {"domains/default", "apps"}) {
+            File dir = new File(muleBaseDirectory, dirName);
+            if (!dir.exists()) {
+                dir.mkdirs();
+            }
+        }
+        try {
+            this.container = DefaultMuleContainer.class.newInstance();
+        } catch (Throwable t) {
+            t.printStackTrace();
+            try {
+                this.container = DefaultMuleContainer.class
+                        .getDeclaredConstructor(String[].class)
+                        .newInstance((Object) new String[0]);
+            } catch (Throwable t2) {
+                throw new RuntimeException("Unable to instantiate MuleContainer", t2);
+            }
+        }
     }
-    String basePath = muleBaseDirectory.getCanonicalPath();
-    // Makes sure that Mule doesn't try to configure its own logging
-    System.setProperty(MuleSystemProperties.MULE_SIMPLE_LOG, "true");
-    // This is the Mule runtime folder where files are stored
-    System.setProperty(MuleProperties.MULE_BASE_DIRECTORY_PROPERTY, basePath);
-    System.setProperty(MuleProperties.MULE_HOME_DIRECTORY_PROPERTY, basePath);
-    System.setProperty("mule.classloader.container.jpmsModuleLayer", "false");
-    // Mule is a bit picky with some directories existing, so let's create them
-    for (String dirName : new String[] {"domains/default", "apps"}) {
-      File dir = new File(muleBaseDirectory, dirName);
-      if (!dir.exists()) {
-        dir.mkdirs();
-      }
-    }
-    try {
-      this.container = DefaultMuleContainer.class.newInstance();
-    } catch (Throwable t) {
-      t.printStackTrace();
-      try {
-        this.container =
-            DefaultMuleContainer.class
-                .getDeclaredConstructor(String[].class)
-                .newInstance((Object) new String[0]);
-      } catch (Throwable t2) {
-        throw new RuntimeException("Unable to instantiate MuleContainer", t2);
-      }
-    }
-  }
 
-  public void start() throws MuleException {
-    container.start(false);
-  }
+    public void start() throws MuleException {
+        container.start(false);
+    }
 
-  public void deploy(URI app, Properties appProperties) throws IOException {
-    container.getDeploymentService().deploy(app, appProperties);
-  }
+    public void deploy(URI app, Properties appProperties) throws IOException {
+        container.getDeploymentService().deploy(app, appProperties);
+    }
 
-  public void undeploy(String appName) {
-    container.getDeploymentService().undeploy(appName);
-  }
+    public void undeploy(String appName) {
+        container.getDeploymentService().undeploy(appName);
+    }
 
-  public void stop() throws Exception {
-    container.shutdown();
-  }
+    public void stop() throws Exception {
+        container.shutdown();
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/AbstractNettyAdvice.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/AbstractNettyAdvice.java
index 97845db559b..5565bf85b56 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/AbstractNettyAdvice.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/AbstractNettyAdvice.java
@@ -4,7 +4,7 @@
 import org.jboss.netty.handler.codec.http.HttpRequest;
 
 public class AbstractNettyAdvice {
-  public static void muzzleCheck(final HttpRequest httpRequest) {
-    final HttpHeaders headers = httpRequest.headers();
-  }
+    public static void muzzleCheck(final HttpRequest httpRequest) {
+        final HttpHeaders headers = httpRequest.headers();
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java
index cc59edc6757..dea404cc7c5 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java
@@ -28,101 +28,99 @@
 
 @AutoService(InstrumenterModule.class)
 public class ChannelFutureListenerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public ChannelFutureListenerInstrumentation() {
-    super(
-        NettyChannelPipelineInstrumentation.INSTRUMENTATION_NAME,
-        NettyChannelPipelineInstrumentation.ADDITIONAL_INSTRUMENTATION_NAMES);
-  }
+    public ChannelFutureListenerInstrumentation() {
+        super(
+                NettyChannelPipelineInstrumentation.INSTRUMENTATION_NAME,
+                NettyChannelPipelineInstrumentation.ADDITIONAL_INSTRUMENTATION_NAMES);
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.jboss.netty.channel.ChannelFutureListener";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.jboss.netty.channel.ChannelFutureListener";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".util.CombinedSimpleChannelHandler",
-      packageName + ".AbstractNettyAdvice",
-      packageName + ".ChannelTraceContext",
-      packageName + ".ChannelTraceContext$Factory",
-      packageName + ".server.ResponseExtractAdapter",
-      packageName + ".server.NettyHttpServerDecorator",
-      packageName + ".server.NettyHttpServerDecorator$NettyBlockResponseFunction",
-      packageName + ".server.NettyHttpServerDecorator$IgnoreBlockingExceptionHandler",
-      packageName + ".server.BlockingResponseHandler",
-      packageName + ".server.BlockAllWritesHandler",
-      packageName + ".server.HttpServerRequestTracingHandler",
-      packageName + ".server.HttpServerResponseTracingHandler",
-      packageName + ".server.HttpServerTracingHandler",
-      packageName + ".server.MaybeBlockResponseHandler",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".util.CombinedSimpleChannelHandler",
+            packageName + ".AbstractNettyAdvice",
+            packageName + ".ChannelTraceContext",
+            packageName + ".ChannelTraceContext$Factory",
+            packageName + ".server.ResponseExtractAdapter",
+            packageName + ".server.NettyHttpServerDecorator",
+            packageName + ".server.NettyHttpServerDecorator$NettyBlockResponseFunction",
+            packageName + ".server.NettyHttpServerDecorator$IgnoreBlockingExceptionHandler",
+            packageName + ".server.BlockingResponseHandler",
+            packageName + ".server.BlockAllWritesHandler",
+            packageName + ".server.HttpServerRequestTracingHandler",
+            packageName + ".server.HttpServerResponseTracingHandler",
+            packageName + ".server.HttpServerTracingHandler",
+            packageName + ".server.MaybeBlockResponseHandler",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("operationComplete"))
-            .and(takesArgument(0, named("org.jboss.netty.channel.ChannelFuture"))),
-        ChannelFutureListenerInstrumentation.class.getName() + "$OperationCompleteAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("operationComplete"))
+                        .and(takesArgument(0, named("org.jboss.netty.channel.ChannelFuture"))),
+                ChannelFutureListenerInstrumentation.class.getName() + "$OperationCompleteAdvice");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.jboss.netty.channel.Channel", packageName + ".ChannelTraceContext");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.jboss.netty.channel.Channel", packageName + ".ChannelTraceContext");
+    }
 
-  public static class OperationCompleteAdvice extends AbstractNettyAdvice {
-    @Advice.OnMethodEnter
-    public static ContextScope activateScope(@Advice.Argument(0) final ChannelFuture future) {
-      /*
-      Idea here is:
-       - To return scope only if we have captured it.
-       - To capture scope only in case of error on a non-null channel.
-       */
-      final Throwable cause = future.getCause();
-      if (cause == null || future.getChannel() == null) {
-        return null;
-      }
+    public static class OperationCompleteAdvice extends AbstractNettyAdvice {
+        @Advice.OnMethodEnter
+        public static ContextScope activateScope(@Advice.Argument(0) final ChannelFuture future) {
+            /*
+            Idea here is:
+             - To return scope only if we have captured it.
+             - To capture scope only in case of error on a non-null channel.
+             */
+            final Throwable cause = future.getCause();
+            if (cause == null || future.getChannel() == null) {
+                return null;
+            }
 
-      final ContextStore<Channel, ChannelTraceContext> contextStore =
-          InstrumentationContext.get(Channel.class, ChannelTraceContext.class);
+            final ContextStore<Channel, ChannelTraceContext> contextStore =
+                    InstrumentationContext.get(Channel.class, ChannelTraceContext.class);
 
-      final ContextContinuation continuation =
-          contextStore
-              .getOrCreate(future.getChannel(), ChannelTraceContext.Factory.INSTANCE)
-              .getConnectionContinuation();
-      contextStore.get(future.getChannel()).setConnectionContinuation(null);
-      if (continuation == null) {
-        return null;
-      }
-      final ContextScope parentScope = continuation.resume();
+            final ContextContinuation continuation = contextStore
+                    .getOrCreate(future.getChannel(), ChannelTraceContext.Factory.INSTANCE)
+                    .getConnectionContinuation();
+            contextStore.get(future.getChannel()).setConnectionContinuation(null);
+            if (continuation == null) {
+                return null;
+            }
+            final ContextScope parentScope = continuation.resume();
 
-      final AgentSpan errorSpan = startSpan("netty", NETTY_CONNECT).setTag(Tags.COMPONENT, "netty");
-      errorSpan.spanContext().setIntegrationName(NETTY);
-      try (final ContextScope scope = errorSpan.attachWithContext()) {
-        DECORATE.onError(errorSpan, cause);
-        DECORATE.beforeFinish(scope.context());
-        errorSpan.finish();
-      }
+            final AgentSpan errorSpan = startSpan("netty", NETTY_CONNECT).setTag(Tags.COMPONENT, "netty");
+            errorSpan.spanContext().setIntegrationName(NETTY);
+            try (final ContextScope scope = errorSpan.attachWithContext()) {
+                DECORATE.onError(errorSpan, cause);
+                DECORATE.beforeFinish(scope.context());
+                errorSpan.finish();
+            }
 
-      return parentScope;
-    }
+            return parentScope;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void deactivateScope(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void deactivateScope(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelPipelineAdviceUtil.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelPipelineAdviceUtil.java
index 45d4a34f9cb..304fc8d8cf3 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelPipelineAdviceUtil.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelPipelineAdviceUtil.java
@@ -32,79 +32,77 @@
  * currently implemented.
  */
 public class ChannelPipelineAdviceUtil {
-  public static void wrapHandler(
-      final ContextStore<Channel, ChannelTraceContext> contextStore,
-      final ChannelPipeline pipeline,
-      final ChannelHandler handler) {
-    try {
-      // Server pipeline handlers
-      if (handler instanceof HttpServerCodec) {
-        pipeline.addLast(
-            HttpServerTracingHandler.class.getName(), new HttpServerTracingHandler(contextStore));
-        pipeline.addLast(
-            MaybeBlockResponseHandler.class.getName(), new MaybeBlockResponseHandler(contextStore));
-      } else if (handler instanceof HttpRequestDecoder) {
-        pipeline.addLast(
-            HttpServerRequestTracingHandler.class.getName(),
-            new HttpServerRequestTracingHandler(contextStore));
-      } else if (handler instanceof HttpResponseEncoder) {
-        pipeline.addLast(
-            HttpServerResponseTracingHandler.class.getName(),
-            new HttpServerResponseTracingHandler(contextStore));
-        pipeline.addLast(
-            MaybeBlockResponseHandler.class.getName(), new MaybeBlockResponseHandler(contextStore));
-      } else if (handler instanceof WebSocketServerProtocolHandler) {
-        if (InstrumenterConfig.get().isWebsocketTracingEnabled()) {
-          if (pipeline.get(HttpServerTracingHandler.class) != null) {
-            addHandlerAfter(
-                pipeline,
-                "datadog.trace.instrumentation.netty38.server.HttpServerTracingHandler",
-                new WebSocketServerTracingHandler(contextStore));
-          }
+    public static void wrapHandler(
+            final ContextStore<Channel, ChannelTraceContext> contextStore,
+            final ChannelPipeline pipeline,
+            final ChannelHandler handler) {
+        try {
+            // Server pipeline handlers
+            if (handler instanceof HttpServerCodec) {
+                pipeline.addLast(HttpServerTracingHandler.class.getName(), new HttpServerTracingHandler(contextStore));
+                pipeline.addLast(
+                        MaybeBlockResponseHandler.class.getName(), new MaybeBlockResponseHandler(contextStore));
+            } else if (handler instanceof HttpRequestDecoder) {
+                pipeline.addLast(
+                        HttpServerRequestTracingHandler.class.getName(),
+                        new HttpServerRequestTracingHandler(contextStore));
+            } else if (handler instanceof HttpResponseEncoder) {
+                pipeline.addLast(
+                        HttpServerResponseTracingHandler.class.getName(),
+                        new HttpServerResponseTracingHandler(contextStore));
+                pipeline.addLast(
+                        MaybeBlockResponseHandler.class.getName(), new MaybeBlockResponseHandler(contextStore));
+            } else if (handler instanceof WebSocketServerProtocolHandler) {
+                if (InstrumenterConfig.get().isWebsocketTracingEnabled()) {
+                    if (pipeline.get(HttpServerTracingHandler.class) != null) {
+                        addHandlerAfter(
+                                pipeline,
+                                "datadog.trace.instrumentation.netty38.server.HttpServerTracingHandler",
+                                new WebSocketServerTracingHandler(contextStore));
+                    }
+                }
+            } else if (handler instanceof WebSocket13FrameEncoder) {
+                if (InstrumenterConfig.get().isWebsocketTracingEnabled()) {
+                    if (pipeline.get(HttpServerRequestTracingHandler.class) != null) {
+                        addHandlerAfter(
+                                pipeline,
+                                "datadog.trace.instrumentation.netty38.server.HttpServerRequestTracingHandler",
+                                new WebSocketServerRequestTracingHandler(contextStore));
+                    }
+                }
+            } else if (handler instanceof WebSocket13FrameDecoder) {
+                if (InstrumenterConfig.get().isWebsocketTracingEnabled()) {
+                    if (pipeline.get(HttpServerResponseTracingHandler.class) != null) {
+                        addHandlerAfter(
+                                pipeline,
+                                "datadog.trace.instrumentation.netty38.server.HttpServerResponseTracingHandler",
+                                new WebSocketServerResponseTracingHandler(contextStore));
+                    }
+                }
+            } else
+            // Client pipeline handlers
+            if (handler instanceof HttpClientCodec) {
+                pipeline.addLast(HttpClientTracingHandler.class.getName(), new HttpClientTracingHandler(contextStore));
+            } else if (handler instanceof HttpRequestEncoder) {
+                pipeline.addLast(
+                        HttpClientRequestTracingHandler.class.getName(),
+                        new HttpClientRequestTracingHandler(contextStore));
+            } else if (handler instanceof HttpResponseDecoder) {
+                pipeline.addLast(
+                        HttpClientResponseTracingHandler.class.getName(),
+                        new HttpClientResponseTracingHandler(contextStore));
+            }
+        } finally {
+            CallDepthThreadLocalMap.reset(ChannelPipeline.class);
         }
-      } else if (handler instanceof WebSocket13FrameEncoder) {
-        if (InstrumenterConfig.get().isWebsocketTracingEnabled()) {
-          if (pipeline.get(HttpServerRequestTracingHandler.class) != null) {
-            addHandlerAfter(
-                pipeline,
-                "datadog.trace.instrumentation.netty38.server.HttpServerRequestTracingHandler",
-                new WebSocketServerRequestTracingHandler(contextStore));
-          }
-        }
-      } else if (handler instanceof WebSocket13FrameDecoder) {
-        if (InstrumenterConfig.get().isWebsocketTracingEnabled()) {
-          if (pipeline.get(HttpServerResponseTracingHandler.class) != null) {
-            addHandlerAfter(
-                pipeline,
-                "datadog.trace.instrumentation.netty38.server.HttpServerResponseTracingHandler",
-                new WebSocketServerResponseTracingHandler(contextStore));
-          }
-        }
-      } else
-      // Client pipeline handlers
-      if (handler instanceof HttpClientCodec) {
-        pipeline.addLast(
-            HttpClientTracingHandler.class.getName(), new HttpClientTracingHandler(contextStore));
-      } else if (handler instanceof HttpRequestEncoder) {
-        pipeline.addLast(
-            HttpClientRequestTracingHandler.class.getName(),
-            new HttpClientRequestTracingHandler(contextStore));
-      } else if (handler instanceof HttpResponseDecoder) {
-        pipeline.addLast(
-            HttpClientResponseTracingHandler.class.getName(),
-            new HttpClientResponseTracingHandler(contextStore));
-      }
-    } finally {
-      CallDepthThreadLocalMap.reset(ChannelPipeline.class);
     }
-  }
 
-  private static void addHandlerAfter(
-      final ChannelPipeline pipeline, final String name, final ChannelHandler handler) {
-    ChannelHandler existing = pipeline.get(handler.getClass());
-    if (existing != null) {
-      pipeline.remove(existing);
+    private static void addHandlerAfter(
+            final ChannelPipeline pipeline, final String name, final ChannelHandler handler) {
+        ChannelHandler existing = pipeline.get(handler.getClass());
+        if (existing != null) {
+            pipeline.remove(existing);
+        }
+        pipeline.addAfter(name, handler.getClass().getName(), handler);
     }
-    pipeline.addAfter(name, handler.getClass().getName(), handler);
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelTraceContext.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelTraceContext.java
index c38a69248bf..f1ce6373cca 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelTraceContext.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelTraceContext.java
@@ -8,109 +8,109 @@
 import org.jboss.netty.handler.codec.http.HttpHeaders;
 
 public class ChannelTraceContext {
-  public static class Factory implements ContextStore.Factory<ChannelTraceContext> {
-    public static final Factory INSTANCE = new Factory();
-
-    @Override
-    public ChannelTraceContext create() {
-      return new ChannelTraceContext();
-    }
-  }
-
-  ContextContinuation connectionContinuation;
-  Context serverContext;
-  AgentSpan clientSpan;
-  AgentSpan clientParentSpan;
-  HttpHeaders requestHeaders;
-  boolean analyzedResponse;
-  boolean blockedResponse;
-
-  HandlerContext.Sender senderHandlerContext;
-  HandlerContext.Receiver receiverHandlerContext;
-
-  public void reset() {
-    this.connectionContinuation = null;
-    this.serverContext = null;
-    this.clientSpan = null;
-    this.clientParentSpan = null;
-    this.requestHeaders = null;
-    this.analyzedResponse = false;
-    this.blockedResponse = false;
-  }
-
-  public void setRequestHeaders(HttpHeaders headers) {
-    this.requestHeaders = headers;
-  }
-
-  public HttpHeaders getRequestHeaders() {
-    return requestHeaders;
-  }
-
-  public boolean isAnalyzedResponse() {
-    return analyzedResponse;
-  }
-
-  public void setAnalyzedResponse(boolean analyzedResponse) {
-    this.analyzedResponse = analyzedResponse;
-  }
-
-  public boolean isBlockedResponse() {
-    return blockedResponse;
-  }
-
-  public void setBlockedResponse(boolean blockedResponse) {
-    this.blockedResponse = blockedResponse;
-  }
-
-  public ContextContinuation getConnectionContinuation() {
-    return connectionContinuation;
-  }
-
-  public Context getServerContext() {
-    return serverContext;
-  }
-
-  public AgentSpan getServerSpan() {
-    return AgentSpan.fromContext(serverContext);
-  }
-
-  public AgentSpan getClientSpan() {
-    return clientSpan;
-  }
-
-  public AgentSpan getClientParentSpan() {
-    return clientParentSpan;
-  }
-
-  public void setConnectionContinuation(ContextContinuation connectionContinuation) {
-    this.connectionContinuation = connectionContinuation;
-  }
-
-  public void setServerContext(Context serverContext) {
-    this.serverContext = serverContext;
-  }
-
-  public void setClientSpan(AgentSpan clientSpan) {
-    this.clientSpan = clientSpan;
-  }
-
-  public void setClientParentSpan(AgentSpan clientParentSpan) {
-    this.clientParentSpan = clientParentSpan;
-  }
-
-  public HandlerContext.Sender getSenderHandlerContext() {
-    return senderHandlerContext;
-  }
-
-  public void setSenderHandlerContext(HandlerContext.Sender senderHandlerContext) {
-    this.senderHandlerContext = senderHandlerContext;
-  }
-
-  public HandlerContext.Receiver getReceiverHandlerContext() {
-    return receiverHandlerContext;
-  }
-
-  public void setReceiverHandlerContext(HandlerContext.Receiver receiverHandlerContext) {
-    this.receiverHandlerContext = receiverHandlerContext;
-  }
+    public static class Factory implements ContextStore.Factory<ChannelTraceContext> {
+        public static final Factory INSTANCE = new Factory();
+
+        @Override
+        public ChannelTraceContext create() {
+            return new ChannelTraceContext();
+        }
+    }
+
+    ContextContinuation connectionContinuation;
+    Context serverContext;
+    AgentSpan clientSpan;
+    AgentSpan clientParentSpan;
+    HttpHeaders requestHeaders;
+    boolean analyzedResponse;
+    boolean blockedResponse;
+
+    HandlerContext.Sender senderHandlerContext;
+    HandlerContext.Receiver receiverHandlerContext;
+
+    public void reset() {
+        this.connectionContinuation = null;
+        this.serverContext = null;
+        this.clientSpan = null;
+        this.clientParentSpan = null;
+        this.requestHeaders = null;
+        this.analyzedResponse = false;
+        this.blockedResponse = false;
+    }
+
+    public void setRequestHeaders(HttpHeaders headers) {
+        this.requestHeaders = headers;
+    }
+
+    public HttpHeaders getRequestHeaders() {
+        return requestHeaders;
+    }
+
+    public boolean isAnalyzedResponse() {
+        return analyzedResponse;
+    }
+
+    public void setAnalyzedResponse(boolean analyzedResponse) {
+        this.analyzedResponse = analyzedResponse;
+    }
+
+    public boolean isBlockedResponse() {
+        return blockedResponse;
+    }
+
+    public void setBlockedResponse(boolean blockedResponse) {
+        this.blockedResponse = blockedResponse;
+    }
+
+    public ContextContinuation getConnectionContinuation() {
+        return connectionContinuation;
+    }
+
+    public Context getServerContext() {
+        return serverContext;
+    }
+
+    public AgentSpan getServerSpan() {
+        return AgentSpan.fromContext(serverContext);
+    }
+
+    public AgentSpan getClientSpan() {
+        return clientSpan;
+    }
+
+    public AgentSpan getClientParentSpan() {
+        return clientParentSpan;
+    }
+
+    public void setConnectionContinuation(ContextContinuation connectionContinuation) {
+        this.connectionContinuation = connectionContinuation;
+    }
+
+    public void setServerContext(Context serverContext) {
+        this.serverContext = serverContext;
+    }
+
+    public void setClientSpan(AgentSpan clientSpan) {
+        this.clientSpan = clientSpan;
+    }
+
+    public void setClientParentSpan(AgentSpan clientParentSpan) {
+        this.clientParentSpan = clientParentSpan;
+    }
+
+    public HandlerContext.Sender getSenderHandlerContext() {
+        return senderHandlerContext;
+    }
+
+    public void setSenderHandlerContext(HandlerContext.Sender senderHandlerContext) {
+        this.senderHandlerContext = senderHandlerContext;
+    }
+
+    public HandlerContext.Receiver getReceiverHandlerContext() {
+        return receiverHandlerContext;
+    }
+
+    public void setReceiverHandlerContext(HandlerContext.Receiver receiverHandlerContext) {
+        this.receiverHandlerContext = receiverHandlerContext;
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java
index 6bc336f07e5..f5f0535af97 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java
@@ -24,62 +24,59 @@
 
 @AutoService(InstrumenterModule.class)
 public class NettyChannelInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public NettyChannelInstrumentation() {
-    super(INSTRUMENTATION_NAME, ADDITIONAL_INSTRUMENTATION_NAMES);
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public NettyChannelInstrumentation() {
+        super(INSTRUMENTATION_NAME, ADDITIONAL_INSTRUMENTATION_NAMES);
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.jboss.netty.channel.Channel";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.jboss.netty.channel.Channel";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".AbstractNettyAdvice",
-      packageName + ".ChannelTraceContext",
-      packageName + ".ChannelTraceContext$Factory"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".AbstractNettyAdvice",
+            packageName + ".ChannelTraceContext",
+            packageName + ".ChannelTraceContext$Factory"
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("connect"))
-            .and(returns(named("org.jboss.netty.channel.ChannelFuture"))),
-        NettyChannelInstrumentation.class.getName() + "$ChannelConnectAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("connect")).and(returns(named("org.jboss.netty.channel.ChannelFuture"))),
+                NettyChannelInstrumentation.class.getName() + "$ChannelConnectAdvice");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.jboss.netty.channel.Channel", packageName + ".ChannelTraceContext");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.jboss.netty.channel.Channel", packageName + ".ChannelTraceContext");
+    }
 
-  public static class ChannelConnectAdvice extends AbstractNettyAdvice {
-    @Advice.OnMethodEnter
-    public static void addConnectContinuation(@Advice.This final Channel channel) {
-      ContextContinuation continuation = currentContext().capture();
-      if (continuation.context() != rootContext()) {
-        final ContextStore<Channel, ChannelTraceContext> contextStore =
-            InstrumentationContext.get(Channel.class, ChannelTraceContext.class);
+    public static class ChannelConnectAdvice extends AbstractNettyAdvice {
+        @Advice.OnMethodEnter
+        public static void addConnectContinuation(@Advice.This final Channel channel) {
+            ContextContinuation continuation = currentContext().capture();
+            if (continuation.context() != rootContext()) {
+                final ContextStore<Channel, ChannelTraceContext> contextStore =
+                        InstrumentationContext.get(Channel.class, ChannelTraceContext.class);
 
-        if (contextStore
-                .getOrCreate(channel, ChannelTraceContext.Factory.INSTANCE)
-                .getConnectionContinuation()
-            != null) {
-          continuation.release();
-        } else {
-          contextStore.get(channel).setConnectionContinuation(continuation);
+                if (contextStore
+                                .getOrCreate(channel, ChannelTraceContext.Factory.INSTANCE)
+                                .getConnectionContinuation()
+                        != null) {
+                    continuation.release();
+                } else {
+                    contextStore.get(channel).setConnectionContinuation(continuation);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java
index 46586895a20..682264dc5d3 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java
@@ -23,134 +23,131 @@
 
 @AutoService(InstrumenterModule.class)
 public class NettyChannelPipelineInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  static final String INSTRUMENTATION_NAME = "netty";
-  static final String[] ADDITIONAL_INSTRUMENTATION_NAMES = {"netty-3.8"};
-
-  public NettyChannelPipelineInstrumentation() {
-    super(INSTRUMENTATION_NAME, ADDITIONAL_INSTRUMENTATION_NAMES);
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.jboss.netty.channel.ChannelPipeline";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".AbstractNettyAdvice",
-      packageName + ".ChannelTraceContext",
-      packageName + ".ChannelTraceContext$Factory",
-      packageName + ".ChannelPipelineAdviceUtil",
-      // Util
-      packageName + ".util.CombinedSimpleChannelHandler",
-      // client helpers
-      packageName + ".client.NettyHttpClientDecorator",
-      packageName + ".client.NettyResponseInjectAdapter",
-      packageName + ".client.HttpClientRequestTracingHandler",
-      packageName + ".client.HttpClientResponseTracingHandler",
-      packageName + ".client.HttpClientTracingHandler",
-      // server helpers
-      packageName + ".server.ResponseExtractAdapter",
-      packageName + ".server.NettyHttpServerDecorator",
-      packageName + ".server.NettyHttpServerDecorator$NettyBlockResponseFunction",
-      packageName + ".server.NettyHttpServerDecorator$IgnoreBlockingExceptionHandler",
-      packageName + ".server.BlockingResponseHandler",
-      packageName + ".server.BlockAllWritesHandler",
-      packageName + ".server.HttpServerRequestTracingHandler",
-      packageName + ".server.HttpServerResponseTracingHandler",
-      packageName + ".server.HttpServerTracingHandler",
-      packageName + ".server.MaybeBlockResponseHandler",
-      packageName + ".server.websocket.WebSocketServerTracingHandler",
-      packageName + ".server.websocket.WebSocketServerRequestTracingHandler",
-      packageName + ".server.websocket.WebSocketServerResponseTracingHandler",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(nameStartsWith("add"))
-            .and(takesArgument(1, named("org.jboss.netty.channel.ChannelHandler"))),
-        NettyChannelPipelineInstrumentation.class.getName() + "$ChannelPipelineAdd2ArgsAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(nameStartsWith("add"))
-            .and(takesArgument(2, named("org.jboss.netty.channel.ChannelHandler"))),
-        NettyChannelPipelineInstrumentation.class.getName() + "$ChannelPipelineAdd3ArgsAdvice");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.jboss.netty.channel.Channel", packageName + ".ChannelTraceContext");
-  }
-
-  public static class ChannelPipelineAdd2ArgsAdvice extends AbstractNettyAdvice {
-    @Advice.OnMethodEnter
-    public static int checkDepth(
-        @Advice.This final ChannelPipeline pipeline,
-        @Advice.Argument(1) final ChannelHandler handler) {
-      // Pipelines are created once as a factory and then copied multiple times using the same add
-      // methods as we are hooking. If our handler has already been added we need to remove it so we
-      // don't end up with duplicates (this throws an exception)
-      if (pipeline.get(handler.getClass().getName()) != null) {
-        pipeline.remove(handler.getClass().getName());
-      }
-      return CallDepthThreadLocalMap.incrementCallDepth(ChannelPipeline.class);
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    static final String INSTRUMENTATION_NAME = "netty";
+    static final String[] ADDITIONAL_INSTRUMENTATION_NAMES = {"netty-3.8"};
+
+    public NettyChannelPipelineInstrumentation() {
+        super(INSTRUMENTATION_NAME, ADDITIONAL_INSTRUMENTATION_NAMES);
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void addHandler(
-        @Advice.Enter final int depth,
-        @Advice.This final ChannelPipeline pipeline,
-        @Advice.Argument(1) final ChannelHandler handler) {
-      if (depth > 0) {
-        return;
-      }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.jboss.netty.channel.ChannelPipeline";
+    }
 
-      final ContextStore<Channel, ChannelTraceContext> contextStore =
-          InstrumentationContext.get(Channel.class, ChannelTraceContext.class);
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-      ChannelPipelineAdviceUtil.wrapHandler(contextStore, pipeline, handler);
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".AbstractNettyAdvice",
+            packageName + ".ChannelTraceContext",
+            packageName + ".ChannelTraceContext$Factory",
+            packageName + ".ChannelPipelineAdviceUtil",
+            // Util
+            packageName + ".util.CombinedSimpleChannelHandler",
+            // client helpers
+            packageName + ".client.NettyHttpClientDecorator",
+            packageName + ".client.NettyResponseInjectAdapter",
+            packageName + ".client.HttpClientRequestTracingHandler",
+            packageName + ".client.HttpClientResponseTracingHandler",
+            packageName + ".client.HttpClientTracingHandler",
+            // server helpers
+            packageName + ".server.ResponseExtractAdapter",
+            packageName + ".server.NettyHttpServerDecorator",
+            packageName + ".server.NettyHttpServerDecorator$NettyBlockResponseFunction",
+            packageName + ".server.NettyHttpServerDecorator$IgnoreBlockingExceptionHandler",
+            packageName + ".server.BlockingResponseHandler",
+            packageName + ".server.BlockAllWritesHandler",
+            packageName + ".server.HttpServerRequestTracingHandler",
+            packageName + ".server.HttpServerResponseTracingHandler",
+            packageName + ".server.HttpServerTracingHandler",
+            packageName + ".server.MaybeBlockResponseHandler",
+            packageName + ".server.websocket.WebSocketServerTracingHandler",
+            packageName + ".server.websocket.WebSocketServerRequestTracingHandler",
+            packageName + ".server.websocket.WebSocketServerResponseTracingHandler",
+        };
     }
-  }
-
-  public static class ChannelPipelineAdd3ArgsAdvice extends AbstractNettyAdvice {
-    @Advice.OnMethodEnter
-    public static int checkDepth(
-        @Advice.This final ChannelPipeline pipeline,
-        @Advice.Argument(2) final ChannelHandler handler) {
-      // Pipelines are created once as a factory and then copied multiple times using the same add
-      // methods as we are hooking. If our handler has already been added we need to remove it so we
-      // don't end up with duplicates (this throws an exception)
-      if (pipeline.get(handler.getClass().getName()) != null) {
-        pipeline.remove(handler.getClass().getName());
-      }
-      return CallDepthThreadLocalMap.incrementCallDepth(ChannelPipeline.class);
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(nameStartsWith("add"))
+                        .and(takesArgument(1, named("org.jboss.netty.channel.ChannelHandler"))),
+                NettyChannelPipelineInstrumentation.class.getName() + "$ChannelPipelineAdd2ArgsAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(nameStartsWith("add"))
+                        .and(takesArgument(2, named("org.jboss.netty.channel.ChannelHandler"))),
+                NettyChannelPipelineInstrumentation.class.getName() + "$ChannelPipelineAdd3ArgsAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void addHandler(
-        @Advice.Enter final int depth,
-        @Advice.This final ChannelPipeline pipeline,
-        @Advice.Argument(2) final ChannelHandler handler) {
-      if (depth > 0) {
-        return;
-      }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.jboss.netty.channel.Channel", packageName + ".ChannelTraceContext");
+    }
 
-      final ContextStore<Channel, ChannelTraceContext> contextStore =
-          InstrumentationContext.get(Channel.class, ChannelTraceContext.class);
+    public static class ChannelPipelineAdd2ArgsAdvice extends AbstractNettyAdvice {
+        @Advice.OnMethodEnter
+        public static int checkDepth(
+                @Advice.This final ChannelPipeline pipeline, @Advice.Argument(1) final ChannelHandler handler) {
+            // Pipelines are created once as a factory and then copied multiple times using the same add
+            // methods as we are hooking. If our handler has already been added we need to remove it so we
+            // don't end up with duplicates (this throws an exception)
+            if (pipeline.get(handler.getClass().getName()) != null) {
+                pipeline.remove(handler.getClass().getName());
+            }
+            return CallDepthThreadLocalMap.incrementCallDepth(ChannelPipeline.class);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void addHandler(
+                @Advice.Enter final int depth,
+                @Advice.This final ChannelPipeline pipeline,
+                @Advice.Argument(1) final ChannelHandler handler) {
+            if (depth > 0) {
+                return;
+            }
+
+            final ContextStore<Channel, ChannelTraceContext> contextStore =
+                    InstrumentationContext.get(Channel.class, ChannelTraceContext.class);
+
+            ChannelPipelineAdviceUtil.wrapHandler(contextStore, pipeline, handler);
+        }
+    }
 
-      ChannelPipelineAdviceUtil.wrapHandler(contextStore, pipeline, handler);
+    public static class ChannelPipelineAdd3ArgsAdvice extends AbstractNettyAdvice {
+        @Advice.OnMethodEnter
+        public static int checkDepth(
+                @Advice.This final ChannelPipeline pipeline, @Advice.Argument(2) final ChannelHandler handler) {
+            // Pipelines are created once as a factory and then copied multiple times using the same add
+            // methods as we are hooking. If our handler has already been added we need to remove it so we
+            // don't end up with duplicates (this throws an exception)
+            if (pipeline.get(handler.getClass().getName()) != null) {
+                pipeline.remove(handler.getClass().getName());
+            }
+            return CallDepthThreadLocalMap.incrementCallDepth(ChannelPipeline.class);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void addHandler(
+                @Advice.Enter final int depth,
+                @Advice.This final ChannelPipeline pipeline,
+                @Advice.Argument(2) final ChannelHandler handler) {
+            if (depth > 0) {
+                return;
+            }
+
+            final ContextStore<Channel, ChannelTraceContext> contextStore =
+                    InstrumentationContext.get(Channel.class, ChannelTraceContext.class);
+
+            ChannelPipelineAdviceUtil.wrapHandler(contextStore, pipeline, handler);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java
index 07fc9be8b0f..b2d8fcf1a05 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java
@@ -25,63 +25,61 @@
 
 public class HttpClientRequestTracingHandler extends SimpleChannelDownstreamHandler {
 
-  private final ContextStore<Channel, ChannelTraceContext> contextStore;
+    private final ContextStore<Channel, ChannelTraceContext> contextStore;
 
-  public HttpClientRequestTracingHandler(
-      final ContextStore<Channel, ChannelTraceContext> contextStore) {
-    this.contextStore = contextStore;
-  }
-
-  @Override
-  public void writeRequested(final ChannelHandlerContext ctx, final MessageEvent msg)
-      throws Exception {
-    if (!(msg.getMessage() instanceof HttpRequest)) {
-      ctx.sendDownstream(msg);
-      return;
+    public HttpClientRequestTracingHandler(final ContextStore<Channel, ChannelTraceContext> contextStore) {
+        this.contextStore = contextStore;
     }
 
-    final ChannelTraceContext channelTraceContext =
-        contextStore.getOrCreate(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE);
+    @Override
+    public void writeRequested(final ChannelHandlerContext ctx, final MessageEvent msg) throws Exception {
+        if (!(msg.getMessage() instanceof HttpRequest)) {
+            ctx.sendDownstream(msg);
+            return;
+        }
 
-    ContextScope parentScope = null;
-    final ContextContinuation continuation = channelTraceContext.getConnectionContinuation();
-    if (continuation != null) {
-      parentScope = continuation.resume();
-      channelTraceContext.setConnectionContinuation(null);
-    }
+        final ChannelTraceContext channelTraceContext =
+                contextStore.getOrCreate(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE);
+
+        ContextScope parentScope = null;
+        final ContextContinuation continuation = channelTraceContext.getConnectionContinuation();
+        if (continuation != null) {
+            parentScope = continuation.resume();
+            channelTraceContext.setConnectionContinuation(null);
+        }
 
-    final HttpRequest request = (HttpRequest) msg.getMessage();
+        final HttpRequest request = (HttpRequest) msg.getMessage();
 
-    channelTraceContext.setClientParentSpan(activeSpan());
-    boolean isSecure = ctx.getPipeline().get("sslHandler") != null;
-    NettyHttpClientDecorator decorate = isSecure ? DECORATE_SECURE : DECORATE;
+        channelTraceContext.setClientParentSpan(activeSpan());
+        boolean isSecure = ctx.getPipeline().get("sslHandler") != null;
+        NettyHttpClientDecorator decorate = isSecure ? DECORATE_SECURE : DECORATE;
 
-    final AgentSpan span = startSpan(NETTY_CLIENT.toString(), NETTY_CLIENT_REQUEST);
-    try (final ContextScope scope = activateSpan(span)) {
-      decorate.afterStart(span);
-      decorate.onRequest(span, request);
+        final AgentSpan span = startSpan(NETTY_CLIENT.toString(), NETTY_CLIENT_REQUEST);
+        try (final ContextScope scope = activateSpan(span)) {
+            decorate.afterStart(span);
+            decorate.onRequest(span, request);
 
-      SocketAddress socketAddress = ctx.getChannel().getRemoteAddress();
-      if (socketAddress instanceof InetSocketAddress) {
-        decorate.onPeerConnection(span, (InetSocketAddress) socketAddress);
-      }
+            SocketAddress socketAddress = ctx.getChannel().getRemoteAddress();
+            if (socketAddress instanceof InetSocketAddress) {
+                decorate.onPeerConnection(span, (InetSocketAddress) socketAddress);
+            }
 
-      DECORATE.injectContext(Context.current(), request.headers(), SETTER);
+            DECORATE.injectContext(Context.current(), request.headers(), SETTER);
 
-      channelTraceContext.setClientSpan(span);
+            channelTraceContext.setClientSpan(span);
 
-      try {
-        ctx.sendDownstream(msg);
-      } catch (final Throwable throwable) {
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        span.finish();
-        throw throwable;
-      }
-    } finally {
-      if (parentScope != null) {
-        parentScope.close();
-      }
+            try {
+                ctx.sendDownstream(msg);
+            } catch (final Throwable throwable) {
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                span.finish();
+                throw throwable;
+            }
+        } finally {
+            if (parentScope != null) {
+                parentScope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java
index e340be8ee77..7c1f6e7a41d 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java
@@ -17,67 +17,65 @@
 
 public class HttpClientResponseTracingHandler extends SimpleChannelUpstreamHandler {
 
-  private final ContextStore<Channel, ChannelTraceContext> contextStore;
+    private final ContextStore<Channel, ChannelTraceContext> contextStore;
 
-  public HttpClientResponseTracingHandler(
-      final ContextStore<Channel, ChannelTraceContext> contextStore) {
-    this.contextStore = contextStore;
-  }
+    public HttpClientResponseTracingHandler(final ContextStore<Channel, ChannelTraceContext> contextStore) {
+        this.contextStore = contextStore;
+    }
 
-  @Override
-  public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent msg)
-      throws Exception {
-    final ChannelTraceContext channelTraceContext =
-        contextStore.getOrCreate(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE);
+    @Override
+    public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent msg) throws Exception {
+        final ChannelTraceContext channelTraceContext =
+                contextStore.getOrCreate(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE);
 
-    AgentSpan parent = channelTraceContext.getClientParentSpan();
-    if (parent == null) {
-      parent = noopSpan();
-      channelTraceContext.setClientParentSpan(noopSpan());
-    }
-    final AgentSpan span = channelTraceContext.getClientSpan();
+        AgentSpan parent = channelTraceContext.getClientParentSpan();
+        if (parent == null) {
+            parent = noopSpan();
+            channelTraceContext.setClientParentSpan(noopSpan());
+        }
+        final AgentSpan span = channelTraceContext.getClientSpan();
 
-    final boolean finishSpan = msg.getMessage() instanceof HttpResponse;
+        final boolean finishSpan = msg.getMessage() instanceof HttpResponse;
 
-    if (span != null && finishSpan) {
-      try (final ContextScope scope = activateSpan(span)) {
-        DECORATE.onResponse(span, (HttpResponse) msg.getMessage());
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
-    }
+        if (span != null && finishSpan) {
+            try (final ContextScope scope = activateSpan(span)) {
+                DECORATE.onResponse(span, (HttpResponse) msg.getMessage());
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
+        }
 
-    // We want the callback in the scope of the parent, not the client span
-    try (final ContextScope scope = activateSpan(parent)) {
-      ctx.sendUpstream(msg);
+        // We want the callback in the scope of the parent, not the client span
+        try (final ContextScope scope = activateSpan(parent)) {
+            ctx.sendUpstream(msg);
+        }
     }
-  }
 
-  @Override
-  public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception {
-    final ChannelTraceContext channelTraceContext =
-        contextStore.getOrCreate(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE);
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception {
+        final ChannelTraceContext channelTraceContext =
+                contextStore.getOrCreate(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE);
 
-    AgentSpan parent = channelTraceContext.getClientParentSpan();
-    if (parent == null) {
-      parent = noopSpan();
-      channelTraceContext.setClientParentSpan(noopSpan());
-    }
+        AgentSpan parent = channelTraceContext.getClientParentSpan();
+        if (parent == null) {
+            parent = noopSpan();
+            channelTraceContext.setClientParentSpan(noopSpan());
+        }
 
-    final AgentSpan span = channelTraceContext.getClientSpan();
-    if (span != null) {
-      // If an exception is passed to this point, it likely means it was unhandled and the
-      // client span won't be finished with a proper response, so we should finish the span here.
-      try (final ContextScope scope = activateSpan(span)) {
-        DECORATE.onError(span, e.getCause());
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
-    }
+        final AgentSpan span = channelTraceContext.getClientSpan();
+        if (span != null) {
+            // If an exception is passed to this point, it likely means it was unhandled and the
+            // client span won't be finished with a proper response, so we should finish the span here.
+            try (final ContextScope scope = activateSpan(span)) {
+                DECORATE.onError(span, e.getCause());
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
+        }
 
-    // We want the callback in the scope of the parent, not the client span
-    try (final ContextScope scope = activateSpan(parent)) {
-      super.exceptionCaught(ctx, e);
+        // We want the callback in the scope of the parent, not the client span
+        try (final ContextScope scope = activateSpan(parent)) {
+            super.exceptionCaught(ctx, e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientTracingHandler.java
index ebc8ebc0fdc..0f3f043e50b 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientTracingHandler.java
@@ -6,12 +6,9 @@
 import org.jboss.netty.channel.Channel;
 
 public class HttpClientTracingHandler
-    extends CombinedSimpleChannelHandler<
-        HttpClientResponseTracingHandler, HttpClientRequestTracingHandler> {
+        extends CombinedSimpleChannelHandler<HttpClientResponseTracingHandler, HttpClientRequestTracingHandler> {
 
-  public HttpClientTracingHandler(final ContextStore<Channel, ChannelTraceContext> contextStore) {
-    super(
-        new HttpClientResponseTracingHandler(contextStore),
-        new HttpClientRequestTracingHandler(contextStore));
-  }
+    public HttpClientTracingHandler(final ContextStore<Channel, ChannelTraceContext> contextStore) {
+        super(new HttpClientResponseTracingHandler(contextStore), new HttpClientRequestTracingHandler(contextStore));
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyHttpClientDecorator.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyHttpClientDecorator.java
index 49251fcd9cc..c8d7a3acc0d 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyHttpClientDecorator.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyHttpClientDecorator.java
@@ -11,57 +11,56 @@
 import org.jboss.netty.handler.codec.http.HttpResponse;
 
 public class NettyHttpClientDecorator extends HttpClientDecorator<HttpRequest, HttpResponse> {
-  public static final CharSequence NETTY_CLIENT = UTF8BytesString.create("netty-client");
+    public static final CharSequence NETTY_CLIENT = UTF8BytesString.create("netty-client");
 
-  public static final NettyHttpClientDecorator DECORATE = new NettyHttpClientDecorator("http://");
-  public static final NettyHttpClientDecorator DECORATE_SECURE =
-      new NettyHttpClientDecorator("https://");
+    public static final NettyHttpClientDecorator DECORATE = new NettyHttpClientDecorator("http://");
+    public static final NettyHttpClientDecorator DECORATE_SECURE = new NettyHttpClientDecorator("https://");
 
-  public static final CharSequence NETTY_CLIENT_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
+    public static final CharSequence NETTY_CLIENT_REQUEST = UTF8BytesString.create(DECORATE.operationName());
 
-  private final String uriPrefix;
+    private final String uriPrefix;
 
-  public NettyHttpClientDecorator(String uriPrefix) {
-    this.uriPrefix = uriPrefix;
-  }
+    public NettyHttpClientDecorator(String uriPrefix) {
+        this.uriPrefix = uriPrefix;
+    }
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"netty", "netty-3.9"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"netty", "netty-3.9"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return NETTY_CLIENT;
-  }
+    @Override
+    protected CharSequence component() {
+        return NETTY_CLIENT;
+    }
 
-  @Override
-  protected String method(final HttpRequest httpRequest) {
-    return httpRequest.getMethod().getName();
-  }
+    @Override
+    protected String method(final HttpRequest httpRequest) {
+        return httpRequest.getMethod().getName();
+    }
 
-  @Override
-  protected URI url(final HttpRequest request) throws URISyntaxException {
-    final URI uri = URIUtils.safeParse(request.getUri());
-    if ((uri.getHost() == null || uri.getHost().equals("")) && request.headers().contains(HOST)) {
-      return URIUtils.safeParse(uriPrefix + request.headers().get(HOST) + request.getUri());
+    @Override
+    protected URI url(final HttpRequest request) throws URISyntaxException {
+        final URI uri = URIUtils.safeParse(request.getUri());
+        if ((uri.getHost() == null || uri.getHost().equals(""))
+                && request.headers().contains(HOST)) {
+            return URIUtils.safeParse(uriPrefix + request.headers().get(HOST) + request.getUri());
+        }
+        return uri;
     }
-    return uri;
-  }
 
-  @Override
-  protected int status(final HttpResponse httpResponse) {
-    return httpResponse.getStatus().getCode();
-  }
+    @Override
+    protected int status(final HttpResponse httpResponse) {
+        return httpResponse.getStatus().getCode();
+    }
 
-  @Override
-  protected String getRequestHeader(HttpRequest request, String headerName) {
-    return request.headers().get(headerName);
-  }
+    @Override
+    protected String getRequestHeader(HttpRequest request, String headerName) {
+        return request.headers().get(headerName);
+    }
 
-  @Override
-  protected String getResponseHeader(HttpResponse response, String headerName) {
-    return response.headers().get(headerName);
-  }
+    @Override
+    protected String getResponseHeader(HttpResponse response, String headerName) {
+        return response.headers().get(headerName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyResponseInjectAdapter.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyResponseInjectAdapter.java
index b29aaae39eb..acb6d094385 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyResponseInjectAdapter.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyResponseInjectAdapter.java
@@ -7,10 +7,10 @@
 @ParametersAreNonnullByDefault
 public class NettyResponseInjectAdapter implements CarrierSetter<HttpHeaders> {
 
-  public static final NettyResponseInjectAdapter SETTER = new NettyResponseInjectAdapter();
+    public static final NettyResponseInjectAdapter SETTER = new NettyResponseInjectAdapter();
 
-  @Override
-  public void set(final HttpHeaders headers, final String key, final String value) {
-    headers.set(key, value);
-  }
+    @Override
+    public void set(final HttpHeaders headers, final String key, final String value) {
+        headers.set(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockAllWritesHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockAllWritesHandler.java
index 972db5976e4..97a1b34df6a 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockAllWritesHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockAllWritesHandler.java
@@ -9,18 +9,18 @@
 import org.slf4j.LoggerFactory;
 
 public class BlockAllWritesHandler extends SimpleChannelDownstreamHandler {
-  public static final ChannelDownstreamHandler INSTANCE = new BlockAllWritesHandler();
-  private static final Logger log = LoggerFactory.getLogger(BlockAllWritesHandler.class);
+    public static final ChannelDownstreamHandler INSTANCE = new BlockAllWritesHandler();
+    private static final Logger log = LoggerFactory.getLogger(BlockAllWritesHandler.class);
 
-  private BlockAllWritesHandler() {}
+    private BlockAllWritesHandler() {}
 
-  @Override
-  public void writeRequested(ChannelHandlerContext ctx, MessageEvent e) {
-    if (e.getMessage() instanceof HttpResponse) {
-      log.debug("Blocking write of {}", e);
-      e.getFuture().setSuccess();
-    } else {
-      ctx.sendDownstream(e);
+    @Override
+    public void writeRequested(ChannelHandlerContext ctx, MessageEvent e) {
+        if (e.getMessage() instanceof HttpResponse) {
+            log.debug("Blocking write of {}", e);
+            e.getFuture().setSuccess();
+        } else {
+            ctx.sendDownstream(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockingResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockingResponseHandler.java
index 3a8e75e2777..13d13078e01 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockingResponseHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockingResponseHandler.java
@@ -23,128 +23,124 @@
 import org.slf4j.LoggerFactory;
 
 public class BlockingResponseHandler extends SimpleChannelUpstreamHandler {
-  private final TraceSegment segment;
-  private final int statusCode;
-  private final BlockingContentType bct;
-  private final Map<String, String> extraHeaders;
-  private final String securityResponseId;
-
-  private static final Logger log = LoggerFactory.getLogger(BlockingResponseHandler.class);
-  private static volatile boolean HAS_WARNED;
-
-  private boolean hasBlockedAlready;
-
-  public BlockingResponseHandler(
-      TraceSegment segment,
-      int statusCode,
-      BlockingContentType bct,
-      Map<String, String> extraHeaders,
-      String securityResponseId) {
-    this.segment = segment;
-    this.statusCode = statusCode;
-    this.bct = bct;
-    this.extraHeaders = extraHeaders;
-    this.securityResponseId = securityResponseId;
-  }
-
-  public BlockingResponseHandler(TraceSegment segment, Flow.Action.RequestBlockingAction rba) {
-    this(
-        segment,
-        rba.getStatusCode(),
-        rba.getBlockingContentType(),
-        rba.getExtraHeaders(),
-        rba.getSecurityResponseId());
-  }
-
-  @Override
-  public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
-    if (hasBlockedAlready) {
-      // we want to ignore any further data that the client might send
-      return;
-    }
-    Object msg = e.getMessage();
-    if (!(msg instanceof HttpRequest)) {
-      ctx.sendUpstream(e);
-      return;
-    }
-
-    // the usual disposition of the pipeline is:
-    // ...
-    // (1) BlockingResponseHandler (upstream, this handler)
-    // (2) HttpServerResponseTracingHandler / HttpServerTracingHandler (downstream / duplex)
-    // (3) MaybeBlockResponseHandler (downstream)
-    // ...
-    // when writing our blocking response, we want (2) to analyze it to report
-    // the status code, etc., but we need not run MaybeBlockResponseHandler
-    // because response blocking on a blocking response is not supported.
-    // We add a handler after (3) blocking all further writes, in case something
-    // tries to write after we've written the blocking response
-    ChannelHandlerContext ctxForDownstream = null;
-    try {
-      ctx.getPipeline()
-          .addAfter(
-              MaybeBlockResponseHandler.class.getName(),
-              "block_all_writes",
-              BlockAllWritesHandler.INSTANCE);
-      // write will start AFTER the referenced handler. It will start in (2)
-      ctxForDownstream = ctx.getPipeline().getContext(MaybeBlockResponseHandler.class.getName());
-    } catch (NoSuchElementException nse) {
-      if (HAS_WARNED) {
-        log.debug(
-            "Unable to block because MaybeBlockResponseHandler was not found on the pipeline");
-      } else {
-        log.warn("Unable to block because MaybeBlockResponseHandler was not found on the pipeline");
-        HAS_WARNED = true;
-      }
-    } catch (IllegalArgumentException iae) {
-      // already added
+    private final TraceSegment segment;
+    private final int statusCode;
+    private final BlockingContentType bct;
+    private final Map<String, String> extraHeaders;
+    private final String securityResponseId;
+
+    private static final Logger log = LoggerFactory.getLogger(BlockingResponseHandler.class);
+    private static volatile boolean HAS_WARNED;
+
+    private boolean hasBlockedAlready;
+
+    public BlockingResponseHandler(
+            TraceSegment segment,
+            int statusCode,
+            BlockingContentType bct,
+            Map<String, String> extraHeaders,
+            String securityResponseId) {
+        this.segment = segment;
+        this.statusCode = statusCode;
+        this.bct = bct;
+        this.extraHeaders = extraHeaders;
+        this.securityResponseId = securityResponseId;
     }
 
-    if (ctxForDownstream == null) {
-      ctx.sendUpstream(e);
-      return;
+    public BlockingResponseHandler(TraceSegment segment, Flow.Action.RequestBlockingAction rba) {
+        this(
+                segment,
+                rba.getStatusCode(),
+                rba.getBlockingContentType(),
+                rba.getExtraHeaders(),
+                rba.getSecurityResponseId());
     }
 
-    HttpRequest request = (HttpRequest) msg;
-
-    int httpCode = BlockingActionHelper.getHttpCode(statusCode);
-    HttpResponseStatus httpResponseStatus = HttpResponseStatus.valueOf(httpCode);
-    DefaultHttpResponse response =
-        new DefaultHttpResponse(request.getProtocolVersion(), httpResponseStatus);
-
-    HttpHeaders headers = response.headers();
-    headers.set("Connection", "close");
-
-    for (Map.Entry<String, String> h : extraHeaders.entrySet()) {
-      headers.set(h.getKey(), h.getValue());
-    }
-
-    response.setChunked(false);
-    if (bct != BlockingContentType.NONE) {
-      String acceptHeader = request.headers().get("accept");
-      BlockingActionHelper.TemplateType type =
-          BlockingActionHelper.determineTemplateType(bct, acceptHeader);
-      headers.set("Content-type", BlockingActionHelper.getContentType(type));
-      byte[] template = BlockingActionHelper.getTemplate(type, this.securityResponseId);
-      setContentLength(response, template.length);
-      ChannelBuffer buf = ChannelBuffers.wrappedBuffer(template);
-      response.setContent(buf);
-    }
-
-    this.hasBlockedAlready = true;
-    segment.effectivelyBlocked();
-
-    ChannelFuture future = Channels.future(ctx.getChannel());
-    future.addListener(
-        fut -> {
-          if (!fut.isSuccess()) {
-            log.warn("Write of blocking response failed", fut.getCause());
-          }
-          // close the connection because it can be in an invalid state at this point
-          // For instance, in a POST request we will still be receiving data from the
-          // client
-          fut.getChannel().close();
+    @Override
+    public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
+        if (hasBlockedAlready) {
+            // we want to ignore any further data that the client might send
+            return;
+        }
+        Object msg = e.getMessage();
+        if (!(msg instanceof HttpRequest)) {
+            ctx.sendUpstream(e);
+            return;
+        }
+
+        // the usual disposition of the pipeline is:
+        // ...
+        // (1) BlockingResponseHandler (upstream, this handler)
+        // (2) HttpServerResponseTracingHandler / HttpServerTracingHandler (downstream / duplex)
+        // (3) MaybeBlockResponseHandler (downstream)
+        // ...
+        // when writing our blocking response, we want (2) to analyze it to report
+        // the status code, etc., but we need not run MaybeBlockResponseHandler
+        // because response blocking on a blocking response is not supported.
+        // We add a handler after (3) blocking all further writes, in case something
+        // tries to write after we've written the blocking response
+        ChannelHandlerContext ctxForDownstream = null;
+        try {
+            ctx.getPipeline()
+                    .addAfter(
+                            MaybeBlockResponseHandler.class.getName(),
+                            "block_all_writes",
+                            BlockAllWritesHandler.INSTANCE);
+            // write will start AFTER the referenced handler. It will start in (2)
+            ctxForDownstream = ctx.getPipeline().getContext(MaybeBlockResponseHandler.class.getName());
+        } catch (NoSuchElementException nse) {
+            if (HAS_WARNED) {
+                log.debug("Unable to block because MaybeBlockResponseHandler was not found on the pipeline");
+            } else {
+                log.warn("Unable to block because MaybeBlockResponseHandler was not found on the pipeline");
+                HAS_WARNED = true;
+            }
+        } catch (IllegalArgumentException iae) {
+            // already added
+        }
+
+        if (ctxForDownstream == null) {
+            ctx.sendUpstream(e);
+            return;
+        }
+
+        HttpRequest request = (HttpRequest) msg;
+
+        int httpCode = BlockingActionHelper.getHttpCode(statusCode);
+        HttpResponseStatus httpResponseStatus = HttpResponseStatus.valueOf(httpCode);
+        DefaultHttpResponse response = new DefaultHttpResponse(request.getProtocolVersion(), httpResponseStatus);
+
+        HttpHeaders headers = response.headers();
+        headers.set("Connection", "close");
+
+        for (Map.Entry<String, String> h : extraHeaders.entrySet()) {
+            headers.set(h.getKey(), h.getValue());
+        }
+
+        response.setChunked(false);
+        if (bct != BlockingContentType.NONE) {
+            String acceptHeader = request.headers().get("accept");
+            BlockingActionHelper.TemplateType type = BlockingActionHelper.determineTemplateType(bct, acceptHeader);
+            headers.set("Content-type", BlockingActionHelper.getContentType(type));
+            byte[] template = BlockingActionHelper.getTemplate(type, this.securityResponseId);
+            setContentLength(response, template.length);
+            ChannelBuffer buf = ChannelBuffers.wrappedBuffer(template);
+            response.setContent(buf);
+        }
+
+        this.hasBlockedAlready = true;
+        segment.effectivelyBlocked();
+
+        ChannelFuture future = Channels.future(ctx.getChannel());
+        future.addListener(fut -> {
+            if (!fut.isSuccess()) {
+                log.warn("Write of blocking response failed", fut.getCause());
+            }
+            // close the connection because it can be in an invalid state at this point
+            // For instance, in a POST request we will still be receiving data from the
+            // client
+            fut.getChannel().close();
         });
-    Channels.write(ctxForDownstream, future, response);
-  }
+        Channels.write(ctxForDownstream, future, response);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java
index 3a2aeef4b3f..e7e381d57e0 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java
@@ -17,62 +17,62 @@
 
 public class HttpServerRequestTracingHandler extends SimpleChannelUpstreamHandler {
 
-  private final ContextStore<Channel, ChannelTraceContext> contextStore;
+    private final ContextStore<Channel, ChannelTraceContext> contextStore;
 
-  public HttpServerRequestTracingHandler(
-      final ContextStore<Channel, ChannelTraceContext> contextStore) {
-    this.contextStore = contextStore;
-  }
+    public HttpServerRequestTracingHandler(final ContextStore<Channel, ChannelTraceContext> contextStore) {
+        this.contextStore = contextStore;
+    }
 
-  @Override
-  public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent msg) {
-    final ChannelTraceContext channelTraceContext =
-        contextStore.getOrCreate(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE);
+    @Override
+    public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent msg) {
+        final ChannelTraceContext channelTraceContext =
+                contextStore.getOrCreate(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE);
 
-    if (!(msg.getMessage() instanceof HttpRequest)) {
-      final Context storedContext = channelTraceContext.getServerContext();
-      if (storedContext == null) {
-        ctx.sendUpstream(msg); // superclass does not throw
-      } else {
-        try (final ContextScope scope = storedContext.attach()) {
-          ctx.sendUpstream(msg); // superclass does not throw
+        if (!(msg.getMessage() instanceof HttpRequest)) {
+            final Context storedContext = channelTraceContext.getServerContext();
+            if (storedContext == null) {
+                ctx.sendUpstream(msg); // superclass does not throw
+            } else {
+                try (final ContextScope scope = storedContext.attach()) {
+                    ctx.sendUpstream(msg); // superclass does not throw
+                }
+            }
+            return;
         }
-      }
-      return;
-    }
 
-    final HttpRequest request = (HttpRequest) msg.getMessage();
-    final HttpHeaders headers = request.headers();
-    final Context parentContext = DECORATE.extract(headers);
-    final Context context = DECORATE.startSpan(headers, parentContext);
+        final HttpRequest request = (HttpRequest) msg.getMessage();
+        final HttpHeaders headers = request.headers();
+        final Context parentContext = DECORATE.extract(headers);
+        final Context context = DECORATE.startSpan(headers, parentContext);
 
-    channelTraceContext.reset();
-    channelTraceContext.setRequestHeaders(headers);
+        channelTraceContext.reset();
+        channelTraceContext.setRequestHeaders(headers);
 
-    try (final ContextScope scope = context.attach()) {
-      final AgentSpan span = AgentSpan.fromContext(context);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, ctx.getChannel(), request, parentContext);
+        try (final ContextScope scope = context.attach()) {
+            final AgentSpan span = AgentSpan.fromContext(context);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, ctx.getChannel(), request, parentContext);
 
-      channelTraceContext.setServerContext(context);
+            channelTraceContext.setServerContext(context);
 
-      Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
-      if (rba != null) {
-        ctx.getPipeline()
-            .addAfter(
-                ctx.getName(),
-                "blocking_handler",
-                new BlockingResponseHandler(span.getRequestContext().getTraceSegment(), rba));
-      }
+            Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
+            if (rba != null) {
+                ctx.getPipeline()
+                        .addAfter(
+                                ctx.getName(),
+                                "blocking_handler",
+                                new BlockingResponseHandler(
+                                        span.getRequestContext().getTraceSegment(), rba));
+            }
 
-      try {
-        ctx.sendUpstream(msg);
-      } catch (final Throwable throwable) {
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(scope.context());
-        span.finish(); // Finish the span manually since finishSpanOnClose was false
-        throw throwable;
-      }
+            try {
+                ctx.sendUpstream(msg);
+            } catch (final Throwable throwable) {
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(scope.context());
+                span.finish(); // Finish the span manually since finishSpanOnClose was false
+                throw throwable;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerResponseTracingHandler.java
index dffde997846..06bbf35a65c 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerResponseTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerResponseTracingHandler.java
@@ -16,50 +16,47 @@
 
 public class HttpServerResponseTracingHandler extends SimpleChannelDownstreamHandler {
 
-  private final ContextStore<Channel, ChannelTraceContext> contextStore;
-  private static final String UPGRADE_HEADER = "upgrade";
+    private final ContextStore<Channel, ChannelTraceContext> contextStore;
+    private static final String UPGRADE_HEADER = "upgrade";
 
-  public HttpServerResponseTracingHandler(
-      final ContextStore<Channel, ChannelTraceContext> contextStore) {
-    this.contextStore = contextStore;
-  }
-
-  @Override
-  public void writeRequested(final ChannelHandlerContext ctx, final MessageEvent msg) {
-    final ChannelTraceContext channelTraceContext =
-        contextStore.getOrCreate(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE);
-
-    final AgentSpan span = channelTraceContext.getServerSpan();
-    if (span == null || !(msg.getMessage() instanceof HttpResponse)) {
-      ctx.sendDownstream(msg);
-      return;
+    public HttpServerResponseTracingHandler(final ContextStore<Channel, ChannelTraceContext> contextStore) {
+        this.contextStore = contextStore;
     }
 
-    try (final ContextScope scope = span.attachWithContext()) {
-      final HttpResponse response = (HttpResponse) msg.getMessage();
-
-      try {
-        ctx.sendDownstream(msg);
-      } catch (final Throwable throwable) {
-        DECORATE.onError(span, throwable);
-        span.setHttpStatusCode(500);
-        span.finish(); // Finish the span manually since finishSpanOnClose was false
-        throw throwable;
-      }
-      final boolean isWebsocketUpgrade =
-          response.getStatus() == HttpResponseStatus.SWITCHING_PROTOCOLS
-              && "websocket".equals(response.headers().get(UPGRADE_HEADER));
-      if (isWebsocketUpgrade) {
-        String channelId = ctx.getChannel().getId().toString();
-        channelTraceContext.setSenderHandlerContext(new HandlerContext.Sender(span, channelId));
-      }
-      if (response.getStatus() != HttpResponseStatus.CONTINUE
-          && (response.getStatus() != HttpResponseStatus.SWITCHING_PROTOCOLS
-              || isWebsocketUpgrade)) {
-        DECORATE.onResponse(span, response);
-        DECORATE.beforeFinish(scope.context());
-        span.finish(); // Finish the span manually since finishSpanOnClose was false
-      }
+    @Override
+    public void writeRequested(final ChannelHandlerContext ctx, final MessageEvent msg) {
+        final ChannelTraceContext channelTraceContext =
+                contextStore.getOrCreate(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE);
+
+        final AgentSpan span = channelTraceContext.getServerSpan();
+        if (span == null || !(msg.getMessage() instanceof HttpResponse)) {
+            ctx.sendDownstream(msg);
+            return;
+        }
+
+        try (final ContextScope scope = span.attachWithContext()) {
+            final HttpResponse response = (HttpResponse) msg.getMessage();
+
+            try {
+                ctx.sendDownstream(msg);
+            } catch (final Throwable throwable) {
+                DECORATE.onError(span, throwable);
+                span.setHttpStatusCode(500);
+                span.finish(); // Finish the span manually since finishSpanOnClose was false
+                throw throwable;
+            }
+            final boolean isWebsocketUpgrade = response.getStatus() == HttpResponseStatus.SWITCHING_PROTOCOLS
+                    && "websocket".equals(response.headers().get(UPGRADE_HEADER));
+            if (isWebsocketUpgrade) {
+                String channelId = ctx.getChannel().getId().toString();
+                channelTraceContext.setSenderHandlerContext(new HandlerContext.Sender(span, channelId));
+            }
+            if (response.getStatus() != HttpResponseStatus.CONTINUE
+                    && (response.getStatus() != HttpResponseStatus.SWITCHING_PROTOCOLS || isWebsocketUpgrade)) {
+                DECORATE.onResponse(span, response);
+                DECORATE.beforeFinish(scope.context());
+                span.finish(); // Finish the span manually since finishSpanOnClose was false
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerTracingHandler.java
index c4827a1fb70..415dc7819ec 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerTracingHandler.java
@@ -6,12 +6,9 @@
 import org.jboss.netty.channel.Channel;
 
 public class HttpServerTracingHandler
-    extends CombinedSimpleChannelHandler<
-        HttpServerRequestTracingHandler, HttpServerResponseTracingHandler> {
+        extends CombinedSimpleChannelHandler<HttpServerRequestTracingHandler, HttpServerResponseTracingHandler> {
 
-  public HttpServerTracingHandler(final ContextStore<Channel, ChannelTraceContext> contextStore) {
-    super(
-        new HttpServerRequestTracingHandler(contextStore),
-        new HttpServerResponseTracingHandler(contextStore));
-  }
+    public HttpServerTracingHandler(final ContextStore<Channel, ChannelTraceContext> contextStore) {
+        super(new HttpServerRequestTracingHandler(contextStore), new HttpServerResponseTracingHandler(contextStore));
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/MaybeBlockResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/MaybeBlockResponseHandler.java
index 8cd6d9d3748..8def60603e4 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/MaybeBlockResponseHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/MaybeBlockResponseHandler.java
@@ -27,97 +27,93 @@
 import org.jboss.netty.handler.codec.http.HttpResponseStatus;
 
 public class MaybeBlockResponseHandler extends SimpleChannelDownstreamHandler {
-  private final ContextStore<Channel, ChannelTraceContext> contextStore;
-
-  public MaybeBlockResponseHandler(final ContextStore<Channel, ChannelTraceContext> contextStore) {
-    this.contextStore = contextStore;
-  }
-
-  @Override
-  public void writeRequested(ChannelHandlerContext ctx, MessageEvent msg) throws Exception {
-    final ChannelTraceContext channelTraceContext =
-        contextStore.getOrCreate(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE);
-
-    AgentSpan span = channelTraceContext.getServerSpan();
-    RequestContext requestContext;
-    if (span == null
-        || (requestContext = span.getRequestContext()) == null
-        || requestContext.getData(RequestContextSlot.APPSEC) == null) {
-      ctx.sendDownstream(msg);
-      return;
-    }
-
-    if (channelTraceContext.isAnalyzedResponse()) {
-      if (channelTraceContext.isBlockedResponse()) {
-        // block further writes
-      } else {
-        ctx.sendDownstream(msg);
-      }
-      return;
-    }
-
-    if (!(msg.getMessage() instanceof HttpResponse)) {
-      ctx.sendDownstream(msg);
-      return;
-    }
-
-    HttpResponse origResponse = (HttpResponse) msg.getMessage();
-    if (origResponse.getStatus() == HttpResponseStatus.CONTINUE) {
-      ctx.sendDownstream(msg);
-      return;
-    }
+    private final ContextStore<Channel, ChannelTraceContext> contextStore;
 
-    Flow<Void> flow =
-        DECORATE.callIGCallbackResponseAndHeaders(
-            span, origResponse, origResponse.getStatus().getCode(), ResponseExtractAdapter.GETTER);
-    channelTraceContext.setAnalyzedResponse(true);
-    Flow.Action action = flow.getAction();
-    if (!(action instanceof Flow.Action.RequestBlockingAction)) {
-      ctx.sendDownstream(msg);
-      return;
+    public MaybeBlockResponseHandler(final ContextStore<Channel, ChannelTraceContext> contextStore) {
+        this.contextStore = contextStore;
     }
 
-    channelTraceContext.setBlockedResponse(true);
-    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-    int httpCode = BlockingActionHelper.getHttpCode(rba.getStatusCode());
-    HttpResponseStatus httpResponseStatus = HttpResponseStatus.valueOf(httpCode);
-    DefaultHttpResponse response =
-        new DefaultHttpResponse(origResponse.getProtocolVersion(), httpResponseStatus);
-
-    HttpHeaders headers = response.headers();
-    headers.set("Connection", "close");
-
-    for (Map.Entry<String, String> h : rba.getExtraHeaders().entrySet()) {
-      headers.set(h.getKey(), h.getValue());
-    }
-
-    response.setChunked(false);
-    BlockingContentType bct = rba.getBlockingContentType();
-    if (bct != BlockingContentType.NONE) {
-      String acceptHeader = channelTraceContext.getRequestHeaders().get("accept");
-      BlockingActionHelper.TemplateType type =
-          BlockingActionHelper.determineTemplateType(bct, acceptHeader);
-      headers.set("Content-type", BlockingActionHelper.getContentType(type));
-      byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
-      setContentLength(response, template.length);
-      ChannelBuffer buf = ChannelBuffers.wrappedBuffer(template);
-      response.setContent(buf);
-    }
-
-    ChannelFuture future = Channels.future(ctx.getChannel());
-    future.addListener(
-        fut -> {
-          if (!fut.isSuccess()) {
-            log.warn("Write of blocking response failed", fut.getCause());
-          }
-          // close the connection because it can be in an invalid state at this point
-          // For instance, in a POST request we will still be receiving data from the
-          // client
-          fut.getChannel().close();
+    @Override
+    public void writeRequested(ChannelHandlerContext ctx, MessageEvent msg) throws Exception {
+        final ChannelTraceContext channelTraceContext =
+                contextStore.getOrCreate(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE);
+
+        AgentSpan span = channelTraceContext.getServerSpan();
+        RequestContext requestContext;
+        if (span == null
+                || (requestContext = span.getRequestContext()) == null
+                || requestContext.getData(RequestContextSlot.APPSEC) == null) {
+            ctx.sendDownstream(msg);
+            return;
+        }
+
+        if (channelTraceContext.isAnalyzedResponse()) {
+            if (channelTraceContext.isBlockedResponse()) {
+                // block further writes
+            } else {
+                ctx.sendDownstream(msg);
+            }
+            return;
+        }
+
+        if (!(msg.getMessage() instanceof HttpResponse)) {
+            ctx.sendDownstream(msg);
+            return;
+        }
+
+        HttpResponse origResponse = (HttpResponse) msg.getMessage();
+        if (origResponse.getStatus() == HttpResponseStatus.CONTINUE) {
+            ctx.sendDownstream(msg);
+            return;
+        }
+
+        Flow<Void> flow = DECORATE.callIGCallbackResponseAndHeaders(
+                span, origResponse, origResponse.getStatus().getCode(), ResponseExtractAdapter.GETTER);
+        channelTraceContext.setAnalyzedResponse(true);
+        Flow.Action action = flow.getAction();
+        if (!(action instanceof Flow.Action.RequestBlockingAction)) {
+            ctx.sendDownstream(msg);
+            return;
+        }
+
+        channelTraceContext.setBlockedResponse(true);
+        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+        int httpCode = BlockingActionHelper.getHttpCode(rba.getStatusCode());
+        HttpResponseStatus httpResponseStatus = HttpResponseStatus.valueOf(httpCode);
+        DefaultHttpResponse response = new DefaultHttpResponse(origResponse.getProtocolVersion(), httpResponseStatus);
+
+        HttpHeaders headers = response.headers();
+        headers.set("Connection", "close");
+
+        for (Map.Entry<String, String> h : rba.getExtraHeaders().entrySet()) {
+            headers.set(h.getKey(), h.getValue());
+        }
+
+        response.setChunked(false);
+        BlockingContentType bct = rba.getBlockingContentType();
+        if (bct != BlockingContentType.NONE) {
+            String acceptHeader = channelTraceContext.getRequestHeaders().get("accept");
+            BlockingActionHelper.TemplateType type = BlockingActionHelper.determineTemplateType(bct, acceptHeader);
+            headers.set("Content-type", BlockingActionHelper.getContentType(type));
+            byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
+            setContentLength(response, template.length);
+            ChannelBuffer buf = ChannelBuffers.wrappedBuffer(template);
+            response.setContent(buf);
+        }
+
+        ChannelFuture future = Channels.future(ctx.getChannel());
+        future.addListener(fut -> {
+            if (!fut.isSuccess()) {
+                log.warn("Write of blocking response failed", fut.getCause());
+            }
+            // close the connection because it can be in an invalid state at this point
+            // For instance, in a POST request we will still be receiving data from the
+            // client
+            fut.getChannel().close();
         });
 
-    requestContext.getTraceSegment().effectivelyBlocked();
+        requestContext.getTraceSegment().effectivelyBlocked();
 
-    Channels.write(ctx, future, response);
-  }
+        Channels.write(ctx, future, response);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyHttpServerDecorator.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyHttpServerDecorator.java
index ddda952fd1b..735a3669b29 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyHttpServerDecorator.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyHttpServerDecorator.java
@@ -30,157 +30,148 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class NettyHttpServerDecorator
-    extends HttpServerDecorator<HttpRequest, Channel, HttpResponse, HttpHeaders> {
-  public static final CharSequence NETTY = UTF8BytesString.create("netty");
-  public static final CharSequence NETTY_CONNECT = UTF8BytesString.create("netty.connect");
-
-  public static final NettyHttpServerDecorator DECORATE = new NettyHttpServerDecorator();
-  private static final CharSequence NETTY_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"netty", "netty-3.9"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return NETTY;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpHeaders> getter() {
-    return ContextVisitors.stringValuesEntrySet();
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
-    return ResponseExtractAdapter.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return NETTY_REQUEST;
-  }
-
-  @Override
-  protected String method(final HttpRequest httpRequest) {
-    return httpRequest.getMethod().getName();
-  }
-
-  @Override
-  protected URIDataAdapter url(final HttpRequest request) {
-    return URIDataAdapterBase.fromURI(
-        request.getUri(),
-        uri -> {
-          if ((uri.getHost() == null || uri.getHost().equals(""))
-              && request.headers().contains(HOST)) {
-            return URIDataAdapterBase.fromURI(
-                "http://" + request.headers().get(HOST) + request.getUri(),
-                URIDefaultDataAdapter::new);
-          }
-          return new URIDefaultDataAdapter(uri);
-        });
-  }
+public class NettyHttpServerDecorator extends HttpServerDecorator<HttpRequest, Channel, HttpResponse, HttpHeaders> {
+    public static final CharSequence NETTY = UTF8BytesString.create("netty");
+    public static final CharSequence NETTY_CONNECT = UTF8BytesString.create("netty.connect");
+
+    public static final NettyHttpServerDecorator DECORATE = new NettyHttpServerDecorator();
+    private static final CharSequence NETTY_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"netty", "netty-3.9"};
+    }
 
-  @Override
-  protected String peerHostIP(final Channel channel) {
-    final SocketAddress socketAddress = channel.getRemoteAddress();
-    if (socketAddress instanceof InetSocketAddress) {
-      return ((InetSocketAddress) socketAddress).getAddress().getHostAddress();
+    @Override
+    protected CharSequence component() {
+        return NETTY;
     }
-    return null;
-  }
-
-  @Override
-  protected int peerPort(final Channel channel) {
-    final SocketAddress socketAddress = channel.getRemoteAddress();
-    if (socketAddress instanceof InetSocketAddress) {
-      return ((InetSocketAddress) socketAddress).getPort();
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpHeaders> getter() {
+        return ContextVisitors.stringValuesEntrySet();
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
+        return ResponseExtractAdapter.GETTER;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return NETTY_REQUEST;
+    }
+
+    @Override
+    protected String method(final HttpRequest httpRequest) {
+        return httpRequest.getMethod().getName();
+    }
+
+    @Override
+    protected URIDataAdapter url(final HttpRequest request) {
+        return URIDataAdapterBase.fromURI(request.getUri(), uri -> {
+            if ((uri.getHost() == null || uri.getHost().equals(""))
+                    && request.headers().contains(HOST)) {
+                return URIDataAdapterBase.fromURI(
+                        "http://" + request.headers().get(HOST) + request.getUri(), URIDefaultDataAdapter::new);
+            }
+            return new URIDefaultDataAdapter(uri);
+        });
     }
-    return 0;
-  }
-
-  @Override
-  protected int status(final HttpResponse httpResponse) {
-    return httpResponse.getStatus().getCode();
-  }
-
-  @Override
-  protected boolean isAppSecOnResponseSeparate() {
-    return true;
-  }
-
-  @Override
-  protected BlockResponseFunction createBlockResponseFunction(
-      HttpRequest httpRequest, Channel channel) {
-    return new NettyBlockResponseFunction(channel.getPipeline(), httpRequest);
-  }
-
-  public static class NettyBlockResponseFunction implements BlockResponseFunction {
-    private final ChannelPipeline pipeline;
-    public static final Logger log = LoggerFactory.getLogger(NettyBlockResponseFunction.class);
-    private final HttpRequest httpRequestMessage;
-
-    public NettyBlockResponseFunction(ChannelPipeline pipeline, HttpRequest httpRequestMessage) {
-      this.pipeline = pipeline;
-      this.httpRequestMessage = httpRequestMessage;
+
+    @Override
+    protected String peerHostIP(final Channel channel) {
+        final SocketAddress socketAddress = channel.getRemoteAddress();
+        if (socketAddress instanceof InetSocketAddress) {
+            return ((InetSocketAddress) socketAddress).getAddress().getHostAddress();
+        }
+        return null;
     }
 
     @Override
-    public boolean tryCommitBlockingResponse(
-        TraceSegment segment,
-        int statusCode,
-        BlockingContentType templateType,
-        Map<String, String> extraHeaders,
-        String securityResponseId) {
-      ChannelHandler handlerBefore = pipeline.get(HttpServerTracingHandler.class);
-      if (handlerBefore == null) {
-        handlerBefore = pipeline.get(HttpServerRequestTracingHandler.class);
-        if (handlerBefore == null) {
-          log.warn(
-              "Can't block without an HttpServerTracingHandler or HttpServerRequestTracingHandler in the pipeline");
-          return false;
+    protected int peerPort(final Channel channel) {
+        final SocketAddress socketAddress = channel.getRemoteAddress();
+        if (socketAddress instanceof InetSocketAddress) {
+            return ((InetSocketAddress) socketAddress).getPort();
         }
-      }
-
-      try {
-        pipeline.addAfter(
-            handlerBefore.getClass().getName(),
-            "blocking_handler",
-            new BlockingResponseHandler(
-                segment, statusCode, templateType, extraHeaders, securityResponseId));
-        pipeline.addBefore(
-            "blocking_handler", "before_blocking_handler", new SimpleChannelUpstreamHandler());
-      } catch (RuntimeException rte) {
-        log.warn("Failed adding blocking handler");
-      }
-
-      // prevent BlockingException from being handled, in order to avoid the existing
-      // handlers trying to write an error response
-      pipeline.addFirst(
-          "ignore_blocking_exception_handler", IgnoreBlockingExceptionHandler.INSTANCE);
-
-      ChannelHandlerContext context = pipeline.getContext("before_blocking_handler");
-      context.sendUpstream(
-          new UpstreamMessageEvent(pipeline.getChannel(), httpRequestMessage, null));
-
-      return true;
+        return 0;
     }
-  }
 
-  public static class IgnoreBlockingExceptionHandler extends SimpleChannelUpstreamHandler {
-    public static ChannelUpstreamHandler INSTANCE = new IgnoreBlockingExceptionHandler();
+    @Override
+    protected int status(final HttpResponse httpResponse) {
+        return httpResponse.getStatus().getCode();
+    }
+
+    @Override
+    protected boolean isAppSecOnResponseSeparate() {
+        return true;
+    }
 
     @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception {
-      if ((e.getCause() instanceof BlockingException)) {
-        NettyBlockResponseFunction.log.info("Suppressing handling of BlockingException");
-        e.getFuture().setSuccess();
-      } else {
-        super.exceptionCaught(ctx, e);
-      }
+    protected BlockResponseFunction createBlockResponseFunction(HttpRequest httpRequest, Channel channel) {
+        return new NettyBlockResponseFunction(channel.getPipeline(), httpRequest);
+    }
+
+    public static class NettyBlockResponseFunction implements BlockResponseFunction {
+        private final ChannelPipeline pipeline;
+        public static final Logger log = LoggerFactory.getLogger(NettyBlockResponseFunction.class);
+        private final HttpRequest httpRequestMessage;
+
+        public NettyBlockResponseFunction(ChannelPipeline pipeline, HttpRequest httpRequestMessage) {
+            this.pipeline = pipeline;
+            this.httpRequestMessage = httpRequestMessage;
+        }
+
+        @Override
+        public boolean tryCommitBlockingResponse(
+                TraceSegment segment,
+                int statusCode,
+                BlockingContentType templateType,
+                Map<String, String> extraHeaders,
+                String securityResponseId) {
+            ChannelHandler handlerBefore = pipeline.get(HttpServerTracingHandler.class);
+            if (handlerBefore == null) {
+                handlerBefore = pipeline.get(HttpServerRequestTracingHandler.class);
+                if (handlerBefore == null) {
+                    log.warn(
+                            "Can't block without an HttpServerTracingHandler or HttpServerRequestTracingHandler in the pipeline");
+                    return false;
+                }
+            }
+
+            try {
+                pipeline.addAfter(
+                        handlerBefore.getClass().getName(),
+                        "blocking_handler",
+                        new BlockingResponseHandler(
+                                segment, statusCode, templateType, extraHeaders, securityResponseId));
+                pipeline.addBefore("blocking_handler", "before_blocking_handler", new SimpleChannelUpstreamHandler());
+            } catch (RuntimeException rte) {
+                log.warn("Failed adding blocking handler");
+            }
+
+            // prevent BlockingException from being handled, in order to avoid the existing
+            // handlers trying to write an error response
+            pipeline.addFirst("ignore_blocking_exception_handler", IgnoreBlockingExceptionHandler.INSTANCE);
+
+            ChannelHandlerContext context = pipeline.getContext("before_blocking_handler");
+            context.sendUpstream(new UpstreamMessageEvent(pipeline.getChannel(), httpRequestMessage, null));
+
+            return true;
+        }
+    }
+
+    public static class IgnoreBlockingExceptionHandler extends SimpleChannelUpstreamHandler {
+        public static ChannelUpstreamHandler INSTANCE = new IgnoreBlockingExceptionHandler();
+
+        @Override
+        public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception {
+            if ((e.getCause() instanceof BlockingException)) {
+                NettyBlockResponseFunction.log.info("Suppressing handling of BlockingException");
+                e.getFuture().setSuccess();
+            } else {
+                super.exceptionCaught(ctx, e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/ResponseExtractAdapter.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/ResponseExtractAdapter.java
index 893454c68b9..58dfa9955e8 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/ResponseExtractAdapter.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/ResponseExtractAdapter.java
@@ -5,10 +5,10 @@
 import org.jboss.netty.handler.codec.http.HttpResponse;
 
 public class ResponseExtractAdapter implements AgentPropagation.ContextVisitor<HttpResponse> {
-  public static final ResponseExtractAdapter GETTER = new ResponseExtractAdapter();
+    public static final ResponseExtractAdapter GETTER = new ResponseExtractAdapter();
 
-  @Override
-  public void forEachKey(HttpResponse carrier, AgentPropagation.KeyClassifier classifier) {
-    ContextVisitors.stringValuesEntrySet().forEachKey(carrier.headers(), classifier);
-  }
+    @Override
+    public void forEachKey(HttpResponse carrier, AgentPropagation.KeyClassifier classifier) {
+        ContextVisitors.stringValuesEntrySet().forEachKey(carrier.headers(), classifier);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java
index 7f7fcfa5330..f372b6438fd 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java
@@ -21,115 +21,108 @@
 
 public class WebSocketServerRequestTracingHandler extends SimpleChannelUpstreamHandler {
 
-  private final ContextStore<Channel, ChannelTraceContext> contextStore;
+    private final ContextStore<Channel, ChannelTraceContext> contextStore;
 
-  public WebSocketServerRequestTracingHandler(
-      final ContextStore<Channel, ChannelTraceContext> contextStore) {
-    this.contextStore = contextStore;
-  }
+    public WebSocketServerRequestTracingHandler(final ContextStore<Channel, ChannelTraceContext> contextStore) {
+        this.contextStore = contextStore;
+    }
 
-  @Override
-  public void messageReceived(ChannelHandlerContext ctx, MessageEvent event) throws Exception {
-    Object frame = event.getMessage();
-    if (frame instanceof WebSocketFrame) {
-      Channel channel = ctx.getChannel();
+    @Override
+    public void messageReceived(ChannelHandlerContext ctx, MessageEvent event) throws Exception {
+        Object frame = event.getMessage();
+        if (frame instanceof WebSocketFrame) {
+            Channel channel = ctx.getChannel();
 
-      ChannelTraceContext traceContext = this.contextStore.get(channel);
-      if (traceContext != null) {
+            ChannelTraceContext traceContext = this.contextStore.get(channel);
+            if (traceContext != null) {
 
-        HandlerContext.Receiver receiverContext = traceContext.getReceiverHandlerContext();
-        if (receiverContext == null) {
-          HandlerContext.Sender sessionState = traceContext.getSenderHandlerContext();
-          if (sessionState != null) {
-            receiverContext =
-                new HandlerContext.Receiver(
-                    sessionState.getHandshakeSpan(), channel.getId().toString());
-            traceContext.setReceiverHandlerContext(receiverContext);
-          }
-        }
-        if (receiverContext != null) {
-          if (frame instanceof TextWebSocketFrame) {
-            // WebSocket Read Text Start
-            TextWebSocketFrame textFrame = (TextWebSocketFrame) frame;
+                HandlerContext.Receiver receiverContext = traceContext.getReceiverHandlerContext();
+                if (receiverContext == null) {
+                    HandlerContext.Sender sessionState = traceContext.getSenderHandlerContext();
+                    if (sessionState != null) {
+                        receiverContext = new HandlerContext.Receiver(
+                                sessionState.getHandshakeSpan(), channel.getId().toString());
+                        traceContext.setReceiverHandlerContext(receiverContext);
+                    }
+                }
+                if (receiverContext != null) {
+                    if (frame instanceof TextWebSocketFrame) {
+                        // WebSocket Read Text Start
+                        TextWebSocketFrame textFrame = (TextWebSocketFrame) frame;
 
-            final AgentSpan span =
-                DECORATE.startInboundFrameSpan(
-                    receiverContext, textFrame.getText(), textFrame.isFinalFragment());
-            try (final ContextScope scope = activateSpan(span)) {
-              ctx.sendUpstream(event);
-              // WebSocket Read Text Start
-            } finally {
-              if (textFrame.isFinalFragment()) {
-                traceContext.setReceiverHandlerContext(null);
-                DECORATE.onFrameEnd(receiverContext);
-              }
-            }
-            return;
-          }
+                        final AgentSpan span = DECORATE.startInboundFrameSpan(
+                                receiverContext, textFrame.getText(), textFrame.isFinalFragment());
+                        try (final ContextScope scope = activateSpan(span)) {
+                            ctx.sendUpstream(event);
+                            // WebSocket Read Text Start
+                        } finally {
+                            if (textFrame.isFinalFragment()) {
+                                traceContext.setReceiverHandlerContext(null);
+                                DECORATE.onFrameEnd(receiverContext);
+                            }
+                        }
+                        return;
+                    }
 
-          if (frame instanceof BinaryWebSocketFrame) {
-            // WebSocket Read Binary Start
-            BinaryWebSocketFrame binaryFrame = (BinaryWebSocketFrame) frame;
-            final AgentSpan span =
-                DECORATE.startInboundFrameSpan(
-                    receiverContext,
-                    binaryFrame.getBinaryData().array(),
-                    binaryFrame.isFinalFragment());
-            try (final ContextScope scope = activateSpan(span)) {
-              ctx.sendUpstream(event);
-            } finally {
-              // WebSocket Read Binary End
-              if (binaryFrame.isFinalFragment()) {
-                traceContext.setReceiverHandlerContext(null);
-                DECORATE.onFrameEnd(receiverContext);
-              }
-            }
+                    if (frame instanceof BinaryWebSocketFrame) {
+                        // WebSocket Read Binary Start
+                        BinaryWebSocketFrame binaryFrame = (BinaryWebSocketFrame) frame;
+                        final AgentSpan span = DECORATE.startInboundFrameSpan(
+                                receiverContext, binaryFrame.getBinaryData().array(), binaryFrame.isFinalFragment());
+                        try (final ContextScope scope = activateSpan(span)) {
+                            ctx.sendUpstream(event);
+                        } finally {
+                            // WebSocket Read Binary End
+                            if (binaryFrame.isFinalFragment()) {
+                                traceContext.setReceiverHandlerContext(null);
+                                DECORATE.onFrameEnd(receiverContext);
+                            }
+                        }
 
-            return;
-          }
+                        return;
+                    }
 
-          if (frame instanceof ContinuationWebSocketFrame) {
-            ContinuationWebSocketFrame continuationWebSocketFrame =
-                (ContinuationWebSocketFrame) frame;
-            final AgentSpan span =
-                DECORATE.startInboundFrameSpan(
-                    receiverContext,
-                    MESSAGE_TYPE_TEXT.equals(receiverContext.getMessageType())
-                        ? continuationWebSocketFrame.getText()
-                        : continuationWebSocketFrame.getBinaryData().array(),
-                    continuationWebSocketFrame.isFinalFragment());
-            try (final ContextScope scope = activateSpan(span)) {
-              ctx.sendUpstream(event);
-            } finally {
-              if (continuationWebSocketFrame.isFinalFragment()) {
-                traceContext.setReceiverHandlerContext(null);
-                DECORATE.onFrameEnd(receiverContext);
-              }
-            }
-            return;
-          }
+                    if (frame instanceof ContinuationWebSocketFrame) {
+                        ContinuationWebSocketFrame continuationWebSocketFrame = (ContinuationWebSocketFrame) frame;
+                        final AgentSpan span = DECORATE.startInboundFrameSpan(
+                                receiverContext,
+                                MESSAGE_TYPE_TEXT.equals(receiverContext.getMessageType())
+                                        ? continuationWebSocketFrame.getText()
+                                        : continuationWebSocketFrame
+                                                .getBinaryData()
+                                                .array(),
+                                continuationWebSocketFrame.isFinalFragment());
+                        try (final ContextScope scope = activateSpan(span)) {
+                            ctx.sendUpstream(event);
+                        } finally {
+                            if (continuationWebSocketFrame.isFinalFragment()) {
+                                traceContext.setReceiverHandlerContext(null);
+                                DECORATE.onFrameEnd(receiverContext);
+                            }
+                        }
+                        return;
+                    }
 
-          if (frame instanceof CloseWebSocketFrame) {
-            // WebSocket Closed by client
-            CloseWebSocketFrame closeFrame = (CloseWebSocketFrame) frame;
-            int statusCode = closeFrame.getStatusCode();
-            String reasonText = closeFrame.getReasonText();
-            traceContext.setSenderHandlerContext(null);
-            traceContext.setReceiverHandlerContext(null);
-            final AgentSpan span =
-                DECORATE.startInboundCloseSpan(receiverContext, reasonText, statusCode);
-            try (final ContextScope scope = activateSpan(span)) {
-              ctx.sendUpstream(event);
-              if (closeFrame.isFinalFragment()) {
-                DECORATE.onFrameEnd(receiverContext);
-              }
+                    if (frame instanceof CloseWebSocketFrame) {
+                        // WebSocket Closed by client
+                        CloseWebSocketFrame closeFrame = (CloseWebSocketFrame) frame;
+                        int statusCode = closeFrame.getStatusCode();
+                        String reasonText = closeFrame.getReasonText();
+                        traceContext.setSenderHandlerContext(null);
+                        traceContext.setReceiverHandlerContext(null);
+                        final AgentSpan span = DECORATE.startInboundCloseSpan(receiverContext, reasonText, statusCode);
+                        try (final ContextScope scope = activateSpan(span)) {
+                            ctx.sendUpstream(event);
+                            if (closeFrame.isFinalFragment()) {
+                                DECORATE.onFrameEnd(receiverContext);
+                            }
+                        }
+                        return;
+                    }
+                }
             }
-            return;
-          }
         }
-      }
-    }
 
-    ctx.sendUpstream(event); // superclass does not throw
-  }
+        ctx.sendUpstream(event); // superclass does not throw
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java
index 3b016b5d9b0..968bbadc8ae 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java
@@ -22,102 +22,100 @@
 
 public class WebSocketServerResponseTracingHandler extends SimpleChannelDownstreamHandler {
 
-  private final ContextStore<Channel, ChannelTraceContext> contextStore;
+    private final ContextStore<Channel, ChannelTraceContext> contextStore;
 
-  public WebSocketServerResponseTracingHandler(
-      final ContextStore<Channel, ChannelTraceContext> contextStore) {
-    this.contextStore = contextStore;
-  }
+    public WebSocketServerResponseTracingHandler(final ContextStore<Channel, ChannelTraceContext> contextStore) {
+        this.contextStore = contextStore;
+    }
 
-  @Override
-  public void writeRequested(ChannelHandlerContext ctx, MessageEvent event) throws Exception {
-    Object frame = event.getMessage();
-    if (frame instanceof WebSocketFrame) {
-      Channel channel = ctx.getChannel();
+    @Override
+    public void writeRequested(ChannelHandlerContext ctx, MessageEvent event) throws Exception {
+        Object frame = event.getMessage();
+        if (frame instanceof WebSocketFrame) {
+            Channel channel = ctx.getChannel();
 
-      ChannelTraceContext traceContext = this.contextStore.get(channel);
-      if (traceContext != null) {
-        HandlerContext.Sender handlerContext = traceContext.getSenderHandlerContext();
-        if (handlerContext != null) {
+            ChannelTraceContext traceContext = this.contextStore.get(channel);
+            if (traceContext != null) {
+                HandlerContext.Sender handlerContext = traceContext.getSenderHandlerContext();
+                if (handlerContext != null) {
 
-          if (frame instanceof TextWebSocketFrame) {
-            // WebSocket Write Text Start
-            TextWebSocketFrame textFrame = (TextWebSocketFrame) frame;
-            final AgentSpan span =
-                DECORATE.startOutboundFrameSpan(
-                    handlerContext, MESSAGE_TYPE_TEXT, textFrame.getText().length());
-            try (final ContextScope scope = activateSpan(span)) {
-              ctx.sendDownstream(event);
-            } finally {
-              // WebSocket Write Text End
-              if (textFrame.isFinalFragment()) {
-                DECORATE.onFrameEnd(handlerContext);
-              }
-            }
-            return;
-          }
+                    if (frame instanceof TextWebSocketFrame) {
+                        // WebSocket Write Text Start
+                        TextWebSocketFrame textFrame = (TextWebSocketFrame) frame;
+                        final AgentSpan span = DECORATE.startOutboundFrameSpan(
+                                handlerContext,
+                                MESSAGE_TYPE_TEXT,
+                                textFrame.getText().length());
+                        try (final ContextScope scope = activateSpan(span)) {
+                            ctx.sendDownstream(event);
+                        } finally {
+                            // WebSocket Write Text End
+                            if (textFrame.isFinalFragment()) {
+                                DECORATE.onFrameEnd(handlerContext);
+                            }
+                        }
+                        return;
+                    }
 
-          if (frame instanceof BinaryWebSocketFrame) {
-            // WebSocket Write Binary Start
-            BinaryWebSocketFrame binaryFrame = (BinaryWebSocketFrame) frame;
-            final AgentSpan span =
-                DECORATE.startOutboundFrameSpan(
-                    handlerContext,
-                    MESSAGE_TYPE_BINARY,
-                    binaryFrame.getBinaryData().readableBytes());
-            try (final ContextScope scope = activateSpan(span)) {
-              ctx.sendDownstream(event);
-            } finally {
-              // WebSocket Write Binary End
-              if (binaryFrame.isFinalFragment()) {
-                DECORATE.onFrameEnd(handlerContext);
-              }
-            }
-            return;
-          }
+                    if (frame instanceof BinaryWebSocketFrame) {
+                        // WebSocket Write Binary Start
+                        BinaryWebSocketFrame binaryFrame = (BinaryWebSocketFrame) frame;
+                        final AgentSpan span = DECORATE.startOutboundFrameSpan(
+                                handlerContext,
+                                MESSAGE_TYPE_BINARY,
+                                binaryFrame.getBinaryData().readableBytes());
+                        try (final ContextScope scope = activateSpan(span)) {
+                            ctx.sendDownstream(event);
+                        } finally {
+                            // WebSocket Write Binary End
+                            if (binaryFrame.isFinalFragment()) {
+                                DECORATE.onFrameEnd(handlerContext);
+                            }
+                        }
+                        return;
+                    }
 
-          if (frame instanceof ContinuationWebSocketFrame) {
-            ContinuationWebSocketFrame continuationWebSocketFrame =
-                (ContinuationWebSocketFrame) frame;
-            final AgentSpan span =
-                DECORATE.startOutboundFrameSpan(
-                    handlerContext,
-                    handlerContext.getMessageType(),
-                    MESSAGE_TYPE_TEXT.equals(handlerContext.getMessageType())
-                        ? continuationWebSocketFrame.getText().length()
-                        : continuationWebSocketFrame.getBinaryData().readableBytes());
-            try (final ContextScope scope = activateSpan(span)) {
-              ctx.sendDownstream(event);
-            } finally {
-              // WebSocket Write Binary End
-              if (continuationWebSocketFrame.isFinalFragment()) {
-                DECORATE.onFrameEnd(handlerContext);
-              }
-            }
-            return;
-          }
+                    if (frame instanceof ContinuationWebSocketFrame) {
+                        ContinuationWebSocketFrame continuationWebSocketFrame = (ContinuationWebSocketFrame) frame;
+                        final AgentSpan span = DECORATE.startOutboundFrameSpan(
+                                handlerContext,
+                                handlerContext.getMessageType(),
+                                MESSAGE_TYPE_TEXT.equals(handlerContext.getMessageType())
+                                        ? continuationWebSocketFrame.getText().length()
+                                        : continuationWebSocketFrame
+                                                .getBinaryData()
+                                                .readableBytes());
+                        try (final ContextScope scope = activateSpan(span)) {
+                            ctx.sendDownstream(event);
+                        } finally {
+                            // WebSocket Write Binary End
+                            if (continuationWebSocketFrame.isFinalFragment()) {
+                                DECORATE.onFrameEnd(handlerContext);
+                            }
+                        }
+                        return;
+                    }
 
-          if (frame instanceof CloseWebSocketFrame) {
-            // WebSocket Closed by Server
-            CloseWebSocketFrame closeFrame = (CloseWebSocketFrame) frame;
-            int statusCode = closeFrame.getStatusCode();
-            String reasonText = closeFrame.getReasonText();
-            traceContext.setSenderHandlerContext(null);
-            final AgentSpan span =
-                DECORATE.startOutboundCloseSpan(handlerContext, reasonText, statusCode);
-            try (final ContextScope scope = activateSpan(span)) {
-              ctx.sendDownstream(event);
-            } finally {
-              if (closeFrame.isFinalFragment()) {
-                DECORATE.onFrameEnd(handlerContext);
-              }
+                    if (frame instanceof CloseWebSocketFrame) {
+                        // WebSocket Closed by Server
+                        CloseWebSocketFrame closeFrame = (CloseWebSocketFrame) frame;
+                        int statusCode = closeFrame.getStatusCode();
+                        String reasonText = closeFrame.getReasonText();
+                        traceContext.setSenderHandlerContext(null);
+                        final AgentSpan span = DECORATE.startOutboundCloseSpan(handlerContext, reasonText, statusCode);
+                        try (final ContextScope scope = activateSpan(span)) {
+                            ctx.sendDownstream(event);
+                        } finally {
+                            if (closeFrame.isFinalFragment()) {
+                                DECORATE.onFrameEnd(handlerContext);
+                            }
+                        }
+                        return;
+                    }
+                }
             }
-            return;
-          }
         }
-      }
+        // can be other messages we do not handle like ping, pong
+        ctx.sendDownstream(event);
     }
-    // can be other messages we do not handle like ping, pong
-    ctx.sendDownstream(event);
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerTracingHandler.java
index a1c817bb674..75622c1ccb7 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerTracingHandler.java
@@ -6,13 +6,12 @@
 import org.jboss.netty.channel.Channel;
 
 public class WebSocketServerTracingHandler
-    extends CombinedSimpleChannelHandler<
-        WebSocketServerRequestTracingHandler, WebSocketServerResponseTracingHandler> {
+        extends CombinedSimpleChannelHandler<
+                WebSocketServerRequestTracingHandler, WebSocketServerResponseTracingHandler> {
 
-  public WebSocketServerTracingHandler(
-      final ContextStore<Channel, ChannelTraceContext> contextStore) {
-    super(
-        new WebSocketServerRequestTracingHandler(contextStore),
-        new WebSocketServerResponseTracingHandler(contextStore));
-  }
+    public WebSocketServerTracingHandler(final ContextStore<Channel, ChannelTraceContext> contextStore) {
+        super(
+                new WebSocketServerRequestTracingHandler(contextStore),
+                new WebSocketServerResponseTracingHandler(contextStore));
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/util/CombinedSimpleChannelHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/util/CombinedSimpleChannelHandler.java
index d33442e4b7d..e86330d5238 100644
--- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/util/CombinedSimpleChannelHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/util/CombinedSimpleChannelHandler.java
@@ -12,141 +12,119 @@
 import org.jboss.netty.channel.WriteCompletionEvent;
 
 public class CombinedSimpleChannelHandler<
-        Upstream extends SimpleChannelUpstreamHandler,
-        Downstream extends SimpleChannelDownstreamHandler>
-    extends SimpleChannelHandler {
-
-  private final Upstream upstream;
-  private final Downstream downstream;
-
-  public CombinedSimpleChannelHandler(final Upstream upstream, final Downstream downstream) {
-    this.upstream = upstream;
-    this.downstream = downstream;
-  }
-
-  @Override
-  public void handleUpstream(final ChannelHandlerContext ctx, final ChannelEvent e)
-      throws Exception {
-    upstream.handleUpstream(ctx, e);
-  }
-
-  @Override
-  public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent e)
-      throws Exception {
-    upstream.messageReceived(ctx, e);
-  }
-
-  @Override
-  public void exceptionCaught(final ChannelHandlerContext ctx, final ExceptionEvent e)
-      throws Exception {
-    upstream.exceptionCaught(ctx, e);
-  }
-
-  @Override
-  public void channelOpen(final ChannelHandlerContext ctx, final ChannelStateEvent e)
-      throws Exception {
-    upstream.channelOpen(ctx, e);
-  }
-
-  @Override
-  public void channelBound(final ChannelHandlerContext ctx, final ChannelStateEvent e)
-      throws Exception {
-    upstream.channelBound(ctx, e);
-  }
-
-  @Override
-  public void channelConnected(final ChannelHandlerContext ctx, final ChannelStateEvent e)
-      throws Exception {
-    upstream.channelConnected(ctx, e);
-  }
-
-  @Override
-  public void channelInterestChanged(final ChannelHandlerContext ctx, final ChannelStateEvent e)
-      throws Exception {
-    upstream.channelInterestChanged(ctx, e);
-  }
-
-  @Override
-  public void channelDisconnected(final ChannelHandlerContext ctx, final ChannelStateEvent e)
-      throws Exception {
-    upstream.channelDisconnected(ctx, e);
-  }
-
-  @Override
-  public void channelUnbound(final ChannelHandlerContext ctx, final ChannelStateEvent e)
-      throws Exception {
-    upstream.channelUnbound(ctx, e);
-  }
-
-  @Override
-  public void channelClosed(final ChannelHandlerContext ctx, final ChannelStateEvent e)
-      throws Exception {
-    upstream.channelClosed(ctx, e);
-  }
-
-  @Override
-  public void writeComplete(final ChannelHandlerContext ctx, final WriteCompletionEvent e)
-      throws Exception {
-    upstream.writeComplete(ctx, e);
-  }
-
-  @Override
-  public void childChannelOpen(final ChannelHandlerContext ctx, final ChildChannelStateEvent e)
-      throws Exception {
-    upstream.childChannelOpen(ctx, e);
-  }
-
-  @Override
-  public void childChannelClosed(final ChannelHandlerContext ctx, final ChildChannelStateEvent e)
-      throws Exception {
-    upstream.childChannelClosed(ctx, e);
-  }
-
-  @Override
-  public void handleDownstream(final ChannelHandlerContext ctx, final ChannelEvent e)
-      throws Exception {
-    downstream.handleDownstream(ctx, e);
-  }
-
-  @Override
-  public void writeRequested(final ChannelHandlerContext ctx, final MessageEvent e)
-      throws Exception {
-    downstream.writeRequested(ctx, e);
-  }
-
-  @Override
-  public void bindRequested(final ChannelHandlerContext ctx, final ChannelStateEvent e)
-      throws Exception {
-    downstream.bindRequested(ctx, e);
-  }
-
-  @Override
-  public void connectRequested(final ChannelHandlerContext ctx, final ChannelStateEvent e)
-      throws Exception {
-    downstream.connectRequested(ctx, e);
-  }
-
-  @Override
-  public void setInterestOpsRequested(final ChannelHandlerContext ctx, final ChannelStateEvent e)
-      throws Exception {
-    downstream.setInterestOpsRequested(ctx, e);
-  }
-
-  @Override
-  public void disconnectRequested(final ChannelHandlerContext ctx, final ChannelStateEvent e)
-      throws Exception {
-    downstream.disconnectRequested(ctx, e);
-  }
-
-  @Override
-  public void unbindRequested(final ChannelHandlerContext ctx, final ChannelStateEvent e)
-      throws Exception {
-    downstream.unbindRequested(ctx, e);
-  }
-
-  @Override
-  public void closeRequested(final ChannelHandlerContext ctx, final ChannelStateEvent e)
-      throws Exception {
-    downstream.closeRequested(ctx, e);
-  }
+                Upstream extends SimpleChannelUpstreamHandler, Downstream extends SimpleChannelDownstreamHandler>
+        extends SimpleChannelHandler {
+
+    private final Upstream upstream;
+    private final Downstream downstream;
+
+    public CombinedSimpleChannelHandler(final Upstream upstream, final Downstream downstream) {
+        this.upstream = upstream;
+        this.downstream = downstream;
+    }
+
+    @Override
+    public void handleUpstream(final ChannelHandlerContext ctx, final ChannelEvent e) throws Exception {
+        upstream.handleUpstream(ctx, e);
+    }
+
+    @Override
+    public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent e) throws Exception {
+        upstream.messageReceived(ctx, e);
+    }
+
+    @Override
+    public void exceptionCaught(final ChannelHandlerContext ctx, final ExceptionEvent e) throws Exception {
+        upstream.exceptionCaught(ctx, e);
+    }
+
+    @Override
+    public void channelOpen(final ChannelHandlerContext ctx, final ChannelStateEvent e) throws Exception {
+        upstream.channelOpen(ctx, e);
+    }
+
+    @Override
+    public void channelBound(final ChannelHandlerContext ctx, final ChannelStateEvent e) throws Exception {
+        upstream.channelBound(ctx, e);
+    }
+
+    @Override
+    public void channelConnected(final ChannelHandlerContext ctx, final ChannelStateEvent e) throws Exception {
+        upstream.channelConnected(ctx, e);
+    }
+
+    @Override
+    public void channelInterestChanged(final ChannelHandlerContext ctx, final ChannelStateEvent e) throws Exception {
+        upstream.channelInterestChanged(ctx, e);
+    }
+
+    @Override
+    public void channelDisconnected(final ChannelHandlerContext ctx, final ChannelStateEvent e) throws Exception {
+        upstream.channelDisconnected(ctx, e);
+    }
+
+    @Override
+    public void channelUnbound(final ChannelHandlerContext ctx, final ChannelStateEvent e) throws Exception {
+        upstream.channelUnbound(ctx, e);
+    }
+
+    @Override
+    public void channelClosed(final ChannelHandlerContext ctx, final ChannelStateEvent e) throws Exception {
+        upstream.channelClosed(ctx, e);
+    }
+
+    @Override
+    public void writeComplete(final ChannelHandlerContext ctx, final WriteCompletionEvent e) throws Exception {
+        upstream.writeComplete(ctx, e);
+    }
+
+    @Override
+    public void childChannelOpen(final ChannelHandlerContext ctx, final ChildChannelStateEvent e) throws Exception {
+        upstream.childChannelOpen(ctx, e);
+    }
+
+    @Override
+    public void childChannelClosed(final ChannelHandlerContext ctx, final ChildChannelStateEvent e) throws Exception {
+        upstream.childChannelClosed(ctx, e);
+    }
+
+    @Override
+    public void handleDownstream(final ChannelHandlerContext ctx, final ChannelEvent e) throws Exception {
+        downstream.handleDownstream(ctx, e);
+    }
+
+    @Override
+    public void writeRequested(final ChannelHandlerContext ctx, final MessageEvent e) throws Exception {
+        downstream.writeRequested(ctx, e);
+    }
+
+    @Override
+    public void bindRequested(final ChannelHandlerContext ctx, final ChannelStateEvent e) throws Exception {
+        downstream.bindRequested(ctx, e);
+    }
+
+    @Override
+    public void connectRequested(final ChannelHandlerContext ctx, final ChannelStateEvent e) throws Exception {
+        downstream.connectRequested(ctx, e);
+    }
+
+    @Override
+    public void setInterestOpsRequested(final ChannelHandlerContext ctx, final ChannelStateEvent e) throws Exception {
+        downstream.setInterestOpsRequested(ctx, e);
+    }
+
+    @Override
+    public void disconnectRequested(final ChannelHandlerContext ctx, final ChannelStateEvent e) throws Exception {
+        downstream.disconnectRequested(ctx, e);
+    }
+
+    @Override
+    public void unbindRequested(final ChannelHandlerContext ctx, final ChannelStateEvent e) throws Exception {
+        downstream.unbindRequested(ctx, e);
+    }
+
+    @Override
+    public void closeRequested(final ChannelHandlerContext ctx, final ChannelStateEvent e) throws Exception {
+        downstream.closeRequested(ctx, e);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/AttributeKeys.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/AttributeKeys.java
index ab9f0bb8a3d..895cf3913ab 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/AttributeKeys.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/AttributeKeys.java
@@ -14,56 +14,55 @@
 
 public final class AttributeKeys {
 
-  private static final ClassValue<ConcurrentHashMap<String, AttributeKey<?>>> MAPS =
-      GenericClassValue.constructing(ConcurrentHashMap.class);
+    private static final ClassValue<ConcurrentHashMap<String, AttributeKey<?>>> MAPS =
+            GenericClassValue.constructing(ConcurrentHashMap.class);
 
-  public static final AttributeKey<Context> CONTEXT_ATTRIBUTE_KEY =
-      attributeKey(DD_CONTEXT_ATTRIBUTE);
+    public static final AttributeKey<Context> CONTEXT_ATTRIBUTE_KEY = attributeKey(DD_CONTEXT_ATTRIBUTE);
 
-  public static final AttributeKey<AgentSpan> CLIENT_PARENT_ATTRIBUTE_KEY =
-      attributeKey("datadog.client.parent.span");
+    public static final AttributeKey<AgentSpan> CLIENT_PARENT_ATTRIBUTE_KEY =
+            attributeKey("datadog.client.parent.span");
 
-  public static final AttributeKey<ContextContinuation> CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY =
-      attributeKey("datadog.connect.parent.continuation");
+    public static final AttributeKey<ContextContinuation> CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY =
+            attributeKey("datadog.connect.parent.continuation");
 
-  public static final AttributeKey<Context> PARENT_CONTEXT_ATTRIBUTE_KEY =
-      attributeKey("datadog.server.parent-context");
+    public static final AttributeKey<Context> PARENT_CONTEXT_ATTRIBUTE_KEY =
+            attributeKey("datadog.server.parent-context");
 
-  public static final AttributeKey<HttpHeaders> REQUEST_HEADERS_ATTRIBUTE_KEY =
-      attributeKey("datadog.server.request.headers");
+    public static final AttributeKey<HttpHeaders> REQUEST_HEADERS_ATTRIBUTE_KEY =
+            attributeKey("datadog.server.request.headers");
 
-  public static final AttributeKey<Boolean> ANALYZED_RESPONSE_KEY =
-      new AttributeKey<>("datadog.server.analyzed_response");
+    public static final AttributeKey<Boolean> ANALYZED_RESPONSE_KEY =
+            new AttributeKey<>("datadog.server.analyzed_response");
 
-  public static final AttributeKey<Boolean> BLOCKED_RESPONSE_KEY =
-      new AttributeKey<>("datadog.server.blocked_response");
+    public static final AttributeKey<Boolean> BLOCKED_RESPONSE_KEY =
+            new AttributeKey<>("datadog.server.blocked_response");
 
-  public static final AttributeKey<String> CHANNEL_ID = attributeKey("io.netty.channel.id");
+    public static final AttributeKey<String> CHANNEL_ID = attributeKey("io.netty.channel.id");
 
-  public static final AttributeKey<HandlerContext.Sender> WEBSOCKET_SENDER_HANDLER_CONTEXT =
-      attributeKey("datadog.server.websocket.sender.handler_context");
+    public static final AttributeKey<HandlerContext.Sender> WEBSOCKET_SENDER_HANDLER_CONTEXT =
+            attributeKey("datadog.server.websocket.sender.handler_context");
 
-  public static final AttributeKey<HandlerContext.Receiver> WEBSOCKET_RECEIVER_HANDLER_CONTEXT =
-      attributeKey("datadog.server.websocket.receiver.handler_context");
+    public static final AttributeKey<HandlerContext.Receiver> WEBSOCKET_RECEIVER_HANDLER_CONTEXT =
+            attributeKey("datadog.server.websocket.receiver.handler_context");
 
-  /**
-   * Generate an attribute key or reuse the one existing in the global app map. This implementation
-   * creates attributes only once even if the current class is loaded by several class loaders and
-   * prevents an issue with Apache Atlas project were this class loaded by multiple class loaders,
-   * while the Attribute class is loaded by a third class loader and used internally for the
-   * cassandra driver.
-   */
-  @SuppressWarnings("unchecked")
-  private static <T> AttributeKey<T> attributeKey(final String key) {
-    ConcurrentMap<String, AttributeKey<?>> map = MAPS.get(AttributeKey.class);
-    AttributeKey<T> attributeKey = (AttributeKey<T>) map.get(key);
-    if (null == attributeKey) {
-      attributeKey = new AttributeKey<>(key);
-      AttributeKey<T> predecessor = (AttributeKey<T>) map.putIfAbsent(key, attributeKey);
-      if (null != predecessor) {
-        attributeKey = predecessor;
-      }
+    /**
+     * Generate an attribute key or reuse the one existing in the global app map. This implementation
+     * creates attributes only once even if the current class is loaded by several class loaders and
+     * prevents an issue with Apache Atlas project were this class loaded by multiple class loaders,
+     * while the Attribute class is loaded by a third class loader and used internally for the
+     * cassandra driver.
+     */
+    @SuppressWarnings("unchecked")
+    private static <T> AttributeKey<T> attributeKey(final String key) {
+        ConcurrentMap<String, AttributeKey<?>> map = MAPS.get(AttributeKey.class);
+        AttributeKey<T> attributeKey = (AttributeKey<T>) map.get(key);
+        if (null == attributeKey) {
+            attributeKey = new AttributeKey<>(key);
+            AttributeKey<T> predecessor = (AttributeKey<T>) map.putIfAbsent(key, attributeKey);
+            if (null != predecessor) {
+                attributeKey = predecessor;
+            }
+        }
+        return attributeKey;
     }
-    return attributeKey;
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java
index ddb3516a871..1ff1ce9bb0b 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java
@@ -24,68 +24,69 @@
 
 @AutoService(InstrumenterModule.class)
 public class ChannelFutureListenerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public ChannelFutureListenerInstrumentation() {
-    super(
-        NettyChannelPipelineInstrumentation.INSTRUMENTATION_NAME,
-        NettyChannelPipelineInstrumentation.ADDITIONAL_INSTRUMENTATION_NAMES);
-  }
+    public ChannelFutureListenerInstrumentation() {
+        super(
+                NettyChannelPipelineInstrumentation.INSTRUMENTATION_NAME,
+                NettyChannelPipelineInstrumentation.ADDITIONAL_INSTRUMENTATION_NAMES);
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.netty.channel.ChannelFutureListener";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.netty.channel.ChannelFutureListener";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("operationComplete"))
-            .and(takesArgument(0, named("io.netty.channel.ChannelFuture"))),
-        ChannelFutureListenerInstrumentation.class.getName() + "$OperationCompleteAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("operationComplete"))
+                        .and(takesArgument(0, named("io.netty.channel.ChannelFuture"))),
+                ChannelFutureListenerInstrumentation.class.getName() + "$OperationCompleteAdvice");
+    }
 
-  public static class OperationCompleteAdvice {
-    @Advice.OnMethodEnter
-    public static ContextScope activateScope(@Advice.Argument(0) final ChannelFuture future) {
-      /*
-      Idea here is:
-       - To return scope only if we have captured it.
-       - To capture scope only in case of error.
-       */
-      final Throwable cause = future.cause();
-      if (cause == null) {
-        return null;
-      }
-      final ContextContinuation continuation =
-          future.channel().attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY).getAndRemove();
-      if (continuation == null) {
-        return null;
-      }
-      final ContextScope parentScope = continuation.resume();
+    public static class OperationCompleteAdvice {
+        @Advice.OnMethodEnter
+        public static ContextScope activateScope(@Advice.Argument(0) final ChannelFuture future) {
+            /*
+            Idea here is:
+             - To return scope only if we have captured it.
+             - To capture scope only in case of error.
+             */
+            final Throwable cause = future.cause();
+            if (cause == null) {
+                return null;
+            }
+            final ContextContinuation continuation = future.channel()
+                    .attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY)
+                    .getAndRemove();
+            if (continuation == null) {
+                return null;
+            }
+            final ContextScope parentScope = continuation.resume();
 
-      final AgentSpan errorSpan = startSpan("netty", NETTY_CONNECT).setTag(Tags.COMPONENT, "netty");
-      errorSpan.spanContext().setIntegrationName(NETTY);
-      try (final ContextScope scope = errorSpan.attachWithContext()) {
-        NettyHttpServerDecorator.DECORATE.onError(errorSpan, cause);
-        NettyHttpServerDecorator.DECORATE.beforeFinish(scope.context());
-        errorSpan.finish();
-      }
+            final AgentSpan errorSpan = startSpan("netty", NETTY_CONNECT).setTag(Tags.COMPONENT, "netty");
+            errorSpan.spanContext().setIntegrationName(NETTY);
+            try (final ContextScope scope = errorSpan.attachWithContext()) {
+                NettyHttpServerDecorator.DECORATE.onError(errorSpan, cause);
+                NettyHttpServerDecorator.DECORATE.beforeFinish(scope.context());
+                errorSpan.finish();
+            }
 
-      return parentScope;
-    }
+            return parentScope;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void deactivateScope(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void deactivateScope(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java
index 0bf4cdc9207..d5f7f893735 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java
@@ -27,53 +27,54 @@
 
 @AutoService(InstrumenterModule.class)
 public class NettyChannelHandlerContextInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public NettyChannelHandlerContextInstrumentation() {
-    super(INSTRUMENTATION_NAME, ADDITIONAL_INSTRUMENTATION_NAMES);
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.netty.channel.ChannelHandlerContext";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    public NettyChannelHandlerContextInstrumentation() {
+        super(INSTRUMENTATION_NAME, ADDITIONAL_INSTRUMENTATION_NAMES);
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        // this may be overly aggressive:
-        isMethod().and(nameStartsWith("fire")).and(isPublic()),
-        NettyChannelHandlerContextInstrumentation.class.getName() + "$FireAdvice");
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.netty.channel.ChannelHandlerContext";
+    }
 
-  public static class FireAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope scopeSpan(@Advice.This final ChannelHandlerContext ctx) {
-      final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get();
-      final AgentSpan channelSpan = spanFromContext(storedContext);
-      if (channelSpan == null || channelSpan == activeSpan()) {
-        // don't modify the scope
-        return null;
-      }
-      return activateSpan(channelSpan);
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void close(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                // this may be overly aggressive:
+                isMethod().and(nameStartsWith("fire")).and(isPublic()),
+                NettyChannelHandlerContextInstrumentation.class.getName() + "$FireAdvice");
     }
 
-    @SuppressWarnings("DataFlowIssue")
-    private void muzzleCheck() {
-      NettyHttpClientDecorator.DECORATE.afterStart(null);
-      NettyHttpServerDecorator.DECORATE.afterStart(null);
+    public static class FireAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope scopeSpan(@Advice.This final ChannelHandlerContext ctx) {
+            final Context storedContext =
+                    ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get();
+            final AgentSpan channelSpan = spanFromContext(storedContext);
+            if (channelSpan == null || channelSpan == activeSpan()) {
+                // don't modify the scope
+                return null;
+            }
+            return activateSpan(channelSpan);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void close(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
+
+        @SuppressWarnings("DataFlowIssue")
+        private void muzzleCheck() {
+            NettyHttpClientDecorator.DECORATE.afterStart(null);
+            NettyHttpServerDecorator.DECORATE.afterStart(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java
index 4367c676554..faeb347a90f 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java
@@ -45,172 +45,162 @@
 
 @AutoService(InstrumenterModule.class)
 public class NettyChannelPipelineInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  static final String INSTRUMENTATION_NAME = "netty";
-  static final String[] ADDITIONAL_INSTRUMENTATION_NAMES = {"netty-4.0"};
+    static final String INSTRUMENTATION_NAME = "netty";
+    static final String[] ADDITIONAL_INSTRUMENTATION_NAMES = {"netty-4.0"};
 
-  public NettyChannelPipelineInstrumentation() {
-    super(INSTRUMENTATION_NAME, ADDITIONAL_INSTRUMENTATION_NAMES);
-  }
+    public NettyChannelPipelineInstrumentation() {
+        super(INSTRUMENTATION_NAME, ADDITIONAL_INSTRUMENTATION_NAMES);
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.netty.channel.ChannelPipeline";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.netty.channel.ChannelPipeline";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(namedOneOf("addFirst", "addLast"))
-            .and(takesArgument(2, named("io.netty.channel.ChannelHandler"))),
-        NettyChannelPipelineInstrumentation.class.getName() + "$ContextTrackingAddHandlerAdvice",
-        NettyChannelPipelineInstrumentation.class.getName() + "$AddHandlerAdvice");
-    transformer.applyAdvices(
-        isMethod()
-            .and(namedOneOf("addBefore", "addAfter"))
-            .and(takesArgument(3, named("io.netty.channel.ChannelHandler"))),
-        NettyChannelPipelineInstrumentation.class.getName() + "$ContextTrackingAddHandlerAdvice",
-        NettyChannelPipelineInstrumentation.class.getName() + "$AddHandlerAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("connect")).and(returns(named("io.netty.channel.ChannelFuture"))),
-        NettyChannelPipelineInstrumentation.class.getName() + "$ConnectAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(namedOneOf("addFirst", "addLast"))
+                        .and(takesArgument(2, named("io.netty.channel.ChannelHandler"))),
+                NettyChannelPipelineInstrumentation.class.getName() + "$ContextTrackingAddHandlerAdvice",
+                NettyChannelPipelineInstrumentation.class.getName() + "$AddHandlerAdvice");
+        transformer.applyAdvices(
+                isMethod()
+                        .and(namedOneOf("addBefore", "addAfter"))
+                        .and(takesArgument(3, named("io.netty.channel.ChannelHandler"))),
+                NettyChannelPipelineInstrumentation.class.getName() + "$ContextTrackingAddHandlerAdvice",
+                NettyChannelPipelineInstrumentation.class.getName() + "$AddHandlerAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("connect")).and(returns(named("io.netty.channel.ChannelFuture"))),
+                NettyChannelPipelineInstrumentation.class.getName() + "$ConnectAdvice");
+    }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextTrackingAddHandlerAdvice {
-    // No OnMethodEnter — avoids double-incrementing CallDepthThreadLocalMap,
-    // which would cause AddHandlerAdvice.OnMethodExit to see depth > 0 and skip.
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void addContextTrackingHandler(
-        @Advice.This final ChannelPipeline pipeline,
-        @Advice.Argument(value = 2, optional = true) final Object handler2,
-        @Advice.Argument(value = 3, optional = true) final ChannelHandler handler3) {
-      ChannelHandler handler =
-          handler2 instanceof ChannelHandler ? (ChannelHandler) handler2 : handler3;
-      try {
-        if (handler instanceof HttpServerCodec || handler instanceof HttpRequestDecoder) {
-          NettyPipelineHelper.addHandlerAfter(
-              pipeline, handler, HttpServerContextTrackingHandler.INSTANCE);
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextTrackingAddHandlerAdvice {
+        // No OnMethodEnter — avoids double-incrementing CallDepthThreadLocalMap,
+        // which would cause AddHandlerAdvice.OnMethodExit to see depth > 0 and skip.
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void addContextTrackingHandler(
+                @Advice.This final ChannelPipeline pipeline,
+                @Advice.Argument(value = 2, optional = true) final Object handler2,
+                @Advice.Argument(value = 3, optional = true) final ChannelHandler handler3) {
+            ChannelHandler handler = handler2 instanceof ChannelHandler ? (ChannelHandler) handler2 : handler3;
+            try {
+                if (handler instanceof HttpServerCodec || handler instanceof HttpRequestDecoder) {
+                    NettyPipelineHelper.addHandlerAfter(pipeline, handler, HttpServerContextTrackingHandler.INSTANCE);
+                }
+            } catch (final IllegalArgumentException e) {
+                // Prevented adding duplicate handlers.
+            }
         }
-      } catch (final IllegalArgumentException e) {
-        // Prevented adding duplicate handlers.
-      }
     }
-  }
 
-  /**
-   * When certain handlers are added to the pipeline, we want to add our corresponding tracing
-   * handlers. If those handlers are later removed, we may want to remove our handlers. That is not
-   * currently implemented.
-   */
-  public static class AddHandlerAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static int checkDepth(
-        @Advice.Argument(value = 2, optional = true) final Object handler2,
-        @Advice.Argument(value = 3, optional = true) final ChannelHandler handler3) {
-      ChannelHandler handler =
-          handler2 instanceof ChannelHandler ? (ChannelHandler) handler2 : handler3;
-      /**
-       * Previously we used one unique call depth tracker for all handlers, using
-       * ChannelPipeline.class as a key. The problem with this approach is that it does not work
-       * with netty's io.netty.channel.ChannelInitializer which provides an `initChannel` that can
-       * be used to `addLast` other handlers. In that case the depth would exceed 0 and handlers
-       * added from initializers would not be considered. Using the specific handler key instead of
-       * the generic ChannelPipeline.class will help us both to handle such cases and avoid adding
-       * our additional handlers in case of internal calls of `addLast` to other method overloads
-       * with a compatible signature.
-       */
-      return CallDepthThreadLocalMap.incrementCallDepth(handler.getClass());
-    }
+    /**
+     * When certain handlers are added to the pipeline, we want to add our corresponding tracing
+     * handlers. If those handlers are later removed, we may want to remove our handlers. That is not
+     * currently implemented.
+     */
+    public static class AddHandlerAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static int checkDepth(
+                @Advice.Argument(value = 2, optional = true) final Object handler2,
+                @Advice.Argument(value = 3, optional = true) final ChannelHandler handler3) {
+            ChannelHandler handler = handler2 instanceof ChannelHandler ? (ChannelHandler) handler2 : handler3;
+            /**
+             * Previously we used one unique call depth tracker for all handlers, using
+             * ChannelPipeline.class as a key. The problem with this approach is that it does not work
+             * with netty's io.netty.channel.ChannelInitializer which provides an `initChannel` that can
+             * be used to `addLast` other handlers. In that case the depth would exceed 0 and handlers
+             * added from initializers would not be considered. Using the specific handler key instead of
+             * the generic ChannelPipeline.class will help us both to handle such cases and avoid adding
+             * our additional handlers in case of internal calls of `addLast` to other method overloads
+             * with a compatible signature.
+             */
+            return CallDepthThreadLocalMap.incrementCallDepth(handler.getClass());
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void addHandler(
-        @Advice.Enter final int depth,
-        @Advice.This final ChannelPipeline pipeline,
-        @Advice.Argument(value = 2, optional = true) final Object handler2,
-        @Advice.Argument(value = 3, optional = true) final ChannelHandler handler3) {
-      if (depth > 0) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void addHandler(
+                @Advice.Enter final int depth,
+                @Advice.This final ChannelPipeline pipeline,
+                @Advice.Argument(value = 2, optional = true) final Object handler2,
+                @Advice.Argument(value = 3, optional = true) final ChannelHandler handler3) {
+            if (depth > 0) {
+                return;
+            }
 
-      ChannelHandler handler =
-          handler2 instanceof ChannelHandler ? (ChannelHandler) handler2 : handler3;
+            ChannelHandler handler = handler2 instanceof ChannelHandler ? (ChannelHandler) handler2 : handler3;
 
-      try {
-        // Server pipeline handlers
-        if (handler instanceof HttpServerCodec) {
-          NettyPipelineHelper.addHandlerAfter(
-              pipeline,
-              handler,
-              new HttpServerTracingHandler(),
-              MaybeBlockResponseHandler.INSTANCE);
-        } else if (handler instanceof HttpRequestDecoder) {
-          NettyPipelineHelper.addHandlerAfter(
-              pipeline, handler, HttpServerRequestTracingHandler.INSTANCE);
-        } else if (handler instanceof HttpResponseEncoder) {
-          NettyPipelineHelper.addHandlerAfter(
-              pipeline,
-              handler,
-              HttpServerResponseTracingHandler.INSTANCE,
-              MaybeBlockResponseHandler.INSTANCE);
-        } else if (handler instanceof WebSocketServerProtocolHandler) {
-          if (InstrumenterConfig.get().isWebsocketTracingEnabled()) {
-            if (pipeline.get(HttpServerTracingHandler.class) != null) {
-              NettyPipelineHelper.addHandlerAfter(
-                  pipeline,
-                  "datadog.trace.instrumentation.netty40.server.HttpServerTracingHandler",
-                  new WebSocketServerTracingHandler());
-            }
-            if (pipeline.get(HttpRequestDecoder.class) != null) {
-              NettyPipelineHelper.addHandlerAfter(
-                  pipeline,
-                  "datadog.trace.instrumentation.netty40.server.HttpServerRequestTracingHandler",
-                  WebSocketServerRequestTracingHandler.INSTANCE);
+            try {
+                // Server pipeline handlers
+                if (handler instanceof HttpServerCodec) {
+                    NettyPipelineHelper.addHandlerAfter(
+                            pipeline, handler, new HttpServerTracingHandler(), MaybeBlockResponseHandler.INSTANCE);
+                } else if (handler instanceof HttpRequestDecoder) {
+                    NettyPipelineHelper.addHandlerAfter(pipeline, handler, HttpServerRequestTracingHandler.INSTANCE);
+                } else if (handler instanceof HttpResponseEncoder) {
+                    NettyPipelineHelper.addHandlerAfter(
+                            pipeline,
+                            handler,
+                            HttpServerResponseTracingHandler.INSTANCE,
+                            MaybeBlockResponseHandler.INSTANCE);
+                } else if (handler instanceof WebSocketServerProtocolHandler) {
+                    if (InstrumenterConfig.get().isWebsocketTracingEnabled()) {
+                        if (pipeline.get(HttpServerTracingHandler.class) != null) {
+                            NettyPipelineHelper.addHandlerAfter(
+                                    pipeline,
+                                    "datadog.trace.instrumentation.netty40.server.HttpServerTracingHandler",
+                                    new WebSocketServerTracingHandler());
+                        }
+                        if (pipeline.get(HttpRequestDecoder.class) != null) {
+                            NettyPipelineHelper.addHandlerAfter(
+                                    pipeline,
+                                    "datadog.trace.instrumentation.netty40.server.HttpServerRequestTracingHandler",
+                                    WebSocketServerRequestTracingHandler.INSTANCE);
+                        }
+                        if (pipeline.get(HttpResponseEncoder.class) != null) {
+                            NettyPipelineHelper.addHandlerAfter(
+                                    pipeline,
+                                    "datadog.trace.instrumentation.netty40.server.HttpServerResponseTracingHandler",
+                                    WebSocketServerResponseTracingHandler.INSTANCE);
+                        }
+                    }
+                } else
+                // Client pipeline handlers
+                if (handler instanceof HttpClientCodec) {
+                    NettyPipelineHelper.addHandlerAfter(pipeline, handler, new HttpClientTracingHandler());
+                } else if (handler instanceof HttpRequestEncoder) {
+                    NettyPipelineHelper.addHandlerAfter(pipeline, handler, HttpClientRequestTracingHandler.INSTANCE);
+                } else if (handler instanceof HttpResponseDecoder) {
+                    NettyPipelineHelper.addHandlerAfter(pipeline, handler, HttpClientResponseTracingHandler.INSTANCE);
+                }
+            } catch (final IllegalArgumentException e) {
+                // Prevented adding duplicate handlers.
+            } finally {
+                CallDepthThreadLocalMap.reset(handler.getClass());
             }
-            if (pipeline.get(HttpResponseEncoder.class) != null) {
-              NettyPipelineHelper.addHandlerAfter(
-                  pipeline,
-                  "datadog.trace.instrumentation.netty40.server.HttpServerResponseTracingHandler",
-                  WebSocketServerResponseTracingHandler.INSTANCE);
-            }
-          }
-        } else
-        // Client pipeline handlers
-        if (handler instanceof HttpClientCodec) {
-          NettyPipelineHelper.addHandlerAfter(pipeline, handler, new HttpClientTracingHandler());
-        } else if (handler instanceof HttpRequestEncoder) {
-          NettyPipelineHelper.addHandlerAfter(
-              pipeline, handler, HttpClientRequestTracingHandler.INSTANCE);
-        } else if (handler instanceof HttpResponseDecoder) {
-          NettyPipelineHelper.addHandlerAfter(
-              pipeline, handler, HttpClientResponseTracingHandler.INSTANCE);
         }
-      } catch (final IllegalArgumentException e) {
-        // Prevented adding duplicate handlers.
-      } finally {
-        CallDepthThreadLocalMap.reset(handler.getClass());
-      }
     }
-  }
 
-  public static class ConnectAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void addParentSpan(@Advice.This final ChannelPipeline pipeline) {
-      ContextContinuation continuation = currentContext().capture();
-      if (continuation.context() != rootContext()) {
-        final Attribute<ContextContinuation> attribute =
-            pipeline.channel().attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY);
-        if (!attribute.compareAndSet(null, continuation)) {
-          continuation.release();
+    public static class ConnectAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void addParentSpan(@Advice.This final ChannelPipeline pipeline) {
+            ContextContinuation continuation = currentContext().capture();
+            if (continuation.context() != rootContext()) {
+                final Attribute<ContextContinuation> attribute =
+                        pipeline.channel().attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY);
+                if (!attribute.compareAndSet(null, continuation)) {
+                    continuation.release();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyPipelineHelper.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyPipelineHelper.java
index 1bda9760ef4..42aaa48390b 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyPipelineHelper.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyPipelineHelper.java
@@ -5,28 +5,28 @@
 import io.netty.channel.ChannelPipeline;
 
 public class NettyPipelineHelper {
-  public static void addHandlerAfter(
-      final ChannelPipeline pipeline, final String name, final ChannelHandler... toAdd) {
-    String targetHandlerName = name;
-    for (ChannelHandler handler : toAdd) {
-      ChannelHandler existing = pipeline.get(handler.getClass());
-      if (existing != null) {
-        pipeline.remove(existing);
-      }
-      pipeline.addAfter(targetHandlerName, handler.getClass().getName(), handler);
-      ChannelHandlerContext handlerContext = pipeline.context(handler);
-      if (handlerContext != null) {
-        targetHandlerName = handlerContext.name();
-      }
+    public static void addHandlerAfter(
+            final ChannelPipeline pipeline, final String name, final ChannelHandler... toAdd) {
+        String targetHandlerName = name;
+        for (ChannelHandler handler : toAdd) {
+            ChannelHandler existing = pipeline.get(handler.getClass());
+            if (existing != null) {
+                pipeline.remove(existing);
+            }
+            pipeline.addAfter(targetHandlerName, handler.getClass().getName(), handler);
+            ChannelHandlerContext handlerContext = pipeline.context(handler);
+            if (handlerContext != null) {
+                targetHandlerName = handlerContext.name();
+            }
+        }
     }
-  }
 
-  public static void addHandlerAfter(
-      final ChannelPipeline pipeline, final ChannelHandler handler, final ChannelHandler... toAdd) {
-    ChannelHandlerContext handlerContext = pipeline.context(handler);
-    if (handlerContext != null) {
-      String handlerName = handlerContext.name();
-      addHandlerAfter(pipeline, handlerName, toAdd);
+    public static void addHandlerAfter(
+            final ChannelPipeline pipeline, final ChannelHandler handler, final ChannelHandler... toAdd) {
+        ChannelHandlerContext handlerContext = pipeline.context(handler);
+        if (handlerContext != null) {
+            String handlerName = handlerContext.name();
+            addHandlerAfter(pipeline, handlerName, toAdd);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java
index 6a4f5fe1d7c..32c1d6bb446 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java
@@ -27,86 +27,85 @@
 
 @ChannelHandler.Sharable
 public class HttpClientRequestTracingHandler extends ChannelOutboundHandlerAdapter {
-  public static final HttpClientRequestTracingHandler INSTANCE =
-      new HttpClientRequestTracingHandler();
-  private static final Class<ChannelHandler> SSL_HANDLER;
+    public static final HttpClientRequestTracingHandler INSTANCE = new HttpClientRequestTracingHandler();
+    private static final Class<ChannelHandler> SSL_HANDLER;
 
-  static {
-    Class<?> sslHandler;
-    try {
-      // This class is in "netty-handler", so ignore if not present.
-      ClassLoader cl = HttpClientRequestTracingHandler.class.getClassLoader();
-      sslHandler = Class.forName("io.netty.handler.ssl.SslHandler", false, cl);
-    } catch (ClassNotFoundException e) {
-      sslHandler = null;
+    static {
+        Class<?> sslHandler;
+        try {
+            // This class is in "netty-handler", so ignore if not present.
+            ClassLoader cl = HttpClientRequestTracingHandler.class.getClassLoader();
+            sslHandler = Class.forName("io.netty.handler.ssl.SslHandler", false, cl);
+        } catch (ClassNotFoundException e) {
+            sslHandler = null;
+        }
+        SSL_HANDLER = (Class<ChannelHandler>) sslHandler;
     }
-    SSL_HANDLER = (Class<ChannelHandler>) sslHandler;
-  }
 
-  private static final boolean AWS_LEGACY_TRACING = Config.get().isAwsLegacyTracingEnabled();
+    private static final boolean AWS_LEGACY_TRACING = Config.get().isAwsLegacyTracingEnabled();
 
-  @Override
-  public void write(final ChannelHandlerContext ctx, final Object msg, final ChannelPromise prm) {
-    if (!(msg instanceof HttpRequest)) {
-      ctx.write(msg, prm);
-      return;
-    }
+    @Override
+    public void write(final ChannelHandlerContext ctx, final Object msg, final ChannelPromise prm) {
+        if (!(msg instanceof HttpRequest)) {
+            ctx.write(msg, prm);
+            return;
+        }
 
-    ContextScope parentScope = null;
-    final ContextContinuation continuation =
-        ctx.channel().attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY).getAndRemove();
-    if (continuation != null) {
-      parentScope = continuation.resume();
-    }
+        ContextScope parentScope = null;
+        final ContextContinuation continuation =
+                ctx.channel().attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY).getAndRemove();
+        if (continuation != null) {
+            parentScope = continuation.resume();
+        }
 
-    final HttpRequest request = (HttpRequest) msg;
-    boolean awsClientCall = request.headers().contains("amz-sdk-invocation-id");
-    if (!AWS_LEGACY_TRACING && awsClientCall) {
-      // avoid creating an extra HTTP client span beneath the AWS client call
-      try {
-        ctx.write(msg, prm);
-        return;
-      } finally {
-        if (null != parentScope) {
-          parentScope.close();
+        final HttpRequest request = (HttpRequest) msg;
+        boolean awsClientCall = request.headers().contains("amz-sdk-invocation-id");
+        if (!AWS_LEGACY_TRACING && awsClientCall) {
+            // avoid creating an extra HTTP client span beneath the AWS client call
+            try {
+                ctx.write(msg, prm);
+                return;
+            } finally {
+                if (null != parentScope) {
+                    parentScope.close();
+                }
+            }
         }
-      }
-    }
 
-    ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY).set(activeSpan());
-    boolean isSecure = SSL_HANDLER != null && ctx.pipeline().get(SSL_HANDLER) != null;
-    NettyHttpClientDecorator decorate = isSecure ? DECORATE_SECURE : DECORATE;
+        ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY).set(activeSpan());
+        boolean isSecure = SSL_HANDLER != null && ctx.pipeline().get(SSL_HANDLER) != null;
+        NettyHttpClientDecorator decorate = isSecure ? DECORATE_SECURE : DECORATE;
 
-    final AgentSpan span = startSpan(NETTY_CLIENT.toString(), NETTY_CLIENT_REQUEST);
-    final Context context = Context.current().with(span);
-    try (final ContextScope scope = activateSpan(span)) {
-      decorate.afterStart(span);
-      decorate.onRequest(span, request);
+        final AgentSpan span = startSpan(NETTY_CLIENT.toString(), NETTY_CLIENT_REQUEST);
+        final Context context = Context.current().with(span);
+        try (final ContextScope scope = activateSpan(span)) {
+            decorate.afterStart(span);
+            decorate.onRequest(span, request);
 
-      SocketAddress socketAddress = ctx.channel().remoteAddress();
-      if (socketAddress instanceof InetSocketAddress) {
-        decorate.onPeerConnection(span, (InetSocketAddress) socketAddress);
-      }
+            SocketAddress socketAddress = ctx.channel().remoteAddress();
+            if (socketAddress instanceof InetSocketAddress) {
+                decorate.onPeerConnection(span, (InetSocketAddress) socketAddress);
+            }
 
-      // AWS calls are often signed, so we can't add headers without breaking the signature.
-      if (!awsClientCall) {
-        DECORATE.injectContext(Context.current(), request.headers(), SETTER);
-      }
+            // AWS calls are often signed, so we can't add headers without breaking the signature.
+            if (!awsClientCall) {
+                DECORATE.injectContext(Context.current(), request.headers(), SETTER);
+            }
 
-      ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(context);
+            ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(context);
 
-      try {
-        ctx.write(msg, prm);
-      } catch (final Throwable throwable) {
-        decorate.onError(span, throwable);
-        decorate.beforeFinish(span);
-        span.finish();
-        throw throwable;
-      }
-    } finally {
-      if (null != parentScope) {
-        parentScope.close();
-      }
+            try {
+                ctx.write(msg, prm);
+            } catch (final Throwable throwable) {
+                decorate.onError(span, throwable);
+                decorate.beforeFinish(span);
+                span.finish();
+                throw throwable;
+            }
+        } finally {
+            if (null != parentScope) {
+                parentScope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java
index b353d24c9a5..d7866df902e 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java
@@ -17,88 +17,87 @@
 
 @ChannelHandler.Sharable
 public class HttpClientResponseTracingHandler extends ChannelInboundHandlerAdapter {
-  public static final HttpClientResponseTracingHandler INSTANCE =
-      new HttpClientResponseTracingHandler();
+    public static final HttpClientResponseTracingHandler INSTANCE = new HttpClientResponseTracingHandler();
 
-  @Override
-  public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
-    final Attribute<AgentSpan> parentAttr = ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY);
-    parentAttr.setIfAbsent(noopSpan());
-    final AgentSpan parent = parentAttr.get();
-    final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get();
-    final AgentSpan span = AgentSpan.fromContext(storedContext);
+    @Override
+    public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
+        final Attribute<AgentSpan> parentAttr = ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY);
+        parentAttr.setIfAbsent(noopSpan());
+        final AgentSpan parent = parentAttr.get();
+        final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get();
+        final AgentSpan span = AgentSpan.fromContext(storedContext);
 
-    // Set parent context back to maintain the same functionality as getAndSet(parent)
-    if (storedContext != null) {
-      ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(storedContext.with(parent));
-    }
+        // Set parent context back to maintain the same functionality as getAndSet(parent)
+        if (storedContext != null) {
+            ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(storedContext.with(parent));
+        }
 
-    final boolean finishSpan = msg instanceof HttpResponse;
+        final boolean finishSpan = msg instanceof HttpResponse;
 
-    if (span != null && finishSpan) {
-      try (final ContextScope scope = activateSpan(span)) {
-        DECORATE.onResponse(span, (HttpResponse) msg);
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
-    }
+        if (span != null && finishSpan) {
+            try (final ContextScope scope = activateSpan(span)) {
+                DECORATE.onResponse(span, (HttpResponse) msg);
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
+        }
 
-    // We want the callback in the scope of the parent, not the client span
-    try (final ContextScope scope = activateSpan(parent)) {
-      ctx.fireChannelRead(msg);
+        // We want the callback in the scope of the parent, not the client span
+        try (final ContextScope scope = activateSpan(parent)) {
+            ctx.fireChannelRead(msg);
+        }
     }
-  }
 
-  @Override
-  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-    final Attribute<AgentSpan> parentAttr = ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY);
-    parentAttr.setIfAbsent(noopSpan());
-    final AgentSpan parent = parentAttr.get();
-    final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get();
-    final AgentSpan span = AgentSpan.fromContext(storedContext);
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        final Attribute<AgentSpan> parentAttr = ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY);
+        parentAttr.setIfAbsent(noopSpan());
+        final AgentSpan parent = parentAttr.get();
+        final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get();
+        final AgentSpan span = AgentSpan.fromContext(storedContext);
 
-    // Set parent context back to maintain the same functionality as getAndSet(parent)
-    if (storedContext != null) {
-      ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(storedContext.with(parent));
-    }
+        // Set parent context back to maintain the same functionality as getAndSet(parent)
+        if (storedContext != null) {
+            ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(storedContext.with(parent));
+        }
 
-    if (span != null) {
-      // If an exception is passed to this point, it likely means it was unhandled and the
-      // client span won't be finished with a proper response, so we should finish the span here.
-      try (final ContextScope scope = activateSpan(span)) {
-        DECORATE.onError(span, cause);
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
+        if (span != null) {
+            // If an exception is passed to this point, it likely means it was unhandled and the
+            // client span won't be finished with a proper response, so we should finish the span here.
+            try (final ContextScope scope = activateSpan(span)) {
+                DECORATE.onError(span, cause);
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
+        }
+        // We want the callback in the scope of the parent, not the client span
+        try (final ContextScope scope = activateSpan(parent)) {
+            super.exceptionCaught(ctx, cause);
+        }
     }
-    // We want the callback in the scope of the parent, not the client span
-    try (final ContextScope scope = activateSpan(parent)) {
-      super.exceptionCaught(ctx, cause);
-    }
-  }
 
-  @Override
-  public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-    final Attribute<AgentSpan> parentAttr = ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY);
-    parentAttr.setIfAbsent(noopSpan());
-    final AgentSpan parent = parentAttr.get();
-    final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get();
-    final AgentSpan span = AgentSpan.fromContext(storedContext);
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        final Attribute<AgentSpan> parentAttr = ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY);
+        parentAttr.setIfAbsent(noopSpan());
+        final AgentSpan parent = parentAttr.get();
+        final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get();
+        final AgentSpan span = AgentSpan.fromContext(storedContext);
 
-    // Set parent context back to maintain the same functionality as getAndSet(parent)
-    if (storedContext != null) {
-      ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(storedContext.with(parent));
-    }
+        // Set parent context back to maintain the same functionality as getAndSet(parent)
+        if (storedContext != null) {
+            ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(storedContext.with(parent));
+        }
 
-    if (span != null && span != parent) {
-      try (final ContextScope scope = activateSpan(span)) {
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
-    }
-    // We want the callback in the scope of the parent, not the client span
-    try (final ContextScope scope = activateSpan(parent)) {
-      super.channelInactive(ctx);
+        if (span != null && span != parent) {
+            try (final ContextScope scope = activateSpan(span)) {
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
+        }
+        // We want the callback in the scope of the parent, not the client span
+        try (final ContextScope scope = activateSpan(parent)) {
+            super.channelInactive(ctx);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientTracingHandler.java
index ae4d6f32c63..d0cfb414fdf 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientTracingHandler.java
@@ -3,10 +3,9 @@
 import io.netty.channel.CombinedChannelDuplexHandler;
 
 public class HttpClientTracingHandler
-    extends CombinedChannelDuplexHandler<
-        HttpClientResponseTracingHandler, HttpClientRequestTracingHandler> {
+        extends CombinedChannelDuplexHandler<HttpClientResponseTracingHandler, HttpClientRequestTracingHandler> {
 
-  public HttpClientTracingHandler() {
-    super(HttpClientResponseTracingHandler.INSTANCE, HttpClientRequestTracingHandler.INSTANCE);
-  }
+    public HttpClientTracingHandler() {
+        super(HttpClientResponseTracingHandler.INSTANCE, HttpClientRequestTracingHandler.INSTANCE);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyHttpClientDecorator.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyHttpClientDecorator.java
index 90b32cb27e0..672eed50caa 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyHttpClientDecorator.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyHttpClientDecorator.java
@@ -13,60 +13,59 @@
 
 public class NettyHttpClientDecorator extends HttpClientDecorator<HttpRequest, HttpResponse> {
 
-  public static final CharSequence NETTY_CLIENT = UTF8BytesString.create("netty-client");
+    public static final CharSequence NETTY_CLIENT = UTF8BytesString.create("netty-client");
 
-  public static final NettyHttpClientDecorator DECORATE = new NettyHttpClientDecorator("http://");
-  public static final NettyHttpClientDecorator DECORATE_SECURE =
-      new NettyHttpClientDecorator("https://");
-  public static final CharSequence NETTY_CLIENT_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
+    public static final NettyHttpClientDecorator DECORATE = new NettyHttpClientDecorator("http://");
+    public static final NettyHttpClientDecorator DECORATE_SECURE = new NettyHttpClientDecorator("https://");
+    public static final CharSequence NETTY_CLIENT_REQUEST = UTF8BytesString.create(DECORATE.operationName());
 
-  private final String uriPrefix;
+    private final String uriPrefix;
 
-  public NettyHttpClientDecorator(String uriPrefix) {
-    this.uriPrefix = uriPrefix;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"netty", "netty-4.0"};
-  }
+    public NettyHttpClientDecorator(String uriPrefix) {
+        this.uriPrefix = uriPrefix;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return NETTY_CLIENT;
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"netty", "netty-4.0"};
+    }
 
-  @Override
-  protected String method(final HttpRequest httpRequest) {
-    return httpRequest.getMethod().name();
-  }
+    @Override
+    protected CharSequence component() {
+        return NETTY_CLIENT;
+    }
 
-  @Override
-  protected URI url(final HttpRequest request) throws URISyntaxException {
-    if (request.getMethod().equals(HttpMethod.CONNECT)) {
-      return URIUtils.safeParse(uriPrefix + request.getUri());
+    @Override
+    protected String method(final HttpRequest httpRequest) {
+        return httpRequest.getMethod().name();
     }
-    final URI uri = URIUtils.safeParse(request.getUri());
-    if ((uri.getHost() == null || uri.getHost().equals("")) && request.headers().contains(HOST)) {
-      return URIUtils.safeParse(uriPrefix + request.headers().get(HOST) + request.getUri());
-    } else {
-      return uri;
+
+    @Override
+    protected URI url(final HttpRequest request) throws URISyntaxException {
+        if (request.getMethod().equals(HttpMethod.CONNECT)) {
+            return URIUtils.safeParse(uriPrefix + request.getUri());
+        }
+        final URI uri = URIUtils.safeParse(request.getUri());
+        if ((uri.getHost() == null || uri.getHost().equals(""))
+                && request.headers().contains(HOST)) {
+            return URIUtils.safeParse(uriPrefix + request.headers().get(HOST) + request.getUri());
+        } else {
+            return uri;
+        }
     }
-  }
 
-  @Override
-  protected int status(final HttpResponse httpResponse) {
-    return httpResponse.getStatus().code();
-  }
+    @Override
+    protected int status(final HttpResponse httpResponse) {
+        return httpResponse.getStatus().code();
+    }
 
-  @Override
-  protected String getRequestHeader(HttpRequest request, String headerName) {
-    return request.headers().get(headerName);
-  }
+    @Override
+    protected String getRequestHeader(HttpRequest request, String headerName) {
+        return request.headers().get(headerName);
+    }
 
-  @Override
-  protected String getResponseHeader(HttpResponse response, String headerName) {
-    return response.headers().get(headerName);
-  }
+    @Override
+    protected String getResponseHeader(HttpResponse response, String headerName) {
+        return response.headers().get(headerName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyResponseInjectAdapter.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyResponseInjectAdapter.java
index 5f23ca3d4b5..467dcb07385 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyResponseInjectAdapter.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyResponseInjectAdapter.java
@@ -7,10 +7,10 @@
 @ParametersAreNonnullByDefault
 public class NettyResponseInjectAdapter implements CarrierSetter<HttpHeaders> {
 
-  public static final NettyResponseInjectAdapter SETTER = new NettyResponseInjectAdapter();
+    public static final NettyResponseInjectAdapter SETTER = new NettyResponseInjectAdapter();
 
-  @Override
-  public void set(final HttpHeaders headers, final String key, final String value) {
-    headers.set(key, value);
-  }
+    @Override
+    public void set(final HttpHeaders headers, final String key, final String value) {
+        headers.set(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/BlockingResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/BlockingResponseHandler.java
index b31435dd801..972bf866698 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/BlockingResponseHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/BlockingResponseHandler.java
@@ -22,135 +22,122 @@
 import org.slf4j.LoggerFactory;
 
 public class BlockingResponseHandler extends ChannelInboundHandlerAdapter {
-  public static final Logger log = LoggerFactory.getLogger(BlockingResponseHandler.class);
-  private static volatile boolean HAS_WARNED;
-
-  private final int statusCode;
-  private final BlockingContentType bct;
-  private final Map<String, String> extraHeaders;
-  private final TraceSegment segment;
-  private final String securityResponseId;
-
-  private boolean hasBlockedAlready;
-
-  public BlockingResponseHandler(
-      TraceSegment segment,
-      int statusCode,
-      BlockingContentType bct,
-      Map<String, String> extraHeaders,
-      String securityResponseId) {
-    this.segment = segment;
-    this.statusCode = statusCode;
-    this.bct = bct;
-    this.extraHeaders = extraHeaders;
-    this.securityResponseId = securityResponseId;
-  }
-
-  public BlockingResponseHandler(TraceSegment segment, Flow.Action.RequestBlockingAction rba) {
-    this(
-        segment,
-        rba.getStatusCode(),
-        rba.getBlockingContentType(),
-        rba.getExtraHeaders(),
-        rba.getSecurityResponseId());
-  }
-
-  @Override
-  public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
-    if (hasBlockedAlready) {
-      // we want to ignore any further data that the client might send
-      ReferenceCountUtil.release(msg);
-      return;
+    public static final Logger log = LoggerFactory.getLogger(BlockingResponseHandler.class);
+    private static volatile boolean HAS_WARNED;
+
+    private final int statusCode;
+    private final BlockingContentType bct;
+    private final Map<String, String> extraHeaders;
+    private final TraceSegment segment;
+    private final String securityResponseId;
+
+    private boolean hasBlockedAlready;
+
+    public BlockingResponseHandler(
+            TraceSegment segment,
+            int statusCode,
+            BlockingContentType bct,
+            Map<String, String> extraHeaders,
+            String securityResponseId) {
+        this.segment = segment;
+        this.statusCode = statusCode;
+        this.bct = bct;
+        this.extraHeaders = extraHeaders;
+        this.securityResponseId = securityResponseId;
     }
-    if (!(msg instanceof HttpRequest)) {
-      ctx.fireChannelRead(msg);
-      return;
-    }
-
-    ChannelHandlerContext ctxForDownstream =
-        ctx.pipeline().context(HttpServerResponseTracingHandler.class);
-    if (ctxForDownstream == null) {
-      ctxForDownstream = ctx.pipeline().context(HttpServerTracingHandler.class);
-    }
-
-    if (ctxForDownstream == null) {
-      if (HAS_WARNED) {
-        log.debug(
-            "Unable to block because HttpServerResponseTracingHandler was not found on the pipeline");
-      } else {
-        log.warn(
-            "Unable to block because HttpServerResponseTracingHandler was not found on the pipeline");
-        HAS_WARNED = true;
-      }
-      ctx.fireChannelRead(msg);
-      return;
-    }
-
-    HttpRequest request = (HttpRequest) msg;
-
-    int httpCode = BlockingActionHelper.getHttpCode(statusCode);
-    HttpResponseStatus httpResponseStatus = HttpResponseStatus.valueOf(httpCode);
-    FullHttpResponse response =
-        new DefaultFullHttpResponse(request.getProtocolVersion(), httpResponseStatus);
 
-    HttpHeaders headers = response.headers();
-    headers.set("Connection", "close");
-
-    for (Map.Entry<String, String> h : this.extraHeaders.entrySet()) {
-      headers.set(h.getKey(), h.getValue());
-    }
-
-    if (bct != BlockingContentType.NONE) {
-      String acceptHeader = request.headers().get("accept");
-      BlockingActionHelper.TemplateType type =
-          BlockingActionHelper.determineTemplateType(bct, acceptHeader);
-      headers.set("Content-type", BlockingActionHelper.getContentType(type));
-
-      byte[] template = BlockingActionHelper.getTemplate(type, this.securityResponseId);
-      setContentLength(response, template.length);
-      response.content().writeBytes(template);
+    public BlockingResponseHandler(TraceSegment segment, Flow.Action.RequestBlockingAction rba) {
+        this(
+                segment,
+                rba.getStatusCode(),
+                rba.getBlockingContentType(),
+                rba.getExtraHeaders(),
+                rba.getSecurityResponseId());
     }
 
-    this.hasBlockedAlready = true;
-    ReferenceCountUtil.release(msg);
-
-    // write starts in the handler before the one associated with ctx
-    // so add one that will be skipped (but that will prevent any writes later coming from later
-    // handlers).
-    // We do not want to start from the end of the
-    // pipeline because there is an increased risk of hitting duplex handlers that
-    // expect to have seen a request before processing the response
-    ctxForDownstream =
-        ctxForDownstream
-            .pipeline()
-            .addAfter(
-                ctxForDownstream.name(),
-                "ignore_all_writes_handler",
-                IgnoreAllWritesHandler.INSTANCE)
-            .context("ignore_all_writes_handler");
-
-    segment.effectivelyBlocked();
-
-    ctxForDownstream
-        .writeAndFlush(response)
-        .addListener(
-            fut -> {
-              if (!fut.isSuccess()) {
+    @Override
+    public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
+        if (hasBlockedAlready) {
+            // we want to ignore any further data that the client might send
+            ReferenceCountUtil.release(msg);
+            return;
+        }
+        if (!(msg instanceof HttpRequest)) {
+            ctx.fireChannelRead(msg);
+            return;
+        }
+
+        ChannelHandlerContext ctxForDownstream = ctx.pipeline().context(HttpServerResponseTracingHandler.class);
+        if (ctxForDownstream == null) {
+            ctxForDownstream = ctx.pipeline().context(HttpServerTracingHandler.class);
+        }
+
+        if (ctxForDownstream == null) {
+            if (HAS_WARNED) {
+                log.debug("Unable to block because HttpServerResponseTracingHandler was not found on the pipeline");
+            } else {
+                log.warn("Unable to block because HttpServerResponseTracingHandler was not found on the pipeline");
+                HAS_WARNED = true;
+            }
+            ctx.fireChannelRead(msg);
+            return;
+        }
+
+        HttpRequest request = (HttpRequest) msg;
+
+        int httpCode = BlockingActionHelper.getHttpCode(statusCode);
+        HttpResponseStatus httpResponseStatus = HttpResponseStatus.valueOf(httpCode);
+        FullHttpResponse response = new DefaultFullHttpResponse(request.getProtocolVersion(), httpResponseStatus);
+
+        HttpHeaders headers = response.headers();
+        headers.set("Connection", "close");
+
+        for (Map.Entry<String, String> h : this.extraHeaders.entrySet()) {
+            headers.set(h.getKey(), h.getValue());
+        }
+
+        if (bct != BlockingContentType.NONE) {
+            String acceptHeader = request.headers().get("accept");
+            BlockingActionHelper.TemplateType type = BlockingActionHelper.determineTemplateType(bct, acceptHeader);
+            headers.set("Content-type", BlockingActionHelper.getContentType(type));
+
+            byte[] template = BlockingActionHelper.getTemplate(type, this.securityResponseId);
+            setContentLength(response, template.length);
+            response.content().writeBytes(template);
+        }
+
+        this.hasBlockedAlready = true;
+        ReferenceCountUtil.release(msg);
+
+        // write starts in the handler before the one associated with ctx
+        // so add one that will be skipped (but that will prevent any writes later coming from later
+        // handlers).
+        // We do not want to start from the end of the
+        // pipeline because there is an increased risk of hitting duplex handlers that
+        // expect to have seen a request before processing the response
+        ctxForDownstream = ctxForDownstream
+                .pipeline()
+                .addAfter(ctxForDownstream.name(), "ignore_all_writes_handler", IgnoreAllWritesHandler.INSTANCE)
+                .context("ignore_all_writes_handler");
+
+        segment.effectivelyBlocked();
+
+        ctxForDownstream.writeAndFlush(response).addListener(fut -> {
+            if (!fut.isSuccess()) {
                 log.warn("Write of blocking response failed", fut.cause());
-              }
-              ctx.channel().close();
-            });
-  }
+            }
+            ctx.channel().close();
+        });
+    }
 
-  @ChannelHandler.Sharable
-  public static class IgnoreAllWritesHandler extends ChannelOutboundHandlerAdapter {
-    public static final IgnoreAllWritesHandler INSTANCE = new IgnoreAllWritesHandler();
+    @ChannelHandler.Sharable
+    public static class IgnoreAllWritesHandler extends ChannelOutboundHandlerAdapter {
+        public static final IgnoreAllWritesHandler INSTANCE = new IgnoreAllWritesHandler();
 
-    @Override
-    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
-        throws Exception {
-      log.info("Ignored write of object {}", msg);
-      ReferenceCountUtil.release(msg);
+        @Override
+        public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+            log.info("Ignored write of object {}", msg);
+            ReferenceCountUtil.release(msg);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerContextTrackingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerContextTrackingHandler.java
index e242392b3f7..d13ed951ea2 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerContextTrackingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerContextTrackingHandler.java
@@ -11,15 +11,14 @@
 
 @ChannelHandler.Sharable
 public class HttpServerContextTrackingHandler extends ChannelInboundHandlerAdapter {
-  public static final HttpServerContextTrackingHandler INSTANCE =
-      new HttpServerContextTrackingHandler();
+    public static final HttpServerContextTrackingHandler INSTANCE = new HttpServerContextTrackingHandler();
 
-  @Override
-  public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
-    if (msg instanceof HttpRequest) {
-      final Context parentContext = DECORATE.extract(((HttpRequest) msg).headers());
-      ctx.channel().attr(PARENT_CONTEXT_ATTRIBUTE_KEY).set(parentContext);
+    @Override
+    public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
+        if (msg instanceof HttpRequest) {
+            final Context parentContext = DECORATE.extract(((HttpRequest) msg).headers());
+            ctx.channel().attr(PARENT_CONTEXT_ATTRIBUTE_KEY).set(parentContext);
+        }
+        ctx.fireChannelRead(msg);
     }
-    ctx.fireChannelRead(msg);
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java
index 1b524e7051c..aff7915d1d3 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java
@@ -20,77 +20,79 @@
 
 @ChannelHandler.Sharable
 public class HttpServerRequestTracingHandler extends ChannelInboundHandlerAdapter {
-  public static HttpServerRequestTracingHandler INSTANCE = new HttpServerRequestTracingHandler();
+    public static HttpServerRequestTracingHandler INSTANCE = new HttpServerRequestTracingHandler();
 
-  @Override
-  public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
+    @Override
+    public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
 
-    Channel channel = ctx.channel();
-    if (!(msg instanceof HttpRequest)) {
-      final Context storedContext = channel.attr(CONTEXT_ATTRIBUTE_KEY).get();
-      if (storedContext == null) {
-        ctx.fireChannelRead(msg); // superclass does not throw
-      } else {
-        try (final ContextScope scope = storedContext.attach()) {
-          ctx.fireChannelRead(msg); // superclass does not throw
+        Channel channel = ctx.channel();
+        if (!(msg instanceof HttpRequest)) {
+            final Context storedContext = channel.attr(CONTEXT_ATTRIBUTE_KEY).get();
+            if (storedContext == null) {
+                ctx.fireChannelRead(msg); // superclass does not throw
+            } else {
+                try (final ContextScope scope = storedContext.attach()) {
+                    ctx.fireChannelRead(msg); // superclass does not throw
+                }
+            }
+            return;
         }
-      }
-      return;
-    }
 
-    final HttpRequest request = (HttpRequest) msg;
-    final HttpHeaders headers = request.headers();
-    final Context storedParentContext = channel.attr(PARENT_CONTEXT_ATTRIBUTE_KEY).getAndRemove();
-    final Context parentContext =
-        storedParentContext != null ? storedParentContext : DECORATE.extract(headers);
-    final Context context = DECORATE.startSpan(headers, parentContext);
+        final HttpRequest request = (HttpRequest) msg;
+        final HttpHeaders headers = request.headers();
+        final Context storedParentContext =
+                channel.attr(PARENT_CONTEXT_ATTRIBUTE_KEY).getAndRemove();
+        final Context parentContext = storedParentContext != null ? storedParentContext : DECORATE.extract(headers);
+        final Context context = DECORATE.startSpan(headers, parentContext);
 
-    try (final ContextScope ignored = context.attach()) {
-      final AgentSpan span = AgentSpan.fromContext(context);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, channel, request, parentContext);
+        try (final ContextScope ignored = context.attach()) {
+            final AgentSpan span = AgentSpan.fromContext(context);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, channel, request, parentContext);
 
-      channel.attr(ANALYZED_RESPONSE_KEY).set(null);
-      channel.attr(BLOCKED_RESPONSE_KEY).set(null);
+            channel.attr(ANALYZED_RESPONSE_KEY).set(null);
+            channel.attr(BLOCKED_RESPONSE_KEY).set(null);
 
-      channel.attr(CONTEXT_ATTRIBUTE_KEY).set(context);
-      channel.attr(REQUEST_HEADERS_ATTRIBUTE_KEY).set(request.headers());
+            channel.attr(CONTEXT_ATTRIBUTE_KEY).set(context);
+            channel.attr(REQUEST_HEADERS_ATTRIBUTE_KEY).set(request.headers());
 
-      Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
-      if (rba != null) {
-        ctx.pipeline()
-            .addAfter(
-                ctx.name(),
-                "blocking_handler",
-                new BlockingResponseHandler(span.getRequestContext().getTraceSegment(), rba));
-      }
+            Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
+            if (rba != null) {
+                ctx.pipeline()
+                        .addAfter(
+                                ctx.name(),
+                                "blocking_handler",
+                                new BlockingResponseHandler(
+                                        span.getRequestContext().getTraceSegment(), rba));
+            }
 
-      try {
-        ctx.fireChannelRead(msg);
-      } catch (final Throwable throwable) {
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(ignored.context());
-        span.finish(); // Finish the span manually since finishSpanOnClose was false
-        ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).remove();
-        throw throwable;
-      }
+            try {
+                ctx.fireChannelRead(msg);
+            } catch (final Throwable throwable) {
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(ignored.context());
+                span.finish(); // Finish the span manually since finishSpanOnClose was false
+                ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).remove();
+                throw throwable;
+            }
+        }
     }
-  }
 
-  @Override
-  public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-    try {
-      super.channelInactive(ctx);
-    } finally {
-      try {
-        final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).getAndRemove();
-        final AgentSpan span = AgentSpan.fromContext(storedContext);
-        if (span != null && span.phasedFinish()) {
-          // at this point we can just publish this span to avoid loosing the rest of the trace
-          span.publish();
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        try {
+            super.channelInactive(ctx);
+        } finally {
+            try {
+                final Context storedContext =
+                        ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).getAndRemove();
+                final AgentSpan span = AgentSpan.fromContext(storedContext);
+                if (span != null && span.phasedFinish()) {
+                    // at this point we can just publish this span to avoid loosing the rest of the trace
+                    span.publish();
+                }
+            } catch (final Throwable ignored) {
+            }
         }
-      } catch (final Throwable ignored) {
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerResponseTracingHandler.java
index 22d970a8da7..8277e76fbeb 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerResponseTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerResponseTracingHandler.java
@@ -19,50 +19,45 @@
 
 @ChannelHandler.Sharable
 public class HttpServerResponseTracingHandler extends ChannelOutboundHandlerAdapter {
-  public static HttpServerResponseTracingHandler INSTANCE = new HttpServerResponseTracingHandler();
-  private static final String UPGRADE_HEADER = "upgrade";
+    public static HttpServerResponseTracingHandler INSTANCE = new HttpServerResponseTracingHandler();
+    private static final String UPGRADE_HEADER = "upgrade";
 
-  @Override
-  public void write(final ChannelHandlerContext ctx, final Object msg, final ChannelPromise prm) {
-    final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get();
-    final AgentSpan span = AgentSpan.fromContext(storedContext);
-    if (span == null || !(msg instanceof HttpResponse)) {
-      ctx.write(msg, prm);
-      return;
-    }
+    @Override
+    public void write(final ChannelHandlerContext ctx, final Object msg, final ChannelPromise prm) {
+        final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get();
+        final AgentSpan span = AgentSpan.fromContext(storedContext);
+        if (span == null || !(msg instanceof HttpResponse)) {
+            ctx.write(msg, prm);
+            return;
+        }
 
-    try (final ContextScope scope = storedContext.attach()) {
-      final HttpResponse response = (HttpResponse) msg;
+        try (final ContextScope scope = storedContext.attach()) {
+            final HttpResponse response = (HttpResponse) msg;
 
-      try {
-        ctx.write(msg, prm);
-      } catch (final Throwable throwable) {
-        DECORATE.onError(span, throwable);
-        span.setHttpStatusCode(500);
-        span.finish(); // Finish the span manually since finishSpanOnClose was false
-        ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).remove();
-        throw throwable;
-      }
-      final boolean isWebsocketUpgrade =
-          response.getStatus() == HttpResponseStatus.SWITCHING_PROTOCOLS
-              && "websocket".equals(response.headers().get(UPGRADE_HEADER));
-      if (isWebsocketUpgrade) {
-        String channelId =
-            ctx.channel()
-                .attr(CHANNEL_ID)
-                .setIfAbsent(RandomUtils.randomUUID().toString().substring(0, 8));
-        ctx.channel()
-            .attr(WEBSOCKET_SENDER_HANDLER_CONTEXT)
-            .set(new HandlerContext.Sender(span, channelId));
-      }
-      if (response.getStatus() != HttpResponseStatus.CONTINUE
-          && (response.getStatus() != HttpResponseStatus.SWITCHING_PROTOCOLS
-              || isWebsocketUpgrade)) {
-        DECORATE.onResponse(span, response);
-        DECORATE.beforeFinish(scope.context());
-        ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).remove();
-        span.finish(); // Finish the span manually since finishSpanOnClose was false
-      }
+            try {
+                ctx.write(msg, prm);
+            } catch (final Throwable throwable) {
+                DECORATE.onError(span, throwable);
+                span.setHttpStatusCode(500);
+                span.finish(); // Finish the span manually since finishSpanOnClose was false
+                ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).remove();
+                throw throwable;
+            }
+            final boolean isWebsocketUpgrade = response.getStatus() == HttpResponseStatus.SWITCHING_PROTOCOLS
+                    && "websocket".equals(response.headers().get(UPGRADE_HEADER));
+            if (isWebsocketUpgrade) {
+                String channelId = ctx.channel()
+                        .attr(CHANNEL_ID)
+                        .setIfAbsent(RandomUtils.randomUUID().toString().substring(0, 8));
+                ctx.channel().attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).set(new HandlerContext.Sender(span, channelId));
+            }
+            if (response.getStatus() != HttpResponseStatus.CONTINUE
+                    && (response.getStatus() != HttpResponseStatus.SWITCHING_PROTOCOLS || isWebsocketUpgrade)) {
+                DECORATE.onResponse(span, response);
+                DECORATE.beforeFinish(scope.context());
+                ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).remove();
+                span.finish(); // Finish the span manually since finishSpanOnClose was false
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerTracingHandler.java
index dbf5a2ac0e0..fd869bf8d00 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerTracingHandler.java
@@ -3,10 +3,9 @@
 import io.netty.channel.CombinedChannelDuplexHandler;
 
 public class HttpServerTracingHandler
-    extends CombinedChannelDuplexHandler<
-        HttpServerRequestTracingHandler, HttpServerResponseTracingHandler> {
+        extends CombinedChannelDuplexHandler<HttpServerRequestTracingHandler, HttpServerResponseTracingHandler> {
 
-  public HttpServerTracingHandler() {
-    super(HttpServerRequestTracingHandler.INSTANCE, HttpServerResponseTracingHandler.INSTANCE);
-  }
+    public HttpServerTracingHandler() {
+        super(HttpServerRequestTracingHandler.INSTANCE, HttpServerResponseTracingHandler.INSTANCE);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/MaybeBlockResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/MaybeBlockResponseHandler.java
index 6f6c1891e88..f0e17324cee 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/MaybeBlockResponseHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/MaybeBlockResponseHandler.java
@@ -32,110 +32,105 @@
 
 @ChannelHandler.Sharable
 public class MaybeBlockResponseHandler extends ChannelOutboundHandlerAdapter {
-  public static final ChannelOutboundHandler INSTANCE = new MaybeBlockResponseHandler();
-  public static final Logger log = LoggerFactory.getLogger(MaybeBlockResponseHandler.class);
-
-  private MaybeBlockResponseHandler() {}
-
-  private static boolean isAnalyzedResponse(Channel ch) {
-    return ch.attr(ANALYZED_RESPONSE_KEY).get() != null;
-  }
-
-  private static void markAnalyzedResponse(Channel ch) {
-    ch.attr(ANALYZED_RESPONSE_KEY).set(Boolean.TRUE);
-  }
-
-  private static boolean isBlockedResponse(Channel ch) {
-    return ch.attr(BLOCKED_RESPONSE_KEY).get() != null;
-  }
-
-  private static void markBlockedResponse(Channel ch) {
-    ch.attr(BLOCKED_RESPONSE_KEY).set(Boolean.TRUE);
-  }
-
-  @Override
-  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) throws Exception {
-    Channel channel = ctx.channel();
-
-    Context storedContext = channel.attr(CONTEXT_ATTRIBUTE_KEY).get();
-    AgentSpan span = AgentSpan.fromContext(storedContext);
-    RequestContext requestContext;
-    if (span == null
-        || (requestContext = span.getRequestContext()) == null
-        || requestContext.getData(RequestContextSlot.APPSEC) == null) {
-      super.write(ctx, msg, prm);
-      return;
-    }
+    public static final ChannelOutboundHandler INSTANCE = new MaybeBlockResponseHandler();
+    public static final Logger log = LoggerFactory.getLogger(MaybeBlockResponseHandler.class);
 
-    if (isAnalyzedResponse(channel)) {
-      if (isBlockedResponse(channel)) {
-        // block further writes
-        log.debug("Write suppressed; dropped outbound message");
-        ReferenceCountUtil.release(msg);
-      } else {
-        super.write(ctx, msg, prm);
-      }
-      return;
-    }
+    private MaybeBlockResponseHandler() {}
 
-    if (!(msg instanceof HttpResponse)) {
-      super.write(ctx, msg, prm);
-      return;
-    }
-    HttpResponse origResponse = (HttpResponse) msg;
-    if (origResponse.getStatus().code() == HttpResponseStatus.CONTINUE.code()) {
-      super.write(ctx, msg, prm);
-      return;
+    private static boolean isAnalyzedResponse(Channel ch) {
+        return ch.attr(ANALYZED_RESPONSE_KEY).get() != null;
     }
 
-    Flow<Void> flow =
-        DECORATE.callIGCallbackResponseAndHeaders(
-            span, origResponse, origResponse.getStatus().code(), ResponseExtractAdapter.GETTER);
-    markAnalyzedResponse(channel);
-    Flow.Action action = flow.getAction();
-    if (!(action instanceof Flow.Action.RequestBlockingAction)) {
-      super.write(ctx, msg, prm);
-      return;
+    private static void markAnalyzedResponse(Channel ch) {
+        ch.attr(ANALYZED_RESPONSE_KEY).set(Boolean.TRUE);
     }
 
-    markBlockedResponse(channel);
-    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-    int httpCode = BlockingActionHelper.getHttpCode(rba.getStatusCode());
-    HttpResponseStatus httpResponseStatus = HttpResponseStatus.valueOf(httpCode);
-    FullHttpResponse response =
-        new DefaultFullHttpResponse(origResponse.getProtocolVersion(), httpResponseStatus);
-    ReferenceCountUtil.release(msg);
-
-    HttpHeaders headers = response.headers();
-    headers.set("Connection", "close");
-
-    for (Map.Entry<String, String> h : rba.getExtraHeaders().entrySet()) {
-      headers.set(h.getKey(), h.getValue());
+    private static boolean isBlockedResponse(Channel ch) {
+        return ch.attr(BLOCKED_RESPONSE_KEY).get() != null;
     }
 
-    BlockingContentType bct = rba.getBlockingContentType();
-    if (bct != BlockingContentType.NONE) {
-      HttpHeaders reqHeaders = ctx.attr(REQUEST_HEADERS_ATTRIBUTE_KEY).get();
-      String acceptHeader = reqHeaders != null ? reqHeaders.get("accept") : null;
-      BlockingActionHelper.TemplateType type =
-          BlockingActionHelper.determineTemplateType(bct, acceptHeader);
-      headers.set("Content-type", BlockingActionHelper.getContentType(type));
-      byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
-      setContentLength(response, template.length);
-      response.content().writeBytes(template);
+    private static void markBlockedResponse(Channel ch) {
+        ch.attr(BLOCKED_RESPONSE_KEY).set(Boolean.TRUE);
     }
 
-    requestContext.getTraceSegment().effectivelyBlocked();
-    log.debug("About to write and flush blocking response {}", response);
-    ctx.writeAndFlush(response, prm)
-        .addListener(
-            fut -> {
-              if (!fut.isSuccess()) {
+    @Override
+    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) throws Exception {
+        Channel channel = ctx.channel();
+
+        Context storedContext = channel.attr(CONTEXT_ATTRIBUTE_KEY).get();
+        AgentSpan span = AgentSpan.fromContext(storedContext);
+        RequestContext requestContext;
+        if (span == null
+                || (requestContext = span.getRequestContext()) == null
+                || requestContext.getData(RequestContextSlot.APPSEC) == null) {
+            super.write(ctx, msg, prm);
+            return;
+        }
+
+        if (isAnalyzedResponse(channel)) {
+            if (isBlockedResponse(channel)) {
+                // block further writes
+                log.debug("Write suppressed; dropped outbound message");
+                ReferenceCountUtil.release(msg);
+            } else {
+                super.write(ctx, msg, prm);
+            }
+            return;
+        }
+
+        if (!(msg instanceof HttpResponse)) {
+            super.write(ctx, msg, prm);
+            return;
+        }
+        HttpResponse origResponse = (HttpResponse) msg;
+        if (origResponse.getStatus().code() == HttpResponseStatus.CONTINUE.code()) {
+            super.write(ctx, msg, prm);
+            return;
+        }
+
+        Flow<Void> flow = DECORATE.callIGCallbackResponseAndHeaders(
+                span, origResponse, origResponse.getStatus().code(), ResponseExtractAdapter.GETTER);
+        markAnalyzedResponse(channel);
+        Flow.Action action = flow.getAction();
+        if (!(action instanceof Flow.Action.RequestBlockingAction)) {
+            super.write(ctx, msg, prm);
+            return;
+        }
+
+        markBlockedResponse(channel);
+        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+        int httpCode = BlockingActionHelper.getHttpCode(rba.getStatusCode());
+        HttpResponseStatus httpResponseStatus = HttpResponseStatus.valueOf(httpCode);
+        FullHttpResponse response = new DefaultFullHttpResponse(origResponse.getProtocolVersion(), httpResponseStatus);
+        ReferenceCountUtil.release(msg);
+
+        HttpHeaders headers = response.headers();
+        headers.set("Connection", "close");
+
+        for (Map.Entry<String, String> h : rba.getExtraHeaders().entrySet()) {
+            headers.set(h.getKey(), h.getValue());
+        }
+
+        BlockingContentType bct = rba.getBlockingContentType();
+        if (bct != BlockingContentType.NONE) {
+            HttpHeaders reqHeaders = ctx.attr(REQUEST_HEADERS_ATTRIBUTE_KEY).get();
+            String acceptHeader = reqHeaders != null ? reqHeaders.get("accept") : null;
+            BlockingActionHelper.TemplateType type = BlockingActionHelper.determineTemplateType(bct, acceptHeader);
+            headers.set("Content-type", BlockingActionHelper.getContentType(type));
+            byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
+            setContentLength(response, template.length);
+            response.content().writeBytes(template);
+        }
+
+        requestContext.getTraceSegment().effectivelyBlocked();
+        log.debug("About to write and flush blocking response {}", response);
+        ctx.writeAndFlush(response, prm).addListener(fut -> {
+            if (!fut.isSuccess()) {
                 log.warn("Write of blocking response failed", fut.cause());
-              } else {
+            } else {
                 log.debug("Write of blocking response succeeded");
-              }
-              channel.close();
-            });
-  }
+            }
+            channel.close();
+        });
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/NettyHttpServerDecorator.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/NettyHttpServerDecorator.java
index f0844e00184..654277951ce 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/NettyHttpServerDecorator.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/NettyHttpServerDecorator.java
@@ -26,139 +26,131 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class NettyHttpServerDecorator
-    extends HttpServerDecorator<HttpRequest, Channel, HttpResponse, HttpHeaders> {
-  public static final CharSequence NETTY = UTF8BytesString.create("netty");
-  public static final CharSequence NETTY_CONNECT = UTF8BytesString.create("netty.connect");
-
-  public static final NettyHttpServerDecorator DECORATE = new NettyHttpServerDecorator();
-  private static final CharSequence NETTY_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"netty", "netty-4.0"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return NETTY;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpHeaders> getter() {
-    return ContextVisitors.stringValuesEntrySet();
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
-    return ResponseExtractAdapter.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return NETTY_REQUEST;
-  }
-
-  @Override
-  protected String method(final HttpRequest httpRequest) {
-    return httpRequest.getMethod().name();
-  }
-
-  @Override
-  protected URIDataAdapter url(final HttpRequest request) {
-    return URIDataAdapterBase.fromURI(
-        request.getUri(),
-        uri -> {
-          if ((uri.getHost() == null || uri.getHost().equals(""))
-              && request.headers().contains(HOST)) {
-            return URIDataAdapterBase.fromURI(
-                "http://" + request.headers().get(HOST) + request.getUri(),
-                URIDefaultDataAdapter::new);
-          }
-          return new URIDefaultDataAdapter(uri);
+public class NettyHttpServerDecorator extends HttpServerDecorator<HttpRequest, Channel, HttpResponse, HttpHeaders> {
+    public static final CharSequence NETTY = UTF8BytesString.create("netty");
+    public static final CharSequence NETTY_CONNECT = UTF8BytesString.create("netty.connect");
+
+    public static final NettyHttpServerDecorator DECORATE = new NettyHttpServerDecorator();
+    private static final CharSequence NETTY_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"netty", "netty-4.0"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return NETTY;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpHeaders> getter() {
+        return ContextVisitors.stringValuesEntrySet();
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
+        return ResponseExtractAdapter.GETTER;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return NETTY_REQUEST;
+    }
+
+    @Override
+    protected String method(final HttpRequest httpRequest) {
+        return httpRequest.getMethod().name();
+    }
+
+    @Override
+    protected URIDataAdapter url(final HttpRequest request) {
+        return URIDataAdapterBase.fromURI(request.getUri(), uri -> {
+            if ((uri.getHost() == null || uri.getHost().equals(""))
+                    && request.headers().contains(HOST)) {
+                return URIDataAdapterBase.fromURI(
+                        "http://" + request.headers().get(HOST) + request.getUri(), URIDefaultDataAdapter::new);
+            }
+            return new URIDefaultDataAdapter(uri);
         });
-  }
+    }
 
-  @Override
-  protected String peerHostIP(final Channel channel) {
-    final SocketAddress socketAddress = channel.remoteAddress();
-    if (socketAddress instanceof InetSocketAddress) {
-      return ((InetSocketAddress) socketAddress).getAddress().getHostAddress();
+    @Override
+    protected String peerHostIP(final Channel channel) {
+        final SocketAddress socketAddress = channel.remoteAddress();
+        if (socketAddress instanceof InetSocketAddress) {
+            return ((InetSocketAddress) socketAddress).getAddress().getHostAddress();
+        }
+        return null;
+    }
+
+    @Override
+    protected int peerPort(final Channel channel) {
+        final SocketAddress socketAddress = channel.remoteAddress();
+        if (socketAddress instanceof InetSocketAddress) {
+            return ((InetSocketAddress) socketAddress).getPort();
+        }
+        return 0;
     }
-    return null;
-  }
-
-  @Override
-  protected int peerPort(final Channel channel) {
-    final SocketAddress socketAddress = channel.remoteAddress();
-    if (socketAddress instanceof InetSocketAddress) {
-      return ((InetSocketAddress) socketAddress).getPort();
+
+    @Override
+    protected int status(final HttpResponse httpResponse) {
+        return httpResponse.getStatus().code();
     }
-    return 0;
-  }
-
-  @Override
-  protected int status(final HttpResponse httpResponse) {
-    return httpResponse.getStatus().code();
-  }
-
-  @Override
-  protected boolean isAppSecOnResponseSeparate() {
-    return true;
-  }
-
-  @Override
-  protected BlockResponseFunction createBlockResponseFunction(
-      HttpRequest httpRequest, Channel channel) {
-    return new NettyBlockResponseFunction(channel.pipeline(), httpRequest);
-  }
-
-  public static class NettyBlockResponseFunction implements BlockResponseFunction {
-    private final ChannelPipeline pipeline;
-    public static final Logger log = LoggerFactory.getLogger(NettyBlockResponseFunction.class);
-    private final HttpRequest httpRequestMessage;
-
-    public NettyBlockResponseFunction(ChannelPipeline pipeline, HttpRequest httpRequestMessage) {
-      this.pipeline = pipeline;
-      this.httpRequestMessage = httpRequestMessage;
+
+    @Override
+    protected boolean isAppSecOnResponseSeparate() {
+        return true;
     }
 
     @Override
-    public boolean tryCommitBlockingResponse(
-        TraceSegment segment,
-        int statusCode,
-        BlockingContentType templateType,
-        Map<String, String> extraHeaders,
-        String securityResponseId) {
-      ChannelHandler handlerBefore = pipeline.get(HttpServerTracingHandler.class);
-      if (handlerBefore == null) {
-        handlerBefore = pipeline.get(HttpServerRequestTracingHandler.class);
-        if (handlerBefore == null) {
-          log.warn(
-              "Can't block without an HttpServerTracingHandler or HttpServerRequestTracingHandler in the pipeline");
-          return false;
+    protected BlockResponseFunction createBlockResponseFunction(HttpRequest httpRequest, Channel channel) {
+        return new NettyBlockResponseFunction(channel.pipeline(), httpRequest);
+    }
+
+    public static class NettyBlockResponseFunction implements BlockResponseFunction {
+        private final ChannelPipeline pipeline;
+        public static final Logger log = LoggerFactory.getLogger(NettyBlockResponseFunction.class);
+        private final HttpRequest httpRequestMessage;
+
+        public NettyBlockResponseFunction(ChannelPipeline pipeline, HttpRequest httpRequestMessage) {
+            this.pipeline = pipeline;
+            this.httpRequestMessage = httpRequestMessage;
+        }
+
+        @Override
+        public boolean tryCommitBlockingResponse(
+                TraceSegment segment,
+                int statusCode,
+                BlockingContentType templateType,
+                Map<String, String> extraHeaders,
+                String securityResponseId) {
+            ChannelHandler handlerBefore = pipeline.get(HttpServerTracingHandler.class);
+            if (handlerBefore == null) {
+                handlerBefore = pipeline.get(HttpServerRequestTracingHandler.class);
+                if (handlerBefore == null) {
+                    log.warn(
+                            "Can't block without an HttpServerTracingHandler or HttpServerRequestTracingHandler in the pipeline");
+                    return false;
+                }
+            }
+
+            try {
+                pipeline.addAfter(
+                                handlerBefore.getClass().getName(),
+                                "blocking_handler",
+                                new BlockingResponseHandler(
+                                        segment, statusCode, templateType, extraHeaders, securityResponseId))
+                        .addBefore("blocking_handler", "before_blocking_handler", new ChannelInboundHandlerAdapter());
+            } catch (RuntimeException rte) {
+                log.warn("Failed adding blocking handler", rte);
+                return false;
+            }
+
+            ChannelHandlerContext context = pipeline.context("before_blocking_handler");
+            context.fireChannelRead(httpRequestMessage);
+
+            return true;
         }
-      }
-
-      try {
-        pipeline
-            .addAfter(
-                handlerBefore.getClass().getName(),
-                "blocking_handler",
-                new BlockingResponseHandler(
-                    segment, statusCode, templateType, extraHeaders, securityResponseId))
-            .addBefore(
-                "blocking_handler", "before_blocking_handler", new ChannelInboundHandlerAdapter());
-      } catch (RuntimeException rte) {
-        log.warn("Failed adding blocking handler", rte);
-        return false;
-      }
-
-      ChannelHandlerContext context = pipeline.context("before_blocking_handler");
-      context.fireChannelRead(httpRequestMessage);
-
-      return true;
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/ResponseExtractAdapter.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/ResponseExtractAdapter.java
index f3b7589f345..32a1a4de51c 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/ResponseExtractAdapter.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/ResponseExtractAdapter.java
@@ -5,10 +5,10 @@
 import io.netty.handler.codec.http.HttpResponse;
 
 public class ResponseExtractAdapter implements AgentPropagation.ContextVisitor<HttpResponse> {
-  public static final ResponseExtractAdapter GETTER = new ResponseExtractAdapter();
+    public static final ResponseExtractAdapter GETTER = new ResponseExtractAdapter();
 
-  @Override
-  public void forEachKey(HttpResponse carrier, AgentPropagation.KeyClassifier classifier) {
-    ContextVisitors.stringValuesEntrySet().forEachKey(carrier.headers(), classifier);
-  }
+    @Override
+    public void forEachKey(HttpResponse carrier, AgentPropagation.KeyClassifier classifier) {
+        ContextVisitors.stringValuesEntrySet().forEachKey(carrier.headers(), classifier);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java
index 998d32def5c..87618f8d909 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java
@@ -22,107 +22,100 @@
 
 @ChannelHandler.Sharable
 public class WebSocketServerRequestTracingHandler extends ChannelInboundHandlerAdapter {
-  public static WebSocketServerRequestTracingHandler INSTANCE =
-      new WebSocketServerRequestTracingHandler();
+    public static WebSocketServerRequestTracingHandler INSTANCE = new WebSocketServerRequestTracingHandler();
 
-  @Override
-  public void channelRead(ChannelHandlerContext ctx, Object frame) {
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object frame) {
 
-    if (frame instanceof WebSocketFrame) {
-      Channel channel = ctx.channel();
-      HandlerContext.Receiver receiverContext =
-          channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).get();
+        if (frame instanceof WebSocketFrame) {
+            Channel channel = ctx.channel();
+            HandlerContext.Receiver receiverContext =
+                    channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).get();
 
-      if (receiverContext == null) {
-        HandlerContext.Sender sessionState = channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).get();
-        if (sessionState != null) {
-          String channelId = ctx.channel().attr(CHANNEL_ID).get();
-          receiverContext = new HandlerContext.Receiver(sessionState.getHandshakeSpan(), channelId);
-          channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).set(receiverContext);
-        }
-      }
-      if (receiverContext != null) {
-        if (frame instanceof TextWebSocketFrame) {
-          // WebSocket Read Text Start
-          TextWebSocketFrame textFrame = (TextWebSocketFrame) frame;
-
-          final AgentSpan span =
-              DECORATE.startInboundFrameSpan(
-                  receiverContext, textFrame.text(), textFrame.isFinalFragment());
-          try (final ContextScope scope = activateSpan(span)) {
-            ctx.fireChannelRead(textFrame);
-            // WebSocket Read Text Start
-          } finally {
-            if (textFrame.isFinalFragment()) {
-              channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove();
-              DECORATE.onFrameEnd(receiverContext);
+            if (receiverContext == null) {
+                HandlerContext.Sender sessionState =
+                        channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).get();
+                if (sessionState != null) {
+                    String channelId = ctx.channel().attr(CHANNEL_ID).get();
+                    receiverContext = new HandlerContext.Receiver(sessionState.getHandshakeSpan(), channelId);
+                    channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).set(receiverContext);
+                }
             }
-          }
-          return;
-        }
+            if (receiverContext != null) {
+                if (frame instanceof TextWebSocketFrame) {
+                    // WebSocket Read Text Start
+                    TextWebSocketFrame textFrame = (TextWebSocketFrame) frame;
 
-        if (frame instanceof BinaryWebSocketFrame) {
-          // WebSocket Read Binary Start
-          BinaryWebSocketFrame binaryFrame = (BinaryWebSocketFrame) frame;
-          final AgentSpan span =
-              DECORATE.startInboundFrameSpan(
-                  receiverContext,
-                  binaryFrame.content().nioBuffer(),
-                  binaryFrame.isFinalFragment());
-          try (final ContextScope scope = activateSpan(span)) {
-            ctx.fireChannelRead(binaryFrame);
-          } finally {
-            // WebSocket Read Binary End
-            if (binaryFrame.isFinalFragment()) {
-              channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove();
-              DECORATE.onFrameEnd(receiverContext);
-            }
-          }
+                    final AgentSpan span = DECORATE.startInboundFrameSpan(
+                            receiverContext, textFrame.text(), textFrame.isFinalFragment());
+                    try (final ContextScope scope = activateSpan(span)) {
+                        ctx.fireChannelRead(textFrame);
+                        // WebSocket Read Text Start
+                    } finally {
+                        if (textFrame.isFinalFragment()) {
+                            channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove();
+                            DECORATE.onFrameEnd(receiverContext);
+                        }
+                    }
+                    return;
+                }
 
-          return;
-        }
+                if (frame instanceof BinaryWebSocketFrame) {
+                    // WebSocket Read Binary Start
+                    BinaryWebSocketFrame binaryFrame = (BinaryWebSocketFrame) frame;
+                    final AgentSpan span = DECORATE.startInboundFrameSpan(
+                            receiverContext, binaryFrame.content().nioBuffer(), binaryFrame.isFinalFragment());
+                    try (final ContextScope scope = activateSpan(span)) {
+                        ctx.fireChannelRead(binaryFrame);
+                    } finally {
+                        // WebSocket Read Binary End
+                        if (binaryFrame.isFinalFragment()) {
+                            channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove();
+                            DECORATE.onFrameEnd(receiverContext);
+                        }
+                    }
 
-        if (frame instanceof ContinuationWebSocketFrame) {
-          ContinuationWebSocketFrame continuationWebSocketFrame =
-              (ContinuationWebSocketFrame) frame;
-          final AgentSpan span =
-              DECORATE.startInboundFrameSpan(
-                  receiverContext,
-                  MESSAGE_TYPE_TEXT.equals(receiverContext.getMessageType())
-                      ? continuationWebSocketFrame.text()
-                      : continuationWebSocketFrame.content().nioBuffer(),
-                  continuationWebSocketFrame.isFinalFragment());
-          try (final ContextScope scope = activateSpan(span)) {
-            ctx.fireChannelRead(continuationWebSocketFrame);
-          } finally {
-            if (continuationWebSocketFrame.isFinalFragment()) {
-              channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove();
-              DECORATE.onFrameEnd(receiverContext);
-            }
-          }
-          return;
-        }
+                    return;
+                }
+
+                if (frame instanceof ContinuationWebSocketFrame) {
+                    ContinuationWebSocketFrame continuationWebSocketFrame = (ContinuationWebSocketFrame) frame;
+                    final AgentSpan span = DECORATE.startInboundFrameSpan(
+                            receiverContext,
+                            MESSAGE_TYPE_TEXT.equals(receiverContext.getMessageType())
+                                    ? continuationWebSocketFrame.text()
+                                    : continuationWebSocketFrame.content().nioBuffer(),
+                            continuationWebSocketFrame.isFinalFragment());
+                    try (final ContextScope scope = activateSpan(span)) {
+                        ctx.fireChannelRead(continuationWebSocketFrame);
+                    } finally {
+                        if (continuationWebSocketFrame.isFinalFragment()) {
+                            channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove();
+                            DECORATE.onFrameEnd(receiverContext);
+                        }
+                    }
+                    return;
+                }
 
-        if (frame instanceof CloseWebSocketFrame) {
-          // WebSocket Closed by client
-          CloseWebSocketFrame closeFrame = (CloseWebSocketFrame) frame;
-          int statusCode = closeFrame.statusCode();
-          String reasonText = closeFrame.reasonText();
-          channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).remove();
-          channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove();
-          final AgentSpan span =
-              DECORATE.startInboundCloseSpan(receiverContext, reasonText, statusCode);
-          try (final ContextScope scope = activateSpan(span)) {
-            ctx.fireChannelRead(closeFrame);
-            if (closeFrame.isFinalFragment()) {
-              DECORATE.onFrameEnd(receiverContext);
+                if (frame instanceof CloseWebSocketFrame) {
+                    // WebSocket Closed by client
+                    CloseWebSocketFrame closeFrame = (CloseWebSocketFrame) frame;
+                    int statusCode = closeFrame.statusCode();
+                    String reasonText = closeFrame.reasonText();
+                    channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).remove();
+                    channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove();
+                    final AgentSpan span = DECORATE.startInboundCloseSpan(receiverContext, reasonText, statusCode);
+                    try (final ContextScope scope = activateSpan(span)) {
+                        ctx.fireChannelRead(closeFrame);
+                        if (closeFrame.isFinalFragment()) {
+                            DECORATE.onFrameEnd(receiverContext);
+                        }
+                    }
+                    return;
+                }
             }
-          }
-          return;
         }
-      }
+        // can be other messages we do not handle like ping, pong
+        ctx.fireChannelRead(frame);
     }
-    // can be other messages we do not handle like ping, pong
-    ctx.fireChannelRead(frame);
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java
index 0e685ce18b9..181a4038751 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java
@@ -22,93 +22,89 @@
 
 @ChannelHandler.Sharable
 public class WebSocketServerResponseTracingHandler extends ChannelOutboundHandlerAdapter {
-  public static WebSocketServerResponseTracingHandler INSTANCE =
-      new WebSocketServerResponseTracingHandler();
+    public static WebSocketServerResponseTracingHandler INSTANCE = new WebSocketServerResponseTracingHandler();
 
-  @Override
-  public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promise)
-      throws Exception {
+    @Override
+    public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promise) throws Exception {
 
-    if (frame instanceof WebSocketFrame) {
-      Channel channel = ctx.channel();
-      HandlerContext.Sender handlerContext = channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).get();
-      if (handlerContext != null) {
+        if (frame instanceof WebSocketFrame) {
+            Channel channel = ctx.channel();
+            HandlerContext.Sender handlerContext =
+                    channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).get();
+            if (handlerContext != null) {
 
-        if (frame instanceof TextWebSocketFrame) {
-          // WebSocket Write Text Start
-          TextWebSocketFrame textFrame = (TextWebSocketFrame) frame;
-          final AgentSpan span =
-              DECORATE.startOutboundFrameSpan(
-                  handlerContext, MESSAGE_TYPE_TEXT, textFrame.text().length());
-          try (final ContextScope scope = activateSpan(span)) {
-            ctx.write(frame, promise);
-          } finally {
-            // WebSocket Write Text End
-            if (textFrame.isFinalFragment()) {
-              DECORATE.onFrameEnd(handlerContext);
-            }
-          }
-          return;
-        }
+                if (frame instanceof TextWebSocketFrame) {
+                    // WebSocket Write Text Start
+                    TextWebSocketFrame textFrame = (TextWebSocketFrame) frame;
+                    final AgentSpan span = DECORATE.startOutboundFrameSpan(
+                            handlerContext, MESSAGE_TYPE_TEXT, textFrame.text().length());
+                    try (final ContextScope scope = activateSpan(span)) {
+                        ctx.write(frame, promise);
+                    } finally {
+                        // WebSocket Write Text End
+                        if (textFrame.isFinalFragment()) {
+                            DECORATE.onFrameEnd(handlerContext);
+                        }
+                    }
+                    return;
+                }
 
-        if (frame instanceof BinaryWebSocketFrame) {
-          // WebSocket Write Binary Start
-          BinaryWebSocketFrame binaryFrame = (BinaryWebSocketFrame) frame;
-          final AgentSpan span =
-              DECORATE.startOutboundFrameSpan(
-                  handlerContext, MESSAGE_TYPE_BINARY, binaryFrame.content().readableBytes());
-          try (final ContextScope scope = activateSpan(span)) {
-            ctx.write(frame, promise);
-          } finally {
-            // WebSocket Write Binary End
-            if (binaryFrame.isFinalFragment()) {
-              DECORATE.onFrameEnd(handlerContext);
-            }
-          }
-          return;
-        }
+                if (frame instanceof BinaryWebSocketFrame) {
+                    // WebSocket Write Binary Start
+                    BinaryWebSocketFrame binaryFrame = (BinaryWebSocketFrame) frame;
+                    final AgentSpan span = DECORATE.startOutboundFrameSpan(
+                            handlerContext,
+                            MESSAGE_TYPE_BINARY,
+                            binaryFrame.content().readableBytes());
+                    try (final ContextScope scope = activateSpan(span)) {
+                        ctx.write(frame, promise);
+                    } finally {
+                        // WebSocket Write Binary End
+                        if (binaryFrame.isFinalFragment()) {
+                            DECORATE.onFrameEnd(handlerContext);
+                        }
+                    }
+                    return;
+                }
 
-        if (frame instanceof ContinuationWebSocketFrame) {
-          ContinuationWebSocketFrame continuationWebSocketFrame =
-              (ContinuationWebSocketFrame) frame;
-          final AgentSpan span =
-              DECORATE.startOutboundFrameSpan(
-                  handlerContext,
-                  handlerContext.getMessageType(),
-                  MESSAGE_TYPE_TEXT.equals(handlerContext.getMessageType())
-                      ? continuationWebSocketFrame.text().length()
-                      : continuationWebSocketFrame.content().readableBytes());
-          try (final ContextScope scope = activateSpan(span)) {
-            ctx.write(frame, promise);
-          } finally {
-            // WebSocket Write Binary End
-            if (continuationWebSocketFrame.isFinalFragment()) {
-              DECORATE.onFrameEnd(handlerContext);
-            }
-          }
-          return;
-        }
+                if (frame instanceof ContinuationWebSocketFrame) {
+                    ContinuationWebSocketFrame continuationWebSocketFrame = (ContinuationWebSocketFrame) frame;
+                    final AgentSpan span = DECORATE.startOutboundFrameSpan(
+                            handlerContext,
+                            handlerContext.getMessageType(),
+                            MESSAGE_TYPE_TEXT.equals(handlerContext.getMessageType())
+                                    ? continuationWebSocketFrame.text().length()
+                                    : continuationWebSocketFrame.content().readableBytes());
+                    try (final ContextScope scope = activateSpan(span)) {
+                        ctx.write(frame, promise);
+                    } finally {
+                        // WebSocket Write Binary End
+                        if (continuationWebSocketFrame.isFinalFragment()) {
+                            DECORATE.onFrameEnd(handlerContext);
+                        }
+                    }
+                    return;
+                }
 
-        if (frame instanceof CloseWebSocketFrame) {
-          // WebSocket Closed by Server
-          CloseWebSocketFrame closeFrame = (CloseWebSocketFrame) frame;
-          int statusCode = closeFrame.statusCode();
-          String reasonText = closeFrame.reasonText();
-          channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).remove();
-          final AgentSpan span =
-              DECORATE.startOutboundCloseSpan(handlerContext, reasonText, statusCode);
-          try (final ContextScope scope = activateSpan(span)) {
-            ctx.write(frame, promise);
-          } finally {
-            if (closeFrame.isFinalFragment()) {
-              DECORATE.onFrameEnd(handlerContext);
+                if (frame instanceof CloseWebSocketFrame) {
+                    // WebSocket Closed by Server
+                    CloseWebSocketFrame closeFrame = (CloseWebSocketFrame) frame;
+                    int statusCode = closeFrame.statusCode();
+                    String reasonText = closeFrame.reasonText();
+                    channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).remove();
+                    final AgentSpan span = DECORATE.startOutboundCloseSpan(handlerContext, reasonText, statusCode);
+                    try (final ContextScope scope = activateSpan(span)) {
+                        ctx.write(frame, promise);
+                    } finally {
+                        if (closeFrame.isFinalFragment()) {
+                            DECORATE.onFrameEnd(handlerContext);
+                        }
+                    }
+                    return;
+                }
             }
-          }
-          return;
         }
-      }
+        // can be other messages we do not handle like ping, pong
+        ctx.write(frame, promise);
     }
-    // can be other messages we do not handle like ping, pong
-    ctx.write(frame, promise);
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerTracingHandler.java
index 6e453c75dd1..b872910c74e 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerTracingHandler.java
@@ -3,12 +3,10 @@
 import io.netty.channel.CombinedChannelDuplexHandler;
 
 public class WebSocketServerTracingHandler
-    extends CombinedChannelDuplexHandler<
-        WebSocketServerRequestTracingHandler, WebSocketServerResponseTracingHandler> {
+        extends CombinedChannelDuplexHandler<
+                WebSocketServerRequestTracingHandler, WebSocketServerResponseTracingHandler> {
 
-  public WebSocketServerTracingHandler() {
-    super(
-        WebSocketServerRequestTracingHandler.INSTANCE,
-        WebSocketServerResponseTracingHandler.INSTANCE);
-  }
+    public WebSocketServerTracingHandler() {
+        super(WebSocketServerRequestTracingHandler.INSTANCE, WebSocketServerResponseTracingHandler.INSTANCE);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java
index af5f36113fa..88d11035939 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java
@@ -24,86 +24,87 @@
 
 @AutoService(InstrumenterModule.class)
 public class ChannelFutureListenerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public ChannelFutureListenerInstrumentation() {
-    super(
-        NettyChannelPipelineInstrumentation.INSTRUMENTATION_NAME,
-        NettyChannelPipelineInstrumentation.ADDITIONAL_INSTRUMENTATION_NAMES);
-  }
+    public ChannelFutureListenerInstrumentation() {
+        super(
+                NettyChannelPipelineInstrumentation.INSTRUMENTATION_NAME,
+                NettyChannelPipelineInstrumentation.ADDITIONAL_INSTRUMENTATION_NAMES);
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.netty.channel.ChannelFutureListener";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.netty.channel.ChannelFutureListener";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".AttributeKeys",
-      packageName + ".ServerRequestContext",
-      // server helpers
-      packageName + ".server.ResponseExtractAdapter",
-      packageName + ".server.NettyHttpServerDecorator",
-      packageName + ".server.NettyHttpServerDecorator$NettyBlockResponseFunction",
-      packageName + ".server.BlockingResponseHandler",
-      packageName + ".server.BlockingResponseHandler$IgnoreAllWritesHandler",
-      packageName + ".server.BlockingResponseHandler$PendingBlockResponse",
-      packageName + ".server.HttpServerRequestTracingHandler",
-      packageName + ".server.HttpServerResponseTracingHandler",
-      packageName + ".server.HttpServerTracingHandler"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".AttributeKeys",
+            packageName + ".ServerRequestContext",
+            // server helpers
+            packageName + ".server.ResponseExtractAdapter",
+            packageName + ".server.NettyHttpServerDecorator",
+            packageName + ".server.NettyHttpServerDecorator$NettyBlockResponseFunction",
+            packageName + ".server.BlockingResponseHandler",
+            packageName + ".server.BlockingResponseHandler$IgnoreAllWritesHandler",
+            packageName + ".server.BlockingResponseHandler$PendingBlockResponse",
+            packageName + ".server.HttpServerRequestTracingHandler",
+            packageName + ".server.HttpServerResponseTracingHandler",
+            packageName + ".server.HttpServerTracingHandler"
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("operationComplete"))
-            .and(takesArgument(0, named("io.netty.channel.ChannelFuture"))),
-        ChannelFutureListenerInstrumentation.class.getName() + "$OperationCompleteAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("operationComplete"))
+                        .and(takesArgument(0, named("io.netty.channel.ChannelFuture"))),
+                ChannelFutureListenerInstrumentation.class.getName() + "$OperationCompleteAdvice");
+    }
 
-  public static class OperationCompleteAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope activateScope(@Advice.Argument(0) final ChannelFuture future) {
-      /*
-      Idea here is:
-       - To return scope only if we have captured it.
-       - To capture scope only in case of error.
-       */
-      final Throwable cause = future.cause();
-      if (cause == null) {
-        return null;
-      }
-      final ContextContinuation continuation =
-          future.channel().attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY).getAndRemove();
-      if (continuation == null) {
-        return null;
-      }
-      final ContextScope parentScope = continuation.resume();
+    public static class OperationCompleteAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope activateScope(@Advice.Argument(0) final ChannelFuture future) {
+            /*
+            Idea here is:
+             - To return scope only if we have captured it.
+             - To capture scope only in case of error.
+             */
+            final Throwable cause = future.cause();
+            if (cause == null) {
+                return null;
+            }
+            final ContextContinuation continuation = future.channel()
+                    .attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY)
+                    .getAndRemove();
+            if (continuation == null) {
+                return null;
+            }
+            final ContextScope parentScope = continuation.resume();
 
-      final AgentSpan errorSpan = startSpan("netty", NETTY_CONNECT).setTag(Tags.COMPONENT, "netty");
-      errorSpan.spanContext().setIntegrationName(NETTY);
-      try (final ContextScope scope = errorSpan.attachWithContext()) {
-        NettyHttpServerDecorator.DECORATE.onError(errorSpan, cause);
-        NettyHttpServerDecorator.DECORATE.beforeFinish(scope.context());
-        errorSpan.finish();
-      }
+            final AgentSpan errorSpan = startSpan("netty", NETTY_CONNECT).setTag(Tags.COMPONENT, "netty");
+            errorSpan.spanContext().setIntegrationName(NETTY);
+            try (final ContextScope scope = errorSpan.attachWithContext()) {
+                NettyHttpServerDecorator.DECORATE.onError(errorSpan, cause);
+                NettyHttpServerDecorator.DECORATE.beforeFinish(scope.context());
+                errorSpan.finish();
+            }
 
-      return parentScope;
-    }
+            return parentScope;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void deactivateScope(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void deactivateScope(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2ConnectContinuationListener.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2ConnectContinuationListener.java
index c7709e3c39f..ae09c7e8df0 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2ConnectContinuationListener.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2ConnectContinuationListener.java
@@ -8,27 +8,27 @@
 import io.netty.channel.ChannelFutureListener;
 
 public final class Http2ConnectContinuationListener implements ChannelFutureListener {
-  public static final ChannelFutureListener INSTANCE = new Http2ConnectContinuationListener();
+    public static final ChannelFutureListener INSTANCE = new Http2ConnectContinuationListener();
 
-  private Http2ConnectContinuationListener() {}
+    private Http2ConnectContinuationListener() {}
 
-  @Override
-  public void operationComplete(final ChannelFuture future) {
-    if (future.isSuccess() || future.isCancelled()) {
-      cancel(future.channel());
+    @Override
+    public void operationComplete(final ChannelFuture future) {
+        if (future.isSuccess() || future.isCancelled()) {
+            cancel(future.channel());
+        }
+        // Failed connects are left for ChannelFutureListenerInstrumentation, which creates the
+        // netty.connect error span under this continuation.
     }
-    // Failed connects are left for ChannelFutureListenerInstrumentation, which creates the
-    // netty.connect error span under this continuation.
-  }
 
-  public static void cancel(final Channel channel) {
-    if (channel == null) {
-      return;
+    public static void cancel(final Channel channel) {
+        if (channel == null) {
+            return;
+        }
+        final ContextContinuation continuation =
+                channel.attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY).getAndRemove();
+        if (continuation != null) {
+            continuation.release();
+        }
     }
-    final ContextContinuation continuation =
-        channel.attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY).getAndRemove();
-    if (continuation != null) {
-      continuation.release();
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2MultiplexHandlerStreamChannelInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2MultiplexHandlerStreamChannelInstrumentation.java
index 6a1162fdff0..85180f84cbc 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2MultiplexHandlerStreamChannelInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2MultiplexHandlerStreamChannelInstrumentation.java
@@ -10,41 +10,41 @@
 
 @AutoService(InstrumenterModule.class)
 public class Http2MultiplexHandlerStreamChannelInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public Http2MultiplexHandlerStreamChannelInstrumentation() {
-    super("netty", "netty-4.1", "netty-4.1-http2");
-  }
+    public Http2MultiplexHandlerStreamChannelInstrumentation() {
+        super("netty", "netty-4.1", "netty-4.1-http2");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.netty.handler.codec.http2.Http2MultiplexHandler$Http2MultiplexHandlerStreamChannel";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.netty.handler.codec.http2.Http2MultiplexHandler$Http2MultiplexHandlerStreamChannel";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".AttributeKeys",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".AttributeKeys",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        ElementMatchers.isConstructor(), getClass().getName() + "$PropagateContextAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(ElementMatchers.isConstructor(), getClass().getName() + "$PropagateContextAdvice");
+    }
 
-  public static class PropagateContextAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterCreate(@Advice.This Channel self) {
-      if (self.parent() != null
-          && self.parent().hasAttr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY)
-          && !self.hasAttr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY)) {
-        Context context = self.parent().attr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY).getAndSet(null);
-        if (context != null) {
-          self.attr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY).set(context);
+    public static class PropagateContextAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterCreate(@Advice.This Channel self) {
+            if (self.parent() != null
+                    && self.parent().hasAttr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY)
+                    && !self.hasAttr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY)) {
+                Context context =
+                        self.parent().attr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY).getAndSet(null);
+                if (context != null) {
+                    self.attr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY).set(context);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java
index 8b6cbef44ce..4a000495729 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java
@@ -27,129 +27,124 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpPostRequestDecoderInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public HttpPostRequestDecoderInstrumentation() {
-    super(
-        NettyChannelPipelineInstrumentation.INSTRUMENTATION_NAME,
-        NettyChannelPipelineInstrumentation.ADDITIONAL_INSTRUMENTATION_NAMES);
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.netty.handler.codec.http.multipart.HttpPostMultipartRequestDecoder",
-      "io.netty.handler.codec.http.multipart.HttpPostStandardRequestDecoder",
-    };
-  }
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      new Reference.Builder("io.netty.handler.codec.http.multipart.HttpPostMultipartRequestDecoder")
-          .withField(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC,
-              "currentStatus",
-              "Lio/netty/handler/codec/http/multipart/HttpPostRequestDecoder$MultiPartStatus;")
-          .withField(new String[0], Reference.EXPECTS_NON_STATIC, "isLastChunk", "Z")
-          .build(),
-      new Reference.Builder("io.netty.handler.codec.http.multipart.HttpPostStandardRequestDecoder")
-          .withField(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC,
-              "currentStatus",
-              "Lio/netty/handler/codec/http/multipart/HttpPostRequestDecoder$MultiPartStatus;")
-          .withField(new String[0], Reference.EXPECTS_NON_STATIC, "isLastChunk", "Z")
-          .build()
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("parseBody").and(takesArguments(0)).and(isPrivate()),
-        getClass().getName() + "$ParseBodyAdvice");
-  }
-
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  static class ParseBodyAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.This InterfaceHttpPostRequestDecoder thiz,
-        @Advice.FieldValue("currentStatus") Enum currentStatus,
-        @Advice.FieldValue("isLastChunk") boolean isLastChunk,
-        @ActiveRequestContext RequestContext requestContext,
-        @Advice.Thrown(readOnly = false) Throwable thr) {
-      String statusName = currentStatus.name();
-      if (!statusName.equals("EPILOGUE")) {
-        // For multipart decoders, the PREEPILOGUE→EPILOGUE transition requires a second
-        // parseBody() call that never comes when the full request arrives in one shot.
-        // Fire on PREEPILOGUE + isLastChunk to handle that case.
-        if (!statusName.equals("PREEPILOGUE") || !isLastChunk) {
-          return;
-        }
-      }
-
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-
-      BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb =
-          cbp.getCallback(EVENTS.requestFilesFilenames());
-
-      BiFunction<RequestContext, List<String>, Flow<Void>> contentCb =
-          cbp.getCallback(EVENTS.requestFilesContent());
-
-      if (callback == null && filenamesCb == null && contentCb == null) {
-        return;
-      }
-
-      Map<String, List<String>> attributes = callback != null ? new LinkedHashMap<>() : null;
-      List<String> filenames = filenamesCb != null ? new ArrayList<>() : null;
-      List<String> filesContent = contentCb != null ? new ArrayList<>() : null;
-
-      RuntimeException exc =
-          NettyMultipartHelper.collectBodyData(
-              thiz.getBodyHttpDatas(), attributes, filenames, filesContent);
-
-      if (callback != null) {
-        // effectivelyBlocked() is intentionally absent: tryCommitBlockingResponse finishes
-        // the span synchronously in this Netty path; calling it on a finished span throws.
-        Throwable block =
-            NettyMultipartHelper.tryBlock(
-                requestContext,
-                callback.apply(requestContext, attributes),
-                "Blocked request (multipart/urlencoded post data)");
-        if (block != null) {
-          thr = block;
-        }
-      }
-
-      if (filenames != null && !filenames.isEmpty()) {
-        Flow<Void> filenamesFlow = filenamesCb.apply(requestContext, filenames);
-        if (thr == null) {
-          thr =
-              NettyMultipartHelper.tryBlock(
-                  requestContext, filenamesFlow, "Blocked request (multipart file upload)");
-        }
-      }
-
-      if (thr == null && filesContent != null && !filesContent.isEmpty()) {
-        thr =
-            NettyMultipartHelper.tryBlock(
-                requestContext,
-                contentCb.apply(requestContext, filesContent),
-                "Blocked request (multipart file upload content)");
-      }
-
-      if (exc != null) {
-        // for it to be logged
-        throw exc;
-      }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public HttpPostRequestDecoderInstrumentation() {
+        super(
+                NettyChannelPipelineInstrumentation.INSTRUMENTATION_NAME,
+                NettyChannelPipelineInstrumentation.ADDITIONAL_INSTRUMENTATION_NAMES);
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.netty.handler.codec.http.multipart.HttpPostMultipartRequestDecoder",
+            "io.netty.handler.codec.http.multipart.HttpPostStandardRequestDecoder",
+        };
+    }
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            new Reference.Builder("io.netty.handler.codec.http.multipart.HttpPostMultipartRequestDecoder")
+                    .withField(
+                            new String[0],
+                            Reference.EXPECTS_NON_STATIC,
+                            "currentStatus",
+                            "Lio/netty/handler/codec/http/multipart/HttpPostRequestDecoder$MultiPartStatus;")
+                    .withField(new String[0], Reference.EXPECTS_NON_STATIC, "isLastChunk", "Z")
+                    .build(),
+            new Reference.Builder("io.netty.handler.codec.http.multipart.HttpPostStandardRequestDecoder")
+                    .withField(
+                            new String[0],
+                            Reference.EXPECTS_NON_STATIC,
+                            "currentStatus",
+                            "Lio/netty/handler/codec/http/multipart/HttpPostRequestDecoder$MultiPartStatus;")
+                    .withField(new String[0], Reference.EXPECTS_NON_STATIC, "isLastChunk", "Z")
+                    .build()
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("parseBody").and(takesArguments(0)).and(isPrivate()),
+                getClass().getName() + "$ParseBodyAdvice");
     }
 
-    Object muzzle() {
-      return EmptyHttpHeaders.class;
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    static class ParseBodyAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.This InterfaceHttpPostRequestDecoder thiz,
+                @Advice.FieldValue("currentStatus") Enum currentStatus,
+                @Advice.FieldValue("isLastChunk") boolean isLastChunk,
+                @ActiveRequestContext RequestContext requestContext,
+                @Advice.Thrown(readOnly = false) Throwable thr) {
+            String statusName = currentStatus.name();
+            if (!statusName.equals("EPILOGUE")) {
+                // For multipart decoders, the PREEPILOGUE→EPILOGUE transition requires a second
+                // parseBody() call that never comes when the full request arrives in one shot.
+                // Fire on PREEPILOGUE + isLastChunk to handle that case.
+                if (!statusName.equals("PREEPILOGUE") || !isLastChunk) {
+                    return;
+                }
+            }
+
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+
+            BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb =
+                    cbp.getCallback(EVENTS.requestFilesFilenames());
+
+            BiFunction<RequestContext, List<String>, Flow<Void>> contentCb =
+                    cbp.getCallback(EVENTS.requestFilesContent());
+
+            if (callback == null && filenamesCb == null && contentCb == null) {
+                return;
+            }
+
+            Map<String, List<String>> attributes = callback != null ? new LinkedHashMap<>() : null;
+            List<String> filenames = filenamesCb != null ? new ArrayList<>() : null;
+            List<String> filesContent = contentCb != null ? new ArrayList<>() : null;
+
+            RuntimeException exc =
+                    NettyMultipartHelper.collectBodyData(thiz.getBodyHttpDatas(), attributes, filenames, filesContent);
+
+            if (callback != null) {
+                // effectivelyBlocked() is intentionally absent: tryCommitBlockingResponse finishes
+                // the span synchronously in this Netty path; calling it on a finished span throws.
+                Throwable block = NettyMultipartHelper.tryBlock(
+                        requestContext,
+                        callback.apply(requestContext, attributes),
+                        "Blocked request (multipart/urlencoded post data)");
+                if (block != null) {
+                    thr = block;
+                }
+            }
+
+            if (filenames != null && !filenames.isEmpty()) {
+                Flow<Void> filenamesFlow = filenamesCb.apply(requestContext, filenames);
+                if (thr == null) {
+                    thr = NettyMultipartHelper.tryBlock(
+                            requestContext, filenamesFlow, "Blocked request (multipart file upload)");
+                }
+            }
+
+            if (thr == null && filesContent != null && !filesContent.isEmpty()) {
+                thr = NettyMultipartHelper.tryBlock(
+                        requestContext,
+                        contentCb.apply(requestContext, filesContent),
+                        "Blocked request (multipart file upload content)");
+            }
+
+            if (exc != null) {
+                // for it to be logged
+                throw exc;
+            }
+        }
+
+        Object muzzle() {
+            return EmptyHttpHeaders.class;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java
index 0246d87e69d..40cfb11b44d 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java
@@ -26,71 +26,71 @@
 
 @AutoService(InstrumenterModule.class)
 public class NettyChannelHandlerContextInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public NettyChannelHandlerContextInstrumentation() {
-    super(INSTRUMENTATION_NAME, ADDITIONAL_INSTRUMENTATION_NAMES);
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.netty.channel.ChannelHandlerContext";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    public NettyChannelHandlerContextInstrumentation() {
+        super(INSTRUMENTATION_NAME, ADDITIONAL_INSTRUMENTATION_NAMES);
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".AttributeKeys",
-      packageName + ".ServerRequestContext",
-      packageName + ".client.NettyHttpClientDecorator",
-      packageName + ".server.ResponseExtractAdapter",
-      packageName + ".server.NettyHttpServerDecorator",
-      packageName + ".server.NettyHttpServerDecorator$NettyBlockResponseFunction",
-      packageName + ".server.BlockingResponseHandler",
-      packageName + ".server.BlockingResponseHandler$IgnoreAllWritesHandler",
-      packageName + ".server.BlockingResponseHandler$PendingBlockResponse",
-      packageName + ".server.HttpServerRequestTracingHandler",
-      packageName + ".server.HttpServerResponseTracingHandler",
-      packageName + ".server.HttpServerTracingHandler"
-    };
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.netty.channel.ChannelHandlerContext";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        // this may be overly aggressive:
-        isMethod().and(nameStartsWith("fire")).and(isPublic()),
-        NettyChannelHandlerContextInstrumentation.class.getName() + "$FireAdvice");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  public static class FireAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope scopeSpan(@Advice.This final ChannelHandlerContext ctx) {
-      final AgentSpan channelSpan =
-          spanFromContext(ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get());
-      if (channelSpan == null || channelSpan == activeSpan()) {
-        // don't modify the scope
-        return null;
-      }
-      return activateSpan(channelSpan);
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".AttributeKeys",
+            packageName + ".ServerRequestContext",
+            packageName + ".client.NettyHttpClientDecorator",
+            packageName + ".server.ResponseExtractAdapter",
+            packageName + ".server.NettyHttpServerDecorator",
+            packageName + ".server.NettyHttpServerDecorator$NettyBlockResponseFunction",
+            packageName + ".server.BlockingResponseHandler",
+            packageName + ".server.BlockingResponseHandler$IgnoreAllWritesHandler",
+            packageName + ".server.BlockingResponseHandler$PendingBlockResponse",
+            packageName + ".server.HttpServerRequestTracingHandler",
+            packageName + ".server.HttpServerResponseTracingHandler",
+            packageName + ".server.HttpServerTracingHandler"
+        };
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void close(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                // this may be overly aggressive:
+                isMethod().and(nameStartsWith("fire")).and(isPublic()),
+                NettyChannelHandlerContextInstrumentation.class.getName() + "$FireAdvice");
     }
 
-    @SuppressWarnings("DataFlowIssue")
-    private void muzzleCheck() {
-      NettyHttpClientDecorator.DECORATE.afterStart(null);
-      NettyHttpServerDecorator.DECORATE.afterStart(null);
+    public static class FireAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope scopeSpan(@Advice.This final ChannelHandlerContext ctx) {
+            final AgentSpan channelSpan =
+                    spanFromContext(ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get());
+            if (channelSpan == null || channelSpan == activeSpan()) {
+                // don't modify the scope
+                return null;
+            }
+            return activateSpan(channelSpan);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void close(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
+
+        @SuppressWarnings("DataFlowIssue")
+        private void muzzleCheck() {
+            NettyHttpClientDecorator.DECORATE.afterStart(null);
+            NettyHttpServerDecorator.DECORATE.afterStart(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java
index 2dadcc5af75..919901d37a2 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java
@@ -49,242 +49,232 @@
 
 @AutoService(InstrumenterModule.class)
 public class NettyChannelPipelineInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  static final String INSTRUMENTATION_NAME = "netty";
-  static final String[] ADDITIONAL_INSTRUMENTATION_NAMES = {"netty-4.1"};
+    static final String INSTRUMENTATION_NAME = "netty";
+    static final String[] ADDITIONAL_INSTRUMENTATION_NAMES = {"netty-4.1"};
 
-  public NettyChannelPipelineInstrumentation() {
-    super(INSTRUMENTATION_NAME, ADDITIONAL_INSTRUMENTATION_NAMES);
-  }
+    public NettyChannelPipelineInstrumentation() {
+        super(INSTRUMENTATION_NAME, ADDITIONAL_INSTRUMENTATION_NAMES);
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.netty.channel.ChannelPipeline";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.netty.channel.ChannelPipeline";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".AttributeKeys",
-      packageName + ".ServerRequestContext",
-      // client helpers
-      packageName + ".client.NettyHttpClientDecorator",
-      packageName + ".client.NettyResponseInjectAdapter",
-      packageName + ".client.HttpClientRequestTracingHandler",
-      packageName + ".client.HttpClientResponseTracingHandler",
-      packageName + ".client.HttpClientTracingHandler",
-      // server helpers
-      packageName + ".server.ResponseExtractAdapter",
-      packageName + ".server.NettyHttpServerDecorator",
-      packageName + ".server.NettyHttpServerDecorator$NettyBlockResponseFunction",
-      packageName + ".server.BlockingResponseHandler",
-      packageName + ".server.BlockingResponseHandler$IgnoreAllWritesHandler",
-      packageName + ".server.BlockingResponseHandler$PendingBlockResponse",
-      packageName + ".server.HttpServerContextTrackingHandler",
-      packageName + ".server.HttpServerRequestTracingHandler",
-      packageName + ".server.HttpServerResponseTracingHandler",
-      packageName + ".server.HttpServerTracingHandler",
-      packageName + ".server.MaybeBlockResponseHandler",
-      packageName + ".server.websocket.WebSocketServerTracingHandler",
-      packageName + ".server.websocket.WebSocketServerOutboundTracingHandler",
-      packageName + ".server.websocket.WebSocketServerInboundTracingHandler",
-      packageName + ".Http2ConnectContinuationListener",
-      packageName + ".NettyHttp2Helper",
-      packageName + ".NettyPipelineHelper",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".AttributeKeys",
+            packageName + ".ServerRequestContext",
+            // client helpers
+            packageName + ".client.NettyHttpClientDecorator",
+            packageName + ".client.NettyResponseInjectAdapter",
+            packageName + ".client.HttpClientRequestTracingHandler",
+            packageName + ".client.HttpClientResponseTracingHandler",
+            packageName + ".client.HttpClientTracingHandler",
+            // server helpers
+            packageName + ".server.ResponseExtractAdapter",
+            packageName + ".server.NettyHttpServerDecorator",
+            packageName + ".server.NettyHttpServerDecorator$NettyBlockResponseFunction",
+            packageName + ".server.BlockingResponseHandler",
+            packageName + ".server.BlockingResponseHandler$IgnoreAllWritesHandler",
+            packageName + ".server.BlockingResponseHandler$PendingBlockResponse",
+            packageName + ".server.HttpServerContextTrackingHandler",
+            packageName + ".server.HttpServerRequestTracingHandler",
+            packageName + ".server.HttpServerResponseTracingHandler",
+            packageName + ".server.HttpServerTracingHandler",
+            packageName + ".server.MaybeBlockResponseHandler",
+            packageName + ".server.websocket.WebSocketServerTracingHandler",
+            packageName + ".server.websocket.WebSocketServerOutboundTracingHandler",
+            packageName + ".server.websocket.WebSocketServerInboundTracingHandler",
+            packageName + ".Http2ConnectContinuationListener",
+            packageName + ".NettyHttp2Helper",
+            packageName + ".NettyPipelineHelper",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(namedOneOf("addFirst", "addLast"))
-            .and(takesArgument(2, named("io.netty.channel.ChannelHandler"))),
-        NettyChannelPipelineInstrumentation.class.getName() + "$ContextTrackingAddHandlerAdvice",
-        NettyChannelPipelineInstrumentation.class.getName() + "$AddHandlerAdvice");
-    transformer.applyAdvices(
-        isMethod()
-            .and(namedOneOf("addBefore", "addAfter"))
-            .and(takesArgument(3, named("io.netty.channel.ChannelHandler"))),
-        NettyChannelPipelineInstrumentation.class.getName() + "$ContextTrackingAddHandlerAdvice",
-        NettyChannelPipelineInstrumentation.class.getName() + "$AddHandlerAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("connect")).and(returns(named("io.netty.channel.ChannelFuture"))),
-        NettyChannelPipelineInstrumentation.class.getName() + "$ConnectAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(namedOneOf("addFirst", "addLast"))
+                        .and(takesArgument(2, named("io.netty.channel.ChannelHandler"))),
+                NettyChannelPipelineInstrumentation.class.getName() + "$ContextTrackingAddHandlerAdvice",
+                NettyChannelPipelineInstrumentation.class.getName() + "$AddHandlerAdvice");
+        transformer.applyAdvices(
+                isMethod()
+                        .and(namedOneOf("addBefore", "addAfter"))
+                        .and(takesArgument(3, named("io.netty.channel.ChannelHandler"))),
+                NettyChannelPipelineInstrumentation.class.getName() + "$ContextTrackingAddHandlerAdvice",
+                NettyChannelPipelineInstrumentation.class.getName() + "$AddHandlerAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("connect")).and(returns(named("io.netty.channel.ChannelFuture"))),
+                NettyChannelPipelineInstrumentation.class.getName() + "$ConnectAdvice");
+    }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextTrackingAddHandlerAdvice {
-    // No OnMethodEnter — avoids double-incrementing CallDepthThreadLocalMap,
-    // which would cause AddHandlerAdvice.OnMethodExit to see depth > 0 and skip.
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void addContextTrackingHandler(
-        @Advice.This final ChannelPipeline pipeline,
-        @Advice.Argument(value = 2, optional = true) final Object handler2,
-        @Advice.Argument(value = 3, optional = true) final ChannelHandler handler3) {
-      ChannelHandler handler =
-          handler2 instanceof ChannelHandler ? (ChannelHandler) handler2 : handler3;
-      try {
-        if (handler instanceof HttpServerCodec || handler instanceof HttpRequestDecoder) {
-          NettyPipelineHelper.addHandlerAfter(
-              pipeline, handler, HttpServerContextTrackingHandler.INSTANCE);
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextTrackingAddHandlerAdvice {
+        // No OnMethodEnter — avoids double-incrementing CallDepthThreadLocalMap,
+        // which would cause AddHandlerAdvice.OnMethodExit to see depth > 0 and skip.
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void addContextTrackingHandler(
+                @Advice.This final ChannelPipeline pipeline,
+                @Advice.Argument(value = 2, optional = true) final Object handler2,
+                @Advice.Argument(value = 3, optional = true) final ChannelHandler handler3) {
+            ChannelHandler handler = handler2 instanceof ChannelHandler ? (ChannelHandler) handler2 : handler3;
+            try {
+                if (handler instanceof HttpServerCodec || handler instanceof HttpRequestDecoder) {
+                    NettyPipelineHelper.addHandlerAfter(pipeline, handler, HttpServerContextTrackingHandler.INSTANCE);
+                }
+            } catch (final IllegalArgumentException e) {
+                // Prevented adding duplicate handlers.
+            }
         }
-      } catch (final IllegalArgumentException e) {
-        // Prevented adding duplicate handlers.
-      }
     }
-  }
 
-  /**
-   * When certain handlers are added to the pipeline, we want to add our corresponding tracing
-   * handlers. If those handlers are later removed, we may want to remove our handlers. That is not
-   * currently implemented.
-   */
-  public static class AddHandlerAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static int checkDepth(
-        @Advice.Argument(value = 2, optional = true) final Object handler2,
-        @Advice.Argument(value = 3, optional = true) final ChannelHandler handler3) {
-      ChannelHandler handler =
-          handler2 instanceof ChannelHandler ? (ChannelHandler) handler2 : handler3;
-      /**
-       * Previously we used one unique call depth tracker for all handlers, using
-       * ChannelPipeline.class as a key. The problem with this approach is that it does not work
-       * with netty's io.netty.channel.ChannelInitializer which provides an `initChannel` that can
-       * be used to `addLast` other handlers. In that case the depth would exceed 0 and handlers
-       * added from initializers would not be considered. Using the specific handler key instead of
-       * the generic ChannelPipeline.class will help us both to handle such cases and avoid adding
-       * our additional handlers in case of internal calls of `addLast` to other method overloads
-       * with a compatible signature.
-       */
-      return CallDepthThreadLocalMap.incrementCallDepth(handler.getClass());
-    }
+    /**
+     * When certain handlers are added to the pipeline, we want to add our corresponding tracing
+     * handlers. If those handlers are later removed, we may want to remove our handlers. That is not
+     * currently implemented.
+     */
+    public static class AddHandlerAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static int checkDepth(
+                @Advice.Argument(value = 2, optional = true) final Object handler2,
+                @Advice.Argument(value = 3, optional = true) final ChannelHandler handler3) {
+            ChannelHandler handler = handler2 instanceof ChannelHandler ? (ChannelHandler) handler2 : handler3;
+            /**
+             * Previously we used one unique call depth tracker for all handlers, using
+             * ChannelPipeline.class as a key. The problem with this approach is that it does not work
+             * with netty's io.netty.channel.ChannelInitializer which provides an `initChannel` that can
+             * be used to `addLast` other handlers. In that case the depth would exceed 0 and handlers
+             * added from initializers would not be considered. Using the specific handler key instead of
+             * the generic ChannelPipeline.class will help us both to handle such cases and avoid adding
+             * our additional handlers in case of internal calls of `addLast` to other method overloads
+             * with a compatible signature.
+             */
+            return CallDepthThreadLocalMap.incrementCallDepth(handler.getClass());
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void addHandler(
-        @Advice.Enter final int depth,
-        @Advice.This final ChannelPipeline pipeline,
-        @Advice.Argument(value = 2, optional = true) final Object handler2,
-        @Advice.Argument(value = 3, optional = true) final ChannelHandler handler3) {
-      if (depth > 0) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void addHandler(
+                @Advice.Enter final int depth,
+                @Advice.This final ChannelPipeline pipeline,
+                @Advice.Argument(value = 2, optional = true) final Object handler2,
+                @Advice.Argument(value = 3, optional = true) final ChannelHandler handler3) {
+            if (depth > 0) {
+                return;
+            }
 
-      ChannelHandler handler =
-          handler2 instanceof ChannelHandler ? (ChannelHandler) handler2 : handler3;
+            ChannelHandler handler = handler2 instanceof ChannelHandler ? (ChannelHandler) handler2 : handler3;
 
-      try {
-        if (NettyHttp2Helper.isHttp2ConnectionCodec(handler)) {
-          pipeline.channel().attr(HTTP2_CONNECTION_CODEC_ATTRIBUTE_KEY).set(Boolean.TRUE);
-        }
-        // Server pipeline handlers
-        if (handler instanceof HttpServerCodec) {
-          NettyPipelineHelper.addHandlerAfter(
-              pipeline,
-              handler,
-              new HttpServerTracingHandler(),
-              MaybeBlockResponseHandler.INSTANCE);
-        } else if (handler instanceof HttpRequestDecoder) {
-          NettyPipelineHelper.addHandlerAfter(
-              pipeline, handler, HttpServerRequestTracingHandler.INSTANCE);
-        } else if (handler instanceof HttpResponseEncoder) {
-          NettyPipelineHelper.addHandlerAfter(
-              pipeline,
-              handler,
-              HttpServerResponseTracingHandler.INSTANCE,
-              MaybeBlockResponseHandler.INSTANCE);
-        } else if (handler instanceof WebSocketServerProtocolHandler) {
-          if (InstrumenterConfig.get().isWebsocketTracingEnabled()
-              && pipeline.get(HttpServerTracingHandler.class) != null) {
-            // remove single websocket handler if added before
-            if (pipeline.get(WebSocketServerInboundTracingHandler.class) != null) {
-              pipeline.remove(WebSocketServerInboundTracingHandler.class);
-            }
-            if (pipeline.get(WebSocketServerOutboundTracingHandler.class) != null) {
-              pipeline.remove(WebSocketServerOutboundTracingHandler.class);
+            try {
+                if (NettyHttp2Helper.isHttp2ConnectionCodec(handler)) {
+                    pipeline.channel()
+                            .attr(HTTP2_CONNECTION_CODEC_ATTRIBUTE_KEY)
+                            .set(Boolean.TRUE);
+                }
+                // Server pipeline handlers
+                if (handler instanceof HttpServerCodec) {
+                    NettyPipelineHelper.addHandlerAfter(
+                            pipeline, handler, new HttpServerTracingHandler(), MaybeBlockResponseHandler.INSTANCE);
+                } else if (handler instanceof HttpRequestDecoder) {
+                    NettyPipelineHelper.addHandlerAfter(pipeline, handler, HttpServerRequestTracingHandler.INSTANCE);
+                } else if (handler instanceof HttpResponseEncoder) {
+                    NettyPipelineHelper.addHandlerAfter(
+                            pipeline,
+                            handler,
+                            HttpServerResponseTracingHandler.INSTANCE,
+                            MaybeBlockResponseHandler.INSTANCE);
+                } else if (handler instanceof WebSocketServerProtocolHandler) {
+                    if (InstrumenterConfig.get().isWebsocketTracingEnabled()
+                            && pipeline.get(HttpServerTracingHandler.class) != null) {
+                        // remove single websocket handler if added before
+                        if (pipeline.get(WebSocketServerInboundTracingHandler.class) != null) {
+                            pipeline.remove(WebSocketServerInboundTracingHandler.class);
+                        }
+                        if (pipeline.get(WebSocketServerOutboundTracingHandler.class) != null) {
+                            pipeline.remove(WebSocketServerOutboundTracingHandler.class);
+                        }
+                        NettyPipelineHelper.addHandlerAfter(
+                                pipeline,
+                                pipeline.get(HttpServerTracingHandler.class),
+                                new WebSocketServerTracingHandler());
+                    }
+                } else if (handler instanceof WebSocketFrameDecoder) {
+                    if (InstrumenterConfig.get().isWebsocketTracingEnabled()
+                            && pipeline.get(WebSocketServerTracingHandler.class) == null) {
+                        NettyPipelineHelper.addHandlerAfter(
+                                pipeline, handler, WebSocketServerInboundTracingHandler.INSTANCE);
+                    }
+                } else if (handler instanceof WebSocketFrameEncoder) {
+                    if (InstrumenterConfig.get().isWebsocketTracingEnabled()
+                            && pipeline.get(WebSocketServerTracingHandler.class) == null) {
+                        NettyPipelineHelper.addHandlerAfter(
+                                pipeline, handler, WebSocketServerOutboundTracingHandler.INSTANCE);
+                    }
+                }
+                // Client pipeline handlers
+                else if (handler instanceof HttpClientCodec) {
+                    NettyPipelineHelper.addHandlerAfter(pipeline, handler, new HttpClientTracingHandler());
+                } else if (handler instanceof HttpRequestEncoder) {
+                    NettyPipelineHelper.addHandlerAfter(pipeline, handler, HttpClientRequestTracingHandler.INSTANCE);
+                } else if (handler instanceof HttpResponseDecoder) {
+                    NettyPipelineHelper.addHandlerAfter(pipeline, handler, HttpClientResponseTracingHandler.INSTANCE);
+                } else if (NettyHttp2Helper.isHttp2FrameCodec(handler)) {
+                    if (NettyHttp2Helper.isServer(handler)) {
+                        NettyPipelineHelper.addHandlerAfter(
+                                pipeline, handler, new HttpServerTracingHandler(), MaybeBlockResponseHandler.INSTANCE);
+                    } else {
+                        NettyPipelineHelper.addHandlerAfter(pipeline, handler, new HttpClientTracingHandler());
+                    }
+                }
+            } catch (final IllegalArgumentException e) {
+                // Prevented adding duplicate handlers.
+            } finally {
+                CallDepthThreadLocalMap.reset(handler.getClass());
             }
-            NettyPipelineHelper.addHandlerAfter(
-                pipeline,
-                pipeline.get(HttpServerTracingHandler.class),
-                new WebSocketServerTracingHandler());
-          }
-        } else if (handler instanceof WebSocketFrameDecoder) {
-          if (InstrumenterConfig.get().isWebsocketTracingEnabled()
-              && pipeline.get(WebSocketServerTracingHandler.class) == null) {
-            NettyPipelineHelper.addHandlerAfter(
-                pipeline, handler, WebSocketServerInboundTracingHandler.INSTANCE);
-          }
-        } else if (handler instanceof WebSocketFrameEncoder) {
-          if (InstrumenterConfig.get().isWebsocketTracingEnabled()
-              && pipeline.get(WebSocketServerTracingHandler.class) == null) {
-            NettyPipelineHelper.addHandlerAfter(
-                pipeline, handler, WebSocketServerOutboundTracingHandler.INSTANCE);
-          }
         }
-        // Client pipeline handlers
-        else if (handler instanceof HttpClientCodec) {
-          NettyPipelineHelper.addHandlerAfter(pipeline, handler, new HttpClientTracingHandler());
-        } else if (handler instanceof HttpRequestEncoder) {
-          NettyPipelineHelper.addHandlerAfter(
-              pipeline, handler, HttpClientRequestTracingHandler.INSTANCE);
-        } else if (handler instanceof HttpResponseDecoder) {
-          NettyPipelineHelper.addHandlerAfter(
-              pipeline, handler, HttpClientResponseTracingHandler.INSTANCE);
-        } else if (NettyHttp2Helper.isHttp2FrameCodec(handler)) {
-          if (NettyHttp2Helper.isServer(handler)) {
-            NettyPipelineHelper.addHandlerAfter(
-                pipeline,
-                handler,
-                new HttpServerTracingHandler(),
-                MaybeBlockResponseHandler.INSTANCE);
-          } else {
-            NettyPipelineHelper.addHandlerAfter(pipeline, handler, new HttpClientTracingHandler());
-          }
-        }
-      } catch (final IllegalArgumentException e) {
-        // Prevented adding duplicate handlers.
-      } finally {
-        CallDepthThreadLocalMap.reset(handler.getClass());
-      }
     }
-  }
 
-  public static class ConnectAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static boolean addParentSpan(@Advice.This final ChannelPipeline pipeline) {
-      ContextContinuation continuation = currentContext().capture();
-      if (continuation.context() != rootContext()) {
-        final Attribute<ContextContinuation> attribute =
-            pipeline.channel().attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY);
-        if (!attribute.compareAndSet(null, continuation)) {
-          continuation.release();
-          return false;
+    public static class ConnectAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static boolean addParentSpan(@Advice.This final ChannelPipeline pipeline) {
+            ContextContinuation continuation = currentContext().capture();
+            if (continuation.context() != rootContext()) {
+                final Attribute<ContextContinuation> attribute =
+                        pipeline.channel().attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY);
+                if (!attribute.compareAndSet(null, continuation)) {
+                    continuation.release();
+                    return false;
+                }
+                return Boolean.TRUE.equals(pipeline.channel()
+                        .attr(HTTP2_CONNECTION_CODEC_ATTRIBUTE_KEY)
+                        .get());
+            }
+            return false;
         }
-        return Boolean.TRUE.equals(
-            pipeline.channel().attr(HTTP2_CONNECTION_CODEC_ATTRIBUTE_KEY).get());
-      }
-      return false;
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void cleanupHttp2ConnectParentContinuation(
-        @Advice.Enter final boolean cleanupHttp2Continuation,
-        @Advice.This final ChannelPipeline pipeline,
-        @Advice.Return final ChannelFuture future) {
-      if (!cleanupHttp2Continuation) {
-        return;
-      }
-      if (future == null) {
-        Http2ConnectContinuationListener.cancel(pipeline.channel());
-      } else {
-        future.addListener(Http2ConnectContinuationListener.INSTANCE);
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void cleanupHttp2ConnectParentContinuation(
+                @Advice.Enter final boolean cleanupHttp2Continuation,
+                @Advice.This final ChannelPipeline pipeline,
+                @Advice.Return final ChannelFuture future) {
+            if (!cleanupHttp2Continuation) {
+                return;
+            }
+            if (future == null) {
+                Http2ConnectContinuationListener.cancel(pipeline.channel());
+            } else {
+                future.addListener(Http2ConnectContinuationListener.INSTANCE);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyHttp2Helper.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyHttp2Helper.java
index ba2761c8d7a..9791b9cc6b5 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyHttp2Helper.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyHttp2Helper.java
@@ -9,69 +9,64 @@
 import org.slf4j.LoggerFactory;
 
 public class NettyHttp2Helper {
-  private static final Class HTTP2_STREAM_FRAME_CODEC_CLS;
-  private static final Class HTTP2_CONNECTION_CODEC_CLS;
-  private static final MethodHandle IS_SERVER_FIELD;
-  private static final Logger LOGGER = LoggerFactory.getLogger(NettyHttp2Helper.class);
+    private static final Class HTTP2_STREAM_FRAME_CODEC_CLS;
+    private static final Class HTTP2_CONNECTION_CODEC_CLS;
+    private static final MethodHandle IS_SERVER_FIELD;
+    private static final Logger LOGGER = LoggerFactory.getLogger(NettyHttp2Helper.class);
 
-  static {
-    Class codecClass;
-    Class frameCodecClass;
-    MethodHandle isServerField;
-    try {
-      codecClass =
-          Class.forName(
-              "io.netty.handler.codec.http2.Http2StreamFrameToHttpObjectCodec",
-              false,
-              NettyHttp2Helper.class.getClassLoader());
-      Field f = codecClass.getDeclaredField("isServer");
-      f.setAccessible(true);
-      isServerField =
-          MethodHandles.lookup()
-              .unreflectGetter(f)
-              .asType(MethodType.methodType(boolean.class, ChannelHandler.class));
-    } catch (final ClassNotFoundException cnfe) {
-      // can be expected
-      codecClass = null;
-      isServerField = null;
-    } catch (Throwable t) {
-      // unexpected
-      codecClass = null;
-      isServerField = null;
-      LOGGER.debug("Unable to setup netty http2 instrumentation", t);
+    static {
+        Class codecClass;
+        Class frameCodecClass;
+        MethodHandle isServerField;
+        try {
+            codecClass = Class.forName(
+                    "io.netty.handler.codec.http2.Http2StreamFrameToHttpObjectCodec",
+                    false,
+                    NettyHttp2Helper.class.getClassLoader());
+            Field f = codecClass.getDeclaredField("isServer");
+            f.setAccessible(true);
+            isServerField = MethodHandles.lookup()
+                    .unreflectGetter(f)
+                    .asType(MethodType.methodType(boolean.class, ChannelHandler.class));
+        } catch (final ClassNotFoundException cnfe) {
+            // can be expected
+            codecClass = null;
+            isServerField = null;
+        } catch (Throwable t) {
+            // unexpected
+            codecClass = null;
+            isServerField = null;
+            LOGGER.debug("Unable to setup netty http2 instrumentation", t);
+        }
+        try {
+            frameCodecClass = Class.forName(
+                    "io.netty.handler.codec.http2.Http2FrameCodec", false, NettyHttp2Helper.class.getClassLoader());
+        } catch (final ClassNotFoundException cnfe) {
+            // can be expected
+            frameCodecClass = null;
+        } catch (Throwable t) {
+            // unexpected
+            frameCodecClass = null;
+            LOGGER.debug("Unable to setup netty http2 connection detection", t);
+        }
+        HTTP2_STREAM_FRAME_CODEC_CLS = codecClass;
+        HTTP2_CONNECTION_CODEC_CLS = frameCodecClass;
+        IS_SERVER_FIELD = isServerField;
     }
-    try {
-      frameCodecClass =
-          Class.forName(
-              "io.netty.handler.codec.http2.Http2FrameCodec",
-              false,
-              NettyHttp2Helper.class.getClassLoader());
-    } catch (final ClassNotFoundException cnfe) {
-      // can be expected
-      frameCodecClass = null;
-    } catch (Throwable t) {
-      // unexpected
-      frameCodecClass = null;
-      LOGGER.debug("Unable to setup netty http2 connection detection", t);
-    }
-    HTTP2_STREAM_FRAME_CODEC_CLS = codecClass;
-    HTTP2_CONNECTION_CODEC_CLS = frameCodecClass;
-    IS_SERVER_FIELD = isServerField;
-  }
 
-  public static boolean isHttp2FrameCodec(final ChannelHandler handler) {
-    return HTTP2_STREAM_FRAME_CODEC_CLS != null && HTTP2_STREAM_FRAME_CODEC_CLS.isInstance(handler);
-  }
+    public static boolean isHttp2FrameCodec(final ChannelHandler handler) {
+        return HTTP2_STREAM_FRAME_CODEC_CLS != null && HTTP2_STREAM_FRAME_CODEC_CLS.isInstance(handler);
+    }
 
-  public static boolean isHttp2ConnectionCodec(final ChannelHandler handler) {
-    return HTTP2_CONNECTION_CODEC_CLS != null && HTTP2_CONNECTION_CODEC_CLS.isInstance(handler);
-  }
+    public static boolean isHttp2ConnectionCodec(final ChannelHandler handler) {
+        return HTTP2_CONNECTION_CODEC_CLS != null && HTTP2_CONNECTION_CODEC_CLS.isInstance(handler);
+    }
 
-  public static boolean isServer(final ChannelHandler handler) {
-    try {
-      return IS_SERVER_FIELD != null && (boolean) IS_SERVER_FIELD.invokeExact(handler);
-    } catch (Throwable t) {
-      return false;
+    public static boolean isServer(final ChannelHandler handler) {
+        try {
+            return IS_SERVER_FIELD != null && (boolean) IS_SERVER_FIELD.invokeExact(handler);
+        } catch (Throwable t) {
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyMultipartHelper.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyMultipartHelper.java
index 7ec20a00631..4c1a75a933e 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyMultipartHelper.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyMultipartHelper.java
@@ -19,91 +19,90 @@
 import java.util.Map;
 
 public final class NettyMultipartHelper {
-  public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
-  public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
+    public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
+    public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
 
-  /**
-   * Iterates multipart body parts populating the provided output collections. Pass {@code null} for
-   * any collection to skip that category. Returns any {@link IOException} encountered reading an
-   * attribute value, wrapped as {@link UndeclaredThrowableException}, or {@code null} if none.
-   */
-  public static RuntimeException collectBodyData(
-      List<InterfaceHttpData> parts,
-      Map<String, List<String>> attributes,
-      List<String> filenames,
-      List<String> filesContent) {
-    RuntimeException exc = null;
-    for (InterfaceHttpData data : parts) {
-      InterfaceHttpData.HttpDataType dataType;
-      try {
-        dataType = data.getHttpDataType();
-      } catch (UnsupportedOperationException ignored) {
-        // Some framework-specific implementations (e.g. Vert.x NettyFileUpload) do not support
-        // getHttpDataType() - skip them; their framework's own instrumentation handles them.
-        continue;
-      }
-      if (attributes != null && dataType == InterfaceHttpData.HttpDataType.Attribute) {
-        String name = data.getName();
-        List<String> values = attributes.get(name);
-        if (values == null) {
-          attributes.put(name, values = new ArrayList<>(1));
+    /**
+     * Iterates multipart body parts populating the provided output collections. Pass {@code null} for
+     * any collection to skip that category. Returns any {@link IOException} encountered reading an
+     * attribute value, wrapped as {@link UndeclaredThrowableException}, or {@code null} if none.
+     */
+    public static RuntimeException collectBodyData(
+            List<InterfaceHttpData> parts,
+            Map<String, List<String>> attributes,
+            List<String> filenames,
+            List<String> filesContent) {
+        RuntimeException exc = null;
+        for (InterfaceHttpData data : parts) {
+            InterfaceHttpData.HttpDataType dataType;
+            try {
+                dataType = data.getHttpDataType();
+            } catch (UnsupportedOperationException ignored) {
+                // Some framework-specific implementations (e.g. Vert.x NettyFileUpload) do not support
+                // getHttpDataType() - skip them; their framework's own instrumentation handles them.
+                continue;
+            }
+            if (attributes != null && dataType == InterfaceHttpData.HttpDataType.Attribute) {
+                String name = data.getName();
+                List<String> values = attributes.get(name);
+                if (values == null) {
+                    attributes.put(name, values = new ArrayList<>(1));
+                }
+                try {
+                    values.add(((Attribute) data).getValue());
+                } catch (IOException e) {
+                    exc = new UndeclaredThrowableException(e);
+                }
+            } else if (dataType == InterfaceHttpData.HttpDataType.FileUpload) {
+                FileUpload fileUpload = (FileUpload) data;
+                String filename = fileUpload.getFilename();
+                if (filenames != null && filename != null && !filename.isEmpty()) {
+                    filenames.add(filename);
+                }
+                if (filesContent != null && filesContent.size() < MAX_FILES_TO_INSPECT) {
+                    filesContent.add(readContent(fileUpload));
+                }
+            }
         }
-        try {
-          values.add(((Attribute) data).getValue());
-        } catch (IOException e) {
-          exc = new UndeclaredThrowableException(e);
-        }
-      } else if (dataType == InterfaceHttpData.HttpDataType.FileUpload) {
-        FileUpload fileUpload = (FileUpload) data;
-        String filename = fileUpload.getFilename();
-        if (filenames != null && filename != null && !filename.isEmpty()) {
-          filenames.add(filename);
-        }
-        if (filesContent != null && filesContent.size() < MAX_FILES_TO_INSPECT) {
-          filesContent.add(readContent(fileUpload));
-        }
-      }
+        return exc;
     }
-    return exc;
-  }
 
-  public static String readContent(FileUpload fileUpload) {
-    try {
-      if (fileUpload.isInMemory()) {
-        ByteBuf buf = fileUpload.getByteBuf();
-        int length = Math.min(MAX_CONTENT_BYTES, buf.readableBytes());
-        byte[] bytes = new byte[length];
-        buf.getBytes(buf.readerIndex(), bytes);
-        return MultipartContentDecoder.decodeBytes(bytes, length, fileUpload.getContentType());
-      } else {
-        try (FileInputStream fis = new FileInputStream(fileUpload.getFile())) {
-          return MultipartContentDecoder.readInputStream(
-              fis, MAX_CONTENT_BYTES, fileUpload.getContentType());
+    public static String readContent(FileUpload fileUpload) {
+        try {
+            if (fileUpload.isInMemory()) {
+                ByteBuf buf = fileUpload.getByteBuf();
+                int length = Math.min(MAX_CONTENT_BYTES, buf.readableBytes());
+                byte[] bytes = new byte[length];
+                buf.getBytes(buf.readerIndex(), bytes);
+                return MultipartContentDecoder.decodeBytes(bytes, length, fileUpload.getContentType());
+            } else {
+                try (FileInputStream fis = new FileInputStream(fileUpload.getFile())) {
+                    return MultipartContentDecoder.readInputStream(fis, MAX_CONTENT_BYTES, fileUpload.getContentType());
+                }
+            }
+        } catch (Exception ignored) {
+            return "";
         }
-      }
-    } catch (Exception ignored) {
-      return "";
     }
-  }
 
-  /**
-   * Checks if the flow action is a blocking action and, if so, commits the blocking response. If
-   * the commit fails, reports the failure to {@link AppSecContext#reportBlockFailure()}. Returns a
-   * {@link BlockingException} to be re-thrown by the advice, or {@code null} if no blocking action
-   * was taken.
-   */
-  public static BlockingException tryBlock(RequestContext ctx, Flow<Void> flow, String message) {
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = ctx.getBlockResponseFunction();
-      if (brf != null) {
-        brf.tryCommitBlockingResponse(ctx, rba);
-        return new BlockingException(message);
-      }
+    /**
+     * Checks if the flow action is a blocking action and, if so, commits the blocking response. If
+     * the commit fails, reports the failure to {@link AppSecContext#reportBlockFailure()}. Returns a
+     * {@link BlockingException} to be re-thrown by the advice, or {@code null} if no blocking action
+     * was taken.
+     */
+    public static BlockingException tryBlock(RequestContext ctx, Flow<Void> flow, String message) {
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = ctx.getBlockResponseFunction();
+            if (brf != null) {
+                brf.tryCommitBlockingResponse(ctx, rba);
+                return new BlockingException(message);
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  private NettyMultipartHelper() {}
+    private NettyMultipartHelper() {}
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyPipelineHelper.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyPipelineHelper.java
index 63947626b86..6eff58352ea 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyPipelineHelper.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyPipelineHelper.java
@@ -5,28 +5,28 @@
 import io.netty.channel.ChannelPipeline;
 
 public class NettyPipelineHelper {
-  public static void addHandlerAfter(
-      final ChannelPipeline pipeline, final String name, final ChannelHandler... toAdd) {
-    String handlerName = name;
-    for (ChannelHandler handler : toAdd) {
-      ChannelHandler existing = pipeline.get(handler.getClass());
-      if (existing != null) {
-        pipeline.remove(existing);
-      }
-      pipeline.addAfter(handlerName, null, handler);
-      ChannelHandlerContext handlerContext = pipeline.context(handler);
-      if (handlerContext != null) {
-        handlerName = handlerContext.name();
-      }
+    public static void addHandlerAfter(
+            final ChannelPipeline pipeline, final String name, final ChannelHandler... toAdd) {
+        String handlerName = name;
+        for (ChannelHandler handler : toAdd) {
+            ChannelHandler existing = pipeline.get(handler.getClass());
+            if (existing != null) {
+                pipeline.remove(existing);
+            }
+            pipeline.addAfter(handlerName, null, handler);
+            ChannelHandlerContext handlerContext = pipeline.context(handler);
+            if (handlerContext != null) {
+                handlerName = handlerContext.name();
+            }
+        }
     }
-  }
 
-  public static void addHandlerAfter(
-      final ChannelPipeline pipeline, final ChannelHandler handler, final ChannelHandler... toAdd) {
-    ChannelHandlerContext handlerContext = pipeline.context(handler);
-    if (handlerContext != null) {
-      String handlerName = handlerContext.name();
-      addHandlerAfter(pipeline, handlerName, toAdd);
+    public static void addHandlerAfter(
+            final ChannelPipeline pipeline, final ChannelHandler handler, final ChannelHandler... toAdd) {
+        ChannelHandlerContext handlerContext = pipeline.context(handler);
+        if (handlerContext != null) {
+            String handlerName = handlerContext.name();
+            addHandlerAfter(pipeline, handlerName, toAdd);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java
index 47134f4a0cf..d575d020065 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java
@@ -28,98 +28,97 @@
 
 @ChannelHandler.Sharable
 public class HttpClientRequestTracingHandler extends ChannelOutboundHandlerAdapter {
-  public static final HttpClientRequestTracingHandler INSTANCE =
-      new HttpClientRequestTracingHandler();
-  private static final Class<ChannelHandler> SSL_HANDLER;
+    public static final HttpClientRequestTracingHandler INSTANCE = new HttpClientRequestTracingHandler();
+    private static final Class<ChannelHandler> SSL_HANDLER;
 
-  static {
-    Class<?> sslHandler;
-    try {
-      // This class is in "netty-handler", so ignore if not present.
-      ClassLoader cl = HttpClientRequestTracingHandler.class.getClassLoader();
-      sslHandler = Class.forName("io.netty.handler.ssl.SslHandler", false, cl);
-    } catch (ClassNotFoundException e) {
-      sslHandler = null;
+    static {
+        Class<?> sslHandler;
+        try {
+            // This class is in "netty-handler", so ignore if not present.
+            ClassLoader cl = HttpClientRequestTracingHandler.class.getClassLoader();
+            sslHandler = Class.forName("io.netty.handler.ssl.SslHandler", false, cl);
+        } catch (ClassNotFoundException e) {
+            sslHandler = null;
+        }
+        SSL_HANDLER = (Class<ChannelHandler>) sslHandler;
     }
-    SSL_HANDLER = (Class<ChannelHandler>) sslHandler;
-  }
 
-  private static final boolean AWS_LEGACY_TRACING = Config.get().isAwsLegacyTracingEnabled();
+    private static final boolean AWS_LEGACY_TRACING = Config.get().isAwsLegacyTracingEnabled();
 
-  @Override
-  public void write(final ChannelHandlerContext ctx, final Object msg, final ChannelPromise prm) {
-    if (!(msg instanceof HttpRequest)) {
-      ctx.write(msg, prm);
-      return;
-    }
+    @Override
+    public void write(final ChannelHandlerContext ctx, final Object msg, final ChannelPromise prm) {
+        if (!(msg instanceof HttpRequest)) {
+            ctx.write(msg, prm);
+            return;
+        }
 
-    ContextScope parentScope = null;
-    final ContextContinuation continuation = takeConnectParentContinuation(ctx);
-    if (continuation != null) {
-      parentScope = continuation.resume();
-    }
+        ContextScope parentScope = null;
+        final ContextContinuation continuation = takeConnectParentContinuation(ctx);
+        if (continuation != null) {
+            parentScope = continuation.resume();
+        }
 
-    final HttpRequest request = (HttpRequest) msg;
-    boolean awsClientCall = request.headers().contains("amz-sdk-invocation-id");
-    if (!AWS_LEGACY_TRACING && awsClientCall) {
-      // avoid creating an extra HTTP client span beneath the AWS client call
-      try {
-        ctx.write(msg, prm);
-        return;
-      } finally {
-        if (null != parentScope) {
-          parentScope.close();
+        final HttpRequest request = (HttpRequest) msg;
+        boolean awsClientCall = request.headers().contains("amz-sdk-invocation-id");
+        if (!AWS_LEGACY_TRACING && awsClientCall) {
+            // avoid creating an extra HTTP client span beneath the AWS client call
+            try {
+                ctx.write(msg, prm);
+                return;
+            } finally {
+                if (null != parentScope) {
+                    parentScope.close();
+                }
+            }
         }
-      }
-    }
-    if (ctx.channel().parent() == null) {
-      ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY).set(activeSpan());
-    }
-    boolean isSecure = SSL_HANDLER != null && ctx.pipeline().get(SSL_HANDLER) != null;
-    NettyHttpClientDecorator decorate = isSecure ? DECORATE_SECURE : DECORATE;
+        if (ctx.channel().parent() == null) {
+            ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY).set(activeSpan());
+        }
+        boolean isSecure = SSL_HANDLER != null && ctx.pipeline().get(SSL_HANDLER) != null;
+        NettyHttpClientDecorator decorate = isSecure ? DECORATE_SECURE : DECORATE;
 
-    final AgentSpan span = startSpan(NETTY_CLIENT.toString(), NETTY_CLIENT_REQUEST);
-    final Context context = Context.current().with(span);
-    try (final ContextScope scope = activateSpan(span)) {
-      decorate.afterStart(span);
-      decorate.onRequest(span, request);
+        final AgentSpan span = startSpan(NETTY_CLIENT.toString(), NETTY_CLIENT_REQUEST);
+        final Context context = Context.current().with(span);
+        try (final ContextScope scope = activateSpan(span)) {
+            decorate.afterStart(span);
+            decorate.onRequest(span, request);
 
-      SocketAddress socketAddress = ctx.channel().remoteAddress();
-      if (socketAddress instanceof InetSocketAddress) {
-        decorate.onPeerConnection(span, (InetSocketAddress) socketAddress);
-      }
+            SocketAddress socketAddress = ctx.channel().remoteAddress();
+            if (socketAddress instanceof InetSocketAddress) {
+                decorate.onPeerConnection(span, (InetSocketAddress) socketAddress);
+            }
 
-      // AWS calls are often signed, so we can't add headers without breaking the signature.
-      if (!awsClientCall) {
-        DECORATE.injectContext(Context.current(), request.headers(), SETTER);
-      }
+            // AWS calls are often signed, so we can't add headers without breaking the signature.
+            if (!awsClientCall) {
+                DECORATE.injectContext(Context.current(), request.headers(), SETTER);
+            }
 
-      ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(context);
+            ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(context);
 
-      try {
-        ctx.write(msg, prm);
-      } catch (final Throwable throwable) {
-        decorate.onError(span, throwable);
-        decorate.beforeFinish(span);
-        span.finish();
-        throw throwable;
-      }
-    } finally {
-      if (null != parentScope) {
-        parentScope.close();
-      }
+            try {
+                ctx.write(msg, prm);
+            } catch (final Throwable throwable) {
+                decorate.onError(span, throwable);
+                decorate.beforeFinish(span);
+                span.finish();
+                throw throwable;
+            }
+        } finally {
+            if (null != parentScope) {
+                parentScope.close();
+            }
+        }
     }
-  }
 
-  private static ContextContinuation takeConnectParentContinuation(
-      final ChannelHandlerContext ctx) {
-    final Channel channel = ctx.channel();
-    ContextContinuation continuation =
-        channel.attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY).getAndRemove();
-    if (continuation == null && channel.parent() != null) {
-      continuation =
-          channel.parent().attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY).getAndRemove();
+    private static ContextContinuation takeConnectParentContinuation(final ChannelHandlerContext ctx) {
+        final Channel channel = ctx.channel();
+        ContextContinuation continuation =
+                channel.attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY).getAndRemove();
+        if (continuation == null && channel.parent() != null) {
+            continuation = channel.parent()
+                    .attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY)
+                    .getAndRemove();
+        }
+        return continuation;
     }
-    return continuation;
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java
index b80f967a3fb..230bf42670d 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java
@@ -19,97 +19,94 @@
 
 @ChannelHandler.Sharable
 public class HttpClientResponseTracingHandler extends ChannelInboundHandlerAdapter {
-  public static final HttpClientResponseTracingHandler INSTANCE =
-      new HttpClientResponseTracingHandler();
+    public static final HttpClientResponseTracingHandler INSTANCE = new HttpClientResponseTracingHandler();
 
-  @Override
-  public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
-    final Attribute<AgentSpan> parentAttr = ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY);
-    parentAttr.setIfAbsent(noopSpan());
-    final AgentSpan parent = parentAttr.get();
-    final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get();
-    final AgentSpan span = AgentSpan.fromContext(storedContext);
+    @Override
+    public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
+        final Attribute<AgentSpan> parentAttr = ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY);
+        parentAttr.setIfAbsent(noopSpan());
+        final AgentSpan parent = parentAttr.get();
+        final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get();
+        final AgentSpan span = AgentSpan.fromContext(storedContext);
 
-    // Set parent context back to maintain the same functionality as getAndSet(parent)
-    if (storedContext != null) {
-      ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(storedContext.with(parent));
-    }
-
-    if (span != null) {
-      final boolean finishSpan =
-          msg instanceof HttpResponse
-              && (!HttpResponseStatus.SWITCHING_PROTOCOLS.equals(((HttpResponse) msg).status())
-                  || "websocket"
-                      .equals(((HttpResponse) msg).headers().get(HttpHeaderNames.UPGRADE)));
-      if (finishSpan) {
-        try (final ContextScope scope = activateSpan(span)) {
-          DECORATE.onResponse(span, (HttpResponse) msg);
-          DECORATE.beforeFinish(span);
-          span.finish();
-        }
-      } else {
+        // Set parent context back to maintain the same functionality as getAndSet(parent)
         if (storedContext != null) {
-          ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(storedContext);
+            ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(storedContext.with(parent));
+        }
+
+        if (span != null) {
+            final boolean finishSpan = msg instanceof HttpResponse
+                    && (!HttpResponseStatus.SWITCHING_PROTOCOLS.equals(((HttpResponse) msg).status())
+                            || "websocket".equals(((HttpResponse) msg).headers().get(HttpHeaderNames.UPGRADE)));
+            if (finishSpan) {
+                try (final ContextScope scope = activateSpan(span)) {
+                    DECORATE.onResponse(span, (HttpResponse) msg);
+                    DECORATE.beforeFinish(span);
+                    span.finish();
+                }
+            } else {
+                if (storedContext != null) {
+                    ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(storedContext);
+                }
+            }
         }
-      }
-    }
 
-    // We want the callback in the scope of the parent, not the client span
-    try (final ContextScope scope = activateSpan(parent)) {
-      ctx.fireChannelRead(msg);
+        // We want the callback in the scope of the parent, not the client span
+        try (final ContextScope scope = activateSpan(parent)) {
+            ctx.fireChannelRead(msg);
+        }
     }
-  }
 
-  @Override
-  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-    final Attribute<AgentSpan> parentAttr = ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY);
-    parentAttr.setIfAbsent(noopSpan());
-    final AgentSpan parent = parentAttr.get();
-    final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get();
-    final AgentSpan span = AgentSpan.fromContext(storedContext);
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        final Attribute<AgentSpan> parentAttr = ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY);
+        parentAttr.setIfAbsent(noopSpan());
+        final AgentSpan parent = parentAttr.get();
+        final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get();
+        final AgentSpan span = AgentSpan.fromContext(storedContext);
 
-    // Set parent context back to maintain the same functionality as getAndSet(parent)
-    if (storedContext != null) {
-      ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(storedContext.with(parent));
-    }
+        // Set parent context back to maintain the same functionality as getAndSet(parent)
+        if (storedContext != null) {
+            ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(storedContext.with(parent));
+        }
 
-    if (span != null) {
-      // If an exception is passed to this point, it likely means it was unhandled and the
-      // client span won't be finished with a proper response, so we should finish the span here.
-      try (final ContextScope scope = activateSpan(span)) {
-        DECORATE.onError(span, cause);
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
-    }
-    // We want the callback in the scope of the parent, not the client span
-    try (final ContextScope scope = activateSpan(parent)) {
-      super.exceptionCaught(ctx, cause);
+        if (span != null) {
+            // If an exception is passed to this point, it likely means it was unhandled and the
+            // client span won't be finished with a proper response, so we should finish the span here.
+            try (final ContextScope scope = activateSpan(span)) {
+                DECORATE.onError(span, cause);
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
+        }
+        // We want the callback in the scope of the parent, not the client span
+        try (final ContextScope scope = activateSpan(parent)) {
+            super.exceptionCaught(ctx, cause);
+        }
     }
-  }
 
-  @Override
-  public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-    final Attribute<AgentSpan> parentAttr = ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY);
-    parentAttr.setIfAbsent(noopSpan());
-    final AgentSpan parent = parentAttr.get();
-    final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get();
-    final AgentSpan span = AgentSpan.fromContext(storedContext);
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        final Attribute<AgentSpan> parentAttr = ctx.channel().attr(CLIENT_PARENT_ATTRIBUTE_KEY);
+        parentAttr.setIfAbsent(noopSpan());
+        final AgentSpan parent = parentAttr.get();
+        final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get();
+        final AgentSpan span = AgentSpan.fromContext(storedContext);
 
-    // Set parent context back to maintain the same functionality  as getAndSet(parent)
-    if (storedContext != null) {
-      ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(storedContext.with(parent));
-    }
+        // Set parent context back to maintain the same functionality  as getAndSet(parent)
+        if (storedContext != null) {
+            ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(storedContext.with(parent));
+        }
 
-    if (span != null && span != parent) {
-      try (final ContextScope scope = activateSpan(span)) {
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
-    }
-    // We want the callback in the scope of the parent, not the client span
-    try (final ContextScope scope = activateSpan(parent)) {
-      super.channelInactive(ctx);
+        if (span != null && span != parent) {
+            try (final ContextScope scope = activateSpan(span)) {
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
+        }
+        // We want the callback in the scope of the parent, not the client span
+        try (final ContextScope scope = activateSpan(parent)) {
+            super.channelInactive(ctx);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientTracingHandler.java
index 87d7d86d202..6f86d2278de 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientTracingHandler.java
@@ -3,10 +3,9 @@
 import io.netty.channel.CombinedChannelDuplexHandler;
 
 public class HttpClientTracingHandler
-    extends CombinedChannelDuplexHandler<
-        HttpClientResponseTracingHandler, HttpClientRequestTracingHandler> {
+        extends CombinedChannelDuplexHandler<HttpClientResponseTracingHandler, HttpClientRequestTracingHandler> {
 
-  public HttpClientTracingHandler() {
-    super(HttpClientResponseTracingHandler.INSTANCE, HttpClientRequestTracingHandler.INSTANCE);
-  }
+    public HttpClientTracingHandler() {
+        super(HttpClientResponseTracingHandler.INSTANCE, HttpClientRequestTracingHandler.INSTANCE);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyHttpClientDecorator.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyHttpClientDecorator.java
index 3feefbc0021..647d5a22b72 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyHttpClientDecorator.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyHttpClientDecorator.java
@@ -13,60 +13,59 @@
 
 public class NettyHttpClientDecorator extends HttpClientDecorator<HttpRequest, HttpResponse> {
 
-  public static final CharSequence NETTY_CLIENT = UTF8BytesString.create("netty-client");
+    public static final CharSequence NETTY_CLIENT = UTF8BytesString.create("netty-client");
 
-  public static final NettyHttpClientDecorator DECORATE = new NettyHttpClientDecorator("http://");
-  public static final NettyHttpClientDecorator DECORATE_SECURE =
-      new NettyHttpClientDecorator("https://");
-  public static final CharSequence NETTY_CLIENT_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
+    public static final NettyHttpClientDecorator DECORATE = new NettyHttpClientDecorator("http://");
+    public static final NettyHttpClientDecorator DECORATE_SECURE = new NettyHttpClientDecorator("https://");
+    public static final CharSequence NETTY_CLIENT_REQUEST = UTF8BytesString.create(DECORATE.operationName());
 
-  private final String uriPrefix;
+    private final String uriPrefix;
 
-  public NettyHttpClientDecorator(String uriPrefix) {
-    this.uriPrefix = uriPrefix;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"netty", "netty-4.0"};
-  }
+    public NettyHttpClientDecorator(String uriPrefix) {
+        this.uriPrefix = uriPrefix;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return NETTY_CLIENT;
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"netty", "netty-4.0"};
+    }
 
-  @Override
-  protected String method(final HttpRequest httpRequest) {
-    return httpRequest.method().name();
-  }
+    @Override
+    protected CharSequence component() {
+        return NETTY_CLIENT;
+    }
 
-  @Override
-  protected URI url(final HttpRequest request) throws URISyntaxException {
-    if (request.method().equals(HttpMethod.CONNECT)) {
-      return URIUtils.safeParse(uriPrefix + request.uri());
+    @Override
+    protected String method(final HttpRequest httpRequest) {
+        return httpRequest.method().name();
     }
-    final URI uri = URIUtils.safeParse(request.uri());
-    if ((uri.getHost() == null || uri.getHost().equals("")) && request.headers().contains(HOST)) {
-      return URIUtils.safeParse(uriPrefix + request.headers().get(HOST) + request.uri());
-    } else {
-      return uri;
+
+    @Override
+    protected URI url(final HttpRequest request) throws URISyntaxException {
+        if (request.method().equals(HttpMethod.CONNECT)) {
+            return URIUtils.safeParse(uriPrefix + request.uri());
+        }
+        final URI uri = URIUtils.safeParse(request.uri());
+        if ((uri.getHost() == null || uri.getHost().equals(""))
+                && request.headers().contains(HOST)) {
+            return URIUtils.safeParse(uriPrefix + request.headers().get(HOST) + request.uri());
+        } else {
+            return uri;
+        }
     }
-  }
 
-  @Override
-  protected int status(final HttpResponse httpResponse) {
-    return httpResponse.status().code();
-  }
+    @Override
+    protected int status(final HttpResponse httpResponse) {
+        return httpResponse.status().code();
+    }
 
-  @Override
-  protected String getRequestHeader(HttpRequest request, String headerName) {
-    return request.headers().get(headerName);
-  }
+    @Override
+    protected String getRequestHeader(HttpRequest request, String headerName) {
+        return request.headers().get(headerName);
+    }
 
-  @Override
-  protected String getResponseHeader(HttpResponse response, String headerName) {
-    return response.headers().get(headerName);
-  }
+    @Override
+    protected String getResponseHeader(HttpResponse response, String headerName) {
+        return response.headers().get(headerName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyResponseInjectAdapter.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyResponseInjectAdapter.java
index e8c9b1e24fd..fccc154c995 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyResponseInjectAdapter.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyResponseInjectAdapter.java
@@ -7,10 +7,10 @@
 @ParametersAreNonnullByDefault
 public class NettyResponseInjectAdapter implements CarrierSetter<HttpHeaders> {
 
-  public static final NettyResponseInjectAdapter SETTER = new NettyResponseInjectAdapter();
+    public static final NettyResponseInjectAdapter SETTER = new NettyResponseInjectAdapter();
 
-  @Override
-  public void set(final HttpHeaders headers, final String key, final String value) {
-    headers.set(key, value);
-  }
+    @Override
+    public void set(final HttpHeaders headers, final String key, final String value) {
+        headers.set(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/BlockingResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/BlockingResponseHandler.java
index bb4c926db79..4d6e58d708d 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/BlockingResponseHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/BlockingResponseHandler.java
@@ -23,229 +23,209 @@
 import org.slf4j.LoggerFactory;
 
 public class BlockingResponseHandler extends ChannelInboundHandlerAdapter {
-  public static final Logger log = LoggerFactory.getLogger(BlockingResponseHandler.class);
-  static final String BEFORE_BLOCKING_HANDLER_NAME = "before_blocking_handler";
-  static final String HANDLER_NAME = "blocking_handler";
-  private static final String IGNORE_ALL_WRITES_HANDLER = "ignore_all_writes_handler";
-  private static final String MISSING_RESPONSE_TRACING_HANDLER_MESSAGE =
-      "Unable to block because HttpServerResponseTracingHandler was not found on the pipeline";
-  private static volatile boolean HAS_WARNED;
-
-  private final TraceSegment segment;
-  private final int statusCode;
-  private final BlockingContentType bct;
-  private final Map<String, String> extraHeaders;
-  private final String securityResponseId;
-  private final ServerRequestContext serverContext;
-
-  // Current callers are event-loop confined; volatile preserves visibility if
-  // commitBlockingResponse is invoked from another thread.
-  private volatile boolean hasBlockedAlready;
-
-  public BlockingResponseHandler(
-      TraceSegment segment,
-      int statusCode,
-      BlockingContentType bct,
-      Map<String, String> extraHeaders,
-      String securityResponseId,
-      ServerRequestContext serverContext) {
-    this.segment = segment;
-    this.statusCode = statusCode;
-    this.bct = bct;
-    this.extraHeaders = extraHeaders;
-    this.securityResponseId = securityResponseId;
-    this.serverContext = serverContext;
-  }
-
-  public BlockingResponseHandler(
-      TraceSegment segment,
-      Flow.Action.RequestBlockingAction rba,
-      ServerRequestContext serverContext) {
-    this.segment = segment;
-    this.statusCode = rba.getStatusCode();
-    this.bct = rba.getBlockingContentType();
-    this.extraHeaders = rba.getExtraHeaders();
-    this.securityResponseId = rba.getSecurityResponseId();
-    this.serverContext = serverContext;
-  }
-
-  @Override
-  public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
-    if (hasBlockedAlready) {
-      // we want to ignore any further data that the client might send
-      ReferenceCountUtil.release(msg);
-      return;
-    }
-    if (!(msg instanceof HttpRequest)) {
-      ctx.fireChannelRead(msg);
-      return;
-    }
+    public static final Logger log = LoggerFactory.getLogger(BlockingResponseHandler.class);
+    static final String BEFORE_BLOCKING_HANDLER_NAME = "before_blocking_handler";
+    static final String HANDLER_NAME = "blocking_handler";
+    private static final String IGNORE_ALL_WRITES_HANDLER = "ignore_all_writes_handler";
+    private static final String MISSING_RESPONSE_TRACING_HANDLER_MESSAGE =
+            "Unable to block because HttpServerResponseTracingHandler was not found on the pipeline";
+    private static volatile boolean HAS_WARNED;
 
-    HttpRequest request = (HttpRequest) msg;
-    if (!commitBlockingResponse(ctx, request.protocolVersion(), request.headers().get("accept"))) {
-      // Do not let a failed block intercept later requests on this keep-alive connection.
-      if (ctx.pipeline().get(BEFORE_BLOCKING_HANDLER_NAME) != null) {
-        ctx.pipeline().remove(BEFORE_BLOCKING_HANDLER_NAME);
-      }
-      ctx.pipeline().remove(this);
-      ctx.fireChannelRead(msg);
-      return;
+    private final TraceSegment segment;
+    private final int statusCode;
+    private final BlockingContentType bct;
+    private final Map<String, String> extraHeaders;
+    private final String securityResponseId;
+    private final ServerRequestContext serverContext;
+
+    // Current callers are event-loop confined; volatile preserves visibility if
+    // commitBlockingResponse is invoked from another thread.
+    private volatile boolean hasBlockedAlready;
+
+    public BlockingResponseHandler(
+            TraceSegment segment,
+            int statusCode,
+            BlockingContentType bct,
+            Map<String, String> extraHeaders,
+            String securityResponseId,
+            ServerRequestContext serverContext) {
+        this.segment = segment;
+        this.statusCode = statusCode;
+        this.bct = bct;
+        this.extraHeaders = extraHeaders;
+        this.securityResponseId = securityResponseId;
+        this.serverContext = serverContext;
     }
 
-    ReferenceCountUtil.release(msg);
-  }
-
-  boolean commitBlockingResponse(
-      final ChannelHandlerContext ctx,
-      final HttpVersion protocolVersion,
-      final String acceptHeader) {
-    ChannelHandlerContext ctxForDownstream =
-        ctx.pipeline().context(HttpServerResponseTracingHandler.class);
-    if (ctxForDownstream == null) {
-      ctxForDownstream = ctx.pipeline().context(HttpServerTracingHandler.class);
-    }
-    if (ctxForDownstream == null) {
-      logMissingResponseTracingHandler();
-      return false;
-    }
-    this.hasBlockedAlready = true;
-    ServerRequestContext.markRequestBlocked(ctx.channel());
-
-    PendingBlockResponse pendingBlockResponse =
-        new PendingBlockResponse(
-            segment,
-            statusCode,
-            bct,
-            extraHeaders,
-            securityResponseId,
-            protocolVersion,
-            acceptHeader);
-
-    if (serverContext != null
-        && ServerRequestContext.nextResponse(ctx.channel()) != serverContext) {
-      serverContext.deferBlockResponse(pendingBlockResponse);
-      return true;
+    public BlockingResponseHandler(
+            TraceSegment segment, Flow.Action.RequestBlockingAction rba, ServerRequestContext serverContext) {
+        this.segment = segment;
+        this.statusCode = rba.getStatusCode();
+        this.bct = rba.getBlockingContentType();
+        this.extraHeaders = rba.getExtraHeaders();
+        this.securityResponseId = rba.getSecurityResponseId();
+        this.serverContext = serverContext;
     }
 
-    writeBlockResponse(ctxForDownstream, pendingBlockResponse);
-    return true;
-  }
-
-  private static void logMissingResponseTracingHandler() {
-    if (HAS_WARNED) {
-      log.debug(MISSING_RESPONSE_TRACING_HANDLER_MESSAGE);
-    } else {
-      log.warn(MISSING_RESPONSE_TRACING_HANDLER_MESSAGE);
-      HAS_WARNED = true;
+    @Override
+    public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
+        if (hasBlockedAlready) {
+            // we want to ignore any further data that the client might send
+            ReferenceCountUtil.release(msg);
+            return;
+        }
+        if (!(msg instanceof HttpRequest)) {
+            ctx.fireChannelRead(msg);
+            return;
+        }
+
+        HttpRequest request = (HttpRequest) msg;
+        if (!commitBlockingResponse(
+                ctx, request.protocolVersion(), request.headers().get("accept"))) {
+            // Do not let a failed block intercept later requests on this keep-alive connection.
+            if (ctx.pipeline().get(BEFORE_BLOCKING_HANDLER_NAME) != null) {
+                ctx.pipeline().remove(BEFORE_BLOCKING_HANDLER_NAME);
+            }
+            ctx.pipeline().remove(this);
+            ctx.fireChannelRead(msg);
+            return;
+        }
+
+        ReferenceCountUtil.release(msg);
     }
-  }
 
-  static boolean maybeWriteDeferredBlockResponse(
-      ChannelHandlerContext ctx, ServerRequestContext serverContext) {
-    if (serverContext == null) {
-      return false;
+    boolean commitBlockingResponse(
+            final ChannelHandlerContext ctx, final HttpVersion protocolVersion, final String acceptHeader) {
+        ChannelHandlerContext ctxForDownstream = ctx.pipeline().context(HttpServerResponseTracingHandler.class);
+        if (ctxForDownstream == null) {
+            ctxForDownstream = ctx.pipeline().context(HttpServerTracingHandler.class);
+        }
+        if (ctxForDownstream == null) {
+            logMissingResponseTracingHandler();
+            return false;
+        }
+        this.hasBlockedAlready = true;
+        ServerRequestContext.markRequestBlocked(ctx.channel());
+
+        PendingBlockResponse pendingBlockResponse = new PendingBlockResponse(
+                segment, statusCode, bct, extraHeaders, securityResponseId, protocolVersion, acceptHeader);
+
+        if (serverContext != null && ServerRequestContext.nextResponse(ctx.channel()) != serverContext) {
+            serverContext.deferBlockResponse(pendingBlockResponse);
+            return true;
+        }
+
+        writeBlockResponse(ctxForDownstream, pendingBlockResponse);
+        return true;
     }
-    Object deferredBlockResponse = serverContext.deferredBlockResponse();
-    if (!(deferredBlockResponse instanceof PendingBlockResponse)) {
-      return false;
+
+    private static void logMissingResponseTracingHandler() {
+        if (HAS_WARNED) {
+            log.debug(MISSING_RESPONSE_TRACING_HANDLER_MESSAGE);
+        } else {
+            log.warn(MISSING_RESPONSE_TRACING_HANDLER_MESSAGE);
+            HAS_WARNED = true;
+        }
     }
-    serverContext.deferBlockResponse(null);
-    writeBlockResponse(ctx, (PendingBlockResponse) deferredBlockResponse);
-    return true;
-  }
-
-  private static void writeBlockResponse(
-      ChannelHandlerContext ctxForDownstream, PendingBlockResponse pendingBlockResponse) {
-    // write starts in the handler before the one associated with ctx
-    // so add one that will be skipped (but that will prevent any writes later coming from later
-    // handlers).
-    // We do not want to start from the end of the
-    // pipeline because there is an increased risk of hitting duplex handlers that
-    // expect to have seen a request before processing the response
-    if (ctxForDownstream.pipeline().get(IGNORE_ALL_WRITES_HANDLER) == null) {
-      ctxForDownstream
-          .pipeline()
-          .addAfter(
-              ctxForDownstream.name(), IGNORE_ALL_WRITES_HANDLER, IgnoreAllWritesHandler.INSTANCE);
+
+    static boolean maybeWriteDeferredBlockResponse(ChannelHandlerContext ctx, ServerRequestContext serverContext) {
+        if (serverContext == null) {
+            return false;
+        }
+        Object deferredBlockResponse = serverContext.deferredBlockResponse();
+        if (!(deferredBlockResponse instanceof PendingBlockResponse)) {
+            return false;
+        }
+        serverContext.deferBlockResponse(null);
+        writeBlockResponse(ctx, (PendingBlockResponse) deferredBlockResponse);
+        return true;
     }
-    ChannelHandlerContext writeContext =
-        ctxForDownstream.pipeline().context(IGNORE_ALL_WRITES_HANDLER);
-
-    writeContext
-        .writeAndFlush(pendingBlockResponse.toResponse())
-        .addListener(
-            fut -> {
-              if (!fut.isSuccess()) {
-                log.warn("Write of blocking response failed", fut.cause());
-              }
-              writeContext.channel().close();
-            });
-  }
 
-  private static class PendingBlockResponse {
-    private final TraceSegment segment;
-    private final int statusCode;
-    private final BlockingContentType bct;
-    private final Map<String, String> extraHeaders;
-    private final String securityResponseId;
-    private final HttpVersion protocolVersion;
-    private final String acceptHeader;
-
-    // Prevent the generation of BlockingResponseHandler$1 by making this constructor
-    // package-private to allow the BlockingResponseHandler to call this. This module emits Java 8
-    // bytecode, so it cannot use Java 11 nested access.
-    PendingBlockResponse(
-        TraceSegment segment,
-        int statusCode,
-        BlockingContentType bct,
-        Map<String, String> extraHeaders,
-        String securityResponseId,
-        HttpVersion protocolVersion,
-        String acceptHeader) {
-      this.segment = segment;
-      this.statusCode = statusCode;
-      this.bct = bct;
-      this.extraHeaders = extraHeaders;
-      this.securityResponseId = securityResponseId;
-      this.protocolVersion = protocolVersion;
-      this.acceptHeader = acceptHeader;
+    private static void writeBlockResponse(
+            ChannelHandlerContext ctxForDownstream, PendingBlockResponse pendingBlockResponse) {
+        // write starts in the handler before the one associated with ctx
+        // so add one that will be skipped (but that will prevent any writes later coming from later
+        // handlers).
+        // We do not want to start from the end of the
+        // pipeline because there is an increased risk of hitting duplex handlers that
+        // expect to have seen a request before processing the response
+        if (ctxForDownstream.pipeline().get(IGNORE_ALL_WRITES_HANDLER) == null) {
+            ctxForDownstream
+                    .pipeline()
+                    .addAfter(ctxForDownstream.name(), IGNORE_ALL_WRITES_HANDLER, IgnoreAllWritesHandler.INSTANCE);
+        }
+        ChannelHandlerContext writeContext = ctxForDownstream.pipeline().context(IGNORE_ALL_WRITES_HANDLER);
+
+        writeContext.writeAndFlush(pendingBlockResponse.toResponse()).addListener(fut -> {
+            if (!fut.isSuccess()) {
+                log.warn("Write of blocking response failed", fut.cause());
+            }
+            writeContext.channel().close();
+        });
     }
 
-    FullHttpResponse toResponse() {
-      int httpCode = BlockingActionHelper.getHttpCode(statusCode);
-      HttpResponseStatus httpResponseStatus = HttpResponseStatus.valueOf(httpCode);
-      FullHttpResponse response = new DefaultFullHttpResponse(protocolVersion, httpResponseStatus);
-
-      HttpHeaders headers = response.headers();
-      headers.set("Connection", "close");
-
-      for (Map.Entry<String, String> h : extraHeaders.entrySet()) {
-        headers.set(h.getKey(), h.getValue());
-      }
-
-      if (bct != BlockingContentType.NONE) {
-        BlockingActionHelper.TemplateType type =
-            BlockingActionHelper.determineTemplateType(bct, acceptHeader);
-        headers.set("Content-type", BlockingActionHelper.getContentType(type));
-
-        byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
-        HttpUtil.setContentLength(response, template.length);
-        response.content().writeBytes(template);
-      }
-      segment.effectivelyBlocked();
-      return response;
+    private static class PendingBlockResponse {
+        private final TraceSegment segment;
+        private final int statusCode;
+        private final BlockingContentType bct;
+        private final Map<String, String> extraHeaders;
+        private final String securityResponseId;
+        private final HttpVersion protocolVersion;
+        private final String acceptHeader;
+
+        // Prevent the generation of BlockingResponseHandler$1 by making this constructor
+        // package-private to allow the BlockingResponseHandler to call this. This module emits Java 8
+        // bytecode, so it cannot use Java 11 nested access.
+        PendingBlockResponse(
+                TraceSegment segment,
+                int statusCode,
+                BlockingContentType bct,
+                Map<String, String> extraHeaders,
+                String securityResponseId,
+                HttpVersion protocolVersion,
+                String acceptHeader) {
+            this.segment = segment;
+            this.statusCode = statusCode;
+            this.bct = bct;
+            this.extraHeaders = extraHeaders;
+            this.securityResponseId = securityResponseId;
+            this.protocolVersion = protocolVersion;
+            this.acceptHeader = acceptHeader;
+        }
+
+        FullHttpResponse toResponse() {
+            int httpCode = BlockingActionHelper.getHttpCode(statusCode);
+            HttpResponseStatus httpResponseStatus = HttpResponseStatus.valueOf(httpCode);
+            FullHttpResponse response = new DefaultFullHttpResponse(protocolVersion, httpResponseStatus);
+
+            HttpHeaders headers = response.headers();
+            headers.set("Connection", "close");
+
+            for (Map.Entry<String, String> h : extraHeaders.entrySet()) {
+                headers.set(h.getKey(), h.getValue());
+            }
+
+            if (bct != BlockingContentType.NONE) {
+                BlockingActionHelper.TemplateType type = BlockingActionHelper.determineTemplateType(bct, acceptHeader);
+                headers.set("Content-type", BlockingActionHelper.getContentType(type));
+
+                byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+                HttpUtil.setContentLength(response, template.length);
+                response.content().writeBytes(template);
+            }
+            segment.effectivelyBlocked();
+            return response;
+        }
     }
-  }
 
-  @ChannelHandler.Sharable
-  public static class IgnoreAllWritesHandler extends ChannelOutboundHandlerAdapter {
-    public static final IgnoreAllWritesHandler INSTANCE = new IgnoreAllWritesHandler();
+    @ChannelHandler.Sharable
+    public static class IgnoreAllWritesHandler extends ChannelOutboundHandlerAdapter {
+        public static final IgnoreAllWritesHandler INSTANCE = new IgnoreAllWritesHandler();
 
-    @Override
-    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
-        throws Exception {
-      log.info("Ignored write of object {}", msg);
-      ReferenceCountUtil.release(msg);
+        @Override
+        public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+            log.info("Ignored write of object {}", msg);
+            ReferenceCountUtil.release(msg);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerContextTrackingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerContextTrackingHandler.java
index fe529ffd000..79ffaf5e6be 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerContextTrackingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerContextTrackingHandler.java
@@ -11,15 +11,14 @@
 
 @ChannelHandler.Sharable
 public class HttpServerContextTrackingHandler extends ChannelInboundHandlerAdapter {
-  public static final HttpServerContextTrackingHandler INSTANCE =
-      new HttpServerContextTrackingHandler();
+    public static final HttpServerContextTrackingHandler INSTANCE = new HttpServerContextTrackingHandler();
 
-  @Override
-  public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
-    if (msg instanceof HttpRequest) {
-      final Context parentContext = DECORATE.extract(((HttpRequest) msg).headers());
-      ctx.channel().attr(PARENT_CONTEXT_ATTRIBUTE_KEY).set(parentContext);
+    @Override
+    public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
+        if (msg instanceof HttpRequest) {
+            final Context parentContext = DECORATE.extract(((HttpRequest) msg).headers());
+            ctx.channel().attr(PARENT_CONTEXT_ATTRIBUTE_KEY).set(parentContext);
+        }
+        ctx.fireChannelRead(msg);
     }
-    ctx.fireChannelRead(msg);
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java
index ddcc7cb7484..e1133705219 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java
@@ -19,120 +19,118 @@
 
 @ChannelHandler.Sharable
 public class HttpServerRequestTracingHandler extends ChannelInboundHandlerAdapter {
-  public static HttpServerRequestTracingHandler INSTANCE = new HttpServerRequestTracingHandler();
+    public static HttpServerRequestTracingHandler INSTANCE = new HttpServerRequestTracingHandler();
 
-  @Override
-  public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
-    Channel channel = ctx.channel();
-    if (!(msg instanceof HttpRequest)) {
-      final Context storedContext = channel.attr(CONTEXT_ATTRIBUTE_KEY).get();
-      if (storedContext == null) {
-        ctx.fireChannelRead(msg); // superclass does not throw
-      } else {
-        try (final ContextScope scope = storedContext.attach()) {
-          ctx.fireChannelRead(msg); // superclass does not throw
+    @Override
+    public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
+        Channel channel = ctx.channel();
+        if (!(msg instanceof HttpRequest)) {
+            final Context storedContext = channel.attr(CONTEXT_ATTRIBUTE_KEY).get();
+            if (storedContext == null) {
+                ctx.fireChannelRead(msg); // superclass does not throw
+            } else {
+                try (final ContextScope scope = storedContext.attach()) {
+                    ctx.fireChannelRead(msg); // superclass does not throw
+                }
+            }
+            return;
         }
-      }
-      return;
-    }
 
-    final HttpRequest request = (HttpRequest) msg;
-    if (ServerRequestContext.isRequestBlocked(channel)) {
-      // A deferred block keeps its handler in the pipeline while an earlier response completes.
-      // Forward later pipelined requests to that handler instead of adding another one.
-      ctx.fireChannelRead(msg);
-      return;
-    }
-    if (!ServerRequestContext.canTrackRequest(channel)) {
-      channel.attr(PARENT_CONTEXT_ATTRIBUTE_KEY).set(null);
-      ctx.fireChannelRead(msg);
-      return;
-    }
+        final HttpRequest request = (HttpRequest) msg;
+        if (ServerRequestContext.isRequestBlocked(channel)) {
+            // A deferred block keeps its handler in the pipeline while an earlier response completes.
+            // Forward later pipelined requests to that handler instead of adding another one.
+            ctx.fireChannelRead(msg);
+            return;
+        }
+        if (!ServerRequestContext.canTrackRequest(channel)) {
+            channel.attr(PARENT_CONTEXT_ATTRIBUTE_KEY).set(null);
+            ctx.fireChannelRead(msg);
+            return;
+        }
 
-    final HttpHeaders headers = request.headers();
-    final Context storedParentContext = channel.attr(PARENT_CONTEXT_ATTRIBUTE_KEY).getAndSet(null);
-    final Context parentContext =
-        storedParentContext != null ? storedParentContext : DECORATE.extract(headers);
-    final Context context = DECORATE.startSpan(headers, parentContext);
-    final ServerRequestContext serverContext =
-        ServerRequestContext.add(channel, context, headers.get("accept"));
+        final HttpHeaders headers = request.headers();
+        final Context storedParentContext =
+                channel.attr(PARENT_CONTEXT_ATTRIBUTE_KEY).getAndSet(null);
+        final Context parentContext = storedParentContext != null ? storedParentContext : DECORATE.extract(headers);
+        final Context context = DECORATE.startSpan(headers, parentContext);
+        final ServerRequestContext serverContext = ServerRequestContext.add(channel, context, headers.get("accept"));
 
-    try (final ContextScope ignored = context.attach()) {
-      final AgentSpan span = AgentSpan.fromContext(context);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, channel, request, parentContext);
+        try (final ContextScope ignored = context.attach()) {
+            final AgentSpan span = AgentSpan.fromContext(context);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, channel, request, parentContext);
 
-      Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
-      if (rba != null) {
-        ctx.pipeline()
-            .addAfter(
-                ctx.name(),
-                BlockingResponseHandler.HANDLER_NAME,
-                new BlockingResponseHandler(
-                    span.getRequestContext().getTraceSegment(), rba, serverContext));
-      }
+            Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
+            if (rba != null) {
+                ctx.pipeline()
+                        .addAfter(
+                                ctx.name(),
+                                BlockingResponseHandler.HANDLER_NAME,
+                                new BlockingResponseHandler(
+                                        span.getRequestContext().getTraceSegment(), rba, serverContext));
+            }
 
-      try {
-        ctx.fireChannelRead(msg);
-        /*
-        The handler chain started from 'fireChannelRead(msg)' will finish the span if successful
-        */
-      } catch (final Throwable throwable) {
-        /*
-        The handler chain failed with exception - need to finish the span here
-         */
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(ignored.context());
-        span.finish(); // Finish the span manually since finishSpanOnClose was false
-        ServerRequestContext.remove(ctx.channel(), serverContext);
-        throw throwable;
-      }
+            try {
+                ctx.fireChannelRead(msg);
+                /*
+                The handler chain started from 'fireChannelRead(msg)' will finish the span if successful
+                */
+            } catch (final Throwable throwable) {
+                /*
+                The handler chain failed with exception - need to finish the span here
+                 */
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(ignored.context());
+                span.finish(); // Finish the span manually since finishSpanOnClose was false
+                ServerRequestContext.remove(ctx.channel(), serverContext);
+                throw throwable;
+            }
+        }
     }
-  }
 
-  @Override
-  public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-    try {
-      super.channelInactive(ctx);
-    } finally {
-      try {
-        final Deque<ServerRequestContext> storedContexts =
-            ServerRequestContext.removeAll(ctx.channel());
-        if (storedContexts != null) {
-          ServerRequestContext storedContext;
-          while ((storedContext = storedContexts.pollFirst()) != null) {
-            if (storedContext.isResponseStarted()) {
-              finishSpanOnChannelClose(storedContext);
-            } else {
-              publishSpanOnChannelClose(storedContext.tracingContext());
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        try {
+            super.channelInactive(ctx);
+        } finally {
+            try {
+                final Deque<ServerRequestContext> storedContexts = ServerRequestContext.removeAll(ctx.channel());
+                if (storedContexts != null) {
+                    ServerRequestContext storedContext;
+                    while ((storedContext = storedContexts.pollFirst()) != null) {
+                        if (storedContext.isResponseStarted()) {
+                            finishSpanOnChannelClose(storedContext);
+                        } else {
+                            publishSpanOnChannelClose(storedContext.tracingContext());
+                        }
+                    }
+                }
+            } catch (final Throwable ignored) {
             }
-          }
         }
-      } catch (final Throwable ignored) {
-      }
     }
-  }
 
-  private static void finishSpanOnChannelClose(final ServerRequestContext serverContext) {
-    final Context storedContext = serverContext.tracingContext();
-    final AgentSpan span = AgentSpan.fromContext(storedContext);
-    if (span == null) {
-      return;
-    }
-    try (final ContextScope ignored = storedContext.attach()) {
-      if (!serverContext.isBeforeFinishCalled()) {
-        serverContext.markBeforeFinishCalled();
-        DECORATE.beforeFinish(storedContext);
-      }
-      span.finish();
+    private static void finishSpanOnChannelClose(final ServerRequestContext serverContext) {
+        final Context storedContext = serverContext.tracingContext();
+        final AgentSpan span = AgentSpan.fromContext(storedContext);
+        if (span == null) {
+            return;
+        }
+        try (final ContextScope ignored = storedContext.attach()) {
+            if (!serverContext.isBeforeFinishCalled()) {
+                serverContext.markBeforeFinishCalled();
+                DECORATE.beforeFinish(storedContext);
+            }
+            span.finish();
+        }
     }
-  }
 
-  private static void publishSpanOnChannelClose(final Context storedContext) {
-    final AgentSpan span = AgentSpan.fromContext(storedContext);
-    if (span != null && span.phasedFinish()) {
-      // At this point we can just publish this span to avoid losing the rest of the trace.
-      span.publish();
+    private static void publishSpanOnChannelClose(final Context storedContext) {
+        final AgentSpan span = AgentSpan.fromContext(storedContext);
+        if (span != null && span.phasedFinish()) {
+            // At this point we can just publish this span to avoid losing the rest of the trace.
+            span.publish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandler.java
index 342490dfc62..34438dfa217 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandler.java
@@ -22,138 +22,130 @@
 
 @ChannelHandler.Sharable
 public class HttpServerResponseTracingHandler extends ChannelOutboundHandlerAdapter {
-  public static HttpServerResponseTracingHandler INSTANCE = new HttpServerResponseTracingHandler();
+    public static HttpServerResponseTracingHandler INSTANCE = new HttpServerResponseTracingHandler();
 
-  @Override
-  public void write(final ChannelHandlerContext ctx, final Object msg, final ChannelPromise prm) {
-    final boolean isResponse = msg instanceof HttpResponse;
-    final boolean isLastContent = msg instanceof LastHttpContent;
-    if (!isResponse && !isLastContent) {
-      ctx.write(msg, prm);
-      return;
-    }
-
-    final ServerRequestContext serverContext = ServerRequestContext.nextResponse(ctx.channel());
-    if (!isResponse && serverContext != null && !serverContext.isResponseStarted()) {
-      ctx.write(msg, prm);
-      return;
-    }
+    @Override
+    public void write(final ChannelHandlerContext ctx, final Object msg, final ChannelPromise prm) {
+        final boolean isResponse = msg instanceof HttpResponse;
+        final boolean isLastContent = msg instanceof LastHttpContent;
+        if (!isResponse && !isLastContent) {
+            ctx.write(msg, prm);
+            return;
+        }
 
-    final Context storedContext =
-        serverContext == null
-            // HTTP/2 multiplex stream channels only inherit the mirrored context attribute from
-            // Http2MultiplexHandlerStreamChannelInstrumentation.PropagateContextAdvice, without a
-            // per-stream request queue.
-            ? ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get()
-            : serverContext.tracingContext();
-    final AgentSpan span = AgentSpan.fromContext(storedContext);
+        final ServerRequestContext serverContext = ServerRequestContext.nextResponse(ctx.channel());
+        if (!isResponse && serverContext != null && !serverContext.isResponseStarted()) {
+            ctx.write(msg, prm);
+            return;
+        }
 
-    if (span == null) {
-      ctx.write(msg, prm);
-      return;
-    }
+        final Context storedContext = serverContext == null
+                // HTTP/2 multiplex stream channels only inherit the mirrored context attribute from
+                // Http2MultiplexHandlerStreamChannelInstrumentation.PropagateContextAdvice, without a
+                // per-stream request queue.
+                ? ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get()
+                : serverContext.tracingContext();
+        final AgentSpan span = AgentSpan.fromContext(storedContext);
 
-    try (final ContextScope ignored = storedContext.attach()) {
-      final HttpResponse response = isResponse ? (HttpResponse) msg : null;
-      final boolean websocketUpgrade = response != null && isWebsocketUpgrade(response);
-      final boolean informationalResponse =
-          response != null && isInformationalResponse(response) && !websocketUpgrade;
-      final boolean finishResponseOnWrite = isLastContent && !informationalResponse;
-      final ChannelPromise writePromise =
-          finishResponseOnWrite && prm.isVoid() ? ctx.newPromise() : prm;
-      try {
-        if (response != null && !informationalResponse) {
-          onResponse(ctx, span, serverContext, response, websocketUpgrade);
+        if (span == null) {
+            ctx.write(msg, prm);
+            return;
         }
-        if (finishResponseOnWrite) {
-          removeServerContext(ctx, serverContext);
-          writePromise.addListener(
-              future -> finishSpan(serverContext, storedContext, span, future));
+
+        try (final ContextScope ignored = storedContext.attach()) {
+            final HttpResponse response = isResponse ? (HttpResponse) msg : null;
+            final boolean websocketUpgrade = response != null && isWebsocketUpgrade(response);
+            final boolean informationalResponse =
+                    response != null && isInformationalResponse(response) && !websocketUpgrade;
+            final boolean finishResponseOnWrite = isLastContent && !informationalResponse;
+            final ChannelPromise writePromise = finishResponseOnWrite && prm.isVoid() ? ctx.newPromise() : prm;
+            try {
+                if (response != null && !informationalResponse) {
+                    onResponse(ctx, span, serverContext, response, websocketUpgrade);
+                }
+                if (finishResponseOnWrite) {
+                    removeServerContext(ctx, serverContext);
+                    writePromise.addListener(future -> finishSpan(serverContext, storedContext, span, future));
+                }
+                ctx.write(msg, writePromise);
+                if (finishResponseOnWrite && (!writePromise.isDone() || writePromise.isSuccess())) {
+                    final ServerRequestContext nextResponse = ServerRequestContext.nextResponse(ctx.channel());
+                    BlockingResponseHandler.maybeWriteDeferredBlockResponse(ctx, nextResponse);
+                }
+            } catch (final Throwable throwable) {
+                if (!finishResponseOnWrite || !writePromise.isDone()) {
+                    DECORATE.onError(span, throwable);
+                    span.setHttpStatusCode(500);
+                    if (!finishResponseOnWrite) {
+                        removeServerContext(ctx, serverContext);
+                    }
+                    finishSpan(serverContext, storedContext, span);
+                }
+                throw throwable;
+            }
         }
-        ctx.write(msg, writePromise);
-        if (finishResponseOnWrite && (!writePromise.isDone() || writePromise.isSuccess())) {
-          final ServerRequestContext nextResponse =
-              ServerRequestContext.nextResponse(ctx.channel());
-          BlockingResponseHandler.maybeWriteDeferredBlockResponse(ctx, nextResponse);
+    }
+
+    private static void onResponse(
+            final ChannelHandlerContext ctx,
+            final AgentSpan span,
+            final ServerRequestContext serverContext,
+            final HttpResponse response,
+            final boolean websocketUpgrade) {
+        if (websocketUpgrade) {
+            ctx.channel()
+                    .attr(WEBSOCKET_SENDER_HANDLER_CONTEXT)
+                    .set(new HandlerContext.Sender(span, ctx.channel().id().asShortText()));
         }
-      } catch (final Throwable throwable) {
-        if (!finishResponseOnWrite || !writePromise.isDone()) {
-          DECORATE.onError(span, throwable);
-          span.setHttpStatusCode(500);
-          if (!finishResponseOnWrite) {
-            removeServerContext(ctx, serverContext);
-          }
-          finishSpan(serverContext, storedContext, span);
+        DECORATE.onResponse(span, response);
+        if (serverContext != null) {
+            serverContext.markResponseStarted();
         }
-        throw throwable;
-      }
     }
-  }
 
-  private static void onResponse(
-      final ChannelHandlerContext ctx,
-      final AgentSpan span,
-      final ServerRequestContext serverContext,
-      final HttpResponse response,
-      final boolean websocketUpgrade) {
-    if (websocketUpgrade) {
-      ctx.channel()
-          .attr(WEBSOCKET_SENDER_HANDLER_CONTEXT)
-          .set(new HandlerContext.Sender(span, ctx.channel().id().asShortText()));
-    }
-    DECORATE.onResponse(span, response);
-    if (serverContext != null) {
-      serverContext.markResponseStarted();
+    private static boolean isInformationalResponse(final HttpResponse response) {
+        final int statusCode = response.status().code();
+        return statusCode >= 100 && statusCode < 200;
     }
-  }
 
-  private static boolean isInformationalResponse(final HttpResponse response) {
-    final int statusCode = response.status().code();
-    return statusCode >= 100 && statusCode < 200;
-  }
-
-  private static boolean isWebsocketUpgrade(final HttpResponse response) {
-    return response.status().code() == HttpResponseStatus.SWITCHING_PROTOCOLS.code()
-        && response
-            .headers()
-            .containsValue(HttpHeaderNames.UPGRADE, HttpHeaderValues.WEBSOCKET, true);
-  }
+    private static boolean isWebsocketUpgrade(final HttpResponse response) {
+        return response.status().code() == HttpResponseStatus.SWITCHING_PROTOCOLS.code()
+                && response.headers().containsValue(HttpHeaderNames.UPGRADE, HttpHeaderValues.WEBSOCKET, true);
+    }
 
-  private static void finishSpan(
-      final ServerRequestContext serverContext,
-      final Context storedContext,
-      final AgentSpan span,
-      final Future<?> future) {
-    if (!future.isSuccess()) {
-      DECORATE.onError(span, future.cause());
+    private static void finishSpan(
+            final ServerRequestContext serverContext,
+            final Context storedContext,
+            final AgentSpan span,
+            final Future<?> future) {
+        if (!future.isSuccess()) {
+            DECORATE.onError(span, future.cause());
+        }
+        finishSpan(serverContext, storedContext, span);
     }
-    finishSpan(serverContext, storedContext, span);
-  }
 
-  private static void finishSpan(
-      final ServerRequestContext serverContext, final Context storedContext, final AgentSpan span) {
-    try (final ContextScope ignored = storedContext.attach()) {
-      beforeFinish(serverContext, storedContext);
-      span.finish(); // Finish the span manually since finishSpanOnClose was false
+    private static void finishSpan(
+            final ServerRequestContext serverContext, final Context storedContext, final AgentSpan span) {
+        try (final ContextScope ignored = storedContext.attach()) {
+            beforeFinish(serverContext, storedContext);
+            span.finish(); // Finish the span manually since finishSpanOnClose was false
+        }
     }
-  }
 
-  private static void beforeFinish(
-      final ServerRequestContext serverContext, final Context storedContext) {
-    if (serverContext == null || !serverContext.isBeforeFinishCalled()) {
-      if (serverContext != null) {
-        serverContext.markBeforeFinishCalled();
-      }
-      DECORATE.beforeFinish(storedContext);
+    private static void beforeFinish(final ServerRequestContext serverContext, final Context storedContext) {
+        if (serverContext == null || !serverContext.isBeforeFinishCalled()) {
+            if (serverContext != null) {
+                serverContext.markBeforeFinishCalled();
+            }
+            DECORATE.beforeFinish(storedContext);
+        }
     }
-  }
 
-  private static void removeServerContext(
-      final ChannelHandlerContext ctx, final ServerRequestContext serverContext) {
-    if (serverContext == null) {
-      ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(null);
-    } else {
-      ServerRequestContext.remove(ctx.channel(), serverContext);
+    private static void removeServerContext(final ChannelHandlerContext ctx, final ServerRequestContext serverContext) {
+        if (serverContext == null) {
+            ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).set(null);
+        } else {
+            ServerRequestContext.remove(ctx.channel(), serverContext);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerTracingHandler.java
index f426f86354d..ef1ada0bdb7 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerTracingHandler.java
@@ -3,10 +3,9 @@
 import io.netty.channel.CombinedChannelDuplexHandler;
 
 public class HttpServerTracingHandler
-    extends CombinedChannelDuplexHandler<
-        HttpServerRequestTracingHandler, HttpServerResponseTracingHandler> {
+        extends CombinedChannelDuplexHandler<HttpServerRequestTracingHandler, HttpServerResponseTracingHandler> {
 
-  public HttpServerTracingHandler() {
-    super(HttpServerRequestTracingHandler.INSTANCE, HttpServerResponseTracingHandler.INSTANCE);
-  }
+    public HttpServerTracingHandler() {
+        super(HttpServerRequestTracingHandler.INSTANCE, HttpServerResponseTracingHandler.INSTANCE);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/MaybeBlockResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/MaybeBlockResponseHandler.java
index 82bede8dcd1..758a5d0aaf9 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/MaybeBlockResponseHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/MaybeBlockResponseHandler.java
@@ -30,107 +30,98 @@
 
 @ChannelHandler.Sharable
 public class MaybeBlockResponseHandler extends ChannelOutboundHandlerAdapter {
-  public static final ChannelOutboundHandler INSTANCE = new MaybeBlockResponseHandler();
-  public static final Logger log = LoggerFactory.getLogger(MaybeBlockResponseHandler.class);
+    public static final ChannelOutboundHandler INSTANCE = new MaybeBlockResponseHandler();
+    public static final Logger log = LoggerFactory.getLogger(MaybeBlockResponseHandler.class);
 
-  private MaybeBlockResponseHandler() {}
+    private MaybeBlockResponseHandler() {}
 
-  @Override
-  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) throws Exception {
-    Channel channel = ctx.channel();
+    @Override
+    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) throws Exception {
+        Channel channel = ctx.channel();
 
-    if (ServerRequestContext.isResponseBlocked(channel)) {
-      // block further writes while the blocking response close is still asynchronous
-      log.debug("Write suppressed; dropped outbound message");
-      ReferenceCountUtil.release(msg);
-      prm.tryFailure(new ClosedChannelException());
-      return;
-    }
+        if (ServerRequestContext.isResponseBlocked(channel)) {
+            // block further writes while the blocking response close is still asynchronous
+            log.debug("Write suppressed; dropped outbound message");
+            ReferenceCountUtil.release(msg);
+            prm.tryFailure(new ClosedChannelException());
+            return;
+        }
 
-    ServerRequestContext serverContext = ServerRequestContext.nextResponse(channel);
-    Context storedContext =
-        serverContext == null
-            ? channel.attr(CONTEXT_ATTRIBUTE_KEY).get()
-            : serverContext.tracingContext();
-    AgentSpan span = AgentSpan.fromContext(storedContext);
-    RequestContext requestContext;
-    if (span == null || (requestContext = span.getRequestContext()) == null) {
-      super.write(ctx, msg, prm);
-      return;
-    }
+        ServerRequestContext serverContext = ServerRequestContext.nextResponse(channel);
+        Context storedContext =
+                serverContext == null ? channel.attr(CONTEXT_ATTRIBUTE_KEY).get() : serverContext.tracingContext();
+        AgentSpan span = AgentSpan.fromContext(storedContext);
+        RequestContext requestContext;
+        if (span == null || (requestContext = span.getRequestContext()) == null) {
+            super.write(ctx, msg, prm);
+            return;
+        }
 
-    if (serverContext != null && serverContext.isResponseAnalyzed()) {
-      super.write(ctx, msg, prm);
-      return;
-    }
+        if (serverContext != null && serverContext.isResponseAnalyzed()) {
+            super.write(ctx, msg, prm);
+            return;
+        }
 
-    if (!(msg instanceof HttpResponse)) {
-      super.write(ctx, msg, prm);
-      return;
-    }
-    HttpResponse origResponse = (HttpResponse) msg;
-    int statusCode = origResponse.status().code();
-    // Interim 1xx responses (e.g. 100 Continue, 103 Early Hints) precede the final response.
-    // Analyzing one here would consume the one-shot response analysis before the final response is
-    // written, so its status and headers would never be inspected. Switching Protocols (101) is
-    // terminal, so it is still analyzed.
-    if (statusCode >= 100
-        && statusCode < 200
-        && statusCode != HttpResponseStatus.SWITCHING_PROTOCOLS.code()) {
-      super.write(ctx, msg, prm);
-      return;
-    }
+        if (!(msg instanceof HttpResponse)) {
+            super.write(ctx, msg, prm);
+            return;
+        }
+        HttpResponse origResponse = (HttpResponse) msg;
+        int statusCode = origResponse.status().code();
+        // Interim 1xx responses (e.g. 100 Continue, 103 Early Hints) precede the final response.
+        // Analyzing one here would consume the one-shot response analysis before the final response is
+        // written, so its status and headers would never be inspected. Switching Protocols (101) is
+        // terminal, so it is still analyzed.
+        if (statusCode >= 100 && statusCode < 200 && statusCode != HttpResponseStatus.SWITCHING_PROTOCOLS.code()) {
+            super.write(ctx, msg, prm);
+            return;
+        }
 
-    Flow<Void> flow =
-        DECORATE.callIGCallbackResponseAndHeaders(
-            span, origResponse, statusCode, ResponseExtractAdapter.GETTER);
-    if (serverContext != null) {
-      serverContext.markResponseAnalyzed();
-    }
-    Flow.Action action = flow.getAction();
-    if (!(action instanceof Flow.Action.RequestBlockingAction)) {
-      super.write(ctx, msg, prm);
-      return;
-    }
+        Flow<Void> flow = DECORATE.callIGCallbackResponseAndHeaders(
+                span, origResponse, statusCode, ResponseExtractAdapter.GETTER);
+        if (serverContext != null) {
+            serverContext.markResponseAnalyzed();
+        }
+        Flow.Action action = flow.getAction();
+        if (!(action instanceof Flow.Action.RequestBlockingAction)) {
+            super.write(ctx, msg, prm);
+            return;
+        }
 
-    ServerRequestContext.markResponseBlocked(channel);
-    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-    int httpCode = BlockingActionHelper.getHttpCode(rba.getStatusCode());
-    HttpResponseStatus httpResponseStatus = HttpResponseStatus.valueOf(httpCode);
-    FullHttpResponse response =
-        new DefaultFullHttpResponse(origResponse.getProtocolVersion(), httpResponseStatus);
-    ReferenceCountUtil.release(msg);
+        ServerRequestContext.markResponseBlocked(channel);
+        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+        int httpCode = BlockingActionHelper.getHttpCode(rba.getStatusCode());
+        HttpResponseStatus httpResponseStatus = HttpResponseStatus.valueOf(httpCode);
+        FullHttpResponse response = new DefaultFullHttpResponse(origResponse.getProtocolVersion(), httpResponseStatus);
+        ReferenceCountUtil.release(msg);
 
-    HttpHeaders headers = response.headers();
-    headers.set("Connection", "close");
+        HttpHeaders headers = response.headers();
+        headers.set("Connection", "close");
 
-    for (Map.Entry<String, String> h : rba.getExtraHeaders().entrySet()) {
-      headers.set(h.getKey(), h.getValue());
-    }
+        for (Map.Entry<String, String> h : rba.getExtraHeaders().entrySet()) {
+            headers.set(h.getKey(), h.getValue());
+        }
 
-    BlockingContentType bct = rba.getBlockingContentType();
-    if (bct != BlockingContentType.NONE) {
-      BlockingActionHelper.TemplateType type =
-          BlockingActionHelper.determineTemplateType(
-              bct, serverContext == null ? null : serverContext.acceptHeader());
-      headers.set("Content-type", BlockingActionHelper.getContentType(type));
-      byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
-      setContentLength(response, template.length);
-      response.content().writeBytes(template);
-    }
+        BlockingContentType bct = rba.getBlockingContentType();
+        if (bct != BlockingContentType.NONE) {
+            BlockingActionHelper.TemplateType type = BlockingActionHelper.determineTemplateType(
+                    bct, serverContext == null ? null : serverContext.acceptHeader());
+            headers.set("Content-type", BlockingActionHelper.getContentType(type));
+            byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
+            setContentLength(response, template.length);
+            response.content().writeBytes(template);
+        }
 
-    requestContext.getTraceSegment().effectivelyBlocked();
-    log.debug("About to write and flush blocking response {}", response);
-    ctx.writeAndFlush(response, prm)
-        .addListener(
-            fut -> {
-              if (!fut.isSuccess()) {
+        requestContext.getTraceSegment().effectivelyBlocked();
+        log.debug("About to write and flush blocking response {}", response);
+        ctx.writeAndFlush(response, prm).addListener(fut -> {
+            if (!fut.isSuccess()) {
                 // known gap: this failure is not reported to AppSec block-failure telemetry
                 log.warn("Write of blocking response failed", fut.cause());
-              } else {
+            } else {
                 log.debug("Write of blocking response succeeded");
-              }
-              channel.close();
-            });
-  }
+            }
+            channel.close();
+        });
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/NettyHttpServerDecorator.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/NettyHttpServerDecorator.java
index b513ef8dc0e..44bb2ab35d7 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/NettyHttpServerDecorator.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/NettyHttpServerDecorator.java
@@ -28,251 +28,232 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class NettyHttpServerDecorator
-    extends HttpServerDecorator<HttpRequest, Channel, HttpResponse, HttpHeaders> {
-  public static final CharSequence NETTY = UTF8BytesString.create("netty");
-  public static final CharSequence NETTY_CONNECT = UTF8BytesString.create("netty.connect");
+public class NettyHttpServerDecorator extends HttpServerDecorator<HttpRequest, Channel, HttpResponse, HttpHeaders> {
+    public static final CharSequence NETTY = UTF8BytesString.create("netty");
+    public static final CharSequence NETTY_CONNECT = UTF8BytesString.create("netty.connect");
 
-  public static final NettyHttpServerDecorator DECORATE = new NettyHttpServerDecorator();
-  private static final CharSequence NETTY_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-  private static final String NETTY_NATIVE_IO_EXCEPTION_CLASS_NAME =
-      "io.netty.channel.unix.Errors$NativeIoException";
-  private static final String NETTY_NATIVE_WRITEV_ADDRESSES_FAILURE_PREFIX =
-      "writevAddresses(..) failed";
-  private static final String NETTY_NATIVE_WRITEV_SYSCALL_FAILURE_PREFIX =
-      "syscall:writev(..) failed";
-  private static final String BROKEN_PIPE_MESSAGE_SUFFIX = ": Broken pipe";
-  private static final String CONNECTION_RESET_MESSAGE_SUFFIX = ": Connection reset by peer";
+    public static final NettyHttpServerDecorator DECORATE = new NettyHttpServerDecorator();
+    private static final CharSequence NETTY_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+    private static final String NETTY_NATIVE_IO_EXCEPTION_CLASS_NAME = "io.netty.channel.unix.Errors$NativeIoException";
+    private static final String NETTY_NATIVE_WRITEV_ADDRESSES_FAILURE_PREFIX = "writevAddresses(..) failed";
+    private static final String NETTY_NATIVE_WRITEV_SYSCALL_FAILURE_PREFIX = "syscall:writev(..) failed";
+    private static final String BROKEN_PIPE_MESSAGE_SUFFIX = ": Broken pipe";
+    private static final String CONNECTION_RESET_MESSAGE_SUFFIX = ": Connection reset by peer";
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"netty", "netty-4.0"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"netty", "netty-4.0"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return NETTY;
-  }
+    @Override
+    protected CharSequence component() {
+        return NETTY;
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpHeaders> getter() {
-    return ContextVisitors.stringValuesEntrySet();
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpHeaders> getter() {
+        return ContextVisitors.stringValuesEntrySet();
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
-    return ResponseExtractAdapter.GETTER;
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
+        return ResponseExtractAdapter.GETTER;
+    }
 
-  @Override
-  public CharSequence spanName() {
-    return NETTY_REQUEST;
-  }
+    @Override
+    public CharSequence spanName() {
+        return NETTY_REQUEST;
+    }
 
-  @Override
-  protected String method(final HttpRequest httpRequest) {
-    return httpRequest.method().name();
-  }
+    @Override
+    protected String method(final HttpRequest httpRequest) {
+        return httpRequest.method().name();
+    }
 
-  @Override
-  protected URIDataAdapter url(final HttpRequest request) {
-    return URIDataAdapterBase.fromURI(
-        request.getUri(),
-        uri -> {
-          if ((uri.getHost() == null || uri.getHost().equals(""))
-              && request.headers().contains(HttpHeaders.Names.HOST)) {
-            return URIDataAdapterBase.fromURI(
-                "http://" + request.headers().get(HttpHeaders.Names.HOST) + request.getUri(),
-                URIDefaultDataAdapter::new);
-          }
-          return new URIDefaultDataAdapter(uri);
+    @Override
+    protected URIDataAdapter url(final HttpRequest request) {
+        return URIDataAdapterBase.fromURI(request.getUri(), uri -> {
+            if ((uri.getHost() == null || uri.getHost().equals(""))
+                    && request.headers().contains(HttpHeaders.Names.HOST)) {
+                return URIDataAdapterBase.fromURI(
+                        "http://" + request.headers().get(HttpHeaders.Names.HOST) + request.getUri(),
+                        URIDefaultDataAdapter::new);
+            }
+            return new URIDefaultDataAdapter(uri);
         });
-  }
-
-  @Override
-  protected String peerHostIP(final Channel channel) {
-    final SocketAddress socketAddress = channel.remoteAddress();
-    if (socketAddress instanceof InetSocketAddress) {
-      return ((InetSocketAddress) socketAddress).getAddress().getHostAddress();
     }
-    return null;
-  }
 
-  @Override
-  protected int peerPort(final Channel channel) {
-    final SocketAddress socketAddress = channel.remoteAddress();
-    if (socketAddress instanceof InetSocketAddress) {
-      return ((InetSocketAddress) socketAddress).getPort();
+    @Override
+    protected String peerHostIP(final Channel channel) {
+        final SocketAddress socketAddress = channel.remoteAddress();
+        if (socketAddress instanceof InetSocketAddress) {
+            return ((InetSocketAddress) socketAddress).getAddress().getHostAddress();
+        }
+        return null;
     }
-    return 0;
-  }
 
-  @Override
-  protected int status(final HttpResponse httpResponse) {
-    return httpResponse.status().code();
-  }
+    @Override
+    protected int peerPort(final Channel channel) {
+        final SocketAddress socketAddress = channel.remoteAddress();
+        if (socketAddress instanceof InetSocketAddress) {
+            return ((InetSocketAddress) socketAddress).getPort();
+        }
+        return 0;
+    }
 
-  @Override
-  protected boolean isAppSecOnResponseSeparate() {
-    return true;
-  }
+    @Override
+    protected int status(final HttpResponse httpResponse) {
+        return httpResponse.status().code();
+    }
 
-  @Override
-  protected void doOnError(final AgentSpan span, final Throwable throwable, byte errorPriority) {
-    if (isNettyNativeClientAbort(throwable)) {
-      span.setTag(DDTags.ERROR_MSG, safeMessage(throwable));
-      span.setTag(DDTags.ERROR_TYPE, throwable.getClass().getName());
-      return;
+    @Override
+    protected boolean isAppSecOnResponseSeparate() {
+        return true;
     }
-    super.doOnError(span, throwable, errorPriority);
-  }
 
-  private static boolean isNettyNativeClientAbort(final Throwable throwable) {
-    if (throwable == null
-        || !NETTY_NATIVE_IO_EXCEPTION_CLASS_NAME.equals(throwable.getClass().getName())) {
-      return false;
+    @Override
+    protected void doOnError(final AgentSpan span, final Throwable throwable, byte errorPriority) {
+        if (isNettyNativeClientAbort(throwable)) {
+            span.setTag(DDTags.ERROR_MSG, safeMessage(throwable));
+            span.setTag(DDTags.ERROR_TYPE, throwable.getClass().getName());
+            return;
+        }
+        super.doOnError(span, throwable, errorPriority);
     }
-    final String message = safeMessage(throwable);
-    return message != null
-        && (message.startsWith(NETTY_NATIVE_WRITEV_ADDRESSES_FAILURE_PREFIX)
-            || message.startsWith(NETTY_NATIVE_WRITEV_SYSCALL_FAILURE_PREFIX))
-        && (message.endsWith(BROKEN_PIPE_MESSAGE_SUFFIX)
-            || message.endsWith(CONNECTION_RESET_MESSAGE_SUFFIX));
-  }
 
-  private static String safeMessage(final Throwable throwable) {
-    try {
-      return throwable.getMessage();
-    } catch (Throwable ignored) {
-      return null;
+    private static boolean isNettyNativeClientAbort(final Throwable throwable) {
+        if (throwable == null
+                || !NETTY_NATIVE_IO_EXCEPTION_CLASS_NAME.equals(
+                        throwable.getClass().getName())) {
+            return false;
+        }
+        final String message = safeMessage(throwable);
+        return message != null
+                && (message.startsWith(NETTY_NATIVE_WRITEV_ADDRESSES_FAILURE_PREFIX)
+                        || message.startsWith(NETTY_NATIVE_WRITEV_SYSCALL_FAILURE_PREFIX))
+                && (message.endsWith(BROKEN_PIPE_MESSAGE_SUFFIX) || message.endsWith(CONNECTION_RESET_MESSAGE_SUFFIX));
     }
-  }
 
-  @Override
-  protected BlockResponseFunction createBlockResponseFunction(
-      HttpRequest httpRequest, Channel channel) {
-    return new NettyBlockResponseFunction(
-        channel.pipeline(), httpRequest, ServerRequestContext.currentRequest(channel));
-  }
+    private static String safeMessage(final Throwable throwable) {
+        try {
+            return throwable.getMessage();
+        } catch (Throwable ignored) {
+            return null;
+        }
+    }
 
-  public static class NettyBlockResponseFunction implements BlockResponseFunction {
-    public static final Logger log = LoggerFactory.getLogger(NettyBlockResponseFunction.class);
+    @Override
+    protected BlockResponseFunction createBlockResponseFunction(HttpRequest httpRequest, Channel channel) {
+        return new NettyBlockResponseFunction(
+                channel.pipeline(), httpRequest, ServerRequestContext.currentRequest(channel));
+    }
 
-    private final ChannelPipeline pipeline;
-    private final HttpVersion protocolVersion;
-    private final String acceptHeader;
-    private final ServerRequestContext serverContext;
-    private volatile boolean blockingResponseInitiated;
+    public static class NettyBlockResponseFunction implements BlockResponseFunction {
+        public static final Logger log = LoggerFactory.getLogger(NettyBlockResponseFunction.class);
 
-    public NettyBlockResponseFunction(
-        ChannelPipeline pipeline,
-        HttpRequest httpRequestMessage,
-        ServerRequestContext serverContext) {
-      this.pipeline = pipeline;
-      this.protocolVersion = httpRequestMessage.protocolVersion();
-      this.acceptHeader = httpRequestMessage.headers().get("accept");
-      this.serverContext = serverContext;
-    }
+        private final ChannelPipeline pipeline;
+        private final HttpVersion protocolVersion;
+        private final String acceptHeader;
+        private final ServerRequestContext serverContext;
+        private volatile boolean blockingResponseInitiated;
 
-    @Override
-    public boolean tryCommitBlockingResponse(
-        TraceSegment segment,
-        int statusCode,
-        BlockingContentType templateType,
-        Map<String, String> extraHeaders,
-        String securityResponseId) {
-      // A single request can trigger multiple blocking evaluations (e.g. one per multipart
-      // chunk). Once a block has already been initiated, the response queue entry backing
-      // isPending() may have already been consumed by that earlier, successful commit — treat
-      // later calls as already handled rather than re-evaluating and reporting a spurious
-      // block_failure for a block that actually succeeded.
-      if (blockingResponseInitiated) {
-        return true;
-      }
-      if (pipeline.channel().eventLoop().inEventLoop()) {
-        boolean committed =
-            commitBlockingResponse(
-                segment, statusCode, templateType, extraHeaders, securityResponseId);
-        if (committed) {
-          blockingResponseInitiated = true;
+        public NettyBlockResponseFunction(
+                ChannelPipeline pipeline, HttpRequest httpRequestMessage, ServerRequestContext serverContext) {
+            this.pipeline = pipeline;
+            this.protocolVersion = httpRequestMessage.protocolVersion();
+            this.acceptHeader = httpRequestMessage.headers().get("accept");
+            this.serverContext = serverContext;
         }
-        return committed;
-      }
 
-      try {
-        pipeline
-            .channel()
-            .eventLoop()
-            .execute(
-                () -> {
-                  if (commitBlockingResponse(
-                      segment, statusCode, templateType, extraHeaders, securityResponseId)) {
+        @Override
+        public boolean tryCommitBlockingResponse(
+                TraceSegment segment,
+                int statusCode,
+                BlockingContentType templateType,
+                Map<String, String> extraHeaders,
+                String securityResponseId) {
+            // A single request can trigger multiple blocking evaluations (e.g. one per multipart
+            // chunk). Once a block has already been initiated, the response queue entry backing
+            // isPending() may have already been consumed by that earlier, successful commit — treat
+            // later calls as already handled rather than re-evaluating and reporting a spurious
+            // block_failure for a block that actually succeeded.
+            if (blockingResponseInitiated) {
+                return true;
+            }
+            if (pipeline.channel().eventLoop().inEventLoop()) {
+                boolean committed =
+                        commitBlockingResponse(segment, statusCode, templateType, extraHeaders, securityResponseId);
+                if (committed) {
                     blockingResponseInitiated = true;
-                  }
+                }
+                return committed;
+            }
+
+            try {
+                pipeline.channel().eventLoop().execute(() -> {
+                    if (commitBlockingResponse(segment, statusCode, templateType, extraHeaders, securityResponseId)) {
+                        blockingResponseInitiated = true;
+                    }
                 });
-        return true;
-      } catch (RuntimeException rte) {
-        log.warn("Failed scheduling blocking handler", rte);
-        return false;
-      }
-    }
+                return true;
+            } catch (RuntimeException rte) {
+                log.warn("Failed scheduling blocking handler", rte);
+                return false;
+            }
+        }
 
-    private boolean commitBlockingResponse(
-        TraceSegment segment,
-        int statusCode,
-        BlockingContentType templateType,
-        Map<String, String> extraHeaders,
-        String securityResponseId) {
-      if (serverContext != null
-          && !ServerRequestContext.isPending(pipeline.channel(), serverContext)) {
-        return false;
-      }
+        private boolean commitBlockingResponse(
+                TraceSegment segment,
+                int statusCode,
+                BlockingContentType templateType,
+                Map<String, String> extraHeaders,
+                String securityResponseId) {
+            if (serverContext != null && !ServerRequestContext.isPending(pipeline.channel(), serverContext)) {
+                return false;
+            }
 
-      ChannelHandler handlerBefore = pipeline.get(HttpServerTracingHandler.class);
-      if (handlerBefore == null) {
-        handlerBefore = pipeline.get(HttpServerRequestTracingHandler.class);
-        if (handlerBefore == null) {
-          log.warn(
-              "Can't block without an HttpServerTracingHandler or HttpServerRequestTracingHandler in the pipeline");
-          return false;
-        }
-      }
+            ChannelHandler handlerBefore = pipeline.get(HttpServerTracingHandler.class);
+            if (handlerBefore == null) {
+                handlerBefore = pipeline.get(HttpServerRequestTracingHandler.class);
+                if (handlerBefore == null) {
+                    log.warn(
+                            "Can't block without an HttpServerTracingHandler or HttpServerRequestTracingHandler in the pipeline");
+                    return false;
+                }
+            }
 
-      BlockingResponseHandler blockingHandler =
-          new BlockingResponseHandler(
-              segment, statusCode, templateType, extraHeaders, securityResponseId, serverContext);
-      ChannelInboundHandlerAdapter beforeBlockingHandler = new ChannelInboundHandlerAdapter();
-      try {
-        pipeline
-            .addAfter(
-                pipeline.context(handlerBefore).name(),
-                BlockingResponseHandler.BEFORE_BLOCKING_HANDLER_NAME,
-                beforeBlockingHandler)
-            .addAfter(
-                BlockingResponseHandler.BEFORE_BLOCKING_HANDLER_NAME,
-                BlockingResponseHandler.HANDLER_NAME,
-                blockingHandler);
-      } catch (RuntimeException rte) {
-        removeHandlerIfPresent(beforeBlockingHandler);
-        removeHandlerIfPresent(blockingHandler);
-        log.warn("Failed adding blocking handler", rte);
-        return false;
-      }
+            BlockingResponseHandler blockingHandler = new BlockingResponseHandler(
+                    segment, statusCode, templateType, extraHeaders, securityResponseId, serverContext);
+            ChannelInboundHandlerAdapter beforeBlockingHandler = new ChannelInboundHandlerAdapter();
+            try {
+                pipeline.addAfter(
+                                pipeline.context(handlerBefore).name(),
+                                BlockingResponseHandler.BEFORE_BLOCKING_HANDLER_NAME,
+                                beforeBlockingHandler)
+                        .addAfter(
+                                BlockingResponseHandler.BEFORE_BLOCKING_HANDLER_NAME,
+                                BlockingResponseHandler.HANDLER_NAME,
+                                blockingHandler);
+            } catch (RuntimeException rte) {
+                removeHandlerIfPresent(beforeBlockingHandler);
+                removeHandlerIfPresent(blockingHandler);
+                log.warn("Failed adding blocking handler", rte);
+                return false;
+            }
 
-      ChannelHandlerContext context = pipeline.context(BlockingResponseHandler.HANDLER_NAME);
-      if (blockingHandler.commitBlockingResponse(context, protocolVersion, acceptHeader)) {
-        return true;
-      }
-      removeHandlerIfPresent(beforeBlockingHandler);
-      removeHandlerIfPresent(blockingHandler);
-      return false;
-    }
+            ChannelHandlerContext context = pipeline.context(BlockingResponseHandler.HANDLER_NAME);
+            if (blockingHandler.commitBlockingResponse(context, protocolVersion, acceptHeader)) {
+                return true;
+            }
+            removeHandlerIfPresent(beforeBlockingHandler);
+            removeHandlerIfPresent(blockingHandler);
+            return false;
+        }
 
-    private void removeHandlerIfPresent(ChannelHandler handler) {
-      if (pipeline.context(handler) != null) {
-        pipeline.remove(handler);
-      }
+        private void removeHandlerIfPresent(ChannelHandler handler) {
+            if (pipeline.context(handler) != null) {
+                pipeline.remove(handler);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/ResponseExtractAdapter.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/ResponseExtractAdapter.java
index f895560e13d..3d234536b01 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/ResponseExtractAdapter.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/ResponseExtractAdapter.java
@@ -5,10 +5,10 @@
 import io.netty.handler.codec.http.HttpResponse;
 
 public class ResponseExtractAdapter implements AgentPropagation.ContextVisitor<HttpResponse> {
-  public static final ResponseExtractAdapter GETTER = new ResponseExtractAdapter();
+    public static final ResponseExtractAdapter GETTER = new ResponseExtractAdapter();
 
-  @Override
-  public void forEachKey(HttpResponse carrier, AgentPropagation.KeyClassifier classifier) {
-    ContextVisitors.stringValuesEntrySet().forEachKey(carrier.headers(), classifier);
-  }
+    @Override
+    public void forEachKey(HttpResponse carrier, AgentPropagation.KeyClassifier classifier) {
+        ContextVisitors.stringValuesEntrySet().forEachKey(carrier.headers(), classifier);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java
index d64cf3f39b3..1fe90c0ec8d 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java
@@ -21,106 +21,98 @@
 
 @ChannelHandler.Sharable
 public class WebSocketServerInboundTracingHandler extends ChannelInboundHandlerAdapter {
-  public static WebSocketServerInboundTracingHandler INSTANCE =
-      new WebSocketServerInboundTracingHandler();
+    public static WebSocketServerInboundTracingHandler INSTANCE = new WebSocketServerInboundTracingHandler();
 
-  @Override
-  public void channelRead(ChannelHandlerContext ctx, Object frame) {
-    if (frame instanceof WebSocketFrame) {
-      Channel channel = ctx.channel();
-      HandlerContext.Receiver receiverContext =
-          channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).get();
-      if (receiverContext == null) {
-        HandlerContext.Sender sessionState = channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).get();
-        if (sessionState != null) {
-          receiverContext =
-              new HandlerContext.Receiver(
-                  sessionState.getHandshakeSpan(), channel.id().asShortText());
-          channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).set(receiverContext);
-        }
-      }
-      if (receiverContext != null) {
-        if (frame instanceof TextWebSocketFrame) {
-          // WebSocket Read Text Start
-          TextWebSocketFrame textFrame = (TextWebSocketFrame) frame;
-
-          final AgentSpan span =
-              DECORATE.startInboundFrameSpan(
-                  receiverContext, textFrame.text(), textFrame.isFinalFragment());
-          try (final ContextScope scope = activateSpan(span)) {
-            ctx.fireChannelRead(textFrame);
-            // WebSocket Read Text Start
-          } finally {
-            if (textFrame.isFinalFragment()) {
-              channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove();
-              DECORATE.onFrameEnd(receiverContext);
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object frame) {
+        if (frame instanceof WebSocketFrame) {
+            Channel channel = ctx.channel();
+            HandlerContext.Receiver receiverContext =
+                    channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).get();
+            if (receiverContext == null) {
+                HandlerContext.Sender sessionState =
+                        channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).get();
+                if (sessionState != null) {
+                    receiverContext = new HandlerContext.Receiver(
+                            sessionState.getHandshakeSpan(), channel.id().asShortText());
+                    channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).set(receiverContext);
+                }
             }
-          }
-          return;
-        }
+            if (receiverContext != null) {
+                if (frame instanceof TextWebSocketFrame) {
+                    // WebSocket Read Text Start
+                    TextWebSocketFrame textFrame = (TextWebSocketFrame) frame;
 
-        if (frame instanceof BinaryWebSocketFrame) {
-          // WebSocket Read Binary Start
-          BinaryWebSocketFrame binaryFrame = (BinaryWebSocketFrame) frame;
-          final AgentSpan span =
-              DECORATE.startInboundFrameSpan(
-                  receiverContext,
-                  binaryFrame.content().nioBuffer(),
-                  binaryFrame.isFinalFragment());
-          try (final ContextScope scope = activateSpan(span)) {
-            ctx.fireChannelRead(binaryFrame);
-          } finally {
-            // WebSocket Read Binary End
-            if (binaryFrame.isFinalFragment()) {
-              channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove();
-              DECORATE.onFrameEnd(receiverContext);
-            }
-          }
+                    final AgentSpan span = DECORATE.startInboundFrameSpan(
+                            receiverContext, textFrame.text(), textFrame.isFinalFragment());
+                    try (final ContextScope scope = activateSpan(span)) {
+                        ctx.fireChannelRead(textFrame);
+                        // WebSocket Read Text Start
+                    } finally {
+                        if (textFrame.isFinalFragment()) {
+                            channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove();
+                            DECORATE.onFrameEnd(receiverContext);
+                        }
+                    }
+                    return;
+                }
 
-          return;
-        }
+                if (frame instanceof BinaryWebSocketFrame) {
+                    // WebSocket Read Binary Start
+                    BinaryWebSocketFrame binaryFrame = (BinaryWebSocketFrame) frame;
+                    final AgentSpan span = DECORATE.startInboundFrameSpan(
+                            receiverContext, binaryFrame.content().nioBuffer(), binaryFrame.isFinalFragment());
+                    try (final ContextScope scope = activateSpan(span)) {
+                        ctx.fireChannelRead(binaryFrame);
+                    } finally {
+                        // WebSocket Read Binary End
+                        if (binaryFrame.isFinalFragment()) {
+                            channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove();
+                            DECORATE.onFrameEnd(receiverContext);
+                        }
+                    }
 
-        if (frame instanceof ContinuationWebSocketFrame) {
-          ContinuationWebSocketFrame continuationWebSocketFrame =
-              (ContinuationWebSocketFrame) frame;
-          final AgentSpan span =
-              DECORATE.startInboundFrameSpan(
-                  receiverContext,
-                  MESSAGE_TYPE_TEXT.equals(receiverContext.getMessageType())
-                      ? continuationWebSocketFrame.text()
-                      : continuationWebSocketFrame.content().nioBuffer(),
-                  continuationWebSocketFrame.isFinalFragment());
-          try (final ContextScope scope = activateSpan(span)) {
-            ctx.fireChannelRead(continuationWebSocketFrame);
-          } finally {
-            if (continuationWebSocketFrame.isFinalFragment()) {
-              channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove();
-              DECORATE.onFrameEnd(receiverContext);
-            }
-          }
-          return;
-        }
+                    return;
+                }
+
+                if (frame instanceof ContinuationWebSocketFrame) {
+                    ContinuationWebSocketFrame continuationWebSocketFrame = (ContinuationWebSocketFrame) frame;
+                    final AgentSpan span = DECORATE.startInboundFrameSpan(
+                            receiverContext,
+                            MESSAGE_TYPE_TEXT.equals(receiverContext.getMessageType())
+                                    ? continuationWebSocketFrame.text()
+                                    : continuationWebSocketFrame.content().nioBuffer(),
+                            continuationWebSocketFrame.isFinalFragment());
+                    try (final ContextScope scope = activateSpan(span)) {
+                        ctx.fireChannelRead(continuationWebSocketFrame);
+                    } finally {
+                        if (continuationWebSocketFrame.isFinalFragment()) {
+                            channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove();
+                            DECORATE.onFrameEnd(receiverContext);
+                        }
+                    }
+                    return;
+                }
 
-        if (frame instanceof CloseWebSocketFrame) {
-          // WebSocket Closed by client
-          CloseWebSocketFrame closeFrame = (CloseWebSocketFrame) frame;
-          int statusCode = closeFrame.statusCode();
-          String reasonText = closeFrame.reasonText();
-          channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).remove();
-          channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove();
-          final AgentSpan span =
-              DECORATE.startInboundCloseSpan(receiverContext, reasonText, statusCode);
-          try (final ContextScope scope = activateSpan(span)) {
-            ctx.fireChannelRead(closeFrame);
-            if (closeFrame.isFinalFragment()) {
-              DECORATE.onFrameEnd(receiverContext);
+                if (frame instanceof CloseWebSocketFrame) {
+                    // WebSocket Closed by client
+                    CloseWebSocketFrame closeFrame = (CloseWebSocketFrame) frame;
+                    int statusCode = closeFrame.statusCode();
+                    String reasonText = closeFrame.reasonText();
+                    channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).remove();
+                    channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove();
+                    final AgentSpan span = DECORATE.startInboundCloseSpan(receiverContext, reasonText, statusCode);
+                    try (final ContextScope scope = activateSpan(span)) {
+                        ctx.fireChannelRead(closeFrame);
+                        if (closeFrame.isFinalFragment()) {
+                            DECORATE.onFrameEnd(receiverContext);
+                        }
+                    }
+                    return;
+                }
             }
-          }
-          return;
         }
-      }
+        // can be other messages we do not handle like ping, pong
+        ctx.fireChannelRead(frame);
     }
-    // can be other messages we do not handle like ping, pong
-    ctx.fireChannelRead(frame);
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java
index c15fe416aeb..21a30049fba 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java
@@ -22,93 +22,89 @@
 
 @ChannelHandler.Sharable
 public class WebSocketServerOutboundTracingHandler extends ChannelOutboundHandlerAdapter {
-  public static WebSocketServerOutboundTracingHandler INSTANCE =
-      new WebSocketServerOutboundTracingHandler();
+    public static WebSocketServerOutboundTracingHandler INSTANCE = new WebSocketServerOutboundTracingHandler();
 
-  @Override
-  public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promise)
-      throws Exception {
+    @Override
+    public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promise) throws Exception {
 
-    if (frame instanceof WebSocketFrame) {
-      Channel channel = ctx.channel();
-      HandlerContext.Sender handlerContext = channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).get();
-      if (handlerContext != null) {
+        if (frame instanceof WebSocketFrame) {
+            Channel channel = ctx.channel();
+            HandlerContext.Sender handlerContext =
+                    channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).get();
+            if (handlerContext != null) {
 
-        if (frame instanceof TextWebSocketFrame) {
-          // WebSocket Write Text Start
-          TextWebSocketFrame textFrame = (TextWebSocketFrame) frame;
-          final AgentSpan span =
-              DECORATE.startOutboundFrameSpan(
-                  handlerContext, MESSAGE_TYPE_TEXT, textFrame.text().length());
-          try (final ContextScope scope = activateSpan(span)) {
-            ctx.write(frame, promise);
-          } finally {
-            // WebSocket Write Text End
-            if (textFrame.isFinalFragment()) {
-              DECORATE.onFrameEnd(handlerContext);
-            }
-          }
-          return;
-        }
+                if (frame instanceof TextWebSocketFrame) {
+                    // WebSocket Write Text Start
+                    TextWebSocketFrame textFrame = (TextWebSocketFrame) frame;
+                    final AgentSpan span = DECORATE.startOutboundFrameSpan(
+                            handlerContext, MESSAGE_TYPE_TEXT, textFrame.text().length());
+                    try (final ContextScope scope = activateSpan(span)) {
+                        ctx.write(frame, promise);
+                    } finally {
+                        // WebSocket Write Text End
+                        if (textFrame.isFinalFragment()) {
+                            DECORATE.onFrameEnd(handlerContext);
+                        }
+                    }
+                    return;
+                }
 
-        if (frame instanceof BinaryWebSocketFrame) {
-          // WebSocket Write Binary Start
-          BinaryWebSocketFrame binaryFrame = (BinaryWebSocketFrame) frame;
-          final AgentSpan span =
-              DECORATE.startOutboundFrameSpan(
-                  handlerContext, MESSAGE_TYPE_BINARY, binaryFrame.content().readableBytes());
-          try (final ContextScope scope = activateSpan(span)) {
-            ctx.write(frame, promise);
-          } finally {
-            // WebSocket Write Binary End
-            if (binaryFrame.isFinalFragment()) {
-              DECORATE.onFrameEnd(handlerContext);
-            }
-          }
-          return;
-        }
+                if (frame instanceof BinaryWebSocketFrame) {
+                    // WebSocket Write Binary Start
+                    BinaryWebSocketFrame binaryFrame = (BinaryWebSocketFrame) frame;
+                    final AgentSpan span = DECORATE.startOutboundFrameSpan(
+                            handlerContext,
+                            MESSAGE_TYPE_BINARY,
+                            binaryFrame.content().readableBytes());
+                    try (final ContextScope scope = activateSpan(span)) {
+                        ctx.write(frame, promise);
+                    } finally {
+                        // WebSocket Write Binary End
+                        if (binaryFrame.isFinalFragment()) {
+                            DECORATE.onFrameEnd(handlerContext);
+                        }
+                    }
+                    return;
+                }
 
-        if (frame instanceof ContinuationWebSocketFrame) {
-          ContinuationWebSocketFrame continuationWebSocketFrame =
-              (ContinuationWebSocketFrame) frame;
-          final AgentSpan span =
-              DECORATE.startOutboundFrameSpan(
-                  handlerContext,
-                  handlerContext.getMessageType(),
-                  MESSAGE_TYPE_TEXT.equals(handlerContext.getMessageType())
-                      ? continuationWebSocketFrame.text().length()
-                      : continuationWebSocketFrame.content().readableBytes());
-          try (final ContextScope scope = activateSpan(span)) {
-            ctx.write(frame, promise);
-          } finally {
-            // WebSocket Write Binary End
-            if (continuationWebSocketFrame.isFinalFragment()) {
-              DECORATE.onFrameEnd(handlerContext);
-            }
-          }
-          return;
-        }
+                if (frame instanceof ContinuationWebSocketFrame) {
+                    ContinuationWebSocketFrame continuationWebSocketFrame = (ContinuationWebSocketFrame) frame;
+                    final AgentSpan span = DECORATE.startOutboundFrameSpan(
+                            handlerContext,
+                            handlerContext.getMessageType(),
+                            MESSAGE_TYPE_TEXT.equals(handlerContext.getMessageType())
+                                    ? continuationWebSocketFrame.text().length()
+                                    : continuationWebSocketFrame.content().readableBytes());
+                    try (final ContextScope scope = activateSpan(span)) {
+                        ctx.write(frame, promise);
+                    } finally {
+                        // WebSocket Write Binary End
+                        if (continuationWebSocketFrame.isFinalFragment()) {
+                            DECORATE.onFrameEnd(handlerContext);
+                        }
+                    }
+                    return;
+                }
 
-        if (frame instanceof CloseWebSocketFrame) {
-          // WebSocket Closed by Server
-          CloseWebSocketFrame closeFrame = (CloseWebSocketFrame) frame;
-          int statusCode = closeFrame.statusCode();
-          String reasonText = closeFrame.reasonText();
-          channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).remove();
-          final AgentSpan span =
-              DECORATE.startOutboundCloseSpan(handlerContext, reasonText, statusCode);
-          try (final ContextScope scope = activateSpan(span)) {
-            ctx.write(frame, promise);
-          } finally {
-            if (closeFrame.isFinalFragment()) {
-              DECORATE.onFrameEnd(handlerContext);
+                if (frame instanceof CloseWebSocketFrame) {
+                    // WebSocket Closed by Server
+                    CloseWebSocketFrame closeFrame = (CloseWebSocketFrame) frame;
+                    int statusCode = closeFrame.statusCode();
+                    String reasonText = closeFrame.reasonText();
+                    channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).remove();
+                    final AgentSpan span = DECORATE.startOutboundCloseSpan(handlerContext, reasonText, statusCode);
+                    try (final ContextScope scope = activateSpan(span)) {
+                        ctx.write(frame, promise);
+                    } finally {
+                        if (closeFrame.isFinalFragment()) {
+                            DECORATE.onFrameEnd(handlerContext);
+                        }
+                    }
+                    return;
+                }
             }
-          }
-          return;
         }
-      }
+        // can be other messages we do not handle like ping, pong
+        ctx.write(frame, promise);
     }
-    // can be other messages we do not handle like ping, pong
-    ctx.write(frame, promise);
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerTracingHandler.java
index fdf48ea82b5..7396363c624 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerTracingHandler.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerTracingHandler.java
@@ -3,12 +3,10 @@
 import io.netty.channel.CombinedChannelDuplexHandler;
 
 public class WebSocketServerTracingHandler
-    extends CombinedChannelDuplexHandler<
-        WebSocketServerInboundTracingHandler, WebSocketServerOutboundTracingHandler> {
+        extends CombinedChannelDuplexHandler<
+                WebSocketServerInboundTracingHandler, WebSocketServerOutboundTracingHandler> {
 
-  public WebSocketServerTracingHandler() {
-    super(
-        WebSocketServerInboundTracingHandler.INSTANCE,
-        WebSocketServerOutboundTracingHandler.INSTANCE);
-  }
+    public WebSocketServerTracingHandler() {
+        super(WebSocketServerInboundTracingHandler.INSTANCE, WebSocketServerOutboundTracingHandler.INSTANCE);
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/Http2ContextTransferTest.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/Http2ContextTransferTest.java
index 028e5ee8b57..9aa02bbca95 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/Http2ContextTransferTest.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/Http2ContextTransferTest.java
@@ -15,33 +15,31 @@
 import org.junit.jupiter.api.Test;
 
 class Http2ContextTransferTest {
-  @Test
-  void consumesParentContextOnceAndReusesItsAttribute() {
-    Channel parent = channel(null);
-    Channel first = channel(parent);
-    Channel second = channel(parent);
-    Attribute<Context> attribute = parent.attr(CONTEXT_ATTRIBUTE_KEY);
-    Context context = Context.root();
-    attribute.set(context);
+    @Test
+    void consumesParentContextOnceAndReusesItsAttribute() {
+        Channel parent = channel(null);
+        Channel first = channel(parent);
+        Channel second = channel(parent);
+        Attribute<Context> attribute = parent.attr(CONTEXT_ATTRIBUTE_KEY);
+        Context context = Context.root();
+        attribute.set(context);
 
-    afterCreate(first);
-    afterCreate(second);
+        afterCreate(first);
+        afterCreate(second);
 
-    assertSame(context, first.attr(CONTEXT_ATTRIBUTE_KEY).get());
-    assertNull(attribute.get());
-    assertSame(attribute, parent.attr(CONTEXT_ATTRIBUTE_KEY));
-    assertFalse(second.hasAttr(CONTEXT_ATTRIBUTE_KEY));
-  }
+        assertSame(context, first.attr(CONTEXT_ATTRIBUTE_KEY).get());
+        assertNull(attribute.get());
+        assertSame(attribute, parent.attr(CONTEXT_ATTRIBUTE_KEY));
+        assertFalse(second.hasAttr(CONTEXT_ATTRIBUTE_KEY));
+    }
 
-  private static Channel channel(Channel parent) {
-    // Avoid pipeline events creating attributes when another test installs Netty instrumentation.
-    DefaultAttributeMap attributes = new DefaultAttributeMap();
-    Channel channel = mock(Channel.class);
-    when(channel.parent()).thenReturn(parent);
-    when(channel.hasAttr(CONTEXT_ATTRIBUTE_KEY))
-        .thenAnswer(ignored -> attributes.hasAttr(CONTEXT_ATTRIBUTE_KEY));
-    when(channel.attr(CONTEXT_ATTRIBUTE_KEY))
-        .thenAnswer(ignored -> attributes.attr(CONTEXT_ATTRIBUTE_KEY));
-    return channel;
-  }
+    private static Channel channel(Channel parent) {
+        // Avoid pipeline events creating attributes when another test installs Netty instrumentation.
+        DefaultAttributeMap attributes = new DefaultAttributeMap();
+        Channel channel = mock(Channel.class);
+        when(channel.parent()).thenReturn(parent);
+        when(channel.hasAttr(CONTEXT_ATTRIBUTE_KEY)).thenAnswer(ignored -> attributes.hasAttr(CONTEXT_ATTRIBUTE_KEY));
+        when(channel.attr(CONTEXT_ATTRIBUTE_KEY)).thenAnswer(ignored -> attributes.attr(CONTEXT_ATTRIBUTE_KEY));
+        return channel;
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/ServerRequestContextTest.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/ServerRequestContextTest.java
index 86874a68213..73c528458a2 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/ServerRequestContextTest.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/ServerRequestContextTest.java
@@ -15,119 +15,119 @@
 import org.junit.jupiter.api.Test;
 
 class ServerRequestContextTest {
-  private static final int PIPELINING_LIMIT = 1000;
+    private static final int PIPELINING_LIMIT = 1000;
 
-  @Test
-  void clearsRequestContextAndReusesAttributeAcrossRequests() {
-    DefaultAttributeMap attributes = new DefaultAttributeMap();
-    ContextKey<String> key = ContextKey.named("request");
-    Attribute<Context> attribute = attributes.attr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY);
+    @Test
+    void clearsRequestContextAndReusesAttributeAcrossRequests() {
+        DefaultAttributeMap attributes = new DefaultAttributeMap();
+        ContextKey<String> key = ContextKey.named("request");
+        Attribute<Context> attribute = attributes.attr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY);
 
-    for (String value : new String[] {"first", "second"}) {
-      Context context = Context.root().with(key, value);
-      ServerRequestContext request = ServerRequestContext.add(attributes, context, null);
+        for (String value : new String[] {"first", "second"}) {
+            Context context = Context.root().with(key, value);
+            ServerRequestContext request = ServerRequestContext.add(attributes, context, null);
 
-      assertSame(context, attribute.get());
-      ServerRequestContext.remove(attributes, request);
+            assertSame(context, attribute.get());
+            ServerRequestContext.remove(attributes, request);
 
-      assertNull(attribute.get());
-      assertSame(attribute, attributes.attr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY));
-      assertNull(ServerRequestContext.nextResponse(attributes));
+            assertNull(attribute.get());
+            assertSame(attribute, attributes.attr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY));
+            assertNull(ServerRequestContext.nextResponse(attributes));
+        }
     }
-  }
 
-  @Test
-  void disablesTrackingWhenPipeliningLimitIsExceeded() {
-    DefaultAttributeMap attributes = new DefaultAttributeMap();
+    @Test
+    void disablesTrackingWhenPipeliningLimitIsExceeded() {
+        DefaultAttributeMap attributes = new DefaultAttributeMap();
 
-    for (int i = 0; i < PIPELINING_LIMIT; i++) {
-      assertNotNull(ServerRequestContext.add(attributes, Context.root(), null));
-    }
+        for (int i = 0; i < PIPELINING_LIMIT; i++) {
+            assertNotNull(ServerRequestContext.add(attributes, Context.root(), null));
+        }
 
-    assertFalse(ServerRequestContext.canTrackRequest(attributes));
-    assertNull(ServerRequestContext.nextResponse(attributes));
-    assertNull(attributes.attr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY).get());
-    assertNull(ServerRequestContext.add(attributes, Context.root(), null));
-  }
+        assertFalse(ServerRequestContext.canTrackRequest(attributes));
+        assertNull(ServerRequestContext.nextResponse(attributes));
+        assertNull(attributes.attr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY).get());
+        assertNull(ServerRequestContext.add(attributes, Context.root(), null));
+    }
 
-  @Test
-  void capturesAcceptHeaderValue() {
-    DefaultAttributeMap attributes = new DefaultAttributeMap();
-    DefaultHttpHeaders headers = new DefaultHttpHeaders();
-    headers.set("accept", "text/html");
+    @Test
+    void capturesAcceptHeaderValue() {
+        DefaultAttributeMap attributes = new DefaultAttributeMap();
+        DefaultHttpHeaders headers = new DefaultHttpHeaders();
+        headers.set("accept", "text/html");
 
-    ServerRequestContext serverContext =
-        ServerRequestContext.add(attributes, Context.root(), headers.get("accept"));
-    headers.set("accept", "application/json");
+        ServerRequestContext serverContext =
+                ServerRequestContext.add(attributes, Context.root(), headers.get("accept"));
+        headers.set("accept", "application/json");
 
-    assertEquals("text/html", serverContext.acceptHeader());
-  }
+        assertEquals("text/html", serverContext.acceptHeader());
+    }
 
-  @Test
-  void reportsOnlyQueuedContextsAsPending() {
-    DefaultAttributeMap attributes = new DefaultAttributeMap();
-    ServerRequestContext serverContext = ServerRequestContext.add(attributes, Context.root(), null);
+    @Test
+    void reportsOnlyQueuedContextsAsPending() {
+        DefaultAttributeMap attributes = new DefaultAttributeMap();
+        ServerRequestContext serverContext = ServerRequestContext.add(attributes, Context.root(), null);
 
-    assertTrue(ServerRequestContext.isPending(attributes, serverContext));
+        assertTrue(ServerRequestContext.isPending(attributes, serverContext));
 
-    ServerRequestContext.remove(attributes, serverContext);
+        ServerRequestContext.remove(attributes, serverContext);
 
-    assertFalse(ServerRequestContext.isPending(attributes, serverContext));
-  }
+        assertFalse(ServerRequestContext.isPending(attributes, serverContext));
+    }
 
-  @Test
-  void preservesPipelinedContextWhenCompactingQueue() {
-    DefaultAttributeMap attributes = new DefaultAttributeMap();
-    ServerRequestContext first = ServerRequestContext.add(attributes, Context.root(), null);
-    ServerRequestContext second = ServerRequestContext.add(attributes, Context.root(), null);
+    @Test
+    void preservesPipelinedContextWhenCompactingQueue() {
+        DefaultAttributeMap attributes = new DefaultAttributeMap();
+        ServerRequestContext first = ServerRequestContext.add(attributes, Context.root(), null);
+        ServerRequestContext second = ServerRequestContext.add(attributes, Context.root(), null);
 
-    ServerRequestContext.remove(attributes, first);
+        ServerRequestContext.remove(attributes, first);
 
-    assertSame(second, ServerRequestContext.nextResponse(attributes));
-    ServerRequestContext.remove(attributes, second);
+        assertSame(second, ServerRequestContext.nextResponse(attributes));
+        ServerRequestContext.remove(attributes, second);
 
-    ServerRequestContext next = ServerRequestContext.add(attributes, Context.root(), null);
-    assertSame(next, ServerRequestContext.nextResponse(attributes));
-  }
+        ServerRequestContext next = ServerRequestContext.add(attributes, Context.root(), null);
+        assertSame(next, ServerRequestContext.nextResponse(attributes));
+    }
 
-  @Test
-  void preservesFirstContextWhenCompactingAfterRequestFailure() {
-    DefaultAttributeMap attributes = new DefaultAttributeMap();
-    ServerRequestContext first = ServerRequestContext.add(attributes, Context.root(), null);
-    ServerRequestContext failed = ServerRequestContext.add(attributes, Context.root(), null);
+    @Test
+    void preservesFirstContextWhenCompactingAfterRequestFailure() {
+        DefaultAttributeMap attributes = new DefaultAttributeMap();
+        ServerRequestContext first = ServerRequestContext.add(attributes, Context.root(), null);
+        ServerRequestContext failed = ServerRequestContext.add(attributes, Context.root(), null);
 
-    ServerRequestContext.remove(attributes, failed);
+        ServerRequestContext.remove(attributes, failed);
 
-    assertSame(first, ServerRequestContext.nextResponse(attributes));
-  }
+        assertSame(first, ServerRequestContext.nextResponse(attributes));
+    }
 
-  @Test
-  void tracksBlockedResponseUntilChannelClose() {
-    DefaultAttributeMap attributes = new DefaultAttributeMap();
-    ServerRequestContext serverContext = ServerRequestContext.add(attributes, Context.root(), null);
+    @Test
+    void tracksBlockedResponseUntilChannelClose() {
+        DefaultAttributeMap attributes = new DefaultAttributeMap();
+        ServerRequestContext serverContext = ServerRequestContext.add(attributes, Context.root(), null);
 
-    ServerRequestContext.markResponseBlocked(attributes);
-    ServerRequestContext.remove(attributes, serverContext);
+        ServerRequestContext.markResponseBlocked(attributes);
+        ServerRequestContext.remove(attributes, serverContext);
 
-    assertTrue(ServerRequestContext.isResponseBlocked(attributes));
+        assertTrue(ServerRequestContext.isResponseBlocked(attributes));
 
-    ServerRequestContext.closeAll(attributes);
+        ServerRequestContext.closeAll(attributes);
 
-    assertFalse(ServerRequestContext.isResponseBlocked(attributes));
-  }
+        assertFalse(ServerRequestContext.isResponseBlocked(attributes));
+    }
 
-  @Test
-  void tracksBlockedRequestUntilChannelClose() {
-    DefaultAttributeMap attributes = new DefaultAttributeMap();
+    @Test
+    void tracksBlockedRequestUntilChannelClose() {
+        DefaultAttributeMap attributes = new DefaultAttributeMap();
 
-    assertFalse(ServerRequestContext.isRequestBlocked(attributes));
+        assertFalse(ServerRequestContext.isRequestBlocked(attributes));
 
-    ServerRequestContext.markRequestBlocked(attributes);
+        ServerRequestContext.markRequestBlocked(attributes);
 
-    assertTrue(ServerRequestContext.isRequestBlocked(attributes));
+        assertTrue(ServerRequestContext.isRequestBlocked(attributes));
 
-    ServerRequestContext.closeAll(attributes);
+        ServerRequestContext.closeAll(attributes);
 
-    assertFalse(ServerRequestContext.isRequestBlocked(attributes));
-  }
+        assertFalse(ServerRequestContext.isRequestBlocked(attributes));
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/BlockingResponseHandlerTest.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/BlockingResponseHandlerTest.java
index 8600402e5b9..8b716582133 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/BlockingResponseHandlerTest.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/BlockingResponseHandlerTest.java
@@ -29,174 +29,151 @@
 
 class BlockingResponseHandlerTest {
 
-  @Test
-  void removesResponseFunctionHandlersWhenResponseTracingIsUnavailable() {
-    EmbeddedChannel channel = new EmbeddedChannel();
-    ServerRequestContext serverContext = ServerRequestContext.add(channel, Context.root(), null);
-    BlockingResponseHandler blockingHandler =
-        new BlockingResponseHandler(
-            null, 403, BlockingContentType.NONE, emptyMap(), null, serverContext);
-    channel
-        .pipeline()
-        .addLast(BEFORE_BLOCKING_HANDLER_NAME, new ChannelInboundHandlerAdapter())
-        .addLast(HANDLER_NAME, blockingHandler);
-    FullHttpRequest request = new DefaultFullHttpRequest(HTTP_1_1, GET, "/");
-
-    assertTrue(channel.writeInbound(request));
-
-    assertFalse(ServerRequestContext.isRequestBlocked(channel));
-    assertNull(channel.pipeline().get(BEFORE_BLOCKING_HANDLER_NAME));
-    assertNull(channel.pipeline().get(HANDLER_NAME));
-    assertSame(request, channel.readInbound());
-    request.release();
-    channel.finishAndReleaseAll();
-  }
-
-  @Test
-  void doesNotInstallBlockingHandlerWhenAuxiliaryHandlerNameIsUnavailable() {
-    ChannelInboundHandlerAdapter existingBeforeBlockingHandler = new ChannelInboundHandlerAdapter();
-    EmbeddedChannel channel = new EmbeddedChannel(HttpServerRequestTracingHandler.INSTANCE);
-    channel.pipeline().addLast(BEFORE_BLOCKING_HANDLER_NAME, existingBeforeBlockingHandler);
-    FullHttpRequest request = new DefaultFullHttpRequest(HTTP_1_1, GET, "/");
-    NettyBlockResponseFunction responseFunction =
-        new NettyBlockResponseFunction(channel.pipeline(), request, null);
-
-    assertFalse(
-        responseFunction.tryCommitBlockingResponse(
-            null, 403, BlockingContentType.NONE, emptyMap(), null));
-
-    assertSame(existingBeforeBlockingHandler, channel.pipeline().get(BEFORE_BLOCKING_HANDLER_NAME));
-    assertNull(channel.pipeline().get(HANDLER_NAME));
-    request.release();
-    channel.finishAndReleaseAll();
-  }
-
-  @Test
-  void commitsOffEventLoopAfterOriginalRequestIsReleased() throws Exception {
-    DefaultEventLoopGroup eventLoopGroup = new DefaultEventLoopGroup(1);
-    LocalChannel channel = new LocalChannel();
-    FullHttpRequest request = new DefaultFullHttpRequest(HTTP_1_1, GET, "/");
-    CountDownLatch eventLoopTaskStarted = new CountDownLatch(1);
-    CountDownLatch releaseEventLoop = new CountDownLatch(1);
-
-    try {
-      eventLoopGroup.register(channel).sync();
-      AtomicReference<ServerRequestContext> serverContext = new AtomicReference<>();
-      channel
-          .eventLoop()
-          .submit(
-              () -> {
-                channel
-                    .pipeline()
-                    .addLast(HttpServerRequestTracingHandler.INSTANCE)
-                    .addLast(HttpServerResponseTracingHandler.INSTANCE);
-                ServerRequestContext.add(channel, Context.root(), null);
-                serverContext.set(ServerRequestContext.add(channel, Context.root(), null));
-              })
-          .sync();
-
-      Future<?> blockingTask =
-          channel
-              .eventLoop()
-              .submit(
-                  () -> {
-                    eventLoopTaskStarted.countDown();
-                    if (!releaseEventLoop.await(5, SECONDS)) {
-                      throw new AssertionError("event loop was not released");
-                    }
-                    return null;
-                  });
-      assertTrue(eventLoopTaskStarted.await(5, SECONDS), "event loop task did not start");
-
-      NettyBlockResponseFunction responseFunction =
-          new NettyBlockResponseFunction(channel.pipeline(), request, serverContext.get());
-      assertTrue(
-          responseFunction.tryCommitBlockingResponse(
-              null, 403, BlockingContentType.NONE, emptyMap(), null));
-      request.release();
-
-      assertNull(channel.pipeline().get(BEFORE_BLOCKING_HANDLER_NAME));
-      assertNull(channel.pipeline().get(HANDLER_NAME));
-
-      releaseEventLoop.countDown();
-      blockingTask.sync();
-      channel.eventLoop().submit(() -> {}).sync();
-
-      assertTrue(ServerRequestContext.isRequestBlocked(channel));
-      assertNotNull(channel.pipeline().get(BEFORE_BLOCKING_HANDLER_NAME));
-      assertNotNull(channel.pipeline().get(HANDLER_NAME));
-    } finally {
-      releaseEventLoop.countDown();
-      channel.close().sync();
-      eventLoopGroup.shutdownGracefully().sync();
-      if (request.refCnt() > 0) {
+    @Test
+    void removesResponseFunctionHandlersWhenResponseTracingIsUnavailable() {
+        EmbeddedChannel channel = new EmbeddedChannel();
+        ServerRequestContext serverContext = ServerRequestContext.add(channel, Context.root(), null);
+        BlockingResponseHandler blockingHandler =
+                new BlockingResponseHandler(null, 403, BlockingContentType.NONE, emptyMap(), null, serverContext);
+        channel.pipeline()
+                .addLast(BEFORE_BLOCKING_HANDLER_NAME, new ChannelInboundHandlerAdapter())
+                .addLast(HANDLER_NAME, blockingHandler);
+        FullHttpRequest request = new DefaultFullHttpRequest(HTTP_1_1, GET, "/");
+
+        assertTrue(channel.writeInbound(request));
+
+        assertFalse(ServerRequestContext.isRequestBlocked(channel));
+        assertNull(channel.pipeline().get(BEFORE_BLOCKING_HANDLER_NAME));
+        assertNull(channel.pipeline().get(HANDLER_NAME));
+        assertSame(request, channel.readInbound());
         request.release();
-      }
+        channel.finishAndReleaseAll();
     }
-  }
-
-  @Test
-  void doesNotBlockChannelWhenScheduledRequestContextCompletesFirst() throws Exception {
-    DefaultEventLoopGroup eventLoopGroup = new DefaultEventLoopGroup(1);
-    LocalChannel channel = new LocalChannel();
-    FullHttpRequest request = new DefaultFullHttpRequest(HTTP_1_1, GET, "/");
-    CountDownLatch eventLoopTaskStarted = new CountDownLatch(1);
-    CountDownLatch releaseEventLoop = new CountDownLatch(1);
-
-    try {
-      eventLoopGroup.register(channel).sync();
-      AtomicReference<ServerRequestContext> serverContext = new AtomicReference<>();
-      channel
-          .eventLoop()
-          .submit(
-              () -> {
-                channel
-                    .pipeline()
-                    .addLast(HttpServerRequestTracingHandler.INSTANCE)
-                    .addLast(HttpServerResponseTracingHandler.INSTANCE);
-                serverContext.set(ServerRequestContext.add(channel, Context.root(), null));
-              })
-          .sync();
-
-      Future<?> blockingTask =
-          channel
-              .eventLoop()
-              .submit(
-                  () -> {
-                    eventLoopTaskStarted.countDown();
-                    if (!releaseEventLoop.await(5, SECONDS)) {
-                      throw new AssertionError("event loop was not released");
-                    }
-                    return null;
-                  });
-      assertTrue(eventLoopTaskStarted.await(5, SECONDS), "event loop task did not start");
-
-      Future<?> completionTask =
-          channel
-              .eventLoop()
-              .submit(() -> ServerRequestContext.remove(channel, serverContext.get()));
-      NettyBlockResponseFunction responseFunction =
-          new NettyBlockResponseFunction(channel.pipeline(), request, serverContext.get());
-      assertTrue(
-          responseFunction.tryCommitBlockingResponse(
-              null, 403, BlockingContentType.NONE, emptyMap(), null));
-      request.release();
-
-      releaseEventLoop.countDown();
-      blockingTask.sync();
-      completionTask.sync();
-      channel.eventLoop().submit(() -> {}).sync();
-
-      assertFalse(ServerRequestContext.isRequestBlocked(channel));
-      assertNull(channel.pipeline().get(BEFORE_BLOCKING_HANDLER_NAME));
-      assertNull(channel.pipeline().get(HANDLER_NAME));
-    } finally {
-      releaseEventLoop.countDown();
-      channel.close().sync();
-      eventLoopGroup.shutdownGracefully().sync();
-      if (request.refCnt() > 0) {
+
+    @Test
+    void doesNotInstallBlockingHandlerWhenAuxiliaryHandlerNameIsUnavailable() {
+        ChannelInboundHandlerAdapter existingBeforeBlockingHandler = new ChannelInboundHandlerAdapter();
+        EmbeddedChannel channel = new EmbeddedChannel(HttpServerRequestTracingHandler.INSTANCE);
+        channel.pipeline().addLast(BEFORE_BLOCKING_HANDLER_NAME, existingBeforeBlockingHandler);
+        FullHttpRequest request = new DefaultFullHttpRequest(HTTP_1_1, GET, "/");
+        NettyBlockResponseFunction responseFunction = new NettyBlockResponseFunction(channel.pipeline(), request, null);
+
+        assertFalse(responseFunction.tryCommitBlockingResponse(null, 403, BlockingContentType.NONE, emptyMap(), null));
+
+        assertSame(existingBeforeBlockingHandler, channel.pipeline().get(BEFORE_BLOCKING_HANDLER_NAME));
+        assertNull(channel.pipeline().get(HANDLER_NAME));
         request.release();
-      }
+        channel.finishAndReleaseAll();
+    }
+
+    @Test
+    void commitsOffEventLoopAfterOriginalRequestIsReleased() throws Exception {
+        DefaultEventLoopGroup eventLoopGroup = new DefaultEventLoopGroup(1);
+        LocalChannel channel = new LocalChannel();
+        FullHttpRequest request = new DefaultFullHttpRequest(HTTP_1_1, GET, "/");
+        CountDownLatch eventLoopTaskStarted = new CountDownLatch(1);
+        CountDownLatch releaseEventLoop = new CountDownLatch(1);
+
+        try {
+            eventLoopGroup.register(channel).sync();
+            AtomicReference<ServerRequestContext> serverContext = new AtomicReference<>();
+            channel.eventLoop()
+                    .submit(() -> {
+                        channel.pipeline()
+                                .addLast(HttpServerRequestTracingHandler.INSTANCE)
+                                .addLast(HttpServerResponseTracingHandler.INSTANCE);
+                        ServerRequestContext.add(channel, Context.root(), null);
+                        serverContext.set(ServerRequestContext.add(channel, Context.root(), null));
+                    })
+                    .sync();
+
+            Future<?> blockingTask = channel.eventLoop().submit(() -> {
+                eventLoopTaskStarted.countDown();
+                if (!releaseEventLoop.await(5, SECONDS)) {
+                    throw new AssertionError("event loop was not released");
+                }
+                return null;
+            });
+            assertTrue(eventLoopTaskStarted.await(5, SECONDS), "event loop task did not start");
+
+            NettyBlockResponseFunction responseFunction =
+                    new NettyBlockResponseFunction(channel.pipeline(), request, serverContext.get());
+            assertTrue(
+                    responseFunction.tryCommitBlockingResponse(null, 403, BlockingContentType.NONE, emptyMap(), null));
+            request.release();
+
+            assertNull(channel.pipeline().get(BEFORE_BLOCKING_HANDLER_NAME));
+            assertNull(channel.pipeline().get(HANDLER_NAME));
+
+            releaseEventLoop.countDown();
+            blockingTask.sync();
+            channel.eventLoop().submit(() -> {}).sync();
+
+            assertTrue(ServerRequestContext.isRequestBlocked(channel));
+            assertNotNull(channel.pipeline().get(BEFORE_BLOCKING_HANDLER_NAME));
+            assertNotNull(channel.pipeline().get(HANDLER_NAME));
+        } finally {
+            releaseEventLoop.countDown();
+            channel.close().sync();
+            eventLoopGroup.shutdownGracefully().sync();
+            if (request.refCnt() > 0) {
+                request.release();
+            }
+        }
+    }
+
+    @Test
+    void doesNotBlockChannelWhenScheduledRequestContextCompletesFirst() throws Exception {
+        DefaultEventLoopGroup eventLoopGroup = new DefaultEventLoopGroup(1);
+        LocalChannel channel = new LocalChannel();
+        FullHttpRequest request = new DefaultFullHttpRequest(HTTP_1_1, GET, "/");
+        CountDownLatch eventLoopTaskStarted = new CountDownLatch(1);
+        CountDownLatch releaseEventLoop = new CountDownLatch(1);
+
+        try {
+            eventLoopGroup.register(channel).sync();
+            AtomicReference<ServerRequestContext> serverContext = new AtomicReference<>();
+            channel.eventLoop()
+                    .submit(() -> {
+                        channel.pipeline()
+                                .addLast(HttpServerRequestTracingHandler.INSTANCE)
+                                .addLast(HttpServerResponseTracingHandler.INSTANCE);
+                        serverContext.set(ServerRequestContext.add(channel, Context.root(), null));
+                    })
+                    .sync();
+
+            Future<?> blockingTask = channel.eventLoop().submit(() -> {
+                eventLoopTaskStarted.countDown();
+                if (!releaseEventLoop.await(5, SECONDS)) {
+                    throw new AssertionError("event loop was not released");
+                }
+                return null;
+            });
+            assertTrue(eventLoopTaskStarted.await(5, SECONDS), "event loop task did not start");
+
+            Future<?> completionTask =
+                    channel.eventLoop().submit(() -> ServerRequestContext.remove(channel, serverContext.get()));
+            NettyBlockResponseFunction responseFunction =
+                    new NettyBlockResponseFunction(channel.pipeline(), request, serverContext.get());
+            assertTrue(
+                    responseFunction.tryCommitBlockingResponse(null, 403, BlockingContentType.NONE, emptyMap(), null));
+            request.release();
+
+            releaseEventLoop.countDown();
+            blockingTask.sync();
+            completionTask.sync();
+            channel.eventLoop().submit(() -> {}).sync();
+
+            assertFalse(ServerRequestContext.isRequestBlocked(channel));
+            assertNull(channel.pipeline().get(BEFORE_BLOCKING_HANDLER_NAME));
+            assertNull(channel.pipeline().get(HANDLER_NAME));
+        } finally {
+            releaseEventLoop.countDown();
+            channel.close().sync();
+            eventLoopGroup.shutdownGracefully().sync();
+            if (request.refCnt() > 0) {
+                request.release();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandlerTest.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandlerTest.java
index d9d90f4d83a..95e232553b2 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandlerTest.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandlerTest.java
@@ -39,176 +39,172 @@
 
 class HttpServerResponseTracingHandlerTest extends AbstractInstrumentationTest {
 
-  @Test
-  void finishesMirroredContextOnLastContentWhenRequestQueueIsAbsent() {
-    EmbeddedChannel channel = new EmbeddedChannel(HttpServerResponseTracingHandler.INSTANCE);
-    AgentSpan span = startSpan("netty", "mirrored-http2-server");
-    channel.attr(CONTEXT_ATTRIBUTE_KEY).set(span);
-
-    HttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
-    assertTrue(channel.writeOutbound(response));
-
-    assertSame(span, channel.attr(CONTEXT_ATTRIBUTE_KEY).get());
-    HttpResponse forwarded = channel.readOutbound();
-    assertSame(response, forwarded);
-    ReferenceCountUtil.release(forwarded);
-
-    assertTrue(channel.writeOutbound(LastHttpContent.EMPTY_LAST_CONTENT));
-
-    ReferenceCountUtil.release(channel.readOutbound());
-    assertNull(channel.attr(CONTEXT_ATTRIBUTE_KEY).get());
-    channel.finishAndReleaseAll();
-    assertTraces(trace(span().root().operationName("mirrored-http2-server")));
-  }
-
-  @Test
-  void forwardsLastContentBeforeFinalResponseWithoutCompletingContext() {
-    EmbeddedChannel channel = new EmbeddedChannel(HttpServerResponseTracingHandler.INSTANCE);
-    ServerRequestContext serverContext = ServerRequestContext.add(channel, Context.root(), null);
-    LastHttpContent lastContent = new DefaultLastHttpContent();
-
-    assertTrue(channel.writeOutbound(lastContent));
-
-    assertSame(serverContext, ServerRequestContext.nextResponse(channel));
-    LastHttpContent forwarded = channel.readOutbound();
-    assertSame(lastContent, forwarded);
-    forwarded.release();
-    channel.finishAndReleaseAll();
-  }
-
-  @Test
-  void headerOnlyResponseWaitsForLastContent() {
-    EmbeddedChannel channel = new EmbeddedChannel(HttpServerResponseTracingHandler.INSTANCE);
-    AgentSpan span = startSpan("netty", "header-only-server");
-    ServerRequestContext serverContext = ServerRequestContext.add(channel, span, null);
-    ServerRequestContext nextServerContext =
-        ServerRequestContext.add(channel, Context.root(), null);
-    HttpResponse response = new DefaultHttpResponse(HTTP_1_1, NO_CONTENT);
-
-    assertTrue(channel.writeOutbound(response));
-
-    assertSame(serverContext, ServerRequestContext.nextResponse(channel));
-    HttpResponse forwarded = channel.readOutbound();
-    assertSame(response, forwarded);
-    ReferenceCountUtil.release(forwarded);
-    assertNull(channel.readOutbound());
-
-    assertTrue(channel.writeOutbound(LastHttpContent.EMPTY_LAST_CONTENT));
-
-    assertSame(nextServerContext, ServerRequestContext.nextResponse(channel));
-    ReferenceCountUtil.release(channel.readOutbound());
-    ServerRequestContext.remove(channel, nextServerContext);
-    channel.finishAndReleaseAll();
-    assertTraces(trace(span().root().operationName("header-only-server")));
-  }
-
-  @Test
-  void rawFixedLengthBodyWaitsForLastContent() {
-    EmbeddedChannel channel = new EmbeddedChannel(HttpServerResponseTracingHandler.INSTANCE);
-    AgentSpan span = startSpan("netty", "raw-body-server");
-    ServerRequestContext serverContext = ServerRequestContext.add(channel, span, null);
-    ServerRequestContext nextServerContext =
-        ServerRequestContext.add(channel, Context.root(), null);
-    HttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
-    response.headers().set(CONTENT_LENGTH, 4);
-
-    assertTrue(channel.writeOutbound(response));
-    ReferenceCountUtil.release(channel.readOutbound());
-    assertTrue(channel.writeOutbound(Unpooled.wrappedBuffer(new byte[] {1, 2, 3, 4})));
-
-    assertSame(serverContext, ServerRequestContext.nextResponse(channel));
-    ReferenceCountUtil.release(channel.readOutbound());
-    assertNull(channel.readOutbound());
-
-    assertTrue(channel.writeOutbound(LastHttpContent.EMPTY_LAST_CONTENT));
-
-    assertSame(nextServerContext, ServerRequestContext.nextResponse(channel));
-    ReferenceCountUtil.release(channel.readOutbound());
-    ServerRequestContext.remove(channel, nextServerContext);
-    channel.finishAndReleaseAll();
-    assertTraces(trace(span().root().operationName("raw-body-server")));
-  }
-
-  @Test
-  void doesNotThrowOnMalformedContentLength() {
-    EmbeddedChannel channel = new EmbeddedChannel(HttpServerResponseTracingHandler.INSTANCE);
-    AgentSpan span = startSpan("netty", "malformed-content-length-server");
-    ServerRequestContext.add(channel, span, null);
-    FullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, OK);
-    response.headers().set(CONTENT_LENGTH, "malformed");
-
-    assertDoesNotThrow(() -> assertTrue(channel.writeOutbound(response)));
-
-    FullHttpResponse forwarded = channel.readOutbound();
-    assertSame(response, forwarded);
-    forwarded.release();
-    channel.finishAndReleaseAll();
-    assertTraces(trace(span().root().operationName("malformed-content-length-server")));
-  }
-
-  @Test
-  void nettyEncoderRequiresLastContentBeforeNextKeepAliveResponse() {
-    EmbeddedChannel channel = new EmbeddedChannel(new HttpResponseEncoder());
-    HttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
-    response.headers().set(CONNECTION, KEEP_ALIVE);
-    response.headers().set(CONTENT_LENGTH, 4);
-
-    assertTrue(channel.writeOutbound(response));
-    ReferenceCountUtil.release(channel.readOutbound());
-    assertTrue(channel.writeOutbound(Unpooled.wrappedBuffer(new byte[] {1, 2, 3, 4})));
-    ReferenceCountUtil.release(channel.readOutbound());
-
-    EncoderException exception =
-        assertThrows(
-            EncoderException.class,
-            () -> channel.writeOutbound(new DefaultFullHttpResponse(HTTP_1_1, OK)));
-
-    assertTrue(exception.getCause() instanceof IllegalStateException);
-
-    assertTrue(channel.writeOutbound(LastHttpContent.EMPTY_LAST_CONTENT));
-    ReferenceCountUtil.release(channel.readOutbound());
-    assertTrue(channel.writeOutbound(new DefaultFullHttpResponse(HTTP_1_1, OK)));
-    ReferenceCountUtil.release(channel.readOutbound());
-    channel.finishAndReleaseAll();
-  }
-
-  @Test
-  void fullWebsocketUpgradeCompletesContextAndPreservesHandshakeSpan() {
-    EmbeddedChannel channel = new EmbeddedChannel(HttpServerResponseTracingHandler.INSTANCE);
-    AgentSpan span = startSpan("netty", "websocket-handshake-server");
-    ServerRequestContext.add(channel, span, null);
-    FullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, SWITCHING_PROTOCOLS);
-    response.headers().set(UPGRADE, "websocket");
-
-    assertTrue(channel.writeOutbound(response));
-
-    assertNull(ServerRequestContext.nextResponse(channel));
-    assertNotNull(channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).get());
-    ReferenceCountUtil.release(channel.readOutbound());
-    channel.finishAndReleaseAll();
-    assertTraces(trace(span().root().operationName("websocket-handshake-server")));
-  }
-
-  @Test
-  void fullNonWebsocketUpgradeWaitsForFinalResponse() {
-    EmbeddedChannel channel = new EmbeddedChannel(HttpServerResponseTracingHandler.INSTANCE);
-    AgentSpan span = startSpan("netty", "h2c-upgrade-server");
-    ServerRequestContext serverContext = ServerRequestContext.add(channel, span, null);
-    FullHttpResponse upgradeResponse = new DefaultFullHttpResponse(HTTP_1_1, SWITCHING_PROTOCOLS);
-    upgradeResponse.headers().set(UPGRADE, "h2c");
-
-    assertTrue(channel.writeOutbound(upgradeResponse));
-
-    assertSame(serverContext, ServerRequestContext.nextResponse(channel));
-    assertNull(channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).get());
-    ReferenceCountUtil.release(channel.readOutbound());
-
-    assertTrue(channel.writeOutbound(new DefaultFullHttpResponse(HTTP_1_1, OK)));
-
-    assertNull(ServerRequestContext.nextResponse(channel));
-    ReferenceCountUtil.release(channel.readOutbound());
-    channel.finishAndReleaseAll();
-
-    assertTraces(trace(span().root().operationName("h2c-upgrade-server")));
-  }
+    @Test
+    void finishesMirroredContextOnLastContentWhenRequestQueueIsAbsent() {
+        EmbeddedChannel channel = new EmbeddedChannel(HttpServerResponseTracingHandler.INSTANCE);
+        AgentSpan span = startSpan("netty", "mirrored-http2-server");
+        channel.attr(CONTEXT_ATTRIBUTE_KEY).set(span);
+
+        HttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
+        assertTrue(channel.writeOutbound(response));
+
+        assertSame(span, channel.attr(CONTEXT_ATTRIBUTE_KEY).get());
+        HttpResponse forwarded = channel.readOutbound();
+        assertSame(response, forwarded);
+        ReferenceCountUtil.release(forwarded);
+
+        assertTrue(channel.writeOutbound(LastHttpContent.EMPTY_LAST_CONTENT));
+
+        ReferenceCountUtil.release(channel.readOutbound());
+        assertNull(channel.attr(CONTEXT_ATTRIBUTE_KEY).get());
+        channel.finishAndReleaseAll();
+        assertTraces(trace(span().root().operationName("mirrored-http2-server")));
+    }
+
+    @Test
+    void forwardsLastContentBeforeFinalResponseWithoutCompletingContext() {
+        EmbeddedChannel channel = new EmbeddedChannel(HttpServerResponseTracingHandler.INSTANCE);
+        ServerRequestContext serverContext = ServerRequestContext.add(channel, Context.root(), null);
+        LastHttpContent lastContent = new DefaultLastHttpContent();
+
+        assertTrue(channel.writeOutbound(lastContent));
+
+        assertSame(serverContext, ServerRequestContext.nextResponse(channel));
+        LastHttpContent forwarded = channel.readOutbound();
+        assertSame(lastContent, forwarded);
+        forwarded.release();
+        channel.finishAndReleaseAll();
+    }
+
+    @Test
+    void headerOnlyResponseWaitsForLastContent() {
+        EmbeddedChannel channel = new EmbeddedChannel(HttpServerResponseTracingHandler.INSTANCE);
+        AgentSpan span = startSpan("netty", "header-only-server");
+        ServerRequestContext serverContext = ServerRequestContext.add(channel, span, null);
+        ServerRequestContext nextServerContext = ServerRequestContext.add(channel, Context.root(), null);
+        HttpResponse response = new DefaultHttpResponse(HTTP_1_1, NO_CONTENT);
+
+        assertTrue(channel.writeOutbound(response));
+
+        assertSame(serverContext, ServerRequestContext.nextResponse(channel));
+        HttpResponse forwarded = channel.readOutbound();
+        assertSame(response, forwarded);
+        ReferenceCountUtil.release(forwarded);
+        assertNull(channel.readOutbound());
+
+        assertTrue(channel.writeOutbound(LastHttpContent.EMPTY_LAST_CONTENT));
+
+        assertSame(nextServerContext, ServerRequestContext.nextResponse(channel));
+        ReferenceCountUtil.release(channel.readOutbound());
+        ServerRequestContext.remove(channel, nextServerContext);
+        channel.finishAndReleaseAll();
+        assertTraces(trace(span().root().operationName("header-only-server")));
+    }
+
+    @Test
+    void rawFixedLengthBodyWaitsForLastContent() {
+        EmbeddedChannel channel = new EmbeddedChannel(HttpServerResponseTracingHandler.INSTANCE);
+        AgentSpan span = startSpan("netty", "raw-body-server");
+        ServerRequestContext serverContext = ServerRequestContext.add(channel, span, null);
+        ServerRequestContext nextServerContext = ServerRequestContext.add(channel, Context.root(), null);
+        HttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
+        response.headers().set(CONTENT_LENGTH, 4);
+
+        assertTrue(channel.writeOutbound(response));
+        ReferenceCountUtil.release(channel.readOutbound());
+        assertTrue(channel.writeOutbound(Unpooled.wrappedBuffer(new byte[] {1, 2, 3, 4})));
+
+        assertSame(serverContext, ServerRequestContext.nextResponse(channel));
+        ReferenceCountUtil.release(channel.readOutbound());
+        assertNull(channel.readOutbound());
+
+        assertTrue(channel.writeOutbound(LastHttpContent.EMPTY_LAST_CONTENT));
+
+        assertSame(nextServerContext, ServerRequestContext.nextResponse(channel));
+        ReferenceCountUtil.release(channel.readOutbound());
+        ServerRequestContext.remove(channel, nextServerContext);
+        channel.finishAndReleaseAll();
+        assertTraces(trace(span().root().operationName("raw-body-server")));
+    }
+
+    @Test
+    void doesNotThrowOnMalformedContentLength() {
+        EmbeddedChannel channel = new EmbeddedChannel(HttpServerResponseTracingHandler.INSTANCE);
+        AgentSpan span = startSpan("netty", "malformed-content-length-server");
+        ServerRequestContext.add(channel, span, null);
+        FullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, OK);
+        response.headers().set(CONTENT_LENGTH, "malformed");
+
+        assertDoesNotThrow(() -> assertTrue(channel.writeOutbound(response)));
+
+        FullHttpResponse forwarded = channel.readOutbound();
+        assertSame(response, forwarded);
+        forwarded.release();
+        channel.finishAndReleaseAll();
+        assertTraces(trace(span().root().operationName("malformed-content-length-server")));
+    }
+
+    @Test
+    void nettyEncoderRequiresLastContentBeforeNextKeepAliveResponse() {
+        EmbeddedChannel channel = new EmbeddedChannel(new HttpResponseEncoder());
+        HttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
+        response.headers().set(CONNECTION, KEEP_ALIVE);
+        response.headers().set(CONTENT_LENGTH, 4);
+
+        assertTrue(channel.writeOutbound(response));
+        ReferenceCountUtil.release(channel.readOutbound());
+        assertTrue(channel.writeOutbound(Unpooled.wrappedBuffer(new byte[] {1, 2, 3, 4})));
+        ReferenceCountUtil.release(channel.readOutbound());
+
+        EncoderException exception = assertThrows(
+                EncoderException.class, () -> channel.writeOutbound(new DefaultFullHttpResponse(HTTP_1_1, OK)));
+
+        assertTrue(exception.getCause() instanceof IllegalStateException);
+
+        assertTrue(channel.writeOutbound(LastHttpContent.EMPTY_LAST_CONTENT));
+        ReferenceCountUtil.release(channel.readOutbound());
+        assertTrue(channel.writeOutbound(new DefaultFullHttpResponse(HTTP_1_1, OK)));
+        ReferenceCountUtil.release(channel.readOutbound());
+        channel.finishAndReleaseAll();
+    }
+
+    @Test
+    void fullWebsocketUpgradeCompletesContextAndPreservesHandshakeSpan() {
+        EmbeddedChannel channel = new EmbeddedChannel(HttpServerResponseTracingHandler.INSTANCE);
+        AgentSpan span = startSpan("netty", "websocket-handshake-server");
+        ServerRequestContext.add(channel, span, null);
+        FullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, SWITCHING_PROTOCOLS);
+        response.headers().set(UPGRADE, "websocket");
+
+        assertTrue(channel.writeOutbound(response));
+
+        assertNull(ServerRequestContext.nextResponse(channel));
+        assertNotNull(channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).get());
+        ReferenceCountUtil.release(channel.readOutbound());
+        channel.finishAndReleaseAll();
+        assertTraces(trace(span().root().operationName("websocket-handshake-server")));
+    }
+
+    @Test
+    void fullNonWebsocketUpgradeWaitsForFinalResponse() {
+        EmbeddedChannel channel = new EmbeddedChannel(HttpServerResponseTracingHandler.INSTANCE);
+        AgentSpan span = startSpan("netty", "h2c-upgrade-server");
+        ServerRequestContext serverContext = ServerRequestContext.add(channel, span, null);
+        FullHttpResponse upgradeResponse = new DefaultFullHttpResponse(HTTP_1_1, SWITCHING_PROTOCOLS);
+        upgradeResponse.headers().set(UPGRADE, "h2c");
+
+        assertTrue(channel.writeOutbound(upgradeResponse));
+
+        assertSame(serverContext, ServerRequestContext.nextResponse(channel));
+        assertNull(channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).get());
+        ReferenceCountUtil.release(channel.readOutbound());
+
+        assertTrue(channel.writeOutbound(new DefaultFullHttpResponse(HTTP_1_1, OK)));
+
+        assertNull(ServerRequestContext.nextResponse(channel));
+        ReferenceCountUtil.release(channel.readOutbound());
+        channel.finishAndReleaseAll();
+
+        assertTraces(trace(span().root().operationName("h2c-upgrade-server")));
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/MaybeBlockResponseHandlerTest.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/MaybeBlockResponseHandlerTest.java
index 2f98851a807..72d8aaf61cd 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/MaybeBlockResponseHandlerTest.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/MaybeBlockResponseHandlerTest.java
@@ -43,130 +43,123 @@
 
 class MaybeBlockResponseHandlerTest extends AbstractInstrumentationTest {
 
-  private static final HttpResponseStatus EARLY_HINTS = new HttpResponseStatus(103, "Early Hints");
-
-  private Object appSecSubscriptions;
-  private boolean originalAppSecActive;
+    private static final HttpResponseStatus EARLY_HINTS = new HttpResponseStatus(103, "Early Hints");
+
+    private Object appSecSubscriptions;
+    private boolean originalAppSecActive;
+
+    @AfterEach
+    void resetAppSec() {
+        if (appSecSubscriptions != null) {
+            ((SubscriptionService) appSecSubscriptions).reset();
+            appSecSubscriptions = null;
+            ActiveSubsystems.APPSEC_ACTIVE = originalAppSecActive;
+        }
+    }
 
-  @AfterEach
-  void resetAppSec() {
-    if (appSecSubscriptions != null) {
-      ((SubscriptionService) appSecSubscriptions).reset();
-      appSecSubscriptions = null;
-      ActiveSubsystems.APPSEC_ACTIVE = originalAppSecActive;
+    @Test
+    void blocksFinalResponseUsingMirroredContextAfterInformationalResponse() {
+        enableAppSecResponseBlocking();
+        Context context = DECORATE.startSpan(new DefaultHttpHeaders(), Context.root());
+        AgentSpan span = AgentSpan.fromContext(context);
+        EmbeddedChannel channel = new EmbeddedChannel(MaybeBlockResponseHandler.INSTANCE);
+        channel.attr(CONTEXT_ATTRIBUTE_KEY).set(context);
+        FullHttpResponse informationalResponse = null;
+        FullHttpResponse response = null;
+
+        try {
+            channel.writeOutbound(new DefaultFullHttpResponse(HTTP_1_1, EARLY_HINTS));
+
+            informationalResponse = channel.readOutbound();
+            assertNotNull(informationalResponse);
+            assertEquals(EARLY_HINTS, informationalResponse.status());
+            informationalResponse.release();
+            informationalResponse = null;
+
+            channel.writeOutbound(new DefaultFullHttpResponse(HTTP_1_1, OK));
+
+            response = channel.readOutbound();
+            assertNotNull(response);
+            assertEquals(FORBIDDEN, response.status());
+        } finally {
+            ReferenceCountUtil.release(informationalResponse);
+            ReferenceCountUtil.release(response);
+            channel.finishAndReleaseAll();
+            span.finish();
+        }
     }
-  }
-
-  @Test
-  void blocksFinalResponseUsingMirroredContextAfterInformationalResponse() {
-    enableAppSecResponseBlocking();
-    Context context = DECORATE.startSpan(new DefaultHttpHeaders(), Context.root());
-    AgentSpan span = AgentSpan.fromContext(context);
-    EmbeddedChannel channel = new EmbeddedChannel(MaybeBlockResponseHandler.INSTANCE);
-    channel.attr(CONTEXT_ATTRIBUTE_KEY).set(context);
-    FullHttpResponse informationalResponse = null;
-    FullHttpResponse response = null;
-
-    try {
-      channel.writeOutbound(new DefaultFullHttpResponse(HTTP_1_1, EARLY_HINTS));
-
-      informationalResponse = channel.readOutbound();
-      assertNotNull(informationalResponse);
-      assertEquals(EARLY_HINTS, informationalResponse.status());
-      informationalResponse.release();
-      informationalResponse = null;
-
-      channel.writeOutbound(new DefaultFullHttpResponse(HTTP_1_1, OK));
-
-      response = channel.readOutbound();
-      assertNotNull(response);
-      assertEquals(FORBIDDEN, response.status());
-    } finally {
-      ReferenceCountUtil.release(informationalResponse);
-      ReferenceCountUtil.release(response);
-      channel.finishAndReleaseAll();
-      span.finish();
+
+    @Test
+    void blocksNonWebSocketSwitchingProtocolsResponse() {
+        enableAppSecResponseBlocking();
+        Context context = DECORATE.startSpan(new DefaultHttpHeaders(), Context.root());
+        AgentSpan span = AgentSpan.fromContext(context);
+        EmbeddedChannel channel = new EmbeddedChannel(MaybeBlockResponseHandler.INSTANCE);
+        channel.attr(CONTEXT_ATTRIBUTE_KEY).set(context);
+        FullHttpResponse response = null;
+
+        try {
+            FullHttpResponse switchingProtocols = new DefaultFullHttpResponse(HTTP_1_1, SWITCHING_PROTOCOLS);
+            switchingProtocols.headers().set(UPGRADE, "h2c");
+
+            channel.writeOutbound(switchingProtocols);
+
+            response = channel.readOutbound();
+            assertNotNull(response);
+            assertEquals(FORBIDDEN, response.status());
+        } finally {
+            ReferenceCountUtil.release(response);
+            channel.finishAndReleaseAll();
+            span.finish();
+        }
     }
-  }
-
-  @Test
-  void blocksNonWebSocketSwitchingProtocolsResponse() {
-    enableAppSecResponseBlocking();
-    Context context = DECORATE.startSpan(new DefaultHttpHeaders(), Context.root());
-    AgentSpan span = AgentSpan.fromContext(context);
-    EmbeddedChannel channel = new EmbeddedChannel(MaybeBlockResponseHandler.INSTANCE);
-    channel.attr(CONTEXT_ATTRIBUTE_KEY).set(context);
-    FullHttpResponse response = null;
-
-    try {
-      FullHttpResponse switchingProtocols =
-          new DefaultFullHttpResponse(HTTP_1_1, SWITCHING_PROTOCOLS);
-      switchingProtocols.headers().set(UPGRADE, "h2c");
-
-      channel.writeOutbound(switchingProtocols);
-
-      response = channel.readOutbound();
-      assertNotNull(response);
-      assertEquals(FORBIDDEN, response.status());
-    } finally {
-      ReferenceCountUtil.release(response);
-      channel.finishAndReleaseAll();
-      span.finish();
+
+    @Test
+    void dropsWritesAfterBlockedContextHasBeenRemoved() {
+        EmbeddedChannel channel = new EmbeddedChannel(MaybeBlockResponseHandler.INSTANCE);
+        ServerRequestContext serverContext = ServerRequestContext.add(channel, Context.root(), null);
+        ServerRequestContext.markResponseBlocked(channel);
+        ServerRequestContext.remove(channel, serverContext);
+        ByteBuf lateResponseChunk = Unpooled.buffer().writeByte(1);
+        ChannelPromise promise = channel.newPromise();
+
+        channel.pipeline().write(lateResponseChunk, promise);
+
+        assertEquals(0, lateResponseChunk.refCnt());
+        assertTrue(promise.isDone());
+        assertFalse(promise.isSuccess());
+        assertTrue(promise.cause() instanceof ClosedChannelException);
+        assertNull(channel.readOutbound());
+        channel.finishAndReleaseAll();
     }
-  }
-
-  @Test
-  void dropsWritesAfterBlockedContextHasBeenRemoved() {
-    EmbeddedChannel channel = new EmbeddedChannel(MaybeBlockResponseHandler.INSTANCE);
-    ServerRequestContext serverContext = ServerRequestContext.add(channel, Context.root(), null);
-    ServerRequestContext.markResponseBlocked(channel);
-    ServerRequestContext.remove(channel, serverContext);
-    ByteBuf lateResponseChunk = Unpooled.buffer().writeByte(1);
-    ChannelPromise promise = channel.newPromise();
-
-    channel.pipeline().write(lateResponseChunk, promise);
-
-    assertEquals(0, lateResponseChunk.refCnt());
-    assertTrue(promise.isDone());
-    assertFalse(promise.isSuccess());
-    assertTrue(promise.cause() instanceof ClosedChannelException);
-    assertNull(channel.readOutbound());
-    channel.finishAndReleaseAll();
-  }
-
-  private void enableAppSecResponseBlocking() {
-    SubscriptionService subscriptions =
-        (SubscriptionService) AgentTracer.get().getSubscriptionService(RequestContextSlot.APPSEC);
-    appSecSubscriptions = subscriptions;
-    originalAppSecActive = ActiveSubsystems.APPSEC_ACTIVE;
-    ActiveSubsystems.APPSEC_ACTIVE = true;
-
-    subscriptions.registerCallback(
-        EVENTS.requestStarted(),
-        new Supplier<Flow<Object>>() {
-          @Override
-          public Flow<Object> get() {
-            return new Flow.ResultFlow<>(new Object());
-          }
+
+    private void enableAppSecResponseBlocking() {
+        SubscriptionService subscriptions =
+                (SubscriptionService) AgentTracer.get().getSubscriptionService(RequestContextSlot.APPSEC);
+        appSecSubscriptions = subscriptions;
+        originalAppSecActive = ActiveSubsystems.APPSEC_ACTIVE;
+        ActiveSubsystems.APPSEC_ACTIVE = true;
+
+        subscriptions.registerCallback(EVENTS.requestStarted(), new Supplier<Flow<Object>>() {
+            @Override
+            public Flow<Object> get() {
+                return new Flow.ResultFlow<>(new Object());
+            }
         });
-    subscriptions.registerCallback(
-        EVENTS.responseHeader(),
-        new TriConsumer<RequestContext, String, String>() {
-          @Override
-          public void accept(RequestContext requestContext, String name, String value) {}
+        subscriptions.registerCallback(EVENTS.responseHeader(), new TriConsumer<RequestContext, String, String>() {
+            @Override
+            public void accept(RequestContext requestContext, String name, String value) {}
         });
-    subscriptions.registerCallback(
-        EVENTS.responseHeaderDone(),
-        new Function<RequestContext, Flow<Void>>() {
-          @Override
-          public Flow<Void> apply(RequestContext requestContext) {
-            return new Flow.ResultFlow<Void>(null) {
-              @Override
-              public Action getAction() {
-                return new Action.RequestBlockingAction(403, BlockingContentType.AUTO);
-              }
-            };
-          }
+        subscriptions.registerCallback(EVENTS.responseHeaderDone(), new Function<RequestContext, Flow<Void>>() {
+            @Override
+            public Flow<Void> apply(RequestContext requestContext) {
+                return new Flow.ResultFlow<Void>(null) {
+                    @Override
+                    public Action getAction() {
+                        return new Action.RequestBlockingAction(403, BlockingContentType.AUTO);
+                    }
+                };
+            }
         });
-  }
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyChunkedResponseSpanTest.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyChunkedResponseSpanTest.java
index 1fae3626f0e..a353ecc6f45 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyChunkedResponseSpanTest.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyChunkedResponseSpanTest.java
@@ -72,867 +72,800 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class NettyChunkedResponseSpanTest extends NettyHttpServerTestSupport {
 
-  private static final String PATH = "/chunked";
-  private static final String CONTINUE_PATH = "/chunked/continue";
-  private static final String NO_CONTENT_PATH = "/bodyless/no-content";
-  private static final String RESET_CONTENT_PATH = "/bodyless/reset-content";
-  private static final String NOT_MODIFIED_PATH = "/bodyless/not-modified";
-  private static final String CONTENT_LENGTH_ZERO_PATH = "/bodyless/content-length-zero";
-  private static final String HEAD_PATH = "/bodyless/head";
-  private static final String NO_RESPONSE_PATH = "/no-response";
-  private static final String CLOSE_DELIMITED_PATH = "/close-delimited";
-  private static final String CLOSE_DELIMITED_FULL_RESPONSE_PATH = "/close-delimited/full";
-  private static final String KNOWN_LENGTH_FULL_RESPONSE_PATH = "/known-length/full";
-  private static final String KNOWN_LENGTH_BYTE_BUF_PATH = "/known-length/bytebuf";
-  private static final String KNOWN_LENGTH_FILE_REGION_PATH = "/known-length/file-region";
-  private static final String INCOMPLETE_KNOWN_LENGTH_PATH = "/known-length/incomplete";
-  private static final String WEBSOCKET_PATH = "/websocket";
-  private static final String CUSTOM_WEBSOCKET_STATUS_PATH = "/websocket/custom-status";
-  private static final String CONNECT_AUTHORITY = "example.com:443";
-  private static final String EARLY_HINTS_PATH = "/chunked/early-hints";
-  private static final HttpResponseStatus EARLY_HINTS = new HttpResponseStatus(103, "Early Hints");
-  private static final HttpResponseStatus CUSTOM_SWITCHING_PROTOCOLS =
-      new HttpResponseStatus(SWITCHING_PROTOCOLS.code(), "Switching Protocols");
-
-  private final ChunkedResponseHandler handler = new ChunkedResponseHandler();
-
-  @Override
-  protected void configurePipeline(Channel ch) {
-    ch.pipeline().addLast(new HttpServerCodec());
-    ch.pipeline().addLast(handler);
-  }
-
-  @Test
-  void keepsServerSpanOpenUntilLastResponseChunk() throws Exception {
-    boolean reportedBeforeLastChunk;
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request().getBytes(US_ASCII));
-      socket.getOutputStream().flush();
-
-      ChannelHandlerContext responseContext = handler.awaitFirstChunkWritten();
-      reportedBeforeLastChunk = writer.waitForTracesMax(1, 1);
-
-      writeLastChunk(responseContext);
-      assertEquals("first", readChunkedHttpResponseBody(socket.getInputStream()));
-    }
-
-    assertFalse(
-        reportedBeforeLastChunk, "server span should not be reported before LastHttpContent");
-    assertTraces(trace(serverSpan(PATH)));
-  }
-
-  @Test
-  void finishesServerSpanWithoutFramingErrorWhenConnectionDrops() throws Exception {
-    boolean reportedBeforeConnectionDrop;
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request().getBytes(US_ASCII));
-      socket.getOutputStream().flush();
-
-      ChannelHandlerContext responseContext = handler.awaitFirstChunkWritten();
-      reportedBeforeConnectionDrop = writer.waitForTracesMax(1, 1);
-
-      closeChannel(responseContext);
-    }
-
-    assertFalse(
-        reportedBeforeConnectionDrop, "server span should not be reported before connection drop");
-    assertTraces(trace(serverSpan(PATH)));
-  }
-
-  @Test
-  void finishesServerSpanWithoutErrorForCloseDelimitedResponse() throws Exception {
-    boolean reportedBeforeConnectionClose;
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request(CLOSE_DELIMITED_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
-
-      ChannelHandlerContext responseContext = handler.awaitFirstChunkWritten();
-      reportedBeforeConnectionClose = writer.waitForTracesMax(1, 1);
-
-      closeChannel(responseContext);
-    }
-
-    assertFalse(
-        reportedBeforeConnectionClose,
-        "server span should not be reported before the connection closes");
-    // The response has neither Content-Length nor chunked encoding, so closing the connection is
-    // its normal completion and the span must not be flagged as an error.
-    assertTraces(trace(serverSpan(CLOSE_DELIMITED_PATH)));
-  }
-
-  @Test
-  void finishesCloseDelimitedFullResponseOnLastContent() throws Exception {
-    boolean reportedBeforeConnectionClose;
-    try (Socket socket = connect()) {
-      socket
-          .getOutputStream()
-          .write(request(CLOSE_DELIMITED_FULL_RESPONSE_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
-
-      ChannelHandlerContext responseContext = handler.awaitCloseDelimitedFullResponseWritten();
-      reportedBeforeConnectionClose = writer.waitForTracesMax(1, 5);
-
-      closeChannel(responseContext);
-    }
-
-    assertTrue(
-        reportedBeforeConnectionClose,
-        "a FullHttpResponse should finish the server span before the connection closes");
-    assertTraces(trace(serverSpan(CLOSE_DELIMITED_FULL_RESPONSE_PATH)));
-  }
-
-  @Test
-  void knownLengthByteBufResponseWaitsForLastContent() throws Exception {
-    boolean reportedBeforeLastContent;
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request(KNOWN_LENGTH_BYTE_BUF_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
-
-      ChannelHandlerContext responseContext = handler.awaitKnownLengthByteBufWritten();
-      reportedBeforeLastContent = writer.waitForTracesMax(1, 1);
-      writeLastChunk(responseContext);
-      assertEquals("first", readHttpResponseBody(socket.getInputStream()));
-      assertTrue(
-          writer.waitForTracesMax(1, 5), "server span should be reported after LastHttpContent");
-    }
-
-    assertFalse(
-        reportedBeforeLastContent,
-        "Content-Length body bytes should not finish the span before LastHttpContent");
-    assertTraces(trace(serverSpan(KNOWN_LENGTH_BYTE_BUF_PATH)));
-  }
-
-  @Test
-  void callsIastRequestEndedForKnownLengthFullResponse() throws Exception {
-    Object iastRequestData = new Object();
-    AtomicReference<String> authorization = new AtomicReference<>();
-    AtomicBoolean requestEnded = new AtomicBoolean();
-    AtomicBoolean requestSpanActive = new AtomicBoolean();
-
-    Events<Object> events = Events.get();
-    Subscription requestStarted =
-        AgentTracer.get()
-            .getSubscriptionService(RequestContextSlot.IAST)
-            .registerCallback(
-                events.requestStarted(),
-                new Supplier<Flow<Object>>() {
-                  @Override
-                  public Flow<Object> get() {
-                    return new Flow.ResultFlow<>(iastRequestData);
-                  }
+    private static final String PATH = "/chunked";
+    private static final String CONTINUE_PATH = "/chunked/continue";
+    private static final String NO_CONTENT_PATH = "/bodyless/no-content";
+    private static final String RESET_CONTENT_PATH = "/bodyless/reset-content";
+    private static final String NOT_MODIFIED_PATH = "/bodyless/not-modified";
+    private static final String CONTENT_LENGTH_ZERO_PATH = "/bodyless/content-length-zero";
+    private static final String HEAD_PATH = "/bodyless/head";
+    private static final String NO_RESPONSE_PATH = "/no-response";
+    private static final String CLOSE_DELIMITED_PATH = "/close-delimited";
+    private static final String CLOSE_DELIMITED_FULL_RESPONSE_PATH = "/close-delimited/full";
+    private static final String KNOWN_LENGTH_FULL_RESPONSE_PATH = "/known-length/full";
+    private static final String KNOWN_LENGTH_BYTE_BUF_PATH = "/known-length/bytebuf";
+    private static final String KNOWN_LENGTH_FILE_REGION_PATH = "/known-length/file-region";
+    private static final String INCOMPLETE_KNOWN_LENGTH_PATH = "/known-length/incomplete";
+    private static final String WEBSOCKET_PATH = "/websocket";
+    private static final String CUSTOM_WEBSOCKET_STATUS_PATH = "/websocket/custom-status";
+    private static final String CONNECT_AUTHORITY = "example.com:443";
+    private static final String EARLY_HINTS_PATH = "/chunked/early-hints";
+    private static final HttpResponseStatus EARLY_HINTS = new HttpResponseStatus(103, "Early Hints");
+    private static final HttpResponseStatus CUSTOM_SWITCHING_PROTOCOLS =
+            new HttpResponseStatus(SWITCHING_PROTOCOLS.code(), "Switching Protocols");
+
+    private final ChunkedResponseHandler handler = new ChunkedResponseHandler();
+
+    @Override
+    protected void configurePipeline(Channel ch) {
+        ch.pipeline().addLast(new HttpServerCodec());
+        ch.pipeline().addLast(handler);
+    }
+
+    @Test
+    void keepsServerSpanOpenUntilLastResponseChunk() throws Exception {
+        boolean reportedBeforeLastChunk;
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request().getBytes(US_ASCII));
+            socket.getOutputStream().flush();
+
+            ChannelHandlerContext responseContext = handler.awaitFirstChunkWritten();
+            reportedBeforeLastChunk = writer.waitForTracesMax(1, 1);
+
+            writeLastChunk(responseContext);
+            assertEquals("first", readChunkedHttpResponseBody(socket.getInputStream()));
+        }
+
+        assertFalse(reportedBeforeLastChunk, "server span should not be reported before LastHttpContent");
+        assertTraces(trace(serverSpan(PATH)));
+    }
+
+    @Test
+    void finishesServerSpanWithoutFramingErrorWhenConnectionDrops() throws Exception {
+        boolean reportedBeforeConnectionDrop;
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request().getBytes(US_ASCII));
+            socket.getOutputStream().flush();
+
+            ChannelHandlerContext responseContext = handler.awaitFirstChunkWritten();
+            reportedBeforeConnectionDrop = writer.waitForTracesMax(1, 1);
+
+            closeChannel(responseContext);
+        }
+
+        assertFalse(reportedBeforeConnectionDrop, "server span should not be reported before connection drop");
+        assertTraces(trace(serverSpan(PATH)));
+    }
+
+    @Test
+    void finishesServerSpanWithoutErrorForCloseDelimitedResponse() throws Exception {
+        boolean reportedBeforeConnectionClose;
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request(CLOSE_DELIMITED_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
+
+            ChannelHandlerContext responseContext = handler.awaitFirstChunkWritten();
+            reportedBeforeConnectionClose = writer.waitForTracesMax(1, 1);
+
+            closeChannel(responseContext);
+        }
+
+        assertFalse(reportedBeforeConnectionClose, "server span should not be reported before the connection closes");
+        // The response has neither Content-Length nor chunked encoding, so closing the connection is
+        // its normal completion and the span must not be flagged as an error.
+        assertTraces(trace(serverSpan(CLOSE_DELIMITED_PATH)));
+    }
+
+    @Test
+    void finishesCloseDelimitedFullResponseOnLastContent() throws Exception {
+        boolean reportedBeforeConnectionClose;
+        try (Socket socket = connect()) {
+            socket.getOutputStream()
+                    .write(request(CLOSE_DELIMITED_FULL_RESPONSE_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
+
+            ChannelHandlerContext responseContext = handler.awaitCloseDelimitedFullResponseWritten();
+            reportedBeforeConnectionClose = writer.waitForTracesMax(1, 5);
+
+            closeChannel(responseContext);
+        }
+
+        assertTrue(
+                reportedBeforeConnectionClose,
+                "a FullHttpResponse should finish the server span before the connection closes");
+        assertTraces(trace(serverSpan(CLOSE_DELIMITED_FULL_RESPONSE_PATH)));
+    }
+
+    @Test
+    void knownLengthByteBufResponseWaitsForLastContent() throws Exception {
+        boolean reportedBeforeLastContent;
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request(KNOWN_LENGTH_BYTE_BUF_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
+
+            ChannelHandlerContext responseContext = handler.awaitKnownLengthByteBufWritten();
+            reportedBeforeLastContent = writer.waitForTracesMax(1, 1);
+            writeLastChunk(responseContext);
+            assertEquals("first", readHttpResponseBody(socket.getInputStream()));
+            assertTrue(writer.waitForTracesMax(1, 5), "server span should be reported after LastHttpContent");
+        }
+
+        assertFalse(
+                reportedBeforeLastContent,
+                "Content-Length body bytes should not finish the span before LastHttpContent");
+        assertTraces(trace(serverSpan(KNOWN_LENGTH_BYTE_BUF_PATH)));
+    }
+
+    @Test
+    void callsIastRequestEndedForKnownLengthFullResponse() throws Exception {
+        Object iastRequestData = new Object();
+        AtomicReference<String> authorization = new AtomicReference<>();
+        AtomicBoolean requestEnded = new AtomicBoolean();
+        AtomicBoolean requestSpanActive = new AtomicBoolean();
+
+        Events<Object> events = Events.get();
+        Subscription requestStarted = AgentTracer.get()
+                .getSubscriptionService(RequestContextSlot.IAST)
+                .registerCallback(events.requestStarted(), new Supplier<Flow<Object>>() {
+                    @Override
+                    public Flow<Object> get() {
+                        return new Flow.ResultFlow<>(iastRequestData);
+                    }
                 });
-    Subscription requestHeader =
-        AgentTracer.get()
-            .getSubscriptionService(RequestContextSlot.IAST)
-            .registerCallback(
-                events.requestHeader(),
-                new TriConsumer<RequestContext, String, String>() {
-                  @Override
-                  public void accept(RequestContext context, String key, String value) {
-                    if (iastRequestData == context.getData(RequestContextSlot.IAST)
-                        && "authorization".equalsIgnoreCase(key)) {
-                      authorization.set(value);
+        Subscription requestHeader = AgentTracer.get()
+                .getSubscriptionService(RequestContextSlot.IAST)
+                .registerCallback(events.requestHeader(), new TriConsumer<RequestContext, String, String>() {
+                    @Override
+                    public void accept(RequestContext context, String key, String value) {
+                        if (iastRequestData == context.getData(RequestContextSlot.IAST)
+                                && "authorization".equalsIgnoreCase(key)) {
+                            authorization.set(value);
+                        }
                     }
-                  }
                 });
-    Subscription requestEnd =
-        AgentTracer.get()
-            .getSubscriptionService(RequestContextSlot.IAST)
-            .registerCallback(
-                events.requestEnded(),
-                new BiFunction<RequestContext, IGSpanInfo, Flow<Void>>() {
-                  @Override
-                  public Flow<Void> apply(RequestContext context, IGSpanInfo span) {
-                    if (iastRequestData == context.getData(RequestContextSlot.IAST)) {
-                      requestEnded.set(true);
-                      AgentSpan activeSpan = AgentTracer.activeSpan();
-                      requestSpanActive.set(
-                          activeSpan != null && activeSpan.getRequestContext() == context);
+        Subscription requestEnd = AgentTracer.get()
+                .getSubscriptionService(RequestContextSlot.IAST)
+                .registerCallback(events.requestEnded(), new BiFunction<RequestContext, IGSpanInfo, Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext context, IGSpanInfo span) {
+                        if (iastRequestData == context.getData(RequestContextSlot.IAST)) {
+                            requestEnded.set(true);
+                            AgentSpan activeSpan = AgentTracer.activeSpan();
+                            requestSpanActive.set(activeSpan != null && activeSpan.getRequestContext() == context);
+                        }
+                        return Flow.ResultFlow.empty();
                     }
-                    return Flow.ResultFlow.empty();
-                  }
                 });
 
-    try {
-      try (Socket socket = connect()) {
-        socket
-            .getOutputStream()
-            .write(
-                requestWithAuthorization(KNOWN_LENGTH_FULL_RESPONSE_PATH, "Basic dXNlcjpwYXNz")
-                    .getBytes(US_ASCII));
-        socket.getOutputStream().flush();
-
-        assertEquals("ok", readHttpResponseBody(socket.getInputStream()));
-      }
-
-      assertTraces(trace(serverSpan(KNOWN_LENGTH_FULL_RESPONSE_PATH)));
-      assertEquals("Basic dXNlcjpwYXNz", authorization.get());
-      assertTrue(requestEnded.get(), "IAST requestEnded callback was not called");
-      assertTrue(requestSpanActive.get(), "request span was not active during requestEnded");
-    } finally {
-      requestEnd.cancel();
-      requestHeader.cancel();
-      requestStarted.cancel();
-    }
-  }
-
-  @Test
-  void activatesRequestSpanWhenWritePromiseCompletesAfterWriteReturns() {
-    Object iastRequestData = new Object();
-    AtomicBoolean requestSpanActive = new AtomicBoolean();
-
-    Events<Object> events = Events.get();
-    Subscription requestEnd =
-        AgentTracer.get()
-            .getSubscriptionService(RequestContextSlot.IAST)
-            .registerCallback(
-                events.requestEnded(),
-                new BiFunction<RequestContext, IGSpanInfo, Flow<Void>>() {
-                  @Override
-                  public Flow<Void> apply(RequestContext context, IGSpanInfo span) {
-                    if (iastRequestData == context.getData(RequestContextSlot.IAST)) {
-                      AgentSpan activeSpan = AgentTracer.activeSpan();
-                      requestSpanActive.set(
-                          activeSpan != null && activeSpan.getRequestContext() == context);
+        try {
+            try (Socket socket = connect()) {
+                socket.getOutputStream()
+                        .write(requestWithAuthorization(KNOWN_LENGTH_FULL_RESPONSE_PATH, "Basic dXNlcjpwYXNz")
+                                .getBytes(US_ASCII));
+                socket.getOutputStream().flush();
+
+                assertEquals("ok", readHttpResponseBody(socket.getInputStream()));
+            }
+
+            assertTraces(trace(serverSpan(KNOWN_LENGTH_FULL_RESPONSE_PATH)));
+            assertEquals("Basic dXNlcjpwYXNz", authorization.get());
+            assertTrue(requestEnded.get(), "IAST requestEnded callback was not called");
+            assertTrue(requestSpanActive.get(), "request span was not active during requestEnded");
+        } finally {
+            requestEnd.cancel();
+            requestHeader.cancel();
+            requestStarted.cancel();
+        }
+    }
+
+    @Test
+    void activatesRequestSpanWhenWritePromiseCompletesAfterWriteReturns() {
+        Object iastRequestData = new Object();
+        AtomicBoolean requestSpanActive = new AtomicBoolean();
+
+        Events<Object> events = Events.get();
+        Subscription requestEnd = AgentTracer.get()
+                .getSubscriptionService(RequestContextSlot.IAST)
+                .registerCallback(events.requestEnded(), new BiFunction<RequestContext, IGSpanInfo, Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext context, IGSpanInfo span) {
+                        if (iastRequestData == context.getData(RequestContextSlot.IAST)) {
+                            AgentSpan activeSpan = AgentTracer.activeSpan();
+                            requestSpanActive.set(activeSpan != null && activeSpan.getRequestContext() == context);
+                        }
+                        return Flow.ResultFlow.empty();
                     }
-                    return Flow.ResultFlow.empty();
-                  }
                 });
 
-    HoldingOutboundHandler holdingHandler = new HoldingOutboundHandler();
-    EmbeddedChannel channel =
-        new EmbeddedChannel(holdingHandler, HttpServerResponseTracingHandler.INSTANCE);
-    AgentSpan span =
-        AgentTracer.get()
-            .startSpan(
-                "netty",
-                "netty.request",
-                new TagContext().withRequestContextDataIast(iastRequestData));
-    ServerRequestContext.add(channel, span, null);
-
-    try {
-      DefaultFullHttpResponse response =
-          new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.copiedBuffer("ok", UTF_8));
-      response.headers().set(CONTENT_LENGTH, response.content().readableBytes());
-
-      channel.writeOutbound(response);
-      assertFalse(requestSpanActive.get(), "write promise completed synchronously");
-
-      holdingHandler.completeWrite();
-
-      assertTrue(requestSpanActive.get(), "request span was not active during requestEnded");
-    } finally {
-      holdingHandler.completeWrite();
-      requestEnd.cancel();
-      channel.finishAndReleaseAll();
-    }
-  }
-
-  @Test
-  void marksSpanErrorWhenWritePromiseFailsAfterWriteReturns() {
-    Object iastRequestData = new Object();
-    AtomicBoolean requestSpanActive = new AtomicBoolean();
-
-    Events<Object> events = Events.get();
-    Subscription requestEnd =
-        AgentTracer.get()
-            .getSubscriptionService(RequestContextSlot.IAST)
-            .registerCallback(
-                events.requestEnded(),
-                new BiFunction<RequestContext, IGSpanInfo, Flow<Void>>() {
-                  @Override
-                  public Flow<Void> apply(RequestContext context, IGSpanInfo span) {
-                    if (iastRequestData == context.getData(RequestContextSlot.IAST)) {
-                      AgentSpan activeSpan = AgentTracer.activeSpan();
-                      requestSpanActive.set(
-                          activeSpan != null && activeSpan.getRequestContext() == context);
+        HoldingOutboundHandler holdingHandler = new HoldingOutboundHandler();
+        EmbeddedChannel channel = new EmbeddedChannel(holdingHandler, HttpServerResponseTracingHandler.INSTANCE);
+        AgentSpan span = AgentTracer.get()
+                .startSpan("netty", "netty.request", new TagContext().withRequestContextDataIast(iastRequestData));
+        ServerRequestContext.add(channel, span, null);
+
+        try {
+            DefaultFullHttpResponse response =
+                    new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.copiedBuffer("ok", UTF_8));
+            response.headers().set(CONTENT_LENGTH, response.content().readableBytes());
+
+            channel.writeOutbound(response);
+            assertFalse(requestSpanActive.get(), "write promise completed synchronously");
+
+            holdingHandler.completeWrite();
+
+            assertTrue(requestSpanActive.get(), "request span was not active during requestEnded");
+        } finally {
+            holdingHandler.completeWrite();
+            requestEnd.cancel();
+            channel.finishAndReleaseAll();
+        }
+    }
+
+    @Test
+    void marksSpanErrorWhenWritePromiseFailsAfterWriteReturns() {
+        Object iastRequestData = new Object();
+        AtomicBoolean requestSpanActive = new AtomicBoolean();
+
+        Events<Object> events = Events.get();
+        Subscription requestEnd = AgentTracer.get()
+                .getSubscriptionService(RequestContextSlot.IAST)
+                .registerCallback(events.requestEnded(), new BiFunction<RequestContext, IGSpanInfo, Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext context, IGSpanInfo span) {
+                        if (iastRequestData == context.getData(RequestContextSlot.IAST)) {
+                            AgentSpan activeSpan = AgentTracer.activeSpan();
+                            requestSpanActive.set(activeSpan != null && activeSpan.getRequestContext() == context);
+                        }
+                        return Flow.ResultFlow.empty();
                     }
-                    return Flow.ResultFlow.empty();
-                  }
                 });
 
-    HoldingOutboundHandler holdingHandler = new HoldingOutboundHandler();
-    EmbeddedChannel channel =
-        new EmbeddedChannel(holdingHandler, HttpServerResponseTracingHandler.INSTANCE);
-    AgentSpan span =
-        AgentTracer.get()
-            .startSpan(
-                "netty",
-                "netty.request",
-                new TagContext().withRequestContextDataIast(iastRequestData));
-    ServerRequestContext.add(channel, span, null);
-    IOException writeFailure = new IOException("delayed write failure");
-
-    try {
-      DefaultFullHttpResponse response =
-          new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.copiedBuffer("ok", UTF_8));
-      response.headers().set(CONTENT_LENGTH, response.content().readableBytes());
-
-      channel.writeOutbound(response);
-      assertFalse(requestSpanActive.get(), "write promise completed synchronously");
-      assertNull(ServerRequestContext.nextResponse(channel));
-
-      holdingHandler.failWrite(writeFailure);
-      assertThrows(IOException.class, channel::checkException);
-
-      assertTrue(requestSpanActive.get(), "request span was not active during requestEnded");
-      assertEquals(200, span.getTag(Tags.HTTP_STATUS));
-      assertTraces(trace(span().root().operationName("netty.request").error()));
-    } finally {
-      holdingHandler.failWrite(writeFailure);
-      requestEnd.cancel();
-      channel.finishAndReleaseAll();
-    }
-  }
-
-  @Test
-  void knownLengthFileRegionResponseWaitsForLastContent() throws Exception {
-    boolean reportedBeforeLastContent;
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request(KNOWN_LENGTH_FILE_REGION_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
-
-      ChannelHandlerContext responseContext = handler.awaitKnownLengthFileRegionWritten();
-      reportedBeforeLastContent = writer.waitForTracesMax(1, 1);
-      writeLastChunk(responseContext);
-      assertEquals("first", readHttpResponseBody(socket.getInputStream()));
-      assertTrue(
-          writer.waitForTracesMax(1, 5), "server span should be reported after LastHttpContent");
-    }
-
-    assertFalse(
-        reportedBeforeLastContent,
-        "Content-Length body bytes should not finish the span before LastHttpContent");
-    assertTraces(trace(serverSpan(KNOWN_LENGTH_FILE_REGION_PATH)));
-  }
-
-  @Test
-  void doesNotInferFramingErrorFromContentLengthWhenConnectionCloses() throws Exception {
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request(INCOMPLETE_KNOWN_LENGTH_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
-
-      ChannelHandlerContext responseContext = handler.awaitIncompleteKnownLengthWritten();
-      closeChannel(responseContext);
-    }
-
-    assertTraces(trace(serverSpan(INCOMPLETE_KNOWN_LENGTH_PATH)));
-  }
-
-  @Test
-  void closesServerSpanWithoutErrorWhenConnectionDropsBeforeResponseStarts() throws Exception {
-    boolean reportedBeforeConnectionDrop;
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request(NO_RESPONSE_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
-
-      handler.awaitRequestWithoutResponse();
-      reportedBeforeConnectionDrop = writer.waitForTracesMax(1, 1);
-    }
-
-    assertFalse(
-        reportedBeforeConnectionDrop, "server span should not be reported before connection drop");
-    assertTraces(trace(serverSpan(NO_RESPONSE_PATH)));
-  }
-
-  @Test
-  void keepsServerSpansSeparateForSequentialKeepAliveChunkedResponses() throws Exception {
-    boolean firstReportedBeforeLastChunk;
-    boolean secondReportedBeforeLastChunk;
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request().getBytes(US_ASCII));
-      socket.getOutputStream().flush();
-
-      ChannelHandlerContext firstResponseContext = handler.awaitFirstChunkWritten();
-      firstReportedBeforeLastChunk = writer.waitForTracesMax(1, 1);
-
-      writeLastChunk(firstResponseContext);
-      assertEquals("first", readChunkedHttpResponseBody(socket.getInputStream()));
-      assertTrue(writer.waitForTracesMax(1, 5), "first keep-alive response was not reported");
-
-      socket.getOutputStream().write(request().getBytes(US_ASCII));
-      socket.getOutputStream().flush();
-
-      ChannelHandlerContext secondResponseContext = handler.awaitFirstChunkWritten();
-      secondReportedBeforeLastChunk = writer.waitForTracesMax(2, 1);
-
-      writeLastChunk(secondResponseContext);
-      assertEquals("first", readChunkedHttpResponseBody(socket.getInputStream()));
-    }
-
-    assertFalse(
-        firstReportedBeforeLastChunk,
-        "first server span should not be reported before LastHttpContent");
-    assertFalse(
-        secondReportedBeforeLastChunk,
-        "second server span should not be reported before LastHttpContent");
-    assertTraces(trace(serverSpan(PATH)), trace(serverSpan(PATH)));
-  }
-
-  @Test
-  void keepsServerSpanOpenAfter100ContinueUntilLastResponseChunk() throws Exception {
-    boolean reportedAfter100Continue;
-    boolean reportedBeforeLastChunk;
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request(CONTINUE_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
-
-      ChannelHandlerContext responseContext = handler.await100ContinueWritten();
-      assertTrue(
-          readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 100 "),
-          "server did not write 100 Continue");
-      reportedAfter100Continue = writer.waitForTracesMax(1, 1);
-
-      writeFirstChunk(responseContext);
-      responseContext = handler.awaitFirstChunkWritten();
-      reportedBeforeLastChunk = writer.waitForTracesMax(1, 1);
-
-      writeLastChunk(responseContext);
-      assertEquals("first", readChunkedHttpResponseBody(socket.getInputStream()));
-    }
-
-    assertFalse(reportedAfter100Continue, "server span should not be reported after 100 Continue");
-    assertFalse(
-        reportedBeforeLastChunk, "server span should not be reported before LastHttpContent");
-    assertTraces(trace(serverSpan(CONTINUE_PATH)));
-  }
-
-  @Test
-  void keepsServerSpanOpenAfter103EarlyHintsUntilLastResponseChunk() throws Exception {
-    boolean reportedAfterEarlyHints;
-    boolean reportedBeforeLastChunk;
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request(EARLY_HINTS_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
-
-      ChannelHandlerContext responseContext = handler.awaitEarlyHintsWritten();
-      assertResponseStatus(readHeaders(socket.getInputStream()), EARLY_HINTS);
-      reportedAfterEarlyHints = writer.waitForTracesMax(1, 1);
-
-      writeFirstChunk(responseContext);
-      responseContext = handler.awaitFirstChunkWritten();
-      reportedBeforeLastChunk = writer.waitForTracesMax(1, 1);
-
-      writeLastChunk(responseContext);
-      assertEquals("first", readChunkedHttpResponseBody(socket.getInputStream()));
-    }
-
-    assertFalse(reportedAfterEarlyHints, "server span should not be reported after 103");
-    assertFalse(
-        reportedBeforeLastChunk, "server span should not be reported before LastHttpContent");
-    assertTraces(trace(serverSpan(EARLY_HINTS_PATH)));
-  }
-
-  @Test
-  void finishesServerSpanForHeaderOnlyNoContentResponse() throws Exception {
-    assertHeaderOnlyResponseFinishes(NO_CONTENT_PATH, NO_CONTENT);
-  }
-
-  @Test
-  void finishesServerSpanForHeaderOnlyResetContentResponse() throws Exception {
-    assertHeaderOnlyResponseFinishes(RESET_CONTENT_PATH, RESET_CONTENT);
-  }
-
-  @Test
-  void finishesServerSpanForHeaderOnlyNotModifiedResponse() throws Exception {
-    assertHeaderOnlyResponseFinishes(NOT_MODIFIED_PATH, NOT_MODIFIED);
-  }
-
-  @Test
-  void finishesServerSpanForHeaderOnlyContentLengthZeroResponse() throws Exception {
-    assertHeaderOnlyResponseFinishes(CONTENT_LENGTH_ZERO_PATH, OK);
-  }
-
-  @Test
-  void finishesServerSpanForHeaderOnlyHeadResponse() throws Exception {
-    assertHeaderOnlyResponseFinishes("HEAD", HEAD_PATH, OK);
-  }
-
-  @Test
-  void finishesServerSpanForHeaderOnlyConnectResponse() throws Exception {
-    assertHeaderOnlyResponseFinishes("CONNECT", CONNECT_AUTHORITY, OK, "/");
-  }
-
-  @Test
-  void finishesServerSpanForHeaderOnlyWebSocketUpgrade() throws Exception {
-    assertHeaderOnlyResponseFinishes(WEBSOCKET_PATH, SWITCHING_PROTOCOLS);
-  }
-
-  @Test
-  void finishesServerSpanForHeaderOnlyWebSocketUpgradeWithDistinctStatusInstance()
-      throws Exception {
-    assertHeaderOnlyResponseFinishes(CUSTOM_WEBSOCKET_STATUS_PATH, SWITCHING_PROTOCOLS);
-  }
-
-  private void assertHeaderOnlyResponseFinishes(String path, HttpResponseStatus status)
-      throws Exception {
-    assertHeaderOnlyResponseFinishes("GET", path, status, path);
-  }
-
-  private void assertHeaderOnlyResponseFinishes(
-      String method, String path, HttpResponseStatus status) throws Exception {
-    assertHeaderOnlyResponseFinishes(method, path, status, path);
-  }
-
-  private void assertHeaderOnlyResponseFinishes(
-      String method, String path, HttpResponseStatus status, String resourcePath) throws Exception {
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request(method, path).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
-
-      handler.awaitHeaderOnlyResponseWritten(path);
-      assertResponseStatus(readHeaders(socket.getInputStream()), status);
-      assertTrue(
-          writer.waitForTracesMax(1, 5),
-          "server span should be reported after header-only response " + status.code());
-    }
-
-    assertTraces(trace(serverSpan(method, resourcePath)));
-  }
-
-  private static String request() {
-    return request(PATH);
-  }
-
-  private static String request(String path) {
-    return request("GET", path);
-  }
-
-  private static String requestWithAuthorization(String path, String authorization) {
-    return "GET "
-        + path
-        + " HTTP/1.1\r\nHost: localhost\r\nAuthorization: "
-        + authorization
-        + "\r\n\r\n";
-  }
-
-  private static String request(String method, String path) {
-    String headers = method + " " + path + " HTTP/1.1\r\nHost: localhost\r\n";
-    if (isWebSocketPath(path)) {
-      headers +=
-          "Connection: Upgrade\r\n"
-              + "Upgrade: websocket\r\n"
-              + "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
-              + "Sec-WebSocket-Version: 13\r\n";
-    }
-    return headers + "\r\n";
-  }
-
-  private static boolean isWebSocketPath(String path) {
-    return WEBSOCKET_PATH.equals(path) || CUSTOM_WEBSOCKET_STATUS_PATH.equals(path);
-  }
-
-  private static SpanMatcher serverSpan(String path) {
-    return serverSpan("GET", path);
-  }
-
-  private static SpanMatcher serverSpan(String method, String path) {
-    return span()
-        .root()
-        .operationName(Pattern.compile("netty\\.request"))
-        .resourceName(Pattern.compile(method + " " + Pattern.quote(path)))
-        .type("web");
-  }
-
-  private static void assertResponseStatus(String headers, HttpResponseStatus status) {
-    assertTrue(
-        headers.startsWith("HTTP/1.1 " + status.code() + " "), "unexpected response: " + headers);
-  }
-
-  private void writeFirstChunk(ChannelHandlerContext responseContext) {
-    responseContext.executor().execute(() -> handler.writeChunkedResponse(responseContext));
-  }
-
-  private static void writeLastChunk(ChannelHandlerContext responseContext) {
-    responseContext.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT).syncUninterruptibly();
-  }
-
-  private static void closeChannel(ChannelHandlerContext responseContext) {
-    responseContext.executor().execute(() -> responseContext.channel().close());
-  }
-
-  @ChannelHandler.Sharable
-  private static final class ChunkedResponseHandler
-      extends SimpleChannelInboundHandler<HttpRequest> {
-    private final BlockingQueue<ChannelHandlerContext> continueWrites = new LinkedBlockingQueue<>();
-    private final BlockingQueue<ChannelHandlerContext> earlyHintsWrites =
-        new LinkedBlockingQueue<>();
-    private final BlockingQueue<ChannelHandlerContext> firstChunkWrites =
-        new LinkedBlockingQueue<>();
-    private final BlockingQueue<ChannelHandlerContext> closeDelimitedFullResponseWrites =
-        new LinkedBlockingQueue<>();
-    private final BlockingQueue<ChannelHandlerContext> knownLengthByteBufWrites =
-        new LinkedBlockingQueue<>();
-    private final BlockingQueue<ChannelHandlerContext> knownLengthFileRegionWrites =
-        new LinkedBlockingQueue<>();
-    private final BlockingQueue<ChannelHandlerContext> incompleteKnownLengthWrites =
-        new LinkedBlockingQueue<>();
-    private final BlockingQueue<String> headerOnlyWrites = new LinkedBlockingQueue<>();
-    private final BlockingQueue<ChannelHandlerContext> requestsWithoutResponse =
-        new LinkedBlockingQueue<>();
+        HoldingOutboundHandler holdingHandler = new HoldingOutboundHandler();
+        EmbeddedChannel channel = new EmbeddedChannel(holdingHandler, HttpServerResponseTracingHandler.INSTANCE);
+        AgentSpan span = AgentTracer.get()
+                .startSpan("netty", "netty.request", new TagContext().withRequestContextDataIast(iastRequestData));
+        ServerRequestContext.add(channel, span, null);
+        IOException writeFailure = new IOException("delayed write failure");
+
+        try {
+            DefaultFullHttpResponse response =
+                    new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.copiedBuffer("ok", UTF_8));
+            response.headers().set(CONTENT_LENGTH, response.content().readableBytes());
+
+            channel.writeOutbound(response);
+            assertFalse(requestSpanActive.get(), "write promise completed synchronously");
+            assertNull(ServerRequestContext.nextResponse(channel));
+
+            holdingHandler.failWrite(writeFailure);
+            assertThrows(IOException.class, channel::checkException);
+
+            assertTrue(requestSpanActive.get(), "request span was not active during requestEnded");
+            assertEquals(200, span.getTag(Tags.HTTP_STATUS));
+            assertTraces(trace(span().root().operationName("netty.request").error()));
+        } finally {
+            holdingHandler.failWrite(writeFailure);
+            requestEnd.cancel();
+            channel.finishAndReleaseAll();
+        }
+    }
+
+    @Test
+    void knownLengthFileRegionResponseWaitsForLastContent() throws Exception {
+        boolean reportedBeforeLastContent;
+        try (Socket socket = connect()) {
+            socket.getOutputStream()
+                    .write(request(KNOWN_LENGTH_FILE_REGION_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
 
-    @Override
-    protected void channelRead0(ChannelHandlerContext ctx, HttpRequest request) throws Exception {
-      if (CONTINUE_PATH.equals(request.uri())) {
-        ctx.writeAndFlush(new DefaultFullHttpResponse(HTTP_1_1, CONTINUE))
-            .addListener(future -> continueWrites.offer(ctx));
-      } else if (EARLY_HINTS_PATH.equals(request.uri())) {
-        ctx.writeAndFlush(new DefaultFullHttpResponse(HTTP_1_1, EARLY_HINTS))
-            .addListener(future -> earlyHintsWrites.offer(ctx));
-      } else if (NO_CONTENT_PATH.equals(request.uri())) {
-        writeHeaderOnlyResponse(ctx, request.uri(), NO_CONTENT);
-      } else if (RESET_CONTENT_PATH.equals(request.uri())) {
-        writeHeaderOnlyResponse(ctx, request.uri(), RESET_CONTENT);
-      } else if (NOT_MODIFIED_PATH.equals(request.uri())) {
-        writeHeaderOnlyResponse(ctx, request.uri(), NOT_MODIFIED);
-      } else if (CONTENT_LENGTH_ZERO_PATH.equals(request.uri())) {
-        writeContentLengthZeroResponse(ctx, request.uri());
-      } else if (HEAD_PATH.equals(request.uri())) {
-        writeHeaderOnlyResponse(ctx, request.uri(), OK);
-      } else if (CONNECT_AUTHORITY.equals(request.uri())) {
-        writeHeaderOnlyResponse(ctx, request.uri(), OK);
-      } else if (NO_RESPONSE_PATH.equals(request.uri())) {
-        requestsWithoutResponse.offer(ctx);
-      } else if (CLOSE_DELIMITED_PATH.equals(request.uri())) {
-        writeCloseDelimitedResponse(ctx);
-      } else if (CLOSE_DELIMITED_FULL_RESPONSE_PATH.equals(request.uri())) {
-        writeCloseDelimitedFullResponse(ctx);
-      } else if (KNOWN_LENGTH_FULL_RESPONSE_PATH.equals(request.uri())) {
-        writeKnownLengthFullResponse(ctx);
-      } else if (KNOWN_LENGTH_BYTE_BUF_PATH.equals(request.uri())) {
-        writeKnownLengthByteBufResponse(ctx);
-      } else if (KNOWN_LENGTH_FILE_REGION_PATH.equals(request.uri())) {
-        writeKnownLengthFileRegionResponse(ctx);
-      } else if (INCOMPLETE_KNOWN_LENGTH_PATH.equals(request.uri())) {
-        writeIncompleteKnownLengthResponse(ctx);
-      } else if (WEBSOCKET_PATH.equals(request.uri())) {
-        writeHeaderOnlyWebSocketUpgrade(ctx, request.uri(), SWITCHING_PROTOCOLS);
-      } else if (CUSTOM_WEBSOCKET_STATUS_PATH.equals(request.uri())) {
-        writeHeaderOnlyWebSocketUpgrade(ctx, request.uri(), CUSTOM_SWITCHING_PROTOCOLS);
-      } else {
-        writeChunkedResponse(ctx);
-      }
-    }
-
-    private void writeChunkedResponse(ChannelHandlerContext ctx) {
-      DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
-      response.headers().set(TRANSFER_ENCODING, CHUNKED);
-      ctx.write(response);
-      ctx.writeAndFlush(new DefaultHttpContent(Unpooled.copiedBuffer("first", UTF_8)))
-          .addListener(future -> firstChunkWrites.offer(ctx));
-    }
-
-    private void writeCloseDelimitedResponse(ChannelHandlerContext ctx) {
-      // No Content-Length and no chunked transfer-encoding: the body is delimited by the connection
-      // closing.
-      DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
-      response.headers().set(CONNECTION, "close");
-      ctx.write(response);
-      ctx.writeAndFlush(new DefaultHttpContent(Unpooled.copiedBuffer("first", UTF_8)))
-          .addListener(future -> firstChunkWrites.offer(ctx));
-    }
-
-    private void writeCloseDelimitedFullResponse(ChannelHandlerContext ctx) {
-      // No Content-Length and no chunked transfer-encoding: the full response still has a
-      // close-delimited body on the wire.
-      DefaultFullHttpResponse response =
-          new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.copiedBuffer("first", UTF_8));
-      response.headers().set(CONNECTION, "close");
-      ctx.writeAndFlush(response)
-          .addListener(future -> closeDelimitedFullResponseWrites.offer(ctx));
-    }
-
-    private void writeKnownLengthFullResponse(ChannelHandlerContext ctx) {
-      DefaultFullHttpResponse response =
-          new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.copiedBuffer("ok", UTF_8));
-      response.headers().set(CONTENT_LENGTH, response.content().readableBytes());
-      ctx.writeAndFlush(response);
-    }
-
-    private void writeKnownLengthByteBufResponse(ChannelHandlerContext ctx) {
-      byte[] body = "first".getBytes(UTF_8);
-      DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
-      response.headers().set(CONNECTION, "close");
-      response.headers().set(CONTENT_LENGTH, body.length);
-      ctx.write(response);
-      ctx.writeAndFlush(Unpooled.wrappedBuffer(body))
-          .addListener(future -> knownLengthByteBufWrites.offer(ctx));
-    }
-
-    private void writeKnownLengthFileRegionResponse(ChannelHandlerContext ctx) throws IOException {
-      byte[] body = "first".getBytes(UTF_8);
-      Path path = Files.createTempFile("netty-known-length", ".body");
-      Files.write(path, body);
-      FileChannel fileChannel = FileChannel.open(path, StandardOpenOption.READ);
-
-      DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
-      response.headers().set(CONNECTION, "close");
-      response.headers().set(CONTENT_LENGTH, body.length);
-      ctx.write(response);
-      ctx.writeAndFlush(new DefaultFileRegion(fileChannel, 0, body.length))
-          .addListener(
-              future -> {
-                close(fileChannel);
-                delete(path);
-                knownLengthFileRegionWrites.offer(ctx);
-              });
-    }
-
-    private void writeIncompleteKnownLengthResponse(ChannelHandlerContext ctx) {
-      byte[] body = "first".getBytes(UTF_8);
-      DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
-      response.headers().set(CONNECTION, "close");
-      response.headers().set(CONTENT_LENGTH, body.length + 1);
-      ctx.write(response);
-      ctx.writeAndFlush(Unpooled.wrappedBuffer(body))
-          .addListener(future -> incompleteKnownLengthWrites.offer(ctx));
-    }
-
-    private void writeHeaderOnlyResponse(
-        ChannelHandlerContext ctx, String path, HttpResponseStatus status) {
-      ctx.write(new DefaultHttpResponse(HTTP_1_1, status));
-      ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT)
-          .addListener(future -> headerOnlyWrites.offer(path));
-    }
-
-    private void writeContentLengthZeroResponse(ChannelHandlerContext ctx, String path) {
-      DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
-      response.headers().set(CONTENT_LENGTH, 0);
-      ctx.write(response);
-      ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT)
-          .addListener(future -> headerOnlyWrites.offer(path));
-    }
-
-    private void writeHeaderOnlyWebSocketUpgrade(
-        ChannelHandlerContext ctx, String path, HttpResponseStatus status) {
-      DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, status);
-      response.headers().set(UPGRADE, "WebSocket");
-      response.headers().set(CONNECTION, "Upgrade");
-      ctx.write(response);
-      ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT)
-          .addListener(future -> headerOnlyWrites.offer(path));
-    }
-
-    private ChannelHandlerContext awaitFirstChunkWritten() throws InterruptedException {
-      ChannelHandlerContext responseContext = firstChunkWrites.poll(5, SECONDS);
-      if (responseContext == null) {
-        throw new AssertionError("server did not write the first chunk");
-      }
-      return responseContext;
-    }
-
-    private ChannelHandlerContext await100ContinueWritten() throws InterruptedException {
-      ChannelHandlerContext responseContext = continueWrites.poll(5, SECONDS);
-      if (responseContext == null) {
-        throw new AssertionError("server did not write 100 Continue");
-      }
-      return responseContext;
-    }
-
-    private ChannelHandlerContext awaitEarlyHintsWritten() throws InterruptedException {
-      ChannelHandlerContext responseContext = earlyHintsWrites.poll(5, SECONDS);
-      if (responseContext == null) {
-        throw new AssertionError("server did not write 103 Early Hints");
-      }
-      return responseContext;
-    }
-
-    private ChannelHandlerContext awaitCloseDelimitedFullResponseWritten()
-        throws InterruptedException {
-      ChannelHandlerContext responseContext = closeDelimitedFullResponseWrites.poll(5, SECONDS);
-      if (responseContext == null) {
-        throw new AssertionError("server did not write the full close-delimited response");
-      }
-      return responseContext;
-    }
-
-    private ChannelHandlerContext awaitKnownLengthByteBufWritten() throws InterruptedException {
-      ChannelHandlerContext responseContext = knownLengthByteBufWrites.poll(5, SECONDS);
-      if (responseContext == null) {
-        throw new AssertionError("server did not write the known-length ByteBuf response");
-      }
-      return responseContext;
-    }
-
-    private ChannelHandlerContext awaitKnownLengthFileRegionWritten() throws InterruptedException {
-      ChannelHandlerContext responseContext = knownLengthFileRegionWrites.poll(5, SECONDS);
-      if (responseContext == null) {
-        throw new AssertionError("server did not write the known-length FileRegion response");
-      }
-      return responseContext;
-    }
-
-    private ChannelHandlerContext awaitIncompleteKnownLengthWritten() throws InterruptedException {
-      ChannelHandlerContext responseContext = incompleteKnownLengthWrites.poll(5, SECONDS);
-      if (responseContext == null) {
-        throw new AssertionError("server did not write the incomplete known-length response");
-      }
-      return responseContext;
-    }
-
-    private ChannelHandlerContext awaitRequestWithoutResponse() throws InterruptedException {
-      ChannelHandlerContext responseContext = requestsWithoutResponse.poll(5, SECONDS);
-      if (responseContext == null) {
-        throw new AssertionError("server did not receive request without response");
-      }
-      return responseContext;
+            ChannelHandlerContext responseContext = handler.awaitKnownLengthFileRegionWritten();
+            reportedBeforeLastContent = writer.waitForTracesMax(1, 1);
+            writeLastChunk(responseContext);
+            assertEquals("first", readHttpResponseBody(socket.getInputStream()));
+            assertTrue(writer.waitForTracesMax(1, 5), "server span should be reported after LastHttpContent");
+        }
+
+        assertFalse(
+                reportedBeforeLastContent,
+                "Content-Length body bytes should not finish the span before LastHttpContent");
+        assertTraces(trace(serverSpan(KNOWN_LENGTH_FILE_REGION_PATH)));
+    }
+
+    @Test
+    void doesNotInferFramingErrorFromContentLengthWhenConnectionCloses() throws Exception {
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request(INCOMPLETE_KNOWN_LENGTH_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
+
+            ChannelHandlerContext responseContext = handler.awaitIncompleteKnownLengthWritten();
+            closeChannel(responseContext);
+        }
+
+        assertTraces(trace(serverSpan(INCOMPLETE_KNOWN_LENGTH_PATH)));
+    }
+
+    @Test
+    void closesServerSpanWithoutErrorWhenConnectionDropsBeforeResponseStarts() throws Exception {
+        boolean reportedBeforeConnectionDrop;
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request(NO_RESPONSE_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
+
+            handler.awaitRequestWithoutResponse();
+            reportedBeforeConnectionDrop = writer.waitForTracesMax(1, 1);
+        }
+
+        assertFalse(reportedBeforeConnectionDrop, "server span should not be reported before connection drop");
+        assertTraces(trace(serverSpan(NO_RESPONSE_PATH)));
     }
 
-    private void awaitHeaderOnlyResponseWritten(String path) throws InterruptedException {
-      String responsePath = headerOnlyWrites.poll(5, SECONDS);
-      if (responsePath == null) {
-        throw new AssertionError("server did not write the header-only response");
-      }
-      assertEquals(path, responsePath, "server wrote header-only response for unexpected path");
+    @Test
+    void keepsServerSpansSeparateForSequentialKeepAliveChunkedResponses() throws Exception {
+        boolean firstReportedBeforeLastChunk;
+        boolean secondReportedBeforeLastChunk;
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request().getBytes(US_ASCII));
+            socket.getOutputStream().flush();
+
+            ChannelHandlerContext firstResponseContext = handler.awaitFirstChunkWritten();
+            firstReportedBeforeLastChunk = writer.waitForTracesMax(1, 1);
+
+            writeLastChunk(firstResponseContext);
+            assertEquals("first", readChunkedHttpResponseBody(socket.getInputStream()));
+            assertTrue(writer.waitForTracesMax(1, 5), "first keep-alive response was not reported");
+
+            socket.getOutputStream().write(request().getBytes(US_ASCII));
+            socket.getOutputStream().flush();
+
+            ChannelHandlerContext secondResponseContext = handler.awaitFirstChunkWritten();
+            secondReportedBeforeLastChunk = writer.waitForTracesMax(2, 1);
+
+            writeLastChunk(secondResponseContext);
+            assertEquals("first", readChunkedHttpResponseBody(socket.getInputStream()));
+        }
+
+        assertFalse(firstReportedBeforeLastChunk, "first server span should not be reported before LastHttpContent");
+        assertFalse(secondReportedBeforeLastChunk, "second server span should not be reported before LastHttpContent");
+        assertTraces(trace(serverSpan(PATH)), trace(serverSpan(PATH)));
     }
 
-    private static void close(FileChannel fileChannel) {
-      try {
-        fileChannel.close();
-      } catch (IOException ignored) {
-      }
+    @Test
+    void keepsServerSpanOpenAfter100ContinueUntilLastResponseChunk() throws Exception {
+        boolean reportedAfter100Continue;
+        boolean reportedBeforeLastChunk;
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request(CONTINUE_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
+
+            ChannelHandlerContext responseContext = handler.await100ContinueWritten();
+            assertTrue(
+                    readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 100 "),
+                    "server did not write 100 Continue");
+            reportedAfter100Continue = writer.waitForTracesMax(1, 1);
+
+            writeFirstChunk(responseContext);
+            responseContext = handler.awaitFirstChunkWritten();
+            reportedBeforeLastChunk = writer.waitForTracesMax(1, 1);
+
+            writeLastChunk(responseContext);
+            assertEquals("first", readChunkedHttpResponseBody(socket.getInputStream()));
+        }
+
+        assertFalse(reportedAfter100Continue, "server span should not be reported after 100 Continue");
+        assertFalse(reportedBeforeLastChunk, "server span should not be reported before LastHttpContent");
+        assertTraces(trace(serverSpan(CONTINUE_PATH)));
     }
 
-    private static void delete(Path path) {
-      try {
-        Files.deleteIfExists(path);
-      } catch (IOException ignored) {
-      }
+    @Test
+    void keepsServerSpanOpenAfter103EarlyHintsUntilLastResponseChunk() throws Exception {
+        boolean reportedAfterEarlyHints;
+        boolean reportedBeforeLastChunk;
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request(EARLY_HINTS_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
+
+            ChannelHandlerContext responseContext = handler.awaitEarlyHintsWritten();
+            assertResponseStatus(readHeaders(socket.getInputStream()), EARLY_HINTS);
+            reportedAfterEarlyHints = writer.waitForTracesMax(1, 1);
+
+            writeFirstChunk(responseContext);
+            responseContext = handler.awaitFirstChunkWritten();
+            reportedBeforeLastChunk = writer.waitForTracesMax(1, 1);
+
+            writeLastChunk(responseContext);
+            assertEquals("first", readChunkedHttpResponseBody(socket.getInputStream()));
+        }
+
+        assertFalse(reportedAfterEarlyHints, "server span should not be reported after 103");
+        assertFalse(reportedBeforeLastChunk, "server span should not be reported before LastHttpContent");
+        assertTraces(trace(serverSpan(EARLY_HINTS_PATH)));
     }
-  }
 
-  private static final class HoldingOutboundHandler extends ChannelOutboundHandlerAdapter {
-    private Object msg;
-    private ChannelPromise promise;
+    @Test
+    void finishesServerSpanForHeaderOnlyNoContentResponse() throws Exception {
+        assertHeaderOnlyResponseFinishes(NO_CONTENT_PATH, NO_CONTENT);
+    }
 
-    @Override
-    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
-      this.msg = msg;
-      this.promise = promise;
+    @Test
+    void finishesServerSpanForHeaderOnlyResetContentResponse() throws Exception {
+        assertHeaderOnlyResponseFinishes(RESET_CONTENT_PATH, RESET_CONTENT);
     }
 
-    private void completeWrite() {
-      finishWrite(null);
+    @Test
+    void finishesServerSpanForHeaderOnlyNotModifiedResponse() throws Exception {
+        assertHeaderOnlyResponseFinishes(NOT_MODIFIED_PATH, NOT_MODIFIED);
     }
 
-    private void failWrite(Throwable failure) {
-      finishWrite(failure);
+    @Test
+    void finishesServerSpanForHeaderOnlyContentLengthZeroResponse() throws Exception {
+        assertHeaderOnlyResponseFinishes(CONTENT_LENGTH_ZERO_PATH, OK);
     }
 
-    private void finishWrite(Throwable failure) {
-      if (promise == null || promise.isDone()) {
-        return;
-      }
-      try {
-        if (failure == null) {
-          promise.setSuccess();
-        } else {
-          promise.setFailure(failure);
+    @Test
+    void finishesServerSpanForHeaderOnlyHeadResponse() throws Exception {
+        assertHeaderOnlyResponseFinishes("HEAD", HEAD_PATH, OK);
+    }
+
+    @Test
+    void finishesServerSpanForHeaderOnlyConnectResponse() throws Exception {
+        assertHeaderOnlyResponseFinishes("CONNECT", CONNECT_AUTHORITY, OK, "/");
+    }
+
+    @Test
+    void finishesServerSpanForHeaderOnlyWebSocketUpgrade() throws Exception {
+        assertHeaderOnlyResponseFinishes(WEBSOCKET_PATH, SWITCHING_PROTOCOLS);
+    }
+
+    @Test
+    void finishesServerSpanForHeaderOnlyWebSocketUpgradeWithDistinctStatusInstance() throws Exception {
+        assertHeaderOnlyResponseFinishes(CUSTOM_WEBSOCKET_STATUS_PATH, SWITCHING_PROTOCOLS);
+    }
+
+    private void assertHeaderOnlyResponseFinishes(String path, HttpResponseStatus status) throws Exception {
+        assertHeaderOnlyResponseFinishes("GET", path, status, path);
+    }
+
+    private void assertHeaderOnlyResponseFinishes(String method, String path, HttpResponseStatus status)
+            throws Exception {
+        assertHeaderOnlyResponseFinishes(method, path, status, path);
+    }
+
+    private void assertHeaderOnlyResponseFinishes(
+            String method, String path, HttpResponseStatus status, String resourcePath) throws Exception {
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request(method, path).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
+
+            handler.awaitHeaderOnlyResponseWritten(path);
+            assertResponseStatus(readHeaders(socket.getInputStream()), status);
+            assertTrue(
+                    writer.waitForTracesMax(1, 5),
+                    "server span should be reported after header-only response " + status.code());
+        }
+
+        assertTraces(trace(serverSpan(method, resourcePath)));
+    }
+
+    private static String request() {
+        return request(PATH);
+    }
+
+    private static String request(String path) {
+        return request("GET", path);
+    }
+
+    private static String requestWithAuthorization(String path, String authorization) {
+        return "GET " + path + " HTTP/1.1\r\nHost: localhost\r\nAuthorization: " + authorization + "\r\n\r\n";
+    }
+
+    private static String request(String method, String path) {
+        String headers = method + " " + path + " HTTP/1.1\r\nHost: localhost\r\n";
+        if (isWebSocketPath(path)) {
+            headers += "Connection: Upgrade\r\n"
+                    + "Upgrade: websocket\r\n"
+                    + "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
+                    + "Sec-WebSocket-Version: 13\r\n";
+        }
+        return headers + "\r\n";
+    }
+
+    private static boolean isWebSocketPath(String path) {
+        return WEBSOCKET_PATH.equals(path) || CUSTOM_WEBSOCKET_STATUS_PATH.equals(path);
+    }
+
+    private static SpanMatcher serverSpan(String path) {
+        return serverSpan("GET", path);
+    }
+
+    private static SpanMatcher serverSpan(String method, String path) {
+        return span().root()
+                .operationName(Pattern.compile("netty\\.request"))
+                .resourceName(Pattern.compile(method + " " + Pattern.quote(path)))
+                .type("web");
+    }
+
+    private static void assertResponseStatus(String headers, HttpResponseStatus status) {
+        assertTrue(headers.startsWith("HTTP/1.1 " + status.code() + " "), "unexpected response: " + headers);
+    }
+
+    private void writeFirstChunk(ChannelHandlerContext responseContext) {
+        responseContext.executor().execute(() -> handler.writeChunkedResponse(responseContext));
+    }
+
+    private static void writeLastChunk(ChannelHandlerContext responseContext) {
+        responseContext.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT).syncUninterruptibly();
+    }
+
+    private static void closeChannel(ChannelHandlerContext responseContext) {
+        responseContext.executor().execute(() -> responseContext.channel().close());
+    }
+
+    @ChannelHandler.Sharable
+    private static final class ChunkedResponseHandler extends SimpleChannelInboundHandler<HttpRequest> {
+        private final BlockingQueue<ChannelHandlerContext> continueWrites = new LinkedBlockingQueue<>();
+        private final BlockingQueue<ChannelHandlerContext> earlyHintsWrites = new LinkedBlockingQueue<>();
+        private final BlockingQueue<ChannelHandlerContext> firstChunkWrites = new LinkedBlockingQueue<>();
+        private final BlockingQueue<ChannelHandlerContext> closeDelimitedFullResponseWrites =
+                new LinkedBlockingQueue<>();
+        private final BlockingQueue<ChannelHandlerContext> knownLengthByteBufWrites = new LinkedBlockingQueue<>();
+        private final BlockingQueue<ChannelHandlerContext> knownLengthFileRegionWrites = new LinkedBlockingQueue<>();
+        private final BlockingQueue<ChannelHandlerContext> incompleteKnownLengthWrites = new LinkedBlockingQueue<>();
+        private final BlockingQueue<String> headerOnlyWrites = new LinkedBlockingQueue<>();
+        private final BlockingQueue<ChannelHandlerContext> requestsWithoutResponse = new LinkedBlockingQueue<>();
+
+        @Override
+        protected void channelRead0(ChannelHandlerContext ctx, HttpRequest request) throws Exception {
+            if (CONTINUE_PATH.equals(request.uri())) {
+                ctx.writeAndFlush(new DefaultFullHttpResponse(HTTP_1_1, CONTINUE))
+                        .addListener(future -> continueWrites.offer(ctx));
+            } else if (EARLY_HINTS_PATH.equals(request.uri())) {
+                ctx.writeAndFlush(new DefaultFullHttpResponse(HTTP_1_1, EARLY_HINTS))
+                        .addListener(future -> earlyHintsWrites.offer(ctx));
+            } else if (NO_CONTENT_PATH.equals(request.uri())) {
+                writeHeaderOnlyResponse(ctx, request.uri(), NO_CONTENT);
+            } else if (RESET_CONTENT_PATH.equals(request.uri())) {
+                writeHeaderOnlyResponse(ctx, request.uri(), RESET_CONTENT);
+            } else if (NOT_MODIFIED_PATH.equals(request.uri())) {
+                writeHeaderOnlyResponse(ctx, request.uri(), NOT_MODIFIED);
+            } else if (CONTENT_LENGTH_ZERO_PATH.equals(request.uri())) {
+                writeContentLengthZeroResponse(ctx, request.uri());
+            } else if (HEAD_PATH.equals(request.uri())) {
+                writeHeaderOnlyResponse(ctx, request.uri(), OK);
+            } else if (CONNECT_AUTHORITY.equals(request.uri())) {
+                writeHeaderOnlyResponse(ctx, request.uri(), OK);
+            } else if (NO_RESPONSE_PATH.equals(request.uri())) {
+                requestsWithoutResponse.offer(ctx);
+            } else if (CLOSE_DELIMITED_PATH.equals(request.uri())) {
+                writeCloseDelimitedResponse(ctx);
+            } else if (CLOSE_DELIMITED_FULL_RESPONSE_PATH.equals(request.uri())) {
+                writeCloseDelimitedFullResponse(ctx);
+            } else if (KNOWN_LENGTH_FULL_RESPONSE_PATH.equals(request.uri())) {
+                writeKnownLengthFullResponse(ctx);
+            } else if (KNOWN_LENGTH_BYTE_BUF_PATH.equals(request.uri())) {
+                writeKnownLengthByteBufResponse(ctx);
+            } else if (KNOWN_LENGTH_FILE_REGION_PATH.equals(request.uri())) {
+                writeKnownLengthFileRegionResponse(ctx);
+            } else if (INCOMPLETE_KNOWN_LENGTH_PATH.equals(request.uri())) {
+                writeIncompleteKnownLengthResponse(ctx);
+            } else if (WEBSOCKET_PATH.equals(request.uri())) {
+                writeHeaderOnlyWebSocketUpgrade(ctx, request.uri(), SWITCHING_PROTOCOLS);
+            } else if (CUSTOM_WEBSOCKET_STATUS_PATH.equals(request.uri())) {
+                writeHeaderOnlyWebSocketUpgrade(ctx, request.uri(), CUSTOM_SWITCHING_PROTOCOLS);
+            } else {
+                writeChunkedResponse(ctx);
+            }
+        }
+
+        private void writeChunkedResponse(ChannelHandlerContext ctx) {
+            DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
+            response.headers().set(TRANSFER_ENCODING, CHUNKED);
+            ctx.write(response);
+            ctx.writeAndFlush(new DefaultHttpContent(Unpooled.copiedBuffer("first", UTF_8)))
+                    .addListener(future -> firstChunkWrites.offer(ctx));
+        }
+
+        private void writeCloseDelimitedResponse(ChannelHandlerContext ctx) {
+            // No Content-Length and no chunked transfer-encoding: the body is delimited by the connection
+            // closing.
+            DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
+            response.headers().set(CONNECTION, "close");
+            ctx.write(response);
+            ctx.writeAndFlush(new DefaultHttpContent(Unpooled.copiedBuffer("first", UTF_8)))
+                    .addListener(future -> firstChunkWrites.offer(ctx));
+        }
+
+        private void writeCloseDelimitedFullResponse(ChannelHandlerContext ctx) {
+            // No Content-Length and no chunked transfer-encoding: the full response still has a
+            // close-delimited body on the wire.
+            DefaultFullHttpResponse response =
+                    new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.copiedBuffer("first", UTF_8));
+            response.headers().set(CONNECTION, "close");
+            ctx.writeAndFlush(response).addListener(future -> closeDelimitedFullResponseWrites.offer(ctx));
+        }
+
+        private void writeKnownLengthFullResponse(ChannelHandlerContext ctx) {
+            DefaultFullHttpResponse response =
+                    new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.copiedBuffer("ok", UTF_8));
+            response.headers().set(CONTENT_LENGTH, response.content().readableBytes());
+            ctx.writeAndFlush(response);
+        }
+
+        private void writeKnownLengthByteBufResponse(ChannelHandlerContext ctx) {
+            byte[] body = "first".getBytes(UTF_8);
+            DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
+            response.headers().set(CONNECTION, "close");
+            response.headers().set(CONTENT_LENGTH, body.length);
+            ctx.write(response);
+            ctx.writeAndFlush(Unpooled.wrappedBuffer(body)).addListener(future -> knownLengthByteBufWrites.offer(ctx));
+        }
+
+        private void writeKnownLengthFileRegionResponse(ChannelHandlerContext ctx) throws IOException {
+            byte[] body = "first".getBytes(UTF_8);
+            Path path = Files.createTempFile("netty-known-length", ".body");
+            Files.write(path, body);
+            FileChannel fileChannel = FileChannel.open(path, StandardOpenOption.READ);
+
+            DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
+            response.headers().set(CONNECTION, "close");
+            response.headers().set(CONTENT_LENGTH, body.length);
+            ctx.write(response);
+            ctx.writeAndFlush(new DefaultFileRegion(fileChannel, 0, body.length))
+                    .addListener(future -> {
+                        close(fileChannel);
+                        delete(path);
+                        knownLengthFileRegionWrites.offer(ctx);
+                    });
+        }
+
+        private void writeIncompleteKnownLengthResponse(ChannelHandlerContext ctx) {
+            byte[] body = "first".getBytes(UTF_8);
+            DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
+            response.headers().set(CONNECTION, "close");
+            response.headers().set(CONTENT_LENGTH, body.length + 1);
+            ctx.write(response);
+            ctx.writeAndFlush(Unpooled.wrappedBuffer(body))
+                    .addListener(future -> incompleteKnownLengthWrites.offer(ctx));
+        }
+
+        private void writeHeaderOnlyResponse(ChannelHandlerContext ctx, String path, HttpResponseStatus status) {
+            ctx.write(new DefaultHttpResponse(HTTP_1_1, status));
+            ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT).addListener(future -> headerOnlyWrites.offer(path));
+        }
+
+        private void writeContentLengthZeroResponse(ChannelHandlerContext ctx, String path) {
+            DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
+            response.headers().set(CONTENT_LENGTH, 0);
+            ctx.write(response);
+            ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT).addListener(future -> headerOnlyWrites.offer(path));
+        }
+
+        private void writeHeaderOnlyWebSocketUpgrade(
+                ChannelHandlerContext ctx, String path, HttpResponseStatus status) {
+            DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, status);
+            response.headers().set(UPGRADE, "WebSocket");
+            response.headers().set(CONNECTION, "Upgrade");
+            ctx.write(response);
+            ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT).addListener(future -> headerOnlyWrites.offer(path));
+        }
+
+        private ChannelHandlerContext awaitFirstChunkWritten() throws InterruptedException {
+            ChannelHandlerContext responseContext = firstChunkWrites.poll(5, SECONDS);
+            if (responseContext == null) {
+                throw new AssertionError("server did not write the first chunk");
+            }
+            return responseContext;
+        }
+
+        private ChannelHandlerContext await100ContinueWritten() throws InterruptedException {
+            ChannelHandlerContext responseContext = continueWrites.poll(5, SECONDS);
+            if (responseContext == null) {
+                throw new AssertionError("server did not write 100 Continue");
+            }
+            return responseContext;
+        }
+
+        private ChannelHandlerContext awaitEarlyHintsWritten() throws InterruptedException {
+            ChannelHandlerContext responseContext = earlyHintsWrites.poll(5, SECONDS);
+            if (responseContext == null) {
+                throw new AssertionError("server did not write 103 Early Hints");
+            }
+            return responseContext;
+        }
+
+        private ChannelHandlerContext awaitCloseDelimitedFullResponseWritten() throws InterruptedException {
+            ChannelHandlerContext responseContext = closeDelimitedFullResponseWrites.poll(5, SECONDS);
+            if (responseContext == null) {
+                throw new AssertionError("server did not write the full close-delimited response");
+            }
+            return responseContext;
+        }
+
+        private ChannelHandlerContext awaitKnownLengthByteBufWritten() throws InterruptedException {
+            ChannelHandlerContext responseContext = knownLengthByteBufWrites.poll(5, SECONDS);
+            if (responseContext == null) {
+                throw new AssertionError("server did not write the known-length ByteBuf response");
+            }
+            return responseContext;
+        }
+
+        private ChannelHandlerContext awaitKnownLengthFileRegionWritten() throws InterruptedException {
+            ChannelHandlerContext responseContext = knownLengthFileRegionWrites.poll(5, SECONDS);
+            if (responseContext == null) {
+                throw new AssertionError("server did not write the known-length FileRegion response");
+            }
+            return responseContext;
+        }
+
+        private ChannelHandlerContext awaitIncompleteKnownLengthWritten() throws InterruptedException {
+            ChannelHandlerContext responseContext = incompleteKnownLengthWrites.poll(5, SECONDS);
+            if (responseContext == null) {
+                throw new AssertionError("server did not write the incomplete known-length response");
+            }
+            return responseContext;
+        }
+
+        private ChannelHandlerContext awaitRequestWithoutResponse() throws InterruptedException {
+            ChannelHandlerContext responseContext = requestsWithoutResponse.poll(5, SECONDS);
+            if (responseContext == null) {
+                throw new AssertionError("server did not receive request without response");
+            }
+            return responseContext;
+        }
+
+        private void awaitHeaderOnlyResponseWritten(String path) throws InterruptedException {
+            String responsePath = headerOnlyWrites.poll(5, SECONDS);
+            if (responsePath == null) {
+                throw new AssertionError("server did not write the header-only response");
+            }
+            assertEquals(path, responsePath, "server wrote header-only response for unexpected path");
+        }
+
+        private static void close(FileChannel fileChannel) {
+            try {
+                fileChannel.close();
+            } catch (IOException ignored) {
+            }
+        }
+
+        private static void delete(Path path) {
+            try {
+                Files.deleteIfExists(path);
+            } catch (IOException ignored) {
+            }
+        }
+    }
+
+    private static final class HoldingOutboundHandler extends ChannelOutboundHandlerAdapter {
+        private Object msg;
+        private ChannelPromise promise;
+
+        @Override
+        public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
+            this.msg = msg;
+            this.promise = promise;
+        }
+
+        private void completeWrite() {
+            finishWrite(null);
+        }
+
+        private void failWrite(Throwable failure) {
+            finishWrite(failure);
+        }
+
+        private void finishWrite(Throwable failure) {
+            if (promise == null || promise.isDone()) {
+                return;
+            }
+            try {
+                if (failure == null) {
+                    promise.setSuccess();
+                } else {
+                    promise.setFailure(failure);
+                }
+            } finally {
+                ReferenceCountUtil.release(msg);
+                msg = null;
+            }
         }
-      } finally {
-        ReferenceCountUtil.release(msg);
-        msg = null;
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyHttp11PipeliningTest.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyHttp11PipeliningTest.java
index eb250b9fcca..3076034f7a2 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyHttp11PipeliningTest.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyHttp11PipeliningTest.java
@@ -68,559 +68,516 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class NettyHttp11PipeliningTest extends NettyHttpServerTestSupport {
 
-  private static final String FIRST_PATH = "/pipelined/first";
-  private static final String SECOND_PATH = "/pipelined/second";
-  private static final String THIRD_PATH = "/pipelined/third";
-  private static final HttpResponseStatus EARLY_HINTS = new HttpResponseStatus(103, "Early Hints");
-
-  private final DecodedRequestObserver decodedRequestObserver = new DecodedRequestObserver();
-  private final PipeliningHandler handler = new PipeliningHandler();
-  private Object appSecSubscriptions;
-  private boolean originalAppSecActive;
-
-  @Override
-  protected void configurePipeline(Channel ch) {
-    HttpServerCodec codec = new HttpServerCodec();
-    ch.pipeline().addLast(codec);
-    ch.pipeline()
-        .addAfter(
-            ch.pipeline().context(codec).name(),
-            "decoded-request-observer",
-            decodedRequestObserver);
-    ch.pipeline().addLast(new HttpObjectAggregator(65536));
-    ch.pipeline().addLast(handler);
-  }
-
-  @AfterEach
-  void resetAppSec() {
-    if (appSecSubscriptions != null) {
-      ((SubscriptionService) appSecSubscriptions).reset();
-      appSecSubscriptions = null;
-      ActiveSubsystems.APPSEC_ACTIVE = originalAppSecActive;
+    private static final String FIRST_PATH = "/pipelined/first";
+    private static final String SECOND_PATH = "/pipelined/second";
+    private static final String THIRD_PATH = "/pipelined/third";
+    private static final HttpResponseStatus EARLY_HINTS = new HttpResponseStatus(103, "Early Hints");
+
+    private final DecodedRequestObserver decodedRequestObserver = new DecodedRequestObserver();
+    private final PipeliningHandler handler = new PipeliningHandler();
+    private Object appSecSubscriptions;
+    private boolean originalAppSecActive;
+
+    @Override
+    protected void configurePipeline(Channel ch) {
+        HttpServerCodec codec = new HttpServerCodec();
+        ch.pipeline().addLast(codec);
+        ch.pipeline().addAfter(ch.pipeline().context(codec).name(), "decoded-request-observer", decodedRequestObserver);
+        ch.pipeline().addLast(new HttpObjectAggregator(65536));
+        ch.pipeline().addLast(handler);
+    }
+
+    @AfterEach
+    void resetAppSec() {
+        if (appSecSubscriptions != null) {
+            ((SubscriptionService) appSecSubscriptions).reset();
+            appSecSubscriptions = null;
+            ActiveSubsystems.APPSEC_ACTIVE = originalAppSecActive;
+        }
+        handler.clearBlockResponseFunctionBlocking();
     }
-    handler.clearBlockResponseFunctionBlocking();
-  }
 
-  @Test
-  void createsServerSpanForEachPipelinedRequest() throws Exception {
-    handler.expectRequests(3);
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(pipelinedRequests().getBytes(US_ASCII));
-      socket.getOutputStream().flush();
+    @Test
+    void createsServerSpanForEachPipelinedRequest() throws Exception {
+        handler.expectRequests(3);
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(pipelinedRequests().getBytes(US_ASCII));
+            socket.getOutputStream().flush();
 
-      assertTrue(
-          handler.awaitAllRequestsReceived(),
-          "server did not receive all pipelined requests before responding");
+            assertTrue(
+                    handler.awaitAllRequestsReceived(),
+                    "server did not receive all pipelined requests before responding");
 
-      handler.writeResponses();
+            handler.writeResponses();
 
-      assertEquals("response " + FIRST_PATH, readHttpResponseBody(socket.getInputStream()));
-      assertEquals("response " + SECOND_PATH, readHttpResponseBody(socket.getInputStream()));
-      assertEquals("response " + THIRD_PATH, readHttpResponseBody(socket.getInputStream()));
+            assertEquals("response " + FIRST_PATH, readHttpResponseBody(socket.getInputStream()));
+            assertEquals("response " + SECOND_PATH, readHttpResponseBody(socket.getInputStream()));
+            assertEquals("response " + THIRD_PATH, readHttpResponseBody(socket.getInputStream()));
+        }
+
+        assertTraces(SORT_BY_START_TIME, serverTrace(FIRST_PATH), serverTrace(SECOND_PATH), serverTrace(THIRD_PATH));
     }
 
-    assertTraces(
-        SORT_BY_START_TIME,
-        serverTrace(FIRST_PATH),
-        serverTrace(SECOND_PATH),
-        serverTrace(THIRD_PATH));
-  }
-
-  @Test
-  void reactorNettyCompletesPipelinedFixedLengthResponses() throws Exception {
-    DisposableServer reactorServer =
-        HttpServer.create()
-            .host("localhost")
-            .port(0)
-            .handle(
-                (request, response) -> {
-                  String body = "response " + request.uri();
-                  response.header(CONTENT_LENGTH, Integer.toString(body.getBytes(UTF_8).length));
-                  return Mono.delay(Duration.ofMillis(100))
-                      .then(Mono.defer(() -> response.sendString(Mono.just(body)).then()));
+    @Test
+    void reactorNettyCompletesPipelinedFixedLengthResponses() throws Exception {
+        DisposableServer reactorServer = HttpServer.create()
+                .host("localhost")
+                .port(0)
+                .handle((request, response) -> {
+                    String body = "response " + request.uri();
+                    response.header(CONTENT_LENGTH, Integer.toString(body.getBytes(UTF_8).length));
+                    return Mono.delay(Duration.ofMillis(100))
+                            .then(Mono.defer(
+                                    () -> response.sendString(Mono.just(body)).then()));
                 })
-            .bindNow();
-
-    try {
-      try (Socket socket = new Socket("localhost", reactorServer.port())) {
-        socket.setSoTimeout(5000);
-        socket.getOutputStream().write(pipelinedRequests().getBytes(US_ASCII));
-        socket.getOutputStream().flush();
-
-        assertEquals("response " + FIRST_PATH, readHttpResponseBody(socket.getInputStream()));
-        assertEquals("response " + SECOND_PATH, readHttpResponseBody(socket.getInputStream()));
-        assertEquals("response " + THIRD_PATH, readHttpResponseBody(socket.getInputStream()));
-      }
-
-      assertTraces(
-          SORT_BY_START_TIME,
-          serverTrace(FIRST_PATH),
-          serverTrace(SECOND_PATH),
-          serverTrace(THIRD_PATH));
-    } finally {
-      reactorServer.disposeNow();
+                .bindNow();
+
+        try {
+            try (Socket socket = new Socket("localhost", reactorServer.port())) {
+                socket.setSoTimeout(5000);
+                socket.getOutputStream().write(pipelinedRequests().getBytes(US_ASCII));
+                socket.getOutputStream().flush();
+
+                assertEquals("response " + FIRST_PATH, readHttpResponseBody(socket.getInputStream()));
+                assertEquals("response " + SECOND_PATH, readHttpResponseBody(socket.getInputStream()));
+                assertEquals("response " + THIRD_PATH, readHttpResponseBody(socket.getInputStream()));
+            }
+
+            assertTraces(
+                    SORT_BY_START_TIME, serverTrace(FIRST_PATH), serverTrace(SECOND_PATH), serverTrace(THIRD_PATH));
+        } finally {
+            reactorServer.disposeNow();
+        }
     }
-  }
 
-  @Test
-  void requestBlockOnLaterPipelinedRequestDoesNotOvertakeEarlierResponse() throws Exception {
-    handler.expectRequests(1);
+    @Test
+    void requestBlockOnLaterPipelinedRequestDoesNotOvertakeEarlierResponse() throws Exception {
+        handler.expectRequests(1);
+
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request(FIRST_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
 
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request(FIRST_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
+            assertTrue(handler.awaitAllRequestsReceived(), "server did not receive first request");
 
-      assertTrue(handler.awaitAllRequestsReceived(), "server did not receive first request");
+            CountDownLatch blockedRequestSeen = enableAppSecRequestBlockingFor(SECOND_PATH);
+            socket.getOutputStream().write(request(SECOND_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
 
-      CountDownLatch blockedRequestSeen = enableAppSecRequestBlockingFor(SECOND_PATH);
-      socket.getOutputStream().write(request(SECOND_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
+            assertTrue(blockedRequestSeen.await(5, SECONDS), "server did not block second pipelined request");
 
-      assertTrue(
-          blockedRequestSeen.await(5, SECONDS), "server did not block second pipelined request");
+            handler.writeResponses();
 
-      handler.writeResponses();
+            assertEquals("response " + FIRST_PATH, readHttpResponseBody(socket.getInputStream()));
+            assertTrue(
+                    readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 403 "),
+                    "second response should be the deferred blocking response");
+        }
 
-      assertEquals("response " + FIRST_PATH, readHttpResponseBody(socket.getInputStream()));
-      assertTrue(
-          readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 403 "),
-          "second response should be the deferred blocking response");
+        assertTraces(SORT_BY_START_TIME, serverTrace(FIRST_PATH), serverTrace(SECOND_PATH));
     }
 
-    assertTraces(SORT_BY_START_TIME, serverTrace(FIRST_PATH), serverTrace(SECOND_PATH));
-  }
-
-  @Test
-  void additionalPipelinedRequestsBehindDeferredBlockAreIgnored() throws Exception {
-    decodedRequestObserver.expectRequests(3);
-    handler.expectRequests(1);
-
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request(FIRST_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
-
-      assertTrue(handler.awaitAllRequestsReceived(), "server did not receive first request");
-
-      CountDownLatch blockedRequestSeen = enableAppSecRequestBlockingFor(SECOND_PATH, THIRD_PATH);
-      socket
-          .getOutputStream()
-          .write((request(SECOND_PATH) + request(THIRD_PATH)).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
-
-      assertTrue(
-          blockedRequestSeen.await(5, SECONDS), "server did not block second pipelined request");
-      assertTrue(
-          decodedRequestObserver.awaitAllRequests(),
-          "server did not decode all three pipelined requests before responding");
-
-      handler.writeResponses();
-
-      assertEquals("response " + FIRST_PATH, readHttpResponseBody(socket.getInputStream()));
-      assertTrue(
-          readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 403 "),
-          "second response should be the deferred blocking response");
-      assertTrue(handler.awaitChannelClosed(), "server did not close the blocked connection");
-      assertNull(
-          handler.inboundException,
-          "additional pipelined requests should be swallowed by the existing blocking handler");
+    @Test
+    void additionalPipelinedRequestsBehindDeferredBlockAreIgnored() throws Exception {
+        decodedRequestObserver.expectRequests(3);
+        handler.expectRequests(1);
+
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request(FIRST_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
+
+            assertTrue(handler.awaitAllRequestsReceived(), "server did not receive first request");
+
+            CountDownLatch blockedRequestSeen = enableAppSecRequestBlockingFor(SECOND_PATH, THIRD_PATH);
+            socket.getOutputStream().write((request(SECOND_PATH) + request(THIRD_PATH)).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
+
+            assertTrue(blockedRequestSeen.await(5, SECONDS), "server did not block second pipelined request");
+            assertTrue(
+                    decodedRequestObserver.awaitAllRequests(),
+                    "server did not decode all three pipelined requests before responding");
+
+            handler.writeResponses();
+
+            assertEquals("response " + FIRST_PATH, readHttpResponseBody(socket.getInputStream()));
+            assertTrue(
+                    readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 403 "),
+                    "second response should be the deferred blocking response");
+            assertTrue(handler.awaitChannelClosed(), "server did not close the blocked connection");
+            assertNull(
+                    handler.inboundException,
+                    "additional pipelined requests should be swallowed by the existing blocking handler");
+        }
+
+        assertTraces(SORT_BY_START_TIME, serverTrace(FIRST_PATH), serverTrace(SECOND_PATH));
     }
 
-    assertTraces(SORT_BY_START_TIME, serverTrace(FIRST_PATH), serverTrace(SECOND_PATH));
-  }
+    @Test
+    void requestBlockOnLaterPipelinedRequestWaitsForEarlierChunkedResponseCompletion() throws Exception {
+        handler.expectRequests(1);
 
-  @Test
-  void requestBlockOnLaterPipelinedRequestWaitsForEarlierChunkedResponseCompletion()
-      throws Exception {
-    handler.expectRequests(1);
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request(FIRST_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
 
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request(FIRST_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
+            assertTrue(handler.awaitAllRequestsReceived(), "server did not receive first request");
 
-      assertTrue(handler.awaitAllRequestsReceived(), "server did not receive first request");
+            CountDownLatch blockedRequestSeen = enableAppSecRequestBlockingFor(SECOND_PATH);
+            socket.getOutputStream().write(request(SECOND_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
 
-      CountDownLatch blockedRequestSeen = enableAppSecRequestBlockingFor(SECOND_PATH);
-      socket.getOutputStream().write(request(SECOND_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
+            assertTrue(blockedRequestSeen.await(5, SECONDS), "server did not block second pipelined request");
 
-      assertTrue(
-          blockedRequestSeen.await(5, SECONDS), "server did not block second pipelined request");
+            handler.writeChunkedResponse();
 
-      handler.writeChunkedResponse();
+            assertEquals("response " + FIRST_PATH, readChunkedHttpResponseBody(socket.getInputStream()));
+            assertTrue(
+                    readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 403 "),
+                    "second response should be the deferred blocking response");
+        }
 
-      assertEquals("response " + FIRST_PATH, readChunkedHttpResponseBody(socket.getInputStream()));
-      assertTrue(
-          readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 403 "),
-          "second response should be the deferred blocking response");
+        assertTraces(SORT_BY_START_TIME, serverTrace(FIRST_PATH), serverTrace(SECOND_PATH));
     }
 
-    assertTraces(SORT_BY_START_TIME, serverTrace(FIRST_PATH), serverTrace(SECOND_PATH));
-  }
+    @Test
+    void requestBlockOnLaterPipelinedRequestFollowsEarlierHeaderOnlyResponse() throws Exception {
+        handler.expectRequests(1);
 
-  @Test
-  void requestBlockOnLaterPipelinedRequestFollowsEarlierHeaderOnlyResponse() throws Exception {
-    handler.expectRequests(1);
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request(FIRST_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
 
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request(FIRST_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
+            assertTrue(handler.awaitAllRequestsReceived(), "server did not receive first request");
 
-      assertTrue(handler.awaitAllRequestsReceived(), "server did not receive first request");
+            CountDownLatch blockedRequestSeen = enableAppSecRequestBlockingFor(SECOND_PATH);
+            socket.getOutputStream().write(request(SECOND_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
 
-      CountDownLatch blockedRequestSeen = enableAppSecRequestBlockingFor(SECOND_PATH);
-      socket.getOutputStream().write(request(SECOND_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
+            assertTrue(blockedRequestSeen.await(5, SECONDS), "server did not block second pipelined request");
 
-      assertTrue(
-          blockedRequestSeen.await(5, SECONDS), "server did not block second pipelined request");
+            handler.writeHeaderOnlyResponseHeaders();
 
-      handler.writeHeaderOnlyResponseHeaders();
+            assertTrue(
+                    readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 204 "),
+                    "first response should be the header-only response");
+            assertFalse(
+                    writer.waitForTracesMax(1, 1), "header-only response should remain pending before LastHttpContent");
 
-      assertTrue(
-          readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 204 "),
-          "first response should be the header-only response");
-      assertFalse(
-          writer.waitForTracesMax(1, 1),
-          "header-only response should remain pending before LastHttpContent");
+            handler.writeLastContent();
 
-      handler.writeLastContent();
+            assertTrue(
+                    readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 403 "),
+                    "second response should be the deferred blocking response");
+        }
 
-      assertTrue(
-          readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 403 "),
-          "second response should be the deferred blocking response");
+        assertTraces(SORT_BY_START_TIME, serverTrace(FIRST_PATH), serverTrace(SECOND_PATH));
     }
 
-    assertTraces(SORT_BY_START_TIME, serverTrace(FIRST_PATH), serverTrace(SECOND_PATH));
-  }
+    @Test
+    void requestBlockOnLaterPipelinedRequestFollowsEarlierHeadResponse() throws Exception {
+        handler.expectRequests(1);
 
-  @Test
-  void requestBlockOnLaterPipelinedRequestFollowsEarlierHeadResponse() throws Exception {
-    handler.expectRequests(1);
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(headRequest(FIRST_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
 
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(headRequest(FIRST_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
+            assertTrue(handler.awaitAllRequestsReceived(), "server did not receive first request");
 
-      assertTrue(handler.awaitAllRequestsReceived(), "server did not receive first request");
+            CountDownLatch blockedRequestSeen = enableAppSecRequestBlockingFor(SECOND_PATH);
+            socket.getOutputStream().write(request(SECOND_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
 
-      CountDownLatch blockedRequestSeen = enableAppSecRequestBlockingFor(SECOND_PATH);
-      socket.getOutputStream().write(request(SECOND_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
+            assertTrue(blockedRequestSeen.await(5, SECONDS), "server did not block second pipelined request");
 
-      assertTrue(
-          blockedRequestSeen.await(5, SECONDS), "server did not block second pipelined request");
+            handler.writeHeadResponse();
 
-      handler.writeHeadResponse();
+            assertTrue(
+                    readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 200 "),
+                    "first response should be the HEAD response");
+            assertTrue(
+                    readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 403 "),
+                    "second response should be the deferred blocking response");
+        }
 
-      assertTrue(
-          readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 200 "),
-          "first response should be the HEAD response");
-      assertTrue(
-          readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 403 "),
-          "second response should be the deferred blocking response");
+        assertTraces(SORT_BY_START_TIME, serverTrace("HEAD", FIRST_PATH), serverTrace("GET", SECOND_PATH));
     }
 
-    assertTraces(
-        SORT_BY_START_TIME, serverTrace("HEAD", FIRST_PATH), serverTrace("GET", SECOND_PATH));
-  }
+    @Test
+    void lastContentAfterInterimResponseDoesNotCompleteServerSpan() throws Exception {
+        handler.expectRequests(1);
 
-  @Test
-  void lastContentAfterInterimResponseDoesNotCompleteServerSpan() throws Exception {
-    handler.expectRequests(1);
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request(FIRST_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
 
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request(FIRST_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
+            assertTrue(handler.awaitAllRequestsReceived(), "server did not receive first request");
 
-      assertTrue(handler.awaitAllRequestsReceived(), "server did not receive first request");
+            handler.writeInterimResponseWithTerminatorThenResponse();
 
-      handler.writeInterimResponseWithTerminatorThenResponse();
+            assertTrue(
+                    readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 100 "),
+                    "first response should be the interim response");
+            assertEquals("response " + FIRST_PATH, readHttpResponseBody(socket.getInputStream()));
+        }
 
-      assertTrue(
-          readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 100 "),
-          "first response should be the interim response");
-      assertEquals("response " + FIRST_PATH, readHttpResponseBody(socket.getInputStream()));
+        assertTraces(SORT_BY_START_TIME, serverTrace(FIRST_PATH));
     }
 
-    assertTraces(SORT_BY_START_TIME, serverTrace(FIRST_PATH));
-  }
+    @Test
+    void requestBlockOnLaterPipelinedRequestWaitsForEarlierEarlyHintsResponseCompletion() throws Exception {
+        handler.expectRequests(1);
 
-  @Test
-  void requestBlockOnLaterPipelinedRequestWaitsForEarlierEarlyHintsResponseCompletion()
-      throws Exception {
-    handler.expectRequests(1);
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request(FIRST_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
 
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request(FIRST_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
+            assertTrue(handler.awaitAllRequestsReceived(), "server did not receive first request");
 
-      assertTrue(handler.awaitAllRequestsReceived(), "server did not receive first request");
+            CountDownLatch blockedRequestSeen = enableAppSecRequestBlockingFor(SECOND_PATH);
+            socket.getOutputStream().write(request(SECOND_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
 
-      CountDownLatch blockedRequestSeen = enableAppSecRequestBlockingFor(SECOND_PATH);
-      socket.getOutputStream().write(request(SECOND_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
+            assertTrue(blockedRequestSeen.await(5, SECONDS), "server did not block second pipelined request");
 
-      assertTrue(
-          blockedRequestSeen.await(5, SECONDS), "server did not block second pipelined request");
+            handler.writeEarlyHintsWithTerminatorThenResponse();
 
-      handler.writeEarlyHintsWithTerminatorThenResponse();
+            assertTrue(
+                    readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 103 "),
+                    "first response should be the early hints response");
+            assertEquals("response " + FIRST_PATH, readHttpResponseBody(socket.getInputStream()));
+            assertTrue(
+                    readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 403 "),
+                    "second response should be the deferred blocking response");
+        }
 
-      assertTrue(
-          readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 103 "),
-          "first response should be the early hints response");
-      assertEquals("response " + FIRST_PATH, readHttpResponseBody(socket.getInputStream()));
-      assertTrue(
-          readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 403 "),
-          "second response should be the deferred blocking response");
+        assertTraces(SORT_BY_START_TIME, serverTrace(FIRST_PATH), serverTrace(SECOND_PATH));
     }
 
-    assertTraces(SORT_BY_START_TIME, serverTrace(FIRST_PATH), serverTrace(SECOND_PATH));
-  }
+    @Test
+    void blockResponseFunctionOnLaterPipelinedRequestDoesNotOvertakeEarlierResponse() throws Exception {
+        enableAppSec();
+        handler.expectRequests(1);
 
-  @Test
-  void blockResponseFunctionOnLaterPipelinedRequestDoesNotOvertakeEarlierResponse()
-      throws Exception {
-    enableAppSec();
-    handler.expectRequests(1);
+        try (Socket socket = connect()) {
+            socket.getOutputStream().write(request(FIRST_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
 
-    try (Socket socket = connect()) {
-      socket.getOutputStream().write(request(FIRST_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
+            assertTrue(handler.awaitAllRequestsReceived(), "server did not receive first request");
 
-      assertTrue(handler.awaitAllRequestsReceived(), "server did not receive first request");
+            CountDownLatch blockedRequestSeen = handler.blockWithResponseFunctionFor(SECOND_PATH);
+            socket.getOutputStream().write(request(SECOND_PATH).getBytes(US_ASCII));
+            socket.getOutputStream().flush();
 
-      CountDownLatch blockedRequestSeen = handler.blockWithResponseFunctionFor(SECOND_PATH);
-      socket.getOutputStream().write(request(SECOND_PATH).getBytes(US_ASCII));
-      socket.getOutputStream().flush();
+            assertTrue(blockedRequestSeen.await(5, SECONDS), "server did not block second pipelined request");
 
-      assertTrue(
-          blockedRequestSeen.await(5, SECONDS), "server did not block second pipelined request");
+            handler.writeResponses();
 
-      handler.writeResponses();
+            assertEquals("response " + FIRST_PATH, readHttpResponseBody(socket.getInputStream()));
+            assertTrue(
+                    readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 403 "),
+                    "second response should be the deferred blocking response");
+        }
 
-      assertEquals("response " + FIRST_PATH, readHttpResponseBody(socket.getInputStream()));
-      assertTrue(
-          readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 403 "),
-          "second response should be the deferred blocking response");
+        assertTraces(SORT_BY_START_TIME, serverTrace(FIRST_PATH), serverTrace(SECOND_PATH));
     }
 
-    assertTraces(SORT_BY_START_TIME, serverTrace(FIRST_PATH), serverTrace(SECOND_PATH));
-  }
-
-  private static String pipelinedRequests() {
-    return "GET "
-        + FIRST_PATH
-        + " HTTP/1.1\r\nHost: localhost\r\n\r\n"
-        + "GET "
-        + SECOND_PATH
-        + " HTTP/1.1\r\nHost: localhost\r\n\r\n"
-        + "GET "
-        + THIRD_PATH
-        + " HTTP/1.1\r\nHost: localhost\r\n\r\n";
-  }
-
-  private static String request(String path) {
-    return "GET " + path + " HTTP/1.1\r\nHost: localhost\r\n\r\n";
-  }
-
-  private static String headRequest(String path) {
-    return "HEAD " + path + " HTTP/1.1\r\nHost: localhost\r\n\r\n";
-  }
-
-  private CountDownLatch enableAppSecRequestBlockingFor(String... blockedPaths) {
-    SubscriptionService subscriptions = (SubscriptionService) enableAppSec();
-    CountDownLatch blockedRequestSeen = new CountDownLatch(1);
-
-    subscriptions.registerCallback(
-        EVENTS.requestMethodUriRaw(),
-        new TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>>() {
-          @Override
-          public Flow<Void> apply(
-              RequestContext requestContext, String method, URIDataAdapter uri) {
-            if (!Arrays.asList(blockedPaths).contains(uri.path())) {
-              return Flow.ResultFlow.empty();
-            }
-            blockedRequestSeen.countDown();
-            return new Flow.ResultFlow<Void>(null) {
-              @Override
-              public Action getAction() {
-                return new Action.RequestBlockingAction(403, BlockingContentType.NONE);
-              }
-            };
-          }
-        });
-    return blockedRequestSeen;
-  }
-
-  private Object enableAppSec() {
-    SubscriptionService subscriptions =
-        (SubscriptionService) AgentTracer.get().getSubscriptionService(RequestContextSlot.APPSEC);
-    appSecSubscriptions = subscriptions;
-    originalAppSecActive = ActiveSubsystems.APPSEC_ACTIVE;
-    ActiveSubsystems.APPSEC_ACTIVE = true;
-
-    subscriptions.registerCallback(
-        EVENTS.requestStarted(),
-        new Supplier<Flow<Object>>() {
-          @Override
-          public Flow<Object> get() {
-            return new Flow.ResultFlow<>(new Object());
-          }
-        });
-    return subscriptions;
-  }
-
-  private static TraceMatcher serverTrace(String path) {
-    return serverTrace("GET", path);
-  }
-
-  private static TraceMatcher serverTrace(String method, String path) {
-    return trace(
-        span()
-            .root()
-            .operationName(Pattern.compile("netty\\.request"))
-            .resourceName(Pattern.compile(Pattern.quote(method + " " + path)))
-            .type("web"));
-  }
-
-  @ChannelHandler.Sharable
-  private static final class DecodedRequestObserver extends ChannelInboundHandlerAdapter {
-    private volatile CountDownLatch receivedRequests = new CountDownLatch(0);
-
-    private void expectRequests(int expectedRequests) {
-      receivedRequests = new CountDownLatch(expectedRequests);
+    private static String pipelinedRequests() {
+        return "GET "
+                + FIRST_PATH
+                + " HTTP/1.1\r\nHost: localhost\r\n\r\n"
+                + "GET "
+                + SECOND_PATH
+                + " HTTP/1.1\r\nHost: localhost\r\n\r\n"
+                + "GET "
+                + THIRD_PATH
+                + " HTTP/1.1\r\nHost: localhost\r\n\r\n";
     }
 
-    @Override
-    public void channelRead(ChannelHandlerContext ctx, Object msg) {
-      if (msg instanceof HttpRequest) {
-        receivedRequests.countDown();
-      }
-      ctx.fireChannelRead(msg);
+    private static String request(String path) {
+        return "GET " + path + " HTTP/1.1\r\nHost: localhost\r\n\r\n";
     }
 
-    private boolean awaitAllRequests() throws InterruptedException {
-      return receivedRequests.await(5, SECONDS);
+    private static String headRequest(String path) {
+        return "HEAD " + path + " HTTP/1.1\r\nHost: localhost\r\n\r\n";
     }
-  }
-
-  @ChannelHandler.Sharable
-  private static final class PipeliningHandler
-      extends SimpleChannelInboundHandler<FullHttpRequest> {
-    private volatile CountDownLatch receivedRequests;
-    private final List<String> paths = new ArrayList<>();
-    private volatile ChannelHandlerContext context;
-    private volatile String blockResponseFunctionPath;
-    private volatile CountDownLatch blockResponseFunctionRequestSeen;
-    private volatile Throwable inboundException;
-
-    private PipeliningHandler() {
-      super(false);
-      expectRequests(0);
+
+    private CountDownLatch enableAppSecRequestBlockingFor(String... blockedPaths) {
+        SubscriptionService subscriptions = (SubscriptionService) enableAppSec();
+        CountDownLatch blockedRequestSeen = new CountDownLatch(1);
+
+        subscriptions.registerCallback(
+                EVENTS.requestMethodUriRaw(), new TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext requestContext, String method, URIDataAdapter uri) {
+                        if (!Arrays.asList(blockedPaths).contains(uri.path())) {
+                            return Flow.ResultFlow.empty();
+                        }
+                        blockedRequestSeen.countDown();
+                        return new Flow.ResultFlow<Void>(null) {
+                            @Override
+                            public Action getAction() {
+                                return new Action.RequestBlockingAction(403, BlockingContentType.NONE);
+                            }
+                        };
+                    }
+                });
+        return blockedRequestSeen;
     }
 
-    private void expectRequests(int expectedRequests) {
-      receivedRequests = new CountDownLatch(expectedRequests);
-      context = null;
-      inboundException = null;
-      synchronized (paths) {
-        paths.clear();
-      }
+    private Object enableAppSec() {
+        SubscriptionService subscriptions =
+                (SubscriptionService) AgentTracer.get().getSubscriptionService(RequestContextSlot.APPSEC);
+        appSecSubscriptions = subscriptions;
+        originalAppSecActive = ActiveSubsystems.APPSEC_ACTIVE;
+        ActiveSubsystems.APPSEC_ACTIVE = true;
+
+        subscriptions.registerCallback(EVENTS.requestStarted(), new Supplier<Flow<Object>>() {
+            @Override
+            public Flow<Object> get() {
+                return new Flow.ResultFlow<>(new Object());
+            }
+        });
+        return subscriptions;
     }
 
-    private CountDownLatch blockWithResponseFunctionFor(String path) {
-      blockResponseFunctionPath = path;
-      blockResponseFunctionRequestSeen = new CountDownLatch(1);
-      return blockResponseFunctionRequestSeen;
+    private static TraceMatcher serverTrace(String path) {
+        return serverTrace("GET", path);
     }
 
-    private void clearBlockResponseFunctionBlocking() {
-      blockResponseFunctionPath = null;
-      blockResponseFunctionRequestSeen = null;
+    private static TraceMatcher serverTrace(String method, String path) {
+        return trace(span().root()
+                .operationName(Pattern.compile("netty\\.request"))
+                .resourceName(Pattern.compile(Pattern.quote(method + " " + path)))
+                .type("web"));
     }
 
-    @Override
-    protected void channelRead0(ChannelHandlerContext ctx, FullHttpRequest request) {
-      context = ctx;
-      boolean blockingResponseCommitted = false;
-      synchronized (paths) {
-        paths.add(request.uri());
-      }
-      if (request.uri().equals(blockResponseFunctionPath)) {
-        AgentSpan span = AgentTracer.activeSpan();
-        RequestContext requestContext = span == null ? null : span.getRequestContext();
-        BlockResponseFunction blockResponseFunction =
-            requestContext == null ? null : requestContext.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockingResponseCommitted =
-              blockResponseFunction.tryCommitBlockingResponse(
-                  requestContext.getTraceSegment(),
-                  403,
-                  BlockingContentType.NONE,
-                  emptyMap(),
-                  null);
+    @ChannelHandler.Sharable
+    private static final class DecodedRequestObserver extends ChannelInboundHandlerAdapter {
+        private volatile CountDownLatch receivedRequests = new CountDownLatch(0);
+
+        private void expectRequests(int expectedRequests) {
+            receivedRequests = new CountDownLatch(expectedRequests);
         }
-        if (blockingResponseCommitted && blockResponseFunctionRequestSeen != null) {
-          blockResponseFunctionRequestSeen.countDown();
+
+        @Override
+        public void channelRead(ChannelHandlerContext ctx, Object msg) {
+            if (msg instanceof HttpRequest) {
+                receivedRequests.countDown();
+            }
+            ctx.fireChannelRead(msg);
         }
-      }
-      receivedRequests.countDown();
-      if (!blockingResponseCommitted) {
-        ReferenceCountUtil.release(request);
-      }
-    }
 
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-      inboundException = cause;
+        private boolean awaitAllRequests() throws InterruptedException {
+            return receivedRequests.await(5, SECONDS);
+        }
     }
 
-    private boolean awaitAllRequestsReceived() throws InterruptedException {
-      return receivedRequests.await(5, SECONDS);
-    }
+    @ChannelHandler.Sharable
+    private static final class PipeliningHandler extends SimpleChannelInboundHandler<FullHttpRequest> {
+        private volatile CountDownLatch receivedRequests;
+        private final List<String> paths = new ArrayList<>();
+        private volatile ChannelHandlerContext context;
+        private volatile String blockResponseFunctionPath;
+        private volatile CountDownLatch blockResponseFunctionRequestSeen;
+        private volatile Throwable inboundException;
+
+        private PipeliningHandler() {
+            super(false);
+            expectRequests(0);
+        }
 
-    private boolean awaitChannelClosed() throws InterruptedException {
-      ChannelHandlerContext responseContext = context;
-      return responseContext != null && responseContext.channel().closeFuture().await(10, SECONDS);
-    }
+        private void expectRequests(int expectedRequests) {
+            receivedRequests = new CountDownLatch(expectedRequests);
+            context = null;
+            inboundException = null;
+            synchronized (paths) {
+                paths.clear();
+            }
+        }
+
+        private CountDownLatch blockWithResponseFunctionFor(String path) {
+            blockResponseFunctionPath = path;
+            blockResponseFunctionRequestSeen = new CountDownLatch(1);
+            return blockResponseFunctionRequestSeen;
+        }
+
+        private void clearBlockResponseFunctionBlocking() {
+            blockResponseFunctionPath = null;
+            blockResponseFunctionRequestSeen = null;
+        }
 
-    private void writeResponses() {
-      ChannelHandlerContext responseContext = context;
-      if (responseContext == null) {
-        throw new IllegalStateException("no request context captured");
-      }
-      List<String> responsePaths;
-      synchronized (paths) {
-        responsePaths = new ArrayList<>(paths);
-      }
-      responseContext
-          .executor()
-          .execute(
-              () -> {
+        @Override
+        protected void channelRead0(ChannelHandlerContext ctx, FullHttpRequest request) {
+            context = ctx;
+            boolean blockingResponseCommitted = false;
+            synchronized (paths) {
+                paths.add(request.uri());
+            }
+            if (request.uri().equals(blockResponseFunctionPath)) {
+                AgentSpan span = AgentTracer.activeSpan();
+                RequestContext requestContext = span == null ? null : span.getRequestContext();
+                BlockResponseFunction blockResponseFunction =
+                        requestContext == null ? null : requestContext.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockingResponseCommitted = blockResponseFunction.tryCommitBlockingResponse(
+                            requestContext.getTraceSegment(), 403, BlockingContentType.NONE, emptyMap(), null);
+                }
+                if (blockingResponseCommitted && blockResponseFunctionRequestSeen != null) {
+                    blockResponseFunctionRequestSeen.countDown();
+                }
+            }
+            receivedRequests.countDown();
+            if (!blockingResponseCommitted) {
+                ReferenceCountUtil.release(request);
+            }
+        }
+
+        @Override
+        public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+            inboundException = cause;
+        }
+
+        private boolean awaitAllRequestsReceived() throws InterruptedException {
+            return receivedRequests.await(5, SECONDS);
+        }
+
+        private boolean awaitChannelClosed() throws InterruptedException {
+            ChannelHandlerContext responseContext = context;
+            return responseContext != null
+                    && responseContext.channel().closeFuture().await(10, SECONDS);
+        }
+
+        private void writeResponses() {
+            ChannelHandlerContext responseContext = context;
+            if (responseContext == null) {
+                throw new IllegalStateException("no request context captured");
+            }
+            List<String> responsePaths;
+            synchronized (paths) {
+                responsePaths = new ArrayList<>(paths);
+            }
+            responseContext.executor().execute(() -> {
                 for (String path : responsePaths) {
-                  byte[] body = ("response " + path).getBytes(UTF_8);
-                  DefaultFullHttpResponse response =
-                      new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.wrappedBuffer(body));
-                  response.headers().set(CONTENT_LENGTH, body.length);
-                  responseContext.write(response);
+                    byte[] body = ("response " + path).getBytes(UTF_8);
+                    DefaultFullHttpResponse response =
+                            new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.wrappedBuffer(body));
+                    response.headers().set(CONTENT_LENGTH, body.length);
+                    responseContext.write(response);
                 }
                 responseContext.flush();
-              });
-    }
+            });
+        }
 
-    private void writeChunkedResponse() {
-      ChannelHandlerContext responseContext = context;
-      if (responseContext == null) {
-        throw new IllegalStateException("no request context captured");
-      }
-      String path;
-      synchronized (paths) {
-        path = paths.get(0);
-      }
-      responseContext
-          .executor()
-          .execute(
-              () -> {
+        private void writeChunkedResponse() {
+            ChannelHandlerContext responseContext = context;
+            if (responseContext == null) {
+                throw new IllegalStateException("no request context captured");
+            }
+            String path;
+            synchronized (paths) {
+                path = paths.get(0);
+            }
+            responseContext.executor().execute(() -> {
                 byte[] body = ("response " + path).getBytes(UTF_8);
                 DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
                 response.headers().set(TRANSFER_ENCODING, CHUNKED);
@@ -628,110 +585,96 @@ private void writeChunkedResponse() {
                 responseContext.write(new DefaultHttpContent(Unpooled.wrappedBuffer(body)));
                 responseContext.write(new DefaultLastHttpContent(Unpooled.EMPTY_BUFFER));
                 responseContext.flush();
-              });
-    }
+            });
+        }
 
-    private void writeHeaderOnlyResponseHeaders() {
-      ChannelHandlerContext responseContext = context;
-      if (responseContext == null) {
-        throw new IllegalStateException("no request context captured");
-      }
-      responseContext
-          .executor()
-          .execute(
-              () -> {
+        private void writeHeaderOnlyResponseHeaders() {
+            ChannelHandlerContext responseContext = context;
+            if (responseContext == null) {
+                throw new IllegalStateException("no request context captured");
+            }
+            responseContext.executor().execute(() -> {
                 DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, NO_CONTENT);
                 response.headers().set(CONNECTION, KEEP_ALIVE);
                 responseContext.writeAndFlush(response);
-              });
-    }
+            });
+        }
 
-    private void writeLastContent() {
-      ChannelHandlerContext responseContext = context;
-      if (responseContext == null) {
-        throw new IllegalStateException("no request context captured");
-      }
-      responseContext
-          .executor()
-          .execute(
-              () ->
-                  responseContext.writeAndFlush(new DefaultLastHttpContent(Unpooled.EMPTY_BUFFER)));
-    }
+        private void writeLastContent() {
+            ChannelHandlerContext responseContext = context;
+            if (responseContext == null) {
+                throw new IllegalStateException("no request context captured");
+            }
+            responseContext
+                    .executor()
+                    .execute(() -> responseContext.writeAndFlush(new DefaultLastHttpContent(Unpooled.EMPTY_BUFFER)));
+        }
 
-    private void writeHeadResponse() {
-      ChannelHandlerContext responseContext = context;
-      if (responseContext == null) {
-        throw new IllegalStateException("no request context captured");
-      }
-      String path;
-      synchronized (paths) {
-        path = paths.get(0);
-      }
-      responseContext
-          .executor()
-          .execute(
-              () -> {
+        private void writeHeadResponse() {
+            ChannelHandlerContext responseContext = context;
+            if (responseContext == null) {
+                throw new IllegalStateException("no request context captured");
+            }
+            String path;
+            synchronized (paths) {
+                path = paths.get(0);
+            }
+            responseContext.executor().execute(() -> {
                 byte[] body = ("response " + path).getBytes(UTF_8);
                 DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
                 response.headers().set(CONTENT_LENGTH, body.length);
                 responseContext.write(response);
                 responseContext.write(new DefaultLastHttpContent(Unpooled.EMPTY_BUFFER));
                 responseContext.flush();
-              });
-    }
+            });
+        }
 
-    private void writeInterimResponseWithTerminatorThenResponse() {
-      ChannelHandlerContext responseContext = context;
-      if (responseContext == null) {
-        throw new IllegalStateException("no request context captured");
-      }
-      String path;
-      synchronized (paths) {
-        path = paths.get(0);
-      }
-      responseContext
-          .executor()
-          .execute(
-              () -> {
+        private void writeInterimResponseWithTerminatorThenResponse() {
+            ChannelHandlerContext responseContext = context;
+            if (responseContext == null) {
+                throw new IllegalStateException("no request context captured");
+            }
+            String path;
+            synchronized (paths) {
+                path = paths.get(0);
+            }
+            responseContext.executor().execute(() -> {
                 responseContext.write(new DefaultHttpResponse(HTTP_1_1, CONTINUE));
                 responseContext.write(new DefaultLastHttpContent(Unpooled.EMPTY_BUFFER));
 
                 byte[] body = ("response " + path).getBytes(UTF_8);
                 DefaultFullHttpResponse response =
-                    new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.wrappedBuffer(body));
+                        new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.wrappedBuffer(body));
                 response.headers().set(CONTENT_LENGTH, body.length);
                 responseContext.write(response);
                 responseContext.flush();
-              });
-    }
+            });
+        }
 
-    private void writeEarlyHintsWithTerminatorThenResponse() {
-      writeInformationalResponseWithTerminatorThenResponse(EARLY_HINTS);
-    }
+        private void writeEarlyHintsWithTerminatorThenResponse() {
+            writeInformationalResponseWithTerminatorThenResponse(EARLY_HINTS);
+        }
 
-    private void writeInformationalResponseWithTerminatorThenResponse(HttpResponseStatus status) {
-      ChannelHandlerContext responseContext = context;
-      if (responseContext == null) {
-        throw new IllegalStateException("no request context captured");
-      }
-      String path;
-      synchronized (paths) {
-        path = paths.get(0);
-      }
-      responseContext
-          .executor()
-          .execute(
-              () -> {
+        private void writeInformationalResponseWithTerminatorThenResponse(HttpResponseStatus status) {
+            ChannelHandlerContext responseContext = context;
+            if (responseContext == null) {
+                throw new IllegalStateException("no request context captured");
+            }
+            String path;
+            synchronized (paths) {
+                path = paths.get(0);
+            }
+            responseContext.executor().execute(() -> {
                 responseContext.write(new DefaultHttpResponse(HTTP_1_1, status));
                 responseContext.write(new DefaultLastHttpContent(Unpooled.EMPTY_BUFFER));
 
                 byte[] body = ("response " + path).getBytes(UTF_8);
                 DefaultFullHttpResponse response =
-                    new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.wrappedBuffer(body));
+                        new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.wrappedBuffer(body));
                 response.headers().set(CONTENT_LENGTH, body.length);
                 responseContext.write(response);
                 responseContext.flush();
-              });
+            });
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyHttpServerTestSupport.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyHttpServerTestSupport.java
index d75bab18d14..1822886333c 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyHttpServerTestSupport.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyHttpServerTestSupport.java
@@ -23,140 +23,138 @@
 
 abstract class NettyHttpServerTestSupport extends AbstractInstrumentationTest {
 
-  private EventLoopGroup eventLoopGroup;
-  private Channel serverChannel;
-  private int port;
-
-  @BeforeAll
-  void startServer() throws Exception {
-    eventLoopGroup = new NioEventLoopGroup(1);
-    ServerBootstrap bootstrap =
-        new ServerBootstrap()
-            .group(eventLoopGroup)
-            .channel(NioServerSocketChannel.class)
-            .childHandler(
-                new ChannelInitializer<Channel>() {
-                  @Override
-                  protected void initChannel(Channel ch) {
-                    configurePipeline(ch);
-                  }
+    private EventLoopGroup eventLoopGroup;
+    private Channel serverChannel;
+    private int port;
+
+    @BeforeAll
+    void startServer() throws Exception {
+        eventLoopGroup = new NioEventLoopGroup(1);
+        ServerBootstrap bootstrap = new ServerBootstrap()
+                .group(eventLoopGroup)
+                .channel(NioServerSocketChannel.class)
+                .childHandler(new ChannelInitializer<Channel>() {
+                    @Override
+                    protected void initChannel(Channel ch) {
+                        configurePipeline(ch);
+                    }
                 });
-    serverChannel = bootstrap.bind(0).sync().channel();
-    port = ((InetSocketAddress) serverChannel.localAddress()).getPort();
-  }
-
-  @AfterAll
-  void stopServer() {
-    try {
-      if (serverChannel != null) {
-        serverChannel.close().syncUninterruptibly();
-      }
-    } finally {
-      if (eventLoopGroup != null) {
-        eventLoopGroup.shutdownGracefully().syncUninterruptibly();
-      }
+        serverChannel = bootstrap.bind(0).sync().channel();
+        port = ((InetSocketAddress) serverChannel.localAddress()).getPort();
     }
-  }
-
-  protected abstract void configurePipeline(Channel ch);
-
-  protected Socket connect() throws IOException {
-    Socket socket = new Socket("localhost", port);
-    socket.setSoTimeout(5000);
-    return socket;
-  }
-
-  protected static String readHttpResponseBody(InputStream in) throws IOException {
-    String headers = readHeaders(in);
-    assertOkResponse(headers);
-    byte[] body = new byte[contentLength(headers)];
-    readFully(in, body);
-    return new String(body, UTF_8);
-  }
-
-  protected static String readChunkedHttpResponseBody(InputStream in) throws IOException {
-    String headers = readHeaders(in);
-    assertOkResponse(headers);
-
-    ByteArrayOutputStream body = new ByteArrayOutputStream();
-    while (true) {
-      int chunkSize = Integer.parseInt(readLine(in), 16);
-      if (chunkSize == 0) {
-        while (!readLine(in).isEmpty()) {}
-        return body.toString(UTF_8.name());
-      }
-      byte[] chunk = new byte[chunkSize];
-      readFully(in, chunk);
-      body.write(chunk);
-      assertEquals("", readLine(in), "chunk was not followed by CRLF");
+
+    @AfterAll
+    void stopServer() {
+        try {
+            if (serverChannel != null) {
+                serverChannel.close().syncUninterruptibly();
+            }
+        } finally {
+            if (eventLoopGroup != null) {
+                eventLoopGroup.shutdownGracefully().syncUninterruptibly();
+            }
+        }
+    }
+
+    protected abstract void configurePipeline(Channel ch);
+
+    protected Socket connect() throws IOException {
+        Socket socket = new Socket("localhost", port);
+        socket.setSoTimeout(5000);
+        return socket;
+    }
+
+    protected static String readHttpResponseBody(InputStream in) throws IOException {
+        String headers = readHeaders(in);
+        assertOkResponse(headers);
+        byte[] body = new byte[contentLength(headers)];
+        readFully(in, body);
+        return new String(body, UTF_8);
+    }
+
+    protected static String readChunkedHttpResponseBody(InputStream in) throws IOException {
+        String headers = readHeaders(in);
+        assertOkResponse(headers);
+
+        ByteArrayOutputStream body = new ByteArrayOutputStream();
+        while (true) {
+            int chunkSize = Integer.parseInt(readLine(in), 16);
+            if (chunkSize == 0) {
+                while (!readLine(in).isEmpty()) {}
+                return body.toString(UTF_8.name());
+            }
+            byte[] chunk = new byte[chunkSize];
+            readFully(in, chunk);
+            body.write(chunk);
+            assertEquals("", readLine(in), "chunk was not followed by CRLF");
+        }
     }
-  }
-
-  private static void assertOkResponse(String headers) {
-    assertTrue(headers.startsWith("HTTP/1.1 200 "), "unexpected response: " + headers);
-  }
-
-  protected static String readHeaders(InputStream in) throws IOException {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    int state = 0;
-    while (state < 4) {
-      int b = in.read();
-      if (b == -1) {
-        throw new EOFException("response ended before headers were complete");
-      }
-      out.write(b);
-      if ((state == 0 || state == 2) && b == '\r') {
-        state++;
-      } else if ((state == 1 || state == 3) && b == '\n') {
-        state++;
-      } else {
-        state = b == '\r' ? 1 : 0;
-      }
+
+    private static void assertOkResponse(String headers) {
+        assertTrue(headers.startsWith("HTTP/1.1 200 "), "unexpected response: " + headers);
     }
-    return out.toString(US_ASCII.name());
-  }
-
-  private static String readLine(InputStream in) throws IOException {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    boolean seenCarriageReturn = false;
-    while (true) {
-      int b = in.read();
-      if (b == -1) {
-        throw new EOFException("response ended before line was complete");
-      }
-      if (seenCarriageReturn && b == '\n') {
+
+    protected static String readHeaders(InputStream in) throws IOException {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        int state = 0;
+        while (state < 4) {
+            int b = in.read();
+            if (b == -1) {
+                throw new EOFException("response ended before headers were complete");
+            }
+            out.write(b);
+            if ((state == 0 || state == 2) && b == '\r') {
+                state++;
+            } else if ((state == 1 || state == 3) && b == '\n') {
+                state++;
+            } else {
+                state = b == '\r' ? 1 : 0;
+            }
+        }
         return out.toString(US_ASCII.name());
-      }
-      if (seenCarriageReturn) {
-        out.write('\r');
-        seenCarriageReturn = false;
-      }
-      if (b == '\r') {
-        seenCarriageReturn = true;
-      } else {
-        out.write(b);
-      }
     }
-  }
-
-  private static int contentLength(String headers) {
-    for (String line : headers.split("\r\n")) {
-      int separator = line.indexOf(':');
-      if (separator > 0 && "content-length".equalsIgnoreCase(line.substring(0, separator))) {
-        return Integer.parseInt(line.substring(separator + 1).trim());
-      }
+
+    private static String readLine(InputStream in) throws IOException {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        boolean seenCarriageReturn = false;
+        while (true) {
+            int b = in.read();
+            if (b == -1) {
+                throw new EOFException("response ended before line was complete");
+            }
+            if (seenCarriageReturn && b == '\n') {
+                return out.toString(US_ASCII.name());
+            }
+            if (seenCarriageReturn) {
+                out.write('\r');
+                seenCarriageReturn = false;
+            }
+            if (b == '\r') {
+                seenCarriageReturn = true;
+            } else {
+                out.write(b);
+            }
+        }
     }
-    throw new AssertionError("missing content-length header: " + headers);
-  }
-
-  private static void readFully(InputStream in, byte[] bytes) throws IOException {
-    int read = 0;
-    while (read < bytes.length) {
-      int count = in.read(bytes, read, bytes.length - read);
-      if (count == -1) {
-        throw new EOFException("response ended before body was complete");
-      }
-      read += count;
+
+    private static int contentLength(String headers) {
+        for (String line : headers.split("\r\n")) {
+            int separator = line.indexOf(':');
+            if (separator > 0 && "content-length".equalsIgnoreCase(line.substring(0, separator))) {
+                return Integer.parseInt(line.substring(separator + 1).trim());
+            }
+        }
+        throw new AssertionError("missing content-length header: " + headers);
+    }
+
+    private static void readFully(InputStream in, byte[] bytes) throws IOException {
+        int read = 0;
+        while (read < bytes.length) {
+            int count = in.read(bytes, read, bytes.length - read);
+            if (count == -1) {
+                throw new EOFException("response ended before body was complete");
+            }
+            read += count;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyNativeClientAbortSpanTest.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyNativeClientAbortSpanTest.java
index 28ed7e1d926..3393abdd9fe 100644
--- a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyNativeClientAbortSpanTest.java
+++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyNativeClientAbortSpanTest.java
@@ -47,195 +47,185 @@
 
 public class NettyNativeClientAbortSpanTest extends AbstractInstrumentationTest {
 
-  private static final String PATH = "/native-broken-pipe";
-  private static final String NATIVE_IO_EXCEPTION =
-      "io.netty.channel.unix.Errors$NativeIoException";
-  private static final String WRITEV_ADDRESSES_FAILURE_PREFIX = "writevAddresses(..) failed";
-  private static final String WRITEV_SYSCALL_FAILURE_PREFIX = "syscall:writev(..) failed";
-  private static final String BROKEN_PIPE_MESSAGE_SUFFIX = ": Broken pipe";
-  private static final String CONNECTION_RESET_MESSAGE_SUFFIX = ": Connection reset by peer";
-
-  @Test
-  void nativeBrokenPipeFromCancelledResponseDoesNotMarkServerSpanError() throws Exception {
-    NativeTransport transport = NativeTransport.current();
-    assumeTrue(transport.available, transport.unavailableReason);
-
-    NativeBrokenPipeHandler handler = new NativeBrokenPipeHandler();
-    EventLoopGroup boss = transport.newEventLoopGroup(1);
-    EventLoopGroup worker = transport.newEventLoopGroup(1);
-    Channel server = null;
-    try {
-      server =
-          new ServerBootstrap()
-              .group(boss, worker)
-              .channel(transport.serverSocketChannelClass)
-              .childOption(
-                  ChannelOption.WRITE_BUFFER_WATER_MARK,
-                  new WriteBufferWaterMark(32 * 1024, 64 * 1024))
-              .childHandler(
-                  new ChannelInitializer<Channel>() {
-                    @Override
-                    protected void initChannel(Channel ch) {
-                      ch.pipeline().addLast(new HttpServerCodec());
-                      ch.pipeline().addLast(handler);
-                    }
-                  })
-              .bind("127.0.0.1", 0)
-              .sync()
-              .channel();
-
-      int port = ((InetSocketAddress) server.localAddress()).getPort();
-      try (Socket socket = new Socket("127.0.0.1", port)) {
-        socket.setReceiveBufferSize(1024);
-        socket.getOutputStream().write(request().getBytes(US_ASCII));
-        socket.getOutputStream().flush();
-
-        InputStream response = socket.getInputStream();
-        assertTrue(response.read() >= 0, "server did not write any response bytes");
-      }
-
-      Throwable failure = handler.awaitFailure();
-      assertEquals(NATIVE_IO_EXCEPTION, failure.getClass().getName());
-      assertTrue(
-          isExpectedClientAbortMessage(failure.getMessage()),
-          () -> "unexpected native write failure message: " + failure.getMessage());
-
-      writer.waitForTraces(1);
-      DDSpan span = writer.firstTrace().get(0);
-      assertFalse(span.isError(), "client abort should result in a non-error span");
-      assertEquals(200, span.getTag(Tags.HTTP_STATUS));
-      assertEquals(NATIVE_IO_EXCEPTION, span.getTag(DDTags.ERROR_TYPE));
-      assertEquals(failure.getMessage(), span.getTag(DDTags.ERROR_MSG));
-      assertNull(span.getTag(DDTags.ERROR_STACK));
-    } finally {
-      if (server != null) {
-        server.close().syncUninterruptibly();
-      }
-      boss.shutdownGracefully().syncUninterruptibly();
-      worker.shutdownGracefully().syncUninterruptibly();
+    private static final String PATH = "/native-broken-pipe";
+    private static final String NATIVE_IO_EXCEPTION = "io.netty.channel.unix.Errors$NativeIoException";
+    private static final String WRITEV_ADDRESSES_FAILURE_PREFIX = "writevAddresses(..) failed";
+    private static final String WRITEV_SYSCALL_FAILURE_PREFIX = "syscall:writev(..) failed";
+    private static final String BROKEN_PIPE_MESSAGE_SUFFIX = ": Broken pipe";
+    private static final String CONNECTION_RESET_MESSAGE_SUFFIX = ": Connection reset by peer";
+
+    @Test
+    void nativeBrokenPipeFromCancelledResponseDoesNotMarkServerSpanError() throws Exception {
+        NativeTransport transport = NativeTransport.current();
+        assumeTrue(transport.available, transport.unavailableReason);
+
+        NativeBrokenPipeHandler handler = new NativeBrokenPipeHandler();
+        EventLoopGroup boss = transport.newEventLoopGroup(1);
+        EventLoopGroup worker = transport.newEventLoopGroup(1);
+        Channel server = null;
+        try {
+            server = new ServerBootstrap()
+                    .group(boss, worker)
+                    .channel(transport.serverSocketChannelClass)
+                    .childOption(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(32 * 1024, 64 * 1024))
+                    .childHandler(new ChannelInitializer<Channel>() {
+                        @Override
+                        protected void initChannel(Channel ch) {
+                            ch.pipeline().addLast(new HttpServerCodec());
+                            ch.pipeline().addLast(handler);
+                        }
+                    })
+                    .bind("127.0.0.1", 0)
+                    .sync()
+                    .channel();
+
+            int port = ((InetSocketAddress) server.localAddress()).getPort();
+            try (Socket socket = new Socket("127.0.0.1", port)) {
+                socket.setReceiveBufferSize(1024);
+                socket.getOutputStream().write(request().getBytes(US_ASCII));
+                socket.getOutputStream().flush();
+
+                InputStream response = socket.getInputStream();
+                assertTrue(response.read() >= 0, "server did not write any response bytes");
+            }
+
+            Throwable failure = handler.awaitFailure();
+            assertEquals(NATIVE_IO_EXCEPTION, failure.getClass().getName());
+            assertTrue(
+                    isExpectedClientAbortMessage(failure.getMessage()),
+                    () -> "unexpected native write failure message: " + failure.getMessage());
+
+            writer.waitForTraces(1);
+            DDSpan span = writer.firstTrace().get(0);
+            assertFalse(span.isError(), "client abort should result in a non-error span");
+            assertEquals(200, span.getTag(Tags.HTTP_STATUS));
+            assertEquals(NATIVE_IO_EXCEPTION, span.getTag(DDTags.ERROR_TYPE));
+            assertEquals(failure.getMessage(), span.getTag(DDTags.ERROR_MSG));
+            assertNull(span.getTag(DDTags.ERROR_STACK));
+        } finally {
+            if (server != null) {
+                server.close().syncUninterruptibly();
+            }
+            boss.shutdownGracefully().syncUninterruptibly();
+            worker.shutdownGracefully().syncUninterruptibly();
+        }
     }
-  }
-
-  private static String request() {
-    return "GET " + PATH + " HTTP/1.1\r\nHost: localhost\r\n\r\n";
-  }
-
-  private static boolean isExpectedClientAbortMessage(String message) {
-    return message != null
-        && (message.startsWith(WRITEV_ADDRESSES_FAILURE_PREFIX)
-            || message.startsWith(WRITEV_SYSCALL_FAILURE_PREFIX))
-        && (message.endsWith(BROKEN_PIPE_MESSAGE_SUFFIX)
-            || message.endsWith(CONNECTION_RESET_MESSAGE_SUFFIX));
-  }
-
-  @ChannelHandler.Sharable
-  private static final class NativeBrokenPipeHandler
-      extends SimpleChannelInboundHandler<HttpRequest> {
-    private final AtomicBoolean failureRecorded = new AtomicBoolean();
-    private final BlockingQueue<Throwable> failures = new LinkedBlockingQueue<>();
-
-    @Override
-    protected void channelRead0(ChannelHandlerContext ctx, HttpRequest request) {
-      if (!PATH.equals(request.uri())) {
-        ctx.close();
-        return;
-      }
-
-      DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
-      response.headers().set(TRANSFER_ENCODING, CHUNKED);
-      ctx.write(response);
-      ctx.writeAndFlush(new DefaultHttpContent(ctx.alloc().buffer(1).writeByte(1)))
-          .addListener(future -> writeCancelledResponseTail(ctx));
+
+    private static String request() {
+        return "GET " + PATH + " HTTP/1.1\r\nHost: localhost\r\n\r\n";
     }
 
-    private void writeCancelledResponseTail(ChannelHandlerContext ctx) {
-      for (int i = 0; i < 512; i++) {
-        ByteBuf content = ctx.alloc().directBuffer(16 * 1024);
-        content.writeZero(content.writableBytes());
-        ctx.write(new DefaultHttpContent(content));
-      }
-      ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT)
-          .addListener(
-              future -> {
+    private static boolean isExpectedClientAbortMessage(String message) {
+        return message != null
+                && (message.startsWith(WRITEV_ADDRESSES_FAILURE_PREFIX)
+                        || message.startsWith(WRITEV_SYSCALL_FAILURE_PREFIX))
+                && (message.endsWith(BROKEN_PIPE_MESSAGE_SUFFIX) || message.endsWith(CONNECTION_RESET_MESSAGE_SUFFIX));
+    }
+
+    @ChannelHandler.Sharable
+    private static final class NativeBrokenPipeHandler extends SimpleChannelInboundHandler<HttpRequest> {
+        private final AtomicBoolean failureRecorded = new AtomicBoolean();
+        private final BlockingQueue<Throwable> failures = new LinkedBlockingQueue<>();
+
+        @Override
+        protected void channelRead0(ChannelHandlerContext ctx, HttpRequest request) {
+            if (!PATH.equals(request.uri())) {
+                ctx.close();
+                return;
+            }
+
+            DefaultHttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
+            response.headers().set(TRANSFER_ENCODING, CHUNKED);
+            ctx.write(response);
+            ctx.writeAndFlush(new DefaultHttpContent(ctx.alloc().buffer(1).writeByte(1)))
+                    .addListener(future -> writeCancelledResponseTail(ctx));
+        }
+
+        private void writeCancelledResponseTail(ChannelHandlerContext ctx) {
+            for (int i = 0; i < 512; i++) {
+                ByteBuf content = ctx.alloc().directBuffer(16 * 1024);
+                content.writeZero(content.writableBytes());
+                ctx.write(new DefaultHttpContent(content));
+            }
+            ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT).addListener(future -> {
                 if (future.isSuccess()) {
-                  failures.offer(
-                      new AssertionError("cancelled response tail write unexpectedly succeeded"));
+                    failures.offer(new AssertionError("cancelled response tail write unexpectedly succeeded"));
                 } else if (failureRecorded.compareAndSet(false, true)) {
-                  failures.offer(future.cause());
+                    failures.offer(future.cause());
                 }
-              });
-    }
+            });
+        }
 
-    private Throwable awaitFailure() throws InterruptedException, TimeoutException {
-      Throwable failure = failures.poll(5, SECONDS);
-      if (failure == null) {
-        throw new TimeoutException("server did not observe a failed native response write");
-      }
-      return failure;
-    }
-  }
-
-  private static final class NativeTransport {
-    private final boolean available;
-    private final String unavailableReason;
-    private final Constructor<? extends EventLoopGroup> eventLoopGroupConstructor;
-    private final Class<? extends ServerChannel> serverSocketChannelClass;
-
-    private NativeTransport(String unavailableReason) {
-      this.available = false;
-      this.unavailableReason = unavailableReason;
-      this.eventLoopGroupConstructor = null;
-      this.serverSocketChannelClass = null;
+        private Throwable awaitFailure() throws InterruptedException, TimeoutException {
+            Throwable failure = failures.poll(5, SECONDS);
+            if (failure == null) {
+                throw new TimeoutException("server did not observe a failed native response write");
+            }
+            return failure;
+        }
     }
 
-    private NativeTransport(
-        Constructor<? extends EventLoopGroup> eventLoopGroupConstructor,
-        Class<? extends ServerChannel> serverSocketChannelClass) {
-      this.available = true;
-      this.unavailableReason = null;
-      this.eventLoopGroupConstructor = eventLoopGroupConstructor;
-      this.serverSocketChannelClass = serverSocketChannelClass;
-    }
+    private static final class NativeTransport {
+        private final boolean available;
+        private final String unavailableReason;
+        private final Constructor<? extends EventLoopGroup> eventLoopGroupConstructor;
+        private final Class<? extends ServerChannel> serverSocketChannelClass;
+
+        private NativeTransport(String unavailableReason) {
+            this.available = false;
+            this.unavailableReason = unavailableReason;
+            this.eventLoopGroupConstructor = null;
+            this.serverSocketChannelClass = null;
+        }
 
-    private static NativeTransport current() {
-      String osName = System.getProperty("os.name", "").toLowerCase(Locale.ROOT);
-      if (osName.contains("mac")) {
-        return load(
-            "kqueue",
-            "io.netty.channel.kqueue.KQueue",
-            "io.netty.channel.kqueue.KQueueEventLoopGroup",
-            "io.netty.channel.kqueue.KQueueServerSocketChannel");
-      } else if (osName.contains("linux")) {
-        return load(
-            "epoll",
-            "io.netty.channel.epoll.Epoll",
-            "io.netty.channel.epoll.EpollEventLoopGroup",
-            "io.netty.channel.epoll.EpollServerSocketChannel");
-      }
-      return new NativeTransport("Netty native transport is not supported on " + osName);
-    }
+        private NativeTransport(
+                Constructor<? extends EventLoopGroup> eventLoopGroupConstructor,
+                Class<? extends ServerChannel> serverSocketChannelClass) {
+            this.available = true;
+            this.unavailableReason = null;
+            this.eventLoopGroupConstructor = eventLoopGroupConstructor;
+            this.serverSocketChannelClass = serverSocketChannelClass;
+        }
 
-    private static NativeTransport load(
-        String name, String availabilityClass, String eventLoopGroupClass, String channelClass) {
-      try {
-        Class<?> availability = Class.forName(availabilityClass);
-        Method isAvailable = availability.getMethod("isAvailable");
-        if (!Boolean.TRUE.equals(isAvailable.invoke(null))) {
-          return new NativeTransport(name + " is not available");
+        private static NativeTransport current() {
+            String osName = System.getProperty("os.name", "").toLowerCase(Locale.ROOT);
+            if (osName.contains("mac")) {
+                return load(
+                        "kqueue",
+                        "io.netty.channel.kqueue.KQueue",
+                        "io.netty.channel.kqueue.KQueueEventLoopGroup",
+                        "io.netty.channel.kqueue.KQueueServerSocketChannel");
+            } else if (osName.contains("linux")) {
+                return load(
+                        "epoll",
+                        "io.netty.channel.epoll.Epoll",
+                        "io.netty.channel.epoll.EpollEventLoopGroup",
+                        "io.netty.channel.epoll.EpollServerSocketChannel");
+            }
+            return new NativeTransport("Netty native transport is not supported on " + osName);
         }
-        return new NativeTransport(
-            Class.forName(eventLoopGroupClass)
-                .asSubclass(EventLoopGroup.class)
-                .getConstructor(int.class),
-            Class.forName(channelClass).asSubclass(ServerChannel.class));
-      } catch (Throwable error) {
-        return new NativeTransport(name + " could not be loaded: " + error);
-      }
-    }
 
-    private EventLoopGroup newEventLoopGroup(int threads) throws Exception {
-      assertNotNull(eventLoopGroupConstructor);
-      return eventLoopGroupConstructor.newInstance(threads);
+        private static NativeTransport load(
+                String name, String availabilityClass, String eventLoopGroupClass, String channelClass) {
+            try {
+                Class<?> availability = Class.forName(availabilityClass);
+                Method isAvailable = availability.getMethod("isAvailable");
+                if (!Boolean.TRUE.equals(isAvailable.invoke(null))) {
+                    return new NativeTransport(name + " is not available");
+                }
+                return new NativeTransport(
+                        Class.forName(eventLoopGroupClass)
+                                .asSubclass(EventLoopGroup.class)
+                                .getConstructor(int.class),
+                        Class.forName(channelClass).asSubclass(ServerChannel.class));
+            } catch (Throwable error) {
+                return new NativeTransport(name + " could not be loaded: " + error);
+            }
+        }
+
+        private EventLoopGroup newEventLoopGroup(int threads) throws Exception {
+            assertNotNull(eventLoopGroupConstructor);
+            return eventLoopGroupConstructor.newInstance(threads);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java
index b240ae1a1d8..291fb4d3c8f 100644
--- a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java
@@ -17,50 +17,47 @@
 
 @AutoService(InstrumenterModule.class)
 public class ByteBufInputStreamInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
 
-  public ByteBufInputStreamInstrumentation() {
-    super("netty", "netty-4.0");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "io.netty.buffer.ByteBufInputStream";
-  }
+    public ByteBufInputStreamInstrumentation() {
+        super("netty", "netty-4.0");
+    }
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.netty.buffer.ByteBufInputStream";
+    }
 
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(isPublic())
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("io.netty.buffer.ByteBuf")))
-            .and(takesArgument(1, int.class))
-            .and(takesArgument(2, boolean.class)),
-        ByteBufInputStreamInstrumentation.class.getName() + "$ConstructorAdvice");
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
+    }
 
-  public static class ConstructorAdvice {
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(isPublic())
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("io.netty.buffer.ByteBuf")))
+                        .and(takesArgument(1, int.class))
+                        .and(takesArgument(2, boolean.class)),
+                ByteBufInputStreamInstrumentation.class.getName() + "$ConstructorAdvice");
+    }
 
-    @Advice.OnMethodExit
-    @Propagation
-    public static void onExit(
-        @Advice.This final Object self, @Advice.Argument(0) final Object buffer) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      try {
-        if (module != null) {
-          module.taintObjectIfTainted(self, buffer);
+    public static class ConstructorAdvice {
+
+        @Advice.OnMethodExit
+        @Propagation
+        public static void onExit(@Advice.This final Object self, @Advice.Argument(0) final Object buffer) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            try {
+                if (module != null) {
+                    module.taintObjectIfTainted(self, buffer);
+                }
+            } catch (final Throwable e) {
+                module.onUnexpectedException("ByteBufInputStream ctor threw", e);
+            }
         }
-      } catch (final Throwable e) {
-        module.onUnexpectedException("ByteBufInputStream ctor threw", e);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInstrumentation.java
index 0b7da02e4c6..7a7742bfd80 100644
--- a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInstrumentation.java
@@ -7,28 +7,26 @@
 
 @AutoService(InstrumenterModule.class)
 public class ByteBufInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
 
-  private final String className = ByteBufInstrumentation.class.getName();
+    private final String className = ByteBufInstrumentation.class.getName();
 
-  public ByteBufInstrumentation() {
-    super("netty", "netty-4.0");
-  }
+    public ByteBufInstrumentation() {
+        super("netty", "netty-4.0");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.netty.buffer.ByteBuf";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.netty.buffer.ByteBuf";
+    }
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
+    }
 
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    // TODO add propagation if needed
-  }
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        // TODO add propagation if needed
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-common/src/main/java/datadog/trace/instrumentation/netty41/AttributeKeys.java b/dd-java-agent/instrumentation/netty/netty-common/src/main/java/datadog/trace/instrumentation/netty41/AttributeKeys.java
index addf40b55d6..86d59a49683 100644
--- a/dd-java-agent/instrumentation/netty/netty-common/src/main/java/datadog/trace/instrumentation/netty41/AttributeKeys.java
+++ b/dd-java-agent/instrumentation/netty/netty-common/src/main/java/datadog/trace/instrumentation/netty41/AttributeKeys.java
@@ -13,48 +13,47 @@
 
 public final class AttributeKeys {
 
-  private static final ClassValue<ConcurrentHashMap<String, AttributeKey<?>>> MAPS =
-      GenericClassValue.constructing(ConcurrentHashMap.class);
-
-  public static final AttributeKey<Context> CONTEXT_ATTRIBUTE_KEY =
-      attributeKey(DD_CONTEXT_ATTRIBUTE);
-
-  public static final AttributeKey<AgentSpan> CLIENT_PARENT_ATTRIBUTE_KEY =
-      attributeKey("datadog.client.parent.span");
-
-  public static final AttributeKey<ContextContinuation> CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY =
-      attributeKey("datadog.connect.parent.continuation");
-
-  public static final AttributeKey<Boolean> HTTP2_CONNECTION_CODEC_ATTRIBUTE_KEY =
-      attributeKey("datadog.http2.connection.codec");
-
-  public static final AttributeKey<Context> PARENT_CONTEXT_ATTRIBUTE_KEY =
-      attributeKey("datadog.server.parent-context");
-
-  public static final AttributeKey<HandlerContext.Sender> WEBSOCKET_SENDER_HANDLER_CONTEXT =
-      attributeKey("datadog.server.websocket.sender.handler_context");
-
-  public static final AttributeKey<HandlerContext.Receiver> WEBSOCKET_RECEIVER_HANDLER_CONTEXT =
-      attributeKey("datadog.server.websocket.receiver.handler_context");
-
-  /**
-   * Generate an attribute key or reuse the one existing in the global app map. This implementation
-   * creates attributes only once even if the current class is loaded by several class loaders and
-   * prevents an issue with Apache Atlas project were this class loaded by multiple class loaders,
-   * while the Attribute class is loaded by a third class loader and used internally for the
-   * cassandra driver.
-   */
-  @SuppressWarnings("unchecked")
-  static <T> AttributeKey<T> attributeKey(final String key) {
-    ConcurrentMap<String, AttributeKey<?>> map = MAPS.get(AttributeKey.class);
-    AttributeKey<T> attributeKey = (AttributeKey<T>) map.get(key);
-    if (null == attributeKey) {
-      attributeKey = AttributeKey.valueOf(key);
-      AttributeKey<T> predecessor = (AttributeKey<T>) map.putIfAbsent(key, attributeKey);
-      if (null != predecessor) {
-        attributeKey = predecessor;
-      }
+    private static final ClassValue<ConcurrentHashMap<String, AttributeKey<?>>> MAPS =
+            GenericClassValue.constructing(ConcurrentHashMap.class);
+
+    public static final AttributeKey<Context> CONTEXT_ATTRIBUTE_KEY = attributeKey(DD_CONTEXT_ATTRIBUTE);
+
+    public static final AttributeKey<AgentSpan> CLIENT_PARENT_ATTRIBUTE_KEY =
+            attributeKey("datadog.client.parent.span");
+
+    public static final AttributeKey<ContextContinuation> CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY =
+            attributeKey("datadog.connect.parent.continuation");
+
+    public static final AttributeKey<Boolean> HTTP2_CONNECTION_CODEC_ATTRIBUTE_KEY =
+            attributeKey("datadog.http2.connection.codec");
+
+    public static final AttributeKey<Context> PARENT_CONTEXT_ATTRIBUTE_KEY =
+            attributeKey("datadog.server.parent-context");
+
+    public static final AttributeKey<HandlerContext.Sender> WEBSOCKET_SENDER_HANDLER_CONTEXT =
+            attributeKey("datadog.server.websocket.sender.handler_context");
+
+    public static final AttributeKey<HandlerContext.Receiver> WEBSOCKET_RECEIVER_HANDLER_CONTEXT =
+            attributeKey("datadog.server.websocket.receiver.handler_context");
+
+    /**
+     * Generate an attribute key or reuse the one existing in the global app map. This implementation
+     * creates attributes only once even if the current class is loaded by several class loaders and
+     * prevents an issue with Apache Atlas project were this class loaded by multiple class loaders,
+     * while the Attribute class is loaded by a third class loader and used internally for the
+     * cassandra driver.
+     */
+    @SuppressWarnings("unchecked")
+    static <T> AttributeKey<T> attributeKey(final String key) {
+        ConcurrentMap<String, AttributeKey<?>> map = MAPS.get(AttributeKey.class);
+        AttributeKey<T> attributeKey = (AttributeKey<T>) map.get(key);
+        if (null == attributeKey) {
+            attributeKey = AttributeKey.valueOf(key);
+            AttributeKey<T> predecessor = (AttributeKey<T>) map.putIfAbsent(key, attributeKey);
+            if (null != predecessor) {
+                attributeKey = predecessor;
+            }
+        }
+        return attributeKey;
     }
-    return attributeKey;
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-common/src/main/java/datadog/trace/instrumentation/netty41/ServerRequestContext.java b/dd-java-agent/instrumentation/netty/netty-common/src/main/java/datadog/trace/instrumentation/netty41/ServerRequestContext.java
index 313c7530b89..bf70fa58f25 100644
--- a/dd-java-agent/instrumentation/netty/netty-common/src/main/java/datadog/trace/instrumentation/netty41/ServerRequestContext.java
+++ b/dd-java-agent/instrumentation/netty/netty-common/src/main/java/datadog/trace/instrumentation/netty41/ServerRequestContext.java
@@ -13,259 +13,255 @@
 
 /** Per-request server state stored on the channel until the matching response is written. */
 public final class ServerRequestContext {
-  /**
-   * Returns whether a new server request can be tracked on this channel (and may disable server
-   * tracing for the channel if the pending-context limit is exceeded).
-   */
-  public static boolean canTrackRequest(final AttributeMap attributes) {
-    final Deque<ServerRequestContext> contexts =
-        attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).get();
-    return contexts == null || canAdd(attributes, contexts);
-  }
-
-  /** Adds a request context to the queue tail. */
-  public static ServerRequestContext add(
-      final AttributeMap attributes, final Context context, final String acceptHeader) {
-    final Deque<ServerRequestContext> contexts = getOrCreate(attributes);
-    if (!canAdd(attributes, contexts)) {
-      return null;
+    /**
+     * Returns whether a new server request can be tracked on this channel (and may disable server
+     * tracing for the channel if the pending-context limit is exceeded).
+     */
+    public static boolean canTrackRequest(final AttributeMap attributes) {
+        final Deque<ServerRequestContext> contexts =
+                attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).get();
+        return contexts == null || canAdd(attributes, contexts);
     }
-    final ServerRequestContext serverContext = new ServerRequestContext(context, acceptHeader);
-    contexts.addLast(serverContext);
-    // The deque is authoritative for server request/response matching. CONTEXT_ATTRIBUTE_KEY is a
-    // context mirror of the current inbound request used by
-    // NettyChannelHandlerContextInstrumentation.FireAdvice and copied to HTTP/2 stream channels by
-    // Http2MultiplexHandlerStreamChannelInstrumentation.
-    attributes.attr(CONTEXT_ATTRIBUTE_KEY).set(context);
-    return serverContext;
-  }
-
-  /** Returns the server request context for the next response. */
-  public static ServerRequestContext nextResponse(final AttributeMap attributes) {
-    final Deque<ServerRequestContext> contexts =
-        attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).get();
-    // HTTP/1.1 responses are written in request order, including when requests are pipelined on one
-    // connection.
-    return contexts == null || isPoisoned(contexts) ? null : contexts.peekFirst();
-  }
-
-  /** Returns the server request context for the current inbound request. */
-  public static ServerRequestContext currentRequest(final AttributeMap attributes) {
-    final Deque<ServerRequestContext> contexts =
-        attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).get();
-    return contexts == null || isPoisoned(contexts) ? null : contexts.peekLast();
-  }
-
-  /** Returns whether the request context is still awaiting a response on this channel. */
-  public static boolean isPending(
-      final AttributeMap attributes, final ServerRequestContext serverContext) {
-    if (serverContext == null) {
-      return false;
+
+    /** Adds a request context to the queue tail. */
+    public static ServerRequestContext add(
+            final AttributeMap attributes, final Context context, final String acceptHeader) {
+        final Deque<ServerRequestContext> contexts = getOrCreate(attributes);
+        if (!canAdd(attributes, contexts)) {
+            return null;
+        }
+        final ServerRequestContext serverContext = new ServerRequestContext(context, acceptHeader);
+        contexts.addLast(serverContext);
+        // The deque is authoritative for server request/response matching. CONTEXT_ATTRIBUTE_KEY is a
+        // context mirror of the current inbound request used by
+        // NettyChannelHandlerContextInstrumentation.FireAdvice and copied to HTTP/2 stream channels by
+        // Http2MultiplexHandlerStreamChannelInstrumentation.
+        attributes.attr(CONTEXT_ATTRIBUTE_KEY).set(context);
+        return serverContext;
+    }
+
+    /** Returns the server request context for the next response. */
+    public static ServerRequestContext nextResponse(final AttributeMap attributes) {
+        final Deque<ServerRequestContext> contexts =
+                attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).get();
+        // HTTP/1.1 responses are written in request order, including when requests are pipelined on one
+        // connection.
+        return contexts == null || isPoisoned(contexts) ? null : contexts.peekFirst();
+    }
+
+    /** Returns the server request context for the current inbound request. */
+    public static ServerRequestContext currentRequest(final AttributeMap attributes) {
+        final Deque<ServerRequestContext> contexts =
+                attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).get();
+        return contexts == null || isPoisoned(contexts) ? null : contexts.peekLast();
+    }
+
+    /** Returns whether the request context is still awaiting a response on this channel. */
+    public static boolean isPending(final AttributeMap attributes, final ServerRequestContext serverContext) {
+        if (serverContext == null) {
+            return false;
+        }
+        final Deque<ServerRequestContext> contexts =
+                attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).get();
+        return contexts != null && !isPoisoned(contexts) && contexts.contains(serverContext);
+    }
+
+    /** Returns whether a request block is closing the channel. */
+    public static boolean isRequestBlocked(final AttributeMap attributes) {
+        return attributes.attr(BLOCKED_REQUEST_ATTRIBUTE_KEY).get() != null;
+    }
+
+    /** Marks the channel as closing after an AppSec request block. */
+    public static void markRequestBlocked(final AttributeMap attributes) {
+        attributes.attr(BLOCKED_REQUEST_ATTRIBUTE_KEY).set(Boolean.TRUE);
+    }
+
+    /** Returns whether the channel is closing after an AppSec response block. */
+    public static boolean isResponseBlocked(final AttributeMap attributes) {
+        return attributes.attr(BLOCKED_RESPONSE_ATTRIBUTE_KEY).get() != null;
     }
-    final Deque<ServerRequestContext> contexts =
-        attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).get();
-    return contexts != null && !isPoisoned(contexts) && contexts.contains(serverContext);
-  }
-
-  /** Returns whether a request block is closing the channel. */
-  public static boolean isRequestBlocked(final AttributeMap attributes) {
-    return attributes.attr(BLOCKED_REQUEST_ATTRIBUTE_KEY).get() != null;
-  }
-
-  /** Marks the channel as closing after an AppSec request block. */
-  public static void markRequestBlocked(final AttributeMap attributes) {
-    attributes.attr(BLOCKED_REQUEST_ATTRIBUTE_KEY).set(Boolean.TRUE);
-  }
-
-  /** Returns whether the channel is closing after an AppSec response block. */
-  public static boolean isResponseBlocked(final AttributeMap attributes) {
-    return attributes.attr(BLOCKED_RESPONSE_ATTRIBUTE_KEY).get() != null;
-  }
-
-  /** Marks the channel as closing after an AppSec response block. */
-  public static void markResponseBlocked(final AttributeMap attributes) {
-    attributes.attr(BLOCKED_RESPONSE_ATTRIBUTE_KEY).set(Boolean.TRUE);
-  }
-
-  /** Removes a completed or failed request context. */
-  public static void remove(
-      final AttributeMap attributes, final ServerRequestContext serverContext) {
-    if (serverContext == null) {
-      return;
+
+    /** Marks the channel as closing after an AppSec response block. */
+    public static void markResponseBlocked(final AttributeMap attributes) {
+        attributes.attr(BLOCKED_RESPONSE_ATTRIBUTE_KEY).set(Boolean.TRUE);
     }
-    final Deque<ServerRequestContext> contexts =
-        attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).get();
-    if (contexts != null) {
-      if (isPoisoned(contexts)) {
-        return;
-      }
-      final boolean removed;
-      if (contexts.peekFirst() == serverContext) {
-        // Response completion consumes the queue head.
-        contexts.pollFirst();
-        removed = true;
-      } else {
-        // Request-side failures normally remove the tail. Remove by value to cover later cleanup
-        // after additional pipelined requests were queued.
-        removed = contexts.remove(serverContext);
-      }
-      final ServerRequestContext currentContext = contexts.peekLast();
-      if (currentContext == null) {
-        attributes.attr(CONTEXT_ATTRIBUTE_KEY).set(null);
-      } else {
-        if (removed && contexts.size() == 1) {
-          // An expanded pipeline must drain through one pending request. Replace its potentially
-          // large backing array while retaining a compact queue for later keep-alive requests.
-          final Deque<ServerRequestContext> compactContexts = new ArrayDeque<>(1);
-          compactContexts.addLast(currentContext);
-          attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).set(compactContexts);
+
+    /** Removes a completed or failed request context. */
+    public static void remove(final AttributeMap attributes, final ServerRequestContext serverContext) {
+        if (serverContext == null) {
+            return;
+        }
+        final Deque<ServerRequestContext> contexts =
+                attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).get();
+        if (contexts != null) {
+            if (isPoisoned(contexts)) {
+                return;
+            }
+            final boolean removed;
+            if (contexts.peekFirst() == serverContext) {
+                // Response completion consumes the queue head.
+                contexts.pollFirst();
+                removed = true;
+            } else {
+                // Request-side failures normally remove the tail. Remove by value to cover later cleanup
+                // after additional pipelined requests were queued.
+                removed = contexts.remove(serverContext);
+            }
+            final ServerRequestContext currentContext = contexts.peekLast();
+            if (currentContext == null) {
+                attributes.attr(CONTEXT_ATTRIBUTE_KEY).set(null);
+            } else {
+                if (removed && contexts.size() == 1) {
+                    // An expanded pipeline must drain through one pending request. Replace its potentially
+                    // large backing array while retaining a compact queue for later keep-alive requests.
+                    final Deque<ServerRequestContext> compactContexts = new ArrayDeque<>(1);
+                    compactContexts.addLast(currentContext);
+                    attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).set(compactContexts);
+                }
+                // Keep the context mirror pointed at the current inbound request after removing an older
+                // response context. It may still be copied to a new HTTP/2 stream channel.
+                attributes.attr(CONTEXT_ATTRIBUTE_KEY).set(currentContext.tracingContext());
+            }
         }
-        // Keep the context mirror pointed at the current inbound request after removing an older
-        // response context. It may still be copied to a new HTTP/2 stream channel.
-        attributes.attr(CONTEXT_ATTRIBUTE_KEY).set(currentContext.tracingContext());
-      }
     }
-  }
-
-  /** Closes all pending request contexts on channel close. */
-  public static void closeAll(final AttributeMap attributes) {
-    close(removeAll(attributes));
-  }
-
-  /** Removes all pending request contexts. */
-  public static Deque<ServerRequestContext> removeAll(final AttributeMap attributes) {
-    // The context mirror must not outlive the authoritative request queue.
-    attributes.attr(CONTEXT_ATTRIBUTE_KEY).remove();
-    attributes.attr(BLOCKED_REQUEST_ATTRIBUTE_KEY).remove();
-    attributes.attr(BLOCKED_RESPONSE_ATTRIBUTE_KEY).remove();
-    return attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).getAndRemove();
-  }
-
-  private static final int PIPELINING_LIMIT = 1000;
-
-  private static final Logger log = LoggerFactory.getLogger(ServerRequestContext.class);
-
-  /** Pending server request contexts for a channel. */
-  private static final AttributeKey<Deque<ServerRequestContext>>
-      SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY =
-          AttributeKeys.attributeKey("datadog.server.request.contexts");
-
-  private static final AttributeKey<Boolean> BLOCKED_RESPONSE_ATTRIBUTE_KEY =
-      AttributeKeys.attributeKey("datadog.server.blocked_response");
-
-  private static final AttributeKey<Boolean> BLOCKED_REQUEST_ATTRIBUTE_KEY =
-      AttributeKeys.attributeKey("datadog.server.blocked_request");
-
-  private static final Deque<ServerRequestContext> POISONED_CONTEXTS = new ArrayDeque<>(0);
-
-  /** Creates the per-channel server request context queue. */
-  private static Deque<ServerRequestContext> getOrCreate(final AttributeMap attributes) {
-    Deque<ServerRequestContext> contexts =
-        attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).get();
-    if (contexts == null) {
-      // Netty serializes handler callbacks for a channel on its EventLoop, so this queue does not
-      // need the allocation and atomic overhead of a concurrent collection.
-      // Most keep-alive traffic is sequential, so retain a queue sized for one request until the
-      // channel closes rather than reallocating it for every request.
-      contexts = new ArrayDeque<>(1);
-      attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).set(contexts);
+
+    /** Closes all pending request contexts on channel close. */
+    public static void closeAll(final AttributeMap attributes) {
+        close(removeAll(attributes));
+    }
+
+    /** Removes all pending request contexts. */
+    public static Deque<ServerRequestContext> removeAll(final AttributeMap attributes) {
+        // The context mirror must not outlive the authoritative request queue.
+        attributes.attr(CONTEXT_ATTRIBUTE_KEY).remove();
+        attributes.attr(BLOCKED_REQUEST_ATTRIBUTE_KEY).remove();
+        attributes.attr(BLOCKED_RESPONSE_ATTRIBUTE_KEY).remove();
+        return attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).getAndRemove();
+    }
+
+    private static final int PIPELINING_LIMIT = 1000;
+
+    private static final Logger log = LoggerFactory.getLogger(ServerRequestContext.class);
+
+    /** Pending server request contexts for a channel. */
+    private static final AttributeKey<Deque<ServerRequestContext>> SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY =
+            AttributeKeys.attributeKey("datadog.server.request.contexts");
+
+    private static final AttributeKey<Boolean> BLOCKED_RESPONSE_ATTRIBUTE_KEY =
+            AttributeKeys.attributeKey("datadog.server.blocked_response");
+
+    private static final AttributeKey<Boolean> BLOCKED_REQUEST_ATTRIBUTE_KEY =
+            AttributeKeys.attributeKey("datadog.server.blocked_request");
+
+    private static final Deque<ServerRequestContext> POISONED_CONTEXTS = new ArrayDeque<>(0);
+
+    /** Creates the per-channel server request context queue. */
+    private static Deque<ServerRequestContext> getOrCreate(final AttributeMap attributes) {
+        Deque<ServerRequestContext> contexts =
+                attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).get();
+        if (contexts == null) {
+            // Netty serializes handler callbacks for a channel on its EventLoop, so this queue does not
+            // need the allocation and atomic overhead of a concurrent collection.
+            // Most keep-alive traffic is sequential, so retain a queue sized for one request until the
+            // channel closes rather than reallocating it for every request.
+            contexts = new ArrayDeque<>(1);
+            attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).set(contexts);
+        }
+        return contexts;
     }
-    return contexts;
-  }
 
-  private static void close(final Deque<ServerRequestContext> contexts) {
-    if (contexts == null || isPoisoned(contexts)) {
-      return;
+    private static void close(final Deque<ServerRequestContext> contexts) {
+        if (contexts == null || isPoisoned(contexts)) {
+            return;
+        }
+        ServerRequestContext context;
+        while ((context = contexts.pollFirst()) != null) {
+            try {
+                final AgentSpan span = AgentSpan.fromContext(context.tracingContext());
+                if (span != null && span.phasedFinish()) {
+                    // These contexts no longer have a response handler path that can finish the span.
+                    span.publish();
+                }
+            } catch (final Throwable ignored) {
+            }
+        }
     }
-    ServerRequestContext context;
-    while ((context = contexts.pollFirst()) != null) {
-      try {
-        final AgentSpan span = AgentSpan.fromContext(context.tracingContext());
-        if (span != null && span.phasedFinish()) {
-          // These contexts no longer have a response handler path that can finish the span.
-          span.publish();
+
+    private static boolean canAdd(final AttributeMap attributes, final Deque<ServerRequestContext> contexts) {
+        if (isPoisoned(contexts)) {
+            return false;
+        }
+        // If this limit is exceeded, stop tracing on the channel and drain the deque. This suggests
+        // contexts are not being removed, for example because the server stopped writing responses.
+        if (contexts.size() >= PIPELINING_LIMIT) {
+            final int pendingContexts = contexts.size();
+            close(contexts);
+            attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).set(POISONED_CONTEXTS);
+            attributes.attr(CONTEXT_ATTRIBUTE_KEY).remove();
+            log.error(
+                    "Too many pending Netty server request contexts on a channel; "
+                            + "closing {} contexts and disabling Netty server tracing on that channel "
+                            + "(limit: {})",
+                    pendingContexts,
+                    PIPELINING_LIMIT);
+            return false;
         }
-      } catch (final Throwable ignored) {
-      }
+        return true;
+    }
+
+    private static boolean isPoisoned(final Deque<ServerRequestContext> contexts) {
+        return contexts == POISONED_CONTEXTS;
+    }
+
+    private final Context tracingContext;
+    private final String acceptHeader;
+    private boolean responseStarted;
+    private boolean beforeFinishCalled;
+    private boolean responseAnalyzed;
+    private Object deferredBlockResponse;
+
+    public Context tracingContext() {
+        return tracingContext;
+    }
+
+    public String acceptHeader() {
+        return acceptHeader;
+    }
+
+    public boolean isResponseStarted() {
+        return responseStarted;
+    }
+
+    public void markResponseStarted() {
+        responseStarted = true;
+    }
+
+    public boolean isBeforeFinishCalled() {
+        return beforeFinishCalled;
+    }
+
+    public void markBeforeFinishCalled() {
+        beforeFinishCalled = true;
     }
-  }
 
-  private static boolean canAdd(
-      final AttributeMap attributes, final Deque<ServerRequestContext> contexts) {
-    if (isPoisoned(contexts)) {
-      return false;
+    public boolean isResponseAnalyzed() {
+        return responseAnalyzed;
     }
-    // If this limit is exceeded, stop tracing on the channel and drain the deque. This suggests
-    // contexts are not being removed, for example because the server stopped writing responses.
-    if (contexts.size() >= PIPELINING_LIMIT) {
-      final int pendingContexts = contexts.size();
-      close(contexts);
-      attributes.attr(SERVER_REQUEST_CONTEXTS_ATTRIBUTE_KEY).set(POISONED_CONTEXTS);
-      attributes.attr(CONTEXT_ATTRIBUTE_KEY).remove();
-      log.error(
-          "Too many pending Netty server request contexts on a channel; "
-              + "closing {} contexts and disabling Netty server tracing on that channel "
-              + "(limit: {})",
-          pendingContexts,
-          PIPELINING_LIMIT);
-      return false;
+
+    public void markResponseAnalyzed() {
+        responseAnalyzed = true;
+    }
+
+    public Object deferredBlockResponse() {
+        return deferredBlockResponse;
+    }
+
+    public void deferBlockResponse(final Object deferredBlockResponse) {
+        this.deferredBlockResponse = deferredBlockResponse;
+    }
+
+    private ServerRequestContext(final Context tracingContext, final String acceptHeader) {
+        this.tracingContext = tracingContext;
+        this.acceptHeader = acceptHeader;
     }
-    return true;
-  }
-
-  private static boolean isPoisoned(final Deque<ServerRequestContext> contexts) {
-    return contexts == POISONED_CONTEXTS;
-  }
-
-  private final Context tracingContext;
-  private final String acceptHeader;
-  private boolean responseStarted;
-  private boolean beforeFinishCalled;
-  private boolean responseAnalyzed;
-  private Object deferredBlockResponse;
-
-  public Context tracingContext() {
-    return tracingContext;
-  }
-
-  public String acceptHeader() {
-    return acceptHeader;
-  }
-
-  public boolean isResponseStarted() {
-    return responseStarted;
-  }
-
-  public void markResponseStarted() {
-    responseStarted = true;
-  }
-
-  public boolean isBeforeFinishCalled() {
-    return beforeFinishCalled;
-  }
-
-  public void markBeforeFinishCalled() {
-    beforeFinishCalled = true;
-  }
-
-  public boolean isResponseAnalyzed() {
-    return responseAnalyzed;
-  }
-
-  public void markResponseAnalyzed() {
-    responseAnalyzed = true;
-  }
-
-  public Object deferredBlockResponse() {
-    return deferredBlockResponse;
-  }
-
-  public void deferBlockResponse(final Object deferredBlockResponse) {
-    this.deferredBlockResponse = deferredBlockResponse;
-  }
-
-  private ServerRequestContext(final Context tracingContext, final String acceptHeader) {
-    this.tracingContext = tracingContext;
-    this.acceptHeader = acceptHeader;
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/NettyPromiseTaskInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/NettyPromiseTaskInstrumentation.java
index 1a0b0d164a3..c00beed4bd3 100644
--- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/NettyPromiseTaskInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/NettyPromiseTaskInstrumentation.java
@@ -28,89 +28,88 @@
 
 @AutoService(InstrumenterModule.class)
 public final class NettyPromiseTaskInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public NettyPromiseTaskInstrumentation() {
-    // Share both names with RunnableFutureInstrumentation because it captures continuations that
-    // this instrumentation activates for scheduled tasks; either name must enable both halves.
-    super("java_concurrent", "runnable-future");
-  }
+    public NettyPromiseTaskInstrumentation() {
+        // Share both names with RunnableFutureInstrumentation because it captures continuations that
+        // this instrumentation activates for scheduled tasks; either name must enable both halves.
+        super("java_concurrent", "runnable-future");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return RunnableFuture.class.getName();
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return RunnableFuture.class.getName();
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(nameEndsWith(".netty.util.concurrent.PromiseTask"))
-        .and(implementsInterface(named(RunnableFuture.class.getName())))
-        .and(hasSuperType(declaresMethod(named("runTask"))));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(nameEndsWith(".netty.util.concurrent.PromiseTask"))
+                .and(implementsInterface(named(RunnableFuture.class.getName())))
+                .and(hasSuperType(declaresMethod(named("runTask"))));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("java.util.concurrent.RunnableFuture", State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("java.util.concurrent.RunnableFuture", State.class.getName());
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {packageName + ".ScheduledTaskScope"};
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {packageName + ".ScheduledTaskScope"};
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("runTask")).and(takesNoArguments()),
-        getClass().getName() + "$RunTask");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("run"))
-            .and(takesNoArguments())
-            .and(isDeclaredBy(nameEndsWith(".netty.util.concurrent.ScheduledFutureTask"))),
-        getClass().getName() + "$Run");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("runTask")).and(takesNoArguments()),
+                getClass().getName() + "$RunTask");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("run"))
+                        .and(takesNoArguments())
+                        .and(isDeclaredBy(nameEndsWith(".netty.util.concurrent.ScheduledFutureTask"))),
+                getClass().getName() + "$Run");
+    }
 
-  public static final class RunTask {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void activate(@Advice.This RunnableFuture<?> task) {
-      if (task instanceof ScheduledFuture) {
-        ContextScope scope =
-            startTaskScope(InstrumentationContext.get(RunnableFuture.class, State.class), task);
-        if (scope != null) {
-          ScheduledTaskScope state = ScheduledTaskScope.CURRENT.get();
-          if (state == null) {
-            state = new ScheduledTaskScope();
-            ScheduledTaskScope.CURRENT.set(state);
-          }
-          state.scope = scope;
-          state.depth++;
+    public static final class RunTask {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void activate(@Advice.This RunnableFuture<?> task) {
+            if (task instanceof ScheduledFuture) {
+                ContextScope scope =
+                        startTaskScope(InstrumentationContext.get(RunnableFuture.class, State.class), task);
+                if (scope != null) {
+                    ScheduledTaskScope state = ScheduledTaskScope.CURRENT.get();
+                    if (state == null) {
+                        state = new ScheduledTaskScope();
+                        ScheduledTaskScope.CURRENT.set(state);
+                    }
+                    state.scope = scope;
+                    state.depth++;
+                }
+            }
         }
-      }
     }
-  }
 
-  public static final class Run {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(@Advice.Local("depth") int depth) {
-      ScheduledTaskScope state = ScheduledTaskScope.CURRENT.get();
-      if (state != null) {
-        depth = state.depth;
-        return state.scope;
-      }
-      return null;
-    }
+    public static final class Run {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(@Advice.Local("depth") int depth) {
+            ScheduledTaskScope state = ScheduledTaskScope.CURRENT.get();
+            if (state != null) {
+                depth = state.depth;
+                return state.scope;
+            }
+            return null;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.Enter ContextScope previous, @Advice.Local("depth") int depth) {
-      ScheduledTaskScope state = ScheduledTaskScope.CURRENT.get();
-      if (state != null && state.depth > depth) {
-        ContextScope scope = state.scope;
-        state.scope = previous;
-        state.depth = depth;
-        endTaskScope(scope);
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter ContextScope previous, @Advice.Local("depth") int depth) {
+            ScheduledTaskScope state = ScheduledTaskScope.CURRENT.get();
+            if (state != null && state.depth > depth) {
+                ContextScope scope = state.scope;
+                state.scope = previous;
+                state.depth = depth;
+                endTaskScope(scope);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/ScheduledTaskScope.java b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/ScheduledTaskScope.java
index f1c9af9d7f2..4bba877df80 100644
--- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/ScheduledTaskScope.java
+++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/ScheduledTaskScope.java
@@ -4,9 +4,9 @@
 
 /** Transfers the runTask() scope to run() so completion listeners retain the task context. */
 public final class ScheduledTaskScope {
-  public static final ThreadLocal<ScheduledTaskScope> CURRENT = new ThreadLocal<>();
+    public static final ThreadLocal<ScheduledTaskScope> CURRENT = new ThreadLocal<>();
 
-  public ContextScope scope;
-  // Track activations separately: resuming the same context can reuse the outer scope instance.
-  public int depth;
+    public ContextScope scope;
+    // Track activations separately: resuming the same context can reuse the outer scope instance.
+    public int depth;
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java
index 8d67743d5e6..90955ab8df2 100644
--- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java
@@ -27,142 +27,142 @@
 
 @AutoService(InstrumenterModule.class)
 public class SingleThreadEventExecutorInstrumentation extends InstrumenterModule.Profiling
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public SingleThreadEventExecutorInstrumentation() {
-    super("netty-concurrent", "netty-event-executor");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public SingleThreadEventExecutorInstrumentation() {
+        super("netty-concurrent", "netty-event-executor");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled()
-        && ConfigProvider.getInstance()
-            .getBoolean(
-                ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED,
-                ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED_DEFAULT);
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled()
+                && ConfigProvider.getInstance()
+                        .getBoolean(
+                                ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED,
+                                ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED_DEFAULT);
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(RunnableFuture.class.getName(), State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(RunnableFuture.class.getName(), State.class.getName());
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.netty.util.concurrent.SingleThreadEventExecutor",
-      "io.grpc.shaded.io.netty.util.concurrent.SingleThreadEventExecutor",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.netty.util.concurrent.SingleThreadEventExecutor",
+            "io.grpc.shaded.io.netty.util.concurrent.SingleThreadEventExecutor",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("addTask"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, Runnable.class))
-            .and(isDeclaredBy(declaresField(named("taskQueue")))),
-        getClass().getName() + "$StartTimingTaskQueue");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("schedule"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, nameEndsWith("netty.util.concurrent.ScheduledFutureTask")))
-            .and(isDeclaredBy(declaresField(named("delayedTaskQueue")))),
-        getClass().getName() + "$StartTimingDelayedTaskQueue");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("schedule"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, nameEndsWith("netty.util.concurrent.ScheduledFutureTask")))
-            .and(isDeclaredBy(declaresField(named("scheduledTaskQueue")))),
-        getClass().getName() + "$StartTimingScheduledTaskQueue");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("addTask"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, Runnable.class))
+                        .and(isDeclaredBy(declaresField(named("taskQueue")))),
+                getClass().getName() + "$StartTimingTaskQueue");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("schedule"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, nameEndsWith("netty.util.concurrent.ScheduledFutureTask")))
+                        .and(isDeclaredBy(declaresField(named("delayedTaskQueue")))),
+                getClass().getName() + "$StartTimingDelayedTaskQueue");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("schedule"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, nameEndsWith("netty.util.concurrent.ScheduledFutureTask")))
+                        .and(isDeclaredBy(declaresField(named("scheduledTaskQueue")))),
+                getClass().getName() + "$StartTimingScheduledTaskQueue");
+    }
 
-  @SuppressWarnings("rawtypes")
-  private static final class StartTimingTaskQueue {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void before(
-        @Advice.FieldValue("taskQueue") Queue<?> taskQueue,
-        @Advice.This EventExecutor executor,
-        @Advice.Argument(0) Runnable task) {
-      if (!QueueTimerHelper.isReady()) {
-        return;
-      }
-      // should be a PromiseTask which is a RunnableFuture
-      if (task instanceof RunnableFuture) {
-        // detect double timing - also not interested in queueing time unless the task is traced
-        // state == null => not traced, state.isTimed() => double timing
-        ContextStore<RunnableFuture, State> contextStore =
-            InstrumentationContext.get(RunnableFuture.class, State.class);
-        State state = contextStore.get((RunnableFuture) task);
-        if (state == null || state.isTimed() || taskQueue == null) {
-          return;
+    @SuppressWarnings("rawtypes")
+    private static final class StartTimingTaskQueue {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void before(
+                @Advice.FieldValue("taskQueue") Queue<?> taskQueue,
+                @Advice.This EventExecutor executor,
+                @Advice.Argument(0) Runnable task) {
+            if (!QueueTimerHelper.isReady()) {
+                return;
+            }
+            // should be a PromiseTask which is a RunnableFuture
+            if (task instanceof RunnableFuture) {
+                // detect double timing - also not interested in queueing time unless the task is traced
+                // state == null => not traced, state.isTimed() => double timing
+                ContextStore<RunnableFuture, State> contextStore =
+                        InstrumentationContext.get(RunnableFuture.class, State.class);
+                State state = contextStore.get((RunnableFuture) task);
+                if (state == null || state.isTimed() || taskQueue == null) {
+                    return;
+                }
+                Class<?> queueType = taskQueue == null ? null : taskQueue.getClass();
+                int length = taskQueue == null ? 0 : taskQueue.size();
+                EventExecutorGroup parent = executor.parent();
+                Class<?> schedulerClass = parent == null ? executor.getClass() : parent.getClass();
+                QueueTimerHelper.startQueuingTimer(state, schedulerClass, queueType, length, task);
+            }
         }
-        Class<?> queueType = taskQueue == null ? null : taskQueue.getClass();
-        int length = taskQueue == null ? 0 : taskQueue.size();
-        EventExecutorGroup parent = executor.parent();
-        Class<?> schedulerClass = parent == null ? executor.getClass() : parent.getClass();
-        QueueTimerHelper.startQueuingTimer(state, schedulerClass, queueType, length, task);
-      }
     }
-  }
 
-  @SuppressWarnings("rawtypes")
-  private static final class StartTimingDelayedTaskQueue {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void before(
-        @Advice.FieldValue("delayedTaskQueue") Queue<?> delayedTaskQueue,
-        @Advice.This EventExecutor executor,
-        @Advice.Argument(0) Runnable task) {
-      if (!QueueTimerHelper.isReady()) {
-        return;
-      }
-      // should be a PromiseTask which is a RunnableFuture
-      if (task instanceof RunnableFuture) {
-        // detect double timing - also not interested in queueing time unless the task is traced
-        // state == null => not traced, state.isTimed() => double timing
-        ContextStore<RunnableFuture, State> contextStore =
-            InstrumentationContext.get(RunnableFuture.class, State.class);
-        State state = contextStore.get((RunnableFuture) task);
-        if (state == null || state.isTimed()) {
-          return;
+    @SuppressWarnings("rawtypes")
+    private static final class StartTimingDelayedTaskQueue {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void before(
+                @Advice.FieldValue("delayedTaskQueue") Queue<?> delayedTaskQueue,
+                @Advice.This EventExecutor executor,
+                @Advice.Argument(0) Runnable task) {
+            if (!QueueTimerHelper.isReady()) {
+                return;
+            }
+            // should be a PromiseTask which is a RunnableFuture
+            if (task instanceof RunnableFuture) {
+                // detect double timing - also not interested in queueing time unless the task is traced
+                // state == null => not traced, state.isTimed() => double timing
+                ContextStore<RunnableFuture, State> contextStore =
+                        InstrumentationContext.get(RunnableFuture.class, State.class);
+                State state = contextStore.get((RunnableFuture) task);
+                if (state == null || state.isTimed()) {
+                    return;
+                }
+                Class<?> queueType = delayedTaskQueue == null ? null : delayedTaskQueue.getClass();
+                int length = delayedTaskQueue == null ? 0 : delayedTaskQueue.size();
+                EventExecutorGroup parent = executor.parent();
+                Class<?> schedulerClass = parent == null ? executor.getClass() : parent.getClass();
+                QueueTimerHelper.startQueuingTimer(state, schedulerClass, queueType, length, task);
+            }
         }
-        Class<?> queueType = delayedTaskQueue == null ? null : delayedTaskQueue.getClass();
-        int length = delayedTaskQueue == null ? 0 : delayedTaskQueue.size();
-        EventExecutorGroup parent = executor.parent();
-        Class<?> schedulerClass = parent == null ? executor.getClass() : parent.getClass();
-        QueueTimerHelper.startQueuingTimer(state, schedulerClass, queueType, length, task);
-      }
     }
-  }
 
-  @SuppressWarnings("rawtypes")
-  private static final class StartTimingScheduledTaskQueue {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void before(
-        @Advice.FieldValue("scheduledTaskQueue") Queue<?> scheduledTaskQueue,
-        @Advice.This EventExecutor executor,
-        @Advice.Argument(0) Runnable task) {
-      if (!QueueTimerHelper.isReady()) {
-        return;
-      }
-      // should be a PromiseTask which is a RunnableFuture
-      if (task instanceof RunnableFuture) {
-        // detect double timing - also not interested in queueing time unless the task is traced
-        // state == null => not traced, state.isTimed() => double timing
-        ContextStore<RunnableFuture, State> contextStore =
-            InstrumentationContext.get(RunnableFuture.class, State.class);
-        State state = contextStore.get((RunnableFuture) task);
-        if (state == null || state.isTimed()) {
-          return;
+    @SuppressWarnings("rawtypes")
+    private static final class StartTimingScheduledTaskQueue {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void before(
+                @Advice.FieldValue("scheduledTaskQueue") Queue<?> scheduledTaskQueue,
+                @Advice.This EventExecutor executor,
+                @Advice.Argument(0) Runnable task) {
+            if (!QueueTimerHelper.isReady()) {
+                return;
+            }
+            // should be a PromiseTask which is a RunnableFuture
+            if (task instanceof RunnableFuture) {
+                // detect double timing - also not interested in queueing time unless the task is traced
+                // state == null => not traced, state.isTimed() => double timing
+                ContextStore<RunnableFuture, State> contextStore =
+                        InstrumentationContext.get(RunnableFuture.class, State.class);
+                State state = contextStore.get((RunnableFuture) task);
+                if (state == null || state.isTimed()) {
+                    return;
+                }
+                Class<?> queueType = scheduledTaskQueue == null ? null : scheduledTaskQueue.getClass();
+                int length = scheduledTaskQueue == null ? 0 : scheduledTaskQueue.size();
+                EventExecutorGroup parent = executor.parent();
+                Class<?> schedulerClass = parent == null ? executor.getClass() : parent.getClass();
+                QueueTimerHelper.startQueuingTimer(state, schedulerClass, queueType, length, task);
+            }
         }
-        Class<?> queueType = scheduledTaskQueue == null ? null : scheduledTaskQueue.getClass();
-        int length = scheduledTaskQueue == null ? 0 : scheduledTaskQueue.size();
-        EventExecutorGroup parent = executor.parent();
-        Class<?> schedulerClass = parent == null ? executor.getClass() : parent.getClass();
-        QueueTimerHelper.startQueuingTimer(state, schedulerClass, queueType, length, task);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorStartThreadInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorStartThreadInstrumentation.java
index 826b37103f7..f46362c8dde 100644
--- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorStartThreadInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorStartThreadInstrumentation.java
@@ -14,46 +14,48 @@
 
 /** Prevents Netty's lazily created event-loop maintenance tasks from inheriting user context. */
 @AutoService(InstrumenterModule.class)
-public final class SingleThreadEventExecutorStartThreadInstrumentation
-    extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-
-  public SingleThreadEventExecutorStartThreadInstrumentation() {
-    super("netty-concurrent", "netty-event-executor");
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.netty.util.concurrent.SingleThreadEventExecutor",
-      "io.grpc.netty.shaded.io.netty.util.concurrent.SingleThreadEventExecutor",
-      "com.couchbase.client.deps.io.netty.util.concurrent.SingleThreadEventExecutor",
-      "play.shaded.ahc.io.netty.util.concurrent.SingleThreadEventExecutor",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("startThread").and(takesNoArguments()).and(returns(void.class)).and(isPrivate()),
-        getClass().getName() + "$DisableAsyncPropagation");
-  }
-
-  public static final class DisableAsyncPropagation {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static boolean before() {
-      if (isAsyncPropagationEnabled()) {
-        setAsyncPropagationEnabled(false);
-        return true;
-      }
-      return false;
+public final class SingleThreadEventExecutorStartThreadInstrumentation extends InstrumenterModule.ContextTracking
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+
+    public SingleThreadEventExecutorStartThreadInstrumentation() {
+        super("netty-concurrent", "netty-event-executor");
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.netty.util.concurrent.SingleThreadEventExecutor",
+            "io.grpc.netty.shaded.io.netty.util.concurrent.SingleThreadEventExecutor",
+            "com.couchbase.client.deps.io.netty.util.concurrent.SingleThreadEventExecutor",
+            "play.shaded.ahc.io.netty.util.concurrent.SingleThreadEventExecutor",
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("startThread")
+                        .and(takesNoArguments())
+                        .and(returns(void.class))
+                        .and(isPrivate()),
+                getClass().getName() + "$DisableAsyncPropagation");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter boolean wasDisabled) {
-      if (wasDisabled) {
-        setAsyncPropagationEnabled(true);
-      }
+    public static final class DisableAsyncPropagation {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static boolean before() {
+            if (isAsyncPropagationEnabled()) {
+                setAsyncPropagationEnabled(false);
+                return true;
+            }
+            return false;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter boolean wasDisabled) {
+            if (wasDisabled) {
+                setAsyncPropagationEnabled(true);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/TimingReadinessForkedTest.java b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/TimingReadinessForkedTest.java
index 204419d287a..c6e2ca8c11c 100644
--- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/TimingReadinessForkedTest.java
+++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/TimingReadinessForkedTest.java
@@ -28,108 +28,110 @@
 @WithConfig(key = PROFILING_ENABLED, value = "true")
 @WithConfig(key = PROFILING_QUEUEING_TIME_ENABLED, value = "true")
 class TimingReadinessForkedTest extends AbstractInstrumentationTest {
-  private static TestProfilingContextIntegration profiling;
-
-  @BeforeAll
-  static void installProfilingTracer() {
-    tracer.close();
-    writer = new ListWriter();
-    profiling = new TestProfilingContextIntegration();
-    CoreTracer profilingTracer =
-        CoreTracer.builder().writer(writer).profilingContextIntegration(profiling).build();
-    TracerInstaller.forceInstallGlobalTracer(profilingTracer);
-    tracer = profilingTracer;
-  }
-
-  @Test
-  void skipsQueueMetadataUntilJfrIsReadyWhilePropagatingTrace() throws Exception {
-    TestExecutor executor = new TestExecutor();
-    try {
-      assertFalse(InstrumentationBasedProfiling.isJFRReady());
-      submitTask(executor);
-
-      assertEquals(0, executor.countingQueue.sizeCalls.get());
-      assertTrue(profiling.getClosedTimings().isEmpty());
-
-      InstrumentationBasedProfiling.enableInstrumentationBasedProfiling();
-      submitTask(executor);
-
-      assertTrue(executor.countingQueue.sizeCalls.get() > 0);
-      assertTrue(profiling.isBalanced());
-      assertFalse(profiling.getClosedTimings().isEmpty());
-    } finally {
-      executor.shutdownGracefully(0, 5, SECONDS).get(10, SECONDS);
-      profiling.getClosedTimings().clear();
+    private static TestProfilingContextIntegration profiling;
+
+    @BeforeAll
+    static void installProfilingTracer() {
+        tracer.close();
+        writer = new ListWriter();
+        profiling = new TestProfilingContextIntegration();
+        CoreTracer profilingTracer = CoreTracer.builder()
+                .writer(writer)
+                .profilingContextIntegration(profiling)
+                .build();
+        TracerInstaller.forceInstallGlobalTracer(profilingTracer);
+        tracer = profilingTracer;
     }
-  }
-
-  private static void submitTask(TestExecutor executor) throws Exception {
-    AgentSpan span = startSpan("test", "submit");
-    try (ContextScope scope = activateSpan(span)) {
-      ContextCheckingTask task = new ContextCheckingTask();
-      executor.submit(task).get(5, SECONDS);
-      assertEquals(span.getSpanId(), task.spanId);
-    } finally {
-      span.finish();
-    }
-  }
 
-  static class ContextCheckingTask implements Runnable {
-    volatile long spanId;
+    @Test
+    void skipsQueueMetadataUntilJfrIsReadyWhilePropagatingTrace() throws Exception {
+        TestExecutor executor = new TestExecutor();
+        try {
+            assertFalse(InstrumentationBasedProfiling.isJFRReady());
+            submitTask(executor);
+
+            assertEquals(0, executor.countingQueue.sizeCalls.get());
+            assertTrue(profiling.getClosedTimings().isEmpty());
+
+            InstrumentationBasedProfiling.enableInstrumentationBasedProfiling();
+            submitTask(executor);
+
+            assertTrue(executor.countingQueue.sizeCalls.get() > 0);
+            assertTrue(profiling.isBalanced());
+            assertFalse(profiling.getClosedTimings().isEmpty());
+        } finally {
+            executor.shutdownGracefully(0, 5, SECONDS).get(10, SECONDS);
+            profiling.getClosedTimings().clear();
+        }
+    }
 
-    @Override
-    public void run() {
-      AgentSpan span = AgentTracer.activeSpan();
-      spanId = span == null ? 0 : span.getSpanId();
+    private static void submitTask(TestExecutor executor) throws Exception {
+        AgentSpan span = startSpan("test", "submit");
+        try (ContextScope scope = activateSpan(span)) {
+            ContextCheckingTask task = new ContextCheckingTask();
+            executor.submit(task).get(5, SECONDS);
+            assertEquals(span.getSpanId(), task.spanId);
+        } finally {
+            span.finish();
+        }
     }
-  }
 
-  static class TestExecutor extends SingleThreadEventExecutor {
-    CountingQueue countingQueue;
+    static class ContextCheckingTask implements Runnable {
+        volatile long spanId;
 
-    TestExecutor() {
-      super(null, defaultThreadFactory(), true);
+        @Override
+        public void run() {
+            AgentSpan span = AgentTracer.activeSpan();
+            spanId = span == null ? 0 : span.getSpanId();
+        }
     }
 
-    @Override
-    protected Queue<Runnable> newTaskQueue() {
-      countingQueue = new CountingQueue();
-      return countingQueue;
-    }
+    static class TestExecutor extends SingleThreadEventExecutor {
+        CountingQueue countingQueue;
 
-    // Newer Netty versions use the factory overload with a capacity argument.
-    protected Queue<Runnable> newTaskQueue(int maxPendingTasks) {
-      return newTaskQueue();
-    }
+        TestExecutor() {
+            super(null, defaultThreadFactory(), true);
+        }
+
+        @Override
+        protected Queue<Runnable> newTaskQueue() {
+            countingQueue = new CountingQueue();
+            return countingQueue;
+        }
 
-    @Override
-    protected void run() {
-      while (true) {
-        Runnable task = takeTask();
-        if (task != null) {
-          task.run();
-          updateLastExecutionTime();
+        // Newer Netty versions use the factory overload with a capacity argument.
+        protected Queue<Runnable> newTaskQueue(int maxPendingTasks) {
+            return newTaskQueue();
         }
-        if (confirmShutdown()) {
-          return;
+
+        @Override
+        protected void run() {
+            while (true) {
+                Runnable task = takeTask();
+                if (task != null) {
+                    task.run();
+                    updateLastExecutionTime();
+                }
+                if (confirmShutdown()) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 
-  static class CountingQueue extends LinkedBlockingQueue<Runnable> {
-    final AtomicInteger sizeCalls = new AtomicInteger();
+    static class CountingQueue extends LinkedBlockingQueue<Runnable> {
+        final AtomicInteger sizeCalls = new AtomicInteger();
 
-    @Override
-    public int size() {
-      sizeCalls.incrementAndGet();
-      return super.size();
-    }
+        @Override
+        public int size() {
+            sizeCalls.incrementAndGet();
+            return super.size();
+        }
 
-    @Override
-    public boolean isEmpty() {
-      // Keep executor housekeeping separate from metadata reads.
-      return super.size() == 0;
+        @Override
+        public boolean isEmpty() {
+            // Keep executor housekeeping separate from metadata reads.
+            return super.size() == 0;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/executor/GrpcShadedNettyScheduledFutureTaskContextPropagationTest.java b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/executor/GrpcShadedNettyScheduledFutureTaskContextPropagationTest.java
index 54e9365689f..ce186bea94e 100644
--- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/executor/GrpcShadedNettyScheduledFutureTaskContextPropagationTest.java
+++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/executor/GrpcShadedNettyScheduledFutureTaskContextPropagationTest.java
@@ -33,197 +33,192 @@
  * DefaultEventExecutorGroup}.
  */
 class GrpcShadedNettyScheduledFutureTaskContextPropagationTest extends AbstractInstrumentationTest {
-  /**
-   * Verifies that a task scheduled with a delay on a shaded {@code DefaultEventExecutorGroup} still
-   * sees the scheduling span as active when it runs, and that a traced method invoked from the task
-   * becomes a child of that span.
-   */
-  @Test
-  void testDelayedTaskPropagatesContextWithShadedNetty() throws Exception {
-    try (CloseableDefaultEventExecutorGroup group = new CloseableDefaultEventExecutorGroup()) {
-      EventExecutor executor = group.next();
-      TraceableTask task = new TraceableTask();
-      AgentSpan parent = startSpan("test", "parent");
+    /**
+     * Verifies that a task scheduled with a delay on a shaded {@code DefaultEventExecutorGroup} still
+     * sees the scheduling span as active when it runs, and that a traced method invoked from the task
+     * becomes a child of that span.
+     */
+    @Test
+    void testDelayedTaskPropagatesContextWithShadedNetty() throws Exception {
+        try (CloseableDefaultEventExecutorGroup group = new CloseableDefaultEventExecutorGroup()) {
+            EventExecutor executor = group.next();
+            TraceableTask task = new TraceableTask();
+            AgentSpan parent = startSpan("test", "parent");
 
-      try (ContextScope ignored = activateSpan(parent)) {
-        executor.schedule(task, 50, MILLISECONDS);
-      } finally {
-        parent.finish();
-      }
+            try (ContextScope ignored = activateSpan(parent)) {
+                executor.schedule(task, 50, MILLISECONDS);
+            } finally {
+                parent.finish();
+            }
 
-      assertTrue(task.finished.await(5, SECONDS));
-      assertTrue(task.sawActiveSpan.get());
-      assertTraces(
-          trace(
-              SORT_BY_START_TIME,
-              span().root().operationName("parent"),
-              span().childOfPrevious().operationName("asyncChild")));
+            assertTrue(task.finished.await(5, SECONDS));
+            assertTrue(task.sawActiveSpan.get());
+            assertTraces(trace(
+                    SORT_BY_START_TIME,
+                    span().root().operationName("parent"),
+                    span().childOfPrevious().operationName("asyncChild")));
+        }
     }
-  }
 
-  /**
-   * Verifies that a listener added to a delayed task's future sees the scheduling span as active
-   * when the task completes successfully, and that the scope is closed afterwards.
-   */
-  @Test
-  void testSuccessListenerKeepsSchedulingContext() throws Exception {
-    assertCompletionListenerContext(false);
-  }
-
-  /**
-   * Same as {@link #testSuccessListenerKeepsSchedulingContext()} but for a task that fails,
-   * verifying the scheduling context still propagates to the listener on failure.
-   */
-  @Test
-  void testFailureListenerKeepsSchedulingContext() throws Exception {
-    assertCompletionListenerContext(true);
-  }
-
-  /**
-   * Verifies that running a nested scheduled task inline (via reflection, bypassing the executor)
-   * does not leak its context: the outer task's active span is restored once the nested task
-   * finishes running, both for a newly-scheduled continuation and for one that reuses the outer
-   * scope.
-   */
-  @Test
-  void testNestedScheduledRunRestoresOuterContext() throws Exception {
-    try (CloseableDefaultEventExecutorGroup group = new CloseableDefaultEventExecutorGroup()) {
-      EventExecutor executor = group.next();
-      executor.submit(() -> {}).sync();
-      AgentSpan parent = startSpan("test", "parent");
-      ScheduledFuture<?> outer;
-      try (ContextScope ignored = activateSpan(parent)) {
-        outer =
-            executor.schedule(
-                () -> {
-                  AgentSpan outerSpan = activeSpan();
-                  AgentSpan child = startSpan("test", "nested");
-                  ScheduledFuture<?> inner;
-                  try (ContextScope innerScope = activateSpan(child)) {
-                    inner = executor.schedule(() -> {}, 0, MILLISECONDS);
-                  } finally {
-                    child.finish();
-                  }
-                  // Remove the due task before running it inline; Netty cannot run it twice.
-                  try {
-                    Method poll =
-                        AbstractScheduledEventExecutor.class.getDeclaredMethod("pollScheduledTask");
-                    poll.setAccessible(true);
-                    assertSame(inner, poll.invoke(executor));
-                  } catch (ReflectiveOperationException e) {
-                    throw new AssertionError(e);
-                  }
-                  ((Runnable) inner).run();
-                  assertTrue(inner.isSuccess());
-                  assertSame(outerSpan, activeSpan());
-                  // The legacy context manager reuses the outer scope for this continuation.
-                  ScheduledFuture<?> sameContext = executor.schedule(() -> {}, 0, MILLISECONDS);
-                  try {
-                    Method poll =
-                        AbstractScheduledEventExecutor.class.getDeclaredMethod("pollScheduledTask");
-                    poll.setAccessible(true);
-                    assertSame(sameContext, poll.invoke(executor));
-                  } catch (ReflectiveOperationException e) {
-                    throw new AssertionError(e);
-                  }
-                  ((Runnable) sameContext).run();
-                  assertTrue(sameContext.isSuccess());
-                  assertSame(outerSpan, activeSpan());
-                },
-                50,
-                MILLISECONDS);
-      } finally {
-        parent.finish();
-      }
-      outer.get(5, SECONDS);
-      assertNull(executor.submit(() -> (Object) activeSpan()).get(5, SECONDS));
-      assertTraces(
-          trace(
-              SORT_BY_START_TIME,
-              span().root().operationName("parent"),
-              span().childOfPrevious().operationName("nested")));
+    /**
+     * Verifies that a listener added to a delayed task's future sees the scheduling span as active
+     * when the task completes successfully, and that the scope is closed afterwards.
+     */
+    @Test
+    void testSuccessListenerKeepsSchedulingContext() throws Exception {
+        assertCompletionListenerContext(false);
     }
-  }
 
-  private void assertCompletionListenerContext(boolean fail) throws Exception {
-    try (CloseableDefaultEventExecutorGroup group = new CloseableDefaultEventExecutorGroup()) {
-      EventExecutor executor = group.next();
-      // Start the worker before capturing the scheduling span.
-      executor.submit(() -> {}).sync();
-      CountDownLatch proceed = new CountDownLatch(1);
-      CountDownLatch completed = new CountDownLatch(1);
-      AtomicReference<AgentSpan> listenerSpan = new AtomicReference<>();
-      AgentSpan parent = startSpan("test", "parent");
-      ScheduledFuture<?> future;
-      try (ContextScope ignored = activateSpan(parent)) {
-        future =
-            executor.schedule(
-                () -> {
-                  try {
-                    if (!proceed.await(5, SECONDS)) {
-                      throw new AssertionError("Listener was not registered");
-                    }
-                  } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    throw new AssertionError(e);
-                  }
-                  if (fail) {
-                    throw new IllegalStateException("expected task failure");
-                  }
-                },
-                50,
-                MILLISECONDS);
-      } finally {
-        parent.finish();
-      }
-      // Register without a span so listener instrumentation cannot mask early scope closure.
-      future.addListener(
-          done -> {
-            listenerSpan.set(activeSpan());
-            completed.countDown();
-          });
-      proceed.countDown();
-      assertTrue(completed.await(5, SECONDS));
-      assertSame(parent, listenerSpan.get());
-      assertTrue(fail != future.isSuccess());
-      assertNull(executor.submit(() -> (Object) activeSpan()).get(5, SECONDS));
-      assertTraces(trace(span().root().operationName("parent")));
+    /**
+     * Same as {@link #testSuccessListenerKeepsSchedulingContext()} but for a task that fails,
+     * verifying the scheduling context still propagates to the listener on failure.
+     */
+    @Test
+    void testFailureListenerKeepsSchedulingContext() throws Exception {
+        assertCompletionListenerContext(true);
     }
-  }
 
-  private static final class CloseableDefaultEventExecutorGroup extends DefaultEventExecutorGroup
-      implements AutoCloseable {
-    private CloseableDefaultEventExecutorGroup() {
-      super(1);
+    /**
+     * Verifies that running a nested scheduled task inline (via reflection, bypassing the executor)
+     * does not leak its context: the outer task's active span is restored once the nested task
+     * finishes running, both for a newly-scheduled continuation and for one that reuses the outer
+     * scope.
+     */
+    @Test
+    void testNestedScheduledRunRestoresOuterContext() throws Exception {
+        try (CloseableDefaultEventExecutorGroup group = new CloseableDefaultEventExecutorGroup()) {
+            EventExecutor executor = group.next();
+            executor.submit(() -> {}).sync();
+            AgentSpan parent = startSpan("test", "parent");
+            ScheduledFuture<?> outer;
+            try (ContextScope ignored = activateSpan(parent)) {
+                outer = executor.schedule(
+                        () -> {
+                            AgentSpan outerSpan = activeSpan();
+                            AgentSpan child = startSpan("test", "nested");
+                            ScheduledFuture<?> inner;
+                            try (ContextScope innerScope = activateSpan(child)) {
+                                inner = executor.schedule(() -> {}, 0, MILLISECONDS);
+                            } finally {
+                                child.finish();
+                            }
+                            // Remove the due task before running it inline; Netty cannot run it twice.
+                            try {
+                                Method poll =
+                                        AbstractScheduledEventExecutor.class.getDeclaredMethod("pollScheduledTask");
+                                poll.setAccessible(true);
+                                assertSame(inner, poll.invoke(executor));
+                            } catch (ReflectiveOperationException e) {
+                                throw new AssertionError(e);
+                            }
+                            ((Runnable) inner).run();
+                            assertTrue(inner.isSuccess());
+                            assertSame(outerSpan, activeSpan());
+                            // The legacy context manager reuses the outer scope for this continuation.
+                            ScheduledFuture<?> sameContext = executor.schedule(() -> {}, 0, MILLISECONDS);
+                            try {
+                                Method poll =
+                                        AbstractScheduledEventExecutor.class.getDeclaredMethod("pollScheduledTask");
+                                poll.setAccessible(true);
+                                assertSame(sameContext, poll.invoke(executor));
+                            } catch (ReflectiveOperationException e) {
+                                throw new AssertionError(e);
+                            }
+                            ((Runnable) sameContext).run();
+                            assertTrue(sameContext.isSuccess());
+                            assertSame(outerSpan, activeSpan());
+                        },
+                        50,
+                        MILLISECONDS);
+            } finally {
+                parent.finish();
+            }
+            outer.get(5, SECONDS);
+            assertNull(executor.submit(() -> (Object) activeSpan()).get(5, SECONDS));
+            assertTraces(trace(
+                    SORT_BY_START_TIME,
+                    span().root().operationName("parent"),
+                    span().childOfPrevious().operationName("nested")));
+        }
     }
 
-    @Override
-    public void close() {
-      try {
-        shutdownGracefully(0, 1, SECONDS).sync();
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      }
+    private void assertCompletionListenerContext(boolean fail) throws Exception {
+        try (CloseableDefaultEventExecutorGroup group = new CloseableDefaultEventExecutorGroup()) {
+            EventExecutor executor = group.next();
+            // Start the worker before capturing the scheduling span.
+            executor.submit(() -> {}).sync();
+            CountDownLatch proceed = new CountDownLatch(1);
+            CountDownLatch completed = new CountDownLatch(1);
+            AtomicReference<AgentSpan> listenerSpan = new AtomicReference<>();
+            AgentSpan parent = startSpan("test", "parent");
+            ScheduledFuture<?> future;
+            try (ContextScope ignored = activateSpan(parent)) {
+                future = executor.schedule(
+                        () -> {
+                            try {
+                                if (!proceed.await(5, SECONDS)) {
+                                    throw new AssertionError("Listener was not registered");
+                                }
+                            } catch (InterruptedException e) {
+                                Thread.currentThread().interrupt();
+                                throw new AssertionError(e);
+                            }
+                            if (fail) {
+                                throw new IllegalStateException("expected task failure");
+                            }
+                        },
+                        50,
+                        MILLISECONDS);
+            } finally {
+                parent.finish();
+            }
+            // Register without a span so listener instrumentation cannot mask early scope closure.
+            future.addListener(done -> {
+                listenerSpan.set(activeSpan());
+                completed.countDown();
+            });
+            proceed.countDown();
+            assertTrue(completed.await(5, SECONDS));
+            assertSame(parent, listenerSpan.get());
+            assertTrue(fail != future.isSuccess());
+            assertNull(executor.submit(() -> (Object) activeSpan()).get(5, SECONDS));
+            assertTraces(trace(span().root().operationName("parent")));
+        }
     }
-  }
 
-  private static final class TraceableTask implements Runnable {
-    private final CountDownLatch finished = new CountDownLatch(1);
-    private final AtomicBoolean sawActiveSpan = new AtomicBoolean();
+    private static final class CloseableDefaultEventExecutorGroup extends DefaultEventExecutorGroup
+            implements AutoCloseable {
+        private CloseableDefaultEventExecutorGroup() {
+            super(1);
+        }
 
-    @Override
-    public void run() {
-      sawActiveSpan.set(activeSpan() != null);
-      try {
-        asyncChild();
-      } finally {
-        finished.countDown();
-      }
+        @Override
+        public void close() {
+            try {
+                shutdownGracefully(0, 1, SECONDS).sync();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
     }
 
-    // No-op body: only the @Trace annotation matters, it starts+finishes a child span so the
-    // test can assert it is parented to the span active when the task ran.
-    @Trace(operationName = "asyncChild")
-    private void asyncChild() {}
-  }
+    private static final class TraceableTask implements Runnable {
+        private final CountDownLatch finished = new CountDownLatch(1);
+        private final AtomicBoolean sawActiveSpan = new AtomicBoolean();
+
+        @Override
+        public void run() {
+            sawActiveSpan.set(activeSpan() != null);
+            try {
+                asyncChild();
+            } finally {
+                finished.countDown();
+            }
+        }
+
+        // No-op body: only the @Trace annotation matters, it starts+finishes a child span so the
+        // test can assert it is parented to the span active when the task ran.
+        @Trace(operationName = "asyncChild")
+        private void asyncChild() {}
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/executor/JavaConcurrentOnlyNettyForkedTest.java b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/executor/JavaConcurrentOnlyNettyForkedTest.java
index 84076271032..aea76ff8bd1 100644
--- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/executor/JavaConcurrentOnlyNettyForkedTest.java
+++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/executor/JavaConcurrentOnlyNettyForkedTest.java
@@ -5,5 +5,4 @@
 @WithConfig(key = "integrations.enabled", value = "false")
 @WithConfig(key = "integration.java_concurrent.enabled", value = "true")
 @WithConfig(key = "integration.trace-annotation.enabled", value = "true")
-class JavaConcurrentOnlyNettyForkedTest
-    extends GrpcShadedNettyScheduledFutureTaskContextPropagationTest {}
+class JavaConcurrentOnlyNettyForkedTest extends GrpcShadedNettyScheduledFutureTaskContextPropagationTest {}
diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/executor/NettyScheduledFutureTaskContextPropagationTest.java b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/executor/NettyScheduledFutureTaskContextPropagationTest.java
index 818f074ba01..e0e25e28837 100644
--- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/executor/NettyScheduledFutureTaskContextPropagationTest.java
+++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/executor/NettyScheduledFutureTaskContextPropagationTest.java
@@ -25,203 +25,197 @@
 import org.junit.jupiter.api.Test;
 
 class NettyScheduledFutureTaskContextPropagationTest extends AbstractInstrumentationTest {
-  @Test
-  void testDelayedScheduledFutureTaskActivatesCapturedContinuationWhenDelayExpires()
-      throws Exception {
-    try (CloseableDefaultEventExecutorGroup group = new CloseableDefaultEventExecutorGroup()) {
-      EventExecutor executor = group.next();
-      BlockingTraceableTask task = new BlockingTraceableTask();
-      AgentSpan parent = startSpan("test", "parent");
-
-      // Netty 4.1.44+ calls ScheduledFutureTask.run() once while enqueueing a delayed task and
-      // again when the delay expires. Context must only activate when runTask() executes.
-      try (ContextScope ignored = activateSpan(parent)) {
-        executor.schedule(task, 50, MILLISECONDS);
-      } finally {
-        parent.finish();
-      }
-
-      // When the delayed task actually runs, runTask() activates the captured continuation so
-      // traced work in the task remains a child of the scheduling span.
-      assertTrue(task.started.await(5, SECONDS));
-      try {
-        assertTrue(task.sawActiveSpan.get());
-      } finally {
-        task.proceed.countDown();
-      }
-      assertTrue(task.finished.await(5, SECONDS));
-
-      assertTraces(
-          trace(
-              SORT_BY_START_TIME,
-              span().root().operationName("parent"),
-              span().childOfPrevious().operationName("asyncChild")));
+    @Test
+    void testDelayedScheduledFutureTaskActivatesCapturedContinuationWhenDelayExpires() throws Exception {
+        try (CloseableDefaultEventExecutorGroup group = new CloseableDefaultEventExecutorGroup()) {
+            EventExecutor executor = group.next();
+            BlockingTraceableTask task = new BlockingTraceableTask();
+            AgentSpan parent = startSpan("test", "parent");
+
+            // Netty 4.1.44+ calls ScheduledFutureTask.run() once while enqueueing a delayed task and
+            // again when the delay expires. Context must only activate when runTask() executes.
+            try (ContextScope ignored = activateSpan(parent)) {
+                executor.schedule(task, 50, MILLISECONDS);
+            } finally {
+                parent.finish();
+            }
+
+            // When the delayed task actually runs, runTask() activates the captured continuation so
+            // traced work in the task remains a child of the scheduling span.
+            assertTrue(task.started.await(5, SECONDS));
+            try {
+                assertTrue(task.sawActiveSpan.get());
+            } finally {
+                task.proceed.countDown();
+            }
+            assertTrue(task.finished.await(5, SECONDS));
+
+            assertTraces(trace(
+                    SORT_BY_START_TIME,
+                    span().root().operationName("parent"),
+                    span().childOfPrevious().operationName("asyncChild")));
+        }
     }
-  }
-
-  @Test
-  void testDelayedTaskPropagatesContextOnAllNettyVersions() throws Exception {
-    // Cross-version invariant: context propagation through a delayed task must work on every
-    // supported Netty version — pre-4.1.44 (single run() at the deadline) and 4.1.44+ (a delay > 0
-    // self-enqueue run followed by execution through runTask()). This guards against regressing
-    // versions that use the original single-run lifecycle.
-    try (CloseableDefaultEventExecutorGroup group = new CloseableDefaultEventExecutorGroup()) {
-      EventExecutor executor = group.next();
-      TraceableTask task = new TraceableTask();
-      AgentSpan parent = startSpan("test", "parent");
-
-      try (ContextScope ignored = activateSpan(parent)) {
-        executor.schedule(task, 50, MILLISECONDS);
-      } finally {
-        parent.finish();
-      }
-
-      assertTrue(task.finished.await(5, SECONDS));
-      assertTrue(task.sawActiveSpan.get());
-      assertTraces(
-          trace(
-              SORT_BY_START_TIME,
-              span().root().operationName("parent"),
-              span().childOfPrevious().operationName("asyncChild")));
+
+    @Test
+    void testDelayedTaskPropagatesContextOnAllNettyVersions() throws Exception {
+        // Cross-version invariant: context propagation through a delayed task must work on every
+        // supported Netty version — pre-4.1.44 (single run() at the deadline) and 4.1.44+ (a delay > 0
+        // self-enqueue run followed by execution through runTask()). This guards against regressing
+        // versions that use the original single-run lifecycle.
+        try (CloseableDefaultEventExecutorGroup group = new CloseableDefaultEventExecutorGroup()) {
+            EventExecutor executor = group.next();
+            TraceableTask task = new TraceableTask();
+            AgentSpan parent = startSpan("test", "parent");
+
+            try (ContextScope ignored = activateSpan(parent)) {
+                executor.schedule(task, 50, MILLISECONDS);
+            } finally {
+                parent.finish();
+            }
+
+            assertTrue(task.finished.await(5, SECONDS));
+            assertTrue(task.sawActiveSpan.get());
+            assertTraces(trace(
+                    SORT_BY_START_TIME,
+                    span().root().operationName("parent"),
+                    span().childOfPrevious().operationName("asyncChild")));
+        }
     }
-  }
-
-  @Test
-  void testImmediateScheduledTaskKeepsContext() throws Exception {
-    // A ScheduledFutureTask scheduled with a non-positive delay executes its body immediately
-    // through runTask(), where the captured continuation must activate.
-    try (CloseableDefaultEventExecutorGroup group = new CloseableDefaultEventExecutorGroup()) {
-      EventExecutor executor = group.next();
-      TraceableTask task = new TraceableTask();
-      AgentSpan parent = startSpan("test", "parent");
-
-      try (ContextScope ignored = activateSpan(parent)) {
-        executor.schedule(task, 0, MILLISECONDS);
-      } finally {
-        parent.finish();
-      }
-
-      assertTrue(task.finished.await(5, SECONDS));
-      assertTrue(task.sawActiveSpan.get());
-      assertTraces(
-          trace(
-              SORT_BY_START_TIME,
-              span().root().operationName("parent"),
-              span().childOfPrevious().operationName("asyncChild")));
+
+    @Test
+    void testImmediateScheduledTaskKeepsContext() throws Exception {
+        // A ScheduledFutureTask scheduled with a non-positive delay executes its body immediately
+        // through runTask(), where the captured continuation must activate.
+        try (CloseableDefaultEventExecutorGroup group = new CloseableDefaultEventExecutorGroup()) {
+            EventExecutor executor = group.next();
+            TraceableTask task = new TraceableTask();
+            AgentSpan parent = startSpan("test", "parent");
+
+            try (ContextScope ignored = activateSpan(parent)) {
+                executor.schedule(task, 0, MILLISECONDS);
+            } finally {
+                parent.finish();
+            }
+
+            assertTrue(task.finished.await(5, SECONDS));
+            assertTrue(task.sawActiveSpan.get());
+            assertTraces(trace(
+                    SORT_BY_START_TIME,
+                    span().root().operationName("parent"),
+                    span().childOfPrevious().operationName("asyncChild")));
+        }
     }
-  }
-
-  @Test
-  void testSuccessListenerKeepsSchedulingContext() throws Exception {
-    assertCompletionListenerContext(false);
-  }
-
-  @Test
-  void testFailureListenerKeepsSchedulingContext() throws Exception {
-    assertCompletionListenerContext(true);
-  }
-
-  private void assertCompletionListenerContext(boolean fail) throws Exception {
-    try (CloseableDefaultEventExecutorGroup group = new CloseableDefaultEventExecutorGroup()) {
-      EventExecutor executor = group.next();
-      // Start the worker before capturing the scheduling span.
-      executor.submit(() -> {}).sync();
-      CountDownLatch proceed = new CountDownLatch(1);
-      CountDownLatch completed = new CountDownLatch(1);
-      AtomicReference<AgentSpan> listenerSpan = new AtomicReference<>();
-      AgentSpan parent = startSpan("test", "parent");
-      ScheduledFuture<?> future;
-      try (ContextScope ignored = activateSpan(parent)) {
-        future =
-            executor.schedule(
-                () -> {
-                  try {
-                    if (!proceed.await(5, SECONDS)) {
-                      throw new AssertionError("Listener was not registered");
-                    }
-                  } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    throw new AssertionError(e);
-                  }
-                  if (fail) {
-                    throw new IllegalStateException("expected task failure");
-                  }
-                },
-                50,
-                MILLISECONDS);
-      } finally {
-        parent.finish();
-      }
-      // Register without a span so listener instrumentation cannot mask early scope closure.
-      future.addListener(
-          done -> {
-            listenerSpan.set(activeSpan());
-            completed.countDown();
-          });
-      proceed.countDown();
-      assertTrue(completed.await(5, SECONDS));
-      assertSame(parent, listenerSpan.get());
-      assertTrue(fail != future.isSuccess());
-      assertNull(executor.submit(() -> (Object) activeSpan()).get(5, SECONDS));
-      assertTraces(trace(span().root().operationName("parent")));
+
+    @Test
+    void testSuccessListenerKeepsSchedulingContext() throws Exception {
+        assertCompletionListenerContext(false);
     }
-  }
 
-  private static final class CloseableDefaultEventExecutorGroup extends DefaultEventExecutorGroup
-      implements AutoCloseable {
-    private CloseableDefaultEventExecutorGroup() {
-      super(1);
+    @Test
+    void testFailureListenerKeepsSchedulingContext() throws Exception {
+        assertCompletionListenerContext(true);
     }
 
-    @Override
-    public void close() {
-      try {
-        shutdownGracefully(0, 1, SECONDS).sync();
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      }
+    private void assertCompletionListenerContext(boolean fail) throws Exception {
+        try (CloseableDefaultEventExecutorGroup group = new CloseableDefaultEventExecutorGroup()) {
+            EventExecutor executor = group.next();
+            // Start the worker before capturing the scheduling span.
+            executor.submit(() -> {}).sync();
+            CountDownLatch proceed = new CountDownLatch(1);
+            CountDownLatch completed = new CountDownLatch(1);
+            AtomicReference<AgentSpan> listenerSpan = new AtomicReference<>();
+            AgentSpan parent = startSpan("test", "parent");
+            ScheduledFuture<?> future;
+            try (ContextScope ignored = activateSpan(parent)) {
+                future = executor.schedule(
+                        () -> {
+                            try {
+                                if (!proceed.await(5, SECONDS)) {
+                                    throw new AssertionError("Listener was not registered");
+                                }
+                            } catch (InterruptedException e) {
+                                Thread.currentThread().interrupt();
+                                throw new AssertionError(e);
+                            }
+                            if (fail) {
+                                throw new IllegalStateException("expected task failure");
+                            }
+                        },
+                        50,
+                        MILLISECONDS);
+            } finally {
+                parent.finish();
+            }
+            // Register without a span so listener instrumentation cannot mask early scope closure.
+            future.addListener(done -> {
+                listenerSpan.set(activeSpan());
+                completed.countDown();
+            });
+            proceed.countDown();
+            assertTrue(completed.await(5, SECONDS));
+            assertSame(parent, listenerSpan.get());
+            assertTrue(fail != future.isSuccess());
+            assertNull(executor.submit(() -> (Object) activeSpan()).get(5, SECONDS));
+            assertTraces(trace(span().root().operationName("parent")));
+        }
     }
-  }
-
-  private static final class BlockingTraceableTask implements Runnable {
-    private final CountDownLatch started = new CountDownLatch(1);
-    private final CountDownLatch proceed = new CountDownLatch(1);
-    private final CountDownLatch finished = new CountDownLatch(1);
-    private final AtomicBoolean sawActiveSpan = new AtomicBoolean();
-
-    @Override
-    public void run() {
-      sawActiveSpan.set(activeSpan() != null);
-      started.countDown();
-      try {
-        proceed.await(5, SECONDS);
-        asyncChild();
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      } finally {
-        finished.countDown();
-      }
+
+    private static final class CloseableDefaultEventExecutorGroup extends DefaultEventExecutorGroup
+            implements AutoCloseable {
+        private CloseableDefaultEventExecutorGroup() {
+            super(1);
+        }
+
+        @Override
+        public void close() {
+            try {
+                shutdownGracefully(0, 1, SECONDS).sync();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
     }
 
-    @Trace(operationName = "asyncChild")
-    private void asyncChild() {}
-  }
-
-  private static final class TraceableTask implements Runnable {
-    private final CountDownLatch finished = new CountDownLatch(1);
-    private final AtomicBoolean sawActiveSpan = new AtomicBoolean();
-
-    @Override
-    public void run() {
-      sawActiveSpan.set(activeSpan() != null);
-      try {
-        asyncChild();
-      } finally {
-        finished.countDown();
-      }
+    private static final class BlockingTraceableTask implements Runnable {
+        private final CountDownLatch started = new CountDownLatch(1);
+        private final CountDownLatch proceed = new CountDownLatch(1);
+        private final CountDownLatch finished = new CountDownLatch(1);
+        private final AtomicBoolean sawActiveSpan = new AtomicBoolean();
+
+        @Override
+        public void run() {
+            sawActiveSpan.set(activeSpan() != null);
+            started.countDown();
+            try {
+                proceed.await(5, SECONDS);
+                asyncChild();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            } finally {
+                finished.countDown();
+            }
+        }
+
+        @Trace(operationName = "asyncChild")
+        private void asyncChild() {}
     }
 
-    @Trace(operationName = "asyncChild")
-    private void asyncChild() {}
-  }
+    private static final class TraceableTask implements Runnable {
+        private final CountDownLatch finished = new CountDownLatch(1);
+        private final AtomicBoolean sawActiveSpan = new AtomicBoolean();
+
+        @Override
+        public void run() {
+            sawActiveSpan.set(activeSpan() != null);
+            try {
+                asyncChild();
+            } finally {
+                finished.countDown();
+            }
+        }
+
+        @Trace(operationName = "asyncChild")
+        private void asyncChild() {}
+    }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/executor/RunnableFutureOnlyNettyForkedTest.java b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/executor/RunnableFutureOnlyNettyForkedTest.java
index 6c8ce0f96de..6cb94ed9a05 100644
--- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/executor/RunnableFutureOnlyNettyForkedTest.java
+++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/executor/RunnableFutureOnlyNettyForkedTest.java
@@ -5,5 +5,4 @@
 @WithConfig(key = "integrations.enabled", value = "false")
 @WithConfig(key = "integration.runnable-future.enabled", value = "true")
 @WithConfig(key = "integration.trace-annotation.enabled", value = "true")
-class RunnableFutureOnlyNettyForkedTest
-    extends GrpcShadedNettyScheduledFutureTaskContextPropagationTest {}
+class RunnableFutureOnlyNettyForkedTest extends GrpcShadedNettyScheduledFutureTaskContextPropagationTest {}
diff --git a/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java b/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java
index 9debb96a173..fe7829a9c7f 100644
--- a/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java
+++ b/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java
@@ -10,57 +10,55 @@
 
 public final class ListenerWrapper {
 
-  public static GenericFutureListener wrapIfNeeded(final GenericFutureListener listener) {
-    if (listener == null || listener instanceof GenericWrapper) {
-      return listener;
+    public static GenericFutureListener wrapIfNeeded(final GenericFutureListener listener) {
+        if (listener == null || listener instanceof GenericWrapper) {
+            return listener;
+        }
+        ContextContinuation continuation = Context.current().capture();
+        if (continuation.context() == Context.root()) {
+            return listener;
+        }
+        if (listener instanceof GenericProgressiveFutureListener) {
+            return new GenericProgressiveWrapper((GenericProgressiveFutureListener<?>) listener, continuation);
+        }
+        return new GenericWrapper(listener, continuation);
     }
-    ContextContinuation continuation = Context.current().capture();
-    if (continuation.context() == Context.root()) {
-      return listener;
-    }
-    if (listener instanceof GenericProgressiveFutureListener) {
-      return new GenericProgressiveWrapper(
-          (GenericProgressiveFutureListener<?>) listener, continuation);
-    }
-    return new GenericWrapper(listener, continuation);
-  }
 
-  private static class GenericWrapper<T extends Future<?>> implements GenericFutureListener<T> {
+    private static class GenericWrapper<T extends Future<?>> implements GenericFutureListener<T> {
 
-    private final GenericFutureListener<T> listener;
-    final ContextContinuation continuation;
+        private final GenericFutureListener<T> listener;
+        final ContextContinuation continuation;
 
-    public GenericWrapper(
-        final GenericFutureListener<T> listener, ContextContinuation continuation) {
-      this.listener = listener;
-      this.continuation = continuation;
-    }
+        public GenericWrapper(final GenericFutureListener<T> listener, ContextContinuation continuation) {
+            this.listener = listener;
+            this.continuation = continuation;
+        }
 
-    @Override
-    public void operationComplete(T future) throws Exception {
-      try (ContextScope scope = continuation.resume()) {
-        listener.operationComplete(future);
-      }
+        @Override
+        public void operationComplete(T future) throws Exception {
+            try (ContextScope scope = continuation.resume()) {
+                listener.operationComplete(future);
+            }
+        }
     }
-  }
 
-  private static class GenericProgressiveWrapper<S extends ProgressiveFuture<?>>
-      extends GenericWrapper<S> implements GenericProgressiveFutureListener<S> {
+    private static class GenericProgressiveWrapper<S extends ProgressiveFuture<?>> extends GenericWrapper<S>
+            implements GenericProgressiveFutureListener<S> {
 
-    private final GenericProgressiveFutureListener<S> listener;
+        private final GenericProgressiveFutureListener<S> listener;
 
-    public GenericProgressiveWrapper(
-        GenericProgressiveFutureListener<S> listener, ContextContinuation continuation) {
-      super(listener, continuation);
-      this.listener = listener;
-    }
+        public GenericProgressiveWrapper(
+                GenericProgressiveFutureListener<S> listener, ContextContinuation continuation) {
+            super(listener, continuation);
+            this.listener = listener;
+        }
 
-    @Override
-    public void operationProgressed(S future, long progress, long total) throws Exception {
-      // not yet complete, not ready to do final activation of continuation
-      try (ContextScope scope = continuation.context().attach()) {
-        listener.operationProgressed(future, progress, total);
-      }
+        @Override
+        public void operationProgressed(S future, long progress, long total) throws Exception {
+            // not yet complete, not ready to do final activation of continuation
+            try (ContextScope scope = continuation.context().attach()) {
+                listener.operationProgressed(future, progress, total);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java
index 077d6f4cd1b..fe83b9286f9 100644
--- a/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java
@@ -12,51 +12,47 @@
 
 @AutoService(InstrumenterModule.class)
 public class NettyPromiseInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public NettyPromiseInstrumentation() {
-    super("netty-promise");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "io.netty.util.concurrent.DefaultPromise";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("addListener")
-            .and(takesArgument(0, named("io.netty.util.concurrent.GenericFutureListener"))),
-        NettyPromiseInstrumentation.class.getName() + "$WrapListenerAdvice");
-    transformer.applyAdvice(
-        named("addListeners")
-            .and(takesArgument(0, named("io.netty.util.concurrent.GenericFutureListener[]"))),
-        NettyPromiseInstrumentation.class.getName() + "$WrapListenersAdvice");
-  }
-
-  public static class WrapListenerAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void wrapListener(
-        @Advice.Argument(value = 0, readOnly = false)
-            GenericFutureListener<? extends Future<?>> listener) {
-      listener = ListenerWrapper.wrapIfNeeded(listener);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public NettyPromiseInstrumentation() {
+        super("netty-promise");
+    }
+
+    @Override
+    protected boolean defaultEnabled() {
+        return false;
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "io.netty.util.concurrent.DefaultPromise";
     }
-  }
-
-  public static class WrapListenersAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void wrapListener(
-        @Advice.Argument(value = 0, readOnly = false)
-            GenericFutureListener<? extends Future<?>>[] listeners) {
-      for (int i = 0; i < listeners.length; i++) {
-        listeners[i] = ListenerWrapper.wrapIfNeeded(listeners[i]);
-      }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("addListener").and(takesArgument(0, named("io.netty.util.concurrent.GenericFutureListener"))),
+                NettyPromiseInstrumentation.class.getName() + "$WrapListenerAdvice");
+        transformer.applyAdvice(
+                named("addListeners").and(takesArgument(0, named("io.netty.util.concurrent.GenericFutureListener[]"))),
+                NettyPromiseInstrumentation.class.getName() + "$WrapListenersAdvice");
+    }
+
+    public static class WrapListenerAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void wrapListener(
+                @Advice.Argument(value = 0, readOnly = false) GenericFutureListener<? extends Future<?>> listener) {
+            listener = ListenerWrapper.wrapIfNeeded(listener);
+        }
+    }
+
+    public static class WrapListenersAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void wrapListener(
+                @Advice.Argument(value = 0, readOnly = false) GenericFutureListener<? extends Future<?>>[] listeners) {
+            for (int i = 0; i < listeners.length; i++) {
+                listeners[i] = ListenerWrapper.wrapIfNeeded(listeners[i]);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ognl-appsec-3.3.2/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java b/dd-java-agent/instrumentation/ognl-appsec-3.3.2/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java
index 031ecd4982a..840e3d01fcd 100644
--- a/dd-java-agent/instrumentation/ognl-appsec-3.3.2/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java
+++ b/dd-java-agent/instrumentation/ognl-appsec-3.3.2/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java
@@ -15,35 +15,35 @@
 
 @AutoService(InstrumenterModule.class)
 public class OgnlInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public OgnlInstrumentation() {
-    super("ognl");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "ognl.Ognl";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("parseExpression")).and(isStatic()).and(takesArguments(String.class)),
-        OgnlInstrumentation.class.getName() + "$OgnlParseExpressionAdvice");
-  }
-
-  static class OgnlParseExpressionAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void before(@Advice.Argument(0) String expression) {
-      AgentSpan parentSpan = activeSpan();
-      if (parentSpan == null) {
-        return;
-      }
-
-      AgentSpan agentSpan = startSpan("ognl", "ognl.parse", parentSpan.spanContext());
-      agentSpan.setTag("ognl.expression", expression);
-      agentSpan.finish();
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public OgnlInstrumentation() {
+        super("ognl");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "ognl.Ognl";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("parseExpression")).and(isStatic()).and(takesArguments(String.class)),
+                OgnlInstrumentation.class.getName() + "$OgnlParseExpressionAdvice");
+    }
+
+    static class OgnlParseExpressionAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void before(@Advice.Argument(0) String expression) {
+            AgentSpan parentSpan = activeSpan();
+            if (parentSpan == null) {
+                return;
+            }
+
+            AgentSpan agentSpan = startSpan("ognl", "ognl.parse", parentSpan.spanContext());
+            agentSpan.setTag("ognl.expression", expression);
+            agentSpan.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecHttpEngineInstrumentation.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecHttpEngineInstrumentation.java
index 9331a92b058..cb9cf7cf35c 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecHttpEngineInstrumentation.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecHttpEngineInstrumentation.java
@@ -17,46 +17,46 @@
 
 @AutoService(InstrumenterModule.class)
 public class AppSecHttpEngineInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public AppSecHttpEngineInstrumentation() {
-    super("okhttp", "okhttp-2");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.squareup.okhttp.internal.http.HttpEngine";
-  }
-
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("sendRequest")).and(takesArguments(0)),
-        AppSecHttpEngineInstrumentation.class.getName() + "$SendRequestAdvice");
-  }
-
-  public static class SendRequestAdvice {
-    @Advice.OnMethodEnter
-    public static void onSendRequest(
-        @Advice.FieldValue("priorResponse") final Response priorResponse,
-        @Advice.FieldValue("userRequest") final Request userRequest) {
-      // only redirects
-      if (priorResponse == null || priorResponse.code() < 300 || priorResponse.code() >= 400) {
-        return;
-      }
-      final AgentSpan span = AgentTracer.activeSpan();
-      final RequestContext ctx = span.getRequestContext();
-      if (ctx == null) {
-        return;
-      }
-      if (ctx.getData(RequestContextSlot.APPSEC) == null) {
-        return;
-      }
-
-      // increment the number of downstream requests but do not include request/response body
-      AppSecInterceptor.sampleRequest(ctx, span.getSpanId());
-      AppSecInterceptor.onResponse(span, false, priorResponse);
-      AppSecInterceptor.onRequest(span, false, userRequest.urlString(), userRequest);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public AppSecHttpEngineInstrumentation() {
+        super("okhttp", "okhttp-2");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "com.squareup.okhttp.internal.http.HttpEngine";
+    }
+
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("sendRequest")).and(takesArguments(0)),
+                AppSecHttpEngineInstrumentation.class.getName() + "$SendRequestAdvice");
+    }
+
+    public static class SendRequestAdvice {
+        @Advice.OnMethodEnter
+        public static void onSendRequest(
+                @Advice.FieldValue("priorResponse") final Response priorResponse,
+                @Advice.FieldValue("userRequest") final Request userRequest) {
+            // only redirects
+            if (priorResponse == null || priorResponse.code() < 300 || priorResponse.code() >= 400) {
+                return;
+            }
+            final AgentSpan span = AgentTracer.activeSpan();
+            final RequestContext ctx = span.getRequestContext();
+            if (ctx == null) {
+                return;
+            }
+            if (ctx.getData(RequestContextSlot.APPSEC) == null) {
+                return;
+            }
+
+            // increment the number of downstream requests but do not include request/response body
+            AppSecInterceptor.sampleRequest(ctx, span.getSpanId());
+            AppSecInterceptor.onResponse(span, false, priorResponse);
+            AppSecInterceptor.onRequest(span, false, userRequest.urlString(), userRequest);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptor.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptor.java
index 82b3e0189ad..0c4de94adf8 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptor.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptor.java
@@ -43,228 +43,222 @@
 
 public class AppSecInterceptor implements Interceptor {
 
-  private static final int BODY_PARSING_SIZE_LIMIT = Config.get().getAppSecBodyParsingSizeLimit();
+    private static final int BODY_PARSING_SIZE_LIMIT = Config.get().getAppSecBodyParsingSizeLimit();
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(AppSecInterceptor.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AppSecInterceptor.class);
 
-  @Override
-  public Response intercept(final Chain chain) throws IOException {
-    Request request = chain.request();
-    final AgentSpan span = AgentTracer.activeSpan();
-    final RequestContext ctx = span == null ? null : span.getRequestContext();
-    if (ctx == null) {
-      return chain.proceed(request);
-    }
-    boolean sampled = false;
-    try {
-      final long requestId = span.getSpanId();
-      sampled = sampleRequest(ctx, requestId);
-      final Object urlTag = span.getTag(Tags.HTTP_URL);
-      final String url = urlTag == null ? null : urlTag.toString();
-      request = onRequest(span, sampled, url, request);
-    } catch (final BlockingException e) {
-      throw e;
-    } catch (final Exception e) {
-      LOGGER.debug("Failed to run AppSec request hooks", e);
-    }
-    // let real connection/IO failures propagate rather than swallowing and retrying the request
-    final Response response = chain.proceed(request);
-    try {
-      return onResponse(span, sampled, response);
-    } catch (final BlockingException e) {
-      throw e;
-    } catch (final Exception e) {
-      LOGGER.debug("Failed to run AppSec response hooks", e);
-      return response;
+    @Override
+    public Response intercept(final Chain chain) throws IOException {
+        Request request = chain.request();
+        final AgentSpan span = AgentTracer.activeSpan();
+        final RequestContext ctx = span == null ? null : span.getRequestContext();
+        if (ctx == null) {
+            return chain.proceed(request);
+        }
+        boolean sampled = false;
+        try {
+            final long requestId = span.getSpanId();
+            sampled = sampleRequest(ctx, requestId);
+            final Object urlTag = span.getTag(Tags.HTTP_URL);
+            final String url = urlTag == null ? null : urlTag.toString();
+            request = onRequest(span, sampled, url, request);
+        } catch (final BlockingException e) {
+            throw e;
+        } catch (final Exception e) {
+            LOGGER.debug("Failed to run AppSec request hooks", e);
+        }
+        // let real connection/IO failures propagate rather than swallowing and retrying the request
+        final Response response = chain.proceed(request);
+        try {
+            return onResponse(span, sampled, response);
+        } catch (final BlockingException e) {
+            throw e;
+        } catch (final Exception e) {
+            LOGGER.debug("Failed to run AppSec response hooks", e);
+            return response;
+        }
     }
-  }
 
-  public static Request onRequest(
-      final AgentSpan span, final boolean sampled, final String url, final Request request) {
-    Request result = request;
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, HttpClientRequest, Flow<Void>> requestCb =
-        cbp.getCallback(EVENTS.httpClientRequest());
-    if (requestCb == null) {
-      return request;
-    }
+    public static Request onRequest(
+            final AgentSpan span, final boolean sampled, final String url, final Request request) {
+        Request result = request;
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, HttpClientRequest, Flow<Void>> requestCb =
+                cbp.getCallback(EVENTS.httpClientRequest());
+        if (requestCb == null) {
+            return request;
+        }
 
-    final RequestBody requestBody = request.body();
-    final RequestContext ctx = span.getRequestContext();
-    final long requestId = span.getSpanId();
-    final HttpClientRequest clientRequest =
-        new HttpClientRequest(requestId, url, request.method(), mapHeaders(request.headers()));
-    if (sampled && requestBody != null) {
-      // we are going to effectively read all the request body in memory to be analyzed by the WAF,
-      // we also modify the outbound request accordingly
-      final MediaType mediaType = contentType(requestBody);
-      try {
-        final long contentLength = requestBody.contentLength();
-        if (shouldProcessBody(contentLength, mediaType)) {
-          final byte[] payload = readBody(requestBody, (int) contentLength);
-          if (payload.length <= BODY_PARSING_SIZE_LIMIT) {
-            clientRequest.setBody(mediaType, new ByteArrayInputStream(payload));
-          }
-          result =
-              request
-                  .newBuilder()
-                  .method(request.method(), RequestBody.create(requestBody.contentType(), payload))
-                  .build(); // update request
+        final RequestBody requestBody = request.body();
+        final RequestContext ctx = span.getRequestContext();
+        final long requestId = span.getSpanId();
+        final HttpClientRequest clientRequest =
+                new HttpClientRequest(requestId, url, request.method(), mapHeaders(request.headers()));
+        if (sampled && requestBody != null) {
+            // we are going to effectively read all the request body in memory to be analyzed by the WAF,
+            // we also modify the outbound request accordingly
+            final MediaType mediaType = contentType(requestBody);
+            try {
+                final long contentLength = requestBody.contentLength();
+                if (shouldProcessBody(contentLength, mediaType)) {
+                    final byte[] payload = readBody(requestBody, (int) contentLength);
+                    if (payload.length <= BODY_PARSING_SIZE_LIMIT) {
+                        clientRequest.setBody(mediaType, new ByteArrayInputStream(payload));
+                    }
+                    result = request.newBuilder()
+                            .method(request.method(), RequestBody.create(requestBody.contentType(), payload))
+                            .build(); // update request
+                }
+            } catch (IOException e) {
+                // ignore it and keep the original request
+            }
         }
-      } catch (IOException e) {
-        // ignore it and keep the original request
-      }
+        publish(ctx, clientRequest, requestCb);
+        return result;
     }
-    publish(ctx, clientRequest, requestCb);
-    return result;
-  }
 
-  public static Response onResponse(
-      final AgentSpan span, final boolean sampled, final Response response) {
-    Response result = response;
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, HttpClientResponse, Flow<Void>> responseCb =
-        cbp.getCallback(EVENTS.httpClientResponse());
-    if (responseCb == null) {
-      return response;
-    }
-    final ResponseBody responseBody = response.body();
-    final RequestContext ctx = span.getRequestContext();
-    final long requestId = span.getSpanId();
-    final HttpClientResponse clientResponse =
-        new HttpClientResponse(requestId, response.code(), mapHeaders(response.headers()));
-    if (sampled && responseBody != null) {
-      // we are going to effectively read all the response body in memory to be analyzed by the WAF,
-      // we also
-      // modify the inbound response accordingly
-      final MediaType mediaType = contentType(responseBody);
-      try {
-        final long contentLength = responseBody.contentLength();
-        if (shouldProcessBody(contentLength, mediaType)) {
-          final byte[] payload = readBody(responseBody, (int) contentLength);
-          if (payload.length <= BODY_PARSING_SIZE_LIMIT) {
-            clientResponse.setBody(mediaType, new ByteArrayInputStream(payload));
-          }
-          result =
-              response
-                  .newBuilder()
-                  .body(ResponseBody.create(responseBody.contentType(), payload))
-                  .build();
+    public static Response onResponse(final AgentSpan span, final boolean sampled, final Response response) {
+        Response result = response;
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, HttpClientResponse, Flow<Void>> responseCb =
+                cbp.getCallback(EVENTS.httpClientResponse());
+        if (responseCb == null) {
+            return response;
+        }
+        final ResponseBody responseBody = response.body();
+        final RequestContext ctx = span.getRequestContext();
+        final long requestId = span.getSpanId();
+        final HttpClientResponse clientResponse =
+                new HttpClientResponse(requestId, response.code(), mapHeaders(response.headers()));
+        if (sampled && responseBody != null) {
+            // we are going to effectively read all the response body in memory to be analyzed by the WAF,
+            // we also
+            // modify the inbound response accordingly
+            final MediaType mediaType = contentType(responseBody);
+            try {
+                final long contentLength = responseBody.contentLength();
+                if (shouldProcessBody(contentLength, mediaType)) {
+                    final byte[] payload = readBody(responseBody, (int) contentLength);
+                    if (payload.length <= BODY_PARSING_SIZE_LIMIT) {
+                        clientResponse.setBody(mediaType, new ByteArrayInputStream(payload));
+                    }
+                    result = response.newBuilder()
+                            .body(ResponseBody.create(responseBody.contentType(), payload))
+                            .build();
+                }
+            } catch (IOException e) {
+                // ignore it and keep the original response
+            }
         }
-      } catch (IOException e) {
-        // ignore it and keep the original response
-      }
-    }
 
-    try {
-      publish(ctx, clientResponse, responseCb);
-    } catch (final BlockingException e) {
-      throw e;
-    } catch (final Exception e) {
-      // don't let a failure in the response hook discard the rebuilt response above --
-      // its body has already been drained/closed, so falling back to the original response
-      // (as the caller in intercept() does) would hand back an empty/closed body
-      LOGGER.debug("Failed to publish AppSec response event", e);
+        try {
+            publish(ctx, clientResponse, responseCb);
+        } catch (final BlockingException e) {
+            throw e;
+        } catch (final Exception e) {
+            // don't let a failure in the response hook discard the rebuilt response above --
+            // its body has already been drained/closed, so falling back to the original response
+            // (as the caller in intercept() does) would hand back an empty/closed body
+            LOGGER.debug("Failed to publish AppSec response event", e);
+        }
+        return result;
     }
-    return result;
-  }
 
-  private static <P extends HttpClientPayload> void publish(
-      final RequestContext ctx,
-      final P request,
-      final BiFunction<RequestContext, P, Flow<Void>> callback) {
-    Flow<Void> flow = callback.apply(ctx, request);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction brf = ctx.getBlockResponseFunction();
-      if (brf != null) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        brf.tryCommitBlockingResponse(ctx, rba);
-      }
-      throw new BlockingException("Blocked request (for http downstream request)");
+    private static <P extends HttpClientPayload> void publish(
+            final RequestContext ctx, final P request, final BiFunction<RequestContext, P, Flow<Void>> callback) {
+        Flow<Void> flow = callback.apply(ctx, request);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction brf = ctx.getBlockResponseFunction();
+            if (brf != null) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                brf.tryCommitBlockingResponse(ctx, rba);
+            }
+            throw new BlockingException("Blocked request (for http downstream request)");
+        }
     }
-  }
 
-  public static boolean sampleRequest(final RequestContext ctx, final long requestId) {
-    //  Check if the current http request was sampled
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, Long, Flow<Boolean>> samplingCb =
-        cbp.getCallback(EVENTS.httpClientSampling());
-    if (samplingCb == null) {
-      return false;
+    public static boolean sampleRequest(final RequestContext ctx, final long requestId) {
+        //  Check if the current http request was sampled
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, Long, Flow<Boolean>> samplingCb = cbp.getCallback(EVENTS.httpClientSampling());
+        if (samplingCb == null) {
+            return false;
+        }
+        final Flow<Boolean> sampled = samplingCb.apply(ctx, requestId);
+        return sampled.getResult() != null && sampled.getResult();
     }
-    final Flow<Boolean> sampled = samplingCb.apply(ctx, requestId);
-    return sampled.getResult() != null && sampled.getResult();
-  }
 
-  /**
-   * Ensure we are only consuming payloads we can safely deserialize with a bounded size to prevent
-   * from OOM
-   */
-  private static boolean shouldProcessBody(final long contentLength, final MediaType mediaType) {
-    if (contentLength <= 0) {
-      return false; // prevent from copying from unbounded source (just to be safe)
-    }
-    if (BODY_PARSING_SIZE_LIMIT <= 0) {
-      return false; // effectively disabled by configuration
-    }
-    if (contentLength > BODY_PARSING_SIZE_LIMIT) {
-      return false;
+    /**
+     * Ensure we are only consuming payloads we can safely deserialize with a bounded size to prevent
+     * from OOM
+     */
+    private static boolean shouldProcessBody(final long contentLength, final MediaType mediaType) {
+        if (contentLength <= 0) {
+            return false; // prevent from copying from unbounded source (just to be safe)
+        }
+        if (BODY_PARSING_SIZE_LIMIT <= 0) {
+            return false; // effectively disabled by configuration
+        }
+        if (contentLength > BODY_PARSING_SIZE_LIMIT) {
+            return false;
+        }
+        return mediaType.isDeserializable();
     }
-    return mediaType.isDeserializable();
-  }
 
-  private static byte[] readBody(final RequestBody body, final int contentLength)
-      throws IOException {
-    final ByteArrayOutputStream buffer = new ByteArrayOutputStream(contentLength);
-    try (final BufferedSink sink = Okio.buffer(Okio.sink(buffer))) {
-      body.writeTo(sink);
+    private static byte[] readBody(final RequestBody body, final int contentLength) throws IOException {
+        final ByteArrayOutputStream buffer = new ByteArrayOutputStream(contentLength);
+        try (final BufferedSink sink = Okio.buffer(Okio.sink(buffer))) {
+            body.writeTo(sink);
+        }
+        return buffer.toByteArray();
     }
-    return buffer.toByteArray();
-  }
 
-  private static byte[] readBody(final ResponseBody body, final int contentLength)
-      throws IOException {
-    final ByteArrayOutputStream buffer = new ByteArrayOutputStream(contentLength);
-    try (final BufferedSource source = body.source();
-        final Sink sink = Okio.sink(buffer)) {
-      source.readAll(sink);
+    private static byte[] readBody(final ResponseBody body, final int contentLength) throws IOException {
+        final ByteArrayOutputStream buffer = new ByteArrayOutputStream(contentLength);
+        try (final BufferedSource source = body.source();
+                final Sink sink = Okio.sink(buffer)) {
+            source.readAll(sink);
+        }
+        return buffer.toByteArray();
     }
-    return buffer.toByteArray();
-  }
 
-  @VisibleForTesting
-  static Map<String, List<String>> mapHeaders(final Headers headers) {
-    if (headers == null) {
-      return Collections.emptyMap();
-    }
-    final Map<String, List<String>> grouped = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-    for (int i = 0; i < headers.size(); i++) {
-      final String name = headers.name(i);
-      List<String> values = grouped.get(name);
-      if (values == null) {
-        values = new ArrayList<>(2);
-        grouped.put(name, values);
-      }
-      values.add(headers.value(i));
-    }
-    final int size = grouped.size();
-    // Account for HashMap's default load factor to avoid resizing while copying.
-    final int capacity = size + (size + 2) / 3;
-    final Map<String, List<String>> result = new HashMap<>(capacity);
-    for (Map.Entry<String, List<String>> entry : grouped.entrySet()) {
-      result.put(entry.getKey(), unmodifiableList(entry.getValue()));
+    @VisibleForTesting
+    static Map<String, List<String>> mapHeaders(final Headers headers) {
+        if (headers == null) {
+            return Collections.emptyMap();
+        }
+        final Map<String, List<String>> grouped = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+        for (int i = 0; i < headers.size(); i++) {
+            final String name = headers.name(i);
+            List<String> values = grouped.get(name);
+            if (values == null) {
+                values = new ArrayList<>(2);
+                grouped.put(name, values);
+            }
+            values.add(headers.value(i));
+        }
+        final int size = grouped.size();
+        // Account for HashMap's default load factor to avoid resizing while copying.
+        final int capacity = size + (size + 2) / 3;
+        final Map<String, List<String>> result = new HashMap<>(capacity);
+        for (Map.Entry<String, List<String>> entry : grouped.entrySet()) {
+            result.put(entry.getKey(), unmodifiableList(entry.getValue()));
+        }
+        return result;
     }
-    return result;
-  }
 
-  private static MediaType contentType(final RequestBody body) {
-    return MediaType.parse(
-        body == null || body.contentType() == null ? null : body.contentType().toString());
-  }
+    private static MediaType contentType(final RequestBody body) {
+        return MediaType.parse(
+                body == null || body.contentType() == null
+                        ? null
+                        : body.contentType().toString());
+    }
 
-  private static MediaType contentType(final ResponseBody body) {
-    return MediaType.parse(
-        body == null || body.contentType() == null ? null : body.contentType().toString());
-  }
+    private static MediaType contentType(final ResponseBody body) {
+        return MediaType.parse(
+                body == null || body.contentType() == null
+                        ? null
+                        : body.contentType().toString());
+    }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/IastHttpUrlInstrumentation.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/IastHttpUrlInstrumentation.java
index fa9bb7f28c7..cc8b581904c 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/IastHttpUrlInstrumentation.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/IastHttpUrlInstrumentation.java
@@ -18,73 +18,68 @@
 
 @AutoService(InstrumenterModule.class)
 public class IastHttpUrlInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
 
-  private final String className = IastHttpUrlInstrumentation.class.getName();
+    private final String className = IastHttpUrlInstrumentation.class.getName();
 
-  public IastHttpUrlInstrumentation() {
-    super("okhttp", "okhttp-2");
-  }
+    public IastHttpUrlInstrumentation() {
+        super("okhttp", "okhttp-2");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.squareup.okhttp.HttpUrl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.squareup.okhttp.HttpUrl";
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "okhttp-2.4";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "okhttp-2.4";
+    }
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("parse"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, String.class)),
-        className + "$ParseAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("get"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, URL.class)),
-        className + "$ParseAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("url")).and(takesArguments(0)), className + "$PropagationAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("parse"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, String.class)),
+                className + "$ParseAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("get"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, URL.class)),
+                className + "$ParseAdvice");
+        transformer.applyAdvice(isMethod().and(named("url")).and(takesArguments(0)), className + "$PropagationAdvice");
+    }
 
-  public static class ParseAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onParse(
-        @Advice.Argument(0) final Object argument, @Advice.Return final Object result) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        module.taintObjectIfTainted(result, argument);
-      }
+    public static class ParseAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onParse(@Advice.Argument(0) final Object argument, @Advice.Return final Object result) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                module.taintObjectIfTainted(result, argument);
+            }
+        }
     }
-  }
 
-  public static class PropagationAdvice {
+    public static class PropagationAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onPropagation(
-        @Advice.This final Object self, @Advice.Return final Object result) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        module.taintObjectIfTainted(result, self);
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onPropagation(@Advice.This final Object self, @Advice.Return final Object result) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                module.taintObjectIfTainted(result, self);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/OkHttp2Instrumentation.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/OkHttp2Instrumentation.java
index 45936b3b7ee..4a66b8b672c 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/OkHttp2Instrumentation.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/OkHttp2Instrumentation.java
@@ -12,34 +12,33 @@
 
 @AutoService(InstrumenterModule.class)
 public class OkHttp2Instrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public OkHttp2Instrumentation() {
-    super("okhttp", "okhttp-2");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public OkHttp2Instrumentation() {
+        super("okhttp", "okhttp-2");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.squareup.okhttp.OkHttpClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.squareup.okhttp.OkHttpClient";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(), OkHttp2Instrumentation.class.getName() + "$OkHttp2ClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), OkHttp2Instrumentation.class.getName() + "$OkHttp2ClientAdvice");
+    }
 
-  public static class OkHttp2ClientAdvice {
-    @Advice.OnMethodExit
-    public static void addTracingInterceptor(@Advice.This final OkHttpClient client) {
-      for (final Interceptor interceptor : client.interceptors()) {
-        if (interceptor instanceof TracingInterceptor) {
-          return;
+    public static class OkHttp2ClientAdvice {
+        @Advice.OnMethodExit
+        public static void addTracingInterceptor(@Advice.This final OkHttpClient client) {
+            for (final Interceptor interceptor : client.interceptors()) {
+                if (interceptor instanceof TracingInterceptor) {
+                    return;
+                }
+            }
+            client.interceptors().add(new TracingInterceptor());
+            if (ActiveSubsystems.APPSEC_ACTIVE) {
+                client.interceptors().add(new AppSecInterceptor());
+            }
         }
-      }
-      client.interceptors().add(new TracingInterceptor());
-      if (ActiveSubsystems.APPSEC_ACTIVE) {
-        client.interceptors().add(new AppSecInterceptor());
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/OkHttpClientDecorator.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/OkHttpClientDecorator.java
index 7f128bbbff9..2fb2f3ca66a 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/OkHttpClientDecorator.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/OkHttpClientDecorator.java
@@ -10,54 +10,53 @@
 import java.net.URL;
 
 public class OkHttpClientDecorator extends HttpClientDecorator<Request, Response> {
-  public static final CharSequence OKHTTP = UTF8BytesString.create("okhttp");
-  public static final OkHttpClientDecorator DECORATE = new OkHttpClientDecorator();
-  public static final CharSequence OKHTTP_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String method(Request request) {
-    return request.method();
-  }
-
-  @Override
-  protected URI url(Request request) throws URISyntaxException {
-    return request.url().toURI();
-  }
-
-  @Override
-  protected URL sourceUrl(final Request request) {
-    return request.url();
-  }
-
-  @Override
-  protected int status(Response response) {
-    return response.code();
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"okhttp", "okhttp-2"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return OKHTTP;
-  }
-
-  @Override
-  protected String getRequestHeader(Request request, String headerName) {
-    return request.header(headerName);
-  }
-
-  @Override
-  protected String getResponseHeader(Response response, String headerName) {
-    return response.header(headerName);
-  }
-
-  /** Overridden by {@link AppSecInterceptor} */
-  @Override
-  protected void onHttpClientRequest(AgentSpan span, String url) {
-    // do nothing
-  }
+    public static final CharSequence OKHTTP = UTF8BytesString.create("okhttp");
+    public static final OkHttpClientDecorator DECORATE = new OkHttpClientDecorator();
+    public static final CharSequence OKHTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String method(Request request) {
+        return request.method();
+    }
+
+    @Override
+    protected URI url(Request request) throws URISyntaxException {
+        return request.url().toURI();
+    }
+
+    @Override
+    protected URL sourceUrl(final Request request) {
+        return request.url();
+    }
+
+    @Override
+    protected int status(Response response) {
+        return response.code();
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"okhttp", "okhttp-2"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return OKHTTP;
+    }
+
+    @Override
+    protected String getRequestHeader(Request request, String headerName) {
+        return request.header(headerName);
+    }
+
+    @Override
+    protected String getResponseHeader(Response response, String headerName) {
+        return response.header(headerName);
+    }
+
+    /** Overridden by {@link AppSecInterceptor} */
+    @Override
+    protected void onHttpClientRequest(AgentSpan span, String url) {
+        // do nothing
+    }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/RequestBuilderInjectAdapter.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/RequestBuilderInjectAdapter.java
index be6b7d5591d..6f3844294ce 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/RequestBuilderInjectAdapter.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/RequestBuilderInjectAdapter.java
@@ -6,10 +6,10 @@
 
 @ParametersAreNonnullByDefault
 public class RequestBuilderInjectAdapter implements CarrierSetter<Request.Builder> {
-  public static final RequestBuilderInjectAdapter SETTER = new RequestBuilderInjectAdapter();
+    public static final RequestBuilderInjectAdapter SETTER = new RequestBuilderInjectAdapter();
 
-  @Override
-  public void set(final Request.Builder carrier, final String key, final String value) {
-    carrier.header(key, value);
-  }
+    @Override
+    public void set(final Request.Builder carrier, final String key, final String value) {
+        carrier.header(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/TracingInterceptor.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/TracingInterceptor.java
index 46469204281..de591486a2b 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/TracingInterceptor.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/TracingInterceptor.java
@@ -15,30 +15,30 @@
 import java.io.IOException;
 
 public class TracingInterceptor implements Interceptor {
-  @Override
-  public Response intercept(final Chain chain) throws IOException {
-    final AgentSpan span = startSpan("okhttp", OKHTTP_REQUEST);
+    @Override
+    public Response intercept(final Chain chain) throws IOException {
+        final AgentSpan span = startSpan("okhttp", OKHTTP_REQUEST);
 
-    try (final ContextScope scope = activateSpan(span)) {
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, chain.request());
+        try (final ContextScope scope = activateSpan(span)) {
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, chain.request());
 
-      final Request.Builder requestBuilder = chain.request().newBuilder();
-      DECORATE.injectContext(current(), requestBuilder, SETTER);
+            final Request.Builder requestBuilder = chain.request().newBuilder();
+            DECORATE.injectContext(current(), requestBuilder, SETTER);
 
-      final Response response;
-      try {
-        response = chain.proceed(requestBuilder.build());
-      } catch (final Exception e) {
-        DECORATE.onError(span, e);
-        throw e;
-      }
+            final Response response;
+            try {
+                response = chain.proceed(requestBuilder.build());
+            } catch (final Exception e) {
+                DECORATE.onError(span, e);
+                throw e;
+            }
 
-      DECORATE.onResponse(span, response);
-      DECORATE.beforeFinish(span);
-      return response;
-    } finally {
-      span.finish();
+            DECORATE.onResponse(span, response);
+            DECORATE.beforeFinish(span);
+            return response;
+        } finally {
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecHeadersTest.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecHeadersTest.java
index e4e13a7ab42..f52332143d3 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecHeadersTest.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecHeadersTest.java
@@ -16,52 +16,53 @@
 import org.junit.jupiter.api.Test;
 
 class AppSecHeadersTest {
-  @Test
-  void handlesNullAndEmptyHeaders() {
-    assertTrue(AppSecInterceptor.mapHeaders(null).isEmpty());
-    Map<String, List<String>> empty = AppSecInterceptor.mapHeaders(new Headers.Builder().build());
-    assertTrue(empty.isEmpty());
-    empty.put("added", singletonList("value"));
-    assertEquals(singletonList("value"), empty.get("added"));
-  }
+    @Test
+    void handlesNullAndEmptyHeaders() {
+        assertTrue(AppSecInterceptor.mapHeaders(null).isEmpty());
+        Map<String, List<String>> empty = AppSecInterceptor.mapHeaders(new Headers.Builder().build());
+        assertTrue(empty.isEmpty());
+        empty.put("added", singletonList("value"));
+        assertEquals(singletonList("value"), empty.get("added"));
+    }
 
-  @Test
-  void preservesFirstSpellingValueOrderAndCaseSensitiveLookup() {
-    Headers headers =
-        new Headers.Builder()
-            .add("X-Example", "one")
-            .add("Other", "")
-            .add("x-example", "two")
-            .add("X-EXAMPLE", "three")
-            .build();
-    Map<String, List<String>> result = AppSecInterceptor.mapHeaders(headers);
-    assertEquals(2, result.size());
-    assertEquals(asList("one", "two", "three"), result.get("X-Example"));
-    assertEquals(singletonList(""), result.get("Other"));
-    assertFalse(result.containsKey("x-example"));
-    assertThrows(UnsupportedOperationException.class, () -> result.get("X-Example").add("four"));
-    result.put("x-example", singletonList("separate"));
-    assertEquals(3, result.size());
-  }
+    @Test
+    void preservesFirstSpellingValueOrderAndCaseSensitiveLookup() {
+        Headers headers = new Headers.Builder()
+                .add("X-Example", "one")
+                .add("Other", "")
+                .add("x-example", "two")
+                .add("X-EXAMPLE", "three")
+                .build();
+        Map<String, List<String>> result = AppSecInterceptor.mapHeaders(headers);
+        assertEquals(2, result.size());
+        assertEquals(asList("one", "two", "three"), result.get("X-Example"));
+        assertEquals(singletonList(""), result.get("Other"));
+        assertFalse(result.containsKey("x-example"));
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> result.get("X-Example").add("four"));
+        result.put("x-example", singletonList("separate"));
+        assertEquals(3, result.size());
+    }
 
-  @Test
-  void matchesExistingConversionAcrossHeaderDistributions() {
-    Random random = new Random(937);
-    for (int sample = 0; sample < 200; sample++) {
-      Headers.Builder builder = new Headers.Builder();
-      for (int i = 0, size = random.nextInt(65); i < size; i++) {
-        String name = "X-Header-" + random.nextInt(24);
-        if (random.nextBoolean()) {
-          name = name.toLowerCase(Locale.ROOT);
+    @Test
+    void matchesExistingConversionAcrossHeaderDistributions() {
+        Random random = new Random(937);
+        for (int sample = 0; sample < 200; sample++) {
+            Headers.Builder builder = new Headers.Builder();
+            for (int i = 0, size = random.nextInt(65); i < size; i++) {
+                String name = "X-Header-" + random.nextInt(24);
+                if (random.nextBoolean()) {
+                    name = name.toLowerCase(Locale.ROOT);
+                }
+                builder.add(name, "value-" + i);
+            }
+            Headers headers = builder.build();
+            Map<String, List<String>> expected = new HashMap<>();
+            for (String name : headers.names()) {
+                expected.put(name, headers.values(name));
+            }
+            assertEquals(expected, AppSecInterceptor.mapHeaders(headers), "sample " + sample);
         }
-        builder.add(name, "value-" + i);
-      }
-      Headers headers = builder.build();
-      Map<String, List<String>> expected = new HashMap<>();
-      for (String name : headers.names()) {
-        expected.put(name, headers.values(name));
-      }
-      assertEquals(expected, AppSecInterceptor.mapHeaders(headers), "sample " + sample);
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptorBlockFailureTest.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptorBlockFailureTest.java
index b04c9fda478..3833ad6c750 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptorBlockFailureTest.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptorBlockFailureTest.java
@@ -35,74 +35,74 @@
  */
 class AppSecInterceptorBlockFailureTest {
 
-  private static final Flow.Action.RequestBlockingAction RBA =
-      new Flow.Action.RequestBlockingAction(403, BlockingContentType.AUTO);
-
-  private final AgentTracer.TracerAPI originalTracer = AgentTracer.get();
-
-  private Request request;
-  private RequestContext ctx;
-  private AgentSpan span;
-
-  @BeforeEach
-  void setup() {
-    request = new Request.Builder().url("http://example.com").build();
-    ctx = mock(RequestContext.class);
-    when(ctx.getTraceSegment()).thenReturn(mock(TraceSegment.class));
-
-    span = mock(AgentSpan.class);
-    when(span.getRequestContext()).thenReturn(ctx);
-    when(span.getSpanId()).thenReturn(1L);
-
-    final BiFunction<RequestContext, HttpClientRequest, Flow<Void>> callback =
-        (requestContext, clientRequest) -> blockingFlow();
-    final CallbackProvider cbp = mock(CallbackProvider.class);
-    when(cbp.getCallback(EVENTS.httpClientRequest())).thenReturn(callback);
-
-    final AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
-    when(tracer.getCallbackProvider(any(RequestContextSlot.class))).thenReturn(cbp);
-    AgentTracer.forceRegister(tracer);
-  }
-
-  @AfterEach
-  void tearDown() {
-    AgentTracer.forceRegister(originalTracer);
-  }
-
-  @Test
-  void commitsBlockingResponseWithTheRequestContext() {
-    final BlockResponseFunction brf = mock(BlockResponseFunction.class);
-    when(ctx.getBlockResponseFunction()).thenReturn(brf);
-
-    assertThrows(BlockingException.class, this::onRequest);
-
-    verify(brf, times(1)).tryCommitBlockingResponse(ctx, RBA);
-  }
-
-  @Test
-  void doesNotTouchAppSecSlotWhenThereIsNoBlockResponseFunction() {
-    when(ctx.getBlockResponseFunction()).thenReturn(null);
-
-    assertThrows(BlockingException.class, this::onRequest);
-
-    verify(ctx, never()).getData(any(RequestContextSlot.class));
-  }
-
-  private void onRequest() {
-    AppSecInterceptor.onRequest(span, false, "http://example.com", request);
-  }
-
-  private static Flow<Void> blockingFlow() {
-    return new Flow<Void>() {
-      @Override
-      public Action getAction() {
-        return RBA;
-      }
-
-      @Override
-      public Void getResult() {
-        return null;
-      }
-    };
-  }
+    private static final Flow.Action.RequestBlockingAction RBA =
+            new Flow.Action.RequestBlockingAction(403, BlockingContentType.AUTO);
+
+    private final AgentTracer.TracerAPI originalTracer = AgentTracer.get();
+
+    private Request request;
+    private RequestContext ctx;
+    private AgentSpan span;
+
+    @BeforeEach
+    void setup() {
+        request = new Request.Builder().url("http://example.com").build();
+        ctx = mock(RequestContext.class);
+        when(ctx.getTraceSegment()).thenReturn(mock(TraceSegment.class));
+
+        span = mock(AgentSpan.class);
+        when(span.getRequestContext()).thenReturn(ctx);
+        when(span.getSpanId()).thenReturn(1L);
+
+        final BiFunction<RequestContext, HttpClientRequest, Flow<Void>> callback =
+                (requestContext, clientRequest) -> blockingFlow();
+        final CallbackProvider cbp = mock(CallbackProvider.class);
+        when(cbp.getCallback(EVENTS.httpClientRequest())).thenReturn(callback);
+
+        final AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
+        when(tracer.getCallbackProvider(any(RequestContextSlot.class))).thenReturn(cbp);
+        AgentTracer.forceRegister(tracer);
+    }
+
+    @AfterEach
+    void tearDown() {
+        AgentTracer.forceRegister(originalTracer);
+    }
+
+    @Test
+    void commitsBlockingResponseWithTheRequestContext() {
+        final BlockResponseFunction brf = mock(BlockResponseFunction.class);
+        when(ctx.getBlockResponseFunction()).thenReturn(brf);
+
+        assertThrows(BlockingException.class, this::onRequest);
+
+        verify(brf, times(1)).tryCommitBlockingResponse(ctx, RBA);
+    }
+
+    @Test
+    void doesNotTouchAppSecSlotWhenThereIsNoBlockResponseFunction() {
+        when(ctx.getBlockResponseFunction()).thenReturn(null);
+
+        assertThrows(BlockingException.class, this::onRequest);
+
+        verify(ctx, never()).getData(any(RequestContextSlot.class));
+    }
+
+    private void onRequest() {
+        AppSecInterceptor.onRequest(span, false, "http://example.com", request);
+    }
+
+    private static Flow<Void> blockingFlow() {
+        return new Flow<Void>() {
+            @Override
+            public Action getAction() {
+                return RBA;
+            }
+
+            @Override
+            public Void getResult() {
+                return null;
+            }
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptorTest.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptorTest.java
index 3319774af1f..663ccdaae90 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptorTest.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptorTest.java
@@ -23,46 +23,46 @@
 
 class AppSecInterceptorTest {
 
-  private final AgentTracer.TracerAPI originalTracer = AgentTracer.get();
+    private final AgentTracer.TracerAPI originalTracer = AgentTracer.get();
 
-  private Interceptor.Chain chain;
-  private Request request;
-  private final AppSecInterceptor interceptor = new AppSecInterceptor();
+    private Interceptor.Chain chain;
+    private Request request;
+    private final AppSecInterceptor interceptor = new AppSecInterceptor();
 
-  @BeforeEach
-  void setup() {
-    request = new Request.Builder().url("http://example.com").build();
+    @BeforeEach
+    void setup() {
+        request = new Request.Builder().url("http://example.com").build();
 
-    final RequestContext requestContext = mock(RequestContext.class);
+        final RequestContext requestContext = mock(RequestContext.class);
 
-    final AgentSpan span = mock(AgentSpan.class);
-    when(span.getRequestContext()).thenReturn(requestContext);
-    when(span.getSpanId()).thenReturn(1L);
-    when(span.getTag(Tags.HTTP_URL)).thenReturn("http://example.com");
+        final AgentSpan span = mock(AgentSpan.class);
+        when(span.getRequestContext()).thenReturn(requestContext);
+        when(span.getSpanId()).thenReturn(1L);
+        when(span.getTag(Tags.HTTP_URL)).thenReturn("http://example.com");
 
-    final AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
-    when(tracer.activeSpan()).thenReturn(span);
-    when(tracer.getCallbackProvider(any(RequestContextSlot.class)))
-        .thenReturn(CallbackProvider.CallbackProviderNoop.INSTANCE);
-    AgentTracer.forceRegister(tracer);
+        final AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
+        when(tracer.activeSpan()).thenReturn(span);
+        when(tracer.getCallbackProvider(any(RequestContextSlot.class)))
+                .thenReturn(CallbackProvider.CallbackProviderNoop.INSTANCE);
+        AgentTracer.forceRegister(tracer);
 
-    chain = mock(Interceptor.Chain.class);
-    when(chain.request()).thenReturn(request);
-  }
+        chain = mock(Interceptor.Chain.class);
+        when(chain.request()).thenReturn(request);
+    }
 
-  @AfterEach
-  void tearDown() {
-    AgentTracer.forceRegister(originalTracer);
-  }
+    @AfterEach
+    void tearDown() {
+        AgentTracer.forceRegister(originalTracer);
+    }
 
-  @Test
-  void ioExceptionFromProceedPropagatesWithoutRetry() throws IOException {
-    final IOException failure = new IOException("boom");
-    when(chain.proceed(request)).thenThrow(failure);
+    @Test
+    void ioExceptionFromProceedPropagatesWithoutRetry() throws IOException {
+        final IOException failure = new IOException("boom");
+        when(chain.proceed(request)).thenThrow(failure);
 
-    final IOException thrown = assertThrows(IOException.class, () -> interceptor.intercept(chain));
+        final IOException thrown = assertThrows(IOException.class, () -> interceptor.intercept(chain));
 
-    assertSame(failure, thrown);
-    verify(chain, times(1)).proceed(request);
-  }
+        assertSame(failure, thrown);
+        verify(chain, times(1)).proceed(request);
+    }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecHttpEngineInstrumentation.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecHttpEngineInstrumentation.java
index 6860939c44a..eec6a4da6ca 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecHttpEngineInstrumentation.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecHttpEngineInstrumentation.java
@@ -17,46 +17,46 @@
 
 @AutoService(InstrumenterModule.class)
 public class AppSecHttpEngineInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public AppSecHttpEngineInstrumentation() {
-    super("okhttp", "okhttp-3");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "okhttp3.internal.http.HttpEngine";
-  }
-
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("sendRequest")).and(takesArguments(0)),
-        AppSecHttpEngineInstrumentation.class.getName() + "$SendRequestAdvice");
-  }
-
-  public static class SendRequestAdvice {
-    @Advice.OnMethodEnter
-    public static void onSendRequest(
-        @Advice.FieldValue("priorResponse") final Response priorResponse,
-        @Advice.FieldValue("userRequest") final Request userRequest) {
-      // only redirects
-      if (priorResponse == null || priorResponse.code() < 300 || priorResponse.code() >= 400) {
-        return;
-      }
-      final AgentSpan span = AgentTracer.activeSpan();
-      final RequestContext ctx = span.getRequestContext();
-      if (ctx == null) {
-        return;
-      }
-      if (ctx.getData(RequestContextSlot.APPSEC) == null) {
-        return;
-      }
-
-      // increment the number of downstream requests but do not include request/response body
-      AppSecInterceptor.sampleRequest(ctx, span.getSpanId());
-      AppSecInterceptor.onResponse(span, false, priorResponse);
-      AppSecInterceptor.onRequest(span, false, userRequest.url().toString(), userRequest);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public AppSecHttpEngineInstrumentation() {
+        super("okhttp", "okhttp-3");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "okhttp3.internal.http.HttpEngine";
+    }
+
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("sendRequest")).and(takesArguments(0)),
+                AppSecHttpEngineInstrumentation.class.getName() + "$SendRequestAdvice");
+    }
+
+    public static class SendRequestAdvice {
+        @Advice.OnMethodEnter
+        public static void onSendRequest(
+                @Advice.FieldValue("priorResponse") final Response priorResponse,
+                @Advice.FieldValue("userRequest") final Request userRequest) {
+            // only redirects
+            if (priorResponse == null || priorResponse.code() < 300 || priorResponse.code() >= 400) {
+                return;
+            }
+            final AgentSpan span = AgentTracer.activeSpan();
+            final RequestContext ctx = span.getRequestContext();
+            if (ctx == null) {
+                return;
+            }
+            if (ctx.getData(RequestContextSlot.APPSEC) == null) {
+                return;
+            }
+
+            // increment the number of downstream requests but do not include request/response body
+            AppSecInterceptor.sampleRequest(ctx, span.getSpanId());
+            AppSecInterceptor.onResponse(span, false, priorResponse);
+            AppSecInterceptor.onRequest(span, false, userRequest.url().toString(), userRequest);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptor.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptor.java
index 7cfecfbebb1..bb0677fb43b 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptor.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptor.java
@@ -43,228 +43,222 @@
 
 public class AppSecInterceptor implements Interceptor {
 
-  private static final int BODY_PARSING_SIZE_LIMIT = Config.get().getAppSecBodyParsingSizeLimit();
+    private static final int BODY_PARSING_SIZE_LIMIT = Config.get().getAppSecBodyParsingSizeLimit();
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(AppSecInterceptor.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AppSecInterceptor.class);
 
-  @Override
-  public Response intercept(final Chain chain) throws IOException {
-    Request request = chain.request();
-    final AgentSpan span = AgentTracer.activeSpan();
-    final RequestContext ctx = span == null ? null : span.getRequestContext();
-    if (ctx == null) {
-      return chain.proceed(request);
-    }
-    boolean sampled = false;
-    try {
-      final long requestId = span.getSpanId();
-      sampled = sampleRequest(ctx, requestId);
-      final Object urlTag = span.getTag(Tags.HTTP_URL);
-      final String url = urlTag == null ? null : urlTag.toString();
-      request = onRequest(span, sampled, url, request);
-    } catch (final BlockingException e) {
-      throw e;
-    } catch (final Exception e) {
-      LOGGER.debug("Failed to run AppSec request hooks", e);
-    }
-    // let real connection/IO failures propagate rather than swallowing and retrying the request
-    final Response response = chain.proceed(request);
-    try {
-      return onResponse(span, sampled, response);
-    } catch (final BlockingException e) {
-      throw e;
-    } catch (final Exception e) {
-      LOGGER.debug("Failed to run AppSec response hooks", e);
-      return response;
+    @Override
+    public Response intercept(final Chain chain) throws IOException {
+        Request request = chain.request();
+        final AgentSpan span = AgentTracer.activeSpan();
+        final RequestContext ctx = span == null ? null : span.getRequestContext();
+        if (ctx == null) {
+            return chain.proceed(request);
+        }
+        boolean sampled = false;
+        try {
+            final long requestId = span.getSpanId();
+            sampled = sampleRequest(ctx, requestId);
+            final Object urlTag = span.getTag(Tags.HTTP_URL);
+            final String url = urlTag == null ? null : urlTag.toString();
+            request = onRequest(span, sampled, url, request);
+        } catch (final BlockingException e) {
+            throw e;
+        } catch (final Exception e) {
+            LOGGER.debug("Failed to run AppSec request hooks", e);
+        }
+        // let real connection/IO failures propagate rather than swallowing and retrying the request
+        final Response response = chain.proceed(request);
+        try {
+            return onResponse(span, sampled, response);
+        } catch (final BlockingException e) {
+            throw e;
+        } catch (final Exception e) {
+            LOGGER.debug("Failed to run AppSec response hooks", e);
+            return response;
+        }
     }
-  }
 
-  public static Request onRequest(
-      final AgentSpan span, final boolean sampled, final String url, final Request request) {
-    Request result = request;
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, HttpClientRequest, Flow<Void>> requestCb =
-        cbp.getCallback(EVENTS.httpClientRequest());
-    if (requestCb == null) {
-      return request;
-    }
+    public static Request onRequest(
+            final AgentSpan span, final boolean sampled, final String url, final Request request) {
+        Request result = request;
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, HttpClientRequest, Flow<Void>> requestCb =
+                cbp.getCallback(EVENTS.httpClientRequest());
+        if (requestCb == null) {
+            return request;
+        }
 
-    final RequestBody requestBody = request.body();
-    final RequestContext ctx = span.getRequestContext();
-    final long requestId = span.getSpanId();
-    final HttpClientRequest clientRequest =
-        new HttpClientRequest(requestId, url, request.method(), mapHeaders(request.headers()));
-    if (sampled && requestBody != null) {
-      // we are going to effectively read all the request body in memory to be analyzed by the WAF,
-      // we also modify the outbound request accordingly
-      final MediaType mediaType = contentType(requestBody);
-      try {
-        final long contentLength = requestBody.contentLength();
-        if (shouldProcessBody(contentLength, mediaType)) {
-          final byte[] payload = readBody(requestBody, (int) contentLength);
-          if (payload.length <= BODY_PARSING_SIZE_LIMIT) {
-            clientRequest.setBody(mediaType, new ByteArrayInputStream(payload));
-          }
-          result =
-              request
-                  .newBuilder()
-                  .method(request.method(), RequestBody.create(requestBody.contentType(), payload))
-                  .build(); // update request
+        final RequestBody requestBody = request.body();
+        final RequestContext ctx = span.getRequestContext();
+        final long requestId = span.getSpanId();
+        final HttpClientRequest clientRequest =
+                new HttpClientRequest(requestId, url, request.method(), mapHeaders(request.headers()));
+        if (sampled && requestBody != null) {
+            // we are going to effectively read all the request body in memory to be analyzed by the WAF,
+            // we also modify the outbound request accordingly
+            final MediaType mediaType = contentType(requestBody);
+            try {
+                final long contentLength = requestBody.contentLength();
+                if (shouldProcessBody(contentLength, mediaType)) {
+                    final byte[] payload = readBody(requestBody, (int) contentLength);
+                    if (payload.length <= BODY_PARSING_SIZE_LIMIT) {
+                        clientRequest.setBody(mediaType, new ByteArrayInputStream(payload));
+                    }
+                    result = request.newBuilder()
+                            .method(request.method(), RequestBody.create(requestBody.contentType(), payload))
+                            .build(); // update request
+                }
+            } catch (IOException e) {
+                // ignore it and keep the original request
+            }
         }
-      } catch (IOException e) {
-        // ignore it and keep the original request
-      }
+        publish(ctx, clientRequest, requestCb);
+        return result;
     }
-    publish(ctx, clientRequest, requestCb);
-    return result;
-  }
 
-  public static Response onResponse(
-      final AgentSpan span, final boolean sampled, final Response response) {
-    Response result = response;
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, HttpClientResponse, Flow<Void>> responseCb =
-        cbp.getCallback(EVENTS.httpClientResponse());
-    if (responseCb == null) {
-      return response;
-    }
-    final ResponseBody responseBody = response.body();
-    final RequestContext ctx = span.getRequestContext();
-    final long requestId = span.getSpanId();
-    final HttpClientResponse clientResponse =
-        new HttpClientResponse(requestId, response.code(), mapHeaders(response.headers()));
-    if (sampled && responseBody != null) {
-      // we are going to effectively read all the response body in memory to be analyzed by the WAF,
-      // we also
-      // modify the inbound response accordingly
-      final MediaType mediaType = contentType(responseBody);
-      try {
-        final long contentLength = responseBody.contentLength();
-        if (shouldProcessBody(contentLength, mediaType)) {
-          final byte[] payload = readBody(responseBody, (int) contentLength);
-          if (payload.length <= BODY_PARSING_SIZE_LIMIT) {
-            clientResponse.setBody(mediaType, new ByteArrayInputStream(payload));
-          }
-          result =
-              response
-                  .newBuilder()
-                  .body(ResponseBody.create(responseBody.contentType(), payload))
-                  .build();
+    public static Response onResponse(final AgentSpan span, final boolean sampled, final Response response) {
+        Response result = response;
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, HttpClientResponse, Flow<Void>> responseCb =
+                cbp.getCallback(EVENTS.httpClientResponse());
+        if (responseCb == null) {
+            return response;
+        }
+        final ResponseBody responseBody = response.body();
+        final RequestContext ctx = span.getRequestContext();
+        final long requestId = span.getSpanId();
+        final HttpClientResponse clientResponse =
+                new HttpClientResponse(requestId, response.code(), mapHeaders(response.headers()));
+        if (sampled && responseBody != null) {
+            // we are going to effectively read all the response body in memory to be analyzed by the WAF,
+            // we also
+            // modify the inbound response accordingly
+            final MediaType mediaType = contentType(responseBody);
+            try {
+                final long contentLength = responseBody.contentLength();
+                if (shouldProcessBody(contentLength, mediaType)) {
+                    final byte[] payload = readBody(responseBody, (int) contentLength);
+                    if (payload.length <= BODY_PARSING_SIZE_LIMIT) {
+                        clientResponse.setBody(mediaType, new ByteArrayInputStream(payload));
+                    }
+                    result = response.newBuilder()
+                            .body(ResponseBody.create(responseBody.contentType(), payload))
+                            .build();
+                }
+            } catch (IOException e) {
+                // ignore it and keep the original response
+            }
         }
-      } catch (IOException e) {
-        // ignore it and keep the original response
-      }
-    }
 
-    try {
-      publish(ctx, clientResponse, responseCb);
-    } catch (final BlockingException e) {
-      throw e;
-    } catch (final Exception e) {
-      // don't let a failure in the response hook discard the rebuilt response above --
-      // its body has already been drained/closed, so falling back to the original response
-      // (as the caller in intercept() does) would hand back an empty/closed body
-      LOGGER.debug("Failed to publish AppSec response event", e);
+        try {
+            publish(ctx, clientResponse, responseCb);
+        } catch (final BlockingException e) {
+            throw e;
+        } catch (final Exception e) {
+            // don't let a failure in the response hook discard the rebuilt response above --
+            // its body has already been drained/closed, so falling back to the original response
+            // (as the caller in intercept() does) would hand back an empty/closed body
+            LOGGER.debug("Failed to publish AppSec response event", e);
+        }
+        return result;
     }
-    return result;
-  }
 
-  private static <P extends HttpClientPayload> void publish(
-      final RequestContext ctx,
-      final P request,
-      final BiFunction<RequestContext, P, Flow<Void>> callback) {
-    Flow<Void> flow = callback.apply(ctx, request);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction brf = ctx.getBlockResponseFunction();
-      if (brf != null) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        brf.tryCommitBlockingResponse(ctx, rba);
-      }
-      throw new BlockingException("Blocked request (for http downstream request)");
+    private static <P extends HttpClientPayload> void publish(
+            final RequestContext ctx, final P request, final BiFunction<RequestContext, P, Flow<Void>> callback) {
+        Flow<Void> flow = callback.apply(ctx, request);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction brf = ctx.getBlockResponseFunction();
+            if (brf != null) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                brf.tryCommitBlockingResponse(ctx, rba);
+            }
+            throw new BlockingException("Blocked request (for http downstream request)");
+        }
     }
-  }
 
-  public static boolean sampleRequest(final RequestContext ctx, final long requestId) {
-    //  Check if the current http request was sampled
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, Long, Flow<Boolean>> samplingCb =
-        cbp.getCallback(EVENTS.httpClientSampling());
-    if (samplingCb == null) {
-      return false;
+    public static boolean sampleRequest(final RequestContext ctx, final long requestId) {
+        //  Check if the current http request was sampled
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, Long, Flow<Boolean>> samplingCb = cbp.getCallback(EVENTS.httpClientSampling());
+        if (samplingCb == null) {
+            return false;
+        }
+        final Flow<Boolean> sampled = samplingCb.apply(ctx, requestId);
+        return sampled.getResult() != null && sampled.getResult();
     }
-    final Flow<Boolean> sampled = samplingCb.apply(ctx, requestId);
-    return sampled.getResult() != null && sampled.getResult();
-  }
 
-  /**
-   * Ensure we are only consuming payloads we can safely deserialize with a bounded size to prevent
-   * from OOM
-   */
-  private static boolean shouldProcessBody(final long contentLength, final MediaType mediaType) {
-    if (contentLength <= 0) {
-      return false; // prevent from copying from unbounded source (just to be safe)
-    }
-    if (BODY_PARSING_SIZE_LIMIT <= 0) {
-      return false; // effectively disabled by configuration
-    }
-    if (contentLength > BODY_PARSING_SIZE_LIMIT) {
-      return false;
+    /**
+     * Ensure we are only consuming payloads we can safely deserialize with a bounded size to prevent
+     * from OOM
+     */
+    private static boolean shouldProcessBody(final long contentLength, final MediaType mediaType) {
+        if (contentLength <= 0) {
+            return false; // prevent from copying from unbounded source (just to be safe)
+        }
+        if (BODY_PARSING_SIZE_LIMIT <= 0) {
+            return false; // effectively disabled by configuration
+        }
+        if (contentLength > BODY_PARSING_SIZE_LIMIT) {
+            return false;
+        }
+        return mediaType.isDeserializable();
     }
-    return mediaType.isDeserializable();
-  }
 
-  private static byte[] readBody(final RequestBody body, final int contentLength)
-      throws IOException {
-    final ByteArrayOutputStream buffer = new ByteArrayOutputStream(contentLength);
-    try (final BufferedSink sink = Okio.buffer(Okio.sink(buffer))) {
-      body.writeTo(sink);
+    private static byte[] readBody(final RequestBody body, final int contentLength) throws IOException {
+        final ByteArrayOutputStream buffer = new ByteArrayOutputStream(contentLength);
+        try (final BufferedSink sink = Okio.buffer(Okio.sink(buffer))) {
+            body.writeTo(sink);
+        }
+        return buffer.toByteArray();
     }
-    return buffer.toByteArray();
-  }
 
-  private static byte[] readBody(final ResponseBody body, final int contentLength)
-      throws IOException {
-    final ByteArrayOutputStream buffer = new ByteArrayOutputStream(contentLength);
-    try (final BufferedSource source = body.source();
-        final Sink sink = Okio.sink(buffer)) {
-      source.readAll(sink);
+    private static byte[] readBody(final ResponseBody body, final int contentLength) throws IOException {
+        final ByteArrayOutputStream buffer = new ByteArrayOutputStream(contentLength);
+        try (final BufferedSource source = body.source();
+                final Sink sink = Okio.sink(buffer)) {
+            source.readAll(sink);
+        }
+        return buffer.toByteArray();
     }
-    return buffer.toByteArray();
-  }
 
-  @VisibleForTesting
-  static Map<String, List<String>> mapHeaders(final Headers headers) {
-    if (headers == null) {
-      return Collections.emptyMap();
-    }
-    final Map<String, List<String>> grouped = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-    for (int i = 0; i < headers.size(); i++) {
-      final String name = headers.name(i);
-      List<String> values = grouped.get(name);
-      if (values == null) {
-        values = new ArrayList<>(2);
-        grouped.put(name, values);
-      }
-      values.add(headers.value(i));
-    }
-    final int size = grouped.size();
-    // Account for HashMap's default load factor to avoid resizing while copying.
-    final int capacity = size + (size + 2) / 3;
-    final Map<String, List<String>> result = new HashMap<>(capacity);
-    for (Map.Entry<String, List<String>> entry : grouped.entrySet()) {
-      result.put(entry.getKey(), unmodifiableList(entry.getValue()));
+    @VisibleForTesting
+    static Map<String, List<String>> mapHeaders(final Headers headers) {
+        if (headers == null) {
+            return Collections.emptyMap();
+        }
+        final Map<String, List<String>> grouped = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+        for (int i = 0; i < headers.size(); i++) {
+            final String name = headers.name(i);
+            List<String> values = grouped.get(name);
+            if (values == null) {
+                values = new ArrayList<>(2);
+                grouped.put(name, values);
+            }
+            values.add(headers.value(i));
+        }
+        final int size = grouped.size();
+        // Account for HashMap's default load factor to avoid resizing while copying.
+        final int capacity = size + (size + 2) / 3;
+        final Map<String, List<String>> result = new HashMap<>(capacity);
+        for (Map.Entry<String, List<String>> entry : grouped.entrySet()) {
+            result.put(entry.getKey(), unmodifiableList(entry.getValue()));
+        }
+        return result;
     }
-    return result;
-  }
 
-  private static MediaType contentType(final RequestBody body) {
-    return MediaType.parse(
-        body == null || body.contentType() == null ? null : body.contentType().toString());
-  }
+    private static MediaType contentType(final RequestBody body) {
+        return MediaType.parse(
+                body == null || body.contentType() == null
+                        ? null
+                        : body.contentType().toString());
+    }
 
-  private static MediaType contentType(final ResponseBody body) {
-    return MediaType.parse(
-        body == null || body.contentType() == null ? null : body.contentType().toString());
-  }
+    private static MediaType contentType(final ResponseBody body) {
+        return MediaType.parse(
+                body == null || body.contentType() == null
+                        ? null
+                        : body.contentType().toString());
+    }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/IastHttpUrlInstrumentation.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/IastHttpUrlInstrumentation.java
index 2c7d52c8c09..89039e1f776 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/IastHttpUrlInstrumentation.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/IastHttpUrlInstrumentation.java
@@ -18,60 +18,57 @@
 
 @AutoService(InstrumenterModule.class)
 public class IastHttpUrlInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
 
-  private final String className = IastHttpUrlInstrumentation.class.getName();
+    private final String className = IastHttpUrlInstrumentation.class.getName();
 
-  public IastHttpUrlInstrumentation() {
-    super("okhttp", "okhttp-3");
-  }
+    public IastHttpUrlInstrumentation() {
+        super("okhttp", "okhttp-3");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "okhttp3.HttpUrl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "okhttp3.HttpUrl";
+    }
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("parse"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, String.class)),
-        className + "$ParseAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("get"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, URL.class)),
-        className + "$ParseAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("get"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, String.class)),
-        className + "$ParseAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("parse"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, String.class)),
+                className + "$ParseAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("get"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, URL.class)),
+                className + "$ParseAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("get"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, String.class)),
+                className + "$ParseAdvice");
+    }
 
-  public static class ParseAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onParse(
-        @Advice.Argument(0) final Object arg, @Advice.Return final Object result) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        module.taintObjectIfTainted(result, arg);
-      }
+    public static class ParseAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onParse(@Advice.Argument(0) final Object arg, @Advice.Return final Object result) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                module.taintObjectIfTainted(result, arg);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java
index a7d35eac36a..20499e4b250 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java
@@ -14,38 +14,37 @@
 
 @AutoService(InstrumenterModule.class)
 public class OkHttp3Instrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public OkHttp3Instrumentation() {
-    super("okhttp", "okhttp-3");
-  }
+    public OkHttp3Instrumentation() {
+        super("okhttp", "okhttp-3");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "okhttp3.OkHttpClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "okhttp3.OkHttpClient";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(0, named("okhttp3.OkHttpClient$Builder"))),
-        OkHttp3Instrumentation.class.getName() + "$OkHttp3Advice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(0, named("okhttp3.OkHttpClient$Builder"))),
+                OkHttp3Instrumentation.class.getName() + "$OkHttp3Advice");
+    }
 
-  public static class OkHttp3Advice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void addTracingInterceptor(
-        @Advice.Argument(0) final OkHttpClient.Builder builder) {
-      for (final Interceptor interceptor : builder.interceptors()) {
-        if (interceptor instanceof TracingInterceptor) {
-          return;
+    public static class OkHttp3Advice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void addTracingInterceptor(@Advice.Argument(0) final OkHttpClient.Builder builder) {
+            for (final Interceptor interceptor : builder.interceptors()) {
+                if (interceptor instanceof TracingInterceptor) {
+                    return;
+                }
+            }
+            final TracingInterceptor interceptor = new TracingInterceptor();
+            builder.addInterceptor(interceptor);
+            if (ActiveSubsystems.APPSEC_ACTIVE) {
+                builder.addInterceptor(new AppSecInterceptor());
+            }
         }
-      }
-      final TracingInterceptor interceptor = new TracingInterceptor();
-      builder.addInterceptor(interceptor);
-      if (ActiveSubsystems.APPSEC_ACTIVE) {
-        builder.addInterceptor(new AppSecInterceptor());
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttpClientDecorator.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttpClientDecorator.java
index 7bbe47db99f..9b405b31180 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttpClientDecorator.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttpClientDecorator.java
@@ -9,60 +9,59 @@
 import okhttp3.Response;
 
 public class OkHttpClientDecorator extends HttpClientDecorator<Request, Response> {
-  public static final CharSequence OKHTTP = UTF8BytesString.create("okhttp");
-  public static final OkHttpClientDecorator DECORATE = new OkHttpClientDecorator();
+    public static final CharSequence OKHTTP = UTF8BytesString.create("okhttp");
+    public static final OkHttpClientDecorator DECORATE = new OkHttpClientDecorator();
 
-  public static final CharSequence OKHTTP_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
+    public static final CharSequence OKHTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"okhttp", "okhttp-3"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"okhttp", "okhttp-3"};
+    }
 
-  @Override
-  protected String service() {
-    return null;
-  }
+    @Override
+    protected String service() {
+        return null;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return OKHTTP;
-  }
+    @Override
+    protected CharSequence component() {
+        return OKHTTP;
+    }
 
-  @Override
-  protected String method(final Request httpRequest) {
-    return httpRequest.method();
-  }
+    @Override
+    protected String method(final Request httpRequest) {
+        return httpRequest.method();
+    }
 
-  @Override
-  protected URI url(final Request httpRequest) {
-    return httpRequest.url().uri();
-  }
+    @Override
+    protected URI url(final Request httpRequest) {
+        return httpRequest.url().uri();
+    }
 
-  @Override
-  protected HttpUrl sourceUrl(final Request httpRequest) {
-    return httpRequest.url();
-  }
+    @Override
+    protected HttpUrl sourceUrl(final Request httpRequest) {
+        return httpRequest.url();
+    }
 
-  @Override
-  protected int status(final Response httpResponse) {
-    return httpResponse.code();
-  }
+    @Override
+    protected int status(final Response httpResponse) {
+        return httpResponse.code();
+    }
 
-  @Override
-  protected String getRequestHeader(Request request, String headerName) {
-    return request.header(headerName);
-  }
+    @Override
+    protected String getRequestHeader(Request request, String headerName) {
+        return request.header(headerName);
+    }
 
-  @Override
-  protected String getResponseHeader(Response response, String headerName) {
-    return response.header(headerName);
-  }
+    @Override
+    protected String getResponseHeader(Response response, String headerName) {
+        return response.header(headerName);
+    }
 
-  /** Overridden by {@link AppSecInterceptor} */
-  @Override
-  protected void onHttpClientRequest(AgentSpan span, String url) {
-    // do nothing
-  }
+    /** Overridden by {@link AppSecInterceptor} */
+    @Override
+    protected void onHttpClientRequest(AgentSpan span, String url) {
+        // do nothing
+    }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/RequestBuilderInjectAdapter.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/RequestBuilderInjectAdapter.java
index d8acd7d44dd..f787f84b46f 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/RequestBuilderInjectAdapter.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/RequestBuilderInjectAdapter.java
@@ -12,10 +12,10 @@
 @ParametersAreNonnullByDefault
 public class RequestBuilderInjectAdapter implements CarrierSetter<Request.Builder> {
 
-  public static final RequestBuilderInjectAdapter SETTER = new RequestBuilderInjectAdapter();
+    public static final RequestBuilderInjectAdapter SETTER = new RequestBuilderInjectAdapter();
 
-  @Override
-  public void set(final Request.Builder carrier, final String key, final String value) {
-    carrier.header(key, value);
-  }
+    @Override
+    public void set(final Request.Builder carrier, final String key, final String value) {
+        carrier.header(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/TracingInterceptor.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/TracingInterceptor.java
index 0246a81f531..783f3955167 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/TracingInterceptor.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/TracingInterceptor.java
@@ -15,34 +15,34 @@
 import okhttp3.Response;
 
 public class TracingInterceptor implements Interceptor {
-  @Override
-  public Response intercept(final Chain chain) throws IOException {
-    if (DECORATE.isAgentRequest(chain.request())) {
-      return chain.proceed(chain.request());
+    @Override
+    public Response intercept(final Chain chain) throws IOException {
+        if (DECORATE.isAgentRequest(chain.request())) {
+            return chain.proceed(chain.request());
+        }
+
+        final AgentSpan span = startSpan("okhttp", OKHTTP_REQUEST);
+
+        try (final ContextScope scope = activateSpan(span)) {
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, chain.request());
+
+            final Request.Builder requestBuilder = chain.request().newBuilder();
+            DECORATE.injectContext(current(), requestBuilder, SETTER);
+
+            final Response response;
+            try {
+                response = chain.proceed(requestBuilder.build());
+            } catch (final Exception e) {
+                DECORATE.onError(span, e);
+                throw e;
+            }
+
+            DECORATE.onResponse(span, response);
+            DECORATE.beforeFinish(span);
+            return response;
+        } finally {
+            span.finish();
+        }
     }
-
-    final AgentSpan span = startSpan("okhttp", OKHTTP_REQUEST);
-
-    try (final ContextScope scope = activateSpan(span)) {
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, chain.request());
-
-      final Request.Builder requestBuilder = chain.request().newBuilder();
-      DECORATE.injectContext(current(), requestBuilder, SETTER);
-
-      final Response response;
-      try {
-        response = chain.proceed(requestBuilder.build());
-      } catch (final Exception e) {
-        DECORATE.onError(span, e);
-        throw e;
-      }
-
-      DECORATE.onResponse(span, response);
-      DECORATE.beforeFinish(span);
-      return response;
-    } finally {
-      span.finish();
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecHeadersTest.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecHeadersTest.java
index d56d547218f..3ec7149fc65 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecHeadersTest.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecHeadersTest.java
@@ -16,52 +16,53 @@
 import org.junit.jupiter.api.Test;
 
 class AppSecHeadersTest {
-  @Test
-  void handlesNullAndEmptyHeaders() {
-    assertTrue(AppSecInterceptor.mapHeaders(null).isEmpty());
-    Map<String, List<String>> empty = AppSecInterceptor.mapHeaders(new Headers.Builder().build());
-    assertTrue(empty.isEmpty());
-    empty.put("added", singletonList("value"));
-    assertEquals(singletonList("value"), empty.get("added"));
-  }
+    @Test
+    void handlesNullAndEmptyHeaders() {
+        assertTrue(AppSecInterceptor.mapHeaders(null).isEmpty());
+        Map<String, List<String>> empty = AppSecInterceptor.mapHeaders(new Headers.Builder().build());
+        assertTrue(empty.isEmpty());
+        empty.put("added", singletonList("value"));
+        assertEquals(singletonList("value"), empty.get("added"));
+    }
 
-  @Test
-  void preservesFirstSpellingValueOrderAndCaseSensitiveLookup() {
-    Headers headers =
-        new Headers.Builder()
-            .add("X-Example", "one")
-            .add("Other", "")
-            .add("x-example", "two")
-            .add("X-EXAMPLE", "three")
-            .build();
-    Map<String, List<String>> result = AppSecInterceptor.mapHeaders(headers);
-    assertEquals(2, result.size());
-    assertEquals(asList("one", "two", "three"), result.get("X-Example"));
-    assertEquals(singletonList(""), result.get("Other"));
-    assertFalse(result.containsKey("x-example"));
-    assertThrows(UnsupportedOperationException.class, () -> result.get("X-Example").add("four"));
-    result.put("x-example", singletonList("separate"));
-    assertEquals(3, result.size());
-  }
+    @Test
+    void preservesFirstSpellingValueOrderAndCaseSensitiveLookup() {
+        Headers headers = new Headers.Builder()
+                .add("X-Example", "one")
+                .add("Other", "")
+                .add("x-example", "two")
+                .add("X-EXAMPLE", "three")
+                .build();
+        Map<String, List<String>> result = AppSecInterceptor.mapHeaders(headers);
+        assertEquals(2, result.size());
+        assertEquals(asList("one", "two", "three"), result.get("X-Example"));
+        assertEquals(singletonList(""), result.get("Other"));
+        assertFalse(result.containsKey("x-example"));
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> result.get("X-Example").add("four"));
+        result.put("x-example", singletonList("separate"));
+        assertEquals(3, result.size());
+    }
 
-  @Test
-  void matchesExistingConversionAcrossHeaderDistributions() {
-    Random random = new Random(937);
-    for (int sample = 0; sample < 200; sample++) {
-      Headers.Builder builder = new Headers.Builder();
-      for (int i = 0, size = random.nextInt(65); i < size; i++) {
-        String name = "X-Header-" + random.nextInt(24);
-        if (random.nextBoolean()) {
-          name = name.toLowerCase(Locale.ROOT);
+    @Test
+    void matchesExistingConversionAcrossHeaderDistributions() {
+        Random random = new Random(937);
+        for (int sample = 0; sample < 200; sample++) {
+            Headers.Builder builder = new Headers.Builder();
+            for (int i = 0, size = random.nextInt(65); i < size; i++) {
+                String name = "X-Header-" + random.nextInt(24);
+                if (random.nextBoolean()) {
+                    name = name.toLowerCase(Locale.ROOT);
+                }
+                builder.add(name, "value-" + i);
+            }
+            Headers headers = builder.build();
+            Map<String, List<String>> expected = new HashMap<>();
+            for (String name : headers.names()) {
+                expected.put(name, headers.values(name));
+            }
+            assertEquals(expected, AppSecInterceptor.mapHeaders(headers), "sample " + sample);
         }
-        builder.add(name, "value-" + i);
-      }
-      Headers headers = builder.build();
-      Map<String, List<String>> expected = new HashMap<>();
-      for (String name : headers.names()) {
-        expected.put(name, headers.values(name));
-      }
-      assertEquals(expected, AppSecInterceptor.mapHeaders(headers), "sample " + sample);
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptorBlockFailureTest.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptorBlockFailureTest.java
index 0f403700c88..99d03995dd9 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptorBlockFailureTest.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptorBlockFailureTest.java
@@ -35,74 +35,74 @@
  */
 class AppSecInterceptorBlockFailureTest {
 
-  private static final Flow.Action.RequestBlockingAction RBA =
-      new Flow.Action.RequestBlockingAction(403, BlockingContentType.AUTO);
-
-  private final AgentTracer.TracerAPI originalTracer = AgentTracer.get();
-
-  private Request request;
-  private RequestContext ctx;
-  private AgentSpan span;
-
-  @BeforeEach
-  void setup() {
-    request = new Request.Builder().url("http://example.com").build();
-    ctx = mock(RequestContext.class);
-    when(ctx.getTraceSegment()).thenReturn(mock(TraceSegment.class));
-
-    span = mock(AgentSpan.class);
-    when(span.getRequestContext()).thenReturn(ctx);
-    when(span.getSpanId()).thenReturn(1L);
-
-    final BiFunction<RequestContext, HttpClientRequest, Flow<Void>> callback =
-        (requestContext, clientRequest) -> blockingFlow();
-    final CallbackProvider cbp = mock(CallbackProvider.class);
-    when(cbp.getCallback(EVENTS.httpClientRequest())).thenReturn(callback);
-
-    final AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
-    when(tracer.getCallbackProvider(any(RequestContextSlot.class))).thenReturn(cbp);
-    AgentTracer.forceRegister(tracer);
-  }
-
-  @AfterEach
-  void tearDown() {
-    AgentTracer.forceRegister(originalTracer);
-  }
-
-  @Test
-  void commitsBlockingResponseWithTheRequestContext() {
-    final BlockResponseFunction brf = mock(BlockResponseFunction.class);
-    when(ctx.getBlockResponseFunction()).thenReturn(brf);
-
-    assertThrows(BlockingException.class, this::onRequest);
-
-    verify(brf, times(1)).tryCommitBlockingResponse(ctx, RBA);
-  }
-
-  @Test
-  void doesNotTouchAppSecSlotWhenThereIsNoBlockResponseFunction() {
-    when(ctx.getBlockResponseFunction()).thenReturn(null);
-
-    assertThrows(BlockingException.class, this::onRequest);
-
-    verify(ctx, never()).getData(any(RequestContextSlot.class));
-  }
-
-  private void onRequest() {
-    AppSecInterceptor.onRequest(span, false, "http://example.com", request);
-  }
-
-  private static Flow<Void> blockingFlow() {
-    return new Flow<Void>() {
-      @Override
-      public Action getAction() {
-        return RBA;
-      }
-
-      @Override
-      public Void getResult() {
-        return null;
-      }
-    };
-  }
+    private static final Flow.Action.RequestBlockingAction RBA =
+            new Flow.Action.RequestBlockingAction(403, BlockingContentType.AUTO);
+
+    private final AgentTracer.TracerAPI originalTracer = AgentTracer.get();
+
+    private Request request;
+    private RequestContext ctx;
+    private AgentSpan span;
+
+    @BeforeEach
+    void setup() {
+        request = new Request.Builder().url("http://example.com").build();
+        ctx = mock(RequestContext.class);
+        when(ctx.getTraceSegment()).thenReturn(mock(TraceSegment.class));
+
+        span = mock(AgentSpan.class);
+        when(span.getRequestContext()).thenReturn(ctx);
+        when(span.getSpanId()).thenReturn(1L);
+
+        final BiFunction<RequestContext, HttpClientRequest, Flow<Void>> callback =
+                (requestContext, clientRequest) -> blockingFlow();
+        final CallbackProvider cbp = mock(CallbackProvider.class);
+        when(cbp.getCallback(EVENTS.httpClientRequest())).thenReturn(callback);
+
+        final AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
+        when(tracer.getCallbackProvider(any(RequestContextSlot.class))).thenReturn(cbp);
+        AgentTracer.forceRegister(tracer);
+    }
+
+    @AfterEach
+    void tearDown() {
+        AgentTracer.forceRegister(originalTracer);
+    }
+
+    @Test
+    void commitsBlockingResponseWithTheRequestContext() {
+        final BlockResponseFunction brf = mock(BlockResponseFunction.class);
+        when(ctx.getBlockResponseFunction()).thenReturn(brf);
+
+        assertThrows(BlockingException.class, this::onRequest);
+
+        verify(brf, times(1)).tryCommitBlockingResponse(ctx, RBA);
+    }
+
+    @Test
+    void doesNotTouchAppSecSlotWhenThereIsNoBlockResponseFunction() {
+        when(ctx.getBlockResponseFunction()).thenReturn(null);
+
+        assertThrows(BlockingException.class, this::onRequest);
+
+        verify(ctx, never()).getData(any(RequestContextSlot.class));
+    }
+
+    private void onRequest() {
+        AppSecInterceptor.onRequest(span, false, "http://example.com", request);
+    }
+
+    private static Flow<Void> blockingFlow() {
+        return new Flow<Void>() {
+            @Override
+            public Action getAction() {
+                return RBA;
+            }
+
+            @Override
+            public Void getResult() {
+                return null;
+            }
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptorTest.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptorTest.java
index 56b230bb849..df98e5f4a8a 100644
--- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptorTest.java
+++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptorTest.java
@@ -23,46 +23,46 @@
 
 class AppSecInterceptorTest {
 
-  private final AgentTracer.TracerAPI originalTracer = AgentTracer.get();
+    private final AgentTracer.TracerAPI originalTracer = AgentTracer.get();
 
-  private Interceptor.Chain chain;
-  private Request request;
-  private final AppSecInterceptor interceptor = new AppSecInterceptor();
+    private Interceptor.Chain chain;
+    private Request request;
+    private final AppSecInterceptor interceptor = new AppSecInterceptor();
 
-  @BeforeEach
-  void setup() {
-    request = new Request.Builder().url("http://example.com").build();
+    @BeforeEach
+    void setup() {
+        request = new Request.Builder().url("http://example.com").build();
 
-    final RequestContext requestContext = mock(RequestContext.class);
+        final RequestContext requestContext = mock(RequestContext.class);
 
-    final AgentSpan span = mock(AgentSpan.class);
-    when(span.getRequestContext()).thenReturn(requestContext);
-    when(span.getSpanId()).thenReturn(1L);
-    when(span.getTag(Tags.HTTP_URL)).thenReturn("http://example.com");
+        final AgentSpan span = mock(AgentSpan.class);
+        when(span.getRequestContext()).thenReturn(requestContext);
+        when(span.getSpanId()).thenReturn(1L);
+        when(span.getTag(Tags.HTTP_URL)).thenReturn("http://example.com");
 
-    final AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
-    when(tracer.activeSpan()).thenReturn(span);
-    when(tracer.getCallbackProvider(any(RequestContextSlot.class)))
-        .thenReturn(CallbackProvider.CallbackProviderNoop.INSTANCE);
-    AgentTracer.forceRegister(tracer);
+        final AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
+        when(tracer.activeSpan()).thenReturn(span);
+        when(tracer.getCallbackProvider(any(RequestContextSlot.class)))
+                .thenReturn(CallbackProvider.CallbackProviderNoop.INSTANCE);
+        AgentTracer.forceRegister(tracer);
 
-    chain = mock(Interceptor.Chain.class);
-    when(chain.request()).thenReturn(request);
-  }
+        chain = mock(Interceptor.Chain.class);
+        when(chain.request()).thenReturn(request);
+    }
 
-  @AfterEach
-  void tearDown() {
-    AgentTracer.forceRegister(originalTracer);
-  }
+    @AfterEach
+    void tearDown() {
+        AgentTracer.forceRegister(originalTracer);
+    }
 
-  @Test
-  void ioExceptionFromProceedPropagatesWithoutRetry() throws IOException {
-    final IOException failure = new IOException("boom");
-    when(chain.proceed(request)).thenThrow(failure);
+    @Test
+    void ioExceptionFromProceedPropagatesWithoutRetry() throws IOException {
+        final IOException failure = new IOException("boom");
+        when(chain.proceed(request)).thenThrow(failure);
 
-    final IOException thrown = assertThrows(IOException.class, () -> interceptor.intercept(chain));
+        final IOException thrown = assertThrows(IOException.class, () -> interceptor.intercept(chain));
 
-    assertSame(failure, thrown);
-    verify(chain, times(1)).proceed(request);
-  }
+        assertSame(failure, thrown);
+        verify(chain, times(1)).proceed(request);
+    }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionDecorator.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionDecorator.java
index f1abd77c45c..eeb7cf6fda0 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionDecorator.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionDecorator.java
@@ -30,245 +30,234 @@
 import java.util.stream.Collectors;
 
 public class ChatCompletionDecorator {
-  public static final ChatCompletionDecorator DECORATE = new ChatCompletionDecorator();
-  private static final CharSequence CHAT_COMPLETIONS_CREATE =
-      UTF8BytesString.create("createChatCompletion");
+    public static final ChatCompletionDecorator DECORATE = new ChatCompletionDecorator();
+    private static final CharSequence CHAT_COMPLETIONS_CREATE = UTF8BytesString.create("createChatCompletion");
 
-  private final boolean llmObsEnabled = Config.get().isLlmObsEnabled();
+    private final boolean llmObsEnabled = Config.get().isLlmObsEnabled();
 
-  public void withChatCompletionCreateParams(
-      AgentSpan span, ChatCompletionCreateParams params, boolean stream) {
-    span.setResourceName(CHAT_COMPLETIONS_CREATE);
-    span.setTag(CommonTags.OPENAI_REQUEST_ENDPOINT, "/v1/chat/completions");
-    if (params == null) {
-      return;
-    }
-    Optional<String> modelName = extractChatModelName(params);
-    modelName.ifPresent(str -> span.setTag(CommonTags.OPENAI_REQUEST_MODEL, str));
+    public void withChatCompletionCreateParams(AgentSpan span, ChatCompletionCreateParams params, boolean stream) {
+        span.setResourceName(CHAT_COMPLETIONS_CREATE);
+        span.setTag(CommonTags.OPENAI_REQUEST_ENDPOINT, "/v1/chat/completions");
+        if (params == null) {
+            return;
+        }
+        Optional<String> modelName = extractChatModelName(params);
+        modelName.ifPresent(str -> span.setTag(CommonTags.OPENAI_REQUEST_MODEL, str));
 
-    if (!llmObsEnabled) {
-      return;
-    }
+        if (!llmObsEnabled) {
+            return;
+        }
 
-    // Keep model_name and output shape stable on error paths where no response is available.
-    modelName.ifPresent(
-        str -> {
-          span.setTag(CommonTags.MODEL_NAME, str);
-          span.setTag(CommonTags.OUTPUT, Collections.singletonList(LLMObs.LLMMessage.from("", "")));
+        // Keep model_name and output shape stable on error paths where no response is available.
+        modelName.ifPresent(str -> {
+            span.setTag(CommonTags.MODEL_NAME, str);
+            span.setTag(CommonTags.OUTPUT, Collections.singletonList(LLMObs.LLMMessage.from("", "")));
         });
 
-    span.setTag(CommonTags.SPAN_KIND, Tags.LLMOBS_LLM_SPAN_KIND);
+        span.setTag(CommonTags.SPAN_KIND, Tags.LLMOBS_LLM_SPAN_KIND);
 
-    span.setTag(
-        CommonTags.INPUT,
-        params.messages().stream()
-            .map(ChatCompletionDecorator::llmMessage)
-            .filter(Objects::nonNull)
-            .collect(Collectors.toList()));
+        span.setTag(
+                CommonTags.INPUT,
+                params.messages().stream()
+                        .map(ChatCompletionDecorator::llmMessage)
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toList()));
 
-    Map<String, Object> metadata = new HashMap<>();
-    // maxTokens is deprecated but integration tests missing to provide maxCompletionTokens
-    params.maxTokens().ifPresent(v -> metadata.put("max_tokens", v));
-    params.temperature().ifPresent(v -> metadata.put("temperature", v));
-    metadata.put("stream", stream);
-    params
-        .streamOptions()
-        .ifPresent(
-            v -> {
-              if (v.includeUsage().orElse(false)) {
+        Map<String, Object> metadata = new HashMap<>();
+        // maxTokens is deprecated but integration tests missing to provide maxCompletionTokens
+        params.maxTokens().ifPresent(v -> metadata.put("max_tokens", v));
+        params.temperature().ifPresent(v -> metadata.put("temperature", v));
+        metadata.put("stream", stream);
+        params.streamOptions().ifPresent(v -> {
+            if (v.includeUsage().orElse(false)) {
                 metadata.put("stream_options", Collections.singletonMap("include_usage", true));
-              }
-            });
-    params.topP().ifPresent(v -> metadata.put("top_p", v));
-    params.frequencyPenalty().ifPresent(v -> metadata.put("frequency_penalty", v));
-    params.presencePenalty().ifPresent(v -> metadata.put("presence_penalty", v));
-    params.n().ifPresent(v -> metadata.put("n", v));
-    params.seed().ifPresent(v -> metadata.put("seed", v));
-    span.setTag(CommonTags.METADATA, metadata);
-    params
-        .toolChoice()
-        .ifPresent(
-            toolChoice -> {
-              String choice = null;
-              if (toolChoice.isAuto()) {
+            }
+        });
+        params.topP().ifPresent(v -> metadata.put("top_p", v));
+        params.frequencyPenalty().ifPresent(v -> metadata.put("frequency_penalty", v));
+        params.presencePenalty().ifPresent(v -> metadata.put("presence_penalty", v));
+        params.n().ifPresent(v -> metadata.put("n", v));
+        params.seed().ifPresent(v -> metadata.put("seed", v));
+        span.setTag(CommonTags.METADATA, metadata);
+        params.toolChoice().ifPresent(toolChoice -> {
+            String choice = null;
+            if (toolChoice.isAuto()) {
                 choice = "auto";
-              } else if (toolChoice.isAllowedToolChoice()) {
+            } else if (toolChoice.isAllowedToolChoice()) {
                 choice = "allowed_tools";
-              } else if (toolChoice.isNamedToolChoice()) {
+            } else if (toolChoice.isNamedToolChoice()) {
                 choice = "function";
-              } else if (toolChoice.isNamedToolChoiceCustom()) {
+            } else if (toolChoice.isNamedToolChoiceCustom()) {
                 choice = "custom";
-              }
-              if (choice != null) {
+            }
+            if (choice != null) {
                 metadata.put("tool_choice", choice);
-              }
-            });
+            }
+        });
 
-    List<ChatCompletionTool> tools = params._tools().asKnown().orElse(Collections.emptyList());
-    if (!tools.isEmpty()) {
-      span.setTag(CommonTags.TOOL_DEFINITIONS, extractToolDefinitions(tools));
+        List<ChatCompletionTool> tools = params._tools().asKnown().orElse(Collections.emptyList());
+        if (!tools.isEmpty()) {
+            span.setTag(CommonTags.TOOL_DEFINITIONS, extractToolDefinitions(tools));
+        }
     }
-  }
 
-  private Optional<String> extractChatModelName(ChatCompletionCreateParams params) {
-    Optional<String> modelName =
-        params._model().asKnown().flatMap(model -> model._value().asString());
-    return modelName.isPresent() ? modelName : params._model().asString();
-  }
+    private Optional<String> extractChatModelName(ChatCompletionCreateParams params) {
+        Optional<String> modelName =
+                params._model().asKnown().flatMap(model -> model._value().asString());
+        return modelName.isPresent() ? modelName : params._model().asString();
+    }
 
-  private List<Map<String, Object>> extractToolDefinitions(List<ChatCompletionTool> tools) {
-    List<Map<String, Object>> toolDefinitions = new ArrayList<>();
-    for (ChatCompletionTool tool : tools) {
-      if (tool.isFunction()) {
-        Map<String, Object> toolDef = extractFunctionToolDef(tool.asFunction());
-        if (toolDef != null) {
-          toolDefinitions.add(toolDef);
+    private List<Map<String, Object>> extractToolDefinitions(List<ChatCompletionTool> tools) {
+        List<Map<String, Object>> toolDefinitions = new ArrayList<>();
+        for (ChatCompletionTool tool : tools) {
+            if (tool.isFunction()) {
+                Map<String, Object> toolDef = extractFunctionToolDef(tool.asFunction());
+                if (toolDef != null) {
+                    toolDefinitions.add(toolDef);
+                }
+            }
         }
-      }
+        return toolDefinitions;
     }
-    return toolDefinitions;
-  }
 
-  private static Map<String, Object> extractFunctionToolDef(ChatCompletionFunctionTool funcTool) {
-    // Try typed access first (works when built programmatically)
-    Optional<FunctionDefinition> funcDefOpt = funcTool._function().asKnown();
-    if (funcDefOpt.isPresent()) {
-      FunctionDefinition funcDef = funcDefOpt.get();
-      Map<String, Object> toolDef = new HashMap<>();
-      toolDef.put("name", funcDef.name());
-      funcDef.description().ifPresent(desc -> toolDef.put("description", desc));
-      funcDef
-          .parameters()
-          .ifPresent(
-              params ->
-                  toolDef.put("schema", jsonValueMapToObject(params._additionalProperties())));
-      return toolDef;
-    }
+    private static Map<String, Object> extractFunctionToolDef(ChatCompletionFunctionTool funcTool) {
+        // Try typed access first (works when built programmatically)
+        Optional<FunctionDefinition> funcDefOpt = funcTool._function().asKnown();
+        if (funcDefOpt.isPresent()) {
+            FunctionDefinition funcDef = funcDefOpt.get();
+            Map<String, Object> toolDef = new HashMap<>();
+            toolDef.put("name", funcDef.name());
+            funcDef.description().ifPresent(desc -> toolDef.put("description", desc));
+            funcDef.parameters()
+                    .ifPresent(params -> toolDef.put("schema", jsonValueMapToObject(params._additionalProperties())));
+            return toolDef;
+        }
 
-    // Fall back to raw JSON extraction (when deserialized from HTTP request)
-    Optional<JsonValue> rawOpt = funcTool._function().asUnknown();
-    if (!rawOpt.isPresent()) {
-      return null;
-    }
-    Optional<Map<String, JsonValue>> objOpt = rawOpt.get().asObject();
-    if (!objOpt.isPresent()) {
-      return null;
-    }
-    Map<String, JsonValue> obj = objOpt.get();
-    JsonValue nameValue = obj.get("name");
-    if (nameValue == null) {
-      return null;
-    }
-    Optional<String> nameOpt = nameValue.asString();
-    if (!nameOpt.isPresent()) {
-      return null;
-    }
-    Map<String, Object> toolDef = new HashMap<>();
-    toolDef.put("name", nameOpt.get());
-    JsonValue descValue = obj.get("description");
-    if (descValue != null) {
-      descValue.asString().ifPresent(desc -> toolDef.put("description", desc));
-    }
-    JsonValue paramsValue = obj.get("parameters");
-    if (paramsValue != null) {
-      Object schema = jsonValueToObject(paramsValue);
-      if (schema != null) {
-        toolDef.put("schema", schema);
-      }
+        // Fall back to raw JSON extraction (when deserialized from HTTP request)
+        Optional<JsonValue> rawOpt = funcTool._function().asUnknown();
+        if (!rawOpt.isPresent()) {
+            return null;
+        }
+        Optional<Map<String, JsonValue>> objOpt = rawOpt.get().asObject();
+        if (!objOpt.isPresent()) {
+            return null;
+        }
+        Map<String, JsonValue> obj = objOpt.get();
+        JsonValue nameValue = obj.get("name");
+        if (nameValue == null) {
+            return null;
+        }
+        Optional<String> nameOpt = nameValue.asString();
+        if (!nameOpt.isPresent()) {
+            return null;
+        }
+        Map<String, Object> toolDef = new HashMap<>();
+        toolDef.put("name", nameOpt.get());
+        JsonValue descValue = obj.get("description");
+        if (descValue != null) {
+            descValue.asString().ifPresent(desc -> toolDef.put("description", desc));
+        }
+        JsonValue paramsValue = obj.get("parameters");
+        if (paramsValue != null) {
+            Object schema = jsonValueToObject(paramsValue);
+            if (schema != null) {
+                toolDef.put("schema", schema);
+            }
+        }
+        return toolDef;
     }
-    return toolDef;
-  }
 
-  private static LLMObs.LLMMessage llmMessage(ChatCompletionMessageParam m) {
-    if (m.isAssistant()) {
-      return LLMObs.LLMMessage.from(
-          "assistant", m.asAssistant().content().map(v -> v.text().orElse(null)).orElse(null));
-    } else if (m.isDeveloper()) {
-      return LLMObs.LLMMessage.from("developer", m.asDeveloper().content().text().orElse(null));
-    } else if (m.isSystem()) {
-      return LLMObs.LLMMessage.from("system", m.asSystem().content().text().orElse(null));
-    } else if (m.isTool()) {
-      return LLMObs.LLMMessage.from("tool", m.asTool().content().text().orElse(null));
-    } else if (m.isUser()) {
-      return LLMObs.LLMMessage.from("user", m.asUser().content().text().orElse(null));
+    private static LLMObs.LLMMessage llmMessage(ChatCompletionMessageParam m) {
+        if (m.isAssistant()) {
+            return LLMObs.LLMMessage.from(
+                    "assistant",
+                    m.asAssistant().content().map(v -> v.text().orElse(null)).orElse(null));
+        } else if (m.isDeveloper()) {
+            return LLMObs.LLMMessage.from(
+                    "developer", m.asDeveloper().content().text().orElse(null));
+        } else if (m.isSystem()) {
+            return LLMObs.LLMMessage.from(
+                    "system", m.asSystem().content().text().orElse(null));
+        } else if (m.isTool()) {
+            return LLMObs.LLMMessage.from("tool", m.asTool().content().text().orElse(null));
+        } else if (m.isUser()) {
+            return LLMObs.LLMMessage.from("user", m.asUser().content().text().orElse(null));
+        }
+        return null;
     }
-    return null;
-  }
-
-  public void withChatCompletion(AgentSpan span, ChatCompletion completion) {
-    String modelName = completion._model().asString().orElse(null);
-    span.setTag(CommonTags.OPENAI_RESPONSE_MODEL, modelName);
-    span.setTag(CommonTags.MODEL_NAME, modelName);
 
-    completion._usage().asKnown().ifPresent(usage -> withUsage(span, usage));
-
-    if (!llmObsEnabled) {
-      return;
-    }
+    public void withChatCompletion(AgentSpan span, ChatCompletion completion) {
+        String modelName = completion._model().asString().orElse(null);
+        span.setTag(CommonTags.OPENAI_RESPONSE_MODEL, modelName);
+        span.setTag(CommonTags.MODEL_NAME, modelName);
 
-    List<LLMObs.LLMMessage> output =
-        completion._choices().asKnown().orElse(Collections.emptyList()).stream()
-            .map(ChatCompletionDecorator::llmMessage)
-            .filter(Objects::nonNull)
-            .collect(Collectors.toList());
-    span.setTag(CommonTags.OUTPUT, output);
-  }
+        completion._usage().asKnown().ifPresent(usage -> withUsage(span, usage));
 
-  private static void withUsage(AgentSpan span, CompletionUsage usage) {
-    TokenUsage.set(span, CommonTags.INPUT_TOKENS, usage.promptTokens());
-    TokenUsage.set(span, CommonTags.OUTPUT_TOKENS, usage.completionTokens());
-    TokenUsage.set(span, CommonTags.TOTAL_TOKENS, usage.totalTokens());
-    usage
-        .promptTokensDetails()
-        .flatMap(details -> details.cachedTokens())
-        .ifPresent(v -> TokenUsage.set(span, CommonTags.CACHE_READ_INPUT_TOKENS, v));
-  }
+        if (!llmObsEnabled) {
+            return;
+        }
 
-  private static LLMObs.LLMMessage llmMessage(ChatCompletion.Choice choice) {
-    Optional<ChatCompletionMessage> msgOpt = choice._message().asKnown();
-    if (!msgOpt.isPresent()) {
-      return null;
+        List<LLMObs.LLMMessage> output = completion._choices().asKnown().orElse(Collections.emptyList()).stream()
+                .map(ChatCompletionDecorator::llmMessage)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+        span.setTag(CommonTags.OUTPUT, output);
     }
 
-    ChatCompletionMessage msg = msgOpt.get();
-    Optional<String> roleOpt = msg._role().asString();
-    if (!roleOpt.isPresent()) {
-      return null;
+    private static void withUsage(AgentSpan span, CompletionUsage usage) {
+        TokenUsage.set(span, CommonTags.INPUT_TOKENS, usage.promptTokens());
+        TokenUsage.set(span, CommonTags.OUTPUT_TOKENS, usage.completionTokens());
+        TokenUsage.set(span, CommonTags.TOTAL_TOKENS, usage.totalTokens());
+        usage.promptTokensDetails()
+                .flatMap(details -> details.cachedTokens())
+                .ifPresent(v -> TokenUsage.set(span, CommonTags.CACHE_READ_INPUT_TOKENS, v));
     }
-    String role = roleOpt.get();
-    String content = msg._content().asString().orElse("");
 
-    List<ChatCompletionMessageToolCall> toolCallsOpt =
-        msg._toolCalls().asKnown().orElse(Collections.emptyList());
-    if (!toolCallsOpt.isEmpty()) {
-      List<LLMObs.ToolCall> toolCalls = new ArrayList<>();
-      for (ChatCompletionMessageToolCall toolCall : toolCallsOpt) {
-        LLMObs.ToolCall llmObsToolCall = ToolCallExtractor.getToolCall(toolCall);
-        if (llmObsToolCall != null) {
-          toolCalls.add(llmObsToolCall);
+    private static LLMObs.LLMMessage llmMessage(ChatCompletion.Choice choice) {
+        Optional<ChatCompletionMessage> msgOpt = choice._message().asKnown();
+        if (!msgOpt.isPresent()) {
+            return null;
         }
-      }
 
-      if (!toolCalls.isEmpty()) {
-        return LLMObs.LLMMessage.from(role, content, toolCalls);
-      }
-    }
+        ChatCompletionMessage msg = msgOpt.get();
+        Optional<String> roleOpt = msg._role().asString();
+        if (!roleOpt.isPresent()) {
+            return null;
+        }
+        String role = roleOpt.get();
+        String content = msg._content().asString().orElse("");
+
+        List<ChatCompletionMessageToolCall> toolCallsOpt =
+                msg._toolCalls().asKnown().orElse(Collections.emptyList());
+        if (!toolCallsOpt.isEmpty()) {
+            List<LLMObs.ToolCall> toolCalls = new ArrayList<>();
+            for (ChatCompletionMessageToolCall toolCall : toolCallsOpt) {
+                LLMObs.ToolCall llmObsToolCall = ToolCallExtractor.getToolCall(toolCall);
+                if (llmObsToolCall != null) {
+                    toolCalls.add(llmObsToolCall);
+                }
+            }
 
-    return LLMObs.LLMMessage.from(role, content);
-  }
+            if (!toolCalls.isEmpty()) {
+                return LLMObs.LLMMessage.from(role, content, toolCalls);
+            }
+        }
 
-  public void withChatCompletionChunks(AgentSpan span, List<ChatCompletionChunk> chunks) {
-    if (!llmObsEnabled) {
-      for (ChatCompletionChunk chunk : chunks) {
-        chunk._usage().asKnown().ifPresent(usage -> withUsage(span, usage));
-      }
-      return;
+        return LLMObs.LLMMessage.from(role, content);
     }
-    ChatCompletionAccumulator accumulator = ChatCompletionAccumulator.create();
-    for (ChatCompletionChunk chunk : chunks) {
-      accumulator.accumulate(chunk);
+
+    public void withChatCompletionChunks(AgentSpan span, List<ChatCompletionChunk> chunks) {
+        if (!llmObsEnabled) {
+            for (ChatCompletionChunk chunk : chunks) {
+                chunk._usage().asKnown().ifPresent(usage -> withUsage(span, usage));
+            }
+            return;
+        }
+        ChatCompletionAccumulator accumulator = ChatCompletionAccumulator.create();
+        for (ChatCompletionChunk chunk : chunks) {
+            accumulator.accumulate(chunk);
+        }
+        ChatCompletion chatCompletion = accumulator.chatCompletion();
+        withChatCompletion(span, chatCompletion);
     }
-    ChatCompletion chatCompletion = accumulator.chatCompletion();
-    withChatCompletion(span, chatCompletion);
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionModule.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionModule.java
index c94991baecc..f4438ff4909 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionModule.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionModule.java
@@ -8,14 +8,13 @@
 
 @AutoService(InstrumenterModule.class)
 public class ChatCompletionModule extends InstrumenterModule.Tracing {
-  public ChatCompletionModule() {
-    super("openai-java");
-  }
+    public ChatCompletionModule() {
+        super("openai-java");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new ChatCompletionServiceAsyncInstrumentation(),
-        new ChatCompletionServiceInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(
+                new ChatCompletionServiceAsyncInstrumentation(), new ChatCompletionServiceInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceAsyncInstrumentation.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceAsyncInstrumentation.java
index e8536d554da..68d1a33bd2e 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceAsyncInstrumentation.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceAsyncInstrumentation.java
@@ -24,92 +24,84 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class ChatCompletionServiceAsyncInstrumentation
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasMethodAdvice,
-        Instrumenter.WithTypeStructure {
-  @Override
-  public String instrumentedType() {
-    return "com.openai.services.async.chat.ChatCompletionServiceAsyncImpl$WithRawResponseImpl";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("create"))
-            .and(
-                takesArgument(
-                    0, named("com.openai.models.chat.completions.ChatCompletionCreateParams")))
-            .and(returns(named(CompletableFuture.class.getName()))),
-        getClass().getName() + "$CreateAdvice");
-
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("createStreaming"))
-            .and(
-                takesArgument(
-                    0, named("com.openai.models.chat.completions.ChatCompletionCreateParams")))
-            .and(returns(named(CompletableFuture.class.getName()))),
-        getClass().getName() + "$CreateStreamingAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, Instrumenter.WithTypeStructure {
+    @Override
+    public String instrumentedType() {
+        return "com.openai.services.async.chat.ChatCompletionServiceAsyncImpl$WithRawResponseImpl";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("clientOptions"));
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("create"))
+                        .and(takesArgument(0, named("com.openai.models.chat.completions.ChatCompletionCreateParams")))
+                        .and(returns(named(CompletableFuture.class.getName()))),
+                getClass().getName() + "$CreateAdvice");
 
-  public static class CreateAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.Argument(0) final ChatCompletionCreateParams params,
-        @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
-      AgentSpan span = DECORATE.startSpan(clientOptions);
-      ChatCompletionDecorator.DECORATE.withChatCompletionCreateParams(span, params, false);
-      return activateSpan(span);
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("createStreaming"))
+                        .and(takesArgument(0, named("com.openai.models.chat.completions.ChatCompletionCreateParams")))
+                        .and(returns(named(CompletableFuture.class.getName()))),
+                getClass().getName() + "$CreateStreamingAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return(readOnly = false) CompletableFuture<HttpResponseFor<ChatCompletion>> future,
-        @Advice.Thrown final Throwable err) {
-      AgentSpan span = spanFromScope(scope);
-      if (err != null || future == null) {
-        DECORATE.finishSpan(span, err);
-      } else {
-        future =
-            HttpResponseWrapper.wrapFuture(
-                future, span, ChatCompletionDecorator.DECORATE::withChatCompletion);
-      }
-      scope.close();
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("clientOptions"));
     }
-  }
 
-  public static class CreateStreamingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.Argument(0) final ChatCompletionCreateParams params,
-        @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
-      AgentSpan span = DECORATE.startSpan(clientOptions);
-      ChatCompletionDecorator.DECORATE.withChatCompletionCreateParams(span, params, true);
-      return activateSpan(span);
+    public static class CreateAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.Argument(0) final ChatCompletionCreateParams params,
+                @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
+            AgentSpan span = DECORATE.startSpan(clientOptions);
+            ChatCompletionDecorator.DECORATE.withChatCompletionCreateParams(span, params, false);
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return(readOnly = false) CompletableFuture<HttpResponseFor<ChatCompletion>> future,
+                @Advice.Thrown final Throwable err) {
+            AgentSpan span = spanFromScope(scope);
+            if (err != null || future == null) {
+                DECORATE.finishSpan(span, err);
+            } else {
+                future = HttpResponseWrapper.wrapFuture(
+                        future, span, ChatCompletionDecorator.DECORATE::withChatCompletion);
+            }
+            scope.close();
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return(readOnly = false)
-            CompletableFuture<HttpResponseFor<StreamResponse<ChatCompletionChunk>>> future,
-        @Advice.Thrown final Throwable err) {
-      AgentSpan span = spanFromScope(scope);
-      if (err != null || future == null) {
-        DECORATE.finishSpan(span, err);
-      } else {
-        future =
-            HttpStreamResponseWrapper.wrapFuture(
-                future, span, ChatCompletionDecorator.DECORATE::withChatCompletionChunks);
-      }
-      scope.close();
+    public static class CreateStreamingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.Argument(0) final ChatCompletionCreateParams params,
+                @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
+            AgentSpan span = DECORATE.startSpan(clientOptions);
+            ChatCompletionDecorator.DECORATE.withChatCompletionCreateParams(span, params, true);
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return(readOnly = false)
+                        CompletableFuture<HttpResponseFor<StreamResponse<ChatCompletionChunk>>> future,
+                @Advice.Thrown final Throwable err) {
+            AgentSpan span = spanFromScope(scope);
+            if (err != null || future == null) {
+                DECORATE.finishSpan(span, err);
+            } else {
+                future = HttpStreamResponseWrapper.wrapFuture(
+                        future, span, ChatCompletionDecorator.DECORATE::withChatCompletionChunks);
+            }
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceInstrumentation.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceInstrumentation.java
index 7d863dcd4b8..fb9de08c4bd 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceInstrumentation.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceInstrumentation.java
@@ -23,93 +23,84 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class ChatCompletionServiceInstrumentation
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasMethodAdvice,
-        Instrumenter.WithTypeStructure {
-  @Override
-  public String instrumentedType() {
-    return "com.openai.services.blocking.chat.ChatCompletionServiceImpl$WithRawResponseImpl";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("create"))
-            .and(
-                takesArgument(
-                    0, named("com.openai.models.chat.completions.ChatCompletionCreateParams")))
-            .and(returns(named("com.openai.core.http.HttpResponseFor"))),
-        getClass().getName() + "$CreateAdvice");
-
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("createStreaming"))
-            .and(
-                takesArgument(
-                    0, named("com.openai.models.chat.completions.ChatCompletionCreateParams")))
-            .and(returns(named("com.openai.core.http.HttpResponseFor"))),
-        getClass().getName() + "$CreateStreamingAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, Instrumenter.WithTypeStructure {
+    @Override
+    public String instrumentedType() {
+        return "com.openai.services.blocking.chat.ChatCompletionServiceImpl$WithRawResponseImpl";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("clientOptions"));
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("create"))
+                        .and(takesArgument(0, named("com.openai.models.chat.completions.ChatCompletionCreateParams")))
+                        .and(returns(named("com.openai.core.http.HttpResponseFor"))),
+                getClass().getName() + "$CreateAdvice");
 
-  public static class CreateAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.Argument(0) final ChatCompletionCreateParams params,
-        @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
-      AgentSpan span = DECORATE.startSpan(clientOptions);
-      ChatCompletionDecorator.DECORATE.withChatCompletionCreateParams(span, params, false);
-      return activateSpan(span);
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("createStreaming"))
+                        .and(takesArgument(0, named("com.openai.models.chat.completions.ChatCompletionCreateParams")))
+                        .and(returns(named("com.openai.core.http.HttpResponseFor"))),
+                getClass().getName() + "$CreateStreamingAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return(readOnly = false) HttpResponseFor<ChatCompletion> response,
-        @Advice.Thrown final Throwable err) {
-      AgentSpan span = spanFromScope(scope);
-      if (err != null || response == null) {
-        DECORATE.finishSpan(span, err);
-      } else {
-        response =
-            HttpResponseWrapper.wrap(
-                response, span, ChatCompletionDecorator.DECORATE::withChatCompletion);
-      }
-      scope.close();
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("clientOptions"));
     }
-  }
 
-  public static class CreateStreamingAdvice {
+    public static class CreateAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.Argument(0) final ChatCompletionCreateParams params,
+                @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
+            AgentSpan span = DECORATE.startSpan(clientOptions);
+            ChatCompletionDecorator.DECORATE.withChatCompletionCreateParams(span, params, false);
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.Argument(0) final ChatCompletionCreateParams params,
-        @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
-      AgentSpan span = DECORATE.startSpan(clientOptions);
-      ChatCompletionDecorator.DECORATE.withChatCompletionCreateParams(span, params, true);
-      return activateSpan(span);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return(readOnly = false) HttpResponseFor<ChatCompletion> response,
+                @Advice.Thrown final Throwable err) {
+            AgentSpan span = spanFromScope(scope);
+            if (err != null || response == null) {
+                DECORATE.finishSpan(span, err);
+            } else {
+                response =
+                        HttpResponseWrapper.wrap(response, span, ChatCompletionDecorator.DECORATE::withChatCompletion);
+            }
+            scope.close();
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return(readOnly = false)
-            HttpResponseFor<StreamResponse<ChatCompletionChunk>> response,
-        @Advice.Thrown final Throwable err) {
-      AgentSpan span = spanFromScope(scope);
-      if (err != null || response == null) {
-        DECORATE.finishSpan(span, err);
-      } else {
-        response =
-            HttpStreamResponseWrapper.wrap(
-                response, span, ChatCompletionDecorator.DECORATE::withChatCompletionChunks);
-      }
-      scope.close();
+    public static class CreateStreamingAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.Argument(0) final ChatCompletionCreateParams params,
+                @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
+            AgentSpan span = DECORATE.startSpan(clientOptions);
+            ChatCompletionDecorator.DECORATE.withChatCompletionCreateParams(span, params, true);
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return(readOnly = false) HttpResponseFor<StreamResponse<ChatCompletionChunk>> response,
+                @Advice.Thrown final Throwable err) {
+            AgentSpan span = spanFromScope(scope);
+            if (err != null || response == null) {
+                DECORATE.finishSpan(span, err);
+            } else {
+                response = HttpStreamResponseWrapper.wrap(
+                        response, span, ChatCompletionDecorator.DECORATE::withChatCompletionChunks);
+            }
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CommonTags.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CommonTags.java
index ab23b0131c6..08f7cf4340c 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CommonTags.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CommonTags.java
@@ -3,49 +3,49 @@
 import datadog.trace.api.llmobs.LLMObsTags;
 
 interface CommonTags {
-  String OPENAI_API_BASE = "openai.api_base";
-  String OPENAI_ORGANIZATION = "openai.organization";
-  String OPENAI_REQUEST_ENDPOINT = "openai.request.endpoint";
-  String OPENAI_REQUEST_METHOD = "openai.request.method";
-  String OPENAI_REQUEST_MODEL = "openai.request.model";
-  String OPENAI_RESPONSE_MODEL = "openai.response.model";
-
-  String TAG_PREFIX = "_ml_obs_tag.";
-  String SPAN_KIND = TAG_PREFIX + "span.kind";
-  String INPUT = TAG_PREFIX + "input";
-  String OUTPUT = TAG_PREFIX + "output";
-  String METADATA = TAG_PREFIX + LLMObsTags.METADATA;
-  String MODEL_NAME = TAG_PREFIX + LLMObsTags.MODEL_NAME;
-  String MODEL_PROVIDER = TAG_PREFIX + LLMObsTags.MODEL_PROVIDER;
-
-  String ML_APP = TAG_PREFIX + LLMObsTags.ML_APP;
-  String INTEGRATION = TAG_PREFIX + "integration";
-  String VERSION = TAG_PREFIX + "version";
-  String DDTRACE_VERSION = TAG_PREFIX + "ddtrace.version";
-  String SOURCE = TAG_PREFIX + "source";
-
-  String ERROR = TAG_PREFIX + "error";
-  String ERROR_TYPE = TAG_PREFIX + "error_type";
-
-  String ENV = TAG_PREFIX + "env";
-  String SERVICE = TAG_PREFIX + "service";
-  String PARENT_ID = TAG_PREFIX + "parent_id";
-  String SESSION_ID = TAG_PREFIX + LLMObsTags.SESSION_ID;
-  String AGENT_VERSION = TAG_PREFIX + LLMObsTags.AGENT_VERSION;
-  String SAMPLE_RATE = TAG_PREFIX + "sample_rate";
-  String SAMPLING_DECISION = TAG_PREFIX + "sampling_decision";
-  String PAGENT_SPAN_ID = TAG_PREFIX + LLMObsTags.PAGENT_SPAN_ID;
-  String PAGENT_NAME = TAG_PREFIX + LLMObsTags.PAGENT_NAME;
-
-  String TOOL_DEFINITIONS = TAG_PREFIX + "tool_definitions";
-
-  String METRIC_PREFIX = "_ml_obs_metric.";
-  String INPUT_TOKENS = METRIC_PREFIX + "input_tokens";
-  String OUTPUT_TOKENS = METRIC_PREFIX + "output_tokens";
-  String TOTAL_TOKENS = METRIC_PREFIX + "total_tokens";
-  String REASONING_OUTPUT_TOKENS = METRIC_PREFIX + "reasoning_output_tokens";
-  String CACHE_READ_INPUT_TOKENS = METRIC_PREFIX + "cache_read_input_tokens";
-
-  String REQUEST_REASONING = "_ml_obs_request.reasoning";
-  String REQUEST_PROMPT = "_ml_obs_request.prompt";
+    String OPENAI_API_BASE = "openai.api_base";
+    String OPENAI_ORGANIZATION = "openai.organization";
+    String OPENAI_REQUEST_ENDPOINT = "openai.request.endpoint";
+    String OPENAI_REQUEST_METHOD = "openai.request.method";
+    String OPENAI_REQUEST_MODEL = "openai.request.model";
+    String OPENAI_RESPONSE_MODEL = "openai.response.model";
+
+    String TAG_PREFIX = "_ml_obs_tag.";
+    String SPAN_KIND = TAG_PREFIX + "span.kind";
+    String INPUT = TAG_PREFIX + "input";
+    String OUTPUT = TAG_PREFIX + "output";
+    String METADATA = TAG_PREFIX + LLMObsTags.METADATA;
+    String MODEL_NAME = TAG_PREFIX + LLMObsTags.MODEL_NAME;
+    String MODEL_PROVIDER = TAG_PREFIX + LLMObsTags.MODEL_PROVIDER;
+
+    String ML_APP = TAG_PREFIX + LLMObsTags.ML_APP;
+    String INTEGRATION = TAG_PREFIX + "integration";
+    String VERSION = TAG_PREFIX + "version";
+    String DDTRACE_VERSION = TAG_PREFIX + "ddtrace.version";
+    String SOURCE = TAG_PREFIX + "source";
+
+    String ERROR = TAG_PREFIX + "error";
+    String ERROR_TYPE = TAG_PREFIX + "error_type";
+
+    String ENV = TAG_PREFIX + "env";
+    String SERVICE = TAG_PREFIX + "service";
+    String PARENT_ID = TAG_PREFIX + "parent_id";
+    String SESSION_ID = TAG_PREFIX + LLMObsTags.SESSION_ID;
+    String AGENT_VERSION = TAG_PREFIX + LLMObsTags.AGENT_VERSION;
+    String SAMPLE_RATE = TAG_PREFIX + "sample_rate";
+    String SAMPLING_DECISION = TAG_PREFIX + "sampling_decision";
+    String PAGENT_SPAN_ID = TAG_PREFIX + LLMObsTags.PAGENT_SPAN_ID;
+    String PAGENT_NAME = TAG_PREFIX + LLMObsTags.PAGENT_NAME;
+
+    String TOOL_DEFINITIONS = TAG_PREFIX + "tool_definitions";
+
+    String METRIC_PREFIX = "_ml_obs_metric.";
+    String INPUT_TOKENS = METRIC_PREFIX + "input_tokens";
+    String OUTPUT_TOKENS = METRIC_PREFIX + "output_tokens";
+    String TOTAL_TOKENS = METRIC_PREFIX + "total_tokens";
+    String REASONING_OUTPUT_TOKENS = METRIC_PREFIX + "reasoning_output_tokens";
+    String CACHE_READ_INPUT_TOKENS = METRIC_PREFIX + "cache_read_input_tokens";
+
+    String REQUEST_REASONING = "_ml_obs_request.reasoning";
+    String REQUEST_PROMPT = "_ml_obs_request.prompt";
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionDecorator.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionDecorator.java
index fe78020e4ec..33160979026 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionDecorator.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionDecorator.java
@@ -16,131 +16,111 @@
 import java.util.stream.Collectors;
 
 public class CompletionDecorator {
-  public static final CompletionDecorator DECORATE = new CompletionDecorator();
+    public static final CompletionDecorator DECORATE = new CompletionDecorator();
 
-  private static final CharSequence COMPLETIONS_CREATE = UTF8BytesString.create("createCompletion");
+    private static final CharSequence COMPLETIONS_CREATE = UTF8BytesString.create("createCompletion");
 
-  private final boolean llmObsEnabled = Config.get().isLlmObsEnabled();
+    private final boolean llmObsEnabled = Config.get().isLlmObsEnabled();
 
-  public void withCompletionCreateParams(AgentSpan span, CompletionCreateParams params) {
-    span.setResourceName(COMPLETIONS_CREATE);
-    span.setTag(CommonTags.OPENAI_REQUEST_ENDPOINT, "/v1/completions");
-    if (params == null) {
-      return;
-    }
-    Optional<String> modelName = extractCompletionModelName(params);
-    modelName.ifPresent(str -> span.setTag(CommonTags.OPENAI_REQUEST_MODEL, str));
+    public void withCompletionCreateParams(AgentSpan span, CompletionCreateParams params) {
+        span.setResourceName(COMPLETIONS_CREATE);
+        span.setTag(CommonTags.OPENAI_REQUEST_ENDPOINT, "/v1/completions");
+        if (params == null) {
+            return;
+        }
+        Optional<String> modelName = extractCompletionModelName(params);
+        modelName.ifPresent(str -> span.setTag(CommonTags.OPENAI_REQUEST_MODEL, str));
 
-    if (!llmObsEnabled) {
-      return;
-    }
+        if (!llmObsEnabled) {
+            return;
+        }
 
-    // Keep model_name and output shape stable on error paths where no response is available.
-    modelName.ifPresent(
-        str -> {
-          span.setTag(CommonTags.MODEL_NAME, str);
-          span.setTag(CommonTags.OUTPUT, Collections.singletonList(LLMObs.LLMMessage.from("", "")));
+        // Keep model_name and output shape stable on error paths where no response is available.
+        modelName.ifPresent(str -> {
+            span.setTag(CommonTags.MODEL_NAME, str);
+            span.setTag(CommonTags.OUTPUT, Collections.singletonList(LLMObs.LLMMessage.from("", "")));
         });
 
-    span.setTag(CommonTags.SPAN_KIND, Tags.LLMOBS_LLM_SPAN_KIND);
-    extractPromptText(params)
-        .ifPresent(
-            input ->
-                span.setTag(
-                    CommonTags.INPUT,
-                    Collections.singletonList(LLMObs.LLMMessage.from("", input))));
-
-    Map<String, Object> metadata = new HashMap<>();
-    params.maxTokens().ifPresent(v -> metadata.put("max_tokens", v));
-    params.temperature().ifPresent(v -> metadata.put("temperature", v));
-    params
-        .streamOptions()
-        .ifPresent(
-            v -> {
-              if (v.includeUsage().orElse(false)) {
+        span.setTag(CommonTags.SPAN_KIND, Tags.LLMOBS_LLM_SPAN_KIND);
+        extractPromptText(params)
+                .ifPresent(input ->
+                        span.setTag(CommonTags.INPUT, Collections.singletonList(LLMObs.LLMMessage.from("", input))));
+
+        Map<String, Object> metadata = new HashMap<>();
+        params.maxTokens().ifPresent(v -> metadata.put("max_tokens", v));
+        params.temperature().ifPresent(v -> metadata.put("temperature", v));
+        params.streamOptions().ifPresent(v -> {
+            if (v.includeUsage().orElse(false)) {
                 metadata.put("stream_options", Collections.singletonMap("include_usage", true));
-              }
-            });
-    span.setTag(CommonTags.METADATA, metadata);
-  }
+            }
+        });
+        span.setTag(CommonTags.METADATA, metadata);
+    }
+
+    public void withCompletion(AgentSpan span, Completion completion) {
+        String modelName = completion._model().asString().orElse(null);
+        span.setTag(CommonTags.OPENAI_RESPONSE_MODEL, modelName);
+        span.setTag(CommonTags.MODEL_NAME, modelName);
 
-  public void withCompletion(AgentSpan span, Completion completion) {
-    String modelName = completion._model().asString().orElse(null);
-    span.setTag(CommonTags.OPENAI_RESPONSE_MODEL, modelName);
-    span.setTag(CommonTags.MODEL_NAME, modelName);
+        completion._usage().asKnown().ifPresent(usage -> withUsage(span, usage));
 
-    completion._usage().asKnown().ifPresent(usage -> withUsage(span, usage));
+        if (!llmObsEnabled) {
+            return;
+        }
 
-    if (!llmObsEnabled) {
-      return;
+        List<LLMObs.LLMMessage> output = completion._choices().asKnown().orElse(Collections.emptyList()).stream()
+                .map(v -> LLMObs.LLMMessage.from("", v._text().asString().orElse(null)))
+                .collect(Collectors.toList());
+        span.setTag(CommonTags.OUTPUT, output);
     }
 
-    List<LLMObs.LLMMessage> output =
-        completion._choices().asKnown().orElse(Collections.emptyList()).stream()
-            .map(v -> LLMObs.LLMMessage.from("", v._text().asString().orElse(null)))
-            .collect(Collectors.toList());
-    span.setTag(CommonTags.OUTPUT, output);
-  }
-
-  private static void withUsage(AgentSpan span, CompletionUsage usage) {
-    usage
-        ._promptTokens()
-        .asKnown()
-        .ifPresent(v -> TokenUsage.set(span, CommonTags.INPUT_TOKENS, v));
-    usage
-        ._completionTokens()
-        .asKnown()
-        .ifPresent(v -> TokenUsage.set(span, CommonTags.OUTPUT_TOKENS, v));
-    usage._totalTokens().asKnown().ifPresent(v -> TokenUsage.set(span, CommonTags.TOTAL_TOKENS, v));
-  }
-
-  public void withCompletions(AgentSpan span, List<Completion> completions) {
-    if (completions.isEmpty()) {
-      return;
+    private static void withUsage(AgentSpan span, CompletionUsage usage) {
+        usage._promptTokens().asKnown().ifPresent(v -> TokenUsage.set(span, CommonTags.INPUT_TOKENS, v));
+        usage._completionTokens().asKnown().ifPresent(v -> TokenUsage.set(span, CommonTags.OUTPUT_TOKENS, v));
+        usage._totalTokens().asKnown().ifPresent(v -> TokenUsage.set(span, CommonTags.TOTAL_TOKENS, v));
     }
 
-    Completion firstCompletion = completions.get(0);
-    String modelName = firstCompletion._model().asString().orElse(null);
-    span.setTag(CommonTags.OPENAI_RESPONSE_MODEL, modelName);
-    span.setTag(CommonTags.MODEL_NAME, modelName);
+    public void withCompletions(AgentSpan span, List<Completion> completions) {
+        if (completions.isEmpty()) {
+            return;
+        }
 
-    Completion lastCompletion = completions.get(completions.size() - 1);
-    lastCompletion._usage().asKnown().ifPresent(usage -> withUsage(span, usage));
+        Completion firstCompletion = completions.get(0);
+        String modelName = firstCompletion._model().asString().orElse(null);
+        span.setTag(CommonTags.OPENAI_RESPONSE_MODEL, modelName);
+        span.setTag(CommonTags.MODEL_NAME, modelName);
 
-    if (!llmObsEnabled) {
-      return;
-    }
+        Completion lastCompletion = completions.get(completions.size() - 1);
+        lastCompletion._usage().asKnown().ifPresent(usage -> withUsage(span, usage));
+
+        if (!llmObsEnabled) {
+            return;
+        }
 
-    Map<Long, StringBuilder> textByChoiceIndex = new HashMap<>();
-    for (Completion completion : completions) {
-      completion
-          ._choices()
-          .asKnown()
-          .orElse(Collections.emptyList())
-          .forEach(
-              choice -> {
+        Map<Long, StringBuilder> textByChoiceIndex = new HashMap<>();
+        for (Completion completion : completions) {
+            completion._choices().asKnown().orElse(Collections.emptyList()).forEach(choice -> {
                 long index = choice._index().asKnown().orElse(0L);
                 textByChoiceIndex
-                    .computeIfAbsent(index, k -> new StringBuilder())
-                    .append(choice._text().asString().orElse(""));
-              });
+                        .computeIfAbsent(index, k -> new StringBuilder())
+                        .append(choice._text().asString().orElse(""));
+            });
+        }
+
+        List<LLMObs.LLMMessage> output = textByChoiceIndex.entrySet().stream()
+                .sorted(Map.Entry.comparingByKey())
+                .map(entry -> LLMObs.LLMMessage.from("", entry.getValue().toString()))
+                .collect(Collectors.toList());
+        span.setTag(CommonTags.OUTPUT, output);
     }
 
-    List<LLMObs.LLMMessage> output =
-        textByChoiceIndex.entrySet().stream()
-            .sorted(Map.Entry.comparingByKey())
-            .map(entry -> LLMObs.LLMMessage.from("", entry.getValue().toString()))
-            .collect(Collectors.toList());
-    span.setTag(CommonTags.OUTPUT, output);
-  }
-
-  private Optional<String> extractCompletionModelName(CompletionCreateParams params) {
-    Optional<String> modelName =
-        params._model().asKnown().flatMap(model -> model._value().asString());
-    return modelName.isPresent() ? modelName : params._model().asString();
-  }
-
-  private Optional<String> extractPromptText(CompletionCreateParams params) {
-    return params._prompt().asKnown().flatMap(CompletionCreateParams.Prompt::string);
-  }
+    private Optional<String> extractCompletionModelName(CompletionCreateParams params) {
+        Optional<String> modelName =
+                params._model().asKnown().flatMap(model -> model._value().asString());
+        return modelName.isPresent() ? modelName : params._model().asString();
+    }
+
+    private Optional<String> extractPromptText(CompletionCreateParams params) {
+        return params._prompt().asKnown().flatMap(CompletionCreateParams.Prompt::string);
+    }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionModule.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionModule.java
index 9e4f736702d..47baa8a56fd 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionModule.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionModule.java
@@ -8,13 +8,12 @@
 
 @AutoService(InstrumenterModule.class)
 public class CompletionModule extends InstrumenterModule.Tracing {
-  public CompletionModule() {
-    super("openai-java");
-  }
+    public CompletionModule() {
+        super("openai-java");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new CompletionServiceAsyncInstrumentation(), new CompletionServiceInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(new CompletionServiceAsyncInstrumentation(), new CompletionServiceInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceAsyncInstrumentation.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceAsyncInstrumentation.java
index 74347d37860..96c78b046f1 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceAsyncInstrumentation.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceAsyncInstrumentation.java
@@ -23,89 +23,83 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class CompletionServiceAsyncInstrumentation
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasMethodAdvice,
-        Instrumenter.WithTypeStructure {
-  @Override
-  public String instrumentedType() {
-    return "com.openai.services.async.CompletionServiceAsyncImpl$WithRawResponseImpl";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("create"))
-            .and(takesArgument(0, named("com.openai.models.completions.CompletionCreateParams")))
-            .and(returns(named(CompletableFuture.class.getName()))),
-        getClass().getName() + "$CreateAdvice");
-
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("createStreaming"))
-            .and(takesArgument(0, named("com.openai.models.completions.CompletionCreateParams")))
-            .and(returns(named(CompletableFuture.class.getName()))),
-        getClass().getName() + "$CreateStreamingAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, Instrumenter.WithTypeStructure {
+    @Override
+    public String instrumentedType() {
+        return "com.openai.services.async.CompletionServiceAsyncImpl$WithRawResponseImpl";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("clientOptions"));
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("create"))
+                        .and(takesArgument(0, named("com.openai.models.completions.CompletionCreateParams")))
+                        .and(returns(named(CompletableFuture.class.getName()))),
+                getClass().getName() + "$CreateAdvice");
 
-  public static class CreateAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.Argument(0) final CompletionCreateParams params,
-        @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
-      AgentSpan span = DECORATE.startSpan(clientOptions);
-      CompletionDecorator.DECORATE.withCompletionCreateParams(span, params);
-      return activateSpan(span);
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("createStreaming"))
+                        .and(takesArgument(0, named("com.openai.models.completions.CompletionCreateParams")))
+                        .and(returns(named(CompletableFuture.class.getName()))),
+                getClass().getName() + "$CreateStreamingAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return(readOnly = false) CompletableFuture<HttpResponseFor<Completion>> future,
-        @Advice.Thrown final Throwable err) {
-      AgentSpan span = spanFromScope(scope);
-      if (err != null || future == null) {
-        DECORATE.finishSpan(span, err);
-      } else {
-        future =
-            HttpResponseWrapper.wrapFuture(
-                future, span, CompletionDecorator.DECORATE::withCompletion);
-      }
-      scope.close();
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("clientOptions"));
     }
-  }
 
-  public static class CreateStreamingAdvice {
+    public static class CreateAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.Argument(0) final CompletionCreateParams params,
+                @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
+            AgentSpan span = DECORATE.startSpan(clientOptions);
+            CompletionDecorator.DECORATE.withCompletionCreateParams(span, params);
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.Argument(0) final CompletionCreateParams params,
-        @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
-      AgentSpan span = DECORATE.startSpan(clientOptions);
-      CompletionDecorator.DECORATE.withCompletionCreateParams(span, params);
-      return activateSpan(span);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return(readOnly = false) CompletableFuture<HttpResponseFor<Completion>> future,
+                @Advice.Thrown final Throwable err) {
+            AgentSpan span = spanFromScope(scope);
+            if (err != null || future == null) {
+                DECORATE.finishSpan(span, err);
+            } else {
+                future = HttpResponseWrapper.wrapFuture(future, span, CompletionDecorator.DECORATE::withCompletion);
+            }
+            scope.close();
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return(readOnly = false)
-            CompletableFuture<HttpResponseFor<StreamResponse<Completion>>> future,
-        @Advice.Thrown final Throwable err) {
-      AgentSpan span = spanFromScope(scope);
-      if (err != null || future == null) {
-        DECORATE.finishSpan(span, err);
-      } else {
-        future =
-            HttpStreamResponseWrapper.wrapFuture(
-                future, span, CompletionDecorator.DECORATE::withCompletions);
-      }
-      scope.close();
+    public static class CreateStreamingAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.Argument(0) final CompletionCreateParams params,
+                @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
+            AgentSpan span = DECORATE.startSpan(clientOptions);
+            CompletionDecorator.DECORATE.withCompletionCreateParams(span, params);
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return(readOnly = false) CompletableFuture<HttpResponseFor<StreamResponse<Completion>>> future,
+                @Advice.Thrown final Throwable err) {
+            AgentSpan span = spanFromScope(scope);
+            if (err != null || future == null) {
+                DECORATE.finishSpan(span, err);
+            } else {
+                future = HttpStreamResponseWrapper.wrapFuture(
+                        future, span, CompletionDecorator.DECORATE::withCompletions);
+            }
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceInstrumentation.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceInstrumentation.java
index c7b6387c85f..34d3c19ec3b 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceInstrumentation.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceInstrumentation.java
@@ -22,89 +22,85 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class CompletionServiceInstrumentation
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasMethodAdvice,
-        Instrumenter.WithTypeStructure {
-  @Override
-  public String instrumentedType() {
-    return "com.openai.services.blocking.CompletionServiceImpl$WithRawResponseImpl";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("create"))
-            .and(takesArgument(0, named("com.openai.models.completions.CompletionCreateParams")))
-            .and(returns(named("com.openai.core.http.HttpResponseFor"))),
-        getClass().getName() + "$CreateAdvice");
-
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("createStreaming"))
-            .and(takesArgument(0, named("com.openai.models.completions.CompletionCreateParams")))
-            .and(returns(named("com.openai.core.http.HttpResponseFor"))),
-        getClass().getName() + "$CreateStreamingAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, Instrumenter.WithTypeStructure {
+    @Override
+    public String instrumentedType() {
+        return "com.openai.services.blocking.CompletionServiceImpl$WithRawResponseImpl";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("clientOptions"));
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("create"))
+                        .and(takesArgument(0, named("com.openai.models.completions.CompletionCreateParams")))
+                        .and(returns(named("com.openai.core.http.HttpResponseFor"))),
+                getClass().getName() + "$CreateAdvice");
 
-  public static class CreateAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.Argument(0) final CompletionCreateParams params,
-        @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
-      AgentSpan span = DECORATE.startSpan(clientOptions);
-      // NOTE: skip LLMObsContext.attach(span.context()) here because never expect an inner
-      // LLMObsSpan
-      CompletionDecorator.DECORATE.withCompletionCreateParams(span, params);
-      return activateSpan(span);
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("createStreaming"))
+                        .and(takesArgument(0, named("com.openai.models.completions.CompletionCreateParams")))
+                        .and(returns(named("com.openai.core.http.HttpResponseFor"))),
+                getClass().getName() + "$CreateStreamingAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return(readOnly = false) HttpResponseFor<Completion> response,
-        @Advice.Thrown final Throwable err) {
-      AgentSpan span = spanFromScope(scope);
-      if (err != null || response == null) {
-        DECORATE.finishSpan(span, err);
-      } else {
-        response =
-            HttpResponseWrapper.wrap(response, span, CompletionDecorator.DECORATE::withCompletion);
-      }
-      scope.close();
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("clientOptions"));
     }
-  }
 
-  public static class CreateStreamingAdvice {
+    public static class CreateAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.Argument(0) final CompletionCreateParams params,
+                @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
+            AgentSpan span = DECORATE.startSpan(clientOptions);
+            // NOTE: skip LLMObsContext.attach(span.context()) here because never expect an inner
+            // LLMObsSpan
+            CompletionDecorator.DECORATE.withCompletionCreateParams(span, params);
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.Argument(0) final CompletionCreateParams params,
-        @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
-      AgentSpan span = DECORATE.startSpan(clientOptions);
-      CompletionDecorator.DECORATE.withCompletionCreateParams(span, params);
-      return activateSpan(span);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return(readOnly = false) HttpResponseFor<Completion> response,
+                @Advice.Thrown final Throwable err) {
+            AgentSpan span = spanFromScope(scope);
+            if (err != null || response == null) {
+                DECORATE.finishSpan(span, err);
+            } else {
+                response = HttpResponseWrapper.wrap(response, span, CompletionDecorator.DECORATE::withCompletion);
+            }
+            scope.close();
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return(readOnly = false) HttpResponseFor<StreamResponse<Completion>> response,
-        @Advice.Thrown final Throwable err) {
-      AgentSpan span = spanFromScope(scope);
-      if (err != null || response == null) {
-        DECORATE.finishSpan(span, err);
-      } else {
-        response =
-            HttpStreamResponseWrapper.wrap(
-                response, span, CompletionDecorator.DECORATE::withCompletions);
-      }
-      scope.close();
+    public static class CreateStreamingAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.Argument(0) final CompletionCreateParams params,
+                @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
+            AgentSpan span = DECORATE.startSpan(clientOptions);
+            CompletionDecorator.DECORATE.withCompletionCreateParams(span, params);
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return(readOnly = false) HttpResponseFor<StreamResponse<Completion>> response,
+                @Advice.Thrown final Throwable err) {
+            AgentSpan span = spanFromScope(scope);
+            if (err != null || response == null) {
+                DECORATE.finishSpan(span, err);
+            } else {
+                response =
+                        HttpStreamResponseWrapper.wrap(response, span, CompletionDecorator.DECORATE::withCompletions);
+            }
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingDecorator.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingDecorator.java
index 5f223afcfc8..65aaeaa800d 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingDecorator.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingDecorator.java
@@ -16,88 +16,89 @@
 import java.util.stream.Collectors;
 
 public class EmbeddingDecorator {
-  public static final EmbeddingDecorator DECORATE = new EmbeddingDecorator();
+    public static final EmbeddingDecorator DECORATE = new EmbeddingDecorator();
 
-  private static final CharSequence EMBEDDINGS_CREATE = UTF8BytesString.create("createEmbedding");
+    private static final CharSequence EMBEDDINGS_CREATE = UTF8BytesString.create("createEmbedding");
 
-  private final boolean llmObsEnabled = Config.get().isLlmObsEnabled();
+    private final boolean llmObsEnabled = Config.get().isLlmObsEnabled();
 
-  public void withEmbeddingCreateParams(AgentSpan span, EmbeddingCreateParams params) {
-    span.setResourceName(EMBEDDINGS_CREATE);
-    span.setTag(CommonTags.OPENAI_REQUEST_ENDPOINT, "/v1/embeddings");
-    if (params == null) {
-      return;
-    }
-    Optional<String> modelName = extractEmbeddingModelName(params);
-    modelName.ifPresent(str -> span.setTag(CommonTags.OPENAI_REQUEST_MODEL, str));
+    public void withEmbeddingCreateParams(AgentSpan span, EmbeddingCreateParams params) {
+        span.setResourceName(EMBEDDINGS_CREATE);
+        span.setTag(CommonTags.OPENAI_REQUEST_ENDPOINT, "/v1/embeddings");
+        if (params == null) {
+            return;
+        }
+        Optional<String> modelName = extractEmbeddingModelName(params);
+        modelName.ifPresent(str -> span.setTag(CommonTags.OPENAI_REQUEST_MODEL, str));
 
-    if (!llmObsEnabled) {
-      return;
-    }
+        if (!llmObsEnabled) {
+            return;
+        }
 
-    // Keep model_name stable on error paths where no response is available.
-    modelName.ifPresent(str -> span.setTag(CommonTags.MODEL_NAME, str));
+        // Keep model_name stable on error paths where no response is available.
+        modelName.ifPresent(str -> span.setTag(CommonTags.MODEL_NAME, str));
 
-    span.setTag(CommonTags.SPAN_KIND, Tags.LLMOBS_EMBEDDING_SPAN_KIND);
+        span.setTag(CommonTags.SPAN_KIND, Tags.LLMOBS_EMBEDDING_SPAN_KIND);
 
-    span.setTag(CommonTags.INPUT, embeddingDocuments(params.input()));
+        span.setTag(CommonTags.INPUT, embeddingDocuments(params.input()));
 
-    Map<String, Object> metadata = new HashMap<>();
-    Optional<String> encodingFormat = extractEncodingFormat(params);
-    encodingFormat.ifPresent(v -> metadata.put("encoding_format", v));
-    params.dimensions().ifPresent(v -> metadata.put("dimensions", v));
-    span.setTag(CommonTags.METADATA, metadata);
-  }
+        Map<String, Object> metadata = new HashMap<>();
+        Optional<String> encodingFormat = extractEncodingFormat(params);
+        encodingFormat.ifPresent(v -> metadata.put("encoding_format", v));
+        params.dimensions().ifPresent(v -> metadata.put("dimensions", v));
+        span.setTag(CommonTags.METADATA, metadata);
+    }
 
-  private List<LLMObs.Document> embeddingDocuments(EmbeddingCreateParams.Input input) {
-    List<String> inputs =
-        input
-            .string()
-            .map(Collections::singletonList)
-            .orElseGet(() -> input.arrayOfStrings().orElse(Collections.emptyList()));
-    return inputs.stream().map(LLMObs.Document::from).collect(Collectors.toList());
-  }
+    private List<LLMObs.Document> embeddingDocuments(EmbeddingCreateParams.Input input) {
+        List<String> inputs = input.string()
+                .map(Collections::singletonList)
+                .orElseGet(() -> input.arrayOfStrings().orElse(Collections.emptyList()));
+        return inputs.stream().map(LLMObs.Document::from).collect(Collectors.toList());
+    }
 
-  public void withCreateEmbeddingResponse(AgentSpan span, CreateEmbeddingResponse response) {
-    String modelName = response._model().asString().orElse(null);
-    span.setTag(CommonTags.OPENAI_RESPONSE_MODEL, modelName);
-    span.setTag(CommonTags.MODEL_NAME, modelName);
+    public void withCreateEmbeddingResponse(AgentSpan span, CreateEmbeddingResponse response) {
+        String modelName = response._model().asString().orElse(null);
+        span.setTag(CommonTags.OPENAI_RESPONSE_MODEL, modelName);
+        span.setTag(CommonTags.MODEL_NAME, modelName);
+
+        response._usage().asKnown().ifPresent(usage -> withUsage(span, usage));
+
+        if (!llmObsEnabled) {
+            return;
+        }
+
+        List<Embedding> data = response._data().asKnown().orElse(Collections.emptyList());
+        if (!data.isEmpty()) {
+            int embeddingCount = data.size();
+            Embedding firstEmbedding = data.get(0);
+            int embeddingSize = firstEmbedding
+                    ._embedding()
+                    .asKnown()
+                    .orElse(Collections.emptyList())
+                    .size();
+            span.setTag(
+                    CommonTags.OUTPUT,
+                    String.format("[%d embedding(s) returned with size %d]", embeddingCount, embeddingSize));
+        }
+    }
 
-    response._usage().asKnown().ifPresent(usage -> withUsage(span, usage));
+    private static void withUsage(AgentSpan span, CreateEmbeddingResponse.Usage usage) {
+        usage._promptTokens().asKnown().ifPresent(v -> TokenUsage.set(span, CommonTags.INPUT_TOKENS, v));
+        usage._totalTokens().asKnown().ifPresent(v -> TokenUsage.set(span, CommonTags.TOTAL_TOKENS, v));
+    }
 
-    if (!llmObsEnabled) {
-      return;
+    private Optional<String> extractEmbeddingModelName(EmbeddingCreateParams params) {
+        Optional<String> modelName =
+                params._model().asKnown().flatMap(model -> model._value().asString());
+        return modelName.isPresent() ? modelName : params._model().asString();
     }
 
-    List<Embedding> data = response._data().asKnown().orElse(Collections.emptyList());
-    if (!data.isEmpty()) {
-      int embeddingCount = data.size();
-      Embedding firstEmbedding = data.get(0);
-      int embeddingSize =
-          firstEmbedding._embedding().asKnown().orElse(Collections.emptyList()).size();
-      span.setTag(
-          CommonTags.OUTPUT,
-          String.format("[%d embedding(s) returned with size %d]", embeddingCount, embeddingSize));
+    private Optional<String> extractEncodingFormat(EmbeddingCreateParams params) {
+        Optional<String> encodingFormat = params._encodingFormat()
+                .asKnown()
+                .flatMap(format -> format._value().asString());
+        return encodingFormat.isPresent()
+                ? encodingFormat
+                : params._encodingFormat().asString();
     }
-  }
-
-  private static void withUsage(AgentSpan span, CreateEmbeddingResponse.Usage usage) {
-    usage
-        ._promptTokens()
-        .asKnown()
-        .ifPresent(v -> TokenUsage.set(span, CommonTags.INPUT_TOKENS, v));
-    usage._totalTokens().asKnown().ifPresent(v -> TokenUsage.set(span, CommonTags.TOTAL_TOKENS, v));
-  }
-
-  private Optional<String> extractEmbeddingModelName(EmbeddingCreateParams params) {
-    Optional<String> modelName =
-        params._model().asKnown().flatMap(model -> model._value().asString());
-    return modelName.isPresent() ? modelName : params._model().asString();
-  }
-
-  private Optional<String> extractEncodingFormat(EmbeddingCreateParams params) {
-    Optional<String> encodingFormat =
-        params._encodingFormat().asKnown().flatMap(format -> format._value().asString());
-    return encodingFormat.isPresent() ? encodingFormat : params._encodingFormat().asString();
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingModule.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingModule.java
index 807eb0b6abd..2e35be17d6d 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingModule.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingModule.java
@@ -8,12 +8,12 @@
 
 @AutoService(InstrumenterModule.class)
 public class EmbeddingModule extends InstrumenterModule.Tracing {
-  public EmbeddingModule() {
-    super("openai-java");
-  }
+    public EmbeddingModule() {
+        super("openai-java");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Collections.singletonList(new EmbeddingServiceInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Collections.singletonList(new EmbeddingServiceInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingServiceInstrumentation.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingServiceInstrumentation.java
index f2b3106215c..95fcdf26477 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingServiceInstrumentation.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingServiceInstrumentation.java
@@ -21,53 +21,50 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class EmbeddingServiceInstrumentation
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasMethodAdvice,
-        Instrumenter.WithTypeStructure {
-  @Override
-  public String instrumentedType() {
-    return "com.openai.services.blocking.EmbeddingServiceImpl$WithRawResponseImpl";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("create"))
-            .and(takesArgument(0, named("com.openai.models.embeddings.EmbeddingCreateParams")))
-            .and(returns(named("com.openai.core.http.HttpResponseFor"))),
-        getClass().getName() + "$CreateAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, Instrumenter.WithTypeStructure {
+    @Override
+    public String instrumentedType() {
+        return "com.openai.services.blocking.EmbeddingServiceImpl$WithRawResponseImpl";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("clientOptions"));
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("create"))
+                        .and(takesArgument(0, named("com.openai.models.embeddings.EmbeddingCreateParams")))
+                        .and(returns(named("com.openai.core.http.HttpResponseFor"))),
+                getClass().getName() + "$CreateAdvice");
+    }
 
-  public static class CreateAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.Argument(0) final EmbeddingCreateParams params,
-        @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
-      AgentSpan span = DECORATE.startSpan(clientOptions);
-      EmbeddingDecorator.DECORATE.withEmbeddingCreateParams(span, params);
-      return activateSpan(span);
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("clientOptions"));
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return(readOnly = false) HttpResponseFor<CreateEmbeddingResponse> response,
-        @Advice.Thrown final Throwable err) {
-      AgentSpan span = spanFromScope(scope);
-      if (err != null || response == null) {
-        DECORATE.finishSpan(span, err);
-      } else {
-        response =
-            HttpResponseWrapper.wrap(
-                response, span, EmbeddingDecorator.DECORATE::withCreateEmbeddingResponse);
-      }
-      scope.close();
+    public static class CreateAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.Argument(0) final EmbeddingCreateParams params,
+                @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
+            AgentSpan span = DECORATE.startSpan(clientOptions);
+            EmbeddingDecorator.DECORATE.withEmbeddingCreateParams(span, params);
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return(readOnly = false) HttpResponseFor<CreateEmbeddingResponse> response,
+                @Advice.Thrown final Throwable err) {
+            AgentSpan span = spanFromScope(scope);
+            if (err != null || response == null) {
+                DECORATE.finishSpan(span, err);
+            } else {
+                response = HttpResponseWrapper.wrap(
+                        response, span, EmbeddingDecorator.DECORATE::withCreateEmbeddingResponse);
+            }
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/FunctionCallOutputExtractor.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/FunctionCallOutputExtractor.java
index e2ea60dff91..ce55abc8542 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/FunctionCallOutputExtractor.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/FunctionCallOutputExtractor.java
@@ -9,104 +9,102 @@
 
 /** Helper class to handle FunctionCallOutput method changes between openai-java versions. */
 public class FunctionCallOutputExtractor {
-  private static final Logger log = LoggerFactory.getLogger(FunctionCallOutputExtractor.class);
+    private static final Logger log = LoggerFactory.getLogger(FunctionCallOutputExtractor.class);
 
-  private static final Class<ResponseInputItem.FunctionCallOutput> FUNCTION_CALL_OUTPUT_CLASS =
-      ResponseInputItem.FunctionCallOutput.class;
-  private static final MethodHandles METHOD_HANDLES =
-      new MethodHandles(FUNCTION_CALL_OUTPUT_CLASS.getClassLoader());
+    private static final Class<ResponseInputItem.FunctionCallOutput> FUNCTION_CALL_OUTPUT_CLASS =
+            ResponseInputItem.FunctionCallOutput.class;
+    private static final MethodHandles METHOD_HANDLES = new MethodHandles(FUNCTION_CALL_OUTPUT_CLASS.getClassLoader());
 
-  private static final MethodHandle CALL_ID_METHOD;
-  private static final MethodHandle OUTPUT_METHOD;
-  private static final MethodHandle IS_STRING_METHOD;
-  private static final MethodHandle AS_STRING_METHOD;
+    private static final MethodHandle CALL_ID_METHOD;
+    private static final MethodHandle OUTPUT_METHOD;
+    private static final MethodHandle IS_STRING_METHOD;
+    private static final MethodHandle AS_STRING_METHOD;
 
-  static {
-    CALL_ID_METHOD = METHOD_HANDLES.method(FUNCTION_CALL_OUTPUT_CLASS, "callId");
-    OUTPUT_METHOD = METHOD_HANDLES.method(FUNCTION_CALL_OUTPUT_CLASS, "output");
+    static {
+        CALL_ID_METHOD = METHOD_HANDLES.method(FUNCTION_CALL_OUTPUT_CLASS, "callId");
+        OUTPUT_METHOD = METHOD_HANDLES.method(FUNCTION_CALL_OUTPUT_CLASS, "output");
 
-    Class<?> outputClass = null;
-    try {
-      outputClass =
-          Class.forName(
-              FUNCTION_CALL_OUTPUT_CLASS.getName() + "$Output",
-              false,
-              FUNCTION_CALL_OUTPUT_CLASS.getClassLoader());
-    } catch (Throwable t) {
-      log.debug("Output class not found, assuming openai-java version 3.x", t);
-    }
+        Class<?> outputClass = null;
+        try {
+            outputClass = Class.forName(
+                    FUNCTION_CALL_OUTPUT_CLASS.getName() + "$Output",
+                    false,
+                    FUNCTION_CALL_OUTPUT_CLASS.getClassLoader());
+        } catch (Throwable t) {
+            log.debug("Output class not found, assuming openai-java version 3.x", t);
+        }
 
-    if (outputClass != null) {
-      IS_STRING_METHOD = METHOD_HANDLES.method(outputClass, "isString");
-      AS_STRING_METHOD = METHOD_HANDLES.method(outputClass, "asString");
-    } else {
-      IS_STRING_METHOD = null;
-      AS_STRING_METHOD = null;
+        if (outputClass != null) {
+            IS_STRING_METHOD = METHOD_HANDLES.method(outputClass, "isString");
+            AS_STRING_METHOD = METHOD_HANDLES.method(outputClass, "asString");
+        } else {
+            IS_STRING_METHOD = null;
+            AS_STRING_METHOD = null;
+        }
     }
-  }
 
-  /**
-   * Extracts the function call ID across openai-java versions.
-   *
-   * <ul>
-   *   <li>Versions before 4.54: {@code callId()} returns {@code String}.
-   *   <li>Version 4.54+: {@code callId()} returns {@code Optional<String>}.
-   * </ul>
-   */
-  public static String getCallIdAsString(ResponseInputItem.FunctionCallOutput functionCallOutput) {
-    try {
-      Object callId = METHOD_HANDLES.invoke(CALL_ID_METHOD, functionCallOutput);
-      if (callId instanceof Optional) {
-        callId = ((Optional<?>) callId).orElse(null);
-      }
-      if (callId == null || callId instanceof String) {
-        return (String) callId;
-      }
-    } catch (Throwable ignored) {
+    /**
+     * Extracts the function call ID across openai-java versions.
+     *
+     * <ul>
+     *   <li>Versions before 4.54: {@code callId()} returns {@code String}.
+     *   <li>Version 4.54+: {@code callId()} returns {@code Optional<String>}.
+     * </ul>
+     */
+    public static String getCallIdAsString(ResponseInputItem.FunctionCallOutput functionCallOutput) {
+        try {
+            Object callId = METHOD_HANDLES.invoke(CALL_ID_METHOD, functionCallOutput);
+            if (callId instanceof Optional) {
+                callId = ((Optional<?>) callId).orElse(null);
+            }
+            if (callId == null || callId instanceof String) {
+                return (String) callId;
+            }
+        } catch (Throwable ignored) {
+        }
+        return null;
     }
-    return null;
-  }
 
-  /**
-   * Extracts the function call output across openai-java versions.
-   *
-   * <ul>
-   *   <li>Version 3.x: {@code output()} returns {@code String}.
-   *   <li>Version 4.0+: {@code output()} returns {@code Output}.
-   * </ul>
-   */
-  public static String getOutputAsString(ResponseInputItem.FunctionCallOutput functionCallOutput) {
-    try {
-      Object output = METHOD_HANDLES.invoke(OUTPUT_METHOD, functionCallOutput);
+    /**
+     * Extracts the function call output across openai-java versions.
+     *
+     * <ul>
+     *   <li>Version 3.x: {@code output()} returns {@code String}.
+     *   <li>Version 4.0+: {@code output()} returns {@code Output}.
+     * </ul>
+     */
+    public static String getOutputAsString(ResponseInputItem.FunctionCallOutput functionCallOutput) {
+        try {
+            Object output = METHOD_HANDLES.invoke(OUTPUT_METHOD, functionCallOutput);
 
-      if (output == null) {
-        return null;
-      }
+            if (output == null) {
+                return null;
+            }
 
-      // In v3.x, output() returns String directly
-      if (output instanceof String) {
-        return (String) output;
-      }
+            // In v3.x, output() returns String directly
+            if (output instanceof String) {
+                return (String) output;
+            }
 
-      // In v4.0+, output() returns an Output object
-      if (IS_STRING_METHOD != null && AS_STRING_METHOD != null) {
-        Boolean isString = METHOD_HANDLES.invoke(IS_STRING_METHOD, output);
-        if (Boolean.TRUE.equals(isString)) {
-          return METHOD_HANDLES.invoke(AS_STRING_METHOD, output);
-        } else {
-          // FunctionCallOutput.output() returned non-string Output type, skipping
-          return null;
-        }
-      }
+            // In v4.0+, output() returns an Output object
+            if (IS_STRING_METHOD != null && AS_STRING_METHOD != null) {
+                Boolean isString = METHOD_HANDLES.invoke(IS_STRING_METHOD, output);
+                if (Boolean.TRUE.equals(isString)) {
+                    return METHOD_HANDLES.invoke(AS_STRING_METHOD, output);
+                } else {
+                    // FunctionCallOutput.output() returned non-string Output type, skipping
+                    return null;
+                }
+            }
 
-      log.debug(
-          "Unable to extract string from FunctionCallOutput.output(): unexpected return type {}",
-          output.getClass().getName());
-      return null;
+            log.debug(
+                    "Unable to extract string from FunctionCallOutput.output(): unexpected return type {}",
+                    output.getClass().getName());
+            return null;
 
-    } catch (Throwable t) {
-      log.debug("Error extracting output from FunctionCallOutput", t);
-      return null;
+        } catch (Throwable t) {
+            log.debug("Error extracting output from FunctionCallOutput", t);
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/HttpResponseWrapper.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/HttpResponseWrapper.java
index 1e8f7493930..37eb534e39f 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/HttpResponseWrapper.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/HttpResponseWrapper.java
@@ -14,85 +14,79 @@
 import org.slf4j.LoggerFactory;
 
 public final class HttpResponseWrapper<T> implements HttpResponseFor<T> {
-  private static final Logger log = LoggerFactory.getLogger(HttpResponseWrapper.class);
+    private static final Logger log = LoggerFactory.getLogger(HttpResponseWrapper.class);
 
-  public static <T> HttpResponseFor<T> wrap(
-      HttpResponseFor<T> response, AgentSpan span, BiConsumer<AgentSpan, T> decorate) {
-    DECORATE.withHttpResponse(span, response.headers());
-    return new HttpResponseWrapper<>(response, span, decorate);
-  }
+    public static <T> HttpResponseFor<T> wrap(
+            HttpResponseFor<T> response, AgentSpan span, BiConsumer<AgentSpan, T> decorate) {
+        DECORATE.withHttpResponse(span, response.headers());
+        return new HttpResponseWrapper<>(response, span, decorate);
+    }
 
-  public static <T> CompletableFuture<HttpResponseFor<T>> wrapFuture(
-      CompletableFuture<HttpResponseFor<T>> future,
-      AgentSpan span,
-      BiConsumer<AgentSpan, T> decorate) {
-    return future
-        .thenApply(response -> wrap(response, span, decorate))
-        .whenComplete(
-            (_r, t) -> {
-              if (t != null) {
+    public static <T> CompletableFuture<HttpResponseFor<T>> wrapFuture(
+            CompletableFuture<HttpResponseFor<T>> future, AgentSpan span, BiConsumer<AgentSpan, T> decorate) {
+        return future.thenApply(response -> wrap(response, span, decorate)).whenComplete((_r, t) -> {
+            if (t != null) {
                 // Only finish if there was an error; otherwise, HttpResponseWrapper.close will
                 // finish it later.
                 DECORATE.finishSpan(span, t);
-              }
-            });
-  }
-
-  private final HttpResponseFor<T> delegate;
-  private final AgentSpan span;
-  private final BiConsumer<AgentSpan, T> decorate;
-  private final AtomicBoolean finished = new AtomicBoolean(false);
+            }
+        });
+    }
 
-  private HttpResponseWrapper(
-      HttpResponseFor<T> delegate, AgentSpan span, BiConsumer<AgentSpan, T> decorate) {
-    this.delegate = delegate;
-    this.span = span;
-    this.decorate = decorate;
-  }
+    private final HttpResponseFor<T> delegate;
+    private final AgentSpan span;
+    private final BiConsumer<AgentSpan, T> decorate;
+    private final AtomicBoolean finished = new AtomicBoolean(false);
 
-  @Override
-  public T parse() {
-    T parsed;
-    try {
-      parsed = delegate.parse();
-    } catch (Throwable err) {
-      DECORATE.finishSpan(span, err);
-      finished.set(true);
-      throw err;
+    private HttpResponseWrapper(HttpResponseFor<T> delegate, AgentSpan span, BiConsumer<AgentSpan, T> decorate) {
+        this.delegate = delegate;
+        this.span = span;
+        this.decorate = decorate;
     }
-    try {
-      decorate.accept(span, parsed);
-    } catch (Throwable t) {
-      log.debug("Span decorator failed", t);
-    } finally {
-      DECORATE.finishSpan(span, null);
-      finished.set(true);
+
+    @Override
+    public T parse() {
+        T parsed;
+        try {
+            parsed = delegate.parse();
+        } catch (Throwable err) {
+            DECORATE.finishSpan(span, err);
+            finished.set(true);
+            throw err;
+        }
+        try {
+            decorate.accept(span, parsed);
+        } catch (Throwable t) {
+            log.debug("Span decorator failed", t);
+        } finally {
+            DECORATE.finishSpan(span, null);
+            finished.set(true);
+        }
+        return parsed;
     }
-    return parsed;
-  }
 
-  @Override
-  public int statusCode() {
-    return delegate.statusCode();
-  }
+    @Override
+    public int statusCode() {
+        return delegate.statusCode();
+    }
 
-  @Nonnull
-  @Override
-  public Headers headers() {
-    return delegate.headers();
-  }
+    @Nonnull
+    @Override
+    public Headers headers() {
+        return delegate.headers();
+    }
 
-  @Nonnull
-  @Override
-  public InputStream body() {
-    return delegate.body();
-  }
+    @Nonnull
+    @Override
+    public InputStream body() {
+        return delegate.body();
+    }
 
-  @Override
-  public void close() {
-    if (finished.compareAndSet(false, true)) {
-      DECORATE.finishSpan(span, null);
+    @Override
+    public void close() {
+        if (finished.compareAndSet(false, true)) {
+            DECORATE.finishSpan(span, null);
+        }
+        delegate.close();
     }
-    delegate.close();
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/HttpStreamResponseStreamWrapper.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/HttpStreamResponseStreamWrapper.java
index b1920b772ab..f62c7724d40 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/HttpStreamResponseStreamWrapper.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/HttpStreamResponseStreamWrapper.java
@@ -14,38 +14,37 @@
 import org.slf4j.LoggerFactory;
 
 public final class HttpStreamResponseStreamWrapper<T> implements StreamResponse<T> {
-  private static final Logger log = LoggerFactory.getLogger(HttpStreamResponseStreamWrapper.class);
+    private static final Logger log = LoggerFactory.getLogger(HttpStreamResponseStreamWrapper.class);
 
-  private final AgentSpan span;
-  private final BiConsumer<AgentSpan, List<T>> decorate;
-  private final List<T> chunks;
-  private final StreamResponse<T> parsed;
-  private final AtomicBoolean finished = new AtomicBoolean(false);
+    private final AgentSpan span;
+    private final BiConsumer<AgentSpan, List<T>> decorate;
+    private final List<T> chunks;
+    private final StreamResponse<T> parsed;
+    private final AtomicBoolean finished = new AtomicBoolean(false);
 
-  HttpStreamResponseStreamWrapper(
-      AgentSpan span, BiConsumer<AgentSpan, List<T>> decorate, StreamResponse<T> parsed) {
-    this.span = span;
-    this.decorate = decorate;
-    this.parsed = parsed;
-    chunks = new ArrayList<>();
-  }
+    HttpStreamResponseStreamWrapper(AgentSpan span, BiConsumer<AgentSpan, List<T>> decorate, StreamResponse<T> parsed) {
+        this.span = span;
+        this.decorate = decorate;
+        this.parsed = parsed;
+        chunks = new ArrayList<>();
+    }
 
-  @Nonnull
-  @Override
-  public Stream<T> stream() {
-    return parsed.stream().peek(chunks::add).onClose(this::close);
-  }
+    @Nonnull
+    @Override
+    public Stream<T> stream() {
+        return parsed.stream().peek(chunks::add).onClose(this::close);
+    }
 
-  @Override
-  public void close() {
-    if (finished.compareAndSet(false, true)) {
-      try {
-        decorate.accept(span, chunks);
-      } catch (Throwable t) {
-        log.debug("Span decorator failed", t);
-      }
-      DECORATE.finishSpan(span, null);
+    @Override
+    public void close() {
+        if (finished.compareAndSet(false, true)) {
+            try {
+                decorate.accept(span, chunks);
+            } catch (Throwable t) {
+                log.debug("Span decorator failed", t);
+            }
+            DECORATE.finishSpan(span, null);
+        }
+        parsed.close();
     }
-    parsed.close();
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/HttpStreamResponseWrapper.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/HttpStreamResponseWrapper.java
index cb715745303..49512488943 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/HttpStreamResponseWrapper.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/HttpStreamResponseWrapper.java
@@ -15,77 +15,72 @@
 
 public final class HttpStreamResponseWrapper<T> implements HttpResponseFor<StreamResponse<T>> {
 
-  public static <T> HttpResponseFor<StreamResponse<T>> wrap(
-      HttpResponseFor<StreamResponse<T>> response,
-      final AgentSpan span,
-      BiConsumer<AgentSpan, List<T>> decorate) {
-    DECORATE.withHttpResponse(span, response.headers());
-    return new HttpStreamResponseWrapper<>(response, span, decorate);
-  }
+    public static <T> HttpResponseFor<StreamResponse<T>> wrap(
+            HttpResponseFor<StreamResponse<T>> response,
+            final AgentSpan span,
+            BiConsumer<AgentSpan, List<T>> decorate) {
+        DECORATE.withHttpResponse(span, response.headers());
+        return new HttpStreamResponseWrapper<>(response, span, decorate);
+    }
 
-  public static <T> CompletableFuture<HttpResponseFor<StreamResponse<T>>> wrapFuture(
-      CompletableFuture<HttpResponseFor<StreamResponse<T>>> future,
-      AgentSpan span,
-      BiConsumer<AgentSpan, List<T>> decorate) {
-    return future
-        .thenApply(r -> wrap(r, span, decorate))
-        .whenComplete(
-            (_r, err) -> {
-              if (err != null) {
+    public static <T> CompletableFuture<HttpResponseFor<StreamResponse<T>>> wrapFuture(
+            CompletableFuture<HttpResponseFor<StreamResponse<T>>> future,
+            AgentSpan span,
+            BiConsumer<AgentSpan, List<T>> decorate) {
+        return future.thenApply(r -> wrap(r, span, decorate)).whenComplete((_r, err) -> {
+            if (err != null) {
                 DECORATE.finishSpan(span, err);
-              }
-            });
-  }
+            }
+        });
+    }
 
-  private final HttpResponseFor<StreamResponse<T>> delegate;
-  private final AgentSpan span;
-  private final BiConsumer<AgentSpan, List<T>> decorate;
-  private final AtomicBoolean parseCalled = new AtomicBoolean(false);
+    private final HttpResponseFor<StreamResponse<T>> delegate;
+    private final AgentSpan span;
+    private final BiConsumer<AgentSpan, List<T>> decorate;
+    private final AtomicBoolean parseCalled = new AtomicBoolean(false);
 
-  private HttpStreamResponseWrapper(
-      HttpResponseFor<StreamResponse<T>> delegate,
-      AgentSpan span,
-      BiConsumer<AgentSpan, List<T>> decorate) {
-    this.delegate = delegate;
-    this.span = span;
-    this.decorate = decorate;
-  }
+    private HttpStreamResponseWrapper(
+            HttpResponseFor<StreamResponse<T>> delegate, AgentSpan span, BiConsumer<AgentSpan, List<T>> decorate) {
+        this.delegate = delegate;
+        this.span = span;
+        this.decorate = decorate;
+    }
 
-  @Override
-  public StreamResponse<T> parse() {
-    try {
-      StreamResponse<T> parsed = delegate.parse();
-      return new HttpStreamResponseStreamWrapper<>(span, decorate, parsed);
-    } catch (Throwable err) {
-      DECORATE.finishSpan(span, err);
-      throw err;
-    } finally {
-      parseCalled.set(true);
+    @Override
+    public StreamResponse<T> parse() {
+        try {
+            StreamResponse<T> parsed = delegate.parse();
+            return new HttpStreamResponseStreamWrapper<>(span, decorate, parsed);
+        } catch (Throwable err) {
+            DECORATE.finishSpan(span, err);
+            throw err;
+        } finally {
+            parseCalled.set(true);
+        }
     }
-  }
 
-  @Override
-  public int statusCode() {
-    return delegate.statusCode();
-  }
+    @Override
+    public int statusCode() {
+        return delegate.statusCode();
+    }
 
-  @Nonnull
-  @Override
-  public Headers headers() {
-    return delegate.headers();
-  }
+    @Nonnull
+    @Override
+    public Headers headers() {
+        return delegate.headers();
+    }
 
-  @Nonnull
-  @Override
-  public InputStream body() {
-    return delegate.body();
-  }
+    @Nonnull
+    @Override
+    public InputStream body() {
+        return delegate.body();
+    }
 
-  @Override
-  public void close() {
-    if (parseCalled.compareAndSet(false, true)) {
-      DECORATE.finishSpan(span, null);
+    @Override
+    public void close() {
+        if (parseCalled.compareAndSet(false, true)) {
+            DECORATE.finishSpan(span, null);
+        }
+        delegate.close();
     }
-    delegate.close();
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/JsonValueUtils.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/JsonValueUtils.java
index c251f5c17fd..8f369195901 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/JsonValueUtils.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/JsonValueUtils.java
@@ -8,44 +8,44 @@
 import java.util.Optional;
 
 public final class JsonValueUtils {
-  private JsonValueUtils() {}
+    private JsonValueUtils() {}
 
-  public static Map<String, Object> jsonValueMapToObject(Map<String, JsonValue> map) {
-    Map<String, Object> result = new HashMap<>();
-    for (Map.Entry<String, JsonValue> entry : map.entrySet()) {
-      result.put(entry.getKey(), jsonValueToObject(entry.getValue()));
+    public static Map<String, Object> jsonValueMapToObject(Map<String, JsonValue> map) {
+        Map<String, Object> result = new HashMap<>();
+        for (Map.Entry<String, JsonValue> entry : map.entrySet()) {
+            result.put(entry.getKey(), jsonValueToObject(entry.getValue()));
+        }
+        return result;
     }
-    return result;
-  }
 
-  public static Object jsonValueToObject(JsonValue value) {
-    if (value == null) {
-      return null;
+    public static Object jsonValueToObject(JsonValue value) {
+        if (value == null) {
+            return null;
+        }
+        Optional<String> str = value.asString();
+        if (str.isPresent()) {
+            return str.get();
+        }
+        Optional<Number> num = value.asNumber();
+        if (num.isPresent()) {
+            return num.get();
+        }
+        Optional<Boolean> bool = value.asBoolean();
+        if (bool.isPresent()) {
+            return bool.get();
+        }
+        Optional<Map<String, JsonValue>> obj = value.asObject();
+        if (obj.isPresent()) {
+            return jsonValueMapToObject(obj.get());
+        }
+        Optional<List<JsonValue>> arr = value.asArray();
+        if (arr.isPresent()) {
+            List<Object> list = new ArrayList<>();
+            for (JsonValue item : arr.get()) {
+                list.add(jsonValueToObject(item));
+            }
+            return list;
+        }
+        return null;
     }
-    Optional<String> str = value.asString();
-    if (str.isPresent()) {
-      return str.get();
-    }
-    Optional<Number> num = value.asNumber();
-    if (num.isPresent()) {
-      return num.get();
-    }
-    Optional<Boolean> bool = value.asBoolean();
-    if (bool.isPresent()) {
-      return bool.get();
-    }
-    Optional<Map<String, JsonValue>> obj = value.asObject();
-    if (obj.isPresent()) {
-      return jsonValueMapToObject(obj.get());
-    }
-    Optional<List<JsonValue>> arr = value.asArray();
-    if (arr.isPresent()) {
-      List<Object> list = new ArrayList<>();
-      for (JsonValue item : arr.get()) {
-        list.add(jsonValueToObject(item));
-      }
-      return list;
-    }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/OpenAiDecorator.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/OpenAiDecorator.java
index a31cf5c95b3..44222e42c6b 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/OpenAiDecorator.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/OpenAiDecorator.java
@@ -26,222 +26,221 @@
 import javax.annotation.Nonnull;
 
 public class OpenAiDecorator extends ClientDecorator {
-  public static final OpenAiDecorator DECORATE = new OpenAiDecorator();
-
-  private static final String INTEGRATION = "openai";
-  private static final String INSTRUMENTATION_NAME = "openai-java";
-  private static final CharSequence SPAN_NAME = UTF8BytesString.create("openai.request");
-
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create(INTEGRATION);
-
-  private static final String METRIC_PREFIX = "openai.organization.ratelimit.";
-  private static final String REQUESTS_LIMIT_METRIC = METRIC_PREFIX + "requests.limit";
-  private static final String REQUESTS_REMAINING_METRIC = METRIC_PREFIX + "requests.remaining";
-  private static final String TOKENS_LIMIT_METRIC = METRIC_PREFIX + "tokens.limit";
-  private static final String TOKENS_REMAINING_METRIC = METRIC_PREFIX + "tokens.remaining";
-
-  private static final String EMBEDDINGS_ENDPOINT = "/v1/embeddings";
-
-  private static final String HEADER_PREFIX = "x-ratelimit-";
-  private static final String LIMIT_REQUESTS_HEADER = HEADER_PREFIX + "limit-requests";
-  private static final String REMAINING_REQUESTS_HEADER = HEADER_PREFIX + "remaining-requests";
-  private static final String LIMIT_TOKENS_HEADER = HEADER_PREFIX + "limit-tokens";
-  private static final String REMAINING_TOKENS_HEADER = HEADER_PREFIX + "remaining-tokens";
-
-  private final boolean llmObsEnabled = Config.get().isLlmObsEnabled();
-  private final WellKnownTags wellKnownTags = Config.get().getWellKnownTags();
-  private final LLMObsSampler sampler = LLMObsSampler.fromConfig();
-
-  public AgentSpan startSpan(ClientOptions clientOptions) {
-    AgentSpan span = AgentTracer.startSpan(INTEGRATION, SPAN_NAME);
-    afterStart(span);
-    String baseUrl = clientOptions.baseUrl();
-    span.setTag(CommonTags.OPENAI_API_BASE, baseUrl);
-    span.setTag(CommonTags.MODEL_PROVIDER, detectProvider(baseUrl));
-    span.setTag(CommonTags.OPENAI_REQUEST_METHOD, "POST");
-    return span;
-  }
-
-  private String detectProvider(String baseUrl) {
-    if (baseUrl != null) {
-      String lower = baseUrl.toLowerCase();
-      if (lower.contains("azure")) return "azure_openai";
-      if (lower.contains("deepseek")) return "deepseek";
+    public static final OpenAiDecorator DECORATE = new OpenAiDecorator();
+
+    private static final String INTEGRATION = "openai";
+    private static final String INSTRUMENTATION_NAME = "openai-java";
+    private static final CharSequence SPAN_NAME = UTF8BytesString.create("openai.request");
+
+    private static final CharSequence COMPONENT_NAME = UTF8BytesString.create(INTEGRATION);
+
+    private static final String METRIC_PREFIX = "openai.organization.ratelimit.";
+    private static final String REQUESTS_LIMIT_METRIC = METRIC_PREFIX + "requests.limit";
+    private static final String REQUESTS_REMAINING_METRIC = METRIC_PREFIX + "requests.remaining";
+    private static final String TOKENS_LIMIT_METRIC = METRIC_PREFIX + "tokens.limit";
+    private static final String TOKENS_REMAINING_METRIC = METRIC_PREFIX + "tokens.remaining";
+
+    private static final String EMBEDDINGS_ENDPOINT = "/v1/embeddings";
+
+    private static final String HEADER_PREFIX = "x-ratelimit-";
+    private static final String LIMIT_REQUESTS_HEADER = HEADER_PREFIX + "limit-requests";
+    private static final String REMAINING_REQUESTS_HEADER = HEADER_PREFIX + "remaining-requests";
+    private static final String LIMIT_TOKENS_HEADER = HEADER_PREFIX + "limit-tokens";
+    private static final String REMAINING_TOKENS_HEADER = HEADER_PREFIX + "remaining-tokens";
+
+    private final boolean llmObsEnabled = Config.get().isLlmObsEnabled();
+    private final WellKnownTags wellKnownTags = Config.get().getWellKnownTags();
+    private final LLMObsSampler sampler = LLMObsSampler.fromConfig();
+
+    public AgentSpan startSpan(ClientOptions clientOptions) {
+        AgentSpan span = AgentTracer.startSpan(INTEGRATION, SPAN_NAME);
+        afterStart(span);
+        String baseUrl = clientOptions.baseUrl();
+        span.setTag(CommonTags.OPENAI_API_BASE, baseUrl);
+        span.setTag(CommonTags.MODEL_PROVIDER, detectProvider(baseUrl));
+        span.setTag(CommonTags.OPENAI_REQUEST_METHOD, "POST");
+        return span;
     }
-    return "openai";
-  }
-
-  public void finishSpan(AgentSpan span, Throwable err) {
-    onError(span, err);
-    beforeFinish(span);
-    span.finish();
-  }
-
-  @Override
-  protected String service() {
-    return null;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {INSTRUMENTATION_NAME};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.LLMOBS;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected void doAfterStart(@Nonnull AgentSpan span) {
-    if (llmObsEnabled) {
-      // set global dd_tags as base layer so UST and span-level tags can override them
-      for (Map.Entry<String, String> entry : Config.get().getGlobalTags().entrySet()) {
-        span.setTag(CommonTags.TAG_PREFIX + entry.getKey(), entry.getValue());
-      }
-
-      // set UST (unified service tags, env, service, version)
-      span.setTag(CommonTags.ENV, wellKnownTags.getEnv());
-      span.setTag(CommonTags.SERVICE, wellKnownTags.getService());
-      span.setTag(CommonTags.VERSION, wellKnownTags.getVersion());
-      span.setTag(CommonTags.DDTRACE_VERSION, DDTraceApiInfo.VERSION);
-
-      span.setTag(CommonTags.ML_APP, Config.get().getLlmObsMlApp());
-      span.setTag(CommonTags.SOURCE, "integration");
-      span.setTag(CommonTags.INTEGRATION, INTEGRATION);
-
-      // Resolve the LLMObs parent context, gated on trace-id consistency: a stale context
-      // from a different trace (e.g. async boundary leakage) must not contribute parent_id,
-      // session_id, agent_version, agent attribution, or a sampling verdict to this span.
-      // Matches DDLLMObsSpan's manual-span gate. One flag drives every inherited value, so a
-      // new propagated tag cannot accidentally ship with a weaker gate of its own.
-      AgentSpanContext parent = LLMObsContext.current();
-      boolean inheritable = parent != null && parent.getTraceId().equals(span.getTraceId());
-
-      String parentSpanId = LLMObsContext.ROOT_SPAN_ID;
-      String samplingDecision = null;
-      String sampleRate = null;
-      if (inheritable) {
-        parentSpanId = String.valueOf(parent.getSpanId());
-
-        // Inherit session_id from the active LLMObs parent (e.g. a manual workflow span).
-        // Matches dd-trace-py / dd-trace-js, where auto-instrumented LLM spans inherit
-        // session_id from the workflow root via context propagation. Without this, the
-        // auto-instrumented openai.request span would not appear under its session in
-        // the LLM Trace Explorer's Sessions view.
-        String sessionId = LLMObsContext.currentSessionId();
-        if (sessionId != null && !sessionId.isEmpty()) {
-          span.setTag(CommonTags.SESSION_ID, sessionId);
-        }
 
-        // Inherit agent_version from the active LLMObs parent.
-        String agentVersion = LLMObsContext.currentAgentVersion();
-        if (agentVersion != null && !agentVersion.isEmpty()) {
-          span.setTag(CommonTags.AGENT_VERSION, agentVersion);
+    private String detectProvider(String baseUrl) {
+        if (baseUrl != null) {
+            String lower = baseUrl.toLowerCase();
+            if (lower.contains("azure")) return "azure_openai";
+            if (lower.contains("deepseek")) return "deepseek";
         }
+        return "openai";
+    }
 
-        // Inherit agent attribution: the nearest agent-kind ancestor of this span. The name is
-        // only meaningful alongside an ID, so it is read inside the ID's branch.
-        String parentAgentSpanId = LLMObsContext.currentParentAgentSpanId();
-        if (parentAgentSpanId != null) {
-          span.setTag(CommonTags.PAGENT_SPAN_ID, parentAgentSpanId);
-          String parentAgentName = LLMObsContext.currentParentAgentName();
-          if (parentAgentName != null) {
-            span.setTag(CommonTags.PAGENT_NAME, parentAgentName);
-          }
-        }
+    public void finishSpan(AgentSpan span, Throwable err) {
+        onError(span, err);
+        beforeFinish(span);
+        span.finish();
+    }
+
+    @Override
+    protected String service() {
+        return null;
+    }
 
-        samplingDecision = LLMObsContext.currentSamplingDecision();
-        sampleRate = LLMObsContext.currentSampleRate();
-      }
-      span.setTag(CommonTags.PARENT_ID, parentSpanId);
-
-      // Compute the sampling decision if none was inherited (no LLMObs parent), which makes this
-      // span the root of its own LLMObs trace. Unlike the tags above, this cannot be skipped when
-      // there is nothing to inherit: an unstamped span is retained at any configured rate.
-      if (samplingDecision == null || sampleRate == null) {
-        sampleRate = sampler.formattedRate();
-        samplingDecision =
-            sampler.sample(span.getTraceId().toLong())
-                ? LLMObsContext.SAMPLING_DECISION_SAMPLED
-                : LLMObsContext.SAMPLING_DECISION_DROPPED;
-      }
-      span.setTag(CommonTags.SAMPLING_DECISION, samplingDecision);
-      span.setTag(CommonTags.SAMPLE_RATE, sampleRate);
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {INSTRUMENTATION_NAME};
     }
-    super.doAfterStart(span);
-  }
-
-  @Override
-  protected void doBeforeFinish(@Nonnull Context context) {
-    AgentSpan span = fromContext(context);
-    if (llmObsEnabled && span != null) {
-      span.setTag(CommonTags.ERROR, span.isError() ? 1 : 0);
-      span.setTag(CommonTags.ERROR_TYPE, span.getTag(DDTags.ERROR_TYPE));
-
-      GenAiApmTags.apply(span);
-
-      Object spanKindTag = span.getTag(CommonTags.SPAN_KIND);
-      if (spanKindTag != null) {
-        String spanKind = spanKindTag.toString();
-        boolean isRootSpan = span.getLocalRootSpan() == span;
-        LLMObsMetricCollector.get()
-            .recordSpanFinished(INTEGRATION, spanKind, isRootSpan, true, span.isError(), false);
-      }
-    } else if (span != null) {
-      // Tracing still runs with LLM Observability off, where these remain resolvable.
-      GenAiApmTags.apply(
-          span, operationName(span), requestedModel(span), Config.get().getLlmObsMlApp());
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.LLMOBS;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
+
+    @Override
+    protected void doAfterStart(@Nonnull AgentSpan span) {
+        if (llmObsEnabled) {
+            // set global dd_tags as base layer so UST and span-level tags can override them
+            for (Map.Entry<String, String> entry : Config.get().getGlobalTags().entrySet()) {
+                span.setTag(CommonTags.TAG_PREFIX + entry.getKey(), entry.getValue());
+            }
+
+            // set UST (unified service tags, env, service, version)
+            span.setTag(CommonTags.ENV, wellKnownTags.getEnv());
+            span.setTag(CommonTags.SERVICE, wellKnownTags.getService());
+            span.setTag(CommonTags.VERSION, wellKnownTags.getVersion());
+            span.setTag(CommonTags.DDTRACE_VERSION, DDTraceApiInfo.VERSION);
+
+            span.setTag(CommonTags.ML_APP, Config.get().getLlmObsMlApp());
+            span.setTag(CommonTags.SOURCE, "integration");
+            span.setTag(CommonTags.INTEGRATION, INTEGRATION);
+
+            // Resolve the LLMObs parent context, gated on trace-id consistency: a stale context
+            // from a different trace (e.g. async boundary leakage) must not contribute parent_id,
+            // session_id, agent_version, agent attribution, or a sampling verdict to this span.
+            // Matches DDLLMObsSpan's manual-span gate. One flag drives every inherited value, so a
+            // new propagated tag cannot accidentally ship with a weaker gate of its own.
+            AgentSpanContext parent = LLMObsContext.current();
+            boolean inheritable = parent != null && parent.getTraceId().equals(span.getTraceId());
+
+            String parentSpanId = LLMObsContext.ROOT_SPAN_ID;
+            String samplingDecision = null;
+            String sampleRate = null;
+            if (inheritable) {
+                parentSpanId = String.valueOf(parent.getSpanId());
+
+                // Inherit session_id from the active LLMObs parent (e.g. a manual workflow span).
+                // Matches dd-trace-py / dd-trace-js, where auto-instrumented LLM spans inherit
+                // session_id from the workflow root via context propagation. Without this, the
+                // auto-instrumented openai.request span would not appear under its session in
+                // the LLM Trace Explorer's Sessions view.
+                String sessionId = LLMObsContext.currentSessionId();
+                if (sessionId != null && !sessionId.isEmpty()) {
+                    span.setTag(CommonTags.SESSION_ID, sessionId);
+                }
+
+                // Inherit agent_version from the active LLMObs parent.
+                String agentVersion = LLMObsContext.currentAgentVersion();
+                if (agentVersion != null && !agentVersion.isEmpty()) {
+                    span.setTag(CommonTags.AGENT_VERSION, agentVersion);
+                }
+
+                // Inherit agent attribution: the nearest agent-kind ancestor of this span. The name is
+                // only meaningful alongside an ID, so it is read inside the ID's branch.
+                String parentAgentSpanId = LLMObsContext.currentParentAgentSpanId();
+                if (parentAgentSpanId != null) {
+                    span.setTag(CommonTags.PAGENT_SPAN_ID, parentAgentSpanId);
+                    String parentAgentName = LLMObsContext.currentParentAgentName();
+                    if (parentAgentName != null) {
+                        span.setTag(CommonTags.PAGENT_NAME, parentAgentName);
+                    }
+                }
+
+                samplingDecision = LLMObsContext.currentSamplingDecision();
+                sampleRate = LLMObsContext.currentSampleRate();
+            }
+            span.setTag(CommonTags.PARENT_ID, parentSpanId);
+
+            // Compute the sampling decision if none was inherited (no LLMObs parent), which makes this
+            // span the root of its own LLMObs trace. Unlike the tags above, this cannot be skipped when
+            // there is nothing to inherit: an unstamped span is retained at any configured rate.
+            if (samplingDecision == null || sampleRate == null) {
+                sampleRate = sampler.formattedRate();
+                samplingDecision = sampler.sample(span.getTraceId().toLong())
+                        ? LLMObsContext.SAMPLING_DECISION_SAMPLED
+                        : LLMObsContext.SAMPLING_DECISION_DROPPED;
+            }
+            span.setTag(CommonTags.SAMPLING_DECISION, samplingDecision);
+            span.setTag(CommonTags.SAMPLE_RATE, sampleRate);
+        }
+        super.doAfterStart(span);
     }
-    super.doBeforeFinish(context);
-  }
 
-  private static String operationName(AgentSpan span) {
-    String endpoint = stringTag(span, CommonTags.OPENAI_REQUEST_ENDPOINT);
-    if (endpoint == null) {
-      return null;
+    @Override
+    protected void doBeforeFinish(@Nonnull Context context) {
+        AgentSpan span = fromContext(context);
+        if (llmObsEnabled && span != null) {
+            span.setTag(CommonTags.ERROR, span.isError() ? 1 : 0);
+            span.setTag(CommonTags.ERROR_TYPE, span.getTag(DDTags.ERROR_TYPE));
+
+            GenAiApmTags.apply(span);
+
+            Object spanKindTag = span.getTag(CommonTags.SPAN_KIND);
+            if (spanKindTag != null) {
+                String spanKind = spanKindTag.toString();
+                boolean isRootSpan = span.getLocalRootSpan() == span;
+                LLMObsMetricCollector.get()
+                        .recordSpanFinished(INTEGRATION, spanKind, isRootSpan, true, span.isError(), false);
+            }
+        } else if (span != null) {
+            // Tracing still runs with LLM Observability off, where these remain resolvable.
+            GenAiApmTags.apply(
+                    span,
+                    operationName(span),
+                    requestedModel(span),
+                    Config.get().getLlmObsMlApp());
+        }
+        super.doBeforeFinish(context);
     }
-    return EMBEDDINGS_ENDPOINT.equals(endpoint)
-        ? Tags.LLMOBS_EMBEDDING_SPAN_KIND
-        : Tags.LLMOBS_LLM_SPAN_KIND;
-  }
-
-  /** The response model resolves aliases the request used, so it wins. */
-  private static String requestedModel(AgentSpan span) {
-    String model = stringTag(span, CommonTags.OPENAI_RESPONSE_MODEL);
-    return model != null ? model : stringTag(span, CommonTags.OPENAI_REQUEST_MODEL);
-  }
-
-  public void withHttpResponse(AgentSpan span, Headers headers) {
-    if (!llmObsEnabled) {
-      return;
+
+    private static String operationName(AgentSpan span) {
+        String endpoint = stringTag(span, CommonTags.OPENAI_REQUEST_ENDPOINT);
+        if (endpoint == null) {
+            return null;
+        }
+        return EMBEDDINGS_ENDPOINT.equals(endpoint) ? Tags.LLMOBS_EMBEDDING_SPAN_KIND : Tags.LLMOBS_LLM_SPAN_KIND;
     }
-    List<String> values = headers.values("openai-organization");
-    if (!values.isEmpty()) {
-      span.setTag(CommonTags.OPENAI_ORGANIZATION, values.get(0));
+
+    /** The response model resolves aliases the request used, so it wins. */
+    private static String requestedModel(AgentSpan span) {
+        String model = stringTag(span, CommonTags.OPENAI_RESPONSE_MODEL);
+        return model != null ? model : stringTag(span, CommonTags.OPENAI_REQUEST_MODEL);
     }
-    setMetricFromHeader(span, REQUESTS_LIMIT_METRIC, headers, LIMIT_REQUESTS_HEADER);
-    setMetricFromHeader(span, REQUESTS_REMAINING_METRIC, headers, REMAINING_REQUESTS_HEADER);
-    setMetricFromHeader(span, TOKENS_LIMIT_METRIC, headers, LIMIT_TOKENS_HEADER);
-    setMetricFromHeader(span, TOKENS_REMAINING_METRIC, headers, REMAINING_TOKENS_HEADER);
-  }
-
-  private static void setMetricFromHeader(
-      AgentSpan span, String metric, Headers headers, String header) {
-    List<String> values = headers.values(header);
-    if (values.isEmpty()) {
-      return;
+
+    public void withHttpResponse(AgentSpan span, Headers headers) {
+        if (!llmObsEnabled) {
+            return;
+        }
+        List<String> values = headers.values("openai-organization");
+        if (!values.isEmpty()) {
+            span.setTag(CommonTags.OPENAI_ORGANIZATION, values.get(0));
+        }
+        setMetricFromHeader(span, REQUESTS_LIMIT_METRIC, headers, LIMIT_REQUESTS_HEADER);
+        setMetricFromHeader(span, REQUESTS_REMAINING_METRIC, headers, REMAINING_REQUESTS_HEADER);
+        setMetricFromHeader(span, TOKENS_LIMIT_METRIC, headers, LIMIT_TOKENS_HEADER);
+        setMetricFromHeader(span, TOKENS_REMAINING_METRIC, headers, REMAINING_TOKENS_HEADER);
     }
-    String firstHeader = values.get(0);
-    try {
-      int value = Integer.parseInt(firstHeader);
-      span.setMetric(metric, value);
-    } catch (NumberFormatException ignore) {
+
+    private static void setMetricFromHeader(AgentSpan span, String metric, Headers headers, String header) {
+        List<String> values = headers.values(header);
+        if (values.isEmpty()) {
+            return;
+        }
+        String firstHeader = values.get(0);
+        try {
+            int value = Integer.parseInt(firstHeader);
+            span.setMetric(metric, value);
+        } catch (NumberFormatException ignore) {
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseDecorator.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseDecorator.java
index 82f4a44f025..bef2f704631 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseDecorator.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseDecorator.java
@@ -37,935 +37,897 @@
 import java.util.Optional;
 
 public class ResponseDecorator {
-  public static final ResponseDecorator DECORATE = new ResponseDecorator();
+    public static final ResponseDecorator DECORATE = new ResponseDecorator();
 
-  private static final CharSequence RESPONSES_CREATE = UTF8BytesString.create("createResponse");
-  private static final String IMAGE_FALLBACK_MARKER = "[image]";
-  private static final String FILE_FALLBACK_MARKER = "[file]";
+    private static final CharSequence RESPONSES_CREATE = UTF8BytesString.create("createResponse");
+    private static final String IMAGE_FALLBACK_MARKER = "[image]";
+    private static final String FILE_FALLBACK_MARKER = "[file]";
 
-  private final boolean llmObsEnabled = Config.get().isLlmObsEnabled();
+    private final boolean llmObsEnabled = Config.get().isLlmObsEnabled();
 
-  public void withResponseCreateParams(AgentSpan span, ResponseCreateParams params) {
-    span.setResourceName(RESPONSES_CREATE);
-    span.setTag(CommonTags.OPENAI_REQUEST_ENDPOINT, "/v1/responses");
-    if (params == null) {
-      return;
-    }
-    // Use ResponseCreateParams._model() b/o ResponseCreateParams.model() changed type from
-    // ResponsesModel to Optional<ResponsesModel> in
-    // https://github.com/openai/openai-java/commit/87dd64658da6cec7564f3b571e15ec0e2db0660b
-    String modelName = extractResponseModel(params._model());
-    span.setTag(CommonTags.OPENAI_REQUEST_MODEL, modelName);
-
-    if (!llmObsEnabled) {
-      return;
-    }
+    public void withResponseCreateParams(AgentSpan span, ResponseCreateParams params) {
+        span.setResourceName(RESPONSES_CREATE);
+        span.setTag(CommonTags.OPENAI_REQUEST_ENDPOINT, "/v1/responses");
+        if (params == null) {
+            return;
+        }
+        // Use ResponseCreateParams._model() b/o ResponseCreateParams.model() changed type from
+        // ResponsesModel to Optional<ResponsesModel> in
+        // https://github.com/openai/openai-java/commit/87dd64658da6cec7564f3b571e15ec0e2db0660b
+        String modelName = extractResponseModel(params._model());
+        span.setTag(CommonTags.OPENAI_REQUEST_MODEL, modelName);
+
+        if (!llmObsEnabled) {
+            return;
+        }
 
-    // Keep model_name/output/metadata shape stable on error paths where no response is available.
-    if (modelName != null && !modelName.isEmpty()) {
-      span.setTag(CommonTags.MODEL_NAME, modelName);
-    }
-    span.setTag(CommonTags.OUTPUT, Collections.singletonList(LLMObs.LLMMessage.from("", "")));
-    span.setTag(CommonTags.METADATA, new HashMap<String, Object>());
+        // Keep model_name/output/metadata shape stable on error paths where no response is available.
+        if (modelName != null && !modelName.isEmpty()) {
+            span.setTag(CommonTags.MODEL_NAME, modelName);
+        }
+        span.setTag(CommonTags.OUTPUT, Collections.singletonList(LLMObs.LLMMessage.from("", "")));
+        span.setTag(CommonTags.METADATA, new HashMap<String, Object>());
 
-    span.setTag(CommonTags.SPAN_KIND, Tags.LLMOBS_LLM_SPAN_KIND);
+        span.setTag(CommonTags.SPAN_KIND, Tags.LLMOBS_LLM_SPAN_KIND);
 
-    List<LLMObs.LLMMessage> inputMessages = new ArrayList<>();
+        List<LLMObs.LLMMessage> inputMessages = new ArrayList<>();
 
-    params
-        ._instructions()
-        .asString()
-        .ifPresent(
-            instructions -> {
-              inputMessages.add(LLMObs.LLMMessage.from("system", instructions));
-            });
+        params._instructions().asString().ifPresent(instructions -> {
+            inputMessages.add(LLMObs.LLMMessage.from("system", instructions));
+        });
 
-    Optional<String> textOpt = params._input().asString();
-    if (textOpt.isPresent()) {
-      inputMessages.add(LLMObs.LLMMessage.from("user", textOpt.get()));
-    }
+        Optional<String> textOpt = params._input().asString();
+        if (textOpt.isPresent()) {
+            inputMessages.add(LLMObs.LLMMessage.from("user", textOpt.get()));
+        }
 
-    Optional<ResponseCreateParams.Input> inputOpt = params._input().asKnown();
-    if (inputOpt.isPresent()) {
-      ResponseCreateParams.Input input = inputOpt.get();
-      Optional<String> inputText = input.text();
-      if (inputText.isPresent()) {
-        inputMessages.add(LLMObs.LLMMessage.from("user", inputText.get()));
-      } else {
-        for (ResponseInputItem item : input.response().orElse(Collections.emptyList())) {
-          LLMObs.LLMMessage message = extractInputItemMessage(item);
-          if (message != null) {
-            inputMessages.add(message);
-          }
-        }
-      }
-    }
+        Optional<ResponseCreateParams.Input> inputOpt = params._input().asKnown();
+        if (inputOpt.isPresent()) {
+            ResponseCreateParams.Input input = inputOpt.get();
+            Optional<String> inputText = input.text();
+            if (inputText.isPresent()) {
+                inputMessages.add(LLMObs.LLMMessage.from("user", inputText.get()));
+            } else {
+                for (ResponseInputItem item : input.response().orElse(Collections.emptyList())) {
+                    LLMObs.LLMMessage message = extractInputItemMessage(item);
+                    if (message != null) {
+                        inputMessages.add(message);
+                    }
+                }
+            }
+        }
 
-    // Handle raw list input (when SDK can't parse into known types)
-    // This path is tested by "create streaming response with raw json tool input test"
-    if (inputMessages.isEmpty()) {
-      Optional<JsonValue> rawValueOpt = params._input().asUnknown();
-      if (rawValueOpt.isPresent()) {
-        Optional<List<JsonValue>> rawListOpt = rawValueOpt.get().asArray();
-        if (rawListOpt.isPresent()) {
-          for (JsonValue item : rawListOpt.get()) {
-            LLMObs.LLMMessage message = extractMessageFromRawJson(item);
-            if (message != null) {
-              inputMessages.add(message);
-            }
-          }
-        }
-      }
-    }
+        // Handle raw list input (when SDK can't parse into known types)
+        // This path is tested by "create streaming response with raw json tool input test"
+        if (inputMessages.isEmpty()) {
+            Optional<JsonValue> rawValueOpt = params._input().asUnknown();
+            if (rawValueOpt.isPresent()) {
+                Optional<List<JsonValue>> rawListOpt = rawValueOpt.get().asArray();
+                if (rawListOpt.isPresent()) {
+                    for (JsonValue item : rawListOpt.get()) {
+                        LLMObs.LLMMessage message = extractMessageFromRawJson(item);
+                        if (message != null) {
+                            inputMessages.add(message);
+                        }
+                    }
+                }
+            }
+        }
 
-    if (!inputMessages.isEmpty()) {
-      span.setTag(CommonTags.INPUT, inputMessages);
-    }
+        if (!inputMessages.isEmpty()) {
+            span.setTag(CommonTags.INPUT, inputMessages);
+        }
 
-    extractReasoningFromParams(params)
-        .ifPresent(reasoningMap -> span.setTag(CommonTags.REQUEST_REASONING, reasoningMap));
+        extractReasoningFromParams(params)
+                .ifPresent(reasoningMap -> span.setTag(CommonTags.REQUEST_REASONING, reasoningMap));
 
-    extractPromptFromParams(params)
-        .ifPresent(prompt -> span.setTag(CommonTags.REQUEST_PROMPT, prompt));
+        extractPromptFromParams(params).ifPresent(prompt -> span.setTag(CommonTags.REQUEST_PROMPT, prompt));
 
-    List<Map<String, Object>> toolDefinitions = extractToolDefinitionsFromParams(params);
-    if (!toolDefinitions.isEmpty()) {
-      span.setTag(CommonTags.TOOL_DEFINITIONS, toolDefinitions);
+        List<Map<String, Object>> toolDefinitions = extractToolDefinitionsFromParams(params);
+        if (!toolDefinitions.isEmpty()) {
+            span.setTag(CommonTags.TOOL_DEFINITIONS, toolDefinitions);
+        }
     }
-  }
-
-  private List<Map<String, Object>> extractToolDefinitionsFromParams(ResponseCreateParams params) {
-    Optional<List<Tool>> toolsOpt = params._tools().asKnown();
-    if (toolsOpt.isPresent()) {
-      List<Map<String, Object>> toolDefinitions = new ArrayList<>();
-      for (Tool tool : toolsOpt.get()) {
-        if (!tool.isFunction()) {
-          continue;
-        }
-        Map<String, Object> toolDef = extractFunctionToolDefinition(tool.asFunction());
-        if (toolDef != null) {
-          toolDefinitions.add(toolDef);
-        }
-      }
-      if (!toolDefinitions.isEmpty()) {
+
+    private List<Map<String, Object>> extractToolDefinitionsFromParams(ResponseCreateParams params) {
+        Optional<List<Tool>> toolsOpt = params._tools().asKnown();
+        if (toolsOpt.isPresent()) {
+            List<Map<String, Object>> toolDefinitions = new ArrayList<>();
+            for (Tool tool : toolsOpt.get()) {
+                if (!tool.isFunction()) {
+                    continue;
+                }
+                Map<String, Object> toolDef = extractFunctionToolDefinition(tool.asFunction());
+                if (toolDef != null) {
+                    toolDefinitions.add(toolDef);
+                }
+            }
+            if (!toolDefinitions.isEmpty()) {
+                return toolDefinitions;
+            }
+        }
+
+        Optional<JsonValue> rawToolsOpt = params._tools().asUnknown();
+        if (!rawToolsOpt.isPresent()) {
+            return Collections.emptyList();
+        }
+        Optional<List<JsonValue>> rawToolListOpt = rawToolsOpt.get().asArray();
+        if (!rawToolListOpt.isPresent()) {
+            return Collections.emptyList();
+        }
+
+        List<Map<String, Object>> toolDefinitions = new ArrayList<>();
+        for (JsonValue rawTool : rawToolListOpt.get()) {
+            Map<String, Object> toolDef = extractFunctionToolDefinition(rawTool);
+            if (toolDef != null) {
+                toolDefinitions.add(toolDef);
+            }
+        }
         return toolDefinitions;
-      }
     }
 
-    Optional<JsonValue> rawToolsOpt = params._tools().asUnknown();
-    if (!rawToolsOpt.isPresent()) {
-      return Collections.emptyList();
-    }
-    Optional<List<JsonValue>> rawToolListOpt = rawToolsOpt.get().asArray();
-    if (!rawToolListOpt.isPresent()) {
-      return Collections.emptyList();
-    }
+    private Map<String, Object> extractFunctionToolDefinition(FunctionTool functionTool) {
+        String name = functionTool.name();
+        if (name == null || name.isEmpty()) {
+            return null;
+        }
 
-    List<Map<String, Object>> toolDefinitions = new ArrayList<>();
-    for (JsonValue rawTool : rawToolListOpt.get()) {
-      Map<String, Object> toolDef = extractFunctionToolDefinition(rawTool);
-      if (toolDef != null) {
-        toolDefinitions.add(toolDef);
-      }
+        Map<String, Object> toolDef = new HashMap<>();
+        toolDef.put("name", name);
+        functionTool.description().ifPresent(desc -> toolDef.put("description", desc));
+        functionTool
+                .parameters()
+                .ifPresent(
+                        parameters -> toolDef.put("schema", jsonValueMapToObject(parameters._additionalProperties())));
+        return toolDef;
     }
-    return toolDefinitions;
-  }
 
-  private Map<String, Object> extractFunctionToolDefinition(FunctionTool functionTool) {
-    String name = functionTool.name();
-    if (name == null || name.isEmpty()) {
-      return null;
-    }
+    private Map<String, Object> extractFunctionToolDefinition(JsonValue rawTool) {
+        Optional<Map<String, JsonValue>> toolObjOpt = rawTool.asObject();
+        if (!toolObjOpt.isPresent()) {
+            return null;
+        }
 
-    Map<String, Object> toolDef = new HashMap<>();
-    toolDef.put("name", name);
-    functionTool.description().ifPresent(desc -> toolDef.put("description", desc));
-    functionTool
-        .parameters()
-        .ifPresent(
-            parameters ->
-                toolDef.put("schema", jsonValueMapToObject(parameters._additionalProperties())));
-    return toolDef;
-  }
-
-  private Map<String, Object> extractFunctionToolDefinition(JsonValue rawTool) {
-    Optional<Map<String, JsonValue>> toolObjOpt = rawTool.asObject();
-    if (!toolObjOpt.isPresent()) {
-      return null;
-    }
+        Map<String, JsonValue> toolObj = toolObjOpt.get();
+        String type = getJsonString(toolObj.get("type"));
+        if (!"function".equals(type)) {
+            return null;
+        }
 
-    Map<String, JsonValue> toolObj = toolObjOpt.get();
-    String type = getJsonString(toolObj.get("type"));
-    if (!"function".equals(type)) {
-      return null;
-    }
+        JsonValue functionObjValue = toolObj.get("function");
+        Map<String, JsonValue> functionObj = null;
+        if (functionObjValue != null) {
+            Optional<Map<String, JsonValue>> nestedFunctionOpt = functionObjValue.asObject();
+            if (nestedFunctionOpt.isPresent()) {
+                functionObj = nestedFunctionOpt.get();
+            }
+        }
 
-    JsonValue functionObjValue = toolObj.get("function");
-    Map<String, JsonValue> functionObj = null;
-    if (functionObjValue != null) {
-      Optional<Map<String, JsonValue>> nestedFunctionOpt = functionObjValue.asObject();
-      if (nestedFunctionOpt.isPresent()) {
-        functionObj = nestedFunctionOpt.get();
-      }
-    }
+        String name = functionObj == null ? getJsonString(toolObj.get("name")) : getJsonString(functionObj.get("name"));
+        if (name == null || name.isEmpty()) {
+            return null;
+        }
 
-    String name =
-        functionObj == null
-            ? getJsonString(toolObj.get("name"))
-            : getJsonString(functionObj.get("name"));
-    if (name == null || name.isEmpty()) {
-      return null;
-    }
+        Map<String, Object> toolDef = new HashMap<>();
+        toolDef.put("name", name);
 
-    Map<String, Object> toolDef = new HashMap<>();
-    toolDef.put("name", name);
+        String description = functionObj == null
+                ? getJsonString(toolObj.get("description"))
+                : getJsonString(functionObj.get("description"));
+        if (description != null) {
+            toolDef.put("description", description);
+        }
 
-    String description =
-        functionObj == null
-            ? getJsonString(toolObj.get("description"))
-            : getJsonString(functionObj.get("description"));
-    if (description != null) {
-      toolDef.put("description", description);
-    }
+        JsonValue parameters = functionObj == null ? toolObj.get("parameters") : functionObj.get("parameters");
+        if (parameters != null) {
+            Object schema = jsonValueToObject(parameters);
+            if (schema != null) {
+                toolDef.put("schema", schema);
+            }
+        }
 
-    JsonValue parameters =
-        functionObj == null ? toolObj.get("parameters") : functionObj.get("parameters");
-    if (parameters != null) {
-      Object schema = jsonValueToObject(parameters);
-      if (schema != null) {
-        toolDef.put("schema", schema);
-      }
+        return toolDef;
     }
 
-    return toolDef;
-  }
+    private LLMObs.LLMMessage extractInputItemMessage(ResponseInputItem item) {
+        if (item.isEasyInputMessage()) {
+            EasyInputMessage message = item.asEasyInputMessage();
+            Optional<String> role = message._role().asKnown().map(EasyInputMessage.Role::asString);
+            if (!role.isPresent()) {
+                return null;
+            }
+            String content = extractEasyInputMessageContent(message);
+            if (content == null || content.isEmpty()) {
+                return null;
+            }
+            return LLMObs.LLMMessage.from(role.get(), content);
+        } else if (item.isMessage()) {
+            ResponseInputItem.Message message = item.asMessage();
+            Optional<String> role = message._role().asKnown().map(ResponseInputItem.Message.Role::asString);
+            if (!role.isPresent()) {
+                return null;
+            }
+            String content = extractInputMessageContent(message);
+            if (content == null || content.isEmpty()) {
+                return null;
+            }
+            return LLMObs.LLMMessage.from(role.get(), content);
+        }
+
+        Optional<ResponseFunctionToolCall> functionCallOpt = item.functionCall();
+        if (functionCallOpt.isPresent()) {
+            // Function call is mapped to assistant message with tool_calls
+            ResponseFunctionToolCall functionCall = functionCallOpt.get();
+            LLMObs.ToolCall toolCall = ToolCallExtractor.getToolCall(functionCall);
+            if (toolCall != null) {
+                List<LLMObs.ToolCall> toolCalls = Collections.singletonList(toolCall);
+                return LLMObs.LLMMessage.from("assistant", null, toolCalls);
+            }
+        }
 
-  private LLMObs.LLMMessage extractInputItemMessage(ResponseInputItem item) {
-    if (item.isEasyInputMessage()) {
-      EasyInputMessage message = item.asEasyInputMessage();
-      Optional<String> role = message._role().asKnown().map(EasyInputMessage.Role::asString);
-      if (!role.isPresent()) {
-        return null;
-      }
-      String content = extractEasyInputMessageContent(message);
-      if (content == null || content.isEmpty()) {
-        return null;
-      }
-      return LLMObs.LLMMessage.from(role.get(), content);
-    } else if (item.isMessage()) {
-      ResponseInputItem.Message message = item.asMessage();
-      Optional<String> role =
-          message._role().asKnown().map(ResponseInputItem.Message.Role::asString);
-      if (!role.isPresent()) {
-        return null;
-      }
-      String content = extractInputMessageContent(message);
-      if (content == null || content.isEmpty()) {
+        Optional<ResponseInputItem.FunctionCallOutput> functionCallOutput = item.functionCallOutput();
+        if (functionCallOutput.isPresent()) {
+            ResponseInputItem.FunctionCallOutput output = functionCallOutput.get();
+            String callId = FunctionCallOutputExtractor.getCallIdAsString(output);
+            String result = FunctionCallOutputExtractor.getOutputAsString(output);
+            LLMObs.ToolResult toolResult = LLMObs.ToolResult.from("", "function_call_output", callId, result);
+            List<LLMObs.ToolResult> toolResults = Collections.singletonList(toolResult);
+            return LLMObs.LLMMessage.fromToolResults("user", toolResults);
+        }
         return null;
-      }
-      return LLMObs.LLMMessage.from(role.get(), content);
     }
 
-    Optional<ResponseFunctionToolCall> functionCallOpt = item.functionCall();
-    if (functionCallOpt.isPresent()) {
-      // Function call is mapped to assistant message with tool_calls
-      ResponseFunctionToolCall functionCall = functionCallOpt.get();
-      LLMObs.ToolCall toolCall = ToolCallExtractor.getToolCall(functionCall);
-      if (toolCall != null) {
-        List<LLMObs.ToolCall> toolCalls = Collections.singletonList(toolCall);
-        return LLMObs.LLMMessage.from("assistant", null, toolCalls);
-      }
-    }
-
-    Optional<ResponseInputItem.FunctionCallOutput> functionCallOutput = item.functionCallOutput();
-    if (functionCallOutput.isPresent()) {
-      ResponseInputItem.FunctionCallOutput output = functionCallOutput.get();
-      String callId = FunctionCallOutputExtractor.getCallIdAsString(output);
-      String result = FunctionCallOutputExtractor.getOutputAsString(output);
-      LLMObs.ToolResult toolResult =
-          LLMObs.ToolResult.from("", "function_call_output", callId, result);
-      List<LLMObs.ToolResult> toolResults = Collections.singletonList(toolResult);
-      return LLMObs.LLMMessage.fromToolResults("user", toolResults);
-    }
-    return null;
-  }
+    private String extractEasyInputMessageContent(EasyInputMessage message) {
+        Optional<EasyInputMessage.Content> contentValue = message._content().asKnown();
+        if (!contentValue.isPresent()) {
+            return null;
+        }
 
-  private String extractEasyInputMessageContent(EasyInputMessage message) {
-    Optional<EasyInputMessage.Content> contentValue = message._content().asKnown();
-    if (!contentValue.isPresent()) {
-      return null;
-    }
+        EasyInputMessage.Content contentValueTyped = contentValue.get();
+        Optional<String> textInput = contentValueTyped.textInput();
+        if (textInput.isPresent()) {
+            String content = textInput.get();
+            return content == null || content.isEmpty() ? null : content;
+        }
 
-    EasyInputMessage.Content contentValueTyped = contentValue.get();
-    Optional<String> textInput = contentValueTyped.textInput();
-    if (textInput.isPresent()) {
-      String content = textInput.get();
-      return content == null || content.isEmpty() ? null : content;
+        StringBuilder contentBuilder = new StringBuilder();
+        for (ResponseInputContent content :
+                contentValueTyped.responseInputMessageContentList().orElse(Collections.emptyList())) {
+            String contentPart = extractInputContentText(content);
+            if (contentPart != null) {
+                contentBuilder.append(contentPart);
+            }
+        }
+        String result = contentBuilder.toString();
+        return result.isEmpty() ? null : result;
     }
 
-    StringBuilder contentBuilder = new StringBuilder();
-    for (ResponseInputContent content :
-        contentValueTyped.responseInputMessageContentList().orElse(Collections.emptyList())) {
-      String contentPart = extractInputContentText(content);
-      if (contentPart != null) {
-        contentBuilder.append(contentPart);
-      }
-    }
-    String result = contentBuilder.toString();
-    return result.isEmpty() ? null : result;
-  }
-
-  private LLMObs.LLMMessage extractMessageFromRawJson(JsonValue jsonValue) {
-    Optional<Map<String, JsonValue>> objOpt = jsonValue.asObject();
-    if (!objOpt.isPresent()) {
-      return null;
-    }
+    private LLMObs.LLMMessage extractMessageFromRawJson(JsonValue jsonValue) {
+        Optional<Map<String, JsonValue>> objOpt = jsonValue.asObject();
+        if (!objOpt.isPresent()) {
+            return null;
+        }
 
-    Map<String, JsonValue> obj = objOpt.get();
-    JsonValue typeValue = obj.get("type");
+        Map<String, JsonValue> obj = objOpt.get();
+        JsonValue typeValue = obj.get("type");
+
+        // Check if it's a function_call
+        if (typeValue != null) {
+            Optional<String> typeStr = typeValue.asString();
+            if (typeStr.isPresent()) {
+                String type = typeStr.get();
+
+                if ("function_call".equals(type)) {
+                    // Extract function call details
+                    JsonValue callIdValue = obj.get("call_id");
+                    JsonValue nameValue = obj.get("name");
+                    JsonValue argumentsValue = obj.get("arguments");
+
+                    String callId = null;
+                    String name = null;
+                    String argumentsStr = null;
+
+                    if (callIdValue != null) {
+                        Optional<String> opt = callIdValue.asString();
+                        if (opt.isPresent()) {
+                            callId = opt.get();
+                        }
+                    }
+                    if (nameValue != null) {
+                        Optional<String> opt = nameValue.asString();
+                        if (opt.isPresent()) {
+                            name = opt.get();
+                        }
+                    }
+                    if (argumentsValue != null) {
+                        Optional<String> opt = argumentsValue.asString();
+                        if (opt.isPresent()) {
+                            argumentsStr = opt.get();
+                        }
+                    }
+
+                    if (callId != null && name != null && argumentsStr != null) {
+                        Map<String, Object> arguments = ToolCallExtractor.parseArguments(argumentsStr);
+                        LLMObs.ToolCall toolCall = LLMObs.ToolCall.from(name, "function_call", callId, arguments);
+                        return LLMObs.LLMMessage.from("assistant", null, Collections.singletonList(toolCall));
+                    }
+                } else if ("function_call_output".equals(type)) {
+                    // Extract function call output
+                    JsonValue callIdValue = obj.get("call_id");
+                    JsonValue outputValue = obj.get("output");
+
+                    String callId = null;
+                    String output = null;
+
+                    if (callIdValue != null) {
+                        Optional<String> opt = callIdValue.asString();
+                        if (opt.isPresent()) {
+                            callId = opt.get();
+                        }
+                    }
+                    if (outputValue != null) {
+                        Optional<String> opt = outputValue.asString();
+                        if (opt.isPresent()) {
+                            output = opt.get();
+                        }
+                    }
 
-    // Check if it's a function_call
-    if (typeValue != null) {
-      Optional<String> typeStr = typeValue.asString();
-      if (typeStr.isPresent()) {
-        String type = typeStr.get();
+                    if (callId != null && output != null) {
+                        LLMObs.ToolResult toolResult =
+                                LLMObs.ToolResult.from("", "function_call_output", callId, output);
+                        return LLMObs.LLMMessage.fromToolResults("user", Collections.singletonList(toolResult));
+                    }
+                }
+            }
+        }
 
-        if ("function_call".equals(type)) {
-          // Extract function call details
-          JsonValue callIdValue = obj.get("call_id");
-          JsonValue nameValue = obj.get("name");
-          JsonValue argumentsValue = obj.get("arguments");
+        // Otherwise, it's a regular message with role and content
+        JsonValue roleValue = obj.get("role");
+        JsonValue contentValue = obj.get("content");
 
-          String callId = null;
-          String name = null;
-          String argumentsStr = null;
+        String role = null;
+        String content = null;
 
-          if (callIdValue != null) {
-            Optional<String> opt = callIdValue.asString();
+        if (roleValue != null) {
+            Optional<String> opt = roleValue.asString();
             if (opt.isPresent()) {
-              callId = opt.get();
+                role = opt.get();
             }
-          }
-          if (nameValue != null) {
-            Optional<String> opt = nameValue.asString();
-            if (opt.isPresent()) {
-              name = opt.get();
-            }
-          }
-          if (argumentsValue != null) {
-            Optional<String> opt = argumentsValue.asString();
-            if (opt.isPresent()) {
-              argumentsStr = opt.get();
-            }
-          }
-
-          if (callId != null && name != null && argumentsStr != null) {
-            Map<String, Object> arguments = ToolCallExtractor.parseArguments(argumentsStr);
-            LLMObs.ToolCall toolCall =
-                LLMObs.ToolCall.from(name, "function_call", callId, arguments);
-            return LLMObs.LLMMessage.from("assistant", null, Collections.singletonList(toolCall));
-          }
-        } else if ("function_call_output".equals(type)) {
-          // Extract function call output
-          JsonValue callIdValue = obj.get("call_id");
-          JsonValue outputValue = obj.get("output");
-
-          String callId = null;
-          String output = null;
-
-          if (callIdValue != null) {
-            Optional<String> opt = callIdValue.asString();
-            if (opt.isPresent()) {
-              callId = opt.get();
-            }
-          }
-          if (outputValue != null) {
-            Optional<String> opt = outputValue.asString();
+        }
+        if (contentValue != null) {
+            Optional<String> opt = contentValue.asString();
             if (opt.isPresent()) {
-              output = opt.get();
+                content = opt.get();
             }
-          }
-
-          if (callId != null && output != null) {
-            LLMObs.ToolResult toolResult =
-                LLMObs.ToolResult.from("", "function_call_output", callId, output);
-            return LLMObs.LLMMessage.fromToolResults("user", Collections.singletonList(toolResult));
-          }
         }
-      }
-    }
-
-    // Otherwise, it's a regular message with role and content
-    JsonValue roleValue = obj.get("role");
-    JsonValue contentValue = obj.get("content");
 
-    String role = null;
-    String content = null;
+        if (role != null) {
+            return LLMObs.LLMMessage.from(role, content);
+        }
 
-    if (roleValue != null) {
-      Optional<String> opt = roleValue.asString();
-      if (opt.isPresent()) {
-        role = opt.get();
-      }
-    }
-    if (contentValue != null) {
-      Optional<String> opt = contentValue.asString();
-      if (opt.isPresent()) {
-        content = opt.get();
-      }
+        return null;
     }
 
-    if (role != null) {
-      return LLMObs.LLMMessage.from(role, content);
+    private String extractInputMessageContent(ResponseInputItem.Message message) {
+        StringBuilder contentBuilder = new StringBuilder();
+        for (ResponseInputContent content : message.content()) {
+            String contentPart = extractInputContentText(content);
+            if (contentPart != null) {
+                contentBuilder.append(contentPart);
+            }
+        }
+        String result = contentBuilder.toString();
+        return result.isEmpty() ? null : result;
     }
 
-    return null;
-  }
+    private String extractInputContentText(ResponseInputContent content) {
+        Optional<String> inputText = content.inputText().map(v -> v.text());
+        if (inputText.isPresent()) {
+            return inputText.get();
+        }
 
-  private String extractInputMessageContent(ResponseInputItem.Message message) {
-    StringBuilder contentBuilder = new StringBuilder();
-    for (ResponseInputContent content : message.content()) {
-      String contentPart = extractInputContentText(content);
-      if (contentPart != null) {
-        contentBuilder.append(contentPart);
-      }
-    }
-    String result = contentBuilder.toString();
-    return result.isEmpty() ? null : result;
-  }
-
-  private String extractInputContentText(ResponseInputContent content) {
-    Optional<String> inputText = content.inputText().map(v -> v.text());
-    if (inputText.isPresent()) {
-      return inputText.get();
-    }
+        Optional<String> inputImage =
+                content.inputImage().map(v -> v.imageUrl().orElse(v.fileId().orElse(IMAGE_FALLBACK_MARKER)));
+        if (inputImage.isPresent()) {
+            return inputImage.get();
+        }
 
-    Optional<String> inputImage =
-        content
-            .inputImage()
-            .map(v -> v.imageUrl().orElse(v.fileId().orElse(IMAGE_FALLBACK_MARKER)));
-    if (inputImage.isPresent()) {
-      return inputImage.get();
+        return content.inputFile()
+                .map(v -> v.fileUrl().orElse(v.fileId().orElse(v.filename().orElse(FILE_FALLBACK_MARKER))))
+                .orElse(null);
     }
 
-    return content
-        .inputFile()
-        .map(v -> v.fileUrl().orElse(v.fileId().orElse(v.filename().orElse(FILE_FALLBACK_MARKER))))
-        .orElse(null);
-  }
+    private Optional<Map<String, String>> extractReasoningFromParams(ResponseCreateParams params) {
+        JsonField<Reasoning> reasoningField = params._reasoning();
+        if (reasoningField.isMissing()) {
+            return Optional.empty();
+        }
 
-  private Optional<Map<String, String>> extractReasoningFromParams(ResponseCreateParams params) {
-    JsonField<Reasoning> reasoningField = params._reasoning();
-    if (reasoningField.isMissing()) {
-      return Optional.empty();
+        Map<String, String> reasoningMap = new HashMap<>();
+
+        Optional<Reasoning> knownReasoning = reasoningField.asKnown();
+        if (knownReasoning.isPresent()) {
+            Reasoning reasoning = knownReasoning.get();
+            reasoning.effort().ifPresent(effort -> reasoningMap.put("effort", effort.asString()));
+            reasoning.summary().ifPresent(summary -> reasoningMap.put("summary", summary.asString()));
+        } else {
+            Optional<Map<String, JsonValue>> rawObject = reasoningField.asObject();
+            if (rawObject.isPresent()) {
+                Map<String, JsonValue> obj = rawObject.get();
+                JsonValue effortVal = obj.get("effort");
+                if (effortVal != null) {
+                    effortVal.asString().ifPresent(v -> reasoningMap.put("effort", String.valueOf(v)));
+                }
+                JsonValue summaryVal = obj.get("summary");
+                if (summaryVal == null) {
+                    summaryVal = obj.get("generate_summary");
+                }
+                if (summaryVal != null) {
+                    summaryVal.asString().ifPresent(v -> reasoningMap.put("summary", String.valueOf(v)));
+                }
+            }
+        }
+
+        return reasoningMap.isEmpty() ? Optional.empty() : Optional.of(reasoningMap);
     }
 
-    Map<String, String> reasoningMap = new HashMap<>();
-
-    Optional<Reasoning> knownReasoning = reasoningField.asKnown();
-    if (knownReasoning.isPresent()) {
-      Reasoning reasoning = knownReasoning.get();
-      reasoning.effort().ifPresent(effort -> reasoningMap.put("effort", effort.asString()));
-      reasoning.summary().ifPresent(summary -> reasoningMap.put("summary", summary.asString()));
-    } else {
-      Optional<Map<String, JsonValue>> rawObject = reasoningField.asObject();
-      if (rawObject.isPresent()) {
-        Map<String, JsonValue> obj = rawObject.get();
-        JsonValue effortVal = obj.get("effort");
-        if (effortVal != null) {
-          effortVal.asString().ifPresent(v -> reasoningMap.put("effort", String.valueOf(v)));
-        }
-        JsonValue summaryVal = obj.get("summary");
-        if (summaryVal == null) {
-          summaryVal = obj.get("generate_summary");
-        }
-        if (summaryVal != null) {
-          summaryVal.asString().ifPresent(v -> reasoningMap.put("summary", String.valueOf(v)));
-        }
-      }
+    public void withResponse(AgentSpan span, Response response) {
+        withResponse(span, response, false);
     }
 
-    return reasoningMap.isEmpty() ? Optional.empty() : Optional.of(reasoningMap);
-  }
-
-  public void withResponse(AgentSpan span, Response response) {
-    withResponse(span, response, false);
-  }
-
-  public void withResponseStreamEvents(AgentSpan span, List<ResponseStreamEvent> events) {
-    for (ResponseStreamEvent event : events) {
-      if (event.isCompleted()) {
-        Response response = event.asCompleted().response();
-        withResponse(span, response, true);
-        return;
-      }
-      if (event.isIncomplete()) {
-        Response response = event.asIncomplete().response();
-        withResponse(span, response, true);
-        return;
-      }
+    public void withResponseStreamEvents(AgentSpan span, List<ResponseStreamEvent> events) {
+        for (ResponseStreamEvent event : events) {
+            if (event.isCompleted()) {
+                Response response = event.asCompleted().response();
+                withResponse(span, response, true);
+                return;
+            }
+            if (event.isIncomplete()) {
+                Response response = event.asIncomplete().response();
+                withResponse(span, response, true);
+                return;
+            }
+        }
     }
-  }
 
-  private void withResponse(AgentSpan span, Response response, boolean stream) {
-    String modelName = extractResponseModel(response._model());
-    span.setTag(CommonTags.OPENAI_RESPONSE_MODEL, modelName);
-    span.setTag(CommonTags.MODEL_NAME, modelName);
+    private void withResponse(AgentSpan span, Response response, boolean stream) {
+        String modelName = extractResponseModel(response._model());
+        span.setTag(CommonTags.OPENAI_RESPONSE_MODEL, modelName);
+        span.setTag(CommonTags.MODEL_NAME, modelName);
 
-    response._usage().asKnown().ifPresent(usage -> withUsage(span, usage));
+        response._usage().asKnown().ifPresent(usage -> withUsage(span, usage));
 
-    if (!llmObsEnabled) {
-      return;
-    }
+        if (!llmObsEnabled) {
+            return;
+        }
 
-    List<LLMObs.LLMMessage> outputMessages =
-        extractResponseOutputMessages(response._output().asKnown().orElse(Collections.emptyList()));
-    if (!outputMessages.isEmpty()) {
-      span.setTag(CommonTags.OUTPUT, outputMessages);
-    }
+        List<LLMObs.LLMMessage> outputMessages =
+                extractResponseOutputMessages(response._output().asKnown().orElse(Collections.emptyList()));
+        if (!outputMessages.isEmpty()) {
+            span.setTag(CommonTags.OUTPUT, outputMessages);
+        }
 
-    enrichInputWithPromptTracking(span, response);
+        enrichInputWithPromptTracking(span, response);
 
-    Map<String, Object> metadata = new HashMap<>();
+        Map<String, Object> metadata = new HashMap<>();
 
-    Object reasoningTag = span.getTag(CommonTags.REQUEST_REASONING);
-    if (reasoningTag != null) {
-      metadata.put("reasoning", reasoningTag);
-    }
+        Object reasoningTag = span.getTag(CommonTags.REQUEST_REASONING);
+        if (reasoningTag != null) {
+            metadata.put("reasoning", reasoningTag);
+        }
+
+        response.maxOutputTokens().ifPresent(v -> metadata.put("max_output_tokens", v));
+        response.temperature().ifPresent(v -> metadata.put("temperature", v));
+        response.topP().ifPresent(v -> metadata.put("top_p", v));
 
-    response.maxOutputTokens().ifPresent(v -> metadata.put("max_output_tokens", v));
-    response.temperature().ifPresent(v -> metadata.put("temperature", v));
-    response.topP().ifPresent(v -> metadata.put("top_p", v));
-
-    response
-        ._toolChoice()
-        .asKnown()
-        .ifPresent(
-            toolChoice -> {
-              toolChoice
-                  .options()
-                  .flatMap(v -> v._value().asString())
-                  .ifPresent(v -> metadata.put("tool_choice", v));
-              if (!metadata.containsKey("tool_choice")) {
+        response._toolChoice().asKnown().ifPresent(toolChoice -> {
+            toolChoice.options().flatMap(v -> v._value().asString()).ifPresent(v -> metadata.put("tool_choice", v));
+            if (!metadata.containsKey("tool_choice")) {
                 toolChoice
-                    .types()
-                    .map(v -> v.type().toString().toLowerCase())
-                    .ifPresent(v -> metadata.put("tool_choice", v));
-              }
-              if (!metadata.containsKey("tool_choice") && toolChoice.function().isPresent()) {
+                        .types()
+                        .map(v -> v.type().toString().toLowerCase())
+                        .ifPresent(v -> metadata.put("tool_choice", v));
+            }
+            if (!metadata.containsKey("tool_choice") && toolChoice.function().isPresent()) {
                 metadata.put("tool_choice", "function");
-              }
+            }
+        });
+
+        response._truncation()
+                .asKnown()
+                .flatMap(t -> t._value().asString())
+                .ifPresent(v -> metadata.put("truncation", v));
+
+        Map<String, Object> textMap = new HashMap<>();
+        response._text().asKnown().ifPresent(textConfig -> {
+            textConfig._format().asKnown().ifPresent(format -> {
+                Map<String, String> formatMap = new HashMap<>();
+                if (format.text().isPresent()) {
+                    formatMap.put("type", "text");
+                } else if (format.jsonSchema().isPresent()) {
+                    formatMap.put("type", "json_schema");
+                } else if (format.jsonObject().isPresent()) {
+                    formatMap.put("type", "json_object");
+                }
+                textMap.put("format", formatMap);
             });
+            textConfig
+                    ._verbosity()
+                    .asKnown()
+                    .flatMap(verbosity -> verbosity._value().asString())
+                    .ifPresent(verbosity -> textMap.put("verbosity", verbosity));
+        });
+        if (!textMap.isEmpty()) {
+            metadata.put("text", textMap);
+        }
 
-    response
-        ._truncation()
-        .asKnown()
-        .flatMap(t -> t._value().asString())
-        .ifPresent(v -> metadata.put("truncation", v));
-
-    Map<String, Object> textMap = new HashMap<>();
-    response
-        ._text()
-        .asKnown()
-        .ifPresent(
-            textConfig -> {
-              textConfig
-                  ._format()
-                  .asKnown()
-                  .ifPresent(
-                      format -> {
-                        Map<String, String> formatMap = new HashMap<>();
-                        if (format.text().isPresent()) {
-                          formatMap.put("type", "text");
-                        } else if (format.jsonSchema().isPresent()) {
-                          formatMap.put("type", "json_schema");
-                        } else if (format.jsonObject().isPresent()) {
-                          formatMap.put("type", "json_object");
-                        }
-                        textMap.put("format", formatMap);
-                      });
-              textConfig
-                  ._verbosity()
-                  .asKnown()
-                  .flatMap(verbosity -> verbosity._value().asString())
-                  .ifPresent(verbosity -> textMap.put("verbosity", verbosity));
-            });
-    if (!textMap.isEmpty()) {
-      metadata.put("text", textMap);
-    }
+        metadata.put("stream", stream);
 
-    metadata.put("stream", stream);
-
-    span.setTag(CommonTags.METADATA, metadata);
-  }
-
-  private static void withUsage(AgentSpan span, ResponseUsage usage) {
-    TokenUsage.set(span, CommonTags.INPUT_TOKENS, usage.inputTokens());
-    TokenUsage.set(span, CommonTags.OUTPUT_TOKENS, usage.outputTokens());
-    TokenUsage.set(span, CommonTags.TOTAL_TOKENS, usage.totalTokens());
-    TokenUsage.set(
-        span, CommonTags.CACHE_READ_INPUT_TOKENS, usage.inputTokensDetails().cachedTokens());
-    TokenUsage.set(
-        span, CommonTags.REASONING_OUTPUT_TOKENS, usage.outputTokensDetails().reasoningTokens());
-  }
-
-  private void enrichInputWithPromptTracking(AgentSpan span, Response response) {
-    Object promptTag = span.getTag(CommonTags.REQUEST_PROMPT);
-    if (!(promptTag instanceof Map)) {
-      return;
+        span.setTag(CommonTags.METADATA, metadata);
     }
 
-    Map<String, Object> prompt = new LinkedHashMap<>((Map<String, Object>) promptTag);
-    Map<String, Object> variables = Collections.emptyMap();
-    Object variablesTag = prompt.get("variables");
-    if (variablesTag instanceof Map) {
-      variables = (Map<String, Object>) variablesTag;
+    private static void withUsage(AgentSpan span, ResponseUsage usage) {
+        TokenUsage.set(span, CommonTags.INPUT_TOKENS, usage.inputTokens());
+        TokenUsage.set(span, CommonTags.OUTPUT_TOKENS, usage.outputTokens());
+        TokenUsage.set(span, CommonTags.TOTAL_TOKENS, usage.totalTokens());
+        TokenUsage.set(
+                span,
+                CommonTags.CACHE_READ_INPUT_TOKENS,
+                usage.inputTokensDetails().cachedTokens());
+        TokenUsage.set(
+                span,
+                CommonTags.REASONING_OUTPUT_TOKENS,
+                usage.outputTokensDetails().reasoningTokens());
     }
 
-    Map<String, Object> inputMap = new LinkedHashMap<>();
-    Object inputTag = span.getTag(CommonTags.INPUT);
-    if (inputTag instanceof Map) {
-      inputMap.putAll((Map<String, Object>) inputTag);
-    }
+    private void enrichInputWithPromptTracking(AgentSpan span, Response response) {
+        Object promptTag = span.getTag(CommonTags.REQUEST_PROMPT);
+        if (!(promptTag instanceof Map)) {
+            return;
+        }
 
-    List<LLMObs.LLMMessage> inputMessages = extractInputMessagesForPromptTracking(span, response);
-    if (!inputMessages.isEmpty()) {
-      inputMap.put("messages", inputMessages);
-    }
+        Map<String, Object> prompt = new LinkedHashMap<>((Map<String, Object>) promptTag);
+        Map<String, Object> variables = Collections.emptyMap();
+        Object variablesTag = prompt.get("variables");
+        if (variablesTag instanceof Map) {
+            variables = (Map<String, Object>) variablesTag;
+        }
 
-    List<Map<String, String>> chatTemplate = extractChatTemplate(inputMessages, variables);
-    if (!chatTemplate.isEmpty()) {
-      prompt.put("chat_template", chatTemplate);
-    }
+        Map<String, Object> inputMap = new LinkedHashMap<>();
+        Object inputTag = span.getTag(CommonTags.INPUT);
+        if (inputTag instanceof Map) {
+            inputMap.putAll((Map<String, Object>) inputTag);
+        }
+
+        List<LLMObs.LLMMessage> inputMessages = extractInputMessagesForPromptTracking(span, response);
+        if (!inputMessages.isEmpty()) {
+            inputMap.put("messages", inputMessages);
+        }
+
+        List<Map<String, String>> chatTemplate = extractChatTemplate(inputMessages, variables);
+        if (!chatTemplate.isEmpty()) {
+            prompt.put("chat_template", chatTemplate);
+        }
+
+        inputMap.put("prompt", prompt);
 
-    inputMap.put("prompt", prompt);
-
-    span.setTag(CommonTags.INPUT, inputMap);
-  }
-
-  private List<Map<String, String>> extractChatTemplate(
-      List<LLMObs.LLMMessage> messages, Map<String, Object> variables) {
-    Map<String, String> valueToPlaceholder = new LinkedHashMap<>();
-    for (Map.Entry<String, Object> variable : variables.entrySet()) {
-      if (variable.getValue() == null) {
-        continue;
-      }
-      String valueStr = String.valueOf(variable.getValue());
-      if (valueStr.isEmpty()
-          || IMAGE_FALLBACK_MARKER.equals(valueStr)
-          || FILE_FALLBACK_MARKER.equals(valueStr)) {
-        continue;
-      }
-      valueToPlaceholder.put(valueStr, "{{" + variable.getKey() + "}}");
+        span.setTag(CommonTags.INPUT, inputMap);
     }
 
-    List<String> sortedValues = new ArrayList<>(valueToPlaceholder.keySet());
-    sortedValues.sort((a, b) -> Integer.compare(b.length(), a.length()));
-
-    List<Map<String, String>> chatTemplate = new ArrayList<>();
-    for (LLMObs.LLMMessage message : messages) {
-      String role = message.getRole();
-      String content = message.getContent();
-      if (role == null || role.isEmpty() || content == null || content.isEmpty()) {
-        continue;
-      }
-
-      String templateContent = content;
-      for (String value : sortedValues) {
-        templateContent = templateContent.replace(value, valueToPlaceholder.get(value));
-      }
-
-      Map<String, String> messageMap = new LinkedHashMap<>();
-      messageMap.put("role", role);
-      messageMap.put("content", templateContent);
-      chatTemplate.add(messageMap);
+    private List<Map<String, String>> extractChatTemplate(
+            List<LLMObs.LLMMessage> messages, Map<String, Object> variables) {
+        Map<String, String> valueToPlaceholder = new LinkedHashMap<>();
+        for (Map.Entry<String, Object> variable : variables.entrySet()) {
+            if (variable.getValue() == null) {
+                continue;
+            }
+            String valueStr = String.valueOf(variable.getValue());
+            if (valueStr.isEmpty() || IMAGE_FALLBACK_MARKER.equals(valueStr) || FILE_FALLBACK_MARKER.equals(valueStr)) {
+                continue;
+            }
+            valueToPlaceholder.put(valueStr, "{{" + variable.getKey() + "}}");
+        }
+
+        List<String> sortedValues = new ArrayList<>(valueToPlaceholder.keySet());
+        sortedValues.sort((a, b) -> Integer.compare(b.length(), a.length()));
+
+        List<Map<String, String>> chatTemplate = new ArrayList<>();
+        for (LLMObs.LLMMessage message : messages) {
+            String role = message.getRole();
+            String content = message.getContent();
+            if (role == null || role.isEmpty() || content == null || content.isEmpty()) {
+                continue;
+            }
+
+            String templateContent = content;
+            for (String value : sortedValues) {
+                templateContent = templateContent.replace(value, valueToPlaceholder.get(value));
+            }
+
+            Map<String, String> messageMap = new LinkedHashMap<>();
+            messageMap.put("role", role);
+            messageMap.put("content", templateContent);
+            chatTemplate.add(messageMap);
+        }
+        return chatTemplate;
     }
-    return chatTemplate;
-  }
-
-  private List<LLMObs.LLMMessage> extractInputMessagesForPromptTracking(
-      AgentSpan span, Response response) {
-    List<LLMObs.LLMMessage> messages = new ArrayList<>();
-
-    response
-        ._instructions()
-        .asKnown()
-        .ifPresent(
-            instructions -> {
-              for (ResponseInputItem item :
-                  instructions.inputItemList().orElse(Collections.emptyList())) {
+
+    private List<LLMObs.LLMMessage> extractInputMessagesForPromptTracking(AgentSpan span, Response response) {
+        List<LLMObs.LLMMessage> messages = new ArrayList<>();
+
+        response._instructions().asKnown().ifPresent(instructions -> {
+            for (ResponseInputItem item : instructions.inputItemList().orElse(Collections.emptyList())) {
                 LLMObs.LLMMessage message = extractInputItemMessage(item);
                 if (message != null) {
-                  messages.add(message);
+                    messages.add(message);
                 }
-              }
-            });
-    return messages;
-  }
-
-  private Optional<Map<String, Object>> extractPromptFromParams(ResponseCreateParams params) {
-    Optional<ResponsePrompt> typedPromptOpt = params._prompt().asKnown();
-    if (typedPromptOpt.isPresent()) {
-      Optional<Map<String, Object>> extractedPrompt = extractPrompt(typedPromptOpt.get());
-      if (extractedPrompt.isPresent()) {
-        return extractedPrompt;
-      }
+            }
+        });
+        return messages;
     }
 
-    Optional<JsonValue> rawPromptOpt = params._prompt().asUnknown();
-    if (!rawPromptOpt.isPresent()) {
-      return Optional.empty();
-    }
+    private Optional<Map<String, Object>> extractPromptFromParams(ResponseCreateParams params) {
+        Optional<ResponsePrompt> typedPromptOpt = params._prompt().asKnown();
+        if (typedPromptOpt.isPresent()) {
+            Optional<Map<String, Object>> extractedPrompt = extractPrompt(typedPromptOpt.get());
+            if (extractedPrompt.isPresent()) {
+                return extractedPrompt;
+            }
+        }
+
+        Optional<JsonValue> rawPromptOpt = params._prompt().asUnknown();
+        if (!rawPromptOpt.isPresent()) {
+            return Optional.empty();
+        }
 
-    Optional<Map<String, JsonValue>> rawPromptObjOpt = rawPromptOpt.get().asObject();
-    if (!rawPromptObjOpt.isPresent()) {
-      return Optional.empty();
+        Optional<Map<String, JsonValue>> rawPromptObjOpt = rawPromptOpt.get().asObject();
+        if (!rawPromptObjOpt.isPresent()) {
+            return Optional.empty();
+        }
+
+        return extractPrompt(rawPromptObjOpt.get());
     }
 
-    return extractPrompt(rawPromptObjOpt.get());
-  }
+    private Optional<Map<String, Object>> extractPrompt(ResponsePrompt prompt) {
+        Map<String, Object> promptMap = new LinkedHashMap<>();
 
-  private Optional<Map<String, Object>> extractPrompt(ResponsePrompt prompt) {
-    Map<String, Object> promptMap = new LinkedHashMap<>();
+        String id = prompt._id().asString().orElse(null);
+        if (id != null && !id.isEmpty()) {
+            promptMap.put("id", id);
+        }
+        prompt._version().asString().ifPresent(version -> promptMap.put("version", version));
+
+        Optional<ResponsePrompt.Variables> typedVariablesOpt =
+                prompt._variables().asKnown();
+        if (typedVariablesOpt.isPresent()) {
+            Map<String, Object> normalized = normalizePromptVariables(typedVariablesOpt.get());
+            if (!normalized.isEmpty()) {
+                promptMap.put("variables", normalized);
+            }
+        }
 
-    String id = prompt._id().asString().orElse(null);
-    if (id != null && !id.isEmpty()) {
-      promptMap.put("id", id);
-    }
-    prompt._version().asString().ifPresent(version -> promptMap.put("version", version));
-
-    Optional<ResponsePrompt.Variables> typedVariablesOpt = prompt._variables().asKnown();
-    if (typedVariablesOpt.isPresent()) {
-      Map<String, Object> normalized = normalizePromptVariables(typedVariablesOpt.get());
-      if (!normalized.isEmpty()) {
-        promptMap.put("variables", normalized);
-      }
+        return promptMap.isEmpty() ? Optional.empty() : Optional.of(promptMap);
     }
 
-    return promptMap.isEmpty() ? Optional.empty() : Optional.of(promptMap);
-  }
+    private Optional<Map<String, Object>> extractPrompt(Map<String, JsonValue> promptObj) {
+        Map<String, Object> promptMap = new LinkedHashMap<>();
 
-  private Optional<Map<String, Object>> extractPrompt(Map<String, JsonValue> promptObj) {
-    Map<String, Object> promptMap = new LinkedHashMap<>();
+        String id = getJsonString(promptObj.get("id"));
+        if (id != null && !id.isEmpty()) {
+            promptMap.put("id", id);
+        }
 
-    String id = getJsonString(promptObj.get("id"));
-    if (id != null && !id.isEmpty()) {
-      promptMap.put("id", id);
+        String version = getJsonString(promptObj.get("version"));
+        if (version != null && !version.isEmpty()) {
+            promptMap.put("version", version);
+        }
+
+        JsonValue variablesValue = promptObj.get("variables");
+        if (variablesValue != null) {
+            Optional<Map<String, JsonValue>> variablesObjOpt = variablesValue.asObject();
+            if (variablesObjOpt.isPresent()) {
+                Map<String, Object> normalized = normalizePromptVariables(variablesObjOpt.get());
+                if (!normalized.isEmpty()) {
+                    promptMap.put("variables", normalized);
+                }
+            }
+        }
+
+        return promptMap.isEmpty() ? Optional.empty() : Optional.of(promptMap);
     }
 
-    String version = getJsonString(promptObj.get("version"));
-    if (version != null && !version.isEmpty()) {
-      promptMap.put("version", version);
+    private Map<String, Object> normalizePromptVariables(ResponsePrompt.Variables variables) {
+        return normalizePromptVariables(variables._additionalProperties());
     }
 
-    JsonValue variablesValue = promptObj.get("variables");
-    if (variablesValue != null) {
-      Optional<Map<String, JsonValue>> variablesObjOpt = variablesValue.asObject();
-      if (variablesObjOpt.isPresent()) {
-        Map<String, Object> normalized = normalizePromptVariables(variablesObjOpt.get());
-        if (!normalized.isEmpty()) {
-          promptMap.put("variables", normalized);
+    private Map<String, Object> normalizePromptVariables(Map<String, JsonValue> variables) {
+        Map<String, Object> normalized = new LinkedHashMap<>();
+        for (Map.Entry<String, JsonValue> entry : variables.entrySet()) {
+            Object value = normalizePromptVariable(entry.getValue());
+            if (value != null) {
+                normalized.put(entry.getKey(), value);
+            }
         }
-      }
+        return normalized;
     }
 
-    return promptMap.isEmpty() ? Optional.empty() : Optional.of(promptMap);
-  }
+    private Object normalizePromptVariable(JsonValue value) {
+        if (value == null) {
+            return null;
+        }
 
-  private Map<String, Object> normalizePromptVariables(ResponsePrompt.Variables variables) {
-    return normalizePromptVariables(variables._additionalProperties());
-  }
+        Optional<String> asString = value.asString();
+        if (asString.isPresent()) {
+            return asString.get();
+        }
 
-  private Map<String, Object> normalizePromptVariables(Map<String, JsonValue> variables) {
-    Map<String, Object> normalized = new LinkedHashMap<>();
-    for (Map.Entry<String, JsonValue> entry : variables.entrySet()) {
-      Object value = normalizePromptVariable(entry.getValue());
-      if (value != null) {
-        normalized.put(entry.getKey(), value);
-      }
-    }
-    return normalized;
-  }
+        Optional<Map<String, JsonValue>> asObject = value.asObject();
+        if (!asObject.isPresent()) {
+            return value.toString();
+        }
 
-  private Object normalizePromptVariable(JsonValue value) {
-    if (value == null) {
-      return null;
-    }
+        Map<String, JsonValue> obj = asObject.get();
+        String type = getJsonString(obj.get("type"));
+        String text = getJsonString(obj.get("text"));
+        if (text != null && !text.isEmpty()) {
+            return text;
+        }
 
-    Optional<String> asString = value.asString();
-    if (asString.isPresent()) {
-      return asString.get();
-    }
+        if ("input_image".equals(type)) {
+            String imageUrl = getJsonString(obj.get("image_url"));
+            if (imageUrl != null && !imageUrl.isEmpty()) {
+                return imageUrl;
+            }
+            String fileId = getJsonString(obj.get("file_id"));
+            return fileId == null || fileId.isEmpty() ? IMAGE_FALLBACK_MARKER : fileId;
+        }
 
-    Optional<Map<String, JsonValue>> asObject = value.asObject();
-    if (!asObject.isPresent()) {
-      return value.toString();
-    }
+        if ("input_file".equals(type)) {
+            String fileUrl = getJsonString(obj.get("file_url"));
+            if (fileUrl != null && !fileUrl.isEmpty()) {
+                return fileUrl;
+            }
+            String fileId = getJsonString(obj.get("file_id"));
+            if (fileId != null && !fileId.isEmpty()) {
+                return fileId;
+            }
+            String filename = getJsonString(obj.get("filename"));
+            return filename == null || filename.isEmpty() ? FILE_FALLBACK_MARKER : filename;
+        }
 
-    Map<String, JsonValue> obj = asObject.get();
-    String type = getJsonString(obj.get("type"));
-    String text = getJsonString(obj.get("text"));
-    if (text != null && !text.isEmpty()) {
-      return text;
+        return value.toString();
     }
 
-    if ("input_image".equals(type)) {
-      String imageUrl = getJsonString(obj.get("image_url"));
-      if (imageUrl != null && !imageUrl.isEmpty()) {
-        return imageUrl;
-      }
-      String fileId = getJsonString(obj.get("file_id"));
-      return fileId == null || fileId.isEmpty() ? IMAGE_FALLBACK_MARKER : fileId;
+    private String getJsonString(JsonValue value) {
+        if (value == null) {
+            return null;
+        }
+        Optional<String> asString = value.asString();
+        return asString.orElse(null);
     }
 
-    if ("input_file".equals(type)) {
-      String fileUrl = getJsonString(obj.get("file_url"));
-      if (fileUrl != null && !fileUrl.isEmpty()) {
-        return fileUrl;
-      }
-      String fileId = getJsonString(obj.get("file_id"));
-      if (fileId != null && !fileId.isEmpty()) {
-        return fileId;
-      }
-      String filename = getJsonString(obj.get("filename"));
-      return filename == null || filename.isEmpty() ? FILE_FALLBACK_MARKER : filename;
-    }
+    private List<LLMObs.LLMMessage> extractResponseOutputMessages(List<ResponseOutputItem> output) {
+        List<LLMObs.LLMMessage> messages = new ArrayList<>();
 
-    return value.toString();
-  }
+        for (ResponseOutputItem item : output) {
+            Optional<ResponseFunctionToolCall> functionCallOpt = item.functionCall();
+            if (functionCallOpt.isPresent()) {
+                ResponseFunctionToolCall functionCall = functionCallOpt.get();
+                LLMObs.ToolCall toolCall = ToolCallExtractor.getToolCall(functionCall);
+                if (toolCall != null) {
+                    List<LLMObs.ToolCall> toolCalls = Collections.singletonList(toolCall);
+                    messages.add(LLMObs.LLMMessage.from("assistant", null, toolCalls));
+                }
+                continue;
+            }
 
-  private String getJsonString(JsonValue value) {
-    if (value == null) {
-      return null;
-    }
-    Optional<String> asString = value.asString();
-    return asString.orElse(null);
-  }
-
-  private List<LLMObs.LLMMessage> extractResponseOutputMessages(List<ResponseOutputItem> output) {
-    List<LLMObs.LLMMessage> messages = new ArrayList<>();
-
-    for (ResponseOutputItem item : output) {
-      Optional<ResponseFunctionToolCall> functionCallOpt = item.functionCall();
-      if (functionCallOpt.isPresent()) {
-        ResponseFunctionToolCall functionCall = functionCallOpt.get();
-        LLMObs.ToolCall toolCall = ToolCallExtractor.getToolCall(functionCall);
-        if (toolCall != null) {
-          List<LLMObs.ToolCall> toolCalls = Collections.singletonList(toolCall);
-          messages.add(LLMObs.LLMMessage.from("assistant", null, toolCalls));
-        }
-        continue;
-      }
-
-      Optional<ResponseCustomToolCall> customToolCallOpt = item.customToolCall();
-      if (customToolCallOpt.isPresent()) {
-        ResponseCustomToolCall customToolCall = customToolCallOpt.get();
-        LLMObs.ToolCall toolCall = ToolCallExtractor.getToolCall(customToolCall);
-        if (toolCall != null) {
-          messages.add(
-              LLMObs.LLMMessage.from("assistant", null, Collections.singletonList(toolCall)));
-        }
-        continue;
-      }
-
-      Optional<ResponseOutputItem.McpCall> mcpCallOpt = item.mcpCall();
-      if (mcpCallOpt.isPresent()) {
-        ResponseOutputItem.McpCall mcpCall = mcpCallOpt.get();
-        LLMObs.ToolCall toolCall = ToolCallExtractor.getToolCall(mcpCall);
-        List<LLMObs.ToolCall> toolCalls =
-            toolCall == null ? null : Collections.singletonList(toolCall);
-        String outputText = mcpCall.output().orElse("");
-        LLMObs.ToolResult toolResult =
-            LLMObs.ToolResult.from(mcpCall.name(), "mcp_tool_result", mcpCall.id(), outputText);
-        List<LLMObs.ToolResult> toolResults = Collections.singletonList(toolResult);
-        messages.add(LLMObs.LLMMessage.from("assistant", null, toolCalls, toolResults));
-        continue;
-      }
-
-      Optional<ResponseOutputMessage> messageOpt = item.message();
-      if (messageOpt.isPresent()) {
-        ResponseOutputMessage message = messageOpt.get();
-        String textContent = extractMessageContent(message);
-        Optional<String> roleOpt = message._role().asString();
-        String role = roleOpt.orElse("assistant");
-        messages.add(LLMObs.LLMMessage.from(role, textContent));
-        continue;
-      }
-
-      Optional<ResponseReasoningItem> reasoningOpt = item.reasoning();
-      if (reasoningOpt.isPresent()) {
-        ResponseReasoningItem reasoning = reasoningOpt.get();
-        try (JsonWriter writer = new JsonWriter()) {
-          writer.beginObject();
-
-          String summaryText =
-              reasoning
-                  ._summary()
-                  .asKnown()
-                  .filter(summary -> !summary.isEmpty())
-                  .flatMap(summary -> summary.get(0)._text().asString())
-                  .orElse(null);
-          writer.name("summary");
-          if (summaryText != null && !summaryText.isEmpty()) {
-            writer.value(summaryText);
-          } else {
-            writer.beginArray().endArray();
-          }
-
-          writer.name("encrypted_content");
-          Optional<String> encryptedContent = reasoning._encryptedContent().asString();
-          if (encryptedContent.isPresent()) {
-            writer.value(encryptedContent.get());
-          } else {
-            writer.nullValue();
-          }
-
-          String id = reasoning._id().asString().orElse(null);
-          writer.name("id").value(id == null ? "" : id);
-
-          writer.endObject();
-
-          messages.add(LLMObs.LLMMessage.from("reasoning", writer.toString()));
-        }
-      }
-    }
-    return messages;
-  }
-
-  private String extractMessageContent(ResponseOutputMessage message) {
-    StringBuilder contentBuilder = new StringBuilder();
-    for (ResponseOutputMessage.Content content :
-        message._content().asKnown().orElse(Collections.emptyList())) {
-      content.outputText().ifPresent(outputText -> contentBuilder.append(outputText.text()));
+            Optional<ResponseCustomToolCall> customToolCallOpt = item.customToolCall();
+            if (customToolCallOpt.isPresent()) {
+                ResponseCustomToolCall customToolCall = customToolCallOpt.get();
+                LLMObs.ToolCall toolCall = ToolCallExtractor.getToolCall(customToolCall);
+                if (toolCall != null) {
+                    messages.add(LLMObs.LLMMessage.from("assistant", null, Collections.singletonList(toolCall)));
+                }
+                continue;
+            }
+
+            Optional<ResponseOutputItem.McpCall> mcpCallOpt = item.mcpCall();
+            if (mcpCallOpt.isPresent()) {
+                ResponseOutputItem.McpCall mcpCall = mcpCallOpt.get();
+                LLMObs.ToolCall toolCall = ToolCallExtractor.getToolCall(mcpCall);
+                List<LLMObs.ToolCall> toolCalls = toolCall == null ? null : Collections.singletonList(toolCall);
+                String outputText = mcpCall.output().orElse("");
+                LLMObs.ToolResult toolResult =
+                        LLMObs.ToolResult.from(mcpCall.name(), "mcp_tool_result", mcpCall.id(), outputText);
+                List<LLMObs.ToolResult> toolResults = Collections.singletonList(toolResult);
+                messages.add(LLMObs.LLMMessage.from("assistant", null, toolCalls, toolResults));
+                continue;
+            }
+
+            Optional<ResponseOutputMessage> messageOpt = item.message();
+            if (messageOpt.isPresent()) {
+                ResponseOutputMessage message = messageOpt.get();
+                String textContent = extractMessageContent(message);
+                Optional<String> roleOpt = message._role().asString();
+                String role = roleOpt.orElse("assistant");
+                messages.add(LLMObs.LLMMessage.from(role, textContent));
+                continue;
+            }
+
+            Optional<ResponseReasoningItem> reasoningOpt = item.reasoning();
+            if (reasoningOpt.isPresent()) {
+                ResponseReasoningItem reasoning = reasoningOpt.get();
+                try (JsonWriter writer = new JsonWriter()) {
+                    writer.beginObject();
+
+                    String summaryText = reasoning
+                            ._summary()
+                            .asKnown()
+                            .filter(summary -> !summary.isEmpty())
+                            .flatMap(summary -> summary.get(0)._text().asString())
+                            .orElse(null);
+                    writer.name("summary");
+                    if (summaryText != null && !summaryText.isEmpty()) {
+                        writer.value(summaryText);
+                    } else {
+                        writer.beginArray().endArray();
+                    }
+
+                    writer.name("encrypted_content");
+                    Optional<String> encryptedContent =
+                            reasoning._encryptedContent().asString();
+                    if (encryptedContent.isPresent()) {
+                        writer.value(encryptedContent.get());
+                    } else {
+                        writer.nullValue();
+                    }
+
+                    String id = reasoning._id().asString().orElse(null);
+                    writer.name("id").value(id == null ? "" : id);
+
+                    writer.endObject();
+
+                    messages.add(LLMObs.LLMMessage.from("reasoning", writer.toString()));
+                }
+            }
+        }
+        return messages;
     }
-    String result = contentBuilder.toString();
-    return result.isEmpty() ? null : result;
-  }
-
-  private String extractResponseModel(JsonField<ResponsesModel> model) {
-    Optional<String> str = model.asString();
-    if (str.isPresent()) {
-      return str.get();
+
+    private String extractMessageContent(ResponseOutputMessage message) {
+        StringBuilder contentBuilder = new StringBuilder();
+        for (ResponseOutputMessage.Content content :
+                message._content().asKnown().orElse(Collections.emptyList())) {
+            content.outputText().ifPresent(outputText -> contentBuilder.append(outputText.text()));
+        }
+        String result = contentBuilder.toString();
+        return result.isEmpty() ? null : result;
     }
-    Optional<ResponsesModel> known = model.asKnown();
-    if (known.isPresent()) {
-      ResponsesModel m = known.get();
-      if (m.isString()) {
-        return m.asString();
-      }
-      if (m.isChat()) {
-        Optional<String> s = m.asChat()._value().asString();
-        if (s.isPresent()) {
-          return s.get();
-        }
-      }
-      if (m.isOnly()) {
-        Optional<String> s = m.asOnly()._value().asString();
-        if (s.isPresent()) {
-          return s.get();
-        }
-      }
+
+    private String extractResponseModel(JsonField<ResponsesModel> model) {
+        Optional<String> str = model.asString();
+        if (str.isPresent()) {
+            return str.get();
+        }
+        Optional<ResponsesModel> known = model.asKnown();
+        if (known.isPresent()) {
+            ResponsesModel m = known.get();
+            if (m.isString()) {
+                return m.asString();
+            }
+            if (m.isChat()) {
+                Optional<String> s = m.asChat()._value().asString();
+                if (s.isPresent()) {
+                    return s.get();
+                }
+            }
+            if (m.isOnly()) {
+                Optional<String> s = m.asOnly()._value().asString();
+                if (s.isPresent()) {
+                    return s.get();
+                }
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseModule.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseModule.java
index 3fa30a82d3f..164fde7ff24 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseModule.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseModule.java
@@ -8,13 +8,12 @@
 
 @AutoService(InstrumenterModule.class)
 public class ResponseModule extends InstrumenterModule.Tracing {
-  public ResponseModule() {
-    super("openai-java");
-  }
+    public ResponseModule() {
+        super("openai-java");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new ResponseServiceAsyncInstrumentation(), new ResponseServiceInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(new ResponseServiceAsyncInstrumentation(), new ResponseServiceInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseServiceAsyncInstrumentation.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseServiceAsyncInstrumentation.java
index ed316703a39..0d6fc61671d 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseServiceAsyncInstrumentation.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseServiceAsyncInstrumentation.java
@@ -24,88 +24,84 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class ResponseServiceAsyncInstrumentation
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasMethodAdvice,
-        Instrumenter.WithTypeStructure {
-  @Override
-  public String instrumentedType() {
-    return "com.openai.services.async.ResponseServiceAsyncImpl$WithRawResponseImpl";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("create"))
-            .and(takesArgument(0, named("com.openai.models.responses.ResponseCreateParams")))
-            .and(returns(named(CompletableFuture.class.getName()))),
-        getClass().getName() + "$CreateAdvice");
-
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("createStreaming"))
-            .and(takesArgument(0, named("com.openai.models.responses.ResponseCreateParams")))
-            .and(returns(named(CompletableFuture.class.getName()))),
-        getClass().getName() + "$CreateStreamingAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, Instrumenter.WithTypeStructure {
+    @Override
+    public String instrumentedType() {
+        return "com.openai.services.async.ResponseServiceAsyncImpl$WithRawResponseImpl";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("clientOptions"));
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("create"))
+                        .and(takesArgument(0, named("com.openai.models.responses.ResponseCreateParams")))
+                        .and(returns(named(CompletableFuture.class.getName()))),
+                getClass().getName() + "$CreateAdvice");
 
-  public static class CreateAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.Argument(0) final ResponseCreateParams params,
-        @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
-      AgentSpan span = DECORATE.startSpan(clientOptions);
-      ResponseDecorator.DECORATE.withResponseCreateParams(span, params);
-      return activateSpan(span);
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("createStreaming"))
+                        .and(takesArgument(0, named("com.openai.models.responses.ResponseCreateParams")))
+                        .and(returns(named(CompletableFuture.class.getName()))),
+                getClass().getName() + "$CreateStreamingAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return(readOnly = false) CompletableFuture<HttpResponseFor<Response>> future,
-        @Advice.Thrown final Throwable err) {
-      AgentSpan span = spanFromScope(scope);
-      if (err != null || future == null) {
-        DECORATE.finishSpan(span, err);
-      } else {
-        future =
-            HttpResponseWrapper.wrapFuture(future, span, ResponseDecorator.DECORATE::withResponse);
-      }
-      scope.close();
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("clientOptions"));
     }
-  }
 
-  public static class CreateStreamingAdvice {
+    public static class CreateAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.Argument(0) final ResponseCreateParams params,
+                @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
+            AgentSpan span = DECORATE.startSpan(clientOptions);
+            ResponseDecorator.DECORATE.withResponseCreateParams(span, params);
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.Argument(0) final ResponseCreateParams params,
-        @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
-      AgentSpan span = DECORATE.startSpan(clientOptions);
-      ResponseDecorator.DECORATE.withResponseCreateParams(span, params);
-      return activateSpan(span);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return(readOnly = false) CompletableFuture<HttpResponseFor<Response>> future,
+                @Advice.Thrown final Throwable err) {
+            AgentSpan span = spanFromScope(scope);
+            if (err != null || future == null) {
+                DECORATE.finishSpan(span, err);
+            } else {
+                future = HttpResponseWrapper.wrapFuture(future, span, ResponseDecorator.DECORATE::withResponse);
+            }
+            scope.close();
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return(readOnly = false)
-            CompletableFuture<HttpResponseFor<StreamResponse<ResponseStreamEvent>>> future,
-        @Advice.Thrown final Throwable err) {
-      AgentSpan span = spanFromScope(scope);
-      if (err != null || future == null) {
-        DECORATE.finishSpan(span, err);
-      } else {
-        future =
-            HttpStreamResponseWrapper.wrapFuture(
-                future, span, ResponseDecorator.DECORATE::withResponseStreamEvents);
-      }
-      scope.close();
+    public static class CreateStreamingAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.Argument(0) final ResponseCreateParams params,
+                @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
+            AgentSpan span = DECORATE.startSpan(clientOptions);
+            ResponseDecorator.DECORATE.withResponseCreateParams(span, params);
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return(readOnly = false)
+                        CompletableFuture<HttpResponseFor<StreamResponse<ResponseStreamEvent>>> future,
+                @Advice.Thrown final Throwable err) {
+            AgentSpan span = spanFromScope(scope);
+            if (err != null || future == null) {
+                DECORATE.finishSpan(span, err);
+            } else {
+                future = HttpStreamResponseWrapper.wrapFuture(
+                        future, span, ResponseDecorator.DECORATE::withResponseStreamEvents);
+            }
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseServiceInstrumentation.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseServiceInstrumentation.java
index 6de041b34ce..3de1ae776f4 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseServiceInstrumentation.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseServiceInstrumentation.java
@@ -23,88 +23,83 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class ResponseServiceInstrumentation
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasMethodAdvice,
-        Instrumenter.WithTypeStructure {
-  @Override
-  public String instrumentedType() {
-    return "com.openai.services.blocking.ResponseServiceImpl$WithRawResponseImpl";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("create"))
-            .and(takesArgument(0, named("com.openai.models.responses.ResponseCreateParams")))
-            .and(returns(named("com.openai.core.http.HttpResponseFor"))),
-        getClass().getName() + "$CreateAdvice");
-
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("createStreaming"))
-            .and(takesArgument(0, named("com.openai.models.responses.ResponseCreateParams")))
-            .and(returns(named("com.openai.core.http.HttpResponseFor"))),
-        getClass().getName() + "$CreateStreamingAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, Instrumenter.WithTypeStructure {
+    @Override
+    public String instrumentedType() {
+        return "com.openai.services.blocking.ResponseServiceImpl$WithRawResponseImpl";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> structureMatcher() {
-    return declaresField(named("clientOptions"));
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("create"))
+                        .and(takesArgument(0, named("com.openai.models.responses.ResponseCreateParams")))
+                        .and(returns(named("com.openai.core.http.HttpResponseFor"))),
+                getClass().getName() + "$CreateAdvice");
 
-  public static class CreateAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.Argument(0) final ResponseCreateParams params,
-        @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
-      AgentSpan span = DECORATE.startSpan(clientOptions);
-      ResponseDecorator.DECORATE.withResponseCreateParams(span, params);
-      return activateSpan(span);
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("createStreaming"))
+                        .and(takesArgument(0, named("com.openai.models.responses.ResponseCreateParams")))
+                        .and(returns(named("com.openai.core.http.HttpResponseFor"))),
+                getClass().getName() + "$CreateStreamingAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return(readOnly = false) HttpResponseFor<Response> response,
-        @Advice.Thrown final Throwable err) {
-      AgentSpan span = spanFromScope(scope);
-      if (err != null || response == null) {
-        DECORATE.finishSpan(span, err);
-      } else {
-        response =
-            HttpResponseWrapper.wrap(response, span, ResponseDecorator.DECORATE::withResponse);
-      }
-      scope.close();
+    @Override
+    public ElementMatcher<TypeDescription> structureMatcher() {
+        return declaresField(named("clientOptions"));
     }
-  }
 
-  public static class CreateStreamingAdvice {
+    public static class CreateAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.Argument(0) final ResponseCreateParams params,
+                @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
+            AgentSpan span = DECORATE.startSpan(clientOptions);
+            ResponseDecorator.DECORATE.withResponseCreateParams(span, params);
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.Argument(0) final ResponseCreateParams params,
-        @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
-      AgentSpan span = DECORATE.startSpan(clientOptions);
-      ResponseDecorator.DECORATE.withResponseCreateParams(span, params);
-      return activateSpan(span);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return(readOnly = false) HttpResponseFor<Response> response,
+                @Advice.Thrown final Throwable err) {
+            AgentSpan span = spanFromScope(scope);
+            if (err != null || response == null) {
+                DECORATE.finishSpan(span, err);
+            } else {
+                response = HttpResponseWrapper.wrap(response, span, ResponseDecorator.DECORATE::withResponse);
+            }
+            scope.close();
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return(readOnly = false)
-            HttpResponseFor<StreamResponse<ResponseStreamEvent>> response,
-        @Advice.Thrown final Throwable err) {
-      AgentSpan span = spanFromScope(scope);
-      if (err != null || response == null) {
-        DECORATE.finishSpan(span, err);
-      } else {
-        response =
-            HttpStreamResponseWrapper.wrap(
-                response, span, ResponseDecorator.DECORATE::withResponseStreamEvents);
-      }
-      scope.close();
+    public static class CreateStreamingAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.Argument(0) final ResponseCreateParams params,
+                @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
+            AgentSpan span = DECORATE.startSpan(clientOptions);
+            ResponseDecorator.DECORATE.withResponseCreateParams(span, params);
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return(readOnly = false) HttpResponseFor<StreamResponse<ResponseStreamEvent>> response,
+                @Advice.Thrown final Throwable err) {
+            AgentSpan span = spanFromScope(scope);
+            if (err != null || response == null) {
+                DECORATE.finishSpan(span, err);
+            } else {
+                response = HttpStreamResponseWrapper.wrap(
+                        response, span, ResponseDecorator.DECORATE::withResponseStreamEvents);
+            }
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/TokenUsage.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/TokenUsage.java
index d7001f425ee..7e34d729c8a 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/TokenUsage.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/TokenUsage.java
@@ -9,18 +9,18 @@
  * the matching {@code gen_ai.usage.*} APM metric when it is not.
  */
 final class TokenUsage {
-  private static final boolean LLM_OBS_ENABLED = Config.get().isLlmObsEnabled();
+    private static final boolean LLM_OBS_ENABLED = Config.get().isLlmObsEnabled();
 
-  static void set(AgentSpan span, String llmObsMetric, Number value) {
-    if (span == null || value == null) {
-      return;
+    static void set(AgentSpan span, String llmObsMetric, Number value) {
+        if (span == null || value == null) {
+            return;
+        }
+        if (LLM_OBS_ENABLED) {
+            span.setTag(llmObsMetric, value);
+        } else {
+            GenAiApmTags.usage(span, llmObsMetric, value);
+        }
     }
-    if (LLM_OBS_ENABLED) {
-      span.setTag(llmObsMetric, value);
-    } else {
-      GenAiApmTags.usage(span, llmObsMetric, value);
-    }
-  }
 
-  private TokenUsage() {}
+    private TokenUsage() {}
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ToolCallExtractor.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ToolCallExtractor.java
index ffeca857a20..d24a24a9413 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ToolCallExtractor.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ToolCallExtractor.java
@@ -15,103 +15,102 @@
 import org.slf4j.LoggerFactory;
 
 public class ToolCallExtractor {
-  private static final Logger log = LoggerFactory.getLogger(ToolCallExtractor.class);
-  private static final ObjectMapper MAPPER = new ObjectMapper();
-  private static final TypeReference<Map<String, Object>> MAP_TYPE_REF =
-      new TypeReference<Map<String, Object>>() {};
+    private static final Logger log = LoggerFactory.getLogger(ToolCallExtractor.class);
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+    private static final TypeReference<Map<String, Object>> MAP_TYPE_REF = new TypeReference<Map<String, Object>>() {};
 
-  public static LLMObs.ToolCall getToolCall(ChatCompletionMessageToolCall toolCall) {
-    Optional<ChatCompletionMessageFunctionToolCall> functionToolCallOpt = toolCall.function();
-    if (!functionToolCallOpt.isPresent()) {
-      return null;
-    }
-    try {
-      ChatCompletionMessageFunctionToolCall functionToolCall = functionToolCallOpt.get();
-      String toolId = functionToolCall.id();
-      ChatCompletionMessageFunctionToolCall.Function function = functionToolCall.function();
-      String name = function.name();
-      String argumentsJson = function.arguments();
+    public static LLMObs.ToolCall getToolCall(ChatCompletionMessageToolCall toolCall) {
+        Optional<ChatCompletionMessageFunctionToolCall> functionToolCallOpt = toolCall.function();
+        if (!functionToolCallOpt.isPresent()) {
+            return null;
+        }
+        try {
+            ChatCompletionMessageFunctionToolCall functionToolCall = functionToolCallOpt.get();
+            String toolId = functionToolCall.id();
+            ChatCompletionMessageFunctionToolCall.Function function = functionToolCall.function();
+            String name = function.name();
+            String argumentsJson = function.arguments();
 
-      String type = "function";
-      Optional<String> typeOpt = functionToolCall._type().asString();
-      if (typeOpt.isPresent()) {
-        type = typeOpt.get();
-      }
+            String type = "function";
+            Optional<String> typeOpt = functionToolCall._type().asString();
+            if (typeOpt.isPresent()) {
+                type = typeOpt.get();
+            }
 
-      Map<String, Object> arguments = parseArguments(argumentsJson);
-      return LLMObs.ToolCall.from(name, type, toolId, arguments);
-    } catch (Exception e) {
-      log.debug("Failed to extract tool call information", e);
+            Map<String, Object> arguments = parseArguments(argumentsJson);
+            return LLMObs.ToolCall.from(name, type, toolId, arguments);
+        } catch (Exception e) {
+            log.debug("Failed to extract tool call information", e);
+        }
+        return null;
     }
-    return null;
-  }
 
-  public static LLMObs.ToolCall getToolCall(ResponseFunctionToolCall functionCall) {
-    try {
-      String name = functionCall.name();
-      String callId = functionCall.callId();
-      String argumentsJson = functionCall.arguments();
+    public static LLMObs.ToolCall getToolCall(ResponseFunctionToolCall functionCall) {
+        try {
+            String name = functionCall.name();
+            String callId = functionCall.callId();
+            String argumentsJson = functionCall.arguments();
 
-      String type = "function_call";
-      Optional<String> typeOpt = functionCall._type().asString();
-      if (typeOpt.isPresent()) {
-        type = typeOpt.get();
-      }
+            String type = "function_call";
+            Optional<String> typeOpt = functionCall._type().asString();
+            if (typeOpt.isPresent()) {
+                type = typeOpt.get();
+            }
 
-      Map<String, Object> arguments = parseArguments(argumentsJson);
-      return LLMObs.ToolCall.from(name, type, callId, arguments);
-    } catch (Exception e) {
-      log.debug("Failed to extract tool call information", e);
+            Map<String, Object> arguments = parseArguments(argumentsJson);
+            return LLMObs.ToolCall.from(name, type, callId, arguments);
+        } catch (Exception e) {
+            log.debug("Failed to extract tool call information", e);
+        }
+        return null;
     }
-    return null;
-  }
 
-  public static LLMObs.ToolCall getToolCall(ResponseCustomToolCall customToolCall) {
-    try {
-      String name = customToolCall.name();
-      String callId = customToolCall.callId();
-      String inputJson = customToolCall.input();
+    public static LLMObs.ToolCall getToolCall(ResponseCustomToolCall customToolCall) {
+        try {
+            String name = customToolCall.name();
+            String callId = customToolCall.callId();
+            String inputJson = customToolCall.input();
 
-      String type = "custom_tool_call";
-      Optional<String> typeOpt = customToolCall._type().asString();
-      if (typeOpt.isPresent()) {
-        type = typeOpt.get();
-      }
+            String type = "custom_tool_call";
+            Optional<String> typeOpt = customToolCall._type().asString();
+            if (typeOpt.isPresent()) {
+                type = typeOpt.get();
+            }
 
-      Map<String, Object> arguments = parseArguments(inputJson);
-      return LLMObs.ToolCall.from(name, type, callId, arguments);
-    } catch (Exception e) {
-      log.debug("Failed to extract custom tool call information", e);
+            Map<String, Object> arguments = parseArguments(inputJson);
+            return LLMObs.ToolCall.from(name, type, callId, arguments);
+        } catch (Exception e) {
+            log.debug("Failed to extract custom tool call information", e);
+        }
+        return null;
     }
-    return null;
-  }
 
-  public static LLMObs.ToolCall getToolCall(McpCall mcpCall) {
-    try {
-      String name = mcpCall.name();
-      String callId = mcpCall.id();
-      String argumentsJson = mcpCall.arguments();
+    public static LLMObs.ToolCall getToolCall(McpCall mcpCall) {
+        try {
+            String name = mcpCall.name();
+            String callId = mcpCall.id();
+            String argumentsJson = mcpCall.arguments();
 
-      String type = "mcp_call";
-      Optional<String> typeOpt = mcpCall._type().asString();
-      if (typeOpt.isPresent()) {
-        type = typeOpt.get();
-      }
+            String type = "mcp_call";
+            Optional<String> typeOpt = mcpCall._type().asString();
+            if (typeOpt.isPresent()) {
+                type = typeOpt.get();
+            }
 
-      Map<String, Object> arguments = parseArguments(argumentsJson);
-      return LLMObs.ToolCall.from(name, type, callId, arguments);
-    } catch (Exception e) {
-      log.debug("Failed to extract MCP tool call information", e);
+            Map<String, Object> arguments = parseArguments(argumentsJson);
+            return LLMObs.ToolCall.from(name, type, callId, arguments);
+        } catch (Exception e) {
+            log.debug("Failed to extract MCP tool call information", e);
+        }
+        return null;
     }
-    return null;
-  }
 
-  static Map<String, Object> parseArguments(String argumentsJson) {
-    try {
-      return MAPPER.readValue(argumentsJson, MAP_TYPE_REF);
-    } catch (Exception e) {
-      log.debug("Failed to parse tool call arguments as JSON: {}", argumentsJson, e);
-      return Collections.singletonMap("value", argumentsJson);
+    static Map<String, Object> parseArguments(String argumentsJson) {
+        try {
+            return MAPPER.readValue(argumentsJson, MAP_TYPE_REF);
+        } catch (Exception e) {
+            log.debug("Failed to parse tool call arguments as JSON: {}", argumentsJson, e);
+            return Collections.singletonMap("value", argumentsJson);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/OpenAiHttpClientForTests.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/OpenAiHttpClientForTests.java
index ead7a9f40ac..48ef487db83 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/OpenAiHttpClientForTests.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/OpenAiHttpClientForTests.java
@@ -12,93 +12,89 @@
 
 // Wraps httpClient calls to dump request/responses records to be used with the mocked backend
 public class OpenAiHttpClientForTests implements HttpClient {
-  private final Path recordsDir;
-  private final HttpClient delegate;
-
-  // Intercepts and dumps a request/response to a record file
-  public OpenAiHttpClientForTests(HttpClient delegate, Path recordsDir) {
-    this.recordsDir = recordsDir;
-    this.delegate = delegate;
-  }
-
-  @Nonnull
-  @Override
-  public HttpResponse execute(
-      @Nonnull HttpRequest request, @Nonnull RequestOptions requestOptions) {
-    HttpResponse response = delegate.execute(request, requestOptions);
-    return wrapIfNeeded(request, response);
-  }
-
-  @Nonnull
-  @Override
-  public CompletableFuture<HttpResponse> executeAsync(
-      @Nonnull HttpRequest request, @Nonnull RequestOptions requestOptions) {
-    return delegate
-        .executeAsync(request, requestOptions)
-        .thenApply(response -> wrapIfNeeded(request, response));
-  }
-
-  @Override
-  public void close() {
-    delegate.close();
-  }
-
-  private HttpResponse wrapIfNeeded(HttpRequest request, HttpResponse response) {
-    if (RequestResponseRecord.exists(recordsDir, request)) {
-      // will NOT rewrite the record file if it exists
-      return response;
-    }
-    return new ResponseRequestInterceptor(request, response, recordsDir);
-  }
-
-  private static class ResponseRequestInterceptor implements HttpResponse {
-    private final HttpRequest request;
-    private final HttpResponse response;
     private final Path recordsDir;
-    private final ByteArrayOutputStream responseBody;
+    private final HttpClient delegate;
 
-    private ResponseRequestInterceptor(
-        HttpRequest request, HttpResponse response, Path recordsDir) {
-      this.request = request;
-      this.response = response;
-      this.recordsDir = recordsDir;
-      responseBody = new ByteArrayOutputStream();
+    // Intercepts and dumps a request/response to a record file
+    public OpenAiHttpClientForTests(HttpClient delegate, Path recordsDir) {
+        this.recordsDir = recordsDir;
+        this.delegate = delegate;
     }
 
+    @Nonnull
     @Override
-    public int statusCode() {
-      return response.statusCode();
+    public HttpResponse execute(@Nonnull HttpRequest request, @Nonnull RequestOptions requestOptions) {
+        HttpResponse response = delegate.execute(request, requestOptions);
+        return wrapIfNeeded(request, response);
     }
 
     @Nonnull
     @Override
-    public Headers headers() {
-      return response.headers();
+    public CompletableFuture<HttpResponse> executeAsync(
+            @Nonnull HttpRequest request, @Nonnull RequestOptions requestOptions) {
+        return delegate.executeAsync(request, requestOptions).thenApply(response -> wrapIfNeeded(request, response));
     }
 
-    @Nonnull
     @Override
-    public InputStream body() {
-      InputStream body = response.body();
-      return new InputStream() {
-        @Override
-        public int read() throws IOException {
-          int b = body.read();
-          // capture body while it's consumed
-          responseBody.write(b);
-          return b;
+    public void close() {
+        delegate.close();
+    }
+
+    private HttpResponse wrapIfNeeded(HttpRequest request, HttpResponse response) {
+        if (RequestResponseRecord.exists(recordsDir, request)) {
+            // will NOT rewrite the record file if it exists
+            return response;
         }
-      };
+        return new ResponseRequestInterceptor(request, response, recordsDir);
     }
 
-    @Override
-    public void close() {
-      try {
-        RequestResponseRecord.dump(recordsDir, request, response, responseBody.toByteArray());
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-      response.close();
+    private static class ResponseRequestInterceptor implements HttpResponse {
+        private final HttpRequest request;
+        private final HttpResponse response;
+        private final Path recordsDir;
+        private final ByteArrayOutputStream responseBody;
+
+        private ResponseRequestInterceptor(HttpRequest request, HttpResponse response, Path recordsDir) {
+            this.request = request;
+            this.response = response;
+            this.recordsDir = recordsDir;
+            responseBody = new ByteArrayOutputStream();
+        }
+
+        @Override
+        public int statusCode() {
+            return response.statusCode();
+        }
+
+        @Nonnull
+        @Override
+        public Headers headers() {
+            return response.headers();
+        }
+
+        @Nonnull
+        @Override
+        public InputStream body() {
+            InputStream body = response.body();
+            return new InputStream() {
+                @Override
+                public int read() throws IOException {
+                    int b = body.read();
+                    // capture body while it's consumed
+                    responseBody.write(b);
+                    return b;
+                }
+            };
+        }
+
+        @Override
+        public void close() {
+            try {
+                RequestResponseRecord.dump(recordsDir, request, response, responseBody.toByteArray());
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            response.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/RequestResponseRecord.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/RequestResponseRecord.java
index 3466f682d4a..8cff157c11d 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/RequestResponseRecord.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/RequestResponseRecord.java
@@ -14,179 +14,177 @@
 import java.util.Map;
 
 public class RequestResponseRecord {
-  /**
-   * Turn it on when the tests change to identify which records have been used and which can be
-   * removed. This sets the execution attribute of the record file, so Git recognizes the file as
-   * changed. This is useful for identifying unused records when changing tests.
-   */
-  public static final boolean SET_RECORD_FILE_ATTR_ON_READ = false;
-
-  private static final String RECORD_FILE_HASH_ALG = "MD5";
-  private static final String METHOD = "method: ";
-  private static final String PATH = "path: ";
-  private static final String BEGIN_REQUEST_BODY = "-- begin request body --";
-  private static final String END_REQUEST_BODY = "-- end request body -- ";
-  private static final String STATUS_CODE = "status code: ";
-  private static final String BEGIN_RESPONSE_HEADERS = "-- begin response headers --";
-  private static final String END_RESPONSE_HEADERS = "-- end response headers --";
-  private static final String BEGIN_RESPONSE_BODY = "-- begin response body --";
-  private static final String END_RESPONSE_BODY = "-- end response body --";
-  private static final String KEY_VALUE_SEP = ": ";
-  private static final char LINE_SEP = '\n';
-
-  public final int status;
-  public final Map<String, String> headers;
-  public final byte[] body;
-
-  private RequestResponseRecord(int status, Map<String, String> headers, byte[] body) {
-    this.status = status;
-    this.headers = headers;
-    this.body = body;
-  }
-
-  public static String requestToFileName(String method, byte[] requestBody) {
-    try {
-      MessageDigest digest = MessageDigest.getInstance(RECORD_FILE_HASH_ALG);
-      byte[] bytes = digest.digest(requestBody);
-      StringBuilder sb = new StringBuilder();
-      for (byte b : bytes) {
-        sb.append(String.format("%02x", b));
-      }
-      // split hash to two haves, so it doesn't trigger the scanner on the commit
-      String hash = sb.toString();
-      int mid = hash.length() / 2;
-      String firstHalf = hash.substring(0, mid);
-      String secondHalf = hash.substring(mid);
-      return firstHalf + '+' + secondHalf + '.' + method + ".rec";
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+    /**
+     * Turn it on when the tests change to identify which records have been used and which can be
+     * removed. This sets the execution attribute of the record file, so Git recognizes the file as
+     * changed. This is useful for identifying unused records when changing tests.
+     */
+    public static final boolean SET_RECORD_FILE_ATTR_ON_READ = false;
+
+    private static final String RECORD_FILE_HASH_ALG = "MD5";
+    private static final String METHOD = "method: ";
+    private static final String PATH = "path: ";
+    private static final String BEGIN_REQUEST_BODY = "-- begin request body --";
+    private static final String END_REQUEST_BODY = "-- end request body -- ";
+    private static final String STATUS_CODE = "status code: ";
+    private static final String BEGIN_RESPONSE_HEADERS = "-- begin response headers --";
+    private static final String END_RESPONSE_HEADERS = "-- end response headers --";
+    private static final String BEGIN_RESPONSE_BODY = "-- begin response body --";
+    private static final String END_RESPONSE_BODY = "-- end response body --";
+    private static final String KEY_VALUE_SEP = ": ";
+    private static final char LINE_SEP = '\n';
+
+    public final int status;
+    public final Map<String, String> headers;
+    public final byte[] body;
+
+    private RequestResponseRecord(int status, Map<String, String> headers, byte[] body) {
+        this.status = status;
+        this.headers = headers;
+        this.body = body;
     }
-  }
-
-  public static boolean exists(Path recordsDir, HttpRequest request) {
-    String filename =
-        requestToFileName(request.method().toString(), readRequestBody(request).toByteArray());
-    Path targetDir = recordSubpath(recordsDir, request);
-    Path filePath = targetDir.resolve(filename);
-    return filePath.toFile().exists();
-  }
-
-  private static ByteArrayOutputStream readRequestBody(HttpRequest request) {
-    ByteArrayOutputStream requestBodyBytes = new ByteArrayOutputStream();
-    try (HttpRequestBody requestBody = request.body()) {
-      if (requestBody != null) {
-        requestBody.writeTo(requestBodyBytes);
-      }
+
+    public static String requestToFileName(String method, byte[] requestBody) {
+        try {
+            MessageDigest digest = MessageDigest.getInstance(RECORD_FILE_HASH_ALG);
+            byte[] bytes = digest.digest(requestBody);
+            StringBuilder sb = new StringBuilder();
+            for (byte b : bytes) {
+                sb.append(String.format("%02x", b));
+            }
+            // split hash to two haves, so it doesn't trigger the scanner on the commit
+            String hash = sb.toString();
+            int mid = hash.length() / 2;
+            String firstHalf = hash.substring(0, mid);
+            String secondHalf = hash.substring(mid);
+            return firstHalf + '+' + secondHalf + '.' + method + ".rec";
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
-    return requestBodyBytes;
-  }
 
-  private static Path recordSubpath(Path recordsDir, HttpRequest request) {
-    Path result = recordsDir;
-    for (String segment : request.pathSegments()) {
-      result = result.resolve(segment);
+    public static boolean exists(Path recordsDir, HttpRequest request) {
+        String filename = requestToFileName(
+                request.method().toString(), readRequestBody(request).toByteArray());
+        Path targetDir = recordSubpath(recordsDir, request);
+        Path filePath = targetDir.resolve(filename);
+        return filePath.toFile().exists();
     }
-    return result;
-  }
-
-  public static void dump(
-      Path recordsDir, HttpRequest request, HttpResponse response, byte[] responseBody)
-      throws IOException {
-    ByteArrayOutputStream requestBodyBytes = readRequestBody(request);
-    Path targetDir = recordSubpath(recordsDir, request);
-    Files.createDirectories(targetDir);
-    String filename =
-        requestToFileName(request.method().toString(), requestBodyBytes.toByteArray());
-    Path filePath = targetDir.resolve(filename);
-
-    try (BufferedWriter out = Files.newBufferedWriter(filePath.toFile().toPath())) {
-      out.write(METHOD);
-      out.write(request.method().toString());
-      out.write(LINE_SEP);
-
-      out.write(PATH);
-      String path = String.join("/", request.pathSegments());
-      out.write(path);
-      out.write(LINE_SEP);
-
-      out.write(BEGIN_REQUEST_BODY);
-      out.write(LINE_SEP);
-      out.write(new String(requestBodyBytes.toByteArray(), StandardCharsets.UTF_8));
-      out.write(LINE_SEP);
-      out.write(END_REQUEST_BODY);
-      out.write(LINE_SEP);
-
-      out.write(STATUS_CODE);
-      out.write(Integer.toString(response.statusCode()));
-      out.write(LINE_SEP);
-
-      out.write(BEGIN_RESPONSE_HEADERS);
-      out.write(LINE_SEP);
-      Headers headers = response.headers();
-      for (String name : headers.names()) {
-        List<String> values = headers.values(name);
-        if (values.size() == 1) {
-          out.write(name);
-          out.write(KEY_VALUE_SEP);
-          out.write(values.get(0));
-          out.write(LINE_SEP);
+
+    private static ByteArrayOutputStream readRequestBody(HttpRequest request) {
+        ByteArrayOutputStream requestBodyBytes = new ByteArrayOutputStream();
+        try (HttpRequestBody requestBody = request.body()) {
+            if (requestBody != null) {
+                requestBody.writeTo(requestBodyBytes);
+            }
         }
-      }
-      out.write(END_RESPONSE_HEADERS);
-      out.write(LINE_SEP);
-
-      out.write(BEGIN_RESPONSE_BODY);
-      out.write(LINE_SEP);
-      out.write(new String(responseBody));
-      out.write(LINE_SEP);
-      out.write(END_RESPONSE_BODY);
-      out.write(LINE_SEP);
+        return requestBodyBytes;
     }
-  }
-
-  public static RequestResponseRecord read(Path recFilePath) {
-    int statusCode = 200;
-    Map<String, String> headers = new java.util.HashMap<>();
-    StringBuilder bodyBuilder = new StringBuilder();
-
-    try {
-      List<String> lines = Files.readAllLines(recFilePath, StandardCharsets.UTF_8);
-
-      boolean inResponseHeaders = false;
-      boolean inResponseBody = false;
-
-      for (String line : lines) {
-        if (line.startsWith(STATUS_CODE)) {
-          statusCode = Integer.parseInt(line.substring(STATUS_CODE.length()));
-        } else if (line.equals(BEGIN_RESPONSE_HEADERS)) {
-          inResponseHeaders = true;
-        } else if (line.equals(END_RESPONSE_HEADERS)) {
-          inResponseHeaders = false;
-        } else if (inResponseHeaders && line.contains(KEY_VALUE_SEP)) {
-          int arrowIndex = line.indexOf(KEY_VALUE_SEP);
-          String name = line.substring(0, arrowIndex);
-          String value = line.substring(arrowIndex + KEY_VALUE_SEP.length());
-          headers.put(name, value);
-        } else if (line.equals(BEGIN_RESPONSE_BODY)) {
-          inResponseBody = true;
-        } else if (line.equals(END_RESPONSE_BODY)) {
-          inResponseBody = false;
-        } else if (inResponseBody) {
-          if (bodyBuilder.length() > 0) {
-            bodyBuilder.append(LINE_SEP);
-          }
-          bodyBuilder.append(line);
+
+    private static Path recordSubpath(Path recordsDir, HttpRequest request) {
+        Path result = recordsDir;
+        for (String segment : request.pathSegments()) {
+            result = result.resolve(segment);
         }
-      }
+        return result;
+    }
 
-      if (SET_RECORD_FILE_ATTR_ON_READ) {
-        Files.setPosixFilePermissions(recFilePath, PosixFilePermissions.fromString("rwxr-xr-x"));
-      }
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+    public static void dump(Path recordsDir, HttpRequest request, HttpResponse response, byte[] responseBody)
+            throws IOException {
+        ByteArrayOutputStream requestBodyBytes = readRequestBody(request);
+        Path targetDir = recordSubpath(recordsDir, request);
+        Files.createDirectories(targetDir);
+        String filename = requestToFileName(request.method().toString(), requestBodyBytes.toByteArray());
+        Path filePath = targetDir.resolve(filename);
+
+        try (BufferedWriter out = Files.newBufferedWriter(filePath.toFile().toPath())) {
+            out.write(METHOD);
+            out.write(request.method().toString());
+            out.write(LINE_SEP);
+
+            out.write(PATH);
+            String path = String.join("/", request.pathSegments());
+            out.write(path);
+            out.write(LINE_SEP);
+
+            out.write(BEGIN_REQUEST_BODY);
+            out.write(LINE_SEP);
+            out.write(new String(requestBodyBytes.toByteArray(), StandardCharsets.UTF_8));
+            out.write(LINE_SEP);
+            out.write(END_REQUEST_BODY);
+            out.write(LINE_SEP);
+
+            out.write(STATUS_CODE);
+            out.write(Integer.toString(response.statusCode()));
+            out.write(LINE_SEP);
+
+            out.write(BEGIN_RESPONSE_HEADERS);
+            out.write(LINE_SEP);
+            Headers headers = response.headers();
+            for (String name : headers.names()) {
+                List<String> values = headers.values(name);
+                if (values.size() == 1) {
+                    out.write(name);
+                    out.write(KEY_VALUE_SEP);
+                    out.write(values.get(0));
+                    out.write(LINE_SEP);
+                }
+            }
+            out.write(END_RESPONSE_HEADERS);
+            out.write(LINE_SEP);
+
+            out.write(BEGIN_RESPONSE_BODY);
+            out.write(LINE_SEP);
+            out.write(new String(responseBody));
+            out.write(LINE_SEP);
+            out.write(END_RESPONSE_BODY);
+            out.write(LINE_SEP);
+        }
     }
 
-    byte[] body = bodyBuilder.toString().getBytes(StandardCharsets.UTF_8);
-    return new RequestResponseRecord(statusCode, headers, body);
-  }
+    public static RequestResponseRecord read(Path recFilePath) {
+        int statusCode = 200;
+        Map<String, String> headers = new java.util.HashMap<>();
+        StringBuilder bodyBuilder = new StringBuilder();
+
+        try {
+            List<String> lines = Files.readAllLines(recFilePath, StandardCharsets.UTF_8);
+
+            boolean inResponseHeaders = false;
+            boolean inResponseBody = false;
+
+            for (String line : lines) {
+                if (line.startsWith(STATUS_CODE)) {
+                    statusCode = Integer.parseInt(line.substring(STATUS_CODE.length()));
+                } else if (line.equals(BEGIN_RESPONSE_HEADERS)) {
+                    inResponseHeaders = true;
+                } else if (line.equals(END_RESPONSE_HEADERS)) {
+                    inResponseHeaders = false;
+                } else if (inResponseHeaders && line.contains(KEY_VALUE_SEP)) {
+                    int arrowIndex = line.indexOf(KEY_VALUE_SEP);
+                    String name = line.substring(0, arrowIndex);
+                    String value = line.substring(arrowIndex + KEY_VALUE_SEP.length());
+                    headers.put(name, value);
+                } else if (line.equals(BEGIN_RESPONSE_BODY)) {
+                    inResponseBody = true;
+                } else if (line.equals(END_RESPONSE_BODY)) {
+                    inResponseBody = false;
+                } else if (inResponseBody) {
+                    if (bodyBuilder.length() > 0) {
+                        bodyBuilder.append(LINE_SEP);
+                    }
+                    bodyBuilder.append(line);
+                }
+            }
+
+            if (SET_RECORD_FILE_ATTR_ON_READ) {
+                Files.setPosixFilePermissions(recFilePath, PosixFilePermissions.fromString("rwxr-xr-x"));
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        byte[] body = bodyBuilder.toString().getBytes(StandardCharsets.UTF_8);
+        return new RequestResponseRecord(statusCode, headers, body);
+    }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/JsonValueUtilsTest.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/JsonValueUtilsTest.java
index 21713649956..f2a2cab674e 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/JsonValueUtilsTest.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/JsonValueUtilsTest.java
@@ -14,145 +14,143 @@
 
 class JsonValueUtilsTest {
 
-  @Test
-  void testNullReturnsNull() {
-    assertNull(JsonValueUtils.jsonValueToObject(null));
-  }
-
-  @Test
-  void testString() {
-    assertEquals("hello", JsonValueUtils.jsonValueToObject(JsonValue.from("hello")));
-  }
-
-  @Test
-  void testInteger() {
-    Object result = JsonValueUtils.jsonValueToObject(JsonValue.from(42));
-    assertInstanceOf(Number.class, result);
-    assertEquals(42, ((Number) result).intValue());
-  }
-
-  @Test
-  void testDouble() {
-    Object result = JsonValueUtils.jsonValueToObject(JsonValue.from(3.14));
-    assertInstanceOf(Number.class, result);
-    assertEquals(3.14, ((Number) result).doubleValue(), 0.0001);
-  }
-
-  @Test
-  void testBooleanTrue() {
-    assertEquals(true, JsonValueUtils.jsonValueToObject(JsonValue.from(true)));
-  }
-
-  @Test
-  void testBooleanFalse() {
-    assertEquals(false, JsonValueUtils.jsonValueToObject(JsonValue.from(false)));
-  }
-
-  @Test
-  void testFlatObject() {
-    Map<String, Object> input = new HashMap<>();
-    input.put("key1", "value1");
-    input.put("key2", 123);
-
-    Object result = JsonValueUtils.jsonValueToObject(JsonValue.from(input));
-
-    assertInstanceOf(Map.class, result);
-    @SuppressWarnings("unchecked")
-    Map<String, Object> map = (Map<String, Object>) result;
-    assertEquals("value1", map.get("key1"));
-    assertEquals(123, ((Number) map.get("key2")).intValue());
-  }
-
-  @Test
-  void testNestedObject() {
-    Map<String, Object> inner = new HashMap<>();
-    inner.put("x", "nested");
-    Map<String, Object> outer = new HashMap<>();
-    outer.put("inner", inner);
-
-    Object result = JsonValueUtils.jsonValueToObject(JsonValue.from(outer));
-
-    assertInstanceOf(Map.class, result);
-    @SuppressWarnings("unchecked")
-    Map<String, Object> outerMap = (Map<String, Object>) result;
-    assertInstanceOf(Map.class, outerMap.get("inner"));
-    @SuppressWarnings("unchecked")
-    Map<String, Object> innerMap = (Map<String, Object>) outerMap.get("inner");
-    assertEquals("nested", innerMap.get("x"));
-  }
-
-  @Test
-  void testFlatArray() {
-    Object result = JsonValueUtils.jsonValueToObject(JsonValue.from(Arrays.asList("a", "b", "c")));
-
-    assertInstanceOf(List.class, result);
-    @SuppressWarnings("unchecked")
-    List<Object> list = (List<Object>) result;
-    assertEquals(3, list.size());
-    assertEquals("a", list.get(0));
-    assertEquals("b", list.get(1));
-    assertEquals("c", list.get(2));
-  }
-
-  @Test
-  void testNestedArray() {
-    Object result =
-        JsonValueUtils.jsonValueToObject(
-            JsonValue.from(Arrays.asList(Arrays.asList(1, 2), Arrays.asList(3, 4))));
-
-    assertInstanceOf(List.class, result);
-    @SuppressWarnings("unchecked")
-    List<Object> outer = (List<Object>) result;
-    assertInstanceOf(List.class, outer.get(0));
-    @SuppressWarnings("unchecked")
-    List<Object> inner = (List<Object>) outer.get(0);
-    assertEquals(1, ((Number) inner.get(0)).intValue());
-  }
-
-  @Test
-  void testMixedArray() {
-    Object result =
-        JsonValueUtils.jsonValueToObject(JsonValue.from(Arrays.asList("text", 42, true)));
-
-    assertInstanceOf(List.class, result);
-    @SuppressWarnings("unchecked")
-    List<Object> list = (List<Object>) result;
-    assertEquals("text", list.get(0));
-    assertEquals(42, ((Number) list.get(1)).intValue());
-    assertEquals(true, list.get(2));
-  }
-
-  @Test
-  void testEmptyObject() {
-    Object result = JsonValueUtils.jsonValueToObject(JsonValue.from(new HashMap<>()));
-    assertInstanceOf(Map.class, result);
-    assertTrue(((Map<?, ?>) result).isEmpty());
-  }
-
-  @Test
-  void testEmptyArray() {
-    Object result = JsonValueUtils.jsonValueToObject(JsonValue.from(Arrays.asList()));
-    assertInstanceOf(List.class, result);
-    assertTrue(((List<?>) result).isEmpty());
-  }
-
-  @Test
-  void testJsonValueMapToObject() {
-    Map<String, JsonValue> input = new HashMap<>();
-    input.put("str", JsonValue.from("hello"));
-    input.put("num", JsonValue.from(7));
-    input.put("bool", JsonValue.from(false));
-
-    Map<String, Object> result = JsonValueUtils.jsonValueMapToObject(input);
-
-    assertEquals("hello", result.get("str"));
-    assertEquals(7, ((Number) result.get("num")).intValue());
-    assertEquals(false, result.get("bool"));
-  }
-
-  @Test
-  void testJsonValueMapToObjectEmpty() {
-    Map<String, Object> result = JsonValueUtils.jsonValueMapToObject(new HashMap<>());
-    assertTrue(result.isEmpty());
-  }
+    @Test
+    void testNullReturnsNull() {
+        assertNull(JsonValueUtils.jsonValueToObject(null));
+    }
+
+    @Test
+    void testString() {
+        assertEquals("hello", JsonValueUtils.jsonValueToObject(JsonValue.from("hello")));
+    }
+
+    @Test
+    void testInteger() {
+        Object result = JsonValueUtils.jsonValueToObject(JsonValue.from(42));
+        assertInstanceOf(Number.class, result);
+        assertEquals(42, ((Number) result).intValue());
+    }
+
+    @Test
+    void testDouble() {
+        Object result = JsonValueUtils.jsonValueToObject(JsonValue.from(3.14));
+        assertInstanceOf(Number.class, result);
+        assertEquals(3.14, ((Number) result).doubleValue(), 0.0001);
+    }
+
+    @Test
+    void testBooleanTrue() {
+        assertEquals(true, JsonValueUtils.jsonValueToObject(JsonValue.from(true)));
+    }
+
+    @Test
+    void testBooleanFalse() {
+        assertEquals(false, JsonValueUtils.jsonValueToObject(JsonValue.from(false)));
+    }
+
+    @Test
+    void testFlatObject() {
+        Map<String, Object> input = new HashMap<>();
+        input.put("key1", "value1");
+        input.put("key2", 123);
+
+        Object result = JsonValueUtils.jsonValueToObject(JsonValue.from(input));
+
+        assertInstanceOf(Map.class, result);
+        @SuppressWarnings("unchecked")
+        Map<String, Object> map = (Map<String, Object>) result;
+        assertEquals("value1", map.get("key1"));
+        assertEquals(123, ((Number) map.get("key2")).intValue());
+    }
+
+    @Test
+    void testNestedObject() {
+        Map<String, Object> inner = new HashMap<>();
+        inner.put("x", "nested");
+        Map<String, Object> outer = new HashMap<>();
+        outer.put("inner", inner);
+
+        Object result = JsonValueUtils.jsonValueToObject(JsonValue.from(outer));
+
+        assertInstanceOf(Map.class, result);
+        @SuppressWarnings("unchecked")
+        Map<String, Object> outerMap = (Map<String, Object>) result;
+        assertInstanceOf(Map.class, outerMap.get("inner"));
+        @SuppressWarnings("unchecked")
+        Map<String, Object> innerMap = (Map<String, Object>) outerMap.get("inner");
+        assertEquals("nested", innerMap.get("x"));
+    }
+
+    @Test
+    void testFlatArray() {
+        Object result = JsonValueUtils.jsonValueToObject(JsonValue.from(Arrays.asList("a", "b", "c")));
+
+        assertInstanceOf(List.class, result);
+        @SuppressWarnings("unchecked")
+        List<Object> list = (List<Object>) result;
+        assertEquals(3, list.size());
+        assertEquals("a", list.get(0));
+        assertEquals("b", list.get(1));
+        assertEquals("c", list.get(2));
+    }
+
+    @Test
+    void testNestedArray() {
+        Object result = JsonValueUtils.jsonValueToObject(
+                JsonValue.from(Arrays.asList(Arrays.asList(1, 2), Arrays.asList(3, 4))));
+
+        assertInstanceOf(List.class, result);
+        @SuppressWarnings("unchecked")
+        List<Object> outer = (List<Object>) result;
+        assertInstanceOf(List.class, outer.get(0));
+        @SuppressWarnings("unchecked")
+        List<Object> inner = (List<Object>) outer.get(0);
+        assertEquals(1, ((Number) inner.get(0)).intValue());
+    }
+
+    @Test
+    void testMixedArray() {
+        Object result = JsonValueUtils.jsonValueToObject(JsonValue.from(Arrays.asList("text", 42, true)));
+
+        assertInstanceOf(List.class, result);
+        @SuppressWarnings("unchecked")
+        List<Object> list = (List<Object>) result;
+        assertEquals("text", list.get(0));
+        assertEquals(42, ((Number) list.get(1)).intValue());
+        assertEquals(true, list.get(2));
+    }
+
+    @Test
+    void testEmptyObject() {
+        Object result = JsonValueUtils.jsonValueToObject(JsonValue.from(new HashMap<>()));
+        assertInstanceOf(Map.class, result);
+        assertTrue(((Map<?, ?>) result).isEmpty());
+    }
+
+    @Test
+    void testEmptyArray() {
+        Object result = JsonValueUtils.jsonValueToObject(JsonValue.from(Arrays.asList()));
+        assertInstanceOf(List.class, result);
+        assertTrue(((List<?>) result).isEmpty());
+    }
+
+    @Test
+    void testJsonValueMapToObject() {
+        Map<String, JsonValue> input = new HashMap<>();
+        input.put("str", JsonValue.from("hello"));
+        input.put("num", JsonValue.from(7));
+        input.put("bool", JsonValue.from(false));
+
+        Map<String, Object> result = JsonValueUtils.jsonValueMapToObject(input);
+
+        assertEquals("hello", result.get("str"));
+        assertEquals(7, ((Number) result.get("num")).intValue());
+        assertEquals(false, result.get("bool"));
+    }
+
+    @Test
+    void testJsonValueMapToObjectEmpty() {
+        Map<String, Object> result = JsonValueUtils.jsonValueMapToObject(new HashMap<>());
+        assertTrue(result.isEmpty());
+    }
 }
diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/LlmObsContextPropagationForkedTest.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/LlmObsContextPropagationForkedTest.java
index 1bf42e0e4df..d20d8252d4d 100644
--- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/LlmObsContextPropagationForkedTest.java
+++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/LlmObsContextPropagationForkedTest.java
@@ -39,89 +39,84 @@
  */
 abstract class AbstractLlmObsOpenAiForkedTest extends AbstractInstrumentationTest {
 
-  protected static HttpServer mockServer;
-  protected static OpenAIClient openAiClient;
-
-  private static final String CHAT_COMPLETION_BODY =
-      "{\"id\":\"chatcmpl-test\",\"object\":\"chat.completion\",\"created\":1,"
-          + "\"model\":\"gpt-4o-mini-2024-07-18\","
-          + "\"choices\":[{\"index\":0,\"finish_reason\":\"stop\",\"logprobs\":null,"
-          + "\"message\":{\"role\":\"assistant\",\"content\":\"hi\"}}],"
-          + "\"usage\":{\"prompt_tokens\":11,\"completion_tokens\":7,\"total_tokens\":18,"
-          + "\"prompt_tokens_details\":{\"cached_tokens\":4}}}";
-
-  private static final String EMBEDDING_BODY =
-      "{\"object\":\"list\",\"model\":\"text-embedding-ada-002\","
-          + "\"data\":[{\"object\":\"embedding\",\"index\":0,\"embedding\":[0.1,0.2]}],"
-          + "\"usage\":{\"prompt_tokens\":5,\"total_tokens\":5}}";
-
-  @BeforeAll
-  static void setupMockOpenAi() throws IOException {
-    mockServer = HttpServer.create(new InetSocketAddress("localhost", 0), 0);
-    mockServer.createContext("/v1/chat/completions", jsonHandler(CHAT_COMPLETION_BODY));
-    mockServer.createContext("/v1/embeddings", jsonHandler(EMBEDDING_BODY));
-    mockServer.createContext(
-        "/v1/",
-        exchange -> {
-          exchange.sendResponseHeaders(200, -1);
-          exchange.close();
+    protected static HttpServer mockServer;
+    protected static OpenAIClient openAiClient;
+
+    private static final String CHAT_COMPLETION_BODY =
+            "{\"id\":\"chatcmpl-test\",\"object\":\"chat.completion\",\"created\":1,"
+                    + "\"model\":\"gpt-4o-mini-2024-07-18\","
+                    + "\"choices\":[{\"index\":0,\"finish_reason\":\"stop\",\"logprobs\":null,"
+                    + "\"message\":{\"role\":\"assistant\",\"content\":\"hi\"}}],"
+                    + "\"usage\":{\"prompt_tokens\":11,\"completion_tokens\":7,\"total_tokens\":18,"
+                    + "\"prompt_tokens_details\":{\"cached_tokens\":4}}}";
+
+    private static final String EMBEDDING_BODY = "{\"object\":\"list\",\"model\":\"text-embedding-ada-002\","
+            + "\"data\":[{\"object\":\"embedding\",\"index\":0,\"embedding\":[0.1,0.2]}],"
+            + "\"usage\":{\"prompt_tokens\":5,\"total_tokens\":5}}";
+
+    @BeforeAll
+    static void setupMockOpenAi() throws IOException {
+        mockServer = HttpServer.create(new InetSocketAddress("localhost", 0), 0);
+        mockServer.createContext("/v1/chat/completions", jsonHandler(CHAT_COMPLETION_BODY));
+        mockServer.createContext("/v1/embeddings", jsonHandler(EMBEDDING_BODY));
+        mockServer.createContext("/v1/", exchange -> {
+            exchange.sendResponseHeaders(200, -1);
+            exchange.close();
         });
-    mockServer.start();
-
-    openAiClient =
-        OpenAIOkHttpClient.builder()
-            .baseUrl(
-                "http://"
-                    + mockServer.getAddress().getHostString()
-                    + ":"
-                    + mockServer.getAddress().getPort()
-                    + "/v1")
-            .credential(BearerTokenCredential.create(""))
-            .build();
-  }
-
-  @AfterAll
-  static void tearDownMockOpenAi() {
-    if (mockServer != null) {
-      mockServer.stop(0);
-      mockServer = null;
+        mockServer.start();
+
+        openAiClient = OpenAIOkHttpClient.builder()
+                .baseUrl("http://"
+                        + mockServer.getAddress().getHostString()
+                        + ":"
+                        + mockServer.getAddress().getPort()
+                        + "/v1")
+                .credential(BearerTokenCredential.create(""))
+                .build();
+    }
+
+    @AfterAll
+    static void tearDownMockOpenAi() {
+        if (mockServer != null) {
+            mockServer.stop(0);
+            mockServer = null;
+        }
+        openAiClient = null;
+    }
+
+    private static HttpHandler jsonHandler(String body) {
+        return exchange -> {
+            byte[] bytes = body.getBytes(StandardCharsets.UTF_8);
+            exchange.getResponseHeaders().set("Content-Type", "application/json");
+            exchange.sendResponseHeaders(200, bytes.length);
+            try (OutputStream out = exchange.getResponseBody()) {
+                out.write(bytes);
+            }
+        };
+    }
+
+    protected static ChatCompletionCreateParams buildMinimalChatParams() {
+        return ChatCompletionCreateParams.builder()
+                .model(ChatModel.GPT_4O_MINI)
+                .addSystemMessage("")
+                .addUserMessage("")
+                .build();
+    }
+
+    protected static EmbeddingCreateParams buildMinimalEmbeddingParams() {
+        return EmbeddingCreateParams.builder()
+                .model(EmbeddingModel.TEXT_EMBEDDING_ADA_002)
+                .input("")
+                .build();
+    }
+
+    protected static DDSpan findSpanByOperationName(List<List<DDSpan>> traces, String operationName) {
+        return traces.stream()
+                .flatMap(List::stream)
+                .filter(s -> operationName.equals(s.getOperationName().toString()))
+                .findFirst()
+                .orElse(null);
     }
-    openAiClient = null;
-  }
-
-  private static HttpHandler jsonHandler(String body) {
-    return exchange -> {
-      byte[] bytes = body.getBytes(StandardCharsets.UTF_8);
-      exchange.getResponseHeaders().set("Content-Type", "application/json");
-      exchange.sendResponseHeaders(200, bytes.length);
-      try (OutputStream out = exchange.getResponseBody()) {
-        out.write(bytes);
-      }
-    };
-  }
-
-  protected static ChatCompletionCreateParams buildMinimalChatParams() {
-    return ChatCompletionCreateParams.builder()
-        .model(ChatModel.GPT_4O_MINI)
-        .addSystemMessage("")
-        .addUserMessage("")
-        .build();
-  }
-
-  protected static EmbeddingCreateParams buildMinimalEmbeddingParams() {
-    return EmbeddingCreateParams.builder()
-        .model(EmbeddingModel.TEXT_EMBEDDING_ADA_002)
-        .input("")
-        .build();
-  }
-
-  protected static DDSpan findSpanByOperationName(List<List<DDSpan>> traces, String operationName) {
-    return traces.stream()
-        .flatMap(List::stream)
-        .filter(s -> operationName.equals(s.getOperationName().toString()))
-        .findFirst()
-        .orElse(null);
-  }
 }
 
 /**
@@ -141,168 +136,149 @@ protected static DDSpan findSpanByOperationName(List<List<DDSpan>> traces, Strin
 @WithConfig(key = "llmobs.enabled", value = "true")
 class LlmObsContextPropagationForkedTest extends AbstractLlmObsOpenAiForkedTest {
 
-  @Test
-  void openAiRequestSpanInheritsSessionIdFromActiveContext() throws Exception {
-    String expectedSessionId = "session-propagation-test-abc";
+    @Test
+    void openAiRequestSpanInheritsSessionIdFromActiveContext() throws Exception {
+        String expectedSessionId = "session-propagation-test-abc";
+
+        AgentSpan parentSpan = AgentTracer.startSpan("test", "parent");
+        try (ContextScope ignored1 = AgentTracer.activateSpan(parentSpan)) {
+            try (ContextScope ignored2 = LLMObsContext.attach(parentSpan.spanContext(), expectedSessionId)) {
+                openAiClient.chat().completions().create(buildMinimalChatParams());
+            }
+        } finally {
+            parentSpan.finish();
+        }
+
+        writer.waitForTraces(1);
+        DDSpan openAiSpan = findSpanByOperationName(writer, "openai.request");
+        assertNotNull(openAiSpan, "openai.request span should have been created");
+        assertEquals(expectedSessionId, openAiSpan.getTag("_ml_obs_tag.session_id"));
+    }
 
-    AgentSpan parentSpan = AgentTracer.startSpan("test", "parent");
-    try (ContextScope ignored1 = AgentTracer.activateSpan(parentSpan)) {
-      try (ContextScope ignored2 =
-          LLMObsContext.attach(parentSpan.spanContext(), expectedSessionId)) {
+    @Test
+    void openAiRequestSpanHasNoSessionIdWhenNoLlmObsContext() throws Exception {
         openAiClient.chat().completions().create(buildMinimalChatParams());
-      }
-    } finally {
-      parentSpan.finish();
+
+        writer.waitForTraces(1);
+        DDSpan openAiSpan = findSpanByOperationName(writer, "openai.request");
+        assertNotNull(openAiSpan, "openai.request span should have been created");
+        assertNull(openAiSpan.getTag("_ml_obs_tag.session_id"));
     }
 
-    writer.waitForTraces(1);
-    DDSpan openAiSpan = findSpanByOperationName(writer, "openai.request");
-    assertNotNull(openAiSpan, "openai.request span should have been created");
-    assertEquals(expectedSessionId, openAiSpan.getTag("_ml_obs_tag.session_id"));
-  }
-
-  @Test
-  void openAiRequestSpanHasNoSessionIdWhenNoLlmObsContext() throws Exception {
-    openAiClient.chat().completions().create(buildMinimalChatParams());
-
-    writer.waitForTraces(1);
-    DDSpan openAiSpan = findSpanByOperationName(writer, "openai.request");
-    assertNotNull(openAiSpan, "openai.request span should have been created");
-    assertNull(openAiSpan.getTag("_ml_obs_tag.session_id"));
-  }
-
-  @Test
-  void openAiRequestSpanInheritsAgentVersionFromActiveContext() throws Exception {
-    String expectedAgentVersion = "agent-version-propagation-test-1.2.3";
-
-    AgentSpan parentSpan = AgentTracer.startSpan("test", "parent");
-    try (ContextScope ignored1 = AgentTracer.activateSpan(parentSpan)) {
-      try (ContextScope ignored2 =
-          LLMObsContext.attach(parentSpan.spanContext(), null, expectedAgentVersion)) {
-        openAiClient.chat().completions().create(buildMinimalChatParams());
-      }
-    } finally {
-      parentSpan.finish();
+    @Test
+    void openAiRequestSpanInheritsAgentVersionFromActiveContext() throws Exception {
+        String expectedAgentVersion = "agent-version-propagation-test-1.2.3";
+
+        AgentSpan parentSpan = AgentTracer.startSpan("test", "parent");
+        try (ContextScope ignored1 = AgentTracer.activateSpan(parentSpan)) {
+            try (ContextScope ignored2 = LLMObsContext.attach(parentSpan.spanContext(), null, expectedAgentVersion)) {
+                openAiClient.chat().completions().create(buildMinimalChatParams());
+            }
+        } finally {
+            parentSpan.finish();
+        }
+
+        writer.waitForTraces(1);
+        DDSpan openAiSpan = findSpanByOperationName(writer, "openai.request");
+        assertNotNull(openAiSpan, "openai.request span should have been created");
+        assertEquals(expectedAgentVersion, openAiSpan.getTag("_ml_obs_tag.agent_version"));
     }
 
-    writer.waitForTraces(1);
-    DDSpan openAiSpan = findSpanByOperationName(writer, "openai.request");
-    assertNotNull(openAiSpan, "openai.request span should have been created");
-    assertEquals(expectedAgentVersion, openAiSpan.getTag("_ml_obs_tag.agent_version"));
-  }
-
-  @Test
-  void openAiRequestSpanInheritsDroppedSamplingDecisionFromActiveContext() throws Exception {
-    AgentSpan parentSpan = AgentTracer.startSpan("test", "parent");
-    try (ContextScope ignored1 = AgentTracer.activateSpan(parentSpan)) {
-      try (ContextScope ignored2 =
-          LLMObsContext.attach(
-              parentSpan.spanContext(),
-              null,
-              null,
-              "0.25",
-              LLMObsContext.SAMPLING_DECISION_DROPPED,
-              null,
-              null)) {
-        openAiClient.chat().completions().create(buildMinimalChatParams());
-      }
-    } finally {
-      parentSpan.finish();
+    @Test
+    void openAiRequestSpanInheritsDroppedSamplingDecisionFromActiveContext() throws Exception {
+        AgentSpan parentSpan = AgentTracer.startSpan("test", "parent");
+        try (ContextScope ignored1 = AgentTracer.activateSpan(parentSpan)) {
+            try (ContextScope ignored2 = LLMObsContext.attach(
+                    parentSpan.spanContext(),
+                    null,
+                    null,
+                    "0.25",
+                    LLMObsContext.SAMPLING_DECISION_DROPPED,
+                    null,
+                    null)) {
+                openAiClient.chat().completions().create(buildMinimalChatParams());
+            }
+        } finally {
+            parentSpan.finish();
+        }
+
+        writer.waitForTraces(1);
+        DDSpan openAiSpan = findSpanByOperationName(writer, "openai.request");
+        assertNotNull(openAiSpan, "openai.request span should have been created");
+        assertEquals(LLMObsContext.SAMPLING_DECISION_DROPPED, openAiSpan.getTag("_ml_obs_tag.sampling_decision"));
+        assertEquals("0.25", openAiSpan.getTag("_ml_obs_tag.sample_rate"));
     }
 
-    writer.waitForTraces(1);
-    DDSpan openAiSpan = findSpanByOperationName(writer, "openai.request");
-    assertNotNull(openAiSpan, "openai.request span should have been created");
-    assertEquals(
-        LLMObsContext.SAMPLING_DECISION_DROPPED,
-        openAiSpan.getTag("_ml_obs_tag.sampling_decision"));
-    assertEquals("0.25", openAiSpan.getTag("_ml_obs_tag.sample_rate"));
-  }
-
-  @Test
-  void openAiRequestSpanInheritsRetainedSamplingDecisionFromActiveContext() throws Exception {
-    AgentSpan parentSpan = AgentTracer.startSpan("test", "parent");
-    try (ContextScope ignored1 = AgentTracer.activateSpan(parentSpan)) {
-      try (ContextScope ignored2 =
-          LLMObsContext.attach(
-              parentSpan.spanContext(),
-              null,
-              null,
-              "1",
-              LLMObsContext.SAMPLING_DECISION_SAMPLED,
-              null,
-              null)) {
-        openAiClient.chat().completions().create(buildMinimalChatParams());
-      }
-    } finally {
-      parentSpan.finish();
+    @Test
+    void openAiRequestSpanInheritsRetainedSamplingDecisionFromActiveContext() throws Exception {
+        AgentSpan parentSpan = AgentTracer.startSpan("test", "parent");
+        try (ContextScope ignored1 = AgentTracer.activateSpan(parentSpan)) {
+            try (ContextScope ignored2 = LLMObsContext.attach(
+                    parentSpan.spanContext(), null, null, "1", LLMObsContext.SAMPLING_DECISION_SAMPLED, null, null)) {
+                openAiClient.chat().completions().create(buildMinimalChatParams());
+            }
+        } finally {
+            parentSpan.finish();
+        }
+
+        writer.waitForTraces(1);
+        DDSpan openAiSpan = findSpanByOperationName(writer, "openai.request");
+        assertNotNull(openAiSpan, "openai.request span should have been created");
+        assertEquals(LLMObsContext.SAMPLING_DECISION_SAMPLED, openAiSpan.getTag("_ml_obs_tag.sampling_decision"));
+        assertEquals("1", openAiSpan.getTag("_ml_obs_tag.sample_rate"));
     }
 
-    writer.waitForTraces(1);
-    DDSpan openAiSpan = findSpanByOperationName(writer, "openai.request");
-    assertNotNull(openAiSpan, "openai.request span should have been created");
-    assertEquals(
-        LLMObsContext.SAMPLING_DECISION_SAMPLED,
-        openAiSpan.getTag("_ml_obs_tag.sampling_decision"));
-    assertEquals("1", openAiSpan.getTag("_ml_obs_tag.sample_rate"));
-  }
-
-  @Test
-  void openAiRequestSpanComputesItsOwnSamplingDecisionWhenNoLlmObsContext() throws Exception {
-    openAiClient.chat().completions().create(buildMinimalChatParams());
-
-    // No verdict to inherit, so the span is the root of its own LLMObs trace and decides for
-    // itself. The rate of 1.0 retains every trace ID, so the verdict is deterministic without
-    // controlling the trace ID.
-    writer.waitForTraces(1);
-    DDSpan openAiSpan = findSpanByOperationName(writer, "openai.request");
-    assertNotNull(openAiSpan, "openai.request span should have been created");
-    assertEquals(
-        LLMObsContext.SAMPLING_DECISION_SAMPLED,
-        openAiSpan.getTag("_ml_obs_tag.sampling_decision"));
-    assertEquals("1", openAiSpan.getTag("_ml_obs_tag.sample_rate"));
-  }
-
-  @Test
-  void openAiRequestSpanInheritsNothingFromStaleCrossTraceContext() throws Exception {
-    // Simulates a stale LLMObsContext leaked across an async boundary: the context is attached,
-    // but its span is never made the active tracer span, so the openai.request call below starts
-    // a brand-new trace and the trace-consistency gate in OpenAiDecorator must skip inheritance.
-    AgentSpan staleParent = AgentTracer.startSpan("test", "stale-parent");
-    try (ContextScope ignored =
-        LLMObsContext.attach(
-            staleParent.spanContext(),
-            "stale-session",
-            "stale-version",
-            "0.25",
-            LLMObsContext.SAMPLING_DECISION_DROPPED,
-            "stale-agent-span-id",
-            "stale-agent")) {
-      openAiClient.chat().completions().create(buildMinimalChatParams());
-    } finally {
-      staleParent.finish();
+    @Test
+    void openAiRequestSpanComputesItsOwnSamplingDecisionWhenNoLlmObsContext() throws Exception {
+        openAiClient.chat().completions().create(buildMinimalChatParams());
+
+        // No verdict to inherit, so the span is the root of its own LLMObs trace and decides for
+        // itself. The rate of 1.0 retains every trace ID, so the verdict is deterministic without
+        // controlling the trace ID.
+        writer.waitForTraces(1);
+        DDSpan openAiSpan = findSpanByOperationName(writer, "openai.request");
+        assertNotNull(openAiSpan, "openai.request span should have been created");
+        assertEquals(LLMObsContext.SAMPLING_DECISION_SAMPLED, openAiSpan.getTag("_ml_obs_tag.sampling_decision"));
+        assertEquals("1", openAiSpan.getTag("_ml_obs_tag.sample_rate"));
     }
 
-    writer.waitForTraces(2);
-    DDSpan openAiSpan = findSpanByOperationName(writer, "openai.request");
-    assertNotNull(openAiSpan, "openai.request span should have been created");
-
-    // The stale "0"/"0.25" pair must not leak; the span falls through to deciding for itself at
-    // the configured rate of 1.0 instead.
-    assertEquals(
-        LLMObsContext.SAMPLING_DECISION_SAMPLED,
-        openAiSpan.getTag("_ml_obs_tag.sampling_decision"));
-    assertEquals("1", openAiSpan.getTag("_ml_obs_tag.sample_rate"));
-
-    // The same gate covers parent_id, session_id, agent_version and agent attribution: inheriting
-    // any of them would point this span at a parent in an unrelated trace and file it under an
-    // unrelated session or agent.
-    assertEquals(LLMObsContext.ROOT_SPAN_ID, openAiSpan.getTag("_ml_obs_tag.parent_id"));
-    assertNull(openAiSpan.getTag("_ml_obs_tag.session_id"));
-    assertNull(openAiSpan.getTag("_ml_obs_tag.agent_version"));
-    assertNull(openAiSpan.getTag("_ml_obs_tag.pagent_span_id"));
-    assertNull(openAiSpan.getTag("_ml_obs_tag.pagent_name"));
-  }
+    @Test
+    void openAiRequestSpanInheritsNothingFromStaleCrossTraceContext() throws Exception {
+        // Simulates a stale LLMObsContext leaked across an async boundary: the context is attached,
+        // but its span is never made the active tracer span, so the openai.request call below starts
+        // a brand-new trace and the trace-consistency gate in OpenAiDecorator must skip inheritance.
+        AgentSpan staleParent = AgentTracer.startSpan("test", "stale-parent");
+        try (ContextScope ignored = LLMObsContext.attach(
+                staleParent.spanContext(),
+                "stale-session",
+                "stale-version",
+                "0.25",
+                LLMObsContext.SAMPLING_DECISION_DROPPED,
+                "stale-agent-span-id",
+                "stale-agent")) {
+            openAiClient.chat().completions().create(buildMinimalChatParams());
+        } finally {
+            staleParent.finish();
+        }
+
+        writer.waitForTraces(2);
+        DDSpan openAiSpan = findSpanByOperationName(writer, "openai.request");
+        assertNotNull(openAiSpan, "openai.request span should have been created");
+
+        // The stale "0"/"0.25" pair must not leak; the span falls through to deciding for itself at
+        // the configured rate of 1.0 instead.
+        assertEquals(LLMObsContext.SAMPLING_DECISION_SAMPLED, openAiSpan.getTag("_ml_obs_tag.sampling_decision"));
+        assertEquals("1", openAiSpan.getTag("_ml_obs_tag.sample_rate"));
+
+        // The same gate covers parent_id, session_id, agent_version and agent attribution: inheriting
+        // any of them would point this span at a parent in an unrelated trace and file it under an
+        // unrelated session or agent.
+        assertEquals(LLMObsContext.ROOT_SPAN_ID, openAiSpan.getTag("_ml_obs_tag.parent_id"));
+        assertNull(openAiSpan.getTag("_ml_obs_tag.session_id"));
+        assertNull(openAiSpan.getTag("_ml_obs_tag.agent_version"));
+        assertNull(openAiSpan.getTag("_ml_obs_tag.pagent_span_id"));
+        assertNull(openAiSpan.getTag("_ml_obs_tag.pagent_name"));
+    }
 }
 
 /**
@@ -313,18 +289,16 @@ void openAiRequestSpanInheritsNothingFromStaleCrossTraceContext() throws Excepti
 @WithConfig(key = "llmobs.sample.rate", value = "0")
 class LlmObsZeroSampleRateForkedTest extends AbstractLlmObsOpenAiForkedTest {
 
-  @Test
-  void parentlessOpenAiRequestSpanIsDroppedAtZeroSampleRate() throws Exception {
-    openAiClient.chat().completions().create(buildMinimalChatParams());
-
-    writer.waitForTraces(1);
-    DDSpan openAiSpan = findSpanByOperationName(writer, "openai.request");
-    assertNotNull(openAiSpan, "openai.request span should have been created");
-    assertEquals(
-        LLMObsContext.SAMPLING_DECISION_DROPPED,
-        openAiSpan.getTag("_ml_obs_tag.sampling_decision"));
-    assertEquals("0", openAiSpan.getTag("_ml_obs_tag.sample_rate"));
-  }
+    @Test
+    void parentlessOpenAiRequestSpanIsDroppedAtZeroSampleRate() throws Exception {
+        openAiClient.chat().completions().create(buildMinimalChatParams());
+
+        writer.waitForTraces(1);
+        DDSpan openAiSpan = findSpanByOperationName(writer, "openai.request");
+        assertNotNull(openAiSpan, "openai.request span should have been created");
+        assertEquals(LLMObsContext.SAMPLING_DECISION_DROPPED, openAiSpan.getTag("_ml_obs_tag.sampling_decision"));
+        assertEquals("0", openAiSpan.getTag("_ml_obs_tag.sample_rate"));
+    }
 }
 
 /**
@@ -335,59 +309,58 @@ void parentlessOpenAiRequestSpanIsDroppedAtZeroSampleRate() throws Exception {
 @WithConfig(key = "llmobs.enabled", value = "false")
 class LlmObsDisabledForkedTest extends AbstractLlmObsOpenAiForkedTest {
 
-  @Test
-  void chatCompletionEmitsTheGenAiAttributesAvailableWithoutLlmObs() {
-    openAiClient.chat().completions().create(buildMinimalChatParams());
-
-    DDSpan openAiSpan = awaitOpenAiSpan("/v1/chat/completions");
-
-    assertEquals("llm", openAiSpan.getTag("gen_ai.operation.name"));
-    assertEquals("gpt-4o-mini-2024-07-18", openAiSpan.getTag("gen_ai.request.model"));
-    assertEquals("openai", openAiSpan.getTag("gen_ai.provider.name"));
-    assertNotNull(openAiSpan.getTag("gen_ai.application.name"));
-    assertEquals("true", openAiSpan.getTag(GenAiApmTags.ARTIFICIAL_TAGS));
-
-    assertEquals(11.0, openAiSpan.getTag("gen_ai.usage.input_tokens"));
-    assertEquals(7.0, openAiSpan.getTag("gen_ai.usage.output_tokens"));
-    assertEquals(18.0, openAiSpan.getTag("gen_ai.usage.total_tokens"));
-    assertEquals(4.0, openAiSpan.getTag("gen_ai.usage.cache_read_input_tokens"));
-
-    assertNull(openAiSpan.getTag("gen_ai.conversation.id"));
-    assertNull(openAiSpan.getTag("_ml_obs_tag.span.kind"));
-    assertNull(openAiSpan.getTag("_ml_obs_metric.input_tokens"));
-  }
-
-  @Test
-  void embeddingMapsToTheEmbeddingOperation() {
-    openAiClient.embeddings().create(buildMinimalEmbeddingParams());
-
-    DDSpan openAiSpan = awaitOpenAiSpan("/v1/embeddings");
-
-    assertEquals("embedding", openAiSpan.getTag("gen_ai.operation.name"));
-    assertEquals(
-        openAiSpan.getTag("openai.request.model"), openAiSpan.getTag("gen_ai.request.model"));
-    assertEquals("openai", openAiSpan.getTag("gen_ai.provider.name"));
-
-    assertEquals(5.0, openAiSpan.getTag("gen_ai.usage.input_tokens"));
-    assertEquals(5.0, openAiSpan.getTag("gen_ai.usage.total_tokens"));
-    assertNull(openAiSpan.getTag("gen_ai.usage.output_tokens"));
-  }
-
-  // Both tests here produce an openai.request span, so match on the endpoint rather than take the
-  // first one written: a trace arriving late from the sibling test would otherwise be picked up.
-  private DDSpan awaitOpenAiSpan(String endpoint) {
-    blockUntilTracesMatch(traces -> findOpenAiSpan(traces, endpoint) != null);
-    DDSpan span = findOpenAiSpan(writer, endpoint);
-    assertNotNull(span, "openai.request span for " + endpoint + " should have been created");
-    return span;
-  }
-
-  private static DDSpan findOpenAiSpan(List<List<DDSpan>> traces, String endpoint) {
-    return traces.stream()
-        .flatMap(List::stream)
-        .filter(span -> "openai.request".equals(span.getOperationName().toString()))
-        .filter(span -> endpoint.equals(span.getTag("openai.request.endpoint")))
-        .findFirst()
-        .orElse(null);
-  }
+    @Test
+    void chatCompletionEmitsTheGenAiAttributesAvailableWithoutLlmObs() {
+        openAiClient.chat().completions().create(buildMinimalChatParams());
+
+        DDSpan openAiSpan = awaitOpenAiSpan("/v1/chat/completions");
+
+        assertEquals("llm", openAiSpan.getTag("gen_ai.operation.name"));
+        assertEquals("gpt-4o-mini-2024-07-18", openAiSpan.getTag("gen_ai.request.model"));
+        assertEquals("openai", openAiSpan.getTag("gen_ai.provider.name"));
+        assertNotNull(openAiSpan.getTag("gen_ai.application.name"));
+        assertEquals("true", openAiSpan.getTag(GenAiApmTags.ARTIFICIAL_TAGS));
+
+        assertEquals(11.0, openAiSpan.getTag("gen_ai.usage.input_tokens"));
+        assertEquals(7.0, openAiSpan.getTag("gen_ai.usage.output_tokens"));
+        assertEquals(18.0, openAiSpan.getTag("gen_ai.usage.total_tokens"));
+        assertEquals(4.0, openAiSpan.getTag("gen_ai.usage.cache_read_input_tokens"));
+
+        assertNull(openAiSpan.getTag("gen_ai.conversation.id"));
+        assertNull(openAiSpan.getTag("_ml_obs_tag.span.kind"));
+        assertNull(openAiSpan.getTag("_ml_obs_metric.input_tokens"));
+    }
+
+    @Test
+    void embeddingMapsToTheEmbeddingOperation() {
+        openAiClient.embeddings().create(buildMinimalEmbeddingParams());
+
+        DDSpan openAiSpan = awaitOpenAiSpan("/v1/embeddings");
+
+        assertEquals("embedding", openAiSpan.getTag("gen_ai.operation.name"));
+        assertEquals(openAiSpan.getTag("openai.request.model"), openAiSpan.getTag("gen_ai.request.model"));
+        assertEquals("openai", openAiSpan.getTag("gen_ai.provider.name"));
+
+        assertEquals(5.0, openAiSpan.getTag("gen_ai.usage.input_tokens"));
+        assertEquals(5.0, openAiSpan.getTag("gen_ai.usage.total_tokens"));
+        assertNull(openAiSpan.getTag("gen_ai.usage.output_tokens"));
+    }
+
+    // Both tests here produce an openai.request span, so match on the endpoint rather than take the
+    // first one written: a trace arriving late from the sibling test would otherwise be picked up.
+    private DDSpan awaitOpenAiSpan(String endpoint) {
+        blockUntilTracesMatch(traces -> findOpenAiSpan(traces, endpoint) != null);
+        DDSpan span = findOpenAiSpan(writer, endpoint);
+        assertNotNull(span, "openai.request span for " + endpoint + " should have been created");
+        return span;
+    }
+
+    private static DDSpan findOpenAiSpan(List<List<DDSpan>> traces, String endpoint) {
+        return traces.stream()
+                .flatMap(List::stream)
+                .filter(span -> "openai.request".equals(span.getOperationName().toString()))
+                .filter(span -> endpoint.equals(span.getTag("openai.request.endpoint")))
+                .findFirst()
+                .orElse(null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-common/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientDecorator.java b/dd-java-agent/instrumentation/opensearch/opensearch-common/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientDecorator.java
index 95ffcfa059c..70d82b6f7d2 100644
--- a/dd-java-agent/instrumentation/opensearch/opensearch-common/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientDecorator.java
+++ b/dd-java-agent/instrumentation/opensearch/opensearch-common/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientDecorator.java
@@ -19,119 +19,117 @@
 
 public class OpensearchRestClientDecorator extends DBTypeProcessingDatabaseClientDecorator {
 
-  private static final int MAX_OPENSEARCH_BODY_CONTENT_LENGTH = 25000;
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().database().service("opensearch");
-
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().database().operation("opensearch.rest"));
-  public static final CharSequence OPENSEARCH_JAVA = UTF8BytesString.create("opensearch-java");
-
-  public static final OpensearchRestClientDecorator DECORATE = new OpensearchRestClientDecorator();
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"opensearch"};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return OPENSEARCH_JAVA;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.OPENSEARCH;
-  }
-
-  @Override
-  protected String dbType() {
-    return "opensearch";
-  }
-
-  @Override
-  protected String dbUser(final Object o) {
-    return null;
-  }
-
-  @Override
-  protected String dbInstance(final Object o) {
-    return null;
-  }
-
-  @Override
-  protected String dbHostname(Object o) {
-    return null;
-  }
-
-  private String getOpensearchRequestBody(HttpEntity entity) {
-    try (BufferedReader bodyBufferedReader =
-        new BufferedReader(new InputStreamReader(entity.getContent(), StandardCharsets.UTF_8))) {
-      StringBuilder bodyStringBuilder = new StringBuilder();
-      String bodyline;
-      while ((bodyline = bodyBufferedReader.readLine()) != null) {
-        bodyStringBuilder.append(bodyline);
-      }
-      return bodyStringBuilder.toString();
-    } catch (IOException e) {
-      return "";
+    private static final int MAX_OPENSEARCH_BODY_CONTENT_LENGTH = 25000;
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().database().service("opensearch");
+
+    public static final CharSequence OPERATION_NAME = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().database().operation("opensearch.rest"));
+    public static final CharSequence OPENSEARCH_JAVA = UTF8BytesString.create("opensearch-java");
+
+    public static final OpensearchRestClientDecorator DECORATE = new OpensearchRestClientDecorator();
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"opensearch"};
+    }
+
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return OPENSEARCH_JAVA;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.OPENSEARCH;
+    }
+
+    @Override
+    protected String dbType() {
+        return "opensearch";
+    }
+
+    @Override
+    protected String dbUser(final Object o) {
+        return null;
+    }
+
+    @Override
+    protected String dbInstance(final Object o) {
+        return null;
     }
-  }
-
-  public void onRequest(
-      final AgentSpan span,
-      final String method,
-      final String endpoint,
-      final HttpEntity entity,
-      final Map<String, String> parameters) {
-    span.setTag(Tags.HTTP_METHOD, method);
-    span.setTag(Tags.HTTP_URL, endpoint);
-
-    final Config config = Config.get();
-    // Elasticsearch also controls OpenSearch
-    if (config.isElasticsearchBodyEnabled() || config.isElasticsearchBodyAndParamsEnabled()) {
-      if (entity != null) {
-        long contentLength = entity.getContentLength();
-        if (contentLength <= MAX_OPENSEARCH_BODY_CONTENT_LENGTH) {
-          span.setTag("opensearch.body", getOpensearchRequestBody(entity));
-        } else {
-          span.setTag(
-              "opensearch.body",
-              "<body size "
-                  + contentLength
-                  + " exceeds limit of "
-                  + MAX_OPENSEARCH_BODY_CONTENT_LENGTH
-                  + ">");
+
+    @Override
+    protected String dbHostname(Object o) {
+        return null;
+    }
+
+    private String getOpensearchRequestBody(HttpEntity entity) {
+        try (BufferedReader bodyBufferedReader =
+                new BufferedReader(new InputStreamReader(entity.getContent(), StandardCharsets.UTF_8))) {
+            StringBuilder bodyStringBuilder = new StringBuilder();
+            String bodyline;
+            while ((bodyline = bodyBufferedReader.readLine()) != null) {
+                bodyStringBuilder.append(bodyline);
+            }
+            return bodyStringBuilder.toString();
+        } catch (IOException e) {
+            return "";
         }
-      }
     }
 
-    if (config.isElasticsearchParamsEnabled() || config.isElasticsearchBodyAndParamsEnabled()) {
-      if (parameters != null) {
-        StringBuilder queryParametersStringBuilder = new StringBuilder();
-        for (Map.Entry<String, String> parameter : parameters.entrySet()) {
-          queryParametersStringBuilder.append(
-              parameter.getKey() + "=" + parameter.getValue() + "&");
+    public void onRequest(
+            final AgentSpan span,
+            final String method,
+            final String endpoint,
+            final HttpEntity entity,
+            final Map<String, String> parameters) {
+        span.setTag(Tags.HTTP_METHOD, method);
+        span.setTag(Tags.HTTP_URL, endpoint);
+
+        final Config config = Config.get();
+        // Elasticsearch also controls OpenSearch
+        if (config.isElasticsearchBodyEnabled() || config.isElasticsearchBodyAndParamsEnabled()) {
+            if (entity != null) {
+                long contentLength = entity.getContentLength();
+                if (contentLength <= MAX_OPENSEARCH_BODY_CONTENT_LENGTH) {
+                    span.setTag("opensearch.body", getOpensearchRequestBody(entity));
+                } else {
+                    span.setTag(
+                            "opensearch.body",
+                            "<body size "
+                                    + contentLength
+                                    + " exceeds limit of "
+                                    + MAX_OPENSEARCH_BODY_CONTENT_LENGTH
+                                    + ">");
+                }
+            }
         }
-        if (queryParametersStringBuilder.length() >= 1) {
-          queryParametersStringBuilder.deleteCharAt(queryParametersStringBuilder.length() - 1);
+
+        if (config.isElasticsearchParamsEnabled() || config.isElasticsearchBodyAndParamsEnabled()) {
+            if (parameters != null) {
+                StringBuilder queryParametersStringBuilder = new StringBuilder();
+                for (Map.Entry<String, String> parameter : parameters.entrySet()) {
+                    queryParametersStringBuilder.append(parameter.getKey() + "=" + parameter.getValue() + "&");
+                }
+                if (queryParametersStringBuilder.length() >= 1) {
+                    queryParametersStringBuilder.deleteCharAt(queryParametersStringBuilder.length() - 1);
+                }
+                span.setTag("opensearch.params", queryParametersStringBuilder.toString());
+            }
         }
-        span.setTag("opensearch.params", queryParametersStringBuilder.toString());
-      }
+        HTTP_RESOURCE_DECORATOR.withClientPath(span, method, endpoint);
     }
-    HTTP_RESOURCE_DECORATOR.withClientPath(span, method, endpoint);
-  }
 
-  public void onResponse(final AgentSpan span, final Response response) {
-    if (response != null && response.getHost() != null) {
-      span.setTag(Tags.PEER_HOSTNAME, response.getHost().getHostName());
-      setPeerPort(span, response.getHost().getPort());
+    public void onResponse(final AgentSpan span, final Response response) {
+        if (response != null && response.getHost() != null) {
+            span.setTag(Tags.PEER_HOSTNAME, response.getHost().getHostName());
+            setPeerPort(span, response.getHost().getPort());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-common/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientDecorator.java b/dd-java-agent/instrumentation/opensearch/opensearch-common/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientDecorator.java
index 04faf2ae2a6..b58bea62c8d 100644
--- a/dd-java-agent/instrumentation/opensearch/opensearch-common/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientDecorator.java
+++ b/dd-java-agent/instrumentation/opensearch/opensearch-common/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientDecorator.java
@@ -8,68 +8,67 @@
 
 public class OpensearchTransportClientDecorator extends DBTypeProcessingDatabaseClientDecorator {
 
-  private static final String DB_TYPE = "opensearch";
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().database().service(DB_TYPE);
+    private static final String DB_TYPE = "opensearch";
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().database().service(DB_TYPE);
 
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
-  public static final CharSequence OPENSEARCH_JAVA = UTF8BytesString.create("opensearch-java");
+    public static final CharSequence OPERATION_NAME = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().database().operation(DB_TYPE));
+    public static final CharSequence OPENSEARCH_JAVA = UTF8BytesString.create("opensearch-java");
 
-  public static final OpensearchTransportClientDecorator DECORATE =
-      new OpensearchTransportClientDecorator();
+    public static final OpensearchTransportClientDecorator DECORATE = new OpensearchTransportClientDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"opensearch"};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"opensearch"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return OPENSEARCH_JAVA;
-  }
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.OPENSEARCH;
-  }
+    @Override
+    protected CharSequence component() {
+        return OPENSEARCH_JAVA;
+    }
 
-  @Override
-  protected String dbType() {
-    return DB_TYPE;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.OPENSEARCH;
+    }
 
-  @Override
-  protected String dbUser(final Object o) {
-    return null;
-  }
+    @Override
+    protected String dbType() {
+        return DB_TYPE;
+    }
 
-  @Override
-  protected String dbInstance(final Object o) {
-    return null;
-  }
+    @Override
+    protected String dbUser(final Object o) {
+        return null;
+    }
 
-  @Override
-  protected String dbHostname(Object o) {
-    return null;
-  }
+    @Override
+    protected String dbInstance(final Object o) {
+        return null;
+    }
 
-  public void onRequest(final AgentSpan span, final Class action, final Class request) {
-    if (action != null) {
-      String actionName = action.getSimpleName();
-      if ("AutoPutMappingAction".equals(actionName)) {
-        actionName = "PutMappingAction";
-      }
-      span.setResourceName(actionName);
-      span.setTag("opensearch.action", actionName);
+    @Override
+    protected String dbHostname(Object o) {
+        return null;
     }
-    if (request != null) {
-      span.setTag("opensearch.request", request.getSimpleName());
+
+    public void onRequest(final AgentSpan span, final Class action, final Class request) {
+        if (action != null) {
+            String actionName = action.getSimpleName();
+            if ("AutoPutMappingAction".equals(actionName)) {
+                actionName = "PutMappingAction";
+            }
+            span.setResourceName(actionName);
+            span.setTag("opensearch.action", actionName);
+        }
+        if (request != null) {
+            span.setTag("opensearch.request", request.getSimpleName());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java
index fb0f0f43200..65aa8f239c9 100644
--- a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java
@@ -24,89 +24,84 @@
 
 @AutoService(InstrumenterModule.class)
 public class OpensearchRestClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public OpensearchRestClientInstrumentation() {
-    super("opensearch", "opensearch-rest");
-  }
+    public OpensearchRestClientInstrumentation() {
+        super("opensearch", "opensearch-rest");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.opensearch.OpensearchRestClientDecorator",
-      packageName + ".RestResponseListener",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.opensearch.OpensearchRestClientDecorator",
+            packageName + ".RestResponseListener",
+        };
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.opensearch.client.RestClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.opensearch.client.RestClient";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("performRequest"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("org.opensearch.client.Request"))),
-        OpensearchRestClientInstrumentation.class.getName() + "$OpensearchRestClientAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("performRequestAsync"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("org.opensearch.client.Request")))
-            .and(takesArgument(1, named("org.opensearch.client.ResponseListener"))),
-        OpensearchRestClientInstrumentation.class.getName() + "$OpensearchRestClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("performRequest"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("org.opensearch.client.Request"))),
+                OpensearchRestClientInstrumentation.class.getName() + "$OpensearchRestClientAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("performRequestAsync"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("org.opensearch.client.Request")))
+                        .and(takesArgument(1, named("org.opensearch.client.ResponseListener"))),
+                OpensearchRestClientInstrumentation.class.getName() + "$OpensearchRestClientAdvice");
+    }
 
-  public static class OpensearchRestClientAdvice {
+    public static class OpensearchRestClientAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final Request request,
-        @Advice.Argument(value = 1, readOnly = false, optional = true)
-            ResponseListener responseListener) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final Request request,
+                @Advice.Argument(value = 1, readOnly = false, optional = true) ResponseListener responseListener) {
 
-      final AgentSpan span = startSpan(OPENSEARCH_JAVA.toString(), OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(
-          span,
-          request.getMethod(),
-          request.getEndpoint(),
-          request.getEntity(),
-          request.getParameters());
+            final AgentSpan span = startSpan(OPENSEARCH_JAVA.toString(), OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(
+                    span, request.getMethod(), request.getEndpoint(), request.getEntity(), request.getParameters());
 
-      if (responseListener != null) {
-        responseListener = new RestResponseListener(responseListener, span);
-      }
+            if (responseListener != null) {
+                responseListener = new RestResponseListener(responseListener, span);
+            }
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object result) {
-      if (throwable != null) {
-        final AgentSpan span = spanFromScope(scope);
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else if (result instanceof Response) {
-        final AgentSpan span = spanFromScope(scope);
-        if (((Response) result).getHost() != null) {
-          DECORATE.onResponse(span, ((Response) result));
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object result) {
+            if (throwable != null) {
+                final AgentSpan span = spanFromScope(scope);
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else if (result instanceof Response) {
+                final AgentSpan span = spanFromScope(scope);
+                if (((Response) result).getHost() != null) {
+                    DECORATE.onResponse(span, ((Response) result));
+                }
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+                // async call, span finished by RestResponseListener
+            }
         }
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-        // async call, span finished by RestResponseListener
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/RestResponseListener.java b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/RestResponseListener.java
index ae4618a78f7..8218fb02b46 100644
--- a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/RestResponseListener.java
+++ b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/RestResponseListener.java
@@ -6,37 +6,37 @@
 
 public class RestResponseListener implements ResponseListener {
 
-  private final ResponseListener listener;
-  private final AgentSpan span;
-
-  public RestResponseListener(final ResponseListener listener, final AgentSpan span) {
-    this.listener = listener;
-    this.span = span;
-  }
-
-  @Override
-  public void onSuccess(final Response response) {
-    if (response.getHost() != null) {
-      OpensearchRestClientDecorator.DECORATE.onResponse(span, response);
+    private final ResponseListener listener;
+    private final AgentSpan span;
+
+    public RestResponseListener(final ResponseListener listener, final AgentSpan span) {
+        this.listener = listener;
+        this.span = span;
     }
 
-    try {
-      listener.onSuccess(response);
-    } finally {
-      OpensearchRestClientDecorator.DECORATE.beforeFinish(span);
-      span.finish();
+    @Override
+    public void onSuccess(final Response response) {
+        if (response.getHost() != null) {
+            OpensearchRestClientDecorator.DECORATE.onResponse(span, response);
+        }
+
+        try {
+            listener.onSuccess(response);
+        } finally {
+            OpensearchRestClientDecorator.DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 
-  @Override
-  public void onFailure(final Exception e) {
-    OpensearchRestClientDecorator.DECORATE.onError(span, e);
+    @Override
+    public void onFailure(final Exception e) {
+        OpensearchRestClientDecorator.DECORATE.onError(span, e);
 
-    try {
-      listener.onFailure(e);
-    } finally {
-      OpensearchRestClientDecorator.DECORATE.beforeFinish(span);
-      span.finish();
+        try {
+            listener.onFailure(e);
+        } finally {
+            OpensearchRestClientDecorator.DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientInstrumentation.java b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientInstrumentation.java
index b54b787fbf0..f9e88caff9e 100644
--- a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientInstrumentation.java
@@ -26,74 +26,71 @@
 
 @AutoService(InstrumenterModule.class)
 public class OpensearchTransportClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public OpensearchTransportClientInstrumentation() {
-    super("opensearch", "opensearch-transport");
-  }
+    public OpensearchTransportClientInstrumentation() {
+        super("opensearch", "opensearch-transport");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("org.opensearch.action.ActionType");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("org.opensearch.action.ActionType");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.opensearch.client.support.AbstractClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.opensearch.client.support.AbstractClient";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.opensearch.OpensearchTransportClientDecorator",
-      packageName + ".TransportActionListener",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.opensearch.OpensearchTransportClientDecorator",
+            packageName + ".TransportActionListener",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("org.opensearch.action.ActionType")))
-            .and(takesArgument(1, named("org.opensearch.action.ActionRequest")))
-            .and(takesArgument(2, named("org.opensearch.action.ActionListener"))),
-        OpensearchTransportClientInstrumentation.class.getName()
-            + "$OpensearchTransportClientAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("org.opensearch.action.ActionType")))
+                        .and(takesArgument(1, named("org.opensearch.action.ActionRequest")))
+                        .and(takesArgument(2, named("org.opensearch.action.ActionListener"))),
+                OpensearchTransportClientInstrumentation.class.getName() + "$OpensearchTransportClientAdvice");
+    }
 
-  public static class OpensearchTransportClientAdvice {
+    public static class OpensearchTransportClientAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final ActionType action,
-        @Advice.Argument(1) final ActionRequest actionRequest,
-        @Advice.Argument(value = 2, readOnly = false)
-            ActionListener<ActionResponse> actionListener) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final ActionType action,
+                @Advice.Argument(1) final ActionRequest actionRequest,
+                @Advice.Argument(value = 2, readOnly = false) ActionListener<ActionResponse> actionListener) {
 
-      final AgentSpan span = startSpan(OPENSEARCH_JAVA.toString(), OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, action.getClass(), actionRequest.getClass());
+            final AgentSpan span = startSpan(OPENSEARCH_JAVA.toString(), OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, action.getClass(), actionRequest.getClass());
 
-      actionListener = new TransportActionListener<>(actionRequest, actionListener, span);
+            actionListener = new TransportActionListener<>(actionRequest, actionListener, span);
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (throwable != null) {
-        final AgentSpan span = spanFromScope(scope);
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
-      // span finished by TransportActionListener
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (throwable != null) {
+                final AgentSpan span = spanFromScope(scope);
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+            // span finished by TransportActionListener
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/ShadowExistingScopeAdvice.java b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/ShadowExistingScopeAdvice.java
index f0de0d46e48..d5dcc900fd6 100644
--- a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/ShadowExistingScopeAdvice.java
+++ b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/ShadowExistingScopeAdvice.java
@@ -12,13 +12,13 @@
  */
 public class ShadowExistingScopeAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope enter() {
-    return activateSpan(noopSpan());
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope enter() {
+        return activateSpan(noopSpan());
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void exit(@Advice.Enter final ContextScope scope) {
-    scope.close();
-  }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void exit(@Advice.Enter final ContextScope scope) {
+        scope.close();
+    }
 }
diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/ThreadedActionListenerInstrumentation.java b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/ThreadedActionListenerInstrumentation.java
index ecaeb784790..ec3b71d9f29 100644
--- a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/ThreadedActionListenerInstrumentation.java
+++ b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/ThreadedActionListenerInstrumentation.java
@@ -24,51 +24,49 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class ThreadedActionListenerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ThreadedActionListenerInstrumentation() {
-    super("opensearch", "opensearch-transport");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.opensearch.action.support.ThreadedActionListener";
-  }
+    public ThreadedActionListenerInstrumentation() {
+        super("opensearch", "opensearch-transport");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(
-        "org.opensearch.action.support.ThreadedActionListener", State.class.getName());
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.opensearch.action.support.ThreadedActionListener";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // only one constructor
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
-    transformer.applyAdvice(
-        namedOneOf("onResponse", "onFailure").and(takesArguments(1)),
-        getClass().getName() + "$OnResponse");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.opensearch.action.support.ThreadedActionListener", State.class.getName());
+    }
 
-  @SuppressWarnings("rawtypes")
-  public static final class Construct {
-    @Advice.OnMethodExit
-    public static void after(@Advice.This ThreadedActionListener listener) {
-      capture(InstrumentationContext.get(ThreadedActionListener.class, State.class), listener);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // only one constructor
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
+        transformer.applyAdvice(
+                namedOneOf("onResponse", "onFailure").and(takesArguments(1)),
+                getClass().getName() + "$OnResponse");
     }
-  }
 
-  @SuppressWarnings("rawtypes")
-  public static final class OnResponse {
-    @Advice.OnMethodEnter
-    public static ContextScope before(@Advice.This ThreadedActionListener listener) {
-      return startTaskScope(
-          InstrumentationContext.get(ThreadedActionListener.class, State.class), listener);
+    @SuppressWarnings("rawtypes")
+    public static final class Construct {
+        @Advice.OnMethodExit
+        public static void after(@Advice.This ThreadedActionListener listener) {
+            capture(InstrumentationContext.get(ThreadedActionListener.class, State.class), listener);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      endTaskScope(scope);
+    @SuppressWarnings("rawtypes")
+    public static final class OnResponse {
+        @Advice.OnMethodEnter
+        public static ContextScope before(@Advice.This ThreadedActionListener listener) {
+            return startTaskScope(InstrumentationContext.get(ThreadedActionListener.class, State.class), listener);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/TransportActionListener.java b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/TransportActionListener.java
index 2b2c2d44217..d95bb449b70 100644
--- a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/TransportActionListener.java
+++ b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/TransportActionListener.java
@@ -17,91 +17,97 @@
 
 public class TransportActionListener<T extends ActionResponse> implements ActionListener<T> {
 
-  private final ActionListener<T> listener;
-  private final AgentSpan span;
-
-  public TransportActionListener(
-      final ActionRequest actionRequest, final ActionListener<T> listener, final AgentSpan span) {
-    this.listener = listener;
-    this.span = span;
-    onRequest(actionRequest);
-  }
-
-  private void onRequest(final ActionRequest request) {
-    if (request instanceof IndicesRequest) {
-      final IndicesRequest req = (IndicesRequest) request;
-      if (req.indices() != null) {
-        span.setTag("opensearch.request.indices", String.join(",", req.indices()));
-      }
-    }
-    if (request instanceof DocWriteRequest) {
-      final DocWriteRequest req = (DocWriteRequest) request;
-      span.setTag("opensearch.request.write.routing", req.routing());
-      span.setTag("opensearch.request.write.version", req.version());
-    }
-  }
-
-  @Override
-  public void onResponse(final T response) {
-    if (response.remoteAddress() != null) {
-      DECORATE.onPeerConnection(span, response.remoteAddress().address());
-    }
-
-    if (response instanceof GetResponse) {
-      final GetResponse resp = (GetResponse) response;
-      span.setTag("opensearch.id", resp.getId());
-      span.setTag("opensearch.version", resp.getVersion());
-    }
-
-    if (response instanceof BroadcastResponse) {
-      final BroadcastResponse resp = (BroadcastResponse) response;
-      span.setTag("opensearch.shard.broadcast.total", resp.getTotalShards());
-      span.setTag("opensearch.shard.broadcast.successful", resp.getSuccessfulShards());
-      span.setTag("opensearch.shard.broadcast.failed", resp.getFailedShards());
-    }
-
-    if (response instanceof ReplicationResponse) {
-      final ReplicationResponse resp = (ReplicationResponse) response;
-      span.setTag("opensearch.shard.replication.total", resp.getShardInfo().getTotal());
-      span.setTag("opensearch.shard.replication.successful", resp.getShardInfo().getSuccessful());
-      span.setTag("opensearch.shard.replication.failed", resp.getShardInfo().getFailed());
-    }
-
-    if (response instanceof IndexResponse) {
-      span.setTag("opensearch.response.status", ((IndexResponse) response).status().getStatus());
-    }
-
-    if (response instanceof BulkShardResponse) {
-      final BulkShardResponse resp = (BulkShardResponse) response;
-      span.setTag("opensearch.shard.bulk.id", resp.getShardId().getId());
-      span.setTag("opensearch.shard.bulk.index", resp.getShardId().getIndexName());
+    private final ActionListener<T> listener;
+    private final AgentSpan span;
+
+    public TransportActionListener(
+            final ActionRequest actionRequest, final ActionListener<T> listener, final AgentSpan span) {
+        this.listener = listener;
+        this.span = span;
+        onRequest(actionRequest);
     }
 
-    if (response instanceof BaseNodesResponse) {
-      final BaseNodesResponse resp = (BaseNodesResponse) response;
-      if (resp.hasFailures()) {
-        span.setTag("opensearch.node.failures", resp.failures().size());
-      }
-      span.setTag("opensearch.node.cluster.name", resp.getClusterName().value());
+    private void onRequest(final ActionRequest request) {
+        if (request instanceof IndicesRequest) {
+            final IndicesRequest req = (IndicesRequest) request;
+            if (req.indices() != null) {
+                span.setTag("opensearch.request.indices", String.join(",", req.indices()));
+            }
+        }
+        if (request instanceof DocWriteRequest) {
+            final DocWriteRequest req = (DocWriteRequest) request;
+            span.setTag("opensearch.request.write.routing", req.routing());
+            span.setTag("opensearch.request.write.version", req.version());
+        }
     }
 
-    try {
-      listener.onResponse(response);
-    } finally {
-      DECORATE.beforeFinish(span);
-      span.finish();
+    @Override
+    public void onResponse(final T response) {
+        if (response.remoteAddress() != null) {
+            DECORATE.onPeerConnection(span, response.remoteAddress().address());
+        }
+
+        if (response instanceof GetResponse) {
+            final GetResponse resp = (GetResponse) response;
+            span.setTag("opensearch.id", resp.getId());
+            span.setTag("opensearch.version", resp.getVersion());
+        }
+
+        if (response instanceof BroadcastResponse) {
+            final BroadcastResponse resp = (BroadcastResponse) response;
+            span.setTag("opensearch.shard.broadcast.total", resp.getTotalShards());
+            span.setTag("opensearch.shard.broadcast.successful", resp.getSuccessfulShards());
+            span.setTag("opensearch.shard.broadcast.failed", resp.getFailedShards());
+        }
+
+        if (response instanceof ReplicationResponse) {
+            final ReplicationResponse resp = (ReplicationResponse) response;
+            span.setTag(
+                    "opensearch.shard.replication.total", resp.getShardInfo().getTotal());
+            span.setTag(
+                    "opensearch.shard.replication.successful",
+                    resp.getShardInfo().getSuccessful());
+            span.setTag(
+                    "opensearch.shard.replication.failed", resp.getShardInfo().getFailed());
+        }
+
+        if (response instanceof IndexResponse) {
+            span.setTag(
+                    "opensearch.response.status",
+                    ((IndexResponse) response).status().getStatus());
+        }
+
+        if (response instanceof BulkShardResponse) {
+            final BulkShardResponse resp = (BulkShardResponse) response;
+            span.setTag("opensearch.shard.bulk.id", resp.getShardId().getId());
+            span.setTag("opensearch.shard.bulk.index", resp.getShardId().getIndexName());
+        }
+
+        if (response instanceof BaseNodesResponse) {
+            final BaseNodesResponse resp = (BaseNodesResponse) response;
+            if (resp.hasFailures()) {
+                span.setTag("opensearch.node.failures", resp.failures().size());
+            }
+            span.setTag("opensearch.node.cluster.name", resp.getClusterName().value());
+        }
+
+        try {
+            listener.onResponse(response);
+        } finally {
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 
-  @Override
-  public void onFailure(final Exception e) {
-    DECORATE.onError(span, e);
+    @Override
+    public void onFailure(final Exception e) {
+        DECORATE.onError(span, e);
 
-    try {
-      listener.onFailure(e);
-    } finally {
-      DECORATE.beforeFinish(span);
-      span.finish();
+        try {
+            listener.onFailure(e);
+        } finally {
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchBreakTraceInstrumentation.java b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchBreakTraceInstrumentation.java
index b9c4d0ecc08..81d67ee62d8 100644
--- a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchBreakTraceInstrumentation.java
+++ b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchBreakTraceInstrumentation.java
@@ -7,13 +7,13 @@
 
 @AutoService(InstrumenterModule.class)
 public class OpensearchBreakTraceInstrumentation extends TestInstrumentation {
-  @Override
-  public String instrumentedType() {
-    return "org.opensearch.client.node.NodeClient";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.opensearch.client.node.NodeClient";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(named("executeLocally"), ShadowExistingScopeAdvice.class.getName());
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("executeLocally"), ShadowExistingScopeAdvice.class.getName());
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OpenTelemetryInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OpenTelemetryInstrumentation.java
index 610387b2b27..3b294360483 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OpenTelemetryInstrumentation.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OpenTelemetryInstrumentation.java
@@ -15,48 +15,47 @@
  */
 @AutoService(InstrumenterModule.class)
 public class OpenTelemetryInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public OpenTelemetryInstrumentation() {
-    super("opentelemetry-beta");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "io.opentelemetry.OpenTelemetry";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getTracerProvider").and(returns(named("io.opentelemetry.trace.TracerProvider"))),
-        OpenTelemetryInstrumentation.class.getName() + "$TracerProviderAdvice");
-    transformer.applyAdvice(
-        named("getPropagators")
-            .and(returns(named("io.opentelemetry.context.propagation.ContextPropagators"))),
-        OpenTelemetryInstrumentation.class.getName() + "$ContextPropagatorsAdvice");
-  }
-
-  public static class TracerProviderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void returnProvider(@Advice.Return(readOnly = false) TracerProvider result) {
-      result = OtelTracerProvider.INSTANCE;
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public OpenTelemetryInstrumentation() {
+        super("opentelemetry-beta");
     }
-  }
 
-  public static class ContextPropagatorsAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void returnProvider(@Advice.Return(readOnly = false) ContextPropagators result) {
-      result = OtelContextPropagators.INSTANCE;
+    @Override
+    protected boolean defaultEnabled() {
+        return false;
     }
 
-    // Muzzle doesn't detect the advice method's argument type, so we have to help it a bit.
-    public static void muzzleCheck(final ContextPropagators propagators) {
-      propagators.getHttpTextFormat();
+    @Override
+    public String instrumentedType() {
+        return "io.opentelemetry.OpenTelemetry";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getTracerProvider").and(returns(named("io.opentelemetry.trace.TracerProvider"))),
+                OpenTelemetryInstrumentation.class.getName() + "$TracerProviderAdvice");
+        transformer.applyAdvice(
+                named("getPropagators").and(returns(named("io.opentelemetry.context.propagation.ContextPropagators"))),
+                OpenTelemetryInstrumentation.class.getName() + "$ContextPropagatorsAdvice");
+    }
+
+    public static class TracerProviderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void returnProvider(@Advice.Return(readOnly = false) TracerProvider result) {
+            result = OtelTracerProvider.INSTANCE;
+        }
+    }
+
+    public static class ContextPropagatorsAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void returnProvider(@Advice.Return(readOnly = false) ContextPropagators result) {
+            result = OtelContextPropagators.INSTANCE;
+        }
+
+        // Muzzle doesn't detect the advice method's argument type, so we have to help it a bit.
+        public static void muzzleCheck(final ContextPropagators propagators) {
+            propagators.getHttpTextFormat();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelContextPropagators.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelContextPropagators.java
index ad6042d0f0e..d0a33802b62 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelContextPropagators.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelContextPropagators.java
@@ -17,89 +17,86 @@
 import java.util.List;
 
 public class OtelContextPropagators implements ContextPropagators {
-  public static final OtelContextPropagators INSTANCE = new OtelContextPropagators();
+    public static final OtelContextPropagators INSTANCE = new OtelContextPropagators();
 
-  private OtelContextPropagators() {}
+    private OtelContextPropagators() {}
 
-  @Override
-  public HttpTextFormat getHttpTextFormat() {
-    return OtelHttpTextFormat.INSTANCE;
-  }
+    @Override
+    public HttpTextFormat getHttpTextFormat() {
+        return OtelHttpTextFormat.INSTANCE;
+    }
 
-  private static class OtelHttpTextFormat implements HttpTextFormat {
-    private static final OtelHttpTextFormat INSTANCE = new OtelHttpTextFormat();
+    private static class OtelHttpTextFormat implements HttpTextFormat {
+        private static final OtelHttpTextFormat INSTANCE = new OtelHttpTextFormat();
 
-    private final AgentTracer.TracerAPI tracer = AgentTracer.get();
-    private final TypeConverter converter = new TypeConverter();
+        private final AgentTracer.TracerAPI tracer = AgentTracer.get();
+        private final TypeConverter converter = new TypeConverter();
 
-    @Override
-    public List<String> fields() {
-      return null;
-    }
+        @Override
+        public List<String> fields() {
+            return null;
+        }
 
-    @Override
-    public <C> void inject(final Context context, final C carrier, final Setter<C> setter) {
-      final Span span = TracingContextUtils.getSpanWithoutDefault(context);
-      if (span == null || !span.getContext().isValid()) {
-        return;
-      }
-      AgentSpan agentSpan = converter.toAgentSpan(span);
-      if (agentSpan != null) {
-        defaultPropagator().inject(agentSpan, carrier, setter::set);
-      }
-    }
+        @Override
+        public <C> void inject(final Context context, final C carrier, final Setter<C> setter) {
+            final Span span = TracingContextUtils.getSpanWithoutDefault(context);
+            if (span == null || !span.getContext().isValid()) {
+                return;
+            }
+            AgentSpan agentSpan = converter.toAgentSpan(span);
+            if (agentSpan != null) {
+                defaultPropagator().inject(agentSpan, carrier, setter::set);
+            }
+        }
 
-    @Override
-    public <C> Context extract(final Context context, final C carrier, final Getter<C> getter) {
-      final AgentSpanContext agentContext =
-          extractContextAndGetSpanContext(carrier, new OtelGetter<>(getter));
-      return TracingContextUtils.withSpan(
-          DefaultSpan.create(converter.toSpanContext(agentContext)), context);
-    }
-  }
-
-  private static class OtelGetter<C> implements AgentPropagation.ContextVisitor<C> {
-    private static final String DD_TRACE_ID_KEY = "x-datadog-trace-id";
-    private static final String DD_SPAN_ID_KEY = "x-datadog-parent-id";
-    private static final String DD_SAMPLING_PRIORITY_KEY = "x-datadog-sampling-priority";
-    private static final String DD_ORIGIN_KEY = "x-datadog-origin";
-
-    private static final String B3_TRACE_ID_KEY = "X-B3-TraceId";
-    private static final String B3_SPAN_ID_KEY = "X-B3-SpanId";
-    private static final String B3_SAMPLING_PRIORITY_KEY = "X-B3-Sampled";
-
-    private static final String HAYSTACK_TRACE_ID_KEY = "Trace-ID";
-    private static final String HAYSTACK_SPAN_ID_KEY = "Span-ID";
-    private static final String HAYSTACK_PARENT_ID_KEY = "Parent_ID";
-
-    private static final List<String> KEYS =
-        Arrays.asList(
-            DD_TRACE_ID_KEY,
-            DD_SPAN_ID_KEY,
-            DD_SAMPLING_PRIORITY_KEY,
-            DD_ORIGIN_KEY,
-            B3_TRACE_ID_KEY,
-            B3_SPAN_ID_KEY,
-            B3_SAMPLING_PRIORITY_KEY,
-            HAYSTACK_TRACE_ID_KEY,
-            HAYSTACK_SPAN_ID_KEY,
-            HAYSTACK_PARENT_ID_KEY);
-
-    private final HttpTextFormat.Getter<C> getter;
-
-    private OtelGetter(final HttpTextFormat.Getter<C> getter) {
-      this.getter = getter;
+        @Override
+        public <C> Context extract(final Context context, final C carrier, final Getter<C> getter) {
+            final AgentSpanContext agentContext = extractContextAndGetSpanContext(carrier, new OtelGetter<>(getter));
+            return TracingContextUtils.withSpan(DefaultSpan.create(converter.toSpanContext(agentContext)), context);
+        }
     }
 
-    @Override
-    public void forEachKey(C carrier, AgentPropagation.KeyClassifier classifier) {
-      // TODO: Otel doesn't expose the keys, so we have to rely on hard coded keys.
-      // https://github.com/open-telemetry/opentelemetry-specification/issues/433
-      for (String key : KEYS) {
-        if (!classifier.accept(key, getter.get(carrier, key))) {
-          return;
+    private static class OtelGetter<C> implements AgentPropagation.ContextVisitor<C> {
+        private static final String DD_TRACE_ID_KEY = "x-datadog-trace-id";
+        private static final String DD_SPAN_ID_KEY = "x-datadog-parent-id";
+        private static final String DD_SAMPLING_PRIORITY_KEY = "x-datadog-sampling-priority";
+        private static final String DD_ORIGIN_KEY = "x-datadog-origin";
+
+        private static final String B3_TRACE_ID_KEY = "X-B3-TraceId";
+        private static final String B3_SPAN_ID_KEY = "X-B3-SpanId";
+        private static final String B3_SAMPLING_PRIORITY_KEY = "X-B3-Sampled";
+
+        private static final String HAYSTACK_TRACE_ID_KEY = "Trace-ID";
+        private static final String HAYSTACK_SPAN_ID_KEY = "Span-ID";
+        private static final String HAYSTACK_PARENT_ID_KEY = "Parent_ID";
+
+        private static final List<String> KEYS = Arrays.asList(
+                DD_TRACE_ID_KEY,
+                DD_SPAN_ID_KEY,
+                DD_SAMPLING_PRIORITY_KEY,
+                DD_ORIGIN_KEY,
+                B3_TRACE_ID_KEY,
+                B3_SPAN_ID_KEY,
+                B3_SAMPLING_PRIORITY_KEY,
+                HAYSTACK_TRACE_ID_KEY,
+                HAYSTACK_SPAN_ID_KEY,
+                HAYSTACK_PARENT_ID_KEY);
+
+        private final HttpTextFormat.Getter<C> getter;
+
+        private OtelGetter(final HttpTextFormat.Getter<C> getter) {
+            this.getter = getter;
+        }
+
+        @Override
+        public void forEachKey(C carrier, AgentPropagation.KeyClassifier classifier) {
+            // TODO: Otel doesn't expose the keys, so we have to rely on hard coded keys.
+            // https://github.com/open-telemetry/opentelemetry-specification/issues/433
+            for (String key : KEYS) {
+                if (!classifier.accept(key, getter.get(carrier, key))) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelScope.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelScope.java
index 294228b01d4..eb03f153b32 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelScope.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelScope.java
@@ -5,14 +5,14 @@
 import io.opentelemetry.context.Scope;
 
 public class OtelScope implements Scope, TraceScope {
-  private final ContextScope delegate;
+    private final ContextScope delegate;
 
-  OtelScope(final ContextScope delegate) {
-    this.delegate = delegate;
-  }
+    OtelScope(final ContextScope delegate) {
+        this.delegate = delegate;
+    }
 
-  @Override
-  public void close() {
-    delegate.close();
-  }
+    @Override
+    public void close() {
+        delegate.close();
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpan.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpan.java
index 66590e18cc2..37324c4fa0c 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpan.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpan.java
@@ -16,238 +16,237 @@
 import java.util.concurrent.TimeUnit;
 
 public class OtelSpan implements Span, MutableSpan, WithAgentSpan, SpanWrapper {
-  private final AgentSpan delegate;
-  private final TypeConverter converter;
-
-  OtelSpan(final AgentSpan agentSpan, final TypeConverter typeConverter) {
-    delegate = agentSpan;
-    converter = typeConverter;
-  }
-
-  @Override
-  public void setAttribute(final String key, final String value) {
-    delegate.setTag(key, value);
-  }
-
-  @Override
-  public void setAttribute(final String key, final long value) {
-    delegate.setTag(key, value);
-  }
-
-  @Override
-  public void setAttribute(final String key, final double value) {
-    delegate.setTag(key, value);
-  }
-
-  @Override
-  public void setAttribute(final String key, final boolean value) {
-    delegate.setTag(key, value);
-  }
-
-  @Override
-  public void setAttribute(final String key, final AttributeValue value) {
-    switch (value.getType()) {
-      case LONG:
-        delegate.setTag(key, value.getLongValue());
-        break;
-      case DOUBLE:
-        delegate.setTag(key, value.getDoubleValue());
-        break;
-      case STRING:
-        delegate.setTag(key, value.getStringValue());
-        break;
-      case BOOLEAN:
-        delegate.setTag(key, value.getBooleanValue());
-        break;
-      default:
-        // Unsupported.... Ignoring.
-    }
-  }
-
-  @Override
-  public void addEvent(final String name) {}
-
-  @Override
-  public void addEvent(final String name, final long timestamp) {}
-
-  @Override
-  public void addEvent(final String name, final Map<String, AttributeValue> attributes) {}
-
-  @Override
-  public void addEvent(
-      final String name, final Map<String, AttributeValue> attributes, final long timestamp) {}
-
-  @Override
-  public void addEvent(final Event event) {}
-
-  @Override
-  public void addEvent(final Event event, final long timestamp) {}
-
-  @Override
-  public void setStatus(final Status status) {
-    if (!status.isOk()) {
-      delegate.setError(true);
-      delegate.setTag(DDTags.ERROR_MSG, status.getDescription());
-    }
-  }
-
-  @Override
-  public void updateName(final String name) {
-    delegate.setResourceName(name);
-  }
-
-  @Override
-  public void end() {
-    delegate.finish();
-  }
-
-  @Override
-  public void end(final EndSpanOptions endOptions) {
-    if (endOptions.getEndTimestamp() > 0) {
-      delegate.finish(TimeUnit.NANOSECONDS.toMicros(endOptions.getEndTimestamp()));
-    } else {
-      delegate.finish();
-    }
-  }
-
-  @Override
-  public SpanContext getContext() {
-    return converter.toSpanContext(delegate.spanContext());
-  }
-
-  @Override
-  public boolean isRecording() {
-    return delegate.getTraceId().toLong() != 0;
-  }
-
-  @Override
-  public long getStartTime() {
-    return delegate.getStartTime();
-  }
-
-  @Override
-  public long getDurationNano() {
-    return delegate.getDurationNano();
-  }
-
-  @Override
-  public CharSequence getOperationName() {
-    return delegate.getOperationName();
-  }
-
-  @Override
-  public MutableSpan setOperationName(final CharSequence serviceName) {
-    return delegate.setOperationName(serviceName);
-  }
-
-  @Override
-  public String getServiceName() {
-    return delegate.getServiceName();
-  }
-
-  @Override
-  @SuppressForbidden
-  public MutableSpan setServiceName(final String serviceName) {
-    return delegate.setServiceName(serviceName);
-  }
-
-  @Override
-  public CharSequence getResourceName() {
-    return delegate.getResourceName();
-  }
-
-  @Override
-  public MutableSpan setResourceName(final CharSequence resourceName) {
-    return delegate.setResourceName(resourceName);
-  }
-
-  @Override
-  public Integer getSamplingPriority() {
-    return delegate.getSamplingPriority();
-  }
-
-  @Override
-  public MutableSpan setSamplingPriority(final int newPriority) {
-    return delegate.setSamplingPriority(newPriority);
-  }
-
-  @Override
-  public String getSpanType() {
-    return delegate.getSpanType();
-  }
-
-  @Override
-  public MutableSpan setSpanType(final CharSequence type) {
-    return delegate.setSpanType(type);
-  }
-
-  @Override
-  public Map<String, Object> getTags() {
-    return delegate.getTags();
-  }
-
-  @Override
-  public Object getTag(String key) {
-    return delegate.getTag(key);
-  }
-
-  @Override
-  public MutableSpan setTag(final String tag, final String value) {
-    return delegate.setTag(tag, value);
-  }
-
-  @Override
-  public MutableSpan setTag(final String tag, final boolean value) {
-    return delegate.setTag(tag, value);
-  }
-
-  @Override
-  public MutableSpan setTag(final String tag, final Number value) {
-    return delegate.setTag(tag, value);
-  }
-
-  @Override
-  public MutableSpan setMetric(final CharSequence metric, final int value) {
-    return delegate.setMetric(metric, value);
-  }
-
-  @Override
-  public MutableSpan setMetric(final CharSequence metric, final long value) {
-    return delegate.setMetric(metric, value);
-  }
-
-  @Override
-  public MutableSpan setMetric(final CharSequence metric, final float value) {
-    return delegate.setMetric(metric, value);
-  }
-
-  @Override
-  public MutableSpan setMetric(final CharSequence metric, final double value) {
-    return delegate.setMetric(metric, value);
-  }
-
-  @Override
-  public boolean isError() {
-    return delegate.isError();
-  }
-
-  @Override
-  public MutableSpan setError(final boolean value) {
-    return delegate.setError(value);
-  }
-
-  @Override
-  public MutableSpan getRootSpan() {
-    return delegate.getRootSpan();
-  }
-
-  @Override
-  public MutableSpan getLocalRootSpan() {
-    return delegate.getLocalRootSpan();
-  }
-
-  @Override
-  public AgentSpan asAgentSpan() {
-    return delegate;
-  }
+    private final AgentSpan delegate;
+    private final TypeConverter converter;
+
+    OtelSpan(final AgentSpan agentSpan, final TypeConverter typeConverter) {
+        delegate = agentSpan;
+        converter = typeConverter;
+    }
+
+    @Override
+    public void setAttribute(final String key, final String value) {
+        delegate.setTag(key, value);
+    }
+
+    @Override
+    public void setAttribute(final String key, final long value) {
+        delegate.setTag(key, value);
+    }
+
+    @Override
+    public void setAttribute(final String key, final double value) {
+        delegate.setTag(key, value);
+    }
+
+    @Override
+    public void setAttribute(final String key, final boolean value) {
+        delegate.setTag(key, value);
+    }
+
+    @Override
+    public void setAttribute(final String key, final AttributeValue value) {
+        switch (value.getType()) {
+            case LONG:
+                delegate.setTag(key, value.getLongValue());
+                break;
+            case DOUBLE:
+                delegate.setTag(key, value.getDoubleValue());
+                break;
+            case STRING:
+                delegate.setTag(key, value.getStringValue());
+                break;
+            case BOOLEAN:
+                delegate.setTag(key, value.getBooleanValue());
+                break;
+            default:
+            // Unsupported.... Ignoring.
+        }
+    }
+
+    @Override
+    public void addEvent(final String name) {}
+
+    @Override
+    public void addEvent(final String name, final long timestamp) {}
+
+    @Override
+    public void addEvent(final String name, final Map<String, AttributeValue> attributes) {}
+
+    @Override
+    public void addEvent(final String name, final Map<String, AttributeValue> attributes, final long timestamp) {}
+
+    @Override
+    public void addEvent(final Event event) {}
+
+    @Override
+    public void addEvent(final Event event, final long timestamp) {}
+
+    @Override
+    public void setStatus(final Status status) {
+        if (!status.isOk()) {
+            delegate.setError(true);
+            delegate.setTag(DDTags.ERROR_MSG, status.getDescription());
+        }
+    }
+
+    @Override
+    public void updateName(final String name) {
+        delegate.setResourceName(name);
+    }
+
+    @Override
+    public void end() {
+        delegate.finish();
+    }
+
+    @Override
+    public void end(final EndSpanOptions endOptions) {
+        if (endOptions.getEndTimestamp() > 0) {
+            delegate.finish(TimeUnit.NANOSECONDS.toMicros(endOptions.getEndTimestamp()));
+        } else {
+            delegate.finish();
+        }
+    }
+
+    @Override
+    public SpanContext getContext() {
+        return converter.toSpanContext(delegate.spanContext());
+    }
+
+    @Override
+    public boolean isRecording() {
+        return delegate.getTraceId().toLong() != 0;
+    }
+
+    @Override
+    public long getStartTime() {
+        return delegate.getStartTime();
+    }
+
+    @Override
+    public long getDurationNano() {
+        return delegate.getDurationNano();
+    }
+
+    @Override
+    public CharSequence getOperationName() {
+        return delegate.getOperationName();
+    }
+
+    @Override
+    public MutableSpan setOperationName(final CharSequence serviceName) {
+        return delegate.setOperationName(serviceName);
+    }
+
+    @Override
+    public String getServiceName() {
+        return delegate.getServiceName();
+    }
+
+    @Override
+    @SuppressForbidden
+    public MutableSpan setServiceName(final String serviceName) {
+        return delegate.setServiceName(serviceName);
+    }
+
+    @Override
+    public CharSequence getResourceName() {
+        return delegate.getResourceName();
+    }
+
+    @Override
+    public MutableSpan setResourceName(final CharSequence resourceName) {
+        return delegate.setResourceName(resourceName);
+    }
+
+    @Override
+    public Integer getSamplingPriority() {
+        return delegate.getSamplingPriority();
+    }
+
+    @Override
+    public MutableSpan setSamplingPriority(final int newPriority) {
+        return delegate.setSamplingPriority(newPriority);
+    }
+
+    @Override
+    public String getSpanType() {
+        return delegate.getSpanType();
+    }
+
+    @Override
+    public MutableSpan setSpanType(final CharSequence type) {
+        return delegate.setSpanType(type);
+    }
+
+    @Override
+    public Map<String, Object> getTags() {
+        return delegate.getTags();
+    }
+
+    @Override
+    public Object getTag(String key) {
+        return delegate.getTag(key);
+    }
+
+    @Override
+    public MutableSpan setTag(final String tag, final String value) {
+        return delegate.setTag(tag, value);
+    }
+
+    @Override
+    public MutableSpan setTag(final String tag, final boolean value) {
+        return delegate.setTag(tag, value);
+    }
+
+    @Override
+    public MutableSpan setTag(final String tag, final Number value) {
+        return delegate.setTag(tag, value);
+    }
+
+    @Override
+    public MutableSpan setMetric(final CharSequence metric, final int value) {
+        return delegate.setMetric(metric, value);
+    }
+
+    @Override
+    public MutableSpan setMetric(final CharSequence metric, final long value) {
+        return delegate.setMetric(metric, value);
+    }
+
+    @Override
+    public MutableSpan setMetric(final CharSequence metric, final float value) {
+        return delegate.setMetric(metric, value);
+    }
+
+    @Override
+    public MutableSpan setMetric(final CharSequence metric, final double value) {
+        return delegate.setMetric(metric, value);
+    }
+
+    @Override
+    public boolean isError() {
+        return delegate.isError();
+    }
+
+    @Override
+    public MutableSpan setError(final boolean value) {
+        return delegate.setError(value);
+    }
+
+    @Override
+    public MutableSpan getRootSpan() {
+        return delegate.getRootSpan();
+    }
+
+    @Override
+    public MutableSpan getLocalRootSpan() {
+        return delegate.getLocalRootSpan();
+    }
+
+    @Override
+    public AgentSpan asAgentSpan() {
+        return delegate;
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpanContext.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpanContext.java
index d2156bbfa96..2a98ca86a4d 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpanContext.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpanContext.java
@@ -8,40 +8,41 @@
 import io.opentelemetry.trace.TraceState;
 
 public class OtelSpanContext extends SpanContext {
-  private static final TraceFlags FLAGS = TraceFlags.builder().setIsSampled(true).build();
-  private final AgentSpanContext delegate;
-
-  OtelSpanContext(final AgentSpanContext delegate) {
-    this.delegate = delegate;
-  }
-
-  @Override
-  public TraceId getTraceId() {
-    return new TraceId(0, delegate.getTraceId().toLong());
-  }
-
-  @Override
-  public SpanId getSpanId() {
-    return new SpanId(delegate.getSpanId());
-  }
-
-  @Override
-  public TraceFlags getTraceFlags() {
-    return FLAGS;
-  }
-
-  @Override
-  public TraceState getTraceState() {
-    return TraceState.getDefault();
-  }
-
-  @Override
-  public boolean isRemote() {
-    // check if delegate is a ExtractedContext
-    return false;
-  }
-
-  AgentSpanContext getDelegate() {
-    return delegate;
-  }
+    private static final TraceFlags FLAGS =
+            TraceFlags.builder().setIsSampled(true).build();
+    private final AgentSpanContext delegate;
+
+    OtelSpanContext(final AgentSpanContext delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public TraceId getTraceId() {
+        return new TraceId(0, delegate.getTraceId().toLong());
+    }
+
+    @Override
+    public SpanId getSpanId() {
+        return new SpanId(delegate.getSpanId());
+    }
+
+    @Override
+    public TraceFlags getTraceFlags() {
+        return FLAGS;
+    }
+
+    @Override
+    public TraceState getTraceState() {
+        return TraceState.getDefault();
+    }
+
+    @Override
+    public boolean isRemote() {
+        // check if delegate is a ExtractedContext
+        return false;
+    }
+
+    AgentSpanContext getDelegate() {
+        return delegate;
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracer.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracer.java
index 4d88fa67280..85620c1aa55 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracer.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracer.java
@@ -14,157 +14,155 @@
 import java.util.concurrent.TimeUnit;
 
 public class OtelTracer implements Tracer {
-  private static final String INSTRUMENTATION_NAME = "otel";
-  private final String tracerName;
-  private final AgentTracer.TracerAPI tracer;
-  private final TypeConverter converter;
-
-  OtelTracer(
-      final String tracerName, final AgentTracer.TracerAPI tracer, final TypeConverter converter) {
-    this.tracerName = tracerName;
-    this.tracer = tracer;
-    this.converter = converter;
-  }
-
-  @Override
-  public Span getCurrentSpan() {
-    return converter.toSpan(tracer.activeSpan());
-  }
-
-  @Override
-  public Scope withSpan(final Span span) {
-    if (null == span) {
-      return null;
-    }
-
-    final AgentSpan agentSpan = converter.toAgentSpan(span);
-    final ContextScope agentScope = tracer.activateManualSpan(agentSpan);
-    return converter.toScope(agentScope);
-  }
-
-  @Override
-  public Span.Builder spanBuilder(final String spanName) {
-    return new SpanBuilder(spanName);
-  }
-
-  private class SpanBuilder implements Span.Builder {
-    private final AgentTracer.SpanBuilder delegate;
-    private boolean parentSet = false;
-
-    public SpanBuilder(final String spanName) {
-      delegate = tracer.buildSpan(INSTRUMENTATION_NAME, tracerName).withResourceName(spanName);
-    }
-
-    @Override
-    public Span.Builder setParent(final Span parent) {
-      parentSet = true;
-      delegate.asChildOf(converter.toAgentSpan(parent).spanContext());
-      return this;
-    }
-
-    @Override
-    public Span.Builder setParent(final SpanContext remoteParent) {
-      parentSet = true;
-      delegate.asChildOf(converter.toContext(remoteParent));
-      return this;
-    }
-
-    @Override
-    public Span.Builder setNoParent() {
-      parentSet = true;
-      delegate.asChildOf(null);
-      delegate.ignoreActiveSpan();
-      return this;
-    }
-
-    @Override
-    public Span.Builder addLink(final SpanContext spanContext) {
-      if (!parentSet) {
-        delegate.asChildOf(converter.toContext(spanContext));
-      }
-      return this;
-    }
+    private static final String INSTRUMENTATION_NAME = "otel";
+    private final String tracerName;
+    private final AgentTracer.TracerAPI tracer;
+    private final TypeConverter converter;
 
-    @Override
-    public Span.Builder addLink(
-        final SpanContext spanContext, final Map<String, AttributeValue> attributes) {
-      if (!parentSet) {
-        delegate.asChildOf(converter.toContext(spanContext));
-      }
-      return this;
-    }
-
-    @Override
-    public Span.Builder addLink(final Link link) {
-      if (!parentSet) {
-        delegate.asChildOf(converter.toContext(link.getContext()));
-      }
-      return this;
-    }
-
-    @Override
-    public Span.Builder setAttribute(final String key, final String value) {
-      delegate.withTag(key, value);
-      return this;
-    }
-
-    @Override
-    public Span.Builder setAttribute(final String key, final long value) {
-      delegate.withTag(key, value);
-      return this;
+    OtelTracer(final String tracerName, final AgentTracer.TracerAPI tracer, final TypeConverter converter) {
+        this.tracerName = tracerName;
+        this.tracer = tracer;
+        this.converter = converter;
     }
 
     @Override
-    public Span.Builder setAttribute(final String key, final double value) {
-      delegate.withTag(key, value);
-      return this;
+    public Span getCurrentSpan() {
+        return converter.toSpan(tracer.activeSpan());
     }
 
     @Override
-    public Span.Builder setAttribute(final String key, final boolean value) {
-      delegate.withTag(key, value);
-      return this;
-    }
-
-    @Override
-    public Span.Builder setAttribute(final String key, final AttributeValue value) {
-      switch (value.getType()) {
-        case LONG:
-          delegate.withTag(key, value.getLongValue());
-          break;
-        case DOUBLE:
-          delegate.withTag(key, value.getDoubleValue());
-          break;
-        case STRING:
-          delegate.withTag(key, value.getStringValue());
-          break;
-        case BOOLEAN:
-          delegate.withTag(key, value.getBooleanValue());
-          break;
-        default:
-          // Unsupported.... Ignoring.
-      }
-      return this;
-    }
+    public Scope withSpan(final Span span) {
+        if (null == span) {
+            return null;
+        }
 
-    @Override
-    public Span.Builder setSpanKind(final Span.Kind spanKind) {
-      // TODO: update delegate.operationName
-      delegate.withTag(Tags.SPAN_KIND, spanKind.name());
-      return this;
-    }
-
-    @Override
-    public Span.Builder setStartTimestamp(final long startTimestamp) {
-      delegate.withStartTimestamp(TimeUnit.NANOSECONDS.toMicros(startTimestamp));
-      return this;
+        final AgentSpan agentSpan = converter.toAgentSpan(span);
+        final ContextScope agentScope = tracer.activateManualSpan(agentSpan);
+        return converter.toScope(agentScope);
     }
 
     @Override
-    public Span startSpan() {
-      final AgentSpan agentSpan = delegate.start();
-      agentSpan.spanContext().setIntegrationName("otel");
-      return converter.toSpan(agentSpan);
+    public Span.Builder spanBuilder(final String spanName) {
+        return new SpanBuilder(spanName);
+    }
+
+    private class SpanBuilder implements Span.Builder {
+        private final AgentTracer.SpanBuilder delegate;
+        private boolean parentSet = false;
+
+        public SpanBuilder(final String spanName) {
+            delegate = tracer.buildSpan(INSTRUMENTATION_NAME, tracerName).withResourceName(spanName);
+        }
+
+        @Override
+        public Span.Builder setParent(final Span parent) {
+            parentSet = true;
+            delegate.asChildOf(converter.toAgentSpan(parent).spanContext());
+            return this;
+        }
+
+        @Override
+        public Span.Builder setParent(final SpanContext remoteParent) {
+            parentSet = true;
+            delegate.asChildOf(converter.toContext(remoteParent));
+            return this;
+        }
+
+        @Override
+        public Span.Builder setNoParent() {
+            parentSet = true;
+            delegate.asChildOf(null);
+            delegate.ignoreActiveSpan();
+            return this;
+        }
+
+        @Override
+        public Span.Builder addLink(final SpanContext spanContext) {
+            if (!parentSet) {
+                delegate.asChildOf(converter.toContext(spanContext));
+            }
+            return this;
+        }
+
+        @Override
+        public Span.Builder addLink(final SpanContext spanContext, final Map<String, AttributeValue> attributes) {
+            if (!parentSet) {
+                delegate.asChildOf(converter.toContext(spanContext));
+            }
+            return this;
+        }
+
+        @Override
+        public Span.Builder addLink(final Link link) {
+            if (!parentSet) {
+                delegate.asChildOf(converter.toContext(link.getContext()));
+            }
+            return this;
+        }
+
+        @Override
+        public Span.Builder setAttribute(final String key, final String value) {
+            delegate.withTag(key, value);
+            return this;
+        }
+
+        @Override
+        public Span.Builder setAttribute(final String key, final long value) {
+            delegate.withTag(key, value);
+            return this;
+        }
+
+        @Override
+        public Span.Builder setAttribute(final String key, final double value) {
+            delegate.withTag(key, value);
+            return this;
+        }
+
+        @Override
+        public Span.Builder setAttribute(final String key, final boolean value) {
+            delegate.withTag(key, value);
+            return this;
+        }
+
+        @Override
+        public Span.Builder setAttribute(final String key, final AttributeValue value) {
+            switch (value.getType()) {
+                case LONG:
+                    delegate.withTag(key, value.getLongValue());
+                    break;
+                case DOUBLE:
+                    delegate.withTag(key, value.getDoubleValue());
+                    break;
+                case STRING:
+                    delegate.withTag(key, value.getStringValue());
+                    break;
+                case BOOLEAN:
+                    delegate.withTag(key, value.getBooleanValue());
+                    break;
+                default:
+                // Unsupported.... Ignoring.
+            }
+            return this;
+        }
+
+        @Override
+        public Span.Builder setSpanKind(final Span.Kind spanKind) {
+            // TODO: update delegate.operationName
+            delegate.withTag(Tags.SPAN_KIND, spanKind.name());
+            return this;
+        }
+
+        @Override
+        public Span.Builder setStartTimestamp(final long startTimestamp) {
+            delegate.withStartTimestamp(TimeUnit.NANOSECONDS.toMicros(startTimestamp));
+            return this;
+        }
+
+        @Override
+        public Span startSpan() {
+            final AgentSpan agentSpan = delegate.start();
+            agentSpan.spanContext().setIntegrationName("otel");
+            return converter.toSpan(agentSpan);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracerProvider.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracerProvider.java
index c9bc473b619..b0d11e387a4 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracerProvider.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracerProvider.java
@@ -5,20 +5,20 @@
 import io.opentelemetry.trace.TracerProvider;
 
 public class OtelTracerProvider implements TracerProvider {
-  public static final OtelTracerProvider INSTANCE = new OtelTracerProvider();
+    public static final OtelTracerProvider INSTANCE = new OtelTracerProvider();
 
-  private final TypeConverter converter = new TypeConverter();
+    private final TypeConverter converter = new TypeConverter();
 
-  private OtelTracerProvider() {}
+    private OtelTracerProvider() {}
 
-  @Override
-  public Tracer get(final String instrumentationName) {
-    return get(instrumentationName, null);
-  }
+    @Override
+    public Tracer get(final String instrumentationName) {
+        return get(instrumentationName, null);
+    }
 
-  @Override
-  public Tracer get(final String instrumentationName, final String instrumentationVersion) {
-    // TODO: cache return value.
-    return new OtelTracer(instrumentationName, AgentTracer.get(), converter);
-  }
+    @Override
+    public Tracer get(final String instrumentationName, final String instrumentationVersion) {
+        // TODO: cache return value.
+        return new OtelTracer(instrumentationName, AgentTracer.get(), converter);
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/TypeConverter.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/TypeConverter.java
index 7ce0080a06b..2be0ccca385 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/TypeConverter.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/TypeConverter.java
@@ -13,63 +13,63 @@
 
 // Centralized place to do conversions
 public class TypeConverter {
-  private final Span noopSpanWrapper;
-  private final SpanContext noopContextWrapper;
+    private final Span noopSpanWrapper;
+    private final SpanContext noopContextWrapper;
 
-  public TypeConverter() {
-    noopSpanWrapper = new OtelSpan(noopSpan(), this);
-    noopContextWrapper = new OtelSpanContext(noopSpanContext());
-  }
-
-  public AgentSpan toAgentSpan(final Span span) {
-    if (span instanceof OtelSpan) {
-      return ((OtelSpan) span).asAgentSpan();
+    public TypeConverter() {
+        noopSpanWrapper = new OtelSpan(noopSpan(), this);
+        noopContextWrapper = new OtelSpanContext(noopSpanContext());
     }
-    return null == span ? null : noopSpan();
-  }
 
-  public Span toSpan(final AgentSpan agentSpan) {
-    if (agentSpan == null) {
-      return null;
-    }
-    if (agentSpan instanceof AttachableWrapper) {
-      AttachableWrapper attachableSpanWrapper = (AttachableWrapper) agentSpan;
-      Object wrapper = attachableSpanWrapper.getWrapper();
-      if (wrapper instanceof Span) {
-        return (Span) wrapper;
-      }
-      OtelSpan spanWrapper = new OtelSpan(agentSpan, this);
-      attachableSpanWrapper.attachWrapper(spanWrapper);
-      return spanWrapper;
+    public AgentSpan toAgentSpan(final Span span) {
+        if (span instanceof OtelSpan) {
+            return ((OtelSpan) span).asAgentSpan();
+        }
+        return null == span ? null : noopSpan();
     }
-    if (agentSpan == noopSpan()) {
-      return noopSpanWrapper;
-    }
-    return new OtelSpan(agentSpan, this);
-  }
 
-  public Scope toScope(final ContextScope scope) {
-    if (scope == null) {
-      return null;
+    public Span toSpan(final AgentSpan agentSpan) {
+        if (agentSpan == null) {
+            return null;
+        }
+        if (agentSpan instanceof AttachableWrapper) {
+            AttachableWrapper attachableSpanWrapper = (AttachableWrapper) agentSpan;
+            Object wrapper = attachableSpanWrapper.getWrapper();
+            if (wrapper instanceof Span) {
+                return (Span) wrapper;
+            }
+            OtelSpan spanWrapper = new OtelSpan(agentSpan, this);
+            attachableSpanWrapper.attachWrapper(spanWrapper);
+            return spanWrapper;
+        }
+        if (agentSpan == noopSpan()) {
+            return noopSpanWrapper;
+        }
+        return new OtelSpan(agentSpan, this);
     }
-    return new OtelScope(scope);
-  }
 
-  public SpanContext toSpanContext(final AgentSpanContext context) {
-    if (context == null) {
-      return null;
+    public Scope toScope(final ContextScope scope) {
+        if (scope == null) {
+            return null;
+        }
+        return new OtelScope(scope);
     }
-    // avoid a new SpanContext wrapper allocation for the noop context
-    if (context == noopSpanContext()) {
-      return noopContextWrapper;
+
+    public SpanContext toSpanContext(final AgentSpanContext context) {
+        if (context == null) {
+            return null;
+        }
+        // avoid a new SpanContext wrapper allocation for the noop context
+        if (context == noopSpanContext()) {
+            return noopContextWrapper;
+        }
+        return new OtelSpanContext(context);
     }
-    return new OtelSpanContext(context);
-  }
 
-  public AgentSpanContext toContext(final SpanContext spanContext) {
-    if (spanContext instanceof OtelSpanContext) {
-      return ((OtelSpanContext) spanContext).getDelegate();
+    public AgentSpanContext toContext(final SpanContext spanContext) {
+        if (spanContext instanceof OtelSpanContext) {
+            return ((OtelSpanContext) spanContext).getDelegate();
+        }
+        return null == spanContext ? null : noopSpanContext();
     }
-    return null == spanContext ? null : noopSpanContext();
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/main/java/datadog/trace/instrumentation/opentelemetry127/OpenTelemetryLogsInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/main/java/datadog/trace/instrumentation/opentelemetry127/OpenTelemetryLogsInstrumentation.java
index 497c4305a20..16893745db3 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/main/java/datadog/trace/instrumentation/opentelemetry127/OpenTelemetryLogsInstrumentation.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/main/java/datadog/trace/instrumentation/opentelemetry127/OpenTelemetryLogsInstrumentation.java
@@ -24,55 +24,55 @@
  */
 @AutoService(InstrumenterModule.class)
 public class OpenTelemetryLogsInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
 
-  public OpenTelemetryLogsInstrumentation() {
-    super("opentelemetry-logs", "opentelemetry-1.27", "opentelemetry-1");
-  }
+    public OpenTelemetryLogsInstrumentation() {
+        super("opentelemetry-logs", "opentelemetry-1.27", "opentelemetry-1");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isLogsOtelEnabled();
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isLogsOtelEnabled();
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.opentelemetry.api.OpenTelemetry";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.opentelemetry.api.OpenTelemetry";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return named(hierarchyMarkerType()).or(implementsInterface(named(hierarchyMarkerType())));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return named(hierarchyMarkerType()).or(implementsInterface(named(hierarchyMarkerType())));
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.opentelemetry.api.DefaultOpenTelemetry",
-      "io.opentelemetry.api.GlobalOpenTelemetry$ObfuscatedOpenTelemetry"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.opentelemetry.api.DefaultOpenTelemetry",
+            "io.opentelemetry.api.GlobalOpenTelemetry$ObfuscatedOpenTelemetry"
+        };
+    }
 
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return isShortcutMatchingEnabled(false);
-  }
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return isShortcutMatchingEnabled(false);
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // LoggerProvider OpenTelemetry.getLogsBridge()
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("getLogsBridge"))
-            .and(takesNoArguments())
-            .and(returns(named("io.opentelemetry.api.logs.LoggerProvider"))),
-        OpenTelemetryLogsInstrumentation.class.getName() + "$LoggerProviderAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // LoggerProvider OpenTelemetry.getLogsBridge()
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("getLogsBridge"))
+                        .and(takesNoArguments())
+                        .and(returns(named("io.opentelemetry.api.logs.LoggerProvider"))),
+                OpenTelemetryLogsInstrumentation.class.getName() + "$LoggerProviderAdvice");
+    }
 
-  public static class LoggerProviderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void returnProvider(@Advice.Return(readOnly = false) LoggerProvider result) {
-      result = OtelLoggerProvider.INSTANCE;
+    public static class LoggerProviderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void returnProvider(@Advice.Return(readOnly = false) LoggerProvider result) {
+            result = OtelLoggerProvider.INSTANCE;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsActivationByInstrumentationNameForkedTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsActivationByInstrumentationNameForkedTest.java
index e1d3a705f7a..c4ff2dd37a5 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsActivationByInstrumentationNameForkedTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsActivationByInstrumentationNameForkedTest.java
@@ -5,11 +5,10 @@
 // Forked test: runs in an isolated JVM with opentelemetry-logs instrumentation enabled
 // by integration name. GlobalOpenTelemetry holds static state that must reset between variants.
 @WithConfig(key = "integration.opentelemetry-logs.enabled", value = "true")
-class OpenTelemetryLogsActivationByInstrumentationNameForkedTest
-    extends OpenTelemetryLogsActivationTest {
+class OpenTelemetryLogsActivationByInstrumentationNameForkedTest extends OpenTelemetryLogsActivationTest {
 
-  @Override
-  boolean shouldBeInjected() {
-    return true;
-  }
+    @Override
+    boolean shouldBeInjected() {
+        return true;
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsActivationByOtelRfcNameForkedTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsActivationByOtelRfcNameForkedTest.java
index 95748da0a6d..7054457d75e 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsActivationByOtelRfcNameForkedTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsActivationByOtelRfcNameForkedTest.java
@@ -7,8 +7,8 @@
 @WithConfig(key = "logs.otel.enabled", value = "true")
 class OpenTelemetryLogsActivationByOtelRfcNameForkedTest extends OpenTelemetryLogsActivationTest {
 
-  @Override
-  boolean shouldBeInjected() {
-    return true;
-  }
+    @Override
+    boolean shouldBeInjected() {
+        return true;
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsActivationTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsActivationTest.java
index aa820a45a9d..ad3cc0db9af 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsActivationTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsActivationTest.java
@@ -9,19 +9,19 @@
 
 abstract class OpenTelemetryLogsActivationTest extends AbstractInstrumentationTest {
 
-  abstract boolean shouldBeInjected();
+    abstract boolean shouldBeInjected();
 
-  @Test
-  void testInstrumentationInjection() {
-    Logger logger = GlobalOpenTelemetry.get().getLogsBridge().get("some-instrumentation");
-    if (shouldBeInjected()) {
-      assertTrue(
-          logger.getClass().getName().endsWith(".OtelLogger"),
-          "Expected OtelLogger but got: " + logger.getClass().getName());
-    } else {
-      assertTrue(
-          logger.getClass().getName().endsWith(".DefaultLogger"),
-          "Expected DefaultLogger but got: " + logger.getClass().getName());
+    @Test
+    void testInstrumentationInjection() {
+        Logger logger = GlobalOpenTelemetry.get().getLogsBridge().get("some-instrumentation");
+        if (shouldBeInjected()) {
+            assertTrue(
+                    logger.getClass().getName().endsWith(".OtelLogger"),
+                    "Expected OtelLogger but got: " + logger.getClass().getName());
+        } else {
+            assertTrue(
+                    logger.getClass().getName().endsWith(".DefaultLogger"),
+                    "Expected DefaultLogger but got: " + logger.getClass().getName());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsDisableByDefaultForkedTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsDisableByDefaultForkedTest.java
index 328e7fd3961..8a770e5da81 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsDisableByDefaultForkedTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsDisableByDefaultForkedTest.java
@@ -5,8 +5,8 @@
 // GlobalOpenTelemetry holds static state that must reset between variants.
 class OpenTelemetryLogsDisableByDefaultForkedTest extends OpenTelemetryLogsActivationTest {
 
-  @Override
-  boolean shouldBeInjected() {
-    return false;
-  }
+    @Override
+    boolean shouldBeInjected() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsTest.java
index 6c6996f3d0c..169722924a2 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/test/java/opentelemetry127/logs/OpenTelemetryLogsTest.java
@@ -30,170 +30,165 @@
 @WithConfig(key = "logs.otel.enabled", value = "true")
 class OpenTelemetryLogsTest extends AbstractInstrumentationTest {
 
-  private final LogsReader logsReader = new LogsReader();
-
-  @BeforeEach
-  void drainQueue() {
-    // drain any stale log records from the shared processor queue before each test
-    OtelLogRecordProcessor.INSTANCE.waitForLogs(LogsDrainer.INSTANCE, 0);
-  }
-
-  @ParameterizedTest
-  @EnumSource(
-      value = Severity.class,
-      names = {"TRACE", "DEBUG", "INFO", "WARN", "ERROR", "FATAL"})
-  void testSeverity(Severity severity) {
-    LoggerProvider loggerProvider = GlobalOpenTelemetry.get().getLogsBridge();
-    Logger logger = loggerProvider.get("test-severity");
-
-    logger.logRecordBuilder().setBody("test message").setSeverity(severity).emit();
-
-    OtelLogRecordProcessor.INSTANCE.waitForLogs(logsReader, 0);
-
-    assertEquals(1, logsReader.logs.size());
-    CapturedLog log = logsReader.logs.get(0);
-    assertEquals("test-severity", log.scopeName);
-    assertEquals(severity.getSeverityNumber(), log.severityNumber);
-    assertEquals("test message", log.body);
-  }
-
-  @Test
-  void testSeverityText() {
-    Logger logger = GlobalOpenTelemetry.get().getLogsBridge().get("test-severity-text");
-
-    logger
-        .logRecordBuilder()
-        .setBody("message")
-        .setSeverity(Severity.INFO)
-        .setSeverityText("custom-level")
-        .emit();
-
-    OtelLogRecordProcessor.INSTANCE.waitForLogs(logsReader, 0);
-
-    assertEquals(1, logsReader.logs.size());
-    CapturedLog log = logsReader.logs.get(0);
-    assertEquals(Severity.INFO.getSeverityNumber(), log.severityNumber);
-    assertEquals("custom-level", log.severityText);
-  }
-
-  @Test
-  void testAttributes() {
-    Logger logger = GlobalOpenTelemetry.get().getLogsBridge().get("test-attributes");
-
-    logger
-        .logRecordBuilder()
-        .setBody("attributed message")
-        .setAttribute(stringKey("str.key"), "str-value")
-        .setAttribute(longKey("long.key"), 42L)
-        .setAttribute(booleanKey("bool.key"), true)
-        .setAttribute(doubleKey("double.key"), 1.5)
-        .emit();
-
-    OtelLogRecordProcessor.INSTANCE.waitForLogs(logsReader, 0);
-
-    assertEquals(1, logsReader.logs.size());
-    CapturedLog log = logsReader.logs.get(0);
-    assertEquals("test-attributes", log.scopeName);
-    assertEquals("attributed message", log.body);
-    assertEquals("str-value", log.attributes.get("str.key"));
-    assertEquals(42L, log.attributes.get("long.key"));
-    assertEquals(true, log.attributes.get("bool.key"));
-    assertEquals(1.5, log.attributes.get("double.key"));
-  }
-
-  @Test
-  void testMultipleScopes() {
-    Logger loggerA = GlobalOpenTelemetry.get().getLogsBridge().get("scope-a");
-    Logger loggerB = GlobalOpenTelemetry.get().getLogsBridge().get("scope-b");
-
-    loggerA.logRecordBuilder().setBody("a-1").setSeverity(Severity.INFO).emit();
-    loggerB.logRecordBuilder().setBody("b-1").setSeverity(Severity.WARN).emit();
-    loggerA.logRecordBuilder().setBody("a-2").setSeverity(Severity.DEBUG).emit();
-
-    OtelLogRecordProcessor.INSTANCE.waitForLogs(logsReader, 0);
-
-    // logs are sorted by scope name, so all scope-a logs come before scope-b logs
-    assertEquals(3, logsReader.logs.size());
-
-    List<CapturedLog> scopeALogs =
-        logsReader.logs.stream()
-            .filter(l -> "scope-a".equals(l.scopeName))
-            .collect(Collectors.toList());
-    List<CapturedLog> scopeBLogs =
-        logsReader.logs.stream()
-            .filter(l -> "scope-b".equals(l.scopeName))
-            .collect(Collectors.toList());
-
-    assertEquals(2, scopeALogs.size());
-    assertEquals("a-1", scopeALogs.get(0).body);
-    assertEquals("a-2", scopeALogs.get(1).body);
-
-    assertEquals(1, scopeBLogs.size());
-    assertEquals("b-1", scopeBLogs.get(0).body);
-  }
-
-  static class CapturedLog {
-    final String scopeName;
-    final int severityNumber;
-    final String severityText;
-    final String body;
-    final Map<String, Object> attributes;
-
-    CapturedLog(
-        String scopeName,
-        int severityNumber,
-        String severityText,
-        String body,
-        Map<String, Object> attributes) {
-      this.scopeName = scopeName;
-      this.severityNumber = severityNumber;
-      this.severityText = severityText;
-      this.body = body;
-      this.attributes = attributes;
+    private final LogsReader logsReader = new LogsReader();
+
+    @BeforeEach
+    void drainQueue() {
+        // drain any stale log records from the shared processor queue before each test
+        OtelLogRecordProcessor.INSTANCE.waitForLogs(LogsDrainer.INSTANCE, 0);
     }
-  }
 
-  static class LogsReader implements OtlpLogsVisitor, OtlpScopedLogsVisitor {
-    final List<CapturedLog> logs = new ArrayList<>();
-    private String currentScopeName;
-    private final Map<String, Object> currentAttributes = new HashMap<>();
+    @ParameterizedTest
+    @EnumSource(
+            value = Severity.class,
+            names = {"TRACE", "DEBUG", "INFO", "WARN", "ERROR", "FATAL"})
+    void testSeverity(Severity severity) {
+        LoggerProvider loggerProvider = GlobalOpenTelemetry.get().getLogsBridge();
+        Logger logger = loggerProvider.get("test-severity");
+
+        logger.logRecordBuilder().setBody("test message").setSeverity(severity).emit();
+
+        OtelLogRecordProcessor.INSTANCE.waitForLogs(logsReader, 0);
 
-    @Override
-    public OtlpScopedLogsVisitor visitScopedLogs(OtelInstrumentationScope scope) {
-      currentScopeName = scope.getName().toString();
-      return this;
+        assertEquals(1, logsReader.logs.size());
+        CapturedLog log = logsReader.logs.get(0);
+        assertEquals("test-severity", log.scopeName);
+        assertEquals(severity.getSeverityNumber(), log.severityNumber);
+        assertEquals("test message", log.body);
     }
 
-    @Override
-    public void visitAttribute(int type, String key, Object value) {
-      currentAttributes.put(key, value);
+    @Test
+    void testSeverityText() {
+        Logger logger = GlobalOpenTelemetry.get().getLogsBridge().get("test-severity-text");
+
+        logger.logRecordBuilder()
+                .setBody("message")
+                .setSeverity(Severity.INFO)
+                .setSeverityText("custom-level")
+                .emit();
+
+        OtelLogRecordProcessor.INSTANCE.waitForLogs(logsReader, 0);
+
+        assertEquals(1, logsReader.logs.size());
+        CapturedLog log = logsReader.logs.get(0);
+        assertEquals(Severity.INFO.getSeverityNumber(), log.severityNumber);
+        assertEquals("custom-level", log.severityText);
+    }
+
+    @Test
+    void testAttributes() {
+        Logger logger = GlobalOpenTelemetry.get().getLogsBridge().get("test-attributes");
+
+        logger.logRecordBuilder()
+                .setBody("attributed message")
+                .setAttribute(stringKey("str.key"), "str-value")
+                .setAttribute(longKey("long.key"), 42L)
+                .setAttribute(booleanKey("bool.key"), true)
+                .setAttribute(doubleKey("double.key"), 1.5)
+                .emit();
+
+        OtelLogRecordProcessor.INSTANCE.waitForLogs(logsReader, 0);
+
+        assertEquals(1, logsReader.logs.size());
+        CapturedLog log = logsReader.logs.get(0);
+        assertEquals("test-attributes", log.scopeName);
+        assertEquals("attributed message", log.body);
+        assertEquals("str-value", log.attributes.get("str.key"));
+        assertEquals(42L, log.attributes.get("long.key"));
+        assertEquals(true, log.attributes.get("bool.key"));
+        assertEquals(1.5, log.attributes.get("double.key"));
+    }
+
+    @Test
+    void testMultipleScopes() {
+        Logger loggerA = GlobalOpenTelemetry.get().getLogsBridge().get("scope-a");
+        Logger loggerB = GlobalOpenTelemetry.get().getLogsBridge().get("scope-b");
+
+        loggerA.logRecordBuilder().setBody("a-1").setSeverity(Severity.INFO).emit();
+        loggerB.logRecordBuilder().setBody("b-1").setSeverity(Severity.WARN).emit();
+        loggerA.logRecordBuilder().setBody("a-2").setSeverity(Severity.DEBUG).emit();
+
+        OtelLogRecordProcessor.INSTANCE.waitForLogs(logsReader, 0);
+
+        // logs are sorted by scope name, so all scope-a logs come before scope-b logs
+        assertEquals(3, logsReader.logs.size());
+
+        List<CapturedLog> scopeALogs = logsReader.logs.stream()
+                .filter(l -> "scope-a".equals(l.scopeName))
+                .collect(Collectors.toList());
+        List<CapturedLog> scopeBLogs = logsReader.logs.stream()
+                .filter(l -> "scope-b".equals(l.scopeName))
+                .collect(Collectors.toList());
+
+        assertEquals(2, scopeALogs.size());
+        assertEquals("a-1", scopeALogs.get(0).body);
+        assertEquals("a-2", scopeALogs.get(1).body);
+
+        assertEquals(1, scopeBLogs.size());
+        assertEquals("b-1", scopeBLogs.get(0).body);
     }
 
-    @Override
-    public void visitLogRecord(OtlpLogRecord logRecord) {
-      logs.add(
-          new CapturedLog(
-              currentScopeName,
-              logRecord.severityNumber,
-              logRecord.severityText,
-              logRecord.body,
-              new HashMap<>(currentAttributes)));
-      currentAttributes.clear();
+    static class CapturedLog {
+        final String scopeName;
+        final int severityNumber;
+        final String severityText;
+        final String body;
+        final Map<String, Object> attributes;
+
+        CapturedLog(
+                String scopeName,
+                int severityNumber,
+                String severityText,
+                String body,
+                Map<String, Object> attributes) {
+            this.scopeName = scopeName;
+            this.severityNumber = severityNumber;
+            this.severityText = severityText;
+            this.body = body;
+            this.attributes = attributes;
+        }
     }
-  }
 
-  private static class LogsDrainer implements OtlpLogsVisitor {
-    public static final LogsDrainer INSTANCE = new LogsDrainer();
+    static class LogsReader implements OtlpLogsVisitor, OtlpScopedLogsVisitor {
+        final List<CapturedLog> logs = new ArrayList<>();
+        private String currentScopeName;
+        private final Map<String, Object> currentAttributes = new HashMap<>();
 
-    @Override
-    public OtlpScopedLogsVisitor visitScopedLogs(OtelInstrumentationScope scope) {
-      return new OtlpScopedLogsVisitor() {
         @Override
-        public void visitAttribute(int type, String key, Object value) {}
+        public OtlpScopedLogsVisitor visitScopedLogs(OtelInstrumentationScope scope) {
+            currentScopeName = scope.getName().toString();
+            return this;
+        }
+
+        @Override
+        public void visitAttribute(int type, String key, Object value) {
+            currentAttributes.put(key, value);
+        }
+
+        @Override
+        public void visitLogRecord(OtlpLogRecord logRecord) {
+            logs.add(new CapturedLog(
+                    currentScopeName,
+                    logRecord.severityNumber,
+                    logRecord.severityText,
+                    logRecord.body,
+                    new HashMap<>(currentAttributes)));
+            currentAttributes.clear();
+        }
+    }
+
+    private static class LogsDrainer implements OtlpLogsVisitor {
+        public static final LogsDrainer INSTANCE = new LogsDrainer();
 
         @Override
-        public void visitLogRecord(OtlpLogRecord record) {}
-      };
+        public OtlpScopedLogsVisitor visitScopedLogs(OtelInstrumentationScope scope) {
+            return new OtlpScopedLogsVisitor() {
+                @Override
+                public void visitAttribute(int type, String key, Object value) {}
+
+                @Override
+                public void visitLogRecord(OtlpLogRecord record) {}
+            };
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java
index 3003d5448ae..fc40ba04db6 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java
@@ -20,69 +20,69 @@
 
 @AutoService(InstrumenterModule.class)
 public class OpenTelemetryInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
 
-  public OpenTelemetryInstrumentation() {
-    super("opentelemetry.experimental", "opentelemetry-1");
-  }
+    public OpenTelemetryInstrumentation() {
+        super("opentelemetry.experimental", "opentelemetry-1");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isTraceOtelEnabled();
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isTraceOtelEnabled();
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.opentelemetry.api.OpenTelemetry";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.opentelemetry.api.OpenTelemetry";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.opentelemetry.api.DefaultOpenTelemetry",
-      "io.opentelemetry.api.GlobalOpenTelemetry$ObfuscatedOpenTelemetry"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.opentelemetry.api.DefaultOpenTelemetry",
+            "io.opentelemetry.api.GlobalOpenTelemetry$ObfuscatedOpenTelemetry"
+        };
+    }
 
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return isShortcutMatchingEnabled(false);
-  }
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return isShortcutMatchingEnabled(false);
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // TracerProvider OpenTelemetry.getTracerProvider()
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("getTracerProvider"))
-            .and(takesNoArguments())
-            .and(returns(named("io.opentelemetry.api.trace.TracerProvider"))),
-        OpenTelemetryInstrumentation.class.getName() + "$TracerProviderAdvice");
-    // ContextPropagators OpenTelemetry.getPropagators();
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("getPropagators"))
-            .and(takesNoArguments())
-            .and(returns(named("io.opentelemetry.context.propagation.ContextPropagators"))),
-        OpenTelemetryInstrumentation.class.getName() + "$ContextPropagatorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // TracerProvider OpenTelemetry.getTracerProvider()
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("getTracerProvider"))
+                        .and(takesNoArguments())
+                        .and(returns(named("io.opentelemetry.api.trace.TracerProvider"))),
+                OpenTelemetryInstrumentation.class.getName() + "$TracerProviderAdvice");
+        // ContextPropagators OpenTelemetry.getPropagators();
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("getPropagators"))
+                        .and(takesNoArguments())
+                        .and(returns(named("io.opentelemetry.context.propagation.ContextPropagators"))),
+                OpenTelemetryInstrumentation.class.getName() + "$ContextPropagatorAdvice");
+    }
 
-  public static class TracerProviderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void returnProvider(@Advice.Return(readOnly = false) TracerProvider result) {
-      result = OtelTracerProvider.INSTANCE;
+    public static class TracerProviderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void returnProvider(@Advice.Return(readOnly = false) TracerProvider result) {
+            result = OtelTracerProvider.INSTANCE;
+        }
     }
-  }
 
-  public static class ContextPropagatorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void returnProvider(@Advice.Return(readOnly = false) ContextPropagators result) {
-      result = OtelContextPropagators.INSTANCE;
+    public static class ContextPropagatorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void returnProvider(@Advice.Return(readOnly = false) ContextPropagators result) {
+            result = OtelContextPropagators.INSTANCE;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java
index 3772567dbc8..b915e0225aa 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java
@@ -18,54 +18,54 @@
 
 @AutoService(InstrumenterModule.class)
 public class OpenTelemetryContextInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
 
-  public OpenTelemetryContextInstrumentation() {
-    super("opentelemetry.experimental", "opentelemetry-1");
-  }
+    public OpenTelemetryContextInstrumentation() {
+        super("opentelemetry.experimental", "opentelemetry-1");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isTraceOtelEnabled();
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isTraceOtelEnabled();
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.opentelemetry.context.Context";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.opentelemetry.context.Context";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.opentelemetry.context.ArrayBasedContext",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.opentelemetry.context.ArrayBasedContext",
+        };
+    }
 
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return isShortcutMatchingEnabled(false);
-  }
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return isShortcutMatchingEnabled(false);
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // Context Context.root()
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("root"))
-            .and(takesNoArguments())
-            .and(returns(named("io.opentelemetry.context.Context"))),
-        OpenTelemetryContextInstrumentation.class.getName() + "$ContextRootAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // Context Context.root()
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("root"))
+                        .and(takesNoArguments())
+                        .and(returns(named("io.opentelemetry.context.Context"))),
+                OpenTelemetryContextInstrumentation.class.getName() + "$ContextRootAdvice");
+    }
 
-  public static class ContextRootAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void current(@Advice.Return(readOnly = false) Context result) {
-      result = OtelContext.ROOT;
+    public static class ContextRootAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void current(@Advice.Return(readOnly = false) Context result) {
+            result = OtelContext.ROOT;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java
index cf261105de2..cb37459f23c 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java
@@ -18,56 +18,54 @@
 
 @AutoService(InstrumenterModule.class)
 public class OpenTelemetryContextStorageInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
 
-  public OpenTelemetryContextStorageInstrumentation() {
-    super("opentelemetry.experimental", "opentelemetry-1");
-  }
+    public OpenTelemetryContextStorageInstrumentation() {
+        super("opentelemetry.experimental", "opentelemetry-1");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isTraceOtelEnabled();
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isTraceOtelEnabled();
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.opentelemetry.context.ContextStorage";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.opentelemetry.context.ContextStorage";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.opentelemetry.context.ThreadLocalContextStorage",
-      "io.opentelemetry.context.StrictContextStorage",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.opentelemetry.context.ThreadLocalContextStorage", "io.opentelemetry.context.StrictContextStorage",
+        };
+    }
 
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return isShortcutMatchingEnabled(false);
-  }
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return isShortcutMatchingEnabled(false);
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // Context ContextStorage.current()
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("current"))
-            .and(takesNoArguments())
-            .and(returns(named("io.opentelemetry.context.Context"))),
-        OpenTelemetryContextStorageInstrumentation.class.getName()
-            + "$ContextStorageCurrentAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // Context ContextStorage.current()
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("current"))
+                        .and(takesNoArguments())
+                        .and(returns(named("io.opentelemetry.context.Context"))),
+                OpenTelemetryContextStorageInstrumentation.class.getName() + "$ContextStorageCurrentAdvice");
+    }
 
-  public static class ContextStorageCurrentAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void current(@Advice.Return(readOnly = false) Context result) {
-      result = OtelContext.current();
+    public static class ContextStorageCurrentAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void current(@Advice.Return(readOnly = false) Context result) {
+            result = OtelContext.current();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/datadog/opentelemetry/shim/trace/OtelSpanEventTestHelper.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/datadog/opentelemetry/shim/trace/OtelSpanEventTestHelper.java
index a8c97ca719e..e8cc97772bf 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/datadog/opentelemetry/shim/trace/OtelSpanEventTestHelper.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/datadog/opentelemetry/shim/trace/OtelSpanEventTestHelper.java
@@ -2,7 +2,7 @@
 
 /** Test helper providing package-level access to {@link OtelSpanEvent} internals. */
 public class OtelSpanEventTestHelper {
-  public static String stringifyErrorStack(Throwable error) {
-    return OtelSpanEvent.stringifyErrorStack(error);
-  }
+    public static String stringifyErrorStack(Throwable error) {
+        return OtelSpanEvent.stringifyErrorStack(error);
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/AbstractOpenTelemetry14Test.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/AbstractOpenTelemetry14Test.java
index 7da14c067aa..b0bb1119ef7 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/AbstractOpenTelemetry14Test.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/AbstractOpenTelemetry14Test.java
@@ -22,33 +22,32 @@
  */
 @WithConfig(key = "integration.opentelemetry.experimental.enabled", value = "true")
 public abstract class AbstractOpenTelemetry14Test extends AbstractInstrumentationTest {
-  private static int tracerInstance;
+    private static int tracerInstance;
 
-  protected Tracer otelTracer;
+    protected Tracer otelTracer;
 
-  @BeforeEach
-  void setupOtelTracer() {
-    this.otelTracer =
-        GlobalOpenTelemetry.get().getTracerProvider().get("test-tracer-" + tracerInstance++);
-  }
+    @BeforeEach
+    void setupOtelTracer() {
+        this.otelTracer = GlobalOpenTelemetry.get().getTracerProvider().get("test-tracer-" + tracerInstance++);
+    }
 
-  @AfterEach
-  void checkOtelContextAndCleanup() {
-    try {
-      assertEquals(Context.current(), Context.root(), "OTel context leak detected");
-    } finally {
-      clearContextStorage();
+    @AfterEach
+    void checkOtelContextAndCleanup() {
+        try {
+            assertEquals(Context.current(), Context.root(), "OTel context leak detected");
+        } finally {
+            clearContextStorage();
+        }
     }
-  }
 
-  private static void clearContextStorage() {
-    try {
-      Class<?> storageClass = Class.forName("io.opentelemetry.context.ThreadLocalContextStorage");
-      Field field = storageClass.getDeclaredField("THREAD_LOCAL_STORAGE");
-      field.setAccessible(true);
-      ((ThreadLocal<?>) field.get(null)).remove();
-    } catch (ReflectiveOperationException e) {
-      throw new AssertionError("Failed to clear OTel context storage", e);
+    private static void clearContextStorage() {
+        try {
+            Class<?> storageClass = Class.forName("io.opentelemetry.context.ThreadLocalContextStorage");
+            Field field = storageClass.getDeclaredField("THREAD_LOCAL_STORAGE");
+            field.setAccessible(true);
+            ((ThreadLocal<?>) field.get(null)).remove();
+        } catch (ReflectiveOperationException e) {
+            throw new AssertionError("Failed to clear OTel context storage", e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14ActivationTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14ActivationTest.java
index ec3da010904..7a89cffd3dc 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14ActivationTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14ActivationTest.java
@@ -14,56 +14,55 @@
 @WithConfig(key = "integration.opentelemetry.experimental.enabled", value = "")
 abstract class OpenTelemetry14ActivationTest extends AbstractOpenTelemetry14Test {
 
-  abstract boolean shouldBeInjected();
+    abstract boolean shouldBeInjected();
 
-  @Test
-  void testInstrumentationInjection() {
-    Tracer tracer = GlobalOpenTelemetry.get().getTracerProvider().get("some-instrumentation");
-    SpanBuilder builder = tracer.spanBuilder("some-name");
-    Span result = builder.startSpan();
-    Context context = Context.current();
+    @Test
+    void testInstrumentationInjection() {
+        Tracer tracer = GlobalOpenTelemetry.get().getTracerProvider().get("some-instrumentation");
+        SpanBuilder builder = tracer.spanBuilder("some-name");
+        Span result = builder.startSpan();
+        Context context = Context.current();
 
-    if (shouldBeInjected()) {
-      assertImplementation(tracer, "OtelTracer");
-      assertImplementation(builder, "OtelSpanBuilder");
-      assertImplementation(result, "OtelSpan");
-      assertImplementation(context, "OtelContext");
-    } else {
-      assertImplementation(tracer, "DefaultTracer");
-      assertImplementation(context, "ArrayBasedContext");
+        if (shouldBeInjected()) {
+            assertImplementation(tracer, "OtelTracer");
+            assertImplementation(builder, "OtelSpanBuilder");
+            assertImplementation(result, "OtelSpan");
+            assertImplementation(context, "OtelContext");
+        } else {
+            assertImplementation(tracer, "DefaultTracer");
+            assertImplementation(context, "ArrayBasedContext");
+        }
     }
-  }
 
-  private static void assertImplementation(Object instance, String expectedClassName) {
-    String actualClassName = instance.getClass().getName();
-    assertTrue(
-        actualClassName.endsWith("." + expectedClassName),
-        "Expected " + expectedClassName + " but got " + actualClassName);
-  }
+    private static void assertImplementation(Object instance, String expectedClassName) {
+        String actualClassName = instance.getClass().getName();
+        assertTrue(
+                actualClassName.endsWith("." + expectedClassName),
+                "Expected " + expectedClassName + " but got " + actualClassName);
+    }
 }
 
 // Forked test variants: each runs in its own JVM to allow GlobalOpenTelemetry static state to reset
 
 @WithConfig(key = "integration.opentelemetry.experimental.enabled", value = "true")
-class OpenTelemetry14ActivationByInstrumentationNameForkedTest
-    extends OpenTelemetry14ActivationTest {
-  @Override
-  boolean shouldBeInjected() {
-    return true;
-  }
+class OpenTelemetry14ActivationByInstrumentationNameForkedTest extends OpenTelemetry14ActivationTest {
+    @Override
+    boolean shouldBeInjected() {
+        return true;
+    }
 }
 
 @WithConfig(key = "trace.otel.enabled", value = "true")
 class OpenTelemetry14ActivationByOtelRfcNameForkedTest extends OpenTelemetry14ActivationTest {
-  @Override
-  boolean shouldBeInjected() {
-    return true;
-  }
+    @Override
+    boolean shouldBeInjected() {
+        return true;
+    }
 }
 
 class OpenTelemetry14DisableByDefaultForkedTest extends OpenTelemetry14ActivationTest {
-  @Override
-  boolean shouldBeInjected() {
-    return false;
-  }
+    @Override
+    boolean shouldBeInjected() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14ConventionsTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14ConventionsTest.java
index 636df381731..562c0ee4799 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14ConventionsTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14ConventionsTest.java
@@ -37,290 +37,264 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 public class OpenTelemetry14ConventionsTest extends AbstractOpenTelemetry14Test {
-  private static final String SPAN_KIND_INTERNAL = "internal";
-  private static final String OPERATION_NAME_SPECIFIC_ATTRIBUTE = "operation.name";
+    private static final String SPAN_KIND_INTERNAL = "internal";
+    private static final String OPERATION_NAME_SPECIFIC_ATTRIBUTE = "operation.name";
 
-  static Stream<Arguments> testSpanNameConventionsArguments() {
-    return Stream.of(
-        // Fallback behavior
-        arguments(null, emptyMap(), "internal"),
-        // Internal spans
-        arguments(INTERNAL, emptyMap(), "internal"),
-        // Server spans
-        arguments(SERVER, emptyMap(), "server.request"),
-        arguments(SERVER, attributes("http.request.method", "GET"), "http.server.request"),
-        arguments(SERVER, attributes("http.request.method", "GET"), "http.server.request"),
-        arguments(SERVER, attributes("network.protocol.name", "amqp"), "amqp.server.request"),
-        // Client spans
-        arguments(CLIENT, emptyMap(), "client.request"),
-        arguments(CLIENT, attributes("http.request.method", "GET"), "http.client.request"),
-        arguments(CLIENT, attributes("db.system", "mysql"), "mysql.query"),
-        arguments(CLIENT, attributes("network.protocol.name", "amqp"), "amqp.client.request"),
-        arguments(CLIENT, attributes("network.protocol.name", "AMQP"), "amqp.client.request"),
-        // Messaging spans
-        arguments(PRODUCER, emptyMap(), "producer"),
-        arguments(CONSUMER, emptyMap(), "consumer"),
-        arguments(
-            CONSUMER,
-            attributes("messaging.system", "rabbitmq", "messaging.operation", "publish"),
-            "rabbitmq.publish"),
-        arguments(
-            PRODUCER,
-            attributes("messaging.system", "rabbitmq", "messaging.operation", "publish"),
-            "rabbitmq.publish"),
-        arguments(
-            CLIENT,
-            attributes("messaging.system", "rabbitmq", "messaging.operation", "publish"),
-            "rabbitmq.publish"),
-        arguments(
-            SERVER,
-            attributes("messaging.system", "rabbitmq", "messaging.operation", "publish"),
-            "rabbitmq.publish"),
-        // RPC spans
-        arguments(CLIENT, attributes("rpc.system", "grpc"), "grpc.client.request"),
-        arguments(SERVER, attributes("rpc.system", "grpc"), "grpc.server.request"),
-        arguments(CLIENT, attributes("rpc.system", "aws-api"), "aws.client.request"),
-        arguments(
-            CLIENT,
-            attributes("rpc.system", "aws-api", "rpc.service", "helloworld"),
-            "aws.helloworld.request"),
-        arguments(SERVER, attributes("rpc.system", "aws-api"), "aws-api.server.request"),
-        // FAAS spans
-        arguments(
-            CLIENT,
-            attributes(
-                "faas.invoked_provider", "alibaba_cloud", "faas.invoked_name", "my-function"),
-            "alibaba_cloud.my-function.invoke"),
-        arguments(SERVER, attributes("faas.trigger", "datasource"), "datasource.invoke"),
-        // GraphQL spans
-        arguments(
-            INTERNAL, attributes("graphql.operation.type", "query"), "graphql.server.request"),
-        arguments(null, attributes("graphql.operation.type", "query"), "graphql.server.request"),
-        // User override
-        arguments(
-            CLIENT, attributes("db.system", "mysql", "operation.name", "db.query"), "db.query"),
-        arguments(
-            CLIENT, attributes("db.system", "mysql", "operation.name", "DB.query"), "db.query"));
-  }
-
-  @ParameterizedTest(name = "[{index}] {0} {1} -> {2}")
-  @MethodSource("testSpanNameConventionsArguments")
-  void testSpanNameConventions(
-      SpanKind kind, Map<String, String> attributes, String expectedOperationName) {
-    SpanBuilder builder = this.otelTracer.spanBuilder("some-name");
-    if (kind != null) {
-      builder.setSpanKind(kind);
+    static Stream<Arguments> testSpanNameConventionsArguments() {
+        return Stream.of(
+                // Fallback behavior
+                arguments(null, emptyMap(), "internal"),
+                // Internal spans
+                arguments(INTERNAL, emptyMap(), "internal"),
+                // Server spans
+                arguments(SERVER, emptyMap(), "server.request"),
+                arguments(SERVER, attributes("http.request.method", "GET"), "http.server.request"),
+                arguments(SERVER, attributes("http.request.method", "GET"), "http.server.request"),
+                arguments(SERVER, attributes("network.protocol.name", "amqp"), "amqp.server.request"),
+                // Client spans
+                arguments(CLIENT, emptyMap(), "client.request"),
+                arguments(CLIENT, attributes("http.request.method", "GET"), "http.client.request"),
+                arguments(CLIENT, attributes("db.system", "mysql"), "mysql.query"),
+                arguments(CLIENT, attributes("network.protocol.name", "amqp"), "amqp.client.request"),
+                arguments(CLIENT, attributes("network.protocol.name", "AMQP"), "amqp.client.request"),
+                // Messaging spans
+                arguments(PRODUCER, emptyMap(), "producer"),
+                arguments(CONSUMER, emptyMap(), "consumer"),
+                arguments(
+                        CONSUMER,
+                        attributes("messaging.system", "rabbitmq", "messaging.operation", "publish"),
+                        "rabbitmq.publish"),
+                arguments(
+                        PRODUCER,
+                        attributes("messaging.system", "rabbitmq", "messaging.operation", "publish"),
+                        "rabbitmq.publish"),
+                arguments(
+                        CLIENT,
+                        attributes("messaging.system", "rabbitmq", "messaging.operation", "publish"),
+                        "rabbitmq.publish"),
+                arguments(
+                        SERVER,
+                        attributes("messaging.system", "rabbitmq", "messaging.operation", "publish"),
+                        "rabbitmq.publish"),
+                // RPC spans
+                arguments(CLIENT, attributes("rpc.system", "grpc"), "grpc.client.request"),
+                arguments(SERVER, attributes("rpc.system", "grpc"), "grpc.server.request"),
+                arguments(CLIENT, attributes("rpc.system", "aws-api"), "aws.client.request"),
+                arguments(
+                        CLIENT,
+                        attributes("rpc.system", "aws-api", "rpc.service", "helloworld"),
+                        "aws.helloworld.request"),
+                arguments(SERVER, attributes("rpc.system", "aws-api"), "aws-api.server.request"),
+                // FAAS spans
+                arguments(
+                        CLIENT,
+                        attributes("faas.invoked_provider", "alibaba_cloud", "faas.invoked_name", "my-function"),
+                        "alibaba_cloud.my-function.invoke"),
+                arguments(SERVER, attributes("faas.trigger", "datasource"), "datasource.invoke"),
+                // GraphQL spans
+                arguments(INTERNAL, attributes("graphql.operation.type", "query"), "graphql.server.request"),
+                arguments(null, attributes("graphql.operation.type", "query"), "graphql.server.request"),
+                // User override
+                arguments(CLIENT, attributes("db.system", "mysql", "operation.name", "db.query"), "db.query"),
+                arguments(CLIENT, attributes("db.system", "mysql", "operation.name", "DB.query"), "db.query"));
     }
-    attributes.forEach(builder::setAttribute);
-    builder.startSpan().end();
 
-    String expectedSpanKindTag = OtelConventions.toSpanKindTagValue(kind == null ? INTERNAL : kind);
-    List<TagsMatcher> tagMatchers = new ArrayList<>();
-    tagMatchers.add(defaultTags());
-    tagMatchers.add(tag(SPAN_KIND, is(expectedSpanKindTag)));
-    attributes.forEach(
-        (key, value) -> {
-          if (!OPERATION_NAME_SPECIFIC_ATTRIBUTE.equals(key)) {
-            tagMatchers.add(tag(key, is(value)));
-          }
+    @ParameterizedTest(name = "[{index}] {0} {1} -> {2}")
+    @MethodSource("testSpanNameConventionsArguments")
+    void testSpanNameConventions(SpanKind kind, Map<String, String> attributes, String expectedOperationName) {
+        SpanBuilder builder = this.otelTracer.spanBuilder("some-name");
+        if (kind != null) {
+            builder.setSpanKind(kind);
+        }
+        attributes.forEach(builder::setAttribute);
+        builder.startSpan().end();
+
+        String expectedSpanKindTag = OtelConventions.toSpanKindTagValue(kind == null ? INTERNAL : kind);
+        List<TagsMatcher> tagMatchers = new ArrayList<>();
+        tagMatchers.add(defaultTags());
+        tagMatchers.add(tag(SPAN_KIND, is(expectedSpanKindTag)));
+        attributes.forEach((key, value) -> {
+            if (!OPERATION_NAME_SPECIFIC_ATTRIBUTE.equals(key)) {
+                tagMatchers.add(tag(key, is(value)));
+            }
         });
 
-    assertTraces(
-        trace(
-            span()
-                .root()
+        assertTraces(trace(span().root()
                 .operationName(expectedOperationName)
                 .resourceName("some-name")
                 .tags(tagMatchers.toArray(new TagsMatcher[0]))));
-  }
+    }
 
-  static Stream<Arguments> testSpanSpecificTagsArguments() {
-    return Stream.of(
-        arguments(true, true),
-        arguments(true, false),
-        arguments(false, true),
-        arguments(false, false));
-  }
+    static Stream<Arguments> testSpanSpecificTagsArguments() {
+        return Stream.of(
+                arguments(true, true), arguments(true, false), arguments(false, true), arguments(false, false));
+    }
 
-  @ParameterizedTest(name = "[{index}] setInBuilder={0} useAttributeKey={1}")
-  @MethodSource("testSpanSpecificTagsArguments")
-  void testSpanSpecificTags(boolean setInBuilder, boolean useAttributeKey) {
-    SpanBuilder builder = this.otelTracer.spanBuilder("some-name");
+    @ParameterizedTest(name = "[{index}] setInBuilder={0} useAttributeKey={1}")
+    @MethodSource("testSpanSpecificTagsArguments")
+    void testSpanSpecificTags(boolean setInBuilder, boolean useAttributeKey) {
+        SpanBuilder builder = this.otelTracer.spanBuilder("some-name");
 
-    if (setInBuilder) {
-      if (useAttributeKey) {
-        builder
-            .setAttribute(stringKey("operation.name"), "my-operation")
-            .setAttribute(stringKey("service.name"), "my-service")
-            .setAttribute(stringKey("resource.name"), "/my-resource")
-            .setAttribute(stringKey("span.type"), "http");
-      } else {
-        builder
-            .setAttribute("operation.name", "my-operation")
-            .setAttribute("service.name", "my-service")
-            .setAttribute("resource.name", "/my-resource")
-            .setAttribute("span.type", "http");
-      }
-    }
-    Span result = builder.startSpan();
-    if (!setInBuilder) {
-      if (useAttributeKey) {
-        result
-            .setAttribute(stringKey("operation.name"), "my-operation")
-            .setAttribute(stringKey("service.name"), "my-service")
-            .setAttribute(stringKey("resource.name"), "/my-resource")
-            .setAttribute(stringKey("span.type"), "http");
-      } else {
-        result
-            .setAttribute("operation.name", "my-operation")
-            .setAttribute("service.name", "my-service")
-            .setAttribute("resource.name", "/my-resource")
-            .setAttribute("span.type", "http");
-      }
-    }
-    result.end();
+        if (setInBuilder) {
+            if (useAttributeKey) {
+                builder.setAttribute(stringKey("operation.name"), "my-operation")
+                        .setAttribute(stringKey("service.name"), "my-service")
+                        .setAttribute(stringKey("resource.name"), "/my-resource")
+                        .setAttribute(stringKey("span.type"), "http");
+            } else {
+                builder.setAttribute("operation.name", "my-operation")
+                        .setAttribute("service.name", "my-service")
+                        .setAttribute("resource.name", "/my-resource")
+                        .setAttribute("span.type", "http");
+            }
+        }
+        Span result = builder.startSpan();
+        if (!setInBuilder) {
+            if (useAttributeKey) {
+                result.setAttribute(stringKey("operation.name"), "my-operation")
+                        .setAttribute(stringKey("service.name"), "my-service")
+                        .setAttribute(stringKey("resource.name"), "/my-resource")
+                        .setAttribute(stringKey("span.type"), "http");
+            } else {
+                result.setAttribute("operation.name", "my-operation")
+                        .setAttribute("service.name", "my-service")
+                        .setAttribute("resource.name", "/my-resource")
+                        .setAttribute("span.type", "http");
+            }
+        }
+        result.end();
 
-    assertTraces(
-        trace(
-            span()
-                .root()
+        assertTraces(trace(span().root()
                 .operationName("my-operation")
                 .resourceName("/my-resource")
                 .serviceName("my-service")
                 .type("http")
-                .tags(
-                    defaultTags(),
-                    tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
-                    tag(DD_SVC_SRC, isManuallySet()))));
-  }
+                .tags(defaultTags(), tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)), tag(DD_SVC_SRC, isManuallySet()))));
+    }
 
-  static Stream<Arguments> testSpanAnalyticsEventSpecificTagArguments() {
-    return Stream.of(
-        arguments(true, true, 1),
-        arguments(true, Boolean.TRUE, 1),
-        arguments(true, false, 0),
-        arguments(true, Boolean.FALSE, 0),
-        arguments(true, null, 0),
-        arguments(true, "true", 1),
-        arguments(true, "false", 0),
-        arguments(true, "TRUE", 1),
-        arguments(true, "something-else", 0),
-        arguments(true, "", 0),
-        arguments(false, true, 1),
-        arguments(false, Boolean.TRUE, 1),
-        arguments(false, false, 0),
-        arguments(false, Boolean.FALSE, 0),
-        arguments(false, null, 0),
-        arguments(false, "true", 1),
-        arguments(false, "false", 0),
-        arguments(false, "TRUE", 1),
-        arguments(false, "something-else", 0),
-        arguments(false, "", 0));
-  }
+    static Stream<Arguments> testSpanAnalyticsEventSpecificTagArguments() {
+        return Stream.of(
+                arguments(true, true, 1),
+                arguments(true, Boolean.TRUE, 1),
+                arguments(true, false, 0),
+                arguments(true, Boolean.FALSE, 0),
+                arguments(true, null, 0),
+                arguments(true, "true", 1),
+                arguments(true, "false", 0),
+                arguments(true, "TRUE", 1),
+                arguments(true, "something-else", 0),
+                arguments(true, "", 0),
+                arguments(false, true, 1),
+                arguments(false, Boolean.TRUE, 1),
+                arguments(false, false, 0),
+                arguments(false, Boolean.FALSE, 0),
+                arguments(false, null, 0),
+                arguments(false, "true", 1),
+                arguments(false, "false", 0),
+                arguments(false, "TRUE", 1),
+                arguments(false, "something-else", 0),
+                arguments(false, "", 0));
+    }
 
-  @ParameterizedTest(name = "[{index}] setInBuilder={0} value={1}")
-  @MethodSource("testSpanAnalyticsEventSpecificTagArguments")
-  void testSpanAnalyticsEventSpecificTag(boolean setInBuilder, Object value, int expectedMetric) {
-    SpanBuilder builder = this.otelTracer.spanBuilder("some-name");
+    @ParameterizedTest(name = "[{index}] setInBuilder={0} value={1}")
+    @MethodSource("testSpanAnalyticsEventSpecificTagArguments")
+    void testSpanAnalyticsEventSpecificTag(boolean setInBuilder, Object value, int expectedMetric) {
+        SpanBuilder builder = this.otelTracer.spanBuilder("some-name");
 
-    if (setInBuilder) {
-      if (value instanceof Boolean) {
-        builder.setAttribute("analytics.event", (boolean) value);
-      } else if (value instanceof String) {
-        builder.setAttribute("analytics.event", (String) value);
-      }
-      // null case: don't set anything
-    }
-    Span result = builder.startSpan();
-    if (!setInBuilder) {
-      if (value instanceof Boolean) {
-        result.setAttribute("analytics.event", (boolean) value);
-      } else if (value instanceof String) {
-        result.setAttribute("analytics.event", (String) value);
-      }
-      // null case: don't set anything
-    }
-    result.end();
+        if (setInBuilder) {
+            if (value instanceof Boolean) {
+                builder.setAttribute("analytics.event", (boolean) value);
+            } else if (value instanceof String) {
+                builder.setAttribute("analytics.event", (String) value);
+            }
+            // null case: don't set anything
+        }
+        Span result = builder.startSpan();
+        if (!setInBuilder) {
+            if (value instanceof Boolean) {
+                result.setAttribute("analytics.event", (boolean) value);
+            } else if (value instanceof String) {
+                result.setAttribute("analytics.event", (String) value);
+            }
+            // null case: don't set anything
+        }
+        result.end();
 
-    List<TagsMatcher> tagMatchers = new ArrayList<>();
-    tagMatchers.add(defaultTags());
-    tagMatchers.add(tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)));
-    if (value != null) {
-      tagMatchers.add(tag(ANALYTICS_SAMPLE_RATE, is(expectedMetric)));
+        List<TagsMatcher> tagMatchers = new ArrayList<>();
+        tagMatchers.add(defaultTags());
+        tagMatchers.add(tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)));
+        if (value != null) {
+            tagMatchers.add(tag(ANALYTICS_SAMPLE_RATE, is(expectedMetric)));
+        }
+        assertTraces(trace(span().root().operationName("internal").tags(tagMatchers.toArray(new TagsMatcher[0]))));
     }
-    assertTraces(
-        trace(
-            span().root().operationName("internal").tags(tagMatchers.toArray(new TagsMatcher[0]))));
-  }
 
-  static Stream<Arguments> testSpanHttpResponseStatusCodeSpecificTagArguments() {
-    return Stream.of(
-        arguments(true, false, null, 0),
-        arguments(true, false, 200, 200),
-        arguments(true, false, 404L, 404),
-        arguments(true, false, (long) 500, 500),
-        arguments(false, false, null, 0),
-        arguments(false, false, 200, 200),
-        arguments(false, false, 404L, 404),
-        arguments(false, false, (long) 500, 500),
-        arguments(true, true, null, 0),
-        arguments(true, true, 200, 200),
-        arguments(true, true, 404L, 404),
-        arguments(true, true, (long) 500, 500),
-        arguments(false, true, null, 0),
-        arguments(false, true, 200, 200),
-        arguments(false, true, 404L, 404),
-        arguments(false, true, (long) 500, 500));
-  }
+    static Stream<Arguments> testSpanHttpResponseStatusCodeSpecificTagArguments() {
+        return Stream.of(
+                arguments(true, false, null, 0),
+                arguments(true, false, 200, 200),
+                arguments(true, false, 404L, 404),
+                arguments(true, false, (long) 500, 500),
+                arguments(false, false, null, 0),
+                arguments(false, false, 200, 200),
+                arguments(false, false, 404L, 404),
+                arguments(false, false, (long) 500, 500),
+                arguments(true, true, null, 0),
+                arguments(true, true, 200, 200),
+                arguments(true, true, 404L, 404),
+                arguments(true, true, (long) 500, 500),
+                arguments(false, true, null, 0),
+                arguments(false, true, 200, 200),
+                arguments(false, true, 404L, 404),
+                arguments(false, true, (long) 500, 500));
+    }
 
-  @ParameterizedTest(name = "[{index}] setInBuilder={0} attributeKey={1} value={2}")
-  @MethodSource("testSpanHttpResponseStatusCodeSpecificTagArguments")
-  void testSpanHttpResponseStatusCodeSpecificTag(
-      boolean setInBuilder, boolean attributeKey, Object value, int expectedStatus) {
-    SpanBuilder builder = this.otelTracer.spanBuilder("some-name");
+    @ParameterizedTest(name = "[{index}] setInBuilder={0} attributeKey={1} value={2}")
+    @MethodSource("testSpanHttpResponseStatusCodeSpecificTagArguments")
+    void testSpanHttpResponseStatusCodeSpecificTag(
+            boolean setInBuilder, boolean attributeKey, Object value, int expectedStatus) {
+        SpanBuilder builder = this.otelTracer.spanBuilder("some-name");
 
-    if (setInBuilder) {
-      if (value != null) {
-        if (attributeKey) {
-          builder.setAttribute(longKey("http.response.status_code"), ((Number) value).longValue());
-        } else {
-          builder.setAttribute("http.response.status_code", ((Number) value).longValue());
+        if (setInBuilder) {
+            if (value != null) {
+                if (attributeKey) {
+                    builder.setAttribute(longKey("http.response.status_code"), ((Number) value).longValue());
+                } else {
+                    builder.setAttribute("http.response.status_code", ((Number) value).longValue());
+                }
+            }
         }
-      }
-    }
-    Span result = builder.startSpan();
-    if (!setInBuilder) {
-      if (value != null) {
-        if (attributeKey) {
-          result.setAttribute(longKey("http.response.status_code"), ((Number) value).longValue());
-        } else {
-          result.setAttribute("http.response.status_code", ((Number) value).longValue());
+        Span result = builder.startSpan();
+        if (!setInBuilder) {
+            if (value != null) {
+                if (attributeKey) {
+                    result.setAttribute(longKey("http.response.status_code"), ((Number) value).longValue());
+                } else {
+                    result.setAttribute("http.response.status_code", ((Number) value).longValue());
+                }
+            }
         }
-      }
-    }
-    result.end();
+        result.end();
 
-    List<TagsMatcher> tagMatchers = new ArrayList<>();
-    tagMatchers.add(defaultTags());
-    tagMatchers.add(tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)));
-    if (value != null) {
-      tagMatchers.add(tag(HTTP_STATUS, is(expectedStatus)));
-    }
+        List<TagsMatcher> tagMatchers = new ArrayList<>();
+        tagMatchers.add(defaultTags());
+        tagMatchers.add(tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)));
+        if (value != null) {
+            tagMatchers.add(tag(HTTP_STATUS, is(expectedStatus)));
+        }
 
-    assertTraces(
-        trace(
-            span().root().operationName("internal").tags(tagMatchers.toArray(new TagsMatcher[0]))));
-  }
+        assertTraces(trace(span().root().operationName("internal").tags(tagMatchers.toArray(new TagsMatcher[0]))));
+    }
 
-  static Map<String, String> attributes(String... keyValues) {
-    Map<String, String> map = new HashMap<>();
-    for (int i = 0; i + 1 < keyValues.length; i += 2) {
-      map.put(keyValues[i], keyValues[i + 1]);
+    static Map<String, String> attributes(String... keyValues) {
+        Map<String, String> map = new HashMap<>();
+        for (int i = 0; i + 1 < keyValues.length; i += 2) {
+            map.put(keyValues[i], keyValues[i + 1]);
+        }
+        return map;
     }
-    return map;
-  }
 
-  static Matcher<Object> isManuallySet() {
-    return Matchers.validates(o -> ServiceNameSources.MANUAL.toString().equals(String.valueOf(o)));
-  }
+    static Matcher<Object> isManuallySet() {
+        return Matchers.validates(o -> ServiceNameSources.MANUAL.toString().equals(String.valueOf(o)));
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14Test.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14Test.java
index 998b41e9f27..d4975d5b300 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14Test.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14Test.java
@@ -80,822 +80,760 @@
 import org.skyscreamer.jsonassert.JSONAssert;
 
 class OpenTelemetry14Test extends AbstractOpenTelemetry14Test {
-  private static final String SPAN_KIND_INTERNAL = "internal";
-  private static final long TIME_MILLIS = 1723220824705L;
-  private static final long TIME_NANO = TIME_MILLIS * 1_000_000L;
-
-  @Test
-  void testParentSpanUsingActiveSpan() {
-    Span parentSpan = this.otelTracer.spanBuilder("some-name").startSpan();
-    try (Scope ignoredScope = parentSpan.makeCurrent()) {
-      Span childSpan = this.otelTracer.spanBuilder("other-name").startSpan();
-      childSpan.end();
+    private static final String SPAN_KIND_INTERNAL = "internal";
+    private static final long TIME_MILLIS = 1723220824705L;
+    private static final long TIME_NANO = TIME_MILLIS * 1_000_000L;
+
+    @Test
+    void testParentSpanUsingActiveSpan() {
+        Span parentSpan = this.otelTracer.spanBuilder("some-name").startSpan();
+        try (Scope ignoredScope = parentSpan.makeCurrent()) {
+            Span childSpan = this.otelTracer.spanBuilder("other-name").startSpan();
+            childSpan.end();
+        }
+        parentSpan.end();
+
+        assertTraces(trace(
+                span().root().operationName("internal").resourceName("some-name"),
+                span().childOfPrevious().operationName("internal").resourceName("other-name")));
     }
-    parentSpan.end();
-
-    assertTraces(
-        trace(
-            span().root().operationName("internal").resourceName("some-name"),
-            span().childOfPrevious().operationName("internal").resourceName("other-name")));
-  }
-
-  @Test
-  void testParentSpanUsingReference() {
-    Span parentSpan = this.otelTracer.spanBuilder("some-name").startSpan();
-    Span childSpan =
-        this.otelTracer
-            .spanBuilder("other-name")
-            .setParent(Context.current().with(parentSpan))
-            .startSpan();
-    childSpan.end();
-    parentSpan.end();
-
-    assertTraces(
-        trace(
-            span().root().operationName("internal").resourceName("some-name"),
-            span().childOfPrevious().operationName("internal").resourceName("other-name")));
-  }
-
-  @Test
-  void testParentSpanUsingPropagationData() {
-    String traceId = "00000000000000001111111111111111";
-    String spanId = "2222222222222222";
-    String traceParent = "00-" + traceId + "-" + spanId + "-00";
-    Map<String, String> headers = new HashMap<>();
-    headers.put("traceparent", traceParent);
-    TextMapPropagator propagator = GlobalOpenTelemetry.getPropagators().getTextMapPropagator();
-    Context context = propagator.extract(Context.root(), headers, TextMap.INSTANCE);
-
-    try (Scope ignoredScope = context.makeCurrent()) {
-      Span childSpan = this.otelTracer.spanBuilder("some-name").startSpan();
-      childSpan.end();
+
+    @Test
+    void testParentSpanUsingReference() {
+        Span parentSpan = this.otelTracer.spanBuilder("some-name").startSpan();
+        Span childSpan = this.otelTracer
+                .spanBuilder("other-name")
+                .setParent(Context.current().with(parentSpan))
+                .startSpan();
+        childSpan.end();
+        parentSpan.end();
+
+        assertTraces(trace(
+                span().root().operationName("internal").resourceName("some-name"),
+                span().childOfPrevious().operationName("internal").resourceName("other-name")));
     }
 
-    assertTraces(
-        trace(
-            span()
-                .traceId(DDTraceId.fromHex(traceId))
+    @Test
+    void testParentSpanUsingPropagationData() {
+        String traceId = "00000000000000001111111111111111";
+        String spanId = "2222222222222222";
+        String traceParent = "00-" + traceId + "-" + spanId + "-00";
+        Map<String, String> headers = new HashMap<>();
+        headers.put("traceparent", traceParent);
+        TextMapPropagator propagator = GlobalOpenTelemetry.getPropagators().getTextMapPropagator();
+        Context context = propagator.extract(Context.root(), headers, TextMap.INSTANCE);
+
+        try (Scope ignoredScope = context.makeCurrent()) {
+            Span childSpan = this.otelTracer.spanBuilder("some-name").startSpan();
+            childSpan.end();
+        }
+
+        assertTraces(trace(span().traceId(DDTraceId.fromHex(traceId))
                 .childOf(DDSpanId.fromHex(spanId))
                 .operationName("internal")
                 .resourceName("some-name")));
-  }
-
-  @Test
-  void testParentSpanUsingInvalidReference() throws Exception {
-    // Root context contains a SpanContext with TID/SID to 0 as current span
-    Context invalidCurrentSpanContext = Context.root();
-    Span childSpan =
-        this.otelTracer.spanBuilder("some-name").setParent(invalidCurrentSpanContext).startSpan();
-    childSpan.end();
-
-    writer.waitForTraces(1);
-    List<DDSpan> firstTrace = writer.firstTrace();
-
-    assertEquals(1, firstTrace.size());
-    assertNotEquals(0, firstTrace.get(0).getSpanId());
-  }
-
-  @Test
-  void testNoParentToCreateNewRootSpan() {
-    Span parentSpan = this.otelTracer.spanBuilder("some-name").startSpan();
-    try (Scope ignoredScope = parentSpan.makeCurrent()) {
-      Span childSpan = this.otelTracer.spanBuilder("other-name").setNoParent().startSpan();
-      childSpan.end();
     }
-    parentSpan.end();
-
-    assertTraces(
-        trace(span().root().operationName("internal").resourceName("some-name")),
-        trace(span().root().operationName("internal").resourceName("other-name")));
-  }
-
-  @Test
-  void testAddEvent() {
-    SpanBuilder builder = this.otelTracer.spanBuilder("some-name");
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    timeSource.set(1000);
-    OtelSpanEvent.setTimeSource(timeSource);
-
-    Span result = builder.startSpan();
-    result.addEvent("event");
-    result.end();
-
-    String expectedEventTag =
-        "["
-            + "{ \"time_unix_nano\": "
-            + timeSource.getCurrentTimeNanos()
-            + ", \"name\": \"event\" }"
-            + "]";
-    assertTraces(
-        trace(
-            span()
-                .tags(
-                    defaultTags(),
-                    tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
-                    tag(SPAN_EVENTS, isJson(expectedEventTag)))));
-  }
-
-  static Stream<Arguments> testAddSingleEventArguments() {
-    return Stream.of(
-        arguments(
-            "empty attributes", "event1", TIME_MILLIS, MILLISECONDS, Attributes.empty(), null),
-        arguments(
-            "scalar attributes",
-            "event2",
-            TIME_NANO,
-            NANOSECONDS,
-            Attributes.builder()
-                .put("string-key", "string-value")
-                .put("long-key", 123456789L)
-                .put("double-key", 1234.5678)
-                .put("boolean-key-true", true)
-                .put("boolean-key-false", false)
-                .build(),
-            "{\"string-key\": \"string-value\", \"long-key\": 123456789, \"double-key\": 1234.5678, \"boolean-key-true\": true, \"boolean-key-false\": false }"),
-        arguments(
-            "array attributes",
-            "event3",
-            TIME_NANO,
-            NANOSECONDS,
-            Attributes.builder()
-                .put("string-key-array", "string-value1", "string-value2", "string-value3")
-                .put("long-key-array", 123456L, 1234567L, 12345678L)
-                .put("double-key-array", 1234.5D, 1234.56D, 1234.567D)
-                .put("boolean-key-array", true, false, true)
-                .build(),
-            "{\"string-key-array\": [ \"string-value1\", \"string-value2\", \"string-value3\" ], \"long-key-array\": [ 123456, 1234567, 12345678 ], \"double-key-array\": [ 1234.5, 1234.56, 1234.567], \"boolean-key-array\": [true, false, true] }"));
-  }
-
-  @ParameterizedTest(name = "[{index}] {0}")
-  @MethodSource("testAddSingleEventArguments")
-  void testAddSingleEvent(
-      String scenario,
-      String name,
-      long timestamp,
-      TimeUnit unit,
-      Attributes attributes,
-      String expectedAttributes) {
-    SpanBuilder builder = this.otelTracer.spanBuilder("some-name");
-    String expectedEventTag =
-        "["
-            + "{ \"time_unix_nano\": "
-            + unit.toNanos(timestamp)
-            + ", \"name\": \""
-            + name
-            + "\""
-            + (expectedAttributes == null ? "" : ", \"attributes\": " + expectedAttributes)
-            + " }"
-            + "]";
-
-    Span result = builder.startSpan();
-    result.addEvent(name, attributes, timestamp, unit);
-    result.end();
-
-    assertTraces(
-        trace(
-            span()
-                .tags(
-                    defaultTags(),
-                    tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
-                    tag(SPAN_EVENTS, isJson(expectedEventTag)))));
-  }
-
-  @Test
-  void testAddMultipleSpanEvents() {
-    SpanBuilder builder = this.otelTracer.spanBuilder("some-name");
-
-    Span result = builder.startSpan();
-    result.addEvent("event1", Attributes.empty(), TIME_NANO, NANOSECONDS);
-    result.addEvent(
-        "event2",
-        Attributes.builder().put("string-key", "string-value").build(),
-        TIME_NANO,
-        NANOSECONDS);
-    result.end();
-
-    String expectedEventTag =
-        "["
-            + "{ \"time_unix_nano\": "
-            + TIME_NANO
-            + ", \"name\": \"event1\" },"
-            + "{ \"time_unix_nano\": "
-            + TIME_NANO
-            + ", \"name\": \"event2\", \"attributes\": {\"string-key\": \"string-value\"} }"
-            + "]";
-    assertTraces(
-        trace(
-            span()
-                .tags(
-                    defaultTags(),
-                    tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
-                    tag(SPAN_EVENTS, isJson(expectedEventTag)))));
-  }
-
-  @Test
-  void testConcurrentAddEvents() throws Exception {
-    // Regression test: concurrent addEvent calls (e.g. from GraphQL DataLoaders on virtual
-    // threads) used to corrupt unsynchronized backing list, causing NPE on span finish.
-    int threadCount = 8;
-    int eventsPerThread = 2000;
-    Span span = this.otelTracer.spanBuilder("some-name").startSpan();
-
-    CountDownLatch start = new CountDownLatch(1);
-    List<Thread> threads = new ArrayList<>();
-    for (int t = 0; t < threadCount; t++) {
-      Thread thread =
-          new Thread(
-              () -> {
+
+    @Test
+    void testParentSpanUsingInvalidReference() throws Exception {
+        // Root context contains a SpanContext with TID/SID to 0 as current span
+        Context invalidCurrentSpanContext = Context.root();
+        Span childSpan = this.otelTracer
+                .spanBuilder("some-name")
+                .setParent(invalidCurrentSpanContext)
+                .startSpan();
+        childSpan.end();
+
+        writer.waitForTraces(1);
+        List<DDSpan> firstTrace = writer.firstTrace();
+
+        assertEquals(1, firstTrace.size());
+        assertNotEquals(0, firstTrace.get(0).getSpanId());
+    }
+
+    @Test
+    void testNoParentToCreateNewRootSpan() {
+        Span parentSpan = this.otelTracer.spanBuilder("some-name").startSpan();
+        try (Scope ignoredScope = parentSpan.makeCurrent()) {
+            Span childSpan =
+                    this.otelTracer.spanBuilder("other-name").setNoParent().startSpan();
+            childSpan.end();
+        }
+        parentSpan.end();
+
+        assertTraces(
+                trace(span().root().operationName("internal").resourceName("some-name")),
+                trace(span().root().operationName("internal").resourceName("other-name")));
+    }
+
+    @Test
+    void testAddEvent() {
+        SpanBuilder builder = this.otelTracer.spanBuilder("some-name");
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        timeSource.set(1000);
+        OtelSpanEvent.setTimeSource(timeSource);
+
+        Span result = builder.startSpan();
+        result.addEvent("event");
+        result.end();
+
+        String expectedEventTag =
+                "[" + "{ \"time_unix_nano\": " + timeSource.getCurrentTimeNanos() + ", \"name\": \"event\" }" + "]";
+        assertTraces(trace(span().tags(
+                        defaultTags(),
+                        tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
+                        tag(SPAN_EVENTS, isJson(expectedEventTag)))));
+    }
+
+    static Stream<Arguments> testAddSingleEventArguments() {
+        return Stream.of(
+                arguments("empty attributes", "event1", TIME_MILLIS, MILLISECONDS, Attributes.empty(), null),
+                arguments(
+                        "scalar attributes",
+                        "event2",
+                        TIME_NANO,
+                        NANOSECONDS,
+                        Attributes.builder()
+                                .put("string-key", "string-value")
+                                .put("long-key", 123456789L)
+                                .put("double-key", 1234.5678)
+                                .put("boolean-key-true", true)
+                                .put("boolean-key-false", false)
+                                .build(),
+                        "{\"string-key\": \"string-value\", \"long-key\": 123456789, \"double-key\": 1234.5678, \"boolean-key-true\": true, \"boolean-key-false\": false }"),
+                arguments(
+                        "array attributes",
+                        "event3",
+                        TIME_NANO,
+                        NANOSECONDS,
+                        Attributes.builder()
+                                .put("string-key-array", "string-value1", "string-value2", "string-value3")
+                                .put("long-key-array", 123456L, 1234567L, 12345678L)
+                                .put("double-key-array", 1234.5D, 1234.56D, 1234.567D)
+                                .put("boolean-key-array", true, false, true)
+                                .build(),
+                        "{\"string-key-array\": [ \"string-value1\", \"string-value2\", \"string-value3\" ], \"long-key-array\": [ 123456, 1234567, 12345678 ], \"double-key-array\": [ 1234.5, 1234.56, 1234.567], \"boolean-key-array\": [true, false, true] }"));
+    }
+
+    @ParameterizedTest(name = "[{index}] {0}")
+    @MethodSource("testAddSingleEventArguments")
+    void testAddSingleEvent(
+            String scenario,
+            String name,
+            long timestamp,
+            TimeUnit unit,
+            Attributes attributes,
+            String expectedAttributes) {
+        SpanBuilder builder = this.otelTracer.spanBuilder("some-name");
+        String expectedEventTag = "["
+                + "{ \"time_unix_nano\": "
+                + unit.toNanos(timestamp)
+                + ", \"name\": \""
+                + name
+                + "\""
+                + (expectedAttributes == null ? "" : ", \"attributes\": " + expectedAttributes)
+                + " }"
+                + "]";
+
+        Span result = builder.startSpan();
+        result.addEvent(name, attributes, timestamp, unit);
+        result.end();
+
+        assertTraces(trace(span().tags(
+                        defaultTags(),
+                        tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
+                        tag(SPAN_EVENTS, isJson(expectedEventTag)))));
+    }
+
+    @Test
+    void testAddMultipleSpanEvents() {
+        SpanBuilder builder = this.otelTracer.spanBuilder("some-name");
+
+        Span result = builder.startSpan();
+        result.addEvent("event1", Attributes.empty(), TIME_NANO, NANOSECONDS);
+        result.addEvent(
+                "event2", Attributes.builder().put("string-key", "string-value").build(), TIME_NANO, NANOSECONDS);
+        result.end();
+
+        String expectedEventTag = "["
+                + "{ \"time_unix_nano\": "
+                + TIME_NANO
+                + ", \"name\": \"event1\" },"
+                + "{ \"time_unix_nano\": "
+                + TIME_NANO
+                + ", \"name\": \"event2\", \"attributes\": {\"string-key\": \"string-value\"} }"
+                + "]";
+        assertTraces(trace(span().tags(
+                        defaultTags(),
+                        tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
+                        tag(SPAN_EVENTS, isJson(expectedEventTag)))));
+    }
+
+    @Test
+    void testConcurrentAddEvents() throws Exception {
+        // Regression test: concurrent addEvent calls (e.g. from GraphQL DataLoaders on virtual
+        // threads) used to corrupt unsynchronized backing list, causing NPE on span finish.
+        int threadCount = 8;
+        int eventsPerThread = 2000;
+        Span span = this.otelTracer.spanBuilder("some-name").startSpan();
+
+        CountDownLatch start = new CountDownLatch(1);
+        List<Thread> threads = new ArrayList<>();
+        for (int t = 0; t < threadCount; t++) {
+            Thread thread = new Thread(() -> {
                 try {
-                  start.await();
+                    start.await();
                 } catch (InterruptedException e) {
-                  Thread.currentThread().interrupt();
-                  return;
+                    Thread.currentThread().interrupt();
+                    return;
                 }
                 for (int i = 0; i < eventsPerThread; i++) {
-                  span.addEvent("event");
+                    span.addEvent("event");
                 }
-              });
-      thread.start();
-      threads.add(thread);
+            });
+            thread.start();
+            threads.add(thread);
+        }
+
+        start.countDown();
+        for (Thread thread : threads) {
+            thread.join();
+        }
+        span.end();
+
+        writer.waitForTraces(1);
+        List<DDSpan> firstTrace = writer.firstTrace();
+        assertEquals(1, firstTrace.size());
+        Object eventsTag = firstTrace.get(0).getTags().get(SPAN_EVENTS);
+        JSONArray events = new JSONArray((String) eventsTag);
+        assertEquals(threadCount * eventsPerThread, events.length());
     }
 
-    start.countDown();
-    for (Thread thread : threads) {
-      thread.join();
+    @Test
+    void testSimpleSpanLinks() {
+        String traceId = "1234567890abcdef1234567890abcdef";
+        String spanId = "fedcba0987654321";
+        TraceState traceState =
+                TraceState.builder().put("string-key", "string-value").build();
+
+        String expectedLinksTag = "["
+                + "{ \"trace_id\": \""
+                + traceId
+                + "\", \"span_id\": \""
+                + spanId
+                + "\", \"flags\": 1, \"tracestate\": \"string-key=string-value\" }"
+                + "]";
+
+        Span span = this.otelTracer
+                .spanBuilder("some-name")
+                .addLink(SpanContext.getInvalid())
+                .addLink(SpanContext.create(traceId, spanId, TraceFlags.getSampled(), traceState))
+                .startSpan();
+        span.end();
+
+        assertTraces(trace(span().tags(
+                        defaultTags(),
+                        tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
+                        tag(SPAN_LINKS, isJson(expectedLinksTag)))));
     }
-    span.end();
-
-    writer.waitForTraces(1);
-    List<DDSpan> firstTrace = writer.firstTrace();
-    assertEquals(1, firstTrace.size());
-    Object eventsTag = firstTrace.get(0).getTags().get(SPAN_EVENTS);
-    JSONArray events = new JSONArray((String) eventsTag);
-    assertEquals(threadCount * eventsPerThread, events.length());
-  }
-
-  @Test
-  void testSimpleSpanLinks() {
-    String traceId = "1234567890abcdef1234567890abcdef";
-    String spanId = "fedcba0987654321";
-    TraceState traceState = TraceState.builder().put("string-key", "string-value").build();
-
-    String expectedLinksTag =
-        "["
-            + "{ \"trace_id\": \""
-            + traceId
-            + "\", \"span_id\": \""
-            + spanId
-            + "\", \"flags\": 1, \"tracestate\": \"string-key=string-value\" }"
-            + "]";
-
-    Span span =
-        this.otelTracer
-            .spanBuilder("some-name")
-            .addLink(SpanContext.getInvalid())
-            .addLink(SpanContext.create(traceId, spanId, TraceFlags.getSampled(), traceState))
-            .startSpan();
-    span.end();
-
-    assertTraces(
-        trace(
-            span()
-                .tags(
-                    defaultTags(),
-                    tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
-                    tag(SPAN_LINKS, isJson(expectedLinksTag)))));
-  }
-
-  @Test
-  void testMultipleSpanLinks() {
-    SpanBuilder spanBuilder = this.otelTracer.spanBuilder("some-name");
-
-    List<String> expectedLinks = new ArrayList<>();
-    for (int i = 0; i <= 9; i++) {
-      String traceId = "1234567890abcdef1234567890abcde" + i;
-      String spanId = "fedcba098765432" + i;
-      TraceState traceState = TraceState.builder().put("string-key", "string-value" + i).build();
-      spanBuilder.addLink(SpanContext.create(traceId, spanId, TraceFlags.getSampled(), traceState));
-      expectedLinks.add(
-          "{ \"trace_id\": \""
-              + traceId
-              + "\", \"span_id\": \""
-              + spanId
-              + "\", \"flags\": 1, \"tracestate\": \"string-key=string-value"
-              + i
-              + "\" }");
+
+    @Test
+    void testMultipleSpanLinks() {
+        SpanBuilder spanBuilder = this.otelTracer.spanBuilder("some-name");
+
+        List<String> expectedLinks = new ArrayList<>();
+        for (int i = 0; i <= 9; i++) {
+            String traceId = "1234567890abcdef1234567890abcde" + i;
+            String spanId = "fedcba098765432" + i;
+            TraceState traceState =
+                    TraceState.builder().put("string-key", "string-value" + i).build();
+            spanBuilder.addLink(SpanContext.create(traceId, spanId, TraceFlags.getSampled(), traceState));
+            expectedLinks.add("{ \"trace_id\": \""
+                    + traceId
+                    + "\", \"span_id\": \""
+                    + spanId
+                    + "\", \"flags\": 1, \"tracestate\": \"string-key=string-value"
+                    + i
+                    + "\" }");
+        }
+        spanBuilder.startSpan().end();
+
+        String expectedLinksTag = "[" + join(",", expectedLinks) + "]";
+        assertTraces(trace(span().tags(
+                        defaultTags(),
+                        tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
+                        tag(SPAN_LINKS, isJson(expectedLinksTag)))));
     }
-    spanBuilder.startSpan().end();
 
-    String expectedLinksTag = "[" + join(",", expectedLinks) + "]";
-    assertTraces(
-        trace(
-            span()
-                .tags(
-                    defaultTags(),
-                    tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
-                    tag(SPAN_LINKS, isJson(expectedLinksTag)))));
-  }
-
-  static Stream<Arguments> testSpanLinkAttributesArguments() {
-    return Stream.of(
-        arguments("empty attributes", Attributes.empty(), null),
-        arguments(
-            "scalar attributes",
-            Attributes.builder()
-                .put("string-key", "string-value")
-                .put("long-key", 123456789L)
-                .put("double-key", 1234.5678)
-                .put("boolean-key-true", true)
-                .put("boolean-key-false", false)
-                .build(),
-            "{ \"string-key\": \"string-value\", \"long-key\": \"123456789\", \"double-key\": \"1234.5678\", \"boolean-key-true\": \"true\", \"boolean-key-false\": \"false\" }"),
-        arguments(
-            "array attributes",
-            Attributes.builder()
-                .put("string-key-array", "string-value1", "string-value2", "string-value3")
-                .put("long-key-array", 123456L, 1234567L, 12345678L)
-                .put("double-key-array", 1234.5D, 1234.56D, 1234.567D)
-                .put("boolean-key-array", true, false, true)
-                .build(),
-            "{ \"string-key-array.0\": \"string-value1\", \"string-key-array.1\": \"string-value2\", \"string-key-array.2\": \"string-value3\", \"long-key-array.0\": \"123456\", \"long-key-array.1\": \"1234567\", \"long-key-array.2\": \"12345678\", \"double-key-array.0\": \"1234.5\", \"double-key-array.1\": \"1234.56\", \"double-key-array.2\": \"1234.567\", \"boolean-key-array.0\": \"true\", \"boolean-key-array.1\": \"false\", \"boolean-key-array.2\": \"true\" }"));
-  }
-
-  @ParameterizedTest(name = "[{index}] {0}")
-  @MethodSource("testSpanLinkAttributesArguments")
-  void testSpanLinkAttributes(String scenario, Attributes attributes, String expectedAttributes) {
-    String traceId = "1234567890abcdef1234567890abcdef";
-    String spanId = "fedcba0987654321";
-    TraceState traceState = TraceState.builder().put("string-key", "string-value").build();
-    Span span =
-        this.otelTracer
-            .spanBuilder("some-name")
-            .addLink(
-                SpanContext.create(traceId, spanId, TraceFlags.getSampled(), traceState),
-                attributes)
-            .startSpan();
-    span.end();
-
-    String expectedLinksTag =
-        "["
-            + "{ \"trace_id\": \""
-            + traceId
-            + "\", \"span_id\": \""
-            + spanId
-            + "\", \"flags\": 1, \"tracestate\": \"string-key=string-value\""
-            + (expectedAttributes == null ? "" : ", \"attributes\": " + expectedAttributes)
-            + " }"
-            + "]";
-
-    assertTraces(
-        trace(
-            span()
-                .tags(
-                    defaultTags(),
-                    tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
-                    tag(SPAN_LINKS, isJson(expectedLinksTag)))));
-  }
-
-  static Stream<Arguments> testSpanLinksTraceStateArguments() {
-    return Stream.of(
-        arguments("default trace state", TraceState.getDefault(), null),
-        arguments(
-            "single key-value", TraceState.builder().put("key", "value").build(), "key=value"),
-        arguments(
-            "multiple key-values",
-            TraceState.builder()
-                .put("key1", "value1")
-                .put("key2", "value2")
-                .put("key3", "value3")
-                .put("key4", "value4")
-                .put("key5", "value5")
-                .build(),
-            "key5=value5,key4=value4,key3=value3,key2=value2,key1=value1"));
-  }
-
-  @ParameterizedTest(name = "[{index}] {0}")
-  @MethodSource("testSpanLinksTraceStateArguments")
-  void testSpanLinksTraceState(String scenario, TraceState traceState, String expectedTraceState) {
-    String traceId = "1234567890abcdef1234567890abcdef";
-    String spanId = "fedcba0987654321";
-
-    Span span =
-        this.otelTracer
-            .spanBuilder("some-name")
-            .addLink(SpanContext.create(traceId, spanId, TraceFlags.getSampled(), traceState))
-            .startSpan();
-    span.end();
-
-    String expectedTraceStateJson =
-        expectedTraceState == null ? "" : ", \"tracestate\": \"" + expectedTraceState + "\"";
-    String expectedLinksTag =
-        "["
-            + "{ \"trace_id\": \""
-            + traceId
-            + "\", \"span_id\": \""
-            + spanId
-            + "\", \"flags\": 1"
-            + expectedTraceStateJson
-            + " }"
-            + "]";
-
-    assertTraces(
-        trace(
-            span()
-                .tags(
-                    defaultTags(),
-                    tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
-                    tag(SPAN_LINKS, isJson(expectedLinksTag)))));
-  }
-
-  static Stream<Arguments> testSpanAttributesArguments() {
-    return Stream.of(
-        arguments("builder only", true, false),
-        arguments("builder and span", true, true),
-        arguments("neither", false, false),
-        arguments("span only", false, true));
-  }
-
-  @SuppressWarnings(
-      "DataFlowIssue") // Allow null values on non-null parameters for thorough testing
-  @ParameterizedTest(name = "[{index}] {0}")
-  @MethodSource("testSpanAttributesArguments")
-  void testSpanAttributes(String scenario, boolean tagBuilder, boolean tagSpan) {
-    SpanBuilder builder = this.otelTracer.spanBuilder("some-name");
-    if (tagBuilder) {
-      builder
-          .setAttribute(DDTags.RESOURCE_NAME, "some-resource")
-          .setAttribute("string", "a")
-          .setAttribute("null-string", null)
-          .setAttribute("empty_string", "")
-          .setAttribute("number", 1)
-          .setAttribute("boolean", true)
-          .setAttribute(stringKey("null-string-attribute"), null)
-          .setAttribute(stringKey("empty-string-attribute"), "")
-          .setAttribute(stringArrayKey("string-array"), asList("a", "b", "c"))
-          .setAttribute(booleanArrayKey("boolean-array"), asList(true, false))
-          .setAttribute(longArrayKey("long-array"), asList(1L, 2L, 3L, 4L))
-          .setAttribute(doubleArrayKey("double-array"), asList(1.23D, 4.56D))
-          .setAttribute(stringArrayKey("empty-array"), emptyList())
-          .setAttribute(stringArrayKey("null-array"), null);
+    static Stream<Arguments> testSpanLinkAttributesArguments() {
+        return Stream.of(
+                arguments("empty attributes", Attributes.empty(), null),
+                arguments(
+                        "scalar attributes",
+                        Attributes.builder()
+                                .put("string-key", "string-value")
+                                .put("long-key", 123456789L)
+                                .put("double-key", 1234.5678)
+                                .put("boolean-key-true", true)
+                                .put("boolean-key-false", false)
+                                .build(),
+                        "{ \"string-key\": \"string-value\", \"long-key\": \"123456789\", \"double-key\": \"1234.5678\", \"boolean-key-true\": \"true\", \"boolean-key-false\": \"false\" }"),
+                arguments(
+                        "array attributes",
+                        Attributes.builder()
+                                .put("string-key-array", "string-value1", "string-value2", "string-value3")
+                                .put("long-key-array", 123456L, 1234567L, 12345678L)
+                                .put("double-key-array", 1234.5D, 1234.56D, 1234.567D)
+                                .put("boolean-key-array", true, false, true)
+                                .build(),
+                        "{ \"string-key-array.0\": \"string-value1\", \"string-key-array.1\": \"string-value2\", \"string-key-array.2\": \"string-value3\", \"long-key-array.0\": \"123456\", \"long-key-array.1\": \"1234567\", \"long-key-array.2\": \"12345678\", \"double-key-array.0\": \"1234.5\", \"double-key-array.1\": \"1234.56\", \"double-key-array.2\": \"1234.567\", \"boolean-key-array.0\": \"true\", \"boolean-key-array.1\": \"false\", \"boolean-key-array.2\": \"true\" }"));
     }
-    Span result = builder.startSpan();
-    if (tagSpan) {
-      result.setAttribute(DDTags.RESOURCE_NAME, "other-resource");
-      result.setAttribute("string", "b");
-      result.setAttribute("empty_string", "");
-      result.setAttribute("number", 2);
-      result.setAttribute("boolean", false);
-      result.setAttribute(stringKey("null-string-attribute"), null);
-      result.setAttribute(stringKey("empty-string-attribute"), "");
-      result.setAttribute(stringArrayKey("string-array"), asList("d", "e", "f"));
-      result.setAttribute(booleanArrayKey("boolean-array"), asList(false, true));
-      result.setAttribute(longArrayKey("long-array"), asList(5L, 6L, 7L, 8L));
-      result.setAttribute(doubleArrayKey("double-array"), asList(2.34D, 5.67D));
-      result.setAttribute(stringArrayKey("empty-array"), emptyList());
-      result.setAttribute(stringArrayKey("null-array"), null);
+
+    @ParameterizedTest(name = "[{index}] {0}")
+    @MethodSource("testSpanLinkAttributesArguments")
+    void testSpanLinkAttributes(String scenario, Attributes attributes, String expectedAttributes) {
+        String traceId = "1234567890abcdef1234567890abcdef";
+        String spanId = "fedcba0987654321";
+        TraceState traceState =
+                TraceState.builder().put("string-key", "string-value").build();
+        Span span = this.otelTracer
+                .spanBuilder("some-name")
+                .addLink(SpanContext.create(traceId, spanId, TraceFlags.getSampled(), traceState), attributes)
+                .startSpan();
+        span.end();
+
+        String expectedLinksTag = "["
+                + "{ \"trace_id\": \""
+                + traceId
+                + "\", \"span_id\": \""
+                + spanId
+                + "\", \"flags\": 1, \"tracestate\": \"string-key=string-value\""
+                + (expectedAttributes == null ? "" : ", \"attributes\": " + expectedAttributes)
+                + " }"
+                + "]";
+
+        assertTraces(trace(span().tags(
+                        defaultTags(),
+                        tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
+                        tag(SPAN_LINKS, isJson(expectedLinksTag)))));
     }
 
-    result.end();
+    static Stream<Arguments> testSpanLinksTraceStateArguments() {
+        return Stream.of(
+                arguments("default trace state", TraceState.getDefault(), null),
+                arguments(
+                        "single key-value",
+                        TraceState.builder().put("key", "value").build(),
+                        "key=value"),
+                arguments(
+                        "multiple key-values",
+                        TraceState.builder()
+                                .put("key1", "value1")
+                                .put("key2", "value2")
+                                .put("key3", "value3")
+                                .put("key4", "value4")
+                                .put("key5", "value5")
+                                .build(),
+                        "key5=value5,key4=value4,key3=value3,key2=value2,key1=value1"));
+    }
 
-    String expectedResource;
-    if (tagSpan) {
-      expectedResource = "other-resource";
-    } else if (tagBuilder) {
-      expectedResource = "some-resource";
-    } else {
-      expectedResource = "some-name";
+    @ParameterizedTest(name = "[{index}] {0}")
+    @MethodSource("testSpanLinksTraceStateArguments")
+    void testSpanLinksTraceState(String scenario, TraceState traceState, String expectedTraceState) {
+        String traceId = "1234567890abcdef1234567890abcdef";
+        String spanId = "fedcba0987654321";
+
+        Span span = this.otelTracer
+                .spanBuilder("some-name")
+                .addLink(SpanContext.create(traceId, spanId, TraceFlags.getSampled(), traceState))
+                .startSpan();
+        span.end();
+
+        String expectedTraceStateJson =
+                expectedTraceState == null ? "" : ", \"tracestate\": \"" + expectedTraceState + "\"";
+        String expectedLinksTag = "["
+                + "{ \"trace_id\": \""
+                + traceId
+                + "\", \"span_id\": \""
+                + spanId
+                + "\", \"flags\": 1"
+                + expectedTraceStateJson
+                + " }"
+                + "]";
+
+        assertTraces(trace(span().tags(
+                        defaultTags(),
+                        tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
+                        tag(SPAN_LINKS, isJson(expectedLinksTag)))));
     }
 
-    TagsMatcher[] tagsMatchers;
-    if (tagSpan) {
-      tagsMatchers =
-          new TagsMatcher[] {
-            defaultTags(),
-            tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
-            tag("string", is("b")),
-            tag("empty_string", is("")),
-            tag("number", is(2L)),
-            tag("boolean", is(false)),
-            tag("empty-string-attribute", is("")),
-            tag("string-array.0", is("d")),
-            tag("string-array.1", is("e")),
-            tag("string-array.2", is("f")),
-            tag("boolean-array.0", is(false)),
-            tag("boolean-array.1", is(true)),
-            tag("long-array.0", is(5L)),
-            tag("long-array.1", is(6L)),
-            tag("long-array.2", is(7L)),
-            tag("long-array.3", is(8L)),
-            tag("double-array.0", is(2.34D)),
-            tag("double-array.1", is(5.67D)),
-            tag("empty-array", is(""))
-          };
-    } else if (tagBuilder) {
-      tagsMatchers =
-          new TagsMatcher[] {
-            defaultTags(),
-            tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
-            tag("string", is("a")),
-            tag("empty_string", is("")),
-            tag("number", is(1L)),
-            tag("boolean", is(true)),
-            tag("empty-string-attribute", is("")),
-            tag("string-array.0", is("a")),
-            tag("string-array.1", is("b")),
-            tag("string-array.2", is("c")),
-            tag("boolean-array.0", is(true)),
-            tag("boolean-array.1", is(false)),
-            tag("long-array.0", is(1L)),
-            tag("long-array.1", is(2L)),
-            tag("long-array.2", is(3L)),
-            tag("long-array.3", is(4L)),
-            tag("double-array.0", is(1.23D)),
-            tag("double-array.1", is(4.56D)),
-            tag("empty-array", is(""))
-          };
-    } else {
-      tagsMatchers = new TagsMatcher[] {defaultTags(), tag(SPAN_KIND, is(SPAN_KIND_INTERNAL))};
+    static Stream<Arguments> testSpanAttributesArguments() {
+        return Stream.of(
+                arguments("builder only", true, false),
+                arguments("builder and span", true, true),
+                arguments("neither", false, false),
+                arguments("span only", false, true));
     }
 
-    assertTraces(
-        trace(
-            span()
-                .root()
+    @SuppressWarnings("DataFlowIssue") // Allow null values on non-null parameters for thorough testing
+    @ParameterizedTest(name = "[{index}] {0}")
+    @MethodSource("testSpanAttributesArguments")
+    void testSpanAttributes(String scenario, boolean tagBuilder, boolean tagSpan) {
+        SpanBuilder builder = this.otelTracer.spanBuilder("some-name");
+        if (tagBuilder) {
+            builder.setAttribute(DDTags.RESOURCE_NAME, "some-resource")
+                    .setAttribute("string", "a")
+                    .setAttribute("null-string", null)
+                    .setAttribute("empty_string", "")
+                    .setAttribute("number", 1)
+                    .setAttribute("boolean", true)
+                    .setAttribute(stringKey("null-string-attribute"), null)
+                    .setAttribute(stringKey("empty-string-attribute"), "")
+                    .setAttribute(stringArrayKey("string-array"), asList("a", "b", "c"))
+                    .setAttribute(booleanArrayKey("boolean-array"), asList(true, false))
+                    .setAttribute(longArrayKey("long-array"), asList(1L, 2L, 3L, 4L))
+                    .setAttribute(doubleArrayKey("double-array"), asList(1.23D, 4.56D))
+                    .setAttribute(stringArrayKey("empty-array"), emptyList())
+                    .setAttribute(stringArrayKey("null-array"), null);
+        }
+        Span result = builder.startSpan();
+        if (tagSpan) {
+            result.setAttribute(DDTags.RESOURCE_NAME, "other-resource");
+            result.setAttribute("string", "b");
+            result.setAttribute("empty_string", "");
+            result.setAttribute("number", 2);
+            result.setAttribute("boolean", false);
+            result.setAttribute(stringKey("null-string-attribute"), null);
+            result.setAttribute(stringKey("empty-string-attribute"), "");
+            result.setAttribute(stringArrayKey("string-array"), asList("d", "e", "f"));
+            result.setAttribute(booleanArrayKey("boolean-array"), asList(false, true));
+            result.setAttribute(longArrayKey("long-array"), asList(5L, 6L, 7L, 8L));
+            result.setAttribute(doubleArrayKey("double-array"), asList(2.34D, 5.67D));
+            result.setAttribute(stringArrayKey("empty-array"), emptyList());
+            result.setAttribute(stringArrayKey("null-array"), null);
+        }
+
+        result.end();
+
+        String expectedResource;
+        if (tagSpan) {
+            expectedResource = "other-resource";
+        } else if (tagBuilder) {
+            expectedResource = "some-resource";
+        } else {
+            expectedResource = "some-name";
+        }
+
+        TagsMatcher[] tagsMatchers;
+        if (tagSpan) {
+            tagsMatchers = new TagsMatcher[] {
+                defaultTags(),
+                tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
+                tag("string", is("b")),
+                tag("empty_string", is("")),
+                tag("number", is(2L)),
+                tag("boolean", is(false)),
+                tag("empty-string-attribute", is("")),
+                tag("string-array.0", is("d")),
+                tag("string-array.1", is("e")),
+                tag("string-array.2", is("f")),
+                tag("boolean-array.0", is(false)),
+                tag("boolean-array.1", is(true)),
+                tag("long-array.0", is(5L)),
+                tag("long-array.1", is(6L)),
+                tag("long-array.2", is(7L)),
+                tag("long-array.3", is(8L)),
+                tag("double-array.0", is(2.34D)),
+                tag("double-array.1", is(5.67D)),
+                tag("empty-array", is(""))
+            };
+        } else if (tagBuilder) {
+            tagsMatchers = new TagsMatcher[] {
+                defaultTags(),
+                tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
+                tag("string", is("a")),
+                tag("empty_string", is("")),
+                tag("number", is(1L)),
+                tag("boolean", is(true)),
+                tag("empty-string-attribute", is("")),
+                tag("string-array.0", is("a")),
+                tag("string-array.1", is("b")),
+                tag("string-array.2", is("c")),
+                tag("boolean-array.0", is(true)),
+                tag("boolean-array.1", is(false)),
+                tag("long-array.0", is(1L)),
+                tag("long-array.1", is(2L)),
+                tag("long-array.2", is(3L)),
+                tag("long-array.3", is(4L)),
+                tag("double-array.0", is(1.23D)),
+                tag("double-array.1", is(4.56D)),
+                tag("empty-array", is(""))
+            };
+        } else {
+            tagsMatchers = new TagsMatcher[] {defaultTags(), tag(SPAN_KIND, is(SPAN_KIND_INTERNAL))};
+        }
+
+        assertTraces(trace(span().root()
                 .operationName("internal")
                 .resourceName(expectedResource)
                 .error(false)
                 .tags(tagsMatchers)));
-  }
-
-  @Test
-  void testIntegrationName() throws Exception {
-    Span span = this.otelTracer.spanBuilder("some-name").startSpan();
-    span.end();
-
-    writer.waitForTraces(1);
-    DDSpan ddSpan = writer.firstTrace().get(0);
-    assertEquals("otel", ddSpan.spanContext().getIntegrationName().toString());
-  }
-
-  static Stream<Arguments> testSpanKindsArguments() {
-    return Stream.of(
-        arguments(INTERNAL, SPAN_KIND_INTERNAL),
-        arguments(SERVER, SPAN_KIND_SERVER),
-        arguments(CLIENT, SPAN_KIND_CLIENT),
-        arguments(PRODUCER, SPAN_KIND_PRODUCER),
-        arguments(CONSUMER, SPAN_KIND_CONSUMER));
-  }
-
-  @ParameterizedTest(name = "[{index}] {0}")
-  @MethodSource("testSpanKindsArguments")
-  void testSpanKinds(SpanKind otelSpanKind, String tagSpanKind) {
-    this.otelTracer.spanBuilder("some-name").setSpanKind(otelSpanKind).startSpan().end();
-
-    assertTraces(trace(span().tags(defaultTags(), tag(SPAN_KIND, is(tagSpanKind)))));
-  }
-
-  @Test
-  void testSpanErrorStatus() {
-    Span result = this.otelTracer.spanBuilder("some-name").startSpan();
-    result.setStatus(ERROR, "some-error");
-    result.end();
-
-    assertTraces(
-        trace(
-            span()
-                .root()
+    }
+
+    @Test
+    void testIntegrationName() throws Exception {
+        Span span = this.otelTracer.spanBuilder("some-name").startSpan();
+        span.end();
+
+        writer.waitForTraces(1);
+        DDSpan ddSpan = writer.firstTrace().get(0);
+        assertEquals("otel", ddSpan.spanContext().getIntegrationName().toString());
+    }
+
+    static Stream<Arguments> testSpanKindsArguments() {
+        return Stream.of(
+                arguments(INTERNAL, SPAN_KIND_INTERNAL),
+                arguments(SERVER, SPAN_KIND_SERVER),
+                arguments(CLIENT, SPAN_KIND_CLIENT),
+                arguments(PRODUCER, SPAN_KIND_PRODUCER),
+                arguments(CONSUMER, SPAN_KIND_CONSUMER));
+    }
+
+    @ParameterizedTest(name = "[{index}] {0}")
+    @MethodSource("testSpanKindsArguments")
+    void testSpanKinds(SpanKind otelSpanKind, String tagSpanKind) {
+        this.otelTracer
+                .spanBuilder("some-name")
+                .setSpanKind(otelSpanKind)
+                .startSpan()
+                .end();
+
+        assertTraces(trace(span().tags(defaultTags(), tag(SPAN_KIND, is(tagSpanKind)))));
+    }
+
+    @Test
+    void testSpanErrorStatus() {
+        Span result = this.otelTracer.spanBuilder("some-name").startSpan();
+        result.setStatus(ERROR, "some-error");
+        result.end();
+
+        assertTraces(trace(span().root()
                 .operationName("internal")
                 .resourceName("some-name")
                 .error(true)
-                .tags(
-                    defaultTags(),
-                    tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
-                    tag(ERROR_MSG, is("some-error")))));
-  }
-
-  @Test
-  void testSpanStatusTransition() {
-    Span result = this.otelTracer.spanBuilder("some-name").startSpan();
-    DDSpan delegate = getDDSpan(result);
-
-    // UNSET
-    result.setStatus(UNSET);
-    assertFalse(delegate.isError());
-    assertNull(delegate.getTag(ERROR_MSG));
-
-    // ERROR
-    result.setStatus(ERROR, "some error");
-    assertTrue(delegate.isError());
-    assertEquals("some error", delegate.getTag(ERROR_MSG));
-
-    // UNSET after ERROR (should not clear error)
-    result.setStatus(UNSET);
-    assertTrue(delegate.isError());
-    assertEquals("some error", delegate.getTag(ERROR_MSG));
-
-    // OK (should clear error)
-    result.setStatus(OK);
-    assertFalse(delegate.isError());
-    assertNull(delegate.getTag(ERROR_MSG));
-
-    result.end();
-
-    assertTraces(
-        trace(
-            span()
-                .root()
+                .tags(defaultTags(), tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)), tag(ERROR_MSG, is("some-error")))));
+    }
+
+    @Test
+    void testSpanStatusTransition() {
+        Span result = this.otelTracer.spanBuilder("some-name").startSpan();
+        DDSpan delegate = getDDSpan(result);
+
+        // UNSET
+        result.setStatus(UNSET);
+        assertFalse(delegate.isError());
+        assertNull(delegate.getTag(ERROR_MSG));
+
+        // ERROR
+        result.setStatus(ERROR, "some error");
+        assertTrue(delegate.isError());
+        assertEquals("some error", delegate.getTag(ERROR_MSG));
+
+        // UNSET after ERROR (should not clear error)
+        result.setStatus(UNSET);
+        assertTrue(delegate.isError());
+        assertEquals("some error", delegate.getTag(ERROR_MSG));
+
+        // OK (should clear error)
+        result.setStatus(OK);
+        assertFalse(delegate.isError());
+        assertNull(delegate.getTag(ERROR_MSG));
+
+        result.end();
+
+        assertTraces(trace(span().root()
                 .operationName("internal")
                 .resourceName("some-name")
                 .error(false)
                 .tags(defaultTags(), tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)))));
-  }
-
-  static Stream<Arguments> testSpanRecordExceptionArguments() {
-    return Stream.of(
-        arguments(
-            "basic exception",
-            new NullPointerException("Null pointer"),
-            Attributes.empty(),
-            null,
-            null,
-            null,
-            null),
-        arguments(
-            "overridden message",
-            new NumberFormatException("Number format exception"),
-            Attributes.builder().put("exception.message", "something-else").build(),
-            "something-else",
-            null,
-            null,
-            null),
-        arguments(
-            "overridden type",
-            new NullPointerException("Null pointer"),
-            Attributes.builder().put("exception.type", "CustomType").build(),
-            null,
-            "CustomType",
-            null,
-            null),
-        arguments(
-            "overridden stacktrace",
-            new NullPointerException("Null pointer"),
-            Attributes.builder().put("exception.stacktrace", "CustomTrace").build(),
-            null,
-            null,
-            "CustomTrace",
-            null),
-        arguments(
-            "extra attributes",
-            new NullPointerException("Null pointer"),
-            Attributes.builder().put("key", "value").build(),
-            null,
-            null,
-            null,
-            ", \"key\": \"value\""));
-  }
-
-  @ParameterizedTest(name = "[{index}] {0}")
-  @MethodSource("testSpanRecordExceptionArguments")
-  void testSpanRecordException(
-      String scenario,
-      Exception exception,
-      Attributes attributes,
-      String overriddenMessage,
-      String overriddenType,
-      String overriddenStacktrace,
-      String extraJson) {
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    timeSource.set(1000);
-    OtelSpanEvent.setTimeSource(timeSource);
-
-    Span result = this.otelTracer.spanBuilder("some-name").startSpan();
-    result.recordException(exception, attributes);
-    result.end();
-
-    String errorMessage = overriddenMessage != null ? overriddenMessage : exception.getMessage();
-    String errorType = overriddenType != null ? overriddenType : exception.getClass().getName();
-    String errorStackTrace =
-        overriddenStacktrace != null ? overriddenStacktrace : stringifyErrorStack(exception);
-    String expectedAttributes =
-        "{"
-            + "\"exception.message\": \""
-            + errorMessage
-            + "\", \"exception.type\": \""
-            + errorType
-            + "\", \"exception.stacktrace\": \""
-            + errorStackTrace
-            + "\""
-            + (extraJson != null ? extraJson : "")
-            + "}";
-
-    String expectedEventTag =
-        "["
-            + "{ \"time_unix_nano\": "
-            + timeSource.getCurrentTimeNanos()
-            + ", \"name\": \"exception\", \"attributes\": "
-            + expectedAttributes
-            + " }"
-            + "]";
-
-    assertTraces(
-        trace(
-            span()
-                .root()
+    }
+
+    static Stream<Arguments> testSpanRecordExceptionArguments() {
+        return Stream.of(
+                arguments(
+                        "basic exception",
+                        new NullPointerException("Null pointer"),
+                        Attributes.empty(),
+                        null,
+                        null,
+                        null,
+                        null),
+                arguments(
+                        "overridden message",
+                        new NumberFormatException("Number format exception"),
+                        Attributes.builder()
+                                .put("exception.message", "something-else")
+                                .build(),
+                        "something-else",
+                        null,
+                        null,
+                        null),
+                arguments(
+                        "overridden type",
+                        new NullPointerException("Null pointer"),
+                        Attributes.builder().put("exception.type", "CustomType").build(),
+                        null,
+                        "CustomType",
+                        null,
+                        null),
+                arguments(
+                        "overridden stacktrace",
+                        new NullPointerException("Null pointer"),
+                        Attributes.builder()
+                                .put("exception.stacktrace", "CustomTrace")
+                                .build(),
+                        null,
+                        null,
+                        "CustomTrace",
+                        null),
+                arguments(
+                        "extra attributes",
+                        new NullPointerException("Null pointer"),
+                        Attributes.builder().put("key", "value").build(),
+                        null,
+                        null,
+                        null,
+                        ", \"key\": \"value\""));
+    }
+
+    @ParameterizedTest(name = "[{index}] {0}")
+    @MethodSource("testSpanRecordExceptionArguments")
+    void testSpanRecordException(
+            String scenario,
+            Exception exception,
+            Attributes attributes,
+            String overriddenMessage,
+            String overriddenType,
+            String overriddenStacktrace,
+            String extraJson) {
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        timeSource.set(1000);
+        OtelSpanEvent.setTimeSource(timeSource);
+
+        Span result = this.otelTracer.spanBuilder("some-name").startSpan();
+        result.recordException(exception, attributes);
+        result.end();
+
+        String errorMessage = overriddenMessage != null ? overriddenMessage : exception.getMessage();
+        String errorType =
+                overriddenType != null ? overriddenType : exception.getClass().getName();
+        String errorStackTrace = overriddenStacktrace != null ? overriddenStacktrace : stringifyErrorStack(exception);
+        String expectedAttributes = "{"
+                + "\"exception.message\": \""
+                + errorMessage
+                + "\", \"exception.type\": \""
+                + errorType
+                + "\", \"exception.stacktrace\": \""
+                + errorStackTrace
+                + "\""
+                + (extraJson != null ? extraJson : "")
+                + "}";
+
+        String expectedEventTag = "["
+                + "{ \"time_unix_nano\": "
+                + timeSource.getCurrentTimeNanos()
+                + ", \"name\": \"exception\", \"attributes\": "
+                + expectedAttributes
+                + " }"
+                + "]";
+
+        assertTraces(trace(span().root()
                 .operationName("internal")
                 .resourceName("some-name")
                 .error(false)
                 .tags(
-                    defaultTags(),
-                    tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
-                    tag(SPAN_EVENTS, isJson(expectedEventTag)),
-                    tag(ERROR_MSG, is(errorMessage)),
-                    tag(ERROR_TYPE, is(errorType)),
-                    tag(ERROR_STACK, is(errorStackTrace)))));
-  }
-
-  @Test
-  void testSpanErrorReflectLastException() {
-    Span span = this.otelTracer.spanBuilder("some-name").startSpan();
-    NullPointerException firstException = new NullPointerException("Null pointer");
-    NumberFormatException lastException = new NumberFormatException("Number format exception");
-
-    span.recordException(firstException);
-    span.recordException(lastException);
-    span.end();
-
-    assertTraces(
-        trace(
-            span()
-                .root()
+                        defaultTags(),
+                        tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
+                        tag(SPAN_EVENTS, isJson(expectedEventTag)),
+                        tag(ERROR_MSG, is(errorMessage)),
+                        tag(ERROR_TYPE, is(errorType)),
+                        tag(ERROR_STACK, is(errorStackTrace)))));
+    }
+
+    @Test
+    void testSpanErrorReflectLastException() {
+        Span span = this.otelTracer.spanBuilder("some-name").startSpan();
+        NullPointerException firstException = new NullPointerException("Null pointer");
+        NumberFormatException lastException = new NumberFormatException("Number format exception");
+
+        span.recordException(firstException);
+        span.recordException(lastException);
+        span.end();
+
+        assertTraces(trace(span().root()
                 .operationName("internal")
                 .resourceName("some-name")
                 .error(false)
                 .tags(
-                    defaultTags(),
-                    tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
-                    tag(SPAN_EVENTS, any()),
-                    tag(ERROR_MSG, is(lastException.getMessage())),
-                    tag(ERROR_TYPE, is(lastException.getClass().getName())),
-                    tag(ERROR_STACK, is(stringifyErrorStack(lastException))))));
-  }
-
-  @Test
-  void testSpanNameUpdate() {
-    Span result = this.otelTracer.spanBuilder("some-name").setSpanKind(SERVER).startSpan();
-    DDSpan delegate = getDDSpan(result);
-
-    assertEquals(SPAN_KIND_INTERNAL, delegate.getOperationName().toString());
-    assertEquals("some-name", delegate.getResourceName().toString());
-
-    result.updateName("other-name");
-
-    assertEquals(SPAN_KIND_INTERNAL, delegate.getOperationName().toString());
-    assertEquals("other-name", delegate.getResourceName().toString());
-
-    result.end();
-
-    assertTraces(trace(span().root().operationName("server.request").resourceName("other-name")));
-  }
-
-  @Test
-  void testSpanUpdateAfterEnd() {
-    Span result = this.otelTracer.spanBuilder("some-name").startSpan();
-
-    result.setAttribute("string", "value");
-    result.setStatus(ERROR);
-    result.end();
-    result.updateName("other-name");
-    result.setAttribute("string", "other-value");
-    result.setStatus(OK);
-    result.addEvent("event");
-    result.recordException(new Throwable());
-
-    assertTraces(
-        trace(
-            span()
-                .root()
+                        defaultTags(),
+                        tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
+                        tag(SPAN_EVENTS, any()),
+                        tag(ERROR_MSG, is(lastException.getMessage())),
+                        tag(ERROR_TYPE, is(lastException.getClass().getName())),
+                        tag(ERROR_STACK, is(stringifyErrorStack(lastException))))));
+    }
+
+    @Test
+    void testSpanNameUpdate() {
+        Span result =
+                this.otelTracer.spanBuilder("some-name").setSpanKind(SERVER).startSpan();
+        DDSpan delegate = getDDSpan(result);
+
+        assertEquals(SPAN_KIND_INTERNAL, delegate.getOperationName().toString());
+        assertEquals("some-name", delegate.getResourceName().toString());
+
+        result.updateName("other-name");
+
+        assertEquals(SPAN_KIND_INTERNAL, delegate.getOperationName().toString());
+        assertEquals("other-name", delegate.getResourceName().toString());
+
+        result.end();
+
+        assertTraces(trace(span().root().operationName("server.request").resourceName("other-name")));
+    }
+
+    @Test
+    void testSpanUpdateAfterEnd() {
+        Span result = this.otelTracer.spanBuilder("some-name").startSpan();
+
+        result.setAttribute("string", "value");
+        result.setStatus(ERROR);
+        result.end();
+        result.updateName("other-name");
+        result.setAttribute("string", "other-value");
+        result.setStatus(OK);
+        result.addEvent("event");
+        result.recordException(new Throwable());
+
+        assertTraces(trace(span().root()
                 .operationName("internal")
                 .resourceName("some-name")
                 .error(true)
-                .tags(
-                    defaultTags(),
-                    tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)),
-                    tag("string", is("value")))));
-  }
-
-  private static DDSpan getDDSpan(Span span) {
-    return (DDSpan) ((WithAgentSpan) span).asAgentSpan();
-  }
-
-  private static Matcher<String> isJson(String expected) {
-    return Matchers.validates(
-        s -> {
-          try {
-            JSONAssert.assertEquals(expected, s, true);
-            return true;
-          } catch (JSONException e) {
-            return false;
-          }
+                .tags(defaultTags(), tag(SPAN_KIND, is(SPAN_KIND_INTERNAL)), tag("string", is("value")))));
+    }
+
+    private static DDSpan getDDSpan(Span span) {
+        return (DDSpan) ((WithAgentSpan) span).asAgentSpan();
+    }
+
+    private static Matcher<String> isJson(String expected) {
+        return Matchers.validates(s -> {
+            try {
+                JSONAssert.assertEquals(expected, s, true);
+                return true;
+            } catch (JSONException e) {
+                return false;
+            }
         });
-  }
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/ContextTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/ContextTest.java
index a644feebb02..1956bbf4a6c 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/ContextTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/ContextTest.java
@@ -25,382 +25,381 @@
 
 public class ContextTest extends AbstractOpenTelemetry14Test {
 
-  @DisplayName("test Span.current/makeCurrent()")
-  @Test
-  void testSpanCurrentMakeCurrent() {
-    Span otelSpan = this.otelTracer.spanBuilder("some-name").startSpan();
-
-    // Before making current: current span must be invalid or null
-    Span currentSpan = Span.current();
-    Span currentSpanFromContext = Span.fromContext(Context.current());
-    Span currentSpanFromContextOrNull = Span.fromContextOrNull(Context.current());
-
-    assertNotNull(currentSpan);
-    assertFalse(currentSpan.getSpanContext().isValid());
-    assertNotNull(currentSpanFromContext);
-    assertFalse(currentSpanFromContext.getSpanContext().isValid());
-    assertNull(currentSpanFromContextOrNull);
-
-    // After making current: OTel span must be current span
-    Scope scope = otelSpan.makeCurrent();
-    currentSpan = Span.current();
-    currentSpanFromContext = Span.fromContext(Context.current());
-    currentSpanFromContextOrNull = Span.fromContextOrNull(Context.current());
-
-    assertEquals(otelSpan, currentSpan);
-    assertEquals(otelSpan, currentSpanFromContext);
-    assertEquals(otelSpan, currentSpanFromContextOrNull);
-
-    // After activating DD span: Datadog span must be current span
-    AgentSpan ddSpan = tracer.startSpan("dd-api", "other-name");
-    ContextScope ddScope = tracer.activateManualSpan(ddSpan);
-    currentSpan = Span.current();
-
-    assertSpanEquals(ddSpan, currentSpan);
-
-    // Cleanup
-    ddScope.close();
-    ddSpan.finish();
-    scope.close();
-    otelSpan.end();
-  }
-
-  @DisplayName("test Context.makeCurrent() to activate a span without prior active span")
-  @Test
-  void testContextMakeCurrentWithoutPriorActiveSpan() {
-    Span otelSpan = this.otelTracer.spanBuilder("some-name").startSpan();
-
-    // No active span: current span is invalid
-    Span currentSpan = Span.current();
-    assertNotNull(currentSpan);
-    assertFalse(currentSpan.getSpanContext().isValid());
-
-    // Make OTel span current via context
-    Context contextWithSpan = Context.current().with(otelSpan);
-    Scope scope = contextWithSpan.makeCurrent();
-    currentSpan = Span.current();
-    assertEquals(otelSpan, currentSpan);
-
-    // After closing scope: current span is invalid again
-    scope.close();
-    currentSpan = Span.current();
-    assertNotNull(currentSpan);
-    assertFalse(currentSpan.getSpanContext().isValid());
-
-    // Cleanup
-    otelSpan.end();
-  }
-
-  @DisplayName("test Context.makeCurrent() to activate a span with another currently active span")
-  @Test
-  void testContextMakeCurrentWithAnotherActiveSpan() {
-    AgentSpan ddSpan = tracer.startSpan("dd-api", "some-name");
-    ContextScope ddScope = tracer.activateManualSpan(ddSpan);
-    Span otelSpan = this.otelTracer.spanBuilder("other-name").startSpan();
-
-    // DD span is active: current OTel span reflects DD span
-    Span currentSpan = Span.current();
-    assertNotNull(currentSpan);
-    assertSpanEquals(ddSpan, currentSpan);
-
-    // Make OTel span current via context
-    Context contextWithSpan = Context.current().with(otelSpan);
-    Scope scope = contextWithSpan.makeCurrent();
-    currentSpan = Span.current();
-    assertEquals(otelSpan, currentSpan);
-
-    // After closing scope: DD span is active again
-    scope.close();
-    currentSpan = Span.current();
-    assertNotNull(currentSpan);
-    assertSpanEquals(ddSpan, currentSpan);
-
-    // Cleanup
-    otelSpan.end();
-    ddScope.close();
-    ddSpan.finish();
-  }
-
-  @DisplayName("test Context.makeCurrent() to activate an already active span")
-  @Test
-  void testContextMakeCurrentAlreadyActiveSpan() {
-    AgentSpan ddSpan = tracer.startSpan("dd-api", "some-name");
-    ContextScope ddScope = tracer.activateManualSpan(ddSpan);
-    Span currentSpan = Span.current();
-
-    assertNotNull(currentSpan);
-    assertSpanEquals(ddSpan, currentSpan);
-
-    // Make the already-current span current again via context
-    Context contextWithSpan = Context.current().with(currentSpan);
-    Scope scope = contextWithSpan.makeCurrent();
-    currentSpan = Span.current();
-
-    assertNotNull(currentSpan);
-    assertSpanEquals(ddSpan, currentSpan);
-
-    // After closing scope: still same DD span
-    scope.close();
-    currentSpan = Span.current();
-
-    assertNotNull(currentSpan);
-    assertSpanEquals(ddSpan, currentSpan);
-
-    // After closing DD scope and finishing: no valid span
-    ddScope.close();
-    ddSpan.finish();
-    currentSpan = Span.current();
-
-    assertNotNull(currentSpan);
-    assertFalse(currentSpan.getSpanContext().isValid());
-  }
-
-  @DisplayName("test clearing context")
-  @Test
-  void testClearingContext() {
-    Scope rootScope = Context.root().makeCurrent();
-    assertEquals(Context.root(), Context.current());
-    rootScope.close();
-  }
-
-  @DisplayName("test mixing manual and OTel instrumentation")
-  @Test
-  void testMixingManualAndOtelInstrumentation() {
-    Span otelParentSpan = this.otelTracer.spanBuilder("some-name").startSpan();
-
-    // Activate OTel parent span and verify DD active span
-    Scope otelParentScope = otelParentSpan.makeCurrent();
-    AgentSpan activeSpan = tracer.activeSpan();
-
-    assertEquals("internal", activeSpan.getOperationName().toString());
-    assertEquals("some-name", activeSpan.getResourceName().toString());
-    assertEquals(
-        DDSpanId.toHexStringPadded(activeSpan.getSpanId()),
-        otelParentSpan.getSpanContext().getSpanId());
-
-    // Activate DD child span and verify OTel current span
-    AgentSpan ddChildSpan = tracer.startSpan("dd-api", "other-name");
-    ContextScope ddChildScope = tracer.activateManualSpan(ddChildSpan);
-    Span current = Span.current();
-
-    assertEquals(
-        DDSpanId.toHexStringPadded(ddChildSpan.getSpanId()), current.getSpanContext().getSpanId());
-
-    // Activate OTel grandchild span and verify DD active span
-    Span otelGrandChildSpan = this.otelTracer.spanBuilder("another-name").startSpan();
-    Scope otelGrandChildScope = otelGrandChildSpan.makeCurrent();
-    activeSpan = tracer.activeSpan();
-
-    assertEquals("internal", activeSpan.getOperationName().toString());
-    assertEquals("another-name", activeSpan.getResourceName().toString());
-    assertEquals(
-        DDSpanId.toHexStringPadded(activeSpan.getSpanId()),
-        otelGrandChildSpan.getSpanContext().getSpanId());
-
-    // Close everything and verify trace structure
-    otelGrandChildScope.close();
-    otelGrandChildSpan.end();
-    ddChildScope.close();
-    ddChildSpan.finish();
-    otelParentScope.close();
-    otelParentSpan.end();
-
-    assertTraces(
-        trace(
-            span().root().operationName("internal").resourceName("some-name"),
-            span().childOfPrevious().operationName("other-name"),
-            span().childOfPrevious().operationName("internal").resourceName("another-name")));
-  }
-
-  @DisplayName("test context spans retrieval")
-  @Test
-  void testContextSpansRetrieval() {
-    Span parentSpan = this.otelTracer.spanBuilder("some-name").startSpan();
-    Scope parentScope = parentSpan.makeCurrent();
-    ContextKey<Span> currentSpanKey = ContextKey.named("opentelemetry-trace-span-key");
-    ContextKey<Span> rootSpanKey = ContextKey.named("opentelemetry-traces-local-root-span");
-
-    // After activating parent: both current and root span keys point to parent
-    Context currentContext = Context.current();
-    assertEquals(parentSpan, currentContext.get(currentSpanKey));
-    assertEquals(parentSpan, currentContext.get(rootSpanKey));
-
-    // After activating child: current span key points to child, root span key still points to
-    // parent
-    Span childSpan = this.otelTracer.spanBuilder("other-name").startSpan();
-    Scope childScope = childSpan.makeCurrent();
-    currentContext = Context.current();
-
-    assertEquals(childSpan, currentContext.get(currentSpanKey));
-    assertEquals(parentSpan, currentContext.get(rootSpanKey));
-
-    // After closing child: back to parent for both keys
-    childScope.close();
-    childSpan.end();
-    currentContext = Context.current();
-
-    assertEquals(parentSpan, currentContext.get(currentSpanKey));
-    assertEquals(parentSpan, currentContext.get(rootSpanKey));
-
-    // Cleanup
-    parentScope.close();
-    parentSpan.end();
-  }
-
-  @DisplayName("test custom object storage")
-  @Test
-  void testCustomObjectStorage() {
-    Context context = Context.root();
-    Context originalContext = context;
-    CustomData data1 = new CustomData();
-    CustomData data2 = new CustomData();
-
-    // Store custom data1
-    context = context.with(data1);
-    assertEquals(data1, CustomData.fromContext(context));
-    assertNull(CustomData.fromContext(originalContext));
-
-    // Replace with custom data2
-    context = context.with(data2);
-    assertEquals(data2, CustomData.fromContext(context));
-
-    // Remove custom data
-    context = context.with(CustomData.KEY, null);
-    assertNull(context.get(CustomData.KEY));
-  }
-
-  @DisplayName("test Baggage.current/makeCurrent()")
-  @Test
-  void testBaggageCurrentMakeCurrent() {
-    // Initially: current baggage must be empty or null
-    Baggage otelBaggage = Baggage.current();
-    Baggage otelBaggageFromContext = Baggage.fromContext(Context.current());
-    Baggage otelBaggageFromContextOrNull = Baggage.fromContextOrNull(Context.current());
-
-    assertNotNull(otelBaggage);
-    assertTrue(otelBaggage.isEmpty());
-    assertNotNull(otelBaggageFromContext);
-    assertTrue(otelBaggageFromContext.isEmpty());
-    assertNull(otelBaggageFromContextOrNull);
-
-    // After making OTel baggage current
-    Scope otelScope =
-        Baggage.builder()
-            .put("foo", "otel_value_to_be_replaced")
-            .put("FOO", "OTEL_UNTOUCHED")
-            .put("remove_me_key", "otel_remove_me_value")
-            .build()
-            .makeCurrent();
-    otelBaggage = Baggage.current();
-    otelBaggageFromContext = Baggage.fromContext(Context.current());
-    otelBaggageFromContextOrNull = Baggage.fromContextOrNull(Context.current());
-
-    assertNotNull(otelBaggage);
-    assertNotNull(otelBaggageFromContext);
-    assertNotNull(otelBaggageFromContextOrNull);
-    assertEquals(3, otelBaggage.size());
-    assertEquals("otel_value_to_be_replaced", otelBaggage.getEntryValue("foo"));
-    assertEquals("OTEL_UNTOUCHED", otelBaggage.getEntryValue("FOO"));
-    assertEquals("otel_remove_me_value", otelBaggage.getEntryValue("remove_me_key"));
-    assertEquals(otelBaggage.asMap(), otelBaggageFromContext.asMap());
-    assertEquals(otelBaggage.asMap(), otelBaggageFromContextOrNull.asMap());
-
-    // After modifying DD baggage
-    datadog.context.Context ddContext = datadog.context.Context.current();
-    datadog.trace.bootstrap.instrumentation.api.Baggage ddBaggage =
-        datadog.trace.bootstrap.instrumentation.api.Baggage.fromContext(ddContext);
-    assertNotNull(ddBaggage);
-    ddBaggage.addItem("new_foo", "dd_new_value");
-    ddBaggage.addItem("foo", "dd_overwrite_value");
-    ddBaggage.removeItem("remove_me_key");
-    datadog.context.ContextScope ddScope = ddContext.with(ddBaggage).attach();
-    otelBaggage = Baggage.current();
-    otelBaggageFromContext = Baggage.fromContext(Context.current());
-    otelBaggageFromContextOrNull = Baggage.fromContextOrNull(Context.current());
-
-    assertNotNull(otelBaggage);
-    assertNotNull(otelBaggageFromContext);
-    assertNotNull(otelBaggageFromContextOrNull);
-    assertEquals(3, otelBaggage.size());
-    assertEquals("dd_overwrite_value", otelBaggage.getEntryValue("foo"));
-    assertEquals("OTEL_UNTOUCHED", otelBaggage.getEntryValue("FOO"));
-    assertEquals("dd_new_value", otelBaggage.getEntryValue("new_foo"));
-    assertEquals(otelBaggage.asMap(), otelBaggageFromContext.asMap());
-    assertEquals(otelBaggage.asMap(), otelBaggageFromContextOrNull.asMap());
-
-    // After closing both scopes: current baggage must be empty
-    ddScope.close();
-    otelScope.close();
-    assertTrue(Baggage.current().isEmpty());
-
-    // Create DD baggage from map and activate
-    ddContext = datadog.context.Context.current();
-    Map<String, String> ddBaggageItems = new HashMap<>();
-    ddBaggageItems.put("foo", "dd_value_to_be_replaced");
-    ddBaggageItems.put("FOO", "DD_UNTOUCHED");
-    ddBaggageItems.put("remove_me_key", "dd_remove_me_value");
-    ddBaggage = datadog.trace.bootstrap.instrumentation.api.Baggage.create(ddBaggageItems);
-    ddScope = ddContext.with(ddBaggage).attach();
-    otelBaggage = Baggage.current();
-    otelBaggageFromContext = Baggage.fromContext(Context.current());
-    otelBaggageFromContextOrNull = Baggage.fromContextOrNull(Context.current());
-
-    assertNotNull(otelBaggage);
-    assertNotNull(otelBaggageFromContext);
-    assertNotNull(otelBaggageFromContextOrNull);
-    assertEquals(3, otelBaggage.size());
-    assertEquals("dd_value_to_be_replaced", otelBaggage.getEntryValue("foo"));
-    assertEquals("DD_UNTOUCHED", otelBaggage.getEntryValue("FOO"));
-    assertEquals("dd_remove_me_value", otelBaggage.getEntryValue("remove_me_key"));
-    assertEquals(otelBaggage.asMap(), otelBaggageFromContext.asMap());
-    assertEquals(otelBaggage.asMap(), otelBaggageFromContextOrNull.asMap());
-
-    // Build modified OTel baggage from existing
-    io.opentelemetry.api.baggage.BaggageBuilder builder = otelBaggage.toBuilder();
-    builder.put("new_foo", "otel_new_value");
-    builder.put("foo", "otel_overwrite_value");
-    builder.remove("remove_me_key");
-    otelScope = builder.build().makeCurrent();
-    otelBaggage = Baggage.current();
-    otelBaggageFromContext = Baggage.fromContext(Context.current());
-    otelBaggageFromContextOrNull = Baggage.fromContextOrNull(Context.current());
-
-    assertNotNull(otelBaggage);
-    assertNotNull(otelBaggageFromContext);
-    assertNotNull(otelBaggageFromContextOrNull);
-    assertEquals(3, otelBaggage.size());
-    assertEquals("otel_overwrite_value", otelBaggage.getEntryValue("foo"));
-    assertEquals("DD_UNTOUCHED", otelBaggage.getEntryValue("FOO"));
-    assertEquals("otel_new_value", otelBaggage.getEntryValue("new_foo"));
-    assertEquals(otelBaggage.asMap(), otelBaggageFromContext.asMap());
-    assertEquals(otelBaggage.asMap(), otelBaggageFromContextOrNull.asMap());
-
-    // Cleanup
-    otelScope.close();
-    ddScope.close();
-  }
-
-  // Using Object for ddSpan instead of AgentSpan as bootstrap types can't be referred in API
-  private static void assertSpanEquals(Object ddSpan, Span currentSpan) {
-    AgentSpan expectedDdSpan = (AgentSpan) ddSpan;
-    assertEquals(
-        expectedDdSpan.getTraceId().toHexStringPadded(32),
-        currentSpan.getSpanContext().getTraceId());
-    assertEquals(
-        DDSpanId.toHexStringPadded(expectedDdSpan.getSpanId()),
-        currentSpan.getSpanContext().getSpanId());
-  }
-
-  private static class CustomData implements ImplicitContextKeyed {
-    static final ContextKey<CustomData> KEY = ContextKey.named("custom");
-
-    @Override
-    public Context storeInContext(Context context) {
-      return context.with(KEY, this);
+    @DisplayName("test Span.current/makeCurrent()")
+    @Test
+    void testSpanCurrentMakeCurrent() {
+        Span otelSpan = this.otelTracer.spanBuilder("some-name").startSpan();
+
+        // Before making current: current span must be invalid or null
+        Span currentSpan = Span.current();
+        Span currentSpanFromContext = Span.fromContext(Context.current());
+        Span currentSpanFromContextOrNull = Span.fromContextOrNull(Context.current());
+
+        assertNotNull(currentSpan);
+        assertFalse(currentSpan.getSpanContext().isValid());
+        assertNotNull(currentSpanFromContext);
+        assertFalse(currentSpanFromContext.getSpanContext().isValid());
+        assertNull(currentSpanFromContextOrNull);
+
+        // After making current: OTel span must be current span
+        Scope scope = otelSpan.makeCurrent();
+        currentSpan = Span.current();
+        currentSpanFromContext = Span.fromContext(Context.current());
+        currentSpanFromContextOrNull = Span.fromContextOrNull(Context.current());
+
+        assertEquals(otelSpan, currentSpan);
+        assertEquals(otelSpan, currentSpanFromContext);
+        assertEquals(otelSpan, currentSpanFromContextOrNull);
+
+        // After activating DD span: Datadog span must be current span
+        AgentSpan ddSpan = tracer.startSpan("dd-api", "other-name");
+        ContextScope ddScope = tracer.activateManualSpan(ddSpan);
+        currentSpan = Span.current();
+
+        assertSpanEquals(ddSpan, currentSpan);
+
+        // Cleanup
+        ddScope.close();
+        ddSpan.finish();
+        scope.close();
+        otelSpan.end();
     }
 
-    static CustomData fromContext(Context context) {
-      return context.get(KEY);
+    @DisplayName("test Context.makeCurrent() to activate a span without prior active span")
+    @Test
+    void testContextMakeCurrentWithoutPriorActiveSpan() {
+        Span otelSpan = this.otelTracer.spanBuilder("some-name").startSpan();
+
+        // No active span: current span is invalid
+        Span currentSpan = Span.current();
+        assertNotNull(currentSpan);
+        assertFalse(currentSpan.getSpanContext().isValid());
+
+        // Make OTel span current via context
+        Context contextWithSpan = Context.current().with(otelSpan);
+        Scope scope = contextWithSpan.makeCurrent();
+        currentSpan = Span.current();
+        assertEquals(otelSpan, currentSpan);
+
+        // After closing scope: current span is invalid again
+        scope.close();
+        currentSpan = Span.current();
+        assertNotNull(currentSpan);
+        assertFalse(currentSpan.getSpanContext().isValid());
+
+        // Cleanup
+        otelSpan.end();
+    }
+
+    @DisplayName("test Context.makeCurrent() to activate a span with another currently active span")
+    @Test
+    void testContextMakeCurrentWithAnotherActiveSpan() {
+        AgentSpan ddSpan = tracer.startSpan("dd-api", "some-name");
+        ContextScope ddScope = tracer.activateManualSpan(ddSpan);
+        Span otelSpan = this.otelTracer.spanBuilder("other-name").startSpan();
+
+        // DD span is active: current OTel span reflects DD span
+        Span currentSpan = Span.current();
+        assertNotNull(currentSpan);
+        assertSpanEquals(ddSpan, currentSpan);
+
+        // Make OTel span current via context
+        Context contextWithSpan = Context.current().with(otelSpan);
+        Scope scope = contextWithSpan.makeCurrent();
+        currentSpan = Span.current();
+        assertEquals(otelSpan, currentSpan);
+
+        // After closing scope: DD span is active again
+        scope.close();
+        currentSpan = Span.current();
+        assertNotNull(currentSpan);
+        assertSpanEquals(ddSpan, currentSpan);
+
+        // Cleanup
+        otelSpan.end();
+        ddScope.close();
+        ddSpan.finish();
+    }
+
+    @DisplayName("test Context.makeCurrent() to activate an already active span")
+    @Test
+    void testContextMakeCurrentAlreadyActiveSpan() {
+        AgentSpan ddSpan = tracer.startSpan("dd-api", "some-name");
+        ContextScope ddScope = tracer.activateManualSpan(ddSpan);
+        Span currentSpan = Span.current();
+
+        assertNotNull(currentSpan);
+        assertSpanEquals(ddSpan, currentSpan);
+
+        // Make the already-current span current again via context
+        Context contextWithSpan = Context.current().with(currentSpan);
+        Scope scope = contextWithSpan.makeCurrent();
+        currentSpan = Span.current();
+
+        assertNotNull(currentSpan);
+        assertSpanEquals(ddSpan, currentSpan);
+
+        // After closing scope: still same DD span
+        scope.close();
+        currentSpan = Span.current();
+
+        assertNotNull(currentSpan);
+        assertSpanEquals(ddSpan, currentSpan);
+
+        // After closing DD scope and finishing: no valid span
+        ddScope.close();
+        ddSpan.finish();
+        currentSpan = Span.current();
+
+        assertNotNull(currentSpan);
+        assertFalse(currentSpan.getSpanContext().isValid());
+    }
+
+    @DisplayName("test clearing context")
+    @Test
+    void testClearingContext() {
+        Scope rootScope = Context.root().makeCurrent();
+        assertEquals(Context.root(), Context.current());
+        rootScope.close();
+    }
+
+    @DisplayName("test mixing manual and OTel instrumentation")
+    @Test
+    void testMixingManualAndOtelInstrumentation() {
+        Span otelParentSpan = this.otelTracer.spanBuilder("some-name").startSpan();
+
+        // Activate OTel parent span and verify DD active span
+        Scope otelParentScope = otelParentSpan.makeCurrent();
+        AgentSpan activeSpan = tracer.activeSpan();
+
+        assertEquals("internal", activeSpan.getOperationName().toString());
+        assertEquals("some-name", activeSpan.getResourceName().toString());
+        assertEquals(
+                DDSpanId.toHexStringPadded(activeSpan.getSpanId()),
+                otelParentSpan.getSpanContext().getSpanId());
+
+        // Activate DD child span and verify OTel current span
+        AgentSpan ddChildSpan = tracer.startSpan("dd-api", "other-name");
+        ContextScope ddChildScope = tracer.activateManualSpan(ddChildSpan);
+        Span current = Span.current();
+
+        assertEquals(
+                DDSpanId.toHexStringPadded(ddChildSpan.getSpanId()),
+                current.getSpanContext().getSpanId());
+
+        // Activate OTel grandchild span and verify DD active span
+        Span otelGrandChildSpan = this.otelTracer.spanBuilder("another-name").startSpan();
+        Scope otelGrandChildScope = otelGrandChildSpan.makeCurrent();
+        activeSpan = tracer.activeSpan();
+
+        assertEquals("internal", activeSpan.getOperationName().toString());
+        assertEquals("another-name", activeSpan.getResourceName().toString());
+        assertEquals(
+                DDSpanId.toHexStringPadded(activeSpan.getSpanId()),
+                otelGrandChildSpan.getSpanContext().getSpanId());
+
+        // Close everything and verify trace structure
+        otelGrandChildScope.close();
+        otelGrandChildSpan.end();
+        ddChildScope.close();
+        ddChildSpan.finish();
+        otelParentScope.close();
+        otelParentSpan.end();
+
+        assertTraces(trace(
+                span().root().operationName("internal").resourceName("some-name"),
+                span().childOfPrevious().operationName("other-name"),
+                span().childOfPrevious().operationName("internal").resourceName("another-name")));
+    }
+
+    @DisplayName("test context spans retrieval")
+    @Test
+    void testContextSpansRetrieval() {
+        Span parentSpan = this.otelTracer.spanBuilder("some-name").startSpan();
+        Scope parentScope = parentSpan.makeCurrent();
+        ContextKey<Span> currentSpanKey = ContextKey.named("opentelemetry-trace-span-key");
+        ContextKey<Span> rootSpanKey = ContextKey.named("opentelemetry-traces-local-root-span");
+
+        // After activating parent: both current and root span keys point to parent
+        Context currentContext = Context.current();
+        assertEquals(parentSpan, currentContext.get(currentSpanKey));
+        assertEquals(parentSpan, currentContext.get(rootSpanKey));
+
+        // After activating child: current span key points to child, root span key still points to
+        // parent
+        Span childSpan = this.otelTracer.spanBuilder("other-name").startSpan();
+        Scope childScope = childSpan.makeCurrent();
+        currentContext = Context.current();
+
+        assertEquals(childSpan, currentContext.get(currentSpanKey));
+        assertEquals(parentSpan, currentContext.get(rootSpanKey));
+
+        // After closing child: back to parent for both keys
+        childScope.close();
+        childSpan.end();
+        currentContext = Context.current();
+
+        assertEquals(parentSpan, currentContext.get(currentSpanKey));
+        assertEquals(parentSpan, currentContext.get(rootSpanKey));
+
+        // Cleanup
+        parentScope.close();
+        parentSpan.end();
+    }
+
+    @DisplayName("test custom object storage")
+    @Test
+    void testCustomObjectStorage() {
+        Context context = Context.root();
+        Context originalContext = context;
+        CustomData data1 = new CustomData();
+        CustomData data2 = new CustomData();
+
+        // Store custom data1
+        context = context.with(data1);
+        assertEquals(data1, CustomData.fromContext(context));
+        assertNull(CustomData.fromContext(originalContext));
+
+        // Replace with custom data2
+        context = context.with(data2);
+        assertEquals(data2, CustomData.fromContext(context));
+
+        // Remove custom data
+        context = context.with(CustomData.KEY, null);
+        assertNull(context.get(CustomData.KEY));
+    }
+
+    @DisplayName("test Baggage.current/makeCurrent()")
+    @Test
+    void testBaggageCurrentMakeCurrent() {
+        // Initially: current baggage must be empty or null
+        Baggage otelBaggage = Baggage.current();
+        Baggage otelBaggageFromContext = Baggage.fromContext(Context.current());
+        Baggage otelBaggageFromContextOrNull = Baggage.fromContextOrNull(Context.current());
+
+        assertNotNull(otelBaggage);
+        assertTrue(otelBaggage.isEmpty());
+        assertNotNull(otelBaggageFromContext);
+        assertTrue(otelBaggageFromContext.isEmpty());
+        assertNull(otelBaggageFromContextOrNull);
+
+        // After making OTel baggage current
+        Scope otelScope = Baggage.builder()
+                .put("foo", "otel_value_to_be_replaced")
+                .put("FOO", "OTEL_UNTOUCHED")
+                .put("remove_me_key", "otel_remove_me_value")
+                .build()
+                .makeCurrent();
+        otelBaggage = Baggage.current();
+        otelBaggageFromContext = Baggage.fromContext(Context.current());
+        otelBaggageFromContextOrNull = Baggage.fromContextOrNull(Context.current());
+
+        assertNotNull(otelBaggage);
+        assertNotNull(otelBaggageFromContext);
+        assertNotNull(otelBaggageFromContextOrNull);
+        assertEquals(3, otelBaggage.size());
+        assertEquals("otel_value_to_be_replaced", otelBaggage.getEntryValue("foo"));
+        assertEquals("OTEL_UNTOUCHED", otelBaggage.getEntryValue("FOO"));
+        assertEquals("otel_remove_me_value", otelBaggage.getEntryValue("remove_me_key"));
+        assertEquals(otelBaggage.asMap(), otelBaggageFromContext.asMap());
+        assertEquals(otelBaggage.asMap(), otelBaggageFromContextOrNull.asMap());
+
+        // After modifying DD baggage
+        datadog.context.Context ddContext = datadog.context.Context.current();
+        datadog.trace.bootstrap.instrumentation.api.Baggage ddBaggage =
+                datadog.trace.bootstrap.instrumentation.api.Baggage.fromContext(ddContext);
+        assertNotNull(ddBaggage);
+        ddBaggage.addItem("new_foo", "dd_new_value");
+        ddBaggage.addItem("foo", "dd_overwrite_value");
+        ddBaggage.removeItem("remove_me_key");
+        datadog.context.ContextScope ddScope = ddContext.with(ddBaggage).attach();
+        otelBaggage = Baggage.current();
+        otelBaggageFromContext = Baggage.fromContext(Context.current());
+        otelBaggageFromContextOrNull = Baggage.fromContextOrNull(Context.current());
+
+        assertNotNull(otelBaggage);
+        assertNotNull(otelBaggageFromContext);
+        assertNotNull(otelBaggageFromContextOrNull);
+        assertEquals(3, otelBaggage.size());
+        assertEquals("dd_overwrite_value", otelBaggage.getEntryValue("foo"));
+        assertEquals("OTEL_UNTOUCHED", otelBaggage.getEntryValue("FOO"));
+        assertEquals("dd_new_value", otelBaggage.getEntryValue("new_foo"));
+        assertEquals(otelBaggage.asMap(), otelBaggageFromContext.asMap());
+        assertEquals(otelBaggage.asMap(), otelBaggageFromContextOrNull.asMap());
+
+        // After closing both scopes: current baggage must be empty
+        ddScope.close();
+        otelScope.close();
+        assertTrue(Baggage.current().isEmpty());
+
+        // Create DD baggage from map and activate
+        ddContext = datadog.context.Context.current();
+        Map<String, String> ddBaggageItems = new HashMap<>();
+        ddBaggageItems.put("foo", "dd_value_to_be_replaced");
+        ddBaggageItems.put("FOO", "DD_UNTOUCHED");
+        ddBaggageItems.put("remove_me_key", "dd_remove_me_value");
+        ddBaggage = datadog.trace.bootstrap.instrumentation.api.Baggage.create(ddBaggageItems);
+        ddScope = ddContext.with(ddBaggage).attach();
+        otelBaggage = Baggage.current();
+        otelBaggageFromContext = Baggage.fromContext(Context.current());
+        otelBaggageFromContextOrNull = Baggage.fromContextOrNull(Context.current());
+
+        assertNotNull(otelBaggage);
+        assertNotNull(otelBaggageFromContext);
+        assertNotNull(otelBaggageFromContextOrNull);
+        assertEquals(3, otelBaggage.size());
+        assertEquals("dd_value_to_be_replaced", otelBaggage.getEntryValue("foo"));
+        assertEquals("DD_UNTOUCHED", otelBaggage.getEntryValue("FOO"));
+        assertEquals("dd_remove_me_value", otelBaggage.getEntryValue("remove_me_key"));
+        assertEquals(otelBaggage.asMap(), otelBaggageFromContext.asMap());
+        assertEquals(otelBaggage.asMap(), otelBaggageFromContextOrNull.asMap());
+
+        // Build modified OTel baggage from existing
+        io.opentelemetry.api.baggage.BaggageBuilder builder = otelBaggage.toBuilder();
+        builder.put("new_foo", "otel_new_value");
+        builder.put("foo", "otel_overwrite_value");
+        builder.remove("remove_me_key");
+        otelScope = builder.build().makeCurrent();
+        otelBaggage = Baggage.current();
+        otelBaggageFromContext = Baggage.fromContext(Context.current());
+        otelBaggageFromContextOrNull = Baggage.fromContextOrNull(Context.current());
+
+        assertNotNull(otelBaggage);
+        assertNotNull(otelBaggageFromContext);
+        assertNotNull(otelBaggageFromContextOrNull);
+        assertEquals(3, otelBaggage.size());
+        assertEquals("otel_overwrite_value", otelBaggage.getEntryValue("foo"));
+        assertEquals("DD_UNTOUCHED", otelBaggage.getEntryValue("FOO"));
+        assertEquals("otel_new_value", otelBaggage.getEntryValue("new_foo"));
+        assertEquals(otelBaggage.asMap(), otelBaggageFromContext.asMap());
+        assertEquals(otelBaggage.asMap(), otelBaggageFromContextOrNull.asMap());
+
+        // Cleanup
+        otelScope.close();
+        ddScope.close();
+    }
+
+    // Using Object for ddSpan instead of AgentSpan as bootstrap types can't be referred in API
+    private static void assertSpanEquals(Object ddSpan, Span currentSpan) {
+        AgentSpan expectedDdSpan = (AgentSpan) ddSpan;
+        assertEquals(
+                expectedDdSpan.getTraceId().toHexStringPadded(32),
+                currentSpan.getSpanContext().getTraceId());
+        assertEquals(
+                DDSpanId.toHexStringPadded(expectedDdSpan.getSpanId()),
+                currentSpan.getSpanContext().getSpanId());
+    }
+
+    private static class CustomData implements ImplicitContextKeyed {
+        static final ContextKey<CustomData> KEY = ContextKey.named("custom");
+
+        @Override
+        public Context storeInContext(Context context) {
+            return context.with(KEY, this);
+        }
+
+        static CustomData fromContext(Context context) {
+            return context.get(KEY);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/AbstractPropagatorTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/AbstractPropagatorTest.java
index cdd36e4a735..d30331f902f 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/AbstractPropagatorTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/AbstractPropagatorTest.java
@@ -24,76 +24,72 @@
 
 abstract class AbstractPropagatorTest extends AbstractOpenTelemetry14Test {
 
-  abstract TextMapPropagator propagator();
+    abstract TextMapPropagator propagator();
 
-  abstract void assertInjectedHeaders(
-      Map<String, String> headers, String traceId, String spanId, byte sampling);
+    abstract void assertInjectedHeaders(Map<String, String> headers, String traceId, String spanId, byte sampling);
 
-  @ParameterizedTest
-  @MethodSource("values")
-  void testContextExtractionAndInjection(
-      Map<String, String> headers, String traceId, String spanId, byte sampling) {
-    TextMapPropagator propagator = propagator();
-    boolean expectedSampled = sampling == SAMPLER_KEEP;
+    @ParameterizedTest
+    @MethodSource("values")
+    void testContextExtractionAndInjection(Map<String, String> headers, String traceId, String spanId, byte sampling) {
+        TextMapPropagator propagator = propagator();
+        boolean expectedSampled = sampling == SAMPLER_KEEP;
 
-    Context context = propagator.extract(Context.root(), headers, TextMap.INSTANCE);
-    assertNotEquals(Context.root(), context);
+        Context context = propagator.extract(Context.root(), headers, TextMap.INSTANCE);
+        assertNotEquals(Context.root(), context);
 
-    Span localSpan = this.otelTracer.spanBuilder("some-name").setParent(context).startSpan();
-    String localSpanId = localSpan.getSpanContext().getSpanId();
-    boolean spanSampled = localSpan.getSpanContext().getTraceFlags().isSampled();
-    Map<String, String> injectedHeaders = new HashMap<>();
-    try (Scope ignoredScope = localSpan.makeCurrent()) {
-      propagator.inject(Context.current(), injectedHeaders, new TextMap());
-    }
-    localSpan.end();
+        Span localSpan =
+                this.otelTracer.spanBuilder("some-name").setParent(context).startSpan();
+        String localSpanId = localSpan.getSpanContext().getSpanId();
+        boolean spanSampled = localSpan.getSpanContext().getTraceFlags().isSampled();
+        Map<String, String> injectedHeaders = new HashMap<>();
+        try (Scope ignoredScope = localSpan.makeCurrent()) {
+            propagator.inject(Context.current(), injectedHeaders, new TextMap());
+        }
+        localSpan.end();
 
-    assertTraces(
-        trace(
-            span()
-                .traceId((DDTraceId) expectedTraceId(traceId))
+        assertTraces(trace(span().traceId((DDTraceId) expectedTraceId(traceId))
                 .childOf(DDSpanId.fromHex(spanId))
                 .operationName("internal")
                 .resourceName("some-name")));
-    assertEquals(expectedSampled, spanSampled);
-    assertInjectedHeaders(injectedHeaders, traceId, localSpanId, sampling);
-  }
-
-  @Test
-  void testContextExtractOnMissingTraceContext() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put("User-Agent", "test");
+        assertEquals(expectedSampled, spanSampled);
+        assertInjectedHeaders(injectedHeaders, traceId, localSpanId, sampling);
+    }
 
-    Context context = propagator().extract(Context.root(), headers, TextMap.INSTANCE);
-    Span extractedSpan = Span.fromContext(context);
+    @Test
+    void testContextExtractOnMissingTraceContext() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("User-Agent", "test");
 
-    assertNotNull(extractedSpan);
-    assertFalse(extractedSpan.getSpanContext().isValid());
-    assertNull(Span.fromContextOrNull(context));
-  }
+        Context context = propagator().extract(Context.root(), headers, TextMap.INSTANCE);
+        Span extractedSpan = Span.fromContext(context);
 
-  // Using Object instead of DDTraceId to avoid loading bootstrap classes before test run
-  Object expectedTraceId(String traceId) {
-    return DDTraceId.fromHex(traceId);
-  }
+        assertNotNull(extractedSpan);
+        assertFalse(extractedSpan.getSpanContext().isValid());
+        assertNull(Span.fromContextOrNull(context));
+    }
 
-  static String zeroPadLeft(String value, int length) {
-    if (value.length() >= length) {
-      return value;
+    // Using Object instead of DDTraceId to avoid loading bootstrap classes before test run
+    Object expectedTraceId(String traceId) {
+        return DDTraceId.fromHex(traceId);
     }
-    StringBuilder sb = new StringBuilder(length);
-    for (int i = value.length(); i < length; i++) {
-      sb.append('0');
+
+    static String zeroPadLeft(String value, int length) {
+        if (value.length() >= length) {
+            return value;
+        }
+        StringBuilder sb = new StringBuilder(length);
+        for (int i = value.length(); i < length; i++) {
+            sb.append('0');
+        }
+        sb.append(value);
+        return sb.toString();
     }
-    sb.append(value);
-    return sb.toString();
-  }
 
-  static Map<String, String> headers(String... keyValues) {
-    Map<String, String> map = new HashMap<>();
-    for (int i = 0; i + 1 < keyValues.length; i += 2) {
-      map.put(keyValues[i], keyValues[i + 1]);
+    static Map<String, String> headers(String... keyValues) {
+        Map<String, String> map = new HashMap<>();
+        for (int i = 0; i + 1 < keyValues.length; i += 2) {
+            map.put(keyValues[i], keyValues[i + 1]);
+        }
+        return map;
     }
-    return map;
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/AgentPropagatorTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/AgentPropagatorTest.java
index 9bb5b8d0d3d..29a6e33b3b2 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/AgentPropagatorTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/AgentPropagatorTest.java
@@ -4,8 +4,8 @@
 import io.opentelemetry.context.propagation.TextMapPropagator;
 
 abstract class AgentPropagatorTest extends AbstractPropagatorTest {
-  @Override
-  TextMapPropagator propagator() {
-    return GlobalOpenTelemetry.get().getPropagators().getTextMapPropagator();
-  }
+    @Override
+    TextMapPropagator propagator() {
+        return GlobalOpenTelemetry.get().getPropagators().getTextMapPropagator();
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/B3MultiPropagatorTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/B3MultiPropagatorTest.java
index f07fd4106eb..79d341ed28e 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/B3MultiPropagatorTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/B3MultiPropagatorTest.java
@@ -14,12 +14,12 @@
 
 @WithConfig(key = "trace.propagation.style", value = "b3multi")
 class B3MultiPropagatorTest extends AgentPropagatorTest {
-  private static final String TRACE_ID_KEY = "X-B3-TraceId";
-  private static final String SPAN_ID_KEY = "X-B3-SpanId";
-  private static final String SAMPLING_PRIORITY_KEY = "X-B3-Sampled";
+    private static final String TRACE_ID_KEY = "X-B3-TraceId";
+    private static final String SPAN_ID_KEY = "X-B3-SpanId";
+    private static final String SAMPLING_PRIORITY_KEY = "X-B3-Sampled";
 
-  static Stream<Arguments> values() {
-    // spotless:off
+    static Stream<Arguments> values() {
+        // spotless:off
     return Stream.of(
         arguments(
             headers(TRACE_ID_KEY, "1", SPAN_ID_KEY, "2"),
@@ -50,19 +50,18 @@ static Stream<Arguments> values() {
             "2222222222222222",
             SAMPLER_KEEP));
     // spotless:on
-  }
+    }
 
-  @Override
-  Object expectedTraceId(String traceId) {
-    return B3TraceId.fromHex(traceId);
-  }
+    @Override
+    Object expectedTraceId(String traceId) {
+        return B3TraceId.fromHex(traceId);
+    }
 
-  @Override
-  void assertInjectedHeaders(
-      Map<String, String> headers, String traceId, String spanId, byte sampling) {
-    String priorityKey = sampling == SAMPLER_DROP ? "0" : "1";
-    assertEquals(zeroPadLeft(traceId, 32), headers.get(TRACE_ID_KEY));
-    assertEquals(zeroPadLeft(spanId, 8), headers.get(SPAN_ID_KEY));
-    assertEquals(priorityKey, headers.get(SAMPLING_PRIORITY_KEY));
-  }
+    @Override
+    void assertInjectedHeaders(Map<String, String> headers, String traceId, String spanId, byte sampling) {
+        String priorityKey = sampling == SAMPLER_DROP ? "0" : "1";
+        assertEquals(zeroPadLeft(traceId, 32), headers.get(TRACE_ID_KEY));
+        assertEquals(zeroPadLeft(spanId, 8), headers.get(SPAN_ID_KEY));
+        assertEquals(priorityKey, headers.get(SAMPLING_PRIORITY_KEY));
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/B3SinglePropagatorTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/B3SinglePropagatorTest.java
index 2cabe3bd21b..c39d57934c8 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/B3SinglePropagatorTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/B3SinglePropagatorTest.java
@@ -14,10 +14,10 @@
 
 @WithConfig(key = "trace.propagation.style", value = "b3single")
 class B3SinglePropagatorTest extends AgentPropagatorTest {
-  private static final String B3_KEY = "b3";
+    private static final String B3_KEY = "b3";
 
-  static Stream<Arguments> values() {
-    // spotless:off
+    static Stream<Arguments> values() {
+        // spotless:off
     return Stream.of(
         arguments(headers(B3_KEY, "1-2"),
             "1",
@@ -44,18 +44,17 @@ static Stream<Arguments> values() {
             "2222222222222222",
             SAMPLER_KEEP));
     // spotless:on
-  }
+    }
 
-  @Override
-  Object expectedTraceId(String traceId) {
-    return B3TraceId.fromHex(traceId);
-  }
+    @Override
+    Object expectedTraceId(String traceId) {
+        return B3TraceId.fromHex(traceId);
+    }
 
-  @Override
-  void assertInjectedHeaders(
-      Map<String, String> headers, String traceId, String spanId, byte sampling) {
-    String sampledValue = sampling == SAMPLER_DROP ? "0" : "1";
-    String expected = zeroPadLeft(traceId, 32) + "-" + zeroPadLeft(spanId, 8) + "-" + sampledValue;
-    assertEquals(expected, headers.get(B3_KEY));
-  }
+    @Override
+    void assertInjectedHeaders(Map<String, String> headers, String traceId, String spanId, byte sampling) {
+        String sampledValue = sampling == SAMPLER_DROP ? "0" : "1";
+        String expected = zeroPadLeft(traceId, 32) + "-" + zeroPadLeft(spanId, 8) + "-" + sampledValue;
+        assertEquals(expected, headers.get(B3_KEY));
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/DatadogPropagatorTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/DatadogPropagatorTest.java
index 09b7ee31a13..0d475b678b6 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/DatadogPropagatorTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/DatadogPropagatorTest.java
@@ -17,10 +17,10 @@
 
 @WithConfig(key = "trace.propagation.style", value = "datadog")
 class DatadogPropagatorTest extends AgentPropagatorTest {
-  static Stream<Arguments> values() {
-    String traceIdDecimal = Long.toString(Long.parseLong("1111111111111111", 16));
-    String parentIdDecimal = Long.toString(Long.parseLong("2222222222222222", 16));
-    // spotless:off
+    static Stream<Arguments> values() {
+        String traceIdDecimal = Long.toString(Long.parseLong("1111111111111111", 16));
+        String parentIdDecimal = Long.toString(Long.parseLong("2222222222222222", 16));
+        // spotless:off
     return Stream.of(
         arguments(
             headers(
@@ -64,26 +64,24 @@ static Stream<Arguments> values() {
             "2222222222222222",
             SAMPLER_DROP));
     // spotless:on
-  }
-
-  @Override
-  void assertInjectedHeaders(
-      Map<String, String> headers, String traceId, String spanId, byte sampling) {
-    assertEquals(
-        Long.toString(DDTraceId.fromHex(traceId).toLong()), headers.get("x-datadog-trace-id"));
-    assertEquals(spanId.replaceAll("^0+(?!$)", ""), headers.get("x-datadog-parent-id"));
-    String samplingPriority = sampling == SAMPLER_DROP ? "0" : "1";
-    List<String> tags = new ArrayList<>();
-    if (sampling == UNSET) {
-      tags.add("_dd.p.dm=-1");
-    }
-    if (traceId.length() == 32) {
-      tags.add("_dd.p.tid=" + traceId.substring(0, 16));
     }
-    if (sampling == UNSET) {
-      tags.add("_dd.p.ksr=1");
+
+    @Override
+    void assertInjectedHeaders(Map<String, String> headers, String traceId, String spanId, byte sampling) {
+        assertEquals(Long.toString(DDTraceId.fromHex(traceId).toLong()), headers.get("x-datadog-trace-id"));
+        assertEquals(spanId.replaceAll("^0+(?!$)", ""), headers.get("x-datadog-parent-id"));
+        String samplingPriority = sampling == SAMPLER_DROP ? "0" : "1";
+        List<String> tags = new ArrayList<>();
+        if (sampling == UNSET) {
+            tags.add("_dd.p.dm=-1");
+        }
+        if (traceId.length() == 32) {
+            tags.add("_dd.p.tid=" + traceId.substring(0, 16));
+        }
+        if (sampling == UNSET) {
+            tags.add("_dd.p.ksr=1");
+        }
+        assertEquals(join(",", tags), headers.get("x-datadog-tags"));
+        assertEquals(samplingPriority, headers.get("x-datadog-sampling-priority"));
     }
-    assertEquals(join(",", tags), headers.get("x-datadog-tags"));
-    assertEquals(samplingPriority, headers.get("x-datadog-sampling-priority"));
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/OtelW3cPropagatorTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/OtelW3cPropagatorTest.java
index 8f62cd5b6f2..4a9436581a8 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/OtelW3cPropagatorTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/OtelW3cPropagatorTest.java
@@ -14,30 +14,29 @@
 
 @WithConfig(key = "trace.propagation.style", value = "datadog")
 class OtelW3cPropagatorTest extends AbstractPropagatorTest {
-  @Override
-  TextMapPropagator propagator() {
-    return W3CTraceContextPropagator.getInstance();
-  }
+    @Override
+    TextMapPropagator propagator() {
+        return W3CTraceContextPropagator.getInstance();
+    }
 
-  static Stream<Arguments> values() {
-    return Stream.of(
-        arguments(
-            headers("traceparent", "00-00000000000000001111111111111111-2222222222222222-00"),
-            "00000000000000001111111111111111",
-            "2222222222222222",
-            UNSET),
-        arguments(
-            headers("traceparent", "00-00000000000000001111111111111111-2222222222222222-01"),
-            "00000000000000001111111111111111",
-            "2222222222222222",
-            SAMPLER_KEEP));
-  }
+    static Stream<Arguments> values() {
+        return Stream.of(
+                arguments(
+                        headers("traceparent", "00-00000000000000001111111111111111-2222222222222222-00"),
+                        "00000000000000001111111111111111",
+                        "2222222222222222",
+                        UNSET),
+                arguments(
+                        headers("traceparent", "00-00000000000000001111111111111111-2222222222222222-01"),
+                        "00000000000000001111111111111111",
+                        "2222222222222222",
+                        SAMPLER_KEEP));
+    }
 
-  @Override
-  void assertInjectedHeaders(
-      Map<String, String> headers, String traceId, String spanId, byte sampling) {
-    String sampleFlag = sampling == SAMPLER_KEEP ? "01" : "00";
-    String expectedTraceParent = "00-" + traceId + "-" + spanId + "-" + sampleFlag;
-    assertEquals(expectedTraceParent, headers.get("traceparent"));
-  }
+    @Override
+    void assertInjectedHeaders(Map<String, String> headers, String traceId, String spanId, byte sampling) {
+        String sampleFlag = sampling == SAMPLER_KEEP ? "01" : "00";
+        String expectedTraceParent = "00-" + traceId + "-" + spanId + "-" + sampleFlag;
+        assertEquals(expectedTraceParent, headers.get("traceparent"));
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/TextMap.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/TextMap.java
index 0bfbdd6b37a..69258e89166 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/TextMap.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/TextMap.java
@@ -7,25 +7,24 @@
 import javax.annotation.ParametersAreNonnullByDefault;
 
 @ParametersAreNonnullByDefault
-public class TextMap
-    implements TextMapGetter<Map<String, String>>, TextMapSetter<Map<String, String>> {
-  public static final TextMap INSTANCE = new TextMap();
+public class TextMap implements TextMapGetter<Map<String, String>>, TextMapSetter<Map<String, String>> {
+    public static final TextMap INSTANCE = new TextMap();
 
-  @Override
-  public Iterable<String> keys(Map<String, String> carrier) {
-    return carrier.keySet();
-  }
+    @Override
+    public Iterable<String> keys(Map<String, String> carrier) {
+        return carrier.keySet();
+    }
 
-  @Override
-  @Nullable
-  public String get(@Nullable Map<String, String> carrier, String key) {
-    return carrier == null ? null : carrier.get(key);
-  }
+    @Override
+    @Nullable
+    public String get(@Nullable Map<String, String> carrier, String key) {
+        return carrier == null ? null : carrier.get(key);
+    }
 
-  @Override
-  public void set(@Nullable Map<String, String> carrier, String key, String value) {
-    if (carrier != null) {
-      carrier.put(key, value);
+    @Override
+    public void set(@Nullable Map<String, String> carrier, String key, String value) {
+        if (carrier != null) {
+            carrier.put(key, value);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/W3cPropagatorTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/W3cPropagatorTest.java
index 27975864cb2..baaa7abd466 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/W3cPropagatorTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/W3cPropagatorTest.java
@@ -12,24 +12,23 @@
 
 @WithConfig(key = "trace.propagation.style", value = "tracecontext")
 class W3cPropagatorTest extends AgentPropagatorTest {
-  static Stream<Arguments> values() {
-    return Stream.of(
-        arguments(
-            headers("traceparent", "00-11111111111111111111111111111111-2222222222222222-00"),
-            "11111111111111111111111111111111",
-            "2222222222222222",
-            UNSET),
-        arguments(
-            headers("traceparent", "00-11111111111111111111111111111111-2222222222222222-01"),
-            "11111111111111111111111111111111",
-            "2222222222222222",
-            SAMPLER_KEEP));
-  }
+    static Stream<Arguments> values() {
+        return Stream.of(
+                arguments(
+                        headers("traceparent", "00-11111111111111111111111111111111-2222222222222222-00"),
+                        "11111111111111111111111111111111",
+                        "2222222222222222",
+                        UNSET),
+                arguments(
+                        headers("traceparent", "00-11111111111111111111111111111111-2222222222222222-01"),
+                        "11111111111111111111111111111111",
+                        "2222222222222222",
+                        SAMPLER_KEEP));
+    }
 
-  @Override
-  void assertInjectedHeaders(
-      Map<String, String> headers, String traceId, String spanId, byte sampling) {
-    String traceFlags = sampling == SAMPLER_KEEP ? "01" : "00";
-    assertEquals("00-" + traceId + "-" + spanId + "-" + traceFlags, headers.get("traceparent"));
-  }
+    @Override
+    void assertInjectedHeaders(Map<String, String> headers, String traceId, String spanId, byte sampling) {
+        String traceFlags = sampling == SAMPLER_KEEP ? "01" : "00";
+        assertEquals("00-" + traceId + "-" + spanId + "-" + traceFlags, headers.get("traceparent"));
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/W3cPropagatorTracestateTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/W3cPropagatorTracestateTest.java
index c7e4123f81f..2f3a5294dea 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/W3cPropagatorTracestateTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/W3cPropagatorTracestateTest.java
@@ -19,43 +19,42 @@
 
 @WithConfig(key = "trace.propagation.style", value = "tracecontext")
 class W3cPropagatorTracestateTest extends AbstractOpenTelemetry14Test {
-  @ParameterizedTest
-  @ValueSource(strings = {"foo=1,bar=2", "dd=s:0,foo=1,bar=2", "foo=1,dd=s:0,bar=2"})
-  void testTracestatePropagation(String tracestate) {
-    TextMapPropagator propagator =
-        GlobalOpenTelemetry.get().getPropagators().getTextMapPropagator();
-    Map<String, String> headers = new HashMap<>();
-    headers.put("traceparent", "00-11111111111111111111111111111111-2222222222222222-00");
-    headers.put("tracestate", tracestate);
+    @ParameterizedTest
+    @ValueSource(strings = {"foo=1,bar=2", "dd=s:0,foo=1,bar=2", "foo=1,dd=s:0,bar=2"})
+    void testTracestatePropagation(String tracestate) {
+        TextMapPropagator propagator =
+                GlobalOpenTelemetry.get().getPropagators().getTextMapPropagator();
+        Map<String, String> headers = new HashMap<>();
+        headers.put("traceparent", "00-11111111111111111111111111111111-2222222222222222-00");
+        headers.put("tracestate", tracestate);
 
-    String[] members =
-        Arrays.stream(tracestate.split(","))
-            .filter(member -> !member.startsWith("dd="))
-            .toArray(String[]::new);
+        String[] members = Arrays.stream(tracestate.split(","))
+                .filter(member -> !member.startsWith("dd="))
+                .toArray(String[]::new);
 
-    Context context = propagator.extract(Context.root(), headers, TextMap.INSTANCE);
-    assertNotEquals(Context.root(), context);
+        Context context = propagator.extract(Context.root(), headers, TextMap.INSTANCE);
+        assertNotEquals(Context.root(), context);
 
-    Span localSpan = this.otelTracer.spanBuilder("some-name").setParent(context).startSpan();
-    Map<String, String> injectedHeaders = new HashMap<>();
-    try (Scope ignoredScope = localSpan.makeCurrent()) {
-      propagator.inject(Context.current(), injectedHeaders, TextMap.INSTANCE);
-    }
-    localSpan.end();
+        Span localSpan =
+                this.otelTracer.spanBuilder("some-name").setParent(context).startSpan();
+        Map<String, String> injectedHeaders = new HashMap<>();
+        try (Scope ignoredScope = localSpan.makeCurrent()) {
+            propagator.inject(Context.current(), injectedHeaders, TextMap.INSTANCE);
+        }
+        localSpan.end();
 
-    // Check tracestate was injected
-    String injectedTracestate = injectedHeaders.get("tracestate");
-    assertNotNull(injectedTracestate);
-    // Check tracestate contains extracted members plus the Datadog one in first position
-    String[] injectedMembers = injectedTracestate.split(",");
-    assertEquals(Math.min(1 + members.length, 32), injectedMembers.length);
-    // Check datadog member (should be injected as first member)
-    String expectedDdMember =
-        "dd=s:0;p:" + localSpan.getSpanContext().getSpanId() + ";t.tid:1111111111111111";
-    assertEquals(expectedDdMember, injectedMembers[0]);
-    // Check all other members
-    for (int i = 0; i < Math.min(members.length, 31); i++) {
-      assertEquals(members[i], injectedMembers[i + 1]);
+        // Check tracestate was injected
+        String injectedTracestate = injectedHeaders.get("tracestate");
+        assertNotNull(injectedTracestate);
+        // Check tracestate contains extracted members plus the Datadog one in first position
+        String[] injectedMembers = injectedTracestate.split(",");
+        assertEquals(Math.min(1 + members.length, 32), injectedMembers.length);
+        // Check datadog member (should be injected as first member)
+        String expectedDdMember = "dd=s:0;p:" + localSpan.getSpanContext().getSpanId() + ";t.tid:1111111111111111";
+        assertEquals(expectedDdMember, injectedMembers[0]);
+        // Check all other members
+        for (int i = 0; i < Math.min(members.length, 31); i++) {
+            assertEquals(members[i], injectedMembers[i + 1]);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/main/java/datadog/trace/instrumentation/opentelemetry147/OpenTelemetryMetricsInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/main/java/datadog/trace/instrumentation/opentelemetry147/OpenTelemetryMetricsInstrumentation.java
index 2ca970d0873..7a045dee34e 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/main/java/datadog/trace/instrumentation/opentelemetry147/OpenTelemetryMetricsInstrumentation.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/main/java/datadog/trace/instrumentation/opentelemetry147/OpenTelemetryMetricsInstrumentation.java
@@ -25,59 +25,59 @@
  */
 @AutoService(InstrumenterModule.class)
 public class OpenTelemetryMetricsInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
 
-  public OpenTelemetryMetricsInstrumentation() {
-    super("opentelemetry-metrics", "opentelemetry-1.47", "opentelemetry-1");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isMetricsOtelEnabled();
-  }
+    public OpenTelemetryMetricsInstrumentation() {
+        super("opentelemetry-metrics", "opentelemetry-1.47", "opentelemetry-1");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.opentelemetry.api.OpenTelemetry";
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isMetricsOtelEnabled();
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.opentelemetry.api.OpenTelemetry";
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.opentelemetry.api.DefaultOpenTelemetry",
-      "io.opentelemetry.api.GlobalOpenTelemetry$ObfuscatedOpenTelemetry"
-    };
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public boolean onlyMatchKnownTypes() {
-    return isShortcutMatchingEnabled(false);
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.opentelemetry.api.DefaultOpenTelemetry",
+            "io.opentelemetry.api.GlobalOpenTelemetry$ObfuscatedOpenTelemetry"
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // MeterProvider OpenTelemetry.getMeterProvider()
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("getMeterProvider"))
-            .and(takesNoArguments())
-            .and(returns(named("io.opentelemetry.api.metrics.MeterProvider"))),
-        OpenTelemetryMetricsInstrumentation.class.getName() + "$MeterProviderAdvice");
-  }
+    @Override
+    public boolean onlyMatchKnownTypes() {
+        return isShortcutMatchingEnabled(false);
+    }
 
-  public static class MeterProviderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void returnProvider(@Advice.Return(readOnly = false) MeterProvider result) {
-      result = OtelMeterProvider.INSTANCE;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // MeterProvider OpenTelemetry.getMeterProvider()
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("getMeterProvider"))
+                        .and(takesNoArguments())
+                        .and(returns(named("io.opentelemetry.api.metrics.MeterProvider"))),
+                OpenTelemetryMetricsInstrumentation.class.getName() + "$MeterProviderAdvice");
     }
 
-    public static void muzzleCheck(DoubleGauge doubleGauge) {
-      doubleGauge.set(0); // not available before 1.38
+    public static class MeterProviderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void returnProvider(@Advice.Return(readOnly = false) MeterProvider result) {
+            result = OtelMeterProvider.INSTANCE;
+        }
+
+        public static void muzzleCheck(DoubleGauge doubleGauge) {
+            doubleGauge.set(0); // not available before 1.38
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/JvmOtlpRuntimeMetricsForkedTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/JvmOtlpRuntimeMetricsForkedTest.java
index e4beefeab46..69012c84226 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/JvmOtlpRuntimeMetricsForkedTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/JvmOtlpRuntimeMetricsForkedTest.java
@@ -21,87 +21,81 @@
 // own JVM separate from the always-on JvmOtlpRuntimeMetricsTest.
 class JvmOtlpRuntimeMetricsForkedTest {
 
-  @BeforeAll
-  static void setUp() {
-    System.setProperty("dd.metrics.otel.enabled", "true");
-    JvmOtlpRuntimeMetrics.start(false);
-  }
+    @BeforeAll
+    static void setUp() {
+        System.setProperty("dd.metrics.otel.enabled", "true");
+        JvmOtlpRuntimeMetrics.start(false);
+    }
 
-  @Test
-  void registersOnlyStableMetricsWhenExperimentalDisabled() {
-    JvmOtlpRuntimeMetricsTest.MetricCollector collector =
-        new JvmOtlpRuntimeMetricsTest.MetricCollector();
-    OtelMetricRegistry.INSTANCE.collectMetrics(collector);
+    @Test
+    void registersOnlyStableMetricsWhenExperimentalDisabled() {
+        JvmOtlpRuntimeMetricsTest.MetricCollector collector = new JvmOtlpRuntimeMetricsTest.MetricCollector();
+        OtelMetricRegistry.INSTANCE.collectMetrics(collector);
 
-    Set<String> names = collector.metricNames;
+        Set<String> names = collector.metricNames;
 
-    List<String> expectedStableMetrics =
-        Arrays.asList(
-            "jvm.memory.used",
-            "jvm.memory.committed",
-            "jvm.memory.limit",
-            "jvm.memory.used_after_last_gc",
-            "jvm.thread.count",
-            "jvm.class.loaded",
-            "jvm.class.count",
-            "jvm.class.unloaded",
-            "jvm.cpu.time",
-            "jvm.cpu.count",
-            "jvm.cpu.recent_utilization",
-            "jvm.gc.duration");
-    for (String metric : expectedStableMetrics) {
-      assertTrue(
-          names.contains(metric),
-          "Expected stable metric '" + metric + "' not found. Got: " + new TreeSet<>(names));
-    }
+        List<String> expectedStableMetrics = Arrays.asList(
+                "jvm.memory.used",
+                "jvm.memory.committed",
+                "jvm.memory.limit",
+                "jvm.memory.used_after_last_gc",
+                "jvm.thread.count",
+                "jvm.class.loaded",
+                "jvm.class.count",
+                "jvm.class.unloaded",
+                "jvm.cpu.time",
+                "jvm.cpu.count",
+                "jvm.cpu.recent_utilization",
+                "jvm.gc.duration");
+        for (String metric : expectedStableMetrics) {
+            assertTrue(
+                    names.contains(metric),
+                    "Expected stable metric '" + metric + "' not found. Got: " + new TreeSet<>(names));
+        }
 
-    List<String> developmentMetrics =
-        Arrays.asList(
-            "jvm.memory.init",
-            "jvm.buffer.memory.used",
-            "jvm.buffer.memory.limit",
-            "jvm.buffer.count",
-            "jvm.system.cpu.utilization",
-            "jvm.system.cpu.load_1m",
-            "jvm.file_descriptor.count",
-            "jvm.file_descriptor.limit");
-    for (String metric : developmentMetrics) {
-      assertFalse(
-          names.contains(metric),
-          "Development metric '"
-              + metric
-              + "' should not be registered when experimental disabled. Got: "
-              + new TreeSet<>(names));
+        List<String> developmentMetrics = Arrays.asList(
+                "jvm.memory.init",
+                "jvm.buffer.memory.used",
+                "jvm.buffer.memory.limit",
+                "jvm.buffer.count",
+                "jvm.system.cpu.utilization",
+                "jvm.system.cpu.load_1m",
+                "jvm.file_descriptor.count",
+                "jvm.file_descriptor.limit");
+        for (String metric : developmentMetrics) {
+            assertFalse(
+                    names.contains(metric),
+                    "Development metric '"
+                            + metric
+                            + "' should not be registered when experimental disabled. Got: "
+                            + new TreeSet<>(names));
+        }
     }
-  }
 
-  @Test
-  void jvmGcDurationDataPointsOmitGcCauseWhenExperimentalDisabled() throws InterruptedException {
-    System.gc();
+    @Test
+    void jvmGcDurationDataPointsOmitGcCauseWhenExperimentalDisabled() throws InterruptedException {
+        System.gc();
 
-    List<JvmOtlpRuntimeMetricsTest.DataPointEntry> points = null;
-    long deadlineNanos = System.nanoTime() + TimeUnit.SECONDS.toNanos(2);
-    while (System.nanoTime() < deadlineNanos) {
-      JvmOtlpRuntimeMetricsTest.MetricCollector collector =
-          new JvmOtlpRuntimeMetricsTest.MetricCollector();
-      OtelMetricRegistry.INSTANCE.collectMetrics(collector);
-      points = collector.points.get("jvm.gc.duration");
-      if (points != null && !points.isEmpty()) {
-        break;
-      }
-      Thread.sleep(50);
-    }
+        List<JvmOtlpRuntimeMetricsTest.DataPointEntry> points = null;
+        long deadlineNanos = System.nanoTime() + TimeUnit.SECONDS.toNanos(2);
+        while (System.nanoTime() < deadlineNanos) {
+            JvmOtlpRuntimeMetricsTest.MetricCollector collector = new JvmOtlpRuntimeMetricsTest.MetricCollector();
+            OtelMetricRegistry.INSTANCE.collectMetrics(collector);
+            points = collector.points.get("jvm.gc.duration");
+            if (points != null && !points.isEmpty()) {
+                break;
+            }
+            Thread.sleep(50);
+        }
 
-    assertNotNull(points, "jvm.gc.duration should have data points after System.gc()");
-    assertFalse(points.isEmpty(), "jvm.gc.duration should have at least one data point");
-    assertTrue(
-        points.stream()
-            .allMatch(
-                p ->
-                    p.attrs.containsKey("jvm.gc.name")
-                        && p.attrs.containsKey("jvm.gc.action")
-                        && !p.attrs.containsKey("jvm.gc.cause")),
-        "jvm.gc.duration data points must carry jvm.gc.name and jvm.gc.action, but not jvm.gc.cause"
-            + " when experimental disabled");
-  }
+        assertNotNull(points, "jvm.gc.duration should have data points after System.gc()");
+        assertFalse(points.isEmpty(), "jvm.gc.duration should have at least one data point");
+        assertTrue(
+                points.stream()
+                        .allMatch(p -> p.attrs.containsKey("jvm.gc.name")
+                                && p.attrs.containsKey("jvm.gc.action")
+                                && !p.attrs.containsKey("jvm.gc.cause")),
+                "jvm.gc.duration data points must carry jvm.gc.name and jvm.gc.action, but not jvm.gc.cause"
+                        + " when experimental disabled");
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/JvmOtlpRuntimeMetricsTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/JvmOtlpRuntimeMetricsTest.java
index 9aa86d9c5cc..529cf1e02f7 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/JvmOtlpRuntimeMetricsTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/JvmOtlpRuntimeMetricsTest.java
@@ -44,267 +44,253 @@
  */
 public class JvmOtlpRuntimeMetricsTest {
 
-  @BeforeAll
-  static void setUp() {
-    System.setProperty("dd.metrics.otel.enabled", "true");
-    JvmOtlpRuntimeMetrics.start(true);
-  }
-
-  @Test
-  void registersExpectedJvmMetrics() {
-    MetricCollector collector = new MetricCollector();
-    OtelMetricRegistry.INSTANCE.collectMetrics(collector);
-
-    List<String> expectedMetrics =
-        Arrays.asList(
-            "jvm.memory.used",
-            "jvm.memory.committed",
-            "jvm.memory.limit",
-            "jvm.memory.init",
-            "jvm.memory.used_after_last_gc",
-            "jvm.buffer.memory.used",
-            "jvm.buffer.memory.limit",
-            "jvm.buffer.count",
-            "jvm.thread.count",
-            "jvm.class.loaded",
-            "jvm.class.count",
-            "jvm.class.unloaded",
-            "jvm.cpu.time",
-            "jvm.cpu.count",
-            "jvm.cpu.recent_utilization",
-            "jvm.system.cpu.utilization",
-            "jvm.system.cpu.load_1m",
-            "jvm.gc.duration");
-
-    Set<String> names = collector.metricNames;
-    for (String metric : expectedMetrics) {
-      assertTrue(
-          names.contains(metric),
-          "Expected metric '" + metric + "' not found. Got: " + new TreeSet<>(names));
+    @BeforeAll
+    static void setUp() {
+        System.setProperty("dd.metrics.otel.enabled", "true");
+        JvmOtlpRuntimeMetrics.start(true);
     }
 
-    int expectedSize = expectedMetrics.size();
-    if (ManagementFactory.getOperatingSystemMXBean() instanceof UnixOperatingSystemMXBean) {
-      assertTrue(
-          names.contains("jvm.file_descriptor.count"),
-          "Expected jvm.file_descriptor.count on Unix. Got: " + new TreeSet<>(names));
-      assertTrue(
-          names.contains("jvm.file_descriptor.limit"),
-          "Expected jvm.file_descriptor.limit on Unix. Got: " + new TreeSet<>(names));
-      expectedSize += 2;
+    @Test
+    void registersExpectedJvmMetrics() {
+        MetricCollector collector = new MetricCollector();
+        OtelMetricRegistry.INSTANCE.collectMetrics(collector);
+
+        List<String> expectedMetrics = Arrays.asList(
+                "jvm.memory.used",
+                "jvm.memory.committed",
+                "jvm.memory.limit",
+                "jvm.memory.init",
+                "jvm.memory.used_after_last_gc",
+                "jvm.buffer.memory.used",
+                "jvm.buffer.memory.limit",
+                "jvm.buffer.count",
+                "jvm.thread.count",
+                "jvm.class.loaded",
+                "jvm.class.count",
+                "jvm.class.unloaded",
+                "jvm.cpu.time",
+                "jvm.cpu.count",
+                "jvm.cpu.recent_utilization",
+                "jvm.system.cpu.utilization",
+                "jvm.system.cpu.load_1m",
+                "jvm.gc.duration");
+
+        Set<String> names = collector.metricNames;
+        for (String metric : expectedMetrics) {
+            assertTrue(
+                    names.contains(metric), "Expected metric '" + metric + "' not found. Got: " + new TreeSet<>(names));
+        }
+
+        int expectedSize = expectedMetrics.size();
+        if (ManagementFactory.getOperatingSystemMXBean() instanceof UnixOperatingSystemMXBean) {
+            assertTrue(
+                    names.contains("jvm.file_descriptor.count"),
+                    "Expected jvm.file_descriptor.count on Unix. Got: " + new TreeSet<>(names));
+            assertTrue(
+                    names.contains("jvm.file_descriptor.limit"),
+                    "Expected jvm.file_descriptor.limit on Unix. Got: " + new TreeSet<>(names));
+            expectedSize += 2;
+        }
+
+        assertEquals(expectedSize, names.size(), "Unexpected metric count: " + new TreeSet<>(names));
+
+        // No DD-proprietary names should be present
+        List<String> ddNames = names.stream()
+                .filter(n -> n.startsWith("jvm.heap_memory") || n.startsWith("jvm.thread_count"))
+                .collect(Collectors.toList());
+        assertTrue(ddNames.isEmpty(), "DD-proprietary names leaked: " + ddNames);
     }
 
-    assertEquals(expectedSize, names.size(), "Unexpected metric count: " + new TreeSet<>(names));
-
-    // No DD-proprietary names should be present
-    List<String> ddNames =
-        names.stream()
-            .filter(n -> n.startsWith("jvm.heap_memory") || n.startsWith("jvm.thread_count"))
-            .collect(Collectors.toList());
-    assertTrue(ddNames.isEmpty(), "DD-proprietary names leaked: " + ddNames);
-  }
-
-  @Test
-  void jvmMemoryUsedHasHeapAndNonHeapTypeAttributes() {
-    MetricCollector collector = new MetricCollector();
-    OtelMetricRegistry.INSTANCE.collectMetrics(collector);
-
-    Set<String> types = collector.attributeValues("jvm.memory.used", "jvm.memory.type");
-    assertTrue(types.contains("heap"), "jvm.memory.used should have heap attribute");
-    assertTrue(types.contains("non_heap"), "jvm.memory.used should have non_heap attribute");
-  }
-
-  @Test
-  void jvmMemoryUsedHeapValueIsPositive() {
-    MetricCollector collector = new MetricCollector();
-    OtelMetricRegistry.INSTANCE.collectMetrics(collector);
-
-    List<DataPointEntry> points = collector.points.get("jvm.memory.used");
-    assertNotNull(points, "jvm.memory.used should have data points");
-    DataPointEntry heapAggregate =
-        points.stream()
-            .filter(
-                p ->
-                    "heap".equals(p.attrs.get("jvm.memory.type"))
-                        && p.attrs.get("jvm.memory.pool.name") == null)
-            .findFirst()
-            .orElse(null);
-    assertNotNull(heapAggregate, "jvm.memory.used should have a heap aggregate data point");
-    assertTrue(
-        heapAggregate.value.longValue() > 0,
-        "jvm.memory.used heap aggregate should be positive, got " + heapAggregate.value);
-  }
-
-  @Test
-  void jvmThreadCountIsBucketedByDaemonAndState() {
-    MetricCollector collector = new MetricCollector();
-    OtelMetricRegistry.INSTANCE.collectMetrics(collector);
-
-    List<DataPointEntry> threadPoints = collector.points.get("jvm.thread.count");
-    assertNotNull(threadPoints, "jvm.thread.count should have data points");
-    assertFalse(threadPoints.isEmpty(), "jvm.thread.count should have data points");
-
-    // Every data point must carry both jvm.thread.daemon (Boolean) and jvm.thread.state (String).
-    Set<String> validStates = new HashSet<>();
-    for (Thread.State state : Thread.State.values()) {
-      validStates.add(state.name().toLowerCase(Locale.ROOT));
-    }
-    long totalThreads = 0;
-    for (DataPointEntry point : threadPoints) {
-      Object daemon = point.attrs.get("jvm.thread.daemon");
-      Object state = point.attrs.get("jvm.thread.state");
-      assertNotNull(daemon, "jvm.thread.count point missing jvm.thread.daemon: " + point.attrs);
-      assertNotNull(state, "jvm.thread.count point missing jvm.thread.state: " + point.attrs);
-      assertTrue(
-          "true".equals(daemon.toString()) || "false".equals(daemon.toString()),
-          "jvm.thread.daemon must be a boolean string, got " + daemon);
-      assertTrue(
-          validStates.contains(state.toString()),
-          "jvm.thread.state must be one of " + validStates + ", got " + state);
-      assertTrue(
-          point.value.longValue() > 0,
-          "jvm.thread.count bucket should be positive (empty buckets must be skipped), got "
-              + point.value
-              + " for "
-              + point.attrs);
-      totalThreads += point.value.longValue();
+    @Test
+    void jvmMemoryUsedHasHeapAndNonHeapTypeAttributes() {
+        MetricCollector collector = new MetricCollector();
+        OtelMetricRegistry.INSTANCE.collectMetrics(collector);
+
+        Set<String> types = collector.attributeValues("jvm.memory.used", "jvm.memory.type");
+        assertTrue(types.contains("heap"), "jvm.memory.used should have heap attribute");
+        assertTrue(types.contains("non_heap"), "jvm.memory.used should have non_heap attribute");
     }
-    assertTrue(totalThreads > 0, "Sum of jvm.thread.count buckets should be positive");
-
-    // The test JVM has at minimum: the main test thread (non-daemon) plus GC/JMX/etc. daemon
-    // threads — so we should observe at least one daemon=true and one daemon=false bucket.
-    Set<String> daemonValues = collector.attributeValues("jvm.thread.count", "jvm.thread.daemon");
-    assertTrue(
-        daemonValues.contains("true") && daemonValues.contains("false"),
-        "jvm.thread.count should emit both daemon and non-daemon buckets, got: " + daemonValues);
-  }
-
-  @Test
-  void jvmMemoryInitHasHeapNonHeapAndPoolAttributes() {
-    MetricCollector collector = new MetricCollector();
-    OtelMetricRegistry.INSTANCE.collectMetrics(collector);
-
-    Set<String> types = collector.attributeValues("jvm.memory.init", "jvm.memory.type");
-    assertTrue(types.contains("heap"), "jvm.memory.init should have heap aggregate");
-    assertTrue(types.contains("non_heap"), "jvm.memory.init should have non_heap aggregate");
-
-    Set<String> poolNames = collector.attributeValues("jvm.memory.init", "jvm.memory.pool.name");
-    assertFalse(
-        poolNames.isEmpty(),
-        "jvm.memory.init should have per-pool data points carrying jvm.memory.pool.name");
-  }
-
-  @Test
-  void jvmMemoryInitHeapAggregateIsPositive() {
-    MetricCollector collector = new MetricCollector();
-    OtelMetricRegistry.INSTANCE.collectMetrics(collector);
-
-    List<DataPointEntry> points = collector.points.get("jvm.memory.init");
-    assertNotNull(points, "jvm.memory.init should have data points");
-    DataPointEntry heapAggregate =
-        points.stream()
-            .filter(
-                p ->
-                    "heap".equals(p.attrs.get("jvm.memory.type"))
-                        && p.attrs.get("jvm.memory.pool.name") == null)
-            .findFirst()
-            .orElse(null);
-    assertNotNull(heapAggregate, "jvm.memory.init should have a heap aggregate data point");
-    assertTrue(
-        heapAggregate.value.longValue() > 0,
-        "jvm.memory.init heap aggregate should be positive, got " + heapAggregate.value);
-  }
-
-  @Test
-  void jvmGcDurationRecordsDataPointsAfterGc() throws InterruptedException {
-    // Force a GC; the JMX NotificationListener should observe the event and record a data
-    // point onto the jvm.gc.duration histogram.
-    System.gc();
-
-    // JMX delivers the notification on the JVM's internal notification thread, so we have
-    // to poll briefly. Two seconds is generous — delivery is typically sub-50ms.
-    List<DataPointEntry> points = null;
-    long deadlineNanos = System.nanoTime() + java.util.concurrent.TimeUnit.SECONDS.toNanos(2);
-    while (System.nanoTime() < deadlineNanos) {
-      MetricCollector collector = new MetricCollector();
-      OtelMetricRegistry.INSTANCE.collectMetrics(collector);
-      points = collector.points.get("jvm.gc.duration");
-      if (points != null && !points.isEmpty()) {
-        break;
-      }
-      Thread.sleep(50);
+
+    @Test
+    void jvmMemoryUsedHeapValueIsPositive() {
+        MetricCollector collector = new MetricCollector();
+        OtelMetricRegistry.INSTANCE.collectMetrics(collector);
+
+        List<DataPointEntry> points = collector.points.get("jvm.memory.used");
+        assertNotNull(points, "jvm.memory.used should have data points");
+        DataPointEntry heapAggregate = points.stream()
+                .filter(p ->
+                        "heap".equals(p.attrs.get("jvm.memory.type")) && p.attrs.get("jvm.memory.pool.name") == null)
+                .findFirst()
+                .orElse(null);
+        assertNotNull(heapAggregate, "jvm.memory.used should have a heap aggregate data point");
+        assertTrue(
+                heapAggregate.value.longValue() > 0,
+                "jvm.memory.used heap aggregate should be positive, got " + heapAggregate.value);
     }
 
-    assertNotNull(points, "jvm.gc.duration should have data points after System.gc()");
-    assertFalse(points.isEmpty(), "jvm.gc.duration should have at least one data point");
-    assertTrue(
-        points.stream()
-            .allMatch(
-                p -> p.attrs.containsKey("jvm.gc.name") && p.attrs.containsKey("jvm.gc.action")),
-        "Every jvm.gc.duration data point should carry jvm.gc.name and jvm.gc.action attributes");
-  }
-
-  static final class DataPointEntry {
-    final Map<String, Object> attrs;
-    final Number value;
-
-    DataPointEntry(Map<String, Object> attrs, Number value) {
-      this.attrs = attrs;
-      this.value = value;
+    @Test
+    void jvmThreadCountIsBucketedByDaemonAndState() {
+        MetricCollector collector = new MetricCollector();
+        OtelMetricRegistry.INSTANCE.collectMetrics(collector);
+
+        List<DataPointEntry> threadPoints = collector.points.get("jvm.thread.count");
+        assertNotNull(threadPoints, "jvm.thread.count should have data points");
+        assertFalse(threadPoints.isEmpty(), "jvm.thread.count should have data points");
+
+        // Every data point must carry both jvm.thread.daemon (Boolean) and jvm.thread.state (String).
+        Set<String> validStates = new HashSet<>();
+        for (Thread.State state : Thread.State.values()) {
+            validStates.add(state.name().toLowerCase(Locale.ROOT));
+        }
+        long totalThreads = 0;
+        for (DataPointEntry point : threadPoints) {
+            Object daemon = point.attrs.get("jvm.thread.daemon");
+            Object state = point.attrs.get("jvm.thread.state");
+            assertNotNull(daemon, "jvm.thread.count point missing jvm.thread.daemon: " + point.attrs);
+            assertNotNull(state, "jvm.thread.count point missing jvm.thread.state: " + point.attrs);
+            assertTrue(
+                    "true".equals(daemon.toString()) || "false".equals(daemon.toString()),
+                    "jvm.thread.daemon must be a boolean string, got " + daemon);
+            assertTrue(
+                    validStates.contains(state.toString()),
+                    "jvm.thread.state must be one of " + validStates + ", got " + state);
+            assertTrue(
+                    point.value.longValue() > 0,
+                    "jvm.thread.count bucket should be positive (empty buckets must be skipped), got "
+                            + point.value
+                            + " for "
+                            + point.attrs);
+            totalThreads += point.value.longValue();
+        }
+        assertTrue(totalThreads > 0, "Sum of jvm.thread.count buckets should be positive");
+
+        // The test JVM has at minimum: the main test thread (non-daemon) plus GC/JMX/etc. daemon
+        // threads — so we should observe at least one daemon=true and one daemon=false bucket.
+        Set<String> daemonValues = collector.attributeValues("jvm.thread.count", "jvm.thread.daemon");
+        assertTrue(
+                daemonValues.contains("true") && daemonValues.contains("false"),
+                "jvm.thread.count should emit both daemon and non-daemon buckets, got: " + daemonValues);
     }
-  }
 
-  static final class MetricCollector
-      implements OtlpMetricsVisitor, OtlpScopedMetricsVisitor, OtlpMetricVisitor {
+    @Test
+    void jvmMemoryInitHasHeapNonHeapAndPoolAttributes() {
+        MetricCollector collector = new MetricCollector();
+        OtelMetricRegistry.INSTANCE.collectMetrics(collector);
 
-    String currentInstrument = "";
-    final Map<String, Object> currentAttrs = new LinkedHashMap<>();
-    final Set<String> metricNames = new LinkedHashSet<>();
-    final Map<String, List<DataPointEntry>> points = new LinkedHashMap<>();
+        Set<String> types = collector.attributeValues("jvm.memory.init", "jvm.memory.type");
+        assertTrue(types.contains("heap"), "jvm.memory.init should have heap aggregate");
+        assertTrue(types.contains("non_heap"), "jvm.memory.init should have non_heap aggregate");
 
-    @Override
-    public OtlpScopedMetricsVisitor visitScopedMetrics(OtelInstrumentationScope scope) {
-      return this;
+        Set<String> poolNames = collector.attributeValues("jvm.memory.init", "jvm.memory.pool.name");
+        assertFalse(
+                poolNames.isEmpty(), "jvm.memory.init should have per-pool data points carrying jvm.memory.pool.name");
     }
 
-    @Override
-    public OtlpMetricVisitor visitMetric(OtelInstrumentDescriptor descriptor) {
-      currentInstrument = descriptor.getName().toString();
-      metricNames.add(currentInstrument);
-      points.computeIfAbsent(currentInstrument, k -> new ArrayList<>());
-      return this;
+    @Test
+    void jvmMemoryInitHeapAggregateIsPositive() {
+        MetricCollector collector = new MetricCollector();
+        OtelMetricRegistry.INSTANCE.collectMetrics(collector);
+
+        List<DataPointEntry> points = collector.points.get("jvm.memory.init");
+        assertNotNull(points, "jvm.memory.init should have data points");
+        DataPointEntry heapAggregate = points.stream()
+                .filter(p ->
+                        "heap".equals(p.attrs.get("jvm.memory.type")) && p.attrs.get("jvm.memory.pool.name") == null)
+                .findFirst()
+                .orElse(null);
+        assertNotNull(heapAggregate, "jvm.memory.init should have a heap aggregate data point");
+        assertTrue(
+                heapAggregate.value.longValue() > 0,
+                "jvm.memory.init heap aggregate should be positive, got " + heapAggregate.value);
     }
 
-    @Override
-    public void visitAttribute(int type, String key, Object value) {
-      currentAttrs.put(key, value == null ? null : value.toString());
+    @Test
+    void jvmGcDurationRecordsDataPointsAfterGc() throws InterruptedException {
+        // Force a GC; the JMX NotificationListener should observe the event and record a data
+        // point onto the jvm.gc.duration histogram.
+        System.gc();
+
+        // JMX delivers the notification on the JVM's internal notification thread, so we have
+        // to poll briefly. Two seconds is generous — delivery is typically sub-50ms.
+        List<DataPointEntry> points = null;
+        long deadlineNanos = System.nanoTime() + java.util.concurrent.TimeUnit.SECONDS.toNanos(2);
+        while (System.nanoTime() < deadlineNanos) {
+            MetricCollector collector = new MetricCollector();
+            OtelMetricRegistry.INSTANCE.collectMetrics(collector);
+            points = collector.points.get("jvm.gc.duration");
+            if (points != null && !points.isEmpty()) {
+                break;
+            }
+            Thread.sleep(50);
+        }
+
+        assertNotNull(points, "jvm.gc.duration should have data points after System.gc()");
+        assertFalse(points.isEmpty(), "jvm.gc.duration should have at least one data point");
+        assertTrue(
+                points.stream()
+                        .allMatch(p -> p.attrs.containsKey("jvm.gc.name") && p.attrs.containsKey("jvm.gc.action")),
+                "Every jvm.gc.duration data point should carry jvm.gc.name and jvm.gc.action attributes");
     }
 
-    @Override
-    public void visitDataPoint(OtlpDataPoint point) {
-      Map<String, Object> attrs = new HashMap<>(currentAttrs);
-      currentAttrs.clear();
-      Number value = 0;
-      if (point instanceof OtlpLongPoint) {
-        value = ((OtlpLongPoint) point).value;
-      } else if (point instanceof OtlpDoublePoint) {
-        value = ((OtlpDoublePoint) point).value;
-      }
-      points
-          .computeIfAbsent(currentInstrument, k -> new ArrayList<>())
-          .add(new DataPointEntry(attrs, value));
+    static final class DataPointEntry {
+        final Map<String, Object> attrs;
+        final Number value;
+
+        DataPointEntry(Map<String, Object> attrs, Number value) {
+            this.attrs = attrs;
+            this.value = value;
+        }
     }
 
-    Set<String> attributeValues(String metricName, String attrKey) {
-      List<DataPointEntry> entries = points.get(metricName);
-      if (entries == null) {
-        return new LinkedHashSet<>();
-      }
-      return entries.stream()
-          .map(e -> e.attrs.get(attrKey))
-          .filter(Objects::nonNull)
-          .map(Object::toString)
-          .collect(Collectors.toCollection(LinkedHashSet::new));
+    static final class MetricCollector implements OtlpMetricsVisitor, OtlpScopedMetricsVisitor, OtlpMetricVisitor {
+
+        String currentInstrument = "";
+        final Map<String, Object> currentAttrs = new LinkedHashMap<>();
+        final Set<String> metricNames = new LinkedHashSet<>();
+        final Map<String, List<DataPointEntry>> points = new LinkedHashMap<>();
+
+        @Override
+        public OtlpScopedMetricsVisitor visitScopedMetrics(OtelInstrumentationScope scope) {
+            return this;
+        }
+
+        @Override
+        public OtlpMetricVisitor visitMetric(OtelInstrumentDescriptor descriptor) {
+            currentInstrument = descriptor.getName().toString();
+            metricNames.add(currentInstrument);
+            points.computeIfAbsent(currentInstrument, k -> new ArrayList<>());
+            return this;
+        }
+
+        @Override
+        public void visitAttribute(int type, String key, Object value) {
+            currentAttrs.put(key, value == null ? null : value.toString());
+        }
+
+        @Override
+        public void visitDataPoint(OtlpDataPoint point) {
+            Map<String, Object> attrs = new HashMap<>(currentAttrs);
+            currentAttrs.clear();
+            Number value = 0;
+            if (point instanceof OtlpLongPoint) {
+                value = ((OtlpLongPoint) point).value;
+            } else if (point instanceof OtlpDoublePoint) {
+                value = ((OtlpDoublePoint) point).value;
+            }
+            points.computeIfAbsent(currentInstrument, k -> new ArrayList<>()).add(new DataPointEntry(attrs, value));
+        }
+
+        Set<String> attributeValues(String metricName, String attrKey) {
+            List<DataPointEntry> entries = points.get(metricName);
+            if (entries == null) {
+                return new LinkedHashSet<>();
+            }
+            return entries.stream()
+                    .map(e -> e.attrs.get(attrKey))
+                    .filter(Objects::nonNull)
+                    .map(Object::toString)
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsActivationByInstrumentationNameForkedTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsActivationByInstrumentationNameForkedTest.java
index 0ea9a37f217..49705ba0412 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsActivationByInstrumentationNameForkedTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsActivationByInstrumentationNameForkedTest.java
@@ -5,11 +5,10 @@
 // Forked test: runs in an isolated JVM with opentelemetry-metrics instrumentation enabled
 // by integration name. GlobalOpenTelemetry holds static state that must reset between variants.
 @WithConfig(key = "integration.opentelemetry-metrics.enabled", value = "true")
-class OpenTelemetryMetricsActivationByInstrumentationNameForkedTest
-    extends OpenTelemetryMetricsActivationTest {
+class OpenTelemetryMetricsActivationByInstrumentationNameForkedTest extends OpenTelemetryMetricsActivationTest {
 
-  @Override
-  boolean shouldBeInjected() {
-    return true;
-  }
+    @Override
+    boolean shouldBeInjected() {
+        return true;
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsActivationByOtelRfcNameForkedTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsActivationByOtelRfcNameForkedTest.java
index 086f296513d..d4f17d677d8 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsActivationByOtelRfcNameForkedTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsActivationByOtelRfcNameForkedTest.java
@@ -5,11 +5,10 @@
 // Forked test: runs in an isolated JVM with opentelemetry-metrics instrumentation enabled
 // by OTel RFC config name. GlobalOpenTelemetry holds static state that must reset between variants.
 @WithConfig(key = "metrics.otel.enabled", value = "true")
-class OpenTelemetryMetricsActivationByOtelRfcNameForkedTest
-    extends OpenTelemetryMetricsActivationTest {
+class OpenTelemetryMetricsActivationByOtelRfcNameForkedTest extends OpenTelemetryMetricsActivationTest {
 
-  @Override
-  boolean shouldBeInjected() {
-    return true;
-  }
+    @Override
+    boolean shouldBeInjected() {
+        return true;
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsActivationTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsActivationTest.java
index 1068a76fa80..d774a8db05b 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsActivationTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsActivationTest.java
@@ -9,19 +9,19 @@
 
 abstract class OpenTelemetryMetricsActivationTest extends AbstractInstrumentationTest {
 
-  abstract boolean shouldBeInjected();
+    abstract boolean shouldBeInjected();
 
-  @Test
-  void testInstrumentationInjection() {
-    Meter meter = GlobalOpenTelemetry.get().getMeterProvider().get("some-instrumentation");
-    if (shouldBeInjected()) {
-      assertTrue(
-          meter.getClass().getName().endsWith(".OtelMeter"),
-          "Expected OtelMeter but got: " + meter.getClass().getName());
-    } else {
-      assertTrue(
-          meter.getClass().getName().endsWith(".DefaultMeter"),
-          "Expected DefaultMeter but got: " + meter.getClass().getName());
+    @Test
+    void testInstrumentationInjection() {
+        Meter meter = GlobalOpenTelemetry.get().getMeterProvider().get("some-instrumentation");
+        if (shouldBeInjected()) {
+            assertTrue(
+                    meter.getClass().getName().endsWith(".OtelMeter"),
+                    "Expected OtelMeter but got: " + meter.getClass().getName());
+        } else {
+            assertTrue(
+                    meter.getClass().getName().endsWith(".DefaultMeter"),
+                    "Expected DefaultMeter but got: " + meter.getClass().getName());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsCumulativeForkedTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsCumulativeForkedTest.java
index f888fd990c2..ae7e0e742e2 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsCumulativeForkedTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsCumulativeForkedTest.java
@@ -23,125 +23,121 @@
 @WithConfig(key = "otlp.metrics.temporality.preference", value = "cumulative")
 class OpenTelemetryMetricsCumulativeForkedTest extends AbstractInstrumentationTest {
 
-  private static final Attributes SOME_ATTRIBUTES = Attributes.of(stringKey("some"), "thing");
-  private static final String WITH_ATTRS = "@{some=thing}";
-
-  private OtelMeterProvider meterProvider;
-  private Meter meter;
-  private Map<String, Object> points;
-  private OpenTelemetryMetricsTest.MeterReader meterReader;
-
-  @BeforeAll
-  static void registerHistogramFactory() {
-    datadog.metrics.api.Histograms.register(DDSketchHistograms.FACTORY);
-  }
-
-  @BeforeEach
-  void setUpMetrics() {
-    meterProvider = (OtelMeterProvider) GlobalOpenTelemetry.get().getMeterProvider();
-    meter = meterProvider.get("test");
-    points = new HashMap<>();
-    meterReader = new OpenTelemetryMetricsTest.MeterReader(points);
-  }
-
-  @Test
-  void testObservableLongCounterCumulative() {
-    long[] absoluteValue = {0L};
-    AutoCloseable observable =
-        meter
-            .counterBuilder("cumulative-observable-long-counter")
-            .buildWithCallback(m -> m.record(absoluteValue[0]));
-
-    absoluteValue[0] = 5L;
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(5L, points.get("test:cumulative-observable-long-counter"));
-
-    // cumulative: same absolute value is reported as-is (not as delta=0)
-    points.clear();
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(5L, points.get("test:cumulative-observable-long-counter"));
-
-    // absolute value increases: reports new absolute value
-    points.clear();
-    absoluteValue[0] = 12L;
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(12L, points.get("test:cumulative-observable-long-counter"));
-
-    closeQuietly(observable);
-  }
-
-  @Test
-  void testObservableDoubleCounterCumulative() {
-    double[] absoluteValue = {0.0};
-    AutoCloseable observable =
-        meter
-            .counterBuilder("cumulative-observable-double-counter")
-            .ofDoubles()
-            .buildWithCallback(m -> m.record(absoluteValue[0]));
-
-    absoluteValue[0] = 3.5;
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(3.5, points.get("test:cumulative-observable-double-counter"));
-
-    // cumulative: same absolute value is reported as-is (not as delta=0.0)
-    points.clear();
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(3.5, points.get("test:cumulative-observable-double-counter"));
-
-    // absolute value increases: reports new absolute value
-    points.clear();
-    absoluteValue[0] = 8.0;
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(8.0, points.get("test:cumulative-observable-double-counter"));
-
-    closeQuietly(observable);
-  }
-
-  @Test
-  void testSynchronousLongCounterCumulative() {
-    io.opentelemetry.api.metrics.LongCounter counter =
-        meter.counterBuilder("cumulative-long-counter").build();
-
-    counter.add(1);
-    counter.add(2, SOME_ATTRIBUTES);
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(1L, points.get("test:cumulative-long-counter"));
-    assertEquals(2L, points.get("test:cumulative-long-counter" + WITH_ATTRS));
-
-    // cumulative: values accumulate without reset between collects
-    points.clear();
-    counter.add(3);
-    counter.add(4, SOME_ATTRIBUTES);
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(4L, points.get("test:cumulative-long-counter"));
-    assertEquals(6L, points.get("test:cumulative-long-counter" + WITH_ATTRS));
-  }
-
-  @Test
-  void testSynchronousDoubleCounterCumulative() {
-    io.opentelemetry.api.metrics.DoubleCounter counter =
-        meter.counterBuilder("cumulative-double-counter").ofDoubles().build();
-
-    counter.add(1.0);
-    counter.add(2.0, SOME_ATTRIBUTES);
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(1.0, points.get("test:cumulative-double-counter"));
-    assertEquals(2.0, points.get("test:cumulative-double-counter" + WITH_ATTRS));
-
-    // cumulative: values accumulate without reset between collects
-    points.clear();
-    counter.add(0.5);
-    counter.add(1.5, SOME_ATTRIBUTES);
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(1.5, (double) points.get("test:cumulative-double-counter"), 0.001);
-    assertEquals(3.5, (double) points.get("test:cumulative-double-counter" + WITH_ATTRS), 0.001);
-  }
-
-  private static void closeQuietly(AutoCloseable closeable) {
-    try {
-      closeable.close();
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+    private static final Attributes SOME_ATTRIBUTES = Attributes.of(stringKey("some"), "thing");
+    private static final String WITH_ATTRS = "@{some=thing}";
+
+    private OtelMeterProvider meterProvider;
+    private Meter meter;
+    private Map<String, Object> points;
+    private OpenTelemetryMetricsTest.MeterReader meterReader;
+
+    @BeforeAll
+    static void registerHistogramFactory() {
+        datadog.metrics.api.Histograms.register(DDSketchHistograms.FACTORY);
+    }
+
+    @BeforeEach
+    void setUpMetrics() {
+        meterProvider = (OtelMeterProvider) GlobalOpenTelemetry.get().getMeterProvider();
+        meter = meterProvider.get("test");
+        points = new HashMap<>();
+        meterReader = new OpenTelemetryMetricsTest.MeterReader(points);
+    }
+
+    @Test
+    void testObservableLongCounterCumulative() {
+        long[] absoluteValue = {0L};
+        AutoCloseable observable = meter.counterBuilder("cumulative-observable-long-counter")
+                .buildWithCallback(m -> m.record(absoluteValue[0]));
+
+        absoluteValue[0] = 5L;
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(5L, points.get("test:cumulative-observable-long-counter"));
+
+        // cumulative: same absolute value is reported as-is (not as delta=0)
+        points.clear();
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(5L, points.get("test:cumulative-observable-long-counter"));
+
+        // absolute value increases: reports new absolute value
+        points.clear();
+        absoluteValue[0] = 12L;
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(12L, points.get("test:cumulative-observable-long-counter"));
+
+        closeQuietly(observable);
+    }
+
+    @Test
+    void testObservableDoubleCounterCumulative() {
+        double[] absoluteValue = {0.0};
+        AutoCloseable observable = meter.counterBuilder("cumulative-observable-double-counter")
+                .ofDoubles()
+                .buildWithCallback(m -> m.record(absoluteValue[0]));
+
+        absoluteValue[0] = 3.5;
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(3.5, points.get("test:cumulative-observable-double-counter"));
+
+        // cumulative: same absolute value is reported as-is (not as delta=0.0)
+        points.clear();
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(3.5, points.get("test:cumulative-observable-double-counter"));
+
+        // absolute value increases: reports new absolute value
+        points.clear();
+        absoluteValue[0] = 8.0;
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(8.0, points.get("test:cumulative-observable-double-counter"));
+
+        closeQuietly(observable);
+    }
+
+    @Test
+    void testSynchronousLongCounterCumulative() {
+        io.opentelemetry.api.metrics.LongCounter counter =
+                meter.counterBuilder("cumulative-long-counter").build();
+
+        counter.add(1);
+        counter.add(2, SOME_ATTRIBUTES);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(1L, points.get("test:cumulative-long-counter"));
+        assertEquals(2L, points.get("test:cumulative-long-counter" + WITH_ATTRS));
+
+        // cumulative: values accumulate without reset between collects
+        points.clear();
+        counter.add(3);
+        counter.add(4, SOME_ATTRIBUTES);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(4L, points.get("test:cumulative-long-counter"));
+        assertEquals(6L, points.get("test:cumulative-long-counter" + WITH_ATTRS));
+    }
+
+    @Test
+    void testSynchronousDoubleCounterCumulative() {
+        io.opentelemetry.api.metrics.DoubleCounter counter =
+                meter.counterBuilder("cumulative-double-counter").ofDoubles().build();
+
+        counter.add(1.0);
+        counter.add(2.0, SOME_ATTRIBUTES);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(1.0, points.get("test:cumulative-double-counter"));
+        assertEquals(2.0, points.get("test:cumulative-double-counter" + WITH_ATTRS));
+
+        // cumulative: values accumulate without reset between collects
+        points.clear();
+        counter.add(0.5);
+        counter.add(1.5, SOME_ATTRIBUTES);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(1.5, (double) points.get("test:cumulative-double-counter"), 0.001);
+        assertEquals(3.5, (double) points.get("test:cumulative-double-counter" + WITH_ATTRS), 0.001);
+    }
+
+    private static void closeQuietly(AutoCloseable closeable) {
+        try {
+            closeable.close();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsDisableByDefaultForkedTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsDisableByDefaultForkedTest.java
index e336fcfb580..3f603566e52 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsDisableByDefaultForkedTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsDisableByDefaultForkedTest.java
@@ -5,8 +5,8 @@
 // GlobalOpenTelemetry holds static state that must reset between variants.
 class OpenTelemetryMetricsDisableByDefaultForkedTest extends OpenTelemetryMetricsActivationTest {
 
-  @Override
-  boolean shouldBeInjected() {
-    return false;
-  }
+    @Override
+    boolean shouldBeInjected() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsTest.java
index a6332ae9267..efec654697e 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsTest.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/java/opentelemetry147/metrics/OpenTelemetryMetricsTest.java
@@ -38,622 +38,585 @@
 @WithConfig(key = "metrics.otel.enabled", value = "true")
 class OpenTelemetryMetricsTest extends AbstractInstrumentationTest {
 
-  private static final Attributes SOME_ATTRIBUTES = Attributes.of(stringKey("some"), "thing");
-  private static final String WITH_ATTRS = "@{some=thing}";
-
-  private OtelMeterProvider meterProvider;
-  private Meter meter;
-  private Map<String, Object> points;
-  private MeterReader meterReader;
-
-  @BeforeAll
-  static void registerHistogramFactory() {
-    datadog.metrics.api.Histograms.register(DDSketchHistograms.FACTORY);
-  }
-
-  @BeforeEach
-  void setUpMetrics() {
-    meterProvider = (OtelMeterProvider) GlobalOpenTelemetry.get().getMeterProvider();
-    meter = meterProvider.get("test");
-    points = new HashMap<>();
-    meterReader = new MeterReader(points);
-  }
-
-  @Test
-  void testLongCounter() {
-    io.opentelemetry.api.metrics.LongCounter counter = meter.counterBuilder("long-counter").build();
-    counter.add(1);
-    counter.add(2, SOME_ATTRIBUTES);
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(1L, points.get("test:long-counter"));
-    assertEquals(2L, points.get("test:long-counter" + WITH_ATTRS));
-  }
-
-  @Test
-  void testDoubleCounter() {
-    io.opentelemetry.api.metrics.DoubleCounter counter =
-        meter.counterBuilder("double-counter").ofDoubles().build();
-    counter.add(1.2);
-    counter.add(3.4, SOME_ATTRIBUTES);
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(1.2, points.get("test:double-counter"));
-    assertEquals(3.4, points.get("test:double-counter" + WITH_ATTRS));
-  }
-
-  @Test
-  void testLongUpDownCounter() {
-    io.opentelemetry.api.metrics.LongUpDownCounter counter =
-        meter.upDownCounterBuilder("long-up-down-counter").build();
-    counter.add(1);
-    counter.add(2, SOME_ATTRIBUTES);
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(1L, points.get("test:long-up-down-counter"));
-    assertEquals(2L, points.get("test:long-up-down-counter" + WITH_ATTRS));
-  }
-
-  @Test
-  void testDoubleUpDownCounter() {
-    io.opentelemetry.api.metrics.DoubleUpDownCounter counter =
-        meter.upDownCounterBuilder("double-up-down-counter").ofDoubles().build();
-    counter.add(1.2);
-    counter.add(3.4, SOME_ATTRIBUTES);
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(1.2, points.get("test:double-up-down-counter"));
-    assertEquals(3.4, points.get("test:double-up-down-counter" + WITH_ATTRS));
-  }
-
-  @Test
-  void testLongGauge() {
-    io.opentelemetry.api.metrics.LongGauge gauge =
-        meter.gaugeBuilder("long-gauge").ofLongs().build();
-    gauge.set(1);
-    gauge.set(2, SOME_ATTRIBUTES);
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(1L, points.get("test:long-gauge"));
-    assertEquals(2L, points.get("test:long-gauge" + WITH_ATTRS));
-  }
-
-  @Test
-  void testDoubleGauge() {
-    io.opentelemetry.api.metrics.DoubleGauge gauge = meter.gaugeBuilder("double-gauge").build();
-    gauge.set(1.2);
-    gauge.set(3.4, SOME_ATTRIBUTES);
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(1.2, points.get("test:double-gauge"));
-    assertEquals(3.4, points.get("test:double-gauge" + WITH_ATTRS));
-  }
-
-  @Test
-  void testLongHistogram() {
-    io.opentelemetry.api.metrics.LongHistogram histogram =
-        meter.histogramBuilder("long-histogram").ofLongs().build();
-    histogram.record(1);
-    histogram.record(24);
-    histogram.record(101, SOME_ATTRIBUTES);
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(
-        new HistogramData(
-            2.0, Arrays.asList(0.0, 5.0, 10.0, 25.0), Arrays.asList(0.0, 1.0, 0.0, 1.0), 25.0),
-        points.get("test:long-histogram"));
-    assertEquals(
-        new HistogramData(1.0, Arrays.asList(100.0, 250.0), Arrays.asList(0.0, 1.0), 101.0),
-        points.get("test:long-histogram" + WITH_ATTRS));
-  }
-
-  @Test
-  void testDoubleHistogram() {
-    io.opentelemetry.api.metrics.DoubleHistogram histogram =
-        meter.histogramBuilder("double-histogram").build();
-    histogram.record(1.2);
-    histogram.record(24.5);
-    histogram.record(101.2, SOME_ATTRIBUTES);
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(
-        new HistogramData(
-            2.0, Arrays.asList(0.0, 5.0, 10.0, 25.0), Arrays.asList(0.0, 1.0, 0.0, 1.0), 25.7),
-        points.get("test:double-histogram"));
-    assertEquals(
-        new HistogramData(1.0, Arrays.asList(100.0, 250.0), Arrays.asList(0.0, 1.0), 101.2),
-        points.get("test:double-histogram" + WITH_ATTRS));
-  }
-
-  @Test
-  void testLongHistogramOverflow() {
-    io.opentelemetry.api.metrics.LongHistogram histogram =
-        meter.histogramBuilder("long-histogram-overflow").ofLongs().build();
-    histogram.record(20_000); // exceeds highest default boundary of 10_000
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(
-        new HistogramData(
-            1.0,
-            Arrays.asList(10_000.0, Double.POSITIVE_INFINITY),
-            Arrays.asList(0.0, 1.0),
-            20_000.0),
-        points.get("test:long-histogram-overflow"));
-  }
-
-  @Test
-  void testDoubleHistogramOverflow() {
-    io.opentelemetry.api.metrics.DoubleHistogram histogram =
-        meter.histogramBuilder("double-histogram-overflow").build();
-    histogram.record(20_000.5); // exceeds highest default boundary of 10_000
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(
-        new HistogramData(
-            1.0,
-            Arrays.asList(10_000.0, Double.POSITIVE_INFINITY),
-            Arrays.asList(0.0, 1.0),
-            20_000.5),
-        points.get("test:double-histogram-overflow"));
-  }
-
-  @Test
-  void testObservableLongCounter() {
-    AutoCloseable observable =
-        meter
-            .counterBuilder("observable-long-counter")
-            .buildWithCallback(
-                m -> {
-                  m.record(1);
-                  m.record(2, SOME_ATTRIBUTES);
-                });
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(1L, points.get("test:observable-long-counter"));
-    assertEquals(2L, points.get("test:observable-long-counter" + WITH_ATTRS));
-
-    // second collect: absolute values are reported, not accumulated
-    points.clear();
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(0L, points.get("test:observable-long-counter"));
-    assertEquals(0L, points.get("test:observable-long-counter" + WITH_ATTRS));
-
-    closeQuietly(observable);
-  }
-
-  @Test
-  void testObservableDoubleCounter() {
-    AutoCloseable observable =
-        meter
-            .counterBuilder("observable-double-counter")
-            .ofDoubles()
-            .buildWithCallback(
-                m -> {
-                  m.record(1.2);
-                  m.record(3.4, SOME_ATTRIBUTES);
+    private static final Attributes SOME_ATTRIBUTES = Attributes.of(stringKey("some"), "thing");
+    private static final String WITH_ATTRS = "@{some=thing}";
+
+    private OtelMeterProvider meterProvider;
+    private Meter meter;
+    private Map<String, Object> points;
+    private MeterReader meterReader;
+
+    @BeforeAll
+    static void registerHistogramFactory() {
+        datadog.metrics.api.Histograms.register(DDSketchHistograms.FACTORY);
+    }
+
+    @BeforeEach
+    void setUpMetrics() {
+        meterProvider = (OtelMeterProvider) GlobalOpenTelemetry.get().getMeterProvider();
+        meter = meterProvider.get("test");
+        points = new HashMap<>();
+        meterReader = new MeterReader(points);
+    }
+
+    @Test
+    void testLongCounter() {
+        io.opentelemetry.api.metrics.LongCounter counter =
+                meter.counterBuilder("long-counter").build();
+        counter.add(1);
+        counter.add(2, SOME_ATTRIBUTES);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(1L, points.get("test:long-counter"));
+        assertEquals(2L, points.get("test:long-counter" + WITH_ATTRS));
+    }
+
+    @Test
+    void testDoubleCounter() {
+        io.opentelemetry.api.metrics.DoubleCounter counter =
+                meter.counterBuilder("double-counter").ofDoubles().build();
+        counter.add(1.2);
+        counter.add(3.4, SOME_ATTRIBUTES);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(1.2, points.get("test:double-counter"));
+        assertEquals(3.4, points.get("test:double-counter" + WITH_ATTRS));
+    }
+
+    @Test
+    void testLongUpDownCounter() {
+        io.opentelemetry.api.metrics.LongUpDownCounter counter =
+                meter.upDownCounterBuilder("long-up-down-counter").build();
+        counter.add(1);
+        counter.add(2, SOME_ATTRIBUTES);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(1L, points.get("test:long-up-down-counter"));
+        assertEquals(2L, points.get("test:long-up-down-counter" + WITH_ATTRS));
+    }
+
+    @Test
+    void testDoubleUpDownCounter() {
+        io.opentelemetry.api.metrics.DoubleUpDownCounter counter =
+                meter.upDownCounterBuilder("double-up-down-counter").ofDoubles().build();
+        counter.add(1.2);
+        counter.add(3.4, SOME_ATTRIBUTES);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(1.2, points.get("test:double-up-down-counter"));
+        assertEquals(3.4, points.get("test:double-up-down-counter" + WITH_ATTRS));
+    }
+
+    @Test
+    void testLongGauge() {
+        io.opentelemetry.api.metrics.LongGauge gauge =
+                meter.gaugeBuilder("long-gauge").ofLongs().build();
+        gauge.set(1);
+        gauge.set(2, SOME_ATTRIBUTES);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(1L, points.get("test:long-gauge"));
+        assertEquals(2L, points.get("test:long-gauge" + WITH_ATTRS));
+    }
+
+    @Test
+    void testDoubleGauge() {
+        io.opentelemetry.api.metrics.DoubleGauge gauge =
+                meter.gaugeBuilder("double-gauge").build();
+        gauge.set(1.2);
+        gauge.set(3.4, SOME_ATTRIBUTES);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(1.2, points.get("test:double-gauge"));
+        assertEquals(3.4, points.get("test:double-gauge" + WITH_ATTRS));
+    }
+
+    @Test
+    void testLongHistogram() {
+        io.opentelemetry.api.metrics.LongHistogram histogram =
+                meter.histogramBuilder("long-histogram").ofLongs().build();
+        histogram.record(1);
+        histogram.record(24);
+        histogram.record(101, SOME_ATTRIBUTES);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(
+                new HistogramData(2.0, Arrays.asList(0.0, 5.0, 10.0, 25.0), Arrays.asList(0.0, 1.0, 0.0, 1.0), 25.0),
+                points.get("test:long-histogram"));
+        assertEquals(
+                new HistogramData(1.0, Arrays.asList(100.0, 250.0), Arrays.asList(0.0, 1.0), 101.0),
+                points.get("test:long-histogram" + WITH_ATTRS));
+    }
+
+    @Test
+    void testDoubleHistogram() {
+        io.opentelemetry.api.metrics.DoubleHistogram histogram =
+                meter.histogramBuilder("double-histogram").build();
+        histogram.record(1.2);
+        histogram.record(24.5);
+        histogram.record(101.2, SOME_ATTRIBUTES);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(
+                new HistogramData(2.0, Arrays.asList(0.0, 5.0, 10.0, 25.0), Arrays.asList(0.0, 1.0, 0.0, 1.0), 25.7),
+                points.get("test:double-histogram"));
+        assertEquals(
+                new HistogramData(1.0, Arrays.asList(100.0, 250.0), Arrays.asList(0.0, 1.0), 101.2),
+                points.get("test:double-histogram" + WITH_ATTRS));
+    }
+
+    @Test
+    void testLongHistogramOverflow() {
+        io.opentelemetry.api.metrics.LongHistogram histogram =
+                meter.histogramBuilder("long-histogram-overflow").ofLongs().build();
+        histogram.record(20_000); // exceeds highest default boundary of 10_000
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(
+                new HistogramData(
+                        1.0, Arrays.asList(10_000.0, Double.POSITIVE_INFINITY), Arrays.asList(0.0, 1.0), 20_000.0),
+                points.get("test:long-histogram-overflow"));
+    }
+
+    @Test
+    void testDoubleHistogramOverflow() {
+        io.opentelemetry.api.metrics.DoubleHistogram histogram =
+                meter.histogramBuilder("double-histogram-overflow").build();
+        histogram.record(20_000.5); // exceeds highest default boundary of 10_000
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(
+                new HistogramData(
+                        1.0, Arrays.asList(10_000.0, Double.POSITIVE_INFINITY), Arrays.asList(0.0, 1.0), 20_000.5),
+                points.get("test:double-histogram-overflow"));
+    }
+
+    @Test
+    void testObservableLongCounter() {
+        AutoCloseable observable = meter.counterBuilder("observable-long-counter")
+                .buildWithCallback(m -> {
+                    m.record(1);
+                    m.record(2, SOME_ATTRIBUTES);
                 });
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(1.2, points.get("test:observable-double-counter"));
-    assertEquals(3.4, points.get("test:observable-double-counter" + WITH_ATTRS));
-
-    // second collect: absolute values are reported, not accumulated
-    points.clear();
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(0.0, points.get("test:observable-double-counter"));
-    assertEquals(0.0, points.get("test:observable-double-counter" + WITH_ATTRS));
-
-    closeQuietly(observable);
-  }
-
-  @Test
-  void testObservableLongUpDownCounter() {
-    AutoCloseable observable =
-        meter
-            .upDownCounterBuilder("observable-long-up-down-counter")
-            .buildWithCallback(
-                m -> {
-                  m.record(1);
-                  m.record(2, SOME_ATTRIBUTES);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(1L, points.get("test:observable-long-counter"));
+        assertEquals(2L, points.get("test:observable-long-counter" + WITH_ATTRS));
+
+        // second collect: absolute values are reported, not accumulated
+        points.clear();
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(0L, points.get("test:observable-long-counter"));
+        assertEquals(0L, points.get("test:observable-long-counter" + WITH_ATTRS));
+
+        closeQuietly(observable);
+    }
+
+    @Test
+    void testObservableDoubleCounter() {
+        AutoCloseable observable = meter.counterBuilder("observable-double-counter")
+                .ofDoubles()
+                .buildWithCallback(m -> {
+                    m.record(1.2);
+                    m.record(3.4, SOME_ATTRIBUTES);
                 });
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(1L, points.get("test:observable-long-up-down-counter"));
-    assertEquals(2L, points.get("test:observable-long-up-down-counter" + WITH_ATTRS));
-
-    // second collect: absolute values are reported, not accumulated
-    points.clear();
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(1L, points.get("test:observable-long-up-down-counter"));
-    assertEquals(2L, points.get("test:observable-long-up-down-counter" + WITH_ATTRS));
-
-    closeQuietly(observable);
-  }
-
-  @Test
-  void testObservableDoubleUpDownCounter() {
-    AutoCloseable observable =
-        meter
-            .upDownCounterBuilder("observable-double-up-down-counter")
-            .ofDoubles()
-            .buildWithCallback(
-                m -> {
-                  m.record(1.2);
-                  m.record(3.4, SOME_ATTRIBUTES);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(1.2, points.get("test:observable-double-counter"));
+        assertEquals(3.4, points.get("test:observable-double-counter" + WITH_ATTRS));
+
+        // second collect: absolute values are reported, not accumulated
+        points.clear();
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(0.0, points.get("test:observable-double-counter"));
+        assertEquals(0.0, points.get("test:observable-double-counter" + WITH_ATTRS));
+
+        closeQuietly(observable);
+    }
+
+    @Test
+    void testObservableLongUpDownCounter() {
+        AutoCloseable observable = meter.upDownCounterBuilder("observable-long-up-down-counter")
+                .buildWithCallback(m -> {
+                    m.record(1);
+                    m.record(2, SOME_ATTRIBUTES);
                 });
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(1.2, points.get("test:observable-double-up-down-counter"));
-    assertEquals(3.4, points.get("test:observable-double-up-down-counter" + WITH_ATTRS));
-
-    // second collect: absolute values are reported, not accumulated
-    points.clear();
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(1.2, points.get("test:observable-double-up-down-counter"));
-    assertEquals(3.4, points.get("test:observable-double-up-down-counter" + WITH_ATTRS));
-
-    closeQuietly(observable);
-  }
-
-  @Test
-  void testObservableLongGauge() {
-    AutoCloseable observable =
-        meter
-            .gaugeBuilder("observable-long-gauge")
-            .ofLongs()
-            .buildWithCallback(
-                m -> {
-                  m.record(1);
-                  m.record(2, SOME_ATTRIBUTES);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(1L, points.get("test:observable-long-up-down-counter"));
+        assertEquals(2L, points.get("test:observable-long-up-down-counter" + WITH_ATTRS));
+
+        // second collect: absolute values are reported, not accumulated
+        points.clear();
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(1L, points.get("test:observable-long-up-down-counter"));
+        assertEquals(2L, points.get("test:observable-long-up-down-counter" + WITH_ATTRS));
+
+        closeQuietly(observable);
+    }
+
+    @Test
+    void testObservableDoubleUpDownCounter() {
+        AutoCloseable observable = meter.upDownCounterBuilder("observable-double-up-down-counter")
+                .ofDoubles()
+                .buildWithCallback(m -> {
+                    m.record(1.2);
+                    m.record(3.4, SOME_ATTRIBUTES);
                 });
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(1L, points.get("test:observable-long-gauge"));
-    assertEquals(2L, points.get("test:observable-long-gauge" + WITH_ATTRS));
-
-    closeQuietly(observable);
-  }
-
-  @Test
-  void testObservableDoubleGauge() {
-    AutoCloseable observable =
-        meter
-            .gaugeBuilder("observable-double-gauge")
-            .buildWithCallback(
-                m -> {
-                  m.record(1.2);
-                  m.record(3.4, SOME_ATTRIBUTES);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(1.2, points.get("test:observable-double-up-down-counter"));
+        assertEquals(3.4, points.get("test:observable-double-up-down-counter" + WITH_ATTRS));
+
+        // second collect: absolute values are reported, not accumulated
+        points.clear();
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(1.2, points.get("test:observable-double-up-down-counter"));
+        assertEquals(3.4, points.get("test:observable-double-up-down-counter" + WITH_ATTRS));
+
+        closeQuietly(observable);
+    }
+
+    @Test
+    void testObservableLongGauge() {
+        AutoCloseable observable = meter.gaugeBuilder("observable-long-gauge")
+                .ofLongs()
+                .buildWithCallback(m -> {
+                    m.record(1);
+                    m.record(2, SOME_ATTRIBUTES);
                 });
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(1.2, points.get("test:observable-double-gauge"));
-    assertEquals(3.4, points.get("test:observable-double-gauge" + WITH_ATTRS));
-
-    closeQuietly(observable);
-  }
-
-  @Test
-  void testObservableLongCounterDeltaWithChangingValues() {
-    long[] absoluteValue = {0L};
-    AutoCloseable observable =
-        meter
-            .counterBuilder("observable-long-counter-delta-changing")
-            .buildWithCallback(m -> m.record(absoluteValue[0]));
-
-    absoluteValue[0] = 5L;
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(5L, points.get("test:observable-long-counter-delta-changing"));
-
-    // delta since last collect: 12 - 5 = 7
-    points.clear();
-    absoluteValue[0] = 12L;
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(7L, points.get("test:observable-long-counter-delta-changing"));
-
-    // no change in absolute value: delta = 0
-    points.clear();
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(0L, points.get("test:observable-long-counter-delta-changing"));
-
-    closeQuietly(observable);
-  }
-
-  @Test
-  void testObservableDoubleCounterDeltaWithChangingValues() {
-    double[] absoluteValue = {0.0};
-    AutoCloseable observable =
-        meter
-            .counterBuilder("observable-double-counter-delta-changing")
-            .ofDoubles()
-            .buildWithCallback(m -> m.record(absoluteValue[0]));
-
-    absoluteValue[0] = 2.5;
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(2.5, points.get("test:observable-double-counter-delta-changing"));
-
-    // delta since last collect: 5.0 - 2.5 = 2.5
-    points.clear();
-    absoluteValue[0] = 5.0;
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(2.5, points.get("test:observable-double-counter-delta-changing"));
-
-    // no change in absolute value: delta = 0.0
-    points.clear();
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(0.0, points.get("test:observable-double-counter-delta-changing"));
-
-    closeQuietly(observable);
-  }
-
-  @Test
-  void testObservableLongUpDownCounterReportsAbsoluteValue() {
-    long[] absoluteValue = {0L};
-    AutoCloseable observable =
-        meter
-            .upDownCounterBuilder("observable-long-up-down-counter-absolute")
-            .buildWithCallback(m -> m.record(absoluteValue[0]));
-
-    absoluteValue[0] = 10L;
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(10L, points.get("test:observable-long-up-down-counter-absolute"));
-
-    // value decreases: should report new absolute value, not a delta
-    points.clear();
-    absoluteValue[0] = 3L;
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(3L, points.get("test:observable-long-up-down-counter-absolute"));
-
-    // value increases again
-    points.clear();
-    absoluteValue[0] = 15L;
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(15L, points.get("test:observable-long-up-down-counter-absolute"));
-
-    closeQuietly(observable);
-  }
-
-  @Test
-  void testObservableDoubleUpDownCounterReportsAbsoluteValue() {
-    double[] absoluteValue = {0.0};
-    AutoCloseable observable =
-        meter
-            .upDownCounterBuilder("observable-double-up-down-counter-absolute")
-            .ofDoubles()
-            .buildWithCallback(m -> m.record(absoluteValue[0]));
-
-    absoluteValue[0] = 8.0;
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(8.0, points.get("test:observable-double-up-down-counter-absolute"));
-
-    // value decreases: should report new absolute value
-    points.clear();
-    absoluteValue[0] = 2.5;
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-    assertEquals(2.5, points.get("test:observable-double-up-down-counter-absolute"));
-
-    closeQuietly(observable);
-  }
-
-  @Test
-  void testBatchCallback() {
-    ObservableLongMeasurement longCounterObserver =
-        meter.counterBuilder("long-counter-observer").buildObserver();
-    ObservableDoubleMeasurement doubleCounterObserver =
-        meter.counterBuilder("double-counter-observer").ofDoubles().buildObserver();
-    ObservableLongMeasurement longUpDownCounterObserver =
-        meter.upDownCounterBuilder("long-up-down-counter-observer").buildObserver();
-    ObservableDoubleMeasurement doubleUpDownCounterObserver =
-        meter.upDownCounterBuilder("double-up-down-counter-observer").ofDoubles().buildObserver();
-    ObservableLongMeasurement longGaugeObserver =
-        meter.gaugeBuilder("long-gauge-observer").ofLongs().buildObserver();
-    ObservableDoubleMeasurement doubleGaugeObserver =
-        meter.gaugeBuilder("double-gauge-observer").buildObserver();
-
-    BatchCallback batchCallback =
-        meter.batchCallback(
-            () -> {
-              longCounterObserver.record(1);
-              longCounterObserver.record(10, SOME_ATTRIBUTES);
-              doubleCounterObserver.record(2.3);
-              doubleCounterObserver.record(20.3, SOME_ATTRIBUTES);
-              longUpDownCounterObserver.record(4);
-              longUpDownCounterObserver.record(40, SOME_ATTRIBUTES);
-              doubleUpDownCounterObserver.record(5.6);
-              doubleUpDownCounterObserver.record(50.6, SOME_ATTRIBUTES);
-              longGaugeObserver.record(7);
-              longGaugeObserver.record(70, SOME_ATTRIBUTES);
-              doubleGaugeObserver.record(8.9);
-              doubleGaugeObserver.record(80.9, SOME_ATTRIBUTES);
-            },
-            longCounterObserver,
-            doubleCounterObserver,
-            longUpDownCounterObserver,
-            doubleUpDownCounterObserver,
-            longGaugeObserver,
-            doubleGaugeObserver);
-
-    // this callback will have no effect because it doesn't declare any measurements
-    BatchCallback noopCallback =
-        meter.batchCallback(
-            () -> {
-              longCounterObserver.record(1000);
-              longCounterObserver.record(1000, SOME_ATTRIBUTES);
-              doubleCounterObserver.record(1000);
-              doubleCounterObserver.record(1000, SOME_ATTRIBUTES);
-              longUpDownCounterObserver.record(1000);
-              longUpDownCounterObserver.record(1000, SOME_ATTRIBUTES);
-              doubleUpDownCounterObserver.record(1000);
-              doubleUpDownCounterObserver.record(1000, SOME_ATTRIBUTES);
-              longGaugeObserver.record(1000);
-              longGaugeObserver.record(1000, SOME_ATTRIBUTES);
-              doubleGaugeObserver.record(1000);
-              doubleGaugeObserver.record(1000, SOME_ATTRIBUTES);
-            },
-            (ObservableMeasurement) null);
-
-    // first collect
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    assertEquals(1L, points.get("test:long-counter-observer"));
-    assertEquals(10L, points.get("test:long-counter-observer" + WITH_ATTRS));
-    assertEquals(2.3, points.get("test:double-counter-observer"));
-    assertEquals(20.3, points.get("test:double-counter-observer" + WITH_ATTRS));
-    assertEquals(4L, points.get("test:long-up-down-counter-observer"));
-    assertEquals(40L, points.get("test:long-up-down-counter-observer" + WITH_ATTRS));
-    assertEquals(5.6, points.get("test:double-up-down-counter-observer"));
-    assertEquals(50.6, points.get("test:double-up-down-counter-observer" + WITH_ATTRS));
-    assertEquals(7L, points.get("test:long-gauge-observer"));
-    assertEquals(70L, points.get("test:long-gauge-observer" + WITH_ATTRS));
-    assertEquals(8.9, points.get("test:double-gauge-observer"));
-    assertEquals(80.9, points.get("test:double-gauge-observer" + WITH_ATTRS));
-
-    // second collect: batchCallback is invoked again
-    points.clear();
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    // async counters show delta since last collect (same value was recorded)
-    assertEquals(0L, points.get("test:long-counter-observer"));
-    assertEquals(0L, points.get("test:long-counter-observer" + WITH_ATTRS));
-    assertEquals(0.0, points.get("test:double-counter-observer"));
-    assertEquals(0.0, points.get("test:double-counter-observer" + WITH_ATTRS));
-    // async up-down counters stay cumulative and show the latest value
-    assertEquals(4L, points.get("test:long-up-down-counter-observer"));
-    assertEquals(40L, points.get("test:long-up-down-counter-observer" + WITH_ATTRS));
-    assertEquals(5.6, (double) points.get("test:double-up-down-counter-observer"), 0.001);
-    assertEquals(
-        50.6, (double) points.get("test:double-up-down-counter-observer" + WITH_ATTRS), 0.001);
-    // gauges continue to only show the latest value
-    assertEquals(7L, points.get("test:long-gauge-observer"));
-    assertEquals(70L, points.get("test:long-gauge-observer" + WITH_ATTRS));
-    assertEquals(8.9, points.get("test:double-gauge-observer"));
-    assertEquals(80.9, points.get("test:double-gauge-observer" + WITH_ATTRS));
-
-    // third collect: batchCallback is closed, so it will not be invoked
-    batchCallback.close();
-    points.clear();
-    OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
-
-    // delta mode: no counts were set as batchCallback is closed, so no data point
-    assertNull(points.get("test:long-counter-observer"));
-    assertNull(points.get("test:long-counter-observer" + WITH_ATTRS));
-    assertNull(points.get("test:double-counter-observer"));
-    assertNull(points.get("test:double-counter-observer" + WITH_ATTRS));
-    // up-down counters stay cumulative: they continue to show the last count set
-    assertEquals(4L, points.get("test:long-up-down-counter-observer"));
-    assertEquals(40L, points.get("test:long-up-down-counter-observer" + WITH_ATTRS));
-    assertEquals(5.6, (double) points.get("test:double-up-down-counter-observer"), 0.001);
-    assertEquals(
-        50.6, (double) points.get("test:double-up-down-counter-observer" + WITH_ATTRS), 0.001);
-    // gauges also stay cumulative: they continue to show the latest value set
-    assertEquals(7L, points.get("test:long-gauge-observer"));
-    assertEquals(70L, points.get("test:long-gauge-observer" + WITH_ATTRS));
-    assertEquals(8.9, points.get("test:double-gauge-observer"));
-    assertEquals(80.9, points.get("test:double-gauge-observer" + WITH_ATTRS));
-
-    noopCallback.close();
-  }
-
-  private static void closeQuietly(AutoCloseable closeable) {
-    try {
-      closeable.close();
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(1L, points.get("test:observable-long-gauge"));
+        assertEquals(2L, points.get("test:observable-long-gauge" + WITH_ATTRS));
+
+        closeQuietly(observable);
     }
-  }
-
-  static class HistogramData {
-    final double count;
-    final List<Double> bucketBoundaries;
-    final List<Double> bucketCounts;
-    final double sum;
-
-    HistogramData(
-        double count, List<Double> bucketBoundaries, List<Double> bucketCounts, double sum) {
-      this.count = count;
-      this.bucketBoundaries = bucketBoundaries;
-      this.bucketCounts = bucketCounts;
-      this.sum = sum;
+
+    @Test
+    void testObservableDoubleGauge() {
+        AutoCloseable observable = meter.gaugeBuilder("observable-double-gauge").buildWithCallback(m -> {
+            m.record(1.2);
+            m.record(3.4, SOME_ATTRIBUTES);
+        });
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(1.2, points.get("test:observable-double-gauge"));
+        assertEquals(3.4, points.get("test:observable-double-gauge" + WITH_ATTRS));
+
+        closeQuietly(observable);
     }
 
-    @Override
-    public boolean equals(Object o) {
-      if (!(o instanceof HistogramData)) {
-        return false;
-      }
-      HistogramData that = (HistogramData) o;
-      return Double.compare(count, that.count) == 0
-          && bucketBoundaries.equals(that.bucketBoundaries)
-          && bucketCounts.equals(that.bucketCounts)
-          && Double.compare(sum, that.sum) == 0;
+    @Test
+    void testObservableLongCounterDeltaWithChangingValues() {
+        long[] absoluteValue = {0L};
+        AutoCloseable observable = meter.counterBuilder("observable-long-counter-delta-changing")
+                .buildWithCallback(m -> m.record(absoluteValue[0]));
+
+        absoluteValue[0] = 5L;
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(5L, points.get("test:observable-long-counter-delta-changing"));
+
+        // delta since last collect: 12 - 5 = 7
+        points.clear();
+        absoluteValue[0] = 12L;
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(7L, points.get("test:observable-long-counter-delta-changing"));
+
+        // no change in absolute value: delta = 0
+        points.clear();
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(0L, points.get("test:observable-long-counter-delta-changing"));
+
+        closeQuietly(observable);
     }
 
-    @Override
-    public int hashCode() {
-      return Objects.hash(count, bucketBoundaries, bucketCounts, sum);
+    @Test
+    void testObservableDoubleCounterDeltaWithChangingValues() {
+        double[] absoluteValue = {0.0};
+        AutoCloseable observable = meter.counterBuilder("observable-double-counter-delta-changing")
+                .ofDoubles()
+                .buildWithCallback(m -> m.record(absoluteValue[0]));
+
+        absoluteValue[0] = 2.5;
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(2.5, points.get("test:observable-double-counter-delta-changing"));
+
+        // delta since last collect: 5.0 - 2.5 = 2.5
+        points.clear();
+        absoluteValue[0] = 5.0;
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(2.5, points.get("test:observable-double-counter-delta-changing"));
+
+        // no change in absolute value: delta = 0.0
+        points.clear();
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(0.0, points.get("test:observable-double-counter-delta-changing"));
+
+        closeQuietly(observable);
     }
 
-    @Override
-    public String toString() {
-      return "HistogramData{"
-          + "count="
-          + count
-          + ", bucketBoundaries="
-          + bucketBoundaries
-          + ", bucketCounts="
-          + bucketCounts
-          + ", sum="
-          + sum
-          + "}";
+    @Test
+    void testObservableLongUpDownCounterReportsAbsoluteValue() {
+        long[] absoluteValue = {0L};
+        AutoCloseable observable = meter.upDownCounterBuilder("observable-long-up-down-counter-absolute")
+                .buildWithCallback(m -> m.record(absoluteValue[0]));
+
+        absoluteValue[0] = 10L;
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(10L, points.get("test:observable-long-up-down-counter-absolute"));
+
+        // value decreases: should report new absolute value, not a delta
+        points.clear();
+        absoluteValue[0] = 3L;
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(3L, points.get("test:observable-long-up-down-counter-absolute"));
+
+        // value increases again
+        points.clear();
+        absoluteValue[0] = 15L;
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(15L, points.get("test:observable-long-up-down-counter-absolute"));
+
+        closeQuietly(observable);
     }
-  }
 
-  static class MeterReader
-      implements OtlpMetricsVisitor, OtlpScopedMetricsVisitor, OtlpMetricVisitor {
-    private final Map<String, Object> points;
-    private String scopeName;
-    private String instrumentName;
-    private final Map<String, Object> attributes = new LinkedHashMap<>();
+    @Test
+    void testObservableDoubleUpDownCounterReportsAbsoluteValue() {
+        double[] absoluteValue = {0.0};
+        AutoCloseable observable = meter.upDownCounterBuilder("observable-double-up-down-counter-absolute")
+                .ofDoubles()
+                .buildWithCallback(m -> m.record(absoluteValue[0]));
+
+        absoluteValue[0] = 8.0;
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(8.0, points.get("test:observable-double-up-down-counter-absolute"));
+
+        // value decreases: should report new absolute value
+        points.clear();
+        absoluteValue[0] = 2.5;
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+        assertEquals(2.5, points.get("test:observable-double-up-down-counter-absolute"));
 
-    MeterReader(Map<String, Object> points) {
-      this.points = points;
+        closeQuietly(observable);
     }
 
-    @Override
-    public OtlpScopedMetricsVisitor visitScopedMetrics(OtelInstrumentationScope scope) {
-      scopeName = scope.getName().toString();
-      return this;
+    @Test
+    void testBatchCallback() {
+        ObservableLongMeasurement longCounterObserver =
+                meter.counterBuilder("long-counter-observer").buildObserver();
+        ObservableDoubleMeasurement doubleCounterObserver =
+                meter.counterBuilder("double-counter-observer").ofDoubles().buildObserver();
+        ObservableLongMeasurement longUpDownCounterObserver =
+                meter.upDownCounterBuilder("long-up-down-counter-observer").buildObserver();
+        ObservableDoubleMeasurement doubleUpDownCounterObserver = meter.upDownCounterBuilder(
+                        "double-up-down-counter-observer")
+                .ofDoubles()
+                .buildObserver();
+        ObservableLongMeasurement longGaugeObserver =
+                meter.gaugeBuilder("long-gauge-observer").ofLongs().buildObserver();
+        ObservableDoubleMeasurement doubleGaugeObserver =
+                meter.gaugeBuilder("double-gauge-observer").buildObserver();
+
+        BatchCallback batchCallback = meter.batchCallback(
+                () -> {
+                    longCounterObserver.record(1);
+                    longCounterObserver.record(10, SOME_ATTRIBUTES);
+                    doubleCounterObserver.record(2.3);
+                    doubleCounterObserver.record(20.3, SOME_ATTRIBUTES);
+                    longUpDownCounterObserver.record(4);
+                    longUpDownCounterObserver.record(40, SOME_ATTRIBUTES);
+                    doubleUpDownCounterObserver.record(5.6);
+                    doubleUpDownCounterObserver.record(50.6, SOME_ATTRIBUTES);
+                    longGaugeObserver.record(7);
+                    longGaugeObserver.record(70, SOME_ATTRIBUTES);
+                    doubleGaugeObserver.record(8.9);
+                    doubleGaugeObserver.record(80.9, SOME_ATTRIBUTES);
+                },
+                longCounterObserver,
+                doubleCounterObserver,
+                longUpDownCounterObserver,
+                doubleUpDownCounterObserver,
+                longGaugeObserver,
+                doubleGaugeObserver);
+
+        // this callback will have no effect because it doesn't declare any measurements
+        BatchCallback noopCallback = meter.batchCallback(
+                () -> {
+                    longCounterObserver.record(1000);
+                    longCounterObserver.record(1000, SOME_ATTRIBUTES);
+                    doubleCounterObserver.record(1000);
+                    doubleCounterObserver.record(1000, SOME_ATTRIBUTES);
+                    longUpDownCounterObserver.record(1000);
+                    longUpDownCounterObserver.record(1000, SOME_ATTRIBUTES);
+                    doubleUpDownCounterObserver.record(1000);
+                    doubleUpDownCounterObserver.record(1000, SOME_ATTRIBUTES);
+                    longGaugeObserver.record(1000);
+                    longGaugeObserver.record(1000, SOME_ATTRIBUTES);
+                    doubleGaugeObserver.record(1000);
+                    doubleGaugeObserver.record(1000, SOME_ATTRIBUTES);
+                },
+                (ObservableMeasurement) null);
+
+        // first collect
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        assertEquals(1L, points.get("test:long-counter-observer"));
+        assertEquals(10L, points.get("test:long-counter-observer" + WITH_ATTRS));
+        assertEquals(2.3, points.get("test:double-counter-observer"));
+        assertEquals(20.3, points.get("test:double-counter-observer" + WITH_ATTRS));
+        assertEquals(4L, points.get("test:long-up-down-counter-observer"));
+        assertEquals(40L, points.get("test:long-up-down-counter-observer" + WITH_ATTRS));
+        assertEquals(5.6, points.get("test:double-up-down-counter-observer"));
+        assertEquals(50.6, points.get("test:double-up-down-counter-observer" + WITH_ATTRS));
+        assertEquals(7L, points.get("test:long-gauge-observer"));
+        assertEquals(70L, points.get("test:long-gauge-observer" + WITH_ATTRS));
+        assertEquals(8.9, points.get("test:double-gauge-observer"));
+        assertEquals(80.9, points.get("test:double-gauge-observer" + WITH_ATTRS));
+
+        // second collect: batchCallback is invoked again
+        points.clear();
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        // async counters show delta since last collect (same value was recorded)
+        assertEquals(0L, points.get("test:long-counter-observer"));
+        assertEquals(0L, points.get("test:long-counter-observer" + WITH_ATTRS));
+        assertEquals(0.0, points.get("test:double-counter-observer"));
+        assertEquals(0.0, points.get("test:double-counter-observer" + WITH_ATTRS));
+        // async up-down counters stay cumulative and show the latest value
+        assertEquals(4L, points.get("test:long-up-down-counter-observer"));
+        assertEquals(40L, points.get("test:long-up-down-counter-observer" + WITH_ATTRS));
+        assertEquals(5.6, (double) points.get("test:double-up-down-counter-observer"), 0.001);
+        assertEquals(50.6, (double) points.get("test:double-up-down-counter-observer" + WITH_ATTRS), 0.001);
+        // gauges continue to only show the latest value
+        assertEquals(7L, points.get("test:long-gauge-observer"));
+        assertEquals(70L, points.get("test:long-gauge-observer" + WITH_ATTRS));
+        assertEquals(8.9, points.get("test:double-gauge-observer"));
+        assertEquals(80.9, points.get("test:double-gauge-observer" + WITH_ATTRS));
+
+        // third collect: batchCallback is closed, so it will not be invoked
+        batchCallback.close();
+        points.clear();
+        OtelMetricRegistry.INSTANCE.collectMetrics(meterReader);
+
+        // delta mode: no counts were set as batchCallback is closed, so no data point
+        assertNull(points.get("test:long-counter-observer"));
+        assertNull(points.get("test:long-counter-observer" + WITH_ATTRS));
+        assertNull(points.get("test:double-counter-observer"));
+        assertNull(points.get("test:double-counter-observer" + WITH_ATTRS));
+        // up-down counters stay cumulative: they continue to show the last count set
+        assertEquals(4L, points.get("test:long-up-down-counter-observer"));
+        assertEquals(40L, points.get("test:long-up-down-counter-observer" + WITH_ATTRS));
+        assertEquals(5.6, (double) points.get("test:double-up-down-counter-observer"), 0.001);
+        assertEquals(50.6, (double) points.get("test:double-up-down-counter-observer" + WITH_ATTRS), 0.001);
+        // gauges also stay cumulative: they continue to show the latest value set
+        assertEquals(7L, points.get("test:long-gauge-observer"));
+        assertEquals(70L, points.get("test:long-gauge-observer" + WITH_ATTRS));
+        assertEquals(8.9, points.get("test:double-gauge-observer"));
+        assertEquals(80.9, points.get("test:double-gauge-observer" + WITH_ATTRS));
+
+        noopCallback.close();
     }
 
-    @Override
-    public OtlpMetricVisitor visitMetric(OtelInstrumentDescriptor descriptor) {
-      instrumentName = descriptor.getName().toString();
-      return this;
+    private static void closeQuietly(AutoCloseable closeable) {
+        try {
+            closeable.close();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    @Override
-    public void visitAttribute(int type, String key, Object value) {
-      attributes.put(key, value);
+    static class HistogramData {
+        final double count;
+        final List<Double> bucketBoundaries;
+        final List<Double> bucketCounts;
+        final double sum;
+
+        HistogramData(double count, List<Double> bucketBoundaries, List<Double> bucketCounts, double sum) {
+            this.count = count;
+            this.bucketBoundaries = bucketBoundaries;
+            this.bucketCounts = bucketCounts;
+            this.sum = sum;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof HistogramData)) {
+                return false;
+            }
+            HistogramData that = (HistogramData) o;
+            return Double.compare(count, that.count) == 0
+                    && bucketBoundaries.equals(that.bucketBoundaries)
+                    && bucketCounts.equals(that.bucketCounts)
+                    && Double.compare(sum, that.sum) == 0;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(count, bucketBoundaries, bucketCounts, sum);
+        }
+
+        @Override
+        public String toString() {
+            return "HistogramData{"
+                    + "count="
+                    + count
+                    + ", bucketBoundaries="
+                    + bucketBoundaries
+                    + ", bucketCounts="
+                    + bucketCounts
+                    + ", sum="
+                    + sum
+                    + "}";
+        }
     }
 
-    @Override
-    public void visitDataPoint(OtlpDataPoint point) {
-      String key = scopeName + ":" + instrumentName;
-      if (!attributes.isEmpty()) {
-        key = key + "@" + attributes;
-        attributes.clear();
-      }
-      if (point instanceof OtlpLongPoint) {
-        points.put(key, ((OtlpLongPoint) point).value);
-      } else if (point instanceof OtlpDoublePoint) {
-        points.put(key, ((OtlpDoublePoint) point).value);
-      } else if (point instanceof OtlpHistogramPoint) {
-        OtlpHistogramPoint h = (OtlpHistogramPoint) point;
-        points.put(key, new HistogramData(h.count, h.bucketBoundaries, h.bucketCounts, h.sum));
-      }
+    static class MeterReader implements OtlpMetricsVisitor, OtlpScopedMetricsVisitor, OtlpMetricVisitor {
+        private final Map<String, Object> points;
+        private String scopeName;
+        private String instrumentName;
+        private final Map<String, Object> attributes = new LinkedHashMap<>();
+
+        MeterReader(Map<String, Object> points) {
+            this.points = points;
+        }
+
+        @Override
+        public OtlpScopedMetricsVisitor visitScopedMetrics(OtelInstrumentationScope scope) {
+            scopeName = scope.getName().toString();
+            return this;
+        }
+
+        @Override
+        public OtlpMetricVisitor visitMetric(OtelInstrumentDescriptor descriptor) {
+            instrumentName = descriptor.getName().toString();
+            return this;
+        }
+
+        @Override
+        public void visitAttribute(int type, String key, Object value) {
+            attributes.put(key, value);
+        }
+
+        @Override
+        public void visitDataPoint(OtlpDataPoint point) {
+            String key = scopeName + ":" + instrumentName;
+            if (!attributes.isEmpty()) {
+                key = key + "@" + attributes;
+                attributes.clear();
+            }
+            if (point instanceof OtlpLongPoint) {
+                points.put(key, ((OtlpLongPoint) point).value);
+            } else if (point instanceof OtlpDoublePoint) {
+                points.put(key, ((OtlpDoublePoint) point).value);
+            } else if (point instanceof OtlpHistogramPoint) {
+                OtlpHistogramPoint h = (OtlpHistogramPoint) point;
+                points.put(key, new HistogramData(h.count, h.bucketBoundaries, h.bucketCounts, h.sum));
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/latestDepTest/java/annotatedsample/latest/TracedMethods.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/latestDepTest/java/annotatedsample/latest/TracedMethods.java
index 07f5cb02aab..fc74a59ce1d 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/latestDepTest/java/annotatedsample/latest/TracedMethods.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/latestDepTest/java/annotatedsample/latest/TracedMethods.java
@@ -18,133 +18,129 @@
 import java.util.concurrent.CountDownLatch;
 
 public class TracedMethods {
-  @WithSpan
-  public static String sayHello() {
-    activeSpan().setTag(SERVICE_NAME, "custom-service-name");
-    return "hello!";
-  }
-
-  @WithSpan(value = "custom-operation-name")
-  public static String sayHelloWithCustomOperationName() {
-    activeSpan().setTag(SERVICE_NAME, "custom-service-name");
-    return "hello!";
-  }
-
-  @WithSpan(kind = SERVER)
-  public static String sayHelloWithServerKind() {
-    return "hello!";
-  }
-
-  @WithSpan(kind = CLIENT)
-  public static String sayHelloWithClientKind() {
-    return "hello!";
-  }
-
-  @WithSpan(kind = PRODUCER)
-  public static String sayHelloWithProducerKind() {
-    return "hello!";
-  }
-
-  @WithSpan(kind = CONSUMER)
-  public static String sayHelloWithConsumerKind() {
-    return "hello!";
-  }
-
-  @WithSpan(kind = INTERNAL)
-  public static String sayHelloWithInternalKind() {
-    return "hello!";
-  }
-
-  @WithSpan(inheritContext = false)
-  public static String sayHelloWithInANewTrace() {
-    return "hello!";
-  }
-
-  @WithSpan
-  public static String sayHelloWithStringAttribute(@SpanAttribute("custom-tag") String param) {
-    return "hello!";
-  }
-
-  @WithSpan
-  public static String sayHelloWithIntAttribute(@SpanAttribute("custom-tag") int param) {
-    return "hello!";
-  }
-
-  @WithSpan
-  public static String sayHelloWithLongAttribute(@SpanAttribute("custom-tag") long param) {
-    return "hello!";
-  }
-
-  @WithSpan
-  public static String sayHelloWithListAttribute(@SpanAttribute("custom-tag") List<?> param) {
-    return "hello!";
-  }
-
-  @WithSpan
-  public static void throwException() {
-    throw new RuntimeException("Some exception");
-  }
-
-  public static String traceAnonymousInnerClass() {
-    return new Callable<String>() {
-      @WithSpan
-      @Override
-      public String call() {
+    @WithSpan
+    public static String sayHello() {
+        activeSpan().setTag(SERVICE_NAME, "custom-service-name");
         return "hello!";
-      }
-    }.call();
-  }
-
-  @WithSpan
-  public static CompletableFuture<String> traceAsyncCompletableFuture(CountDownLatch latch) {
-    return CompletableFuture.supplyAsync(
-        () -> {
-          await(latch);
-          return "hello!";
+    }
+
+    @WithSpan(value = "custom-operation-name")
+    public static String sayHelloWithCustomOperationName() {
+        activeSpan().setTag(SERVICE_NAME, "custom-service-name");
+        return "hello!";
+    }
+
+    @WithSpan(kind = SERVER)
+    public static String sayHelloWithServerKind() {
+        return "hello!";
+    }
+
+    @WithSpan(kind = CLIENT)
+    public static String sayHelloWithClientKind() {
+        return "hello!";
+    }
+
+    @WithSpan(kind = PRODUCER)
+    public static String sayHelloWithProducerKind() {
+        return "hello!";
+    }
+
+    @WithSpan(kind = CONSUMER)
+    public static String sayHelloWithConsumerKind() {
+        return "hello!";
+    }
+
+    @WithSpan(kind = INTERNAL)
+    public static String sayHelloWithInternalKind() {
+        return "hello!";
+    }
+
+    @WithSpan(inheritContext = false)
+    public static String sayHelloWithInANewTrace() {
+        return "hello!";
+    }
+
+    @WithSpan
+    public static String sayHelloWithStringAttribute(@SpanAttribute("custom-tag") String param) {
+        return "hello!";
+    }
+
+    @WithSpan
+    public static String sayHelloWithIntAttribute(@SpanAttribute("custom-tag") int param) {
+        return "hello!";
+    }
+
+    @WithSpan
+    public static String sayHelloWithLongAttribute(@SpanAttribute("custom-tag") long param) {
+        return "hello!";
+    }
+
+    @WithSpan
+    public static String sayHelloWithListAttribute(@SpanAttribute("custom-tag") List<?> param) {
+        return "hello!";
+    }
+
+    @WithSpan
+    public static void throwException() {
+        throw new RuntimeException("Some exception");
+    }
+
+    public static String traceAnonymousInnerClass() {
+        return new Callable<String>() {
+            @WithSpan
+            @Override
+            public String call() {
+                return "hello!";
+            }
+        }.call();
+    }
+
+    @WithSpan
+    public static CompletableFuture<String> traceAsyncCompletableFuture(CountDownLatch latch) {
+        return CompletableFuture.supplyAsync(() -> {
+            await(latch);
+            return "hello!";
         });
-  }
-
-  @WithSpan
-  public static CompletableFuture<String> traceAsyncFailingCompletableFuture(
-      CountDownLatch latch, RuntimeException exception) {
-    return CompletableFuture.supplyAsync(
-        () -> {
-          await(latch);
-          throw exception;
+    }
+
+    @WithSpan
+    public static CompletableFuture<String> traceAsyncFailingCompletableFuture(
+            CountDownLatch latch, RuntimeException exception) {
+        return CompletableFuture.supplyAsync(() -> {
+            await(latch);
+            throw exception;
         });
-  }
-
-  @WithSpan
-  public static CompletionStage<String> traceAsyncCompletionStage(CountDownLatch latch) {
-    return CompletableFuture.supplyAsync(
-        () -> {
-          await(latch);
-          return "hello!";
+    }
+
+    @WithSpan
+    public static CompletionStage<String> traceAsyncCompletionStage(CountDownLatch latch) {
+        return CompletableFuture.supplyAsync(() -> {
+            await(latch);
+            return "hello!";
         });
-  }
-
-  @WithSpan
-  public static CompletionStage<String> traceAsyncFailingCompletionStage(
-      CountDownLatch latch, RuntimeException exception) {
-    return CompletableFuture.supplyAsync(
-        () -> {
-          await(latch);
-          throw exception;
+    }
+
+    @WithSpan
+    public static CompletionStage<String> traceAsyncFailingCompletionStage(
+            CountDownLatch latch, RuntimeException exception) {
+        return CompletableFuture.supplyAsync(() -> {
+            await(latch);
+            throw exception;
         });
-  }
-
-  @WithSpan
-  public static String sayHelloMeasured() {
-    return "hello!";
-  }
-
-  private static void await(CountDownLatch latch) {
-    try {
-      if (!latch.await(5, SECONDS)) {
-        throw new IllegalStateException("Latch still locked");
-      }
-    } catch (InterruptedException e) {
-      throw new RuntimeException(e);
-    }
-  }
+    }
+
+    @WithSpan
+    public static String sayHelloMeasured() {
+        return "hello!";
+    }
+
+    private static void await(CountDownLatch latch) {
+        try {
+            if (!latch.await(5, SECONDS)) {
+                throw new IllegalStateException("Latch still locked");
+            }
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAdvice.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAdvice.java
index 0a7bf4c13ba..f6cd71e2554 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAdvice.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAdvice.java
@@ -12,22 +12,21 @@
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
 
 public class WithSpanAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(@Advice.Origin final Method method) {
-    AgentSpan span = DECORATE.startMethodSpan(method);
-    return activateSpan(span);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(@Advice.Origin final Method method) {
+        AgentSpan span = DECORATE.startMethodSpan(method);
+        return activateSpan(span);
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void stopSpan(
-      @Advice.Enter final ContextScope scope,
-      @Advice.Origin final MethodType methodType,
-      @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false) Object result,
-      @Advice.Thrown final Throwable throwable) {
-    DECORATE.onError(scope, throwable);
-    DECORATE.beforeFinish(scope);
-    scope.close();
-    result =
-        DECORATE.wrapAsyncResultOrFinishSpan(result, methodType.returnType(), spanFromScope(scope));
-  }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void stopSpan(
+            @Advice.Enter final ContextScope scope,
+            @Advice.Origin final MethodType methodType,
+            @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false) Object result,
+            @Advice.Thrown final Throwable throwable) {
+        DECORATE.onError(scope, throwable);
+        DECORATE.beforeFinish(scope);
+        scope.close();
+        result = DECORATE.wrapAsyncResultOrFinishSpan(result, methodType.returnType(), spanFromScope(scope));
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAnnotationInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAnnotationInstrumentation.java
index 1391e63e628..9990781b9f9 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAnnotationInstrumentation.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAnnotationInstrumentation.java
@@ -17,43 +17,38 @@
 
 @AutoService(InstrumenterModule.class)
 public final class WithSpanAnnotationInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public WithSpanAnnotationInstrumentation() {
-    super("opentelemetry-annotations", "opentelemetry-annotations-1.20");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isTraceOtelEnabled();
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.opentelemetry.instrumentation.annotations.WithSpan";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return declaresMethod(isAnnotatedWith(named(hierarchyMarkerType())));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    ElementMatcher.Junction<MethodDescription> annotatedMethodMatcher =
-        isAnnotatedWith(named(hierarchyMarkerType()));
-    ElementMatcher.Junction<MethodDescription> annotatedParametersMatcher =
-        hasParameters(
-            whereAny(
-                isAnnotatedWith(
-                    named("io.opentelemetry.instrumentation.annotations.SpanAttribute"))));
-    // Apply transformation without parameter capture
-    transformer.applyAdvice(
-        annotatedMethodMatcher.and(not(annotatedParametersMatcher)),
-        this.packageName + ".WithSpanAdvice");
-    // Apply transformation with parameter capture
-    transformer.applyAdvice(
-        annotatedMethodMatcher.and(annotatedParametersMatcher),
-        this.packageName + ".WithSpanAttributeAdvice");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public WithSpanAnnotationInstrumentation() {
+        super("opentelemetry-annotations", "opentelemetry-annotations-1.20");
+    }
+
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isTraceOtelEnabled();
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.opentelemetry.instrumentation.annotations.WithSpan";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return declaresMethod(isAnnotatedWith(named(hierarchyMarkerType())));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        ElementMatcher.Junction<MethodDescription> annotatedMethodMatcher =
+                isAnnotatedWith(named(hierarchyMarkerType()));
+        ElementMatcher.Junction<MethodDescription> annotatedParametersMatcher = hasParameters(
+                whereAny(isAnnotatedWith(named("io.opentelemetry.instrumentation.annotations.SpanAttribute"))));
+        // Apply transformation without parameter capture
+        transformer.applyAdvice(
+                annotatedMethodMatcher.and(not(annotatedParametersMatcher)), this.packageName + ".WithSpanAdvice");
+        // Apply transformation with parameter capture
+        transformer.applyAdvice(
+                annotatedMethodMatcher.and(annotatedParametersMatcher), this.packageName + ".WithSpanAttributeAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAttributeAdvice.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAttributeAdvice.java
index df1f5717c8a..eac33cb0388 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAttributeAdvice.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAttributeAdvice.java
@@ -10,20 +10,18 @@
 import net.bytebuddy.asm.Advice;
 
 public class WithSpanAttributeAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(
-      @Advice.Origin final Method method, @Advice.AllArguments final Object[] args) {
-    AgentSpan span = DECORATE.startMethodSpan(method);
-    DECORATE.addTagsFromMethodArgs(span, method, args);
-    return activateSpan(span);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(@Advice.Origin final Method method, @Advice.AllArguments final Object[] args) {
+        AgentSpan span = DECORATE.startMethodSpan(method);
+        DECORATE.addTagsFromMethodArgs(span, method, args);
+        return activateSpan(span);
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void stopSpan(
-      @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-    DECORATE.onError(scope, throwable);
-    DECORATE.beforeFinish(scope);
-    scope.close();
-    spanFromScope(scope).finish();
-  }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+        DECORATE.onError(scope, throwable);
+        DECORATE.beforeFinish(scope);
+        scope.close();
+        spanFromScope(scope).finish();
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanDecorator.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanDecorator.java
index bdeb57e6919..84224893210 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanDecorator.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanDecorator.java
@@ -23,116 +23,113 @@
 import java.lang.reflect.Parameter;
 
 public class WithSpanDecorator extends AsyncResultDecorator {
-  public static final WithSpanDecorator DECORATE = new WithSpanDecorator();
-  private static final String INSTRUMENTATION_NAME = "opentelemetry-annotations";
-  private static final CharSequence OPENTELEMETRY = UTF8BytesString.create("opentelemetry");
-  private static final MethodHandle INHERIT_CONTEXT_MH = maybeGetInheritContextHandle();
-
-  private static MethodHandle maybeGetInheritContextHandle() {
-    try {
-      return new MethodHandles(WithSpan.class.getClassLoader())
-          .method(WithSpan.class, "inheritContext")
-          .asType(MethodType.methodType(boolean.class, WithSpan.class));
-    } catch (Throwable ignored) {
-      // not available before 2.14.0
-    }
-    return null;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"opentelemetry-annotations", "opentelemetry-annotations-1"};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return null; // Will be defined per span from WithSpan annotation parameter
-  }
-
-  @Override
-  protected CharSequence component() {
-    return OPENTELEMETRY;
-  }
-
-  public AgentSpan startMethodSpan(Method method) {
-    CharSequence operationName = null;
-    CharSequence spanType = null;
-    SpanKind kind = null;
-    boolean inheritContext = true;
-
-    WithSpan withSpanAnnotation = method.getAnnotation(WithSpan.class);
-    if (withSpanAnnotation != null) {
-      operationName = withSpanAnnotation.value();
-      kind = withSpanAnnotation.kind();
-      if (INHERIT_CONTEXT_MH != null) {
+    public static final WithSpanDecorator DECORATE = new WithSpanDecorator();
+    private static final String INSTRUMENTATION_NAME = "opentelemetry-annotations";
+    private static final CharSequence OPENTELEMETRY = UTF8BytesString.create("opentelemetry");
+    private static final MethodHandle INHERIT_CONTEXT_MH = maybeGetInheritContextHandle();
+
+    private static MethodHandle maybeGetInheritContextHandle() {
         try {
-          inheritContext = (boolean) INHERIT_CONTEXT_MH.invokeExact(withSpanAnnotation);
+            return new MethodHandles(WithSpan.class.getClassLoader())
+                    .method(WithSpan.class, "inheritContext")
+                    .asType(MethodType.methodType(boolean.class, WithSpan.class));
         } catch (Throwable ignored) {
+            // not available before 2.14.0
         }
-      }
+        return null;
     }
 
-    if (operationName == null || operationName.length() == 0) {
-      operationName = DECORATE.spanNameForMethod(method);
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"opentelemetry-annotations", "opentelemetry-annotations-1"};
     }
 
-    AgentTracer.SpanBuilder spanBuilder =
-        AgentTracer.get().singleSpanBuilder(INSTRUMENTATION_NAME, operationName);
-
-    if (!inheritContext) {
-      spanBuilder = spanBuilder.ignoreActiveSpan();
+    @Override
+    protected CharSequence spanType() {
+        return null; // Will be defined per span from WithSpan annotation parameter
     }
-    final AgentSpan span = spanBuilder.start();
-    DECORATE.afterStart(span);
 
-    if (kind != null) {
-      span.setSpanType(convertToSpanType(kind));
-      span.setTag(SPAN_KIND, toSpanKindTagValue(kind));
-    }
-    if (InstrumenterConfig.get().isMethodMeasured(method)) {
-      span.setMeasured(true);
+    @Override
+    protected CharSequence component() {
+        return OPENTELEMETRY;
     }
 
-    return span;
-  }
+    public AgentSpan startMethodSpan(Method method) {
+        CharSequence operationName = null;
+        CharSequence spanType = null;
+        SpanKind kind = null;
+        boolean inheritContext = true;
+
+        WithSpan withSpanAnnotation = method.getAnnotation(WithSpan.class);
+        if (withSpanAnnotation != null) {
+            operationName = withSpanAnnotation.value();
+            kind = withSpanAnnotation.kind();
+            if (INHERIT_CONTEXT_MH != null) {
+                try {
+                    inheritContext = (boolean) INHERIT_CONTEXT_MH.invokeExact(withSpanAnnotation);
+                } catch (Throwable ignored) {
+                }
+            }
+        }
 
-  private static String convertToSpanType(SpanKind kind) {
-    if (kind == null) {
-      return null;
-    }
-    switch (kind) {
-      case SERVER:
-        return HTTP_SERVER;
-      case CLIENT:
-        return HTTP_CLIENT;
-      case PRODUCER:
-        return MESSAGE_PRODUCER;
-      case CONSUMER:
-        return MESSAGE_CONSUMER;
-      case INTERNAL:
-      default:
-        return null;
+        if (operationName == null || operationName.length() == 0) {
+            operationName = DECORATE.spanNameForMethod(method);
+        }
+
+        AgentTracer.SpanBuilder spanBuilder = AgentTracer.get().singleSpanBuilder(INSTRUMENTATION_NAME, operationName);
+
+        if (!inheritContext) {
+            spanBuilder = spanBuilder.ignoreActiveSpan();
+        }
+        final AgentSpan span = spanBuilder.start();
+        DECORATE.afterStart(span);
+
+        if (kind != null) {
+            span.setSpanType(convertToSpanType(kind));
+            span.setTag(SPAN_KIND, toSpanKindTagValue(kind));
+        }
+        if (InstrumenterConfig.get().isMethodMeasured(method)) {
+            span.setMeasured(true);
+        }
+
+        return span;
     }
-  }
-
-  public void addTagsFromMethodArgs(AgentSpan span, Method method, Object[] args) {
-    Parameter[] parameters = method.getParameters();
-    for (int parameterIndex = 0;
-        parameterIndex < min(parameters.length, args.length);
-        parameterIndex++) {
-      Parameter parameter = parameters[parameterIndex];
-      SpanAttribute annotation = parameter.getAnnotation(SpanAttribute.class);
-      if (annotation != null) {
-        // Get name from annotation value
-        String name = annotation.value();
-        // If name is missing, try to get it from parameter description (absent by default)
-        if ((name == null || name.isEmpty()) && parameter.isNamePresent()) {
-          name = parameter.getName();
+
+    private static String convertToSpanType(SpanKind kind) {
+        if (kind == null) {
+            return null;
+        }
+        switch (kind) {
+            case SERVER:
+                return HTTP_SERVER;
+            case CLIENT:
+                return HTTP_CLIENT;
+            case PRODUCER:
+                return MESSAGE_PRODUCER;
+            case CONSUMER:
+                return MESSAGE_CONSUMER;
+            case INTERNAL:
+            default:
+                return null;
         }
-        if (name != null) {
-          span.setTag(name, args[parameterIndex]);
+    }
+
+    public void addTagsFromMethodArgs(AgentSpan span, Method method, Object[] args) {
+        Parameter[] parameters = method.getParameters();
+        for (int parameterIndex = 0; parameterIndex < min(parameters.length, args.length); parameterIndex++) {
+            Parameter parameter = parameters[parameterIndex];
+            SpanAttribute annotation = parameter.getAnnotation(SpanAttribute.class);
+            if (annotation != null) {
+                // Get name from annotation value
+                String name = annotation.value();
+                // If name is missing, try to get it from parameter description (absent by default)
+                if ((name == null || name.isEmpty()) && parameter.isNamePresent()) {
+                    name = parameter.getName();
+                }
+                if (name != null) {
+                    span.setTag(name, args[parameterIndex]);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/test/java/annotatedsample/TracedMethods.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/test/java/annotatedsample/TracedMethods.java
index ff57b7051bf..6e7f940e6e4 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/test/java/annotatedsample/TracedMethods.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/test/java/annotatedsample/TracedMethods.java
@@ -18,134 +18,130 @@
 import java.util.concurrent.CountDownLatch;
 
 public class TracedMethods {
-  @WithSpan
-  public static String sayHello() {
-    activeSpan().setTag(SERVICE_NAME, "custom-service-name");
-    return "hello!";
-  }
-
-  @WithSpan(value = "custom-operation-name")
-  public static String sayHelloWithCustomOperationName() {
-    activeSpan().setTag(SERVICE_NAME, "custom-service-name");
-    return "hello!";
-  }
-
-  @WithSpan(kind = SERVER)
-  public static String sayHelloWithServerKind() {
-    return "hello!";
-  }
-
-  @WithSpan(kind = CLIENT)
-  public static String sayHelloWithClientKind() {
-    return "hello!";
-  }
-
-  @WithSpan(kind = PRODUCER)
-  public static String sayHelloWithProducerKind() {
-    return "hello!";
-  }
-
-  @WithSpan(kind = CONSUMER)
-  public static String sayHelloWithConsumerKind() {
-    return "hello!";
-  }
-
-  @WithSpan(kind = INTERNAL)
-  public static String sayHelloWithInternalKind() {
-    return "hello!";
-  }
-
-  @WithSpan
-  public static String sayHelloWithStringAttribute(@SpanAttribute("custom-tag") String param) {
-    return "hello!";
-  }
-
-  @WithSpan
-  public static String sayHelloWithIntAttribute(@SpanAttribute("custom-tag") int param) {
-    return "hello!";
-  }
-
-  @WithSpan
-  public static String sayHelloWithLongAttribute(@SpanAttribute("custom-tag") long param) {
-    return "hello!";
-  }
-
-  @WithSpan
-  public static String sayHelloWithListAttribute(@SpanAttribute("custom-tag") List<?> param) {
-    return "hello!";
-  }
-
-  @WithSpan
-  public static String sayHelloWithMultipleAttributes(
-      @SpanAttribute("custom-tag1") String param1, @SpanAttribute("custom-tag2") String param2) {
-    return "hello!";
-  }
-
-  @WithSpan
-  public static void throwException() {
-    throw new RuntimeException("Some exception");
-  }
-
-  public static String traceAnonymousInnerClass() {
-    return new Callable<String>() {
-      @WithSpan
-      @Override
-      public String call() {
+    @WithSpan
+    public static String sayHello() {
+        activeSpan().setTag(SERVICE_NAME, "custom-service-name");
         return "hello!";
-      }
-    }.call();
-  }
-
-  @WithSpan
-  public static CompletableFuture<String> traceAsyncCompletableFuture(CountDownLatch latch) {
-    return CompletableFuture.supplyAsync(
-        () -> {
-          await(latch);
-          return "hello!";
+    }
+
+    @WithSpan(value = "custom-operation-name")
+    public static String sayHelloWithCustomOperationName() {
+        activeSpan().setTag(SERVICE_NAME, "custom-service-name");
+        return "hello!";
+    }
+
+    @WithSpan(kind = SERVER)
+    public static String sayHelloWithServerKind() {
+        return "hello!";
+    }
+
+    @WithSpan(kind = CLIENT)
+    public static String sayHelloWithClientKind() {
+        return "hello!";
+    }
+
+    @WithSpan(kind = PRODUCER)
+    public static String sayHelloWithProducerKind() {
+        return "hello!";
+    }
+
+    @WithSpan(kind = CONSUMER)
+    public static String sayHelloWithConsumerKind() {
+        return "hello!";
+    }
+
+    @WithSpan(kind = INTERNAL)
+    public static String sayHelloWithInternalKind() {
+        return "hello!";
+    }
+
+    @WithSpan
+    public static String sayHelloWithStringAttribute(@SpanAttribute("custom-tag") String param) {
+        return "hello!";
+    }
+
+    @WithSpan
+    public static String sayHelloWithIntAttribute(@SpanAttribute("custom-tag") int param) {
+        return "hello!";
+    }
+
+    @WithSpan
+    public static String sayHelloWithLongAttribute(@SpanAttribute("custom-tag") long param) {
+        return "hello!";
+    }
+
+    @WithSpan
+    public static String sayHelloWithListAttribute(@SpanAttribute("custom-tag") List<?> param) {
+        return "hello!";
+    }
+
+    @WithSpan
+    public static String sayHelloWithMultipleAttributes(
+            @SpanAttribute("custom-tag1") String param1, @SpanAttribute("custom-tag2") String param2) {
+        return "hello!";
+    }
+
+    @WithSpan
+    public static void throwException() {
+        throw new RuntimeException("Some exception");
+    }
+
+    public static String traceAnonymousInnerClass() {
+        return new Callable<String>() {
+            @WithSpan
+            @Override
+            public String call() {
+                return "hello!";
+            }
+        }.call();
+    }
+
+    @WithSpan
+    public static CompletableFuture<String> traceAsyncCompletableFuture(CountDownLatch latch) {
+        return CompletableFuture.supplyAsync(() -> {
+            await(latch);
+            return "hello!";
         });
-  }
-
-  @WithSpan
-  public static CompletableFuture<String> traceAsyncFailingCompletableFuture(
-      CountDownLatch latch, RuntimeException exception) {
-    return CompletableFuture.supplyAsync(
-        () -> {
-          await(latch);
-          throw exception;
+    }
+
+    @WithSpan
+    public static CompletableFuture<String> traceAsyncFailingCompletableFuture(
+            CountDownLatch latch, RuntimeException exception) {
+        return CompletableFuture.supplyAsync(() -> {
+            await(latch);
+            throw exception;
         });
-  }
-
-  @WithSpan
-  public static CompletionStage<String> traceAsyncCompletionStage(CountDownLatch latch) {
-    return CompletableFuture.supplyAsync(
-        () -> {
-          await(latch);
-          return "hello!";
+    }
+
+    @WithSpan
+    public static CompletionStage<String> traceAsyncCompletionStage(CountDownLatch latch) {
+        return CompletableFuture.supplyAsync(() -> {
+            await(latch);
+            return "hello!";
         });
-  }
-
-  @WithSpan
-  public static CompletionStage<String> traceAsyncFailingCompletionStage(
-      CountDownLatch latch, RuntimeException exception) {
-    return CompletableFuture.supplyAsync(
-        () -> {
-          await(latch);
-          throw exception;
+    }
+
+    @WithSpan
+    public static CompletionStage<String> traceAsyncFailingCompletionStage(
+            CountDownLatch latch, RuntimeException exception) {
+        return CompletableFuture.supplyAsync(() -> {
+            await(latch);
+            throw exception;
         });
-  }
-
-  @WithSpan
-  public static String sayHelloMeasured() {
-    return "hello!";
-  }
-
-  private static void await(CountDownLatch latch) {
-    try {
-      if (!latch.await(5, SECONDS)) {
-        throw new IllegalStateException("Latch still locked");
-      }
-    } catch (InterruptedException e) {
-      throw new RuntimeException(e);
-    }
-  }
+    }
+
+    @WithSpan
+    public static String sayHelloMeasured() {
+        return "hello!";
+    }
+
+    private static void await(CountDownLatch latch) {
+        try {
+            if (!latch.await(5, SECONDS)) {
+                throw new IllegalStateException("Latch still locked");
+            }
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/AddingSpanAttributesAdvice.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/AddingSpanAttributesAdvice.java
index 051f5095f00..948cfb2b25f 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/AddingSpanAttributesAdvice.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/AddingSpanAttributesAdvice.java
@@ -8,12 +8,11 @@
 import net.bytebuddy.asm.Advice;
 
 public class AddingSpanAttributesAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void onEnter(
-      @Advice.Origin final Method method, @Advice.AllArguments final Object[] args) {
-    AgentSpan activeSpan = AgentTracer.get().activeSpan();
-    if (activeSpan != null) {
-      DECORATE.addTagsFromMethodArgs(activeSpan, method, args);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void onEnter(@Advice.Origin final Method method, @Advice.AllArguments final Object[] args) {
+        AgentSpan activeSpan = AgentTracer.get().activeSpan();
+        if (activeSpan != null) {
+            DECORATE.addTagsFromMethodArgs(activeSpan, method, args);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/AddingSpanAttributesInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/AddingSpanAttributesInstrumentation.java
index 2aa84eb8bd6..fa61851b982 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/AddingSpanAttributesInstrumentation.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/AddingSpanAttributesInstrumentation.java
@@ -16,48 +16,45 @@
 
 @AutoService(InstrumenterModule.class)
 public class AddingSpanAttributesInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public AddingSpanAttributesInstrumentation() {
-    super("opentelemetry-annotations", "opentelemetry-annotations-1.26");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isTraceOtelEnabled();
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.opentelemetry.instrumentation.annotations.AddingSpanAttributes";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return declaresMethod(isAnnotatedWith(named(hierarchyMarkerType())));
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      this.packageName + ".WithSpanDecorator",
-      this.packageName + ".WithSpanDecorator$1", // Switch over enum generated class
-      "datadog.opentelemetry.shim.trace.OtelConventions",
-      "datadog.opentelemetry.shim.trace.OtelConventions$1",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    ElementMatcher.Junction<MethodDescription> annotatedMethodMatcher =
-        isAnnotatedWith(named(hierarchyMarkerType()));
-    ElementMatcher.Junction<MethodDescription> annotatedParametersMatcher =
-        hasParameters(
-            whereAny(
-                isAnnotatedWith(
-                    named("io.opentelemetry.instrumentation.annotations.SpanAttribute"))));
-    transformer.applyAdvice(
-        annotatedMethodMatcher.and(annotatedParametersMatcher),
-        this.packageName + ".AddingSpanAttributesAdvice");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public AddingSpanAttributesInstrumentation() {
+        super("opentelemetry-annotations", "opentelemetry-annotations-1.26");
+    }
+
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isTraceOtelEnabled();
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.opentelemetry.instrumentation.annotations.AddingSpanAttributes";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return declaresMethod(isAnnotatedWith(named(hierarchyMarkerType())));
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            this.packageName + ".WithSpanDecorator",
+            this.packageName + ".WithSpanDecorator$1", // Switch over enum generated class
+            "datadog.opentelemetry.shim.trace.OtelConventions",
+            "datadog.opentelemetry.shim.trace.OtelConventions$1",
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        ElementMatcher.Junction<MethodDescription> annotatedMethodMatcher =
+                isAnnotatedWith(named(hierarchyMarkerType()));
+        ElementMatcher.Junction<MethodDescription> annotatedParametersMatcher = hasParameters(
+                whereAny(isAnnotatedWith(named("io.opentelemetry.instrumentation.annotations.SpanAttribute"))));
+        transformer.applyAdvice(
+                annotatedMethodMatcher.and(annotatedParametersMatcher),
+                this.packageName + ".AddingSpanAttributesAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/test/java/annotatedsample/AnnotatedMethods.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/test/java/annotatedsample/AnnotatedMethods.java
index a34fd2b0543..9969fbb35dd 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/test/java/annotatedsample/AnnotatedMethods.java
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/test/java/annotatedsample/AnnotatedMethods.java
@@ -5,29 +5,29 @@
 import java.util.List;
 
 public class AnnotatedMethods {
-  @AddingSpanAttributes
-  public static String sayHelloWithStringAttribute(@SpanAttribute("custom-tag") String param) {
-    return "hello!";
-  }
+    @AddingSpanAttributes
+    public static String sayHelloWithStringAttribute(@SpanAttribute("custom-tag") String param) {
+        return "hello!";
+    }
 
-  @AddingSpanAttributes
-  public static String sayHelloWithIntAttribute(@SpanAttribute("custom-tag") int param) {
-    return "hello!";
-  }
+    @AddingSpanAttributes
+    public static String sayHelloWithIntAttribute(@SpanAttribute("custom-tag") int param) {
+        return "hello!";
+    }
 
-  @AddingSpanAttributes
-  public static String sayHelloWithLongAttribute(@SpanAttribute("custom-tag") long param) {
-    return "hello!";
-  }
+    @AddingSpanAttributes
+    public static String sayHelloWithLongAttribute(@SpanAttribute("custom-tag") long param) {
+        return "hello!";
+    }
 
-  @AddingSpanAttributes
-  public static String sayHelloWithListAttribute(@SpanAttribute("custom-tag") List<?> param) {
-    return "hello!";
-  }
+    @AddingSpanAttributes
+    public static String sayHelloWithListAttribute(@SpanAttribute("custom-tag") List<?> param) {
+        return "hello!";
+    }
 
-  @AddingSpanAttributes
-  public static String sayHelloWithMultipleAttributes(
-      @SpanAttribute("custom-tag1") String param1, @SpanAttribute("custom-tag2") String param2) {
-    return "hello!";
-  }
+    @AddingSpanAttributes
+    public static String sayHelloWithMultipleAttributes(
+            @SpanAttribute("custom-tag1") String param1, @SpanAttribute("custom-tag2") String param2) {
+        return "hello!";
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/GlobalTracerInstrumentation.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/GlobalTracerInstrumentation.java
index 3129d49d036..0c484bfca6e 100644
--- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/GlobalTracerInstrumentation.java
+++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/GlobalTracerInstrumentation.java
@@ -20,51 +20,51 @@
  */
 @AutoService(InstrumenterModule.class)
 public class GlobalTracerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public GlobalTracerInstrumentation() {
-    super("opentracing", "opentracing-globaltracer");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public GlobalTracerInstrumentation() {
+        super("opentracing", "opentracing-globaltracer");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Avoid matching OT 0.32+ which has its own instrumentation.
-    return not(hasClassNamed("io.opentracing.tag.Tag"));
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Avoid matching OT 0.32+ which has its own instrumentation.
+        return not(hasClassNamed("io.opentracing.tag.Tag"));
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.opentracing.util.GlobalTracer";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.opentracing.util.GlobalTracer";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".OTTracer",
-      packageName + ".OTTracer$OTSpanBuilder",
-      packageName + ".OTTextMapSetter",
-      packageName + ".OTScopeManager",
-      packageName + ".OTScopeManager$OTScope",
-      packageName + ".OTScopeManager$FakeScope",
-      packageName + ".TypeConverter",
-      packageName + ".OTSpan",
-      packageName + ".OTSpanContext",
-      "datadog.trace.instrumentation.opentracing.LogHandler",
-      "datadog.trace.instrumentation.opentracing.DefaultLogHandler",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".OTTracer",
+            packageName + ".OTTracer$OTSpanBuilder",
+            packageName + ".OTTextMapSetter",
+            packageName + ".OTScopeManager",
+            packageName + ".OTScopeManager$OTScope",
+            packageName + ".OTScopeManager$FakeScope",
+            packageName + ".TypeConverter",
+            packageName + ".OTSpan",
+            packageName + ".OTSpanContext",
+            "datadog.trace.instrumentation.opentracing.LogHandler",
+            "datadog.trace.instrumentation.opentracing.DefaultLogHandler",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isTypeInitializer(), GlobalTracerInstrumentation.class.getName() + "$GlobalTracerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isTypeInitializer(), GlobalTracerInstrumentation.class.getName() + "$GlobalTracerAdvice");
+    }
 
-  public static class GlobalTracerAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void registerTracer() {
-      if (AgentTracer.isRegistered()) {
-        GlobalTracer.register(new OTTracer(AgentTracer.get()));
-      }
+    public static class GlobalTracerAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void registerTracer() {
+            if (AgentTracer.isRegistered()) {
+                GlobalTracer.register(new OTTracer(AgentTracer.get()));
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTScopeManager.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTScopeManager.java
index 0faa346dda4..9e31f655d72 100644
--- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTScopeManager.java
+++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTScopeManager.java
@@ -13,93 +13,90 @@
 import org.slf4j.LoggerFactory;
 
 public class OTScopeManager implements ScopeManager {
-  static final Logger log = LoggerFactory.getLogger(OTScopeManager.class);
+    static final Logger log = LoggerFactory.getLogger(OTScopeManager.class);
 
-  private final TypeConverter converter;
-  private final AgentTracer.TracerAPI tracer;
-
-  public OTScopeManager(final AgentTracer.TracerAPI tracer, final TypeConverter converter) {
-    this.tracer = tracer;
-    this.converter = converter;
-  }
-
-  @Override
-  public Scope activate(final Span span, final boolean finishSpanOnClose) {
-    if (null == span) {
-      return null;
-    }
-
-    final AgentSpan agentSpan = converter.toAgentSpan(span);
-    final ContextScope agentScope = tracer.activateManualSpan(agentSpan);
-
-    return converter.toScope(agentScope, finishSpanOnClose);
-  }
-
-  @Deprecated
-  @Override
-  public Scope active() {
-    AgentSpan agentSpan = tracer.activeSpan();
-    if (null == agentSpan) {
-      return null;
-    }
-    // WARNING... Making an assumption about finishSpanOnClose
-    return new OTScope(new FakeScope(agentSpan), false, converter);
-  }
-
-  static class OTScope implements Scope, TraceScope {
-    private final ContextScope delegate;
-    private final boolean finishSpanOnClose;
     private final TypeConverter converter;
+    private final AgentTracer.TracerAPI tracer;
 
-    OTScope(
-        final ContextScope delegate,
-        final boolean finishSpanOnClose,
-        final TypeConverter converter) {
-      this.delegate = delegate;
-      this.finishSpanOnClose = finishSpanOnClose;
-      this.converter = converter;
+    public OTScopeManager(final AgentTracer.TracerAPI tracer, final TypeConverter converter) {
+        this.tracer = tracer;
+        this.converter = converter;
     }
 
     @Override
-    public void close() {
-      delegate.close();
+    public Scope activate(final Span span, final boolean finishSpanOnClose) {
+        if (null == span) {
+            return null;
+        }
 
-      if (finishSpanOnClose) {
-        AgentSpan.fromScope(delegate).finish();
-      }
-    }
-
-    @Override
-    public Span span() {
-      return converter.toSpan(AgentSpan.fromScope(delegate));
-    }
+        final AgentSpan agentSpan = converter.toAgentSpan(span);
+        final ContextScope agentScope = tracer.activateManualSpan(agentSpan);
 
-    public boolean isFinishSpanOnClose() {
-      return finishSpanOnClose;
+        return converter.toScope(agentScope, finishSpanOnClose);
     }
-  }
 
-  private final class FakeScope implements ContextScope {
-    private final AgentSpan agentSpan;
-
-    FakeScope(AgentSpan agentSpan) {
-      this.agentSpan = agentSpan;
+    @Deprecated
+    @Override
+    public Scope active() {
+        AgentSpan agentSpan = tracer.activeSpan();
+        if (null == agentSpan) {
+            return null;
+        }
+        // WARNING... Making an assumption about finishSpanOnClose
+        return new OTScope(new FakeScope(agentSpan), false, converter);
     }
 
-    @Override
-    public Context context() {
-      return agentSpan;
+    static class OTScope implements Scope, TraceScope {
+        private final ContextScope delegate;
+        private final boolean finishSpanOnClose;
+        private final TypeConverter converter;
+
+        OTScope(final ContextScope delegate, final boolean finishSpanOnClose, final TypeConverter converter) {
+            this.delegate = delegate;
+            this.finishSpanOnClose = finishSpanOnClose;
+            this.converter = converter;
+        }
+
+        @Override
+        public void close() {
+            delegate.close();
+
+            if (finishSpanOnClose) {
+                AgentSpan.fromScope(delegate).finish();
+            }
+        }
+
+        @Override
+        public Span span() {
+            return converter.toSpan(AgentSpan.fromScope(delegate));
+        }
+
+        public boolean isFinishSpanOnClose() {
+            return finishSpanOnClose;
+        }
     }
 
-    @Override
-    public void close() {
-      if (agentSpan == tracer.activeSpan()) {
-        tracer.closeActive();
-      } else if (Config.get().isScopeStrictMode()) {
-        throw new RuntimeException("Tried to close " + agentSpan + " scope when not on top");
-      } else {
-        log.warn("Tried to close {} scope when not on top", agentSpan);
-      }
+    private final class FakeScope implements ContextScope {
+        private final AgentSpan agentSpan;
+
+        FakeScope(AgentSpan agentSpan) {
+            this.agentSpan = agentSpan;
+        }
+
+        @Override
+        public Context context() {
+            return agentSpan;
+        }
+
+        @Override
+        public void close() {
+            if (agentSpan == tracer.activeSpan()) {
+                tracer.closeActive();
+            } else if (Config.get().isScopeStrictMode()) {
+                throw new RuntimeException("Tried to close " + agentSpan + " scope when not on top");
+            } else {
+                log.warn("Tried to close {} scope when not on top", agentSpan);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpan.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpan.java
index e33c98fb54f..394f56ecf71 100644
--- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpan.java
+++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpan.java
@@ -18,230 +18,230 @@
  * interact with non-ot parts of our API.
  */
 class OTSpan implements Span, MutableSpan, WithAgentSpan, SpanWrapper {
-  private final AgentSpan delegate;
-  private final TypeConverter converter;
-  private final LogHandler logHandler;
-
-  OTSpan(final AgentSpan delegate, final TypeConverter converter, final LogHandler logHandler) {
-    this.delegate = delegate;
-    this.converter = converter;
-    this.logHandler = logHandler;
-  }
-
-  @Override
-  public SpanContext context() {
-    return converter.toSpanContext(delegate.spanContext());
-  }
-
-  @Override
-  public OTSpan setTag(final String key, final String value) {
-    delegate.setTag(key, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setTag(final String key, final boolean value) {
-    delegate.setTag(key, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setTag(final String key, final Number value) {
-    delegate.setTag(key, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setMetric(final CharSequence metric, final int value) {
-    delegate.setMetric(metric, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setMetric(final CharSequence metric, final long value) {
-    delegate.setMetric(metric, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setMetric(final CharSequence metric, final float value) {
-    delegate.setMetric(metric, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setMetric(final CharSequence metric, final double value) {
-    delegate.setMetric(metric, value);
-    return this;
-  }
-
-  @Override
-  public boolean isError() {
-    return delegate.isError();
-  }
-
-  @Override
-  public OTSpan setError(final boolean value) {
-    delegate.setError(value, ErrorPriorities.MANUAL_INSTRUMENTATION);
-    return this;
-  }
-
-  @Override
-  public OTSpan getRootSpan() {
-    return getLocalRootSpan();
-  }
-
-  @Override
-  public OTSpan getLocalRootSpan() {
-    return converter.toSpan(delegate.getLocalRootSpan());
-  }
-
-  @Override
-  public OTSpan log(final Map<String, ?> fields) {
-    logHandler.log(fields, delegate);
-    return this;
-  }
-
-  @Override
-  public OTSpan log(final long timestampMicroseconds, final Map<String, ?> fields) {
-    logHandler.log(timestampMicroseconds, fields, delegate);
-    return this;
-  }
-
-  @Override
-  public OTSpan log(final String event) {
-    logHandler.log(event, delegate);
-    return this;
-  }
-
-  @Override
-  public OTSpan log(final long timestampMicroseconds, final String event) {
-    logHandler.log(timestampMicroseconds, event, delegate);
-    return this;
-  }
-
-  @Override
-  public OTSpan setBaggageItem(final String key, final String value) {
-    delegate.setBaggageItem(key, value);
-    return this;
-  }
-
-  @Override
-  public String getBaggageItem(final String key) {
-    return delegate.getBaggageItem(key);
-  }
-
-  @Override
-  public long getStartTime() {
-    return delegate.getStartTime();
-  }
-
-  @Override
-  public long getDurationNano() {
-    return delegate.getDurationNano();
-  }
-
-  @Override
-  public CharSequence getOperationName() {
-    return delegate.getOperationName();
-  }
-
-  @Override
-  public OTSpan setOperationName(final CharSequence operationName) {
-    delegate.setOperationName(operationName);
-    return this;
-  }
-
-  @Override
-  public OTSpan setOperationName(final String operationName) {
-    delegate.setOperationName(UTF8BytesString.create(operationName));
-    return this;
-  }
-
-  @Override
-  public String getServiceName() {
-    return delegate.getServiceName();
-  }
-
-  @Override
-  @SuppressForbidden
-  public OTSpan setServiceName(final String serviceName) {
-    delegate.setServiceName(serviceName);
-    return this;
-  }
-
-  @Override
-  public CharSequence getResourceName() {
-    return delegate.getResourceName();
-  }
-
-  @Override
-  public OTSpan setResourceName(final CharSequence resourceName) {
-    delegate.setResourceName(resourceName, ResourceNamePriorities.MANUAL_INSTRUMENTATION);
-    return this;
-  }
-
-  @Override
-  public Integer getSamplingPriority() {
-    return delegate.getSamplingPriority();
-  }
-
-  @Override
-  public OTSpan setSamplingPriority(final int newPriority) {
-    delegate.setSamplingPriority(newPriority);
-    return this;
-  }
-
-  @Override
-  public String getSpanType() {
-    return delegate.getSpanType();
-  }
-
-  @Override
-  public OTSpan setSpanType(final CharSequence type) {
-    delegate.setSpanType(type);
-    return this;
-  }
-
-  @Override
-  public Map<String, Object> getTags() {
-    return delegate.getTags();
-  }
-
-  @Override
-  public Object getTag(String key) {
-    return delegate.getTag(key);
-  }
-
-  @Override
-  public void finish() {
-    delegate.finish();
-  }
-
-  @Override
-  public void finish(final long finishMicros) {
-    delegate.finish(finishMicros);
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    final OTSpan otSpan = (OTSpan) o;
-    return delegate.equals(otSpan.delegate);
-  }
-
-  @Override
-  public int hashCode() {
-    return delegate.hashCode();
-  }
-
-  @Override
-  public AgentSpan asAgentSpan() {
-    return delegate;
-  }
+    private final AgentSpan delegate;
+    private final TypeConverter converter;
+    private final LogHandler logHandler;
+
+    OTSpan(final AgentSpan delegate, final TypeConverter converter, final LogHandler logHandler) {
+        this.delegate = delegate;
+        this.converter = converter;
+        this.logHandler = logHandler;
+    }
+
+    @Override
+    public SpanContext context() {
+        return converter.toSpanContext(delegate.spanContext());
+    }
+
+    @Override
+    public OTSpan setTag(final String key, final String value) {
+        delegate.setTag(key, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setTag(final String key, final boolean value) {
+        delegate.setTag(key, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setTag(final String key, final Number value) {
+        delegate.setTag(key, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setMetric(final CharSequence metric, final int value) {
+        delegate.setMetric(metric, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setMetric(final CharSequence metric, final long value) {
+        delegate.setMetric(metric, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setMetric(final CharSequence metric, final float value) {
+        delegate.setMetric(metric, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setMetric(final CharSequence metric, final double value) {
+        delegate.setMetric(metric, value);
+        return this;
+    }
+
+    @Override
+    public boolean isError() {
+        return delegate.isError();
+    }
+
+    @Override
+    public OTSpan setError(final boolean value) {
+        delegate.setError(value, ErrorPriorities.MANUAL_INSTRUMENTATION);
+        return this;
+    }
+
+    @Override
+    public OTSpan getRootSpan() {
+        return getLocalRootSpan();
+    }
+
+    @Override
+    public OTSpan getLocalRootSpan() {
+        return converter.toSpan(delegate.getLocalRootSpan());
+    }
+
+    @Override
+    public OTSpan log(final Map<String, ?> fields) {
+        logHandler.log(fields, delegate);
+        return this;
+    }
+
+    @Override
+    public OTSpan log(final long timestampMicroseconds, final Map<String, ?> fields) {
+        logHandler.log(timestampMicroseconds, fields, delegate);
+        return this;
+    }
+
+    @Override
+    public OTSpan log(final String event) {
+        logHandler.log(event, delegate);
+        return this;
+    }
+
+    @Override
+    public OTSpan log(final long timestampMicroseconds, final String event) {
+        logHandler.log(timestampMicroseconds, event, delegate);
+        return this;
+    }
+
+    @Override
+    public OTSpan setBaggageItem(final String key, final String value) {
+        delegate.setBaggageItem(key, value);
+        return this;
+    }
+
+    @Override
+    public String getBaggageItem(final String key) {
+        return delegate.getBaggageItem(key);
+    }
+
+    @Override
+    public long getStartTime() {
+        return delegate.getStartTime();
+    }
+
+    @Override
+    public long getDurationNano() {
+        return delegate.getDurationNano();
+    }
+
+    @Override
+    public CharSequence getOperationName() {
+        return delegate.getOperationName();
+    }
+
+    @Override
+    public OTSpan setOperationName(final CharSequence operationName) {
+        delegate.setOperationName(operationName);
+        return this;
+    }
+
+    @Override
+    public OTSpan setOperationName(final String operationName) {
+        delegate.setOperationName(UTF8BytesString.create(operationName));
+        return this;
+    }
+
+    @Override
+    public String getServiceName() {
+        return delegate.getServiceName();
+    }
+
+    @Override
+    @SuppressForbidden
+    public OTSpan setServiceName(final String serviceName) {
+        delegate.setServiceName(serviceName);
+        return this;
+    }
+
+    @Override
+    public CharSequence getResourceName() {
+        return delegate.getResourceName();
+    }
+
+    @Override
+    public OTSpan setResourceName(final CharSequence resourceName) {
+        delegate.setResourceName(resourceName, ResourceNamePriorities.MANUAL_INSTRUMENTATION);
+        return this;
+    }
+
+    @Override
+    public Integer getSamplingPriority() {
+        return delegate.getSamplingPriority();
+    }
+
+    @Override
+    public OTSpan setSamplingPriority(final int newPriority) {
+        delegate.setSamplingPriority(newPriority);
+        return this;
+    }
+
+    @Override
+    public String getSpanType() {
+        return delegate.getSpanType();
+    }
+
+    @Override
+    public OTSpan setSpanType(final CharSequence type) {
+        delegate.setSpanType(type);
+        return this;
+    }
+
+    @Override
+    public Map<String, Object> getTags() {
+        return delegate.getTags();
+    }
+
+    @Override
+    public Object getTag(String key) {
+        return delegate.getTag(key);
+    }
+
+    @Override
+    public void finish() {
+        delegate.finish();
+    }
+
+    @Override
+    public void finish(final long finishMicros) {
+        delegate.finish(finishMicros);
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final OTSpan otSpan = (OTSpan) o;
+        return delegate.equals(otSpan.delegate);
+    }
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+
+    @Override
+    public AgentSpan asAgentSpan() {
+        return delegate;
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpanContext.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpanContext.java
index 6bbb8c59a48..d2b586e6b08 100644
--- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpanContext.java
+++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpanContext.java
@@ -5,18 +5,18 @@
 import java.util.Map;
 
 class OTSpanContext implements SpanContext {
-  private final AgentSpanContext delegate;
+    private final AgentSpanContext delegate;
 
-  OTSpanContext(final AgentSpanContext delegate) {
-    this.delegate = delegate;
-  }
+    OTSpanContext(final AgentSpanContext delegate) {
+        this.delegate = delegate;
+    }
 
-  @Override
-  public Iterable<Map.Entry<String, String>> baggageItems() {
-    return delegate.baggageItems();
-  }
+    @Override
+    public Iterable<Map.Entry<String, String>> baggageItems() {
+        return delegate.baggageItems();
+    }
 
-  AgentSpanContext getDelegate() {
-    return delegate;
-  }
+    AgentSpanContext getDelegate() {
+        return delegate;
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTTextMapSetter.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTTextMapSetter.java
index 99122724ab6..56a6801b296 100644
--- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTTextMapSetter.java
+++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTTextMapSetter.java
@@ -6,10 +6,10 @@
 
 @ParametersAreNonnullByDefault
 class OTTextMapSetter implements CarrierSetter<TextMap> {
-  static final OTTextMapSetter INSTANCE = new OTTextMapSetter();
+    static final OTTextMapSetter INSTANCE = new OTTextMapSetter();
 
-  @Override
-  public void set(final TextMap carrier, final String key, final String value) {
-    carrier.put(key, value);
-  }
+    @Override
+    public void set(final TextMap carrier, final String key, final String value) {
+        carrier.put(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTTracer.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTTracer.java
index 32f62c86832..15043583c17 100644
--- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTTracer.java
+++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTTracer.java
@@ -21,145 +21,144 @@
 import org.slf4j.LoggerFactory;
 
 public class OTTracer implements Tracer {
-  private static final String INSTRUMENTATION_NAME = "opentracing";
-  private static final Logger log = LoggerFactory.getLogger(OTTracer.class);
-
-  private final TypeConverter converter = new TypeConverter(new DefaultLogHandler());
-  private final AgentTracer.TracerAPI tracer;
-  private final ScopeManager scopeManager;
-
-  public OTTracer(final AgentTracer.TracerAPI tracer) {
-    this.tracer = tracer;
-    scopeManager = new OTScopeManager(tracer, converter);
-  }
-
-  @Override
-  public ScopeManager scopeManager() {
-    return scopeManager;
-  }
-
-  @Override
-  public Span activeSpan() {
-    return converter.toSpan(AgentTracer.activeSpan());
-  }
-
-  @Override
-  public SpanBuilder buildSpan(final String operationName) {
-    return new OTSpanBuilder(tracer.buildSpan(INSTRUMENTATION_NAME, operationName));
-  }
-
-  @Override
-  public <C> void inject(final SpanContext spanContext, final Format<C> format, final C carrier) {
-    if (carrier instanceof TextMap) {
-      final AgentSpanContext context = converter.toContext(spanContext);
-      AgentSpan span = fromSpanContext(context);
-      defaultPropagator().inject(span, (TextMap) carrier, OTTextMapSetter.INSTANCE);
-    } else {
-      log.debug("Unsupported format for propagation - {}", format.getClass().getName());
-    }
-  }
-
-  @Override
-  public <C> SpanContext extract(final Format<C> format, final C carrier) {
-    if (carrier instanceof TextMap) {
-      final AgentSpanContext tagContext =
-          extractContextAndGetSpanContext(
-              (TextMap) carrier, ContextVisitors.stringValuesEntrySet());
-
-      return converter.toSpanContext(tagContext);
-    } else {
-      log.debug("Unsupported format for propagation - {}", format.getClass().getName());
-      return null;
-    }
-  }
-
-  public class OTSpanBuilder implements Tracer.SpanBuilder {
-    private final AgentTracer.SpanBuilder delegate;
-
-    public OTSpanBuilder(final AgentTracer.SpanBuilder delegate) {
-      this.delegate = delegate;
-    }
-
-    @Override
-    public Tracer.SpanBuilder asChildOf(final SpanContext parent) {
-      delegate.asChildOf(converter.toContext(parent));
-      return this;
-    }
-
-    @Override
-    public Tracer.SpanBuilder asChildOf(final Span parent) {
-      if (parent != null) {
-        delegate.asChildOf(converter.toAgentSpan(parent).spanContext());
-      }
-      return this;
-    }
+    private static final String INSTRUMENTATION_NAME = "opentracing";
+    private static final Logger log = LoggerFactory.getLogger(OTTracer.class);
 
-    @Override
-    public Tracer.SpanBuilder addReference(
-        final String referenceType, final SpanContext referencedContext) {
-      if (referencedContext == null) {
-        return this;
-      }
-
-      final AgentSpanContext context = converter.toContext(referencedContext);
-
-      if (References.CHILD_OF.equals(referenceType)
-          || References.FOLLOWS_FROM.equals(referenceType)) {
-        delegate.asChildOf(context);
-      } else {
-        log.debug("Only support reference type of CHILD_OF and FOLLOWS_FROM");
-      }
-
-      return this;
-    }
+    private final TypeConverter converter = new TypeConverter(new DefaultLogHandler());
+    private final AgentTracer.TracerAPI tracer;
+    private final ScopeManager scopeManager;
 
-    @Override
-    public OTSpanBuilder ignoreActiveSpan() {
-      delegate.ignoreActiveSpan();
-      return this;
+    public OTTracer(final AgentTracer.TracerAPI tracer) {
+        this.tracer = tracer;
+        scopeManager = new OTScopeManager(tracer, converter);
     }
 
     @Override
-    public OTSpanBuilder withTag(final String key, final String value) {
-      delegate.withTag(key, value);
-      return this;
+    public ScopeManager scopeManager() {
+        return scopeManager;
     }
 
     @Override
-    public OTSpanBuilder withTag(final String key, final boolean value) {
-      delegate.withTag(key, value);
-      return this;
+    public Span activeSpan() {
+        return converter.toSpan(AgentTracer.activeSpan());
     }
 
     @Override
-    public OTSpanBuilder withTag(final String key, final Number value) {
-      delegate.withTag(key, value);
-      return this;
+    public SpanBuilder buildSpan(final String operationName) {
+        return new OTSpanBuilder(tracer.buildSpan(INSTRUMENTATION_NAME, operationName));
     }
 
     @Override
-    public OTSpanBuilder withStartTimestamp(final long microseconds) {
-      delegate.withStartTimestamp(microseconds);
-      return this;
+    public <C> void inject(final SpanContext spanContext, final Format<C> format, final C carrier) {
+        if (carrier instanceof TextMap) {
+            final AgentSpanContext context = converter.toContext(spanContext);
+            AgentSpan span = fromSpanContext(context);
+            defaultPropagator().inject(span, (TextMap) carrier, OTTextMapSetter.INSTANCE);
+        } else {
+            log.debug(
+                    "Unsupported format for propagation - {}", format.getClass().getName());
+        }
     }
 
     @Override
-    public Span startManual() {
-      return start();
+    public <C> SpanContext extract(final Format<C> format, final C carrier) {
+        if (carrier instanceof TextMap) {
+            final AgentSpanContext tagContext =
+                    extractContextAndGetSpanContext((TextMap) carrier, ContextVisitors.stringValuesEntrySet());
+
+            return converter.toSpanContext(tagContext);
+        } else {
+            log.debug(
+                    "Unsupported format for propagation - {}", format.getClass().getName());
+            return null;
+        }
     }
 
-    @Override
-    public Span start() {
-      final AgentSpan agentSpan = delegate.start();
-      agentSpan.spanContext().setIntegrationName("opentracing");
-      return converter.toSpan(agentSpan);
-    }
-
-    @Override
-    public Scope startActive(final boolean finishSpanOnClose) {
-      final AgentSpan agentSpan = delegate.start();
-      agentSpan.spanContext().setIntegrationName("opentracing");
-      return converter.toScope(tracer.activateManualSpan(agentSpan), finishSpanOnClose);
+    public class OTSpanBuilder implements Tracer.SpanBuilder {
+        private final AgentTracer.SpanBuilder delegate;
+
+        public OTSpanBuilder(final AgentTracer.SpanBuilder delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public Tracer.SpanBuilder asChildOf(final SpanContext parent) {
+            delegate.asChildOf(converter.toContext(parent));
+            return this;
+        }
+
+        @Override
+        public Tracer.SpanBuilder asChildOf(final Span parent) {
+            if (parent != null) {
+                delegate.asChildOf(converter.toAgentSpan(parent).spanContext());
+            }
+            return this;
+        }
+
+        @Override
+        public Tracer.SpanBuilder addReference(final String referenceType, final SpanContext referencedContext) {
+            if (referencedContext == null) {
+                return this;
+            }
+
+            final AgentSpanContext context = converter.toContext(referencedContext);
+
+            if (References.CHILD_OF.equals(referenceType) || References.FOLLOWS_FROM.equals(referenceType)) {
+                delegate.asChildOf(context);
+            } else {
+                log.debug("Only support reference type of CHILD_OF and FOLLOWS_FROM");
+            }
+
+            return this;
+        }
+
+        @Override
+        public OTSpanBuilder ignoreActiveSpan() {
+            delegate.ignoreActiveSpan();
+            return this;
+        }
+
+        @Override
+        public OTSpanBuilder withTag(final String key, final String value) {
+            delegate.withTag(key, value);
+            return this;
+        }
+
+        @Override
+        public OTSpanBuilder withTag(final String key, final boolean value) {
+            delegate.withTag(key, value);
+            return this;
+        }
+
+        @Override
+        public OTSpanBuilder withTag(final String key, final Number value) {
+            delegate.withTag(key, value);
+            return this;
+        }
+
+        @Override
+        public OTSpanBuilder withStartTimestamp(final long microseconds) {
+            delegate.withStartTimestamp(microseconds);
+            return this;
+        }
+
+        @Override
+        public Span startManual() {
+            return start();
+        }
+
+        @Override
+        public Span start() {
+            final AgentSpan agentSpan = delegate.start();
+            agentSpan.spanContext().setIntegrationName("opentracing");
+            return converter.toSpan(agentSpan);
+        }
+
+        @Override
+        public Scope startActive(final boolean finishSpanOnClose) {
+            final AgentSpan agentSpan = delegate.start();
+            agentSpan.spanContext().setIntegrationName("opentracing");
+            return converter.toScope(tracer.activateManualSpan(agentSpan), finishSpanOnClose);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/TypeConverter.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/TypeConverter.java
index 734ab0b7123..657524b0405 100644
--- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/TypeConverter.java
+++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/TypeConverter.java
@@ -14,65 +14,65 @@
 
 // Centralized place to do conversions
 public class TypeConverter {
-  private final LogHandler logHandler;
-  private final OTSpan noopSpanWrapper;
-  private final OTSpanContext noopContextWrapper;
+    private final LogHandler logHandler;
+    private final OTSpan noopSpanWrapper;
+    private final OTSpanContext noopContextWrapper;
 
-  public TypeConverter(final LogHandler logHandler) {
-    this.logHandler = logHandler;
-    noopSpanWrapper = new OTSpan(noopSpan(), this, logHandler);
-    noopContextWrapper = new OTSpanContext(noopSpanContext());
-  }
-
-  public AgentSpan toAgentSpan(final Span span) {
-    if (span instanceof OTSpan) {
-      return ((OTSpan) span).asAgentSpan();
+    public TypeConverter(final LogHandler logHandler) {
+        this.logHandler = logHandler;
+        noopSpanWrapper = new OTSpan(noopSpan(), this, logHandler);
+        noopContextWrapper = new OTSpanContext(noopSpanContext());
     }
-    return null == span ? null : noopSpan();
-  }
 
-  public OTSpan toSpan(final AgentSpan agentSpan) {
-    if (agentSpan == null) {
-      return null;
-    }
-    if (agentSpan instanceof AttachableWrapper) {
-      AttachableWrapper attachableSpanWrapper = (AttachableWrapper) agentSpan;
-      Object wrapper = attachableSpanWrapper.getWrapper();
-      if (wrapper instanceof OTSpan) {
-        return (OTSpan) wrapper;
-      }
-      OTSpan spanWrapper = new OTSpan(agentSpan, this, logHandler);
-      attachableSpanWrapper.attachWrapper(spanWrapper);
-      return spanWrapper;
+    public AgentSpan toAgentSpan(final Span span) {
+        if (span instanceof OTSpan) {
+            return ((OTSpan) span).asAgentSpan();
+        }
+        return null == span ? null : noopSpan();
     }
-    if (agentSpan == noopSpan()) {
-      return noopSpanWrapper;
-    }
-    return new OTSpan(agentSpan, this, logHandler);
-  }
 
-  public Scope toScope(final ContextScope scope, final boolean finishSpanOnClose) {
-    if (scope == null) {
-      return null;
+    public OTSpan toSpan(final AgentSpan agentSpan) {
+        if (agentSpan == null) {
+            return null;
+        }
+        if (agentSpan instanceof AttachableWrapper) {
+            AttachableWrapper attachableSpanWrapper = (AttachableWrapper) agentSpan;
+            Object wrapper = attachableSpanWrapper.getWrapper();
+            if (wrapper instanceof OTSpan) {
+                return (OTSpan) wrapper;
+            }
+            OTSpan spanWrapper = new OTSpan(agentSpan, this, logHandler);
+            attachableSpanWrapper.attachWrapper(spanWrapper);
+            return spanWrapper;
+        }
+        if (agentSpan == noopSpan()) {
+            return noopSpanWrapper;
+        }
+        return new OTSpan(agentSpan, this, logHandler);
     }
-    return new OTScopeManager.OTScope(scope, finishSpanOnClose, this);
-  }
 
-  public SpanContext toSpanContext(final AgentSpanContext context) {
-    if (context == null) {
-      return null;
+    public Scope toScope(final ContextScope scope, final boolean finishSpanOnClose) {
+        if (scope == null) {
+            return null;
+        }
+        return new OTScopeManager.OTScope(scope, finishSpanOnClose, this);
     }
-    // avoid a new SpanContext wrapper allocation for the noop context
-    if (context == noopSpanContext()) {
-      return noopContextWrapper;
+
+    public SpanContext toSpanContext(final AgentSpanContext context) {
+        if (context == null) {
+            return null;
+        }
+        // avoid a new SpanContext wrapper allocation for the noop context
+        if (context == noopSpanContext()) {
+            return noopContextWrapper;
+        }
+        return new OTSpanContext(context);
     }
-    return new OTSpanContext(context);
-  }
 
-  public AgentSpanContext toContext(final SpanContext spanContext) {
-    if (spanContext instanceof OTSpanContext) {
-      return ((OTSpanContext) spanContext).getDelegate();
+    public AgentSpanContext toContext(final SpanContext spanContext) {
+        if (spanContext instanceof OTSpanContext) {
+            return ((OTSpanContext) spanContext).getDelegate();
+        }
+        return null == spanContext ? null : noopSpanContext();
     }
-    return null == spanContext ? null : noopSpanContext();
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/GlobalTracerInstrumentation.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/GlobalTracerInstrumentation.java
index e2b594e3ad2..4d3a4fa4bef 100644
--- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/GlobalTracerInstrumentation.java
+++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/GlobalTracerInstrumentation.java
@@ -17,45 +17,45 @@
  */
 @AutoService(InstrumenterModule.class)
 public class GlobalTracerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public GlobalTracerInstrumentation() {
-    super("opentracing", "opentracing-globaltracer");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public GlobalTracerInstrumentation() {
+        super("opentracing", "opentracing-globaltracer");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.opentracing.util.GlobalTracer";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.opentracing.util.GlobalTracer";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".OTTracer",
-      packageName + ".OTTracer$OTSpanBuilder",
-      packageName + ".OTTextMapInjectSetter",
-      packageName + ".OTScopeManager",
-      packageName + ".OTScopeManager$OTScope",
-      packageName + ".OTScopeManager$FakeScope",
-      packageName + ".TypeConverter",
-      packageName + ".OTSpan",
-      packageName + ".OTSpanContext",
-      "datadog.trace.instrumentation.opentracing.LogHandler",
-      "datadog.trace.instrumentation.opentracing.DefaultLogHandler",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".OTTracer",
+            packageName + ".OTTracer$OTSpanBuilder",
+            packageName + ".OTTextMapInjectSetter",
+            packageName + ".OTScopeManager",
+            packageName + ".OTScopeManager$OTScope",
+            packageName + ".OTScopeManager$FakeScope",
+            packageName + ".TypeConverter",
+            packageName + ".OTSpan",
+            packageName + ".OTSpanContext",
+            "datadog.trace.instrumentation.opentracing.LogHandler",
+            "datadog.trace.instrumentation.opentracing.DefaultLogHandler",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isTypeInitializer(), GlobalTracerInstrumentation.class.getName() + "$GlobalTracerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isTypeInitializer(), GlobalTracerInstrumentation.class.getName() + "$GlobalTracerAdvice");
+    }
 
-  public static class GlobalTracerAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void registerTracer() {
-      if (AgentTracer.isRegistered()) {
-        GlobalTracer.registerIfAbsent(new OTTracer(AgentTracer.get()));
-      }
+    public static class GlobalTracerAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void registerTracer() {
+            if (AgentTracer.isRegistered()) {
+                GlobalTracer.registerIfAbsent(new OTTracer(AgentTracer.get()));
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTScopeManager.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTScopeManager.java
index 5591ac985cb..7f50d1d534d 100644
--- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTScopeManager.java
+++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTScopeManager.java
@@ -13,103 +13,100 @@
 import org.slf4j.LoggerFactory;
 
 public class OTScopeManager implements ScopeManager {
-  static final Logger log = LoggerFactory.getLogger(OTScopeManager.class);
+    static final Logger log = LoggerFactory.getLogger(OTScopeManager.class);
 
-  private final TypeConverter converter;
-  private final AgentTracer.TracerAPI tracer;
-
-  public OTScopeManager(final AgentTracer.TracerAPI tracer, final TypeConverter converter) {
-    this.tracer = tracer;
-    this.converter = converter;
-  }
-
-  @Override
-  public Scope activate(final Span span) {
-    return activate(span, false);
-  }
-
-  @Override
-  public Scope activate(final Span span, final boolean finishSpanOnClose) {
-    if (null == span) {
-      return null;
-    }
-
-    final AgentSpan agentSpan = converter.toAgentSpan(span);
-    final ContextScope agentScope = tracer.activateManualSpan(agentSpan);
-
-    return converter.toScope(agentScope, finishSpanOnClose);
-  }
-
-  @Deprecated
-  @Override
-  public Scope active() {
-    AgentSpan agentSpan = tracer.activeSpan();
-    if (null == agentSpan) {
-      return null;
-    }
-    // WARNING... Making an assumption about finishSpanOnClose
-    return new OTScope(new FakeScope(agentSpan), false, converter);
-  }
-
-  @Override
-  public Span activeSpan() {
-    return converter.toSpan(tracer.activeSpan());
-  }
-
-  static class OTScope implements Scope, TraceScope {
-    private final ContextScope delegate;
-    private final boolean finishSpanOnClose;
     private final TypeConverter converter;
+    private final AgentTracer.TracerAPI tracer;
 
-    OTScope(
-        final ContextScope delegate,
-        final boolean finishSpanOnClose,
-        final TypeConverter converter) {
-      this.delegate = delegate;
-      this.finishSpanOnClose = finishSpanOnClose;
-      this.converter = converter;
+    public OTScopeManager(final AgentTracer.TracerAPI tracer, final TypeConverter converter) {
+        this.tracer = tracer;
+        this.converter = converter;
     }
 
     @Override
-    public void close() {
-      delegate.close();
-
-      if (finishSpanOnClose) {
-        AgentSpan.fromScope(delegate).finish();
-      }
+    public Scope activate(final Span span) {
+        return activate(span, false);
     }
 
     @Override
-    public Span span() {
-      return converter.toSpan(AgentSpan.fromScope(delegate));
-    }
-
-    public boolean isFinishSpanOnClose() {
-      return finishSpanOnClose;
-    }
-  }
+    public Scope activate(final Span span, final boolean finishSpanOnClose) {
+        if (null == span) {
+            return null;
+        }
 
-  private final class FakeScope implements ContextScope {
-    private final AgentSpan agentSpan;
+        final AgentSpan agentSpan = converter.toAgentSpan(span);
+        final ContextScope agentScope = tracer.activateManualSpan(agentSpan);
 
-    FakeScope(AgentSpan agentSpan) {
-      this.agentSpan = agentSpan;
+        return converter.toScope(agentScope, finishSpanOnClose);
     }
 
+    @Deprecated
     @Override
-    public Context context() {
-      return agentSpan;
+    public Scope active() {
+        AgentSpan agentSpan = tracer.activeSpan();
+        if (null == agentSpan) {
+            return null;
+        }
+        // WARNING... Making an assumption about finishSpanOnClose
+        return new OTScope(new FakeScope(agentSpan), false, converter);
     }
 
     @Override
-    public void close() {
-      if (agentSpan == tracer.activeSpan()) {
-        tracer.closeActive();
-      } else if (Config.get().isScopeStrictMode()) {
-        throw new RuntimeException("Tried to close " + agentSpan + " scope when not on top");
-      } else {
-        log.warn("Tried to close {} scope when not on top", agentSpan);
-      }
+    public Span activeSpan() {
+        return converter.toSpan(tracer.activeSpan());
+    }
+
+    static class OTScope implements Scope, TraceScope {
+        private final ContextScope delegate;
+        private final boolean finishSpanOnClose;
+        private final TypeConverter converter;
+
+        OTScope(final ContextScope delegate, final boolean finishSpanOnClose, final TypeConverter converter) {
+            this.delegate = delegate;
+            this.finishSpanOnClose = finishSpanOnClose;
+            this.converter = converter;
+        }
+
+        @Override
+        public void close() {
+            delegate.close();
+
+            if (finishSpanOnClose) {
+                AgentSpan.fromScope(delegate).finish();
+            }
+        }
+
+        @Override
+        public Span span() {
+            return converter.toSpan(AgentSpan.fromScope(delegate));
+        }
+
+        public boolean isFinishSpanOnClose() {
+            return finishSpanOnClose;
+        }
+    }
+
+    private final class FakeScope implements ContextScope {
+        private final AgentSpan agentSpan;
+
+        FakeScope(AgentSpan agentSpan) {
+            this.agentSpan = agentSpan;
+        }
+
+        @Override
+        public Context context() {
+            return agentSpan;
+        }
+
+        @Override
+        public void close() {
+            if (agentSpan == tracer.activeSpan()) {
+                tracer.closeActive();
+            } else if (Config.get().isScopeStrictMode()) {
+                throw new RuntimeException("Tried to close " + agentSpan + " scope when not on top");
+            } else {
+                log.warn("Tried to close {} scope when not on top", agentSpan);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpan.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpan.java
index b8e60b6b4b7..6b667efc5d7 100644
--- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpan.java
+++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpan.java
@@ -19,236 +19,236 @@
  * interact with non-ot parts of our API.
  */
 class OTSpan implements Span, MutableSpan, WithAgentSpan, SpanWrapper {
-  private final AgentSpan delegate;
-  private final TypeConverter converter;
-  private final LogHandler logHandler;
-
-  OTSpan(final AgentSpan delegate, final TypeConverter converter, final LogHandler logHandler) {
-    this.delegate = delegate;
-    this.converter = converter;
-    this.logHandler = logHandler;
-  }
-
-  @Override
-  public SpanContext context() {
-    return converter.toSpanContext(delegate.spanContext());
-  }
-
-  @Override
-  public OTSpan setTag(final String key, final String value) {
-    delegate.setTag(key, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setTag(final String key, final boolean value) {
-    delegate.setTag(key, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setTag(final String key, final Number value) {
-    delegate.setTag(key, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setMetric(final CharSequence metric, final int value) {
-    delegate.setMetric(metric, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setMetric(final CharSequence metric, final long value) {
-    delegate.setMetric(metric, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setMetric(final CharSequence metric, final float value) {
-    delegate.setMetric(metric, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setMetric(final CharSequence metric, final double value) {
-    delegate.setMetric(metric, value);
-    return this;
-  }
-
-  @Override
-  public boolean isError() {
-    return delegate.isError();
-  }
-
-  @Override
-  public OTSpan setError(final boolean value) {
-    delegate.setError(value, ErrorPriorities.MANUAL_INSTRUMENTATION);
-    return this;
-  }
-
-  @Override
-  public OTSpan getRootSpan() {
-    return getLocalRootSpan();
-  }
-
-  @Override
-  public OTSpan getLocalRootSpan() {
-    return converter.toSpan(delegate.getLocalRootSpan());
-  }
-
-  @Override
-  public <T> Span setTag(final Tag<T> tag, final T value) {
-    delegate.setTag(tag.getKey(), value);
-    return this;
-  }
-
-  @Override
-  public OTSpan log(final Map<String, ?> fields) {
-    logHandler.log(fields, delegate);
-    return this;
-  }
-
-  @Override
-  public OTSpan log(final long timestampMicroseconds, final Map<String, ?> fields) {
-    logHandler.log(timestampMicroseconds, fields, delegate);
-    return this;
-  }
-
-  @Override
-  public OTSpan log(final String event) {
-    logHandler.log(event, delegate);
-    return this;
-  }
-
-  @Override
-  public OTSpan log(final long timestampMicroseconds, final String event) {
-    logHandler.log(timestampMicroseconds, event, delegate);
-    return this;
-  }
-
-  @Override
-  public OTSpan setBaggageItem(final String key, final String value) {
-    delegate.setBaggageItem(key, value);
-    return this;
-  }
-
-  @Override
-  public String getBaggageItem(final String key) {
-    return delegate.getBaggageItem(key);
-  }
-
-  @Override
-  public long getStartTime() {
-    return delegate.getStartTime();
-  }
-
-  @Override
-  public long getDurationNano() {
-    return delegate.getDurationNano();
-  }
-
-  @Override
-  public CharSequence getOperationName() {
-    return delegate.getOperationName();
-  }
-
-  @Override
-  public OTSpan setOperationName(final CharSequence operationName) {
-    delegate.setOperationName(operationName);
-    return this;
-  }
-
-  @Override
-  public OTSpan setOperationName(final String operationName) {
-    delegate.setOperationName(UTF8BytesString.create(operationName));
-    return this;
-  }
-
-  @Override
-  public String getServiceName() {
-    return delegate.getServiceName();
-  }
-
-  @Override
-  @SuppressForbidden
-  public OTSpan setServiceName(final String serviceName) {
-    delegate.setServiceName(serviceName);
-    return this;
-  }
-
-  @Override
-  public CharSequence getResourceName() {
-    return delegate.getResourceName();
-  }
-
-  @Override
-  public OTSpan setResourceName(final CharSequence resourceName) {
-    delegate.setResourceName(resourceName, ResourceNamePriorities.MANUAL_INSTRUMENTATION);
-    return this;
-  }
-
-  @Override
-  public Integer getSamplingPriority() {
-    return delegate.getSamplingPriority();
-  }
-
-  @Override
-  public OTSpan setSamplingPriority(final int newPriority) {
-    delegate.setSamplingPriority(newPriority);
-    return this;
-  }
-
-  @Override
-  public String getSpanType() {
-    return delegate.getSpanType();
-  }
-
-  @Override
-  public OTSpan setSpanType(final CharSequence type) {
-    delegate.setSpanType(type);
-    return this;
-  }
-
-  @Override
-  public Map<String, Object> getTags() {
-    return delegate.getTags();
-  }
-
-  @Override
-  public Object getTag(String key) {
-    return delegate.getTag(key);
-  }
-
-  @Override
-  public void finish() {
-    delegate.finish();
-  }
-
-  @Override
-  public void finish(final long finishMicros) {
-    delegate.finish(finishMicros);
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    final OTSpan otSpan = (OTSpan) o;
-    return delegate.equals(otSpan.delegate);
-  }
-
-  @Override
-  public int hashCode() {
-    return delegate.hashCode();
-  }
-
-  @Override
-  public AgentSpan asAgentSpan() {
-    return delegate;
-  }
+    private final AgentSpan delegate;
+    private final TypeConverter converter;
+    private final LogHandler logHandler;
+
+    OTSpan(final AgentSpan delegate, final TypeConverter converter, final LogHandler logHandler) {
+        this.delegate = delegate;
+        this.converter = converter;
+        this.logHandler = logHandler;
+    }
+
+    @Override
+    public SpanContext context() {
+        return converter.toSpanContext(delegate.spanContext());
+    }
+
+    @Override
+    public OTSpan setTag(final String key, final String value) {
+        delegate.setTag(key, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setTag(final String key, final boolean value) {
+        delegate.setTag(key, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setTag(final String key, final Number value) {
+        delegate.setTag(key, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setMetric(final CharSequence metric, final int value) {
+        delegate.setMetric(metric, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setMetric(final CharSequence metric, final long value) {
+        delegate.setMetric(metric, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setMetric(final CharSequence metric, final float value) {
+        delegate.setMetric(metric, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setMetric(final CharSequence metric, final double value) {
+        delegate.setMetric(metric, value);
+        return this;
+    }
+
+    @Override
+    public boolean isError() {
+        return delegate.isError();
+    }
+
+    @Override
+    public OTSpan setError(final boolean value) {
+        delegate.setError(value, ErrorPriorities.MANUAL_INSTRUMENTATION);
+        return this;
+    }
+
+    @Override
+    public OTSpan getRootSpan() {
+        return getLocalRootSpan();
+    }
+
+    @Override
+    public OTSpan getLocalRootSpan() {
+        return converter.toSpan(delegate.getLocalRootSpan());
+    }
+
+    @Override
+    public <T> Span setTag(final Tag<T> tag, final T value) {
+        delegate.setTag(tag.getKey(), value);
+        return this;
+    }
+
+    @Override
+    public OTSpan log(final Map<String, ?> fields) {
+        logHandler.log(fields, delegate);
+        return this;
+    }
+
+    @Override
+    public OTSpan log(final long timestampMicroseconds, final Map<String, ?> fields) {
+        logHandler.log(timestampMicroseconds, fields, delegate);
+        return this;
+    }
+
+    @Override
+    public OTSpan log(final String event) {
+        logHandler.log(event, delegate);
+        return this;
+    }
+
+    @Override
+    public OTSpan log(final long timestampMicroseconds, final String event) {
+        logHandler.log(timestampMicroseconds, event, delegate);
+        return this;
+    }
+
+    @Override
+    public OTSpan setBaggageItem(final String key, final String value) {
+        delegate.setBaggageItem(key, value);
+        return this;
+    }
+
+    @Override
+    public String getBaggageItem(final String key) {
+        return delegate.getBaggageItem(key);
+    }
+
+    @Override
+    public long getStartTime() {
+        return delegate.getStartTime();
+    }
+
+    @Override
+    public long getDurationNano() {
+        return delegate.getDurationNano();
+    }
+
+    @Override
+    public CharSequence getOperationName() {
+        return delegate.getOperationName();
+    }
+
+    @Override
+    public OTSpan setOperationName(final CharSequence operationName) {
+        delegate.setOperationName(operationName);
+        return this;
+    }
+
+    @Override
+    public OTSpan setOperationName(final String operationName) {
+        delegate.setOperationName(UTF8BytesString.create(operationName));
+        return this;
+    }
+
+    @Override
+    public String getServiceName() {
+        return delegate.getServiceName();
+    }
+
+    @Override
+    @SuppressForbidden
+    public OTSpan setServiceName(final String serviceName) {
+        delegate.setServiceName(serviceName);
+        return this;
+    }
+
+    @Override
+    public CharSequence getResourceName() {
+        return delegate.getResourceName();
+    }
+
+    @Override
+    public OTSpan setResourceName(final CharSequence resourceName) {
+        delegate.setResourceName(resourceName, ResourceNamePriorities.MANUAL_INSTRUMENTATION);
+        return this;
+    }
+
+    @Override
+    public Integer getSamplingPriority() {
+        return delegate.getSamplingPriority();
+    }
+
+    @Override
+    public OTSpan setSamplingPriority(final int newPriority) {
+        delegate.setSamplingPriority(newPriority);
+        return this;
+    }
+
+    @Override
+    public String getSpanType() {
+        return delegate.getSpanType();
+    }
+
+    @Override
+    public OTSpan setSpanType(final CharSequence type) {
+        delegate.setSpanType(type);
+        return this;
+    }
+
+    @Override
+    public Map<String, Object> getTags() {
+        return delegate.getTags();
+    }
+
+    @Override
+    public Object getTag(String key) {
+        return delegate.getTag(key);
+    }
+
+    @Override
+    public void finish() {
+        delegate.finish();
+    }
+
+    @Override
+    public void finish(final long finishMicros) {
+        delegate.finish(finishMicros);
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final OTSpan otSpan = (OTSpan) o;
+        return delegate.equals(otSpan.delegate);
+    }
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+
+    @Override
+    public AgentSpan asAgentSpan() {
+        return delegate;
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpanContext.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpanContext.java
index 60cc72c6c2b..5c84c54fe15 100644
--- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpanContext.java
+++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpanContext.java
@@ -6,28 +6,28 @@
 import java.util.Map;
 
 class OTSpanContext implements SpanContext {
-  private final AgentSpanContext delegate;
+    private final AgentSpanContext delegate;
 
-  OTSpanContext(final AgentSpanContext delegate) {
-    this.delegate = delegate;
-  }
+    OTSpanContext(final AgentSpanContext delegate) {
+        this.delegate = delegate;
+    }
 
-  @Override
-  public String toTraceId() {
-    return delegate.getTraceId().toString();
-  }
+    @Override
+    public String toTraceId() {
+        return delegate.getTraceId().toString();
+    }
 
-  @Override
-  public String toSpanId() {
-    return DDSpanId.toString(delegate.getSpanId());
-  }
+    @Override
+    public String toSpanId() {
+        return DDSpanId.toString(delegate.getSpanId());
+    }
 
-  @Override
-  public Iterable<Map.Entry<String, String>> baggageItems() {
-    return delegate.baggageItems();
-  }
+    @Override
+    public Iterable<Map.Entry<String, String>> baggageItems() {
+        return delegate.baggageItems();
+    }
 
-  AgentSpanContext getDelegate() {
-    return delegate;
-  }
+    AgentSpanContext getDelegate() {
+        return delegate;
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTTextMapInjectSetter.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTTextMapInjectSetter.java
index 74040c1a10b..0d241c6f7d7 100644
--- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTTextMapInjectSetter.java
+++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTTextMapInjectSetter.java
@@ -6,10 +6,10 @@
 
 @ParametersAreNonnullByDefault
 class OTTextMapInjectSetter implements CarrierSetter<TextMapInject> {
-  static final OTTextMapInjectSetter INSTANCE = new OTTextMapInjectSetter();
+    static final OTTextMapInjectSetter INSTANCE = new OTTextMapInjectSetter();
 
-  @Override
-  public void set(final TextMapInject carrier, final String key, final String value) {
-    carrier.put(key, value);
-  }
+    @Override
+    public void set(final TextMapInject carrier, final String key, final String value) {
+        carrier.put(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTTracer.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTTracer.java
index ba2ce8313c0..b04162801d0 100644
--- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTTracer.java
+++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTTracer.java
@@ -23,165 +23,164 @@
 import org.slf4j.LoggerFactory;
 
 public class OTTracer implements Tracer {
-  private static final String INSTRUMENTATION_NAME = "opentracing";
-  private static final Logger log = LoggerFactory.getLogger(OTTracer.class);
-
-  private final TypeConverter converter = new TypeConverter(new DefaultLogHandler());
-  private final AgentTracer.TracerAPI tracer;
-  private final ScopeManager scopeManager;
-
-  public OTTracer(final AgentTracer.TracerAPI tracer) {
-    this.tracer = tracer;
-    scopeManager = new OTScopeManager(tracer, converter);
-  }
-
-  @Override
-  public ScopeManager scopeManager() {
-    return scopeManager;
-  }
-
-  @Override
-  public Span activeSpan() {
-    return converter.toSpan(AgentTracer.activeSpan());
-  }
-
-  @Override
-  public Scope activateSpan(final Span span) {
-    if (null == span) {
-      return null;
-    }
-
-    return converter.toScope(tracer.activateManualSpan(converter.toAgentSpan(span)), false);
-  }
-
-  @Override
-  public SpanBuilder buildSpan(final String operationName) {
-    return new OTSpanBuilder(tracer.buildSpan(INSTRUMENTATION_NAME, operationName));
-  }
-
-  @Override
-  public <C> void inject(final SpanContext spanContext, final Format<C> format, final C carrier) {
-    if (carrier instanceof TextMapInject) {
-      final AgentSpanContext context = converter.toContext(spanContext);
-      AgentSpan span = fromSpanContext(context);
-      defaultPropagator().inject(span, (TextMapInject) carrier, OTTextMapInjectSetter.INSTANCE);
-    } else {
-      log.debug("Unsupported format for propagation - {}", format.getClass().getName());
-    }
-  }
-
-  @Override
-  public <C> SpanContext extract(final Format<C> format, final C carrier) {
-    if (carrier instanceof TextMapExtract) {
-      final AgentSpanContext tagContext =
-          extractContextAndGetSpanContext(
-              (TextMapExtract) carrier, ContextVisitors.stringValuesEntrySet());
-
-      return converter.toSpanContext(tagContext);
-    } else {
-      log.debug("Unsupported format for propagation - {}", format.getClass().getName());
-      return null;
-    }
-  }
-
-  @Override
-  public void close() {
-    tracer.flush(); // keep wrapped tracer open
-  }
-
-  public class OTSpanBuilder implements Tracer.SpanBuilder {
-    private final AgentTracer.SpanBuilder delegate;
-
-    public OTSpanBuilder(final AgentTracer.SpanBuilder delegate) {
-      this.delegate = delegate;
-    }
-
-    @Override
-    public Tracer.SpanBuilder asChildOf(final SpanContext parent) {
-      delegate.asChildOf(converter.toContext(parent));
-      return this;
-    }
+    private static final String INSTRUMENTATION_NAME = "opentracing";
+    private static final Logger log = LoggerFactory.getLogger(OTTracer.class);
 
-    @Override
-    public Tracer.SpanBuilder asChildOf(final Span parent) {
-      if (parent != null) {
-        delegate.asChildOf(converter.toAgentSpan(parent).spanContext());
-      }
-      return this;
-    }
+    private final TypeConverter converter = new TypeConverter(new DefaultLogHandler());
+    private final AgentTracer.TracerAPI tracer;
+    private final ScopeManager scopeManager;
 
-    @Override
-    public Tracer.SpanBuilder addReference(
-        final String referenceType, final SpanContext referencedContext) {
-      if (referencedContext == null) {
-        return this;
-      }
-
-      final AgentSpanContext context = converter.toContext(referencedContext);
-
-      if (References.CHILD_OF.equals(referenceType)
-          || References.FOLLOWS_FROM.equals(referenceType)) {
-        delegate.asChildOf(context);
-      } else {
-        log.debug("Only support reference type of CHILD_OF and FOLLOWS_FROM");
-      }
-
-      return this;
+    public OTTracer(final AgentTracer.TracerAPI tracer) {
+        this.tracer = tracer;
+        scopeManager = new OTScopeManager(tracer, converter);
     }
 
     @Override
-    public OTSpanBuilder ignoreActiveSpan() {
-      delegate.ignoreActiveSpan();
-      return this;
+    public ScopeManager scopeManager() {
+        return scopeManager;
     }
 
     @Override
-    public OTSpanBuilder withTag(final String key, final String value) {
-      delegate.withTag(key, value);
-      return this;
+    public Span activeSpan() {
+        return converter.toSpan(AgentTracer.activeSpan());
     }
 
     @Override
-    public OTSpanBuilder withTag(final String key, final boolean value) {
-      delegate.withTag(key, value);
-      return this;
-    }
+    public Scope activateSpan(final Span span) {
+        if (null == span) {
+            return null;
+        }
 
-    @Override
-    public OTSpanBuilder withTag(final String key, final Number value) {
-      delegate.withTag(key, value);
-      return this;
+        return converter.toScope(tracer.activateManualSpan(converter.toAgentSpan(span)), false);
     }
 
     @Override
-    public <T> OTSpanBuilder withTag(final Tag<T> tag, final T value) {
-      delegate.withTag(tag.getKey(), value);
-      return this;
+    public SpanBuilder buildSpan(final String operationName) {
+        return new OTSpanBuilder(tracer.buildSpan(INSTRUMENTATION_NAME, operationName));
     }
 
     @Override
-    public OTSpanBuilder withStartTimestamp(final long microseconds) {
-      delegate.withStartTimestamp(microseconds);
-      return this;
+    public <C> void inject(final SpanContext spanContext, final Format<C> format, final C carrier) {
+        if (carrier instanceof TextMapInject) {
+            final AgentSpanContext context = converter.toContext(spanContext);
+            AgentSpan span = fromSpanContext(context);
+            defaultPropagator().inject(span, (TextMapInject) carrier, OTTextMapInjectSetter.INSTANCE);
+        } else {
+            log.debug(
+                    "Unsupported format for propagation - {}", format.getClass().getName());
+        }
     }
 
     @Override
-    public Span startManual() {
-      return start();
-    }
+    public <C> SpanContext extract(final Format<C> format, final C carrier) {
+        if (carrier instanceof TextMapExtract) {
+            final AgentSpanContext tagContext =
+                    extractContextAndGetSpanContext((TextMapExtract) carrier, ContextVisitors.stringValuesEntrySet());
 
-    @Override
-    public Span start() {
-      final AgentSpan agentSpan = delegate.start();
-      agentSpan.spanContext().setIntegrationName("opentracing");
-      return converter.toSpan(agentSpan);
+            return converter.toSpanContext(tagContext);
+        } else {
+            log.debug(
+                    "Unsupported format for propagation - {}", format.getClass().getName());
+            return null;
+        }
     }
 
     @Override
-    public Scope startActive(final boolean finishSpanOnClose) {
-      final AgentSpan agentSpan = delegate.start();
-      agentSpan.spanContext().setIntegrationName("opentracing");
-      return converter.toScope(tracer.activateManualSpan(agentSpan), finishSpanOnClose);
+    public void close() {
+        tracer.flush(); // keep wrapped tracer open
+    }
+
+    public class OTSpanBuilder implements Tracer.SpanBuilder {
+        private final AgentTracer.SpanBuilder delegate;
+
+        public OTSpanBuilder(final AgentTracer.SpanBuilder delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public Tracer.SpanBuilder asChildOf(final SpanContext parent) {
+            delegate.asChildOf(converter.toContext(parent));
+            return this;
+        }
+
+        @Override
+        public Tracer.SpanBuilder asChildOf(final Span parent) {
+            if (parent != null) {
+                delegate.asChildOf(converter.toAgentSpan(parent).spanContext());
+            }
+            return this;
+        }
+
+        @Override
+        public Tracer.SpanBuilder addReference(final String referenceType, final SpanContext referencedContext) {
+            if (referencedContext == null) {
+                return this;
+            }
+
+            final AgentSpanContext context = converter.toContext(referencedContext);
+
+            if (References.CHILD_OF.equals(referenceType) || References.FOLLOWS_FROM.equals(referenceType)) {
+                delegate.asChildOf(context);
+            } else {
+                log.debug("Only support reference type of CHILD_OF and FOLLOWS_FROM");
+            }
+
+            return this;
+        }
+
+        @Override
+        public OTSpanBuilder ignoreActiveSpan() {
+            delegate.ignoreActiveSpan();
+            return this;
+        }
+
+        @Override
+        public OTSpanBuilder withTag(final String key, final String value) {
+            delegate.withTag(key, value);
+            return this;
+        }
+
+        @Override
+        public OTSpanBuilder withTag(final String key, final boolean value) {
+            delegate.withTag(key, value);
+            return this;
+        }
+
+        @Override
+        public OTSpanBuilder withTag(final String key, final Number value) {
+            delegate.withTag(key, value);
+            return this;
+        }
+
+        @Override
+        public <T> OTSpanBuilder withTag(final Tag<T> tag, final T value) {
+            delegate.withTag(tag.getKey(), value);
+            return this;
+        }
+
+        @Override
+        public OTSpanBuilder withStartTimestamp(final long microseconds) {
+            delegate.withStartTimestamp(microseconds);
+            return this;
+        }
+
+        @Override
+        public Span startManual() {
+            return start();
+        }
+
+        @Override
+        public Span start() {
+            final AgentSpan agentSpan = delegate.start();
+            agentSpan.spanContext().setIntegrationName("opentracing");
+            return converter.toSpan(agentSpan);
+        }
+
+        @Override
+        public Scope startActive(final boolean finishSpanOnClose) {
+            final AgentSpan agentSpan = delegate.start();
+            agentSpan.spanContext().setIntegrationName("opentracing");
+            return converter.toScope(tracer.activateManualSpan(agentSpan), finishSpanOnClose);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/TypeConverter.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/TypeConverter.java
index f686d3ca40b..074d675c713 100644
--- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/TypeConverter.java
+++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/TypeConverter.java
@@ -14,65 +14,65 @@
 
 // Centralized place to do conversions
 public class TypeConverter {
-  private final LogHandler logHandler;
-  private final OTSpan noopSpanWrapper;
-  private final OTSpanContext noopContextWrapper;
+    private final LogHandler logHandler;
+    private final OTSpan noopSpanWrapper;
+    private final OTSpanContext noopContextWrapper;
 
-  public TypeConverter(final LogHandler logHandler) {
-    this.logHandler = logHandler;
-    noopSpanWrapper = new OTSpan(noopSpan(), this, logHandler);
-    noopContextWrapper = new OTSpanContext(noopSpanContext());
-  }
-
-  public AgentSpan toAgentSpan(final Span span) {
-    if (span instanceof OTSpan) {
-      return ((OTSpan) span).asAgentSpan();
+    public TypeConverter(final LogHandler logHandler) {
+        this.logHandler = logHandler;
+        noopSpanWrapper = new OTSpan(noopSpan(), this, logHandler);
+        noopContextWrapper = new OTSpanContext(noopSpanContext());
     }
-    return null == span ? null : noopSpan();
-  }
 
-  public OTSpan toSpan(final AgentSpan agentSpan) {
-    if (agentSpan == null) {
-      return null;
-    }
-    if (agentSpan instanceof AttachableWrapper) {
-      AttachableWrapper attachableSpanWrapper = (AttachableWrapper) agentSpan;
-      Object wrapper = attachableSpanWrapper.getWrapper();
-      if (wrapper instanceof OTSpan) {
-        return (OTSpan) wrapper;
-      }
-      OTSpan spanWrapper = new OTSpan(agentSpan, this, logHandler);
-      attachableSpanWrapper.attachWrapper(spanWrapper);
-      return spanWrapper;
+    public AgentSpan toAgentSpan(final Span span) {
+        if (span instanceof OTSpan) {
+            return ((OTSpan) span).asAgentSpan();
+        }
+        return null == span ? null : noopSpan();
     }
-    if (agentSpan == noopSpan()) {
-      return noopSpanWrapper;
-    }
-    return new OTSpan(agentSpan, this, logHandler);
-  }
 
-  public Scope toScope(final ContextScope scope, final boolean finishSpanOnClose) {
-    if (scope == null) {
-      return null;
+    public OTSpan toSpan(final AgentSpan agentSpan) {
+        if (agentSpan == null) {
+            return null;
+        }
+        if (agentSpan instanceof AttachableWrapper) {
+            AttachableWrapper attachableSpanWrapper = (AttachableWrapper) agentSpan;
+            Object wrapper = attachableSpanWrapper.getWrapper();
+            if (wrapper instanceof OTSpan) {
+                return (OTSpan) wrapper;
+            }
+            OTSpan spanWrapper = new OTSpan(agentSpan, this, logHandler);
+            attachableSpanWrapper.attachWrapper(spanWrapper);
+            return spanWrapper;
+        }
+        if (agentSpan == noopSpan()) {
+            return noopSpanWrapper;
+        }
+        return new OTSpan(agentSpan, this, logHandler);
     }
-    return new OTScopeManager.OTScope(scope, finishSpanOnClose, this);
-  }
 
-  public SpanContext toSpanContext(final AgentSpanContext context) {
-    if (context == null) {
-      return null;
+    public Scope toScope(final ContextScope scope, final boolean finishSpanOnClose) {
+        if (scope == null) {
+            return null;
+        }
+        return new OTScopeManager.OTScope(scope, finishSpanOnClose, this);
     }
-    // avoid a new SpanContext wrapper allocation for the noop context
-    if (context == noopSpanContext()) {
-      return noopContextWrapper;
+
+    public SpanContext toSpanContext(final AgentSpanContext context) {
+        if (context == null) {
+            return null;
+        }
+        // avoid a new SpanContext wrapper allocation for the noop context
+        if (context == noopSpanContext()) {
+            return noopContextWrapper;
+        }
+        return new OTSpanContext(context);
     }
-    return new OTSpanContext(context);
-  }
 
-  public AgentSpanContext toContext(final SpanContext spanContext) {
-    if (spanContext instanceof OTSpanContext) {
-      return ((OTSpanContext) spanContext).getDelegate();
+    public AgentSpanContext toContext(final SpanContext spanContext) {
+        if (spanContext instanceof OTSpanContext) {
+            return ((OTSpanContext) spanContext).getDelegate();
+        }
+        return null == spanContext ? null : noopSpanContext();
     }
-    return null == spanContext ? null : noopSpanContext();
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-common/src/main/java/datadog/trace/instrumentation/opentracing/DefaultLogHandler.java b/dd-java-agent/instrumentation/opentracing/opentracing-common/src/main/java/datadog/trace/instrumentation/opentracing/DefaultLogHandler.java
index dfb72237f11..9904296d158 100644
--- a/dd-java-agent/instrumentation/opentracing/opentracing-common/src/main/java/datadog/trace/instrumentation/opentracing/DefaultLogHandler.java
+++ b/dd-java-agent/instrumentation/opentracing/opentracing-common/src/main/java/datadog/trace/instrumentation/opentracing/DefaultLogHandler.java
@@ -13,42 +13,41 @@
 /** The default implementation of the LogHandler. */
 public class DefaultLogHandler implements LogHandler {
 
-  private static final Logger log = LoggerFactory.getLogger(DefaultLogHandler.class);
-
-  @Override
-  public void log(final Map<String, ?> fields, final AgentSpan span) {
-    extractError(fields, span);
-    log.debug("`log` method is not implemented. Doing nothing");
-  }
-
-  @Override
-  public void log(
-      final long timestampMicroseconds, final Map<String, ?> fields, final AgentSpan span) {
-    extractError(fields, span);
-    log.debug("`log` method is not implemented. Doing nothing");
-  }
-
-  @Override
-  public void log(final String event, final AgentSpan span) {
-    log.debug("`log` method is not implemented. Provided log: {}", event);
-  }
-
-  @Override
-  public void log(final long timestampMicroseconds, final String event, final AgentSpan span) {
-    log.debug("`log` method is not implemented. Provided log: {}", event);
-  }
-
-  private boolean isErrorSpan(final Map<String, ?> map, final AgentSpan span) {
-    final String event = map.get(EVENT) instanceof String ? (String) map.get(EVENT) : "";
-    return span.isError() || event.equalsIgnoreCase("error");
-  }
-
-  private void extractError(final Map<String, ?> map, final AgentSpan span) {
-    if (map.get(ERROR_OBJECT) instanceof Throwable) {
-      final Throwable error = (Throwable) map.get(ERROR_OBJECT);
-      span.addThrowable(error);
-    } else if (isErrorSpan(map, span) && map.get(MESSAGE) instanceof String) {
-      span.setTag(ERROR_MSG, (String) map.get(MESSAGE));
+    private static final Logger log = LoggerFactory.getLogger(DefaultLogHandler.class);
+
+    @Override
+    public void log(final Map<String, ?> fields, final AgentSpan span) {
+        extractError(fields, span);
+        log.debug("`log` method is not implemented. Doing nothing");
+    }
+
+    @Override
+    public void log(final long timestampMicroseconds, final Map<String, ?> fields, final AgentSpan span) {
+        extractError(fields, span);
+        log.debug("`log` method is not implemented. Doing nothing");
+    }
+
+    @Override
+    public void log(final String event, final AgentSpan span) {
+        log.debug("`log` method is not implemented. Provided log: {}", event);
+    }
+
+    @Override
+    public void log(final long timestampMicroseconds, final String event, final AgentSpan span) {
+        log.debug("`log` method is not implemented. Provided log: {}", event);
+    }
+
+    private boolean isErrorSpan(final Map<String, ?> map, final AgentSpan span) {
+        final String event = map.get(EVENT) instanceof String ? (String) map.get(EVENT) : "";
+        return span.isError() || event.equalsIgnoreCase("error");
+    }
+
+    private void extractError(final Map<String, ?> map, final AgentSpan span) {
+        if (map.get(ERROR_OBJECT) instanceof Throwable) {
+            final Throwable error = (Throwable) map.get(ERROR_OBJECT);
+            span.addThrowable(error);
+        } else if (isErrorSpan(map, span) && map.get(MESSAGE) instanceof String) {
+            span.setTag(ERROR_MSG, (String) map.get(MESSAGE));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-common/src/main/java/datadog/trace/instrumentation/opentracing/LogHandler.java b/dd-java-agent/instrumentation/opentracing/opentracing-common/src/main/java/datadog/trace/instrumentation/opentracing/LogHandler.java
index 610ccfa4bd4..32a8597beee 100644
--- a/dd-java-agent/instrumentation/opentracing/opentracing-common/src/main/java/datadog/trace/instrumentation/opentracing/LogHandler.java
+++ b/dd-java-agent/instrumentation/opentracing/opentracing-common/src/main/java/datadog/trace/instrumentation/opentracing/LogHandler.java
@@ -5,40 +5,40 @@
 
 public interface LogHandler {
 
-  /**
-   * Handles the log implementation in the Span.
-   *
-   * @param fields key:value log fields. Tracer implementations should support String, numeric, and
-   *     boolean values; some may also support arbitrary Objects.
-   * @param span from which the call was made
-   */
-  void log(Map<String, ?> fields, AgentSpan span);
+    /**
+     * Handles the log implementation in the Span.
+     *
+     * @param fields key:value log fields. Tracer implementations should support String, numeric, and
+     *     boolean values; some may also support arbitrary Objects.
+     * @param span from which the call was made
+     */
+    void log(Map<String, ?> fields, AgentSpan span);
 
-  /**
-   * Handles the log implementation in the Span.
-   *
-   * @param timestampMicroseconds The explicit timestamp for the log record. Must be greater than or
-   *     equal to the Span's start timestamp.
-   * @param fields key:value log fields. Tracer implementations should support String, numeric, and
-   * @param span from which the call was made
-   */
-  void log(long timestampMicroseconds, Map<String, ?> fields, AgentSpan span);
+    /**
+     * Handles the log implementation in the Span.
+     *
+     * @param timestampMicroseconds The explicit timestamp for the log record. Must be greater than or
+     *     equal to the Span's start timestamp.
+     * @param fields key:value log fields. Tracer implementations should support String, numeric, and
+     * @param span from which the call was made
+     */
+    void log(long timestampMicroseconds, Map<String, ?> fields, AgentSpan span);
 
-  /**
-   * Handles the log implementation in the Span..
-   *
-   * @param event the event value; often a stable identifier for a moment in the Span lifecycle
-   * @param span from which the call was made
-   */
-  void log(String event, AgentSpan span);
+    /**
+     * Handles the log implementation in the Span..
+     *
+     * @param event the event value; often a stable identifier for a moment in the Span lifecycle
+     * @param span from which the call was made
+     */
+    void log(String event, AgentSpan span);
 
-  /**
-   * Handles the log implementation in the Span.
-   *
-   * @param timestampMicroseconds The explicit timestamp for the log record. Must be greater than or
-   *     equal to the Span's start timestamp.
-   * @param event the event value; often a stable identifier for a moment in the Span lifecycle
-   * @param span from which the call was made
-   */
-  void log(long timestampMicroseconds, String event, AgentSpan span);
+    /**
+     * Handles the log implementation in the Span.
+     *
+     * @param timestampMicroseconds The explicit timestamp for the log record. Must be greater than or
+     *     equal to the Span's start timestamp.
+     * @param event the event value; often a stable identifier for a moment in the Span lifecycle
+     * @param span from which the call was made
+     */
+    void log(long timestampMicroseconds, String event, AgentSpan span);
 }
diff --git a/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONArrayInstrumentation.java b/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONArrayInstrumentation.java
index 869de8beeb8..9abc4376ac7 100644
--- a/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONArrayInstrumentation.java
+++ b/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONArrayInstrumentation.java
@@ -18,40 +18,39 @@
 
 @AutoService(InstrumenterModule.class)
 public class JSONArrayInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public JSONArrayInstrumentation() {
-    super("org-json");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "all";
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.json.JSONArray";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArguments(0)).and(takesArgument(0, named("org.json.JSONTokener"))),
-        getClass().getName() + "$ConstructorAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(returns(Object.class)).and(named("opt")),
-        packageName + ".OptAdvice");
-  }
-
-  public static class ConstructorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void afterInit(@Advice.This Object self, @Advice.Argument(0) final Object input) {
-      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
-      if (iastModule != null && input != null) {
-        iastModule.taintObjectIfTainted(self, input);
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public JSONArrayInstrumentation() {
+        super("org-json");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "all";
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.json.JSONArray";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArguments(0)).and(takesArgument(0, named("org.json.JSONTokener"))),
+                getClass().getName() + "$ConstructorAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(returns(Object.class)).and(named("opt")), packageName + ".OptAdvice");
+    }
+
+    public static class ConstructorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void afterInit(@Advice.This Object self, @Advice.Argument(0) final Object input) {
+            final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+            if (iastModule != null && input != null) {
+                iastModule.taintObjectIfTainted(self, input);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONCookieInstrumentation.java b/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONCookieInstrumentation.java
index 26e332f9956..7bd9da42fe8 100644
--- a/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONCookieInstrumentation.java
+++ b/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONCookieInstrumentation.java
@@ -13,38 +13,37 @@
 
 @AutoService(InstrumenterModule.class)
 public class JSONCookieInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public JSONCookieInstrumentation() {
-    super("org-json");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "all";
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.json.Cookie";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("toJSONObject").and(takesArguments(String.class)),
-        getClass().getName() + "$toJSONObjectAdvice");
-  }
-
-  public static class toJSONObjectAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onExit(
-        @Advice.Return Object retValue, @Advice.Argument(0) final String input) {
-      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
-      if (iastModule != null && input != null) {
-        iastModule.taintObjectIfTainted(retValue, input);
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public JSONCookieInstrumentation() {
+        super("org-json");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "all";
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.json.Cookie";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("toJSONObject").and(takesArguments(String.class)),
+                getClass().getName() + "$toJSONObjectAdvice");
+    }
+
+    public static class toJSONObjectAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onExit(@Advice.Return Object retValue, @Advice.Argument(0) final String input) {
+            final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+            if (iastModule != null && input != null) {
+                iastModule.taintObjectIfTainted(retValue, input);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONObject20241224Instrumentation.java b/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONObject20241224Instrumentation.java
index 5cb96ad7ffa..aabe90d23e1 100644
--- a/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONObject20241224Instrumentation.java
+++ b/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONObject20241224Instrumentation.java
@@ -21,64 +21,63 @@
 
 @AutoService(InstrumenterModule.class)
 public class JSONObject20241224Instrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public JSONObject20241224Instrumentation() {
-    super("org-json");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public JSONObject20241224Instrumentation() {
+        super("org-json");
+    }
 
-  static final ElementMatcher.Junction<ClassLoader> AFTER_20241224 =
-      hasClassNamed("org.json.StringBuilderWriter");
+    static final ElementMatcher.Junction<ClassLoader> AFTER_20241224 = hasClassNamed("org.json.StringBuilderWriter");
 
-  @Override
-  public String muzzleDirective() {
-    return "after_20241224";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "after_20241224";
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return AFTER_20241224;
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return AFTER_20241224;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.json.JSONObject";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.json.JSONObject";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration)
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("org.json.JSONTokener")))
-            .and(takesArgument(1, named("org.json.JSONParserConfiguration"))),
-        getClass().getName() + "$ConstructorAdvice");
-    // private JSONObject(Map<?, ?> m, int recursionDepth, JSONParserConfiguration
-    // jsonParserConfiguration)
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArguments(3))
-            .and(takesArgument(0, Map.class))
-            .and(takesArgument(1, int.class))
-            .and(takesArgument(2, named("org.json.JSONParserConfiguration"))),
-        getClass().getName() + "$ConstructorAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(returns(Object.class))
-            .and(named("opt"))
-            .and(takesArguments(String.class)),
-        packageName + ".OptAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration)
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("org.json.JSONTokener")))
+                        .and(takesArgument(1, named("org.json.JSONParserConfiguration"))),
+                getClass().getName() + "$ConstructorAdvice");
+        // private JSONObject(Map<?, ?> m, int recursionDepth, JSONParserConfiguration
+        // jsonParserConfiguration)
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, Map.class))
+                        .and(takesArgument(1, int.class))
+                        .and(takesArgument(2, named("org.json.JSONParserConfiguration"))),
+                getClass().getName() + "$ConstructorAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(returns(Object.class))
+                        .and(named("opt"))
+                        .and(takesArguments(String.class)),
+                packageName + ".OptAdvice");
+    }
 
-  public static class ConstructorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void afterInit(@Advice.This Object self, @Advice.Argument(0) final Object input) {
-      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
-      if (iastModule != null && input != null) {
-        iastModule.taintObjectIfTainted(self, input);
-      }
+    public static class ConstructorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void afterInit(@Advice.This Object self, @Advice.Argument(0) final Object input) {
+            final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+            if (iastModule != null && input != null) {
+                iastModule.taintObjectIfTainted(self, input);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONObjectInstrumentation.java b/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONObjectInstrumentation.java
index dabee96e25c..dc1e6cd5b55 100644
--- a/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONObjectInstrumentation.java
+++ b/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONObjectInstrumentation.java
@@ -22,56 +22,56 @@
 
 @AutoService(InstrumenterModule.class)
 public class JSONObjectInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public JSONObjectInstrumentation() {
-    super("org-json");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public JSONObjectInstrumentation() {
+        super("org-json");
+    }
 
-  static final ElementMatcher.Junction<ClassLoader> BEFORE_20241224 =
-      not(hasClassNamed("org.json.StringBuilderWriter"));
+    static final ElementMatcher.Junction<ClassLoader> BEFORE_20241224 =
+            not(hasClassNamed("org.json.StringBuilderWriter"));
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return BEFORE_20241224;
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return BEFORE_20241224;
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "before_20241224";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "before_20241224";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.json.JSONObject";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.json.JSONObject";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // public JSONObject(JSONTokener x)
-    transformer.applyAdvice(
-        isConstructor().and(takesArguments(1)).and(takesArgument(0, named("org.json.JSONTokener"))),
-        getClass().getName() + "$ConstructorAdvice");
-    // private JSONObject(Map<?, ?> m)
-    transformer.applyAdvice(
-        isConstructor().and(takesArguments(1)).and(takesArgument(0, Map.class)),
-        getClass().getName() + "$ConstructorAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(returns(Object.class))
-            .and(named("opt"))
-            .and(takesArguments(String.class)),
-        packageName + ".OptAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // public JSONObject(JSONTokener x)
+        transformer.applyAdvice(
+                isConstructor().and(takesArguments(1)).and(takesArgument(0, named("org.json.JSONTokener"))),
+                getClass().getName() + "$ConstructorAdvice");
+        // private JSONObject(Map<?, ?> m)
+        transformer.applyAdvice(
+                isConstructor().and(takesArguments(1)).and(takesArgument(0, Map.class)),
+                getClass().getName() + "$ConstructorAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(returns(Object.class))
+                        .and(named("opt"))
+                        .and(takesArguments(String.class)),
+                packageName + ".OptAdvice");
+    }
 
-  public static class ConstructorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void afterInit(@Advice.This Object self, @Advice.Argument(0) final Object input) {
-      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
-      if (iastModule != null && input != null) {
-        iastModule.taintObjectIfTainted(self, input);
-      }
+    public static class ConstructorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void afterInit(@Advice.This Object self, @Advice.Argument(0) final Object input) {
+            final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+            if (iastModule != null && input != null) {
+                iastModule.taintObjectIfTainted(self, input);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONTokenerInstrumentation.java b/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONTokenerInstrumentation.java
index b4fb20a64c3..bb513894a46 100644
--- a/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONTokenerInstrumentation.java
+++ b/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/JSONTokenerInstrumentation.java
@@ -14,37 +14,36 @@
 
 @AutoService(InstrumenterModule.class)
 public class JSONTokenerInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public JSONTokenerInstrumentation() {
-    super("org-json");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.json.JSONTokener";
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "all";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArguments(Reader.class)),
-        getClass().getName() + "$ConstructorAdvice");
-  }
-
-  public static class ConstructorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void afterInit(@Advice.This Object self, @Advice.Argument(0) final Object input) {
-      final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
-      if (iastModule != null && input != null) {
-        iastModule.taintObjectIfTainted(self, input);
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public JSONTokenerInstrumentation() {
+        super("org-json");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.json.JSONTokener";
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "all";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArguments(Reader.class)), getClass().getName() + "$ConstructorAdvice");
+    }
+
+    public static class ConstructorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void afterInit(@Advice.This Object self, @Advice.Argument(0) final Object input) {
+            final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+            if (iastModule != null && input != null) {
+                iastModule.taintObjectIfTainted(self, input);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/OptAdvice.java b/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/OptAdvice.java
index 4e40cb0d098..3358f37bf90 100644
--- a/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/OptAdvice.java
+++ b/dd-java-agent/instrumentation/org-json-20230227/src/main/java/datadog/trace/instrumentation/json/OptAdvice.java
@@ -8,21 +8,21 @@
 import org.json.JSONObject;
 
 public class OptAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  @Propagation
-  public static void afterMethod(@Advice.This Object self, @Advice.Return final Object result) {
-    boolean isString = result instanceof String;
-    boolean isJson = !isString && (result instanceof JSONObject || result instanceof JSONArray);
-    if (!isString && !isJson) {
-      return;
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Propagation
+    public static void afterMethod(@Advice.This Object self, @Advice.Return final Object result) {
+        boolean isString = result instanceof String;
+        boolean isJson = !isString && (result instanceof JSONObject || result instanceof JSONArray);
+        if (!isString && !isJson) {
+            return;
+        }
+        final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
+        if (iastModule != null) {
+            if (isString) {
+                iastModule.taintStringIfTainted((String) result, self);
+            } else {
+                iastModule.taintObjectIfTainted(result, self);
+            }
+        }
     }
-    final PropagationModule iastModule = InstrumentationBridge.PROPAGATION;
-    if (iastModule != null) {
-      if (isString) {
-        iastModule.taintStringIfTainted((String) result, self);
-      } else {
-        iastModule.taintObjectIfTainted(result, self);
-      }
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/osgi-4.3/src/main/java/datadog/trace/instrumentation/osgi43/BundleReferenceInstrumentation.java b/dd-java-agent/instrumentation/osgi-4.3/src/main/java/datadog/trace/instrumentation/osgi43/BundleReferenceInstrumentation.java
index ca5a881219f..3e02bf761b3 100644
--- a/dd-java-agent/instrumentation/osgi-4.3/src/main/java/datadog/trace/instrumentation/osgi43/BundleReferenceInstrumentation.java
+++ b/dd-java-agent/instrumentation/osgi-4.3/src/main/java/datadog/trace/instrumentation/osgi43/BundleReferenceInstrumentation.java
@@ -23,162 +23,156 @@
 
 @AutoService(InstrumenterModule.class)
 public final class BundleReferenceInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public BundleReferenceInstrumentation() {
-    super("classloading", "osgi");
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Avoid matching older versions of OSGi that don't have the wiring API.
-    return hasClassNamed("org.osgi.framework.wiring.BundleWiring");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public BundleReferenceInstrumentation() {
+        super("classloading", "osgi");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.osgi.framework.BundleReference";
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Avoid matching older versions of OSGi that don't have the wiring API.
+        return hasClassNamed("org.osgi.framework.wiring.BundleWiring");
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("java.lang.ClassLoader"))
-        .and(implementsInterface(named(hierarchyMarkerType())));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.osgi.framework.BundleReference";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("getResource"))
-            .and(takesArguments(1).and(takesArgument(0, String.class))),
-        BundleReferenceInstrumentation.class.getName() + "$WidenGetResourceAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("getResourceAsStream"))
-            .and(takesArguments(1).and(takesArgument(0, String.class))),
-        BundleReferenceInstrumentation.class.getName() + "$WidenGetResourceAsStreamAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("loadClass"))
-            .and(
-                takesArguments(1)
-                    .and(takesArgument(0, String.class))
-                    .or(
-                        takesArguments(2)
-                            .and(takesArgument(0, String.class))
-                            .and(takesArgument(1, boolean.class)))),
-        BundleReferenceInstrumentation.class.getName() + "$WidenLoadClassAdvice");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("java.lang.ClassLoader")).and(implementsInterface(named(hierarchyMarkerType())));
+    }
 
-  /**
-   * Bypass local visibility rules by repeating failed requests from bundles wired as dependencies.
-   * Also supports light probing of class-loaders without triggering further resolution of bundles.
-   *
-   * <p>We only do this for agent requests that require this additional visibility.
-   */
-  public static class WidenGetResourceAdvice {
-    @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class, suppress = Throwable.class)
-    public static Object onEnter(
-        @Advice.This final BundleReference thiz, @Advice.Argument(0) final String name) {
-      AgentClassLoading requestType = AgentClassLoading.type();
-      // avoid probing "java/..." class resources, use standard lookup for them
-      if (PROBING_CLASSLOADER == requestType && !name.startsWith("java/")) {
-        return BundleWiringHelper.probeResource(thiz.getBundle(), name);
-      }
-      return null;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("getResource")).and(takesArguments(1).and(takesArgument(0, String.class))),
+                BundleReferenceInstrumentation.class.getName() + "$WidenGetResourceAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("getResourceAsStream"))
+                        .and(takesArguments(1).and(takesArgument(0, String.class))),
+                BundleReferenceInstrumentation.class.getName() + "$WidenGetResourceAsStreamAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("loadClass"))
+                        .and(takesArguments(1)
+                                .and(takesArgument(0, String.class))
+                                .or(takesArguments(2)
+                                        .and(takesArgument(0, String.class))
+                                        .and(takesArgument(1, boolean.class)))),
+                BundleReferenceInstrumentation.class.getName() + "$WidenLoadClassAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This final BundleReference thiz,
-        @Advice.Argument(0) final String name,
-        @Advice.Return(readOnly = false) URL result,
-        @Advice.Thrown(readOnly = false) Throwable error,
-        @Advice.Enter final Object resultFromProbe) {
-      if (null != resultFromProbe) {
-        if (resultFromProbe instanceof URL) {
-          result = (URL) resultFromProbe;
-        } else {
-          // probe returned SKIP_REQUEST
+    /**
+     * Bypass local visibility rules by repeating failed requests from bundles wired as dependencies.
+     * Also supports light probing of class-loaders without triggering further resolution of bundles.
+     *
+     * <p>We only do this for agent requests that require this additional visibility.
+     */
+    public static class WidenGetResourceAdvice {
+        @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class, suppress = Throwable.class)
+        public static Object onEnter(@Advice.This final BundleReference thiz, @Advice.Argument(0) final String name) {
+            AgentClassLoading requestType = AgentClassLoading.type();
+            // avoid probing "java/..." class resources, use standard lookup for them
+            if (PROBING_CLASSLOADER == requestType && !name.startsWith("java/")) {
+                return BundleWiringHelper.probeResource(thiz.getBundle(), name);
+            }
+            return null;
         }
-      } else if (null == result) {
-        AgentClassLoading requestType = AgentClassLoading.type();
-        if (null != requestType) {
-          requestType.end(); // avoid looping back into our advice
-          try {
-            // widen search by peeking inside bundle wiring
-            result = BundleWiringHelper.getResource(thiz.getBundle(), name);
-            if (null != result) {
-              error = null; // clear any error from original call
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This final BundleReference thiz,
+                @Advice.Argument(0) final String name,
+                @Advice.Return(readOnly = false) URL result,
+                @Advice.Thrown(readOnly = false) Throwable error,
+                @Advice.Enter final Object resultFromProbe) {
+            if (null != resultFromProbe) {
+                if (resultFromProbe instanceof URL) {
+                    result = (URL) resultFromProbe;
+                } else {
+                    // probe returned SKIP_REQUEST
+                }
+            } else if (null == result) {
+                AgentClassLoading requestType = AgentClassLoading.type();
+                if (null != requestType) {
+                    requestType.end(); // avoid looping back into our advice
+                    try {
+                        // widen search by peeking inside bundle wiring
+                        result = BundleWiringHelper.getResource(thiz.getBundle(), name);
+                        if (null != result) {
+                            error = null; // clear any error from original call
+                        }
+                    } finally {
+                        requestType.begin();
+                    }
+                }
             }
-          } finally {
-            requestType.begin();
-          }
         }
-      }
     }
-  }
 
-  /**
-   * Bypass local visibility rules by repeating failed requests from bundles wired as dependencies.
-   *
-   * <p>We only do this for agent requests that require this additional visibility.
-   */
-  public static class WidenGetResourceAsStreamAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This final BundleReference thiz,
-        @Advice.Argument(0) final String name,
-        @Advice.Return(readOnly = false) InputStream result,
-        @Advice.Thrown(readOnly = false) Throwable error) {
-      if (null == result) {
-        AgentClassLoading requestType = AgentClassLoading.type();
-        if (null != requestType) {
-          requestType.end(); // avoid looping back into our advice
-          try {
-            // widen search by peeking inside bundle wiring
-            URL resource = BundleWiringHelper.getResource(thiz.getBundle(), name);
-            if (null != resource) {
-              result = resource.openStream();
-              error = null; // clear any error from original call
+    /**
+     * Bypass local visibility rules by repeating failed requests from bundles wired as dependencies.
+     *
+     * <p>We only do this for agent requests that require this additional visibility.
+     */
+    public static class WidenGetResourceAsStreamAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This final BundleReference thiz,
+                @Advice.Argument(0) final String name,
+                @Advice.Return(readOnly = false) InputStream result,
+                @Advice.Thrown(readOnly = false) Throwable error) {
+            if (null == result) {
+                AgentClassLoading requestType = AgentClassLoading.type();
+                if (null != requestType) {
+                    requestType.end(); // avoid looping back into our advice
+                    try {
+                        // widen search by peeking inside bundle wiring
+                        URL resource = BundleWiringHelper.getResource(thiz.getBundle(), name);
+                        if (null != resource) {
+                            result = resource.openStream();
+                            error = null; // clear any error from original call
+                        }
+                    } catch (IOException e) {
+                        // ignore missing resource
+                    } finally {
+                        requestType.begin();
+                    }
+                }
             }
-          } catch (IOException e) {
-            // ignore missing resource
-          } finally {
-            requestType.begin();
-          }
         }
-      }
     }
-  }
 
-  /**
-   * Bypass local visibility rules by repeating failed requests from bundles wired as dependencies.
-   *
-   * <p>We only do this for agent requests that require this additional visibility.
-   */
-  public static class WidenLoadClassAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This final BundleReference thiz,
-        @Advice.Argument(0) final String name,
-        @Advice.Return(readOnly = false) Class<?> result,
-        @Advice.Thrown(readOnly = false) Throwable error) {
-      if (null == result) {
-        AgentClassLoading requestType = AgentClassLoading.type();
-        if (null != requestType) {
-          requestType.end(); // avoid looping back into our advice
-          try {
-            // widen search by peeking inside bundle wiring
-            result = BundleWiringHelper.loadClass(thiz.getBundle(), name);
-            if (null != result) {
-              error = null; // clear any error from original call
+    /**
+     * Bypass local visibility rules by repeating failed requests from bundles wired as dependencies.
+     *
+     * <p>We only do this for agent requests that require this additional visibility.
+     */
+    public static class WidenLoadClassAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This final BundleReference thiz,
+                @Advice.Argument(0) final String name,
+                @Advice.Return(readOnly = false) Class<?> result,
+                @Advice.Thrown(readOnly = false) Throwable error) {
+            if (null == result) {
+                AgentClassLoading requestType = AgentClassLoading.type();
+                if (null != requestType) {
+                    requestType.end(); // avoid looping back into our advice
+                    try {
+                        // widen search by peeking inside bundle wiring
+                        result = BundleWiringHelper.loadClass(thiz.getBundle(), name);
+                        if (null != result) {
+                            error = null; // clear any error from original call
+                        }
+                    } finally {
+                        requestType.begin();
+                    }
+                }
             }
-          } finally {
-            requestType.begin();
-          }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/osgi-4.3/src/main/java/datadog/trace/instrumentation/osgi43/BundleWiringHelper.java b/dd-java-agent/instrumentation/osgi-4.3/src/main/java/datadog/trace/instrumentation/osgi43/BundleWiringHelper.java
index 01c0da6a726..bcfeafba99c 100644
--- a/dd-java-agent/instrumentation/osgi-4.3/src/main/java/datadog/trace/instrumentation/osgi43/BundleWiringHelper.java
+++ b/dd-java-agent/instrumentation/osgi-4.3/src/main/java/datadog/trace/instrumentation/osgi43/BundleWiringHelper.java
@@ -19,116 +19,116 @@
  */
 public final class BundleWiringHelper {
 
-  // placeholder when we want byte-buddy to skip the original call and return null
-  private static final Object SKIP_REQUEST = new Object();
+    // placeholder when we want byte-buddy to skip the original call and return null
+    private static final Object SKIP_REQUEST = new Object();
 
-  /** Probes for the named resource without using any class-loader related methods. */
-  public static Object probeResource(final Bundle origin, final String resourceName) {
-    if (null == origin) {
-      // bundle reference has gone stale, e.g. the bundle was uninstalled
-      return SKIP_REQUEST;
-    }
-    URL resource = origin.getEntry(resourceName);
-    if (null != resource) {
-      return resource;
-    }
-    // not in the bundle, lets check for a direct import of the containing package
-    BundleWiring wiring = (BundleWiring) origin.adapt(BundleWiring.class);
-    if (null != wiring) {
-      List<BundleWire> importWires = wiring.getRequiredWires(PACKAGE_NAMESPACE);
-      if (null != importWires) {
-        int lastSlash = resourceName.lastIndexOf('/');
-        if (lastSlash > 0) {
-          String pkg = resourceName.substring(0, lastSlash).replace('/', '.');
-          for (BundleWire wire : importWires) {
-            if (pkg.equals(wire.getCapability().getAttributes().get(PACKAGE_NAMESPACE))) {
-              // class resource comes from a transitive import - to avoid cost of finding it, and
-              // because classloader matching/probing just checks existence, we return a resource
-              // we know exists to stand-in for the real resource
-              return origin.getEntry("META-INF/MANIFEST.MF");
+    /** Probes for the named resource without using any class-loader related methods. */
+    public static Object probeResource(final Bundle origin, final String resourceName) {
+        if (null == origin) {
+            // bundle reference has gone stale, e.g. the bundle was uninstalled
+            return SKIP_REQUEST;
+        }
+        URL resource = origin.getEntry(resourceName);
+        if (null != resource) {
+            return resource;
+        }
+        // not in the bundle, lets check for a direct import of the containing package
+        BundleWiring wiring = (BundleWiring) origin.adapt(BundleWiring.class);
+        if (null != wiring) {
+            List<BundleWire> importWires = wiring.getRequiredWires(PACKAGE_NAMESPACE);
+            if (null != importWires) {
+                int lastSlash = resourceName.lastIndexOf('/');
+                if (lastSlash > 0) {
+                    String pkg = resourceName.substring(0, lastSlash).replace('/', '.');
+                    for (BundleWire wire : importWires) {
+                        if (pkg.equals(wire.getCapability().getAttributes().get(PACKAGE_NAMESPACE))) {
+                            // class resource comes from a transitive import - to avoid cost of finding it, and
+                            // because classloader matching/probing just checks existence, we return a resource
+                            // we know exists to stand-in for the real resource
+                            return origin.getEntry("META-INF/MANIFEST.MF");
+                        }
+                    }
+                }
             }
-          }
         }
-      }
+        return SKIP_REQUEST;
     }
-    return SKIP_REQUEST;
-  }
 
-  /** Delegates resource request to any direct dependencies (Import-Package, Require-Bundle etc.) */
-  public static URL getResource(final Bundle origin, final String resourceName) {
-    if (null == origin) {
-      // bundle reference has gone stale, e.g. the bundle was uninstalled
-      return null;
-    }
-    BundleWiring wiring = (BundleWiring) origin.adapt(BundleWiring.class);
-    if (null != wiring) {
-      // track which bundles we've visited to avoid dependency cycles
-      Set<BundleRevision> visited = new HashSet<>();
-      visited.add(wiring.getRevision());
-      // check all Import-Package and Require-Bundle dependencies for resources
-      List<BundleWire> dependencies = wiring.getRequiredWires(null);
-      if (null != dependencies) {
-        for (BundleWire dependency : dependencies) {
-          BundleWiring provider = dependency.getProviderWiring();
-          if (null != provider && visited.add(provider.getRevision())) {
-            try {
-              URL result = provider.getBundle().getResource(resourceName);
-              if (null != result) {
-                return result;
-              }
-            } catch (Exception ignore) {
-              // continue search...
+    /** Delegates resource request to any direct dependencies (Import-Package, Require-Bundle etc.) */
+    public static URL getResource(final Bundle origin, final String resourceName) {
+        if (null == origin) {
+            // bundle reference has gone stale, e.g. the bundle was uninstalled
+            return null;
+        }
+        BundleWiring wiring = (BundleWiring) origin.adapt(BundleWiring.class);
+        if (null != wiring) {
+            // track which bundles we've visited to avoid dependency cycles
+            Set<BundleRevision> visited = new HashSet<>();
+            visited.add(wiring.getRevision());
+            // check all Import-Package and Require-Bundle dependencies for resources
+            List<BundleWire> dependencies = wiring.getRequiredWires(null);
+            if (null != dependencies) {
+                for (BundleWire dependency : dependencies) {
+                    BundleWiring provider = dependency.getProviderWiring();
+                    if (null != provider && visited.add(provider.getRevision())) {
+                        try {
+                            URL result = provider.getBundle().getResource(resourceName);
+                            if (null != result) {
+                                return result;
+                            }
+                        } catch (Exception ignore) {
+                            // continue search...
+                        }
+                    }
+                }
             }
-          }
         }
-      }
+        return null;
     }
-    return null;
-  }
 
-  /** Delegates class-load request to those direct dependencies that provide a similar package. */
-  public static Class<?> loadClass(final Bundle origin, final String className) {
-    if (null == origin) {
-      // bundle reference has gone stale, e.g. the bundle was uninstalled
-      return null;
-    }
-    BundleWiring wiring = (BundleWiring) origin.adapt(BundleWiring.class);
-    if (null != wiring) {
-      // track which bundles we've visited to avoid dependency cycles
-      Set<BundleRevision> visited = new HashSet<>();
-      visited.add(wiring.getRevision());
-      // check Import-Package dependencies that share a package prefix with the class
-      List<BundleWire> dependencies = wiring.getRequiredWires(PACKAGE_NAMESPACE);
-      if (null != dependencies) {
-        for (BundleWire dependency : dependencies) {
-          Object pkg = dependency.getCapability().getAttributes().get(PACKAGE_NAMESPACE);
-          if (pkg instanceof String && isRelatedPackage((String) pkg, className)) {
-            BundleWiring provider = dependency.getProviderWiring();
-            if (null != provider && visited.add(provider.getRevision())) {
-              try {
-                return provider.getBundle().loadClass(className);
-              } catch (Exception ignore) {
-                // continue search...
-              }
+    /** Delegates class-load request to those direct dependencies that provide a similar package. */
+    public static Class<?> loadClass(final Bundle origin, final String className) {
+        if (null == origin) {
+            // bundle reference has gone stale, e.g. the bundle was uninstalled
+            return null;
+        }
+        BundleWiring wiring = (BundleWiring) origin.adapt(BundleWiring.class);
+        if (null != wiring) {
+            // track which bundles we've visited to avoid dependency cycles
+            Set<BundleRevision> visited = new HashSet<>();
+            visited.add(wiring.getRevision());
+            // check Import-Package dependencies that share a package prefix with the class
+            List<BundleWire> dependencies = wiring.getRequiredWires(PACKAGE_NAMESPACE);
+            if (null != dependencies) {
+                for (BundleWire dependency : dependencies) {
+                    Object pkg = dependency.getCapability().getAttributes().get(PACKAGE_NAMESPACE);
+                    if (pkg instanceof String && isRelatedPackage((String) pkg, className)) {
+                        BundleWiring provider = dependency.getProviderWiring();
+                        if (null != provider && visited.add(provider.getRevision())) {
+                            try {
+                                return provider.getBundle().loadClass(className);
+                            } catch (Exception ignore) {
+                                // continue search...
+                            }
+                        }
+                    }
+                }
             }
-          }
         }
-      }
+        return null;
     }
-    return null;
-  }
 
-  private static boolean isRelatedPackage(String providedPackage, String className) {
-    int segmentsMatched = 0;
-    for (int i = 0; i < providedPackage.length(); i++) {
-      char c = providedPackage.charAt(i);
-      if (i >= className.length() || c != className.charAt(i)) {
-        return false; // no common package prefix
-      }
-      if (c == '.' && ++segmentsMatched >= 3) {
-        break; // three package segments matched, assume related
-      }
+    private static boolean isRelatedPackage(String providedPackage, String className) {
+        int segmentsMatched = 0;
+        for (int i = 0; i < providedPackage.length(); i++) {
+            char c = providedPackage.charAt(i);
+            if (i >= className.length() || c != className.charAt(i)) {
+                return false; // no common package prefix
+            }
+            if (c == '.' && ++segmentsMatched >= 3) {
+                break; // three package segments matched, assume related
+            }
+        }
+        return true;
     }
-    return true;
-  }
 }
diff --git a/dd-java-agent/instrumentation/owasp-esapi-2.1/src/main/java/datadog/trace/instrumentation/owasp/esapi/EncoderCallSite.java b/dd-java-agent/instrumentation/owasp-esapi-2.1/src/main/java/datadog/trace/instrumentation/owasp/esapi/EncoderCallSite.java
index 06a6bbd59ae..e5ea5cb37a2 100644
--- a/dd-java-agent/instrumentation/owasp-esapi-2.1/src/main/java/datadog/trace/instrumentation/owasp/esapi/EncoderCallSite.java
+++ b/dd-java-agent/instrumentation/owasp-esapi-2.1/src/main/java/datadog/trace/instrumentation/owasp/esapi/EncoderCallSite.java
@@ -14,125 +14,122 @@
 @CallSite(spi = IastCallSites.class)
 public class EncoderCallSite {
 
-  @CallSite.After("java.lang.String org.owasp.esapi.Encoder.encodeForHTML(java.lang.String)")
-  public static String afterEncodeForHTML(
-      @CallSite.This final Encoder encoder,
-      @CallSite.Argument(0) @Nonnull final String input,
-      @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterEncodeForHTML threw", e);
-      }
+    @CallSite.After("java.lang.String org.owasp.esapi.Encoder.encodeForHTML(java.lang.String)")
+    public static String afterEncodeForHTML(
+            @CallSite.This final Encoder encoder,
+            @CallSite.Argument(0) @Nonnull final String input,
+            @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterEncodeForHTML threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String org.owasp.esapi.Encoder.canonicalize(java.lang.String)")
-  public static String afterCanonicalize1(
-      @CallSite.This final Encoder encoder,
-      @CallSite.Argument(0) @Nonnull final String input,
-      @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterCanonicalize1 threw", e);
-      }
+    @CallSite.After("java.lang.String org.owasp.esapi.Encoder.canonicalize(java.lang.String)")
+    public static String afterCanonicalize1(
+            @CallSite.This final Encoder encoder,
+            @CallSite.Argument(0) @Nonnull final String input,
+            @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterCanonicalize1 threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After(
-      "java.lang.String org.owasp.esapi.Encoder.canonicalize(java.lang.String, boolean)")
-  public static String afterCanonicalize2(
-      @CallSite.This final Encoder encoder,
-      @CallSite.Argument(0) @Nonnull final String input,
-      @CallSite.Argument(1) final boolean strict,
-      @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterCanonicalize2 threw", e);
-      }
+    @CallSite.After("java.lang.String org.owasp.esapi.Encoder.canonicalize(java.lang.String, boolean)")
+    public static String afterCanonicalize2(
+            @CallSite.This final Encoder encoder,
+            @CallSite.Argument(0) @Nonnull final String input,
+            @CallSite.Argument(1) final boolean strict,
+            @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterCanonicalize2 threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After(
-      "java.lang.String org.owasp.esapi.Encoder.canonicalize(java.lang.String, boolean, boolean)")
-  public static String afterCanonicalize3(
-      @CallSite.This final Encoder encoder,
-      @CallSite.Argument(0) @Nonnull final String input,
-      @CallSite.Argument(1) final boolean strict,
-      @CallSite.Argument(2) final boolean restrictMixed,
-      @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterCanonicalize3 threw", e);
-      }
+    @CallSite.After("java.lang.String org.owasp.esapi.Encoder.canonicalize(java.lang.String, boolean, boolean)")
+    public static String afterCanonicalize3(
+            @CallSite.This final Encoder encoder,
+            @CallSite.Argument(0) @Nonnull final String input,
+            @CallSite.Argument(1) final boolean strict,
+            @CallSite.Argument(2) final boolean restrictMixed,
+            @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterCanonicalize3 threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("java.lang.String org.owasp.esapi.Encoder.encodeForLDAP(java.lang.String)")
-  public static String afterEncodeForLDAP(
-      @CallSite.This final Encoder encoder,
-      @CallSite.Argument(0) @Nonnull final String input,
-      @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input, false, VulnerabilityMarks.LDAP_INJECTION_MARK);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterEncodeForLDAP threw", e);
-      }
+    @CallSite.After("java.lang.String org.owasp.esapi.Encoder.encodeForLDAP(java.lang.String)")
+    public static String afterEncodeForLDAP(
+            @CallSite.This final Encoder encoder,
+            @CallSite.Argument(0) @Nonnull final String input,
+            @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input, false, VulnerabilityMarks.LDAP_INJECTION_MARK);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterEncodeForLDAP threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After(
-      "java.lang.String org.owasp.esapi.Encoder.encodeForOS(org.owasp.esapi.codecs.Codec, java.lang.String)")
-  public static String afterEncodeForOS(
-      @CallSite.This final Encoder encoder,
-      @CallSite.Argument(0) @Nonnull final Codec codec,
-      @CallSite.Argument(1) @Nonnull final String input,
-      @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(
-            result, input, false, VulnerabilityMarks.COMMAND_INJECTION_MARK);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterEncodeForOS threw", e);
-      }
+    @CallSite.After(
+            "java.lang.String org.owasp.esapi.Encoder.encodeForOS(org.owasp.esapi.codecs.Codec, java.lang.String)")
+    public static String afterEncodeForOS(
+            @CallSite.This final Encoder encoder,
+            @CallSite.Argument(0) @Nonnull final Codec codec,
+            @CallSite.Argument(1) @Nonnull final String input,
+            @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input, false, VulnerabilityMarks.COMMAND_INJECTION_MARK);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterEncodeForOS threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After(
-      "java.lang.String org.owasp.esapi.Encoder.encodeForSQL(org.owasp.esapi.codecs.Codec, java.lang.String)")
-  public static String afterEncodeForSQL(
-      @CallSite.This final Encoder encoder,
-      @CallSite.Argument(0) @Nonnull final Codec codec,
-      @CallSite.Argument(1) @Nonnull final String input,
-      @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input, false, VulnerabilityMarks.SQL_INJECTION_MARK);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterEncodeForSQL threw", e);
-      }
+    @CallSite.After(
+            "java.lang.String org.owasp.esapi.Encoder.encodeForSQL(org.owasp.esapi.codecs.Codec, java.lang.String)")
+    public static String afterEncodeForSQL(
+            @CallSite.This final Encoder encoder,
+            @CallSite.Argument(0) @Nonnull final Codec codec,
+            @CallSite.Argument(1) @Nonnull final String input,
+            @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input, false, VulnerabilityMarks.SQL_INJECTION_MARK);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterEncodeForSQL threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/owasp-esapi-2.1/src/test/java/foo/bar/TestEncoderSuite.java b/dd-java-agent/instrumentation/owasp-esapi-2.1/src/test/java/foo/bar/TestEncoderSuite.java
index 21f91858fc0..a600b9bd134 100644
--- a/dd-java-agent/instrumentation/owasp-esapi-2.1/src/test/java/foo/bar/TestEncoderSuite.java
+++ b/dd-java-agent/instrumentation/owasp-esapi-2.1/src/test/java/foo/bar/TestEncoderSuite.java
@@ -5,37 +5,37 @@
 
 public class TestEncoderSuite {
 
-  private Encoder encoder;
+    private Encoder encoder;
 
-  TestEncoderSuite(Encoder encoder) {
-    this.encoder = encoder;
-  }
+    TestEncoderSuite(Encoder encoder) {
+        this.encoder = encoder;
+    }
 
-  public String encodeForHTML(String input) {
-    return encoder.encodeForHTML(input);
-  }
+    public String encodeForHTML(String input) {
+        return encoder.encodeForHTML(input);
+    }
 
-  public String canonicalize(String input) {
-    return encoder.canonicalize(input);
-  }
+    public String canonicalize(String input) {
+        return encoder.canonicalize(input);
+    }
 
-  public String canonicalize(String input, boolean strict) {
-    return encoder.canonicalize(input, strict);
-  }
+    public String canonicalize(String input, boolean strict) {
+        return encoder.canonicalize(input, strict);
+    }
 
-  public String canonicalize(String input, boolean strict, boolean restrictMixed) {
-    return encoder.canonicalize(input, strict, restrictMixed);
-  }
+    public String canonicalize(String input, boolean strict, boolean restrictMixed) {
+        return encoder.canonicalize(input, strict, restrictMixed);
+    }
 
-  public String encodeForLDAP(String input) {
-    return encoder.encodeForLDAP(input);
-  }
+    public String encodeForLDAP(String input) {
+        return encoder.encodeForLDAP(input);
+    }
 
-  public String encodeForOS(Codec codec, String input) {
-    return encoder.encodeForOS(codec, input);
-  }
+    public String encodeForOS(Codec codec, String input) {
+        return encoder.encodeForOS(codec, input);
+    }
 
-  public String encodeForSQL(Codec codec, String input) {
-    return encoder.encodeForSQL(codec, input);
-  }
+    public String encodeForSQL(Codec codec, String input) {
+        return encoder.encodeForSQL(codec, input);
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoActorCellInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoActorCellInstrumentation.java
index 2778831de22..27dd4d26617 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoActorCellInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoActorCellInstrumentation.java
@@ -22,75 +22,70 @@
 
 @AutoService(InstrumenterModule.class)
 public class PekkoActorCellInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public PekkoActorCellInstrumentation() {
-    super("pekko_actor_receive", "pekko_actor", "pekko_concurrent", "java_concurrent");
-  }
+    public PekkoActorCellInstrumentation() {
+        super("pekko_actor_receive", "pekko_actor", "pekko_concurrent", "java_concurrent");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.actor.ActorCell";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.actor.ActorCell";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("org.apache.pekko.dispatch.Envelope", State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.apache.pekko.dispatch.Envelope", State.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("invoke")), getClass().getName() + "$InvokeAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isMethod().and(named("invoke")), getClass().getName() + "$InvokeAdvice");
+    }
 
-  /**
-   * This instrumentation is defensive and closes all scopes on the scope stack that were not there
-   * when we started processing this actor message. The reason for that is twofold.
-   *
-   * <p>1) An actor is self contained, and driven by a thread that could serve many other purposes,
-   * and a scope should not leak out after a message has been processed.
-   *
-   * <p>2) We rely on this cleanup mechanism to be able to intentionally leak the scope in the
-   * {@code PekkoHttpServerInstrumentation} so that it propagates to the user provided request
-   * handling code that will execute on the same thread in the same actor.
-   */
-  public static class InvokeAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static Context enter(
-        @Advice.Argument(value = 0) Envelope envelope,
-        @Advice.Local("taskScope") ContextScope taskScope) {
+    /**
+     * This instrumentation is defensive and closes all scopes on the scope stack that were not there
+     * when we started processing this actor message. The reason for that is twofold.
+     *
+     * <p>1) An actor is self contained, and driven by a thread that could serve many other purposes,
+     * and a scope should not leak out after a message has been processed.
+     *
+     * <p>2) We rely on this cleanup mechanism to be able to intentionally leak the scope in the
+     * {@code PekkoHttpServerInstrumentation} so that it propagates to the user provided request
+     * handling code that will execute on the same thread in the same actor.
+     */
+    public static class InvokeAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static Context enter(
+                @Advice.Argument(value = 0) Envelope envelope, @Advice.Local("taskScope") ContextScope taskScope) {
 
-      // do this before checkpointing, as the envelope's task scope may already be active
-      taskScope =
-          AdviceUtils.startTaskScope(
-              InstrumentationContext.get(Envelope.class, State.class), envelope);
+            // do this before checkpointing, as the envelope's task scope may already be active
+            taskScope = AdviceUtils.startTaskScope(InstrumentationContext.get(Envelope.class, State.class), envelope);
 
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        // remember the currently active scope so we can roll back to this point
-        checkpointActiveForRollback();
-        return null;
-      } else {
-        return currentContext().swap();
-      }
-    }
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                // remember the currently active scope so we can roll back to this point
+                checkpointActiveForRollback();
+                return null;
+            } else {
+                return currentContext().swap();
+            }
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Local("taskScope") ContextScope taskScope,
-        @Advice.Enter Context checkpointContext) {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Local("taskScope") ContextScope taskScope, @Advice.Enter Context checkpointContext) {
 
-      if (checkpointContext == null) {
-        // Clean up any leaking scopes from pekko-streams/pekko-http etc.
-        rollbackActiveToCheckpoint();
-      } else {
-        checkpointContext.swap();
-      }
+            if (checkpointContext == null) {
+                // Clean up any leaking scopes from pekko-streams/pekko-http etc.
+                rollbackActiveToCheckpoint();
+            } else {
+                checkpointContext.swap();
+            }
 
-      // close envelope's task scope if we previously started it
-      if (taskScope != null) {
-        taskScope.close();
-      }
+            // close envelope's task scope if we previously started it
+            if (taskScope != null) {
+                taskScope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoEnvelopeInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoEnvelopeInstrumentation.java
index 7ef7a82ffad..63a5b232406 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoEnvelopeInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoEnvelopeInstrumentation.java
@@ -15,31 +15,31 @@
 
 @AutoService(InstrumenterModule.class)
 public class PekkoEnvelopeInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public PekkoEnvelopeInstrumentation() {
-    super("pekko_actor_send", "pekko_actor", "pekko_concurrent", "java_concurrent");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.dispatch.Envelope";
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("org.apache.pekko.dispatch.Envelope", State.class.getName());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$ConstructAdvice");
-  }
-
-  public static class ConstructAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterInit(@Advice.This Envelope zis) {
-      capture(InstrumentationContext.get(Envelope.class, State.class), zis);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public PekkoEnvelopeInstrumentation() {
+        super("pekko_actor_send", "pekko_actor", "pekko_concurrent", "java_concurrent");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.dispatch.Envelope";
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.apache.pekko.dispatch.Envelope", State.class.getName());
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$ConstructAdvice");
+    }
+
+    public static class ConstructAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterInit(@Advice.This Envelope zis) {
+            capture(InstrumentationContext.get(Envelope.class, State.class), zis);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoForkJoinExecutorTaskInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoForkJoinExecutorTaskInstrumentation.java
index 522fda36949..92052944c99 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoForkJoinExecutorTaskInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoForkJoinExecutorTaskInstrumentation.java
@@ -24,47 +24,46 @@
  * org.apache.pekko.dispatch.ForkJoinTask, because of its error handling.
  */
 @AutoService(InstrumenterModule.class)
-public final class PekkoForkJoinExecutorTaskInstrumentation
-    extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public PekkoForkJoinExecutorTaskInstrumentation() {
-    super("java_concurrent", "pekko_concurrent");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(Runnable.class.getName(), State.class.getName());
-  }
+public final class PekkoForkJoinExecutorTaskInstrumentation extends InstrumenterModule.ContextTracking
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public PekkoForkJoinExecutorTaskInstrumentation() {
+        super("java_concurrent", "pekko_concurrent");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.dispatch.ForkJoinExecutorConfigurator$PekkoForkJoinTask";
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(Runnable.class.getName(), State.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(0, named(Runnable.class.getName()))),
-        getClass().getName() + "$Construct");
-    transformer.applyAdvice(isMethod().and(named("run")), getClass().getName() + "$Run");
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.dispatch.ForkJoinExecutorConfigurator$PekkoForkJoinTask";
+    }
 
-  public static final class Construct {
-    @Advice.OnMethodExit
-    public static void construct(@Advice.Argument(0) Runnable wrapped) {
-      capture(InstrumentationContext.get(Runnable.class, State.class), wrapped);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(0, named(Runnable.class.getName()))),
+                getClass().getName() + "$Construct");
+        transformer.applyAdvice(isMethod().and(named("run")), getClass().getName() + "$Run");
     }
-  }
 
-  public static final class Run {
-    @Advice.OnMethodEnter
-    public static ContextScope before(@Advice.Argument(0) Runnable wrapped) {
-      return startTaskScope(InstrumentationContext.get(Runnable.class, State.class), wrapped);
+    public static final class Construct {
+        @Advice.OnMethodExit
+        public static void construct(@Advice.Argument(0) Runnable wrapped) {
+            capture(InstrumentationContext.get(Runnable.class, State.class), wrapped);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      endTaskScope(scope);
+    public static final class Run {
+        @Advice.OnMethodEnter
+        public static ContextScope before(@Advice.Argument(0) Runnable wrapped) {
+            return startTaskScope(InstrumentationContext.get(Runnable.class, State.class), wrapped);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoMailboxInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoMailboxInstrumentation.java
index ab33ee024c7..645c9a66dbc 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoMailboxInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoMailboxInstrumentation.java
@@ -15,54 +15,53 @@
 
 @AutoService(InstrumenterModule.class)
 public class PekkoMailboxInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public PekkoMailboxInstrumentation() {
-    super("pekko_actor_mailbox", "pekko_actor", "pekko_concurrent", "java_concurrent");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.dispatch.Mailbox";
-  }
+    public PekkoMailboxInstrumentation() {
+        super("pekko_actor_mailbox", "pekko_actor", "pekko_concurrent", "java_concurrent");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("run")), getClass().getName() + "$SuppressMailboxRunAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.dispatch.Mailbox";
+    }
 
-  /**
-   * This instrumentation is defensive and closes all scopes on the scope stack that were not there
-   * when we started processing this actor mailbox. The reason for that is twofold.
-   *
-   * <p>1) An actor is self contained, and driven by a thread that could serve many other purposes,
-   * and a scope should not leak out after a mailbox has been processed.
-   *
-   * <p>2) We rely on this cleanup mechanism to be able to intentionally leak the scope in the
-   * {@code PekkoHttpServerInstrumentation} so that it propagates to the user provided request
-   * handling code that will execute on the same thread in the same actor.
-   */
-  public static final class SuppressMailboxRunAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static Context enter() {
-      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-        // remember the currently active scope so we can roll back to this point
-        checkpointActiveForRollback();
-        return null;
-      } else {
-        return currentContext().swap();
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isMethod().and(named("run")), getClass().getName() + "$SuppressMailboxRunAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Enter final Context checkpointContext) {
-      if (checkpointContext == null) {
-        // Clean up any leaking scopes from pekko-streams/pekko-http etc.
-        rollbackActiveToCheckpoint();
-      } else {
-        checkpointContext.swap();
-      }
+    /**
+     * This instrumentation is defensive and closes all scopes on the scope stack that were not there
+     * when we started processing this actor mailbox. The reason for that is twofold.
+     *
+     * <p>1) An actor is self contained, and driven by a thread that could serve many other purposes,
+     * and a scope should not leak out after a mailbox has been processed.
+     *
+     * <p>2) We rely on this cleanup mechanism to be able to intentionally leak the scope in the
+     * {@code PekkoHttpServerInstrumentation} so that it propagates to the user provided request
+     * handling code that will execute on the same thread in the same actor.
+     */
+    public static final class SuppressMailboxRunAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static Context enter() {
+            if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                // remember the currently active scope so we can roll back to this point
+                checkpointActiveForRollback();
+                return null;
+            } else {
+                return currentContext().swap();
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Enter final Context checkpointContext) {
+            if (checkpointContext == null) {
+                // Clean up any leaking scopes from pekko-streams/pekko-http etc.
+                rollbackActiveToCheckpoint();
+            } else {
+                checkpointContext.swap();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoRoutedActorCellInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoRoutedActorCellInstrumentation.java
index a89eaea3892..8836dfa3e24 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoRoutedActorCellInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoRoutedActorCellInstrumentation.java
@@ -19,56 +19,52 @@
 
 @AutoService(InstrumenterModule.class)
 public class PekkoRoutedActorCellInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public PekkoRoutedActorCellInstrumentation() {
-    super("pekko_actor_send", "pekko_actor", "pekko_concurrent", "java_concurrent");
-  }
+    public PekkoRoutedActorCellInstrumentation() {
+        super("pekko_actor_send", "pekko_actor", "pekko_concurrent", "java_concurrent");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.routing.RoutedActorCell";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.routing.RoutedActorCell";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("org.apache.pekko.dispatch.Envelope", State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.apache.pekko.dispatch.Envelope", State.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(
-                named("sendMessage")
-                    .and(takesArgument(0, named("org.apache.pekko.dispatch.Envelope")))),
-        getClass().getName() + "$SendMessageAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("sendMessage").and(takesArgument(0, named("org.apache.pekko.dispatch.Envelope")))),
+                getClass().getName() + "$SendMessageAdvice");
+    }
 
-  /**
-   * RoutedActorCell will sometimes deconstruct the Envelope in the {@code sendMessage} method, so
-   * we might need to activate the {@code Scope} to ensure that it propagates properly.
-   */
-  public static class SendMessageAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.This RoutedActorCell zis, @Advice.Argument(value = 0) Envelope envelope) {
-      // If this isn't a management message, it will be deconstructed before being routed through
-      // the routing logic, so activate the Scope
-      if (!zis.routerConfig().isManagementMessage(envelope.message())) {
-        return AdviceUtils.startTaskScope(
-            InstrumentationContext.get(Envelope.class, State.class), envelope);
-      }
+    /**
+     * RoutedActorCell will sometimes deconstruct the Envelope in the {@code sendMessage} method, so
+     * we might need to activate the {@code Scope} to ensure that it propagates properly.
+     */
+    public static class SendMessageAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(
+                @Advice.This RoutedActorCell zis, @Advice.Argument(value = 0) Envelope envelope) {
+            // If this isn't a management message, it will be deconstructed before being routed through
+            // the routing logic, so activate the Scope
+            if (!zis.routerConfig().isManagementMessage(envelope.message())) {
+                return AdviceUtils.startTaskScope(InstrumentationContext.get(Envelope.class, State.class), envelope);
+            }
 
-      return null;
-    }
+            return null;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Enter ContextScope scope) {
-      if (null != scope) {
-        scope.close();
-        // then we have invoked an Envelope and need to mark the work complete
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Enter ContextScope scope) {
+            if (null != scope) {
+                scope.close();
+                // then we have invoked an Envelope and need to mark the work complete
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoSchedulerInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoSchedulerInstrumentation.java
index 6a720b52b76..f96e5737de7 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoSchedulerInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoSchedulerInstrumentation.java
@@ -19,42 +19,42 @@
 /** Active span capturing and continuation for Pekko's async scheduled tasks. */
 @AutoService(InstrumenterModule.class)
 public class PekkoSchedulerInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public PekkoSchedulerInstrumentation() {
-    super("java_concurrent", "pekko_concurrent", "pekko_scheduler");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isPekkoSchedulerEnabled();
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(Runnable.class.getName(), State.class.getName());
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.actor.LightArrayRevolverScheduler";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(nameEndsWith("schedule"))
-            .and(takesArgument(0, named("scala.concurrent.ExecutionContext")))
-            .and(takesArgument(1, Runnable.class))
-            .and(takesArgument(2, named("scala.concurrent.duration.FiniteDuration"))),
-        getClass().getName() + "$Schedule");
-  }
-
-  public static final class Schedule {
-    @Advice.OnMethodEnter
-    public static void schedule(@Advice.Argument(1) Runnable runnable) {
-      capture(InstrumentationContext.get(Runnable.class, State.class), runnable);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public PekkoSchedulerInstrumentation() {
+        super("java_concurrent", "pekko_concurrent", "pekko_scheduler");
+    }
+
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isPekkoSchedulerEnabled();
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(Runnable.class.getName(), State.class.getName());
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.actor.LightArrayRevolverScheduler";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(nameEndsWith("schedule"))
+                        .and(takesArgument(0, named("scala.concurrent.ExecutionContext")))
+                        .and(takesArgument(1, Runnable.class))
+                        .and(takesArgument(2, named("scala.concurrent.duration.FiniteDuration"))),
+                getClass().getName() + "$Schedule");
+    }
+
+    public static final class Schedule {
+        @Advice.OnMethodEnter
+        public static void schedule(@Advice.Argument(1) Runnable runnable) {
+            capture(InstrumentationContext.get(Runnable.class, State.class), runnable);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/test/groovy/PekkoAsyncChild.java b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/test/groovy/PekkoAsyncChild.java
index b9d53fe01ba..59c0a95e1d2 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/test/groovy/PekkoAsyncChild.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/test/groovy/PekkoAsyncChild.java
@@ -4,56 +4,56 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class PekkoAsyncChild extends ForkJoinTask implements Runnable, Callable {
-  private final AtomicBoolean blockThread;
-  private final boolean doTraceableWork;
-
-  public PekkoAsyncChild() {
-    this(true, false);
-  }
-
-  @Override
-  public Object getRawResult() {
-    return null;
-  }
-
-  @Override
-  protected void setRawResult(final Object value) {}
-
-  @Override
-  protected boolean exec() {
-    runImpl();
-    return true;
-  }
-
-  public PekkoAsyncChild(final boolean doTraceableWork, final boolean blockThread) {
-    this.doTraceableWork = doTraceableWork;
-    this.blockThread = new AtomicBoolean(blockThread);
-  }
-
-  public void unblock() {
-    blockThread.set(false);
-  }
-
-  @Override
-  public void run() {
-    runImpl();
-  }
-
-  @Override
-  public Object call() throws Exception {
-    runImpl();
-    return null;
-  }
-
-  private void runImpl() {
-    while (blockThread.get()) {
-      // busy-wait to block thread
-    }
-    if (doTraceableWork) {
-      asyncChild();
-    }
-  }
-
-  @Trace(operationName = "asyncChild")
-  private void asyncChild() {}
+    private final AtomicBoolean blockThread;
+    private final boolean doTraceableWork;
+
+    public PekkoAsyncChild() {
+        this(true, false);
+    }
+
+    @Override
+    public Object getRawResult() {
+        return null;
+    }
+
+    @Override
+    protected void setRawResult(final Object value) {}
+
+    @Override
+    protected boolean exec() {
+        runImpl();
+        return true;
+    }
+
+    public PekkoAsyncChild(final boolean doTraceableWork, final boolean blockThread) {
+        this.doTraceableWork = doTraceableWork;
+        this.blockThread = new AtomicBoolean(blockThread);
+    }
+
+    public void unblock() {
+        blockThread.set(false);
+    }
+
+    @Override
+    public void run() {
+        runImpl();
+    }
+
+    @Override
+    public Object call() throws Exception {
+        runImpl();
+        return null;
+    }
+
+    private void runImpl() {
+        while (blockThread.get()) {
+            // busy-wait to block thread
+        }
+        if (doTraceableWork) {
+            asyncChild();
+        }
+    }
+
+    @Trace(operationName = "asyncChild")
+    private void asyncChild() {}
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/java/datadog/trace/instrumentation/pekkohttp/SwappedContextScopeTest.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/java/datadog/trace/instrumentation/pekkohttp/SwappedContextScopeTest.java
index 21fee39d54f..e3b77304319 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/java/datadog/trace/instrumentation/pekkohttp/SwappedContextScopeTest.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/java/datadog/trace/instrumentation/pekkohttp/SwappedContextScopeTest.java
@@ -8,36 +8,36 @@
 import org.junit.jupiter.api.Test;
 
 class SwappedContextScopeTest {
-  private static final ContextKey<String> KEY = ContextKey.named("pekko-http-swap-test");
+    private static final ContextKey<String> KEY = ContextKey.named("pekko-http-swap-test");
 
-  @Test
-  void restoresPreviousContext() {
-    Context previous = Context.root().with(KEY, "previous");
-    Context request = Context.root().with(KEY, "request");
+    @Test
+    void restoresPreviousContext() {
+        Context previous = Context.root().with(KEY, "previous");
+        Context request = Context.root().with(KEY, "request");
 
-    try (ContextScope previousScope = previous.attach()) {
-      try (ContextScope requestScope = new DatadogWrapperHelper.SwappedContextScope(request)) {
-        assertSame(request, Context.current());
-      }
-      assertSame(previous, Context.current());
+        try (ContextScope previousScope = previous.attach()) {
+            try (ContextScope requestScope = new DatadogWrapperHelper.SwappedContextScope(request)) {
+                assertSame(request, Context.current());
+            }
+            assertSame(previous, Context.current());
+        }
     }
-  }
 
-  @Test
-  void waitsUntilRequestContextIsCurrent() {
-    Context previous = Context.root().with(KEY, "previous");
-    Context request = Context.root().with(KEY, "request");
-    Context other = Context.root().with(KEY, "other");
+    @Test
+    void waitsUntilRequestContextIsCurrent() {
+        Context previous = Context.root().with(KEY, "previous");
+        Context request = Context.root().with(KEY, "request");
+        Context other = Context.root().with(KEY, "other");
 
-    try (ContextScope previousScope = previous.attach()) {
-      ContextScope requestScope = new DatadogWrapperHelper.SwappedContextScope(request);
-      try (ContextScope otherScope = other.attach()) {
-        requestScope.close();
-        assertSame(other, Context.current());
-      }
-      assertSame(request, Context.current());
-      requestScope.close();
-      assertSame(previous, Context.current());
+        try (ContextScope previousScope = previous.attach()) {
+            ContextScope requestScope = new DatadogWrapperHelper.SwappedContextScope(request);
+            try (ContextScope otherScope = other.attach()) {
+                requestScope.close();
+                assertSame(other, Context.current());
+            }
+            assertSame(request, Context.current());
+            requestScope.close();
+            assertSame(previous, Context.current());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogAsyncHandlerWrapper.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogAsyncHandlerWrapper.java
index 0578eda8aba..eff8bf3958d 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogAsyncHandlerWrapper.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogAsyncHandlerWrapper.java
@@ -11,48 +11,45 @@
 import scala.concurrent.Future;
 import scala.runtime.AbstractFunction1;
 
-public class DatadogAsyncHandlerWrapper
-    extends AbstractFunction1<HttpRequest, Future<HttpResponse>> {
-  private final Function1<HttpRequest, Future<HttpResponse>> userHandler;
-  private final ExecutionContext executionContext;
+public class DatadogAsyncHandlerWrapper extends AbstractFunction1<HttpRequest, Future<HttpResponse>> {
+    private final Function1<HttpRequest, Future<HttpResponse>> userHandler;
+    private final ExecutionContext executionContext;
 
-  public DatadogAsyncHandlerWrapper(
-      final Function1<HttpRequest, Future<HttpResponse>> userHandler,
-      final ExecutionContext executionContext) {
-    this.userHandler = userHandler;
-    this.executionContext = executionContext;
-  }
+    public DatadogAsyncHandlerWrapper(
+            final Function1<HttpRequest, Future<HttpResponse>> userHandler, final ExecutionContext executionContext) {
+        this.userHandler = userHandler;
+        this.executionContext = executionContext;
+    }
 
-  @Override
-  public Future<HttpResponse> apply(final HttpRequest request) {
-    final ContextScope scope = DatadogWrapperHelper.createSpan(request);
-    AgentSpan span = fromContext(scope.context());
-    Future<HttpResponse> futureResponse;
-    try {
-      futureResponse = userHandler.apply(request);
-    } catch (final Throwable t) {
-      scope.close();
-      DatadogWrapperHelper.finishSpan(scope.context(), t);
-      throw t;
+    @Override
+    public Future<HttpResponse> apply(final HttpRequest request) {
+        final ContextScope scope = DatadogWrapperHelper.createSpan(request);
+        AgentSpan span = fromContext(scope.context());
+        Future<HttpResponse> futureResponse;
+        try {
+            futureResponse = userHandler.apply(request);
+        } catch (final Throwable t) {
+            scope.close();
+            DatadogWrapperHelper.finishSpan(scope.context(), t);
+            throw t;
+        }
+        final Future<HttpResponse> wrapped = futureResponse.transform(
+                new AbstractFunction1<HttpResponse, HttpResponse>() {
+                    @Override
+                    public HttpResponse apply(final HttpResponse response) {
+                        DatadogWrapperHelper.finishSpan(scope.context(), response);
+                        return response;
+                    }
+                },
+                new AbstractFunction1<Throwable, Throwable>() {
+                    @Override
+                    public Throwable apply(final Throwable t) {
+                        DatadogWrapperHelper.finishSpan(scope.context(), t);
+                        return t;
+                    }
+                },
+                executionContext);
+        scope.close();
+        return wrapped;
     }
-    final Future<HttpResponse> wrapped =
-        futureResponse.transform(
-            new AbstractFunction1<HttpResponse, HttpResponse>() {
-              @Override
-              public HttpResponse apply(final HttpResponse response) {
-                DatadogWrapperHelper.finishSpan(scope.context(), response);
-                return response;
-              }
-            },
-            new AbstractFunction1<Throwable, Throwable>() {
-              @Override
-              public Throwable apply(final Throwable t) {
-                DatadogWrapperHelper.finishSpan(scope.context(), t);
-                return t;
-              }
-            },
-            executionContext);
-    scope.close();
-    return wrapped;
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogServerRequestResponseFlowWrapper.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogServerRequestResponseFlowWrapper.java
index 0de81b07a08..da88ccc84f6 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogServerRequestResponseFlowWrapper.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogServerRequestResponseFlowWrapper.java
@@ -20,155 +20,147 @@
 import org.apache.pekko.stream.stage.GraphStageLogic;
 
 public class DatadogServerRequestResponseFlowWrapper
-    extends GraphStage<BidiShape<HttpResponse, HttpResponse, HttpRequest, HttpRequest>> {
-  private final Inlet<HttpRequest> requestInlet = Inlet.create("Datadog.server.requestIn");
-  private final Outlet<HttpRequest> requestOutlet = Outlet.create("Datadog.server.requestOut");
-  private final Inlet<HttpResponse> responseInlet = Inlet.create("Datadog.server.responseIn");
-  private final Outlet<HttpResponse> responseOutlet = Outlet.create("Datadog.server.responseOut");
-  private final BidiShape<HttpResponse, HttpResponse, HttpRequest, HttpRequest> shape =
-      BidiShape.of(responseInlet, responseOutlet, requestInlet, requestOutlet);
-
-  private final int pipeliningLimit;
-
-  public DatadogServerRequestResponseFlowWrapper(final ServerSettings settings) {
-    this.pipeliningLimit = settings.getPipeliningLimit();
-  }
-
-  @Override
-  public BidiShape<HttpResponse, HttpResponse, HttpRequest, HttpRequest> shape() {
-    return shape;
-  }
-
-  @Override
-  public Attributes initialAttributes() {
-    return Attributes.name("DatadogServerRequestResponseFlowWrapper");
-  }
-
-  @Override
-  public GraphStageLogic createLogic(final Attributes inheritedAttributes) throws Exception {
-    return new GraphStageLogic(shape) {
-      {
-        // The is one instance of this logic per connection, and the request/response is
-        // guaranteed to be in order according to the docs at
-        // https://pekko.apache.org/docs/pekko-http/current/server-side/low-level-api.html#request-response-cycle
-        // and there can never be more outstanding requests than the pipeliningLimit
-        // that this connection was created with. This means that we can safely
-        // close the span at the front of the queue when we receive the response
-        // from the user code, since it will match up to the request for that span.
-        final Queue<ContextScope> scopes = new ArrayBlockingQueue<>(pipeliningLimit);
-
-        // This is where the request comes in from the server and TCP layer
-        setHandler(
-            requestInlet,
-            new AbstractInHandler() {
-              @Override
-              public void onPush() throws Exception {
-                final HttpRequest request = grab(requestInlet);
-                final ContextScope scope = DatadogWrapperHelper.createSpanForFlow(request);
-                scopes.add(scope);
-                push(requestOutlet, request);
-                // Legacy mode leaves the scope open so the surrounding actor can clean it up.
-                // Context-manager mode swaps the context and the actor restores it on exit.
-              }
-
-              @Override
-              public void onUpstreamFinish() throws Exception {
-                // We will not receive any more requests from the server and TCP layer so stop
-                // sending them
-                complete(requestOutlet);
-              }
-
-              @Override
-              public void onUpstreamFailure(final Throwable ex) throws Exception {
-                // We will not receive any more requests from the server and TCP layer so stop
-                // sending them
-                fail(requestOutlet, ex);
-              }
-            });
-
-        // This is where demand comes in from the user code
-        setHandler(
-            requestOutlet,
-            new AbstractOutHandler() {
-              @Override
-              public void onPull() throws Exception {
-                pull(requestInlet);
-              }
-
-              @Override
-              public void onDownstreamFinish() throws Exception {
-                // We can not send out any more requests to the user code so stop receiving them
-                cancel(requestInlet);
-              }
-            });
-
-        // This is where the response comes back from the user code
-        setHandler(
-            responseInlet,
-            new AbstractInHandler() {
-              @Override
-              public void onPush() throws Exception {
-                final HttpResponse response = grab(responseInlet);
-                final ContextScope scope = scopes.poll();
-                if (scope != null) {
-                  DatadogWrapperHelper.finishSpan(scope.context(), response);
-                  // Legacy mode may still own the scope when the response arrives.
-                  AgentSpan activeSpan = activeSpan();
-                  AgentSpan span = fromContext(scope.context());
-                  if (activeSpan == span) {
-                    scope.close();
-                  }
-                }
-                push(responseOutlet, response);
-              }
-
-              @Override
-              public void onUpstreamFinish() throws Exception {
-                // We will not receive any more responses from the user code, so clean up any
-                // remaining spans
-                ContextScope scope = scopes.poll();
-                while (scope != null) {
-                  fromContext(scope.context()).finish();
-                  scope = scopes.poll();
-                }
-                completeStage();
-              }
-
-              @Override
-              public void onUpstreamFailure(final Throwable ex) throws Exception {
-                ContextScope scope = scopes.poll();
-                if (scope != null) {
-                  // Mark the span as failed
-                  DatadogWrapperHelper.finishSpan(scope.context(), ex);
-                }
-                // We will not receive any more responses from the user code, so clean up any
-                // remaining spans
-                scope = scopes.poll();
-                while (scope != null) {
-                  fromContext(scope.context()).finish();
-                  scope = scopes.poll();
-                }
-                fail(responseOutlet, ex);
-              }
-            });
-
-        // This is where demand comes in from the server and TCP layer
-        setHandler(
-            responseOutlet,
-            new AbstractOutHandler() {
-              @Override
-              public void onPull() throws Exception {
-                pull(responseInlet);
-              }
-
-              @Override
-              public void onDownstreamFinish() throws Exception {
-                // We can not send out any more responses to the server and TCP layer so stop
-                // receiving them
-                cancel(responseInlet);
-              }
-            });
-      }
-    };
-  }
+        extends GraphStage<BidiShape<HttpResponse, HttpResponse, HttpRequest, HttpRequest>> {
+    private final Inlet<HttpRequest> requestInlet = Inlet.create("Datadog.server.requestIn");
+    private final Outlet<HttpRequest> requestOutlet = Outlet.create("Datadog.server.requestOut");
+    private final Inlet<HttpResponse> responseInlet = Inlet.create("Datadog.server.responseIn");
+    private final Outlet<HttpResponse> responseOutlet = Outlet.create("Datadog.server.responseOut");
+    private final BidiShape<HttpResponse, HttpResponse, HttpRequest, HttpRequest> shape =
+            BidiShape.of(responseInlet, responseOutlet, requestInlet, requestOutlet);
+
+    private final int pipeliningLimit;
+
+    public DatadogServerRequestResponseFlowWrapper(final ServerSettings settings) {
+        this.pipeliningLimit = settings.getPipeliningLimit();
+    }
+
+    @Override
+    public BidiShape<HttpResponse, HttpResponse, HttpRequest, HttpRequest> shape() {
+        return shape;
+    }
+
+    @Override
+    public Attributes initialAttributes() {
+        return Attributes.name("DatadogServerRequestResponseFlowWrapper");
+    }
+
+    @Override
+    public GraphStageLogic createLogic(final Attributes inheritedAttributes) throws Exception {
+        return new GraphStageLogic(shape) {
+            {
+                // The is one instance of this logic per connection, and the request/response is
+                // guaranteed to be in order according to the docs at
+                // https://pekko.apache.org/docs/pekko-http/current/server-side/low-level-api.html#request-response-cycle
+                // and there can never be more outstanding requests than the pipeliningLimit
+                // that this connection was created with. This means that we can safely
+                // close the span at the front of the queue when we receive the response
+                // from the user code, since it will match up to the request for that span.
+                final Queue<ContextScope> scopes = new ArrayBlockingQueue<>(pipeliningLimit);
+
+                // This is where the request comes in from the server and TCP layer
+                setHandler(requestInlet, new AbstractInHandler() {
+                    @Override
+                    public void onPush() throws Exception {
+                        final HttpRequest request = grab(requestInlet);
+                        final ContextScope scope = DatadogWrapperHelper.createSpanForFlow(request);
+                        scopes.add(scope);
+                        push(requestOutlet, request);
+                        // Legacy mode leaves the scope open so the surrounding actor can clean it up.
+                        // Context-manager mode swaps the context and the actor restores it on exit.
+                    }
+
+                    @Override
+                    public void onUpstreamFinish() throws Exception {
+                        // We will not receive any more requests from the server and TCP layer so stop
+                        // sending them
+                        complete(requestOutlet);
+                    }
+
+                    @Override
+                    public void onUpstreamFailure(final Throwable ex) throws Exception {
+                        // We will not receive any more requests from the server and TCP layer so stop
+                        // sending them
+                        fail(requestOutlet, ex);
+                    }
+                });
+
+                // This is where demand comes in from the user code
+                setHandler(requestOutlet, new AbstractOutHandler() {
+                    @Override
+                    public void onPull() throws Exception {
+                        pull(requestInlet);
+                    }
+
+                    @Override
+                    public void onDownstreamFinish() throws Exception {
+                        // We can not send out any more requests to the user code so stop receiving them
+                        cancel(requestInlet);
+                    }
+                });
+
+                // This is where the response comes back from the user code
+                setHandler(responseInlet, new AbstractInHandler() {
+                    @Override
+                    public void onPush() throws Exception {
+                        final HttpResponse response = grab(responseInlet);
+                        final ContextScope scope = scopes.poll();
+                        if (scope != null) {
+                            DatadogWrapperHelper.finishSpan(scope.context(), response);
+                            // Legacy mode may still own the scope when the response arrives.
+                            AgentSpan activeSpan = activeSpan();
+                            AgentSpan span = fromContext(scope.context());
+                            if (activeSpan == span) {
+                                scope.close();
+                            }
+                        }
+                        push(responseOutlet, response);
+                    }
+
+                    @Override
+                    public void onUpstreamFinish() throws Exception {
+                        // We will not receive any more responses from the user code, so clean up any
+                        // remaining spans
+                        ContextScope scope = scopes.poll();
+                        while (scope != null) {
+                            fromContext(scope.context()).finish();
+                            scope = scopes.poll();
+                        }
+                        completeStage();
+                    }
+
+                    @Override
+                    public void onUpstreamFailure(final Throwable ex) throws Exception {
+                        ContextScope scope = scopes.poll();
+                        if (scope != null) {
+                            // Mark the span as failed
+                            DatadogWrapperHelper.finishSpan(scope.context(), ex);
+                        }
+                        // We will not receive any more responses from the user code, so clean up any
+                        // remaining spans
+                        scope = scopes.poll();
+                        while (scope != null) {
+                            fromContext(scope.context()).finish();
+                            scope = scopes.poll();
+                        }
+                        fail(responseOutlet, ex);
+                    }
+                });
+
+                // This is where demand comes in from the server and TCP layer
+                setHandler(responseOutlet, new AbstractOutHandler() {
+                    @Override
+                    public void onPull() throws Exception {
+                        pull(responseInlet);
+                    }
+
+                    @Override
+                    public void onDownstreamFinish() throws Exception {
+                        // We can not send out any more responses to the server and TCP layer so stop
+                        // receiving them
+                        cancel(responseInlet);
+                    }
+                });
+            }
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogWrapperHelper.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogWrapperHelper.java
index 3cee9b327b5..330c2f5dbf0 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogWrapperHelper.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogWrapperHelper.java
@@ -11,71 +11,71 @@
 import org.apache.pekko.http.scaladsl.model.HttpResponse;
 
 public class DatadogWrapperHelper {
-  private static final boolean LEGACY_CONTEXT_MANAGER_ENABLED =
-      InstrumenterConfig.get().isLegacyContextManagerEnabled();
+    private static final boolean LEGACY_CONTEXT_MANAGER_ENABLED =
+            InstrumenterConfig.get().isLegacyContextManagerEnabled();
 
-  public static ContextScope createSpan(final HttpRequest request) {
-    return startSpan(request).attach();
-  }
+    public static ContextScope createSpan(final HttpRequest request) {
+        return startSpan(request).attach();
+    }
 
-  public static ContextScope createSpanForFlow(final HttpRequest request) {
-    final Context context = startSpan(request);
-    if (LEGACY_CONTEXT_MANAGER_ENABLED) {
-      return context.attach();
+    public static ContextScope createSpanForFlow(final HttpRequest request) {
+        final Context context = startSpan(request);
+        if (LEGACY_CONTEXT_MANAGER_ENABLED) {
+            return context.attach();
+        }
+        return new SwappedContextScope(context);
     }
-    return new SwappedContextScope(context);
-  }
 
-  private static Context startSpan(final HttpRequest request) {
-    final Context parentContext = DECORATE.extract(request);
-    final Context context = DECORATE.startSpan(request, parentContext);
-    final AgentSpan span = fromContext(context);
-    DECORATE.afterStart(span);
-    DECORATE.onRequest(span, request, request, parentContext);
+    private static Context startSpan(final HttpRequest request) {
+        final Context parentContext = DECORATE.extract(request);
+        final Context context = DECORATE.startSpan(request, parentContext);
+        final AgentSpan span = fromContext(context);
+        DECORATE.afterStart(span);
+        DECORATE.onRequest(span, request, request, parentContext);
 
-    return context;
-  }
+        return context;
+    }
 
-  static final class SwappedContextScope implements ContextScope {
-    private final Context context;
-    private final Context previousContext;
-    private final Thread ownerThread;
-    private boolean closed;
+    static final class SwappedContextScope implements ContextScope {
+        private final Context context;
+        private final Context previousContext;
+        private final Thread ownerThread;
+        private boolean closed;
 
-    SwappedContextScope(final Context context) {
-      this.context = context;
-      this.ownerThread = Thread.currentThread();
-      this.previousContext = context.swap();
-    }
+        SwappedContextScope(final Context context) {
+            this.context = context;
+            this.ownerThread = Thread.currentThread();
+            this.previousContext = context.swap();
+        }
 
-    @Override
-    public Context context() {
-      return context;
-    }
+        @Override
+        public Context context() {
+            return context;
+        }
 
-    @Override
-    public void close() {
-      if (!closed && ownerThread == Thread.currentThread() && context == Context.current()) {
-        closed = true;
-        previousContext.swap();
-      }
+        @Override
+        public void close() {
+            if (!closed && ownerThread == Thread.currentThread() && context == Context.current()) {
+                closed = true;
+                previousContext.swap();
+            }
+        }
     }
-  }
 
-  public static void finishSpan(final Context context, final HttpResponse response) {
-    final AgentSpan span = fromContext(context);
-    DECORATE.onResponse(span, response);
-    DECORATE.beforeFinish(context);
+    public static void finishSpan(final Context context, final HttpResponse response) {
+        final AgentSpan span = fromContext(context);
+        DECORATE.onResponse(span, response);
+        DECORATE.beforeFinish(context);
 
-    span.finish();
-  }
+        span.finish();
+    }
 
-  public static void finishSpan(final Context context, final Throwable t) {
-    final AgentSpan span = fromContext(context);
-    DECORATE.onError(span, t);
-    span.setHttpStatusCode(500);
-    DECORATE.beforeFinish(context);
+    public static void finishSpan(final Context context, final Throwable t) {
+        final AgentSpan span = fromContext(context);
+        DECORATE.onError(span, t);
+        span.setHttpStatusCode(500);
+        DECORATE.beforeFinish(context);
 
-    span.finish();
-  }
+        span.finish();
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttp2ServerInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttp2ServerInstrumentation.java
index 2d648ac3611..de664455247 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttp2ServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttp2ServerInstrumentation.java
@@ -23,91 +23,88 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class PekkoHttp2ServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public PekkoHttp2ServerInstrumentation() {
-    super("pekko-http2", "pekko-http", "pekko-http-server");
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      // pekko 1.1.0 seems not going through Htt2Ext anymore
-      "org.apache.pekko.http.scaladsl.HttpExt",
-      "org.apache.pekko.http.scaladsl.Http2Ext",
-      "org.apache.pekko.http.impl.engine.http2.Http2Ext"
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        takesArguments(8)
-            .and(named("bindAndHandleAsync"))
-            .and(takesArgument(0, named("scala.Function1")))
-            .and(takesArgument(7, named("org.apache.pekko.stream.Materializer"))),
-        getClass().getName() + "$Http2BindAndHandleAsync8ArgAdvice");
-    transformer.applyAdvice(
-        takesArguments(7)
-            .and(named("bindAndHandleAsync"))
-            .and(takesArgument(0, named("scala.Function1")))
-            .and(takesArgument(6, named("org.apache.pekko.stream.Materializer"))),
-        getClass().getName() + "$Http2BindAndHandleAsync7ArgAdvice");
-    transformer.applyAdvice(
-        takesArguments(6)
-            .and(named("bindAndHandleAsync"))
-            .and(takesArgument(0, named("scala.Function1")))
-            .and(takesArgument(5, named("org.apache.pekko.stream.Materializer"))),
-        getClass().getName() + "$Http2BindAndHandleAsync6ArgAdvice");
-  }
-
-  public static class Http2BindAndHandleAsync8ArgAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(
-        @Advice.Argument(value = 0, readOnly = false)
-            Function1<HttpRequest, Future<HttpResponse>> handler,
-        @Advice.Argument(value = 7) final Materializer materializer) {
-      if (CallDepthThreadLocalMap.incrementCallDepth(HttpExt.class) == 0) {
-        handler = new DatadogAsyncHandlerWrapper(handler, materializer.executionContext());
-      }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public PekkoHttp2ServerInstrumentation() {
+        super("pekko-http2", "pekko-http", "pekko-http-server");
     }
 
-    @OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit() {
-      CallDepthThreadLocalMap.decrementCallDepth(HttpExt.class);
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            // pekko 1.1.0 seems not going through Htt2Ext anymore
+            "org.apache.pekko.http.scaladsl.HttpExt",
+            "org.apache.pekko.http.scaladsl.Http2Ext",
+            "org.apache.pekko.http.impl.engine.http2.Http2Ext"
+        };
     }
-  }
 
-  public static class Http2BindAndHandleAsync7ArgAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(
-        @Advice.Argument(value = 0, readOnly = false)
-            Function1<HttpRequest, Future<HttpResponse>> handler,
-        @Advice.Argument(value = 6) final Materializer materializer) {
-      if (CallDepthThreadLocalMap.incrementCallDepth(HttpExt.class) == 0) {
-        handler = new DatadogAsyncHandlerWrapper(handler, materializer.executionContext());
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                takesArguments(8)
+                        .and(named("bindAndHandleAsync"))
+                        .and(takesArgument(0, named("scala.Function1")))
+                        .and(takesArgument(7, named("org.apache.pekko.stream.Materializer"))),
+                getClass().getName() + "$Http2BindAndHandleAsync8ArgAdvice");
+        transformer.applyAdvice(
+                takesArguments(7)
+                        .and(named("bindAndHandleAsync"))
+                        .and(takesArgument(0, named("scala.Function1")))
+                        .and(takesArgument(6, named("org.apache.pekko.stream.Materializer"))),
+                getClass().getName() + "$Http2BindAndHandleAsync7ArgAdvice");
+        transformer.applyAdvice(
+                takesArguments(6)
+                        .and(named("bindAndHandleAsync"))
+                        .and(takesArgument(0, named("scala.Function1")))
+                        .and(takesArgument(5, named("org.apache.pekko.stream.Materializer"))),
+                getClass().getName() + "$Http2BindAndHandleAsync6ArgAdvice");
     }
 
-    @OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit() {
-      CallDepthThreadLocalMap.decrementCallDepth(HttpExt.class);
+    public static class Http2BindAndHandleAsync8ArgAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(
+                @Advice.Argument(value = 0, readOnly = false) Function1<HttpRequest, Future<HttpResponse>> handler,
+                @Advice.Argument(value = 7) final Materializer materializer) {
+            if (CallDepthThreadLocalMap.incrementCallDepth(HttpExt.class) == 0) {
+                handler = new DatadogAsyncHandlerWrapper(handler, materializer.executionContext());
+            }
+        }
+
+        @OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit() {
+            CallDepthThreadLocalMap.decrementCallDepth(HttpExt.class);
+        }
     }
-  }
 
-  public static class Http2BindAndHandleAsync6ArgAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(
-        @Advice.Argument(value = 0, readOnly = false)
-            Function1<HttpRequest, Future<HttpResponse>> handler,
-        @Advice.Argument(value = 5) final Materializer materializer) {
-      if (CallDepthThreadLocalMap.incrementCallDepth(HttpExt.class) == 0) {
-        handler = new DatadogAsyncHandlerWrapper(handler, materializer.executionContext());
-      }
+    public static class Http2BindAndHandleAsync7ArgAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(
+                @Advice.Argument(value = 0, readOnly = false) Function1<HttpRequest, Future<HttpResponse>> handler,
+                @Advice.Argument(value = 6) final Materializer materializer) {
+            if (CallDepthThreadLocalMap.incrementCallDepth(HttpExt.class) == 0) {
+                handler = new DatadogAsyncHandlerWrapper(handler, materializer.executionContext());
+            }
+        }
+
+        @OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit() {
+            CallDepthThreadLocalMap.decrementCallDepth(HttpExt.class);
+        }
     }
 
-    @OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit() {
-      CallDepthThreadLocalMap.decrementCallDepth(HttpExt.class);
+    public static class Http2BindAndHandleAsync6ArgAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(
+                @Advice.Argument(value = 0, readOnly = false) Function1<HttpRequest, Future<HttpResponse>> handler,
+                @Advice.Argument(value = 5) final Materializer materializer) {
+            if (CallDepthThreadLocalMap.incrementCallDepth(HttpExt.class) == 0) {
+                handler = new DatadogAsyncHandlerWrapper(handler, materializer.executionContext());
+            }
+        }
+
+        @OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit() {
+            CallDepthThreadLocalMap.decrementCallDepth(HttpExt.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpClientDecorator.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpClientDecorator.java
index 18405ddc40f..7b400ab1101 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpClientDecorator.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpClientDecorator.java
@@ -10,43 +10,42 @@
 import org.apache.pekko.http.scaladsl.model.HttpResponse;
 
 public class PekkoHttpClientDecorator extends HttpClientDecorator<HttpRequest, HttpResponse> {
-  public static final CharSequence PEKKO_HTTP_CLIENT = UTF8BytesString.create("pekko-http-client");
-  public static final PekkoHttpClientDecorator DECORATE = new PekkoHttpClientDecorator();
-  public static final CharSequence PEKKO_CLIENT_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"pekko-http", "pekko-http-client"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return PEKKO_HTTP_CLIENT;
-  }
-
-  @Override
-  protected String method(final HttpRequest httpRequest) {
-    return httpRequest.method().value();
-  }
-
-  @Override
-  protected URI url(final HttpRequest httpRequest) throws URISyntaxException {
-    return URIUtils.safeParse(httpRequest.uri().toString());
-  }
-
-  @Override
-  protected int status(final HttpResponse httpResponse) {
-    return httpResponse.status().intValue();
-  }
-
-  @Override
-  protected String getRequestHeader(HttpRequest request, String headerName) {
-    return request.getHeader(headerName).map(HttpHeader::value).orElse(null);
-  }
-
-  @Override
-  protected String getResponseHeader(HttpResponse response, String headerName) {
-    return response.getHeader(headerName).map(HttpHeader::value).orElse(null);
-  }
+    public static final CharSequence PEKKO_HTTP_CLIENT = UTF8BytesString.create("pekko-http-client");
+    public static final PekkoHttpClientDecorator DECORATE = new PekkoHttpClientDecorator();
+    public static final CharSequence PEKKO_CLIENT_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"pekko-http", "pekko-http-client"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return PEKKO_HTTP_CLIENT;
+    }
+
+    @Override
+    protected String method(final HttpRequest httpRequest) {
+        return httpRequest.method().value();
+    }
+
+    @Override
+    protected URI url(final HttpRequest httpRequest) throws URISyntaxException {
+        return URIUtils.safeParse(httpRequest.uri().toString());
+    }
+
+    @Override
+    protected int status(final HttpResponse httpResponse) {
+        return httpResponse.status().intValue();
+    }
+
+    @Override
+    protected String getRequestHeader(HttpRequest request, String headerName) {
+        return request.getHeader(headerName).map(HttpHeader::value).orElse(null);
+    }
+
+    @Override
+    protected String getResponseHeader(HttpResponse response, String headerName) {
+        return response.getHeader(headerName).map(HttpHeader::value).orElse(null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpClientHelpers.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpClientHelpers.java
index bbef0b767a9..e39b0cb9964 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpClientHelpers.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpClientHelpers.java
@@ -13,77 +13,77 @@
 import scala.util.Try;
 
 public final class PekkoHttpClientHelpers {
-  public static class OnCompleteHandler extends AbstractFunction1<Try<HttpResponse>, Void> {
-    private final AgentSpan span;
+    public static class OnCompleteHandler extends AbstractFunction1<Try<HttpResponse>, Void> {
+        private final AgentSpan span;
 
-    public OnCompleteHandler(final AgentSpan span) {
-      this.span = span;
-    }
+        public OnCompleteHandler(final AgentSpan span) {
+            this.span = span;
+        }
 
-    @Override
-    public Void apply(final Try<HttpResponse> result) {
-      if (result.isSuccess()) {
-        DECORATE.onResponse(span, result.get());
-      } else {
-        DECORATE.onError(span, result.failed().get());
-      }
-      DECORATE.beforeFinish(span);
-      span.finish();
-      return null;
+        @Override
+        public Void apply(final Try<HttpResponse> result) {
+            if (result.isSuccess()) {
+                DECORATE.onResponse(span, result.get());
+            } else {
+                DECORATE.onError(span, result.failed().get());
+            }
+            DECORATE.beforeFinish(span);
+            span.finish();
+            return null;
+        }
     }
-  }
 
-  public static class PekkoHttpHeaders implements CarrierSetter<HttpRequest> {
-    private HttpRequest request;
-    // Did this request have a span when the PekkoHttpHeaders object was created?
-    private final boolean hadSpan;
+    public static class PekkoHttpHeaders implements CarrierSetter<HttpRequest> {
+        private HttpRequest request;
+        // Did this request have a span when the PekkoHttpHeaders object was created?
+        private final boolean hadSpan;
 
-    public PekkoHttpHeaders(final HttpRequest request) {
-      hadSpan = request != null && request.getHeader(HasSpanHeader.class).isPresent();
-      if (hadSpan || request == null) {
-        this.request = request;
-      } else {
-        // Coerce a Scala trait Self type into the correct type
-        this.request = (HttpRequest) request.addHeader(new HasSpanHeader());
-      }
-    }
+        public PekkoHttpHeaders(final HttpRequest request) {
+            hadSpan = request != null && request.getHeader(HasSpanHeader.class).isPresent();
+            if (hadSpan || request == null) {
+                this.request = request;
+            } else {
+                // Coerce a Scala trait Self type into the correct type
+                this.request = (HttpRequest) request.addHeader(new HasSpanHeader());
+            }
+        }
 
-    public boolean hadSpan() {
-      return hadSpan;
-    }
+        public boolean hadSpan() {
+            return hadSpan;
+        }
 
-    @ParametersAreNonnullByDefault
-    @Override
-    public void set(final HttpRequest carrier, final String key, final String value) {
-      // Coerce a Scala trait Self type into the correct type
-      request = (HttpRequest) request.addHeader(RawHeader.create(key, value));
-    }
+        @ParametersAreNonnullByDefault
+        @Override
+        public void set(final HttpRequest carrier, final String key, final String value) {
+            // Coerce a Scala trait Self type into the correct type
+            request = (HttpRequest) request.addHeader(RawHeader.create(key, value));
+        }
 
-    public HttpRequest getRequest() {
-      return request;
+        public HttpRequest getRequest() {
+            return request;
+        }
     }
-  }
 
-  // Custom header to mark that this request has a span associated with it
-  public static class HasSpanHeader extends CustomHeader {
-    @Override
-    public String name() {
-      return "x-datadog-request-has-span";
-    }
+    // Custom header to mark that this request has a span associated with it
+    public static class HasSpanHeader extends CustomHeader {
+        @Override
+        public String name() {
+            return "x-datadog-request-has-span";
+        }
 
-    @Override
-    public String value() {
-      return "true";
-    }
+        @Override
+        public String value() {
+            return "true";
+        }
 
-    @Override
-    public boolean renderInRequests() {
-      return false;
-    }
+        @Override
+        public boolean renderInRequests() {
+            return false;
+        }
 
-    @Override
-    public boolean renderInResponses() {
-      return false;
+        @Override
+        public boolean renderInResponses() {
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerDecorator.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerDecorator.java
index c0f46986cf9..bc79595aee9 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerDecorator.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerDecorator.java
@@ -7,61 +7,59 @@
 import org.apache.pekko.http.scaladsl.model.HttpRequest;
 import org.apache.pekko.http.scaladsl.model.HttpResponse;
 
-public class PekkoHttpServerDecorator
-    extends HttpServerDecorator<HttpRequest, HttpRequest, HttpResponse, HttpRequest> {
-  private static final CharSequence PEKKO_HTTP_SERVER = UTF8BytesString.create("pekko-http-server");
+public class PekkoHttpServerDecorator extends HttpServerDecorator<HttpRequest, HttpRequest, HttpResponse, HttpRequest> {
+    private static final CharSequence PEKKO_HTTP_SERVER = UTF8BytesString.create("pekko-http-server");
 
-  public static final PekkoHttpServerDecorator DECORATE = new PekkoHttpServerDecorator();
-  public static final CharSequence PEKKO_SERVER_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
+    public static final PekkoHttpServerDecorator DECORATE = new PekkoHttpServerDecorator();
+    public static final CharSequence PEKKO_SERVER_REQUEST = UTF8BytesString.create(DECORATE.operationName());
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"pekko-http", "pekko-http-server"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"pekko-http", "pekko-http-server"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return PEKKO_HTTP_SERVER;
-  }
+    @Override
+    protected CharSequence component() {
+        return PEKKO_HTTP_SERVER;
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpRequest> getter() {
-    return PekkoHttpServerHeaders.requestGetter();
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpRequest> getter() {
+        return PekkoHttpServerHeaders.requestGetter();
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
-    return PekkoHttpServerHeaders.responseGetter();
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
+        return PekkoHttpServerHeaders.responseGetter();
+    }
 
-  @Override
-  public CharSequence spanName() {
-    return PEKKO_SERVER_REQUEST;
-  }
+    @Override
+    public CharSequence spanName() {
+        return PEKKO_SERVER_REQUEST;
+    }
 
-  @Override
-  protected String method(final HttpRequest httpRequest) {
-    return httpRequest.method().value();
-  }
+    @Override
+    protected String method(final HttpRequest httpRequest) {
+        return httpRequest.method().value();
+    }
 
-  @Override
-  protected URIDataAdapter url(final HttpRequest httpRequest) {
-    return new UriAdapter(httpRequest.uri());
-  }
+    @Override
+    protected URIDataAdapter url(final HttpRequest httpRequest) {
+        return new UriAdapter(httpRequest.uri());
+    }
 
-  @Override
-  protected String peerHostIP(final HttpRequest httpRequest) {
-    return null;
-  }
+    @Override
+    protected String peerHostIP(final HttpRequest httpRequest) {
+        return null;
+    }
 
-  @Override
-  protected int peerPort(final HttpRequest httpRequest) {
-    return 0;
-  }
+    @Override
+    protected int peerPort(final HttpRequest httpRequest) {
+        return 0;
+    }
 
-  @Override
-  protected int status(final HttpResponse httpResponse) {
-    return httpResponse.status().intValue();
-  }
+    @Override
+    protected int status(final HttpResponse httpResponse) {
+        return httpResponse.status().intValue();
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerHeaders.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerHeaders.java
index 44d9c27580f..4a232c5926c 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerHeaders.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerHeaders.java
@@ -6,31 +6,29 @@
 import org.apache.pekko.http.scaladsl.model.HttpRequest;
 import org.apache.pekko.http.scaladsl.model.HttpResponse;
 
-public class PekkoHttpServerHeaders<T extends HttpMessage>
-    implements AgentPropagation.ContextVisitor<T> {
+public class PekkoHttpServerHeaders<T extends HttpMessage> implements AgentPropagation.ContextVisitor<T> {
 
-  @SuppressWarnings("rawtypes")
-  private static final PekkoHttpServerHeaders GETTER = new PekkoHttpServerHeaders();
+    @SuppressWarnings("rawtypes")
+    private static final PekkoHttpServerHeaders GETTER = new PekkoHttpServerHeaders();
 
-  private PekkoHttpServerHeaders() {}
+    private PekkoHttpServerHeaders() {}
 
-  @SuppressWarnings("unchecked")
-  public static AgentPropagation.ContextVisitor<HttpRequest> requestGetter() {
-    return (AgentPropagation.ContextVisitor<HttpRequest>) GETTER;
-  }
+    @SuppressWarnings("unchecked")
+    public static AgentPropagation.ContextVisitor<HttpRequest> requestGetter() {
+        return (AgentPropagation.ContextVisitor<HttpRequest>) GETTER;
+    }
 
-  @SuppressWarnings("unchecked")
-  public static AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
-    return (AgentPropagation.ContextVisitor<HttpResponse>) GETTER;
-  }
+    @SuppressWarnings("unchecked")
+    public static AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
+        return (AgentPropagation.ContextVisitor<HttpResponse>) GETTER;
+    }
 
-  @Override
-  public void forEachKey(
-      final HttpMessage carrier, final AgentPropagation.KeyClassifier classifier) {
-    for (final HttpHeader header : carrier.getHeaders()) {
-      if (!classifier.accept(header.lowercaseName(), header.value())) {
-        return;
-      }
+    @Override
+    public void forEachKey(final HttpMessage carrier, final AgentPropagation.KeyClassifier classifier) {
+        for (final HttpHeader header : carrier.getHeaders()) {
+            if (!classifier.accept(header.lowercaseName(), header.value())) {
+                return;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerInstrumentation.java
index 912b6503137..ff6507d11cf 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerInstrumentation.java
@@ -51,40 +51,38 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class PekkoHttpServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public PekkoHttpServerInstrumentation() {
-    super("pekko-http", "pekko-http-server");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.http.scaladsl.HttpExt";
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public PekkoHttpServerInstrumentation() {
+        super("pekko-http", "pekko-http-server");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("bindAndHandle")
-            .and(takesArgument(0, named("org.apache.pekko.stream.scaladsl.Flow"))),
-        getClass().getName() + "$PekkoHttpBindAndHandleAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.http.scaladsl.HttpExt";
+    }
 
-  public static class PekkoHttpBindAndHandleAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(
-        @Advice.Argument(value = 0, readOnly = false)
-            Flow<HttpRequest, HttpResponse, NotUsed> handler,
-        @Advice.Argument(value = 4, readOnly = false) ServerSettings settings) {
-      if (CallDepthThreadLocalMap.incrementCallDepth(HttpExt.class) == 0) {
-        final BidiFlow<HttpResponse, HttpResponse, HttpRequest, HttpRequest, NotUsed> wrapper =
-            BidiFlow.fromGraph(new DatadogServerRequestResponseFlowWrapper(settings));
-        handler = wrapper.reversed().join(handler.asJava()).asScala();
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("bindAndHandle").and(takesArgument(0, named("org.apache.pekko.stream.scaladsl.Flow"))),
+                getClass().getName() + "$PekkoHttpBindAndHandleAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit() {
-      CallDepthThreadLocalMap.decrementCallDepth(HttpExt.class);
+    public static class PekkoHttpBindAndHandleAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(
+                @Advice.Argument(value = 0, readOnly = false) Flow<HttpRequest, HttpResponse, NotUsed> handler,
+                @Advice.Argument(value = 4, readOnly = false) ServerSettings settings) {
+            if (CallDepthThreadLocalMap.incrementCallDepth(HttpExt.class) == 0) {
+                final BidiFlow<HttpResponse, HttpResponse, HttpRequest, HttpRequest, NotUsed> wrapper =
+                        BidiFlow.fromGraph(new DatadogServerRequestResponseFlowWrapper(settings));
+                handler = wrapper.reversed().join(handler.asJava()).asScala();
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit() {
+            CallDepthThreadLocalMap.decrementCallDepth(HttpExt.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpSingleRequestInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpSingleRequestInstrumentation.java
index bde139cbbb3..a6a812e179e 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpSingleRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpSingleRequestInstrumentation.java
@@ -27,101 +27,97 @@
 
 @AutoService(InstrumenterModule.class)
 public final class PekkoHttpSingleRequestInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public PekkoHttpSingleRequestInstrumentation() {
-    super("pekko-http", "pekko-http-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public PekkoHttpSingleRequestInstrumentation() {
+        super("pekko-http", "pekko-http-client");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.http.scaladsl.HttpExt";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.http.scaladsl.HttpExt";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".PekkoHttpClientHelpers",
-      packageName + ".PekkoHttpClientHelpers$OnCompleteHandler",
-      packageName + ".PekkoHttpClientHelpers$PekkoHttpHeaders",
-      packageName + ".PekkoHttpClientHelpers$HasSpanHeader",
-      packageName + ".PekkoHttpClientDecorator",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".PekkoHttpClientHelpers",
+            packageName + ".PekkoHttpClientHelpers$OnCompleteHandler",
+            packageName + ".PekkoHttpClientHelpers$PekkoHttpHeaders",
+            packageName + ".PekkoHttpClientHelpers$HasSpanHeader",
+            packageName + ".PekkoHttpClientDecorator",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // This is mainly for compatibility with 10.0
-    transformer.applyAdvices(
-        named("singleRequest")
-            .and(takesArgument(0, named("org.apache.pekko.http.scaladsl.model.HttpRequest"))),
-        PekkoHttpSingleRequestInstrumentation.class.getName() + "$SingleRequestAdvice",
-        PekkoHttpSingleRequestInstrumentation.class.getName()
-            + "$SingleRequestContextPropagationAdvice");
-    // This is for 10.1+
-    transformer.applyAdvices(
-        named("singleRequestImpl")
-            .and(takesArgument(0, named("org.apache.pekko.http.scaladsl.model.HttpRequest"))),
-        PekkoHttpSingleRequestInstrumentation.class.getName() + "$SingleRequestAdvice",
-        PekkoHttpSingleRequestInstrumentation.class.getName()
-            + "$SingleRequestContextPropagationAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // This is mainly for compatibility with 10.0
+        transformer.applyAdvices(
+                named("singleRequest").and(takesArgument(0, named("org.apache.pekko.http.scaladsl.model.HttpRequest"))),
+                PekkoHttpSingleRequestInstrumentation.class.getName() + "$SingleRequestAdvice",
+                PekkoHttpSingleRequestInstrumentation.class.getName() + "$SingleRequestContextPropagationAdvice");
+        // This is for 10.1+
+        transformer.applyAdvices(
+                named("singleRequestImpl")
+                        .and(takesArgument(0, named("org.apache.pekko.http.scaladsl.model.HttpRequest"))),
+                PekkoHttpSingleRequestInstrumentation.class.getName() + "$SingleRequestAdvice",
+                PekkoHttpSingleRequestInstrumentation.class.getName() + "$SingleRequestContextPropagationAdvice");
+    }
 
-  public static class SingleRequestAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.Argument(value = 0, readOnly = false) HttpRequest request) {
-      /*
-      Versions 10.0 and 10.1 have slightly different structure that is hard to distinguish so here
-      we cast 'wider net' and avoid instrumenting twice.
-      In the future we may want to separate these, but since lots of code is reused we would need to come up
-      with way of continuing to reusing it.
-       */
-      final PekkoHttpHeaders headers = new PekkoHttpHeaders(request);
-      if (headers.hadSpan()) {
-        return null;
-      }
+    public static class SingleRequestAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(@Advice.Argument(value = 0, readOnly = false) HttpRequest request) {
+            /*
+            Versions 10.0 and 10.1 have slightly different structure that is hard to distinguish so here
+            we cast 'wider net' and avoid instrumenting twice.
+            In the future we may want to separate these, but since lots of code is reused we would need to come up
+            with way of continuing to reusing it.
+             */
+            final PekkoHttpHeaders headers = new PekkoHttpHeaders(request);
+            if (headers.hadSpan()) {
+                return null;
+            }
 
-      final AgentSpan span = startSpan(PEKKO_HTTP_CLIENT.toString(), PEKKO_CLIENT_REQUEST);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, request);
-      return activateSpan(span);
-    }
+            final AgentSpan span = startSpan(PEKKO_HTTP_CLIENT.toString(), PEKKO_CLIENT_REQUEST);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, request);
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.This final HttpExt thiz,
-        @Advice.Return final Future<HttpResponse> responseFuture,
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.This final HttpExt thiz,
+                @Advice.Return final Future<HttpResponse> responseFuture,
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
 
-      final AgentSpan span = spanFromScope(scope);
+            final AgentSpan span = spanFromScope(scope);
 
-      if (throwable == null) {
-        responseFuture.onComplete(new OnCompleteHandler(span), thiz.system().dispatcher());
-        scope.close();
-      } else {
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      }
+            if (throwable == null) {
+                responseFuture.onComplete(
+                        new OnCompleteHandler(span), thiz.system().dispatcher());
+                scope.close();
+            } else {
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            }
+        }
     }
-  }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class SingleRequestContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
-        @Advice.Argument(value = 0, readOnly = false) HttpRequest request) {
-      if (request == null) {
-        return;
-      }
-      final PekkoHttpHeaders headers = new PekkoHttpHeaders(request);
-      DECORATE.injectContext(currentContext(), request, headers);
-      request = headers.getRequest();
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class SingleRequestContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter(@Advice.Argument(value = 0, readOnly = false) HttpRequest request) {
+            if (request == null) {
+                return;
+            }
+            final PekkoHttpHeaders headers = new PekkoHttpHeaders(request);
+            DECORATE.injectContext(currentContext(), request, headers);
+            request = headers.getRequest();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoPoolMasterActorInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoPoolMasterActorInstrumentation.java
index b4fb4627a14..eaa81fe406f 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoPoolMasterActorInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoPoolMasterActorInstrumentation.java
@@ -12,40 +12,40 @@
 
 @AutoService(InstrumenterModule.class)
 public final class PekkoPoolMasterActorInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public PekkoPoolMasterActorInstrumentation() {
-    super("pekko-http", "pekko-http-client");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.http.impl.engine.client.PoolMasterActor";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // This is how scala names a method that is private to a class but is used in a PartialFunction
-    transformer.applyAdvice(
-        named("org$apache$pekko$http$impl$engine$client$PoolMasterActor$$startPoolInterface"),
-        PekkoPoolMasterActorInstrumentation.class.getName() + "$BlockPropagation");
-  }
-
-  /**
-   * This instrumentation ensures that the creation of a pool doesn't attach the current {@code
-   * Scope} to the {@code onComplete} of the {@code Future} that is only completed when the
-   * interface is shut down. This means that the {@code Trace} will finish fast, and not wait for
-   * the flush to happen.
-   */
-  public static class BlockPropagation {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter() {
-      return activateSpan(noopSpan());
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public PekkoPoolMasterActorInstrumentation() {
+        super("pekko-http", "pekko-http-client");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Enter final ContextScope scope) {
-      scope.close();
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.http.impl.engine.client.PoolMasterActor";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // This is how scala names a method that is private to a class but is used in a PartialFunction
+        transformer.applyAdvice(
+                named("org$apache$pekko$http$impl$engine$client$PoolMasterActor$$startPoolInterface"),
+                PekkoPoolMasterActorInstrumentation.class.getName() + "$BlockPropagation");
+    }
+
+    /**
+     * This instrumentation ensures that the creation of a pool doesn't attach the current {@code
+     * Scope} to the {@code onComplete} of the {@code Future} that is only completed when the
+     * interface is shut down. This means that the {@code Trace} will finish fast, and not wait for
+     * the flush to happen.
+     */
+    public static class BlockPropagation {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter() {
+            return activateSpan(noopSpan());
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Enter final ContextScope scope) {
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/UriAdapter.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/UriAdapter.java
index 3e65a163d5a..7049a40f063 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/UriAdapter.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/UriAdapter.java
@@ -6,46 +6,46 @@
 
 final class UriAdapter extends URIRawDataAdapter {
 
-  private final Uri uri;
-
-  UriAdapter(Uri uri) {
-    this.uri = uri;
-  }
-
-  @Override
-  public String scheme() {
-    return uri.scheme();
-  }
-
-  @Override
-  public String host() {
-    return uri.authority().host().address();
-  }
-
-  @Override
-  public int port() {
-    return uri.authority().port();
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return uri.path().toString();
-  }
-
-  @Override
-  public String fragment() {
-    return getOrElseNull(uri.fragment());
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return getOrElseNull(uri.rawQueryString());
-  }
-
-  private static String getOrElseNull(Option<String> optional) {
-    if (optional.nonEmpty()) {
-      return optional.get();
-    }
-    return null;
-  }
+    private final Uri uri;
+
+    UriAdapter(Uri uri) {
+        this.uri = uri;
+    }
+
+    @Override
+    public String scheme() {
+        return uri.scheme();
+    }
+
+    @Override
+    public String host() {
+        return uri.authority().host().address();
+    }
+
+    @Override
+    public int port() {
+        return uri.authority().port();
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return uri.path().toString();
+    }
+
+    @Override
+    public String fragment() {
+        return getOrElseNull(uri.fragment());
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return getOrElseNull(uri.rawQueryString());
+    }
+
+    private static String getOrElseNull(Option<String> optional) {
+        if (optional.nonEmpty()) {
+            return optional.get();
+        }
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieDirectivesInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieDirectivesInstrumentation.java
index 58f2ea2decf..ad066d6e843 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieDirectivesInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieDirectivesInstrumentation.java
@@ -22,45 +22,44 @@
  */
 @AutoService(InstrumenterModule.class)
 public class CookieDirectivesInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public CookieDirectivesInstrumentation() {
-    super("pekko-http");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public CookieDirectivesInstrumentation() {
+        super("pekko-http");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      // "org.apache.pekko.http.scaladsl.server.directives.CookieDirectives$class", // scala 2.11
-      "org.apache.pekko.http.scaladsl.server.directives.CookieDirectives", // scala 2.12+ (default
-      // methods)
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            // "org.apache.pekko.http.scaladsl.server.directives.CookieDirectives$class", // scala 2.11
+            "org.apache.pekko.http.scaladsl.server.directives.CookieDirectives", // scala 2.12+ (default
+            // methods)
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    String traitName = "org.apache.pekko.http.scaladsl.server.directives.CookieDirectives";
-    transformer.applyAdvice(
-        isTraitDirectiveMethod(traitName, "cookie", "java.lang.String"),
-        CookieDirectivesInstrumentation.class.getName() + "$TaintCookieAdvice");
-    transformer.applyAdvice(
-        isTraitDirectiveMethod(traitName, "optionalCookie", "java.lang.String"),
-        CookieDirectivesInstrumentation.class.getName() + "$TaintOptionalCookieAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        String traitName = "org.apache.pekko.http.scaladsl.server.directives.CookieDirectives";
+        transformer.applyAdvice(
+                isTraitDirectiveMethod(traitName, "cookie", "java.lang.String"),
+                CookieDirectivesInstrumentation.class.getName() + "$TaintCookieAdvice");
+        transformer.applyAdvice(
+                isTraitDirectiveMethod(traitName, "optionalCookie", "java.lang.String"),
+                CookieDirectivesInstrumentation.class.getName() + "$TaintOptionalCookieAdvice");
+    }
 
-  static class TaintCookieAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    static void after(@Advice.Return(readOnly = false) Directive directive) {
-      directive = directive.tmap(TaintCookieFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+    static class TaintCookieAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        static void after(@Advice.Return(readOnly = false) Directive directive) {
+            directive = directive.tmap(TaintCookieFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        }
     }
-  }
 
-  static class TaintOptionalCookieAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    static void after(@Advice.Return(readOnly = false) Directive directive) {
-      directive =
-          directive.tmap(TaintOptionalCookieFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+    static class TaintOptionalCookieAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        static void after(@Advice.Return(readOnly = false) Directive directive) {
+            directive = directive.tmap(TaintOptionalCookieFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieHeaderInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieHeaderInstrumentation.java
index 8c020da2ffe..64a19eca8da 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieHeaderInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieHeaderInstrumentation.java
@@ -33,51 +33,51 @@
  */
 @AutoService(InstrumenterModule.class)
 public class CookieHeaderInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public CookieHeaderInstrumentation() {
-    super("pekko-http");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public CookieHeaderInstrumentation() {
+        super("pekko-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.http.scaladsl.model.headers.Cookie";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.http.scaladsl.model.headers.Cookie";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("cookies"))
-            .and(returns(named("scala.collection.immutable.Seq")))
-            .and(takesArguments(0)),
-        CookieHeaderInstrumentation.class.getName() + "$TaintAllCookiesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("cookies"))
+                        .and(returns(named("scala.collection.immutable.Seq")))
+                        .and(takesArguments(0)),
+                CookieHeaderInstrumentation.class.getName() + "$TaintAllCookiesAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  static class TaintAllCookiesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    static void after(
-        @Advice.This HttpHeader cookie,
-        @Advice.Return Seq<HttpCookiePair> cookiePairs,
-        @ActiveRequestContext RequestContext reqCtx) {
-      PropagationModule prop = InstrumentationBridge.PROPAGATION;
-      if (prop == null || cookiePairs == null || cookiePairs.isEmpty()) {
-        return;
-      }
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      if (!prop.isTainted(ctx, cookie)) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    static class TaintAllCookiesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        static void after(
+                @Advice.This HttpHeader cookie,
+                @Advice.Return Seq<HttpCookiePair> cookiePairs,
+                @ActiveRequestContext RequestContext reqCtx) {
+            PropagationModule prop = InstrumentationBridge.PROPAGATION;
+            if (prop == null || cookiePairs == null || cookiePairs.isEmpty()) {
+                return;
+            }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            if (!prop.isTainted(ctx, cookie)) {
+                return;
+            }
 
-      Iterator<HttpCookiePair> iterator = cookiePairs.iterator();
-      while (iterator.hasNext()) {
-        HttpCookiePair pair = iterator.next();
-        final String name = pair.name(), value = pair.value();
-        prop.taintString(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
-        prop.taintString(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
-      }
+            Iterator<HttpCookiePair> iterator = cookiePairs.iterator();
+            while (iterator.hasNext()) {
+                HttpCookiePair pair = iterator.next();
+                final String name = pair.name(), value = pair.value();
+                prop.taintString(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
+                prop.taintString(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ExtractDirectivesInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ExtractDirectivesInstrumentation.java
index f22c5c24eaf..e2e6dfcc0f0 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ExtractDirectivesInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ExtractDirectivesInstrumentation.java
@@ -34,55 +34,53 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ExtractDirectivesInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public ExtractDirectivesInstrumentation() {
-    super("pekko-http");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public ExtractDirectivesInstrumentation() {
+        super("pekko-http");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.apache.pekko.http.scaladsl.server.directives.BasicDirectives$class",
-      "org.apache.pekko.http.scaladsl.server.directives.BasicDirectives",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.apache.pekko.http.scaladsl.server.directives.BasicDirectives$class",
+            "org.apache.pekko.http.scaladsl.server.directives.BasicDirectives",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    instrumentDirective(transformer, "extractUri", "TaintUriDirectiveAdvice");
-    instrumentDirective(transformer, "extractRequest", "TaintRequestDirectiveAdvice");
-    instrumentDirective(transformer, "extractRequestContext", "TaintRequestContextDirectiveAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        instrumentDirective(transformer, "extractUri", "TaintUriDirectiveAdvice");
+        instrumentDirective(transformer, "extractRequest", "TaintRequestDirectiveAdvice");
+        instrumentDirective(transformer, "extractRequestContext", "TaintRequestContextDirectiveAdvice");
+    }
 
-  private void instrumentDirective(MethodTransformer transformation, String method, String advice) {
-    transformation.applyAdvice(
-        isTraitDirectiveMethod(
-            "org.apache.pekko.http.scaladsl.server.directives.BasicDirectives", method),
-        ExtractDirectivesInstrumentation.class.getName() + '$' + advice);
-  }
+    private void instrumentDirective(MethodTransformer transformation, String method, String advice) {
+        transformation.applyAdvice(
+                isTraitDirectiveMethod("org.apache.pekko.http.scaladsl.server.directives.BasicDirectives", method),
+                ExtractDirectivesInstrumentation.class.getName() + '$' + advice);
+    }
 
-  static class TaintUriDirectiveAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_QUERY)
-    static void after(@Advice.Return(readOnly = false) Directive directive) {
-      directive = directive.tmap(TaintUriFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+    static class TaintUriDirectiveAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_QUERY)
+        static void after(@Advice.Return(readOnly = false) Directive directive) {
+            directive = directive.tmap(TaintUriFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        }
     }
-  }
 
-  static class TaintRequestDirectiveAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_BODY)
-    static void after(@Advice.Return(readOnly = false) Directive directive) {
-      directive = directive.tmap(TaintRequestFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+    static class TaintRequestDirectiveAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_BODY)
+        static void after(@Advice.Return(readOnly = false) Directive directive) {
+            directive = directive.tmap(TaintRequestFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        }
     }
-  }
 
-  static class TaintRequestContextDirectiveAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_BODY)
-    static void after(@Advice.Return(readOnly = false) Directive directive) {
-      directive =
-          directive.tmap(TaintRequestContextFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+    static class TaintRequestContextDirectiveAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_BODY)
+        static void after(@Advice.Return(readOnly = false) Directive directive) {
+            directive = directive.tmap(TaintRequestContextFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormDataInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormDataInstrumentation.java
index 63545c59350..f984a9148f4 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormDataInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormDataInstrumentation.java
@@ -20,28 +20,28 @@
  */
 @AutoService(InstrumenterModule.class)
 public class FormDataInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public FormDataInstrumentation() {
-    super("pekko-http");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public FormDataInstrumentation() {
+        super("pekko-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.http.scaladsl.model.FormData";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.http.scaladsl.model.FormData";
+    }
 
-  /**
-   * @param transformer
-   * @see UriInstrumentation.TaintQueryAdvice
-   */
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("fields"))
-            .and(takesArguments(0))
-            .and(returns(named("org.apache.pekko.http.scaladsl.model.Uri$Query"))),
-        "datadog.trace.instrumentation.pekkohttp.iast.UriInstrumentation$TaintQueryAdvice");
-  }
+    /**
+     * @param transformer
+     * @see UriInstrumentation.TaintQueryAdvice
+     */
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("fields"))
+                        .and(takesArguments(0))
+                        .and(returns(named("org.apache.pekko.http.scaladsl.model.Uri$Query"))),
+                "datadog.trace.instrumentation.pekkohttp.iast.UriInstrumentation$TaintQueryAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormFieldDirectivesImplInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormFieldDirectivesImplInstrumentation.java
index 5b9aaf8624e..b1aec961f3f 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormFieldDirectivesImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormFieldDirectivesImplInstrumentation.java
@@ -5,8 +5,8 @@
 
 @AutoService(InstrumenterModule.class)
 public class FormFieldDirectivesImplInstrumentation extends ParameterDirectivesImplInstrumentation {
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.http.scaladsl.server.directives.FormFieldDirectives$Impl$";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.http.scaladsl.server.directives.FormFieldDirectives$Impl$";
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormFieldDirectivesInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormFieldDirectivesInstrumentation.java
index 37245674001..1ae4d2f65d7 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormFieldDirectivesInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormFieldDirectivesInstrumentation.java
@@ -30,98 +30,89 @@
  */
 @AutoService(InstrumenterModule.class)
 public class FormFieldDirectivesInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  private static final String TRAIT_CLASS =
-      "org.apache.pekko.http.scaladsl.server.directives.FormFieldDirectives";
+    private static final String TRAIT_CLASS = "org.apache.pekko.http.scaladsl.server.directives.FormFieldDirectives";
 
-  public FormFieldDirectivesInstrumentation() {
-    super("pekko-http");
-  }
+    public FormFieldDirectivesInstrumentation() {
+        super("pekko-http");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      TRAIT_CLASS + "$class", TRAIT_CLASS,
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            TRAIT_CLASS + "$class", TRAIT_CLASS,
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // the Java API delegates to the Scala API
-    transformDirective(transformer, "formFieldMultiMap", "TaintMultiMapDirectiveAdvice");
-    transformDirective(transformer, "formFieldMap", "TaintMapDirectiveAdvice");
-    transformDirective(transformer, "formFieldSeq", "TaintSeqDirectiveAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // the Java API delegates to the Scala API
+        transformDirective(transformer, "formFieldMultiMap", "TaintMultiMapDirectiveAdvice");
+        transformDirective(transformer, "formFieldMap", "TaintMapDirectiveAdvice");
+        transformDirective(transformer, "formFieldSeq", "TaintSeqDirectiveAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("formField").or(named("formFields")))
-            .and(returns(Object.class))
-            .and(takesArguments(2))
-            .and(
-                takesArgument(
-                    0,
-                    named("org.apache.pekko.http.scaladsl.server.directives.FormFieldDirectives")))
-            .and(
-                takesArgument(
-                    1,
-                    named(
-                        "org.apache.pekko.http.scaladsl.server.directives.FormFieldDirectives$FieldMagnet"))),
-        FormFieldDirectivesInstrumentation.class.getName()
-            + "$TaintSingleFormFieldDirectiveOldScalaAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("formField").or(named("formFields")))
+                        .and(returns(Object.class))
+                        .and(takesArguments(2))
+                        .and(takesArgument(
+                                0, named("org.apache.pekko.http.scaladsl.server.directives.FormFieldDirectives")))
+                        .and(
+                                takesArgument(
+                                        1,
+                                        named(
+                                                "org.apache.pekko.http.scaladsl.server.directives.FormFieldDirectives$FieldMagnet"))),
+                FormFieldDirectivesInstrumentation.class.getName() + "$TaintSingleFormFieldDirectiveOldScalaAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("formField").or(named("formFields")))
-            .and(
-                returns(Object.class)
-                    .or(returns(named("org.apache.pekko.http.scaladsl.server.Directive"))))
-            .and(takesArguments(1))
-            .and(
-                takesArgument(
-                    0,
-                    named(
-                        "org.apache.pekko.http.scaladsl.server.directives.FormFieldDirectives$FieldMagnet"))),
-        FormFieldDirectivesInstrumentation.class.getName()
-            + "$TaintSingleFormFieldDirectiveNewScalaAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("formField").or(named("formFields")))
+                        .and(returns(Object.class)
+                                .or(returns(named("org.apache.pekko.http.scaladsl.server.Directive"))))
+                        .and(takesArguments(1))
+                        .and(
+                                takesArgument(
+                                        0,
+                                        named(
+                                                "org.apache.pekko.http.scaladsl.server.directives.FormFieldDirectives$FieldMagnet"))),
+                FormFieldDirectivesInstrumentation.class.getName() + "$TaintSingleFormFieldDirectiveNewScalaAdvice");
+    }
 
-  private void transformDirective(
-      MethodTransformer transformation, String methodName, String adviceClass) {
-    transformation.applyAdvice(
-        isTraitDirectiveMethod(TRAIT_CLASS, methodName),
-        ParameterDirectivesInstrumentation.class.getName() + "$" + adviceClass);
-  }
+    private void transformDirective(MethodTransformer transformation, String methodName, String adviceClass) {
+        transformation.applyAdvice(
+                isTraitDirectiveMethod(TRAIT_CLASS, methodName),
+                ParameterDirectivesInstrumentation.class.getName() + "$" + adviceClass);
+    }
 
-  static class TaintSingleFormFieldDirectiveOldScalaAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(
-        @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Directive retval,
-        @Advice.Argument(1) FormFieldDirectives.FieldMagnet fmag) {
-      try {
-        retval =
-            retval.tmap(new TaintSingleParameterFunction<>(fmag), Tupler$.MODULE$.forTuple(null));
-      } catch (Exception e) {
-        throw new RuntimeException(e); // propagate so it's logged
-      }
+    static class TaintSingleFormFieldDirectiveOldScalaAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(
+                @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Directive retval,
+                @Advice.Argument(1) FormFieldDirectives.FieldMagnet fmag) {
+            try {
+                retval = retval.tmap(new TaintSingleParameterFunction<>(fmag), Tupler$.MODULE$.forTuple(null));
+            } catch (Exception e) {
+                throw new RuntimeException(e); // propagate so it's logged
+            }
+        }
     }
-  }
 
-  static class TaintSingleFormFieldDirectiveNewScalaAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(
-        @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Directive retval,
-        @Advice.Argument(0) FormFieldDirectives.FieldMagnet fmag) {
-      try {
-        retval =
-            retval.tmap(new TaintSingleParameterFunction<>(fmag), Tupler$.MODULE$.forTuple(null));
-      } catch (Exception e) {
-        throw new RuntimeException(e); // propagate so it's logged
-      }
+    static class TaintSingleFormFieldDirectiveNewScalaAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(
+                @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Directive retval,
+                @Advice.Argument(0) FormFieldDirectives.FieldMagnet fmag) {
+            try {
+                retval = retval.tmap(new TaintSingleParameterFunction<>(fmag), Tupler$.MODULE$.forTuple(null));
+            } catch (Exception e) {
+                throw new RuntimeException(e); // propagate so it's logged
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HeaderNameCallSite.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HeaderNameCallSite.java
index f0de41cd3da..3e382b1235a 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HeaderNameCallSite.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HeaderNameCallSite.java
@@ -19,24 +19,23 @@
 @CallSite(spi = IastCallSites.class)
 public class HeaderNameCallSite {
 
-  @CallSite.After("java.lang.String org.apache.pekko.http.javadsl.model.HttpHeader.name()")
-  @CallSite.After(
-      "java.lang.String org.apache.pekko.http.scaladsl.model.HttpHeader.name()") // subtype of the
-  // first
-  public static String after(@CallSite.This HttpHeader header, @CallSite.Return String result) {
-    PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module == null) {
-      return result;
-    }
-    try {
-      final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-      if (ctx == null) {
+    @CallSite.After("java.lang.String org.apache.pekko.http.javadsl.model.HttpHeader.name()")
+    @CallSite.After("java.lang.String org.apache.pekko.http.scaladsl.model.HttpHeader.name()") // subtype of the
+    // first
+    public static String after(@CallSite.This HttpHeader header, @CallSite.Return String result) {
+        PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module == null) {
+            return result;
+        }
+        try {
+            final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+            if (ctx == null) {
+                return result;
+            }
+            module.taintStringIfTainted(ctx, result, header, SourceTypes.REQUEST_HEADER_NAME, result);
+        } catch (final Throwable e) {
+            module.onUnexpectedException("onHeaderNames threw", e);
+        }
         return result;
-      }
-      module.taintStringIfTainted(ctx, result, header, SourceTypes.REQUEST_HEADER_NAME, result);
-    } catch (final Throwable e) {
-      module.onUnexpectedException("onHeaderNames threw", e);
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpHeaderSubclassesInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpHeaderSubclassesInstrumentation.java
index fa84d2ee2ad..e01f2ece650 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpHeaderSubclassesInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpHeaderSubclassesInstrumentation.java
@@ -34,45 +34,43 @@
  */
 @AutoService(InstrumenterModule.class)
 public class HttpHeaderSubclassesInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public HttpHeaderSubclassesInstrumentation() {
-    super("pekko-http");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public HttpHeaderSubclassesInstrumentation() {
+        super("pekko-http");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.pekko.http.scaladsl.model.HttpHeader";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.pekko.http.scaladsl.model.HttpHeader";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return nameStartsWith("org.apache.pekko.http.scaladsl.model.")
-        .and(not(named(hierarchyMarkerType())))
-        .and(extendsClass(named(hierarchyMarkerType())));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return nameStartsWith("org.apache.pekko.http.scaladsl.model.")
+                .and(not(named(hierarchyMarkerType())))
+                .and(extendsClass(named(hierarchyMarkerType())));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("value")).and(takesArguments(0)).and(returns(String.class)),
-        HttpHeaderSubclassesInstrumentation.class.getName() + "$HttpHeaderSubclassesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("value")).and(takesArguments(0)).and(returns(String.class)),
+                HttpHeaderSubclassesInstrumentation.class.getName() + "$HttpHeaderSubclassesAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  static class HttpHeaderSubclassesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    static void onExit(
-        @Advice.This HttpHeader h,
-        @Advice.Return String retVal,
-        @ActiveRequestContext RequestContext reqCtx) {
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    static class HttpHeaderSubclassesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        static void onExit(
+                @Advice.This HttpHeader h, @Advice.Return String retVal, @ActiveRequestContext RequestContext reqCtx) {
 
-      PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      propagation.taintStringIfTainted(ctx, retVal, h);
+            PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            propagation.taintStringIfTainted(ctx, retVal, h);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpRequestInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpRequestInstrumentation.java
index 6a6a1eb88cb..319dd50ada1 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/HttpRequestInstrumentation.java
@@ -35,83 +35,87 @@
  */
 @AutoService(InstrumenterModule.class)
 public class HttpRequestInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public HttpRequestInstrumentation() {
-    super("pekko-http");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public HttpRequestInstrumentation() {
+        super("pekko-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.http.scaladsl.model.HttpRequest";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.http.scaladsl.model.HttpRequest";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("headers"))
-            .and(returns(named("scala.collection.immutable.Seq")))
-            .and(takesArguments(0)),
-        HttpRequestInstrumentation.class.getName() + "$RequestHeadersAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("headers"))
+                        .and(returns(named("scala.collection.immutable.Seq")))
+                        .and(takesArguments(0)),
+                HttpRequestInstrumentation.class.getName() + "$RequestHeadersAdvice");
 
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(not(isStatic())).and(named("entity")).and(takesArguments(0)),
-        HttpRequestInstrumentation.class.getName() + "$EntityAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(not(isStatic()))
+                        .and(named("entity"))
+                        .and(takesArguments(0)),
+                HttpRequestInstrumentation.class.getName() + "$EntityAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  static class RequestHeadersAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    static void onExit(
-        @Advice.This HttpRequest thiz,
-        @Advice.Return(readOnly = false) Seq<HttpHeader> headers,
-        @ActiveRequestContext RequestContext reqCtx) {
-      PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation == null || headers == null || headers.isEmpty()) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    static class RequestHeadersAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        static void onExit(
+                @Advice.This HttpRequest thiz,
+                @Advice.Return(readOnly = false) Seq<HttpHeader> headers,
+                @ActiveRequestContext RequestContext reqCtx) {
+            PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation == null || headers == null || headers.isEmpty()) {
+                return;
+            }
 
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
 
-      if (!propagation.isTainted(ctx, thiz)) {
-        return;
-      }
+            if (!propagation.isTainted(ctx, thiz)) {
+                return;
+            }
 
-      Iterator<HttpHeader> iterator = headers.iterator();
-      while (iterator.hasNext()) {
-        HttpHeader h = iterator.next();
-        if (propagation.isTainted(ctx, h)) {
-          continue;
+            Iterator<HttpHeader> iterator = headers.iterator();
+            while (iterator.hasNext()) {
+                HttpHeader h = iterator.next();
+                if (propagation.isTainted(ctx, h)) {
+                    continue;
+                }
+                // unfortunately, the call to h.value() is instrumented, but
+                // because the call to taint() only happens after, the call is a noop
+                propagation.taintObject(ctx, h, SourceTypes.REQUEST_HEADER_VALUE, h.name(), h.value());
+            }
         }
-        // unfortunately, the call to h.value() is instrumented, but
-        // because the call to taint() only happens after, the call is a noop
-        propagation.taintObject(ctx, h, SourceTypes.REQUEST_HEADER_VALUE, h.name(), h.value());
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  static class EntityAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    static void onExit(
-        @Advice.This HttpRequest thiz,
-        @Advice.Return(readOnly = false, typing = DYNAMIC) Object entity,
-        @ActiveRequestContext RequestContext reqCtx) {
-      PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation == null || entity == null) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    static class EntityAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        static void onExit(
+                @Advice.This HttpRequest thiz,
+                @Advice.Return(readOnly = false, typing = DYNAMIC) Object entity,
+                @ActiveRequestContext RequestContext reqCtx) {
+            PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation == null || entity == null) {
+                return;
+            }
 
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
 
-      if (propagation.isTainted(ctx, entity)) {
-        return;
-      }
+            if (propagation.isTainted(ctx, entity)) {
+                return;
+            }
 
-      propagation.taintObjectIfTainted(ctx, entity, thiz);
+            propagation.taintObjectIfTainted(ctx, entity, thiz);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MakeTaintableInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MakeTaintableInstrumentation.java
index f65d6e19371..e00f7a1def5 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MakeTaintableInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MakeTaintableInstrumentation.java
@@ -7,34 +7,34 @@
 
 @AutoService(InstrumenterModule.class)
 public class MakeTaintableInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasTypeAdvice {
-  public MakeTaintableInstrumentation() {
-    super("pekko-http");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasTypeAdvice {
+    public MakeTaintableInstrumentation() {
+        super("pekko-http");
+    }
 
-  /**
-   * @see org.apache.pekko.http.scaladsl.model.HttpHeader
-   * @return the matching types
-   */
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.apache.pekko.http.javadsl.model.HttpHeader", // scaladsl versions extends
-      // javadsl.m.HttpHeader
-      "org.apache.pekko.http.scaladsl.model.Uri", // javadsl version wraps scaladsl version
-      "org.apache.pekko.http.scaladsl.model.HttpRequest", // javadsl is abstract superclass, but
-      // scaladsl is
-      // concrete types of request entities
-      "org.apache.pekko.http.scaladsl.model.HttpEntity$Strict",
-      "org.apache.pekko.http.scaladsl.model.HttpEntity$Default",
-      "org.apache.pekko.http.scaladsl.model.HttpEntity$Chunked",
-      // only impl
-      "org.apache.pekko.http.scaladsl.server.RequestContextImpl",
-    };
-  }
+    /**
+     * @see org.apache.pekko.http.scaladsl.model.HttpHeader
+     * @return the matching types
+     */
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.apache.pekko.http.javadsl.model.HttpHeader", // scaladsl versions extends
+            // javadsl.m.HttpHeader
+            "org.apache.pekko.http.scaladsl.model.Uri", // javadsl version wraps scaladsl version
+            "org.apache.pekko.http.scaladsl.model.HttpRequest", // javadsl is abstract superclass, but
+            // scaladsl is
+            // concrete types of request entities
+            "org.apache.pekko.http.scaladsl.model.HttpEntity$Strict",
+            "org.apache.pekko.http.scaladsl.model.HttpEntity$Default",
+            "org.apache.pekko.http.scaladsl.model.HttpEntity$Chunked",
+            // only impl
+            "org.apache.pekko.http.scaladsl.server.RequestContextImpl",
+        };
+    }
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new TaintableVisitor(knownMatchingTypes()));
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new TaintableVisitor(knownMatchingTypes()));
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MarshallingDirectivesInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MarshallingDirectivesInstrumentation.java
index 79f48df4b2a..57ec62258d8 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MarshallingDirectivesInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MarshallingDirectivesInstrumentation.java
@@ -28,71 +28,62 @@
  */
 @AutoService(InstrumenterModule.class)
 public class MarshallingDirectivesInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public MarshallingDirectivesInstrumentation() {
-    super("pekko-http");
-  }
+    public MarshallingDirectivesInstrumentation() {
+        super("pekko-http");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.apache.pekko.http.scaladsl.server.directives.MarshallingDirectives$class",
-      "org.apache.pekko.http.scaladsl.server.directives.MarshallingDirectives",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.apache.pekko.http.scaladsl.server.directives.MarshallingDirectives$class",
+            "org.apache.pekko.http.scaladsl.server.directives.MarshallingDirectives",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("entity"))
-            .and(returns(named("org.apache.pekko.http.scaladsl.server.Directive")))
-            .and(takesArguments(2))
-            .and(
-                takesArgument(
-                    0,
-                    named(
-                        "org.apache.pekko.http.scaladsl.server.directives.MarshallingDirectives")))
-            .and(
-                takesArgument(
-                    1, named("org.apache.pekko.http.scaladsl.unmarshalling.Unmarshaller"))),
-        MarshallingDirectivesInstrumentation.class.getName()
-            + "$TaintUnmarshallerInputOldScalaAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("entity"))
+                        .and(returns(named("org.apache.pekko.http.scaladsl.server.Directive")))
+                        .and(takesArguments(2))
+                        .and(takesArgument(
+                                0, named("org.apache.pekko.http.scaladsl.server.directives.MarshallingDirectives")))
+                        .and(takesArgument(1, named("org.apache.pekko.http.scaladsl.unmarshalling.Unmarshaller"))),
+                MarshallingDirectivesInstrumentation.class.getName() + "$TaintUnmarshallerInputOldScalaAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("entity"))
-            .and(returns(named("org.apache.pekko.http.scaladsl.server.Directive")))
-            .and(takesArguments(1))
-            .and(
-                takesArgument(
-                    1, named("org.apache.pekko.http.scaladsl.unmarshalling.Unmarshaller"))),
-        MarshallingDirectivesInstrumentation.class.getName()
-            + "$TaintUnmarshallerInputNewScalaAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("entity"))
+                        .and(returns(named("org.apache.pekko.http.scaladsl.server.Directive")))
+                        .and(takesArguments(1))
+                        .and(takesArgument(1, named("org.apache.pekko.http.scaladsl.unmarshalling.Unmarshaller"))),
+                MarshallingDirectivesInstrumentation.class.getName() + "$TaintUnmarshallerInputNewScalaAdvice");
+    }
 
-  static class TaintUnmarshallerInputOldScalaAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_BODY)
-    static void before(@Advice.Argument(readOnly = false, value = 1) Unmarshaller unmarshaller) {
-      PropagationModule mod = InstrumentationBridge.PROPAGATION;
-      if (mod != null) {
-        unmarshaller = new TaintUnmarshaller(mod, unmarshaller);
-      }
+    static class TaintUnmarshallerInputOldScalaAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_BODY)
+        static void before(@Advice.Argument(readOnly = false, value = 1) Unmarshaller unmarshaller) {
+            PropagationModule mod = InstrumentationBridge.PROPAGATION;
+            if (mod != null) {
+                unmarshaller = new TaintUnmarshaller(mod, unmarshaller);
+            }
+        }
     }
-  }
 
-  static class TaintUnmarshallerInputNewScalaAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_BODY)
-    static void before(@Advice.Argument(readOnly = false, value = 0) Unmarshaller unmarshaller) {
-      PropagationModule mod = InstrumentationBridge.PROPAGATION;
-      if (mod != null) {
-        unmarshaller = new TaintUnmarshaller(mod, unmarshaller);
-      }
+    static class TaintUnmarshallerInputNewScalaAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_BODY)
+        static void before(@Advice.Argument(readOnly = false, value = 0) Unmarshaller unmarshaller) {
+            PropagationModule mod = InstrumentationBridge.PROPAGATION;
+            if (mod != null) {
+                unmarshaller = new TaintUnmarshaller(mod, unmarshaller);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesImplInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesImplInstrumentation.java
index d0416a2c038..c3994804590 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesImplInstrumentation.java
@@ -21,77 +21,71 @@
 
 @AutoService(InstrumenterModule.class)
 public class ParameterDirectivesImplInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ParameterDirectivesImplInstrumentation() {
-    super("pekko-http");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ParameterDirectivesImplInstrumentation() {
+        super("pekko-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.http.scaladsl.server.directives.ParameterDirectives$Impl$";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.http.scaladsl.server.directives.ParameterDirectives$Impl$";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    // just so we can use assertInverse in the muzzle directive
-    return new Reference[] {new Reference.Builder(instrumentedType()).build()};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        // just so we can use assertInverse in the muzzle directive
+        return new Reference[] {new Reference.Builder(instrumentedType()).build()};
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("filter"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, String.class))
-            .and(
-                takesArgument(
-                    1, named("org.apache.pekko.http.scaladsl.unmarshalling.Unmarshaller")))
-            .and(returns(named("org.apache.pekko.http.scaladsl.server.Directive"))),
-        ParameterDirectivesImplInstrumentation.class.getName() + "$FilterAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("filter"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, String.class))
+                        .and(takesArgument(1, named("org.apache.pekko.http.scaladsl.unmarshalling.Unmarshaller")))
+                        .and(returns(named("org.apache.pekko.http.scaladsl.server.Directive"))),
+                ParameterDirectivesImplInstrumentation.class.getName() + "$FilterAdvice");
 
-    // requiredFilter not relevant
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("repeatedFilter"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, String.class))
-            .and(
-                takesArgument(
-                    1, named("org.apache.pekko.http.scaladsl.unmarshalling.Unmarshaller")))
-            .and(returns(named("org.apache.pekko.http.scaladsl.server.Directive"))),
-        ParameterDirectivesImplInstrumentation.class.getName() + "$RepeatedFilterAdvice");
-  }
+        // requiredFilter not relevant
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("repeatedFilter"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, String.class))
+                        .and(takesArgument(1, named("org.apache.pekko.http.scaladsl.unmarshalling.Unmarshaller")))
+                        .and(returns(named("org.apache.pekko.http.scaladsl.server.Directive"))),
+                ParameterDirectivesImplInstrumentation.class.getName() + "$RepeatedFilterAdvice");
+    }
 
-  static class FilterAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(
-        @Advice.Argument(0) String paramName,
-        @Advice.Return(readOnly = false) Directive /*<Tuple1<?>>*/ retval) {
-      try {
-        retval =
-            retval.tmap(new TaintParametersFunction(paramName), Tupler$.MODULE$.forTuple(null));
-      } catch (Exception e) {
-        throw new RuntimeException(e); // propagate so it's logged
-      }
+    static class FilterAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(
+                @Advice.Argument(0) String paramName,
+                @Advice.Return(readOnly = false) Directive /*<Tuple1<?>>*/ retval) {
+            try {
+                retval = retval.tmap(new TaintParametersFunction(paramName), Tupler$.MODULE$.forTuple(null));
+            } catch (Exception e) {
+                throw new RuntimeException(e); // propagate so it's logged
+            }
+        }
     }
-  }
 
-  static class RepeatedFilterAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(
-        @Advice.Argument(0) String paramName,
-        @Advice.Return(readOnly = false) Directive /*<Tuple1<Iterable<?>>>*/ retval) {
-      try {
-        retval =
-            retval.tmap(new TaintParametersFunction(paramName), Tupler$.MODULE$.forTuple(null));
-      } catch (Exception e) {
-        throw new RuntimeException(e); // propagate so it's logged
-      }
+    static class RepeatedFilterAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(
+                @Advice.Argument(0) String paramName,
+                @Advice.Return(readOnly = false) Directive /*<Tuple1<Iterable<?>>>*/ retval) {
+            try {
+                retval = retval.tmap(new TaintParametersFunction(paramName), Tupler$.MODULE$.forTuple(null));
+            } catch (Exception e) {
+                throw new RuntimeException(e); // propagate so it's logged
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesInstrumentation.java
index ab5e213cf5e..524627d6d27 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesInstrumentation.java
@@ -30,131 +30,122 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ParameterDirectivesInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  private static final String TRAIT_NAME =
-      "org.apache.pekko.http.scaladsl.server.directives.ParameterDirectives";
-
-  public ParameterDirectivesInstrumentation() {
-    super("pekko-http");
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      TRAIT_NAME + "$class", TRAIT_NAME,
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // the Java API delegates to the Scala API
-    transformDirective(transformer, "parameterMultiMap", "TaintMultiMapDirectiveAdvice");
-    transformDirective(transformer, "parameterMap", "TaintMapDirectiveAdvice");
-    transformDirective(transformer, "parameterSeq", "TaintSeqDirectiveAdvice");
-
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("parameter").or(named("parameters")))
-            .and(returns(Object.class))
-            .and(takesArguments(2))
-            .and(
-                takesArgument(
-                    0,
-                    named("org.apache.pekko.http.scaladsl.server.directives.ParameterDirectives")))
-            .and(
-                takesArgument(
-                    1,
-                    named(
-                        "org.apache.pekko.http.scaladsl.server.directives.ParameterDirectives$ParamMagnet"))),
-        ParameterDirectivesInstrumentation.class.getName()
-            + "$TaintSingleParameterDirectiveOldScalaAdvice");
-
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("parameter").or(named("parameters")))
-            .and(
-                returns(Object.class)
-                    .or(returns(named("org.apache.pekko.http.scaladsl.server.Directive"))))
-            .and(takesArguments(1))
-            .and(
-                takesArgument(
-                    0,
-                    named(
-                        "org.apache.pekko.http.scaladsl.server.directives.ParameterDirectives$ParamMagnet"))),
-        ParameterDirectivesInstrumentation.class.getName()
-            + "$TaintSingleParameterDirectiveNewScalaAdvice");
-  }
-
-  private void transformDirective(
-      MethodTransformer transformation, String methodName, String adviceClass) {
-    transformation.applyAdvice(
-        TraitMethodMatchers.isTraitDirectiveMethod(TRAIT_NAME, methodName),
-        ParameterDirectivesInstrumentation.class.getName() + "$" + adviceClass);
-  }
-
-  static class TaintMultiMapDirectiveAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(@Advice.Return(readOnly = false) Directive directive) {
-      directive = directive.tmap(TaintMultiMapFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    private static final String TRAIT_NAME = "org.apache.pekko.http.scaladsl.server.directives.ParameterDirectives";
+
+    public ParameterDirectivesInstrumentation() {
+        super("pekko-http");
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            TRAIT_NAME + "$class", TRAIT_NAME,
+        };
     }
-  }
 
-  static class TaintMapDirectiveAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(@Advice.Return(readOnly = false) Directive directive) {
-      directive = directive.tmap(TaintMapFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // the Java API delegates to the Scala API
+        transformDirective(transformer, "parameterMultiMap", "TaintMultiMapDirectiveAdvice");
+        transformDirective(transformer, "parameterMap", "TaintMapDirectiveAdvice");
+        transformDirective(transformer, "parameterSeq", "TaintSeqDirectiveAdvice");
+
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("parameter").or(named("parameters")))
+                        .and(returns(Object.class))
+                        .and(takesArguments(2))
+                        .and(takesArgument(
+                                0, named("org.apache.pekko.http.scaladsl.server.directives.ParameterDirectives")))
+                        .and(
+                                takesArgument(
+                                        1,
+                                        named(
+                                                "org.apache.pekko.http.scaladsl.server.directives.ParameterDirectives$ParamMagnet"))),
+                ParameterDirectivesInstrumentation.class.getName() + "$TaintSingleParameterDirectiveOldScalaAdvice");
+
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("parameter").or(named("parameters")))
+                        .and(returns(Object.class)
+                                .or(returns(named("org.apache.pekko.http.scaladsl.server.Directive"))))
+                        .and(takesArguments(1))
+                        .and(
+                                takesArgument(
+                                        0,
+                                        named(
+                                                "org.apache.pekko.http.scaladsl.server.directives.ParameterDirectives$ParamMagnet"))),
+                ParameterDirectivesInstrumentation.class.getName() + "$TaintSingleParameterDirectiveNewScalaAdvice");
     }
-  }
 
-  static class TaintSeqDirectiveAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(@Advice.Return(readOnly = false) Directive directive) {
-      directive = directive.tmap(TaintSeqFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+    private void transformDirective(MethodTransformer transformation, String methodName, String adviceClass) {
+        transformation.applyAdvice(
+                TraitMethodMatchers.isTraitDirectiveMethod(TRAIT_NAME, methodName),
+                ParameterDirectivesInstrumentation.class.getName() + "$" + adviceClass);
     }
-  }
-
-  static class TaintSingleParameterDirectiveOldScalaAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(
-        @Advice.Return(readOnly = false) Object retval,
-        @Advice.Argument(1) ParameterDirectives.ParamMagnet pmag) {
-      if (!(retval instanceof Directive)) {
-        return;
-      }
-
-      try {
-        retval =
-            ((Directive) retval)
-                .tmap(new TaintSingleParameterFunction<>(pmag), Tupler$.MODULE$.forTuple(null));
-      } catch (Exception e) {
-        throw new RuntimeException(e); // propagate so it's logged
-      }
+
+    static class TaintMultiMapDirectiveAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(@Advice.Return(readOnly = false) Directive directive) {
+            directive = directive.tmap(TaintMultiMapFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        }
+    }
+
+    static class TaintMapDirectiveAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(@Advice.Return(readOnly = false) Directive directive) {
+            directive = directive.tmap(TaintMapFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        }
     }
-  }
-
-  static class TaintSingleParameterDirectiveNewScalaAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(
-        @Advice.Return(readOnly = false) Object retval,
-        @Advice.Argument(0) ParameterDirectives.ParamMagnet pmag) {
-      if (!(retval instanceof Directive)) {
-        return;
-      }
-
-      try {
-        retval =
-            ((Directive) retval)
-                .tmap(new TaintSingleParameterFunction<>(pmag), Tupler$.MODULE$.forTuple(null));
-      } catch (Exception e) {
-        throw new RuntimeException(e); // propagate so it's logged
-      }
+
+    static class TaintSeqDirectiveAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(@Advice.Return(readOnly = false) Directive directive) {
+            directive = directive.tmap(TaintSeqFunction.INSTANCE, Tupler$.MODULE$.forTuple(null));
+        }
+    }
+
+    static class TaintSingleParameterDirectiveOldScalaAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(
+                @Advice.Return(readOnly = false) Object retval,
+                @Advice.Argument(1) ParameterDirectives.ParamMagnet pmag) {
+            if (!(retval instanceof Directive)) {
+                return;
+            }
+
+            try {
+                retval = ((Directive) retval)
+                        .tmap(new TaintSingleParameterFunction<>(pmag), Tupler$.MODULE$.forTuple(null));
+            } catch (Exception e) {
+                throw new RuntimeException(e); // propagate so it's logged
+            }
+        }
+    }
+
+    static class TaintSingleParameterDirectiveNewScalaAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(
+                @Advice.Return(readOnly = false) Object retval,
+                @Advice.Argument(0) ParameterDirectives.ParamMagnet pmag) {
+            if (!(retval instanceof Directive)) {
+                return;
+            }
+
+            try {
+                retval = ((Directive) retval)
+                        .tmap(new TaintSingleParameterFunction<>(pmag), Tupler$.MODULE$.forTuple(null));
+            } catch (Exception e) {
+                throw new RuntimeException(e); // propagate so it's logged
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/PathMatcherInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/PathMatcherInstrumentation.java
index 3fd5586ed8d..cd78709b34b 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/PathMatcherInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/PathMatcherInstrumentation.java
@@ -25,54 +25,53 @@
  */
 @AutoService(InstrumenterModule.class)
 public class PathMatcherInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public PathMatcherInstrumentation() {
-    super("pekko-http");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public PathMatcherInstrumentation() {
+        super("pekko-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.http.scaladsl.server.PathMatcher$Matched";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.http.scaladsl.server.PathMatcher$Matched";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("org.apache.pekko.http.scaladsl.model.Uri$Path")))
-            .and(takesArgument(1, Object.class))
-            .and(takesArgument(2, named("org.apache.pekko.http.scaladsl.server.util.Tuple"))),
-        PathMatcherInstrumentation.class.getName() + "$PathMatcherAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("org.apache.pekko.http.scaladsl.model.Uri$Path")))
+                        .and(takesArgument(1, Object.class))
+                        .and(takesArgument(2, named("org.apache.pekko.http.scaladsl.server.util.Tuple"))),
+                PathMatcherInstrumentation.class.getName() + "$PathMatcherAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  static class PathMatcherAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PATH_PARAMETER)
-    static void onExit(
-        @Advice.Argument(1) Object extractions, @ActiveRequestContext RequestContext reqCtx) {
-      if (!(extractions instanceof scala.Tuple1)) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    static class PathMatcherAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PATH_PARAMETER)
+        static void onExit(@Advice.Argument(1) Object extractions, @ActiveRequestContext RequestContext reqCtx) {
+            if (!(extractions instanceof scala.Tuple1)) {
+                return;
+            }
 
-      scala.Tuple1 tuple = (scala.Tuple1) extractions;
-      Object value = tuple._1();
+            scala.Tuple1 tuple = (scala.Tuple1) extractions;
+            Object value = tuple._1();
 
-      PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null || !(value instanceof String)) {
-        return;
-      }
-      final String stringValue = (String) value;
+            PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null || !(value instanceof String)) {
+                return;
+            }
+            final String stringValue = (String) value;
 
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
 
-      // in the test, 4 instances of PathMatcher$Match are created, all with the same value
-      if (module.isTainted(ctx, stringValue)) {
-        return;
-      }
+            // in the test, 4 instances of PathMatcher$Match are created, all with the same value
+            if (module.isTainted(ctx, stringValue)) {
+                return;
+            }
 
-      module.taintString(ctx, stringValue, SourceTypes.REQUEST_PATH_PARAMETER);
+            module.taintString(ctx, stringValue, SourceTypes.REQUEST_PATH_PARAMETER);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/RequestContextInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/RequestContextInstrumentation.java
index 3bf9af6d546..6fd0ddff625 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/RequestContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/RequestContextInstrumentation.java
@@ -24,48 +24,48 @@
 /** Propagates taint when fetching the {@link HttpRequest} from the {@link RequestContext}. */
 @AutoService(InstrumenterModule.class)
 public class RequestContextInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public RequestContextInstrumentation() {
-    super("pekko-http");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public RequestContextInstrumentation() {
+        super("pekko-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.http.scaladsl.server.RequestContextImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.http.scaladsl.server.RequestContextImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("request"))
-            .and(returns(named("org.apache.pekko.http.scaladsl.model.HttpRequest")))
-            .and(takesArguments(0)),
-        RequestContextInstrumentation.class.getName() + "$GetRequestAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("request"))
+                        .and(returns(named("org.apache.pekko.http.scaladsl.model.HttpRequest")))
+                        .and(takesArguments(0)),
+                RequestContextInstrumentation.class.getName() + "$GetRequestAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  static class GetRequestAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    static void onExit(
-        @Advice.This RequestContext requestContext,
-        @Advice.Return HttpRequest request,
-        @ActiveRequestContext datadog.trace.api.gateway.RequestContext reqCtx) {
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    static class GetRequestAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        static void onExit(
+                @Advice.This RequestContext requestContext,
+                @Advice.Return HttpRequest request,
+                @ActiveRequestContext datadog.trace.api.gateway.RequestContext reqCtx) {
 
-      PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation == null) {
-        return;
-      }
+            PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation == null) {
+                return;
+            }
 
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
 
-      if (propagation.isTainted(ctx, request)) {
-        return;
-      }
+            if (propagation.isTainted(ctx, request)) {
+                return;
+            }
 
-      propagation.taintObjectIfTainted(ctx, request, requestContext);
+            propagation.taintObjectIfTainted(ctx, request, requestContext);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/TraitMethodMatchers.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/TraitMethodMatchers.java
index abd2a1d5f25..031b6f7b393 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/TraitMethodMatchers.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/TraitMethodMatchers.java
@@ -12,24 +12,22 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class TraitMethodMatchers {
-  public static ElementMatcher.Junction<MethodDescription> isTraitDirectiveMethod(
-      String traitName, String name, String... argumentTypes) {
+    public static ElementMatcher.Junction<MethodDescription> isTraitDirectiveMethod(
+            String traitName, String name, String... argumentTypes) {
 
-    ElementMatcher.Junction<MethodDescription> scalaOldArgs =
-        isStatic()
-            .and(takesArguments(argumentTypes.length + 1))
-            .and(takesArgument(0, named(traitName)));
-    ElementMatcher.Junction<MethodDescription> scalaNewArgs =
-        not(isStatic()).and(takesArguments(argumentTypes.length));
+        ElementMatcher.Junction<MethodDescription> scalaOldArgs =
+                isStatic().and(takesArguments(argumentTypes.length + 1)).and(takesArgument(0, named(traitName)));
+        ElementMatcher.Junction<MethodDescription> scalaNewArgs =
+                not(isStatic()).and(takesArguments(argumentTypes.length));
 
-    for (int i = 0; i < argumentTypes.length; i++) {
-      scalaOldArgs = scalaOldArgs.and(takesArgument(i + 1, named(argumentTypes[i])));
-      scalaNewArgs = scalaNewArgs.and(takesArgument(i, named(argumentTypes[i])));
-    }
+        for (int i = 0; i < argumentTypes.length; i++) {
+            scalaOldArgs = scalaOldArgs.and(takesArgument(i + 1, named(argumentTypes[i])));
+            scalaNewArgs = scalaNewArgs.and(takesArgument(i, named(argumentTypes[i])));
+        }
 
-    return isMethod()
-        .and(named(name))
-        .and(returns(named("org.apache.pekko.http.scaladsl.server.Directive")))
-        .and(scalaOldArgs.or(scalaNewArgs));
-  }
+        return isMethod()
+                .and(named(name))
+                .and(returns(named("org.apache.pekko.http.scaladsl.server.Directive")))
+                .and(scalaOldArgs.or(scalaNewArgs));
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UnmarshallerInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UnmarshallerInstrumentation.java
index a0ff0cad720..753efc06e17 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UnmarshallerInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UnmarshallerInstrumentation.java
@@ -34,48 +34,48 @@
  */
 @AutoService(InstrumenterModule.class)
 public class UnmarshallerInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public UnmarshallerInstrumentation() {
-    super("pekko-http");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public UnmarshallerInstrumentation() {
+        super("pekko-http");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.apache.pekko.http.scaladsl.unmarshalling.Unmarshaller";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.apache.pekko.http.scaladsl.unmarshalling.Unmarshaller";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return nameStartsWith("org.apache.pekko.http.scaladsl.unmarshalling.")
-        .and(implementsInterface(named(hierarchyMarkerType())));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return nameStartsWith("org.apache.pekko.http.scaladsl.unmarshalling.")
+                .and(implementsInterface(named(hierarchyMarkerType())));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("apply"))
-            .and(returns(named("scala.concurrent.Future")))
-            .and(takesArguments(3))
-            .and(takesArgument(0, Object.class))
-            .and(takesArgument(1, named("scala.concurrent.ExecutionContext")))
-            .and(takesArgument(2, named("org.apache.pekko.stream.Materializer"))),
-        UnmarshallerInstrumentation.class.getName() + "$PropagateTaintOnApplyAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("apply"))
+                        .and(returns(named("scala.concurrent.Future")))
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, Object.class))
+                        .and(takesArgument(1, named("scala.concurrent.ExecutionContext")))
+                        .and(takesArgument(2, named("org.apache.pekko.stream.Materializer"))),
+                UnmarshallerInstrumentation.class.getName() + "$PropagateTaintOnApplyAdvice");
+    }
 
-  static class PropagateTaintOnApplyAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    static void after(
-        @Advice.Return(readOnly = false) Future<?> result,
-        @Advice.Argument(0) Object input,
-        @Advice.Argument(1) ExecutionContext ec) {
-      PropagationModule mod = InstrumentationBridge.PROPAGATION;
-      if (mod == null) {
-        return;
-      }
-      result = TaintFutureHelper.wrapFuture(result, input, mod, ec);
+    static class PropagateTaintOnApplyAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        static void after(
+                @Advice.Return(readOnly = false) Future<?> result,
+                @Advice.Argument(0) Object input,
+                @Advice.Argument(1) ExecutionContext ec) {
+            PropagationModule mod = InstrumentationBridge.PROPAGATION;
+            if (mod == null) {
+                return;
+            }
+            result = TaintFutureHelper.wrapFuture(result, input, mod, ec);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UriInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UriInstrumentation.java
index 4a7e23f08ca..9c4bd7d5f38 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UriInstrumentation.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UriInstrumentation.java
@@ -29,88 +29,88 @@
 /** Propagates taint from a {@link Uri} to query strings fetched from it. */
 @AutoService(InstrumenterModule.class)
 public class UriInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public UriInstrumentation() {
-    super("pekko-http");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public UriInstrumentation() {
+        super("pekko-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.pekko.http.scaladsl.model.Uri";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.pekko.http.scaladsl.model.Uri";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("queryString"))
-            .and(returns(named("scala.Option")))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("java.nio.charset.Charset"))),
-        UriInstrumentation.class.getName() + "$TaintQueryStringAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("rawQueryString"))
-            .and(returns(named("scala.Option")))
-            .and(takesArguments(0)),
-        UriInstrumentation.class.getName() + "$TaintQueryStringAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("query"))
-            .and(returns(named("org.apache.pekko.http.scaladsl.model.Uri$Query")))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("java.nio.charset.Charset")))
-            .and(takesArgument(1, named("org.apache.pekko.http.scaladsl.model.Uri$ParsingMode"))),
-        UriInstrumentation.class.getName() + "$TaintQueryAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("queryString"))
+                        .and(returns(named("scala.Option")))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("java.nio.charset.Charset"))),
+                UriInstrumentation.class.getName() + "$TaintQueryStringAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("rawQueryString"))
+                        .and(returns(named("scala.Option")))
+                        .and(takesArguments(0)),
+                UriInstrumentation.class.getName() + "$TaintQueryStringAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("query"))
+                        .and(returns(named("org.apache.pekko.http.scaladsl.model.Uri$Query")))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("java.nio.charset.Charset")))
+                        .and(takesArgument(1, named("org.apache.pekko.http.scaladsl.model.Uri$ParsingMode"))),
+                UriInstrumentation.class.getName() + "$TaintQueryAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  static class TaintQueryStringAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    static void after(
-        @Advice.This Uri uri,
-        @Advice.Return scala.Option<String> ret,
-        @ActiveRequestContext RequestContext reqCtx) {
-      PropagationModule mod = InstrumentationBridge.PROPAGATION;
-      if (mod == null || ret.isEmpty()) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      mod.taintStringIfTainted(ctx, ret.get(), uri);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    static class TaintQueryStringAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        static void after(
+                @Advice.This Uri uri,
+                @Advice.Return scala.Option<String> ret,
+                @ActiveRequestContext RequestContext reqCtx) {
+            PropagationModule mod = InstrumentationBridge.PROPAGATION;
+            if (mod == null || ret.isEmpty()) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            mod.taintStringIfTainted(ctx, ret.get(), uri);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class TaintQueryAdvice {
-    // bind uri to a variable of type Object so that this advice can also
-    // be used from FromDataInstrumentaton
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    static void after(
-        @Advice.This /*Uri*/ Object uri,
-        @Advice.Return Uri.Query ret,
-        @ActiveRequestContext RequestContext reqCtx) {
-      PropagationModule prop = InstrumentationBridge.PROPAGATION;
-      if (prop == null || ret.isEmpty()) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class TaintQueryAdvice {
+        // bind uri to a variable of type Object so that this advice can also
+        // be used from FromDataInstrumentaton
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        static void after(
+                @Advice.This /*Uri*/ Object uri,
+                @Advice.Return Uri.Query ret,
+                @ActiveRequestContext RequestContext reqCtx) {
+            PropagationModule prop = InstrumentationBridge.PROPAGATION;
+            if (prop == null || ret.isEmpty()) {
+                return;
+            }
 
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      if (!prop.isTainted(ctx, uri)) {
-        return;
-      }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            if (!prop.isTainted(ctx, uri)) {
+                return;
+            }
 
-      Iterator<Tuple2<String, String>> iterator = ret.iterator();
-      while (iterator.hasNext()) {
-        Tuple2<String, String> pair = iterator.next();
-        final String name = pair._1(), value = pair._2();
-        prop.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
-        prop.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
-      }
+            Iterator<Tuple2<String, String>> iterator = ret.iterator();
+            while (iterator.hasNext()) {
+                Tuple2<String, String> pair = iterator.next();
+                final String name = pair._1(), value = pair._2();
+                prop.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+                prop.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/ScalaToJava.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/ScalaToJava.java
index ea95e7fa946..8b4faf649c9 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/ScalaToJava.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/ScalaToJava.java
@@ -7,22 +7,22 @@
 
 // do not use JavaConverters, as they changed in an ABI-incompatible way in Scala 2.13
 public class ScalaToJava {
-  public static java.util.List<String> keySetAsCollection(Map<String, ?> m) {
-    scala.collection.immutable.Set<String> keys = m.keySet();
-    java.util.List<String> keysAsCollection = new ArrayList<>(keys.size());
-    Iterator<String> keysIterator = keys.iterator();
-    while (keysIterator.hasNext()) {
-      keysAsCollection.add(keysIterator.next());
+    public static java.util.List<String> keySetAsCollection(Map<String, ?> m) {
+        scala.collection.immutable.Set<String> keys = m.keySet();
+        java.util.List<String> keysAsCollection = new ArrayList<>(keys.size());
+        Iterator<String> keysIterator = keys.iterator();
+        while (keysIterator.hasNext()) {
+            keysAsCollection.add(keysIterator.next());
+        }
+        return keysAsCollection;
     }
-    return keysAsCollection;
-  }
 
-  public static <T> java.util.List<T> listAsList(List<T> l) {
-    java.util.List<T> asJavaList = new ArrayList<>(l.size());
-    Iterator<T> iterator = l.iterator();
-    while (iterator.hasNext()) {
-      asJavaList.add(iterator.next());
+    public static <T> java.util.List<T> listAsList(List<T> l) {
+        java.util.List<T> asJavaList = new ArrayList<>(l.size());
+        Iterator<T> iterator = l.iterator();
+        while (iterator.hasNext()) {
+            asJavaList.add(iterator.next());
+        }
+        return asJavaList;
     }
-    return asJavaList;
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintCookieFunction.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintCookieFunction.java
index bc3e83b493b..d20362f2fe4 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintCookieFunction.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintCookieFunction.java
@@ -9,26 +9,25 @@
 import scala.Tuple1;
 import scala.compat.java8.JFunction1;
 
-public class TaintCookieFunction
-    implements JFunction1<Tuple1<HttpCookiePair>, Tuple1<HttpCookiePair>> {
-  public static final TaintCookieFunction INSTANCE = new TaintCookieFunction();
+public class TaintCookieFunction implements JFunction1<Tuple1<HttpCookiePair>, Tuple1<HttpCookiePair>> {
+    public static final TaintCookieFunction INSTANCE = new TaintCookieFunction();
 
-  @Override
-  public Tuple1<HttpCookiePair> apply(Tuple1<HttpCookiePair> v1) {
-    HttpCookiePair httpCookiePair = v1._1();
+    @Override
+    public Tuple1<HttpCookiePair> apply(Tuple1<HttpCookiePair> v1) {
+        HttpCookiePair httpCookiePair = v1._1();
 
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null || httpCookiePair == null) {
-      return v1;
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
+        if (mod == null || httpCookiePair == null) {
+            return v1;
+        }
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        final String name = httpCookiePair.name();
+        final String value = httpCookiePair.value();
+        mod.taintString(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
+        mod.taintString(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
+        return v1;
     }
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    final String name = httpCookiePair.name();
-    final String value = httpCookiePair.value();
-    mod.taintString(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
-    mod.taintString(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
-    return v1;
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintFutureHelper.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintFutureHelper.java
index fe1459d632f..17777d2757a 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintFutureHelper.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintFutureHelper.java
@@ -8,16 +8,14 @@
 import scala.concurrent.Future;
 
 public class TaintFutureHelper {
-  public static <T> Future<T> wrapFuture(
-      Future<T> f, Object input, PropagationModule mod, ExecutionContext ec) {
-    JFunction1<T, T> mapf =
-        t -> {
-          IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-          if (ctx != null) {
-            mod.taintObjectIfTainted(ctx, t, input);
-          }
-          return t;
+    public static <T> Future<T> wrapFuture(Future<T> f, Object input, PropagationModule mod, ExecutionContext ec) {
+        JFunction1<T, T> mapf = t -> {
+            IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+            if (ctx != null) {
+                mod.taintObjectIfTainted(ctx, t, input);
+            }
+            return t;
         };
-    return f.map(mapf, ec);
-  }
+        return f.map(mapf, ec);
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintMapFunction.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintMapFunction.java
index aaf2b8ee79a..1b0c1249191 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintMapFunction.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintMapFunction.java
@@ -11,31 +11,30 @@
 import scala.collection.immutable.Map;
 import scala.compat.java8.JFunction1;
 
-public class TaintMapFunction
-    implements JFunction1<Tuple1<Map<String, String>>, Tuple1<Map<String, String>>> {
-  public static final TaintMapFunction INSTANCE = new TaintMapFunction();
+public class TaintMapFunction implements JFunction1<Tuple1<Map<String, String>>, Tuple1<Map<String, String>>> {
+    public static final TaintMapFunction INSTANCE = new TaintMapFunction();
 
-  @Override
-  public Tuple1<Map<String, String>> apply(Tuple1<Map<String, String>> v1) {
-    Map<String, String> m = v1._1;
+    @Override
+    public Tuple1<Map<String, String>> apply(Tuple1<Map<String, String>> v1) {
+        Map<String, String> m = v1._1;
 
-    PropagationModule prop = InstrumentationBridge.PROPAGATION;
-    if (prop == null || m == null || m.isEmpty()) {
-      return v1;
-    }
+        PropagationModule prop = InstrumentationBridge.PROPAGATION;
+        if (prop == null || m == null || m.isEmpty()) {
+            return v1;
+        }
 
-    final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    Iterator<Tuple2<String, String>> iterator = m.iterator();
-    while (iterator.hasNext()) {
-      Tuple2<String, String> e = iterator.next();
-      final String name = e._1(), value = e._2();
-      prop.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
-      prop.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
-    }
+        final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        Iterator<Tuple2<String, String>> iterator = m.iterator();
+        while (iterator.hasNext()) {
+            Tuple2<String, String> e = iterator.next();
+            final String name = e._1(), value = e._2();
+            prop.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+            prop.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+        }
 
-    return v1;
-  }
+        return v1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintMultiMapFunction.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintMultiMapFunction.java
index 58dcebd688b..ee4efb09111 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintMultiMapFunction.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintMultiMapFunction.java
@@ -13,33 +13,33 @@
 import scala.compat.java8.JFunction1;
 
 public class TaintMultiMapFunction
-    implements JFunction1<Tuple1<Map<String, List<String>>>, Tuple1<Map<String, List<String>>>> {
-  public static final TaintMultiMapFunction INSTANCE = new TaintMultiMapFunction();
+        implements JFunction1<Tuple1<Map<String, List<String>>>, Tuple1<Map<String, List<String>>>> {
+    public static final TaintMultiMapFunction INSTANCE = new TaintMultiMapFunction();
 
-  @Override
-  public Tuple1<Map<String, List<String>>> apply(Tuple1<Map<String, List<String>>> v1) {
-    Map<String, List<String>> m = v1._1;
+    @Override
+    public Tuple1<Map<String, List<String>>> apply(Tuple1<Map<String, List<String>>> v1) {
+        Map<String, List<String>> m = v1._1;
 
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null || m == null || m.isEmpty()) {
-      return v1;
-    }
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
+        if (mod == null || m == null || m.isEmpty()) {
+            return v1;
+        }
 
-    final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    Iterator<Tuple2<String, List<String>>> entriesIterator = m.iterator();
-    while (entriesIterator.hasNext()) {
-      Tuple2<String, List<String>> e = entriesIterator.next();
-      final String name = e._1();
-      mod.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
-      List<String> values = e._2();
-      for (final String value : ScalaToJava.listAsList(values)) {
-        mod.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
-      }
-    }
+        final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        Iterator<Tuple2<String, List<String>>> entriesIterator = m.iterator();
+        while (entriesIterator.hasNext()) {
+            Tuple2<String, List<String>> e = entriesIterator.next();
+            final String name = e._1();
+            mod.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+            List<String> values = e._2();
+            for (final String value : ScalaToJava.listAsList(values)) {
+                mod.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+            }
+        }
 
-    return v1;
-  }
+        return v1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintOptionalCookieFunction.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintOptionalCookieFunction.java
index a8b1569945c..1063c06f2a5 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintOptionalCookieFunction.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintOptionalCookieFunction.java
@@ -11,26 +11,26 @@
 import scala.compat.java8.JFunction1;
 
 public class TaintOptionalCookieFunction
-    implements JFunction1<Tuple1<Option<HttpCookiePair>>, Tuple1<Option<HttpCookiePair>>> {
-  public static final TaintOptionalCookieFunction INSTANCE = new TaintOptionalCookieFunction();
+        implements JFunction1<Tuple1<Option<HttpCookiePair>>, Tuple1<Option<HttpCookiePair>>> {
+    public static final TaintOptionalCookieFunction INSTANCE = new TaintOptionalCookieFunction();
 
-  @Override
-  public Tuple1<Option<HttpCookiePair>> apply(Tuple1<Option<HttpCookiePair>> v1) {
-    Option<HttpCookiePair> httpCookiePair = v1._1();
+    @Override
+    public Tuple1<Option<HttpCookiePair>> apply(Tuple1<Option<HttpCookiePair>> v1) {
+        Option<HttpCookiePair> httpCookiePair = v1._1();
 
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null || httpCookiePair.isEmpty()) {
-      return v1;
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
+        if (mod == null || httpCookiePair.isEmpty()) {
+            return v1;
+        }
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        final HttpCookiePair cookie = httpCookiePair.get();
+        final String name = cookie.name();
+        final String value = cookie.value();
+        mod.taintString(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
+        mod.taintString(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
+        return v1;
     }
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    final HttpCookiePair cookie = httpCookiePair.get();
-    final String name = cookie.name();
-    final String value = cookie.value();
-    mod.taintString(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
-    mod.taintString(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
-    return v1;
-  }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintParametersFunction.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintParametersFunction.java
index 1ae24ca9b3c..5e0098e7f3b 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintParametersFunction.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintParametersFunction.java
@@ -12,45 +12,45 @@
 import scala.collection.Iterator;
 
 public class TaintParametersFunction<T> implements Function1<Tuple1<T>, Tuple1<T>> {
-  private final String paramName;
+    private final String paramName;
 
-  public TaintParametersFunction(String paramName) {
-    this.paramName = paramName;
-  }
-
-  @Override
-  public Tuple1<T> apply(Tuple1<T> v1) {
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null) {
-      return v1;
+    public TaintParametersFunction(String paramName) {
+        this.paramName = paramName;
     }
 
-    Object value = v1._1();
-    if (value instanceof Option) {
-      Option<?> option = (Option<?>) value;
-      if (option.isEmpty()) {
-        return v1;
-      }
-      value = option.get();
-    }
+    @Override
+    public Tuple1<T> apply(Tuple1<T> v1) {
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
+        if (mod == null) {
+            return v1;
+        }
 
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
+        Object value = v1._1();
+        if (value instanceof Option) {
+            Option<?> option = (Option<?>) value;
+            if (option.isEmpty()) {
+                return v1;
+            }
+            value = option.get();
+        }
 
-    if (value instanceof Iterable) {
-      Iterator<?> iterator = ((Iterable<?>) value).iterator();
-      while (iterator.hasNext()) {
-        Object o = iterator.next();
-        if (o instanceof String) {
-          mod.taintString(ctx, (String) o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+
+        if (value instanceof Iterable) {
+            Iterator<?> iterator = ((Iterable<?>) value).iterator();
+            while (iterator.hasNext()) {
+                Object o = iterator.next();
+                if (o instanceof String) {
+                    mod.taintString(ctx, (String) o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
+                }
+            }
+        } else if (value instanceof String) {
+            mod.taintString(ctx, (String) value, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
         }
-      }
-    } else if (value instanceof String) {
-      mod.taintString(ctx, (String) value, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
-    }
 
-    return v1;
-  }
+        return v1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintRequestContextFunction.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintRequestContextFunction.java
index 7e1d0dda2e7..2cb1fcd2cc8 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintRequestContextFunction.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintRequestContextFunction.java
@@ -9,24 +9,23 @@
 import scala.Tuple1;
 import scala.compat.java8.JFunction1;
 
-public class TaintRequestContextFunction
-    implements JFunction1<Tuple1<RequestContext>, Tuple1<RequestContext>> {
-  public static final TaintRequestContextFunction INSTANCE = new TaintRequestContextFunction();
+public class TaintRequestContextFunction implements JFunction1<Tuple1<RequestContext>, Tuple1<RequestContext>> {
+    public static final TaintRequestContextFunction INSTANCE = new TaintRequestContextFunction();
 
-  @Override
-  public Tuple1<RequestContext> apply(Tuple1<RequestContext> v1) {
-    RequestContext reqCtx = v1._1();
+    @Override
+    public Tuple1<RequestContext> apply(Tuple1<RequestContext> v1) {
+        RequestContext reqCtx = v1._1();
 
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null) {
-      return v1;
-    }
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    mod.taintObject(ctx, reqCtx, SourceTypes.REQUEST_BODY);
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
+        if (mod == null) {
+            return v1;
+        }
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        mod.taintObject(ctx, reqCtx, SourceTypes.REQUEST_BODY);
 
-    return v1;
-  }
+        return v1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintRequestFunction.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintRequestFunction.java
index 15e9486efa3..6da75b64cc2 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintRequestFunction.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintRequestFunction.java
@@ -10,22 +10,22 @@
 import scala.compat.java8.JFunction1;
 
 public class TaintRequestFunction implements JFunction1<Tuple1<HttpRequest>, Tuple1<HttpRequest>> {
-  public static final TaintRequestFunction INSTANCE = new TaintRequestFunction();
+    public static final TaintRequestFunction INSTANCE = new TaintRequestFunction();
 
-  @Override
-  public Tuple1<HttpRequest> apply(Tuple1<HttpRequest> v1) {
-    HttpRequest httpRequest = v1._1();
+    @Override
+    public Tuple1<HttpRequest> apply(Tuple1<HttpRequest> v1) {
+        HttpRequest httpRequest = v1._1();
 
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null) {
-      return v1;
-    }
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    mod.taintObject(ctx, httpRequest, SourceTypes.REQUEST_BODY);
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
+        if (mod == null) {
+            return v1;
+        }
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        mod.taintObject(ctx, httpRequest, SourceTypes.REQUEST_BODY);
 
-    return v1;
-  }
+        return v1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintSeqFunction.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintSeqFunction.java
index dc49d4f5efc..2eb78cc7a7b 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintSeqFunction.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintSeqFunction.java
@@ -15,35 +15,34 @@
 import scala.compat.java8.JFunction1;
 
 public class TaintSeqFunction
-    implements JFunction1<
-        Tuple1<Seq<Tuple2<String, String>>>, Tuple1<Seq<Tuple2<String, String>>>> {
-  public static final TaintSeqFunction INSTANCE = new TaintSeqFunction();
+        implements JFunction1<Tuple1<Seq<Tuple2<String, String>>>, Tuple1<Seq<Tuple2<String, String>>>> {
+    public static final TaintSeqFunction INSTANCE = new TaintSeqFunction();
 
-  @Override
-  public Tuple1<Seq<Tuple2<String, String>>> apply(Tuple1<Seq<Tuple2<String, String>>> v1) {
-    Seq<Tuple2<String, String>> seq = v1._1;
+    @Override
+    public Tuple1<Seq<Tuple2<String, String>>> apply(Tuple1<Seq<Tuple2<String, String>>> v1) {
+        Seq<Tuple2<String, String>> seq = v1._1;
 
-    PropagationModule prop = InstrumentationBridge.PROPAGATION;
-    if (prop == null || seq == null || seq.isEmpty()) {
-      return v1;
-    }
+        PropagationModule prop = InstrumentationBridge.PROPAGATION;
+        if (prop == null || seq == null || seq.isEmpty()) {
+            return v1;
+        }
 
-    final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    Iterator<Tuple2<String, String>> iterator = seq.iterator();
-    Set<String> seenKeys = Collections.newSetFromMap(new IdentityHashMap<>());
-    while (iterator.hasNext()) {
-      Tuple2<String, String> t = iterator.next();
-      String name = t._1();
-      String value = t._2();
-      if (seenKeys.add(name)) {
-        prop.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
-      }
-      prop.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
-    }
+        final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        Iterator<Tuple2<String, String>> iterator = seq.iterator();
+        Set<String> seenKeys = Collections.newSetFromMap(new IdentityHashMap<>());
+        while (iterator.hasNext()) {
+            Tuple2<String, String> t = iterator.next();
+            String name = t._1();
+            String value = t._2();
+            if (seenKeys.add(name)) {
+                prop.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+            }
+            prop.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+        }
 
-    return v1;
-  }
+        return v1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintSingleParameterFunction.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintSingleParameterFunction.java
index 65c81805dd4..2331e82a17c 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintSingleParameterFunction.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintSingleParameterFunction.java
@@ -13,51 +13,50 @@
 import scala.collection.Iterator;
 import scala.compat.java8.JFunction1;
 
-public class TaintSingleParameterFunction<Magnet>
-    implements JFunction1<Tuple1<Object>, Tuple1<Object>> {
-  private final String paramName;
-
-  public TaintSingleParameterFunction(Magnet pmag) throws Exception {
-    Field value$1 = pmag.getClass().getDeclaredField("value$1");
-    value$1.setAccessible(true);
-    Object nameReceptacle = value$1.get(pmag);
-    Method nameMeth = nameReceptacle.getClass().getMethod("name");
-    paramName = (String) nameMeth.invoke(nameReceptacle);
-  }
-
-  @Override
-  public Tuple1<Object> apply(Tuple1<Object> v1) {
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null || v1 == null) {
-      return v1;
+public class TaintSingleParameterFunction<Magnet> implements JFunction1<Tuple1<Object>, Tuple1<Object>> {
+    private final String paramName;
+
+    public TaintSingleParameterFunction(Magnet pmag) throws Exception {
+        Field value$1 = pmag.getClass().getDeclaredField("value$1");
+        value$1.setAccessible(true);
+        Object nameReceptacle = value$1.get(pmag);
+        Method nameMeth = nameReceptacle.getClass().getMethod("name");
+        paramName = (String) nameMeth.invoke(nameReceptacle);
     }
 
-    Object value = v1._1();
-    if (value instanceof Option) {
-      Option<?> option = (Option<?>) value;
-      if (option.isEmpty()) {
-        return v1;
-      }
-      value = option.get();
-    }
+    @Override
+    public Tuple1<Object> apply(Tuple1<Object> v1) {
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
+        if (mod == null || v1 == null) {
+            return v1;
+        }
 
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
+        Object value = v1._1();
+        if (value instanceof Option) {
+            Option<?> option = (Option<?>) value;
+            if (option.isEmpty()) {
+                return v1;
+            }
+            value = option.get();
+        }
 
-    if (value instanceof Iterable) {
-      Iterator<?> iterator = ((Iterable<?>) value).iterator();
-      while (iterator.hasNext()) {
-        Object o = iterator.next();
-        if (o instanceof String) {
-          mod.taintString(ctx, (String) o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+
+        if (value instanceof Iterable) {
+            Iterator<?> iterator = ((Iterable<?>) value).iterator();
+            while (iterator.hasNext()) {
+                Object o = iterator.next();
+                if (o instanceof String) {
+                    mod.taintString(ctx, (String) o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
+                }
+            }
+        } else if (value instanceof String) {
+            mod.taintString(ctx, (String) value, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
         }
-      }
-    } else if (value instanceof String) {
-      mod.taintString(ctx, (String) value, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
-    }
 
-    return v1;
-  }
+        return v1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintUnmarshaller.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintUnmarshaller.java
index 17fa5a8fa7c..d5be4787822 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintUnmarshaller.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintUnmarshaller.java
@@ -20,53 +20,53 @@
  * @see UnmarshallerInstrumentation
  */
 public class TaintUnmarshaller<A, B> implements Unmarshaller<A, B> {
-  private final PropagationModule propagationModule;
-  private final Unmarshaller<A, B> delegate;
+    private final PropagationModule propagationModule;
+    private final Unmarshaller<A, B> delegate;
 
-  public TaintUnmarshaller(PropagationModule propagationModule, Unmarshaller<A, B> delegate) {
-    this.propagationModule = propagationModule;
-    this.delegate = delegate;
-  }
+    public TaintUnmarshaller(PropagationModule propagationModule, Unmarshaller<A, B> delegate) {
+        this.propagationModule = propagationModule;
+        this.delegate = delegate;
+    }
 
-  @Override
-  public Future<B> apply(A value, ExecutionContext ec, Materializer materializer) {
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx != null) {
-      propagationModule.taintObject(ctx, value, SourceTypes.REQUEST_BODY);
+    @Override
+    public Future<B> apply(A value, ExecutionContext ec, Materializer materializer) {
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx != null) {
+            propagationModule.taintObject(ctx, value, SourceTypes.REQUEST_BODY);
+        }
+        return delegate.apply(value, ec, materializer);
     }
-    return delegate.apply(value, ec, materializer);
-  }
 
-  @Override
-  public <C> Unmarshaller<A, C> transform(
-      Function1<ExecutionContext, Function1<Materializer, Function1<Future<B>, Future<C>>>> f) {
-    return delegate.transform(f);
-  }
+    @Override
+    public <C> Unmarshaller<A, C> transform(
+            Function1<ExecutionContext, Function1<Materializer, Function1<Future<B>, Future<C>>>> f) {
+        return delegate.transform(f);
+    }
 
-  @Override
-  public <C> Unmarshaller<A, C> map(Function1<B, C> f) {
-    return delegate.map(f);
-  }
+    @Override
+    public <C> Unmarshaller<A, C> map(Function1<B, C> f) {
+        return delegate.map(f);
+    }
 
-  @Override
-  public <C> Unmarshaller<A, C> flatMap(
-      Function1<ExecutionContext, Function1<Materializer, Function1<B, Future<C>>>> f) {
-    return delegate.flatMap(f);
-  }
+    @Override
+    public <C> Unmarshaller<A, C> flatMap(
+            Function1<ExecutionContext, Function1<Materializer, Function1<B, Future<C>>>> f) {
+        return delegate.flatMap(f);
+    }
 
-  @Override
-  public <C> Unmarshaller<A, C> recover(
-      Function1<ExecutionContext, Function1<Materializer, PartialFunction<Throwable, C>>> pf) {
-    return delegate.recover(pf);
-  }
+    @Override
+    public <C> Unmarshaller<A, C> recover(
+            Function1<ExecutionContext, Function1<Materializer, PartialFunction<Throwable, C>>> pf) {
+        return delegate.recover(pf);
+    }
 
-  @Override
-  public <BB> Unmarshaller<A, BB> withDefaultValue(BB defaultValue) {
-    return delegate.withDefaultValue(defaultValue);
-  }
+    @Override
+    public <BB> Unmarshaller<A, BB> withDefaultValue(BB defaultValue) {
+        return delegate.withDefaultValue(defaultValue);
+    }
 
-  @Override
-  public Unmarshaller<A, B> asScala() {
-    return this;
-  }
+    @Override
+    public Unmarshaller<A, B> asScala() {
+        return this;
+    }
 }
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintUriFunction.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintUriFunction.java
index 799602c9833..265e6c3dde2 100644
--- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintUriFunction.java
+++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/helpers/TaintUriFunction.java
@@ -10,22 +10,22 @@
 import scala.compat.java8.JFunction1;
 
 public class TaintUriFunction implements JFunction1<Tuple1<Uri>, Tuple1<Uri>> {
-  public static final TaintUriFunction INSTANCE = new TaintUriFunction();
+    public static final TaintUriFunction INSTANCE = new TaintUriFunction();
 
-  @Override
-  public Tuple1<Uri> apply(Tuple1<Uri> v1) {
-    Uri uri = v1._1();
+    @Override
+    public Tuple1<Uri> apply(Tuple1<Uri> v1) {
+        Uri uri = v1._1();
 
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
-    if (mod == null) {
-      return v1;
-    }
-    IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-    if (ctx == null) {
-      return v1;
-    }
-    mod.taintObject(ctx, uri, SourceTypes.REQUEST_QUERY);
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
+        if (mod == null) {
+            return v1;
+        }
+        IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+        if (ctx == null) {
+            return v1;
+        }
+        mod.taintObject(ctx, uri, SourceTypes.REQUEST_QUERY);
 
-    return v1;
-  }
+        return v1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/AsyncHandlerWrapper.java b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/AsyncHandlerWrapper.java
index 1bad523acae..fc975005295 100644
--- a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/AsyncHandlerWrapper.java
+++ b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/AsyncHandlerWrapper.java
@@ -12,67 +12,67 @@
 import play.shaded.ahc.org.asynchttpclient.Response;
 
 public class AsyncHandlerWrapper implements AsyncHandler {
-  private final AsyncHandler delegate;
-  private final AgentSpan span;
-  private final ContextContinuation continuation;
+    private final AsyncHandler delegate;
+    private final AgentSpan span;
+    private final ContextContinuation continuation;
 
-  private final Response.ResponseBuilder builder = new Response.ResponseBuilder();
+    private final Response.ResponseBuilder builder = new Response.ResponseBuilder();
 
-  public AsyncHandlerWrapper(final AsyncHandler delegate, final AgentSpan span) {
-    this.delegate = delegate;
-    this.span = span;
-    this.continuation = span.captureWithContext();
-  }
-
-  @Override
-  public State onBodyPartReceived(final HttpResponseBodyPart content) throws Exception {
-    builder.accumulate(content);
-    return delegate.onBodyPartReceived(content);
-  }
+    public AsyncHandlerWrapper(final AsyncHandler delegate, final AgentSpan span) {
+        this.delegate = delegate;
+        this.span = span;
+        this.continuation = span.captureWithContext();
+    }
 
-  @Override
-  public State onStatusReceived(final HttpResponseStatus status) throws Exception {
-    builder.reset();
-    builder.accumulate(status);
-    return delegate.onStatusReceived(status);
-  }
+    @Override
+    public State onBodyPartReceived(final HttpResponseBodyPart content) throws Exception {
+        builder.accumulate(content);
+        return delegate.onBodyPartReceived(content);
+    }
 
-  @Override
-  public State onHeadersReceived(final HttpResponseHeaders httpHeaders) throws Exception {
-    builder.accumulate(httpHeaders);
-    return delegate.onHeadersReceived(httpHeaders);
-  }
+    @Override
+    public State onStatusReceived(final HttpResponseStatus status) throws Exception {
+        builder.reset();
+        builder.accumulate(status);
+        return delegate.onStatusReceived(status);
+    }
 
-  @Override
-  public Object onCompleted() throws Exception {
-    final Response response = builder.build();
-    if (response != null) {
-      DECORATE.onResponse(span, response);
+    @Override
+    public State onHeadersReceived(final HttpResponseHeaders httpHeaders) throws Exception {
+        builder.accumulate(httpHeaders);
+        return delegate.onHeadersReceived(httpHeaders);
     }
-    DECORATE.beforeFinish(span);
-    span.finish();
 
-    if (continuation != null) {
-      try (final ContextScope scope = continuation.resume()) {
-        return delegate.onCompleted();
-      }
-    } else {
-      return delegate.onCompleted();
+    @Override
+    public Object onCompleted() throws Exception {
+        final Response response = builder.build();
+        if (response != null) {
+            DECORATE.onResponse(span, response);
+        }
+        DECORATE.beforeFinish(span);
+        span.finish();
+
+        if (continuation != null) {
+            try (final ContextScope scope = continuation.resume()) {
+                return delegate.onCompleted();
+            }
+        } else {
+            return delegate.onCompleted();
+        }
     }
-  }
 
-  @Override
-  public void onThrowable(final Throwable throwable) {
-    DECORATE.onError(span, throwable);
-    DECORATE.beforeFinish(span);
-    span.finish();
+    @Override
+    public void onThrowable(final Throwable throwable) {
+        DECORATE.onError(span, throwable);
+        DECORATE.beforeFinish(span);
+        span.finish();
 
-    if (continuation != null) {
-      try (final ContextScope scope = continuation.resume()) {
-        delegate.onThrowable(throwable);
-      }
-    } else {
-      delegate.onThrowable(throwable);
+        if (continuation != null) {
+            try (final ContextScope scope = continuation.resume()) {
+                delegate.onThrowable(throwable);
+            }
+        } else {
+            delegate.onThrowable(throwable);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/PlayWSClientInstrumentation.java b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/PlayWSClientInstrumentation.java
index 9f53b1fccc1..31a60459173 100644
--- a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/PlayWSClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/PlayWSClientInstrumentation.java
@@ -18,42 +18,42 @@
 
 @AutoService(InstrumenterModule.class)
 public class PlayWSClientInstrumentation extends BasePlayWSClientInstrumentation {
-  public static class ClientAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.Argument(0) final Request request,
-        @Advice.Argument(value = 1, readOnly = false) AsyncHandler asyncHandler) {
-
-      final AgentSpan span = startSpan("play-ws", PLAY_WS_REQUEST);
-
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, request);
-
-      if (asyncHandler instanceof StreamedAsyncHandler) {
-        asyncHandler = new StreamedAsyncHandlerWrapper((StreamedAsyncHandler) asyncHandler, span);
-      } else if (!(asyncHandler instanceof WebSocketUpgradeHandler)) {
-        // websocket upgrade handlers aren't supported
-        asyncHandler = new AsyncHandlerWrapper(asyncHandler, span);
-      }
-
-      return span.attachWithContext();
-    }
-
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      if (throwable != null) {
-        final AgentSpan span = spanFromContext(scope.context());
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
+    public static class ClientAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.Argument(0) final Request request,
+                @Advice.Argument(value = 1, readOnly = false) AsyncHandler asyncHandler) {
+
+            final AgentSpan span = startSpan("play-ws", PLAY_WS_REQUEST);
+
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, request);
+
+            if (asyncHandler instanceof StreamedAsyncHandler) {
+                asyncHandler = new StreamedAsyncHandlerWrapper((StreamedAsyncHandler) asyncHandler, span);
+            } else if (!(asyncHandler instanceof WebSocketUpgradeHandler)) {
+                // websocket upgrade handlers aren't supported
+                asyncHandler = new AsyncHandlerWrapper(asyncHandler, span);
+            }
+
+            return span.attachWithContext();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            if (throwable != null) {
+                final AgentSpan span = spanFromContext(scope.context());
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/StreamedAsyncHandlerWrapper.java b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/StreamedAsyncHandlerWrapper.java
index da10db2a428..50c02dc671a 100644
--- a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/StreamedAsyncHandlerWrapper.java
+++ b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/StreamedAsyncHandlerWrapper.java
@@ -4,17 +4,16 @@
 import org.reactivestreams.Publisher;
 import play.shaded.ahc.org.asynchttpclient.handler.StreamedAsyncHandler;
 
-public class StreamedAsyncHandlerWrapper extends AsyncHandlerWrapper
-    implements StreamedAsyncHandler {
-  private final StreamedAsyncHandler streamedDelegate;
+public class StreamedAsyncHandlerWrapper extends AsyncHandlerWrapper implements StreamedAsyncHandler {
+    private final StreamedAsyncHandler streamedDelegate;
 
-  public StreamedAsyncHandlerWrapper(final StreamedAsyncHandler delegate, final AgentSpan span) {
-    super(delegate, span);
-    streamedDelegate = delegate;
-  }
+    public StreamedAsyncHandlerWrapper(final StreamedAsyncHandler delegate, final AgentSpan span) {
+        super(delegate, span);
+        streamedDelegate = delegate;
+    }
 
-  @Override
-  public State onStream(final Publisher publisher) {
-    return streamedDelegate.onStream(publisher);
-  }
+    @Override
+    public State onStream(final Publisher publisher) {
+        return streamedDelegate.onStream(publisher);
+    }
 }
diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/AsyncHandlerWrapper.java b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/AsyncHandlerWrapper.java
index 4cb2362c2fe..2c0eff44d3b 100644
--- a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/AsyncHandlerWrapper.java
+++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/AsyncHandlerWrapper.java
@@ -16,142 +16,142 @@
 import play.shaded.ahc.org.asynchttpclient.netty.request.NettyRequest;
 
 public class AsyncHandlerWrapper implements AsyncHandler {
-  private final AsyncHandler delegate;
-  private final AgentSpan span;
-  private final ContextContinuation continuation;
-
-  private final Response.ResponseBuilder builder = new Response.ResponseBuilder();
-
-  public AsyncHandlerWrapper(final AsyncHandler delegate, final AgentSpan span) {
-    this.delegate = delegate;
-    this.span = span;
-    this.continuation = span.captureWithContext();
-  }
-
-  @Override
-  public State onBodyPartReceived(final HttpResponseBodyPart content) throws Exception {
-    builder.accumulate(content);
-    return delegate.onBodyPartReceived(content);
-  }
-
-  @Override
-  public State onStatusReceived(final HttpResponseStatus status) throws Exception {
-    builder.reset();
-    builder.accumulate(status);
-    return delegate.onStatusReceived(status);
-  }
-
-  @Override
-  public State onHeadersReceived(final HttpHeaders httpHeaders) throws Exception {
-    builder.accumulate(httpHeaders);
-    return delegate.onHeadersReceived(httpHeaders);
-  }
-
-  @Override
-  public Object onCompleted() throws Exception {
-    final Response response = builder.build();
-    if (response != null) {
-      DECORATE.onResponse(span, response);
-    }
-    DECORATE.beforeFinish(span);
-    span.finish();
-
-    if (continuation != null) {
-      try (final ContextScope scope = continuation.resume()) {
-        return delegate.onCompleted();
-      }
-    } else {
-      return delegate.onCompleted();
-    }
-  }
-
-  @Override
-  public void onThrowable(final Throwable throwable) {
-    DECORATE.onError(span, throwable);
-    DECORATE.beforeFinish(span);
-    span.finish();
-
-    if (continuation != null) {
-      try (final ContextScope scope = continuation.resume()) {
-        delegate.onThrowable(throwable);
-      }
-    } else {
-      delegate.onThrowable(throwable);
-    }
-  }
-
-  @Override
-  public State onTrailingHeadersReceived(final HttpHeaders headers) throws Exception {
-    return delegate.onTrailingHeadersReceived(headers);
-  }
-
-  @Override
-  public void onHostnameResolutionAttempt(final String name) {
-    delegate.onHostnameResolutionAttempt(name);
-  }
-
-  @Override
-  public void onHostnameResolutionSuccess(final String name, final List list) {
-    delegate.onHostnameResolutionSuccess(name, list);
-  }
-
-  @Override
-  public void onHostnameResolutionFailure(final String name, final Throwable cause) {
-    delegate.onHostnameResolutionFailure(name, cause);
-  }
-
-  @Override
-  public void onTcpConnectAttempt(final InetSocketAddress remoteAddress) {
-    delegate.onTcpConnectAttempt(remoteAddress);
-  }
-
-  @Override
-  public void onTcpConnectSuccess(final InetSocketAddress remoteAddress, final Channel connection) {
-    delegate.onTcpConnectSuccess(remoteAddress, connection);
-  }
-
-  @Override
-  public void onTcpConnectFailure(final InetSocketAddress remoteAddress, final Throwable cause) {
-    delegate.onTcpConnectFailure(remoteAddress, cause);
-  }
-
-  @Override
-  public void onTlsHandshakeAttempt() {
-    delegate.onTlsHandshakeAttempt();
-  }
-
-  @Override
-  public void onTlsHandshakeSuccess() {
-    delegate.onTlsHandshakeSuccess();
-  }
-
-  @Override
-  public void onTlsHandshakeFailure(final Throwable cause) {
-    delegate.onTlsHandshakeFailure(cause);
-  }
-
-  @Override
-  public void onConnectionPoolAttempt() {
-    delegate.onConnectionPoolAttempt();
-  }
-
-  @Override
-  public void onConnectionPooled(final Channel connection) {
-    delegate.onConnectionPooled(connection);
-  }
-
-  @Override
-  public void onConnectionOffer(final Channel connection) {
-    delegate.onConnectionOffer(connection);
-  }
-
-  @Override
-  public void onRequestSend(final NettyRequest request) {
-    delegate.onRequestSend(request);
-  }
-
-  @Override
-  public void onRetry() {
-    delegate.onRetry();
-  }
+    private final AsyncHandler delegate;
+    private final AgentSpan span;
+    private final ContextContinuation continuation;
+
+    private final Response.ResponseBuilder builder = new Response.ResponseBuilder();
+
+    public AsyncHandlerWrapper(final AsyncHandler delegate, final AgentSpan span) {
+        this.delegate = delegate;
+        this.span = span;
+        this.continuation = span.captureWithContext();
+    }
+
+    @Override
+    public State onBodyPartReceived(final HttpResponseBodyPart content) throws Exception {
+        builder.accumulate(content);
+        return delegate.onBodyPartReceived(content);
+    }
+
+    @Override
+    public State onStatusReceived(final HttpResponseStatus status) throws Exception {
+        builder.reset();
+        builder.accumulate(status);
+        return delegate.onStatusReceived(status);
+    }
+
+    @Override
+    public State onHeadersReceived(final HttpHeaders httpHeaders) throws Exception {
+        builder.accumulate(httpHeaders);
+        return delegate.onHeadersReceived(httpHeaders);
+    }
+
+    @Override
+    public Object onCompleted() throws Exception {
+        final Response response = builder.build();
+        if (response != null) {
+            DECORATE.onResponse(span, response);
+        }
+        DECORATE.beforeFinish(span);
+        span.finish();
+
+        if (continuation != null) {
+            try (final ContextScope scope = continuation.resume()) {
+                return delegate.onCompleted();
+            }
+        } else {
+            return delegate.onCompleted();
+        }
+    }
+
+    @Override
+    public void onThrowable(final Throwable throwable) {
+        DECORATE.onError(span, throwable);
+        DECORATE.beforeFinish(span);
+        span.finish();
+
+        if (continuation != null) {
+            try (final ContextScope scope = continuation.resume()) {
+                delegate.onThrowable(throwable);
+            }
+        } else {
+            delegate.onThrowable(throwable);
+        }
+    }
+
+    @Override
+    public State onTrailingHeadersReceived(final HttpHeaders headers) throws Exception {
+        return delegate.onTrailingHeadersReceived(headers);
+    }
+
+    @Override
+    public void onHostnameResolutionAttempt(final String name) {
+        delegate.onHostnameResolutionAttempt(name);
+    }
+
+    @Override
+    public void onHostnameResolutionSuccess(final String name, final List list) {
+        delegate.onHostnameResolutionSuccess(name, list);
+    }
+
+    @Override
+    public void onHostnameResolutionFailure(final String name, final Throwable cause) {
+        delegate.onHostnameResolutionFailure(name, cause);
+    }
+
+    @Override
+    public void onTcpConnectAttempt(final InetSocketAddress remoteAddress) {
+        delegate.onTcpConnectAttempt(remoteAddress);
+    }
+
+    @Override
+    public void onTcpConnectSuccess(final InetSocketAddress remoteAddress, final Channel connection) {
+        delegate.onTcpConnectSuccess(remoteAddress, connection);
+    }
+
+    @Override
+    public void onTcpConnectFailure(final InetSocketAddress remoteAddress, final Throwable cause) {
+        delegate.onTcpConnectFailure(remoteAddress, cause);
+    }
+
+    @Override
+    public void onTlsHandshakeAttempt() {
+        delegate.onTlsHandshakeAttempt();
+    }
+
+    @Override
+    public void onTlsHandshakeSuccess() {
+        delegate.onTlsHandshakeSuccess();
+    }
+
+    @Override
+    public void onTlsHandshakeFailure(final Throwable cause) {
+        delegate.onTlsHandshakeFailure(cause);
+    }
+
+    @Override
+    public void onConnectionPoolAttempt() {
+        delegate.onConnectionPoolAttempt();
+    }
+
+    @Override
+    public void onConnectionPooled(final Channel connection) {
+        delegate.onConnectionPooled(connection);
+    }
+
+    @Override
+    public void onConnectionOffer(final Channel connection) {
+        delegate.onConnectionOffer(connection);
+    }
+
+    @Override
+    public void onRequestSend(final NettyRequest request) {
+        delegate.onRequestSend(request);
+    }
+
+    @Override
+    public void onRetry() {
+        delegate.onRetry();
+    }
 }
diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/PlayWSClientInstrumentation.java b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/PlayWSClientInstrumentation.java
index 1adf651e7e6..bd3f6739da6 100644
--- a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/PlayWSClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/PlayWSClientInstrumentation.java
@@ -18,42 +18,42 @@
 
 @AutoService(InstrumenterModule.class)
 public class PlayWSClientInstrumentation extends BasePlayWSClientInstrumentation {
-  public static class ClientAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.Argument(0) final Request request,
-        @Advice.Argument(value = 1, readOnly = false) AsyncHandler asyncHandler) {
-
-      final AgentSpan span = startSpan("play-ws", PLAY_WS_REQUEST);
-
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, request);
-
-      if (asyncHandler instanceof StreamedAsyncHandler) {
-        asyncHandler = new StreamedAsyncHandlerWrapper((StreamedAsyncHandler) asyncHandler, span);
-      } else if (!(asyncHandler instanceof WebSocketUpgradeHandler)) {
-        // websocket upgrade handlers aren't supported
-        asyncHandler = new AsyncHandlerWrapper(asyncHandler, span);
-      }
-
-      return span.attachWithContext();
-    }
-
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      if (throwable != null) {
-        final AgentSpan span = spanFromContext(scope.context());
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
+    public static class ClientAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.Argument(0) final Request request,
+                @Advice.Argument(value = 1, readOnly = false) AsyncHandler asyncHandler) {
+
+            final AgentSpan span = startSpan("play-ws", PLAY_WS_REQUEST);
+
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, request);
+
+            if (asyncHandler instanceof StreamedAsyncHandler) {
+                asyncHandler = new StreamedAsyncHandlerWrapper((StreamedAsyncHandler) asyncHandler, span);
+            } else if (!(asyncHandler instanceof WebSocketUpgradeHandler)) {
+                // websocket upgrade handlers aren't supported
+                asyncHandler = new AsyncHandlerWrapper(asyncHandler, span);
+            }
+
+            return span.attachWithContext();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            if (throwable != null) {
+                final AgentSpan span = spanFromContext(scope.context());
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/StreamedAsyncHandlerWrapper.java b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/StreamedAsyncHandlerWrapper.java
index d4861367f14..f19a0a4772c 100644
--- a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/StreamedAsyncHandlerWrapper.java
+++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/StreamedAsyncHandlerWrapper.java
@@ -4,17 +4,16 @@
 import org.reactivestreams.Publisher;
 import play.shaded.ahc.org.asynchttpclient.handler.StreamedAsyncHandler;
 
-public class StreamedAsyncHandlerWrapper extends AsyncHandlerWrapper
-    implements StreamedAsyncHandler {
-  private final StreamedAsyncHandler streamedDelegate;
+public class StreamedAsyncHandlerWrapper extends AsyncHandlerWrapper implements StreamedAsyncHandler {
+    private final StreamedAsyncHandler streamedDelegate;
 
-  public StreamedAsyncHandlerWrapper(final StreamedAsyncHandler delegate, final AgentSpan span) {
-    super(delegate, span);
-    streamedDelegate = delegate;
-  }
+    public StreamedAsyncHandlerWrapper(final StreamedAsyncHandler delegate, final AgentSpan span) {
+        super(delegate, span);
+        streamedDelegate = delegate;
+    }
 
-  @Override
-  public State onStream(final Publisher publisher) {
-    return streamedDelegate.onStream(publisher);
-  }
+    @Override
+    public State onStream(final Publisher publisher) {
+        return streamedDelegate.onStream(publisher);
+    }
 }
diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/AsyncHandlerWrapper.java b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/AsyncHandlerWrapper.java
index a2f3810b82b..e289d40ce9c 100644
--- a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/AsyncHandlerWrapper.java
+++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/AsyncHandlerWrapper.java
@@ -17,142 +17,142 @@
 import play.shaded.ahc.org.asynchttpclient.netty.request.NettyRequest;
 
 public class AsyncHandlerWrapper implements AsyncHandler {
-  private final AsyncHandler delegate;
-  private final AgentSpan span;
-  private final ContextContinuation continuation;
-
-  private final Response.ResponseBuilder builder = new Response.ResponseBuilder();
-
-  public AsyncHandlerWrapper(final AsyncHandler delegate, final AgentSpan span) {
-    this.delegate = delegate;
-    this.span = span;
-    this.continuation = span.captureWithContext();
-  }
-
-  @Override
-  public State onBodyPartReceived(final HttpResponseBodyPart content) throws Exception {
-    builder.accumulate(content);
-    return delegate.onBodyPartReceived(content);
-  }
-
-  @Override
-  public State onStatusReceived(final HttpResponseStatus status) throws Exception {
-    builder.reset();
-    builder.accumulate(status);
-    return delegate.onStatusReceived(status);
-  }
-
-  @Override
-  public State onHeadersReceived(final HttpHeaders httpHeaders) throws Exception {
-    builder.accumulate(httpHeaders);
-    return delegate.onHeadersReceived(httpHeaders);
-  }
-
-  @Override
-  public Object onCompleted() throws Exception {
-    final Response response = builder.build();
-    if (response != null) {
-      DECORATE.onResponse(span, response);
-    }
-    DECORATE.beforeFinish(span);
-    span.finish();
-
-    if (continuation != null) {
-      try (final ContextScope scope = continuation.resume()) {
-        return delegate.onCompleted();
-      }
-    } else {
-      return delegate.onCompleted();
-    }
-  }
-
-  @Override
-  public void onThrowable(final Throwable throwable) {
-    DECORATE.onError(span, throwable);
-    DECORATE.beforeFinish(span);
-    span.finish();
-
-    if (continuation != null) {
-      try (final ContextScope scope = continuation.resume()) {
-        delegate.onThrowable(throwable);
-      }
-    } else {
-      delegate.onThrowable(throwable);
-    }
-  }
-
-  @Override
-  public State onTrailingHeadersReceived(final HttpHeaders headers) throws Exception {
-    return delegate.onTrailingHeadersReceived(headers);
-  }
-
-  @Override
-  public void onHostnameResolutionAttempt(final String name) {
-    delegate.onHostnameResolutionAttempt(name);
-  }
-
-  @Override
-  public void onHostnameResolutionSuccess(final String name, final List list) {
-    delegate.onHostnameResolutionSuccess(name, list);
-  }
-
-  @Override
-  public void onHostnameResolutionFailure(final String name, final Throwable cause) {
-    delegate.onHostnameResolutionFailure(name, cause);
-  }
-
-  @Override
-  public void onTcpConnectAttempt(final InetSocketAddress remoteAddress) {
-    delegate.onTcpConnectAttempt(remoteAddress);
-  }
-
-  @Override
-  public void onTcpConnectSuccess(final InetSocketAddress remoteAddress, final Channel connection) {
-    delegate.onTcpConnectSuccess(remoteAddress, connection);
-  }
-
-  @Override
-  public void onTcpConnectFailure(final InetSocketAddress remoteAddress, final Throwable cause) {
-    delegate.onTcpConnectFailure(remoteAddress, cause);
-  }
-
-  @Override
-  public void onTlsHandshakeAttempt() {
-    delegate.onTlsHandshakeAttempt();
-  }
-
-  @Override
-  public void onTlsHandshakeSuccess(final SSLSession sslSession) {
-    delegate.onTlsHandshakeSuccess(sslSession);
-  }
-
-  @Override
-  public void onTlsHandshakeFailure(final Throwable cause) {
-    delegate.onTlsHandshakeFailure(cause);
-  }
-
-  @Override
-  public void onConnectionPoolAttempt() {
-    delegate.onConnectionPoolAttempt();
-  }
-
-  @Override
-  public void onConnectionPooled(final Channel connection) {
-    delegate.onConnectionPooled(connection);
-  }
-
-  @Override
-  public void onConnectionOffer(final Channel connection) {
-    delegate.onConnectionOffer(connection);
-  }
-
-  @Override
-  public void onRequestSend(final NettyRequest request) {
-    delegate.onRequestSend(request);
-  }
-
-  @Override
-  public void onRetry() {
-    delegate.onRetry();
-  }
+    private final AsyncHandler delegate;
+    private final AgentSpan span;
+    private final ContextContinuation continuation;
+
+    private final Response.ResponseBuilder builder = new Response.ResponseBuilder();
+
+    public AsyncHandlerWrapper(final AsyncHandler delegate, final AgentSpan span) {
+        this.delegate = delegate;
+        this.span = span;
+        this.continuation = span.captureWithContext();
+    }
+
+    @Override
+    public State onBodyPartReceived(final HttpResponseBodyPart content) throws Exception {
+        builder.accumulate(content);
+        return delegate.onBodyPartReceived(content);
+    }
+
+    @Override
+    public State onStatusReceived(final HttpResponseStatus status) throws Exception {
+        builder.reset();
+        builder.accumulate(status);
+        return delegate.onStatusReceived(status);
+    }
+
+    @Override
+    public State onHeadersReceived(final HttpHeaders httpHeaders) throws Exception {
+        builder.accumulate(httpHeaders);
+        return delegate.onHeadersReceived(httpHeaders);
+    }
+
+    @Override
+    public Object onCompleted() throws Exception {
+        final Response response = builder.build();
+        if (response != null) {
+            DECORATE.onResponse(span, response);
+        }
+        DECORATE.beforeFinish(span);
+        span.finish();
+
+        if (continuation != null) {
+            try (final ContextScope scope = continuation.resume()) {
+                return delegate.onCompleted();
+            }
+        } else {
+            return delegate.onCompleted();
+        }
+    }
+
+    @Override
+    public void onThrowable(final Throwable throwable) {
+        DECORATE.onError(span, throwable);
+        DECORATE.beforeFinish(span);
+        span.finish();
+
+        if (continuation != null) {
+            try (final ContextScope scope = continuation.resume()) {
+                delegate.onThrowable(throwable);
+            }
+        } else {
+            delegate.onThrowable(throwable);
+        }
+    }
+
+    @Override
+    public State onTrailingHeadersReceived(final HttpHeaders headers) throws Exception {
+        return delegate.onTrailingHeadersReceived(headers);
+    }
+
+    @Override
+    public void onHostnameResolutionAttempt(final String name) {
+        delegate.onHostnameResolutionAttempt(name);
+    }
+
+    @Override
+    public void onHostnameResolutionSuccess(final String name, final List list) {
+        delegate.onHostnameResolutionSuccess(name, list);
+    }
+
+    @Override
+    public void onHostnameResolutionFailure(final String name, final Throwable cause) {
+        delegate.onHostnameResolutionFailure(name, cause);
+    }
+
+    @Override
+    public void onTcpConnectAttempt(final InetSocketAddress remoteAddress) {
+        delegate.onTcpConnectAttempt(remoteAddress);
+    }
+
+    @Override
+    public void onTcpConnectSuccess(final InetSocketAddress remoteAddress, final Channel connection) {
+        delegate.onTcpConnectSuccess(remoteAddress, connection);
+    }
+
+    @Override
+    public void onTcpConnectFailure(final InetSocketAddress remoteAddress, final Throwable cause) {
+        delegate.onTcpConnectFailure(remoteAddress, cause);
+    }
+
+    @Override
+    public void onTlsHandshakeAttempt() {
+        delegate.onTlsHandshakeAttempt();
+    }
+
+    @Override
+    public void onTlsHandshakeSuccess(final SSLSession sslSession) {
+        delegate.onTlsHandshakeSuccess(sslSession);
+    }
+
+    @Override
+    public void onTlsHandshakeFailure(final Throwable cause) {
+        delegate.onTlsHandshakeFailure(cause);
+    }
+
+    @Override
+    public void onConnectionPoolAttempt() {
+        delegate.onConnectionPoolAttempt();
+    }
+
+    @Override
+    public void onConnectionPooled(final Channel connection) {
+        delegate.onConnectionPooled(connection);
+    }
+
+    @Override
+    public void onConnectionOffer(final Channel connection) {
+        delegate.onConnectionOffer(connection);
+    }
+
+    @Override
+    public void onRequestSend(final NettyRequest request) {
+        delegate.onRequestSend(request);
+    }
+
+    @Override
+    public void onRetry() {
+        delegate.onRetry();
+    }
 }
diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/PlayWSClientInstrumentation.java b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/PlayWSClientInstrumentation.java
index 810dfdf35e4..a95bfeedb91 100644
--- a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/PlayWSClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/PlayWSClientInstrumentation.java
@@ -18,42 +18,42 @@
 
 @AutoService(InstrumenterModule.class)
 public class PlayWSClientInstrumentation extends BasePlayWSClientInstrumentation {
-  public static class ClientAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.Argument(0) final Request request,
-        @Advice.Argument(value = 1, readOnly = false) AsyncHandler asyncHandler) {
-
-      final AgentSpan span = startSpan("play-ws", PLAY_WS_REQUEST);
-
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, request);
-
-      if (asyncHandler instanceof StreamedAsyncHandler) {
-        asyncHandler = new StreamedAsyncHandlerWrapper((StreamedAsyncHandler) asyncHandler, span);
-      } else if (!(asyncHandler instanceof WebSocketUpgradeHandler)) {
-        // websocket upgrade handlers aren't supported
-        asyncHandler = new AsyncHandlerWrapper(asyncHandler, span);
-      }
-
-      return span.attachWithContext();
-    }
-
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      if (throwable != null) {
-        final AgentSpan span = spanFromContext(scope.context());
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
+    public static class ClientAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.Argument(0) final Request request,
+                @Advice.Argument(value = 1, readOnly = false) AsyncHandler asyncHandler) {
+
+            final AgentSpan span = startSpan("play-ws", PLAY_WS_REQUEST);
+
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, request);
+
+            if (asyncHandler instanceof StreamedAsyncHandler) {
+                asyncHandler = new StreamedAsyncHandlerWrapper((StreamedAsyncHandler) asyncHandler, span);
+            } else if (!(asyncHandler instanceof WebSocketUpgradeHandler)) {
+                // websocket upgrade handlers aren't supported
+                asyncHandler = new AsyncHandlerWrapper(asyncHandler, span);
+            }
+
+            return span.attachWithContext();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            if (throwable != null) {
+                final AgentSpan span = spanFromContext(scope.context());
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/StreamedAsyncHandlerWrapper.java b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/StreamedAsyncHandlerWrapper.java
index 6e0c7dc518a..59d3b520fb9 100644
--- a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/StreamedAsyncHandlerWrapper.java
+++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/StreamedAsyncHandlerWrapper.java
@@ -4,17 +4,16 @@
 import org.reactivestreams.Publisher;
 import play.shaded.ahc.org.asynchttpclient.handler.StreamedAsyncHandler;
 
-public class StreamedAsyncHandlerWrapper extends AsyncHandlerWrapper
-    implements StreamedAsyncHandler {
-  private final StreamedAsyncHandler streamedDelegate;
+public class StreamedAsyncHandlerWrapper extends AsyncHandlerWrapper implements StreamedAsyncHandler {
+    private final StreamedAsyncHandler streamedDelegate;
 
-  public StreamedAsyncHandlerWrapper(final StreamedAsyncHandler delegate, final AgentSpan span) {
-    super(delegate, span);
-    streamedDelegate = delegate;
-  }
+    public StreamedAsyncHandlerWrapper(final StreamedAsyncHandler delegate, final AgentSpan span) {
+        super(delegate, span);
+        streamedDelegate = delegate;
+    }
 
-  @Override
-  public State onStream(final Publisher publisher) {
-    return streamedDelegate.onStream(publisher);
-  }
+    @Override
+    public State onStream(final Publisher publisher) {
+        return streamedDelegate.onStream(publisher);
+    }
 }
diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-common/src/main/java/datadog/trace/instrumentation/playws/BasePlayWSClientInstrumentation.java b/dd-java-agent/instrumentation/play-ws/play-ws-common/src/main/java/datadog/trace/instrumentation/playws/BasePlayWSClientInstrumentation.java
index d10ef50ad78..9f1b7b2e085 100644
--- a/dd-java-agent/instrumentation/play-ws/play-ws-common/src/main/java/datadog/trace/instrumentation/playws/BasePlayWSClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/play-ws/play-ws-common/src/main/java/datadog/trace/instrumentation/playws/BasePlayWSClientInstrumentation.java
@@ -21,53 +21,52 @@
 import play.shaded.ahc.org.asynchttpclient.Request;
 
 public abstract class BasePlayWSClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public BasePlayWSClientInstrumentation() {
-    super("play-ws");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public BasePlayWSClientInstrumentation() {
+        super("play-ws");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "play.shaded.ahc.org.asynchttpclient.AsyncHttpClient";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "play.shaded.ahc.org.asynchttpclient.AsyncHttpClient";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    // CachingAsyncHttpClient rejects overrides to AsyncHandler
-    // It also delegates to another AsyncHttpClient
-    return nameStartsWith("play.")
-        .and(
-            implementsInterface(named(hierarchyMarkerType()))
-                .and(not(named("play.api.libs.ws.ahc.cache.CachingAsyncHttpClient"))));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        // CachingAsyncHttpClient rejects overrides to AsyncHandler
+        // It also delegates to another AsyncHttpClient
+        return nameStartsWith("play.")
+                .and(implementsInterface(named(hierarchyMarkerType()))
+                        .and(not(named("play.api.libs.ws.ahc.cache.CachingAsyncHttpClient"))));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("execute"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("play.shaded.ahc.org.asynchttpclient.Request")))
-            .and(takesArgument(1, named("play.shaded.ahc.org.asynchttpclient.AsyncHandler"))),
-        getClass().getName() + "$ClientAdvice",
-        BasePlayWSClientInstrumentation.class.getName() + "$ClientContextPropagationAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("execute"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("play.shaded.ahc.org.asynchttpclient.Request")))
+                        .and(takesArgument(1, named("play.shaded.ahc.org.asynchttpclient.AsyncHandler"))),
+                getClass().getName() + "$ClientAdvice",
+                BasePlayWSClientInstrumentation.class.getName() + "$ClientContextPropagationAdvice");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.playws.PlayWSClientDecorator",
-      "datadog.trace.instrumentation.playws.HeadersInjectAdapter",
-      packageName + ".AsyncHandlerWrapper",
-      packageName + ".StreamedAsyncHandlerWrapper"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.playws.PlayWSClientDecorator",
+            "datadog.trace.instrumentation.playws.HeadersInjectAdapter",
+            packageName + ".AsyncHandlerWrapper",
+            packageName + ".StreamedAsyncHandlerWrapper"
+        };
+    }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ClientContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(@Advice.Argument(0) final Request request) {
-      DECORATE.injectContext(currentContext(), request, SETTER);
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ClientContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void methodEnter(@Advice.Argument(0) final Request request) {
+            DECORATE.injectContext(currentContext(), request, SETTER);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-common/src/main/java/datadog/trace/instrumentation/playws/HeadersInjectAdapter.java b/dd-java-agent/instrumentation/play-ws/play-ws-common/src/main/java/datadog/trace/instrumentation/playws/HeadersInjectAdapter.java
index 0856a970f4b..14c5f66d738 100644
--- a/dd-java-agent/instrumentation/play-ws/play-ws-common/src/main/java/datadog/trace/instrumentation/playws/HeadersInjectAdapter.java
+++ b/dd-java-agent/instrumentation/play-ws/play-ws-common/src/main/java/datadog/trace/instrumentation/playws/HeadersInjectAdapter.java
@@ -7,10 +7,10 @@
 @ParametersAreNonnullByDefault
 public class HeadersInjectAdapter implements CarrierSetter<Request> {
 
-  public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter();
+    public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter();
 
-  @Override
-  public void set(final Request carrier, final String key, final String value) {
-    carrier.getHeaders().add(key, value);
-  }
+    @Override
+    public void set(final Request carrier, final String key, final String value) {
+        carrier.getHeaders().add(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-common/src/main/java/datadog/trace/instrumentation/playws/PlayWSClientDecorator.java b/dd-java-agent/instrumentation/play-ws/play-ws-common/src/main/java/datadog/trace/instrumentation/playws/PlayWSClientDecorator.java
index b823a22989f..5853ebb1ac6 100644
--- a/dd-java-agent/instrumentation/play-ws/play-ws-common/src/main/java/datadog/trace/instrumentation/playws/PlayWSClientDecorator.java
+++ b/dd-java-agent/instrumentation/play-ws/play-ws-common/src/main/java/datadog/trace/instrumentation/playws/PlayWSClientDecorator.java
@@ -8,43 +8,42 @@
 import play.shaded.ahc.org.asynchttpclient.Response;
 
 public class PlayWSClientDecorator extends HttpClientDecorator<Request, Response> {
-  public static final CharSequence PLAY_WS = UTF8BytesString.create("play-ws");
-  public static final PlayWSClientDecorator DECORATE = new PlayWSClientDecorator();
-  public static final CharSequence PLAY_WS_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String method(final Request request) {
-    return request.getMethod();
-  }
-
-  @Override
-  protected URI url(final Request request) throws URISyntaxException {
-    return request.getUri().toJavaNetURI();
-  }
-
-  @Override
-  protected int status(final Response response) {
-    return response.getStatusCode();
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"play-ws"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return PLAY_WS;
-  }
-
-  @Override
-  protected String getRequestHeader(Request request, String headerName) {
-    return request.getHeaders().get(headerName);
-  }
-
-  @Override
-  protected String getResponseHeader(Response response, String headerName) {
-    return response.getHeaders().get(headerName);
-  }
+    public static final CharSequence PLAY_WS = UTF8BytesString.create("play-ws");
+    public static final PlayWSClientDecorator DECORATE = new PlayWSClientDecorator();
+    public static final CharSequence PLAY_WS_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String method(final Request request) {
+        return request.getMethod();
+    }
+
+    @Override
+    protected URI url(final Request request) throws URISyntaxException {
+        return request.getUri().toJavaNetURI();
+    }
+
+    @Override
+    protected int status(final Response response) {
+        return response.getStatusCode();
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"play-ws"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return PLAY_WS;
+    }
+
+    @Override
+    protected String getRequestHeader(Request request, String headerName) {
+        return request.getHeaders().get(headerName);
+    }
+
+    @Override
+    protected String getResponseHeader(Response response, String headerName) {
+        return response.getHeaders().get(headerName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayAdvice.java b/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayAdvice.java
index f114e48dcbf..b5f969140a0 100644
--- a/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayAdvice.java
@@ -20,59 +20,58 @@
 import scala.concurrent.Future;
 
 public class PlayAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(@Advice.Argument(0) final Request<?> req) {
-    final AgentSpan span;
-    final ContextScope scope;
-    if (activeSpan() == null) {
-      Headers headers = req.headers();
-      final Context parentContext = DECORATE.extract(headers);
-      final Context context = DECORATE.startSpan(headers, parentContext);
-      span = spanFromContext(context);
-      scope = context.attach();
-    } else {
-      // An upstream framework (e.g. akka-http, netty) has already started the span.
-      // Do not extract the context.
-      span = startSpan(PLAY_ACTION.toString(), PLAY_REQUEST);
-      span.setMeasured(true);
-      scope = span.attachWithContext();
-    }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(@Advice.Argument(0) final Request<?> req) {
+        final AgentSpan span;
+        final ContextScope scope;
+        if (activeSpan() == null) {
+            Headers headers = req.headers();
+            final Context parentContext = DECORATE.extract(headers);
+            final Context context = DECORATE.startSpan(headers, parentContext);
+            span = spanFromContext(context);
+            scope = context.attach();
+        } else {
+            // An upstream framework (e.g. akka-http, netty) has already started the span.
+            // Do not extract the context.
+            span = startSpan(PLAY_ACTION.toString(), PLAY_REQUEST);
+            span.setMeasured(true);
+            scope = span.attachWithContext();
+        }
 
-    DECORATE.afterStart(span);
-    return scope;
-  }
+        DECORATE.afterStart(span);
+        return scope;
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void stopTraceOnResponse(
-      @Advice.Enter final ContextScope playControllerScope,
-      @Advice.This final Object thisAction,
-      @Advice.Thrown final Throwable throwable,
-      @Advice.Argument(0) final Request<?> req,
-      @Advice.Return(readOnly = false) final Future<Result> responseFuture) {
-    final AgentSpan playControllerSpan = spanFromContext(playControllerScope.context());
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void stopTraceOnResponse(
+            @Advice.Enter final ContextScope playControllerScope,
+            @Advice.This final Object thisAction,
+            @Advice.Thrown final Throwable throwable,
+            @Advice.Argument(0) final Request<?> req,
+            @Advice.Return(readOnly = false) final Future<Result> responseFuture) {
+        final AgentSpan playControllerSpan = spanFromContext(playControllerScope.context());
 
-    // Call onRequest on return after tags are populated.
-    DECORATE.onRequest(playControllerSpan, req, req, rootContext());
+        // Call onRequest on return after tags are populated.
+        DECORATE.onRequest(playControllerSpan, req, req, rootContext());
 
-    if (throwable == null) {
-      responseFuture.onComplete(
-          new RequestCompleteCallback(playControllerScope),
-          ((Action<?>) thisAction).executionContext());
-    } else {
-      DECORATE.onError(playControllerSpan, throwable);
-      if (REPORT_HTTP_STATUS) {
-        playControllerSpan.setHttpStatusCode(500);
-      }
-      DECORATE.beforeFinish(playControllerScope.context());
-      playControllerSpan.finish();
-    }
-    playControllerScope.close();
-    // span finished in RequestCompleteCallback
+        if (throwable == null) {
+            responseFuture.onComplete(
+                    new RequestCompleteCallback(playControllerScope), ((Action<?>) thisAction).executionContext());
+        } else {
+            DECORATE.onError(playControllerSpan, throwable);
+            if (REPORT_HTTP_STATUS) {
+                playControllerSpan.setHttpStatusCode(500);
+            }
+            DECORATE.beforeFinish(playControllerScope.context());
+            playControllerSpan.finish();
+        }
+        playControllerScope.close();
+        // span finished in RequestCompleteCallback
 
-    final AgentSpan rootSpan = activeSpan();
-    // set the resource name on the upstream akka/netty span if there is one
-    if (rootSpan != null) {
-      DECORATE.onRequest(rootSpan, req, req, rootContext());
+        final AgentSpan rootSpan = activeSpan();
+        // set the resource name on the upstream akka/netty span if there is one
+        if (rootSpan != null) {
+            DECORATE.onRequest(rootSpan, req, req, rootContext());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayHeaders.java b/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayHeaders.java
index 4a41287b6d0..96d44e39020 100644
--- a/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayHeaders.java
+++ b/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayHeaders.java
@@ -8,30 +8,30 @@
 
 public abstract class PlayHeaders {
 
-  public static final class Request implements AgentPropagation.ContextVisitor<Headers> {
-    public static final Request GETTER = new Request();
+    public static final class Request implements AgentPropagation.ContextVisitor<Headers> {
+        public static final Request GETTER = new Request();
 
-    @Override
-    public void forEachKey(Headers carrier, AgentPropagation.KeyClassifier classifier) {
-      for (Tuple2<String, Seq<String>> entry : JavaConversions.asJavaIterable(carrier.data())) {
-        if (!classifier.accept(entry._1, entry._2.head())) {
-          return;
+        @Override
+        public void forEachKey(Headers carrier, AgentPropagation.KeyClassifier classifier) {
+            for (Tuple2<String, Seq<String>> entry : JavaConversions.asJavaIterable(carrier.data())) {
+                if (!classifier.accept(entry._1, entry._2.head())) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 
-  public static final class Result implements AgentPropagation.ContextVisitor<play.api.mvc.Result> {
-    public static final Result GETTER = new Result();
+    public static final class Result implements AgentPropagation.ContextVisitor<play.api.mvc.Result> {
+        public static final Result GETTER = new Result();
 
-    @Override
-    public void forEachKey(play.api.mvc.Result carrier, AgentPropagation.KeyClassifier classifier) {
-      for (Tuple2<String, String> entry :
-          JavaConversions.asJavaIterable(carrier.header().headers())) {
-        if (!classifier.accept(entry._1, entry._2)) {
-          return;
+        @Override
+        public void forEachKey(play.api.mvc.Result carrier, AgentPropagation.KeyClassifier classifier) {
+            for (Tuple2<String, String> entry :
+                    JavaConversions.asJavaIterable(carrier.header().headers())) {
+                if (!classifier.accept(entry._1, entry._2)) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayHttpServerDecorator.java b/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayHttpServerDecorator.java
index b1589452e46..5f0dc4cf223 100644
--- a/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayHttpServerDecorator.java
+++ b/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayHttpServerDecorator.java
@@ -26,156 +26,150 @@
 import play.api.mvc.Request;
 import scala.Option;
 
-public class PlayHttpServerDecorator
-    extends HttpServerDecorator<Request<?>, Request<?>, play.api.mvc.Result, Headers> {
-  private static final Logger LOG = LoggerFactory.getLogger(PlayHttpServerDecorator.class);
-  public static final boolean REPORT_HTTP_STATUS = Config.get().getPlayReportHttpStatus();
-  public static final CharSequence PLAY_REQUEST = UTF8BytesString.create("play.request");
-  public static final CharSequence PLAY_ACTION = UTF8BytesString.create("play-action");
-  public static final PlayHttpServerDecorator DECORATE = new PlayHttpServerDecorator();
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"play"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return PLAY_ACTION;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Headers> getter() {
-    return PlayHeaders.Request.GETTER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<play.api.mvc.Result> responseGetter() {
-    return PlayHeaders.Result.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return PLAY_REQUEST;
-  }
-
-  @Override
-  protected String method(final Request<?> httpRequest) {
-    return httpRequest.method();
-  }
-
-  @Override
-  protected URIDataAdapter url(final Request<?> request) {
-    return new RequestURIDataAdapter(request);
-  }
-
-  @Override
-  protected String peerHostIP(final Request<?> request) {
-    return request.remoteAddress();
-  }
-
-  @Override
-  protected int peerPort(final Request<?> request) {
-    return 0;
-  }
-
-  @Override
-  protected int status(final play.api.mvc.Result httpResponse) {
-    return httpResponse.header().status();
-  }
-
-  @Override
-  protected void doOnRequest(
-      final AgentSpan span,
-      final Request<?> connection,
-      final Request<?> request,
-      final Context parentContext) {
-    // Play's Request#remoteAddress() returns the address resolved from X-Forwarded-For (and
-    // similar) proxy headers, not the actual TCP socket peer. If the upstream framework
-    // (akka/netty) already populated peer information on the span from the real socket,
-    // wrap the connection so super.onRequest sees the captured value instead of Play's
-    // forwarded one. This way the IG callbacks and tags receive the correct peer.
-    // (APPSEC-62562)
-    final Request<?> connectionForSuper = withCapturedPeer(span, connection);
-    super.doOnRequest(span, connectionForSuper, request, parentContext);
-    if (request != null) {
-      // more about routes here:
-      // https://github.com/playframework/playframework/blob/master/documentation/manual/releases/release26/migration26/Migration26.md#router-tags-are-now-attributes
-      final Option pathOption = request.tags().get(Routes.ROUTE_PATTERN());
-      if (!pathOption.isEmpty()) {
-        final String path = (String) pathOption.get();
-        HTTP_RESOURCE_DECORATOR.withRoute(span, request.method(), path);
-        dispatchRoute(span, path);
-      }
+public class PlayHttpServerDecorator extends HttpServerDecorator<Request<?>, Request<?>, play.api.mvc.Result, Headers> {
+    private static final Logger LOG = LoggerFactory.getLogger(PlayHttpServerDecorator.class);
+    public static final boolean REPORT_HTTP_STATUS = Config.get().getPlayReportHttpStatus();
+    public static final CharSequence PLAY_REQUEST = UTF8BytesString.create("play.request");
+    public static final CharSequence PLAY_ACTION = UTF8BytesString.create("play-action");
+    public static final PlayHttpServerDecorator DECORATE = new PlayHttpServerDecorator();
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"play"};
     }
-  }
-
-  /**
-   * Play does not set the http.route in the local root span so we need to store it in the context
-   * for API security
-   */
-  private void dispatchRoute(final AgentSpan span, final String route) {
-    try {
-      final RequestContext ctx = span.getRequestContext();
-      if (ctx == null) {
-        return;
-      }
-      // Send event to AppSec provider
-      final CallbackProvider cbp = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
-      if (cbp != null) {
-        final BiConsumer<RequestContext, String> cb = cbp.getCallback(EVENTS.httpRoute());
-        if (cb != null) {
-          cb.accept(ctx, route);
-        }
-      }
-      // Send event to IAST provider
-      final CallbackProvider cbpIast = tracer().getCallbackProvider(RequestContextSlot.IAST);
-      if (cbpIast != null) {
-        final BiConsumer<RequestContext, String> cb = cbpIast.getCallback(EVENTS.httpRoute());
-        if (cb != null) {
-          cb.accept(ctx, route);
-        }
-      }
-    } catch (final Throwable t) {
-      LOG.debug("Failed to dispatch route", t);
+
+    @Override
+    protected CharSequence component() {
+        return PLAY_ACTION;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Headers> getter() {
+        return PlayHeaders.Request.GETTER;
     }
-  }
-
-  /**
-   * Wraps the connection so that {@code remoteAddress()} returns the real socket peer IP instead of
-   * Play's X-Forwarded-For-resolved value. We look up the local root span (the upstream akka/netty
-   * span) because the play span is a fresh child that has no peer tags yet when {@code onRequest}
-   * is called. When called on the root span itself (e.g. to propagate route info), we use the root
-   * span's existing peer IP so the forwarded value cannot overwrite it.
-   */
-  private static Request<?> withCapturedPeer(final AgentSpan span, final Request<?> connection) {
-    if (connection == null) {
-      return null;
+
+    @Override
+    protected AgentPropagation.ContextVisitor<play.api.mvc.Result> responseGetter() {
+        return PlayHeaders.Result.GETTER;
     }
-    final AgentSpan source = span.getLocalRootSpan();
-    final AgentSpan peerSource = source != null ? source : span;
-    final Object capturedIp = peerSource.getTag(Tags.PEER_HOST_IPV4);
-    final Object peerIp = capturedIp != null ? capturedIp : peerSource.getTag(Tags.PEER_HOST_IPV6);
-    if (peerIp != null) {
-      return new RequestWithCapturedPeer(connection, peerIp.toString());
+
+    @Override
+    public CharSequence spanName() {
+        return PLAY_REQUEST;
     }
-    return connection;
-  }
-
-  @Override
-  protected void doOnError(
-      @Nonnull final AgentSpan span, @Nonnull Throwable throwable, byte errorPriority) {
-    if (REPORT_HTTP_STATUS) {
-      span.setHttpStatusCode(500);
+
+    @Override
+    protected String method(final Request<?> httpRequest) {
+        return httpRequest.method();
     }
-    if (throwable instanceof CompletionException && throwable.getCause() != null) {
-      throwable = throwable.getCause();
+
+    @Override
+    protected URIDataAdapter url(final Request<?> request) {
+        return new RequestURIDataAdapter(request);
+    }
+
+    @Override
+    protected String peerHostIP(final Request<?> request) {
+        return request.remoteAddress();
+    }
+
+    @Override
+    protected int peerPort(final Request<?> request) {
+        return 0;
+    }
+
+    @Override
+    protected int status(final play.api.mvc.Result httpResponse) {
+        return httpResponse.header().status();
     }
-    while ((throwable instanceof InvocationTargetException
-            || throwable instanceof UndeclaredThrowableException)
-        && throwable.getCause() != null) {
-      throwable = throwable.getCause();
+
+    @Override
+    protected void doOnRequest(
+            final AgentSpan span, final Request<?> connection, final Request<?> request, final Context parentContext) {
+        // Play's Request#remoteAddress() returns the address resolved from X-Forwarded-For (and
+        // similar) proxy headers, not the actual TCP socket peer. If the upstream framework
+        // (akka/netty) already populated peer information on the span from the real socket,
+        // wrap the connection so super.onRequest sees the captured value instead of Play's
+        // forwarded one. This way the IG callbacks and tags receive the correct peer.
+        // (APPSEC-62562)
+        final Request<?> connectionForSuper = withCapturedPeer(span, connection);
+        super.doOnRequest(span, connectionForSuper, request, parentContext);
+        if (request != null) {
+            // more about routes here:
+            // https://github.com/playframework/playframework/blob/master/documentation/manual/releases/release26/migration26/Migration26.md#router-tags-are-now-attributes
+            final Option pathOption = request.tags().get(Routes.ROUTE_PATTERN());
+            if (!pathOption.isEmpty()) {
+                final String path = (String) pathOption.get();
+                HTTP_RESOURCE_DECORATOR.withRoute(span, request.method(), path);
+                dispatchRoute(span, path);
+            }
+        }
+    }
+
+    /**
+     * Play does not set the http.route in the local root span so we need to store it in the context
+     * for API security
+     */
+    private void dispatchRoute(final AgentSpan span, final String route) {
+        try {
+            final RequestContext ctx = span.getRequestContext();
+            if (ctx == null) {
+                return;
+            }
+            // Send event to AppSec provider
+            final CallbackProvider cbp = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
+            if (cbp != null) {
+                final BiConsumer<RequestContext, String> cb = cbp.getCallback(EVENTS.httpRoute());
+                if (cb != null) {
+                    cb.accept(ctx, route);
+                }
+            }
+            // Send event to IAST provider
+            final CallbackProvider cbpIast = tracer().getCallbackProvider(RequestContextSlot.IAST);
+            if (cbpIast != null) {
+                final BiConsumer<RequestContext, String> cb = cbpIast.getCallback(EVENTS.httpRoute());
+                if (cb != null) {
+                    cb.accept(ctx, route);
+                }
+            }
+        } catch (final Throwable t) {
+            LOG.debug("Failed to dispatch route", t);
+        }
+    }
+
+    /**
+     * Wraps the connection so that {@code remoteAddress()} returns the real socket peer IP instead of
+     * Play's X-Forwarded-For-resolved value. We look up the local root span (the upstream akka/netty
+     * span) because the play span is a fresh child that has no peer tags yet when {@code onRequest}
+     * is called. When called on the root span itself (e.g. to propagate route info), we use the root
+     * span's existing peer IP so the forwarded value cannot overwrite it.
+     */
+    private static Request<?> withCapturedPeer(final AgentSpan span, final Request<?> connection) {
+        if (connection == null) {
+            return null;
+        }
+        final AgentSpan source = span.getLocalRootSpan();
+        final AgentSpan peerSource = source != null ? source : span;
+        final Object capturedIp = peerSource.getTag(Tags.PEER_HOST_IPV4);
+        final Object peerIp = capturedIp != null ? capturedIp : peerSource.getTag(Tags.PEER_HOST_IPV6);
+        if (peerIp != null) {
+            return new RequestWithCapturedPeer(connection, peerIp.toString());
+        }
+        return connection;
+    }
+
+    @Override
+    protected void doOnError(@Nonnull final AgentSpan span, @Nonnull Throwable throwable, byte errorPriority) {
+        if (REPORT_HTTP_STATUS) {
+            span.setHttpStatusCode(500);
+        }
+        if (throwable instanceof CompletionException && throwable.getCause() != null) {
+            throwable = throwable.getCause();
+        }
+        while ((throwable instanceof InvocationTargetException || throwable instanceof UndeclaredThrowableException)
+                && throwable.getCause() != null) {
+            throwable = throwable.getCause();
+        }
+        super.doOnError(span, throwable, errorPriority);
     }
-    super.doOnError(span, throwable, errorPriority);
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayInstrumentation.java
index a198a5721bc..a9d3da33eab 100644
--- a/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayInstrumentation.java
@@ -13,41 +13,41 @@
 
 @AutoService(InstrumenterModule.class)
 public final class PlayInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public PlayInstrumentation() {
-    super("play", "play-action");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "play.api.mvc.Action";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".PlayHeaders",
-      packageName + ".PlayHeaders$Request",
-      packageName + ".PlayHeaders$Result",
-      packageName + ".PlayHttpServerDecorator",
-      packageName + ".RequestCompleteCallback",
-      packageName + ".RequestURIDataAdapter",
-      packageName + ".RequestWithCapturedPeer"
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("apply")
-            .and(takesArgument(0, named("play.api.mvc.Request")))
-            .and(returns(named("scala.concurrent.Future"))),
-        packageName + ".PlayAdvice");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public PlayInstrumentation() {
+        super("play", "play-action");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "play.api.mvc.Action";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".PlayHeaders",
+            packageName + ".PlayHeaders$Request",
+            packageName + ".PlayHeaders$Result",
+            packageName + ".PlayHttpServerDecorator",
+            packageName + ".RequestCompleteCallback",
+            packageName + ".RequestURIDataAdapter",
+            packageName + ".RequestWithCapturedPeer"
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("apply")
+                        .and(takesArgument(0, named("play.api.mvc.Request")))
+                        .and(returns(named("scala.concurrent.Future"))),
+                packageName + ".PlayAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/RequestCompleteCallback.java b/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/RequestCompleteCallback.java
index 09be3dd9992..92e2889187a 100644
--- a/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/RequestCompleteCallback.java
+++ b/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/RequestCompleteCallback.java
@@ -12,31 +12,31 @@
 
 public class RequestCompleteCallback extends scala.runtime.AbstractFunction1<Try<Result>, Object> {
 
-  private static final Logger log = LoggerFactory.getLogger(RequestCompleteCallback.class);
-  private final ContextScope scope;
-  private final AgentSpan span;
+    private static final Logger log = LoggerFactory.getLogger(RequestCompleteCallback.class);
+    private final ContextScope scope;
+    private final AgentSpan span;
 
-  public RequestCompleteCallback(final ContextScope scope) {
-    this.scope = scope;
-    this.span = AgentSpan.fromContext(scope.context());
-  }
+    public RequestCompleteCallback(final ContextScope scope) {
+        this.scope = scope;
+        this.span = AgentSpan.fromContext(scope.context());
+    }
 
-  @Override
-  public Object apply(final Try<Result> result) {
-    try {
-      if (result.isFailure()) {
-        DECORATE.onError(span, result.failed().get());
-      } else {
-        if (REPORT_HTTP_STATUS) {
-          DECORATE.onResponse(span, result.get());
+    @Override
+    public Object apply(final Try<Result> result) {
+        try {
+            if (result.isFailure()) {
+                DECORATE.onError(span, result.failed().get());
+            } else {
+                if (REPORT_HTTP_STATUS) {
+                    DECORATE.onResponse(span, result.get());
+                }
+            }
+            DECORATE.beforeFinish(scope.context());
+        } catch (final Throwable t) {
+            log.debug("error in play instrumentation", t);
+        } finally {
+            span.finish();
         }
-      }
-      DECORATE.beforeFinish(scope.context());
-    } catch (final Throwable t) {
-      log.debug("error in play instrumentation", t);
-    } finally {
-      span.finish();
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/RequestURIDataAdapter.java
index f91358d52f4..e2a2d11e7db 100644
--- a/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/RequestURIDataAdapter.java
+++ b/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/RequestURIDataAdapter.java
@@ -5,44 +5,44 @@
 
 final class RequestURIDataAdapter extends URIRawDataAdapter {
 
-  private final Request request;
-  private final String host;
-  private final int port;
-
-  RequestURIDataAdapter(Request request) {
-    this.request = request;
-    int split = request.host().lastIndexOf(':');
-    this.host = split == -1 ? request.host() : request.host().substring(0, split);
-    this.port = split == -1 ? 0 : Integer.parseInt(request.host().substring(split + 1));
-  }
-
-  @Override
-  public String scheme() {
-    return request.secure() ? "https" : "http";
-  }
-
-  @Override
-  public String host() {
-    return host;
-  }
-
-  @Override
-  public int port() {
-    return port;
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return request.path();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return request.rawQueryString();
-  }
+    private final Request request;
+    private final String host;
+    private final int port;
+
+    RequestURIDataAdapter(Request request) {
+        this.request = request;
+        int split = request.host().lastIndexOf(':');
+        this.host = split == -1 ? request.host() : request.host().substring(0, split);
+        this.port = split == -1 ? 0 : Integer.parseInt(request.host().substring(split + 1));
+    }
+
+    @Override
+    public String scheme() {
+        return request.secure() ? "https" : "http";
+    }
+
+    @Override
+    public String host() {
+        return host;
+    }
+
+    @Override
+    public int port() {
+        return port;
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return request.path();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return request.rawQueryString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/RequestWithCapturedPeer.java b/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/RequestWithCapturedPeer.java
index 9e74660bc2b..062b39b703e 100644
--- a/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/RequestWithCapturedPeer.java
+++ b/dd-java-agent/instrumentation/play/play-2.3/src/main/java/datadog/trace/instrumentation/play23/RequestWithCapturedPeer.java
@@ -10,16 +10,16 @@
  * information. See APPSEC-62562.
  */
 public class RequestWithCapturedPeer extends WrappedRequest<Object> {
-  private final String capturedPeerAddress;
+    private final String capturedPeerAddress;
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  public RequestWithCapturedPeer(final Request<?> request, final String capturedPeerAddress) {
-    super((Request) request);
-    this.capturedPeerAddress = capturedPeerAddress;
-  }
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public RequestWithCapturedPeer(final Request<?> request, final String capturedPeerAddress) {
+        super((Request) request);
+        this.capturedPeerAddress = capturedPeerAddress;
+    }
 
-  @Override
-  public String remoteAddress() {
-    return capturedPeerAddress;
-  }
+    @Override
+    public String remoteAddress() {
+        return capturedPeerAddress;
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayAdvice.java b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayAdvice.java
index deb84b7b0bf..1dee0d99a84 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayAdvice.java
@@ -20,79 +20,78 @@
 import scala.concurrent.Future;
 
 public class PlayAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(@Advice.Argument(value = 0, readOnly = false) Request<?> req) {
-    final AgentSpan span;
-    final ContextScope scope;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(@Advice.Argument(value = 0, readOnly = false) Request<?> req) {
+        final AgentSpan span;
+        final ContextScope scope;
 
-    // If we have already added a `play.request` span, then don't do it again
-    if (req.tags().contains("_dd_HasPlayRequestSpan")) {
-      return null;
-    }
+        // If we have already added a `play.request` span, then don't do it again
+        if (req.tags().contains("_dd_HasPlayRequestSpan")) {
+            return null;
+        }
 
-    if (activeSpan() == null) {
-      final Headers headers = req.headers();
-      final Context parentContext = DECORATE.extract(headers);
-      final Context context = DECORATE.startSpan(headers, parentContext);
-      span = spanFromContext(context);
-      scope = context.attach();
-    } else {
-      // An upstream framework (e.g. akka-http, netty) has already started the span.
-      // Do not extract the context.
-      span = startSpan(PLAY_ACTION.toString(), PLAY_REQUEST);
-      span.setMeasured(true);
-      scope = span.attachWithContext();
-    }
+        if (activeSpan() == null) {
+            final Headers headers = req.headers();
+            final Context parentContext = DECORATE.extract(headers);
+            final Context context = DECORATE.startSpan(headers, parentContext);
+            span = spanFromContext(context);
+            scope = context.attach();
+        } else {
+            // An upstream framework (e.g. akka-http, netty) has already started the span.
+            // Do not extract the context.
+            span = startSpan(PLAY_ACTION.toString(), PLAY_REQUEST);
+            span.setMeasured(true);
+            scope = span.attachWithContext();
+        }
+
+        DECORATE.afterStart(span);
 
-    DECORATE.afterStart(span);
+        req = RequestHelper.withTag(req, "_dd_HasPlayRequestSpan", "true");
 
-    req = RequestHelper.withTag(req, "_dd_HasPlayRequestSpan", "true");
+        // Moved from OnMethodExit
+        // Call onRequest on return after tags are populated.
+        DECORATE.onRequest(span, req, req, rootContext());
 
-    // Moved from OnMethodExit
-    // Call onRequest on return after tags are populated.
-    DECORATE.onRequest(span, req, req, rootContext());
+        return scope;
+    }
 
-    return scope;
-  }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void stopTraceOnResponse(
+            @Advice.Enter final ContextScope playControllerScope,
+            @Advice.This final Object thisAction,
+            @Advice.Thrown final Throwable throwable,
+            @Advice.Argument(0) final Request<?> req,
+            @Advice.Return(readOnly = false) final Future<Result> responseFuture) {
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void stopTraceOnResponse(
-      @Advice.Enter final ContextScope playControllerScope,
-      @Advice.This final Object thisAction,
-      @Advice.Thrown final Throwable throwable,
-      @Advice.Argument(0) final Request<?> req,
-      @Advice.Return(readOnly = false) final Future<Result> responseFuture) {
+        if (playControllerScope == null) {
+            return;
+        }
 
-    if (playControllerScope == null) {
-      return;
-    }
+        final AgentSpan playControllerSpan = spanFromContext(playControllerScope.context());
 
-    final AgentSpan playControllerSpan = spanFromContext(playControllerScope.context());
+        if (throwable == null) {
+            responseFuture.onComplete(
+                    new RequestCompleteCallback(playControllerScope), ((Action<?>) thisAction).executionContext());
+        } else {
+            DECORATE.onError(playControllerSpan, throwable);
+            if (REPORT_HTTP_STATUS) {
+                playControllerSpan.setHttpStatusCode(500);
+            }
+            DECORATE.beforeFinish(playControllerScope.context());
+            playControllerSpan.finish();
+        }
+        playControllerScope.close();
+        // span finished in RequestCompleteCallback
 
-    if (throwable == null) {
-      responseFuture.onComplete(
-          new RequestCompleteCallback(playControllerScope),
-          ((Action<?>) thisAction).executionContext());
-    } else {
-      DECORATE.onError(playControllerSpan, throwable);
-      if (REPORT_HTTP_STATUS) {
-        playControllerSpan.setHttpStatusCode(500);
-      }
-      DECORATE.beforeFinish(playControllerScope.context());
-      playControllerSpan.finish();
+        final AgentSpan rootSpan = activeSpan();
+        // set the resource name on the upstream akka/netty span if there is one
+        if (rootSpan != null) {
+            DECORATE.onRequest(rootSpan, req, req, rootContext());
+        }
     }
-    playControllerScope.close();
-    // span finished in RequestCompleteCallback
 
-    final AgentSpan rootSpan = activeSpan();
-    // set the resource name on the upstream akka/netty span if there is one
-    if (rootSpan != null) {
-      DECORATE.onRequest(rootSpan, req, req, rootContext());
+    // Unused method for muzzle to allow only 2.4-2.5
+    public static void muzzleCheck() {
+        play.libs.Akka.system();
     }
-  }
-
-  // Unused method for muzzle to allow only 2.4-2.5
-  public static void muzzleCheck() {
-    play.libs.Akka.system();
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayHeaders.java b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayHeaders.java
index de9f14b2c8c..a22f0da5684 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayHeaders.java
+++ b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayHeaders.java
@@ -7,30 +7,30 @@
 
 public abstract class PlayHeaders {
 
-  public static final class Request implements AgentPropagation.ContextVisitor<Headers> {
-    public static final Request GETTER = new Request();
+    public static final class Request implements AgentPropagation.ContextVisitor<Headers> {
+        public static final Request GETTER = new Request();
 
-    @Override
-    public void forEachKey(Headers carrier, AgentPropagation.KeyClassifier classifier) {
-      for (Tuple2<String, String> entry : JavaConversions.asJavaIterable(carrier.headers())) {
-        if (!classifier.accept(entry._1, entry._2)) {
-          return;
+        @Override
+        public void forEachKey(Headers carrier, AgentPropagation.KeyClassifier classifier) {
+            for (Tuple2<String, String> entry : JavaConversions.asJavaIterable(carrier.headers())) {
+                if (!classifier.accept(entry._1, entry._2)) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 
-  public static final class Result implements AgentPropagation.ContextVisitor<play.api.mvc.Result> {
-    public static final Result GETTER = new Result();
+    public static final class Result implements AgentPropagation.ContextVisitor<play.api.mvc.Result> {
+        public static final Result GETTER = new Result();
 
-    @Override
-    public void forEachKey(play.api.mvc.Result carrier, AgentPropagation.KeyClassifier classifier) {
-      for (Tuple2<String, String> entry :
-          JavaConversions.asJavaIterable(carrier.header().headers())) {
-        if (!classifier.accept(entry._1, entry._2)) {
-          return;
+        @Override
+        public void forEachKey(play.api.mvc.Result carrier, AgentPropagation.KeyClassifier classifier) {
+            for (Tuple2<String, String> entry :
+                    JavaConversions.asJavaIterable(carrier.header().headers())) {
+                if (!classifier.accept(entry._1, entry._2)) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayHttpServerDecorator.java b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayHttpServerDecorator.java
index e5e80e81d05..59a55f98b09 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayHttpServerDecorator.java
+++ b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayHttpServerDecorator.java
@@ -26,156 +26,150 @@
 import play.api.mvc.Result;
 import scala.Option;
 
-public class PlayHttpServerDecorator
-    extends HttpServerDecorator<Request<?>, Request<?>, Result, Headers> {
-  private static final Logger LOG = LoggerFactory.getLogger(PlayHttpServerDecorator.class);
-  public static final boolean REPORT_HTTP_STATUS = Config.get().getPlayReportHttpStatus();
-  public static final CharSequence PLAY_REQUEST = UTF8BytesString.create("play.request");
-  public static final CharSequence PLAY_ACTION = UTF8BytesString.create("play-action");
-  public static final PlayHttpServerDecorator DECORATE = new PlayHttpServerDecorator();
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"play"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return PLAY_ACTION;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Headers> getter() {
-    return PlayHeaders.Request.GETTER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Result> responseGetter() {
-    return PlayHeaders.Result.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return PLAY_REQUEST;
-  }
-
-  @Override
-  protected String method(final Request<?> httpRequest) {
-    return httpRequest.method();
-  }
-
-  @Override
-  protected URIDataAdapter url(final Request<?> request) {
-    return new RequestURIDataAdapter(request);
-  }
-
-  @Override
-  protected String peerHostIP(final Request<?> request) {
-    return request.remoteAddress();
-  }
-
-  @Override
-  protected int peerPort(final Request<?> request) {
-    return 0;
-  }
-
-  @Override
-  protected int status(final Result httpResponse) {
-    return httpResponse.header().status();
-  }
-
-  @Override
-  protected void doOnRequest(
-      final AgentSpan span,
-      final Request<?> connection,
-      final Request<?> request,
-      final Context parentContext) {
-    // Play's Request#remoteAddress() returns the address resolved from X-Forwarded-For (and
-    // similar) proxy headers, not the actual TCP socket peer. If the upstream framework
-    // (akka/netty) already populated peer information on the span from the real socket,
-    // wrap the connection so super.onRequest sees the captured value instead of Play's
-    // forwarded one. This way the IG callbacks and tags receive the correct peer.
-    // (APPSEC-62562)
-    final Request<?> connectionForSuper = withCapturedPeer(span, connection);
-    super.doOnRequest(span, connectionForSuper, request, parentContext);
-    if (request != null) {
-      // more about routes here:
-      // https://github.com/playframework/playframework/blob/master/documentation/manual/releases/release26/migration26/Migration26.md#router-tags-are-now-attributes
-      final Option<?> pathOption = request.tags().get("ROUTE_PATTERN");
-      if (!pathOption.isEmpty()) {
-        final String path = (String) pathOption.get();
-        HTTP_RESOURCE_DECORATOR.withRoute(span, request.method(), path);
-        dispatchRoute(span, path);
-      }
+public class PlayHttpServerDecorator extends HttpServerDecorator<Request<?>, Request<?>, Result, Headers> {
+    private static final Logger LOG = LoggerFactory.getLogger(PlayHttpServerDecorator.class);
+    public static final boolean REPORT_HTTP_STATUS = Config.get().getPlayReportHttpStatus();
+    public static final CharSequence PLAY_REQUEST = UTF8BytesString.create("play.request");
+    public static final CharSequence PLAY_ACTION = UTF8BytesString.create("play-action");
+    public static final PlayHttpServerDecorator DECORATE = new PlayHttpServerDecorator();
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"play"};
     }
-  }
-
-  /**
-   * Play does not set the http.route in the local root span so we need to store it in the context
-   * for API security
-   */
-  private void dispatchRoute(final AgentSpan span, final String route) {
-    try {
-      final RequestContext ctx = span.getRequestContext();
-      if (ctx == null) {
-        return;
-      }
-      // Send event to AppSec provider
-      final CallbackProvider cbp = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
-      if (cbp != null) {
-        final BiConsumer<RequestContext, String> cb = cbp.getCallback(EVENTS.httpRoute());
-        if (cb != null) {
-          cb.accept(ctx, route);
-        }
-      }
-      // Send event to IAST provider
-      final CallbackProvider cbpIast = tracer().getCallbackProvider(RequestContextSlot.IAST);
-      if (cbpIast != null) {
-        final BiConsumer<RequestContext, String> cb = cbpIast.getCallback(EVENTS.httpRoute());
-        if (cb != null) {
-          cb.accept(ctx, route);
-        }
-      }
-    } catch (final Throwable t) {
-      LOG.debug("Failed to dispatch route", t);
+
+    @Override
+    protected CharSequence component() {
+        return PLAY_ACTION;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Headers> getter() {
+        return PlayHeaders.Request.GETTER;
     }
-  }
-
-  /**
-   * Wraps the connection so that {@code remoteAddress()} returns the real socket peer IP instead of
-   * Play's X-Forwarded-For-resolved value. We look up the local root span (the upstream akka/netty
-   * span) because the play span is a fresh child that has no peer tags yet when {@code onRequest}
-   * is called. When called on the root span itself (e.g. to propagate route info), we use the root
-   * span's existing peer IP so the forwarded value cannot overwrite it.
-   */
-  private static Request<?> withCapturedPeer(final AgentSpan span, final Request<?> connection) {
-    if (connection == null) {
-      return null;
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Result> responseGetter() {
+        return PlayHeaders.Result.GETTER;
     }
-    final AgentSpan source = span.getLocalRootSpan();
-    final AgentSpan peerSource = (source != null && source != span) ? source : span;
-    final Object capturedIp = peerSource.getTag(Tags.PEER_HOST_IPV4);
-    final Object peerIp = capturedIp != null ? capturedIp : peerSource.getTag(Tags.PEER_HOST_IPV6);
-    if (peerIp != null) {
-      return new RequestWithCapturedPeer(connection, peerIp.toString());
+
+    @Override
+    public CharSequence spanName() {
+        return PLAY_REQUEST;
     }
-    return connection;
-  }
-
-  @Override
-  protected void doOnError(
-      @Nonnull final AgentSpan span, @Nonnull Throwable throwable, byte errorPriority) {
-    if (REPORT_HTTP_STATUS) {
-      span.setHttpStatusCode(500);
+
+    @Override
+    protected String method(final Request<?> httpRequest) {
+        return httpRequest.method();
     }
-    if (throwable instanceof CompletionException && throwable.getCause() != null) {
-      throwable = throwable.getCause();
+
+    @Override
+    protected URIDataAdapter url(final Request<?> request) {
+        return new RequestURIDataAdapter(request);
+    }
+
+    @Override
+    protected String peerHostIP(final Request<?> request) {
+        return request.remoteAddress();
+    }
+
+    @Override
+    protected int peerPort(final Request<?> request) {
+        return 0;
+    }
+
+    @Override
+    protected int status(final Result httpResponse) {
+        return httpResponse.header().status();
     }
-    while ((throwable instanceof InvocationTargetException
-            || throwable instanceof UndeclaredThrowableException)
-        && throwable.getCause() != null) {
-      throwable = throwable.getCause();
+
+    @Override
+    protected void doOnRequest(
+            final AgentSpan span, final Request<?> connection, final Request<?> request, final Context parentContext) {
+        // Play's Request#remoteAddress() returns the address resolved from X-Forwarded-For (and
+        // similar) proxy headers, not the actual TCP socket peer. If the upstream framework
+        // (akka/netty) already populated peer information on the span from the real socket,
+        // wrap the connection so super.onRequest sees the captured value instead of Play's
+        // forwarded one. This way the IG callbacks and tags receive the correct peer.
+        // (APPSEC-62562)
+        final Request<?> connectionForSuper = withCapturedPeer(span, connection);
+        super.doOnRequest(span, connectionForSuper, request, parentContext);
+        if (request != null) {
+            // more about routes here:
+            // https://github.com/playframework/playframework/blob/master/documentation/manual/releases/release26/migration26/Migration26.md#router-tags-are-now-attributes
+            final Option<?> pathOption = request.tags().get("ROUTE_PATTERN");
+            if (!pathOption.isEmpty()) {
+                final String path = (String) pathOption.get();
+                HTTP_RESOURCE_DECORATOR.withRoute(span, request.method(), path);
+                dispatchRoute(span, path);
+            }
+        }
+    }
+
+    /**
+     * Play does not set the http.route in the local root span so we need to store it in the context
+     * for API security
+     */
+    private void dispatchRoute(final AgentSpan span, final String route) {
+        try {
+            final RequestContext ctx = span.getRequestContext();
+            if (ctx == null) {
+                return;
+            }
+            // Send event to AppSec provider
+            final CallbackProvider cbp = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
+            if (cbp != null) {
+                final BiConsumer<RequestContext, String> cb = cbp.getCallback(EVENTS.httpRoute());
+                if (cb != null) {
+                    cb.accept(ctx, route);
+                }
+            }
+            // Send event to IAST provider
+            final CallbackProvider cbpIast = tracer().getCallbackProvider(RequestContextSlot.IAST);
+            if (cbpIast != null) {
+                final BiConsumer<RequestContext, String> cb = cbpIast.getCallback(EVENTS.httpRoute());
+                if (cb != null) {
+                    cb.accept(ctx, route);
+                }
+            }
+        } catch (final Throwable t) {
+            LOG.debug("Failed to dispatch route", t);
+        }
+    }
+
+    /**
+     * Wraps the connection so that {@code remoteAddress()} returns the real socket peer IP instead of
+     * Play's X-Forwarded-For-resolved value. We look up the local root span (the upstream akka/netty
+     * span) because the play span is a fresh child that has no peer tags yet when {@code onRequest}
+     * is called. When called on the root span itself (e.g. to propagate route info), we use the root
+     * span's existing peer IP so the forwarded value cannot overwrite it.
+     */
+    private static Request<?> withCapturedPeer(final AgentSpan span, final Request<?> connection) {
+        if (connection == null) {
+            return null;
+        }
+        final AgentSpan source = span.getLocalRootSpan();
+        final AgentSpan peerSource = (source != null && source != span) ? source : span;
+        final Object capturedIp = peerSource.getTag(Tags.PEER_HOST_IPV4);
+        final Object peerIp = capturedIp != null ? capturedIp : peerSource.getTag(Tags.PEER_HOST_IPV6);
+        if (peerIp != null) {
+            return new RequestWithCapturedPeer(connection, peerIp.toString());
+        }
+        return connection;
+    }
+
+    @Override
+    protected void doOnError(@Nonnull final AgentSpan span, @Nonnull Throwable throwable, byte errorPriority) {
+        if (REPORT_HTTP_STATUS) {
+            span.setHttpStatusCode(500);
+        }
+        if (throwable instanceof CompletionException && throwable.getCause() != null) {
+            throwable = throwable.getCause();
+        }
+        while ((throwable instanceof InvocationTargetException || throwable instanceof UndeclaredThrowableException)
+                && throwable.getCause() != null) {
+            throwable = throwable.getCause();
+        }
+        super.doOnError(span, throwable, errorPriority);
     }
-    super.doOnError(span, throwable, errorPriority);
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java
index 7dbb715b9aa..af7a72dea23 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java
@@ -13,43 +13,43 @@
 
 @AutoService(InstrumenterModule.class)
 public final class PlayInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public PlayInstrumentation() {
-    super("play");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "play.api.mvc.Action";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".PlayHeaders",
-      packageName + ".PlayHeaders$Request",
-      packageName + ".PlayHeaders$Result",
-      packageName + ".PlayHttpServerDecorator",
-      packageName + ".RequestCompleteCallback",
-      packageName + ".RequestURIDataAdapter",
-      packageName + ".RequestHelper",
-      packageName + ".RequestHelper$SFunction0",
-      packageName + ".RequestWithCapturedPeer"
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("apply")
-            .and(takesArgument(0, named("play.api.mvc.Request")))
-            .and(returns(named("scala.concurrent.Future"))),
-        packageName + ".PlayAdvice");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public PlayInstrumentation() {
+        super("play");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "play.api.mvc.Action";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".PlayHeaders",
+            packageName + ".PlayHeaders$Request",
+            packageName + ".PlayHeaders$Result",
+            packageName + ".PlayHttpServerDecorator",
+            packageName + ".RequestCompleteCallback",
+            packageName + ".RequestURIDataAdapter",
+            packageName + ".RequestHelper",
+            packageName + ".RequestHelper$SFunction0",
+            packageName + ".RequestWithCapturedPeer"
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("apply")
+                        .and(takesArgument(0, named("play.api.mvc.Request")))
+                        .and(returns(named("scala.concurrent.Future"))),
+                packageName + ".PlayAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestCompleteCallback.java b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestCompleteCallback.java
index 50a1239ffee..1d8e91d2197 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestCompleteCallback.java
+++ b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestCompleteCallback.java
@@ -11,31 +11,31 @@
 import scala.util.Try;
 
 public class RequestCompleteCallback extends scala.runtime.AbstractFunction1<Try<Result>, Object> {
-  private static final Logger log = LoggerFactory.getLogger(RequestCompleteCallback.class);
-  private final AgentSpan span;
-  private final ContextScope scope;
+    private static final Logger log = LoggerFactory.getLogger(RequestCompleteCallback.class);
+    private final AgentSpan span;
+    private final ContextScope scope;
 
-  public RequestCompleteCallback(final ContextScope scope) {
-    this.span = AgentSpan.fromContext(scope.context());
-    this.scope = scope;
-  }
+    public RequestCompleteCallback(final ContextScope scope) {
+        this.span = AgentSpan.fromContext(scope.context());
+        this.scope = scope;
+    }
 
-  @Override
-  public Object apply(final Try<Result> result) {
-    try {
-      if (result.isFailure()) {
-        DECORATE.onError(span, result.failed().get());
-      } else {
-        if (REPORT_HTTP_STATUS) {
-          DECORATE.onResponse(span, result.get());
+    @Override
+    public Object apply(final Try<Result> result) {
+        try {
+            if (result.isFailure()) {
+                DECORATE.onError(span, result.failed().get());
+            } else {
+                if (REPORT_HTTP_STATUS) {
+                    DECORATE.onResponse(span, result.get());
+                }
+            }
+            DECORATE.beforeFinish(scope.context());
+        } catch (final Throwable t) {
+            log.debug("error in play instrumentation", t);
+        } finally {
+            span.finish();
         }
-      }
-      DECORATE.beforeFinish(scope.context());
-    } catch (final Throwable t) {
-      log.debug("error in play instrumentation", t);
-    } finally {
-      span.finish();
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestHelper.java b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestHelper.java
index 071dbdd35f3..7059e9650b3 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestHelper.java
+++ b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestHelper.java
@@ -18,107 +18,104 @@
  * this helper class.
  */
 public class RequestHelper {
-  // This is the method for creating a new Request from a RequestHeader and a value
-  private static final MethodHandle APPLY;
-  // This is the normal Play 2.5 method for adding a tag to a RequestHeader
-  private static final MethodHandle WITH_TAG;
-  // Play 2.4 does not have a withTag method, so there we need to call the copy method on
-  // the RequestHeader ourselves with an updated tags Map instead
-  private static final MethodHandle COPY;
+    // This is the method for creating a new Request from a RequestHeader and a value
+    private static final MethodHandle APPLY;
+    // This is the normal Play 2.5 method for adding a tag to a RequestHeader
+    private static final MethodHandle WITH_TAG;
+    // Play 2.4 does not have a withTag method, so there we need to call the copy method on
+    // the RequestHeader ourselves with an updated tags Map instead
+    private static final MethodHandle COPY;
 
-  static {
-    MethodHandle withTag = null;
-    MethodHandle apply = null;
-    MethodHandle copy = null;
-    MethodHandles.Lookup lookup = MethodHandles.publicLookup();
-    try {
-      MethodType mt = MethodType.methodType(Request.class, RequestHeader.class, Object.class);
-      apply = lookup.findVirtual(Request$.class, "apply", mt);
-    } catch (final NoSuchMethodException | IllegalAccessException ignored) {
-      // We never expect this to fail, and if it does then the play application itself is probably
-      // misconfigured, so we will revert to not adding headers which is safe
-    }
-    // Only try to look up the withTag or copy method if we can use apply to create a tagged Request
-    if (apply != null) {
-      try {
-        MethodType mt = MethodType.methodType(RequestHeader.class, String.class, String.class);
-        withTag = lookup.findVirtual(RequestHeader.class, "withTag", mt);
-      } catch (final NoSuchMethodException | IllegalAccessException ignored1) {
-        // So we failed to look up withTag, then this is probably Play 2.4 and we should
-        // try to look up the copy method instead
+    static {
+        MethodHandle withTag = null;
+        MethodHandle apply = null;
+        MethodHandle copy = null;
+        MethodHandles.Lookup lookup = MethodHandles.publicLookup();
         try {
-          Class<?> rh = RequestHeader.class;
-          Class<?> m = Map.class;
-          Class<?> s = String.class;
-          Class<?> f = Function0.class;
-          MethodType mt =
-              MethodType.methodType(rh, long.class, m, s, s, s, s, m, Headers.class, f, f);
-          copy = lookup.findVirtual(rh, "copy", mt);
-        } catch (final NoSuchMethodException | IllegalAccessException ignored2) {
+            MethodType mt = MethodType.methodType(Request.class, RequestHeader.class, Object.class);
+            apply = lookup.findVirtual(Request$.class, "apply", mt);
+        } catch (final NoSuchMethodException | IllegalAccessException ignored) {
+            // We never expect this to fail, and if it does then the play application itself is probably
+            // misconfigured, so we will revert to not adding headers which is safe
+        }
+        // Only try to look up the withTag or copy method if we can use apply to create a tagged Request
+        if (apply != null) {
+            try {
+                MethodType mt = MethodType.methodType(RequestHeader.class, String.class, String.class);
+                withTag = lookup.findVirtual(RequestHeader.class, "withTag", mt);
+            } catch (final NoSuchMethodException | IllegalAccessException ignored1) {
+                // So we failed to look up withTag, then this is probably Play 2.4 and we should
+                // try to look up the copy method instead
+                try {
+                    Class<?> rh = RequestHeader.class;
+                    Class<?> m = Map.class;
+                    Class<?> s = String.class;
+                    Class<?> f = Function0.class;
+                    MethodType mt = MethodType.methodType(rh, long.class, m, s, s, s, s, m, Headers.class, f, f);
+                    copy = lookup.findVirtual(rh, "copy", mt);
+                } catch (final NoSuchMethodException | IllegalAccessException ignored2) {
+                }
+            }
         }
-      }
+        APPLY = apply;
+        WITH_TAG = withTag;
+        COPY = copy;
     }
-    APPLY = apply;
-    WITH_TAG = withTag;
-    COPY = copy;
-  }
 
-  public static Request withTag(final Request request, final String key, final String value) {
-    Request newRequest = request;
-    if (APPLY != null) {
-      try {
-        RequestHeader newHeader = request;
-        if (WITH_TAG != null) {
-          newHeader = (RequestHeader) WITH_TAG.invokeExact((RequestHeader) request, key, value);
-        } else if (COPY != null) {
-          RequestHeader header = request;
-          try {
-            newHeader =
-                (RequestHeader)
-                    COPY.invokeExact(
-                        header,
-                        header.id(),
-                        header.tags().updated(key, value),
-                        header.uri(),
-                        header.path(),
-                        header.method(),
-                        header.version(),
-                        header.queryString(),
-                        header.headers(),
-                        (Function0) SFunction0.from(header::remoteAddress),
-                        (Function0) SFunction0.from(header::secure));
-          } catch (Throwable ignored1) {
-          }
+    public static Request withTag(final Request request, final String key, final String value) {
+        Request newRequest = request;
+        if (APPLY != null) {
+            try {
+                RequestHeader newHeader = request;
+                if (WITH_TAG != null) {
+                    newHeader = (RequestHeader) WITH_TAG.invokeExact((RequestHeader) request, key, value);
+                } else if (COPY != null) {
+                    RequestHeader header = request;
+                    try {
+                        newHeader = (RequestHeader) COPY.invokeExact(
+                                header,
+                                header.id(),
+                                header.tags().updated(key, value),
+                                header.uri(),
+                                header.path(),
+                                header.method(),
+                                header.version(),
+                                header.queryString(),
+                                header.headers(),
+                                (Function0) SFunction0.from(header::remoteAddress),
+                                (Function0) SFunction0.from(header::secure));
+                    } catch (Throwable ignored1) {
+                    }
+                }
+                // Only return an updated Request if we manageed to add the tag to the RequesHeader
+                if (newHeader != newRequest) {
+                    // This is calling the apply method on the Scala `object` `Request`
+                    newRequest = (Request) APPLY.invokeExact(Request$.MODULE$, newHeader, request.body());
+                }
+            } catch (Throwable ignored2) {
+            }
         }
-        // Only return an updated Request if we manageed to add the tag to the RequesHeader
-        if (newHeader != newRequest) {
-          // This is calling the apply method on the Scala `object` `Request`
-          newRequest = (Request) APPLY.invokeExact(Request$.MODULE$, newHeader, request.body());
-        }
-      } catch (Throwable ignored2) {
-      }
+        return newRequest;
     }
-    return newRequest;
-  }
 
-  /**
-   * Scala Function0 is not a Java Functional Interface in older Scala versions, so add a helper
-   * class to bridge the gap.
-   */
-  public static class SFunction0<T> extends AbstractFunction0<T> {
-    private final Supplier<T> supplier;
+    /**
+     * Scala Function0 is not a Java Functional Interface in older Scala versions, so add a helper
+     * class to bridge the gap.
+     */
+    public static class SFunction0<T> extends AbstractFunction0<T> {
+        private final Supplier<T> supplier;
 
-    public static <A> SFunction0<A> from(final Supplier<A> supplier) {
-      return new SFunction0<>(supplier);
-    }
+        public static <A> SFunction0<A> from(final Supplier<A> supplier) {
+            return new SFunction0<>(supplier);
+        }
 
-    private SFunction0(final Supplier<T> supplier) {
-      this.supplier = supplier;
-    }
+        private SFunction0(final Supplier<T> supplier) {
+            this.supplier = supplier;
+        }
 
-    @Override
-    public T apply() {
-      return supplier.get();
+        @Override
+        public T apply() {
+            return supplier.get();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestURIDataAdapter.java
index 0145913ed7e..404afaf5d36 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestURIDataAdapter.java
+++ b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestURIDataAdapter.java
@@ -5,44 +5,44 @@
 
 final class RequestURIDataAdapter extends URIRawDataAdapter {
 
-  private final Request request;
-  private final String host;
-  private final int port;
-
-  RequestURIDataAdapter(Request request) {
-    this.request = request;
-    int split = request.host().lastIndexOf(':');
-    this.host = split == -1 ? request.host() : request.host().substring(0, split);
-    this.port = split == -1 ? 0 : Integer.parseInt(request.host().substring(split + 1));
-  }
-
-  @Override
-  public String scheme() {
-    return request.secure() ? "https" : "http";
-  }
-
-  @Override
-  public String host() {
-    return host;
-  }
-
-  @Override
-  public int port() {
-    return port;
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return request.path();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return request.rawQueryString();
-  }
+    private final Request request;
+    private final String host;
+    private final int port;
+
+    RequestURIDataAdapter(Request request) {
+        this.request = request;
+        int split = request.host().lastIndexOf(':');
+        this.host = split == -1 ? request.host() : request.host().substring(0, split);
+        this.port = split == -1 ? 0 : Integer.parseInt(request.host().substring(split + 1));
+    }
+
+    @Override
+    public String scheme() {
+        return request.secure() ? "https" : "http";
+    }
+
+    @Override
+    public String host() {
+        return host;
+    }
+
+    @Override
+    public int port() {
+        return port;
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return request.path();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return request.rawQueryString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestWithCapturedPeer.java b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestWithCapturedPeer.java
index 87ff06054a8..ba2b7f6c672 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestWithCapturedPeer.java
+++ b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestWithCapturedPeer.java
@@ -10,16 +10,16 @@
  * information. See APPSEC-62562.
  */
 public class RequestWithCapturedPeer extends WrappedRequest<Object> {
-  private final String capturedPeerAddress;
+    private final String capturedPeerAddress;
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  public RequestWithCapturedPeer(final Request<?> request, final String capturedPeerAddress) {
-    super((Request) request);
-    this.capturedPeerAddress = capturedPeerAddress;
-  }
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public RequestWithCapturedPeer(final Request<?> request, final String capturedPeerAddress) {
+        super((Request) request);
+        this.capturedPeerAddress = capturedPeerAddress;
+    }
 
-  @Override
-  public String remoteAddress() {
-    return capturedPeerAddress;
-  }
+    @Override
+    public String remoteAddress() {
+        return capturedPeerAddress;
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/HasPlayRequestSpan.java b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/HasPlayRequestSpan.java
index f59412b76bd..8efe3d7f9b8 100644
--- a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/HasPlayRequestSpan.java
+++ b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/HasPlayRequestSpan.java
@@ -3,8 +3,8 @@
 import play.api.libs.typedmap.TypedKey;
 
 public final class HasPlayRequestSpan {
-  public static final TypedKey<HasPlayRequestSpan> KEY = TypedKey.apply("HasPlayRequest");
-  public static final HasPlayRequestSpan INSTANCE = new HasPlayRequestSpan();
+    public static final TypedKey<HasPlayRequestSpan> KEY = TypedKey.apply("HasPlayRequest");
+    public static final HasPlayRequestSpan INSTANCE = new HasPlayRequestSpan();
 
-  private HasPlayRequestSpan() {}
+    private HasPlayRequestSpan() {}
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/MuzzleReferences.java b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/MuzzleReferences.java
index 227d1fdf3bc..3487c75c87e 100644
--- a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/MuzzleReferences.java
+++ b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/MuzzleReferences.java
@@ -3,14 +3,13 @@
 import datadog.trace.agent.tooling.muzzle.Reference;
 
 public class MuzzleReferences {
-  private MuzzleReferences() {}
+    private MuzzleReferences() {}
 
-  public static final Reference[] PLAY_26_PLUS =
-      new Reference[] {new Reference.Builder("play.components.BodyParserComponents").build()};
+    public static final Reference[] PLAY_26_PLUS =
+            new Reference[] {new Reference.Builder("play.components.BodyParserComponents").build()};
 
-  public static final Reference[] PLAY_26_ONLY =
-      new Reference[] {
+    public static final Reference[] PLAY_26_ONLY = new Reference[] {
         new Reference.Builder("play.components.BodyParserComponents").build(),
         new Reference.Builder("play.Configuration").build()
-      };
+    };
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java
index f1c66f17bbb..4b95b0ff1e5 100644
--- a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java
@@ -20,74 +20,72 @@
 import scala.concurrent.Future;
 
 public class PlayAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(@Advice.Argument(value = 0, readOnly = false) Request<?> req) {
-    final Context parentContext;
-    final AgentSpan span;
-    final ContextScope scope;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(@Advice.Argument(value = 0, readOnly = false) Request<?> req) {
+        final Context parentContext;
+        final AgentSpan span;
+        final ContextScope scope;
 
-    // If we have already added a `play.request` span, then don't do it again
-    if (req.attrs().contains(HasPlayRequestSpan.KEY)) {
-      return null;
-    }
+        // If we have already added a `play.request` span, then don't do it again
+        if (req.attrs().contains(HasPlayRequestSpan.KEY)) {
+            return null;
+        }
 
-    if (activeSpan() == null) {
-      final Headers headers = req.headers();
-      parentContext = DECORATE.extract(headers);
-      final Context context = DECORATE.startSpan(headers, parentContext);
-      span = spanFromContext(context);
-      scope = context.attach();
-    } else {
-      // An upstream framework (e.g. akka-http, netty) has already started the span.
-      // Do not extract the context.
-      parentContext = rootContext();
-      span = startSpan(PLAY_ACTION.toString(), PLAY_REQUEST);
-      scope = span.attachWithContext();
-    }
+        if (activeSpan() == null) {
+            final Headers headers = req.headers();
+            parentContext = DECORATE.extract(headers);
+            final Context context = DECORATE.startSpan(headers, parentContext);
+            span = spanFromContext(context);
+            scope = context.attach();
+        } else {
+            // An upstream framework (e.g. akka-http, netty) has already started the span.
+            // Do not extract the context.
+            parentContext = rootContext();
+            span = startSpan(PLAY_ACTION.toString(), PLAY_REQUEST);
+            scope = span.attachWithContext();
+        }
 
-    span.setMeasured(true);
-    DECORATE.afterStart(span);
+        span.setMeasured(true);
+        DECORATE.afterStart(span);
 
-    req = req.addAttr(HasPlayRequestSpan.KEY, HasPlayRequestSpan.INSTANCE);
+        req = req.addAttr(HasPlayRequestSpan.KEY, HasPlayRequestSpan.INSTANCE);
 
-    // Moved from OnMethodExit
-    // Call onRequest on return after tags are populated.
-    DECORATE.onRequest(span, req, req, parentContext);
+        // Moved from OnMethodExit
+        // Call onRequest on return after tags are populated.
+        DECORATE.onRequest(span, req, req, parentContext);
 
-    return scope;
-  }
+        return scope;
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void stopTraceOnResponse(
-      @Advice.Enter final ContextScope playControllerScope,
-      @Advice.This final Object thisAction,
-      @Advice.Thrown final Throwable throwable,
-      @Advice.Argument(0) final Request<?> req,
-      @Advice.Return(readOnly = false) final Future<Result> responseFuture) {
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void stopTraceOnResponse(
+            @Advice.Enter final ContextScope playControllerScope,
+            @Advice.This final Object thisAction,
+            @Advice.Thrown final Throwable throwable,
+            @Advice.Argument(0) final Request<?> req,
+            @Advice.Return(readOnly = false) final Future<Result> responseFuture) {
 
-    if (playControllerScope == null) {
-      return;
-    }
+        if (playControllerScope == null) {
+            return;
+        }
 
-    final AgentSpan playControllerSpan = spanFromContext(playControllerScope.context());
+        final AgentSpan playControllerSpan = spanFromContext(playControllerScope.context());
 
-    if (throwable == null) {
-      responseFuture.onComplete(
-          new RequestCompleteCallback(playControllerScope),
-          ((Action<?>) thisAction).executionContext());
-    } else {
-      DECORATE.onError(playControllerSpan, throwable);
-      DECORATE.beforeFinish(playControllerScope.context());
-      playControllerSpan.finish();
-    }
-    playControllerScope.close();
-    // span finished in RequestCompleteCallback
+        if (throwable == null) {
+            responseFuture.onComplete(
+                    new RequestCompleteCallback(playControllerScope), ((Action<?>) thisAction).executionContext());
+        } else {
+            DECORATE.onError(playControllerSpan, throwable);
+            DECORATE.beforeFinish(playControllerScope.context());
+            playControllerSpan.finish();
+        }
+        playControllerScope.close();
+        // span finished in RequestCompleteCallback
 
-    final AgentSpan rootSpan = activeSpan();
-    // set the resource name on the upstream akka/netty span if there is one
-    if (rootSpan != null && playControllerSpan.getResourceName() != null) {
-      rootSpan.setResourceName(
-          playControllerSpan.getResourceName(), ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE);
+        final AgentSpan rootSpan = activeSpan();
+        // set the resource name on the upstream akka/netty span if there is one
+        if (rootSpan != null && playControllerSpan.getResourceName() != null) {
+            rootSpan.setResourceName(playControllerSpan.getResourceName(), ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayHeaders.java b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayHeaders.java
index c0fdd048bc2..c221643928e 100644
--- a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayHeaders.java
+++ b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayHeaders.java
@@ -12,61 +12,60 @@
 
 public final class PlayHeaders {
 
-  public static final class Request implements AgentPropagation.ContextVisitor<Headers> {
-    private static final MethodHandle AS_MAP = asMap();
+    public static final class Request implements AgentPropagation.ContextVisitor<Headers> {
+        private static final MethodHandle AS_MAP = asMap();
 
-    public static final Request GETTER = new Request();
+        public static final Request GETTER = new Request();
 
-    @Override
-    public void forEachKey(Headers carrier, AgentPropagation.KeyClassifier classifier) {
-      for (Map.Entry<String, List<String>> entry : toMap(carrier).entrySet()) {
-        List<String> values = entry.getValue();
-        if (!values.isEmpty() && !classifier.accept(entry.getKey(), values.get(0))) {
-          return;
+        @Override
+        public void forEachKey(Headers carrier, AgentPropagation.KeyClassifier classifier) {
+            for (Map.Entry<String, List<String>> entry : toMap(carrier).entrySet()) {
+                List<String> values = entry.getValue();
+                if (!values.isEmpty() && !classifier.accept(entry.getKey(), values.get(0))) {
+                    return;
+                }
+            }
         }
-      }
-    }
 
-    @SuppressWarnings("unchecked")
-    protected static Map<String, List<String>> toMap(Headers headers) {
-      if (null != AS_MAP) {
-        try {
-          return (Map<String, List<String>>) AS_MAP.invokeExact(headers);
-        } catch (Throwable ignore) {
+        @SuppressWarnings("unchecked")
+        protected static Map<String, List<String>> toMap(Headers headers) {
+            if (null != AS_MAP) {
+                try {
+                    return (Map<String, List<String>>) AS_MAP.invokeExact(headers);
+                } catch (Throwable ignore) {
+                }
+            }
+            return headers.asJava().toMap();
         }
-      }
-      return headers.asJava().toMap();
-    }
 
-    private static MethodHandle asMap() {
-      try {
-        // this is available in Play 2.8 and doesn't copy
-        return MethodHandles.lookup()
-            .findVirtual(Headers.class, "asMap", MethodType.methodType(Map.class));
-      } catch (NoSuchMethodException | IllegalAccessException findFallback) {
-        try {
-          // this is available in Play 2.7 and doesn't copy
-          return MethodHandles.lookup()
-              .findVirtual(Headers.class, "toMap", MethodType.methodType(Map.class));
-        } catch (NoSuchMethodException | IllegalAccessException giveup) {
+        private static MethodHandle asMap() {
+            try {
+                // this is available in Play 2.8 and doesn't copy
+                return MethodHandles.lookup().findVirtual(Headers.class, "asMap", MethodType.methodType(Map.class));
+            } catch (NoSuchMethodException | IllegalAccessException findFallback) {
+                try {
+                    // this is available in Play 2.7 and doesn't copy
+                    return MethodHandles.lookup().findVirtual(Headers.class, "toMap", MethodType.methodType(Map.class));
+                } catch (NoSuchMethodException | IllegalAccessException giveup) {
+                }
+                return null;
+            }
         }
-        return null;
-      }
     }
-  }
 
-  public static final class Result implements AgentPropagation.ContextVisitor<play.api.mvc.Result> {
-    public static final Result GETTER = new Result();
+    public static final class Result implements AgentPropagation.ContextVisitor<play.api.mvc.Result> {
+        public static final Result GETTER = new Result();
 
-    @Override
-    public void forEachKey(play.api.mvc.Result carrier, AgentPropagation.KeyClassifier classifier) {
-      Iterator<Tuple2<String, String>> iterator = carrier.header().headers().iterator();
-      while (iterator.hasNext()) {
-        Tuple2<String, String> entry = iterator.next();
-        if (!classifier.accept(entry._1, entry._2)) {
-          return;
+        @Override
+        public void forEachKey(play.api.mvc.Result carrier, AgentPropagation.KeyClassifier classifier) {
+            Iterator<Tuple2<String, String>> iterator =
+                    carrier.header().headers().iterator();
+            while (iterator.hasNext()) {
+                Tuple2<String, String> entry = iterator.next();
+                if (!classifier.accept(entry._1, entry._2)) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayHttpServerDecorator.java b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayHttpServerDecorator.java
index 1018b576f3d..e51651c80f7 100644
--- a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayHttpServerDecorator.java
+++ b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayHttpServerDecorator.java
@@ -36,203 +36,189 @@
 import play.routing.Router;
 import scala.Option;
 
-public class PlayHttpServerDecorator
-    extends HttpServerDecorator<Request<?>, Request<?>, Result, Headers> {
-  private static final Logger LOG = LoggerFactory.getLogger(PlayHttpServerDecorator.class);
-  public static final boolean REPORT_HTTP_STATUS = Config.get().getPlayReportHttpStatus();
-  public static final CharSequence PLAY_REQUEST = UTF8BytesString.create("play.request");
-  public static final CharSequence PLAY_ACTION = UTF8BytesString.create("play-action");
-  public static final PlayHttpServerDecorator DECORATE = new PlayHttpServerDecorator();
-
-  private static final MethodHandle TYPED_KEY_GET_UNDERLYING;
-
-  private static final DDCache<String, CharSequence> PATH_CACHE = DDCaches.newFixedSizeCache(32);
-
-  static {
-    MethodHandles.Lookup lookup = MethodHandles.publicLookup();
-    MethodHandle typedKeyGetUnderlyingCheck = null;
-    try {
-      // This method was added in Play 2.6.8
-      typedKeyGetUnderlyingCheck =
-          lookup.findVirtual(
-              TypedKey.class,
-              "asScala",
-              MethodType.methodType(play.api.libs.typedmap.TypedKey.class));
-    } catch (final NoSuchMethodException | IllegalAccessException ignored) {
-    }
-    // Fallback
-    if (typedKeyGetUnderlyingCheck == null) {
-      try {
-        typedKeyGetUnderlyingCheck =
-            lookup.findGetter(TypedKey.class, "underlying", play.api.libs.typedmap.TypedKey.class);
-      } catch (final NoSuchFieldException | IllegalAccessException ignored) {
-      }
-    }
-    TYPED_KEY_GET_UNDERLYING = typedKeyGetUnderlyingCheck;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"play"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return PLAY_ACTION;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Headers> getter() {
-    return PlayHeaders.Request.GETTER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Result> responseGetter() {
-    return PlayHeaders.Result.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return PLAY_REQUEST;
-  }
-
-  @Override
-  protected String method(final Request<?> httpRequest) {
-    return httpRequest.method();
-  }
-
-  @Override
-  protected URIDataAdapter url(final Request<?> request) {
-    return new RequestURIDataAdapter(request);
-  }
-
-  @Override
-  protected String peerHostIP(final Request<?> request) {
-    RemoteConnection connection = request.connection();
-    if (connection instanceof RemoteConnectionWithRawAddress) {
-      return ((RemoteConnectionWithRawAddress) connection).rawRemoteAddressString();
-    } else {
-      return request.remoteAddress();
-    }
-  }
-
-  @Override
-  protected int peerPort(final Request<?> request) {
-    return 0;
-  }
-
-  @Override
-  protected int status(final Result httpResponse) {
-    return httpResponse.header().status();
-  }
-
-  @Override
-  protected void doOnRequest(
-      final AgentSpan span,
-      final Request<?> connection,
-      final Request<?> request,
-      final Context parentContext) {
-    super.doOnRequest(span, connection, request, parentContext);
-    if (request != null) {
-      // more about routes here:
-      // https://github.com/playframework/playframework/blob/master/documentation/manual/releases/release26/migration26/Migration26.md
-      Option<HandlerDef> defOption = Option.empty();
-      if (TYPED_KEY_GET_UNDERLYING != null) { // Should always be non-null but just to make sure
+public class PlayHttpServerDecorator extends HttpServerDecorator<Request<?>, Request<?>, Result, Headers> {
+    private static final Logger LOG = LoggerFactory.getLogger(PlayHttpServerDecorator.class);
+    public static final boolean REPORT_HTTP_STATUS = Config.get().getPlayReportHttpStatus();
+    public static final CharSequence PLAY_REQUEST = UTF8BytesString.create("play.request");
+    public static final CharSequence PLAY_ACTION = UTF8BytesString.create("play-action");
+    public static final PlayHttpServerDecorator DECORATE = new PlayHttpServerDecorator();
+
+    private static final MethodHandle TYPED_KEY_GET_UNDERLYING;
+
+    private static final DDCache<String, CharSequence> PATH_CACHE = DDCaches.newFixedSizeCache(32);
+
+    static {
+        MethodHandles.Lookup lookup = MethodHandles.publicLookup();
+        MethodHandle typedKeyGetUnderlyingCheck = null;
         try {
-          defOption =
-              request
-                  .attrs()
-                  .get(
-                      (play.api.libs.typedmap.TypedKey<HandlerDef>)
-                          TYPED_KEY_GET_UNDERLYING.invokeExact(Router.Attrs.HANDLER_DEF));
-        } catch (final Throwable ignored) {
+            // This method was added in Play 2.6.8
+            typedKeyGetUnderlyingCheck = lookup.findVirtual(
+                    TypedKey.class, "asScala", MethodType.methodType(play.api.libs.typedmap.TypedKey.class));
+        } catch (final NoSuchMethodException | IllegalAccessException ignored) {
         }
-      }
-      if (!defOption.isEmpty()) {
-        CharSequence path =
-            PATH_CACHE.computeIfAbsent(
-                defOption.get().path(), p -> addMissingSlash(p, request.path()));
-        HTTP_RESOURCE_DECORATOR.withRoute(span, request.method(), path, true);
-        dispatchRoute(span, path);
-      }
-    }
-  }
-
-  /**
-   * Play does not set the http.route in the local root span so we need to store it in the context
-   * for API security
-   */
-  private void dispatchRoute(final AgentSpan span, final CharSequence route) {
-    try {
-      final RequestContext ctx = span.getRequestContext();
-      if (ctx == null) {
-        return;
-      }
-      // Send event to IAST provider
-      final CallbackProvider cbpIast = tracer().getCallbackProvider(RequestContextSlot.IAST);
-      if (cbpIast != null) {
-        final BiConsumer<RequestContext, String> cb = cbpIast.getCallback(EVENTS.httpRoute());
-        if (cb != null) {
-          cb.accept(ctx, URIUtils.decode(route.toString()));
+        // Fallback
+        if (typedKeyGetUnderlyingCheck == null) {
+            try {
+                typedKeyGetUnderlyingCheck =
+                        lookup.findGetter(TypedKey.class, "underlying", play.api.libs.typedmap.TypedKey.class);
+            } catch (final NoSuchFieldException | IllegalAccessException ignored) {
+            }
         }
-      }
-      // Send event to AppSec provider
-      final CallbackProvider cbp = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
-      if (cbp != null) {
-        final BiConsumer<RequestContext, String> cb = cbp.getCallback(EVENTS.httpRoute());
-        if (cb != null) {
-          cb.accept(ctx, URIUtils.decode(route.toString()));
+        TYPED_KEY_GET_UNDERLYING = typedKeyGetUnderlyingCheck;
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"play"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return PLAY_ACTION;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Headers> getter() {
+        return PlayHeaders.Request.GETTER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Result> responseGetter() {
+        return PlayHeaders.Result.GETTER;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return PLAY_REQUEST;
+    }
+
+    @Override
+    protected String method(final Request<?> httpRequest) {
+        return httpRequest.method();
+    }
+
+    @Override
+    protected URIDataAdapter url(final Request<?> request) {
+        return new RequestURIDataAdapter(request);
+    }
+
+    @Override
+    protected String peerHostIP(final Request<?> request) {
+        RemoteConnection connection = request.connection();
+        if (connection instanceof RemoteConnectionWithRawAddress) {
+            return ((RemoteConnectionWithRawAddress) connection).rawRemoteAddressString();
+        } else {
+            return request.remoteAddress();
         }
-      }
-    } catch (final Throwable t) {
-      LOG.debug("Failed to dispatch route", t);
-    }
-  }
-
-  /*
-     This is a workaround to add a `/` if it is missing when using split routes.
-
-     https://www.playframework.com/documentation/2.8.x/sbtSubProjects#Splitting-the-route-file
-     PlayFramework routes compiler generates play.api.routing.HandlerDef.path without a `/`.
-
-     https://github.com/playframework/playframework/blob/main/dev-mode/routes-compiler/src/main/twirl/play/routes/compiler/inject/forwardsRouter.scala.twirl#L70
-  */
-  private CharSequence addMissingSlash(String routePath, String rawPath) {
-    int i = 0;
-    int m = Math.min(routePath.length(), rawPath.length());
-    while (i < m && routePath.charAt(i) == rawPath.charAt(i)) {
-      i++;
-    }
-    if (i < routePath.length() && routePath.charAt(i) != '/' && rawPath.charAt(i) == '/') {
-      StringBuilder sb = new StringBuilder(routePath.length() + 1);
-      sb.append(routePath, 0, i);
-      sb.append('/');
-      sb.append(routePath, i, routePath.length());
-      return sb;
-    }
-    return routePath;
-  }
-
-  @Override
-  protected void doOnError(
-      @Nonnull final AgentSpan span, @Nonnull Throwable throwable, byte errorPriority) {
-    if (REPORT_HTTP_STATUS) {
-      span.setHttpStatusCode(500);
-    }
-    if (throwable instanceof CompletionException && throwable.getCause() != null) {
-      throwable = throwable.getCause();
-    }
-    while ((throwable instanceof InvocationTargetException
-            || throwable instanceof UndeclaredThrowableException)
-        && throwable.getCause() != null) {
-      throwable = throwable.getCause();
-    }
-    super.doOnError(span, throwable, errorPriority);
-  }
-
-  public void updateOn404Only(final AgentSpan span, final Result result) {
-    if (SHOULD_SET_404_RESOURCE_NAME && status(result) == 404) {
-      span.setResourceName(NOT_FOUND_RESOURCE_NAME, ResourceNamePriorities.HTTP_404);
-    }
-  }
+    }
+
+    @Override
+    protected int peerPort(final Request<?> request) {
+        return 0;
+    }
+
+    @Override
+    protected int status(final Result httpResponse) {
+        return httpResponse.header().status();
+    }
+
+    @Override
+    protected void doOnRequest(
+            final AgentSpan span, final Request<?> connection, final Request<?> request, final Context parentContext) {
+        super.doOnRequest(span, connection, request, parentContext);
+        if (request != null) {
+            // more about routes here:
+            // https://github.com/playframework/playframework/blob/master/documentation/manual/releases/release26/migration26/Migration26.md
+            Option<HandlerDef> defOption = Option.empty();
+            if (TYPED_KEY_GET_UNDERLYING != null) { // Should always be non-null but just to make sure
+                try {
+                    defOption = request.attrs().get((play.api.libs.typedmap.TypedKey<HandlerDef>)
+                            TYPED_KEY_GET_UNDERLYING.invokeExact(Router.Attrs.HANDLER_DEF));
+                } catch (final Throwable ignored) {
+                }
+            }
+            if (!defOption.isEmpty()) {
+                CharSequence path =
+                        PATH_CACHE.computeIfAbsent(defOption.get().path(), p -> addMissingSlash(p, request.path()));
+                HTTP_RESOURCE_DECORATOR.withRoute(span, request.method(), path, true);
+                dispatchRoute(span, path);
+            }
+        }
+    }
+
+    /**
+     * Play does not set the http.route in the local root span so we need to store it in the context
+     * for API security
+     */
+    private void dispatchRoute(final AgentSpan span, final CharSequence route) {
+        try {
+            final RequestContext ctx = span.getRequestContext();
+            if (ctx == null) {
+                return;
+            }
+            // Send event to IAST provider
+            final CallbackProvider cbpIast = tracer().getCallbackProvider(RequestContextSlot.IAST);
+            if (cbpIast != null) {
+                final BiConsumer<RequestContext, String> cb = cbpIast.getCallback(EVENTS.httpRoute());
+                if (cb != null) {
+                    cb.accept(ctx, URIUtils.decode(route.toString()));
+                }
+            }
+            // Send event to AppSec provider
+            final CallbackProvider cbp = tracer().getCallbackProvider(RequestContextSlot.APPSEC);
+            if (cbp != null) {
+                final BiConsumer<RequestContext, String> cb = cbp.getCallback(EVENTS.httpRoute());
+                if (cb != null) {
+                    cb.accept(ctx, URIUtils.decode(route.toString()));
+                }
+            }
+        } catch (final Throwable t) {
+            LOG.debug("Failed to dispatch route", t);
+        }
+    }
+
+    /*
+       This is a workaround to add a `/` if it is missing when using split routes.
+
+       https://www.playframework.com/documentation/2.8.x/sbtSubProjects#Splitting-the-route-file
+       PlayFramework routes compiler generates play.api.routing.HandlerDef.path without a `/`.
+
+       https://github.com/playframework/playframework/blob/main/dev-mode/routes-compiler/src/main/twirl/play/routes/compiler/inject/forwardsRouter.scala.twirl#L70
+    */
+    private CharSequence addMissingSlash(String routePath, String rawPath) {
+        int i = 0;
+        int m = Math.min(routePath.length(), rawPath.length());
+        while (i < m && routePath.charAt(i) == rawPath.charAt(i)) {
+            i++;
+        }
+        if (i < routePath.length() && routePath.charAt(i) != '/' && rawPath.charAt(i) == '/') {
+            StringBuilder sb = new StringBuilder(routePath.length() + 1);
+            sb.append(routePath, 0, i);
+            sb.append('/');
+            sb.append(routePath, i, routePath.length());
+            return sb;
+        }
+        return routePath;
+    }
+
+    @Override
+    protected void doOnError(@Nonnull final AgentSpan span, @Nonnull Throwable throwable, byte errorPriority) {
+        if (REPORT_HTTP_STATUS) {
+            span.setHttpStatusCode(500);
+        }
+        if (throwable instanceof CompletionException && throwable.getCause() != null) {
+            throwable = throwable.getCause();
+        }
+        while ((throwable instanceof InvocationTargetException || throwable instanceof UndeclaredThrowableException)
+                && throwable.getCause() != null) {
+            throwable = throwable.getCause();
+        }
+        super.doOnError(span, throwable, errorPriority);
+    }
+
+    public void updateOn404Only(final AgentSpan span, final Result result) {
+        if (SHOULD_SET_404_RESOURCE_NAME && status(result) == 404) {
+            span.setResourceName(NOT_FOUND_RESOURCE_NAME, ResourceNamePriorities.HTTP_404);
+        }
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayInstrumentation.java
index 0b707d3b3a0..85d86a8f9db 100644
--- a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayInstrumentation.java
@@ -13,47 +13,47 @@
 
 @AutoService(InstrumenterModule.class)
 public final class PlayInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public PlayInstrumentation() {
-    super("play");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "play26Plus";
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "play.api.mvc.Action";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".PlayHeaders",
-      packageName + ".PlayHeaders$Request",
-      packageName + ".PlayHeaders$Result",
-      packageName + ".PlayHttpServerDecorator",
-      packageName + ".RemoteConnectionWithRawAddress",
-      packageName + ".RequestCompleteCallback",
-      packageName + ".RequestURIDataAdapter",
-      packageName + ".HasPlayRequestSpan",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("apply")
-            .and(takesArgument(0, named("play.api.mvc.Request")))
-            .and(returns(named("scala.concurrent.Future"))),
-        packageName + ".PlayAdvice");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public PlayInstrumentation() {
+        super("play");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "play26Plus";
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "play.api.mvc.Action";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".PlayHeaders",
+            packageName + ".PlayHeaders$Request",
+            packageName + ".PlayHeaders$Result",
+            packageName + ".PlayHttpServerDecorator",
+            packageName + ".RemoteConnectionWithRawAddress",
+            packageName + ".RequestCompleteCallback",
+            packageName + ".RequestURIDataAdapter",
+            packageName + ".HasPlayRequestSpan",
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("apply")
+                        .and(takesArgument(0, named("play.api.mvc.Request")))
+                        .and(returns(named("scala.concurrent.Future"))),
+                packageName + ".PlayAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/RemoteConnectionWithRawAddress.java b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/RemoteConnectionWithRawAddress.java
index 8d1976a0e16..6ff3ada1ba5 100644
--- a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/RemoteConnectionWithRawAddress.java
+++ b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/RemoteConnectionWithRawAddress.java
@@ -7,35 +7,35 @@
 import scala.collection.Seq;
 
 public class RemoteConnectionWithRawAddress implements RemoteConnection {
-  private final RemoteConnection rawConnection;
-  private final RemoteConnection delegate;
-
-  public RemoteConnectionWithRawAddress(RemoteConnection rawConnection, RemoteConnection delegate) {
-    this.rawConnection = rawConnection;
-    this.delegate = delegate;
-  }
-
-  @Override
-  public InetAddress remoteAddress() {
-    return delegate.remoteAddress();
-  }
-
-  @Override
-  public String remoteAddressString() {
-    return delegate.remoteAddressString();
-  }
-
-  public String rawRemoteAddressString() {
-    return rawConnection.remoteAddressString();
-  }
-
-  @Override
-  public boolean secure() {
-    return delegate.secure();
-  }
-
-  @Override
-  public Option<Seq<X509Certificate>> clientCertificateChain() {
-    return delegate.clientCertificateChain();
-  }
+    private final RemoteConnection rawConnection;
+    private final RemoteConnection delegate;
+
+    public RemoteConnectionWithRawAddress(RemoteConnection rawConnection, RemoteConnection delegate) {
+        this.rawConnection = rawConnection;
+        this.delegate = delegate;
+    }
+
+    @Override
+    public InetAddress remoteAddress() {
+        return delegate.remoteAddress();
+    }
+
+    @Override
+    public String remoteAddressString() {
+        return delegate.remoteAddressString();
+    }
+
+    public String rawRemoteAddressString() {
+        return rawConnection.remoteAddressString();
+    }
+
+    @Override
+    public boolean secure() {
+        return delegate.secure();
+    }
+
+    @Override
+    public Option<Seq<X509Certificate>> clientCertificateChain() {
+        return delegate.clientCertificateChain();
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/RequestCompleteCallback.java b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/RequestCompleteCallback.java
index 30c49ab6456..67dc1188758 100644
--- a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/RequestCompleteCallback.java
+++ b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/RequestCompleteCallback.java
@@ -12,35 +12,35 @@
 
 public class RequestCompleteCallback extends scala.runtime.AbstractFunction1<Try<Result>, Object> {
 
-  private static final Logger log = LoggerFactory.getLogger(RequestCompleteCallback.class);
+    private static final Logger log = LoggerFactory.getLogger(RequestCompleteCallback.class);
 
-  private final AgentSpan span;
-  private final ContextScope scope;
+    private final AgentSpan span;
+    private final ContextScope scope;
 
-  public RequestCompleteCallback(final ContextScope scope) {
-    this.span = AgentSpan.fromContext(scope.context());
-    this.scope = scope;
-  }
+    public RequestCompleteCallback(final ContextScope scope) {
+        this.span = AgentSpan.fromContext(scope.context());
+        this.scope = scope;
+    }
 
-  @Override
-  public Object apply(final Try<Result> result) {
-    try {
-      if (result.isFailure()) {
-        DECORATE.onError(span, result.failed().get());
-      } else {
-        Result response = result.get();
-        if (REPORT_HTTP_STATUS) {
-          DECORATE.onResponse(span, response);
-        } else {
-          DECORATE.updateOn404Only(span, response);
+    @Override
+    public Object apply(final Try<Result> result) {
+        try {
+            if (result.isFailure()) {
+                DECORATE.onError(span, result.failed().get());
+            } else {
+                Result response = result.get();
+                if (REPORT_HTTP_STATUS) {
+                    DECORATE.onResponse(span, response);
+                } else {
+                    DECORATE.updateOn404Only(span, response);
+                }
+            }
+            DECORATE.beforeFinish(scope.context());
+        } catch (final Throwable t) {
+            log.debug("error in play instrumentation", t);
+        } finally {
+            span.finish();
         }
-      }
-      DECORATE.beforeFinish(scope.context());
-    } catch (final Throwable t) {
-      log.debug("error in play instrumentation", t);
-    } finally {
-      span.finish();
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/RequestURIDataAdapter.java
index d2bd4ba01a1..30221b1c8d1 100644
--- a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/RequestURIDataAdapter.java
+++ b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/RequestURIDataAdapter.java
@@ -5,44 +5,44 @@
 
 final class RequestURIDataAdapter extends URIRawDataAdapter {
 
-  private final Request request;
-  private final String host;
-  private final int port;
-
-  RequestURIDataAdapter(Request request) {
-    this.request = request;
-    int split = request.host().lastIndexOf(':');
-    this.host = split == -1 ? request.host() : request.host().substring(0, split);
-    this.port = split == -1 ? 0 : Integer.parseInt(request.host().substring(split + 1));
-  }
-
-  @Override
-  public String scheme() {
-    return request.secure() ? "https" : "http";
-  }
-
-  @Override
-  public String host() {
-    return host;
-  }
-
-  @Override
-  public int port() {
-    return port;
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return request.path();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return request.rawQueryString();
-  }
+    private final Request request;
+    private final String host;
+    private final int port;
+
+    RequestURIDataAdapter(Request request) {
+        this.request = request;
+        int split = request.host().lastIndexOf(':');
+        this.host = split == -1 ? request.host() : request.host().substring(0, split);
+        this.port = split == -1 ? 0 : Integer.parseInt(request.host().substring(split + 1));
+    }
+
+    @Override
+    public String scheme() {
+        return request.secure() ? "https" : "http";
+    }
+
+    @Override
+    public String host() {
+        return host;
+    }
+
+    @Override
+    public int port() {
+        return port;
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return request.path();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return request.rawQueryString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/SaveRawRemoteConnectionInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/SaveRawRemoteConnectionInstrumentation.java
index 35e1974ceb3..c2602562c8e 100644
--- a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/SaveRawRemoteConnectionInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/SaveRawRemoteConnectionInstrumentation.java
@@ -15,41 +15,41 @@
 
 @AutoService(InstrumenterModule.class)
 public class SaveRawRemoteConnectionInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public SaveRawRemoteConnectionInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public SaveRawRemoteConnectionInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "play26Plus";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "play26Plus";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.core.server.common.ForwardedHeaderHandler";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.core.server.common.ForwardedHeaderHandler";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("forwardedConnection")
-            .and(not(isStatic()))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("play.api.mvc.request.RemoteConnection")))
-            .and(takesArgument(1, named("play.api.mvc.Headers")))
-            .and(returns(named("play.api.mvc.request.RemoteConnection"))),
-        SaveRawRemoteConnectionInstrumentation.class.getName() + "$ForwardedConnectionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("forwardedConnection")
+                        .and(not(isStatic()))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("play.api.mvc.request.RemoteConnection")))
+                        .and(takesArgument(1, named("play.api.mvc.Headers")))
+                        .and(returns(named("play.api.mvc.request.RemoteConnection"))),
+                SaveRawRemoteConnectionInstrumentation.class.getName() + "$ForwardedConnectionAdvice");
+    }
 
-  static class ForwardedConnectionAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(
-        @Advice.Argument(0) RemoteConnection rawConnection,
-        @Advice.Return(readOnly = false) RemoteConnection retConnection) {
-      if (rawConnection != retConnection && rawConnection != null) {
-        retConnection = new RemoteConnectionWithRawAddress(rawConnection, retConnection);
-      }
+    static class ForwardedConnectionAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(
+                @Advice.Argument(0) RemoteConnection rawConnection,
+                @Advice.Return(readOnly = false) RemoteConnection retConnection) {
+            if (rawConnection != retConnection && rawConnection != null) {
+                retConnection = new RemoteConnectionWithRawAddress(rawConnection, retConnection);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.6/src/testFixtures/java/datadog/trace/instrumentation/play26/server/TestHttpErrorHandler.java b/dd-java-agent/instrumentation/play/play-2.6/src/testFixtures/java/datadog/trace/instrumentation/play26/server/TestHttpErrorHandler.java
index f4a4055480c..b82a53ee43f 100644
--- a/dd-java-agent/instrumentation/play/play-2.6/src/testFixtures/java/datadog/trace/instrumentation/play26/server/TestHttpErrorHandler.java
+++ b/dd-java-agent/instrumentation/play/play-2.6/src/testFixtures/java/datadog/trace/instrumentation/play26/server/TestHttpErrorHandler.java
@@ -12,31 +12,30 @@
 import play.mvc.Results;
 
 public class TestHttpErrorHandler implements HttpErrorHandler {
-  private static final Logger log = LoggerFactory.getLogger(TestHttpErrorHandler.class);
+    private static final Logger log = LoggerFactory.getLogger(TestHttpErrorHandler.class);
 
-  public static class CustomRuntimeException extends RuntimeException {
-    public CustomRuntimeException(String message) {
-      super(message);
+    public static class CustomRuntimeException extends RuntimeException {
+        public CustomRuntimeException(String message) {
+            super(message);
+        }
     }
-  }
 
-  public CompletionStage<Result> onClientError(
-      RequestHeader request, int statusCode, String message) {
-    return CompletableFuture.completedFuture(Results.status(statusCode, message));
-  }
+    public CompletionStage<Result> onClientError(RequestHeader request, int statusCode, String message) {
+        return CompletableFuture.completedFuture(Results.status(statusCode, message));
+    }
 
-  public CompletionStage<Result> onServerError(RequestHeader request, Throwable exception) {
-    log.warn("server error", exception);
+    public CompletionStage<Result> onServerError(RequestHeader request, Throwable exception) {
+        log.warn("server error", exception);
 
-    Throwable cause = exception.getCause();
-    if (cause != null) {
-      exception = cause;
-    }
-    if (exception instanceof CustomRuntimeException) {
-      return CompletableFuture.completedFuture(
-          Results.status(CUSTOM_EXCEPTION.getStatus(), exception.getMessage()));
-    }
+        Throwable cause = exception.getCause();
+        if (cause != null) {
+            exception = cause;
+        }
+        if (exception instanceof CustomRuntimeException) {
+            return CompletableFuture.completedFuture(
+                    Results.status(CUSTOM_EXCEPTION.getStatus(), exception.getMessage()));
+        }
 
-    return CompletableFuture.completedFuture(Results.internalServerError(exception.getMessage()));
-  }
+        return CompletableFuture.completedFuture(Results.internalServerError(exception.getMessage()));
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java
index 8b7c89dcc8f..1ef994364da 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java
@@ -15,117 +15,113 @@
 import play.libs.F;
 
 public class ArgumentCaptureWrappers {
-  public static class ArgumentCaptureFunction<R> implements Function<Object, R> {
-    private final Function<Object, R> delegate;
-
-    public ArgumentCaptureFunction(Function<Object, R> delegate) {
-      this.delegate = delegate;
-    }
-
-    @Override
-    public R apply(Object o) {
-      if (o == null) {
-        return delegate.apply(null);
-      }
-
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan == null) {
-        return delegate.apply(o);
-      }
-
-      RequestContext requestContext = agentSpan.getRequestContext();
-      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
-        return delegate.apply(o);
-      }
-
-      Map<String, Object> conv = Collections.singletonMap("0", o);
-
-      BlockingException t =
-          PathExtractionHelpers.callRequestPathParamsCallback(
-              requestContext, conv, "RoutingDsl#routeTo");
-      if (t != null) {
-        throw t;
-      }
-
-      return delegate.apply(o);
-    }
-  }
-
-  public static class ArgumentCaptureBiFunction<R> implements BiFunction<Object, Object, R> {
-    private final BiFunction<Object, Object, R> delegate;
-
-    public ArgumentCaptureBiFunction(BiFunction<Object, Object, R> delegate) {
-      this.delegate = delegate;
+    public static class ArgumentCaptureFunction<R> implements Function<Object, R> {
+        private final Function<Object, R> delegate;
+
+        public ArgumentCaptureFunction(Function<Object, R> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public R apply(Object o) {
+            if (o == null) {
+                return delegate.apply(null);
+            }
+
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan == null) {
+                return delegate.apply(o);
+            }
+
+            RequestContext requestContext = agentSpan.getRequestContext();
+            if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+                return delegate.apply(o);
+            }
+
+            Map<String, Object> conv = Collections.singletonMap("0", o);
+
+            BlockingException t =
+                    PathExtractionHelpers.callRequestPathParamsCallback(requestContext, conv, "RoutingDsl#routeTo");
+            if (t != null) {
+                throw t;
+            }
+
+            return delegate.apply(o);
+        }
     }
 
-    @Override
-    public R apply(Object o1, Object o2) {
-      if (o1 == null && o2 == null) {
-        return delegate.apply(null, null);
-      }
-
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan == null) {
-        return delegate.apply(o1, o2);
-      }
-
-      RequestContext requestContext = agentSpan.getRequestContext();
-      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
-        return delegate.apply(o1, o2);
-      }
-
-      Map<String, Object> conv = new HashMap<>();
-      conv.put("0", o1);
-      conv.put("1", o2);
-
-      BlockingException t =
-          PathExtractionHelpers.callRequestPathParamsCallback(
-              requestContext, conv, "RoutingDsl#routeTo");
-      if (t != null) {
-        throw t;
-      }
-
-      return delegate.apply(o1, o2);
-    }
-  }
-
-  public static class ArgumentCaptureFunction3<R>
-      implements F.Function3<Object, Object, Object, R> {
-    private final F.Function3<Object, Object, Object, R> delegate;
-
-    public ArgumentCaptureFunction3(F.Function3<Object, Object, Object, R> delegate) {
-      this.delegate = delegate;
+    public static class ArgumentCaptureBiFunction<R> implements BiFunction<Object, Object, R> {
+        private final BiFunction<Object, Object, R> delegate;
+
+        public ArgumentCaptureBiFunction(BiFunction<Object, Object, R> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public R apply(Object o1, Object o2) {
+            if (o1 == null && o2 == null) {
+                return delegate.apply(null, null);
+            }
+
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan == null) {
+                return delegate.apply(o1, o2);
+            }
+
+            RequestContext requestContext = agentSpan.getRequestContext();
+            if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+                return delegate.apply(o1, o2);
+            }
+
+            Map<String, Object> conv = new HashMap<>();
+            conv.put("0", o1);
+            conv.put("1", o2);
+
+            BlockingException t =
+                    PathExtractionHelpers.callRequestPathParamsCallback(requestContext, conv, "RoutingDsl#routeTo");
+            if (t != null) {
+                throw t;
+            }
+
+            return delegate.apply(o1, o2);
+        }
     }
 
-    @Override
-    public R apply(Object o1, Object o2, Object o3) throws Throwable {
-      if (o1 == null && o2 == null && o3 == null) {
-        return delegate.apply(null, null, null);
-      }
-
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan == null) {
-        return delegate.apply(o1, o2, o3);
-      }
-
-      RequestContext requestContext = agentSpan.getRequestContext();
-      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
-        return delegate.apply(o1, o2, o3);
-      }
-
-      Map<String, Object> conv = new HashMap<>();
-      conv.put("0", o1);
-      conv.put("1", o2);
-      conv.put("2", o3);
-
-      BlockingException t =
-          PathExtractionHelpers.callRequestPathParamsCallback(
-              requestContext, conv, "RoutingDsl#routeTo");
-      if (t != null) {
-        throw t;
-      }
-
-      return delegate.apply(o1, o2, o3);
+    public static class ArgumentCaptureFunction3<R> implements F.Function3<Object, Object, Object, R> {
+        private final F.Function3<Object, Object, Object, R> delegate;
+
+        public ArgumentCaptureFunction3(F.Function3<Object, Object, Object, R> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public R apply(Object o1, Object o2, Object o3) throws Throwable {
+            if (o1 == null && o2 == null && o3 == null) {
+                return delegate.apply(null, null, null);
+            }
+
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan == null) {
+                return delegate.apply(o1, o2, o3);
+            }
+
+            RequestContext requestContext = agentSpan.getRequestContext();
+            if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+                return delegate.apply(o1, o2, o3);
+            }
+
+            Map<String, Object> conv = new HashMap<>();
+            conv.put("0", o1);
+            conv.put("1", o2);
+            conv.put("2", o3);
+
+            BlockingException t =
+                    PathExtractionHelpers.callRequestPathParamsCallback(requestContext, conv, "RoutingDsl#routeTo");
+            if (t != null) {
+                throw t;
+            }
+
+            return delegate.apply(o1, o2, o3);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java
index 8ad4565fb25..bf426ce4e97 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java
@@ -10,18 +10,14 @@
  * @see BodyParser.DelegatingBodyParser#apply(Http.RequestHeader)
  */
 public class BodyParserDelegatingBodyParserApplyAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  static void after(
-      @Advice.This BodyParser thiz,
-      @Advice.Return(readOnly = false) play.libs.streams.Accumulator ret) {
-    if (!thiz.getClass().getName().equals("play.mvc.BodyParser$MultipartFormData")) {
-      return;
-    }
-    Accumulator<
-            akka.util.ByteString, play.libs.F.Either<play.mvc.Result, Http.MultipartFormData<?>>>
-        acc = ret;
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    static void after(
+            @Advice.This BodyParser thiz, @Advice.Return(readOnly = false) play.libs.streams.Accumulator ret) {
+        if (!thiz.getClass().getName().equals("play.mvc.BodyParser$MultipartFormData")) {
+            return;
+        }
+        Accumulator<akka.util.ByteString, play.libs.F.Either<play.mvc.Result, Http.MultipartFormData<?>>> acc = ret;
 
-    ret =
-        acc.recover(JavaMultipartFormDataRegisterExcF.INSTANCE, JavaParsers$.MODULE$.trampoline());
-  }
+        ret = acc.recover(JavaMultipartFormDataRegisterExcF.INSTANCE, JavaParsers$.MODULE$.trampoline());
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java
index be989ac774e..e440b4c8583 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java
@@ -10,17 +10,16 @@
  * @see play.mvc.BodyParser.FormUrlEncoded#parse(Http.RequestHeader, ByteString)
  */
 public class BodyParserFormUrlEncodedParseAdvice {
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  static void after(
-      @Advice.Return Map<String, String[]> ret, @Advice.Thrown(readOnly = false) Throwable t) {
-    if (t != null) {
-      return;
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    static void after(@Advice.Return Map<String, String[]> ret, @Advice.Thrown(readOnly = false) Throwable t) {
+        if (t != null) {
+            return;
+        }
+        try {
+            // error is reported as client error, which doesn't preserve the exception
+            BodyParserHelpers.handleArbitraryPostDataWithSpanError(ret, "FormUrlEncoded#parse");
+        } catch (BlockingException be) {
+            t = be;
+        }
     }
-    try {
-      // error is reported as client error, which doesn't preserve the exception
-      BodyParserHelpers.handleArbitraryPostDataWithSpanError(ret, "FormUrlEncoded#parse");
-    } catch (BlockingException be) {
-      t = be;
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java
index 0eba7744dff..79bf6ce417c 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java
@@ -50,496 +50,487 @@
 
 public class BodyParserHelpers {
 
-  public static final int MAX_CONVERSION_DEPTH = 10;
-  private static final Logger log = LoggerFactory.getLogger(BodyParserHelpers.class);
-  public static final int MAX_RECURSION = 15;
-
-  // Cached via reflection to avoid embedding a hard binary reference to
-  // files():Lscala/collection/Seq; — the return type changed to
-  // Lscala/collection/immutable/Seq; in Scala 2.13 (Play 2.7+), which would
-  // cause muzzle to disable the instrumentation for Play 2.7.
-  private static final Method MULTIPART_FILES_METHOD;
-
-  // Cached via reflection: FilePart.ref() returns the generic file reference (TemporaryFile in
-  // Play 2.5/2.6), and TemporaryFile.file() returns java.io.File. Using reflection avoids
-  // embedding bytecode references to TemporaryFile that could break muzzle.
-  private static final Method FILE_PART_REF;
-  private static final Method TEMP_FILE_FILE;
-
-  public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
-  public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
-
-  static {
-    Method m = null;
-    try {
-      m = MultipartFormData.class.getMethod("files");
-    } catch (Exception ignored) {
-    }
-    MULTIPART_FILES_METHOD = m;
+    public static final int MAX_CONVERSION_DEPTH = 10;
+    private static final Logger log = LoggerFactory.getLogger(BodyParserHelpers.class);
+    public static final int MAX_RECURSION = 15;
+
+    // Cached via reflection to avoid embedding a hard binary reference to
+    // files():Lscala/collection/Seq; — the return type changed to
+    // Lscala/collection/immutable/Seq; in Scala 2.13 (Play 2.7+), which would
+    // cause muzzle to disable the instrumentation for Play 2.7.
+    private static final Method MULTIPART_FILES_METHOD;
+
+    // Cached via reflection: FilePart.ref() returns the generic file reference (TemporaryFile in
+    // Play 2.5/2.6), and TemporaryFile.file() returns java.io.File. Using reflection avoids
+    // embedding bytecode references to TemporaryFile that could break muzzle.
+    private static final Method FILE_PART_REF;
+    private static final Method TEMP_FILE_FILE;
+
+    public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
+    public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
+
+    static {
+        Method m = null;
+        try {
+            m = MultipartFormData.class.getMethod("files");
+        } catch (Exception ignored) {
+        }
+        MULTIPART_FILES_METHOD = m;
 
-    Method ref = null;
-    Method file = null;
-    try {
-      ref = MultipartFormData.FilePart.class.getMethod("ref");
-    } catch (Exception ignored) {
-    }
-    try {
-      file =
-          Class.forName(
-                  "play.api.libs.Files$TemporaryFile",
-                  false,
-                  BodyParserHelpers.class.getClassLoader())
-              .getMethod("file");
-    } catch (Exception ignored) {
-    }
-    FILE_PART_REF = ref;
-    TEMP_FILE_FILE = file;
-  }
-
-  private static JFunction1<
-          scala.collection.immutable.Map<String, Seq<String>>,
-          scala.collection.immutable.Map<String, Seq<String>>>
-      HANDLE_URL_ENCODED = BodyParserHelpers::handleUrlEncoded;
-  private static JFunction1<String, String> HANDLE_TEXT = BodyParserHelpers::handleText;
-  private static JFunction1<MultipartFormData<?>, MultipartFormData<?>> HANDLE_MULTIPART_FORM_DATA =
-      BodyParserHelpers::handleMultipartFormData;
-  private static JFunction1<JsValue, JsValue> HANDLE_JSON = BodyParserHelpers::handleJson;
-
-  private BodyParserHelpers() {}
-
-  public static Function1<
-          scala.collection.immutable.Map<String, Seq<String>>,
-          scala.collection.immutable.Map<String, Seq<String>>>
-      getHandleUrlEncodedMapF() {
-    return HANDLE_URL_ENCODED;
-  }
-
-  private static scala.collection.immutable.Map<String, Seq<String>> handleUrlEncoded(
-      scala.collection.immutable.Map<String, Seq<String>> data) {
-    if (data == null || data.isEmpty()) {
-      return data;
+        Method ref = null;
+        Method file = null;
+        try {
+            ref = MultipartFormData.FilePart.class.getMethod("ref");
+        } catch (Exception ignored) {
+        }
+        try {
+            file = Class.forName("play.api.libs.Files$TemporaryFile", false, BodyParserHelpers.class.getClassLoader())
+                    .getMethod("file");
+        } catch (Exception ignored) {
+        }
+        FILE_PART_REF = ref;
+        TEMP_FILE_FILE = file;
     }
 
-    try {
-      Object conv = tryConvertingScalaContainers(data, MAX_CONVERSION_DEPTH);
-      handleArbitraryPostData(conv, "tolerantFormUrlEncoded");
-    } catch (Exception e) {
-      handleException(e, "Error handling result of tolerantFormUrlEncoded BodyParser");
-    }
-    return data;
-  }
+    private static JFunction1<
+                    scala.collection.immutable.Map<String, Seq<String>>,
+                    scala.collection.immutable.Map<String, Seq<String>>>
+            HANDLE_URL_ENCODED = BodyParserHelpers::handleUrlEncoded;
+    private static JFunction1<String, String> HANDLE_TEXT = BodyParserHelpers::handleText;
+    private static JFunction1<MultipartFormData<?>, MultipartFormData<?>> HANDLE_MULTIPART_FORM_DATA =
+            BodyParserHelpers::handleMultipartFormData;
+    private static JFunction1<JsValue, JsValue> HANDLE_JSON = BodyParserHelpers::handleJson;
 
-  public static Function1<String, String> getHandleStringMapF() {
-    return HANDLE_TEXT;
-  }
+    private BodyParserHelpers() {}
 
-  private static String handleText(String s) {
-    if (s == null || s.isEmpty()) {
-      return s;
+    public static Function1<
+                    scala.collection.immutable.Map<String, Seq<String>>,
+                    scala.collection.immutable.Map<String, Seq<String>>>
+            getHandleUrlEncodedMapF() {
+        return HANDLE_URL_ENCODED;
     }
 
-    try {
-      handleArbitraryPostData(s, "tolerantText");
-    } catch (Exception e) {
-      handleException(e, "Error handling result of tolerantText BodyParser");
-    }
+    private static scala.collection.immutable.Map<String, Seq<String>> handleUrlEncoded(
+            scala.collection.immutable.Map<String, Seq<String>> data) {
+        if (data == null || data.isEmpty()) {
+            return data;
+        }
 
-    return s;
-  }
-
-  public static Function1<MultipartFormData<?>, MultipartFormData<?>>
-      getHandleMultipartFormDataF() {
-    return HANDLE_MULTIPART_FORM_DATA;
-  }
-
-  private static MultipartFormData<?> handleMultipartFormData(MultipartFormData<?> data) {
-    scala.collection.immutable.Map<String, Seq<String>> mpfd = data.asFormUrlEncoded();
-    BlockingException pendingBlock = null;
-
-    if (mpfd != null && !mpfd.isEmpty()) {
-      try {
-        Object conv = tryConvertingScalaContainers(mpfd, MAX_CONVERSION_DEPTH);
-        handleArbitraryPostData(conv, "multipartFormData");
-      } catch (BlockingException be) {
-        pendingBlock = be;
-      } catch (Exception e) {
-        log.debug("Error handling result of multipartFormData BodyParser", e);
-      }
+        try {
+            Object conv = tryConvertingScalaContainers(data, MAX_CONVERSION_DEPTH);
+            handleArbitraryPostData(conv, "tolerantFormUrlEncoded");
+        } catch (Exception e) {
+            handleException(e, "Error handling result of tolerantFormUrlEncoded BodyParser");
+        }
+        return data;
     }
 
-    try {
-      if (MULTIPART_FILES_METHOD != null) {
-        Object files = MULTIPART_FILES_METHOD.invoke(data);
-        if (files instanceof scala.collection.Iterable) {
-          handleMultipartFilenames(
-              new ScalaIteratorAdapter(((scala.collection.Iterable<?>) files).iterator()));
-        }
-      }
-    } catch (BlockingException be) {
-      if (pendingBlock == null) pendingBlock = be;
-    } catch (Exception e) {
-      log.debug("Error handling multipartFormData filenames", e);
+    public static Function1<String, String> getHandleStringMapF() {
+        return HANDLE_TEXT;
     }
 
-    if (pendingBlock == null) {
-      try {
-        if (MULTIPART_FILES_METHOD != null) {
-          Object files = MULTIPART_FILES_METHOD.invoke(data);
-          if (files instanceof scala.collection.Iterable) {
-            handleMultipartFilesContent(
-                new ScalaIteratorAdapter(((scala.collection.Iterable<?>) files).iterator()));
-          }
-        }
-      } catch (BlockingException be) {
-        pendingBlock = be;
-      } catch (Exception e) {
-        log.debug("Error handling multipartFormData files content", e);
-      }
-    }
+    private static String handleText(String s) {
+        if (s == null || s.isEmpty()) {
+            return s;
+        }
 
-    if (pendingBlock != null) throw pendingBlock;
-    return data;
-  }
+        try {
+            handleArbitraryPostData(s, "tolerantText");
+        } catch (Exception e) {
+            handleException(e, "Error handling result of tolerantText BodyParser");
+        }
 
-  private static void handleMultipartFilenames(java.util.Iterator<?> iterator) {
-    AgentSpan span = activeSpan();
-    if (span == null) {
-      return;
-    }
-    RequestContext reqCtx = span.getRequestContext();
-    if (reqCtx == null || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
-      return;
+        return s;
     }
 
-    List<String> filenames = collectFilenames(iterator);
-    if (filenames.isEmpty()) {
-      return;
+    public static Function1<MultipartFormData<?>, MultipartFormData<?>> getHandleMultipartFormDataF() {
+        return HANDLE_MULTIPART_FORM_DATA;
     }
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestFilesFilenames());
-    if (callback == null) {
-      return;
-    }
-    executeFilenamesCallback(reqCtx, callback, filenames);
-  }
-
-  @VisibleForTesting
-  static List<String> collectFilenames(java.util.Iterator<?> iterator) {
-    List<String> filenames = new ArrayList<>();
-    while (iterator.hasNext()) {
-      MultipartFormData.FilePart<?> part = (MultipartFormData.FilePart<?>) iterator.next();
-      String filename = part.filename();
-      if (filename != null && !filename.isEmpty()) {
-        filenames.add(filename);
-      }
-    }
-    return filenames;
-  }
-
-  private static void executeFilenamesCallback(
-      RequestContext reqCtx,
-      BiFunction<RequestContext, List<String>, Flow<Void>> callback,
-      List<String> filenames) {
-    Flow<Void> flow = callback.apply(reqCtx, filenames);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        boolean success = brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-        if (success) {
-          throw new BlockingException("Blocked request (multipart file upload)");
-        }
-      }
-    }
-  }
+    private static MultipartFormData<?> handleMultipartFormData(MultipartFormData<?> data) {
+        scala.collection.immutable.Map<String, Seq<String>> mpfd = data.asFormUrlEncoded();
+        BlockingException pendingBlock = null;
 
-  private static void handleMultipartFilesContent(java.util.Iterator<?> iterator) {
-    AgentSpan span = activeSpan();
-    if (span == null) {
-      return;
-    }
-    RequestContext reqCtx = span.getRequestContext();
-    if (reqCtx == null || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
-      return;
-    }
+        if (mpfd != null && !mpfd.isEmpty()) {
+            try {
+                Object conv = tryConvertingScalaContainers(mpfd, MAX_CONVERSION_DEPTH);
+                handleArbitraryPostData(conv, "multipartFormData");
+            } catch (BlockingException be) {
+                pendingBlock = be;
+            } catch (Exception e) {
+                log.debug("Error handling result of multipartFormData BodyParser", e);
+            }
+        }
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestFilesContent());
-    if (callback == null) {
-      return;
-    }
+        try {
+            if (MULTIPART_FILES_METHOD != null) {
+                Object files = MULTIPART_FILES_METHOD.invoke(data);
+                if (files instanceof scala.collection.Iterable) {
+                    handleMultipartFilenames(
+                            new ScalaIteratorAdapter(((scala.collection.Iterable<?>) files).iterator()));
+                }
+            }
+        } catch (BlockingException be) {
+            if (pendingBlock == null) pendingBlock = be;
+        } catch (Exception e) {
+            log.debug("Error handling multipartFormData filenames", e);
+        }
 
-    List<String> contents = collectFilesContent(iterator);
-    if (contents.isEmpty()) {
-      return;
-    }
+        if (pendingBlock == null) {
+            try {
+                if (MULTIPART_FILES_METHOD != null) {
+                    Object files = MULTIPART_FILES_METHOD.invoke(data);
+                    if (files instanceof scala.collection.Iterable) {
+                        handleMultipartFilesContent(
+                                new ScalaIteratorAdapter(((scala.collection.Iterable<?>) files).iterator()));
+                    }
+                }
+            } catch (BlockingException be) {
+                pendingBlock = be;
+            } catch (Exception e) {
+                log.debug("Error handling multipartFormData files content", e);
+            }
+        }
 
-    executeFilesContentCallback(reqCtx, callback, contents);
-  }
-
-  @VisibleForTesting
-  static List<String> collectFilesContent(java.util.Iterator<?> iterator) {
-    List<String> contents = new ArrayList<>(MAX_FILES_TO_INSPECT);
-    while (iterator.hasNext() && contents.size() < MAX_FILES_TO_INSPECT) {
-      MultipartFormData.FilePart<?> part = (MultipartFormData.FilePart<?>) iterator.next();
-      // null filename → no Content-Disposition filename attribute → form field → skip
-      // empty filename → file upload with no name → content still inspected
-      if (part.filename() == null) {
-        continue;
-      }
-      contents.add(readFilePartContent(part));
+        if (pendingBlock != null) throw pendingBlock;
+        return data;
     }
-    return contents;
-  }
 
-  @VisibleForTesting
-  static String readFilePartContent(MultipartFormData.FilePart<?> part) {
-    if (FILE_PART_REF == null || TEMP_FILE_FILE == null) {
-      return "";
-    }
-    try {
-      Object ref = FILE_PART_REF.invoke(part);
-      if (ref == null) {
-        return "";
-      }
-      Object fileObj = TEMP_FILE_FILE.invoke(ref);
-      if (!(fileObj instanceof File)) {
-        return "";
-      }
-      String contentType = null;
-      scala.Option<?> ct = (scala.Option<?>) part.contentType();
-      if (ct != null && ct.isDefined()) {
-        contentType = (String) ct.get();
-      }
-      try (InputStream is = new FileInputStream((File) fileObj)) {
-        return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, contentType);
-      }
-    } catch (Exception ignored) {
-      return "";
-    }
-  }
-
-  private static void executeFilesContentCallback(
-      RequestContext reqCtx,
-      BiFunction<RequestContext, List<String>, Flow<Void>> callback,
-      List<String> contents) {
-    Flow<Void> flow = callback.apply(reqCtx, contents);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        boolean success = brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-        if (success) {
-          throw new BlockingException("Blocked request (multipart file upload content)");
-        }
-      }
+    private static void handleMultipartFilenames(java.util.Iterator<?> iterator) {
+        AgentSpan span = activeSpan();
+        if (span == null) {
+            return;
+        }
+        RequestContext reqCtx = span.getRequestContext();
+        if (reqCtx == null || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
+            return;
+        }
+
+        List<String> filenames = collectFilenames(iterator);
+        if (filenames.isEmpty()) {
+            return;
+        }
+
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> callback = cbp.getCallback(EVENTS.requestFilesFilenames());
+        if (callback == null) {
+            return;
+        }
+        executeFilenamesCallback(reqCtx, callback, filenames);
+    }
+
+    @VisibleForTesting
+    static List<String> collectFilenames(java.util.Iterator<?> iterator) {
+        List<String> filenames = new ArrayList<>();
+        while (iterator.hasNext()) {
+            MultipartFormData.FilePart<?> part = (MultipartFormData.FilePart<?>) iterator.next();
+            String filename = part.filename();
+            if (filename != null && !filename.isEmpty()) {
+                filenames.add(filename);
+            }
+        }
+        return filenames;
+    }
+
+    private static void executeFilenamesCallback(
+            RequestContext reqCtx,
+            BiFunction<RequestContext, List<String>, Flow<Void>> callback,
+            List<String> filenames) {
+        Flow<Void> flow = callback.apply(reqCtx, filenames);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                boolean success = brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                if (success) {
+                    throw new BlockingException("Blocked request (multipart file upload)");
+                }
+            }
+        }
     }
-  }
 
-  public static Function1<JsValue, JsValue> getHandleJsonF() {
-    return HANDLE_JSON;
-  }
+    private static void handleMultipartFilesContent(java.util.Iterator<?> iterator) {
+        AgentSpan span = activeSpan();
+        if (span == null) {
+            return;
+        }
+        RequestContext reqCtx = span.getRequestContext();
+        if (reqCtx == null || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
+            return;
+        }
 
-  private static JsValue handleJson(JsValue data) {
-    if (data == null) {
-      return null;
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> callback = cbp.getCallback(EVENTS.requestFilesContent());
+        if (callback == null) {
+            return;
+        }
+
+        List<String> contents = collectFilesContent(iterator);
+        if (contents.isEmpty()) {
+            return;
+        }
+
+        executeFilesContentCallback(reqCtx, callback, contents);
     }
 
-    try {
-      Object conv = jsValueToJavaObject(data, MAX_RECURSION);
-      handleArbitraryPostData(conv, "json");
-    } catch (Exception e) {
-      handleException(e, "Error handling result of json BodyParser");
+    @VisibleForTesting
+    static List<String> collectFilesContent(java.util.Iterator<?> iterator) {
+        List<String> contents = new ArrayList<>(MAX_FILES_TO_INSPECT);
+        while (iterator.hasNext() && contents.size() < MAX_FILES_TO_INSPECT) {
+            MultipartFormData.FilePart<?> part = (MultipartFormData.FilePart<?>) iterator.next();
+            // null filename → no Content-Disposition filename attribute → form field → skip
+            // empty filename → file upload with no name → content still inspected
+            if (part.filename() == null) {
+                continue;
+            }
+            contents.add(readFilePartContent(part));
+        }
+        return contents;
     }
-    return data;
-  }
-
-  private static void executeCallback(
-      RequestContext reqCtx,
-      BiFunction<RequestContext, Object, Flow<Void>> callback,
-      Object conv,
-      String details) {
-    Flow<Void> flow = callback.apply(reqCtx, conv);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-      if (blockResponseFunction != null) {
-        boolean success =
-            blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-        if (success) {
-          throw new BlockingException("Blocked request (for " + details + ")");
-        }
-      }
+
+    @VisibleForTesting
+    static String readFilePartContent(MultipartFormData.FilePart<?> part) {
+        if (FILE_PART_REF == null || TEMP_FILE_FILE == null) {
+            return "";
+        }
+        try {
+            Object ref = FILE_PART_REF.invoke(part);
+            if (ref == null) {
+                return "";
+            }
+            Object fileObj = TEMP_FILE_FILE.invoke(ref);
+            if (!(fileObj instanceof File)) {
+                return "";
+            }
+            String contentType = null;
+            scala.Option<?> ct = (scala.Option<?>) part.contentType();
+            if (ct != null && ct.isDefined()) {
+                contentType = (String) ct.get();
+            }
+            try (InputStream is = new FileInputStream((File) fileObj)) {
+                return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, contentType);
+            }
+        } catch (Exception ignored) {
+            return "";
+        }
     }
-  }
 
-  private static Object tryConvertingScalaContainers(Object obj, int depth) {
-    if (depth == 0) {
-      return obj;
+    private static void executeFilesContentCallback(
+            RequestContext reqCtx,
+            BiFunction<RequestContext, List<String>, Flow<Void>> callback,
+            List<String> contents) {
+        Flow<Void> flow = callback.apply(reqCtx, contents);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                boolean success = brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                if (success) {
+                    throw new BlockingException("Blocked request (multipart file upload content)");
+                }
+            }
+        }
     }
-    if (obj instanceof scala.collection.Map) {
-      scala.collection.Map map = (scala.collection.Map) obj;
-      Map<Object, Object> ret = new HashMap<>();
-      Iterator<Tuple2> iterator = map.iterator();
-      while (iterator.hasNext()) {
-        Tuple2 next = iterator.next();
-        ret.put(next._1(), tryConvertingScalaContainers(next._2(), depth - 1));
-      }
-      return ret;
-    } else if (obj instanceof Iterable) {
-      List<Object> ret = new ArrayList<>();
-      Iterator iterator = ((Iterable) obj).iterator();
-      while (iterator.hasNext()) {
-        Object next = iterator.next();
-        ret.add(tryConvertingScalaContainers(next, depth - 1));
-      }
-      return ret;
+
+    public static Function1<JsValue, JsValue> getHandleJsonF() {
+        return HANDLE_JSON;
     }
-    return obj;
-  }
-
-  public static void handleJsonNode(JsonNode n, String source) {
-    Object o = jsNodeToJavaObject(n, MAX_RECURSION);
-    handleArbitraryPostDataWithSpanError(o, source);
-  }
-
-  public static void handleArbitraryPostDataWithSpanError(Object o, String source) {
-    AgentSpan span = activeSpan();
-    try {
-      doHandleArbitraryPostData(span, o, source);
-    } catch (BlockingException be) {
-      span.addThrowable(be);
-      throw be;
+
+    private static JsValue handleJson(JsValue data) {
+        if (data == null) {
+            return null;
+        }
+
+        try {
+            Object conv = jsValueToJavaObject(data, MAX_RECURSION);
+            handleArbitraryPostData(conv, "json");
+        } catch (Exception e) {
+            handleException(e, "Error handling result of json BodyParser");
+        }
+        return data;
+    }
+
+    private static void executeCallback(
+            RequestContext reqCtx,
+            BiFunction<RequestContext, Object, Flow<Void>> callback,
+            Object conv,
+            String details) {
+        Flow<Void> flow = callback.apply(reqCtx, conv);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+            if (blockResponseFunction != null) {
+                boolean success = blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                if (success) {
+                    throw new BlockingException("Blocked request (for " + details + ")");
+                }
+            }
+        }
     }
-  }
-
-  public static void handleArbitraryPostData(Object o, String source) {
-    doHandleArbitraryPostData(activeSpan(), o, source);
-  }
-
-  public static void doHandleArbitraryPostData(AgentSpan span, Object o, String source) {
-    RequestContext reqCtx;
-    if (span == null
-        || (reqCtx = span.getRequestContext()) == null
-        || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
-      return;
+
+    private static Object tryConvertingScalaContainers(Object obj, int depth) {
+        if (depth == 0) {
+            return obj;
+        }
+        if (obj instanceof scala.collection.Map) {
+            scala.collection.Map map = (scala.collection.Map) obj;
+            Map<Object, Object> ret = new HashMap<>();
+            Iterator<Tuple2> iterator = map.iterator();
+            while (iterator.hasNext()) {
+                Tuple2 next = iterator.next();
+                ret.put(next._1(), tryConvertingScalaContainers(next._2(), depth - 1));
+            }
+            return ret;
+        } else if (obj instanceof Iterable) {
+            List<Object> ret = new ArrayList<>();
+            Iterator iterator = ((Iterable) obj).iterator();
+            while (iterator.hasNext()) {
+                Object next = iterator.next();
+                ret.add(tryConvertingScalaContainers(next, depth - 1));
+            }
+            return ret;
+        }
+        return obj;
     }
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, Object, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestBodyProcessed());
-    if (callback == null) {
-      return;
+    public static void handleJsonNode(JsonNode n, String source) {
+        Object o = jsNodeToJavaObject(n, MAX_RECURSION);
+        handleArbitraryPostDataWithSpanError(o, source);
     }
 
-    // callback execution
-    executeCallback(reqCtx, callback, o, source);
-  }
+    public static void handleArbitraryPostDataWithSpanError(Object o, String source) {
+        AgentSpan span = activeSpan();
+        try {
+            doHandleArbitraryPostData(span, o, source);
+        } catch (BlockingException be) {
+            span.addThrowable(be);
+            throw be;
+        }
+    }
 
-  private static void handleException(Exception e, String logMessage) {
-    if (e instanceof BlockingException) {
-      throw (BlockingException) e;
+    public static void handleArbitraryPostData(Object o, String source) {
+        doHandleArbitraryPostData(activeSpan(), o, source);
     }
 
-    log.warn(logMessage, e);
-  }
+    public static void doHandleArbitraryPostData(AgentSpan span, Object o, String source) {
+        RequestContext reqCtx;
+        if (span == null
+                || (reqCtx = span.getRequestContext()) == null
+                || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
+            return;
+        }
 
-  public static Object jsValueToJavaObject(JsValue value) {
-    return jsValueToJavaObject(value, MAX_RECURSION);
-  }
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+        if (callback == null) {
+            return;
+        }
 
-  public static Object jsValueToJavaObject(JsValue value, int maxRecursion) {
-    if (value == null || maxRecursion <= 0) {
-      return null;
+        // callback execution
+        executeCallback(reqCtx, callback, o, source);
     }
 
-    if (value instanceof JsString) {
-      return ((JsString) value).value();
-    } else if (value instanceof JsNumber) {
-      final BigDecimal number = ((JsNumber) value).value();
-      return number == null ? null : number.bigDecimal();
-    } else if (value instanceof JsBoolean) {
-      return ((JsBoolean) value).value();
-    } else if (value instanceof JsObject) {
-      Map<String, Object> map = new HashMap<>();
-      JsObject jsonObject = (JsObject) value;
-      Iterator<Tuple2<String, JsValue>> iterator = jsonObject.fields().iterator();
-      while (iterator.hasNext()) {
-        Tuple2<String, JsValue> e = iterator.next();
-        map.put(e._1(), jsValueToJavaObject(e._2(), maxRecursion - 1));
-      }
-      return map;
-    } else if (value instanceof JsArray) {
-      List<Object> list = new ArrayList<>();
-      JsArray jsArray = (JsArray) value;
-      Iterator<JsValue> iterator = jsArray.value().iterator();
-      while (iterator.hasNext()) {
-        JsValue next = iterator.next();
-        list.add(jsValueToJavaObject(next, maxRecursion - 1));
-      }
-      return list;
-    } else {
-      return null;
-    }
-  }
+    private static void handleException(Exception e, String logMessage) {
+        if (e instanceof BlockingException) {
+            throw (BlockingException) e;
+        }
 
-  private static Object jsNodeToJavaObject(JsonNode value, int maxRecursion) {
-    if (value == null || maxRecursion <= 0) {
-      return null;
+        log.warn(logMessage, e);
     }
 
-    if (value instanceof TextNode) {
-      return value.asText();
-    } else if (value instanceof FloatNode || value instanceof DoubleNode) {
-      return value.asDouble();
-    } else if (value instanceof NumericNode) {
-      return value.asLong();
-    } else if (value instanceof ObjectNode) {
-      Map<String, Object> map = new HashMap<>();
-      ObjectNode jsonObject = (ObjectNode) value;
-      java.util.Iterator<Map.Entry<String, JsonNode>> iterator = jsonObject.fields();
-      while (iterator.hasNext()) {
-        Map.Entry<String, JsonNode> e = iterator.next();
-        map.put(e.getKey(), jsNodeToJavaObject(e.getValue(), maxRecursion - 1));
-      }
-      return map;
-    } else if (value instanceof ArrayNode) {
-      List<Object> list = new ArrayList<>();
-      ArrayNode arrayNode = (ArrayNode) value;
-      java.util.Iterator<JsonNode> iterator = arrayNode.elements();
-      while (iterator.hasNext()) {
-        JsonNode next = iterator.next();
-        list.add(jsNodeToJavaObject(next, maxRecursion - 1));
-      }
-      return list;
-    } else if (value instanceof NullNode) {
-      return null;
-    } else {
-      return value.asText("");
+    public static Object jsValueToJavaObject(JsValue value) {
+        return jsValueToJavaObject(value, MAX_RECURSION);
     }
-  }
 
-  static final class ScalaIteratorAdapter implements java.util.Iterator<Object> {
-    private final Iterator<?> delegate;
+    public static Object jsValueToJavaObject(JsValue value, int maxRecursion) {
+        if (value == null || maxRecursion <= 0) {
+            return null;
+        }
 
-    ScalaIteratorAdapter(Iterator<?> delegate) {
-      this.delegate = delegate;
+        if (value instanceof JsString) {
+            return ((JsString) value).value();
+        } else if (value instanceof JsNumber) {
+            final BigDecimal number = ((JsNumber) value).value();
+            return number == null ? null : number.bigDecimal();
+        } else if (value instanceof JsBoolean) {
+            return ((JsBoolean) value).value();
+        } else if (value instanceof JsObject) {
+            Map<String, Object> map = new HashMap<>();
+            JsObject jsonObject = (JsObject) value;
+            Iterator<Tuple2<String, JsValue>> iterator = jsonObject.fields().iterator();
+            while (iterator.hasNext()) {
+                Tuple2<String, JsValue> e = iterator.next();
+                map.put(e._1(), jsValueToJavaObject(e._2(), maxRecursion - 1));
+            }
+            return map;
+        } else if (value instanceof JsArray) {
+            List<Object> list = new ArrayList<>();
+            JsArray jsArray = (JsArray) value;
+            Iterator<JsValue> iterator = jsArray.value().iterator();
+            while (iterator.hasNext()) {
+                JsValue next = iterator.next();
+                list.add(jsValueToJavaObject(next, maxRecursion - 1));
+            }
+            return list;
+        } else {
+            return null;
+        }
     }
 
-    @Override
-    public boolean hasNext() {
-      return delegate.hasNext();
+    private static Object jsNodeToJavaObject(JsonNode value, int maxRecursion) {
+        if (value == null || maxRecursion <= 0) {
+            return null;
+        }
+
+        if (value instanceof TextNode) {
+            return value.asText();
+        } else if (value instanceof FloatNode || value instanceof DoubleNode) {
+            return value.asDouble();
+        } else if (value instanceof NumericNode) {
+            return value.asLong();
+        } else if (value instanceof ObjectNode) {
+            Map<String, Object> map = new HashMap<>();
+            ObjectNode jsonObject = (ObjectNode) value;
+            java.util.Iterator<Map.Entry<String, JsonNode>> iterator = jsonObject.fields();
+            while (iterator.hasNext()) {
+                Map.Entry<String, JsonNode> e = iterator.next();
+                map.put(e.getKey(), jsNodeToJavaObject(e.getValue(), maxRecursion - 1));
+            }
+            return map;
+        } else if (value instanceof ArrayNode) {
+            List<Object> list = new ArrayList<>();
+            ArrayNode arrayNode = (ArrayNode) value;
+            java.util.Iterator<JsonNode> iterator = arrayNode.elements();
+            while (iterator.hasNext()) {
+                JsonNode next = iterator.next();
+                list.add(jsNodeToJavaObject(next, maxRecursion - 1));
+            }
+            return list;
+        } else if (value instanceof NullNode) {
+            return null;
+        } else {
+            return value.asText("");
+        }
     }
 
-    @Override
-    public Object next() {
-      return delegate.next();
+    static final class ScalaIteratorAdapter implements java.util.Iterator<Object> {
+        private final Iterator<?> delegate;
+
+        ScalaIteratorAdapter(Iterator<?> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public boolean hasNext() {
+            return delegate.hasNext();
+        }
+
+        @Override
+        public Object next() {
+            return delegate.next();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java
index b51bf207c4c..a31894d0250 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java
@@ -5,15 +5,15 @@
 import net.bytebuddy.asm.Advice;
 
 public class BodyParserTolerantJsonParseAdvice {
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  static void after(@Advice.Return JsonNode ret, @Advice.Thrown(readOnly = false) Throwable t) {
-    if (t != null) {
-      return;
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    static void after(@Advice.Return JsonNode ret, @Advice.Thrown(readOnly = false) Throwable t) {
+        if (t != null) {
+            return;
+        }
+        try {
+            BodyParserHelpers.handleJsonNode(ret, "TolerantJson#parse");
+        } catch (BlockingException be) {
+            t = be;
+        }
     }
-    try {
-      BodyParserHelpers.handleJsonNode(ret, "TolerantJson#parse");
-    } catch (BlockingException be) {
-      t = be;
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java
index d472aaca3c9..fd54debfce8 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java
@@ -4,16 +4,16 @@
 import net.bytebuddy.asm.Advice;
 
 public class BodyParserTolerantTextParseAdvice {
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  static void after(@Advice.Return String ret, @Advice.Thrown(readOnly = false) Throwable t) {
-    if (t != null) {
-      return;
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    static void after(@Advice.Return String ret, @Advice.Thrown(readOnly = false) Throwable t) {
+        if (t != null) {
+            return;
+        }
+        try {
+            // error is reported as client error, which doesn't preserve the exception
+            BodyParserHelpers.handleArbitraryPostDataWithSpanError(ret, "TolerantText#parse");
+        } catch (BlockingException be) {
+            t = be;
+        }
     }
-    try {
-      // error is reported as client error, which doesn't preserve the exception
-      BodyParserHelpers.handleArbitraryPostDataWithSpanError(ret, "TolerantText#parse");
-    } catch (BlockingException be) {
-      t = be;
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java
index 2884a2d1739..a644b4cdd5f 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java
@@ -12,28 +12,28 @@
 
 @AutoService(InstrumenterModule.class)
 public class DelegatingBodyParserInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public DelegatingBodyParserInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public DelegatingBodyParserInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.mvc.BodyParser$DelegatingBodyParser";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.mvc.BodyParser$DelegatingBodyParser";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_25_ONLY;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_25_ONLY;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("apply")
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
-            .and(returns(named("play.libs.streams.Accumulator"))),
-        packageName + ".BodyParserDelegatingBodyParserApplyAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("apply")
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+                        .and(returns(named("play.libs.streams.Accumulator"))),
+                packageName + ".BodyParserDelegatingBodyParserApplyAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java
index 409098c0cc1..9f29e55200e 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java
@@ -13,29 +13,29 @@
 
 @AutoService(InstrumenterModule.class)
 public class FormUrlEncodedInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public FormUrlEncodedInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public FormUrlEncodedInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_25_ONLY;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_25_ONLY;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.mvc.BodyParser$FormUrlEncoded";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.mvc.BodyParser$FormUrlEncoded";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("parse")
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
-            .and(takesArgument(1, named("akka.util.ByteString")))
-            .and(returns(Map.class)),
-        packageName + ".BodyParserFormUrlEncodedParseAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("parse")
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+                        .and(takesArgument(1, named("akka.util.ByteString")))
+                        .and(returns(Map.class)),
+                packageName + ".BodyParserFormUrlEncodedParseAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java
index 040dd321783..82520707517 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java
@@ -26,60 +26,60 @@
  */
 @AutoService(InstrumenterModule.class)
 public class HttpErrorHandlerInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public HttpErrorHandlerInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public HttpErrorHandlerInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_25_ONLY;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_25_ONLY;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("onServerError"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("play.api.mvc.RequestHeader")))
-            .and(takesArgument(1, Throwable.class))
-            .and(returns(named("scala.concurrent.Future"))),
-        HttpErrorHandlerInstrumentation.class.getName() + "$OnServerErrorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("onServerError"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("play.api.mvc.RequestHeader")))
+                        .and(takesArgument(1, Throwable.class))
+                        .and(returns(named("scala.concurrent.Future"))),
+                HttpErrorHandlerInstrumentation.class.getName() + "$OnServerErrorAdvice");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "play.api.http.HttpErrorHandler";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "play.api.http.HttpErrorHandler";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named("play.api.http.HttpErrorHandler"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named("play.api.http.HttpErrorHandler"));
+    }
 
-  static class OnServerErrorAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void before(@Advice.Argument(1) Throwable t) {
-      int i = CallDepthThreadLocalMap.incrementCallDepth(HttpErrorHandler.class);
-      if (i > 0) {
-        return;
-      }
+    static class OnServerErrorAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void before(@Advice.Argument(1) Throwable t) {
+            int i = CallDepthThreadLocalMap.incrementCallDepth(HttpErrorHandler.class);
+            if (i > 0) {
+                return;
+            }
 
-      if (!(t instanceof BlockingException)) {
-        return;
-      }
+            if (!(t instanceof BlockingException)) {
+                return;
+            }
 
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan == null) {
-        return;
-      }
-      agentSpan.addThrowable(t);
-    }
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan == null) {
+                return;
+            }
+            agentSpan.addThrowable(t);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after() {
-      CallDepthThreadLocalMap.decrementCallDepth(HttpErrorHandler.class);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after() {
+            CallDepthThreadLocalMap.decrementCallDepth(HttpErrorHandler.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java
index 0c249d912cc..a8f54deb546 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java
@@ -12,27 +12,27 @@
 import play.mvc.Result;
 
 public class JavaMultipartFormDataRegisterExcF
-    implements Function<Throwable, F.Either<Result, Http.MultipartFormData<?>>> {
-  public static Function<Throwable, F.Either<Result, Http.MultipartFormData<?>>> INSTANCE =
-      new JavaMultipartFormDataRegisterExcF();
+        implements Function<Throwable, F.Either<Result, Http.MultipartFormData<?>>> {
+    public static Function<Throwable, F.Either<Result, Http.MultipartFormData<?>>> INSTANCE =
+            new JavaMultipartFormDataRegisterExcF();
 
-  private JavaMultipartFormDataRegisterExcF() {}
+    private JavaMultipartFormDataRegisterExcF() {}
 
-  @Override
-  public F.Either<Result, Http.MultipartFormData<?>> apply(Throwable exc) {
-    if (exc instanceof CompletionException) {
-      exc = exc.getCause();
+    @Override
+    public F.Either<Result, Http.MultipartFormData<?>> apply(Throwable exc) {
+        if (exc instanceof CompletionException) {
+            exc = exc.getCause();
+        }
+        if (exc instanceof BlockingException) {
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan != null) {
+                agentSpan.addThrowable(exc);
+            }
+        }
+        if (exc instanceof RuntimeException) {
+            throw (RuntimeException) exc;
+        } else {
+            throw new UndeclaredThrowableException(exc);
+        }
     }
-    if (exc instanceof BlockingException) {
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan != null) {
-        agentSpan.addThrowable(exc);
-      }
-    }
-    if (exc instanceof RuntimeException) {
-      throw (RuntimeException) exc;
-    } else {
-      throw new UndeclaredThrowableException(exc);
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java
index b56b9ea27d5..1a229175357 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java
@@ -4,11 +4,9 @@
 
 public class MuzzleReferences {
 
-  public static final Reference[] PLAY_25_PLUS = new Reference[] {};
+    public static final Reference[] PLAY_25_PLUS = new Reference[] {};
 
-  public static final Reference[] PLAY_25_ONLY =
-      new Reference[] {
-        new Reference.Builder("play.libs.concurrent.Futures").build(),
-        new Reference.Builder("play.Routes").build()
-      };
+    public static final Reference[] PLAY_25_ONLY = new Reference[] {
+        new Reference.Builder("play.libs.concurrent.Futures").build(), new Reference.Builder("play.Routes").build()
+    };
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java
index 1fb266b5ae5..b52af09663e 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java
@@ -13,34 +13,34 @@
 
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 public class PathPatternApplyAdvice {
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  static void after(
-      @Advice.Return(readOnly = false)
-          scala.Option<scala.collection.immutable.Map<String, Either<Throwable, String>>> ret,
-      @Advice.Thrown(readOnly = false) Throwable t,
-      @ActiveRequestContext RequestContext reqCtx) {
-    if (t != null) {
-      return;
-    }
-    if (ret.isEmpty()) {
-      return;
-    }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    static void after(
+            @Advice.Return(readOnly = false)
+                    scala.Option<scala.collection.immutable.Map<String, Either<Throwable, String>>> ret,
+            @Advice.Thrown(readOnly = false) Throwable t,
+            @ActiveRequestContext RequestContext reqCtx) {
+        if (t != null) {
+            return;
+        }
+        if (ret.isEmpty()) {
+            return;
+        }
 
-    java.util.Map<String, Object> conv = new java.util.HashMap<>();
+        java.util.Map<String, Object> conv = new java.util.HashMap<>();
 
-    Iterator<Tuple2<String, Either<Throwable, String>>> iterator = ret.get().iterator();
-    while (iterator.hasNext()) {
-      Tuple2<String, Either<Throwable, String>> next = iterator.next();
-      Either<Throwable, String> value = next._2();
-      if (value.isLeft()) {
-        continue;
-      }
+        Iterator<Tuple2<String, Either<Throwable, String>>> iterator = ret.get().iterator();
+        while (iterator.hasNext()) {
+            Tuple2<String, Either<Throwable, String>> next = iterator.next();
+            Either<Throwable, String> value = next._2();
+            if (value.isLeft()) {
+                continue;
+            }
 
-      conv.put(next._1(), value.right().get());
-    }
+            conv.put(next._1(), value.right().get());
+        }
 
-    BlockingException blockingException =
-        PathExtractionHelpers.callRequestPathParamsCallback(reqCtx, conv, "PathPattern#apply");
-    t = blockingException;
-  }
+        BlockingException blockingException =
+                PathExtractionHelpers.callRequestPathParamsCallback(reqCtx, conv, "PathPattern#apply");
+        t = blockingException;
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java
index 86856d3b199..b47bc467209 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java
@@ -17,36 +17,36 @@
  */
 @AutoService(InstrumenterModule.class)
 public class PathPatternInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public PathPatternInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public PathPatternInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_25_ONLY;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_25_ONLY;
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.play.appsec.PathExtractionHelpers",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.play.appsec.PathExtractionHelpers",
+        };
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.core.routing.PathPattern";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.core.routing.PathPattern";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("apply")
-            .and(not(isStatic()))
-            .and(takesArguments(1))
-            .and(takesArgument(0, String.class))
-            .and(returns(named("scala.Option"))),
-        packageName + ".PathPatternApplyAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("apply")
+                        .and(not(isStatic()))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, String.class))
+                        .and(returns(named("scala.Option"))),
+                packageName + ".PathPatternApplyAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java
index a2479148405..b608f36f1c7 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java
@@ -17,54 +17,54 @@
  */
 @AutoService(InstrumenterModule.class)
 public class PlayBodyParsersInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public PlayBodyParsersInstrumentation() {
-    super("play");
-  }
+    public PlayBodyParsersInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_25_ONLY;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_25_ONLY;
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "play.api.mvc.BodyParsers$parse$",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "play.api.mvc.BodyParsers$parse$",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("tolerantText")
-            .and(not(isStatic()))
-            .and(takesArguments(1))
-            .and(takesArgument(0, long.class))
-            .and(returns(named("play.api.mvc.BodyParser"))),
-        packageName + ".PlayBodyParsersTolerantTextAdvice");
-    transformer.applyAdvice(
-        named("tolerantJson")
-            .and(not(isStatic()))
-            .and(takesArguments(1))
-            .and(takesArgument(0, int.class))
-            .and(returns(named("play.api.mvc.BodyParser"))),
-        packageName + ".PlayBodyParsersTolerantJsonAdvice");
-    transformer.applyAdvice(
-        named("tolerantFormUrlEncoded")
-            .and(not(isStatic()))
-            .and(takesArguments(1))
-            .and(takesArgument(0, int.class))
-            .and(returns(named("play.api.mvc.BodyParser"))),
-        packageName + ".PlayBodyParsersTolerantFormUrlEncodedAdvice");
-    transformer.applyAdvice(
-        named("multipartFormData")
-            .and(not(isStatic()))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("scala.Function1")))
-            .and(takesArgument(1, long.class))
-            .and(returns(named("play.api.mvc.BodyParser"))),
-        packageName + ".PlayBodyParsersMultipartFormDataAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("tolerantText")
+                        .and(not(isStatic()))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, long.class))
+                        .and(returns(named("play.api.mvc.BodyParser"))),
+                packageName + ".PlayBodyParsersTolerantTextAdvice");
+        transformer.applyAdvice(
+                named("tolerantJson")
+                        .and(not(isStatic()))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, int.class))
+                        .and(returns(named("play.api.mvc.BodyParser"))),
+                packageName + ".PlayBodyParsersTolerantJsonAdvice");
+        transformer.applyAdvice(
+                named("tolerantFormUrlEncoded")
+                        .and(not(isStatic()))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, int.class))
+                        .and(returns(named("play.api.mvc.BodyParser"))),
+                packageName + ".PlayBodyParsersTolerantFormUrlEncodedAdvice");
+        transformer.applyAdvice(
+                named("multipartFormData")
+                        .and(not(isStatic()))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("scala.Function1")))
+                        .and(takesArgument(1, long.class))
+                        .and(returns(named("play.api.mvc.BodyParser"))),
+                packageName + ".PlayBodyParsersMultipartFormDataAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java
index 1250bc4a40a..a468447831e 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java
@@ -9,12 +9,9 @@
  * @see play.api.mvc.BodyParsers.parse$#multipartFormData(Function1, long)
  */
 public class PlayBodyParsersMultipartFormDataAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  static void after(
-      @Advice.Return(readOnly = false) BodyParser<play.api.mvc.MultipartFormData<?>> parser) {
-    parser =
-        parser.map(
-            BodyParserHelpers.getHandleMultipartFormDataF(),
-            Execution.Implicits$.MODULE$.internalContext());
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    static void after(@Advice.Return(readOnly = false) BodyParser<play.api.mvc.MultipartFormData<?>> parser) {
+        parser = parser.map(
+                BodyParserHelpers.getHandleMultipartFormDataF(), Execution.Implicits$.MODULE$.internalContext());
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java
index edeb7a2e014..32309c609de 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java
@@ -6,13 +6,10 @@
 import scala.collection.Seq;
 
 public class PlayBodyParsersTolerantFormUrlEncodedAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  static void after(
-      @Advice.Return(readOnly = false)
-          BodyParser<scala.collection.immutable.Map<String, Seq<String>>> parser) {
-    parser =
-        parser.map(
-            BodyParserHelpers.getHandleUrlEncodedMapF(),
-            Execution.Implicits$.MODULE$.internalContext());
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    static void after(
+            @Advice.Return(readOnly = false) BodyParser<scala.collection.immutable.Map<String, Seq<String>>> parser) {
+        parser =
+                parser.map(BodyParserHelpers.getHandleUrlEncodedMapF(), Execution.Implicits$.MODULE$.internalContext());
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java
index 76272033305..72bba48e97a 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java
@@ -9,10 +9,8 @@
  * @see play.api.mvc.BodyParsers.parse$#tolerantJson(int)
  */
 public class PlayBodyParsersTolerantJsonAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  static void after(@Advice.Return(readOnly = false) BodyParser<JsValue> parser) {
-    parser =
-        parser.map(
-            BodyParserHelpers.getHandleJsonF(), Execution.Implicits$.MODULE$.internalContext());
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    static void after(@Advice.Return(readOnly = false) BodyParser<JsValue> parser) {
+        parser = parser.map(BodyParserHelpers.getHandleJsonF(), Execution.Implicits$.MODULE$.internalContext());
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java
index 2c519597326..bf6ff9a43e4 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java
@@ -5,11 +5,8 @@
 import play.core.Execution;
 
 public class PlayBodyParsersTolerantTextAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  static void after(@Advice.Return(readOnly = false) BodyParser<String> parser) {
-    parser =
-        parser.map(
-            BodyParserHelpers.getHandleStringMapF(),
-            Execution.Implicits$.MODULE$.internalContext());
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    static void after(@Advice.Return(readOnly = false) BodyParser<String> parser) {
+        parser = parser.map(BodyParserHelpers.getHandleStringMapF(), Execution.Implicits$.MODULE$.internalContext());
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java
index 64e2ce7fbb5..3ffa3dc7058 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java
@@ -19,35 +19,33 @@
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 public class ResultsStatusApplyAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  static void before(
-      @Advice.Argument(0) final Object content, @ActiveRequestContext final RequestContext reqCtx) {
-
-    if (!(content instanceof JsValue)) {
-      return;
-    }
-
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    if (cbp == null) {
-      return;
-    }
-    BiFunction<RequestContext, Object, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.responseBody());
-    if (callback == null) {
-      return;
-    }
-
-    Flow<Void> flow = callback.apply(reqCtx, jsValueToJavaObject((JsValue) content));
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-      if (blockResponseFunction == null) {
-        return;
-      }
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-
-      throw new BlockingException("Blocked request (for Results$Status/apply)");
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static void before(@Advice.Argument(0) final Object content, @ActiveRequestContext final RequestContext reqCtx) {
+
+        if (!(content instanceof JsValue)) {
+            return;
+        }
+
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        if (cbp == null) {
+            return;
+        }
+        BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.responseBody());
+        if (callback == null) {
+            return;
+        }
+
+        Flow<Void> flow = callback.apply(reqCtx, jsValueToJavaObject((JsValue) content));
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+            if (blockResponseFunction == null) {
+                return;
+            }
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+
+            throw new BlockingException("Blocked request (for Results$Status/apply)");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java
index 4352637f986..74b51bf1edc 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java
@@ -9,24 +9,24 @@
 
 @AutoService(InstrumenterModule.class)
 public class ResultsStatusInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ResultsStatusInstrumentation() {
-    super("play");
-  }
+    public ResultsStatusInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_25_ONLY;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_25_ONLY;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.api.mvc.Results$Status";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.api.mvc.Results$Status";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(named("apply"), packageName + ".ResultsStatusApplyAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("apply"), packageName + ".ResultsStatusApplyAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java
index 5e975ec2805..d7bfc033447 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java
@@ -14,39 +14,39 @@
  */
 @AutoService(InstrumenterModule.class)
 public class RoutingDslInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public RoutingDslInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public RoutingDslInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_25_ONLY;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_25_ONLY;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.routing.RoutingDsl$Route";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.routing.RoutingDsl$Route";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ArgumentCaptureWrappers",
-      packageName + ".ArgumentCaptureWrappers$ArgumentCaptureFunction",
-      packageName + ".ArgumentCaptureWrappers$ArgumentCaptureBiFunction",
-      packageName + ".ArgumentCaptureWrappers$ArgumentCaptureFunction3",
-      "datadog.trace.instrumentation.play.appsec.PathExtractionHelpers",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ArgumentCaptureWrappers",
+            packageName + ".ArgumentCaptureWrappers$ArgumentCaptureFunction",
+            packageName + ".ArgumentCaptureWrappers$ArgumentCaptureBiFunction",
+            packageName + ".ArgumentCaptureWrappers$ArgumentCaptureFunction3",
+            "datadog.trace.instrumentation.play.appsec.PathExtractionHelpers",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArguments(5))
-            .and(takesArgument(3, Object.class))
-            .and(takesArgument(4, java.lang.reflect.Method.class)),
-        packageName + ".RoutingDslRouteConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArguments(5))
+                        .and(takesArgument(3, Object.class))
+                        .and(takesArgument(4, java.lang.reflect.Method.class)),
+                packageName + ".RoutingDslRouteConstructorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java
index 9ebc0a8bd6c..921445c86f4 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java
@@ -6,14 +6,14 @@
 import play.libs.F;
 
 public class RoutingDslRouteConstructorAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  static void before(@Advice.Argument(value = 3, readOnly = false) Object action) {
-    if (action instanceof Function) {
-      action = new ArgumentCaptureWrappers.ArgumentCaptureFunction<>((Function) action);
-    } else if (action instanceof BiFunction) {
-      action = new ArgumentCaptureWrappers.ArgumentCaptureBiFunction<>((BiFunction) action);
-    } else if (action instanceof F.Function3) {
-      action = new ArgumentCaptureWrappers.ArgumentCaptureFunction3<>((F.Function3) action);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static void before(@Advice.Argument(value = 3, readOnly = false) Object action) {
+        if (action instanceof Function) {
+            action = new ArgumentCaptureWrappers.ArgumentCaptureFunction<>((Function) action);
+        } else if (action instanceof BiFunction) {
+            action = new ArgumentCaptureWrappers.ArgumentCaptureBiFunction<>((BiFunction) action);
+        } else if (action instanceof F.Function3) {
+            action = new ArgumentCaptureWrappers.ArgumentCaptureFunction3<>((F.Function3) action);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java
index 5f346fccbf6..0fd6e0c7674 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java
@@ -15,23 +15,21 @@
  */
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 public class SirdPathExtractorExtractAdvice {
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  static void after(
-      @Advice.Return scala.Option<List<String>> ret,
-      @ActiveRequestContext RequestContext reqCtx,
-      @Advice.Thrown(readOnly = false) Throwable t) {
-    if (ret.isEmpty() || t != null) {
-      return;
-    }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    static void after(
+            @Advice.Return scala.Option<List<String>> ret,
+            @ActiveRequestContext RequestContext reqCtx,
+            @Advice.Thrown(readOnly = false) Throwable t) {
+        if (ret.isEmpty() || t != null) {
+            return;
+        }
 
-    Map<String, Object> conv = new HashMap<>();
-    List<String> stringList = ret.get();
-    for (int i = 0; i < stringList.size(); i++) {
-      conv.put(Integer.toString(i), stringList.apply(i));
-    }
+        Map<String, Object> conv = new HashMap<>();
+        List<String> stringList = ret.get();
+        for (int i = 0; i < stringList.size(); i++) {
+            conv.put(Integer.toString(i), stringList.apply(i));
+        }
 
-    t =
-        PathExtractionHelpers.callRequestPathParamsCallback(
-            reqCtx, conv, "sird.PathExtractor#extract");
-  }
+        t = PathExtractionHelpers.callRequestPathParamsCallback(reqCtx, conv, "sird.PathExtractor#extract");
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java
index 946a8299fef..7b9db388ec2 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java
@@ -16,35 +16,35 @@
  */
 @AutoService(InstrumenterModule.class)
 public class SirdPathExtractorInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public SirdPathExtractorInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public SirdPathExtractorInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_25_ONLY;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_25_ONLY;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.api.routing.sird.PathExtractor";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.api.routing.sird.PathExtractor";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        namedOneOf("extract", "play$api$routing$sird$PathExtractor$$extract")
-            .and(takesArguments(1))
-            .and(takesArgument(0, String.class))
-            .and(returns(named("scala.Option"))),
-        packageName + ".SirdPathExtractorExtractAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                namedOneOf("extract", "play$api$routing$sird$PathExtractor$$extract")
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, String.class))
+                        .and(returns(named("scala.Option"))),
+                packageName + ".SirdPathExtractorExtractAdvice");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.play.appsec.PathExtractionHelpers",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.play.appsec.PathExtractionHelpers",
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java
index c3362e119a9..e5b5659bb3b 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java
@@ -10,26 +10,26 @@
 
 @AutoService(InstrumenterModule.class)
 public class StatusHeaderInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public StatusHeaderInstrumentation() {
-    super("play");
-  }
+    public StatusHeaderInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_25_ONLY;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_25_ONLY;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.mvc.StatusHeader";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.mvc.StatusHeader";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("sendJson").and(takesArgument(0, named("com.fasterxml.jackson.databind.JsonNode"))),
-        packageName + ".StatusHeaderSendJsonAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("sendJson").and(takesArgument(0, named("com.fasterxml.jackson.databind.JsonNode"))),
+                packageName + ".StatusHeaderSendJsonAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java
index 51a6084c350..598c617c587 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java
@@ -20,44 +20,42 @@
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 public class StatusHeaderSendJsonAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  static void before(
-      @Advice.Argument(0) final JsonNode json, @ActiveRequestContext final RequestContext reqCtx) {
-
-    if (CallDepthThreadLocalMap.incrementCallDepth(StatusHeader.class) > 0) {
-      return;
-    }
-
-    if (json == null) {
-      return;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static void before(@Advice.Argument(0) final JsonNode json, @ActiveRequestContext final RequestContext reqCtx) {
+
+        if (CallDepthThreadLocalMap.incrementCallDepth(StatusHeader.class) > 0) {
+            return;
+        }
+
+        if (json == null) {
+            return;
+        }
+
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        if (cbp == null) {
+            return;
+        }
+        BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.responseBody());
+        if (callback == null) {
+            return;
+        }
+
+        Flow<Void> flow = callback.apply(reqCtx, json);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+            if (blockResponseFunction == null) {
+                return;
+            }
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+
+            throw new BlockingException("Blocked request (for StatusHeader/sendJson)");
+        }
     }
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    if (cbp == null) {
-      return;
-    }
-    BiFunction<RequestContext, Object, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.responseBody());
-    if (callback == null) {
-      return;
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    static void after() {
+        CallDepthThreadLocalMap.decrementCallDepth(StatusHeader.class);
     }
-
-    Flow<Void> flow = callback.apply(reqCtx, json);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-      if (blockResponseFunction == null) {
-        return;
-      }
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-
-      throw new BlockingException("Blocked request (for StatusHeader/sendJson)");
-    }
-  }
-
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  static void after() {
-    CallDepthThreadLocalMap.decrementCallDepth(StatusHeader.class);
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java
index 3e62e242e6f..d8f3078e0a6 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java
@@ -17,29 +17,29 @@
  */
 @AutoService(InstrumenterModule.class)
 public class TolerantJsonInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public TolerantJsonInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public TolerantJsonInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_25_ONLY;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_25_ONLY;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.mvc.BodyParser$TolerantJson";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.mvc.BodyParser$TolerantJson";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("parse")
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
-            .and(takesArgument(1, named("akka.util.ByteString")))
-            .and(returns(named("com.fasterxml.jackson.databind.JsonNode"))),
-        packageName + ".BodyParserTolerantJsonParseAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("parse")
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+                        .and(takesArgument(1, named("akka.util.ByteString")))
+                        .and(returns(named("com.fasterxml.jackson.databind.JsonNode"))),
+                packageName + ".BodyParserTolerantJsonParseAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java
index 9581908d236..72deb59a422 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java
@@ -12,29 +12,29 @@
 
 @AutoService(InstrumenterModule.class)
 public class TolerantTextInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public TolerantTextInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public TolerantTextInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_25_ONLY;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_25_ONLY;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.mvc.BodyParser$TolerantText";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.mvc.BodyParser$TolerantText";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("parse")
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
-            .and(takesArgument(1, named("akka.util.ByteString")))
-            .and(returns(String.class)),
-        packageName + ".BodyParserTolerantTextParseAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("parse")
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+                        .and(takesArgument(1, named("akka.util.ByteString")))
+                        .and(returns(String.class)),
+                packageName + ".BodyParserTolerantTextParseAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpersTest.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpersTest.java
index e14f55c7d74..2fa68f2cd1c 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpersTest.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpersTest.java
@@ -16,152 +16,143 @@
 
 class BodyParserHelpersTest {
 
-  private static JsValue parse(String json) {
-    return play.api.libs.json.Json$.MODULE$.parse(json);
-  }
-
-  @Test
-  void jsValueToJavaObject_nullInputReturnsNull() {
-    assertNull(BodyParserHelpers.jsValueToJavaObject(null));
-  }
-
-  @Test
-  void jsValueToJavaObject_jsNullReturnsNull() {
-    assertNull(BodyParserHelpers.jsValueToJavaObject(parse("null")));
-  }
-
-  @Test
-  void jsValueToJavaObject_string() {
-    Object result = BodyParserHelpers.jsValueToJavaObject(parse("\"hello\""));
-    assertEquals("hello", result);
-  }
-
-  @Test
-  void jsValueToJavaObject_number() {
-    Object result = BodyParserHelpers.jsValueToJavaObject(parse("42"));
-    assertTrue(result instanceof BigDecimal);
-    assertEquals(0, ((BigDecimal) result).compareTo(new BigDecimal("42")));
-  }
-
-  @Test
-  void jsValueToJavaObject_booleanTrue() {
-    Object result = BodyParserHelpers.jsValueToJavaObject(parse("true"));
-    assertEquals(Boolean.TRUE, result);
-  }
-
-  @Test
-  void jsValueToJavaObject_booleanFalse() {
-    Object result = BodyParserHelpers.jsValueToJavaObject(parse("false"));
-    assertEquals(Boolean.FALSE, result);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void jsValueToJavaObject_object() {
-    Object result = BodyParserHelpers.jsValueToJavaObject(parse("{\"key\":\"value\",\"num\":1}"));
-    assertTrue(result instanceof Map);
-    Map<String, Object> map = (Map<String, Object>) result;
-    assertEquals("value", map.get("key"));
-    assertTrue(map.get("num") instanceof BigDecimal);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void jsValueToJavaObject_array() {
-    Object result = BodyParserHelpers.jsValueToJavaObject(parse("[\"a\",\"b\",\"c\"]"));
-    assertTrue(result instanceof List);
-    List<Object> list = (List<Object>) result;
-    assertEquals(3, list.size());
-    assertEquals("a", list.get(0));
-    assertEquals("b", list.get(1));
-    assertEquals("c", list.get(2));
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void jsValueToJavaObject_nestedObject() {
-    Object result =
-        BodyParserHelpers.jsValueToJavaObject(parse("{\"outer\":{\"inner\":\"deep\"}}"));
-    assertTrue(result instanceof Map);
-    Map<String, Object> outer = (Map<String, Object>) result;
-    assertTrue(outer.get("outer") instanceof Map);
-    Map<String, Object> inner = (Map<String, Object>) outer.get("outer");
-    assertEquals("deep", inner.get("inner"));
-  }
-
-  @Test
-  void jsValueToJavaObject_zeroRecursionReturnsNull() {
-    Object result = BodyParserHelpers.jsValueToJavaObject(parse("{\"key\":\"value\"}"), 0);
-    assertNull(result);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void jsValueToJavaObject_recursionLimitTruncatesNesting() {
-    // depth=1: outer object is converted, but children exceed the limit and become null
-    Object result = BodyParserHelpers.jsValueToJavaObject(parse("{\"a\":{\"b\":\"val\"}}"), 1);
-    assertTrue(result instanceof Map);
-    Map<String, Object> map = (Map<String, Object>) result;
-    assertNull(map.get("a"));
-  }
-
-  // --- collectFilenames tests ---
-
-  @Test
-  void collectFilenames_emptyIterator() {
-    List<String> result = BodyParserHelpers.collectFilenames(Collections.emptyIterator());
-    assertTrue(result.isEmpty());
-  }
-
-  @Test
-  void collectFilenames_nullFilenameExcluded() throws Exception {
-    List<String> result =
-        BodyParserHelpers.collectFilenames(
-            Collections.<Object>singletonList(filePart("f", null)).iterator());
-    assertTrue(result.isEmpty());
-  }
-
-  @Test
-  void collectFilenames_emptyFilenameExcluded() throws Exception {
-    List<String> result =
-        BodyParserHelpers.collectFilenames(
-            Collections.<Object>singletonList(filePart("f", "")).iterator());
-    assertTrue(result.isEmpty());
-  }
-
-  @Test
-  void collectFilenames_validFilenameIncluded() throws Exception {
-    List<String> result =
-        BodyParserHelpers.collectFilenames(
-            Collections.<Object>singletonList(filePart("f", "evil.php")).iterator());
-    assertEquals(Collections.singletonList("evil.php"), result);
-  }
-
-  @Test
-  void collectFilenames_mixedPartsFiltered() throws Exception {
-    List<Object> parts =
-        Arrays.<Object>asList(
-            filePart("f1", "a.pdf"),
-            filePart("f2", null),
-            filePart("f3", ""),
-            filePart("f4", "b.jpg"));
-    List<String> result = BodyParserHelpers.collectFilenames(parts.iterator());
-    assertEquals(Arrays.asList("a.pdf", "b.jpg"), result);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static MultipartFormData.FilePart<Object> filePart(String key, String filename)
-      throws Exception {
-    // FilePart is a Scala case class nested in object MultipartFormData.
-    // Use the companion object's apply() to avoid JVM inner-class constructor complexity.
-    Class<?> companionClass = Class.forName("play.api.mvc.MultipartFormData$FilePart$");
-    Object companion = companionClass.getField("MODULE$").get(null);
-    for (Method m : companionClass.getMethods()) {
-      if ("apply".equals(m.getName()) && m.getParameterCount() == 4) {
-        return (MultipartFormData.FilePart<Object>)
-            m.invoke(companion, key, filename, scala.None$.MODULE$, new Object());
-      }
-    }
-    throw new IllegalStateException("FilePart.apply(4 params) not found");
-  }
+    private static JsValue parse(String json) {
+        return play.api.libs.json.Json$.MODULE$.parse(json);
+    }
+
+    @Test
+    void jsValueToJavaObject_nullInputReturnsNull() {
+        assertNull(BodyParserHelpers.jsValueToJavaObject(null));
+    }
+
+    @Test
+    void jsValueToJavaObject_jsNullReturnsNull() {
+        assertNull(BodyParserHelpers.jsValueToJavaObject(parse("null")));
+    }
+
+    @Test
+    void jsValueToJavaObject_string() {
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("\"hello\""));
+        assertEquals("hello", result);
+    }
+
+    @Test
+    void jsValueToJavaObject_number() {
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("42"));
+        assertTrue(result instanceof BigDecimal);
+        assertEquals(0, ((BigDecimal) result).compareTo(new BigDecimal("42")));
+    }
+
+    @Test
+    void jsValueToJavaObject_booleanTrue() {
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("true"));
+        assertEquals(Boolean.TRUE, result);
+    }
+
+    @Test
+    void jsValueToJavaObject_booleanFalse() {
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("false"));
+        assertEquals(Boolean.FALSE, result);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void jsValueToJavaObject_object() {
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("{\"key\":\"value\",\"num\":1}"));
+        assertTrue(result instanceof Map);
+        Map<String, Object> map = (Map<String, Object>) result;
+        assertEquals("value", map.get("key"));
+        assertTrue(map.get("num") instanceof BigDecimal);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void jsValueToJavaObject_array() {
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("[\"a\",\"b\",\"c\"]"));
+        assertTrue(result instanceof List);
+        List<Object> list = (List<Object>) result;
+        assertEquals(3, list.size());
+        assertEquals("a", list.get(0));
+        assertEquals("b", list.get(1));
+        assertEquals("c", list.get(2));
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void jsValueToJavaObject_nestedObject() {
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("{\"outer\":{\"inner\":\"deep\"}}"));
+        assertTrue(result instanceof Map);
+        Map<String, Object> outer = (Map<String, Object>) result;
+        assertTrue(outer.get("outer") instanceof Map);
+        Map<String, Object> inner = (Map<String, Object>) outer.get("outer");
+        assertEquals("deep", inner.get("inner"));
+    }
+
+    @Test
+    void jsValueToJavaObject_zeroRecursionReturnsNull() {
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("{\"key\":\"value\"}"), 0);
+        assertNull(result);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void jsValueToJavaObject_recursionLimitTruncatesNesting() {
+        // depth=1: outer object is converted, but children exceed the limit and become null
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("{\"a\":{\"b\":\"val\"}}"), 1);
+        assertTrue(result instanceof Map);
+        Map<String, Object> map = (Map<String, Object>) result;
+        assertNull(map.get("a"));
+    }
+
+    // --- collectFilenames tests ---
+
+    @Test
+    void collectFilenames_emptyIterator() {
+        List<String> result = BodyParserHelpers.collectFilenames(Collections.emptyIterator());
+        assertTrue(result.isEmpty());
+    }
+
+    @Test
+    void collectFilenames_nullFilenameExcluded() throws Exception {
+        List<String> result = BodyParserHelpers.collectFilenames(
+                Collections.<Object>singletonList(filePart("f", null)).iterator());
+        assertTrue(result.isEmpty());
+    }
+
+    @Test
+    void collectFilenames_emptyFilenameExcluded() throws Exception {
+        List<String> result = BodyParserHelpers.collectFilenames(
+                Collections.<Object>singletonList(filePart("f", "")).iterator());
+        assertTrue(result.isEmpty());
+    }
+
+    @Test
+    void collectFilenames_validFilenameIncluded() throws Exception {
+        List<String> result = BodyParserHelpers.collectFilenames(
+                Collections.<Object>singletonList(filePart("f", "evil.php")).iterator());
+        assertEquals(Collections.singletonList("evil.php"), result);
+    }
+
+    @Test
+    void collectFilenames_mixedPartsFiltered() throws Exception {
+        List<Object> parts = Arrays.<Object>asList(
+                filePart("f1", "a.pdf"), filePart("f2", null), filePart("f3", ""), filePart("f4", "b.jpg"));
+        List<String> result = BodyParserHelpers.collectFilenames(parts.iterator());
+        assertEquals(Arrays.asList("a.pdf", "b.jpg"), result);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static MultipartFormData.FilePart<Object> filePart(String key, String filename) throws Exception {
+        // FilePart is a Scala case class nested in object MultipartFormData.
+        // Use the companion object's apply() to avoid JVM inner-class constructor complexity.
+        Class<?> companionClass = Class.forName("play.api.mvc.MultipartFormData$FilePart$");
+        Object companion = companionClass.getField("MODULE$").get(null);
+        for (Method m : companionClass.getMethods()) {
+            if ("apply".equals(m.getName()) && m.getParameterCount() == 4) {
+                return (MultipartFormData.FilePart<Object>)
+                        m.invoke(companion, key, filename, scala.None$.MODULE$, new Object());
+            }
+        }
+        throw new IllegalStateException("FilePart.apply(4 params) not found");
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/ArgumentCaptureWrappers.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/ArgumentCaptureWrappers.java
index 26f716b3414..52306cf3184 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/ArgumentCaptureWrappers.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/ArgumentCaptureWrappers.java
@@ -15,117 +15,113 @@
 import play.libs.F;
 
 public class ArgumentCaptureWrappers {
-  public static class ArgumentCaptureFunction<R> implements Function<Object, R> {
-    private final Function<Object, R> delegate;
-
-    public ArgumentCaptureFunction(Function<Object, R> delegate) {
-      this.delegate = delegate;
-    }
-
-    @Override
-    public R apply(Object o) {
-      if (o == null) {
-        return delegate.apply(null);
-      }
-
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan == null) {
-        return delegate.apply(o);
-      }
-
-      RequestContext requestContext = agentSpan.getRequestContext();
-      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
-        return delegate.apply(o);
-      }
-
-      Map<String, Object> conv = Collections.singletonMap("0", o);
-
-      BlockingException t =
-          PathExtractionHelpers.callRequestPathParamsCallback(
-              requestContext, conv, "RoutingDsl#routeTo");
-      if (t != null) {
-        throw t;
-      }
-
-      return delegate.apply(o);
-    }
-  }
-
-  public static class ArgumentCaptureBiFunction<R> implements BiFunction<Object, Object, R> {
-    private final BiFunction<Object, Object, R> delegate;
-
-    public ArgumentCaptureBiFunction(BiFunction<Object, Object, R> delegate) {
-      this.delegate = delegate;
+    public static class ArgumentCaptureFunction<R> implements Function<Object, R> {
+        private final Function<Object, R> delegate;
+
+        public ArgumentCaptureFunction(Function<Object, R> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public R apply(Object o) {
+            if (o == null) {
+                return delegate.apply(null);
+            }
+
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan == null) {
+                return delegate.apply(o);
+            }
+
+            RequestContext requestContext = agentSpan.getRequestContext();
+            if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+                return delegate.apply(o);
+            }
+
+            Map<String, Object> conv = Collections.singletonMap("0", o);
+
+            BlockingException t =
+                    PathExtractionHelpers.callRequestPathParamsCallback(requestContext, conv, "RoutingDsl#routeTo");
+            if (t != null) {
+                throw t;
+            }
+
+            return delegate.apply(o);
+        }
     }
 
-    @Override
-    public R apply(Object o1, Object o2) {
-      if (o1 == null && o2 == null) {
-        return delegate.apply(null, null);
-      }
-
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan == null) {
-        return delegate.apply(o1, o2);
-      }
-
-      RequestContext requestContext = agentSpan.getRequestContext();
-      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
-        return delegate.apply(o1, o2);
-      }
-
-      Map<String, Object> conv = new HashMap<>();
-      conv.put("0", o1);
-      conv.put("1", o2);
-
-      BlockingException t =
-          PathExtractionHelpers.callRequestPathParamsCallback(
-              requestContext, conv, "RoutingDsl#routeTo");
-      if (t != null) {
-        throw t;
-      }
-
-      return delegate.apply(o1, o2);
-    }
-  }
-
-  public static class ArgumentCaptureFunction3<R>
-      implements F.Function3<Object, Object, Object, R> {
-    private final F.Function3<Object, Object, Object, R> delegate;
-
-    public ArgumentCaptureFunction3(F.Function3<Object, Object, Object, R> delegate) {
-      this.delegate = delegate;
+    public static class ArgumentCaptureBiFunction<R> implements BiFunction<Object, Object, R> {
+        private final BiFunction<Object, Object, R> delegate;
+
+        public ArgumentCaptureBiFunction(BiFunction<Object, Object, R> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public R apply(Object o1, Object o2) {
+            if (o1 == null && o2 == null) {
+                return delegate.apply(null, null);
+            }
+
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan == null) {
+                return delegate.apply(o1, o2);
+            }
+
+            RequestContext requestContext = agentSpan.getRequestContext();
+            if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+                return delegate.apply(o1, o2);
+            }
+
+            Map<String, Object> conv = new HashMap<>();
+            conv.put("0", o1);
+            conv.put("1", o2);
+
+            BlockingException t =
+                    PathExtractionHelpers.callRequestPathParamsCallback(requestContext, conv, "RoutingDsl#routeTo");
+            if (t != null) {
+                throw t;
+            }
+
+            return delegate.apply(o1, o2);
+        }
     }
 
-    @Override
-    public R apply(Object o1, Object o2, Object o3) throws Throwable {
-      if (o1 == null && o2 == null && o3 == null) {
-        return delegate.apply(null, null, null);
-      }
-
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan == null) {
-        return delegate.apply(o1, o2, o3);
-      }
-
-      RequestContext requestContext = agentSpan.getRequestContext();
-      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
-        return delegate.apply(o1, o2, o3);
-      }
-
-      Map<String, Object> conv = new HashMap<>();
-      conv.put("0", o1);
-      conv.put("1", o2);
-      conv.put("2", o3);
-
-      BlockingException t =
-          PathExtractionHelpers.callRequestPathParamsCallback(
-              requestContext, conv, "RoutingDsl#routeTo");
-      if (t != null) {
-        throw t;
-      }
-
-      return delegate.apply(o1, o2, o3);
+    public static class ArgumentCaptureFunction3<R> implements F.Function3<Object, Object, Object, R> {
+        private final F.Function3<Object, Object, Object, R> delegate;
+
+        public ArgumentCaptureFunction3(F.Function3<Object, Object, Object, R> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public R apply(Object o1, Object o2, Object o3) throws Throwable {
+            if (o1 == null && o2 == null && o3 == null) {
+                return delegate.apply(null, null, null);
+            }
+
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan == null) {
+                return delegate.apply(o1, o2, o3);
+            }
+
+            RequestContext requestContext = agentSpan.getRequestContext();
+            if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+                return delegate.apply(o1, o2, o3);
+            }
+
+            Map<String, Object> conv = new HashMap<>();
+            conv.put("0", o1);
+            conv.put("1", o2);
+            conv.put("2", o3);
+
+            BlockingException t =
+                    PathExtractionHelpers.callRequestPathParamsCallback(requestContext, conv, "RoutingDsl#routeTo");
+            if (t != null) {
+                throw t;
+            }
+
+            return delegate.apply(o1, o2, o3);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/BodyParserHelpers.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/BodyParserHelpers.java
index 4f1fff4b5fa..90c4a3f0dad 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/BodyParserHelpers.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/BodyParserHelpers.java
@@ -60,634 +60,626 @@
 
 public class BodyParserHelpers {
 
-  public static final int MAX_CONVERSION_DEPTH = 10;
-  private static final Logger log = LoggerFactory.getLogger(BodyParserHelpers.class);
-  public static final int MAX_RECURSION = 15;
-
-  // Cached via reflection to avoid embedding a hard binary reference to
-  // files():Lscala/collection/Seq; — the return type changed to
-  // Lscala/collection/immutable/Seq; in Scala 2.13 (Play 2.7+), which would
-  // cause muzzle to disable the instrumentation for Play 2.7.
-  private static final Method MULTIPART_FILES_METHOD;
-
-  // Cached via reflection: FilePart.ref() returns the generic file reference (TemporaryFile in
-  // Play 2.5/2.6), and TemporaryFile.file() returns java.io.File. Using reflection avoids
-  // embedding bytecode references to TemporaryFile that could break muzzle.
-  private static final Method FILE_PART_REF;
-  private static final Method TEMP_FILE_FILE;
-
-  public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
-  public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
-
-  static {
-    Method m = null;
-    try {
-      m = MultipartFormData.class.getMethod("files");
-    } catch (Exception ignored) {
-    }
-    MULTIPART_FILES_METHOD = m;
-
-    Method ref = null;
-    Method file = null;
-    try {
-      ref = MultipartFormData.FilePart.class.getMethod("ref");
-    } catch (Exception ignored) {
-    }
-    try {
-      file =
-          Class.forName(
-                  "play.api.libs.Files$TemporaryFile",
-                  false,
-                  BodyParserHelpers.class.getClassLoader())
-              .getMethod("file");
-    } catch (Exception ignored) {
-    }
-    FILE_PART_REF = ref;
-    TEMP_FILE_FILE = file;
-  }
-
-  private static JFunction1<
-          scala.collection.immutable.Map<String, Seq<String>>,
-          scala.collection.immutable.Map<String, Seq<String>>>
-      HANDLE_URL_ENCODED = BodyParserHelpers::handleUrlEncoded;
-  private static JFunction1<String, String> HANDLE_TEXT = BodyParserHelpers::handleText;
-  private static JFunction1<MultipartFormData<?>, MultipartFormData<?>> HANDLE_MULTIPART_FORM_DATA =
-      BodyParserHelpers::handleMultipartFormData;
-  private static JFunction1<JsValue, JsValue> HANDLE_JSON = BodyParserHelpers::handleJson;
-  private static JFunction1<NodeSeq, NodeSeq> HANDLE_XML = BodyParserHelpers::handleXml;
-
-  private BodyParserHelpers() {}
-
-  public static Function1<
-          scala.collection.immutable.Map<String, Seq<String>>,
-          scala.collection.immutable.Map<String, Seq<String>>>
-      getHandleUrlEncodedMapF() {
-    return HANDLE_URL_ENCODED;
-  }
-
-  private static scala.collection.immutable.Map<String, Seq<String>> handleUrlEncoded(
-      scala.collection.immutable.Map<String, Seq<String>> data) {
-    if (data == null || data.isEmpty()) {
-      return data;
-    }
-
-    try {
-      Object conv = tryConvertingScalaContainers(data, MAX_CONVERSION_DEPTH);
-      handleArbitraryPostData(conv, "tolerantFormUrlEncoded");
-    } catch (Exception e) {
-      handleException(e, "Error handling result of tolerantFormUrlEncoded BodyParser");
-    }
-    return data;
-  }
-
-  public static Function1<String, String> getHandleStringMapF() {
-    return HANDLE_TEXT;
-  }
-
-  private static String handleText(String s) {
-    if (s == null || s.isEmpty()) {
-      return s;
-    }
-
-    try {
-      handleArbitraryPostData(s, "tolerantText");
-    } catch (Exception e) {
-      handleException(e, "Error handling result of tolerantText BodyParser");
-    }
-
-    return s;
-  }
-
-  public static Function1<MultipartFormData<?>, MultipartFormData<?>>
-      getHandleMultipartFormDataF() {
-    return HANDLE_MULTIPART_FORM_DATA;
-  }
-
-  private static MultipartFormData<?> handleMultipartFormData(MultipartFormData<?> data) {
-    scala.collection.immutable.Map<String, Seq<String>> mpfd = data.asFormUrlEncoded();
-    BlockingException pendingBlock = null;
-
-    if (mpfd != null && !mpfd.isEmpty()) {
-      try {
-        Object conv = tryConvertingScalaContainers(mpfd, MAX_CONVERSION_DEPTH);
-        handleArbitraryPostData(conv, "multipartFormData");
-      } catch (BlockingException be) {
-        pendingBlock = be;
-      } catch (Exception e) {
-        log.debug("Error handling result of multipartFormData BodyParser", e);
-      }
-    }
-
-    try {
-      if (MULTIPART_FILES_METHOD != null) {
-        Object files = MULTIPART_FILES_METHOD.invoke(data);
-        if (files instanceof scala.collection.Iterable) {
-          handleMultipartFilenames(
-              new ScalaIteratorAdapter(((scala.collection.Iterable<?>) files).iterator()));
-        }
-      }
-    } catch (BlockingException be) {
-      if (pendingBlock == null) pendingBlock = be;
-    } catch (Exception e) {
-      log.debug("Error handling multipartFormData filenames", e);
-    }
-
-    if (pendingBlock == null) {
-      try {
-        if (MULTIPART_FILES_METHOD != null) {
-          Object files = MULTIPART_FILES_METHOD.invoke(data);
-          if (files instanceof scala.collection.Iterable) {
-            handleMultipartFilesContent(
-                new ScalaIteratorAdapter(((scala.collection.Iterable<?>) files).iterator()));
-          }
-        }
-      } catch (BlockingException be) {
-        pendingBlock = be;
-      } catch (Exception e) {
-        log.debug("Error handling multipartFormData files content", e);
-      }
-    }
-
-    if (pendingBlock != null) throw pendingBlock;
-    return data;
-  }
-
-  private static void handleMultipartFilenames(java.util.Iterator<?> iterator) {
-    AgentSpan span = activeSpan();
-    if (span == null) {
-      return;
-    }
-    RequestContext reqCtx = span.getRequestContext();
-    if (reqCtx == null || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
-      return;
-    }
-
-    List<String> filenames = collectFilenames(iterator);
-    if (filenames.isEmpty()) {
-      return;
-    }
-
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestFilesFilenames());
-    if (callback == null) {
-      return;
-    }
-    executeFilenamesCallback(reqCtx, callback, filenames);
-  }
-
-  @VisibleForTesting
-  static List<String> collectFilenames(java.util.Iterator<?> iterator) {
-    List<String> filenames = new ArrayList<>();
-    while (iterator.hasNext()) {
-      MultipartFormData.FilePart<?> part = (MultipartFormData.FilePart<?>) iterator.next();
-      String filename = part.filename();
-      if (filename != null && !filename.isEmpty()) {
-        filenames.add(filename);
-      }
-    }
-    return filenames;
-  }
-
-  private static void executeFilenamesCallback(
-      RequestContext reqCtx,
-      BiFunction<RequestContext, List<String>, Flow<Void>> callback,
-      List<String> filenames) {
-    Flow<Void> flow = callback.apply(reqCtx, filenames);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        boolean success = brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-        if (success) {
-          throw new BlockingException("Blocked request (multipart file upload)");
-        }
-      }
-    }
-  }
-
-  private static void handleMultipartFilesContent(java.util.Iterator<?> iterator) {
-    AgentSpan span = activeSpan();
-    if (span == null) {
-      return;
-    }
-    RequestContext reqCtx = span.getRequestContext();
-    if (reqCtx == null || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
-      return;
-    }
-
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestFilesContent());
-    if (callback == null) {
-      return;
-    }
-
-    List<String> contents = collectFilesContent(iterator);
-    if (contents.isEmpty()) {
-      return;
-    }
-
-    executeFilesContentCallback(reqCtx, callback, contents);
-  }
-
-  @VisibleForTesting
-  static List<String> collectFilesContent(java.util.Iterator<?> iterator) {
-    List<String> contents = new ArrayList<>(MAX_FILES_TO_INSPECT);
-    while (iterator.hasNext() && contents.size() < MAX_FILES_TO_INSPECT) {
-      MultipartFormData.FilePart<?> part = (MultipartFormData.FilePart<?>) iterator.next();
-      // null filename → no Content-Disposition filename attribute → form field → skip
-      // empty filename → file upload with no name → content still inspected
-      if (part.filename() == null) {
-        continue;
-      }
-      contents.add(readFilePartContent(part));
-    }
-    return contents;
-  }
-
-  @VisibleForTesting
-  static String readFilePartContent(MultipartFormData.FilePart<?> part) {
-    if (FILE_PART_REF == null || TEMP_FILE_FILE == null) {
-      return "";
-    }
-    try {
-      Object ref = FILE_PART_REF.invoke(part);
-      if (ref == null) {
-        return "";
-      }
-      Object fileObj = TEMP_FILE_FILE.invoke(ref);
-      if (!(fileObj instanceof File)) {
-        return "";
-      }
-      String contentType = null;
-      scala.Option<?> ct = (scala.Option<?>) part.contentType();
-      if (ct != null && ct.isDefined()) {
-        contentType = (String) ct.get();
-      }
-      try (InputStream is = new FileInputStream((File) fileObj)) {
-        return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, contentType);
-      }
-    } catch (Exception ignored) {
-      return "";
-    }
-  }
-
-  private static void executeFilesContentCallback(
-      RequestContext reqCtx,
-      BiFunction<RequestContext, List<String>, Flow<Void>> callback,
-      List<String> contents) {
-    Flow<Void> flow = callback.apply(reqCtx, contents);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        boolean success = brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-        if (success) {
-          throw new BlockingException("Blocked request (multipart file upload content)");
-        }
-      }
-    }
-  }
-
-  public static Function1<JsValue, JsValue> getHandleJsonF() {
-    return HANDLE_JSON;
-  }
-
-  private static JsValue handleJson(JsValue data) {
-    if (data == null) {
-      return null;
-    }
-    if (!isAppsecActiveForRequest()) {
-      // skip potentially expensive transformation
-      return data;
-    }
-
-    try {
-      Object conv = jsValueToJavaObject(data, MAX_RECURSION);
-      handleArbitraryPostData(conv, "json");
-    } catch (Exception e) {
-      handleException(e, "Error handling result of json BodyParser");
-    }
-    return data;
-  }
-
-  public static Function1<NodeSeq, NodeSeq> getHandleXmlF() {
-    return HANDLE_XML;
-  }
-
-  private static NodeSeq handleXml(NodeSeq data) {
-    if (data == null) {
-      return null;
-    }
-    if (!isAppsecActiveForRequest()) {
-      // skip potentially expensive transformation
-      return data;
-    }
-
-    try {
-      Object conv = nodeSeqToJavaObject(data, MAX_RECURSION);
-      handleArbitraryPostData(conv, "xml");
-    } catch (Exception e) {
-      handleException(e, "Error handling result of xml BodyParser");
-    }
-    return data;
-  }
-
-  private static void executeCallback(
-      RequestContext reqCtx,
-      BiFunction<RequestContext, Object, Flow<Void>> callback,
-      Object conv,
-      String details) {
-    Flow<Void> flow = callback.apply(reqCtx, conv);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-      if (blockResponseFunction != null) {
-        boolean success =
-            blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-        if (success) {
-          throw new BlockingException("Blocked request (for " + details + ")");
-        }
-      }
-    }
-  }
-
-  private static Object tryConvertingScalaContainers(Object obj, int depth) {
-    if (depth == 0) {
-      return obj;
-    }
-    if (obj instanceof scala.collection.Map) {
-      scala.collection.Map map = (scala.collection.Map) obj;
-      Map<Object, Object> ret = new HashMap<>();
-      Iterator<Tuple2> iterator = map.iterator();
-      while (iterator.hasNext()) {
-        Tuple2 next = iterator.next();
-        ret.put(next._1(), tryConvertingScalaContainers(next._2(), depth - 1));
-      }
-      return ret;
-    } else if (obj instanceof Iterable) {
-      List<Object> ret = new ArrayList<>();
-      Iterator iterator = ((Iterable) obj).iterator();
-      while (iterator.hasNext()) {
-        Object next = iterator.next();
-        ret.add(tryConvertingScalaContainers(next, depth - 1));
-      }
-      return ret;
-    }
-    return obj;
-  }
-
-  public static void handleJsonNode(JsonNode n, String source) {
-    Object o = jsNodeToJavaObject(n, MAX_RECURSION);
-    handleArbitraryPostDataWithSpanError(o, source);
-  }
-
-  private static boolean isAppsecActiveForRequest() {
-    AgentSpan span = activeSpan();
-    RequestContext reqCtx;
-
-    return span != null
-        && (reqCtx = span.getRequestContext()) != null
-        && reqCtx.getData(RequestContextSlot.APPSEC) != null;
-  }
-
-  public static void handleArbitraryPostDataWithSpanError(Object o, String source) {
-    AgentSpan span = activeSpan();
-    try {
-      doHandleArbitraryPostData(span, o, source);
-    } catch (BlockingException be) {
-      span.addThrowable(be);
-      throw be;
-    }
-  }
-
-  public static void handleArbitraryPostData(Object o, String source) {
-    doHandleArbitraryPostData(activeSpan(), o, source);
-  }
-
-  public static void doHandleArbitraryPostData(AgentSpan span, Object o, String source) {
-    RequestContext reqCtx;
-    if (span == null
-        || (reqCtx = span.getRequestContext()) == null
-        || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
-      return;
-    }
-
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, Object, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestBodyProcessed());
-    if (callback == null) {
-      return;
-    }
-
-    // callback execution
-    executeCallback(reqCtx, callback, o, source);
-  }
-
-  private static void handleException(Exception e, String logMessage) {
-    if (e instanceof BlockingException) {
-      throw (BlockingException) e;
-    }
-
-    log.warn(logMessage, e);
-  }
-
-  public static Object jsValueToJavaObject(JsValue value) {
-    return jsValueToJavaObject(value, MAX_RECURSION);
-  }
-
-  public static Object jsValueToJavaObject(JsValue value, int maxRecursion) {
-    if (value == null || maxRecursion <= 0) {
-      return null;
-    }
-
-    if (value instanceof JsString) {
-      return ((JsString) value).value();
-    } else if (value instanceof JsNumber) {
-      // migrate away from scala types
-      final BigDecimal number = ((JsNumber) value).value();
-      return number == null ? null : number.bigDecimal();
-    } else if (value instanceof JsBoolean) {
-      return ((JsBoolean) value).value();
-    } else if (value instanceof JsObject) {
-      Map<String, Object> map = new HashMap<>();
-      JsObject jsonObject = (JsObject) value;
-      Iterator<Tuple2<String, JsValue>> iterator = jsonObject.fields().iterator();
-      while (iterator.hasNext()) {
-        Tuple2<String, JsValue> e = iterator.next();
-        map.put(e._1(), jsValueToJavaObject(e._2(), maxRecursion - 1));
-      }
-      return map;
-    } else if (value instanceof JsArray) {
-      List<Object> list = new ArrayList<>();
-      JsArray jsArray = (JsArray) value;
-      Iterator<JsValue> iterator = jsArray.value().iterator();
-      while (iterator.hasNext()) {
-        JsValue next = iterator.next();
-        list.add(jsValueToJavaObject(next, maxRecursion - 1));
-      }
-      return list;
-    } else {
-      return null;
-    }
-  }
-
-  private static Object jsNodeToJavaObject(JsonNode value, int maxRecursion) {
-    if (value == null || maxRecursion <= 0) {
-      return null;
-    }
-
-    if (value instanceof TextNode) {
-      return value.asText();
-    } else if (value instanceof FloatNode || value instanceof DoubleNode) {
-      return value.asDouble();
-    } else if (value instanceof NumericNode) {
-      return value.asLong();
-    } else if (value instanceof ObjectNode) {
-      Map<String, Object> map = new HashMap<>();
-      ObjectNode jsonObject = (ObjectNode) value;
-      java.util.Iterator<Map.Entry<String, JsonNode>> iterator = jsonObject.fields();
-      while (iterator.hasNext()) {
-        Map.Entry<String, JsonNode> e = iterator.next();
-        map.put(e.getKey(), jsNodeToJavaObject(e.getValue(), maxRecursion - 1));
-      }
-      return map;
-    } else if (value instanceof ArrayNode) {
-      List<Object> list = new ArrayList<>();
-      ArrayNode arrayNode = (ArrayNode) value;
-      java.util.Iterator<JsonNode> iterator = arrayNode.elements();
-      while (iterator.hasNext()) {
-        JsonNode next = iterator.next();
-        list.add(jsNodeToJavaObject(next, maxRecursion - 1));
-      }
-      return list;
-    } else if (value instanceof NullNode) {
-      return null;
-    } else {
-      return value.asText("");
-    }
-  }
-
-  private static Object nodeSeqToJavaObject(NodeSeq nodeSeq, int maxRecursion) {
-    if (nodeSeq.length() == 0 || maxRecursion <= 0) {
-      return null;
-    }
-
-    List<Object> ret = new ArrayList<>(nodeSeq.length());
-    Iterator<Node> iterator = nodeSeq.iterator();
-    while (iterator.hasNext()) {
-      Node node = iterator.next();
-      ret.add(nodeToJavaObject(node, maxRecursion));
-    }
-    return ret;
-  }
-
-  // we don't preserve element names
-  private static Object nodeToJavaObject(Node node, int maxRecursion) {
-    if (node == null || maxRecursion <= 0) {
-      return null;
-    }
-
-    if (node instanceof Elem) {
-      scala.collection.immutable.Map<String, String> attributes = node.attributes().asAttrMap();
-
-      int size = node.child().size();
-      List<Object> childList = Collections.emptyList();
-      if (size > 0) {
-        childList = new ArrayList<>();
-        Iterator<Node> iterator = node.child().iterator();
+    public static final int MAX_CONVERSION_DEPTH = 10;
+    private static final Logger log = LoggerFactory.getLogger(BodyParserHelpers.class);
+    public static final int MAX_RECURSION = 15;
+
+    // Cached via reflection to avoid embedding a hard binary reference to
+    // files():Lscala/collection/Seq; — the return type changed to
+    // Lscala/collection/immutable/Seq; in Scala 2.13 (Play 2.7+), which would
+    // cause muzzle to disable the instrumentation for Play 2.7.
+    private static final Method MULTIPART_FILES_METHOD;
+
+    // Cached via reflection: FilePart.ref() returns the generic file reference (TemporaryFile in
+    // Play 2.5/2.6), and TemporaryFile.file() returns java.io.File. Using reflection avoids
+    // embedding bytecode references to TemporaryFile that could break muzzle.
+    private static final Method FILE_PART_REF;
+    private static final Method TEMP_FILE_FILE;
+
+    public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
+    public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
+
+    static {
+        Method m = null;
+        try {
+            m = MultipartFormData.class.getMethod("files");
+        } catch (Exception ignored) {
+        }
+        MULTIPART_FILES_METHOD = m;
+
+        Method ref = null;
+        Method file = null;
+        try {
+            ref = MultipartFormData.FilePart.class.getMethod("ref");
+        } catch (Exception ignored) {
+        }
+        try {
+            file = Class.forName("play.api.libs.Files$TemporaryFile", false, BodyParserHelpers.class.getClassLoader())
+                    .getMethod("file");
+        } catch (Exception ignored) {
+        }
+        FILE_PART_REF = ref;
+        TEMP_FILE_FILE = file;
+    }
+
+    private static JFunction1<
+                    scala.collection.immutable.Map<String, Seq<String>>,
+                    scala.collection.immutable.Map<String, Seq<String>>>
+            HANDLE_URL_ENCODED = BodyParserHelpers::handleUrlEncoded;
+    private static JFunction1<String, String> HANDLE_TEXT = BodyParserHelpers::handleText;
+    private static JFunction1<MultipartFormData<?>, MultipartFormData<?>> HANDLE_MULTIPART_FORM_DATA =
+            BodyParserHelpers::handleMultipartFormData;
+    private static JFunction1<JsValue, JsValue> HANDLE_JSON = BodyParserHelpers::handleJson;
+    private static JFunction1<NodeSeq, NodeSeq> HANDLE_XML = BodyParserHelpers::handleXml;
+
+    private BodyParserHelpers() {}
+
+    public static Function1<
+                    scala.collection.immutable.Map<String, Seq<String>>,
+                    scala.collection.immutable.Map<String, Seq<String>>>
+            getHandleUrlEncodedMapF() {
+        return HANDLE_URL_ENCODED;
+    }
+
+    private static scala.collection.immutable.Map<String, Seq<String>> handleUrlEncoded(
+            scala.collection.immutable.Map<String, Seq<String>> data) {
+        if (data == null || data.isEmpty()) {
+            return data;
+        }
+
+        try {
+            Object conv = tryConvertingScalaContainers(data, MAX_CONVERSION_DEPTH);
+            handleArbitraryPostData(conv, "tolerantFormUrlEncoded");
+        } catch (Exception e) {
+            handleException(e, "Error handling result of tolerantFormUrlEncoded BodyParser");
+        }
+        return data;
+    }
+
+    public static Function1<String, String> getHandleStringMapF() {
+        return HANDLE_TEXT;
+    }
+
+    private static String handleText(String s) {
+        if (s == null || s.isEmpty()) {
+            return s;
+        }
+
+        try {
+            handleArbitraryPostData(s, "tolerantText");
+        } catch (Exception e) {
+            handleException(e, "Error handling result of tolerantText BodyParser");
+        }
+
+        return s;
+    }
+
+    public static Function1<MultipartFormData<?>, MultipartFormData<?>> getHandleMultipartFormDataF() {
+        return HANDLE_MULTIPART_FORM_DATA;
+    }
+
+    private static MultipartFormData<?> handleMultipartFormData(MultipartFormData<?> data) {
+        scala.collection.immutable.Map<String, Seq<String>> mpfd = data.asFormUrlEncoded();
+        BlockingException pendingBlock = null;
+
+        if (mpfd != null && !mpfd.isEmpty()) {
+            try {
+                Object conv = tryConvertingScalaContainers(mpfd, MAX_CONVERSION_DEPTH);
+                handleArbitraryPostData(conv, "multipartFormData");
+            } catch (BlockingException be) {
+                pendingBlock = be;
+            } catch (Exception e) {
+                log.debug("Error handling result of multipartFormData BodyParser", e);
+            }
+        }
+
+        try {
+            if (MULTIPART_FILES_METHOD != null) {
+                Object files = MULTIPART_FILES_METHOD.invoke(data);
+                if (files instanceof scala.collection.Iterable) {
+                    handleMultipartFilenames(
+                            new ScalaIteratorAdapter(((scala.collection.Iterable<?>) files).iterator()));
+                }
+            }
+        } catch (BlockingException be) {
+            if (pendingBlock == null) pendingBlock = be;
+        } catch (Exception e) {
+            log.debug("Error handling multipartFormData filenames", e);
+        }
+
+        if (pendingBlock == null) {
+            try {
+                if (MULTIPART_FILES_METHOD != null) {
+                    Object files = MULTIPART_FILES_METHOD.invoke(data);
+                    if (files instanceof scala.collection.Iterable) {
+                        handleMultipartFilesContent(
+                                new ScalaIteratorAdapter(((scala.collection.Iterable<?>) files).iterator()));
+                    }
+                }
+            } catch (BlockingException be) {
+                pendingBlock = be;
+            } catch (Exception e) {
+                log.debug("Error handling multipartFormData files content", e);
+            }
+        }
+
+        if (pendingBlock != null) throw pendingBlock;
+        return data;
+    }
+
+    private static void handleMultipartFilenames(java.util.Iterator<?> iterator) {
+        AgentSpan span = activeSpan();
+        if (span == null) {
+            return;
+        }
+        RequestContext reqCtx = span.getRequestContext();
+        if (reqCtx == null || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
+            return;
+        }
+
+        List<String> filenames = collectFilenames(iterator);
+        if (filenames.isEmpty()) {
+            return;
+        }
+
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> callback = cbp.getCallback(EVENTS.requestFilesFilenames());
+        if (callback == null) {
+            return;
+        }
+        executeFilenamesCallback(reqCtx, callback, filenames);
+    }
+
+    @VisibleForTesting
+    static List<String> collectFilenames(java.util.Iterator<?> iterator) {
+        List<String> filenames = new ArrayList<>();
         while (iterator.hasNext()) {
-          Node childNode = iterator.next();
-          childList.add(nodeToJavaObject(childNode, maxRecursion - 1));
+            MultipartFormData.FilePart<?> part = (MultipartFormData.FilePart<?>) iterator.next();
+            String filename = part.filename();
+            if (filename != null && !filename.isEmpty()) {
+                filenames.add(filename);
+            }
+        }
+        return filenames;
+    }
+
+    private static void executeFilenamesCallback(
+            RequestContext reqCtx,
+            BiFunction<RequestContext, List<String>, Flow<Void>> callback,
+            List<String> filenames) {
+        Flow<Void> flow = callback.apply(reqCtx, filenames);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                boolean success = brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                if (success) {
+                    throw new BlockingException("Blocked request (multipart file upload)");
+                }
+            }
+        }
+    }
+
+    private static void handleMultipartFilesContent(java.util.Iterator<?> iterator) {
+        AgentSpan span = activeSpan();
+        if (span == null) {
+            return;
+        }
+        RequestContext reqCtx = span.getRequestContext();
+        if (reqCtx == null || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
+            return;
+        }
+
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> callback = cbp.getCallback(EVENTS.requestFilesContent());
+        if (callback == null) {
+            return;
+        }
+
+        List<String> contents = collectFilesContent(iterator);
+        if (contents.isEmpty()) {
+            return;
+        }
+
+        executeFilesContentCallback(reqCtx, callback, contents);
+    }
+
+    @VisibleForTesting
+    static List<String> collectFilesContent(java.util.Iterator<?> iterator) {
+        List<String> contents = new ArrayList<>(MAX_FILES_TO_INSPECT);
+        while (iterator.hasNext() && contents.size() < MAX_FILES_TO_INSPECT) {
+            MultipartFormData.FilePart<?> part = (MultipartFormData.FilePart<?>) iterator.next();
+            // null filename → no Content-Disposition filename attribute → form field → skip
+            // empty filename → file upload with no name → content still inspected
+            if (part.filename() == null) {
+                continue;
+            }
+            contents.add(readFilePartContent(part));
+        }
+        return contents;
+    }
+
+    @VisibleForTesting
+    static String readFilePartContent(MultipartFormData.FilePart<?> part) {
+        if (FILE_PART_REF == null || TEMP_FILE_FILE == null) {
+            return "";
+        }
+        try {
+            Object ref = FILE_PART_REF.invoke(part);
+            if (ref == null) {
+                return "";
+            }
+            Object fileObj = TEMP_FILE_FILE.invoke(ref);
+            if (!(fileObj instanceof File)) {
+                return "";
+            }
+            String contentType = null;
+            scala.Option<?> ct = (scala.Option<?>) part.contentType();
+            if (ct != null && ct.isDefined()) {
+                contentType = (String) ct.get();
+            }
+            try (InputStream is = new FileInputStream((File) fileObj)) {
+                return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, contentType);
+            }
+        } catch (Exception ignored) {
+            return "";
+        }
+    }
+
+    private static void executeFilesContentCallback(
+            RequestContext reqCtx,
+            BiFunction<RequestContext, List<String>, Flow<Void>> callback,
+            List<String> contents) {
+        Flow<Void> flow = callback.apply(reqCtx, contents);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                boolean success = brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                if (success) {
+                    throw new BlockingException("Blocked request (multipart file upload content)");
+                }
+            }
+        }
+    }
+
+    public static Function1<JsValue, JsValue> getHandleJsonF() {
+        return HANDLE_JSON;
+    }
+
+    private static JsValue handleJson(JsValue data) {
+        if (data == null) {
+            return null;
+        }
+        if (!isAppsecActiveForRequest()) {
+            // skip potentially expensive transformation
+            return data;
+        }
+
+        try {
+            Object conv = jsValueToJavaObject(data, MAX_RECURSION);
+            handleArbitraryPostData(conv, "json");
+        } catch (Exception e) {
+            handleException(e, "Error handling result of json BodyParser");
+        }
+        return data;
+    }
+
+    public static Function1<NodeSeq, NodeSeq> getHandleXmlF() {
+        return HANDLE_XML;
+    }
+
+    private static NodeSeq handleXml(NodeSeq data) {
+        if (data == null) {
+            return null;
+        }
+        if (!isAppsecActiveForRequest()) {
+            // skip potentially expensive transformation
+            return data;
+        }
+
+        try {
+            Object conv = nodeSeqToJavaObject(data, MAX_RECURSION);
+            handleArbitraryPostData(conv, "xml");
+        } catch (Exception e) {
+            handleException(e, "Error handling result of xml BodyParser");
+        }
+        return data;
+    }
+
+    private static void executeCallback(
+            RequestContext reqCtx,
+            BiFunction<RequestContext, Object, Flow<Void>> callback,
+            Object conv,
+            String details) {
+        Flow<Void> flow = callback.apply(reqCtx, conv);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+            if (blockResponseFunction != null) {
+                boolean success = blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                if (success) {
+                    throw new BlockingException("Blocked request (for " + details + ")");
+                }
+            }
+        }
+    }
+
+    private static Object tryConvertingScalaContainers(Object obj, int depth) {
+        if (depth == 0) {
+            return obj;
+        }
+        if (obj instanceof scala.collection.Map) {
+            scala.collection.Map map = (scala.collection.Map) obj;
+            Map<Object, Object> ret = new HashMap<>();
+            Iterator<Tuple2> iterator = map.iterator();
+            while (iterator.hasNext()) {
+                Tuple2 next = iterator.next();
+                ret.put(next._1(), tryConvertingScalaContainers(next._2(), depth - 1));
+            }
+            return ret;
+        } else if (obj instanceof Iterable) {
+            List<Object> ret = new ArrayList<>();
+            Iterator iterator = ((Iterable) obj).iterator();
+            while (iterator.hasNext()) {
+                Object next = iterator.next();
+                ret.add(tryConvertingScalaContainers(next, depth - 1));
+            }
+            return ret;
+        }
+        return obj;
+    }
+
+    public static void handleJsonNode(JsonNode n, String source) {
+        Object o = jsNodeToJavaObject(n, MAX_RECURSION);
+        handleArbitraryPostDataWithSpanError(o, source);
+    }
+
+    private static boolean isAppsecActiveForRequest() {
+        AgentSpan span = activeSpan();
+        RequestContext reqCtx;
+
+        return span != null
+                && (reqCtx = span.getRequestContext()) != null
+                && reqCtx.getData(RequestContextSlot.APPSEC) != null;
+    }
+
+    public static void handleArbitraryPostDataWithSpanError(Object o, String source) {
+        AgentSpan span = activeSpan();
+        try {
+            doHandleArbitraryPostData(span, o, source);
+        } catch (BlockingException be) {
+            span.addThrowable(be);
+            throw be;
+        }
+    }
+
+    public static void handleArbitraryPostData(Object o, String source) {
+        doHandleArbitraryPostData(activeSpan(), o, source);
+    }
+
+    public static void doHandleArbitraryPostData(AgentSpan span, Object o, String source) {
+        RequestContext reqCtx;
+        if (span == null
+                || (reqCtx = span.getRequestContext()) == null
+                || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
+            return;
+        }
+
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+        if (callback == null) {
+            return;
         }
-      }
 
-      Map<String, Object> nodeRepr = new HashMap<>();
-      if (!attributes.isEmpty()) {
-        nodeRepr.put("attributes", tryConvertingScalaContainers(attributes, 1));
-      }
-      if (!childList.isEmpty()) {
-        nodeRepr.put("children", childList);
-      }
-      return nodeRepr;
-    } else if (node instanceof Text) {
-      return node.text().trim();
-    } else {
-      return null;
+        // callback execution
+        executeCallback(reqCtx, callback, o, source);
     }
-  }
 
-  public static void handleXmlDocument(Document ret, String source) {
-    if (ret == null) {
-      return;
+    private static void handleException(Exception e, String logMessage) {
+        if (e instanceof BlockingException) {
+            throw (BlockingException) e;
+        }
+
+        log.warn(logMessage, e);
     }
 
-    Element documentElement = ret.getDocumentElement();
-    Object obj = convertW3cNode(documentElement, MAX_RECURSION);
+    public static Object jsValueToJavaObject(JsValue value) {
+        return jsValueToJavaObject(value, MAX_RECURSION);
+    }
 
-    // pass wrapped in a list for consistency with NodeSeq (scala) variant
-    handleArbitraryPostDataWithSpanError(Collections.singletonList(obj), source);
-  }
+    public static Object jsValueToJavaObject(JsValue value, int maxRecursion) {
+        if (value == null || maxRecursion <= 0) {
+            return null;
+        }
 
-  private static Object convertW3cNode(org.w3c.dom.Node node, int maxRecursion) {
-    if (node == null || maxRecursion <= 0) {
-      return null;
+        if (value instanceof JsString) {
+            return ((JsString) value).value();
+        } else if (value instanceof JsNumber) {
+            // migrate away from scala types
+            final BigDecimal number = ((JsNumber) value).value();
+            return number == null ? null : number.bigDecimal();
+        } else if (value instanceof JsBoolean) {
+            return ((JsBoolean) value).value();
+        } else if (value instanceof JsObject) {
+            Map<String, Object> map = new HashMap<>();
+            JsObject jsonObject = (JsObject) value;
+            Iterator<Tuple2<String, JsValue>> iterator = jsonObject.fields().iterator();
+            while (iterator.hasNext()) {
+                Tuple2<String, JsValue> e = iterator.next();
+                map.put(e._1(), jsValueToJavaObject(e._2(), maxRecursion - 1));
+            }
+            return map;
+        } else if (value instanceof JsArray) {
+            List<Object> list = new ArrayList<>();
+            JsArray jsArray = (JsArray) value;
+            Iterator<JsValue> iterator = jsArray.value().iterator();
+            while (iterator.hasNext()) {
+                JsValue next = iterator.next();
+                list.add(jsValueToJavaObject(next, maxRecursion - 1));
+            }
+            return list;
+        } else {
+            return null;
+        }
     }
 
-    if (node instanceof Element) {
-      Map<String, String> attributes = Collections.emptyMap();
-      if (node.hasAttributes()) {
-        attributes = new HashMap<>();
-        NamedNodeMap attrMap = node.getAttributes();
-        for (int i = 0; i < attrMap.getLength(); i++) {
-          org.w3c.dom.Attr item = (Attr) attrMap.item(i);
-          attributes.put(item.getName(), item.getValue());
+    private static Object jsNodeToJavaObject(JsonNode value, int maxRecursion) {
+        if (value == null || maxRecursion <= 0) {
+            return null;
+        }
+
+        if (value instanceof TextNode) {
+            return value.asText();
+        } else if (value instanceof FloatNode || value instanceof DoubleNode) {
+            return value.asDouble();
+        } else if (value instanceof NumericNode) {
+            return value.asLong();
+        } else if (value instanceof ObjectNode) {
+            Map<String, Object> map = new HashMap<>();
+            ObjectNode jsonObject = (ObjectNode) value;
+            java.util.Iterator<Map.Entry<String, JsonNode>> iterator = jsonObject.fields();
+            while (iterator.hasNext()) {
+                Map.Entry<String, JsonNode> e = iterator.next();
+                map.put(e.getKey(), jsNodeToJavaObject(e.getValue(), maxRecursion - 1));
+            }
+            return map;
+        } else if (value instanceof ArrayNode) {
+            List<Object> list = new ArrayList<>();
+            ArrayNode arrayNode = (ArrayNode) value;
+            java.util.Iterator<JsonNode> iterator = arrayNode.elements();
+            while (iterator.hasNext()) {
+                JsonNode next = iterator.next();
+                list.add(jsNodeToJavaObject(next, maxRecursion - 1));
+            }
+            return list;
+        } else if (value instanceof NullNode) {
+            return null;
+        } else {
+            return value.asText("");
         }
-      }
+    }
 
-      List<Object> children = Collections.emptyList();
-      if (node.hasChildNodes()) {
-        NodeList childNodes = node.getChildNodes();
-        children = new ArrayList<>(childNodes.getLength());
-        for (int i = 0; i < childNodes.getLength(); i++) {
-          org.w3c.dom.Node item = childNodes.item(i);
-          children.add(convertW3cNode(item, maxRecursion - 1));
+    private static Object nodeSeqToJavaObject(NodeSeq nodeSeq, int maxRecursion) {
+        if (nodeSeq.length() == 0 || maxRecursion <= 0) {
+            return null;
         }
-      }
 
-      Map<String, Object> repr = new HashMap<>();
-      if (!attributes.isEmpty()) {
-        repr.put("attributes", attributes);
-      }
-      if (!children.isEmpty()) {
-        repr.put("children", children);
-      }
-      return repr;
-    } else if (node instanceof org.w3c.dom.Text) {
-      return node.getTextContent();
+        List<Object> ret = new ArrayList<>(nodeSeq.length());
+        Iterator<Node> iterator = nodeSeq.iterator();
+        while (iterator.hasNext()) {
+            Node node = iterator.next();
+            ret.add(nodeToJavaObject(node, maxRecursion));
+        }
+        return ret;
     }
-    return null;
-  }
 
-  static final class ScalaIteratorAdapter implements java.util.Iterator<Object> {
-    private final Iterator<?> delegate;
+    // we don't preserve element names
+    private static Object nodeToJavaObject(Node node, int maxRecursion) {
+        if (node == null || maxRecursion <= 0) {
+            return null;
+        }
 
-    ScalaIteratorAdapter(Iterator<?> delegate) {
-      this.delegate = delegate;
+        if (node instanceof Elem) {
+            scala.collection.immutable.Map<String, String> attributes =
+                    node.attributes().asAttrMap();
+
+            int size = node.child().size();
+            List<Object> childList = Collections.emptyList();
+            if (size > 0) {
+                childList = new ArrayList<>();
+                Iterator<Node> iterator = node.child().iterator();
+                while (iterator.hasNext()) {
+                    Node childNode = iterator.next();
+                    childList.add(nodeToJavaObject(childNode, maxRecursion - 1));
+                }
+            }
+
+            Map<String, Object> nodeRepr = new HashMap<>();
+            if (!attributes.isEmpty()) {
+                nodeRepr.put("attributes", tryConvertingScalaContainers(attributes, 1));
+            }
+            if (!childList.isEmpty()) {
+                nodeRepr.put("children", childList);
+            }
+            return nodeRepr;
+        } else if (node instanceof Text) {
+            return node.text().trim();
+        } else {
+            return null;
+        }
     }
 
-    @Override
-    public boolean hasNext() {
-      return delegate.hasNext();
+    public static void handleXmlDocument(Document ret, String source) {
+        if (ret == null) {
+            return;
+        }
+
+        Element documentElement = ret.getDocumentElement();
+        Object obj = convertW3cNode(documentElement, MAX_RECURSION);
+
+        // pass wrapped in a list for consistency with NodeSeq (scala) variant
+        handleArbitraryPostDataWithSpanError(Collections.singletonList(obj), source);
     }
 
-    @Override
-    public Object next() {
-      return delegate.next();
+    private static Object convertW3cNode(org.w3c.dom.Node node, int maxRecursion) {
+        if (node == null || maxRecursion <= 0) {
+            return null;
+        }
+
+        if (node instanceof Element) {
+            Map<String, String> attributes = Collections.emptyMap();
+            if (node.hasAttributes()) {
+                attributes = new HashMap<>();
+                NamedNodeMap attrMap = node.getAttributes();
+                for (int i = 0; i < attrMap.getLength(); i++) {
+                    org.w3c.dom.Attr item = (Attr) attrMap.item(i);
+                    attributes.put(item.getName(), item.getValue());
+                }
+            }
+
+            List<Object> children = Collections.emptyList();
+            if (node.hasChildNodes()) {
+                NodeList childNodes = node.getChildNodes();
+                children = new ArrayList<>(childNodes.getLength());
+                for (int i = 0; i < childNodes.getLength(); i++) {
+                    org.w3c.dom.Node item = childNodes.item(i);
+                    children.add(convertW3cNode(item, maxRecursion - 1));
+                }
+            }
+
+            Map<String, Object> repr = new HashMap<>();
+            if (!attributes.isEmpty()) {
+                repr.put("attributes", attributes);
+            }
+            if (!children.isEmpty()) {
+                repr.put("children", children);
+            }
+            return repr;
+        } else if (node instanceof org.w3c.dom.Text) {
+            return node.getTextContent();
+        }
+        return null;
+    }
+
+    static final class ScalaIteratorAdapter implements java.util.Iterator<Object> {
+        private final Iterator<?> delegate;
+
+        ScalaIteratorAdapter(Iterator<?> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public boolean hasNext() {
+            return delegate.hasNext();
+        }
+
+        @Override
+        public Object next() {
+            return delegate.next();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/DelegatingBodyParserInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/DelegatingBodyParserInstrumentation.java
index 023af91882f..a39fc0778a5 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/DelegatingBodyParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/DelegatingBodyParserInstrumentation.java
@@ -20,53 +20,50 @@
  */
 @AutoService(InstrumenterModule.class)
 public class DelegatingBodyParserInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public DelegatingBodyParserInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public DelegatingBodyParserInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "play26Plus";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "play26Plus";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_26_PLUS;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_26_PLUS;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.mvc.BodyParser$DelegatingBodyParser";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.mvc.BodyParser$DelegatingBodyParser";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("apply")
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
-            .and(returns(named("play.libs.streams.Accumulator"))),
-        DelegatingBodyParserInstrumentation.class.getName() + "$ApplyAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("apply")
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+                        .and(returns(named("play.libs.streams.Accumulator"))),
+                DelegatingBodyParserInstrumentation.class.getName() + "$ApplyAdvice");
+    }
 
-  static class ApplyAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(
-        @Advice.This BodyParser.DelegatingBodyParser thiz,
-        @Advice.Return(readOnly = false) play.libs.streams.Accumulator ret) {
-      if (!thiz.getClass().getName().equals("play.mvc.BodyParser$MultipartFormData")) {
-        return;
-      }
-      play.libs.streams.Accumulator<
-              akka.util.ByteString,
-              play.libs.F.Either<
-                  play.mvc.Result, Http.MultipartFormData<play.libs.Files.TemporaryFile>>>
-          acc = ret;
+    static class ApplyAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(
+                @Advice.This BodyParser.DelegatingBodyParser thiz,
+                @Advice.Return(readOnly = false) play.libs.streams.Accumulator ret) {
+            if (!thiz.getClass().getName().equals("play.mvc.BodyParser$MultipartFormData")) {
+                return;
+            }
+            play.libs.streams.Accumulator<
+                            akka.util.ByteString,
+                            play.libs.F.Either<play.mvc.Result, Http.MultipartFormData<play.libs.Files.TemporaryFile>>>
+                    acc = ret;
 
-      ret =
-          acc.recover(
-              JavaMultipartFormDataRegisterExcF.INSTANCE, JavaParsers$.MODULE$.trampoline());
+            ret = acc.recover(JavaMultipartFormDataRegisterExcF.INSTANCE, JavaParsers$.MODULE$.trampoline());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/FormUrlEncodedInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/FormUrlEncodedInstrumentation.java
index 3103e58a091..5c6852f16a1 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/FormUrlEncodedInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/FormUrlEncodedInstrumentation.java
@@ -19,45 +19,44 @@
  */
 @AutoService(InstrumenterModule.class)
 public class FormUrlEncodedInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public FormUrlEncodedInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public FormUrlEncodedInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "play26Plus";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "play26Plus";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.mvc.BodyParser$FormUrlEncoded";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.mvc.BodyParser$FormUrlEncoded";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("parse")
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
-            .and(takesArgument(1, named("akka.util.ByteString")))
-            .and(returns(Map.class)),
-        FormUrlEncodedInstrumentation.class.getName() + "$ParseAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("parse")
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+                        .and(takesArgument(1, named("akka.util.ByteString")))
+                        .and(returns(Map.class)),
+                FormUrlEncodedInstrumentation.class.getName() + "$ParseAdvice");
+    }
 
-  static class ParseAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return Map<String, String[]> ret, @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
-      try {
-        // error is reported as client error, which doesn't preserve the exception
-        BodyParserHelpers.handleArbitraryPostDataWithSpanError(ret, "FormUrlEncoded#parse");
-      } catch (BlockingException be) {
-        t = be;
-      }
+    static class ParseAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(@Advice.Return Map<String, String[]> ret, @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
+            }
+            try {
+                // error is reported as client error, which doesn't preserve the exception
+                BodyParserHelpers.handleArbitraryPostDataWithSpanError(ret, "FormUrlEncoded#parse");
+            } catch (BlockingException be) {
+                t = be;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/HttpErrorHandlerInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/HttpErrorHandlerInstrumentation.java
index 145ee7d8d82..9fc22950da1 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/HttpErrorHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/HttpErrorHandlerInstrumentation.java
@@ -27,65 +27,65 @@
  */
 @AutoService(InstrumenterModule.class)
 public class HttpErrorHandlerInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public HttpErrorHandlerInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public HttpErrorHandlerInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "play26Plus";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "play26Plus";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_26_PLUS;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_26_PLUS;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("onServerError"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("play.api.mvc.RequestHeader")))
-            .and(takesArgument(1, Throwable.class))
-            .and(returns(named("scala.concurrent.Future"))),
-        HttpErrorHandlerInstrumentation.class.getName() + "$OnServerErrorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("onServerError"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("play.api.mvc.RequestHeader")))
+                        .and(takesArgument(1, Throwable.class))
+                        .and(returns(named("scala.concurrent.Future"))),
+                HttpErrorHandlerInstrumentation.class.getName() + "$OnServerErrorAdvice");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "play.api.http.HttpErrorHandler";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "play.api.http.HttpErrorHandler";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named("play.api.http.HttpErrorHandler"));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named("play.api.http.HttpErrorHandler"));
+    }
 
-  static class OnServerErrorAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void before(@Advice.Argument(1) Throwable t) {
-      int i = CallDepthThreadLocalMap.incrementCallDepth(HttpErrorHandler.class);
-      if (i > 0) {
-        return;
-      }
+    static class OnServerErrorAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void before(@Advice.Argument(1) Throwable t) {
+            int i = CallDepthThreadLocalMap.incrementCallDepth(HttpErrorHandler.class);
+            if (i > 0) {
+                return;
+            }
 
-      if (!(t instanceof BlockingException)) {
-        return;
-      }
+            if (!(t instanceof BlockingException)) {
+                return;
+            }
 
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan == null) {
-        return;
-      }
-      agentSpan.addThrowable(t);
-    }
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan == null) {
+                return;
+            }
+            agentSpan.addThrowable(t);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after() {
-      CallDepthThreadLocalMap.decrementCallDepth(HttpErrorHandler.class);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after() {
+            CallDepthThreadLocalMap.decrementCallDepth(HttpErrorHandler.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/JavaMultipartFormDataRegisterExcF.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/JavaMultipartFormDataRegisterExcF.java
index bc6199c89f0..14ee53b6247 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/JavaMultipartFormDataRegisterExcF.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/JavaMultipartFormDataRegisterExcF.java
@@ -13,27 +13,27 @@
 import play.mvc.Result;
 
 public class JavaMultipartFormDataRegisterExcF
-    implements Function<Throwable, F.Either<Result, Http.MultipartFormData<Files.TemporaryFile>>> {
-  public static Function<Throwable, F.Either<Result, Http.MultipartFormData<Files.TemporaryFile>>>
-      INSTANCE = new JavaMultipartFormDataRegisterExcF();
+        implements Function<Throwable, F.Either<Result, Http.MultipartFormData<Files.TemporaryFile>>> {
+    public static Function<Throwable, F.Either<Result, Http.MultipartFormData<Files.TemporaryFile>>> INSTANCE =
+            new JavaMultipartFormDataRegisterExcF();
 
-  private JavaMultipartFormDataRegisterExcF() {}
+    private JavaMultipartFormDataRegisterExcF() {}
 
-  @Override
-  public F.Either<Result, Http.MultipartFormData<Files.TemporaryFile>> apply(Throwable exc) {
-    if (exc instanceof CompletionException) {
-      exc = exc.getCause();
+    @Override
+    public F.Either<Result, Http.MultipartFormData<Files.TemporaryFile>> apply(Throwable exc) {
+        if (exc instanceof CompletionException) {
+            exc = exc.getCause();
+        }
+        if (exc instanceof BlockingException) {
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan != null) {
+                agentSpan.addThrowable(exc);
+            }
+        }
+        if (exc instanceof RuntimeException) {
+            throw (RuntimeException) exc;
+        } else {
+            throw new UndeclaredThrowableException(exc);
+        }
     }
-    if (exc instanceof BlockingException) {
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan != null) {
-        agentSpan.addThrowable(exc);
-      }
-    }
-    if (exc instanceof RuntimeException) {
-      throw (RuntimeException) exc;
-    } else {
-      throw new UndeclaredThrowableException(exc);
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/NoDeclaredMethodMatcher.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/NoDeclaredMethodMatcher.java
index 1075d1c34c7..7ef5ee32b24 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/NoDeclaredMethodMatcher.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/NoDeclaredMethodMatcher.java
@@ -4,20 +4,18 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class NoDeclaredMethodMatcher implements ElementMatcher<MethodDescription> {
-  private final ElementMatcher<? super MethodDescription> methodMatcher;
+    private final ElementMatcher<? super MethodDescription> methodMatcher;
 
-  public static ElementMatcher<MethodDescription> hasNoDeclaredMethod(
-      ElementMatcher<? super MethodDescription> em) {
-    return new NoDeclaredMethodMatcher(em);
-  }
+    public static ElementMatcher<MethodDescription> hasNoDeclaredMethod(ElementMatcher<? super MethodDescription> em) {
+        return new NoDeclaredMethodMatcher(em);
+    }
 
-  private NoDeclaredMethodMatcher(ElementMatcher<? super MethodDescription> methodMatcher) {
-    this.methodMatcher = methodMatcher;
-  }
+    private NoDeclaredMethodMatcher(ElementMatcher<? super MethodDescription> methodMatcher) {
+        this.methodMatcher = methodMatcher;
+    }
 
-  @Override
-  public boolean matches(MethodDescription target) {
-    return !target.getDeclaringType().getDeclaredMethods().stream()
-        .anyMatch(md -> this.methodMatcher.matches(md));
-  }
+    @Override
+    public boolean matches(MethodDescription target) {
+        return !target.getDeclaringType().getDeclaredMethods().stream().anyMatch(md -> this.methodMatcher.matches(md));
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PathPatternInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PathPatternInstrumentation.java
index 8740c1a12f3..e41f911912e 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PathPatternInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PathPatternInstrumentation.java
@@ -28,77 +28,76 @@
  */
 @AutoService(InstrumenterModule.class)
 public class PathPatternInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public PathPatternInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public PathPatternInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "play26Plus";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "play26Plus";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.play.appsec.PathExtractionHelpers",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.play.appsec.PathExtractionHelpers",
+        };
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_26_PLUS;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_26_PLUS;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.core.routing.PathPattern";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.core.routing.PathPattern";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("apply")
-            .and(not(isStatic()))
-            .and(takesArguments(1))
-            .and(takesArgument(0, String.class))
-            .and(returns(named("scala.Option"))),
-        PathPatternInstrumentation.class.getName() + "$ApplyAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("apply")
+                        .and(not(isStatic()))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, String.class))
+                        .and(returns(named("scala.Option"))),
+                PathPatternInstrumentation.class.getName() + "$ApplyAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  static class ApplyAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return(readOnly = false)
-            scala.Option<
-                    scala.collection.immutable.Map<String, scala.util.Either<Throwable, String>>>
-                ret,
-        @Advice.Thrown(readOnly = false) Throwable t,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (t != null) {
-        return;
-      }
-      if (ret.isEmpty()) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    static class ApplyAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Return(readOnly = false)
+                        scala.Option<scala.collection.immutable.Map<String, scala.util.Either<Throwable, String>>> ret,
+                @Advice.Thrown(readOnly = false) Throwable t,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (t != null) {
+                return;
+            }
+            if (ret.isEmpty()) {
+                return;
+            }
 
-      java.util.Map<String, Object> conv = new java.util.HashMap<>();
+            java.util.Map<String, Object> conv = new java.util.HashMap<>();
 
-      Iterator<Tuple2<String, Either<Throwable, String>>> iterator = ret.get().iterator();
-      while (iterator.hasNext()) {
-        Tuple2<String, Either<Throwable, String>> next = iterator.next();
-        Either<Throwable, String> value = next._2();
-        if (value.isLeft()) {
-          continue;
-        }
+            Iterator<Tuple2<String, Either<Throwable, String>>> iterator =
+                    ret.get().iterator();
+            while (iterator.hasNext()) {
+                Tuple2<String, Either<Throwable, String>> next = iterator.next();
+                Either<Throwable, String> value = next._2();
+                if (value.isLeft()) {
+                    continue;
+                }
 
-        conv.put(next._1(), value.right().get());
-      }
+                conv.put(next._1(), value.right().get());
+            }
 
-      BlockingException blockingException =
-          PathExtractionHelpers.callRequestPathParamsCallback(reqCtx, conv, "PathPattern#apply");
-      t = blockingException;
+            BlockingException blockingException =
+                    PathExtractionHelpers.callRequestPathParamsCallback(reqCtx, conv, "PathPattern#apply");
+            t = blockingException;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PlayBodyParsersInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PlayBodyParsersInstrumentation.java
index e04d0793c8d..a5a55b264cd 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PlayBodyParsersInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PlayBodyParsersInstrumentation.java
@@ -25,123 +25,112 @@
  */
 @AutoService(InstrumenterModule.class)
 public class PlayBodyParsersInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  private static final String TRAIT_NAME = "play.api.mvc.PlayBodyParsers";
-
-  public PlayBodyParsersInstrumentation() {
-    super("play");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "play26Plus";
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {TRAIT_NAME, TRAIT_NAME + "$class"};
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isTraitMethod(TRAIT_NAME, "tolerantFormUrlEncoded", is(int.class).or(is(long.class)))
-            .and(returns(named("play.api.mvc.BodyParser"))),
-        PlayBodyParsersInstrumentation.class.getName() + "$UrlEncodedAdvice");
-    transformer.applyAdvice(
-        isTraitMethod(TRAIT_NAME, "tolerantText", long.class)
-            .and(returns(named("play.api.mvc.BodyParser"))),
-        PlayBodyParsersInstrumentation.class.getName() + "$TextAdvice");
-    transformer.applyAdvice(
-        isTraitMethod(TRAIT_NAME, "text", long.class)
-            .and(returns(named("play.api.mvc.BodyParser"))),
-        PlayBodyParsersInstrumentation.class.getName() + "$TextAdvice");
-    transformer.applyAdvice(
-        isTraitMethod(TRAIT_NAME, "multipartFormData", "scala.Function1", long.class, boolean.class)
-            .and(returns(named("play.api.mvc.BodyParser"))),
-        PlayBodyParsersInstrumentation.class.getName() + "$MultipartFormDataAdvice");
-    transformer.applyAdvice(
-        isTraitMethod(TRAIT_NAME, "multipartFormData", "scala.Function1", long.class)
-            .and(returns(named("play.api.mvc.BodyParser")))
-            .and(
-                /* only if prev didn't match */
-                hasNoDeclaredMethod(
-                    isTraitMethod(
-                            TRAIT_NAME,
-                            "multipartFormData",
-                            "scala.Function1",
-                            long.class,
-                            boolean.class)
-                        .and(returns(named("play.api.mvc.BodyParser"))))),
-        PlayBodyParsersInstrumentation.class.getName() + "$MultipartFormDataAdvice");
-    transformer.applyAdvice(
-        isTraitMethod(TRAIT_NAME, "tolerantJson", is(int.class).or(is(long.class)))
-            .and(returns(named("play.api.mvc.BodyParser"))),
-        PlayBodyParsersInstrumentation.class.getName() + "$JsonAdvice");
-    transformer.applyAdvice(
-        isTraitMethod(TRAIT_NAME, "tolerantXml", is(int.class).or(is(long.class)))
-            .and(returns(named("play.api.mvc.BodyParser"))),
-        PlayBodyParsersInstrumentation.class.getName() + "$XmlAdvice");
-  }
-
-  static class UrlEncodedAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(
-        @Advice.Return(readOnly = false) BodyParser<Map<String, Seq<String>>> parser) {
-
-      parser =
-          parser.map(
-              BodyParserHelpers.getHandleUrlEncodedMapF(),
-              Execution.Implicits$.MODULE$.trampoline());
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    private static final String TRAIT_NAME = "play.api.mvc.PlayBodyParsers";
+
+    public PlayBodyParsersInstrumentation() {
+        super("play");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "play26Plus";
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {TRAIT_NAME, TRAIT_NAME + "$class"};
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isTraitMethod(
+                                TRAIT_NAME,
+                                "tolerantFormUrlEncoded",
+                                is(int.class).or(is(long.class)))
+                        .and(returns(named("play.api.mvc.BodyParser"))),
+                PlayBodyParsersInstrumentation.class.getName() + "$UrlEncodedAdvice");
+        transformer.applyAdvice(
+                isTraitMethod(TRAIT_NAME, "tolerantText", long.class).and(returns(named("play.api.mvc.BodyParser"))),
+                PlayBodyParsersInstrumentation.class.getName() + "$TextAdvice");
+        transformer.applyAdvice(
+                isTraitMethod(TRAIT_NAME, "text", long.class).and(returns(named("play.api.mvc.BodyParser"))),
+                PlayBodyParsersInstrumentation.class.getName() + "$TextAdvice");
+        transformer.applyAdvice(
+                isTraitMethod(TRAIT_NAME, "multipartFormData", "scala.Function1", long.class, boolean.class)
+                        .and(returns(named("play.api.mvc.BodyParser"))),
+                PlayBodyParsersInstrumentation.class.getName() + "$MultipartFormDataAdvice");
+        transformer.applyAdvice(
+                isTraitMethod(TRAIT_NAME, "multipartFormData", "scala.Function1", long.class)
+                        .and(returns(named("play.api.mvc.BodyParser")))
+                        .and(
+                                /* only if prev didn't match */
+                                hasNoDeclaredMethod(isTraitMethod(
+                                                TRAIT_NAME,
+                                                "multipartFormData",
+                                                "scala.Function1",
+                                                long.class,
+                                                boolean.class)
+                                        .and(returns(named("play.api.mvc.BodyParser"))))),
+                PlayBodyParsersInstrumentation.class.getName() + "$MultipartFormDataAdvice");
+        transformer.applyAdvice(
+                isTraitMethod(TRAIT_NAME, "tolerantJson", is(int.class).or(is(long.class)))
+                        .and(returns(named("play.api.mvc.BodyParser"))),
+                PlayBodyParsersInstrumentation.class.getName() + "$JsonAdvice");
+        transformer.applyAdvice(
+                isTraitMethod(TRAIT_NAME, "tolerantXml", is(int.class).or(is(long.class)))
+                        .and(returns(named("play.api.mvc.BodyParser"))),
+                PlayBodyParsersInstrumentation.class.getName() + "$XmlAdvice");
     }
-  }
 
-  static class TextAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void before() {
-      CallDepthThreadLocalMap.incrementCallDepth(PlayBodyParsers.class);
+    static class UrlEncodedAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.Return(readOnly = false) BodyParser<Map<String, Seq<String>>> parser) {
+
+            parser = parser.map(BodyParserHelpers.getHandleUrlEncodedMapF(), Execution.Implicits$.MODULE$.trampoline());
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return(readOnly = false) BodyParser<String> parser, @Advice.Thrown Throwable t) {
-      int depth = CallDepthThreadLocalMap.decrementCallDepth(PlayBodyParsers.class);
-      if (depth > 0 || t != null) {
-        return;
-      }
-
-      parser =
-          parser.map(
-              BodyParserHelpers.getHandleStringMapF(), Execution.Implicits$.MODULE$.trampoline());
+    static class TextAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void before() {
+            CallDepthThreadLocalMap.incrementCallDepth(PlayBodyParsers.class);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(@Advice.Return(readOnly = false) BodyParser<String> parser, @Advice.Thrown Throwable t) {
+            int depth = CallDepthThreadLocalMap.decrementCallDepth(PlayBodyParsers.class);
+            if (depth > 0 || t != null) {
+                return;
+            }
+
+            parser = parser.map(BodyParserHelpers.getHandleStringMapF(), Execution.Implicits$.MODULE$.trampoline());
+        }
     }
-  }
 
-  static class MultipartFormDataAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(@Advice.Return(readOnly = false) BodyParser<MultipartFormData<?>> parser) {
+    static class MultipartFormDataAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.Return(readOnly = false) BodyParser<MultipartFormData<?>> parser) {
 
-      parser =
-          parser.map(
-              BodyParserHelpers.getHandleMultipartFormDataF(),
-              Execution.Implicits$.MODULE$.trampoline());
+            parser = parser.map(
+                    BodyParserHelpers.getHandleMultipartFormDataF(), Execution.Implicits$.MODULE$.trampoline());
+        }
     }
-  }
 
-  static class JsonAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(@Advice.Return(readOnly = false) BodyParser<JsValue> parser) {
+    static class JsonAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.Return(readOnly = false) BodyParser<JsValue> parser) {
 
-      parser =
-          parser.map(BodyParserHelpers.getHandleJsonF(), Execution.Implicits$.MODULE$.trampoline());
+            parser = parser.map(BodyParserHelpers.getHandleJsonF(), Execution.Implicits$.MODULE$.trampoline());
+        }
     }
-  }
 
-  static class XmlAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(@Advice.Return(readOnly = false) BodyParser<NodeSeq> parser) {
+    static class XmlAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.Return(readOnly = false) BodyParser<NodeSeq> parser) {
 
-      parser =
-          parser.map(BodyParserHelpers.getHandleXmlF(), Execution.Implicits$.MODULE$.trampoline());
+            parser = parser.map(BodyParserHelpers.getHandleXmlF(), Execution.Implicits$.MODULE$.trampoline());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/ResultsStatusInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/ResultsStatusInstrumentation.java
index d7e3db81b03..54b9abe8221 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/ResultsStatusInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/ResultsStatusInstrumentation.java
@@ -24,66 +24,64 @@
 
 @AutoService(InstrumenterModule.class)
 public class ResultsStatusInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ResultsStatusInstrumentation() {
-    super("play");
-  }
+    public ResultsStatusInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "play26Plus";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "play26Plus";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_26_PLUS;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_26_PLUS;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.api.mvc.Results$Status";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.api.mvc.Results$Status";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("apply"), ResultsStatusInstrumentation.class.getName() + "$ResultsStatusApplyAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("apply"), ResultsStatusInstrumentation.class.getName() + "$ResultsStatusApplyAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class ResultsStatusApplyAdvice {
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class ResultsStatusApplyAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void after(
-        @Advice.Argument(0) final Object content, @ActiveRequestContext RequestContext reqCtx) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void after(@Advice.Argument(0) final Object content, @ActiveRequestContext RequestContext reqCtx) {
 
-      if (!(content instanceof JsValue)) {
-        return;
-      }
+            if (!(content instanceof JsValue)) {
+                return;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      if (cbp == null) {
-        return;
-      }
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.responseBody());
-      if (callback == null) {
-        return;
-      }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            if (cbp == null) {
+                return;
+            }
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.responseBody());
+            if (callback == null) {
+                return;
+            }
 
-      Flow<Void> flow = callback.apply(reqCtx, jsValueToJavaObject((JsValue) content));
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction == null) {
-          return;
-        }
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+            Flow<Void> flow = callback.apply(reqCtx, jsValueToJavaObject((JsValue) content));
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction == null) {
+                    return;
+                }
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
 
-        throw new BlockingException("Blocked request (for Results$Status/apply)");
-      }
+                throw new BlockingException("Blocked request (for Results$Status/apply)");
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/RoutingDslInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/RoutingDslInstrumentation.java
index ce026f7727d..4b5cd8b0452 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/RoutingDslInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/RoutingDslInstrumentation.java
@@ -20,68 +20,68 @@
  */
 @AutoService(InstrumenterModule.class)
 public class RoutingDslInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public RoutingDslInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public RoutingDslInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "play26Only";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "play26Only";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.routing.RoutingDsl$Route";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.routing.RoutingDsl$Route";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      new Reference.Builder("play.routing.RoutingDsl$PathPatternMatcher")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC | Reference.EXPECTS_PUBLIC,
-              "routeTo",
-              "Lplay/routing/RoutingDsl;",
-              "Ljava/util/function/Supplier;")
-          .build(),
-      MuzzleReferences.PLAY_26_ONLY[0],
-      MuzzleReferences.PLAY_26_ONLY[1],
-    };
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            new Reference.Builder("play.routing.RoutingDsl$PathPatternMatcher")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_NON_STATIC | Reference.EXPECTS_PUBLIC,
+                            "routeTo",
+                            "Lplay/routing/RoutingDsl;",
+                            "Ljava/util/function/Supplier;")
+                    .build(),
+            MuzzleReferences.PLAY_26_ONLY[0],
+            MuzzleReferences.PLAY_26_ONLY[1],
+        };
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ArgumentCaptureWrappers",
-      packageName + ".ArgumentCaptureWrappers$ArgumentCaptureFunction",
-      packageName + ".ArgumentCaptureWrappers$ArgumentCaptureBiFunction",
-      packageName + ".ArgumentCaptureWrappers$ArgumentCaptureFunction3",
-      "datadog.trace.instrumentation.play.appsec.PathExtractionHelpers",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ArgumentCaptureWrappers",
+            packageName + ".ArgumentCaptureWrappers$ArgumentCaptureFunction",
+            packageName + ".ArgumentCaptureWrappers$ArgumentCaptureBiFunction",
+            packageName + ".ArgumentCaptureWrappers$ArgumentCaptureFunction3",
+            "datadog.trace.instrumentation.play.appsec.PathExtractionHelpers",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArguments(5))
-            .and(takesArgument(3, Object.class))
-            .and(takesArgument(4, java.lang.reflect.Method.class)),
-        RoutingDslInstrumentation.class.getName() + "$RouteConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArguments(5))
+                        .and(takesArgument(3, Object.class))
+                        .and(takesArgument(4, java.lang.reflect.Method.class)),
+                RoutingDslInstrumentation.class.getName() + "$RouteConstructorAdvice");
+    }
 
-  static class RouteConstructorAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void before(@Advice.Argument(value = 3, readOnly = false) Object action) {
-      if (action instanceof Function) {
-        action = new ArgumentCaptureWrappers.ArgumentCaptureFunction<>((Function) action);
-      } else if (action instanceof BiFunction) {
-        action = new ArgumentCaptureWrappers.ArgumentCaptureBiFunction<>((BiFunction) action);
-      } else if (action instanceof F.Function3) {
-        action = new ArgumentCaptureWrappers.ArgumentCaptureFunction3<>((F.Function3) action);
-      }
+    static class RouteConstructorAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void before(@Advice.Argument(value = 3, readOnly = false) Object action) {
+            if (action instanceof Function) {
+                action = new ArgumentCaptureWrappers.ArgumentCaptureFunction<>((Function) action);
+            } else if (action instanceof BiFunction) {
+                action = new ArgumentCaptureWrappers.ArgumentCaptureBiFunction<>((BiFunction) action);
+            } else if (action instanceof F.Function3) {
+                action = new ArgumentCaptureWrappers.ArgumentCaptureFunction3<>((F.Function3) action);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/SirdPathExtractorInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/SirdPathExtractorInstrumentation.java
index cfa61d26931..9d20621bcbf 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/SirdPathExtractorInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/SirdPathExtractorInstrumentation.java
@@ -25,63 +25,61 @@
  */
 @AutoService(InstrumenterModule.class)
 public class SirdPathExtractorInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public SirdPathExtractorInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public SirdPathExtractorInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "play26Plus";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "play26Plus";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_26_PLUS; // force failure in <2.6
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_26_PLUS; // force failure in <2.6
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.api.routing.sird.PathExtractor";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.api.routing.sird.PathExtractor";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("extract")
-            .and(takesArguments(1))
-            .and(takesArgument(0, String.class))
-            .and(returns(named("scala.Option"))),
-        SirdPathExtractorInstrumentation.class.getName() + "$ExtractAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("extract")
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, String.class))
+                        .and(returns(named("scala.Option"))),
+                SirdPathExtractorInstrumentation.class.getName() + "$ExtractAdvice");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.play.appsec.PathExtractionHelpers",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.play.appsec.PathExtractionHelpers",
+        };
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  static class ExtractAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return scala.Option<scala.collection.immutable.List<String>> ret,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (ret.isEmpty() || t != null) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    static class ExtractAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Return scala.Option<scala.collection.immutable.List<String>> ret,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (ret.isEmpty() || t != null) {
+                return;
+            }
 
-      Map<String, Object> conv = new HashMap<>();
-      List<String> stringList = ret.get();
-      for (int i = 0; i < stringList.size(); i++) {
-        conv.put(Integer.toString(i), stringList.apply(i));
-      }
+            Map<String, Object> conv = new HashMap<>();
+            List<String> stringList = ret.get();
+            for (int i = 0; i < stringList.size(); i++) {
+                conv.put(Integer.toString(i), stringList.apply(i));
+            }
 
-      t =
-          PathExtractionHelpers.callRequestPathParamsCallback(
-              reqCtx, conv, "sird.PathExtractor#extract");
+            t = PathExtractionHelpers.callRequestPathParamsCallback(reqCtx, conv, "sird.PathExtractor#extract");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/StatusHeaderInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/StatusHeaderInstrumentation.java
index 904c3731d3f..ff18042bd76 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/StatusHeaderInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/StatusHeaderInstrumentation.java
@@ -26,77 +26,74 @@
 
 @AutoService(InstrumenterModule.class)
 public class StatusHeaderInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public StatusHeaderInstrumentation() {
-    super("play");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "play26Plus";
-  }
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_26_PLUS; // force failure in <2.6
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "play.mvc.StatusHeader";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("sendJson").and(takesArgument(0, named("com.fasterxml.jackson.databind.JsonNode"))),
-        StatusHeaderInstrumentation.class.getName() + "$StatusHeaderSendJsonAdvice");
-  }
-
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class StatusHeaderSendJsonAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void before(
-        @Advice.Argument(0) final JsonNode json,
-        @ActiveRequestContext final RequestContext reqCtx) {
-
-      if (CallDepthThreadLocalMap.incrementCallDepth(StatusHeader.class) > 0) {
-        return;
-      }
-
-      if (json == null) {
-        return;
-      }
-
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      if (cbp == null) {
-        return;
-      }
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.responseBody());
-      if (callback == null) {
-        return;
-      }
-
-      Flow<Void> flow = callback.apply(reqCtx, json);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction == null) {
-          return;
-        }
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public StatusHeaderInstrumentation() {
+        super("play");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "play26Plus";
+    }
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_26_PLUS; // force failure in <2.6
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "play.mvc.StatusHeader";
+    }
 
-        throw new BlockingException("Blocked request (for StatusHeader/sendJson)");
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("sendJson").and(takesArgument(0, named("com.fasterxml.jackson.databind.JsonNode"))),
+                StatusHeaderInstrumentation.class.getName() + "$StatusHeaderSendJsonAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after() {
-      CallDepthThreadLocalMap.decrementCallDepth(StatusHeader.class);
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class StatusHeaderSendJsonAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void before(@Advice.Argument(0) final JsonNode json, @ActiveRequestContext final RequestContext reqCtx) {
+
+            if (CallDepthThreadLocalMap.incrementCallDepth(StatusHeader.class) > 0) {
+                return;
+            }
+
+            if (json == null) {
+                return;
+            }
+
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            if (cbp == null) {
+                return;
+            }
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.responseBody());
+            if (callback == null) {
+                return;
+            }
+
+            Flow<Void> flow = callback.apply(reqCtx, json);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction == null) {
+                    return;
+                }
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+
+                throw new BlockingException("Blocked request (for StatusHeader/sendJson)");
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after() {
+            CallDepthThreadLocalMap.decrementCallDepth(StatusHeader.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantJsonInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantJsonInstrumentation.java
index 384ffda6423..652d12e233b 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantJsonInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantJsonInstrumentation.java
@@ -23,49 +23,49 @@
  */
 @AutoService(InstrumenterModule.class)
 public class TolerantJsonInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public TolerantJsonInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public TolerantJsonInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "play26Plus";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "play26Plus";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_26_PLUS;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_26_PLUS;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.mvc.BodyParser$TolerantJson";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.mvc.BodyParser$TolerantJson";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("parse")
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
-            .and(takesArgument(1, named("akka.util.ByteString")))
-            .and(returns(named("com.fasterxml.jackson.databind.JsonNode"))),
-        TolerantJsonInstrumentation.class.getName() + "$ParseAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("parse")
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+                        .and(takesArgument(1, named("akka.util.ByteString")))
+                        .and(returns(named("com.fasterxml.jackson.databind.JsonNode"))),
+                TolerantJsonInstrumentation.class.getName() + "$ParseAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  static class ParseAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(@Advice.Return JsonNode ret, @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
-      try {
-        BodyParserHelpers.handleJsonNode(ret, "TolerantJson#parse");
-      } catch (BlockingException be) {
-        t = be;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    static class ParseAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(@Advice.Return JsonNode ret, @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
+            }
+            try {
+                BodyParserHelpers.handleJsonNode(ret, "TolerantJson#parse");
+            } catch (BlockingException be) {
+                t = be;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantTextInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantTextInstrumentation.java
index ccb5510ac94..f8d74a17274 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantTextInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantTextInstrumentation.java
@@ -20,49 +20,49 @@
  */
 @AutoService(InstrumenterModule.class)
 public class TolerantTextInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public TolerantTextInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public TolerantTextInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "play26Plus";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "play26Plus";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_26_PLUS;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_26_PLUS;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.mvc.BodyParser$TolerantText";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.mvc.BodyParser$TolerantText";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("parse")
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
-            .and(takesArgument(1, named("akka.util.ByteString")))
-            .and(returns(String.class)),
-        TolerantTextInstrumentation.class.getName() + "$ParseAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("parse")
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+                        .and(takesArgument(1, named("akka.util.ByteString")))
+                        .and(returns(String.class)),
+                TolerantTextInstrumentation.class.getName() + "$ParseAdvice");
+    }
 
-  static class ParseAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(@Advice.Return String ret, @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
-      try {
-        // error is reported as client error, which doesn't preserve the exception
-        BodyParserHelpers.handleArbitraryPostDataWithSpanError(ret, "TolerantText#parse");
-      } catch (BlockingException be) {
-        t = be;
-      }
+    static class ParseAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(@Advice.Return String ret, @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
+            }
+            try {
+                // error is reported as client error, which doesn't preserve the exception
+                BodyParserHelpers.handleArbitraryPostDataWithSpanError(ret, "TolerantText#parse");
+            } catch (BlockingException be) {
+                t = be;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantXmlInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantXmlInstrumentation.java
index 0dfaddea35e..53a584a0fe2 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantXmlInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantXmlInstrumentation.java
@@ -20,49 +20,48 @@
  */
 @AutoService(InstrumenterModule.class)
 public class TolerantXmlInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public TolerantXmlInstrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public TolerantXmlInstrumentation() {
+        super("play");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "play26Plus";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "play26Plus";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return MuzzleReferences.PLAY_26_PLUS;
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return MuzzleReferences.PLAY_26_PLUS;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.mvc.BodyParser$TolerantXml";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.mvc.BodyParser$TolerantXml";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("parse")
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
-            .and(takesArgument(1, named("akka.util.ByteString")))
-            .and(returns(named("org.w3c.dom.Document"))),
-        TolerantXmlInstrumentation.class.getName() + "$ParseAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("parse")
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("play.mvc.Http$RequestHeader")))
+                        .and(takesArgument(1, named("akka.util.ByteString")))
+                        .and(returns(named("org.w3c.dom.Document"))),
+                TolerantXmlInstrumentation.class.getName() + "$ParseAdvice");
+    }
 
-  static class ParseAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return org.w3c.dom.Document ret, @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
-      try {
-        BodyParserHelpers.handleXmlDocument(ret, "TolerantXml#parse");
-      } catch (BlockingException be) {
-        t = be;
-      }
+    static class ParseAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(@Advice.Return org.w3c.dom.Document ret, @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
+            }
+            try {
+                BodyParserHelpers.handleXmlDocument(ret, "TolerantXml#parse");
+            } catch (BlockingException be) {
+                t = be;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/test/java/datadog/trace/instrumentation/play26/appsec/BodyParserHelpersTest.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/test/java/datadog/trace/instrumentation/play26/appsec/BodyParserHelpersTest.java
index 17fd88344a1..bdbeb4b4efe 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/test/java/datadog/trace/instrumentation/play26/appsec/BodyParserHelpersTest.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/test/java/datadog/trace/instrumentation/play26/appsec/BodyParserHelpersTest.java
@@ -16,153 +16,144 @@
 
 class BodyParserHelpersTest {
 
-  private static JsValue parse(String json) {
-    return play.api.libs.json.Json$.MODULE$.parse(json);
-  }
-
-  @Test
-  void jsValueToJavaObject_nullInputReturnsNull() {
-    assertNull(BodyParserHelpers.jsValueToJavaObject(null));
-  }
-
-  @Test
-  void jsValueToJavaObject_jsNullReturnsNull() {
-    assertNull(BodyParserHelpers.jsValueToJavaObject(parse("null")));
-  }
-
-  @Test
-  void jsValueToJavaObject_string() {
-    Object result = BodyParserHelpers.jsValueToJavaObject(parse("\"hello\""));
-    assertEquals("hello", result);
-  }
-
-  @Test
-  void jsValueToJavaObject_number() {
-    Object result = BodyParserHelpers.jsValueToJavaObject(parse("42"));
-    assertTrue(result instanceof BigDecimal);
-    assertEquals(0, ((BigDecimal) result).compareTo(new BigDecimal("42")));
-  }
-
-  @Test
-  void jsValueToJavaObject_booleanTrue() {
-    Object result = BodyParserHelpers.jsValueToJavaObject(parse("true"));
-    assertEquals(Boolean.TRUE, result);
-  }
-
-  @Test
-  void jsValueToJavaObject_booleanFalse() {
-    Object result = BodyParserHelpers.jsValueToJavaObject(parse("false"));
-    assertEquals(Boolean.FALSE, result);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void jsValueToJavaObject_object() {
-    Object result = BodyParserHelpers.jsValueToJavaObject(parse("{\"key\":\"value\",\"num\":1}"));
-    assertTrue(result instanceof Map);
-    Map<String, Object> map = (Map<String, Object>) result;
-    assertEquals("value", map.get("key"));
-    assertTrue(map.get("num") instanceof BigDecimal);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void jsValueToJavaObject_array() {
-    Object result = BodyParserHelpers.jsValueToJavaObject(parse("[\"a\",\"b\",\"c\"]"));
-    assertTrue(result instanceof List);
-    List<Object> list = (List<Object>) result;
-    assertEquals(3, list.size());
-    assertEquals("a", list.get(0));
-    assertEquals("b", list.get(1));
-    assertEquals("c", list.get(2));
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void jsValueToJavaObject_nestedObject() {
-    Object result =
-        BodyParserHelpers.jsValueToJavaObject(parse("{\"outer\":{\"inner\":\"deep\"}}"));
-    assertTrue(result instanceof Map);
-    Map<String, Object> outer = (Map<String, Object>) result;
-    assertTrue(outer.get("outer") instanceof Map);
-    Map<String, Object> inner = (Map<String, Object>) outer.get("outer");
-    assertEquals("deep", inner.get("inner"));
-  }
-
-  @Test
-  void jsValueToJavaObject_zeroRecursionReturnsNull() {
-    Object result = BodyParserHelpers.jsValueToJavaObject(parse("{\"key\":\"value\"}"), 0);
-    assertNull(result);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void jsValueToJavaObject_recursionLimitTruncatesNesting() {
-    // depth=1 means the object itself is converted but children are null
-    Object result = BodyParserHelpers.jsValueToJavaObject(parse("{\"a\":{\"b\":\"val\"}}"), 1);
-    assertTrue(result instanceof Map);
-    Map<String, Object> map = (Map<String, Object>) result;
-    // inner object exceeds depth so its value is null
-    assertNull(map.get("a"));
-  }
-
-  // --- collectFilenames tests ---
-
-  @Test
-  void collectFilenames_emptyIterator() {
-    List<String> result = BodyParserHelpers.collectFilenames(Collections.emptyIterator());
-    assertTrue(result.isEmpty());
-  }
-
-  @Test
-  void collectFilenames_nullFilenameExcluded() throws Exception {
-    List<String> result =
-        BodyParserHelpers.collectFilenames(
-            Collections.<Object>singletonList(filePart("f", null)).iterator());
-    assertTrue(result.isEmpty());
-  }
-
-  @Test
-  void collectFilenames_emptyFilenameExcluded() throws Exception {
-    List<String> result =
-        BodyParserHelpers.collectFilenames(
-            Collections.<Object>singletonList(filePart("f", "")).iterator());
-    assertTrue(result.isEmpty());
-  }
-
-  @Test
-  void collectFilenames_validFilenameIncluded() throws Exception {
-    List<String> result =
-        BodyParserHelpers.collectFilenames(
-            Collections.<Object>singletonList(filePart("f", "evil.php")).iterator());
-    assertEquals(Collections.singletonList("evil.php"), result);
-  }
-
-  @Test
-  void collectFilenames_mixedPartsFiltered() throws Exception {
-    List<Object> parts =
-        Arrays.<Object>asList(
-            filePart("f1", "a.pdf"),
-            filePart("f2", null),
-            filePart("f3", ""),
-            filePart("f4", "b.jpg"));
-    List<String> result = BodyParserHelpers.collectFilenames(parts.iterator());
-    assertEquals(Arrays.asList("a.pdf", "b.jpg"), result);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static MultipartFormData.FilePart<Object> filePart(String key, String filename)
-      throws Exception {
-    // FilePart is a Scala case class nested in object MultipartFormData.
-    // Use the companion object's apply() to avoid JVM inner-class constructor complexity.
-    Class<?> companionClass = Class.forName("play.api.mvc.MultipartFormData$FilePart$");
-    Object companion = companionClass.getField("MODULE$").get(null);
-    for (Method m : companionClass.getMethods()) {
-      if ("apply".equals(m.getName()) && m.getParameterCount() == 4) {
-        return (MultipartFormData.FilePart<Object>)
-            m.invoke(companion, key, filename, scala.None$.MODULE$, new Object());
-      }
-    }
-    throw new IllegalStateException("FilePart.apply(4 params) not found");
-  }
+    private static JsValue parse(String json) {
+        return play.api.libs.json.Json$.MODULE$.parse(json);
+    }
+
+    @Test
+    void jsValueToJavaObject_nullInputReturnsNull() {
+        assertNull(BodyParserHelpers.jsValueToJavaObject(null));
+    }
+
+    @Test
+    void jsValueToJavaObject_jsNullReturnsNull() {
+        assertNull(BodyParserHelpers.jsValueToJavaObject(parse("null")));
+    }
+
+    @Test
+    void jsValueToJavaObject_string() {
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("\"hello\""));
+        assertEquals("hello", result);
+    }
+
+    @Test
+    void jsValueToJavaObject_number() {
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("42"));
+        assertTrue(result instanceof BigDecimal);
+        assertEquals(0, ((BigDecimal) result).compareTo(new BigDecimal("42")));
+    }
+
+    @Test
+    void jsValueToJavaObject_booleanTrue() {
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("true"));
+        assertEquals(Boolean.TRUE, result);
+    }
+
+    @Test
+    void jsValueToJavaObject_booleanFalse() {
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("false"));
+        assertEquals(Boolean.FALSE, result);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void jsValueToJavaObject_object() {
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("{\"key\":\"value\",\"num\":1}"));
+        assertTrue(result instanceof Map);
+        Map<String, Object> map = (Map<String, Object>) result;
+        assertEquals("value", map.get("key"));
+        assertTrue(map.get("num") instanceof BigDecimal);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void jsValueToJavaObject_array() {
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("[\"a\",\"b\",\"c\"]"));
+        assertTrue(result instanceof List);
+        List<Object> list = (List<Object>) result;
+        assertEquals(3, list.size());
+        assertEquals("a", list.get(0));
+        assertEquals("b", list.get(1));
+        assertEquals("c", list.get(2));
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void jsValueToJavaObject_nestedObject() {
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("{\"outer\":{\"inner\":\"deep\"}}"));
+        assertTrue(result instanceof Map);
+        Map<String, Object> outer = (Map<String, Object>) result;
+        assertTrue(outer.get("outer") instanceof Map);
+        Map<String, Object> inner = (Map<String, Object>) outer.get("outer");
+        assertEquals("deep", inner.get("inner"));
+    }
+
+    @Test
+    void jsValueToJavaObject_zeroRecursionReturnsNull() {
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("{\"key\":\"value\"}"), 0);
+        assertNull(result);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void jsValueToJavaObject_recursionLimitTruncatesNesting() {
+        // depth=1 means the object itself is converted but children are null
+        Object result = BodyParserHelpers.jsValueToJavaObject(parse("{\"a\":{\"b\":\"val\"}}"), 1);
+        assertTrue(result instanceof Map);
+        Map<String, Object> map = (Map<String, Object>) result;
+        // inner object exceeds depth so its value is null
+        assertNull(map.get("a"));
+    }
+
+    // --- collectFilenames tests ---
+
+    @Test
+    void collectFilenames_emptyIterator() {
+        List<String> result = BodyParserHelpers.collectFilenames(Collections.emptyIterator());
+        assertTrue(result.isEmpty());
+    }
+
+    @Test
+    void collectFilenames_nullFilenameExcluded() throws Exception {
+        List<String> result = BodyParserHelpers.collectFilenames(
+                Collections.<Object>singletonList(filePart("f", null)).iterator());
+        assertTrue(result.isEmpty());
+    }
+
+    @Test
+    void collectFilenames_emptyFilenameExcluded() throws Exception {
+        List<String> result = BodyParserHelpers.collectFilenames(
+                Collections.<Object>singletonList(filePart("f", "")).iterator());
+        assertTrue(result.isEmpty());
+    }
+
+    @Test
+    void collectFilenames_validFilenameIncluded() throws Exception {
+        List<String> result = BodyParserHelpers.collectFilenames(
+                Collections.<Object>singletonList(filePart("f", "evil.php")).iterator());
+        assertEquals(Collections.singletonList("evil.php"), result);
+    }
+
+    @Test
+    void collectFilenames_mixedPartsFiltered() throws Exception {
+        List<Object> parts = Arrays.<Object>asList(
+                filePart("f1", "a.pdf"), filePart("f2", null), filePart("f3", ""), filePart("f4", "b.jpg"));
+        List<String> result = BodyParserHelpers.collectFilenames(parts.iterator());
+        assertEquals(Arrays.asList("a.pdf", "b.jpg"), result);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static MultipartFormData.FilePart<Object> filePart(String key, String filename) throws Exception {
+        // FilePart is a Scala case class nested in object MultipartFormData.
+        // Use the companion object's apply() to avoid JVM inner-class constructor complexity.
+        Class<?> companionClass = Class.forName("play.api.mvc.MultipartFormData$FilePart$");
+        Object companion = companionClass.getField("MODULE$").get(null);
+        for (Method m : companionClass.getMethods()) {
+            if ("apply".equals(m.getName()) && m.getParameterCount() == 4) {
+                return (MultipartFormData.FilePart<Object>)
+                        m.invoke(companion, key, filename, scala.None$.MODULE$, new Object());
+            }
+        }
+        throw new IllegalStateException("FilePart.apply(4 params) not found");
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/test/java/datadog/trace/instrumentation/play26/server/TestHttpErrorHandler.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/test/java/datadog/trace/instrumentation/play26/server/TestHttpErrorHandler.java
index f4a4055480c..b82a53ee43f 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/test/java/datadog/trace/instrumentation/play26/server/TestHttpErrorHandler.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/test/java/datadog/trace/instrumentation/play26/server/TestHttpErrorHandler.java
@@ -12,31 +12,30 @@
 import play.mvc.Results;
 
 public class TestHttpErrorHandler implements HttpErrorHandler {
-  private static final Logger log = LoggerFactory.getLogger(TestHttpErrorHandler.class);
+    private static final Logger log = LoggerFactory.getLogger(TestHttpErrorHandler.class);
 
-  public static class CustomRuntimeException extends RuntimeException {
-    public CustomRuntimeException(String message) {
-      super(message);
+    public static class CustomRuntimeException extends RuntimeException {
+        public CustomRuntimeException(String message) {
+            super(message);
+        }
     }
-  }
 
-  public CompletionStage<Result> onClientError(
-      RequestHeader request, int statusCode, String message) {
-    return CompletableFuture.completedFuture(Results.status(statusCode, message));
-  }
+    public CompletionStage<Result> onClientError(RequestHeader request, int statusCode, String message) {
+        return CompletableFuture.completedFuture(Results.status(statusCode, message));
+    }
 
-  public CompletionStage<Result> onServerError(RequestHeader request, Throwable exception) {
-    log.warn("server error", exception);
+    public CompletionStage<Result> onServerError(RequestHeader request, Throwable exception) {
+        log.warn("server error", exception);
 
-    Throwable cause = exception.getCause();
-    if (cause != null) {
-      exception = cause;
-    }
-    if (exception instanceof CustomRuntimeException) {
-      return CompletableFuture.completedFuture(
-          Results.status(CUSTOM_EXCEPTION.getStatus(), exception.getMessage()));
-    }
+        Throwable cause = exception.getCause();
+        if (cause != null) {
+            exception = cause;
+        }
+        if (exception instanceof CustomRuntimeException) {
+            return CompletableFuture.completedFuture(
+                    Results.status(CUSTOM_EXCEPTION.getStatus(), exception.getMessage()));
+        }
 
-    return CompletableFuture.completedFuture(Results.internalServerError(exception.getMessage()));
-  }
+        return CompletableFuture.completedFuture(Results.internalServerError(exception.getMessage()));
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.7/src/main/java/datadog/trace/instrumentation/play27/appsec/ArgumentCaptureAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.7/src/main/java/datadog/trace/instrumentation/play27/appsec/ArgumentCaptureAdvice.java
index d32fdb49773..1f74dddf117 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.7/src/main/java/datadog/trace/instrumentation/play27/appsec/ArgumentCaptureAdvice.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.7/src/main/java/datadog/trace/instrumentation/play27/appsec/ArgumentCaptureAdvice.java
@@ -17,135 +17,129 @@
 import play.routing.RequestFunctions;
 
 public class ArgumentCaptureAdvice {
-  private static Logger log = LoggerFactory.getLogger(ArgumentCaptureAdvice.class);
-
-  public static class RouteConstructorAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void before(@Advice.Argument(value = 3, readOnly = false) Object action) {
-      if (action instanceof RequestFunctions.Params1) {
-        action = new ArgumentCaptureFunctionParam1((RequestFunctions.Params1) action);
-      } else if (action instanceof RequestFunctions.Params2) {
-        action = new ArgumentCaptureFunctionParam2((RequestFunctions.Params2) action);
-      } else if (action instanceof RequestFunctions.Params3) {
-        action = new ArgumentCaptureFunctionParam3((RequestFunctions.Params3) action);
-      }
+    private static Logger log = LoggerFactory.getLogger(ArgumentCaptureAdvice.class);
+
+    public static class RouteConstructorAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void before(@Advice.Argument(value = 3, readOnly = false) Object action) {
+            if (action instanceof RequestFunctions.Params1) {
+                action = new ArgumentCaptureFunctionParam1((RequestFunctions.Params1) action);
+            } else if (action instanceof RequestFunctions.Params2) {
+                action = new ArgumentCaptureFunctionParam2((RequestFunctions.Params2) action);
+            } else if (action instanceof RequestFunctions.Params3) {
+                action = new ArgumentCaptureFunctionParam3((RequestFunctions.Params3) action);
+            }
+        }
     }
-  }
 
-  public static class ArgumentCaptureFunctionParam1<R>
-      implements RequestFunctions.Params1<Object, R> {
-    private final RequestFunctions.Params1<Object, R> delegate;
+    public static class ArgumentCaptureFunctionParam1<R> implements RequestFunctions.Params1<Object, R> {
+        private final RequestFunctions.Params1<Object, R> delegate;
 
-    public ArgumentCaptureFunctionParam1(RequestFunctions.Params1<Object, R> delegate) {
-      this.delegate = delegate;
-    }
-
-    @Override
-    public R apply(Http.Request req, Object o1) {
-      if (o1 == null) {
-        return delegate.apply(req, null);
-      }
+        public ArgumentCaptureFunctionParam1(RequestFunctions.Params1<Object, R> delegate) {
+            this.delegate = delegate;
+        }
 
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan == null) {
-        return delegate.apply(req, o1);
-      }
+        @Override
+        public R apply(Http.Request req, Object o1) {
+            if (o1 == null) {
+                return delegate.apply(req, null);
+            }
 
-      RequestContext requestContext = agentSpan.getRequestContext();
-      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
-        return delegate.apply(req, o1);
-      }
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan == null) {
+                return delegate.apply(req, o1);
+            }
 
-      Map<String, Object> conv = Collections.singletonMap("0", o1);
+            RequestContext requestContext = agentSpan.getRequestContext();
+            if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+                return delegate.apply(req, o1);
+            }
 
-      BlockingException t =
-          PathExtractionHelpers.callRequestPathParamsCallback(
-              requestContext, conv, "RoutingDsl#routingTo");
-      if (t != null) {
-        throw t;
-      }
-
-      return delegate.apply(req, o1);
-    }
-  }
+            Map<String, Object> conv = Collections.singletonMap("0", o1);
 
-  public static class ArgumentCaptureFunctionParam2<R>
-      implements RequestFunctions.Params2<Object, Object, R> {
-    private final RequestFunctions.Params2<Object, Object, R> delegate;
+            BlockingException t =
+                    PathExtractionHelpers.callRequestPathParamsCallback(requestContext, conv, "RoutingDsl#routingTo");
+            if (t != null) {
+                throw t;
+            }
 
-    public ArgumentCaptureFunctionParam2(RequestFunctions.Params2<Object, Object, R> delegate) {
-      this.delegate = delegate;
+            return delegate.apply(req, o1);
+        }
     }
 
-    @Override
-    public R apply(Http.Request req, Object o1, Object o2) throws Throwable {
-      if (o1 == null && o2 == null) {
-        return delegate.apply(req, null, null);
-      }
-
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan == null) {
-        return delegate.apply(req, o1, o2);
-      }
-
-      RequestContext requestContext = agentSpan.getRequestContext();
-      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
-        return delegate.apply(req, o1, o2);
-      }
-
-      Map<String, Object> conv = new HashMap<>();
-      conv.put("0", o1);
-      conv.put("1", o2);
-
-      BlockingException t =
-          PathExtractionHelpers.callRequestPathParamsCallback(
-              requestContext, conv, "RoutingDsl#routingTo");
-      if (t != null) {
-        throw t;
-      }
-
-      return delegate.apply(req, o1, o2);
-    }
-  }
-
-  public static class ArgumentCaptureFunctionParam3<R>
-      implements RequestFunctions.Params3<Object, Object, Object, R> {
-    private final RequestFunctions.Params3<Object, Object, Object, R> delegate;
-
-    public ArgumentCaptureFunctionParam3(
-        RequestFunctions.Params3<Object, Object, Object, R> delegate) {
-      this.delegate = delegate;
+    public static class ArgumentCaptureFunctionParam2<R> implements RequestFunctions.Params2<Object, Object, R> {
+        private final RequestFunctions.Params2<Object, Object, R> delegate;
+
+        public ArgumentCaptureFunctionParam2(RequestFunctions.Params2<Object, Object, R> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public R apply(Http.Request req, Object o1, Object o2) throws Throwable {
+            if (o1 == null && o2 == null) {
+                return delegate.apply(req, null, null);
+            }
+
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan == null) {
+                return delegate.apply(req, o1, o2);
+            }
+
+            RequestContext requestContext = agentSpan.getRequestContext();
+            if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+                return delegate.apply(req, o1, o2);
+            }
+
+            Map<String, Object> conv = new HashMap<>();
+            conv.put("0", o1);
+            conv.put("1", o2);
+
+            BlockingException t =
+                    PathExtractionHelpers.callRequestPathParamsCallback(requestContext, conv, "RoutingDsl#routingTo");
+            if (t != null) {
+                throw t;
+            }
+
+            return delegate.apply(req, o1, o2);
+        }
     }
 
-    @Override
-    public R apply(Http.Request req, Object o1, Object o2, Object o3) throws Throwable {
-      if (o1 == null && o2 == null && o3 == null) {
-        return delegate.apply(req, null, null, null);
-      }
-
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan == null) {
-        return delegate.apply(req, o1, o2, o3);
-      }
-
-      RequestContext requestContext = agentSpan.getRequestContext();
-      if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
-        return delegate.apply(req, o1, o2, o3);
-      }
-
-      Map<String, Object> conv = new HashMap<>();
-      conv.put("0", o1);
-      conv.put("1", o2);
-      conv.put("2", o3);
-
-      BlockingException t =
-          PathExtractionHelpers.callRequestPathParamsCallback(
-              requestContext, conv, "RoutingDsl#routingTo");
-      if (t != null) {
-        throw t;
-      }
-
-      return delegate.apply(req, o1, o2, o3);
+    public static class ArgumentCaptureFunctionParam3<R>
+            implements RequestFunctions.Params3<Object, Object, Object, R> {
+        private final RequestFunctions.Params3<Object, Object, Object, R> delegate;
+
+        public ArgumentCaptureFunctionParam3(RequestFunctions.Params3<Object, Object, Object, R> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public R apply(Http.Request req, Object o1, Object o2, Object o3) throws Throwable {
+            if (o1 == null && o2 == null && o3 == null) {
+                return delegate.apply(req, null, null, null);
+            }
+
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan == null) {
+                return delegate.apply(req, o1, o2, o3);
+            }
+
+            RequestContext requestContext = agentSpan.getRequestContext();
+            if (requestContext.getData(RequestContextSlot.APPSEC) == null) {
+                return delegate.apply(req, o1, o2, o3);
+            }
+
+            Map<String, Object> conv = new HashMap<>();
+            conv.put("0", o1);
+            conv.put("1", o2);
+            conv.put("2", o3);
+
+            BlockingException t =
+                    PathExtractionHelpers.callRequestPathParamsCallback(requestContext, conv, "RoutingDsl#routingTo");
+            if (t != null) {
+                throw t;
+            }
+
+            return delegate.apply(req, o1, o2, o3);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.7/src/main/java/datadog/trace/instrumentation/play27/appsec/RoutingDsl27Instrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.7/src/main/java/datadog/trace/instrumentation/play27/appsec/RoutingDsl27Instrumentation.java
index 1f60d2aa906..8cfc6a2e42d 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-2.7/src/main/java/datadog/trace/instrumentation/play27/appsec/RoutingDsl27Instrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.7/src/main/java/datadog/trace/instrumentation/play27/appsec/RoutingDsl27Instrumentation.java
@@ -15,53 +15,53 @@
  */
 @AutoService(InstrumenterModule.class)
 public class RoutingDsl27Instrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public RoutingDsl27Instrumentation() {
-    super("play");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public RoutingDsl27Instrumentation() {
+        super("play");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "play27";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "play27";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "play.routing.RoutingDsl$Route";
-  }
+    @Override
+    public String instrumentedType() {
+        return "play.routing.RoutingDsl$Route";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      new Reference.Builder("play.routing.RoutingDsl$PathPatternMatcher")
-          .withMethod(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC | Reference.EXPECTS_PUBLIC,
-              "routingTo",
-              "Lplay/routing/RoutingDsl;",
-              "Lplay/routing/RequestFunctions$Params1;")
-          .build()
-    };
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            new Reference.Builder("play.routing.RoutingDsl$PathPatternMatcher")
+                    .withMethod(
+                            new String[0],
+                            Reference.EXPECTS_NON_STATIC | Reference.EXPECTS_PUBLIC,
+                            "routingTo",
+                            "Lplay/routing/RoutingDsl;",
+                            "Lplay/routing/RequestFunctions$Params1;")
+                    .build()
+        };
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ArgumentCaptureAdvice",
-      packageName + ".ArgumentCaptureAdvice$ArgumentCaptureFunctionParam1",
-      packageName + ".ArgumentCaptureAdvice$ArgumentCaptureFunctionParam2",
-      packageName + ".ArgumentCaptureAdvice$ArgumentCaptureFunctionParam3",
-      "datadog.trace.instrumentation.play.appsec.PathExtractionHelpers",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ArgumentCaptureAdvice",
+            packageName + ".ArgumentCaptureAdvice$ArgumentCaptureFunctionParam1",
+            packageName + ".ArgumentCaptureAdvice$ArgumentCaptureFunctionParam2",
+            packageName + ".ArgumentCaptureAdvice$ArgumentCaptureFunctionParam3",
+            "datadog.trace.instrumentation.play.appsec.PathExtractionHelpers",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArguments(5))
-            .and(takesArgument(3, Object.class))
-            .and(takesArgument(4, java.lang.reflect.Method.class)),
-        packageName + ".ArgumentCaptureAdvice$RouteConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArguments(5))
+                        .and(takesArgument(3, Object.class))
+                        .and(takesArgument(4, java.lang.reflect.Method.class)),
+                packageName + ".ArgumentCaptureAdvice$RouteConstructorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/play/play-appsec-common/src/main/java/datadog/trace/instrumentation/play/appsec/PathExtractionHelpers.java b/dd-java-agent/instrumentation/play/play-appsec-common/src/main/java/datadog/trace/instrumentation/play/appsec/PathExtractionHelpers.java
index 8da233f0388..d29963a5411 100644
--- a/dd-java-agent/instrumentation/play/play-appsec-common/src/main/java/datadog/trace/instrumentation/play/appsec/PathExtractionHelpers.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-common/src/main/java/datadog/trace/instrumentation/play/appsec/PathExtractionHelpers.java
@@ -15,44 +15,43 @@
 import org.slf4j.LoggerFactory;
 
 public class PathExtractionHelpers {
-  private static final Logger log = LoggerFactory.getLogger(PathExtractionHelpers.class);
-
-  private PathExtractionHelpers() {}
-
-  public static BlockingException callRequestPathParamsCallback(
-      RequestContext reqCtx, Map<String, Object> params, String origin) {
-    try {
-      return doCallRequestPathParamsCallback(reqCtx, params, origin);
-    } catch (Exception e) {
-      log.warn("Error calling {}", origin, e);
-      return null;
-    }
-  }
-
-  private static BlockingException doCallRequestPathParamsCallback(
-      RequestContext reqCtx, Map<String, Object> params, String origin) {
-    if (params == null || params.isEmpty()) {
-      return null;
-    }
-
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestPathParams());
-    if (callback == null) {
-      return null;
-    }
-
-    Flow<Void> flow = callback.apply(reqCtx, params);
-    Flow.Action action = flow.getAction();
-    if (!(action instanceof Flow.Action.RequestBlockingAction)) {
-      return null;
+    private static final Logger log = LoggerFactory.getLogger(PathExtractionHelpers.class);
+
+    private PathExtractionHelpers() {}
+
+    public static BlockingException callRequestPathParamsCallback(
+            RequestContext reqCtx, Map<String, Object> params, String origin) {
+        try {
+            return doCallRequestPathParamsCallback(reqCtx, params, origin);
+        } catch (Exception e) {
+            log.warn("Error calling {}", origin, e);
+            return null;
+        }
     }
 
-    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-    BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-    if (brf != null) {
-      brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+    private static BlockingException doCallRequestPathParamsCallback(
+            RequestContext reqCtx, Map<String, Object> params, String origin) {
+        if (params == null || params.isEmpty()) {
+            return null;
+        }
+
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback = cbp.getCallback(EVENTS.requestPathParams());
+        if (callback == null) {
+            return null;
+        }
+
+        Flow<Void> flow = callback.apply(reqCtx, params);
+        Flow.Action action = flow.getAction();
+        if (!(action instanceof Flow.Action.RequestBlockingAction)) {
+            return null;
+        }
+
+        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+        BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+        if (brf != null) {
+            brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+        }
+        return new BlockingException("Blocked request (for " + origin + ")");
     }
-    return new BlockingException("Blocked request (for " + origin + ")");
-  }
 }
diff --git a/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzDecorator.java b/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzDecorator.java
index bafb9ae23ee..beace09e59b 100644
--- a/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzDecorator.java
+++ b/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzDecorator.java
@@ -14,43 +14,44 @@
 import org.quartz.TriggerKey;
 
 public class QuartzDecorator extends BaseDecorator {
-  public static final CharSequence SCHEDULED_CALL = UTF8BytesString.create("scheduled.call");
-  public static final QuartzDecorator DECORATE = new QuartzDecorator();
-
-  private QuartzDecorator() {}
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"quartz"};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return "quartz";
-  }
-
-  public void onExecute(final AgentSpan span, JobExecutionContext context) {
-    if (context != null) {
-      if (context.getJobInstance() != null) {
-        span.setTag(DDTags.RESOURCE_NAME, context.getJobInstance().getClass()).toString();
-      }
-      if (context.getTrigger() != null) {
-        final TriggerKey key = context.getTrigger().getKey();
-        if (key != null) {
-          span.setTag(QUARTZ_TRIGGER_NAME, key.getName());
-          span.setTag(QUARTZ_TRIGGER_GROUP, key.getGroup());
-        }
-        final JobKey jobKey = context.getJobDetail().getKey();
-        if (jobKey != null) {
-          span.setTag(QUARTZ_JOB_NAME, jobKey.getName());
-          span.setTag(QUARTZ_JOB_GROUP, jobKey.getGroup());
+    public static final CharSequence SCHEDULED_CALL = UTF8BytesString.create("scheduled.call");
+    public static final QuartzDecorator DECORATE = new QuartzDecorator();
+
+    private QuartzDecorator() {}
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"quartz"};
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return "quartz";
+    }
+
+    public void onExecute(final AgentSpan span, JobExecutionContext context) {
+        if (context != null) {
+            if (context.getJobInstance() != null) {
+                span.setTag(DDTags.RESOURCE_NAME, context.getJobInstance().getClass())
+                        .toString();
+            }
+            if (context.getTrigger() != null) {
+                final TriggerKey key = context.getTrigger().getKey();
+                if (key != null) {
+                    span.setTag(QUARTZ_TRIGGER_NAME, key.getName());
+                    span.setTag(QUARTZ_TRIGGER_GROUP, key.getGroup());
+                }
+                final JobKey jobKey = context.getJobDetail().getKey();
+                if (jobKey != null) {
+                    span.setTag(QUARTZ_JOB_NAME, jobKey.getName());
+                    span.setTag(QUARTZ_JOB_GROUP, jobKey.getGroup());
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java b/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java
index 3757be3a85d..a12cf69a191 100644
--- a/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java
+++ b/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java
@@ -23,52 +23,51 @@
 
 @AutoService(InstrumenterModule.class)
 public final class QuartzSchedulingInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public QuartzSchedulingInstrumentation() {
-    super("quartz");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.quartz.Job";
-  }
+    public QuartzSchedulingInstrumentation() {
+        super("quartz");
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.quartz.Job";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("execute"))
-            .and(takesArgument(0, named("org.quartz.JobExecutionContext"))),
-        QuartzSchedulingInstrumentation.class.getName() + "$QuartzSchedulingAdvice");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  public static class QuartzSchedulingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(@Advice.Argument(0) JobExecutionContext context) {
-      // create a new trace for every job
-      final AgentSpan span = startSpan("quartz", SCHEDULED_CALL, null);
-      DECORATE.afterStart(span);
-      DECORATE.onExecute(span, context);
-      return activateSpan(span);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("execute"))
+                        .and(takesArgument(0, named("org.quartz.JobExecutionContext"))),
+                QuartzSchedulingInstrumentation.class.getName() + "$QuartzSchedulingAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      final AgentSpan span = spanFromScope(scope);
-      if (throwable != null) {
-        DECORATE.onError(span, throwable);
-      }
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+    public static class QuartzSchedulingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(@Advice.Argument(0) JobExecutionContext context) {
+            // create a new trace for every job
+            final AgentSpan span = startSpan("quartz", SCHEDULED_CALL, null);
+            DECORATE.afterStart(span);
+            DECORATE.onExecute(span, context);
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            final AgentSpan span = spanFromScope(scope);
+            if (throwable != null) {
+                DECORATE.onError(span, throwable);
+            }
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/quartz-2.0/src/test/java/QuartzTestJob.java b/dd-java-agent/instrumentation/quartz-2.0/src/test/java/QuartzTestJob.java
index 0e38cda8559..19f538bcc90 100644
--- a/dd-java-agent/instrumentation/quartz-2.0/src/test/java/QuartzTestJob.java
+++ b/dd-java-agent/instrumentation/quartz-2.0/src/test/java/QuartzTestJob.java
@@ -7,16 +7,16 @@
 
 @DisallowConcurrentExecution
 public class QuartzTestJob implements Job {
-  @Override
-  public void execute(JobExecutionContext context) {
-    try {
-      Scheduler scheduler = context.getScheduler();
-      scheduler.standby(); // prevent subsequent cron fires from racing with test assertions
+    @Override
+    public void execute(JobExecutionContext context) {
+        try {
+            Scheduler scheduler = context.getScheduler();
+            scheduler.standby(); // prevent subsequent cron fires from racing with test assertions
 
-      CountDownLatch latch = (CountDownLatch) scheduler.getContext().get("latch");
-      latch.countDown();
-    } catch (SchedulerException e) {
-      e.printStackTrace();
+            CountDownLatch latch = (CountDownLatch) scheduler.getContext().get("latch");
+            latch.countDown();
+        } catch (SchedulerException e) {
+            e.printStackTrace();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java
index a774612a98d..bb5512162fe 100644
--- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java
+++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java
@@ -57,248 +57,234 @@
 
 @AutoService(InstrumenterModule.class)
 public class RabbitChannelInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public RabbitChannelInstrumentation() {
-    super("amqp", "rabbitmq");
-  }
+    public RabbitChannelInstrumentation() {
+        super("amqp", "rabbitmq");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "com.rabbitmq.client.Channel";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "com.rabbitmq.client.Channel";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        // Class is added to ignores trie, but it's not final so just being safe
-        .and(not(extendsClass(named("reactor.rabbitmq.ChannelProxy"))));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                // Class is added to ignores trie, but it's not final so just being safe
+                .and(not(extendsClass(named("reactor.rabbitmq.ChannelProxy"))));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // We want the advice applied in a specific order.
-    transformer.applyAdvice(
-        isMethod()
-            .and(
-                not(
-                    isGetter()
-                        .or(isSetter())
-                        .or(nameEndsWith("Listener"))
-                        .or(nameEndsWith("Listeners"))
-                        .or(
-                            namedOneOf(
-                                "processAsync",
-                                "open",
-                                "close",
-                                "abort",
-                                "basicGet",
-                                "basicPublish"))))
-            .and(isPublic())
-            .and(canThrow(IOException.class).or(canThrow(InterruptedException.class))),
-        RabbitChannelInstrumentation.class.getName() + "$ChannelMethodAdvice");
-    transformer.applyAdvices(
-        isMethod().and(named("basicPublish")).and(takesArguments(6)),
-        RabbitChannelInstrumentation.class.getName() + "$ChannelPublishAdvice",
-        RabbitChannelInstrumentation.class.getName() + "$ChannelPublishContextPropagationAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("basicGet")).and(takesArgument(0, String.class)),
-        RabbitChannelInstrumentation.class.getName() + "$ChannelGetAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("basicConsume"))
-            .and(takesArgument(0, String.class))
-            .and(takesArgument(6, named("com.rabbitmq.client.Consumer"))),
-        RabbitChannelInstrumentation.class.getName() + "$ChannelConsumeAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // We want the advice applied in a specific order.
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isGetter()
+                                .or(isSetter())
+                                .or(nameEndsWith("Listener"))
+                                .or(nameEndsWith("Listeners"))
+                                .or(namedOneOf("processAsync", "open", "close", "abort", "basicGet", "basicPublish"))))
+                        .and(isPublic())
+                        .and(canThrow(IOException.class).or(canThrow(InterruptedException.class))),
+                RabbitChannelInstrumentation.class.getName() + "$ChannelMethodAdvice");
+        transformer.applyAdvices(
+                isMethod().and(named("basicPublish")).and(takesArguments(6)),
+                RabbitChannelInstrumentation.class.getName() + "$ChannelPublishAdvice",
+                RabbitChannelInstrumentation.class.getName() + "$ChannelPublishContextPropagationAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("basicGet")).and(takesArgument(0, String.class)),
+                RabbitChannelInstrumentation.class.getName() + "$ChannelGetAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("basicConsume"))
+                        .and(takesArgument(0, String.class))
+                        .and(takesArgument(6, named("com.rabbitmq.client.Consumer"))),
+                RabbitChannelInstrumentation.class.getName() + "$ChannelConsumeAdvice");
+    }
 
-  public static class ChannelMethodAdvice {
-    @Advice.OnMethodEnter
-    public static ContextScope onEnter(
-        @Advice.This final Channel channel, @Advice.Origin("Channel.#m") final String method) {
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Channel.class);
-      if (callDepth > 0) {
-        return null;
-      }
+    public static class ChannelMethodAdvice {
+        @Advice.OnMethodEnter
+        public static ContextScope onEnter(
+                @Advice.This final Channel channel, @Advice.Origin("Channel.#m") final String method) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Channel.class);
+            if (callDepth > 0) {
+                return null;
+            }
 
-      final Connection connection = channel.getConnection();
+            final Connection connection = channel.getConnection();
 
-      final AgentSpan span = startSpan(RABBITMQ_AMQP.toString(), OPERATION_AMQP_COMMAND);
-      span.setResourceName(method);
-      CLIENT_DECORATE.setPeerPort(span, connection.getPort());
-      CLIENT_DECORATE.afterStart(span);
-      CLIENT_DECORATE.onPeerConnection(span, connection.getAddress());
-      return activateSpan(span);
-    }
+            final AgentSpan span = startSpan(RABBITMQ_AMQP.toString(), OPERATION_AMQP_COMMAND);
+            span.setResourceName(method);
+            CLIENT_DECORATE.setPeerPort(span, connection.getPort());
+            CLIENT_DECORATE.afterStart(span);
+            CLIENT_DECORATE.onPeerConnection(span, connection.getAddress());
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      CLIENT_DECORATE.onError(scope, throwable);
-      CLIENT_DECORATE.beforeFinish(scope);
-      scope.close();
-      spanFromScope(scope).finish();
-      CallDepthThreadLocalMap.reset(Channel.class);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            CLIENT_DECORATE.onError(scope, throwable);
+            CLIENT_DECORATE.beforeFinish(scope);
+            scope.close();
+            spanFromScope(scope).finish();
+            CallDepthThreadLocalMap.reset(Channel.class);
+        }
     }
-  }
 
-  public static class ChannelPublishAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope setResourceNameAddHeaders(
-        @Advice.This final Channel channel,
-        @Advice.Argument(0) final String exchange,
-        @Advice.Argument(1) final String routingKey,
-        @Advice.Argument(4) final AMQP.BasicProperties props,
-        @Advice.Argument(5) final byte[] body) {
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Channel.class);
-      if (callDepth > 0) {
-        return null;
-      }
+    public static class ChannelPublishAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope setResourceNameAddHeaders(
+                @Advice.This final Channel channel,
+                @Advice.Argument(0) final String exchange,
+                @Advice.Argument(1) final String routingKey,
+                @Advice.Argument(4) final AMQP.BasicProperties props,
+                @Advice.Argument(5) final byte[] body) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Channel.class);
+            if (callDepth > 0) {
+                return null;
+            }
 
-      final Connection connection = channel.getConnection();
+            final Connection connection = channel.getConnection();
 
-      final AgentSpan span = startSpan(RABBITMQ_AMQP.toString(), OPERATION_AMQP_OUTBOUND);
-      PRODUCER_DECORATE.setPeerPort(span, connection.getPort());
-      PRODUCER_DECORATE.afterStart(span);
-      PRODUCER_DECORATE.onPeerConnection(span, connection.getAddress());
-      PRODUCER_DECORATE.onPublish(span, exchange, routingKey);
-      span.setTag("message.size", body == null ? 0 : body.length);
+            final AgentSpan span = startSpan(RABBITMQ_AMQP.toString(), OPERATION_AMQP_OUTBOUND);
+            PRODUCER_DECORATE.setPeerPort(span, connection.getPort());
+            PRODUCER_DECORATE.afterStart(span);
+            PRODUCER_DECORATE.onPeerConnection(span, connection.getAddress());
+            PRODUCER_DECORATE.onPublish(span, exchange, routingKey);
+            span.setTag("message.size", body == null ? 0 : body.length);
 
-      final Integer deliveryMode = props != null ? props.getDeliveryMode() : null;
-      if (deliveryMode != null) {
-        span.setTag("amqp.delivery_mode", deliveryMode);
-      }
+            final Integer deliveryMode = props != null ? props.getDeliveryMode() : null;
+            if (deliveryMode != null) {
+                span.setTag("amqp.delivery_mode", deliveryMode);
+            }
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      PRODUCER_DECORATE.onError(scope, throwable);
-      PRODUCER_DECORATE.beforeFinish(scope);
-      scope.close();
-      spanFromScope(scope).finish();
-      CallDepthThreadLocalMap.reset(Channel.class);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            PRODUCER_DECORATE.onError(scope, throwable);
+            PRODUCER_DECORATE.beforeFinish(scope);
+            scope.close();
+            spanFromScope(scope).finish();
+            CallDepthThreadLocalMap.reset(Channel.class);
+        }
     }
-  }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ChannelPublishContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) final String exchange,
-        @Advice.Argument(1) final String routingKey,
-        @Advice.Argument(value = 4, readOnly = false) AMQP.BasicProperties props,
-        @Advice.Argument(5) final byte[] body) {
-      AgentSpan span = activeSpan();
-      if (span == null) return;
-      Config config = Config.get();
-      final boolean isDefaultExchange = exchange == null || exchange.isEmpty();
-      final String destination = isDefaultExchange ? routingKey : exchange;
-      if (!config.isRabbitPropagationEnabled()
-          || config.isRabbitPropagationDisabledForDestination(destination)) return;
-      // This is the internal behavior when props are null.  We're just doing it earlier now.
-      if (props == null) {
-        props = MessageProperties.MINIMAL_BASIC;
-      }
-      // We need to copy the BasicProperties and provide a header map we can modify
-      Map<String, Object> headers = props.getHeaders();
-      headers = (headers == null) ? new HashMap<String, Object>() : new HashMap<>(headers);
-      if (TIME_IN_QUEUE_ENABLED) {
-        RabbitDecorator.injectTimeInQueueStart(headers);
-      }
-      final boolean hasRoutingKey = routingKey != null && !routingKey.isEmpty();
-      DataStreamsTags tags;
-      if (isDefaultExchange && hasRoutingKey) {
-        tags = create("rabbitmq", OUTBOUND, routingKey);
-      } else {
-        tags = createWithExchange("rabbitmq", OUTBOUND, exchange, hasRoutingKey);
-      }
-      DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
-      defaultPropagator().inject(span.with(dsmContext), headers, SETTER);
-      props =
-          new AMQP.BasicProperties(
-              props.getContentType(),
-              props.getContentEncoding(),
-              headers,
-              props.getDeliveryMode(),
-              props.getPriority(),
-              props.getCorrelationId(),
-              props.getReplyTo(),
-              props.getExpiration(),
-              props.getMessageId(),
-              props.getTimestamp(),
-              props.getType(),
-              props.getUserId(),
-              props.getAppId(),
-              props.getClusterId());
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ChannelPublishContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Argument(0) final String exchange,
+                @Advice.Argument(1) final String routingKey,
+                @Advice.Argument(value = 4, readOnly = false) AMQP.BasicProperties props,
+                @Advice.Argument(5) final byte[] body) {
+            AgentSpan span = activeSpan();
+            if (span == null) return;
+            Config config = Config.get();
+            final boolean isDefaultExchange = exchange == null || exchange.isEmpty();
+            final String destination = isDefaultExchange ? routingKey : exchange;
+            if (!config.isRabbitPropagationEnabled() || config.isRabbitPropagationDisabledForDestination(destination))
+                return;
+            // This is the internal behavior when props are null.  We're just doing it earlier now.
+            if (props == null) {
+                props = MessageProperties.MINIMAL_BASIC;
+            }
+            // We need to copy the BasicProperties and provide a header map we can modify
+            Map<String, Object> headers = props.getHeaders();
+            headers = (headers == null) ? new HashMap<String, Object>() : new HashMap<>(headers);
+            if (TIME_IN_QUEUE_ENABLED) {
+                RabbitDecorator.injectTimeInQueueStart(headers);
+            }
+            final boolean hasRoutingKey = routingKey != null && !routingKey.isEmpty();
+            DataStreamsTags tags;
+            if (isDefaultExchange && hasRoutingKey) {
+                tags = create("rabbitmq", OUTBOUND, routingKey);
+            } else {
+                tags = createWithExchange("rabbitmq", OUTBOUND, exchange, hasRoutingKey);
+            }
+            DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
+            defaultPropagator().inject(span.with(dsmContext), headers, SETTER);
+            props = new AMQP.BasicProperties(
+                    props.getContentType(),
+                    props.getContentEncoding(),
+                    headers,
+                    props.getDeliveryMode(),
+                    props.getPriority(),
+                    props.getCorrelationId(),
+                    props.getReplyTo(),
+                    props.getExpiration(),
+                    props.getMessageId(),
+                    props.getTimestamp(),
+                    props.getType(),
+                    props.getUserId(),
+                    props.getAppId(),
+                    props.getClusterId());
+        }
     }
-  }
 
-  public static class ChannelGetAdvice {
-    @Advice.OnMethodEnter
-    public static long takeTimestamp(
-        @Advice.Local("placeholderScope") ContextScope placeholderScope,
-        @Advice.Local("callDepth") int callDepth) {
+    public static class ChannelGetAdvice {
+        @Advice.OnMethodEnter
+        public static long takeTimestamp(
+                @Advice.Local("placeholderScope") ContextScope placeholderScope,
+                @Advice.Local("callDepth") int callDepth) {
 
-      callDepth = CallDepthThreadLocalMap.incrementCallDepth(Channel.class);
-      // Don't want RabbitCommandInstrumentation to mess up our actual parent span.
-      placeholderScope = activateSpan(noopSpan());
-      return System.currentTimeMillis();
-    }
+            callDepth = CallDepthThreadLocalMap.incrementCallDepth(Channel.class);
+            // Don't want RabbitCommandInstrumentation to mess up our actual parent span.
+            placeholderScope = activateSpan(noopSpan());
+            return System.currentTimeMillis();
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void extractAndStartSpan(
-        @Advice.This final Channel channel,
-        @Advice.Argument(0) final String queue,
-        @Advice.Enter final long spanStartMillis,
-        @Advice.Local("placeholderScope") final ContextScope placeholderScope,
-        @Advice.Local("callDepth") final int callDepth,
-        @Advice.Return final GetResponse response,
-        @Advice.Thrown final Throwable throwable) {
-      placeholderScope.close(); // noop span, so no need to finish.
-      if (callDepth > 0) {
-        return;
-      }
-      final Connection connection = channel.getConnection();
-      final Config config = Config.get();
-      final boolean propagate =
-          config.isRabbitPropagationEnabled()
-              && !config.isRabbitPropagationDisabledForDestination(queue);
-      final ContextScope scope =
-          RabbitDecorator.startReceivingSpan(
-              propagate,
-              spanStartMillis,
-              null != response ? response.getProps() : null,
-              null != response ? response.getBody() : null,
-              queue);
-      final AgentSpan span = spanFromScope(scope);
-      CONSUMER_DECORATE.setPeerPort(span, connection.getPort());
-      CONSUMER_DECORATE.onGet(span, queue);
-      CONSUMER_DECORATE.onPeerConnection(span, connection.getAddress());
-      CONSUMER_DECORATE.onError(span, throwable);
-      CONSUMER_DECORATE.beforeFinish(span);
-      RabbitDecorator.finishReceivingSpan(scope);
-      CallDepthThreadLocalMap.reset(Channel.class);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void extractAndStartSpan(
+                @Advice.This final Channel channel,
+                @Advice.Argument(0) final String queue,
+                @Advice.Enter final long spanStartMillis,
+                @Advice.Local("placeholderScope") final ContextScope placeholderScope,
+                @Advice.Local("callDepth") final int callDepth,
+                @Advice.Return final GetResponse response,
+                @Advice.Thrown final Throwable throwable) {
+            placeholderScope.close(); // noop span, so no need to finish.
+            if (callDepth > 0) {
+                return;
+            }
+            final Connection connection = channel.getConnection();
+            final Config config = Config.get();
+            final boolean propagate =
+                    config.isRabbitPropagationEnabled() && !config.isRabbitPropagationDisabledForDestination(queue);
+            final ContextScope scope = RabbitDecorator.startReceivingSpan(
+                    propagate,
+                    spanStartMillis,
+                    null != response ? response.getProps() : null,
+                    null != response ? response.getBody() : null,
+                    queue);
+            final AgentSpan span = spanFromScope(scope);
+            CONSUMER_DECORATE.setPeerPort(span, connection.getPort());
+            CONSUMER_DECORATE.onGet(span, queue);
+            CONSUMER_DECORATE.onPeerConnection(span, connection.getAddress());
+            CONSUMER_DECORATE.onError(span, throwable);
+            CONSUMER_DECORATE.beforeFinish(span);
+            RabbitDecorator.finishReceivingSpan(scope);
+            CallDepthThreadLocalMap.reset(Channel.class);
+        }
     }
-  }
 
-  public static class ChannelConsumeAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void wrapConsumer(
-        @Advice.Argument(0) final String queue,
-        @Advice.Argument(value = 6, readOnly = false) Consumer consumer) {
-      // We have to save off the queue name here because it isn't available to the consumer later.
-      if (consumer != null && !(consumer instanceof TracedDelegatingConsumer)) {
-        consumer = CLIENT_DECORATE.wrapConsumer(queue, consumer);
-      }
+    public static class ChannelConsumeAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void wrapConsumer(
+                @Advice.Argument(0) final String queue,
+                @Advice.Argument(value = 6, readOnly = false) Consumer consumer) {
+            // We have to save off the queue name here because it isn't available to the consumer later.
+            if (consumer != null && !(consumer instanceof TracedDelegatingConsumer)) {
+                consumer = CLIENT_DECORATE.wrapConsumer(queue, consumer);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java
index e4a3d097502..da75d78e9e8 100644
--- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java
+++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java
@@ -21,60 +21,59 @@
 
 @AutoService(InstrumenterModule.class)
 public class RabbitCommandInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public RabbitCommandInstrumentation() {
-    super("amqp", "rabbitmq");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "com.rabbitmq.client.Command";
-  }
+    public RabbitCommandInstrumentation() {
+        super("amqp", "rabbitmq");
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "com.rabbitmq.client.Command";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(),
-        RabbitCommandInstrumentation.class.getName() + "$CommandConstructorAdvice");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  public static class CommandConstructorAdvice {
-    @Advice.OnMethodEnter
-    public static int getCallDepth() {
-      return CallDepthThreadLocalMap.incrementCallDepth(Command.class);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor(), RabbitCommandInstrumentation.class.getName() + "$CommandConstructorAdvice");
     }
 
-    @Advice.OnMethodExit
-    public static void setResourceNameAddHeaders(
-        @Advice.This final Command command, @Advice.Enter final int callDepth) {
-      if (callDepth > 0) {
-        return;
-      }
-      final AgentSpan span = activeSpan();
+    public static class CommandConstructorAdvice {
+        @Advice.OnMethodEnter
+        public static int getCallDepth() {
+            return CallDepthThreadLocalMap.incrementCallDepth(Command.class);
+        }
+
+        @Advice.OnMethodExit
+        public static void setResourceNameAddHeaders(
+                @Advice.This final Command command, @Advice.Enter final int callDepth) {
+            if (callDepth > 0) {
+                return;
+            }
+            final AgentSpan span = activeSpan();
 
-      if (span != null && command.getMethod() != null) {
-        // now we have 3 different operations on schema v1
-        if (!span.getSpanName().equals(OPERATION_AMQP_DELIVER.toString())
-            && RABBITMQ_AMQP.equals(span.getTag(Tags.COMPONENT))) {
-          CLIENT_DECORATE.onCommand(span, command);
+            if (span != null && command.getMethod() != null) {
+                // now we have 3 different operations on schema v1
+                if (!span.getSpanName().equals(OPERATION_AMQP_DELIVER.toString())
+                        && RABBITMQ_AMQP.equals(span.getTag(Tags.COMPONENT))) {
+                    CLIENT_DECORATE.onCommand(span, command);
+                }
+            }
+            CallDepthThreadLocalMap.reset(Command.class);
         }
-      }
-      CallDepthThreadLocalMap.reset(Command.class);
-    }
 
-    /**
-     * This instrumentation will match with 2.6, but the channel instrumentation only matches with
-     * 2.7 because of TracedDelegatingConsumer. This unused method is added to ensure consistent
-     * muzzle validation by preventing match with 2.6.
-     */
-    public static void muzzleCheck(final TracedDelegatingConsumer consumer) {
-      consumer.handleRecoverOk(null);
+        /**
+         * This instrumentation will match with 2.6, but the channel instrumentation only matches with
+         * 2.7 because of TracedDelegatingConsumer. This unused method is added to ensure consistent
+         * muzzle validation by preventing match with 2.6.
+         */
+        public static void muzzleCheck(final TracedDelegatingConsumer consumer) {
+            consumer.handleRecoverOk(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java
index e3741e76d11..e305b019db3 100644
--- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java
+++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java
@@ -36,256 +36,227 @@
 
 public class RabbitDecorator extends MessagingClientDecorator {
 
-  public static final CharSequence OPERATION_AMQP_COMMAND = UTF8BytesString.create("amqp.command");
-  public static final CharSequence OPERATION_AMQP_INBOUND =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().messaging().inboundOperation("amqp"));
-
-  public static final CharSequence OPERATION_AMQP_DELIVER = UTF8BytesString.create("amqp.deliver");
-
-  public static final CharSequence OPERATION_AMQP_OUTBOUND =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().messaging().outboundOperation("amqp"));
-  public static final CharSequence RABBITMQ_AMQP = UTF8BytesString.create("rabbitmq-amqp");
-
-  public static final boolean RABBITMQ_LEGACY_TRACING =
-      SpanNaming.instance().namingSchema().allowInferredServices()
-          && Config.get().isLegacyTracingEnabled(true, "rabbit", "rabbitmq");
-
-  public static final boolean TIME_IN_QUEUE_ENABLED =
-      Config.get().isTimeInQueueEnabled(!RABBITMQ_LEGACY_TRACING, "rabbit", "rabbitmq");
-
-  public static final RabbitDecorator CLIENT_DECORATE =
-      new RabbitDecorator(
-          Tags.SPAN_KIND_CLIENT,
-          InternalSpanTypes.MESSAGE_CLIENT,
-          SpanNaming.instance()
-              .namingSchema()
-              .messaging()
-              .outboundService("rabbitmq", RABBITMQ_LEGACY_TRACING));
-  public static final RabbitDecorator PRODUCER_DECORATE =
-      new RabbitDecorator(
-          Tags.SPAN_KIND_PRODUCER,
-          InternalSpanTypes.MESSAGE_PRODUCER,
-          SpanNaming.instance()
-              .namingSchema()
-              .messaging()
-              .outboundService("rabbitmq", RABBITMQ_LEGACY_TRACING));
-  public static final RabbitDecorator CONSUMER_DECORATE =
-      new RabbitDecorator(
-          Tags.SPAN_KIND_CONSUMER,
-          InternalSpanTypes.MESSAGE_CONSUMER,
-          SpanNaming.instance()
-              .namingSchema()
-              .messaging()
-              .inboundService("rabbitmq", RABBITMQ_LEGACY_TRACING));
-  public static final RabbitDecorator BROKER_DECORATE =
-      new RabbitDecorator(
-          Tags.SPAN_KIND_BROKER,
-          InternalSpanTypes.MESSAGE_BROKER,
-          SpanNaming.instance().namingSchema().messaging().timeInQueueService("rabbitmq"));
-
-  private final String spanKind;
-  private final CharSequence spanType;
-  private final Supplier<String> serviceNameSupplier;
-
-  public RabbitDecorator(
-      String spanKind, CharSequence spanType, Supplier<String> serviceNameSupplier) {
-    this.spanKind = spanKind;
-    this.spanType = spanType;
-    this.serviceNameSupplier = serviceNameSupplier;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"amqp", "rabbitmq"};
-  }
-
-  @Override
-  protected String service() {
-    return serviceNameSupplier.get();
-  }
-
-  @Override
-  protected CharSequence component() {
-    return RABBITMQ_AMQP;
-  }
-
-  @Override
-  protected String spanKind() {
-    return spanKind;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return spanType;
-  }
-
-  public void onPublish(final AgentSpan span, final String exchange, final String routingKey) {
-    final String exchangeName = exchange == null || exchange.isEmpty() ? "<default>" : exchange;
-    final String routing =
-        routingKey == null || routingKey.isEmpty()
-            ? "<all>"
-            : routingKey.startsWith("amq.gen-") ? "<generated>" : routingKey;
-    span.setResourceName(buildResourceName("basic.publish", exchangeName, routing));
-    span.setTag(AMQP_EXCHANGE, exchange);
-    span.setTag(AMQP_ROUTING_KEY, routingKey);
-  }
-
-  public void onGet(final AgentSpan span, final String queue) {
-    span.setResourceName("basic.get " + normalizeQueueName(queue));
-    // This span is created after the command has returned, so we need to set the tag here
-    span.setTag(AMQP_COMMAND, "basic.get");
-    span.setTag(AMQP_QUEUE, queue);
-  }
-
-  public void onDeliver(final AgentSpan span, final String queue, final Envelope envelope) {
-    span.setResourceName("basic.deliver " + normalizeQueueName(queue));
-    // This span happens after any AMQP commands so we need to set the tag here
-    span.setTag(AMQP_COMMAND, "basic.deliver");
-    if (envelope != null) {
-      span.setTag(AMQP_EXCHANGE, envelope.getExchange());
-      span.setTag(AMQP_ROUTING_KEY, envelope.getRoutingKey());
+    public static final CharSequence OPERATION_AMQP_COMMAND = UTF8BytesString.create("amqp.command");
+    public static final CharSequence OPERATION_AMQP_INBOUND = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().messaging().inboundOperation("amqp"));
+
+    public static final CharSequence OPERATION_AMQP_DELIVER = UTF8BytesString.create("amqp.deliver");
+
+    public static final CharSequence OPERATION_AMQP_OUTBOUND = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().messaging().outboundOperation("amqp"));
+    public static final CharSequence RABBITMQ_AMQP = UTF8BytesString.create("rabbitmq-amqp");
+
+    public static final boolean RABBITMQ_LEGACY_TRACING =
+            SpanNaming.instance().namingSchema().allowInferredServices()
+                    && Config.get().isLegacyTracingEnabled(true, "rabbit", "rabbitmq");
+
+    public static final boolean TIME_IN_QUEUE_ENABLED =
+            Config.get().isTimeInQueueEnabled(!RABBITMQ_LEGACY_TRACING, "rabbit", "rabbitmq");
+
+    public static final RabbitDecorator CLIENT_DECORATE = new RabbitDecorator(
+            Tags.SPAN_KIND_CLIENT,
+            InternalSpanTypes.MESSAGE_CLIENT,
+            SpanNaming.instance().namingSchema().messaging().outboundService("rabbitmq", RABBITMQ_LEGACY_TRACING));
+    public static final RabbitDecorator PRODUCER_DECORATE = new RabbitDecorator(
+            Tags.SPAN_KIND_PRODUCER,
+            InternalSpanTypes.MESSAGE_PRODUCER,
+            SpanNaming.instance().namingSchema().messaging().outboundService("rabbitmq", RABBITMQ_LEGACY_TRACING));
+    public static final RabbitDecorator CONSUMER_DECORATE = new RabbitDecorator(
+            Tags.SPAN_KIND_CONSUMER,
+            InternalSpanTypes.MESSAGE_CONSUMER,
+            SpanNaming.instance().namingSchema().messaging().inboundService("rabbitmq", RABBITMQ_LEGACY_TRACING));
+    public static final RabbitDecorator BROKER_DECORATE = new RabbitDecorator(
+            Tags.SPAN_KIND_BROKER,
+            InternalSpanTypes.MESSAGE_BROKER,
+            SpanNaming.instance().namingSchema().messaging().timeInQueueService("rabbitmq"));
+
+    private final String spanKind;
+    private final CharSequence spanType;
+    private final Supplier<String> serviceNameSupplier;
+
+    public RabbitDecorator(String spanKind, CharSequence spanType, Supplier<String> serviceNameSupplier) {
+        this.spanKind = spanKind;
+        this.spanType = spanType;
+        this.serviceNameSupplier = serviceNameSupplier;
     }
-  }
 
-  public void onCommand(final AgentSpan span, final Command command) {
-    final String name = command.getMethod().protocolMethodName();
-    // Don't overwrite the name already set by onPublish
-    if (!name.equals("basic.publish")) {
-      span.setResourceName(name);
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"amqp", "rabbitmq"};
     }
-    span.setTag(AMQP_COMMAND, name);
-  }
 
-  public void onTimeInQueue(final AgentSpan span, final String queue, final byte[] body) {
-    String normalizedQueueName = normalizeQueueName(queue);
-    if (Config.get().isMessageBrokerSplitByDestination()) {
-      span.setServiceName(normalizedQueueName, MESSAGE_BROKER_SPLIT_BY_DESTINATION);
+    @Override
+    protected String service() {
+        return serviceNameSupplier.get();
     }
-    span.setResourceName("amqp.deliver " + normalizedQueueName);
-    if (null != body) {
-      span.setTag("message.size", body.length);
+
+    @Override
+    protected CharSequence component() {
+        return RABBITMQ_AMQP;
+    }
+
+    @Override
+    protected String spanKind() {
+        return spanKind;
     }
-    span.setTag(AMQP_QUEUE, queue);
-  }
-
-  private String normalizeQueueName(String queueName) {
-    if (queueName == null || queueName.isEmpty()) {
-      return "<default>";
-    } else if (queueName.startsWith("amq.gen-")) {
-      return "<generated>";
+
+    @Override
+    protected CharSequence spanType() {
+        return spanType;
     }
-    return queueName;
-  }
-
-  private String buildResourceName(
-      final String opName, final String exchangeName, final String routingKey) {
-    // pre-size to the worst case length
-    final StringBuilder prefix =
-        new StringBuilder(opName.length() + exchangeName.length() + routingKey.length() + 5)
-            .append(opName)
-            .append(' ')
-            .append(exchangeName);
-    if (Config.get().isRabbitIncludeRoutingKeyInResource()) {
-      prefix.append(" -> ").append(routingKey);
+
+    public void onPublish(final AgentSpan span, final String exchange, final String routingKey) {
+        final String exchangeName = exchange == null || exchange.isEmpty() ? "<default>" : exchange;
+        final String routing = routingKey == null || routingKey.isEmpty()
+                ? "<all>"
+                : routingKey.startsWith("amq.gen-") ? "<generated>" : routingKey;
+        span.setResourceName(buildResourceName("basic.publish", exchangeName, routing));
+        span.setTag(AMQP_EXCHANGE, exchange);
+        span.setTag(AMQP_ROUTING_KEY, routingKey);
+    }
+
+    public void onGet(final AgentSpan span, final String queue) {
+        span.setResourceName("basic.get " + normalizeQueueName(queue));
+        // This span is created after the command has returned, so we need to set the tag here
+        span.setTag(AMQP_COMMAND, "basic.get");
+        span.setTag(AMQP_QUEUE, queue);
     }
-    return prefix.toString();
-  }
-
-  public TracedDelegatingConsumer wrapConsumer(String queue, Consumer consumer) {
-    return new TracedDelegatingConsumer(queue, consumer);
-  }
-
-  public static ContextScope startReceivingSpan(
-      boolean propagate,
-      long spanStartMillis,
-      AMQP.BasicProperties properties,
-      byte[] body,
-      String queue) {
-    final Map<String, Object> headers =
-        propagate && null != properties ? properties.getHeaders() : null;
-    AgentSpanContext parentSpanContext =
-        null != headers
-            ? extractContextAndGetSpanContext(headers, ContextVisitors.objectValuesMap())
-            : null;
-    // TODO: check dynamically bound queues -
-    // https://github.com/DataDog/dd-trace-java/pull/2955#discussion_r677787875
-
-    if (spanStartMillis == 0) {
-      spanStartMillis = System.currentTimeMillis();
+
+    public void onDeliver(final AgentSpan span, final String queue, final Envelope envelope) {
+        span.setResourceName("basic.deliver " + normalizeQueueName(queue));
+        // This span happens after any AMQP commands so we need to set the tag here
+        span.setTag(AMQP_COMMAND, "basic.deliver");
+        if (envelope != null) {
+            span.setTag(AMQP_EXCHANGE, envelope.getExchange());
+            span.setTag(AMQP_ROUTING_KEY, envelope.getRoutingKey());
+        }
     }
-    long queueStartMillis = 0;
-    if (null != headers && TIME_IN_QUEUE_ENABLED) {
-      queueStartMillis = extractTimeInQueueStart(headers);
+
+    public void onCommand(final AgentSpan span, final Command command) {
+        final String name = command.getMethod().protocolMethodName();
+        // Don't overwrite the name already set by onPublish
+        if (!name.equals("basic.publish")) {
+            span.setResourceName(name);
+        }
+        span.setTag(AMQP_COMMAND, name);
     }
-    long spanStartMicros = TimeUnit.MILLISECONDS.toMicros(spanStartMillis);
-    AgentSpan queueSpan = null;
-    if (queueStartMillis != 0) {
-      queueStartMillis = Math.min(spanStartMillis, queueStartMillis);
-      queueSpan =
-          startSpan(
-              RABBITMQ_AMQP.toString(),
-              OPERATION_AMQP_DELIVER,
-              parentSpanContext,
-              TimeUnit.MILLISECONDS.toMicros(queueStartMillis));
-      BROKER_DECORATE.afterStart(queueSpan);
-      BROKER_DECORATE.onTimeInQueue(queueSpan, queue, body);
-      parentSpanContext = queueSpan.spanContext();
-      BROKER_DECORATE.beforeFinish(queueSpan);
-      // The queueSpan will be finished after the inner span has been activated to ensure that the
-      // spans are written out together by the TraceStructureWriter when running in strict mode
+
+    public void onTimeInQueue(final AgentSpan span, final String queue, final byte[] body) {
+        String normalizedQueueName = normalizeQueueName(queue);
+        if (Config.get().isMessageBrokerSplitByDestination()) {
+            span.setServiceName(normalizedQueueName, MESSAGE_BROKER_SPLIT_BY_DESTINATION);
+        }
+        span.setResourceName("amqp.deliver " + normalizedQueueName);
+        if (null != body) {
+            span.setTag("message.size", body.length);
+        }
+        span.setTag(AMQP_QUEUE, queue);
     }
-    final AgentSpan span =
-        startSpan(
-            RABBITMQ_AMQP.toString(), OPERATION_AMQP_INBOUND, parentSpanContext, spanStartMicros);
 
-    if (null != body) {
-      span.setTag("message.size", body.length);
+    private String normalizeQueueName(String queueName) {
+        if (queueName == null || queueName.isEmpty()) {
+            return "<default>";
+        } else if (queueName.startsWith("amq.gen-")) {
+            return "<generated>";
+        }
+        return queueName;
     }
-    // TODO - do we still need both?
-    long produceMillis = 0;
-    if (null != properties && null != properties.getTimestamp()) {
-      // this will be set if the sender sets the timestamp,
-      // or if a plugin is installed on the rabbitmq broker
-      produceMillis = properties.getTimestamp().getTime();
-      span.setTag(RECORD_QUEUE_TIME_MS, Math.max(0L, spanStartMillis - produceMillis));
+
+    private String buildResourceName(final String opName, final String exchangeName, final String routingKey) {
+        // pre-size to the worst case length
+        final StringBuilder prefix = new StringBuilder(
+                        opName.length() + exchangeName.length() + routingKey.length() + 5)
+                .append(opName)
+                .append(' ')
+                .append(exchangeName);
+        if (Config.get().isRabbitIncludeRoutingKeyInResource()) {
+            prefix.append(" -> ").append(routingKey);
+        }
+        return prefix.toString();
     }
 
-    if (null != headers) {
-      DataStreamsTags tags = create("rabbitmq", INBOUND, queue);
-      AgentTracer.get()
-          .getDataStreamsMonitoring()
-          .setCheckpoint(span, create(tags, produceMillis, 0));
+    public TracedDelegatingConsumer wrapConsumer(String queue, Consumer consumer) {
+        return new TracedDelegatingConsumer(queue, consumer);
     }
 
-    CONSUMER_DECORATE.afterStart(span);
-    ContextScope scope = activateSpan(span);
-    if (null != queueSpan) {
-      queueSpan.finish(spanStartMicros);
+    public static ContextScope startReceivingSpan(
+            boolean propagate, long spanStartMillis, AMQP.BasicProperties properties, byte[] body, String queue) {
+        final Map<String, Object> headers = propagate && null != properties ? properties.getHeaders() : null;
+        AgentSpanContext parentSpanContext =
+                null != headers ? extractContextAndGetSpanContext(headers, ContextVisitors.objectValuesMap()) : null;
+        // TODO: check dynamically bound queues -
+        // https://github.com/DataDog/dd-trace-java/pull/2955#discussion_r677787875
+
+        if (spanStartMillis == 0) {
+            spanStartMillis = System.currentTimeMillis();
+        }
+        long queueStartMillis = 0;
+        if (null != headers && TIME_IN_QUEUE_ENABLED) {
+            queueStartMillis = extractTimeInQueueStart(headers);
+        }
+        long spanStartMicros = TimeUnit.MILLISECONDS.toMicros(spanStartMillis);
+        AgentSpan queueSpan = null;
+        if (queueStartMillis != 0) {
+            queueStartMillis = Math.min(spanStartMillis, queueStartMillis);
+            queueSpan = startSpan(
+                    RABBITMQ_AMQP.toString(),
+                    OPERATION_AMQP_DELIVER,
+                    parentSpanContext,
+                    TimeUnit.MILLISECONDS.toMicros(queueStartMillis));
+            BROKER_DECORATE.afterStart(queueSpan);
+            BROKER_DECORATE.onTimeInQueue(queueSpan, queue, body);
+            parentSpanContext = queueSpan.spanContext();
+            BROKER_DECORATE.beforeFinish(queueSpan);
+            // The queueSpan will be finished after the inner span has been activated to ensure that the
+            // spans are written out together by the TraceStructureWriter when running in strict mode
+        }
+        final AgentSpan span =
+                startSpan(RABBITMQ_AMQP.toString(), OPERATION_AMQP_INBOUND, parentSpanContext, spanStartMicros);
+
+        if (null != body) {
+            span.setTag("message.size", body.length);
+        }
+        // TODO - do we still need both?
+        long produceMillis = 0;
+        if (null != properties && null != properties.getTimestamp()) {
+            // this will be set if the sender sets the timestamp,
+            // or if a plugin is installed on the rabbitmq broker
+            produceMillis = properties.getTimestamp().getTime();
+            span.setTag(RECORD_QUEUE_TIME_MS, Math.max(0L, spanStartMillis - produceMillis));
+        }
+
+        if (null != headers) {
+            DataStreamsTags tags = create("rabbitmq", INBOUND, queue);
+            AgentTracer.get().getDataStreamsMonitoring().setCheckpoint(span, create(tags, produceMillis, 0));
+        }
+
+        CONSUMER_DECORATE.afterStart(span);
+        ContextScope scope = activateSpan(span);
+        if (null != queueSpan) {
+            queueSpan.finish(spanStartMicros);
+        }
+        return scope;
     }
-    return scope;
-  }
-
-  public static void finishReceivingSpan(ContextScope scope) {
-    AgentSpan span = spanFromScope(scope);
-    scope.close();
-    if (CONSUMER_DECORATE.endToEndDurationsEnabled) {
-      span.finishWithEndToEnd();
-    } else {
-      span.finish();
+
+    public static void finishReceivingSpan(ContextScope scope) {
+        AgentSpan span = spanFromScope(scope);
+        scope.close();
+        if (CONSUMER_DECORATE.endToEndDurationsEnabled) {
+            span.finishWithEndToEnd();
+        } else {
+            span.finish();
+        }
     }
-  }
 
-  public static final String RABBITMQ_PRODUCED_KEY = "x_datadog_rabbitmq_produced";
+    public static final String RABBITMQ_PRODUCED_KEY = "x_datadog_rabbitmq_produced";
 
-  public static void injectTimeInQueueStart(Map<String, Object> headers) {
-    long startMillis = System.currentTimeMillis();
-    headers.put(RABBITMQ_PRODUCED_KEY, startMillis);
-  }
+    public static void injectTimeInQueueStart(Map<String, Object> headers) {
+        long startMillis = System.currentTimeMillis();
+        headers.put(RABBITMQ_PRODUCED_KEY, startMillis);
+    }
 
-  public static long extractTimeInQueueStart(Map<String, Object> headers) {
-    Long startMillis = null == headers ? null : (Long) headers.get(RABBITMQ_PRODUCED_KEY);
-    return null == startMillis ? 0 : startMillis;
-  }
+    public static long extractTimeInQueueStart(Map<String, Object> headers) {
+        Long startMillis = null == headers ? null : (Long) headers.get(RABBITMQ_PRODUCED_KEY);
+        return null == startMillis ? 0 : startMillis;
+    }
 }
diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/TextMapInjectAdapter.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/TextMapInjectAdapter.java
index 88b8df498fa..41cba2babff 100644
--- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/TextMapInjectAdapter.java
+++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/TextMapInjectAdapter.java
@@ -7,10 +7,10 @@
 @ParametersAreNonnullByDefault
 public class TextMapInjectAdapter implements CarrierSetter<Map<String, Object>> {
 
-  public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
+    public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
 
-  @Override
-  public void set(final Map<String, Object> carrier, final String key, final String value) {
-    carrier.put(key, value);
-  }
+    @Override
+    public void set(final Map<String, Object> carrier, final String key, final String value) {
+        carrier.put(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java
index 35008f303f5..79880ff8502 100644
--- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java
+++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java
@@ -21,75 +21,71 @@
  */
 public class TracedDelegatingConsumer implements Consumer {
 
-  private static final Logger log = LoggerFactory.getLogger(TracedDelegatingConsumer.class);
-  private final String queue;
-  private final Consumer delegate;
-  private final boolean propagate;
+    private static final Logger log = LoggerFactory.getLogger(TracedDelegatingConsumer.class);
+    private final String queue;
+    private final Consumer delegate;
+    private final boolean propagate;
 
-  public TracedDelegatingConsumer(final String queue, final Consumer delegate) {
-    this.queue = queue;
-    this.propagate =
-        Config.get().isRabbitPropagationEnabled()
-            && !Config.get().isRabbitPropagationDisabledForDestination(queue);
-    this.delegate = delegate;
-  }
+    public TracedDelegatingConsumer(final String queue, final Consumer delegate) {
+        this.queue = queue;
+        this.propagate = Config.get().isRabbitPropagationEnabled()
+                && !Config.get().isRabbitPropagationDisabledForDestination(queue);
+        this.delegate = delegate;
+    }
 
-  @Override
-  public void handleConsumeOk(final String consumerTag) {
-    delegate.handleConsumeOk(consumerTag);
-  }
+    @Override
+    public void handleConsumeOk(final String consumerTag) {
+        delegate.handleConsumeOk(consumerTag);
+    }
 
-  @Override
-  public void handleCancelOk(final String consumerTag) {
-    delegate.handleCancelOk(consumerTag);
-  }
+    @Override
+    public void handleCancelOk(final String consumerTag) {
+        delegate.handleCancelOk(consumerTag);
+    }
 
-  @Override
-  public void handleCancel(final String consumerTag) throws IOException {
-    delegate.handleCancel(consumerTag);
-  }
+    @Override
+    public void handleCancel(final String consumerTag) throws IOException {
+        delegate.handleCancel(consumerTag);
+    }
 
-  @Override
-  public void handleShutdownSignal(final String consumerTag, final ShutdownSignalException sig) {
-    delegate.handleShutdownSignal(consumerTag, sig);
-  }
+    @Override
+    public void handleShutdownSignal(final String consumerTag, final ShutdownSignalException sig) {
+        delegate.handleShutdownSignal(consumerTag, sig);
+    }
 
-  @Override
-  public void handleRecoverOk(final String consumerTag) {
-    delegate.handleRecoverOk(consumerTag);
-  }
+    @Override
+    public void handleRecoverOk(final String consumerTag) {
+        delegate.handleRecoverOk(consumerTag);
+    }
 
-  @Override
-  public void handleDelivery(
-      final String consumerTag,
-      final Envelope envelope,
-      final AMQP.BasicProperties properties,
-      final byte[] body)
-      throws IOException {
-    ContextScope scope = null;
-    try {
-      scope = RabbitDecorator.startReceivingSpan(propagate, 0, properties, body, queue);
-      AgentSpan span = spanFromScope(scope);
-      CONSUMER_DECORATE.onDeliver(span, queue, envelope);
-      scope = activateSpan(span);
-    } catch (final Exception e) {
-      log.debug("Instrumentation error in tracing consumer", e);
-    } finally {
-      try {
-        // Call delegate.
-        delegate.handleDelivery(consumerTag, envelope, properties, body);
-      } catch (final Throwable throwable) {
-        if (scope != null) {
-          CONSUMER_DECORATE.onError(scope, throwable);
-        }
-        throw throwable;
-      } finally {
-        if (scope != null) {
-          CONSUMER_DECORATE.beforeFinish(scope);
-          scope.close();
-          RabbitDecorator.finishReceivingSpan(scope);
+    @Override
+    public void handleDelivery(
+            final String consumerTag, final Envelope envelope, final AMQP.BasicProperties properties, final byte[] body)
+            throws IOException {
+        ContextScope scope = null;
+        try {
+            scope = RabbitDecorator.startReceivingSpan(propagate, 0, properties, body, queue);
+            AgentSpan span = spanFromScope(scope);
+            CONSUMER_DECORATE.onDeliver(span, queue, envelope);
+            scope = activateSpan(span);
+        } catch (final Exception e) {
+            log.debug("Instrumentation error in tracing consumer", e);
+        } finally {
+            try {
+                // Call delegate.
+                delegate.handleDelivery(consumerTag, envelope, properties, body);
+            } catch (final Throwable throwable) {
+                if (scope != null) {
+                    CONSUMER_DECORATE.onError(scope, throwable);
+                }
+                throw throwable;
+            } finally {
+                if (scope != null) {
+                    CONSUMER_DECORATE.beforeFinish(scope);
+                    scope.close();
+                    RabbitDecorator.finishReceivingSpan(scope);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ActionWrapper.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ActionWrapper.java
index b0ce89cc2cd..7449ea0fa6c 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ActionWrapper.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ActionWrapper.java
@@ -10,28 +10,28 @@
 
 public class ActionWrapper<T> implements Action<T> {
 
-  private static final Logger log = LoggerFactory.getLogger(ActionWrapper.class);
-  private final Action<T> delegate;
-  private final AgentSpan span;
+    private static final Logger log = LoggerFactory.getLogger(ActionWrapper.class);
+    private final Action<T> delegate;
+    private final AgentSpan span;
 
-  private ActionWrapper(final Action<T> delegate, final AgentSpan span) {
-    assert span != null;
-    this.delegate = delegate;
-    this.span = span;
-  }
+    private ActionWrapper(final Action<T> delegate, final AgentSpan span) {
+        assert span != null;
+        this.delegate = delegate;
+        this.span = span;
+    }
 
-  @Override
-  public void execute(final T t) throws Exception {
-    try (final ContextScope scope = activateSpan(span)) {
-      delegate.execute(t);
+    @Override
+    public void execute(final T t) throws Exception {
+        try (final ContextScope scope = activateSpan(span)) {
+            delegate.execute(t);
+        }
     }
-  }
 
-  public static <T> Action<T> wrapIfNeeded(final Action<T> delegate, final AgentSpan span) {
-    if (delegate instanceof ActionWrapper || span == null) {
-      return delegate;
+    public static <T> Action<T> wrapIfNeeded(final Action<T> delegate, final AgentSpan span) {
+        if (delegate instanceof ActionWrapper || span == null) {
+            return delegate;
+        }
+        log.debug("Wrapping action task {}", delegate);
+        return new ActionWrapper(delegate, span);
     }
-    log.debug("Wrapping action task {}", delegate);
-    return new ActionWrapper(delegate, span);
-  }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/BlockWrapper.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/BlockWrapper.java
index 7fe94d5a86e..148e9541ab1 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/BlockWrapper.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/BlockWrapper.java
@@ -10,29 +10,29 @@
 
 public class BlockWrapper implements Block {
 
-  private static final Logger log = LoggerFactory.getLogger(BlockWrapper.class);
+    private static final Logger log = LoggerFactory.getLogger(BlockWrapper.class);
 
-  private final Block delegate;
-  private final AgentSpan span;
+    private final Block delegate;
+    private final AgentSpan span;
 
-  private BlockWrapper(final Block delegate, final AgentSpan span) {
-    assert span != null;
-    this.delegate = delegate;
-    this.span = span;
-  }
+    private BlockWrapper(final Block delegate, final AgentSpan span) {
+        assert span != null;
+        this.delegate = delegate;
+        this.span = span;
+    }
 
-  @Override
-  public void execute() throws Exception {
-    try (final ContextScope scope = activateSpan(span)) {
-      delegate.execute();
+    @Override
+    public void execute() throws Exception {
+        try (final ContextScope scope = activateSpan(span)) {
+            delegate.execute();
+        }
     }
-  }
 
-  public static Block wrapIfNeeded(final Block delegate, final AgentSpan span) {
-    if (delegate instanceof BlockWrapper || span == null) {
-      return delegate;
+    public static Block wrapIfNeeded(final Block delegate, final AgentSpan span) {
+        if (delegate instanceof BlockWrapper || span == null) {
+            return delegate;
+        }
+        log.debug("Wrapping block {}", delegate);
+        return new BlockWrapper(delegate, span);
     }
-    log.debug("Wrapping block {}", delegate);
-    return new BlockWrapper(delegate, span);
-  }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContextParseAdvice.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContextParseAdvice.java
index e4b03268eff..5d02e5aab47 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContextParseAdvice.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContextParseAdvice.java
@@ -18,37 +18,36 @@
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 public class ContextParseAdvice {
 
-  // for now ignore that the parser can be configured to mix in the query string
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  static void after(
-      @Advice.Return Object obj_,
-      @ActiveRequestContext RequestContext reqCtx,
-      @Advice.Thrown(readOnly = false) Throwable t) {
-    Object obj = obj_;
-    if (obj == null || t != null) {
-      return;
-    }
-    if (obj instanceof Form) {
-      // handled by netty
-      return;
-    }
+    // for now ignore that the parser can be configured to mix in the query string
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    static void after(
+            @Advice.Return Object obj_,
+            @ActiveRequestContext RequestContext reqCtx,
+            @Advice.Thrown(readOnly = false) Throwable t) {
+        Object obj = obj_;
+        if (obj == null || t != null) {
+            return;
+        }
+        if (obj instanceof Form) {
+            // handled by netty
+            return;
+        }
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, Object, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestBodyProcessed());
-    if (callback == null) {
-      return;
-    }
-    Flow<Void> flow = callback.apply(reqCtx, obj);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+        if (callback == null) {
+            return;
+        }
+        Flow<Void> flow = callback.apply(reqCtx, obj);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
 
-        t = new BlockingException("Blocked request (for DefaultContext/parse)");
-      }
+                t = new BlockingException("Blocked request (for DefaultContext/parse)");
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContextParseInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContextParseInstrumentation.java
index c455360454e..09334a081fc 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContextParseInstrumentation.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContextParseInstrumentation.java
@@ -11,32 +11,32 @@
 
 @AutoService(InstrumenterModule.class)
 public class ContextParseInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public ContextParseInstrumentation() {
-    super("ratpack");
-  }
-
-  // so it doesn't apply to ratpack < 1.5
-  private static final Reference FILE_IO = new Reference.Builder("ratpack.file.FileIo").build();
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {FILE_IO};
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "ratpack.handling.internal.DefaultContext";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("parse")
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("ratpack.http.TypedData")))
-            .and(takesArgument(1, named("ratpack.parse.Parse"))),
-        packageName + ".ContextParseAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public ContextParseInstrumentation() {
+        super("ratpack");
+    }
+
+    // so it doesn't apply to ratpack < 1.5
+    private static final Reference FILE_IO = new Reference.Builder("ratpack.file.FileIo").build();
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {FILE_IO};
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "ratpack.handling.internal.DefaultContext";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("parse")
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("ratpack.http.TypedData")))
+                        .and(takesArgument(1, named("ratpack.parse.Parse"))),
+                packageName + ".ContextParseAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContinuationInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContinuationInstrumentation.java
index 3291cd261d4..ea57f8a2d1e 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContinuationInstrumentation.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContinuationInstrumentation.java
@@ -18,42 +18,42 @@
 
 @AutoService(InstrumenterModule.class)
 public final class ContinuationInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public ContinuationInstrumentation() {
-    super("ratpack");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "ratpack.exec.internal.Continuation";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return nameStartsWith("ratpack.exec.").and(implementsInterface(named(hierarchyMarkerType())));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("resume").and(takesArgument(0, named("ratpack.func.Block"))),
-        ContinuationInstrumentation.class.getName() + "$ResumeAdvice");
-  }
-
-  public static class ResumeAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void wrap(@Advice.Argument(value = 0, readOnly = false) Block block) {
-      block = BlockWrapper.wrapIfNeeded(block, activeSpan());
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public ContinuationInstrumentation() {
+        super("ratpack");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "ratpack.exec.internal.Continuation";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return nameStartsWith("ratpack.exec.").and(implementsInterface(named(hierarchyMarkerType())));
     }
 
-    public void muzzleCheck(final PathBinding binding, final HostAndPort host) {
-      // This was added in 1.4.  Added here to ensure consistency with other instrumentation.
-      binding.getDescription();
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("resume").and(takesArgument(0, named("ratpack.func.Block"))),
+                ContinuationInstrumentation.class.getName() + "$ResumeAdvice");
+    }
+
+    public static class ResumeAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void wrap(@Advice.Argument(value = 0, readOnly = false) Block block) {
+            block = BlockWrapper.wrapIfNeeded(block, activeSpan());
+        }
+
+        public void muzzleCheck(final PathBinding binding, final HostAndPort host) {
+            // This was added in 1.4.  Added here to ensure consistency with other instrumentation.
+            binding.getDescription();
 
-      // This is available in Guava 20 which was required starting in 1.5
-      host.getHost();
+            // This is available in Guava 20 which was required starting in 1.5
+            host.getHost();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/DefaultExecutionInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/DefaultExecutionInstrumentation.java
index 61028c9a653..3c5ee258472 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/DefaultExecutionInstrumentation.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/DefaultExecutionInstrumentation.java
@@ -17,47 +17,47 @@
 
 @AutoService(InstrumenterModule.class)
 public final class DefaultExecutionInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public DefaultExecutionInstrumentation() {
-    super("ratpack");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "ratpack.exec.internal.DefaultExecution";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        nameStartsWith("delimit") // include delimitStream
-            .and(takesArgument(0, named("ratpack.func.Action")))
-            .and(takesArgument(1, named("ratpack.func.Action"))),
-        DefaultExecutionInstrumentation.class.getName() + "$DelimitAdvice");
-  }
-
-  public static class DelimitAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void wrap(
-        @Advice.Argument(value = 0, readOnly = false) Action<? super Throwable> onError,
-        @Advice.Argument(value = 1, readOnly = false) Action<? super Continuation> segment) {
-      /**
-       * Here we pass along the span instead of a continuation because we aren't sure the callback
-       * will actually be called.
-       */
-      final AgentSpan span = activeSpan();
-      onError = ActionWrapper.wrapIfNeeded(onError, span);
-      segment = ActionWrapper.wrapIfNeeded(segment, span);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public DefaultExecutionInstrumentation() {
+        super("ratpack");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "ratpack.exec.internal.DefaultExecution";
     }
 
-    public void muzzleCheck(final PathBinding binding, final HostAndPort host) {
-      // This was added in 1.4.  Added here to ensure consistency with other instrumentation.
-      binding.getDescription();
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                nameStartsWith("delimit") // include delimitStream
+                        .and(takesArgument(0, named("ratpack.func.Action")))
+                        .and(takesArgument(1, named("ratpack.func.Action"))),
+                DefaultExecutionInstrumentation.class.getName() + "$DelimitAdvice");
+    }
 
-      // This is available in Guava 20 which was required starting in 1.5
-      host.getHost();
+    public static class DelimitAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void wrap(
+                @Advice.Argument(value = 0, readOnly = false) Action<? super Throwable> onError,
+                @Advice.Argument(value = 1, readOnly = false) Action<? super Continuation> segment) {
+            /**
+             * Here we pass along the span instead of a continuation because we aren't sure the callback
+             * will actually be called.
+             */
+            final AgentSpan span = activeSpan();
+            onError = ActionWrapper.wrapIfNeeded(onError, span);
+            segment = ActionWrapper.wrapIfNeeded(segment, span);
+        }
+
+        public void muzzleCheck(final PathBinding binding, final HostAndPort host) {
+            // This was added in 1.4.  Added here to ensure consistency with other instrumentation.
+            binding.getDescription();
+
+            // This is available in Guava 20 which was required starting in 1.5
+            host.getHost();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ErrorHandlerAdvice.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ErrorHandlerAdvice.java
index 0b22a95af31..b51844b50e8 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ErrorHandlerAdvice.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ErrorHandlerAdvice.java
@@ -11,12 +11,12 @@
  * @see ratpack.error.ServerErrorHandler#error(Context, Throwable)
  */
 public class ErrorHandlerAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void captureThrowable(
-      @Advice.Argument(0) final Context ctx, @Advice.Argument(1) final Throwable throwable) {
-    final Optional<AgentSpan> span = ctx.maybeGet(AgentSpan.class);
-    if (span.isPresent()) {
-      DECORATE.onError(span.get(), throwable);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void captureThrowable(
+            @Advice.Argument(0) final Context ctx, @Advice.Argument(1) final Throwable throwable) {
+        final Optional<AgentSpan> span = ctx.maybeGet(AgentSpan.class);
+        if (span.isPresent()) {
+            DECORATE.onError(span.get(), throwable);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/GetTextCharSequenceSupplier.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/GetTextCharSequenceSupplier.java
index feebda52d7f..6cb8ccc96d5 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/GetTextCharSequenceSupplier.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/GetTextCharSequenceSupplier.java
@@ -4,14 +4,14 @@
 import ratpack.http.TypedData;
 
 public class GetTextCharSequenceSupplier implements Supplier<CharSequence> {
-  private final TypedData thiz;
+    private final TypedData thiz;
 
-  public GetTextCharSequenceSupplier(TypedData thiz) {
-    this.thiz = thiz;
-  }
+    public GetTextCharSequenceSupplier(TypedData thiz) {
+        this.thiz = thiz;
+    }
 
-  @Override
-  public CharSequence get() {
-    return thiz.getText();
-  }
+    @Override
+    public CharSequence get() {
+        return thiz.getText();
+    }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/JsonRendererAdvice.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/JsonRendererAdvice.java
index 0f1b75320f8..795fb31e6f4 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/JsonRendererAdvice.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/JsonRendererAdvice.java
@@ -18,34 +18,31 @@
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 public class JsonRendererAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  static void enter(
-      @Advice.Argument(1) final JsonRender render,
-      @ActiveRequestContext final RequestContext reqCtx) {
-    Object obj = render == null ? null : render.getObject();
-    if (obj == null) {
-      return;
-    }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static void enter(@Advice.Argument(1) final JsonRender render, @ActiveRequestContext final RequestContext reqCtx) {
+        Object obj = render == null ? null : render.getObject();
+        if (obj == null) {
+            return;
+        }
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    if (cbp == null) {
-      return;
-    }
-    BiFunction<RequestContext, Object, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.responseBody());
-    if (callback == null) {
-      return;
-    }
-    Flow<Void> flow = callback.apply(reqCtx, obj);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        if (cbp == null) {
+            return;
+        }
+        BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.responseBody());
+        if (callback == null) {
+            return;
+        }
+        Flow<Void> flow = callback.apply(reqCtx, obj);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
 
-        throw new BlockingException("Blocked request (for JsonRenderer/render)");
-      }
+                throw new BlockingException("Blocked request (for JsonRenderer/render)");
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/JsonRendererInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/JsonRendererInstrumentation.java
index ccbd274ee70..d6cfac45f56 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/JsonRendererInstrumentation.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/JsonRendererInstrumentation.java
@@ -12,33 +12,33 @@
 
 @AutoService(InstrumenterModule.class)
 public class JsonRendererInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  // so it doesn't apply to ratpack < 1.5
-  private static final Reference FILE_IO = new Reference.Builder("ratpack.file.FileIo").build();
-
-  public JsonRendererInstrumentation() {
-    super("ratpack");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "ratpack.jackson.internal.JsonRenderer";
-  }
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {FILE_IO};
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("render"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("ratpack.handling.Context")))
-            .and(takesArgument(1, named("ratpack.jackson.JsonRender"))),
-        packageName + ".JsonRendererAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    // so it doesn't apply to ratpack < 1.5
+    private static final Reference FILE_IO = new Reference.Builder("ratpack.file.FileIo").build();
+
+    public JsonRendererInstrumentation() {
+        super("ratpack");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "ratpack.jackson.internal.JsonRenderer";
+    }
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {FILE_IO};
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("render"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("ratpack.handling.Context")))
+                        .and(takesArgument(1, named("ratpack.jackson.JsonRender"))),
+                packageName + ".JsonRendererAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathBindingPublishingHandler.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathBindingPublishingHandler.java
index a41a1cbfdda..f02638abc9e 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathBindingPublishingHandler.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathBindingPublishingHandler.java
@@ -20,57 +20,56 @@
 import ratpack.path.PathTokens;
 
 public class PathBindingPublishingHandler implements Handler {
-  public static final Handler INSTANCE = new PathBindingPublishingHandler();
-  private static final Logger LOGGER = LoggerFactory.getLogger(PathBindingPublishingHandler.class);
+    public static final Handler INSTANCE = new PathBindingPublishingHandler();
+    private static final Logger LOGGER = LoggerFactory.getLogger(PathBindingPublishingHandler.class);
 
-  @Override
-  public void handle(Context ctx) {
-    boolean doDelegation = true;
-    try {
-      doDelegation = maybePublishTokens(ctx);
-    } finally {
-      if (doDelegation) {
-        ctx.next();
-      } else {
-        throw new BlockingException("Blocking request");
-      }
+    @Override
+    public void handle(Context ctx) {
+        boolean doDelegation = true;
+        try {
+            doDelegation = maybePublishTokens(ctx);
+        } finally {
+            if (doDelegation) {
+                ctx.next();
+            } else {
+                throw new BlockingException("Blocking request");
+            }
+        }
     }
-  }
 
-  private boolean maybePublishTokens(Context ctx) {
-    PathTokens tokens = ctx.getPathTokens();
+    private boolean maybePublishTokens(Context ctx) {
+        PathTokens tokens = ctx.getPathTokens();
 
-    if (tokens == null || tokens.isEmpty()) {
-      return true;
-    }
+        if (tokens == null || tokens.isEmpty()) {
+            return true;
+        }
 
-    AgentSpan agentSpan = activeSpan();
-    if (agentSpan == null) {
-      return true;
-    }
+        AgentSpan agentSpan = activeSpan();
+        if (agentSpan == null) {
+            return true;
+        }
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestPathParams());
-    RequestContext requestContext = agentSpan.getRequestContext();
-    if (requestContext == null || callback == null) {
-      return true;
-    }
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback = cbp.getCallback(EVENTS.requestPathParams());
+        RequestContext requestContext = agentSpan.getRequestContext();
+        if (requestContext == null || callback == null) {
+            return true;
+        }
+
+        Flow<Void> flow = callback.apply(requestContext, tokens);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction blockResponseFunction =
+                    agentSpan.getRequestContext().getBlockResponseFunction();
+            if (blockResponseFunction == null) {
+                LOGGER.warn("Can't block path parameters (no block response function available)");
+                return true;
+            }
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            blockResponseFunction.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
+            return false;
+        }
 
-    Flow<Void> flow = callback.apply(requestContext, tokens);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction blockResponseFunction =
-          agentSpan.getRequestContext().getBlockResponseFunction();
-      if (blockResponseFunction == null) {
-        LOGGER.warn("Can't block path parameters (no block response function available)");
         return true;
-      }
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      blockResponseFunction.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
-      return false;
     }
-
-    return true;
-  }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathHandlerAdvice.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathHandlerAdvice.java
index 1c901ccfc5e..57e93f456ca 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathHandlerAdvice.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathHandlerAdvice.java
@@ -12,31 +12,28 @@
  */
 public class PathHandlerAdvice {
 
-  // limitation: we can publish tokens for more than one handler in the same request
-  // only the first one will be considered further down
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  @SuppressFBWarnings(
-      value = "UC_USELESS_OBJECT",
-      justification = "write to handler is not without effect")
-  static void before(
-      @Advice.Argument(0) PathBinder pathBinder,
-      @Advice.Argument(value = 1, readOnly = false) Handler handler) {
-    if (!(pathBinder instanceof TokenPathBinder)) {
-      return;
-    }
+    // limitation: we can publish tokens for more than one handler in the same request
+    // only the first one will be considered further down
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    @SuppressFBWarnings(value = "UC_USELESS_OBJECT", justification = "write to handler is not without effect")
+    static void before(
+            @Advice.Argument(0) PathBinder pathBinder, @Advice.Argument(value = 1, readOnly = false) Handler handler) {
+        if (!(pathBinder instanceof TokenPathBinder)) {
+            return;
+        }
 
-    if (!TokenPathBinderInspector.hasTokenNames((TokenPathBinder) pathBinder)) {
-      return;
-    }
+        if (!TokenPathBinderInspector.hasTokenNames((TokenPathBinder) pathBinder)) {
+            return;
+        }
 
-    if (handler instanceof ChainHandler) {
-      Handler[] unpacked = ChainHandler.unpack(handler);
-      Handler[] withPubHandler = new Handler[unpacked.length + 1];
-      System.arraycopy(unpacked, 0, withPubHandler, 1, unpacked.length);
-      withPubHandler[0] = PathBindingPublishingHandler.INSTANCE;
-      handler = new ChainHandler(withPubHandler);
-    } else {
-      handler = new ChainHandler(PathBindingPublishingHandler.INSTANCE, handler);
+        if (handler instanceof ChainHandler) {
+            Handler[] unpacked = ChainHandler.unpack(handler);
+            Handler[] withPubHandler = new Handler[unpacked.length + 1];
+            System.arraycopy(unpacked, 0, withPubHandler, 1, unpacked.length);
+            withPubHandler[0] = PathBindingPublishingHandler.INSTANCE;
+            handler = new ChainHandler(withPubHandler);
+        } else {
+            handler = new ChainHandler(PathBindingPublishingHandler.INSTANCE, handler);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathHandlerInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathHandlerInstrumentation.java
index f1631b72e1f..ce40b0f986f 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathHandlerInstrumentation.java
@@ -12,41 +12,41 @@
 
 @AutoService(InstrumenterModule.class)
 public class PathHandlerInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public PathHandlerInstrumentation() {
-    super("ratpack");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "ratpack.path.internal.PathHandler";
-  }
-
-  private static final Reference TOKEN_PATH_BINDER_TOKEN_NAMES =
-      new Reference.Builder("ratpack.path.internal.TokenPathBinder")
-          .withField(
-              new String[0],
-              Reference.EXPECTS_NON_STATIC,
-              "tokenNames",
-              "Lcom/google/common/collect/ImmutableList;")
-          .build();
-
-  // so it doesn't apply to ratpack < 1.5
-  private static final Reference FILE_IO = new Reference.Builder("ratpack.file.FileIo").build();
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {FILE_IO, TOKEN_PATH_BINDER_TOKEN_NAMES};
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("ratpack.path.PathBinder")))
-            .and(takesArgument(1, named("ratpack.handling.Handler"))),
-        packageName + ".PathHandlerAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public PathHandlerInstrumentation() {
+        super("ratpack");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "ratpack.path.internal.PathHandler";
+    }
+
+    private static final Reference TOKEN_PATH_BINDER_TOKEN_NAMES = new Reference.Builder(
+                    "ratpack.path.internal.TokenPathBinder")
+            .withField(
+                    new String[0],
+                    Reference.EXPECTS_NON_STATIC,
+                    "tokenNames",
+                    "Lcom/google/common/collect/ImmutableList;")
+            .build();
+
+    // so it doesn't apply to ratpack < 1.5
+    private static final Reference FILE_IO = new Reference.Builder("ratpack.file.FileIo").build();
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {FILE_IO, TOKEN_PATH_BINDER_TOKEN_NAMES};
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("ratpack.path.PathBinder")))
+                        .and(takesArgument(1, named("ratpack.handling.Handler"))),
+                packageName + ".PathHandlerAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackBodyReadStreamAdvice.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackBodyReadStreamAdvice.java
index c39a7bbfe4f..d52387753b7 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackBodyReadStreamAdvice.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackBodyReadStreamAdvice.java
@@ -12,20 +12,19 @@
 
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 public class RatpackBodyReadStreamAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  static void after(
-      @Advice.This RequestBody requestBody,
-      @Advice.Return(readOnly = false) TransformablePublisher<ByteBuf> publisher) {
-    final StoredByteBody byteBody =
-        StoredBodyFactories.maybeCreateForByte(null, requestBody.getContentLength());
-    if (byteBody == null) {
-      return;
-    }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    static void after(
+            @Advice.This RequestBody requestBody,
+            @Advice.Return(readOnly = false) TransformablePublisher<ByteBuf> publisher) {
+        final StoredByteBody byteBody = StoredBodyFactories.maybeCreateForByte(null, requestBody.getContentLength());
+        if (byteBody == null) {
+            return;
+        }
 
-    publisher = new RequestBodyCollectionPublisher(byteBody, publisher);
-  }
+        publisher = new RequestBodyCollectionPublisher(byteBody, publisher);
+    }
 
-  public void muzzleCheck() {
-    FileIo.open(null); // added in 1.5
-  }
+    public void muzzleCheck() {
+        FileIo.open(null); // added in 1.5
+    }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyCallGetBufferAdvice.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyCallGetBufferAdvice.java
index 43c9de353d2..e43a8bf0a1a 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyCallGetBufferAdvice.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyCallGetBufferAdvice.java
@@ -26,48 +26,46 @@
  */
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 public class RatpackRequestBodyCallGetBufferAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  static Throwable before(
-      @Advice.This ByteBufBackedTypedData thiz, @ActiveRequestContext RequestContext reqCtx) {
-    Boolean bodyPublished =
-        InstrumentationContext.get(ByteBufBackedTypedData.class, Boolean.class).get(thiz);
-    if (bodyPublished == Boolean.TRUE) {
-      return null;
-    }
-    InstrumentationContext.get(ByteBufBackedTypedData.class, Boolean.class).put(thiz, Boolean.TRUE);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static Throwable before(@Advice.This ByteBufBackedTypedData thiz, @ActiveRequestContext RequestContext reqCtx) {
+        Boolean bodyPublished = InstrumentationContext.get(ByteBufBackedTypedData.class, Boolean.class)
+                .get(thiz);
+        if (bodyPublished == Boolean.TRUE) {
+            return null;
+        }
+        InstrumentationContext.get(ByteBufBackedTypedData.class, Boolean.class).put(thiz, Boolean.TRUE);
+
+        Flow<Void> flow = StoredBodyFactories.maybeDeliverBodyInOneGo(new GetTextCharSequenceSupplier(thiz), reqCtx);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+            if (blockResponseFunction == null) {
+                return null;
+            }
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+            return new BlockingException("Blocked request (for ByteBufBackedTypedData/getBuffer)");
+        }
 
-    Flow<Void> flow =
-        StoredBodyFactories.maybeDeliverBodyInOneGo(new GetTextCharSequenceSupplier(thiz), reqCtx);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-      if (blockResponseFunction == null) {
         return null;
-      }
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-      return new BlockingException("Blocked request (for ByteBufBackedTypedData/getBuffer)");
     }
 
-    return null;
-  }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    static void after(
+            @Advice.Enter Throwable enterThr,
+            @Advice.Thrown(readOnly = false) Throwable t,
+            @ActiveRequestContext RequestContext reqCtx) {
+        if (enterThr == null) {
+            return;
+        }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  static void after(
-      @Advice.Enter Throwable enterThr,
-      @Advice.Thrown(readOnly = false) Throwable t,
-      @ActiveRequestContext RequestContext reqCtx) {
-    if (enterThr == null) {
-      return;
+        // it's questionable, but we don't replace existing exceptions with our BlockingException
+        if (t == null) {
+            t = enterThr;
+        }
     }
 
-    // it's questionable, but we don't replace existing exceptions with our BlockingException
-    if (t == null) {
-      t = enterThr;
+    public void muzzleCheck() {
+        FileIo.open(null); // added in 1.5
     }
-  }
-
-  public void muzzleCheck() {
-    FileIo.open(null); // added in 1.5
-  }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyGetTextCalledAdvice.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyGetTextCalledAdvice.java
index 847041f83f8..b6bfd29eee6 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyGetTextCalledAdvice.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyGetTextCalledAdvice.java
@@ -15,35 +15,35 @@
 
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 public class RatpackRequestBodyGetTextCalledAdvice {
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  static void after(
-      @Advice.This ByteBufBackedTypedData thiz,
-      @Advice.Return String str,
-      @ActiveRequestContext RequestContext reqCtx,
-      @Advice.Thrown(readOnly = false) Throwable throwable) {
-    Boolean bodyPublished =
-        InstrumentationContext.get(ByteBufBackedTypedData.class, Boolean.class).get(thiz);
-    if (bodyPublished == Boolean.TRUE) {
-      return;
-    }
-    InstrumentationContext.get(ByteBufBackedTypedData.class, Boolean.class).put(thiz, Boolean.TRUE);
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    static void after(
+            @Advice.This ByteBufBackedTypedData thiz,
+            @Advice.Return String str,
+            @ActiveRequestContext RequestContext reqCtx,
+            @Advice.Thrown(readOnly = false) Throwable throwable) {
+        Boolean bodyPublished = InstrumentationContext.get(ByteBufBackedTypedData.class, Boolean.class)
+                .get(thiz);
+        if (bodyPublished == Boolean.TRUE) {
+            return;
+        }
+        InstrumentationContext.get(ByteBufBackedTypedData.class, Boolean.class).put(thiz, Boolean.TRUE);
 
-    Flow<Void> flow = StoredBodyFactories.maybeDeliverBodyInOneGo(str, reqCtx);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-      if (blockResponseFunction == null) {
-        return;
-      }
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-      if (throwable == null) {
-        throwable = new BlockingException("Blocked request (for ByteBufBackedTypedData/getText)");
-      }
+        Flow<Void> flow = StoredBodyFactories.maybeDeliverBodyInOneGo(str, reqCtx);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+            if (blockResponseFunction == null) {
+                return;
+            }
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+            if (throwable == null) {
+                throwable = new BlockingException("Blocked request (for ByteBufBackedTypedData/getText)");
+            }
+        }
     }
-  }
 
-  public void muzzleCheck() {
-    FileIo.open(null); // added in 1.5
-  }
+    public void muzzleCheck() {
+        FileIo.open(null); // added in 1.5
+    }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyInstrumentation.java
index 8ed4dbbf686..880140992d8 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyInstrumentation.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyInstrumentation.java
@@ -13,19 +13,19 @@
  */
 @AutoService(InstrumenterModule.class)
 public class RatpackRequestBodyInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public RatpackRequestBodyInstrumentation() {
-    super("ratpack-request-body");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public RatpackRequestBodyInstrumentation() {
+        super("ratpack-request-body");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "ratpack.server.internal.RequestBody";
-  }
+    @Override
+    public String instrumentedType() {
+        return "ratpack.server.internal.RequestBody";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("readStream").and(takesArguments(0)), packageName + ".RatpackBodyReadStreamAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("readStream").and(takesArguments(0)), packageName + ".RatpackBodyReadStreamAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackServerDecorator.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackServerDecorator.java
index c101c4eea7f..48c96e23887 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackServerDecorator.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackServerDecorator.java
@@ -14,90 +14,89 @@
 import ratpack.http.Status;
 
 public class RatpackServerDecorator extends HttpServerDecorator<Request, Request, Response, Void> {
-  public static final CharSequence RATPACK_HANDLER = UTF8BytesString.create("ratpack.handler");
-  public static final CharSequence RATPACK = UTF8BytesString.create("ratpack");
-  public static final RatpackServerDecorator DECORATE = new RatpackServerDecorator();
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"ratpack"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return RATPACK;
-  }
-
-  @Override
-  protected boolean traceAnalyticsDefault() {
-    return false;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Void> getter() {
-    return null;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Response> responseGetter() {
-    return null;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return RATPACK_HANDLER;
-  }
-
-  @Override
-  protected String method(final Request request) {
-    return request.getMethod().getName();
-  }
-
-  @Override
-  protected URIDataAdapter url(final Request request) {
-    return new RequestURIAdapterAdapter(request);
-  }
-
-  @Override
-  protected String peerHostIP(final Request request) {
-    return request.getRemoteAddress().getHost();
-  }
-
-  @Override
-  protected int peerPort(final Request request) {
-    return request.getRemoteAddress().getPort();
-  }
-
-  @Override
-  protected int status(final Response response) {
-    final Status status = response.getStatus();
-    if (status != null) {
-      return status.getCode();
-    } else {
-      return 0;
+    public static final CharSequence RATPACK_HANDLER = UTF8BytesString.create("ratpack.handler");
+    public static final CharSequence RATPACK = UTF8BytesString.create("ratpack");
+    public static final RatpackServerDecorator DECORATE = new RatpackServerDecorator();
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"ratpack"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return RATPACK;
+    }
+
+    @Override
+    protected boolean traceAnalyticsDefault() {
+        return false;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Void> getter() {
+        return null;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Response> responseGetter() {
+        return null;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return RATPACK_HANDLER;
     }
-  }
 
-  public void onContext(final AgentSpan span, final Context ctx) {
+    @Override
+    protected String method(final Request request) {
+        return request.getMethod().getName();
+    }
+
+    @Override
+    protected URIDataAdapter url(final Request request) {
+        return new RequestURIAdapterAdapter(request);
+    }
+
+    @Override
+    protected String peerHostIP(final Request request) {
+        return request.getRemoteAddress().getHost();
+    }
+
+    @Override
+    protected int peerPort(final Request request) {
+        return request.getRemoteAddress().getPort();
+    }
+
+    @Override
+    protected int status(final Response response) {
+        final Status status = response.getStatus();
+        if (status != null) {
+            return status.getCode();
+        } else {
+            return 0;
+        }
+    }
+
+    public void onContext(final AgentSpan span, final Context ctx) {
+
+        String description = ctx.getPathBinding().getDescription();
+        if (description == null || description.isEmpty()) {
+            description = "/";
+        } else if (!description.startsWith("/")) {
+            description = "/" + description;
+        }
 
-    String description = ctx.getPathBinding().getDescription();
-    if (description == null || description.isEmpty()) {
-      description = "/";
-    } else if (!description.startsWith("/")) {
-      description = "/" + description;
+        HTTP_RESOURCE_DECORATOR.withRoute(span, ctx.getRequest().getMethod().getName(), description);
     }
 
-    HTTP_RESOURCE_DECORATOR.withRoute(span, ctx.getRequest().getMethod().getName(), description);
-  }
-
-  @Override
-  protected void doOnError(
-      @Nonnull final AgentSpan span, @Nonnull Throwable throwable, byte errorPriority) {
-    // Attempt to unwrap ratpack.handling.internal.HandlerException without direct reference.
-    if (throwable instanceof Error && throwable.getCause() != null) {
-      super.doOnError(span, throwable.getCause(), errorPriority);
-    } else {
-      super.doOnError(span, throwable, errorPriority);
+    @Override
+    protected void doOnError(@Nonnull final AgentSpan span, @Nonnull Throwable throwable, byte errorPriority) {
+        // Attempt to unwrap ratpack.handling.internal.HandlerException without direct reference.
+        if (throwable instanceof Error && throwable.getCause() != null) {
+            super.doOnError(span, throwable.getCause(), errorPriority);
+        } else {
+            super.doOnError(span, throwable, errorPriority);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackTypedDataInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackTypedDataInstrumentation.java
index 17bfbfa2a66..66d0b4bfc99 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackTypedDataInstrumentation.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackTypedDataInstrumentation.java
@@ -13,33 +13,32 @@
 
 @AutoService(InstrumenterModule.class)
 public class RatpackTypedDataInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public RatpackTypedDataInstrumentation() {
-    super("ratpack-request-body");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public RatpackTypedDataInstrumentation() {
+        super("ratpack-request-body");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "ratpack.http.internal.ByteBufBackedTypedData";
-  }
+    @Override
+    public String instrumentedType() {
+        return "ratpack.http.internal.ByteBufBackedTypedData";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "ratpack.http.internal.ByteBufBackedTypedData", Boolean.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("ratpack.http.internal.ByteBufBackedTypedData", Boolean.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getBuffer")
-            .and(takesArguments(0))
-            .or(named("getBytes").and(takesArguments(0)))
-            .or(named("writeTo").and(takesArguments(OutputStream.class)))
-            .or(named("getInputStream").and(takesArguments(0))),
-        packageName + ".RatpackRequestBodyCallGetBufferAdvice");
-    transformer.applyAdvice(
-        named("getText").and(takesArguments(0).or(takesArguments(Charset.class))),
-        packageName + ".RatpackRequestBodyGetTextCalledAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getBuffer")
+                        .and(takesArguments(0))
+                        .or(named("getBytes").and(takesArguments(0)))
+                        .or(named("writeTo").and(takesArguments(OutputStream.class)))
+                        .or(named("getInputStream").and(takesArguments(0))),
+                packageName + ".RatpackRequestBodyCallGetBufferAdvice");
+        transformer.applyAdvice(
+                named("getText").and(takesArguments(0).or(takesArguments(Charset.class))),
+                packageName + ".RatpackRequestBodyGetTextCalledAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RequestBodyCollectionPublisher.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RequestBodyCollectionPublisher.java
index 6ec7376249e..90ca61bd3c9 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RequestBodyCollectionPublisher.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RequestBodyCollectionPublisher.java
@@ -17,90 +17,88 @@
 import ratpack.stream.TransformablePublisher;
 
 public class RequestBodyCollectionPublisher implements TransformablePublisher<ByteBuf> {
-  private final ByteBufIntoByteBufferCallback cb = new ByteBufIntoByteBufferCallback();
-  private final StoredByteBody storedByteBody;
-  private final Publisher<ByteBuf> input;
+    private final ByteBufIntoByteBufferCallback cb = new ByteBufIntoByteBufferCallback();
+    private final StoredByteBody storedByteBody;
+    private final Publisher<ByteBuf> input;
 
-  public RequestBodyCollectionPublisher(StoredByteBody storedByteBody, Publisher<ByteBuf> input) {
-    this.storedByteBody = storedByteBody;
-    this.input = input;
-  }
-
-  @Override
-  public void subscribe(final Subscriber<? super ByteBuf> outSubscriber) {
-    input.subscribe(
-        new Subscriber<ByteBuf>() {
+    public RequestBodyCollectionPublisher(StoredByteBody storedByteBody, Publisher<ByteBuf> input) {
+        this.storedByteBody = storedByteBody;
+        this.input = input;
+    }
 
-          private final AtomicBoolean done = new AtomicBoolean();
+    @Override
+    public void subscribe(final Subscriber<? super ByteBuf> outSubscriber) {
+        input.subscribe(new Subscriber<ByteBuf>() {
 
-          @Override
-          public void onSubscribe(Subscription subscription) {
-            outSubscriber.onSubscribe(subscription);
-          }
+            private final AtomicBoolean done = new AtomicBoolean();
 
-          @Override
-          public void onNext(ByteBuf in) {
-            // duplicate in order not to move indexes. Release is unnecessary
-            cb.byteBuf = in.duplicate();
-            storedByteBody.appendData(cb, cb.byteBuf.readableBytes());
-            if (!done.get()) {
-              outSubscriber.onNext(in);
+            @Override
+            public void onSubscribe(Subscription subscription) {
+                outSubscriber.onSubscribe(subscription);
             }
-          }
 
-          @Override
-          public void onError(Throwable t) {
-            Flow<Void> flow = storedByteBody.maybeNotify();
-            Flow.Action action = flow.getAction();
-            if (action instanceof Flow.Action.RequestBlockingAction) {
-              block((Flow.Action.RequestBlockingAction) action, t);
-            } else if (done.compareAndSet(false, true)) {
-              outSubscriber.onError(t);
+            @Override
+            public void onNext(ByteBuf in) {
+                // duplicate in order not to move indexes. Release is unnecessary
+                cb.byteBuf = in.duplicate();
+                storedByteBody.appendData(cb, cb.byteBuf.readableBytes());
+                if (!done.get()) {
+                    outSubscriber.onNext(in);
+                }
             }
-          }
 
-          @Override
-          public void onComplete() {
-            Flow<Void> flow = storedByteBody.maybeNotify();
-            Flow.Action action = flow.getAction();
-            if (action instanceof Flow.Action.RequestBlockingAction) {
-              block(
-                  (Flow.Action.RequestBlockingAction) action,
-                  new BlockingException("Blocked request (for RequestBody/readStream)"));
-            } else if (done.compareAndSet(false, true)) {
-              outSubscriber.onComplete();
+            @Override
+            public void onError(Throwable t) {
+                Flow<Void> flow = storedByteBody.maybeNotify();
+                Flow.Action action = flow.getAction();
+                if (action instanceof Flow.Action.RequestBlockingAction) {
+                    block((Flow.Action.RequestBlockingAction) action, t);
+                } else if (done.compareAndSet(false, true)) {
+                    outSubscriber.onError(t);
+                }
             }
-          }
 
-          private void block(Flow.Action.RequestBlockingAction rba, Throwable t) {
-            AgentSpan agentSpan = activeSpan();
-            if (agentSpan == null) {
-              return;
-            }
-            RequestContext requestContext = agentSpan.getRequestContext();
-            BlockResponseFunction blockResponseFunction = requestContext.getBlockResponseFunction();
-            if (blockResponseFunction == null) {
-              return;
+            @Override
+            public void onComplete() {
+                Flow<Void> flow = storedByteBody.maybeNotify();
+                Flow.Action action = flow.getAction();
+                if (action instanceof Flow.Action.RequestBlockingAction) {
+                    block(
+                            (Flow.Action.RequestBlockingAction) action,
+                            new BlockingException("Blocked request (for RequestBody/readStream)"));
+                } else if (done.compareAndSet(false, true)) {
+                    outSubscriber.onComplete();
+                }
             }
-            blockResponseFunction.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
 
-            // we can't directly interrupt user code here by throwing an exception
-            // user code must listen for errors and implement its own logic to prevent
-            // the request processing from continue (although we always commit the error response)
-            if (done.compareAndSet(false, true)) {
-              outSubscriber.onError(t);
+            private void block(Flow.Action.RequestBlockingAction rba, Throwable t) {
+                AgentSpan agentSpan = activeSpan();
+                if (agentSpan == null) {
+                    return;
+                }
+                RequestContext requestContext = agentSpan.getRequestContext();
+                BlockResponseFunction blockResponseFunction = requestContext.getBlockResponseFunction();
+                if (blockResponseFunction == null) {
+                    return;
+                }
+                blockResponseFunction.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
+
+                // we can't directly interrupt user code here by throwing an exception
+                // user code must listen for errors and implement its own logic to prevent
+                // the request processing from continue (although we always commit the error response)
+                if (done.compareAndSet(false, true)) {
+                    outSubscriber.onError(t);
+                }
             }
-          }
         });
-  }
+    }
 
-  public static class ByteBufIntoByteBufferCallback
-      implements StoredByteBody.ByteBufferWriteCallback {
-    ByteBuf byteBuf;
+    public static class ByteBufIntoByteBufferCallback implements StoredByteBody.ByteBufferWriteCallback {
+        ByteBuf byteBuf;
 
-    @Override
-    public void put(ByteBuffer undecodedData) {
-      byteBuf.readBytes(undecodedData);
+        @Override
+        public void put(ByteBuffer undecodedData) {
+            byteBuf.readBytes(undecodedData);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RequestURIAdapterAdapter.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RequestURIAdapterAdapter.java
index 565afaf6b1b..3fcf5b146d2 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RequestURIAdapterAdapter.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RequestURIAdapterAdapter.java
@@ -11,70 +11,69 @@
 
 final class RequestURIAdapterAdapter extends URIDataAdapterBase {
 
-  // the cache size can be small, as this is a cache for a string representation
-  // of the local address of the socket. Usually there will be only one element
-  private static final DDCache<String, String> DOMAIN_NAME_MAPPING = DDCaches.newFixedSizeCache(4);
+    // the cache size can be small, as this is a cache for a string representation
+    // of the local address of the socket. Usually there will be only one element
+    private static final DDCache<String, String> DOMAIN_NAME_MAPPING = DDCaches.newFixedSizeCache(4);
 
-  private static final Function<String, String> GET_CANONICAL_NAME =
-      ip -> {
+    private static final Function<String, String> GET_CANONICAL_NAME = ip -> {
         try {
-          return InetAddress.getByName(ip).getCanonicalHostName();
+            return InetAddress.getByName(ip).getCanonicalHostName();
         } catch (UnknownHostException e) {
-          return ip;
+            return ip;
         }
-      };
+    };
 
-  private final Request request;
-  private final HostAndPort hostAndPort;
+    private final Request request;
+    private final HostAndPort hostAndPort;
 
-  RequestURIAdapterAdapter(Request request) {
-    this.request = request;
-    this.hostAndPort = request.getLocalAddress();
-  }
+    RequestURIAdapterAdapter(Request request) {
+        this.request = request;
+        this.hostAndPort = request.getLocalAddress();
+    }
 
-  @Override
-  public String scheme() {
-    return hostAndPort.getPort() == 443 ? "https" : "http";
-  }
+    @Override
+    public String scheme() {
+        return hostAndPort.getPort() == 443 ? "https" : "http";
+    }
 
-  @Override
-  public String host() {
-    // this is a local address, so not too worried about this blowing up
-    return DOMAIN_NAME_MAPPING.computeIfAbsent(hostAndPort.getHost(), GET_CANONICAL_NAME);
-  }
+    @Override
+    public String host() {
+        // this is a local address, so not too worried about this blowing up
+        return DOMAIN_NAME_MAPPING.computeIfAbsent(hostAndPort.getHost(), GET_CANONICAL_NAME);
+    }
 
-  @Override
-  public int port() {
-    return hostAndPort.getPort();
-  }
+    @Override
+    public int port() {
+        return hostAndPort.getPort();
+    }
 
-  @Override
-  public String path() {
-    return request.getPath();
-  }
+    @Override
+    public String path() {
+        return request.getPath();
+    }
 
-  @Override
-  public String fragment() {
-    return null;
-  }
+    @Override
+    public String fragment() {
+        return null;
+    }
 
-  @Override
-  public String query() {
-    return request.getQuery();
-  }
+    @Override
+    public String query() {
+        return request.getQuery();
+    }
 
-  @Override
-  public boolean supportsRaw() {
-    return false;
-  }
+    @Override
+    public boolean supportsRaw() {
+        return false;
+    }
 
-  @Override
-  public String rawPath() {
-    return null;
-  }
+    @Override
+    public String rawPath() {
+        return null;
+    }
 
-  @Override
-  public String rawQuery() {
-    return null;
-  }
+    @Override
+    public String rawQuery() {
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java
index 28a02619416..dcc753a2b60 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java
@@ -13,28 +13,28 @@
 
 @AutoService(InstrumenterModule.class)
 public class ServerErrorHandlerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public ServerErrorHandlerInstrumentation() {
-    super("ratpack");
-  }
+    public ServerErrorHandlerInstrumentation() {
+        super("ratpack");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "ratpack.error.ServerErrorHandler";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "ratpack.error.ServerErrorHandler";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return concreteClass().and(implementsInterface(named(hierarchyMarkerType())));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return concreteClass().and(implementsInterface(named(hierarchyMarkerType())));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("error")
-            .and(takesArgument(0, named("ratpack.handling.Context")))
-            .and(takesArgument(1, Throwable.class)),
-        packageName + ".ErrorHandlerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("error")
+                        .and(takesArgument(0, named("ratpack.handling.Context")))
+                        .and(takesArgument(1, Throwable.class)),
+                packageName + ".ErrorHandlerAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerRegistryAdvice.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerRegistryAdvice.java
index 24425d80eeb..5c26102cc98 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerRegistryAdvice.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerRegistryAdvice.java
@@ -5,10 +5,10 @@
 import ratpack.registry.Registry;
 
 public class ServerRegistryAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void injectTracing(@Advice.Return(readOnly = false) Registry registry) {
-    registry =
-        registry.join(
-            Registry.builder().add(HandlerDecorator.prepend(TracingHandler.INSTANCE)).build());
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void injectTracing(@Advice.Return(readOnly = false) Registry registry) {
+        registry = registry.join(Registry.builder()
+                .add(HandlerDecorator.prepend(TracingHandler.INSTANCE))
+                .build());
+    }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerRegistryInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerRegistryInstrumentation.java
index 89a10f2fd60..701bec695dd 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerRegistryInstrumentation.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerRegistryInstrumentation.java
@@ -10,21 +10,20 @@
 
 @AutoService(InstrumenterModule.class)
 public class ServerRegistryInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ServerRegistryInstrumentation() {
-    super("ratpack");
-  }
+    public ServerRegistryInstrumentation() {
+        super("ratpack");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "ratpack.server.internal.ServerRegistry";
-  }
+    @Override
+    public String instrumentedType() {
+        return "ratpack.server.internal.ServerRegistry";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isStatic()).and(named("buildBaseRegistry")),
-        packageName + ".ServerRegistryAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isStatic()).and(named("buildBaseRegistry")), packageName + ".ServerRegistryAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TokenPathBinderInspector.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TokenPathBinderInspector.java
index 1708f05c226..3cc7bf6a22a 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TokenPathBinderInspector.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TokenPathBinderInspector.java
@@ -6,23 +6,23 @@
 import ratpack.path.internal.TokenPathBinder;
 
 public class TokenPathBinderInspector {
-  private static final Field TOKEN_NAMES_FIELD;
+    private static final Field TOKEN_NAMES_FIELD;
 
-  static {
-    try {
-      TOKEN_NAMES_FIELD = TokenPathBinder.class.getDeclaredField("tokenNames");
-      TOKEN_NAMES_FIELD.setAccessible(true);
-    } catch (NoSuchFieldException e) {
-      throw new UndeclaredThrowableException(e);
+    static {
+        try {
+            TOKEN_NAMES_FIELD = TokenPathBinder.class.getDeclaredField("tokenNames");
+            TOKEN_NAMES_FIELD.setAccessible(true);
+        } catch (NoSuchFieldException e) {
+            throw new UndeclaredThrowableException(e);
+        }
     }
-  }
 
-  public static boolean hasTokenNames(TokenPathBinder binder) {
-    try {
-      Collection<?> tokenNames = (Collection<?>) TOKEN_NAMES_FIELD.get(binder);
-      return !tokenNames.isEmpty();
-    } catch (IllegalAccessException e) {
-      throw new UndeclaredThrowableException(e);
+    public static boolean hasTokenNames(TokenPathBinder binder) {
+        try {
+            Collection<?> tokenNames = (Collection<?>) TOKEN_NAMES_FIELD.get(binder);
+            return !tokenNames.isEmpty();
+        } catch (IllegalAccessException e) {
+            throw new UndeclaredThrowableException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java
index 7c5ad8b19b2..15d95ee8457 100644
--- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java
+++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java
@@ -19,59 +19,57 @@
 import ratpack.util.Types;
 
 public final class TracingHandler implements Handler {
-  public static Handler INSTANCE = new TracingHandler();
+    public static Handler INSTANCE = new TracingHandler();
 
-  private static final TypeToken<Flow.Action.RequestBlockingAction> RBA_CLASS_TOKEN =
-      Types.token(Flow.Action.RequestBlockingAction.class);
+    private static final TypeToken<Flow.Action.RequestBlockingAction> RBA_CLASS_TOKEN =
+            Types.token(Flow.Action.RequestBlockingAction.class);
 
-  /** This constant must stay in sync with datadog.trace.instrumentation.netty41.AttributeKeys. */
-  public static final AttributeKey<datadog.context.Context> SERVER_CONTEXT_ATTRIBUTE_KEY =
-      AttributeKey.valueOf(DD_CONTEXT_ATTRIBUTE);
+    /** This constant must stay in sync with datadog.trace.instrumentation.netty41.AttributeKeys. */
+    public static final AttributeKey<datadog.context.Context> SERVER_CONTEXT_ATTRIBUTE_KEY =
+            AttributeKey.valueOf(DD_CONTEXT_ATTRIBUTE);
 
-  @Override
-  public void handle(final Context ctx) {
-    final Request request = ctx.getRequest();
+    @Override
+    public void handle(final Context ctx) {
+        final Request request = ctx.getRequest();
 
-    final Attribute<datadog.context.Context> contextAttribute =
-        ctx.getDirectChannelAccess().getChannel().attr(SERVER_CONTEXT_ATTRIBUTE_KEY);
-    final datadog.context.Context nettyContext = contextAttribute.get();
-    final AgentSpan nettySpan = nettyContext != null ? fromContext(nettyContext) : null;
+        final Attribute<datadog.context.Context> contextAttribute =
+                ctx.getDirectChannelAccess().getChannel().attr(SERVER_CONTEXT_ATTRIBUTE_KEY);
+        final datadog.context.Context nettyContext = contextAttribute.get();
+        final AgentSpan nettySpan = nettyContext != null ? fromContext(nettyContext) : null;
 
-    // Relying on executor instrumentation to assume the netty span is in context as the parent.
-    final AgentSpan ratpackSpan = startSpan("ratpack", DECORATE.spanName()).setMeasured(true);
-    DECORATE.afterStart(ratpackSpan);
-    DECORATE.onRequest(ratpackSpan, request, request, root());
-    ctx.getExecution().add(ratpackSpan);
+        // Relying on executor instrumentation to assume the netty span is in context as the parent.
+        final AgentSpan ratpackSpan = startSpan("ratpack", DECORATE.spanName()).setMeasured(true);
+        DECORATE.afterStart(ratpackSpan);
+        DECORATE.onRequest(ratpackSpan, request, request, root());
+        ctx.getExecution().add(ratpackSpan);
 
-    boolean setFinalizer = false;
+        boolean setFinalizer = false;
 
-    try (final ContextScope scope = activateSpan(ratpackSpan)) {
+        try (final ContextScope scope = activateSpan(ratpackSpan)) {
 
-      ctx.getResponse()
-          .beforeSend(
-              response -> {
+            ctx.getResponse().beforeSend(response -> {
                 try (final ContextScope ignored = activateSpan(ratpackSpan)) {
-                  if (nettySpan != null) {
-                    // Rename the netty span resource name with the ratpack route.
-                    DECORATE.onContext(nettySpan, ctx);
-                  }
-                  DECORATE.onResponse(ratpackSpan, response);
-                  DECORATE.onContext(ratpackSpan, ctx);
-                  DECORATE.beforeFinish(ratpackSpan);
-                  ratpackSpan.finish();
+                    if (nettySpan != null) {
+                        // Rename the netty span resource name with the ratpack route.
+                        DECORATE.onContext(nettySpan, ctx);
+                    }
+                    DECORATE.onResponse(ratpackSpan, response);
+                    DECORATE.onContext(ratpackSpan, ctx);
+                    DECORATE.beforeFinish(ratpackSpan);
+                    ratpackSpan.finish();
                 }
-              });
+            });
 
-      setFinalizer = true;
+            setFinalizer = true;
 
-      ctx.next();
-    } catch (final Throwable e) {
-      DECORATE.onError(ratpackSpan, e);
-      DECORATE.beforeFinish(ratpackSpan);
-      if (!setFinalizer) {
-        ratpackSpan.finish();
-      }
-      throw e;
+            ctx.next();
+        } catch (final Throwable e) {
+            DECORATE.onError(ratpackSpan, e);
+            DECORATE.beforeFinish(ratpackSpan);
+            if (!setFinalizer) {
+                ratpackSpan.finish();
+            }
+            throw e;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/PublisherInstrumentation.java b/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/PublisherInstrumentation.java
index 9a293319be1..a1002208999 100644
--- a/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/PublisherInstrumentation.java
+++ b/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/PublisherInstrumentation.java
@@ -25,46 +25,45 @@
  * Publisher#subscribe(Subscriber)} is called. The state is then stored and will be used to
  * eventually propagate on the downstream signals.
  */
-public class PublisherInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+public class PublisherInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.reactivestreams.Publisher";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named("org.reactivestreams.Publisher"));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.reactivestreams.Publisher";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(not(isStatic()))
-            .and(named("subscribe"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, hasInterface(named("org.reactivestreams.Subscriber")))),
-        getClass().getName() + "$PublisherSubscribeAdvice");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named("org.reactivestreams.Publisher"));
+    }
 
-  public static class PublisherSubscribeAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onSubscribe(
-        @Advice.This final Publisher self, @Advice.Argument(value = 0) final Subscriber s) {
-      return ReactiveStreamsContextPropagation.captureOnSubscribe(
-          self,
-          s,
-          InstrumentationContext.get(Publisher.class, HandoffContext.class),
-          InstrumentationContext.get(Subscriber.class, Context.class));
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(not(isStatic()))
+                        .and(named("subscribe"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, hasInterface(named("org.reactivestreams.Subscriber")))),
+                getClass().getName() + "$PublisherSubscribeAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterSubscribe(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    public static class PublisherSubscribeAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onSubscribe(
+                @Advice.This final Publisher self, @Advice.Argument(value = 0) final Subscriber s) {
+            return ReactiveStreamsContextPropagation.captureOnSubscribe(
+                    self,
+                    s,
+                    InstrumentationContext.get(Publisher.class, HandoffContext.class),
+                    InstrumentationContext.get(Subscriber.class, Context.class));
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterSubscribe(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsAsyncResultExtension.java b/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsAsyncResultExtension.java
index ea4bd12d61d..a91ead5d64c 100644
--- a/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsAsyncResultExtension.java
+++ b/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsAsyncResultExtension.java
@@ -9,100 +9,100 @@
 import org.reactivestreams.Subscription;
 
 public class ReactiveStreamsAsyncResultExtension implements AsyncResultExtension, EagerHelper {
-  static {
-    AsyncResultExtensions.register(new ReactiveStreamsAsyncResultExtension());
-  }
-
-  /**
-   * Register the extension as an {@link AsyncResultExtension} using static class initialization.
-   * <br>
-   * It uses an empty static method call to ensure the class loading and the one-time-only static
-   * class initialization. This will ensure this extension will only be registered once under {@link
-   * AsyncResultExtensions}.
-   */
-  public static void init() {}
-
-  @Override
-  public boolean supports(Class<?> result) {
-    boolean ret = result == Publisher.class;
-    return ret;
-  }
-
-  @Override
-  public Object apply(Object result, AgentSpan span) {
-    if (result != null) {
-      // the span will be closed then the subscriber span will finish.
-      return new WrappedPublisher<>((Publisher<?>) result, span);
+    static {
+        AsyncResultExtensions.register(new ReactiveStreamsAsyncResultExtension());
     }
-    return null;
-  }
 
-  private static class WrappedPublisher<T> implements Publisher<T> {
-    private final Publisher<T> delegate;
-    private final AgentSpan span;
-
-    public WrappedPublisher(Publisher<T> delegate, AgentSpan span) {
-      this.delegate = delegate;
-      this.span = span;
-    }
+    /**
+     * Register the extension as an {@link AsyncResultExtension} using static class initialization.
+     * <br>
+     * It uses an empty static method call to ensure the class loading and the one-time-only static
+     * class initialization. This will ensure this extension will only be registered once under {@link
+     * AsyncResultExtensions}.
+     */
+    public static void init() {}
 
     @Override
-    public void subscribe(Subscriber<? super T> s) {
-      this.delegate.subscribe(new WrappedSubscriber<>(s, this.span));
-    }
-  }
-
-  private static class WrappedSubscriber<T> implements Subscriber<T> {
-    private final Subscriber<T> delegate;
-    private final AgentSpan span;
-
-    public WrappedSubscriber(Subscriber<T> delegate, AgentSpan span) {
-      this.delegate = delegate;
-      this.span = span;
+    public boolean supports(Class<?> result) {
+        boolean ret = result == Publisher.class;
+        return ret;
     }
 
     @Override
-    public void onSubscribe(Subscription s) {
-      this.delegate.onSubscribe(new WrappedSubscription(s, this.span));
+    public Object apply(Object result, AgentSpan span) {
+        if (result != null) {
+            // the span will be closed then the subscriber span will finish.
+            return new WrappedPublisher<>((Publisher<?>) result, span);
+        }
+        return null;
     }
 
-    @Override
-    public void onNext(T t) {
-      this.delegate.onNext(t);
-    }
+    private static class WrappedPublisher<T> implements Publisher<T> {
+        private final Publisher<T> delegate;
+        private final AgentSpan span;
 
-    @Override
-    public void onError(Throwable t) {
-      this.span.addThrowable(t);
-      this.span.finish();
-      this.delegate.onError(t);
-    }
+        public WrappedPublisher(Publisher<T> delegate, AgentSpan span) {
+            this.delegate = delegate;
+            this.span = span;
+        }
 
-    @Override
-    public void onComplete() {
-      this.span.finish();
-      this.delegate.onComplete();
+        @Override
+        public void subscribe(Subscriber<? super T> s) {
+            this.delegate.subscribe(new WrappedSubscriber<>(s, this.span));
+        }
     }
-  }
 
-  private static class WrappedSubscription implements Subscription {
-    private final Subscription delegate;
-    private final AgentSpan span;
-
-    public WrappedSubscription(Subscription delegate, AgentSpan span) {
-      this.delegate = delegate;
-      this.span = span;
+    private static class WrappedSubscriber<T> implements Subscriber<T> {
+        private final Subscriber<T> delegate;
+        private final AgentSpan span;
+
+        public WrappedSubscriber(Subscriber<T> delegate, AgentSpan span) {
+            this.delegate = delegate;
+            this.span = span;
+        }
+
+        @Override
+        public void onSubscribe(Subscription s) {
+            this.delegate.onSubscribe(new WrappedSubscription(s, this.span));
+        }
+
+        @Override
+        public void onNext(T t) {
+            this.delegate.onNext(t);
+        }
+
+        @Override
+        public void onError(Throwable t) {
+            this.span.addThrowable(t);
+            this.span.finish();
+            this.delegate.onError(t);
+        }
+
+        @Override
+        public void onComplete() {
+            this.span.finish();
+            this.delegate.onComplete();
+        }
     }
 
-    @Override
-    public void request(long n) {
-      delegate.request(n);
-    }
-
-    @Override
-    public void cancel() {
-      span.finish();
-      delegate.cancel();
+    private static class WrappedSubscription implements Subscription {
+        private final Subscription delegate;
+        private final AgentSpan span;
+
+        public WrappedSubscription(Subscription delegate, AgentSpan span) {
+            this.delegate = delegate;
+            this.span = span;
+        }
+
+        @Override
+        public void request(long n) {
+            delegate.request(n);
+        }
+
+        @Override
+        public void cancel() {
+            span.finish();
+            delegate.cancel();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsContextPropagation.java b/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsContextPropagation.java
index b7053fea6f8..8557545ef7e 100644
--- a/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsContextPropagation.java
+++ b/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsContextPropagation.java
@@ -9,52 +9,52 @@
 
 public final class ReactiveStreamsContextPropagation {
 
-  private ReactiveStreamsContextPropagation() {}
-
-  public static ContextScope captureOnSubscribe(
-      final Publisher<?> publisher,
-      final Subscriber<?> subscriber,
-      final ContextStore<Publisher, HandoffContext> publisherContexts,
-      final ContextStore<Subscriber, Context> subscriberContexts) {
-    // Don't consume the publisher context until we've verified the subscriber is non-null. For
-    // subscribe(null), Reactive Streams mandates an NPE after this advice returns. Consuming the
-    // context earlier would incorrectly discard it.
-    if (subscriber == null) {
-      return null;
+    private ReactiveStreamsContextPropagation() {}
+
+    public static ContextScope captureOnSubscribe(
+            final Publisher<?> publisher,
+            final Subscriber<?> subscriber,
+            final ContextStore<Publisher, HandoffContext> publisherContexts,
+            final ContextStore<Subscriber, Context> subscriberContexts) {
+        // Don't consume the publisher context until we've verified the subscriber is non-null. For
+        // subscribe(null), Reactive Streams mandates an NPE after this advice returns. Consuming the
+        // context earlier would incorrectly discard it.
+        if (subscriber == null) {
+            return null;
+        }
+
+        final HandoffContext handoff = publisherContexts.remove(publisher);
+        final Context contextFromPublisher = handoff == null ? null : handoff.contextForCurrentThread();
+        final Context activeContext = Context.current();
+        final Context context = contextFromPublisher != null ? contextFromPublisher : activeContext;
+        if (context == Context.root()) {
+            return null;
+        }
+
+        final Context subscriberContext = subscriberContexts.getOrPut(subscriber, context);
+        // A context captured on the publisher (cross-thread propagation) must win even when the
+        // current thread already carries a non-root active context.
+        return attachIfRequired(subscriberContext, activeContext);
     }
 
-    final HandoffContext handoff = publisherContexts.remove(publisher);
-    final Context contextFromPublisher = handoff == null ? null : handoff.contextForCurrentThread();
-    final Context activeContext = Context.current();
-    final Context context = contextFromPublisher != null ? contextFromPublisher : activeContext;
-    if (context == Context.root()) {
-      return null;
+    public static ContextScope activateOnSignal(
+            final Subscriber<?> subscriber, final ContextStore<Subscriber, Context> subscriberContexts) {
+        final Context activeContext = Context.current();
+        if (activeContext != Context.root()) {
+            return null;
+        }
+        return attachIfRequired(subscriberContexts.get(subscriber), activeContext);
     }
 
-    final Context subscriberContext = subscriberContexts.getOrPut(subscriber, context);
-    // A context captured on the publisher (cross-thread propagation) must win even when the
-    // current thread already carries a non-root active context.
-    return attachIfRequired(subscriberContext, activeContext);
-  }
-
-  public static ContextScope activateOnSignal(
-      final Subscriber<?> subscriber, final ContextStore<Subscriber, Context> subscriberContexts) {
-    final Context activeContext = Context.current();
-    if (activeContext != Context.root()) {
-      return null;
+    public static ContextScope activateOnComplete(
+            final Subscriber<?> subscriber, final ContextStore<Subscriber, Context> subscriberContexts) {
+        return attachIfRequired(subscriberContexts.get(subscriber), Context.current());
     }
-    return attachIfRequired(subscriberContexts.get(subscriber), activeContext);
-  }
 
-  public static ContextScope activateOnComplete(
-      final Subscriber<?> subscriber, final ContextStore<Subscriber, Context> subscriberContexts) {
-    return attachIfRequired(subscriberContexts.get(subscriber), Context.current());
-  }
-
-  private static ContextScope attachIfRequired(final Context context, final Context activeContext) {
-    if (context == null || context == activeContext || context == Context.root()) {
-      return null;
+    private static ContextScope attachIfRequired(final Context context, final Context activeContext) {
+        if (context == null || context == activeContext || context == Context.root()) {
+            return null;
+        }
+        return context.attach();
     }
-    return context.attach();
-  }
 }
diff --git a/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsModule.java b/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsModule.java
index 9749b838254..1f0ac9f83eb 100644
--- a/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsModule.java
+++ b/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsModule.java
@@ -13,31 +13,31 @@
 
 @AutoService(InstrumenterModule.class)
 public final class ReactiveStreamsModule extends InstrumenterModule.ContextTracking {
-  public ReactiveStreamsModule() {
-    super("reactive-streams", "reactive-streams-1");
-  }
+    public ReactiveStreamsModule() {
+        super("reactive-streams", "reactive-streams-1");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ReactiveStreamsContextPropagation",
-      packageName + ".ReactiveStreamsAsyncResultExtension",
-      packageName + ".ReactiveStreamsAsyncResultExtension$WrappedPublisher",
-      packageName + ".ReactiveStreamsAsyncResultExtension$WrappedSubscriber",
-      packageName + ".ReactiveStreamsAsyncResultExtension$WrappedSubscription",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ReactiveStreamsContextPropagation",
+            packageName + ".ReactiveStreamsAsyncResultExtension",
+            packageName + ".ReactiveStreamsAsyncResultExtension$WrappedPublisher",
+            packageName + ".ReactiveStreamsAsyncResultExtension$WrappedSubscriber",
+            packageName + ".ReactiveStreamsAsyncResultExtension$WrappedSubscription",
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    final Map<String, String> store = new HashMap<>();
-    store.put("org.reactivestreams.Subscriber", Context.class.getName());
-    store.put("org.reactivestreams.Publisher", HandoffContext.class.getName());
-    return store;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        final Map<String, String> store = new HashMap<>();
+        store.put("org.reactivestreams.Subscriber", Context.class.getName());
+        store.put("org.reactivestreams.Publisher", HandoffContext.class.getName());
+        return store;
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(new PublisherInstrumentation(), new SubscriberInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(new PublisherInstrumentation(), new SubscriberInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/SubscriberInstrumentation.java b/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/SubscriberInstrumentation.java
index 6d0d27fe440..568e2f054fa 100644
--- a/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/SubscriberInstrumentation.java
+++ b/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/SubscriberInstrumentation.java
@@ -19,66 +19,64 @@
  * This instrumentation is responsible for propagating the state on the downstream signals (onNext,
  * onError, onComplete).
  */
-public class SubscriberInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+public class SubscriberInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("onNext", "onError")),
-        getClass().getName() + "$SubscriberDownStreamAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("onComplete")), getClass().getName() + "$SubscriberCompleteAdvice");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.reactivestreams.Subscriber";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return HierarchyMatchers.implementsInterface(NameMatchers.named(hierarchyMarkerType()));
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("onNext", "onError")), getClass().getName() + "$SubscriberDownStreamAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("onComplete")), getClass().getName() + "$SubscriberCompleteAdvice");
+    }
 
-  /**
-   * This advice propagate the downstream signals onNext and onError. The context on reactor is
-   * propagating bottom up, but we can have processing pipelines that wants to propagate the state
-   * downstream (i.e. state coming from the source). For this reason we allow to let the active
-   * context propagate downstream if any. If missing, we'll use the one captured on subscribe.
-   */
-  public static class SubscriberDownStreamAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(@Advice.This final Subscriber self) {
-      return ReactiveStreamsContextPropagation.activateOnSignal(
-          self, InstrumentationContext.get(Subscriber.class, Context.class));
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.reactivestreams.Subscriber";
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return HierarchyMatchers.implementsInterface(NameMatchers.named(hierarchyMarkerType()));
     }
-  }
 
-  /**
-   * Propagates the context captured onSubscribe when the onComplete method is called. We do not let
-   * to propagate the active context if different from the context captured on subscribe because we
-   * need to ensure that late subscriptions that kicks onComplete have the right context.
-   */
-  public static class SubscriberCompleteAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(@Advice.This final Subscriber self) {
-      return ReactiveStreamsContextPropagation.activateOnComplete(
-          self, InstrumentationContext.get(Subscriber.class, Context.class));
+    /**
+     * This advice propagate the downstream signals onNext and onError. The context on reactor is
+     * propagating bottom up, but we can have processing pipelines that wants to propagate the state
+     * downstream (i.e. state coming from the source). For this reason we allow to let the active
+     * context propagate downstream if any. If missing, we'll use the one captured on subscribe.
+     */
+    public static class SubscriberDownStreamAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(@Advice.This final Subscriber self) {
+            return ReactiveStreamsContextPropagation.activateOnSignal(
+                    self, InstrumentationContext.get(Subscriber.class, Context.class));
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    /**
+     * Propagates the context captured onSubscribe when the onComplete method is called. We do not let
+     * to propagate the active context if different from the context captured on subscribe because we
+     * need to ensure that late subscriptions that kicks onComplete have the right context.
+     */
+    public static class SubscriberCompleteAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(@Advice.This final Subscriber self) {
+            return ReactiveStreamsContextPropagation.activateOnComplete(
+                    self, InstrumentationContext.get(Subscriber.class, Context.class));
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/reactive-streams-1.0/src/test/java/annotatedsample/ReactiveStreamsTracedMethods.java b/dd-java-agent/instrumentation/reactive-streams-1.0/src/test/java/annotatedsample/ReactiveStreamsTracedMethods.java
index 68713f90cdc..760e9af1075 100644
--- a/dd-java-agent/instrumentation/reactive-streams-1.0/src/test/java/annotatedsample/ReactiveStreamsTracedMethods.java
+++ b/dd-java-agent/instrumentation/reactive-streams-1.0/src/test/java/annotatedsample/ReactiveStreamsTracedMethods.java
@@ -9,99 +9,97 @@
 import org.reactivestreams.Subscription;
 
 public class ReactiveStreamsTracedMethods {
-  @WithSpan
-  public static Publisher<String> traceAsyncPublisher(CountDownLatch latch) {
-    return TestPublisher.ofComplete(latch, "hello");
-  }
-
-  @WithSpan
-  public static Publisher<String> traceAsyncFailingPublisher(
-      CountDownLatch latch, Throwable throwable) {
-    return TestPublisher.ofFailing(latch, throwable);
-  }
-
-  @WithSpan
-  public static Publisher<String> traceNestedAsyncPublisher(CountDownLatch latch) {
-    return traceAsyncPublisher(latch);
-  }
-
-  public static class TestPublisher implements Publisher<String> {
-    private final CountDownLatch latch;
-    private final String element;
-    private final Throwable error;
-
-    private TestPublisher(CountDownLatch latch, String element, Throwable error) {
-      this.latch = latch;
-      this.element = element;
-      this.error = error;
+    @WithSpan
+    public static Publisher<String> traceAsyncPublisher(CountDownLatch latch) {
+        return TestPublisher.ofComplete(latch, "hello");
     }
 
-    public static TestPublisher ofComplete(CountDownLatch latch, String element) {
-      return new TestPublisher(latch, element, null);
+    @WithSpan
+    public static Publisher<String> traceAsyncFailingPublisher(CountDownLatch latch, Throwable throwable) {
+        return TestPublisher.ofFailing(latch, throwable);
     }
 
-    public static TestPublisher ofFailing(CountDownLatch latch, Throwable error) {
-      return new TestPublisher(latch, null, error);
+    @WithSpan
+    public static Publisher<String> traceNestedAsyncPublisher(CountDownLatch latch) {
+        return traceAsyncPublisher(latch);
     }
 
-    @Override
-    public void subscribe(Subscriber<? super String> s) {
-      try {
-        if (!this.latch.await(5, SECONDS)) {
-          throw new IllegalStateException("Latch still locked");
+    public static class TestPublisher implements Publisher<String> {
+        private final CountDownLatch latch;
+        private final String element;
+        private final Throwable error;
+
+        private TestPublisher(CountDownLatch latch, String element, Throwable error) {
+            this.latch = latch;
+            this.element = element;
+            this.error = error;
         }
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-        throw new RuntimeException(e);
-      }
-
-      s.onSubscribe(
-          new Subscription() {
-            @Override
-            public void request(long n) {
-              if (error != null) {
-                s.onError(error);
-              } else {
-                s.onNext(element);
-                s.onComplete();
-              }
-            }
 
-            @Override
-            public void cancel() {}
-          });
-    }
-  }
+        public static TestPublisher ofComplete(CountDownLatch latch, String element) {
+            return new TestPublisher(latch, element, null);
+        }
 
-  public static class ConsumerSubscriber<T> implements Subscriber<T> {
-    @Override
-    public void onSubscribe(Subscription s) {
-      s.request(1);
+        public static TestPublisher ofFailing(CountDownLatch latch, Throwable error) {
+            return new TestPublisher(latch, null, error);
+        }
+
+        @Override
+        public void subscribe(Subscriber<? super String> s) {
+            try {
+                if (!this.latch.await(5, SECONDS)) {
+                    throw new IllegalStateException("Latch still locked");
+                }
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new RuntimeException(e);
+            }
+
+            s.onSubscribe(new Subscription() {
+                @Override
+                public void request(long n) {
+                    if (error != null) {
+                        s.onError(error);
+                    } else {
+                        s.onNext(element);
+                        s.onComplete();
+                    }
+                }
+
+                @Override
+                public void cancel() {}
+            });
+        }
     }
 
-    @Override
-    public void onNext(T t) {}
+    public static class ConsumerSubscriber<T> implements Subscriber<T> {
+        @Override
+        public void onSubscribe(Subscription s) {
+            s.request(1);
+        }
 
-    @Override
-    public void onError(Throwable t) {}
+        @Override
+        public void onNext(T t) {}
 
-    @Override
-    public void onComplete() {}
-  }
+        @Override
+        public void onError(Throwable t) {}
 
-  public static class CancellerSubscriber<T> implements Subscriber<T> {
-    @Override
-    public void onSubscribe(Subscription s) {
-      s.cancel();
+        @Override
+        public void onComplete() {}
     }
 
-    @Override
-    public void onNext(T t) {}
+    public static class CancellerSubscriber<T> implements Subscriber<T> {
+        @Override
+        public void onSubscribe(Subscription s) {
+            s.cancel();
+        }
+
+        @Override
+        public void onNext(T t) {}
 
-    @Override
-    public void onError(Throwable t) {}
+        @Override
+        public void onError(Throwable t) {}
 
-    @Override
-    public void onComplete() {}
-  }
+        @Override
+        public void onComplete() {}
+    }
 }
diff --git a/dd-java-agent/instrumentation/reactive-streams-1.0/src/test/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsContextPropagationTest.java b/dd-java-agent/instrumentation/reactive-streams-1.0/src/test/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsContextPropagationTest.java
index ab99ae9c3ae..d462deacdde 100644
--- a/dd-java-agent/instrumentation/reactive-streams-1.0/src/test/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsContextPropagationTest.java
+++ b/dd-java-agent/instrumentation/reactive-streams-1.0/src/test/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsContextPropagationTest.java
@@ -19,176 +19,171 @@
 
 class ReactiveStreamsContextPropagationTest {
 
-  private static final ContextKey<String> KEY = ContextKey.named("reactive-streams-test");
-
-  @Test
-  void publisherCapturedContextOverridesActiveContext() {
-    final Publisher<Object> publisher = subscriber -> {};
-    final Subscriber<Object> subscriber = new NoopSubscriber();
-    final ContextStore<Publisher, HandoffContext> publisherContexts = new MapContextStore<>();
-    final ContextStore<Subscriber, Context> subscriberContexts = new MapContextStore<>();
-
-    // A context was handed off on the publisher, confined to this (the producing) thread.
-    final Context captured = Context.root().with(KEY, "captured");
-    publisherContexts.put(publisher, HandoffContext.threadConfined(captured));
-
-    // The current thread already carries a different, non-root active context.
-    final Context active = Context.root().with(KEY, "active");
-    try (ContextScope activeScope = active.attach()) {
-      assertSame(active, Context.current());
-
-      final ContextScope scope =
-          ReactiveStreamsContextPropagation.captureOnSubscribe(
-              publisher, subscriber, publisherContexts, subscriberContexts);
-      try {
-        // The captured context must win over the ambient active one
-        assertNotNull(scope, "captured context should be attached over the active context");
-        assertSame(captured, Context.current());
-      } finally {
-        if (scope != null) {
-          scope.close();
+    private static final ContextKey<String> KEY = ContextKey.named("reactive-streams-test");
+
+    @Test
+    void publisherCapturedContextOverridesActiveContext() {
+        final Publisher<Object> publisher = subscriber -> {};
+        final Subscriber<Object> subscriber = new NoopSubscriber();
+        final ContextStore<Publisher, HandoffContext> publisherContexts = new MapContextStore<>();
+        final ContextStore<Subscriber, Context> subscriberContexts = new MapContextStore<>();
+
+        // A context was handed off on the publisher, confined to this (the producing) thread.
+        final Context captured = Context.root().with(KEY, "captured");
+        publisherContexts.put(publisher, HandoffContext.threadConfined(captured));
+
+        // The current thread already carries a different, non-root active context.
+        final Context active = Context.root().with(KEY, "active");
+        try (ContextScope activeScope = active.attach()) {
+            assertSame(active, Context.current());
+
+            final ContextScope scope = ReactiveStreamsContextPropagation.captureOnSubscribe(
+                    publisher, subscriber, publisherContexts, subscriberContexts);
+            try {
+                // The captured context must win over the ambient active one
+                assertNotNull(scope, "captured context should be attached over the active context");
+                assertSame(captured, Context.current());
+            } finally {
+                if (scope != null) {
+                    scope.close();
+                }
+            }
+
+            // Closing the scope restores the previously active context.
+            assertSame(active, Context.current());
         }
-      }
 
-      // Closing the scope restores the previously active context.
-      assertSame(active, Context.current());
+        // The captured context is remembered for the subscriber, and consumed from the publisher store.
+        assertSame(captured, subscriberContexts.get(subscriber));
+        assertNull(publisherContexts.get(publisher));
     }
 
-    // The captured context is remembered for the subscriber, and consumed from the publisher store.
-    assertSame(captured, subscriberContexts.get(subscriber));
-    assertNull(publisherContexts.get(publisher));
-  }
-
-  @Test
-  void publisherContextFromAnotherThreadIsIgnored() throws InterruptedException {
-    // A thread-confined deposit from another thread (concurrent multicast subscribe) must be
-    // ignored.
-    final Publisher<Object> publisher = subscriber -> {};
-    final Subscriber<Object> subscriber = new NoopSubscriber();
-    final ContextStore<Publisher, HandoffContext> publisherContexts = new MapContextStore<>();
-    final ContextStore<Subscriber, Context> subscriberContexts = new MapContextStore<>();
-
-    final Context foreign = Context.root().with(KEY, "foreign");
-    final Thread producer =
-        new Thread(() -> publisherContexts.put(publisher, HandoffContext.threadConfined(foreign)));
-    producer.start();
-    producer.join();
-
-    final Context active = Context.root().with(KEY, "active");
-    try (ContextScope activeScope = active.attach()) {
-      final ContextScope scope =
-          ReactiveStreamsContextPropagation.captureOnSubscribe(
-              publisher, subscriber, publisherContexts, subscriberContexts);
-      if (scope != null) {
-        scope.close();
-      }
+    @Test
+    void publisherContextFromAnotherThreadIsIgnored() throws InterruptedException {
+        // A thread-confined deposit from another thread (concurrent multicast subscribe) must be
+        // ignored.
+        final Publisher<Object> publisher = subscriber -> {};
+        final Subscriber<Object> subscriber = new NoopSubscriber();
+        final ContextStore<Publisher, HandoffContext> publisherContexts = new MapContextStore<>();
+        final ContextStore<Subscriber, Context> subscriberContexts = new MapContextStore<>();
+
+        final Context foreign = Context.root().with(KEY, "foreign");
+        final Thread producer =
+                new Thread(() -> publisherContexts.put(publisher, HandoffContext.threadConfined(foreign)));
+        producer.start();
+        producer.join();
+
+        final Context active = Context.root().with(KEY, "active");
+        try (ContextScope activeScope = active.attach()) {
+            final ContextScope scope = ReactiveStreamsContextPropagation.captureOnSubscribe(
+                    publisher, subscriber, publisherContexts, subscriberContexts);
+            if (scope != null) {
+                scope.close();
+            }
+        }
+
+        // The foreign deposit is ignored; the subscriber keeps this thread's active context.
+        assertSame(active, subscriberContexts.get(subscriber));
     }
 
-    // The foreign deposit is ignored; the subscriber keeps this thread's active context.
-    assertSame(active, subscriberContexts.get(subscriber));
-  }
-
-  @Test
-  void anyThreadPublisherContextIsAdoptedAcrossThreads() throws InterruptedException {
-    // An any-thread deposit (resilience4j/spring-messaging: attached early, subscribed later) is
-    // adopted even when the subscribe runs on a different thread.
-    final Publisher<Object> publisher = subscriber -> {};
-    final Subscriber<Object> subscriber = new NoopSubscriber();
-    final ContextStore<Publisher, HandoffContext> publisherContexts = new MapContextStore<>();
-    final ContextStore<Subscriber, Context> subscriberContexts = new MapContextStore<>();
-
-    final Context captured = Context.root().with(KEY, "captured");
-    final Thread producer =
-        new Thread(() -> publisherContexts.put(publisher, HandoffContext.anyThread(captured)));
-    producer.start();
-    producer.join();
-
-    final ContextScope scope =
-        ReactiveStreamsContextPropagation.captureOnSubscribe(
-            publisher, subscriber, publisherContexts, subscriberContexts);
-    if (scope != null) {
-      scope.close();
+    @Test
+    void anyThreadPublisherContextIsAdoptedAcrossThreads() throws InterruptedException {
+        // An any-thread deposit (resilience4j/spring-messaging: attached early, subscribed later) is
+        // adopted even when the subscribe runs on a different thread.
+        final Publisher<Object> publisher = subscriber -> {};
+        final Subscriber<Object> subscriber = new NoopSubscriber();
+        final ContextStore<Publisher, HandoffContext> publisherContexts = new MapContextStore<>();
+        final ContextStore<Subscriber, Context> subscriberContexts = new MapContextStore<>();
+
+        final Context captured = Context.root().with(KEY, "captured");
+        final Thread producer = new Thread(() -> publisherContexts.put(publisher, HandoffContext.anyThread(captured)));
+        producer.start();
+        producer.join();
+
+        final ContextScope scope = ReactiveStreamsContextPropagation.captureOnSubscribe(
+                publisher, subscriber, publisherContexts, subscriberContexts);
+        if (scope != null) {
+            scope.close();
+        }
+
+        // The any-thread deposit is adopted despite the cross-thread subscribe.
+        assertSame(captured, subscriberContexts.get(subscriber));
     }
 
-    // The any-thread deposit is adopted despite the cross-thread subscribe.
-    assertSame(captured, subscriberContexts.get(subscriber));
-  }
-
-  @Test
-  void signalActivationIsSkippedWhenAnotherContextIsActive() {
-    final Subscriber<Object> subscriber = new NoopSubscriber();
-    final ContextStore<Subscriber, Context> subscriberContexts = new MapContextStore<>();
-    subscriberContexts.put(subscriber, Context.root().with(KEY, "stored"));
-
-    final Context active = Context.root().with(KEY, "active");
-    try (ContextScope activeScope = active.attach()) {
-      final ContextScope scope =
-          ReactiveStreamsContextPropagation.activateOnSignal(subscriber, subscriberContexts);
-      assertNull(scope, "must not override an already-active non-root context on a signal");
-      assertSame(active, Context.current());
+    @Test
+    void signalActivationIsSkippedWhenAnotherContextIsActive() {
+        final Subscriber<Object> subscriber = new NoopSubscriber();
+        final ContextStore<Subscriber, Context> subscriberContexts = new MapContextStore<>();
+        subscriberContexts.put(subscriber, Context.root().with(KEY, "stored"));
+
+        final Context active = Context.root().with(KEY, "active");
+        try (ContextScope activeScope = active.attach()) {
+            final ContextScope scope =
+                    ReactiveStreamsContextPropagation.activateOnSignal(subscriber, subscriberContexts);
+            assertNull(scope, "must not override an already-active non-root context on a signal");
+            assertSame(active, Context.current());
+        }
     }
-  }
-
-  @Test
-  void signalActivationAttachesStoredContextWhenIdle() {
-    final Subscriber<Object> subscriber = new NoopSubscriber();
-    final ContextStore<Subscriber, Context> subscriberContexts = new MapContextStore<>();
-    final Context stored = Context.root().with(KEY, "stored");
-    subscriberContexts.put(subscriber, stored);
-
-    final ContextScope scope =
-        ReactiveStreamsContextPropagation.activateOnSignal(subscriber, subscriberContexts);
-    try {
-      assertNotNull(scope);
-      assertSame(stored, Context.current());
-    } finally {
-      if (scope != null) {
-        scope.close();
-      }
+
+    @Test
+    void signalActivationAttachesStoredContextWhenIdle() {
+        final Subscriber<Object> subscriber = new NoopSubscriber();
+        final ContextStore<Subscriber, Context> subscriberContexts = new MapContextStore<>();
+        final Context stored = Context.root().with(KEY, "stored");
+        subscriberContexts.put(subscriber, stored);
+
+        final ContextScope scope = ReactiveStreamsContextPropagation.activateOnSignal(subscriber, subscriberContexts);
+        try {
+            assertNotNull(scope);
+            assertSame(stored, Context.current());
+        } finally {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 
-  private static final class NoopSubscriber implements Subscriber<Object> {
-    @Override
-    public void onSubscribe(final Subscription subscription) {}
+    private static final class NoopSubscriber implements Subscriber<Object> {
+        @Override
+        public void onSubscribe(final Subscription subscription) {}
 
-    @Override
-    public void onNext(final Object value) {}
+        @Override
+        public void onNext(final Object value) {}
 
-    @Override
-    public void onError(final Throwable throwable) {}
+        @Override
+        public void onError(final Throwable throwable) {}
 
-    @Override
-    public void onComplete() {}
-  }
+        @Override
+        public void onComplete() {}
+    }
 
-  private static final class MapContextStore<K, C> implements ContextStore<K, C> {
-    private final Map<K, C> map = new IdentityHashMap<>();
+    private static final class MapContextStore<K, C> implements ContextStore<K, C> {
+        private final Map<K, C> map = new IdentityHashMap<>();
 
-    @Override
-    public C get(final K key) {
-      return map.get(key);
-    }
+        @Override
+        public C get(final K key) {
+            return map.get(key);
+        }
 
-    @Override
-    public void put(final K key, final C context) {
-      map.put(key, context);
-    }
+        @Override
+        public void put(final K key, final C context) {
+            map.put(key, context);
+        }
 
-    @Override
-    public C getOrPut(final K key, final C context) {
-      final C existing = map.putIfAbsent(key, context);
-      return existing != null ? existing : context;
-    }
+        @Override
+        public C getOrPut(final K key, final C context) {
+            final C existing = map.putIfAbsent(key, context);
+            return existing != null ? existing : context;
+        }
 
-    @Override
-    public C getOrCompute(final K key, final Function<? super K, C> contextFactory) {
-      return map.computeIfAbsent(key, contextFactory);
-    }
+        @Override
+        public C getOrCompute(final K key, final Function<? super K, C> contextFactory) {
+            return map.computeIfAbsent(key, contextFactory);
+        }
 
-    @Override
-    public C remove(final K key) {
-      return map.remove(key);
+        @Override
+        public C remove(final K key) {
+            return map.remove(key);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/java/annotatedsample/ReactorTracedMethods.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/java/annotatedsample/ReactorTracedMethods.java
index a3450a31e20..7bcade869a8 100644
--- a/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/java/annotatedsample/ReactorTracedMethods.java
+++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/java/annotatedsample/ReactorTracedMethods.java
@@ -10,66 +10,62 @@
 import reactor.core.publisher.Mono;
 
 public class ReactorTracedMethods {
-  @WithSpan
-  public static Mono<String> traceAsyncMono(CountDownLatch latch) {
-    return Mono.fromCallable(
-        () -> {
-          await(latch);
-          return "hello";
+    @WithSpan
+    public static Mono<String> traceAsyncMono(CountDownLatch latch) {
+        return Mono.fromCallable(() -> {
+            await(latch);
+            return "hello";
         });
-  }
+    }
 
-  @WithSpan
-  public static Mono<String> traceAsyncFailingMono(CountDownLatch latch, Exception exception) {
-    return Mono.fromCallable(
-        () -> {
-          await(latch);
-          throw exception;
+    @WithSpan
+    public static Mono<String> traceAsyncFailingMono(CountDownLatch latch, Exception exception) {
+        return Mono.fromCallable(() -> {
+            await(latch);
+            throw exception;
         });
-  }
+    }
 
-  @WithSpan
-  public static Flux<String> traceAsyncFlux(CountDownLatch latch) {
-    return Flux.create(
-        emitter -> {
-          await(latch);
-          emitter.next("hello");
-          emitter.complete();
+    @WithSpan
+    public static Flux<String> traceAsyncFlux(CountDownLatch latch) {
+        return Flux.create(emitter -> {
+            await(latch);
+            emitter.next("hello");
+            emitter.complete();
         });
-  }
+    }
 
-  @WithSpan
-  public static Flux<String> traceAsyncFailingFlux(CountDownLatch latch, Exception exception) {
-    return Flux.create(
-        emitter -> {
-          await(latch);
-          emitter.error(exception);
+    @WithSpan
+    public static Flux<String> traceAsyncFailingFlux(CountDownLatch latch, Exception exception) {
+        return Flux.create(emitter -> {
+            await(latch);
+            emitter.error(exception);
         });
-  }
-
-  private static void await(CountDownLatch latch) {
-    try {
-      if (!latch.await(5, SECONDS)) {
-        throw new IllegalStateException("Latch still locked");
-      }
-    } catch (InterruptedException e) {
-      throw new RuntimeException(e);
     }
-  }
 
-  public static class CancelSubscriber<T> implements Subscriber<T> {
-    @Override
-    public void onSubscribe(Subscription s) {
-      s.cancel();
+    private static void await(CountDownLatch latch) {
+        try {
+            if (!latch.await(5, SECONDS)) {
+                throw new IllegalStateException("Latch still locked");
+            }
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    @Override
-    public void onNext(T t) {}
+    public static class CancelSubscriber<T> implements Subscriber<T> {
+        @Override
+        public void onSubscribe(Subscription s) {
+            s.cancel();
+        }
+
+        @Override
+        public void onNext(T t) {}
 
-    @Override
-    public void onError(Throwable t) {}
+        @Override
+        public void onError(Throwable t) {}
 
-    @Override
-    public void onComplete() {}
-  }
+        @Override
+        public void onComplete() {}
+    }
 }
diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockingPublisherInstrumentation.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockingPublisherInstrumentation.java
index 349ea7397f7..5a519f4ce7e 100644
--- a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockingPublisherInstrumentation.java
+++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockingPublisherInstrumentation.java
@@ -19,37 +19,36 @@
  * methods are called. This because the mechanism they handle this differs a bit of the standard
  * {@link Publisher#subscribe}
  */
-public class BlockingPublisherInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "reactor.core.publisher.Mono";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return hasSuperType(namedOneOf("reactor.core.publisher.Mono", "reactor.core.publisher.Flux"));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(nameStartsWith("block")), getClass().getName() + "$BlockingAdvice");
-  }
-
-  public static class BlockingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(@Advice.This final Publisher self) {
-      return ReactorContextBridge.activateForBlocking(
-          self, InstrumentationContext.get(Publisher.class, HandoffContext.class));
+public class BlockingPublisherInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "reactor.core.publisher.Mono";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return hasSuperType(namedOneOf("reactor.core.publisher.Mono", "reactor.core.publisher.Flux"));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(nameStartsWith("block")), getClass().getName() + "$BlockingAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    public static class BlockingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(@Advice.This final Publisher self) {
+            return ReactorContextBridge.activateForBlocking(
+                    self, InstrumentationContext.get(Publisher.class, HandoffContext.class));
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ContextWritingSubscriberInstrumentation.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ContextWritingSubscriberInstrumentation.java
index bd9be15cd09..5082401332d 100644
--- a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ContextWritingSubscriberInstrumentation.java
+++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ContextWritingSubscriberInstrumentation.java
@@ -22,50 +22,49 @@
  * lookup.
  */
 public class ContextWritingSubscriberInstrumentation
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "reactor.core.publisher.FluxContextWrite$ContextWriteSubscriber",
-      "reactor.core.publisher.FluxContextStart$ContextStartSubscriber",
-      "reactor.core.publisher.FluxContextWriteRestoringThreadLocals"
-          + "$ContextWriteRestoringThreadLocalsSubscriber",
-      "reactor.core.publisher.FluxContextWriteRestoringThreadLocalsFuseable"
-          + "$FuseableContextWriteRestoringThreadLocalsSubscriber",
-      "reactor.core.publisher.MonoContextWriteRestoringThreadLocals"
-          + "$ContextWriteRestoringThreadLocalsSubscriber",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureContextAdvice");
-    transformer.applyAdvice(
-        namedOneOf("onNext", "onComplete", "onError"),
-        getClass().getName() + "$ActivateContextAdvice");
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "reactor.core.publisher.FluxContextWrite$ContextWriteSubscriber",
+            "reactor.core.publisher.FluxContextStart$ContextStartSubscriber",
+            "reactor.core.publisher.FluxContextWriteRestoringThreadLocals"
+                    + "$ContextWriteRestoringThreadLocalsSubscriber",
+            "reactor.core.publisher.FluxContextWriteRestoringThreadLocalsFuseable"
+                    + "$FuseableContextWriteRestoringThreadLocalsSubscriber",
+            "reactor.core.publisher.MonoContextWriteRestoringThreadLocals"
+                    + "$ContextWriteRestoringThreadLocalsSubscriber",
+        };
+    }
 
-  public static class CaptureContextAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onConstructed(@Advice.This final CoreSubscriber<?> self) {
-      ReactorContextBridge.captureSubscriberContext(
-          self, InstrumentationContext.get(Subscriber.class, Context.class));
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureContextAdvice");
+        transformer.applyAdvice(
+                namedOneOf("onNext", "onComplete", "onError"), getClass().getName() + "$ActivateContextAdvice");
     }
-  }
 
-  public static class ActivateContextAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(@Advice.This final CoreSubscriber<?> self) {
-      return ReactorContextBridge.activateStoredContext(
-          self, InstrumentationContext.get(Subscriber.class, Context.class));
+    public static class CaptureContextAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onConstructed(@Advice.This final CoreSubscriber<?> self) {
+            ReactorContextBridge.captureSubscriberContext(
+                    self, InstrumentationContext.get(Subscriber.class, Context.class));
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    public static class ActivateContextAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(@Advice.This final CoreSubscriber<?> self) {
+            return ReactorContextBridge.activateStoredContext(
+                    self, InstrumentationContext.get(Subscriber.class, Context.class));
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/CorePublisherInstrumentation.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/CorePublisherInstrumentation.java
index 0d6053b0cd2..e66456dcb8f 100644
--- a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/CorePublisherInstrumentation.java
+++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/CorePublisherInstrumentation.java
@@ -21,53 +21,48 @@
 import org.reactivestreams.Subscriber;
 import reactor.core.CoreSubscriber;
 
-public class CorePublisherInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+public class CorePublisherInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "reactor.core.CoreSubscriber";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named("reactor.core.CorePublisher")) // from 3.1.7
-        .or(
-            hasSuperType(
-                namedOneOf(
-                    "reactor.core.publisher.Mono", "reactor.core.publisher.Flux"))); // < 3.1.7
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "reactor.core.CoreSubscriber";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("subscribe")
-            .and(not(isStatic()))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("reactor.core.CoreSubscriber"))),
-        getClass().getName() + "$PropagateContextSpanOnSubscribe");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named("reactor.core.CorePublisher")) // from 3.1.7
+                .or(hasSuperType(namedOneOf("reactor.core.publisher.Mono", "reactor.core.publisher.Flux"))); // < 3.1.7
+    }
 
-  public static class PropagateContextSpanOnSubscribe {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(
-        @Advice.This final Publisher<?> self,
-        @Advice.Argument(0) final CoreSubscriber<?> subscriber) {
-      // Hands the explicit context recorded for a context-writing subscriber to the publisher store
-      // (for the reactive-streams hand-off) and attaches it. The subscriber wrapping for
-      // context-reading operators lives in ContextReadingPublisherInstrumentation.
-      return ReactorContextBridge.captureOnSubscribe(
-          self,
-          subscriber,
-          InstrumentationContext.get(Publisher.class, HandoffContext.class),
-          InstrumentationContext.get(Subscriber.class, Context.class));
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("subscribe")
+                        .and(not(isStatic()))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("reactor.core.CoreSubscriber"))),
+                getClass().getName() + "$PropagateContextSpanOnSubscribe");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    public static class PropagateContextSpanOnSubscribe {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(
+                @Advice.This final Publisher<?> self, @Advice.Argument(0) final CoreSubscriber<?> subscriber) {
+            // Hands the explicit context recorded for a context-writing subscriber to the publisher store
+            // (for the reactive-streams hand-off) and attaches it. The subscriber wrapping for
+            // context-reading operators lives in ContextReadingPublisherInstrumentation.
+            return ReactorContextBridge.captureOnSubscribe(
+                    self,
+                    subscriber,
+                    InstrumentationContext.get(Publisher.class, HandoffContext.class),
+                    InstrumentationContext.get(Subscriber.class, Context.class));
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/OptimizableOperatorInstrumentation.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/OptimizableOperatorInstrumentation.java
index 73c963dd898..685d388b546 100644
--- a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/OptimizableOperatorInstrumentation.java
+++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/OptimizableOperatorInstrumentation.java
@@ -22,41 +22,40 @@
  * optimization are made. In particular reactor's OptimizableOperators can do subscription via a
  * loop call instead of recursion.
  */
-public class OptimizableOperatorInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+public class OptimizableOperatorInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "reactor.core.publisher.OptimizableOperator";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "reactor.core.publisher.OptimizableOperator";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("subscribeOrReturn"))
-            .and(takesArguments(1))
-            .and(returns(hasInterface(named("org.reactivestreams.Subscriber")))),
-        getClass().getName() + "$PublisherSubscribeAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("subscribeOrReturn"))
+                        .and(takesArguments(1))
+                        .and(returns(hasInterface(named("org.reactivestreams.Subscriber")))),
+                getClass().getName() + "$PublisherSubscribeAdvice");
+    }
 
-  public static class PublisherSubscribeAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onSubscribe(
-        @Advice.This final Publisher self,
-        @Advice.Argument(0) final Subscriber arg,
-        @Advice.Return final Subscriber s) {
-      ReactorContextBridge.transferToOptimizedSubscriber(
-          self,
-          arg,
-          s,
-          InstrumentationContext.get(Publisher.class, HandoffContext.class),
-          InstrumentationContext.get(Subscriber.class, Context.class));
+    public static class PublisherSubscribeAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onSubscribe(
+                @Advice.This final Publisher self,
+                @Advice.Argument(0) final Subscriber arg,
+                @Advice.Return final Subscriber s) {
+            ReactorContextBridge.transferToOptimizedSubscriber(
+                    self,
+                    arg,
+                    s,
+                    InstrumentationContext.get(Publisher.class, HandoffContext.class),
+                    InstrumentationContext.get(Subscriber.class, Context.class));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorAsyncResultExtension.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorAsyncResultExtension.java
index ab16ccac7db..b4c6b39134c 100644
--- a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorAsyncResultExtension.java
+++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorAsyncResultExtension.java
@@ -8,37 +8,37 @@
 import reactor.core.publisher.Mono;
 
 public class ReactorAsyncResultExtension implements AsyncResultExtension, EagerHelper {
-  static {
-    AsyncResultExtensions.register(new ReactorAsyncResultExtension());
-  }
+    static {
+        AsyncResultExtensions.register(new ReactorAsyncResultExtension());
+    }
 
-  /**
-   * Register the extension as an {@link AsyncResultExtension} using static class initialization.
-   * <br>
-   * It uses an empty static method call to ensure the class loading and the one-time-only static
-   * class initialization. This will ensure this extension will only be registered once under {@link
-   * AsyncResultExtensions}.
-   */
-  public static void init() {}
+    /**
+     * Register the extension as an {@link AsyncResultExtension} using static class initialization.
+     * <br>
+     * It uses an empty static method call to ensure the class loading and the one-time-only static
+     * class initialization. This will ensure this extension will only be registered once under {@link
+     * AsyncResultExtensions}.
+     */
+    public static void init() {}
 
-  @Override
-  public boolean supports(Class<?> result) {
-    return Flux.class.isAssignableFrom(result) || Mono.class.isAssignableFrom(result);
-  }
+    @Override
+    public boolean supports(Class<?> result) {
+        return Flux.class.isAssignableFrom(result) || Mono.class.isAssignableFrom(result);
+    }
 
-  @Override
-  public Object apply(Object result, AgentSpan span) {
-    if (result instanceof Flux) {
-      return ((Flux<?>) result)
-          .doOnError(span::addThrowable)
-          .doOnTerminate(span::finish)
-          .doOnCancel(span::finish);
-    } else if (result instanceof Mono) {
-      return ((Mono<?>) result)
-          .doOnError(span::addThrowable)
-          .doOnTerminate(span::finish)
-          .doOnCancel(span::finish);
+    @Override
+    public Object apply(Object result, AgentSpan span) {
+        if (result instanceof Flux) {
+            return ((Flux<?>) result)
+                    .doOnError(span::addThrowable)
+                    .doOnTerminate(span::finish)
+                    .doOnCancel(span::finish);
+        } else if (result instanceof Mono) {
+            return ((Mono<?>) result)
+                    .doOnError(span::addThrowable)
+                    .doOnTerminate(span::finish)
+                    .doOnCancel(span::finish);
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorContextBridge.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorContextBridge.java
index 1ddbd88fb7e..375ead42b2f 100644
--- a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorContextBridge.java
+++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorContextBridge.java
@@ -17,123 +17,120 @@
  */
 public final class ReactorContextBridge {
 
-  private static final String DD_SPAN_KEY = "dd.span";
-
-  private ReactorContextBridge() {}
-
-  /**
-   * Records the {@link Context} derived from the {@code dd.span} span a context-writing subscriber
-   * carries, into the subscriber store, once, when the subscriber is constructed. The caller
-   * ({@code ContextWritingSubscriberInstrumentation}) only matches context-writing subscribers, so
-   * no runtime type check is needed.
-   */
-  public static void captureSubscriberContext(
-      final CoreSubscriber<?> subscriber,
-      final ContextStore<Subscriber, Context> subscriberContexts) {
-    final Context context = explicitContextFromSubscriber(subscriber);
-    if (context != null) {
-      subscriberContexts.put(subscriber, context);
-    }
-  }
-
-  /**
-   * Attaches the context recorded for {@code subscriber} by {@link #captureSubscriberContext}. A
-   * plain store lookup — no {@code instanceof}, no {@code currentContext()} call — on the signal
-   * hot path.
-   */
-  public static ContextScope activateStoredContext(
-      final Subscriber<?> subscriber, final ContextStore<Subscriber, Context> subscriberContexts) {
-    return attachIfRequired(subscriberContexts.get(subscriber), Context.current());
-  }
-
-  /**
-   * On subscribe, hands the explicit context recorded for {@code subscriber} (a context-writing
-   * subscriber) to the publisher store so the reactive-streams layer can propagate it, and attaches
-   * it. The deposit is {@linkplain HandoffContext#threadConfined thread-confined} since the
-   * subscribed publisher may be a concurrently-subscribed shared sink.
-   */
-  public static ContextScope captureOnSubscribe(
-      final Publisher<?> publisher,
-      final Subscriber<?> subscriber,
-      final ContextStore<Publisher, HandoffContext> publisherContexts,
-      final ContextStore<Subscriber, Context> subscriberContexts) {
-    final Context context = subscriberContexts.get(subscriber);
-    if (context == null) {
-      return null;
+    private static final String DD_SPAN_KEY = "dd.span";
+
+    private ReactorContextBridge() {}
+
+    /**
+     * Records the {@link Context} derived from the {@code dd.span} span a context-writing subscriber
+     * carries, into the subscriber store, once, when the subscriber is constructed. The caller
+     * ({@code ContextWritingSubscriberInstrumentation}) only matches context-writing subscribers, so
+     * no runtime type check is needed.
+     */
+    public static void captureSubscriberContext(
+            final CoreSubscriber<?> subscriber, final ContextStore<Subscriber, Context> subscriberContexts) {
+        final Context context = explicitContextFromSubscriber(subscriber);
+        if (context != null) {
+            subscriberContexts.put(subscriber, context);
+        }
     }
 
-    publisherContexts.put(publisher, HandoffContext.threadConfined(context));
-    return attachIfRequired(context, Context.current());
-  }
-
-  public static ContextScope activateForBlocking(
-      final Publisher<?> publisher,
-      final ContextStore<Publisher, HandoffContext> publisherContexts) {
-    final HandoffContext handoff = publisherContexts.get(publisher);
-    return attachIfRequired(
-        handoff == null ? null : handoff.contextForCurrentThread(), Context.current());
-  }
-
-  public static void transferToOptimizedSubscriber(
-      final Publisher<?> publisher,
-      final Subscriber<?> source,
-      final Subscriber<?> target,
-      final ContextStore<Publisher, HandoffContext> publisherContexts,
-      final ContextStore<Subscriber, Context> subscriberContexts) {
-    if (source == null || target == null) {
-      return;
+    /**
+     * Attaches the context recorded for {@code subscriber} by {@link #captureSubscriberContext}. A
+     * plain store lookup — no {@code instanceof}, no {@code currentContext()} call — on the signal
+     * hot path.
+     */
+    public static ContextScope activateStoredContext(
+            final Subscriber<?> subscriber, final ContextStore<Subscriber, Context> subscriberContexts) {
+        return attachIfRequired(subscriberContexts.get(subscriber), Context.current());
     }
 
-    final HandoffContext handoff = publisherContexts.get(publisher);
-    Context context = handoff == null ? null : handoff.contextForCurrentThread();
-    if (context == null) {
-      context = subscriberContexts.get(source);
+    /**
+     * On subscribe, hands the explicit context recorded for {@code subscriber} (a context-writing
+     * subscriber) to the publisher store so the reactive-streams layer can propagate it, and attaches
+     * it. The deposit is {@linkplain HandoffContext#threadConfined thread-confined} since the
+     * subscribed publisher may be a concurrently-subscribed shared sink.
+     */
+    public static ContextScope captureOnSubscribe(
+            final Publisher<?> publisher,
+            final Subscriber<?> subscriber,
+            final ContextStore<Publisher, HandoffContext> publisherContexts,
+            final ContextStore<Subscriber, Context> subscriberContexts) {
+        final Context context = subscriberContexts.get(subscriber);
+        if (context == null) {
+            return null;
+        }
+
+        publisherContexts.put(publisher, HandoffContext.threadConfined(context));
+        return attachIfRequired(context, Context.current());
     }
-    if (context != null) {
-      subscriberContexts.getOrPut(target, context);
+
+    public static ContextScope activateForBlocking(
+            final Publisher<?> publisher, final ContextStore<Publisher, HandoffContext> publisherContexts) {
+        final HandoffContext handoff = publisherContexts.get(publisher);
+        return attachIfRequired(handoff == null ? null : handoff.contextForCurrentThread(), Context.current());
     }
-  }
 
-  private static Context explicitContextFromSubscriber(final CoreSubscriber<?> subscriber) {
-    final reactor.util.context.Context reactorContext = currentContext(subscriber);
-    if (reactorContext == null || !hasKey(reactorContext, DD_SPAN_KEY)) {
-      return null;
+    public static void transferToOptimizedSubscriber(
+            final Publisher<?> publisher,
+            final Subscriber<?> source,
+            final Subscriber<?> target,
+            final ContextStore<Publisher, HandoffContext> publisherContexts,
+            final ContextStore<Subscriber, Context> subscriberContexts) {
+        if (source == null || target == null) {
+            return;
+        }
+
+        final HandoffContext handoff = publisherContexts.get(publisher);
+        Context context = handoff == null ? null : handoff.contextForCurrentThread();
+        if (context == null) {
+            context = subscriberContexts.get(source);
+        }
+        if (context != null) {
+            subscriberContexts.getOrPut(target, context);
+        }
     }
-    final Object maybeSpan = get(reactorContext, DD_SPAN_KEY);
-    return maybeSpan instanceof WithAgentSpan ? ((WithAgentSpan) maybeSpan).asAgentSpan() : null;
-  }
 
-  private static reactor.util.context.Context currentContext(final CoreSubscriber<?> subscriber) {
-    if (subscriber == null) {
-      return null;
+    private static Context explicitContextFromSubscriber(final CoreSubscriber<?> subscriber) {
+        final reactor.util.context.Context reactorContext = currentContext(subscriber);
+        if (reactorContext == null || !hasKey(reactorContext, DD_SPAN_KEY)) {
+            return null;
+        }
+        final Object maybeSpan = get(reactorContext, DD_SPAN_KEY);
+        return maybeSpan instanceof WithAgentSpan ? ((WithAgentSpan) maybeSpan).asAgentSpan() : null;
     }
-    try {
-      return subscriber.currentContext();
-    } catch (Throwable ignored) {
-      return null;
+
+    private static reactor.util.context.Context currentContext(final CoreSubscriber<?> subscriber) {
+        if (subscriber == null) {
+            return null;
+        }
+        try {
+            return subscriber.currentContext();
+        } catch (Throwable ignored) {
+            return null;
+        }
     }
-  }
 
-  private static ContextScope attachIfRequired(final Context context, final Context activeContext) {
-    if (context == null || context == activeContext || context == Context.root()) {
-      return null;
+    private static ContextScope attachIfRequired(final Context context, final Context activeContext) {
+        if (context == null || context == activeContext || context == Context.root()) {
+            return null;
+        }
+        return context.attach();
     }
-    return context.attach();
-  }
-
-  private static boolean hasKey(final reactor.util.context.Context context, final Object key) {
-    try {
-      return context.hasKey(key);
-    } catch (Throwable ignored) {
-      return false;
+
+    private static boolean hasKey(final reactor.util.context.Context context, final Object key) {
+        try {
+            return context.hasKey(key);
+        } catch (Throwable ignored) {
+            return false;
+        }
     }
-  }
 
-  private static Object get(final reactor.util.context.Context context, final Object key) {
-    try {
-      return context.get(key);
-    } catch (Throwable ignored) {
-      return null;
+    private static Object get(final reactor.util.context.Context context, final Object key) {
+        try {
+            return context.get(key);
+        } catch (Throwable ignored) {
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorCoreModule.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorCoreModule.java
index 14bd109c458..12b1a29c843 100644
--- a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorCoreModule.java
+++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorCoreModule.java
@@ -17,46 +17,45 @@
 import java.util.Map;
 
 @AutoService(InstrumenterModule.class)
-public final class ReactorCoreModule extends InstrumenterModule.ContextTracking
-    implements ExcludeFilterProvider {
-  public ReactorCoreModule() {
-    super("reactor-core");
-  }
+public final class ReactorCoreModule extends InstrumenterModule.ContextTracking implements ExcludeFilterProvider {
+    public ReactorCoreModule() {
+        super("reactor-core");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ReactorAsyncResultExtension", packageName + ".ReactorContextBridge",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ReactorAsyncResultExtension", packageName + ".ReactorContextBridge",
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    final Map<String, String> store = new HashMap<>();
-    store.put("org.reactivestreams.Subscriber", Context.class.getName());
-    store.put("org.reactivestreams.Publisher", HandoffContext.class.getName());
-    return store;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        final Map<String, String> store = new HashMap<>();
+        store.put("org.reactivestreams.Subscriber", Context.class.getName());
+        store.put("org.reactivestreams.Publisher", HandoffContext.class.getName());
+        return store;
+    }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    return Collections.singletonMap(
-        ExcludeFilter.ExcludeType.RUNNABLE,
-        Arrays.asList(
-            "reactor.core.publisher.EventLoopProcessor",
-            "reactor.core.publisher.EventLoopProcessor$RequestTask",
-            "reactor.core.publisher.TopicProcessor$TopicInner",
-            "reactor.core.publisher.TopicProcessor$TopicInner$1",
-            "reactor.core.publisher.WorkQueueProcessor$WorkQueueInner",
-            "reactor.core.publisher.WorkQueueProcessor$WorkQueueInner$1"));
-  }
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        return Collections.singletonMap(
+                ExcludeFilter.ExcludeType.RUNNABLE,
+                Arrays.asList(
+                        "reactor.core.publisher.EventLoopProcessor",
+                        "reactor.core.publisher.EventLoopProcessor$RequestTask",
+                        "reactor.core.publisher.TopicProcessor$TopicInner",
+                        "reactor.core.publisher.TopicProcessor$TopicInner$1",
+                        "reactor.core.publisher.WorkQueueProcessor$WorkQueueInner",
+                        "reactor.core.publisher.WorkQueueProcessor$WorkQueueInner$1"));
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(
-        new BlockingPublisherInstrumentation(),
-        new CorePublisherInstrumentation(),
-        new ContextWritingSubscriberInstrumentation(),
-        new OptimizableOperatorInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(
+                new BlockingPublisherInstrumentation(),
+                new CorePublisherInstrumentation(),
+                new ContextWritingSubscriberInstrumentation(),
+                new OptimizableOperatorInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/test/java/annotatedsample/ReactorTracedMethods.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/test/java/annotatedsample/ReactorTracedMethods.java
index a3450a31e20..7bcade869a8 100644
--- a/dd-java-agent/instrumentation/reactor-core-3.1/src/test/java/annotatedsample/ReactorTracedMethods.java
+++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/test/java/annotatedsample/ReactorTracedMethods.java
@@ -10,66 +10,62 @@
 import reactor.core.publisher.Mono;
 
 public class ReactorTracedMethods {
-  @WithSpan
-  public static Mono<String> traceAsyncMono(CountDownLatch latch) {
-    return Mono.fromCallable(
-        () -> {
-          await(latch);
-          return "hello";
+    @WithSpan
+    public static Mono<String> traceAsyncMono(CountDownLatch latch) {
+        return Mono.fromCallable(() -> {
+            await(latch);
+            return "hello";
         });
-  }
+    }
 
-  @WithSpan
-  public static Mono<String> traceAsyncFailingMono(CountDownLatch latch, Exception exception) {
-    return Mono.fromCallable(
-        () -> {
-          await(latch);
-          throw exception;
+    @WithSpan
+    public static Mono<String> traceAsyncFailingMono(CountDownLatch latch, Exception exception) {
+        return Mono.fromCallable(() -> {
+            await(latch);
+            throw exception;
         });
-  }
+    }
 
-  @WithSpan
-  public static Flux<String> traceAsyncFlux(CountDownLatch latch) {
-    return Flux.create(
-        emitter -> {
-          await(latch);
-          emitter.next("hello");
-          emitter.complete();
+    @WithSpan
+    public static Flux<String> traceAsyncFlux(CountDownLatch latch) {
+        return Flux.create(emitter -> {
+            await(latch);
+            emitter.next("hello");
+            emitter.complete();
         });
-  }
+    }
 
-  @WithSpan
-  public static Flux<String> traceAsyncFailingFlux(CountDownLatch latch, Exception exception) {
-    return Flux.create(
-        emitter -> {
-          await(latch);
-          emitter.error(exception);
+    @WithSpan
+    public static Flux<String> traceAsyncFailingFlux(CountDownLatch latch, Exception exception) {
+        return Flux.create(emitter -> {
+            await(latch);
+            emitter.error(exception);
         });
-  }
-
-  private static void await(CountDownLatch latch) {
-    try {
-      if (!latch.await(5, SECONDS)) {
-        throw new IllegalStateException("Latch still locked");
-      }
-    } catch (InterruptedException e) {
-      throw new RuntimeException(e);
     }
-  }
 
-  public static class CancelSubscriber<T> implements Subscriber<T> {
-    @Override
-    public void onSubscribe(Subscription s) {
-      s.cancel();
+    private static void await(CountDownLatch latch) {
+        try {
+            if (!latch.await(5, SECONDS)) {
+                throw new IllegalStateException("Latch still locked");
+            }
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    @Override
-    public void onNext(T t) {}
+    public static class CancelSubscriber<T> implements Subscriber<T> {
+        @Override
+        public void onSubscribe(Subscription s) {
+            s.cancel();
+        }
+
+        @Override
+        public void onNext(T t) {}
 
-    @Override
-    public void onError(Throwable t) {}
+        @Override
+        public void onError(Throwable t) {}
 
-    @Override
-    public void onComplete() {}
-  }
+        @Override
+        public void onComplete() {}
+    }
 }
diff --git a/dd-java-agent/instrumentation/reactor-netty-1.0/src/main/java/datadog/trace/instrumentation/reactor/netty/AfterConstructorAdvice.java b/dd-java-agent/instrumentation/reactor-netty-1.0/src/main/java/datadog/trace/instrumentation/reactor/netty/AfterConstructorAdvice.java
index d59f754bfb2..93bfae7898f 100644
--- a/dd-java-agent/instrumentation/reactor-netty-1.0/src/main/java/datadog/trace/instrumentation/reactor/netty/AfterConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/reactor-netty-1.0/src/main/java/datadog/trace/instrumentation/reactor/netty/AfterConstructorAdvice.java
@@ -4,11 +4,10 @@
 import reactor.netty.http.client.HttpClient;
 
 public class AfterConstructorAdvice {
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void onExit(
-      @Advice.Thrown Throwable throwable, @Advice.Return(readOnly = false) HttpClient client) {
-    if (null == throwable) {
-      client = client.mapConnect(new CaptureConnectSpan()).doOnRequest(new TransferConnectSpan());
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void onExit(@Advice.Thrown Throwable throwable, @Advice.Return(readOnly = false) HttpClient client) {
+        if (null == throwable) {
+            client = client.mapConnect(new CaptureConnectSpan()).doOnRequest(new TransferConnectSpan());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/reactor-netty-1.0/src/main/java/datadog/trace/instrumentation/reactor/netty/CaptureConnectSpan.java b/dd-java-agent/instrumentation/reactor-netty-1.0/src/main/java/datadog/trace/instrumentation/reactor/netty/CaptureConnectSpan.java
index 41daf101e96..43648f2e6f4 100644
--- a/dd-java-agent/instrumentation/reactor-netty-1.0/src/main/java/datadog/trace/instrumentation/reactor/netty/CaptureConnectSpan.java
+++ b/dd-java-agent/instrumentation/reactor-netty-1.0/src/main/java/datadog/trace/instrumentation/reactor/netty/CaptureConnectSpan.java
@@ -5,21 +5,19 @@
 import reactor.core.publisher.Mono;
 import reactor.netty.Connection;
 
-public class CaptureConnectSpan
-    implements Function<Mono<? extends Connection>, Mono<? extends Connection>> {
+public class CaptureConnectSpan implements Function<Mono<? extends Connection>, Mono<? extends Connection>> {
 
-  static final String CONNECT_CONTEXT = "datadog.connect.context";
+    static final String CONNECT_CONTEXT = "datadog.connect.context";
 
-  @Override
-  public Mono<? extends Connection> apply(Mono<? extends Connection> mono) {
-    return mono.contextWrite(
-        reactorCtx -> {
-          final Context context = Context.current();
-          if (context != Context.root()) {
-            return reactorCtx.put(CONNECT_CONTEXT, context);
-          } else {
-            return reactorCtx;
-          }
+    @Override
+    public Mono<? extends Connection> apply(Mono<? extends Connection> mono) {
+        return mono.contextWrite(reactorCtx -> {
+            final Context context = Context.current();
+            if (context != Context.root()) {
+                return reactorCtx.put(CONNECT_CONTEXT, context);
+            } else {
+                return reactorCtx;
+            }
         });
-  }
+    }
 }
diff --git a/dd-java-agent/instrumentation/reactor-netty-1.0/src/main/java/datadog/trace/instrumentation/reactor/netty/HttpClientInstrumentation.java b/dd-java-agent/instrumentation/reactor-netty-1.0/src/main/java/datadog/trace/instrumentation/reactor/netty/HttpClientInstrumentation.java
index 532b7503009..711c6bde8b5 100644
--- a/dd-java-agent/instrumentation/reactor-netty-1.0/src/main/java/datadog/trace/instrumentation/reactor/netty/HttpClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/reactor-netty-1.0/src/main/java/datadog/trace/instrumentation/reactor/netty/HttpClientInstrumentation.java
@@ -19,36 +19,36 @@
  */
 @AutoService(InstrumenterModule.class)
 public class HttpClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public HttpClientInstrumentation() {
-    super("reactor-netty", "reactor-netty-1");
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Avoid matching pre-1.0 releases which are not compatible.
-    return hasClassNamed("reactor.netty.transport.AddressUtils");
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.netty41.AttributeKeys",
-      packageName + ".CaptureConnectSpan",
-      packageName + ".TransferConnectSpan",
-    };
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "reactor.netty.http.client.HttpClient";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isStatic()).and(namedOneOf("create", "newConnection")),
-        packageName + ".AfterConstructorAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public HttpClientInstrumentation() {
+        super("reactor-netty", "reactor-netty-1");
+    }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Avoid matching pre-1.0 releases which are not compatible.
+        return hasClassNamed("reactor.netty.transport.AddressUtils");
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.netty41.AttributeKeys",
+            packageName + ".CaptureConnectSpan",
+            packageName + ".TransferConnectSpan",
+        };
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "reactor.netty.http.client.HttpClient";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isStatic()).and(namedOneOf("create", "newConnection")),
+                packageName + ".AfterConstructorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/reactor-netty-1.0/src/main/java/datadog/trace/instrumentation/reactor/netty/TransferConnectSpan.java b/dd-java-agent/instrumentation/reactor-netty-1.0/src/main/java/datadog/trace/instrumentation/reactor/netty/TransferConnectSpan.java
index 0e58a33b624..586edfc4665 100644
--- a/dd-java-agent/instrumentation/reactor-netty-1.0/src/main/java/datadog/trace/instrumentation/reactor/netty/TransferConnectSpan.java
+++ b/dd-java-agent/instrumentation/reactor-netty-1.0/src/main/java/datadog/trace/instrumentation/reactor/netty/TransferConnectSpan.java
@@ -10,20 +10,19 @@
 import reactor.netty.http.client.HttpClientRequest;
 
 public class TransferConnectSpan implements BiConsumer<HttpClientRequest, Connection> {
-  @Override
-  public void accept(HttpClientRequest clientRequest, Connection connection) {
-    final Context context = clientRequest.currentContextView().getOrDefault(CONNECT_CONTEXT, null);
-    if (null == context) {
-      return;
+    @Override
+    public void accept(HttpClientRequest clientRequest, Connection connection) {
+        final Context context = clientRequest.currentContextView().getOrDefault(CONNECT_CONTEXT, null);
+        if (null == context) {
+            return;
+        }
+        ContextContinuation newContinuation = context.capture();
+        ContextContinuation oldContinuation = connection
+                .channel()
+                .attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY)
+                .getAndSet(newContinuation);
+        if (null != oldContinuation) {
+            oldContinuation.release();
+        }
     }
-    ContextContinuation newContinuation = context.capture();
-    ContextContinuation oldContinuation =
-        connection
-            .channel()
-            .attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY)
-            .getAndSet(newContinuation);
-    if (null != oldContinuation) {
-      oldContinuation.release();
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/reactor-netty-1.0/src/test/java/ReactorNettyBaggagePropagationTest.java b/dd-java-agent/instrumentation/reactor-netty-1.0/src/test/java/ReactorNettyBaggagePropagationTest.java
index 40cb6d0cf0f..b4949fa11f1 100644
--- a/dd-java-agent/instrumentation/reactor-netty-1.0/src/test/java/ReactorNettyBaggagePropagationTest.java
+++ b/dd-java-agent/instrumentation/reactor-netty-1.0/src/test/java/ReactorNettyBaggagePropagationTest.java
@@ -36,74 +36,70 @@
  */
 class ReactorNettyBaggagePropagationTest extends AbstractInstrumentationTest {
 
-  private static HttpServer mockServer;
-  private static ExecutorService serverExecutor;
-  private static String baseUrl;
-  private static final AtomicReference<String> capturedBaggage = new AtomicReference<>();
+    private static HttpServer mockServer;
+    private static ExecutorService serverExecutor;
+    private static String baseUrl;
+    private static final AtomicReference<String> capturedBaggage = new AtomicReference<>();
 
-  @BeforeAll
-  static void startServer() throws IOException {
-    capturedBaggage.set(null);
-    mockServer = HttpServer.create(new InetSocketAddress("localhost", 0), 0);
-    mockServer.createContext(
-        "/capture",
-        exchange -> {
-          capturedBaggage.set(exchange.getRequestHeaders().getFirst("baggage"));
-          byte[] body = "ok".getBytes(StandardCharsets.UTF_8);
-          exchange.sendResponseHeaders(200, body.length);
-          exchange.getResponseBody().write(body);
-          exchange.close();
+    @BeforeAll
+    static void startServer() throws IOException {
+        capturedBaggage.set(null);
+        mockServer = HttpServer.create(new InetSocketAddress("localhost", 0), 0);
+        mockServer.createContext("/capture", exchange -> {
+            capturedBaggage.set(exchange.getRequestHeaders().getFirst("baggage"));
+            byte[] body = "ok".getBytes(StandardCharsets.UTF_8);
+            exchange.sendResponseHeaders(200, body.length);
+            exchange.getResponseBody().write(body);
+            exchange.close();
         });
-    serverExecutor = Executors.newCachedThreadPool();
-    mockServer.setExecutor(serverExecutor);
-    mockServer.start();
-    baseUrl =
-        "http://"
-            + mockServer.getAddress().getHostString()
-            + ":"
-            + mockServer.getAddress().getPort();
-  }
-
-  @AfterAll
-  static void stopServer() {
-    if (mockServer != null) {
-      mockServer.stop(0);
-      mockServer = null;
+        serverExecutor = Executors.newCachedThreadPool();
+        mockServer.setExecutor(serverExecutor);
+        mockServer.start();
+        baseUrl = "http://"
+                + mockServer.getAddress().getHostString()
+                + ":"
+                + mockServer.getAddress().getPort();
     }
-    if (serverExecutor != null) {
-      serverExecutor.shutdown();
-      serverExecutor = null;
+
+    @AfterAll
+    static void stopServer() {
+        if (mockServer != null) {
+            mockServer.stop(0);
+            mockServer = null;
+        }
+        if (serverExecutor != null) {
+            serverExecutor.shutdown();
+            serverExecutor = null;
+        }
     }
-  }
 
-  @Test
-  void baggageHeaderPropagatedOnOutgoingRequest() {
-    Baggage baggage = Baggage.create(Collections.singletonMap("user.id", "abc123"));
+    @Test
+    void baggageHeaderPropagatedOnOutgoingRequest() {
+        Baggage baggage = Baggage.create(Collections.singletonMap("user.id", "abc123"));
 
-    AgentSpan span = AgentTracer.startSpan("test", "parent");
-    try (ContextScope spanScope = AgentTracer.activateSpan(span)) {
-      // Active context now carries both the span and the baggage — the exact shape the connect-span
-      // path must carry across the subscription -> I/O thread hand-off.
-      try (ContextScope baggageScope = Context.current().with(baggage).attach()) {
-        HttpClient.create()
-            .get()
-            .uri(baseUrl + "/capture")
-            .responseContent()
-            .aggregate()
-            .asString()
-            .block(Duration.ofSeconds(10));
-      }
-    } finally {
-      span.finish();
-    }
+        AgentSpan span = AgentTracer.startSpan("test", "parent");
+        try (ContextScope spanScope = AgentTracer.activateSpan(span)) {
+            // Active context now carries both the span and the baggage — the exact shape the connect-span
+            // path must carry across the subscription -> I/O thread hand-off.
+            try (ContextScope baggageScope = Context.current().with(baggage).attach()) {
+                HttpClient.create()
+                        .get()
+                        .uri(baseUrl + "/capture")
+                        .responseContent()
+                        .aggregate()
+                        .asString()
+                        .block(Duration.ofSeconds(10));
+            }
+        } finally {
+            span.finish();
+        }
 
-    String header = capturedBaggage.get();
-    assertNotNull(
-        header,
-        "outgoing request must carry a W3C 'baggage' header when baggage is in the active context;"
-            + " null means the connect-span path dropped the context (carried only the span)");
-    assertTrue(
-        header.contains("user.id=abc123"),
-        "baggage header should contain the propagated item, was: " + header);
-  }
+        String header = capturedBaggage.get();
+        assertNotNull(
+                header,
+                "outgoing request must carry a W3C 'baggage' header when baggage is in the active context;"
+                        + " null means the connect-span path dropped the context (carried only the span)");
+        assertTrue(
+                header.contains("user.id=abc123"), "baggage header should contain the propagated item, was: " + header);
+    }
 }
diff --git a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/OnCompleteHandler.java b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/OnCompleteHandler.java
index 7d70e3fe668..7c3dd40ad44 100644
--- a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/OnCompleteHandler.java
+++ b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/OnCompleteHandler.java
@@ -11,32 +11,31 @@
 
 public final class OnCompleteHandler extends AbstractFunction1<Try<Object>, Void> {
 
-  private final ContextStore<ActorRef, RedisConnectionInfo> contextStore;
-  private final ActorRef actorRef;
+    private final ContextStore<ActorRef, RedisConnectionInfo> contextStore;
+    private final ActorRef actorRef;
 
-  public OnCompleteHandler(
-      ContextStore<ActorRef, RedisConnectionInfo> contextStore, ActorRef actorRef) {
-    this.contextStore = contextStore;
-    this.actorRef = actorRef;
-  }
+    public OnCompleteHandler(ContextStore<ActorRef, RedisConnectionInfo> contextStore, ActorRef actorRef) {
+        this.contextStore = contextStore;
+        this.actorRef = actorRef;
+    }
 
-  @Override
-  public Void apply(final Try<Object> result) {
-    // propagation handled by scala promise instrumentation
-    AgentSpan span = activeSpan();
-    if (null != span) {
-      try {
-        if (actorRef != null) {
-          DECORATE.onConnection(span, contextStore.get(actorRef));
-        }
-        if (result.isFailure()) {
-          DECORATE.onError(span, result.failed().get());
+    @Override
+    public Void apply(final Try<Object> result) {
+        // propagation handled by scala promise instrumentation
+        AgentSpan span = activeSpan();
+        if (null != span) {
+            try {
+                if (actorRef != null) {
+                    DECORATE.onConnection(span, contextStore.get(actorRef));
+                }
+                if (result.isFailure()) {
+                    DECORATE.onError(span, result.failed().get());
+                }
+                DECORATE.beforeFinish(span);
+            } finally {
+                span.finish();
+            }
         }
-        DECORATE.beforeFinish(span);
-      } finally {
-        span.finish();
-      }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RedisClientActorInstrumentation.java b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RedisClientActorInstrumentation.java
index 68df431c2a7..c12d943218b 100644
--- a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RedisClientActorInstrumentation.java
+++ b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RedisClientActorInstrumentation.java
@@ -18,43 +18,42 @@
 
 @AutoService(InstrumenterModule.class)
 public class RedisClientActorInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public RedisClientActorInstrumentation() {
-    super("rediscala", "redis", "rediscala-connection");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "redis.RedisClientActorLike";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("akka.actor.ActorRef", packageName + ".RedisConnectionInfo");
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("onConnect")),
-        RedisClientActorInstrumentation.class.getName() + "$ConnectionAdvice");
-  }
-
-  public static class ConnectionAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void beforeOnConnect(@Advice.This final RedisClientActorLike thiz) {
-      if (thiz.redisConnection() != null) {
-        final Object tmpDbIndex = thiz.db().isDefined() ? thiz.db().get() : null;
-        final int dbIndex = (tmpDbIndex instanceof Number) ? ((Number) tmpDbIndex).intValue() : 0;
-        InstrumentationContext.get(ActorRef.class, RedisConnectionInfo.class)
-            .put(
-                thiz.redisConnection(), new RedisConnectionInfo(thiz.host(), thiz.port(), dbIndex));
-      }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public RedisClientActorInstrumentation() {
+        super("rediscala", "redis", "rediscala-connection");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "redis.RedisClientActorLike";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("akka.actor.ActorRef", packageName + ".RedisConnectionInfo");
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("onConnect")),
+                RedisClientActorInstrumentation.class.getName() + "$ConnectionAdvice");
+    }
+
+    public static class ConnectionAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void beforeOnConnect(@Advice.This final RedisClientActorLike thiz) {
+            if (thiz.redisConnection() != null) {
+                final Object tmpDbIndex = thiz.db().isDefined() ? thiz.db().get() : null;
+                final int dbIndex = (tmpDbIndex instanceof Number) ? ((Number) tmpDbIndex).intValue() : 0;
+                InstrumentationContext.get(ActorRef.class, RedisConnectionInfo.class)
+                        .put(thiz.redisConnection(), new RedisConnectionInfo(thiz.host(), thiz.port(), dbIndex));
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RedisConnectionInfo.java b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RedisConnectionInfo.java
index c9f756df9f7..14ef9a25291 100644
--- a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RedisConnectionInfo.java
+++ b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RedisConnectionInfo.java
@@ -1,13 +1,13 @@
 package datadog.trace.instrumentation.rediscala;
 
 public class RedisConnectionInfo {
-  public final String host;
-  public final int port;
-  public final int dbIndex;
+    public final String host;
+    public final int port;
+    public final int dbIndex;
 
-  public RedisConnectionInfo(String host, int port, int dbIndex) {
-    this.host = host;
-    this.port = port;
-    this.dbIndex = dbIndex;
-  }
+    public RedisConnectionInfo(String host, int port, int dbIndex) {
+        this.host = host;
+        this.port = port;
+        this.dbIndex = dbIndex;
+    }
 }
diff --git a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaClientDecorator.java b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaClientDecorator.java
index 41e566312f1..63f5a3d9ea1 100644
--- a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaClientDecorator.java
+++ b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaClientDecorator.java
@@ -6,64 +6,63 @@
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.decorator.DBTypeProcessingDatabaseClientDecorator;
 
-public class RediscalaClientDecorator
-    extends DBTypeProcessingDatabaseClientDecorator<RedisConnectionInfo> {
+public class RediscalaClientDecorator extends DBTypeProcessingDatabaseClientDecorator<RedisConnectionInfo> {
 
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
+    private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
 
-  public static final RediscalaClientDecorator DECORATE = new RediscalaClientDecorator();
+    public static final RediscalaClientDecorator DECORATE = new RediscalaClientDecorator();
 
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation("redis"));
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cache().service("redis");
+    public static final CharSequence OPERATION_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation("redis"));
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cache().service("redis");
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"rediscala", "redis"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"rediscala", "redis"};
+    }
 
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.REDIS;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.REDIS;
+    }
 
-  @Override
-  protected String dbType() {
-    return "redis";
-  }
+    @Override
+    protected String dbType() {
+        return "redis";
+    }
 
-  @Override
-  protected String dbUser(final RedisConnectionInfo redisConnectionInfo) {
-    return null;
-  }
+    @Override
+    protected String dbUser(final RedisConnectionInfo redisConnectionInfo) {
+        return null;
+    }
 
-  @Override
-  protected String dbInstance(final RedisConnectionInfo redisConnectionInfo) {
-    return null;
-  }
+    @Override
+    protected String dbInstance(final RedisConnectionInfo redisConnectionInfo) {
+        return null;
+    }
 
-  @Override
-  protected String dbHostname(final RedisConnectionInfo redisConnectionInfo) {
-    return redisConnectionInfo.host;
-  }
+    @Override
+    protected String dbHostname(final RedisConnectionInfo redisConnectionInfo) {
+        return redisConnectionInfo.host;
+    }
 
-  @Override
-  public void onConnection(final AgentSpan span, final RedisConnectionInfo connection) {
-    if (connection != null) {
-      setPeerPort(span, connection.port);
-      span.setTag("db.redis.dbIndex", connection.dbIndex);
+    @Override
+    public void onConnection(final AgentSpan span, final RedisConnectionInfo connection) {
+        if (connection != null) {
+            setPeerPort(span, connection.port);
+            span.setTag("db.redis.dbIndex", connection.dbIndex);
+        }
+        super.onConnection(span, connection);
     }
-    super.onConnection(span, connection);
-  }
 }
diff --git a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java
index 6ec53badf47..411643b4686 100644
--- a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java
+++ b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java
@@ -33,84 +33,83 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RediscalaInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public RediscalaInstrumentation() {
-    super("rediscala", "redis");
-  }
+    public RediscalaInstrumentation() {
+        super("rediscala", "redis");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "redis.Request";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "redis.Request";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return NameMatchers.nameStartsWith("redis.")
-        .and(
-            implementsInterface(
-                namedOneOf( // traits
-                    "redis.Request",
-                    "redis.ActorRequest",
-                    "redis.BufferedRequest",
-                    "redis.RoundRobinPoolRequest")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return NameMatchers.nameStartsWith("redis.")
+                .and(implementsInterface(
+                        namedOneOf( // traits
+                                "redis.Request",
+                                "redis.ActorRequest",
+                                "redis.BufferedRequest",
+                                "redis.RoundRobinPoolRequest")));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("akka.actor.ActorRef", packageName + ".RedisConnectionInfo");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("akka.actor.ActorRef", packageName + ".RedisConnectionInfo");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("send"))
-            .and(takesArgument(0, named("redis.RedisCommand")))
-            .and(returns(named("scala.concurrent.Future"))),
-        RediscalaInstrumentation.class.getName() + "$RediscalaAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("send"))
+                        .and(takesArgument(0, named("redis.RedisCommand")))
+                        .and(returns(named("scala.concurrent.Future"))),
+                RediscalaInstrumentation.class.getName() + "$RediscalaAdvice");
+    }
 
-  public static class RediscalaAdvice {
+    public static class RediscalaAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(@Advice.Argument(0) final RedisCommand cmd) {
-      final AgentSpan span = startSpan("redis-command", RediscalaClientDecorator.OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onStatement(span, DECORATE.className(cmd.getClass()));
-      return activateSpan(span);
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(@Advice.Argument(0) final RedisCommand cmd) {
+            final AgentSpan span = startSpan("redis-command", RediscalaClientDecorator.OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onStatement(span, DECORATE.className(cmd.getClass()));
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.This final Object thiz,
-        @Advice.FieldValue("executionContext") final ExecutionContext ctx,
-        @Advice.Return(readOnly = false) final Future<Object> responseFuture) {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.This final Object thiz,
+                @Advice.FieldValue("executionContext") final ExecutionContext ctx,
+                @Advice.Return(readOnly = false) final Future<Object> responseFuture) {
 
-      final AgentSpan span = spanFromScope(scope);
-      final ContextStore<ActorRef, RedisConnectionInfo> contextStore =
-          InstrumentationContext.get(ActorRef.class, RedisConnectionInfo.class);
-      ActorRef connection = null;
-      if (thiz instanceof ActorRequest) {
-        connection = ((ActorRequest) thiz).redisConnection();
-      }
-      if (throwable == null) {
-        responseFuture.onComplete(new OnCompleteHandler(contextStore, connection), ctx);
-        scope.close();
-      } else {
-        if (connection != null) {
-          // try to get the info early
-          DECORATE.onConnection(span, contextStore.get(connection));
+            final AgentSpan span = spanFromScope(scope);
+            final ContextStore<ActorRef, RedisConnectionInfo> contextStore =
+                    InstrumentationContext.get(ActorRef.class, RedisConnectionInfo.class);
+            ActorRef connection = null;
+            if (thiz instanceof ActorRequest) {
+                connection = ((ActorRequest) thiz).redisConnection();
+            }
+            if (throwable == null) {
+                responseFuture.onComplete(new OnCompleteHandler(contextStore, connection), ctx);
+                scope.close();
+            } else {
+                if (connection != null) {
+                    // try to get the info early
+                    DECORATE.onConnection(span, contextStore.get(connection));
+                }
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            }
+            // span finished in OnCompleteHandler
         }
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      }
-      // span finished in OnCompleteHandler
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonClientDecorator.java b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonClientDecorator.java
index 481fd745e3b..fea5a6b4161 100644
--- a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonClientDecorator.java
+++ b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonClientDecorator.java
@@ -6,54 +6,53 @@
 import datadog.trace.bootstrap.instrumentation.decorator.DBTypeProcessingDatabaseClientDecorator;
 import org.redisson.client.protocol.CommandData;
 
-public class RedissonClientDecorator
-    extends DBTypeProcessingDatabaseClientDecorator<CommandData<?, ?>> {
-  public static final RedissonClientDecorator DECORATE = new RedissonClientDecorator();
-
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation("redis"));
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cache().service("redis");
-
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"redisson", "redis"};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.REDIS;
-  }
-
-  @Override
-  protected String dbType() {
-    return "redis";
-  }
-
-  @Override
-  protected String dbUser(CommandData<?, ?> commandData) {
-    return null;
-  }
-
-  @Override
-  protected String dbInstance(CommandData<?, ?> commandData) {
-    return null;
-  }
-
-  @Override
-  protected CharSequence dbHostname(CommandData<?, ?> commandData) {
-    return null;
-  }
+public class RedissonClientDecorator extends DBTypeProcessingDatabaseClientDecorator<CommandData<?, ?>> {
+    public static final RedissonClientDecorator DECORATE = new RedissonClientDecorator();
+
+    public static final CharSequence OPERATION_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation("redis"));
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cache().service("redis");
+
+    private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"redisson", "redis"};
+    }
+
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.REDIS;
+    }
+
+    @Override
+    protected String dbType() {
+        return "redis";
+    }
+
+    @Override
+    protected String dbUser(CommandData<?, ?> commandData) {
+        return null;
+    }
+
+    @Override
+    protected String dbInstance(CommandData<?, ?> commandData) {
+        return null;
+    }
+
+    @Override
+    protected CharSequence dbHostname(CommandData<?, ?> commandData) {
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java
index 700b1c7896e..6425f7143b6 100644
--- a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java
+++ b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java
@@ -22,85 +22,85 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RedissonInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public RedissonInstrumentation() {
-    super("redisson", "redis");
-  }
+    public RedissonInstrumentation() {
+        super("redisson", "redis");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.redisson.client.RedisConnection";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.redisson.client.RedisConnection";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("send"))
-            .and(takesArgument(0, named("org.redisson.client.protocol.CommandData"))),
-        RedissonInstrumentation.class.getName() + "$RedissonCommandAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("send"))
+                        .and(takesArgument(0, named("org.redisson.client.protocol.CommandData"))),
+                RedissonInstrumentation.class.getName() + "$RedissonCommandAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("send"))
-            .and(takesArgument(0, named("org.redisson.client.protocol.CommandsData"))),
-        RedissonInstrumentation.class.getName() + "$RedissonCommandsAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("send"))
+                        .and(takesArgument(0, named("org.redisson.client.protocol.CommandsData"))),
+                RedissonInstrumentation.class.getName() + "$RedissonCommandsAdvice");
+    }
 
-  public static class RedissonCommandAdvice {
+    public static class RedissonCommandAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final CommandData<?, ?> command, @Advice.This RedisConnection thiz) {
-      if (command.getPromise() == null) {
-        return null;
-      }
-      final AgentSpan span = startSpan("redis-command", RedissonClientDecorator.OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onPeerConnection(span, thiz.getRedisClient().getAddr());
-      DECORATE.onStatement(span, command.getCommand().getName());
-      command.getPromise().addListener(new SpanFinishListener(span.captureWithContext()));
-      return activateSpan(span);
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final CommandData<?, ?> command, @Advice.This RedisConnection thiz) {
+            if (command.getPromise() == null) {
+                return null;
+            }
+            final AgentSpan span = startSpan("redis-command", RedissonClientDecorator.OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onPeerConnection(span, thiz.getRedisClient().getAddr());
+            DECORATE.onStatement(span, command.getCommand().getName());
+            command.getPromise().addListener(new SpanFinishListener(span.captureWithContext()));
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 
-  public static class RedissonCommandsAdvice {
+    public static class RedissonCommandsAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final CommandsData command, @Advice.This final RedisConnection thiz) {
-      if (command.getPromise() == null) {
-        return null;
-      }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final CommandsData command, @Advice.This final RedisConnection thiz) {
+            if (command.getPromise() == null) {
+                return null;
+            }
 
-      final AgentSpan span = startSpan("redis-command", RedissonClientDecorator.OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onPeerConnection(span, thiz.getRedisClient().getAddr());
+            final AgentSpan span = startSpan("redis-command", RedissonClientDecorator.OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onPeerConnection(span, thiz.getRedisClient().getAddr());
 
-      List<String> commandResourceNames = new ArrayList<>();
-      for (CommandData<?, ?> commandData : command.getCommands()) {
-        commandResourceNames.add(commandData.getCommand().getName());
-      }
-      DECORATE.onStatement(span, String.join(";", commandResourceNames));
-      command.getPromise().addListener(new SpanFinishListener(span.captureWithContext()));
-      return activateSpan(span);
-    }
+            List<String> commandResourceNames = new ArrayList<>();
+            for (CommandData<?, ?> commandData : command.getCommands()) {
+                commandResourceNames.add(commandData.getCommand().getName());
+            }
+            DECORATE.onStatement(span, String.join(";", commandResourceNames));
+            command.getPromise().addListener(new SpanFinishListener(span.captureWithContext()));
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/SpanFinishListener.java b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/SpanFinishListener.java
index 83cf885ef49..2dcdb19ab2a 100644
--- a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/SpanFinishListener.java
+++ b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/SpanFinishListener.java
@@ -9,20 +9,20 @@
 import io.netty.util.concurrent.GenericFutureListener;
 
 public class SpanFinishListener implements GenericFutureListener<Future<Object>> {
-  private final ContextContinuation continuation;
+    private final ContextContinuation continuation;
 
-  public SpanFinishListener(final ContextContinuation continuation) {
-    this.continuation = continuation;
-  }
+    public SpanFinishListener(final ContextContinuation continuation) {
+        this.continuation = continuation;
+    }
 
-  @Override
-  public void operationComplete(Future<Object> future) throws Exception {
-    try (final ContextScope scope = continuation.resume()) {
-      if (!future.isSuccess()) {
-        DECORATE.onError(scope, future.cause());
-      }
-      DECORATE.beforeFinish(scope);
-      AgentSpan.fromContext(scope.context()).finish();
+    @Override
+    public void operationComplete(Future<Object> future) throws Exception {
+        try (final ContextScope scope = continuation.resume()) {
+            if (!future.isSuccess()) {
+                DECORATE.onError(scope, future.cause());
+            }
+            DECORATE.beforeFinish(scope);
+            AgentSpan.fromContext(scope.context()).finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonClientDecorator.java b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonClientDecorator.java
index 19e452b3f14..02456177ff1 100644
--- a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonClientDecorator.java
+++ b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonClientDecorator.java
@@ -6,54 +6,53 @@
 import datadog.trace.bootstrap.instrumentation.decorator.DBTypeProcessingDatabaseClientDecorator;
 import org.redisson.client.protocol.CommandData;
 
-public class RedissonClientDecorator
-    extends DBTypeProcessingDatabaseClientDecorator<CommandData<?, ?>> {
-  public static final RedissonClientDecorator DECORATE = new RedissonClientDecorator();
-
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation("redis"));
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cache().service("redis");
-
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"redisson", "redis"};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.REDIS;
-  }
-
-  @Override
-  protected String dbType() {
-    return "redis";
-  }
-
-  @Override
-  protected String dbUser(CommandData<?, ?> commandData) {
-    return null;
-  }
-
-  @Override
-  protected String dbInstance(CommandData<?, ?> commandData) {
-    return null;
-  }
-
-  @Override
-  protected CharSequence dbHostname(CommandData<?, ?> commandData) {
-    return null;
-  }
+public class RedissonClientDecorator extends DBTypeProcessingDatabaseClientDecorator<CommandData<?, ?>> {
+    public static final RedissonClientDecorator DECORATE = new RedissonClientDecorator();
+
+    public static final CharSequence OPERATION_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation("redis"));
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cache().service("redis");
+
+    private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"redisson", "redis"};
+    }
+
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.REDIS;
+    }
+
+    @Override
+    protected String dbType() {
+        return "redis";
+    }
+
+    @Override
+    protected String dbUser(CommandData<?, ?> commandData) {
+        return null;
+    }
+
+    @Override
+    protected String dbInstance(CommandData<?, ?> commandData) {
+        return null;
+    }
+
+    @Override
+    protected CharSequence dbHostname(CommandData<?, ?> commandData) {
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java
index a512bb6f8cb..7386ce6098b 100644
--- a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java
+++ b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java
@@ -22,87 +22,88 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RedissonInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public RedissonInstrumentation() {
-    super("redisson", "redis");
-  }
+    public RedissonInstrumentation() {
+        super("redisson", "redis");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.redisson.client.RedisConnection";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.redisson.client.RedisConnection";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("send"))
-            .and(takesArgument(0, named("org.redisson.client.protocol.CommandData"))),
-        RedissonInstrumentation.class.getName() + "$RedissonCommandAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("send"))
+                        .and(takesArgument(0, named("org.redisson.client.protocol.CommandData"))),
+                RedissonInstrumentation.class.getName() + "$RedissonCommandAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("send"))
-            .and(takesArgument(0, named("org.redisson.client.protocol.CommandsData"))),
-        RedissonInstrumentation.class.getName() + "$RedissonCommandsAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("send"))
+                        .and(takesArgument(0, named("org.redisson.client.protocol.CommandsData"))),
+                RedissonInstrumentation.class.getName() + "$RedissonCommandsAdvice");
+    }
 
-  public static class RedissonCommandAdvice {
+    public static class RedissonCommandAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final CommandData<?, ?> command, @Advice.This RedisConnection thiz) {
-      if (command.getPromise() == null) {
-        return null;
-      }
-      final AgentSpan span = startSpan("redis-command", RedissonClientDecorator.OPERATION_NAME);
-      RedissonClientDecorator.DECORATE.afterStart(span);
-      RedissonClientDecorator.DECORATE.onPeerConnection(span, thiz.getRedisClient().getAddr());
-      RedissonClientDecorator.DECORATE.onStatement(span, command.getCommand().getName());
-      ((RFuture<?>) command.getPromise())
-          .addListener(new SpanFinishListener(span.captureWithContext()));
-      return activateSpan(span);
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final CommandData<?, ?> command, @Advice.This RedisConnection thiz) {
+            if (command.getPromise() == null) {
+                return null;
+            }
+            final AgentSpan span = startSpan("redis-command", RedissonClientDecorator.OPERATION_NAME);
+            RedissonClientDecorator.DECORATE.afterStart(span);
+            RedissonClientDecorator.DECORATE.onPeerConnection(
+                    span, thiz.getRedisClient().getAddr());
+            RedissonClientDecorator.DECORATE.onStatement(
+                    span, command.getCommand().getName());
+            ((RFuture<?>) command.getPromise()).addListener(new SpanFinishListener(span.captureWithContext()));
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 
-  public static class RedissonCommandsAdvice {
+    public static class RedissonCommandsAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final CommandsData command, @Advice.This final RedisConnection thiz) {
-      if (command.getPromise() == null) {
-        return null;
-      }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final CommandsData command, @Advice.This final RedisConnection thiz) {
+            if (command.getPromise() == null) {
+                return null;
+            }
 
-      final AgentSpan span = startSpan("redis-command", RedissonClientDecorator.OPERATION_NAME);
-      RedissonClientDecorator.DECORATE.afterStart(span);
-      RedissonClientDecorator.DECORATE.onPeerConnection(span, thiz.getRedisClient().getAddr());
+            final AgentSpan span = startSpan("redis-command", RedissonClientDecorator.OPERATION_NAME);
+            RedissonClientDecorator.DECORATE.afterStart(span);
+            RedissonClientDecorator.DECORATE.onPeerConnection(
+                    span, thiz.getRedisClient().getAddr());
 
-      List<String> commandResourceNames = new ArrayList<>();
-      for (CommandData<?, ?> commandData : command.getCommands()) {
-        commandResourceNames.add(commandData.getCommand().getName());
-      }
-      RedissonClientDecorator.DECORATE.onStatement(span, String.join(";", commandResourceNames));
-      ((RFuture<?>) command.getPromise())
-          .addListener(new SpanFinishListener(span.captureWithContext()));
-      return activateSpan(span);
-    }
+            List<String> commandResourceNames = new ArrayList<>();
+            for (CommandData<?, ?> commandData : command.getCommands()) {
+                commandResourceNames.add(commandData.getCommand().getName());
+            }
+            RedissonClientDecorator.DECORATE.onStatement(span, String.join(";", commandResourceNames));
+            ((RFuture<?>) command.getPromise()).addListener(new SpanFinishListener(span.captureWithContext()));
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/SpanFinishListener.java b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/SpanFinishListener.java
index 4111f197b72..a3883eaaefd 100644
--- a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/SpanFinishListener.java
+++ b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/SpanFinishListener.java
@@ -7,20 +7,20 @@
 import io.netty.util.concurrent.FutureListener;
 
 public class SpanFinishListener implements FutureListener<Object> {
-  private final ContextContinuation continuation;
+    private final ContextContinuation continuation;
 
-  public SpanFinishListener(final ContextContinuation continuation) {
-    this.continuation = continuation;
-  }
+    public SpanFinishListener(final ContextContinuation continuation) {
+        this.continuation = continuation;
+    }
 
-  @Override
-  public void operationComplete(Future<Object> future) throws Exception {
-    try (final ContextScope scope = continuation.resume()) {
-      if (!future.isSuccess()) {
-        RedissonClientDecorator.DECORATE.onError(scope, future.cause());
-      }
-      RedissonClientDecorator.DECORATE.beforeFinish(scope);
-      AgentSpan.fromContext(scope.context()).finish();
+    @Override
+    public void operationComplete(Future<Object> future) throws Exception {
+        try (final ContextScope scope = continuation.resume()) {
+            if (!future.isSuccess()) {
+                RedissonClientDecorator.DECORATE.onError(scope, future.cause());
+            }
+            RedissonClientDecorator.DECORATE.beforeFinish(scope);
+            AgentSpan.fromContext(scope.context()).finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/PromiseHelper.java b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/PromiseHelper.java
index e3dd4b58d1b..8e4730467bd 100644
--- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/PromiseHelper.java
+++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/PromiseHelper.java
@@ -16,43 +16,38 @@
  * {@link CompletionStage} otherwise muzzle blocks the instrumentation since RFuture is missing.
  */
 public class PromiseHelper {
-  private static final Logger LOGGER = LoggerFactory.getLogger(PromiseHelper.class);
-  public static final MethodHandle COMMAND_GET_PROMISE_HANDLE =
-      resolveMethodHandles(CommandData.class);
-  public static final MethodHandle COMMANDS_GET_PROMISE_HANDLE =
-      resolveMethodHandles(CommandsData.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PromiseHelper.class);
+    public static final MethodHandle COMMAND_GET_PROMISE_HANDLE = resolveMethodHandles(CommandData.class);
+    public static final MethodHandle COMMANDS_GET_PROMISE_HANDLE = resolveMethodHandles(CommandsData.class);
 
-  private static MethodHandle resolveMethodHandles(Class<?> cls) {
-    final MethodHandle ret =
-        new MethodHandles(PromiseHelper.class.getClassLoader()).method(cls, "getPromise");
-    if (ret == null) {
-      LOGGER.debug(
-          "Redisson instrumentation blocked. Cannot resolve getPromise method handle for class {}",
-          cls);
-      return null;
+    private static MethodHandle resolveMethodHandles(Class<?> cls) {
+        final MethodHandle ret = new MethodHandles(PromiseHelper.class.getClassLoader()).method(cls, "getPromise");
+        if (ret == null) {
+            LOGGER.debug("Redisson instrumentation blocked. Cannot resolve getPromise method handle for class {}", cls);
+            return null;
+        }
+        try {
+            return ret.asType(MethodType.methodType(CompletionStage.class, cls));
+        } catch (Throwable t) {
+            LOGGER.debug(
+                    "Redisson instrumentation blocked. Cannot getPromise method for class {} is not compatible with CompletionStage",
+                    cls,
+                    t);
+        }
+        return null;
     }
-    try {
-      return ret.asType(MethodType.methodType(CompletionStage.class, cls));
-    } catch (Throwable t) {
-      LOGGER.debug(
-          "Redisson instrumentation blocked. Cannot getPromise method for class {} is not compatible with CompletionStage",
-          cls,
-          t);
-    }
-    return null;
-  }
 
-  public static CompletionStage<?> getPromise(MethodHandle mh, Object target) {
-    if (mh == null) {
-      return null;
-    }
-    try {
-      return (CompletionStage<?>) mh.invoke(target);
-    } catch (Throwable t) {
-      // can be ignored
+    public static CompletionStage<?> getPromise(MethodHandle mh, Object target) {
+        if (mh == null) {
+            return null;
+        }
+        try {
+            return (CompletionStage<?>) mh.invoke(target);
+        } catch (Throwable t) {
+            // can be ignored
+        }
+        return null;
     }
-    return null;
-  }
 
-  private PromiseHelper() {}
+    private PromiseHelper() {}
 }
diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonClientDecorator.java b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonClientDecorator.java
index 4d157fb8f06..5d6e6c6f1c5 100644
--- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonClientDecorator.java
+++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonClientDecorator.java
@@ -6,54 +6,53 @@
 import datadog.trace.bootstrap.instrumentation.decorator.DBTypeProcessingDatabaseClientDecorator;
 import org.redisson.client.protocol.CommandData;
 
-public class RedissonClientDecorator
-    extends DBTypeProcessingDatabaseClientDecorator<CommandData<?, ?>> {
-  public static final RedissonClientDecorator DECORATE = new RedissonClientDecorator();
-
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation("redis"));
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cache().service("redis");
-
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"redisson", "redis"};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.REDIS;
-  }
-
-  @Override
-  protected String dbType() {
-    return "redis";
-  }
-
-  @Override
-  protected String dbUser(CommandData<?, ?> commandData) {
-    return null;
-  }
-
-  @Override
-  protected String dbInstance(CommandData<?, ?> commandData) {
-    return null;
-  }
-
-  @Override
-  protected CharSequence dbHostname(CommandData<?, ?> commandData) {
-    return null;
-  }
+public class RedissonClientDecorator extends DBTypeProcessingDatabaseClientDecorator<CommandData<?, ?>> {
+    public static final RedissonClientDecorator DECORATE = new RedissonClientDecorator();
+
+    public static final CharSequence OPERATION_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation("redis"));
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cache().service("redis");
+
+    private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"redisson", "redis"};
+    }
+
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.REDIS;
+    }
+
+    @Override
+    protected String dbType() {
+        return "redis";
+    }
+
+    @Override
+    protected String dbUser(CommandData<?, ?> commandData) {
+        return null;
+    }
+
+    @Override
+    protected String dbInstance(CommandData<?, ?> commandData) {
+        return null;
+    }
+
+    @Override
+    protected CharSequence dbHostname(CommandData<?, ?> commandData) {
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java
index cdec096dcaf..76534238245 100644
--- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java
+++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java
@@ -23,93 +23,96 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RedissonInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public RedissonInstrumentation() {
-    super("redisson", "redis");
-  }
+    public RedissonInstrumentation() {
+        super("redisson", "redis");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.redisson.client.RedisConnection";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.redisson.client.RedisConnection";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("send"))
-            .and(takesArgument(0, named("org.redisson.client.protocol.CommandData"))),
-        RedissonInstrumentation.class.getName() + "$RedissonCommandAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("send"))
+                        .and(takesArgument(0, named("org.redisson.client.protocol.CommandData"))),
+                RedissonInstrumentation.class.getName() + "$RedissonCommandAdvice");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("send"))
-            .and(takesArgument(0, named("org.redisson.client.protocol.CommandsData"))),
-        RedissonInstrumentation.class.getName() + "$RedissonCommandsAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("send"))
+                        .and(takesArgument(0, named("org.redisson.client.protocol.CommandsData"))),
+                RedissonInstrumentation.class.getName() + "$RedissonCommandsAdvice");
+    }
 
-  public static class RedissonCommandAdvice {
+    public static class RedissonCommandAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final CommandData<?, ?> command, @Advice.This RedisConnection thiz) {
-      final CompletionStage<?> promise =
-          PromiseHelper.getPromise(PromiseHelper.COMMAND_GET_PROMISE_HANDLE, command);
-      if (promise == null) {
-        return null;
-      }
-      final AgentSpan span = startSpan("redis-command", RedissonClientDecorator.OPERATION_NAME);
-      RedissonClientDecorator.DECORATE.afterStart(span);
-      RedissonClientDecorator.DECORATE.onPeerConnection(span, thiz.getRedisClient().getAddr());
-      RedissonClientDecorator.DECORATE.onStatement(span, command.getCommand().getName());
-      promise.whenComplete(new SpanFinishListener(span.captureWithContext()));
-      return activateSpan(span);
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final CommandData<?, ?> command, @Advice.This RedisConnection thiz) {
+            final CompletionStage<?> promise =
+                    PromiseHelper.getPromise(PromiseHelper.COMMAND_GET_PROMISE_HANDLE, command);
+            if (promise == null) {
+                return null;
+            }
+            final AgentSpan span = startSpan("redis-command", RedissonClientDecorator.OPERATION_NAME);
+            RedissonClientDecorator.DECORATE.afterStart(span);
+            RedissonClientDecorator.DECORATE.onPeerConnection(
+                    span, thiz.getRedisClient().getAddr());
+            RedissonClientDecorator.DECORATE.onStatement(
+                    span, command.getCommand().getName());
+            promise.whenComplete(new SpanFinishListener(span.captureWithContext()));
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
-    }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
 
-    public static void muzzleCheck(final RTransaction b) {
-      // added on 3.10.3
-      b.getBuckets();
+        public static void muzzleCheck(final RTransaction b) {
+            // added on 3.10.3
+            b.getBuckets();
+        }
     }
-  }
 
-  public static class RedissonCommandsAdvice {
+    public static class RedissonCommandsAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final CommandsData command, @Advice.This final RedisConnection thiz) {
-      final CompletionStage<?> promise =
-          PromiseHelper.getPromise(PromiseHelper.COMMANDS_GET_PROMISE_HANDLE, command);
-      if (promise == null) {
-        return null;
-      }
-      final AgentSpan span = startSpan("redis-command", RedissonClientDecorator.OPERATION_NAME);
-      RedissonClientDecorator.DECORATE.afterStart(span);
-      RedissonClientDecorator.DECORATE.onPeerConnection(span, thiz.getRedisClient().getAddr());
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final CommandsData command, @Advice.This final RedisConnection thiz) {
+            final CompletionStage<?> promise =
+                    PromiseHelper.getPromise(PromiseHelper.COMMANDS_GET_PROMISE_HANDLE, command);
+            if (promise == null) {
+                return null;
+            }
+            final AgentSpan span = startSpan("redis-command", RedissonClientDecorator.OPERATION_NAME);
+            RedissonClientDecorator.DECORATE.afterStart(span);
+            RedissonClientDecorator.DECORATE.onPeerConnection(
+                    span, thiz.getRedisClient().getAddr());
 
-      List<String> commandResourceNames = new ArrayList<>();
-      for (CommandData<?, ?> commandData : command.getCommands()) {
-        commandResourceNames.add(commandData.getCommand().getName());
-      }
-      RedissonClientDecorator.DECORATE.onStatement(span, String.join(";", commandResourceNames));
-      promise.whenComplete(new SpanFinishListener(span.captureWithContext()));
-      return activateSpan(span);
-    }
+            List<String> commandResourceNames = new ArrayList<>();
+            for (CommandData<?, ?> commandData : command.getCommands()) {
+                commandResourceNames.add(commandData.getCommand().getName());
+            }
+            RedissonClientDecorator.DECORATE.onStatement(span, String.join(";", commandResourceNames));
+            promise.whenComplete(new SpanFinishListener(span.captureWithContext()));
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/SpanFinishListener.java b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/SpanFinishListener.java
index a61b4ad369d..5d7a5a5fad7 100644
--- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/SpanFinishListener.java
+++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/SpanFinishListener.java
@@ -6,20 +6,20 @@
 import java.util.function.BiConsumer;
 
 public class SpanFinishListener implements BiConsumer<Object, Throwable> {
-  private final ContextContinuation continuation;
+    private final ContextContinuation continuation;
 
-  public SpanFinishListener(final ContextContinuation continuation) {
-    this.continuation = continuation;
-  }
+    public SpanFinishListener(final ContextContinuation continuation) {
+        this.continuation = continuation;
+    }
 
-  @Override
-  public void accept(Object o, Throwable throwable) {
-    try (final ContextScope scope = continuation.resume()) {
-      if (throwable != null) {
-        RedissonClientDecorator.DECORATE.onError(scope, throwable);
-      }
-      RedissonClientDecorator.DECORATE.beforeFinish(scope);
-      AgentSpan.fromContext(scope.context()).finish();
+    @Override
+    public void accept(Object o, Throwable throwable) {
+        try (final ContextScope scope = continuation.resume()) {
+            if (throwable != null) {
+                RedissonClientDecorator.DECORATE.onError(scope, throwable);
+            }
+            RedissonClientDecorator.DECORATE.beforeFinish(scope);
+            AgentSpan.fromContext(scope.context()).finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/renaissance-0.7/src/main/java/datadog/trace/instrumentation/renaissance/RenaissanceInstrumentation.java b/dd-java-agent/instrumentation/renaissance-0.7/src/main/java/datadog/trace/instrumentation/renaissance/RenaissanceInstrumentation.java
index 5364853ecc5..0f6e0978967 100644
--- a/dd-java-agent/instrumentation/renaissance-0.7/src/main/java/datadog/trace/instrumentation/renaissance/RenaissanceInstrumentation.java
+++ b/dd-java-agent/instrumentation/renaissance-0.7/src/main/java/datadog/trace/instrumentation/renaissance/RenaissanceInstrumentation.java
@@ -18,44 +18,42 @@
 
 @AutoService(InstrumenterModule.class)
 public class RenaissanceInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  private static final Logger log = LoggerFactory.getLogger(RenaissanceInstrumentation.class);
-
-  public RenaissanceInstrumentation() {
-    super("renaissance");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.renaissance.harness.ExecutionDriver";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("executeOperation")).and(takesArgument(0, int.class)),
-        RenaissanceInstrumentation.class.getName() + "$BenchmarkAdvice");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
-
-  public static final class BenchmarkAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) int index, @Advice.FieldValue("benchmarkName") String benchmarkName) {
-      AgentSpan span =
-          startSpan("renaissance", "renaissance.benchmark").setResourceName(benchmarkName);
-      return activateSpan(span);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    private static final Logger log = LoggerFactory.getLogger(RenaissanceInstrumentation.class);
+
+    public RenaissanceInstrumentation() {
+        super("renaissance");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.renaissance.harness.ExecutionDriver";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("executeOperation")).and(takesArgument(0, int.class)),
+                RenaissanceInstrumentation.class.getName() + "$BenchmarkAdvice");
+    }
+
+    @Override
+    protected boolean defaultEnabled() {
+        return false;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      scope.close();
-      spanFromScope(scope).finish();
+    public static final class BenchmarkAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) int index, @Advice.FieldValue("benchmarkName") String benchmarkName) {
+            AgentSpan span = startSpan("renaissance", "renaissance.benchmark").setResourceName(benchmarkName);
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            scope.close();
+            spanFromScope(scope).finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/CircuitBreakerDecorator.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/CircuitBreakerDecorator.java
index f66f7ae2712..e9163e79cc4 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/CircuitBreakerDecorator.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/CircuitBreakerDecorator.java
@@ -5,30 +5,29 @@
 import io.github.resilience4j.circuitbreaker.CircuitBreaker;
 
 public final class CircuitBreakerDecorator extends Resilience4jSpanDecorator<CircuitBreaker> {
-  public static final CircuitBreakerDecorator DECORATE = new CircuitBreakerDecorator();
-  public static final String TAG_PREFIX = "resilience4j.circuit_breaker.";
-  public static final String TAG_METRICS_PREFIX = TAG_PREFIX + "metrics.";
+    public static final CircuitBreakerDecorator DECORATE = new CircuitBreakerDecorator();
+    public static final String TAG_PREFIX = "resilience4j.circuit_breaker.";
+    public static final String TAG_METRICS_PREFIX = TAG_PREFIX + "metrics.";
 
-  private CircuitBreakerDecorator() {
-    super();
-  }
+    private CircuitBreakerDecorator() {
+        super();
+    }
 
-  @Override
-  public void decorate(AgentSpan span, CircuitBreaker data) {
-    span.setTag(TAG_PREFIX + "name", data.getName());
-    span.setTag(TAG_PREFIX + "state", data.getState().toString());
-    if (Config.get().isResilience4jTagMetricsEnabled()) {
-      CircuitBreaker.Metrics ms = data.getMetrics();
-      span.setTag(TAG_METRICS_PREFIX + "failure_rate", ms.getFailureRate());
-      span.setTag(TAG_METRICS_PREFIX + "slow_call_rate", ms.getSlowCallRate());
-      span.setTag(TAG_METRICS_PREFIX + "slow_calls", ms.getNumberOfSlowCalls());
-      span.setTag(
-          TAG_METRICS_PREFIX + "slow_successful_calls", ms.getNumberOfSlowSuccessfulCalls());
-      span.setTag(TAG_METRICS_PREFIX + "slow_failed_calls", ms.getNumberOfSlowFailedCalls());
-      span.setTag(TAG_METRICS_PREFIX + "buffered_calls", ms.getNumberOfBufferedCalls());
-      span.setTag(TAG_METRICS_PREFIX + "failed_calls", ms.getNumberOfFailedCalls());
-      span.setTag(TAG_METRICS_PREFIX + "not_permitted_calls", ms.getNumberOfNotPermittedCalls());
-      span.setTag(TAG_METRICS_PREFIX + "successful_calls", ms.getNumberOfSuccessfulCalls());
+    @Override
+    public void decorate(AgentSpan span, CircuitBreaker data) {
+        span.setTag(TAG_PREFIX + "name", data.getName());
+        span.setTag(TAG_PREFIX + "state", data.getState().toString());
+        if (Config.get().isResilience4jTagMetricsEnabled()) {
+            CircuitBreaker.Metrics ms = data.getMetrics();
+            span.setTag(TAG_METRICS_PREFIX + "failure_rate", ms.getFailureRate());
+            span.setTag(TAG_METRICS_PREFIX + "slow_call_rate", ms.getSlowCallRate());
+            span.setTag(TAG_METRICS_PREFIX + "slow_calls", ms.getNumberOfSlowCalls());
+            span.setTag(TAG_METRICS_PREFIX + "slow_successful_calls", ms.getNumberOfSlowSuccessfulCalls());
+            span.setTag(TAG_METRICS_PREFIX + "slow_failed_calls", ms.getNumberOfSlowFailedCalls());
+            span.setTag(TAG_METRICS_PREFIX + "buffered_calls", ms.getNumberOfBufferedCalls());
+            span.setTag(TAG_METRICS_PREFIX + "failed_calls", ms.getNumberOfFailedCalls());
+            span.setTag(TAG_METRICS_PREFIX + "not_permitted_calls", ms.getNumberOfNotPermittedCalls());
+            span.setTag(TAG_METRICS_PREFIX + "successful_calls", ms.getNumberOfSuccessfulCalls());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/CircuitBreakerInstrumentation.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/CircuitBreakerInstrumentation.java
index ab4f661d69c..b4680028974 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/CircuitBreakerInstrumentation.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/CircuitBreakerInstrumentation.java
@@ -20,216 +20,203 @@
 import java.util.function.Supplier;
 import net.bytebuddy.asm.Advice;
 
-public final class CircuitBreakerInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  private static final String CIRCUIT_BREAKER_FQCN =
-      "io.github.resilience4j.circuitbreaker.CircuitBreaker";
-  private static final String THIS_CLASS = CircuitBreakerInstrumentation.class.getName();
-
-  @Override
-  public String instrumentedType() {
-    return CIRCUIT_BREAKER_FQCN;
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateCheckedSupplier"))
-            .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
-            .and(returns(named("io.github.resilience4j.core.functions.CheckedSupplier"))),
-        THIS_CLASS + "$CheckedSupplierAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateCheckedFunction"))
-            .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
-            .and(returns(named("io.github.resilience4j.core.functions.CheckedFunction"))),
-        THIS_CLASS + "$CheckedFunctionAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateCheckedConsumer"))
-            .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
-            .and(returns(named("io.github.resilience4j.core.functions.CheckedConsumer"))),
-        THIS_CLASS + "$CheckedConsumerAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateCompletionStage"))
-            .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
-            .and(returns(named(Supplier.class.getName()))),
-        THIS_CLASS + "$CompletionStageAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateFuture"))
-            .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
-            .and(returns(named(Supplier.class.getName()))),
-        THIS_CLASS + "$FutureAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateConsumer"))
-            .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
-            .and(returns(named(Consumer.class.getName()))),
-        THIS_CLASS + "$ConsumerAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateCheckedRunnable"))
-            .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
-            .and(returns(named("io.github.resilience4j.core.functions.CheckedRunnable"))),
-        THIS_CLASS + "$CheckedRunnableAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateCallable"))
-            .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
-            .and(returns(named(Callable.class.getName()))),
-        THIS_CLASS + "$CallableAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateRunnable"))
-            .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
-            .and(returns(named(Runnable.class.getName()))),
-        THIS_CLASS + "$RunnableAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateSupplier"))
-            .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
-            .and(returns(named(Supplier.class.getName()))),
-        THIS_CLASS + "$SupplierAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateFunction"))
-            .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
-            .and(returns(named(Function.class.getName()))),
-        THIS_CLASS + "$FunctionAdvice");
-  }
-
-  public static class SupplierAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
-        @Advice.Return(readOnly = false) Supplier<?> result) {
-      result =
-          new WrapperWithContext.SupplierWithContext<>(
-              result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+public final class CircuitBreakerInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    private static final String CIRCUIT_BREAKER_FQCN = "io.github.resilience4j.circuitbreaker.CircuitBreaker";
+    private static final String THIS_CLASS = CircuitBreakerInstrumentation.class.getName();
+
+    @Override
+    public String instrumentedType() {
+        return CIRCUIT_BREAKER_FQCN;
     }
-  }
-
-  public static class CallableAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
-        @Advice.Return(readOnly = false) Callable<?> result) {
-      result =
-          new WrapperWithContext.CallableWithContext<>(
-              result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateCheckedSupplier"))
+                        .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
+                        .and(returns(named("io.github.resilience4j.core.functions.CheckedSupplier"))),
+                THIS_CLASS + "$CheckedSupplierAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateCheckedFunction"))
+                        .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
+                        .and(returns(named("io.github.resilience4j.core.functions.CheckedFunction"))),
+                THIS_CLASS + "$CheckedFunctionAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateCheckedConsumer"))
+                        .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
+                        .and(returns(named("io.github.resilience4j.core.functions.CheckedConsumer"))),
+                THIS_CLASS + "$CheckedConsumerAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateCompletionStage"))
+                        .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
+                        .and(returns(named(Supplier.class.getName()))),
+                THIS_CLASS + "$CompletionStageAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateFuture"))
+                        .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
+                        .and(returns(named(Supplier.class.getName()))),
+                THIS_CLASS + "$FutureAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateConsumer"))
+                        .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
+                        .and(returns(named(Consumer.class.getName()))),
+                THIS_CLASS + "$ConsumerAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateCheckedRunnable"))
+                        .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
+                        .and(returns(named("io.github.resilience4j.core.functions.CheckedRunnable"))),
+                THIS_CLASS + "$CheckedRunnableAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateCallable"))
+                        .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
+                        .and(returns(named(Callable.class.getName()))),
+                THIS_CLASS + "$CallableAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateRunnable"))
+                        .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
+                        .and(returns(named(Runnable.class.getName()))),
+                THIS_CLASS + "$RunnableAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateSupplier"))
+                        .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
+                        .and(returns(named(Supplier.class.getName()))),
+                THIS_CLASS + "$SupplierAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateFunction"))
+                        .and(takesArgument(0, named(CIRCUIT_BREAKER_FQCN)))
+                        .and(returns(named(Function.class.getName()))),
+                THIS_CLASS + "$FunctionAdvice");
     }
-  }
-
-  public static class RunnableAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
-        @Advice.Return(readOnly = false) Runnable result) {
-      result =
-          new WrapperWithContext.RunnableWithContext<>(
-              result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+
+    public static class SupplierAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
+                @Advice.Return(readOnly = false) Supplier<?> result) {
+            result = new WrapperWithContext.SupplierWithContext<>(
+                    result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+        }
     }
-  }
-
-  public static class FunctionAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
-        @Advice.Return(readOnly = false) Function<?, ?> result) {
-      result =
-          new WrapperWithContext.FunctionWithContext<>(
-              result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+
+    public static class CallableAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
+                @Advice.Return(readOnly = false) Callable<?> result) {
+            result = new WrapperWithContext.CallableWithContext<>(
+                    result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+        }
     }
-  }
-
-  public static class CheckedSupplierAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
-        @Advice.Return(readOnly = false) CheckedSupplier<?> result) {
-      result =
-          new WrapperWithContext.CheckedSupplierWithContext<>(
-              result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+
+    public static class RunnableAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
+                @Advice.Return(readOnly = false) Runnable result) {
+            result = new WrapperWithContext.RunnableWithContext<>(
+                    result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+        }
     }
-  }
-
-  public static class CheckedFunctionAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
-        @Advice.Return(readOnly = false) CheckedFunction<?, ?> result) {
-      result =
-          new WrapperWithContext.CheckedFunctionWithContext<>(
-              result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+
+    public static class FunctionAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
+                @Advice.Return(readOnly = false) Function<?, ?> result) {
+            result = new WrapperWithContext.FunctionWithContext<>(
+                    result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+        }
     }
-  }
-
-  public static class CheckedConsumerAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
-        @Advice.Return(readOnly = false) CheckedConsumer<?> result) {
-      result =
-          new WrapperWithContext.CheckedConsumerWithContext<>(
-              result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+
+    public static class CheckedSupplierAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
+                @Advice.Return(readOnly = false) CheckedSupplier<?> result) {
+            result = new WrapperWithContext.CheckedSupplierWithContext<>(
+                    result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+        }
     }
-  }
-
-  public static class CheckedRunnableAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
-        @Advice.Return(readOnly = false) CheckedRunnable result) {
-      result =
-          new WrapperWithContext.CheckedRunnableWithContext<>(
-              result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+
+    public static class CheckedFunctionAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
+                @Advice.Return(readOnly = false) CheckedFunction<?, ?> result) {
+            result = new WrapperWithContext.CheckedFunctionWithContext<>(
+                    result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+        }
     }
-  }
-
-  public static class ConsumerAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
-        @Advice.Return(readOnly = false) Consumer<?> result) {
-      result =
-          new WrapperWithContext.ConsumerWithContext<>(
-              result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+
+    public static class CheckedConsumerAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
+                @Advice.Return(readOnly = false) CheckedConsumer<?> result) {
+            result = new WrapperWithContext.CheckedConsumerWithContext<>(
+                    result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+        }
+    }
+
+    public static class CheckedRunnableAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
+                @Advice.Return(readOnly = false) CheckedRunnable result) {
+            result = new WrapperWithContext.CheckedRunnableWithContext<>(
+                    result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+        }
     }
-  }
-
-  public static class CompletionStageAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
-        @Advice.Return(readOnly = false) Supplier<CompletionStage<?>> result) {
-      result =
-          new WrapperWithContext.SupplierOfCompletionStageWithContext<>(
-              result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+
+    public static class ConsumerAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
+                @Advice.Return(readOnly = false) Consumer<?> result) {
+            result = new WrapperWithContext.ConsumerWithContext<>(
+                    result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+        }
     }
-  }
-
-  public static class FutureAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
-        @Advice.Return(readOnly = false) Supplier<Future<?>> result) {
-      result =
-          new WrapperWithContext.SupplierOfFutureWithContext<>(
-              result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+
+    public static class CompletionStageAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
+                @Advice.Return(readOnly = false) Supplier<CompletionStage<?>> result) {
+            result = new WrapperWithContext.SupplierOfCompletionStageWithContext<>(
+                    result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+        }
+    }
+
+    public static class FutureAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) CircuitBreaker circuitBreaker,
+                @Advice.Return(readOnly = false) Supplier<Future<?>> result) {
+            result = new WrapperWithContext.SupplierOfFutureWithContext<>(
+                    result, CircuitBreakerDecorator.DECORATE, circuitBreaker);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackCallableInstrumentation.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackCallableInstrumentation.java
index 9a48ce40ff5..cd3a9096336 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackCallableInstrumentation.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackCallableInstrumentation.java
@@ -8,33 +8,29 @@
 import java.util.concurrent.Callable;
 import net.bytebuddy.asm.Advice;
 
-public class FallbackCallableInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class FallbackCallableInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "io.github.resilience4j.decorators.Decorators$DecorateCallable";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("withFallback")),
-        FallbackCallableInstrumentation.class.getName() + "$CallableAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.github.resilience4j.decorators.Decorators$DecorateCallable";
+    }
 
-  public static class CallableAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.FieldValue(value = "callable", readOnly = false) Callable<?> callable) {
-      callable =
-          new WrapperWithContext.CallableWithContext<>(
-              callable, Resilience4jSpanDecorator.DECORATE, null);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("withFallback")),
+                FallbackCallableInstrumentation.class.getName() + "$CallableAdvice");
     }
 
-    // 2.0.0+
-    public static void muzzleCheck(CheckedSupplier<?> cs) throws Throwable {
-      cs.get();
+    public static class CallableAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(@Advice.FieldValue(value = "callable", readOnly = false) Callable<?> callable) {
+            callable = new WrapperWithContext.CallableWithContext<>(callable, Resilience4jSpanDecorator.DECORATE, null);
+        }
+
+        // 2.0.0+
+        public static void muzzleCheck(CheckedSupplier<?> cs) throws Throwable {
+            cs.get();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackCheckedSupplierInstrumentation.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackCheckedSupplierInstrumentation.java
index 8748a3faac9..c9f6bc6fef9 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackCheckedSupplierInstrumentation.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackCheckedSupplierInstrumentation.java
@@ -8,27 +8,26 @@
 import net.bytebuddy.asm.Advice;
 
 public class FallbackCheckedSupplierInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "io.github.resilience4j.decorators.Decorators$DecorateCheckedSupplier";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.github.resilience4j.decorators.Decorators$DecorateCheckedSupplier";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("withFallback")),
-        FallbackCheckedSupplierInstrumentation.class.getName() + "$CheckedSupplierAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("withFallback")),
+                FallbackCheckedSupplierInstrumentation.class.getName() + "$CheckedSupplierAdvice");
+    }
 
-  public static class CheckedSupplierAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.FieldValue(value = "supplier", readOnly = false) CheckedSupplier<?> supplier) {
-      supplier =
-          new WrapperWithContext.CheckedSupplierWithContext<>(
-              supplier, Resilience4jSpanDecorator.DECORATE, null);
+    public static class CheckedSupplierAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.FieldValue(value = "supplier", readOnly = false) CheckedSupplier<?> supplier) {
+            supplier = new WrapperWithContext.CheckedSupplierWithContext<>(
+                    supplier, Resilience4jSpanDecorator.DECORATE, null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackCompletionStageInstrumentation.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackCompletionStageInstrumentation.java
index 36e4414f4cb..ac64ff8c5c1 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackCompletionStageInstrumentation.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackCompletionStageInstrumentation.java
@@ -10,33 +10,32 @@
 import net.bytebuddy.asm.Advice;
 
 public class FallbackCompletionStageInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "io.github.resilience4j.decorators.Decorators$DecorateCompletionStage";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("withFallback")),
-        FallbackCompletionStageInstrumentation.class.getName() + "$CompletionStageAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.github.resilience4j.decorators.Decorators$DecorateCompletionStage";
+    }
 
-  public static class CompletionStageAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.FieldValue(value = "stageSupplier", readOnly = false)
-            Supplier<CompletionStage<?>> stageSupplier) {
-      stageSupplier =
-          new WrapperWithContext.SupplierOfCompletionStageWithContext<>(
-              stageSupplier, Resilience4jSpanDecorator.DECORATE, null);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("withFallback")),
+                FallbackCompletionStageInstrumentation.class.getName() + "$CompletionStageAdvice");
     }
 
-    // 2.0.0+
-    public static void muzzleCheck(CheckedSupplier<?> cs) throws Throwable {
-      cs.get();
+    public static class CompletionStageAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.FieldValue(value = "stageSupplier", readOnly = false)
+                        Supplier<CompletionStage<?>> stageSupplier) {
+            stageSupplier = new WrapperWithContext.SupplierOfCompletionStageWithContext<>(
+                    stageSupplier, Resilience4jSpanDecorator.DECORATE, null);
+        }
+
+        // 2.0.0+
+        public static void muzzleCheck(CheckedSupplier<?> cs) throws Throwable {
+            cs.get();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackSupplierInstrumentation.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackSupplierInstrumentation.java
index dfab63300fb..75f43b01699 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackSupplierInstrumentation.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackSupplierInstrumentation.java
@@ -8,33 +8,29 @@
 import java.util.function.Supplier;
 import net.bytebuddy.asm.Advice;
 
-public class FallbackSupplierInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class FallbackSupplierInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "io.github.resilience4j.decorators.Decorators$DecorateSupplier";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("withFallback")),
-        FallbackSupplierInstrumentation.class.getName() + "$SupplierAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.github.resilience4j.decorators.Decorators$DecorateSupplier";
+    }
 
-  public static class SupplierAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.FieldValue(value = "supplier", readOnly = false) Supplier<?> supplier) {
-      supplier =
-          new WrapperWithContext.SupplierWithContext<>(
-              supplier, Resilience4jSpanDecorator.DECORATE, null);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("withFallback")),
+                FallbackSupplierInstrumentation.class.getName() + "$SupplierAdvice");
     }
 
-    // 2.0.0+
-    public static void muzzleCheck(CheckedSupplier<?> cs) throws Throwable {
-      cs.get();
+    public static class SupplierAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(@Advice.FieldValue(value = "supplier", readOnly = false) Supplier<?> supplier) {
+            supplier = new WrapperWithContext.SupplierWithContext<>(supplier, Resilience4jSpanDecorator.DECORATE, null);
+        }
+
+        // 2.0.0+
+        public static void muzzleCheck(CheckedSupplier<?> cs) throws Throwable {
+            cs.get();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jModule.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jModule.java
index b50a53fd4fd..04432414256 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jModule.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jModule.java
@@ -9,18 +9,18 @@
 @AutoService(InstrumenterModule.class)
 public class Resilience4jModule extends InstrumenterModule.Tracing {
 
-  public Resilience4jModule() {
-    super("resilience4j");
-  }
+    public Resilience4jModule() {
+        super("resilience4j");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new CircuitBreakerInstrumentation(),
-        new FallbackCallableInstrumentation(),
-        new FallbackCheckedSupplierInstrumentation(),
-        new FallbackCompletionStageInstrumentation(),
-        new FallbackSupplierInstrumentation(),
-        new RetryInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(
+                new CircuitBreakerInstrumentation(),
+                new FallbackCallableInstrumentation(),
+                new FallbackCheckedSupplierInstrumentation(),
+                new FallbackCompletionStageInstrumentation(),
+                new FallbackSupplierInstrumentation(),
+                new RetryInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jSpan.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jSpan.java
index bab9e52cda3..5b19bfc3a6f 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jSpan.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jSpan.java
@@ -5,25 +5,25 @@
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 
 public class Resilience4jSpan {
-  public static final String INSTRUMENTATION_NAME = "resilience4j";
-  public static final CharSequence SPAN_NAME = UTF8BytesString.create(INSTRUMENTATION_NAME);
+    public static final String INSTRUMENTATION_NAME = "resilience4j";
+    public static final CharSequence SPAN_NAME = UTF8BytesString.create(INSTRUMENTATION_NAME);
 
-  public static AgentSpan current() {
-    AgentSpan span = AgentTracer.activeSpan();
-    if (span == null) {
-      return null;
+    public static AgentSpan current() {
+        AgentSpan span = AgentTracer.activeSpan();
+        if (span == null) {
+            return null;
+        }
+        CharSequence operationName = span.getOperationName();
+        if (operationName == null) {
+            return null;
+        }
+        if (!SPAN_NAME.toString().equals(operationName.toString())) {
+            return null;
+        }
+        return span;
     }
-    CharSequence operationName = span.getOperationName();
-    if (operationName == null) {
-      return null;
-    }
-    if (!SPAN_NAME.toString().equals(operationName.toString())) {
-      return null;
-    }
-    return span;
-  }
 
-  public static AgentSpan start() {
-    return AgentTracer.startSpan(INSTRUMENTATION_NAME, SPAN_NAME);
-  }
+    public static AgentSpan start() {
+        return AgentTracer.startSpan(INSTRUMENTATION_NAME, SPAN_NAME);
+    }
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jSpanDecorator.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jSpanDecorator.java
index 6b484ec042d..1d534a5fcef 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jSpanDecorator.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jSpanDecorator.java
@@ -8,34 +8,34 @@
 import javax.annotation.Nonnull;
 
 public class Resilience4jSpanDecorator<T> extends BaseDecorator {
-  public static final Resilience4jSpanDecorator<Void> DECORATE = new Resilience4jSpanDecorator<>();
-
-  private static final CharSequence RESILIENCE4J = UTF8BytesString.create("resilience4j");
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"resilience4j"};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return RESILIENCE4J;
-  }
-
-  @Override
-  protected void doAfterStart(@Nonnull AgentSpan span) {
-    super.doAfterStart(span);
-    span.setSpanName(RESILIENCE4J);
-    span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_INTERNAL);
-    if (Config.get().isResilience4jMeasuredEnabled()) {
-      span.setMeasured(true);
+    public static final Resilience4jSpanDecorator<Void> DECORATE = new Resilience4jSpanDecorator<>();
+
+    private static final CharSequence RESILIENCE4J = UTF8BytesString.create("resilience4j");
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"resilience4j"};
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return RESILIENCE4J;
+    }
+
+    @Override
+    protected void doAfterStart(@Nonnull AgentSpan span) {
+        super.doAfterStart(span);
+        span.setSpanName(RESILIENCE4J);
+        span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_INTERNAL);
+        if (Config.get().isResilience4jMeasuredEnabled()) {
+            span.setMeasured(true);
+        }
     }
-  }
 
-  public void decorate(AgentSpan span, T data) {}
+    public void decorate(AgentSpan span, T data) {}
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/RetryDecorator.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/RetryDecorator.java
index be4da0523e1..ecdd2c9eeb0 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/RetryDecorator.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/RetryDecorator.java
@@ -5,38 +5,32 @@
 import io.github.resilience4j.retry.Retry;
 
 public final class RetryDecorator extends Resilience4jSpanDecorator<Retry> {
-  public static final RetryDecorator DECORATE = new RetryDecorator();
-  public static final String TAG_PREFIX = "resilience4j.retry.";
-  public static final String TAG_METRICS_PREFIX = TAG_PREFIX + "metrics.";
+    public static final RetryDecorator DECORATE = new RetryDecorator();
+    public static final String TAG_PREFIX = "resilience4j.retry.";
+    public static final String TAG_METRICS_PREFIX = TAG_PREFIX + "metrics.";
 
-  private RetryDecorator() {
-    super();
-  }
+    private RetryDecorator() {
+        super();
+    }
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"resilience4j.retry"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"resilience4j.retry"};
+    }
 
-  @Override
-  public void decorate(AgentSpan span, Retry data) {
-    span.setTag(TAG_PREFIX + "name", data.getName());
-    span.setTag(TAG_PREFIX + "max_attempts", data.getRetryConfig().getMaxAttempts());
-    span.setTag(
-        TAG_PREFIX + "fail_after_max_attempts", data.getRetryConfig().isFailAfterMaxAttempts());
-    if (Config.get().isResilience4jTagMetricsEnabled()) {
-      Retry.Metrics ms = data.getMetrics();
-      span.setTag(
-          TAG_METRICS_PREFIX + "success_without_retry",
-          ms.getNumberOfSuccessfulCallsWithoutRetryAttempt());
-      span.setTag(
-          TAG_METRICS_PREFIX + "failed_without_retry",
-          ms.getNumberOfFailedCallsWithoutRetryAttempt());
-      span.setTag(
-          TAG_METRICS_PREFIX + "success_with_retry",
-          ms.getNumberOfSuccessfulCallsWithRetryAttempt());
-      span.setTag(
-          TAG_METRICS_PREFIX + "failed_with_retry", ms.getNumberOfFailedCallsWithRetryAttempt());
+    @Override
+    public void decorate(AgentSpan span, Retry data) {
+        span.setTag(TAG_PREFIX + "name", data.getName());
+        span.setTag(TAG_PREFIX + "max_attempts", data.getRetryConfig().getMaxAttempts());
+        span.setTag(
+                TAG_PREFIX + "fail_after_max_attempts", data.getRetryConfig().isFailAfterMaxAttempts());
+        if (Config.get().isResilience4jTagMetricsEnabled()) {
+            Retry.Metrics ms = data.getMetrics();
+            span.setTag(
+                    TAG_METRICS_PREFIX + "success_without_retry", ms.getNumberOfSuccessfulCallsWithoutRetryAttempt());
+            span.setTag(TAG_METRICS_PREFIX + "failed_without_retry", ms.getNumberOfFailedCallsWithoutRetryAttempt());
+            span.setTag(TAG_METRICS_PREFIX + "success_with_retry", ms.getNumberOfSuccessfulCallsWithRetryAttempt());
+            span.setTag(TAG_METRICS_PREFIX + "failed_with_retry", ms.getNumberOfFailedCallsWithRetryAttempt());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/RetryInstrumentation.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/RetryInstrumentation.java
index 8857a2a3ce0..59a15a2d5e5 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/RetryInstrumentation.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/RetryInstrumentation.java
@@ -17,152 +17,139 @@
 import java.util.function.Supplier;
 import net.bytebuddy.asm.Advice;
 
-public final class RetryInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  private static final String RETRY_FQCN = "io.github.resilience4j.retry.Retry";
-  private static final String THIS_CLASS = RetryInstrumentation.class.getName();
+public final class RetryInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    private static final String RETRY_FQCN = "io.github.resilience4j.retry.Retry";
+    private static final String THIS_CLASS = RetryInstrumentation.class.getName();
 
-  @Override
-  public String instrumentedType() {
-    return RETRY_FQCN;
-  }
+    @Override
+    public String instrumentedType() {
+        return RETRY_FQCN;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateCompletionStage"))
-            .and(takesArgument(0, named(RETRY_FQCN)))
-            .and(returns(named(Supplier.class.getName()))),
-        THIS_CLASS + "$CompletionStageAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateCheckedSupplier"))
-            .and(takesArgument(0, named(RETRY_FQCN)))
-            .and(returns(named("io.github.resilience4j.core.functions.CheckedSupplier"))),
-        THIS_CLASS + "$CheckedSupplierAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateCheckedRunnable"))
-            .and(takesArgument(0, named(RETRY_FQCN)))
-            .and(returns(named("io.github.resilience4j.core.functions.CheckedRunnable"))),
-        THIS_CLASS + "$CheckedRunnableAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateCallable"))
-            .and(takesArgument(0, named(RETRY_FQCN)))
-            .and(returns(named(Callable.class.getName()))),
-        THIS_CLASS + "$CallableAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateSupplier"))
-            .and(takesArgument(0, named(RETRY_FQCN)))
-            .and(returns(named(Supplier.class.getName()))),
-        THIS_CLASS + "$SupplierAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateFunction"))
-            .and(takesArgument(0, named(RETRY_FQCN)))
-            .and(returns(named(Function.class.getName()))),
-        THIS_CLASS + "$FunctionAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateCheckedFunction"))
-            .and(takesArgument(0, named(RETRY_FQCN)))
-            .and(returns(named("io.github.resilience4j.core.functions.CheckedFunction"))),
-        THIS_CLASS + "$CheckedFunctionAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("decorateRunnable"))
-            .and(takesArgument(0, named(RETRY_FQCN)))
-            .and(returns(named(Runnable.class.getName()))),
-        THIS_CLASS + "$RunnableAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateCompletionStage"))
+                        .and(takesArgument(0, named(RETRY_FQCN)))
+                        .and(returns(named(Supplier.class.getName()))),
+                THIS_CLASS + "$CompletionStageAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateCheckedSupplier"))
+                        .and(takesArgument(0, named(RETRY_FQCN)))
+                        .and(returns(named("io.github.resilience4j.core.functions.CheckedSupplier"))),
+                THIS_CLASS + "$CheckedSupplierAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateCheckedRunnable"))
+                        .and(takesArgument(0, named(RETRY_FQCN)))
+                        .and(returns(named("io.github.resilience4j.core.functions.CheckedRunnable"))),
+                THIS_CLASS + "$CheckedRunnableAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateCallable"))
+                        .and(takesArgument(0, named(RETRY_FQCN)))
+                        .and(returns(named(Callable.class.getName()))),
+                THIS_CLASS + "$CallableAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateSupplier"))
+                        .and(takesArgument(0, named(RETRY_FQCN)))
+                        .and(returns(named(Supplier.class.getName()))),
+                THIS_CLASS + "$SupplierAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateFunction"))
+                        .and(takesArgument(0, named(RETRY_FQCN)))
+                        .and(returns(named(Function.class.getName()))),
+                THIS_CLASS + "$FunctionAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateCheckedFunction"))
+                        .and(takesArgument(0, named(RETRY_FQCN)))
+                        .and(returns(named("io.github.resilience4j.core.functions.CheckedFunction"))),
+                THIS_CLASS + "$CheckedFunctionAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isStatic())
+                        .and(named("decorateRunnable"))
+                        .and(takesArgument(0, named(RETRY_FQCN)))
+                        .and(returns(named(Runnable.class.getName()))),
+                THIS_CLASS + "$RunnableAdvice");
+    }
 
-  public static class SupplierAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) Retry retry,
-        @Advice.Return(readOnly = false) Supplier<?> result) {
-      result = new WrapperWithContext.SupplierWithContext<>(result, RetryDecorator.DECORATE, retry);
+    public static class SupplierAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) Retry retry, @Advice.Return(readOnly = false) Supplier<?> result) {
+            result = new WrapperWithContext.SupplierWithContext<>(result, RetryDecorator.DECORATE, retry);
+        }
     }
-  }
 
-  public static class CallableAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) Retry retry,
-        @Advice.Return(readOnly = false) Callable<?> result) {
-      result = new WrapperWithContext.CallableWithContext<>(result, RetryDecorator.DECORATE, retry);
+    public static class CallableAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) Retry retry, @Advice.Return(readOnly = false) Callable<?> result) {
+            result = new WrapperWithContext.CallableWithContext<>(result, RetryDecorator.DECORATE, retry);
+        }
     }
-  }
 
-  public static class FunctionAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) Retry retry,
-        @Advice.Return(readOnly = false) Function<?, ?> result) {
-      result = new WrapperWithContext.FunctionWithContext<>(result, RetryDecorator.DECORATE, retry);
+    public static class FunctionAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) Retry retry, @Advice.Return(readOnly = false) Function<?, ?> result) {
+            result = new WrapperWithContext.FunctionWithContext<>(result, RetryDecorator.DECORATE, retry);
+        }
     }
-  }
 
-  public static class CheckedFunctionAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) Retry retry,
-        @Advice.Return(readOnly = false) CheckedFunction<?, ?> result) {
-      result =
-          new WrapperWithContext.CheckedFunctionWithContext<>(
-              result, RetryDecorator.DECORATE, retry);
+    public static class CheckedFunctionAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) Retry retry,
+                @Advice.Return(readOnly = false) CheckedFunction<?, ?> result) {
+            result = new WrapperWithContext.CheckedFunctionWithContext<>(result, RetryDecorator.DECORATE, retry);
+        }
     }
-  }
 
-  public static class CheckedSupplierAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) Retry retry,
-        @Advice.Return(readOnly = false) CheckedSupplier<?> result) {
-      result =
-          new WrapperWithContext.CheckedSupplierWithContext<>(
-              result, RetryDecorator.DECORATE, retry);
+    public static class CheckedSupplierAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) Retry retry, @Advice.Return(readOnly = false) CheckedSupplier<?> result) {
+            result = new WrapperWithContext.CheckedSupplierWithContext<>(result, RetryDecorator.DECORATE, retry);
+        }
     }
-  }
 
-  public static class CheckedRunnableAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) Retry retry,
-        @Advice.Return(readOnly = false) CheckedRunnable result) {
-      result =
-          new WrapperWithContext.CheckedRunnableWithContext<>(
-              result, RetryDecorator.DECORATE, retry);
+    public static class CheckedRunnableAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) Retry retry, @Advice.Return(readOnly = false) CheckedRunnable result) {
+            result = new WrapperWithContext.CheckedRunnableWithContext<>(result, RetryDecorator.DECORATE, retry);
+        }
     }
-  }
 
-  public static class CompletionStageAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) Retry retry,
-        @Advice.Return(readOnly = false) Supplier<CompletionStage<?>> result) {
-      result =
-          new WrapperWithContext.SupplierOfCompletionStageWithContext<>(
-              result, RetryDecorator.DECORATE, retry);
+    public static class CompletionStageAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) Retry retry,
+                @Advice.Return(readOnly = false) Supplier<CompletionStage<?>> result) {
+            result = new WrapperWithContext.SupplierOfCompletionStageWithContext<>(
+                    result, RetryDecorator.DECORATE, retry);
+        }
     }
-  }
 
-  public static class RunnableAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Argument(value = 0) Retry retry, @Advice.Return(readOnly = false) Runnable result) {
-      result = new WrapperWithContext.RunnableWithContext<>(result, RetryDecorator.DECORATE, retry);
+    public static class RunnableAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Argument(value = 0) Retry retry, @Advice.Return(readOnly = false) Runnable result) {
+            result = new WrapperWithContext.RunnableWithContext<>(result, RetryDecorator.DECORATE, retry);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/WrapperWithContext.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/WrapperWithContext.java
index 98236acbe1c..353345e8af9 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/WrapperWithContext.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/WrapperWithContext.java
@@ -20,310 +20,293 @@
 
 public class WrapperWithContext<T> {
 
-  public static final class CheckedConsumerWithContext<T, I> extends WrapperWithContext<T>
-      implements CheckedConsumer<I> {
-    private final CheckedConsumer<I> delegate;
-
-    public CheckedConsumerWithContext(
-        CheckedConsumer<I> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
-      super(spanDecorator, data);
-      this.delegate = delegate;
-    }
+    public static final class CheckedConsumerWithContext<T, I> extends WrapperWithContext<T>
+            implements CheckedConsumer<I> {
+        private final CheckedConsumer<I> delegate;
+
+        public CheckedConsumerWithContext(
+                CheckedConsumer<I> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
+            super(spanDecorator, data);
+            this.delegate = delegate;
+        }
 
-    @Override
-    public void accept(I arg) throws Throwable {
-      try (ContextScope ignore = activateScope()) {
-        delegate.accept(arg);
-      } finally {
-        finishSpanIfNeeded();
-      }
+        @Override
+        public void accept(I arg) throws Throwable {
+            try (ContextScope ignore = activateScope()) {
+                delegate.accept(arg);
+            } finally {
+                finishSpanIfNeeded();
+            }
+        }
     }
-  }
 
-  public static final class ConsumerWithContext<T, I> extends WrapperWithContext<T>
-      implements Consumer<I> {
-    private final Consumer<I> delegate;
+    public static final class ConsumerWithContext<T, I> extends WrapperWithContext<T> implements Consumer<I> {
+        private final Consumer<I> delegate;
 
-    public ConsumerWithContext(
-        Consumer<I> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
-      super(spanDecorator, data);
-      this.delegate = delegate;
-    }
+        public ConsumerWithContext(Consumer<I> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
+            super(spanDecorator, data);
+            this.delegate = delegate;
+        }
 
-    @Override
-    public void accept(I arg) {
-      try (ContextScope ignore = activateScope()) {
-        delegate.accept(arg);
-      } finally {
-        finishSpanIfNeeded();
-      }
+        @Override
+        public void accept(I arg) {
+            try (ContextScope ignore = activateScope()) {
+                delegate.accept(arg);
+            } finally {
+                finishSpanIfNeeded();
+            }
+        }
     }
-  }
 
-  public static final class CheckedFunctionWithContext<T, I, O> extends WrapperWithContext<T>
-      implements CheckedFunction<I, O> {
-    private final CheckedFunction<I, O> delegate;
+    public static final class CheckedFunctionWithContext<T, I, O> extends WrapperWithContext<T>
+            implements CheckedFunction<I, O> {
+        private final CheckedFunction<I, O> delegate;
 
-    public CheckedFunctionWithContext(
-        CheckedFunction<I, O> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
-      super(spanDecorator, data);
-      this.delegate = delegate;
-    }
+        public CheckedFunctionWithContext(
+                CheckedFunction<I, O> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
+            super(spanDecorator, data);
+            this.delegate = delegate;
+        }
 
-    @Override
-    public O apply(I arg) throws Throwable {
-      try (ContextScope ignore = activateScope()) {
-        return delegate.apply(arg);
-      } finally {
-        finishSpanIfNeeded();
-      }
+        @Override
+        public O apply(I arg) throws Throwable {
+            try (ContextScope ignore = activateScope()) {
+                return delegate.apply(arg);
+            } finally {
+                finishSpanIfNeeded();
+            }
+        }
     }
-  }
 
-  public static final class SupplierWithContext<T, O> extends WrapperWithContext<T>
-      implements Supplier<O> {
-    private final Supplier<O> delegate;
+    public static final class SupplierWithContext<T, O> extends WrapperWithContext<T> implements Supplier<O> {
+        private final Supplier<O> delegate;
 
-    public SupplierWithContext(
-        Supplier<O> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
-      super(spanDecorator, data);
-      this.delegate = delegate;
-    }
+        public SupplierWithContext(Supplier<O> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
+            super(spanDecorator, data);
+            this.delegate = delegate;
+        }
 
-    @Override
-    public O get() {
-      try (ContextScope ignore = activateScope()) {
-        return delegate.get();
-      } finally {
-        finishSpanIfNeeded();
-      }
+        @Override
+        public O get() {
+            try (ContextScope ignore = activateScope()) {
+                return delegate.get();
+            } finally {
+                finishSpanIfNeeded();
+            }
+        }
     }
-  }
 
-  public static final class CallableWithContext<T, O> extends WrapperWithContext<T>
-      implements Callable<O> {
-    private final Callable<O> delegate;
+    public static final class CallableWithContext<T, O> extends WrapperWithContext<T> implements Callable<O> {
+        private final Callable<O> delegate;
 
-    public CallableWithContext(
-        Callable<O> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
-      super(spanDecorator, data);
-      this.delegate = delegate;
-    }
+        public CallableWithContext(Callable<O> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
+            super(spanDecorator, data);
+            this.delegate = delegate;
+        }
 
-    @Override
-    public O call() throws Exception {
-      try (ContextScope ignore = activateScope()) {
-        return delegate.call();
-      } finally {
-        finishSpanIfNeeded();
-      }
+        @Override
+        public O call() throws Exception {
+            try (ContextScope ignore = activateScope()) {
+                return delegate.call();
+            } finally {
+                finishSpanIfNeeded();
+            }
+        }
     }
-  }
 
-  public static final class FunctionWithContext<T, I, O> extends WrapperWithContext<T>
-      implements Function<I, O> {
-    private final Function<I, O> delegate;
+    public static final class FunctionWithContext<T, I, O> extends WrapperWithContext<T> implements Function<I, O> {
+        private final Function<I, O> delegate;
 
-    public FunctionWithContext(
-        Function<I, O> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
-      super(spanDecorator, data);
-      this.delegate = delegate;
-    }
+        public FunctionWithContext(Function<I, O> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
+            super(spanDecorator, data);
+            this.delegate = delegate;
+        }
 
-    @Override
-    public O apply(I arg) {
-      try (ContextScope ignore = activateScope()) {
-        return delegate.apply(arg);
-      } finally {
-        finishSpanIfNeeded();
-      }
+        @Override
+        public O apply(I arg) {
+            try (ContextScope ignore = activateScope()) {
+                return delegate.apply(arg);
+            } finally {
+                finishSpanIfNeeded();
+            }
+        }
     }
-  }
 
-  public static final class CheckedSupplierWithContext<T, O> extends WrapperWithContext<T>
-      implements CheckedSupplier<O> {
-    private final CheckedSupplier<O> delegate;
+    public static final class CheckedSupplierWithContext<T, O> extends WrapperWithContext<T>
+            implements CheckedSupplier<O> {
+        private final CheckedSupplier<O> delegate;
 
-    public CheckedSupplierWithContext(
-        CheckedSupplier<O> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
-      super(spanDecorator, data);
-      this.delegate = delegate;
-    }
+        public CheckedSupplierWithContext(
+                CheckedSupplier<O> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
+            super(spanDecorator, data);
+            this.delegate = delegate;
+        }
 
-    @Override
-    public O get() throws Throwable {
-      try (ContextScope ignore = activateScope()) {
-        return delegate.get();
-      } finally {
-        finishSpanIfNeeded();
-      }
+        @Override
+        public O get() throws Throwable {
+            try (ContextScope ignore = activateScope()) {
+                return delegate.get();
+            } finally {
+                finishSpanIfNeeded();
+            }
+        }
     }
-  }
 
-  public static final class CheckedRunnableWithContext<T> extends WrapperWithContext<T>
-      implements CheckedRunnable {
-    private final CheckedRunnable delegate;
+    public static final class CheckedRunnableWithContext<T> extends WrapperWithContext<T> implements CheckedRunnable {
+        private final CheckedRunnable delegate;
 
-    public CheckedRunnableWithContext(
-        CheckedRunnable delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
-      super(spanDecorator, data);
-      this.delegate = delegate;
-    }
+        public CheckedRunnableWithContext(
+                CheckedRunnable delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
+            super(spanDecorator, data);
+            this.delegate = delegate;
+        }
 
-    @Override
-    public void run() throws Throwable {
-      try (ContextScope ignore = activateScope()) {
-        delegate.run();
-      } finally {
-        finishSpanIfNeeded();
-      }
+        @Override
+        public void run() throws Throwable {
+            try (ContextScope ignore = activateScope()) {
+                delegate.run();
+            } finally {
+                finishSpanIfNeeded();
+            }
+        }
     }
-  }
 
-  public static final class RunnableWithContext<T> extends WrapperWithContext<T>
-      implements Runnable {
-    private final Runnable delegate;
+    public static final class RunnableWithContext<T> extends WrapperWithContext<T> implements Runnable {
+        private final Runnable delegate;
 
-    public RunnableWithContext(
-        Runnable delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
-      super(spanDecorator, data);
-      this.delegate = delegate;
-    }
+        public RunnableWithContext(Runnable delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
+            super(spanDecorator, data);
+            this.delegate = delegate;
+        }
 
-    @Override
-    public void run() {
-      try (ContextScope ignore = activateScope()) {
-        delegate.run();
-      } finally {
-        finishSpanIfNeeded();
-      }
+        @Override
+        public void run() {
+            try (ContextScope ignore = activateScope()) {
+                delegate.run();
+            } finally {
+                finishSpanIfNeeded();
+            }
+        }
     }
-  }
 
-  public static final class SupplierOfCompletionStageWithContext<T> extends WrapperWithContext<T>
-      implements Supplier<CompletionStage<?>> {
-    private final Supplier<CompletionStage<?>> delegate;
+    public static final class SupplierOfCompletionStageWithContext<T> extends WrapperWithContext<T>
+            implements Supplier<CompletionStage<?>> {
+        private final Supplier<CompletionStage<?>> delegate;
 
-    public SupplierOfCompletionStageWithContext(
-        Supplier<CompletionStage<?>> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
-      super(spanDecorator, data);
-      this.delegate = delegate;
-    }
+        public SupplierOfCompletionStageWithContext(
+                Supplier<CompletionStage<?>> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
+            super(spanDecorator, data);
+            this.delegate = delegate;
+        }
 
-    @Override
-    public CompletionStage<?> get() {
-      try (ContextScope ignore = activateScope()) {
-        return delegate
-            .get()
-            .whenComplete(
-                (v, e) -> {
-                  finishSpanIfNeeded();
+        @Override
+        public CompletionStage<?> get() {
+            try (ContextScope ignore = activateScope()) {
+                return delegate.get().whenComplete((v, e) -> {
+                    finishSpanIfNeeded();
                 });
-      }
+            }
+        }
     }
-  }
 
-  public static final class SupplierOfFutureWithContext<T> extends WrapperWithContext<T>
-      implements Supplier<Future<?>> {
-    private final Supplier<Future<?>> delegate;
+    public static final class SupplierOfFutureWithContext<T> extends WrapperWithContext<T>
+            implements Supplier<Future<?>> {
+        private final Supplier<Future<?>> delegate;
 
-    public SupplierOfFutureWithContext(
-        Supplier<Future<?>> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
-      super(spanDecorator, data);
-      this.delegate = delegate;
-    }
+        public SupplierOfFutureWithContext(
+                Supplier<Future<?>> delegate, Resilience4jSpanDecorator<T> spanDecorator, T data) {
+            super(spanDecorator, data);
+            this.delegate = delegate;
+        }
 
-    @Override
-    public Future<?> get() {
-      try (ContextScope ignore = activateScope()) {
-        Future<?> future = delegate.get();
-        if (future instanceof CompletableFuture) {
-          ((CompletableFuture<?>) future)
-              .whenComplete(
-                  (v, e) -> {
-                    finishSpanIfNeeded();
-                  });
-          return future;
+        @Override
+        public Future<?> get() {
+            try (ContextScope ignore = activateScope()) {
+                Future<?> future = delegate.get();
+                if (future instanceof CompletableFuture) {
+                    ((CompletableFuture<?>) future).whenComplete((v, e) -> {
+                        finishSpanIfNeeded();
+                    });
+                    return future;
+                }
+                return new FinishOnGetFuture<>(future, this);
+            }
         }
-        return new FinishOnGetFuture<>(future, this);
-      }
     }
-  }
 
-  private static final class FinishOnGetFuture<V> implements Future<V> {
-    private final Future<V> delegate;
-    private final WrapperWithContext<?> context;
+    private static final class FinishOnGetFuture<V> implements Future<V> {
+        private final Future<V> delegate;
+        private final WrapperWithContext<?> context;
 
-    FinishOnGetFuture(Future<V> delegate, WrapperWithContext<?> context) {
-      this.delegate = delegate;
-      this.context = context;
-    }
+        FinishOnGetFuture(Future<V> delegate, WrapperWithContext<?> context) {
+            this.delegate = delegate;
+            this.context = context;
+        }
 
-    @Override
-    public boolean cancel(boolean mayInterruptIfRunning) {
-      try {
-        return delegate.cancel(mayInterruptIfRunning);
-      } finally {
-        context.finishSpanIfNeeded();
-      }
-    }
+        @Override
+        public boolean cancel(boolean mayInterruptIfRunning) {
+            try {
+                return delegate.cancel(mayInterruptIfRunning);
+            } finally {
+                context.finishSpanIfNeeded();
+            }
+        }
 
-    @Override
-    public boolean isCancelled() {
-      return delegate.isCancelled();
-    }
+        @Override
+        public boolean isCancelled() {
+            return delegate.isCancelled();
+        }
 
-    @Override
-    public boolean isDone() {
-      return delegate.isDone();
-    }
+        @Override
+        public boolean isDone() {
+            return delegate.isDone();
+        }
+
+        @Override
+        public V get() throws InterruptedException, ExecutionException {
+            try {
+                return delegate.get();
+            } finally {
+                context.finishSpanIfNeeded();
+            }
+        }
 
-    @Override
-    public V get() throws InterruptedException, ExecutionException {
-      try {
-        return delegate.get();
-      } finally {
-        context.finishSpanIfNeeded();
-      }
+        @Override
+        public V get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+            try {
+                return delegate.get(timeout, unit);
+            } finally {
+                context.finishSpanIfNeeded();
+            }
+        }
     }
 
-    @Override
-    public V get(long timeout, TimeUnit unit)
-        throws InterruptedException, ExecutionException, TimeoutException {
-      try {
-        return delegate.get(timeout, unit);
-      } finally {
-        context.finishSpanIfNeeded();
-      }
+    private final Resilience4jSpanDecorator<T> spanDecorator;
+    private final T data;
+    private AgentSpan span;
+
+    protected WrapperWithContext(Resilience4jSpanDecorator<T> spanDecorator, T data) {
+        this.spanDecorator = spanDecorator;
+        this.data = data;
     }
-  }
-
-  private final Resilience4jSpanDecorator<T> spanDecorator;
-  private final T data;
-  private AgentSpan span;
-
-  protected WrapperWithContext(Resilience4jSpanDecorator<T> spanDecorator, T data) {
-    this.spanDecorator = spanDecorator;
-    this.data = data;
-  }
-
-  public ContextScope activateScope() {
-    AgentSpan current = Resilience4jSpan.current();
-    AgentSpan owned = current == null ? Resilience4jSpan.start() : null;
-    if (owned != null) {
-      current = owned;
-      spanDecorator.afterStart(owned);
-      this.span = owned;
+
+    public ContextScope activateScope() {
+        AgentSpan current = Resilience4jSpan.current();
+        AgentSpan owned = current == null ? Resilience4jSpan.start() : null;
+        if (owned != null) {
+            current = owned;
+            spanDecorator.afterStart(owned);
+            this.span = owned;
+        }
+        spanDecorator.decorate(current, data);
+        return AgentTracer.activateSpan(current);
     }
-    spanDecorator.decorate(current, data);
-    return AgentTracer.activateSpan(current);
-  }
-
-  public void finishSpanIfNeeded() {
-    if (span != null) {
-      spanDecorator.beforeFinish(span);
-      span.finish();
-      span = null;
+
+    public void finishSpanIfNeeded() {
+        if (span != null) {
+            spanDecorator.beforeFinish(span);
+            span.finish();
+            span = null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/CircuitBreakerOperatorInstrumentation.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/CircuitBreakerOperatorInstrumentation.java
index 7dbc912eb44..af9e24ac8c9 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/CircuitBreakerOperatorInstrumentation.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/CircuitBreakerOperatorInstrumentation.java
@@ -11,37 +11,32 @@
 import net.bytebuddy.asm.Advice;
 import org.reactivestreams.Publisher;
 
-public class CircuitBreakerOperatorInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  @Override
-  public String instrumentedType() {
-    return "io.github.resilience4j.reactor.circuitbreaker.operator.CircuitBreakerOperator";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("apply"))
-            .and(takesArgument(0, named("org.reactivestreams.Publisher"))),
-        CircuitBreakerOperatorInstrumentation.class.getName() + "$ApplyAdvice");
-  }
-
-  public static class ApplyAdvice {
-
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.Return(readOnly = false) Publisher<?> result,
-        @Advice.FieldValue(value = "circuitBreaker") CircuitBreaker circuitBreaker) {
-
-      result =
-          ReactorHelper.wrapPublisher(
-              result,
-              CircuitBreakerDecorator.DECORATE,
-              circuitBreaker,
-              ReactorHelper.putInto(
-                  InstrumentationContext.get(Publisher.class, HandoffContext.class)));
+public class CircuitBreakerOperatorInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    @Override
+    public String instrumentedType() {
+        return "io.github.resilience4j.reactor.circuitbreaker.operator.CircuitBreakerOperator";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("apply")).and(takesArgument(0, named("org.reactivestreams.Publisher"))),
+                CircuitBreakerOperatorInstrumentation.class.getName() + "$ApplyAdvice");
+    }
+
+    public static class ApplyAdvice {
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(
+                @Advice.Return(readOnly = false) Publisher<?> result,
+                @Advice.FieldValue(value = "circuitBreaker") CircuitBreaker circuitBreaker) {
+
+            result = ReactorHelper.wrapPublisher(
+                    result,
+                    CircuitBreakerDecorator.DECORATE,
+                    circuitBreaker,
+                    ReactorHelper.putInto(InstrumentationContext.get(Publisher.class, HandoffContext.class)));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackOperatorInstrumentation.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackOperatorInstrumentation.java
index ed9f5ebbd2f..86255c457e8 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackOperatorInstrumentation.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/FallbackOperatorInstrumentation.java
@@ -13,41 +13,36 @@
 import net.bytebuddy.asm.Advice;
 import org.reactivestreams.Publisher;
 
-public class FallbackOperatorInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  @Override
-  public String instrumentedType() {
-    return "io.github.resilience4j.reactor.ReactorOperatorFallbackDecorator";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("decorate"))
-            .and(
-                takesArgument(0, named("java.util.function.UnaryOperator"))
-                    .and(returns(named("java.util.function.Function")))),
-        FallbackOperatorInstrumentation.class.getName() + "$DecorateAdvice");
-  }
-
-  public static class DecorateAdvice {
-
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.Return(readOnly = false) Function<Publisher<?>, Publisher<?>> result) {
-
-      result =
-          ReactorHelper.wrapFunction(
-              result,
-              ReactorHelper.putIfAbsentInto(
-                  InstrumentationContext.get(Publisher.class, HandoffContext.class)));
+public class FallbackOperatorInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    @Override
+    public String instrumentedType() {
+        return "io.github.resilience4j.reactor.ReactorOperatorFallbackDecorator";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("decorate"))
+                        .and(takesArgument(0, named("java.util.function.UnaryOperator"))
+                                .and(returns(named("java.util.function.Function")))),
+                FallbackOperatorInstrumentation.class.getName() + "$DecorateAdvice");
     }
 
-    // 2.0.0+
-    public static void muzzleCheck(CheckedSupplier<?> cs) throws Throwable {
-      cs.get();
+    public static class DecorateAdvice {
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Return(readOnly = false) Function<Publisher<?>, Publisher<?>> result) {
+
+            result = ReactorHelper.wrapFunction(
+                    result,
+                    ReactorHelper.putIfAbsentInto(InstrumentationContext.get(Publisher.class, HandoffContext.class)));
+        }
+
+        // 2.0.0+
+        public static void muzzleCheck(CheckedSupplier<?> cs) throws Throwable {
+            cs.get();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/ReactorHelper.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/ReactorHelper.java
index 4a42aeef8fa..39b47d60f9e 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/ReactorHelper.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/ReactorHelper.java
@@ -19,98 +19,95 @@
 
 public class ReactorHelper {
 
-  private static final Logger log = LoggerFactory.getLogger(ReactorHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(ReactorHelper.class);
 
-  // These build the hand-off BiConsumer here rather than in @Advice code on purpose: a lambda
-  // defined in advice desugars to an invokedynamic that cannot be linked once the advice is inlined
-  // into the (third-party) operator, and fails silently. anyThread: the span is attached at
-  // assembly and the publisher may be subscribed later on another thread.
-  public static BiConsumer<Publisher<?>, AgentSpan> putInto(
-      final ContextStore<Publisher, HandoffContext> store) {
-    return (publisher, span) -> store.put(publisher, HandoffContext.anyThread(span));
-  }
+    // These build the hand-off BiConsumer here rather than in @Advice code on purpose: a lambda
+    // defined in advice desugars to an invokedynamic that cannot be linked once the advice is inlined
+    // into the (third-party) operator, and fails silently. anyThread: the span is attached at
+    // assembly and the publisher may be subscribed later on another thread.
+    public static BiConsumer<Publisher<?>, AgentSpan> putInto(final ContextStore<Publisher, HandoffContext> store) {
+        return (publisher, span) -> store.put(publisher, HandoffContext.anyThread(span));
+    }
 
-  public static BiConsumer<Publisher<?>, AgentSpan> putIfAbsentInto(
-      final ContextStore<Publisher, HandoffContext> store) {
-    return (publisher, span) -> store.getOrPut(publisher, HandoffContext.anyThread(span));
-  }
+    public static BiConsumer<Publisher<?>, AgentSpan> putIfAbsentInto(
+            final ContextStore<Publisher, HandoffContext> store) {
+        return (publisher, span) -> store.getOrPut(publisher, HandoffContext.anyThread(span));
+    }
 
-  public static Function<Publisher<?>, Publisher<?>> wrapFunction(
-      Function<Publisher<?>, Publisher<?>> operator,
-      BiConsumer<Publisher<?>, AgentSpan> attachContext) {
-    return (value) -> {
-      AgentSpan current = Resilience4jSpan.current();
-      AgentSpan owned = current == null ? Resilience4jSpan.start() : null;
-      Resilience4jSpanDecorator<Void> spanDecorator = Resilience4jSpanDecorator.DECORATE;
-      if (owned != null) {
-        current = owned;
-        spanDecorator.afterStart(current);
-      }
-      spanDecorator.decorate(current, null);
-      try (ContextScope scope = activateSpan(current)) {
-        Publisher<?> ret = operator.apply(value);
-        attachContext.accept(ret, current);
-        if (owned == null) {
-          return ret;
+    public static Function<Publisher<?>, Publisher<?>> wrapFunction(
+            Function<Publisher<?>, Publisher<?>> operator, BiConsumer<Publisher<?>, AgentSpan> attachContext) {
+        return (value) -> {
+            AgentSpan current = Resilience4jSpan.current();
+            AgentSpan owned = current == null ? Resilience4jSpan.start() : null;
+            Resilience4jSpanDecorator<Void> spanDecorator = Resilience4jSpanDecorator.DECORATE;
+            if (owned != null) {
+                current = owned;
+                spanDecorator.afterStart(current);
+            }
+            spanDecorator.decorate(current, null);
+            try (ContextScope scope = activateSpan(current)) {
+                Publisher<?> ret = operator.apply(value);
+                attachContext.accept(ret, current);
+                if (owned == null) {
+                    return ret;
+                }
+                return scheduleOwnedSpanFinish(ret, spanDecorator, owned);
+            }
+        };
+    }
+
+    public static <T> Publisher<?> wrapPublisher(
+            Publisher<?> publisher,
+            Resilience4jSpanDecorator<T> spanDecorator,
+            T data,
+            BiConsumer<Publisher<?>, AgentSpan> attachContext) {
+        // Create span at construction (needs transformDeferred which is what Spring R4j use)
+        AgentSpan current = Resilience4jSpan.current();
+        AgentSpan owned = current == null ? Resilience4jSpan.start() : null;
+        if (owned != null) {
+            current = owned;
+            spanDecorator.afterStart(current);
         }
-        return scheduleOwnedSpanFinish(ret, spanDecorator, owned);
-      }
-    };
-  }
+        spanDecorator.decorate(current, data);
 
-  public static <T> Publisher<?> wrapPublisher(
-      Publisher<?> publisher,
-      Resilience4jSpanDecorator<T> spanDecorator,
-      T data,
-      BiConsumer<Publisher<?>, AgentSpan> attachContext) {
-    // Create span at construction (needs transformDeferred which is what Spring R4j use)
-    AgentSpan current = Resilience4jSpan.current();
-    AgentSpan owned = current == null ? Resilience4jSpan.start() : null;
-    if (owned != null) {
-      current = owned;
-      spanDecorator.afterStart(current);
+        // This schedules a span to be finished when the publisher finishes to be non-zero
+        Publisher<?> newResult = scheduleOwnedSpanFinish(publisher, spanDecorator, owned);
+        if (newResult instanceof Scannable) {
+            Scannable parent = (Scannable) newResult;
+            while (parent != null) {
+                if (parent instanceof Publisher) {
+                    // Attach the span to the publisher to be activated by the reactive streams
+                    // instrumentation to scope child spans
+                    attachContext.accept((Publisher<?>) parent, current);
+                }
+                parent = parent.scan(Scannable.Attr.PARENT);
+            }
+        }
+        return newResult;
     }
-    spanDecorator.decorate(current, data);
 
-    // This schedules a span to be finished when the publisher finishes to be non-zero
-    Publisher<?> newResult = scheduleOwnedSpanFinish(publisher, spanDecorator, owned);
-    if (newResult instanceof Scannable) {
-      Scannable parent = (Scannable) newResult;
-      while (parent != null) {
-        if (parent instanceof Publisher) {
-          // Attach the span to the publisher to be activated by the reactive streams
-          // instrumentation to scope child spans
-          attachContext.accept((Publisher<?>) parent, current);
+    private static <T> Publisher<?> scheduleOwnedSpanFinish(
+            Publisher<?> publisher, Resilience4jSpanDecorator<T> spanDecorator, AgentSpan owned) {
+        if (owned == null) {
+            return publisher;
+        }
+        if (publisher instanceof Flux<?>) {
+            return ((Flux<?>) publisher).doFinally(beforeFinish(spanDecorator, owned));
+        } else if (publisher instanceof Mono<?>) {
+            return ((Mono<?>) publisher).doFinally(beforeFinish(spanDecorator, owned));
+        } else {
+            log.debug("Unexpected type of publisher {}", publisher);
+            // can't schedule span finish - finish immediately
+            spanDecorator.beforeFinish(owned);
+            owned.finish();
         }
-        parent = parent.scan(Scannable.Attr.PARENT);
-      }
+        return publisher;
     }
-    return newResult;
-  }
 
-  private static <T> Publisher<?> scheduleOwnedSpanFinish(
-      Publisher<?> publisher, Resilience4jSpanDecorator<T> spanDecorator, AgentSpan owned) {
-    if (owned == null) {
-      return publisher;
+    private static <T> Consumer<SignalType> beforeFinish(Resilience4jSpanDecorator<T> spanDecorator, AgentSpan span) {
+        return signalType -> {
+            spanDecorator.beforeFinish(span);
+            span.finish();
+        };
     }
-    if (publisher instanceof Flux<?>) {
-      return ((Flux<?>) publisher).doFinally(beforeFinish(spanDecorator, owned));
-    } else if (publisher instanceof Mono<?>) {
-      return ((Mono<?>) publisher).doFinally(beforeFinish(spanDecorator, owned));
-    } else {
-      log.debug("Unexpected type of publisher {}", publisher);
-      // can't schedule span finish - finish immediately
-      spanDecorator.beforeFinish(owned);
-      owned.finish();
-    }
-    return publisher;
-  }
-
-  private static <T> Consumer<SignalType> beforeFinish(
-      Resilience4jSpanDecorator<T> spanDecorator, AgentSpan span) {
-    return signalType -> {
-      spanDecorator.beforeFinish(span);
-      span.finish();
-    };
-  }
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jReactorModule.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jReactorModule.java
index 53d90f8919b..fa967a5e1ed 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jReactorModule.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jReactorModule.java
@@ -16,32 +16,31 @@
 @AutoService(InstrumenterModule.class)
 public class Resilience4jReactorModule extends InstrumenterModule.Tracing {
 
-  public Resilience4jReactorModule() {
-    super("resilience4j-reactor");
-  }
+    public Resilience4jReactorModule() {
+        super("resilience4j-reactor");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".Resilience4jSpan",
-      packageName + ".Resilience4jSpanDecorator",
-      packageName + ".CircuitBreakerDecorator",
-      packageName + ".RetryDecorator",
-      packageName + ".ReactorHelper",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".Resilience4jSpan",
+            packageName + ".Resilience4jSpanDecorator",
+            packageName + ".CircuitBreakerDecorator",
+            packageName + ".RetryDecorator",
+            packageName + ".ReactorHelper",
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.reactivestreams.Publisher", HandoffContext.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.reactivestreams.Publisher", HandoffContext.class.getName());
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new CircuitBreakerOperatorInstrumentation(),
-        new FallbackOperatorInstrumentation(),
-        new RetryOperatorInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(
+                new CircuitBreakerOperatorInstrumentation(),
+                new FallbackOperatorInstrumentation(),
+                new RetryOperatorInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/RetryOperatorInstrumentation.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/RetryOperatorInstrumentation.java
index 1b395be55ab..8a16207d2b1 100644
--- a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/RetryOperatorInstrumentation.java
+++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/RetryOperatorInstrumentation.java
@@ -11,36 +11,30 @@
 import net.bytebuddy.asm.Advice;
 import org.reactivestreams.Publisher;
 
-public class RetryOperatorInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class RetryOperatorInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "io.github.resilience4j.reactor.retry.RetryOperator";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.github.resilience4j.reactor.retry.RetryOperator";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("apply"))
-            .and(takesArgument(0, named("org.reactivestreams.Publisher"))),
-        RetryOperatorInstrumentation.class.getName() + "$ApplyAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("apply")).and(takesArgument(0, named("org.reactivestreams.Publisher"))),
+                RetryOperatorInstrumentation.class.getName() + "$ApplyAdvice");
+    }
 
-  public static class ApplyAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.Return(readOnly = false) Publisher<?> result,
-        @Advice.FieldValue(value = "retry") Retry retry) {
+    public static class ApplyAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(
+                @Advice.Return(readOnly = false) Publisher<?> result, @Advice.FieldValue(value = "retry") Retry retry) {
 
-      result =
-          ReactorHelper.wrapPublisher(
-              result,
-              RetryDecorator.DECORATE,
-              retry,
-              ReactorHelper.putInto(
-                  InstrumentationContext.get(Publisher.class, HandoffContext.class)));
+            result = ReactorHelper.wrapPublisher(
+                    result,
+                    RetryDecorator.DECORATE,
+                    retry,
+                    ReactorHelper.putInto(InstrumentationContext.get(Publisher.class, HandoffContext.class)));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java
index bf9559671c8..22800fa8af5 100644
--- a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java
@@ -21,29 +21,27 @@
  */
 @AutoService(InstrumenterModule.class)
 public class Resteasy30RequestContextInstrumentation extends AbstractRequestContextInstrumentation {
-  public static class ContainerRequestContextAdvice {
+    public static class ContainerRequestContextAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope decorateAbortSpan(
-        @Advice.This final ContainerRequestContext context) {
-      if (context.getProperty(JaxRsAnnotationsDecorator.ABORT_HANDLED) == null
-          && context instanceof PostMatchContainerRequestContext) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope decorateAbortSpan(@Advice.This final ContainerRequestContext context) {
+            if (context.getProperty(JaxRsAnnotationsDecorator.ABORT_HANDLED) == null
+                    && context instanceof PostMatchContainerRequestContext) {
 
-        final ResourceMethodInvoker resourceMethodInvoker =
-            ((PostMatchContainerRequestContext) context).getResourceMethod();
-        final Method method = resourceMethodInvoker.getMethod();
-        final Class resourceClass = resourceMethodInvoker.getResourceClass();
+                final ResourceMethodInvoker resourceMethodInvoker =
+                        ((PostMatchContainerRequestContext) context).getResourceMethod();
+                final Method method = resourceMethodInvoker.getMethod();
+                final Class resourceClass = resourceMethodInvoker.getResourceClass();
 
-        return RequestFilterHelper.createOrUpdateAbortSpan(context, resourceClass, method);
-      }
+                return RequestFilterHelper.createOrUpdateAbortSpan(context, resourceClass, method);
+            }
 
-      return null;
-    }
+            return null;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      RequestFilterHelper.closeSpanAndScope(scope, throwable);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            RequestFilterHelper.closeSpanAndScope(scope, throwable);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java
index e2c5f5d7322..7bd1e046b31 100644
--- a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java
@@ -21,28 +21,26 @@
  */
 @AutoService(InstrumenterModule.class)
 public class Resteasy31RequestContextInstrumentation extends AbstractRequestContextInstrumentation {
-  public static class ContainerRequestContextAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope decorateAbortSpan(
-        @Advice.This final ContainerRequestContext context) {
-      if (context.getProperty(JaxRsAnnotationsDecorator.ABORT_HANDLED) == null
-          && context instanceof PostMatchContainerRequestContext) {
+    public static class ContainerRequestContextAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope decorateAbortSpan(@Advice.This final ContainerRequestContext context) {
+            if (context.getProperty(JaxRsAnnotationsDecorator.ABORT_HANDLED) == null
+                    && context instanceof PostMatchContainerRequestContext) {
 
-        final ResourceMethodInvoker resourceMethodInvoker =
-            ((PostMatchContainerRequestContext) context).getResourceMethod();
-        final Method method = resourceMethodInvoker.getMethod();
-        final Class resourceClass = resourceMethodInvoker.getResourceClass();
+                final ResourceMethodInvoker resourceMethodInvoker =
+                        ((PostMatchContainerRequestContext) context).getResourceMethod();
+                final Method method = resourceMethodInvoker.getMethod();
+                final Class resourceClass = resourceMethodInvoker.getResourceClass();
 
-        return RequestFilterHelper.createOrUpdateAbortSpan(context, resourceClass, method);
-      }
+                return RequestFilterHelper.createOrUpdateAbortSpan(context, resourceClass, method);
+            }
 
-      return null;
-    }
+            return null;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      RequestFilterHelper.closeSpanAndScope(scope, throwable);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            RequestFilterHelper.closeSpanAndScope(scope, throwable);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-3.0/src/main/java/datadog/trace/instrumentation/connection_error/resteasy/ResteasyClientConnectionErrorInstrumentation.java b/dd-java-agent/instrumentation/resteasy/resteasy-3.0/src/main/java/datadog/trace/instrumentation/connection_error/resteasy/ResteasyClientConnectionErrorInstrumentation.java
index 126018a04ed..1fe10877c2e 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-3.0/src/main/java/datadog/trace/instrumentation/connection_error/resteasy/ResteasyClientConnectionErrorInstrumentation.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-3.0/src/main/java/datadog/trace/instrumentation/connection_error/resteasy/ResteasyClientConnectionErrorInstrumentation.java
@@ -21,60 +21,59 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class ResteasyClientConnectionErrorInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ResteasyClientConnectionErrorInstrumentation() {
-    super("jax-rs", "jaxrs", "jax-rs-client");
-  }
+    public ResteasyClientConnectionErrorInstrumentation() {
+        super("jax-rs", "jaxrs", "jax-rs-client");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.jboss.resteasy.client.jaxrs.internal.ClientInvocation";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.jboss.resteasy.client.jaxrs.internal.ClientInvocation";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("invoke")),
-        ResteasyClientConnectionErrorInstrumentation.class.getName() + "$InvokeAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("invoke")),
+                ResteasyClientConnectionErrorInstrumentation.class.getName() + "$InvokeAdvice");
 
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("submit")).and(returns(Future.class)),
-        ResteasyClientConnectionErrorInstrumentation.class.getName() + "$SubmitAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("submit")).and(returns(Future.class)),
+                ResteasyClientConnectionErrorInstrumentation.class.getName() + "$SubmitAdvice");
+    }
 
-  public static class InvokeAdvice {
+    public static class InvokeAdvice {
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void handleError(
-        @Advice.FieldValue("configuration") final ClientConfiguration context,
-        @Advice.Thrown final Throwable throwable) {
-      if (throwable != null) {
-        final Object prop = context.getProperty(ClientTracingFilter.SPAN_PROPERTY_NAME);
-        if (prop instanceof AgentSpan) {
-          final AgentSpan span = (AgentSpan) prop;
-          span.addThrowable(throwable);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void handleError(
+                @Advice.FieldValue("configuration") final ClientConfiguration context,
+                @Advice.Thrown final Throwable throwable) {
+            if (throwable != null) {
+                final Object prop = context.getProperty(ClientTracingFilter.SPAN_PROPERTY_NAME);
+                if (prop instanceof AgentSpan) {
+                    final AgentSpan span = (AgentSpan) prop;
+                    span.addThrowable(throwable);
 
-          @SuppressWarnings("deprecation")
-          final boolean isJaxRsExceptionAsErrorEnabled =
-              Config.get().isJaxRsExceptionAsErrorEnabled();
-          span.setError(isJaxRsExceptionAsErrorEnabled);
+                    @SuppressWarnings("deprecation")
+                    final boolean isJaxRsExceptionAsErrorEnabled = Config.get().isJaxRsExceptionAsErrorEnabled();
+                    span.setError(isJaxRsExceptionAsErrorEnabled);
 
-          span.finish();
+                    span.finish();
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class SubmitAdvice {
+    public static class SubmitAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void handleError(
-        @Advice.FieldValue("configuration") final ClientConfiguration context,
-        @Advice.Return(readOnly = false) Future<?> future) {
-      if (!(future instanceof WrappedFuture)) {
-        future = new WrappedFuture<>(future, context);
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void handleError(
+                @Advice.FieldValue("configuration") final ClientConfiguration context,
+                @Advice.Return(readOnly = false) Future<?> future) {
+            if (!(future instanceof WrappedFuture)) {
+                future = new WrappedFuture<>(future, context);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-3.0/src/main/java/datadog/trace/instrumentation/connection_error/resteasy/WrappedFuture.java b/dd-java-agent/instrumentation/resteasy/resteasy-3.0/src/main/java/datadog/trace/instrumentation/connection_error/resteasy/WrappedFuture.java
index 9f2ea0de202..88de02b1a8a 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-3.0/src/main/java/datadog/trace/instrumentation/connection_error/resteasy/WrappedFuture.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-3.0/src/main/java/datadog/trace/instrumentation/connection_error/resteasy/WrappedFuture.java
@@ -11,61 +11,61 @@
 
 public class WrappedFuture<T> implements Future<T> {
 
-  private final Future<T> wrapped;
-  private final ClientConfiguration context;
+    private final Future<T> wrapped;
+    private final ClientConfiguration context;
 
-  public WrappedFuture(final Future<T> wrapped, final ClientConfiguration context) {
-    this.wrapped = wrapped;
-    this.context = context;
-  }
+    public WrappedFuture(final Future<T> wrapped, final ClientConfiguration context) {
+        this.wrapped = wrapped;
+        this.context = context;
+    }
 
-  @Override
-  public boolean cancel(final boolean mayInterruptIfRunning) {
-    return wrapped.cancel(mayInterruptIfRunning);
-  }
+    @Override
+    public boolean cancel(final boolean mayInterruptIfRunning) {
+        return wrapped.cancel(mayInterruptIfRunning);
+    }
 
-  @Override
-  public boolean isCancelled() {
-    return wrapped.isCancelled();
-  }
+    @Override
+    public boolean isCancelled() {
+        return wrapped.isCancelled();
+    }
 
-  @Override
-  public boolean isDone() {
-    return wrapped.isDone();
-  }
+    @Override
+    public boolean isDone() {
+        return wrapped.isDone();
+    }
 
-  @Override
-  public T get() throws InterruptedException, ExecutionException {
-    try {
-      return wrapped.get();
-    } catch (final ExecutionException e) {
-      handleExecutionException(e);
-      throw e;
+    @Override
+    public T get() throws InterruptedException, ExecutionException {
+        try {
+            return wrapped.get();
+        } catch (final ExecutionException e) {
+            handleExecutionException(e);
+            throw e;
+        }
     }
-  }
 
-  @Override
-  public T get(final long timeout, final TimeUnit unit)
-      throws InterruptedException, ExecutionException, TimeoutException {
-    try {
-      return wrapped.get(timeout, unit);
-    } catch (final ExecutionException e) {
-      handleExecutionException(e);
-      throw e;
+    @Override
+    public T get(final long timeout, final TimeUnit unit)
+            throws InterruptedException, ExecutionException, TimeoutException {
+        try {
+            return wrapped.get(timeout, unit);
+        } catch (final ExecutionException e) {
+            handleExecutionException(e);
+            throw e;
+        }
     }
-  }
 
-  private void handleExecutionException(ExecutionException e) {
-    final Object prop = context.getProperty(ClientTracingFilter.SPAN_PROPERTY_NAME);
-    if (prop instanceof AgentSpan) {
-      final AgentSpan span = (AgentSpan) prop;
-      span.addThrowable(e.getCause());
+    private void handleExecutionException(ExecutionException e) {
+        final Object prop = context.getProperty(ClientTracingFilter.SPAN_PROPERTY_NAME);
+        if (prop instanceof AgentSpan) {
+            final AgentSpan span = (AgentSpan) prop;
+            span.addThrowable(e.getCause());
 
-      @SuppressWarnings("deprecation")
-      final boolean isJaxRsExceptionAsErrorEnabled = Config.get().isJaxRsExceptionAsErrorEnabled();
-      span.setError(isJaxRsExceptionAsErrorEnabled);
+            @SuppressWarnings("deprecation")
+            final boolean isJaxRsExceptionAsErrorEnabled = Config.get().isJaxRsExceptionAsErrorEnabled();
+            span.setError(isJaxRsExceptionAsErrorEnabled);
 
-      span.finish();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/CookieParamInjectorAdvice.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/CookieParamInjectorAdvice.java
index 282c2ec34af..ac7dd55a242 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/CookieParamInjectorAdvice.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/CookieParamInjectorAdvice.java
@@ -14,27 +14,27 @@
 
 @RequiresRequestContext(RequestContextSlot.IAST)
 public class CookieParamInjectorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-  public static void onExit(
-      @Advice.Return Object result,
-      @Advice.FieldValue("paramName") String paramName,
-      @ActiveRequestContext RequestContext reqCtx) {
-    if (result instanceof String || result instanceof Collection) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        if (result instanceof Collection) {
-          Collection<?> collection = (Collection<?>) result;
-          for (Object o : collection) {
-            if (o instanceof String) {
-              module.taintString(ctx, (String) o, SourceTypes.REQUEST_COOKIE_VALUE, paramName);
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+    public static void onExit(
+            @Advice.Return Object result,
+            @Advice.FieldValue("paramName") String paramName,
+            @ActiveRequestContext RequestContext reqCtx) {
+        if (result instanceof String || result instanceof Collection) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                if (result instanceof Collection) {
+                    Collection<?> collection = (Collection<?>) result;
+                    for (Object o : collection) {
+                        if (o instanceof String) {
+                            module.taintString(ctx, (String) o, SourceTypes.REQUEST_COOKIE_VALUE, paramName);
+                        }
+                    }
+                } else {
+                    module.taintString(ctx, (String) result, SourceTypes.REQUEST_COOKIE_VALUE, paramName);
+                }
             }
-          }
-        } else {
-          module.taintString(ctx, (String) result, SourceTypes.REQUEST_COOKIE_VALUE, paramName);
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/CookieParamInjectorInstrumentation.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/CookieParamInjectorInstrumentation.java
index 5858c1fdf29..2cb65130240 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/CookieParamInjectorInstrumentation.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/CookieParamInjectorInstrumentation.java
@@ -10,26 +10,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class CookieParamInjectorInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public CookieParamInjectorInstrumentation() {
-    super("resteasy");
-  }
+    public CookieParamInjectorInstrumentation() {
+        super("resteasy");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jaxrs";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jaxrs";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("inject").and(isPublic()).and(takesArguments(2)),
-        packageName + ".CookieParamInjectorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("inject").and(isPublic()).and(takesArguments(2)), packageName + ".CookieParamInjectorAdvice");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.jboss.resteasy.core.CookieParamInjector";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.jboss.resteasy.core.CookieParamInjector";
+    }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/DecodedFormParametersInstrumentation.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/DecodedFormParametersInstrumentation.java
index 23979a9e36f..fb177d8331c 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/DecodedFormParametersInstrumentation.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/DecodedFormParametersInstrumentation.java
@@ -29,116 +29,111 @@
 
 @AutoService(InstrumenterModule.class)
 public class DecodedFormParametersInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-
-  public DecodedFormParametersInstrumentation() {
-    super("resteasy");
-  }
-
-  public static final String NETTY_HTTP_REQUEST_CLASS_NAME =
-      "org.jboss.resteasy.plugins.server.netty.NettyHttpRequest";
-
-  @Override
-  public String muzzleDirective() {
-    return "jaxrs";
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.jboss.resteasy.plugins.server.BaseHttpRequest",
-      "org.jboss.resteasy.plugins.server.servlet.HttpServletInputMessage",
-      NETTY_HTTP_REQUEST_CLASS_NAME
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getDecodedFormParameters").and(takesArguments(0)),
-        DecodedFormParametersInstrumentation.class.getName() + "$GetDecodedFormParametersAdvice");
-  }
-
-  @Override
-  public ReferenceProvider runtimeMuzzleReferences() {
-    return new CustomReferenceProvider();
-  }
-
-  public static class CustomReferenceProvider implements ReferenceProvider {
-    private static final Reference BASE_HTTP_REQUEST_DECODED_PARAMETERS =
-        new Reference.Builder("org.jboss.resteasy.plugins.server.BaseHttpRequest")
-            .withField(
-                new String[0], 0, "decodedFormParameters", "Ljavax/ws/rs/core/MultivaluedMap;")
-            .build();
-
-    private static final Reference HTTP_SERVLET_INPUT_MESSAGE_DECODED_PARAMETERS =
-        new Reference.Builder("org.jboss.resteasy.plugins.server.servlet.HttpServletInputMessage")
-            .withField(
-                new String[0], 0, "decodedFormParameters", "Ljavax/ws/rs/core/MultivaluedMap;")
-            .build();
-
-    private static final Reference NETTY_HTTP_REQUEST_DECODED_PARAMETERS =
-        new Reference.Builder(NETTY_HTTP_REQUEST_CLASS_NAME)
-            .withField(
-                new String[0], 0, "decodedFormParameters", "Ljavax/ws/rs/core/MultivaluedMap;")
-            .build();
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+
+    public DecodedFormParametersInstrumentation() {
+        super("resteasy");
+    }
+
+    public static final String NETTY_HTTP_REQUEST_CLASS_NAME =
+            "org.jboss.resteasy.plugins.server.netty.NettyHttpRequest";
+
+    @Override
+    public String muzzleDirective() {
+        return "jaxrs";
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.jboss.resteasy.plugins.server.BaseHttpRequest",
+            "org.jboss.resteasy.plugins.server.servlet.HttpServletInputMessage",
+            NETTY_HTTP_REQUEST_CLASS_NAME
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getDecodedFormParameters").and(takesArguments(0)),
+                DecodedFormParametersInstrumentation.class.getName() + "$GetDecodedFormParametersAdvice");
+    }
 
     @Override
-    public Iterable<Reference> buildReferences(TypePool typePool) {
-      List<Reference> references = new ArrayList<>();
-      references.add(BASE_HTTP_REQUEST_DECODED_PARAMETERS);
-      references.add(HTTP_SERVLET_INPUT_MESSAGE_DECODED_PARAMETERS);
-      if (typePool.describe(NETTY_HTTP_REQUEST_CLASS_NAME).isResolved()) {
-        references.add(NETTY_HTTP_REQUEST_DECODED_PARAMETERS);
-      }
-      return references;
+    public ReferenceProvider runtimeMuzzleReferences() {
+        return new CustomReferenceProvider();
     }
-  }
-
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class GetDecodedFormParametersAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean before(
-        @Advice.FieldValue("decodedFormParameters") final MultivaluedMap<String, String> map) {
-      // only if the field is initially null do we run the after() advice
-      // this is so that further calls to getDecodedFormParameters(), when the
-      // data has already been processed and saved, do not make the data be resubmitted to the IG
-      return map == null;
+
+    public static class CustomReferenceProvider implements ReferenceProvider {
+        private static final Reference BASE_HTTP_REQUEST_DECODED_PARAMETERS = new Reference.Builder(
+                        "org.jboss.resteasy.plugins.server.BaseHttpRequest")
+                .withField(new String[0], 0, "decodedFormParameters", "Ljavax/ws/rs/core/MultivaluedMap;")
+                .build();
+
+        private static final Reference HTTP_SERVLET_INPUT_MESSAGE_DECODED_PARAMETERS = new Reference.Builder(
+                        "org.jboss.resteasy.plugins.server.servlet.HttpServletInputMessage")
+                .withField(new String[0], 0, "decodedFormParameters", "Ljavax/ws/rs/core/MultivaluedMap;")
+                .build();
+
+        private static final Reference NETTY_HTTP_REQUEST_DECODED_PARAMETERS = new Reference.Builder(
+                        NETTY_HTTP_REQUEST_CLASS_NAME)
+                .withField(new String[0], 0, "decodedFormParameters", "Ljavax/ws/rs/core/MultivaluedMap;")
+                .build();
+
+        @Override
+        public Iterable<Reference> buildReferences(TypePool typePool) {
+            List<Reference> references = new ArrayList<>();
+            references.add(BASE_HTTP_REQUEST_DECODED_PARAMETERS);
+            references.add(HTTP_SERVLET_INPUT_MESSAGE_DECODED_PARAMETERS);
+            if (typePool.describe(NETTY_HTTP_REQUEST_CLASS_NAME).isResolved()) {
+                references.add(NETTY_HTTP_REQUEST_DECODED_PARAMETERS);
+            }
+            return references;
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.FieldValue("decodedFormParameters") final MultivaluedMap<String, String> map,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t,
-        @Advice.Enter boolean proceed) {
-      if (!proceed || map == null || map.isEmpty() || t != null) {
-        return;
-      }
-
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan == null) {
-        return;
-      }
-
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      RequestContext requestContext = agentSpan.getRequestContext();
-      if (requestContext == null || callback == null) {
-        return;
-      }
-      Flow<Void> flow = callback.apply(requestContext, map);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba);
-          t = new BlockingException("Blocked request (for getDecodedFormParameters)");
-          requestContext.getTraceSegment().effectivelyBlocked();
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class GetDecodedFormParametersAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean before(@Advice.FieldValue("decodedFormParameters") final MultivaluedMap<String, String> map) {
+            // only if the field is initially null do we run the after() advice
+            // this is so that further calls to getDecodedFormParameters(), when the
+            // data has already been processed and saved, do not make the data be resubmitted to the IG
+            return map == null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.FieldValue("decodedFormParameters") final MultivaluedMap<String, String> map,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t,
+                @Advice.Enter boolean proceed) {
+            if (!proceed || map == null || map.isEmpty() || t != null) {
+                return;
+            }
+
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan == null) {
+                return;
+            }
+
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            RequestContext requestContext = agentSpan.getRequestContext();
+            if (requestContext == null || callback == null) {
+                return;
+            }
+            Flow<Void> flow = callback.apply(requestContext, map);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba);
+                    t = new BlockingException("Blocked request (for getDecodedFormParameters)");
+                    requestContext.getTraceSegment().effectivelyBlocked();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/FormParamInjectorAdvice.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/FormParamInjectorAdvice.java
index 5068bd1b3f9..45f5fb25870 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/FormParamInjectorAdvice.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/FormParamInjectorAdvice.java
@@ -14,27 +14,27 @@
 
 @RequiresRequestContext(RequestContextSlot.IAST)
 public class FormParamInjectorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-  public static void onExit(
-      @Advice.Return Object result,
-      @Advice.FieldValue("paramName") String paramName,
-      @ActiveRequestContext RequestContext reqCtx) {
-    if (result instanceof String || result instanceof Collection) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        if (result instanceof Collection) {
-          Collection<?> collection = (Collection<?>) result;
-          for (Object o : collection) {
-            if (o instanceof String) {
-              module.taintString(ctx, (String) o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+    public static void onExit(
+            @Advice.Return Object result,
+            @Advice.FieldValue("paramName") String paramName,
+            @ActiveRequestContext RequestContext reqCtx) {
+        if (result instanceof String || result instanceof Collection) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                if (result instanceof Collection) {
+                    Collection<?> collection = (Collection<?>) result;
+                    for (Object o : collection) {
+                        if (o instanceof String) {
+                            module.taintString(ctx, (String) o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
+                        }
+                    }
+                } else {
+                    module.taintString(ctx, (String) result, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
+                }
             }
-          }
-        } else {
-          module.taintString(ctx, (String) result, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/FormParamInjectorInstrumentation.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/FormParamInjectorInstrumentation.java
index 27ff8714740..5f351c4ae32 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/FormParamInjectorInstrumentation.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/FormParamInjectorInstrumentation.java
@@ -10,26 +10,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class FormParamInjectorInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public FormParamInjectorInstrumentation() {
-    super("resteasy");
-  }
+    public FormParamInjectorInstrumentation() {
+        super("resteasy");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jaxrs";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jaxrs";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("inject").and(isPublic()).and(takesArguments(2)),
-        packageName + ".FormParamInjectorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("inject").and(isPublic()).and(takesArguments(2)), packageName + ".FormParamInjectorAdvice");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.jboss.resteasy.core.FormParamInjector";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.jboss.resteasy.core.FormParamInjector";
+    }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/HeaderParamInjectorAdvice.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/HeaderParamInjectorAdvice.java
index 1dc2e4afc07..6b894cf3d32 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/HeaderParamInjectorAdvice.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/HeaderParamInjectorAdvice.java
@@ -14,27 +14,27 @@
 
 @RequiresRequestContext(RequestContextSlot.IAST)
 public class HeaderParamInjectorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_HEADER_VALUE)
-  public static void onExit(
-      @Advice.Return Object result,
-      @Advice.FieldValue("paramName") String paramName,
-      @ActiveRequestContext RequestContext reqCtx) {
-    if (result instanceof String || result instanceof Collection) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        if (result instanceof Collection) {
-          Collection<?> collection = (Collection<?>) result;
-          for (Object o : collection) {
-            if (o instanceof String) {
-              module.taintString(ctx, (String) o, SourceTypes.REQUEST_HEADER_VALUE, paramName);
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_HEADER_VALUE)
+    public static void onExit(
+            @Advice.Return Object result,
+            @Advice.FieldValue("paramName") String paramName,
+            @ActiveRequestContext RequestContext reqCtx) {
+        if (result instanceof String || result instanceof Collection) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                if (result instanceof Collection) {
+                    Collection<?> collection = (Collection<?>) result;
+                    for (Object o : collection) {
+                        if (o instanceof String) {
+                            module.taintString(ctx, (String) o, SourceTypes.REQUEST_HEADER_VALUE, paramName);
+                        }
+                    }
+                } else {
+                    module.taintString(ctx, (String) result, SourceTypes.REQUEST_HEADER_VALUE, paramName);
+                }
             }
-          }
-        } else {
-          module.taintString(ctx, (String) result, SourceTypes.REQUEST_HEADER_VALUE, paramName);
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/HeaderParamInjectorInstrumentation.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/HeaderParamInjectorInstrumentation.java
index 9a5e97c08c9..808dd4ba3a8 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/HeaderParamInjectorInstrumentation.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/HeaderParamInjectorInstrumentation.java
@@ -10,26 +10,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class HeaderParamInjectorInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public HeaderParamInjectorInstrumentation() {
-    super("resteasy");
-  }
+    public HeaderParamInjectorInstrumentation() {
+        super("resteasy");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jaxrs";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jaxrs";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("inject").and(isPublic()).and(takesArguments(2)),
-        packageName + ".HeaderParamInjectorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("inject").and(isPublic()).and(takesArguments(2)), packageName + ".HeaderParamInjectorAdvice");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.jboss.resteasy.core.HeaderParamInjector";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.jboss.resteasy.core.HeaderParamInjector";
+    }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/JavaxWSResponseInstrumentation.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/JavaxWSResponseInstrumentation.java
index 957bcc23801..da41cae3c65 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/JavaxWSResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/JavaxWSResponseInstrumentation.java
@@ -20,64 +20,63 @@
 
 @AutoService(InstrumenterModule.class)
 public class JavaxWSResponseInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public JavaxWSResponseInstrumentation() {
-    super("resteasy");
-  }
+    public JavaxWSResponseInstrumentation() {
+        super("resteasy");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("header").and(isPublic().and(takesArguments(String.class, Object.class))),
-        JavaxWSResponseInstrumentation.class.getName() + "$HeaderAdvice");
-    transformer.applyAdvice(
-        named("location").and(isPublic().and(takesArguments(URI.class))),
-        JavaxWSResponseInstrumentation.class.getName() + "$RedirectionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("header").and(isPublic().and(takesArguments(String.class, Object.class))),
+                JavaxWSResponseInstrumentation.class.getName() + "$HeaderAdvice");
+        transformer.applyAdvice(
+                named("location").and(isPublic().and(takesArguments(URI.class))),
+                JavaxWSResponseInstrumentation.class.getName() + "$RedirectionAdvice");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.ws.rs.core.Response$ResponseBuilder";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.ws.rs.core.Response$ResponseBuilder";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  protected boolean isOptOutEnabled() {
-    return true;
-  }
+    @Override
+    protected boolean isOptOutEnabled() {
+        return true;
+    }
 
-  public static class HeaderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.RESPONSE_HEADER)
-    public static void onExit(
-        @Advice.Argument(0) String headerName, @Advice.Argument(1) Object headerValue) {
-      if (headerValue instanceof String) {
-        String value = (String) headerValue;
-        if (value.length() > 0) {
-          HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
-          if (mod != null) {
-            mod.onHeader(headerName, value);
-          }
+    public static class HeaderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.RESPONSE_HEADER)
+        public static void onExit(@Advice.Argument(0) String headerName, @Advice.Argument(1) Object headerValue) {
+            if (headerValue instanceof String) {
+                String value = (String) headerValue;
+                if (value.length() > 0) {
+                    HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
+                    if (mod != null) {
+                        mod.onHeader(headerName, value);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class RedirectionAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
-    public static void onEnter(@Advice.Argument(0) final URI location) {
-      final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
-      if (module != null) {
-        if (null != location) {
-          module.onURIRedirect(location);
+    public static class RedirectionAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
+        public static void onEnter(@Advice.Argument(0) final URI location) {
+            final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
+            if (module != null) {
+                if (null != location) {
+                    module.onURIRedirect(location);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MessageBodyReaderInvocationInstrumentation.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MessageBodyReaderInvocationInstrumentation.java
index 4ea7de926af..8af543dc0d3 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MessageBodyReaderInvocationInstrumentation.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MessageBodyReaderInvocationInstrumentation.java
@@ -23,70 +23,64 @@
 
 @AutoService(InstrumenterModule.class)
 public class MessageBodyReaderInvocationInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public MessageBodyReaderInvocationInstrumentation() {
-    super("resteasy");
-  }
+    public MessageBodyReaderInvocationInstrumentation() {
+        super("resteasy");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jaxrs";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jaxrs";
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {"org.jboss.resteasy.core.interception.AbstractReaderInterceptorContext"};
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"org.jboss.resteasy.core.interception.AbstractReaderInterceptorContext"};
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("readFrom")
-            .and(takesArguments(1))
-            .and(takesArgument(0, nameEndsWith(".MessageBodyReader"))),
-        MessageBodyReaderInvocationInstrumentation.class.getName()
-            + "$AbstractReaderInterceptorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("readFrom").and(takesArguments(1)).and(takesArgument(0, nameEndsWith(".MessageBodyReader"))),
+                MessageBodyReaderInvocationInstrumentation.class.getName() + "$AbstractReaderInterceptorAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class AbstractReaderInterceptorAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return final Object ret,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (ret == null || t != null) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class AbstractReaderInterceptorAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Return final Object ret,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (ret == null || t != null) {
+                return;
+            }
 
-      if (ret.getClass()
-          .getName()
-          .equals("org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInputImpl")) {
-        // already handled in MultipartFormDataReaderInstrumentation
-        return;
-      }
+            if (ret.getClass()
+                    .getName()
+                    .equals("org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInputImpl")) {
+                // already handled in MultipartFormDataReaderInstrumentation
+                return;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
 
-      Flow<Void> flow = callback.apply(reqCtx, ret);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba);
-          t =
-              new BlockingException(
-                  "Blocked request (for AbstractReaderInterceptorContext/readFrom)");
-          reqCtx.getTraceSegment().effectivelyBlocked();
+            Flow<Void> flow = callback.apply(reqCtx, ret);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba);
+                    t = new BlockingException("Blocked request (for AbstractReaderInterceptorContext/readFrom)");
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MethodExpressionInstrumentation.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MethodExpressionInstrumentation.java
index 8dadbd820e0..f3265237d2e 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MethodExpressionInstrumentation.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MethodExpressionInstrumentation.java
@@ -25,66 +25,66 @@
 
 @AutoService(InstrumenterModule.class)
 public class MethodExpressionInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public MethodExpressionInstrumentation() {
-    super("resteasy");
-  }
+    public MethodExpressionInstrumentation() {
+        super("resteasy");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jaxrs";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jaxrs";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.jboss.resteasy.core.registry.MethodExpression";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.jboss.resteasy.core.registry.MethodExpression";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("populatePathParams")
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("org.jboss.resteasy.spi.HttpRequest")))
-            .and(takesArgument(1, named("java.util.regex.Matcher")))
-            .and(takesArgument(2, String.class)),
-        MethodExpressionInstrumentation.class.getName() + "$PopulatePathParamsAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("populatePathParams")
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("org.jboss.resteasy.spi.HttpRequest")))
+                        .and(takesArgument(1, named("java.util.regex.Matcher")))
+                        .and(takesArgument(2, String.class)),
+                MethodExpressionInstrumentation.class.getName() + "$PopulatePathParamsAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class PopulatePathParamsAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Argument(0) HttpRequest req,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class PopulatePathParamsAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Argument(0) HttpRequest req,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
+            }
 
-      MultivaluedMap<String, String> pathParameters = req.getUri().getPathParameters();
-      if (pathParameters.isEmpty()) {
-        return;
-      }
+            MultivaluedMap<String, String> pathParameters = req.getUri().getPathParameters();
+            if (pathParameters.isEmpty()) {
+                return;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestPathParams());
-      if (callback == null) {
-        return;
-      }
-      Flow<Void> flow = callback.apply(reqCtx, pathParameters);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba);
-          t = new BlockingException("Blocked request (for MethodExpression/populatePathParams)");
-          reqCtx.getTraceSegment().effectivelyBlocked();
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
+                    cbp.getCallback(EVENTS.requestPathParams());
+            if (callback == null) {
+                return;
+            }
+            Flow<Void> flow = callback.apply(reqCtx, pathParameters);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba);
+                    t = new BlockingException("Blocked request (for MethodExpression/populatePathParams)");
+                    reqCtx.getTraceSegment().effectivelyBlocked();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MultipartFormDataReaderInstrumentation.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MultipartFormDataReaderInstrumentation.java
index c280c9121af..9a50a85536a 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MultipartFormDataReaderInstrumentation.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MultipartFormDataReaderInstrumentation.java
@@ -24,95 +24,88 @@
 
 @AutoService(InstrumenterModule.class)
 public class MultipartFormDataReaderInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public MultipartFormDataReaderInstrumentation() {
-    super("resteasy");
-  }
+    public MultipartFormDataReaderInstrumentation() {
+        super("resteasy");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "multipart";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "multipart";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataReader";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataReader";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("readFrom")
-            .and(takesArguments(6))
-            .and(
-                returns(
-                    named(
-                        "org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput"))),
-        MultipartFormDataReaderInstrumentation.class.getName() + "$ReadFromAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("readFrom")
+                        .and(takesArguments(6))
+                        .and(returns(named("org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput"))),
+                MultipartFormDataReaderInstrumentation.class.getName() + "$ReadFromAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class ReadFromAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return final MultipartFormDataInput ret,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (ret == null || t != null) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class ReadFromAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Return final MultipartFormDataInput ret,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (ret == null || t != null) {
+                return;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCallback =
-          cbp.getCallback(EVENTS.requestFilesFilenames());
-      BiFunction<RequestContext, List<String>, Flow<Void>> contentCallback =
-          cbp.getCallback(EVENTS.requestFilesContent());
-      if (callback == null && filenamesCallback == null && contentCallback == null) {
-        return;
-      }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCallback =
+                    cbp.getCallback(EVENTS.requestFilesFilenames());
+            BiFunction<RequestContext, List<String>, Flow<Void>> contentCallback =
+                    cbp.getCallback(EVENTS.requestFilesContent());
+            if (callback == null && filenamesCallback == null && contentCallback == null) {
+                return;
+            }
 
-      if (callback != null) {
-        Map<String, List<String>> m = MultipartHelper.collectBodyMap(ret);
+            if (callback != null) {
+                Map<String, List<String>> m = MultipartHelper.collectBodyMap(ret);
 
-        Flow<Void> flow = callback.apply(reqCtx, m);
-        BlockingException be =
-            MultipartHelper.tryBlock(
-                reqCtx, flow, "Blocked request (for MultipartFormDataInput/readFrom)");
-        if (be != null) {
-          t = be;
-        }
-      }
+                Flow<Void> flow = callback.apply(reqCtx, m);
+                BlockingException be =
+                        MultipartHelper.tryBlock(reqCtx, flow, "Blocked request (for MultipartFormDataInput/readFrom)");
+                if (be != null) {
+                    t = be;
+                }
+            }
 
-      if (filenamesCallback != null) {
-        List<String> filenames = MultipartHelper.collectFilenames(ret);
-        if (!filenames.isEmpty()) {
-          Flow<Void> filenamesFlow = filenamesCallback.apply(reqCtx, filenames);
-          if (t == null) {
-            BlockingException be =
-                MultipartHelper.tryBlock(
-                    reqCtx, filenamesFlow, "Blocked request (multipart file upload)");
-            if (be != null) {
-              t = be;
+            if (filenamesCallback != null) {
+                List<String> filenames = MultipartHelper.collectFilenames(ret);
+                if (!filenames.isEmpty()) {
+                    Flow<Void> filenamesFlow = filenamesCallback.apply(reqCtx, filenames);
+                    if (t == null) {
+                        BlockingException be = MultipartHelper.tryBlock(
+                                reqCtx, filenamesFlow, "Blocked request (multipart file upload)");
+                        if (be != null) {
+                            t = be;
+                        }
+                    }
+                }
             }
-          }
-        }
-      }
 
-      if (t == null && contentCallback != null) {
-        List<String> filesContent = MultipartHelper.collectFilesContent(ret);
-        if (!filesContent.isEmpty()) {
-          Flow<Void> contentFlow = contentCallback.apply(reqCtx, filesContent);
-          BlockingException be =
-              MultipartHelper.tryBlock(
-                  reqCtx, contentFlow, "Blocked request (multipart file upload content)");
-          if (be != null) {
-            t = be;
-          }
+            if (t == null && contentCallback != null) {
+                List<String> filesContent = MultipartHelper.collectFilesContent(ret);
+                if (!filesContent.isEmpty()) {
+                    Flow<Void> contentFlow = contentCallback.apply(reqCtx, filesContent);
+                    BlockingException be = MultipartHelper.tryBlock(
+                            reqCtx, contentFlow, "Blocked request (multipart file upload content)");
+                    if (be != null) {
+                        t = be;
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MultipartHelper.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MultipartHelper.java
index b63333d8c4b..3b155af7da5 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MultipartHelper.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MultipartHelper.java
@@ -20,311 +20,307 @@
 
 public final class MultipartHelper {
 
-  private static final Logger log = LoggerFactory.getLogger(MultipartHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(MultipartHelper.class);
 
-  public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
-  public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
+    public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
+    public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
 
-  private MultipartHelper() {}
+    private MultipartHelper() {}
 
-  // Reflection avoids a bytecode ref to MultivaluedMap (javax→jakarta in RESTEasy 6)
-  private static final Method GET_HEADERS;
+    // Reflection avoids a bytecode ref to MultivaluedMap (javax→jakarta in RESTEasy 6)
+    private static final Method GET_HEADERS;
 
-  static {
-    Method m = null;
-    try {
-      m = InputPart.class.getMethod("getHeaders");
-    } catch (NoSuchMethodException ignored) {
-    }
-    GET_HEADERS = m;
-  }
-
-  /**
-   * Builds the {@code server.request.body} map out of the multipart parts.
-   *
-   * <p>Every part with no {@code filename} attribute is collected, regardless of its declared
-   * content-type: a part with a filename is a file upload, reported separately via {@link
-   * #collectFilenames} / {@link #collectFilesContent}, and must not also consume the body-map
-   * budget, or a request could pad out the cap with disposable text-file parts and push a real form
-   * field out of the map. Filename-less parts are always genuine form fields regardless of their
-   * declared media type (e.g. a JSON or XML {@code @RequestPart}), so they must stay in the body
-   * map even when not {@code text/plain} - filtering those out would silently drop their content
-   * from AppSec inspection entirely, since {@link #collectFilesContent} also skips filename-less
-   * parts. The number of collected values is capped by {@link #MAX_FILES_TO_INSPECT}. The cap
-   * counts the total accumulated values across all field names, not the distinct keys: {@code
-   * getFormDataMap()} already groups parts by field name, so a per-key cap would be trivially
-   * bypassed by repeating the same field name on every part.
-   */
-  public static Map<String, List<String>> collectBodyMap(MultipartFormDataInput ret) {
-    Map<String, List<String>> bodyMap = new HashMap<>();
-    int total = 0;
-    for (Map.Entry<String, List<InputPart>> e : ret.getFormDataMap().entrySet()) {
-      for (InputPart inputPart : e.getValue()) {
-        Map<String, List<String>> headers = headersOf(inputPart);
-        if (hasFilename(headers)) {
-          continue;
-        }
-        if (total >= MAX_FILES_TO_INSPECT) {
-          return bodyMap;
+    static {
+        Method m = null;
+        try {
+            m = InputPart.class.getMethod("getHeaders");
+        } catch (NoSuchMethodException ignored) {
         }
-        String contentType = contentTypeOf(headers);
-        bodyMap
-            .computeIfAbsent(e.getKey(), k -> new ArrayList<>())
-            .add(readContent(inputPart, contentTypeWithDefaultUtf8(contentType)));
-        total++;
-      }
-    }
-    return bodyMap;
-  }
-
-  // Used for the body-map/text-field path only: matches Jersey's own getValue(), which decodes
-  // undeclared-charset text parts as UTF-8 instead of falling back to the JVM platform charset
-  // (MultipartContentDecoder's default for the filesContent path, kept as-is for parity with the
-  // other multipart integrations).
-  private static String contentTypeWithDefaultUtf8(String contentType) {
-    return MultipartContentDecoder.extractCharset(contentType) == null
-        ? (contentType == null ? "text/plain; charset=UTF-8" : contentType + "; charset=UTF-8")
-        : contentType;
-  }
-
-  // Used by collectBodyMap only: collectFilenames/collectFilesContent do their own reflective
-  // getHeaders() call and are intentionally left untouched (out of scope, already correct).
-  private static Map<String, List<String>> headersOf(InputPart inputPart) {
-    if (GET_HEADERS == null) {
-      return null;
-    }
-    try {
-      @SuppressWarnings("unchecked")
-      Map<String, List<String>> headers = (Map<String, List<String>>) GET_HEADERS.invoke(inputPart);
-      return headers;
-    } catch (Exception e) {
-      // Reflective getHeaders() call failed (unexpected InputPart implementation): fall back to
-      // resolving no headers rather than aborting the whole request's body-map collection.
-      log.debug("Failed to read multipart part headers via reflection", e);
-      return null;
+        GET_HEADERS = m;
     }
-  }
 
-  private static String contentTypeOf(Map<String, List<String>> headers) {
-    if (headers == null) {
-      return null;
+    /**
+     * Builds the {@code server.request.body} map out of the multipart parts.
+     *
+     * <p>Every part with no {@code filename} attribute is collected, regardless of its declared
+     * content-type: a part with a filename is a file upload, reported separately via {@link
+     * #collectFilenames} / {@link #collectFilesContent}, and must not also consume the body-map
+     * budget, or a request could pad out the cap with disposable text-file parts and push a real form
+     * field out of the map. Filename-less parts are always genuine form fields regardless of their
+     * declared media type (e.g. a JSON or XML {@code @RequestPart}), so they must stay in the body
+     * map even when not {@code text/plain} - filtering those out would silently drop their content
+     * from AppSec inspection entirely, since {@link #collectFilesContent} also skips filename-less
+     * parts. The number of collected values is capped by {@link #MAX_FILES_TO_INSPECT}. The cap
+     * counts the total accumulated values across all field names, not the distinct keys: {@code
+     * getFormDataMap()} already groups parts by field name, so a per-key cap would be trivially
+     * bypassed by repeating the same field name on every part.
+     */
+    public static Map<String, List<String>> collectBodyMap(MultipartFormDataInput ret) {
+        Map<String, List<String>> bodyMap = new HashMap<>();
+        int total = 0;
+        for (Map.Entry<String, List<InputPart>> e : ret.getFormDataMap().entrySet()) {
+            for (InputPart inputPart : e.getValue()) {
+                Map<String, List<String>> headers = headersOf(inputPart);
+                if (hasFilename(headers)) {
+                    continue;
+                }
+                if (total >= MAX_FILES_TO_INSPECT) {
+                    return bodyMap;
+                }
+                String contentType = contentTypeOf(headers);
+                bodyMap.computeIfAbsent(e.getKey(), k -> new ArrayList<>())
+                        .add(readContent(inputPart, contentTypeWithDefaultUtf8(contentType)));
+                total++;
+            }
+        }
+        return bodyMap;
     }
-    List<String> ctHeaders = getHeaderCaseInsensitive(headers, "Content-Type");
-    return (ctHeaders != null && !ctHeaders.isEmpty()) ? ctHeaders.get(0) : null;
-  }
 
-  // A part with a filename attribute (present, even if empty) is a file upload, not a form field,
-  // regardless of its declared content-type: a file can be declared text/plain and would otherwise
-  // consume the body-map budget meant for genuine form fields. Uses hasFilenameParam() rather than
-  // rawFilenameFromContentDisposition(), which deliberately ignores
-  // the RFC 5987 "filename*" form: a part carrying only "filename*" must still be excluded here.
-  // collectFilesContent() uses the same hasFilenameParam() gate, so such a part is still inspected
-  // there even though this file never decodes its filename* value.
-  private static boolean hasFilename(Map<String, List<String>> headers) {
-    if (headers == null) {
-      return false;
-    }
-    List<String> cdHeaders = getHeaderCaseInsensitive(headers, "Content-Disposition");
-    if (cdHeaders == null || cdHeaders.isEmpty()) {
-      return false;
+    // Used for the body-map/text-field path only: matches Jersey's own getValue(), which decodes
+    // undeclared-charset text parts as UTF-8 instead of falling back to the JVM platform charset
+    // (MultipartContentDecoder's default for the filesContent path, kept as-is for parity with the
+    // other multipart integrations).
+    private static String contentTypeWithDefaultUtf8(String contentType) {
+        return MultipartContentDecoder.extractCharset(contentType) == null
+                ? (contentType == null ? "text/plain; charset=UTF-8" : contentType + "; charset=UTF-8")
+                : contentType;
     }
-    return hasFilenameParam(cdHeaders.get(0));
-  }
 
-  // Presence-only counterpart of rawFilenameFromContentDisposition(): recognizes both the plain
-  // "filename" parameter and the RFC 5987 extended "filename*" form (e.g. filename*=UTF-8''a.txt),
-  // since either form marks the part as a file upload. Unlike rawFilenameFromContentDisposition(),
-  // this never needs to decode the value, so the RFC 5987 charset/percent-encoding is irrelevant
-  // here. Shares the same quote-aware semicolon scanning; see rawFilenameFromContentDisposition()
-  // for the rationale.
-  private static boolean hasFilenameParam(String cd) {
-    if (cd == null) return false;
-    int i = 0;
-    int len = cd.length();
-    while (i < len) {
-      while (i < len && cd.charAt(i) != ';') {
-        if (cd.charAt(i) == '"') {
-          i++;
-          while (i < len && cd.charAt(i) != '"') {
-            if (cd.charAt(i) == '\\') i++;
-            i++;
-          }
+    // Used by collectBodyMap only: collectFilenames/collectFilesContent do their own reflective
+    // getHeaders() call and are intentionally left untouched (out of scope, already correct).
+    private static Map<String, List<String>> headersOf(InputPart inputPart) {
+        if (GET_HEADERS == null) {
+            return null;
         }
-        i++;
-      }
-      if (i >= len) break;
-      i++;
-      while (i < len && (cd.charAt(i) == ' ' || cd.charAt(i) == '\t')) i++;
-      if (cd.regionMatches(true, i, "filename", 0, 8)) {
-        int j = i + 8;
-        if (j < len && cd.charAt(j) == '*') j++;
-        while (j < len && (cd.charAt(j) == ' ' || cd.charAt(j) == '\t')) j++;
-        if (j < len && cd.charAt(j) == '=') {
-          return true;
+        try {
+            @SuppressWarnings("unchecked")
+            Map<String, List<String>> headers = (Map<String, List<String>>) GET_HEADERS.invoke(inputPart);
+            return headers;
+        } catch (Exception e) {
+            // Reflective getHeaders() call failed (unexpected InputPart implementation): fall back to
+            // resolving no headers rather than aborting the whole request's body-map collection.
+            log.debug("Failed to read multipart part headers via reflection", e);
+            return null;
         }
-      }
     }
-    return false;
-  }
 
-  public static List<String> collectFilenames(MultipartFormDataInput ret) {
-    List<String> filenames = new ArrayList<>();
-    if (GET_HEADERS == null) {
-      return filenames;
+    private static String contentTypeOf(Map<String, List<String>> headers) {
+        if (headers == null) {
+            return null;
+        }
+        List<String> ctHeaders = getHeaderCaseInsensitive(headers, "Content-Type");
+        return (ctHeaders != null && !ctHeaders.isEmpty()) ? ctHeaders.get(0) : null;
     }
-    for (Map.Entry<String, List<InputPart>> e : ret.getFormDataMap().entrySet()) {
-      for (InputPart inputPart : e.getValue()) {
-        List<String> cdHeaders;
-        try {
-          @SuppressWarnings("unchecked")
-          Map<String, List<String>> headers =
-              (Map<String, List<String>>) GET_HEADERS.invoke(inputPart);
-          cdHeaders =
-              headers != null ? getHeaderCaseInsensitive(headers, "Content-Disposition") : null;
-        } catch (Exception ignored) {
-          continue;
+
+    // A part with a filename attribute (present, even if empty) is a file upload, not a form field,
+    // regardless of its declared content-type: a file can be declared text/plain and would otherwise
+    // consume the body-map budget meant for genuine form fields. Uses hasFilenameParam() rather than
+    // rawFilenameFromContentDisposition(), which deliberately ignores
+    // the RFC 5987 "filename*" form: a part carrying only "filename*" must still be excluded here.
+    // collectFilesContent() uses the same hasFilenameParam() gate, so such a part is still inspected
+    // there even though this file never decodes its filename* value.
+    private static boolean hasFilename(Map<String, List<String>> headers) {
+        if (headers == null) {
+            return false;
         }
+        List<String> cdHeaders = getHeaderCaseInsensitive(headers, "Content-Disposition");
         if (cdHeaders == null || cdHeaders.isEmpty()) {
-          continue;
-        }
-        String filename = filenameFromContentDisposition(cdHeaders.get(0));
-        if (filename != null) {
-          filenames.add(filename);
+            return false;
         }
-      }
+        return hasFilenameParam(cdHeaders.get(0));
     }
-    return filenames;
-  }
 
-  public static List<String> collectFilesContent(MultipartFormDataInput ret) {
-    List<String> contents = new ArrayList<>();
-    if (GET_HEADERS == null) {
-      return contents;
-    }
-    for (Map.Entry<String, List<InputPart>> e : ret.getFormDataMap().entrySet()) {
-      for (InputPart inputPart : e.getValue()) {
-        if (contents.size() >= MAX_FILES_TO_INSPECT) {
-          return contents;
+    // Presence-only counterpart of rawFilenameFromContentDisposition(): recognizes both the plain
+    // "filename" parameter and the RFC 5987 extended "filename*" form (e.g. filename*=UTF-8''a.txt),
+    // since either form marks the part as a file upload. Unlike rawFilenameFromContentDisposition(),
+    // this never needs to decode the value, so the RFC 5987 charset/percent-encoding is irrelevant
+    // here. Shares the same quote-aware semicolon scanning; see rawFilenameFromContentDisposition()
+    // for the rationale.
+    private static boolean hasFilenameParam(String cd) {
+        if (cd == null) return false;
+        int i = 0;
+        int len = cd.length();
+        while (i < len) {
+            while (i < len && cd.charAt(i) != ';') {
+                if (cd.charAt(i) == '"') {
+                    i++;
+                    while (i < len && cd.charAt(i) != '"') {
+                        if (cd.charAt(i) == '\\') i++;
+                        i++;
+                    }
+                }
+                i++;
+            }
+            if (i >= len) break;
+            i++;
+            while (i < len && (cd.charAt(i) == ' ' || cd.charAt(i) == '\t')) i++;
+            if (cd.regionMatches(true, i, "filename", 0, 8)) {
+                int j = i + 8;
+                if (j < len && cd.charAt(j) == '*') j++;
+                while (j < len && (cd.charAt(j) == ' ' || cd.charAt(j) == '\t')) j++;
+                if (j < len && cd.charAt(j) == '=') {
+                    return true;
+                }
+            }
         }
-        Map<String, List<String>> headers;
-        try {
-          @SuppressWarnings("unchecked")
-          Map<String, List<String>> h = (Map<String, List<String>>) GET_HEADERS.invoke(inputPart);
-          headers = h;
-        } catch (Exception ignored) {
-          continue;
+        return false;
+    }
+
+    public static List<String> collectFilenames(MultipartFormDataInput ret) {
+        List<String> filenames = new ArrayList<>();
+        if (GET_HEADERS == null) {
+            return filenames;
         }
-        if (headers == null) {
-          continue;
+        for (Map.Entry<String, List<InputPart>> e : ret.getFormDataMap().entrySet()) {
+            for (InputPart inputPart : e.getValue()) {
+                List<String> cdHeaders;
+                try {
+                    @SuppressWarnings("unchecked")
+                    Map<String, List<String>> headers = (Map<String, List<String>>) GET_HEADERS.invoke(inputPart);
+                    cdHeaders = headers != null ? getHeaderCaseInsensitive(headers, "Content-Disposition") : null;
+                } catch (Exception ignored) {
+                    continue;
+                }
+                if (cdHeaders == null || cdHeaders.isEmpty()) {
+                    continue;
+                }
+                String filename = filenameFromContentDisposition(cdHeaders.get(0));
+                if (filename != null) {
+                    filenames.add(filename);
+                }
+            }
         }
-        List<String> cdHeaders = getHeaderCaseInsensitive(headers, "Content-Disposition");
-        if (cdHeaders == null || cdHeaders.isEmpty()) {
-          continue;
+        return filenames;
+    }
+
+    public static List<String> collectFilesContent(MultipartFormDataInput ret) {
+        List<String> contents = new ArrayList<>();
+        if (GET_HEADERS == null) {
+            return contents;
         }
-        // hasFilenameParam recognizes both filename and filename* (see its javadoc): a part with
-        // neither is a plain form field, already covered by collectBodyMap, and skipped here.
-        if (!hasFilenameParam(cdHeaders.get(0))) {
-          continue;
+        for (Map.Entry<String, List<InputPart>> e : ret.getFormDataMap().entrySet()) {
+            for (InputPart inputPart : e.getValue()) {
+                if (contents.size() >= MAX_FILES_TO_INSPECT) {
+                    return contents;
+                }
+                Map<String, List<String>> headers;
+                try {
+                    @SuppressWarnings("unchecked")
+                    Map<String, List<String>> h = (Map<String, List<String>>) GET_HEADERS.invoke(inputPart);
+                    headers = h;
+                } catch (Exception ignored) {
+                    continue;
+                }
+                if (headers == null) {
+                    continue;
+                }
+                List<String> cdHeaders = getHeaderCaseInsensitive(headers, "Content-Disposition");
+                if (cdHeaders == null || cdHeaders.isEmpty()) {
+                    continue;
+                }
+                // hasFilenameParam recognizes both filename and filename* (see its javadoc): a part with
+                // neither is a plain form field, already covered by collectBodyMap, and skipped here.
+                if (!hasFilenameParam(cdHeaders.get(0))) {
+                    continue;
+                }
+                List<String> ctHeaders = getHeaderCaseInsensitive(headers, "Content-Type");
+                String contentType = (ctHeaders != null && !ctHeaders.isEmpty()) ? ctHeaders.get(0) : null;
+                contents.add(readContent(inputPart, contentType));
+            }
         }
-        List<String> ctHeaders = getHeaderCaseInsensitive(headers, "Content-Type");
-        String contentType = (ctHeaders != null && !ctHeaders.isEmpty()) ? ctHeaders.get(0) : null;
-        contents.add(readContent(inputPart, contentType));
-      }
+        return contents;
     }
-    return contents;
-  }
 
-  public static BlockingException tryBlock(RequestContext ctx, Flow<Void> flow, String message) {
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      BlockResponseFunction brf = ctx.getBlockResponseFunction();
-      if (brf != null) {
-        brf.tryCommitBlockingResponse(ctx, rba);
-        BlockingException be = new BlockingException(message);
-        ctx.getTraceSegment().effectivelyBlocked();
-        return be;
-      }
+    public static BlockingException tryBlock(RequestContext ctx, Flow<Void> flow, String message) {
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            BlockResponseFunction brf = ctx.getBlockResponseFunction();
+            if (brf != null) {
+                brf.tryCommitBlockingResponse(ctx, rba);
+                BlockingException be = new BlockingException(message);
+                ctx.getTraceSegment().effectivelyBlocked();
+                return be;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  static String readContent(InputPart inputPart, String contentType) {
-    try (InputStream is = inputPart.getBody(InputStream.class, null)) {
-      if (is == null) return "";
-      return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, contentType);
-    } catch (Exception e) {
-      // getBody()/readInputStream() can throw unchecked exceptions too (e.g. a MessageBodyReader
-      // lookup failure); one bad part must not abort the whole request's body/content collection.
-      log.debug("Failed to read multipart part content, returning empty string", e);
-      return "";
+    static String readContent(InputPart inputPart, String contentType) {
+        try (InputStream is = inputPart.getBody(InputStream.class, null)) {
+            if (is == null) return "";
+            return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, contentType);
+        } catch (Exception e) {
+            // getBody()/readInputStream() can throw unchecked exceptions too (e.g. a MessageBodyReader
+            // lookup failure); one bad part must not abort the whole request's body/content collection.
+            log.debug("Failed to read multipart part content, returning empty string", e);
+            return "";
+        }
     }
-  }
 
-  private static List<String> getHeaderCaseInsensitive(
-      Map<String, List<String>> headers, String name) {
-    for (Entry<String, List<String>> entry : headers.entrySet()) {
-      if (name.equalsIgnoreCase(entry.getKey())) {
-        return entry.getValue();
-      }
+    private static List<String> getHeaderCaseInsensitive(Map<String, List<String>> headers, String name) {
+        for (Entry<String, List<String>> entry : headers.entrySet()) {
+            if (name.equalsIgnoreCase(entry.getKey())) {
+                return entry.getValue();
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  // Quote-aware: semicolons inside quoted filenames (e.g. filename="a;b.php") are not separators.
-  // Outer loop: i advances to each ';' (skipping quoted strings to avoid treating their contents
-  // as delimiters), then past MIME linear whitespace (SP/HT) to the start of the parameter name.
-  // j is a lookahead used only to find '=' after optional whitespace without committing i until
-  // the parameter is confirmed to be "filename"; this avoids confusing "filename*" (RFC 5987) or
-  // other "filename"-prefixed parameter names with the plain "filename" parameter.
-  public static String filenameFromContentDisposition(String cd) {
-    String raw = rawFilenameFromContentDisposition(cd);
-    return (raw == null || raw.isEmpty()) ? null : raw;
-  }
+    // Quote-aware: semicolons inside quoted filenames (e.g. filename="a;b.php") are not separators.
+    // Outer loop: i advances to each ';' (skipping quoted strings to avoid treating their contents
+    // as delimiters), then past MIME linear whitespace (SP/HT) to the start of the parameter name.
+    // j is a lookahead used only to find '=' after optional whitespace without committing i until
+    // the parameter is confirmed to be "filename"; this avoids confusing "filename*" (RFC 5987) or
+    // other "filename"-prefixed parameter names with the plain "filename" parameter.
+    public static String filenameFromContentDisposition(String cd) {
+        String raw = rawFilenameFromContentDisposition(cd);
+        return (raw == null || raw.isEmpty()) ? null : raw;
+    }
 
-  // Like filenameFromContentDisposition but returns "" for present-but-empty filename,
-  // and null only when the filename parameter is absent entirely.
-  static String rawFilenameFromContentDisposition(String cd) {
-    if (cd == null) return null;
-    int i = 0;
-    int len = cd.length();
-    while (i < len) {
-      while (i < len && cd.charAt(i) != ';') {
-        if (cd.charAt(i) == '"') {
-          i++;
-          while (i < len && cd.charAt(i) != '"') {
-            if (cd.charAt(i) == '\\') i++;
-            i++;
-          }
-        }
-        i++;
-      }
-      if (i >= len) break;
-      i++;
-      while (i < len && (cd.charAt(i) == ' ' || cd.charAt(i) == '\t')) i++;
-      if (cd.regionMatches(true, i, "filename", 0, 8)) {
-        int j = i + 8;
-        while (j < len && (cd.charAt(j) == ' ' || cd.charAt(j) == '\t')) j++;
-        if (j < len && cd.charAt(j) == '=') {
-          i = j + 1;
-          while (i < len && (cd.charAt(i) == ' ' || cd.charAt(i) == '\t')) i++;
-          if (i >= len) return "";
-          if (cd.charAt(i) == '"') {
+    // Like filenameFromContentDisposition but returns "" for present-but-empty filename,
+    // and null only when the filename parameter is absent entirely.
+    static String rawFilenameFromContentDisposition(String cd) {
+        if (cd == null) return null;
+        int i = 0;
+        int len = cd.length();
+        while (i < len) {
+            while (i < len && cd.charAt(i) != ';') {
+                if (cd.charAt(i) == '"') {
+                    i++;
+                    while (i < len && cd.charAt(i) != '"') {
+                        if (cd.charAt(i) == '\\') i++;
+                        i++;
+                    }
+                }
+                i++;
+            }
+            if (i >= len) break;
             i++;
-            StringBuilder sb = new StringBuilder();
-            while (i < len && cd.charAt(i) != '"') {
-              if (cd.charAt(i) == '\\' && i + 1 < len) i++; // unescape
-              sb.append(cd.charAt(i++));
+            while (i < len && (cd.charAt(i) == ' ' || cd.charAt(i) == '\t')) i++;
+            if (cd.regionMatches(true, i, "filename", 0, 8)) {
+                int j = i + 8;
+                while (j < len && (cd.charAt(j) == ' ' || cd.charAt(j) == '\t')) j++;
+                if (j < len && cd.charAt(j) == '=') {
+                    i = j + 1;
+                    while (i < len && (cd.charAt(i) == ' ' || cd.charAt(i) == '\t')) i++;
+                    if (i >= len) return "";
+                    if (cd.charAt(i) == '"') {
+                        i++;
+                        StringBuilder sb = new StringBuilder();
+                        while (i < len && cd.charAt(i) != '"') {
+                            if (cd.charAt(i) == '\\' && i + 1 < len) i++; // unescape
+                            sb.append(cd.charAt(i++));
+                        }
+                        return sb.toString();
+                    } else {
+                        int start = i;
+                        while (i < len && cd.charAt(i) != ';') i++;
+                        return cd.substring(start, i).trim();
+                    }
+                }
             }
-            return sb.toString();
-          } else {
-            int start = i;
-            while (i < len && cd.charAt(i) != ';') i++;
-            return cd.substring(start, i).trim();
-          }
         }
-      }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/PathParamInjectorAdvice.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/PathParamInjectorAdvice.java
index 0edfa333cf9..af94ab2b606 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/PathParamInjectorAdvice.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/PathParamInjectorAdvice.java
@@ -14,27 +14,27 @@
 
 @RequiresRequestContext(RequestContextSlot.IAST)
 public class PathParamInjectorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-  public static void onExit(
-      @Advice.Return Object result,
-      @Advice.FieldValue("paramName") String paramName,
-      @ActiveRequestContext RequestContext reqCtx) {
-    if (result instanceof String || result instanceof Collection) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        if (result instanceof Collection) {
-          Collection<?> collection = (Collection<?>) result;
-          for (Object o : collection) {
-            if (o instanceof String) {
-              module.taintString(ctx, (String) o, SourceTypes.REQUEST_PATH_PARAMETER, paramName);
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+    public static void onExit(
+            @Advice.Return Object result,
+            @Advice.FieldValue("paramName") String paramName,
+            @ActiveRequestContext RequestContext reqCtx) {
+        if (result instanceof String || result instanceof Collection) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                if (result instanceof Collection) {
+                    Collection<?> collection = (Collection<?>) result;
+                    for (Object o : collection) {
+                        if (o instanceof String) {
+                            module.taintString(ctx, (String) o, SourceTypes.REQUEST_PATH_PARAMETER, paramName);
+                        }
+                    }
+                } else {
+                    module.taintString(ctx, (String) result, SourceTypes.REQUEST_PATH_PARAMETER, paramName);
+                }
             }
-          }
-        } else {
-          module.taintString(ctx, (String) result, SourceTypes.REQUEST_PATH_PARAMETER, paramName);
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/PathParamInjectorInstrumentation.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/PathParamInjectorInstrumentation.java
index 9bb763d36ca..6c14e941354 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/PathParamInjectorInstrumentation.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/PathParamInjectorInstrumentation.java
@@ -10,26 +10,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class PathParamInjectorInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public PathParamInjectorInstrumentation() {
-    super("resteasy");
-  }
+    public PathParamInjectorInstrumentation() {
+        super("resteasy");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jaxrs";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jaxrs";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("inject").and(isPublic()).and(takesArguments(2)),
-        packageName + ".PathParamInjectorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("inject").and(isPublic()).and(takesArguments(2)), packageName + ".PathParamInjectorAdvice");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.jboss.resteasy.core.PathParamInjector";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.jboss.resteasy.core.PathParamInjector";
+    }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/QueryParamInjectorAdvice.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/QueryParamInjectorAdvice.java
index 3a3c7e323b0..10ff208424b 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/QueryParamInjectorAdvice.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/QueryParamInjectorAdvice.java
@@ -14,27 +14,27 @@
 
 @RequiresRequestContext(RequestContextSlot.IAST)
 public class QueryParamInjectorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-  public static void onExit(
-      @Advice.Return Object result,
-      @Advice.FieldValue("encodedName") String paramName,
-      @ActiveRequestContext RequestContext reqCtx) {
-    if (result instanceof String || result instanceof Collection) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        if (result instanceof Collection) {
-          Collection<?> collection = (Collection<?>) result;
-          for (Object o : collection) {
-            if (o instanceof String) {
-              module.taintString(ctx, (String) o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+    public static void onExit(
+            @Advice.Return Object result,
+            @Advice.FieldValue("encodedName") String paramName,
+            @ActiveRequestContext RequestContext reqCtx) {
+        if (result instanceof String || result instanceof Collection) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                if (result instanceof Collection) {
+                    Collection<?> collection = (Collection<?>) result;
+                    for (Object o : collection) {
+                        if (o instanceof String) {
+                            module.taintString(ctx, (String) o, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
+                        }
+                    }
+                } else {
+                    module.taintString(ctx, (String) result, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
+                }
             }
-          }
-        } else {
-          module.taintString(ctx, (String) result, SourceTypes.REQUEST_PARAMETER_VALUE, paramName);
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/QueryParamInjectorInstrumentation.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/QueryParamInjectorInstrumentation.java
index 0055ac5244e..f21d9fd2c4a 100644
--- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/QueryParamInjectorInstrumentation.java
+++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/QueryParamInjectorInstrumentation.java
@@ -10,26 +10,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class QueryParamInjectorInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public QueryParamInjectorInstrumentation() {
-    super("resteasy");
-  }
+    public QueryParamInjectorInstrumentation() {
+        super("resteasy");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jaxrs";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jaxrs";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("inject").and(isPublic()).and(takesArguments(2)),
-        packageName + ".QueryParamInjectorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("inject").and(isPublic()).and(takesArguments(2)), packageName + ".QueryParamInjectorAdvice");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.jboss.resteasy.core.QueryParamInjector";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.jboss.resteasy.core.QueryParamInjector";
+    }
 }
diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/HttpExchangeURIDataAdapter.java b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/HttpExchangeURIDataAdapter.java
index 8693c3b0d5c..f8a732f8d2a 100644
--- a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/HttpExchangeURIDataAdapter.java
+++ b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/HttpExchangeURIDataAdapter.java
@@ -7,36 +7,36 @@
 
 final class HttpExchangeURIDataAdapter extends URIDefaultDataAdapter {
 
-  private final HttpExchange exchange;
+    private final HttpExchange exchange;
 
-  HttpExchangeURIDataAdapter(HttpExchange exchange) {
-    super(exchange.getRequestURI());
-    this.exchange = exchange;
-  }
+    HttpExchangeURIDataAdapter(HttpExchange exchange) {
+        super(exchange.getRequestURI());
+        this.exchange = exchange;
+    }
 
-  @Override
-  public String scheme() {
-    // scheme is not available in getRequestURI
-    if (exchange instanceof HttpsExchange) {
-      return "https";
+    @Override
+    public String scheme() {
+        // scheme is not available in getRequestURI
+        if (exchange instanceof HttpsExchange) {
+            return "https";
+        }
+        return "http";
     }
-    return "http";
-  }
 
-  @Override
-  public String host() {
-    // host is not available in getRequestURI
-    InetSocketAddress inetSocketAddress = exchange.getLocalAddress();
-    if (inetSocketAddress.isUnresolved()) {
-      return inetSocketAddress.getHostString();
-    } else {
-      return inetSocketAddress.getHostName();
+    @Override
+    public String host() {
+        // host is not available in getRequestURI
+        InetSocketAddress inetSocketAddress = exchange.getLocalAddress();
+        if (inetSocketAddress.isUnresolved()) {
+            return inetSocketAddress.getHostString();
+        } else {
+            return inetSocketAddress.getHostName();
+        }
     }
-  }
 
-  @Override
-  public int port() {
-    // port is not available in getRequestURI
-    return exchange.getLocalAddress().getPort();
-  }
+    @Override
+    public int port() {
+        // port is not available in getRequestURI
+        return exchange.getLocalAddress().getPort();
+    }
 }
diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceDecorator.java b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceDecorator.java
index a92b5ac0730..655375bb34f 100644
--- a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceDecorator.java
+++ b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceDecorator.java
@@ -13,51 +13,47 @@
 
 public class ResourceDecorator extends BaseDecorator {
 
-  public static final CharSequence RESTLET_CONTROLLER =
-      UTF8BytesString.create("restlet-controller");
-
-  public static final String RESTLET_ROUTE = "datadog.trace.instrumentation.restlet.route";
-
-  public static ResourceDecorator DECORATE = new ResourceDecorator();
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"restlet-http"};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return RESTLET_CONTROLLER;
-  }
-
-  public void onRestletSpan(
-      final AgentSpan span,
-      final AgentSpan parent,
-      final ServerResource serverResource,
-      final Method method) {
-    Series<Header> headers =
-        (Series<Header>)
-            serverResource.getRequest().getAttributes().get("org.restlet.http.headers");
-    String route = headers.getFirstValue(RESTLET_ROUTE);
-
-    span.setSpanType(InternalSpanTypes.HTTP_SERVER);
-
-    // When restlet-http is the root, we want to name using the path, otherwise use
-    // class.method.
-    final boolean isRootScope = parent == null;
-    if (isRootScope) {
-      HTTP_RESOURCE_DECORATOR.withRoute(span, serverResource.getMethod().getName(), route);
-    } else {
-      span.setResourceName(DECORATE.spanNameForMethod(method));
-
-      if (parent == parent.getLocalRootSpan()) {
-        HTTP_RESOURCE_DECORATOR.withRoute(parent, serverResource.getMethod().getName(), route);
-      }
+    public static final CharSequence RESTLET_CONTROLLER = UTF8BytesString.create("restlet-controller");
+
+    public static final String RESTLET_ROUTE = "datadog.trace.instrumentation.restlet.route";
+
+    public static ResourceDecorator DECORATE = new ResourceDecorator();
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"restlet-http"};
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return RESTLET_CONTROLLER;
+    }
+
+    public void onRestletSpan(
+            final AgentSpan span, final AgentSpan parent, final ServerResource serverResource, final Method method) {
+        Series<Header> headers =
+                (Series<Header>) serverResource.getRequest().getAttributes().get("org.restlet.http.headers");
+        String route = headers.getFirstValue(RESTLET_ROUTE);
+
+        span.setSpanType(InternalSpanTypes.HTTP_SERVER);
+
+        // When restlet-http is the root, we want to name using the path, otherwise use
+        // class.method.
+        final boolean isRootScope = parent == null;
+        if (isRootScope) {
+            HTTP_RESOURCE_DECORATOR.withRoute(span, serverResource.getMethod().getName(), route);
+        } else {
+            span.setResourceName(DECORATE.spanNameForMethod(method));
+
+            if (parent == parent.getLocalRootSpan()) {
+                HTTP_RESOURCE_DECORATOR.withRoute(
+                        parent, serverResource.getMethod().getName(), route);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java
index acf91cd081c..da94cfe5d8a 100644
--- a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java
+++ b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java
@@ -23,60 +23,58 @@
 
 @AutoService(InstrumenterModule.class)
 public final class ResourceInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  private static final String RESTLET_HTTP_OPERATION_NAME = "restlet.request";
+    private static final String RESTLET_HTTP_OPERATION_NAME = "restlet.request";
 
-  public ResourceInstrumentation() {
-    super("restlet-http");
-  }
+    public ResourceInstrumentation() {
+        super("restlet-http");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.restlet.resource.ServerResource";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.restlet.resource.ServerResource";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("doHandle"))
-            .and(takesArguments(2))
-            // In 2.2 this parameter is of type AnnotationInfo. In 2.3+ it is of type
-            // MethodAnnotationInfo, which is a subclass of AnnotationInfo
-            .and(
-                takesArgument(0, extendsClass(named("org.restlet.engine.resource.AnnotationInfo"))))
-            .and(takesArgument(1, named("org.restlet.representation.Variant"))),
-        getClass().getName() + "$ResourceHandleAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("doHandle"))
+                        .and(takesArguments(2))
+                        // In 2.2 this parameter is of type AnnotationInfo. In 2.3+ it is of type
+                        // MethodAnnotationInfo, which is a subclass of AnnotationInfo
+                        .and(takesArgument(0, extendsClass(named("org.restlet.engine.resource.AnnotationInfo"))))
+                        .and(takesArgument(1, named("org.restlet.representation.Variant"))),
+                getClass().getName() + "$ResourceHandleAdvice");
+    }
 
-  public static class ResourceHandleAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beginRequest(
-        @Advice.This final ServerResource serverResource,
-        @Advice.Argument(0) final AnnotationInfo annotationInfo) {
-      final AgentSpan parent = activeSpan();
+    public static class ResourceHandleAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beginRequest(
+                @Advice.This final ServerResource serverResource,
+                @Advice.Argument(0) final AnnotationInfo annotationInfo) {
+            final AgentSpan parent = activeSpan();
 
-      final AgentSpan span = startSpan(RESTLET_CONTROLLER.toString(), RESTLET_HTTP_OPERATION_NAME);
-      span.setMeasured(true);
-      DECORATE.onRestletSpan(span, parent, serverResource, annotationInfo.getJavaMethod());
-      DECORATE.afterStart(span);
+            final AgentSpan span = startSpan(RESTLET_CONTROLLER.toString(), RESTLET_HTTP_OPERATION_NAME);
+            span.setMeasured(true);
+            DECORATE.onRestletSpan(span, parent, serverResource, annotationInfo.getJavaMethod());
+            DECORATE.afterStart(span);
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void finishRequest(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) {
-      AgentSpan span = spanFromScope(scope);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void finishRequest(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) {
+            AgentSpan span = spanFromScope(scope);
 
-      if (null != error) {
-        DECORATE.onError(span, error);
-      }
+            if (null != error) {
+                DECORATE.onError(span, error);
+            }
 
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletDecorator.java b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletDecorator.java
index 627def26a91..493711e617b 100644
--- a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletDecorator.java
+++ b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletDecorator.java
@@ -9,67 +9,64 @@
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator;
 
-public class RestletDecorator
-    extends HttpServerDecorator<HttpExchange, HttpExchange, HttpExchange, HttpExchange> {
-  public static final CharSequence RESTLET_HTTP_SERVER =
-      UTF8BytesString.create("restlet-http-server");
-  public static final RestletDecorator DECORATE = new RestletDecorator();
+public class RestletDecorator extends HttpServerDecorator<HttpExchange, HttpExchange, HttpExchange, HttpExchange> {
+    public static final CharSequence RESTLET_HTTP_SERVER = UTF8BytesString.create("restlet-http-server");
+    public static final RestletDecorator DECORATE = new RestletDecorator();
 
-  private static final CharSequence RESTLET_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
+    private static final CharSequence RESTLET_REQUEST = UTF8BytesString.create(DECORATE.operationName());
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"restlet-http", "restlet-http-server"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"restlet-http", "restlet-http-server"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return RESTLET_HTTP_SERVER;
-  }
+    @Override
+    protected CharSequence component() {
+        return RESTLET_HTTP_SERVER;
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpExchange> getter() {
-    return Request.GETTER;
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpExchange> getter() {
+        return Request.GETTER;
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpExchange> responseGetter() {
-    return Response.GETTER;
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpExchange> responseGetter() {
+        return Response.GETTER;
+    }
 
-  @Override
-  public CharSequence spanName() {
-    return RESTLET_REQUEST;
-  }
+    @Override
+    public CharSequence spanName() {
+        return RESTLET_REQUEST;
+    }
 
-  @Override
-  protected String method(final HttpExchange exchange) {
-    return exchange.getRequestMethod();
-  }
+    @Override
+    protected String method(final HttpExchange exchange) {
+        return exchange.getRequestMethod();
+    }
 
-  @Override
-  protected URIDataAdapter url(final HttpExchange exchange) {
-    return new HttpExchangeURIDataAdapter(exchange);
-  }
+    @Override
+    protected URIDataAdapter url(final HttpExchange exchange) {
+        return new HttpExchangeURIDataAdapter(exchange);
+    }
 
-  @Override
-  protected String peerHostIP(final HttpExchange exchange) {
-    return exchange.getRemoteAddress().getAddress().getHostAddress();
-  }
+    @Override
+    protected String peerHostIP(final HttpExchange exchange) {
+        return exchange.getRemoteAddress().getAddress().getHostAddress();
+    }
 
-  @Override
-  protected int peerPort(final HttpExchange exchange) {
-    return exchange.getRemoteAddress().getPort();
-  }
+    @Override
+    protected int peerPort(final HttpExchange exchange) {
+        return exchange.getRemoteAddress().getPort();
+    }
 
-  @Override
-  protected int status(final HttpExchange exchange) {
-    return exchange.getResponseCode();
-  }
+    @Override
+    protected int status(final HttpExchange exchange) {
+        return exchange.getResponseCode();
+    }
 
-  @Override
-  protected String getRequestHeader(final HttpExchange exchange, String key) {
-    return exchange.getRequestHeaders().getFirst(key);
-  }
+    @Override
+    protected String getRequestHeader(final HttpExchange exchange, String key) {
+        return exchange.getRequestHeaders().getFirst(key);
+    }
 }
diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletExtractAdapter.java b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletExtractAdapter.java
index 5cafbd96f29..03e7854ff43 100644
--- a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletExtractAdapter.java
+++ b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletExtractAdapter.java
@@ -6,37 +6,36 @@
 import java.util.List;
 import java.util.Map;
 
-public abstract class RestletExtractAdapter
-    implements AgentPropagation.ContextVisitor<HttpExchange> {
-
-  abstract Headers getHeaders(HttpExchange exchange);
-
-  @Override
-  public void forEachKey(HttpExchange exchange, AgentPropagation.KeyClassifier classifier) {
-    Headers headers = getHeaders(exchange);
-    for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
-      List<String> values = entry.getValue();
-      if (!values.isEmpty() && !classifier.accept(entry.getKey(), values.get(0))) {
-        return;
-      }
-    }
-  }
+public abstract class RestletExtractAdapter implements AgentPropagation.ContextVisitor<HttpExchange> {
 
-  public static class Request extends RestletExtractAdapter {
-    public static final Request GETTER = new Request();
+    abstract Headers getHeaders(HttpExchange exchange);
 
     @Override
-    Headers getHeaders(HttpExchange exchange) {
-      return exchange.getRequestHeaders();
+    public void forEachKey(HttpExchange exchange, AgentPropagation.KeyClassifier classifier) {
+        Headers headers = getHeaders(exchange);
+        for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+            List<String> values = entry.getValue();
+            if (!values.isEmpty() && !classifier.accept(entry.getKey(), values.get(0))) {
+                return;
+            }
+        }
     }
-  }
 
-  public static class Response extends RestletExtractAdapter {
-    public static final Response GETTER = new Response();
+    public static class Request extends RestletExtractAdapter {
+        public static final Request GETTER = new Request();
 
-    @Override
-    Headers getHeaders(HttpExchange exchange) {
-      return exchange.getResponseHeaders();
+        @Override
+        Headers getHeaders(HttpExchange exchange) {
+            return exchange.getRequestHeaders();
+        }
+    }
+
+    public static class Response extends RestletExtractAdapter {
+        public static final Response GETTER = new Response();
+
+        @Override
+        Headers getHeaders(HttpExchange exchange) {
+            return exchange.getResponseHeaders();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletInstrumentation.java b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletInstrumentation.java
index deb86bbc843..9ecee2b6779 100644
--- a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletInstrumentation.java
+++ b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletInstrumentation.java
@@ -20,77 +20,74 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RestletInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public RestletInstrumentation() {
-    super("restlet-http", "restlet-http-server");
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.restlet.engine.connector.HttpServerHelper$1",
-      "org.restlet.engine.connector.HttpsServerHelper$2"
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("handle"))
-            .and(takesArgument(0, named("com.sun.net.httpserver.HttpExchange"))),
-        getClass().getName() + "$ContextTrackingAdvice",
-        getClass().getName() + "$RestletHandleAdvice");
-  }
+    public RestletInstrumentation() {
+        super("restlet-http", "restlet-http-server");
+    }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextTrackingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(@Advice.Argument(0) final HttpExchange exchange) {
-      Context parentContext = DECORATE.extract(exchange);
-      return parentContext.attach();
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.restlet.engine.connector.HttpServerHelper$1", "org.restlet.engine.connector.HttpsServerHelper$2"
+        };
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      scope.close();
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod().and(named("handle")).and(takesArgument(0, named("com.sun.net.httpserver.HttpExchange"))),
+                getClass().getName() + "$ContextTrackingAdvice",
+                getClass().getName() + "$RestletHandleAdvice");
     }
-  }
 
-  public static class RestletHandleAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beginRequest(@Advice.Argument(0) final HttpExchange exchange) {
-      Context parentContext = currentContext(); // parent context attached by ContextTrackingAdvice
-      Context context = DECORATE.startSpan(exchange, parentContext);
-      AgentSpan span = spanFromContext(context);
-      ContextScope scope = context.attach();
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, exchange, exchange, parentContext);
-      DECORATE.onPeerConnection(span, exchange.getRemoteAddress());
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextTrackingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(@Advice.Argument(0) final HttpExchange exchange) {
+            Context parentContext = DECORATE.extract(exchange);
+            return parentContext.attach();
+        }
 
-      return scope;
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            scope.close();
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void finishRequest(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Argument(0) final HttpExchange exchange,
-        @Advice.Thrown final Throwable error) {
-      if (null == scope) {
-        return;
-      }
+    public static class RestletHandleAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beginRequest(@Advice.Argument(0) final HttpExchange exchange) {
+            Context parentContext = currentContext(); // parent context attached by ContextTrackingAdvice
+            Context context = DECORATE.startSpan(exchange, parentContext);
+            AgentSpan span = spanFromContext(context);
+            ContextScope scope = context.attach();
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, exchange, exchange, parentContext);
+            DECORATE.onPeerConnection(span, exchange.getRemoteAddress());
+
+            return scope;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void finishRequest(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Argument(0) final HttpExchange exchange,
+                @Advice.Thrown final Throwable error) {
+            if (null == scope) {
+                return;
+            }
 
-      AgentSpan span = spanFromContext(scope.context());
-      DECORATE.onResponse(span, exchange);
+            AgentSpan span = spanFromContext(scope.context());
+            DECORATE.onResponse(span, exchange);
 
-      if (null != error) {
-        DECORATE.onError(span, error);
-      }
+            if (null != error) {
+                DECORATE.onError(span, error);
+            }
 
-      DECORATE.beforeFinish(scope.context());
-      scope.close();
-      span.finish();
+            DECORATE.beforeFinish(scope.context());
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RouteInstrumentation.java b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RouteInstrumentation.java
index 0b468b596cf..3d46a92a47b 100644
--- a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RouteInstrumentation.java
+++ b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RouteInstrumentation.java
@@ -16,39 +16,38 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RouteInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public RouteInstrumentation() {
-    super("restlet-http");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.restlet.routing.TemplateRoute";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("beforeHandle"))
-            .and(takesArgument(0, named("org.restlet.Request")))
-            .and(takesArgument(1, named("org.restlet.Response"))),
-        getClass().getName() + "$RouteBeforeHandleAdvice");
-  }
-
-  public static class RouteBeforeHandleAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void beginRequest(
-        @Advice.This final TemplateRoute route, @Advice.Argument(0) final Request request) {
-      String pattern = route.getTemplate().getPattern();
-      if (null == pattern || pattern.equals("")) {
-        return;
-      }
-
-      Series<Header> headers =
-          (Series<Header>) request.getAttributes().get("org.restlet.http.headers");
-      headers.set(RESTLET_ROUTE, pattern);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public RouteInstrumentation() {
+        super("restlet-http");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.restlet.routing.TemplateRoute";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("beforeHandle"))
+                        .and(takesArgument(0, named("org.restlet.Request")))
+                        .and(takesArgument(1, named("org.restlet.Response"))),
+                getClass().getName() + "$RouteBeforeHandleAdvice");
+    }
+
+    public static class RouteBeforeHandleAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void beginRequest(
+                @Advice.This final TemplateRoute route, @Advice.Argument(0) final Request request) {
+            String pattern = route.getTemplate().getPattern();
+            if (null == pattern || pattern.equals("")) {
+                return;
+            }
+
+            Series<Header> headers = (Series<Header>) request.getAttributes().get("org.restlet.http.headers");
+            headers.set(RESTLET_ROUTE, pattern);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/robolectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricInstrumentation.java b/dd-java-agent/instrumentation/robolectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricInstrumentation.java
index afe9d717cc9..f26ad6d1468 100644
--- a/dd-java-agent/instrumentation/robolectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricInstrumentation.java
+++ b/dd-java-agent/instrumentation/robolectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricInstrumentation.java
@@ -19,35 +19,34 @@
  */
 @AutoService(InstrumenterModule.class)
 public class RobolectricInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public RobolectricInstrumentation() {
-    super("ci-visibility", "robolectric");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.robolectric.internal.TestEnvironment";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("setUpApplicationState"), getClass().getName() + "$SetUpApplicationStateAdvice");
-  }
-
-  public static class SetUpApplicationStateAdvice {
-    // onThrowable so the tags are still captured when setUpApplicationState fails (e.g. during
-    // manifest/resource initialization): the emulated SDK is set early in the method, and the test
-    // span still exists, so the failing test should carry the Android metadata too.
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit() {
-      RobolectricTestAnnotator.annotate();
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public RobolectricInstrumentation() {
+        super("ci-visibility", "robolectric");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.robolectric.internal.TestEnvironment";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("setUpApplicationState"), getClass().getName() + "$SetUpApplicationStateAdvice");
+    }
+
+    public static class SetUpApplicationStateAdvice {
+        // onThrowable so the tags are still captured when setUpApplicationState fails (e.g. during
+        // manifest/resource initialization): the emulated SDK is set early in the method, and the test
+        // span still exists, so the failing test should carry the Android metadata too.
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit() {
+            RobolectricTestAnnotator.annotate();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/robolectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricTestAnnotator.java b/dd-java-agent/instrumentation/robolectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricTestAnnotator.java
index 90ee48a41b9..a5ea2258fe4 100644
--- a/dd-java-agent/instrumentation/robolectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricTestAnnotator.java
+++ b/dd-java-agent/instrumentation/robolectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricTestAnnotator.java
@@ -17,136 +17,135 @@
 
 public final class RobolectricTestAnnotator {
 
-  /** Matches the version in a {@code robolectric-<version>.jar} file name. */
-  private static final Pattern ROBOLECTRIC_JAR = Pattern.compile("^robolectric-(.+)\\.jar$");
+    /** Matches the version in a {@code robolectric-<version>.jar} file name. */
+    private static final Pattern ROBOLECTRIC_JAR = Pattern.compile("^robolectric-(.+)\\.jar$");
 
-  private RobolectricTestAnnotator() {}
+    private RobolectricTestAnnotator() {}
 
-  public static void annotate() {
-    int apiLevel = RuntimeEnvironment.getApiLevel();
-    if (apiLevel <= 0) {
-      return;
-    }
+    public static void annotate() {
+        int apiLevel = RuntimeEnvironment.getApiLevel();
+        if (apiLevel <= 0) {
+            return;
+        }
 
-    AgentSpan span = AgentTracer.activeSpan();
-    if (span == null) {
-      return;
-    }
-    RequestContext requestContext = span.getRequestContext();
-    if (requestContext == null
-        || requestContext.getData(RequestContextSlot.CI_VISIBILITY) == null) {
-      // The active span is not a CI Visibility test span; nothing to enrich.
-      return;
-    }
+        AgentSpan span = AgentTracer.activeSpan();
+        if (span == null) {
+            return;
+        }
+        RequestContext requestContext = span.getRequestContext();
+        if (requestContext == null || requestContext.getData(RequestContextSlot.CI_VISIBILITY) == null) {
+            // The active span is not a CI Visibility test span; nothing to enrich.
+            return;
+        }
 
-    span.setTag(Tags.TEST_ANDROID_API_LEVEL, apiLevel);
-    span.setTag(Tags.TEST_ANDROID_RELEASE, Build.VERSION.RELEASE);
-    String androidCodename = androidCodename(apiLevel);
-    if (androidCodename != null) {
-      span.setTag(Tags.TEST_ANDROID_CODENAME, androidCodename);
-    }
-    String robolectricVersion = robolectricVersion();
-    if (robolectricVersion != null) {
-      span.setTag(Tags.TEST_ANDROID_ROBOLECTRIC_VERSION, robolectricVersion);
+        span.setTag(Tags.TEST_ANDROID_API_LEVEL, apiLevel);
+        span.setTag(Tags.TEST_ANDROID_RELEASE, Build.VERSION.RELEASE);
+        String androidCodename = androidCodename(apiLevel);
+        if (androidCodename != null) {
+            span.setTag(Tags.TEST_ANDROID_CODENAME, androidCodename);
+        }
+        String robolectricVersion = robolectricVersion();
+        if (robolectricVersion != null) {
+            span.setTag(Tags.TEST_ANDROID_ROBOLECTRIC_VERSION, robolectricVersion);
+        }
     }
-  }
 
-  private static String androidCodename(int apiLevel) {
-    switch (apiLevel) {
-      case 1:
-        return "BASE";
-      case 2:
-        return "BASE_1_1";
-      case 3:
-        return "CUPCAKE";
-      case 4:
-        return "DONUT";
-      case 5:
-        return "ECLAIR";
-      case 6:
-        return "ECLAIR_0_1";
-      case 7:
-        return "ECLAIR_MR1";
-      case 8:
-        return "FROYO";
-      case 9:
-        return "GINGERBREAD";
-      case 10:
-        return "GINGERBREAD_MR1";
-      case 11:
-        return "HONEYCOMB";
-      case 12:
-        return "HONEYCOMB_MR1";
-      case 13:
-        return "HONEYCOMB_MR2";
-      case 14:
-        return "ICE_CREAM_SANDWICH";
-      case 15:
-        return "ICE_CREAM_SANDWICH_MR1";
-      case 16:
-        return "JELLY_BEAN";
-      case 17:
-        return "JELLY_BEAN_MR1";
-      case 18:
-        return "JELLY_BEAN_MR2";
-      case 19:
-        return "KITKAT";
-      case 20:
-        return "KITKAT_WATCH";
-      case 21:
-        return "LOLLIPOP";
-      case 22:
-        return "LOLLIPOP_MR1";
-      case 23:
-        return "M";
-      case 24:
-        return "N";
-      case 25:
-        return "N_MR1";
-      case 26:
-        return "O";
-      case 27:
-        return "O_MR1";
-      case 28:
-        return "P";
-      case 29:
-        return "Q";
-      case 30:
-        return "R";
-      case 31:
-        return "S";
-      case 32:
-        return "S_V2";
-      case 33:
-        return "TIRAMISU";
-      case 34:
-        return "UPSIDE_DOWN_CAKE";
-      case 35:
-        return "VANILLA_ICE_CREAM";
-      case 36:
-        return "BAKLAVA";
-      case 37:
-        return "CINNAMON_BUN";
-      default:
-        return null;
+    private static String androidCodename(int apiLevel) {
+        switch (apiLevel) {
+            case 1:
+                return "BASE";
+            case 2:
+                return "BASE_1_1";
+            case 3:
+                return "CUPCAKE";
+            case 4:
+                return "DONUT";
+            case 5:
+                return "ECLAIR";
+            case 6:
+                return "ECLAIR_0_1";
+            case 7:
+                return "ECLAIR_MR1";
+            case 8:
+                return "FROYO";
+            case 9:
+                return "GINGERBREAD";
+            case 10:
+                return "GINGERBREAD_MR1";
+            case 11:
+                return "HONEYCOMB";
+            case 12:
+                return "HONEYCOMB_MR1";
+            case 13:
+                return "HONEYCOMB_MR2";
+            case 14:
+                return "ICE_CREAM_SANDWICH";
+            case 15:
+                return "ICE_CREAM_SANDWICH_MR1";
+            case 16:
+                return "JELLY_BEAN";
+            case 17:
+                return "JELLY_BEAN_MR1";
+            case 18:
+                return "JELLY_BEAN_MR2";
+            case 19:
+                return "KITKAT";
+            case 20:
+                return "KITKAT_WATCH";
+            case 21:
+                return "LOLLIPOP";
+            case 22:
+                return "LOLLIPOP_MR1";
+            case 23:
+                return "M";
+            case 24:
+                return "N";
+            case 25:
+                return "N_MR1";
+            case 26:
+                return "O";
+            case 27:
+                return "O_MR1";
+            case 28:
+                return "P";
+            case 29:
+                return "Q";
+            case 30:
+                return "R";
+            case 31:
+                return "S";
+            case 32:
+                return "S_V2";
+            case 33:
+                return "TIRAMISU";
+            case 34:
+                return "UPSIDE_DOWN_CAKE";
+            case 35:
+                return "VANILLA_ICE_CREAM";
+            case 36:
+                return "BAKLAVA";
+            case 37:
+                return "CINNAMON_BUN";
+            default:
+                return null;
+        }
     }
-  }
 
-  private static String robolectricVersion() {
-    try {
-      // RuntimeEnvironment is re-loaded by the sandbox classloader with no CodeSource, but the
-      // runner runs outside the sandbox (it creates it), so it is delegated to the application
-      // classloader and its CodeSource points at the real robolectric-<version>.jar.
-      ProtectionDomain protectionDomain = RobolectricTestRunner.class.getProtectionDomain();
-      CodeSource codeSource = protectionDomain != null ? protectionDomain.getCodeSource() : null;
-      URL location = codeSource != null ? codeSource.getLocation() : null;
-      if (location == null) {
-        return null;
-      }
-      Matcher matcher = ROBOLECTRIC_JAR.matcher(new File(location.getPath()).getName());
-      return matcher.matches() ? matcher.group(1) : null;
-    } catch (Throwable t) {
-      return null;
+    private static String robolectricVersion() {
+        try {
+            // RuntimeEnvironment is re-loaded by the sandbox classloader with no CodeSource, but the
+            // runner runs outside the sandbox (it creates it), so it is delegated to the application
+            // classloader and its CodeSource points at the real robolectric-<version>.jar.
+            ProtectionDomain protectionDomain = RobolectricTestRunner.class.getProtectionDomain();
+            CodeSource codeSource = protectionDomain != null ? protectionDomain.getCodeSource() : null;
+            URL location = codeSource != null ? codeSource.getLocation() : null;
+            if (location == null) {
+                return null;
+            }
+            Matcher matcher = ROBOLECTRIC_JAR.matcher(new File(location.getPath()).getName());
+            return matcher.matches() ? matcher.group(1) : null;
+        } catch (Throwable t) {
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/AbstractRequestContextInstrumentation.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/AbstractRequestContextInstrumentation.java
index 16e1c61b520..bfe10592004 100644
--- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/AbstractRequestContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/AbstractRequestContextInstrumentation.java
@@ -12,28 +12,28 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public abstract class AbstractRequestContextInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public AbstractRequestContextInstrumentation() {
-    super("jakarta-rs", "jakartars", "jakarta-rs-filter");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public AbstractRequestContextInstrumentation() {
+        super("jakarta-rs", "jakartars", "jakarta-rs-filter");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "jakarta.ws.rs.container.ContainerRequestContext";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "jakarta.ws.rs.container.ContainerRequestContext";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("abortWith"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("jakarta.ws.rs.core.Response"))),
-        getClass().getName() + "$ContainerRequestContextAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("abortWith"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("jakarta.ws.rs.core.Response"))),
+                getClass().getName() + "$ContainerRequestContextAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/ContainerRequestFilterInstrumentation.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/ContainerRequestFilterInstrumentation.java
index 4e3d1166f51..b21bb0514be 100644
--- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/ContainerRequestFilterInstrumentation.java
+++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/ContainerRequestFilterInstrumentation.java
@@ -21,38 +21,38 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ContainerRequestFilterInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public ContainerRequestFilterInstrumentation() {
-    super("jakarta-rs", "jakartars", "jakarta-rs-filter");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "jakarta.ws.rs.container.ContainerRequestFilter";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("filter"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("jakarta.ws.rs.container.ContainerRequestContext"))),
-        ContainerRequestFilterInstrumentation.class.getName() + "$RequestFilterAdvice");
-  }
-
-  public static class RequestFilterAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void setFilterClass(
-        @Advice.This final ContainerRequestFilter filter,
-        @Advice.Argument(0) final ContainerRequestContext context) {
-      context.setProperty(JakartaRsAnnotationsDecorator.ABORT_FILTER_CLASS, filter.getClass());
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public ContainerRequestFilterInstrumentation() {
+        super("jakarta-rs", "jakartars", "jakarta-rs-filter");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "jakarta.ws.rs.container.ContainerRequestFilter";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("filter"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("jakarta.ws.rs.container.ContainerRequestContext"))),
+                ContainerRequestFilterInstrumentation.class.getName() + "$RequestFilterAdvice");
+    }
+
+    public static class RequestFilterAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void setFilterClass(
+                @Advice.This final ContainerRequestFilter filter,
+                @Advice.Argument(0) final ContainerRequestContext context) {
+            context.setProperty(JakartaRsAnnotationsDecorator.ABORT_FILTER_CLASS, filter.getClass());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java
index ceced5726ba..0fd86aa5574 100644
--- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java
@@ -27,56 +27,52 @@
  */
 @AutoService(InstrumenterModule.class)
 public class DefaultRequestContextInstrumentation extends AbstractRequestContextInstrumentation {
-  public static class ContainerRequestContextAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope createGenericSpan(
-        @Advice.This final ContainerRequestContext context) {
+    public static class ContainerRequestContextAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope createGenericSpan(@Advice.This final ContainerRequestContext context) {
 
-      if (context.getProperty(JakartaRsAnnotationsDecorator.ABORT_HANDLED) == null) {
-        final AgentSpan parent = activeSpan();
-        final AgentSpan span =
-            startSpan(JAKARTA_RS_CONTROLLER.toString(), JAKARTA_RS_REQUEST_ABORT);
+            if (context.getProperty(JakartaRsAnnotationsDecorator.ABORT_HANDLED) == null) {
+                final AgentSpan parent = activeSpan();
+                final AgentSpan span = startSpan(JAKARTA_RS_CONTROLLER.toString(), JAKARTA_RS_REQUEST_ABORT);
 
-        // Save spans so a more specific instrumentation can run later
-        context.setProperty(JakartaRsAnnotationsDecorator.ABORT_PARENT, parent);
-        context.setProperty(JakartaRsAnnotationsDecorator.ABORT_SPAN, span);
+                // Save spans so a more specific instrumentation can run later
+                context.setProperty(JakartaRsAnnotationsDecorator.ABORT_PARENT, parent);
+                context.setProperty(JakartaRsAnnotationsDecorator.ABORT_SPAN, span);
 
-        final Class filterClass =
-            (Class) context.getProperty(JakartaRsAnnotationsDecorator.ABORT_FILTER_CLASS);
-        Method method = null;
-        try {
-          method = filterClass.getMethod("filter", ContainerRequestContext.class);
-        } catch (final NoSuchMethodException e) {
-          // Unable to find the filter method.  This should not be reachable because the context
-          // can only be aborted inside the filter method
-        }
+                final Class filterClass = (Class) context.getProperty(JakartaRsAnnotationsDecorator.ABORT_FILTER_CLASS);
+                Method method = null;
+                try {
+                    method = filterClass.getMethod("filter", ContainerRequestContext.class);
+                } catch (final NoSuchMethodException e) {
+                    // Unable to find the filter method.  This should not be reachable because the context
+                    // can only be aborted inside the filter method
+                }
 
-        final ContextScope scope = activateSpan(span);
+                final ContextScope scope = activateSpan(span);
 
-        DECORATE.afterStart(span);
-        DECORATE.onJakartaRsSpan(span, parent, filterClass, method);
+                DECORATE.afterStart(span);
+                DECORATE.onJakartaRsSpan(span, parent, filterClass, method);
 
-        return scope;
-      }
+                return scope;
+            }
 
-      return null;
-    }
+            return null;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
 
-      final AgentSpan span = spanFromScope(scope);
-      if (throwable != null) {
-        DECORATE.onError(span, throwable);
-      }
+            final AgentSpan span = spanFromScope(scope);
+            if (throwable != null) {
+                DECORATE.onError(span, throwable);
+            }
 
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsDecorator.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsDecorator.java
index 57d41ff0012..ea76143b0b0 100644
--- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsDecorator.java
+++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsDecorator.java
@@ -19,184 +19,173 @@
 
 public class JakartaRsAnnotationsDecorator extends BaseDecorator {
 
-  public static final CharSequence JAKARTA_RS_REQUEST_ABORT =
-      UTF8BytesString.create("jakarta-rs.request.abort");
-  public static final CharSequence JAKARTA_RS_CONTROLLER =
-      UTF8BytesString.create("jakarta-rs-controller");
-
-  public static final String ABORT_FILTER_CLASS =
-      "datadog.trace.instrumentation.jakarta3.filter.abort.class";
-  public static final String ABORT_HANDLED =
-      "datadog.trace.instrumentation.jakarta3.filter.abort.handled";
-  public static final String ABORT_PARENT =
-      "datadog.trace.instrumentation.jakarta3.filter.abort.parent";
-  public static final String ABORT_SPAN =
-      "datadog.trace.instrumentation.jakarta3.filter.abort.span";
-
-  public static JakartaRsAnnotationsDecorator DECORATE = new JakartaRsAnnotationsDecorator();
-
-  private static final ClassValue<ConcurrentHashMap<Method, Pair<CharSequence, CharSequence>>>
-      RESOURCE_NAMES = GenericClassValue.constructing(ConcurrentHashMap.class);
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[0];
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JAKARTA_RS_CONTROLLER;
-  }
-
-  public void onJakartaRsSpan(
-      final AgentSpan span, final AgentSpan parent, final Class<?> target, final Method method) {
-
-    final Pair<CharSequence, CharSequence> httpMethodAndRoute =
-        getHttpMethodAndRoute(target, method);
-    span.setSpanType(InternalSpanTypes.HTTP_SERVER);
-
-    // When jakarta-rs is the root, we want to name using the path, otherwise use the class/method.
-    final boolean isRootScope = parent == null;
-    if (isRootScope) {
-      HTTP_RESOURCE_DECORATOR.withRoute(
-          span, httpMethodAndRoute.getLeft(), httpMethodAndRoute.getRight());
-    } else {
-      span.setResourceName(DECORATE.spanNameForMethod(target, method));
-
-      if (parent == parent.getLocalRootSpan()) {
-        parent.setTag(Tags.COMPONENT, "jakarta-rs");
-        HTTP_RESOURCE_DECORATOR.withRoute(
-            parent, httpMethodAndRoute.getLeft(), httpMethodAndRoute.getRight());
-      }
+    public static final CharSequence JAKARTA_RS_REQUEST_ABORT = UTF8BytesString.create("jakarta-rs.request.abort");
+    public static final CharSequence JAKARTA_RS_CONTROLLER = UTF8BytesString.create("jakarta-rs-controller");
+
+    public static final String ABORT_FILTER_CLASS = "datadog.trace.instrumentation.jakarta3.filter.abort.class";
+    public static final String ABORT_HANDLED = "datadog.trace.instrumentation.jakarta3.filter.abort.handled";
+    public static final String ABORT_PARENT = "datadog.trace.instrumentation.jakarta3.filter.abort.parent";
+    public static final String ABORT_SPAN = "datadog.trace.instrumentation.jakarta3.filter.abort.span";
+
+    public static JakartaRsAnnotationsDecorator DECORATE = new JakartaRsAnnotationsDecorator();
+
+    private static final ClassValue<ConcurrentHashMap<Method, Pair<CharSequence, CharSequence>>> RESOURCE_NAMES =
+            GenericClassValue.constructing(ConcurrentHashMap.class);
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[0];
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return null;
     }
-  }
-
-  /**
-   * Returns the resource name parts given a JakartaRS annotated method. Results are cached so this
-   * method can be called multiple times without significantly impacting performance.
-   *
-   * @return The result can be an empty string but will never be {@code null}.
-   */
-  private Pair<CharSequence, CharSequence> getHttpMethodAndRoute(
-      final Class<?> target, final Method method) {
-    Map<Method, Pair<CharSequence, CharSequence>> classMap = RESOURCE_NAMES.get(target);
-    Pair<CharSequence, CharSequence> httpMethodAndRoute = classMap.get(method);
-    if (httpMethodAndRoute == null) {
-      String httpMethod = null;
-      Path methodPath = null;
-      final Path classPath = findClassPath(target);
-      for (final Class<?> currentClass : new ClassHierarchyIterable(target)) {
-        Method currentMethod;
-        if (currentClass.equals(target)) {
-          currentMethod = method;
+
+    @Override
+    protected CharSequence component() {
+        return JAKARTA_RS_CONTROLLER;
+    }
+
+    public void onJakartaRsSpan(
+            final AgentSpan span, final AgentSpan parent, final Class<?> target, final Method method) {
+
+        final Pair<CharSequence, CharSequence> httpMethodAndRoute = getHttpMethodAndRoute(target, method);
+        span.setSpanType(InternalSpanTypes.HTTP_SERVER);
+
+        // When jakarta-rs is the root, we want to name using the path, otherwise use the class/method.
+        final boolean isRootScope = parent == null;
+        if (isRootScope) {
+            HTTP_RESOURCE_DECORATOR.withRoute(span, httpMethodAndRoute.getLeft(), httpMethodAndRoute.getRight());
         } else {
-          currentMethod = findMatchingMethod(method, currentClass.getDeclaredMethods());
+            span.setResourceName(DECORATE.spanNameForMethod(target, method));
+
+            if (parent == parent.getLocalRootSpan()) {
+                parent.setTag(Tags.COMPONENT, "jakarta-rs");
+                HTTP_RESOURCE_DECORATOR.withRoute(parent, httpMethodAndRoute.getLeft(), httpMethodAndRoute.getRight());
+            }
         }
+    }
 
-        if (currentMethod != null) {
-          if (httpMethod == null) {
-            httpMethod = locateHttpMethod(currentMethod);
-          }
-          if (methodPath == null) {
-            methodPath = findMethodPath(currentMethod);
-          }
-
-          if (httpMethod != null && methodPath != null) {
-            break;
-          }
+    /**
+     * Returns the resource name parts given a JakartaRS annotated method. Results are cached so this
+     * method can be called multiple times without significantly impacting performance.
+     *
+     * @return The result can be an empty string but will never be {@code null}.
+     */
+    private Pair<CharSequence, CharSequence> getHttpMethodAndRoute(final Class<?> target, final Method method) {
+        Map<Method, Pair<CharSequence, CharSequence>> classMap = RESOURCE_NAMES.get(target);
+        Pair<CharSequence, CharSequence> httpMethodAndRoute = classMap.get(method);
+        if (httpMethodAndRoute == null) {
+            String httpMethod = null;
+            Path methodPath = null;
+            final Path classPath = findClassPath(target);
+            for (final Class<?> currentClass : new ClassHierarchyIterable(target)) {
+                Method currentMethod;
+                if (currentClass.equals(target)) {
+                    currentMethod = method;
+                } else {
+                    currentMethod = findMatchingMethod(method, currentClass.getDeclaredMethods());
+                }
+
+                if (currentMethod != null) {
+                    if (httpMethod == null) {
+                        httpMethod = locateHttpMethod(currentMethod);
+                    }
+                    if (methodPath == null) {
+                        methodPath = findMethodPath(currentMethod);
+                    }
+
+                    if (httpMethod != null && methodPath != null) {
+                        break;
+                    }
+                }
+            }
+            httpMethodAndRoute = Pair.<CharSequence, CharSequence>of(httpMethod, buildRoutePath(classPath, methodPath));
+            classMap.put(method, httpMethodAndRoute);
         }
-      }
-      httpMethodAndRoute =
-          Pair.<CharSequence, CharSequence>of(httpMethod, buildRoutePath(classPath, methodPath));
-      classMap.put(method, httpMethodAndRoute);
+
+        return httpMethodAndRoute;
     }
 
-    return httpMethodAndRoute;
-  }
-
-  private String locateHttpMethod(final Method method) {
-    String httpMethod = null;
-    for (final Annotation ann : method.getDeclaredAnnotations()) {
-      final HttpMethod annotation = ann.annotationType().getAnnotation(HttpMethod.class);
-      if (annotation != null) {
-        httpMethod = annotation.value();
-        break;
-      }
+    private String locateHttpMethod(final Method method) {
+        String httpMethod = null;
+        for (final Annotation ann : method.getDeclaredAnnotations()) {
+            final HttpMethod annotation = ann.annotationType().getAnnotation(HttpMethod.class);
+            if (annotation != null) {
+                httpMethod = annotation.value();
+                break;
+            }
+        }
+        return httpMethod;
     }
-    return httpMethod;
-  }
-
-  private Path findMethodPath(final Method method) {
-    return method.getAnnotation(Path.class);
-  }
-
-  private Path findClassPath(final Class<?> target) {
-    for (final Class<?> currentClass : new ClassHierarchyIterable(target)) {
-      final Path annotation = currentClass.getAnnotation(Path.class);
-      if (annotation != null) {
-        // Annotation overridden, no need to continue.
-        return annotation;
-      }
+
+    private Path findMethodPath(final Method method) {
+        return method.getAnnotation(Path.class);
     }
 
-    return null;
-  }
-
-  private Method findMatchingMethod(final Method baseMethod, final Method[] methods) {
-    nextMethod:
-    for (final Method method : methods) {
-      if (!baseMethod.getReturnType().equals(method.getReturnType())) {
-        continue;
-      }
-
-      if (!baseMethod.getName().equals(method.getName())) {
-        continue;
-      }
-
-      final Class<?>[] baseParameterTypes = baseMethod.getParameterTypes();
-      final Class<?>[] parameterTypes = method.getParameterTypes();
-      if (baseParameterTypes.length != parameterTypes.length) {
-        continue;
-      }
-      for (int i = 0; i < baseParameterTypes.length; i++) {
-        if (!baseParameterTypes[i].equals(parameterTypes[i])) {
-          continue nextMethod;
+    private Path findClassPath(final Class<?> target) {
+        for (final Class<?> currentClass : new ClassHierarchyIterable(target)) {
+            final Path annotation = currentClass.getAnnotation(Path.class);
+            if (annotation != null) {
+                // Annotation overridden, no need to continue.
+                return annotation;
+            }
         }
-      }
-      return method;
-    }
-    return null;
-  }
-
-  private String buildRoutePath(final Path classPath, final Path methodPath) {
-    final StringBuilder route = new StringBuilder();
-
-    boolean skipSlash = false;
-    if (classPath != null) {
-      if (!classPath.value().startsWith("/")) {
-        route.append('/');
-      }
-      route.append(classPath.value());
-      skipSlash = classPath.value().endsWith("/");
+
+        return null;
     }
 
-    if (methodPath != null) {
-      String path = methodPath.value();
-      if (skipSlash) {
-        if (path.startsWith("/")) {
-          path = path.length() == 1 ? "" : path.substring(1);
+    private Method findMatchingMethod(final Method baseMethod, final Method[] methods) {
+        nextMethod:
+        for (final Method method : methods) {
+            if (!baseMethod.getReturnType().equals(method.getReturnType())) {
+                continue;
+            }
+
+            if (!baseMethod.getName().equals(method.getName())) {
+                continue;
+            }
+
+            final Class<?>[] baseParameterTypes = baseMethod.getParameterTypes();
+            final Class<?>[] parameterTypes = method.getParameterTypes();
+            if (baseParameterTypes.length != parameterTypes.length) {
+                continue;
+            }
+            for (int i = 0; i < baseParameterTypes.length; i++) {
+                if (!baseParameterTypes[i].equals(parameterTypes[i])) {
+                    continue nextMethod;
+                }
+            }
+            return method;
         }
-      } else if (!path.startsWith("/")) {
-        route.append('/');
-      }
-      route.append(path);
+        return null;
     }
 
-    return route.toString().trim();
-  }
+    private String buildRoutePath(final Path classPath, final Path methodPath) {
+        final StringBuilder route = new StringBuilder();
+
+        boolean skipSlash = false;
+        if (classPath != null) {
+            if (!classPath.value().startsWith("/")) {
+                route.append('/');
+            }
+            route.append(classPath.value());
+            skipSlash = classPath.value().endsWith("/");
+        }
+
+        if (methodPath != null) {
+            String path = methodPath.value();
+            if (skipSlash) {
+                if (path.startsWith("/")) {
+                    path = path.length() == 1 ? "" : path.substring(1);
+                }
+            } else if (!path.startsWith("/")) {
+                route.append('/');
+            }
+            route.append(path);
+        }
+
+        return route.toString().trim();
+    }
 }
diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java
index 59a5aa4019e..94a974bea6a 100644
--- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java
+++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java
@@ -36,125 +36,123 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JakartaRsAnnotationsInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  private static final String JAKARTA_ENDPOINT_OPERATION_NAME = "jakarta-rs.request";
-
-  public JakartaRsAnnotationsInstrumentation() {
-    super("jakarta-rs", "jakartars", "jakarta-rs-annotations");
-  }
-
-  private Collection<String> getJaxRsAnnotations() {
-    final Set<String> ret = new HashSet<>();
-    ret.add("jakarta.ws.rs.Path");
-    ret.add("jakarta.ws.rs.DELETE");
-    ret.add("jakarta.ws.rs.GET");
-    ret.add("jakarta.ws.rs.HEAD");
-    ret.add("jakarta.ws.rs.OPTIONS");
-    ret.add("jakarta.ws.rs.POST");
-    ret.add("jakarta.ws.rs.PUT");
-    ret.add("jakarta.ws.rs.PATCH");
-    ret.addAll(InstrumenterConfig.get().getAdditionalJaxRsAnnotations());
-    return ret;
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("jakarta.ws.rs.container.AsyncResponse", AgentSpan.class.getName());
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "jakarta.ws.rs.Path";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return hasSuperType(
-        declaresAnnotation(named(hierarchyMarkerType()))
-            .or(declaresMethod(isAnnotatedWith(named(hierarchyMarkerType())))));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(hasSuperMethod(isAnnotatedWith(namedOneOf(getJaxRsAnnotations())))),
-        JakartaRsAnnotationsInstrumentation.class.getName() + "$JakartaRsAnnotationsAdvice");
-  }
-
-  public static class JakartaRsAnnotationsAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope nameSpan(
-        @Advice.This final Object target,
-        @Advice.Origin final Method method,
-        @Advice.AllArguments final Object[] args,
-        @Advice.Local("asyncResponse") AsyncResponse asyncResponse) {
-      ContextStore<AsyncResponse, AgentSpan> contextStore = null;
-      for (final Object arg : args) {
-        if (arg instanceof AsyncResponse) {
-          asyncResponse = (AsyncResponse) arg;
-          contextStore = InstrumentationContext.get(AsyncResponse.class, AgentSpan.class);
-          if (contextStore.get(asyncResponse) != null) {
-            /**
-             * We are probably in a recursive call and don't want to start a new span because it
-             * would replace the existing span in the asyncResponse and cause it to never finish. We
-             * could work around this by using a list instead, but we likely don't want the extra
-             * span anyway.
-             */
-            return null;
-          }
-          break;
-        }
-      }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    private static final String JAKARTA_ENDPOINT_OPERATION_NAME = "jakarta-rs.request";
 
-      // Rename the parent span according to the path represented by these annotations.
-      final AgentSpan parent = activeSpan();
+    public JakartaRsAnnotationsInstrumentation() {
+        super("jakarta-rs", "jakartars", "jakarta-rs-annotations");
+    }
 
-      final AgentSpan span =
-          startSpan(JAKARTA_RS_CONTROLLER.toString(), JAKARTA_ENDPOINT_OPERATION_NAME);
-      span.setMeasured(true);
-      DECORATE.onJakartaRsSpan(span, parent, target.getClass(), method);
-      DECORATE.afterStart(span);
+    private Collection<String> getJaxRsAnnotations() {
+        final Set<String> ret = new HashSet<>();
+        ret.add("jakarta.ws.rs.Path");
+        ret.add("jakarta.ws.rs.DELETE");
+        ret.add("jakarta.ws.rs.GET");
+        ret.add("jakarta.ws.rs.HEAD");
+        ret.add("jakarta.ws.rs.OPTIONS");
+        ret.add("jakarta.ws.rs.POST");
+        ret.add("jakarta.ws.rs.PUT");
+        ret.add("jakarta.ws.rs.PATCH");
+        ret.addAll(InstrumenterConfig.get().getAdditionalJaxRsAnnotations());
+        return ret;
+    }
 
-      final ContextScope scope = activateSpan(span);
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("jakarta.ws.rs.container.AsyncResponse", AgentSpan.class.getName());
+    }
 
-      if (contextStore != null && asyncResponse != null) {
-        contextStore.put(asyncResponse, span);
-      }
+    @Override
+    public String hierarchyMarkerType() {
+        return "jakarta.ws.rs.Path";
+    }
 
-      return scope;
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return hasSuperType(declaresAnnotation(named(hierarchyMarkerType()))
+                .or(declaresMethod(isAnnotatedWith(named(hierarchyMarkerType())))));
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Local("asyncResponse") final AsyncResponse asyncResponse) {
-      if (scope == null) {
-        return;
-      }
-      final AgentSpan span = spanFromScope(scope);
-      if (throwable != null) {
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-        return;
-      }
-
-      if (asyncResponse != null && !asyncResponse.isSuspended()) {
-        // Clear span from the asyncResponse. Logically this should never happen. Added to be safe.
-        InstrumentationContext.get(AsyncResponse.class, AgentSpan.class).put(asyncResponse, null);
-      }
-      if (asyncResponse == null || !asyncResponse.isSuspended()) {
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
-      // else span finished by AsyncResponseAdvice
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(hasSuperMethod(isAnnotatedWith(namedOneOf(getJaxRsAnnotations())))),
+                JakartaRsAnnotationsInstrumentation.class.getName() + "$JakartaRsAnnotationsAdvice");
+    }
+
+    public static class JakartaRsAnnotationsAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope nameSpan(
+                @Advice.This final Object target,
+                @Advice.Origin final Method method,
+                @Advice.AllArguments final Object[] args,
+                @Advice.Local("asyncResponse") AsyncResponse asyncResponse) {
+            ContextStore<AsyncResponse, AgentSpan> contextStore = null;
+            for (final Object arg : args) {
+                if (arg instanceof AsyncResponse) {
+                    asyncResponse = (AsyncResponse) arg;
+                    contextStore = InstrumentationContext.get(AsyncResponse.class, AgentSpan.class);
+                    if (contextStore.get(asyncResponse) != null) {
+                        /**
+                         * We are probably in a recursive call and don't want to start a new span because it
+                         * would replace the existing span in the asyncResponse and cause it to never finish. We
+                         * could work around this by using a list instead, but we likely don't want the extra
+                         * span anyway.
+                         */
+                        return null;
+                    }
+                    break;
+                }
+            }
+
+            // Rename the parent span according to the path represented by these annotations.
+            final AgentSpan parent = activeSpan();
+
+            final AgentSpan span = startSpan(JAKARTA_RS_CONTROLLER.toString(), JAKARTA_ENDPOINT_OPERATION_NAME);
+            span.setMeasured(true);
+            DECORATE.onJakartaRsSpan(span, parent, target.getClass(), method);
+            DECORATE.afterStart(span);
+
+            final ContextScope scope = activateSpan(span);
+
+            if (contextStore != null && asyncResponse != null) {
+                contextStore.put(asyncResponse, span);
+            }
+
+            return scope;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Local("asyncResponse") final AsyncResponse asyncResponse) {
+            if (scope == null) {
+                return;
+            }
+            final AgentSpan span = spanFromScope(scope);
+            if (throwable != null) {
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+                return;
+            }
+
+            if (asyncResponse != null && !asyncResponse.isSuspended()) {
+                // Clear span from the asyncResponse. Logically this should never happen. Added to be safe.
+                InstrumentationContext.get(AsyncResponse.class, AgentSpan.class).put(asyncResponse, null);
+            }
+            if (asyncResponse == null || !asyncResponse.isSuspended()) {
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+            // else span finished by AsyncResponseAdvice
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAsyncResponseInstrumentation.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAsyncResponseInstrumentation.java
index 6fd916ec5c2..0e392528b6d 100644
--- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAsyncResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAsyncResponseInstrumentation.java
@@ -21,100 +21,97 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JakartaRsAsyncResponseInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public JakartaRsAsyncResponseInstrumentation() {
-    super("jakarta-rs", "jakartars", "jakarta-rs-annotations");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "jakarta.ws.rs.container.AsyncResponse", AgentSpan.class.getName());
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "jakarta.ws.rs.container.AsyncResponse";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("resume").and(takesArgument(0, Object.class)).and(isPublic()),
-        JakartaRsAsyncResponseInstrumentation.class.getName() + "$AsyncResponseAdvice");
-    transformer.applyAdvice(
-        named("resume").and(takesArgument(0, Throwable.class)).and(isPublic()),
-        JakartaRsAsyncResponseInstrumentation.class.getName() + "$AsyncResponseThrowableAdvice");
-    transformer.applyAdvice(
-        named("cancel"),
-        JakartaRsAsyncResponseInstrumentation.class.getName() + "$AsyncResponseCancelAdvice");
-  }
-
-  public static class AsyncResponseAdvice {
-
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.This final AsyncResponse asyncResponse, @Advice.Thrown Throwable throwable) {
-
-      final ContextStore<AsyncResponse, AgentSpan> contextStore =
-          InstrumentationContext.get(AsyncResponse.class, AgentSpan.class);
-
-      final AgentSpan span = contextStore.get(asyncResponse);
-      if (span != null) {
-        contextStore.put(asyncResponse, null);
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public JakartaRsAsyncResponseInstrumentation() {
+        super("jakarta-rs", "jakartars", "jakarta-rs-annotations");
     }
-  }
 
-  public static class AsyncResponseThrowableAdvice {
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("jakarta.ws.rs.container.AsyncResponse", AgentSpan.class.getName());
+    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.This final AsyncResponse asyncResponse,
-        @Advice.Argument(0) final Throwable throwable) {
+    @Override
+    public String hierarchyMarkerType() {
+        return "jakarta.ws.rs.container.AsyncResponse";
+    }
 
-      final ContextStore<AsyncResponse, AgentSpan> contextStore =
-          InstrumentationContext.get(AsyncResponse.class, AgentSpan.class);
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-      final AgentSpan span = contextStore.get(asyncResponse);
-      if (span != null) {
-        contextStore.put(asyncResponse, null);
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("resume").and(takesArgument(0, Object.class)).and(isPublic()),
+                JakartaRsAsyncResponseInstrumentation.class.getName() + "$AsyncResponseAdvice");
+        transformer.applyAdvice(
+                named("resume").and(takesArgument(0, Throwable.class)).and(isPublic()),
+                JakartaRsAsyncResponseInstrumentation.class.getName() + "$AsyncResponseThrowableAdvice");
+        transformer.applyAdvice(
+                named("cancel"), JakartaRsAsyncResponseInstrumentation.class.getName() + "$AsyncResponseCancelAdvice");
     }
-  }
 
-  public static class AsyncResponseCancelAdvice {
+    public static class AsyncResponseAdvice {
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.This final AsyncResponse asyncResponse, @Advice.Thrown Throwable throwable) {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.This final AsyncResponse asyncResponse, @Advice.Thrown Throwable throwable) {
 
-      final ContextStore<AsyncResponse, AgentSpan> contextStore =
-          InstrumentationContext.get(AsyncResponse.class, AgentSpan.class);
+            final ContextStore<AsyncResponse, AgentSpan> contextStore =
+                    InstrumentationContext.get(AsyncResponse.class, AgentSpan.class);
+
+            final AgentSpan span = contextStore.get(asyncResponse);
+            if (span != null) {
+                contextStore.put(asyncResponse, null);
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
+        }
+    }
+
+    public static class AsyncResponseThrowableAdvice {
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.This final AsyncResponse asyncResponse, @Advice.Argument(0) final Throwable throwable) {
+
+            final ContextStore<AsyncResponse, AgentSpan> contextStore =
+                    InstrumentationContext.get(AsyncResponse.class, AgentSpan.class);
+
+            final AgentSpan span = contextStore.get(asyncResponse);
+            if (span != null) {
+                contextStore.put(asyncResponse, null);
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
+        }
+    }
 
-      final AgentSpan span = contextStore.get(asyncResponse);
-      if (span != null) {
-        contextStore.put(asyncResponse, null);
-        if (throwable != null) {
-          DECORATE.onError(span, throwable);
-        } else {
-          span.setTag("canceled", true);
+    public static class AsyncResponseCancelAdvice {
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.This final AsyncResponse asyncResponse, @Advice.Thrown Throwable throwable) {
+
+            final ContextStore<AsyncResponse, AgentSpan> contextStore =
+                    InstrumentationContext.get(AsyncResponse.class, AgentSpan.class);
+
+            final AgentSpan span = contextStore.get(asyncResponse);
+            if (span != null) {
+                contextStore.put(asyncResponse, null);
+                if (throwable != null) {
+                    DECORATE.onError(span, throwable);
+                } else {
+                    span.setTag("canceled", true);
+                }
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
         }
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/MessageBodyWriterInstrumentation.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/MessageBodyWriterInstrumentation.java
index f259d4cde5b..72d02e7ef8d 100644
--- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/MessageBodyWriterInstrumentation.java
+++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/MessageBodyWriterInstrumentation.java
@@ -25,59 +25,58 @@
 
 @AutoService(InstrumenterModule.class)
 public class MessageBodyWriterInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public MessageBodyWriterInstrumentation() {
-    super("jakarta-rs");
-  }
+    public MessageBodyWriterInstrumentation() {
+        super("jakarta-rs");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "jakarta.ws.rs.ext.MessageBodyWriter";
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "jakarta.ws.rs.ext.MessageBodyWriter";
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("writeTo").and(takesArguments(7)), getClass().getName() + "$MessageBodyWriterAdvice");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("writeTo").and(takesArguments(7)), getClass().getName() + "$MessageBodyWriterAdvice");
-  }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class MessageBodyWriterAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void before(
+                @Advice.Argument(0) Object entity,
+                @Advice.Argument(4) MediaType mediaType,
+                @ActiveRequestContext RequestContext reqCtx) {
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class MessageBodyWriterAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void before(
-        @Advice.Argument(0) Object entity,
-        @Advice.Argument(4) MediaType mediaType,
-        @ActiveRequestContext RequestContext reqCtx) {
+            if (!MediaType.APPLICATION_JSON_TYPE.isCompatible(mediaType)) {
+                return;
+            }
 
-      if (!MediaType.APPLICATION_JSON_TYPE.isCompatible(mediaType)) {
-        return;
-      }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.responseBody());
+            if (callback == null) {
+                return;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.responseBody());
-      if (callback == null) {
-        return;
-      }
+            Flow<Void> flow = callback.apply(reqCtx, entity);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction == null) {
+                    return;
+                }
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
 
-      Flow<Void> flow = callback.apply(reqCtx, entity);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction == null) {
-          return;
+                throw new BlockingException("Blocked request (for MessageBodyWriter)");
+            }
         }
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-
-        throw new BlockingException("Blocked request (for MessageBodyWriter)");
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java
index 65fa0265970..260d66784fc 100644
--- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java
+++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java
@@ -14,49 +14,48 @@
 import java.lang.reflect.Method;
 
 public class RequestFilterHelper {
-  public static ContextScope createOrUpdateAbortSpan(
-      final ContainerRequestContext context, final Class resourceClass, final Method method) {
-
-    if (method != null && resourceClass != null) {
-      context.setProperty(JakartaRsAnnotationsDecorator.ABORT_HANDLED, true);
-      // The ordering of the specific and general abort instrumentation is unspecified
-      // The general instrumentation (ContainerRequestFilterInstrumentation) saves spans
-      // properties if it ran first
-      AgentSpan parent =
-          (AgentSpan) context.getProperty(JakartaRsAnnotationsDecorator.ABORT_PARENT);
-      AgentSpan span = (AgentSpan) context.getProperty(JakartaRsAnnotationsDecorator.ABORT_SPAN);
-
-      if (span == null) {
-        parent = activeSpan();
-        span = startSpan(JAKARTA_RS_CONTROLLER.toString(), JAKARTA_RS_REQUEST_ABORT);
-
-        final ContextScope scope = activateSpan(span);
-
-        DECORATE.afterStart(span);
-        DECORATE.onJakartaRsSpan(span, parent, resourceClass, method);
-
-        return scope;
-      } else {
-        DECORATE.onJakartaRsSpan(span, parent, resourceClass, method);
-        return null;
-      }
-    } else {
-      return null;
+    public static ContextScope createOrUpdateAbortSpan(
+            final ContainerRequestContext context, final Class resourceClass, final Method method) {
+
+        if (method != null && resourceClass != null) {
+            context.setProperty(JakartaRsAnnotationsDecorator.ABORT_HANDLED, true);
+            // The ordering of the specific and general abort instrumentation is unspecified
+            // The general instrumentation (ContainerRequestFilterInstrumentation) saves spans
+            // properties if it ran first
+            AgentSpan parent = (AgentSpan) context.getProperty(JakartaRsAnnotationsDecorator.ABORT_PARENT);
+            AgentSpan span = (AgentSpan) context.getProperty(JakartaRsAnnotationsDecorator.ABORT_SPAN);
+
+            if (span == null) {
+                parent = activeSpan();
+                span = startSpan(JAKARTA_RS_CONTROLLER.toString(), JAKARTA_RS_REQUEST_ABORT);
+
+                final ContextScope scope = activateSpan(span);
+
+                DECORATE.afterStart(span);
+                DECORATE.onJakartaRsSpan(span, parent, resourceClass, method);
+
+                return scope;
+            } else {
+                DECORATE.onJakartaRsSpan(span, parent, resourceClass, method);
+                return null;
+            }
+        } else {
+            return null;
+        }
     }
-  }
 
-  public static void closeSpanAndScope(final ContextScope scope, final Throwable throwable) {
-    if (scope == null) {
-      return;
-    }
+    public static void closeSpanAndScope(final ContextScope scope, final Throwable throwable) {
+        if (scope == null) {
+            return;
+        }
 
-    final AgentSpan span = spanFromScope(scope);
-    if (throwable != null) {
-      DECORATE.onError(span, throwable);
-    }
+        final AgentSpan span = spanFromScope(scope);
+        if (throwable != null) {
+            DECORATE.onError(span, throwable);
+        }
 
-    DECORATE.beforeFinish(span);
-    scope.close();
-    span.finish();
-  }
+        DECORATE.beforeFinish(span);
+        scope.close();
+        span.finish();
+    }
 }
diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/test/groovy/JavaInterfaces.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/test/groovy/JavaInterfaces.java
index 07fcbb97f88..be06aac706d 100644
--- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/test/groovy/JavaInterfaces.java
+++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/test/groovy/JavaInterfaces.java
@@ -3,61 +3,61 @@
 
 public class JavaInterfaces {
 
-  interface Jakarta {
+    interface Jakarta {
 
-    void call();
-  }
+        void call();
+    }
 
-  @Path("interface")
-  interface InterfaceWithClassMethodPath extends Jakarta {
+    @Path("interface")
+    interface InterfaceWithClassMethodPath extends Jakarta {
 
-    @Override
-    @GET
-    @Path("invoke")
-    void call();
-  }
+        @Override
+        @GET
+        @Path("invoke")
+        void call();
+    }
 
-  @Path("abstract")
-  abstract class AbstractClassOnInterfaceWithClassPath implements InterfaceWithClassMethodPath {
+    @Path("abstract")
+    abstract class AbstractClassOnInterfaceWithClassPath implements InterfaceWithClassMethodPath {
 
-    @GET
-    @Path("call")
-    @Override
-    public void call() {
-      // do nothing
-    }
+        @GET
+        @Path("call")
+        @Override
+        public void call() {
+            // do nothing
+        }
 
-    abstract void actual();
-  }
+        abstract void actual();
+    }
 
-  @Path("child")
-  class ChildClassOnInterface extends AbstractClassOnInterfaceWithClassPath {
+    @Path("child")
+    class ChildClassOnInterface extends AbstractClassOnInterfaceWithClassPath {
 
-    @Override
-    void actual() {
-      // do nothing
+        @Override
+        void actual() {
+            // do nothing
+        }
     }
-  }
-
-  // TODO: uncomment when we drop support for Java 7
-  //  @Path("interface")
-  //  interface DefaultInterfaceWithClassMethodPath extends Jakarta {
-  //
-  //    @GET
-  //    @Path("invoke")
-  //    default void call() {
-  //      actual();
-  //    }
-  //
-  //    void actual();
-  //  }
-  //
-  //  @Path("child")
-  //  class DefaultChildClassOnInterface implements DefaultInterfaceWithClassMethodPath {
-  //
-  //    @Override
-  //    public void actual() {
-  //      // do nothing
-  //    }
-  //  }
+
+    // TODO: uncomment when we drop support for Java 7
+    //  @Path("interface")
+    //  interface DefaultInterfaceWithClassMethodPath extends Jakarta {
+    //
+    //    @GET
+    //    @Path("invoke")
+    //    default void call() {
+    //      actual();
+    //    }
+    //
+    //    void actual();
+    //  }
+    //
+    //  @Path("child")
+    //  class DefaultChildClassOnInterface implements DefaultInterfaceWithClassMethodPath {
+    //
+    //    @Override
+    //    public void actual() {
+    //      // do nothing
+    //    }
+    //  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/test/java/Resource.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/test/java/Resource.java
index 5f4da6aa30a..fa16be97a8f 100644
--- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/test/java/Resource.java
+++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/test/java/Resource.java
@@ -5,45 +5,45 @@
 // Originally had this as a groovy class but was getting some weird errors.
 @Path("/ignored")
 public interface Resource {
-  @Path("ignored")
-  String hello(final String name);
+    @Path("ignored")
+    String hello(final String name);
 
-  @Path("/test")
-  interface SubResource extends Cloneable, Resource {
-    @Override
-    @POST
-    @Path("/hello/{name}")
-    String hello(@PathParam("name") final String name);
-  }
-
-  class Test1 implements SubResource {
-    @Override
-    public String hello(final String name) {
-      return "Test1 " + name + "!";
+    @Path("/test")
+    interface SubResource extends Cloneable, Resource {
+        @Override
+        @POST
+        @Path("/hello/{name}")
+        String hello(@PathParam("name") final String name);
     }
-  }
 
-  @Path("/test2")
-  class Test2 implements SubResource {
-    @Override
-    public String hello(final String name) {
-      return "Test2 " + name + "!";
+    class Test1 implements SubResource {
+        @Override
+        public String hello(final String name) {
+            return "Test1 " + name + "!";
+        }
     }
-  }
 
-  @Path("/test3")
-  class Test3 implements SubResource {
-    @Override
-    @POST
-    @Path("/hi/{name}")
-    public String hello(@PathParam("name") final String name) {
-      return "Test3 " + name + "!";
+    @Path("/test2")
+    class Test2 implements SubResource {
+        @Override
+        public String hello(final String name) {
+            return "Test2 " + name + "!";
+        }
     }
 
-    @POST
-    @Path("/nested")
-    public String nested() {
-      return hello("nested");
+    @Path("/test3")
+    class Test3 implements SubResource {
+        @Override
+        @POST
+        @Path("/hi/{name}")
+        public String hello(@PathParam("name") final String name) {
+            return "Test3 " + name + "!";
+        }
+
+        @POST
+        @Path("/nested")
+        public String nested() {
+            return hello("nested");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java
index 7186c507c13..148b63b7442 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java
@@ -19,175 +19,169 @@
 import javax.ws.rs.Path;
 
 public class JaxRsAnnotationsDecorator extends BaseDecorator {
-  public static JaxRsAnnotationsDecorator DECORATE = new JaxRsAnnotationsDecorator();
-
-  private static final ClassValue<ConcurrentHashMap<Method, Pair<CharSequence, CharSequence>>>
-      RESOURCE_NAMES = GenericClassValue.constructing(ConcurrentHashMap.class);
-
-  public static final CharSequence JAX_RS_CONTROLLER = UTF8BytesString.create("jax-rs-controller");
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[0];
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JAX_RS_CONTROLLER;
-  }
-
-  public void onJaxRsSpan(
-      final AgentSpan span, final AgentSpan parent, final Class<?> target, final Method method) {
-
-    final Pair<CharSequence, CharSequence> httpMethodAndRoute =
-        getHttpMethodAndRoute(target, method);
-    span.setSpanType(InternalSpanTypes.HTTP_SERVER);
-
-    // When jax-rs is the root, we want to name using the path, otherwise use the class/method.
-    final boolean isRootScope = parent == null;
-    if (isRootScope) {
-      HTTP_RESOURCE_DECORATOR.withRoute(
-          span, httpMethodAndRoute.getLeft(), httpMethodAndRoute.getRight());
-    } else {
-      // This check ensures that we only use the route from the first JAX-RS annotated method that
-      // is executed
-      if (parent.getLocalRootSpan().getResourceNamePriority()
-          < ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE) {
-        HTTP_RESOURCE_DECORATOR.withRoute(
-            parent.getLocalRootSpan(), httpMethodAndRoute.getLeft(), httpMethodAndRoute.getRight());
-        parent.getLocalRootSpan().setTag(Tags.COMPONENT, "jax-rs");
-      }
-
-      span.setResourceName(DECORATE.spanNameForMethod(target, method));
+    public static JaxRsAnnotationsDecorator DECORATE = new JaxRsAnnotationsDecorator();
+
+    private static final ClassValue<ConcurrentHashMap<Method, Pair<CharSequence, CharSequence>>> RESOURCE_NAMES =
+            GenericClassValue.constructing(ConcurrentHashMap.class);
+
+    public static final CharSequence JAX_RS_CONTROLLER = UTF8BytesString.create("jax-rs-controller");
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[0];
     }
-  }
-
-  /**
-   * Returns the resource name parts given a JaxRS annotated method. Results are cached so this
-   * method can be called multiple times without significantly impacting performance.
-   *
-   * @return The result can be an empty string but will never be {@code null}.
-   */
-  private Pair<CharSequence, CharSequence> getHttpMethodAndRoute(
-      final Class<?> target, final Method method) {
-    Map<Method, Pair<CharSequence, CharSequence>> classMap = RESOURCE_NAMES.get(target);
-    Pair<CharSequence, CharSequence> httpMethodAndRoute = classMap.get(method);
-    if (httpMethodAndRoute == null) {
-      String httpMethod = null;
-      Path methodPath = null;
-      final Path classPath = findClassPath(target);
-      for (final Class<?> currentClass : new ClassHierarchyIterable(target)) {
-        final Method currentMethod;
-        if (currentClass.equals(target)) {
-          currentMethod = method;
+
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JAX_RS_CONTROLLER;
+    }
+
+    public void onJaxRsSpan(final AgentSpan span, final AgentSpan parent, final Class<?> target, final Method method) {
+
+        final Pair<CharSequence, CharSequence> httpMethodAndRoute = getHttpMethodAndRoute(target, method);
+        span.setSpanType(InternalSpanTypes.HTTP_SERVER);
+
+        // When jax-rs is the root, we want to name using the path, otherwise use the class/method.
+        final boolean isRootScope = parent == null;
+        if (isRootScope) {
+            HTTP_RESOURCE_DECORATOR.withRoute(span, httpMethodAndRoute.getLeft(), httpMethodAndRoute.getRight());
         } else {
-          currentMethod = findMatchingMethod(method, currentClass.getDeclaredMethods());
+            // This check ensures that we only use the route from the first JAX-RS annotated method that
+            // is executed
+            if (parent.getLocalRootSpan().getResourceNamePriority() < ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE) {
+                HTTP_RESOURCE_DECORATOR.withRoute(
+                        parent.getLocalRootSpan(), httpMethodAndRoute.getLeft(), httpMethodAndRoute.getRight());
+                parent.getLocalRootSpan().setTag(Tags.COMPONENT, "jax-rs");
+            }
+
+            span.setResourceName(DECORATE.spanNameForMethod(target, method));
         }
+    }
 
-        if (currentMethod != null) {
-          if (httpMethod == null) {
-            httpMethod = locateHttpMethod(currentMethod);
-          }
-          if (methodPath == null) {
-            methodPath = findMethodPath(currentMethod);
-          }
-
-          if (httpMethod != null && methodPath != null) {
-            break;
-          }
+    /**
+     * Returns the resource name parts given a JaxRS annotated method. Results are cached so this
+     * method can be called multiple times without significantly impacting performance.
+     *
+     * @return The result can be an empty string but will never be {@code null}.
+     */
+    private Pair<CharSequence, CharSequence> getHttpMethodAndRoute(final Class<?> target, final Method method) {
+        Map<Method, Pair<CharSequence, CharSequence>> classMap = RESOURCE_NAMES.get(target);
+        Pair<CharSequence, CharSequence> httpMethodAndRoute = classMap.get(method);
+        if (httpMethodAndRoute == null) {
+            String httpMethod = null;
+            Path methodPath = null;
+            final Path classPath = findClassPath(target);
+            for (final Class<?> currentClass : new ClassHierarchyIterable(target)) {
+                final Method currentMethod;
+                if (currentClass.equals(target)) {
+                    currentMethod = method;
+                } else {
+                    currentMethod = findMatchingMethod(method, currentClass.getDeclaredMethods());
+                }
+
+                if (currentMethod != null) {
+                    if (httpMethod == null) {
+                        httpMethod = locateHttpMethod(currentMethod);
+                    }
+                    if (methodPath == null) {
+                        methodPath = findMethodPath(currentMethod);
+                    }
+
+                    if (httpMethod != null && methodPath != null) {
+                        break;
+                    }
+                }
+            }
+            httpMethodAndRoute = Pair.<CharSequence, CharSequence>of(httpMethod, buildRoutePath(classPath, methodPath));
+            classMap.put(method, httpMethodAndRoute);
         }
-      }
-      httpMethodAndRoute =
-          Pair.<CharSequence, CharSequence>of(httpMethod, buildRoutePath(classPath, methodPath));
-      classMap.put(method, httpMethodAndRoute);
+
+        return httpMethodAndRoute;
     }
 
-    return httpMethodAndRoute;
-  }
-
-  private String locateHttpMethod(final Method method) {
-    String httpMethod = null;
-    for (final Annotation ann : method.getDeclaredAnnotations()) {
-      final HttpMethod annotation = ann.annotationType().getAnnotation(HttpMethod.class);
-      if (annotation != null) {
-        httpMethod = annotation.value();
-        break;
-      }
+    private String locateHttpMethod(final Method method) {
+        String httpMethod = null;
+        for (final Annotation ann : method.getDeclaredAnnotations()) {
+            final HttpMethod annotation = ann.annotationType().getAnnotation(HttpMethod.class);
+            if (annotation != null) {
+                httpMethod = annotation.value();
+                break;
+            }
+        }
+        return httpMethod;
     }
-    return httpMethod;
-  }
-
-  private Path findMethodPath(final Method method) {
-    return method.getAnnotation(Path.class);
-  }
-
-  private Path findClassPath(final Class<?> target) {
-    for (final Class<?> currentClass : new ClassHierarchyIterable(target)) {
-      final Path annotation = currentClass.getAnnotation(Path.class);
-      if (annotation != null) {
-        // Annotation overridden, no need to continue.
-        return annotation;
-      }
+
+    private Path findMethodPath(final Method method) {
+        return method.getAnnotation(Path.class);
     }
 
-    return null;
-  }
-
-  private Method findMatchingMethod(final Method baseMethod, final Method[] methods) {
-    nextMethod:
-    for (final Method method : methods) {
-      if (!baseMethod.getReturnType().equals(method.getReturnType())) {
-        continue;
-      }
-
-      if (!baseMethod.getName().equals(method.getName())) {
-        continue;
-      }
-
-      final Class<?>[] baseParameterTypes = baseMethod.getParameterTypes();
-      final Class<?>[] parameterTypes = method.getParameterTypes();
-      if (baseParameterTypes.length != parameterTypes.length) {
-        continue;
-      }
-      for (int i = 0; i < baseParameterTypes.length; i++) {
-        if (!baseParameterTypes[i].equals(parameterTypes[i])) {
-          continue nextMethod;
+    private Path findClassPath(final Class<?> target) {
+        for (final Class<?> currentClass : new ClassHierarchyIterable(target)) {
+            final Path annotation = currentClass.getAnnotation(Path.class);
+            if (annotation != null) {
+                // Annotation overridden, no need to continue.
+                return annotation;
+            }
         }
-      }
-      return method;
-    }
-    return null;
-  }
-
-  private String buildRoutePath(final Path classPath, final Path methodPath) {
-    final StringBuilder route = new StringBuilder();
-
-    boolean skipSlash = false;
-    if (classPath != null) {
-      if (!classPath.value().startsWith("/")) {
-        route.append('/');
-      }
-      route.append(classPath.value());
-      skipSlash = classPath.value().endsWith("/");
+
+        return null;
     }
 
-    if (methodPath != null) {
-      String path = methodPath.value();
-      if (skipSlash) {
-        if (path.startsWith("/")) {
-          path = path.length() == 1 ? "" : path.substring(1);
+    private Method findMatchingMethod(final Method baseMethod, final Method[] methods) {
+        nextMethod:
+        for (final Method method : methods) {
+            if (!baseMethod.getReturnType().equals(method.getReturnType())) {
+                continue;
+            }
+
+            if (!baseMethod.getName().equals(method.getName())) {
+                continue;
+            }
+
+            final Class<?>[] baseParameterTypes = baseMethod.getParameterTypes();
+            final Class<?>[] parameterTypes = method.getParameterTypes();
+            if (baseParameterTypes.length != parameterTypes.length) {
+                continue;
+            }
+            for (int i = 0; i < baseParameterTypes.length; i++) {
+                if (!baseParameterTypes[i].equals(parameterTypes[i])) {
+                    continue nextMethod;
+                }
+            }
+            return method;
         }
-      } else if (!path.startsWith("/")) {
-        route.append('/');
-      }
-      route.append(path);
+        return null;
     }
 
-    return route.toString().trim();
-  }
+    private String buildRoutePath(final Path classPath, final Path methodPath) {
+        final StringBuilder route = new StringBuilder();
+
+        boolean skipSlash = false;
+        if (classPath != null) {
+            if (!classPath.value().startsWith("/")) {
+                route.append('/');
+            }
+            route.append(classPath.value());
+            skipSlash = classPath.value().endsWith("/");
+        }
+
+        if (methodPath != null) {
+            String path = methodPath.value();
+            if (skipSlash) {
+                if (path.startsWith("/")) {
+                    path = path.length() == 1 ? "" : path.substring(1);
+                }
+            } else if (!path.startsWith("/")) {
+                route.append('/');
+            }
+            route.append(path);
+        }
+
+        return route.toString().trim();
+    }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java
index 64bd2bbb91b..62ab338ffa8 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java
@@ -33,77 +33,74 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JaxRsAnnotationsInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  private static final String JAX_ENDPOINT_OPERATION_NAME = "jax-rs.request";
+    private static final String JAX_ENDPOINT_OPERATION_NAME = "jax-rs.request";
 
-  public JaxRsAnnotationsInstrumentation() {
-    super("jax-rs", "jaxrs", "jax-rs-annotations");
-  }
+    public JaxRsAnnotationsInstrumentation() {
+        super("jax-rs", "jaxrs", "jax-rs-annotations");
+    }
 
-  private Collection<String> getJaxRsAnnotations() {
-    final Set<String> ret = new HashSet<>();
-    ret.add("javax.ws.rs.Path");
-    ret.add("javax.ws.rs.DELETE");
-    ret.add("javax.ws.rs.GET");
-    ret.add("javax.ws.rs.HEAD");
-    ret.add("javax.ws.rs.OPTIONS");
-    ret.add("javax.ws.rs.POST");
-    ret.add("javax.ws.rs.PUT");
-    ret.add("io.dropwizard.jersey.PATCH");
-    ret.addAll(InstrumenterConfig.get().getAdditionalJaxRsAnnotations());
-    return ret;
-  }
+    private Collection<String> getJaxRsAnnotations() {
+        final Set<String> ret = new HashSet<>();
+        ret.add("javax.ws.rs.Path");
+        ret.add("javax.ws.rs.DELETE");
+        ret.add("javax.ws.rs.GET");
+        ret.add("javax.ws.rs.HEAD");
+        ret.add("javax.ws.rs.OPTIONS");
+        ret.add("javax.ws.rs.POST");
+        ret.add("javax.ws.rs.PUT");
+        ret.add("io.dropwizard.jersey.PATCH");
+        ret.addAll(InstrumenterConfig.get().getAdditionalJaxRsAnnotations());
+        return ret;
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Avoid matching JAX-RS 2 which has its own instrumentation.
-    return not(hasClassNamed("javax.ws.rs.container.AsyncResponse"));
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Avoid matching JAX-RS 2 which has its own instrumentation.
+        return not(hasClassNamed("javax.ws.rs.container.AsyncResponse"));
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.ws.rs.Path";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.ws.rs.Path";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return hasSuperType(
-        declaresAnnotation(named(hierarchyMarkerType()))
-            .or(declaresMethod(isAnnotatedWith(named(hierarchyMarkerType())))));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return hasSuperType(declaresAnnotation(named(hierarchyMarkerType()))
+                .or(declaresMethod(isAnnotatedWith(named(hierarchyMarkerType())))));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(hasSuperMethod(isAnnotatedWith(namedOneOf(getJaxRsAnnotations())))),
-        JaxRsAnnotationsInstrumentation.class.getName() + "$JaxRsAnnotationsAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(hasSuperMethod(isAnnotatedWith(namedOneOf(getJaxRsAnnotations())))),
+                JaxRsAnnotationsInstrumentation.class.getName() + "$JaxRsAnnotationsAdvice");
+    }
 
-  public static class JaxRsAnnotationsAdvice {
+    public static class JaxRsAnnotationsAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope nameSpan(
-        @Advice.This final Object target, @Advice.Origin final Method method) {
-      // Rename the parent span according to the path represented by these annotations.
-      final AgentSpan parent = activeSpan();
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope nameSpan(@Advice.This final Object target, @Advice.Origin final Method method) {
+            // Rename the parent span according to the path represented by these annotations.
+            final AgentSpan parent = activeSpan();
 
-      final AgentSpan span = startSpan(JAX_RS_CONTROLLER.toString(), JAX_ENDPOINT_OPERATION_NAME);
-      span.setMeasured(true);
-      DECORATE.onJaxRsSpan(span, parent, target.getClass(), method);
-      DECORATE.afterStart(span);
+            final AgentSpan span = startSpan(JAX_RS_CONTROLLER.toString(), JAX_ENDPOINT_OPERATION_NAME);
+            span.setMeasured(true);
+            DECORATE.onJaxRsSpan(span, parent, target.getClass(), method);
+            DECORATE.afterStart(span);
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      final AgentSpan span = spanFromScope(scope);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            final AgentSpan span = spanFromScope(scope);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/test/groovy/JavaInterfaces.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/test/groovy/JavaInterfaces.java
index b40759ccfbb..210c9b9b581 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/test/groovy/JavaInterfaces.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/test/groovy/JavaInterfaces.java
@@ -3,61 +3,61 @@
 
 public class JavaInterfaces {
 
-  interface Jax {
+    interface Jax {
 
-    void call();
-  }
+        void call();
+    }
 
-  @Path("interface")
-  interface InterfaceWithClassMethodPath extends Jax {
+    @Path("interface")
+    interface InterfaceWithClassMethodPath extends Jax {
 
-    @Override
-    @GET
-    @Path("invoke")
-    void call();
-  }
+        @Override
+        @GET
+        @Path("invoke")
+        void call();
+    }
 
-  @Path("abstract")
-  abstract class AbstractClassOnInterfaceWithClassPath implements InterfaceWithClassMethodPath {
+    @Path("abstract")
+    abstract class AbstractClassOnInterfaceWithClassPath implements InterfaceWithClassMethodPath {
 
-    @GET
-    @Path("call")
-    @Override
-    public void call() {
-      // do nothing
-    }
+        @GET
+        @Path("call")
+        @Override
+        public void call() {
+            // do nothing
+        }
 
-    abstract void actual();
-  }
+        abstract void actual();
+    }
 
-  @Path("child")
-  class ChildClassOnInterface extends AbstractClassOnInterfaceWithClassPath {
+    @Path("child")
+    class ChildClassOnInterface extends AbstractClassOnInterfaceWithClassPath {
 
-    @Override
-    void actual() {
-      // do nothing
+        @Override
+        void actual() {
+            // do nothing
+        }
     }
-  }
-
-  // TODO: uncomment when we drop support for Java 7
-  //  @Path("interface")
-  //  interface DefaultInterfaceWithClassMethodPath extends Jax {
-  //
-  //    @GET
-  //    @Path("invoke")
-  //    default void call() {
-  //      actual();
-  //    }
-  //
-  //    void actual();
-  //  }
-  //
-  //  @Path("child")
-  //  class DefaultChildClassOnInterface implements DefaultInterfaceWithClassMethodPath {
-  //
-  //    @Override
-  //    public void actual() {
-  //      // do nothing
-  //    }
-  //  }
+
+    // TODO: uncomment when we drop support for Java 7
+    //  @Path("interface")
+    //  interface DefaultInterfaceWithClassMethodPath extends Jax {
+    //
+    //    @GET
+    //    @Path("invoke")
+    //    default void call() {
+    //      actual();
+    //    }
+    //
+    //    void actual();
+    //  }
+    //
+    //  @Path("child")
+    //  class DefaultChildClassOnInterface implements DefaultInterfaceWithClassMethodPath {
+    //
+    //    @Override
+    //    public void actual() {
+    //      // do nothing
+    //    }
+    //  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/test/java/Resource.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/test/java/Resource.java
index 73df13fd493..97aed8def28 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/test/java/Resource.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/test/java/Resource.java
@@ -5,45 +5,45 @@
 // Originally had this as a groovy class but was getting some weird errors.
 @Path("/ignored")
 public interface Resource {
-  @Path("ignored")
-  String hello(final String name);
+    @Path("ignored")
+    String hello(final String name);
 
-  @Path("/test")
-  interface SubResource extends Cloneable, Resource {
-    @Override
-    @POST
-    @Path("/hello/{name}")
-    String hello(@PathParam("name") final String name);
-  }
-
-  class Test1 implements SubResource {
-    @Override
-    public String hello(final String name) {
-      return "Test1 " + name + "!";
+    @Path("/test")
+    interface SubResource extends Cloneable, Resource {
+        @Override
+        @POST
+        @Path("/hello/{name}")
+        String hello(@PathParam("name") final String name);
     }
-  }
 
-  @Path("/test2")
-  class Test2 implements SubResource {
-    @Override
-    public String hello(final String name) {
-      return "Test2 " + name + "!";
+    class Test1 implements SubResource {
+        @Override
+        public String hello(final String name) {
+            return "Test1 " + name + "!";
+        }
     }
-  }
 
-  @Path("/test3")
-  class Test3 implements SubResource {
-    @Override
-    @POST
-    @Path("/hi/{name}")
-    public String hello(@PathParam("name") final String name) {
-      return "Test3 " + name + "!";
+    @Path("/test2")
+    class Test2 implements SubResource {
+        @Override
+        public String hello(final String name) {
+            return "Test2 " + name + "!";
+        }
     }
 
-    @POST
-    @Path("/nested")
-    public String nested() {
-      return hello("nested");
+    @Path("/test3")
+    class Test3 implements SubResource {
+        @Override
+        @POST
+        @Path("/hi/{name}")
+        public String hello(@PathParam("name") final String name) {
+            return "Test3 " + name + "!";
+        }
+
+        @POST
+        @Path("/nested")
+        public String nested() {
+            return hello("nested");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java
index 81977cb9ea5..7de6ef94f7a 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java
@@ -12,35 +12,35 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public abstract class AbstractRequestContextInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public AbstractRequestContextInstrumentation() {
-    super("jax-rs", "jaxrs", "jax-rs-filter");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public AbstractRequestContextInstrumentation() {
+        super("jax-rs", "jaxrs", "jax-rs-filter");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.ws.rs.container.ContainerRequestContext";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.ws.rs.container.ContainerRequestContext";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".JaxRsAnnotationsDecorator", packageName + ".RequestFilterHelper",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".JaxRsAnnotationsDecorator", packageName + ".RequestFilterHelper",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("abortWith"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("javax.ws.rs.core.Response"))),
-        getClass().getName() + "$ContainerRequestContextAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("abortWith"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("javax.ws.rs.core.Response"))),
+                getClass().getName() + "$ContainerRequestContextAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java
index 05977801733..40fa15ab14a 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java
@@ -21,38 +21,38 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ContainerRequestFilterInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public ContainerRequestFilterInstrumentation() {
-    super("jax-rs", "jaxrs", "jax-rs-filter");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.ws.rs.container.ContainerRequestFilter";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("filter"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("javax.ws.rs.container.ContainerRequestContext"))),
-        ContainerRequestFilterInstrumentation.class.getName() + "$RequestFilterAdvice");
-  }
-
-  public static class RequestFilterAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void setFilterClass(
-        @Advice.This final ContainerRequestFilter filter,
-        @Advice.Argument(0) final ContainerRequestContext context) {
-      context.setProperty(JaxRsAnnotationsDecorator.ABORT_FILTER_CLASS, filter.getClass());
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public ContainerRequestFilterInstrumentation() {
+        super("jax-rs", "jaxrs", "jax-rs-filter");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.ws.rs.container.ContainerRequestFilter";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("filter"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("javax.ws.rs.container.ContainerRequestContext"))),
+                ContainerRequestFilterInstrumentation.class.getName() + "$RequestFilterAdvice");
+    }
+
+    public static class RequestFilterAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void setFilterClass(
+                @Advice.This final ContainerRequestFilter filter,
+                @Advice.Argument(0) final ContainerRequestContext context) {
+            context.setProperty(JaxRsAnnotationsDecorator.ABORT_FILTER_CLASS, filter.getClass());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java
index 220855d932e..29f5f407474 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java
@@ -27,55 +27,52 @@
  */
 @AutoService(InstrumenterModule.class)
 public class DefaultRequestContextInstrumentation extends AbstractRequestContextInstrumentation {
-  public static class ContainerRequestContextAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope createGenericSpan(
-        @Advice.This final ContainerRequestContext context) {
+    public static class ContainerRequestContextAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope createGenericSpan(@Advice.This final ContainerRequestContext context) {
 
-      if (context.getProperty(JaxRsAnnotationsDecorator.ABORT_HANDLED) == null) {
-        final AgentSpan parent = activeSpan();
-        final AgentSpan span = startSpan(JAX_RS_CONTROLLER.toString(), JAX_RS_REQUEST_ABORT);
+            if (context.getProperty(JaxRsAnnotationsDecorator.ABORT_HANDLED) == null) {
+                final AgentSpan parent = activeSpan();
+                final AgentSpan span = startSpan(JAX_RS_CONTROLLER.toString(), JAX_RS_REQUEST_ABORT);
 
-        // Save spans so a more specific instrumentation can run later
-        context.setProperty(JaxRsAnnotationsDecorator.ABORT_PARENT, parent);
-        context.setProperty(JaxRsAnnotationsDecorator.ABORT_SPAN, span);
+                // Save spans so a more specific instrumentation can run later
+                context.setProperty(JaxRsAnnotationsDecorator.ABORT_PARENT, parent);
+                context.setProperty(JaxRsAnnotationsDecorator.ABORT_SPAN, span);
 
-        final Class filterClass =
-            (Class) context.getProperty(JaxRsAnnotationsDecorator.ABORT_FILTER_CLASS);
-        Method method = null;
-        try {
-          method = filterClass.getMethod("filter", ContainerRequestContext.class);
-        } catch (final NoSuchMethodException e) {
-          // Unable to find the filter method.  This should not be reachable because the context
-          // can only be aborted inside the filter method
-        }
+                final Class filterClass = (Class) context.getProperty(JaxRsAnnotationsDecorator.ABORT_FILTER_CLASS);
+                Method method = null;
+                try {
+                    method = filterClass.getMethod("filter", ContainerRequestContext.class);
+                } catch (final NoSuchMethodException e) {
+                    // Unable to find the filter method.  This should not be reachable because the context
+                    // can only be aborted inside the filter method
+                }
 
-        final ContextScope scope = activateSpan(span);
+                final ContextScope scope = activateSpan(span);
 
-        DECORATE.afterStart(span);
-        DECORATE.onJaxRsSpan(span, parent, filterClass, method);
+                DECORATE.afterStart(span);
+                DECORATE.onJaxRsSpan(span, parent, filterClass, method);
 
-        return scope;
-      }
+                return scope;
+            }
 
-      return null;
-    }
+            return null;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
 
-      final AgentSpan span = spanFromScope(scope);
-      if (throwable != null) {
-        DECORATE.onError(span, throwable);
-      }
+            final AgentSpan span = spanFromScope(scope);
+            if (throwable != null) {
+                DECORATE.onError(span, throwable);
+            }
 
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java
index a7c8e82f2d8..913ddbf4805 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java
@@ -20,190 +20,181 @@
 
 public class JaxRsAnnotationsDecorator extends BaseDecorator {
 
-  public static final CharSequence JAX_RS_REQUEST_ABORT =
-      UTF8BytesString.create("jax-rs.request.abort");
-  public static final CharSequence JAX_RS_CONTROLLER = UTF8BytesString.create("jax-rs-controller");
-
-  public static final String ABORT_FILTER_CLASS =
-      "datadog.trace.instrumentation.jaxrs2.filter.abort.class";
-  public static final String ABORT_HANDLED =
-      "datadog.trace.instrumentation.jaxrs2.filter.abort.handled";
-  public static final String ABORT_PARENT =
-      "datadog.trace.instrumentation.jaxrs2.filter.abort.parent";
-  public static final String ABORT_SPAN = "datadog.trace.instrumentation.jaxrs2.filter.abort.span";
-
-  public static JaxRsAnnotationsDecorator DECORATE = new JaxRsAnnotationsDecorator();
-
-  private static final ClassValue<ConcurrentHashMap<Method, Pair<CharSequence, CharSequence>>>
-      RESOURCE_NAMES = GenericClassValue.constructing(ConcurrentHashMap.class);
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[0];
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JAX_RS_CONTROLLER;
-  }
-
-  public void onJaxRsSpan(
-      final AgentSpan span, final AgentSpan parent, final Class<?> target, final Method method) {
-
-    final Pair<CharSequence, CharSequence> httpMethodAndRoute =
-        getHttpMethodAndRoute(target, method);
-    span.setSpanType(InternalSpanTypes.HTTP_SERVER);
-
-    // When jax-rs is the root, we want to name using the path, otherwise use the class/method.
-    final boolean isRootScope = parent == null;
-    if (isRootScope) {
-      HTTP_RESOURCE_DECORATOR.withRoute(
-          span, httpMethodAndRoute.getLeft(), httpMethodAndRoute.getRight());
-    } else {
-      span.setResourceName(DECORATE.spanNameForMethod(target, method));
-
-      if (parent.getLocalRootSpan().getResourceNamePriority()
-          < ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE) {
-        parent.setTag(Tags.COMPONENT, "jax-rs");
-
-        // current handler is a filter
-        if (!httpMethodAndRoute.hasLeft()
-            && (!httpMethodAndRoute.hasRight() || httpMethodAndRoute.getRight().length() == 0)) {
-          return;
-        }
+    public static final CharSequence JAX_RS_REQUEST_ABORT = UTF8BytesString.create("jax-rs.request.abort");
+    public static final CharSequence JAX_RS_CONTROLLER = UTF8BytesString.create("jax-rs-controller");
+
+    public static final String ABORT_FILTER_CLASS = "datadog.trace.instrumentation.jaxrs2.filter.abort.class";
+    public static final String ABORT_HANDLED = "datadog.trace.instrumentation.jaxrs2.filter.abort.handled";
+    public static final String ABORT_PARENT = "datadog.trace.instrumentation.jaxrs2.filter.abort.parent";
+    public static final String ABORT_SPAN = "datadog.trace.instrumentation.jaxrs2.filter.abort.span";
+
+    public static JaxRsAnnotationsDecorator DECORATE = new JaxRsAnnotationsDecorator();
+
+    private static final ClassValue<ConcurrentHashMap<Method, Pair<CharSequence, CharSequence>>> RESOURCE_NAMES =
+            GenericClassValue.constructing(ConcurrentHashMap.class);
 
-        HTTP_RESOURCE_DECORATOR.withRoute(
-            parent.getLocalRootSpan(), httpMethodAndRoute.getLeft(), httpMethodAndRoute.getRight());
-      }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[0];
     }
-  }
-
-  /**
-   * Returns the resource name parts given a JaxRS annotated method. Results are cached so this
-   * method can be called multiple times without significantly impacting performance.
-   *
-   * @return The result can be an empty string but will never be {@code null}.
-   */
-  private Pair<CharSequence, CharSequence> getHttpMethodAndRoute(
-      final Class<?> target, final Method method) {
-    Map<Method, Pair<CharSequence, CharSequence>> classMap = RESOURCE_NAMES.get(target);
-    Pair<CharSequence, CharSequence> httpMethodAndRoute = classMap.get(method);
-    if (httpMethodAndRoute == null) {
-      String httpMethod = null;
-      Path methodPath = null;
-      final Path classPath = findClassPath(target);
-      for (final Class<?> currentClass : new ClassHierarchyIterable(target)) {
-        Method currentMethod;
-        if (currentClass.equals(target)) {
-          currentMethod = method;
+
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JAX_RS_CONTROLLER;
+    }
+
+    public void onJaxRsSpan(final AgentSpan span, final AgentSpan parent, final Class<?> target, final Method method) {
+
+        final Pair<CharSequence, CharSequence> httpMethodAndRoute = getHttpMethodAndRoute(target, method);
+        span.setSpanType(InternalSpanTypes.HTTP_SERVER);
+
+        // When jax-rs is the root, we want to name using the path, otherwise use the class/method.
+        final boolean isRootScope = parent == null;
+        if (isRootScope) {
+            HTTP_RESOURCE_DECORATOR.withRoute(span, httpMethodAndRoute.getLeft(), httpMethodAndRoute.getRight());
         } else {
-          currentMethod = findMatchingMethod(method, currentClass.getDeclaredMethods());
+            span.setResourceName(DECORATE.spanNameForMethod(target, method));
+
+            if (parent.getLocalRootSpan().getResourceNamePriority() < ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE) {
+                parent.setTag(Tags.COMPONENT, "jax-rs");
+
+                // current handler is a filter
+                if (!httpMethodAndRoute.hasLeft()
+                        && (!httpMethodAndRoute.hasRight()
+                                || httpMethodAndRoute.getRight().length() == 0)) {
+                    return;
+                }
+
+                HTTP_RESOURCE_DECORATOR.withRoute(
+                        parent.getLocalRootSpan(), httpMethodAndRoute.getLeft(), httpMethodAndRoute.getRight());
+            }
         }
+    }
 
-        if (currentMethod != null) {
-          if (httpMethod == null) {
-            httpMethod = locateHttpMethod(currentMethod);
-          }
-          if (methodPath == null) {
-            methodPath = findMethodPath(currentMethod);
-          }
-
-          if (httpMethod != null && methodPath != null) {
-            break;
-          }
+    /**
+     * Returns the resource name parts given a JaxRS annotated method. Results are cached so this
+     * method can be called multiple times without significantly impacting performance.
+     *
+     * @return The result can be an empty string but will never be {@code null}.
+     */
+    private Pair<CharSequence, CharSequence> getHttpMethodAndRoute(final Class<?> target, final Method method) {
+        Map<Method, Pair<CharSequence, CharSequence>> classMap = RESOURCE_NAMES.get(target);
+        Pair<CharSequence, CharSequence> httpMethodAndRoute = classMap.get(method);
+        if (httpMethodAndRoute == null) {
+            String httpMethod = null;
+            Path methodPath = null;
+            final Path classPath = findClassPath(target);
+            for (final Class<?> currentClass : new ClassHierarchyIterable(target)) {
+                Method currentMethod;
+                if (currentClass.equals(target)) {
+                    currentMethod = method;
+                } else {
+                    currentMethod = findMatchingMethod(method, currentClass.getDeclaredMethods());
+                }
+
+                if (currentMethod != null) {
+                    if (httpMethod == null) {
+                        httpMethod = locateHttpMethod(currentMethod);
+                    }
+                    if (methodPath == null) {
+                        methodPath = findMethodPath(currentMethod);
+                    }
+
+                    if (httpMethod != null && methodPath != null) {
+                        break;
+                    }
+                }
+            }
+            httpMethodAndRoute = Pair.<CharSequence, CharSequence>of(httpMethod, buildRoutePath(classPath, methodPath));
+            classMap.put(method, httpMethodAndRoute);
         }
-      }
-      httpMethodAndRoute =
-          Pair.<CharSequence, CharSequence>of(httpMethod, buildRoutePath(classPath, methodPath));
-      classMap.put(method, httpMethodAndRoute);
+
+        return httpMethodAndRoute;
     }
 
-    return httpMethodAndRoute;
-  }
-
-  private String locateHttpMethod(final Method method) {
-    String httpMethod = null;
-    for (final Annotation ann : method.getDeclaredAnnotations()) {
-      final HttpMethod annotation = ann.annotationType().getAnnotation(HttpMethod.class);
-      if (annotation != null) {
-        httpMethod = annotation.value();
-        break;
-      }
+    private String locateHttpMethod(final Method method) {
+        String httpMethod = null;
+        for (final Annotation ann : method.getDeclaredAnnotations()) {
+            final HttpMethod annotation = ann.annotationType().getAnnotation(HttpMethod.class);
+            if (annotation != null) {
+                httpMethod = annotation.value();
+                break;
+            }
+        }
+        return httpMethod;
     }
-    return httpMethod;
-  }
-
-  private Path findMethodPath(final Method method) {
-    return method.getAnnotation(Path.class);
-  }
-
-  private Path findClassPath(final Class<?> target) {
-    for (final Class<?> currentClass : new ClassHierarchyIterable(target)) {
-      final Path annotation = currentClass.getAnnotation(Path.class);
-      if (annotation != null) {
-        // Annotation overridden, no need to continue.
-        return annotation;
-      }
+
+    private Path findMethodPath(final Method method) {
+        return method.getAnnotation(Path.class);
     }
 
-    return null;
-  }
-
-  private Method findMatchingMethod(final Method baseMethod, final Method[] methods) {
-    nextMethod:
-    for (final Method method : methods) {
-      if (!baseMethod.getReturnType().equals(method.getReturnType())) {
-        continue;
-      }
-
-      if (!baseMethod.getName().equals(method.getName())) {
-        continue;
-      }
-
-      final Class<?>[] baseParameterTypes = baseMethod.getParameterTypes();
-      final Class<?>[] parameterTypes = method.getParameterTypes();
-      if (baseParameterTypes.length != parameterTypes.length) {
-        continue;
-      }
-      for (int i = 0; i < baseParameterTypes.length; i++) {
-        if (!baseParameterTypes[i].equals(parameterTypes[i])) {
-          continue nextMethod;
+    private Path findClassPath(final Class<?> target) {
+        for (final Class<?> currentClass : new ClassHierarchyIterable(target)) {
+            final Path annotation = currentClass.getAnnotation(Path.class);
+            if (annotation != null) {
+                // Annotation overridden, no need to continue.
+                return annotation;
+            }
         }
-      }
-      return method;
-    }
-    return null;
-  }
-
-  private String buildRoutePath(final Path classPath, final Path methodPath) {
-    final StringBuilder route = new StringBuilder();
-
-    boolean skipSlash = false;
-    if (classPath != null) {
-      if (!classPath.value().startsWith("/")) {
-        route.append('/');
-      }
-      route.append(classPath.value());
-      skipSlash = classPath.value().endsWith("/");
+
+        return null;
     }
 
-    if (methodPath != null) {
-      String path = methodPath.value();
-      if (skipSlash) {
-        if (path.startsWith("/")) {
-          path = path.length() == 1 ? "" : path.substring(1);
+    private Method findMatchingMethod(final Method baseMethod, final Method[] methods) {
+        nextMethod:
+        for (final Method method : methods) {
+            if (!baseMethod.getReturnType().equals(method.getReturnType())) {
+                continue;
+            }
+
+            if (!baseMethod.getName().equals(method.getName())) {
+                continue;
+            }
+
+            final Class<?>[] baseParameterTypes = baseMethod.getParameterTypes();
+            final Class<?>[] parameterTypes = method.getParameterTypes();
+            if (baseParameterTypes.length != parameterTypes.length) {
+                continue;
+            }
+            for (int i = 0; i < baseParameterTypes.length; i++) {
+                if (!baseParameterTypes[i].equals(parameterTypes[i])) {
+                    continue nextMethod;
+                }
+            }
+            return method;
         }
-      } else if (!path.startsWith("/")) {
-        route.append('/');
-      }
-      route.append(path);
+        return null;
     }
 
-    return route.toString().trim();
-  }
+    private String buildRoutePath(final Path classPath, final Path methodPath) {
+        final StringBuilder route = new StringBuilder();
+
+        boolean skipSlash = false;
+        if (classPath != null) {
+            if (!classPath.value().startsWith("/")) {
+                route.append('/');
+            }
+            route.append(classPath.value());
+            skipSlash = classPath.value().endsWith("/");
+        }
+
+        if (methodPath != null) {
+            String path = methodPath.value();
+            if (skipSlash) {
+                if (path.startsWith("/")) {
+                    path = path.length() == 1 ? "" : path.substring(1);
+                }
+            } else if (!path.startsWith("/")) {
+                route.append('/');
+            }
+            route.append(path);
+        }
+
+        return route.toString().trim();
+    }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java
index f9aa7965244..c3f91b5dd02 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java
@@ -37,131 +37,130 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JaxRsAnnotationsInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  private static final String JAX_ENDPOINT_OPERATION_NAME = "jax-rs.request";
-
-  public JaxRsAnnotationsInstrumentation() {
-    super("jax-rs", "jaxrs", "jax-rs-annotations");
-  }
-
-  private Collection<String> getJaxRsAnnotations() {
-    final Set<String> ret = new HashSet<>();
-    ret.add("javax.ws.rs.Path");
-    ret.add("javax.ws.rs.DELETE");
-    ret.add("javax.ws.rs.GET");
-    ret.add("javax.ws.rs.HEAD");
-    ret.add("javax.ws.rs.OPTIONS");
-    ret.add("javax.ws.rs.POST");
-    ret.add("javax.ws.rs.PUT");
-    ret.add("javax.ws.rs.PATCH"); // come with 2.1 spec
-    ret.add("io.dropwizard.jersey.PATCH");
-    ret.addAll(InstrumenterConfig.get().getAdditionalJaxRsAnnotations());
-    return ret;
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("javax.ws.rs.container.AsyncResponse", AgentSpan.class.getName());
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Avoid matching JAX-RS 1 which has its own instrumentation.
-    return hasClassNamed("javax.ws.rs.container.AsyncResponse");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.ws.rs.Path";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return hasSuperType(
-        declaresAnnotation(named(hierarchyMarkerType()))
-            .or(declaresMethod(isAnnotatedWith(named(hierarchyMarkerType())))));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(hasSuperMethod(isAnnotatedWith(namedOneOf(getJaxRsAnnotations())))),
-        JaxRsAnnotationsInstrumentation.class.getName() + "$JaxRsAnnotationsAdvice");
-  }
-
-  public static class JaxRsAnnotationsAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope nameSpan(
-        @Advice.This final Object target,
-        @Advice.Origin final Method method,
-        @Advice.AllArguments final Object[] args,
-        @Advice.Local("asyncResponse") AsyncResponse asyncResponse) {
-      ContextStore<AsyncResponse, AgentSpan> contextStore = null;
-      for (final Object arg : args) {
-        if (arg instanceof AsyncResponse) {
-          asyncResponse = (AsyncResponse) arg;
-          contextStore = InstrumentationContext.get(AsyncResponse.class, AgentSpan.class);
-          if (contextStore.get(asyncResponse) != null) {
-            /**
-             * We are probably in a recursive call and don't want to start a new span because it
-             * would replace the existing span in the asyncResponse and cause it to never finish. We
-             * could work around this by using a list instead, but we likely don't want the extra
-             * span anyway.
-             */
-            return null;
-          }
-          break;
-        }
-      }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-      // Rename the parent span according to the path represented by these annotations.
-      final AgentSpan parent = activeSpan();
+    private static final String JAX_ENDPOINT_OPERATION_NAME = "jax-rs.request";
 
-      final AgentSpan span = startSpan(JAX_RS_CONTROLLER.toString(), JAX_ENDPOINT_OPERATION_NAME);
-      span.setMeasured(true);
-      DECORATE.onJaxRsSpan(span, parent, target.getClass(), method);
-      DECORATE.afterStart(span);
+    public JaxRsAnnotationsInstrumentation() {
+        super("jax-rs", "jaxrs", "jax-rs-annotations");
+    }
 
-      final ContextScope scope = activateSpan(span);
+    private Collection<String> getJaxRsAnnotations() {
+        final Set<String> ret = new HashSet<>();
+        ret.add("javax.ws.rs.Path");
+        ret.add("javax.ws.rs.DELETE");
+        ret.add("javax.ws.rs.GET");
+        ret.add("javax.ws.rs.HEAD");
+        ret.add("javax.ws.rs.OPTIONS");
+        ret.add("javax.ws.rs.POST");
+        ret.add("javax.ws.rs.PUT");
+        ret.add("javax.ws.rs.PATCH"); // come with 2.1 spec
+        ret.add("io.dropwizard.jersey.PATCH");
+        ret.addAll(InstrumenterConfig.get().getAdditionalJaxRsAnnotations());
+        return ret;
+    }
 
-      if (contextStore != null && asyncResponse != null) {
-        contextStore.put(asyncResponse, span);
-      }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("javax.ws.rs.container.AsyncResponse", AgentSpan.class.getName());
+    }
 
-      return scope;
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Avoid matching JAX-RS 1 which has its own instrumentation.
+        return hasClassNamed("javax.ws.rs.container.AsyncResponse");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Local("asyncResponse") final AsyncResponse asyncResponse) {
-      if (scope == null) {
-        return;
-      }
-      final AgentSpan span = spanFromScope(scope);
-      if (throwable != null) {
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-        return;
-      }
-
-      if (asyncResponse != null && !asyncResponse.isSuspended()) {
-        // Clear span from the asyncResponse. Logically this should never happen. Added to be safe.
-        InstrumentationContext.get(AsyncResponse.class, AgentSpan.class).put(asyncResponse, null);
-      }
-      if (asyncResponse == null || !asyncResponse.isSuspended()) {
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
-      // else span finished by AsyncResponseAdvice
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.ws.rs.Path";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return hasSuperType(declaresAnnotation(named(hierarchyMarkerType()))
+                .or(declaresMethod(isAnnotatedWith(named(hierarchyMarkerType())))));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(hasSuperMethod(isAnnotatedWith(namedOneOf(getJaxRsAnnotations())))),
+                JaxRsAnnotationsInstrumentation.class.getName() + "$JaxRsAnnotationsAdvice");
+    }
+
+    public static class JaxRsAnnotationsAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope nameSpan(
+                @Advice.This final Object target,
+                @Advice.Origin final Method method,
+                @Advice.AllArguments final Object[] args,
+                @Advice.Local("asyncResponse") AsyncResponse asyncResponse) {
+            ContextStore<AsyncResponse, AgentSpan> contextStore = null;
+            for (final Object arg : args) {
+                if (arg instanceof AsyncResponse) {
+                    asyncResponse = (AsyncResponse) arg;
+                    contextStore = InstrumentationContext.get(AsyncResponse.class, AgentSpan.class);
+                    if (contextStore.get(asyncResponse) != null) {
+                        /**
+                         * We are probably in a recursive call and don't want to start a new span because it
+                         * would replace the existing span in the asyncResponse and cause it to never finish. We
+                         * could work around this by using a list instead, but we likely don't want the extra
+                         * span anyway.
+                         */
+                        return null;
+                    }
+                    break;
+                }
+            }
+
+            // Rename the parent span according to the path represented by these annotations.
+            final AgentSpan parent = activeSpan();
+
+            final AgentSpan span = startSpan(JAX_RS_CONTROLLER.toString(), JAX_ENDPOINT_OPERATION_NAME);
+            span.setMeasured(true);
+            DECORATE.onJaxRsSpan(span, parent, target.getClass(), method);
+            DECORATE.afterStart(span);
+
+            final ContextScope scope = activateSpan(span);
+
+            if (contextStore != null && asyncResponse != null) {
+                contextStore.put(asyncResponse, span);
+            }
+
+            return scope;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Local("asyncResponse") final AsyncResponse asyncResponse) {
+            if (scope == null) {
+                return;
+            }
+            final AgentSpan span = spanFromScope(scope);
+            if (throwable != null) {
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+                return;
+            }
+
+            if (asyncResponse != null && !asyncResponse.isSuspended()) {
+                // Clear span from the asyncResponse. Logically this should never happen. Added to be safe.
+                InstrumentationContext.get(AsyncResponse.class, AgentSpan.class).put(asyncResponse, null);
+            }
+            if (asyncResponse == null || !asyncResponse.isSuspended()) {
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+            // else span finished by AsyncResponseAdvice
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java
index 55fb401a8db..12f955c00a1 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java
@@ -21,100 +21,97 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JaxRsAsyncResponseInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public JaxRsAsyncResponseInstrumentation() {
-    super("jax-rs", "jaxrs", "jax-rs-annotations");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "javax.ws.rs.container.AsyncResponse", AgentSpan.class.getName());
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.ws.rs.container.AsyncResponse";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("resume").and(takesArgument(0, Object.class)).and(isPublic()),
-        JaxRsAsyncResponseInstrumentation.class.getName() + "$AsyncResponseAdvice");
-    transformer.applyAdvice(
-        named("resume").and(takesArgument(0, Throwable.class)).and(isPublic()),
-        JaxRsAsyncResponseInstrumentation.class.getName() + "$AsyncResponseThrowableAdvice");
-    transformer.applyAdvice(
-        named("cancel"),
-        JaxRsAsyncResponseInstrumentation.class.getName() + "$AsyncResponseCancelAdvice");
-  }
-
-  public static class AsyncResponseAdvice {
-
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.This final AsyncResponse asyncResponse, @Advice.Thrown Throwable throwable) {
-
-      final ContextStore<AsyncResponse, AgentSpan> contextStore =
-          InstrumentationContext.get(AsyncResponse.class, AgentSpan.class);
-
-      final AgentSpan span = contextStore.get(asyncResponse);
-      if (span != null) {
-        contextStore.put(asyncResponse, null);
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public JaxRsAsyncResponseInstrumentation() {
+        super("jax-rs", "jaxrs", "jax-rs-annotations");
     }
-  }
 
-  public static class AsyncResponseThrowableAdvice {
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("javax.ws.rs.container.AsyncResponse", AgentSpan.class.getName());
+    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.This final AsyncResponse asyncResponse,
-        @Advice.Argument(0) final Throwable throwable) {
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.ws.rs.container.AsyncResponse";
+    }
 
-      final ContextStore<AsyncResponse, AgentSpan> contextStore =
-          InstrumentationContext.get(AsyncResponse.class, AgentSpan.class);
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-      final AgentSpan span = contextStore.get(asyncResponse);
-      if (span != null) {
-        contextStore.put(asyncResponse, null);
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("resume").and(takesArgument(0, Object.class)).and(isPublic()),
+                JaxRsAsyncResponseInstrumentation.class.getName() + "$AsyncResponseAdvice");
+        transformer.applyAdvice(
+                named("resume").and(takesArgument(0, Throwable.class)).and(isPublic()),
+                JaxRsAsyncResponseInstrumentation.class.getName() + "$AsyncResponseThrowableAdvice");
+        transformer.applyAdvice(
+                named("cancel"), JaxRsAsyncResponseInstrumentation.class.getName() + "$AsyncResponseCancelAdvice");
     }
-  }
 
-  public static class AsyncResponseCancelAdvice {
+    public static class AsyncResponseAdvice {
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.This final AsyncResponse asyncResponse, @Advice.Thrown Throwable throwable) {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.This final AsyncResponse asyncResponse, @Advice.Thrown Throwable throwable) {
 
-      final ContextStore<AsyncResponse, AgentSpan> contextStore =
-          InstrumentationContext.get(AsyncResponse.class, AgentSpan.class);
+            final ContextStore<AsyncResponse, AgentSpan> contextStore =
+                    InstrumentationContext.get(AsyncResponse.class, AgentSpan.class);
+
+            final AgentSpan span = contextStore.get(asyncResponse);
+            if (span != null) {
+                contextStore.put(asyncResponse, null);
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
+        }
+    }
+
+    public static class AsyncResponseThrowableAdvice {
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.This final AsyncResponse asyncResponse, @Advice.Argument(0) final Throwable throwable) {
+
+            final ContextStore<AsyncResponse, AgentSpan> contextStore =
+                    InstrumentationContext.get(AsyncResponse.class, AgentSpan.class);
+
+            final AgentSpan span = contextStore.get(asyncResponse);
+            if (span != null) {
+                contextStore.put(asyncResponse, null);
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
+        }
+    }
 
-      final AgentSpan span = contextStore.get(asyncResponse);
-      if (span != null) {
-        contextStore.put(asyncResponse, null);
-        if (throwable != null) {
-          DECORATE.onError(span, throwable);
-        } else {
-          span.setTag("canceled", true);
+    public static class AsyncResponseCancelAdvice {
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.This final AsyncResponse asyncResponse, @Advice.Thrown Throwable throwable) {
+
+            final ContextStore<AsyncResponse, AgentSpan> contextStore =
+                    InstrumentationContext.get(AsyncResponse.class, AgentSpan.class);
+
+            final AgentSpan span = contextStore.get(asyncResponse);
+            if (span != null) {
+                contextStore.put(asyncResponse, null);
+                if (throwable != null) {
+                    DECORATE.onError(span, throwable);
+                } else {
+                    span.setTag("canceled", true);
+                }
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
         }
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/MessageBodyWriterInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/MessageBodyWriterInstrumentation.java
index 8262c211420..fd20da328e9 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/MessageBodyWriterInstrumentation.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/MessageBodyWriterInstrumentation.java
@@ -25,64 +25,63 @@
 
 @AutoService(InstrumenterModule.class)
 public class MessageBodyWriterInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public MessageBodyWriterInstrumentation() {
-    super("jax-rs");
-  }
+    public MessageBodyWriterInstrumentation() {
+        super("jax-rs");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "javax-message-body-writer";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "javax-message-body-writer";
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.ws.rs.ext.MessageBodyWriter";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.ws.rs.ext.MessageBodyWriter";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("writeTo").and(takesArguments(7)), getClass().getName() + "$MessageBodyWriterAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("writeTo").and(takesArguments(7)), getClass().getName() + "$MessageBodyWriterAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class MessageBodyWriterAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void before(
-        @Advice.Argument(0) Object entity,
-        @Advice.Argument(4) MediaType mediaType,
-        @ActiveRequestContext RequestContext reqCtx) {
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class MessageBodyWriterAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void before(
+                @Advice.Argument(0) Object entity,
+                @Advice.Argument(4) MediaType mediaType,
+                @ActiveRequestContext RequestContext reqCtx) {
 
-      if (!MediaType.APPLICATION_JSON_TYPE.isCompatible(mediaType)) {
-        return;
-      }
+            if (!MediaType.APPLICATION_JSON_TYPE.isCompatible(mediaType)) {
+                return;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.responseBody());
-      if (callback == null) {
-        return;
-      }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.responseBody());
+            if (callback == null) {
+                return;
+            }
 
-      Flow<Void> flow = callback.apply(reqCtx, entity);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction == null) {
-          return;
-        }
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+            Flow<Void> flow = callback.apply(reqCtx, entity);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction == null) {
+                    return;
+                }
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
 
-        throw new BlockingException("Blocked request (for MessageBodyWriter)");
-      }
+                throw new BlockingException("Blocked request (for MessageBodyWriter)");
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java
index 43213c32241..0ada9f6c214 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java
@@ -14,48 +14,48 @@
 import javax.ws.rs.container.ContainerRequestContext;
 
 public class RequestFilterHelper {
-  public static ContextScope createOrUpdateAbortSpan(
-      final ContainerRequestContext context, final Class resourceClass, final Method method) {
-
-    if (method != null && resourceClass != null) {
-      context.setProperty(JaxRsAnnotationsDecorator.ABORT_HANDLED, true);
-      // The ordering of the specific and general abort instrumentation is unspecified
-      // The general instrumentation (ContainerRequestFilterInstrumentation) saves spans
-      // properties if it ran first
-      AgentSpan parent = (AgentSpan) context.getProperty(JaxRsAnnotationsDecorator.ABORT_PARENT);
-      AgentSpan span = (AgentSpan) context.getProperty(JaxRsAnnotationsDecorator.ABORT_SPAN);
-
-      if (span == null) {
-        parent = activeSpan();
-        span = startSpan(JAX_RS_CONTROLLER.toString(), JAX_RS_REQUEST_ABORT);
-
-        final ContextScope scope = activateSpan(span);
-
-        DECORATE.afterStart(span);
-        DECORATE.onJaxRsSpan(span, parent, resourceClass, method);
-
-        return scope;
-      } else {
-        DECORATE.onJaxRsSpan(span, parent, resourceClass, method);
-        return null;
-      }
-    } else {
-      return null;
+    public static ContextScope createOrUpdateAbortSpan(
+            final ContainerRequestContext context, final Class resourceClass, final Method method) {
+
+        if (method != null && resourceClass != null) {
+            context.setProperty(JaxRsAnnotationsDecorator.ABORT_HANDLED, true);
+            // The ordering of the specific and general abort instrumentation is unspecified
+            // The general instrumentation (ContainerRequestFilterInstrumentation) saves spans
+            // properties if it ran first
+            AgentSpan parent = (AgentSpan) context.getProperty(JaxRsAnnotationsDecorator.ABORT_PARENT);
+            AgentSpan span = (AgentSpan) context.getProperty(JaxRsAnnotationsDecorator.ABORT_SPAN);
+
+            if (span == null) {
+                parent = activeSpan();
+                span = startSpan(JAX_RS_CONTROLLER.toString(), JAX_RS_REQUEST_ABORT);
+
+                final ContextScope scope = activateSpan(span);
+
+                DECORATE.afterStart(span);
+                DECORATE.onJaxRsSpan(span, parent, resourceClass, method);
+
+                return scope;
+            } else {
+                DECORATE.onJaxRsSpan(span, parent, resourceClass, method);
+                return null;
+            }
+        } else {
+            return null;
+        }
     }
-  }
 
-  public static void closeSpanAndScope(final ContextScope scope, final Throwable throwable) {
-    if (scope == null) {
-      return;
-    }
+    public static void closeSpanAndScope(final ContextScope scope, final Throwable throwable) {
+        if (scope == null) {
+            return;
+        }
 
-    final AgentSpan span = spanFromScope(scope);
-    if (throwable != null) {
-      DECORATE.onError(span, throwable);
-    }
+        final AgentSpan span = spanFromScope(scope);
+        if (throwable != null) {
+            DECORATE.onError(span, throwable);
+        }
 
-    DECORATE.beforeFinish(span);
-    scope.close();
-    span.finish();
-  }
+        DECORATE.beforeFinish(span);
+        scope.close();
+        span.finish();
+    }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/nestedTest/java/KeyCloakResources.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/nestedTest/java/KeyCloakResources.java
index 634158f7732..95316d569a1 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/nestedTest/java/KeyCloakResources.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/nestedTest/java/KeyCloakResources.java
@@ -8,53 +8,53 @@
 import javax.xml.bind.annotation.XmlRootElement;
 
 public class KeyCloakResources {
-  @Path("/admin")
-  public static class AdminRoot {
+    @Path("/admin")
+    public static class AdminRoot {
 
-    @Path("realms")
-    public Object getRealmsAdmin(@Context final HttpHeaders headers) {
-      return new RealmsAdminResource();
+        @Path("realms")
+        public Object getRealmsAdmin(@Context final HttpHeaders headers) {
+            return new RealmsAdminResource();
+        }
     }
-  }
 
-  public static class RealmsAdminResource {
+    public static class RealmsAdminResource {
 
-    @Path("{realm}")
-    public RealmAdminResource getRealmAdmin(
-        @Context final HttpHeaders headers, @PathParam("realm") final String name) {
-      return new RealmAdminResource();
+        @Path("{realm}")
+        public RealmAdminResource getRealmAdmin(
+                @Context final HttpHeaders headers, @PathParam("realm") final String name) {
+            return new RealmAdminResource();
+        }
     }
-  }
 
-  public static class RealmAdminResource {
-    @Path("users")
-    public UsersResource users() {
-      return new UsersResource();
+    public static class RealmAdminResource {
+        @Path("users")
+        public UsersResource users() {
+            return new UsersResource();
+        }
     }
-  }
 
-  public static class UsersResource {
+    public static class UsersResource {
 
-    @Path("{id}")
-    public UserResource user(final @PathParam("id") String id) {
-      return new UserResource();
+        @Path("{id}")
+        public UserResource user(final @PathParam("id") String id) {
+            return new UserResource();
+        }
     }
-  }
 
-  public static class UserResource {
-    @GET
-    @Produces(MediaType.APPLICATION_XML)
-    public UserRepresentation getUser() {
-      return new UserRepresentation();
+    public static class UserResource {
+        @GET
+        @Produces(MediaType.APPLICATION_XML)
+        public UserRepresentation getUser() {
+            return new UserRepresentation();
+        }
+
+        /* A method annotated with @Path is required in order for JaxRsAnnotationsInstrumentation.typeMatcher to intercept */
+        @Path("self")
+        public UserResource requiredMethod() {
+            return null;
+        }
     }
 
-    /* A method annotated with @Path is required in order for JaxRsAnnotationsInstrumentation.typeMatcher to intercept */
-    @Path("self")
-    public UserResource requiredMethod() {
-      return null;
-    }
-  }
-
-  @XmlRootElement
-  public static class UserRepresentation {}
+    @XmlRootElement
+    public static class UserRepresentation {}
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/test/groovy/JavaInterfaces.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/test/groovy/JavaInterfaces.java
index b40759ccfbb..210c9b9b581 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/test/groovy/JavaInterfaces.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/test/groovy/JavaInterfaces.java
@@ -3,61 +3,61 @@
 
 public class JavaInterfaces {
 
-  interface Jax {
+    interface Jax {
 
-    void call();
-  }
+        void call();
+    }
 
-  @Path("interface")
-  interface InterfaceWithClassMethodPath extends Jax {
+    @Path("interface")
+    interface InterfaceWithClassMethodPath extends Jax {
 
-    @Override
-    @GET
-    @Path("invoke")
-    void call();
-  }
+        @Override
+        @GET
+        @Path("invoke")
+        void call();
+    }
 
-  @Path("abstract")
-  abstract class AbstractClassOnInterfaceWithClassPath implements InterfaceWithClassMethodPath {
+    @Path("abstract")
+    abstract class AbstractClassOnInterfaceWithClassPath implements InterfaceWithClassMethodPath {
 
-    @GET
-    @Path("call")
-    @Override
-    public void call() {
-      // do nothing
-    }
+        @GET
+        @Path("call")
+        @Override
+        public void call() {
+            // do nothing
+        }
 
-    abstract void actual();
-  }
+        abstract void actual();
+    }
 
-  @Path("child")
-  class ChildClassOnInterface extends AbstractClassOnInterfaceWithClassPath {
+    @Path("child")
+    class ChildClassOnInterface extends AbstractClassOnInterfaceWithClassPath {
 
-    @Override
-    void actual() {
-      // do nothing
+        @Override
+        void actual() {
+            // do nothing
+        }
     }
-  }
-
-  // TODO: uncomment when we drop support for Java 7
-  //  @Path("interface")
-  //  interface DefaultInterfaceWithClassMethodPath extends Jax {
-  //
-  //    @GET
-  //    @Path("invoke")
-  //    default void call() {
-  //      actual();
-  //    }
-  //
-  //    void actual();
-  //  }
-  //
-  //  @Path("child")
-  //  class DefaultChildClassOnInterface implements DefaultInterfaceWithClassMethodPath {
-  //
-  //    @Override
-  //    public void actual() {
-  //      // do nothing
-  //    }
-  //  }
+
+    // TODO: uncomment when we drop support for Java 7
+    //  @Path("interface")
+    //  interface DefaultInterfaceWithClassMethodPath extends Jax {
+    //
+    //    @GET
+    //    @Path("invoke")
+    //    default void call() {
+    //      actual();
+    //    }
+    //
+    //    void actual();
+    //  }
+    //
+    //  @Path("child")
+    //  class DefaultChildClassOnInterface implements DefaultInterfaceWithClassMethodPath {
+    //
+    //    @Override
+    //    public void actual() {
+    //      // do nothing
+    //    }
+    //  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/test/java/Resource.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/test/java/Resource.java
index 73df13fd493..97aed8def28 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/test/java/Resource.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/test/java/Resource.java
@@ -5,45 +5,45 @@
 // Originally had this as a groovy class but was getting some weird errors.
 @Path("/ignored")
 public interface Resource {
-  @Path("ignored")
-  String hello(final String name);
+    @Path("ignored")
+    String hello(final String name);
 
-  @Path("/test")
-  interface SubResource extends Cloneable, Resource {
-    @Override
-    @POST
-    @Path("/hello/{name}")
-    String hello(@PathParam("name") final String name);
-  }
-
-  class Test1 implements SubResource {
-    @Override
-    public String hello(final String name) {
-      return "Test1 " + name + "!";
+    @Path("/test")
+    interface SubResource extends Cloneable, Resource {
+        @Override
+        @POST
+        @Path("/hello/{name}")
+        String hello(@PathParam("name") final String name);
     }
-  }
 
-  @Path("/test2")
-  class Test2 implements SubResource {
-    @Override
-    public String hello(final String name) {
-      return "Test2 " + name + "!";
+    class Test1 implements SubResource {
+        @Override
+        public String hello(final String name) {
+            return "Test1 " + name + "!";
+        }
     }
-  }
 
-  @Path("/test3")
-  class Test3 implements SubResource {
-    @Override
-    @POST
-    @Path("/hi/{name}")
-    public String hello(@PathParam("name") final String name) {
-      return "Test3 " + name + "!";
+    @Path("/test2")
+    class Test2 implements SubResource {
+        @Override
+        public String hello(final String name) {
+            return "Test2 " + name + "!";
+        }
     }
 
-    @POST
-    @Path("/nested")
-    public String nested() {
-      return hello("nested");
+    @Path("/test3")
+    class Test3 implements SubResource {
+        @Override
+        @POST
+        @Path("/hi/{name}")
+        public String hello(@PathParam("name") final String name) {
+            return "Test3 " + name + "!";
+        }
+
+        @POST
+        @Path("/nested")
+        public String nested() {
+            return hello("nested");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/InjectAdapter.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/InjectAdapter.java
index ed476a83fc2..8932ebab323 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/InjectAdapter.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/InjectAdapter.java
@@ -7,12 +7,11 @@
 @ParametersAreNonnullByDefault
 public final class InjectAdapter implements CarrierSetter<MultivaluedMap<String, Object>> {
 
-  public static final InjectAdapter SETTER = new InjectAdapter();
+    public static final InjectAdapter SETTER = new InjectAdapter();
 
-  @Override
-  public void set(
-      final MultivaluedMap<String, Object> headers, final String key, final String value) {
-    // Don't allow duplicates.
-    headers.putSingle(key, value);
-  }
+    @Override
+    public void set(final MultivaluedMap<String, Object> headers, final String key, final String value) {
+        // Don't allow duplicates.
+        headers.putSingle(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Decorator.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Decorator.java
index f8adab0c5ee..fa42987dff6 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Decorator.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Decorator.java
@@ -8,48 +8,47 @@
 
 public class JaxRsClientV1Decorator extends HttpClientDecorator<ClientRequest, ClientResponse> {
 
-  public static final CharSequence JAX_RS_CLIENT = UTF8BytesString.create("jax-rs.client");
-
-  public static final JaxRsClientV1Decorator DECORATE = new JaxRsClientV1Decorator();
-  public static final CharSequence JAX_RS_CLIENT_CALL =
-      UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jax-rs", "jaxrs", "jax-rs-client"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JAX_RS_CLIENT;
-  }
-
-  @Override
-  protected String method(final ClientRequest httpRequest) {
-    return httpRequest.getMethod();
-  }
-
-  @Override
-  protected URI url(final ClientRequest httpRequest) {
-    return httpRequest.getURI();
-  }
-
-  @Override
-  protected int status(final ClientResponse clientResponse) {
-    return clientResponse.getStatus();
-  }
-
-  @Override
-  protected String getRequestHeader(ClientRequest request, String headerName) {
-    Object headerValue = request.getHeaders().getFirst(headerName);
-    if (null != headerValue) {
-      return headerValue.toString();
+    public static final CharSequence JAX_RS_CLIENT = UTF8BytesString.create("jax-rs.client");
+
+    public static final JaxRsClientV1Decorator DECORATE = new JaxRsClientV1Decorator();
+    public static final CharSequence JAX_RS_CLIENT_CALL = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jax-rs", "jaxrs", "jax-rs-client"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JAX_RS_CLIENT;
     }
-    return null;
-  }
 
-  @Override
-  protected String getResponseHeader(ClientResponse response, String headerName) {
-    return response.getHeaders().getFirst(headerName);
-  }
+    @Override
+    protected String method(final ClientRequest httpRequest) {
+        return httpRequest.getMethod();
+    }
+
+    @Override
+    protected URI url(final ClientRequest httpRequest) {
+        return httpRequest.getURI();
+    }
+
+    @Override
+    protected int status(final ClientResponse clientResponse) {
+        return clientResponse.getStatus();
+    }
+
+    @Override
+    protected String getRequestHeader(ClientRequest request, String headerName) {
+        Object headerValue = request.getHeaders().getFirst(headerName);
+        if (null != headerValue) {
+            return headerValue.toString();
+        }
+        return null;
+    }
+
+    @Override
+    protected String getResponseHeader(ClientResponse response, String headerName) {
+        return response.getHeaders().getFirst(headerName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java
index 578cb1930a1..0745229eb5a 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java
@@ -31,73 +31,72 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JaxRsClientV1Instrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public JaxRsClientV1Instrumentation() {
-    super("jax-rs", "jaxrs", "jax-rs-client");
-  }
+    public JaxRsClientV1Instrumentation() {
+        super("jax-rs", "jaxrs", "jax-rs-client");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "com.sun.jersey.api.client.ClientHandler";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "com.sun.jersey.api.client.ClientHandler";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        named("handle")
-            .and(takesArgument(0, extendsClass(named("com.sun.jersey.api.client.ClientRequest"))))
-            .and(returns(extendsClass(named("com.sun.jersey.api.client.ClientResponse")))),
-        JaxRsClientV1Instrumentation.class.getName() + "$HandleAdvice",
-        JaxRsClientV1Instrumentation.class.getName() + "$HandleContextPropagationAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                named("handle")
+                        .and(takesArgument(0, extendsClass(named("com.sun.jersey.api.client.ClientRequest"))))
+                        .and(returns(extendsClass(named("com.sun.jersey.api.client.ClientResponse")))),
+                JaxRsClientV1Instrumentation.class.getName() + "$HandleAdvice",
+                JaxRsClientV1Instrumentation.class.getName() + "$HandleContextPropagationAdvice");
+    }
 
-  public static class HandleAdvice {
+    public static class HandleAdvice {
 
-    @Advice.OnMethodEnter
-    public static ContextScope onEnter(
-        @Advice.Argument(value = 0) final ClientRequest request,
-        @Advice.This final ClientHandler thisObj) {
+        @Advice.OnMethodEnter
+        public static ContextScope onEnter(
+                @Advice.Argument(value = 0) final ClientRequest request, @Advice.This final ClientHandler thisObj) {
 
-      // WARNING: this might be a chain...so we only have to trace the first in the chain.
-      final boolean isRootClientHandler = null == request.getProperties().get(DD_CONTEXT_ATTRIBUTE);
-      if (isRootClientHandler) {
-        final AgentSpan span = startSpan(JAX_RS_CLIENT.toString(), JAX_RS_CLIENT_CALL);
-        DECORATE.afterStart(span);
-        DECORATE.onRequest(span, request);
-        request.getProperties().put(DD_CONTEXT_ATTRIBUTE, span);
-        return activateSpan(span);
-      }
-      return null;
-    }
+            // WARNING: this might be a chain...so we only have to trace the first in the chain.
+            final boolean isRootClientHandler = null == request.getProperties().get(DD_CONTEXT_ATTRIBUTE);
+            if (isRootClientHandler) {
+                final AgentSpan span = startSpan(JAX_RS_CLIENT.toString(), JAX_RS_CLIENT_CALL);
+                DECORATE.afterStart(span);
+                DECORATE.onRequest(span, request);
+                request.getProperties().put(DD_CONTEXT_ATTRIBUTE, span);
+                return activateSpan(span);
+            }
+            return null;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Return final ClientResponse response,
-        @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      final AgentSpan span = spanFromScope(scope);
-      DECORATE.onResponse(span, response);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Return final ClientResponse response,
+                @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            final AgentSpan span = spanFromScope(scope);
+            DECORATE.onResponse(span, response);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class HandleContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(0) final ClientRequest request) {
-      DECORATE.injectContext(currentContext(), request.getHeaders(), SETTER);
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class HandleContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(0) final ClientRequest request) {
+            DECORATE.injectContext(currentContext(), request.getHeaders(), SETTER);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFeature.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFeature.java
index e6795fc0b92..1cbc0cfbabb 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFeature.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFeature.java
@@ -4,9 +4,9 @@
 import javax.ws.rs.core.FeatureContext;
 
 public class ClientTracingFeature implements Feature {
-  @Override
-  public boolean configure(final FeatureContext context) {
-    context.register(new ClientTracingFilter());
-    return true;
-  }
+    @Override
+    public boolean configure(final FeatureContext context) {
+        context.register(new ClientTracingFilter());
+        return true;
+    }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFilter.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFilter.java
index 45e6c04a3a0..b0cc3da12e6 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFilter.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFilter.java
@@ -19,28 +19,27 @@
 
 @Priority(Priorities.HEADER_DECORATOR)
 public class ClientTracingFilter implements ClientRequestFilter, ClientResponseFilter {
-  public static final String SPAN_PROPERTY_NAME = "datadog.trace.jax-rs-client.span";
+    public static final String SPAN_PROPERTY_NAME = "datadog.trace.jax-rs-client.span";
 
-  @Override
-  public void filter(final ClientRequestContext requestContext) {
-    final AgentSpan span = startSpan(JAX_RS_CLIENT.toString(), JAX_RS_CLIENT_CALL);
-    try (final ContextScope scope = activateSpan(span)) {
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, requestContext);
-      DECORATE.injectContext(current().with(span), requestContext.getHeaders(), SETTER);
-      requestContext.setProperty(SPAN_PROPERTY_NAME, span);
+    @Override
+    public void filter(final ClientRequestContext requestContext) {
+        final AgentSpan span = startSpan(JAX_RS_CLIENT.toString(), JAX_RS_CLIENT_CALL);
+        try (final ContextScope scope = activateSpan(span)) {
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, requestContext);
+            DECORATE.injectContext(current().with(span), requestContext.getHeaders(), SETTER);
+            requestContext.setProperty(SPAN_PROPERTY_NAME, span);
+        }
     }
-  }
 
-  @Override
-  public void filter(
-      final ClientRequestContext requestContext, final ClientResponseContext responseContext) {
-    final Object spanObj = requestContext.getProperty(SPAN_PROPERTY_NAME);
-    if (spanObj instanceof AgentSpan) {
-      final AgentSpan span = (AgentSpan) spanObj;
-      DECORATE.onResponse(span, responseContext);
-      DECORATE.beforeFinish(span);
-      span.finish();
+    @Override
+    public void filter(final ClientRequestContext requestContext, final ClientResponseContext responseContext) {
+        final Object spanObj = requestContext.getProperty(SPAN_PROPERTY_NAME);
+        if (spanObj instanceof AgentSpan) {
+            final AgentSpan span = (AgentSpan) spanObj;
+            DECORATE.onResponse(span, responseContext);
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/InjectAdapter.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/InjectAdapter.java
index 24e3f6a12b4..5c09361db3c 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/InjectAdapter.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/InjectAdapter.java
@@ -7,12 +7,11 @@
 @ParametersAreNonnullByDefault
 public final class InjectAdapter implements CarrierSetter<MultivaluedMap<String, Object>> {
 
-  public static final InjectAdapter SETTER = new InjectAdapter();
+    public static final InjectAdapter SETTER = new InjectAdapter();
 
-  @Override
-  public void set(
-      final MultivaluedMap<String, Object> headers, final String key, final String value) {
-    // Don't allow duplicates.
-    headers.putSingle(key, value);
-  }
+    @Override
+    public void set(final MultivaluedMap<String, Object> headers, final String key, final String value) {
+        // Don't allow duplicates.
+        headers.putSingle(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientDecorator.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientDecorator.java
index 5a6c8b422ad..8274d720ffd 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientDecorator.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientDecorator.java
@@ -6,46 +6,44 @@
 import javax.ws.rs.client.ClientRequestContext;
 import javax.ws.rs.client.ClientResponseContext;
 
-public class JaxRsClientDecorator
-    extends HttpClientDecorator<ClientRequestContext, ClientResponseContext> {
-  public static final CharSequence JAX_RS_CLIENT = UTF8BytesString.create("jax-rs.client");
-  public static final JaxRsClientDecorator DECORATE = new JaxRsClientDecorator();
-
-  public static final CharSequence JAX_RS_CLIENT_CALL =
-      UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jax-rs", "jaxrs", "jax-rs-client"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JAX_RS_CLIENT;
-  }
-
-  @Override
-  protected String method(final ClientRequestContext httpRequest) {
-    return httpRequest.getMethod();
-  }
-
-  @Override
-  protected URI url(final ClientRequestContext httpRequest) {
-    return httpRequest.getUri();
-  }
-
-  @Override
-  protected int status(final ClientResponseContext httpResponse) {
-    return httpResponse.getStatus();
-  }
-
-  @Override
-  protected String getRequestHeader(ClientRequestContext request, String headerName) {
-    return request.getHeaderString(headerName);
-  }
-
-  @Override
-  protected String getResponseHeader(ClientResponseContext response, String headerName) {
-    return response.getHeaderString(headerName);
-  }
+public class JaxRsClientDecorator extends HttpClientDecorator<ClientRequestContext, ClientResponseContext> {
+    public static final CharSequence JAX_RS_CLIENT = UTF8BytesString.create("jax-rs.client");
+    public static final JaxRsClientDecorator DECORATE = new JaxRsClientDecorator();
+
+    public static final CharSequence JAX_RS_CLIENT_CALL = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jax-rs", "jaxrs", "jax-rs-client"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JAX_RS_CLIENT;
+    }
+
+    @Override
+    protected String method(final ClientRequestContext httpRequest) {
+        return httpRequest.getMethod();
+    }
+
+    @Override
+    protected URI url(final ClientRequestContext httpRequest) {
+        return httpRequest.getUri();
+    }
+
+    @Override
+    protected int status(final ClientResponseContext httpResponse) {
+        return httpResponse.getStatus();
+    }
+
+    @Override
+    protected String getRequestHeader(ClientRequestContext request, String headerName) {
+        return request.getHeaderString(headerName);
+    }
+
+    @Override
+    protected String getResponseHeader(ClientResponseContext response, String headerName) {
+        return response.getHeaderString(headerName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java
index 86a527253db..aa71a5e1b26 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java
@@ -16,38 +16,37 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JaxRsClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public JaxRsClientInstrumentation() {
-    super("jax-rs", "jaxrs", "jax-rs-client");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.ws.rs.client.ClientBuilder";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("build").and(returns(hasInterface(named("javax.ws.rs.client.Client")))),
-        JaxRsClientInstrumentation.class.getName() + "$ClientBuilderAdvice");
-  }
-
-  public static class ClientBuilderAdvice {
-
-    @Advice.OnMethodExit
-    public static void registerFeature(
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Client client) {
-      // Register on the generated client instead of the builder
-      // The build() can be called multiple times and is not thread safe
-      // A client is only created once
-      client.register(ClientTracingFeature.class);
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public JaxRsClientInstrumentation() {
+        super("jax-rs", "jaxrs", "jax-rs-client");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.ws.rs.client.ClientBuilder";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("build").and(returns(hasInterface(named("javax.ws.rs.client.Client")))),
+                JaxRsClientInstrumentation.class.getName() + "$ClientBuilderAdvice");
+    }
+
+    public static class ClientBuilderAdvice {
+
+        @Advice.OnMethodExit
+        public static void registerFeature(@Advice.Return(typing = Assigner.Typing.DYNAMIC) final Client client) {
+            // Register on the generated client instead of the builder
+            // The build() can be called multiple times and is not thread safe
+            // A client is only created once
+            client.register(ClientTracingFeature.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/SpanFinishingSubscription.java b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/SpanFinishingSubscription.java
index d9d766fed04..9b87bfab6f0 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/SpanFinishingSubscription.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/SpanFinishingSubscription.java
@@ -6,26 +6,25 @@
 import rx.Subscription;
 
 public class SpanFinishingSubscription implements Subscription {
-  private final BaseDecorator decorator;
-  private final AtomicReference<AgentSpan> spanRef;
+    private final BaseDecorator decorator;
+    private final AtomicReference<AgentSpan> spanRef;
 
-  public SpanFinishingSubscription(
-      final BaseDecorator decorator, final AtomicReference<AgentSpan> spanRef) {
-    this.decorator = decorator;
-    this.spanRef = spanRef;
-  }
+    public SpanFinishingSubscription(final BaseDecorator decorator, final AtomicReference<AgentSpan> spanRef) {
+        this.decorator = decorator;
+        this.spanRef = spanRef;
+    }
 
-  @Override
-  public void unsubscribe() {
-    final AgentSpan span = spanRef.getAndSet(null);
-    if (span != null) {
-      decorator.beforeFinish(span);
-      span.finish();
+    @Override
+    public void unsubscribe() {
+        final AgentSpan span = spanRef.getAndSet(null);
+        if (span != null) {
+            decorator.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 
-  @Override
-  public boolean isUnsubscribed() {
-    return spanRef.get() == null;
-  }
+    @Override
+    public boolean isUnsubscribed() {
+        return spanRef.get() == null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java
index f88a82fa3d6..809530e1f07 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java
@@ -13,38 +13,35 @@
 
 public class TracedOnSubscribe<T> implements Observable.OnSubscribe<T> {
 
-  private final Observable.OnSubscribe<?> delegate;
-  private final CharSequence operationName;
-  private final AgentSpan parent;
-  private final BaseDecorator decorator;
-
-  public TracedOnSubscribe(
-      final Observable originalObservable,
-      final CharSequence operationName,
-      final BaseDecorator decorator) {
-    delegate = DDTracingUtil.extractOnSubscribe(originalObservable);
-    this.operationName = operationName;
-    this.decorator = decorator;
-    this.parent = activeSpan();
-  }
-
-  protected String instrumentationName() {
-    return "rxjava";
-  }
-
-  @Override
-  public void call(final Subscriber<? super T> subscriber) {
-    final AgentSpan span =
-        startSpan(
-            instrumentationName(), operationName, parent != null ? parent.spanContext() : null);
-    afterStart(span);
-
-    try (final ContextScope scope = activateSpan(span)) {
-      delegate.call(new TracedSubscriber(span, subscriber, decorator));
+    private final Observable.OnSubscribe<?> delegate;
+    private final CharSequence operationName;
+    private final AgentSpan parent;
+    private final BaseDecorator decorator;
+
+    public TracedOnSubscribe(
+            final Observable originalObservable, final CharSequence operationName, final BaseDecorator decorator) {
+        delegate = DDTracingUtil.extractOnSubscribe(originalObservable);
+        this.operationName = operationName;
+        this.decorator = decorator;
+        this.parent = activeSpan();
     }
-  }
 
-  protected void afterStart(final AgentSpan span) {
-    decorator.afterStart(span);
-  }
+    protected String instrumentationName() {
+        return "rxjava";
+    }
+
+    @Override
+    public void call(final Subscriber<? super T> subscriber) {
+        final AgentSpan span =
+                startSpan(instrumentationName(), operationName, parent != null ? parent.spanContext() : null);
+        afterStart(span);
+
+        try (final ContextScope scope = activateSpan(span)) {
+            delegate.call(new TracedSubscriber(span, subscriber, decorator));
+        }
+    }
+
+    protected void afterStart(final AgentSpan span) {
+        decorator.afterStart(span);
+    }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedSubscriber.java b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedSubscriber.java
index 9eeb30270f4..cec0a65256f 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedSubscriber.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedSubscriber.java
@@ -10,86 +10,84 @@
 
 public class TracedSubscriber<T> extends Subscriber<T> {
 
-  private final AtomicReference<AgentSpan> spanRef;
-  private final Subscriber<T> delegate;
-  private final BaseDecorator decorator;
+    private final AtomicReference<AgentSpan> spanRef;
+    private final Subscriber<T> delegate;
+    private final BaseDecorator decorator;
 
-  public TracedSubscriber(
-      final AgentSpan span, final Subscriber<T> delegate, final BaseDecorator decorator) {
-    spanRef = new AtomicReference<>(span);
-    this.delegate = delegate;
-    this.decorator = decorator;
-    final SpanFinishingSubscription subscription =
-        new SpanFinishingSubscription(decorator, spanRef);
-    delegate.add(subscription);
-  }
+    public TracedSubscriber(final AgentSpan span, final Subscriber<T> delegate, final BaseDecorator decorator) {
+        spanRef = new AtomicReference<>(span);
+        this.delegate = delegate;
+        this.decorator = decorator;
+        final SpanFinishingSubscription subscription = new SpanFinishingSubscription(decorator, spanRef);
+        delegate.add(subscription);
+    }
 
-  @Override
-  public void onStart() {
-    final AgentSpan span = spanRef.get();
-    if (span != null) {
-      try (final ContextScope scope = activateSpan(span)) {
-        delegate.onStart();
-      }
-    } else {
-      delegate.onStart();
+    @Override
+    public void onStart() {
+        final AgentSpan span = spanRef.get();
+        if (span != null) {
+            try (final ContextScope scope = activateSpan(span)) {
+                delegate.onStart();
+            }
+        } else {
+            delegate.onStart();
+        }
     }
-  }
 
-  @Override
-  public void onNext(final T value) {
-    final AgentSpan span = spanRef.get();
-    if (span != null) {
-      try (final ContextScope scope = activateSpan(span)) {
-        delegate.onNext(value);
-      } catch (final Throwable e) {
-        onError(e);
-      }
-    } else {
-      delegate.onNext(value);
+    @Override
+    public void onNext(final T value) {
+        final AgentSpan span = spanRef.get();
+        if (span != null) {
+            try (final ContextScope scope = activateSpan(span)) {
+                delegate.onNext(value);
+            } catch (final Throwable e) {
+                onError(e);
+            }
+        } else {
+            delegate.onNext(value);
+        }
     }
-  }
 
-  @Override
-  public void onCompleted() {
-    final AgentSpan span = spanRef.getAndSet(null);
-    if (span != null) {
-      boolean errored = false;
-      try (final ContextScope scope = activateSpan(span)) {
-        delegate.onCompleted();
-      } catch (final Throwable e) {
-        // Repopulate the spanRef for onError
-        spanRef.compareAndSet(null, span);
-        onError(e);
-        errored = true;
-      } finally {
-        // finish called by onError, so don't finish again.
-        if (!errored) {
-          decorator.beforeFinish(span);
-          span.finish();
+    @Override
+    public void onCompleted() {
+        final AgentSpan span = spanRef.getAndSet(null);
+        if (span != null) {
+            boolean errored = false;
+            try (final ContextScope scope = activateSpan(span)) {
+                delegate.onCompleted();
+            } catch (final Throwable e) {
+                // Repopulate the spanRef for onError
+                spanRef.compareAndSet(null, span);
+                onError(e);
+                errored = true;
+            } finally {
+                // finish called by onError, so don't finish again.
+                if (!errored) {
+                    decorator.beforeFinish(span);
+                    span.finish();
+                }
+            }
+        } else {
+            delegate.onCompleted();
         }
-      }
-    } else {
-      delegate.onCompleted();
     }
-  }
 
-  @Override
-  public void onError(final Throwable e) {
-    final AgentSpan span = spanRef.getAndSet(null);
-    if (span != null) {
-      try (final ContextScope scope = activateSpan(span)) {
-        decorator.onError(span, e);
-        delegate.onError(e);
-      } catch (final Throwable e2) {
-        decorator.onError(span, e2);
-        throw e2;
-      } finally {
-        decorator.beforeFinish(span);
-        span.finish();
-      }
-    } else {
-      delegate.onError(e);
+    @Override
+    public void onError(final Throwable e) {
+        final AgentSpan span = spanRef.getAndSet(null);
+        if (span != null) {
+            try (final ContextScope scope = activateSpan(span)) {
+                decorator.onError(span, e);
+                delegate.onError(e);
+            } catch (final Throwable e2) {
+                decorator.onError(span, e2);
+                throw e2;
+            } finally {
+                decorator.beforeFinish(span);
+                span.finish();
+            }
+        } else {
+            delegate.onError(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/rx/DDTracingUtil.java b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/rx/DDTracingUtil.java
index a877d1385ae..b49497e83b3 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/rx/DDTracingUtil.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/rx/DDTracingUtil.java
@@ -4,7 +4,7 @@
  * This class must be in the rx package in order to access the package accessible onSubscribe field.
  */
 public class DDTracingUtil {
-  public static <T> Observable.OnSubscribe<T> extractOnSubscribe(final Observable<T> observable) {
-    return observable.onSubscribe;
-  }
+    public static <T> Observable.OnSubscribe<T> extractOnSubscribe(final Observable<T> observable) {
+        return observable.onSubscribe;
+    }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/CompletableInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/CompletableInstrumentation.java
index cfed4b67c45..fc1eef81f9b 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/CompletableInstrumentation.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/CompletableInstrumentation.java
@@ -16,59 +16,57 @@
 import io.reactivex.CompletableObserver;
 import net.bytebuddy.asm.Advice;
 
-public final class CompletableInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class CompletableInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "io.reactivex.Completable";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("subscribe"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("io.reactivex.CompletableObserver"))),
-        getClass().getName() + "$PropagateParentSpanAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.reactivex.Completable";
+    }
 
-  public static class CaptureParentSpanAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onConstruct(@Advice.This final Completable completable) {
-      Context parentContext = currentContext();
-      if (parentContext != rootContext()) {
-        InstrumentationContext.get(Completable.class, Context.class)
-            .put(completable, parentContext);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("subscribe"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("io.reactivex.CompletableObserver"))),
+                getClass().getName() + "$PropagateParentSpanAdvice");
     }
-  }
 
-  public static class PropagateParentSpanAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onSubscribe(
-        @Advice.This final Completable completable,
-        @Advice.Argument(value = 0, readOnly = false) CompletableObserver observer) {
-      if (observer != null) {
-        Context parentContext =
-            InstrumentationContext.get(Completable.class, Context.class).get(completable);
-        if (parentContext != null) {
-          // wrap the observer so spans from its events treat the captured span as their parent
-          observer = new TracingCompletableObserver(observer, parentContext);
-          // attach the context here in case additional observers are created during subscribe
-          return parentContext.attach();
+    public static class CaptureParentSpanAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onConstruct(@Advice.This final Completable completable) {
+            Context parentContext = currentContext();
+            if (parentContext != rootContext()) {
+                InstrumentationContext.get(Completable.class, Context.class).put(completable, parentContext);
+            }
         }
-      }
-      return null;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    public static class PropagateParentSpanAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onSubscribe(
+                @Advice.This final Completable completable,
+                @Advice.Argument(value = 0, readOnly = false) CompletableObserver observer) {
+            if (observer != null) {
+                Context parentContext = InstrumentationContext.get(Completable.class, Context.class)
+                        .get(completable);
+                if (parentContext != null) {
+                    // wrap the observer so spans from its events treat the captured span as their parent
+                    observer = new TracingCompletableObserver(observer, parentContext);
+                    // attach the context here in case additional observers are created during subscribe
+                    return parentContext.attach();
+                }
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/FlowableInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/FlowableInstrumentation.java
index 291b8efe8fa..8be75d272cf 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/FlowableInstrumentation.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/FlowableInstrumentation.java
@@ -16,58 +16,57 @@
 import net.bytebuddy.asm.Advice;
 import org.reactivestreams.Subscriber;
 
-public final class FlowableInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class FlowableInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "io.reactivex.Flowable";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("subscribe"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("org.reactivestreams.Subscriber"))),
-        getClass().getName() + "$PropagateParentSpanAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.reactivex.Flowable";
+    }
 
-  public static class CaptureParentSpanAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onConstruct(@Advice.This final Flowable<?> flowable) {
-      Context parentContext = currentContext();
-      if (parentContext != rootContext()) {
-        InstrumentationContext.get(Flowable.class, Context.class).put(flowable, parentContext);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("subscribe"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("org.reactivestreams.Subscriber"))),
+                getClass().getName() + "$PropagateParentSpanAdvice");
     }
-  }
 
-  public static class PropagateParentSpanAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onSubscribe(
-        @Advice.This final Flowable<?> flowable,
-        @Advice.Argument(value = 0, readOnly = false) Subscriber<?> subscriber) {
-      if (subscriber != null) {
-        Context parentContext =
-            InstrumentationContext.get(Flowable.class, Context.class).get(flowable);
-        if (parentContext != null) {
-          // wrap the subscriber so spans from its events treat the captured span as their parent
-          subscriber = new TracingSubscriber<>(subscriber, parentContext);
-          // attach the context here in case additional subscribers are created during subscribe
-          return parentContext.attach();
+    public static class CaptureParentSpanAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onConstruct(@Advice.This final Flowable<?> flowable) {
+            Context parentContext = currentContext();
+            if (parentContext != rootContext()) {
+                InstrumentationContext.get(Flowable.class, Context.class).put(flowable, parentContext);
+            }
         }
-      }
-      return null;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    public static class PropagateParentSpanAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onSubscribe(
+                @Advice.This final Flowable<?> flowable,
+                @Advice.Argument(value = 0, readOnly = false) Subscriber<?> subscriber) {
+            if (subscriber != null) {
+                Context parentContext = InstrumentationContext.get(Flowable.class, Context.class)
+                        .get(flowable);
+                if (parentContext != null) {
+                    // wrap the subscriber so spans from its events treat the captured span as their parent
+                    subscriber = new TracingSubscriber<>(subscriber, parentContext);
+                    // attach the context here in case additional subscribers are created during subscribe
+                    return parentContext.attach();
+                }
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/MaybeInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/MaybeInstrumentation.java
index 2608e91873d..98f0ac69904 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/MaybeInstrumentation.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/MaybeInstrumentation.java
@@ -16,56 +16,56 @@
 import io.reactivex.MaybeObserver;
 import net.bytebuddy.asm.Advice;
 
-public final class MaybeInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  @Override
-  public String instrumentedType() {
-    return "io.reactivex.Maybe";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("subscribe"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("io.reactivex.MaybeObserver"))),
-        getClass().getName() + "$PropagateParentSpanAdvice");
-  }
+public final class MaybeInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    @Override
+    public String instrumentedType() {
+        return "io.reactivex.Maybe";
+    }
 
-  public static class CaptureParentSpanAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onConstruct(@Advice.This final Maybe<?> maybe) {
-      Context parentContext = currentContext();
-      if (parentContext != rootContext()) {
-        InstrumentationContext.get(Maybe.class, Context.class).put(maybe, parentContext);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("subscribe"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("io.reactivex.MaybeObserver"))),
+                getClass().getName() + "$PropagateParentSpanAdvice");
     }
-  }
 
-  public static class PropagateParentSpanAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onSubscribe(
-        @Advice.This final Maybe<?> maybe,
-        @Advice.Argument(value = 0, readOnly = false) MaybeObserver<?> observer) {
-      if (observer != null) {
-        Context parentContext = InstrumentationContext.get(Maybe.class, Context.class).get(maybe);
-        if (parentContext != null) {
-          // wrap the observer so spans from its events treat the captured span as their parent
-          observer = new TracingMaybeObserver<>(observer, parentContext);
-          // attach the context here in case additional observers are created during subscribe
-          return parentContext.attach();
+    public static class CaptureParentSpanAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onConstruct(@Advice.This final Maybe<?> maybe) {
+            Context parentContext = currentContext();
+            if (parentContext != rootContext()) {
+                InstrumentationContext.get(Maybe.class, Context.class).put(maybe, parentContext);
+            }
         }
-      }
-      return null;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    public static class PropagateParentSpanAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onSubscribe(
+                @Advice.This final Maybe<?> maybe,
+                @Advice.Argument(value = 0, readOnly = false) MaybeObserver<?> observer) {
+            if (observer != null) {
+                Context parentContext =
+                        InstrumentationContext.get(Maybe.class, Context.class).get(maybe);
+                if (parentContext != null) {
+                    // wrap the observer so spans from its events treat the captured span as their parent
+                    observer = new TracingMaybeObserver<>(observer, parentContext);
+                    // attach the context here in case additional observers are created during subscribe
+                    return parentContext.attach();
+                }
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/ObservableInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/ObservableInstrumentation.java
index 067dee10e52..a560d254514 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/ObservableInstrumentation.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/ObservableInstrumentation.java
@@ -16,57 +16,56 @@
 import io.reactivex.Observer;
 import net.bytebuddy.asm.Advice;
 
-public final class ObservableInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  @Override
-  public String instrumentedType() {
-    return "io.reactivex.Observable";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("subscribe"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("io.reactivex.Observer"))),
-        getClass().getName() + "$PropagateParentSpanAdvice");
-  }
+public final class ObservableInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    @Override
+    public String instrumentedType() {
+        return "io.reactivex.Observable";
+    }
 
-  public static class CaptureParentSpanAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onConstruct(@Advice.This final Observable<?> observable) {
-      Context parentContext = currentContext();
-      if (parentContext != rootContext()) {
-        InstrumentationContext.get(Observable.class, Context.class).put(observable, parentContext);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("subscribe"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("io.reactivex.Observer"))),
+                getClass().getName() + "$PropagateParentSpanAdvice");
     }
-  }
 
-  public static class PropagateParentSpanAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onSubscribe(
-        @Advice.This final Observable<?> observable,
-        @Advice.Argument(value = 0, readOnly = false) Observer<?> observer) {
-      if (observer != null) {
-        Context parentContext =
-            InstrumentationContext.get(Observable.class, Context.class).get(observable);
-        if (parentContext != null) {
-          // wrap the observer so spans from its events treat the captured span as their parent
-          observer = new TracingObserver<>(observer, parentContext);
-          // attach the context here in case additional observers are created during subscribe
-          return parentContext.attach();
+    public static class CaptureParentSpanAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onConstruct(@Advice.This final Observable<?> observable) {
+            Context parentContext = currentContext();
+            if (parentContext != rootContext()) {
+                InstrumentationContext.get(Observable.class, Context.class).put(observable, parentContext);
+            }
         }
-      }
-      return null;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    public static class PropagateParentSpanAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onSubscribe(
+                @Advice.This final Observable<?> observable,
+                @Advice.Argument(value = 0, readOnly = false) Observer<?> observer) {
+            if (observer != null) {
+                Context parentContext = InstrumentationContext.get(Observable.class, Context.class)
+                        .get(observable);
+                if (parentContext != null) {
+                    // wrap the observer so spans from its events treat the captured span as their parent
+                    observer = new TracingObserver<>(observer, parentContext);
+                    // attach the context here in case additional observers are created during subscribe
+                    return parentContext.attach();
+                }
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaAsyncResultExtension.java b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaAsyncResultExtension.java
index 0ff7026a77c..05b44c94ddb 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaAsyncResultExtension.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaAsyncResultExtension.java
@@ -11,58 +11,58 @@
 import io.reactivex.Single;
 
 public class RxJavaAsyncResultExtension implements AsyncResultExtension, EagerHelper {
-  static {
-    AsyncResultExtensions.register(new RxJavaAsyncResultExtension());
-  }
+    static {
+        AsyncResultExtensions.register(new RxJavaAsyncResultExtension());
+    }
 
-  /**
-   * Register the extension as an {@link AsyncResultExtension} using static class initialization.
-   * <br>
-   * It uses an empty static method call to ensure the class loading and the one-time-only static
-   * class initialization. This will ensure this extension will only be registered once under {@link
-   * AsyncResultExtensions}.
-   */
-  public static void init() {}
+    /**
+     * Register the extension as an {@link AsyncResultExtension} using static class initialization.
+     * <br>
+     * It uses an empty static method call to ensure the class loading and the one-time-only static
+     * class initialization. This will ensure this extension will only be registered once under {@link
+     * AsyncResultExtensions}.
+     */
+    public static void init() {}
 
-  @Override
-  public boolean supports(Class<?> result) {
-    return Completable.class.isAssignableFrom(result)
-        || Maybe.class.isAssignableFrom(result)
-        || Single.class.isAssignableFrom(result)
-        || Observable.class.isAssignableFrom(result)
-        || Flowable.class.isAssignableFrom(result);
-  }
+    @Override
+    public boolean supports(Class<?> result) {
+        return Completable.class.isAssignableFrom(result)
+                || Maybe.class.isAssignableFrom(result)
+                || Single.class.isAssignableFrom(result)
+                || Observable.class.isAssignableFrom(result)
+                || Flowable.class.isAssignableFrom(result);
+    }
 
-  @Override
-  public Object apply(Object result, AgentSpan span) {
-    if (result instanceof Completable) {
-      return ((Completable) result)
-          .doOnEvent(throwable -> onError(span, throwable))
-          .doOnDispose(span::finish);
-    } else if (result instanceof Maybe) {
-      return ((Maybe<?>) result)
-          .doOnEvent((o, throwable) -> onError(span, throwable))
-          .doOnDispose(span::finish);
-    } else if (result instanceof Single) {
-      return ((Single<?>) result)
-          .doOnEvent((o, throwable) -> onError(span, throwable))
-          .doOnDispose(span::finish);
-    } else if (result instanceof Observable) {
-      return ((Observable<?>) result)
-          .doOnComplete(span::finish)
-          .doOnError(throwable -> onError(span, throwable))
-          .doOnDispose(span::finish);
-    } else if (result instanceof Flowable) {
-      return ((Flowable<?>) result)
-          .doOnComplete(span::finish)
-          .doOnError(throwable -> onError(span, throwable))
-          .doOnCancel(span::finish);
+    @Override
+    public Object apply(Object result, AgentSpan span) {
+        if (result instanceof Completable) {
+            return ((Completable) result)
+                    .doOnEvent(throwable -> onError(span, throwable))
+                    .doOnDispose(span::finish);
+        } else if (result instanceof Maybe) {
+            return ((Maybe<?>) result)
+                    .doOnEvent((o, throwable) -> onError(span, throwable))
+                    .doOnDispose(span::finish);
+        } else if (result instanceof Single) {
+            return ((Single<?>) result)
+                    .doOnEvent((o, throwable) -> onError(span, throwable))
+                    .doOnDispose(span::finish);
+        } else if (result instanceof Observable) {
+            return ((Observable<?>) result)
+                    .doOnComplete(span::finish)
+                    .doOnError(throwable -> onError(span, throwable))
+                    .doOnDispose(span::finish);
+        } else if (result instanceof Flowable) {
+            return ((Flowable<?>) result)
+                    .doOnComplete(span::finish)
+                    .doOnError(throwable -> onError(span, throwable))
+                    .doOnCancel(span::finish);
+        }
+        return null;
     }
-    return null;
-  }
 
-  private static void onError(AgentSpan span, Throwable throwable) {
-    span.addThrowable(throwable);
-    span.finish();
-  }
+    private static void onError(AgentSpan span, Throwable throwable) {
+        span.addThrowable(throwable);
+        span.finish();
+    }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaModule.java b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaModule.java
index 67519304f8e..f049e0cc4a4 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaModule.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaModule.java
@@ -12,40 +12,40 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RxJavaModule extends InstrumenterModule.ContextTracking {
-  public RxJavaModule() {
-    super("rxjava");
-  }
+    public RxJavaModule() {
+        super("rxjava");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".TracingCompletableObserver",
-      packageName + ".TracingSubscriber",
-      packageName + ".TracingMaybeObserver",
-      packageName + ".TracingObserver",
-      packageName + ".RxJavaAsyncResultExtension",
-      packageName + ".TracingSingleObserver",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".TracingCompletableObserver",
+            packageName + ".TracingSubscriber",
+            packageName + ".TracingMaybeObserver",
+            packageName + ".TracingObserver",
+            packageName + ".RxJavaAsyncResultExtension",
+            packageName + ".TracingSingleObserver",
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    final Map<String, String> store = new HashMap<>();
-    store.put("io.reactivex.Flowable", Context.class.getName());
-    store.put("io.reactivex.Completable", Context.class.getName());
-    store.put("io.reactivex.Maybe", Context.class.getName());
-    store.put("io.reactivex.Observable", Context.class.getName());
-    store.put("io.reactivex.Single", Context.class.getName());
-    return store;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        final Map<String, String> store = new HashMap<>();
+        store.put("io.reactivex.Flowable", Context.class.getName());
+        store.put("io.reactivex.Completable", Context.class.getName());
+        store.put("io.reactivex.Maybe", Context.class.getName());
+        store.put("io.reactivex.Observable", Context.class.getName());
+        store.put("io.reactivex.Single", Context.class.getName());
+        return store;
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(
-        new CompletableInstrumentation(),
-        new FlowableInstrumentation(),
-        new MaybeInstrumentation(),
-        new ObservableInstrumentation(),
-        new SingleInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(
+                new CompletableInstrumentation(),
+                new FlowableInstrumentation(),
+                new MaybeInstrumentation(),
+                new ObservableInstrumentation(),
+                new SingleInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/SingleInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/SingleInstrumentation.java
index a94a48f2968..628b0fce35b 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/SingleInstrumentation.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/SingleInstrumentation.java
@@ -16,57 +16,57 @@
 import io.reactivex.SingleObserver;
 import net.bytebuddy.asm.Advice;
 
-public final class SingleInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class SingleInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "io.reactivex.Single";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("subscribe"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("io.reactivex.SingleObserver"))),
-        getClass().getName() + "$PropagateParentSpanAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.reactivex.Single";
+    }
 
-  public static class CaptureParentSpanAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onConstruct(@Advice.This final Single<?> single) {
-      Context parentContext = currentContext();
-      if (parentContext != rootContext()) {
-        InstrumentationContext.get(Single.class, Context.class).put(single, parentContext);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("subscribe"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("io.reactivex.SingleObserver"))),
+                getClass().getName() + "$PropagateParentSpanAdvice");
     }
-  }
 
-  public static class PropagateParentSpanAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onSubscribe(
-        @Advice.This final Single<?> single,
-        @Advice.Argument(value = 0, readOnly = false) SingleObserver<?> observer) {
-      if (observer != null) {
-        Context parentContext = InstrumentationContext.get(Single.class, Context.class).get(single);
-        if (parentContext != null) {
-          // wrap the observer so spans from its events treat the captured span as their parent
-          observer = new TracingSingleObserver<>(observer, parentContext);
-          // attach the context here in case additional observers are created during subscribe
-          return parentContext.attach();
+    public static class CaptureParentSpanAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onConstruct(@Advice.This final Single<?> single) {
+            Context parentContext = currentContext();
+            if (parentContext != rootContext()) {
+                InstrumentationContext.get(Single.class, Context.class).put(single, parentContext);
+            }
         }
-      }
-      return null;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    public static class PropagateParentSpanAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onSubscribe(
+                @Advice.This final Single<?> single,
+                @Advice.Argument(value = 0, readOnly = false) SingleObserver<?> observer) {
+            if (observer != null) {
+                Context parentContext =
+                        InstrumentationContext.get(Single.class, Context.class).get(single);
+                if (parentContext != null) {
+                    // wrap the observer so spans from its events treat the captured span as their parent
+                    observer = new TracingSingleObserver<>(observer, parentContext);
+                    // attach the context here in case additional observers are created during subscribe
+                    return parentContext.attach();
+                }
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingCompletableObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingCompletableObserver.java
index 955994ed4cc..294a139543b 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingCompletableObserver.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingCompletableObserver.java
@@ -8,31 +8,31 @@
 
 /** Wrapper that makes sure spans from observer events treat the captured span as their parent. */
 public final class TracingCompletableObserver implements CompletableObserver {
-  private final CompletableObserver observer;
-  private final Context parentContext;
+    private final CompletableObserver observer;
+    private final Context parentContext;
 
-  public TracingCompletableObserver(
-      @Nonnull final CompletableObserver observer, @Nonnull final Context parentContext) {
-    this.observer = observer;
-    this.parentContext = parentContext;
-  }
+    public TracingCompletableObserver(
+            @Nonnull final CompletableObserver observer, @Nonnull final Context parentContext) {
+        this.observer = observer;
+        this.parentContext = parentContext;
+    }
 
-  @Override
-  public void onSubscribe(final Disposable d) {
-    observer.onSubscribe(d);
-  }
+    @Override
+    public void onSubscribe(final Disposable d) {
+        observer.onSubscribe(d);
+    }
 
-  @Override
-  public void onError(final Throwable e) {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onError(e);
+    @Override
+    public void onError(final Throwable e) {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onError(e);
+        }
     }
-  }
 
-  @Override
-  public void onComplete() {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onComplete();
+    @Override
+    public void onComplete() {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onComplete();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingMaybeObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingMaybeObserver.java
index c82d8690189..44d8fbff93c 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingMaybeObserver.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingMaybeObserver.java
@@ -8,38 +8,37 @@
 
 /** Wrapper that makes sure spans from observer events treat the captured span as their parent. */
 public final class TracingMaybeObserver<T> implements MaybeObserver<T> {
-  private final MaybeObserver<T> observer;
-  private final Context parentContext;
+    private final MaybeObserver<T> observer;
+    private final Context parentContext;
 
-  public TracingMaybeObserver(
-      @Nonnull final MaybeObserver<T> observer, @Nonnull final Context parentContext) {
-    this.observer = observer;
-    this.parentContext = parentContext;
-  }
+    public TracingMaybeObserver(@Nonnull final MaybeObserver<T> observer, @Nonnull final Context parentContext) {
+        this.observer = observer;
+        this.parentContext = parentContext;
+    }
 
-  @Override
-  public void onSubscribe(final Disposable d) {
-    observer.onSubscribe(d);
-  }
+    @Override
+    public void onSubscribe(final Disposable d) {
+        observer.onSubscribe(d);
+    }
 
-  @Override
-  public void onSuccess(final T value) {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onSuccess(value);
+    @Override
+    public void onSuccess(final T value) {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onSuccess(value);
+        }
     }
-  }
 
-  @Override
-  public void onError(final Throwable e) {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onError(e);
+    @Override
+    public void onError(final Throwable e) {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onError(e);
+        }
     }
-  }
 
-  @Override
-  public void onComplete() {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onComplete();
+    @Override
+    public void onComplete() {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onComplete();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingObserver.java
index 864191ac2d9..2c0b5aaa925 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingObserver.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingObserver.java
@@ -7,37 +7,37 @@
 
 /** Wrapper that makes sure spans from observer events treat the captured span as their parent. */
 public final class TracingObserver<T> implements Observer<T> {
-  private final Observer<T> observer;
-  private final Context parentContext;
+    private final Observer<T> observer;
+    private final Context parentContext;
 
-  public TracingObserver(final Observer<T> observer, final Context parentContext) {
-    this.observer = observer;
-    this.parentContext = parentContext;
-  }
+    public TracingObserver(final Observer<T> observer, final Context parentContext) {
+        this.observer = observer;
+        this.parentContext = parentContext;
+    }
 
-  @Override
-  public void onSubscribe(final Disposable d) {
-    observer.onSubscribe(d);
-  }
+    @Override
+    public void onSubscribe(final Disposable d) {
+        observer.onSubscribe(d);
+    }
 
-  @Override
-  public void onNext(final T value) {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onNext(value);
+    @Override
+    public void onNext(final T value) {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onNext(value);
+        }
     }
-  }
 
-  @Override
-  public void onError(final Throwable e) {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onError(e);
+    @Override
+    public void onError(final Throwable e) {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onError(e);
+        }
     }
-  }
 
-  @Override
-  public void onComplete() {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onComplete();
+    @Override
+    public void onComplete() {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onComplete();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingSingleObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingSingleObserver.java
index 386e1d6fd0b..e885213bc0f 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingSingleObserver.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingSingleObserver.java
@@ -8,31 +8,30 @@
 
 /** Wrapper that makes sure spans from observer events treat the captured span as their parent. */
 public final class TracingSingleObserver<T> implements SingleObserver<T> {
-  private final SingleObserver<T> observer;
-  private final Context parentContext;
+    private final SingleObserver<T> observer;
+    private final Context parentContext;
 
-  public TracingSingleObserver(
-      @Nonnull final SingleObserver<T> observer, @Nonnull final Context parentContext) {
-    this.observer = observer;
-    this.parentContext = parentContext;
-  }
+    public TracingSingleObserver(@Nonnull final SingleObserver<T> observer, @Nonnull final Context parentContext) {
+        this.observer = observer;
+        this.parentContext = parentContext;
+    }
 
-  @Override
-  public void onSubscribe(final Disposable d) {
-    observer.onSubscribe(d);
-  }
+    @Override
+    public void onSubscribe(final Disposable d) {
+        observer.onSubscribe(d);
+    }
 
-  @Override
-  public void onSuccess(final T value) {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onSuccess(value);
+    @Override
+    public void onSuccess(final T value) {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onSuccess(value);
+        }
     }
-  }
 
-  @Override
-  public void onError(final Throwable e) {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onError(e);
+    @Override
+    public void onError(final Throwable e) {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onError(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingSubscriber.java b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingSubscriber.java
index b38addfcdcb..e5e8030fc4f 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingSubscriber.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/TracingSubscriber.java
@@ -8,38 +8,37 @@
 
 /** Wrapper that makes sure spans from subscriber events treat the captured span as their parent. */
 public final class TracingSubscriber<T> implements Subscriber<T> {
-  private final Subscriber<T> subscriber;
-  private final Context parentContext;
+    private final Subscriber<T> subscriber;
+    private final Context parentContext;
 
-  public TracingSubscriber(
-      @Nonnull final Subscriber<T> subscriber, @Nonnull final Context parentContext) {
-    this.subscriber = subscriber;
-    this.parentContext = parentContext;
-  }
+    public TracingSubscriber(@Nonnull final Subscriber<T> subscriber, @Nonnull final Context parentContext) {
+        this.subscriber = subscriber;
+        this.parentContext = parentContext;
+    }
 
-  @Override
-  public void onSubscribe(final Subscription subscription) {
-    subscriber.onSubscribe(subscription);
-  }
+    @Override
+    public void onSubscribe(final Subscription subscription) {
+        subscriber.onSubscribe(subscription);
+    }
 
-  @Override
-  public void onNext(final T value) {
-    try (final ContextScope scope = parentContext.attach()) {
-      subscriber.onNext(value);
+    @Override
+    public void onNext(final T value) {
+        try (final ContextScope scope = parentContext.attach()) {
+            subscriber.onNext(value);
+        }
     }
-  }
 
-  @Override
-  public void onError(final Throwable e) {
-    try (final ContextScope scope = parentContext.attach()) {
-      subscriber.onError(e);
+    @Override
+    public void onError(final Throwable e) {
+        try (final ContextScope scope = parentContext.attach()) {
+            subscriber.onError(e);
+        }
     }
-  }
 
-  @Override
-  public void onComplete() {
-    try (final ContextScope scope = parentContext.attach()) {
-      subscriber.onComplete();
+    @Override
+    public void onComplete() {
+        try (final ContextScope scope = parentContext.attach()) {
+            subscriber.onComplete();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/test/java/annotatedsample/RxJava2TracedMethods.java b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/test/java/annotatedsample/RxJava2TracedMethods.java
index 5036f5e0ff7..c15523ed621 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/test/java/annotatedsample/RxJava2TracedMethods.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/test/java/annotatedsample/RxJava2TracedMethods.java
@@ -11,102 +11,90 @@
 import java.util.concurrent.CountDownLatch;
 
 public class RxJava2TracedMethods {
-  @WithSpan
-  public static Completable traceAsyncCompletable(CountDownLatch latch) {
-    return Completable.fromRunnable(() -> await(latch));
-  }
+    @WithSpan
+    public static Completable traceAsyncCompletable(CountDownLatch latch) {
+        return Completable.fromRunnable(() -> await(latch));
+    }
 
-  @WithSpan
-  public static Completable traceAsyncFailingCompletable(
-      CountDownLatch latch, Exception exception) {
-    return Completable.fromCallable(
-        () -> {
-          await(latch);
-          throw exception;
+    @WithSpan
+    public static Completable traceAsyncFailingCompletable(CountDownLatch latch, Exception exception) {
+        return Completable.fromCallable(() -> {
+            await(latch);
+            throw exception;
         });
-  }
+    }
 
-  @WithSpan
-  public static Maybe<String> traceAsyncMaybe(CountDownLatch latch) {
-    return Maybe.fromCallable(
-        () -> {
-          await(latch);
-          return "hello";
+    @WithSpan
+    public static Maybe<String> traceAsyncMaybe(CountDownLatch latch) {
+        return Maybe.fromCallable(() -> {
+            await(latch);
+            return "hello";
         });
-  }
+    }
 
-  @WithSpan
-  public static Maybe<String> traceAsyncFailingMaybe(CountDownLatch latch, Exception exception) {
-    return Maybe.fromCallable(
-        () -> {
-          await(latch);
-          throw exception;
+    @WithSpan
+    public static Maybe<String> traceAsyncFailingMaybe(CountDownLatch latch, Exception exception) {
+        return Maybe.fromCallable(() -> {
+            await(latch);
+            throw exception;
         });
-  }
+    }
 
-  @WithSpan
-  public static Single<String> traceAsyncSingle(CountDownLatch latch) {
-    return Single.fromCallable(
-        () -> {
-          await(latch);
-          return "hello";
+    @WithSpan
+    public static Single<String> traceAsyncSingle(CountDownLatch latch) {
+        return Single.fromCallable(() -> {
+            await(latch);
+            return "hello";
         });
-  }
+    }
 
-  @WithSpan
-  public static Single<String> traceAsyncFailingSingle(CountDownLatch latch, Exception exception) {
-    return Single.fromCallable(
-        () -> {
-          await(latch);
-          throw exception;
+    @WithSpan
+    public static Single<String> traceAsyncFailingSingle(CountDownLatch latch, Exception exception) {
+        return Single.fromCallable(() -> {
+            await(latch);
+            throw exception;
         });
-  }
+    }
 
-  @WithSpan
-  public static Observable<String> traceAsyncObservable(CountDownLatch latch) {
-    return Observable.fromCallable(
-        () -> {
-          await(latch);
-          return "hello";
+    @WithSpan
+    public static Observable<String> traceAsyncObservable(CountDownLatch latch) {
+        return Observable.fromCallable(() -> {
+            await(latch);
+            return "hello";
         });
-  }
+    }
 
-  @WithSpan
-  public static Observable<String> traceAsyncFailingObservable(
-      CountDownLatch latch, Exception exception) {
-    return Observable.fromCallable(
-        () -> {
-          await(latch);
-          throw exception;
+    @WithSpan
+    public static Observable<String> traceAsyncFailingObservable(CountDownLatch latch, Exception exception) {
+        return Observable.fromCallable(() -> {
+            await(latch);
+            throw exception;
         });
-  }
+    }
 
-  @WithSpan
-  public static Flowable<String> traceAsyncFlowable(CountDownLatch latch) {
-    return Flowable.fromCallable(
-        () -> {
-          await(latch);
-          return "hello";
+    @WithSpan
+    public static Flowable<String> traceAsyncFlowable(CountDownLatch latch) {
+        return Flowable.fromCallable(() -> {
+            await(latch);
+            return "hello";
         });
-  }
+    }
 
-  @WithSpan
-  public static Flowable<String> traceAsyncFailingFlowable(
-      CountDownLatch latch, Exception exception) {
-    return Flowable.fromCallable(
-        () -> {
-          await(latch);
-          throw exception;
+    @WithSpan
+    public static Flowable<String> traceAsyncFailingFlowable(CountDownLatch latch, Exception exception) {
+        return Flowable.fromCallable(() -> {
+            await(latch);
+            throw exception;
         });
-  }
+    }
 
-  private static void await(CountDownLatch latch) {
-    try {
-      if (!latch.await(5, SECONDS)) {
-        throw new IllegalStateException("Latch still locked");
-      }
-    } catch (InterruptedException e) {
-      throw new RuntimeException(e);
+    private static void await(CountDownLatch latch) {
+        try {
+            if (!latch.await(5, SECONDS)) {
+                throw new IllegalStateException("Latch still locked");
+            }
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java
index a77e46fe698..24832ab27d8 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java
@@ -16,58 +16,56 @@
 import io.reactivex.rxjava3.core.CompletableObserver;
 import net.bytebuddy.asm.Advice;
 
-public final class CompletableInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class CompletableInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "io.reactivex.rxjava3.core.Completable";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("subscribe"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("io.reactivex.rxjava3.core.CompletableObserver"))),
-        getClass().getName() + "$PropagateParentSpanAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.reactivex.rxjava3.core.Completable";
+    }
 
-  public static class CaptureParentSpanAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onConstruct(@Advice.This final Completable completable) {
-      Context parentContext = currentContext();
-      if (parentContext != rootContext()) {
-        InstrumentationContext.get(Completable.class, Context.class)
-            .put(completable, parentContext);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("subscribe"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("io.reactivex.rxjava3.core.CompletableObserver"))),
+                getClass().getName() + "$PropagateParentSpanAdvice");
     }
-  }
 
-  public static class PropagateParentSpanAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onSubscribe(
-        @Advice.This final Completable completable,
-        @Advice.Argument(value = 0, readOnly = false) CompletableObserver observer) {
-      if (observer != null) {
-        Context parentContext =
-            InstrumentationContext.get(Completable.class, Context.class).get(completable);
-        if (parentContext != null) {
-          observer = new TracingCompletableObserver(observer, parentContext);
-          // attach the context here in case additional observers are created during subscribe
-          return parentContext.attach();
+    public static class CaptureParentSpanAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onConstruct(@Advice.This final Completable completable) {
+            Context parentContext = currentContext();
+            if (parentContext != rootContext()) {
+                InstrumentationContext.get(Completable.class, Context.class).put(completable, parentContext);
+            }
         }
-      }
-      return null;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    public static class PropagateParentSpanAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onSubscribe(
+                @Advice.This final Completable completable,
+                @Advice.Argument(value = 0, readOnly = false) CompletableObserver observer) {
+            if (observer != null) {
+                Context parentContext = InstrumentationContext.get(Completable.class, Context.class)
+                        .get(completable);
+                if (parentContext != null) {
+                    observer = new TracingCompletableObserver(observer, parentContext);
+                    // attach the context here in case additional observers are created during subscribe
+                    return parentContext.attach();
+                }
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java
index 35f06daed79..20e1d1bb589 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java
@@ -16,57 +16,56 @@
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 import net.bytebuddy.asm.Advice;
 
-public final class FlowableInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class FlowableInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "io.reactivex.rxjava3.core.Flowable";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("subscribe"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("io.reactivex.rxjava3.core.FlowableSubscriber"))),
-        getClass().getName() + "$PropagateParentSpanAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.reactivex.rxjava3.core.Flowable";
+    }
 
-  public static class CaptureParentSpanAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onConstruct(@Advice.This final Flowable<?> flowable) {
-      Context parentContext = currentContext();
-      if (parentContext != rootContext()) {
-        InstrumentationContext.get(Flowable.class, Context.class).put(flowable, parentContext);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("subscribe"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("io.reactivex.rxjava3.core.FlowableSubscriber"))),
+                getClass().getName() + "$PropagateParentSpanAdvice");
     }
-  }
 
-  public static class PropagateParentSpanAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onSubscribe(
-        @Advice.This final Flowable<?> flowable,
-        @Advice.Argument(value = 0, readOnly = false) FlowableSubscriber<?> subscriber) {
-      if (subscriber != null) {
-        Context parentContext =
-            InstrumentationContext.get(Flowable.class, Context.class).get(flowable);
-        if (parentContext != null) {
-          subscriber = new TracingSubscriber<>(subscriber, parentContext);
-          // attach the context here in case additional subscribers are created during subscribe
-          return parentContext.attach();
+    public static class CaptureParentSpanAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onConstruct(@Advice.This final Flowable<?> flowable) {
+            Context parentContext = currentContext();
+            if (parentContext != rootContext()) {
+                InstrumentationContext.get(Flowable.class, Context.class).put(flowable, parentContext);
+            }
         }
-      }
-      return null;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    public static class PropagateParentSpanAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onSubscribe(
+                @Advice.This final Flowable<?> flowable,
+                @Advice.Argument(value = 0, readOnly = false) FlowableSubscriber<?> subscriber) {
+            if (subscriber != null) {
+                Context parentContext = InstrumentationContext.get(Flowable.class, Context.class)
+                        .get(flowable);
+                if (parentContext != null) {
+                    subscriber = new TracingSubscriber<>(subscriber, parentContext);
+                    // attach the context here in case additional subscribers are created during subscribe
+                    return parentContext.attach();
+                }
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java
index 0bc833922be..3008d32ec71 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java
@@ -16,55 +16,55 @@
 import io.reactivex.rxjava3.core.MaybeObserver;
 import net.bytebuddy.asm.Advice;
 
-public final class MaybeInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  @Override
-  public String instrumentedType() {
-    return "io.reactivex.rxjava3.core.Maybe";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("subscribe"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("io.reactivex.rxjava3.core.MaybeObserver"))),
-        getClass().getName() + "$PropagateParentSpanAdvice");
-  }
+public final class MaybeInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    @Override
+    public String instrumentedType() {
+        return "io.reactivex.rxjava3.core.Maybe";
+    }
 
-  public static class CaptureParentSpanAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onConstruct(@Advice.This final Maybe<?> maybe) {
-      Context parentContext = currentContext();
-      if (parentContext != rootContext()) {
-        InstrumentationContext.get(Maybe.class, Context.class).put(maybe, parentContext);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("subscribe"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("io.reactivex.rxjava3.core.MaybeObserver"))),
+                getClass().getName() + "$PropagateParentSpanAdvice");
     }
-  }
 
-  public static class PropagateParentSpanAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onSubscribe(
-        @Advice.This final Maybe<?> maybe,
-        @Advice.Argument(value = 0, readOnly = false) MaybeObserver<?> observer) {
-      if (observer != null) {
-        Context parentContext = InstrumentationContext.get(Maybe.class, Context.class).get(maybe);
-        if (parentContext != null) {
-          observer = new TracingMaybeObserver<>(observer, parentContext);
-          // attach the context here in case additional observers are created during subscribe
-          return parentContext.attach();
+    public static class CaptureParentSpanAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onConstruct(@Advice.This final Maybe<?> maybe) {
+            Context parentContext = currentContext();
+            if (parentContext != rootContext()) {
+                InstrumentationContext.get(Maybe.class, Context.class).put(maybe, parentContext);
+            }
         }
-      }
-      return null;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    public static class PropagateParentSpanAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onSubscribe(
+                @Advice.This final Maybe<?> maybe,
+                @Advice.Argument(value = 0, readOnly = false) MaybeObserver<?> observer) {
+            if (observer != null) {
+                Context parentContext =
+                        InstrumentationContext.get(Maybe.class, Context.class).get(maybe);
+                if (parentContext != null) {
+                    observer = new TracingMaybeObserver<>(observer, parentContext);
+                    // attach the context here in case additional observers are created during subscribe
+                    return parentContext.attach();
+                }
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java
index 304b710aa87..f336d75985f 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java
@@ -16,56 +16,55 @@
 import io.reactivex.rxjava3.core.Observer;
 import net.bytebuddy.asm.Advice;
 
-public final class ObservableInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  @Override
-  public String instrumentedType() {
-    return "io.reactivex.rxjava3.core.Observable";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("subscribe"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("io.reactivex.rxjava3.core.Observer"))),
-        getClass().getName() + "$PropagateParentSpanAdvice");
-  }
+public final class ObservableInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    @Override
+    public String instrumentedType() {
+        return "io.reactivex.rxjava3.core.Observable";
+    }
 
-  public static class CaptureParentSpanAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onConstruct(@Advice.This final Observable<?> observable) {
-      Context parentContext = currentContext();
-      if (parentContext != rootContext()) {
-        InstrumentationContext.get(Observable.class, Context.class).put(observable, parentContext);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("subscribe"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("io.reactivex.rxjava3.core.Observer"))),
+                getClass().getName() + "$PropagateParentSpanAdvice");
     }
-  }
 
-  public static class PropagateParentSpanAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onSubscribe(
-        @Advice.This final Observable<?> observable,
-        @Advice.Argument(value = 0, readOnly = false) Observer<?> observer) {
-      if (observer != null) {
-        Context parentContext =
-            InstrumentationContext.get(Observable.class, Context.class).get(observable);
-        if (parentContext != null) {
-          observer = new TracingObserver<>(observer, parentContext);
-          // attach the context here in case additional observers are created during subscribe
-          return parentContext.attach();
+    public static class CaptureParentSpanAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onConstruct(@Advice.This final Observable<?> observable) {
+            Context parentContext = currentContext();
+            if (parentContext != rootContext()) {
+                InstrumentationContext.get(Observable.class, Context.class).put(observable, parentContext);
+            }
         }
-      }
-      return null;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    public static class PropagateParentSpanAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onSubscribe(
+                @Advice.This final Observable<?> observable,
+                @Advice.Argument(value = 0, readOnly = false) Observer<?> observer) {
+            if (observer != null) {
+                Context parentContext = InstrumentationContext.get(Observable.class, Context.class)
+                        .get(observable);
+                if (parentContext != null) {
+                    observer = new TracingObserver<>(observer, parentContext);
+                    // attach the context here in case additional observers are created during subscribe
+                    return parentContext.attach();
+                }
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaAsyncResultExtension.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaAsyncResultExtension.java
index 26ad58cfcf3..304024c0bbd 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaAsyncResultExtension.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaAsyncResultExtension.java
@@ -11,58 +11,58 @@
 import io.reactivex.rxjava3.core.Single;
 
 public class RxJavaAsyncResultExtension implements AsyncResultExtension, EagerHelper {
-  static {
-    AsyncResultExtensions.register(new RxJavaAsyncResultExtension());
-  }
+    static {
+        AsyncResultExtensions.register(new RxJavaAsyncResultExtension());
+    }
 
-  /**
-   * Register the extension as an {@link AsyncResultExtension} using static class initialization.
-   * <br>
-   * It uses an empty static method call to ensure the class loading and the one-time-only static
-   * class initialization. This will ensure this extension will only be registered once under {@link
-   * AsyncResultExtensions}.
-   */
-  public static void init() {}
+    /**
+     * Register the extension as an {@link AsyncResultExtension} using static class initialization.
+     * <br>
+     * It uses an empty static method call to ensure the class loading and the one-time-only static
+     * class initialization. This will ensure this extension will only be registered once under {@link
+     * AsyncResultExtensions}.
+     */
+    public static void init() {}
 
-  @Override
-  public boolean supports(Class<?> result) {
-    return Completable.class.isAssignableFrom(result)
-        || Maybe.class.isAssignableFrom(result)
-        || Single.class.isAssignableFrom(result)
-        || Observable.class.isAssignableFrom(result)
-        || Flowable.class.isAssignableFrom(result);
-  }
+    @Override
+    public boolean supports(Class<?> result) {
+        return Completable.class.isAssignableFrom(result)
+                || Maybe.class.isAssignableFrom(result)
+                || Single.class.isAssignableFrom(result)
+                || Observable.class.isAssignableFrom(result)
+                || Flowable.class.isAssignableFrom(result);
+    }
 
-  @Override
-  public Object apply(Object result, AgentSpan span) {
-    if (result instanceof Completable) {
-      return ((Completable) result)
-          .doOnEvent(throwable -> onError(span, throwable))
-          .doOnDispose(span::finish);
-    } else if (result instanceof Maybe) {
-      return ((Maybe<?>) result)
-          .doOnEvent((o, throwable) -> onError(span, throwable))
-          .doOnDispose(span::finish);
-    } else if (result instanceof Single) {
-      return ((Single<?>) result)
-          .doOnEvent((o, throwable) -> onError(span, throwable))
-          .doOnDispose(span::finish);
-    } else if (result instanceof Observable) {
-      return ((Observable<?>) result)
-          .doOnComplete(span::finish)
-          .doOnError(throwable -> onError(span, throwable))
-          .doOnDispose(span::finish);
-    } else if (result instanceof Flowable) {
-      return ((Flowable<?>) result)
-          .doOnComplete(span::finish)
-          .doOnError(throwable -> onError(span, throwable))
-          .doOnCancel(span::finish);
+    @Override
+    public Object apply(Object result, AgentSpan span) {
+        if (result instanceof Completable) {
+            return ((Completable) result)
+                    .doOnEvent(throwable -> onError(span, throwable))
+                    .doOnDispose(span::finish);
+        } else if (result instanceof Maybe) {
+            return ((Maybe<?>) result)
+                    .doOnEvent((o, throwable) -> onError(span, throwable))
+                    .doOnDispose(span::finish);
+        } else if (result instanceof Single) {
+            return ((Single<?>) result)
+                    .doOnEvent((o, throwable) -> onError(span, throwable))
+                    .doOnDispose(span::finish);
+        } else if (result instanceof Observable) {
+            return ((Observable<?>) result)
+                    .doOnComplete(span::finish)
+                    .doOnError(throwable -> onError(span, throwable))
+                    .doOnDispose(span::finish);
+        } else if (result instanceof Flowable) {
+            return ((Flowable<?>) result)
+                    .doOnComplete(span::finish)
+                    .doOnError(throwable -> onError(span, throwable))
+                    .doOnCancel(span::finish);
+        }
+        return null;
     }
-    return null;
-  }
 
-  private static void onError(AgentSpan span, Throwable throwable) {
-    span.addThrowable(throwable);
-    span.finish();
-  }
+    private static void onError(AgentSpan span, Throwable throwable) {
+        span.addThrowable(throwable);
+        span.finish();
+    }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaModule.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaModule.java
index 69cfb0e833a..9de877917ed 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaModule.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaModule.java
@@ -12,41 +12,41 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RxJavaModule extends InstrumenterModule.ContextTracking {
-  public RxJavaModule() {
-    super("rxjava", "rxjava-3");
-  }
+    public RxJavaModule() {
+        super("rxjava", "rxjava-3");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".TracingCompletableObserver",
-      packageName + ".TracingSubscriber",
-      packageName + ".TracingMaybeObserver",
-      packageName + ".TracingObserver",
-      packageName + ".RxJavaAsyncResultExtension",
-      packageName + ".TracingSingleObserver",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".TracingCompletableObserver",
+            packageName + ".TracingSubscriber",
+            packageName + ".TracingMaybeObserver",
+            packageName + ".TracingObserver",
+            packageName + ".RxJavaAsyncResultExtension",
+            packageName + ".TracingSingleObserver",
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    String contextClass = Context.class.getName();
-    final Map<String, String> store = new HashMap<>();
-    store.put("io.reactivex.rxjava3.core.Flowable", contextClass);
-    store.put("io.reactivex.rxjava3.core.Completable", contextClass);
-    store.put("io.reactivex.rxjava3.core.Maybe", contextClass);
-    store.put("io.reactivex.rxjava3.core.Observable", contextClass);
-    store.put("io.reactivex.rxjava3.core.Single", contextClass);
-    return store;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        String contextClass = Context.class.getName();
+        final Map<String, String> store = new HashMap<>();
+        store.put("io.reactivex.rxjava3.core.Flowable", contextClass);
+        store.put("io.reactivex.rxjava3.core.Completable", contextClass);
+        store.put("io.reactivex.rxjava3.core.Maybe", contextClass);
+        store.put("io.reactivex.rxjava3.core.Observable", contextClass);
+        store.put("io.reactivex.rxjava3.core.Single", contextClass);
+        return store;
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(
-        new CompletableInstrumentation(),
-        new FlowableInstrumentation(),
-        new MaybeInstrumentation(),
-        new ObservableInstrumentation(),
-        new SingleInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(
+                new CompletableInstrumentation(),
+                new FlowableInstrumentation(),
+                new MaybeInstrumentation(),
+                new ObservableInstrumentation(),
+                new SingleInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/SingleInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/SingleInstrumentation.java
index 3dfc1382da2..0b96987e4a4 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/SingleInstrumentation.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/SingleInstrumentation.java
@@ -16,56 +16,56 @@
 import io.reactivex.rxjava3.core.SingleObserver;
 import net.bytebuddy.asm.Advice;
 
-public final class SingleInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class SingleInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "io.reactivex.rxjava3.core.Single";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("subscribe"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("io.reactivex.rxjava3.core.SingleObserver"))),
-        getClass().getName() + "$PropagateParentSpanAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.reactivex.rxjava3.core.Single";
+    }
 
-  public static class CaptureParentSpanAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onConstruct(@Advice.This final Single<?> single) {
-      Context parentContext = currentContext();
-      if (parentContext != rootContext()) {
-        InstrumentationContext.get(Single.class, Context.class).put(single, parentContext);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("subscribe"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("io.reactivex.rxjava3.core.SingleObserver"))),
+                getClass().getName() + "$PropagateParentSpanAdvice");
     }
-  }
 
-  public static class PropagateParentSpanAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onSubscribe(
-        @Advice.This final Single<?> single,
-        @Advice.Argument(value = 0, readOnly = false) SingleObserver<?> observer) {
-      if (observer != null) {
-        Context parentContext = InstrumentationContext.get(Single.class, Context.class).get(single);
-        if (parentContext != null) {
-          observer = new TracingSingleObserver<>(observer, parentContext);
-          // attach the context here in case additional observers are created during subscribe
-          return parentContext.attach();
+    public static class CaptureParentSpanAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onConstruct(@Advice.This final Single<?> single) {
+            Context parentContext = currentContext();
+            if (parentContext != rootContext()) {
+                InstrumentationContext.get(Single.class, Context.class).put(single, parentContext);
+            }
         }
-      }
-      return null;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    public static class PropagateParentSpanAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onSubscribe(
+                @Advice.This final Single<?> single,
+                @Advice.Argument(value = 0, readOnly = false) SingleObserver<?> observer) {
+            if (observer != null) {
+                Context parentContext =
+                        InstrumentationContext.get(Single.class, Context.class).get(single);
+                if (parentContext != null) {
+                    observer = new TracingSingleObserver<>(observer, parentContext);
+                    // attach the context here in case additional observers are created during subscribe
+                    return parentContext.attach();
+                }
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingCompletableObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingCompletableObserver.java
index 8a0dd7254e1..1277b57f105 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingCompletableObserver.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingCompletableObserver.java
@@ -8,31 +8,31 @@
 
 /** Wrapper that makes sure spans from observer events treat the captured span as their parent. */
 public final class TracingCompletableObserver implements CompletableObserver {
-  private final CompletableObserver observer;
-  private final Context parentContext;
+    private final CompletableObserver observer;
+    private final Context parentContext;
 
-  public TracingCompletableObserver(
-      @Nonnull final CompletableObserver observer, @Nonnull final Context parentContext) {
-    this.observer = observer;
-    this.parentContext = parentContext;
-  }
+    public TracingCompletableObserver(
+            @Nonnull final CompletableObserver observer, @Nonnull final Context parentContext) {
+        this.observer = observer;
+        this.parentContext = parentContext;
+    }
 
-  @Override
-  public void onSubscribe(final Disposable d) {
-    observer.onSubscribe(d);
-  }
+    @Override
+    public void onSubscribe(final Disposable d) {
+        observer.onSubscribe(d);
+    }
 
-  @Override
-  public void onError(final Throwable e) {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onError(e);
+    @Override
+    public void onError(final Throwable e) {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onError(e);
+        }
     }
-  }
 
-  @Override
-  public void onComplete() {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onComplete();
+    @Override
+    public void onComplete() {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onComplete();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingMaybeObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingMaybeObserver.java
index 0cbf34c61e4..d58f328fd0d 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingMaybeObserver.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingMaybeObserver.java
@@ -8,38 +8,37 @@
 
 /** Wrapper that makes sure spans from observer events treat the captured span as their parent. */
 public final class TracingMaybeObserver<T> implements MaybeObserver<T> {
-  private final MaybeObserver<T> observer;
-  private final Context parentContext;
+    private final MaybeObserver<T> observer;
+    private final Context parentContext;
 
-  public TracingMaybeObserver(
-      @Nonnull final MaybeObserver<T> observer, @Nonnull final Context parentContext) {
-    this.observer = observer;
-    this.parentContext = parentContext;
-  }
+    public TracingMaybeObserver(@Nonnull final MaybeObserver<T> observer, @Nonnull final Context parentContext) {
+        this.observer = observer;
+        this.parentContext = parentContext;
+    }
 
-  @Override
-  public void onSubscribe(final Disposable d) {
-    observer.onSubscribe(d);
-  }
+    @Override
+    public void onSubscribe(final Disposable d) {
+        observer.onSubscribe(d);
+    }
 
-  @Override
-  public void onSuccess(final T value) {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onSuccess(value);
+    @Override
+    public void onSuccess(final T value) {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onSuccess(value);
+        }
     }
-  }
 
-  @Override
-  public void onError(final Throwable e) {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onError(e);
+    @Override
+    public void onError(final Throwable e) {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onError(e);
+        }
     }
-  }
 
-  @Override
-  public void onComplete() {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onComplete();
+    @Override
+    public void onComplete() {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onComplete();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingObserver.java
index 50bad4e92a1..a03a5e46de1 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingObserver.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingObserver.java
@@ -8,38 +8,37 @@
 
 /** Wrapper that makes sure spans from observer events treat the captured span as their parent. */
 public final class TracingObserver<T> implements Observer<T> {
-  private final Observer<T> observer;
-  private final Context parentContext;
+    private final Observer<T> observer;
+    private final Context parentContext;
 
-  public TracingObserver(
-      @Nonnull final Observer<T> observer, @Nonnull final Context parentContext) {
-    this.observer = observer;
-    this.parentContext = parentContext;
-  }
+    public TracingObserver(@Nonnull final Observer<T> observer, @Nonnull final Context parentContext) {
+        this.observer = observer;
+        this.parentContext = parentContext;
+    }
 
-  @Override
-  public void onSubscribe(final Disposable d) {
-    observer.onSubscribe(d);
-  }
+    @Override
+    public void onSubscribe(final Disposable d) {
+        observer.onSubscribe(d);
+    }
 
-  @Override
-  public void onNext(final T value) {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onNext(value);
+    @Override
+    public void onNext(final T value) {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onNext(value);
+        }
     }
-  }
 
-  @Override
-  public void onError(final Throwable e) {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onError(e);
+    @Override
+    public void onError(final Throwable e) {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onError(e);
+        }
     }
-  }
 
-  @Override
-  public void onComplete() {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onComplete();
+    @Override
+    public void onComplete() {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onComplete();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSingleObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSingleObserver.java
index 3e05d1124bc..0d1bcac906e 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSingleObserver.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSingleObserver.java
@@ -8,31 +8,30 @@
 
 /** Wrapper that makes sure spans from observer events treat the captured span as their parent. */
 public final class TracingSingleObserver<T> implements SingleObserver<T> {
-  private final SingleObserver<T> observer;
-  private final Context parentContext;
+    private final SingleObserver<T> observer;
+    private final Context parentContext;
 
-  public TracingSingleObserver(
-      @Nonnull final SingleObserver<T> observer, @Nonnull final Context parentContext) {
-    this.observer = observer;
-    this.parentContext = parentContext;
-  }
+    public TracingSingleObserver(@Nonnull final SingleObserver<T> observer, @Nonnull final Context parentContext) {
+        this.observer = observer;
+        this.parentContext = parentContext;
+    }
 
-  @Override
-  public void onSubscribe(final Disposable d) {
-    observer.onSubscribe(d);
-  }
+    @Override
+    public void onSubscribe(final Disposable d) {
+        observer.onSubscribe(d);
+    }
 
-  @Override
-  public void onSuccess(final T value) {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onSuccess(value);
+    @Override
+    public void onSuccess(final T value) {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onSuccess(value);
+        }
     }
-  }
 
-  @Override
-  public void onError(final Throwable e) {
-    try (final ContextScope scope = parentContext.attach()) {
-      observer.onError(e);
+    @Override
+    public void onError(final Throwable e) {
+        try (final ContextScope scope = parentContext.attach()) {
+            observer.onError(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSubscriber.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSubscriber.java
index 49caa0e6ecf..63282a99778 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSubscriber.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSubscriber.java
@@ -8,38 +8,37 @@
 
 /** Wrapper that makes sure spans from subscriber events treat the captured span as their parent. */
 public final class TracingSubscriber<T> implements FlowableSubscriber<T> {
-  private final FlowableSubscriber<T> subscriber;
-  private final Context parentContext;
+    private final FlowableSubscriber<T> subscriber;
+    private final Context parentContext;
 
-  public TracingSubscriber(
-      @Nonnull final FlowableSubscriber<T> subscriber, @Nonnull final Context parentContext) {
-    this.subscriber = subscriber;
-    this.parentContext = parentContext;
-  }
+    public TracingSubscriber(@Nonnull final FlowableSubscriber<T> subscriber, @Nonnull final Context parentContext) {
+        this.subscriber = subscriber;
+        this.parentContext = parentContext;
+    }
 
-  @Override
-  public void onSubscribe(final Subscription subscription) {
-    subscriber.onSubscribe(subscription);
-  }
+    @Override
+    public void onSubscribe(final Subscription subscription) {
+        subscriber.onSubscribe(subscription);
+    }
 
-  @Override
-  public void onNext(final T value) {
-    try (final ContextScope scope = parentContext.attach()) {
-      subscriber.onNext(value);
+    @Override
+    public void onNext(final T value) {
+        try (final ContextScope scope = parentContext.attach()) {
+            subscriber.onNext(value);
+        }
     }
-  }
 
-  @Override
-  public void onError(final Throwable e) {
-    try (final ContextScope scope = parentContext.attach()) {
-      subscriber.onError(e);
+    @Override
+    public void onError(final Throwable e) {
+        try (final ContextScope scope = parentContext.attach()) {
+            subscriber.onError(e);
+        }
     }
-  }
 
-  @Override
-  public void onComplete() {
-    try (final ContextScope scope = parentContext.attach()) {
-      subscriber.onComplete();
+    @Override
+    public void onComplete() {
+        try (final ContextScope scope = parentContext.attach()) {
+            subscriber.onComplete();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/annotatedsample/RxJava3TracedMethods.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/annotatedsample/RxJava3TracedMethods.java
index 163f5fb4b69..d68ff5ea1f6 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/annotatedsample/RxJava3TracedMethods.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/annotatedsample/RxJava3TracedMethods.java
@@ -11,127 +11,115 @@
 import java.util.concurrent.CountDownLatch;
 
 public class RxJava3TracedMethods {
-  @WithSpan
-  public static Completable traceAsyncCompletable(CountDownLatch latch) {
-    return Completable.fromRunnable(() -> await(latch));
-  }
-
-  @WithSpan
-  public static Completable traceAsyncFailingCompletable(
-      CountDownLatch latch, Exception exception) {
-    return Completable.fromCallable(
-        () -> {
-          await(latch);
-          throw exception;
+    @WithSpan
+    public static Completable traceAsyncCompletable(CountDownLatch latch) {
+        return Completable.fromRunnable(() -> await(latch));
+    }
+
+    @WithSpan
+    public static Completable traceAsyncFailingCompletable(CountDownLatch latch, Exception exception) {
+        return Completable.fromCallable(() -> {
+            await(latch);
+            throw exception;
         });
-  }
-
-  @WithSpan
-  public static Maybe<String> traceAsyncMaybe(CountDownLatch latch) {
-    return Maybe.fromCallable(
-        () -> {
-          await(latch);
-          return "hello";
+    }
+
+    @WithSpan
+    public static Maybe<String> traceAsyncMaybe(CountDownLatch latch) {
+        return Maybe.fromCallable(() -> {
+            await(latch);
+            return "hello";
         });
-  }
-
-  @WithSpan
-  public static Maybe<String> traceAsyncFailingMaybe(CountDownLatch latch, Exception exception) {
-    return Maybe.fromCallable(
-        () -> {
-          await(latch);
-          throw exception;
+    }
+
+    @WithSpan
+    public static Maybe<String> traceAsyncFailingMaybe(CountDownLatch latch, Exception exception) {
+        return Maybe.fromCallable(() -> {
+            await(latch);
+            throw exception;
         });
-  }
-
-  @WithSpan
-  public static Single<String> traceAsyncSingle(CountDownLatch latch) {
-    return Single.fromCallable(
-        () -> {
-          await(latch);
-          return "hello";
+    }
+
+    @WithSpan
+    public static Single<String> traceAsyncSingle(CountDownLatch latch) {
+        return Single.fromCallable(() -> {
+            await(latch);
+            return "hello";
         });
-  }
-
-  @WithSpan
-  public static Single<String> traceAsyncFailingSingle(CountDownLatch latch, Exception exception) {
-    return Single.fromCallable(
-        () -> {
-          await(latch);
-          throw exception;
+    }
+
+    @WithSpan
+    public static Single<String> traceAsyncFailingSingle(CountDownLatch latch, Exception exception) {
+        return Single.fromCallable(() -> {
+            await(latch);
+            throw exception;
         });
-  }
-
-  @WithSpan
-  public static Observable<String> traceAsyncObservable(CountDownLatch latch) {
-    return Observable.fromCallable(
-        () -> {
-          await(latch);
-          return "hello";
+    }
+
+    @WithSpan
+    public static Observable<String> traceAsyncObservable(CountDownLatch latch) {
+        return Observable.fromCallable(() -> {
+            await(latch);
+            return "hello";
         });
-  }
-
-  @WithSpan
-  public static Observable<String> traceAsyncFailingObservable(
-      CountDownLatch latch, Exception exception) {
-    return Observable.fromCallable(
-        () -> {
-          await(latch);
-          throw exception;
+    }
+
+    @WithSpan
+    public static Observable<String> traceAsyncFailingObservable(CountDownLatch latch, Exception exception) {
+        return Observable.fromCallable(() -> {
+            await(latch);
+            throw exception;
         });
-  }
-
-  @WithSpan
-  public static Flowable<String> traceAsyncFlowable(CountDownLatch latch) {
-    return Flowable.fromCallable(
-        () -> {
-          await(latch);
-          return "hello";
+    }
+
+    @WithSpan
+    public static Flowable<String> traceAsyncFlowable(CountDownLatch latch) {
+        return Flowable.fromCallable(() -> {
+            await(latch);
+            return "hello";
         });
-  }
-
-  @WithSpan
-  public static Flowable<String> traceAsyncFailingFlowable(
-      CountDownLatch latch, Exception exception) {
-    return Flowable.fromCallable(
-        () -> {
-          await(latch);
-          throw exception;
+    }
+
+    @WithSpan
+    public static Flowable<String> traceAsyncFailingFlowable(CountDownLatch latch, Exception exception) {
+        return Flowable.fromCallable(() -> {
+            await(latch);
+            throw exception;
         });
-  }
-
-  @WithSpan
-  public static Completable traceAsyncNeverCompletable() {
-    return Completable.never();
-  }
-
-  @WithSpan
-  public static Maybe<String> traceAsyncNeverMaybe() {
-    return Maybe.never();
-  }
-
-  @WithSpan
-  public static Single<String> traceAsyncNeverSingle() {
-    return Single.never();
-  }
-
-  @WithSpan
-  public static Observable<String> traceAsyncNeverObservable() {
-    return Observable.never();
-  }
-
-  @WithSpan
-  public static Flowable<String> traceAsyncNeverFlowable() {
-    return Flowable.never();
-  }
-
-  private static void await(CountDownLatch latch) {
-    try {
-      if (!latch.await(5, SECONDS)) {
-        throw new IllegalStateException("Latch still locked");
-      }
-    } catch (InterruptedException e) {
-      throw new RuntimeException(e);
-    }
-  }
+    }
+
+    @WithSpan
+    public static Completable traceAsyncNeverCompletable() {
+        return Completable.never();
+    }
+
+    @WithSpan
+    public static Maybe<String> traceAsyncNeverMaybe() {
+        return Maybe.never();
+    }
+
+    @WithSpan
+    public static Single<String> traceAsyncNeverSingle() {
+        return Single.never();
+    }
+
+    @WithSpan
+    public static Observable<String> traceAsyncNeverObservable() {
+        return Observable.never();
+    }
+
+    @WithSpan
+    public static Flowable<String> traceAsyncNeverFlowable() {
+        return Flowable.never();
+    }
+
+    private static void await(CountDownLatch latch) {
+        try {
+            if (!latch.await(5, SECONDS)) {
+                throw new IllegalStateException("Latch still locked");
+            }
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java
index 207ca3f6ca1..bea8ad8eca9 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java
@@ -24,109 +24,92 @@
 
 class RxJava3InteropTest extends AbstractInstrumentationTest {
 
-  // The component tag is stored as a UTF8BytesString, so compare by string content.
-  static TagsMatcher componentTrace() {
-    return tag(Tags.COMPONENT, validates(o -> "trace".equals(String.valueOf(o))));
-  }
-
-  static class Worker {
-    static int child(int i) {
-      return childTraced(i);
+    // The component tag is stored as a UTF8BytesString, so compare by string content.
+    static TagsMatcher componentTrace() {
+        return tag(Tags.COMPONENT, validates(o -> "trace".equals(String.valueOf(o))));
     }
 
-    @Trace(operationName = "child", resourceName = "child")
-    static int childTraced(int i) {
-      return i + 1;
-    }
+    static class Worker {
+        static int child(int i) {
+            return childTraced(i);
+        }
 
-    @Trace(operationName = "interop-parent", resourceName = "interop-parent")
-    static <T> T runUnderParent(Supplier<T> work) {
-      return work.get();
+        @Trace(operationName = "child", resourceName = "child")
+        static int childTraced(int i) {
+            return i + 1;
+        }
+
+        @Trace(operationName = "interop-parent", resourceName = "interop-parent")
+        static <T> T runUnderParent(Supplier<T> work) {
+            return work.get();
+        }
     }
-  }
 
-  @Test
-  void fromCompletionStageSync() {
-    Integer result =
-        Worker.runUnderParent(
-            () ->
-                Single.fromCompletionStage(CompletableFuture.completedFuture(1))
-                    .map(Worker::child)
-                    .blockingGet());
-    assertEquals(2, result);
+    @Test
+    void fromCompletionStageSync() {
+        Integer result = Worker.runUnderParent(() -> Single.fromCompletionStage(CompletableFuture.completedFuture(1))
+                .map(Worker::child)
+                .blockingGet());
+        assertEquals(2, result);
 
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("interop-parent").resourceName("interop-parent"),
-            span()
-                .childOfIndex(0)
-                .operationName("child")
-                .resourceName("child")
-                .tags(componentTrace(), defaultTags())));
-  }
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root().operationName("interop-parent").resourceName("interop-parent"),
+                span().childOfIndex(0)
+                        .operationName("child")
+                        .resourceName("child")
+                        .tags(componentTrace(), defaultTags())));
+    }
 
-  @Test
-  void fromCompletionStageAsync() {
-    Integer result =
-        Worker.runUnderParent(
-            () ->
-                Single.fromCompletionStage(CompletableFuture.supplyAsync(() -> 1))
-                    .map(Worker::child)
-                    .blockingGet());
-    assertEquals(2, result);
+    @Test
+    void fromCompletionStageAsync() {
+        Integer result = Worker.runUnderParent(() -> Single.fromCompletionStage(CompletableFuture.supplyAsync(() -> 1))
+                .map(Worker::child)
+                .blockingGet());
+        assertEquals(2, result);
 
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("interop-parent").resourceName("interop-parent"),
-            span()
-                .childOfIndex(0)
-                .operationName("child")
-                .resourceName("child")
-                .tags(componentTrace(), defaultTags())));
-  }
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root().operationName("interop-parent").resourceName("interop-parent"),
+                span().childOfIndex(0)
+                        .operationName("child")
+                        .resourceName("child")
+                        .tags(componentTrace(), defaultTags())));
+    }
 
-  @Test
-  void fromOptional() {
-    Integer result =
-        Worker.runUnderParent(
-            () -> Maybe.fromOptional(Optional.of(1)).map(Worker::child).blockingGet());
-    assertEquals(2, result);
+    @Test
+    void fromOptional() {
+        Integer result = Worker.runUnderParent(
+                () -> Maybe.fromOptional(Optional.of(1)).map(Worker::child).blockingGet());
+        assertEquals(2, result);
 
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("interop-parent").resourceName("interop-parent"),
-            span()
-                .childOfIndex(0)
-                .operationName("child")
-                .resourceName("child")
-                .tags(componentTrace(), defaultTags())));
-  }
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root().operationName("interop-parent").resourceName("interop-parent"),
+                span().childOfIndex(0)
+                        .operationName("child")
+                        .resourceName("child")
+                        .tags(componentTrace(), defaultTags())));
+    }
 
-  @Test
-  void fromStream() {
-    List<Integer> result =
-        Worker.runUnderParent(
-            () -> Flowable.fromStream(Stream.of(1, 2)).map(Worker::child).toList().blockingGet());
-    assertEquals(2, result.size());
-    assertEquals(2, result.get(0));
-    assertEquals(3, result.get(1));
+    @Test
+    void fromStream() {
+        List<Integer> result = Worker.runUnderParent(() ->
+                Flowable.fromStream(Stream.of(1, 2)).map(Worker::child).toList().blockingGet());
+        assertEquals(2, result.size());
+        assertEquals(2, result.get(0));
+        assertEquals(3, result.get(1));
 
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("interop-parent").resourceName("interop-parent"),
-            span()
-                .childOfIndex(0)
-                .operationName("child")
-                .resourceName("child")
-                .tags(componentTrace(), defaultTags()),
-            span()
-                .childOfIndex(0)
-                .operationName("child")
-                .resourceName("child")
-                .tags(componentTrace(), defaultTags())));
-  }
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root().operationName("interop-parent").resourceName("interop-parent"),
+                span().childOfIndex(0)
+                        .operationName("child")
+                        .resourceName("child")
+                        .tags(componentTrace(), defaultTags()),
+                span().childOfIndex(0)
+                        .operationName("child")
+                        .resourceName("child")
+                        .tags(componentTrace(), defaultTags())));
+    }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java
index 500a92c7637..e95c88d04d3 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java
@@ -27,215 +27,206 @@
 @WithConfig(key = "trace.otel.enabled", value = "true")
 class RxJava3ResultExtensionTest extends AbstractInstrumentationTest {
 
-  static final String EXCEPTION_MESSAGE = "Test exception";
-
-  // The COMPONENT and SPAN_KIND tags are stored as UTF8BytesString, so we compare by string content
-  // rather than using is("...") which would fail the asymmetric String#equals(UTF8BytesString)
-  // check.
-  static TagsMatcher otelComponent() {
-    return tag(Tags.COMPONENT, validates(o -> "opentelemetry".equals(String.valueOf(o))));
-  }
-
-  static TagsMatcher internalSpanKind() {
-    return tag(Tags.SPAN_KIND, validates(o -> Tags.SPAN_KIND_INTERNAL.equals(String.valueOf(o))));
-  }
-
-  // The operation and resource names are stored as UTF8BytesString, so we compare by string content
-  // (CharSequence equality is asymmetric: String#equals(UTF8BytesString) is false).
-  static SpanMatcher otelSpan(String name) {
-    return span()
-        .operationName(java.util.regex.Pattern.compile(java.util.regex.Pattern.quote(name)))
-        .resourceName((CharSequence cs) -> name.contentEquals(cs));
-  }
-
-  /**
-   * The five reactive types exercised by the test, with their type-specific terminal operations.
-   */
-  enum ReactiveType {
-    COMPLETABLE("Completable"),
-    MAYBE("Maybe"),
-    SINGLE("Single"),
-    OBSERVABLE("Observable"),
-    FLOWABLE("Flowable");
-
-    final String type;
-
-    ReactiveType(String type) {
-      this.type = type;
-    }
+    static final String EXCEPTION_MESSAGE = "Test exception";
 
-    /** Runs the blocking terminal operation that drives the async result to completion. */
-    void runTerminal(Object asyncType) {
-      switch (this) {
-        case COMPLETABLE:
-          ((Completable) asyncType).blockingAwait();
-          break;
-        case MAYBE:
-          ((Maybe<?>) asyncType).blockingGet();
-          break;
-        case SINGLE:
-          ((Single<?>) asyncType).blockingGet();
-          break;
-        case OBSERVABLE:
-          ((Observable<?>) asyncType).blockingLast();
-          break;
-        case FLOWABLE:
-          ((Flowable<?>) asyncType).blockingLast();
-          break;
-        default:
-          throw new IllegalStateException("Unknown type: " + this);
-      }
+    // The COMPONENT and SPAN_KIND tags are stored as UTF8BytesString, so we compare by string content
+    // rather than using is("...") which would fail the asymmetric String#equals(UTF8BytesString)
+    // check.
+    static TagsMatcher otelComponent() {
+        return tag(Tags.COMPONENT, validates(o -> "opentelemetry".equals(String.valueOf(o))));
     }
 
-    /** Subscribes and immediately disposes (cancels) the async result. */
-    void subscribeAndDispose(Object asyncType) {
-      switch (this) {
-        case COMPLETABLE:
-          ((Completable) asyncType).subscribe().dispose();
-          break;
-        case MAYBE:
-          ((Maybe<?>) asyncType).subscribe().dispose();
-          break;
-        case SINGLE:
-          ((Single<?>) asyncType).subscribe().dispose();
-          break;
-        case OBSERVABLE:
-          ((Observable<?>) asyncType).subscribe().dispose();
-          break;
-        case FLOWABLE:
-          ((Flowable<?>) asyncType).subscribe().dispose();
-          break;
-        default:
-          throw new IllegalStateException("Unknown type: " + this);
-      }
+    static TagsMatcher internalSpanKind() {
+        return tag(Tags.SPAN_KIND, validates(o -> Tags.SPAN_KIND_INTERNAL.equals(String.valueOf(o))));
     }
 
-    Object traceAsync(CountDownLatch latch) {
-      switch (this) {
-        case COMPLETABLE:
-          return RxJava3TracedMethods.traceAsyncCompletable(latch);
-        case MAYBE:
-          return RxJava3TracedMethods.traceAsyncMaybe(latch);
-        case SINGLE:
-          return RxJava3TracedMethods.traceAsyncSingle(latch);
-        case OBSERVABLE:
-          return RxJava3TracedMethods.traceAsyncObservable(latch);
-        case FLOWABLE:
-          return RxJava3TracedMethods.traceAsyncFlowable(latch);
-        default:
-          throw new IllegalStateException("Unknown type: " + this);
-      }
+    // The operation and resource names are stored as UTF8BytesString, so we compare by string content
+    // (CharSequence equality is asymmetric: String#equals(UTF8BytesString) is false).
+    static SpanMatcher otelSpan(String name) {
+        return span().operationName(java.util.regex.Pattern.compile(java.util.regex.Pattern.quote(name)))
+                .resourceName((CharSequence cs) -> name.contentEquals(cs));
     }
 
-    Object traceAsyncNever() {
-      switch (this) {
-        case COMPLETABLE:
-          return RxJava3TracedMethods.traceAsyncNeverCompletable();
-        case MAYBE:
-          return RxJava3TracedMethods.traceAsyncNeverMaybe();
-        case SINGLE:
-          return RxJava3TracedMethods.traceAsyncNeverSingle();
-        case OBSERVABLE:
-          return RxJava3TracedMethods.traceAsyncNeverObservable();
-        case FLOWABLE:
-          return RxJava3TracedMethods.traceAsyncNeverFlowable();
-        default:
-          throw new IllegalStateException("Unknown type: " + this);
-      }
+    /**
+     * The five reactive types exercised by the test, with their type-specific terminal operations.
+     */
+    enum ReactiveType {
+        COMPLETABLE("Completable"),
+        MAYBE("Maybe"),
+        SINGLE("Single"),
+        OBSERVABLE("Observable"),
+        FLOWABLE("Flowable");
+
+        final String type;
+
+        ReactiveType(String type) {
+            this.type = type;
+        }
+
+        /** Runs the blocking terminal operation that drives the async result to completion. */
+        void runTerminal(Object asyncType) {
+            switch (this) {
+                case COMPLETABLE:
+                    ((Completable) asyncType).blockingAwait();
+                    break;
+                case MAYBE:
+                    ((Maybe<?>) asyncType).blockingGet();
+                    break;
+                case SINGLE:
+                    ((Single<?>) asyncType).blockingGet();
+                    break;
+                case OBSERVABLE:
+                    ((Observable<?>) asyncType).blockingLast();
+                    break;
+                case FLOWABLE:
+                    ((Flowable<?>) asyncType).blockingLast();
+                    break;
+                default:
+                    throw new IllegalStateException("Unknown type: " + this);
+            }
+        }
+
+        /** Subscribes and immediately disposes (cancels) the async result. */
+        void subscribeAndDispose(Object asyncType) {
+            switch (this) {
+                case COMPLETABLE:
+                    ((Completable) asyncType).subscribe().dispose();
+                    break;
+                case MAYBE:
+                    ((Maybe<?>) asyncType).subscribe().dispose();
+                    break;
+                case SINGLE:
+                    ((Single<?>) asyncType).subscribe().dispose();
+                    break;
+                case OBSERVABLE:
+                    ((Observable<?>) asyncType).subscribe().dispose();
+                    break;
+                case FLOWABLE:
+                    ((Flowable<?>) asyncType).subscribe().dispose();
+                    break;
+                default:
+                    throw new IllegalStateException("Unknown type: " + this);
+            }
+        }
+
+        Object traceAsync(CountDownLatch latch) {
+            switch (this) {
+                case COMPLETABLE:
+                    return RxJava3TracedMethods.traceAsyncCompletable(latch);
+                case MAYBE:
+                    return RxJava3TracedMethods.traceAsyncMaybe(latch);
+                case SINGLE:
+                    return RxJava3TracedMethods.traceAsyncSingle(latch);
+                case OBSERVABLE:
+                    return RxJava3TracedMethods.traceAsyncObservable(latch);
+                case FLOWABLE:
+                    return RxJava3TracedMethods.traceAsyncFlowable(latch);
+                default:
+                    throw new IllegalStateException("Unknown type: " + this);
+            }
+        }
+
+        Object traceAsyncNever() {
+            switch (this) {
+                case COMPLETABLE:
+                    return RxJava3TracedMethods.traceAsyncNeverCompletable();
+                case MAYBE:
+                    return RxJava3TracedMethods.traceAsyncNeverMaybe();
+                case SINGLE:
+                    return RxJava3TracedMethods.traceAsyncNeverSingle();
+                case OBSERVABLE:
+                    return RxJava3TracedMethods.traceAsyncNeverObservable();
+                case FLOWABLE:
+                    return RxJava3TracedMethods.traceAsyncNeverFlowable();
+                default:
+                    throw new IllegalStateException("Unknown type: " + this);
+            }
+        }
+
+        Object traceAsyncFailing(CountDownLatch latch, Exception exception) {
+            switch (this) {
+                case COMPLETABLE:
+                    return RxJava3TracedMethods.traceAsyncFailingCompletable(latch, exception);
+                case MAYBE:
+                    return RxJava3TracedMethods.traceAsyncFailingMaybe(latch, exception);
+                case SINGLE:
+                    return RxJava3TracedMethods.traceAsyncFailingSingle(latch, exception);
+                case OBSERVABLE:
+                    return RxJava3TracedMethods.traceAsyncFailingObservable(latch, exception);
+                case FLOWABLE:
+                    return RxJava3TracedMethods.traceAsyncFailingFlowable(latch, exception);
+                default:
+                    throw new IllegalStateException("Unknown type: " + this);
+            }
+        }
     }
 
-    Object traceAsyncFailing(CountDownLatch latch, Exception exception) {
-      switch (this) {
-        case COMPLETABLE:
-          return RxJava3TracedMethods.traceAsyncFailingCompletable(latch, exception);
-        case MAYBE:
-          return RxJava3TracedMethods.traceAsyncFailingMaybe(latch, exception);
-        case SINGLE:
-          return RxJava3TracedMethods.traceAsyncFailingSingle(latch, exception);
-        case OBSERVABLE:
-          return RxJava3TracedMethods.traceAsyncFailingObservable(latch, exception);
-        case FLOWABLE:
-          return RxJava3TracedMethods.traceAsyncFailingFlowable(latch, exception);
-        default:
-          throw new IllegalStateException("Unknown type: " + this);
-      }
+    @ParameterizedTest(name = "test WithSpan annotated async method {0}")
+    @EnumSource(ReactiveType.class)
+    void success(ReactiveType type) {
+        CountDownLatch latch = new CountDownLatch(1);
+        Object asyncType = type.traceAsync(latch);
+
+        // The span must not be finished before the async result completes.
+        assertEquals(0, writer.size());
+
+        latch.countDown();
+        type.runTerminal(asyncType);
+
+        String method = "traceAsync" + type.type;
+        assertTraces(trace(
+                otelSpan("RxJava3TracedMethods." + method).tags(defaultTags(), otelComponent(), internalSpanKind())));
     }
-  }
-
-  @ParameterizedTest(name = "test WithSpan annotated async method {0}")
-  @EnumSource(ReactiveType.class)
-  void success(ReactiveType type) {
-    CountDownLatch latch = new CountDownLatch(1);
-    Object asyncType = type.traceAsync(latch);
-
-    // The span must not be finished before the async result completes.
-    assertEquals(0, writer.size());
-
-    latch.countDown();
-    type.runTerminal(asyncType);
-
-    String method = "traceAsync" + type.type;
-    assertTraces(
-        trace(
-            otelSpan("RxJava3TracedMethods." + method)
-                .tags(defaultTags(), otelComponent(), internalSpanKind())));
-  }
-
-  @ParameterizedTest(name = "test WithSpan annotated async method failing {0}")
-  @EnumSource(ReactiveType.class)
-  void failing(ReactiveType type) {
-    CountDownLatch latch = new CountDownLatch(1);
-    IllegalStateException expectedException = new IllegalStateException(EXCEPTION_MESSAGE);
-    Object asyncType = type.traceAsyncFailing(latch, expectedException);
-
-    assertEquals(0, writer.size());
-
-    latch.countDown();
-    assertThrows(IllegalStateException.class, () -> type.runTerminal(asyncType));
-
-    String method = "traceAsyncFailing" + type.type;
-    assertTraces(
-        trace(
-            otelSpan("RxJava3TracedMethods." + method)
+
+    @ParameterizedTest(name = "test WithSpan annotated async method failing {0}")
+    @EnumSource(ReactiveType.class)
+    void failing(ReactiveType type) {
+        CountDownLatch latch = new CountDownLatch(1);
+        IllegalStateException expectedException = new IllegalStateException(EXCEPTION_MESSAGE);
+        Object asyncType = type.traceAsyncFailing(latch, expectedException);
+
+        assertEquals(0, writer.size());
+
+        latch.countDown();
+        assertThrows(IllegalStateException.class, () -> type.runTerminal(asyncType));
+
+        String method = "traceAsyncFailing" + type.type;
+        assertTraces(trace(otelSpan("RxJava3TracedMethods." + method)
                 .error()
                 .tags(
-                    defaultTags(),
-                    otelComponent(),
-                    internalSpanKind(),
-                    error(IllegalStateException.class, EXCEPTION_MESSAGE))));
-  }
-
-  @ParameterizedTest(name = "test WithSpan annotated async method cancelled {0}")
-  @EnumSource(ReactiveType.class)
-  void cancelled(ReactiveType type) {
-    CountDownLatch latch = new CountDownLatch(1);
-    Object asyncType = type.traceAsync(latch);
-
-    assertEquals(0, writer.size());
-
-    latch.countDown();
-    type.subscribeAndDispose(asyncType);
-
-    String method = "traceAsync" + type.type;
-    assertTraces(
-        trace(
-            otelSpan("RxJava3TracedMethods." + method)
-                .tags(defaultTags(), otelComponent(), internalSpanKind())));
-  }
-
-  @ParameterizedTest(name = "test WithSpan annotated never async method cancelled {0}")
-  @EnumSource(ReactiveType.class)
-  void cancelledNever(ReactiveType type) {
-    Object asyncType = type.traceAsyncNever();
-
-    assertEquals(0, writer.size());
-
-    type.subscribeAndDispose(asyncType);
-
-    String method = "traceAsyncNever" + type.type;
-    assertTraces(
-        trace(
-            otelSpan("RxJava3TracedMethods." + method)
-                .tags(defaultTags(), otelComponent(), internalSpanKind())));
-  }
+                        defaultTags(),
+                        otelComponent(),
+                        internalSpanKind(),
+                        error(IllegalStateException.class, EXCEPTION_MESSAGE))));
+    }
+
+    @ParameterizedTest(name = "test WithSpan annotated async method cancelled {0}")
+    @EnumSource(ReactiveType.class)
+    void cancelled(ReactiveType type) {
+        CountDownLatch latch = new CountDownLatch(1);
+        Object asyncType = type.traceAsync(latch);
+
+        assertEquals(0, writer.size());
+
+        latch.countDown();
+        type.subscribeAndDispose(asyncType);
+
+        String method = "traceAsync" + type.type;
+        assertTraces(trace(
+                otelSpan("RxJava3TracedMethods." + method).tags(defaultTags(), otelComponent(), internalSpanKind())));
+    }
+
+    @ParameterizedTest(name = "test WithSpan annotated never async method cancelled {0}")
+    @EnumSource(ReactiveType.class)
+    void cancelledNever(ReactiveType type) {
+        Object asyncType = type.traceAsyncNever();
+
+        assertEquals(0, writer.size());
+
+        type.subscribeAndDispose(asyncType);
+
+        String method = "traceAsyncNever" + type.type;
+        assertTraces(trace(
+                otelSpan("RxJava3TracedMethods." + method).tags(defaultTags(), otelComponent(), internalSpanKind())));
+    }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java
index 89278800e57..41f5a304d36 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java
@@ -42,616 +42,485 @@
 
 class RxJava3Test extends AbstractInstrumentationTest {
 
-  static final String EXCEPTION_MESSAGE = "test exception";
+    static final String EXCEPTION_MESSAGE = "test exception";
 
-  // The component tag is stored as a UTF8BytesString, so we compare by string content rather than
-  // using is("trace") which would fail the asymmetric String#equals(UTF8BytesString) check.
-  static TagsMatcher componentTrace() {
-    return tag(Tags.COMPONENT, validates(o -> "trace".equals(String.valueOf(o))));
-  }
+    // The component tag is stored as a UTF8BytesString, so we compare by string content rather than
+    // using is("trace") which would fail the asymmetric String#equals(UTF8BytesString) check.
+    static TagsMatcher componentTrace() {
+        return tag(Tags.COMPONENT, validates(o -> "trace".equals(String.valueOf(o))));
+    }
 
-  static class Worker {
-    static long traceParentId;
-    static long publisherParentId;
-    static long intermediateId;
+    static class Worker {
+        static long traceParentId;
+        static long publisherParentId;
+        static long intermediateId;
 
-    static int addOne(int i) {
-      return addOneTraced(i);
-    }
+        static int addOne(int i) {
+            return addOneTraced(i);
+        }
 
-    @Trace(operationName = "addOne", resourceName = "addOne")
-    static int addOneTraced(int i) {
-      return i + 1;
-    }
+        @Trace(operationName = "addOne", resourceName = "addOne")
+        static int addOneTraced(int i) {
+            return i + 1;
+        }
 
-    static int addTwo(int i) {
-      return addTwoTraced(i);
-    }
+        static int addTwo(int i) {
+            return addTwoTraced(i);
+        }
 
-    @Trace(operationName = "addTwo", resourceName = "addTwo")
-    static int addTwoTraced(int i) {
-      return i + 2;
-    }
+        @Trace(operationName = "addTwo", resourceName = "addTwo")
+        static int addTwoTraced(int i) {
+            return i + 2;
+        }
 
-    static Object throwException() {
-      throw new RuntimeException(EXCEPTION_MESSAGE);
-    }
+        static Object throwException() {
+            throw new RuntimeException(EXCEPTION_MESSAGE);
+        }
 
-    @Trace(operationName = "trace-parent", resourceName = "trace-parent")
-    @SuppressWarnings("unchecked")
-    static Object assemblePublisherUnderTrace(Supplier<Object> publisherSupplier) {
-      traceParentId = activeSpan().getSpanId();
-      AgentSpan span = startSpan("test", "publisher-parent");
-      publisherParentId = span.getSpanId();
-      ContextScope scope = activateSpan(span);
-
-      Object publisher = publisherSupplier.get();
-      try {
-        if (publisher instanceof Maybe) {
-          return ((Maybe<Object>) publisher).blockingGet();
-        } else if (publisher instanceof Flowable) {
-          List<Object> list = ((Flowable<Object>) publisher).toList().blockingGet();
-          return list.toArray(new Object[0]);
+        @Trace(operationName = "trace-parent", resourceName = "trace-parent")
+        @SuppressWarnings("unchecked")
+        static Object assemblePublisherUnderTrace(Supplier<Object> publisherSupplier) {
+            traceParentId = activeSpan().getSpanId();
+            AgentSpan span = startSpan("test", "publisher-parent");
+            publisherParentId = span.getSpanId();
+            ContextScope scope = activateSpan(span);
+
+            Object publisher = publisherSupplier.get();
+            try {
+                if (publisher instanceof Maybe) {
+                    return ((Maybe<Object>) publisher).blockingGet();
+                } else if (publisher instanceof Flowable) {
+                    List<Object> list = ((Flowable<Object>) publisher).toList().blockingGet();
+                    return list.toArray(new Object[0]);
+                }
+                throw new RuntimeException("Unknown publisher: " + publisher);
+            } finally {
+                scope.close();
+                span.finish();
+            }
         }
-        throw new RuntimeException("Unknown publisher: " + publisher);
-      } finally {
-        scope.close();
-        span.finish();
-      }
-    }
 
-    @Trace(operationName = "trace-parent", resourceName = "trace-parent")
-    static void cancelUnderTrace(Supplier<Object> publisherSupplier) {
-      traceParentId = activeSpan().getSpanId();
-      AgentSpan span = startSpan("test", "publisher-parent");
-      publisherParentId = span.getSpanId();
-      ContextScope scope = activateSpan(span);
-
-      // Normalize every reactive type to a Flowable so a single Subscriber can cancel the
-      // subscription right away, exercising the cancellation path of each instrumentation.
-      Object publisher = publisherSupplier.get();
-      Flowable<?> flowable;
-      if (publisher instanceof Maybe) {
-        flowable = ((Maybe<?>) publisher).toFlowable();
-      } else if (publisher instanceof Single) {
-        flowable = ((Single<?>) publisher).toFlowable();
-      } else if (publisher instanceof Observable) {
-        flowable = ((Observable<?>) publisher).toFlowable(BackpressureStrategy.BUFFER);
-      } else if (publisher instanceof Completable) {
-        flowable = ((Completable) publisher).toFlowable();
-      } else {
-        flowable = (Flowable<?>) publisher;
-      }
-
-      try {
-        flowable.subscribe(
-            new Subscriber<Object>() {
-              @Override
-              public void onSubscribe(Subscription subscription) {
-                subscription.cancel();
-              }
-
-              @Override
-              public void onNext(Object t) {}
-
-              @Override
-              public void onError(Throwable error) {}
-
-              @Override
-              public void onComplete() {}
-            });
-      } finally {
-        scope.close();
-        span.finish();
-      }
-    }
+        @Trace(operationName = "trace-parent", resourceName = "trace-parent")
+        static void cancelUnderTrace(Supplier<Object> publisherSupplier) {
+            traceParentId = activeSpan().getSpanId();
+            AgentSpan span = startSpan("test", "publisher-parent");
+            publisherParentId = span.getSpanId();
+            ContextScope scope = activateSpan(span);
+
+            // Normalize every reactive type to a Flowable so a single Subscriber can cancel the
+            // subscription right away, exercising the cancellation path of each instrumentation.
+            Object publisher = publisherSupplier.get();
+            Flowable<?> flowable;
+            if (publisher instanceof Maybe) {
+                flowable = ((Maybe<?>) publisher).toFlowable();
+            } else if (publisher instanceof Single) {
+                flowable = ((Single<?>) publisher).toFlowable();
+            } else if (publisher instanceof Observable) {
+                flowable = ((Observable<?>) publisher).toFlowable(BackpressureStrategy.BUFFER);
+            } else if (publisher instanceof Completable) {
+                flowable = ((Completable) publisher).toFlowable();
+            } else {
+                flowable = (Flowable<?>) publisher;
+            }
+
+            try {
+                flowable.subscribe(new Subscriber<Object>() {
+                    @Override
+                    public void onSubscribe(Subscription subscription) {
+                        subscription.cancel();
+                    }
+
+                    @Override
+                    public void onNext(Object t) {}
+
+                    @Override
+                    public void onError(Throwable error) {}
+
+                    @Override
+                    public void onComplete() {}
+                });
+            } finally {
+                scope.close();
+                span.finish();
+            }
+        }
 
-    @Trace(operationName = "trace-parent", resourceName = "trace-parent")
-    static Object runUnderTraceParent(Supplier<Object> work) {
-      traceParentId = activeSpan().getSpanId();
-      return work.get();
+        @Trace(operationName = "trace-parent", resourceName = "trace-parent")
+        static Object runUnderTraceParent(Supplier<Object> work) {
+            traceParentId = activeSpan().getSpanId();
+            return work.get();
+        }
     }
-  }
-
-  // --- Publisher success ---------------------------------------------------
-
-  static List<Arguments> publisherSuccessArgs() {
-    return Arrays.asList(
-        Arguments.of(
-            "basic maybe",
-            new Object[] {2},
-            1,
-            (Supplier<Object>) () -> Maybe.just(1).map(Worker::addOne)),
-        Arguments.of(
-            "two operations maybe",
-            new Object[] {4},
-            2,
-            (Supplier<Object>) () -> Maybe.just(2).map(Worker::addOne).map(Worker::addOne)),
-        Arguments.of(
-            "delayed maybe",
-            new Object[] {4},
-            1,
-            (Supplier<Object>) () -> Maybe.just(3).delay(100, MILLISECONDS).map(Worker::addOne)),
-        Arguments.of(
-            "delayed twice maybe",
-            new Object[] {6},
-            2,
-            (Supplier<Object>)
-                () ->
-                    Maybe.just(4)
-                        .delay(100, MILLISECONDS)
-                        .map(Worker::addOne)
-                        .delay(100, MILLISECONDS)
-                        .map(Worker::addOne)),
-        Arguments.of(
-            "basic flowable",
-            new Object[] {6, 7},
-            2,
-            (Supplier<Object>)
-                () -> Flowable.fromIterable(Arrays.asList(5, 6)).map(Worker::addOne)),
-        Arguments.of(
-            "two operations flowable",
-            new Object[] {8, 9},
-            4,
-            (Supplier<Object>)
-                () ->
-                    Flowable.fromIterable(Arrays.asList(6, 7))
-                        .map(Worker::addOne)
-                        .map(Worker::addOne)),
-        Arguments.of(
-            "delayed flowable",
-            new Object[] {8, 9},
-            2,
-            (Supplier<Object>)
-                () ->
-                    Flowable.fromIterable(Arrays.asList(7, 8))
-                        .delay(100, MILLISECONDS)
-                        .map(Worker::addOne)),
-        Arguments.of(
-            "delayed twice flowable",
-            new Object[] {10, 11},
-            4,
-            (Supplier<Object>)
-                () ->
-                    Flowable.fromIterable(Arrays.asList(8, 9))
+
+    // --- Publisher success ---------------------------------------------------
+
+    static List<Arguments> publisherSuccessArgs() {
+        return Arrays.asList(
+                Arguments.of("basic maybe", new Object[] {2}, 1, (Supplier<Object>)
+                        () -> Maybe.just(1).map(Worker::addOne)),
+                Arguments.of("two operations maybe", new Object[] {4}, 2, (Supplier<Object>)
+                        () -> Maybe.just(2).map(Worker::addOne).map(Worker::addOne)),
+                Arguments.of("delayed maybe", new Object[] {4}, 1, (Supplier<Object>)
+                        () -> Maybe.just(3).delay(100, MILLISECONDS).map(Worker::addOne)),
+                Arguments.of("delayed twice maybe", new Object[] {6}, 2, (Supplier<Object>) () -> Maybe.just(4)
                         .delay(100, MILLISECONDS)
                         .map(Worker::addOne)
                         .delay(100, MILLISECONDS)
                         .map(Worker::addOne)),
-        Arguments.of(
-            "maybe from callable",
-            new Object[] {12},
-            2,
-            (Supplier<Object>)
-                () -> Maybe.fromCallable(() -> Worker.addOne(10)).map(Worker::addOne)));
-  }
-
-  @ParameterizedTest(name = "Publisher ''{0}'' test")
-  @MethodSource("publisherSuccessArgs")
-  void publisherSuccess(String name, Object[] expected, int workSpans, Supplier<Object> supplier) {
-    Object result = Worker.assemblePublisherUnderTrace(supplier);
-
-    if (expected.length == 1) {
-      assertEquals(expected[0], result);
-    } else {
-      assertArrayEquals(expected, (Object[]) result);
+                Arguments.of("basic flowable", new Object[] {6, 7}, 2, (Supplier<Object>)
+                        () -> Flowable.fromIterable(Arrays.asList(5, 6)).map(Worker::addOne)),
+                Arguments.of("two operations flowable", new Object[] {8, 9}, 4, (Supplier<Object>)
+                        () -> Flowable.fromIterable(Arrays.asList(6, 7))
+                                .map(Worker::addOne)
+                                .map(Worker::addOne)),
+                Arguments.of("delayed flowable", new Object[] {8, 9}, 2, (Supplier<Object>)
+                        () -> Flowable.fromIterable(Arrays.asList(7, 8))
+                                .delay(100, MILLISECONDS)
+                                .map(Worker::addOne)),
+                Arguments.of("delayed twice flowable", new Object[] {10, 11}, 4, (Supplier<Object>)
+                        () -> Flowable.fromIterable(Arrays.asList(8, 9))
+                                .delay(100, MILLISECONDS)
+                                .map(Worker::addOne)
+                                .delay(100, MILLISECONDS)
+                                .map(Worker::addOne)),
+                Arguments.of("maybe from callable", new Object[] {12}, 2, (Supplier<Object>)
+                        () -> Maybe.fromCallable(() -> Worker.addOne(10)).map(Worker::addOne)));
     }
 
-    SpanMatcher[] matchers = new SpanMatcher[workSpans + 2];
-    matchers[0] =
-        span()
-            .root()
-            .operationName("trace-parent")
-            .resourceName("trace-parent")
-            .tags(componentTrace(), defaultTags());
-    matchers[1] =
-        span()
-            .id(Worker.publisherParentId)
-            .childOf(Worker.traceParentId)
-            .operationName("publisher-parent")
-            .resourceName("publisher-parent")
-            .tags(defaultTags());
-    for (int i = 0; i < workSpans; i++) {
-      matchers[2 + i] =
-          span()
-              .childOf(Worker.publisherParentId)
-              .operationName("addOne")
-              .resourceName("addOne")
-              .tags(componentTrace(), defaultTags());
-    }
+    @ParameterizedTest(name = "Publisher ''{0}'' test")
+    @MethodSource("publisherSuccessArgs")
+    void publisherSuccess(String name, Object[] expected, int workSpans, Supplier<Object> supplier) {
+        Object result = Worker.assemblePublisherUnderTrace(supplier);
 
-    assertTraces(trace(SORT_BY_START_TIME, matchers));
-  }
-
-  // --- Publisher error -----------------------------------------------------
-
-  static List<Arguments> publisherErrorArgs() {
-    return Arrays.asList(
-        Arguments.of(
-            "maybe", (Supplier<Object>) () -> Maybe.error(new RuntimeException(EXCEPTION_MESSAGE))),
-        Arguments.of(
-            "flowable",
-            (Supplier<Object>) () -> Flowable.error(new RuntimeException(EXCEPTION_MESSAGE))));
-  }
-
-  @ParameterizedTest(name = "Publisher error ''{0}'' test")
-  @MethodSource("publisherErrorArgs")
-  void publisherError(String name, Supplier<Object> supplier) {
-    RuntimeException exception =
-        assertThrows(RuntimeException.class, () -> Worker.assemblePublisherUnderTrace(supplier));
-    assertEquals(EXCEPTION_MESSAGE, exception.getMessage());
-
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span()
-                .root()
+        if (expected.length == 1) {
+            assertEquals(expected[0], result);
+        } else {
+            assertArrayEquals(expected, (Object[]) result);
+        }
+
+        SpanMatcher[] matchers = new SpanMatcher[workSpans + 2];
+        matchers[0] = span().root()
                 .operationName("trace-parent")
                 .resourceName("trace-parent")
-                .error()
-                .tags(
-                    componentTrace(),
-                    error(RuntimeException.class, EXCEPTION_MESSAGE),
-                    defaultTags()),
-            // It's important that we don't attach errors at the reactive level so that we don't
-            // impact the spans on reactive integrations such as netty and lettuce.
-            span()
-                .id(Worker.publisherParentId)
+                .tags(componentTrace(), defaultTags());
+        matchers[1] = span().id(Worker.publisherParentId)
                 .childOf(Worker.traceParentId)
                 .operationName("publisher-parent")
                 .resourceName("publisher-parent")
-                .tags(defaultTags())));
-  }
-
-  // --- Publisher step error ------------------------------------------------
-
-  static List<Arguments> publisherStepErrorArgs() {
-    return Arrays.asList(
-        Arguments.of(
-            "basic maybe failure",
-            1,
-            (Supplier<Object>)
-                () -> Maybe.just(1).map(Worker::addOne).map(i -> Worker.throwException())),
-        Arguments.of(
-            "basic flowable failure",
-            1,
-            (Supplier<Object>)
-                () ->
-                    Flowable.fromIterable(Arrays.asList(5, 6))
-                        .map(Worker::addOne)
-                        .map(i -> Worker.throwException())));
-  }
-
-  @ParameterizedTest(name = "Publisher step ''{0}'' test")
-  @MethodSource("publisherStepErrorArgs")
-  void publisherStepError(String name, int workSpans, Supplier<Object> supplier) {
-    RuntimeException exception =
-        assertThrows(RuntimeException.class, () -> Worker.assemblePublisherUnderTrace(supplier));
-    assertEquals(EXCEPTION_MESSAGE, exception.getMessage());
-
-    SpanMatcher[] matchers = new SpanMatcher[workSpans + 2];
-    matchers[0] =
-        span()
-            .root()
-            .operationName("trace-parent")
-            .resourceName("trace-parent")
-            .error()
-            .tags(
-                componentTrace(), error(RuntimeException.class, EXCEPTION_MESSAGE), defaultTags());
-    matchers[1] =
-        span()
-            .id(Worker.publisherParentId)
-            .childOf(Worker.traceParentId)
-            .operationName("publisher-parent")
-            .resourceName("publisher-parent")
-            .tags(defaultTags());
-    for (int i = 0; i < workSpans; i++) {
-      matchers[2 + i] =
-          span()
-              .childOf(Worker.publisherParentId)
-              .operationName("addOne")
-              .resourceName("addOne")
-              .tags(componentTrace(), defaultTags());
+                .tags(defaultTags());
+        for (int i = 0; i < workSpans; i++) {
+            matchers[2 + i] = span().childOf(Worker.publisherParentId)
+                    .operationName("addOne")
+                    .resourceName("addOne")
+                    .tags(componentTrace(), defaultTags());
+        }
+
+        assertTraces(trace(SORT_BY_START_TIME, matchers));
     }
 
-    assertTraces(trace(SORT_BY_START_TIME, matchers));
-  }
-
-  // --- Cancel --------------------------------------------------------------
-
-  static List<Arguments> cancelArgs() {
-    return Arrays.asList(
-        Arguments.of("basic maybe", (Supplier<Object>) () -> Maybe.just(1)),
-        Arguments.of(
-            "basic flowable", (Supplier<Object>) () -> Flowable.fromIterable(Arrays.asList(5, 6))),
-        Arguments.of("basic single", (Supplier<Object>) () -> Single.just(1)),
-        Arguments.of(
-            "basic observable",
-            (Supplier<Object>) () -> Observable.fromIterable(Arrays.asList(5, 6))),
-        Arguments.of("basic completable", (Supplier<Object>) Completable::complete));
-  }
-
-  @ParameterizedTest(name = "Publisher ''{0}'' cancel")
-  @MethodSource("cancelArgs")
-  void cancel(String name, Supplier<Object> supplier) {
-    Worker.cancelUnderTrace(supplier);
-
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span()
-                .root()
+    // --- Publisher error -----------------------------------------------------
+
+    static List<Arguments> publisherErrorArgs() {
+        return Arrays.asList(
+                Arguments.of("maybe", (Supplier<Object>) () -> Maybe.error(new RuntimeException(EXCEPTION_MESSAGE))),
+                Arguments.of(
+                        "flowable", (Supplier<Object>) () -> Flowable.error(new RuntimeException(EXCEPTION_MESSAGE))));
+    }
+
+    @ParameterizedTest(name = "Publisher error ''{0}'' test")
+    @MethodSource("publisherErrorArgs")
+    void publisherError(String name, Supplier<Object> supplier) {
+        RuntimeException exception =
+                assertThrows(RuntimeException.class, () -> Worker.assemblePublisherUnderTrace(supplier));
+        assertEquals(EXCEPTION_MESSAGE, exception.getMessage());
+
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root()
+                        .operationName("trace-parent")
+                        .resourceName("trace-parent")
+                        .error()
+                        .tags(componentTrace(), error(RuntimeException.class, EXCEPTION_MESSAGE), defaultTags()),
+                // It's important that we don't attach errors at the reactive level so that we don't
+                // impact the spans on reactive integrations such as netty and lettuce.
+                span().id(Worker.publisherParentId)
+                        .childOf(Worker.traceParentId)
+                        .operationName("publisher-parent")
+                        .resourceName("publisher-parent")
+                        .tags(defaultTags())));
+    }
+
+    // --- Publisher step error ------------------------------------------------
+
+    static List<Arguments> publisherStepErrorArgs() {
+        return Arrays.asList(
+                Arguments.of("basic maybe failure", 1, (Supplier<Object>)
+                        () -> Maybe.just(1).map(Worker::addOne).map(i -> Worker.throwException())),
+                Arguments.of(
+                        "basic flowable failure", 1, (Supplier<Object>) () -> Flowable.fromIterable(Arrays.asList(5, 6))
+                                .map(Worker::addOne)
+                                .map(i -> Worker.throwException())));
+    }
+
+    @ParameterizedTest(name = "Publisher step ''{0}'' test")
+    @MethodSource("publisherStepErrorArgs")
+    void publisherStepError(String name, int workSpans, Supplier<Object> supplier) {
+        RuntimeException exception =
+                assertThrows(RuntimeException.class, () -> Worker.assemblePublisherUnderTrace(supplier));
+        assertEquals(EXCEPTION_MESSAGE, exception.getMessage());
+
+        SpanMatcher[] matchers = new SpanMatcher[workSpans + 2];
+        matchers[0] = span().root()
                 .operationName("trace-parent")
                 .resourceName("trace-parent")
-                .tags(componentTrace(), defaultTags()),
-            span()
-                .id(Worker.publisherParentId)
+                .error()
+                .tags(componentTrace(), error(RuntimeException.class, EXCEPTION_MESSAGE), defaultTags());
+        matchers[1] = span().id(Worker.publisherParentId)
                 .childOf(Worker.traceParentId)
                 .operationName("publisher-parent")
                 .resourceName("publisher-parent")
-                .tags(defaultTags())));
-  }
-
-  // --- Chain spans correct parent ------------------------------------------
-
-  static List<Arguments> chainParentArgs() {
-    return Arrays.asList(
-        Arguments.of(
-            "basic maybe",
-            3,
-            (Supplier<Object>)
-                () ->
-                    Maybe.just(1)
+                .tags(defaultTags());
+        for (int i = 0; i < workSpans; i++) {
+            matchers[2 + i] = span().childOf(Worker.publisherParentId)
+                    .operationName("addOne")
+                    .resourceName("addOne")
+                    .tags(componentTrace(), defaultTags());
+        }
+
+        assertTraces(trace(SORT_BY_START_TIME, matchers));
+    }
+
+    // --- Cancel --------------------------------------------------------------
+
+    static List<Arguments> cancelArgs() {
+        return Arrays.asList(
+                Arguments.of("basic maybe", (Supplier<Object>) () -> Maybe.just(1)),
+                Arguments.of("basic flowable", (Supplier<Object>) () -> Flowable.fromIterable(Arrays.asList(5, 6))),
+                Arguments.of("basic single", (Supplier<Object>) () -> Single.just(1)),
+                Arguments.of("basic observable", (Supplier<Object>) () -> Observable.fromIterable(Arrays.asList(5, 6))),
+                Arguments.of("basic completable", (Supplier<Object>) Completable::complete));
+    }
+
+    @ParameterizedTest(name = "Publisher ''{0}'' cancel")
+    @MethodSource("cancelArgs")
+    void cancel(String name, Supplier<Object> supplier) {
+        Worker.cancelUnderTrace(supplier);
+
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root()
+                        .operationName("trace-parent")
+                        .resourceName("trace-parent")
+                        .tags(componentTrace(), defaultTags()),
+                span().id(Worker.publisherParentId)
+                        .childOf(Worker.traceParentId)
+                        .operationName("publisher-parent")
+                        .resourceName("publisher-parent")
+                        .tags(defaultTags())));
+    }
+
+    // --- Chain spans correct parent ------------------------------------------
+
+    static List<Arguments> chainParentArgs() {
+        return Arrays.asList(
+                Arguments.of("basic maybe", 3, (Supplier<Object>) () -> Maybe.just(1)
                         .map(Worker::addOne)
                         .map(Worker::addOne)
                         .concatWith(Maybe.just(1).map(Worker::addOne))),
-        Arguments.of(
-            "basic flowable",
-            5,
-            (Supplier<Object>)
-                () ->
-                    Flowable.fromIterable(Arrays.asList(5, 6))
+                Arguments.of("basic flowable", 5, (Supplier<Object>) () -> Flowable.fromIterable(Arrays.asList(5, 6))
                         .map(Worker::addOne)
                         .map(Worker::addOne)
                         .concatWith(Maybe.just(1).map(Worker::addOne).toFlowable())));
-  }
-
-  @ParameterizedTest(name = "Publisher chain spans have the correct parent for ''{0}''")
-  @MethodSource("chainParentArgs")
-  void chainParent(String name, int workSpans, Supplier<Object> supplier) {
-    Worker.assemblePublisherUnderTrace(supplier);
-
-    SpanMatcher[] matchers = new SpanMatcher[workSpans + 2];
-    matchers[0] =
-        span()
-            .root()
-            .operationName("trace-parent")
-            .resourceName("trace-parent")
-            .tags(componentTrace(), defaultTags());
-    matchers[1] =
-        span()
-            .id(Worker.publisherParentId)
-            .childOf(Worker.traceParentId)
-            .operationName("publisher-parent")
-            .resourceName("publisher-parent")
-            .tags(defaultTags());
-    for (int i = 0; i < workSpans; i++) {
-      matchers[2 + i] =
-          span()
-              .childOf(Worker.publisherParentId)
-              .operationName("addOne")
-              .resourceName("addOne")
-              .tags(componentTrace(), defaultTags());
     }
 
-    assertTraces(trace(SORT_BY_START_TIME, matchers));
-  }
+    @ParameterizedTest(name = "Publisher chain spans have the correct parent for ''{0}''")
+    @MethodSource("chainParentArgs")
+    void chainParent(String name, int workSpans, Supplier<Object> supplier) {
+        Worker.assemblePublisherUnderTrace(supplier);
 
-  // --- Correct parents from subscription time (blockingGet) ----------------
+        SpanMatcher[] matchers = new SpanMatcher[workSpans + 2];
+        matchers[0] = span().root()
+                .operationName("trace-parent")
+                .resourceName("trace-parent")
+                .tags(componentTrace(), defaultTags());
+        matchers[1] = span().id(Worker.publisherParentId)
+                .childOf(Worker.traceParentId)
+                .operationName("publisher-parent")
+                .resourceName("publisher-parent")
+                .tags(defaultTags());
+        for (int i = 0; i < workSpans; i++) {
+            matchers[2 + i] = span().childOf(Worker.publisherParentId)
+                    .operationName("addOne")
+                    .resourceName("addOne")
+                    .tags(componentTrace(), defaultTags());
+        }
 
-  @Test
-  void correctParentsFromSubscriptionTimeBlockingGet() {
-    Maybe<Integer> maybe = Maybe.just(42).map(Worker::addOne).map(Worker::addTwo);
+        assertTraces(trace(SORT_BY_START_TIME, matchers));
+    }
+
+    // --- Correct parents from subscription time (blockingGet) ----------------
+
+    @Test
+    void correctParentsFromSubscriptionTimeBlockingGet() {
+        Maybe<Integer> maybe = Maybe.just(42).map(Worker::addOne).map(Worker::addTwo);
 
-    Worker.runUnderTraceParent(
-        () -> {
-          maybe.blockingGet();
-          return null;
+        Worker.runUnderTraceParent(() -> {
+            maybe.blockingGet();
+            return null;
         });
 
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("trace-parent").resourceName("trace-parent"),
-            span()
-                .childOf(Worker.traceParentId)
-                .operationName("addOne")
-                .tags(componentTrace(), defaultTags()),
-            span()
-                .childOf(Worker.traceParentId)
-                .operationName("addTwo")
-                .tags(componentTrace(), defaultTags())));
-  }
-
-  // --- Correct parents from subscription time (intermediate span) ----------
-
-  static List<Arguments> subscriptionTimeIntermediateArgs() {
-    return Arrays.asList(
-        Arguments.of("basic maybe", 1, (Supplier<Object>) () -> Maybe.just(1).map(Worker::addOne)),
-        Arguments.of(
-            "basic flowable",
-            2,
-            (Supplier<Object>)
-                () -> Flowable.fromIterable(Arrays.asList(1, 2)).map(Worker::addOne)));
-  }
-
-  @ParameterizedTest(
-      name = "Publisher chain spans have the correct parents from subscription time ''{0}''")
-  @MethodSource("subscriptionTimeIntermediateArgs")
-  @SuppressWarnings("unchecked")
-  void correctParentsFromSubscriptionTime(String name, int workItems, Supplier<Object> supplier) {
-    Worker.assemblePublisherUnderTrace(
-        () -> {
-          // The "add one" operations are assembled under publisher-parent and stay its children.
-          // The "add two" operations are assembled under intermediate, but intermediate is finished
-          // before subscription, so re-activating its context at delivery time is a no-op and
-          // addTwo falls back to the still-active publisher-parent as well.
-          Object publisher = supplier.get();
-
-          AgentSpan intermediate = startSpan("test", "intermediate");
-          Worker.intermediateId = intermediate.getSpanId();
-          ContextScope scope = activateSpan(intermediate);
-          try {
-            if (publisher instanceof Maybe) {
-              return ((Maybe<Integer>) publisher).map(Worker::addTwo);
-            } else if (publisher instanceof Flowable) {
-              return ((Flowable<Integer>) publisher).map(Worker::addTwo);
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root().operationName("trace-parent").resourceName("trace-parent"),
+                span().childOf(Worker.traceParentId).operationName("addOne").tags(componentTrace(), defaultTags()),
+                span().childOf(Worker.traceParentId).operationName("addTwo").tags(componentTrace(), defaultTags())));
+    }
+
+    // --- Correct parents from subscription time (intermediate span) ----------
+
+    static List<Arguments> subscriptionTimeIntermediateArgs() {
+        return Arrays.asList(
+                Arguments.of(
+                        "basic maybe", 1, (Supplier<Object>) () -> Maybe.just(1).map(Worker::addOne)),
+                Arguments.of("basic flowable", 2, (Supplier<Object>)
+                        () -> Flowable.fromIterable(Arrays.asList(1, 2)).map(Worker::addOne)));
+    }
+
+    @ParameterizedTest(name = "Publisher chain spans have the correct parents from subscription time ''{0}''")
+    @MethodSource("subscriptionTimeIntermediateArgs")
+    @SuppressWarnings("unchecked")
+    void correctParentsFromSubscriptionTime(String name, int workItems, Supplier<Object> supplier) {
+        Worker.assemblePublisherUnderTrace(() -> {
+            // The "add one" operations are assembled under publisher-parent and stay its children.
+            // The "add two" operations are assembled under intermediate, but intermediate is finished
+            // before subscription, so re-activating its context at delivery time is a no-op and
+            // addTwo falls back to the still-active publisher-parent as well.
+            Object publisher = supplier.get();
+
+            AgentSpan intermediate = startSpan("test", "intermediate");
+            Worker.intermediateId = intermediate.getSpanId();
+            ContextScope scope = activateSpan(intermediate);
+            try {
+                if (publisher instanceof Maybe) {
+                    return ((Maybe<Integer>) publisher).map(Worker::addTwo);
+                } else if (publisher instanceof Flowable) {
+                    return ((Flowable<Integer>) publisher).map(Worker::addTwo);
+                }
+                throw new IllegalStateException("Unknown publisher type");
+            } finally {
+                scope.close();
+                intermediate.finish();
             }
-            throw new IllegalStateException("Unknown publisher type");
-          } finally {
-            scope.close();
-            intermediate.finish();
-          }
         });
 
-    SpanMatcher[] matchers = new SpanMatcher[3 + 2 * workItems];
-    matchers[0] =
-        span()
-            .root()
-            .operationName("trace-parent")
-            .resourceName("trace-parent")
-            .tags(componentTrace(), defaultTags());
-    matchers[1] =
-        span()
-            .id(Worker.publisherParentId)
-            .childOf(Worker.traceParentId)
-            .operationName("publisher-parent")
-            .resourceName("publisher-parent")
-            .tags(defaultTags());
-    matchers[2] =
-        span()
-            .id(Worker.intermediateId)
-            .childOf(Worker.publisherParentId)
-            .operationName("intermediate")
-            .resourceName("intermediate")
-            .tags(defaultTags());
-    for (int i = 0; i < 2 * workItems; i += 2) {
-      matchers[3 + i] =
-          span()
-              .childOf(Worker.publisherParentId)
-              .operationName("addOne")
-              .tags(componentTrace(), defaultTags());
-      matchers[4 + i] =
-          span()
-              .childOf(Worker.publisherParentId)
-              .operationName("addTwo")
-              .tags(componentTrace(), defaultTags());
+        SpanMatcher[] matchers = new SpanMatcher[3 + 2 * workItems];
+        matchers[0] = span().root()
+                .operationName("trace-parent")
+                .resourceName("trace-parent")
+                .tags(componentTrace(), defaultTags());
+        matchers[1] = span().id(Worker.publisherParentId)
+                .childOf(Worker.traceParentId)
+                .operationName("publisher-parent")
+                .resourceName("publisher-parent")
+                .tags(defaultTags());
+        matchers[2] = span().id(Worker.intermediateId)
+                .childOf(Worker.publisherParentId)
+                .operationName("intermediate")
+                .resourceName("intermediate")
+                .tags(defaultTags());
+        for (int i = 0; i < 2 * workItems; i += 2) {
+            matchers[3 + i] = span().childOf(Worker.publisherParentId)
+                    .operationName("addOne")
+                    .tags(componentTrace(), defaultTags());
+            matchers[4 + i] = span().childOf(Worker.publisherParentId)
+                    .operationName("addTwo")
+                    .tags(componentTrace(), defaultTags());
+        }
+
+        assertTraces(trace(SORT_BY_START_TIME, matchers));
     }
 
-    assertTraces(trace(SORT_BY_START_TIME, matchers));
-  }
-
-  // --- Schedulers ----------------------------------------------------------
-
-  static List<Arguments> schedulerArgs() {
-    return Arrays.asList(
-        Arguments.of("new-thread", Schedulers.newThread()),
-        Arguments.of("computation", Schedulers.computation()),
-        Arguments.of("single", Schedulers.single()),
-        Arguments.of("trampoline", Schedulers.trampoline()));
-  }
-
-  @ParameterizedTest(name = "Flowables produce the right number of results on ''{0}'' scheduler")
-  @MethodSource("schedulerArgs")
-  void schedulers(String schedulerName, Scheduler scheduler) {
-    List<String> values =
-        Flowable.fromIterable(Arrays.asList(1, 2, 3, 4))
-            .parallel()
-            .runOn(scheduler)
-            .flatMap(
-                num ->
-                    Maybe.just(num.toString() + " on " + Thread.currentThread().getName())
+    // --- Schedulers ----------------------------------------------------------
+
+    static List<Arguments> schedulerArgs() {
+        return Arrays.asList(
+                Arguments.of("new-thread", Schedulers.newThread()),
+                Arguments.of("computation", Schedulers.computation()),
+                Arguments.of("single", Schedulers.single()),
+                Arguments.of("trampoline", Schedulers.trampoline()));
+    }
+
+    @ParameterizedTest(name = "Flowables produce the right number of results on ''{0}'' scheduler")
+    @MethodSource("schedulerArgs")
+    void schedulers(String schedulerName, Scheduler scheduler) {
+        List<String> values = Flowable.fromIterable(Arrays.asList(1, 2, 3, 4))
+                .parallel()
+                .runOn(scheduler)
+                .flatMap(num -> Maybe.just(
+                                num.toString() + " on " + Thread.currentThread().getName())
                         .toFlowable())
-            .sequential()
-            .toList()
-            .blockingGet();
-
-    assertEquals(4, values.size());
-
-    // No trace-parent span is active while the chain is assembled, so the instrumentation must be
-    // non-intrusive: parallel scheduler hops must not synthesize any trace. Flushing makes sure
-    // any span that the instrumentation might have wrongly created on the scheduler threads is
-    // reported before we assert the writer is empty.
-    tracer.flush();
-    assertEquals(
-        0,
-        writer.getTraceCount(),
-        () -> "Unexpected traces emitted without active trace: " + writer);
-  }
-
-  @ParameterizedTest(name = "Flowable propagates context on ''{0}'' scheduler")
-  @MethodSource("schedulerArgs")
-  void flowableParallelContextPropagation(String schedulerName, Scheduler scheduler) {
-    Worker.assemblePublisherUnderTrace(
-        () ->
-            Flowable.fromIterable(Arrays.asList(1, 2, 3, 4))
+                .sequential()
+                .toList()
+                .blockingGet();
+
+        assertEquals(4, values.size());
+
+        // No trace-parent span is active while the chain is assembled, so the instrumentation must be
+        // non-intrusive: parallel scheduler hops must not synthesize any trace. Flushing makes sure
+        // any span that the instrumentation might have wrongly created on the scheduler threads is
+        // reported before we assert the writer is empty.
+        tracer.flush();
+        assertEquals(0, writer.getTraceCount(), () -> "Unexpected traces emitted without active trace: " + writer);
+    }
+
+    @ParameterizedTest(name = "Flowable propagates context on ''{0}'' scheduler")
+    @MethodSource("schedulerArgs")
+    void flowableParallelContextPropagation(String schedulerName, Scheduler scheduler) {
+        Worker.assemblePublisherUnderTrace(() -> Flowable.fromIterable(Arrays.asList(1, 2, 3, 4))
                 .parallel()
                 .runOn(scheduler)
                 .flatMap(num -> Maybe.just(num).map(Worker::addOne).toFlowable())
                 .sequential());
 
-    SpanMatcher[] matchers = new SpanMatcher[6];
-    matchers[0] =
-        span()
-            .root()
-            .operationName("trace-parent")
-            .resourceName("trace-parent")
-            .tags(componentTrace(), defaultTags());
-    matchers[1] =
-        span()
-            .id(Worker.publisherParentId)
-            .childOf(Worker.traceParentId)
-            .operationName("publisher-parent")
-            .resourceName("publisher-parent")
-            .tags(defaultTags());
-    for (int i = 0; i < 4; i++) {
-      matchers[2 + i] =
-          span()
-              .childOf(Worker.publisherParentId)
-              .operationName("addOne")
-              .resourceName("addOne")
-              .tags(componentTrace(), defaultTags());
-    }
+        SpanMatcher[] matchers = new SpanMatcher[6];
+        matchers[0] = span().root()
+                .operationName("trace-parent")
+                .resourceName("trace-parent")
+                .tags(componentTrace(), defaultTags());
+        matchers[1] = span().id(Worker.publisherParentId)
+                .childOf(Worker.traceParentId)
+                .operationName("publisher-parent")
+                .resourceName("publisher-parent")
+                .tags(defaultTags());
+        for (int i = 0; i < 4; i++) {
+            matchers[2 + i] = span().childOf(Worker.publisherParentId)
+                    .operationName("addOne")
+                    .resourceName("addOne")
+                    .tags(componentTrace(), defaultTags());
+        }
 
-    assertTraces(trace(SORT_BY_START_TIME, matchers));
-  }
+        assertTraces(trace(SORT_BY_START_TIME, matchers));
+    }
 
-  // --- No spurious traces outside active trace --------------------------------
+    // --- No spurious traces outside active trace --------------------------------
 
-  // Verifies that CaptureParentSpanAdvice and PropagateParentSpanAdvice are no-ops when there is
-  // no active trace: the instrumentation must not synthesize any spans of its own.
-  static List<Arguments> noSpuriousTracesArgs() {
-    return Arrays.asList(
-        Arguments.of(
-            "observable",
-            (Supplier<Object>)
-                () ->
-                    Observable.fromIterable(Arrays.asList(1, 2, 3, 4))
+    // Verifies that CaptureParentSpanAdvice and PropagateParentSpanAdvice are no-ops when there is
+    // no active trace: the instrumentation must not synthesize any spans of its own.
+    static List<Arguments> noSpuriousTracesArgs() {
+        return Arrays.asList(
+                Arguments.of("observable", (Supplier<Object>) () -> Observable.fromIterable(Arrays.asList(1, 2, 3, 4))
                         .map(i -> i + 1)
                         .toList()
                         .blockingGet()),
-        Arguments.of(
-            "single", (Supplier<Object>) () -> Single.just(1).map(i -> i + 1).blockingGet()));
-  }
-
-  @ParameterizedTest(name = "No spurious traces for ''{0}'' assembled outside active trace")
-  @MethodSource("noSpuriousTracesArgs")
-  void noSpuriousTracesWhenAssembledOutsideTrace(String name, Supplier<Object> supplier) {
-    supplier.get();
-    tracer.flush();
-    assertEquals(
-        0,
-        writer.getTraceCount(),
-        () -> "Unexpected traces emitted without active trace: " + writer);
-  }
+                Arguments.of("single", (Supplier<Object>)
+                        () -> Single.just(1).map(i -> i + 1).blockingGet()));
+    }
+
+    @ParameterizedTest(name = "No spurious traces for ''{0}'' assembled outside active trace")
+    @MethodSource("noSpuriousTracesArgs")
+    void noSpuriousTracesWhenAssembledOutsideTrace(String name, Supplier<Object> supplier) {
+        supplier.get();
+        tracer.flush();
+        assertEquals(0, writer.getTraceCount(), () -> "Unexpected traces emitted without active trace: " + writer);
+    }
 }
diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/SubscriptionTest.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/SubscriptionTest.java
index cc0a84b42fc..d31fef0c1a4 100644
--- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/SubscriptionTest.java
+++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/SubscriptionTest.java
@@ -21,142 +21,129 @@
 
 class SubscriptionTest extends AbstractInstrumentationTest {
 
-  @Test
-  void maybeSubscriptionPropagatesParentSpan() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(1);
-
-    AgentSpan parent = startSpan("test", "parent");
-    try (ContextScope scope = activateSpan(parent)) {
-      Maybe<Connection> connection = Maybe.create(emitter -> emitter.onSuccess(new Connection()));
-      connection.subscribe(
-          c -> {
-            c.query();
-            latch.countDown();
-          });
-    } finally {
-      parent.finish();
+    @Test
+    void maybeSubscriptionPropagatesParentSpan() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+
+        AgentSpan parent = startSpan("test", "parent");
+        try (ContextScope scope = activateSpan(parent)) {
+            Maybe<Connection> connection = Maybe.create(emitter -> emitter.onSuccess(new Connection()));
+            connection.subscribe(c -> {
+                c.query();
+                latch.countDown();
+            });
+        } finally {
+            parent.finish();
+        }
+        latch.await();
+
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root().operationName("parent"),
+                span().childOfPrevious().operationName("Connection.query")));
     }
-    latch.await();
-
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("parent"),
-            span().childOfPrevious().operationName("Connection.query")));
-  }
-
-  @Test
-  void singleSubscriptionPropagatesParentSpan() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(1);
-
-    AgentSpan parent = startSpan("test", "parent");
-    try (ContextScope scope = activateSpan(parent)) {
-      Single<Connection> connection = Single.create(emitter -> emitter.onSuccess(new Connection()));
-      connection.subscribe(
-          c -> {
-            c.query();
-            latch.countDown();
-          });
-    } finally {
-      parent.finish();
+
+    @Test
+    void singleSubscriptionPropagatesParentSpan() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+
+        AgentSpan parent = startSpan("test", "parent");
+        try (ContextScope scope = activateSpan(parent)) {
+            Single<Connection> connection = Single.create(emitter -> emitter.onSuccess(new Connection()));
+            connection.subscribe(c -> {
+                c.query();
+                latch.countDown();
+            });
+        } finally {
+            parent.finish();
+        }
+        latch.await();
+
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root().operationName("parent"),
+                span().childOfPrevious().operationName("Connection.query")));
     }
-    latch.await();
-
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("parent"),
-            span().childOfPrevious().operationName("Connection.query")));
-  }
-
-  @Test
-  void completableSubscriptionPropagatesParentSpan() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(1);
-
-    AgentSpan parent = startSpan("test", "parent");
-    try (ContextScope scope = activateSpan(parent)) {
-      Completable action = Completable.create(emitter -> emitter.onComplete());
-      action.subscribe(
-          () -> {
-            new Connection().query();
-            latch.countDown();
-          });
-    } finally {
-      parent.finish();
+
+    @Test
+    void completableSubscriptionPropagatesParentSpan() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+
+        AgentSpan parent = startSpan("test", "parent");
+        try (ContextScope scope = activateSpan(parent)) {
+            Completable action = Completable.create(emitter -> emitter.onComplete());
+            action.subscribe(() -> {
+                new Connection().query();
+                latch.countDown();
+            });
+        } finally {
+            parent.finish();
+        }
+        latch.await();
+
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root().operationName("parent"),
+                span().childOfPrevious().operationName("Connection.query")));
     }
-    latch.await();
-
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("parent"),
-            span().childOfPrevious().operationName("Connection.query")));
-  }
-
-  @Test
-  void observableSubscriptionPropagatesParentSpan() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(1);
-
-    AgentSpan parent = startSpan("test", "parent");
-    try (ContextScope scope = activateSpan(parent)) {
-      Observable<Connection> connection =
-          Observable.create(
-              emitter -> {
+
+    @Test
+    void observableSubscriptionPropagatesParentSpan() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+
+        AgentSpan parent = startSpan("test", "parent");
+        try (ContextScope scope = activateSpan(parent)) {
+            Observable<Connection> connection = Observable.create(emitter -> {
                 emitter.onNext(new Connection());
                 emitter.onComplete();
-              });
-      connection.subscribe(
-          c -> {
-            c.query();
-            latch.countDown();
-          });
-    } finally {
-      parent.finish();
+            });
+            connection.subscribe(c -> {
+                c.query();
+                latch.countDown();
+            });
+        } finally {
+            parent.finish();
+        }
+        latch.await();
+
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root().operationName("parent"),
+                span().childOfPrevious().operationName("Connection.query")));
     }
-    latch.await();
-
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("parent"),
-            span().childOfPrevious().operationName("Connection.query")));
-  }
-
-  @Test
-  void flowableSubscriptionPropagatesParentSpan() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(1);
-
-    AgentSpan parent = startSpan("test", "parent");
-    try (ContextScope scope = activateSpan(parent)) {
-      Flowable<Connection> connection =
-          Flowable.create(
-              emitter -> {
-                emitter.onNext(new Connection());
-                emitter.onComplete();
-              },
-              BackpressureStrategy.BUFFER);
-      connection.subscribe(
-          c -> {
-            c.query();
-            latch.countDown();
-          });
-    } finally {
-      parent.finish();
+
+    @Test
+    void flowableSubscriptionPropagatesParentSpan() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+
+        AgentSpan parent = startSpan("test", "parent");
+        try (ContextScope scope = activateSpan(parent)) {
+            Flowable<Connection> connection = Flowable.create(
+                    emitter -> {
+                        emitter.onNext(new Connection());
+                        emitter.onComplete();
+                    },
+                    BackpressureStrategy.BUFFER);
+            connection.subscribe(c -> {
+                c.query();
+                latch.countDown();
+            });
+        } finally {
+            parent.finish();
+        }
+        latch.await();
+
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().root().operationName("parent"),
+                span().childOfPrevious().operationName("Connection.query")));
     }
-    latch.await();
-
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span().root().operationName("parent"),
-            span().childOfPrevious().operationName("Connection.query")));
-  }
-
-  static class Connection {
-    int query() {
-      AgentSpan span = startSpan("test", "Connection.query");
-      span.finish();
-      return new Random().nextInt();
+
+    static class Connection {
+        int query() {
+            AgentSpan span = startSpan("test", "Connection.query");
+            span.finish();
+            return new Random().nextInt();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/RandomCallSite.java b/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/RandomCallSite.java
index 47e69e6562a..42c46555578 100644
--- a/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/RandomCallSite.java
+++ b/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/RandomCallSite.java
@@ -12,24 +12,24 @@
 @CallSite(spi = IastCallSites.class)
 public class RandomCallSite {
 
-  @CallSite.Before("boolean scala.util.Random.nextBoolean()")
-  @CallSite.Before("int scala.util.Random.nextInt()")
-  @CallSite.Before("int scala.util.Random.nextInt(int)")
-  @CallSite.Before("long scala.util.Random.nextLong()")
-  @CallSite.Before("float scala.util.Random.nextFloat()")
-  @CallSite.Before("double scala.util.Random.nextDouble()")
-  @CallSite.Before("double scala.util.Random.nextGaussian()")
-  @CallSite.Before("void scala.util.Random.nextBytes(byte[])")
-  @CallSite.Before("java.lang.String scala.util.Random.nextString(int)")
-  @CallSite.Before("char scala.util.Random.nextPrintableChar()")
-  public static void before(@CallSite.This final Random random) {
-    final WeakRandomnessModule module = InstrumentationBridge.WEAK_RANDOMNESS;
-    if (module != null && random != null) {
-      try {
-        module.onWeakRandom(random.getClass());
-      } catch (final Throwable e) {
-        module.onUnexpectedException("random threw", e);
-      }
+    @CallSite.Before("boolean scala.util.Random.nextBoolean()")
+    @CallSite.Before("int scala.util.Random.nextInt()")
+    @CallSite.Before("int scala.util.Random.nextInt(int)")
+    @CallSite.Before("long scala.util.Random.nextLong()")
+    @CallSite.Before("float scala.util.Random.nextFloat()")
+    @CallSite.Before("double scala.util.Random.nextDouble()")
+    @CallSite.Before("double scala.util.Random.nextGaussian()")
+    @CallSite.Before("void scala.util.Random.nextBytes(byte[])")
+    @CallSite.Before("java.lang.String scala.util.Random.nextString(int)")
+    @CallSite.Before("char scala.util.Random.nextPrintableChar()")
+    public static void before(@CallSite.This final Random random) {
+        final WeakRandomnessModule module = InstrumentationBridge.WEAK_RANDOMNESS;
+        if (module != null && random != null) {
+            try {
+                module.onWeakRandom(random.getClass());
+            } catch (final Throwable e) {
+                module.onUnexpectedException("random threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/ScalaJavaConverters.java b/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/ScalaJavaConverters.java
index 4d2113a7c03..ba88c26f4f4 100644
--- a/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/ScalaJavaConverters.java
+++ b/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/ScalaJavaConverters.java
@@ -6,54 +6,54 @@
 
 public class ScalaJavaConverters {
 
-  public static <E> Iterable<E> toIterable(@Nonnull final scala.collection.Iterable<E> iterable) {
-    return new JavaIterable<>(iterable);
-  }
-
-  public static <E> Object[] toArray(@Nullable final scala.collection.Iterable<E> iterable) {
-    if (iterable == null) {
-      return new Object[0];
+    public static <E> Iterable<E> toIterable(@Nonnull final scala.collection.Iterable<E> iterable) {
+        return new JavaIterable<>(iterable);
     }
-    final int size = iterable.size();
-    final Object[] array = new Object[size];
-    int index = 0;
-    for (scala.collection.Iterator<E> iterator = iterable.iterator(); iterator.hasNext(); ) {
-      array[index++] = iterator.next();
+
+    public static <E> Object[] toArray(@Nullable final scala.collection.Iterable<E> iterable) {
+        if (iterable == null) {
+            return new Object[0];
+        }
+        final int size = iterable.size();
+        final Object[] array = new Object[size];
+        int index = 0;
+        for (scala.collection.Iterator<E> iterator = iterable.iterator(); iterator.hasNext(); ) {
+            array[index++] = iterator.next();
+        }
+        return array;
     }
-    return array;
-  }
 
-  public static class JavaIterable<E> implements Iterable<E> {
+    public static class JavaIterable<E> implements Iterable<E> {
 
-    private final scala.collection.Iterable<E> iterable;
+        private final scala.collection.Iterable<E> iterable;
 
-    private JavaIterable(final scala.collection.Iterable<E> iterable) {
-      this.iterable = iterable;
-    }
+        private JavaIterable(final scala.collection.Iterable<E> iterable) {
+            this.iterable = iterable;
+        }
 
-    @Override
-    @Nonnull
-    public Iterator<E> iterator() {
-      return new JavaIterator<>(iterable.iterator());
+        @Override
+        @Nonnull
+        public Iterator<E> iterator() {
+            return new JavaIterator<>(iterable.iterator());
+        }
     }
-  }
 
-  public static class JavaIterator<E> implements Iterator<E> {
+    public static class JavaIterator<E> implements Iterator<E> {
 
-    private final scala.collection.Iterator<E> iterator;
+        private final scala.collection.Iterator<E> iterator;
 
-    private JavaIterator(final scala.collection.Iterator<E> iterator) {
-      this.iterator = iterator;
-    }
+        private JavaIterator(final scala.collection.Iterator<E> iterator) {
+            this.iterator = iterator;
+        }
 
-    @Override
-    public boolean hasNext() {
-      return iterator.hasNext();
-    }
+        @Override
+        public boolean hasNext() {
+            return iterator.hasNext();
+        }
 
-    @Override
-    public E next() {
-      return iterator.next();
+        @Override
+        public E next() {
+            return iterator.next();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/SourceCallSite.java b/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/SourceCallSite.java
index 60423de3802..a8c53b3fc44 100644
--- a/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/SourceCallSite.java
+++ b/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/SourceCallSite.java
@@ -14,53 +14,48 @@
 @CallSite(spi = IastCallSites.class)
 public class SourceCallSite {
 
-  @CallSite.Before(
-      "scala.io.BufferedSource scala.io.Source$.fromFile(java.lang.String, scala.io.Codec)")
-  @CallSite.Before(
-      "scala.io.BufferedSource scala.io.Source$.fromFile(java.lang.String, java.lang.String)")
-  public static void beforeFromFile(@CallSite.Argument(0) @Nullable final String path) {
-    if (path != null) {
-      final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
-      if (module != null) {
-        try {
-          module.onPathTraversal(path);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeFromFile threw", e);
+    @CallSite.Before("scala.io.BufferedSource scala.io.Source$.fromFile(java.lang.String, scala.io.Codec)")
+    @CallSite.Before("scala.io.BufferedSource scala.io.Source$.fromFile(java.lang.String, java.lang.String)")
+    public static void beforeFromFile(@CallSite.Argument(0) @Nullable final String path) {
+        if (path != null) {
+            final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
+            if (module != null) {
+                try {
+                    module.onPathTraversal(path);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("beforeFromFile threw", e);
+                }
+            }
         }
-      }
     }
-  }
 
-  @CallSite.Before(
-      "scala.io.BufferedSource scala.io.Source$.fromFile(java.net.URI, scala.io.Codec)")
-  @CallSite.Before(
-      "scala.io.BufferedSource scala.io.Source$.fromFile(java.net.URI, java.lang.String)")
-  @CallSite.Before("scala.io.BufferedSource scala.io.Source$.fromURI(java.net.URI, scala.io.Codec)")
-  public static void beforeFromURI(@CallSite.Argument(0) @Nullable final URI path) {
-    if (path != null) {
-      final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
-      if (module != null) {
-        try {
-          module.onPathTraversal(path);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeFromURI threw", e);
+    @CallSite.Before("scala.io.BufferedSource scala.io.Source$.fromFile(java.net.URI, scala.io.Codec)")
+    @CallSite.Before("scala.io.BufferedSource scala.io.Source$.fromFile(java.net.URI, java.lang.String)")
+    @CallSite.Before("scala.io.BufferedSource scala.io.Source$.fromURI(java.net.URI, scala.io.Codec)")
+    public static void beforeFromURI(@CallSite.Argument(0) @Nullable final URI path) {
+        if (path != null) {
+            final PathTraversalModule module = InstrumentationBridge.PATH_TRAVERSAL;
+            if (module != null) {
+                try {
+                    module.onPathTraversal(path);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("beforeFromURI threw", e);
+                }
+            }
         }
-      }
     }
-  }
 
-  @CallSite.Before(
-      "scala.io.BufferedSource scala.io.Source$.fromURL(java.lang.String, java.lang.String)")
-  public static void beforeFromURL(@CallSite.Argument(0) @Nullable final String url) {
-    if (url != null) {
-      final SsrfModule module = InstrumentationBridge.SSRF;
-      if (module != null) {
-        try {
-          module.onURLConnection(url);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeFromURL threw", e);
+    @CallSite.Before("scala.io.BufferedSource scala.io.Source$.fromURL(java.lang.String, java.lang.String)")
+    public static void beforeFromURL(@CallSite.Argument(0) @Nullable final String url) {
+        if (url != null) {
+            final SsrfModule module = InstrumentationBridge.SSRF;
+            if (module != null) {
+                try {
+                    module.onURLConnection(url);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("beforeFromURL threw", e);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/StringBuilderCallSite.java b/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/StringBuilderCallSite.java
index bd08bd0b28d..09323ad17b2 100644
--- a/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/StringBuilderCallSite.java
+++ b/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/StringBuilderCallSite.java
@@ -15,105 +15,102 @@
 @CallSite(spi = IastCallSites.class)
 public class StringBuilderCallSite {
 
-  @CallSite.After("void scala.collection.mutable.StringBuilder.<init>(java.lang.String)")
-  @Nonnull
-  public static StringBuilder afterInit(
-      @CallSite.AllArguments @Nonnull final Object[] params,
-      @CallSite.Return @Nonnull final StringBuilder result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
+    @CallSite.After("void scala.collection.mutable.StringBuilder.<init>(java.lang.String)")
+    @Nonnull
+    public static StringBuilder afterInit(
+            @CallSite.AllArguments @Nonnull final Object[] params,
+            @CallSite.Return @Nonnull final StringBuilder result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
 
-        module.onStringBuilderInit(result, (CharSequence) params[0]);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterInit threw", e);
-      }
+                module.onStringBuilderInit(result, (CharSequence) params[0]);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterInit threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After("void scala.collection.mutable.StringBuilder.<init>(int, java.lang.String)")
-  @Nonnull
-  public static StringBuilder afterInitWithCapacity(
-      @CallSite.AllArguments @Nonnull final Object[] params,
-      @CallSite.Return @Nonnull final StringBuilder result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
+    @CallSite.After("void scala.collection.mutable.StringBuilder.<init>(int, java.lang.String)")
+    @Nonnull
+    public static StringBuilder afterInitWithCapacity(
+            @CallSite.AllArguments @Nonnull final Object[] params,
+            @CallSite.Return @Nonnull final StringBuilder result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
 
-        module.onStringBuilderInit(result, (CharSequence) params[1]);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterInitWithCapacity threw", e);
-      }
+                module.onStringBuilderInit(result, (CharSequence) params[1]);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterInitWithCapacity threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After(
-      "scala.collection.mutable.StringBuilder scala.collection.mutable.StringBuilder.append(java.lang.String)")
-  @CallSite.After(
-      "scala.collection.mutable.StringBuilder scala.collection.mutable.StringBuilder.append(scala.collection.mutable.StringBuilder)")
-  @Nonnull
-  public static StringBuilder afterAppend(
-      @CallSite.This @Nonnull final StringBuilder self,
-      @CallSite.Argument(0) @Nullable final CharSequence param,
-      @CallSite.Return @Nonnull final StringBuilder result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringBuilderAppend(self, param);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterAppend threw", e);
-      }
+    @CallSite.After(
+            "scala.collection.mutable.StringBuilder scala.collection.mutable.StringBuilder.append(java.lang.String)")
+    @CallSite.After(
+            "scala.collection.mutable.StringBuilder scala.collection.mutable.StringBuilder.append(scala.collection.mutable.StringBuilder)")
+    @Nonnull
+    public static StringBuilder afterAppend(
+            @CallSite.This @Nonnull final StringBuilder self,
+            @CallSite.Argument(0) @Nullable final CharSequence param,
+            @CallSite.Return @Nonnull final StringBuilder result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringBuilderAppend(self, param);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterAppend threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.Around(
-      "scala.collection.mutable.StringBuilder scala.collection.mutable.StringBuilder.append(java.lang.Object)")
-  @Nonnull
-  @SuppressFBWarnings(
-      "NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE") // we do check for null on self
-  // parameter
-  public static StringBuilder aroundAppend(
-      @CallSite.This @Nullable final StringBuilder self,
-      @CallSite.Argument(0) @Nullable final Object param)
-      throws Throwable {
-    try {
-      if (self == null) {
-        throw new NullPointerException();
-      }
-      final String paramStr = String.valueOf(param);
-      final StringBuilder result = self.append(paramStr);
-      final StringModule module = InstrumentationBridge.STRING;
-      if (module != null) {
+    @CallSite.Around(
+            "scala.collection.mutable.StringBuilder scala.collection.mutable.StringBuilder.append(java.lang.Object)")
+    @Nonnull
+    @SuppressFBWarnings("NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE") // we do check for null on self
+    // parameter
+    public static StringBuilder aroundAppend(
+            @CallSite.This @Nullable final StringBuilder self, @CallSite.Argument(0) @Nullable final Object param)
+            throws Throwable {
         try {
-          module.onStringBuilderAppend(self, paramStr);
+            if (self == null) {
+                throw new NullPointerException();
+            }
+            final String paramStr = String.valueOf(param);
+            final StringBuilder result = self.append(paramStr);
+            final StringModule module = InstrumentationBridge.STRING;
+            if (module != null) {
+                try {
+                    module.onStringBuilderAppend(self, paramStr);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("aroundAppend threw", e);
+                }
+            }
+            return result;
         } catch (final Throwable e) {
-          module.onUnexpectedException("aroundAppend threw", e);
+            final String clazz = StringBuilderCallSite.class.getName();
+            throw StackUtils.filterUntil(
+                    e, s -> s.getClassName().equals(clazz) && s.getMethodName().equals("aroundAppend"));
         }
-      }
-      return result;
-    } catch (final Throwable e) {
-      final String clazz = StringBuilderCallSite.class.getName();
-      throw StackUtils.filterUntil(
-          e, s -> s.getClassName().equals(clazz) && s.getMethodName().equals("aroundAppend"));
     }
-  }
 
-  @CallSite.After("java.lang.String scala.collection.mutable.StringBuilder.toString()")
-  @Nonnull
-  public static String afterToString(
-      @CallSite.This @Nonnull final StringBuilder self,
-      @CallSite.Return @Nonnull final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringBuilderToString(self, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterToString threw", e);
-      }
+    @CallSite.After("java.lang.String scala.collection.mutable.StringBuilder.toString()")
+    @Nonnull
+    public static String afterToString(
+            @CallSite.This @Nonnull final StringBuilder self, @CallSite.Return @Nonnull final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringBuilderToString(self, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterToString threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/StringContextCallSite.java b/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/StringContextCallSite.java
index 8718021e02d..064b77b76f2 100644
--- a/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/StringContextCallSite.java
+++ b/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/StringContextCallSite.java
@@ -11,31 +11,31 @@
 
 @Propagation
 @CallSite(
-    spi = IastCallSites.class,
-    helpers = {
-      ScalaJavaConverters.class,
-      ScalaJavaConverters.JavaIterable.class,
-      ScalaJavaConverters.JavaIterator.class
-    })
+        spi = IastCallSites.class,
+        helpers = {
+            ScalaJavaConverters.class,
+            ScalaJavaConverters.JavaIterable.class,
+            ScalaJavaConverters.JavaIterator.class
+        })
 public class StringContextCallSite {
 
-  @CallSite.After("java.lang.String scala.StringContext.s(scala.collection.Seq)")
-  @CallSite.After("java.lang.String scala.StringContext.raw(scala.collection.Seq)")
-  @Nonnull
-  public static String afterInterpolation(
-      @CallSite.This @Nonnull final StringContext context,
-      @CallSite.Argument final Seq<?> params,
-      @CallSite.Return @Nonnull final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        final Iterable<String> literals = ScalaJavaConverters.toIterable(context.parts());
-        final Object[] args = ScalaJavaConverters.toArray(params);
-        module.onStringFormat(literals, args, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterInterpolation threw", e);
-      }
+    @CallSite.After("java.lang.String scala.StringContext.s(scala.collection.Seq)")
+    @CallSite.After("java.lang.String scala.StringContext.raw(scala.collection.Seq)")
+    @Nonnull
+    public static String afterInterpolation(
+            @CallSite.This @Nonnull final StringContext context,
+            @CallSite.Argument final Seq<?> params,
+            @CallSite.Return @Nonnull final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                final Iterable<String> literals = ScalaJavaConverters.toIterable(context.parts());
+                final Object[] args = ScalaJavaConverters.toArray(params);
+                module.onStringFormat(literals, args, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterInterpolation threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/StringOpsCallSite.java b/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/StringOpsCallSite.java
index 41885b8f6b5..6f5e42e8b3d 100644
--- a/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/StringOpsCallSite.java
+++ b/dd-java-agent/instrumentation/scala/scala-2.10.7/src/main/java/datadog/trace/instrumentation/scala/StringOpsCallSite.java
@@ -11,91 +11,90 @@
 
 @Propagation
 @CallSite(
-    spi = IastCallSites.class,
-    helpers = {
-      ScalaJavaConverters.class,
-      ScalaJavaConverters.JavaIterable.class,
-      ScalaJavaConverters.JavaIterator.class
-    })
+        spi = IastCallSites.class,
+        helpers = {
+            ScalaJavaConverters.class,
+            ScalaJavaConverters.JavaIterable.class,
+            ScalaJavaConverters.JavaIterator.class
+        })
 public class StringOpsCallSite {
 
-  @CallSite.After(
-      "java.lang.String scala.collection.immutable.StringOps.format(scala.collection.Seq)")
-  public static String afterInterpolation(
-      @CallSite.This @Nonnull final StringOps stringOps,
-      @CallSite.Argument(0) final scala.collection.Seq<?> params,
-      @CallSite.Return @Nonnull final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        final Object[] args = ScalaJavaConverters.toArray(params);
-        // Unwrap Scala ScalaNumber types to their underlying Java representation
-        // This replicates Scala's unwrapArg() behavior before calling String.format
-        final Object[] unwrappedArgs = unwrapScalaNumbers(args);
-        module.onStringFormat(stringOps.toString(), unwrappedArgs, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterInterpolation threw", e);
-      }
+    @CallSite.After("java.lang.String scala.collection.immutable.StringOps.format(scala.collection.Seq)")
+    public static String afterInterpolation(
+            @CallSite.This @Nonnull final StringOps stringOps,
+            @CallSite.Argument(0) final scala.collection.Seq<?> params,
+            @CallSite.Return @Nonnull final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                final Object[] args = ScalaJavaConverters.toArray(params);
+                // Unwrap Scala ScalaNumber types to their underlying Java representation
+                // This replicates Scala's unwrapArg() behavior before calling String.format
+                final Object[] unwrappedArgs = unwrapScalaNumbers(args);
+                module.onStringFormat(stringOps.toString(), unwrappedArgs, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterInterpolation threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After(
-      "java.lang.String scala.collection.StringOps$.format$extension(java.lang.String, scala.collection.immutable.Seq)")
-  public static String afterInterpolation(
-      @CallSite.This final Object target, // CSI forces to include the target of the invoke
-      @CallSite.Argument(0) @Nonnull final String pattern,
-      @CallSite.Argument(1) final scala.collection.immutable.Seq<?> params,
-      @CallSite.Return @Nonnull final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        final Object[] args = ScalaJavaConverters.toArray(params);
-        // Unwrap Scala ScalaNumber types to their underlying Java representation
-        // This replicates Scala's unwrapArg() behavior before calling String.format
-        final Object[] unwrappedArgs = unwrapScalaNumbers(args);
-        module.onStringFormat(pattern, unwrappedArgs, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterInterpolation threw", e);
-      }
+    @CallSite.After(
+            "java.lang.String scala.collection.StringOps$.format$extension(java.lang.String, scala.collection.immutable.Seq)")
+    public static String afterInterpolation(
+            @CallSite.This final Object target, // CSI forces to include the target of the invoke
+            @CallSite.Argument(0) @Nonnull final String pattern,
+            @CallSite.Argument(1) final scala.collection.immutable.Seq<?> params,
+            @CallSite.Return @Nonnull final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                final Object[] args = ScalaJavaConverters.toArray(params);
+                // Unwrap Scala ScalaNumber types to their underlying Java representation
+                // This replicates Scala's unwrapArg() behavior before calling String.format
+                final Object[] unwrappedArgs = unwrapScalaNumbers(args);
+                module.onStringFormat(pattern, unwrappedArgs, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterInterpolation threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  /**
-   * Unwraps all Scala ScalaNumber types in an array to their underlying Java representations.
-   *
-   * <p>This method replicates Scala's unwrapArg behavior from StringLike.scala:
-   *
-   * <pre>
-   * private def unwrapArg(arg: Any): AnyRef = arg match {
-   *   case x: ScalaNumber => x.underlying
-   *   case x => x.asInstanceOf[AnyRef]
-   * }
-   * </pre>
-   *
-   * <p>The conversion is:
-   *
-   * <ul>
-   *   <li>scala.math.BigDecimal -> java.math.BigDecimal (via underlying())
-   *   <li>scala.math.BigInt -> java.math.BigInteger (via underlying())
-   *   <li>Other types -> unchanged
-   * </ul>
-   *
-   * <p>This ensures String.format receives java.math.BigDecimal/BigInteger instead of
-   * scala.math.BigDecimal/BigInt, preventing IllegalFormatConversionException while maintaining
-   * correct format results and taint tracking.
-   *
-   * @param args the array of arguments to unwrap (modified in-place)
-   * @return the same array with ScalaNumber instances unwrapped to their Java equivalents
-   */
-  @Nonnull
-  private static Object[] unwrapScalaNumbers(@Nonnull final Object[] args) {
-    for (int i = 0; i < args.length; i++) {
-      if (args[i] instanceof scala.math.ScalaNumber) {
-        args[i] = ((ScalaNumber) args[i]).underlying();
-      }
+    /**
+     * Unwraps all Scala ScalaNumber types in an array to their underlying Java representations.
+     *
+     * <p>This method replicates Scala's unwrapArg behavior from StringLike.scala:
+     *
+     * <pre>
+     * private def unwrapArg(arg: Any): AnyRef = arg match {
+     *   case x: ScalaNumber => x.underlying
+     *   case x => x.asInstanceOf[AnyRef]
+     * }
+     * </pre>
+     *
+     * <p>The conversion is:
+     *
+     * <ul>
+     *   <li>scala.math.BigDecimal -> java.math.BigDecimal (via underlying())
+     *   <li>scala.math.BigInt -> java.math.BigInteger (via underlying())
+     *   <li>Other types -> unchanged
+     * </ul>
+     *
+     * <p>This ensures String.format receives java.math.BigDecimal/BigInteger instead of
+     * scala.math.BigDecimal/BigInt, preventing IllegalFormatConversionException while maintaining
+     * correct format results and taint tracking.
+     *
+     * @param args the array of arguments to unwrap (modified in-place)
+     * @return the same array with ScalaNumber instances unwrapped to their Java equivalents
+     */
+    @Nonnull
+    private static Object[] unwrapScalaNumbers(@Nonnull final Object[] args) {
+        for (int i = 0; i < args.length; i++) {
+            if (args[i] instanceof scala.math.ScalaNumber) {
+                args[i] = ((ScalaNumber) args[i]).underlying();
+            }
+        }
+        return args;
     }
-    return args;
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaConcurrentModule.java b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaConcurrentModule.java
index ae49a131d37..ffae5bd9d16 100644
--- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaConcurrentModule.java
+++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaConcurrentModule.java
@@ -15,31 +15,29 @@
 import java.util.Map;
 
 @AutoService(InstrumenterModule.class)
-public final class ScalaConcurrentModule extends InstrumenterModule.ContextTracking
-    implements ExcludeFilterProvider {
+public final class ScalaConcurrentModule extends InstrumenterModule.ContextTracking implements ExcludeFilterProvider {
 
-  public ScalaConcurrentModule() {
-    super("java_concurrent", "scala_concurrent");
-  }
+    public ScalaConcurrentModule() {
+        super("java_concurrent", "scala_concurrent");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("scala.concurrent.forkjoin.ForkJoinTask", State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("scala.concurrent.forkjoin.ForkJoinTask", State.class.getName());
+    }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    return singletonMap(
-        RUNNABLE_FUTURE,
-        Arrays.asList(
-            "scala.concurrent.forkjoin.ForkJoinTask$AdaptedCallable",
-            "scala.concurrent.forkjoin.ForkJoinTask$AdaptedRunnable",
-            "scala.concurrent.forkjoin.ForkJoinTask$AdaptedRunnableAction"));
-  }
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        return singletonMap(
+                RUNNABLE_FUTURE,
+                Arrays.asList(
+                        "scala.concurrent.forkjoin.ForkJoinTask$AdaptedCallable",
+                        "scala.concurrent.forkjoin.ForkJoinTask$AdaptedRunnable",
+                        "scala.concurrent.forkjoin.ForkJoinTask$AdaptedRunnableAction"));
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new ScalaForkJoinTaskInstrumentation(), new ScalaForkJoinPoolInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(new ScalaForkJoinTaskInstrumentation(), new ScalaForkJoinPoolInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinPoolInstrumentation.java b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinPoolInstrumentation.java
index 595ca5d1f7b..7f1e6a84ac7 100644
--- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinPoolInstrumentation.java
+++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinPoolInstrumentation.java
@@ -16,36 +16,35 @@
 import scala.concurrent.forkjoin.ForkJoinTask;
 
 public final class ScalaForkJoinPoolInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "scala.concurrent.forkjoin.ForkJoinPool";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("doSubmit", "externalPush"))
-            .and(takesArgument(0, named("scala.concurrent.forkjoin.ForkJoinTask"))),
-        getClass().getName() + "$StartTask");
-  }
+    @Override
+    public String instrumentedType() {
+        return "scala.concurrent.forkjoin.ForkJoinPool";
+    }
 
-  public static final class StartTask {
-    @Advice.OnMethodEnter
-    public static <T> void before(@Advice.Argument(0) ForkJoinTask<T> task) {
-      if (!exclude(FORK_JOIN_TASK, task)) {
-        capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("doSubmit", "externalPush"))
+                        .and(takesArgument(0, named("scala.concurrent.forkjoin.ForkJoinTask"))),
+                getClass().getName() + "$StartTask");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static <T> void cleanup(
-        @Advice.Argument(0) ForkJoinTask<T> task, @Advice.Thrown Throwable thrown) {
-      if (null != thrown) {
-        cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
-      }
+    public static final class StartTask {
+        @Advice.OnMethodEnter
+        public static <T> void before(@Advice.Argument(0) ForkJoinTask<T> task) {
+            if (!exclude(FORK_JOIN_TASK, task)) {
+                capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static <T> void cleanup(@Advice.Argument(0) ForkJoinTask<T> task, @Advice.Thrown Throwable thrown) {
+            if (null != thrown) {
+                cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinTaskInstrumentation.java b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinTaskInstrumentation.java
index 37c77580199..154eeac507b 100644
--- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinTaskInstrumentation.java
+++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinTaskInstrumentation.java
@@ -29,55 +29,55 @@
  * ForkJoinPool}: JVM, Akka, Scala, Netty to name a few. This class handles Scala version.
  */
 public final class ScalaForkJoinTaskInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "scala.concurrent.forkjoin.ForkJoinTask";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    // this type is constructed on entry to the JFP, and can be used to track
-    // the lifecycle of tasks
-    return notExcludedByName(FORK_JOIN_TASK)
-        .and(declaresMethod(namedOneOf("exec", "fork", "cancel")))
-        .and(extendsClass(named(hierarchyMarkerType())));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "scala.concurrent.forkjoin.ForkJoinTask";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("doExec", "exec")), getClass().getName() + "$Exec");
-    transformer.applyAdvice(isMethod().and(named("fork")), getClass().getName() + "$Fork");
-    transformer.applyAdvice(isMethod().and(named("cancel")), getClass().getName() + "$Cancel");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        // this type is constructed on entry to the JFP, and can be used to track
+        // the lifecycle of tasks
+        return notExcludedByName(FORK_JOIN_TASK)
+                .and(declaresMethod(namedOneOf("exec", "fork", "cancel")))
+                .and(extendsClass(named(hierarchyMarkerType())));
+    }
 
-  public static final class Exec {
-    @Advice.OnMethodEnter
-    public static <T> ContextScope before(@Advice.This ForkJoinTask<T> task) {
-      return startTaskScope(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("doExec", "exec")), getClass().getName() + "$Exec");
+        transformer.applyAdvice(isMethod().and(named("fork")), getClass().getName() + "$Fork");
+        transformer.applyAdvice(isMethod().and(named("cancel")), getClass().getName() + "$Cancel");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      endTaskScope(scope);
+    public static final class Exec {
+        @Advice.OnMethodEnter
+        public static <T> ContextScope before(@Advice.This ForkJoinTask<T> task) {
+            return startTaskScope(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 
-  public static final class Fork {
-    @Advice.OnMethodEnter
-    public static <T> void fork(@Advice.This ForkJoinTask<T> task) {
-      if (!exclude(FORK_JOIN_TASK, task)) {
-        capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
-      }
+    public static final class Fork {
+        @Advice.OnMethodEnter
+        public static <T> void fork(@Advice.This ForkJoinTask<T> task) {
+            if (!exclude(FORK_JOIN_TASK, task)) {
+                capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+            }
+        }
     }
-  }
 
-  public static final class Cancel {
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static <T> void cancel(@Advice.This ForkJoinTask<T> task) {
-      cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+    public static final class Cancel {
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static <T> void cancel(@Advice.This ForkJoinTask<T> task) {
+            cancelTask(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/groovy/ScalaAsyncChild.java b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/groovy/ScalaAsyncChild.java
index 602d5e82bc8..a2724ebc40a 100644
--- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/groovy/ScalaAsyncChild.java
+++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/groovy/ScalaAsyncChild.java
@@ -4,56 +4,56 @@
 import scala.concurrent.forkjoin.ForkJoinTask;
 
 public class ScalaAsyncChild extends ForkJoinTask implements Runnable, Callable {
-  private final AtomicBoolean blockThread;
-  private final boolean doTraceableWork;
-
-  public ScalaAsyncChild() {
-    this(true, false);
-  }
-
-  @Override
-  public Object getRawResult() {
-    return null;
-  }
-
-  @Override
-  protected void setRawResult(final Object value) {}
-
-  @Override
-  protected boolean exec() {
-    runImpl();
-    return true;
-  }
-
-  public ScalaAsyncChild(final boolean doTraceableWork, final boolean blockThread) {
-    this.doTraceableWork = doTraceableWork;
-    this.blockThread = new AtomicBoolean(blockThread);
-  }
-
-  public void unblock() {
-    blockThread.set(false);
-  }
-
-  @Override
-  public void run() {
-    runImpl();
-  }
-
-  @Override
-  public Object call() throws Exception {
-    runImpl();
-    return null;
-  }
-
-  private void runImpl() {
-    while (blockThread.get()) {
-      // busy-wait to block thread
-    }
-    if (doTraceableWork) {
-      asyncChild();
-    }
-  }
-
-  @Trace(operationName = "asyncChild", resourceName = "asyncChild")
-  private void asyncChild() {}
+    private final AtomicBoolean blockThread;
+    private final boolean doTraceableWork;
+
+    public ScalaAsyncChild() {
+        this(true, false);
+    }
+
+    @Override
+    public Object getRawResult() {
+        return null;
+    }
+
+    @Override
+    protected void setRawResult(final Object value) {}
+
+    @Override
+    protected boolean exec() {
+        runImpl();
+        return true;
+    }
+
+    public ScalaAsyncChild(final boolean doTraceableWork, final boolean blockThread) {
+        this.doTraceableWork = doTraceableWork;
+        this.blockThread = new AtomicBoolean(blockThread);
+    }
+
+    public void unblock() {
+        blockThread.set(false);
+    }
+
+    @Override
+    public void run() {
+        runImpl();
+    }
+
+    @Override
+    public Object call() throws Exception {
+        runImpl();
+        return null;
+    }
+
+    private void runImpl() {
+        while (blockThread.get()) {
+            // busy-wait to block thread
+        }
+        if (doTraceableWork) {
+            asyncChild();
+        }
+    }
+
+    @Trace(operationName = "asyncChild", resourceName = "asyncChild")
+    private void asyncChild() {}
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/java/LinearTask.java b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/java/LinearTask.java
index 0bfd9877d15..c4faf379e37 100644
--- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/java/LinearTask.java
+++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/java/LinearTask.java
@@ -6,38 +6,38 @@
 import scala.concurrent.forkjoin.RecursiveTask;
 
 public class LinearTask extends RecursiveTask<Integer> {
-  private final int depth;
-  private final int parent;
+    private final int depth;
+    private final int parent;
 
-  public LinearTask(int depth) {
-    this(0, depth);
-  }
-
-  private LinearTask(int parent, int depth) {
-    this.parent = parent;
-    this.depth = depth;
-  }
+    public LinearTask(int depth) {
+        this(0, depth);
+    }
 
-  @Override
-  protected Integer compute() {
-    try {
-      // introduces delay to encourage parallelism
-      // which will expose problems with context propagation
-      Thread.sleep(5);
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
+    private LinearTask(int parent, int depth) {
+        this.parent = parent;
+        this.depth = depth;
     }
-    if (parent == depth) {
-      return parent;
-    } else {
-      int next = parent + 1;
-      AgentSpan span = startSpan("test", Integer.toString(next));
-      try (ContextScope scope = activateSpan(span)) {
-        LinearTask child = new LinearTask(next, depth);
-        return child.fork().join();
-      } finally {
-        span.finish();
-      }
+
+    @Override
+    protected Integer compute() {
+        try {
+            // introduces delay to encourage parallelism
+            // which will expose problems with context propagation
+            Thread.sleep(5);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+        if (parent == depth) {
+            return parent;
+        } else {
+            int next = parent + 1;
+            AgentSpan span = startSpan("test", Integer.toString(next));
+            try (ContextScope scope = activateSpan(span)) {
+                LinearTask child = new LinearTask(next, depth);
+                return child.fork().join();
+            } finally {
+                span.finish();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/CallbackRunnableInstrumentation.java b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/CallbackRunnableInstrumentation.java
index 78038465abe..869bbfea546 100644
--- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/CallbackRunnableInstrumentation.java
+++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/CallbackRunnableInstrumentation.java
@@ -17,64 +17,58 @@
 import scala.concurrent.impl.CallbackRunnable;
 import scala.util.Try;
 
-public final class CallbackRunnableInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class CallbackRunnableInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "scala.concurrent.impl.CallbackRunnable";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
-    transformer.applyAdvice(isMethod().and(named("run")), getClass().getName() + "$Run");
-    transformer.applyAdvice(
-        isMethod().and(named("executeWithValue")), getClass().getName() + "$ExecuteWithValue");
-  }
+    @Override
+    public String instrumentedType() {
+        return "scala.concurrent.impl.CallbackRunnable";
+    }
 
-  /** Capture the scope when the promise is created */
-  public static final class Construct {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static <T> void onConstruct(@Advice.This CallbackRunnable<T> task) {
-      capture(InstrumentationContext.get(CallbackRunnable.class, State.class), task);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
+        transformer.applyAdvice(isMethod().and(named("run")), getClass().getName() + "$Run");
+        transformer.applyAdvice(
+                isMethod().and(named("executeWithValue")), getClass().getName() + "$ExecuteWithValue");
     }
-  }
 
-  public static final class Run {
-    @Advice.OnMethodEnter
-    public static <T> ContextScope before(@Advice.This CallbackRunnable<T> task) {
-      return PromiseHelper.runWithContext(
-          InstrumentationContext.get(CallbackRunnable.class, State.class).get(task));
+    /** Capture the scope when the promise is created */
+    public static final class Construct {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static <T> void onConstruct(@Advice.This CallbackRunnable<T> task) {
+            capture(InstrumentationContext.get(CallbackRunnable.class, State.class), task);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      endTaskScope(scope);
+    public static final class Run {
+        @Advice.OnMethodEnter
+        public static <T> ContextScope before(@Advice.This CallbackRunnable<T> task) {
+            return PromiseHelper.runWithContext(InstrumentationContext.get(CallbackRunnable.class, State.class)
+                    .get(task));
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 
-  public static final class ExecuteWithValue {
-    @Advice.OnMethodEnter
-    public static <T> void beforeExecute(
-        @Advice.This CallbackRunnable<T> task, @Advice.Argument(value = 0) Try<T> resolved) {
-      // About to enter an ExecutionContext so capture the Scope if necessary
-      ContextStore<CallbackRunnable, State> contextStore =
-          InstrumentationContext.get(CallbackRunnable.class, State.class);
-      State state = contextStore.get(task);
-      if (PromiseHelper.completionPriority) {
-        state =
-            PromiseHelper.executeCaptureContext(
-                InstrumentationContext.get(Try.class, Context.class),
-                resolved,
-                contextStore,
-                task,
-                state);
-      }
-      // If nothing else has been picked up, then try to pick up the current Scope
-      if (null == state) {
-        capture(contextStore, task);
-      }
+    public static final class ExecuteWithValue {
+        @Advice.OnMethodEnter
+        public static <T> void beforeExecute(
+                @Advice.This CallbackRunnable<T> task, @Advice.Argument(value = 0) Try<T> resolved) {
+            // About to enter an ExecutionContext so capture the Scope if necessary
+            ContextStore<CallbackRunnable, State> contextStore =
+                    InstrumentationContext.get(CallbackRunnable.class, State.class);
+            State state = contextStore.get(task);
+            if (PromiseHelper.completionPriority) {
+                state = PromiseHelper.executeCaptureContext(
+                        InstrumentationContext.get(Try.class, Context.class), resolved, contextStore, task, state);
+            }
+            // If nothing else has been picked up, then try to pick up the current Scope
+            if (null == state) {
+                capture(contextStore, task);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/FutureObjectInstrumentation.java b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/FutureObjectInstrumentation.java
index 97034cddac0..4cf6f8cc252 100644
--- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/FutureObjectInstrumentation.java
+++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/FutureObjectInstrumentation.java
@@ -20,38 +20,36 @@
  * every {@code Future} created via one of the static methods like {@code map} would always pick up
  * that context and propagate it forward, which is quite unexpected and not very relevant.
  */
-public final class FutureObjectInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class FutureObjectInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    // The $ at the end is how Scala encodes a Scala object (as opposed to a class or trait)
-    return "scala.concurrent.Future$";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isTypeInitializer(), getClass().getName() + "$ClassInit");
-  }
+    @Override
+    public String instrumentedType() {
+        // The $ at the end is how Scala encodes a Scala object (as opposed to a class or trait)
+        return "scala.concurrent.Future$";
+    }
 
-  public static final class ClassInit {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static <T> void afterInit() {
-      // This field and method showed up in Scala 2.12, so we need to figure out if it's there
-      try {
-        MethodHandles.Lookup lookup = MethodHandles.publicLookup();
-        MethodHandle mh =
-            lookup.findVirtual(Future$.class, "unit", MethodType.methodType(Future.class));
-        Future<?> unit = (Future<?>) mh.invoke(Future$.MODULE$);
-        Try<?> result = unit.value().get();
-        InstrumentationContext.get(Try.class, Context.class).remove(result);
-      } catch (Throwable ignored) {
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isTypeInitializer(), getClass().getName() + "$ClassInit");
     }
 
-    /** CallbackRunnable was removed in scala 2.13 */
-    private static void muzzleCheck(final CallbackRunnable callback) {
-      callback.run();
+    public static final class ClassInit {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static <T> void afterInit() {
+            // This field and method showed up in Scala 2.12, so we need to figure out if it's there
+            try {
+                MethodHandles.Lookup lookup = MethodHandles.publicLookup();
+                MethodHandle mh = lookup.findVirtual(Future$.class, "unit", MethodType.methodType(Future.class));
+                Future<?> unit = (Future<?>) mh.invoke(Future$.MODULE$);
+                Try<?> result = unit.value().get();
+                InstrumentationContext.get(Try.class, Context.class).remove(result);
+            } catch (Throwable ignored) {
+            }
+        }
+
+        /** CallbackRunnable was removed in scala 2.13 */
+        private static void muzzleCheck(final CallbackRunnable callback) {
+            callback.run();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/PromiseObjectInstrumentation.java b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/PromiseObjectInstrumentation.java
index 28cd365ad9e..3950e9be13e 100644
--- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/PromiseObjectInstrumentation.java
+++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/PromiseObjectInstrumentation.java
@@ -19,41 +19,39 @@
  * to take priority over any spans captured while adding computations to a {@code Future} associated
  * with a {@code Promise}, then we capture the active span when the {@code Try} is resolved.
  */
-public final class PromiseObjectInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class PromiseObjectInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    // The $ at the end is how Scala encodes a Scala object (as opposed to a class or trait)
-    return "scala.concurrent.impl.Promise$";
-  }
+    @Override
+    public String instrumentedType() {
+        // The $ at the end is how Scala encodes a Scala object (as opposed to a class or trait)
+        return "scala.concurrent.impl.Promise$";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("scala$concurrent$impl$Promise$$resolveTry")),
-        getClass().getName() + "$ResolveTry");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("scala$concurrent$impl$Promise$$resolveTry")),
+                getClass().getName() + "$ResolveTry");
+    }
 
-  public static final class ResolveTry {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static <T> void afterResolve(@Advice.Return(readOnly = false) Try<T> resolved) {
-      Context context = currentContext();
-      if (shouldCapture(context)) {
-        ContextStore<Try, Context> contextStore =
-            InstrumentationContext.get(Try.class, Context.class);
-        final Context existing = contextStore.get(resolved);
-        Try<T> next = PromiseHelper.getTry(resolved, context, existing);
-        if (next != resolved) {
-          contextStore.put(next, context);
-          resolved = next;
+    public static final class ResolveTry {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static <T> void afterResolve(@Advice.Return(readOnly = false) Try<T> resolved) {
+            Context context = currentContext();
+            if (shouldCapture(context)) {
+                ContextStore<Try, Context> contextStore = InstrumentationContext.get(Try.class, Context.class);
+                final Context existing = contextStore.get(resolved);
+                Try<T> next = PromiseHelper.getTry(resolved, context, existing);
+                if (next != resolved) {
+                    contextStore.put(next, context);
+                    resolved = next;
+                }
+            }
         }
-      }
-    }
 
-    /** CallbackRunnable was removed in scala 2.13 */
-    private static void muzzleCheck(final CallbackRunnable callback) {
-      callback.run();
+        /** CallbackRunnable was removed in scala 2.13 */
+        private static void muzzleCheck(final CallbackRunnable callback) {
+            callback.run();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/ScalaPromiseModule.java b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/ScalaPromiseModule.java
index 80a0f8cf947..8144b1aea6c 100644
--- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/ScalaPromiseModule.java
+++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/ScalaPromiseModule.java
@@ -20,55 +20,53 @@
 import java.util.Map;
 
 @AutoService(InstrumenterModule.class)
-public final class ScalaPromiseModule extends InstrumenterModule.ContextTracking
-    implements ExcludeFilterProvider {
+public final class ScalaPromiseModule extends InstrumenterModule.ContextTracking implements ExcludeFilterProvider {
 
-  public ScalaPromiseModule() {
-    super("scala_concurrent");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "scala-promise-2.10";
-  }
+    public ScalaPromiseModule() {
+        super("scala_concurrent");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStore = new HashMap<>();
-    contextStore.put("scala.util.Try", Context.class.getName());
-    contextStore.put("scala.concurrent.impl.CallbackRunnable", State.class.getName());
-    return contextStore;
-  }
+    @Override
+    public String muzzleDirective() {
+        return "scala-promise-2.10";
+    }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    // force other instrumentations (e.g. Runnable) not to deal with this type
-    Map<ExcludeFilter.ExcludeType, Collection<String>> map = new HashMap<>();
-    Collection<String> cbr = singleton("scala.concurrent.impl.CallbackRunnable");
-    map.put(RUNNABLE, cbr);
-    map.put(EXECUTOR, cbr);
-    return map;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStore = new HashMap<>();
+        contextStore.put("scala.util.Try", Context.class.getName());
+        contextStore.put("scala.concurrent.impl.CallbackRunnable", State.class.getName());
+        return contextStore;
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {"datadog.trace.instrumentation.scala.PromiseHelper"};
-  }
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        // force other instrumentations (e.g. Runnable) not to deal with this type
+        Map<ExcludeFilter.ExcludeType, Collection<String>> map = new HashMap<>();
+        Collection<String> cbr = singleton("scala.concurrent.impl.CallbackRunnable");
+        map.put(RUNNABLE, cbr);
+        map.put(EXECUTOR, cbr);
+        return map;
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    final InstrumenterConfig config = InstrumenterConfig.get();
-    final List<Instrumenter> instrumenters = new ArrayList<>(3);
-    instrumenters.add(new CallbackRunnableInstrumentation());
-    if (config.isIntegrationEnabled(singleton("scala_future_object"), true)) {
-      instrumenters.add(new FutureObjectInstrumentation());
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {"datadog.trace.instrumentation.scala.PromiseHelper"};
     }
-    // Only enable this if integrations have been enabled and the extra "integration"
-    // scala_promise_completion_priority has been enabled specifically
-    if (config.isIntegrationEnabled(
-        Collections.singletonList("scala_promise_completion_priority"), false)) {
-      instrumenters.add(new PromiseObjectInstrumentation());
+
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        final InstrumenterConfig config = InstrumenterConfig.get();
+        final List<Instrumenter> instrumenters = new ArrayList<>(3);
+        instrumenters.add(new CallbackRunnableInstrumentation());
+        if (config.isIntegrationEnabled(singleton("scala_future_object"), true)) {
+            instrumenters.add(new FutureObjectInstrumentation());
+        }
+        // Only enable this if integrations have been enabled and the extra "integration"
+        // scala_promise_completion_priority has been enabled specifically
+        if (config.isIntegrationEnabled(Collections.singletonList("scala_promise_completion_priority"), false)) {
+            instrumenters.add(new PromiseObjectInstrumentation());
+        }
+        return instrumenters;
     }
-    return instrumenters;
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/DefaultPromiseInstrumentation.java b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/DefaultPromiseInstrumentation.java
index 4af9504adc5..b1acd4c447c 100644
--- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/DefaultPromiseInstrumentation.java
+++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/DefaultPromiseInstrumentation.java
@@ -20,47 +20,45 @@
  * only pick up the completing span if the resolved {@code Try} doesn't have a an existing span set
  * from the {@code resolve} method.
  */
-public final class DefaultPromiseInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class DefaultPromiseInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "scala.concurrent.impl.Promise$DefaultPromise";
-  }
+    @Override
+    public String instrumentedType() {
+        return "scala.concurrent.impl.Promise$DefaultPromise";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("tryComplete0")), getClass().getName() + "$TryComplete");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("tryComplete0")), getClass().getName() + "$TryComplete");
+    }
 
-  public static final class TryComplete {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static <T> void beforeTryComplete(
-        @Advice.Argument(value = 0) Object state,
-        @Advice.Argument(value = 1, readOnly = false) Try<T> resolved) {
-      // If the Promise is already completed, then we don't need to do anything
-      if (state instanceof Try) {
-        return;
-      }
-      Context context = currentContext();
-      if (shouldCapture(context)) {
-        ContextStore<Try, Context> contextStore =
-            InstrumentationContext.get(Try.class, Context.class);
-        Context existing = contextStore.get(resolved);
-        if (existing == null) {
-          Try<T> next = PromiseHelper.getTry(resolved, context, null);
-          if (next != resolved) {
-            contextStore.put(next, context);
-            resolved = next;
-          }
+    public static final class TryComplete {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static <T> void beforeTryComplete(
+                @Advice.Argument(value = 0) Object state,
+                @Advice.Argument(value = 1, readOnly = false) Try<T> resolved) {
+            // If the Promise is already completed, then we don't need to do anything
+            if (state instanceof Try) {
+                return;
+            }
+            Context context = currentContext();
+            if (shouldCapture(context)) {
+                ContextStore<Try, Context> contextStore = InstrumentationContext.get(Try.class, Context.class);
+                Context existing = contextStore.get(resolved);
+                if (existing == null) {
+                    Try<T> next = PromiseHelper.getTry(resolved, context, null);
+                    if (next != resolved) {
+                        contextStore.put(next, context);
+                        resolved = next;
+                    }
+                }
+            }
         }
-      }
-    }
 
-    /** Promise.Transformation was introduced in scala 2.13 */
-    private static void muzzleCheck(final Transformation callback) {
-      callback.submitWithValue(null);
+        /** Promise.Transformation was introduced in scala 2.13 */
+        private static void muzzleCheck(final Transformation callback) {
+            callback.submitWithValue(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/FutureObjectInstrumentation.java b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/FutureObjectInstrumentation.java
index a0de0cc8890..c85ded8a702 100644
--- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/FutureObjectInstrumentation.java
+++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/FutureObjectInstrumentation.java
@@ -16,30 +16,29 @@
  * every {@code Future} created via one of the static methods like {@code map} would always pick up
  * that context and propagate it forward, which is quite unexpected and not very relevant.
  */
-public final class FutureObjectInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class FutureObjectInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    // The $ at the end is how Scala encodes a Scala object (as opposed to a class or trait)
-    return "scala.concurrent.Future$";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isTypeInitializer(), getClass().getName() + "$ClassInit");
-  }
+    @Override
+    public String instrumentedType() {
+        // The $ at the end is how Scala encodes a Scala object (as opposed to a class or trait)
+        return "scala.concurrent.Future$";
+    }
 
-  public static final class ClassInit {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static <T> void afterInit() {
-      Try<?> result = Future$.MODULE$.unit().value().get();
-      InstrumentationContext.get(Try.class, Context.class).remove(result);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isTypeInitializer(), getClass().getName() + "$ClassInit");
     }
 
-    /** Promise.Transformation was introduced in scala 2.13 */
-    private static void muzzleCheck(final Transformation callback) {
-      callback.submitWithValue(null);
+    public static final class ClassInit {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static <T> void afterInit() {
+            Try<?> result = Future$.MODULE$.unit().value().get();
+            InstrumentationContext.get(Try.class, Context.class).remove(result);
+        }
+
+        /** Promise.Transformation was introduced in scala 2.13 */
+        private static void muzzleCheck(final Transformation callback) {
+            callback.submitWithValue(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseObjectInstrumentation.java b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseObjectInstrumentation.java
index d8a17eb04dd..0eb4a529870 100644
--- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseObjectInstrumentation.java
+++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseObjectInstrumentation.java
@@ -19,41 +19,39 @@
  * to take priority over any spans captured while adding computations to a {@code Future} associated
  * with a {@code Promise}, then we capture the active span when the {@code Try} is resolved.
  */
-public final class PromiseObjectInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class PromiseObjectInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    // The $ at the end is how Scala encodes a Scala object (as opposed to a class or trait)
-    return "scala.concurrent.impl.Promise$";
-  }
+    @Override
+    public String instrumentedType() {
+        // The $ at the end is how Scala encodes a Scala object (as opposed to a class or trait)
+        return "scala.concurrent.impl.Promise$";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("scala$concurrent$impl$Promise$$resolve")),
-        getClass().getName() + "$Resolve");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("scala$concurrent$impl$Promise$$resolve")),
+                getClass().getName() + "$Resolve");
+    }
 
-  public static final class Resolve {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static <T> void afterResolve(@Advice.Return(readOnly = false) Try<T> resolved) {
-      Context context = currentContext();
-      if (shouldCapture(context)) {
-        ContextStore<Try, Context> contextStore =
-            InstrumentationContext.get(Try.class, Context.class);
-        Context existing = contextStore.get(resolved);
-        Try<T> next = PromiseHelper.getTry(resolved, context, existing);
-        if (next != resolved) {
-          contextStore.put(next, context);
-          resolved = next;
+    public static final class Resolve {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static <T> void afterResolve(@Advice.Return(readOnly = false) Try<T> resolved) {
+            Context context = currentContext();
+            if (shouldCapture(context)) {
+                ContextStore<Try, Context> contextStore = InstrumentationContext.get(Try.class, Context.class);
+                Context existing = contextStore.get(resolved);
+                Try<T> next = PromiseHelper.getTry(resolved, context, existing);
+                if (next != resolved) {
+                    contextStore.put(next, context);
+                    resolved = next;
+                }
+            }
         }
-      }
-    }
 
-    /** Promise.Transformation was introduced in scala 2.13 */
-    private static void muzzleCheck(final Transformation callback) {
-      callback.submitWithValue(null);
+        /** Promise.Transformation was introduced in scala 2.13 */
+        private static void muzzleCheck(final Transformation callback) {
+            callback.submitWithValue(null);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseTransformationInstrumentation.java b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseTransformationInstrumentation.java
index e57eb714a05..a462f17bd93 100644
--- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseTransformationInstrumentation.java
+++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseTransformationInstrumentation.java
@@ -19,79 +19,74 @@
 import scala.util.Try;
 
 public final class PromiseTransformationInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "scala.concurrent.impl.Promise$Transformation";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArguments(4)), getClass().getName() + "$Construct");
-    transformer.applyAdvice(
-        isMethod().and(named("submitWithValue")), getClass().getName() + "$SubmitWithValue");
-    transformer.applyAdvice(isMethod().and(named("run")), getClass().getName() + "$Run");
-    transformer.applyAdvice(isMethod().and(named("cancel")), getClass().getName() + "$Cancel");
-  }
+    @Override
+    public String instrumentedType() {
+        return "scala.concurrent.impl.Promise$Transformation";
+    }
 
-  public static final class Construct {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static <F, T> void onConstruct(
-        @Advice.This Transformation<F, T> task, @Advice.Argument(3) int xform) {
-      // Do not trace the Noop Transformation
-      if (xform == 0) {
-        return;
-      }
-      capture(InstrumentationContext.get(Transformation.class, State.class), task);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArguments(4)), getClass().getName() + "$Construct");
+        transformer.applyAdvice(
+                isMethod().and(named("submitWithValue")), getClass().getName() + "$SubmitWithValue");
+        transformer.applyAdvice(isMethod().and(named("run")), getClass().getName() + "$Run");
+        transformer.applyAdvice(isMethod().and(named("cancel")), getClass().getName() + "$Cancel");
     }
-  }
 
-  public static final class Run {
-    @Advice.OnMethodEnter
-    public static <F, T> ContextScope before(@Advice.This Transformation<F, T> task) {
-      return PromiseHelper.runWithContext(
-          InstrumentationContext.get(Transformation.class, State.class).get(task));
+    public static final class Construct {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static <F, T> void onConstruct(@Advice.This Transformation<F, T> task, @Advice.Argument(3) int xform) {
+            // Do not trace the Noop Transformation
+            if (xform == 0) {
+                return;
+            }
+            capture(InstrumentationContext.get(Transformation.class, State.class), task);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
-    public static void after(@Advice.Enter ContextScope scope) {
-      endTaskScope(scope);
+    public static final class Run {
+        @Advice.OnMethodEnter
+        public static <F, T> ContextScope before(@Advice.This Transformation<F, T> task) {
+            return PromiseHelper.runWithContext(InstrumentationContext.get(Transformation.class, State.class)
+                    .get(task));
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class)
+        public static void after(@Advice.Enter ContextScope scope) {
+            endTaskScope(scope);
+        }
     }
-  }
 
-  public static final class Cancel {
-    @Advice.OnMethodEnter
-    public static <F, T> void cancel(@Advice.This Transformation<F, T> task) {
-      State state = InstrumentationContext.get(Transformation.class, State.class).get(task);
-      if (null != state) {
-        state.closeContinuation();
-      }
+    public static final class Cancel {
+        @Advice.OnMethodEnter
+        public static <F, T> void cancel(@Advice.This Transformation<F, T> task) {
+            State state = InstrumentationContext.get(Transformation.class, State.class)
+                    .get(task);
+            if (null != state) {
+                state.closeContinuation();
+            }
+        }
     }
-  }
 
-  public static final class SubmitWithValue {
-    @Advice.OnMethodEnter
-    public static <F, T> void beforeExecute(
-        @Advice.This Transformation<F, T> task, @Advice.Argument(value = 0) Try<T> resolved) {
-      // About to enter an ExecutionContext so capture the Scope if necessary
-      ContextStore<Transformation, State> contextStore =
-          InstrumentationContext.get(Transformation.class, State.class);
-      State state = contextStore.get(task);
-      if (PromiseHelper.completionPriority) {
-        state =
-            PromiseHelper.executeCaptureContext(
-                InstrumentationContext.get(Try.class, Context.class),
-                resolved,
-                contextStore,
-                task,
-                state);
-      }
-      // If nothing else has been picked up, then try to pick up the current Scope
-      if (null == state) {
-        capture(contextStore, task);
-      }
+    public static final class SubmitWithValue {
+        @Advice.OnMethodEnter
+        public static <F, T> void beforeExecute(
+                @Advice.This Transformation<F, T> task, @Advice.Argument(value = 0) Try<T> resolved) {
+            // About to enter an ExecutionContext so capture the Scope if necessary
+            ContextStore<Transformation, State> contextStore =
+                    InstrumentationContext.get(Transformation.class, State.class);
+            State state = contextStore.get(task);
+            if (PromiseHelper.completionPriority) {
+                state = PromiseHelper.executeCaptureContext(
+                        InstrumentationContext.get(Try.class, Context.class), resolved, contextStore, task, state);
+            }
+            // If nothing else has been picked up, then try to pick up the current Scope
+            if (null == state) {
+                capture(contextStore, task);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/ScalaPromiseModule.java b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/ScalaPromiseModule.java
index 42d013039ab..0cbaab12370 100644
--- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/ScalaPromiseModule.java
+++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/ScalaPromiseModule.java
@@ -20,57 +20,55 @@
 import java.util.Map;
 
 @AutoService(InstrumenterModule.class)
-public final class ScalaPromiseModule extends InstrumenterModule.ContextTracking
-    implements ExcludeFilterProvider {
+public final class ScalaPromiseModule extends InstrumenterModule.ContextTracking implements ExcludeFilterProvider {
 
-  public ScalaPromiseModule() {
-    super("scala_concurrent");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "scala-promise-2.13";
-  }
+    public ScalaPromiseModule() {
+        super("scala_concurrent");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStore = new HashMap<>();
-    contextStore.put("scala.util.Try", Context.class.getName());
-    contextStore.put("scala.concurrent.impl.Promise$Transformation", State.class.getName());
-    return contextStore;
-  }
+    @Override
+    public String muzzleDirective() {
+        return "scala-promise-2.13";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {"datadog.trace.instrumentation.scala.PromiseHelper"};
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStore = new HashMap<>();
+        contextStore.put("scala.util.Try", Context.class.getName());
+        contextStore.put("scala.concurrent.impl.Promise$Transformation", State.class.getName());
+        return contextStore;
+    }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    // force other instrumentations (e.g. Runnable) not to deal with this type
-    Map<ExcludeFilter.ExcludeType, Collection<String>> map = new HashMap<>();
-    Collection<String> pt = singleton("scala.concurrent.impl.Promise$Transformation");
-    map.put(RUNNABLE, pt);
-    map.put(EXECUTOR, pt);
-    return map;
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {"datadog.trace.instrumentation.scala.PromiseHelper"};
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    final List<Instrumenter> ret = new ArrayList<>(4);
-    final InstrumenterConfig config = InstrumenterConfig.get();
-    // Only enable this if integrations have been enabled and the extra "integration"
-    // scala_promise_completion_priority has been enabled specifically
-    if (config.isIntegrationEnabled(
-        Collections.singletonList("scala_promise_completion_priority"), false)) {
-      ret.add(new DefaultPromiseInstrumentation());
-      ret.add(new PromiseObjectInstrumentation());
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        // force other instrumentations (e.g. Runnable) not to deal with this type
+        Map<ExcludeFilter.ExcludeType, Collection<String>> map = new HashMap<>();
+        Collection<String> pt = singleton("scala.concurrent.impl.Promise$Transformation");
+        map.put(RUNNABLE, pt);
+        map.put(EXECUTOR, pt);
+        return map;
     }
 
-    if (config.isIntegrationEnabled(singleton("scala_future_object"), true)) {
-      ret.add(new FutureObjectInstrumentation());
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        final List<Instrumenter> ret = new ArrayList<>(4);
+        final InstrumenterConfig config = InstrumenterConfig.get();
+        // Only enable this if integrations have been enabled and the extra "integration"
+        // scala_promise_completion_priority has been enabled specifically
+        if (config.isIntegrationEnabled(Collections.singletonList("scala_promise_completion_priority"), false)) {
+            ret.add(new DefaultPromiseInstrumentation());
+            ret.add(new PromiseObjectInstrumentation());
+        }
+
+        if (config.isIntegrationEnabled(singleton("scala_future_object"), true)) {
+            ret.add(new FutureObjectInstrumentation());
+        }
+        ret.add(new PromiseTransformationInstrumentation());
+        return ret;
     }
-    ret.add(new PromiseTransformationInstrumentation());
-    return ret;
-  }
 }
diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/src/main/java/datadog/trace/instrumentation/scala/PromiseHelper.java b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/src/main/java/datadog/trace/instrumentation/scala/PromiseHelper.java
index b3e6b27d7ac..2081bf1b355 100644
--- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/src/main/java/datadog/trace/instrumentation/scala/PromiseHelper.java
+++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/src/main/java/datadog/trace/instrumentation/scala/PromiseHelper.java
@@ -13,92 +13,89 @@
 import scala.util.Try;
 
 public class PromiseHelper {
-  public static final boolean completionPriority =
-      InstrumenterConfig.get()
-          .isIntegrationEnabled(
-              Collections.singletonList("scala_promise_completion_priority"), false);
+    public static final boolean completionPriority = InstrumenterConfig.get()
+            .isIntegrationEnabled(Collections.singletonList("scala_promise_completion_priority"), false);
 
-  /**
-   * Get the {@code Try} that should be associated with the {@code Context}. Will create a new copy
-   * of the {@code Try} if the existing one already has a different {@code Context} associated.
-   *
-   * @param resolved the current Try
-   * @param context the current context
-   * @param existing the currently stored context for the Try
-   * @return the Try that should be associated with the context
-   */
-  public static <T> Try<T> getTry(
-      final Try<T> resolved, final Context context, final Context existing) {
-    // Check if the new context is the same as the currently stored one
-    if (existing == context) {
-      return resolved;
-    }
+    /**
+     * Get the {@code Try} that should be associated with the {@code Context}. Will create a new copy
+     * of the {@code Try} if the existing one already has a different {@code Context} associated.
+     *
+     * @param resolved the current Try
+     * @param context the current context
+     * @param existing the currently stored context for the Try
+     * @return the Try that should be associated with the context
+     */
+    public static <T> Try<T> getTry(final Try<T> resolved, final Context context, final Context existing) {
+        // Check if the new context is the same as the currently stored one
+        if (existing == context) {
+            return resolved;
+        }
 
-    // Otherwise we need to create a new Try to associate the context with
-    if (resolved instanceof Success) {
-      Success<T> success = (Success<T>) resolved;
-      return new Success<>(success.value());
-    } else if (resolved instanceof Failure) {
-      Failure<T> failure = (Failure<T>) resolved;
-      return new Failure<>(failure.exception());
+        // Otherwise we need to create a new Try to associate the context with
+        if (resolved instanceof Success) {
+            Success<T> success = (Success<T>) resolved;
+            return new Success<>(success.value());
+        } else if (resolved instanceof Failure) {
+            Failure<T> failure = (Failure<T>) resolved;
+            return new Failure<>(failure.exception());
+        }
+        return resolved;
     }
-    return resolved;
-  }
 
-  /**
-   * Activate the {@code Context} stored in the {@code State} for the active task, if any, and mark
-   * migration accordingly.
-   *
-   * @param state the State related to the task becoming active.
-   * @return the active ContextScope
-   */
-  public static ContextScope runWithContext(State state) {
-    if (state == null) {
-      return null;
-    }
-    Context context = state.getContext();
-    if (context != Context.root() && context != Context.current()) {
-      return AdviceUtils.startTaskScope(state);
-    } else {
-      state.closeContinuation();
+    /**
+     * Activate the {@code Context} stored in the {@code State} for the active task, if any, and mark
+     * migration accordingly.
+     *
+     * @param state the State related to the task becoming active.
+     * @return the active ContextScope
+     */
+    public static ContextScope runWithContext(State state) {
+        if (state == null) {
+            return null;
+        }
+        Context context = state.getContext();
+        if (context != Context.root() && context != Context.current()) {
+            return AdviceUtils.startTaskScope(state);
+        } else {
+            state.closeContinuation();
+        }
+        return null;
     }
-    return null;
-  }
 
-  /**
-   * Transfer and capture the {@code Context} from the {@code Try} to the task, and store or swap
-   * out the existing {@code Continuation} if any.
-   *
-   * @param tryStore the ContextStore for the Try
-   * @param resolved the Try in question
-   * @param taskStore the ContextStore for the task
-   * @param task the task in question
-   * @param state the current State associated with the task
-   * @return the current or updated state
-   */
-  public static <K> State executeCaptureContext(
-      ContextStore<Try, Context> tryStore,
-      Try<?> resolved,
-      ContextStore<K, State> taskStore,
-      K task,
-      State state) {
-    final Context context = tryStore.get(resolved);
-    // Check if there's no new context, or it's the same as the stored one
-    if (null == context || (null != state && state.getContext() == context)) {
-      return state;
-    }
-    ContextContinuation continuation = context.capture();
-    ContextContinuation existing = null;
-    if (null != state) {
-      existing = state.getAndResetContinuation();
-    } else {
-      state = State.FACTORY.create();
-      taskStore.put(task, state);
-    }
-    state.setOrCancelContinuation(continuation);
-    if (null != existing) {
-      existing.release();
+    /**
+     * Transfer and capture the {@code Context} from the {@code Try} to the task, and store or swap
+     * out the existing {@code Continuation} if any.
+     *
+     * @param tryStore the ContextStore for the Try
+     * @param resolved the Try in question
+     * @param taskStore the ContextStore for the task
+     * @param task the task in question
+     * @param state the current State associated with the task
+     * @return the current or updated state
+     */
+    public static <K> State executeCaptureContext(
+            ContextStore<Try, Context> tryStore,
+            Try<?> resolved,
+            ContextStore<K, State> taskStore,
+            K task,
+            State state) {
+        final Context context = tryStore.get(resolved);
+        // Check if there's no new context, or it's the same as the stored one
+        if (null == context || (null != state && state.getContext() == context)) {
+            return state;
+        }
+        ContextContinuation continuation = context.capture();
+        ContextContinuation existing = null;
+        if (null != state) {
+            existing = state.getAndResetContinuation();
+        } else {
+            state = State.FACTORY.create();
+            taskStore.put(task, state);
+        }
+        state.setOrCancelContinuation(continuation);
+        if (null != existing) {
+            existing.release();
+        }
+        return state;
     }
-    return state;
-  }
 }
diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/DatadogReporter.java b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/DatadogReporter.java
index 8bd83c25569..0d6663d247e 100644
--- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/DatadogReporter.java
+++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/DatadogReporter.java
@@ -29,279 +29,279 @@
 
 public class DatadogReporter {
 
-  private static final String TEST_FRAMEWORK = "scalatest";
-  private static final String TEST_FRAMEWORK_VERSION = ScalatestUtils.getScalatestVersion();
+    private static final String TEST_FRAMEWORK = "scalatest";
+    private static final String TEST_FRAMEWORK_VERSION = ScalatestUtils.getScalatestVersion();
 
-  public static void handle(Event event) {
-    if (event instanceof RunStarting) {
-      start(event);
+    public static void handle(Event event) {
+        if (event instanceof RunStarting) {
+            start(event);
 
-    } else if (event instanceof RunCompleted) {
-      stop(event);
+        } else if (event instanceof RunCompleted) {
+            stop(event);
 
-    } else if (event instanceof RunAborted) {
-      stop(event);
+        } else if (event instanceof RunAborted) {
+            stop(event);
 
-    } else if (event instanceof RunStopped) {
-      stop(event);
+        } else if (event instanceof RunStopped) {
+            stop(event);
 
-    } else if (event instanceof SuiteStarting) {
-      onSuiteStart((SuiteStarting) event);
+        } else if (event instanceof SuiteStarting) {
+            onSuiteStart((SuiteStarting) event);
 
-    } else if (event instanceof SuiteCompleted) {
-      onSuiteFinish((SuiteCompleted) event);
+        } else if (event instanceof SuiteCompleted) {
+            onSuiteFinish((SuiteCompleted) event);
 
-    } else if (event instanceof SuiteAborted) {
-      onSuiteAbort((SuiteAborted) event);
+        } else if (event instanceof SuiteAborted) {
+            onSuiteAbort((SuiteAborted) event);
 
-    } else if (event instanceof TestStarting) {
-      onTestStart((TestStarting) event);
+        } else if (event instanceof TestStarting) {
+            onTestStart((TestStarting) event);
 
-    } else if (event instanceof TestSucceeded) {
-      onTestSuccess((TestSucceeded) event);
+        } else if (event instanceof TestSucceeded) {
+            onTestSuccess((TestSucceeded) event);
 
-    } else if (event instanceof TestFailed) {
-      onTestFailure((TestFailed) event);
+        } else if (event instanceof TestFailed) {
+            onTestFailure((TestFailed) event);
 
-    } else if (event instanceof TestIgnored) {
-      onTestIgnore((TestIgnored) event);
+        } else if (event instanceof TestIgnored) {
+            onTestIgnore((TestIgnored) event);
 
-    } else if (event instanceof TestCanceled) {
-      onTestCancel((TestCanceled) event);
+        } else if (event instanceof TestCanceled) {
+            onTestCancel((TestCanceled) event);
 
-    } else if (event instanceof TestPending) {
-      onTestPending((TestPending) event);
+        } else if (event instanceof TestPending) {
+            onTestPending((TestPending) event);
+        }
     }
-  }
-
-  private static void start(Event event) {
-    int runStamp = event.ordinal().runStamp();
-    RunContext.getOrCreate(runStamp);
-  }
-
-  private static void stop(Event event) {
-    int runStamp = event.ordinal().runStamp();
-    RunContext.destroy(runStamp);
-  }
-
-  private static void onSuiteStart(SuiteStarting event) {
-    int runStamp = event.ordinal().runStamp();
-    RunContext context = RunContext.get(runStamp);
-    if (context == null) {
-      return;
+
+    private static void start(Event event) {
+        int runStamp = event.ordinal().runStamp();
+        RunContext.getOrCreate(runStamp);
+    }
+
+    private static void stop(Event event) {
+        int runStamp = event.ordinal().runStamp();
+        RunContext.destroy(runStamp);
     }
 
-    String testSuiteName = event.suiteId();
-    Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
-    Collection<String> categories = Collections.emptyList();
-    boolean parallelized = true;
-
-    TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
-    eventHandler.onTestSuiteStart(
-        new TestSuiteDescriptor(testSuiteName, testClass),
-        testSuiteName,
-        TEST_FRAMEWORK,
-        TEST_FRAMEWORK_VERSION,
-        testClass,
-        categories,
-        parallelized,
-        TestFrameworkInstrumentation.SCALATEST,
-        null);
-  }
-
-  private static void onSuiteFinish(SuiteCompleted event) {
-    int runStamp = event.ordinal().runStamp();
-    RunContext context = RunContext.get(runStamp);
-    if (context == null) {
-      return;
+    private static void onSuiteStart(SuiteStarting event) {
+        int runStamp = event.ordinal().runStamp();
+        RunContext context = RunContext.get(runStamp);
+        if (context == null) {
+            return;
+        }
+
+        String testSuiteName = event.suiteId();
+        Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
+        Collection<String> categories = Collections.emptyList();
+        boolean parallelized = true;
+
+        TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
+        eventHandler.onTestSuiteStart(
+                new TestSuiteDescriptor(testSuiteName, testClass),
+                testSuiteName,
+                TEST_FRAMEWORK,
+                TEST_FRAMEWORK_VERSION,
+                testClass,
+                categories,
+                parallelized,
+                TestFrameworkInstrumentation.SCALATEST,
+                null);
     }
 
-    String testSuiteName = event.suiteId();
-    Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
+    private static void onSuiteFinish(SuiteCompleted event) {
+        int runStamp = event.ordinal().runStamp();
+        RunContext context = RunContext.get(runStamp);
+        if (context == null) {
+            return;
+        }
 
-    TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
-    eventHandler.onTestSuiteFinish(new TestSuiteDescriptor(testSuiteName, testClass), null);
-  }
+        String testSuiteName = event.suiteId();
+        Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
 
-  private static void onSuiteAbort(SuiteAborted event) {
-    int runStamp = event.ordinal().runStamp();
-    RunContext context = RunContext.get(runStamp);
-    if (context == null) {
-      return;
+        TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
+        eventHandler.onTestSuiteFinish(new TestSuiteDescriptor(testSuiteName, testClass), null);
     }
 
-    String testSuiteName = event.suiteId();
-    Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
-    Throwable throwable = event.throwable().getOrElse(null);
+    private static void onSuiteAbort(SuiteAborted event) {
+        int runStamp = event.ordinal().runStamp();
+        RunContext context = RunContext.get(runStamp);
+        if (context == null) {
+            return;
+        }
 
-    TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
-    eventHandler.onTestSuiteFailure(new TestSuiteDescriptor(testSuiteName, testClass), throwable);
-    eventHandler.onTestSuiteFinish(new TestSuiteDescriptor(testSuiteName, testClass), null);
-  }
+        String testSuiteName = event.suiteId();
+        Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
+        Throwable throwable = event.throwable().getOrElse(null);
 
-  private static void onTestStart(TestStarting event) {
-    int runStamp = event.ordinal().runStamp();
-    RunContext context = RunContext.get(runStamp);
-    if (context == null) {
-      return;
+        TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
+        eventHandler.onTestSuiteFailure(new TestSuiteDescriptor(testSuiteName, testClass), throwable);
+        eventHandler.onTestSuiteFinish(new TestSuiteDescriptor(testSuiteName, testClass), null);
     }
 
-    String testSuiteName = event.suiteId();
-    String testName = event.testName();
-    Object testQualifier = null;
-    String testParameters = null;
-    Collection<String> categories;
-    TestIdentifier testIdentifier = new TestIdentifier(testSuiteName, testName, null);
-    if (context.itrUnskippable(testIdentifier)) {
-      categories = Collections.singletonList(CIConstants.Tags.ITR_UNSKIPPABLE_TAG);
-    } else {
-      categories = Collections.emptyList();
-    }
-    Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
-
-    TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
-    eventHandler.onTestStart(
-        new TestSuiteDescriptor(testSuiteName, testClass),
-        new TestDescriptor(testSuiteName, testClass, testName, testParameters, testQualifier),
-        testName,
-        TEST_FRAMEWORK,
-        TEST_FRAMEWORK_VERSION,
-        testParameters,
-        categories,
-        new TestSourceData(testClass, null, null),
-        null,
-        context.getExecutionTracker(testIdentifier));
-  }
-
-  private static void onTestSuccess(TestSucceeded event) {
-    int runStamp = event.ordinal().runStamp();
-    RunContext context = RunContext.get(runStamp);
-    if (context == null) {
-      return;
+    private static void onTestStart(TestStarting event) {
+        int runStamp = event.ordinal().runStamp();
+        RunContext context = RunContext.get(runStamp);
+        if (context == null) {
+            return;
+        }
+
+        String testSuiteName = event.suiteId();
+        String testName = event.testName();
+        Object testQualifier = null;
+        String testParameters = null;
+        Collection<String> categories;
+        TestIdentifier testIdentifier = new TestIdentifier(testSuiteName, testName, null);
+        if (context.itrUnskippable(testIdentifier)) {
+            categories = Collections.singletonList(CIConstants.Tags.ITR_UNSKIPPABLE_TAG);
+        } else {
+            categories = Collections.emptyList();
+        }
+        Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
+
+        TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
+        eventHandler.onTestStart(
+                new TestSuiteDescriptor(testSuiteName, testClass),
+                new TestDescriptor(testSuiteName, testClass, testName, testParameters, testQualifier),
+                testName,
+                TEST_FRAMEWORK,
+                TEST_FRAMEWORK_VERSION,
+                testParameters,
+                categories,
+                new TestSourceData(testClass, null, null),
+                null,
+                context.getExecutionTracker(testIdentifier));
     }
 
-    String testSuiteName = event.suiteId();
-    Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
-    String testName = event.testName();
-    Object testQualifier = null;
-    String testParameters = null;
-    TestDescriptor testDescriptor =
-        new TestDescriptor(testSuiteName, testClass, testName, testParameters, testQualifier);
-
-    TestIdentifier testIdentifier = new TestIdentifier(testSuiteName, testName, null);
-    TestExecutionTracker executionTracker = context.popExecutionTracker(testIdentifier);
-
-    TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
-    eventHandler.onTestFinish(testDescriptor, null, executionTracker);
-  }
-
-  private static void onTestFailure(TestFailed event) {
-    int runStamp = event.ordinal().runStamp();
-    RunContext context = RunContext.get(runStamp);
-    if (context == null) {
-      return;
+    private static void onTestSuccess(TestSucceeded event) {
+        int runStamp = event.ordinal().runStamp();
+        RunContext context = RunContext.get(runStamp);
+        if (context == null) {
+            return;
+        }
+
+        String testSuiteName = event.suiteId();
+        Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
+        String testName = event.testName();
+        Object testQualifier = null;
+        String testParameters = null;
+        TestDescriptor testDescriptor =
+                new TestDescriptor(testSuiteName, testClass, testName, testParameters, testQualifier);
+
+        TestIdentifier testIdentifier = new TestIdentifier(testSuiteName, testName, null);
+        TestExecutionTracker executionTracker = context.popExecutionTracker(testIdentifier);
+
+        TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
+        eventHandler.onTestFinish(testDescriptor, null, executionTracker);
     }
 
-    String testSuiteName = event.suiteId();
-    Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
-    String testName = event.testName();
-    Object testQualifier = null;
-    String testParameters = null;
-    Throwable throwable = event.throwable().getOrElse(null);
-    TestDescriptor testDescriptor =
-        new TestDescriptor(testSuiteName, testClass, testName, testParameters, testQualifier);
-
-    TestIdentifier testIdentifier = new TestIdentifier(testSuiteName, testName, null);
-    TestExecutionTracker executionTracker = context.popExecutionTracker(testIdentifier);
-
-    TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
-    eventHandler.onTestFailure(testDescriptor, throwable);
-    eventHandler.onTestFinish(testDescriptor, null, executionTracker);
-  }
-
-  private static void onTestIgnore(TestIgnored event) {
-    int runStamp = event.ordinal().runStamp();
-    RunContext context = RunContext.get(runStamp);
-    if (context == null) {
-      return;
+    private static void onTestFailure(TestFailed event) {
+        int runStamp = event.ordinal().runStamp();
+        RunContext context = RunContext.get(runStamp);
+        if (context == null) {
+            return;
+        }
+
+        String testSuiteName = event.suiteId();
+        Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
+        String testName = event.testName();
+        Object testQualifier = null;
+        String testParameters = null;
+        Throwable throwable = event.throwable().getOrElse(null);
+        TestDescriptor testDescriptor =
+                new TestDescriptor(testSuiteName, testClass, testName, testParameters, testQualifier);
+
+        TestIdentifier testIdentifier = new TestIdentifier(testSuiteName, testName, null);
+        TestExecutionTracker executionTracker = context.popExecutionTracker(testIdentifier);
+
+        TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
+        eventHandler.onTestFailure(testDescriptor, throwable);
+        eventHandler.onTestFinish(testDescriptor, null, executionTracker);
     }
 
-    String testSuiteName = event.suiteId();
-    String testName = event.testName();
-    Object testQualifier = null;
-    String testParameters = null;
-    Collection<String> categories = Collections.emptyList();
-    Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
-
-    TestIdentifier skippableTest = new TestIdentifier(testSuiteName, testName, null);
-    SkipReason reason = context.getSkipReason(skippableTest);
-
-    TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
-    eventHandler.onTestIgnore(
-        new TestSuiteDescriptor(testSuiteName, testClass),
-        new TestDescriptor(testSuiteName, testClass, testName, testParameters, testQualifier),
-        testName,
-        TEST_FRAMEWORK,
-        TEST_FRAMEWORK_VERSION,
-        testParameters,
-        categories,
-        new TestSourceData(testClass, null, null),
-        reason != null ? reason.getDescription() : null,
-        context.popExecutionTracker(skippableTest));
-  }
-
-  private static void onTestCancel(TestCanceled event) {
-    int runStamp = event.ordinal().runStamp();
-    RunContext context = RunContext.get(runStamp);
-    if (context == null) {
-      return;
+    private static void onTestIgnore(TestIgnored event) {
+        int runStamp = event.ordinal().runStamp();
+        RunContext context = RunContext.get(runStamp);
+        if (context == null) {
+            return;
+        }
+
+        String testSuiteName = event.suiteId();
+        String testName = event.testName();
+        Object testQualifier = null;
+        String testParameters = null;
+        Collection<String> categories = Collections.emptyList();
+        Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
+
+        TestIdentifier skippableTest = new TestIdentifier(testSuiteName, testName, null);
+        SkipReason reason = context.getSkipReason(skippableTest);
+
+        TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
+        eventHandler.onTestIgnore(
+                new TestSuiteDescriptor(testSuiteName, testClass),
+                new TestDescriptor(testSuiteName, testClass, testName, testParameters, testQualifier),
+                testName,
+                TEST_FRAMEWORK,
+                TEST_FRAMEWORK_VERSION,
+                testParameters,
+                categories,
+                new TestSourceData(testClass, null, null),
+                reason != null ? reason.getDescription() : null,
+                context.popExecutionTracker(skippableTest));
     }
 
-    String testSuiteName = event.suiteId();
-    String testName = event.testName();
-    Object testQualifier = null;
-    String testParameters = null;
-    Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
-    Throwable throwable = event.throwable().getOrElse(null);
-    String reason = throwable != null ? throwable.getMessage() : null;
-
-    TestDescriptor testDescriptor =
-        new TestDescriptor(testSuiteName, testClass, testName, testParameters, testQualifier);
-    TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
-    if (throwable instanceof SuppressedTestFailedException) {
-      eventHandler.onTestFailure(testDescriptor, throwable.getCause());
-    } else {
-      eventHandler.onTestSkip(testDescriptor, reason);
+    private static void onTestCancel(TestCanceled event) {
+        int runStamp = event.ordinal().runStamp();
+        RunContext context = RunContext.get(runStamp);
+        if (context == null) {
+            return;
+        }
+
+        String testSuiteName = event.suiteId();
+        String testName = event.testName();
+        Object testQualifier = null;
+        String testParameters = null;
+        Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
+        Throwable throwable = event.throwable().getOrElse(null);
+        String reason = throwable != null ? throwable.getMessage() : null;
+
+        TestDescriptor testDescriptor =
+                new TestDescriptor(testSuiteName, testClass, testName, testParameters, testQualifier);
+        TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
+        if (throwable instanceof SuppressedTestFailedException) {
+            eventHandler.onTestFailure(testDescriptor, throwable.getCause());
+        } else {
+            eventHandler.onTestSkip(testDescriptor, reason);
+        }
+
+        TestIdentifier testIdentifier = new TestIdentifier(testSuiteName, testName, null);
+        TestExecutionTracker executionTracker = context.popExecutionTracker(testIdentifier);
+
+        eventHandler.onTestFinish(testDescriptor, null, executionTracker);
     }
 
-    TestIdentifier testIdentifier = new TestIdentifier(testSuiteName, testName, null);
-    TestExecutionTracker executionTracker = context.popExecutionTracker(testIdentifier);
-
-    eventHandler.onTestFinish(testDescriptor, null, executionTracker);
-  }
-
-  private static void onTestPending(TestPending event) {
-    int runStamp = event.ordinal().runStamp();
-    RunContext context = RunContext.get(runStamp);
-    if (context == null) {
-      return;
+    private static void onTestPending(TestPending event) {
+        int runStamp = event.ordinal().runStamp();
+        RunContext context = RunContext.get(runStamp);
+        if (context == null) {
+            return;
+        }
+
+        String testSuiteName = event.suiteId();
+        String testName = event.testName();
+        Object testQualifier = null;
+        String testParameters = null;
+        Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
+        String reason = "pending";
+
+        TestDescriptor testDescriptor =
+                new TestDescriptor(testSuiteName, testClass, testName, testParameters, testQualifier);
+        TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
+        eventHandler.onTestSkip(testDescriptor, reason);
+
+        TestIdentifier testIdentifier = new TestIdentifier(testSuiteName, testName, null);
+        TestExecutionTracker executionTracker = context.popExecutionTracker(testIdentifier);
+
+        eventHandler.onTestFinish(testDescriptor, null, executionTracker);
     }
-
-    String testSuiteName = event.suiteId();
-    String testName = event.testName();
-    Object testQualifier = null;
-    String testParameters = null;
-    Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
-    String reason = "pending";
-
-    TestDescriptor testDescriptor =
-        new TestDescriptor(testSuiteName, testClass, testName, testParameters, testQualifier);
-    TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler = context.getEventHandler();
-    eventHandler.onTestSkip(testDescriptor, reason);
-
-    TestIdentifier testIdentifier = new TestIdentifier(testSuiteName, testName, null);
-    TestExecutionTracker executionTracker = context.popExecutionTracker(testIdentifier);
-
-    eventHandler.onTestFinish(testDescriptor, null, executionTracker);
-  }
 }
diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/RunContext.java b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/RunContext.java
index a0e9e378cc4..b700c1703f4 100644
--- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/RunContext.java
+++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/RunContext.java
@@ -25,156 +25,146 @@
 
 public class RunContext {
 
-  private static final ConcurrentMap<Integer, RunContext> CONTEXTS = new ConcurrentHashMap<>();
-
-  public static RunContext getOrCreate(int runStamp) {
-    return CONTEXTS.computeIfAbsent(runStamp, RunContext::new);
-  }
+    private static final ConcurrentMap<Integer, RunContext> CONTEXTS = new ConcurrentHashMap<>();
 
-  public static RunContext get(int runStamp) {
-    return CONTEXTS.get(runStamp);
-  }
+    public static RunContext getOrCreate(int runStamp) {
+        return CONTEXTS.computeIfAbsent(runStamp, RunContext::new);
+    }
+
+    public static RunContext get(int runStamp) {
+        return CONTEXTS.get(runStamp);
+    }
+
+    public static void destroy(int runStamp) {
+        RunContext context = CONTEXTS.remove(runStamp);
+        if (context != null) {
+            context.destroy();
+        }
+    }
+
+    private final int runStamp;
+
+    private final TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler =
+            InstrumentationBridge.createTestEventsHandler("scalatest", null, null, ScalatestUtils.CAPABILITIES);
+
+    private final java.util.Map<TestIdentifier, SkipReason> skipReasonByTest = new ConcurrentHashMap<>();
+    private final java.util.Map<TestIdentifier, Collection<String>> tagsByTest = new ConcurrentHashMap<>();
+    private final java.util.Map<TestIdentifier, TestExecutionPolicy> executionPolicies = new ConcurrentHashMap<>();
+
+    public RunContext(int runStamp) {
+        this.runStamp = runStamp;
+    }
+
+    public int getRunStamp() {
+        return runStamp;
+    }
+
+    public TestEventsHandler<TestSuiteDescriptor, TestDescriptor> getEventHandler() {
+        return eventHandler;
+    }
+
+    public SkipReason getSkipReason(TestIdentifier test) {
+        return skipReasonByTest.remove(test);
+    }
+
+    public boolean itrUnskippable(TestIdentifier test) {
+        return tagsByTest.getOrDefault(test, Collections.emptyList()).contains(CIConstants.Tags.ITR_UNSKIPPABLE_TAG);
+    }
+
+    public Collection<String> tags(TestIdentifier test) {
+        return tagsByTest.getOrDefault(test, Collections.emptyList());
+    }
+
+    public void populateTags(
+            String suiteId,
+            Map<String, Set<String>> tags,
+            scala.collection.immutable.List<Tuple2<String, Boolean>> namesAndSkipStatuses) {
+        Iterator<Tuple2<String, Boolean>> it = namesAndSkipStatuses.iterator();
+        while (it.hasNext()) {
+            Tuple2<String, Boolean> nameAndSkipStatus = it.next();
+            String testName = nameAndSkipStatus._1();
+            TestIdentifier test = new TestIdentifier(suiteId, testName, null);
+            populateTags(test, tags);
+        }
+    }
 
-  public static void destroy(int runStamp) {
-    RunContext context = CONTEXTS.remove(runStamp);
-    if (context != null) {
-      context.destroy();
+    public scala.collection.immutable.List<Tuple2<String, Boolean>> skip(
+            String suiteId, scala.collection.immutable.List<Tuple2<String, Boolean>> namesAndSkipStatuses) {
+        java.util.List<Tuple2<String, Boolean>> modifiedNamesAndSkipStatuses =
+                new ArrayList<>(namesAndSkipStatuses.size());
+        Iterator<Tuple2<String, Boolean>> it = namesAndSkipStatuses.iterator();
+        while (it.hasNext()) {
+            Tuple2<String, Boolean> nameAndSkipStatus = skip(suiteId, it.next());
+            modifiedNamesAndSkipStatuses.add(nameAndSkipStatus);
+        }
+        return JavaConverters.asScalaBuffer(modifiedNamesAndSkipStatuses).toList();
     }
-  }
 
-  private final int runStamp;
+    private Tuple2<String, Boolean> skip(String suiteId, Tuple2<String, Boolean> testNameAndSkipStatus) {
+        if (testNameAndSkipStatus._2()) {
+            return testNameAndSkipStatus; // test already skipped
+        }
 
-  private final TestEventsHandler<TestSuiteDescriptor, TestDescriptor> eventHandler =
-      InstrumentationBridge.createTestEventsHandler(
-          "scalatest", null, null, ScalatestUtils.CAPABILITIES);
+        String testName = testNameAndSkipStatus._1();
+        TestIdentifier test = new TestIdentifier(suiteId, testName, null);
 
-  private final java.util.Map<TestIdentifier, SkipReason> skipReasonByTest =
-      new ConcurrentHashMap<>();
-  private final java.util.Map<TestIdentifier, Collection<String>> tagsByTest =
-      new ConcurrentHashMap<>();
-  private final java.util.Map<TestIdentifier, TestExecutionPolicy> executionPolicies =
-      new ConcurrentHashMap<>();
+        SkipReason skipReason = eventHandler.skipReason(test);
+        if (skipReason == null || skipReason == SkipReason.ITR && itrUnskippable(test)) {
+            return testNameAndSkipStatus;
+        }
 
-  public RunContext(int runStamp) {
-    this.runStamp = runStamp;
-  }
+        skipReasonByTest.put(test, skipReason);
+        return new Tuple2<>(testName, true);
+    }
+
+    public void populateTags(TestIdentifier test, Map<String, Set<String>> tags) {
+        Option<Set<String>> testTagsOption = tags.get(test.getName());
+        if (testTagsOption.isEmpty()) {
+            return;
+        }
+
+        Set<String> testTags = testTagsOption.get();
+        if (testTags != null) {
+            tagsByTest.put(test, JavaConverters.asJavaCollection(testTags));
+        }
+    }
 
-  public int getRunStamp() {
-    return runStamp;
-  }
+    public boolean skip(TestIdentifier test, Map<String, Set<String>> tags) {
+        SkipReason skipReason = eventHandler.skipReason(test);
+        if (skipReason == null) {
+            return false;
+        }
 
-  public TestEventsHandler<TestSuiteDescriptor, TestDescriptor> getEventHandler() {
-    return eventHandler;
-  }
+        if (skipReason == SkipReason.ITR && itrUnskippable(test)) {
+            return false;
+        }
 
-  public SkipReason getSkipReason(TestIdentifier test) {
-    return skipReasonByTest.remove(test);
-  }
-
-  public boolean itrUnskippable(TestIdentifier test) {
-    return tagsByTest
-        .getOrDefault(test, Collections.emptyList())
-        .contains(CIConstants.Tags.ITR_UNSKIPPABLE_TAG);
-  }
-
-  public Collection<String> tags(TestIdentifier test) {
-    return tagsByTest.getOrDefault(test, Collections.emptyList());
-  }
-
-  public void populateTags(
-      String suiteId,
-      Map<String, Set<String>> tags,
-      scala.collection.immutable.List<Tuple2<String, Boolean>> namesAndSkipStatuses) {
-    Iterator<Tuple2<String, Boolean>> it = namesAndSkipStatuses.iterator();
-    while (it.hasNext()) {
-      Tuple2<String, Boolean> nameAndSkipStatus = it.next();
-      String testName = nameAndSkipStatus._1();
-      TestIdentifier test = new TestIdentifier(suiteId, testName, null);
-      populateTags(test, tags);
-    }
-  }
-
-  public scala.collection.immutable.List<Tuple2<String, Boolean>> skip(
-      String suiteId,
-      scala.collection.immutable.List<Tuple2<String, Boolean>> namesAndSkipStatuses) {
-    java.util.List<Tuple2<String, Boolean>> modifiedNamesAndSkipStatuses =
-        new ArrayList<>(namesAndSkipStatuses.size());
-    Iterator<Tuple2<String, Boolean>> it = namesAndSkipStatuses.iterator();
-    while (it.hasNext()) {
-      Tuple2<String, Boolean> nameAndSkipStatus = skip(suiteId, it.next());
-      modifiedNamesAndSkipStatuses.add(nameAndSkipStatus);
-    }
-    return JavaConverters.asScalaBuffer(modifiedNamesAndSkipStatuses).toList();
-  }
-
-  private Tuple2<String, Boolean> skip(
-      String suiteId, Tuple2<String, Boolean> testNameAndSkipStatus) {
-    if (testNameAndSkipStatus._2()) {
-      return testNameAndSkipStatus; // test already skipped
-    }
-
-    String testName = testNameAndSkipStatus._1();
-    TestIdentifier test = new TestIdentifier(suiteId, testName, null);
-
-    SkipReason skipReason = eventHandler.skipReason(test);
-    if (skipReason == null || skipReason == SkipReason.ITR && itrUnskippable(test)) {
-      return testNameAndSkipStatus;
-    }
-
-    skipReasonByTest.put(test, skipReason);
-    return new Tuple2<>(testName, true);
-  }
-
-  public void populateTags(TestIdentifier test, Map<String, Set<String>> tags) {
-    Option<Set<String>> testTagsOption = tags.get(test.getName());
-    if (testTagsOption.isEmpty()) {
-      return;
-    }
-
-    Set<String> testTags = testTagsOption.get();
-    if (testTags != null) {
-      tagsByTest.put(test, JavaConverters.asJavaCollection(testTags));
-    }
-  }
-
-  public boolean skip(TestIdentifier test, Map<String, Set<String>> tags) {
-    SkipReason skipReason = eventHandler.skipReason(test);
-    if (skipReason == null) {
-      return false;
-    }
-
-    if (skipReason == SkipReason.ITR && itrUnskippable(test)) {
-      return false;
-    }
-
-    skipReasonByTest.put(test, skipReason);
-    return true;
-  }
-
-  public TestExecutionPolicy getOrCreateExecutionPolicy(
-      TestIdentifier testIdentifier, TestSourceData testSourceData, Collection<String> testTags) {
-    return executionPolicies.computeIfAbsent(
-        testIdentifier, test -> eventHandler.executionPolicy(test, testSourceData, testTags));
-  }
-
-  @Nullable
-  public TestExecutionTracker getExecutionTracker(TestIdentifier testIdentifier) {
-    return executionPolicies.get(testIdentifier);
-  }
-
-  @Nullable
-  public TestExecutionTracker popExecutionTracker(TestIdentifier testIdentifier) {
-    TestExecutionPolicy[] holder = new TestExecutionPolicy[1];
-    executionPolicies.computeIfPresent(
-        testIdentifier,
-        (ti, policy) -> {
-          holder[0] = policy;
-          return policy.applicable() ? policy : null;
+        skipReasonByTest.put(test, skipReason);
+        return true;
+    }
+
+    public TestExecutionPolicy getOrCreateExecutionPolicy(
+            TestIdentifier testIdentifier, TestSourceData testSourceData, Collection<String> testTags) {
+        return executionPolicies.computeIfAbsent(
+                testIdentifier, test -> eventHandler.executionPolicy(test, testSourceData, testTags));
+    }
+
+    @Nullable
+    public TestExecutionTracker getExecutionTracker(TestIdentifier testIdentifier) {
+        return executionPolicies.get(testIdentifier);
+    }
+
+    @Nullable
+    public TestExecutionTracker popExecutionTracker(TestIdentifier testIdentifier) {
+        TestExecutionPolicy[] holder = new TestExecutionPolicy[1];
+        executionPolicies.computeIfPresent(testIdentifier, (ti, policy) -> {
+            holder[0] = policy;
+            return policy.applicable() ? policy : null;
         });
-    return holder[0];
-  }
+        return holder[0];
+    }
 
-  public void destroy() {
-    eventHandler.close();
-  }
+    public void destroy() {
+        eventHandler.close();
+    }
 }
diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestForkInstrumentation.java b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestForkInstrumentation.java
index 544c6084cf0..d8fc6785059 100644
--- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestForkInstrumentation.java
+++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestForkInstrumentation.java
@@ -14,60 +14,60 @@
 
 @AutoService(InstrumenterModule.class)
 public class ScalatestForkInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ScalatestForkInstrumentation() {
-    super("ci-visibility", "scalatest");
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityScalatestForkMonitorEnabled();
-  }
+    public ScalatestForkInstrumentation() {
+        super("ci-visibility", "scalatest");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.scalatest.tools.Framework";
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityScalatestForkMonitorEnabled();
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("runner").and(takesArgument(1, String[].class)),
-        ScalatestForkInstrumentation.class.getName() + "$RunnerAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.scalatest.tools.Framework";
+    }
 
-  /**
-   * This instrumentation is needed to prevent double-reporting of Scalatest events when using SBT
-   * and Test/fork. Current version of the code cannot detect such cases automatically, so it has to
-   * be activated explicitly by setting {@link
-   * CiVisibilityConfig#CIVISIBILITY_SCALATEST_FORK_MONITOR_ENABLED}.
-   *
-   * <p>When using SBT with test forking, Scalatest reporter is activated both in the parent and in
-   * the child process. We only want to instrument the child process (since it is actually executing
-   * the tests) and not the parent one. The way to distinguish between the two is by examining the
-   * "remoteArgs" passed to the runner method: the args are non-empty in the child process, and
-   * empty in the parent one.
-   *
-   * <p>The instrumentation works by increasing the Reporter.class counter in the call depth thread
-   * local map. The counter is decreased when the runner method exits.
-   *
-   * <p>Since the tracing instrumentation is checking the counter value to avoid nested calls,
-   * increasing it here results in effectively disabling the tracing.
-   */
-  public static class RunnerAdvice {
-    @Advice.OnMethodEnter
-    public static void beforeRunnerStart(@Advice.Argument(value = 1) String[] remoteArgs) {
-      if (remoteArgs.length == 0) {
-        CallDepthThreadLocalMap.incrementCallDepth(Reporter.class);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("runner").and(takesArgument(1, String[].class)),
+                ScalatestForkInstrumentation.class.getName() + "$RunnerAdvice");
     }
 
-    @Advice.OnMethodExit
-    public static void afterRunnerStart(@Advice.Argument(value = 1) String[] remoteArgs) {
-      if (remoteArgs.length == 0) {
-        CallDepthThreadLocalMap.decrementCallDepth(Reporter.class);
-      }
+    /**
+     * This instrumentation is needed to prevent double-reporting of Scalatest events when using SBT
+     * and Test/fork. Current version of the code cannot detect such cases automatically, so it has to
+     * be activated explicitly by setting {@link
+     * CiVisibilityConfig#CIVISIBILITY_SCALATEST_FORK_MONITOR_ENABLED}.
+     *
+     * <p>When using SBT with test forking, Scalatest reporter is activated both in the parent and in
+     * the child process. We only want to instrument the child process (since it is actually executing
+     * the tests) and not the parent one. The way to distinguish between the two is by examining the
+     * "remoteArgs" passed to the runner method: the args are non-empty in the child process, and
+     * empty in the parent one.
+     *
+     * <p>The instrumentation works by increasing the Reporter.class counter in the call depth thread
+     * local map. The counter is decreased when the runner method exits.
+     *
+     * <p>Since the tracing instrumentation is checking the counter value to avoid nested calls,
+     * increasing it here results in effectively disabling the tracing.
+     */
+    public static class RunnerAdvice {
+        @Advice.OnMethodEnter
+        public static void beforeRunnerStart(@Advice.Argument(value = 1) String[] remoteArgs) {
+            if (remoteArgs.length == 0) {
+                CallDepthThreadLocalMap.incrementCallDepth(Reporter.class);
+            }
+        }
+
+        @Advice.OnMethodExit
+        public static void afterRunnerStart(@Advice.Argument(value = 1) String[] remoteArgs) {
+            if (remoteArgs.length == 0) {
+                CallDepthThreadLocalMap.decrementCallDepth(Reporter.class);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestInstrumentation.java b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestInstrumentation.java
index d26facf3c41..9ae13891b5d 100644
--- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestInstrumentation.java
+++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestInstrumentation.java
@@ -14,71 +14,68 @@
 
 @AutoService(InstrumenterModule.class)
 public class ScalatestInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public ScalatestInstrumentation() {
-    super("ci-visibility", "scalatest");
-  }
+    public ScalatestInstrumentation() {
+        super("ci-visibility", "scalatest");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.scalatest.DispatchReporter", "org.scalatest.tools.TestSortingReporter",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.scalatest.DispatchReporter", "org.scalatest.tools.TestSortingReporter",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("apply")
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("org.scalatest.events.Event"))),
-        ScalatestInstrumentation.class.getName() + "$DispatchEventAdvice");
-    transformer.applyAdvice(
-        named("fireReadyEvents"),
-        ScalatestInstrumentation.class.getName() + "$SuppressAsyncEventsAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("apply").and(takesArguments(1)).and(takesArgument(0, named("org.scalatest.events.Event"))),
+                ScalatestInstrumentation.class.getName() + "$DispatchEventAdvice");
+        transformer.applyAdvice(
+                named("fireReadyEvents"), ScalatestInstrumentation.class.getName() + "$SuppressAsyncEventsAdvice");
+    }
 
-  public static class DispatchEventAdvice {
-    @Advice.OnMethodEnter
-    public static void onDispatchEvent(@Advice.Argument(value = 0) Event event) {
-      if (CallDepthThreadLocalMap.incrementCallDepth(Reporter.class) != 0) {
-        // nested call
-        return;
-      }
+    public static class DispatchEventAdvice {
+        @Advice.OnMethodEnter
+        public static void onDispatchEvent(@Advice.Argument(value = 0) Event event) {
+            if (CallDepthThreadLocalMap.incrementCallDepth(Reporter.class) != 0) {
+                // nested call
+                return;
+            }
 
-      // Instead of registering our reporter using Scalatest's standard "-C" argument,
-      // we hook into internal reporter.
-      // The reason is that Scalatest invokes registered reporters in a separate thread,
-      // while we need to process events in the thread where they originate.
-      // This is required because test span has to be active in the thread where
-      // corresponding test is being executed,
-      // so that children spans and coverage records
-      // could be properly associated with it.
-      DatadogReporter.handle(event);
-    }
+            // Instead of registering our reporter using Scalatest's standard "-C" argument,
+            // we hook into internal reporter.
+            // The reason is that Scalatest invokes registered reporters in a separate thread,
+            // while we need to process events in the thread where they originate.
+            // This is required because test span has to be active in the thread where
+            // corresponding test is being executed,
+            // so that children spans and coverage records
+            // could be properly associated with it.
+            DatadogReporter.handle(event);
+        }
 
-    @Advice.OnMethodExit
-    public static void afterDispatchEvent() {
-      CallDepthThreadLocalMap.decrementCallDepth(Reporter.class);
+        @Advice.OnMethodExit
+        public static void afterDispatchEvent() {
+            CallDepthThreadLocalMap.decrementCallDepth(Reporter.class);
+        }
     }
-  }
 
-  /**
-   * {@link org.scalatest.tools.TestSortingReporter#fireReadyEvents} is triggered asynchronously. It
-   * fires some events that are then delegated to other reporters. We need to suppress them (by
-   * increasing the call depth so that {@link DispatchEventAdvice} is aborted) as the same events
-   * are reported earlier synchronously from {@link org.scalatest.tools.TestSortingReporter#apply}
-   */
-  public static class SuppressAsyncEventsAdvice {
-    @Advice.OnMethodEnter
-    public static void onAsyncEventsTrigger() {
-      CallDepthThreadLocalMap.incrementCallDepth(Reporter.class);
-    }
+    /**
+     * {@link org.scalatest.tools.TestSortingReporter#fireReadyEvents} is triggered asynchronously. It
+     * fires some events that are then delegated to other reporters. We need to suppress them (by
+     * increasing the call depth so that {@link DispatchEventAdvice} is aborted) as the same events
+     * are reported earlier synchronously from {@link org.scalatest.tools.TestSortingReporter#apply}
+     */
+    public static class SuppressAsyncEventsAdvice {
+        @Advice.OnMethodEnter
+        public static void onAsyncEventsTrigger() {
+            CallDepthThreadLocalMap.incrementCallDepth(Reporter.class);
+        }
 
-    @Advice.OnMethodExit
-    public static void afterAsyncEventsTrigger() {
-      CallDepthThreadLocalMap.decrementCallDepth(Reporter.class);
+        @Advice.OnMethodExit
+        public static void afterAsyncEventsTrigger() {
+            CallDepthThreadLocalMap.decrementCallDepth(Reporter.class);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestSkipInstrumentation.java b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestSkipInstrumentation.java
index 63e0a718890..af2608555fe 100644
--- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestSkipInstrumentation.java
+++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestSkipInstrumentation.java
@@ -19,113 +19,111 @@
 
 @AutoService(InstrumenterModule.class)
 public class ScalatestSkipInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public ScalatestSkipInstrumentation() {
-    super("ci-visibility", "scalatest");
-  }
+    public ScalatestSkipInstrumentation() {
+        super("ci-visibility", "scalatest");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {"org.scalatest.Filter", "org.scalatest.Args"};
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"org.scalatest.Filter", "org.scalatest.Args"};
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("org.scalatest.Filter", packageName + ".RunContext");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.scalatest.Filter", packageName + ".RunContext");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // org.scalatest.Args
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(2, named("org.scalatest.Filter")))
-            .and(takesArgument(5, named("org.scalatest.Tracker"))),
-        ScalatestSkipInstrumentation.class.getName() + "$ArgsContructorAdvice");
-    // org.scalatest.Filter
-    transformer.applyAdvice(
-        named("apply")
-            .and(takesArguments(3))
-            .and(takesArgument(0, String.class))
-            .and(takesArgument(1, named("scala.collection.immutable.Map")))
-            .and(takesArgument(2, String.class)),
-        ScalatestSkipInstrumentation.class.getName() + "$SingleTestFilterAdvice");
-    transformer.applyAdvice(
-        named("apply")
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("scala.collection.immutable.Set")))
-            .and(takesArgument(1, named("scala.collection.immutable.Map")))
-            .and(takesArgument(2, String.class)),
-        ScalatestSkipInstrumentation.class.getName() + "$MultipleTestsFilterAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // org.scalatest.Args
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArgument(2, named("org.scalatest.Filter")))
+                        .and(takesArgument(5, named("org.scalatest.Tracker"))),
+                ScalatestSkipInstrumentation.class.getName() + "$ArgsContructorAdvice");
+        // org.scalatest.Filter
+        transformer.applyAdvice(
+                named("apply")
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, String.class))
+                        .and(takesArgument(1, named("scala.collection.immutable.Map")))
+                        .and(takesArgument(2, String.class)),
+                ScalatestSkipInstrumentation.class.getName() + "$SingleTestFilterAdvice");
+        transformer.applyAdvice(
+                named("apply")
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("scala.collection.immutable.Set")))
+                        .and(takesArgument(1, named("scala.collection.immutable.Map")))
+                        .and(takesArgument(2, String.class)),
+                ScalatestSkipInstrumentation.class.getName() + "$MultipleTestsFilterAdvice");
+    }
 
-  public static class ArgsContructorAdvice {
-    @Advice.OnMethodExit
-    public static void apply(
-        @Advice.Argument(value = 2) Filter filter, @Advice.Argument(value = 5) Tracker tracker) {
-      int runStamp = tracker.nextOrdinal().runStamp();
-      RunContext context = RunContext.getOrCreate(runStamp);
-      RunContext existingContext =
-          InstrumentationContext.get(Filter.class, RunContext.class).getOrPut(filter, context);
-      if (existingContext != context) {
-        // This shouldn't happen.
-        // If it does, instrumentation isn't working as expected, or Scalatest internals changed.
-        // Either of the two means associating filters with runs should be done differently.
-        throw new IllegalStateException(
-            "Attempting to associate filter "
-                + filter
-                + " with runstamp "
-                + runStamp
-                + ", while already associated with "
-                + existingContext.getRunStamp());
-      }
+    public static class ArgsContructorAdvice {
+        @Advice.OnMethodExit
+        public static void apply(
+                @Advice.Argument(value = 2) Filter filter, @Advice.Argument(value = 5) Tracker tracker) {
+            int runStamp = tracker.nextOrdinal().runStamp();
+            RunContext context = RunContext.getOrCreate(runStamp);
+            RunContext existingContext =
+                    InstrumentationContext.get(Filter.class, RunContext.class).getOrPut(filter, context);
+            if (existingContext != context) {
+                // This shouldn't happen.
+                // If it does, instrumentation isn't working as expected, or Scalatest internals changed.
+                // Either of the two means associating filters with runs should be done differently.
+                throw new IllegalStateException("Attempting to associate filter "
+                        + filter
+                        + " with runstamp "
+                        + runStamp
+                        + ", while already associated with "
+                        + existingContext.getRunStamp());
+            }
+        }
     }
-  }
 
-  public static class SingleTestFilterAdvice {
-    @Advice.OnMethodExit
-    public static void apply(
-        @Advice.This Filter filter,
-        @Advice.Return(readOnly = false) Tuple2<Boolean, Boolean> filterResult,
-        @Advice.Argument(value = 0) String testName,
-        @Advice.Argument(value = 1)
-            scala.collection.immutable.Map<String, scala.collection.immutable.Set<String>> tags,
-        @Advice.Argument(value = 2) String suiteId) {
-      if (filterResult == null // filter terminated exceptionally
-          || filterResult._1() // test is filtered
-          || filterResult._2() // test is ignored
-      ) {
-        return;
-      }
-      TestIdentifier test = new TestIdentifier(suiteId, testName, null);
-      RunContext runContext =
-          InstrumentationContext.get(Filter.class, RunContext.class).get(filter);
-      runContext.populateTags(test, tags);
+    public static class SingleTestFilterAdvice {
+        @Advice.OnMethodExit
+        public static void apply(
+                @Advice.This Filter filter,
+                @Advice.Return(readOnly = false) Tuple2<Boolean, Boolean> filterResult,
+                @Advice.Argument(value = 0) String testName,
+                @Advice.Argument(value = 1)
+                        scala.collection.immutable.Map<String, scala.collection.immutable.Set<String>> tags,
+                @Advice.Argument(value = 2) String suiteId) {
+            if (filterResult == null // filter terminated exceptionally
+                    || filterResult._1() // test is filtered
+                    || filterResult._2() // test is ignored
+            ) {
+                return;
+            }
+            TestIdentifier test = new TestIdentifier(suiteId, testName, null);
+            RunContext runContext =
+                    InstrumentationContext.get(Filter.class, RunContext.class).get(filter);
+            runContext.populateTags(test, tags);
 
-      if (runContext.skip(test, tags)) {
-        filterResult = new Tuple2<>(false, true);
-      }
+            if (runContext.skip(test, tags)) {
+                filterResult = new Tuple2<>(false, true);
+            }
+        }
     }
-  }
 
-  public static class MultipleTestsFilterAdvice {
-    @Advice.OnMethodExit
-    public static void apply(
-        @Advice.This Filter filter,
-        @Advice.Return(readOnly = false)
-            scala.collection.immutable.List<Tuple2<String, Boolean>> filterResult,
-        @Advice.Argument(value = 1)
-            scala.collection.immutable.Map<String, scala.collection.immutable.Set<String>> tags,
-        @Advice.Argument(value = 2) String suiteId) {
-      if (filterResult == null /* filter terminated exceptionally */) {
-        return;
-      }
-      RunContext runContext =
-          InstrumentationContext.get(Filter.class, RunContext.class).get(filter);
-      runContext.populateTags(suiteId, tags, filterResult);
+    public static class MultipleTestsFilterAdvice {
+        @Advice.OnMethodExit
+        public static void apply(
+                @Advice.This Filter filter,
+                @Advice.Return(readOnly = false) scala.collection.immutable.List<Tuple2<String, Boolean>> filterResult,
+                @Advice.Argument(value = 1)
+                        scala.collection.immutable.Map<String, scala.collection.immutable.Set<String>> tags,
+                @Advice.Argument(value = 2) String suiteId) {
+            if (filterResult == null /* filter terminated exceptionally */) {
+                return;
+            }
+            RunContext runContext =
+                    InstrumentationContext.get(Filter.class, RunContext.class).get(filter);
+            runContext.populateTags(suiteId, tags, filterResult);
 
-      filterResult = runContext.skip(suiteId, filterResult);
+            filterResult = runContext.skip(suiteId, filterResult);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestUtils.java b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestUtils.java
index c6be5171199..2cf0e2c4ab5 100644
--- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestUtils.java
+++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestUtils.java
@@ -14,56 +14,54 @@
 
 public abstract class ScalatestUtils {
 
-  private static final Logger log = LoggerFactory.getLogger(ScalatestUtils.class);
+    private static final Logger log = LoggerFactory.getLogger(ScalatestUtils.class);
 
-  private static final ClassLoader CLASS_LOADER = Reporter.class.getClassLoader();
+    private static final ClassLoader CLASS_LOADER = Reporter.class.getClassLoader();
 
-  public static final List<LibraryCapability> CAPABILITIES =
-      Arrays.asList(
-          LibraryCapability.TIA,
-          LibraryCapability.EFD,
-          LibraryCapability.ATR,
-          LibraryCapability.IMPACTED,
-          LibraryCapability.FTR,
-          LibraryCapability.QUARANTINE,
-          LibraryCapability.DISABLED,
-          LibraryCapability.ATTEMPT_TO_FIX);
+    public static final List<LibraryCapability> CAPABILITIES = Arrays.asList(
+            LibraryCapability.TIA,
+            LibraryCapability.EFD,
+            LibraryCapability.ATR,
+            LibraryCapability.IMPACTED,
+            LibraryCapability.FTR,
+            LibraryCapability.QUARANTINE,
+            LibraryCapability.DISABLED,
+            LibraryCapability.ATTEMPT_TO_FIX);
 
-  private ScalatestUtils() {}
+    private ScalatestUtils() {}
 
-  public static @Nullable String getScalatestVersion() {
-    try {
-      String className = '/' + Reporter.class.getName().replace('.', '/') + ".class";
-      URL classResource = Reporter.class.getResource(className);
-      if (classResource == null) {
-        return null;
-      }
+    public static @Nullable String getScalatestVersion() {
+        try {
+            String className = '/' + Reporter.class.getName().replace('.', '/') + ".class";
+            URL classResource = Reporter.class.getResource(className);
+            if (classResource == null) {
+                return null;
+            }
 
-      String classPath = classResource.toString();
-      String manifestPath =
-          classPath.substring(0, classPath.lastIndexOf("!") + 1) + "/META-INF/MANIFEST.MF";
-      try (InputStream manifestStream = new java.net.URL(manifestPath).openStream()) {
-        Properties manifestProperties = new Properties();
-        manifestProperties.load(manifestStream);
-        return manifestProperties.getProperty("Bundle-Version");
-      }
+            String classPath = classResource.toString();
+            String manifestPath = classPath.substring(0, classPath.lastIndexOf("!") + 1) + "/META-INF/MANIFEST.MF";
+            try (InputStream manifestStream = new java.net.URL(manifestPath).openStream()) {
+                Properties manifestProperties = new Properties();
+                manifestProperties.load(manifestStream);
+                return manifestProperties.getProperty("Bundle-Version");
+            }
 
-    } catch (Exception e) {
-      return null;
+        } catch (Exception e) {
+            return null;
+        }
     }
-  }
 
-  @Nullable
-  public static Class<?> getClass(Option<String> className) {
-    if (className.isEmpty()) {
-      return null;
+    @Nullable
+    public static Class<?> getClass(Option<String> className) {
+        if (className.isEmpty()) {
+            return null;
+        }
+        try {
+            return CLASS_LOADER.loadClass(className.get());
+        } catch (Exception e) {
+            log.debug("Could not load class {}", className, e);
+            log.warn("Could not load a Scalatest class");
+            return null;
+        }
     }
-    try {
-      return CLASS_LOADER.loadClass(className.get());
-    } catch (Exception e) {
-      log.debug("Could not load class {}", className, e);
-      log.warn("Could not load a Scalatest class");
-      return null;
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/execution/ScalatestExecutionInstrumentation.java b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/execution/ScalatestExecutionInstrumentation.java
index ed206c9e597..75f45f6f421 100644
--- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/execution/ScalatestExecutionInstrumentation.java
+++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/execution/ScalatestExecutionInstrumentation.java
@@ -26,80 +26,76 @@
 
 @AutoService(InstrumenterModule.class)
 public class ScalatestExecutionInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  private final String parentPackageName = Strings.getPackageName(ScalatestUtils.class.getName());
+    private final String parentPackageName = Strings.getPackageName(ScalatestUtils.class.getName());
 
-  public ScalatestExecutionInstrumentation() {
-    super("ci-visibility", "scalatest", "test-retry");
-  }
+    public ScalatestExecutionInstrumentation() {
+        super("ci-visibility", "scalatest", "test-retry");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.scalatest.SuperEngine";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.scalatest.SuperEngine";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("runTestImpl")
-            .and(takesArgument(0, named("org.scalatest.Suite")))
-            .and(takesArgument(1, String.class))
-            .and(takesArgument(2, named("org.scalatest.Args"))),
-        ScalatestExecutionInstrumentation.class.getName() + "$ExecutionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("runTestImpl")
+                        .and(takesArgument(0, named("org.scalatest.Suite")))
+                        .and(takesArgument(1, String.class))
+                        .and(takesArgument(2, named("org.scalatest.Args"))),
+                ScalatestExecutionInstrumentation.class.getName() + "$ExecutionAdvice");
+    }
 
-  public static class ExecutionAdvice {
-    @Advice.OnMethodEnter
-    public static void beforeTest(
-        @Advice.Argument(value = 0) Suite suite,
-        @Advice.Argument(value = 1) String testName,
-        @Advice.Argument(value = 2) Args args,
-        @Advice.Argument(value = 4, readOnly = false)
-            scala.Function1<SuperEngine<?>.TestLeaf, Outcome> invokeWithFixture)
-        throws Throwable {
-      if (!(invokeWithFixture instanceof TestExecutionWrapper)) {
-        int runStamp = args.tracker().nextOrdinal().runStamp();
-        RunContext context = RunContext.getOrCreate(runStamp);
-        TestIdentifier testIdentifier = new TestIdentifier(suite.suiteId(), testName, null);
-        TestSourceData testSourceData = new TestSourceData(suite.getClass(), null, null);
-        TestExecutionPolicy executionPolicy =
-            context.getOrCreateExecutionPolicy(
-                testIdentifier, testSourceData, context.tags(testIdentifier));
+    public static class ExecutionAdvice {
+        @Advice.OnMethodEnter
+        public static void beforeTest(
+                @Advice.Argument(value = 0) Suite suite,
+                @Advice.Argument(value = 1) String testName,
+                @Advice.Argument(value = 2) Args args,
+                @Advice.Argument(value = 4, readOnly = false)
+                        scala.Function1<SuperEngine<?>.TestLeaf, Outcome> invokeWithFixture)
+                throws Throwable {
+            if (!(invokeWithFixture instanceof TestExecutionWrapper)) {
+                int runStamp = args.tracker().nextOrdinal().runStamp();
+                RunContext context = RunContext.getOrCreate(runStamp);
+                TestIdentifier testIdentifier = new TestIdentifier(suite.suiteId(), testName, null);
+                TestSourceData testSourceData = new TestSourceData(suite.getClass(), null, null);
+                TestExecutionPolicy executionPolicy = context.getOrCreateExecutionPolicy(
+                        testIdentifier, testSourceData, context.tags(testIdentifier));
 
-        invokeWithFixture = new TestExecutionWrapper(invokeWithFixture, executionPolicy);
-      }
-    }
+                invokeWithFixture = new TestExecutionWrapper(invokeWithFixture, executionPolicy);
+            }
+        }
 
-    @Advice.OnMethodExit
-    public static void afterTest(
-        @Advice.Origin MethodHandle runTest,
-        @Advice.This SuperEngine engine,
-        @Advice.Argument(value = 0) Suite suite,
-        @Advice.Argument(value = 1) String testName,
-        @Advice.Argument(value = 2) Args args,
-        @Advice.Argument(value = 3) Object includeIcon,
-        @Advice.Argument(value = 4)
-            scala.Function1<SuperEngine<?>.TestLeaf, Outcome> invokeWithFixture,
-        @Advice.Return(readOnly = false) Status status)
-        throws Throwable {
-      TestExecutionWrapper invokeWrapper = (TestExecutionWrapper) invokeWithFixture;
-      if (invokeWrapper.applicable()) {
-        status =
-            (Status)
-                runTest.invokeWithArguments(
-                    engine, suite, testName, args, includeIcon, invokeWithFixture);
-      }
+        @Advice.OnMethodExit
+        public static void afterTest(
+                @Advice.Origin MethodHandle runTest,
+                @Advice.This SuperEngine engine,
+                @Advice.Argument(value = 0) Suite suite,
+                @Advice.Argument(value = 1) String testName,
+                @Advice.Argument(value = 2) Args args,
+                @Advice.Argument(value = 3) Object includeIcon,
+                @Advice.Argument(value = 4) scala.Function1<SuperEngine<?>.TestLeaf, Outcome> invokeWithFixture,
+                @Advice.Return(readOnly = false) Status status)
+                throws Throwable {
+            TestExecutionWrapper invokeWrapper = (TestExecutionWrapper) invokeWithFixture;
+            if (invokeWrapper.applicable()) {
+                status = (Status)
+                        runTest.invokeWithArguments(engine, suite, testName, args, includeIcon, invokeWithFixture);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/execution/SuppressedTestFailedException.java b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/execution/SuppressedTestFailedException.java
index 0cbadb26597..c376cd8413a 100644
--- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/execution/SuppressedTestFailedException.java
+++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/execution/SuppressedTestFailedException.java
@@ -3,7 +3,7 @@
 import org.scalatest.exceptions.TestCanceledException;
 
 public class SuppressedTestFailedException extends TestCanceledException {
-  public SuppressedTestFailedException(String message, Throwable cause, int failedCodeStackDepth) {
-    super(message, cause, failedCodeStackDepth);
-  }
+    public SuppressedTestFailedException(String message, Throwable cause, int failedCodeStackDepth) {
+        super(message, cause, failedCodeStackDepth);
+    }
 }
diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/execution/TestExecutionWrapper.java b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/execution/TestExecutionWrapper.java
index af366582437..9647eab81a6 100644
--- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/execution/TestExecutionWrapper.java
+++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/execution/TestExecutionWrapper.java
@@ -7,31 +7,30 @@
 import scala.Function1;
 
 public class TestExecutionWrapper implements scala.Function1<SuperEngine<?>.TestLeaf, Outcome> {
-  private final scala.Function1<SuperEngine<?>.TestLeaf, Outcome> delegate;
-  private final TestExecutionPolicy executionPolicy;
+    private final scala.Function1<SuperEngine<?>.TestLeaf, Outcome> delegate;
+    private final TestExecutionPolicy executionPolicy;
 
-  public TestExecutionWrapper(
-      Function1<SuperEngine<?>.TestLeaf, Outcome> delegate, TestExecutionPolicy executionPolicy) {
-    this.delegate = delegate;
-    this.executionPolicy = executionPolicy;
-  }
+    public TestExecutionWrapper(
+            Function1<SuperEngine<?>.TestLeaf, Outcome> delegate, TestExecutionPolicy executionPolicy) {
+        this.delegate = delegate;
+        this.executionPolicy = executionPolicy;
+    }
 
-  @Override
-  public Outcome apply(SuperEngine<?>.TestLeaf testLeaf) {
-    Outcome outcome = delegate.apply(testLeaf);
+    @Override
+    public Outcome apply(SuperEngine<?>.TestLeaf testLeaf) {
+        Outcome outcome = delegate.apply(testLeaf);
 
-    if (outcome.isFailed()) {
-      if (executionPolicy.suppressFailures()) {
-        Throwable t = outcome.toOption().get();
-        return Canceled.apply(
-            new SuppressedTestFailedException("Test failed and will be retried", t, 0));
-      }
-    }
+        if (outcome.isFailed()) {
+            if (executionPolicy.suppressFailures()) {
+                Throwable t = outcome.toOption().get();
+                return Canceled.apply(new SuppressedTestFailedException("Test failed and will be retried", t, 0));
+            }
+        }
 
-    return outcome;
-  }
+        return outcome;
+    }
 
-  public boolean applicable() {
-    return executionPolicy.applicable();
-  }
+    public boolean applicable() {
+        return executionPolicy.applicable();
+    }
 }
diff --git a/dd-java-agent/instrumentation/selenium-3.13/src/latestDepTest/java/org/example/TestSucceedMultipleSelenium.java b/dd-java-agent/instrumentation/selenium-3.13/src/latestDepTest/java/org/example/TestSucceedMultipleSelenium.java
index 93822554662..6c5f426b6c4 100644
--- a/dd-java-agent/instrumentation/selenium-3.13/src/latestDepTest/java/org/example/TestSucceedMultipleSelenium.java
+++ b/dd-java-agent/instrumentation/selenium-3.13/src/latestDepTest/java/org/example/TestSucceedMultipleSelenium.java
@@ -11,29 +11,29 @@
 
 public class TestSucceedMultipleSelenium {
 
-  private static WebDriver driver;
+    private static WebDriver driver;
 
-  @BeforeAll
-  public static void setUp() {
-    driver = new HtmlUnitDriver(BrowserVersion.CHROME, true);
-  }
+    @BeforeAll
+    public static void setUp() {
+        driver = new HtmlUnitDriver(BrowserVersion.CHROME, true);
+    }
 
-  @Test
-  public void test_succeed() {
-    WebDriver window = driver.switchTo().newWindow(WindowType.WINDOW);
-    window.get(System.getProperty("selenium-test.dummy-page-url"));
-    Assertions.assertEquals("Selenium Integration Test", window.getTitle());
-  }
+    @Test
+    public void test_succeed() {
+        WebDriver window = driver.switchTo().newWindow(WindowType.WINDOW);
+        window.get(System.getProperty("selenium-test.dummy-page-url"));
+        Assertions.assertEquals("Selenium Integration Test", window.getTitle());
+    }
 
-  @Test
-  public void test_succeed_another() {
-    WebDriver window = driver.switchTo().newWindow(WindowType.WINDOW);
-    window.get(System.getProperty("selenium-test.dummy-page-url"));
-    Assertions.assertEquals("Selenium Integration Test", window.getTitle());
-  }
+    @Test
+    public void test_succeed_another() {
+        WebDriver window = driver.switchTo().newWindow(WindowType.WINDOW);
+        window.get(System.getProperty("selenium-test.dummy-page-url"));
+        Assertions.assertEquals("Selenium Integration Test", window.getTitle());
+    }
 
-  @AfterAll
-  public static void tearDown() {
-    driver.quit();
-  }
+    @AfterAll
+    public static void tearDown() {
+        driver.quit();
+    }
 }
diff --git a/dd-java-agent/instrumentation/selenium-3.13/src/main/java/datadog/trace/instrumentation/selenium/SeleniumInstrumentation.java b/dd-java-agent/instrumentation/selenium-3.13/src/main/java/datadog/trace/instrumentation/selenium/SeleniumInstrumentation.java
index d1032684976..0aa74737eca 100644
--- a/dd-java-agent/instrumentation/selenium-3.13/src/main/java/datadog/trace/instrumentation/selenium/SeleniumInstrumentation.java
+++ b/dd-java-agent/instrumentation/selenium-3.13/src/main/java/datadog/trace/instrumentation/selenium/SeleniumInstrumentation.java
@@ -19,73 +19,70 @@
 
 @AutoService(InstrumenterModule.class)
 public class SeleniumInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public SeleniumInstrumentation() {
-    super("ci-visibility", "selenium");
-  }
+    public SeleniumInstrumentation() {
+        super("ci-visibility", "selenium");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.openqa.selenium.WebDriver";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.openqa.selenium.WebDriver";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(), SeleniumInstrumentation.class.getName() + "$InjectTestListener");
-    transformer.applyAdvice(
-        named("get").and(takesArguments(String.class)),
-        SeleniumInstrumentation.class.getName() + "$GetPageAdvice");
-    transformer.applyAdvice(
-        named("close").and(takesNoArguments()),
-        SeleniumInstrumentation.class.getName() + "$ClosePageAdvice");
-    transformer.applyAdvice(
-        named("quit").and(takesNoArguments()),
-        SeleniumInstrumentation.class.getName() + "$QuitPageAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), SeleniumInstrumentation.class.getName() + "$InjectTestListener");
+        transformer.applyAdvice(
+                named("get").and(takesArguments(String.class)),
+                SeleniumInstrumentation.class.getName() + "$GetPageAdvice");
+        transformer.applyAdvice(
+                named("close").and(takesNoArguments()), SeleniumInstrumentation.class.getName() + "$ClosePageAdvice");
+        transformer.applyAdvice(
+                named("quit").and(takesNoArguments()), SeleniumInstrumentation.class.getName() + "$QuitPageAdvice");
+    }
 
-  public static class InjectTestListener {
-    @Advice.OnMethodExit
-    public static void afterWebDriverCreated() {
-      InstrumentationTestBridge.registerListener(SeleniumTestListener.INSTANCE);
+    public static class InjectTestListener {
+        @Advice.OnMethodExit
+        public static void afterWebDriverCreated() {
+            InstrumentationTestBridge.registerListener(SeleniumTestListener.INSTANCE);
+        }
     }
-  }
 
-  public static class GetPageAdvice {
-    @Advice.OnMethodExit
-    public static void afterPageLoad(@Advice.This WebDriver driver) {
-      TestContext testContext = InstrumentationTestBridge.getCurrentTestContext();
-      if (testContext != null) {
-        testContext.set(WebDriver.class, driver);
-      }
-      SeleniumUtils.afterPageOpen(driver);
+    public static class GetPageAdvice {
+        @Advice.OnMethodExit
+        public static void afterPageLoad(@Advice.This WebDriver driver) {
+            TestContext testContext = InstrumentationTestBridge.getCurrentTestContext();
+            if (testContext != null) {
+                testContext.set(WebDriver.class, driver);
+            }
+            SeleniumUtils.afterPageOpen(driver);
+        }
     }
-  }
 
-  public static class ClosePageAdvice {
-    @Advice.OnMethodEnter
-    public static void beforePageClose(@Advice.This WebDriver driver) {
-      SeleniumUtils.beforePageClose(driver);
+    public static class ClosePageAdvice {
+        @Advice.OnMethodEnter
+        public static void beforePageClose(@Advice.This WebDriver driver) {
+            SeleniumUtils.beforePageClose(driver);
+        }
     }
-  }
 
-  public static class QuitPageAdvice {
-    @Advice.OnMethodEnter
-    public static void beforeBrowserQuit(@Advice.This WebDriver driver) {
-      Set<String> handles = driver.getWindowHandles();
-      if (handles == null) {
-        return;
-      }
-      for (String handle : handles) {
-        WebDriver window = driver.switchTo().window(handle);
-        SeleniumUtils.beforePageClose(window);
-      }
+    public static class QuitPageAdvice {
+        @Advice.OnMethodEnter
+        public static void beforeBrowserQuit(@Advice.This WebDriver driver) {
+            Set<String> handles = driver.getWindowHandles();
+            if (handles == null) {
+                return;
+            }
+            for (String handle : handles) {
+                WebDriver window = driver.switchTo().window(handle);
+                SeleniumUtils.beforePageClose(window);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/selenium-3.13/src/main/java/datadog/trace/instrumentation/selenium/SeleniumTestListener.java b/dd-java-agent/instrumentation/selenium-3.13/src/main/java/datadog/trace/instrumentation/selenium/SeleniumTestListener.java
index 9b2d93af88b..a66411f3f29 100644
--- a/dd-java-agent/instrumentation/selenium-3.13/src/main/java/datadog/trace/instrumentation/selenium/SeleniumTestListener.java
+++ b/dd-java-agent/instrumentation/selenium-3.13/src/main/java/datadog/trace/instrumentation/selenium/SeleniumTestListener.java
@@ -7,22 +7,22 @@
 
 public class SeleniumTestListener implements InstrumentationTestBridge.TestListener {
 
-  public static final InstrumentationTestBridge.TestListener INSTANCE = new SeleniumTestListener();
+    public static final InstrumentationTestBridge.TestListener INSTANCE = new SeleniumTestListener();
 
-  @Override
-  public void beforeTestEnd(TestContext testContext) {
-    WebDriver driver = testContext.get(WebDriver.class);
-    if (driver == null) {
-      return;
-    }
+    @Override
+    public void beforeTestEnd(TestContext testContext) {
+        WebDriver driver = testContext.get(WebDriver.class);
+        if (driver == null) {
+            return;
+        }
 
-    try {
-      driver.getCurrentUrl();
-    } catch (NoSuchSessionException e) {
-      // the driver was closed before the test ended
-      return;
-    }
+        try {
+            driver.getCurrentUrl();
+        } catch (NoSuchSessionException e) {
+            // the driver was closed before the test ended
+            return;
+        }
 
-    SeleniumUtils.beforePageClose(driver);
-  }
+        SeleniumUtils.beforePageClose(driver);
+    }
 }
diff --git a/dd-java-agent/instrumentation/selenium-3.13/src/main/java/datadog/trace/instrumentation/selenium/SeleniumUtils.java b/dd-java-agent/instrumentation/selenium-3.13/src/main/java/datadog/trace/instrumentation/selenium/SeleniumUtils.java
index 5910e3aa3f1..effd2277e58 100644
--- a/dd-java-agent/instrumentation/selenium-3.13/src/main/java/datadog/trace/instrumentation/selenium/SeleniumUtils.java
+++ b/dd-java-agent/instrumentation/selenium-3.13/src/main/java/datadog/trace/instrumentation/selenium/SeleniumUtils.java
@@ -24,178 +24,174 @@
 
 public abstract class SeleniumUtils {
 
-  public static final String SELENIUM_VERSION = getSeleniumVersion();
-
-  private static final String RUM_CONTEXT_COOKIE_NAME = "datadog-ci-visibility-test-execution-id";
-
-  private SeleniumUtils() {}
-
-  @Nullable
-  private static String getSeleniumVersion() {
-    try {
-      String className = '/' + WebDriver.class.getName().replace('.', '/') + ".class";
-      URL classResource = WebDriver.class.getResource(className);
-      if (classResource == null) {
-        return null;
-      }
-
-      String classPath = classResource.toString();
-      String manifestPath =
-          classPath.substring(0, classPath.lastIndexOf("!") + 1) + "/META-INF/MANIFEST.MF";
-      try (InputStream manifestStream = new java.net.URL(manifestPath).openStream()) {
-        Properties manifestProperties = new Properties();
-        manifestProperties.load(manifestStream);
-        return manifestProperties.getProperty("Selenium-Version");
-      }
-
-    } catch (Exception e) {
-      return null;
-    }
-  }
-
-  public static void afterPageOpen(WebDriver driver) {
-    AgentSpan span = activeSpan();
-    if (span == null) {
-      // no active span
-      return;
+    public static final String SELENIUM_VERSION = getSeleniumVersion();
+
+    private static final String RUM_CONTEXT_COOKIE_NAME = "datadog-ci-visibility-test-execution-id";
+
+    private SeleniumUtils() {}
+
+    @Nullable
+    private static String getSeleniumVersion() {
+        try {
+            String className = '/' + WebDriver.class.getName().replace('.', '/') + ".class";
+            URL classResource = WebDriver.class.getResource(className);
+            if (classResource == null) {
+                return null;
+            }
+
+            String classPath = classResource.toString();
+            String manifestPath = classPath.substring(0, classPath.lastIndexOf("!") + 1) + "/META-INF/MANIFEST.MF";
+            try (InputStream manifestStream = new java.net.URL(manifestPath).openStream()) {
+                Properties manifestProperties = new Properties();
+                manifestProperties.load(manifestStream);
+                return manifestProperties.getProperty("Selenium-Version");
+            }
+
+        } catch (Exception e) {
+            return null;
+        }
     }
 
-    String spanType = span.getSpanType();
-    if (spanType == null || !spanType.contentEquals(InternalSpanTypes.TEST)) {
-      // not in a test
-      return;
-    }
+    public static void afterPageOpen(WebDriver driver) {
+        AgentSpan span = activeSpan();
+        if (span == null) {
+            // no active span
+            return;
+        }
 
-    injectRumContext(driver, span.getTraceId());
-  }
+        String spanType = span.getSpanType();
+        if (spanType == null || !spanType.contentEquals(InternalSpanTypes.TEST)) {
+            // not in a test
+            return;
+        }
 
-  private static void injectRumContext(WebDriver driver, DDTraceId traceId) {
-    WebDriver.Options options = driver.manage();
-    // options can be null if the driver has not finished initializing yet
-    // (which is the case when the driver's home page is opened)
-    if (options == null) {
-      return;
-    }
-    try {
-      String domain = getCookieDomain(driver.getCurrentUrl());
-      options.addCookie(new Cookie(RUM_CONTEXT_COOKIE_NAME, traceId.toString(), domain, "/", null));
-    } catch (MalformedURLException e) {
-      // could be "about:blank" or other similar pages,
-      // trying to set a cookie will cause exceptions
-    }
-  }
-
-  private static void clearRumContext(WebDriver driver) {
-    WebDriver.Options options = driver.manage();
-    // options can be null if the driver has not finished initializing yet
-    // (which is the case when the driver's home page is opened)
-    if (options != null) {
-      options.deleteCookieNamed(RUM_CONTEXT_COOKIE_NAME);
-    }
-  }
-
-  @SuppressForbidden
-  static String getCookieDomain(String urlString) throws MalformedURLException {
-    URL url = new URL(urlString);
-    String host = url.getHost();
-    if (isIPV4Address(host)) {
-      return null;
+        injectRumContext(driver, span.getTraceId());
     }
 
-    int idx = host.length();
-    int tokenCount = 0;
-    while (tokenCount < 2 && idx > 0) {
-      idx = host.lastIndexOf('.', idx - 1);
-      tokenCount++;
+    private static void injectRumContext(WebDriver driver, DDTraceId traceId) {
+        WebDriver.Options options = driver.manage();
+        // options can be null if the driver has not finished initializing yet
+        // (which is the case when the driver's home page is opened)
+        if (options == null) {
+            return;
+        }
+        try {
+            String domain = getCookieDomain(driver.getCurrentUrl());
+            options.addCookie(new Cookie(RUM_CONTEXT_COOKIE_NAME, traceId.toString(), domain, "/", null));
+        } catch (MalformedURLException e) {
+            // could be "about:blank" or other similar pages,
+            // trying to set a cookie will cause exceptions
+        }
     }
-    return idx == -1 ? null : host.substring(idx + 1);
-  }
 
-  @SuppressForbidden
-  static boolean isIPV4Address(String host) {
-    if (host == null) {
-      return false;
-    }
-    String[] tokens = host.split("\\.");
-    if (tokens.length != 4) {
-      return false;
-    }
-    for (String token : tokens) {
-      try {
-        int value = Integer.parseInt(token);
-        if (value < 0 || value > 255) {
-          return false;
-        }
-      } catch (NumberFormatException e) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  public static void beforePageClose(WebDriver driver) {
-    AgentSpan span = activeSpan();
-    if (span == null) {
-      // no active span
-      return;
+    private static void clearRumContext(WebDriver driver) {
+        WebDriver.Options options = driver.manage();
+        // options can be null if the driver has not finished initializing yet
+        // (which is the case when the driver's home page is opened)
+        if (options != null) {
+            options.deleteCookieNamed(RUM_CONTEXT_COOKIE_NAME);
+        }
     }
 
-    String spanType = span.getSpanType();
-    if (spanType == null || !spanType.contentEquals(InternalSpanTypes.TEST)) {
-      // not in a test
-      return;
+    @SuppressForbidden
+    static String getCookieDomain(String urlString) throws MalformedURLException {
+        URL url = new URL(urlString);
+        String host = url.getHost();
+        if (isIPV4Address(host)) {
+            return null;
+        }
+
+        int idx = host.length();
+        int tokenCount = 0;
+        while (tokenCount < 2 && idx > 0) {
+            idx = host.lastIndexOf('.', idx - 1);
+            tokenCount++;
+        }
+        return idx == -1 ? null : host.substring(idx + 1);
     }
 
-    span.setTag(Tags.TEST_TYPE, "browser");
-    span.setTag(Tags.TEST_BROWSER_DRIVER, CIConstants.SELENIUM_BROWSER_DRIVER);
-    span.setTag(Tags.TEST_BROWSER_DRIVER_VERSION, SeleniumUtils.SELENIUM_VERSION);
-
-    Capabilities capabilities = SeleniumUtils.getCapabilities(driver);
-    if (capabilities != null) {
-      String browserName = capabilities.getBrowserName();
-      String browserVersion =
-          String.valueOf(
-              Optional.ofNullable(capabilities.getCapability("browserVersion"))
-                  .orElse(Optional.ofNullable(capabilities.getCapability("version")).orElse("")));
-      span.setTag(Tags.TEST_BROWSER_NAME, browserName);
-      span.setTag(Tags.TEST_BROWSER_VERSION, browserVersion);
+    @SuppressForbidden
+    static boolean isIPV4Address(String host) {
+        if (host == null) {
+            return false;
+        }
+        String[] tokens = host.split("\\.");
+        if (tokens.length != 4) {
+            return false;
+        }
+        for (String token : tokens) {
+            try {
+                int value = Integer.parseInt(token);
+                if (value < 0 || value > 255) {
+                    return false;
+                }
+            } catch (NumberFormatException e) {
+                return false;
+            }
+        }
+        return true;
     }
 
-    if (driver instanceof JavascriptExecutor
-        && SeleniumUtils.isRumAvailable((JavascriptExecutor) driver)) {
-      span.setTag(Tags.TEST_IS_RUM_ACTIVE, true);
-      stopRumSession((JavascriptExecutor) driver);
+    public static void beforePageClose(WebDriver driver) {
+        AgentSpan span = activeSpan();
+        if (span == null) {
+            // no active span
+            return;
+        }
+
+        String spanType = span.getSpanType();
+        if (spanType == null || !spanType.contentEquals(InternalSpanTypes.TEST)) {
+            // not in a test
+            return;
+        }
+
+        span.setTag(Tags.TEST_TYPE, "browser");
+        span.setTag(Tags.TEST_BROWSER_DRIVER, CIConstants.SELENIUM_BROWSER_DRIVER);
+        span.setTag(Tags.TEST_BROWSER_DRIVER_VERSION, SeleniumUtils.SELENIUM_VERSION);
+
+        Capabilities capabilities = SeleniumUtils.getCapabilities(driver);
+        if (capabilities != null) {
+            String browserName = capabilities.getBrowserName();
+            String browserVersion = String.valueOf(Optional.ofNullable(capabilities.getCapability("browserVersion"))
+                    .orElse(Optional.ofNullable(capabilities.getCapability("version"))
+                            .orElse("")));
+            span.setTag(Tags.TEST_BROWSER_NAME, browserName);
+            span.setTag(Tags.TEST_BROWSER_VERSION, browserVersion);
+        }
+
+        if (driver instanceof JavascriptExecutor && SeleniumUtils.isRumAvailable((JavascriptExecutor) driver)) {
+            span.setTag(Tags.TEST_IS_RUM_ACTIVE, true);
+            stopRumSession((JavascriptExecutor) driver);
+        }
+
+        clearRumContext(driver);
     }
 
-    clearRumContext(driver);
-  }
+    @Nullable
+    private static Capabilities getCapabilities(WebDriver driver) {
+        if (driver instanceof RemoteWebDriver) {
+            return ((RemoteWebDriver) driver).getCapabilities();
+        }
+        Class<? extends WebDriver> driverClass = driver.getClass();
+        try {
+            Method getCapabilitiesMethod = driverClass.getMethod("getCapabilities");
+            return (Capabilities) getCapabilitiesMethod.invoke(driver);
 
-  @Nullable
-  private static Capabilities getCapabilities(WebDriver driver) {
-    if (driver instanceof RemoteWebDriver) {
-      return ((RemoteWebDriver) driver).getCapabilities();
+        } catch (Exception e) {
+            return null;
+        }
     }
-    Class<? extends WebDriver> driverClass = driver.getClass();
-    try {
-      Method getCapabilitiesMethod = driverClass.getMethod("getCapabilities");
-      return (Capabilities) getCapabilitiesMethod.invoke(driver);
 
-    } catch (Exception e) {
-      return null;
+    private static boolean isRumAvailable(JavascriptExecutor js) {
+        return (boolean) js.executeScript("return !!window.DD_RUM;");
     }
-  }
-
-  private static boolean isRumAvailable(JavascriptExecutor js) {
-    return (boolean) js.executeScript("return !!window.DD_RUM;");
-  }
-
-  private static void stopRumSession(JavascriptExecutor js) {
-    js.executeScript(
-        "if (window.DD_RUM && window.DD_RUM.stopSession) { window.DD_RUM.stopSession(); }");
-    try {
-      Thread.sleep(Config.get().getCiVisibilityRumFlushWaitMillis());
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
+
+    private static void stopRumSession(JavascriptExecutor js) {
+        js.executeScript("if (window.DD_RUM && window.DD_RUM.stopSession) { window.DD_RUM.stopSession(); }");
+        try {
+            Thread.sleep(Config.get().getCiVisibilityRumFlushWaitMillis());
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/selenium-3.13/src/test/java/org/example/TestSucceedSelenium.java b/dd-java-agent/instrumentation/selenium-3.13/src/test/java/org/example/TestSucceedSelenium.java
index ec0c584064b..6eec577143e 100644
--- a/dd-java-agent/instrumentation/selenium-3.13/src/test/java/org/example/TestSucceedSelenium.java
+++ b/dd-java-agent/instrumentation/selenium-3.13/src/test/java/org/example/TestSucceedSelenium.java
@@ -8,11 +8,11 @@
 
 public class TestSucceedSelenium {
 
-  @Test
-  public void test_succeed() {
-    WebDriver driver = new HtmlUnitDriver(BrowserVersion.CHROME, true);
-    driver.get(System.getProperty("selenium-test.dummy-page-url"));
-    Assertions.assertEquals("Selenium Integration Test", driver.getTitle());
-    driver.close();
-  }
+    @Test
+    public void test_succeed() {
+        WebDriver driver = new HtmlUnitDriver(BrowserVersion.CHROME, true);
+        driver.get(System.getProperty("selenium-test.dummy-page-url"));
+        Assertions.assertEquals("Selenium Integration Test", driver.getTitle());
+        driver.close();
+    }
 }
diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/src/main/java/datadog/trace/instrumentation/servicetalk0_42_0/ContextMapInstrumentation.java b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/src/main/java/datadog/trace/instrumentation/servicetalk0_42_0/ContextMapInstrumentation.java
index 72f9fd3d43b..6307f0cd1dd 100644
--- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/src/main/java/datadog/trace/instrumentation/servicetalk0_42_0/ContextMapInstrumentation.java
+++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/src/main/java/datadog/trace/instrumentation/servicetalk0_42_0/ContextMapInstrumentation.java
@@ -17,33 +17,30 @@
 
 @AutoService(InstrumenterModule.class)
 public class ContextMapInstrumentation extends ServiceTalkInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "io.servicetalk.concurrent.api.CopyOnWriteContextMap";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.servicetalk.concurrent.api.CopyOnWriteContextMap";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(isPrivate())
-            .and(takesArguments(1))
-            .and(
-                takesArgument(
-                    0,
-                    named("io.servicetalk.concurrent.api.CopyOnWriteContextMap$CopyContextMap"))),
-        getClass().getName() + "$Construct");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(isPrivate())
+                        .and(takesArguments(1))
+                        .and(takesArgument(
+                                0, named("io.servicetalk.concurrent.api.CopyOnWriteContextMap$CopyContextMap"))),
+                getClass().getName() + "$Construct");
+    }
 
-  private static final class Construct {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void exit(@Advice.This ContextMap contextMap) {
-      // Capture an active span on ST context copy to support versions prior to 0.42.56 that did not
-      // have captureContext
-      InstrumentationContext.get(ContextMap.class, AgentSpan.class)
-          .put(contextMap, AgentTracer.activeSpan());
+    private static final class Construct {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void exit(@Advice.This ContextMap contextMap) {
+            // Capture an active span on ST context copy to support versions prior to 0.42.56 that did not
+            // have captureContext
+            InstrumentationContext.get(ContextMap.class, AgentSpan.class).put(contextMap, AgentTracer.activeSpan());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/src/main/java/datadog/trace/instrumentation/servicetalk0_42_0/ContextPreservingInstrumentation.java b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/src/main/java/datadog/trace/instrumentation/servicetalk0_42_0/ContextPreservingInstrumentation.java
index dbf10ef5a2d..2bb58ebf0ca 100644
--- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/src/main/java/datadog/trace/instrumentation/servicetalk0_42_0/ContextPreservingInstrumentation.java
+++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/src/main/java/datadog/trace/instrumentation/servicetalk0_42_0/ContextPreservingInstrumentation.java
@@ -14,59 +14,59 @@
 
 @AutoService(InstrumenterModule.class)
 public class ContextPreservingInstrumentation extends ServiceTalkInstrumentation
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.servicetalk.concurrent.api.ContextPreservingBiConsumer",
-      "io.servicetalk.concurrent.api.ContextPreservingBiFunction",
-      "io.servicetalk.concurrent.api.ContextPreservingCallable",
-      "io.servicetalk.concurrent.api.ContextPreservingCancellable",
-      "io.servicetalk.concurrent.api.ContextPreservingCompletableSubscriber",
-      "io.servicetalk.concurrent.api.ContextPreservingConsumer",
-      "io.servicetalk.concurrent.api.ContextPreservingFunction",
-      "io.servicetalk.concurrent.api.ContextPreservingRunnable",
-      "io.servicetalk.concurrent.api.ContextPreservingSingleSubscriber",
-      "io.servicetalk.concurrent.api.ContextPreservingSubscriber",
-      "io.servicetalk.concurrent.api.ContextPreservingSubscription",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        namedOneOf(
-            "accept",
-            "apply",
-            "call",
-            "cancel",
-            "onComplete",
-            "onError",
-            "onSuccess",
-            "request",
-            "onNext",
-            "onSubscribe",
-            "run"),
-        getClass().getName() + "$Wrapper");
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.servicetalk.concurrent.api.ContextPreservingBiConsumer",
+            "io.servicetalk.concurrent.api.ContextPreservingBiFunction",
+            "io.servicetalk.concurrent.api.ContextPreservingCallable",
+            "io.servicetalk.concurrent.api.ContextPreservingCancellable",
+            "io.servicetalk.concurrent.api.ContextPreservingCompletableSubscriber",
+            "io.servicetalk.concurrent.api.ContextPreservingConsumer",
+            "io.servicetalk.concurrent.api.ContextPreservingFunction",
+            "io.servicetalk.concurrent.api.ContextPreservingRunnable",
+            "io.servicetalk.concurrent.api.ContextPreservingSingleSubscriber",
+            "io.servicetalk.concurrent.api.ContextPreservingSubscriber",
+            "io.servicetalk.concurrent.api.ContextPreservingSubscription",
+        };
+    }
 
-  public static final class Wrapper {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(@Advice.FieldValue("saved") final ContextMap contextMap) {
-      AgentSpan parent =
-          InstrumentationContext.get(ContextMap.class, AgentSpan.class).get(contextMap);
-      if (parent != null) {
-        return AgentTracer.activateSpan(parent);
-      }
-      return null;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                namedOneOf(
+                        "accept",
+                        "apply",
+                        "call",
+                        "cancel",
+                        "onComplete",
+                        "onError",
+                        "onSuccess",
+                        "request",
+                        "onNext",
+                        "onSubscribe",
+                        "run"),
+                getClass().getName() + "$Wrapper");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Enter final ContextScope agentScope) {
-      if (agentScope != null) {
-        agentScope.close();
-      }
+    public static final class Wrapper {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(@Advice.FieldValue("saved") final ContextMap contextMap) {
+            AgentSpan parent = InstrumentationContext.get(ContextMap.class, AgentSpan.class)
+                    .get(contextMap);
+            if (parent != null) {
+                return AgentTracer.activateSpan(parent);
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Enter final ContextScope agentScope) {
+            if (agentScope != null) {
+                agentScope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/src/main/java/datadog/trace/instrumentation/servicetalk0_42_0/ServiceTalkInstrumentation.java b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/src/main/java/datadog/trace/instrumentation/servicetalk0_42_0/ServiceTalkInstrumentation.java
index ee0a4ef2273..8a37922d288 100644
--- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/src/main/java/datadog/trace/instrumentation/servicetalk0_42_0/ServiceTalkInstrumentation.java
+++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/src/main/java/datadog/trace/instrumentation/servicetalk0_42_0/ServiceTalkInstrumentation.java
@@ -8,24 +8,23 @@
 
 public abstract class ServiceTalkInstrumentation extends InstrumenterModule.Tracing {
 
-  public ServiceTalkInstrumentation() {
-    super("servicetalk", "servicetalk-concurrent");
-  }
+    public ServiceTalkInstrumentation() {
+        super("servicetalk", "servicetalk-concurrent");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "io.servicetalk.context.api.ContextMap", AgentSpan.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("io.servicetalk.context.api.ContextMap", AgentSpan.class.getName());
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      // This check prevents older instrumentation from being applied to ServiceTalk v0.42.56+
-      new Reference.Builder("io.servicetalk.concurrent.api.DelegatingExecutor")
-          // Removed in v0.42.56
-          .withField(new String[0], 0, "delegate", "Lio/servicetalk/concurrent/api/Executor;")
-          .build(),
-    };
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            // This check prevents older instrumentation from being applied to ServiceTalk v0.42.56+
+            new Reference.Builder("io.servicetalk.concurrent.api.DelegatingExecutor")
+                    // Removed in v0.42.56
+                    .withField(new String[0], 0, "delegate", "Lio/servicetalk/concurrent/api/Executor;")
+                    .build(),
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/main/java/datadog/trace/instrumentation/servicetalk0_42_56/CapturedContextProvidersInstrumentation.java b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/main/java/datadog/trace/instrumentation/servicetalk0_42_56/CapturedContextProvidersInstrumentation.java
index 4b79a444fb8..e872a141ca6 100644
--- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/main/java/datadog/trace/instrumentation/servicetalk0_42_56/CapturedContextProvidersInstrumentation.java
+++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/main/java/datadog/trace/instrumentation/servicetalk0_42_56/CapturedContextProvidersInstrumentation.java
@@ -13,30 +13,30 @@
 
 @AutoService(InstrumenterModule.class)
 public class CapturedContextProvidersInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public CapturedContextProvidersInstrumentation() {
-    super("servicetalk", "servicetalk-concurrent");
-  }
+    public CapturedContextProvidersInstrumentation() {
+        super("servicetalk", "servicetalk-concurrent");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.servicetalk.concurrent.api.CapturedContextProviders";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.servicetalk.concurrent.api.CapturedContextProviders";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(named("loadProviders"), getClass().getName() + "$LoadProvidersAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("loadProviders"), getClass().getName() + "$LoadProvidersAdvice");
+    }
 
-  private static final class LoadProvidersAdvice {
-    @SuppressFBWarnings("UC_USELESS_OBJECT")
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void exit(@Advice.Return(readOnly = false) java.util.List loadedProviders) {
-      List<CapturedContextProvider> providers = new ArrayList<>(loadedProviders.size() + 1);
-      providers.addAll(loadedProviders);
-      providers.add(new DatadogCapturedContextProvider());
-      loadedProviders = providers;
+    private static final class LoadProvidersAdvice {
+        @SuppressFBWarnings("UC_USELESS_OBJECT")
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void exit(@Advice.Return(readOnly = false) java.util.List loadedProviders) {
+            List<CapturedContextProvider> providers = new ArrayList<>(loadedProviders.size() + 1);
+            providers.addAll(loadedProviders);
+            providers.add(new DatadogCapturedContextProvider());
+            loadedProviders = providers;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/main/java/datadog/trace/instrumentation/servicetalk0_42_56/DatadogCapturedContextProvider.java b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/main/java/datadog/trace/instrumentation/servicetalk0_42_56/DatadogCapturedContextProvider.java
index b13df7f0d91..94b7b4d0232 100644
--- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/main/java/datadog/trace/instrumentation/servicetalk0_42_56/DatadogCapturedContextProvider.java
+++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/main/java/datadog/trace/instrumentation/servicetalk0_42_56/DatadogCapturedContextProvider.java
@@ -9,42 +9,42 @@
 import io.servicetalk.context.api.ContextMap;
 
 public final class DatadogCapturedContextProvider implements CapturedContextProvider {
-  @Override
-  public CapturedContext captureContext(CapturedContext underlying) {
-    return captureContextCopy(underlying);
-  }
+    @Override
+    public CapturedContext captureContext(CapturedContext underlying) {
+        return captureContextCopy(underlying);
+    }
 
-  @Override
-  public CapturedContext captureContextCopy(CapturedContext underlying) {
-    AgentSpan activeSpan = AgentTracer.activeSpan();
-    if (activeSpan == null) {
-      return underlying;
+    @Override
+    public CapturedContext captureContextCopy(CapturedContext underlying) {
+        AgentSpan activeSpan = AgentTracer.activeSpan();
+        if (activeSpan == null) {
+            return underlying;
+        }
+        return new WithDatadogCapturedContext(activeSpan, underlying);
     }
-    return new WithDatadogCapturedContext(activeSpan, underlying);
-  }
 
-  private static final class WithDatadogCapturedContext implements CapturedContext {
-    private final AgentSpan agentSpan;
-    private final CapturedContext underlying;
+    private static final class WithDatadogCapturedContext implements CapturedContext {
+        private final AgentSpan agentSpan;
+        private final CapturedContext underlying;
 
-    public WithDatadogCapturedContext(AgentSpan agentSpan, CapturedContext underlying) {
-      this.agentSpan = agentSpan;
-      this.underlying = underlying;
-    }
+        public WithDatadogCapturedContext(AgentSpan agentSpan, CapturedContext underlying) {
+            this.agentSpan = agentSpan;
+            this.underlying = underlying;
+        }
 
-    @Override
-    public ContextMap captured() {
-      return underlying.captured();
-    }
+        @Override
+        public ContextMap captured() {
+            return underlying.captured();
+        }
 
-    @Override
-    public Scope attachContext() {
-      Scope stScope = underlying.attachContext();
-      ContextScope ddScope = AgentTracer.activateSpan(agentSpan);
-      return () -> {
-        ddScope.close();
-        stScope.close();
-      };
+        @Override
+        public Scope attachContext() {
+            Scope stScope = underlying.attachContext();
+            ContextScope ddScope = AgentTracer.activateSpan(agentSpan);
+            return () -> {
+                ddScope.close();
+                stScope.close();
+            };
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/IastJakartaServletInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/IastJakartaServletInstrumentation.java
index 076bcc1583f..229a35d25cf 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/IastJakartaServletInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/IastJakartaServletInstrumentation.java
@@ -23,59 +23,59 @@
 
 @AutoService(InstrumenterModule.class)
 public class IastJakartaServletInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public IastJakartaServletInstrumentation() {
-    super("servlet", "servlet-5");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public IastJakartaServletInstrumentation() {
+        super("servlet", "servlet-5");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "jakarta.servlet.http.HttpServlet";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "jakarta.servlet.http.HttpServlet";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return hasSuperType(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return hasSuperType(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("jakarta.servlet.ServletContext", Boolean.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("jakarta.servlet.ServletContext", Boolean.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("service"))
-            .and(isPublic())
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("jakarta.servlet.ServletRequest")))
-            .and(takesArgument(1, named("jakarta.servlet.ServletResponse"))),
-        getClass().getName() + "$IastAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("service"))
+                        .and(isPublic())
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("jakarta.servlet.ServletRequest")))
+                        .and(takesArgument(1, named("jakarta.servlet.ServletResponse"))),
+                getClass().getName() + "$IastAdvice");
+    }
 
-  @Override
-  protected boolean isOptOutEnabled() {
-    return true;
-  }
+    @Override
+    protected boolean isOptOutEnabled() {
+        return true;
+    }
 
-  public static class IastAdvice {
+    public static class IastAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void after(@Advice.This final HttpServlet servlet) {
-      final ApplicationModule applicationModule = InstrumentationBridge.APPLICATION;
-      if (applicationModule == null) {
-        return;
-      }
-      final ServletContext context = servlet.getServletContext();
-      if (InstrumentationContext.get(ServletContext.class, Boolean.class).get(context) != null) {
-        return;
-      }
-      InstrumentationContext.get(ServletContext.class, Boolean.class).put(context, true);
-      if (applicationModule != null) {
-        applicationModule.onRealPath(context.getRealPath("/"));
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void after(@Advice.This final HttpServlet servlet) {
+            final ApplicationModule applicationModule = InstrumentationBridge.APPLICATION;
+            if (applicationModule == null) {
+                return;
+            }
+            final ServletContext context = servlet.getServletContext();
+            if (InstrumentationContext.get(ServletContext.class, Boolean.class).get(context) != null) {
+                return;
+            }
+            InstrumentationContext.get(ServletContext.class, Boolean.class).put(context, true);
+            if (applicationModule != null) {
+                applicationModule.onRealPath(context.getRealPath("/"));
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/IastOptOutJakartaHttpServletRequestInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/IastOptOutJakartaHttpServletRequestInstrumentation.java
index 2dbda417503..8105270bfd8 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/IastOptOutJakartaHttpServletRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/IastOptOutJakartaHttpServletRequestInstrumentation.java
@@ -30,82 +30,83 @@
 @SuppressWarnings("unused")
 @AutoService(InstrumenterModule.class)
 public class IastOptOutJakartaHttpServletRequestInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  private static final String CLASS_NAME =
-      IastOptOutJakartaHttpServletRequestInstrumentation.class.getName();
-  private static final ElementMatcher.Junction<? super TypeDescription> WRAPPER_CLASS =
-      named("jakarta.servlet.http.HttpServletRequestWrapper");
+    private static final String CLASS_NAME = IastOptOutJakartaHttpServletRequestInstrumentation.class.getName();
+    private static final ElementMatcher.Junction<? super TypeDescription> WRAPPER_CLASS =
+            named("jakarta.servlet.http.HttpServletRequestWrapper");
 
-  public IastOptOutJakartaHttpServletRequestInstrumentation() {
-    super("servlet", "servlet-5", "servlet-request");
-  }
+    public IastOptOutJakartaHttpServletRequestInstrumentation() {
+        super("servlet", "servlet-5", "servlet-request");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "jakarta.servlet.http.HttpServletRequest";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "jakarta.servlet.http.HttpServletRequest";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        .and(not(WRAPPER_CLASS))
-        .and(not(extendsClass(WRAPPER_CLASS)));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                .and(not(WRAPPER_CLASS))
+                .and(not(extendsClass(WRAPPER_CLASS)));
+    }
 
-  @Override
-  protected boolean isOptOutEnabled() {
-    return true;
-  }
+    @Override
+    protected boolean isOptOutEnabled() {
+        return true;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getSession").and(returns(named("jakarta.servlet.http.HttpSession"))).and(isPublic()),
-        CLASS_NAME + "$GetHttpSessionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getSession")
+                        .and(returns(named("jakarta.servlet.http.HttpSession")))
+                        .and(isPublic()),
+                CLASS_NAME + "$GetHttpSessionAdvice");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "jakarta.servlet.ServletContext", "jakarta.servlet.SessionTrackingMode");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("jakarta.servlet.ServletContext", "jakarta.servlet.SessionTrackingMode");
+    }
 
-  public static class GetHttpSessionAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.SESSION_REWRITING)
-    public static void onExit(
-        @Advice.This final HttpServletRequest request, @Advice.Return final HttpSession session) {
-      if (session == null) {
-        return;
-      }
-      final ApplicationModule module = InstrumentationBridge.APPLICATION;
-      if (module == null) {
-        return;
-      }
-      final ServletContext context = request.getServletContext();
+    public static class GetHttpSessionAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.SESSION_REWRITING)
+        public static void onExit(
+                @Advice.This final HttpServletRequest request, @Advice.Return final HttpSession session) {
+            if (session == null) {
+                return;
+            }
+            final ApplicationModule module = InstrumentationBridge.APPLICATION;
+            if (module == null) {
+                return;
+            }
+            final ServletContext context = request.getServletContext();
 
-      if (InstrumentationContext.get(ServletContext.class, SessionTrackingMode.class).get(context)
-          != null) {
-        return;
-      }
-      // We only want to report it once per application
-      InstrumentationContext.get(ServletContext.class, SessionTrackingMode.class)
-          .put(context, SessionTrackingMode.URL);
-      if (context.getEffectiveSessionTrackingModes() != null
-          && !context.getEffectiveSessionTrackingModes().isEmpty()) {
-        Set<String> sessionTrackingModes = new HashSet<>();
-        for (SessionTrackingMode mode : context.getEffectiveSessionTrackingModes()) {
-          sessionTrackingModes.add(mode.name());
+            if (InstrumentationContext.get(ServletContext.class, SessionTrackingMode.class)
+                            .get(context)
+                    != null) {
+                return;
+            }
+            // We only want to report it once per application
+            InstrumentationContext.get(ServletContext.class, SessionTrackingMode.class)
+                    .put(context, SessionTrackingMode.URL);
+            if (context.getEffectiveSessionTrackingModes() != null
+                    && !context.getEffectiveSessionTrackingModes().isEmpty()) {
+                Set<String> sessionTrackingModes = new HashSet<>();
+                for (SessionTrackingMode mode : context.getEffectiveSessionTrackingModes()) {
+                    sessionTrackingModes.add(mode.name());
+                }
+                module.checkSessionTrackingModes(sessionTrackingModes);
+            }
         }
-        module.checkSessionTrackingModes(sessionTrackingModes);
-      }
     }
-  }
 
-  @Override
-  public int order() {
-    // apply this instrumentation after the regular servlet one.
-    return 1;
-  }
+    @Override
+    public int order() {
+        // apply this instrumentation after the regular servlet one.
+        return 1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestCallSite.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestCallSite.java
index b1dc62cb58a..d6c37fa613b 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestCallSite.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestCallSite.java
@@ -17,51 +17,49 @@
 @CallSite(spi = IastCallSites.class)
 public class JakartaHttpServletRequestCallSite {
 
-  @Source(SourceTypes.REQUEST_PATH)
-  @CallSite.After("java.lang.String jakarta.servlet.http.HttpServletRequest.getRequestURI()")
-  @CallSite.After("java.lang.String jakarta.servlet.http.HttpServletRequestWrapper.getRequestURI()")
-  @CallSite.After("java.lang.String jakarta.servlet.http.HttpServletRequest.getPathInfo()")
-  @CallSite.After("java.lang.String jakarta.servlet.http.HttpServletRequestWrapper.getPathInfo()")
-  @CallSite.After("java.lang.String jakarta.servlet.http.HttpServletRequest.getPathTranslated()")
-  @CallSite.After(
-      "java.lang.String jakarta.servlet.http.HttpServletRequestWrapper.getPathTranslated()")
-  public static String afterPath(
-      @CallSite.This final HttpServletRequest self, @CallSite.Return final String retValue) {
-    if (null != retValue && !retValue.isEmpty()) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        try {
-          final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-          if (ctx != null) {
-            module.taintString(ctx, retValue, SourceTypes.REQUEST_PATH);
-          }
-        } catch (final Throwable e) {
-          module.onUnexpectedException("afterPath threw", e);
+    @Source(SourceTypes.REQUEST_PATH)
+    @CallSite.After("java.lang.String jakarta.servlet.http.HttpServletRequest.getRequestURI()")
+    @CallSite.After("java.lang.String jakarta.servlet.http.HttpServletRequestWrapper.getRequestURI()")
+    @CallSite.After("java.lang.String jakarta.servlet.http.HttpServletRequest.getPathInfo()")
+    @CallSite.After("java.lang.String jakarta.servlet.http.HttpServletRequestWrapper.getPathInfo()")
+    @CallSite.After("java.lang.String jakarta.servlet.http.HttpServletRequest.getPathTranslated()")
+    @CallSite.After("java.lang.String jakarta.servlet.http.HttpServletRequestWrapper.getPathTranslated()")
+    public static String afterPath(
+            @CallSite.This final HttpServletRequest self, @CallSite.Return final String retValue) {
+        if (null != retValue && !retValue.isEmpty()) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                try {
+                    final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+                    if (ctx != null) {
+                        module.taintString(ctx, retValue, SourceTypes.REQUEST_PATH);
+                    }
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("afterPath threw", e);
+                }
+            }
         }
-      }
+        return retValue;
     }
-    return retValue;
-  }
 
-  @Source(SourceTypes.REQUEST_URI)
-  @CallSite.After("java.lang.StringBuffer jakarta.servlet.http.HttpServletRequest.getRequestURL()")
-  @CallSite.After(
-      "java.lang.StringBuffer jakarta.servlet.http.HttpServletRequestWrapper.getRequestURL()")
-  public static StringBuffer afterGetRequestURL(
-      @CallSite.This final HttpServletRequest self, @CallSite.Return final StringBuffer retValue) {
-    if (null != retValue && retValue.length() > 0) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        try {
-          final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-          if (ctx != null) {
-            module.taintObject(ctx, retValue, SourceTypes.REQUEST_URI);
-          }
-        } catch (final Throwable e) {
-          module.onUnexpectedException("afterGetRequestURL threw", e);
+    @Source(SourceTypes.REQUEST_URI)
+    @CallSite.After("java.lang.StringBuffer jakarta.servlet.http.HttpServletRequest.getRequestURL()")
+    @CallSite.After("java.lang.StringBuffer jakarta.servlet.http.HttpServletRequestWrapper.getRequestURL()")
+    public static StringBuffer afterGetRequestURL(
+            @CallSite.This final HttpServletRequest self, @CallSite.Return final StringBuffer retValue) {
+        if (null != retValue && retValue.length() > 0) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                try {
+                    final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+                    if (ctx != null) {
+                        module.taintObject(ctx, retValue, SourceTypes.REQUEST_URI);
+                    }
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("afterGetRequestURL threw", e);
+                }
+            }
         }
-      }
+        return retValue;
     }
-    return retValue;
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java
index 1aa2d869a56..2c2f940e097 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java
@@ -34,288 +34,274 @@
 @SuppressWarnings("unused")
 @AutoService(InstrumenterModule.class)
 public class JakartaHttpServletRequestInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  private static final String CLASS_NAME = JakartaHttpServletRequestInstrumentation.class.getName();
-  private static final ElementMatcher.Junction<? super TypeDescription> WRAPPER_CLASS =
-      named("jakarta.servlet.http.HttpServletRequestWrapper");
+    private static final String CLASS_NAME = JakartaHttpServletRequestInstrumentation.class.getName();
+    private static final ElementMatcher.Junction<? super TypeDescription> WRAPPER_CLASS =
+            named("jakarta.servlet.http.HttpServletRequestWrapper");
 
-  public JakartaHttpServletRequestInstrumentation() {
-    super("servlet", "servlet-5", "servlet-request");
-  }
+    public JakartaHttpServletRequestInstrumentation() {
+        super("servlet", "servlet-5", "servlet-request");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "jakarta.servlet.http.HttpServletRequest";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "jakarta.servlet.http.HttpServletRequest";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        .and(not(WRAPPER_CLASS))
-        .and(not(extendsClass(WRAPPER_CLASS)));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                .and(not(WRAPPER_CLASS))
+                .and(not(extendsClass(WRAPPER_CLASS)));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("getHeader")).and(takesArguments(String.class)),
-        CLASS_NAME + "$GetHeaderAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getHeaders")).and(takesArguments(String.class)),
-        CLASS_NAME + "$GetHeadersAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getHeaderNames")).and(takesArguments(0)),
-        CLASS_NAME + "$GetHeaderNamesAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getParameter")).and(takesArguments(String.class)),
-        CLASS_NAME + "$GetParameterAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getParameterValues")).and(takesArguments(String.class)),
-        CLASS_NAME + "$GetParameterValuesAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getParameterMap")).and(takesArguments(0)),
-        CLASS_NAME + "$GetParameterMapAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getParameterNames")).and(takesArguments(0)),
-        CLASS_NAME + "$GetParameterNamesAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getCookies")).and(takesArguments(0)),
-        CLASS_NAME + "$GetCookiesAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getQueryString")).and(takesArguments(0)),
-        CLASS_NAME + "$GetQueryStringAdvice");
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("getInputStream", "getReader")).and(takesArguments(0)),
-        CLASS_NAME + "$GetBodyAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getRequestDispatcher")).and(takesArguments(String.class)),
-        CLASS_NAME + "$GetRequestDispatcherAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("getHeader")).and(takesArguments(String.class)), CLASS_NAME + "$GetHeaderAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getHeaders")).and(takesArguments(String.class)),
+                CLASS_NAME + "$GetHeadersAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getHeaderNames")).and(takesArguments(0)), CLASS_NAME + "$GetHeaderNamesAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getParameter")).and(takesArguments(String.class)),
+                CLASS_NAME + "$GetParameterAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getParameterValues")).and(takesArguments(String.class)),
+                CLASS_NAME + "$GetParameterValuesAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getParameterMap")).and(takesArguments(0)), CLASS_NAME + "$GetParameterMapAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getParameterNames")).and(takesArguments(0)),
+                CLASS_NAME + "$GetParameterNamesAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getCookies")).and(takesArguments(0)), CLASS_NAME + "$GetCookiesAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getQueryString")).and(takesArguments(0)), CLASS_NAME + "$GetQueryStringAdvice");
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("getInputStream", "getReader")).and(takesArguments(0)),
+                CLASS_NAME + "$GetBodyAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getRequestDispatcher")).and(takesArguments(String.class)),
+                CLASS_NAME + "$GetRequestDispatcherAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetHeaderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void onExit(
-        @Advice.Argument(0) final String name,
-        @Advice.Return final String value,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (value == null) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      module.taintString(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetHeaderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void onExit(
+                @Advice.Argument(0) final String name,
+                @Advice.Return final String value,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (value == null) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            module.taintString(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetHeadersAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void onExit(
-        @Advice.Argument(0) final String name,
-        @Advice.Return(readOnly = false) Enumeration<String> enumeration,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (enumeration == null) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      enumeration =
-          TaintableEnumeration.wrap(
-              ctx, enumeration, module, SourceTypes.REQUEST_HEADER_VALUE, name);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetHeadersAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void onExit(
+                @Advice.Argument(0) final String name,
+                @Advice.Return(readOnly = false) Enumeration<String> enumeration,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (enumeration == null) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            enumeration = TaintableEnumeration.wrap(ctx, enumeration, module, SourceTypes.REQUEST_HEADER_VALUE, name);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetHeaderNamesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_NAME)
-    public static void onExit(
-        @Advice.Return(readOnly = false) Enumeration<String> enumeration,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (enumeration == null) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      enumeration =
-          TaintableEnumeration.wrap(
-              ctx, enumeration, module, SourceTypes.REQUEST_HEADER_NAME, true);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetHeaderNamesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_NAME)
+        public static void onExit(
+                @Advice.Return(readOnly = false) Enumeration<String> enumeration,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (enumeration == null) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            enumeration = TaintableEnumeration.wrap(ctx, enumeration, module, SourceTypes.REQUEST_HEADER_NAME, true);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetParameterAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void onExit(
-        @Advice.Argument(0) final String name,
-        @Advice.Return final String value,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (value == null) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      module.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetParameterAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void onExit(
+                @Advice.Argument(0) final String name,
+                @Advice.Return final String value,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (value == null) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            module.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetParameterValuesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void onExit(
-        @Advice.Argument(0) final String name,
-        @Advice.Return final String[] values,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (values == null || values.length == 0) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      for (final String value : values) {
-        module.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetParameterValuesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void onExit(
+                @Advice.Argument(0) final String name,
+                @Advice.Return final String[] values,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (values == null || values.length == 0) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            for (final String value : values) {
+                module.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+            }
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetParameterMapAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void onExit(
-        @Advice.Return final Map<String, String[]> parameters,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (parameters == null || parameters.isEmpty()) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      for (final Map.Entry<String, String[]> entry : parameters.entrySet()) {
-        final String name = entry.getKey();
-        module.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
-        final String[] values = entry.getValue();
-        if (values != null) {
-          for (final String value : entry.getValue()) {
-            module.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
-          }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetParameterMapAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void onExit(
+                @Advice.Return final Map<String, String[]> parameters, @ActiveRequestContext RequestContext reqCtx) {
+            if (parameters == null || parameters.isEmpty()) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            for (final Map.Entry<String, String[]> entry : parameters.entrySet()) {
+                final String name = entry.getKey();
+                module.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+                final String[] values = entry.getValue();
+                if (values != null) {
+                    for (final String value : entry.getValue()) {
+                        module.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetParameterNamesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_NAME)
-    public static void onExit(
-        @Advice.Return(readOnly = false) Enumeration<String> enumeration,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (enumeration == null) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      enumeration =
-          TaintableEnumeration.wrap(
-              ctx, enumeration, module, SourceTypes.REQUEST_PARAMETER_NAME, true);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetParameterNamesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_NAME)
+        public static void onExit(
+                @Advice.Return(readOnly = false) Enumeration<String> enumeration,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (enumeration == null) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            enumeration = TaintableEnumeration.wrap(ctx, enumeration, module, SourceTypes.REQUEST_PARAMETER_NAME, true);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetCookiesAdvice {
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetCookiesAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    public static void onExit(
-        @Advice.Return final Cookie[] cookies, @ActiveRequestContext RequestContext reqCtx) {
-      if (cookies == null || cookies.length == 0) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      for (final Cookie cookie : cookies) {
-        module.taintObject(ctx, cookie, SourceTypes.REQUEST_COOKIE_VALUE);
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        public static void onExit(@Advice.Return final Cookie[] cookies, @ActiveRequestContext RequestContext reqCtx) {
+            if (cookies == null || cookies.length == 0) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            for (final Cookie cookie : cookies) {
+                module.taintObject(ctx, cookie, SourceTypes.REQUEST_COOKIE_VALUE);
+            }
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetQueryStringAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_QUERY)
-    public static void onExit(
-        @Advice.Return final String queryString, @ActiveRequestContext RequestContext reqCtx) {
-      if (queryString == null) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      module.taintString(ctx, queryString, SourceTypes.REQUEST_QUERY);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetQueryStringAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_QUERY)
+        public static void onExit(
+                @Advice.Return final String queryString, @ActiveRequestContext RequestContext reqCtx) {
+            if (queryString == null) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            module.taintString(ctx, queryString, SourceTypes.REQUEST_QUERY);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetBodyAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_BODY)
-    public static void onExit(
-        @Advice.Return final Object body, @ActiveRequestContext RequestContext reqCtx) {
-      if (body == null) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      module.taintObject(ctx, body, SourceTypes.REQUEST_BODY);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetBodyAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_BODY)
+        public static void onExit(@Advice.Return final Object body, @ActiveRequestContext RequestContext reqCtx) {
+            if (body == null) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            module.taintObject(ctx, body, SourceTypes.REQUEST_BODY);
+        }
     }
-  }
 
-  public static class GetRequestDispatcherAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
-    public static void onExit(@Advice.Argument(0) final String path) {
-      if (path == null) {
-        return;
-      }
-      final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
-      if (module == null) {
-        return;
-      }
-      module.onRedirect(path);
+    public static class GetRequestDispatcherAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
+        public static void onExit(@Advice.Argument(0) final String path) {
+            if (path == null) {
+                return;
+            }
+            final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
+            if (module == null) {
+                return;
+            }
+            module.onRedirect(path);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletResponseInstrumentation.java
index 13f6ca9ccd3..29d525d8eeb 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletResponseInstrumentation.java
@@ -26,103 +26,99 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JakartaHttpServletResponseInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public JakartaHttpServletResponseInstrumentation() {
-    super("servlet", "servlet-5", "servlet-response");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public JakartaHttpServletResponseInstrumentation() {
+        super("servlet", "servlet-5", "servlet-response");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "jakarta.servlet.http.HttpServletResponse";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "jakarta.servlet.http.HttpServletResponse";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        .and(not(extendsClass(named("jakarta.servlet.http.HttpServletResponseWrapper"))));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                .and(not(extendsClass(named("jakarta.servlet.http.HttpServletResponseWrapper"))));
+    }
 
-  @Override
-  protected boolean isOptOutEnabled() {
-    return true;
-  }
+    @Override
+    protected boolean isOptOutEnabled() {
+        return true;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("addCookie")
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("jakarta.servlet.http.Cookie"))),
-        getClass().getName() + "$AddCookieAdvice");
-    transformer.applyAdvice(
-        namedOneOf("setHeader", "addHeader").and(takesArguments(String.class, String.class)),
-        getClass().getName() + "$AddHeaderAdvice");
-    transformer.applyAdvice(
-        namedOneOf("encodeRedirectURL", "encodeURL")
-            .and(takesArgument(0, String.class))
-            .and(returns(String.class)),
-        getClass().getName() + "$EncodeURLAdvice");
-    transformer.applyAdvice(
-        named("sendRedirect").and(takesArgument(0, String.class)),
-        getClass().getName() + "$SendRedirectAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("addCookie").and(takesArguments(1)).and(takesArgument(0, named("jakarta.servlet.http.Cookie"))),
+                getClass().getName() + "$AddCookieAdvice");
+        transformer.applyAdvice(
+                namedOneOf("setHeader", "addHeader").and(takesArguments(String.class, String.class)),
+                getClass().getName() + "$AddHeaderAdvice");
+        transformer.applyAdvice(
+                namedOneOf("encodeRedirectURL", "encodeURL")
+                        .and(takesArgument(0, String.class))
+                        .and(returns(String.class)),
+                getClass().getName() + "$EncodeURLAdvice");
+        transformer.applyAdvice(
+                named("sendRedirect").and(takesArgument(0, String.class)),
+                getClass().getName() + "$SendRedirectAdvice");
+    }
 
-  public static class AddCookieAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.RESPONSE_HEADER)
-    public static void onEnter(@Advice.Argument(0) final jakarta.servlet.http.Cookie cookie) {
-      if (cookie != null) {
-        HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
-        if (mod != null) {
-          mod.onCookie(
-              Cookie.named(cookie.getName())
-                  .value(cookie.getValue())
-                  .secure(cookie.getSecure())
-                  .httpOnly(cookie.isHttpOnly())
-                  .maxAge(cookie.getMaxAge())
-                  .build());
+    public static class AddCookieAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.RESPONSE_HEADER)
+        public static void onEnter(@Advice.Argument(0) final jakarta.servlet.http.Cookie cookie) {
+            if (cookie != null) {
+                HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
+                if (mod != null) {
+                    mod.onCookie(Cookie.named(cookie.getName())
+                            .value(cookie.getValue())
+                            .secure(cookie.getSecure())
+                            .httpOnly(cookie.isHttpOnly())
+                            .maxAge(cookie.getMaxAge())
+                            .build());
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class AddHeaderAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.RESPONSE_HEADER)
-    public static void onEnter(
-        @Advice.Argument(0) final String name, @Advice.Argument(1) String value) {
-      if (null != value && !value.isEmpty()) {
-        HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
-        if (mod != null) {
-          mod.onHeader(name, value);
+    public static class AddHeaderAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.RESPONSE_HEADER)
+        public static void onEnter(@Advice.Argument(0) final String name, @Advice.Argument(1) String value) {
+            if (null != value && !value.isEmpty()) {
+                HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
+                if (mod != null) {
+                    mod.onHeader(name, value);
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class SendRedirectAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
-    public static void onEnter(@Advice.Argument(0) final String location) {
-      final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
-      if (module != null) {
-        if (null != location && !location.isEmpty()) {
-          module.onRedirect(location);
+    public static class SendRedirectAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
+        public static void onEnter(@Advice.Argument(0) final String location) {
+            final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
+            if (module != null) {
+                if (null != location && !location.isEmpty()) {
+                    module.onRedirect(location);
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class EncodeURLAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onExit(@Advice.Argument(0) final String url, @Advice.Return String encoded) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        if (null != url && !url.isEmpty() && null != encoded && !encoded.isEmpty()) {
-          module.taintStringIfTainted(encoded, url);
+    public static class EncodeURLAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onExit(@Advice.Argument(0) final String url, @Advice.Return String encoded) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                if (null != url && !url.isEmpty() && null != encoded && !encoded.isEmpty()) {
+                    module.taintStringIfTainted(encoded, url);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpSessionInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpSessionInstrumentation.java
index 6d24fb32313..23a29186709 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpSessionInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpSessionInstrumentation.java
@@ -18,39 +18,38 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class JakartaHttpSessionInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public JakartaHttpSessionInstrumentation() {
-    super("servlet", "servlet-5", "servlet-session");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public JakartaHttpSessionInstrumentation() {
+        super("servlet", "servlet-5", "servlet-session");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "jakarta.servlet.http.HttpSession";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "jakarta.servlet.http.HttpSession";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        .and(not(named("com.ibm.ws.session.HttpSessionFacade")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                .and(not(named("com.ibm.ws.session.HttpSessionFacade")));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        namedOneOf("setAttribute", "putValue")
-            .and(takesArguments(String.class, Object.class).and(isPublic())),
-        getClass().getName() + "$InstrumenterAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                namedOneOf("setAttribute", "putValue")
+                        .and(takesArguments(String.class, Object.class).and(isPublic())),
+                getClass().getName() + "$InstrumenterAdvice");
+    }
 
-  public static class InstrumenterAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.TRUST_BOUNDARY_VIOLATION)
-    public static void onEnter(
-        @Advice.Argument(0) final String name, @Advice.Argument(1) final Object value) {
-      TrustBoundaryViolationModule mod = InstrumentationBridge.TRUST_BOUNDARY_VIOLATION;
-      if (mod != null) {
-        mod.onSessionValue(name, value);
-      }
+    public static class InstrumenterAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.TRUST_BOUNDARY_VIOLATION)
+        public static void onEnter(@Advice.Argument(0) final String name, @Advice.Argument(1) final Object value) {
+            TrustBoundaryViolationModule mod = InstrumentationBridge.TRUST_BOUNDARY_VIOLATION;
+            if (mod != null) {
+                mod.onSessionValue(name, value);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaMultipartInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaMultipartInstrumentation.java
index ef35ef3e992..625ee67f9f9 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaMultipartInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaMultipartInstrumentation.java
@@ -25,129 +25,126 @@
 
 @AutoService(InstrumenterModule.class)
 public class JakartaMultipartInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public JakartaMultipartInstrumentation() {
-    super("servlet", "servlet-5", "multipart");
-  }
+    public JakartaMultipartInstrumentation() {
+        super("servlet", "servlet-5", "multipart");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "jakarta.servlet.http.Part";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "jakarta.servlet.http.Part";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getName").and(isPublic()).and(takesArguments(0)),
-        getClass().getName() + "$GetNameAdvice");
-    transformer.applyAdvice(
-        named("getHeader").and(isPublic()).and(takesArguments(String.class)),
-        getClass().getName() + "$GetHeaderAdvice");
-    transformer.applyAdvice(
-        named("getHeaders").and(isPublic()).and(takesArguments(String.class)),
-        getClass().getName() + "$GetHeadersAdvice");
-    transformer.applyAdvice(
-        named("getHeaderNames").and(isPublic()).and(takesArguments(0)),
-        getClass().getName() + "$GetHeaderNamesAdvice");
-    transformer.applyAdvice(
-        named("getInputStream").and(isPublic()).and(takesArguments(0)),
-        getClass().getName() + "$GetInputStreamAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getName").and(isPublic()).and(takesArguments(0)),
+                getClass().getName() + "$GetNameAdvice");
+        transformer.applyAdvice(
+                named("getHeader").and(isPublic()).and(takesArguments(String.class)),
+                getClass().getName() + "$GetHeaderAdvice");
+        transformer.applyAdvice(
+                named("getHeaders").and(isPublic()).and(takesArguments(String.class)),
+                getClass().getName() + "$GetHeadersAdvice");
+        transformer.applyAdvice(
+                named("getHeaderNames").and(isPublic()).and(takesArguments(0)),
+                getClass().getName() + "$GetHeaderNamesAdvice");
+        transformer.applyAdvice(
+                named("getInputStream").and(isPublic()).and(takesArguments(0)),
+                getClass().getName() + "$GetInputStreamAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetNameAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
-    public static String onExit(
-        @Advice.Return final String name, @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintString(
-            ctx, name, SourceTypes.REQUEST_MULTIPART_PARAMETER, "Content-Disposition");
-      }
-      return name;
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetNameAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
+        public static String onExit(@Advice.Return final String name, @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintString(ctx, name, SourceTypes.REQUEST_MULTIPART_PARAMETER, "Content-Disposition");
+            }
+            return name;
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetHeaderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
-    public static String onExit(
-        @Advice.Return final String value,
-        @Advice.Argument(0) final String name,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintString(ctx, value, SourceTypes.REQUEST_MULTIPART_PARAMETER, name);
-      }
-      return value;
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetHeaderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
+        public static String onExit(
+                @Advice.Return final String value,
+                @Advice.Argument(0) final String name,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintString(ctx, value, SourceTypes.REQUEST_MULTIPART_PARAMETER, name);
+            }
+            return value;
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetHeadersAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
-    public static void onExit(
-        @Advice.Argument(0) final String headerName,
-        @Advice.Return Collection<String> headerValues,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (null == headerValues || headerValues.isEmpty()) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        for (final String value : headerValues) {
-          module.taintString(ctx, value, SourceTypes.REQUEST_MULTIPART_PARAMETER, headerName);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetHeadersAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
+        public static void onExit(
+                @Advice.Argument(0) final String headerName,
+                @Advice.Return Collection<String> headerValues,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (null == headerValues || headerValues.isEmpty()) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                for (final String value : headerValues) {
+                    module.taintString(ctx, value, SourceTypes.REQUEST_MULTIPART_PARAMETER, headerName);
+                }
+            }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetHeaderNamesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
-    public static void onExit(
-        @Advice.Return final Collection<String> headerNames,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (null == headerNames || headerNames.isEmpty()) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        for (final String name : headerNames) {
-          module.taintString(ctx, name, SourceTypes.REQUEST_MULTIPART_PARAMETER);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetHeaderNamesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
+        public static void onExit(
+                @Advice.Return final Collection<String> headerNames, @ActiveRequestContext RequestContext reqCtx) {
+            if (null == headerNames || headerNames.isEmpty()) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                for (final String name : headerNames) {
+                    module.taintString(ctx, name, SourceTypes.REQUEST_MULTIPART_PARAMETER);
+                }
+            }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetInputStreamAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
-    public static void onExit(
-        @Advice.Return final InputStream inputStream, @ActiveRequestContext RequestContext reqCtx) {
-      if (null == inputStream) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintObject(ctx, inputStream, SourceTypes.REQUEST_MULTIPART_PARAMETER);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetInputStreamAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
+        public static void onExit(
+                @Advice.Return final InputStream inputStream, @ActiveRequestContext RequestContext reqCtx) {
+            if (null == inputStream) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintObject(ctx, inputStream, SourceTypes.REQUEST_MULTIPART_PARAMETER);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletBlockingHelper.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletBlockingHelper.java
index 0b3f5d649d4..0563b89a09b 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletBlockingHelper.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletBlockingHelper.java
@@ -13,77 +13,76 @@
 import org.slf4j.LoggerFactory;
 
 public class JakartaServletBlockingHelper {
-  private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
-  private static final Logger log = LoggerFactory.getLogger(JakartaServletBlockingHelper.class);
+    private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+    private static final Logger log = LoggerFactory.getLogger(JakartaServletBlockingHelper.class);
 
-  public static void commitBlockingResponse(
-      TraceSegment segment,
-      HttpServletRequest httpServletRequest,
-      HttpServletResponse resp,
-      int statusCode_,
-      BlockingContentType bct,
-      Map<String, String> extraHeaders,
-      String securityResponseId) {
-    int statusCode = BlockingActionHelper.getHttpCode(statusCode_);
-    if (!start(resp, statusCode)) {
-      return;
-    }
+    public static void commitBlockingResponse(
+            TraceSegment segment,
+            HttpServletRequest httpServletRequest,
+            HttpServletResponse resp,
+            int statusCode_,
+            BlockingContentType bct,
+            Map<String, String> extraHeaders,
+            String securityResponseId) {
+        int statusCode = BlockingActionHelper.getHttpCode(statusCode_);
+        if (!start(resp, statusCode)) {
+            return;
+        }
 
-    for (Map.Entry<String, String> h : extraHeaders.entrySet()) {
-      resp.setHeader(h.getKey(), h.getValue());
-    }
+        for (Map.Entry<String, String> h : extraHeaders.entrySet()) {
+            resp.setHeader(h.getKey(), h.getValue());
+        }
 
-    byte[] template;
-    if (bct != BlockingContentType.NONE) {
-      String acceptHeader = httpServletRequest.getHeader("Accept");
-      BlockingActionHelper.TemplateType type =
-          BlockingActionHelper.determineTemplateType(bct, acceptHeader);
-      template = BlockingActionHelper.getTemplate(type, securityResponseId);
-      String contentType = BlockingActionHelper.getContentType(type);
+        byte[] template;
+        if (bct != BlockingContentType.NONE) {
+            String acceptHeader = httpServletRequest.getHeader("Accept");
+            BlockingActionHelper.TemplateType type = BlockingActionHelper.determineTemplateType(bct, acceptHeader);
+            template = BlockingActionHelper.getTemplate(type, securityResponseId);
+            String contentType = BlockingActionHelper.getContentType(type);
 
-      resp.setHeader("Content-length", Integer.toString(template.length));
-      resp.setHeader("Content-type", contentType);
-    } else {
-      template = EMPTY_BYTE_ARRAY;
-    }
-    segment.effectivelyBlocked();
+            resp.setHeader("Content-length", Integer.toString(template.length));
+            resp.setHeader("Content-type", contentType);
+        } else {
+            template = EMPTY_BYTE_ARRAY;
+        }
+        segment.effectivelyBlocked();
 
-    try {
-      OutputStream os = resp.getOutputStream();
-      os.write(template);
-      os.close();
-    } catch (IOException e) {
-      log.warn("Error sending error page", e);
+        try {
+            OutputStream os = resp.getOutputStream();
+            os.write(template);
+            os.close();
+        } catch (IOException e) {
+            log.warn("Error sending error page", e);
+        }
     }
-  }
 
-  public static void commitBlockingResponse(
-      TraceSegment segment,
-      HttpServletRequest httpServletRequest,
-      HttpServletResponse resp,
-      Flow.Action.RequestBlockingAction rba) {
+    public static void commitBlockingResponse(
+            TraceSegment segment,
+            HttpServletRequest httpServletRequest,
+            HttpServletResponse resp,
+            Flow.Action.RequestBlockingAction rba) {
 
-    commitBlockingResponse(
-        segment,
-        httpServletRequest,
-        resp,
-        rba.getStatusCode(),
-        rba.getBlockingContentType(),
-        rba.getExtraHeaders(),
-        rba.getSecurityResponseId());
-  }
-
-  private static boolean start(HttpServletResponse resp, int statusCode) {
-    if (resp.isCommitted()) {
-      log.warn("response already committed, we can't change it");
-      return false;
+        commitBlockingResponse(
+                segment,
+                httpServletRequest,
+                resp,
+                rba.getStatusCode(),
+                rba.getBlockingContentType(),
+                rba.getExtraHeaders(),
+                rba.getSecurityResponseId());
     }
 
-    log.debug("Committing blocking response");
+    private static boolean start(HttpServletResponse resp, int statusCode) {
+        if (resp.isCommitted()) {
+            log.warn("response already committed, we can't change it");
+            return false;
+        }
+
+        log.debug("Committing blocking response");
 
-    resp.reset();
-    resp.setStatus(statusCode);
+        resp.reset();
+        resp.setStatus(statusCode);
 
-    return true;
-  }
+        return true;
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletInstrumentation.java
index e5f7d4ce418..03d249924e8 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletInstrumentation.java
@@ -32,96 +32,93 @@
 
 @AutoService(InstrumenterModule.class)
 public class JakartaServletInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public JakartaServletInstrumentation() {
-    super("servlet", "servlet-5");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public JakartaServletInstrumentation() {
+        super("servlet", "servlet-5");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "jakarta.servlet.http.HttpServlet";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "jakarta.servlet.http.HttpServlet";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return hasSuperType(named(hierarchyMarkerType()))
-        .or(implementsInterface(named("jakarta.servlet.FilterChain")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return hasSuperType(named(hierarchyMarkerType())).or(implementsInterface(named("jakarta.servlet.FilterChain")));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("service"))
-            .and(isPublic())
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("jakarta.servlet.ServletRequest")))
-            .and(takesArgument(1, named("jakarta.servlet.ServletResponse"))),
-        getClass().getName() + "$JakartaServletAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("service"))
+                        .and(isPublic())
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("jakarta.servlet.ServletRequest")))
+                        .and(takesArgument(1, named("jakarta.servlet.ServletResponse"))),
+                getClass().getName() + "$JakartaServletAdvice");
+    }
 
-  public static class JakartaServletAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static AgentSpan before(
-        @Advice.Argument(value = 0, readOnly = false) ServletRequest request,
-        @Advice.Argument(value = 1, readOnly = false) ServletResponse response,
-        @Advice.Local("rumServletWrapper") RumControllableResponse rumServletWrapper) {
-      if (!(request instanceof HttpServletRequest)) {
-        return null;
-      }
+    public static class JakartaServletAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static AgentSpan before(
+                @Advice.Argument(value = 0, readOnly = false) ServletRequest request,
+                @Advice.Argument(value = 1, readOnly = false) ServletResponse response,
+                @Advice.Local("rumServletWrapper") RumControllableResponse rumServletWrapper) {
+            if (!(request instanceof HttpServletRequest)) {
+                return null;
+            }
 
-      if (response instanceof HttpServletResponse) {
-        final HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+            if (response instanceof HttpServletResponse) {
+                final HttpServletRequest httpServletRequest = (HttpServletRequest) request;
 
-        if (RumInjector.get().isEnabled()) {
-          final Object maybeRumWrapper = httpServletRequest.getAttribute(DD_RUM_INJECTED);
-          if (maybeRumWrapper instanceof RumControllableResponse) {
-            rumServletWrapper = (RumControllableResponse) maybeRumWrapper;
-          } else {
-            rumServletWrapper =
-                new RumHttpServletResponseWrapper(
-                    httpServletRequest, (HttpServletResponse) response);
-            httpServletRequest.setAttribute(DD_RUM_INJECTED, rumServletWrapper);
-            response = (ServletResponse) rumServletWrapper;
-            request =
-                new RumHttpServletRequestWrapper(
-                    httpServletRequest, (HttpServletResponse) rumServletWrapper);
-          }
-        }
-      }
+                if (RumInjector.get().isEnabled()) {
+                    final Object maybeRumWrapper = httpServletRequest.getAttribute(DD_RUM_INJECTED);
+                    if (maybeRumWrapper instanceof RumControllableResponse) {
+                        rumServletWrapper = (RumControllableResponse) maybeRumWrapper;
+                    } else {
+                        rumServletWrapper =
+                                new RumHttpServletResponseWrapper(httpServletRequest, (HttpServletResponse) response);
+                        httpServletRequest.setAttribute(DD_RUM_INJECTED, rumServletWrapper);
+                        response = (ServletResponse) rumServletWrapper;
+                        request = new RumHttpServletRequestWrapper(
+                                httpServletRequest, (HttpServletResponse) rumServletWrapper);
+                    }
+                }
+            }
 
-      Object contextAttr = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (contextAttr instanceof Context
-          && CallDepthThreadLocalMap.incrementCallDepth(HttpServletRequest.class) == 0) {
-        final Context context = (Context) contextAttr;
-        final AgentSpan span = spanFromContext(context);
-        if (span != null) {
-          ClassloaderConfigurationOverrides.maybeEnrichSpan(span);
-          return span;
+            Object contextAttr = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (contextAttr instanceof Context
+                    && CallDepthThreadLocalMap.incrementCallDepth(HttpServletRequest.class) == 0) {
+                final Context context = (Context) contextAttr;
+                final AgentSpan span = spanFromContext(context);
+                if (span != null) {
+                    ClassloaderConfigurationOverrides.maybeEnrichSpan(span);
+                    return span;
+                }
+            }
+            return null;
         }
-      }
-      return null;
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.Enter final AgentSpan span,
-        @Advice.Argument(0) final ServletRequest request,
-        @Advice.Local("rumServletWrapper") RumControllableResponse rumServletWrapper) {
-      if (span == null) {
-        return;
-      }
-      if (rumServletWrapper != null) {
-        rumServletWrapper.commit();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(
+                @Advice.Enter final AgentSpan span,
+                @Advice.Argument(0) final ServletRequest request,
+                @Advice.Local("rumServletWrapper") RumControllableResponse rumServletWrapper) {
+            if (span == null) {
+                return;
+            }
+            if (rumServletWrapper != null) {
+                rumServletWrapper.commit();
+            }
 
-      CallDepthThreadLocalMap.reset(HttpServletRequest.class);
-      final HttpServletRequest httpServletRequest =
-          (HttpServletRequest) request; // at this point the cast should be safe
-      if (Config.get().isServletPrincipalEnabled()
-          && httpServletRequest.getUserPrincipal() != null) {
-        span.setTag(DDTags.USER_NAME, httpServletRequest.getUserPrincipal().getName());
-      }
+            CallDepthThreadLocalMap.reset(HttpServletRequest.class);
+            final HttpServletRequest httpServletRequest =
+                    (HttpServletRequest) request; // at this point the cast should be safe
+            if (Config.get().isServletPrincipalEnabled() && httpServletRequest.getUserPrincipal() != null) {
+                span.setTag(
+                        DDTags.USER_NAME, httpServletRequest.getUserPrincipal().getName());
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumAsyncContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumAsyncContextInstrumentation.java
index abed23b36e5..2bf46dfd5eb 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumAsyncContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumAsyncContextInstrumentation.java
@@ -18,41 +18,40 @@
 
 @AutoService(InstrumenterModule.class)
 public class RumAsyncContextInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public RumAsyncContextInstrumentation() {
-    super("servlet", "servlet-5", "servlet-5-async-context");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "jakarta.servlet.AsyncContext";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && InstrumenterConfig.get().isRumEnabled();
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("complete", "dispatch")), getClass().getName() + "$CommitAdvice");
-  }
-
-  public static class CommitAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void commitRumBuffer(@Advice.This final AsyncContext asyncContext) {
-      final Object maybeRumWrappedResponse =
-          asyncContext.getRequest().getAttribute(DD_RUM_INJECTED);
-      if (maybeRumWrappedResponse instanceof RumControllableResponse) {
-        ((RumControllableResponse) maybeRumWrappedResponse).commit();
-      }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public RumAsyncContextInstrumentation() {
+        super("servlet", "servlet-5", "servlet-5-async-context");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "jakarta.servlet.AsyncContext";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && InstrumenterConfig.get().isRumEnabled();
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("complete", "dispatch")), getClass().getName() + "$CommitAdvice");
+    }
+
+    public static class CommitAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void commitRumBuffer(@Advice.This final AsyncContext asyncContext) {
+            final Object maybeRumWrappedResponse = asyncContext.getRequest().getAttribute(DD_RUM_INJECTED);
+            if (maybeRumWrappedResponse instanceof RumControllableResponse) {
+                ((RumControllableResponse) maybeRumWrappedResponse).commit();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletRequestWrapper.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletRequestWrapper.java
index 8aa73d4bf3c..cd272358187 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletRequestWrapper.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletRequestWrapper.java
@@ -12,36 +12,34 @@
 
 public class RumHttpServletRequestWrapper extends HttpServletRequestWrapper {
 
-  private final HttpServletResponse response;
+    private final HttpServletResponse response;
 
-  public RumHttpServletRequestWrapper(
-      final HttpServletRequest request, final HttpServletResponse response) {
-    super(request);
-    this.response = response;
-  }
-
-  @Override
-  public AsyncContext startAsync() throws IllegalStateException {
-    // need to hide this method otherwise we cannot control the wrapped response used asynchronously
-    return startAsync(getRequest(), response);
-  }
+    public RumHttpServletRequestWrapper(final HttpServletRequest request, final HttpServletResponse response) {
+        super(request);
+        this.response = response;
+    }
 
-  @Override
-  public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
-      throws IllegalStateException {
-    // deactivate the previous wrapper
-    final Object maybeRumWrappedResponse = (servletRequest.getAttribute(DD_RUM_INJECTED));
-    if (maybeRumWrappedResponse instanceof RumControllableResponse) {
-      ((RumControllableResponse) maybeRumWrappedResponse).commit();
-      ((RumControllableResponse) maybeRumWrappedResponse).stopFiltering();
+    @Override
+    public AsyncContext startAsync() throws IllegalStateException {
+        // need to hide this method otherwise we cannot control the wrapped response used asynchronously
+        return startAsync(getRequest(), response);
     }
-    ServletResponse actualResponse = servletResponse;
-    // rewrap it
-    if (servletResponse instanceof HttpServletResponse) {
-      actualResponse =
-          new RumHttpServletResponseWrapper(this, (HttpServletResponse) servletResponse);
-      servletRequest.setAttribute(DD_RUM_INJECTED, actualResponse);
+
+    @Override
+    public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
+            throws IllegalStateException {
+        // deactivate the previous wrapper
+        final Object maybeRumWrappedResponse = (servletRequest.getAttribute(DD_RUM_INJECTED));
+        if (maybeRumWrappedResponse instanceof RumControllableResponse) {
+            ((RumControllableResponse) maybeRumWrappedResponse).commit();
+            ((RumControllableResponse) maybeRumWrappedResponse).stopFiltering();
+        }
+        ServletResponse actualResponse = servletResponse;
+        // rewrap it
+        if (servletResponse instanceof HttpServletResponse) {
+            actualResponse = new RumHttpServletResponseWrapper(this, (HttpServletResponse) servletResponse);
+            servletRequest.setAttribute(DD_RUM_INJECTED, actualResponse);
+        }
+        return super.startAsync(servletRequest, actualResponse);
     }
-    return super.startAsync(servletRequest, actualResponse);
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletResponseWrapper.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletResponseWrapper.java
index 25b3f2c9964..91591dc6c6a 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletResponseWrapper.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletResponseWrapper.java
@@ -12,225 +12,214 @@
 import java.io.PrintWriter;
 import java.nio.charset.Charset;
 
-public class RumHttpServletResponseWrapper extends HttpServletResponseWrapper
-    implements RumControllableResponse {
-  private final RumInjector rumInjector;
-  private final String servletVersion;
-  private WrappedServletOutputStream outputStream;
-  private InjectingPipeWriter wrappedPipeWriter;
-  private PrintWriter printWriter;
-  private boolean shouldInject = true;
-  private String contentEncoding = null;
-
-  public RumHttpServletResponseWrapper(HttpServletRequest request, HttpServletResponse response) {
-    super(response);
-    this.rumInjector = RumInjector.get();
-
-    String version = "5";
-    ServletContext servletContext = request.getServletContext();
-    if (servletContext != null) {
-      try {
-        version = String.valueOf(servletContext.getEffectiveMajorVersion());
-      } catch (Exception e) {
-      }
-    }
-    this.servletVersion = version;
-  }
-
-  @Override
-  public ServletOutputStream getOutputStream() throws IOException {
-    if (outputStream != null) {
-      return outputStream;
-    }
-    if (!shouldInject) {
-      RumInjector.getTelemetryCollector().onInjectionSkipped(servletVersion);
-      return super.getOutputStream();
-    }
-    try {
-      String encoding = getCharacterEncoding();
-      if (encoding == null) {
-        encoding = Charset.defaultCharset().name();
-      }
-      outputStream =
-          new WrappedServletOutputStream(
-              super.getOutputStream(),
-              rumInjector.getMarkerBytes(encoding),
-              rumInjector.getSnippetBytes(encoding),
-              this::onInjected,
-              bytes ->
-                  RumInjector.getTelemetryCollector()
-                      .onInjectionResponseSize(servletVersion, bytes),
-              milliseconds ->
-                  RumInjector.getTelemetryCollector()
-                      .onInjectionTime(servletVersion, milliseconds));
-    } catch (Exception e) {
-      RumInjector.getTelemetryCollector().onInjectionFailed(servletVersion, contentEncoding);
-      throw e;
-    }
-    return outputStream;
-  }
-
-  @Override
-  public PrintWriter getWriter() throws IOException {
-    if (printWriter != null) {
-      return printWriter;
-    }
-    if (!shouldInject) {
-      RumInjector.getTelemetryCollector().onInjectionSkipped(servletVersion);
-      return super.getWriter();
-    }
-    try {
-      wrappedPipeWriter =
-          new InjectingPipeWriter(
-              super.getWriter(),
-              rumInjector.getMarkerChars(),
-              rumInjector.getSnippetChars(),
-              this::onInjected,
-              bytes ->
-                  RumInjector.getTelemetryCollector()
-                      .onInjectionResponseSize(servletVersion, bytes),
-              milliseconds ->
-                  RumInjector.getTelemetryCollector()
-                      .onInjectionTime(servletVersion, milliseconds));
-      printWriter = new PrintWriter(wrappedPipeWriter);
-    } catch (Exception e) {
-      RumInjector.getTelemetryCollector().onInjectionFailed(servletVersion, contentEncoding);
-      throw e;
-    }
-
-    return printWriter;
-  }
-
-  @Override
-  public void setHeader(String name, String value) {
-    if (shouldInject) {
-      if (isContentLengthHeader(name)) {
-        return;
-      }
-      checkForContentType(name, value);
-      checkForContentSecurityPolicy(name);
-    }
-    super.setHeader(name, value);
-  }
-
-  @Override
-  public void addHeader(String name, String value) {
-    if (shouldInject) {
-      if (isContentLengthHeader(name)) {
-        return;
-      }
-      checkForContentType(name, value);
-      checkForContentSecurityPolicy(name);
-    }
-    super.addHeader(name, value);
-  }
-
-  private boolean isContentLengthHeader(String name) {
-    return "content-length".equalsIgnoreCase(name);
-  }
-
-  private void checkForContentSecurityPolicy(String name) {
-    if ("content-security-policy".equalsIgnoreCase(name)) {
-      RumInjector.getTelemetryCollector().onContentSecurityPolicyDetected(servletVersion);
-    }
-  }
-
-  private void checkForContentType(String name, String value) {
-    if ("content-type".equalsIgnoreCase(name)) {
-      handleContentType(value);
-    }
-  }
-
-  @Override
-  public void setContentLength(int len) {
-    // don't set it since we don't know if we will inject
-    if (!shouldInject) {
-      super.setContentLength(len);
-    }
-  }
-
-  @Override
-  public void setContentLengthLong(long len) {
-    if (!shouldInject) {
-      super.setContentLengthLong(len);
-    }
-  }
-
-  @Override
-  public void setCharacterEncoding(String charset) {
-    if (charset != null) {
-      this.contentEncoding = charset;
-    }
-    super.setCharacterEncoding(charset);
-  }
-
-  @Override
-  public void reset() {
-    this.outputStream = null;
-    this.wrappedPipeWriter = null;
-    this.printWriter = null;
-    this.shouldInject = false;
-    super.reset();
-  }
-
-  @Override
-  public void resetBuffer() {
-    this.outputStream = null;
-    this.wrappedPipeWriter = null;
-    this.printWriter = null;
-    super.resetBuffer();
-  }
-
-  public void onInjected() {
-    RumInjector.getTelemetryCollector().onInjectionSucceed(servletVersion);
-    try {
-      setHeader("x-datadog-rum-injected", "1");
-    } catch (Throwable ignored) {
-      // suppress exception if arisen setting this header by us.
-    }
-  }
-
-  private void handleContentType(String type) {
-    final boolean wasInjecting = shouldInject;
-    if (shouldInject) {
-      shouldInject = type != null && type.contains("text/html");
-    }
-    if (wasInjecting && !shouldInject) {
-      commit();
-      stopFiltering();
-    }
-  }
-
-  @Override
-  public void setContentType(String type) {
-    handleContentType(type);
-    super.setContentType(type);
-  }
-
-  @Override
-  public void commit() {
-    if (wrappedPipeWriter != null) {
-      try {
-        wrappedPipeWriter.commit();
-      } catch (Throwable ignored) {
-      }
-    }
-    if (outputStream != null) {
-      try {
-        outputStream.commit();
-      } catch (Throwable ignored) {
-      }
-    }
-  }
-
-  @Override
-  public void stopFiltering() {
-    shouldInject = false;
-    if (wrappedPipeWriter != null) {
-      wrappedPipeWriter.setFilter(false);
-    }
-    if (outputStream != null) {
-      outputStream.setFilter(false);
-    }
-  }
+public class RumHttpServletResponseWrapper extends HttpServletResponseWrapper implements RumControllableResponse {
+    private final RumInjector rumInjector;
+    private final String servletVersion;
+    private WrappedServletOutputStream outputStream;
+    private InjectingPipeWriter wrappedPipeWriter;
+    private PrintWriter printWriter;
+    private boolean shouldInject = true;
+    private String contentEncoding = null;
+
+    public RumHttpServletResponseWrapper(HttpServletRequest request, HttpServletResponse response) {
+        super(response);
+        this.rumInjector = RumInjector.get();
+
+        String version = "5";
+        ServletContext servletContext = request.getServletContext();
+        if (servletContext != null) {
+            try {
+                version = String.valueOf(servletContext.getEffectiveMajorVersion());
+            } catch (Exception e) {
+            }
+        }
+        this.servletVersion = version;
+    }
+
+    @Override
+    public ServletOutputStream getOutputStream() throws IOException {
+        if (outputStream != null) {
+            return outputStream;
+        }
+        if (!shouldInject) {
+            RumInjector.getTelemetryCollector().onInjectionSkipped(servletVersion);
+            return super.getOutputStream();
+        }
+        try {
+            String encoding = getCharacterEncoding();
+            if (encoding == null) {
+                encoding = Charset.defaultCharset().name();
+            }
+            outputStream = new WrappedServletOutputStream(
+                    super.getOutputStream(),
+                    rumInjector.getMarkerBytes(encoding),
+                    rumInjector.getSnippetBytes(encoding),
+                    this::onInjected,
+                    bytes -> RumInjector.getTelemetryCollector().onInjectionResponseSize(servletVersion, bytes),
+                    milliseconds -> RumInjector.getTelemetryCollector().onInjectionTime(servletVersion, milliseconds));
+        } catch (Exception e) {
+            RumInjector.getTelemetryCollector().onInjectionFailed(servletVersion, contentEncoding);
+            throw e;
+        }
+        return outputStream;
+    }
+
+    @Override
+    public PrintWriter getWriter() throws IOException {
+        if (printWriter != null) {
+            return printWriter;
+        }
+        if (!shouldInject) {
+            RumInjector.getTelemetryCollector().onInjectionSkipped(servletVersion);
+            return super.getWriter();
+        }
+        try {
+            wrappedPipeWriter = new InjectingPipeWriter(
+                    super.getWriter(),
+                    rumInjector.getMarkerChars(),
+                    rumInjector.getSnippetChars(),
+                    this::onInjected,
+                    bytes -> RumInjector.getTelemetryCollector().onInjectionResponseSize(servletVersion, bytes),
+                    milliseconds -> RumInjector.getTelemetryCollector().onInjectionTime(servletVersion, milliseconds));
+            printWriter = new PrintWriter(wrappedPipeWriter);
+        } catch (Exception e) {
+            RumInjector.getTelemetryCollector().onInjectionFailed(servletVersion, contentEncoding);
+            throw e;
+        }
+
+        return printWriter;
+    }
+
+    @Override
+    public void setHeader(String name, String value) {
+        if (shouldInject) {
+            if (isContentLengthHeader(name)) {
+                return;
+            }
+            checkForContentType(name, value);
+            checkForContentSecurityPolicy(name);
+        }
+        super.setHeader(name, value);
+    }
+
+    @Override
+    public void addHeader(String name, String value) {
+        if (shouldInject) {
+            if (isContentLengthHeader(name)) {
+                return;
+            }
+            checkForContentType(name, value);
+            checkForContentSecurityPolicy(name);
+        }
+        super.addHeader(name, value);
+    }
+
+    private boolean isContentLengthHeader(String name) {
+        return "content-length".equalsIgnoreCase(name);
+    }
+
+    private void checkForContentSecurityPolicy(String name) {
+        if ("content-security-policy".equalsIgnoreCase(name)) {
+            RumInjector.getTelemetryCollector().onContentSecurityPolicyDetected(servletVersion);
+        }
+    }
+
+    private void checkForContentType(String name, String value) {
+        if ("content-type".equalsIgnoreCase(name)) {
+            handleContentType(value);
+        }
+    }
+
+    @Override
+    public void setContentLength(int len) {
+        // don't set it since we don't know if we will inject
+        if (!shouldInject) {
+            super.setContentLength(len);
+        }
+    }
+
+    @Override
+    public void setContentLengthLong(long len) {
+        if (!shouldInject) {
+            super.setContentLengthLong(len);
+        }
+    }
+
+    @Override
+    public void setCharacterEncoding(String charset) {
+        if (charset != null) {
+            this.contentEncoding = charset;
+        }
+        super.setCharacterEncoding(charset);
+    }
+
+    @Override
+    public void reset() {
+        this.outputStream = null;
+        this.wrappedPipeWriter = null;
+        this.printWriter = null;
+        this.shouldInject = false;
+        super.reset();
+    }
+
+    @Override
+    public void resetBuffer() {
+        this.outputStream = null;
+        this.wrappedPipeWriter = null;
+        this.printWriter = null;
+        super.resetBuffer();
+    }
+
+    public void onInjected() {
+        RumInjector.getTelemetryCollector().onInjectionSucceed(servletVersion);
+        try {
+            setHeader("x-datadog-rum-injected", "1");
+        } catch (Throwable ignored) {
+            // suppress exception if arisen setting this header by us.
+        }
+    }
+
+    private void handleContentType(String type) {
+        final boolean wasInjecting = shouldInject;
+        if (shouldInject) {
+            shouldInject = type != null && type.contains("text/html");
+        }
+        if (wasInjecting && !shouldInject) {
+            commit();
+            stopFiltering();
+        }
+    }
+
+    @Override
+    public void setContentType(String type) {
+        handleContentType(type);
+        super.setContentType(type);
+    }
+
+    @Override
+    public void commit() {
+        if (wrappedPipeWriter != null) {
+            try {
+                wrappedPipeWriter.commit();
+            } catch (Throwable ignored) {
+            }
+        }
+        if (outputStream != null) {
+            try {
+                outputStream.commit();
+            } catch (Throwable ignored) {
+            }
+        }
+    }
+
+    @Override
+    public void stopFiltering() {
+        shouldInject = false;
+        if (wrappedPipeWriter != null) {
+            wrappedPipeWriter.setFilter(false);
+        }
+        if (outputStream != null) {
+            outputStream.setFilter(false);
+        }
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/Servlet5RequestBodyInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/Servlet5RequestBodyInstrumentation.java
index 72d8e2aecc7..65e5e92fca0 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/Servlet5RequestBodyInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/Servlet5RequestBodyInstrumentation.java
@@ -17,52 +17,52 @@
 
 @AutoService(InstrumenterModule.class)
 public class Servlet5RequestBodyInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public Servlet5RequestBodyInstrumentation() {
-    super("servlet-request-body");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public Servlet5RequestBodyInstrumentation() {
+        super("servlet-request-body");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "jakarta.servlet.http.HttpServletRequest";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "jakarta.servlet.http.HttpServletRequest";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        // ignore wrappers that ship with servlet-api
-        .and(namedNoneOf("jakarta.servlet.http.HttpServletRequestWrapper"))
-        .and(not(extendsClass(named("jakarta.servlet.http.HttpServletRequestWrapper"))));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                // ignore wrappers that ship with servlet-api
+                .and(namedNoneOf("jakarta.servlet.http.HttpServletRequestWrapper"))
+                .and(not(extendsClass(named("jakarta.servlet.http.HttpServletRequestWrapper"))));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getInputStream")
-            .and(takesNoArguments())
-            .and(returns(named("jakarta.servlet.ServletInputStream")))
-            .and(isPublic()),
-        packageName + ".HttpServletGetInputStreamAdvice");
-    transformer.applyAdvice(
-        named("getReader")
-            .and(takesNoArguments())
-            .and(returns(named("java.io.BufferedReader")))
-            .and(isPublic()),
-        packageName + ".HttpServletGetReaderAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getInputStream")
+                        .and(takesNoArguments())
+                        .and(returns(named("jakarta.servlet.ServletInputStream")))
+                        .and(isPublic()),
+                packageName + ".HttpServletGetInputStreamAdvice");
+        transformer.applyAdvice(
+                named("getReader")
+                        .and(takesNoArguments())
+                        .and(returns(named("java.io.BufferedReader")))
+                        .and(isPublic()),
+                packageName + ".HttpServletGetReaderAdvice");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.servlet5.BufferedReaderWrapper",
-      "datadog.trace.instrumentation.servlet5.AbstractServletInputStreamWrapper",
-      "datadog.trace.instrumentation.servlet5.Servlet31InputStreamWrapper"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.servlet5.BufferedReaderWrapper",
+            "datadog.trace.instrumentation.servlet5.AbstractServletInputStreamWrapper",
+            "datadog.trace.instrumentation.servlet5.Servlet31InputStreamWrapper"
+        };
+    }
 
-  @Override
-  public int order() {
-    // apply this instrumentation after the regular servlet one.
-    return 1;
-  }
+    @Override
+    public int order() {
+        // apply this instrumentation after the regular servlet one.
+        return 1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/WrappedServletOutputStream.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/WrappedServletOutputStream.java
index fe2a87774ac..f41f8c2174b 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/WrappedServletOutputStream.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/WrappedServletOutputStream.java
@@ -7,62 +7,61 @@
 import java.util.function.LongConsumer;
 
 public class WrappedServletOutputStream extends ServletOutputStream {
-  private final InjectingPipeOutputStream filtered;
-  private final ServletOutputStream delegate;
+    private final InjectingPipeOutputStream filtered;
+    private final ServletOutputStream delegate;
 
-  public WrappedServletOutputStream(
-      ServletOutputStream delegate,
-      byte[] marker,
-      byte[] contentToInject,
-      Runnable onInjected,
-      LongConsumer onBytesWritten,
-      LongConsumer onInjectionTime) {
-    this.filtered =
-        new InjectingPipeOutputStream(
-            delegate, marker, contentToInject, onInjected, onBytesWritten, onInjectionTime);
-    this.delegate = delegate;
-  }
+    public WrappedServletOutputStream(
+            ServletOutputStream delegate,
+            byte[] marker,
+            byte[] contentToInject,
+            Runnable onInjected,
+            LongConsumer onBytesWritten,
+            LongConsumer onInjectionTime) {
+        this.filtered = new InjectingPipeOutputStream(
+                delegate, marker, contentToInject, onInjected, onBytesWritten, onInjectionTime);
+        this.delegate = delegate;
+    }
 
-  @Override
-  public void write(int b) throws IOException {
-    filtered.write(b);
-  }
+    @Override
+    public void write(int b) throws IOException {
+        filtered.write(b);
+    }
 
-  @Override
-  public void write(byte[] b) throws IOException {
-    filtered.write(b);
-  }
+    @Override
+    public void write(byte[] b) throws IOException {
+        filtered.write(b);
+    }
 
-  @Override
-  public void write(byte[] b, int off, int len) throws IOException {
-    filtered.write(b, off, len);
-  }
+    @Override
+    public void write(byte[] b, int off, int len) throws IOException {
+        filtered.write(b, off, len);
+    }
 
-  public void commit() throws IOException {
-    filtered.commit();
-  }
+    public void commit() throws IOException {
+        filtered.commit();
+    }
 
-  @Override
-  public void flush() throws IOException {
-    filtered.flush();
-  }
+    @Override
+    public void flush() throws IOException {
+        filtered.flush();
+    }
 
-  @Override
-  public void close() throws IOException {
-    filtered.close();
-  }
+    @Override
+    public void close() throws IOException {
+        filtered.close();
+    }
 
-  @Override
-  public boolean isReady() {
-    return delegate.isReady();
-  }
+    @Override
+    public boolean isReady() {
+        return delegate.isReady();
+    }
 
-  @Override
-  public void setWriteListener(WriteListener writeListener) {
-    delegate.setWriteListener(writeListener);
-  }
+    @Override
+    public void setWriteListener(WriteListener writeListener) {
+        delegate.setWriteListener(writeListener);
+    }
 
-  public void setFilter(boolean filter) {
-    filtered.setFilter(filter);
-  }
+    public void setFilter(boolean filter) {
+        filtered.setFilter(filter);
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterCallSite.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterCallSite.java
index 6cd5059af6b..950cfa55cd6 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterCallSite.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterCallSite.java
@@ -12,17 +12,17 @@
 @CallSite(spi = IastCallSites.class)
 public class JakartaJspWriterCallSite {
 
-  @CallSite.Before("void jakarta.servlet.jsp.JspWriter.print(java.lang.String)")
-  @CallSite.Before("void jakarta.servlet.jsp.JspWriter.println(java.lang.String)")
-  @CallSite.Before("void jakarta.servlet.jsp.JspWriter.write(java.lang.String)")
-  public static void beforeStringParam(@CallSite.Argument(0) @Nonnull final String s) {
-    final XssModule module = InstrumentationBridge.XSS;
-    if (module != null) {
-      try {
-        module.onXss(s);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeStringParam threw", e);
-      }
+    @CallSite.Before("void jakarta.servlet.jsp.JspWriter.print(java.lang.String)")
+    @CallSite.Before("void jakarta.servlet.jsp.JspWriter.println(java.lang.String)")
+    @CallSite.Before("void jakarta.servlet.jsp.JspWriter.write(java.lang.String)")
+    public static void beforeStringParam(@CallSite.Argument(0) @Nonnull final String s) {
+        final XssModule module = InstrumentationBridge.XSS;
+        if (module != null) {
+            try {
+                module.onXss(s);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeStringParam threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterFullDetectionCallSite.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterFullDetectionCallSite.java
index baf2bafc32c..d1008c62fd2 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterFullDetectionCallSite.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterFullDetectionCallSite.java
@@ -10,21 +10,21 @@
 
 @Sink(VulnerabilityTypes.XSS)
 @CallSite(
-    spi = IastCallSites.class,
-    enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isFullDetection"})
+        spi = IastCallSites.class,
+        enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isFullDetection"})
 public class JakartaJspWriterFullDetectionCallSite {
 
-  @CallSite.Before("void jakarta.servlet.jsp.JspWriter.print(char[])")
-  @CallSite.Before("void jakarta.servlet.jsp.JspWriter.println(char[])")
-  @CallSite.Before("void jakarta.servlet.jsp.JspWriter.write(char[])")
-  public static void beforeCharArrayParam(@CallSite.Argument(0) @Nonnull final char[] buf) {
-    final XssModule module = InstrumentationBridge.XSS;
-    if (module != null) {
-      try {
-        module.onXss(buf);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeCharArrayParam threw", e);
-      }
+    @CallSite.Before("void jakarta.servlet.jsp.JspWriter.print(char[])")
+    @CallSite.Before("void jakarta.servlet.jsp.JspWriter.println(char[])")
+    @CallSite.Before("void jakarta.servlet.jsp.JspWriter.write(char[])")
+    public static void beforeCharArrayParam(@CallSite.Argument(0) @Nonnull final char[] buf) {
+        final XssModule module = InstrumentationBridge.XSS;
+        if (module != null) {
+            try {
+                module.onXss(buf);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeCharArrayParam threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyContext.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyContext.java
index 28b3650182a..edc8f0cb6d1 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyContext.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyContext.java
@@ -21,272 +21,272 @@
 import java.util.Set;
 
 public class DummyContext implements ServletContext {
-  @Override
-  public String getContextPath() {
-    return null;
-  }
-
-  @Override
-  public ServletContext getContext(String s) {
-    return null;
-  }
-
-  @Override
-  public int getMajorVersion() {
-    return 0;
-  }
-
-  @Override
-  public int getMinorVersion() {
-    return 0;
-  }
-
-  @Override
-  public int getEffectiveMajorVersion() {
-    return 0;
-  }
-
-  @Override
-  public int getEffectiveMinorVersion() {
-    return 0;
-  }
-
-  @Override
-  public String getMimeType(String s) {
-    return null;
-  }
-
-  @Override
-  public Set<String> getResourcePaths(String s) {
-    return null;
-  }
-
-  @Override
-  public URL getResource(String s) throws MalformedURLException {
-    return null;
-  }
-
-  @Override
-  public InputStream getResourceAsStream(String s) {
-    return null;
-  }
-
-  @Override
-  public RequestDispatcher getRequestDispatcher(String s) {
-    return null;
-  }
-
-  @Override
-  public RequestDispatcher getNamedDispatcher(String s) {
-    return null;
-  }
-
-  @Override
-  public Servlet getServlet(String s) throws ServletException {
-    return null;
-  }
-
-  @Override
-  public Enumeration<Servlet> getServlets() {
-    return null;
-  }
-
-  @Override
-  public Enumeration<String> getServletNames() {
-    return null;
-  }
-
-  @Override
-  public void log(String s) {}
-
-  @Override
-  public void log(Exception e, String s) {}
-
-  @Override
-  public void log(String s, Throwable throwable) {}
-
-  @Override
-  public String getRealPath(String s) {
-    return null;
-  }
-
-  @Override
-  public String getServerInfo() {
-    return null;
-  }
-
-  @Override
-  public String getInitParameter(String s) {
-    return null;
-  }
-
-  @Override
-  public Enumeration<String> getInitParameterNames() {
-    return null;
-  }
-
-  @Override
-  public boolean setInitParameter(String s, String s1) {
-    return false;
-  }
-
-  @Override
-  public Object getAttribute(String s) {
-    return null;
-  }
-
-  @Override
-  public Enumeration<String> getAttributeNames() {
-    return null;
-  }
-
-  @Override
-  public void setAttribute(String s, Object o) {}
-
-  @Override
-  public void removeAttribute(String s) {}
-
-  @Override
-  public String getServletContextName() {
-    return null;
-  }
-
-  @Override
-  public ServletRegistration.Dynamic addServlet(String s, String s1) {
-    return null;
-  }
-
-  @Override
-  public ServletRegistration.Dynamic addServlet(String s, Servlet servlet) {
-    return null;
-  }
-
-  @Override
-  public ServletRegistration.Dynamic addServlet(String s, Class<? extends Servlet> aClass) {
-    return null;
-  }
-
-  @Override
-  public ServletRegistration.Dynamic addJspFile(String s, String s1) {
-    return null;
-  }
-
-  @Override
-  public <T extends Servlet> T createServlet(Class<T> aClass) throws ServletException {
-    return null;
-  }
-
-  @Override
-  public ServletRegistration getServletRegistration(String s) {
-    return null;
-  }
-
-  @Override
-  public Map<String, ? extends ServletRegistration> getServletRegistrations() {
-    return null;
-  }
-
-  @Override
-  public FilterRegistration.Dynamic addFilter(String s, String s1) {
-    return null;
-  }
-
-  @Override
-  public FilterRegistration.Dynamic addFilter(String s, Filter filter) {
-    return null;
-  }
-
-  @Override
-  public FilterRegistration.Dynamic addFilter(String s, Class<? extends Filter> aClass) {
-    return null;
-  }
-
-  @Override
-  public <T extends Filter> T createFilter(Class<T> aClass) throws ServletException {
-    return null;
-  }
-
-  @Override
-  public FilterRegistration getFilterRegistration(String s) {
-    return null;
-  }
-
-  @Override
-  public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
-    return null;
-  }
-
-  @Override
-  public SessionCookieConfig getSessionCookieConfig() {
-    return null;
-  }
-
-  @Override
-  public void setSessionTrackingModes(Set<SessionTrackingMode> set) {}
-
-  @Override
-  public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
-    return null;
-  }
-
-  @Override
-  public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
-    return new HashSet<>(Arrays.asList(SessionTrackingMode.COOKIE, SessionTrackingMode.URL));
-  }
-
-  @Override
-  public void addListener(String s) {}
-
-  @Override
-  public <T extends EventListener> void addListener(T t) {}
-
-  @Override
-  public void addListener(Class<? extends EventListener> aClass) {}
-
-  @Override
-  public <T extends EventListener> T createListener(Class<T> aClass) throws ServletException {
-    return null;
-  }
-
-  @Override
-  public JspConfigDescriptor getJspConfigDescriptor() {
-    return null;
-  }
-
-  @Override
-  public ClassLoader getClassLoader() {
-    return null;
-  }
-
-  @Override
-  public void declareRoles(String... strings) {}
-
-  @Override
-  public String getVirtualServerName() {
-    return null;
-  }
-
-  @Override
-  public int getSessionTimeout() {
-    return 0;
-  }
-
-  @Override
-  public void setSessionTimeout(int i) {}
-
-  @Override
-  public String getRequestCharacterEncoding() {
-    return null;
-  }
-
-  @Override
-  public void setRequestCharacterEncoding(String s) {}
-
-  @Override
-  public String getResponseCharacterEncoding() {
-    return null;
-  }
-
-  @Override
-  public void setResponseCharacterEncoding(String s) {}
+    @Override
+    public String getContextPath() {
+        return null;
+    }
+
+    @Override
+    public ServletContext getContext(String s) {
+        return null;
+    }
+
+    @Override
+    public int getMajorVersion() {
+        return 0;
+    }
+
+    @Override
+    public int getMinorVersion() {
+        return 0;
+    }
+
+    @Override
+    public int getEffectiveMajorVersion() {
+        return 0;
+    }
+
+    @Override
+    public int getEffectiveMinorVersion() {
+        return 0;
+    }
+
+    @Override
+    public String getMimeType(String s) {
+        return null;
+    }
+
+    @Override
+    public Set<String> getResourcePaths(String s) {
+        return null;
+    }
+
+    @Override
+    public URL getResource(String s) throws MalformedURLException {
+        return null;
+    }
+
+    @Override
+    public InputStream getResourceAsStream(String s) {
+        return null;
+    }
+
+    @Override
+    public RequestDispatcher getRequestDispatcher(String s) {
+        return null;
+    }
+
+    @Override
+    public RequestDispatcher getNamedDispatcher(String s) {
+        return null;
+    }
+
+    @Override
+    public Servlet getServlet(String s) throws ServletException {
+        return null;
+    }
+
+    @Override
+    public Enumeration<Servlet> getServlets() {
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getServletNames() {
+        return null;
+    }
+
+    @Override
+    public void log(String s) {}
+
+    @Override
+    public void log(Exception e, String s) {}
+
+    @Override
+    public void log(String s, Throwable throwable) {}
+
+    @Override
+    public String getRealPath(String s) {
+        return null;
+    }
+
+    @Override
+    public String getServerInfo() {
+        return null;
+    }
+
+    @Override
+    public String getInitParameter(String s) {
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getInitParameterNames() {
+        return null;
+    }
+
+    @Override
+    public boolean setInitParameter(String s, String s1) {
+        return false;
+    }
+
+    @Override
+    public Object getAttribute(String s) {
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getAttributeNames() {
+        return null;
+    }
+
+    @Override
+    public void setAttribute(String s, Object o) {}
+
+    @Override
+    public void removeAttribute(String s) {}
+
+    @Override
+    public String getServletContextName() {
+        return null;
+    }
+
+    @Override
+    public ServletRegistration.Dynamic addServlet(String s, String s1) {
+        return null;
+    }
+
+    @Override
+    public ServletRegistration.Dynamic addServlet(String s, Servlet servlet) {
+        return null;
+    }
+
+    @Override
+    public ServletRegistration.Dynamic addServlet(String s, Class<? extends Servlet> aClass) {
+        return null;
+    }
+
+    @Override
+    public ServletRegistration.Dynamic addJspFile(String s, String s1) {
+        return null;
+    }
+
+    @Override
+    public <T extends Servlet> T createServlet(Class<T> aClass) throws ServletException {
+        return null;
+    }
+
+    @Override
+    public ServletRegistration getServletRegistration(String s) {
+        return null;
+    }
+
+    @Override
+    public Map<String, ? extends ServletRegistration> getServletRegistrations() {
+        return null;
+    }
+
+    @Override
+    public FilterRegistration.Dynamic addFilter(String s, String s1) {
+        return null;
+    }
+
+    @Override
+    public FilterRegistration.Dynamic addFilter(String s, Filter filter) {
+        return null;
+    }
+
+    @Override
+    public FilterRegistration.Dynamic addFilter(String s, Class<? extends Filter> aClass) {
+        return null;
+    }
+
+    @Override
+    public <T extends Filter> T createFilter(Class<T> aClass) throws ServletException {
+        return null;
+    }
+
+    @Override
+    public FilterRegistration getFilterRegistration(String s) {
+        return null;
+    }
+
+    @Override
+    public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
+        return null;
+    }
+
+    @Override
+    public SessionCookieConfig getSessionCookieConfig() {
+        return null;
+    }
+
+    @Override
+    public void setSessionTrackingModes(Set<SessionTrackingMode> set) {}
+
+    @Override
+    public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
+        return null;
+    }
+
+    @Override
+    public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
+        return new HashSet<>(Arrays.asList(SessionTrackingMode.COOKIE, SessionTrackingMode.URL));
+    }
+
+    @Override
+    public void addListener(String s) {}
+
+    @Override
+    public <T extends EventListener> void addListener(T t) {}
+
+    @Override
+    public void addListener(Class<? extends EventListener> aClass) {}
+
+    @Override
+    public <T extends EventListener> T createListener(Class<T> aClass) throws ServletException {
+        return null;
+    }
+
+    @Override
+    public JspConfigDescriptor getJspConfigDescriptor() {
+        return null;
+    }
+
+    @Override
+    public ClassLoader getClassLoader() {
+        return null;
+    }
+
+    @Override
+    public void declareRoles(String... strings) {}
+
+    @Override
+    public String getVirtualServerName() {
+        return null;
+    }
+
+    @Override
+    public int getSessionTimeout() {
+        return 0;
+    }
+
+    @Override
+    public void setSessionTimeout(int i) {}
+
+    @Override
+    public String getRequestCharacterEncoding() {
+        return null;
+    }
+
+    @Override
+    public void setRequestCharacterEncoding(String s) {}
+
+    @Override
+    public String getResponseCharacterEncoding() {
+        return null;
+    }
+
+    @Override
+    public void setResponseCharacterEncoding(String s) {}
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyHttpServlet.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyHttpServlet.java
index 6a8e605a8c1..f052db7e36c 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyHttpServlet.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyHttpServlet.java
@@ -13,41 +13,40 @@
 
 public class DummyHttpServlet extends HttpServlet {
 
-  DummyHttpServlet() {}
-
-  private void callPublicServiceMethod(HttpServletRequest req, HttpServletResponse resp)
-      throws ServletException, IOException {
-    service((ServletRequest) req, (ServletResponse) resp);
-  }
-
-  @Override
-  public void service(ServletRequest req, ServletResponse res)
-      throws ServletException, IOException {
-    // do nothing
-  }
-
-  @Override
-  public ServletConfig getServletConfig() {
-    return new ServletConfig() {
-      @Override
-      public String getServletName() {
-        return "test";
-      }
-
-      @Override
-      public ServletContext getServletContext() {
-        return new DummyContext();
-      }
-
-      @Override
-      public String getInitParameter(String s) {
-        return s;
-      }
-
-      @Override
-      public Enumeration<String> getInitParameterNames() {
-        return null;
-      }
-    };
-  }
+    DummyHttpServlet() {}
+
+    private void callPublicServiceMethod(HttpServletRequest req, HttpServletResponse resp)
+            throws ServletException, IOException {
+        service((ServletRequest) req, (ServletResponse) resp);
+    }
+
+    @Override
+    public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {
+        // do nothing
+    }
+
+    @Override
+    public ServletConfig getServletConfig() {
+        return new ServletConfig() {
+            @Override
+            public String getServletName() {
+                return "test";
+            }
+
+            @Override
+            public ServletContext getServletContext() {
+                return new DummyContext();
+            }
+
+            @Override
+            public String getInitParameter(String s) {
+                return s;
+            }
+
+            @Override
+            public Enumeration<String> getInitParameterNames() {
+                return null;
+            }
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyRequest.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyRequest.java
index 9715496786f..5dd42f7db5e 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyRequest.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyRequest.java
@@ -25,343 +25,341 @@
 
 public class DummyRequest implements HttpServletRequest {
 
-  private ServletContext context = new DummyContext();
-
-  @Override
-  public String getAuthType() {
-    return null;
-  }
-
-  @Override
-  public Cookie[] getCookies() {
-    return new Cookie[0];
-  }
-
-  @Override
-  public long getDateHeader(String s) {
-    return 0;
-  }
-
-  @Override
-  public String getHeader(String s) {
-    return null;
-  }
-
-  @Override
-  public Enumeration<String> getHeaders(String s) {
-    return null;
-  }
-
-  @Override
-  public Enumeration<String> getHeaderNames() {
-    return null;
-  }
-
-  @Override
-  public int getIntHeader(String s) {
-    return 0;
-  }
-
-  @Override
-  public String getMethod() {
-    return null;
-  }
-
-  @Override
-  public String getPathInfo() {
-    return null;
-  }
-
-  @Override
-  public String getPathTranslated() {
-    return null;
-  }
-
-  @Override
-  public String getContextPath() {
-    return "/";
-  }
-
-  @Override
-  public String getQueryString() {
-    return null;
-  }
-
-  @Override
-  public String getRemoteUser() {
-    return null;
-  }
-
-  @Override
-  public boolean isUserInRole(String s) {
-    return false;
-  }
-
-  @Override
-  public Principal getUserPrincipal() {
-    return null;
-  }
-
-  @Override
-  public String getRequestedSessionId() {
-    return null;
-  }
-
-  @Override
-  public String getRequestURI() {
-    return "/test";
-  }
-
-  @Override
-  public StringBuffer getRequestURL() {
-    return null;
-  }
-
-  @Override
-  public String getServletPath() {
-    return null;
-  }
-
-  @Override
-  public HttpSession getSession(boolean b) {
-    return null;
-  }
-
-  @Override
-  public HttpSession getSession() {
-    return null;
-  }
-
-  @Override
-  public String changeSessionId() {
-    return null;
-  }
-
-  @Override
-  public boolean isRequestedSessionIdValid() {
-    return false;
-  }
-
-  @Override
-  public boolean isRequestedSessionIdFromCookie() {
-    return false;
-  }
-
-  @Override
-  public boolean isRequestedSessionIdFromURL() {
-    return false;
-  }
-
-  @Override
-  public boolean isRequestedSessionIdFromUrl() {
-    return false;
-  }
-
-  @Override
-  public boolean authenticate(HttpServletResponse httpServletResponse)
-      throws IOException, ServletException {
-    return false;
-  }
-
-  @Override
-  public void login(String s, String s1) throws ServletException {}
-
-  @Override
-  public void logout() throws ServletException {}
-
-  @Override
-  public Collection<Part> getParts() throws IOException, ServletException {
-    return null;
-  }
-
-  @Override
-  public Part getPart(String s) throws IOException, ServletException {
-    return null;
-  }
-
-  @Override
-  public <T extends HttpUpgradeHandler> T upgrade(Class<T> aClass)
-      throws IOException, ServletException {
-    return null;
-  }
-
-  @Override
-  public Object getAttribute(String s) {
-    return null;
-  }
-
-  @Override
-  public Enumeration<String> getAttributeNames() {
-    return null;
-  }
-
-  @Override
-  public String getCharacterEncoding() {
-    return null;
-  }
-
-  @Override
-  public void setCharacterEncoding(String s) throws UnsupportedEncodingException {}
-
-  @Override
-  public int getContentLength() {
-    return 0;
-  }
-
-  @Override
-  public long getContentLengthLong() {
-    return 0;
-  }
-
-  @Override
-  public String getContentType() {
-    return null;
-  }
-
-  @Override
-  public ServletInputStream getInputStream() throws IOException {
-    return null;
-  }
-
-  @Override
-  public String getParameter(String s) {
-    return null;
-  }
-
-  @Override
-  public Enumeration<String> getParameterNames() {
-    return null;
-  }
-
-  @Override
-  public String[] getParameterValues(String s) {
-    return new String[0];
-  }
-
-  @Override
-  public Map<String, String[]> getParameterMap() {
-    return null;
-  }
-
-  @Override
-  public String getProtocol() {
-    return null;
-  }
-
-  @Override
-  public String getScheme() {
-    return null;
-  }
-
-  @Override
-  public String getServerName() {
-    return null;
-  }
-
-  @Override
-  public int getServerPort() {
-    return 0;
-  }
-
-  @Override
-  public BufferedReader getReader() throws IOException {
-    return null;
-  }
-
-  @Override
-  public String getRemoteAddr() {
-    return null;
-  }
-
-  @Override
-  public String getRemoteHost() {
-    return null;
-  }
-
-  @Override
-  public void setAttribute(String s, Object o) {}
-
-  @Override
-  public void removeAttribute(String s) {}
-
-  @Override
-  public Locale getLocale() {
-    return null;
-  }
-
-  @Override
-  public Enumeration<Locale> getLocales() {
-    return null;
-  }
-
-  @Override
-  public boolean isSecure() {
-    return false;
-  }
-
-  @Override
-  public RequestDispatcher getRequestDispatcher(String s) {
-    return null;
-  }
-
-  @Override
-  public String getRealPath(String s) {
-    return null;
-  }
-
-  @Override
-  public int getRemotePort() {
-    return 0;
-  }
-
-  @Override
-  public String getLocalName() {
-    return null;
-  }
-
-  @Override
-  public String getLocalAddr() {
-    return null;
-  }
-
-  @Override
-  public int getLocalPort() {
-    return 0;
-  }
-
-  @Override
-  public ServletContext getServletContext() {
-    return context;
-  }
-
-  @Override
-  public AsyncContext startAsync() throws IllegalStateException {
-    return null;
-  }
-
-  @Override
-  public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
-      throws IllegalStateException {
-    return null;
-  }
-
-  @Override
-  public boolean isAsyncStarted() {
-    return false;
-  }
-
-  @Override
-  public boolean isAsyncSupported() {
-    return false;
-  }
-
-  @Override
-  public AsyncContext getAsyncContext() {
-    return null;
-  }
-
-  @Override
-  public DispatcherType getDispatcherType() {
-    return null;
-  }
+    private ServletContext context = new DummyContext();
+
+    @Override
+    public String getAuthType() {
+        return null;
+    }
+
+    @Override
+    public Cookie[] getCookies() {
+        return new Cookie[0];
+    }
+
+    @Override
+    public long getDateHeader(String s) {
+        return 0;
+    }
+
+    @Override
+    public String getHeader(String s) {
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getHeaders(String s) {
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getHeaderNames() {
+        return null;
+    }
+
+    @Override
+    public int getIntHeader(String s) {
+        return 0;
+    }
+
+    @Override
+    public String getMethod() {
+        return null;
+    }
+
+    @Override
+    public String getPathInfo() {
+        return null;
+    }
+
+    @Override
+    public String getPathTranslated() {
+        return null;
+    }
+
+    @Override
+    public String getContextPath() {
+        return "/";
+    }
+
+    @Override
+    public String getQueryString() {
+        return null;
+    }
+
+    @Override
+    public String getRemoteUser() {
+        return null;
+    }
+
+    @Override
+    public boolean isUserInRole(String s) {
+        return false;
+    }
+
+    @Override
+    public Principal getUserPrincipal() {
+        return null;
+    }
+
+    @Override
+    public String getRequestedSessionId() {
+        return null;
+    }
+
+    @Override
+    public String getRequestURI() {
+        return "/test";
+    }
+
+    @Override
+    public StringBuffer getRequestURL() {
+        return null;
+    }
+
+    @Override
+    public String getServletPath() {
+        return null;
+    }
+
+    @Override
+    public HttpSession getSession(boolean b) {
+        return null;
+    }
+
+    @Override
+    public HttpSession getSession() {
+        return null;
+    }
+
+    @Override
+    public String changeSessionId() {
+        return null;
+    }
+
+    @Override
+    public boolean isRequestedSessionIdValid() {
+        return false;
+    }
+
+    @Override
+    public boolean isRequestedSessionIdFromCookie() {
+        return false;
+    }
+
+    @Override
+    public boolean isRequestedSessionIdFromURL() {
+        return false;
+    }
+
+    @Override
+    public boolean isRequestedSessionIdFromUrl() {
+        return false;
+    }
+
+    @Override
+    public boolean authenticate(HttpServletResponse httpServletResponse) throws IOException, ServletException {
+        return false;
+    }
+
+    @Override
+    public void login(String s, String s1) throws ServletException {}
+
+    @Override
+    public void logout() throws ServletException {}
+
+    @Override
+    public Collection<Part> getParts() throws IOException, ServletException {
+        return null;
+    }
+
+    @Override
+    public Part getPart(String s) throws IOException, ServletException {
+        return null;
+    }
+
+    @Override
+    public <T extends HttpUpgradeHandler> T upgrade(Class<T> aClass) throws IOException, ServletException {
+        return null;
+    }
+
+    @Override
+    public Object getAttribute(String s) {
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getAttributeNames() {
+        return null;
+    }
+
+    @Override
+    public String getCharacterEncoding() {
+        return null;
+    }
+
+    @Override
+    public void setCharacterEncoding(String s) throws UnsupportedEncodingException {}
+
+    @Override
+    public int getContentLength() {
+        return 0;
+    }
+
+    @Override
+    public long getContentLengthLong() {
+        return 0;
+    }
+
+    @Override
+    public String getContentType() {
+        return null;
+    }
+
+    @Override
+    public ServletInputStream getInputStream() throws IOException {
+        return null;
+    }
+
+    @Override
+    public String getParameter(String s) {
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getParameterNames() {
+        return null;
+    }
+
+    @Override
+    public String[] getParameterValues(String s) {
+        return new String[0];
+    }
+
+    @Override
+    public Map<String, String[]> getParameterMap() {
+        return null;
+    }
+
+    @Override
+    public String getProtocol() {
+        return null;
+    }
+
+    @Override
+    public String getScheme() {
+        return null;
+    }
+
+    @Override
+    public String getServerName() {
+        return null;
+    }
+
+    @Override
+    public int getServerPort() {
+        return 0;
+    }
+
+    @Override
+    public BufferedReader getReader() throws IOException {
+        return null;
+    }
+
+    @Override
+    public String getRemoteAddr() {
+        return null;
+    }
+
+    @Override
+    public String getRemoteHost() {
+        return null;
+    }
+
+    @Override
+    public void setAttribute(String s, Object o) {}
+
+    @Override
+    public void removeAttribute(String s) {}
+
+    @Override
+    public Locale getLocale() {
+        return null;
+    }
+
+    @Override
+    public Enumeration<Locale> getLocales() {
+        return null;
+    }
+
+    @Override
+    public boolean isSecure() {
+        return false;
+    }
+
+    @Override
+    public RequestDispatcher getRequestDispatcher(String s) {
+        return null;
+    }
+
+    @Override
+    public String getRealPath(String s) {
+        return null;
+    }
+
+    @Override
+    public int getRemotePort() {
+        return 0;
+    }
+
+    @Override
+    public String getLocalName() {
+        return null;
+    }
+
+    @Override
+    public String getLocalAddr() {
+        return null;
+    }
+
+    @Override
+    public int getLocalPort() {
+        return 0;
+    }
+
+    @Override
+    public ServletContext getServletContext() {
+        return context;
+    }
+
+    @Override
+    public AsyncContext startAsync() throws IllegalStateException {
+        return null;
+    }
+
+    @Override
+    public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
+            throws IllegalStateException {
+        return null;
+    }
+
+    @Override
+    public boolean isAsyncStarted() {
+        return false;
+    }
+
+    @Override
+    public boolean isAsyncSupported() {
+        return false;
+    }
+
+    @Override
+    public AsyncContext getAsyncContext() {
+        return null;
+    }
+
+    @Override
+    public DispatcherType getDispatcherType() {
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyResponse.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyResponse.java
index cdd806f3580..d872c3506b8 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyResponse.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyResponse.java
@@ -9,156 +9,156 @@
 import java.util.Locale;
 
 public class DummyResponse implements HttpServletResponse {
-  @Override
-  public void addCookie(Cookie cookie) {}
+    @Override
+    public void addCookie(Cookie cookie) {}
 
-  public void addCookie(CustomCookie cookie) {}
+    public void addCookie(CustomCookie cookie) {}
 
-  @Override
-  public boolean containsHeader(String name) {
-    return false;
-  }
+    @Override
+    public boolean containsHeader(String name) {
+        return false;
+    }
 
-  @Override
-  public String encodeURL(String url) {
-    return "Encoded_" + url;
-  }
+    @Override
+    public String encodeURL(String url) {
+        return "Encoded_" + url;
+    }
 
-  @Override
-  public String encodeRedirectURL(String url) {
-    return "Encoded_" + url;
-  }
+    @Override
+    public String encodeRedirectURL(String url) {
+        return "Encoded_" + url;
+    }
 
-  @Override
-  public String encodeUrl(String url) {
-    return null;
-  }
+    @Override
+    public String encodeUrl(String url) {
+        return null;
+    }
 
-  @Override
-  public String encodeRedirectUrl(String url) {
-    return null;
-  }
+    @Override
+    public String encodeRedirectUrl(String url) {
+        return null;
+    }
 
-  @Override
-  public void sendError(int sc, String msg) throws IOException {}
+    @Override
+    public void sendError(int sc, String msg) throws IOException {}
 
-  @Override
-  public void sendError(int sc) throws IOException {}
+    @Override
+    public void sendError(int sc) throws IOException {}
 
-  @Override
-  public void sendRedirect(String location) throws IOException {}
+    @Override
+    public void sendRedirect(String location) throws IOException {}
 
-  @Override
-  public void setDateHeader(String name, long date) {}
+    @Override
+    public void setDateHeader(String name, long date) {}
 
-  @Override
-  public void addDateHeader(String name, long date) {}
+    @Override
+    public void addDateHeader(String name, long date) {}
 
-  @Override
-  public void setHeader(String name, String value) {}
+    @Override
+    public void setHeader(String name, String value) {}
 
-  public void setHeader(CustomHeaderName name, String value) {}
+    public void setHeader(CustomHeaderName name, String value) {}
 
-  @Override
-  public void addHeader(String name, String value) {}
+    @Override
+    public void addHeader(String name, String value) {}
 
-  public void addHeader(CustomHeaderName name, String value) {}
+    public void addHeader(CustomHeaderName name, String value) {}
 
-  @Override
-  public void setIntHeader(String name, int value) {}
+    @Override
+    public void setIntHeader(String name, int value) {}
 
-  @Override
-  public void addIntHeader(String name, int value) {}
+    @Override
+    public void addIntHeader(String name, int value) {}
 
-  @Override
-  public void setStatus(int sc) {}
+    @Override
+    public void setStatus(int sc) {}
 
-  @Override
-  public void setStatus(int sc, String sm) {}
+    @Override
+    public void setStatus(int sc, String sm) {}
 
-  @Override
-  public int getStatus() {
-    return 0;
-  }
+    @Override
+    public int getStatus() {
+        return 0;
+    }
 
-  @Override
-  public String getHeader(String name) {
-    return null;
-  }
+    @Override
+    public String getHeader(String name) {
+        return null;
+    }
 
-  @Override
-  public Collection<String> getHeaders(String name) {
-    return null;
-  }
+    @Override
+    public Collection<String> getHeaders(String name) {
+        return null;
+    }
 
-  @Override
-  public Collection<String> getHeaderNames() {
-    return null;
-  }
+    @Override
+    public Collection<String> getHeaderNames() {
+        return null;
+    }
 
-  @Override
-  public String getCharacterEncoding() {
-    return null;
-  }
+    @Override
+    public String getCharacterEncoding() {
+        return null;
+    }
 
-  @Override
-  public String getContentType() {
-    return null;
-  }
+    @Override
+    public String getContentType() {
+        return null;
+    }
 
-  @Override
-  public ServletOutputStream getOutputStream() throws IOException {
-    return null;
-  }
+    @Override
+    public ServletOutputStream getOutputStream() throws IOException {
+        return null;
+    }
 
-  @Override
-  public PrintWriter getWriter() throws IOException {
-    return null;
-  }
+    @Override
+    public PrintWriter getWriter() throws IOException {
+        return null;
+    }
 
-  @Override
-  public void setCharacterEncoding(String charset) {}
+    @Override
+    public void setCharacterEncoding(String charset) {}
 
-  @Override
-  public void setContentLength(int len) {}
+    @Override
+    public void setContentLength(int len) {}
 
-  @Override
-  public void setContentLengthLong(long len) {}
+    @Override
+    public void setContentLengthLong(long len) {}
 
-  @Override
-  public void setContentType(String type) {}
+    @Override
+    public void setContentType(String type) {}
 
-  @Override
-  public void setBufferSize(int size) {}
+    @Override
+    public void setBufferSize(int size) {}
 
-  @Override
-  public int getBufferSize() {
-    return 0;
-  }
+    @Override
+    public int getBufferSize() {
+        return 0;
+    }
 
-  @Override
-  public void flushBuffer() throws IOException {}
+    @Override
+    public void flushBuffer() throws IOException {}
 
-  @Override
-  public void resetBuffer() {}
+    @Override
+    public void resetBuffer() {}
 
-  @Override
-  public boolean isCommitted() {
-    return false;
-  }
+    @Override
+    public boolean isCommitted() {
+        return false;
+    }
 
-  @Override
-  public void reset() {}
+    @Override
+    public void reset() {}
 
-  @Override
-  public void setLocale(Locale loc) {}
+    @Override
+    public void setLocale(Locale loc) {}
 
-  @Override
-  public Locale getLocale() {
-    return null;
-  }
+    @Override
+    public Locale getLocale() {
+        return null;
+    }
 
-  public static class CustomCookie {}
+    public static class CustomCookie {}
 
-  public static class CustomHeaderName {}
+    public static class CustomHeaderName {}
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestTestSuite.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestTestSuite.java
index 41f3b87641e..dd8b4f4ef8a 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestTestSuite.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestTestSuite.java
@@ -3,29 +3,29 @@
 import jakarta.servlet.http.HttpServletRequest;
 
 public class JakartaHttpServletRequestTestSuite implements ServletRequestTestSuite {
-  private final HttpServletRequest request;
+    private final HttpServletRequest request;
 
-  public JakartaHttpServletRequestTestSuite(final HttpServletRequest request) {
-    this.request = request;
-  }
+    public JakartaHttpServletRequestTestSuite(final HttpServletRequest request) {
+        this.request = request;
+    }
 
-  @Override
-  public String getRequestURI() {
-    return request.getRequestURI();
-  }
+    @Override
+    public String getRequestURI() {
+        return request.getRequestURI();
+    }
 
-  @Override
-  public String getPathInfo() {
-    return request.getPathInfo();
-  }
+    @Override
+    public String getPathInfo() {
+        return request.getPathInfo();
+    }
 
-  @Override
-  public String getPathTranslated() {
-    return request.getPathTranslated();
-  }
+    @Override
+    public String getPathTranslated() {
+        return request.getPathTranslated();
+    }
 
-  @Override
-  public StringBuffer getRequestURL() {
-    return request.getRequestURL();
-  }
+    @Override
+    public StringBuffer getRequestURL() {
+        return request.getRequestURL();
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestWrapperTestSuite.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestWrapperTestSuite.java
index 80039d4cdca..ea5b5f10fab 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestWrapperTestSuite.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestWrapperTestSuite.java
@@ -3,29 +3,29 @@
 import jakarta.servlet.http.HttpServletRequestWrapper;
 
 public class JakartaHttpServletRequestWrapperTestSuite implements ServletRequestTestSuite {
-  private final HttpServletRequestWrapper request;
+    private final HttpServletRequestWrapper request;
 
-  public JakartaHttpServletRequestWrapperTestSuite(final HttpServletRequestWrapper request) {
-    this.request = request;
-  }
+    public JakartaHttpServletRequestWrapperTestSuite(final HttpServletRequestWrapper request) {
+        this.request = request;
+    }
 
-  @Override
-  public String getRequestURI() {
-    return request.getRequestURI();
-  }
+    @Override
+    public String getRequestURI() {
+        return request.getRequestURI();
+    }
 
-  @Override
-  public String getPathInfo() {
-    return request.getPathInfo();
-  }
+    @Override
+    public String getPathInfo() {
+        return request.getPathInfo();
+    }
 
-  @Override
-  public String getPathTranslated() {
-    return request.getPathTranslated();
-  }
+    @Override
+    public String getPathTranslated() {
+        return request.getPathTranslated();
+    }
 
-  @Override
-  public StringBuffer getRequestURL() {
-    return request.getRequestURL();
-  }
+    @Override
+    public StringBuffer getRequestURL() {
+        return request.getRequestURL();
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/MockPart.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/MockPart.java
index a8f8fd288b9..669eb5cf0df 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/MockPart.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/MockPart.java
@@ -9,74 +9,74 @@
 import java.util.Map;
 
 public class MockPart implements Part {
-  private final String name;
-
-  private final Map<String, Collection<String>> headers;
-  private final InputStream inputStream;
-
-  public MockPart(final String name, final Map<String, Collection<String>> headers) {
-    this.name = name;
-    this.headers = headers;
-    this.inputStream = null;
-  }
-
-  public MockPart(final String name, final String headerName, final String... headerValue) {
-    this.name = name;
-    this.headers = new HashMap<>();
-    this.headers.put(headerName, Arrays.asList(headerValue));
-    this.inputStream = null;
-  }
-
-  public MockPart(final String name, final InputStream inputStream) {
-    this.name = name;
-    this.headers = new HashMap<>();
-    this.inputStream = inputStream;
-  }
-
-  @Override
-  public InputStream getInputStream() throws IOException {
-    return inputStream;
-  }
-
-  @Override
-  public String getContentType() {
-    return null;
-  }
-
-  @Override
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public String getSubmittedFileName() {
-    return null;
-  }
-
-  @Override
-  public long getSize() {
-    return 0;
-  }
-
-  @Override
-  public void write(String fileName) throws IOException {}
-
-  @Override
-  public void delete() throws IOException {}
-
-  @Override
-  public String getHeader(String name) {
-    final Collection<String> values = this.headers.get(name);
-    return values == null || values.isEmpty() ? null : values.iterator().next();
-  }
-
-  @Override
-  public Collection<String> getHeaders(String name) {
-    return headers.get(name);
-  }
-
-  @Override
-  public Collection<String> getHeaderNames() {
-    return this.headers.keySet();
-  }
+    private final String name;
+
+    private final Map<String, Collection<String>> headers;
+    private final InputStream inputStream;
+
+    public MockPart(final String name, final Map<String, Collection<String>> headers) {
+        this.name = name;
+        this.headers = headers;
+        this.inputStream = null;
+    }
+
+    public MockPart(final String name, final String headerName, final String... headerValue) {
+        this.name = name;
+        this.headers = new HashMap<>();
+        this.headers.put(headerName, Arrays.asList(headerValue));
+        this.inputStream = null;
+    }
+
+    public MockPart(final String name, final InputStream inputStream) {
+        this.name = name;
+        this.headers = new HashMap<>();
+        this.inputStream = inputStream;
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException {
+        return inputStream;
+    }
+
+    @Override
+    public String getContentType() {
+        return null;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getSubmittedFileName() {
+        return null;
+    }
+
+    @Override
+    public long getSize() {
+        return 0;
+    }
+
+    @Override
+    public void write(String fileName) throws IOException {}
+
+    @Override
+    public void delete() throws IOException {}
+
+    @Override
+    public String getHeader(String name) {
+        final Collection<String> values = this.headers.get(name);
+        return values == null || values.isEmpty() ? null : values.iterator().next();
+    }
+
+    @Override
+    public Collection<String> getHeaders(String name) {
+        return headers.get(name);
+    }
+
+    @Override
+    public Collection<String> getHeaderNames() {
+        return this.headers.keySet();
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/ServletRequestTestSuite.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/ServletRequestTestSuite.java
index c1e5e45cde4..1e1957b4b5d 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/ServletRequestTestSuite.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/ServletRequestTestSuite.java
@@ -2,11 +2,11 @@
 
 public interface ServletRequestTestSuite {
 
-  String getRequestURI();
+    String getRequestURI();
 
-  String getPathInfo();
+    String getPathInfo();
 
-  String getPathTranslated();
+    String getPathTranslated();
 
-  StringBuffer getRequestURL();
+    StringBuffer getRequestURL();
 }
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/TestJspWriterSuite.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/TestJspWriterSuite.java
index 350d8049486..0a2bba3e2d4 100644
--- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/TestJspWriterSuite.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/TestJspWriterSuite.java
@@ -5,33 +5,33 @@
 
 public class TestJspWriterSuite {
 
-  JspWriter writer;
+    JspWriter writer;
 
-  public TestJspWriterSuite(final JspWriter writer) {
-    this.writer = writer;
-  }
+    public TestJspWriterSuite(final JspWriter writer) {
+        this.writer = writer;
+    }
 
-  public void printlnTest(char[] x) throws IOException {
-    writer.println(x);
-  }
+    public void printlnTest(char[] x) throws IOException {
+        writer.println(x);
+    }
 
-  public void printlnTest(String x) throws IOException {
-    writer.println(x);
-  }
+    public void printlnTest(String x) throws IOException {
+        writer.println(x);
+    }
 
-  public void printTest(char[] s) throws IOException {
-    writer.print(s);
-  }
+    public void printTest(char[] s) throws IOException {
+        writer.print(s);
+    }
 
-  public void printTest(String s) throws IOException {
-    writer.print(s);
-  }
+    public void printTest(String s) throws IOException {
+        writer.print(s);
+    }
 
-  public void write(char[] s) throws IOException {
-    writer.write(s);
-  }
+    public void write(char[] s) throws IOException {
+        writer.write(s);
+    }
 
-  public void write(String s) throws IOException {
-    writer.write(s);
-  }
+    public void write(String s) throws IOException {
+        writer.write(s);
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServletRequestExtractAdapter.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServletRequestExtractAdapter.java
index e81f9b95a0f..3a0210bfc33 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServletRequestExtractAdapter.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServletRequestExtractAdapter.java
@@ -4,33 +4,31 @@
 import java.util.Enumeration;
 import javax.servlet.http.HttpServletRequest;
 
-public class HttpServletRequestExtractAdapter
-    implements AgentPropagation.ContextVisitor<HttpServletRequest> {
+public class HttpServletRequestExtractAdapter implements AgentPropagation.ContextVisitor<HttpServletRequest> {
 
-  public static final HttpServletRequestExtractAdapter GETTER =
-      new HttpServletRequestExtractAdapter();
+    public static final HttpServletRequestExtractAdapter GETTER = new HttpServletRequestExtractAdapter();
 
-  @Override
-  @SuppressWarnings("unchecked")
-  public void forEachKey(HttpServletRequest carrier, AgentPropagation.KeyClassifier classifier) {
-    Enumeration<String> headerNames = carrier.getHeaderNames();
-    while (headerNames.hasMoreElements()) {
-      String header = headerNames.nextElement();
-      if (!classifier.accept(header, carrier.getHeader(header))) {
-        break;
-      }
+    @Override
+    @SuppressWarnings("unchecked")
+    public void forEachKey(HttpServletRequest carrier, AgentPropagation.KeyClassifier classifier) {
+        Enumeration<String> headerNames = carrier.getHeaderNames();
+        while (headerNames.hasMoreElements()) {
+            String header = headerNames.nextElement();
+            if (!classifier.accept(header, carrier.getHeader(header))) {
+                break;
+            }
+        }
+        /*
+         * Read from the attributes and override the headers.
+         * This is used by ServletRequestSetter when a request is async-dispatched.
+         */
+        Enumeration<String> attributeNames = carrier.getAttributeNames();
+        while (attributeNames.hasMoreElements()) {
+            String name = attributeNames.nextElement();
+            Object attribute = carrier.getAttribute(name);
+            if (attribute instanceof String && !classifier.accept(name, (String) attribute)) {
+                return;
+            }
+        }
     }
-    /*
-     * Read from the attributes and override the headers.
-     * This is used by ServletRequestSetter when a request is async-dispatched.
-     */
-    Enumeration<String> attributeNames = carrier.getAttributeNames();
-    while (attributeNames.hasMoreElements()) {
-      String name = attributeNames.nextElement();
-      Object attribute = carrier.getAttribute(name);
-      if (attribute instanceof String && !classifier.accept(name, (String) attribute)) {
-        return;
-      }
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Advice.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Advice.java
index 37a1f30ff3b..ed92fa5cfa8 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Advice.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Advice.java
@@ -11,23 +11,23 @@
 
 public class IastServlet2Advice {
 
-  @Sink(VulnerabilityTypes.APPLICATION)
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit(@Advice.This Object servlet) {
-    final ApplicationModule applicationModule = InstrumentationBridge.APPLICATION;
-    if (applicationModule == null) {
-      return;
+    @Sink(VulnerabilityTypes.APPLICATION)
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(@Advice.This Object servlet) {
+        final ApplicationModule applicationModule = InstrumentationBridge.APPLICATION;
+        if (applicationModule == null) {
+            return;
+        }
+        if (!(servlet instanceof HttpServlet)) {
+            return;
+        }
+        final ServletContext context = ((HttpServlet) servlet).getServletContext();
+        if (InstrumentationContext.get(ServletContext.class, Boolean.class).get(context) != null) {
+            return;
+        }
+        InstrumentationContext.get(ServletContext.class, Boolean.class).put(context, true);
+        if (applicationModule != null) {
+            applicationModule.onRealPath(context.getRealPath("/"));
+        }
     }
-    if (!(servlet instanceof HttpServlet)) {
-      return;
-    }
-    final ServletContext context = ((HttpServlet) servlet).getServletContext();
-    if (InstrumentationContext.get(ServletContext.class, Boolean.class).get(context) != null) {
-      return;
-    }
-    InstrumentationContext.get(ServletContext.class, Boolean.class).put(context, true);
-    if (applicationModule != null) {
-      applicationModule.onRealPath(context.getRealPath("/"));
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Instrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Instrumentation.java
index b79df98fddf..6bc6ea35bfd 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Instrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Instrumentation.java
@@ -19,60 +19,59 @@
 
 @AutoService(InstrumenterModule.class)
 public final class IastServlet2Instrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public IastServlet2Instrumentation() {
-    super("servlet", "servlet-2");
-  }
+    public IastServlet2Instrumentation() {
+        super("servlet", "servlet-2");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "servlet-2.x";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "servlet-2.x";
+    }
 
-  // Avoid matching servlet 3 which has its own instrumentation
-  static final ElementMatcher.Junction<ClassLoader> NOT_SERVLET_3 =
-      not(hasClassNamed("javax.servlet.AsyncEvent"));
+    // Avoid matching servlet 3 which has its own instrumentation
+    static final ElementMatcher.Junction<ClassLoader> NOT_SERVLET_3 = not(hasClassNamed("javax.servlet.AsyncEvent"));
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return NOT_SERVLET_3;
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return NOT_SERVLET_3;
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.http.HttpServlet";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.http.HttpServlet";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("javax.servlet.http.HttpServlet"))
-        .or(implementsInterface(named("javax.servlet.FilterChain")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("javax.servlet.http.HttpServlet"))
+                .or(implementsInterface(named("javax.servlet.FilterChain")));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("javax.servlet.ServletContext", Boolean.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("javax.servlet.ServletContext", Boolean.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        namedOneOf("doFilter", "service")
-            .and(takesArgument(0, named("javax.servlet.ServletRequest")))
-            .and(takesArgument(1, named("javax.servlet.ServletResponse")))
-            .and(isPublic()),
-        packageName + ".IastServlet2Advice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                namedOneOf("doFilter", "service")
+                        .and(takesArgument(0, named("javax.servlet.ServletRequest")))
+                        .and(takesArgument(1, named("javax.servlet.ServletResponse")))
+                        .and(isPublic()),
+                packageName + ".IastServlet2Advice");
+    }
 
-  @Override
-  protected boolean isOptOutEnabled() {
-    return true;
-  }
+    @Override
+    protected boolean isOptOutEnabled() {
+        return true;
+    }
 
-  @Override
-  public int order() {
-    // apply this instrumentation after the regular servlet one.
-    return 1;
-  }
+    @Override
+    public int order() {
+        // apply this instrumentation after the regular servlet one.
+        return 1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Advice.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Advice.java
index ae67ab27c27..80ac6234eee 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Advice.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Advice.java
@@ -24,108 +24,109 @@
 
 public class Servlet2Advice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-  public static boolean onEnter(
-      @Advice.This final Object servlet,
-      @Advice.Argument(value = 0, readOnly = false) ServletRequest request,
-      @Advice.Argument(value = 1, typing = Assigner.Typing.DYNAMIC) final ServletResponse response,
-      @Advice.Local("contextScope") ContextScope scope) {
-
-    final boolean invalidRequest = !(request instanceof HttpServletRequest);
-    if (invalidRequest) {
-      return false;
-    }
+    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+    public static boolean onEnter(
+            @Advice.This final Object servlet,
+            @Advice.Argument(value = 0, readOnly = false) ServletRequest request,
+            @Advice.Argument(value = 1, typing = Assigner.Typing.DYNAMIC) final ServletResponse response,
+            @Advice.Local("contextScope") ContextScope scope) {
+
+        final boolean invalidRequest = !(request instanceof HttpServletRequest);
+        if (invalidRequest) {
+            return false;
+        }
 
-    final HttpServletRequest httpServletRequest = (HttpServletRequest) request;
-    Object contextAttr = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-    if (contextAttr instanceof Context) {
-      final Context existingContext = (Context) contextAttr;
-      final AgentSpan span = spanFromContext(existingContext);
-      if (span != null) {
-        ClassloaderConfigurationOverrides.maybeEnrichSpan(span);
-        // Tracing might already be applied by the FilterChain or a parent request
-        // (forward/include).
-        return false;
-      }
-    }
+        final HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+        Object contextAttr = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+        if (contextAttr instanceof Context) {
+            final Context existingContext = (Context) contextAttr;
+            final AgentSpan span = spanFromContext(existingContext);
+            if (span != null) {
+                ClassloaderConfigurationOverrides.maybeEnrichSpan(span);
+                // Tracing might already be applied by the FilterChain or a parent request
+                // (forward/include).
+                return false;
+            }
+        }
 
-    if (response instanceof HttpServletResponse) {
-      // Default value for checking for uncaught error later
-      InstrumentationContext.get(ServletResponse.class, Integer.class).put(response, 200);
-    }
+        if (response instanceof HttpServletResponse) {
+            // Default value for checking for uncaught error later
+            InstrumentationContext.get(ServletResponse.class, Integer.class).put(response, 200);
+        }
+
+        final Context parentContext = DECORATE.extract(httpServletRequest);
+        final Context context = DECORATE.startSpan(httpServletRequest, parentContext);
+        scope = context.attach();
+        final AgentSpan span = spanFromContext(context);
+        DECORATE.afterStart(span);
+        DECORATE.onRequest(span, httpServletRequest, httpServletRequest, parentContext);
+
+        httpServletRequest.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
+        httpServletRequest.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+        httpServletRequest.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+
+        Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
+        if (rba != null) {
+            ServletBlockingHelper.commitBlockingResponse(
+                    span.getRequestContext().getTraceSegment(),
+                    httpServletRequest,
+                    (HttpServletResponse) response,
+                    rba);
+            span.getRequestContext().getTraceSegment().effectivelyBlocked();
+            return true; // skip method body
+        }
 
-    final Context parentContext = DECORATE.extract(httpServletRequest);
-    final Context context = DECORATE.startSpan(httpServletRequest, parentContext);
-    scope = context.attach();
-    final AgentSpan span = spanFromContext(context);
-    DECORATE.afterStart(span);
-    DECORATE.onRequest(span, httpServletRequest, httpServletRequest, parentContext);
-
-    httpServletRequest.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
-    httpServletRequest.setAttribute(
-        CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
-    httpServletRequest.setAttribute(
-        CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
-
-    Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
-    if (rba != null) {
-      ServletBlockingHelper.commitBlockingResponse(
-          span.getRequestContext().getTraceSegment(),
-          httpServletRequest,
-          (HttpServletResponse) response,
-          rba);
-      span.getRequestContext().getTraceSegment().effectivelyBlocked();
-      return true; // skip method body
+        return false;
     }
 
-    return false;
-  }
-
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void stopSpan(
-      @Advice.Argument(0) final ServletRequest request,
-      @Advice.Argument(1) final ServletResponse response,
-      @Advice.Local("contextScope") final ContextScope scope,
-      @Advice.Thrown final Throwable throwable) {
-    // Set user.principal regardless of who created this span.
-    final Object contextAttr = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-    if (Config.get().isServletPrincipalEnabled()
-        && contextAttr instanceof Context
-        && request instanceof HttpServletRequest) {
-      final Context context = (Context) contextAttr;
-      final AgentSpan span = spanFromContext(context);
-      if (span != null) {
-        final Principal principal = ((HttpServletRequest) request).getUserPrincipal();
-        if (principal != null) {
-          span.setTag(DDTags.USER_NAME, principal.getName());
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void stopSpan(
+            @Advice.Argument(0) final ServletRequest request,
+            @Advice.Argument(1) final ServletResponse response,
+            @Advice.Local("contextScope") final ContextScope scope,
+            @Advice.Thrown final Throwable throwable) {
+        // Set user.principal regardless of who created this span.
+        final Object contextAttr = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+        if (Config.get().isServletPrincipalEnabled()
+                && contextAttr instanceof Context
+                && request instanceof HttpServletRequest) {
+            final Context context = (Context) contextAttr;
+            final AgentSpan span = spanFromContext(context);
+            if (span != null) {
+                final Principal principal = ((HttpServletRequest) request).getUserPrincipal();
+                if (principal != null) {
+                    span.setTag(DDTags.USER_NAME, principal.getName());
+                }
+            }
         }
-      }
-    }
 
-    if (scope == null) {
-      return;
-    }
-    final AgentSpan span = spanFromContext(scope.context());
+        if (scope == null) {
+            return;
+        }
+        final AgentSpan span = spanFromContext(scope.context());
+
+        if (response instanceof HttpServletResponse) {
+            DECORATE.onResponse(
+                    span,
+                    InstrumentationContext.get(ServletResponse.class, Integer.class)
+                            .get(response));
+        } else {
+            DECORATE.onResponse(span, null);
+        }
 
-    if (response instanceof HttpServletResponse) {
-      DECORATE.onResponse(
-          span, InstrumentationContext.get(ServletResponse.class, Integer.class).get(response));
-    } else {
-      DECORATE.onResponse(span, null);
-    }
+        if (throwable != null) {
+            if (response instanceof HttpServletResponse
+                    && InstrumentationContext.get(ServletResponse.class, Integer.class)
+                                    .get(response)
+                            == HttpServletResponse.SC_OK) {
+                // exception was thrown but status code wasn't set
+                span.setHttpStatusCode(500);
+            }
+            DECORATE.onError(span, throwable);
+        }
+        DECORATE.beforeFinish(scope.context());
 
-    if (throwable != null) {
-      if (response instanceof HttpServletResponse
-          && InstrumentationContext.get(ServletResponse.class, Integer.class).get(response)
-              == HttpServletResponse.SC_OK) {
-        // exception was thrown but status code wasn't set
-        span.setHttpStatusCode(500);
-      }
-      DECORATE.onError(span, throwable);
+        scope.close();
+        span.finish();
     }
-    DECORATE.beforeFinish(scope.context());
-
-    scope.close();
-    span.finish();
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Decorator.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Decorator.java
index 03d970cdc3b..aa1452900f6 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Decorator.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Decorator.java
@@ -11,85 +11,83 @@
 import javax.servlet.http.HttpServletRequest;
 
 public class Servlet2Decorator
-    extends HttpServerDecorator<
-        HttpServletRequest, HttpServletRequest, Integer, HttpServletRequest> {
-  public static final CharSequence JAVA_WEB_SERVLET = UTF8BytesString.create("java-web-servlet");
-  public static final Servlet2Decorator DECORATE = new Servlet2Decorator();
-  public static final CharSequence SERVLET_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"servlet", "servlet-2"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JAVA_WEB_SERVLET;
-  }
-
-  @Override
-  protected String requestedSessionId(final HttpServletRequest request) {
-    return request.getRequestedSessionId();
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpServletRequest> getter() {
-    return GETTER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Integer> responseGetter() {
-    return null; // There is no way to access the headers
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return SERVLET_REQUEST;
-  }
-
-  @Override
-  protected String method(final HttpServletRequest httpServletRequest) {
-    return httpServletRequest.getMethod();
-  }
-
-  @Override
-  protected URIDataAdapter url(final HttpServletRequest httpServletRequest) {
-    return new ServletRequestURIAdapter(httpServletRequest);
-  }
-
-  @Override
-  protected String peerHostIP(final HttpServletRequest httpServletRequest) {
-    return httpServletRequest.getRemoteAddr();
-  }
-
-  @Override
-  protected int peerPort(final HttpServletRequest httpServletRequest) {
-    // HttpServletResponse doesn't have accessor for remote port.
-    return 0;
-  }
-
-  @Override
-  protected String getRequestHeader(final HttpServletRequest request, String key) {
-    return request.getHeader(key);
-  }
-
-  @Override
-  protected int status(final Integer status) {
-    return status;
-  }
-
-  @Override
-  protected void doOnRequest(
-      final AgentSpan span,
-      final HttpServletRequest connection,
-      final HttpServletRequest request,
-      final Context parentContext) {
-    assert span != null;
-    if (request != null) {
-      span.setTag("servlet.context", request.getContextPath());
-      span.setTag("servlet.path", request.getServletPath());
+        extends HttpServerDecorator<HttpServletRequest, HttpServletRequest, Integer, HttpServletRequest> {
+    public static final CharSequence JAVA_WEB_SERVLET = UTF8BytesString.create("java-web-servlet");
+    public static final Servlet2Decorator DECORATE = new Servlet2Decorator();
+    public static final CharSequence SERVLET_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"servlet", "servlet-2"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JAVA_WEB_SERVLET;
+    }
+
+    @Override
+    protected String requestedSessionId(final HttpServletRequest request) {
+        return request.getRequestedSessionId();
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpServletRequest> getter() {
+        return GETTER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Integer> responseGetter() {
+        return null; // There is no way to access the headers
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return SERVLET_REQUEST;
+    }
+
+    @Override
+    protected String method(final HttpServletRequest httpServletRequest) {
+        return httpServletRequest.getMethod();
+    }
+
+    @Override
+    protected URIDataAdapter url(final HttpServletRequest httpServletRequest) {
+        return new ServletRequestURIAdapter(httpServletRequest);
+    }
+
+    @Override
+    protected String peerHostIP(final HttpServletRequest httpServletRequest) {
+        return httpServletRequest.getRemoteAddr();
+    }
+
+    @Override
+    protected int peerPort(final HttpServletRequest httpServletRequest) {
+        // HttpServletResponse doesn't have accessor for remote port.
+        return 0;
+    }
+
+    @Override
+    protected String getRequestHeader(final HttpServletRequest request, String key) {
+        return request.getHeader(key);
+    }
+
+    @Override
+    protected int status(final Integer status) {
+        return status;
+    }
+
+    @Override
+    protected void doOnRequest(
+            final AgentSpan span,
+            final HttpServletRequest connection,
+            final HttpServletRequest request,
+            final Context parentContext) {
+        assert span != null;
+        if (request != null) {
+            span.setTag("servlet.context", request.getContextPath());
+            span.setTag("servlet.path", request.getServletPath());
+        }
+        super.doOnRequest(span, connection, request, parentContext);
     }
-    super.doOnRequest(span, connection, request, parentContext);
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Instrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Instrumentation.java
index 3d090c95f51..bc3f6710a30 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Instrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Instrumentation.java
@@ -19,64 +19,63 @@
 
 @AutoService(InstrumenterModule.class)
 public final class Servlet2Instrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public Servlet2Instrumentation() {
-    super("servlet", "servlet-2");
-  }
+    public Servlet2Instrumentation() {
+        super("servlet", "servlet-2");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "servlet-2.x";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "servlet-2.x";
+    }
 
-  // Avoid matching servlet 3 which has its own instrumentation
-  static final ElementMatcher.Junction<ClassLoader> NOT_SERVLET_3 =
-      not(hasClassNamed("javax.servlet.AsyncEvent"));
+    // Avoid matching servlet 3 which has its own instrumentation
+    static final ElementMatcher.Junction<ClassLoader> NOT_SERVLET_3 = not(hasClassNamed("javax.servlet.AsyncEvent"));
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return NOT_SERVLET_3;
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return NOT_SERVLET_3;
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.http.HttpServlet";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.http.HttpServlet";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("javax.servlet.http.HttpServlet"))
-        .or(implementsInterface(named("javax.servlet.FilterChain")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("javax.servlet.http.HttpServlet"))
+                .or(implementsInterface(named("javax.servlet.FilterChain")));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".Servlet2Decorator",
-      packageName + ".ServletRequestURIAdapter",
-      packageName + ".HttpServletRequestExtractAdapter",
-      "datadog.trace.instrumentation.servlet.ServletBlockingHelper",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".Servlet2Decorator",
+            packageName + ".ServletRequestURIAdapter",
+            packageName + ".HttpServletRequestExtractAdapter",
+            "datadog.trace.instrumentation.servlet.ServletBlockingHelper",
+        };
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("javax.servlet.ServletResponse", Integer.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("javax.servlet.ServletResponse", Integer.class.getName());
+    }
 
-  /**
-   * Here we are instrumenting the public method for HttpServlet. This should ensure that this
-   * advice is always called before HttpServletInstrumentation which is instrumenting the protected
-   * method.
-   */
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        namedOneOf("doFilter", "service")
-            .and(takesArgument(0, named("javax.servlet.ServletRequest")))
-            .and(takesArgument(1, named("javax.servlet.ServletResponse")))
-            .and(isPublic()),
-        packageName + ".Servlet2Advice");
-  }
+    /**
+     * Here we are instrumenting the public method for HttpServlet. This should ensure that this
+     * advice is always called before HttpServletInstrumentation which is instrumenting the protected
+     * method.
+     */
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                namedOneOf("doFilter", "service")
+                        .and(takesArgument(0, named("javax.servlet.ServletRequest")))
+                        .and(takesArgument(1, named("javax.servlet.ServletResponse")))
+                        .and(isPublic()),
+                packageName + ".Servlet2Advice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseRedirectAdvice.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseRedirectAdvice.java
index b02d52f7c88..19c4959e53b 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseRedirectAdvice.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseRedirectAdvice.java
@@ -6,8 +6,8 @@
 import net.bytebuddy.asm.Advice;
 
 public class Servlet2ResponseRedirectAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void onEnter(@Advice.This final HttpServletResponse response) {
-    InstrumentationContext.get(ServletResponse.class, Integer.class).put(response, 302);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void onEnter(@Advice.This final HttpServletResponse response) {
+        InstrumentationContext.get(ServletResponse.class, Integer.class).put(response, 302);
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusAdvice.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusAdvice.java
index 25b1a21b45a..f7d8acb22aa 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusAdvice.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusAdvice.java
@@ -6,9 +6,9 @@
 import net.bytebuddy.asm.Advice;
 
 public class Servlet2ResponseStatusAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void onEnter(
-      @Advice.This final HttpServletResponse response, @Advice.Argument(0) final Integer status) {
-    InstrumentationContext.get(ServletResponse.class, Integer.class).put(response, status);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void onEnter(
+            @Advice.This final HttpServletResponse response, @Advice.Argument(0) final Integer status) {
+        InstrumentationContext.get(ServletResponse.class, Integer.class).put(response, status);
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusInstrumentation.java
index 86dc200aefa..dde84b1ff08 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusInstrumentation.java
@@ -15,45 +15,45 @@
 
 @AutoService(InstrumenterModule.class)
 public final class Servlet2ResponseStatusInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public Servlet2ResponseStatusInstrumentation() {
-    super("servlet", "servlet-2");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "servlet-2.x";
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return Servlet2Instrumentation.NOT_SERVLET_3;
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.http.HttpServletResponse";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("javax.servlet.ServletResponse", Integer.class.getName());
-  }
-
-  /**
-   * Unlike Servlet2Instrumentation it doesn't matter if the HttpServletResponseInstrumentation
-   * applies first
-   */
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        namedOneOf("sendError", "setStatus").and(takesArgument(0, int.class)),
-        packageName + ".Servlet2ResponseStatusAdvice");
-    transformer.applyAdvice(named("sendRedirect"), packageName + ".Servlet2ResponseRedirectAdvice");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public Servlet2ResponseStatusInstrumentation() {
+        super("servlet", "servlet-2");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "servlet-2.x";
+    }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return Servlet2Instrumentation.NOT_SERVLET_3;
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.http.HttpServletResponse";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("javax.servlet.ServletResponse", Integer.class.getName());
+    }
+
+    /**
+     * Unlike Servlet2Instrumentation it doesn't matter if the HttpServletResponseInstrumentation
+     * applies first
+     */
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                namedOneOf("sendError", "setStatus").and(takesArgument(0, int.class)),
+                packageName + ".Servlet2ResponseStatusAdvice");
+        transformer.applyAdvice(named("sendRedirect"), packageName + ".Servlet2ResponseRedirectAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletInputStreamWrapper.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletInputStreamWrapper.java
index 48e55a63d3d..6c52af0440a 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletInputStreamWrapper.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletInputStreamWrapper.java
@@ -5,7 +5,7 @@
 import javax.servlet.ServletInputStream;
 
 public class ServletInputStreamWrapper extends AbstractServletInputStreamWrapper {
-  public ServletInputStreamWrapper(ServletInputStream is, StoredByteBody storedByteBody) {
-    super(is, storedByteBody);
-  }
+    public ServletInputStreamWrapper(ServletInputStream is, StoredByteBody storedByteBody) {
+        super(is, storedByteBody);
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestBodyInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestBodyInstrumentation.java
index b19f4aa56ab..1ff91ed8645 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestBodyInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestBodyInstrumentation.java
@@ -42,169 +42,168 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ServletRequestBodyInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public ServletRequestBodyInstrumentation() {
-    super("servlet-request-body");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "servlet-2.x-and-3.0.x";
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Avoid matching request bodies after 3.0.x which have their own instrumentation
-    return not(hasClassNamed("javax.servlet.ReadListener"));
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.http.HttpServletRequest";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        // ignore wrappers that ship with servlet-api
-        .and(namedNoneOf("javax.servlet.http.HttpServletRequestWrapper"))
-        .and(not(extendsClass(named("javax.servlet.http.HttpServletRequestWrapper"))));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getInputStream")
-            .and(takesNoArguments())
-            .and(returns(named("javax.servlet.ServletInputStream")))
-            .and(isPublic()),
-        getClass().getName() + "$HttpServletGetInputStreamAdvice");
-    transformer.applyAdvice(
-        named("getReader")
-            .and(takesNoArguments())
-            .and(returns(named("java.io.BufferedReader")))
-            .and(isPublic()),
-        getClass().getName() + "$HttpServletGetReaderAdvice");
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.servlet.BufferedReaderWrapper",
-      "datadog.trace.instrumentation.servlet.AbstractServletInputStreamWrapper",
-      "datadog.trace.instrumentation.servlet2.ServletInputStreamWrapper"
-    };
-  }
-
-  @Override
-  public int order() {
-    // apply this instrumentation after the regular servlet one.
-    return 1;
-  }
-
-  @SuppressWarnings("Duplicates")
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  static class HttpServletGetInputStreamAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(
-        @Advice.This final HttpServletRequest req,
-        @Advice.Return(readOnly = false) ServletInputStream is,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (is == null) {
-        return;
-      }
-
-      Object alreadyWrapped = req.getAttribute("datadog.wrapped_request_body");
-      if (alreadyWrapped != null || is instanceof ServletInputStreamWrapper) {
-        return;
-      }
-
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, StoredBodySupplier, Void> requestStartCb =
-          cbp.getCallback(EVENTS.requestBodyStart());
-      BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> requestEndedCb =
-          cbp.getCallback(EVENTS.requestBodyDone());
-      if (requestStartCb == null || requestEndedCb == null) {
-        return;
-      }
-
-      req.setAttribute("datadog.wrapped_request_body", Boolean.TRUE);
-
-      int lengthHint = 0;
-      String lengthHeader = req.getHeader("content-length");
-      if (lengthHeader != null) {
-        try {
-          lengthHint = Integer.parseInt(lengthHeader);
-        } catch (NumberFormatException nfe) {
-          // purposefully left blank
-        }
-      }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public ServletRequestBodyInstrumentation() {
+        super("servlet-request-body");
+    }
 
-      String encoding = req.getCharacterEncoding();
-      Charset charset = null;
-      try {
-        if (encoding != null) {
-          charset = Charset.forName(encoding);
-        }
-      } catch (IllegalArgumentException iae) {
-        // purposefully left blank
-      }
+    @Override
+    public String muzzleDirective() {
+        return "servlet-2.x-and-3.0.x";
+    }
 
-      StoredByteBody storedByteBody =
-          new StoredByteBody(reqCtx, requestStartCb, requestEndedCb, charset, lengthHint);
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Avoid matching request bodies after 3.0.x which have their own instrumentation
+        return not(hasClassNamed("javax.servlet.ReadListener"));
+    }
 
-      is = new ServletInputStreamWrapper(is, storedByteBody);
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.http.HttpServletRequest";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                // ignore wrappers that ship with servlet-api
+                .and(namedNoneOf("javax.servlet.http.HttpServletRequestWrapper"))
+                .and(not(extendsClass(named("javax.servlet.http.HttpServletRequestWrapper"))));
     }
-  }
-
-  @SuppressWarnings("Duplicates")
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  static class HttpServletGetReaderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(
-        @Advice.This final HttpServletRequest req,
-        @Advice.Return(readOnly = false) BufferedReader reader) {
-      if (reader == null) {
-        return;
-      }
-
-      AgentSpan agentSpan = activeSpan();
-      if (agentSpan == null) {
-        return;
-      }
-      Object alreadyWrapped = req.getAttribute("datadog.wrapped_request_body");
-      if (alreadyWrapped != null || reader instanceof BufferedReaderWrapper) {
-        return;
-      }
-      RequestContext requestContext = agentSpan.getRequestContext();
-      if (requestContext == null) {
-        return;
-      }
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, StoredBodySupplier, Void> requestStartCb =
-          cbp.getCallback(EVENTS.requestBodyStart());
-      BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> requestEndedCb =
-          cbp.getCallback(EVENTS.requestBodyDone());
-      if (requestStartCb == null || requestEndedCb == null) {
-        return;
-      }
-
-      req.setAttribute("datadog.wrapped_request_body", Boolean.TRUE);
-
-      int lengthHint = 0;
-      String lengthHeader = req.getHeader("content-length");
-      if (lengthHeader != null) {
-        try {
-          lengthHint = Integer.parseInt(lengthHeader);
-        } catch (NumberFormatException nfe) {
-          // purposefully left blank
-        }
-      }
 
-      StoredCharBody storedCharBody =
-          new StoredCharBody(requestContext, requestStartCb, requestEndedCb, lengthHint);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getInputStream")
+                        .and(takesNoArguments())
+                        .and(returns(named("javax.servlet.ServletInputStream")))
+                        .and(isPublic()),
+                getClass().getName() + "$HttpServletGetInputStreamAdvice");
+        transformer.applyAdvice(
+                named("getReader")
+                        .and(takesNoArguments())
+                        .and(returns(named("java.io.BufferedReader")))
+                        .and(isPublic()),
+                getClass().getName() + "$HttpServletGetReaderAdvice");
+    }
 
-      reader = new BufferedReaderWrapper(reader, storedCharBody);
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.servlet.BufferedReaderWrapper",
+            "datadog.trace.instrumentation.servlet.AbstractServletInputStreamWrapper",
+            "datadog.trace.instrumentation.servlet2.ServletInputStreamWrapper"
+        };
+    }
+
+    @Override
+    public int order() {
+        // apply this instrumentation after the regular servlet one.
+        return 1;
+    }
+
+    @SuppressWarnings("Duplicates")
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    static class HttpServletGetInputStreamAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(
+                @Advice.This final HttpServletRequest req,
+                @Advice.Return(readOnly = false) ServletInputStream is,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (is == null) {
+                return;
+            }
+
+            Object alreadyWrapped = req.getAttribute("datadog.wrapped_request_body");
+            if (alreadyWrapped != null || is instanceof ServletInputStreamWrapper) {
+                return;
+            }
+
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, StoredBodySupplier, Void> requestStartCb =
+                    cbp.getCallback(EVENTS.requestBodyStart());
+            BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> requestEndedCb =
+                    cbp.getCallback(EVENTS.requestBodyDone());
+            if (requestStartCb == null || requestEndedCb == null) {
+                return;
+            }
+
+            req.setAttribute("datadog.wrapped_request_body", Boolean.TRUE);
+
+            int lengthHint = 0;
+            String lengthHeader = req.getHeader("content-length");
+            if (lengthHeader != null) {
+                try {
+                    lengthHint = Integer.parseInt(lengthHeader);
+                } catch (NumberFormatException nfe) {
+                    // purposefully left blank
+                }
+            }
+
+            String encoding = req.getCharacterEncoding();
+            Charset charset = null;
+            try {
+                if (encoding != null) {
+                    charset = Charset.forName(encoding);
+                }
+            } catch (IllegalArgumentException iae) {
+                // purposefully left blank
+            }
+
+            StoredByteBody storedByteBody =
+                    new StoredByteBody(reqCtx, requestStartCb, requestEndedCb, charset, lengthHint);
+
+            is = new ServletInputStreamWrapper(is, storedByteBody);
+        }
+    }
+
+    @SuppressWarnings("Duplicates")
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    static class HttpServletGetReaderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(
+                @Advice.This final HttpServletRequest req, @Advice.Return(readOnly = false) BufferedReader reader) {
+            if (reader == null) {
+                return;
+            }
+
+            AgentSpan agentSpan = activeSpan();
+            if (agentSpan == null) {
+                return;
+            }
+            Object alreadyWrapped = req.getAttribute("datadog.wrapped_request_body");
+            if (alreadyWrapped != null || reader instanceof BufferedReaderWrapper) {
+                return;
+            }
+            RequestContext requestContext = agentSpan.getRequestContext();
+            if (requestContext == null) {
+                return;
+            }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, StoredBodySupplier, Void> requestStartCb =
+                    cbp.getCallback(EVENTS.requestBodyStart());
+            BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> requestEndedCb =
+                    cbp.getCallback(EVENTS.requestBodyDone());
+            if (requestStartCb == null || requestEndedCb == null) {
+                return;
+            }
+
+            req.setAttribute("datadog.wrapped_request_body", Boolean.TRUE);
+
+            int lengthHint = 0;
+            String lengthHeader = req.getHeader("content-length");
+            if (lengthHeader != null) {
+                try {
+                    lengthHint = Integer.parseInt(lengthHeader);
+                } catch (NumberFormatException nfe) {
+                    // purposefully left blank
+                }
+            }
+
+            StoredCharBody storedCharBody =
+                    new StoredCharBody(requestContext, requestStartCb, requestEndedCb, lengthHint);
+
+            reader = new BufferedReaderWrapper(reader, storedCharBody);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestURIAdapter.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestURIAdapter.java
index 2d530fd93d6..80e1377d7bd 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestURIAdapter.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestURIAdapter.java
@@ -4,39 +4,39 @@
 import javax.servlet.http.HttpServletRequest;
 
 public class ServletRequestURIAdapter extends URIRawDataAdapter {
-  private final HttpServletRequest request;
-
-  public ServletRequestURIAdapter(HttpServletRequest request) {
-    this.request = request;
-  }
-
-  @Override
-  public String scheme() {
-    return request.getScheme();
-  }
-
-  @Override
-  public String host() {
-    return request.getServerName();
-  }
-
-  @Override
-  public int port() {
-    return request.getServerPort();
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return request.getRequestURI();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return request.getQueryString();
-  }
+    private final HttpServletRequest request;
+
+    public ServletRequestURIAdapter(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    @Override
+    public String scheme() {
+        return request.getScheme();
+    }
+
+    @Override
+    public String host() {
+        return request.getServerName();
+    }
+
+    @Override
+    public int port() {
+        return request.getServerPort();
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return request.getRequestURI();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return request.getQueryString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java
index 2043b17ed97..bedf966dec3 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java
@@ -30,92 +30,91 @@
 
 @AutoService(InstrumenterModule.class)
 public final class AsyncContextInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public AsyncContextInstrumentation() {
-    super("servlet", "servlet-3");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "servlet-3.x";
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.AsyncContext";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("dispatch")),
-        AsyncContextInstrumentation.class.getName() + "$DispatchAdvice");
-  }
-
-  /**
-   * When a request is dispatched, we want new request to have propagation headers from its parent
-   * request. The parent request's span is later closed by {@code
-   * FinishAsyncDispatchListener#onStartAsync}
-   */
-  public static class DispatchAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static boolean enter(
-        @Advice.This final AsyncContext context, @Advice.AllArguments final Object[] args) {
-      final int depth = CallDepthThreadLocalMap.incrementCallDepth(AsyncContext.class);
-      if (depth > 0) {
-        return false;
-      }
-
-      final ServletRequest request = context.getRequest();
-      final Object contextAttr = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (!(contextAttr instanceof Context)) {
-        return true;
-      }
-      final Context ctxt = (Context) contextAttr;
-      final AgentSpan parent = spanFromContext(ctxt);
-      if (parent == null) {
-        return true;
-      }
-
-      final AgentSpan span =
-          startSpan(JAVA_WEB_SERVLET_DISPATCHER.toString(), SERVLET_DISPATCH, parent.spanContext());
-      // This span should get finished by Servlet3Advice
-      // However, when using Jetty without servlets (directly org.eclipse.jetty.server.Handler),
-      // that's not the case (see jetty's HandleAdvice)
-      DECORATE.afterStart(span);
-
-      // These are pulled from attributes because jetty clears them from the request too early.
-      span.setTag(SERVLET_CONTEXT, request.getAttribute(DD_CONTEXT_PATH_ATTRIBUTE));
-      span.setTag(SERVLET_PATH, request.getAttribute(DD_SERVLET_PATH_ATTRIBUTE));
-
-      synchronized (request) {
-        request.setAttribute(DD_DISPATCH_SPAN_ATTRIBUTE, span);
-      }
-
-      if (args.length == 1 && args[0] instanceof String) {
-        span.setResourceName((String) args[0]);
-      } else if (args.length == 2 && args[1] instanceof String) {
-        span.setResourceName((String) args[1]);
-      }
-
-      // We can't register FinishAsyncDispatchListener here.
-      // The dispatch may happen on an onTimeout/onError, and adding listeners
-      // when listeners are being iterated on causes a ConcurrentModificationException on jetty
-      return true;
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public AsyncContextInstrumentation() {
+        super("servlet", "servlet-3");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "servlet-3.x";
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.AsyncContext";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("dispatch")),
+                AsyncContextInstrumentation.class.getName() + "$DispatchAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Enter final boolean topLevel) {
-      if (topLevel) {
-        CallDepthThreadLocalMap.reset(AsyncContext.class);
-      }
+    /**
+     * When a request is dispatched, we want new request to have propagation headers from its parent
+     * request. The parent request's span is later closed by {@code
+     * FinishAsyncDispatchListener#onStartAsync}
+     */
+    public static class DispatchAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static boolean enter(@Advice.This final AsyncContext context, @Advice.AllArguments final Object[] args) {
+            final int depth = CallDepthThreadLocalMap.incrementCallDepth(AsyncContext.class);
+            if (depth > 0) {
+                return false;
+            }
+
+            final ServletRequest request = context.getRequest();
+            final Object contextAttr = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (!(contextAttr instanceof Context)) {
+                return true;
+            }
+            final Context ctxt = (Context) contextAttr;
+            final AgentSpan parent = spanFromContext(ctxt);
+            if (parent == null) {
+                return true;
+            }
+
+            final AgentSpan span =
+                    startSpan(JAVA_WEB_SERVLET_DISPATCHER.toString(), SERVLET_DISPATCH, parent.spanContext());
+            // This span should get finished by Servlet3Advice
+            // However, when using Jetty without servlets (directly org.eclipse.jetty.server.Handler),
+            // that's not the case (see jetty's HandleAdvice)
+            DECORATE.afterStart(span);
+
+            // These are pulled from attributes because jetty clears them from the request too early.
+            span.setTag(SERVLET_CONTEXT, request.getAttribute(DD_CONTEXT_PATH_ATTRIBUTE));
+            span.setTag(SERVLET_PATH, request.getAttribute(DD_SERVLET_PATH_ATTRIBUTE));
+
+            synchronized (request) {
+                request.setAttribute(DD_DISPATCH_SPAN_ATTRIBUTE, span);
+            }
+
+            if (args.length == 1 && args[0] instanceof String) {
+                span.setResourceName((String) args[0]);
+            } else if (args.length == 2 && args[1] instanceof String) {
+                span.setResourceName((String) args[1]);
+            }
+
+            // We can't register FinishAsyncDispatchListener here.
+            // The dispatch may happen on an onTimeout/onError, and adding listeners
+            // when listeners are being iterated on causes a ConcurrentModificationException on jetty
+            return true;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Enter final boolean topLevel) {
+            if (topLevel) {
+                CallDepthThreadLocalMap.reset(AsyncContext.class);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncDispatcherDecorator.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncDispatcherDecorator.java
index 80a6af7d3a7..e712b68ddf0 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncDispatcherDecorator.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncDispatcherDecorator.java
@@ -4,22 +4,22 @@
 import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;
 
 public class AsyncDispatcherDecorator extends BaseDecorator {
-  public static final AsyncDispatcherDecorator DECORATE = new AsyncDispatcherDecorator();
-  public static final CharSequence JAVA_WEB_SERVLET_DISPATCHER =
-      UTF8BytesString.create("java-web-servlet-async-dispatcher");
+    public static final AsyncDispatcherDecorator DECORATE = new AsyncDispatcherDecorator();
+    public static final CharSequence JAVA_WEB_SERVLET_DISPATCHER =
+            UTF8BytesString.create("java-web-servlet-async-dispatcher");
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"servlet", "servlet-3"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"servlet", "servlet-3"};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return JAVA_WEB_SERVLET_DISPATCHER;
-  }
+    @Override
+    protected CharSequence component() {
+        return JAVA_WEB_SERVLET_DISPATCHER;
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/FinishAsyncDispatchListener.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/FinishAsyncDispatchListener.java
index 7799a54ab67..af7a46cb7e4 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/FinishAsyncDispatchListener.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/FinishAsyncDispatchListener.java
@@ -24,82 +24,81 @@
  * case of exception handling, the status reported could be wrong.
  */
 public class FinishAsyncDispatchListener implements AsyncListener, Runnable {
-  private final AtomicBoolean activated;
-  private final AgentSpan span;
-  private final boolean doOnResponse;
-  private final ContextScope scope;
+    private final AtomicBoolean activated;
+    private final AgentSpan span;
+    private final boolean doOnResponse;
+    private final ContextScope scope;
 
-  public FinishAsyncDispatchListener(final ContextScope scope, boolean doOnResponse) {
-    this(scope, new AtomicBoolean(), doOnResponse);
-  }
+    public FinishAsyncDispatchListener(final ContextScope scope, boolean doOnResponse) {
+        this(scope, new AtomicBoolean(), doOnResponse);
+    }
 
-  public FinishAsyncDispatchListener(
-      final ContextScope scope, AtomicBoolean activated, boolean doOnResponse) {
-    this.scope = scope;
-    this.span = AgentSpan.fromContext(scope.context());
-    this.activated = activated;
-    this.doOnResponse = doOnResponse;
-  }
+    public FinishAsyncDispatchListener(final ContextScope scope, AtomicBoolean activated, boolean doOnResponse) {
+        this.scope = scope;
+        this.span = AgentSpan.fromContext(scope.context());
+        this.activated = activated;
+        this.doOnResponse = doOnResponse;
+    }
 
-  @Override
-  public void onComplete(final AsyncEvent event) throws IOException {
-    if (activated.compareAndSet(false, true)) {
-      if (doOnResponse) {
-        ServletResponse resp = event.getSuppliedResponse();
-        if (resp instanceof HttpServletResponse) {
-          DECORATE.onResponse(span, (HttpServletResponse) resp);
+    @Override
+    public void onComplete(final AsyncEvent event) throws IOException {
+        if (activated.compareAndSet(false, true)) {
+            if (doOnResponse) {
+                ServletResponse resp = event.getSuppliedResponse();
+                if (resp instanceof HttpServletResponse) {
+                    DECORATE.onResponse(span, (HttpServletResponse) resp);
+                }
+            }
+            ServletRequest req = event.getSuppliedRequest();
+            if (null != req) {
+                Object error = req.getAttribute(RequestDispatcher.ERROR_EXCEPTION);
+                if (error instanceof Throwable) {
+                    DECORATE.onError(span, (Throwable) error);
+                }
+            }
+            DECORATE.beforeFinish(scope.context());
+            maybeFinishSpan();
         }
-      }
-      ServletRequest req = event.getSuppliedRequest();
-      if (null != req) {
-        Object error = req.getAttribute(RequestDispatcher.ERROR_EXCEPTION);
-        if (error instanceof Throwable) {
-          DECORATE.onError(span, (Throwable) error);
-        }
-      }
-      DECORATE.beforeFinish(scope.context());
-      maybeFinishSpan();
     }
-  }
 
-  @Override
-  public void run() {
-    if (activated.compareAndSet(false, true)) {
-      DECORATE.beforeFinish(scope.context());
-      maybeFinishSpan();
+    @Override
+    public void run() {
+        if (activated.compareAndSet(false, true)) {
+            DECORATE.beforeFinish(scope.context());
+            maybeFinishSpan();
+        }
     }
-  }
 
-  @Override
-  public void onTimeout(final AsyncEvent event) throws IOException {
-    if (activated.compareAndSet(false, true)) {
-      if (Config.get().isServletAsyncTimeoutError()) {
-        span.setError(true);
-      }
-      span.setTag(TIMEOUT, event.getAsyncContext().getTimeout());
-      DECORATE.beforeFinish(scope.context());
-      maybeFinishSpan();
+    @Override
+    public void onTimeout(final AsyncEvent event) throws IOException {
+        if (activated.compareAndSet(false, true)) {
+            if (Config.get().isServletAsyncTimeoutError()) {
+                span.setError(true);
+            }
+            span.setTag(TIMEOUT, event.getAsyncContext().getTimeout());
+            DECORATE.beforeFinish(scope.context());
+            maybeFinishSpan();
+        }
     }
-  }
 
-  @Override
-  public void onError(final AsyncEvent event) throws IOException {
-    if (event.getThrowable() != null && activated.compareAndSet(false, true)) {
-      DECORATE.onError(span, event.getThrowable());
-      DECORATE.beforeFinish(scope.context());
-      maybeFinishSpan();
+    @Override
+    public void onError(final AsyncEvent event) throws IOException {
+        if (event.getThrowable() != null && activated.compareAndSet(false, true)) {
+            DECORATE.onError(span, event.getThrowable());
+            DECORATE.beforeFinish(scope.context());
+            maybeFinishSpan();
+        }
     }
-  }
 
-  /** Transfer the listener over to the new context. */
-  @Override
-  public void onStartAsync(final AsyncEvent event) throws IOException {
-    event.getAsyncContext().addListener(this);
-  }
+    /** Transfer the listener over to the new context. */
+    @Override
+    public void onStartAsync(final AsyncEvent event) throws IOException {
+        event.getAsyncContext().addListener(this);
+    }
 
-  private void maybeFinishSpan() {
-    if (span.phasedFinish()) {
-      span.publish();
+    private void maybeFinishSpan() {
+        if (span.phasedFinish()) {
+            span.publish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletExtractAdapter.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletExtractAdapter.java
index 6fce09dfdb2..c5a44d55b16 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletExtractAdapter.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletExtractAdapter.java
@@ -10,48 +10,48 @@
 import javax.servlet.http.HttpServletResponse;
 
 public abstract class HttpServletExtractAdapter<T> implements AgentPropagation.ContextVisitor<T> {
-  abstract Enumeration<String> getHeaderNames(T t);
-
-  abstract String getHeader(T t, String name);
-
-  @Override
-  public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-    Enumeration<String> headerNames = getHeaderNames(carrier);
-    while (headerNames.hasMoreElements()) {
-      String header = headerNames.nextElement();
-      if (!classifier.accept(header, getHeader(carrier, header))) {
-        break;
-      }
-    }
-  }
+    abstract Enumeration<String> getHeaderNames(T t);
 
-  public static final class Request extends HttpServletExtractAdapter<HttpServletRequest> {
-    public static final Request GETTER = new Request();
+    abstract String getHeader(T t, String name);
 
     @Override
-    Enumeration<String> getHeaderNames(HttpServletRequest request) {
-      final Enumeration<String> ret = request.getHeaderNames();
-      return ret != null ? ret : emptyEnumeration();
+    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+        Enumeration<String> headerNames = getHeaderNames(carrier);
+        while (headerNames.hasMoreElements()) {
+            String header = headerNames.nextElement();
+            if (!classifier.accept(header, getHeader(carrier, header))) {
+                break;
+            }
+        }
     }
 
-    @Override
-    String getHeader(HttpServletRequest request, String name) {
-      return request.getHeader(name);
-    }
-  }
+    public static final class Request extends HttpServletExtractAdapter<HttpServletRequest> {
+        public static final Request GETTER = new Request();
 
-  public static final class Response extends HttpServletExtractAdapter<HttpServletResponse> {
-    public static final Response GETTER = new Response();
+        @Override
+        Enumeration<String> getHeaderNames(HttpServletRequest request) {
+            final Enumeration<String> ret = request.getHeaderNames();
+            return ret != null ? ret : emptyEnumeration();
+        }
 
-    @Override
-    Enumeration<String> getHeaderNames(HttpServletResponse response) {
-      final Collection<String> headerNames = response.getHeaderNames();
-      return headerNames != null ? enumeration(headerNames) : emptyEnumeration();
+        @Override
+        String getHeader(HttpServletRequest request, String name) {
+            return request.getHeader(name);
+        }
     }
 
-    @Override
-    String getHeader(HttpServletResponse response, String name) {
-      return response.getHeader(name);
+    public static final class Response extends HttpServletExtractAdapter<HttpServletResponse> {
+        public static final Response GETTER = new Response();
+
+        @Override
+        Enumeration<String> getHeaderNames(HttpServletResponse response) {
+            final Collection<String> headerNames = response.getHeaderNames();
+            return headerNames != null ? enumeration(headerNames) : emptyEnumeration();
+        }
+
+        @Override
+        String getHeader(HttpServletResponse response, String name) {
+            return response.getHeader(name);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletGetInputStreamAdvice.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletGetInputStreamAdvice.java
index 4fd91f27183..6f92b2f2108 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletGetInputStreamAdvice.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletGetInputStreamAdvice.java
@@ -20,54 +20,53 @@
 @SuppressWarnings("Duplicates")
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 class HttpServletGetInputStreamAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  static void after(
-      @Advice.This final HttpServletRequest req,
-      @Advice.Return(readOnly = false) ServletInputStream is,
-      @ActiveRequestContext RequestContext reqCtx) {
-    if (is == null) {
-      return;
-    }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    static void after(
+            @Advice.This final HttpServletRequest req,
+            @Advice.Return(readOnly = false) ServletInputStream is,
+            @ActiveRequestContext RequestContext reqCtx) {
+        if (is == null) {
+            return;
+        }
 
-    Object alreadyWrapped = req.getAttribute("datadog.wrapped_request_body");
-    if (alreadyWrapped != null || is instanceof Servlet31InputStreamWrapper) {
-      return;
-    }
+        Object alreadyWrapped = req.getAttribute("datadog.wrapped_request_body");
+        if (alreadyWrapped != null || is instanceof Servlet31InputStreamWrapper) {
+            return;
+        }
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, StoredBodySupplier, Void> requestStartCb =
-        cbp.getCallback(EVENTS.requestBodyStart());
-    BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> requestEndedCb =
-        cbp.getCallback(EVENTS.requestBodyDone());
-    if (requestStartCb == null || requestEndedCb == null) {
-      return;
-    }
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, StoredBodySupplier, Void> requestStartCb =
+                cbp.getCallback(EVENTS.requestBodyStart());
+        BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> requestEndedCb =
+                cbp.getCallback(EVENTS.requestBodyDone());
+        if (requestStartCb == null || requestEndedCb == null) {
+            return;
+        }
 
-    req.setAttribute("datadog.wrapped_request_body", Boolean.TRUE);
+        req.setAttribute("datadog.wrapped_request_body", Boolean.TRUE);
 
-    int lengthHint = 0;
-    String lengthHeader = req.getHeader("content-length");
-    if (lengthHeader != null) {
-      try {
-        lengthHint = Integer.parseInt(lengthHeader);
-      } catch (NumberFormatException nfe) {
-        // purposefully left blank
-      }
-    }
+        int lengthHint = 0;
+        String lengthHeader = req.getHeader("content-length");
+        if (lengthHeader != null) {
+            try {
+                lengthHint = Integer.parseInt(lengthHeader);
+            } catch (NumberFormatException nfe) {
+                // purposefully left blank
+            }
+        }
 
-    String encoding = req.getCharacterEncoding();
-    Charset charset = null;
-    try {
-      if (encoding != null) {
-        charset = Charset.forName(encoding);
-      }
-    } catch (IllegalArgumentException iae) {
-      // purposefully left blank
-    }
+        String encoding = req.getCharacterEncoding();
+        Charset charset = null;
+        try {
+            if (encoding != null) {
+                charset = Charset.forName(encoding);
+            }
+        } catch (IllegalArgumentException iae) {
+            // purposefully left blank
+        }
 
-    StoredByteBody storedByteBody =
-        new StoredByteBody(reqCtx, requestStartCb, requestEndedCb, charset, lengthHint);
+        StoredByteBody storedByteBody = new StoredByteBody(reqCtx, requestStartCb, requestEndedCb, charset, lengthHint);
 
-    is = new Servlet31InputStreamWrapper(is, storedByteBody);
-  }
+        is = new Servlet31InputStreamWrapper(is, storedByteBody);
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletGetReaderAdvice.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletGetReaderAdvice.java
index 0eb1d348d1a..fa8b0bc80fa 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletGetReaderAdvice.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletGetReaderAdvice.java
@@ -21,50 +21,48 @@
 @SuppressWarnings("Duplicates")
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 class HttpServletGetReaderAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  static void after(
-      @Advice.This final HttpServletRequest req,
-      @Advice.Return(readOnly = false) BufferedReader reader) {
-    if (reader == null) {
-      return;
-    }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    static void after(
+            @Advice.This final HttpServletRequest req, @Advice.Return(readOnly = false) BufferedReader reader) {
+        if (reader == null) {
+            return;
+        }
 
-    AgentSpan agentSpan = activeSpan();
-    if (agentSpan == null) {
-      return;
-    }
-    Object alreadyWrapped = req.getAttribute("datadog.wrapped_request_body");
-    if (alreadyWrapped != null || reader instanceof BufferedReaderWrapper) {
-      return;
-    }
-    RequestContext requestContext = agentSpan.getRequestContext();
-    if (requestContext == null) {
-      return;
-    }
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, StoredBodySupplier, Void> requestStartCb =
-        cbp.getCallback(EVENTS.requestBodyStart());
-    BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> requestEndedCb =
-        cbp.getCallback(EVENTS.requestBodyDone());
-    if (requestStartCb == null || requestEndedCb == null) {
-      return;
-    }
+        AgentSpan agentSpan = activeSpan();
+        if (agentSpan == null) {
+            return;
+        }
+        Object alreadyWrapped = req.getAttribute("datadog.wrapped_request_body");
+        if (alreadyWrapped != null || reader instanceof BufferedReaderWrapper) {
+            return;
+        }
+        RequestContext requestContext = agentSpan.getRequestContext();
+        if (requestContext == null) {
+            return;
+        }
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, StoredBodySupplier, Void> requestStartCb =
+                cbp.getCallback(EVENTS.requestBodyStart());
+        BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> requestEndedCb =
+                cbp.getCallback(EVENTS.requestBodyDone());
+        if (requestStartCb == null || requestEndedCb == null) {
+            return;
+        }
 
-    req.setAttribute("datadog.wrapped_request_body", Boolean.TRUE);
+        req.setAttribute("datadog.wrapped_request_body", Boolean.TRUE);
 
-    int lengthHint = 0;
-    String lengthHeader = req.getHeader("content-length");
-    if (lengthHeader != null) {
-      try {
-        lengthHint = Integer.parseInt(lengthHeader);
-      } catch (NumberFormatException nfe) {
-        // purposefully left blank
-      }
-    }
+        int lengthHint = 0;
+        String lengthHeader = req.getHeader("content-length");
+        if (lengthHeader != null) {
+            try {
+                lengthHint = Integer.parseInt(lengthHeader);
+            } catch (NumberFormatException nfe) {
+                // purposefully left blank
+            }
+        }
 
-    StoredCharBody storedCharBody =
-        new StoredCharBody(requestContext, requestStartCb, requestEndedCb, lengthHint);
+        StoredCharBody storedCharBody = new StoredCharBody(requestContext, requestStartCb, requestEndedCb, lengthHint);
 
-    reader = new BufferedReaderWrapper(reader, storedCharBody);
-  }
+        reader = new BufferedReaderWrapper(reader, storedCharBody);
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastOptOutHttpServletRequest3Instrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastOptOutHttpServletRequest3Instrumentation.java
index 57289e26ab7..51e2978cc47 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastOptOutHttpServletRequest3Instrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastOptOutHttpServletRequest3Instrumentation.java
@@ -31,88 +31,90 @@
 
 @AutoService(InstrumenterModule.class)
 public class IastOptOutHttpServletRequest3Instrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public IastOptOutHttpServletRequest3Instrumentation() {
-    super("servlet", "servlet-3");
-  }
+    public IastOptOutHttpServletRequest3Instrumentation() {
+        super("servlet", "servlet-3");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "servlet-3.x";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "servlet-3.x";
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Avoid matching request before servlet-3.x which don't have session tracking modes
-    return hasClassNamed("javax.servlet.SessionTrackingMode");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Avoid matching request before servlet-3.x which don't have session tracking modes
+        return hasClassNamed("javax.servlet.SessionTrackingMode");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.http.HttpServletRequest";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.http.HttpServletRequest";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        // ignore wrappers that ship with servlet-api
-        .and(namedNoneOf("javax.servlet.http.HttpServletRequestWrapper"))
-        .and(not(extendsClass(named("javax.servlet.http.HttpServletRequestWrapper"))));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                // ignore wrappers that ship with servlet-api
+                .and(namedNoneOf("javax.servlet.http.HttpServletRequestWrapper"))
+                .and(not(extendsClass(named("javax.servlet.http.HttpServletRequestWrapper"))));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getSession").and(returns(named("javax.servlet.http.HttpSession"))).and(isPublic()),
-        getClass().getName() + "$GetHttpSessionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getSession")
+                        .and(returns(named("javax.servlet.http.HttpSession")))
+                        .and(isPublic()),
+                getClass().getName() + "$GetHttpSessionAdvice");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "javax.servlet.ServletContext", "javax.servlet.SessionTrackingMode");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("javax.servlet.ServletContext", "javax.servlet.SessionTrackingMode");
+    }
 
-  @Override
-  protected boolean isOptOutEnabled() {
-    return true;
-  }
+    @Override
+    protected boolean isOptOutEnabled() {
+        return true;
+    }
 
-  public static class GetHttpSessionAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.SESSION_REWRITING)
-    public static void onExit(
-        @Advice.This final HttpServletRequest request, @Advice.Return final HttpSession session) {
-      if (session == null) {
-        return;
-      }
-      final ApplicationModule module = InstrumentationBridge.APPLICATION;
-      if (module == null) {
-        return;
-      }
-      final ServletContext context = request.getServletContext();
-      if (InstrumentationContext.get(ServletContext.class, SessionTrackingMode.class).get(context)
-          != null) {
-        return;
-      }
-      // We only want to report it once per application
-      InstrumentationContext.get(ServletContext.class, SessionTrackingMode.class)
-          .put(context, SessionTrackingMode.URL);
-      if (context.getEffectiveSessionTrackingModes() != null
-          && !context.getEffectiveSessionTrackingModes().isEmpty()) {
-        Set<String> sessionTrackingModes = new HashSet<>();
-        for (SessionTrackingMode mode : context.getEffectiveSessionTrackingModes()) {
-          sessionTrackingModes.add(mode.name());
+    public static class GetHttpSessionAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.SESSION_REWRITING)
+        public static void onExit(
+                @Advice.This final HttpServletRequest request, @Advice.Return final HttpSession session) {
+            if (session == null) {
+                return;
+            }
+            final ApplicationModule module = InstrumentationBridge.APPLICATION;
+            if (module == null) {
+                return;
+            }
+            final ServletContext context = request.getServletContext();
+            if (InstrumentationContext.get(ServletContext.class, SessionTrackingMode.class)
+                            .get(context)
+                    != null) {
+                return;
+            }
+            // We only want to report it once per application
+            InstrumentationContext.get(ServletContext.class, SessionTrackingMode.class)
+                    .put(context, SessionTrackingMode.URL);
+            if (context.getEffectiveSessionTrackingModes() != null
+                    && !context.getEffectiveSessionTrackingModes().isEmpty()) {
+                Set<String> sessionTrackingModes = new HashSet<>();
+                for (SessionTrackingMode mode : context.getEffectiveSessionTrackingModes()) {
+                    sessionTrackingModes.add(mode.name());
+                }
+                module.checkSessionTrackingModes(sessionTrackingModes);
+            }
         }
-        module.checkSessionTrackingModes(sessionTrackingModes);
-      }
     }
-  }
 
-  @Override
-  public int order() {
-    // apply this instrumentation after the regular servlet one.
-    return 1;
-  }
+    @Override
+    public int order() {
+        // apply this instrumentation after the regular servlet one.
+        return 1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Advice.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Advice.java
index d9d40cfde04..a5a69216e68 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Advice.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Advice.java
@@ -12,23 +12,23 @@
 
 public class IastServlet3Advice {
 
-  @Sink(VulnerabilityTypes.APPLICATION)
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit(@Advice.Argument(0) ServletRequest request) {
-    final ApplicationModule applicationModule = InstrumentationBridge.APPLICATION;
-    if (applicationModule == null) {
-      return;
+    @Sink(VulnerabilityTypes.APPLICATION)
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(@Advice.Argument(0) ServletRequest request) {
+        final ApplicationModule applicationModule = InstrumentationBridge.APPLICATION;
+        if (applicationModule == null) {
+            return;
+        }
+        if (!(request instanceof HttpServletRequest)) {
+            return;
+        }
+        final ServletContext context = request.getServletContext();
+        if (InstrumentationContext.get(ServletContext.class, Boolean.class).get(context) != null) {
+            return;
+        }
+        InstrumentationContext.get(ServletContext.class, Boolean.class).put(context, true);
+        if (applicationModule != null) {
+            applicationModule.onRealPath(context.getRealPath("/"));
+        }
     }
-    if (!(request instanceof HttpServletRequest)) {
-      return;
-    }
-    final ServletContext context = request.getServletContext();
-    if (InstrumentationContext.get(ServletContext.class, Boolean.class).get(context) != null) {
-      return;
-    }
-    InstrumentationContext.get(ServletContext.class, Boolean.class).put(context, true);
-    if (applicationModule != null) {
-      applicationModule.onRealPath(context.getRealPath("/"));
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Instrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Instrumentation.java
index 6e1d9ebdec2..10514295632 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Instrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Instrumentation.java
@@ -18,56 +18,56 @@
 
 @AutoService(InstrumenterModule.class)
 public final class IastServlet3Instrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public IastServlet3Instrumentation() {
-    super("servlet", "servlet-3");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public IastServlet3Instrumentation() {
+        super("servlet", "servlet-3");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "servlet-3.x";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "servlet-3.x";
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Avoid matching servlet 2 which has its own instrumentation
-    return hasClassNamed("javax.servlet.AsyncEvent");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Avoid matching servlet 2 which has its own instrumentation
+        return hasClassNamed("javax.servlet.AsyncEvent");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.http.HttpServlet";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.http.HttpServlet";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("javax.servlet.http.HttpServlet"))
-        .or(implementsInterface(named("javax.servlet.FilterChain")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("javax.servlet.http.HttpServlet"))
+                .or(implementsInterface(named("javax.servlet.FilterChain")));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("javax.servlet.ServletContext", Boolean.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("javax.servlet.ServletContext", Boolean.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        namedOneOf("doFilter", "service")
-            .and(takesArgument(0, named("javax.servlet.ServletRequest")))
-            .and(takesArgument(1, named("javax.servlet.ServletResponse")))
-            .and(isPublic()),
-        packageName + ".IastServlet3Advice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                namedOneOf("doFilter", "service")
+                        .and(takesArgument(0, named("javax.servlet.ServletRequest")))
+                        .and(takesArgument(1, named("javax.servlet.ServletResponse")))
+                        .and(isPublic()),
+                packageName + ".IastServlet3Advice");
+    }
 
-  @Override
-  protected boolean isOptOutEnabled() {
-    return true;
-  }
+    @Override
+    protected boolean isOptOutEnabled() {
+        return true;
+    }
 
-  @Override
-  public int order() {
-    // apply this instrumentation after the regular servlet one.
-    return 1;
-  }
+    @Override
+    public int order() {
+        // apply this instrumentation after the regular servlet one.
+        return 1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/MultipartInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/MultipartInstrumentation.java
index de8ddb29ff7..fe8e83c599b 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/MultipartInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/MultipartInstrumentation.java
@@ -25,133 +25,130 @@
 
 @AutoService(InstrumenterModule.class)
 public class MultipartInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public MultipartInstrumentation() {
-    super("servlet", "multipart");
-  }
+    public MultipartInstrumentation() {
+        super("servlet", "multipart");
+    }
 
-  public String muzzleDirective() {
-    return "servlet-3.x";
-  }
+    public String muzzleDirective() {
+        return "servlet-3.x";
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.http.Part";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.http.Part";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getName").and(isPublic()).and(takesArguments(0)),
-        getClass().getName() + "$GetNameAdvice");
-    transformer.applyAdvice(
-        named("getHeader").and(isPublic()).and(takesArguments(String.class)),
-        getClass().getName() + "$GetHeaderAdvice");
-    transformer.applyAdvice(
-        named("getHeaders").and(isPublic()).and(takesArguments(String.class)),
-        getClass().getName() + "$GetHeadersAdvice");
-    transformer.applyAdvice(
-        named("getHeaderNames").and(isPublic()).and(takesArguments(0)),
-        getClass().getName() + "$GetHeaderNamesAdvice");
-    transformer.applyAdvice(
-        named("getInputStream").and(isPublic()).and(takesArguments(0)),
-        getClass().getName() + "$GetInputStreamAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getName").and(isPublic()).and(takesArguments(0)),
+                getClass().getName() + "$GetNameAdvice");
+        transformer.applyAdvice(
+                named("getHeader").and(isPublic()).and(takesArguments(String.class)),
+                getClass().getName() + "$GetHeaderAdvice");
+        transformer.applyAdvice(
+                named("getHeaders").and(isPublic()).and(takesArguments(String.class)),
+                getClass().getName() + "$GetHeadersAdvice");
+        transformer.applyAdvice(
+                named("getHeaderNames").and(isPublic()).and(takesArguments(0)),
+                getClass().getName() + "$GetHeaderNamesAdvice");
+        transformer.applyAdvice(
+                named("getInputStream").and(isPublic()).and(takesArguments(0)),
+                getClass().getName() + "$GetInputStreamAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetNameAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
-    public static String onExit(
-        @Advice.Return final String name, @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintString(
-            ctx, name, SourceTypes.REQUEST_MULTIPART_PARAMETER, "Content-Disposition");
-      }
-      return name;
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetNameAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
+        public static String onExit(@Advice.Return final String name, @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintString(ctx, name, SourceTypes.REQUEST_MULTIPART_PARAMETER, "Content-Disposition");
+            }
+            return name;
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetHeaderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
-    public static String onExit(
-        @Advice.Return final String value,
-        @Advice.Argument(0) final String name,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintString(ctx, value, SourceTypes.REQUEST_MULTIPART_PARAMETER, name);
-      }
-      return value;
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetHeaderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
+        public static String onExit(
+                @Advice.Return final String value,
+                @Advice.Argument(0) final String name,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintString(ctx, value, SourceTypes.REQUEST_MULTIPART_PARAMETER, name);
+            }
+            return value;
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetHeadersAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
-    public static void onExit(
-        @Advice.Argument(0) final String headerName,
-        @Advice.Return Collection<String> headerValues,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (null == headerValues || headerValues.isEmpty()) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        for (final String value : headerValues) {
-          module.taintString(ctx, value, SourceTypes.REQUEST_MULTIPART_PARAMETER, headerName);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetHeadersAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
+        public static void onExit(
+                @Advice.Argument(0) final String headerName,
+                @Advice.Return Collection<String> headerValues,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (null == headerValues || headerValues.isEmpty()) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                for (final String value : headerValues) {
+                    module.taintString(ctx, value, SourceTypes.REQUEST_MULTIPART_PARAMETER, headerName);
+                }
+            }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetHeaderNamesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
-    public static void onExit(
-        @Advice.Return final Collection<String> headerNames,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (null == headerNames || headerNames.isEmpty()) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        for (final String name : headerNames) {
-          module.taintString(ctx, name, SourceTypes.REQUEST_MULTIPART_PARAMETER);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetHeaderNamesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
+        public static void onExit(
+                @Advice.Return final Collection<String> headerNames, @ActiveRequestContext RequestContext reqCtx) {
+            if (null == headerNames || headerNames.isEmpty()) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                for (final String name : headerNames) {
+                    module.taintString(ctx, name, SourceTypes.REQUEST_MULTIPART_PARAMETER);
+                }
+            }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetInputStreamAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
-    public static void onExit(
-        @Advice.Return final InputStream inputStream, @ActiveRequestContext RequestContext reqCtx) {
-      if (null == inputStream) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintObject(ctx, inputStream, SourceTypes.REQUEST_MULTIPART_PARAMETER);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetInputStreamAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_MULTIPART_PARAMETER)
+        public static void onExit(
+                @Advice.Return final InputStream inputStream, @ActiveRequestContext RequestContext reqCtx) {
+            if (null == inputStream) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintObject(ctx, inputStream, SourceTypes.REQUEST_MULTIPART_PARAMETER);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumAsyncContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumAsyncContextInstrumentation.java
index f4158cd0bd0..dc62a6f191d 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumAsyncContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumAsyncContextInstrumentation.java
@@ -18,46 +18,45 @@
 
 @AutoService(InstrumenterModule.class)
 public class RumAsyncContextInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public RumAsyncContextInstrumentation() {
-    super("servlet", "servlet-3", "servlet-3-async-context");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.AsyncContext";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "servlet-3.x";
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && InstrumenterConfig.get().isRumEnabled();
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("complete", "dispatch")), getClass().getName() + "$CommitAdvice");
-  }
-
-  public static class CommitAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void commitRumBuffer(@Advice.This final AsyncContext asyncContext) {
-      final Object maybeRumWrappedResponse =
-          asyncContext.getRequest().getAttribute(DD_RUM_INJECTED);
-      if (maybeRumWrappedResponse instanceof RumControllableResponse) {
-        ((RumControllableResponse) maybeRumWrappedResponse).commit();
-      }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public RumAsyncContextInstrumentation() {
+        super("servlet", "servlet-3", "servlet-3-async-context");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.AsyncContext";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "servlet-3.x";
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && InstrumenterConfig.get().isRumEnabled();
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("complete", "dispatch")), getClass().getName() + "$CommitAdvice");
+    }
+
+    public static class CommitAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void commitRumBuffer(@Advice.This final AsyncContext asyncContext) {
+            final Object maybeRumWrappedResponse = asyncContext.getRequest().getAttribute(DD_RUM_INJECTED);
+            if (maybeRumWrappedResponse instanceof RumControllableResponse) {
+                ((RumControllableResponse) maybeRumWrappedResponse).commit();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletRequestWrapper.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletRequestWrapper.java
index 13dfa13c4c9..c529c7be030 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletRequestWrapper.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletRequestWrapper.java
@@ -12,35 +12,33 @@
 
 public class RumHttpServletRequestWrapper extends HttpServletRequestWrapper {
 
-  private HttpServletResponse response;
+    private HttpServletResponse response;
 
-  public RumHttpServletRequestWrapper(
-      final HttpServletRequest request, final HttpServletResponse response) {
-    super(request);
-    this.response = response;
-  }
-
-  @Override
-  public AsyncContext startAsync() throws IllegalStateException {
-    // need to hide this method otherwise we cannot control the wrapped response used asynchronously
-    return startAsync(getRequest(), response);
-  }
+    public RumHttpServletRequestWrapper(final HttpServletRequest request, final HttpServletResponse response) {
+        super(request);
+        this.response = response;
+    }
 
-  @Override
-  public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
-      throws IllegalStateException {
-    // deactivate the previous wrapper
-    final Object maybeRumWrappedResponse = (servletRequest.getAttribute(DD_RUM_INJECTED));
-    if (maybeRumWrappedResponse instanceof RumControllableResponse) {
-      ((RumControllableResponse) maybeRumWrappedResponse).commit();
-      ((RumControllableResponse) maybeRumWrappedResponse).stopFiltering();
+    @Override
+    public AsyncContext startAsync() throws IllegalStateException {
+        // need to hide this method otherwise we cannot control the wrapped response used asynchronously
+        return startAsync(getRequest(), response);
     }
-    // rewrap it
-    if (servletResponse instanceof HttpServletResponse) {
-      this.response =
-          new RumHttpServletResponseWrapper(this, (HttpServletResponse) servletResponse);
-      servletRequest.setAttribute(DD_RUM_INJECTED, this.response);
+
+    @Override
+    public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
+            throws IllegalStateException {
+        // deactivate the previous wrapper
+        final Object maybeRumWrappedResponse = (servletRequest.getAttribute(DD_RUM_INJECTED));
+        if (maybeRumWrappedResponse instanceof RumControllableResponse) {
+            ((RumControllableResponse) maybeRumWrappedResponse).commit();
+            ((RumControllableResponse) maybeRumWrappedResponse).stopFiltering();
+        }
+        // rewrap it
+        if (servletResponse instanceof HttpServletResponse) {
+            this.response = new RumHttpServletResponseWrapper(this, (HttpServletResponse) servletResponse);
+            servletRequest.setAttribute(DD_RUM_INJECTED, this.response);
+        }
+        return super.startAsync(servletRequest, this.response);
     }
-    return super.startAsync(servletRequest, this.response);
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletResponseWrapper.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletResponseWrapper.java
index cbd0b6f845b..cfc3ee123b1 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletResponseWrapper.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletResponseWrapper.java
@@ -15,245 +15,233 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 
-public class RumHttpServletResponseWrapper extends HttpServletResponseWrapper
-    implements RumControllableResponse {
-  private final RumInjector rumInjector;
-  private final String servletVersion;
-  private WrappedServletOutputStream outputStream;
-  private PrintWriter printWriter;
-  private InjectingPipeWriter wrappedPipeWriter;
-  private boolean shouldInject = true;
-  private String contentEncoding = null;
-
-  private static final MethodHandle SET_CONTENT_LENGTH_LONG = getMh("setContentLengthLong");
-
-  private static MethodHandle getMh(final String name) {
-    try {
-      return new MethodHandles(ServletResponse.class.getClassLoader())
-          .method(ServletResponse.class, name);
-    } catch (Throwable ignored) {
-      return null;
-    }
-  }
-
-  private static <E extends Throwable> void sneakyThrow(Throwable e) throws E {
-    throw (E) e;
-  }
-
-  public RumHttpServletResponseWrapper(HttpServletRequest request, HttpServletResponse response) {
-    super(response);
-    this.rumInjector = RumInjector.get();
-
-    String version = "3";
-    ServletContext servletContext = request.getServletContext();
-    if (servletContext != null) {
-      try {
-        version = String.valueOf(servletContext.getEffectiveMajorVersion());
-      } catch (Exception e) {
-      }
-    }
-    this.servletVersion = version;
-  }
-
-  @Override
-  public ServletOutputStream getOutputStream() throws IOException {
-    if (outputStream != null) {
-      return outputStream;
-    }
-    if (!shouldInject) {
-      RumInjector.getTelemetryCollector().onInjectionSkipped(servletVersion);
-      return super.getOutputStream();
-    }
-    try {
-      String encoding = getCharacterEncoding();
-      if (encoding == null) {
-        encoding = Charset.defaultCharset().name();
-      }
-      outputStream =
-          new WrappedServletOutputStream(
-              super.getOutputStream(),
-              rumInjector.getMarkerBytes(encoding),
-              rumInjector.getSnippetBytes(encoding),
-              this::onInjected,
-              bytes ->
-                  RumInjector.getTelemetryCollector()
-                      .onInjectionResponseSize(servletVersion, bytes),
-              milliseconds ->
-                  RumInjector.getTelemetryCollector()
-                      .onInjectionTime(servletVersion, milliseconds));
-    } catch (Exception e) {
-      RumInjector.getTelemetryCollector().onInjectionFailed(servletVersion, contentEncoding);
-      throw e;
-    }
-
-    return outputStream;
-  }
-
-  @Override
-  public PrintWriter getWriter() throws IOException {
-    if (printWriter != null) {
-      return printWriter;
-    }
-    if (!shouldInject) {
-      RumInjector.getTelemetryCollector().onInjectionSkipped(servletVersion);
-      return super.getWriter();
-    }
-    try {
-      wrappedPipeWriter =
-          new InjectingPipeWriter(
-              super.getWriter(),
-              rumInjector.getMarkerChars(),
-              rumInjector.getSnippetChars(),
-              this::onInjected,
-              bytes ->
-                  RumInjector.getTelemetryCollector()
-                      .onInjectionResponseSize(servletVersion, bytes),
-              milliseconds ->
-                  RumInjector.getTelemetryCollector()
-                      .onInjectionTime(servletVersion, milliseconds));
-      printWriter = new PrintWriter(wrappedPipeWriter);
-    } catch (Exception e) {
-      RumInjector.getTelemetryCollector().onInjectionFailed(servletVersion, contentEncoding);
-      throw e;
-    }
-
-    return printWriter;
-  }
-
-  @Override
-  public void setHeader(String name, String value) {
-    if (shouldInject) {
-      if (isContentLengthHeader(name)) {
-        return;
-      }
-      checkForContentType(name, value);
-      checkForContentSecurityPolicy(name);
-    }
-    super.setHeader(name, value);
-  }
-
-  @Override
-  public void addHeader(String name, String value) {
-    if (shouldInject) {
-      if (isContentLengthHeader(name)) {
-        return;
-      }
-      checkForContentType(name, value);
-      checkForContentSecurityPolicy(name);
-    }
-    super.addHeader(name, value);
-  }
-
-  private boolean isContentLengthHeader(String name) {
-    return "content-length".equalsIgnoreCase(name);
-  }
-
-  private void checkForContentSecurityPolicy(String name) {
-    if ("content-security-policy".equalsIgnoreCase(name)) {
-      RumInjector.getTelemetryCollector().onContentSecurityPolicyDetected(servletVersion);
-    }
-  }
-
-  @Override
-  public void setContentLength(int len) {
-    // don't set it since we don't know if we will inject
-    if (!shouldInject) {
-      super.setContentLength(len);
-    }
-  }
-
-  @Override
-  public void setContentLengthLong(long len) {
-    if (!shouldInject && SET_CONTENT_LENGTH_LONG != null) {
-      try {
-        SET_CONTENT_LENGTH_LONG.invoke(getResponse(), len);
-      } catch (Throwable t) {
-        sneakyThrow(t);
-      }
-    }
-  }
-
-  @Override
-  public void setCharacterEncoding(String charset) {
-    if (charset != null) {
-      this.contentEncoding = charset;
-    }
-    super.setCharacterEncoding(charset);
-  }
-
-  @Override
-  public void reset() {
-    this.outputStream = null;
-    this.wrappedPipeWriter = null;
-    this.printWriter = null;
-    this.shouldInject = false;
-    super.reset();
-  }
-
-  @Override
-  public void resetBuffer() {
-    this.outputStream = null;
-    this.wrappedPipeWriter = null;
-    this.printWriter = null;
-    super.resetBuffer();
-  }
-
-  public void onInjected() {
-    RumInjector.getTelemetryCollector().onInjectionSucceed(servletVersion);
-    try {
-      setHeader("x-datadog-rum-injected", "1");
-    } catch (Throwable ignored) {
-      // suppress exception if arisen setting this header by us.
-    }
-  }
-
-  private void handleContentType(String type) {
-    final boolean wasInjecting = shouldInject;
-    if (shouldInject) {
-      shouldInject = type != null && type.contains("text/html");
-    }
-    if (wasInjecting && !shouldInject) {
-      commit();
-      stopFiltering();
-    }
-  }
-
-  private void checkForContentType(String name, String value) {
-    if ("content-type".equalsIgnoreCase(name)) {
-      handleContentType(value);
-    }
-  }
-
-  @Override
-  public void setContentType(String type) {
-    handleContentType(type);
-    super.setContentType(type);
-  }
-
-  @Override
-  public void commit() {
-    if (wrappedPipeWriter != null) {
-      try {
-        wrappedPipeWriter.commit();
-      } catch (Throwable ignored) {
-      }
-    }
-    if (outputStream != null) {
-      try {
-        outputStream.commit();
-      } catch (Throwable ignored) {
-      }
-    }
-  }
-
-  @Override
-  public void stopFiltering() {
-    shouldInject = false;
-    if (wrappedPipeWriter != null) {
-      wrappedPipeWriter.setFilter(false);
-    }
-    if (outputStream != null) {
-      outputStream.setFilter(false);
+public class RumHttpServletResponseWrapper extends HttpServletResponseWrapper implements RumControllableResponse {
+    private final RumInjector rumInjector;
+    private final String servletVersion;
+    private WrappedServletOutputStream outputStream;
+    private PrintWriter printWriter;
+    private InjectingPipeWriter wrappedPipeWriter;
+    private boolean shouldInject = true;
+    private String contentEncoding = null;
+
+    private static final MethodHandle SET_CONTENT_LENGTH_LONG = getMh("setContentLengthLong");
+
+    private static MethodHandle getMh(final String name) {
+        try {
+            return new MethodHandles(ServletResponse.class.getClassLoader()).method(ServletResponse.class, name);
+        } catch (Throwable ignored) {
+            return null;
+        }
+    }
+
+    private static <E extends Throwable> void sneakyThrow(Throwable e) throws E {
+        throw (E) e;
+    }
+
+    public RumHttpServletResponseWrapper(HttpServletRequest request, HttpServletResponse response) {
+        super(response);
+        this.rumInjector = RumInjector.get();
+
+        String version = "3";
+        ServletContext servletContext = request.getServletContext();
+        if (servletContext != null) {
+            try {
+                version = String.valueOf(servletContext.getEffectiveMajorVersion());
+            } catch (Exception e) {
+            }
+        }
+        this.servletVersion = version;
+    }
+
+    @Override
+    public ServletOutputStream getOutputStream() throws IOException {
+        if (outputStream != null) {
+            return outputStream;
+        }
+        if (!shouldInject) {
+            RumInjector.getTelemetryCollector().onInjectionSkipped(servletVersion);
+            return super.getOutputStream();
+        }
+        try {
+            String encoding = getCharacterEncoding();
+            if (encoding == null) {
+                encoding = Charset.defaultCharset().name();
+            }
+            outputStream = new WrappedServletOutputStream(
+                    super.getOutputStream(),
+                    rumInjector.getMarkerBytes(encoding),
+                    rumInjector.getSnippetBytes(encoding),
+                    this::onInjected,
+                    bytes -> RumInjector.getTelemetryCollector().onInjectionResponseSize(servletVersion, bytes),
+                    milliseconds -> RumInjector.getTelemetryCollector().onInjectionTime(servletVersion, milliseconds));
+        } catch (Exception e) {
+            RumInjector.getTelemetryCollector().onInjectionFailed(servletVersion, contentEncoding);
+            throw e;
+        }
+
+        return outputStream;
+    }
+
+    @Override
+    public PrintWriter getWriter() throws IOException {
+        if (printWriter != null) {
+            return printWriter;
+        }
+        if (!shouldInject) {
+            RumInjector.getTelemetryCollector().onInjectionSkipped(servletVersion);
+            return super.getWriter();
+        }
+        try {
+            wrappedPipeWriter = new InjectingPipeWriter(
+                    super.getWriter(),
+                    rumInjector.getMarkerChars(),
+                    rumInjector.getSnippetChars(),
+                    this::onInjected,
+                    bytes -> RumInjector.getTelemetryCollector().onInjectionResponseSize(servletVersion, bytes),
+                    milliseconds -> RumInjector.getTelemetryCollector().onInjectionTime(servletVersion, milliseconds));
+            printWriter = new PrintWriter(wrappedPipeWriter);
+        } catch (Exception e) {
+            RumInjector.getTelemetryCollector().onInjectionFailed(servletVersion, contentEncoding);
+            throw e;
+        }
+
+        return printWriter;
+    }
+
+    @Override
+    public void setHeader(String name, String value) {
+        if (shouldInject) {
+            if (isContentLengthHeader(name)) {
+                return;
+            }
+            checkForContentType(name, value);
+            checkForContentSecurityPolicy(name);
+        }
+        super.setHeader(name, value);
+    }
+
+    @Override
+    public void addHeader(String name, String value) {
+        if (shouldInject) {
+            if (isContentLengthHeader(name)) {
+                return;
+            }
+            checkForContentType(name, value);
+            checkForContentSecurityPolicy(name);
+        }
+        super.addHeader(name, value);
+    }
+
+    private boolean isContentLengthHeader(String name) {
+        return "content-length".equalsIgnoreCase(name);
+    }
+
+    private void checkForContentSecurityPolicy(String name) {
+        if ("content-security-policy".equalsIgnoreCase(name)) {
+            RumInjector.getTelemetryCollector().onContentSecurityPolicyDetected(servletVersion);
+        }
+    }
+
+    @Override
+    public void setContentLength(int len) {
+        // don't set it since we don't know if we will inject
+        if (!shouldInject) {
+            super.setContentLength(len);
+        }
+    }
+
+    @Override
+    public void setContentLengthLong(long len) {
+        if (!shouldInject && SET_CONTENT_LENGTH_LONG != null) {
+            try {
+                SET_CONTENT_LENGTH_LONG.invoke(getResponse(), len);
+            } catch (Throwable t) {
+                sneakyThrow(t);
+            }
+        }
+    }
+
+    @Override
+    public void setCharacterEncoding(String charset) {
+        if (charset != null) {
+            this.contentEncoding = charset;
+        }
+        super.setCharacterEncoding(charset);
+    }
+
+    @Override
+    public void reset() {
+        this.outputStream = null;
+        this.wrappedPipeWriter = null;
+        this.printWriter = null;
+        this.shouldInject = false;
+        super.reset();
+    }
+
+    @Override
+    public void resetBuffer() {
+        this.outputStream = null;
+        this.wrappedPipeWriter = null;
+        this.printWriter = null;
+        super.resetBuffer();
+    }
+
+    public void onInjected() {
+        RumInjector.getTelemetryCollector().onInjectionSucceed(servletVersion);
+        try {
+            setHeader("x-datadog-rum-injected", "1");
+        } catch (Throwable ignored) {
+            // suppress exception if arisen setting this header by us.
+        }
+    }
+
+    private void handleContentType(String type) {
+        final boolean wasInjecting = shouldInject;
+        if (shouldInject) {
+            shouldInject = type != null && type.contains("text/html");
+        }
+        if (wasInjecting && !shouldInject) {
+            commit();
+            stopFiltering();
+        }
+    }
+
+    private void checkForContentType(String name, String value) {
+        if ("content-type".equalsIgnoreCase(name)) {
+            handleContentType(value);
+        }
+    }
+
+    @Override
+    public void setContentType(String type) {
+        handleContentType(type);
+        super.setContentType(type);
+    }
+
+    @Override
+    public void commit() {
+        if (wrappedPipeWriter != null) {
+            try {
+                wrappedPipeWriter.commit();
+            } catch (Throwable ignored) {
+            }
+        }
+        if (outputStream != null) {
+            try {
+                outputStream.commit();
+            } catch (Throwable ignored) {
+            }
+        }
+    }
+
+    @Override
+    public void stopFiltering() {
+        shouldInject = false;
+        if (wrappedPipeWriter != null) {
+            wrappedPipeWriter.setFilter(false);
+        }
+        if (outputStream != null) {
+            outputStream.setFilter(false);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31InputStreamWrapper.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31InputStreamWrapper.java
index 23eb76a75e6..231c8ed051b 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31InputStreamWrapper.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31InputStreamWrapper.java
@@ -7,22 +7,22 @@
 
 /** Provides additional delegation for servlet 3.1 */
 public class Servlet31InputStreamWrapper extends AbstractServletInputStreamWrapper {
-  public Servlet31InputStreamWrapper(ServletInputStream is, StoredByteBody storedByteBody) {
-    super(is, storedByteBody);
-  }
+    public Servlet31InputStreamWrapper(ServletInputStream is, StoredByteBody storedByteBody) {
+        super(is, storedByteBody);
+    }
 
-  @Override
-  public boolean isFinished() {
-    return is.isFinished();
-  }
+    @Override
+    public boolean isFinished() {
+        return is.isFinished();
+    }
 
-  @Override
-  public boolean isReady() {
-    return is.isReady();
-  }
+    @Override
+    public boolean isReady() {
+        return is.isReady();
+    }
 
-  @Override
-  public void setReadListener(ReadListener readListener) {
-    is.setReadListener(readListener);
-  }
+    @Override
+    public void setReadListener(ReadListener readListener) {
+        is.setReadListener(readListener);
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31RequestBodyInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31RequestBodyInstrumentation.java
index 882b2b762bf..13f536bc28c 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31RequestBodyInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31RequestBodyInstrumentation.java
@@ -22,63 +22,63 @@
  */
 @AutoService(InstrumenterModule.class)
 public class Servlet31RequestBodyInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public Servlet31RequestBodyInstrumentation() {
-    super("servlet-request-body");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public Servlet31RequestBodyInstrumentation() {
+        super("servlet-request-body");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "servlet-3.1.x";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "servlet-3.1.x";
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Avoid matching request bodies before 3.1.x which have their own instrumentation
-    return hasClassNamed("javax.servlet.ReadListener");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Avoid matching request bodies before 3.1.x which have their own instrumentation
+        return hasClassNamed("javax.servlet.ReadListener");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.http.HttpServletRequest";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.http.HttpServletRequest";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        // ignore wrappers that ship with servlet-api
-        .and(namedNoneOf("javax.servlet.http.HttpServletRequestWrapper"))
-        .and(not(extendsClass(named("javax.servlet.http.HttpServletRequestWrapper"))));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                // ignore wrappers that ship with servlet-api
+                .and(namedNoneOf("javax.servlet.http.HttpServletRequestWrapper"))
+                .and(not(extendsClass(named("javax.servlet.http.HttpServletRequestWrapper"))));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getInputStream")
-            .and(takesNoArguments())
-            .and(returns(named("javax.servlet.ServletInputStream")))
-            .and(isPublic()),
-        packageName + ".HttpServletGetInputStreamAdvice");
-    transformer.applyAdvice(
-        named("getReader")
-            .and(takesNoArguments())
-            .and(returns(named("java.io.BufferedReader")))
-            .and(isPublic()),
-        packageName + ".HttpServletGetReaderAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getInputStream")
+                        .and(takesNoArguments())
+                        .and(returns(named("javax.servlet.ServletInputStream")))
+                        .and(isPublic()),
+                packageName + ".HttpServletGetInputStreamAdvice");
+        transformer.applyAdvice(
+                named("getReader")
+                        .and(takesNoArguments())
+                        .and(returns(named("java.io.BufferedReader")))
+                        .and(isPublic()),
+                packageName + ".HttpServletGetReaderAdvice");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.servlet.BufferedReaderWrapper",
-      "datadog.trace.instrumentation.servlet.AbstractServletInputStreamWrapper",
-      "datadog.trace.instrumentation.servlet3.Servlet31InputStreamWrapper"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.servlet.BufferedReaderWrapper",
+            "datadog.trace.instrumentation.servlet.AbstractServletInputStreamWrapper",
+            "datadog.trace.instrumentation.servlet3.Servlet31InputStreamWrapper"
+        };
+    }
 
-  @Override
-  public int order() {
-    // apply this instrumentation after the regular servlet one.
-    return 1;
-  }
+    @Override
+    public int order() {
+        // apply this instrumentation after the regular servlet one.
+        return 1;
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Advice.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Advice.java
index d4799961504..7dcd31b1e16 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Advice.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Advice.java
@@ -29,184 +29,180 @@
 
 public class Servlet3Advice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-  public static boolean onEnter(
-      @Advice.Argument(value = 0, readOnly = false) ServletRequest request,
-      @Advice.Argument(value = 1, readOnly = false) ServletResponse response,
-      @Advice.Local("isDispatch") boolean isDispatch,
-      @Advice.Local("finishSpan") boolean finishSpan,
-      @Advice.Local("contextScope") ContextScope scope,
-      @Advice.Local("rumServletWrapper") RumControllableResponse rumServletWrapper) {
-    final boolean invalidRequest =
-        !(request instanceof HttpServletRequest) || !(response instanceof HttpServletResponse);
-    if (invalidRequest) {
-      return false;
-    }
+    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+    public static boolean onEnter(
+            @Advice.Argument(value = 0, readOnly = false) ServletRequest request,
+            @Advice.Argument(value = 1, readOnly = false) ServletResponse response,
+            @Advice.Local("isDispatch") boolean isDispatch,
+            @Advice.Local("finishSpan") boolean finishSpan,
+            @Advice.Local("contextScope") ContextScope scope,
+            @Advice.Local("rumServletWrapper") RumControllableResponse rumServletWrapper) {
+        final boolean invalidRequest =
+                !(request instanceof HttpServletRequest) || !(response instanceof HttpServletResponse);
+        if (invalidRequest) {
+            return false;
+        }
 
-    final HttpServletRequest httpServletRequest = (HttpServletRequest) request;
-    HttpServletResponse httpServletResponse = (HttpServletResponse) response;
-
-    if (RumInjector.get().isEnabled()) {
-      final Object maybeRumWrapper = httpServletRequest.getAttribute(DD_RUM_INJECTED);
-      if (maybeRumWrapper instanceof RumControllableResponse) {
-        rumServletWrapper = (RumControllableResponse) maybeRumWrapper;
-      } else {
-        rumServletWrapper =
-            new RumHttpServletResponseWrapper(httpServletRequest, (HttpServletResponse) response);
-        httpServletRequest.setAttribute(DD_RUM_INJECTED, rumServletWrapper);
-        response = (ServletResponse) rumServletWrapper;
-        request =
-            new RumHttpServletRequestWrapper(
-                httpServletRequest, (HttpServletResponse) rumServletWrapper);
-      }
-    }
+        final HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+        HttpServletResponse httpServletResponse = (HttpServletResponse) response;
+
+        if (RumInjector.get().isEnabled()) {
+            final Object maybeRumWrapper = httpServletRequest.getAttribute(DD_RUM_INJECTED);
+            if (maybeRumWrapper instanceof RumControllableResponse) {
+                rumServletWrapper = (RumControllableResponse) maybeRumWrapper;
+            } else {
+                rumServletWrapper =
+                        new RumHttpServletResponseWrapper(httpServletRequest, (HttpServletResponse) response);
+                httpServletRequest.setAttribute(DD_RUM_INJECTED, rumServletWrapper);
+                response = (ServletResponse) rumServletWrapper;
+                request = new RumHttpServletRequestWrapper(httpServletRequest, (HttpServletResponse) rumServletWrapper);
+            }
+        }
 
-    Object contextAttr = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-
-    Object dispatchSpan = request.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
-    if (dispatchSpan instanceof AgentSpan) {
-      request.removeAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
-      isDispatch = true; // local default is false;
-      // Activate the dispatch span as the request span so it can be finished with the request.
-      // We don't want to create a new servlet.request span since this is internal processing.
-      AgentSpan castDispatchSpan = (AgentSpan) dispatchSpan;
-      // the dispatch span was already activated in Jetty's HandleAdvice. We let it finish the span
-      // to avoid trying to finish twice
-      finishSpan = activeSpan() != dispatchSpan;
-      // If we have an existing context, create a new context with the dispatch span
-      // Otherwise just attach the dispatch span
-      if (contextAttr instanceof Context) {
-        Context contextWithDispatchSpan = ((Context) contextAttr).with(castDispatchSpan);
-        scope = contextWithDispatchSpan.attach();
-      } else {
-        scope = castDispatchSpan.attach();
-      }
-      return false;
-    }
+        Object contextAttr = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+
+        Object dispatchSpan = request.getAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
+        if (dispatchSpan instanceof AgentSpan) {
+            request.removeAttribute(DD_DISPATCH_SPAN_ATTRIBUTE);
+            isDispatch = true; // local default is false;
+            // Activate the dispatch span as the request span so it can be finished with the request.
+            // We don't want to create a new servlet.request span since this is internal processing.
+            AgentSpan castDispatchSpan = (AgentSpan) dispatchSpan;
+            // the dispatch span was already activated in Jetty's HandleAdvice. We let it finish the span
+            // to avoid trying to finish twice
+            finishSpan = activeSpan() != dispatchSpan;
+            // If we have an existing context, create a new context with the dispatch span
+            // Otherwise just attach the dispatch span
+            if (contextAttr instanceof Context) {
+                Context contextWithDispatchSpan = ((Context) contextAttr).with(castDispatchSpan);
+                scope = contextWithDispatchSpan.attach();
+            } else {
+                scope = castDispatchSpan.attach();
+            }
+            return false;
+        }
 
-    finishSpan = true;
+        finishSpan = true;
 
-    if (contextAttr instanceof Context) {
-      final Context existingContext = (Context) contextAttr;
-      final AgentSpan span = spanFromContext(existingContext);
-      if (span != null) {
-        ClassloaderConfigurationOverrides.maybeEnrichSpan(span);
-        // Tracing might already be applied by other instrumentation,
-        // the FilterChain or a parent request (forward/include).
-        return false;
-      }
-    }
+        if (contextAttr instanceof Context) {
+            final Context existingContext = (Context) contextAttr;
+            final AgentSpan span = spanFromContext(existingContext);
+            if (span != null) {
+                ClassloaderConfigurationOverrides.maybeEnrichSpan(span);
+                // Tracing might already be applied by other instrumentation,
+                // the FilterChain or a parent request (forward/include).
+                return false;
+            }
+        }
 
-    final Context parentContext = DECORATE.extract(httpServletRequest);
-    final Context context = DECORATE.startSpan(httpServletRequest, parentContext);
-    scope = context.attach();
-
-    final AgentSpan span = spanFromContext(context);
-    DECORATE.afterStart(span);
-    DECORATE.onRequest(span, httpServletRequest, httpServletRequest, parentContext);
-
-    httpServletRequest.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
-    httpServletRequest.setAttribute(
-        CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
-    httpServletRequest.setAttribute(
-        CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
-
-    Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
-    if (rba != null) {
-      ServletBlockingHelper.commitBlockingResponse(
-          span.getRequestContext().getTraceSegment(), httpServletRequest, httpServletResponse, rba);
-      span.getRequestContext().getTraceSegment().effectivelyBlocked();
-      return true; // skip method body
-    }
+        final Context parentContext = DECORATE.extract(httpServletRequest);
+        final Context context = DECORATE.startSpan(httpServletRequest, parentContext);
+        scope = context.attach();
 
-    return false;
-  }
-
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void stopSpan(
-      @Advice.Argument(0) final ServletRequest request,
-      @Advice.Argument(1) final ServletResponse response,
-      @Advice.Local("contextScope") final ContextScope scope,
-      @Advice.Local("isDispatch") boolean isDispatch,
-      @Advice.Local("finishSpan") boolean finishSpan,
-      @Advice.Local("rumServletWrapper") RumControllableResponse rumServletWrapper,
-      @Advice.Thrown final Throwable throwable) {
-    if (rumServletWrapper != null) {
-      rumServletWrapper.commit();
-    }
-    // Set user.principal regardless of who created this span.
-    final Object contextAttr = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-    if (Config.get().isServletPrincipalEnabled()
-        && contextAttr instanceof Context
-        && request instanceof HttpServletRequest) {
-      final Context context = (Context) contextAttr;
-      final AgentSpan span = spanFromContext(context);
-      if (span != null) {
-        final Principal principal = ((HttpServletRequest) request).getUserPrincipal();
-        if (principal != null) {
-          span.setTag(DDTags.USER_NAME, principal.getName());
+        final AgentSpan span = spanFromContext(context);
+        DECORATE.afterStart(span);
+        DECORATE.onRequest(span, httpServletRequest, httpServletRequest, parentContext);
+
+        httpServletRequest.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
+        httpServletRequest.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+        httpServletRequest.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+
+        Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
+        if (rba != null) {
+            ServletBlockingHelper.commitBlockingResponse(
+                    span.getRequestContext().getTraceSegment(), httpServletRequest, httpServletResponse, rba);
+            span.getRequestContext().getTraceSegment().effectivelyBlocked();
+            return true; // skip method body
         }
-      }
-    }
 
-    if (scope == null) {
-      return;
+        return false;
     }
 
-    final AgentSpan span = spanFromContext(scope.context());
-    boolean finishSpanManually = false;
-
-    if (request instanceof HttpServletRequest && response instanceof HttpServletResponse) {
-      final HttpServletResponse resp = (HttpServletResponse) response;
-
-      if (DECORATE.safeIsAsyncStarted(request)) {
-        AtomicBoolean activated = new AtomicBoolean();
-        FinishAsyncDispatchListener asyncListener =
-            new FinishAsyncDispatchListener(scope, activated, !isDispatch);
-        // Jetty doesn't always call the listener, if the request ends before
-        request.setAttribute(DD_FIN_DISP_LIST_SPAN_ATTRIBUTE, asyncListener);
-        try {
-          request.getAsyncContext().addListener(asyncListener);
-        } catch (final IllegalStateException | AbstractMethodError ignored) {
-          // org.eclipse.jetty.server.Request may throw an exception here if request became
-          // finished after check above. We just ignore that exception and move on.
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void stopSpan(
+            @Advice.Argument(0) final ServletRequest request,
+            @Advice.Argument(1) final ServletResponse response,
+            @Advice.Local("contextScope") final ContextScope scope,
+            @Advice.Local("isDispatch") boolean isDispatch,
+            @Advice.Local("finishSpan") boolean finishSpan,
+            @Advice.Local("rumServletWrapper") RumControllableResponse rumServletWrapper,
+            @Advice.Thrown final Throwable throwable) {
+        if (rumServletWrapper != null) {
+            rumServletWrapper.commit();
         }
-        if (!DECORATE.safeIsAsyncStarted(request) && activated.compareAndSet(false, true)) {
-          if (!isDispatch) {
-            DECORATE.onResponse(span, resp);
-          }
-          if (finishSpan) {
-            DECORATE.beforeFinish(scope.context());
-            finishSpanManually = true;
-          }
+        // Set user.principal regardless of who created this span.
+        final Object contextAttr = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+        if (Config.get().isServletPrincipalEnabled()
+                && contextAttr instanceof Context
+                && request instanceof HttpServletRequest) {
+            final Context context = (Context) contextAttr;
+            final AgentSpan span = spanFromContext(context);
+            if (span != null) {
+                final Principal principal = ((HttpServletRequest) request).getUserPrincipal();
+                if (principal != null) {
+                    span.setTag(DDTags.USER_NAME, principal.getName());
+                }
+            }
+        }
+
+        if (scope == null) {
+            return;
         }
-      } else { // not async
-        // Finish the span manually since finishSpanOnClose was false
-        if (throwable == null) {
-          if (!isDispatch) {
-            DECORATE.onResponse(span, resp);
-          }
-        } else { // has thrown
-          if (!isDispatch) {
-            // We don't want to put the status on the dispatch span.
-            // (It might be wrong/different from the server span with an exception handler.)
-            DECORATE.onResponse(span, resp);
-            if (resp.getStatus() == HttpServletResponse.SC_OK) {
-              // exception is thrown in filter chain, but status code is likely incorrect
-              span.setHttpStatusCode(500);
+
+        final AgentSpan span = spanFromContext(scope.context());
+        boolean finishSpanManually = false;
+
+        if (request instanceof HttpServletRequest && response instanceof HttpServletResponse) {
+            final HttpServletResponse resp = (HttpServletResponse) response;
+
+            if (DECORATE.safeIsAsyncStarted(request)) {
+                AtomicBoolean activated = new AtomicBoolean();
+                FinishAsyncDispatchListener asyncListener =
+                        new FinishAsyncDispatchListener(scope, activated, !isDispatch);
+                // Jetty doesn't always call the listener, if the request ends before
+                request.setAttribute(DD_FIN_DISP_LIST_SPAN_ATTRIBUTE, asyncListener);
+                try {
+                    request.getAsyncContext().addListener(asyncListener);
+                } catch (final IllegalStateException | AbstractMethodError ignored) {
+                    // org.eclipse.jetty.server.Request may throw an exception here if request became
+                    // finished after check above. We just ignore that exception and move on.
+                }
+                if (!DECORATE.safeIsAsyncStarted(request) && activated.compareAndSet(false, true)) {
+                    if (!isDispatch) {
+                        DECORATE.onResponse(span, resp);
+                    }
+                    if (finishSpan) {
+                        DECORATE.beforeFinish(scope.context());
+                        finishSpanManually = true;
+                    }
+                }
+            } else { // not async
+                // Finish the span manually since finishSpanOnClose was false
+                if (throwable == null) {
+                    if (!isDispatch) {
+                        DECORATE.onResponse(span, resp);
+                    }
+                } else { // has thrown
+                    if (!isDispatch) {
+                        // We don't want to put the status on the dispatch span.
+                        // (It might be wrong/different from the server span with an exception handler.)
+                        DECORATE.onResponse(span, resp);
+                        if (resp.getStatus() == HttpServletResponse.SC_OK) {
+                            // exception is thrown in filter chain, but status code is likely incorrect
+                            span.setHttpStatusCode(500);
+                        }
+                    }
+                    DECORATE.onError(span, throwable);
+                }
+                if (finishSpan) {
+                    DECORATE.beforeFinish(scope.context());
+                    finishSpanManually = true;
+                }
             }
-          }
-          DECORATE.onError(span, throwable);
         }
-        if (finishSpan) {
-          DECORATE.beforeFinish(scope.context());
-          finishSpanManually = true;
+        scope.close();
+        if (finishSpanManually) {
+            span.finish(); // Finish the span manually since finishSpanOnClose was false
         }
-      }
-    }
-    scope.close();
-    if (finishSpanManually) {
-      span.finish(); // Finish the span manually since finishSpanOnClose was false
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Decorator.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Decorator.java
index 80d00febe97..41dfedf2302 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Decorator.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Decorator.java
@@ -18,130 +18,124 @@
 import org.slf4j.LoggerFactory;
 
 public class Servlet3Decorator
-    extends HttpServerDecorator<
-        HttpServletRequest, HttpServletRequest, HttpServletResponse, HttpServletRequest> {
-  public static final CharSequence JAVA_WEB_SERVLET = UTF8BytesString.create("java-web-servlet");
-
-  public static final Servlet3Decorator DECORATE = new Servlet3Decorator();
-  public static final CharSequence SERVLET_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-  public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
-  public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
-  private static final Logger LOGGER = LoggerFactory.getLogger(Servlet3Decorator.class);
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"servlet", "servlet-3"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JAVA_WEB_SERVLET;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpServletRequest> getter() {
-    return HttpServletExtractAdapter.Request.GETTER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpServletResponse> responseGetter() {
-    return HttpServletExtractAdapter.Response.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return SERVLET_REQUEST;
-  }
-
-  @Override
-  protected String method(final HttpServletRequest httpServletRequest) {
-    return httpServletRequest.getMethod();
-  }
-
-  @Override
-  protected URIDataAdapter url(final HttpServletRequest httpServletRequest) {
-    return new ServletRequestURIAdapter(httpServletRequest);
-  }
-
-  @Override
-  protected String peerHostIP(final HttpServletRequest httpServletRequest) {
-    return httpServletRequest.getRemoteAddr();
-  }
-
-  @Override
-  protected int peerPort(final HttpServletRequest httpServletRequest) {
-    try {
-      return httpServletRequest.getRemotePort();
-    } catch (AbstractMethodError e) {
-      LOGGER.debug(
-          EXCLUDE_TELEMETRY,
-          "Method not implemented when trying to get the request remote port",
-          e);
-      return 0; // 0 will be handled as `no port` by the caller
+        extends HttpServerDecorator<HttpServletRequest, HttpServletRequest, HttpServletResponse, HttpServletRequest> {
+    public static final CharSequence JAVA_WEB_SERVLET = UTF8BytesString.create("java-web-servlet");
+
+    public static final Servlet3Decorator DECORATE = new Servlet3Decorator();
+    public static final CharSequence SERVLET_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+    public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
+    public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
+    private static final Logger LOGGER = LoggerFactory.getLogger(Servlet3Decorator.class);
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"servlet", "servlet-3"};
     }
-  }
-
-  @Override
-  protected int status(final HttpServletResponse httpServletResponse) {
-    return httpServletResponse.getStatus();
-  }
-
-  @Override
-  protected String requestedSessionId(final HttpServletRequest request) {
-    return request.getRequestedSessionId();
-  }
-
-  @Override
-  protected String getRequestHeader(final HttpServletRequest request, String key) {
-    return request.getHeader(key);
-  }
-
-  @Override
-  protected void doOnRequest(
-      final AgentSpan span,
-      final HttpServletRequest connection,
-      final HttpServletRequest request,
-      final Context parentContext) {
-    assert span != null;
-    ClassloaderConfigurationOverrides.maybeEnrichSpan(span);
-    if (request != null) {
-      String contextPath = request.getContextPath();
-      String servletPath = request.getServletPath();
-
-      span.setTag("servlet.context", contextPath);
-      span.setTag("servlet.path", servletPath);
-
-      // Used by AsyncContextInstrumentation because the context path may be reset
-      // (eg by jetty) by the time the async context is dispatched.
-      request.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, contextPath);
-      request.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, servletPath);
+
+    @Override
+    protected CharSequence component() {
+        return JAVA_WEB_SERVLET;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpServletRequest> getter() {
+        return HttpServletExtractAdapter.Request.GETTER;
     }
-    super.doOnRequest(span, connection, request, parentContext);
-  }
-
-  @Override
-  protected void doOnError(
-      @Nonnull final AgentSpan span, @Nonnull final Throwable throwable, byte errorPriority) {
-    if (throwable instanceof ServletException && throwable.getCause() != null) {
-      super.doOnError(span, throwable.getCause(), errorPriority);
-    } else {
-      super.doOnError(span, throwable, errorPriority);
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpServletResponse> responseGetter() {
+        return HttpServletExtractAdapter.Response.GETTER;
     }
-  }
-
-  /**
-   * Safely calls ServletRequest#isAsyncStarted. Some 2.x wrappers might be dangling in the 3.x
-   * classpath and produce an AbstractMethodError
-   *
-   * @param servletRequest the servlet request.
-   * @return the real call result or false when the method does not exist in the provided object.
-   */
-  public boolean safeIsAsyncStarted(final ServletRequest servletRequest) {
-    try {
-      return servletRequest.isAsyncStarted();
-    } catch (AbstractMethodError ignored) {
-      return false;
+
+    @Override
+    public CharSequence spanName() {
+        return SERVLET_REQUEST;
+    }
+
+    @Override
+    protected String method(final HttpServletRequest httpServletRequest) {
+        return httpServletRequest.getMethod();
+    }
+
+    @Override
+    protected URIDataAdapter url(final HttpServletRequest httpServletRequest) {
+        return new ServletRequestURIAdapter(httpServletRequest);
+    }
+
+    @Override
+    protected String peerHostIP(final HttpServletRequest httpServletRequest) {
+        return httpServletRequest.getRemoteAddr();
+    }
+
+    @Override
+    protected int peerPort(final HttpServletRequest httpServletRequest) {
+        try {
+            return httpServletRequest.getRemotePort();
+        } catch (AbstractMethodError e) {
+            LOGGER.debug(EXCLUDE_TELEMETRY, "Method not implemented when trying to get the request remote port", e);
+            return 0; // 0 will be handled as `no port` by the caller
+        }
+    }
+
+    @Override
+    protected int status(final HttpServletResponse httpServletResponse) {
+        return httpServletResponse.getStatus();
+    }
+
+    @Override
+    protected String requestedSessionId(final HttpServletRequest request) {
+        return request.getRequestedSessionId();
+    }
+
+    @Override
+    protected String getRequestHeader(final HttpServletRequest request, String key) {
+        return request.getHeader(key);
+    }
+
+    @Override
+    protected void doOnRequest(
+            final AgentSpan span,
+            final HttpServletRequest connection,
+            final HttpServletRequest request,
+            final Context parentContext) {
+        assert span != null;
+        ClassloaderConfigurationOverrides.maybeEnrichSpan(span);
+        if (request != null) {
+            String contextPath = request.getContextPath();
+            String servletPath = request.getServletPath();
+
+            span.setTag("servlet.context", contextPath);
+            span.setTag("servlet.path", servletPath);
+
+            // Used by AsyncContextInstrumentation because the context path may be reset
+            // (eg by jetty) by the time the async context is dispatched.
+            request.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, contextPath);
+            request.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, servletPath);
+        }
+        super.doOnRequest(span, connection, request, parentContext);
+    }
+
+    @Override
+    protected void doOnError(@Nonnull final AgentSpan span, @Nonnull final Throwable throwable, byte errorPriority) {
+        if (throwable instanceof ServletException && throwable.getCause() != null) {
+            super.doOnError(span, throwable.getCause(), errorPriority);
+        } else {
+            super.doOnError(span, throwable, errorPriority);
+        }
+    }
+
+    /**
+     * Safely calls ServletRequest#isAsyncStarted. Some 2.x wrappers might be dangling in the 3.x
+     * classpath and produce an AbstractMethodError
+     *
+     * @param servletRequest the servlet request.
+     * @return the real call result or false when the method does not exist in the provided object.
+     */
+    public boolean safeIsAsyncStarted(final ServletRequest servletRequest) {
+        try {
+            return servletRequest.isAsyncStarted();
+        } catch (AbstractMethodError ignored) {
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Instrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Instrumentation.java
index 4835d9d2b0b..e099145aa8e 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Instrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Instrumentation.java
@@ -16,61 +16,61 @@
 
 @AutoService(InstrumenterModule.class)
 public final class Servlet3Instrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public Servlet3Instrumentation() {
-    super("servlet", "servlet-3");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public Servlet3Instrumentation() {
+        super("servlet", "servlet-3");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "servlet-3.x";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "servlet-3.x";
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Avoid matching servlet 2 which has its own instrumentation
-    return hasClassNamed("javax.servlet.AsyncEvent");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Avoid matching servlet 2 which has its own instrumentation
+        return hasClassNamed("javax.servlet.AsyncEvent");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.http.HttpServlet";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.http.HttpServlet";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("javax.servlet.http.HttpServlet"))
-        .or(implementsInterface(named("javax.servlet.FilterChain")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("javax.servlet.http.HttpServlet"))
+                .or(implementsInterface(named("javax.servlet.FilterChain")));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".HttpServletExtractAdapter",
-      packageName + ".HttpServletExtractAdapter$Request",
-      packageName + ".HttpServletExtractAdapter$Response",
-      packageName + ".Servlet3Decorator",
-      packageName + ".ServletRequestURIAdapter",
-      packageName + ".FinishAsyncDispatchListener",
-      packageName + ".RumHttpServletRequestWrapper",
-      packageName + ".RumHttpServletResponseWrapper",
-      packageName + ".WrappedServletOutputStream",
-      "datadog.trace.instrumentation.servlet.ServletBlockingHelper",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".HttpServletExtractAdapter",
+            packageName + ".HttpServletExtractAdapter$Request",
+            packageName + ".HttpServletExtractAdapter$Response",
+            packageName + ".Servlet3Decorator",
+            packageName + ".ServletRequestURIAdapter",
+            packageName + ".FinishAsyncDispatchListener",
+            packageName + ".RumHttpServletRequestWrapper",
+            packageName + ".RumHttpServletResponseWrapper",
+            packageName + ".WrappedServletOutputStream",
+            "datadog.trace.instrumentation.servlet.ServletBlockingHelper",
+        };
+    }
 
-  /**
-   * Here we are instrumenting the public method for HttpServlet. This should ensure that this
-   * advice is always called before HttpServletInstrumentation which is instrumenting the protected
-   * method.
-   */
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        namedOneOf("doFilter", "service")
-            .and(takesArgument(0, named("javax.servlet.ServletRequest")))
-            .and(takesArgument(1, named("javax.servlet.ServletResponse")))
-            .and(isPublic()),
-        packageName + ".Servlet3Advice");
-  }
+    /**
+     * Here we are instrumenting the public method for HttpServlet. This should ensure that this
+     * advice is always called before HttpServletInstrumentation which is instrumenting the protected
+     * method.
+     */
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                namedOneOf("doFilter", "service")
+                        .and(takesArgument(0, named("javax.servlet.ServletRequest")))
+                        .and(takesArgument(1, named("javax.servlet.ServletResponse")))
+                        .and(isPublic()),
+                packageName + ".Servlet3Advice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/ServletRequestURIAdapter.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/ServletRequestURIAdapter.java
index 2ece4b4d540..4653fd5abf4 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/ServletRequestURIAdapter.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/ServletRequestURIAdapter.java
@@ -4,39 +4,39 @@
 import javax.servlet.http.HttpServletRequest;
 
 public class ServletRequestURIAdapter extends URIRawDataAdapter {
-  private final HttpServletRequest request;
-
-  public ServletRequestURIAdapter(HttpServletRequest request) {
-    this.request = request;
-  }
-
-  @Override
-  public String scheme() {
-    return request.getScheme();
-  }
-
-  @Override
-  public String host() {
-    return request.getServerName();
-  }
-
-  @Override
-  public int port() {
-    return request.getServerPort();
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return request.getRequestURI();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return request.getQueryString();
-  }
+    private final HttpServletRequest request;
+
+    public ServletRequestURIAdapter(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    @Override
+    public String scheme() {
+        return request.getScheme();
+    }
+
+    @Override
+    public String host() {
+        return request.getServerName();
+    }
+
+    @Override
+    public int port() {
+        return request.getServerPort();
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return request.getRequestURI();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return request.getQueryString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/WrappedServletOutputStream.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/WrappedServletOutputStream.java
index c4b575836ff..0b7b0bed087 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/WrappedServletOutputStream.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/WrappedServletOutputStream.java
@@ -9,93 +9,92 @@
 import javax.servlet.WriteListener;
 
 public class WrappedServletOutputStream extends ServletOutputStream {
-  private final InjectingPipeOutputStream filtered;
-  private final ServletOutputStream delegate;
+    private final InjectingPipeOutputStream filtered;
+    private final ServletOutputStream delegate;
 
-  private static final MethodHandle IS_READY_MH = getMh("isReady");
-  private static final MethodHandle SET_WRITELISTENER_MH = getMh("setWriteListener");
+    private static final MethodHandle IS_READY_MH = getMh("isReady");
+    private static final MethodHandle SET_WRITELISTENER_MH = getMh("setWriteListener");
 
-  private static MethodHandle getMh(final String name) {
-    try {
-      return new MethodHandles(ServletOutputStream.class.getClassLoader())
-          .method(ServletOutputStream.class, name);
-    } catch (Throwable ignored) {
-      return null;
+    private static MethodHandle getMh(final String name) {
+        try {
+            return new MethodHandles(ServletOutputStream.class.getClassLoader())
+                    .method(ServletOutputStream.class, name);
+        } catch (Throwable ignored) {
+            return null;
+        }
     }
-  }
 
-  @SuppressWarnings("unchecked")
-  private static <E extends Throwable> void sneakyThrow(Throwable e) throws E {
-    throw (E) e;
-  }
-
-  public WrappedServletOutputStream(
-      ServletOutputStream delegate,
-      byte[] marker,
-      byte[] contentToInject,
-      Runnable onInjected,
-      LongConsumer onBytesWritten,
-      LongConsumer onInjectionTime) {
-    this.filtered =
-        new InjectingPipeOutputStream(
-            delegate, marker, contentToInject, onInjected, onBytesWritten, onInjectionTime);
-    this.delegate = delegate;
-  }
-
-  @Override
-  public void write(int b) throws IOException {
-    filtered.write(b);
-  }
+    @SuppressWarnings("unchecked")
+    private static <E extends Throwable> void sneakyThrow(Throwable e) throws E {
+        throw (E) e;
+    }
 
-  @Override
-  public void write(byte[] b) throws IOException {
-    filtered.write(b);
-  }
+    public WrappedServletOutputStream(
+            ServletOutputStream delegate,
+            byte[] marker,
+            byte[] contentToInject,
+            Runnable onInjected,
+            LongConsumer onBytesWritten,
+            LongConsumer onInjectionTime) {
+        this.filtered = new InjectingPipeOutputStream(
+                delegate, marker, contentToInject, onInjected, onBytesWritten, onInjectionTime);
+        this.delegate = delegate;
+    }
 
-  @Override
-  public void write(byte[] b, int off, int len) throws IOException {
-    filtered.write(b, off, len);
-  }
+    @Override
+    public void write(int b) throws IOException {
+        filtered.write(b);
+    }
 
-  @Override
-  public void flush() throws IOException {
-    filtered.flush();
-  }
+    @Override
+    public void write(byte[] b) throws IOException {
+        filtered.write(b);
+    }
 
-  @Override
-  public void close() throws IOException {
-    filtered.close();
-  }
+    @Override
+    public void write(byte[] b, int off, int len) throws IOException {
+        filtered.write(b, off, len);
+    }
 
-  public boolean isReady() {
-    if (IS_READY_MH == null) {
-      return false;
+    @Override
+    public void flush() throws IOException {
+        filtered.flush();
     }
-    try {
-      return (boolean) IS_READY_MH.invoke(delegate);
-    } catch (Throwable e) {
-      sneakyThrow(e);
-      // will never return a value but added for the compiler
-      return false;
+
+    @Override
+    public void close() throws IOException {
+        filtered.close();
     }
-  }
 
-  public void setWriteListener(WriteListener writeListener) {
-    if (SET_WRITELISTENER_MH == null) {
-      return;
+    public boolean isReady() {
+        if (IS_READY_MH == null) {
+            return false;
+        }
+        try {
+            return (boolean) IS_READY_MH.invoke(delegate);
+        } catch (Throwable e) {
+            sneakyThrow(e);
+            // will never return a value but added for the compiler
+            return false;
+        }
     }
-    try {
-      SET_WRITELISTENER_MH.invoke(delegate, writeListener);
-    } catch (Throwable e) {
-      sneakyThrow(e);
+
+    public void setWriteListener(WriteListener writeListener) {
+        if (SET_WRITELISTENER_MH == null) {
+            return;
+        }
+        try {
+            SET_WRITELISTENER_MH.invoke(delegate, writeListener);
+        } catch (Throwable e) {
+            sneakyThrow(e);
+        }
     }
-  }
 
-  public void commit() throws IOException {
-    filtered.commit();
-  }
+    public void commit() throws IOException {
+        filtered.commit();
+    }
 
-  public void setFilter(boolean filter) {
-    filtered.setFilter(filter);
-  }
+    public void setFilter(boolean filter) {
+        filtered.setFilter(filter);
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/RequestDispatcherServlet.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/RequestDispatcherServlet.java
index fe42ca8e25d..86dd5de2191 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/RequestDispatcherServlet.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/RequestDispatcherServlet.java
@@ -9,33 +9,32 @@
 import javax.servlet.http.HttpServletResponse;
 
 public class RequestDispatcherServlet {
-  /* There's something about the getRequestDispatcher call that breaks horribly when these classes
-   * are written in groovy.
-   */
+    /* There's something about the getRequestDispatcher call that breaks horribly when these classes
+     * are written in groovy.
+     */
 
-  @WebServlet(asyncSupported = true)
-  public static class Forward extends HttpServlet {
-    @Override
-    protected void service(final HttpServletRequest req, final HttpServletResponse resp)
-        throws ServletException, IOException {
-      final String target = req.getServletPath().replace("/dispatch", "");
-      final ServletContext context = getServletContext();
-      final RequestDispatcher dispatcher = context.getRequestDispatcher(target);
-      dispatcher.forward(req, resp);
+    @WebServlet(asyncSupported = true)
+    public static class Forward extends HttpServlet {
+        @Override
+        protected void service(final HttpServletRequest req, final HttpServletResponse resp)
+                throws ServletException, IOException {
+            final String target = req.getServletPath().replace("/dispatch", "");
+            final ServletContext context = getServletContext();
+            final RequestDispatcher dispatcher = context.getRequestDispatcher(target);
+            dispatcher.forward(req, resp);
+        }
     }
-  }
 
-  @WebServlet(asyncSupported = true)
-  public static class Include extends HttpServlet {
-    @Override
-    protected void service(final HttpServletRequest req, final HttpServletResponse resp)
-        throws ServletException, IOException {
-      final String target = req.getServletPath().replace("/dispatch", "");
-      final ServletContext context = getServletContext();
-      final RequestDispatcher dispatcher = context.getRequestDispatcher(target);
-      dispatcher.include(req, resp);
-      resp.setHeader(
-          HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE());
+    @WebServlet(asyncSupported = true)
+    public static class Include extends HttpServlet {
+        @Override
+        protected void service(final HttpServletRequest req, final HttpServletResponse resp)
+                throws ServletException, IOException {
+            final String target = req.getServletPath().replace("/dispatch", "");
+            final ServletContext context = getServletContext();
+            final RequestDispatcher dispatcher = context.getRequestDispatcher(target);
+            dispatcher.include(req, resp);
+            resp.setHeader(HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/java/foo/bar/smoketest/MockPart.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/java/foo/bar/smoketest/MockPart.java
index 8a9b0a03946..9ff2ed69ed5 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/java/foo/bar/smoketest/MockPart.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/java/foo/bar/smoketest/MockPart.java
@@ -9,74 +9,74 @@
 import javax.servlet.http.Part;
 
 public class MockPart implements Part {
-  private final String name;
-
-  private final Map<String, Collection<String>> headers;
-  private final InputStream inputStream;
-
-  public MockPart(final String name, final Map<String, Collection<String>> headers) {
-    this.name = name;
-    this.headers = headers;
-    this.inputStream = null;
-  }
-
-  public MockPart(final String name, final String headerName, final String... headerValue) {
-    this.name = name;
-    this.headers = new HashMap<>();
-    this.headers.put(headerName, Arrays.asList(headerValue));
-    this.inputStream = null;
-  }
-
-  public MockPart(final String name, final InputStream inputStream) {
-    this.name = name;
-    this.headers = new HashMap<>();
-    this.inputStream = inputStream;
-  }
-
-  @Override
-  public InputStream getInputStream() throws IOException {
-    return inputStream;
-  }
-
-  @Override
-  public String getContentType() {
-    return null;
-  }
-
-  @Override
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public String getSubmittedFileName() {
-    return null;
-  }
-
-  @Override
-  public long getSize() {
-    return 0;
-  }
-
-  @Override
-  public void write(String fileName) throws IOException {}
-
-  @Override
-  public void delete() throws IOException {}
-
-  @Override
-  public String getHeader(String name) {
-    final Collection<String> values = this.headers.get(name);
-    return values == null || values.isEmpty() ? null : values.iterator().next();
-  }
-
-  @Override
-  public Collection<String> getHeaders(String name) {
-    return headers.get(name);
-  }
-
-  @Override
-  public Collection<String> getHeaderNames() {
-    return this.headers.keySet();
-  }
+    private final String name;
+
+    private final Map<String, Collection<String>> headers;
+    private final InputStream inputStream;
+
+    public MockPart(final String name, final Map<String, Collection<String>> headers) {
+        this.name = name;
+        this.headers = headers;
+        this.inputStream = null;
+    }
+
+    public MockPart(final String name, final String headerName, final String... headerValue) {
+        this.name = name;
+        this.headers = new HashMap<>();
+        this.headers.put(headerName, Arrays.asList(headerValue));
+        this.inputStream = null;
+    }
+
+    public MockPart(final String name, final InputStream inputStream) {
+        this.name = name;
+        this.headers = new HashMap<>();
+        this.inputStream = inputStream;
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException {
+        return inputStream;
+    }
+
+    @Override
+    public String getContentType() {
+        return null;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getSubmittedFileName() {
+        return null;
+    }
+
+    @Override
+    public long getSize() {
+        return 0;
+    }
+
+    @Override
+    public void write(String fileName) throws IOException {}
+
+    @Override
+    public void delete() throws IOException {}
+
+    @Override
+    public String getHeader(String name) {
+        final Collection<String> values = this.headers.get(name);
+        return values == null || values.isEmpty() ? null : values.iterator().next();
+    }
+
+    @Override
+    public Collection<String> getHeaders(String name) {
+        return headers.get(name);
+    }
+
+    @Override
+    public Collection<String> getHeaderNames() {
+        return this.headers.keySet();
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/ServletRequestSetter.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/ServletRequestSetter.java
index 9a18009c6e9..685695cabdd 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/ServletRequestSetter.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/ServletRequestSetter.java
@@ -7,10 +7,10 @@
 /** Inject into request attributes since the request headers can't be modified. */
 @ParametersAreNonnullByDefault
 public class ServletRequestSetter implements CarrierSetter<ServletRequest> {
-  public static final ServletRequestSetter SETTER = new ServletRequestSetter();
+    public static final ServletRequestSetter SETTER = new ServletRequestSetter();
 
-  @Override
-  public void set(final ServletRequest carrier, final String key, final String value) {
-    carrier.setAttribute(key, value);
-  }
+    @Override
+    public void set(final ServletRequest carrier, final String key, final String value) {
+        carrier.setAttribute(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/SpanNameCache.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/SpanNameCache.java
index 0c2e1d0676a..5ac03255a9f 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/SpanNameCache.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/SpanNameCache.java
@@ -6,8 +6,6 @@
 import java.util.function.Function;
 
 public final class SpanNameCache {
-  public static final DDCache<CharSequence, CharSequence> SPAN_NAME_CACHE =
-      DDCaches.newUnboundedCache(16);
-  public static final Function<CharSequence, CharSequence> SERVLET_PREFIX =
-      new Functions.Prefix("servlet.");
+    public static final DDCache<CharSequence, CharSequence> SPAN_NAME_CACHE = DDCaches.newUnboundedCache(16);
+    public static final Function<CharSequence, CharSequence> SERVLET_PREFIX = new Functions.Prefix("servlet.");
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java
index 36838980c03..57e710541e1 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java
@@ -13,43 +13,42 @@
 import javax.servlet.ServletException;
 
 public class RequestDispatcherDecorator extends BaseDecorator {
-  public static final RequestDispatcherDecorator DECORATE = new RequestDispatcherDecorator();
-  public static final CharSequence JAVA_WEB_SERVLET_DISPATCHER =
-      UTF8BytesString.create("java-web-servlet-dispatcher");
-  public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
-  public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"servlet", "servlet-dispatcher"};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return JAVA_WEB_SERVLET_DISPATCHER;
-  }
-
-  @Override
-  protected void doOnError(
-      @Nonnull final AgentSpan span, @Nonnull final Throwable throwable, byte errorPriority) {
-    if (throwable instanceof ServletException && throwable.getCause() != null) {
-      super.doOnError(span, throwable.getCause(), errorPriority);
-    } else {
-      super.doOnError(span, throwable, errorPriority);
+    public static final RequestDispatcherDecorator DECORATE = new RequestDispatcherDecorator();
+    public static final CharSequence JAVA_WEB_SERVLET_DISPATCHER =
+            UTF8BytesString.create("java-web-servlet-dispatcher");
+    public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
+    public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"servlet", "servlet-dispatcher"};
     }
-  }
 
-  public <C> void injectContext(Context context, final C request, CarrierSetter<C> setter) {
-    // Add additional default DSM context for HTTP clients if missing but DSM is enabled
-    if (traceConfig().isDataStreamsEnabled()) {
-      context = context.with(DataStreamsContext.forHttpClient());
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return JAVA_WEB_SERVLET_DISPATCHER;
+    }
+
+    @Override
+    protected void doOnError(@Nonnull final AgentSpan span, @Nonnull final Throwable throwable, byte errorPriority) {
+        if (throwable instanceof ServletException && throwable.getCause() != null) {
+            super.doOnError(span, throwable.getCause(), errorPriority);
+        } else {
+            super.doOnError(span, throwable, errorPriority);
+        }
+    }
+
+    public <C> void injectContext(Context context, final C request, CarrierSetter<C> setter) {
+        // Add additional default DSM context for HTTP clients if missing but DSM is enabled
+        if (traceConfig().isDataStreamsEnabled()) {
+            context = context.with(DataStreamsContext.forHttpClient());
+        }
+        // Inject context into carrier
+        defaultPropagator().inject(context, request, setter);
     }
-    // Inject context into carrier
-    defaultPropagator().inject(context, request, setter);
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java
index ff4a5ac7ae2..470e0681bc7 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java
@@ -41,122 +41,121 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RequestDispatcherInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public RequestDispatcherInstrumentation() {
-    super("servlet", "servlet-dispatcher");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.RequestDispatcher";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("javax.servlet.RequestDispatcher", String.class.getName());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        // error is Jetty's method that doesn't delegate to forward or include
-        namedOneOf("forward", "include", "error")
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("javax.servlet.ServletRequest")))
-            .and(takesArgument(1, named("javax.servlet.ServletResponse")))
-            .and(isPublic()),
-        getClass().getName() + "$RequestDispatcherAdvice");
-  }
-
-  public static class RequestDispatcherAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope start(
-        @Advice.Origin("#m") final String method,
-        @Advice.This final RequestDispatcher dispatcher,
-        @Advice.Local("_requestContext") Object requestContext,
-        @Advice.Argument(0) final ServletRequest request) {
-      final AgentSpan parentSpan = activeSpan();
-
-      final Object contextAttr = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      final AgentSpan servletSpan =
-          contextAttr instanceof Context ? spanFromContext((Context) contextAttr) : null;
-
-      if (parentSpan == null && servletSpan == null) {
-        // Don't want to generate a new top-level span
-        return null;
-      }
-
-      final int depth = CallDepthThreadLocalMap.incrementCallDepth(RequestDispatcher.class);
-      if (depth > 0) {
-        return null;
-      }
-      final AgentSpanContext parent;
-      if (servletSpan == null || (parentSpan != null && servletSpan.isSameTrace(parentSpan))) {
-        // Use the parentSpan if the servletSpan is null or part of the same trace.
-        parent = parentSpan.spanContext();
-      } else {
-        // parentSpan is part of a different trace, so lets ignore it.
-        // This can happen with the way Tomcat does error handling.
-        parent = servletSpan.spanContext();
-      }
-
-      final AgentSpan span =
-          startSpan(
-              JAVA_WEB_SERVLET_DISPATCHER.toString(),
-              SPAN_NAME_CACHE.computeIfAbsent(method, SERVLET_PREFIX),
-              parent);
-      DECORATE.afterStart(span);
-      span.setTag(SERVLET_CONTEXT, request.getAttribute(DD_CONTEXT_PATH_ATTRIBUTE));
-      span.setTag(SERVLET_PATH, request.getAttribute(DD_SERVLET_PATH_ATTRIBUTE));
-
-      final String target =
-          InstrumentationContext.get(RequestDispatcher.class, String.class).get(dispatcher);
-      span.setResourceName(target);
-      span.setSpanType(InternalSpanTypes.HTTP_SERVER);
-
-      // In case we lose context, inject trace into to the request.
-      DECORATE.injectContext(span, request, SETTER);
-
-      // temporarily replace from request to avoid spring resource name bubbling up:
-      requestContext = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-
-      final ContextScope scope = span.attachWithContext();
-      // Set the context after activation so we have the proper Context object
-      request.setAttribute(DD_CONTEXT_ATTRIBUTE, scope.context());
-
-      return scope;
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public RequestDispatcherInstrumentation() {
+        super("servlet", "servlet-dispatcher");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stop(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Local("_requestContext") final Object requestContext,
-        @Advice.Argument(0) final ServletRequest request,
-        @Advice.Argument(1) final ServletResponse response,
-        @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-
-      try {
-        if (requestContext != null) {
-          request.setAttribute(DD_CONTEXT_ATTRIBUTE, requestContext);
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.RequestDispatcher";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("javax.servlet.RequestDispatcher", String.class.getName());
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                // error is Jetty's method that doesn't delegate to forward or include
+                namedOneOf("forward", "include", "error")
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("javax.servlet.ServletRequest")))
+                        .and(takesArgument(1, named("javax.servlet.ServletResponse")))
+                        .and(isPublic()),
+                getClass().getName() + "$RequestDispatcherAdvice");
+    }
+
+    public static class RequestDispatcherAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope start(
+                @Advice.Origin("#m") final String method,
+                @Advice.This final RequestDispatcher dispatcher,
+                @Advice.Local("_requestContext") Object requestContext,
+                @Advice.Argument(0) final ServletRequest request) {
+            final AgentSpan parentSpan = activeSpan();
+
+            final Object contextAttr = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            final AgentSpan servletSpan =
+                    contextAttr instanceof Context ? spanFromContext((Context) contextAttr) : null;
+
+            if (parentSpan == null && servletSpan == null) {
+                // Don't want to generate a new top-level span
+                return null;
+            }
+
+            final int depth = CallDepthThreadLocalMap.incrementCallDepth(RequestDispatcher.class);
+            if (depth > 0) {
+                return null;
+            }
+            final AgentSpanContext parent;
+            if (servletSpan == null || (parentSpan != null && servletSpan.isSameTrace(parentSpan))) {
+                // Use the parentSpan if the servletSpan is null or part of the same trace.
+                parent = parentSpan.spanContext();
+            } else {
+                // parentSpan is part of a different trace, so lets ignore it.
+                // This can happen with the way Tomcat does error handling.
+                parent = servletSpan.spanContext();
+            }
+
+            final AgentSpan span = startSpan(
+                    JAVA_WEB_SERVLET_DISPATCHER.toString(),
+                    SPAN_NAME_CACHE.computeIfAbsent(method, SERVLET_PREFIX),
+                    parent);
+            DECORATE.afterStart(span);
+            span.setTag(SERVLET_CONTEXT, request.getAttribute(DD_CONTEXT_PATH_ATTRIBUTE));
+            span.setTag(SERVLET_PATH, request.getAttribute(DD_SERVLET_PATH_ATTRIBUTE));
+
+            final String target = InstrumentationContext.get(RequestDispatcher.class, String.class)
+                    .get(dispatcher);
+            span.setResourceName(target);
+            span.setSpanType(InternalSpanTypes.HTTP_SERVER);
+
+            // In case we lose context, inject trace into to the request.
+            DECORATE.injectContext(span, request, SETTER);
+
+            // temporarily replace from request to avoid spring resource name bubbling up:
+            requestContext = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+
+            final ContextScope scope = span.attachWithContext();
+            // Set the context after activation so we have the proper Context object
+            request.setAttribute(DD_CONTEXT_ATTRIBUTE, scope.context());
+
+            return scope;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stop(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Local("_requestContext") final Object requestContext,
+                @Advice.Argument(0) final ServletRequest request,
+                @Advice.Argument(1) final ServletResponse response,
+                @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+
+            try {
+                if (requestContext != null) {
+                    request.setAttribute(DD_CONTEXT_ATTRIBUTE, requestContext);
+                }
+            } finally {
+                CallDepthThreadLocalMap.reset(RequestDispatcher.class);
+            }
+
+            final AgentSpan span = spanFromContext(scope.context());
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(scope.context());
+            scope.close();
+            span.finish();
         }
-      } finally {
-        CallDepthThreadLocalMap.reset(RequestDispatcher.class);
-      }
-
-      final AgentSpan span = spanFromContext(scope.context());
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(scope.context());
-      scope.close();
-      span.finish();
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java
index b732436003a..b40bc0a3282 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java
@@ -19,43 +19,42 @@
 
 @AutoService(InstrumenterModule.class)
 public final class ServletContextInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public ServletContextInstrumentation() {
-    super("servlet", "servlet-dispatcher");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.ServletContext";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("javax.servlet.RequestDispatcher", String.class.getName());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        returns(named("javax.servlet.RequestDispatcher"))
-            .and(takesArgument(0, String.class))
-            // javax.servlet.ServletContext.getRequestDispatcher
-            // javax.servlet.ServletContext.getNamedDispatcher
-            .and(isPublic()),
-        ServletContextInstrumentation.class.getName() + "$RequestDispatcherTargetAdvice");
-  }
-
-  public static class RequestDispatcherTargetAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void saveTarget(
-        @Advice.Argument(0) final String target,
-        @Advice.Return final RequestDispatcher dispatcher) {
-      InstrumentationContext.get(RequestDispatcher.class, String.class).put(dispatcher, target);
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public ServletContextInstrumentation() {
+        super("servlet", "servlet-dispatcher");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.ServletContext";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("javax.servlet.RequestDispatcher", String.class.getName());
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                returns(named("javax.servlet.RequestDispatcher"))
+                        .and(takesArgument(0, String.class))
+                        // javax.servlet.ServletContext.getRequestDispatcher
+                        // javax.servlet.ServletContext.getNamedDispatcher
+                        .and(isPublic()),
+                ServletContextInstrumentation.class.getName() + "$RequestDispatcherTargetAdvice");
+    }
+
+    public static class RequestDispatcherTargetAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void saveTarget(
+                @Advice.Argument(0) final String target, @Advice.Return final RequestDispatcher dispatcher) {
+            InstrumentationContext.get(RequestDispatcher.class, String.class).put(dispatcher, target);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterDecorator.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterDecorator.java
index 2f5a561a82b..e5acb6ee713 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterDecorator.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterDecorator.java
@@ -4,23 +4,22 @@
 import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;
 
 public class FilterDecorator extends BaseDecorator {
-  public static final CharSequence JAVA_WEB_SERVLET_FILTER =
-      UTF8BytesString.create("java-web-servlet-filter");
-  public static final CharSequence SERVLET_FILTER = UTF8BytesString.create("servlet.filter");
-  public static final FilterDecorator DECORATE = new FilterDecorator();
+    public static final CharSequence JAVA_WEB_SERVLET_FILTER = UTF8BytesString.create("java-web-servlet-filter");
+    public static final CharSequence SERVLET_FILTER = UTF8BytesString.create("servlet.filter");
+    public static final FilterDecorator DECORATE = new FilterDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"servlet-filter"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"servlet-filter"};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return JAVA_WEB_SERVLET_FILTER;
-  }
+    @Override
+    protected CharSequence component() {
+        return JAVA_WEB_SERVLET_FILTER;
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java
index 84c758e4f1d..bd03cf57fc8 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java
@@ -24,64 +24,63 @@
 
 @AutoService(InstrumenterModule.class)
 public final class FilterInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public FilterInstrumentation() {
-    super("servlet-filter");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public FilterInstrumentation() {
+        super("servlet-filter");
+    }
 
-  @Override
-  public boolean defaultEnabled() {
-    return false;
-  }
+    @Override
+    public boolean defaultEnabled() {
+        return false;
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.Filter";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.Filter";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("doFilter")
-            .and(takesArgument(0, named("javax.servlet.ServletRequest")))
-            .and(takesArgument(1, named("javax.servlet.ServletResponse")))
-            .and(isPublic()),
-        getClass().getName() + "$FilterAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("doFilter")
+                        .and(takesArgument(0, named("javax.servlet.ServletRequest")))
+                        .and(takesArgument(1, named("javax.servlet.ServletResponse")))
+                        .and(isPublic()),
+                getClass().getName() + "$FilterAdvice");
+    }
 
-  public static class FilterAdvice {
+    public static class FilterAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope start(@Advice.This final Filter filter) {
-      if (activeSpan() == null) {
-        // Don't want to generate a new top-level span
-        return null;
-      }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope start(@Advice.This final Filter filter) {
+            if (activeSpan() == null) {
+                // Don't want to generate a new top-level span
+                return null;
+            }
 
-      final AgentSpan span = startSpan(JAVA_WEB_SERVLET_FILTER.toString(), SERVLET_FILTER);
-      DECORATE.afterStart(span);
+            final AgentSpan span = startSpan(JAVA_WEB_SERVLET_FILTER.toString(), SERVLET_FILTER);
+            DECORATE.afterStart(span);
 
-      // Here we use "this" instead of "the method target" to distinguish abstract filter instances.
-      span.setResourceName(DECORATE.spanNameForMethod(filter.getClass(), "doFilter"));
+            // Here we use "this" instead of "the method target" to distinguish abstract filter instances.
+            span.setResourceName(DECORATE.spanNameForMethod(filter.getClass(), "doFilter"));
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      DECORATE.onError(scope, throwable);
-      DECORATE.beforeFinish(scope);
-      scope.close();
-      spanFromScope(scope).finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            DECORATE.onError(scope, throwable);
+            DECORATE.beforeFinish(scope);
+            scope.close();
+            spanFromScope(scope).finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/CookieInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/CookieInstrumentation.java
index ea2334882bc..f70f6a3e4c7 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/CookieInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/CookieInstrumentation.java
@@ -21,73 +21,71 @@
 
 @AutoService(InstrumenterModule.class)
 public class CookieInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
 
-  public CookieInstrumentation() {
-    super("servlet", "servlet-cookie");
-  }
+    public CookieInstrumentation() {
+        super("servlet", "servlet-cookie");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "javax.servlet.http.Cookie";
-  }
+    @Override
+    public String instrumentedType() {
+        return "javax.servlet.http.Cookie";
+    }
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
+    }
 
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("getName")).and(takesArguments(0)),
-        getClass().getName() + "$GetNameAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getValue")).and(takesArguments(0)),
-        getClass().getName() + "$GetValueAdvice");
-  }
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("getName")).and(takesArguments(0)),
+                getClass().getName() + "$GetNameAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getValue")).and(takesArguments(0)),
+                getClass().getName() + "$GetValueAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetNameAdvice {
-    @Advice.OnMethodExit
-    @Source(SourceTypes.REQUEST_COOKIE_NAME)
-    public static void afterGetName(
-        @Advice.This final Object self,
-        @Advice.Return final String result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        try {
-          IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-          module.taintStringIfTainted(ctx, result, self, SourceTypes.REQUEST_COOKIE_NAME, result);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("afterGetName threw", e);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetNameAdvice {
+        @Advice.OnMethodExit
+        @Source(SourceTypes.REQUEST_COOKIE_NAME)
+        public static void afterGetName(
+                @Advice.This final Object self,
+                @Advice.Return final String result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                try {
+                    IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                    module.taintStringIfTainted(ctx, result, self, SourceTypes.REQUEST_COOKIE_NAME, result);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("afterGetName threw", e);
+                }
+            }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetValueAdvice {
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetValueAdvice {
 
-    @Advice.OnMethodExit
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    public static void afterGetValue(
-        @Advice.This final Object self,
-        @Advice.FieldValue("name") final String name,
-        @Advice.Return final String result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        try {
-          IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-          module.taintStringIfTainted(ctx, result, self, SourceTypes.REQUEST_COOKIE_VALUE, name);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("getValue threw", e);
+        @Advice.OnMethodExit
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        public static void afterGetValue(
+                @Advice.This final Object self,
+                @Advice.FieldValue("name") final String name,
+                @Advice.Return final String result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                try {
+                    IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                    module.taintStringIfTainted(ctx, result, self, SourceTypes.REQUEST_COOKIE_VALUE, name);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("getValue threw", e);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletDecorator.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletDecorator.java
index 48de5d22a1c..1867908390f 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletDecorator.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletDecorator.java
@@ -5,22 +5,21 @@
 
 public class HttpServletDecorator extends BaseDecorator {
 
-  public static final CharSequence JAVA_WEB_SERVLET_SERVICE =
-      UTF8BytesString.create("java-web-servlet-service");
-  public static final HttpServletDecorator DECORATE = new HttpServletDecorator();
+    public static final CharSequence JAVA_WEB_SERVLET_SERVICE = UTF8BytesString.create("java-web-servlet-service");
+    public static final HttpServletDecorator DECORATE = new HttpServletDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"servlet-service"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"servlet-service"};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return JAVA_WEB_SERVLET_SERVICE;
-  }
+    @Override
+    protected CharSequence component() {
+        return JAVA_WEB_SERVLET_SERVICE;
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java
index 74d16c4f9a9..0334316ed83 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java
@@ -26,73 +26,71 @@
 
 @AutoService(InstrumenterModule.class)
 public final class HttpServletInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public HttpServletInstrumentation() {
-    super("servlet-service");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public HttpServletInstrumentation() {
+        super("servlet-service");
+    }
 
-  @Override
-  public boolean defaultEnabled() {
-    return false;
-  }
+    @Override
+    public boolean defaultEnabled() {
+        return false;
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.http.HttpServlet";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.http.HttpServlet";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
 
-  /**
-   * Here we are instrumenting the protected method for HttpServlet. This should ensure that this
-   * advice is always called after Servlet3Instrumentation which is instrumenting the public method.
-   */
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("service")
-            .or(nameStartsWith("do")) // doGet, doPost, etc
-            .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest")))
-            .and(takesArgument(1, named("javax.servlet.http.HttpServletResponse")))
-            .and(isProtected().or(isPublic())),
-        getClass().getName() + "$HttpServletAdvice");
-  }
+    /**
+     * Here we are instrumenting the protected method for HttpServlet. This should ensure that this
+     * advice is always called after Servlet3Instrumentation which is instrumenting the public method.
+     */
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("service")
+                        .or(nameStartsWith("do")) // doGet, doPost, etc
+                        .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest")))
+                        .and(takesArgument(1, named("javax.servlet.http.HttpServletResponse")))
+                        .and(isProtected().or(isPublic())),
+                getClass().getName() + "$HttpServletAdvice");
+    }
 
-  public static class HttpServletAdvice {
+    public static class HttpServletAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope start(@Advice.Origin final Method method) {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope start(@Advice.Origin final Method method) {
 
-      if (activeSpan() == null) {
-        // Don't want to generate a new top-level span
-        return null;
-      }
+            if (activeSpan() == null) {
+                // Don't want to generate a new top-level span
+                return null;
+            }
 
-      final AgentSpan span =
-          startSpan(
-              HttpServletDecorator.JAVA_WEB_SERVLET_SERVICE.toString(),
-              SPAN_NAME_CACHE.computeIfAbsent(method.getName(), SERVLET_PREFIX));
-      DECORATE.afterStart(span);
+            final AgentSpan span = startSpan(
+                    HttpServletDecorator.JAVA_WEB_SERVLET_SERVICE.toString(),
+                    SPAN_NAME_CACHE.computeIfAbsent(method.getName(), SERVLET_PREFIX));
+            DECORATE.afterStart(span);
 
-      // Here we use the Method instead of "this.class.name" to distinguish calls to "super".
-      span.setResourceName(DECORATE.spanNameForMethod(method));
+            // Here we use the Method instead of "this.class.name" to distinguish calls to "super".
+            span.setResourceName(DECORATE.spanNameForMethod(method));
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      DECORATE.onError(scope, throwable);
-      DECORATE.beforeFinish(scope);
-      scope.close();
-      spanFromScope(scope).finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            DECORATE.onError(scope, throwable);
+            DECORATE.beforeFinish(scope);
+            scope.close();
+            spanFromScope(scope).finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestCallSite.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestCallSite.java
index 6eb24635b92..895a1c0aa26 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestCallSite.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestCallSite.java
@@ -17,51 +17,49 @@
 @CallSite(spi = IastCallSites.class)
 public class HttpServletRequestCallSite {
 
-  @Source(SourceTypes.REQUEST_PATH)
-  @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequest.getRequestURI()")
-  @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequestWrapper.getRequestURI()")
-  @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequest.getPathInfo()")
-  @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequestWrapper.getPathInfo()")
-  @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequest.getPathTranslated()")
-  @CallSite.After(
-      "java.lang.String javax.servlet.http.HttpServletRequestWrapper.getPathTranslated()")
-  public static String afterPath(
-      @CallSite.This final HttpServletRequest self, @CallSite.Return final String retValue) {
-    if (null != retValue && !retValue.isEmpty()) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        try {
-          final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-          if (ctx != null) {
-            module.taintString(ctx, retValue, SourceTypes.REQUEST_PATH);
-          }
-        } catch (final Throwable e) {
-          module.onUnexpectedException("afterPath threw", e);
+    @Source(SourceTypes.REQUEST_PATH)
+    @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequest.getRequestURI()")
+    @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequestWrapper.getRequestURI()")
+    @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequest.getPathInfo()")
+    @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequestWrapper.getPathInfo()")
+    @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequest.getPathTranslated()")
+    @CallSite.After("java.lang.String javax.servlet.http.HttpServletRequestWrapper.getPathTranslated()")
+    public static String afterPath(
+            @CallSite.This final HttpServletRequest self, @CallSite.Return final String retValue) {
+        if (null != retValue && !retValue.isEmpty()) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                try {
+                    final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+                    if (ctx != null) {
+                        module.taintString(ctx, retValue, SourceTypes.REQUEST_PATH);
+                    }
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("afterPath threw", e);
+                }
+            }
         }
-      }
+        return retValue;
     }
-    return retValue;
-  }
 
-  @Source(SourceTypes.REQUEST_URI)
-  @CallSite.After("java.lang.StringBuffer javax.servlet.http.HttpServletRequest.getRequestURL()")
-  @CallSite.After(
-      "java.lang.StringBuffer javax.servlet.http.HttpServletRequestWrapper.getRequestURL()")
-  public static StringBuffer afterGetRequestURL(
-      @CallSite.This final HttpServletRequest self, @CallSite.Return final StringBuffer retValue) {
-    if (null != retValue && retValue.length() > 0) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        try {
-          final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
-          if (ctx != null) {
-            module.taintObject(ctx, retValue, SourceTypes.REQUEST_URI);
-          }
-        } catch (final Throwable e) {
-          module.onUnexpectedException("afterGetRequestURL threw", e);
+    @Source(SourceTypes.REQUEST_URI)
+    @CallSite.After("java.lang.StringBuffer javax.servlet.http.HttpServletRequest.getRequestURL()")
+    @CallSite.After("java.lang.StringBuffer javax.servlet.http.HttpServletRequestWrapper.getRequestURL()")
+    public static StringBuffer afterGetRequestURL(
+            @CallSite.This final HttpServletRequest self, @CallSite.Return final StringBuffer retValue) {
+        if (null != retValue && retValue.length() > 0) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                try {
+                    final IastContext ctx = IastContext.Provider.get(AgentTracer.activeSpan());
+                    if (ctx != null) {
+                        module.taintObject(ctx, retValue, SourceTypes.REQUEST_URI);
+                    }
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("afterGetRequestURL threw", e);
+                }
+            }
         }
-      }
+        return retValue;
     }
-    return retValue;
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java
index b7351aa786b..9940431a060 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java
@@ -34,288 +34,274 @@
 @SuppressWarnings("unused")
 @AutoService(InstrumenterModule.class)
 public class HttpServletRequestInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  private static final String CLASS_NAME = HttpServletRequestInstrumentation.class.getName();
-  private static final ElementMatcher.Junction<? super TypeDescription> WRAPPER_CLASS =
-      named("javax.servlet.http.HttpServletRequestWrapper");
+    private static final String CLASS_NAME = HttpServletRequestInstrumentation.class.getName();
+    private static final ElementMatcher.Junction<? super TypeDescription> WRAPPER_CLASS =
+            named("javax.servlet.http.HttpServletRequestWrapper");
 
-  public HttpServletRequestInstrumentation() {
-    super("servlet", "servlet-request");
-  }
+    public HttpServletRequestInstrumentation() {
+        super("servlet", "servlet-request");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.http.HttpServletRequest";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.http.HttpServletRequest";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        .and(not(WRAPPER_CLASS))
-        .and(not(extendsClass(WRAPPER_CLASS)));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                .and(not(WRAPPER_CLASS))
+                .and(not(extendsClass(WRAPPER_CLASS)));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("getHeader")).and(takesArguments(String.class)),
-        CLASS_NAME + "$GetHeaderAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getHeaders")).and(takesArguments(String.class)),
-        CLASS_NAME + "$GetHeadersAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getHeaderNames")).and(takesArguments(0)),
-        CLASS_NAME + "$GetHeaderNamesAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getParameter")).and(takesArguments(String.class)),
-        CLASS_NAME + "$GetParameterAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getParameterValues")).and(takesArguments(String.class)),
-        CLASS_NAME + "$GetParameterValuesAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getParameterMap")).and(takesArguments(0)),
-        CLASS_NAME + "$GetParameterMapAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getParameterNames")).and(takesArguments(0)),
-        CLASS_NAME + "$GetParameterNamesAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getCookies")).and(takesArguments(0)),
-        CLASS_NAME + "$GetCookiesAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getQueryString")).and(takesArguments(0)),
-        CLASS_NAME + "$GetQueryStringAdvice");
-    transformer.applyAdvice(
-        isMethod().and(namedOneOf("getInputStream", "getReader")).and(takesArguments(0)),
-        CLASS_NAME + "$GetBodyAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getRequestDispatcher")).and(takesArguments(String.class)),
-        CLASS_NAME + "$GetRequestDispatcherAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("getHeader")).and(takesArguments(String.class)), CLASS_NAME + "$GetHeaderAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getHeaders")).and(takesArguments(String.class)),
+                CLASS_NAME + "$GetHeadersAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getHeaderNames")).and(takesArguments(0)), CLASS_NAME + "$GetHeaderNamesAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getParameter")).and(takesArguments(String.class)),
+                CLASS_NAME + "$GetParameterAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getParameterValues")).and(takesArguments(String.class)),
+                CLASS_NAME + "$GetParameterValuesAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getParameterMap")).and(takesArguments(0)), CLASS_NAME + "$GetParameterMapAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getParameterNames")).and(takesArguments(0)),
+                CLASS_NAME + "$GetParameterNamesAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getCookies")).and(takesArguments(0)), CLASS_NAME + "$GetCookiesAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getQueryString")).and(takesArguments(0)), CLASS_NAME + "$GetQueryStringAdvice");
+        transformer.applyAdvice(
+                isMethod().and(namedOneOf("getInputStream", "getReader")).and(takesArguments(0)),
+                CLASS_NAME + "$GetBodyAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getRequestDispatcher")).and(takesArguments(String.class)),
+                CLASS_NAME + "$GetRequestDispatcherAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetHeaderAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void onExit(
-        @Advice.Argument(0) final String name,
-        @Advice.Return final String value,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (value == null) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      module.taintString(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetHeaderAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void onExit(
+                @Advice.Argument(0) final String name,
+                @Advice.Return final String value,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (value == null) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            module.taintString(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetHeadersAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void onExit(
-        @Advice.Argument(0) final String name,
-        @Advice.Return(readOnly = false) Enumeration<String> enumeration,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (enumeration == null) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      enumeration =
-          TaintableEnumeration.wrap(
-              ctx, enumeration, module, SourceTypes.REQUEST_HEADER_VALUE, name);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetHeadersAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void onExit(
+                @Advice.Argument(0) final String name,
+                @Advice.Return(readOnly = false) Enumeration<String> enumeration,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (enumeration == null) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            enumeration = TaintableEnumeration.wrap(ctx, enumeration, module, SourceTypes.REQUEST_HEADER_VALUE, name);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetHeaderNamesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_NAME)
-    public static void onExit(
-        @Advice.Return(readOnly = false) Enumeration<String> enumeration,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (enumeration == null) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      enumeration =
-          TaintableEnumeration.wrap(
-              ctx, enumeration, module, SourceTypes.REQUEST_HEADER_NAME, true);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetHeaderNamesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_NAME)
+        public static void onExit(
+                @Advice.Return(readOnly = false) Enumeration<String> enumeration,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (enumeration == null) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            enumeration = TaintableEnumeration.wrap(ctx, enumeration, module, SourceTypes.REQUEST_HEADER_NAME, true);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetParameterAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void onExit(
-        @Advice.Argument(0) final String name,
-        @Advice.Return final String value,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (value == null) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      module.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetParameterAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void onExit(
+                @Advice.Argument(0) final String name,
+                @Advice.Return final String value,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (value == null) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            module.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetParameterValuesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void onExit(
-        @Advice.Argument(0) final String name,
-        @Advice.Return final String[] values,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (values == null || values.length == 0) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      for (final String value : values) {
-        module.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetParameterValuesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void onExit(
+                @Advice.Argument(0) final String name,
+                @Advice.Return final String[] values,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (values == null || values.length == 0) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            for (final String value : values) {
+                module.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+            }
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetParameterMapAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void onExit(
-        @Advice.Return final Map<String, String[]> parameters,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (parameters == null || parameters.isEmpty()) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      for (final Map.Entry<String, String[]> entry : parameters.entrySet()) {
-        final String name = entry.getKey();
-        module.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
-        final String[] values = entry.getValue();
-        if (values != null) {
-          for (final String value : entry.getValue()) {
-            module.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
-          }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetParameterMapAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void onExit(
+                @Advice.Return final Map<String, String[]> parameters, @ActiveRequestContext RequestContext reqCtx) {
+            if (parameters == null || parameters.isEmpty()) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            for (final Map.Entry<String, String[]> entry : parameters.entrySet()) {
+                final String name = entry.getKey();
+                module.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+                final String[] values = entry.getValue();
+                if (values != null) {
+                    for (final String value : entry.getValue()) {
+                        module.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetParameterNamesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_NAME)
-    public static void onExit(
-        @Advice.Return(readOnly = false) Enumeration<String> enumeration,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (enumeration == null) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      enumeration =
-          TaintableEnumeration.wrap(
-              ctx, enumeration, module, SourceTypes.REQUEST_PARAMETER_NAME, true);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetParameterNamesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_NAME)
+        public static void onExit(
+                @Advice.Return(readOnly = false) Enumeration<String> enumeration,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (enumeration == null) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            enumeration = TaintableEnumeration.wrap(ctx, enumeration, module, SourceTypes.REQUEST_PARAMETER_NAME, true);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetCookiesAdvice {
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetCookiesAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    public static void onExit(
-        @Advice.Return final Cookie[] cookies, @ActiveRequestContext RequestContext reqCtx) {
-      if (cookies == null || cookies.length == 0) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      for (final Cookie cookie : cookies) {
-        module.taintObject(ctx, cookie, SourceTypes.REQUEST_COOKIE_VALUE);
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        public static void onExit(@Advice.Return final Cookie[] cookies, @ActiveRequestContext RequestContext reqCtx) {
+            if (cookies == null || cookies.length == 0) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            for (final Cookie cookie : cookies) {
+                module.taintObject(ctx, cookie, SourceTypes.REQUEST_COOKIE_VALUE);
+            }
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetQueryStringAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_QUERY)
-    public static void onExit(
-        @Advice.Return final String queryString, @ActiveRequestContext RequestContext reqCtx) {
-      if (queryString == null) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      module.taintString(ctx, queryString, SourceTypes.REQUEST_QUERY);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetQueryStringAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_QUERY)
+        public static void onExit(
+                @Advice.Return final String queryString, @ActiveRequestContext RequestContext reqCtx) {
+            if (queryString == null) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            module.taintString(ctx, queryString, SourceTypes.REQUEST_QUERY);
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetBodyAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_BODY)
-    public static void onExit(
-        @Advice.Return final Object body, @ActiveRequestContext RequestContext reqCtx) {
-      if (body == null) {
-        return;
-      }
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      module.taintObject(ctx, body, SourceTypes.REQUEST_BODY);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetBodyAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_BODY)
+        public static void onExit(@Advice.Return final Object body, @ActiveRequestContext RequestContext reqCtx) {
+            if (body == null) {
+                return;
+            }
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            module.taintObject(ctx, body, SourceTypes.REQUEST_BODY);
+        }
     }
-  }
 
-  public static class GetRequestDispatcherAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
-    public static void onExit(@Advice.Argument(0) final String path) {
-      if (path == null) {
-        return;
-      }
-      final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
-      if (module == null) {
-        return;
-      }
-      module.onRedirect(path);
+    public static class GetRequestDispatcherAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
+        public static void onExit(@Advice.Argument(0) final String path) {
+            if (path == null) {
+                return;
+            }
+            final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
+            if (module == null) {
+                return;
+            }
+            module.onRedirect(path);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseDecorator.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseDecorator.java
index e6a7d73e9a6..5183509a1f7 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseDecorator.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseDecorator.java
@@ -4,23 +4,22 @@
 import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;
 
 public class HttpServletResponseDecorator extends BaseDecorator {
-  public static final CharSequence SERVLET_RESPONSE = UTF8BytesString.create("servlet.response");
-  public static final CharSequence JAVA_WEB_SERVLET_RESPONSE =
-      UTF8BytesString.create("java-web-servlet-response");
-  public static final HttpServletResponseDecorator DECORATE = new HttpServletResponseDecorator();
+    public static final CharSequence SERVLET_RESPONSE = UTF8BytesString.create("servlet.response");
+    public static final CharSequence JAVA_WEB_SERVLET_RESPONSE = UTF8BytesString.create("java-web-servlet-response");
+    public static final HttpServletResponseDecorator DECORATE = new HttpServletResponseDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"servlet", "servlet-response"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"servlet", "servlet-response"};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return JAVA_WEB_SERVLET_RESPONSE;
-  }
+    @Override
+    protected CharSequence component() {
+        return JAVA_WEB_SERVLET_RESPONSE;
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java
index ac999ac4f8f..29d9710c9f4 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java
@@ -24,64 +24,63 @@
 
 @AutoService(InstrumenterModule.class)
 public final class HttpServletResponseInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public HttpServletResponseInstrumentation() {
-    super("servlet", "servlet-response");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public HttpServletResponseInstrumentation() {
+        super("servlet", "servlet-response");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.http.HttpServletResponse";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.http.HttpServletResponse";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        namedOneOf("sendError", "sendRedirect"),
-        HttpServletResponseInstrumentation.class.getName() + "$SendAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                namedOneOf("sendError", "sendRedirect"),
+                HttpServletResponseInstrumentation.class.getName() + "$SendAdvice");
+    }
 
-  public static class SendAdvice {
+    public static class SendAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope start(
-        @Advice.Origin("#m") final String method, @Advice.This final HttpServletResponse resp) {
-      if (activeSpan() == null) {
-        // Don't want to generate a new top-level span
-        return null;
-      }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope start(
+                @Advice.Origin("#m") final String method, @Advice.This final HttpServletResponse resp) {
+            if (activeSpan() == null) {
+                // Don't want to generate a new top-level span
+                return null;
+            }
 
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpServletResponse.class);
-      if (callDepth > 0) {
-        return null;
-      }
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpServletResponse.class);
+            if (callDepth > 0) {
+                return null;
+            }
 
-      final AgentSpan span = startSpan(JAVA_WEB_SERVLET_RESPONSE.toString(), SERVLET_RESPONSE);
-      DECORATE.afterStart(span);
+            final AgentSpan span = startSpan(JAVA_WEB_SERVLET_RESPONSE.toString(), SERVLET_RESPONSE);
+            DECORATE.afterStart(span);
 
-      span.setResourceName(DECORATE.spanNameForMethod(HttpServletResponse.class, method));
+            span.setResourceName(DECORATE.spanNameForMethod(HttpServletResponse.class, method));
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
 
-      CallDepthThreadLocalMap.reset(HttpServletResponse.class);
+            CallDepthThreadLocalMap.reset(HttpServletResponse.class);
 
-      DECORATE.onError(scope, throwable);
-      DECORATE.beforeFinish(scope);
-      scope.close();
-      spanFromScope(scope).finish();
+            DECORATE.onError(scope, throwable);
+            DECORATE.beforeFinish(scope);
+            scope.close();
+            spanFromScope(scope).finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterCallSite.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterCallSite.java
index 1fe98da204c..932f8615d0d 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterCallSite.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterCallSite.java
@@ -12,17 +12,17 @@
 @CallSite(spi = IastCallSites.class)
 public class JspWriterCallSite {
 
-  @CallSite.Before("void javax.servlet.jsp.JspWriter.print(java.lang.String)")
-  @CallSite.Before("void javax.servlet.jsp.JspWriter.println(java.lang.String)")
-  @CallSite.Before("void javax.servlet.jsp.JspWriter.write(java.lang.String)")
-  public static void beforeStringParam(@CallSite.Argument(0) @Nonnull final String s) {
-    final XssModule module = InstrumentationBridge.XSS;
-    if (module != null) {
-      try {
-        module.onXss(s);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeStringParam threw", e);
-      }
+    @CallSite.Before("void javax.servlet.jsp.JspWriter.print(java.lang.String)")
+    @CallSite.Before("void javax.servlet.jsp.JspWriter.println(java.lang.String)")
+    @CallSite.Before("void javax.servlet.jsp.JspWriter.write(java.lang.String)")
+    public static void beforeStringParam(@CallSite.Argument(0) @Nonnull final String s) {
+        final XssModule module = InstrumentationBridge.XSS;
+        if (module != null) {
+            try {
+                module.onXss(s);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeStringParam threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterFullDetectionCallSite.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterFullDetectionCallSite.java
index 6c035c2886d..4a41e1d1ace 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterFullDetectionCallSite.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterFullDetectionCallSite.java
@@ -10,21 +10,21 @@
 
 @Sink(VulnerabilityTypes.XSS)
 @CallSite(
-    spi = IastCallSites.class,
-    enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isFullDetection"})
+        spi = IastCallSites.class,
+        enabled = {"datadog.trace.api.iast.IastEnabledChecks", "isFullDetection"})
 public class JspWriterFullDetectionCallSite {
 
-  @CallSite.Before("void javax.servlet.jsp.JspWriter.print(char[])")
-  @CallSite.Before("void javax.servlet.jsp.JspWriter.println(char[])")
-  @CallSite.Before("void javax.servlet.jsp.JspWriter.write(char[])")
-  public static void beforeCharArrayParam(@CallSite.Argument(0) @Nonnull final char[] buf) {
-    final XssModule module = InstrumentationBridge.XSS;
-    if (module != null) {
-      try {
-        module.onXss(buf);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("beforeCharArrayParam threw", e);
-      }
+    @CallSite.Before("void javax.servlet.jsp.JspWriter.print(char[])")
+    @CallSite.Before("void javax.servlet.jsp.JspWriter.println(char[])")
+    @CallSite.Before("void javax.servlet.jsp.JspWriter.write(char[])")
+    public static void beforeCharArrayParam(@CallSite.Argument(0) @Nonnull final char[] buf) {
+        final XssModule module = InstrumentationBridge.XSS;
+        if (module != null) {
+            try {
+                module.onXss(buf);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("beforeCharArrayParam threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/RequestDispatcherUtils.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/RequestDispatcherUtils.java
index 60ee45c4dc6..1a5c3ca5a77 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/RequestDispatcherUtils.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/RequestDispatcherUtils.java
@@ -15,196 +15,192 @@
 import javax.servlet.ServletResponse;
 
 public class RequestDispatcherUtils {
-  private final ServletRequest req;
-  private final ServletResponse resp;
-  private final ServletException toThrow;
-
-  public RequestDispatcherUtils(final ServletRequest req, final ServletResponse resp) {
-    this.req = req;
-    this.resp = resp;
-    toThrow = null;
-  }
-
-  public RequestDispatcherUtils(
-      final ServletRequest req, final ServletResponse resp, final ServletException toThrow) {
-    this.req = req;
-    this.resp = resp;
-    this.toThrow = toThrow;
-  }
-
-  public RequestDispatcherUtils() {
-    this.req = null;
-    this.resp = null;
-    this.toThrow = null;
-  }
-
-  /* RequestDispatcher can't be visible to groovy otherwise things break, so everything is
-   * encapsulated in here where groovy doesn't need to access it.
-   */
-
-  void forward(final String target) throws ServletException, IOException {
-    new TestContext().getRequestDispatcher(target).forward(req, resp);
-  }
-
-  void include(final String target) throws ServletException, IOException {
-    new TestContext().getRequestDispatcher(target).include(req, resp);
-  }
-
-  void forwardNamed(final String target) throws ServletException, IOException {
-    new TestContext().getNamedDispatcher(target).forward(req, resp);
-  }
-
-  void includeNamed(final String target) throws ServletException, IOException {
-    new TestContext().getNamedDispatcher(target).include(req, resp);
-  }
-
-  void getRealPath(final String target) {
-    new TestContext().getRealPath(target);
-  }
-
-  class TestContext implements ServletContext {
-    @Override
-    public ServletContext getContext(final String s) {
-      return null;
-    }
+    private final ServletRequest req;
+    private final ServletResponse resp;
+    private final ServletException toThrow;
 
-    @Override
-    public int getMajorVersion() {
-      return 0;
+    public RequestDispatcherUtils(final ServletRequest req, final ServletResponse resp) {
+        this.req = req;
+        this.resp = resp;
+        toThrow = null;
     }
 
-    @Override
-    public int getMinorVersion() {
-      return 0;
+    public RequestDispatcherUtils(
+            final ServletRequest req, final ServletResponse resp, final ServletException toThrow) {
+        this.req = req;
+        this.resp = resp;
+        this.toThrow = toThrow;
     }
 
-    @Override
-    public String getMimeType(final String s) {
-      return null;
+    public RequestDispatcherUtils() {
+        this.req = null;
+        this.resp = null;
+        this.toThrow = null;
     }
 
-    @Override
-    public Set getResourcePaths(final String s) {
-      return null;
-    }
+    /* RequestDispatcher can't be visible to groovy otherwise things break, so everything is
+     * encapsulated in here where groovy doesn't need to access it.
+     */
 
-    @Override
-    public URL getResource(final String s) throws MalformedURLException {
-      return null;
+    void forward(final String target) throws ServletException, IOException {
+        new TestContext().getRequestDispatcher(target).forward(req, resp);
     }
 
-    @Override
-    public InputStream getResourceAsStream(final String s) {
-      return null;
+    void include(final String target) throws ServletException, IOException {
+        new TestContext().getRequestDispatcher(target).include(req, resp);
     }
 
-    @Override
-    public RequestDispatcher getRequestDispatcher(final String s) {
-      return new TestDispatcher();
+    void forwardNamed(final String target) throws ServletException, IOException {
+        new TestContext().getNamedDispatcher(target).forward(req, resp);
     }
 
-    @Override
-    public RequestDispatcher getNamedDispatcher(final String s) {
-      return new TestDispatcher();
+    void includeNamed(final String target) throws ServletException, IOException {
+        new TestContext().getNamedDispatcher(target).include(req, resp);
     }
 
-    @Override
-    public Servlet getServlet(final String s) throws ServletException {
-      return null;
+    void getRealPath(final String target) {
+        new TestContext().getRealPath(target);
     }
 
-    @Override
-    public Enumeration getServlets() {
-      return null;
-    }
+    class TestContext implements ServletContext {
+        @Override
+        public ServletContext getContext(final String s) {
+            return null;
+        }
 
-    @Override
-    public Enumeration getServletNames() {
-      return null;
-    }
+        @Override
+        public int getMajorVersion() {
+            return 0;
+        }
 
-    @Override
-    public void log(final String s) {}
+        @Override
+        public int getMinorVersion() {
+            return 0;
+        }
 
-    @Override
-    public void log(final Exception e, final String s) {}
+        @Override
+        public String getMimeType(final String s) {
+            return null;
+        }
 
-    @Override
-    public void log(final String s, final Throwable throwable) {}
+        @Override
+        public Set getResourcePaths(final String s) {
+            return null;
+        }
 
-    @Override
-    public String getRealPath(final String s) {
-      return null;
-    }
+        @Override
+        public URL getResource(final String s) throws MalformedURLException {
+            return null;
+        }
 
-    @Override
-    public String getServerInfo() {
-      return null;
-    }
+        @Override
+        public InputStream getResourceAsStream(final String s) {
+            return null;
+        }
 
-    @Override
-    public String getInitParameter(final String s) {
-      return null;
-    }
+        @Override
+        public RequestDispatcher getRequestDispatcher(final String s) {
+            return new TestDispatcher();
+        }
 
-    @Override
-    public Enumeration getInitParameterNames() {
-      return null;
-    }
+        @Override
+        public RequestDispatcher getNamedDispatcher(final String s) {
+            return new TestDispatcher();
+        }
 
-    @Override
-    public Object getAttribute(final String s) {
-      return null;
-    }
+        @Override
+        public Servlet getServlet(final String s) throws ServletException {
+            return null;
+        }
 
-    @Override
-    public Enumeration getAttributeNames() {
-      return null;
-    }
+        @Override
+        public Enumeration getServlets() {
+            return null;
+        }
 
-    @Override
-    public void setAttribute(final String s, final Object o) {}
+        @Override
+        public Enumeration getServletNames() {
+            return null;
+        }
 
-    @Override
-    public void removeAttribute(final String s) {}
+        @Override
+        public void log(final String s) {}
 
-    @Override
-    public String getServletContextName() {
-      return null;
-    }
-  }
-
-  class TestDispatcher implements RequestDispatcher {
-    @Override
-    public void forward(final ServletRequest servletRequest, final ServletResponse servletResponse)
-        throws ServletException {
-      runUnderTrace(
-          "forward-child",
-          new Callable<Object>() {
-            @Override
-            public Object call() throws Exception {
-              return null;
-            }
-          });
-      if (toThrow != null) {
-        throw toThrow;
-      }
-    }
+        @Override
+        public void log(final Exception e, final String s) {}
 
-    @Override
-    public void include(final ServletRequest servletRequest, final ServletResponse servletResponse)
-        throws ServletException {
-      runUnderTrace(
-          "include-child",
-          new Callable<Object>() {
-            @Override
-            public Object call() throws Exception {
-              return null;
+        @Override
+        public void log(final String s, final Throwable throwable) {}
+
+        @Override
+        public String getRealPath(final String s) {
+            return null;
+        }
+
+        @Override
+        public String getServerInfo() {
+            return null;
+        }
+
+        @Override
+        public String getInitParameter(final String s) {
+            return null;
+        }
+
+        @Override
+        public Enumeration getInitParameterNames() {
+            return null;
+        }
+
+        @Override
+        public Object getAttribute(final String s) {
+            return null;
+        }
+
+        @Override
+        public Enumeration getAttributeNames() {
+            return null;
+        }
+
+        @Override
+        public void setAttribute(final String s, final Object o) {}
+
+        @Override
+        public void removeAttribute(final String s) {}
+
+        @Override
+        public String getServletContextName() {
+            return null;
+        }
+    }
+
+    class TestDispatcher implements RequestDispatcher {
+        @Override
+        public void forward(final ServletRequest servletRequest, final ServletResponse servletResponse)
+                throws ServletException {
+            runUnderTrace("forward-child", new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
+                    return null;
+                }
+            });
+            if (toThrow != null) {
+                throw toThrow;
+            }
+        }
+
+        @Override
+        public void include(final ServletRequest servletRequest, final ServletResponse servletResponse)
+                throws ServletException {
+            runUnderTrace("include-child", new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
+                    return null;
+                }
+            });
+            if (toThrow != null) {
+                throw toThrow;
             }
-          });
-      if (toThrow != null) {
-        throw toThrow;
-      }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/RequestDispatcherRecursionTest.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/RequestDispatcherRecursionTest.java
index ea9f498909e..602651ea37c 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/RequestDispatcherRecursionTest.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/RequestDispatcherRecursionTest.java
@@ -33,163 +33,149 @@
  */
 class RequestDispatcherRecursionTest extends AbstractInstrumentationTest {
 
-  /** Minimal {@code RequestDispatcher} stub — instrumented by ByteBuddy via interface match. */
-  static class TestDispatcher implements RequestDispatcher {
-    @Override
-    public void forward(ServletRequest req, ServletResponse resp)
-        throws ServletException, IOException {}
-
-    @Override
-    public void include(ServletRequest req, ServletResponse resp)
-        throws ServletException, IOException {}
-  }
-
-  /**
-   * {@code RequestDispatcher} with a non-trivial body simulating {@code ApplicationDispatcher}
-   * (Tomcat / SAP Commerce), which traverses a filter and valve chain adding significant call
-   * depth.
-   */
-  static class RealisticDispatcher implements RequestDispatcher {
-    @Override
-    public void forward(ServletRequest req, ServletResponse resp)
-        throws ServletException, IOException {
-      simulateFilterChain(200);
-    }
+    /** Minimal {@code RequestDispatcher} stub — instrumented by ByteBuddy via interface match. */
+    static class TestDispatcher implements RequestDispatcher {
+        @Override
+        public void forward(ServletRequest req, ServletResponse resp) throws ServletException, IOException {}
 
-    @Override
-    public void include(ServletRequest req, ServletResponse resp)
-        throws ServletException, IOException {}
+        @Override
+        public void include(ServletRequest req, ServletResponse resp) throws ServletException, IOException {}
+    }
 
-    private static void simulateFilterChain(int depth) {
-      if (depth > 0) simulateFilterChain(depth - 1);
+    /**
+     * {@code RequestDispatcher} with a non-trivial body simulating {@code ApplicationDispatcher}
+     * (Tomcat / SAP Commerce), which traverses a filter and valve chain adding significant call
+     * depth.
+     */
+    static class RealisticDispatcher implements RequestDispatcher {
+        @Override
+        public void forward(ServletRequest req, ServletResponse resp) throws ServletException, IOException {
+            simulateFilterChain(200);
+        }
+
+        @Override
+        public void include(ServletRequest req, ServletResponse resp) throws ServletException, IOException {}
+
+        private static void simulateFilterChain(int depth) {
+            if (depth > 0) simulateFilterChain(depth - 1);
+        }
     }
-  }
-
-  /** Creates a proxy stub for {@code iface} where all methods return null / 0 / false. */
-  @SuppressWarnings("unchecked")
-  static <T> T nullStub(Class<T> iface) {
-    return (T)
-        Proxy.newProxyInstance(
-            iface.getClassLoader(),
-            new Class<?>[] {iface},
-            (proxy, method, args) -> {
-              Class<?> ret = method.getReturnType();
-              if (ret == boolean.class) return false;
-              if (ret == int.class || ret == long.class) return 0;
-              return null;
-            });
-  }
-
-  @Test
-  void forward_doesNotRecurse_whenSetAttributeTriggersRedispatch() throws Exception {
-    TestDispatcher dispatcher = new TestDispatcher();
-    HttpServletResponse response = nullStub(HttpServletResponse.class);
-
-    AtomicInteger currentDepth = new AtomicInteger(0);
-    AtomicInteger maxDepth = new AtomicInteger(0);
-
-    // Hybris-style wrapper: setAttribute() re-triggers a dispatch. Capped at depth 3
-    // to bound total calls (≈ N^3, N ≈ 5 headers) and avoid OOM without the fix.
-    final int MAX_SETATTRIBUTE_DEPTH = 3;
-    HttpServletRequest recursiveRequest =
-        new HttpServletRequestWrapper(nullStub(HttpServletRequest.class)) {
-          @Override
-          public void setAttribute(String name, Object value) {
-            int depth = currentDepth.incrementAndGet();
-            maxDepth.updateAndGet(d -> Math.max(d, depth));
-            try {
-              super.setAttribute(name, value);
-              if (depth < MAX_SETATTRIBUTE_DEPTH) {
-                dispatcher.forward(this, response);
-              }
-            } catch (Exception | StackOverflowError ignored) {
-            } finally {
-              currentDepth.decrementAndGet();
-            }
-          }
-        };
 
-    // runUnderTrace provides an active span; without one the advice exits before injectContext().
-    runUnderTrace(
-        "test",
-        () -> {
-          dispatcher.forward(recursiveRequest, response);
-          return null;
+    /** Creates a proxy stub for {@code iface} where all methods return null / 0 / false. */
+    @SuppressWarnings("unchecked")
+    static <T> T nullStub(Class<T> iface) {
+        return (T) Proxy.newProxyInstance(iface.getClassLoader(), new Class<?>[] {iface}, (proxy, method, args) -> {
+            Class<?> ret = method.getReturnType();
+            if (ret == boolean.class) return false;
+            if (ret == int.class || ret == long.class) return 0;
+            return null;
         });
+    }
 
-    assertTrue(
-        maxDepth.get() >= 1,
-        "advice did not call setAttribute() — check that TestDispatcher is instrumented"
-            + " by ByteBuddy and that runUnderTrace creates an active span");
-
-    assertEquals(
-        1,
-        maxDepth.get(),
-        "setAttribute() was called recursively to depth "
-            + maxDepth.get()
-            + ". RequestDispatcherAdvice.start() needs a CallDepthThreadLocalMap guard "
-            + "(see AsyncContextInstrumentation for the pattern).");
-  }
-
-  /**
-   * Regression test for the production SOE scenario with a realistic dispatcher body.
-   *
-   * <p>Without the fix, the recursive {@code setAttribute()} pattern in Hybris would fill the call
-   * stack, and the extra frames from {@code simulateFilterChain()} would tip it into a {@code
-   * StackOverflowError} from the method <em>body</em> — captured by {@code @Advice.Thrown} → {@code
-   * DECORATE.onError()} → {@code span.setTag("error.stack")}.
-   *
-   * <p>With the {@code CallDepthThreadLocalMap} fix, re-entrant {@code forward()} calls return
-   * immediately from the enter advice (depth &gt; 0), so the stack never saturates and no SOE is
-   * thrown. The test verifies exactly this: {@code capturedSoe} must be {@code null}.
-   */
-  @Test
-  void forward_noSoe_withRealisticDispatcherBodyAndSetAttributeRecursion() throws Exception {
-    AtomicReference<StackOverflowError> capturedSoe = new AtomicReference<>();
-    AtomicBoolean soeSeen = new AtomicBoolean(false); // stops re-dispatching once SOE is caught
-    AtomicBoolean setAttributeInvoked = new AtomicBoolean(false); // guards against false-positive
-
-    RealisticDispatcher dispatcher = new RealisticDispatcher();
-    HttpServletResponse response = nullStub(HttpServletResponse.class);
-
-    // Hybris-style wrapper: setAttribute() triggers a new forward(); no depth cap.
-    HttpServletRequest recursiveRequest =
-        new HttpServletRequestWrapper(nullStub(HttpServletRequest.class)) {
-          @Override
-          public void setAttribute(String name, Object value) {
-            super.setAttribute(name, value);
-            setAttributeInvoked.set(true);
-            if (soeSeen.get()) return; // already captured — stop recursing
-            try {
-              dispatcher.forward(this, response);
-            } catch (StackOverflowError soe) {
-              capturedSoe.compareAndSet(null, soe);
-              soeSeen.set(true);
-              throw soe;
-            } catch (Exception ignored) {
+    @Test
+    void forward_doesNotRecurse_whenSetAttributeTriggersRedispatch() throws Exception {
+        TestDispatcher dispatcher = new TestDispatcher();
+        HttpServletResponse response = nullStub(HttpServletResponse.class);
+
+        AtomicInteger currentDepth = new AtomicInteger(0);
+        AtomicInteger maxDepth = new AtomicInteger(0);
+
+        // Hybris-style wrapper: setAttribute() re-triggers a dispatch. Capped at depth 3
+        // to bound total calls (≈ N^3, N ≈ 5 headers) and avoid OOM without the fix.
+        final int MAX_SETATTRIBUTE_DEPTH = 3;
+        HttpServletRequest recursiveRequest = new HttpServletRequestWrapper(nullStub(HttpServletRequest.class)) {
+            @Override
+            public void setAttribute(String name, Object value) {
+                int depth = currentDepth.incrementAndGet();
+                maxDepth.updateAndGet(d -> Math.max(d, depth));
+                try {
+                    super.setAttribute(name, value);
+                    if (depth < MAX_SETATTRIBUTE_DEPTH) {
+                        dispatcher.forward(this, response);
+                    }
+                } catch (Exception | StackOverflowError ignored) {
+                } finally {
+                    currentDepth.decrementAndGet();
+                }
             }
-          }
         };
 
-    try {
-      runUnderTrace(
-          "test",
-          () -> {
+        // runUnderTrace provides an active span; without one the advice exits before injectContext().
+        runUnderTrace("test", () -> {
             dispatcher.forward(recursiveRequest, response);
             return null;
-          });
-    } catch (StackOverflowError ignored) {
-      // SOE may reach this level if it is not fully absorbed at inner levels.
+        });
+
+        assertTrue(
+                maxDepth.get() >= 1,
+                "advice did not call setAttribute() — check that TestDispatcher is instrumented"
+                        + " by ByteBuddy and that runUnderTrace creates an active span");
+
+        assertEquals(
+                1,
+                maxDepth.get(),
+                "setAttribute() was called recursively to depth "
+                        + maxDepth.get()
+                        + ". RequestDispatcherAdvice.start() needs a CallDepthThreadLocalMap guard "
+                        + "(see AsyncContextInstrumentation for the pattern).");
     }
 
-    assertTrue(
-        setAttributeInvoked.get(),
-        "advice did not call setAttribute() — check that RealisticDispatcher is instrumented"
-            + " by ByteBuddy and that runUnderTrace creates an active span");
+    /**
+     * Regression test for the production SOE scenario with a realistic dispatcher body.
+     *
+     * <p>Without the fix, the recursive {@code setAttribute()} pattern in Hybris would fill the call
+     * stack, and the extra frames from {@code simulateFilterChain()} would tip it into a {@code
+     * StackOverflowError} from the method <em>body</em> — captured by {@code @Advice.Thrown} → {@code
+     * DECORATE.onError()} → {@code span.setTag("error.stack")}.
+     *
+     * <p>With the {@code CallDepthThreadLocalMap} fix, re-entrant {@code forward()} calls return
+     * immediately from the enter advice (depth &gt; 0), so the stack never saturates and no SOE is
+     * thrown. The test verifies exactly this: {@code capturedSoe} must be {@code null}.
+     */
+    @Test
+    void forward_noSoe_withRealisticDispatcherBodyAndSetAttributeRecursion() throws Exception {
+        AtomicReference<StackOverflowError> capturedSoe = new AtomicReference<>();
+        AtomicBoolean soeSeen = new AtomicBoolean(false); // stops re-dispatching once SOE is caught
+        AtomicBoolean setAttributeInvoked = new AtomicBoolean(false); // guards against false-positive
+
+        RealisticDispatcher dispatcher = new RealisticDispatcher();
+        HttpServletResponse response = nullStub(HttpServletResponse.class);
+
+        // Hybris-style wrapper: setAttribute() triggers a new forward(); no depth cap.
+        HttpServletRequest recursiveRequest = new HttpServletRequestWrapper(nullStub(HttpServletRequest.class)) {
+            @Override
+            public void setAttribute(String name, Object value) {
+                super.setAttribute(name, value);
+                setAttributeInvoked.set(true);
+                if (soeSeen.get()) return; // already captured — stop recursing
+                try {
+                    dispatcher.forward(this, response);
+                } catch (StackOverflowError soe) {
+                    capturedSoe.compareAndSet(null, soe);
+                    soeSeen.set(true);
+                    throw soe;
+                } catch (Exception ignored) {
+                }
+            }
+        };
 
-    assertNull(
-        capturedSoe.get(),
-        "StackOverflowError was thrown — fix regression: CallDepthThreadLocalMap guard "
-            + "was removed from RequestDispatcherAdvice.start()");
-  }
+        try {
+            runUnderTrace("test", () -> {
+                dispatcher.forward(recursiveRequest, response);
+                return null;
+            });
+        } catch (StackOverflowError ignored) {
+            // SOE may reach this level if it is not fully absorbed at inner levels.
+        }
+
+        assertTrue(
+                setAttributeInvoked.get(),
+                "advice did not call setAttribute() — check that RealisticDispatcher is instrumented"
+                        + " by ByteBuddy and that runUnderTrace creates an active span");
+
+        assertNull(
+                capturedSoe.get(),
+                "StackOverflowError was thrown — fix regression: CallDepthThreadLocalMap guard "
+                        + "was removed from RequestDispatcherAdvice.start()");
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestTestSuite.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestTestSuite.java
index 0c55d315158..d38d18fc446 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestTestSuite.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestTestSuite.java
@@ -3,29 +3,29 @@
 import javax.servlet.http.HttpServletRequest;
 
 public class JavaxHttpServletRequestTestSuite implements ServletRequestTestSuite {
-  private final HttpServletRequest request;
+    private final HttpServletRequest request;
 
-  public JavaxHttpServletRequestTestSuite(final HttpServletRequest request) {
-    this.request = request;
-  }
+    public JavaxHttpServletRequestTestSuite(final HttpServletRequest request) {
+        this.request = request;
+    }
 
-  @Override
-  public String getRequestURI() {
-    return request.getRequestURI();
-  }
+    @Override
+    public String getRequestURI() {
+        return request.getRequestURI();
+    }
 
-  @Override
-  public String getPathInfo() {
-    return request.getPathInfo();
-  }
+    @Override
+    public String getPathInfo() {
+        return request.getPathInfo();
+    }
 
-  @Override
-  public String getPathTranslated() {
-    return request.getPathTranslated();
-  }
+    @Override
+    public String getPathTranslated() {
+        return request.getPathTranslated();
+    }
 
-  @Override
-  public StringBuffer getRequestURL() {
-    return request.getRequestURL();
-  }
+    @Override
+    public StringBuffer getRequestURL() {
+        return request.getRequestURL();
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestWrapperTestSuite.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestWrapperTestSuite.java
index 79a81ef2f3b..619c1adfafc 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestWrapperTestSuite.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestWrapperTestSuite.java
@@ -4,29 +4,29 @@
 
 public class JavaxHttpServletRequestWrapperTestSuite implements ServletRequestTestSuite {
 
-  private final HttpServletRequestWrapper request;
-
-  public JavaxHttpServletRequestWrapperTestSuite(final HttpServletRequestWrapper request) {
-    this.request = request;
-  }
-
-  @Override
-  public String getRequestURI() {
-    return request.getRequestURI();
-  }
-
-  @Override
-  public String getPathInfo() {
-    return request.getPathInfo();
-  }
-
-  @Override
-  public String getPathTranslated() {
-    return request.getPathTranslated();
-  }
-
-  @Override
-  public StringBuffer getRequestURL() {
-    return request.getRequestURL();
-  }
+    private final HttpServletRequestWrapper request;
+
+    public JavaxHttpServletRequestWrapperTestSuite(final HttpServletRequestWrapper request) {
+        this.request = request;
+    }
+
+    @Override
+    public String getRequestURI() {
+        return request.getRequestURI();
+    }
+
+    @Override
+    public String getPathInfo() {
+        return request.getPathInfo();
+    }
+
+    @Override
+    public String getPathTranslated() {
+        return request.getPathTranslated();
+    }
+
+    @Override
+    public StringBuffer getRequestURL() {
+        return request.getRequestURL();
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/ServletRequestTestSuite.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/ServletRequestTestSuite.java
index cfa4c98d997..23a4426149f 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/ServletRequestTestSuite.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/ServletRequestTestSuite.java
@@ -2,11 +2,11 @@
 
 public interface ServletRequestTestSuite {
 
-  String getRequestURI();
+    String getRequestURI();
 
-  String getPathInfo();
+    String getPathInfo();
 
-  String getPathTranslated();
+    String getPathTranslated();
 
-  StringBuffer getRequestURL();
+    StringBuffer getRequestURL();
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/foo/bar/TestJspWriterSuite.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/foo/bar/TestJspWriterSuite.java
index ea16800fed7..2c8fb2498a4 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/foo/bar/TestJspWriterSuite.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/foo/bar/TestJspWriterSuite.java
@@ -5,33 +5,33 @@
 
 public class TestJspWriterSuite {
 
-  JspWriter writer;
+    JspWriter writer;
 
-  public TestJspWriterSuite(final JspWriter writer) {
-    this.writer = writer;
-  }
+    public TestJspWriterSuite(final JspWriter writer) {
+        this.writer = writer;
+    }
 
-  public void printlnTest(char[] x) throws IOException {
-    writer.println(x);
-  }
+    public void printlnTest(char[] x) throws IOException {
+        writer.println(x);
+    }
 
-  public void printlnTest(String x) throws IOException {
-    writer.println(x);
-  }
+    public void printlnTest(String x) throws IOException {
+        writer.println(x);
+    }
 
-  public void printTest(char[] s) throws IOException {
-    writer.print(s);
-  }
+    public void printTest(char[] s) throws IOException {
+        writer.print(s);
+    }
 
-  public void printTest(String s) throws IOException {
-    writer.print(s);
-  }
+    public void printTest(String s) throws IOException {
+        writer.print(s);
+    }
 
-  public void write(char[] s) throws IOException {
-    writer.write(s);
-  }
+    public void write(char[] s) throws IOException {
+        writer.write(s);
+    }
 
-  public void write(String s) throws IOException {
-    writer.write(s);
-  }
+    public void write(String s) throws IOException {
+        writer.write(s);
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/AbstractServletInputStreamWrapper.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/AbstractServletInputStreamWrapper.java
index ef8cc028ee4..447b980d50a 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/AbstractServletInputStreamWrapper.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/AbstractServletInputStreamWrapper.java
@@ -5,86 +5,86 @@
 import javax.servlet.ServletInputStream;
 
 public abstract class AbstractServletInputStreamWrapper extends ServletInputStream {
-  protected final ServletInputStream is;
-  private final StoredByteBody storedByteBody;
+    protected final ServletInputStream is;
+    private final StoredByteBody storedByteBody;
 
-  public AbstractServletInputStreamWrapper(ServletInputStream is, StoredByteBody storedByteBody) {
-    this.is = is;
-    this.storedByteBody = storedByteBody;
-  }
-
-  @Override
-  public int read(byte[] b) throws IOException {
-    int numRead = is.read(b);
-    if (numRead > 0) {
-      storedByteBody.appendData(b, 0, numRead);
-    } else if (numRead == -1) {
-      storedByteBody.maybeNotifyAndBlock();
+    public AbstractServletInputStreamWrapper(ServletInputStream is, StoredByteBody storedByteBody) {
+        this.is = is;
+        this.storedByteBody = storedByteBody;
     }
-    return numRead;
-  }
 
-  @Override
-  public int read(byte[] b, int off, int len) throws IOException {
-    int numRead = is.read(b, off, len);
-    if (numRead > 0) {
-      storedByteBody.appendData(b, off, off + numRead);
-    } else if (numRead == -1) {
-      storedByteBody.maybeNotifyAndBlock();
+    @Override
+    public int read(byte[] b) throws IOException {
+        int numRead = is.read(b);
+        if (numRead > 0) {
+            storedByteBody.appendData(b, 0, numRead);
+        } else if (numRead == -1) {
+            storedByteBody.maybeNotifyAndBlock();
+        }
+        return numRead;
     }
-    return numRead;
-  }
 
-  @Override
-  public int read() throws IOException {
-    int read = is.read();
-    if (read == -1) {
-      storedByteBody.maybeNotifyAndBlock();
+    @Override
+    public int read(byte[] b, int off, int len) throws IOException {
+        int numRead = is.read(b, off, len);
+        if (numRead > 0) {
+            storedByteBody.appendData(b, off, off + numRead);
+        } else if (numRead == -1) {
+            storedByteBody.maybeNotifyAndBlock();
+        }
+        return numRead;
     }
-    storedByteBody.appendData(read);
-    return read;
-  }
 
-  @Override
-  public int readLine(byte[] b, int off, int len) throws IOException {
-    int numRead = is.readLine(b, off, len);
-    if (numRead > 0) {
-      storedByteBody.appendData(b, off, off + numRead);
-    } else if (numRead == -1) {
-      storedByteBody.maybeNotifyAndBlock();
+    @Override
+    public int read() throws IOException {
+        int read = is.read();
+        if (read == -1) {
+            storedByteBody.maybeNotifyAndBlock();
+        }
+        storedByteBody.appendData(read);
+        return read;
     }
 
-    return numRead;
-  }
+    @Override
+    public int readLine(byte[] b, int off, int len) throws IOException {
+        int numRead = is.readLine(b, off, len);
+        if (numRead > 0) {
+            storedByteBody.appendData(b, off, off + numRead);
+        } else if (numRead == -1) {
+            storedByteBody.maybeNotifyAndBlock();
+        }
 
-  @Override
-  public long skip(long n) throws IOException {
-    return is.skip(n);
-  }
+        return numRead;
+    }
 
-  @Override
-  public int available() throws IOException {
-    return is.available();
-  }
+    @Override
+    public long skip(long n) throws IOException {
+        return is.skip(n);
+    }
 
-  @Override
-  public void close() throws IOException {
-    is.close();
-    storedByteBody.maybeNotifyAndBlock();
-  }
+    @Override
+    public int available() throws IOException {
+        return is.available();
+    }
 
-  @Override
-  public void mark(int readlimit) {
-    is.mark(readlimit);
-  }
+    @Override
+    public void close() throws IOException {
+        is.close();
+        storedByteBody.maybeNotifyAndBlock();
+    }
 
-  @Override
-  public void reset() throws IOException {
-    is.reset();
-  }
+    @Override
+    public void mark(int readlimit) {
+        is.mark(readlimit);
+    }
+
+    @Override
+    public void reset() throws IOException {
+        is.reset();
+    }
 
-  @Override
-  public boolean markSupported() {
-    return is.markSupported();
-  }
+    @Override
+    public boolean markSupported() {
+        return is.markSupported();
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/BufferedReaderWrapper.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/BufferedReaderWrapper.java
index d6812be93e8..4683e14159d 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/BufferedReaderWrapper.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/BufferedReaderWrapper.java
@@ -6,108 +6,108 @@
 import java.nio.CharBuffer;
 
 public class BufferedReaderWrapper extends BufferedReader {
-  private final BufferedReader reader;
-  private final StoredCharBody storedCharBody;
-
-  public BufferedReaderWrapper(BufferedReader reader, StoredCharBody storedCharBody) {
-    super(reader);
-    this.reader = reader;
-    this.storedCharBody = storedCharBody;
-  }
-
-  @Override
-  public int read() throws IOException {
-    int read = this.reader.read();
-    if (read >= 0) {
-      storedCharBody.appendData(read);
-    } else {
-      storedCharBody.maybeNotifyAndBlock();
+    private final BufferedReader reader;
+    private final StoredCharBody storedCharBody;
+
+    public BufferedReaderWrapper(BufferedReader reader, StoredCharBody storedCharBody) {
+        super(reader);
+        this.reader = reader;
+        this.storedCharBody = storedCharBody;
+    }
+
+    @Override
+    public int read() throws IOException {
+        int read = this.reader.read();
+        if (read >= 0) {
+            storedCharBody.appendData(read);
+        } else {
+            storedCharBody.maybeNotifyAndBlock();
+        }
+        return read;
+    }
+
+    @Override
+    public int read(char[] cbuf, int off, int len) throws IOException {
+        int read = this.reader.read(cbuf, off, len);
+        if (read > 0) {
+            storedCharBody.appendData(cbuf, off, off + read);
+        } else if (read == -1) {
+            storedCharBody.maybeNotifyAndBlock();
+        }
+        return read;
     }
-    return read;
-  }
-
-  @Override
-  public int read(char[] cbuf, int off, int len) throws IOException {
-    int read = this.reader.read(cbuf, off, len);
-    if (read > 0) {
-      storedCharBody.appendData(cbuf, off, off + read);
-    } else if (read == -1) {
-      storedCharBody.maybeNotifyAndBlock();
+
+    @Override
+    public String readLine() throws IOException {
+        String read = this.reader.readLine();
+        if (read == null) {
+            storedCharBody.maybeNotifyAndBlock();
+            return null;
+        }
+        storedCharBody.appendData(read);
+        storedCharBody.appendData('\n');
+        return read;
     }
-    return read;
-  }
-
-  @Override
-  public String readLine() throws IOException {
-    String read = this.reader.readLine();
-    if (read == null) {
-      storedCharBody.maybeNotifyAndBlock();
-      return null;
+
+    @Override
+    public long skip(long n) throws IOException {
+        return this.reader.skip(n);
     }
-    storedCharBody.appendData(read);
-    storedCharBody.appendData('\n');
-    return read;
-  }
-
-  @Override
-  public long skip(long n) throws IOException {
-    return this.reader.skip(n);
-  }
-
-  @Override
-  public boolean ready() throws IOException {
-    return this.reader.ready();
-  }
-
-  @Override
-  public boolean markSupported() {
-    return this.reader.markSupported();
-  }
-
-  @Override
-  public void mark(int readAheadLimit) throws IOException {
-    this.reader.mark(readAheadLimit);
-  }
-
-  @Override
-  public void reset() throws IOException {
-    this.reader.reset();
-  }
-
-  @Override
-  public void close() throws IOException {
-    this.reader.close();
-    storedCharBody.maybeNotifyAndBlock();
-  }
-
-  @Override
-  public int read(CharBuffer target) throws IOException {
-    int initPos = target.position();
-    int read = this.reader.read(target);
-    if (read > 0) {
-      int finalLimit = target.limit();
-      int finalPos = target.position(); // or initPos + read
-      target.limit(target.position());
-      target.position(initPos);
-
-      storedCharBody.appendData(target);
-
-      target.limit(finalLimit);
-      target.position(finalPos);
-    } else if (read == -1) {
-      storedCharBody.maybeNotifyAndBlock();
+
+    @Override
+    public boolean ready() throws IOException {
+        return this.reader.ready();
+    }
+
+    @Override
+    public boolean markSupported() {
+        return this.reader.markSupported();
     }
-    return read;
-  }
-
-  @Override
-  public int read(char[] cbuf) throws IOException {
-    int read = this.reader.read(cbuf);
-    if (read > 0) {
-      storedCharBody.appendData(cbuf, 0, read);
-    } else if (read == -1) {
-      storedCharBody.maybeNotifyAndBlock();
+
+    @Override
+    public void mark(int readAheadLimit) throws IOException {
+        this.reader.mark(readAheadLimit);
+    }
+
+    @Override
+    public void reset() throws IOException {
+        this.reader.reset();
+    }
+
+    @Override
+    public void close() throws IOException {
+        this.reader.close();
+        storedCharBody.maybeNotifyAndBlock();
+    }
+
+    @Override
+    public int read(CharBuffer target) throws IOException {
+        int initPos = target.position();
+        int read = this.reader.read(target);
+        if (read > 0) {
+            int finalLimit = target.limit();
+            int finalPos = target.position(); // or initPos + read
+            target.limit(target.position());
+            target.position(initPos);
+
+            storedCharBody.appendData(target);
+
+            target.limit(finalLimit);
+            target.position(finalPos);
+        } else if (read == -1) {
+            storedCharBody.maybeNotifyAndBlock();
+        }
+        return read;
+    }
+
+    @Override
+    public int read(char[] cbuf) throws IOException {
+        int read = this.reader.read(cbuf);
+        if (read > 0) {
+            storedCharBody.appendData(cbuf, 0, read);
+        } else if (read == -1) {
+            storedCharBody.maybeNotifyAndBlock();
+        }
+        return read;
     }
-    return read;
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/HttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/HttpServletResponseInstrumentation.java
index 4ddeefa013e..1d62baa0b8e 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/HttpServletResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/HttpServletResponseInstrumentation.java
@@ -26,103 +26,101 @@
 
 @AutoService(InstrumenterModule.class)
 public final class HttpServletResponseInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public HttpServletResponseInstrumentation() {
-    super("servlet", "servelet-response");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public HttpServletResponseInstrumentation() {
+        super("servlet", "servelet-response");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "servlet-common";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "servlet-common";
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.http.HttpServletResponse";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.http.HttpServletResponse";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        .and(not(extendsClass(named("javax.servlet.http.HttpServletResponseWrapper"))));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                .and(not(extendsClass(named("javax.servlet.http.HttpServletResponseWrapper"))));
+    }
 
-  @Override
-  protected boolean isOptOutEnabled() {
-    return true;
-  }
+    @Override
+    protected boolean isOptOutEnabled() {
+        return true;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("addCookie").and(takesArgument(0, named("javax.servlet.http.Cookie"))),
-        getClass().getName() + "$AddCookieAdvice");
-    transformer.applyAdvice(
-        namedOneOf("setHeader", "addHeader").and(takesArguments(String.class, String.class)),
-        getClass().getName() + "$AddHeaderAdvice");
-    transformer.applyAdvice(
-        namedOneOf("encodeRedirectURL", "encodeURL")
-            .and(takesArgument(0, String.class))
-            .and(returns(String.class)),
-        getClass().getName() + "$EncodeURLAdvice");
-    transformer.applyAdvice(
-        named("sendRedirect").and(takesArgument(0, String.class)),
-        getClass().getName() + "$SendRedirectAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("addCookie").and(takesArgument(0, named("javax.servlet.http.Cookie"))),
+                getClass().getName() + "$AddCookieAdvice");
+        transformer.applyAdvice(
+                namedOneOf("setHeader", "addHeader").and(takesArguments(String.class, String.class)),
+                getClass().getName() + "$AddHeaderAdvice");
+        transformer.applyAdvice(
+                namedOneOf("encodeRedirectURL", "encodeURL")
+                        .and(takesArgument(0, String.class))
+                        .and(returns(String.class)),
+                getClass().getName() + "$EncodeURLAdvice");
+        transformer.applyAdvice(
+                named("sendRedirect").and(takesArgument(0, String.class)),
+                getClass().getName() + "$SendRedirectAdvice");
+    }
 
-  public static class AddCookieAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.RESPONSE_HEADER)
-    public static void onEnter(@Advice.Argument(0) final javax.servlet.http.Cookie cookie) {
-      if (null != cookie) {
-        HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
-        if (mod != null) {
-          mod.onCookie(
-              Cookie.named(cookie.getName())
-                  .value(cookie.getValue())
-                  .secure(cookie.getSecure())
-                  .maxAge(cookie.getMaxAge())
-                  .build());
+    public static class AddCookieAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.RESPONSE_HEADER)
+        public static void onEnter(@Advice.Argument(0) final javax.servlet.http.Cookie cookie) {
+            if (null != cookie) {
+                HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
+                if (mod != null) {
+                    mod.onCookie(Cookie.named(cookie.getName())
+                            .value(cookie.getValue())
+                            .secure(cookie.getSecure())
+                            .maxAge(cookie.getMaxAge())
+                            .build());
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class AddHeaderAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.RESPONSE_HEADER)
-    public static void onEnter(
-        @Advice.Argument(0) final String name, @Advice.Argument(1) String value) {
-      if (null != value && value.length() > 0) {
-        HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
-        if (mod != null) {
-          mod.onHeader(name, value);
+    public static class AddHeaderAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.RESPONSE_HEADER)
+        public static void onEnter(@Advice.Argument(0) final String name, @Advice.Argument(1) String value) {
+            if (null != value && value.length() > 0) {
+                HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
+                if (mod != null) {
+                    mod.onHeader(name, value);
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class SendRedirectAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
-    public static void onEnter(@Advice.Argument(0) final String location) {
-      final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
-      if (module != null) {
-        if (null != location && location.length() > 0) {
-          module.onRedirect(location);
+    public static class SendRedirectAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
+        public static void onEnter(@Advice.Argument(0) final String location) {
+            final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
+            if (module != null) {
+                if (null != location && location.length() > 0) {
+                    module.onRedirect(location);
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class EncodeURLAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void onExit(@Advice.Argument(0) final String url, @Advice.Return String encoded) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (encoded != null && module != null) {
-        module.taintStringIfTainted(encoded, url);
-      }
+    public static class EncodeURLAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void onExit(@Advice.Argument(0) final String url, @Advice.Return String encoded) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (encoded != null && module != null) {
+                module.taintStringIfTainted(encoded, url);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/HttpSessionInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/HttpSessionInstrumentation.java
index dea9c24bfa9..c964003788a 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/HttpSessionInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/HttpSessionInstrumentation.java
@@ -20,48 +20,44 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpSessionInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public HttpSessionInstrumentation() {
-    super("servlet", "servlet-session");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public HttpSessionInstrumentation() {
+        super("servlet", "servlet-session");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "servlet-common";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "servlet-common";
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "javax.servlet.http.HttpSession";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "javax.servlet.http.HttpSession";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()))
-        .and(
-            not(
-                namedOneOf(
-                    "com.ibm.ws.session.HttpSessionFacade",
-                    "org.apache.catalina.session.StandardSessionFacade")));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()))
+                .and(not(namedOneOf(
+                        "com.ibm.ws.session.HttpSessionFacade", "org.apache.catalina.session.StandardSessionFacade")));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        namedOneOf("setAttribute", "putValue")
-            .and(takesArguments(String.class, Object.class).and(isPublic())),
-        getClass().getName() + "$InstrumenterAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                namedOneOf("setAttribute", "putValue")
+                        .and(takesArguments(String.class, Object.class).and(isPublic())),
+                getClass().getName() + "$InstrumenterAdvice");
+    }
 
-  public static class InstrumenterAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.TRUST_BOUNDARY_VIOLATION)
-    public static void onEnter(
-        @Advice.Argument(0) final String name, @Advice.Argument(1) final Object value) {
-      TrustBoundaryViolationModule mod = InstrumentationBridge.TRUST_BOUNDARY_VIOLATION;
-      if (mod != null) {
-        mod.onSessionValue(name, value);
-      }
+    public static class InstrumenterAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.TRUST_BOUNDARY_VIOLATION)
+        public static void onEnter(@Advice.Argument(0) final String name, @Advice.Argument(1) final Object value) {
+            TrustBoundaryViolationModule mod = InstrumentationBridge.TRUST_BOUNDARY_VIOLATION;
+            if (mod != null) {
+                mod.onSessionValue(name, value);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/ServletBlockingHelper.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/ServletBlockingHelper.java
index 41e5bc73916..31999c1489c 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/ServletBlockingHelper.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/ServletBlockingHelper.java
@@ -13,77 +13,76 @@
 import org.slf4j.LoggerFactory;
 
 public class ServletBlockingHelper {
-  private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
-  private static final Logger log = LoggerFactory.getLogger(ServletBlockingHelper.class);
+    private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+    private static final Logger log = LoggerFactory.getLogger(ServletBlockingHelper.class);
 
-  public static void commitBlockingResponse(
-      TraceSegment segment,
-      HttpServletRequest httpServletRequest,
-      HttpServletResponse resp,
-      int statusCode_,
-      BlockingContentType bct,
-      Map<String, String> extraHeaders,
-      String securityResponseId) {
-    int statusCode = BlockingActionHelper.getHttpCode(statusCode_);
-    if (!start(resp, statusCode)) {
-      return;
-    }
+    public static void commitBlockingResponse(
+            TraceSegment segment,
+            HttpServletRequest httpServletRequest,
+            HttpServletResponse resp,
+            int statusCode_,
+            BlockingContentType bct,
+            Map<String, String> extraHeaders,
+            String securityResponseId) {
+        int statusCode = BlockingActionHelper.getHttpCode(statusCode_);
+        if (!start(resp, statusCode)) {
+            return;
+        }
 
-    for (Map.Entry<String, String> h : extraHeaders.entrySet()) {
-      resp.setHeader(h.getKey(), h.getValue());
-    }
+        for (Map.Entry<String, String> h : extraHeaders.entrySet()) {
+            resp.setHeader(h.getKey(), h.getValue());
+        }
 
-    byte[] template;
-    if (bct != BlockingContentType.NONE) {
-      String acceptHeader = httpServletRequest.getHeader("Accept");
-      BlockingActionHelper.TemplateType type =
-          BlockingActionHelper.determineTemplateType(bct, acceptHeader);
-      template = BlockingActionHelper.getTemplate(type, securityResponseId);
-      String contentType = BlockingActionHelper.getContentType(type);
+        byte[] template;
+        if (bct != BlockingContentType.NONE) {
+            String acceptHeader = httpServletRequest.getHeader("Accept");
+            BlockingActionHelper.TemplateType type = BlockingActionHelper.determineTemplateType(bct, acceptHeader);
+            template = BlockingActionHelper.getTemplate(type, securityResponseId);
+            String contentType = BlockingActionHelper.getContentType(type);
 
-      resp.setHeader("Content-length", Integer.toString(template.length));
-      resp.setHeader("Content-type", contentType);
-    } else {
-      template = EMPTY_BYTE_ARRAY;
-    }
+            resp.setHeader("Content-length", Integer.toString(template.length));
+            resp.setHeader("Content-type", contentType);
+        } else {
+            template = EMPTY_BYTE_ARRAY;
+        }
 
-    segment.effectivelyBlocked();
+        segment.effectivelyBlocked();
 
-    try {
-      OutputStream os = resp.getOutputStream();
-      os.write(template);
-      os.close();
-    } catch (IOException e) {
-      log.warn("Error sending error page", e);
+        try {
+            OutputStream os = resp.getOutputStream();
+            os.write(template);
+            os.close();
+        } catch (IOException e) {
+            log.warn("Error sending error page", e);
+        }
     }
-  }
 
-  public static void commitBlockingResponse(
-      TraceSegment segment,
-      HttpServletRequest httpServletRequest,
-      HttpServletResponse resp,
-      Flow.Action.RequestBlockingAction rba) {
+    public static void commitBlockingResponse(
+            TraceSegment segment,
+            HttpServletRequest httpServletRequest,
+            HttpServletResponse resp,
+            Flow.Action.RequestBlockingAction rba) {
 
-    commitBlockingResponse(
-        segment,
-        httpServletRequest,
-        resp,
-        rba.getStatusCode(),
-        rba.getBlockingContentType(),
-        rba.getExtraHeaders(),
-        rba.getSecurityResponseId());
-  }
-
-  private static boolean start(HttpServletResponse resp, int statusCode) {
-    if (resp.isCommitted()) {
-      log.warn("response already committed, we can't change it");
+        commitBlockingResponse(
+                segment,
+                httpServletRequest,
+                resp,
+                rba.getStatusCode(),
+                rba.getBlockingContentType(),
+                rba.getExtraHeaders(),
+                rba.getSecurityResponseId());
     }
 
-    log.debug("Committing blocking response");
+    private static boolean start(HttpServletResponse resp, int statusCode) {
+        if (resp.isCommitted()) {
+            log.warn("response already committed, we can't change it");
+        }
+
+        log.debug("Committing blocking response");
 
-    resp.reset();
-    resp.setStatus(statusCode);
+        resp.reset();
+        resp.setStatus(statusCode);
 
-    return true;
-  }
+        return true;
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/test/java/foo/bar/DummyHttpSession.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/test/java/foo/bar/DummyHttpSession.java
index d602fbb1278..c1e8eee6387 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/test/java/foo/bar/DummyHttpSession.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/test/java/foo/bar/DummyHttpSession.java
@@ -6,76 +6,76 @@
 import javax.servlet.http.HttpSessionContext;
 
 public class DummyHttpSession implements HttpSession {
-  @Override
-  public long getCreationTime() {
-    return 0;
-  }
-
-  @Override
-  public String getId() {
-    return null;
-  }
-
-  @Override
-  public long getLastAccessedTime() {
-    return 0;
-  }
-
-  @Override
-  public ServletContext getServletContext() {
-    return null;
-  }
-
-  @Override
-  public void setMaxInactiveInterval(int interval) {}
-
-  @Override
-  public int getMaxInactiveInterval() {
-    return 0;
-  }
-
-  @Override
-  public HttpSessionContext getSessionContext() {
-    return null;
-  }
-
-  @Override
-  public Object getAttribute(String name) {
-    return null;
-  }
-
-  @Override
-  public Object getValue(String name) {
-    return null;
-  }
-
-  @Override
-  public Enumeration getAttributeNames() {
-    return null;
-  }
-
-  @Override
-  public String[] getValueNames() {
-    return new String[0];
-  }
-
-  @Override
-  public void setAttribute(String name, Object value) {}
-
-  @Override
-  public void putValue(String name, Object value) {}
-
-  @Override
-  public void removeAttribute(String name) {}
-
-  @Override
-  public void removeValue(String name) {}
-
-  @Override
-  public void invalidate() {}
-
-  @Override
-  public boolean isNew() {
-    return false;
-  }
+    @Override
+    public long getCreationTime() {
+        return 0;
+    }
+
+    @Override
+    public String getId() {
+        return null;
+    }
+
+    @Override
+    public long getLastAccessedTime() {
+        return 0;
+    }
+
+    @Override
+    public ServletContext getServletContext() {
+        return null;
+    }
+
+    @Override
+    public void setMaxInactiveInterval(int interval) {}
+
+    @Override
+    public int getMaxInactiveInterval() {
+        return 0;
+    }
+
+    @Override
+    public HttpSessionContext getSessionContext() {
+        return null;
+    }
+
+    @Override
+    public Object getAttribute(String name) {
+        return null;
+    }
+
+    @Override
+    public Object getValue(String name) {
+        return null;
+    }
+
+    @Override
+    public Enumeration getAttributeNames() {
+        return null;
+    }
+
+    @Override
+    public String[] getValueNames() {
+        return new String[0];
+    }
+
+    @Override
+    public void setAttribute(String name, Object value) {}
+
+    @Override
+    public void putValue(String name, Object value) {}
+
+    @Override
+    public void removeAttribute(String name) {}
+
+    @Override
+    public void removeValue(String name) {}
+
+    @Override
+    public void invalidate() {}
+
+    @Override
+    public boolean isNew() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/test/java/foo/bar/DummyResponse.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/test/java/foo/bar/DummyResponse.java
index adcc8440641..19393edd34d 100644
--- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/test/java/foo/bar/DummyResponse.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/test/java/foo/bar/DummyResponse.java
@@ -8,125 +8,125 @@
 import javax.servlet.http.HttpServletResponse;
 
 public class DummyResponse implements HttpServletResponse {
-  @Override
-  public void addCookie(Cookie cookie) {}
+    @Override
+    public void addCookie(Cookie cookie) {}
 
-  public void addCookie(CustomCookie cookie) {}
+    public void addCookie(CustomCookie cookie) {}
 
-  @Override
-  public boolean containsHeader(String name) {
-    return false;
-  }
+    @Override
+    public boolean containsHeader(String name) {
+        return false;
+    }
 
-  @Override
-  public String encodeURL(String url) {
-    return "Encoded_" + url;
-  }
+    @Override
+    public String encodeURL(String url) {
+        return "Encoded_" + url;
+    }
 
-  @Override
-  public String encodeRedirectURL(String url) {
-    return "Encoded_" + url;
-  }
+    @Override
+    public String encodeRedirectURL(String url) {
+        return "Encoded_" + url;
+    }
 
-  @Override
-  public String encodeUrl(String url) {
-    return null;
-  }
+    @Override
+    public String encodeUrl(String url) {
+        return null;
+    }
 
-  @Override
-  public String encodeRedirectUrl(String url) {
-    return null;
-  }
+    @Override
+    public String encodeRedirectUrl(String url) {
+        return null;
+    }
 
-  @Override
-  public void sendError(int sc, String msg) throws IOException {}
+    @Override
+    public void sendError(int sc, String msg) throws IOException {}
 
-  @Override
-  public void sendError(int sc) throws IOException {}
+    @Override
+    public void sendError(int sc) throws IOException {}
 
-  @Override
-  public void sendRedirect(String location) throws IOException {}
+    @Override
+    public void sendRedirect(String location) throws IOException {}
 
-  @Override
-  public void setDateHeader(String name, long date) {}
+    @Override
+    public void setDateHeader(String name, long date) {}
 
-  @Override
-  public void addDateHeader(String name, long date) {}
+    @Override
+    public void addDateHeader(String name, long date) {}
 
-  @Override
-  public void setHeader(String name, String value) {}
+    @Override
+    public void setHeader(String name, String value) {}
 
-  public void setHeader(CustomHeaderName name, String value) {}
+    public void setHeader(CustomHeaderName name, String value) {}
 
-  @Override
-  public void addHeader(String name, String value) {}
+    @Override
+    public void addHeader(String name, String value) {}
 
-  public void addHeader(CustomHeaderName name, String value) {}
+    public void addHeader(CustomHeaderName name, String value) {}
 
-  @Override
-  public void setIntHeader(String name, int value) {}
+    @Override
+    public void setIntHeader(String name, int value) {}
 
-  @Override
-  public void addIntHeader(String name, int value) {}
+    @Override
+    public void addIntHeader(String name, int value) {}
 
-  @Override
-  public void setStatus(int sc) {}
+    @Override
+    public void setStatus(int sc) {}
 
-  @Override
-  public void setStatus(int sc, String sm) {}
+    @Override
+    public void setStatus(int sc, String sm) {}
 
-  @Override
-  public String getCharacterEncoding() {
-    return null;
-  }
+    @Override
+    public String getCharacterEncoding() {
+        return null;
+    }
 
-  @Override
-  public ServletOutputStream getOutputStream() throws IOException {
-    return null;
-  }
+    @Override
+    public ServletOutputStream getOutputStream() throws IOException {
+        return null;
+    }
 
-  @Override
-  public PrintWriter getWriter() throws IOException {
-    return null;
-  }
+    @Override
+    public PrintWriter getWriter() throws IOException {
+        return null;
+    }
 
-  @Override
-  public void setContentLength(int len) {}
+    @Override
+    public void setContentLength(int len) {}
 
-  @Override
-  public void setContentType(String type) {}
+    @Override
+    public void setContentType(String type) {}
 
-  @Override
-  public void setBufferSize(int size) {}
+    @Override
+    public void setBufferSize(int size) {}
 
-  @Override
-  public int getBufferSize() {
-    return 0;
-  }
+    @Override
+    public int getBufferSize() {
+        return 0;
+    }
 
-  @Override
-  public void flushBuffer() throws IOException {}
+    @Override
+    public void flushBuffer() throws IOException {}
 
-  @Override
-  public void resetBuffer() {}
+    @Override
+    public void resetBuffer() {}
 
-  @Override
-  public boolean isCommitted() {
-    return false;
-  }
+    @Override
+    public boolean isCommitted() {
+        return false;
+    }
 
-  @Override
-  public void reset() {}
+    @Override
+    public void reset() {}
 
-  @Override
-  public void setLocale(Locale loc) {}
+    @Override
+    public void setLocale(Locale loc) {}
 
-  @Override
-  public Locale getLocale() {
-    return null;
-  }
+    @Override
+    public Locale getLocale() {
+        return null;
+    }
 
-  public static class CustomCookie {}
+    public static class CustomCookie {}
 
-  public static class CustomHeaderName {}
+    public static class CustomHeaderName {}
 }
diff --git a/dd-java-agent/instrumentation/slick-3.2/src/main/java/datadog/trace/instrumentation/slick/SlickRunnableInstrumentation.java b/dd-java-agent/instrumentation/slick-3.2/src/main/java/datadog/trace/instrumentation/slick/SlickRunnableInstrumentation.java
index c4e6fb7b5fd..bf5434fb536 100644
--- a/dd-java-agent/instrumentation/slick-3.2/src/main/java/datadog/trace/instrumentation/slick/SlickRunnableInstrumentation.java
+++ b/dd-java-agent/instrumentation/slick-3.2/src/main/java/datadog/trace/instrumentation/slick/SlickRunnableInstrumentation.java
@@ -23,50 +23,49 @@
 /** Instruments runnables from the slick framework, which are excluded elsewhere. */
 @AutoService(InstrumenterModule.class)
 public final class SlickRunnableInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public SlickRunnableInstrumentation() {
-    super("slick");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(Runnable.class.getName(), State.class.getName());
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public SlickRunnableInstrumentation() {
+        super("slick");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "slick.util.AsyncExecutor"; // implies existence of the various slick-runnables
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(Runnable.class.getName(), State.class.getName());
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return nameStartsWith("slick.").and(implementsInterface(named(Runnable.class.getName())));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "slick.util.AsyncExecutor"; // implies existence of the various slick-runnables
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
-    transformer.applyAdvice(named("run").and(takesNoArguments()), getClass().getName() + "$Run");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return nameStartsWith("slick.").and(implementsInterface(named(Runnable.class.getName())));
+    }
 
-  public static final class Construct {
-    @Advice.OnMethodExit
-    public static void capture(@Advice.This Runnable zis) {
-      AdviceUtils.capture(InstrumentationContext.get(Runnable.class, State.class), zis);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$Construct");
+        transformer.applyAdvice(named("run").and(takesNoArguments()), getClass().getName() + "$Run");
     }
-  }
 
-  public static final class Run {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(@Advice.This final Runnable zis) {
-      final ContextStore<Runnable, State> contextStore =
-          InstrumentationContext.get(Runnable.class, State.class);
-      return AdviceUtils.startTaskScope(contextStore, zis);
+    public static final class Construct {
+        @Advice.OnMethodExit
+        public static void capture(@Advice.This Runnable zis) {
+            AdviceUtils.capture(InstrumentationContext.get(Runnable.class, State.class), zis);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Enter final ContextScope scope) {
-      AdviceUtils.endTaskScope(scope);
+    public static final class Run {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(@Advice.This final Runnable zis) {
+            final ContextStore<Runnable, State> contextStore = InstrumentationContext.get(Runnable.class, State.class);
+            return AdviceUtils.startTaskScope(contextStore, zis);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Enter final ContextScope scope) {
+            AdviceUtils.endTaskScope(scope);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/snakeyaml-1.33/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlHelper.java b/dd-java-agent/instrumentation/snakeyaml-1.33/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlHelper.java
index d2a94f5ec19..27eb39d3e2b 100644
--- a/dd-java-agent/instrumentation/snakeyaml-1.33/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlHelper.java
+++ b/dd-java-agent/instrumentation/snakeyaml-1.33/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlHelper.java
@@ -8,32 +8,32 @@
 import org.yaml.snakeyaml.constructor.BaseConstructor;
 
 public final class SnakeYamlHelper {
-  private SnakeYamlHelper() {}
+    private SnakeYamlHelper() {}
 
-  private static final Logger log = LoggerFactory.getLogger(SnakeYamlHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(SnakeYamlHelper.class);
 
-  private static final Field CONSTRUCTOR = prepareConstructor();
+    private static final Field CONSTRUCTOR = prepareConstructor();
 
-  private static Field prepareConstructor() {
-    Field constructor = null;
-    try {
-      constructor = Yaml.class.getDeclaredField("constructor");
-      constructor.setAccessible(true);
-    } catch (Throwable e) {
-      log.debug("Failed to get Yaml constructor", e);
-      return null;
+    private static Field prepareConstructor() {
+        Field constructor = null;
+        try {
+            constructor = Yaml.class.getDeclaredField("constructor");
+            constructor.setAccessible(true);
+        } catch (Throwable e) {
+            log.debug("Failed to get Yaml constructor", e);
+            return null;
+        }
+        return constructor;
     }
-    return constructor;
-  }
 
-  public static BaseConstructor fetchConstructor(Yaml yaml) {
-    if (CONSTRUCTOR == null) {
-      return null;
+    public static BaseConstructor fetchConstructor(Yaml yaml) {
+        if (CONSTRUCTOR == null) {
+            return null;
+        }
+        try {
+            return (BaseConstructor) CONSTRUCTOR.get(yaml);
+        } catch (IllegalAccessException e) {
+            throw new UndeclaredThrowableException(e);
+        }
     }
-    try {
-      return (BaseConstructor) CONSTRUCTOR.get(yaml);
-    } catch (IllegalAccessException e) {
-      throw new UndeclaredThrowableException(e);
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/snakeyaml-1.33/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlInstrumentation.java b/dd-java-agent/instrumentation/snakeyaml-1.33/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlInstrumentation.java
index 3a081f463e4..27736516a8d 100644
--- a/dd-java-agent/instrumentation/snakeyaml-1.33/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlInstrumentation.java
+++ b/dd-java-agent/instrumentation/snakeyaml-1.33/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlInstrumentation.java
@@ -23,61 +23,59 @@
 
 @AutoService(InstrumenterModule.class)
 public class SnakeYamlInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public SnakeYamlInstrumentation() {
-    super("snakeyaml", "snakeyaml");
-  }
+    public SnakeYamlInstrumentation() {
+        super("snakeyaml", "snakeyaml");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "snakeyaml-1.x";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "snakeyaml-1.x";
+    }
 
-  static final ElementMatcher.Junction<ClassLoader> NOT_SNAKEYAML_2 =
-      not(hasClassNamed("org.yaml.snakeyaml.inspector.TagInspector"));
+    static final ElementMatcher.Junction<ClassLoader> NOT_SNAKEYAML_2 =
+            not(hasClassNamed("org.yaml.snakeyaml.inspector.TagInspector"));
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return NOT_SNAKEYAML_2;
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return NOT_SNAKEYAML_2;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.yaml.snakeyaml.Yaml";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.yaml.snakeyaml.Yaml";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("load")
-            .and(isMethod())
-            .and(
-                takesArguments(String.class)
-                    .or(takesArguments(InputStream.class))
-                    .or(takesArguments(Reader.class))),
-        SnakeYamlInstrumentation.class.getName() + "$LoadAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("load")
+                        .and(isMethod())
+                        .and(takesArguments(String.class)
+                                .or(takesArguments(InputStream.class))
+                                .or(takesArguments(Reader.class))),
+                SnakeYamlInstrumentation.class.getName() + "$LoadAdvice");
+    }
 
-  public static class LoadAdvice {
+    public static class LoadAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.UNTRUSTED_DESERIALIZATION)
-    public static void onEnter(
-        @Advice.Argument(0) final Object data, @Advice.This final Yaml self) {
-      if (data == null) {
-        return;
-      }
-      final UntrustedDeserializationModule untrustedDeserialization =
-          InstrumentationBridge.UNTRUSTED_DESERIALIZATION;
-      if (untrustedDeserialization == null) {
-        return;
-      }
-      final BaseConstructor constructor = SnakeYamlHelper.fetchConstructor(self);
-      // For versions prior to 1.7 (not included), the constructor field is null
-      if (constructor instanceof Constructor || constructor == null) {
-        untrustedDeserialization.onObject(data);
-      }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.UNTRUSTED_DESERIALIZATION)
+        public static void onEnter(@Advice.Argument(0) final Object data, @Advice.This final Yaml self) {
+            if (data == null) {
+                return;
+            }
+            final UntrustedDeserializationModule untrustedDeserialization =
+                    InstrumentationBridge.UNTRUSTED_DESERIALIZATION;
+            if (untrustedDeserialization == null) {
+                return;
+            }
+            final BaseConstructor constructor = SnakeYamlHelper.fetchConstructor(self);
+            // For versions prior to 1.7 (not included), the constructor field is null
+            if (constructor instanceof Constructor || constructor == null) {
+                untrustedDeserialization.onObject(data);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/AbstractClusterInstrumentation.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/AbstractClusterInstrumentation.java
index 218750a794f..78b573bc393 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/AbstractClusterInstrumentation.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/AbstractClusterInstrumentation.java
@@ -21,55 +21,53 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
 
-public class AbstractClusterInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class AbstractClusterInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.alipay.sofa.rpc.client.AbstractCluster";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("invoke"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("com.alipay.sofa.rpc.core.request.SofaRequest"))),
-        getClass().getName() + "$InvokeAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.alipay.sofa.rpc.client.AbstractCluster";
+    }
 
-  public static class InvokeAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(
-        @Advice.This AbstractCluster self, @Advice.Argument(0) SofaRequest request) {
-      ConsumerConfig config = self.getConsumerConfig();
-      String protocol = config != null ? config.getProtocol() : null;
-      AgentSpan span = startSpan("sofarpc-client", SOFA_RPC_CLIENT);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, request);
-      if (protocol != null) {
-        span.setTag("sofarpc.protocol", protocol);
-      }
-      ContextScope scope = activateSpan(span);
-      defaultPropagator().inject(span, request, SETTER);
-      return scope;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("invoke"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("com.alipay.sofa.rpc.core.request.SofaRequest"))),
+                getClass().getName() + "$InvokeAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter ContextScope scope,
-        @Advice.Return SofaResponse response,
-        @Advice.Thrown Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      AgentSpan span = spanFromScope(scope);
-      DECORATE.onResponse(span, response);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+    public static class InvokeAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(@Advice.This AbstractCluster self, @Advice.Argument(0) SofaRequest request) {
+            ConsumerConfig config = self.getConsumerConfig();
+            String protocol = config != null ? config.getProtocol() : null;
+            AgentSpan span = startSpan("sofarpc-client", SOFA_RPC_CLIENT);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, request);
+            if (protocol != null) {
+                span.setTag("sofarpc.protocol", protocol);
+            }
+            ContextScope scope = activateSpan(span);
+            defaultPropagator().inject(span, request, SETTER);
+            return scope;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter ContextScope scope,
+                @Advice.Return SofaResponse response,
+                @Advice.Thrown Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            AgentSpan span = spanFromScope(scope);
+            DECORATE.onResponse(span, response);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/BoltServerProcessorInstrumentation.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/BoltServerProcessorInstrumentation.java
index 35622f2a105..5d9bcdbe02e 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/BoltServerProcessorInstrumentation.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/BoltServerProcessorInstrumentation.java
@@ -8,33 +8,32 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import net.bytebuddy.asm.Advice;
 
-public class BoltServerProcessorInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class BoltServerProcessorInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.alipay.sofa.rpc.server.bolt.BoltServerProcessor";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("handleRequest"))
-            .and(takesArguments(3))
-            .and(takesArgument(2, named("com.alipay.sofa.rpc.core.request.SofaRequest"))),
-        getClass().getName() + "$HandleRequestAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.alipay.sofa.rpc.server.bolt.BoltServerProcessor";
+    }
 
-  public static class HandleRequestAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter() {
-      SofaRpcProtocolContext.set("bolt");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("handleRequest"))
+                        .and(takesArguments(3))
+                        .and(takesArgument(2, named("com.alipay.sofa.rpc.core.request.SofaRequest"))),
+                getClass().getName() + "$HandleRequestAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit() {
-      SofaRpcProtocolContext.clear();
+    public static class HandleRequestAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter() {
+            SofaRpcProtocolContext.set("bolt");
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit() {
+            SofaRpcProtocolContext.clear();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/H2cServerTaskInstrumentation.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/H2cServerTaskInstrumentation.java
index 8657125dac3..5325dee1b27 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/H2cServerTaskInstrumentation.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/H2cServerTaskInstrumentation.java
@@ -7,29 +7,28 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import net.bytebuddy.asm.Advice;
 
-public class H2cServerTaskInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class H2cServerTaskInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.alipay.sofa.rpc.server.http.AbstractHttpServerTask";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("run")).and(takesNoArguments()), getClass().getName() + "$RunAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.alipay.sofa.rpc.server.http.AbstractHttpServerTask";
+    }
 
-  public static class RunAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter() {
-      SofaRpcProtocolContext.set("h2c");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("run")).and(takesNoArguments()), getClass().getName() + "$RunAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit() {
-      SofaRpcProtocolContext.clear();
+    public static class RunAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter() {
+            SofaRpcProtocolContext.set("h2c");
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit() {
+            SofaRpcProtocolContext.clear();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/ProviderProxyInvokerInstrumentation.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/ProviderProxyInvokerInstrumentation.java
index 90adc43122e..e7533b22c7d 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/ProviderProxyInvokerInstrumentation.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/ProviderProxyInvokerInstrumentation.java
@@ -20,62 +20,60 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
 import net.bytebuddy.asm.Advice;
 
-public class ProviderProxyInvokerInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class ProviderProxyInvokerInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.alipay.sofa.rpc.server.ProviderProxyInvoker";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("invoke"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("com.alipay.sofa.rpc.core.request.SofaRequest"))),
-        getClass().getName() + "$InvokeAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.alipay.sofa.rpc.server.ProviderProxyInvoker";
+    }
 
-  public static class InvokeAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(@Advice.Argument(0) SofaRequest request) {
-      // Protocol is set in thread-local by transport-specific instrumentation before this call.
-      // If null, the transport is not instrumented — skip.
-      String protocol = SofaRpcProtocolContext.get();
-      if (protocol == null) {
-        return null;
-      }
-      // For Bolt and H2C the client injects trace context into SofaRequest.requestProps;
-      // extract it here. For Triple, parentContext will be null and startSpan() without an
-      // explicit parent naturally attaches to the active grpc.server span. For REST,
-      // parentContext will also be null and the active netty.request span becomes the parent.
-      AgentSpanContext parentContext = extractContextAndGetSpanContext(request, GETTER);
-      AgentSpan span =
-          parentContext != null
-              ? startSpan("sofarpc-server", SOFA_RPC_SERVER, parentContext)
-              : startSpan("sofarpc-server", SOFA_RPC_SERVER);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, request);
-      span.setTag("sofarpc.protocol", protocol);
-      return activateSpan(span);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("invoke"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("com.alipay.sofa.rpc.core.request.SofaRequest"))),
+                getClass().getName() + "$InvokeAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter ContextScope scope,
-        @Advice.Return SofaResponse response,
-        @Advice.Thrown Throwable throwable) {
-      if (scope == null) {
-        return;
-      }
-      AgentSpan span = spanFromScope(scope);
-      DECORATE.onResponse(span, response);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+    public static class InvokeAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(@Advice.Argument(0) SofaRequest request) {
+            // Protocol is set in thread-local by transport-specific instrumentation before this call.
+            // If null, the transport is not instrumented — skip.
+            String protocol = SofaRpcProtocolContext.get();
+            if (protocol == null) {
+                return null;
+            }
+            // For Bolt and H2C the client injects trace context into SofaRequest.requestProps;
+            // extract it here. For Triple, parentContext will be null and startSpan() without an
+            // explicit parent naturally attaches to the active grpc.server span. For REST,
+            // parentContext will also be null and the active netty.request span becomes the parent.
+            AgentSpanContext parentContext = extractContextAndGetSpanContext(request, GETTER);
+            AgentSpan span = parentContext != null
+                    ? startSpan("sofarpc-server", SOFA_RPC_SERVER, parentContext)
+                    : startSpan("sofarpc-server", SOFA_RPC_SERVER);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, request);
+            span.setTag("sofarpc.protocol", protocol);
+            return activateSpan(span);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter ContextScope scope,
+                @Advice.Return SofaResponse response,
+                @Advice.Thrown Throwable throwable) {
+            if (scope == null) {
+                return;
+            }
+            AgentSpan span = spanFromScope(scope);
+            DECORATE.onResponse(span, response);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/RestServerHandlerInstrumentation.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/RestServerHandlerInstrumentation.java
index 7ac377311a2..cff10c43b6d 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/RestServerHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/RestServerHandlerInstrumentation.java
@@ -7,30 +7,29 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import net.bytebuddy.asm.Advice;
 
-public class RestServerHandlerInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class RestServerHandlerInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.alipay.sofa.rpc.server.rest.SofaRestRequestHandler";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("channelRead0")).and(takesArguments(2)),
-        getClass().getName() + "$ChannelRead0Advice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.alipay.sofa.rpc.server.rest.SofaRestRequestHandler";
+    }
 
-  public static class ChannelRead0Advice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter() {
-      SofaRpcProtocolContext.set("rest");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("channelRead0")).and(takesArguments(2)),
+                getClass().getName() + "$ChannelRead0Advice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit() {
-      SofaRpcProtocolContext.clear();
+    public static class ChannelRead0Advice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter() {
+            SofaRpcProtocolContext.set("rest");
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit() {
+            SofaRpcProtocolContext.clear();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcClientDecorator.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcClientDecorator.java
index a626be864dd..9510240a77a 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcClientDecorator.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcClientDecorator.java
@@ -11,55 +11,54 @@
 
 public class SofaRpcClientDecorator extends ClientDecorator {
 
-  public static final CharSequence SOFA_RPC_CLIENT =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().client().operationForProtocol("sofarpc"));
+    public static final CharSequence SOFA_RPC_CLIENT =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().client().operationForProtocol("sofarpc"));
 
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("sofarpc-client");
+    private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("sofarpc-client");
 
-  public static final SofaRpcClientDecorator DECORATE = new SofaRpcClientDecorator();
+    public static final SofaRpcClientDecorator DECORATE = new SofaRpcClientDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"sofarpc"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"sofarpc"};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.RPC;
-  }
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
 
-  @Override
-  protected String service() {
-    return null;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.RPC;
+    }
 
-  public void onRequest(AgentSpan span, SofaRequest request) {
-    span.setTag("rpc.system", "sofarpc");
-    if (request == null) {
-      return;
+    @Override
+    protected String service() {
+        return null;
     }
-    String serviceName = request.getTargetServiceUniqueName();
-    String methodName = request.getMethodName();
-    span.setTag(Tags.RPC_SERVICE, serviceName);
-    span.setTag("rpc.method", methodName);
-    // peer.service is derived automatically by PeerServiceCalculator from rpc.service.
-    if (serviceName != null && methodName != null) {
-      span.setResourceName(serviceName + "/" + methodName);
-    } else if (methodName != null) {
-      span.setResourceName(methodName);
+
+    public void onRequest(AgentSpan span, SofaRequest request) {
+        span.setTag("rpc.system", "sofarpc");
+        if (request == null) {
+            return;
+        }
+        String serviceName = request.getTargetServiceUniqueName();
+        String methodName = request.getMethodName();
+        span.setTag(Tags.RPC_SERVICE, serviceName);
+        span.setTag("rpc.method", methodName);
+        // peer.service is derived automatically by PeerServiceCalculator from rpc.service.
+        if (serviceName != null && methodName != null) {
+            span.setResourceName(serviceName + "/" + methodName);
+        } else if (methodName != null) {
+            span.setResourceName(methodName);
+        }
     }
-  }
 
-  public void onResponse(AgentSpan span, SofaResponse response) {
-    if (response != null && response.isError()) {
-      span.setError(true);
-      span.setTag("error.message", response.getErrorMsg());
+    public void onResponse(AgentSpan span, SofaResponse response) {
+        if (response != null && response.isError()) {
+            span.setError(true);
+            span.setTag("error.message", response.getErrorMsg());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcExtractAdapter.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcExtractAdapter.java
index b5c36c45258..d6e0822a693 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcExtractAdapter.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcExtractAdapter.java
@@ -6,20 +6,20 @@
 
 public final class SofaRpcExtractAdapter implements AgentPropagation.ContextVisitor<SofaRequest> {
 
-  public static final SofaRpcExtractAdapter GETTER = new SofaRpcExtractAdapter();
+    public static final SofaRpcExtractAdapter GETTER = new SofaRpcExtractAdapter();
 
-  @Override
-  public void forEachKey(SofaRequest carrier, AgentPropagation.KeyClassifier classifier) {
-    Map<String, Object> props = carrier.getRequestProps();
-    if (props == null || props.isEmpty()) {
-      return;
-    }
-    for (Map.Entry<String, Object> entry : props.entrySet()) {
-      if (entry.getValue() instanceof String) {
-        if (!classifier.accept(entry.getKey(), (String) entry.getValue())) {
-          return;
+    @Override
+    public void forEachKey(SofaRequest carrier, AgentPropagation.KeyClassifier classifier) {
+        Map<String, Object> props = carrier.getRequestProps();
+        if (props == null || props.isEmpty()) {
+            return;
+        }
+        for (Map.Entry<String, Object> entry : props.entrySet()) {
+            if (entry.getValue() instanceof String) {
+                if (!classifier.accept(entry.getKey(), (String) entry.getValue())) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcInjectAdapter.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcInjectAdapter.java
index f5f8e4ebe0e..2f99e5646d0 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcInjectAdapter.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcInjectAdapter.java
@@ -5,10 +5,10 @@
 
 public final class SofaRpcInjectAdapter implements CarrierSetter<SofaRequest> {
 
-  public static final SofaRpcInjectAdapter SETTER = new SofaRpcInjectAdapter();
+    public static final SofaRpcInjectAdapter SETTER = new SofaRpcInjectAdapter();
 
-  @Override
-  public void set(SofaRequest carrier, String key, String value) {
-    carrier.addRequestProp(key, value);
-  }
+    @Override
+    public void set(SofaRequest carrier, String key, String value) {
+        carrier.addRequestProp(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcModule.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcModule.java
index 1afcba1c677..cda726262a6 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcModule.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcModule.java
@@ -10,18 +10,18 @@
 @AutoService(InstrumenterModule.class)
 public class SofaRpcModule extends InstrumenterModule.Tracing {
 
-  public SofaRpcModule() {
-    super("sofarpc");
-  }
+    public SofaRpcModule() {
+        super("sofarpc");
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return asList(
-        new AbstractClusterInstrumentation(),
-        new BoltServerProcessorInstrumentation(),
-        new H2cServerTaskInstrumentation(),
-        new RestServerHandlerInstrumentation(),
-        new TripleServerInstrumentation(),
-        new ProviderProxyInvokerInstrumentation());
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return asList(
+                new AbstractClusterInstrumentation(),
+                new BoltServerProcessorInstrumentation(),
+                new H2cServerTaskInstrumentation(),
+                new RestServerHandlerInstrumentation(),
+                new TripleServerInstrumentation(),
+                new ProviderProxyInvokerInstrumentation());
+    }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcProtocolContext.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcProtocolContext.java
index 09bbafae508..f3aec12fe08 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcProtocolContext.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcProtocolContext.java
@@ -3,19 +3,19 @@
 /** Thread-local carrier for the SOFA RPC transport protocol name. */
 public final class SofaRpcProtocolContext {
 
-  private static final ThreadLocal<String> PROTOCOL = new ThreadLocal<>();
+    private static final ThreadLocal<String> PROTOCOL = new ThreadLocal<>();
 
-  private SofaRpcProtocolContext() {}
+    private SofaRpcProtocolContext() {}
 
-  public static void set(String protocol) {
-    PROTOCOL.set(protocol);
-  }
+    public static void set(String protocol) {
+        PROTOCOL.set(protocol);
+    }
 
-  public static String get() {
-    return PROTOCOL.get();
-  }
+    public static String get() {
+        return PROTOCOL.get();
+    }
 
-  public static void clear() {
-    PROTOCOL.remove();
-  }
+    public static void clear() {
+        PROTOCOL.remove();
+    }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcServerDecorator.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcServerDecorator.java
index ba2f44bae88..a821b9257cc 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcServerDecorator.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcServerDecorator.java
@@ -12,64 +12,63 @@
 
 public class SofaRpcServerDecorator extends ServerDecorator {
 
-  public static final CharSequence SOFA_RPC_SERVER =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().server().operationForProtocol("sofarpc"));
+    public static final CharSequence SOFA_RPC_SERVER =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().server().operationForProtocol("sofarpc"));
 
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("sofarpc-server");
+    private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("sofarpc-server");
 
-  public static final SofaRpcServerDecorator DECORATE = new SofaRpcServerDecorator();
+    public static final SofaRpcServerDecorator DECORATE = new SofaRpcServerDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"sofarpc"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.RPC;
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"sofarpc"};
+    }
 
-  @Override
-  protected void doAfterStart(@Nonnull AgentSpan span) {
-    span.setMeasured(true);
-    super.doAfterStart(span);
-  }
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
 
-  public void onRequest(AgentSpan span, SofaRequest request) {
-    span.setTag("rpc.system", "sofarpc");
-    if (request == null) {
-      return;
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.RPC;
     }
-    String serviceName = request.getTargetServiceUniqueName();
-    String methodName = request.getMethodName();
-    span.setTag(Tags.RPC_SERVICE, serviceName);
-    span.setTag("rpc.method", methodName);
-    if (serviceName != null && methodName != null) {
-      span.setResourceName(serviceName + "/" + methodName);
-    } else if (methodName != null) {
-      span.setResourceName(methodName);
+
+    @Override
+    protected void doAfterStart(@Nonnull AgentSpan span) {
+        span.setMeasured(true);
+        super.doAfterStart(span);
     }
-  }
 
-  public void onResponse(AgentSpan span, SofaResponse response) {
-    if (response == null) {
-      return;
+    public void onRequest(AgentSpan span, SofaRequest request) {
+        span.setTag("rpc.system", "sofarpc");
+        if (request == null) {
+            return;
+        }
+        String serviceName = request.getTargetServiceUniqueName();
+        String methodName = request.getMethodName();
+        span.setTag(Tags.RPC_SERVICE, serviceName);
+        span.setTag("rpc.method", methodName);
+        if (serviceName != null && methodName != null) {
+            span.setResourceName(serviceName + "/" + methodName);
+        } else if (methodName != null) {
+            span.setResourceName(methodName);
+        }
     }
-    if (response.isError()) {
-      // RPC-layer error (timeout, serialization failure, etc.)
-      span.setError(true);
-      span.setTag("error.message", response.getErrorMsg());
-    } else if (response.getAppResponse() instanceof Throwable) {
-      // Application exception: ProviderProxyInvoker catches it and stores in appResponse
-      Throwable t = (Throwable) response.getAppResponse();
-      span.setError(true);
-      span.setTag("error.message", t.getMessage());
+
+    public void onResponse(AgentSpan span, SofaResponse response) {
+        if (response == null) {
+            return;
+        }
+        if (response.isError()) {
+            // RPC-layer error (timeout, serialization failure, etc.)
+            span.setError(true);
+            span.setTag("error.message", response.getErrorMsg());
+        } else if (response.getAppResponse() instanceof Throwable) {
+            // Application exception: ProviderProxyInvoker catches it and stores in appResponse
+            Throwable t = (Throwable) response.getAppResponse();
+            span.setError(true);
+            span.setTag("error.message", t.getMessage());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/TripleServerInstrumentation.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/TripleServerInstrumentation.java
index 38abc4fb22b..32f8698ff3e 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/TripleServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/TripleServerInstrumentation.java
@@ -8,33 +8,32 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import net.bytebuddy.asm.Advice;
 
-public class TripleServerInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class TripleServerInstrumentation implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "com.alipay.sofa.rpc.server.triple.UniqueIdInvoker";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("invoke"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("com.alipay.sofa.rpc.core.request.SofaRequest"))),
-        getClass().getName() + "$InvokeAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.alipay.sofa.rpc.server.triple.UniqueIdInvoker";
+    }
 
-  public static class InvokeAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter() {
-      SofaRpcProtocolContext.set("tri");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("invoke"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("com.alipay.sofa.rpc.core.request.SofaRequest"))),
+                getClass().getName() + "$InvokeAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit() {
-      SofaRpcProtocolContext.clear();
+    public static class InvokeAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter() {
+            SofaRpcProtocolContext.set("tri");
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit() {
+            SofaRpcProtocolContext.clear();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/RestGreeterService.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/RestGreeterService.java
index 981fa7c4176..8c991320185 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/RestGreeterService.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/RestGreeterService.java
@@ -8,8 +8,8 @@
 
 @Path("/greeter")
 public interface RestGreeterService {
-  @GET
-  @Path("/hello/{name}")
-  @Produces(MediaType.TEXT_PLAIN)
-  String sayHello(@PathParam("name") String name);
+    @GET
+    @Path("/hello/{name}")
+    @Produces(MediaType.TEXT_PLAIN)
+    String sayHello(@PathParam("name") String name);
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/RestGreeterServiceImpl.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/RestGreeterServiceImpl.java
index 5bd3a2fc53e..345fcd4f8d3 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/RestGreeterServiceImpl.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/RestGreeterServiceImpl.java
@@ -1,8 +1,8 @@
 package datadog.trace.instrumentation.sofarpc;
 
 public class RestGreeterServiceImpl implements RestGreeterService {
-  @Override
-  public String sayHello(String name) {
-    return "Hello, " + name;
-  }
+    @Override
+    public String sayHello(String name) {
+        return "Hello, " + name;
+    }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcRestTest.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcRestTest.java
index a7ed308db8e..473a37b0af3 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcRestTest.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcRestTest.java
@@ -41,104 +41,105 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SofaRpcRestTest extends AbstractInstrumentationTest {
 
-  private static final int PORT = 12205;
-
-  private ProviderConfig<RestGreeterService> restProviderConfig;
-  private RestGreeterService greeterService;
-
-  @BeforeAll
-  void setupServers() {
-    restProviderConfig =
-        new ProviderConfig<RestGreeterService>()
-            .setApplication(new ApplicationConfig().setAppName("test-server"))
-            .setInterfaceId(RestGreeterService.class.getName())
-            .setRef(new RestGreeterServiceImpl())
-            .setServer(new ServerConfig().setProtocol("rest").setHost("127.0.0.1").setPort(PORT))
-            .setRegister(false);
-    restProviderConfig.export();
-
-    greeterService =
-        new ConsumerConfig<RestGreeterService>()
-            .setApplication(new ApplicationConfig().setAppName("test-client"))
-            .setInterfaceId(RestGreeterService.class.getName())
-            .setDirectUrl("rest://127.0.0.1:" + PORT)
-            .setProtocol("rest")
-            .setRegister(false)
-            .setSubscribe(false)
-            .refer();
-  }
-
-  @AfterAll
-  void tearDownServers() {
-    if (restProviderConfig != null) {
-      restProviderConfig.unExport();
+    private static final int PORT = 12205;
+
+    private ProviderConfig<RestGreeterService> restProviderConfig;
+    private RestGreeterService greeterService;
+
+    @BeforeAll
+    void setupServers() {
+        restProviderConfig = new ProviderConfig<RestGreeterService>()
+                .setApplication(new ApplicationConfig().setAppName("test-server"))
+                .setInterfaceId(RestGreeterService.class.getName())
+                .setRef(new RestGreeterServiceImpl())
+                .setServer(new ServerConfig()
+                        .setProtocol("rest")
+                        .setHost("127.0.0.1")
+                        .setPort(PORT))
+                .setRegister(false);
+        restProviderConfig.export();
+
+        greeterService = new ConsumerConfig<RestGreeterService>()
+                .setApplication(new ApplicationConfig().setAppName("test-client"))
+                .setInterfaceId(RestGreeterService.class.getName())
+                .setDirectUrl("rest://127.0.0.1:" + PORT)
+                .setProtocol("rest")
+                .setRegister(false)
+                .setSubscribe(false)
+                .refer();
     }
-  }
-
-  @Test
-  void clientAndServerSpansForRestCall() throws InterruptedException, TimeoutException {
-    String serviceUniqueName = RestGreeterService.class.getName() + ":1.0";
-
-    AgentSpan callerSpan = startSpan("test", "caller");
-    ContextScope callerScope = activateSpan(callerSpan);
-    String reply;
-    try {
-      reply = greeterService.sayHello("World");
-    } finally {
-      callerScope.close();
-      callerSpan.finish();
+
+    @AfterAll
+    void tearDownServers() {
+        if (restProviderConfig != null) {
+            restProviderConfig.unExport();
+        }
+    }
+
+    @Test
+    void clientAndServerSpansForRestCall() throws InterruptedException, TimeoutException {
+        String serviceUniqueName = RestGreeterService.class.getName() + ":1.0";
+
+        AgentSpan callerSpan = startSpan("test", "caller");
+        ContextScope callerScope = activateSpan(callerSpan);
+        String reply;
+        try {
+            reply = greeterService.sayHello("World");
+        } finally {
+            callerScope.close();
+            callerSpan.finish();
+        }
+
+        assertEquals("Hello, World", reply);
+
+        writer.waitForTraces(2);
+        List<DDSpan> allSpans = flattenTraces();
+
+        DDSpan clientSofaSpan = findSpan(allSpans, "sofarpc.request", "client");
+        DDSpan serverSofaSpan = findSpan(allSpans, "sofarpc.request", "server");
+
+        // Client span — full service unique name is available on client side
+        assertNotNull(clientSofaSpan, "Expected sofarpc client span");
+        assertEquals(
+                serviceUniqueName + "/sayHello",
+                clientSofaSpan.getResourceName().toString());
+        assertEquals("rest", String.valueOf(clientSofaSpan.getTag("sofarpc.protocol")));
+        assertEquals("sofarpc-client", String.valueOf(clientSofaSpan.getTag("component")));
+        assertEquals("client", String.valueOf(clientSofaSpan.getTag("span.kind")));
+        assertEquals("sofarpc", String.valueOf(clientSofaSpan.getTag("rpc.system")));
+        assertEquals("sayHello", String.valueOf(clientSofaSpan.getTag("rpc.method")));
+        assertEquals(callerSpan.getSpanId(), clientSofaSpan.getParentId());
+        assertFalse(clientSofaSpan.isError());
+
+        // Server span — SofaRequest.getTargetServiceUniqueName() is null on the server side for REST
+        // (not propagated through the JAX-RS layer), so resourceName is the method name only
+        // and rpc.service tag is absent. Parent link to the client trace is provided by
+        // HTTP instrumentation (not active in this test), so this span is a trace root here.
+        assertNotNull(serverSofaSpan, "Expected sofarpc server span");
+        assertEquals("sayHello", serverSofaSpan.getResourceName().toString());
+        assertEquals("rest", String.valueOf(serverSofaSpan.getTag("sofarpc.protocol")));
+        assertEquals("sofarpc-server", String.valueOf(serverSofaSpan.getTag("component")));
+        assertEquals("server", String.valueOf(serverSofaSpan.getTag("span.kind")));
+        assertEquals("sofarpc", String.valueOf(serverSofaSpan.getTag("rpc.system")));
+        assertNull(serverSofaSpan.getTag("rpc.service"), "rpc.service should be absent for REST server span");
+        assertEquals("sayHello", String.valueOf(serverSofaSpan.getTag("rpc.method")));
+        assertFalse(serverSofaSpan.isError());
     }
 
-    assertEquals("Hello, World", reply);
-
-    writer.waitForTraces(2);
-    List<DDSpan> allSpans = flattenTraces();
-
-    DDSpan clientSofaSpan = findSpan(allSpans, "sofarpc.request", "client");
-    DDSpan serverSofaSpan = findSpan(allSpans, "sofarpc.request", "server");
-
-    // Client span — full service unique name is available on client side
-    assertNotNull(clientSofaSpan, "Expected sofarpc client span");
-    assertEquals(serviceUniqueName + "/sayHello", clientSofaSpan.getResourceName().toString());
-    assertEquals("rest", String.valueOf(clientSofaSpan.getTag("sofarpc.protocol")));
-    assertEquals("sofarpc-client", String.valueOf(clientSofaSpan.getTag("component")));
-    assertEquals("client", String.valueOf(clientSofaSpan.getTag("span.kind")));
-    assertEquals("sofarpc", String.valueOf(clientSofaSpan.getTag("rpc.system")));
-    assertEquals("sayHello", String.valueOf(clientSofaSpan.getTag("rpc.method")));
-    assertEquals(callerSpan.getSpanId(), clientSofaSpan.getParentId());
-    assertFalse(clientSofaSpan.isError());
-
-    // Server span — SofaRequest.getTargetServiceUniqueName() is null on the server side for REST
-    // (not propagated through the JAX-RS layer), so resourceName is the method name only
-    // and rpc.service tag is absent. Parent link to the client trace is provided by
-    // HTTP instrumentation (not active in this test), so this span is a trace root here.
-    assertNotNull(serverSofaSpan, "Expected sofarpc server span");
-    assertEquals("sayHello", serverSofaSpan.getResourceName().toString());
-    assertEquals("rest", String.valueOf(serverSofaSpan.getTag("sofarpc.protocol")));
-    assertEquals("sofarpc-server", String.valueOf(serverSofaSpan.getTag("component")));
-    assertEquals("server", String.valueOf(serverSofaSpan.getTag("span.kind")));
-    assertEquals("sofarpc", String.valueOf(serverSofaSpan.getTag("rpc.system")));
-    assertNull(
-        serverSofaSpan.getTag("rpc.service"), "rpc.service should be absent for REST server span");
-    assertEquals("sayHello", String.valueOf(serverSofaSpan.getTag("rpc.method")));
-    assertFalse(serverSofaSpan.isError());
-  }
-
-  private List<DDSpan> flattenTraces() {
-    List<DDSpan> result = new ArrayList<>();
-    for (List<DDSpan> trace : writer) {
-      result.addAll(trace);
+    private List<DDSpan> flattenTraces() {
+        List<DDSpan> result = new ArrayList<>();
+        for (List<DDSpan> trace : writer) {
+            result.addAll(trace);
+        }
+        return result;
     }
-    return result;
-  }
-
-  private DDSpan findSpan(List<DDSpan> spans, String operationName, String spanKind) {
-    for (DDSpan span : spans) {
-      if (span.getOperationName().toString().equals(operationName)
-          && spanKind.equals(span.getTag("span.kind"))) {
-        return span;
-      }
+
+    private DDSpan findSpan(List<DDSpan> spans, String operationName, String spanKind) {
+        for (DDSpan span : spans) {
+            if (span.getOperationName().toString().equals(operationName) && spanKind.equals(span.getTag("span.kind"))) {
+                return span;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTest.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTest.java
index b91900d5db6..7cf4e085463 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTest.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTest.java
@@ -27,179 +27,184 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SofaRpcTest extends AbstractInstrumentationTest {
 
-  private static final int PORT = 12201;
-  private static final int ERROR_PORT = 12202;
-
-  private ProviderConfig<GreeterService> providerConfig;
-  private ProviderConfig<FaultyService> errorProviderConfig;
-  private GreeterService greeterService;
-  private FaultyService faultyService;
-
-  @BeforeAll
-  void setupServers() {
-    ApplicationConfig appConfig = new ApplicationConfig().setAppName("test-server");
-
-    providerConfig =
-        new ProviderConfig<GreeterService>()
-            .setApplication(appConfig)
-            .setInterfaceId(GreeterService.class.getName())
-            .setRef(new GreeterServiceImpl())
-            .setServer(new ServerConfig().setProtocol("bolt").setHost("127.0.0.1").setPort(PORT))
-            .setRegister(false);
-    providerConfig.export();
-
-    greeterService =
-        new ConsumerConfig<GreeterService>()
-            .setApplication(new ApplicationConfig().setAppName("test-client"))
-            .setInterfaceId(GreeterService.class.getName())
-            .setDirectUrl("bolt://127.0.0.1:" + PORT)
-            .setProtocol("bolt")
-            .setRegister(false)
-            .setSubscribe(false)
-            .refer();
-
-    errorProviderConfig =
-        new ProviderConfig<FaultyService>()
-            .setApplication(appConfig)
-            .setInterfaceId(FaultyService.class.getName())
-            .setRef(new FaultyServiceImpl())
-            .setServer(
-                new ServerConfig().setProtocol("bolt").setHost("127.0.0.1").setPort(ERROR_PORT))
-            .setRegister(false);
-    errorProviderConfig.export();
-
-    faultyService =
-        new ConsumerConfig<FaultyService>()
-            .setApplication(new ApplicationConfig().setAppName("test-client"))
-            .setInterfaceId(FaultyService.class.getName())
-            .setDirectUrl("bolt://127.0.0.1:" + ERROR_PORT)
-            .setProtocol("bolt")
-            .setRegister(false)
-            .setSubscribe(false)
-            .refer();
-  }
-
-  @AfterAll
-  void tearDownServers() {
-    if (providerConfig != null) {
-      providerConfig.unExport();
+    private static final int PORT = 12201;
+    private static final int ERROR_PORT = 12202;
+
+    private ProviderConfig<GreeterService> providerConfig;
+    private ProviderConfig<FaultyService> errorProviderConfig;
+    private GreeterService greeterService;
+    private FaultyService faultyService;
+
+    @BeforeAll
+    void setupServers() {
+        ApplicationConfig appConfig = new ApplicationConfig().setAppName("test-server");
+
+        providerConfig = new ProviderConfig<GreeterService>()
+                .setApplication(appConfig)
+                .setInterfaceId(GreeterService.class.getName())
+                .setRef(new GreeterServiceImpl())
+                .setServer(new ServerConfig()
+                        .setProtocol("bolt")
+                        .setHost("127.0.0.1")
+                        .setPort(PORT))
+                .setRegister(false);
+        providerConfig.export();
+
+        greeterService = new ConsumerConfig<GreeterService>()
+                .setApplication(new ApplicationConfig().setAppName("test-client"))
+                .setInterfaceId(GreeterService.class.getName())
+                .setDirectUrl("bolt://127.0.0.1:" + PORT)
+                .setProtocol("bolt")
+                .setRegister(false)
+                .setSubscribe(false)
+                .refer();
+
+        errorProviderConfig = new ProviderConfig<FaultyService>()
+                .setApplication(appConfig)
+                .setInterfaceId(FaultyService.class.getName())
+                .setRef(new FaultyServiceImpl())
+                .setServer(new ServerConfig()
+                        .setProtocol("bolt")
+                        .setHost("127.0.0.1")
+                        .setPort(ERROR_PORT))
+                .setRegister(false);
+        errorProviderConfig.export();
+
+        faultyService = new ConsumerConfig<FaultyService>()
+                .setApplication(new ApplicationConfig().setAppName("test-client"))
+                .setInterfaceId(FaultyService.class.getName())
+                .setDirectUrl("bolt://127.0.0.1:" + ERROR_PORT)
+                .setProtocol("bolt")
+                .setRegister(false)
+                .setSubscribe(false)
+                .refer();
     }
-    if (errorProviderConfig != null) {
-      errorProviderConfig.unExport();
+
+    @AfterAll
+    void tearDownServers() {
+        if (providerConfig != null) {
+            providerConfig.unExport();
+        }
+        if (errorProviderConfig != null) {
+            errorProviderConfig.unExport();
+        }
+    }
+
+    @Test
+    void clientAndServerSpansForBoltCall() throws InterruptedException, TimeoutException {
+        String serviceUniqueName = GreeterService.class.getName() + ":1.0";
+
+        AgentSpan callerSpan = startSpan("test", "caller");
+        ContextScope callerScope = activateSpan(callerSpan);
+        String reply;
+        try {
+            reply = greeterService.sayHello("World");
+        } finally {
+            callerScope.close();
+            callerSpan.finish();
+        }
+
+        assertEquals("Hello, World", reply);
+
+        writer.waitForTraces(2);
+        List<DDSpan> allSpans = flattenTraces();
+
+        DDSpan clientSofaSpan = findSpan(allSpans, "sofarpc.request", "client");
+        DDSpan serverSofaSpan = findSpan(allSpans, "sofarpc.request", "server");
+
+        assertNotNull(clientSofaSpan, "Expected sofarpc client span");
+        assertEquals(
+                serviceUniqueName + "/sayHello",
+                clientSofaSpan.getResourceName().toString());
+        assertEquals("bolt", String.valueOf(clientSofaSpan.getTag("sofarpc.protocol")));
+        assertEquals("sofarpc-client", String.valueOf(clientSofaSpan.getTag("component")));
+        assertEquals("client", String.valueOf(clientSofaSpan.getTag("span.kind")));
+        assertEquals("sofarpc", String.valueOf(clientSofaSpan.getTag("rpc.system")));
+        assertEquals(serviceUniqueName, String.valueOf(clientSofaSpan.getTag("rpc.service")));
+        assertEquals("sayHello", String.valueOf(clientSofaSpan.getTag("rpc.method")));
+        assertEquals(callerSpan.getSpanId(), clientSofaSpan.getParentId());
+        assertFalse(clientSofaSpan.isError());
+
+        assertNotNull(serverSofaSpan, "Expected sofarpc server span");
+        assertEquals(
+                serviceUniqueName + "/sayHello",
+                serverSofaSpan.getResourceName().toString());
+        assertEquals("bolt", String.valueOf(serverSofaSpan.getTag("sofarpc.protocol")));
+        assertEquals("sofarpc-server", String.valueOf(serverSofaSpan.getTag("component")));
+        assertEquals("server", String.valueOf(serverSofaSpan.getTag("span.kind")));
+        assertEquals("sofarpc", String.valueOf(serverSofaSpan.getTag("rpc.system")));
+        assertEquals(serviceUniqueName, String.valueOf(serverSofaSpan.getTag("rpc.service")));
+        assertEquals("sayHello", String.valueOf(serverSofaSpan.getTag("rpc.method")));
+        assertEquals(clientSofaSpan.getSpanId(), serverSofaSpan.getParentId());
+        assertFalse(serverSofaSpan.isError());
+    }
+
+    @Test
+    void serverErrorIsMarkedOnServerSpan() throws InterruptedException, TimeoutException {
+        // SOFA RPC Bolt propagates server exceptions back to the client as a SofaRpcException.
+        // The client-side AbstractCluster.invoke() returns the SofaResponse to the proxy layer,
+        // which then throws — after our instrumentation's OnMethodExit has already closed the scope.
+        // So the CLIENT span is not errored; only the SERVER span reflects the error.
+        String serviceUniqueName = FaultyService.class.getName() + ":1.0";
+
+        assertThrows(Exception.class, () -> faultyService.fail());
+
+        writer.waitForTraces(2);
+        List<DDSpan> allSpans = flattenTraces();
+
+        DDSpan clientSofaSpan = findSpan(allSpans, "sofarpc.request", "client");
+        DDSpan serverSofaSpan = findSpan(allSpans, "sofarpc.request", "server");
+
+        assertNotNull(clientSofaSpan, "Expected sofarpc client span");
+        assertEquals(
+                serviceUniqueName + "/fail", clientSofaSpan.getResourceName().toString());
+        assertFalse(clientSofaSpan.isError(), "Client span should not be errored");
+
+        assertNotNull(serverSofaSpan, "Expected sofarpc server span");
+        assertEquals(
+                serviceUniqueName + "/fail", serverSofaSpan.getResourceName().toString());
+        assertTrue(serverSofaSpan.isError(), "Server span should be errored");
+        assertNotNull(serverSofaSpan.getTag("error.message"), "Expected error.message tag on server span");
     }
-  }
-
-  @Test
-  void clientAndServerSpansForBoltCall() throws InterruptedException, TimeoutException {
-    String serviceUniqueName = GreeterService.class.getName() + ":1.0";
-
-    AgentSpan callerSpan = startSpan("test", "caller");
-    ContextScope callerScope = activateSpan(callerSpan);
-    String reply;
-    try {
-      reply = greeterService.sayHello("World");
-    } finally {
-      callerScope.close();
-      callerSpan.finish();
+
+    private List<DDSpan> flattenTraces() {
+        List<DDSpan> result = new ArrayList<>();
+        for (List<DDSpan> trace : writer) {
+            result.addAll(trace);
+        }
+        return result;
     }
 
-    assertEquals("Hello, World", reply);
-
-    writer.waitForTraces(2);
-    List<DDSpan> allSpans = flattenTraces();
-
-    DDSpan clientSofaSpan = findSpan(allSpans, "sofarpc.request", "client");
-    DDSpan serverSofaSpan = findSpan(allSpans, "sofarpc.request", "server");
-
-    assertNotNull(clientSofaSpan, "Expected sofarpc client span");
-    assertEquals(serviceUniqueName + "/sayHello", clientSofaSpan.getResourceName().toString());
-    assertEquals("bolt", String.valueOf(clientSofaSpan.getTag("sofarpc.protocol")));
-    assertEquals("sofarpc-client", String.valueOf(clientSofaSpan.getTag("component")));
-    assertEquals("client", String.valueOf(clientSofaSpan.getTag("span.kind")));
-    assertEquals("sofarpc", String.valueOf(clientSofaSpan.getTag("rpc.system")));
-    assertEquals(serviceUniqueName, String.valueOf(clientSofaSpan.getTag("rpc.service")));
-    assertEquals("sayHello", String.valueOf(clientSofaSpan.getTag("rpc.method")));
-    assertEquals(callerSpan.getSpanId(), clientSofaSpan.getParentId());
-    assertFalse(clientSofaSpan.isError());
-
-    assertNotNull(serverSofaSpan, "Expected sofarpc server span");
-    assertEquals(serviceUniqueName + "/sayHello", serverSofaSpan.getResourceName().toString());
-    assertEquals("bolt", String.valueOf(serverSofaSpan.getTag("sofarpc.protocol")));
-    assertEquals("sofarpc-server", String.valueOf(serverSofaSpan.getTag("component")));
-    assertEquals("server", String.valueOf(serverSofaSpan.getTag("span.kind")));
-    assertEquals("sofarpc", String.valueOf(serverSofaSpan.getTag("rpc.system")));
-    assertEquals(serviceUniqueName, String.valueOf(serverSofaSpan.getTag("rpc.service")));
-    assertEquals("sayHello", String.valueOf(serverSofaSpan.getTag("rpc.method")));
-    assertEquals(clientSofaSpan.getSpanId(), serverSofaSpan.getParentId());
-    assertFalse(serverSofaSpan.isError());
-  }
-
-  @Test
-  void serverErrorIsMarkedOnServerSpan() throws InterruptedException, TimeoutException {
-    // SOFA RPC Bolt propagates server exceptions back to the client as a SofaRpcException.
-    // The client-side AbstractCluster.invoke() returns the SofaResponse to the proxy layer,
-    // which then throws — after our instrumentation's OnMethodExit has already closed the scope.
-    // So the CLIENT span is not errored; only the SERVER span reflects the error.
-    String serviceUniqueName = FaultyService.class.getName() + ":1.0";
-
-    assertThrows(Exception.class, () -> faultyService.fail());
-
-    writer.waitForTraces(2);
-    List<DDSpan> allSpans = flattenTraces();
-
-    DDSpan clientSofaSpan = findSpan(allSpans, "sofarpc.request", "client");
-    DDSpan serverSofaSpan = findSpan(allSpans, "sofarpc.request", "server");
-
-    assertNotNull(clientSofaSpan, "Expected sofarpc client span");
-    assertEquals(serviceUniqueName + "/fail", clientSofaSpan.getResourceName().toString());
-    assertFalse(clientSofaSpan.isError(), "Client span should not be errored");
-
-    assertNotNull(serverSofaSpan, "Expected sofarpc server span");
-    assertEquals(serviceUniqueName + "/fail", serverSofaSpan.getResourceName().toString());
-    assertTrue(serverSofaSpan.isError(), "Server span should be errored");
-    assertNotNull(
-        serverSofaSpan.getTag("error.message"), "Expected error.message tag on server span");
-  }
-
-  private List<DDSpan> flattenTraces() {
-    List<DDSpan> result = new ArrayList<>();
-    for (List<DDSpan> trace : writer) {
-      result.addAll(trace);
+    private DDSpan findSpan(List<DDSpan> spans, String operationName, String spanKind) {
+        for (DDSpan span : spans) {
+            if (span.getOperationName().toString().equals(operationName) && spanKind.equals(span.getTag("span.kind"))) {
+                return span;
+            }
+        }
+        return null;
     }
-    return result;
-  }
-
-  private DDSpan findSpan(List<DDSpan> spans, String operationName, String spanKind) {
-    for (DDSpan span : spans) {
-      if (span.getOperationName().toString().equals(operationName)
-          && spanKind.equals(span.getTag("span.kind"))) {
-        return span;
-      }
+
+    public interface GreeterService {
+        String sayHello(String name);
     }
-    return null;
-  }
 
-  public interface GreeterService {
-    String sayHello(String name);
-  }
+    static class GreeterServiceImpl implements GreeterService {
+        @Override
+        public String sayHello(String name) {
+            return "Hello, " + name;
+        }
+    }
 
-  static class GreeterServiceImpl implements GreeterService {
-    @Override
-    public String sayHello(String name) {
-      return "Hello, " + name;
+    public interface FaultyService {
+        // Non-void return type: SOFA RPC Bolt throws SofaRpcException on client side
+        // when the server returns an error response, which is what we verify in the test.
+        String fail();
     }
-  }
-
-  public interface FaultyService {
-    // Non-void return type: SOFA RPC Bolt throws SofaRpcException on client side
-    // when the server returns an error response, which is what we verify in the test.
-    String fail();
-  }
-
-  static class FaultyServiceImpl implements FaultyService {
-    @Override
-    public String fail() {
-      throw new IllegalStateException("something went wrong");
+
+    static class FaultyServiceImpl implements FaultyService {
+        @Override
+        public String fail() {
+            throw new IllegalStateException("something went wrong");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTripleWithGrpcForkedTest.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTripleWithGrpcForkedTest.java
index ec6eb153068..f2e4020d96e 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTripleWithGrpcForkedTest.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTripleWithGrpcForkedTest.java
@@ -54,108 +54,106 @@
  */
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SofaRpcTripleWithGrpcForkedTest extends AbstractInstrumentationTest {
-  // No configurePreAgent() override — gRPC instrumentation is enabled by default.
-
-  private static final int TRIPLE_PORT = 12204;
-
-  private ProviderConfig<TripleGreeterService> tripleProviderConfig;
-  private TripleGreeterService greeterService;
-
-  // @BeforeEach (not @BeforeAll) so the gRPC server is built after the agent is installed by
-  // AbstractInstrumentationTest.init(), allowing GrpcServerBuilderInstrumentation to add
-  // TracingServerInterceptor at build time.
-  @BeforeEach
-  void setupServer() {
-    tripleProviderConfig =
-        new ProviderConfig<TripleGreeterService>()
-            .setApplication(new ApplicationConfig().setAppName("test-server"))
-            .setInterfaceId(TripleGreeterService.class.getName())
-            .setRef(new TripleGreeterServiceImpl())
-            .setServer(
-                new ServerConfig().setProtocol("tri").setHost("127.0.0.1").setPort(TRIPLE_PORT))
-            .setRegister(false);
-    tripleProviderConfig.export();
-
-    greeterService =
-        new ConsumerConfig<TripleGreeterService>()
-            .setApplication(new ApplicationConfig().setAppName("test-client"))
-            .setInterfaceId(TripleGreeterService.class.getName())
-            .setDirectUrl("tri://127.0.0.1:" + TRIPLE_PORT)
-            .setProtocol("tri")
-            .setRegister(false)
-            .setSubscribe(false)
-            .refer();
-  }
-
-  @AfterEach
-  void tearDownServer() {
-    if (tripleProviderConfig != null) {
-      tripleProviderConfig.unExport();
-      tripleProviderConfig = null;
+    // No configurePreAgent() override — gRPC instrumentation is enabled by default.
+
+    private static final int TRIPLE_PORT = 12204;
+
+    private ProviderConfig<TripleGreeterService> tripleProviderConfig;
+    private TripleGreeterService greeterService;
+
+    // @BeforeEach (not @BeforeAll) so the gRPC server is built after the agent is installed by
+    // AbstractInstrumentationTest.init(), allowing GrpcServerBuilderInstrumentation to add
+    // TracingServerInterceptor at build time.
+    @BeforeEach
+    void setupServer() {
+        tripleProviderConfig = new ProviderConfig<TripleGreeterService>()
+                .setApplication(new ApplicationConfig().setAppName("test-server"))
+                .setInterfaceId(TripleGreeterService.class.getName())
+                .setRef(new TripleGreeterServiceImpl())
+                .setServer(new ServerConfig()
+                        .setProtocol("tri")
+                        .setHost("127.0.0.1")
+                        .setPort(TRIPLE_PORT))
+                .setRegister(false);
+        tripleProviderConfig.export();
+
+        greeterService = new ConsumerConfig<TripleGreeterService>()
+                .setApplication(new ApplicationConfig().setAppName("test-client"))
+                .setInterfaceId(TripleGreeterService.class.getName())
+                .setDirectUrl("tri://127.0.0.1:" + TRIPLE_PORT)
+                .setProtocol("tri")
+                .setRegister(false)
+                .setSubscribe(false)
+                .refer();
     }
-    greeterService = null;
-  }
-
-  @Test
-  void tripleServerSpanIsNestedUnderGrpcServer() throws InterruptedException, TimeoutException {
-    AgentSpan callerSpan = startSpan("test", "caller");
-    ContextScope callerScope = activateSpan(callerSpan);
-    String reply;
-    try {
-      reply = greeterService.sayHello("World");
-    } finally {
-      callerScope.close();
-      callerSpan.finish();
+
+    @AfterEach
+    void tearDownServer() {
+        if (tripleProviderConfig != null) {
+            tripleProviderConfig.unExport();
+            tripleProviderConfig = null;
+        }
+        greeterService = null;
     }
 
-    assertEquals("Hello, World", reply);
-
-    // Client spans (caller, sofarpc[client], grpc.client) are flushed when the client-side
-    // root span finishes. Server spans (grpc.server, grpc.message, sofarpc[server]) are flushed
-    // when grpc.server — the server-side local root — finishes on its own thread.
-    // That gives two separate ListWriter entries even though both share the same trace_id.
-    writer.waitForTraces(2);
-    List<DDSpan> allSpans = flattenTraces();
-
-    DDSpan serverSofaSpan = findSpan(allSpans, "sofarpc.request", "server");
-    DDSpan grpcServerSpan = findSpan(allSpans, "grpc.server", null);
-
-    assertNotNull(
-        serverSofaSpan, "Expected sofarpc[server] span. Spans found: " + describeSpans(allSpans));
-    assertNotNull(
-        grpcServerSpan, "Expected grpc.server span. Spans found: " + describeSpans(allSpans));
-
-    // sofarpc.request[server] must be a direct child of grpc.server, not grpc.client
-    assertEquals(
-        grpcServerSpan.getSpanId(),
-        serverSofaSpan.getParentId(),
-        "sofarpc.request[server] should be a child of grpc.server");
-  }
-
-  private List<DDSpan> flattenTraces() {
-    List<DDSpan> result = new ArrayList<>();
-    for (List<DDSpan> trace : writer) {
-      result.addAll(trace);
+    @Test
+    void tripleServerSpanIsNestedUnderGrpcServer() throws InterruptedException, TimeoutException {
+        AgentSpan callerSpan = startSpan("test", "caller");
+        ContextScope callerScope = activateSpan(callerSpan);
+        String reply;
+        try {
+            reply = greeterService.sayHello("World");
+        } finally {
+            callerScope.close();
+            callerSpan.finish();
+        }
+
+        assertEquals("Hello, World", reply);
+
+        // Client spans (caller, sofarpc[client], grpc.client) are flushed when the client-side
+        // root span finishes. Server spans (grpc.server, grpc.message, sofarpc[server]) are flushed
+        // when grpc.server — the server-side local root — finishes on its own thread.
+        // That gives two separate ListWriter entries even though both share the same trace_id.
+        writer.waitForTraces(2);
+        List<DDSpan> allSpans = flattenTraces();
+
+        DDSpan serverSofaSpan = findSpan(allSpans, "sofarpc.request", "server");
+        DDSpan grpcServerSpan = findSpan(allSpans, "grpc.server", null);
+
+        assertNotNull(serverSofaSpan, "Expected sofarpc[server] span. Spans found: " + describeSpans(allSpans));
+        assertNotNull(grpcServerSpan, "Expected grpc.server span. Spans found: " + describeSpans(allSpans));
+
+        // sofarpc.request[server] must be a direct child of grpc.server, not grpc.client
+        assertEquals(
+                grpcServerSpan.getSpanId(),
+                serverSofaSpan.getParentId(),
+                "sofarpc.request[server] should be a child of grpc.server");
+    }
+
+    private List<DDSpan> flattenTraces() {
+        List<DDSpan> result = new ArrayList<>();
+        for (List<DDSpan> trace : writer) {
+            result.addAll(trace);
+        }
+        return result;
     }
-    return result;
-  }
-
-  private DDSpan findSpan(List<DDSpan> spans, String operationName, String spanKind) {
-    for (DDSpan span : spans) {
-      if (span.getOperationName().toString().equals(operationName)) {
-        if (spanKind == null || spanKind.equals(span.getTag("span.kind"))) {
-          return span;
+
+    private DDSpan findSpan(List<DDSpan> spans, String operationName, String spanKind) {
+        for (DDSpan span : spans) {
+            if (span.getOperationName().toString().equals(operationName)) {
+                if (spanKind == null || spanKind.equals(span.getTag("span.kind"))) {
+                    return span;
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
 
-  private String describeSpans(List<DDSpan> spans) {
-    List<String> descriptions = new ArrayList<>();
-    for (DDSpan span : spans) {
-      descriptions.add(span.getOperationName() + "[" + span.getTag("span.kind") + "]");
+    private String describeSpans(List<DDSpan> spans) {
+        List<String> descriptions = new ArrayList<>();
+        for (DDSpan span : spans) {
+            descriptions.add(span.getOperationName() + "[" + span.getTag("span.kind") + "]");
+        }
+        return descriptions.toString();
     }
-    return descriptions.toString();
-  }
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/TripleGreeterService.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/TripleGreeterService.java
index 5046d5c468b..47b2dcc124b 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/TripleGreeterService.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/TripleGreeterService.java
@@ -1,5 +1,5 @@
 package datadog.trace.instrumentation.sofarpc;
 
 public interface TripleGreeterService {
-  String sayHello(String name);
+    String sayHello(String name);
 }
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/TripleGreeterServiceImpl.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/TripleGreeterServiceImpl.java
index 8ac98b890eb..65cb8038c6c 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/TripleGreeterServiceImpl.java
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/TripleGreeterServiceImpl.java
@@ -1,8 +1,8 @@
 package datadog.trace.instrumentation.sofarpc;
 
 public class TripleGreeterServiceImpl implements TripleGreeterService {
-  @Override
-  public String sayHello(String name) {
-    return "Hello, " + name;
-  }
+    @Override
+    public String sayHello(String name) {
+        return "Hello, " + name;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java
index ddb53c44c49..4e3f7e3c1c4 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java
@@ -82,1516 +82,1463 @@
  * still needed
  */
 public abstract class AbstractDatadogSparkListener extends SparkListener {
-  private static final Logger log = LoggerFactory.getLogger(AbstractDatadogSparkListener.class);
-  protected static final ObjectMapper objectMapper = new ObjectMapper();
-  public static volatile AbstractDatadogSparkListener listener = null;
-
-  public static volatile boolean finishTraceOnApplicationEnd = true;
-  public static volatile boolean isPysparkShell = false;
-
-  private final int MAX_COLLECTION_SIZE = 5000;
-  private final int MAX_ACCUMULATOR_SIZE = 50000;
-  private final String RUNTIME_TAGS_PREFIX = "spark.datadog.tags.";
-  private static final String AGENT_OL_ENDPOINT = "openlineage/api/v1/lineage";
-  private static final int OL_CIRCUIT_BREAKER_TIMEOUT_IN_SECONDS = 60;
-
-  volatile SparkListenerInterface openLineageSparkListener = null;
-  public volatile SparkConf openLineageSparkConf = null;
-
-  private final SparkConf sparkConf;
-  private final String sparkVersion;
-  private final String appId;
-
-  private final AgentTracer.TracerAPI tracer;
-
-  // This is created by constructor, and used if we're not in other known
-  // parent context like Databricks, OpenLineage
-  private final PredeterminedTraceIdContext predeterminedTraceIdContext;
-
-  private AgentSpan applicationSpan;
-  private SparkListenerApplicationStart applicationStart;
-  private final HashMap<String, AgentSpan> streamingBatchSpans = new HashMap<>();
-  private final HashMap<Long, AgentSpan> sqlSpans = new HashMap<>();
-  private final HashMap<Integer, AgentSpan> jobSpans = new HashMap<>();
-  private final HashMap<Long, AgentSpan> stageSpans = new HashMap<>();
-
-  private final HashMap<Integer, Integer> stageToJob = new HashMap<>();
-  private final HashMap<Long, Properties> stageProperties = new HashMap<>();
-
-  private final SparkAggregatedTaskMetrics applicationMetrics = new SparkAggregatedTaskMetrics();
-  private final HashMap<String, SparkAggregatedTaskMetrics> streamingBatchMetrics = new HashMap<>();
-  private final HashMap<Long, SparkAggregatedTaskMetrics> sqlMetrics = new HashMap<>();
-  private final HashMap<Integer, SparkAggregatedTaskMetrics> jobMetrics = new HashMap<>();
-  private final HashMap<Long, SparkAggregatedTaskMetrics> stageMetrics = new HashMap<>();
-
-  private final HashMap<UUID, StreamingQueryListener.QueryStartedEvent> streamingQueries =
-      new HashMap<>();
-  private final HashMap<Long, SparkListenerSQLExecutionStart> sqlQueries = new HashMap<>();
-  protected final HashMap<Long, SparkPlanInfo> sqlPlans = new HashMap<>();
-  private final HashMap<String, SparkListenerExecutorAdded> liveExecutors = new HashMap<>();
-
-  private final Map<Long, Integer> accumulatorToStageID = new HashMap<>();
-
-  private volatile boolean isStreamingJob = false;
-  private final boolean isRunningOnDatabricks;
-  private final String databricksClusterName;
-  private final String databricksServiceName;
-  private final String sparkServiceName;
-
-  private boolean lastJobFailed = false;
-  private String lastJobFailedMessage;
-  private String lastJobFailedStackTrace;
-  private boolean lastSqlFailed = false;
-  private String lastSqlFailedMessage;
-  private String lastSqlFailedStackTrace;
-  private int jobCount = 0;
-  private int currentExecutorCount = 0;
-  private int maxExecutorCount = 0;
-  private long availableExecutorTime = 0;
-
-  private volatile boolean applicationEnded = false;
-
-  public AbstractDatadogSparkListener(SparkConf sparkConf, String appId, String sparkVersion) {
-    tracer = AgentTracer.get();
-
-    this.sparkConf = sparkConf;
-    this.appId = appId;
-    this.sparkVersion = sparkVersion;
-
-    isRunningOnDatabricks = sparkConf.contains("spark.databricks.sparkContextId");
-    databricksClusterName = sparkConf.get("spark.databricks.clusterUsageTags.clusterName", null);
-    databricksServiceName = getDatabricksServiceName(sparkConf, databricksClusterName);
-    sparkServiceName = getSparkServiceName(sparkConf, isRunningOnDatabricks);
-    predeterminedTraceIdContext =
-        new PredeterminedTraceIdContext(Config.get().getIdGenerationStrategy().generateTraceId());
-
-    // If JVM exiting with System.exit(code), it bypass the code closing the application span
-    //
-    // Using shutdown hook to close the span, but it is only best effort:
-    // - no guarantee it will be executed before the tracer shuts down
-    // - no access to the exit code
-    Runtime.getRuntime()
-        .addShutdownHook(
-            AgentThreadFactory.newAgentThread(
-                AgentThreadFactory.AgentThread.DATA_JOBS_MONITORING_SHUTDOWN_HOOK,
-                () -> {
-                  if (!applicationEnded) {
-                    log.info("Finishing application trace from shutdown hook");
-                    finishApplication(System.currentTimeMillis(), null, 0, null);
-                  }
-                }));
-  }
-
-  public void setupOpenLineage(DDTraceId traceId) {
-    log.debug("Setting up OpenLineage configuration with trace id {}", traceId);
-    if (openLineageSparkListener != null) {
-      openLineageSparkConf.set("spark.openlineage.transport.type", "composite");
-      openLineageSparkConf.set("spark.openlineage.transport.continueOnFailure", "true");
-      openLineageSparkConf.set("spark.openlineage.transport.transports.agent.type", "http");
-      openLineageSparkConf.set(
-          "spark.openlineage.transport.transports.agent.url", getAgentHttpUrl());
-      openLineageSparkConf.set(
-          "spark.openlineage.transport.transports.agent.endpoint", AGENT_OL_ENDPOINT);
-      openLineageSparkConf.set("spark.openlineage.transport.transports.agent.compression", "gzip");
-      String runTags =
-          "_dd.trace_id:"
-              + traceId.toString()
-              + ";_dd.ol_intake.emit_spans:false;_dd.ol_service:"
-              + getServiceForOpenLineage(sparkConf, isRunningOnDatabricks)
-              + ";_dd.ol_intake.process_tags:"
-              + ProcessTags.getTagsForSerialization()
-              + ";_dd.ol_app_id:"
-              + appId;
-      // _dd.ol_env carries the run environment so the lineage-processor can use it
-      // as the Spark application's UGP namespace, letting the OpenLineage-created
-      // node and the tracer-only node (djm-span-processor) resolve to the same
-      // entity_id. Omitted when env is unset so the consumer falls back to the
-      // OpenLineage namespace.
-      String olEnv = Config.get().getEnv();
-      if (!olEnv.isEmpty()) {
-        runTags += ";_dd.ol_env:" + olEnv;
-      }
-      openLineageSparkConf.set("spark.openlineage.run.tags", runTags);
-      setupOpenLineageCircuitBreaker();
-      return;
-    }
-    log.debug(
-        "There is no OpenLineage Spark Listener in the context. Skipping setting tags. {}",
-        openLineageSparkListener);
-    log.debug(
-        "There is no OpenLineage SparkConf in the context. Skipping setting tags. {}",
-        openLineageSparkConf);
-  }
-
-  /** Resource name of the spark job. Provide an implementation based on a specific scala version */
-  protected abstract String getSparkJobName(SparkListenerJobStart jobStart);
-
-  /** Stage ids of the spark job. Provide an implementation based on a specific scala version */
-  protected abstract ArrayList<Integer> getSparkJobStageIds(SparkListenerJobStart jobStart);
-
-  /** Stage count of the spark job. Provide an implementation based on a specific scala version */
-  protected abstract int getStageCount(SparkListenerJobStart jobStart);
-
-  /** Children of a SparkPlanInfo. Provide an implementation based on a specific scala version */
-  protected abstract Collection<SparkPlanInfo> getPlanInfoChildren(SparkPlanInfo info);
-
-  /** Metrics of a SparkPlanInfo. Provide an implementation based on a specific scala version */
-  protected abstract List<SQLMetricInfo> getPlanInfoMetrics(SparkPlanInfo info);
-
-  /** Parent Ids of a Stage. Provide an implementation based on a specific scala version */
-  protected abstract int[] getStageParentIds(StageInfo info);
-
-  /**
-   * All External Accumulators associated with a given task. Provide an implementation based on a
-   * specific scala version
-   */
-  protected abstract List<AccumulatorV2> getExternalAccumulators(TaskMetrics metrics);
-
-  @Override
-  public synchronized void onApplicationStart(SparkListenerApplicationStart applicationStart) {
-    this.applicationStart = applicationStart;
-
-    if (openLineageSparkListener == null) {
-      openLineageSparkListener =
-          InstanceStore.of(SparkListenerInterface.class).get("openLineageListener");
-      openLineageSparkConf = InstanceStore.of(SparkConf.class).get("openLineageSparkConf");
-    }
-
-    if (openLineageSparkListener != null) {
-      setupOpenLineage(
-          OpenlineageParentContext.from(sparkConf)
-              .map(context -> context.getTraceId())
-              .orElse(predeterminedTraceIdContext.getTraceId()));
-    }
-    notifyOl(x -> openLineageSparkListener.onApplicationStart(x), applicationStart);
-  }
-
-  private void initApplicationSpanIfNotInitialized() {
-    if (applicationSpan != null) {
-      return;
+    private static final Logger log = LoggerFactory.getLogger(AbstractDatadogSparkListener.class);
+    protected static final ObjectMapper objectMapper = new ObjectMapper();
+    public static volatile AbstractDatadogSparkListener listener = null;
+
+    public static volatile boolean finishTraceOnApplicationEnd = true;
+    public static volatile boolean isPysparkShell = false;
+
+    private final int MAX_COLLECTION_SIZE = 5000;
+    private final int MAX_ACCUMULATOR_SIZE = 50000;
+    private final String RUNTIME_TAGS_PREFIX = "spark.datadog.tags.";
+    private static final String AGENT_OL_ENDPOINT = "openlineage/api/v1/lineage";
+    private static final int OL_CIRCUIT_BREAKER_TIMEOUT_IN_SECONDS = 60;
+
+    volatile SparkListenerInterface openLineageSparkListener = null;
+    public volatile SparkConf openLineageSparkConf = null;
+
+    private final SparkConf sparkConf;
+    private final String sparkVersion;
+    private final String appId;
+
+    private final AgentTracer.TracerAPI tracer;
+
+    // This is created by constructor, and used if we're not in other known
+    // parent context like Databricks, OpenLineage
+    private final PredeterminedTraceIdContext predeterminedTraceIdContext;
+
+    private AgentSpan applicationSpan;
+    private SparkListenerApplicationStart applicationStart;
+    private final HashMap<String, AgentSpan> streamingBatchSpans = new HashMap<>();
+    private final HashMap<Long, AgentSpan> sqlSpans = new HashMap<>();
+    private final HashMap<Integer, AgentSpan> jobSpans = new HashMap<>();
+    private final HashMap<Long, AgentSpan> stageSpans = new HashMap<>();
+
+    private final HashMap<Integer, Integer> stageToJob = new HashMap<>();
+    private final HashMap<Long, Properties> stageProperties = new HashMap<>();
+
+    private final SparkAggregatedTaskMetrics applicationMetrics = new SparkAggregatedTaskMetrics();
+    private final HashMap<String, SparkAggregatedTaskMetrics> streamingBatchMetrics = new HashMap<>();
+    private final HashMap<Long, SparkAggregatedTaskMetrics> sqlMetrics = new HashMap<>();
+    private final HashMap<Integer, SparkAggregatedTaskMetrics> jobMetrics = new HashMap<>();
+    private final HashMap<Long, SparkAggregatedTaskMetrics> stageMetrics = new HashMap<>();
+
+    private final HashMap<UUID, StreamingQueryListener.QueryStartedEvent> streamingQueries = new HashMap<>();
+    private final HashMap<Long, SparkListenerSQLExecutionStart> sqlQueries = new HashMap<>();
+    protected final HashMap<Long, SparkPlanInfo> sqlPlans = new HashMap<>();
+    private final HashMap<String, SparkListenerExecutorAdded> liveExecutors = new HashMap<>();
+
+    private final Map<Long, Integer> accumulatorToStageID = new HashMap<>();
+
+    private volatile boolean isStreamingJob = false;
+    private final boolean isRunningOnDatabricks;
+    private final String databricksClusterName;
+    private final String databricksServiceName;
+    private final String sparkServiceName;
+
+    private boolean lastJobFailed = false;
+    private String lastJobFailedMessage;
+    private String lastJobFailedStackTrace;
+    private boolean lastSqlFailed = false;
+    private String lastSqlFailedMessage;
+    private String lastSqlFailedStackTrace;
+    private int jobCount = 0;
+    private int currentExecutorCount = 0;
+    private int maxExecutorCount = 0;
+    private long availableExecutorTime = 0;
+
+    private volatile boolean applicationEnded = false;
+
+    public AbstractDatadogSparkListener(SparkConf sparkConf, String appId, String sparkVersion) {
+        tracer = AgentTracer.get();
+
+        this.sparkConf = sparkConf;
+        this.appId = appId;
+        this.sparkVersion = sparkVersion;
+
+        isRunningOnDatabricks = sparkConf.contains("spark.databricks.sparkContextId");
+        databricksClusterName = sparkConf.get("spark.databricks.clusterUsageTags.clusterName", null);
+        databricksServiceName = getDatabricksServiceName(sparkConf, databricksClusterName);
+        sparkServiceName = getSparkServiceName(sparkConf, isRunningOnDatabricks);
+        predeterminedTraceIdContext = new PredeterminedTraceIdContext(
+                Config.get().getIdGenerationStrategy().generateTraceId());
+
+        // If JVM exiting with System.exit(code), it bypass the code closing the application span
+        //
+        // Using shutdown hook to close the span, but it is only best effort:
+        // - no guarantee it will be executed before the tracer shuts down
+        // - no access to the exit code
+        Runtime.getRuntime()
+                .addShutdownHook(AgentThreadFactory.newAgentThread(
+                        AgentThreadFactory.AgentThread.DATA_JOBS_MONITORING_SHUTDOWN_HOOK, () -> {
+                            if (!applicationEnded) {
+                                log.info("Finishing application trace from shutdown hook");
+                                finishApplication(System.currentTimeMillis(), null, 0, null);
+                            }
+                        }));
+    }
+
+    public void setupOpenLineage(DDTraceId traceId) {
+        log.debug("Setting up OpenLineage configuration with trace id {}", traceId);
+        if (openLineageSparkListener != null) {
+            openLineageSparkConf.set("spark.openlineage.transport.type", "composite");
+            openLineageSparkConf.set("spark.openlineage.transport.continueOnFailure", "true");
+            openLineageSparkConf.set("spark.openlineage.transport.transports.agent.type", "http");
+            openLineageSparkConf.set("spark.openlineage.transport.transports.agent.url", getAgentHttpUrl());
+            openLineageSparkConf.set("spark.openlineage.transport.transports.agent.endpoint", AGENT_OL_ENDPOINT);
+            openLineageSparkConf.set("spark.openlineage.transport.transports.agent.compression", "gzip");
+            String runTags = "_dd.trace_id:"
+                    + traceId.toString()
+                    + ";_dd.ol_intake.emit_spans:false;_dd.ol_service:"
+                    + getServiceForOpenLineage(sparkConf, isRunningOnDatabricks)
+                    + ";_dd.ol_intake.process_tags:"
+                    + ProcessTags.getTagsForSerialization()
+                    + ";_dd.ol_app_id:"
+                    + appId;
+            // _dd.ol_env carries the run environment so the lineage-processor can use it
+            // as the Spark application's UGP namespace, letting the OpenLineage-created
+            // node and the tracer-only node (djm-span-processor) resolve to the same
+            // entity_id. Omitted when env is unset so the consumer falls back to the
+            // OpenLineage namespace.
+            String olEnv = Config.get().getEnv();
+            if (!olEnv.isEmpty()) {
+                runTags += ";_dd.ol_env:" + olEnv;
+            }
+            openLineageSparkConf.set("spark.openlineage.run.tags", runTags);
+            setupOpenLineageCircuitBreaker();
+            return;
+        }
+        log.debug(
+                "There is no OpenLineage Spark Listener in the context. Skipping setting tags. {}",
+                openLineageSparkListener);
+        log.debug("There is no OpenLineage SparkConf in the context. Skipping setting tags. {}", openLineageSparkConf);
     }
 
-    log.debug("Starting tracer application span.");
+    /** Resource name of the spark job. Provide an implementation based on a specific scala version */
+    protected abstract String getSparkJobName(SparkListenerJobStart jobStart);
 
-    AgentTracer.SpanBuilder builder = buildSparkSpan("spark.application", null);
+    /** Stage ids of the spark job. Provide an implementation based on a specific scala version */
+    protected abstract ArrayList<Integer> getSparkJobStageIds(SparkListenerJobStart jobStart);
 
-    if (applicationStart != null) {
-      String ddTags =
-          Config.get().getGlobalTags().entrySet().stream()
-              .sorted(Map.Entry.comparingByKey())
-              .map(e -> e.getKey() + ":" + e.getValue())
-              .collect(Collectors.joining(","));
+    /** Stage count of the spark job. Provide an implementation based on a specific scala version */
+    protected abstract int getStageCount(SparkListenerJobStart jobStart);
 
-      builder
-          .withStartTimestamp(applicationStart.time() * 1000)
-          .withTag("application_name", applicationStart.appName())
-          .withTag("djm.tags", ddTags)
-          .withTag("spark_user", applicationStart.sparkUser());
+    /** Children of a SparkPlanInfo. Provide an implementation based on a specific scala version */
+    protected abstract Collection<SparkPlanInfo> getPlanInfoChildren(SparkPlanInfo info);
 
-      if (applicationStart.appAttemptId().isDefined()) {
-        builder.withTag("app_attempt_id", applicationStart.appAttemptId().get());
-      }
-    }
+    /** Metrics of a SparkPlanInfo. Provide an implementation based on a specific scala version */
+    protected abstract List<SQLMetricInfo> getPlanInfoMetrics(SparkPlanInfo info);
 
-    captureApplicationParameters(builder);
-    captureEmrStepId(builder);
-    captureOpenlineageJobInfo(builder);
-
-    Optional<OpenlineageParentContext> openlineageParentContext =
-        OpenlineageParentContext.from(sparkConf);
-    // We know we're not in Databricks context
-    if (openlineageParentContext.isPresent()) {
-      captureOpenlineageContextIfPresent(builder, openlineageParentContext.get());
-    } else {
-      builder.asChildOf(predeterminedTraceIdContext);
-    }
+    /** Parent Ids of a Stage. Provide an implementation based on a specific scala version */
+    protected abstract int[] getStageParentIds(StageInfo info);
 
-    applicationSpan = builder.start();
-    setDataJobsSamplingPriority(applicationSpan);
-    applicationSpan.setMeasured(true);
-  }
+    /**
+     * All External Accumulators associated with a given task. Provide an implementation based on a
+     * specific scala version
+     */
+    protected abstract List<AccumulatorV2> getExternalAccumulators(TaskMetrics metrics);
 
-  private void captureOpenlineageJobInfo(AgentTracer.SpanBuilder builder) {
-    String olAppName = sparkConf.get("spark.openlineage.appName", null);
-    if (olAppName != null) {
-      builder.withTag("spark.openlineage.appName", olAppName);
-    }
-  }
-
-  private void captureOpenlineageContextIfPresent(
-      AgentTracer.SpanBuilder builder, OpenlineageParentContext context) {
-    builder.asChildOf(context);
-
-    log.debug("Captured Openlineage context: {}, with trace_id: {}", context, context.getTraceId());
-
-    builder.withTag("openlineage_parent_job_namespace", context.getParentJobNamespace());
-    builder.withTag("openlineage_parent_job_name", context.getParentJobName());
-    builder.withTag("openlineage_parent_run_id", context.getParentRunId());
-    builder.withTag("openlineage_root_parent_job_namespace", context.getRootParentJobNamespace());
-    builder.withTag("openlineage_root_parent_job_name", context.getRootParentJobName());
-    builder.withTag("openlineage_root_parent_run_id", context.getRootParentRunId());
-  }
-
-  /**
-   * Called by SparkSqlFailureAdvice when a SQL call (e.g. SparkSession.sql()) throws an exception
-   * during Catalyst analysis, before any Spark job is submitted. This ensures finishApplication()
-   * has an error signal even when no job/stage/task events fire.
-   */
-  public synchronized void onSqlFailure(Throwable throwable) {
-    if (applicationEnded) {
-      return;
-    }
-    lastSqlFailed = true;
-    lastSqlFailedMessage = throwable.getMessage();
-
-    StringWriter sw = new StringWriter();
-    throwable.printStackTrace(new PrintWriter(sw));
-    lastSqlFailedStackTrace = sw.toString();
-  }
-
-  @Override
-  public void onApplicationEnd(SparkListenerApplicationEnd applicationEnd) {
-    // In YARN cluster mode SparkContext can stop before the Python driver exits. Wait for
-    // ApplicationMaster.finish() to report the exit code instead of finishing successfully here.
-    boolean finishOnApplicationEnd =
-        finishTraceOnApplicationEnd
-            && !("yarn".equals(sparkConf.get("spark.master", ""))
-                && "cluster".equals(sparkConf.get("spark.submit.deployMode", "")));
-    log.info(
-        "Received spark application end event, finish trace on this event: {}",
-        finishOnApplicationEnd);
-    notifyOl(x -> openLineageSparkListener.onApplicationEnd(x), applicationEnd);
-
-    if (finishOnApplicationEnd) {
-      finishApplication(applicationEnd.time(), null, 0, null);
-    }
-  }
+    @Override
+    public synchronized void onApplicationStart(SparkListenerApplicationStart applicationStart) {
+        this.applicationStart = applicationStart;
 
-  // This function is called using reflection in SparkExitInstrumentation, make sure to update if
-  // the signature of this function is changed
-  public synchronized void finishApplication(
-      long time, Throwable throwable, int exitCode, String msg) {
-    log.info("Finishing spark application trace");
+        if (openLineageSparkListener == null) {
+            openLineageSparkListener =
+                    InstanceStore.of(SparkListenerInterface.class).get("openLineageListener");
+            openLineageSparkConf = InstanceStore.of(SparkConf.class).get("openLineageSparkConf");
+        }
 
-    if (applicationEnded) {
-      return;
+        if (openLineageSparkListener != null) {
+            setupOpenLineage(OpenlineageParentContext.from(sparkConf)
+                    .map(context -> context.getTraceId())
+                    .orElse(predeterminedTraceIdContext.getTraceId()));
+        }
+        notifyOl(x -> openLineageSparkListener.onApplicationStart(x), applicationStart);
     }
-    applicationEnded = true;
 
-    if ((applicationSpan == null && jobCount > 0) || isRunningOnDatabricks) {
-      // If the application span is not initialized, but spark jobs have been executed, all those
-      // spark jobs were databricks or streaming. In this case we don't send the application span
-      return;
-    }
+    private void initApplicationSpanIfNotInitialized() {
+        if (applicationSpan != null) {
+            return;
+        }
 
-    initApplicationSpanIfNotInitialized();
-
-    if (throwable != null) {
-      applicationSpan.addThrowable(throwable);
-    } else if (exitCode != 0) {
-      applicationSpan.setError(true);
-      applicationSpan.setTag(
-          DDTags.ERROR_TYPE, "Spark Application Failed with exit code " + exitCode);
-
-      String errorMessage = getErrorMessageWithoutStackTrace(msg);
-      applicationSpan.setTag(DDTags.ERROR_MSG, errorMessage);
-      applicationSpan.setTag(DDTags.ERROR_STACK, msg);
-    } else if (lastJobFailed) {
-      applicationSpan.setError(true);
-      applicationSpan.setTag(DDTags.ERROR_TYPE, "Spark Application Failed");
-      applicationSpan.setTag(DDTags.ERROR_MSG, lastJobFailedMessage);
-      applicationSpan.setTag(DDTags.ERROR_STACK, lastJobFailedStackTrace);
-    } else if (lastSqlFailed) {
-      applicationSpan.setError(true);
-      applicationSpan.setTag(DDTags.ERROR_TYPE, "Spark SQL Failed");
-      applicationSpan.setTag(DDTags.ERROR_MSG, lastSqlFailedMessage);
-      applicationSpan.setTag(DDTags.ERROR_STACK, lastSqlFailedStackTrace);
-    }
+        log.debug("Starting tracer application span.");
 
-    applicationMetrics.setSpanMetrics(applicationSpan);
-    applicationSpan.setMetric("spark.max_executor_count", maxExecutorCount);
-    applicationSpan.setMetric(
-        "spark.available_executor_time", computeCurrentAvailableExecutorTime(time));
+        AgentTracer.SpanBuilder builder = buildSparkSpan("spark.application", null);
 
-    applicationSpan.finish(time * 1000);
+        if (applicationStart != null) {
+            String ddTags = Config.get().getGlobalTags().entrySet().stream()
+                    .sorted(Map.Entry.comparingByKey())
+                    .map(e -> e.getKey() + ":" + e.getValue())
+                    .collect(Collectors.joining(","));
 
-    // write traces synchronously:
-    // as soon as the application finishes, the JVM starts to shut down
-    tracer.flush();
-  }
+            builder.withStartTimestamp(applicationStart.time() * 1000)
+                    .withTag("application_name", applicationStart.appName())
+                    .withTag("djm.tags", ddTags)
+                    .withTag("spark_user", applicationStart.sparkUser());
 
-  private AgentSpan getOrCreateStreamingBatchSpan(
-      String batchKey, Long timeMs, Properties jobProperties) {
-    AgentSpan batchSpan = streamingBatchSpans.get(batchKey);
-    if (batchSpan != null) {
-      return batchSpan;
-    }
+            if (applicationStart.appAttemptId().isDefined()) {
+                builder.withTag(
+                        "app_attempt_id", applicationStart.appAttemptId().get());
+            }
+        }
 
-    AgentTracer.SpanBuilder builder =
-        buildSparkSpan("spark.streaming_batch", jobProperties).withStartTimestamp(timeMs * 1000);
+        captureApplicationParameters(builder);
+        captureEmrStepId(builder);
+        captureOpenlineageJobInfo(builder);
 
-    // Streaming spans will always be the root span, capturing job parameters on those
-    captureJobParameters(builder, jobProperties);
+        Optional<OpenlineageParentContext> openlineageParentContext = OpenlineageParentContext.from(sparkConf);
+        // We know we're not in Databricks context
+        if (openlineageParentContext.isPresent()) {
+            captureOpenlineageContextIfPresent(builder, openlineageParentContext.get());
+        } else {
+            builder.asChildOf(predeterminedTraceIdContext);
+        }
 
-    if (isRunningOnDatabricks) {
-      addDatabricksSpecificTags(builder, jobProperties, false);
+        applicationSpan = builder.start();
+        setDataJobsSamplingPriority(applicationSpan);
+        applicationSpan.setMeasured(true);
     }
 
-    batchSpan = builder.start();
-    setDataJobsSamplingPriority(batchSpan);
-    streamingBatchSpans.put(batchKey, batchSpan);
-    return batchSpan;
-  }
-
-  private void addDatabricksSpecificTags(
-      AgentTracer.SpanBuilder builder, Properties properties, boolean withParentContext) {
-    // Databricks has no application span. Adding the parameters to the top level spark span
-    captureJobParameters(builder, properties);
-
-    if (properties != null) {
-      String databricksJobId = getDatabricksJobId(properties);
-      String databricksJobRunId = getDatabricksJobRunId(properties, databricksClusterName);
-      String databricksTaskRunId = getDatabricksTaskRunId(properties, databricksJobRunId);
-
-      // ids to link those spans to databricks job/task traces
-      builder.withTag("databricks_job_id", databricksJobId);
-      builder.withTag("databricks_job_run_id", databricksJobRunId);
-      builder.withTag("databricks_task_run_id", databricksTaskRunId);
-
-      AgentSpanContext parentContext =
-          new DatabricksParentContext(
-              databricksJobId,
-              databricksJobRunId,
-              databricksTaskRunId,
-              getDatabricksJobRunAttempt(properties));
-
-      if (parentContext.getTraceId() != DDTraceId.ZERO) {
-        if (withParentContext) {
-          builder.asChildOf(parentContext);
-        } else {
-          builder.withLink(SpanLink.from(parentContext));
+    private void captureOpenlineageJobInfo(AgentTracer.SpanBuilder builder) {
+        String olAppName = sparkConf.get("spark.openlineage.appName", null);
+        if (olAppName != null) {
+            builder.withTag("spark.openlineage.appName", olAppName);
         }
-      }
     }
-  }
 
-  private AgentSpan getOrCreateSqlSpan(
-      long sqlExecutionId, String batchKey, Properties jobProperties) {
-    AgentSpan span = sqlSpans.get(sqlExecutionId);
-    if (span != null) {
-      return span;
-    }
+    private void captureOpenlineageContextIfPresent(AgentTracer.SpanBuilder builder, OpenlineageParentContext context) {
+        builder.asChildOf(context);
 
-    SparkListenerSQLExecutionStart queryStart = sqlQueries.get(sqlExecutionId);
-    if (queryStart == null) {
-      return null;
-    }
+        log.debug("Captured Openlineage context: {}, with trace_id: {}", context, context.getTraceId());
 
-    AgentTracer.SpanBuilder spanBuilder =
-        buildSparkSpan("spark.sql", jobProperties)
-            .withStartTimestamp(queryStart.time() * 1000)
-            .withTag("query_id", sqlExecutionId)
-            .withTag("description", queryStart.description())
-            .withTag("details", queryStart.details())
-            .withTag(DDTags.RESOURCE_NAME, queryStart.description());
-
-    if (batchKey != null) {
-      AgentSpan batchSpan =
-          getOrCreateStreamingBatchSpan(batchKey, queryStart.time(), jobProperties);
-      spanBuilder.asChildOf(batchSpan.spanContext());
-    } else if (isRunningOnDatabricks) {
-      addDatabricksSpecificTags(spanBuilder, jobProperties, true);
-    } else {
-      initApplicationSpanIfNotInitialized();
-      spanBuilder.asChildOf(applicationSpan.spanContext());
+        builder.withTag("openlineage_parent_job_namespace", context.getParentJobNamespace());
+        builder.withTag("openlineage_parent_job_name", context.getParentJobName());
+        builder.withTag("openlineage_parent_run_id", context.getParentRunId());
+        builder.withTag("openlineage_root_parent_job_namespace", context.getRootParentJobNamespace());
+        builder.withTag("openlineage_root_parent_job_name", context.getRootParentJobName());
+        builder.withTag("openlineage_root_parent_run_id", context.getRootParentRunId());
     }
 
-    AgentSpan sqlSpan = spanBuilder.start();
-    setDataJobsSamplingPriority(sqlSpan);
-    sqlSpans.put(sqlExecutionId, sqlSpan);
-    return sqlSpan;
-  }
-
-  @Override
-  public synchronized void onJobStart(SparkListenerJobStart jobStart) {
-    jobCount++;
-    if (jobSpans.size() > MAX_COLLECTION_SIZE) {
-      return;
+    /**
+     * Called by SparkSqlFailureAdvice when a SQL call (e.g. SparkSession.sql()) throws an exception
+     * during Catalyst analysis, before any Spark job is submitted. This ensures finishApplication()
+     * has an error signal even when no job/stage/task events fire.
+     */
+    public synchronized void onSqlFailure(Throwable throwable) {
+        if (applicationEnded) {
+            return;
+        }
+        lastSqlFailed = true;
+        lastSqlFailedMessage = throwable.getMessage();
+
+        StringWriter sw = new StringWriter();
+        throwable.printStackTrace(new PrintWriter(sw));
+        lastSqlFailedStackTrace = sw.toString();
+    }
+
+    @Override
+    public void onApplicationEnd(SparkListenerApplicationEnd applicationEnd) {
+        // In YARN cluster mode SparkContext can stop before the Python driver exits. Wait for
+        // ApplicationMaster.finish() to report the exit code instead of finishing successfully here.
+        boolean finishOnApplicationEnd = finishTraceOnApplicationEnd
+                && !("yarn".equals(sparkConf.get("spark.master", ""))
+                        && "cluster".equals(sparkConf.get("spark.submit.deployMode", "")));
+        log.info("Received spark application end event, finish trace on this event: {}", finishOnApplicationEnd);
+        notifyOl(x -> openLineageSparkListener.onApplicationEnd(x), applicationEnd);
+
+        if (finishOnApplicationEnd) {
+            finishApplication(applicationEnd.time(), null, 0, null);
+        }
     }
 
-    AgentTracer.SpanBuilder jobSpanBuilder =
-        buildSparkSpan("spark.job", jobStart.properties())
-            .withStartTimestamp(jobStart.time() * 1000)
-            .withTag("job_id", jobStart.jobId())
-            .withTag("stage_count", getStageCount(jobStart));
+    // This function is called using reflection in SparkExitInstrumentation, make sure to update if
+    // the signature of this function is changed
+    public synchronized void finishApplication(long time, Throwable throwable, int exitCode, String msg) {
+        log.info("Finishing spark application trace");
 
-    String batchKey = getStreamingBatchKey(jobStart.properties());
-    Long sqlExecutionId = getSqlExecutionId(jobStart.properties());
-    AgentSpan sqlSpan = null;
+        if (applicationEnded) {
+            return;
+        }
+        applicationEnded = true;
 
-    if (sqlExecutionId != null) {
-      sqlSpan = getOrCreateSqlSpan(sqlExecutionId, batchKey, jobStart.properties());
-    }
+        if ((applicationSpan == null && jobCount > 0) || isRunningOnDatabricks) {
+            // If the application span is not initialized, but spark jobs have been executed, all those
+            // spark jobs were databricks or streaming. In this case we don't send the application span
+            return;
+        }
 
-    /*-
-     * The spark.job span hierarchy depends on the setup:
-     *
-     * spark.application | spark.streaming_batch | databricks.task depending on the environment where spark is running
-     *               \          |                   /
-     *                    [spark.sql] optional, only present if using spark-sql
-     *                          |
-     *                      spark.job
-     */
-    if (sqlSpan != null) {
-      jobSpanBuilder.asChildOf(sqlSpan.spanContext());
-    } else if (batchKey != null) {
-      isStreamingJob = true;
-      AgentSpan batchSpan =
-          getOrCreateStreamingBatchSpan(batchKey, jobStart.time(), jobStart.properties());
-      jobSpanBuilder.asChildOf(batchSpan.spanContext());
-    } else if (isRunningOnDatabricks) {
-      addDatabricksSpecificTags(jobSpanBuilder, jobStart.properties(), true);
-    } else {
-      // In non-databricks, non-streaming env, the spark application is the local root span
-      initApplicationSpanIfNotInitialized();
-      jobSpanBuilder.asChildOf(applicationSpan.spanContext());
-    }
+        initApplicationSpanIfNotInitialized();
+
+        if (throwable != null) {
+            applicationSpan.addThrowable(throwable);
+        } else if (exitCode != 0) {
+            applicationSpan.setError(true);
+            applicationSpan.setTag(DDTags.ERROR_TYPE, "Spark Application Failed with exit code " + exitCode);
+
+            String errorMessage = getErrorMessageWithoutStackTrace(msg);
+            applicationSpan.setTag(DDTags.ERROR_MSG, errorMessage);
+            applicationSpan.setTag(DDTags.ERROR_STACK, msg);
+        } else if (lastJobFailed) {
+            applicationSpan.setError(true);
+            applicationSpan.setTag(DDTags.ERROR_TYPE, "Spark Application Failed");
+            applicationSpan.setTag(DDTags.ERROR_MSG, lastJobFailedMessage);
+            applicationSpan.setTag(DDTags.ERROR_STACK, lastJobFailedStackTrace);
+        } else if (lastSqlFailed) {
+            applicationSpan.setError(true);
+            applicationSpan.setTag(DDTags.ERROR_TYPE, "Spark SQL Failed");
+            applicationSpan.setTag(DDTags.ERROR_MSG, lastSqlFailedMessage);
+            applicationSpan.setTag(DDTags.ERROR_STACK, lastSqlFailedStackTrace);
+        }
 
-    jobSpanBuilder.withTag(DDTags.RESOURCE_NAME, getSparkJobName(jobStart));
+        applicationMetrics.setSpanMetrics(applicationSpan);
+        applicationSpan.setMetric("spark.max_executor_count", maxExecutorCount);
+        applicationSpan.setMetric("spark.available_executor_time", computeCurrentAvailableExecutorTime(time));
 
-    AgentSpan jobSpan = jobSpanBuilder.start();
-    setDataJobsSamplingPriority(jobSpan);
-    jobSpan.setMeasured(true);
+        applicationSpan.finish(time * 1000);
 
-    for (int stageId : getSparkJobStageIds(jobStart)) {
-      stageToJob.put(stageId, jobStart.jobId());
-    }
-    jobSpans.put(jobStart.jobId(), jobSpan);
-    notifyOl(x -> openLineageSparkListener.onJobStart(x), jobStart);
-  }
-
-  @Override
-  public synchronized void onJobEnd(SparkListenerJobEnd jobEnd) {
-    AgentSpan jobSpan = jobSpans.remove(jobEnd.jobId());
-    if (jobSpan == null) {
-      return;
+        // write traces synchronously:
+        // as soon as the application finishes, the JVM starts to shut down
+        tracer.flush();
     }
 
-    if (jobEnd.jobResult() instanceof JobFailed) {
-      JobFailed jobFailed = (JobFailed) jobEnd.jobResult();
-      Exception exception = jobFailed.exception();
-
-      String errorMessage = getErrorMessageWithoutStackTrace(exception.getMessage());
-      String errorStackTrace = stackTraceToString(exception);
-
-      jobSpan.setError(true);
-      jobSpan.setErrorMessage(errorMessage);
-      jobSpan.setTag(DDTags.ERROR_STACK, errorStackTrace);
-      jobSpan.setTag(DDTags.ERROR_TYPE, "Spark Job Failed");
-
-      // Only propagate the error to the application if it is not a cancellation
-      if (errorMessage != null && !errorMessage.toLowerCase().contains("cancelled")) {
-        lastJobFailed = true;
-        lastJobFailedMessage = errorMessage;
-        lastJobFailedStackTrace = errorStackTrace;
-      }
-    } else {
-      lastJobFailed = false;
-      lastSqlFailed = false;
-    }
+    private AgentSpan getOrCreateStreamingBatchSpan(String batchKey, Long timeMs, Properties jobProperties) {
+        AgentSpan batchSpan = streamingBatchSpans.get(batchKey);
+        if (batchSpan != null) {
+            return batchSpan;
+        }
 
-    SparkAggregatedTaskMetrics metrics = jobMetrics.remove(jobEnd.jobId());
-    if (metrics != null) {
-      metrics.setSpanMetrics(jobSpan);
-    }
-    notifyOl(x -> openLineageSparkListener.onJobEnd(x), jobEnd);
+        AgentTracer.SpanBuilder builder =
+                buildSparkSpan("spark.streaming_batch", jobProperties).withStartTimestamp(timeMs * 1000);
 
-    jobSpan.finish(jobEnd.time() * 1000);
-  }
+        // Streaming spans will always be the root span, capturing job parameters on those
+        captureJobParameters(builder, jobProperties);
 
-  @Override
-  public synchronized void onStageSubmitted(SparkListenerStageSubmitted stageSubmitted) {
-    if (stageSpans.size() > MAX_COLLECTION_SIZE) {
-      return;
+        if (isRunningOnDatabricks) {
+            addDatabricksSpecificTags(builder, jobProperties, false);
+        }
+
+        batchSpan = builder.start();
+        setDataJobsSamplingPriority(batchSpan);
+        streamingBatchSpans.put(batchKey, batchSpan);
+        return batchSpan;
+    }
+
+    private void addDatabricksSpecificTags(
+            AgentTracer.SpanBuilder builder, Properties properties, boolean withParentContext) {
+        // Databricks has no application span. Adding the parameters to the top level spark span
+        captureJobParameters(builder, properties);
+
+        if (properties != null) {
+            String databricksJobId = getDatabricksJobId(properties);
+            String databricksJobRunId = getDatabricksJobRunId(properties, databricksClusterName);
+            String databricksTaskRunId = getDatabricksTaskRunId(properties, databricksJobRunId);
+
+            // ids to link those spans to databricks job/task traces
+            builder.withTag("databricks_job_id", databricksJobId);
+            builder.withTag("databricks_job_run_id", databricksJobRunId);
+            builder.withTag("databricks_task_run_id", databricksTaskRunId);
+
+            AgentSpanContext parentContext = new DatabricksParentContext(
+                    databricksJobId, databricksJobRunId, databricksTaskRunId, getDatabricksJobRunAttempt(properties));
+
+            if (parentContext.getTraceId() != DDTraceId.ZERO) {
+                if (withParentContext) {
+                    builder.asChildOf(parentContext);
+                } else {
+                    builder.withLink(SpanLink.from(parentContext));
+                }
+            }
+        }
     }
 
-    int stageId = stageSubmitted.stageInfo().stageId();
-    int stageAttemptId = stageSubmitted.stageInfo().attemptNumber();
+    private AgentSpan getOrCreateSqlSpan(long sqlExecutionId, String batchKey, Properties jobProperties) {
+        AgentSpan span = sqlSpans.get(sqlExecutionId);
+        if (span != null) {
+            return span;
+        }
 
-    Integer jobId = stageToJob.get(stageId);
-    if (jobId == null) {
-      return;
-    }
+        SparkListenerSQLExecutionStart queryStart = sqlQueries.get(sqlExecutionId);
+        if (queryStart == null) {
+            return null;
+        }
 
-    AgentSpan jobSpan = jobSpans.get(jobId);
-    if (jobSpan == null) {
-      return;
-    }
+        AgentTracer.SpanBuilder spanBuilder = buildSparkSpan("spark.sql", jobProperties)
+                .withStartTimestamp(queryStart.time() * 1000)
+                .withTag("query_id", sqlExecutionId)
+                .withTag("description", queryStart.description())
+                .withTag("details", queryStart.details())
+                .withTag(DDTags.RESOURCE_NAME, queryStart.description());
+
+        if (batchKey != null) {
+            AgentSpan batchSpan = getOrCreateStreamingBatchSpan(batchKey, queryStart.time(), jobProperties);
+            spanBuilder.asChildOf(batchSpan.spanContext());
+        } else if (isRunningOnDatabricks) {
+            addDatabricksSpecificTags(spanBuilder, jobProperties, true);
+        } else {
+            initApplicationSpanIfNotInitialized();
+            spanBuilder.asChildOf(applicationSpan.spanContext());
+        }
 
-    long submissionTimeMs;
-    if (stageSubmitted.stageInfo().submissionTime().isDefined()) {
-      submissionTimeMs = (long) stageSubmitted.stageInfo().submissionTime().get();
-    } else {
-      submissionTimeMs = System.currentTimeMillis();
+        AgentSpan sqlSpan = spanBuilder.start();
+        setDataJobsSamplingPriority(sqlSpan);
+        sqlSpans.put(sqlExecutionId, sqlSpan);
+        return sqlSpan;
     }
 
-    long stageSpanKey = stageSpanKey(stageId, stageAttemptId);
-    stageMetrics.put(
-        stageSpanKey,
-        new SparkAggregatedTaskMetrics(computeCurrentAvailableExecutorTime(submissionTimeMs)));
-    stageProperties.put(stageSpanKey, stageSubmitted.properties());
-
-    AgentSpan stageSpan =
-        buildSparkSpan("spark.stage", stageSubmitted.properties())
-            .asChildOf(jobSpan.spanContext())
-            .withStartTimestamp(submissionTimeMs * 1000)
-            .withTag("stage_id", stageId)
-            .withTag(
-                "parent_stage_ids", Arrays.toString(getStageParentIds(stageSubmitted.stageInfo())))
-            .withTag("task_count", stageSubmitted.stageInfo().numTasks())
-            .withTag("attempt_id", stageAttemptId)
-            .withTag(DDTags.RESOURCE_NAME, stageSubmitted.stageInfo().name())
-            .start();
-
-    setDataJobsSamplingPriority(stageSpan);
-    stageSpan.setMeasured(true);
-
-    stageSpans.put(stageSpanKey(stageId, stageAttemptId), stageSpan);
-  }
-
-  @Override
-  public synchronized void onStageCompleted(SparkListenerStageCompleted stageCompleted) {
-    StageInfo stageInfo = stageCompleted.stageInfo();
-    int stageId = stageInfo.stageId();
-    int stageAttemptId = stageInfo.attemptNumber();
-
-    Integer jobId = stageToJob.get(stageId);
-    if (jobId == null) {
-      return;
-    }
+    @Override
+    public synchronized void onJobStart(SparkListenerJobStart jobStart) {
+        jobCount++;
+        if (jobSpans.size() > MAX_COLLECTION_SIZE) {
+            return;
+        }
 
-    long stageSpanKey = stageSpanKey(stageId, stageAttemptId);
-    AgentSpan span = stageSpans.remove(stageSpanKey);
-    if (span == null) {
-      return;
-    }
+        AgentTracer.SpanBuilder jobSpanBuilder = buildSparkSpan("spark.job", jobStart.properties())
+                .withStartTimestamp(jobStart.time() * 1000)
+                .withTag("job_id", jobStart.jobId())
+                .withTag("stage_count", getStageCount(jobStart));
 
-    span.setTag("details", stageCompleted.stageInfo().details());
-    if (stageInfo.failureReason().isDefined()) {
-      span.setError(true);
-      span.setErrorMessage(getErrorMessageWithoutStackTrace(stageInfo.failureReason().get()));
-      span.setTag(DDTags.ERROR_STACK, stageInfo.failureReason().get());
-      span.setTag(DDTags.ERROR_TYPE, "Spark Stage Failed");
-    }
+        String batchKey = getStreamingBatchKey(jobStart.properties());
+        Long sqlExecutionId = getSqlExecutionId(jobStart.properties());
+        AgentSpan sqlSpan = null;
 
-    long completionTimeMs;
-    if (stageCompleted.stageInfo().completionTime().isDefined()) {
-      completionTimeMs = (long) stageCompleted.stageInfo().completionTime().get();
-    } else {
-      completionTimeMs = System.currentTimeMillis();
-    }
+        if (sqlExecutionId != null) {
+            sqlSpan = getOrCreateSqlSpan(sqlExecutionId, batchKey, jobStart.properties());
+        }
 
-    long currentAvailableExecutorTime = computeCurrentAvailableExecutorTime(completionTimeMs);
-    for (SparkAggregatedTaskMetrics metric : stageMetrics.values()) {
-      metric.allocateAvailableExecutorTime(currentAvailableExecutorTime);
-    }
+        /*-
+         * The spark.job span hierarchy depends on the setup:
+         *
+         * spark.application | spark.streaming_batch | databricks.task depending on the environment where spark is running
+         *               \          |                   /
+         *                    [spark.sql] optional, only present if using spark-sql
+         *                          |
+         *                      spark.job
+         */
+        if (sqlSpan != null) {
+            jobSpanBuilder.asChildOf(sqlSpan.spanContext());
+        } else if (batchKey != null) {
+            isStreamingJob = true;
+            AgentSpan batchSpan = getOrCreateStreamingBatchSpan(batchKey, jobStart.time(), jobStart.properties());
+            jobSpanBuilder.asChildOf(batchSpan.spanContext());
+        } else if (isRunningOnDatabricks) {
+            addDatabricksSpecificTags(jobSpanBuilder, jobStart.properties(), true);
+        } else {
+            // In non-databricks, non-streaming env, the spark application is the local root span
+            initApplicationSpanIfNotInitialized();
+            jobSpanBuilder.asChildOf(applicationSpan.spanContext());
+        }
 
-    for (AccumulableInfo info :
-        JavaConverters.asJavaCollection(stageInfo.accumulables().values())) {
-      accumulatorToStageID.put(info.id(), stageId);
-    }
+        jobSpanBuilder.withTag(DDTags.RESOURCE_NAME, getSparkJobName(jobStart));
 
-    Properties prop = stageProperties.remove(stageSpanKey);
-    Long sqlExecutionId = getSqlExecutionId(prop);
-
-    SparkAggregatedTaskMetrics stageMetric = stageMetrics.remove(stageSpanKey);
-    if (stageMetric != null) {
-      stageMetric.computeSkew();
-      stageMetric.setSpanMetrics(span);
-      applicationMetrics.accumulateStageMetrics(stageMetric);
-
-      jobMetrics
-          .computeIfAbsent(jobId, k -> new SparkAggregatedTaskMetrics())
-          .accumulateStageMetrics(stageMetric);
-
-      String batchKey = getStreamingBatchKey(prop);
-      if (batchKey != null) {
-        streamingBatchMetrics
-            .computeIfAbsent(batchKey, k -> new SparkAggregatedTaskMetrics())
-            .accumulateStageMetrics(stageMetric);
-      }
-
-      if (sqlExecutionId != null) {
-        sqlMetrics
-            .computeIfAbsent(sqlExecutionId, k -> new SparkAggregatedTaskMetrics())
-            .accumulateStageMetrics(stageMetric);
-      }
-    }
+        AgentSpan jobSpan = jobSpanBuilder.start();
+        setDataJobsSamplingPriority(jobSpan);
+        jobSpan.setMeasured(true);
 
-    SparkPlanInfo sqlPlan = sqlPlans.get(sqlExecutionId);
-    if (sqlPlan != null) {
-      SparkSQLUtils.addSQLPlanToStageSpan(
-          span, sqlPlan, accumulatorToStageID, stageMetric, stageId);
+        for (int stageId : getSparkJobStageIds(jobStart)) {
+            stageToJob.put(stageId, jobStart.jobId());
+        }
+        jobSpans.put(jobStart.jobId(), jobSpan);
+        notifyOl(x -> openLineageSparkListener.onJobStart(x), jobStart);
     }
 
-    span.finish(completionTimeMs * 1000);
-  }
+    @Override
+    public synchronized void onJobEnd(SparkListenerJobEnd jobEnd) {
+        AgentSpan jobSpan = jobSpans.remove(jobEnd.jobId());
+        if (jobSpan == null) {
+            return;
+        }
 
-  @Override
-  public void onTaskEnd(SparkListenerTaskEnd taskEnd) {
-    int stageId = taskEnd.stageId();
-    int stageAttemptId = taskEnd.stageAttemptId();
-    long stageSpanKey = stageSpanKey(stageId, stageAttemptId);
+        if (jobEnd.jobResult() instanceof JobFailed) {
+            JobFailed jobFailed = (JobFailed) jobEnd.jobResult();
+            Exception exception = jobFailed.exception();
 
-    SparkAggregatedTaskMetrics stageMetric = stageMetrics.get(stageSpanKey);
-    if (stageMetric != null) {
-      // Not happy that we have to extract external accumulators here, but needed as we're dealing
-      // with Seq which varies across Scala versions
-      stageMetric.addTaskMetrics(taskEnd, getExternalAccumulators(taskEnd.taskMetrics()));
-    }
+            String errorMessage = getErrorMessageWithoutStackTrace(exception.getMessage());
+            String errorStackTrace = stackTraceToString(exception);
 
-    if (taskEnd.taskMetrics() != null) {
-      // Record the runtime in each active stage in order to allocate the available executor time
-      long taskRunTime = SparkAggregatedTaskMetrics.computeTaskRunTime(taskEnd.taskMetrics());
-      for (SparkAggregatedTaskMetrics aggMetrics : stageMetrics.values()) {
-        aggMetrics.recordTotalTaskRunTime(taskRunTime);
-      }
-    }
+            jobSpan.setError(true);
+            jobSpan.setErrorMessage(errorMessage);
+            jobSpan.setTag(DDTags.ERROR_STACK, errorStackTrace);
+            jobSpan.setTag(DDTags.ERROR_TYPE, "Spark Job Failed");
 
-    // OpenLineage call should be prior to method return statements
-    notifyOl(x -> openLineageSparkListener.onTaskEnd(x), taskEnd);
+            // Only propagate the error to the application if it is not a cancellation
+            if (errorMessage != null && !errorMessage.toLowerCase().contains("cancelled")) {
+                lastJobFailed = true;
+                lastJobFailedMessage = errorMessage;
+                lastJobFailedStackTrace = errorStackTrace;
+            }
+        } else {
+            lastJobFailed = false;
+            lastSqlFailed = false;
+        }
 
-    // Only sending failing tasks
-    if (!(taskEnd.reason() instanceof TaskFailedReason)) {
-      return;
-    }
+        SparkAggregatedTaskMetrics metrics = jobMetrics.remove(jobEnd.jobId());
+        if (metrics != null) {
+            metrics.setSpanMetrics(jobSpan);
+        }
+        notifyOl(x -> openLineageSparkListener.onJobEnd(x), jobEnd);
 
-    // Only sending tasks that can lead to failure
-    TaskFailedReason reason = (TaskFailedReason) taskEnd.reason();
-    if (!reason.countTowardsTaskFailures()) {
-      return;
+        jobSpan.finish(jobEnd.time() * 1000);
     }
 
-    AgentSpan stageSpan = stageSpans.get(stageSpanKey);
-    if (stageSpan == null) {
-      return;
-    }
+    @Override
+    public synchronized void onStageSubmitted(SparkListenerStageSubmitted stageSubmitted) {
+        if (stageSpans.size() > MAX_COLLECTION_SIZE) {
+            return;
+        }
 
-    Properties props = stageProperties.get(stageSpanKey);
-    sendTaskSpan(stageSpan, taskEnd, props);
-  }
-
-  public static boolean classIsLoadable(String className) {
-    try {
-      Class.forName(
-          className,
-          false,
-          Optional.ofNullable(Thread.currentThread().getContextClassLoader())
-              .orElse(SparkConf.class.getClassLoader()));
-      return true;
-    } catch (ClassNotFoundException e) {
-      return false;
-    }
-  }
-
-  private void sendTaskSpan(
-      AgentSpan stageSpan, SparkListenerTaskEnd taskEnd, Properties properties) {
-    AgentSpan taskSpan =
-        buildSparkSpan("spark.task", properties)
-            .asChildOf(stageSpan.spanContext())
-            .withStartTimestamp(taskEnd.taskInfo().launchTime() * 1000)
-            .withTag("task_id", taskEnd.taskInfo().taskId())
-            .withTag("task_attempt_id", taskEnd.taskInfo().attemptNumber())
-            .withTag("task_type", taskEnd.taskType())
-            .withTag("stage_id", taskEnd.stageId())
-            .withTag("stage_attempt_id", taskEnd.stageAttemptId())
-            .withTag("executor_id", taskEnd.taskInfo().executorId())
-            .withTag("host", taskEnd.taskInfo().host())
-            .withTag("task_locality", taskEnd.taskInfo().taskLocality().toString())
-            .withTag("speculative", taskEnd.taskInfo().speculative())
-            .withTag("status", taskEnd.taskInfo().status())
-            .start();
-
-    if (taskEnd.reason() instanceof TaskFailedReason) {
-      TaskFailedReason reason = (TaskFailedReason) taskEnd.reason();
-
-      taskSpan.setError(true);
-      taskSpan.setTag(DDTags.ERROR_TYPE, "Spark Task Failed");
-
-      if (reason instanceof ExceptionFailure) {
-        ExceptionFailure exceptionFailure = (ExceptionFailure) reason;
-
-        taskSpan.setErrorMessage(
-            String.format("%s: %s", exceptionFailure.className(), exceptionFailure.description()));
-        taskSpan.setTag(DDTags.ERROR_STACK, exceptionFailure.fullStackTrace());
-      } else {
-        taskSpan.setErrorMessage(reason.toErrorString());
-      }
-
-      taskSpan.setTag("count_towards_task_failures", reason.countTowardsTaskFailures());
-    }
+        int stageId = stageSubmitted.stageInfo().stageId();
+        int stageAttemptId = stageSubmitted.stageInfo().attemptNumber();
 
-    setDataJobsSamplingPriority(taskSpan);
-    taskSpan.finish(taskEnd.taskInfo().finishTime() * 1000);
-  }
+        Integer jobId = stageToJob.get(stageId);
+        if (jobId == null) {
+            return;
+        }
 
-  @Override
-  public synchronized void onExecutorAdded(SparkListenerExecutorAdded executorAdded) {
-    currentExecutorCount += 1;
-    maxExecutorCount = Math.max(maxExecutorCount, currentExecutorCount);
+        AgentSpan jobSpan = jobSpans.get(jobId);
+        if (jobSpan == null) {
+            return;
+        }
 
-    if (liveExecutors.size() <= MAX_COLLECTION_SIZE) {
-      liveExecutors.put(executorAdded.executorId(), executorAdded);
-    }
-  }
+        long submissionTimeMs;
+        if (stageSubmitted.stageInfo().submissionTime().isDefined()) {
+            submissionTimeMs =
+                    (long) stageSubmitted.stageInfo().submissionTime().get();
+        } else {
+            submissionTimeMs = System.currentTimeMillis();
+        }
 
-  @Override
-  public synchronized void onExecutorRemoved(SparkListenerExecutorRemoved executorRemoved) {
-    currentExecutorCount -= 1;
+        long stageSpanKey = stageSpanKey(stageId, stageAttemptId);
+        stageMetrics.put(
+                stageSpanKey, new SparkAggregatedTaskMetrics(computeCurrentAvailableExecutorTime(submissionTimeMs)));
+        stageProperties.put(stageSpanKey, stageSubmitted.properties());
 
-    SparkListenerExecutorAdded executor = liveExecutors.remove(executorRemoved.executorId());
-    if (executor != null) {
-      availableExecutorTime +=
-          (executorRemoved.time() - executor.time()) * executor.executorInfo().totalCores();
-    }
-  }
-
-  @Override
-  public void onOtherEvent(SparkListenerEvent event) {
-    if (event instanceof StreamingQueryListener.QueryStartedEvent) {
-      onStreamingQueryStartedEvent((StreamingQueryListener.QueryStartedEvent) event);
-    } else if (event instanceof StreamingQueryListener.QueryProgressEvent) {
-      onStreamingQueryProgressEvent((StreamingQueryListener.QueryProgressEvent) event);
-    } else if (event instanceof StreamingQueryListener.QueryTerminatedEvent) {
-      onStreamingQueryTerminatedEvent((StreamingQueryListener.QueryTerminatedEvent) event);
-    } else if (event instanceof SparkListenerSQLExecutionStart) {
-      onSQLExecutionStart((SparkListenerSQLExecutionStart) event);
-    } else if (event instanceof SparkListenerSQLExecutionEnd) {
-      onSQLExecutionEnd((SparkListenerSQLExecutionEnd) event);
-    }
+        AgentSpan stageSpan = buildSparkSpan("spark.stage", stageSubmitted.properties())
+                .asChildOf(jobSpan.spanContext())
+                .withStartTimestamp(submissionTimeMs * 1000)
+                .withTag("stage_id", stageId)
+                .withTag("parent_stage_ids", Arrays.toString(getStageParentIds(stageSubmitted.stageInfo())))
+                .withTag("task_count", stageSubmitted.stageInfo().numTasks())
+                .withTag("attempt_id", stageAttemptId)
+                .withTag(DDTags.RESOURCE_NAME, stageSubmitted.stageInfo().name())
+                .start();
 
-    updateAdaptiveSQLPlan(event);
-  }
+        setDataJobsSamplingPriority(stageSpan);
+        stageSpan.setMeasured(true);
 
-  private <T extends SparkListenerEvent> void notifyOl(Consumer<T> ol, T event) {
-    if (!Config.get().isDataJobsOpenLineageEnabled()) {
-      log.debug("Ignoring event {} - OpenLineage not enabled", event);
-      return;
+        stageSpans.put(stageSpanKey(stageId, stageAttemptId), stageSpan);
     }
 
-    if (isStreamingJob) {
-      log.debug("Not emitting event when running streaming jobs");
-      return;
-    }
-    if (openLineageSparkListener != null) {
-      log.debug(
-          "Passing event `{}` to OpenLineageSparkListener", event.getClass().getCanonicalName());
-      ol.accept(event);
-    } else {
-      log.debug("OpenLineageSparkListener is null");
-    }
-  }
-
-  private static final Class<?> adaptiveExecutionUpdateClass;
-  private static final MethodHandle adaptiveExecutionIdMethod;
-  private static final MethodHandle adaptiveSparkPlanMethod;
-
-  @SuppressForbidden // Using reflection to avoid splitting the instrumentation once more
-  private static Class<?> findAdaptiveExecutionUpdateClass() throws ClassNotFoundException {
-    return Class.forName(
-        "org.apache.spark.sql.execution.ui.SparkListenerSQLAdaptiveExecutionUpdate");
-  }
-
-  static {
-    Class<?> executionUpdateClass = null;
-    MethodHandle executionIdMethod = null;
-    MethodHandle sparkPlanMethod = null;
-
-    try {
-      MethodHandles.Lookup lookup = MethodHandles.lookup();
-
-      executionUpdateClass = findAdaptiveExecutionUpdateClass();
-      executionIdMethod =
-          lookup.findVirtual(
-              executionUpdateClass, "executionId", MethodType.methodType(long.class));
-      sparkPlanMethod =
-          lookup.findVirtual(
-              executionUpdateClass, "sparkPlanInfo", MethodType.methodType(SparkPlanInfo.class));
-    } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException ignored) {
-    }
+    @Override
+    public synchronized void onStageCompleted(SparkListenerStageCompleted stageCompleted) {
+        StageInfo stageInfo = stageCompleted.stageInfo();
+        int stageId = stageInfo.stageId();
+        int stageAttemptId = stageInfo.attemptNumber();
 
-    adaptiveExecutionUpdateClass = executionUpdateClass;
-    adaptiveExecutionIdMethod = executionIdMethod;
-    adaptiveSparkPlanMethod = sparkPlanMethod;
-  }
+        Integer jobId = stageToJob.get(stageId);
+        if (jobId == null) {
+            return;
+        }
 
-  private synchronized void updateAdaptiveSQLPlan(SparkListenerEvent event) {
-    try {
-      if (adaptiveExecutionUpdateClass != null && adaptiveExecutionUpdateClass.isInstance(event)) {
-        long queryId = (long) adaptiveExecutionIdMethod.invoke(event);
-        SparkPlanInfo sparkPlanInfo = (SparkPlanInfo) adaptiveSparkPlanMethod.invoke(event);
+        long stageSpanKey = stageSpanKey(stageId, stageAttemptId);
+        AgentSpan span = stageSpans.remove(stageSpanKey);
+        if (span == null) {
+            return;
+        }
 
-        sqlPlans.put(queryId, sparkPlanInfo);
-      }
-    } catch (Throwable ignored) {
-    }
-  }
-
-  private synchronized void onSQLExecutionStart(SparkListenerSQLExecutionStart sqlStart) {
-    sqlPlans.put(sqlStart.executionId(), sqlStart.sparkPlanInfo());
-    sqlQueries.put(sqlStart.executionId(), sqlStart);
-    notifyOl(x -> openLineageSparkListener.onOtherEvent(x), sqlStart);
-  }
-
-  private synchronized void onSQLExecutionEnd(SparkListenerSQLExecutionEnd sqlEnd) {
-    AgentSpan span = sqlSpans.remove(sqlEnd.executionId());
-    SparkAggregatedTaskMetrics metrics = sqlMetrics.remove(sqlEnd.executionId());
-    SparkListenerSQLExecutionStart queryStart = sqlQueries.remove(sqlEnd.executionId());
-    sqlPlans.remove(sqlEnd.executionId());
-
-    if (span != null) {
-      if (metrics != null) {
-        metrics.setSpanMetrics(span);
-      }
-      notifyOl(x -> openLineageSparkListener.onOtherEvent(x), sqlEnd);
-
-      // Set right before finish so long-running heartbeats of the running span don't carry the
-      // plan
-      span.setTag("_dd.spark.physical_plan", queryStart.physicalPlanDescription());
-      span.finish(sqlEnd.time() * 1000);
-    }
-  }
+        span.setTag("details", stageCompleted.stageInfo().details());
+        if (stageInfo.failureReason().isDefined()) {
+            span.setError(true);
+            span.setErrorMessage(
+                    getErrorMessageWithoutStackTrace(stageInfo.failureReason().get()));
+            span.setTag(DDTags.ERROR_STACK, stageInfo.failureReason().get());
+            span.setTag(DDTags.ERROR_TYPE, "Spark Stage Failed");
+        }
 
-  private synchronized void onStreamingQueryStartedEvent(
-      StreamingQueryListener.QueryStartedEvent event) {
-    if (streamingQueries.size() > MAX_COLLECTION_SIZE) {
-      return;
-    }
+        long completionTimeMs;
+        if (stageCompleted.stageInfo().completionTime().isDefined()) {
+            completionTimeMs =
+                    (long) stageCompleted.stageInfo().completionTime().get();
+        } else {
+            completionTimeMs = System.currentTimeMillis();
+        }
+
+        long currentAvailableExecutorTime = computeCurrentAvailableExecutorTime(completionTimeMs);
+        for (SparkAggregatedTaskMetrics metric : stageMetrics.values()) {
+            metric.allocateAvailableExecutorTime(currentAvailableExecutorTime);
+        }
 
-    streamingQueries.put(event.id(), event);
-  }
+        for (AccumulableInfo info :
+                JavaConverters.asJavaCollection(stageInfo.accumulables().values())) {
+            accumulatorToStageID.put(info.id(), stageId);
+        }
 
-  private synchronized void onStreamingQueryTerminatedEvent(
-      StreamingQueryListener.QueryTerminatedEvent event) {
-    StreamingQueryListener.QueryStartedEvent startedEvent = streamingQueries.remove(event.id());
+        Properties prop = stageProperties.remove(stageSpanKey);
+        Long sqlExecutionId = getSqlExecutionId(prop);
+
+        SparkAggregatedTaskMetrics stageMetric = stageMetrics.remove(stageSpanKey);
+        if (stageMetric != null) {
+            stageMetric.computeSkew();
+            stageMetric.setSpanMetrics(span);
+            applicationMetrics.accumulateStageMetrics(stageMetric);
+
+            jobMetrics
+                    .computeIfAbsent(jobId, k -> new SparkAggregatedTaskMetrics())
+                    .accumulateStageMetrics(stageMetric);
+
+            String batchKey = getStreamingBatchKey(prop);
+            if (batchKey != null) {
+                streamingBatchMetrics
+                        .computeIfAbsent(batchKey, k -> new SparkAggregatedTaskMetrics())
+                        .accumulateStageMetrics(stageMetric);
+            }
+
+            if (sqlExecutionId != null) {
+                sqlMetrics
+                        .computeIfAbsent(sqlExecutionId, k -> new SparkAggregatedTaskMetrics())
+                        .accumulateStageMetrics(stageMetric);
+            }
+        }
 
-    ArrayList<String> batchesToFinish = new ArrayList<>();
+        SparkPlanInfo sqlPlan = sqlPlans.get(sqlExecutionId);
+        if (sqlPlan != null) {
+            SparkSQLUtils.addSQLPlanToStageSpan(span, sqlPlan, accumulatorToStageID, stageMetric, stageId);
+        }
 
-    for (String batchKey : streamingBatchSpans.keySet()) {
-      if (batchKey.startsWith(event.id().toString())) {
-        batchesToFinish.add(batchKey);
-      }
+        span.finish(completionTimeMs * 1000);
     }
 
-    for (String batchKey : batchesToFinish) {
-      AgentSpan batchSpan = streamingBatchSpans.remove(batchKey);
-      SparkAggregatedTaskMetrics metrics = streamingBatchMetrics.remove(batchKey);
+    @Override
+    public void onTaskEnd(SparkListenerTaskEnd taskEnd) {
+        int stageId = taskEnd.stageId();
+        int stageAttemptId = taskEnd.stageAttemptId();
+        long stageSpanKey = stageSpanKey(stageId, stageAttemptId);
 
-      if (batchSpan != null) {
-        if (metrics != null) {
-          metrics.setSpanMetrics(batchSpan);
+        SparkAggregatedTaskMetrics stageMetric = stageMetrics.get(stageSpanKey);
+        if (stageMetric != null) {
+            // Not happy that we have to extract external accumulators here, but needed as we're dealing
+            // with Seq which varies across Scala versions
+            stageMetric.addTaskMetrics(taskEnd, getExternalAccumulators(taskEnd.taskMetrics()));
         }
 
-        batchSpan.setTag("streaming_query.id", event.id());
-        batchSpan.setTag("streaming_query.run_id", event.runId());
-        batchSpan.setTag("streaming_query.batch_id", getBatchIdFromBatchKey(batchKey));
-        if (startedEvent != null) {
-          batchSpan.setTag("streaming_query.name", startedEvent.name());
-          batchSpan.setTag(DDTags.RESOURCE_NAME, startedEvent.name());
+        if (taskEnd.taskMetrics() != null) {
+            // Record the runtime in each active stage in order to allocate the available executor time
+            long taskRunTime = SparkAggregatedTaskMetrics.computeTaskRunTime(taskEnd.taskMetrics());
+            for (SparkAggregatedTaskMetrics aggMetrics : stageMetrics.values()) {
+                aggMetrics.recordTotalTaskRunTime(taskRunTime);
+            }
         }
 
-        if (event.exception().isDefined()) {
-          String exceptionString = event.exception().get();
+        // OpenLineage call should be prior to method return statements
+        notifyOl(x -> openLineageSparkListener.onTaskEnd(x), taskEnd);
 
-          batchSpan.setError(true);
-          batchSpan.setErrorMessage(getErrorMessageWithoutStackTrace(exceptionString));
-          batchSpan.setTag(DDTags.ERROR_STACK, exceptionString);
+        // Only sending failing tasks
+        if (!(taskEnd.reason() instanceof TaskFailedReason)) {
+            return;
         }
 
-        batchSpan.finish();
-      }
-    }
-  }
-
-  private synchronized void onStreamingQueryProgressEvent(
-      StreamingQueryListener.QueryProgressEvent event) {
-    StreamingQueryProgress progress = event.progress();
-
-    String batchKey =
-        getStreamingBatchKey(progress.id().toString(), String.valueOf(progress.batchId()));
-
-    AgentSpan batchSpan = streamingBatchSpans.remove(batchKey);
-    SparkAggregatedTaskMetrics metrics = streamingBatchMetrics.remove(batchKey);
-    if (batchSpan != null) {
-      if (metrics != null) {
-        metrics.setSpanMetrics(batchSpan);
-      }
-
-      batchSpan.setTag("streaming_query.id", progress.id());
-      batchSpan.setTag("streaming_query.run_id", progress.runId());
-      batchSpan.setTag("streaming_query.batch_id", progress.batchId());
-      batchSpan.setTag("streaming_query.name", progress.name());
-      batchSpan.setTag(DDTags.RESOURCE_NAME, progress.name());
-
-      batchSpan.setMetric("spark.num_input_rows", progress.numInputRows());
-      batchSpan.setMetric("spark.input_rows_per_second", progress.inputRowsPerSecond());
-      batchSpan.setMetric("spark.processed_rows_per_second", progress.processedRowsPerSecond());
-
-      Long watermark = convertStringDateToMillis(progress.eventTime().get("watermark"));
-      if (watermark != null) {
-        batchSpan.setMetric("spark.event_time.watermark", watermark);
-
-        Long progressTimestamp = convertStringDateToMillis(progress.timestamp());
-        if (watermark > 0 && progressTimestamp != null) {
-          batchSpan.setMetric("spark.event_time.watermark_gap", progressTimestamp - watermark);
-        }
-      }
-      Long maxEventTime = convertStringDateToMillis(progress.eventTime().get("max"));
-      if (maxEventTime != null) {
-        batchSpan.setMetric("spark.event_time.max", maxEventTime);
-      }
-      Long minEventTime = convertStringDateToMillis(progress.eventTime().get("min"));
-      if (minEventTime != null) {
-        batchSpan.setMetric("spark.event_time.min", minEventTime);
-      }
-
-      Long addBatch = progress.durationMs().get("addBatch");
-      if (addBatch != null) {
-        batchSpan.setMetric("spark.add_batch_duration", addBatch);
-      }
-      Long getBatch = progress.durationMs().get("getBatch");
-      if (getBatch != null) {
-        batchSpan.setMetric("spark.get_batch_duration", getBatch);
-      }
-      Long latestOffset = progress.durationMs().get("latestOffset");
-      if (latestOffset != null) {
-        batchSpan.setMetric("spark.latest_offset_duration", latestOffset);
-      }
-      Long queryPlanning = progress.durationMs().get("queryPlanning");
-      if (queryPlanning != null) {
-        batchSpan.setMetric("spark.query_planing_duration", queryPlanning);
-      }
-      Long triggerExecution = progress.durationMs().get("triggerExecution");
-      if (triggerExecution != null) {
-        batchSpan.setMetric("spark.trigger_execution_duration", triggerExecution);
-      }
-      Long walCommit = progress.durationMs().get("walCommit");
-      if (walCommit != null) {
-        batchSpan.setMetric("spark.wal_commit_duration", walCommit);
-      }
-
-      for (int i = 0; i < progress.sources().length; i++) {
-        SourceProgress source = progress.sources()[i];
-        String prefix = "spark.source." + i + ".";
-
-        batchSpan.setTag(prefix + "description", source.description());
-        batchSpan.setTag(prefix + "start_offset", source.startOffset());
-        batchSpan.setTag(prefix + "end_offset", source.endOffset());
-        batchSpan.setTag(prefix + "num_input_rows", source.numInputRows());
-        batchSpan.setTag(prefix + "input_rows_per_second", source.inputRowsPerSecond());
-        batchSpan.setTag(prefix + "processed_rows_per_second", source.processedRowsPerSecond());
-
-        reportKafkaOffsets(batchSpan.getServiceName(), batchSpan, source);
-      }
-
-      for (int i = 0; i < progress.stateOperators().length; i++) {
-        StateOperatorProgress state = progress.stateOperators()[i];
-        String prefix = "spark.state." + i + ".";
-
-        batchSpan.setTag(prefix + "num_rows_total", state.numRowsTotal());
-        batchSpan.setTag(prefix + "num_rows_updated", state.numRowsUpdated());
-        batchSpan.setTag(prefix + "memory_used_bytes", state.memoryUsedBytes());
-      }
-
-      batchSpan.setTag("spark.sink.description", progress.sink().description());
-
-      batchSpan.finish();
-    }
-  }
-
-  private void setDataJobsSamplingPriority(AgentSpan span) {
-    span.setSamplingPriority(PrioritySampling.USER_KEEP, SamplingMechanism.DATA_JOBS);
-  }
+        // Only sending tasks that can lead to failure
+        TaskFailedReason reason = (TaskFailedReason) taskEnd.reason();
+        if (!reason.countTowardsTaskFailures()) {
+            return;
+        }
 
-  private AgentTracer.SpanBuilder buildSparkSpan(String spanName, Properties properties) {
-    AgentTracer.SpanBuilder builder =
-        tracer.buildSpan("spark", spanName).withSpanType("spark").withTag("app_id", appId);
+        AgentSpan stageSpan = stageSpans.get(stageSpanKey);
+        if (stageSpan == null) {
+            return;
+        }
 
-    if (databricksServiceName != null) {
-      builder.withServiceName(databricksServiceName);
-    } else if (sparkServiceName != null) {
-      builder.withServiceName(sparkServiceName);
-      builder.withTag("service_name", sparkServiceName);
+        Properties props = stageProperties.get(stageSpanKey);
+        sendTaskSpan(stageSpan, taskEnd, props);
     }
 
-    addPropertiesTags(builder, properties);
+    public static boolean classIsLoadable(String className) {
+        try {
+            Class.forName(
+                    className,
+                    false,
+                    Optional.ofNullable(Thread.currentThread().getContextClassLoader())
+                            .orElse(SparkConf.class.getClassLoader()));
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+    }
 
-    return builder;
-  }
+    private void sendTaskSpan(AgentSpan stageSpan, SparkListenerTaskEnd taskEnd, Properties properties) {
+        AgentSpan taskSpan = buildSparkSpan("spark.task", properties)
+                .asChildOf(stageSpan.spanContext())
+                .withStartTimestamp(taskEnd.taskInfo().launchTime() * 1000)
+                .withTag("task_id", taskEnd.taskInfo().taskId())
+                .withTag("task_attempt_id", taskEnd.taskInfo().attemptNumber())
+                .withTag("task_type", taskEnd.taskType())
+                .withTag("stage_id", taskEnd.stageId())
+                .withTag("stage_attempt_id", taskEnd.stageAttemptId())
+                .withTag("executor_id", taskEnd.taskInfo().executorId())
+                .withTag("host", taskEnd.taskInfo().host())
+                .withTag("task_locality", taskEnd.taskInfo().taskLocality().toString())
+                .withTag("speculative", taskEnd.taskInfo().speculative())
+                .withTag("status", taskEnd.taskInfo().status())
+                .start();
+
+        if (taskEnd.reason() instanceof TaskFailedReason) {
+            TaskFailedReason reason = (TaskFailedReason) taskEnd.reason();
+
+            taskSpan.setError(true);
+            taskSpan.setTag(DDTags.ERROR_TYPE, "Spark Task Failed");
+
+            if (reason instanceof ExceptionFailure) {
+                ExceptionFailure exceptionFailure = (ExceptionFailure) reason;
+
+                taskSpan.setErrorMessage(
+                        String.format("%s: %s", exceptionFailure.className(), exceptionFailure.description()));
+                taskSpan.setTag(DDTags.ERROR_STACK, exceptionFailure.fullStackTrace());
+            } else {
+                taskSpan.setErrorMessage(reason.toErrorString());
+            }
+
+            taskSpan.setTag("count_towards_task_failures", reason.countTowardsTaskFailures());
+        }
 
-  private void addPropertiesTags(AgentTracer.SpanBuilder builder, Properties properties) {
-    if (properties == null) {
-      return;
+        setDataJobsSamplingPriority(taskSpan);
+        taskSpan.finish(taskEnd.taskInfo().finishTime() * 1000);
     }
 
-    for (String propertyName : properties.stringPropertyNames()) {
-      if (propertyName.startsWith(RUNTIME_TAGS_PREFIX)) {
-        String value = properties.getProperty(propertyName);
-        String key = propertyName.substring(RUNTIME_TAGS_PREFIX.length());
+    @Override
+    public synchronized void onExecutorAdded(SparkListenerExecutorAdded executorAdded) {
+        currentExecutorCount += 1;
+        maxExecutorCount = Math.max(maxExecutorCount, currentExecutorCount);
 
-        builder.withTag(key, value);
-      }
+        if (liveExecutors.size() <= MAX_COLLECTION_SIZE) {
+            liveExecutors.put(executorAdded.executorId(), executorAdded);
+        }
     }
-  }
 
-  private long stageSpanKey(int stageId, int attemptId) {
-    return ((long) stageId << 32) + attemptId;
-  }
+    @Override
+    public synchronized void onExecutorRemoved(SparkListenerExecutorRemoved executorRemoved) {
+        currentExecutorCount -= 1;
 
-  @SuppressForbidden // split with one-char String use a fast-path without regex usage
-  private static String getDatabricksJobId(Properties properties) {
-    String jobId = properties.getProperty("spark.databricks.job.id");
-    if (jobId != null) {
-      return jobId;
+        SparkListenerExecutorAdded executor = liveExecutors.remove(executorRemoved.executorId());
+        if (executor != null) {
+            availableExecutorTime += (executorRemoved.time() - executor.time())
+                    * executor.executorInfo().totalCores();
+        }
     }
 
-    // First fallback, use spark.jobGroup.id with the pattern
-    // <scheduler_id>_job-<job_id>-run-<task_run_id>-action-<action_id>
-    String jobGroupId = properties.getProperty("spark.jobGroup.id");
-    if (jobGroupId != null) {
-      int startIndex = jobGroupId.indexOf("job-");
-      int endIndex = jobGroupId.indexOf("-run", startIndex);
-      if (startIndex != -1 && endIndex != -1) {
-        return jobGroupId.substring(startIndex + 4, endIndex);
-      }
+    @Override
+    public void onOtherEvent(SparkListenerEvent event) {
+        if (event instanceof StreamingQueryListener.QueryStartedEvent) {
+            onStreamingQueryStartedEvent((StreamingQueryListener.QueryStartedEvent) event);
+        } else if (event instanceof StreamingQueryListener.QueryProgressEvent) {
+            onStreamingQueryProgressEvent((StreamingQueryListener.QueryProgressEvent) event);
+        } else if (event instanceof StreamingQueryListener.QueryTerminatedEvent) {
+            onStreamingQueryTerminatedEvent((StreamingQueryListener.QueryTerminatedEvent) event);
+        } else if (event instanceof SparkListenerSQLExecutionStart) {
+            onSQLExecutionStart((SparkListenerSQLExecutionStart) event);
+        } else if (event instanceof SparkListenerSQLExecutionEnd) {
+            onSQLExecutionEnd((SparkListenerSQLExecutionEnd) event);
+        }
+
+        updateAdaptiveSQLPlan(event);
     }
 
-    // Second fallback, use spark.databricks.workload.id with pattern
-    // <org_id>-<job_id>-<task_run_id>
-    String workloadId = properties.getProperty("spark.databricks.workload.id");
-    if (workloadId != null) {
-      String[] parts = workloadId.split("-");
-      if (parts.length > 1) {
-        return parts[1];
-      }
+    private <T extends SparkListenerEvent> void notifyOl(Consumer<T> ol, T event) {
+        if (!Config.get().isDataJobsOpenLineageEnabled()) {
+            log.debug("Ignoring event {} - OpenLineage not enabled", event);
+            return;
+        }
+
+        if (isStreamingJob) {
+            log.debug("Not emitting event when running streaming jobs");
+            return;
+        }
+        if (openLineageSparkListener != null) {
+            log.debug(
+                    "Passing event `{}` to OpenLineageSparkListener",
+                    event.getClass().getCanonicalName());
+            ol.accept(event);
+        } else {
+            log.debug("OpenLineageSparkListener is null");
+        }
     }
 
-    return null;
-  }
+    private static final Class<?> adaptiveExecutionUpdateClass;
+    private static final MethodHandle adaptiveExecutionIdMethod;
+    private static final MethodHandle adaptiveSparkPlanMethod;
 
-  @SuppressForbidden // split with one-char String use a fast-path without regex usage
-  private static String getDatabricksJobRunId(
-      Properties jobProperties, String databricksClusterName) {
-    String jobRunId = jobProperties.getProperty("spark.databricks.job.parentRunId");
-    if (jobRunId != null) {
-      return jobRunId;
+    @SuppressForbidden // Using reflection to avoid splitting the instrumentation once more
+    private static Class<?> findAdaptiveExecutionUpdateClass() throws ClassNotFoundException {
+        return Class.forName("org.apache.spark.sql.execution.ui.SparkListenerSQLAdaptiveExecutionUpdate");
     }
 
-    // Fallback, extract the jobRunId from the cluster name for job clusters having the pattern
-    // job-<job_id>-run-<job_run_id>
-    String clusterName = jobProperties.getProperty("spark.databricks.clusterUsageTags.clusterName");
+    static {
+        Class<?> executionUpdateClass = null;
+        MethodHandle executionIdMethod = null;
+        MethodHandle sparkPlanMethod = null;
 
-    // Using the databricksClusterName as fallback, if not present in jobProperties
-    clusterName = (clusterName == null) ? databricksClusterName : clusterName;
+        try {
+            MethodHandles.Lookup lookup = MethodHandles.lookup();
 
-    if (clusterName == null) {
-      return null;
-    }
+            executionUpdateClass = findAdaptiveExecutionUpdateClass();
+            executionIdMethod =
+                    lookup.findVirtual(executionUpdateClass, "executionId", MethodType.methodType(long.class));
+            sparkPlanMethod = lookup.findVirtual(
+                    executionUpdateClass, "sparkPlanInfo", MethodType.methodType(SparkPlanInfo.class));
+        } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException ignored) {
+        }
 
-    // For job cluster, the cluster name has a pattern job-<job_id>-run-<job_run_id>
-    String[] parts = clusterName.split("-");
-    if (parts.length > 3) {
-      return parts[3];
+        adaptiveExecutionUpdateClass = executionUpdateClass;
+        adaptiveExecutionIdMethod = executionIdMethod;
+        adaptiveSparkPlanMethod = sparkPlanMethod;
     }
 
-    return null;
-  }
-
-  @SuppressForbidden // split with one-char String use a fast-path without regex usage
-  private static String getDatabricksTaskRunId(Properties properties, String jobRunId) {
-    // spark.databricks.job.runId is the runId of the task, not of the Job, until Databricks 18.2
-    String taskRunId = properties.getProperty("spark.databricks.job.runId");
-    // On Databricks 18.2+, spark.databricks.job.runId now returns the job run ID
-    // There is no easy config key to extract the task run ID, so we use the fallback extraction
-    // methods
-    // Task run ID is crucial for the spans parent-child relationship inside the trace
-    if (taskRunId != null && !taskRunId.equals(jobRunId)) {
-      return taskRunId;
-    }
+    private synchronized void updateAdaptiveSQLPlan(SparkListenerEvent event) {
+        try {
+            if (adaptiveExecutionUpdateClass != null && adaptiveExecutionUpdateClass.isInstance(event)) {
+                long queryId = (long) adaptiveExecutionIdMethod.invoke(event);
+                SparkPlanInfo sparkPlanInfo = (SparkPlanInfo) adaptiveSparkPlanMethod.invoke(event);
 
-    // First fallback, use spark.jobGroup.id with the pattern
-    // <scheduler_id>_job-<job_id>-run-<task_run_id>-action-<action_id>
-    String jobGroupId = properties.getProperty("spark.jobGroup.id");
-    if (jobGroupId != null) {
-      int startIndex = jobGroupId.indexOf("run-");
-      int endIndex = jobGroupId.indexOf("-action", startIndex);
-      if (startIndex != -1 && endIndex != -1) {
-        return jobGroupId.substring(startIndex + 4, endIndex);
-      }
+                sqlPlans.put(queryId, sparkPlanInfo);
+            }
+        } catch (Throwable ignored) {
+        }
     }
 
-    // Second fallback, use spark.databricks.workload.id with pattern
-    // <org_id>-<job_id>-<task_run_id>
-    String workloadId = properties.getProperty("spark.databricks.workload.id");
-    if (workloadId != null) {
-      String[] parts = workloadId.split("-");
-      if (parts.length > 2) {
-        return parts[2];
-      }
+    private synchronized void onSQLExecutionStart(SparkListenerSQLExecutionStart sqlStart) {
+        sqlPlans.put(sqlStart.executionId(), sqlStart.sparkPlanInfo());
+        sqlQueries.put(sqlStart.executionId(), sqlStart);
+        notifyOl(x -> openLineageSparkListener.onOtherEvent(x), sqlStart);
     }
 
-    return null;
-  }
-
-  private static final byte[] JOB_RUN_ATTEMPT_NUM_KEY =
-      "jobRunAttemptNum".getBytes(StandardCharsets.UTF_8);
-
-  /**
-   * Returns the Databricks repair attempt index (0 for the original run, 1+ for each repair). It is
-   * not exposed as a first-class Spark property: the only source is the base64 + java-serialized
-   * "unity.scope.data" local property, under the key "jobRunAttemptNum". We extract it best-effort
-   * by looking at the raw serialized bytes right after that key, without a full deserialization of
-   * the stream (e.g. we don't resolve TC_REFERENCE backreferences); on any failure or unexpected
-   * shape we return 0, which reproduces the original (non-repair-aware) trace id so correlation is
-   * never worse than before.
-   */
-  // Package-private for testing.
-  static int getDatabricksJobRunAttempt(Properties properties) {
-    String scopeData = properties.getProperty("unity.scope.data");
-    if (scopeData == null) {
-      return 0;
+    private synchronized void onSQLExecutionEnd(SparkListenerSQLExecutionEnd sqlEnd) {
+        AgentSpan span = sqlSpans.remove(sqlEnd.executionId());
+        SparkAggregatedTaskMetrics metrics = sqlMetrics.remove(sqlEnd.executionId());
+        SparkListenerSQLExecutionStart queryStart = sqlQueries.remove(sqlEnd.executionId());
+        sqlPlans.remove(sqlEnd.executionId());
+
+        if (span != null) {
+            if (metrics != null) {
+                metrics.setSpanMetrics(span);
+            }
+            notifyOl(x -> openLineageSparkListener.onOtherEvent(x), sqlEnd);
+
+            // Set right before finish so long-running heartbeats of the running span don't carry the
+            // plan
+            span.setTag("_dd.spark.physical_plan", queryStart.physicalPlanDescription());
+            span.finish(sqlEnd.time() * 1000);
+        }
     }
-    try {
-      byte[] decoded = Base64.getDecoder().decode(scopeData);
-      int keyIdx = indexOfDatabricksAttemptKey(decoded, JOB_RUN_ATTEMPT_NUM_KEY);
-      if (keyIdx < 0) {
-        return 0;
-      }
-      // The (key, value) tuple is serialized back-to-back with no gap, so the value's type tag sits
-      // immediately after the key's bytes. It's normally TC_STRING (0x74) with a 2-byte big-endian
-      // length prefix, but if this exact attempt string already appeared earlier in the stream
-      // (e.g.
-      // another Databricks tag also has value "1"), Java's serialization writes a TC_REFERENCE
-      // (0x71)
-      // back-pointer instead of repeating the string. We don't resolve backreferences -- rather
-      // than
-      // risk scanning forward and matching an unrelated byte, treat anything other than an
-      // immediate
-      // TC_STRING as unparseable and fall back to attempt 0.
-      int valueStart = keyIdx + JOB_RUN_ATTEMPT_NUM_KEY.length;
-      if (valueStart + 3 > decoded.length || decoded[valueStart] != 0x74) {
-        return 0;
-      }
-      int len = ((decoded[valueStart + 1] & 0xff) << 8) | (decoded[valueStart + 2] & 0xff);
-      if (len > 0 && len <= 9 && valueStart + 3 + len <= decoded.length) {
-        return Integer.parseInt(new String(decoded, valueStart + 3, len, StandardCharsets.UTF_8));
-      }
-    } catch (Exception e) {
-      log.debug("Unable to extract databricks job run attempt from unity.scope.data", e);
+
+    private synchronized void onStreamingQueryStartedEvent(StreamingQueryListener.QueryStartedEvent event) {
+        if (streamingQueries.size() > MAX_COLLECTION_SIZE) {
+            return;
+        }
+
+        streamingQueries.put(event.id(), event);
     }
-    return 0;
-  }
-
-  private static int indexOfDatabricksAttemptKey(byte[] haystack, byte[] needle) {
-    outer:
-    for (int i = 0; i <= haystack.length - needle.length; i++) {
-      for (int j = 0; j < needle.length; j++) {
-        if (haystack[i + j] != needle[j]) {
-          continue outer;
-        }
-      }
-      return i;
+
+    private synchronized void onStreamingQueryTerminatedEvent(StreamingQueryListener.QueryTerminatedEvent event) {
+        StreamingQueryListener.QueryStartedEvent startedEvent = streamingQueries.remove(event.id());
+
+        ArrayList<String> batchesToFinish = new ArrayList<>();
+
+        for (String batchKey : streamingBatchSpans.keySet()) {
+            if (batchKey.startsWith(event.id().toString())) {
+                batchesToFinish.add(batchKey);
+            }
+        }
+
+        for (String batchKey : batchesToFinish) {
+            AgentSpan batchSpan = streamingBatchSpans.remove(batchKey);
+            SparkAggregatedTaskMetrics metrics = streamingBatchMetrics.remove(batchKey);
+
+            if (batchSpan != null) {
+                if (metrics != null) {
+                    metrics.setSpanMetrics(batchSpan);
+                }
+
+                batchSpan.setTag("streaming_query.id", event.id());
+                batchSpan.setTag("streaming_query.run_id", event.runId());
+                batchSpan.setTag("streaming_query.batch_id", getBatchIdFromBatchKey(batchKey));
+                if (startedEvent != null) {
+                    batchSpan.setTag("streaming_query.name", startedEvent.name());
+                    batchSpan.setTag(DDTags.RESOURCE_NAME, startedEvent.name());
+                }
+
+                if (event.exception().isDefined()) {
+                    String exceptionString = event.exception().get();
+
+                    batchSpan.setError(true);
+                    batchSpan.setErrorMessage(getErrorMessageWithoutStackTrace(exceptionString));
+                    batchSpan.setTag(DDTags.ERROR_STACK, exceptionString);
+                }
+
+                batchSpan.finish();
+            }
+        }
     }
-    return -1;
-  }
-
-  private String stackTraceToString(Throwable e) {
-    StringWriter stringWriter = new StringWriter();
-    e.printStackTrace(new PrintWriter(stringWriter));
-    return stringWriter.toString();
-  }
-
-  private String getErrorMessageWithoutStackTrace(String errorMessage) {
-    if (errorMessage == null) {
-      return null;
+
+    private synchronized void onStreamingQueryProgressEvent(StreamingQueryListener.QueryProgressEvent event) {
+        StreamingQueryProgress progress = event.progress();
+
+        String batchKey = getStreamingBatchKey(progress.id().toString(), String.valueOf(progress.batchId()));
+
+        AgentSpan batchSpan = streamingBatchSpans.remove(batchKey);
+        SparkAggregatedTaskMetrics metrics = streamingBatchMetrics.remove(batchKey);
+        if (batchSpan != null) {
+            if (metrics != null) {
+                metrics.setSpanMetrics(batchSpan);
+            }
+
+            batchSpan.setTag("streaming_query.id", progress.id());
+            batchSpan.setTag("streaming_query.run_id", progress.runId());
+            batchSpan.setTag("streaming_query.batch_id", progress.batchId());
+            batchSpan.setTag("streaming_query.name", progress.name());
+            batchSpan.setTag(DDTags.RESOURCE_NAME, progress.name());
+
+            batchSpan.setMetric("spark.num_input_rows", progress.numInputRows());
+            batchSpan.setMetric("spark.input_rows_per_second", progress.inputRowsPerSecond());
+            batchSpan.setMetric("spark.processed_rows_per_second", progress.processedRowsPerSecond());
+
+            Long watermark = convertStringDateToMillis(progress.eventTime().get("watermark"));
+            if (watermark != null) {
+                batchSpan.setMetric("spark.event_time.watermark", watermark);
+
+                Long progressTimestamp = convertStringDateToMillis(progress.timestamp());
+                if (watermark > 0 && progressTimestamp != null) {
+                    batchSpan.setMetric("spark.event_time.watermark_gap", progressTimestamp - watermark);
+                }
+            }
+            Long maxEventTime = convertStringDateToMillis(progress.eventTime().get("max"));
+            if (maxEventTime != null) {
+                batchSpan.setMetric("spark.event_time.max", maxEventTime);
+            }
+            Long minEventTime = convertStringDateToMillis(progress.eventTime().get("min"));
+            if (minEventTime != null) {
+                batchSpan.setMetric("spark.event_time.min", minEventTime);
+            }
+
+            Long addBatch = progress.durationMs().get("addBatch");
+            if (addBatch != null) {
+                batchSpan.setMetric("spark.add_batch_duration", addBatch);
+            }
+            Long getBatch = progress.durationMs().get("getBatch");
+            if (getBatch != null) {
+                batchSpan.setMetric("spark.get_batch_duration", getBatch);
+            }
+            Long latestOffset = progress.durationMs().get("latestOffset");
+            if (latestOffset != null) {
+                batchSpan.setMetric("spark.latest_offset_duration", latestOffset);
+            }
+            Long queryPlanning = progress.durationMs().get("queryPlanning");
+            if (queryPlanning != null) {
+                batchSpan.setMetric("spark.query_planing_duration", queryPlanning);
+            }
+            Long triggerExecution = progress.durationMs().get("triggerExecution");
+            if (triggerExecution != null) {
+                batchSpan.setMetric("spark.trigger_execution_duration", triggerExecution);
+            }
+            Long walCommit = progress.durationMs().get("walCommit");
+            if (walCommit != null) {
+                batchSpan.setMetric("spark.wal_commit_duration", walCommit);
+            }
+
+            for (int i = 0; i < progress.sources().length; i++) {
+                SourceProgress source = progress.sources()[i];
+                String prefix = "spark.source." + i + ".";
+
+                batchSpan.setTag(prefix + "description", source.description());
+                batchSpan.setTag(prefix + "start_offset", source.startOffset());
+                batchSpan.setTag(prefix + "end_offset", source.endOffset());
+                batchSpan.setTag(prefix + "num_input_rows", source.numInputRows());
+                batchSpan.setTag(prefix + "input_rows_per_second", source.inputRowsPerSecond());
+                batchSpan.setTag(prefix + "processed_rows_per_second", source.processedRowsPerSecond());
+
+                reportKafkaOffsets(batchSpan.getServiceName(), batchSpan, source);
+            }
+
+            for (int i = 0; i < progress.stateOperators().length; i++) {
+                StateOperatorProgress state = progress.stateOperators()[i];
+                String prefix = "spark.state." + i + ".";
+
+                batchSpan.setTag(prefix + "num_rows_total", state.numRowsTotal());
+                batchSpan.setTag(prefix + "num_rows_updated", state.numRowsUpdated());
+                batchSpan.setTag(prefix + "memory_used_bytes", state.memoryUsedBytes());
+            }
+
+            batchSpan.setTag("spark.sink.description", progress.sink().description());
+
+            batchSpan.finish();
+        }
     }
 
-    int stackTraceIndex = errorMessage.indexOf("\tat ");
-    if (stackTraceIndex != -1) {
-      return errorMessage.substring(0, stackTraceIndex);
+    private void setDataJobsSamplingPriority(AgentSpan span) {
+        span.setSamplingPriority(PrioritySampling.USER_KEEP, SamplingMechanism.DATA_JOBS);
     }
 
-    return errorMessage;
-  }
+    private AgentTracer.SpanBuilder buildSparkSpan(String spanName, Properties properties) {
+        AgentTracer.SpanBuilder builder =
+                tracer.buildSpan("spark", spanName).withSpanType("spark").withTag("app_id", appId);
+
+        if (databricksServiceName != null) {
+            builder.withServiceName(databricksServiceName);
+        } else if (sparkServiceName != null) {
+            builder.withServiceName(sparkServiceName);
+            builder.withTag("service_name", sparkServiceName);
+        }
 
-  private long computeCurrentAvailableExecutorTime(long time) {
-    long currentAvailableExecutorTime = availableExecutorTime;
+        addPropertiesTags(builder, properties);
 
-    for (SparkListenerExecutorAdded executor : liveExecutors.values()) {
-      currentAvailableExecutorTime +=
-          (time - executor.time()) * executor.executorInfo().totalCores();
+        return builder;
     }
 
-    return currentAvailableExecutorTime;
-  }
+    private void addPropertiesTags(AgentTracer.SpanBuilder builder, Properties properties) {
+        if (properties == null) {
+            return;
+        }
 
-  private void captureApplicationParameters(AgentTracer.SpanBuilder builder) {
-    for (Map.Entry<String, String> entry : SparkConfAllowList.getRedactedSparkConf(sparkConf)) {
-      builder.withTag("config." + entry.getKey().replace(".", "_"), entry.getValue());
-    }
-    builder.withTag("config.spark_version", sparkVersion);
-  }
+        for (String propertyName : properties.stringPropertyNames()) {
+            if (propertyName.startsWith(RUNTIME_TAGS_PREFIX)) {
+                String value = properties.getProperty(propertyName);
+                String key = propertyName.substring(RUNTIME_TAGS_PREFIX.length());
 
-  private static void captureEmrStepId(AgentTracer.SpanBuilder builder) {
-    String stepId = EmrUtils.getEmrStepId();
-    if (stepId != null) {
-      builder.withTag("emr_step_id", stepId);
+                builder.withTag(key, value);
+            }
+        }
     }
-  }
 
-  private void captureJobParameters(AgentTracer.SpanBuilder builder, Properties properties) {
-    for (Tuple2<String, String> conf : sparkConf.getAll()) {
-      if (SparkConfAllowList.canCaptureJobParameter(conf._1)) {
-        builder.withTag("config." + conf._1.replace(".", "_"), conf._2);
-      }
+    private long stageSpanKey(int stageId, int attemptId) {
+        return ((long) stageId << 32) + attemptId;
     }
 
-    // Parameters from properties overwrite values from the spark conf
-    if (properties != null) {
-      for (final Map.Entry<Object, Object> entry : properties.entrySet()) {
-        if (SparkConfAllowList.canCaptureJobParameter(entry.getKey().toString())) {
-          builder.withTag(
-              "config." + entry.getKey().toString().replace('.', '_'), entry.getValue());
+    @SuppressForbidden // split with one-char String use a fast-path without regex usage
+    private static String getDatabricksJobId(Properties properties) {
+        String jobId = properties.getProperty("spark.databricks.job.id");
+        if (jobId != null) {
+            return jobId;
         }
-      }
-    }
-    builder.withTag("config.spark_version", sparkVersion);
-  }
 
-  private static Long getSqlExecutionId(Properties properties) {
-    if (properties == null) {
-      return null;
+        // First fallback, use spark.jobGroup.id with the pattern
+        // <scheduler_id>_job-<job_id>-run-<task_run_id>-action-<action_id>
+        String jobGroupId = properties.getProperty("spark.jobGroup.id");
+        if (jobGroupId != null) {
+            int startIndex = jobGroupId.indexOf("job-");
+            int endIndex = jobGroupId.indexOf("-run", startIndex);
+            if (startIndex != -1 && endIndex != -1) {
+                return jobGroupId.substring(startIndex + 4, endIndex);
+            }
+        }
+
+        // Second fallback, use spark.databricks.workload.id with pattern
+        // <org_id>-<job_id>-<task_run_id>
+        String workloadId = properties.getProperty("spark.databricks.workload.id");
+        if (workloadId != null) {
+            String[] parts = workloadId.split("-");
+            if (parts.length > 1) {
+                return parts[1];
+            }
+        }
+
+        return null;
     }
 
-    String sqlExecutionId = properties.getProperty(SQLExecution.EXECUTION_ID_KEY());
-    if (sqlExecutionId == null) {
-      return null;
+    @SuppressForbidden // split with one-char String use a fast-path without regex usage
+    private static String getDatabricksJobRunId(Properties jobProperties, String databricksClusterName) {
+        String jobRunId = jobProperties.getProperty("spark.databricks.job.parentRunId");
+        if (jobRunId != null) {
+            return jobRunId;
+        }
+
+        // Fallback, extract the jobRunId from the cluster name for job clusters having the pattern
+        // job-<job_id>-run-<job_run_id>
+        String clusterName = jobProperties.getProperty("spark.databricks.clusterUsageTags.clusterName");
+
+        // Using the databricksClusterName as fallback, if not present in jobProperties
+        clusterName = (clusterName == null) ? databricksClusterName : clusterName;
+
+        if (clusterName == null) {
+            return null;
+        }
+
+        // For job cluster, the cluster name has a pattern job-<job_id>-run-<job_run_id>
+        String[] parts = clusterName.split("-");
+        if (parts.length > 3) {
+            return parts[3];
+        }
+
+        return null;
     }
 
-    try {
-      return Long.parseLong(sqlExecutionId);
-    } catch (NumberFormatException e) {
-      return null;
+    @SuppressForbidden // split with one-char String use a fast-path without regex usage
+    private static String getDatabricksTaskRunId(Properties properties, String jobRunId) {
+        // spark.databricks.job.runId is the runId of the task, not of the Job, until Databricks 18.2
+        String taskRunId = properties.getProperty("spark.databricks.job.runId");
+        // On Databricks 18.2+, spark.databricks.job.runId now returns the job run ID
+        // There is no easy config key to extract the task run ID, so we use the fallback extraction
+        // methods
+        // Task run ID is crucial for the spans parent-child relationship inside the trace
+        if (taskRunId != null && !taskRunId.equals(jobRunId)) {
+            return taskRunId;
+        }
+
+        // First fallback, use spark.jobGroup.id with the pattern
+        // <scheduler_id>_job-<job_id>-run-<task_run_id>-action-<action_id>
+        String jobGroupId = properties.getProperty("spark.jobGroup.id");
+        if (jobGroupId != null) {
+            int startIndex = jobGroupId.indexOf("run-");
+            int endIndex = jobGroupId.indexOf("-action", startIndex);
+            if (startIndex != -1 && endIndex != -1) {
+                return jobGroupId.substring(startIndex + 4, endIndex);
+            }
+        }
+
+        // Second fallback, use spark.databricks.workload.id with pattern
+        // <org_id>-<job_id>-<task_run_id>
+        String workloadId = properties.getProperty("spark.databricks.workload.id");
+        if (workloadId != null) {
+            String[] parts = workloadId.split("-");
+            if (parts.length > 2) {
+                return parts[2];
+            }
+        }
+
+        return null;
     }
-  }
 
-  private static Long convertStringDateToMillis(String isoUtcDateStr) {
-    if (isoUtcDateStr == null) {
-      return null;
+    private static final byte[] JOB_RUN_ATTEMPT_NUM_KEY = "jobRunAttemptNum".getBytes(StandardCharsets.UTF_8);
+
+    /**
+     * Returns the Databricks repair attempt index (0 for the original run, 1+ for each repair). It is
+     * not exposed as a first-class Spark property: the only source is the base64 + java-serialized
+     * "unity.scope.data" local property, under the key "jobRunAttemptNum". We extract it best-effort
+     * by looking at the raw serialized bytes right after that key, without a full deserialization of
+     * the stream (e.g. we don't resolve TC_REFERENCE backreferences); on any failure or unexpected
+     * shape we return 0, which reproduces the original (non-repair-aware) trace id so correlation is
+     * never worse than before.
+     */
+    // Package-private for testing.
+    static int getDatabricksJobRunAttempt(Properties properties) {
+        String scopeData = properties.getProperty("unity.scope.data");
+        if (scopeData == null) {
+            return 0;
+        }
+        try {
+            byte[] decoded = Base64.getDecoder().decode(scopeData);
+            int keyIdx = indexOfDatabricksAttemptKey(decoded, JOB_RUN_ATTEMPT_NUM_KEY);
+            if (keyIdx < 0) {
+                return 0;
+            }
+            // The (key, value) tuple is serialized back-to-back with no gap, so the value's type tag sits
+            // immediately after the key's bytes. It's normally TC_STRING (0x74) with a 2-byte big-endian
+            // length prefix, but if this exact attempt string already appeared earlier in the stream
+            // (e.g.
+            // another Databricks tag also has value "1"), Java's serialization writes a TC_REFERENCE
+            // (0x71)
+            // back-pointer instead of repeating the string. We don't resolve backreferences -- rather
+            // than
+            // risk scanning forward and matching an unrelated byte, treat anything other than an
+            // immediate
+            // TC_STRING as unparseable and fall back to attempt 0.
+            int valueStart = keyIdx + JOB_RUN_ATTEMPT_NUM_KEY.length;
+            if (valueStart + 3 > decoded.length || decoded[valueStart] != 0x74) {
+                return 0;
+            }
+            int len = ((decoded[valueStart + 1] & 0xff) << 8) | (decoded[valueStart + 2] & 0xff);
+            if (len > 0 && len <= 9 && valueStart + 3 + len <= decoded.length) {
+                return Integer.parseInt(new String(decoded, valueStart + 3, len, StandardCharsets.UTF_8));
+            }
+        } catch (Exception e) {
+            log.debug("Unable to extract databricks job run attempt from unity.scope.data", e);
+        }
+        return 0;
     }
 
-    try {
-      return OffsetDateTime.parse(isoUtcDateStr).toInstant().toEpochMilli();
-    } catch (DateTimeParseException e) {
-      return null;
+    private static int indexOfDatabricksAttemptKey(byte[] haystack, byte[] needle) {
+        outer:
+        for (int i = 0; i <= haystack.length - needle.length; i++) {
+            for (int j = 0; j < needle.length; j++) {
+                if (haystack[i + j] != needle[j]) {
+                    continue outer;
+                }
+            }
+            return i;
+        }
+        return -1;
     }
-  }
 
-  private static String getStreamingBatchKey(Properties properties) {
-    if (properties == null) {
-      return null;
+    private String stackTraceToString(Throwable e) {
+        StringWriter stringWriter = new StringWriter();
+        e.printStackTrace(new PrintWriter(stringWriter));
+        return stringWriter.toString();
     }
 
-    Object queryId = properties.get("sql.streaming.queryId");
-    Object batchId = properties.get("streaming.sql.batchId");
+    private String getErrorMessageWithoutStackTrace(String errorMessage) {
+        if (errorMessage == null) {
+            return null;
+        }
 
-    if (queryId == null || batchId == null) {
-      return null;
+        int stackTraceIndex = errorMessage.indexOf("\tat ");
+        if (stackTraceIndex != -1) {
+            return errorMessage.substring(0, stackTraceIndex);
+        }
+
+        return errorMessage;
     }
 
-    return getStreamingBatchKey(queryId.toString(), batchId.toString());
-  }
+    private long computeCurrentAvailableExecutorTime(long time) {
+        long currentAvailableExecutorTime = availableExecutorTime;
 
-  private static String getStreamingBatchKey(String queryId, String batchId) {
-    return queryId + "." + batchId;
-  }
+        for (SparkListenerExecutorAdded executor : liveExecutors.values()) {
+            currentAvailableExecutorTime +=
+                    (time - executor.time()) * executor.executorInfo().totalCores();
+        }
 
-  private static String getBatchIdFromBatchKey(String batchKey) {
-    return batchKey.substring(batchKey.lastIndexOf(".") + 1);
-  }
+        return currentAvailableExecutorTime;
+    }
 
-  private static String getDatabricksServiceName(SparkConf conf, String databricksClusterName) {
-    if (Config.get().isServiceNameSetByUser()) {
-      return null;
+    private void captureApplicationParameters(AgentTracer.SpanBuilder builder) {
+        for (Map.Entry<String, String> entry : SparkConfAllowList.getRedactedSparkConf(sparkConf)) {
+            builder.withTag("config." + entry.getKey().replace(".", "_"), entry.getValue());
+        }
+        builder.withTag("config.spark_version", sparkVersion);
     }
 
-    String serviceName = null;
-    String runName = getDatabricksRunName(conf);
-    if (runName != null) {
-      serviceName = "databricks.job-cluster." + runName;
-    } else if (databricksClusterName != null) {
-      serviceName = "databricks.all-purpose-cluster." + databricksClusterName;
+    private static void captureEmrStepId(AgentTracer.SpanBuilder builder) {
+        String stepId = EmrUtils.getEmrStepId();
+        if (stepId != null) {
+            builder.withTag("emr_step_id", stepId);
+        }
     }
 
-    return serviceName;
-  }
+    private void captureJobParameters(AgentTracer.SpanBuilder builder, Properties properties) {
+        for (Tuple2<String, String> conf : sparkConf.getAll()) {
+            if (SparkConfAllowList.canCaptureJobParameter(conf._1)) {
+                builder.withTag("config." + conf._1.replace(".", "_"), conf._2);
+            }
+        }
 
-  private static String getSparkServiceName(SparkConf conf, boolean isRunningOnDatabricks) {
-    // If config is not set or running on databricks, not changing the service name
-    if (!Config.get().useSparkAppNameAsService() || isRunningOnDatabricks) {
-      return null;
+        // Parameters from properties overwrite values from the spark conf
+        if (properties != null) {
+            for (final Map.Entry<Object, Object> entry : properties.entrySet()) {
+                if (SparkConfAllowList.canCaptureJobParameter(entry.getKey().toString())) {
+                    builder.withTag("config." + entry.getKey().toString().replace('.', '_'), entry.getValue());
+                }
+            }
+        }
+        builder.withTag("config.spark_version", sparkVersion);
     }
 
-    // Keep service set by user, except if it is only "spark" or "hadoop" that can be set by USM
-    String serviceName = Config.get().getServiceName();
-    if (Config.get().isServiceNameSetByUser()
-        && !"spark".equals(serviceName)
-        && !"hadoop".equals(serviceName)) {
-      log.debug("Service '{}' explicitly set by user, not using the application name", serviceName);
-      return null;
+    private static Long getSqlExecutionId(Properties properties) {
+        if (properties == null) {
+            return null;
+        }
+
+        String sqlExecutionId = properties.getProperty(SQLExecution.EXECUTION_ID_KEY());
+        if (sqlExecutionId == null) {
+            return null;
+        }
+
+        try {
+            return Long.parseLong(sqlExecutionId);
+        } catch (NumberFormatException e) {
+            return null;
+        }
     }
 
-    String sparkAppName = conf.get("spark.app.name", null);
-    if (sparkAppName != null) {
-      log.info("Using Spark application name '{}' as the Datadog service name", sparkAppName);
+    private static Long convertStringDateToMillis(String isoUtcDateStr) {
+        if (isoUtcDateStr == null) {
+            return null;
+        }
+
+        try {
+            return OffsetDateTime.parse(isoUtcDateStr).toInstant().toEpochMilli();
+        } catch (DateTimeParseException e) {
+            return null;
+        }
     }
 
-    return sparkAppName;
-  }
+    private static String getStreamingBatchKey(Properties properties) {
+        if (properties == null) {
+            return null;
+        }
 
-  private String getServiceForOpenLineage(SparkConf conf, boolean isRunningOnDatabricks) {
-    if (isRunningOnDatabricks) {
-      return databricksServiceName;
+        Object queryId = properties.get("sql.streaming.queryId");
+        Object batchId = properties.get("streaming.sql.batchId");
+
+        if (queryId == null || batchId == null) {
+            return null;
+        }
+
+        return getStreamingBatchKey(queryId.toString(), batchId.toString());
     }
-    // Keep service set by user, except if it is only "spark" or "hadoop" that can be set by USM
-    String serviceName = Config.get().getServiceName();
-    if (Config.get().isServiceNameSetByUser()
-        && !"spark".equals(serviceName)
-        && !"hadoop".equals(serviceName)) {
-      log.debug(
-          "Service explicitly set by user, not using the application name. Service name: {}",
-          serviceName);
-      return serviceName;
+
+    private static String getStreamingBatchKey(String queryId, String batchId) {
+        return queryId + "." + batchId;
     }
 
-    String sparkAppName = conf.get("spark.app.name", null);
-    if (sparkAppName != null) {
-      log.debug(
-          "Using Spark application name as the Datadog service for OpenLineage. Spark application name: {}",
-          sparkAppName);
+    private static String getBatchIdFromBatchKey(String batchKey) {
+        return batchKey.substring(batchKey.lastIndexOf(".") + 1);
     }
 
-    return sparkAppName;
-  }
+    private static String getDatabricksServiceName(SparkConf conf, String databricksClusterName) {
+        if (Config.get().isServiceNameSetByUser()) {
+            return null;
+        }
 
-  private void setupOpenLineageCircuitBreaker() {
-    if (!Config.get().isDataJobsOpenLineageTimeoutEnabled()) {
-      log.debug("Data Jobs OpenLineage timeout is not enabled");
-      return;
-    }
-    if (!classIsLoadable("io.openlineage.client.circuitBreaker.TimeoutCircuitBreaker")) {
-      log.debug(
-          "OpenLineage version without timeout circuit breaker. Probably OL version < 1.35.0");
-      return;
+        String serviceName = null;
+        String runName = getDatabricksRunName(conf);
+        if (runName != null) {
+            serviceName = "databricks.job-cluster." + runName;
+        } else if (databricksClusterName != null) {
+            serviceName = "databricks.all-purpose-cluster." + databricksClusterName;
+        }
+
+        return serviceName;
     }
-    if (openLineageSparkConf.contains("spark.openlineage.circuitBreaker.type")) {
-      log.debug(
-          "Other OpenLineage circuit breaker already configured: {}",
-          openLineageSparkConf.get("spark.openlineage.circuitBreaker.type"));
-      return;
+
+    private static String getSparkServiceName(SparkConf conf, boolean isRunningOnDatabricks) {
+        // If config is not set or running on databricks, not changing the service name
+        if (!Config.get().useSparkAppNameAsService() || isRunningOnDatabricks) {
+            return null;
+        }
+
+        // Keep service set by user, except if it is only "spark" or "hadoop" that can be set by USM
+        String serviceName = Config.get().getServiceName();
+        if (Config.get().isServiceNameSetByUser() && !"spark".equals(serviceName) && !"hadoop".equals(serviceName)) {
+            log.debug("Service '{}' explicitly set by user, not using the application name", serviceName);
+            return null;
+        }
+
+        String sparkAppName = conf.get("spark.app.name", null);
+        if (sparkAppName != null) {
+            log.info("Using Spark application name '{}' as the Datadog service name", sparkAppName);
+        }
+
+        return sparkAppName;
     }
 
-    openLineageSparkConf.set("spark.openlineage.circuitBreaker.type", "timeout");
-    openLineageSparkConf.setIfMissing(
-        "spark.openlineage.circuitBreaker.timeoutInSeconds",
-        String.valueOf(OL_CIRCUIT_BREAKER_TIMEOUT_IN_SECONDS));
-    log.debug(
-        "Setting OpenLineage circuit breaker with timeout {} seconds",
-        openLineageSparkConf.get("spark.openlineage.circuitBreaker.timeoutInSeconds"));
-  }
-
-  private static void reportKafkaOffsets(
-      final String appName, final AgentSpan span, final SourceProgress progress) {
-    if (!traceConfig().isDataStreamsEnabled()
-        || progress == null
-        || progress.description() == null) {
-      return;
+    private String getServiceForOpenLineage(SparkConf conf, boolean isRunningOnDatabricks) {
+        if (isRunningOnDatabricks) {
+            return databricksServiceName;
+        }
+        // Keep service set by user, except if it is only "spark" or "hadoop" that can be set by USM
+        String serviceName = Config.get().getServiceName();
+        if (Config.get().isServiceNameSetByUser() && !"spark".equals(serviceName) && !"hadoop".equals(serviceName)) {
+            log.debug("Service explicitly set by user, not using the application name. Service name: {}", serviceName);
+            return serviceName;
+        }
+
+        String sparkAppName = conf.get("spark.app.name", null);
+        if (sparkAppName != null) {
+            log.debug(
+                    "Using Spark application name as the Datadog service for OpenLineage. Spark application name: {}",
+                    sparkAppName);
+        }
+
+        return sparkAppName;
     }
 
-    // check if this is a kafka source
-    if (progress.description().toLowerCase().startsWith("kafka")) {
-      try {
-        // parse offsets from endOffsets json, reported in a format:
-        // "topic" -> ["partition":value]
-        JsonNode jsonNode = objectMapper.readTree(progress.endOffset());
-        Iterator<String> topics = jsonNode.fieldNames();
-        // report offsets for all topics / partitions
-        while (topics.hasNext()) {
-          String topic = topics.next();
-          JsonNode topicNode = jsonNode.get(topic);
-          // iterate thought reported partitions
-          Iterator<String> allPartitions = topicNode.fieldNames();
-          while (allPartitions.hasNext()) {
-            String partition = allPartitions.next();
-            DataStreamsTags tags =
-                DataStreamsTags.createWithPartition(
-                    "kafka_commit", topic, partition, null, appName);
-            AgentTracer.get()
-                .getDataStreamsMonitoring()
-                .trackBacklog(tags, topicNode.get(partition).asLong());
-          }
-        }
-      } catch (Throwable e) {
-        log.debug("Failed to parse kafka offsets", e);
-      }
+    private void setupOpenLineageCircuitBreaker() {
+        if (!Config.get().isDataJobsOpenLineageTimeoutEnabled()) {
+            log.debug("Data Jobs OpenLineage timeout is not enabled");
+            return;
+        }
+        if (!classIsLoadable("io.openlineage.client.circuitBreaker.TimeoutCircuitBreaker")) {
+            log.debug("OpenLineage version without timeout circuit breaker. Probably OL version < 1.35.0");
+            return;
+        }
+        if (openLineageSparkConf.contains("spark.openlineage.circuitBreaker.type")) {
+            log.debug(
+                    "Other OpenLineage circuit breaker already configured: {}",
+                    openLineageSparkConf.get("spark.openlineage.circuitBreaker.type"));
+            return;
+        }
+
+        openLineageSparkConf.set("spark.openlineage.circuitBreaker.type", "timeout");
+        openLineageSparkConf.setIfMissing(
+                "spark.openlineage.circuitBreaker.timeoutInSeconds",
+                String.valueOf(OL_CIRCUIT_BREAKER_TIMEOUT_IN_SECONDS));
+        log.debug(
+                "Setting OpenLineage circuit breaker with timeout {} seconds",
+                openLineageSparkConf.get("spark.openlineage.circuitBreaker.timeoutInSeconds"));
     }
-  }
 
-  private static String getDatabricksRunName(SparkConf conf) {
-    String allTags = conf.get("spark.databricks.clusterUsageTags.clusterAllTags", null);
-    if (allTags == null) {
-      return null;
+    private static void reportKafkaOffsets(final String appName, final AgentSpan span, final SourceProgress progress) {
+        if (!traceConfig().isDataStreamsEnabled() || progress == null || progress.description() == null) {
+            return;
+        }
+
+        // check if this is a kafka source
+        if (progress.description().toLowerCase().startsWith("kafka")) {
+            try {
+                // parse offsets from endOffsets json, reported in a format:
+                // "topic" -> ["partition":value]
+                JsonNode jsonNode = objectMapper.readTree(progress.endOffset());
+                Iterator<String> topics = jsonNode.fieldNames();
+                // report offsets for all topics / partitions
+                while (topics.hasNext()) {
+                    String topic = topics.next();
+                    JsonNode topicNode = jsonNode.get(topic);
+                    // iterate thought reported partitions
+                    Iterator<String> allPartitions = topicNode.fieldNames();
+                    while (allPartitions.hasNext()) {
+                        String partition = allPartitions.next();
+                        DataStreamsTags tags =
+                                DataStreamsTags.createWithPartition("kafka_commit", topic, partition, null, appName);
+                        AgentTracer.get()
+                                .getDataStreamsMonitoring()
+                                .trackBacklog(tags, topicNode.get(partition).asLong());
+                    }
+                }
+            } catch (Throwable e) {
+                log.debug("Failed to parse kafka offsets", e);
+            }
+        }
     }
 
-    try {
-      // Using the jackson JSON lib used by spark
-      // https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.12/3.5.0
-      JsonNode jsonNode = objectMapper.readTree(allTags);
+    private static String getDatabricksRunName(SparkConf conf) {
+        String allTags = conf.get("spark.databricks.clusterUsageTags.clusterAllTags", null);
+        if (allTags == null) {
+            return null;
+        }
 
-      for (JsonNode node : jsonNode) {
-        String key = node.get("key").asText();
-        if ("RunName".equals(key)) {
-          // Databricks jobs launched by Azure Data Factory have an uuid at the end of the name
-          return removeUuidFromEndOfString(node.get("value").asText());
+        try {
+            // Using the jackson JSON lib used by spark
+            // https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.12/3.5.0
+            JsonNode jsonNode = objectMapper.readTree(allTags);
+
+            for (JsonNode node : jsonNode) {
+                String key = node.get("key").asText();
+                if ("RunName".equals(key)) {
+                    // Databricks jobs launched by Azure Data Factory have an uuid at the end of the name
+                    return removeUuidFromEndOfString(node.get("value").asText());
+                }
+            }
+        } catch (Exception ignored) {
         }
-      }
-    } catch (Exception ignored) {
+
+        return null;
     }
 
-    return null;
-  }
-
-  private static String getAgentHttpUrl() {
-    // When the Agent is reachable over a Unix Domain Socket, its URL uses the unix:// scheme.
-    // Pass it through so the OpenLineage HTTP transport sends lineage over the socket (requires
-    // OpenLineage 1.54+). Any other configuration keeps the original http://host:port behavior,
-    // so existing http(s) setups are unaffected.
-    String agentUrl = Config.get().getAgentUrl();
-    if (agentUrl != null && agentUrl.startsWith("unix:")) {
-      return agentUrl;
+    private static String getAgentHttpUrl() {
+        // When the Agent is reachable over a Unix Domain Socket, its URL uses the unix:// scheme.
+        // Pass it through so the OpenLineage HTTP transport sends lineage over the socket (requires
+        // OpenLineage 1.54+). Any other configuration keeps the original http://host:port behavior,
+        // so existing http(s) setups are unaffected.
+        String agentUrl = Config.get().getAgentUrl();
+        if (agentUrl != null && agentUrl.startsWith("unix:")) {
+            return agentUrl;
+        }
+
+        StringBuilder sb = new StringBuilder("http://")
+                .append(Config.get().getAgentHost())
+                .append(":")
+                .append(Config.get().getAgentPort());
+        return sb.toString();
     }
 
-    StringBuilder sb =
-        new StringBuilder("http://")
-            .append(Config.get().getAgentHost())
-            .append(":")
-            .append(Config.get().getAgentPort());
-    return sb.toString();
-  }
-
-  @SuppressForbidden // called at most once per spark application
-  private static String removeUuidFromEndOfString(String input) {
-    return input.replaceAll(
-        "_[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$", "");
-  }
+    @SuppressForbidden // called at most once per spark application
+    private static String removeUuidFromEndOfString(String input) {
+        return input.replaceAll("_[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$", "");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkInstrumentation.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkInstrumentation.java
index 8b5368aafd2..e0aa299845d 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkInstrumentation.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkInstrumentation.java
@@ -19,177 +19,174 @@
 import org.slf4j.LoggerFactory;
 
 public abstract class AbstractSparkInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-
-  public AbstractSparkInstrumentation() {
-    super("spark", "apache-spark");
-  }
-
-  @Override
-  public boolean defaultEnabled() {
-    return false;
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.apache.spark.SparkContext",
-      "org.apache.spark.deploy.SparkSubmit",
-      "org.apache.spark.deploy.yarn.ApplicationMaster",
-      "org.apache.spark.util.Utils",
-      "org.apache.spark.util.SparkClassUtils",
-      "org.apache.spark.scheduler.LiveListenerBus",
-      "org.apache.spark.sql.execution.SparkPlanInfo$",
-      "org.apache.spark.sql.SparkSession",
-      "org.apache.spark.sql.execution.QueryExecution"
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // Capture spark submit arguments
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("prepareSubmitEnvironment"))
-            .and(takesArgument(0, named("org.apache.spark.deploy.SparkSubmitArguments")))
-            .and(isDeclaredBy(named("org.apache.spark.deploy.SparkSubmit"))),
-        AbstractSparkInstrumentation.class.getName() + "$PrepareSubmitEnvAdvice");
-
-    // SparkSubmit class used for non YARN/Mesos environment
-    transformer.applyAdvice(
-        isMethod()
-            .and(nameEndsWith("runMain"))
-            .and(isDeclaredBy(named("org.apache.spark.deploy.SparkSubmit"))),
-        AbstractSparkInstrumentation.class.getName() + "$RunMainAdvice");
-
-    // ApplicationMaster class is used when running in a YARN cluster
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("finish"))
-            .and(isDeclaredBy(named("org.apache.spark.deploy.yarn.ApplicationMaster"))),
-        AbstractSparkInstrumentation.class.getName() + "$YarnFinishAdvice");
-
-    // SparkSession.sql(String, ...) — catch AnalysisException failures that fire during Catalyst
-    // analysis before any Spark job is submitted and are invisible to the listener bus
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("sql"))
-            .and(takesArgument(0, String.class))
-            .and(isDeclaredBy(named("org.apache.spark.sql.SparkSession"))),
-        AbstractSparkInstrumentation.class.getName() + "$SparkSqlFailureAdvice");
-
-    // QueryExecution.assertAnalyzed() — catch all Catalyst analysis failures regardless of
-    // entry point (SparkSession.sql, Dataset.select, Dataset.filter, etc.)
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("assertAnalyzed"))
-            .and(isDeclaredBy(named("org.apache.spark.sql.execution.QueryExecution"))),
-        AbstractSparkInstrumentation.class.getName() + "$QueryExecutionFailureAdvice");
-
-    // LiveListenerBus class is used to manage spark listeners
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("addToSharedQueue"))
-            .and(takesArgument(0, named("org.apache.spark.scheduler.SparkListenerInterface")))
-            .and(isDeclaredBy(named("org.apache.spark.scheduler.LiveListenerBus"))),
-        AbstractSparkInstrumentation.class.getName() + "$LiveListenerBusAdvice");
-  }
-
-  public static class PrepareSubmitEnvAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(@Advice.Argument(0) SparkSubmitArguments submitArgs) {
-
-      // Using pyspark `python script.py`, spark JVM is launched as PythonGatewayServer, which is
-      // exited using System.exit(0), leading to the exit advice not being called
-      // https://github.com/apache/spark/blob/v3.5.1/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala#L540-L542
-      // https://github.com/apache/spark/blob/v3.5.1/core/src/main/scala/org/apache/spark/api/python/PythonGatewayServer.scala#L74
-      if ("pyspark-shell".equals(submitArgs.primaryResource())) {
-        AbstractDatadogSparkListener.isPysparkShell = true;
-
-        // prepareSubmitEnvironment might be called before/after runMain depending on spark version
-        AbstractDatadogSparkListener.finishTraceOnApplicationEnd = true;
-      }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+
+    public AbstractSparkInstrumentation() {
+        super("spark", "apache-spark");
+    }
+
+    @Override
+    public boolean defaultEnabled() {
+        return false;
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.apache.spark.SparkContext",
+            "org.apache.spark.deploy.SparkSubmit",
+            "org.apache.spark.deploy.yarn.ApplicationMaster",
+            "org.apache.spark.util.Utils",
+            "org.apache.spark.util.SparkClassUtils",
+            "org.apache.spark.scheduler.LiveListenerBus",
+            "org.apache.spark.sql.execution.SparkPlanInfo$",
+            "org.apache.spark.sql.SparkSession",
+            "org.apache.spark.sql.execution.QueryExecution"
+        };
     }
-  }
-
-  public static class RunMainAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter() {
-      if (!AbstractDatadogSparkListener.isPysparkShell) {
-        AbstractDatadogSparkListener.finishTraceOnApplicationEnd = false;
-      }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // Capture spark submit arguments
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("prepareSubmitEnvironment"))
+                        .and(takesArgument(0, named("org.apache.spark.deploy.SparkSubmitArguments")))
+                        .and(isDeclaredBy(named("org.apache.spark.deploy.SparkSubmit"))),
+                AbstractSparkInstrumentation.class.getName() + "$PrepareSubmitEnvAdvice");
+
+        // SparkSubmit class used for non YARN/Mesos environment
+        transformer.applyAdvice(
+                isMethod().and(nameEndsWith("runMain")).and(isDeclaredBy(named("org.apache.spark.deploy.SparkSubmit"))),
+                AbstractSparkInstrumentation.class.getName() + "$RunMainAdvice");
+
+        // ApplicationMaster class is used when running in a YARN cluster
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("finish"))
+                        .and(isDeclaredBy(named("org.apache.spark.deploy.yarn.ApplicationMaster"))),
+                AbstractSparkInstrumentation.class.getName() + "$YarnFinishAdvice");
+
+        // SparkSession.sql(String, ...) — catch AnalysisException failures that fire during Catalyst
+        // analysis before any Spark job is submitted and are invisible to the listener bus
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("sql"))
+                        .and(takesArgument(0, String.class))
+                        .and(isDeclaredBy(named("org.apache.spark.sql.SparkSession"))),
+                AbstractSparkInstrumentation.class.getName() + "$SparkSqlFailureAdvice");
+
+        // QueryExecution.assertAnalyzed() — catch all Catalyst analysis failures regardless of
+        // entry point (SparkSession.sql, Dataset.select, Dataset.filter, etc.)
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("assertAnalyzed"))
+                        .and(isDeclaredBy(named("org.apache.spark.sql.execution.QueryExecution"))),
+                AbstractSparkInstrumentation.class.getName() + "$QueryExecutionFailureAdvice");
+
+        // LiveListenerBus class is used to manage spark listeners
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("addToSharedQueue"))
+                        .and(takesArgument(0, named("org.apache.spark.scheduler.SparkListenerInterface")))
+                        .and(isDeclaredBy(named("org.apache.spark.scheduler.LiveListenerBus"))),
+                AbstractSparkInstrumentation.class.getName() + "$LiveListenerBusAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Thrown Throwable throwable) {
-      if (AbstractDatadogSparkListener.listener != null) {
-        AbstractDatadogSparkListener.listener.finishApplication(
-            System.currentTimeMillis(), throwable, 0, null);
-      } else {
-        SparkLauncherListener.finishSpanWithThrowable(throwable);
-      }
+    public static class PrepareSubmitEnvAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(@Advice.Argument(0) SparkSubmitArguments submitArgs) {
+
+            // Using pyspark `python script.py`, spark JVM is launched as PythonGatewayServer, which is
+            // exited using System.exit(0), leading to the exit advice not being called
+            // https://github.com/apache/spark/blob/v3.5.1/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala#L540-L542
+            // https://github.com/apache/spark/blob/v3.5.1/core/src/main/scala/org/apache/spark/api/python/PythonGatewayServer.scala#L74
+            if ("pyspark-shell".equals(submitArgs.primaryResource())) {
+                AbstractDatadogSparkListener.isPysparkShell = true;
+
+                // prepareSubmitEnvironment might be called before/after runMain depending on spark version
+                AbstractDatadogSparkListener.finishTraceOnApplicationEnd = true;
+            }
+        }
     }
-  }
-
-  public static class YarnFinishAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(@Advice.Argument(1) int exitCode, @Advice.Argument(2) String msg) {
-      if (AbstractDatadogSparkListener.listener != null) {
-        AbstractDatadogSparkListener.listener.finishApplication(
-            System.currentTimeMillis(), null, exitCode, msg);
-      }
+
+    public static class RunMainAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter() {
+            if (!AbstractDatadogSparkListener.isPysparkShell) {
+                AbstractDatadogSparkListener.finishTraceOnApplicationEnd = false;
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Thrown Throwable throwable) {
+            if (AbstractDatadogSparkListener.listener != null) {
+                AbstractDatadogSparkListener.listener.finishApplication(System.currentTimeMillis(), throwable, 0, null);
+            } else {
+                SparkLauncherListener.finishSpanWithThrowable(throwable);
+            }
+        }
     }
-  }
-
-  public static class SparkSqlFailureAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Thrown Throwable throwable) {
-      if (throwable != null && AbstractDatadogSparkListener.listener != null) {
-        AbstractDatadogSparkListener.listener.onSqlFailure(throwable);
-      }
+
+    public static class YarnFinishAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(@Advice.Argument(1) int exitCode, @Advice.Argument(2) String msg) {
+            if (AbstractDatadogSparkListener.listener != null) {
+                AbstractDatadogSparkListener.listener.finishApplication(
+                        System.currentTimeMillis(), null, exitCode, msg);
+            }
+        }
     }
-  }
-
-  public static class QueryExecutionFailureAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Thrown Throwable throwable) {
-      if (throwable != null && AbstractDatadogSparkListener.listener != null) {
-        AbstractDatadogSparkListener.listener.onSqlFailure(throwable);
-      }
+
+    public static class SparkSqlFailureAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Thrown Throwable throwable) {
+            if (throwable != null && AbstractDatadogSparkListener.listener != null) {
+                AbstractDatadogSparkListener.listener.onSqlFailure(throwable);
+            }
+        }
     }
-  }
-
-  public static class LiveListenerBusAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-    // If OL is disabled in tracer config but user set it up manually don't interfere
-    public static boolean enter(@Advice.Argument(0) SparkListenerInterface listener) {
-      Logger log = LoggerFactory.getLogger("LiveListenerBusAdvice");
-      if (Config.get().isDataJobsOpenLineageEnabled()
-          && listener != null
-          && "io.openlineage.spark.agent.OpenLineageSparkListener"
-              .equals(listener.getClass().getCanonicalName())) {
-        log.debug("Detected OpenLineage listener, skipping adding it to ListenerBus");
-
-        // Spark config does not get captured on databricks env, possibly bcz of other listener's
-        // constructor used.
-        // Reflection is used here to get the config.
-        try {
-          log.debug("Getting OpenLineage conf from the listener");
-          Object openLineageConf = listener.getClass().getMethod("getConf").invoke(listener);
-          if (openLineageConf != null) {
-            InstanceStore.of(SparkConf.class)
-                .put("openLineageSparkConf", (SparkConf) openLineageConf);
-          }
-        } catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
-          log.warn(
-              "Issue when obtaining OpenLineage conf (possibly unsupported OpenLineage version): {}",
-              e.getMessage());
+
+    public static class QueryExecutionFailureAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(@Advice.Thrown Throwable throwable) {
+            if (throwable != null && AbstractDatadogSparkListener.listener != null) {
+                AbstractDatadogSparkListener.listener.onSqlFailure(throwable);
+            }
         }
+    }
 
-        InstanceStore.of(SparkListenerInterface.class).put("openLineageListener", listener);
-        return true;
-      }
-      return false;
+    public static class LiveListenerBusAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+        // If OL is disabled in tracer config but user set it up manually don't interfere
+        public static boolean enter(@Advice.Argument(0) SparkListenerInterface listener) {
+            Logger log = LoggerFactory.getLogger("LiveListenerBusAdvice");
+            if (Config.get().isDataJobsOpenLineageEnabled()
+                    && listener != null
+                    && "io.openlineage.spark.agent.OpenLineageSparkListener"
+                            .equals(listener.getClass().getCanonicalName())) {
+                log.debug("Detected OpenLineage listener, skipping adding it to ListenerBus");
+
+                // Spark config does not get captured on databricks env, possibly bcz of other listener's
+                // constructor used.
+                // Reflection is used here to get the config.
+                try {
+                    log.debug("Getting OpenLineage conf from the listener");
+                    Object openLineageConf =
+                            listener.getClass().getMethod("getConf").invoke(listener);
+                    if (openLineageConf != null) {
+                        InstanceStore.of(SparkConf.class).put("openLineageSparkConf", (SparkConf) openLineageConf);
+                    }
+                } catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
+                    log.warn(
+                            "Issue when obtaining OpenLineage conf (possibly unsupported OpenLineage version): {}",
+                            e.getMessage());
+                }
+
+                InstanceStore.of(SparkListenerInterface.class).put("openLineageListener", listener);
+                return true;
+            }
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkPlanSerializer.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkPlanSerializer.java
index 271f273660a..d77f587dfbc 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkPlanSerializer.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkPlanSerializer.java
@@ -22,201 +22,187 @@
 // An extension of how Spark translates `SparkPlan`s to `SparkPlanInfo`, see here:
 // https://github.com/apache/spark/blob/v3.5.0/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkPlanInfo.scala#L54
 public abstract class AbstractSparkPlanSerializer {
-  private final int MAX_DEPTH = 4;
-  private final int MAX_LENGTH = 50;
-  private final ObjectMapper mapper = AbstractDatadogSparkListener.objectMapper;
-
-  private final String SPARK_PKG_NAME = "org.apache.spark";
-  private final Set<String> SAFE_PARSE_TRAVERSE =
-      Collections.singleton(SPARK_PKG_NAME + ".sql.catalyst.plans.physical.Partitioning");
-  private final Set<String> SAFE_PARSE_STRING =
-      new HashSet<>(
-          Arrays.asList(
-              SPARK_PKG_NAME + ".Partitioner", // not a product or TreeNode
-              SPARK_PKG_NAME
-                  + ".sql.catalyst.expressions.Attribute", // avoid data type added by simpleString
-              SPARK_PKG_NAME + ".sql.catalyst.optimizer.BuildSide", // enum (v3+)
-              SPARK_PKG_NAME + ".sql.catalyst.plans.JoinType", // enum
-              SPARK_PKG_NAME
-                  + ".sql.catalyst.plans.physical.BroadcastMode", // not a product or TreeNode
-              SPARK_PKG_NAME
-                  + ".sql.execution.ShufflePartitionSpec", // not a product or TreeNode (v3+)
-              SPARK_PKG_NAME + ".sql.execution.exchange.ShuffleOrigin" // enum (v3+)
-              ));
-
-  // Add class here if we want to break inheritance and interface traversal early when we see
-  // this class. In other words, we explicitly do not match these classes or their parents
-  private final Set<String> NEGATIVE_CACHE =
-      new HashSet<>(
-          Arrays.asList(
-              "java.io.Serializable",
-              "java.lang.Object",
-              "scala.Equals",
-              "scala.Product",
-              SPARK_PKG_NAME + ".sql.catalyst.InternalRow",
-              SPARK_PKG_NAME + ".sql.catalyst.expressions.UnaryExpression",
-              SPARK_PKG_NAME + ".sql.catalyst.expressions.Unevaluable",
-              SPARK_PKG_NAME + ".sql.catalyst.trees.TreeNode"));
-
-  private final MethodHandles methodLoader = new MethodHandles(ClassLoader.getSystemClassLoader());
-  private final MethodHandle getSimpleString =
-      methodLoader.method(TreeNode.class, "simpleString", int.class);
-  private final MethodHandle getSimpleStringLegacy =
-      methodLoader.method(TreeNode.class, "simpleString");
-
-  public abstract String getKey(int idx, TreeNode node);
-
-  public Map<String, String> extractFormattedProduct(SparkPlan plan) {
-    HashMap<String, String> result = new HashMap<>();
-    safeParseTreeNode(plan, 0)
-        .forEach(
-            (key, value) -> {
-              result.put(key, writeObjectToString(value));
-            });
-    return result;
-  }
-
-  protected Map<String, Object> safeParseTreeNode(TreeNode node, int depth) {
-    HashMap<String, Object> args = new HashMap<>();
-    HashMap<String, String> unparsed = new HashMap<>();
-
-    int i = 0;
-    for (Iterator<Object> it = JavaConverters.asJavaIterator(node.productIterator());
-        it.hasNext(); ) {
-      Object obj = it.next();
-
-      Object val = safeParseObjectToJson(obj, depth);
-      if (val != null) {
-        args.put(getKey(i, node), val);
-      } else {
-        unparsed.put(getKey(i, node), obj.getClass().getName());
-      }
-
-      i++;
+    private final int MAX_DEPTH = 4;
+    private final int MAX_LENGTH = 50;
+    private final ObjectMapper mapper = AbstractDatadogSparkListener.objectMapper;
+
+    private final String SPARK_PKG_NAME = "org.apache.spark";
+    private final Set<String> SAFE_PARSE_TRAVERSE =
+            Collections.singleton(SPARK_PKG_NAME + ".sql.catalyst.plans.physical.Partitioning");
+    private final Set<String> SAFE_PARSE_STRING = new HashSet<>(Arrays.asList(
+            SPARK_PKG_NAME + ".Partitioner", // not a product or TreeNode
+            SPARK_PKG_NAME + ".sql.catalyst.expressions.Attribute", // avoid data type added by simpleString
+            SPARK_PKG_NAME + ".sql.catalyst.optimizer.BuildSide", // enum (v3+)
+            SPARK_PKG_NAME + ".sql.catalyst.plans.JoinType", // enum
+            SPARK_PKG_NAME + ".sql.catalyst.plans.physical.BroadcastMode", // not a product or TreeNode
+            SPARK_PKG_NAME + ".sql.execution.ShufflePartitionSpec", // not a product or TreeNode (v3+)
+            SPARK_PKG_NAME + ".sql.execution.exchange.ShuffleOrigin" // enum (v3+)
+            ));
+
+    // Add class here if we want to break inheritance and interface traversal early when we see
+    // this class. In other words, we explicitly do not match these classes or their parents
+    private final Set<String> NEGATIVE_CACHE = new HashSet<>(Arrays.asList(
+            "java.io.Serializable",
+            "java.lang.Object",
+            "scala.Equals",
+            "scala.Product",
+            SPARK_PKG_NAME + ".sql.catalyst.InternalRow",
+            SPARK_PKG_NAME + ".sql.catalyst.expressions.UnaryExpression",
+            SPARK_PKG_NAME + ".sql.catalyst.expressions.Unevaluable",
+            SPARK_PKG_NAME + ".sql.catalyst.trees.TreeNode"));
+
+    private final MethodHandles methodLoader = new MethodHandles(ClassLoader.getSystemClassLoader());
+    private final MethodHandle getSimpleString = methodLoader.method(TreeNode.class, "simpleString", int.class);
+    private final MethodHandle getSimpleStringLegacy = methodLoader.method(TreeNode.class, "simpleString");
+
+    public abstract String getKey(int idx, TreeNode node);
+
+    public Map<String, String> extractFormattedProduct(SparkPlan plan) {
+        HashMap<String, String> result = new HashMap<>();
+        safeParseTreeNode(plan, 0).forEach((key, value) -> {
+            result.put(key, writeObjectToString(value));
+        });
+        return result;
     }
 
-    if (unparsed.size() > 0) {
-      // For now, place what we can't parse here with the types so we're aware of them
-      args.put("_dd.unparsed", unparsed);
-    }
-    return args;
-  }
-
-  // Should only call on final values being written to `meta`
-  protected String writeObjectToString(Object value) {
-    try {
-      return mapper.writeValueAsString(value);
-    } catch (IOException e) {
-      return null;
+    protected Map<String, Object> safeParseTreeNode(TreeNode node, int depth) {
+        HashMap<String, Object> args = new HashMap<>();
+        HashMap<String, String> unparsed = new HashMap<>();
+
+        int i = 0;
+        for (Iterator<Object> it = JavaConverters.asJavaIterator(node.productIterator()); it.hasNext(); ) {
+            Object obj = it.next();
+
+            Object val = safeParseObjectToJson(obj, depth);
+            if (val != null) {
+                args.put(getKey(i, node), val);
+            } else {
+                unparsed.put(getKey(i, node), obj.getClass().getName());
+            }
+
+            i++;
+        }
+
+        if (unparsed.size() > 0) {
+            // For now, place what we can't parse here with the types so we're aware of them
+            args.put("_dd.unparsed", unparsed);
+        }
+        return args;
     }
-  }
-
-  protected Object safeParseObjectToJson(Object value, int depth) {
-    // This function MUST not arbitrarily serialize the object as we can't be sure what it is.
-    // A null return indicates object is unserializable, otherwise it should really only return
-    // valid JSON types (Array, Map, String, Boolean, Number, null)
-
-    if (value == null) {
-      return "null";
-    } else if (value instanceof String || value instanceof Boolean || value instanceof Number) {
-      return value;
-    } else if (value instanceof Option) {
-      return safeParseObjectToJson(((Option) value).getOrElse(() -> "none"), depth);
-    } else if (value instanceof QueryPlan) {
-      // don't duplicate child nodes
-      return null;
-    } else if (value instanceof Iterable && depth < MAX_DEPTH) {
-      ArrayList<Object> list = new ArrayList<>();
-      for (Object item : JavaConverters.asJavaIterable((Iterable) value)) {
-        Object res = safeParseObjectToJson(item, depth + 1);
-        if (list.size() >= MAX_LENGTH) {
-          break;
-        } else if (res != null) {
-          list.add(res);
+
+    // Should only call on final values being written to `meta`
+    protected String writeObjectToString(Object value) {
+        try {
+            return mapper.writeValueAsString(value);
+        } catch (IOException e) {
+            return null;
         }
-      }
-      return list;
-    } else if (instanceOf(value, SAFE_PARSE_TRAVERSE, NEGATIVE_CACHE)) {
-      if (value instanceof TreeNode && depth < MAX_DEPTH) {
-        HashMap<String, Object> inner = new HashMap<>();
-        inner.put(
-            value.getClass().getSimpleName(), safeParseTreeNode(((TreeNode) value), depth + 1));
-        return inner;
-      } else {
-        return value.toString();
-      }
-    } else if (instanceOf(value, SAFE_PARSE_STRING, NEGATIVE_CACHE)) {
-      return value.toString();
-    } else if (value instanceof TreeNode) {
-      // fallback case, leave at bottom
-      return getSimpleString((TreeNode) value);
     }
 
-    return null;
-  }
+    protected Object safeParseObjectToJson(Object value, int depth) {
+        // This function MUST not arbitrarily serialize the object as we can't be sure what it is.
+        // A null return indicates object is unserializable, otherwise it should really only return
+        // valid JSON types (Array, Map, String, Boolean, Number, null)
+
+        if (value == null) {
+            return "null";
+        } else if (value instanceof String || value instanceof Boolean || value instanceof Number) {
+            return value;
+        } else if (value instanceof Option) {
+            return safeParseObjectToJson(((Option) value).getOrElse(() -> "none"), depth);
+        } else if (value instanceof QueryPlan) {
+            // don't duplicate child nodes
+            return null;
+        } else if (value instanceof Iterable && depth < MAX_DEPTH) {
+            ArrayList<Object> list = new ArrayList<>();
+            for (Object item : JavaConverters.asJavaIterable((Iterable) value)) {
+                Object res = safeParseObjectToJson(item, depth + 1);
+                if (list.size() >= MAX_LENGTH) {
+                    break;
+                } else if (res != null) {
+                    list.add(res);
+                }
+            }
+            return list;
+        } else if (instanceOf(value, SAFE_PARSE_TRAVERSE, NEGATIVE_CACHE)) {
+            if (value instanceof TreeNode && depth < MAX_DEPTH) {
+                HashMap<String, Object> inner = new HashMap<>();
+                inner.put(value.getClass().getSimpleName(), safeParseTreeNode(((TreeNode) value), depth + 1));
+                return inner;
+            } else {
+                return value.toString();
+            }
+        } else if (instanceOf(value, SAFE_PARSE_STRING, NEGATIVE_CACHE)) {
+            return value.toString();
+        } else if (value instanceof TreeNode) {
+            // fallback case, leave at bottom
+            return getSimpleString((TreeNode) value);
+        }
 
-  private String getSimpleString(TreeNode value) {
-    if (getSimpleString != null) {
-      String simpleString = methodLoader.invoke(getSimpleString, value, MAX_LENGTH);
-      if (simpleString != null) {
-        return simpleString;
-      }
+        return null;
     }
 
-    if (getSimpleStringLegacy != null) {
-      String simpleString = methodLoader.invoke(getSimpleStringLegacy, value);
-      if (simpleString != null) {
-        return simpleString;
-      }
-    }
+    private String getSimpleString(TreeNode value) {
+        if (getSimpleString != null) {
+            String simpleString = methodLoader.invoke(getSimpleString, value, MAX_LENGTH);
+            if (simpleString != null) {
+                return simpleString;
+            }
+        }
 
-    return null;
-  }
+        if (getSimpleStringLegacy != null) {
+            String simpleString = methodLoader.invoke(getSimpleStringLegacy, value);
+            if (simpleString != null) {
+                return simpleString;
+            }
+        }
 
-  // Matches a class to a set of expected classes. Returns true if the class or any
-  // of the interfaces or parent classes it implements matches a class in `expectedClasses`.
-  // Will not attempt to match any classes identified in `negativeCache` on traversal
-  private boolean instanceOf(Object value, Set<String> expectedClasses, Set<String> negativeCache) {
-    if (classOrInterfaceInstanceOf(value.getClass(), expectedClasses, negativeCache)) {
-      return true;
+        return null;
     }
 
-    // Traverse up inheritance tree to check for matches
-    int lim = 0;
-    Class currClass = value.getClass();
-    while (currClass.getSuperclass() != null && lim < MAX_DEPTH) {
-      currClass = currClass.getSuperclass();
-      if (negativeCache.contains(currClass.getName())) {
-        // don't traverse known paths
-        break;
-      }
-      if (classOrInterfaceInstanceOf(currClass, expectedClasses, negativeCache)) {
-        return true;
-      }
-      lim += 1;
-    }
+    // Matches a class to a set of expected classes. Returns true if the class or any
+    // of the interfaces or parent classes it implements matches a class in `expectedClasses`.
+    // Will not attempt to match any classes identified in `negativeCache` on traversal
+    private boolean instanceOf(Object value, Set<String> expectedClasses, Set<String> negativeCache) {
+        if (classOrInterfaceInstanceOf(value.getClass(), expectedClasses, negativeCache)) {
+            return true;
+        }
 
-    return false;
-  }
-
-  // Matches a class to a set of expected classes. Returns true if the class or any
-  // of the interfaces it implements matches a class in `expectedClasses`. Will not
-  // attempt to match any classes identified in `negativeCache`.
-  private boolean classOrInterfaceInstanceOf(
-      Class cls, Set<String> expectedClasses, Set<String> negativeCache) {
-    // Match on strings to avoid class loading errors
-    if (expectedClasses.contains(cls.getName())) {
-      return true;
-    }
+        // Traverse up inheritance tree to check for matches
+        int lim = 0;
+        Class currClass = value.getClass();
+        while (currClass.getSuperclass() != null && lim < MAX_DEPTH) {
+            currClass = currClass.getSuperclass();
+            if (negativeCache.contains(currClass.getName())) {
+                // don't traverse known paths
+                break;
+            }
+            if (classOrInterfaceInstanceOf(currClass, expectedClasses, negativeCache)) {
+                return true;
+            }
+            lim += 1;
+        }
 
-    // Check interfaces as well
-    for (Class interfaceClass : cls.getInterfaces()) {
-      if (!negativeCache.contains(interfaceClass.getName())
-          && classOrInterfaceInstanceOf(interfaceClass, expectedClasses, negativeCache)) {
-        return true;
-      }
+        return false;
     }
 
-    return false;
-  }
+    // Matches a class to a set of expected classes. Returns true if the class or any
+    // of the interfaces it implements matches a class in `expectedClasses`. Will not
+    // attempt to match any classes identified in `negativeCache`.
+    private boolean classOrInterfaceInstanceOf(Class cls, Set<String> expectedClasses, Set<String> negativeCache) {
+        // Match on strings to avoid class loading errors
+        if (expectedClasses.contains(cls.getName())) {
+            return true;
+        }
+
+        // Check interfaces as well
+        for (Class interfaceClass : cls.getInterfaces()) {
+            if (!negativeCache.contains(interfaceClass.getName())
+                    && classOrInterfaceInstanceOf(interfaceClass, expectedClasses, negativeCache)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkPlanUtils.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkPlanUtils.java
index 68af1f402dc..43b19ba4bdd 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkPlanUtils.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkPlanUtils.java
@@ -11,47 +11,44 @@
 import scala.collection.immutable.Map;
 
 abstract class AbstractSparkPlanUtils {
-  private static final Logger log = LoggerFactory.getLogger(AbstractSparkPlanUtils.class);
-
-  protected static final MethodHandles methodLoader =
-      new MethodHandles(ClassLoader.getSystemClassLoader());
-
-  protected abstract MethodHandle getConstructor();
-
-  protected abstract MethodHandle getDatabricksConstructor();
-
-  // Deals with Seq which changed from Scala 2.12 to 2.13, so delegate to version-specific classes
-  protected abstract Object[] getStandardArgs(SparkPlanInfo planInfo, Map meta);
-
-  // Attempt to create a new SparkPlanInfo with additional metadata replaced
-  // Since the fields are immutable we must instantiate a new SparkPlanInfo to do this
-  public SparkPlanInfo upsertSparkPlanInfoMetadata(
-      SparkPlanInfo planInfo, scala.collection.immutable.Map<String, String> meta) {
-    if (getDatabricksConstructor() != null) {
-      List<Object> databricksArgs = new ArrayList<>(Arrays.asList(getStandardArgs(planInfo, meta)));
-      try {
-        databricksArgs.add(SparkPlanInfo.class.getMethod("estRowCount").invoke(planInfo));
-        databricksArgs.add(SparkPlanInfo.class.getMethod("rddScopeId").invoke(planInfo));
-        databricksArgs.add(SparkPlanInfo.class.getMethod("explainId").invoke(planInfo));
-      } catch (Throwable t) {
-        log.warn("Error obtaining Databricks-specific SparkPlanInfo args", t);
-      }
-
-      SparkPlanInfo newPlan =
-          methodLoader.invoke(getDatabricksConstructor(), databricksArgs.toArray());
-      if (newPlan != null) {
-        return newPlan;
-      }
+    private static final Logger log = LoggerFactory.getLogger(AbstractSparkPlanUtils.class);
+
+    protected static final MethodHandles methodLoader = new MethodHandles(ClassLoader.getSystemClassLoader());
+
+    protected abstract MethodHandle getConstructor();
+
+    protected abstract MethodHandle getDatabricksConstructor();
+
+    // Deals with Seq which changed from Scala 2.12 to 2.13, so delegate to version-specific classes
+    protected abstract Object[] getStandardArgs(SparkPlanInfo planInfo, Map meta);
+
+    // Attempt to create a new SparkPlanInfo with additional metadata replaced
+    // Since the fields are immutable we must instantiate a new SparkPlanInfo to do this
+    public SparkPlanInfo upsertSparkPlanInfoMetadata(
+            SparkPlanInfo planInfo, scala.collection.immutable.Map<String, String> meta) {
+        if (getDatabricksConstructor() != null) {
+            List<Object> databricksArgs = new ArrayList<>(Arrays.asList(getStandardArgs(planInfo, meta)));
+            try {
+                databricksArgs.add(SparkPlanInfo.class.getMethod("estRowCount").invoke(planInfo));
+                databricksArgs.add(SparkPlanInfo.class.getMethod("rddScopeId").invoke(planInfo));
+                databricksArgs.add(SparkPlanInfo.class.getMethod("explainId").invoke(planInfo));
+            } catch (Throwable t) {
+                log.warn("Error obtaining Databricks-specific SparkPlanInfo args", t);
+            }
+
+            SparkPlanInfo newPlan = methodLoader.invoke(getDatabricksConstructor(), databricksArgs.toArray());
+            if (newPlan != null) {
+                return newPlan;
+            }
+        }
+
+        if (getConstructor() != null) {
+            SparkPlanInfo newPlan = methodLoader.invoke(getConstructor(), getStandardArgs(planInfo, meta));
+            if (newPlan != null) {
+                return newPlan;
+            }
+        }
+
+        return null;
     }
-
-    if (getConstructor() != null) {
-      SparkPlanInfo newPlan =
-          methodLoader.invoke(getConstructor(), getStandardArgs(planInfo, meta));
-      if (newPlan != null) {
-        return newPlan;
-      }
-    }
-
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/DatabricksParentContext.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/DatabricksParentContext.java
index b0f5de5e505..355a2245e34 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/DatabricksParentContext.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/DatabricksParentContext.java
@@ -22,90 +22,89 @@
  * the same hash on both sides to link everything in the same trace
  */
 public class DatabricksParentContext implements AgentSpanContext {
-  private static final Logger log = LoggerFactory.getLogger(DatabricksParentContext.class);
-
-  private final DDTraceId traceId;
-  private final long spanId;
-
-  public DatabricksParentContext(
-      String jobId, String jobRunId, String taskRunId, int attemptNumber) {
-    MessageDigest digest = null;
-    try {
-      digest = MessageDigest.getInstance("SHA-1");
-    } catch (NoSuchAlgorithmException e) {
-      log.debug("Unable to find SHA-1 algorithm", e);
+    private static final Logger log = LoggerFactory.getLogger(DatabricksParentContext.class);
+
+    private final DDTraceId traceId;
+    private final long spanId;
+
+    public DatabricksParentContext(String jobId, String jobRunId, String taskRunId, int attemptNumber) {
+        MessageDigest digest = null;
+        try {
+            digest = MessageDigest.getInstance("SHA-1");
+        } catch (NoSuchAlgorithmException e) {
+            log.debug("Unable to find SHA-1 algorithm", e);
+        }
+
+        if (digest != null && jobId != null && taskRunId != null) {
+            traceId = computeTraceId(digest, jobId, jobRunId, taskRunId, attemptNumber);
+            spanId = computeSpanId(digest, jobId, taskRunId);
+        } else {
+            traceId = DDTraceId.ZERO;
+            spanId = DDSpanId.ZERO;
+        }
     }
 
-    if (digest != null && jobId != null && taskRunId != null) {
-      traceId = computeTraceId(digest, jobId, jobRunId, taskRunId, attemptNumber);
-      spanId = computeSpanId(digest, jobId, taskRunId);
-    } else {
-      traceId = DDTraceId.ZERO;
-      spanId = DDSpanId.ZERO;
+    private DDTraceId computeTraceId(
+            MessageDigest digest, String jobId, String jobRunId, String taskRunId, int attemptNumber) {
+        byte[] inputBytes;
+
+        if (jobRunId != null) {
+            // Databricks reuses the same jobRunId when a run is repaired, so the original and repaired
+            // attempts would otherwise hash to the same trace id. The crawler side (dogweb) mixes the
+            // repair attempt index into the trace id to give each attempt its own trace; mirror that
+            // exactly so the spark spans land on the matching trace. attempt 0 stays bare for backward
+            // compatibility with runs that were never repaired.
+            String input = jobId + jobRunId;
+            if (attemptNumber > 0) {
+                input += "-" + attemptNumber;
+            }
+            inputBytes = input.getBytes(StandardCharsets.UTF_8);
+        } else {
+            inputBytes = (jobId + taskRunId).getBytes(StandardCharsets.UTF_8);
+        }
+
+        byte[] hash = digest.digest(inputBytes);
+        long traceIdLong = ByteBuffer.wrap(hash).getLong();
+        return DDTraceId.from(traceIdLong);
     }
-  }
-
-  private DDTraceId computeTraceId(
-      MessageDigest digest, String jobId, String jobRunId, String taskRunId, int attemptNumber) {
-    byte[] inputBytes;
-
-    if (jobRunId != null) {
-      // Databricks reuses the same jobRunId when a run is repaired, so the original and repaired
-      // attempts would otherwise hash to the same trace id. The crawler side (dogweb) mixes the
-      // repair attempt index into the trace id to give each attempt its own trace; mirror that
-      // exactly so the spark spans land on the matching trace. attempt 0 stays bare for backward
-      // compatibility with runs that were never repaired.
-      String input = jobId + jobRunId;
-      if (attemptNumber > 0) {
-        input += "-" + attemptNumber;
-      }
-      inputBytes = input.getBytes(StandardCharsets.UTF_8);
-    } else {
-      inputBytes = (jobId + taskRunId).getBytes(StandardCharsets.UTF_8);
+
+    private long computeSpanId(MessageDigest digest, String jobId, String taskRunId) {
+        byte[] hash = digest.digest((jobId + taskRunId).getBytes(StandardCharsets.UTF_8));
+        return ByteBuffer.wrap(hash).getLong();
+    }
+
+    @Override
+    public DDTraceId getTraceId() {
+        return traceId;
+    }
+
+    @Override
+    public long getSpanId() {
+        return spanId;
+    }
+
+    @Override
+    public AgentTraceCollector getTraceCollector() {
+        return null;
     }
 
-    byte[] hash = digest.digest(inputBytes);
-    long traceIdLong = ByteBuffer.wrap(hash).getLong();
-    return DDTraceId.from(traceIdLong);
-  }
-
-  private long computeSpanId(MessageDigest digest, String jobId, String taskRunId) {
-    byte[] hash = digest.digest((jobId + taskRunId).getBytes(StandardCharsets.UTF_8));
-    return ByteBuffer.wrap(hash).getLong();
-  }
-
-  @Override
-  public DDTraceId getTraceId() {
-    return traceId;
-  }
-
-  @Override
-  public long getSpanId() {
-    return spanId;
-  }
-
-  @Override
-  public AgentTraceCollector getTraceCollector() {
-    return null;
-  }
-
-  @Override
-  public int getSamplingPriority() {
-    return PrioritySampling.UNSET;
-  }
-
-  @Override
-  public Iterable<Map.Entry<String, String>> baggageItems() {
-    return null;
-  }
-
-  @Override
-  public PathwayContext getPathwayContext() {
-    return null;
-  }
-
-  @Override
-  public boolean isRemote() {
-    return false;
-  }
+    @Override
+    public int getSamplingPriority() {
+        return PrioritySampling.UNSET;
+    }
+
+    @Override
+    public Iterable<Map.Entry<String, String>> baggageItems() {
+        return null;
+    }
+
+    @Override
+    public PathwayContext getPathwayContext() {
+        return null;
+    }
+
+    @Override
+    public boolean isRemote() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/EmrUtils.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/EmrUtils.java
index 82d2dc146b8..86bfee04360 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/EmrUtils.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/EmrUtils.java
@@ -11,32 +11,32 @@
 /** Extracts the AWS EMR Step ID from the working directory name (e.g. s-07767992IY7VC5NVV854). */
 class EmrUtils {
 
-  private static final Logger log = LoggerFactory.getLogger(EmrUtils.class);
+    private static final Logger log = LoggerFactory.getLogger(EmrUtils.class);
 
-  /** EMR step ID is a 20 character string with numbers and uppercase letters only */
-  private static final Pattern EMR_STEP_ID_PATTERN = Pattern.compile("^(s-[0-9A-Z]{20})$");
+    /** EMR step ID is a 20 character string with numbers and uppercase letters only */
+    private static final Pattern EMR_STEP_ID_PATTERN = Pattern.compile("^(s-[0-9A-Z]{20})$");
 
-  @Nullable
-  static String getEmrStepId() {
-    try {
-      String userDir = System.getProperty("user.dir");
-      if (userDir == null) {
+    @Nullable
+    static String getEmrStepId() {
+        try {
+            String userDir = System.getProperty("user.dir");
+            if (userDir == null) {
+                return null;
+            }
+            Path workDir = Paths.get(userDir).getFileName();
+            if (workDir == null) {
+                return null;
+            }
+            Matcher matcher = EMR_STEP_ID_PATTERN.matcher(workDir.toString());
+            if (matcher.matches()) {
+                log.debug("EMR step ID extracted: {}", matcher.group(1));
+                return matcher.group(1);
+            }
+        } catch (Throwable t) {
+            log.debug("Unable to extract EMR step ID from working directory", t);
+        }
         return null;
-      }
-      Path workDir = Paths.get(userDir).getFileName();
-      if (workDir == null) {
-        return null;
-      }
-      Matcher matcher = EMR_STEP_ID_PATTERN.matcher(workDir.toString());
-      if (matcher.matches()) {
-        log.debug("EMR step ID extracted: {}", matcher.group(1));
-        return matcher.group(1);
-      }
-    } catch (Throwable t) {
-      log.debug("Unable to extract EMR step ID from working directory", t);
     }
-    return null;
-  }
 
-  private EmrUtils() {}
+    private EmrUtils() {}
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/OpenLineageInstrumentation.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/OpenLineageInstrumentation.java
index ac5151bf2b5..321a9e906af 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/OpenLineageInstrumentation.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/OpenLineageInstrumentation.java
@@ -17,43 +17,42 @@
 
 @AutoService(InstrumenterModule.class)
 public class OpenLineageInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-
-  public OpenLineageInstrumentation() {
-    super("spark-openlineage");
-  }
-
-  @Override
-  public boolean defaultEnabled() {
-    return false;
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {"io.openlineage.spark.agent.OpenLineageSparkListener"};
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // LiveListenerBus class is used when running in a YARN cluster
-    transformer.applyAdvice(
-        isConstructor()
-            .and(isDeclaredBy(named("io.openlineage.spark.agent.OpenLineageSparkListener")))
-            .and(takesArgument(0, named("org.apache.spark.SparkConf"))),
-        OpenLineageInstrumentation.class.getName() + "$OpenLineageSparkListenerAdvice");
-  }
-
-  public static class OpenLineageSparkListenerAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void exit(@Advice.This Object self, @Advice.FieldValue("conf") SparkConf conf)
-        throws IllegalAccessException {
-      Logger log = LoggerFactory.getLogger("OpenLineageSparkListenerAdvice");
-      if (!Config.get().isDataJobsOpenLineageEnabled()) {
-        log.debug(
-            "OpenLineage - Data Jobs integration disabled. Not manipulating OpenLineageSparkListener");
-        return;
-      }
-      InstanceStore.of(SparkConf.class).put("openLineageSparkConf", conf);
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+
+    public OpenLineageInstrumentation() {
+        super("spark-openlineage");
+    }
+
+    @Override
+    public boolean defaultEnabled() {
+        return false;
+    }
+
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"io.openlineage.spark.agent.OpenLineageSparkListener"};
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // LiveListenerBus class is used when running in a YARN cluster
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(isDeclaredBy(named("io.openlineage.spark.agent.OpenLineageSparkListener")))
+                        .and(takesArgument(0, named("org.apache.spark.SparkConf"))),
+                OpenLineageInstrumentation.class.getName() + "$OpenLineageSparkListenerAdvice");
+    }
+
+    public static class OpenLineageSparkListenerAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void exit(@Advice.This Object self, @Advice.FieldValue("conf") SparkConf conf)
+                throws IllegalAccessException {
+            Logger log = LoggerFactory.getLogger("OpenLineageSparkListenerAdvice");
+            if (!Config.get().isDataJobsOpenLineageEnabled()) {
+                log.debug("OpenLineage - Data Jobs integration disabled. Not manipulating OpenLineageSparkListener");
+                return;
+            }
+            InstanceStore.of(SparkConf.class).put("openLineageSparkConf", conf);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/OpenlineageParentContext.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/OpenlineageParentContext.java
index 51977d73f6c..1e942526877 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/OpenlineageParentContext.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/OpenlineageParentContext.java
@@ -17,174 +17,169 @@
 import org.slf4j.LoggerFactory;
 
 public class OpenlineageParentContext implements AgentSpanContext {
-  private static final Logger log = LoggerFactory.getLogger(OpenlineageParentContext.class);
-  private static final Pattern UUID =
-      Pattern.compile(
-          "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$");
-
-  private final DDTraceId traceId;
-  private final long spanId;
-
-  private final String parentJobNamespace;
-  private final String parentJobName;
-  private final String parentRunId;
-  private final String rootParentJobNamespace;
-  private final String rootParentJobName;
-  private final String rootParentRunId;
-
-  public static final String OPENLINEAGE_PARENT_JOB_NAMESPACE =
-      "spark.openlineage.parentJobNamespace";
-  public static final String OPENLINEAGE_PARENT_JOB_NAME = "spark.openlineage.parentJobName";
-  public static final String OPENLINEAGE_PARENT_RUN_ID = "spark.openlineage.parentRunId";
-  public static final String OPENLINEAGE_ROOT_PARENT_JOB_NAMESPACE =
-      "spark.openlineage.rootParentJobNamespace";
-  public static final String OPENLINEAGE_ROOT_PARENT_JOB_NAME =
-      "spark.openlineage.rootParentJobName";
-  public static final String OPENLINEAGE_ROOT_PARENT_RUN_ID = "spark.openlineage.rootParentRunId";
-
-  public static Optional<OpenlineageParentContext> from(SparkConf sparkConf) {
-    if (!sparkConf.contains(OPENLINEAGE_PARENT_JOB_NAMESPACE)
-        || !sparkConf.contains(OPENLINEAGE_PARENT_JOB_NAME)
-        || !sparkConf.contains(OPENLINEAGE_PARENT_RUN_ID)) {
-      return Optional.empty();
-    }
-
-    if (!sparkConf.contains(OPENLINEAGE_ROOT_PARENT_RUN_ID)) {
-      log.debug("Found parent info, but not root parent info. Can't construct valid trace id.");
-      return Optional.empty();
-    }
-
-    String parentJobNamespace = sparkConf.get(OPENLINEAGE_PARENT_JOB_NAMESPACE);
-    String parentJobName = sparkConf.get(OPENLINEAGE_PARENT_JOB_NAME);
-    String parentRunId = sparkConf.get(OPENLINEAGE_PARENT_RUN_ID);
-
-    if (!UUID.matcher(parentRunId).matches()) {
-      log.debug("OpenLineage parent run id is not a valid UUID: {}", parentRunId);
-      return Optional.empty();
-    }
-
-    String rootParentJobNamespace = sparkConf.get(OPENLINEAGE_ROOT_PARENT_JOB_NAMESPACE);
-    String rootParentJobName = sparkConf.get(OPENLINEAGE_ROOT_PARENT_JOB_NAME);
-    String rootParentRunId = sparkConf.get(OPENLINEAGE_ROOT_PARENT_RUN_ID);
-
-    if (!UUID.matcher(rootParentRunId).matches()) {
-      log.debug("OpenLineage root parent run id is not a valid UUID: {}", parentRunId);
-      return Optional.empty();
-    }
-
-    return Optional.of(
-        new OpenlineageParentContext(
-            parentJobNamespace,
-            parentJobName,
-            parentRunId,
-            rootParentJobNamespace,
-            rootParentJobName,
-            rootParentRunId));
-  }
-
-  OpenlineageParentContext(
-      String parentJobNamespace,
-      String parentJobName,
-      String parentRunId,
-      String rootParentJobNamespace,
-      String rootParentJobName,
-      String rootParentRunId) {
-    log.debug(
-        "Creating OpenlineageParentContext with parentJobNamespace: {}, parentJobName: {}, parentRunId: {}, rootParentJobNamespace: {}, rootParentJobName: {}, rootParentRunId: {}",
-        parentJobNamespace,
-        parentJobName,
-        parentRunId,
-        rootParentJobNamespace,
-        rootParentJobName,
-        rootParentRunId);
-
-    this.parentJobNamespace = parentJobNamespace;
-    this.parentJobName = parentJobName;
-    this.parentRunId = parentRunId;
-
-    this.rootParentJobNamespace = rootParentJobNamespace;
-    this.rootParentJobName = rootParentJobName;
-    this.rootParentRunId = rootParentRunId;
-
-    if (this.rootParentRunId != null) {
-      traceId = computeTraceId(this.rootParentRunId);
-      spanId = computeSpanId(this.parentRunId);
-    } else if (this.parentRunId != null) {
-      traceId = computeTraceId(this.parentRunId);
-      spanId = computeSpanId(this.parentRunId);
-    } else {
-      traceId = DDTraceId.ZERO;
-      spanId = DDSpanId.ZERO;
-    }
-
-    log.debug("Created OpenlineageParentContext with traceId: {}, spanId: {}", traceId, spanId);
-  }
-
-  private long computeSpanId(String runId) {
-    return FNV64Hash.generateHash(runId, FNV64Hash.Version.v1A);
-  }
-
-  private DDTraceId computeTraceId(String runId) {
-    log.debug("Generating traceID from runId: {}", runId);
-    return DDTraceId.from(FNV64Hash.generateHash(runId, FNV64Hash.Version.v1A));
-  }
-
-  @Override
-  public DDTraceId getTraceId() {
-    return traceId;
-  }
-
-  @Override
-  public long getSpanId() {
-    return spanId;
-  }
-
-  @Override
-  public AgentTraceCollector getTraceCollector() {
-    return AgentTracer.NoopAgentTraceCollector.INSTANCE;
-  }
-
-  @Override
-  public int getSamplingPriority() {
-    return PrioritySampling.USER_KEEP;
-  }
-
-  @Override
-  public Iterable<Map.Entry<String, String>> baggageItems() {
-    return Collections.<String, String>emptyMap().entrySet();
-  }
-
-  @Override
-  public PathwayContext getPathwayContext() {
-    return null;
-  }
-
-  @Override
-  public boolean isRemote() {
-    return false;
-  }
-
-  public String getParentJobNamespace() {
-    return parentJobNamespace;
-  }
-
-  public String getParentJobName() {
-    return parentJobName;
-  }
-
-  public String getParentRunId() {
-    return parentRunId;
-  }
-
-  public String getRootParentJobNamespace() {
-    return rootParentJobNamespace;
-  }
-
-  public String getRootParentJobName() {
-    return rootParentJobName;
-  }
-
-  public String getRootParentRunId() {
-    return rootParentRunId;
-  }
+    private static final Logger log = LoggerFactory.getLogger(OpenlineageParentContext.class);
+    private static final Pattern UUID =
+            Pattern.compile("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$");
+
+    private final DDTraceId traceId;
+    private final long spanId;
+
+    private final String parentJobNamespace;
+    private final String parentJobName;
+    private final String parentRunId;
+    private final String rootParentJobNamespace;
+    private final String rootParentJobName;
+    private final String rootParentRunId;
+
+    public static final String OPENLINEAGE_PARENT_JOB_NAMESPACE = "spark.openlineage.parentJobNamespace";
+    public static final String OPENLINEAGE_PARENT_JOB_NAME = "spark.openlineage.parentJobName";
+    public static final String OPENLINEAGE_PARENT_RUN_ID = "spark.openlineage.parentRunId";
+    public static final String OPENLINEAGE_ROOT_PARENT_JOB_NAMESPACE = "spark.openlineage.rootParentJobNamespace";
+    public static final String OPENLINEAGE_ROOT_PARENT_JOB_NAME = "spark.openlineage.rootParentJobName";
+    public static final String OPENLINEAGE_ROOT_PARENT_RUN_ID = "spark.openlineage.rootParentRunId";
+
+    public static Optional<OpenlineageParentContext> from(SparkConf sparkConf) {
+        if (!sparkConf.contains(OPENLINEAGE_PARENT_JOB_NAMESPACE)
+                || !sparkConf.contains(OPENLINEAGE_PARENT_JOB_NAME)
+                || !sparkConf.contains(OPENLINEAGE_PARENT_RUN_ID)) {
+            return Optional.empty();
+        }
+
+        if (!sparkConf.contains(OPENLINEAGE_ROOT_PARENT_RUN_ID)) {
+            log.debug("Found parent info, but not root parent info. Can't construct valid trace id.");
+            return Optional.empty();
+        }
+
+        String parentJobNamespace = sparkConf.get(OPENLINEAGE_PARENT_JOB_NAMESPACE);
+        String parentJobName = sparkConf.get(OPENLINEAGE_PARENT_JOB_NAME);
+        String parentRunId = sparkConf.get(OPENLINEAGE_PARENT_RUN_ID);
+
+        if (!UUID.matcher(parentRunId).matches()) {
+            log.debug("OpenLineage parent run id is not a valid UUID: {}", parentRunId);
+            return Optional.empty();
+        }
+
+        String rootParentJobNamespace = sparkConf.get(OPENLINEAGE_ROOT_PARENT_JOB_NAMESPACE);
+        String rootParentJobName = sparkConf.get(OPENLINEAGE_ROOT_PARENT_JOB_NAME);
+        String rootParentRunId = sparkConf.get(OPENLINEAGE_ROOT_PARENT_RUN_ID);
+
+        if (!UUID.matcher(rootParentRunId).matches()) {
+            log.debug("OpenLineage root parent run id is not a valid UUID: {}", parentRunId);
+            return Optional.empty();
+        }
+
+        return Optional.of(new OpenlineageParentContext(
+                parentJobNamespace,
+                parentJobName,
+                parentRunId,
+                rootParentJobNamespace,
+                rootParentJobName,
+                rootParentRunId));
+    }
+
+    OpenlineageParentContext(
+            String parentJobNamespace,
+            String parentJobName,
+            String parentRunId,
+            String rootParentJobNamespace,
+            String rootParentJobName,
+            String rootParentRunId) {
+        log.debug(
+                "Creating OpenlineageParentContext with parentJobNamespace: {}, parentJobName: {}, parentRunId: {}, rootParentJobNamespace: {}, rootParentJobName: {}, rootParentRunId: {}",
+                parentJobNamespace,
+                parentJobName,
+                parentRunId,
+                rootParentJobNamespace,
+                rootParentJobName,
+                rootParentRunId);
+
+        this.parentJobNamespace = parentJobNamespace;
+        this.parentJobName = parentJobName;
+        this.parentRunId = parentRunId;
+
+        this.rootParentJobNamespace = rootParentJobNamespace;
+        this.rootParentJobName = rootParentJobName;
+        this.rootParentRunId = rootParentRunId;
+
+        if (this.rootParentRunId != null) {
+            traceId = computeTraceId(this.rootParentRunId);
+            spanId = computeSpanId(this.parentRunId);
+        } else if (this.parentRunId != null) {
+            traceId = computeTraceId(this.parentRunId);
+            spanId = computeSpanId(this.parentRunId);
+        } else {
+            traceId = DDTraceId.ZERO;
+            spanId = DDSpanId.ZERO;
+        }
+
+        log.debug("Created OpenlineageParentContext with traceId: {}, spanId: {}", traceId, spanId);
+    }
+
+    private long computeSpanId(String runId) {
+        return FNV64Hash.generateHash(runId, FNV64Hash.Version.v1A);
+    }
+
+    private DDTraceId computeTraceId(String runId) {
+        log.debug("Generating traceID from runId: {}", runId);
+        return DDTraceId.from(FNV64Hash.generateHash(runId, FNV64Hash.Version.v1A));
+    }
+
+    @Override
+    public DDTraceId getTraceId() {
+        return traceId;
+    }
+
+    @Override
+    public long getSpanId() {
+        return spanId;
+    }
+
+    @Override
+    public AgentTraceCollector getTraceCollector() {
+        return AgentTracer.NoopAgentTraceCollector.INSTANCE;
+    }
+
+    @Override
+    public int getSamplingPriority() {
+        return PrioritySampling.USER_KEEP;
+    }
+
+    @Override
+    public Iterable<Map.Entry<String, String>> baggageItems() {
+        return Collections.<String, String>emptyMap().entrySet();
+    }
+
+    @Override
+    public PathwayContext getPathwayContext() {
+        return null;
+    }
+
+    @Override
+    public boolean isRemote() {
+        return false;
+    }
+
+    public String getParentJobNamespace() {
+        return parentJobNamespace;
+    }
+
+    public String getParentJobName() {
+        return parentJobName;
+    }
+
+    public String getParentRunId() {
+        return parentRunId;
+    }
+
+    public String getRootParentJobNamespace() {
+        return rootParentJobNamespace;
+    }
+
+    public String getRootParentJobName() {
+        return rootParentJobName;
+    }
+
+    public String getRootParentRunId() {
+        return rootParentRunId;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/PredeterminedTraceIdContext.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/PredeterminedTraceIdContext.java
index 51164f8bbc8..a949e62f004 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/PredeterminedTraceIdContext.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/PredeterminedTraceIdContext.java
@@ -9,44 +9,44 @@
 import java.util.Map;
 
 public class PredeterminedTraceIdContext implements AgentSpanContext {
-  private final DDTraceId traceId;
-
-  public PredeterminedTraceIdContext(DDTraceId traceId) {
-    this.traceId = traceId;
-  }
-
-  @Override
-  public DDTraceId getTraceId() {
-    return this.traceId;
-  }
-
-  @Override
-  public long getSpanId() {
-    return 0;
-  }
-
-  @Override
-  public AgentTraceCollector getTraceCollector() {
-    return AgentTracer.NoopAgentTraceCollector.INSTANCE;
-  }
-
-  @Override
-  public int getSamplingPriority() {
-    return PrioritySampling.USER_KEEP;
-  }
-
-  @Override
-  public Iterable<Map.Entry<String, String>> baggageItems() {
-    return null;
-  }
-
-  @Override
-  public PathwayContext getPathwayContext() {
-    return null;
-  }
-
-  @Override
-  public boolean isRemote() {
-    return false;
-  }
+    private final DDTraceId traceId;
+
+    public PredeterminedTraceIdContext(DDTraceId traceId) {
+        this.traceId = traceId;
+    }
+
+    @Override
+    public DDTraceId getTraceId() {
+        return this.traceId;
+    }
+
+    @Override
+    public long getSpanId() {
+        return 0;
+    }
+
+    @Override
+    public AgentTraceCollector getTraceCollector() {
+        return AgentTracer.NoopAgentTraceCollector.INSTANCE;
+    }
+
+    @Override
+    public int getSamplingPriority() {
+        return PrioritySampling.USER_KEEP;
+    }
+
+    @Override
+    public Iterable<Map.Entry<String, String>> baggageItems() {
+        return null;
+    }
+
+    @Override
+    public PathwayContext getPathwayContext() {
+        return null;
+    }
+
+    @Override
+    public boolean isRemote() {
+        return false;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/RemoveEldestHashMap.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/RemoveEldestHashMap.java
index 1a6a68d8e56..ce43d628513 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/RemoveEldestHashMap.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/RemoveEldestHashMap.java
@@ -4,14 +4,14 @@
 import java.util.Map;
 
 public class RemoveEldestHashMap<K, V> extends LinkedHashMap<K, V> {
-  private final int maxSize;
+    private final int maxSize;
 
-  public RemoveEldestHashMap(int maxSize) {
-    this.maxSize = maxSize;
-  }
+    public RemoveEldestHashMap(int maxSize) {
+        this.maxSize = maxSize;
+    }
 
-  @Override
-  protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
-    return size() > maxSize;
-  }
+    @Override
+    protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
+        return size() > maxSize;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkAggregatedTaskMetrics.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkAggregatedTaskMetrics.java
index 988a9507649..fac6a9c87ba 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkAggregatedTaskMetrics.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkAggregatedTaskMetrics.java
@@ -17,336 +17,330 @@
 import org.apache.spark.util.AccumulatorV2;
 
 class SparkAggregatedTaskMetrics {
-  private static final double HISTOGRAM_RELATIVE_ACCURACY = 1 / 32.0;
-  private static final int HISTOGRAM_MAX_NUM_BINS = 512;
-  private static final int MAX_ACCUMULATOR_SIZE = 5000;
-  private final boolean isSparkTaskHistogramEnabled = Config.get().isSparkTaskHistogramEnabled();
-
-  private long executorDeserializeTime = 0L;
-  private long executorDeserializeCpuTime = 0L;
-  private long executorRunTime = 0L;
-  private long executorCpuTime = 0L;
-  private long resultSize = 0L;
-  private long jvmGCTime = 0L;
-  private long resultSerializationTime = 0L;
-  private long memoryBytesSpilled = 0L;
-  private long diskBytesSpilled = 0L;
-  private long peakExecutionMemory = 0L;
-
-  private long inputBytesRead = 0L;
-  private long inputRecordsRead = 0L;
-  private long outputBytesWritten = 0L;
-  private long outputRecordsWritten = 0L;
-
-  private long shuffleReadBytes = 0L;
-  private long shuffleReadBytesLocal = 0L;
-  private long shuffleReadBytesRemote = 0L;
-  private long shuffleReadBytesRemoteToDisk = 0L;
-  private long shuffleReadFetchWaitTime = 0L;
-  private long shuffleReadRecords = 0L;
-
-  private long shuffleWriteBytes = 0L;
-  private long shuffleWriteRecords = 0L;
-  private long shuffleWriteTime = 0L;
-
-  private long taskCompletedCount = 0L;
-  private long taskFailedCount = 0L;
-  private long taskRetriedCount = 0L;
-  private long taskWithOutputCount = 0L;
-
-  private long attributedAvailableExecutorTime = 0L;
-  private long previousAvailableExecutorTime = 0L;
-  private long taskRunTimeSinceLastStage = 0L;
-  private long totalTaskRunTimeSinceLastStage = 0L;
-  private long skewTime = 0;
-
-  private Histogram taskRunTimeHistogram;
-  private Histogram inputBytesHistogram;
-  private Histogram outputBytesHistogram;
-  private Histogram shuffleReadBytesHistogram;
-  private Histogram shuffleWriteBytesHistogram;
-  private Histogram diskBytesSpilledHistogram;
-
-  // Used for Spark SQL Plan metrics ONLY, don't put in regular span for now
-  private Map<Long, HistogramWithSum> externalAccumulableHistograms;
-
-  public SparkAggregatedTaskMetrics() {}
-
-  public SparkAggregatedTaskMetrics(long availableExecutorTime) {
-    this.previousAvailableExecutorTime = availableExecutorTime;
-  }
-
-  public void addTaskMetrics(
-      SparkListenerTaskEnd taskEnd, List<AccumulatorV2> externalAccumulators) {
-    taskCompletedCount += 1;
-
-    if (taskEnd.taskInfo().attemptNumber() > 0) {
-      taskRetriedCount += 1;
+    private static final double HISTOGRAM_RELATIVE_ACCURACY = 1 / 32.0;
+    private static final int HISTOGRAM_MAX_NUM_BINS = 512;
+    private static final int MAX_ACCUMULATOR_SIZE = 5000;
+    private final boolean isSparkTaskHistogramEnabled = Config.get().isSparkTaskHistogramEnabled();
+
+    private long executorDeserializeTime = 0L;
+    private long executorDeserializeCpuTime = 0L;
+    private long executorRunTime = 0L;
+    private long executorCpuTime = 0L;
+    private long resultSize = 0L;
+    private long jvmGCTime = 0L;
+    private long resultSerializationTime = 0L;
+    private long memoryBytesSpilled = 0L;
+    private long diskBytesSpilled = 0L;
+    private long peakExecutionMemory = 0L;
+
+    private long inputBytesRead = 0L;
+    private long inputRecordsRead = 0L;
+    private long outputBytesWritten = 0L;
+    private long outputRecordsWritten = 0L;
+
+    private long shuffleReadBytes = 0L;
+    private long shuffleReadBytesLocal = 0L;
+    private long shuffleReadBytesRemote = 0L;
+    private long shuffleReadBytesRemoteToDisk = 0L;
+    private long shuffleReadFetchWaitTime = 0L;
+    private long shuffleReadRecords = 0L;
+
+    private long shuffleWriteBytes = 0L;
+    private long shuffleWriteRecords = 0L;
+    private long shuffleWriteTime = 0L;
+
+    private long taskCompletedCount = 0L;
+    private long taskFailedCount = 0L;
+    private long taskRetriedCount = 0L;
+    private long taskWithOutputCount = 0L;
+
+    private long attributedAvailableExecutorTime = 0L;
+    private long previousAvailableExecutorTime = 0L;
+    private long taskRunTimeSinceLastStage = 0L;
+    private long totalTaskRunTimeSinceLastStage = 0L;
+    private long skewTime = 0;
+
+    private Histogram taskRunTimeHistogram;
+    private Histogram inputBytesHistogram;
+    private Histogram outputBytesHistogram;
+    private Histogram shuffleReadBytesHistogram;
+    private Histogram shuffleWriteBytesHistogram;
+    private Histogram diskBytesSpilledHistogram;
+
+    // Used for Spark SQL Plan metrics ONLY, don't put in regular span for now
+    private Map<Long, HistogramWithSum> externalAccumulableHistograms;
+
+    public SparkAggregatedTaskMetrics() {}
+
+    public SparkAggregatedTaskMetrics(long availableExecutorTime) {
+        this.previousAvailableExecutorTime = availableExecutorTime;
     }
 
-    if (taskEnd.reason() instanceof TaskFailedReason) {
-      taskFailedCount += 1;
-    }
+    public void addTaskMetrics(SparkListenerTaskEnd taskEnd, List<AccumulatorV2> externalAccumulators) {
+        taskCompletedCount += 1;
 
-    if (taskEnd.taskMetrics() != null) {
-      TaskMetrics taskMetrics = taskEnd.taskMetrics();
-
-      executorDeserializeTime += taskMetrics.executorDeserializeTime();
-      executorDeserializeCpuTime += taskMetrics.executorDeserializeCpuTime();
-      executorRunTime += taskMetrics.executorRunTime();
-      executorCpuTime += taskMetrics.executorCpuTime();
-      resultSize += taskMetrics.resultSize();
-      jvmGCTime += taskMetrics.jvmGCTime();
-      resultSerializationTime += taskMetrics.resultSerializationTime();
-      memoryBytesSpilled += taskMetrics.memoryBytesSpilled();
-      diskBytesSpilled += taskMetrics.diskBytesSpilled();
-      peakExecutionMemory = Math.max(peakExecutionMemory, taskMetrics.peakExecutionMemory());
-
-      inputBytesRead += taskMetrics.inputMetrics().bytesRead();
-      inputRecordsRead += taskMetrics.inputMetrics().recordsRead();
-      outputBytesWritten += taskMetrics.outputMetrics().bytesWritten();
-      outputRecordsWritten += taskMetrics.outputMetrics().recordsWritten();
-
-      shuffleReadBytes += taskMetrics.shuffleReadMetrics().totalBytesRead();
-      shuffleReadBytesLocal += taskMetrics.shuffleReadMetrics().localBytesRead();
-      shuffleReadBytesRemote += taskMetrics.shuffleReadMetrics().remoteBytesRead();
-      shuffleReadBytesRemoteToDisk += taskMetrics.shuffleReadMetrics().remoteBytesReadToDisk();
-      shuffleReadFetchWaitTime += taskMetrics.shuffleReadMetrics().fetchWaitTime();
-      shuffleReadRecords += taskMetrics.shuffleReadMetrics().recordsRead();
-
-      shuffleWriteBytes += taskMetrics.shuffleWriteMetrics().bytesWritten();
-      shuffleWriteRecords += taskMetrics.shuffleWriteMetrics().recordsWritten();
-      shuffleWriteTime += taskMetrics.shuffleWriteMetrics().writeTime();
-
-      if (taskMetrics.outputMetrics().recordsWritten() >= 1) {
-        taskWithOutputCount += 1;
-      }
-
-      long taskRunTime = computeTaskRunTime(taskMetrics);
-      taskRunTimeSinceLastStage += taskRunTime;
-
-      if (isSparkTaskHistogramEnabled) {
-        taskRunTimeHistogram = lazyHistogramAccept(taskRunTimeHistogram, taskRunTime);
-        inputBytesHistogram =
-            lazyHistogramAccept(inputBytesHistogram, taskMetrics.inputMetrics().bytesRead());
-        outputBytesHistogram =
-            lazyHistogramAccept(outputBytesHistogram, taskMetrics.outputMetrics().bytesWritten());
-        shuffleReadBytesHistogram =
-            lazyHistogramAccept(
-                shuffleReadBytesHistogram, taskMetrics.shuffleReadMetrics().totalBytesRead());
-        shuffleWriteBytesHistogram =
-            lazyHistogramAccept(
-                shuffleWriteBytesHistogram, taskMetrics.shuffleWriteMetrics().bytesWritten());
-        diskBytesSpilledHistogram =
-            lazyHistogramAccept(diskBytesSpilledHistogram, taskMetrics.diskBytesSpilled());
-
-        // TODO (CY): Should we also look at TaskInfo accumulable update values as a backup? Is that
-        // only needed for SHS?
-        if (externalAccumulators != null && !externalAccumulators.isEmpty()) {
-          if (externalAccumulableHistograms == null) {
-            externalAccumulableHistograms = new RemoveEldestHashMap<>(MAX_ACCUMULATOR_SIZE);
-          }
-
-          externalAccumulators.forEach(
-              acc -> {
-                HistogramWithSum hist = externalAccumulableHistograms.get(acc.id());
-                if (hist == null) {
-                  hist =
-                      Histogram.newHistogramWithSum(
-                          HISTOGRAM_RELATIVE_ACCURACY, HISTOGRAM_MAX_NUM_BINS);
-                }
+        if (taskEnd.taskInfo().attemptNumber() > 0) {
+            taskRetriedCount += 1;
+        }
+
+        if (taskEnd.reason() instanceof TaskFailedReason) {
+            taskFailedCount += 1;
+        }
 
-                try {
-                  // As of spark 3.5, all SQL metrics are Long, safeguard if it changes in new
-                  // versions
-                  hist.accept(((Number) acc.value()).doubleValue());
-                  externalAccumulableHistograms.put(acc.id(), hist);
-                } catch (ClassCastException ignored) {
+        if (taskEnd.taskMetrics() != null) {
+            TaskMetrics taskMetrics = taskEnd.taskMetrics();
+
+            executorDeserializeTime += taskMetrics.executorDeserializeTime();
+            executorDeserializeCpuTime += taskMetrics.executorDeserializeCpuTime();
+            executorRunTime += taskMetrics.executorRunTime();
+            executorCpuTime += taskMetrics.executorCpuTime();
+            resultSize += taskMetrics.resultSize();
+            jvmGCTime += taskMetrics.jvmGCTime();
+            resultSerializationTime += taskMetrics.resultSerializationTime();
+            memoryBytesSpilled += taskMetrics.memoryBytesSpilled();
+            diskBytesSpilled += taskMetrics.diskBytesSpilled();
+            peakExecutionMemory = Math.max(peakExecutionMemory, taskMetrics.peakExecutionMemory());
+
+            inputBytesRead += taskMetrics.inputMetrics().bytesRead();
+            inputRecordsRead += taskMetrics.inputMetrics().recordsRead();
+            outputBytesWritten += taskMetrics.outputMetrics().bytesWritten();
+            outputRecordsWritten += taskMetrics.outputMetrics().recordsWritten();
+
+            shuffleReadBytes += taskMetrics.shuffleReadMetrics().totalBytesRead();
+            shuffleReadBytesLocal += taskMetrics.shuffleReadMetrics().localBytesRead();
+            shuffleReadBytesRemote += taskMetrics.shuffleReadMetrics().remoteBytesRead();
+            shuffleReadBytesRemoteToDisk += taskMetrics.shuffleReadMetrics().remoteBytesReadToDisk();
+            shuffleReadFetchWaitTime += taskMetrics.shuffleReadMetrics().fetchWaitTime();
+            shuffleReadRecords += taskMetrics.shuffleReadMetrics().recordsRead();
+
+            shuffleWriteBytes += taskMetrics.shuffleWriteMetrics().bytesWritten();
+            shuffleWriteRecords += taskMetrics.shuffleWriteMetrics().recordsWritten();
+            shuffleWriteTime += taskMetrics.shuffleWriteMetrics().writeTime();
+
+            if (taskMetrics.outputMetrics().recordsWritten() >= 1) {
+                taskWithOutputCount += 1;
+            }
+
+            long taskRunTime = computeTaskRunTime(taskMetrics);
+            taskRunTimeSinceLastStage += taskRunTime;
+
+            if (isSparkTaskHistogramEnabled) {
+                taskRunTimeHistogram = lazyHistogramAccept(taskRunTimeHistogram, taskRunTime);
+                inputBytesHistogram = lazyHistogramAccept(
+                        inputBytesHistogram, taskMetrics.inputMetrics().bytesRead());
+                outputBytesHistogram = lazyHistogramAccept(
+                        outputBytesHistogram, taskMetrics.outputMetrics().bytesWritten());
+                shuffleReadBytesHistogram = lazyHistogramAccept(
+                        shuffleReadBytesHistogram,
+                        taskMetrics.shuffleReadMetrics().totalBytesRead());
+                shuffleWriteBytesHistogram = lazyHistogramAccept(
+                        shuffleWriteBytesHistogram,
+                        taskMetrics.shuffleWriteMetrics().bytesWritten());
+                diskBytesSpilledHistogram =
+                        lazyHistogramAccept(diskBytesSpilledHistogram, taskMetrics.diskBytesSpilled());
+
+                // TODO (CY): Should we also look at TaskInfo accumulable update values as a backup? Is that
+                // only needed for SHS?
+                if (externalAccumulators != null && !externalAccumulators.isEmpty()) {
+                    if (externalAccumulableHistograms == null) {
+                        externalAccumulableHistograms = new RemoveEldestHashMap<>(MAX_ACCUMULATOR_SIZE);
+                    }
+
+                    externalAccumulators.forEach(acc -> {
+                        HistogramWithSum hist = externalAccumulableHistograms.get(acc.id());
+                        if (hist == null) {
+                            hist = Histogram.newHistogramWithSum(HISTOGRAM_RELATIVE_ACCURACY, HISTOGRAM_MAX_NUM_BINS);
+                        }
+
+                        try {
+                            // As of spark 3.5, all SQL metrics are Long, safeguard if it changes in new
+                            // versions
+                            hist.accept(((Number) acc.value()).doubleValue());
+                            externalAccumulableHistograms.put(acc.id(), hist);
+                        } catch (ClassCastException ignored) {
+                        }
+                    });
                 }
-              });
+            }
         }
-      }
     }
-  }
 
-  public void recordTotalTaskRunTime(long taskRunTime) {
-    totalTaskRunTimeSinceLastStage += taskRunTime;
-  }
+    public void recordTotalTaskRunTime(long taskRunTime) {
+        totalTaskRunTimeSinceLastStage += taskRunTime;
+    }
 
-  public void allocateAvailableExecutorTime(long availableExecutorTime) {
-    long executorTime = availableExecutorTime - previousAvailableExecutorTime;
-    long runTime = taskRunTimeSinceLastStage;
-    long totalRunTime = totalTaskRunTimeSinceLastStage;
+    public void allocateAvailableExecutorTime(long availableExecutorTime) {
+        long executorTime = availableExecutorTime - previousAvailableExecutorTime;
+        long runTime = taskRunTimeSinceLastStage;
+        long totalRunTime = totalTaskRunTimeSinceLastStage;
 
-    if (totalRunTime > 0) {
-      double ratio = (double) runTime / totalRunTime;
-      attributedAvailableExecutorTime += (long) (ratio * executorTime);
-    }
+        if (totalRunTime > 0) {
+            double ratio = (double) runTime / totalRunTime;
+            attributedAvailableExecutorTime += (long) (ratio * executorTime);
+        }
 
-    previousAvailableExecutorTime = availableExecutorTime;
-    taskRunTimeSinceLastStage = 0;
-    totalTaskRunTimeSinceLastStage = 0;
-  }
-
-  public void accumulateStageMetrics(SparkAggregatedTaskMetrics stageMetrics) {
-    executorDeserializeTime += stageMetrics.executorDeserializeTime;
-    executorDeserializeCpuTime += stageMetrics.executorDeserializeCpuTime;
-    executorRunTime += stageMetrics.executorRunTime;
-    executorCpuTime += stageMetrics.executorCpuTime;
-    resultSize += stageMetrics.resultSize;
-    jvmGCTime += stageMetrics.jvmGCTime;
-    resultSerializationTime += stageMetrics.resultSerializationTime;
-    memoryBytesSpilled += stageMetrics.memoryBytesSpilled;
-    diskBytesSpilled += stageMetrics.diskBytesSpilled;
-    peakExecutionMemory = Math.max(stageMetrics.peakExecutionMemory, peakExecutionMemory);
-
-    inputBytesRead += stageMetrics.inputBytesRead;
-    inputRecordsRead += stageMetrics.inputRecordsRead;
-    outputBytesWritten += stageMetrics.outputBytesWritten;
-    outputRecordsWritten += stageMetrics.outputRecordsWritten;
-
-    shuffleReadBytes += stageMetrics.shuffleReadBytes;
-    shuffleReadBytesLocal += stageMetrics.shuffleReadBytesLocal;
-    shuffleReadBytesRemote += stageMetrics.shuffleReadBytesRemote;
-    shuffleReadBytesRemoteToDisk += stageMetrics.shuffleReadBytesRemoteToDisk;
-    shuffleReadFetchWaitTime += stageMetrics.shuffleReadFetchWaitTime;
-    shuffleReadRecords += stageMetrics.shuffleReadRecords;
-
-    shuffleWriteBytes += stageMetrics.shuffleWriteBytes;
-    shuffleWriteRecords += stageMetrics.shuffleWriteRecords;
-    shuffleWriteTime += stageMetrics.shuffleWriteTime;
-
-    taskCompletedCount += stageMetrics.taskCompletedCount;
-    taskFailedCount += stageMetrics.taskFailedCount;
-    taskRetriedCount += stageMetrics.taskRetriedCount;
-    taskWithOutputCount += stageMetrics.taskWithOutputCount;
-
-    attributedAvailableExecutorTime += stageMetrics.attributedAvailableExecutorTime;
-    skewTime += stageMetrics.skewTime;
-  }
-
-  public void computeSkew() {
-    if (taskRunTimeHistogram != null && taskRunTimeHistogram.getCount() > 0) {
-      double p50 = taskRunTimeHistogram.getValueAtQuantile(0.5);
-      double max = taskRunTimeHistogram.getMaxValue();
-
-      skewTime = (long) (max - p50);
+        previousAvailableExecutorTime = availableExecutorTime;
+        taskRunTimeSinceLastStage = 0;
+        totalTaskRunTimeSinceLastStage = 0;
     }
-  }
-
-  public void setSpanMetrics(AgentSpan span) {
-    span.setMetric("spark.executor_deserialize_time", executorDeserializeTime);
-    span.setMetric("spark.executor_deserialize_cpu_time", executorDeserializeCpuTime);
-    span.setMetric("spark.executor_run_time", executorRunTime);
-    span.setMetric("spark.executor_cpu_time", executorCpuTime);
-    span.setMetric("spark.result_size", resultSize);
-    span.setMetric("spark.jvm_gc_time", jvmGCTime);
-    span.setMetric("spark.result_serialization_time", resultSerializationTime);
-    span.setMetric("spark.memory_bytes_spilled", memoryBytesSpilled);
-    span.setMetric("spark.disk_bytes_spilled", diskBytesSpilled);
-    span.setMetric("spark.peak_execution_memory", peakExecutionMemory);
-
-    span.setMetric("spark.input_bytes", inputBytesRead);
-    span.setMetric("spark.input_records", inputRecordsRead);
-    span.setMetric("spark.output_bytes", outputBytesWritten);
-    span.setMetric("spark.output_records", outputRecordsWritten);
-
-    span.setMetric("spark.shuffle_read_bytes", shuffleReadBytes);
-    span.setMetric("spark.shuffle_read_bytes_local", shuffleReadBytesLocal);
-    span.setMetric("spark.shuffle_read_bytes_remote", shuffleReadBytesRemote);
-    span.setMetric("spark.shuffle_read_bytes_remote_to_disk", shuffleReadBytesRemoteToDisk);
-    span.setMetric("spark.shuffle_read_fetch_wait_time", shuffleReadFetchWaitTime);
-    span.setMetric("spark.shuffle_read_records", shuffleReadRecords);
-
-    span.setMetric("spark.shuffle_write_bytes", shuffleWriteBytes);
-    span.setMetric("spark.shuffle_write_records", shuffleWriteRecords);
-    span.setMetric("spark.shuffle_write_time", shuffleWriteTime);
-
-    span.setMetric("spark.task_completed_count", taskCompletedCount);
-    span.setMetric("spark.task_failed_count", taskFailedCount);
-    span.setMetric("spark.task_retried_count", taskRetriedCount);
-    span.setMetric("spark.task_with_output_count", taskWithOutputCount);
-
-    span.setMetric("spark.available_executor_time", attributedAvailableExecutorTime);
-    span.setMetric("spark.skew_time", skewTime);
-
-    if (taskRunTimeHistogram != null && taskRunTimeHistogram.getCount() > 0) {
-      span.setTag("_dd.spark.task_run_time", histogramToBase64(taskRunTimeHistogram));
-    }
-    if (inputBytesHistogram != null && inputBytesHistogram.getCount() > 0) {
-      span.setTag("_dd.spark.input_bytes", histogramToBase64(inputBytesHistogram));
-    }
-    if (outputBytesHistogram != null && outputBytesHistogram.getCount() > 0) {
-      span.setTag("_dd.spark.output_bytes", histogramToBase64(outputBytesHistogram));
-    }
-    if (shuffleReadBytesHistogram != null && shuffleReadBytesHistogram.getCount() > 0) {
-      span.setTag("_dd.spark.shuffle_read_bytes", histogramToBase64(shuffleReadBytesHistogram));
+
+    public void accumulateStageMetrics(SparkAggregatedTaskMetrics stageMetrics) {
+        executorDeserializeTime += stageMetrics.executorDeserializeTime;
+        executorDeserializeCpuTime += stageMetrics.executorDeserializeCpuTime;
+        executorRunTime += stageMetrics.executorRunTime;
+        executorCpuTime += stageMetrics.executorCpuTime;
+        resultSize += stageMetrics.resultSize;
+        jvmGCTime += stageMetrics.jvmGCTime;
+        resultSerializationTime += stageMetrics.resultSerializationTime;
+        memoryBytesSpilled += stageMetrics.memoryBytesSpilled;
+        diskBytesSpilled += stageMetrics.diskBytesSpilled;
+        peakExecutionMemory = Math.max(stageMetrics.peakExecutionMemory, peakExecutionMemory);
+
+        inputBytesRead += stageMetrics.inputBytesRead;
+        inputRecordsRead += stageMetrics.inputRecordsRead;
+        outputBytesWritten += stageMetrics.outputBytesWritten;
+        outputRecordsWritten += stageMetrics.outputRecordsWritten;
+
+        shuffleReadBytes += stageMetrics.shuffleReadBytes;
+        shuffleReadBytesLocal += stageMetrics.shuffleReadBytesLocal;
+        shuffleReadBytesRemote += stageMetrics.shuffleReadBytesRemote;
+        shuffleReadBytesRemoteToDisk += stageMetrics.shuffleReadBytesRemoteToDisk;
+        shuffleReadFetchWaitTime += stageMetrics.shuffleReadFetchWaitTime;
+        shuffleReadRecords += stageMetrics.shuffleReadRecords;
+
+        shuffleWriteBytes += stageMetrics.shuffleWriteBytes;
+        shuffleWriteRecords += stageMetrics.shuffleWriteRecords;
+        shuffleWriteTime += stageMetrics.shuffleWriteTime;
+
+        taskCompletedCount += stageMetrics.taskCompletedCount;
+        taskFailedCount += stageMetrics.taskFailedCount;
+        taskRetriedCount += stageMetrics.taskRetriedCount;
+        taskWithOutputCount += stageMetrics.taskWithOutputCount;
+
+        attributedAvailableExecutorTime += stageMetrics.attributedAvailableExecutorTime;
+        skewTime += stageMetrics.skewTime;
     }
-    if (shuffleWriteBytesHistogram != null && shuffleWriteBytesHistogram.getCount() > 0) {
-      span.setTag("_dd.spark.shuffle_write_bytes", histogramToBase64(shuffleWriteBytesHistogram));
+
+    public void computeSkew() {
+        if (taskRunTimeHistogram != null && taskRunTimeHistogram.getCount() > 0) {
+            double p50 = taskRunTimeHistogram.getValueAtQuantile(0.5);
+            double max = taskRunTimeHistogram.getMaxValue();
+
+            skewTime = (long) (max - p50);
+        }
     }
-    if (diskBytesSpilledHistogram != null && diskBytesSpilledHistogram.getCount() > 0) {
-      span.setTag("_dd.spark.disk_bytes_spilled", histogramToBase64(diskBytesSpilledHistogram));
+
+    public void setSpanMetrics(AgentSpan span) {
+        span.setMetric("spark.executor_deserialize_time", executorDeserializeTime);
+        span.setMetric("spark.executor_deserialize_cpu_time", executorDeserializeCpuTime);
+        span.setMetric("spark.executor_run_time", executorRunTime);
+        span.setMetric("spark.executor_cpu_time", executorCpuTime);
+        span.setMetric("spark.result_size", resultSize);
+        span.setMetric("spark.jvm_gc_time", jvmGCTime);
+        span.setMetric("spark.result_serialization_time", resultSerializationTime);
+        span.setMetric("spark.memory_bytes_spilled", memoryBytesSpilled);
+        span.setMetric("spark.disk_bytes_spilled", diskBytesSpilled);
+        span.setMetric("spark.peak_execution_memory", peakExecutionMemory);
+
+        span.setMetric("spark.input_bytes", inputBytesRead);
+        span.setMetric("spark.input_records", inputRecordsRead);
+        span.setMetric("spark.output_bytes", outputBytesWritten);
+        span.setMetric("spark.output_records", outputRecordsWritten);
+
+        span.setMetric("spark.shuffle_read_bytes", shuffleReadBytes);
+        span.setMetric("spark.shuffle_read_bytes_local", shuffleReadBytesLocal);
+        span.setMetric("spark.shuffle_read_bytes_remote", shuffleReadBytesRemote);
+        span.setMetric("spark.shuffle_read_bytes_remote_to_disk", shuffleReadBytesRemoteToDisk);
+        span.setMetric("spark.shuffle_read_fetch_wait_time", shuffleReadFetchWaitTime);
+        span.setMetric("spark.shuffle_read_records", shuffleReadRecords);
+
+        span.setMetric("spark.shuffle_write_bytes", shuffleWriteBytes);
+        span.setMetric("spark.shuffle_write_records", shuffleWriteRecords);
+        span.setMetric("spark.shuffle_write_time", shuffleWriteTime);
+
+        span.setMetric("spark.task_completed_count", taskCompletedCount);
+        span.setMetric("spark.task_failed_count", taskFailedCount);
+        span.setMetric("spark.task_retried_count", taskRetriedCount);
+        span.setMetric("spark.task_with_output_count", taskWithOutputCount);
+
+        span.setMetric("spark.available_executor_time", attributedAvailableExecutorTime);
+        span.setMetric("spark.skew_time", skewTime);
+
+        if (taskRunTimeHistogram != null && taskRunTimeHistogram.getCount() > 0) {
+            span.setTag("_dd.spark.task_run_time", histogramToBase64(taskRunTimeHistogram));
+        }
+        if (inputBytesHistogram != null && inputBytesHistogram.getCount() > 0) {
+            span.setTag("_dd.spark.input_bytes", histogramToBase64(inputBytesHistogram));
+        }
+        if (outputBytesHistogram != null && outputBytesHistogram.getCount() > 0) {
+            span.setTag("_dd.spark.output_bytes", histogramToBase64(outputBytesHistogram));
+        }
+        if (shuffleReadBytesHistogram != null && shuffleReadBytesHistogram.getCount() > 0) {
+            span.setTag("_dd.spark.shuffle_read_bytes", histogramToBase64(shuffleReadBytesHistogram));
+        }
+        if (shuffleWriteBytesHistogram != null && shuffleWriteBytesHistogram.getCount() > 0) {
+            span.setTag("_dd.spark.shuffle_write_bytes", histogramToBase64(shuffleWriteBytesHistogram));
+        }
+        if (diskBytesSpilledHistogram != null && diskBytesSpilledHistogram.getCount() > 0) {
+            span.setTag("_dd.spark.disk_bytes_spilled", histogramToBase64(diskBytesSpilledHistogram));
+        }
     }
-  }
-
-  /**
-   * Lazy creation of histograms, only creating one if there is a non-zero value. Spark stages
-   * usually involve either input/output or shuffle read/write operations, resulting in an average
-   * of 3 histograms having non-zero values
-   */
-  private Histogram lazyHistogramAccept(Histogram hist, double value) {
-    if (hist != null) {
-      hist.accept(value);
-    } else {
-      if (value != 0) {
-        // All the callbacks in DatadogSparkListener are called from the same thread, meaning we
-        // don't risk to lose values by creating the histogram this way
-        hist = Histogram.newHistogram(HISTOGRAM_RELATIVE_ACCURACY, HISTOGRAM_MAX_NUM_BINS);
-        if (taskCompletedCount > 1) {
-          // Filling all the previous 0s that we might have missed
-          hist.accept(0, taskCompletedCount - 1);
+
+    /**
+     * Lazy creation of histograms, only creating one if there is a non-zero value. Spark stages
+     * usually involve either input/output or shuffle read/write operations, resulting in an average
+     * of 3 histograms having non-zero values
+     */
+    private Histogram lazyHistogramAccept(Histogram hist, double value) {
+        if (hist != null) {
+            hist.accept(value);
+        } else {
+            if (value != 0) {
+                // All the callbacks in DatadogSparkListener are called from the same thread, meaning we
+                // don't risk to lose values by creating the histogram this way
+                hist = Histogram.newHistogram(HISTOGRAM_RELATIVE_ACCURACY, HISTOGRAM_MAX_NUM_BINS);
+                if (taskCompletedCount > 1) {
+                    // Filling all the previous 0s that we might have missed
+                    hist.accept(0, taskCompletedCount - 1);
+                }
+                hist.accept(value);
+            }
         }
-        hist.accept(value);
-      }
+
+        return hist;
     }
 
-    return hist;
-  }
-
-  // Used to put external accum metrics to JSON for Spark SQL plans
-  public void externalAccumToJson(JsonGenerator generator, SQLMetricInfo info) throws IOException {
-    if (externalAccumulableHistograms != null) {
-      HistogramWithSum hist = externalAccumulableHistograms.get(info.accumulatorId());
-      String name = info.name();
-
-      if (name != null && hist != null) {
-        generator.writeStartObject();
-        generator.writeStringField(name, histogramToBase64(hist));
-        generator.writeNumberField("sum", hist.getSum());
-        generator.writeStringField("type", info.metricType());
-        generator.writeEndObject();
-      }
+    // Used to put external accum metrics to JSON for Spark SQL plans
+    public void externalAccumToJson(JsonGenerator generator, SQLMetricInfo info) throws IOException {
+        if (externalAccumulableHistograms != null) {
+            HistogramWithSum hist = externalAccumulableHistograms.get(info.accumulatorId());
+            String name = info.name();
+
+            if (name != null && hist != null) {
+                generator.writeStartObject();
+                generator.writeStringField(name, histogramToBase64(hist));
+                generator.writeNumberField("sum", hist.getSum());
+                generator.writeStringField("type", info.metricType());
+                generator.writeEndObject();
+            }
+        }
     }
-  }
-
-  public static long computeTaskRunTime(TaskMetrics metrics) {
-    return metrics.executorDeserializeTime()
-        + metrics.executorRunTime()
-        + metrics.resultSerializationTime();
-  }
-
-  private static String histogramToBase64(Histogram hist) {
-    ByteBuffer bb = hist.serialize();
-
-    byte[] bytes;
-    if (bb.hasArray()) {
-      bytes = bb.array();
-    } else {
-      bytes = new byte[bb.remaining()];
-      bb.get(bytes);
+
+    public static long computeTaskRunTime(TaskMetrics metrics) {
+        return metrics.executorDeserializeTime() + metrics.executorRunTime() + metrics.resultSerializationTime();
     }
 
-    return Base64.getEncoder().encodeToString(bytes);
-  }
+    private static String histogramToBase64(Histogram hist) {
+        ByteBuffer bb = hist.serialize();
+
+        byte[] bytes;
+        if (bb.hasArray()) {
+            bytes = bb.array();
+        } else {
+            bytes = new byte[bb.remaining()];
+            bb.get(bytes);
+        }
+
+        return Base64.getEncoder().encodeToString(bytes);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkConfAllowList.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkConfAllowList.java
index 23c13688306..57348fee80a 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkConfAllowList.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkConfAllowList.java
@@ -17,100 +17,98 @@
  * @see <a href="https://spark.apache.org/docs/latest/configuration.html">Spark Configuration</a>
  */
 class SparkConfAllowList {
-  // Using values from
-  // https://github.com/apache/spark/blob/v3.5.1/core/src/main/scala/org/apache/spark/internal/config/package.scala#L1150-L1158
-  static final String DEFAULT_REDACTION_REGEX = "(?i)secret|password|token|access.key|api.key";
+    // Using values from
+    // https://github.com/apache/spark/blob/v3.5.1/core/src/main/scala/org/apache/spark/internal/config/package.scala#L1150-L1158
+    static final String DEFAULT_REDACTION_REGEX = "(?i)secret|password|token|access.key|api.key";
 
-  private static final Pattern DEFAULT_REDACTION_PATTERN = Pattern.compile(DEFAULT_REDACTION_REGEX);
+    private static final Pattern DEFAULT_REDACTION_PATTERN = Pattern.compile(DEFAULT_REDACTION_REGEX);
 
-  /**
-   * Job-specific parameters that can be used to control job execution or provide metadata about the
-   * job being executed
-   */
-  private static final Set<String> allowedJobParams =
-      new HashSet<>(
-          Arrays.asList(
-              "spark.app.id",
-              "spark.app.name",
-              "spark.app.startTime",
-              "spark.databricks.clusterSource",
-              "spark.databricks.clusterUsageTags.clusterId",
-              "spark.databricks.clusterUsageTags.clusterName",
-              "spark.databricks.clusterUsageTags.clusterNodeType",
-              "spark.databricks.clusterUsageTags.clusterWorkers",
-              "spark.databricks.clusterUsageTags.driverContainerId",
-              "spark.databricks.clusterUsageTags.sparkVersion",
-              "spark.databricks.clusterUsageTags.workerEnvironmentId",
-              "spark.databricks.env",
-              "spark.databricks.job.parentRunId",
-              "spark.databricks.job.type",
-              "spark.databricks.sparkContextId",
-              "spark.databricks.workload.name",
-              "spark.default.parallelism",
-              "spark.dynamicAllocation.enabled",
-              "spark.dynamicAllocation.executorIdleTimeout",
-              "spark.dynamicAllocation.initialExecutors",
-              "spark.dynamicAllocation.maxExecutors",
-              "spark.dynamicAllocation.minExecutors",
-              "spark.dynamicAllocation.executorAllocationRatio",
-              "spark.dynamicAllocation.schedulerBacklogTimeout",
-              "spark.driver.cores",
-              "spark.driver.maxResultSize",
-              "spark.driver.memory",
-              "spark.driver.memoryOverhead",
-              "spark.driver.memoryOverheadFactor",
-              "spark.executor.cores",
-              "spark.executor.instances",
-              "spark.executor.memory",
-              "spark.executor.pyspark.memory",
-              "spark.executor.memoryOverhead",
-              "spark.executor.memoryOverheadFactor",
-              "spark.files.maxPartitionBytes",
-              "spark.job.description",
-              "spark.jobGroup.id",
-              "spark.master",
-              "spark.memory.fraction",
-              "spark.memory.storageFraction",
-              "spark.memory.offHeap.enabled",
-              "spark.memory.offHeap.size",
-              "spark.submit.deployMode",
-              "spark.sql.autoBroadcastJoinThreshold",
-              "spark.sql.files.maxPartitionBytes",
-              "spark.sql.shuffle.partitions",
-              "spark.sql.execution.id",
-              "sql.streaming.queryId",
-              "streaming.sql.batchId",
-              "user"));
+    /**
+     * Job-specific parameters that can be used to control job execution or provide metadata about the
+     * job being executed
+     */
+    private static final Set<String> allowedJobParams = new HashSet<>(Arrays.asList(
+            "spark.app.id",
+            "spark.app.name",
+            "spark.app.startTime",
+            "spark.databricks.clusterSource",
+            "spark.databricks.clusterUsageTags.clusterId",
+            "spark.databricks.clusterUsageTags.clusterName",
+            "spark.databricks.clusterUsageTags.clusterNodeType",
+            "spark.databricks.clusterUsageTags.clusterWorkers",
+            "spark.databricks.clusterUsageTags.driverContainerId",
+            "spark.databricks.clusterUsageTags.sparkVersion",
+            "spark.databricks.clusterUsageTags.workerEnvironmentId",
+            "spark.databricks.env",
+            "spark.databricks.job.parentRunId",
+            "spark.databricks.job.type",
+            "spark.databricks.sparkContextId",
+            "spark.databricks.workload.name",
+            "spark.default.parallelism",
+            "spark.dynamicAllocation.enabled",
+            "spark.dynamicAllocation.executorIdleTimeout",
+            "spark.dynamicAllocation.initialExecutors",
+            "spark.dynamicAllocation.maxExecutors",
+            "spark.dynamicAllocation.minExecutors",
+            "spark.dynamicAllocation.executorAllocationRatio",
+            "spark.dynamicAllocation.schedulerBacklogTimeout",
+            "spark.driver.cores",
+            "spark.driver.maxResultSize",
+            "spark.driver.memory",
+            "spark.driver.memoryOverhead",
+            "spark.driver.memoryOverheadFactor",
+            "spark.executor.cores",
+            "spark.executor.instances",
+            "spark.executor.memory",
+            "spark.executor.pyspark.memory",
+            "spark.executor.memoryOverhead",
+            "spark.executor.memoryOverheadFactor",
+            "spark.files.maxPartitionBytes",
+            "spark.job.description",
+            "spark.jobGroup.id",
+            "spark.master",
+            "spark.memory.fraction",
+            "spark.memory.storageFraction",
+            "spark.memory.offHeap.enabled",
+            "spark.memory.offHeap.size",
+            "spark.submit.deployMode",
+            "spark.sql.autoBroadcastJoinThreshold",
+            "spark.sql.files.maxPartitionBytes",
+            "spark.sql.shuffle.partitions",
+            "spark.sql.execution.id",
+            "sql.streaming.queryId",
+            "streaming.sql.batchId",
+            "user"));
 
-  public static boolean canCaptureJobParameter(String parameterName) {
-    return allowedJobParams.contains(parameterName);
-  }
+    public static boolean canCaptureJobParameter(String parameterName) {
+        return allowedJobParams.contains(parameterName);
+    }
 
-  /** Redact a value if the key or value matches the default redaction pattern. */
-  public static String redactValue(String key, String value) {
-    if (DEFAULT_REDACTION_PATTERN.matcher(key).find()
-        || DEFAULT_REDACTION_PATTERN.matcher(value).find()) {
-      return "[redacted]";
+    /** Redact a value if the key or value matches the default redaction pattern. */
+    public static String redactValue(String key, String value) {
+        if (DEFAULT_REDACTION_PATTERN.matcher(key).find()
+                || DEFAULT_REDACTION_PATTERN.matcher(value).find()) {
+            return "[redacted]";
+        }
+        return value;
     }
-    return value;
-  }
 
-  public static List<Map.Entry<String, String>> getRedactedSparkConf(SparkConf conf) {
-    String redactionPattern = conf.get("spark.redaction.regex", DEFAULT_REDACTION_REGEX);
-    List<Map.Entry<String, String>> redacted = new ArrayList<>();
-    Pattern pattern = Pattern.compile(redactionPattern);
+    public static List<Map.Entry<String, String>> getRedactedSparkConf(SparkConf conf) {
+        String redactionPattern = conf.get("spark.redaction.regex", DEFAULT_REDACTION_REGEX);
+        List<Map.Entry<String, String>> redacted = new ArrayList<>();
+        Pattern pattern = Pattern.compile(redactionPattern);
 
-    for (Tuple2<String, String> entry : conf.getAll()) {
-      String key = entry._1;
-      String value = entry._2;
+        for (Tuple2<String, String> entry : conf.getAll()) {
+            String key = entry._1;
+            String value = entry._2;
 
-      if (pattern.matcher(key).find() || pattern.matcher(value).find()) {
-        redacted.add(new AbstractMap.SimpleEntry<>(key, "[redacted]"));
-      } else {
-        redacted.add(new AbstractMap.SimpleEntry<>(key, value));
-      }
-    }
+            if (pattern.matcher(key).find() || pattern.matcher(value).find()) {
+                redacted.add(new AbstractMap.SimpleEntry<>(key, "[redacted]"));
+            } else {
+                redacted.add(new AbstractMap.SimpleEntry<>(key, value));
+            }
+        }
 
-    return redacted;
-  }
+        return redacted;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkExitAdvice.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkExitAdvice.java
index 1306da2b373..0b1be8a781b 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkExitAdvice.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkExitAdvice.java
@@ -4,25 +4,22 @@
 import net.bytebuddy.asm.Advice;
 
 class SparkExitAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void enter(@Advice.Argument(0) int exitCode) {
-    try {
-      // Using reflection as java.lang.* instrumentation have to be done at boostrap,
-      // when spark classes have not been injected yet
-      Class<?> klass =
-          Thread.currentThread()
-              .getContextClassLoader()
-              .loadClass("datadog.trace.instrumentation.spark.AbstractDatadogSparkListener");
-      Object datadogListener = klass.getDeclaredField("listener").get(null);
-      if (datadogListener != null) {
-        Method method =
-            datadogListener
-                .getClass()
-                .getMethod(
-                    "finishApplication", long.class, Throwable.class, int.class, String.class);
-        method.invoke(datadogListener, System.currentTimeMillis(), null, exitCode, null);
-      }
-    } catch (Exception ignored) {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void enter(@Advice.Argument(0) int exitCode) {
+        try {
+            // Using reflection as java.lang.* instrumentation have to be done at boostrap,
+            // when spark classes have not been injected yet
+            Class<?> klass = Thread.currentThread()
+                    .getContextClassLoader()
+                    .loadClass("datadog.trace.instrumentation.spark.AbstractDatadogSparkListener");
+            Object datadogListener = klass.getDeclaredField("listener").get(null);
+            if (datadogListener != null) {
+                Method method = datadogListener
+                        .getClass()
+                        .getMethod("finishApplication", long.class, Throwable.class, int.class, String.class);
+                method.invoke(datadogListener, System.currentTimeMillis(), null, exitCode, null);
+            }
+        } catch (Exception ignored) {
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkExitInstrumentation.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkExitInstrumentation.java
index 1bc8337ac72..0b611e7df80 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkExitInstrumentation.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkExitInstrumentation.java
@@ -10,26 +10,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class SparkExitInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, Instrumenter.ForBootstrap {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, Instrumenter.ForBootstrap {
 
-  public SparkExitInstrumentation() {
-    super("spark-exit");
-  }
+    public SparkExitInstrumentation() {
+        super("spark-exit");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isDataJobsEnabled();
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isDataJobsEnabled();
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "java.lang.Runtime";
-  }
+    @Override
+    public String instrumentedType() {
+        return "java.lang.Runtime";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("exit").and(isDeclaredBy(named("java.lang.Runtime"))),
-        packageName + ".SparkExitAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("exit").and(isDeclaredBy(named("java.lang.Runtime"))), packageName + ".SparkExitAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherInstrumentation.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherInstrumentation.java
index 71d7089298d..e31b647051d 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherInstrumentation.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherInstrumentation.java
@@ -13,47 +13,47 @@
 
 @AutoService(InstrumenterModule.class)
 public class SparkLauncherInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public SparkLauncherInstrumentation() {
-    super("spark-launcher");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isDataJobsEnabled();
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.spark.launcher.SparkLauncher";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("startApplication"))
-            .and(isDeclaredBy(named("org.apache.spark.launcher.SparkLauncher"))),
-        SparkLauncherInstrumentation.class.getName() + "$StartApplicationAdvice");
-  }
-
-  public static class StartApplicationAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.This Object launcher,
-        @Advice.Return SparkAppHandle handle,
-        @Advice.Thrown Throwable throwable) {
-      SparkLauncherListener.createLauncherSpan(launcher);
-
-      if (throwable != null) {
-        SparkLauncherListener.finishSpanWithThrowable(throwable);
-        return;
-      }
-
-      if (handle != null) {
-        handle.addListener(new SparkLauncherListener());
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public SparkLauncherInstrumentation() {
+        super("spark-launcher");
+    }
+
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isDataJobsEnabled();
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.apache.spark.launcher.SparkLauncher";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("startApplication"))
+                        .and(isDeclaredBy(named("org.apache.spark.launcher.SparkLauncher"))),
+                SparkLauncherInstrumentation.class.getName() + "$StartApplicationAdvice");
+    }
+
+    public static class StartApplicationAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.This Object launcher,
+                @Advice.Return SparkAppHandle handle,
+                @Advice.Thrown Throwable throwable) {
+            SparkLauncherListener.createLauncherSpan(launcher);
+
+            if (throwable != null) {
+                SparkLauncherListener.finishSpanWithThrowable(throwable);
+                return;
+            }
+
+            if (handle != null) {
+                handle.addListener(new SparkLauncherListener());
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherListener.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherListener.java
index fa050768917..9afe71d153f 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherListener.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherListener.java
@@ -20,239 +20,231 @@
  */
 public class SparkLauncherListener implements SparkAppHandle.Listener {
 
-  private static final Logger log = LoggerFactory.getLogger(SparkLauncherListener.class);
+    private static final Logger log = LoggerFactory.getLogger(SparkLauncherListener.class);
 
-  static volatile AgentSpan launcherSpan;
+    static volatile AgentSpan launcherSpan;
 
-  private static volatile boolean shutdownHookRegistered = false;
+    private static volatile boolean shutdownHookRegistered = false;
 
-  private static long spanStartTimeMs = 0L;
-  private static long connectedTimeMs = 0L;
-  private static long submittedTimeMs = 0L;
-  private static long runningTimeMs = 0L;
+    private static long spanStartTimeMs = 0L;
+    private static long connectedTimeMs = 0L;
+    private static long submittedTimeMs = 0L;
+    private static long runningTimeMs = 0L;
 
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification =
-          "Listener class not exposed to application code; locking on its Class is safe")
-  public static synchronized void createLauncherSpan(Object launcher) {
-    if (launcherSpan != null) {
-      return;
-    }
-
-    AgentTracer.TracerAPI tracer = AgentTracer.get();
-    AgentSpan span =
-        tracer
-            .buildSpan("spark-launcher", "spark.launcher.launch")
-            .withSpanType("spark")
-            .withResourceName("SparkLauncher.startApplication")
-            .start();
-    span.setSamplingPriority(PrioritySampling.USER_KEEP, SamplingMechanism.DATA_JOBS);
-    setLauncherConfigTags(span, launcher);
-    captureEmrStepId(span);
-    spanStartTimeMs = System.currentTimeMillis();
-    connectedTimeMs = 0L;
-    submittedTimeMs = 0L;
-    runningTimeMs = 0L;
-    launcherSpan = span;
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Listener class not exposed to application code; locking on its Class is safe")
+    public static synchronized void createLauncherSpan(Object launcher) {
+        if (launcherSpan != null) {
+            return;
+        }
 
-    if (!shutdownHookRegistered) {
-      shutdownHookRegistered = true;
-      Runtime.getRuntime()
-          .addShutdownHook(
-              new Thread(
-                  () -> {
-                    synchronized (SparkLauncherListener.class) {
-                      AgentSpan s = launcherSpan;
-                      if (s != null) {
+        AgentTracer.TracerAPI tracer = AgentTracer.get();
+        AgentSpan span = tracer.buildSpan("spark-launcher", "spark.launcher.launch")
+                .withSpanType("spark")
+                .withResourceName("SparkLauncher.startApplication")
+                .start();
+        span.setSamplingPriority(PrioritySampling.USER_KEEP, SamplingMechanism.DATA_JOBS);
+        setLauncherConfigTags(span, launcher);
+        captureEmrStepId(span);
+        spanStartTimeMs = System.currentTimeMillis();
+        connectedTimeMs = 0L;
+        submittedTimeMs = 0L;
+        runningTimeMs = 0L;
+        launcherSpan = span;
+
+        if (!shutdownHookRegistered) {
+            shutdownHookRegistered = true;
+            Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+                synchronized (SparkLauncherListener.class) {
+                    AgentSpan s = launcherSpan;
+                    if (s != null) {
                         log.info("Finishing spark.launcher span from shutdown hook");
                         setTimingMetrics(s);
                         s.finish();
                         launcherSpan = null;
-                      }
                     }
-                  }));
-    }
-  }
-
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification =
-          "Listener class not exposed to application code; locking on its Class is safe")
-  public static synchronized void finishSpan(boolean isError, String errorMessage) {
-    AgentSpan span = launcherSpan;
-    if (span == null) {
-      return;
-    }
-    if (isError) {
-      span.setError(true);
-      span.setTag(DDTags.ERROR_TYPE, "Spark Launcher Failed");
-      span.setTag(DDTags.ERROR_MSG, errorMessage);
-    }
-    setTimingMetrics(span);
-    span.finish();
-    launcherSpan = null;
-  }
-
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification =
-          "Listener class not exposed to application code; locking on its Class is safe")
-  public static synchronized void finishSpanWithThrowable(Throwable throwable) {
-    AgentSpan span = launcherSpan;
-    if (span == null) {
-      return;
-    }
-    if (throwable != null) {
-      span.addThrowable(throwable);
-    }
-    setTimingMetrics(span);
-    span.finish();
-    launcherSpan = null;
-  }
-
-  private static void setTimingMetrics(AgentSpan span) {
-    if (spanStartTimeMs <= 0L) {
-      return;
-    }
-    if (connectedTimeMs > 0L) {
-      span.setMetric("spark.launcher.time_to_connected_ms", connectedTimeMs - spanStartTimeMs);
-    }
-    if (submittedTimeMs > 0L) {
-      span.setMetric("spark.launcher.time_to_submitted_ms", submittedTimeMs - spanStartTimeMs);
-    }
-    if (runningTimeMs > 0L) {
-      span.setMetric("spark.launcher.time_to_running_ms", runningTimeMs - spanStartTimeMs);
+                }
+            }));
+        }
     }
-  }
 
-  @Override
-  public void stateChanged(SparkAppHandle handle) {
-    synchronized (SparkLauncherListener.class) {
-      SparkAppHandle.State state = handle.getState();
-      AgentSpan span = launcherSpan;
-      if (span != null) {
-        span.setTag("spark.launcher.app_state", state.toString());
-        recordStateTimestamp(state);
-
-        String appId = handle.getAppId();
-        if (appId != null) {
-          span.setTag("spark.app_id", appId);
-          span.setTag("app_id", appId);
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Listener class not exposed to application code; locking on its Class is safe")
+    public static synchronized void finishSpan(boolean isError, String errorMessage) {
+        AgentSpan span = launcherSpan;
+        if (span == null) {
+            return;
         }
-
-        if (state.isFinal()) {
-          if (state == SparkAppHandle.State.FAILED
-              || state == SparkAppHandle.State.KILLED
-              || state == SparkAppHandle.State.LOST) {
-            // Set error tags but don't finish yet — RunMainAdvice may add the throwable
-            // with the full stack trace. The span will be finished by RunMainAdvice or
-            // the shutdown hook.
+        if (isError) {
             span.setError(true);
             span.setTag(DDTags.ERROR_TYPE, "Spark Launcher Failed");
-            span.setTag(DDTags.ERROR_MSG, "Application " + state);
-          } else {
-            finishSpan(false, null);
-          }
+            span.setTag(DDTags.ERROR_MSG, errorMessage);
+        }
+        setTimingMetrics(span);
+        span.finish();
+        launcherSpan = null;
+    }
+
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Listener class not exposed to application code; locking on its Class is safe")
+    public static synchronized void finishSpanWithThrowable(Throwable throwable) {
+        AgentSpan span = launcherSpan;
+        if (span == null) {
+            return;
+        }
+        if (throwable != null) {
+            span.addThrowable(throwable);
         }
-      }
+        setTimingMetrics(span);
+        span.finish();
+        launcherSpan = null;
     }
-  }
 
-  @Override
-  public void infoChanged(SparkAppHandle handle) {
-    synchronized (SparkLauncherListener.class) {
-      AgentSpan span = launcherSpan;
-      if (span != null) {
-        String appId = handle.getAppId();
-        if (appId != null) {
-          span.setTag("spark.app_id", appId);
-          span.setTag("app_id", appId);
+    private static void setTimingMetrics(AgentSpan span) {
+        if (spanStartTimeMs <= 0L) {
+            return;
+        }
+        if (connectedTimeMs > 0L) {
+            span.setMetric("spark.launcher.time_to_connected_ms", connectedTimeMs - spanStartTimeMs);
+        }
+        if (submittedTimeMs > 0L) {
+            span.setMetric("spark.launcher.time_to_submitted_ms", submittedTimeMs - spanStartTimeMs);
+        }
+        if (runningTimeMs > 0L) {
+            span.setMetric("spark.launcher.time_to_running_ms", runningTimeMs - spanStartTimeMs);
         }
-      }
     }
-  }
 
-  private static void recordStateTimestamp(SparkAppHandle.State state) {
-    long now = System.currentTimeMillis();
-    if (state == SparkAppHandle.State.CONNECTED) {
-      if (connectedTimeMs == 0L) {
-        connectedTimeMs = now;
-      }
-    } else if (state == SparkAppHandle.State.SUBMITTED) {
-      if (submittedTimeMs == 0L) {
-        submittedTimeMs = now;
-      }
-    } else if (state == SparkAppHandle.State.RUNNING) {
-      if (runningTimeMs == 0L) {
-        runningTimeMs = now;
-      }
+    @Override
+    public void stateChanged(SparkAppHandle handle) {
+        synchronized (SparkLauncherListener.class) {
+            SparkAppHandle.State state = handle.getState();
+            AgentSpan span = launcherSpan;
+            if (span != null) {
+                span.setTag("spark.launcher.app_state", state.toString());
+                recordStateTimestamp(state);
+
+                String appId = handle.getAppId();
+                if (appId != null) {
+                    span.setTag("spark.app_id", appId);
+                    span.setTag("app_id", appId);
+                }
+
+                if (state.isFinal()) {
+                    if (state == SparkAppHandle.State.FAILED
+                            || state == SparkAppHandle.State.KILLED
+                            || state == SparkAppHandle.State.LOST) {
+                        // Set error tags but don't finish yet — RunMainAdvice may add the throwable
+                        // with the full stack trace. The span will be finished by RunMainAdvice or
+                        // the shutdown hook.
+                        span.setError(true);
+                        span.setTag(DDTags.ERROR_TYPE, "Spark Launcher Failed");
+                        span.setTag(DDTags.ERROR_MSG, "Application " + state);
+                    } else {
+                        finishSpan(false, null);
+                    }
+                }
+            }
+        }
     }
-  }
 
-  private static void captureEmrStepId(AgentSpan span) {
-    String stepId = EmrUtils.getEmrStepId();
-    if (stepId != null) {
-      span.setTag("emr_step_id", stepId);
+    @Override
+    public void infoChanged(SparkAppHandle handle) {
+        synchronized (SparkLauncherListener.class) {
+            AgentSpan span = launcherSpan;
+            if (span != null) {
+                String appId = handle.getAppId();
+                if (appId != null) {
+                    span.setTag("spark.app_id", appId);
+                    span.setTag("app_id", appId);
+                }
+            }
+        }
     }
-  }
 
-  /**
-   * Extract launcher configuration via reflection and set as span tags. Secret redaction uses the
-   * default pattern only (not spark.redaction.regex) because the SparkLauncher conf map is a plain
-   * Map, not a SparkConf, so there is no way to read the user's custom redaction regex at this
-   * point.
-   */
-  private static void setLauncherConfigTags(AgentSpan span, Object launcher) {
-    try {
-      Field builderField = launcher.getClass().getSuperclass().getDeclaredField("builder");
-      builderField.setAccessible(true);
-      Object builder = builderField.get(launcher);
-      if (builder == null) {
-        return;
-      }
+    private static void recordStateTimestamp(SparkAppHandle.State state) {
+        long now = System.currentTimeMillis();
+        if (state == SparkAppHandle.State.CONNECTED) {
+            if (connectedTimeMs == 0L) {
+                connectedTimeMs = now;
+            }
+        } else if (state == SparkAppHandle.State.SUBMITTED) {
+            if (submittedTimeMs == 0L) {
+                submittedTimeMs = now;
+            }
+        } else if (state == SparkAppHandle.State.RUNNING) {
+            if (runningTimeMs == 0L) {
+                runningTimeMs = now;
+            }
+        }
+    }
 
-      Class<?> builderClass = builder.getClass();
-      Class<?> abstractBuilderClass = builderClass.getSuperclass();
+    private static void captureEmrStepId(AgentSpan span) {
+        String stepId = EmrUtils.getEmrStepId();
+        if (stepId != null) {
+            span.setTag("emr_step_id", stepId);
+        }
+    }
 
-      setStringFieldAsTag(span, builder, abstractBuilderClass, "master", "master");
-      setStringFieldAsTag(span, builder, abstractBuilderClass, "deployMode", "deploy_mode");
-      setStringFieldAsTag(span, builder, abstractBuilderClass, "appName", "application_name");
-      setStringFieldAsTag(span, builder, abstractBuilderClass, "mainClass", "main_class");
-      setStringFieldAsTag(span, builder, abstractBuilderClass, "appResource", "app_resource");
+    /**
+     * Extract launcher configuration via reflection and set as span tags. Secret redaction uses the
+     * default pattern only (not spark.redaction.regex) because the SparkLauncher conf map is a plain
+     * Map, not a SparkConf, so there is no way to read the user's custom redaction regex at this
+     * point.
+     */
+    private static void setLauncherConfigTags(AgentSpan span, Object launcher) {
+        try {
+            Field builderField = launcher.getClass().getSuperclass().getDeclaredField("builder");
+            builderField.setAccessible(true);
+            Object builder = builderField.get(launcher);
+            if (builder == null) {
+                return;
+            }
 
-      try {
-        Field confField = abstractBuilderClass.getDeclaredField("conf");
-        confField.setAccessible(true);
-        @SuppressWarnings("unchecked")
-        Map<String, String> conf = (Map<String, String>) confField.get(builder);
-        if (conf != null) {
-          for (Map.Entry<String, String> entry : conf.entrySet()) {
-            if (SparkConfAllowList.canCaptureJobParameter(entry.getKey())) {
-              String value = SparkConfAllowList.redactValue(entry.getKey(), entry.getValue());
-              span.setTag("config." + entry.getKey().replace('.', '_'), value);
+            Class<?> builderClass = builder.getClass();
+            Class<?> abstractBuilderClass = builderClass.getSuperclass();
+
+            setStringFieldAsTag(span, builder, abstractBuilderClass, "master", "master");
+            setStringFieldAsTag(span, builder, abstractBuilderClass, "deployMode", "deploy_mode");
+            setStringFieldAsTag(span, builder, abstractBuilderClass, "appName", "application_name");
+            setStringFieldAsTag(span, builder, abstractBuilderClass, "mainClass", "main_class");
+            setStringFieldAsTag(span, builder, abstractBuilderClass, "appResource", "app_resource");
+
+            try {
+                Field confField = abstractBuilderClass.getDeclaredField("conf");
+                confField.setAccessible(true);
+                @SuppressWarnings("unchecked")
+                Map<String, String> conf = (Map<String, String>) confField.get(builder);
+                if (conf != null) {
+                    for (Map.Entry<String, String> entry : conf.entrySet()) {
+                        if (SparkConfAllowList.canCaptureJobParameter(entry.getKey())) {
+                            String value = SparkConfAllowList.redactValue(entry.getKey(), entry.getValue());
+                            span.setTag("config." + entry.getKey().replace('.', '_'), value);
+                        }
+                    }
+                }
+            } catch (NoSuchFieldException e) {
+                log.debug("Could not find conf field on builder", e);
             }
-          }
+        } catch (Exception e) {
+            log.debug("Failed to extract SparkLauncher configuration", e);
         }
-      } catch (NoSuchFieldException e) {
-        log.debug("Could not find conf field on builder", e);
-      }
-    } catch (Exception e) {
-      log.debug("Failed to extract SparkLauncher configuration", e);
     }
-  }
 
-  private static void setStringFieldAsTag(
-      AgentSpan span, Object obj, Class<?> clazz, String fieldName, String tagName) {
-    try {
-      Field field = clazz.getDeclaredField(fieldName);
-      field.setAccessible(true);
-      Object value = field.get(obj);
-      if (value != null) {
-        span.setTag(tagName, value.toString());
-      }
-    } catch (Exception e) {
-      log.debug("Could not read field {} from builder", fieldName, e);
+    private static void setStringFieldAsTag(
+            AgentSpan span, Object obj, Class<?> clazz, String fieldName, String tagName) {
+        try {
+            Field field = clazz.getDeclaredField(fieldName);
+            field.setAccessible(true);
+            Object value = field.get(obj);
+            if (value != null) {
+                span.setTag(tagName, value.toString());
+            }
+        } catch (Exception e) {
+            log.debug("Could not read field {} from builder", fieldName, e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkSQLUtils.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkSQLUtils.java
index eb5875f2a38..749ad74e124 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkSQLUtils.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkSQLUtils.java
@@ -20,202 +20,198 @@
 import scala.collection.JavaConverters;
 
 public class SparkSQLUtils {
-  public static void addSQLPlanToStageSpan(
-      AgentSpan span,
-      SparkPlanInfo plan,
-      Map<Long, Integer> accumulatorToStageID,
-      SparkAggregatedTaskMetrics stageMetric,
-      int stageId) {
-    Set<Integer> parentStageIds = new HashSet<>();
-    SparkPlanInfoForStage planForStage =
-        computeStageInfoForStage(plan, accumulatorToStageID, stageId, parentStageIds, false);
-
-    span.setTag("_dd.spark.sql_parent_stage_ids", parentStageIds.toString());
-
-    if (planForStage != null) {
-      String json = planForStage.toJson(stageMetric);
-      span.setTag("_dd.spark.sql_plan", json);
-    }
-  }
-
-  public static SparkPlanInfoForStage computeStageInfoForStage(
-      SparkPlanInfo plan,
-      Map<Long, Integer> accumulatorToStageID,
-      int stageId,
-      Set<Integer> parentStageIds,
-      boolean foundStage) {
-    Set<Integer> stageIds = stageIdsForPlan(plan, accumulatorToStageID);
-
-    boolean hasStageInfo = !stageIds.isEmpty();
-    boolean isForStage = stageIds.contains(stageId);
-
-    if (foundStage && hasStageInfo && !isForStage) {
-      parentStageIds.addAll(stageIds);
-
-      // Stopping the propagation since this node is for another stage
-      return null;
-    }
-
-    Collection<SparkPlanInfo> children =
-        AbstractDatadogSparkListener.listener.getPlanInfoChildren(plan);
-
-    if (foundStage || isForStage) {
-      // The expected stage was found, adding its children to the plan
-      List<SparkPlanInfoForStage> childrenForStage = new ArrayList<>();
-      for (SparkPlanInfo child : children) {
+    public static void addSQLPlanToStageSpan(
+            AgentSpan span,
+            SparkPlanInfo plan,
+            Map<Long, Integer> accumulatorToStageID,
+            SparkAggregatedTaskMetrics stageMetric,
+            int stageId) {
+        Set<Integer> parentStageIds = new HashSet<>();
         SparkPlanInfoForStage planForStage =
-            computeStageInfoForStage(child, accumulatorToStageID, stageId, parentStageIds, true);
+                computeStageInfoForStage(plan, accumulatorToStageID, stageId, parentStageIds, false);
 
-        if (planForStage != null) {
-          childrenForStage.add(planForStage);
-        }
-      }
-
-      return new SparkPlanInfoForStage(plan, childrenForStage);
-    } else {
-      // The expected stage was not found yet, searching in the children nodes
-      for (SparkPlanInfo child : children) {
-        SparkPlanInfoForStage planForStage =
-            computeStageInfoForStage(child, accumulatorToStageID, stageId, parentStageIds, false);
+        span.setTag("_dd.spark.sql_parent_stage_ids", parentStageIds.toString());
 
         if (planForStage != null) {
-          // Early stopping if the stage was found, no need to keep searching
-          return planForStage;
+            String json = planForStage.toJson(stageMetric);
+            span.setTag("_dd.spark.sql_plan", json);
         }
-      }
     }
 
-    return null;
-  }
+    public static SparkPlanInfoForStage computeStageInfoForStage(
+            SparkPlanInfo plan,
+            Map<Long, Integer> accumulatorToStageID,
+            int stageId,
+            Set<Integer> parentStageIds,
+            boolean foundStage) {
+        Set<Integer> stageIds = stageIdsForPlan(plan, accumulatorToStageID);
 
-  private static Set<Integer> stageIdsForPlan(
-      SparkPlanInfo info, Map<Long, Integer> accumulatorToStageID) {
-    Set<Integer> stageIds = new HashSet<>();
+        boolean hasStageInfo = !stageIds.isEmpty();
+        boolean isForStage = stageIds.contains(stageId);
 
-    Collection<SQLMetricInfo> metrics =
-        AbstractDatadogSparkListener.listener.getPlanInfoMetrics(info);
-    for (SQLMetricInfo metric : metrics) {
-      // Using the accumulators to associate a plan with its stage
-      Integer stageId = accumulatorToStageID.get(metric.accumulatorId());
+        if (foundStage && hasStageInfo && !isForStage) {
+            parentStageIds.addAll(stageIds);
 
-      if (stageId != null) {
-        stageIds.add(stageId);
-      }
-    }
-
-    return stageIds;
-  }
+            // Stopping the propagation since this node is for another stage
+            return null;
+        }
 
-  public static class AccumulatorWithStage {
-    private final int stageId;
-    private final AccumulableInfo acc;
+        Collection<SparkPlanInfo> children = AbstractDatadogSparkListener.listener.getPlanInfoChildren(plan);
+
+        if (foundStage || isForStage) {
+            // The expected stage was found, adding its children to the plan
+            List<SparkPlanInfoForStage> childrenForStage = new ArrayList<>();
+            for (SparkPlanInfo child : children) {
+                SparkPlanInfoForStage planForStage =
+                        computeStageInfoForStage(child, accumulatorToStageID, stageId, parentStageIds, true);
+
+                if (planForStage != null) {
+                    childrenForStage.add(planForStage);
+                }
+            }
+
+            return new SparkPlanInfoForStage(plan, childrenForStage);
+        } else {
+            // The expected stage was not found yet, searching in the children nodes
+            for (SparkPlanInfo child : children) {
+                SparkPlanInfoForStage planForStage =
+                        computeStageInfoForStage(child, accumulatorToStageID, stageId, parentStageIds, false);
+
+                if (planForStage != null) {
+                    // Early stopping if the stage was found, no need to keep searching
+                    return planForStage;
+                }
+            }
+        }
 
-    public AccumulatorWithStage(int stageId, AccumulableInfo acc) {
-      this.stageId = stageId;
-      this.acc = acc;
+        return null;
     }
 
-    public void toJson(JsonGenerator generator, SQLMetricInfo metric) throws IOException {
-      if (acc.name().isDefined() && acc.value().isDefined()) {
-        String name = acc.name().get();
-        Long value = null;
-        try {
-          // As of spark 3.5, all SQL metrics are Long, safeguard if it changes in new versions
-          value = (Long) acc.value().get();
-        } catch (ClassCastException ignored) {
-        }
+    private static Set<Integer> stageIdsForPlan(SparkPlanInfo info, Map<Long, Integer> accumulatorToStageID) {
+        Set<Integer> stageIds = new HashSet<>();
 
-        if (name != null && value != null) {
-          generator.writeStartObject();
-          generator.writeNumberField(name, value);
-          generator.writeStringField("type", metric.metricType());
-          generator.writeEndObject();
-        }
-      }
-    }
-  }
+        Collection<SQLMetricInfo> metrics = AbstractDatadogSparkListener.listener.getPlanInfoMetrics(info);
+        for (SQLMetricInfo metric : metrics) {
+            // Using the accumulators to associate a plan with its stage
+            Integer stageId = accumulatorToStageID.get(metric.accumulatorId());
 
-  public static class SparkPlanInfoForStage {
-    private final SparkPlanInfo plan;
-    private final List<SparkPlanInfoForStage> children;
+            if (stageId != null) {
+                stageIds.add(stageId);
+            }
+        }
 
-    public SparkPlanInfoForStage(SparkPlanInfo plan, List<SparkPlanInfoForStage> children) {
-      this.plan = plan;
-      this.children = children;
+        return stageIds;
     }
 
-    public String toJson(SparkAggregatedTaskMetrics stageMetric) {
-      // Using the jackson JSON lib used by spark
-      // https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.12/3.5.0
-      ObjectMapper mapper =
-          new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    public static class AccumulatorWithStage {
+        private final int stageId;
+        private final AccumulableInfo acc;
 
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      try (JsonGenerator generator = mapper.getFactory().createGenerator(baos)) {
-        this.toJson(generator, mapper, stageMetric);
-      } catch (IOException e) {
-        return null;
-      }
+        public AccumulatorWithStage(int stageId, AccumulableInfo acc) {
+            this.stageId = stageId;
+            this.acc = acc;
+        }
 
-      return new String(baos.toByteArray(), StandardCharsets.UTF_8);
+        public void toJson(JsonGenerator generator, SQLMetricInfo metric) throws IOException {
+            if (acc.name().isDefined() && acc.value().isDefined()) {
+                String name = acc.name().get();
+                Long value = null;
+                try {
+                    // As of spark 3.5, all SQL metrics are Long, safeguard if it changes in new versions
+                    value = (Long) acc.value().get();
+                } catch (ClassCastException ignored) {
+                }
+
+                if (name != null && value != null) {
+                    generator.writeStartObject();
+                    generator.writeNumberField(name, value);
+                    generator.writeStringField("type", metric.metricType());
+                    generator.writeEndObject();
+                }
+            }
+        }
     }
 
-    private void toJson(
-        JsonGenerator generator, ObjectMapper mapper, SparkAggregatedTaskMetrics stageMetric)
-        throws IOException {
-      generator.writeStartObject();
-      generator.writeStringField("node", plan.nodeName());
-      generator.writeNumberField("nodeId", plan.hashCode());
-
-      String nodeDetails = plan.simpleString();
-      if (nodeDetails.startsWith(plan.nodeName())) {
-        nodeDetails = nodeDetails.substring(plan.nodeName().length()).trim();
-      }
-      if (!nodeDetails.isEmpty()) {
-        generator.writeStringField("nodeDetailString", nodeDetails);
-      }
-
-      // Metadata is only added natively by Spark for FileSourceScan nodes
-      // We leverage this to extract & inject additional argument-level data
-      if (!plan.metadata().isEmpty()) {
-        generator.writeFieldName("meta");
-        generator.writeStartObject();
-
-        for (Tuple2<String, String> metadata : JavaConverters.asJavaCollection(plan.metadata())) {
-          generator.writeFieldName(metadata._1);
-          try {
-            generator.writeTree(mapper.readTree(metadata._2));
-          } catch (IOException e) {
-            generator.writeString(metadata._2);
-          }
+    public static class SparkPlanInfoForStage {
+        private final SparkPlanInfo plan;
+        private final List<SparkPlanInfoForStage> children;
+
+        public SparkPlanInfoForStage(SparkPlanInfo plan, List<SparkPlanInfoForStage> children) {
+            this.plan = plan;
+            this.children = children;
         }
 
-        generator.writeEndObject();
-      }
+        public String toJson(SparkAggregatedTaskMetrics stageMetric) {
+            // Using the jackson JSON lib used by spark
+            // https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.12/3.5.0
+            ObjectMapper mapper =
+                    new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
-      List<SQLMetricInfo> metrics = AbstractDatadogSparkListener.listener.getPlanInfoMetrics(plan);
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try (JsonGenerator generator = mapper.getFactory().createGenerator(baos)) {
+                this.toJson(generator, mapper, stageMetric);
+            } catch (IOException e) {
+                return null;
+            }
 
-      // Writing final values of metrics
-      if (!metrics.isEmpty()) {
-        generator.writeFieldName("metrics");
-        generator.writeStartArray();
-        for (SQLMetricInfo metric : metrics) {
-          stageMetric.externalAccumToJson(generator, metric);
-        }
-        generator.writeEndArray();
-      }
-
-      // Writing child nodes
-      if (!children.isEmpty()) {
-        generator.writeFieldName("children");
-        generator.writeStartArray();
-        for (SparkPlanInfoForStage child : children) {
-          child.toJson(generator, mapper, stageMetric);
+            return new String(baos.toByteArray(), StandardCharsets.UTF_8);
         }
-        generator.writeEndArray();
-      }
 
-      generator.writeEndObject();
+        private void toJson(JsonGenerator generator, ObjectMapper mapper, SparkAggregatedTaskMetrics stageMetric)
+                throws IOException {
+            generator.writeStartObject();
+            generator.writeStringField("node", plan.nodeName());
+            generator.writeNumberField("nodeId", plan.hashCode());
+
+            String nodeDetails = plan.simpleString();
+            if (nodeDetails.startsWith(plan.nodeName())) {
+                nodeDetails = nodeDetails.substring(plan.nodeName().length()).trim();
+            }
+            if (!nodeDetails.isEmpty()) {
+                generator.writeStringField("nodeDetailString", nodeDetails);
+            }
+
+            // Metadata is only added natively by Spark for FileSourceScan nodes
+            // We leverage this to extract & inject additional argument-level data
+            if (!plan.metadata().isEmpty()) {
+                generator.writeFieldName("meta");
+                generator.writeStartObject();
+
+                for (Tuple2<String, String> metadata : JavaConverters.asJavaCollection(plan.metadata())) {
+                    generator.writeFieldName(metadata._1);
+                    try {
+                        generator.writeTree(mapper.readTree(metadata._2));
+                    } catch (IOException e) {
+                        generator.writeString(metadata._2);
+                    }
+                }
+
+                generator.writeEndObject();
+            }
+
+            List<SQLMetricInfo> metrics = AbstractDatadogSparkListener.listener.getPlanInfoMetrics(plan);
+
+            // Writing final values of metrics
+            if (!metrics.isEmpty()) {
+                generator.writeFieldName("metrics");
+                generator.writeStartArray();
+                for (SQLMetricInfo metric : metrics) {
+                    stageMetric.externalAccumToJson(generator, metric);
+                }
+                generator.writeEndArray();
+            }
+
+            // Writing child nodes
+            if (!children.isEmpty()) {
+                generator.writeFieldName("children");
+                generator.writeStartArray();
+                for (SparkPlanInfoForStage child : children) {
+                    child.toJson(generator, mapper, stageMetric);
+                }
+                generator.writeEndArray();
+            }
+
+            generator.writeEndObject();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/test/java/datadog/trace/instrumentation/spark/DatabricksRepairAttemptTest.java b/dd-java-agent/instrumentation/spark/spark-common/src/test/java/datadog/trace/instrumentation/spark/DatabricksRepairAttemptTest.java
index 8593853733d..d21146d6a57 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/test/java/datadog/trace/instrumentation/spark/DatabricksRepairAttemptTest.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/test/java/datadog/trace/instrumentation/spark/DatabricksRepairAttemptTest.java
@@ -15,114 +15,110 @@
 
 class DatabricksRepairAttemptTest {
 
-  private static String loadResource(String path) {
-    try (InputStream stream = DatabricksRepairAttemptTest.class.getResourceAsStream(path)) {
-      if (stream == null) {
-        throw new IllegalStateException("missing test resource " + path);
-      }
-      ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-      byte[] chunk = new byte[4096];
-      int read;
-      while ((read = stream.read(chunk)) != -1) {
-        bytes.write(chunk, 0, read);
-      }
-      return new String(bytes.toByteArray(), StandardCharsets.UTF_8).trim();
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
+    private static String loadResource(String path) {
+        try (InputStream stream = DatabricksRepairAttemptTest.class.getResourceAsStream(path)) {
+            if (stream == null) {
+                throw new IllegalStateException("missing test resource " + path);
+            }
+            ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+            byte[] chunk = new byte[4096];
+            int read;
+            while ((read = stream.read(chunk)) != -1) {
+                bytes.write(chunk, 0, read);
+            }
+            return new String(bytes.toByteArray(), StandardCharsets.UTF_8).trim();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    @Test
+    void extractsAttemptZeroFromOriginalRunPayload() {
+        Properties properties = new Properties();
+        properties.setProperty("unity.scope.data", loadResource("/databricks/unity-scope-data-original.txt"));
+
+        assertEquals(0, AbstractDatadogSparkListener.getDatabricksJobRunAttempt(properties));
+    }
+
+    @Test
+    void extractsAttemptOneFromRepairedRunPayload() {
+        Properties properties = new Properties();
+        properties.setProperty("unity.scope.data", loadResource("/databricks/unity-scope-data-repaired.txt"));
+
+        assertEquals(1, AbstractDatadogSparkListener.getDatabricksJobRunAttempt(properties));
+    }
+
+    @Test
+    void fallsBackToZeroWhenPropertyIsMissing() {
+        Properties properties = new Properties();
+
+        assertEquals(0, AbstractDatadogSparkListener.getDatabricksJobRunAttempt(properties));
+    }
+
+    @Test
+    void fallsBackToZeroWhenPayloadIsNotValidBase64() {
+        Properties properties = new Properties();
+        properties.setProperty("unity.scope.data", "not-valid-base64-@@@");
+
+        assertEquals(0, AbstractDatadogSparkListener.getDatabricksJobRunAttempt(properties));
+    }
+
+    @Test
+    void fallsBackToZeroWhenKeyIsAbsent() {
+        // Base64 of a serialized map that never mentions jobRunAttemptNum at all.
+        Properties properties = new Properties();
+        properties.setProperty(
+                "unity.scope.data",
+                java.util.Base64.getEncoder()
+                        .encodeToString("no attempt info in here".getBytes(StandardCharsets.UTF_8)));
+
+        assertEquals(0, AbstractDatadogSparkListener.getDatabricksJobRunAttempt(properties));
+    }
+
+    @Test
+    void fallsBackToZeroWhenValueIsABackreferenceRatherThanAString() {
+        // If the attempt value string was already written earlier in the serialized stream, Java
+        // serialization emits a TC_REFERENCE (0x71) back-pointer instead of repeating the string. We
+        // don't resolve backreferences, so this must safely fall back to attempt 0 rather than risk
+        // scanning forward and matching an unrelated byte as the value.
+        byte[] key = "jobRunAttemptNum".getBytes(StandardCharsets.UTF_8);
+        byte[] payload = new byte[key.length + 5];
+        System.arraycopy(key, 0, payload, 0, key.length);
+        payload[key.length] = 0x71; // TC_REFERENCE
+        payload[key.length + 1] = 0x00;
+        payload[key.length + 2] = 0x00;
+        payload[key.length + 3] = 0x00;
+        payload[key.length + 4] = 0x01;
+
+        Properties properties = new Properties();
+        properties.setProperty("unity.scope.data", java.util.Base64.getEncoder().encodeToString(payload));
+
+        assertEquals(0, AbstractDatadogSparkListener.getDatabricksJobRunAttempt(properties));
+    }
+
+    @Test
+    void computesDistinctTraceIdsForOriginalAndRepairedAttemptOfTheSameRun() {
+        // A repaired run reuses the same jobId/parentRunId as the original (that's the whole reason
+        // spans collided before this fix); it gets a fresh taskRunId per attempt, but that alone isn't
+        // enough since the job span (the trace root) is keyed on jobId+parentRunId, not taskRunId.
+        String jobId = "1234";
+        String parentRunId = "5678";
+
+        DatabricksParentContext original = new DatabricksParentContext(jobId, parentRunId, "9012", 0);
+        DatabricksParentContext repaired = new DatabricksParentContext(jobId, parentRunId, "3456", 1);
+
+        assertEquals(DDTraceId.from("8944764253919609482"), original.getTraceId());
+        assertNotEquals(original.getTraceId(), repaired.getTraceId());
+        assertNotEquals(DDSpanId.ZERO, repaired.getSpanId());
+    }
+
+    @Test
+    void attemptZeroReproducesTheOriginalNonRepairAwareTraceId() {
+        // Backward compatibility: runs that were never repaired must keep the exact trace id they
+        // always had, since attempt 0 is the overwhelmingly common case.
+        DatabricksParentContext withDefaultAttempt = new DatabricksParentContext("1234", "5678", "9012", 0);
+
+        assertEquals(DDTraceId.from("8944764253919609482"), withDefaultAttempt.getTraceId());
+        assertEquals(DDSpanId.from("15104224823446433673"), withDefaultAttempt.getSpanId());
     }
-  }
-
-  @Test
-  void extractsAttemptZeroFromOriginalRunPayload() {
-    Properties properties = new Properties();
-    properties.setProperty(
-        "unity.scope.data", loadResource("/databricks/unity-scope-data-original.txt"));
-
-    assertEquals(0, AbstractDatadogSparkListener.getDatabricksJobRunAttempt(properties));
-  }
-
-  @Test
-  void extractsAttemptOneFromRepairedRunPayload() {
-    Properties properties = new Properties();
-    properties.setProperty(
-        "unity.scope.data", loadResource("/databricks/unity-scope-data-repaired.txt"));
-
-    assertEquals(1, AbstractDatadogSparkListener.getDatabricksJobRunAttempt(properties));
-  }
-
-  @Test
-  void fallsBackToZeroWhenPropertyIsMissing() {
-    Properties properties = new Properties();
-
-    assertEquals(0, AbstractDatadogSparkListener.getDatabricksJobRunAttempt(properties));
-  }
-
-  @Test
-  void fallsBackToZeroWhenPayloadIsNotValidBase64() {
-    Properties properties = new Properties();
-    properties.setProperty("unity.scope.data", "not-valid-base64-@@@");
-
-    assertEquals(0, AbstractDatadogSparkListener.getDatabricksJobRunAttempt(properties));
-  }
-
-  @Test
-  void fallsBackToZeroWhenKeyIsAbsent() {
-    // Base64 of a serialized map that never mentions jobRunAttemptNum at all.
-    Properties properties = new Properties();
-    properties.setProperty(
-        "unity.scope.data",
-        java.util.Base64.getEncoder()
-            .encodeToString("no attempt info in here".getBytes(StandardCharsets.UTF_8)));
-
-    assertEquals(0, AbstractDatadogSparkListener.getDatabricksJobRunAttempt(properties));
-  }
-
-  @Test
-  void fallsBackToZeroWhenValueIsABackreferenceRatherThanAString() {
-    // If the attempt value string was already written earlier in the serialized stream, Java
-    // serialization emits a TC_REFERENCE (0x71) back-pointer instead of repeating the string. We
-    // don't resolve backreferences, so this must safely fall back to attempt 0 rather than risk
-    // scanning forward and matching an unrelated byte as the value.
-    byte[] key = "jobRunAttemptNum".getBytes(StandardCharsets.UTF_8);
-    byte[] payload = new byte[key.length + 5];
-    System.arraycopy(key, 0, payload, 0, key.length);
-    payload[key.length] = 0x71; // TC_REFERENCE
-    payload[key.length + 1] = 0x00;
-    payload[key.length + 2] = 0x00;
-    payload[key.length + 3] = 0x00;
-    payload[key.length + 4] = 0x01;
-
-    Properties properties = new Properties();
-    properties.setProperty(
-        "unity.scope.data", java.util.Base64.getEncoder().encodeToString(payload));
-
-    assertEquals(0, AbstractDatadogSparkListener.getDatabricksJobRunAttempt(properties));
-  }
-
-  @Test
-  void computesDistinctTraceIdsForOriginalAndRepairedAttemptOfTheSameRun() {
-    // A repaired run reuses the same jobId/parentRunId as the original (that's the whole reason
-    // spans collided before this fix); it gets a fresh taskRunId per attempt, but that alone isn't
-    // enough since the job span (the trace root) is keyed on jobId+parentRunId, not taskRunId.
-    String jobId = "1234";
-    String parentRunId = "5678";
-
-    DatabricksParentContext original = new DatabricksParentContext(jobId, parentRunId, "9012", 0);
-    DatabricksParentContext repaired = new DatabricksParentContext(jobId, parentRunId, "3456", 1);
-
-    assertEquals(DDTraceId.from("8944764253919609482"), original.getTraceId());
-    assertNotEquals(original.getTraceId(), repaired.getTraceId());
-    assertNotEquals(DDSpanId.ZERO, repaired.getSpanId());
-  }
-
-  @Test
-  void attemptZeroReproducesTheOriginalNonRepairAwareTraceId() {
-    // Backward compatibility: runs that were never repaired must keep the exact trace id they
-    // always had, since attempt 0 is the overwhelmingly common case.
-    DatabricksParentContext withDefaultAttempt =
-        new DatabricksParentContext("1234", "5678", "9012", 0);
-
-    assertEquals(DDTraceId.from("8944764253919609482"), withDefaultAttempt.getTraceId());
-    assertEquals(DDSpanId.from("15104224823446433673"), withDefaultAttempt.getSpanId());
-  }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/test/java/datadog/trace/instrumentation/spark/EmrUtilsTest.java b/dd-java-agent/instrumentation/spark/spark-common/src/test/java/datadog/trace/instrumentation/spark/EmrUtilsTest.java
index f4439cb9583..c56eb25b9ad 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/test/java/datadog/trace/instrumentation/spark/EmrUtilsTest.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/test/java/datadog/trace/instrumentation/spark/EmrUtilsTest.java
@@ -9,33 +9,33 @@
 
 class EmrUtilsTest {
 
-  private String originalUserDir;
-
-  @BeforeEach
-  void saveUserDir() {
-    originalUserDir = System.getProperty("user.dir");
-  }
-
-  @AfterEach
-  void restoreUserDir() {
-    System.setProperty("user.dir", originalUserDir);
-  }
-
-  @Test
-  void returnsStepIdWhenWorkdirMatchesEmrPattern() {
-    System.setProperty("user.dir", "/mnt/var/lib/hadoop/steps/s-07767992IY7VC5NVV854");
-    assertEquals("s-07767992IY7VC5NVV854", EmrUtils.getEmrStepId());
-  }
-
-  @Test
-  void returnsNullWhenWorkdirDoesNotMatchEmrPattern() {
-    System.setProperty("user.dir", "/home/hadoop");
-    assertNull(EmrUtils.getEmrStepId());
-  }
-
-  @Test
-  void returnsNullForApplicationIdWorkdir() {
-    System.setProperty("user.dir", "/home/hadoop/application_1234567890_0001");
-    assertNull(EmrUtils.getEmrStepId());
-  }
+    private String originalUserDir;
+
+    @BeforeEach
+    void saveUserDir() {
+        originalUserDir = System.getProperty("user.dir");
+    }
+
+    @AfterEach
+    void restoreUserDir() {
+        System.setProperty("user.dir", originalUserDir);
+    }
+
+    @Test
+    void returnsStepIdWhenWorkdirMatchesEmrPattern() {
+        System.setProperty("user.dir", "/mnt/var/lib/hadoop/steps/s-07767992IY7VC5NVV854");
+        assertEquals("s-07767992IY7VC5NVV854", EmrUtils.getEmrStepId());
+    }
+
+    @Test
+    void returnsNullWhenWorkdirDoesNotMatchEmrPattern() {
+        System.setProperty("user.dir", "/home/hadoop");
+        assertNull(EmrUtils.getEmrStepId());
+    }
+
+    @Test
+    void returnsNullForApplicationIdWorkdir() {
+        System.setProperty("user.dir", "/home/hadoop/application_1234567890_0001");
+        assertNull(EmrUtils.getEmrStepId());
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/test/java/datadog/trace/instrumentation/spark/SetupOpenLineageTest.java b/dd-java-agent/instrumentation/spark/spark-common/src/test/java/datadog/trace/instrumentation/spark/SetupOpenLineageTest.java
index 372cd3c10b7..e9f76763f8f 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/test/java/datadog/trace/instrumentation/spark/SetupOpenLineageTest.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/test/java/datadog/trace/instrumentation/spark/SetupOpenLineageTest.java
@@ -27,107 +27,106 @@
 
 class SetupOpenLineageTest {
 
-  private static TestListener newListenerWithOpenLineage() {
-    TestListener listener = new TestListener(new SparkConf(), "some_app_id", "some_version");
-    // The constructor registers a JVM shutdown hook that finishes the application trace. In a plain
-    // unit test there is no registered tracer, so that hook would NPE at JVM exit. Mark the
-    // application as already ended so the hook short-circuits.
-    markApplicationEnded(listener);
-    listener.openLineageSparkListener = mock(SparkListenerInterface.class);
-    listener.openLineageSparkConf = new SparkConf();
-    return listener;
-  }
-
-  private static void markApplicationEnded(AbstractDatadogSparkListener listener) {
-    try {
-      Field applicationEnded =
-          AbstractDatadogSparkListener.class.getDeclaredField("applicationEnded");
-      applicationEnded.setAccessible(true);
-      applicationEnded.setBoolean(listener, true);
-    } catch (ReflectiveOperationException e) {
-      throw new IllegalStateException("Could not mark application as ended", e);
+    private static TestListener newListenerWithOpenLineage() {
+        TestListener listener = new TestListener(new SparkConf(), "some_app_id", "some_version");
+        // The constructor registers a JVM shutdown hook that finishes the application trace. In a plain
+        // unit test there is no registered tracer, so that hook would NPE at JVM exit. Mark the
+        // application as already ended so the hook short-circuits.
+        markApplicationEnded(listener);
+        listener.openLineageSparkListener = mock(SparkListenerInterface.class);
+        listener.openLineageSparkConf = new SparkConf();
+        return listener;
     }
-  }
-
-  private static List<String> runTags(TestListener listener) {
-    return Arrays.asList(
-        listener.openLineageSparkConf.get("spark.openlineage.run.tags").split(";"));
-  }
-
-  @Test
-  void addsOlEnvTagWhenEnvIsSet() {
-    TestListener listener = newListenerWithOpenLineage();
-
-    Config config = mock(Config.class);
-    when(config.getEnv()).thenReturn("my-env");
-    try (MockedStatic<Config> configMock = mockStatic(Config.class)) {
-      configMock.when(Config::get).thenReturn(config);
-      listener.setupOpenLineage(mock(DDTraceId.class));
-    }
-
-    assertTrue(runTags(listener).contains("_dd.ol_env:my-env"));
-  }
 
-  @Test
-  void omitsOlEnvTagWhenEnvIsEmpty() {
-    TestListener listener = newListenerWithOpenLineage();
-
-    Config config = mock(Config.class);
-    when(config.getEnv()).thenReturn("");
-    try (MockedStatic<Config> configMock = mockStatic(Config.class)) {
-      configMock.when(Config::get).thenReturn(config);
-      listener.setupOpenLineage(mock(DDTraceId.class));
+    private static void markApplicationEnded(AbstractDatadogSparkListener listener) {
+        try {
+            Field applicationEnded = AbstractDatadogSparkListener.class.getDeclaredField("applicationEnded");
+            applicationEnded.setAccessible(true);
+            applicationEnded.setBoolean(listener, true);
+        } catch (ReflectiveOperationException e) {
+            throw new IllegalStateException("Could not mark application as ended", e);
+        }
     }
 
-    assertFalse(
-        runTags(listener).stream().anyMatch(tag -> tag.startsWith("_dd.ol_env:")),
-        "No _dd.ol_env tag should be set when env is empty");
-  }
-
-  /**
-   * Minimal concrete listener so the version-agnostic {@link
-   * AbstractDatadogSparkListener#setupOpenLineage} logic can be exercised without a running Spark
-   * context. The scala-version-specific abstract methods are irrelevant here and return empty
-   * results.
-   */
-  private static class TestListener extends AbstractDatadogSparkListener {
-    TestListener(SparkConf sparkConf, String appId, String sparkVersion) {
-      super(sparkConf, appId, sparkVersion);
+    private static List<String> runTags(TestListener listener) {
+        return Arrays.asList(
+                listener.openLineageSparkConf.get("spark.openlineage.run.tags").split(";"));
     }
 
-    @Override
-    protected String getSparkJobName(SparkListenerJobStart jobStart) {
-      return null;
-    }
+    @Test
+    void addsOlEnvTagWhenEnvIsSet() {
+        TestListener listener = newListenerWithOpenLineage();
 
-    @Override
-    protected ArrayList<Integer> getSparkJobStageIds(SparkListenerJobStart jobStart) {
-      return new ArrayList<>();
-    }
+        Config config = mock(Config.class);
+        when(config.getEnv()).thenReturn("my-env");
+        try (MockedStatic<Config> configMock = mockStatic(Config.class)) {
+            configMock.when(Config::get).thenReturn(config);
+            listener.setupOpenLineage(mock(DDTraceId.class));
+        }
 
-    @Override
-    protected int getStageCount(SparkListenerJobStart jobStart) {
-      return 0;
+        assertTrue(runTags(listener).contains("_dd.ol_env:my-env"));
     }
 
-    @Override
-    protected Collection<SparkPlanInfo> getPlanInfoChildren(SparkPlanInfo info) {
-      return Collections.emptyList();
-    }
+    @Test
+    void omitsOlEnvTagWhenEnvIsEmpty() {
+        TestListener listener = newListenerWithOpenLineage();
 
-    @Override
-    protected List<SQLMetricInfo> getPlanInfoMetrics(SparkPlanInfo info) {
-      return Collections.emptyList();
-    }
+        Config config = mock(Config.class);
+        when(config.getEnv()).thenReturn("");
+        try (MockedStatic<Config> configMock = mockStatic(Config.class)) {
+            configMock.when(Config::get).thenReturn(config);
+            listener.setupOpenLineage(mock(DDTraceId.class));
+        }
 
-    @Override
-    protected int[] getStageParentIds(StageInfo info) {
-      return new int[0];
+        assertFalse(
+                runTags(listener).stream().anyMatch(tag -> tag.startsWith("_dd.ol_env:")),
+                "No _dd.ol_env tag should be set when env is empty");
     }
 
-    @Override
-    protected List<AccumulatorV2> getExternalAccumulators(TaskMetrics metrics) {
-      return Collections.emptyList();
+    /**
+     * Minimal concrete listener so the version-agnostic {@link
+     * AbstractDatadogSparkListener#setupOpenLineage} logic can be exercised without a running Spark
+     * context. The scala-version-specific abstract methods are irrelevant here and return empty
+     * results.
+     */
+    private static class TestListener extends AbstractDatadogSparkListener {
+        TestListener(SparkConf sparkConf, String appId, String sparkVersion) {
+            super(sparkConf, appId, sparkVersion);
+        }
+
+        @Override
+        protected String getSparkJobName(SparkListenerJobStart jobStart) {
+            return null;
+        }
+
+        @Override
+        protected ArrayList<Integer> getSparkJobStageIds(SparkListenerJobStart jobStart) {
+            return new ArrayList<>();
+        }
+
+        @Override
+        protected int getStageCount(SparkListenerJobStart jobStart) {
+            return 0;
+        }
+
+        @Override
+        protected Collection<SparkPlanInfo> getPlanInfoChildren(SparkPlanInfo info) {
+            return Collections.emptyList();
+        }
+
+        @Override
+        protected List<SQLMetricInfo> getPlanInfoMetrics(SparkPlanInfo info) {
+            return Collections.emptyList();
+        }
+
+        @Override
+        protected int[] getStageParentIds(StageInfo info) {
+            return new int[0];
+        }
+
+        @Override
+        protected List<AccumulatorV2> getExternalAccumulators(TaskMetrics metrics) {
+            return Collections.emptyList();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/java/datadog/trace/instrumentation/spark/SparkPlanSerializerTest.java b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/java/datadog/trace/instrumentation/spark/SparkPlanSerializerTest.java
index ee9e26a774c..916e77ef2df 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/java/datadog/trace/instrumentation/spark/SparkPlanSerializerTest.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/java/datadog/trace/instrumentation/spark/SparkPlanSerializerTest.java
@@ -4,8 +4,8 @@
 
 public class SparkPlanSerializerTest extends AbstractSparkPlanSerializer {
 
-  @Override
-  public String getKey(int idx, TreeNode node) {
-    return String.valueOf(idx);
-  }
+    @Override
+    public String getKey(int idx, TreeNode node) {
+        return String.valueOf(idx);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/java/datadog/trace/instrumentation/spark/TestSparkComputation.java b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/java/datadog/trace/instrumentation/spark/TestSparkComputation.java
index 2398186bf81..924888c70b7 100644
--- a/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/java/datadog/trace/instrumentation/spark/TestSparkComputation.java
+++ b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/java/datadog/trace/instrumentation/spark/TestSparkComputation.java
@@ -12,44 +12,43 @@
  * have a good support for groovy
  */
 public class TestSparkComputation {
-  public static void generateTestSparkComputation(SparkSession sparkSession) {
-    // This will generate 1 spark job that has two stages
-    // - the first because distinct will need a shuffle operation
-    // - the second one triggered by the count() action
-    sparkSession.sparkContext().range(1, 10, 1, 2).distinct().count();
-  }
+    public static void generateTestSparkComputation(SparkSession sparkSession) {
+        // This will generate 1 spark job that has two stages
+        // - the first because distinct will need a shuffle operation
+        // - the second one triggered by the count() action
+        sparkSession.sparkContext().range(1, 10, 1, 2).distinct().count();
+    }
 
-  public static void generateTestFailingSparkComputation(SparkSession sparkSession) {
-    sparkSession
-        .sparkContext()
-        .range(1, 10, 1, 2)
-        .toJavaRDD()
-        .map(x -> ((Long) null).toString())
-        .collect();
-  }
+    public static void generateTestFailingSparkComputation(SparkSession sparkSession) {
+        sparkSession
+                .sparkContext()
+                .range(1, 10, 1, 2)
+                .toJavaRDD()
+                .map(x -> ((Long) null).toString())
+                .collect();
+    }
 
-  public static StreamingQuery generateTestFailingStreamingComputation(Dataset<String> ds)
-      throws TimeoutException {
-    return ds.map((MapFunction<String, String>) x -> ((Long) null).toString(), Encoders.STRING())
-        .writeStream()
-        .queryName("failing-query")
-        .outputMode("append")
-        .format("console")
-        .start();
-  }
+    public static StreamingQuery generateTestFailingStreamingComputation(Dataset<String> ds) throws TimeoutException {
+        return ds.map((MapFunction<String, String>) x -> ((Long) null).toString(), Encoders.STRING())
+                .writeStream()
+                .queryName("failing-query")
+                .outputMode("append")
+                .format("console")
+                .start();
+    }
 
-  static class IdentityMapFunction implements MapFunction<String, String> {
-    @Override
-    public String call(String s) {
-      return s;
+    static class IdentityMapFunction implements MapFunction<String, String> {
+        @Override
+        public String call(String s) {
+            return s;
+        }
     }
-  }
 
-  public static Dataset<String> applyIdentityMapFunction(Dataset<String> ds) {
-    return ds.map(new IdentityMapFunction(), Encoders.STRING());
-  }
+    public static Dataset<String> applyIdentityMapFunction(Dataset<String> ds) {
+        return ds.map(new IdentityMapFunction(), Encoders.STRING());
+    }
 
-  public static String getSparkVersion() {
-    return org.apache.spark.package$.MODULE$.SPARK_VERSION();
-  }
+    public static String getSparkVersion() {
+        return org.apache.spark.package$.MODULE$.SPARK_VERSION();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java b/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java
index a618745bbed..e039b1e39fd 100644
--- a/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java
+++ b/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java
@@ -9,91 +9,95 @@
 import org.slf4j.LoggerFactory;
 
 public class SparkExecutorDecorator extends BaseDecorator {
-  private static final Logger log = LoggerFactory.getLogger(SparkExecutorDecorator.class);
+    private static final Logger log = LoggerFactory.getLogger(SparkExecutorDecorator.class);
 
-  public static final CharSequence SPARK_TASK = UTF8BytesString.create("spark.task");
-  public static final CharSequence SPARK = UTF8BytesString.create("spark");
-  public static SparkExecutorDecorator DECORATE = new SparkExecutorDecorator();
+    public static final CharSequence SPARK_TASK = UTF8BytesString.create("spark.task");
+    public static final CharSequence SPARK = UTF8BytesString.create("spark");
+    public static SparkExecutorDecorator DECORATE = new SparkExecutorDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"spark-executor"};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"spark-executor"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return SPARK;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
 
-  public void onTaskStart(AgentSpan span, Executor.TaskRunner taskRunner) {
-    span.setTag("task_id", taskRunner.taskId());
-    span.setTag("task_thread_name", taskRunner.threadName());
-  }
+    @Override
+    protected CharSequence component() {
+        return SPARK;
+    }
 
-  public final void onTaskEnd(AgentSpan span, Executor.TaskRunner taskRunner) {
-    try {
-      doOnTaskEnd(span, taskRunner);
-    } catch (Throwable t) {
-      log.debug("Failed to decorate span on task end", t);
+    public void onTaskStart(AgentSpan span, Executor.TaskRunner taskRunner) {
+        span.setTag("task_id", taskRunner.taskId());
+        span.setTag("task_thread_name", taskRunner.threadName());
     }
-  }
 
-  protected void doOnTaskEnd(AgentSpan span, Executor.TaskRunner taskRunner) {
-    // task is set by spark in run() by deserializing the task binary coming from the driver
-    if (taskRunner.task() == null) {
-      return;
+    public final void onTaskEnd(AgentSpan span, Executor.TaskRunner taskRunner) {
+        try {
+            doOnTaskEnd(span, taskRunner);
+        } catch (Throwable t) {
+            log.debug("Failed to decorate span on task end", t);
+        }
     }
 
-    span.setTag("stage_id", taskRunner.task().stageId());
-    span.setTag("stage_attempt_id", taskRunner.task().stageAttemptId());
+    protected void doOnTaskEnd(AgentSpan span, Executor.TaskRunner taskRunner) {
+        // task is set by spark in run() by deserializing the task binary coming from the driver
+        if (taskRunner.task() == null) {
+            return;
+        }
 
-    if (taskRunner.task().jobId().isDefined()) {
-      span.setTag("job_id", taskRunner.task().jobId().get());
-    }
-    if (taskRunner.task().appId().isDefined()) {
-      span.setTag("app_id", taskRunner.task().appId().get());
-    }
-    if (taskRunner.task().appAttemptId().isDefined()) {
-      span.setTag("app_attempt_id", taskRunner.task().appAttemptId().get());
-    }
-    span.setTag(
-        "application_name", taskRunner.task().localProperties().getProperty("spark.app.name"));
+        span.setTag("stage_id", taskRunner.task().stageId());
+        span.setTag("stage_attempt_id", taskRunner.task().stageAttemptId());
 
-    TaskMetrics metrics = taskRunner.task().metrics();
-    span.setMetric("spark.executor_deserialize_time", metrics.executorDeserializeTime());
-    span.setMetric("spark.executor_deserialize_cpu_time", metrics.executorDeserializeCpuTime());
-    span.setMetric("spark.executor_run_time", metrics.executorRunTime());
-    span.setMetric("spark.executor_cpu_time", metrics.executorCpuTime());
-    span.setMetric("spark.result_size", metrics.resultSize());
-    span.setMetric("spark.jvm_gc_time", metrics.jvmGCTime());
-    span.setMetric("spark.result_serialization_time", metrics.resultSerializationTime());
-    span.setMetric("spark.memory_bytes_spilled", metrics.memoryBytesSpilled());
-    span.setMetric("spark.disk_bytes_spilled", metrics.diskBytesSpilled());
-    span.setMetric("spark.peak_execution_memory", metrics.peakExecutionMemory());
+        if (taskRunner.task().jobId().isDefined()) {
+            span.setTag("job_id", taskRunner.task().jobId().get());
+        }
+        if (taskRunner.task().appId().isDefined()) {
+            span.setTag("app_id", taskRunner.task().appId().get());
+        }
+        if (taskRunner.task().appAttemptId().isDefined()) {
+            span.setTag("app_attempt_id", taskRunner.task().appAttemptId().get());
+        }
+        span.setTag("application_name", taskRunner.task().localProperties().getProperty("spark.app.name"));
 
-    span.setMetric("spark.input_bytes", metrics.inputMetrics().bytesRead());
-    span.setMetric("spark.input_records", metrics.inputMetrics().recordsRead());
-    span.setMetric("spark.output_bytes", metrics.outputMetrics().bytesWritten());
-    span.setMetric("spark.output_records", metrics.outputMetrics().recordsWritten());
+        TaskMetrics metrics = taskRunner.task().metrics();
+        span.setMetric("spark.executor_deserialize_time", metrics.executorDeserializeTime());
+        span.setMetric("spark.executor_deserialize_cpu_time", metrics.executorDeserializeCpuTime());
+        span.setMetric("spark.executor_run_time", metrics.executorRunTime());
+        span.setMetric("spark.executor_cpu_time", metrics.executorCpuTime());
+        span.setMetric("spark.result_size", metrics.resultSize());
+        span.setMetric("spark.jvm_gc_time", metrics.jvmGCTime());
+        span.setMetric("spark.result_serialization_time", metrics.resultSerializationTime());
+        span.setMetric("spark.memory_bytes_spilled", metrics.memoryBytesSpilled());
+        span.setMetric("spark.disk_bytes_spilled", metrics.diskBytesSpilled());
+        span.setMetric("spark.peak_execution_memory", metrics.peakExecutionMemory());
 
-    span.setMetric("spark.shuffle_read_bytes", metrics.shuffleReadMetrics().totalBytesRead());
-    span.setMetric("spark.shuffle_read_bytes_local", metrics.shuffleReadMetrics().localBytesRead());
-    span.setMetric(
-        "spark.shuffle_read_bytes_remote", metrics.shuffleReadMetrics().remoteBytesRead());
-    span.setMetric(
-        "spark.shuffle_read_bytes_remote_to_disk",
-        metrics.shuffleReadMetrics().remoteBytesReadToDisk());
-    span.setMetric(
-        "spark.shuffle_read_fetch_wait_time", metrics.shuffleReadMetrics().fetchWaitTime());
-    span.setMetric("spark.shuffle_read_records", metrics.shuffleReadMetrics().recordsRead());
+        span.setMetric("spark.input_bytes", metrics.inputMetrics().bytesRead());
+        span.setMetric("spark.input_records", metrics.inputMetrics().recordsRead());
+        span.setMetric("spark.output_bytes", metrics.outputMetrics().bytesWritten());
+        span.setMetric("spark.output_records", metrics.outputMetrics().recordsWritten());
 
-    span.setMetric("spark.shuffle_write_bytes", metrics.shuffleWriteMetrics().bytesWritten());
-    span.setMetric("spark.shuffle_write_records", metrics.shuffleWriteMetrics().recordsWritten());
-    span.setMetric("spark.shuffle_write_time", metrics.shuffleWriteMetrics().writeTime());
-  }
+        span.setMetric("spark.shuffle_read_bytes", metrics.shuffleReadMetrics().totalBytesRead());
+        span.setMetric(
+                "spark.shuffle_read_bytes_local", metrics.shuffleReadMetrics().localBytesRead());
+        span.setMetric(
+                "spark.shuffle_read_bytes_remote", metrics.shuffleReadMetrics().remoteBytesRead());
+        span.setMetric(
+                "spark.shuffle_read_bytes_remote_to_disk",
+                metrics.shuffleReadMetrics().remoteBytesReadToDisk());
+        span.setMetric(
+                "spark.shuffle_read_fetch_wait_time",
+                metrics.shuffleReadMetrics().fetchWaitTime());
+        span.setMetric(
+                "spark.shuffle_read_records", metrics.shuffleReadMetrics().recordsRead());
+
+        span.setMetric(
+                "spark.shuffle_write_bytes", metrics.shuffleWriteMetrics().bytesWritten());
+        span.setMetric(
+                "spark.shuffle_write_records", metrics.shuffleWriteMetrics().recordsWritten());
+        span.setMetric("spark.shuffle_write_time", metrics.shuffleWriteMetrics().writeTime());
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java b/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java
index 8eb096f5e09..ea4af28789b 100644
--- a/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java
+++ b/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java
@@ -19,55 +19,53 @@
 
 @AutoService(InstrumenterModule.class)
 public class SparkExecutorInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public SparkExecutorInstrumentation() {
-    super("spark-executor");
-  }
+    public SparkExecutorInstrumentation() {
+        super("spark-executor");
+    }
 
-  @Override
-  public boolean defaultEnabled() {
-    return false;
-  }
+    @Override
+    public boolean defaultEnabled() {
+        return false;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.spark.executor.Executor$TaskRunner";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.spark.executor.Executor$TaskRunner";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("run"))
-            .and(isDeclaredBy(named("org.apache.spark.executor.Executor$TaskRunner"))),
-        SparkExecutorInstrumentation.class.getName() + "$RunAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("run")).and(isDeclaredBy(named("org.apache.spark.executor.Executor$TaskRunner"))),
+                SparkExecutorInstrumentation.class.getName() + "$RunAdvice");
+    }
 
-  public static final class RunAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope enter(@Advice.This Executor.TaskRunner taskRunner) {
-      final AgentSpan span = startSpan("spark", SPARK_TASK);
+    public static final class RunAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope enter(@Advice.This Executor.TaskRunner taskRunner) {
+            final AgentSpan span = startSpan("spark", SPARK_TASK);
 
-      DECORATE.afterStart(span);
-      DECORATE.onTaskStart(span, taskRunner);
+            DECORATE.afterStart(span);
+            DECORATE.onTaskStart(span, taskRunner);
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(
-        @Advice.Enter final ContextScope scope, @Advice.This final Executor.TaskRunner taskRunner) {
-      if (scope == null) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void exit(
+                @Advice.Enter final ContextScope scope, @Advice.This final Executor.TaskRunner taskRunner) {
+            if (scope == null) {
+                return;
+            }
 
-      final AgentSpan span = spanFromScope(scope);
+            final AgentSpan span = spanFromScope(scope);
 
-      DECORATE.onTaskEnd(span, taskRunner);
-      DECORATE.beforeFinish(scope);
-      scope.close();
-      span.finish();
+            DECORATE.onTaskEnd(span, taskRunner);
+            DECORATE.beforeFinish(scope);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/DatadogSpark212Listener.java b/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/DatadogSpark212Listener.java
index 31ff513880f..f285b5bbaa0 100644
--- a/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/DatadogSpark212Listener.java
+++ b/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/DatadogSpark212Listener.java
@@ -24,81 +24,78 @@
  * compiled with the specific scala version
  */
 public class DatadogSpark212Listener extends AbstractDatadogSparkListener {
-  private static final MethodHandles methodLoader =
-      new MethodHandles(ClassLoader.getSystemClassLoader());
-  private static final MethodHandle externalAccums =
-      methodLoader.method(TaskMetrics.class, "externalAccums");
-  private static final MethodHandle withExternalAccums =
-      methodLoader.method(TaskMetrics.class, "withExternalAccums", new Class[] {Function1.class});
+    private static final MethodHandles methodLoader = new MethodHandles(ClassLoader.getSystemClassLoader());
+    private static final MethodHandle externalAccums = methodLoader.method(TaskMetrics.class, "externalAccums");
+    private static final MethodHandle withExternalAccums =
+            methodLoader.method(TaskMetrics.class, "withExternalAccums", new Class[] {Function1.class});
 
-  public DatadogSpark212Listener(SparkConf sparkConf, String appId, String sparkVersion) {
-    super(sparkConf, appId, sparkVersion);
-  }
-
-  @Override
-  protected ArrayList<Integer> getSparkJobStageIds(SparkListenerJobStart jobStart) {
-    ArrayList<Integer> javaIds = new ArrayList<>(jobStart.stageInfos().length());
-    jobStart.stageInfos().foreach(stage -> javaIds.add(stage.stageId()));
-    return javaIds;
-  }
+    public DatadogSpark212Listener(SparkConf sparkConf, String appId, String sparkVersion) {
+        super(sparkConf, appId, sparkVersion);
+    }
 
-  @Override
-  protected String getSparkJobName(SparkListenerJobStart jobStart) {
-    if (jobStart.stageInfos().nonEmpty()) {
-      // In the spark UI, the name of a job is the name of its last stage
-      return jobStart.stageInfos().last().name();
+    @Override
+    protected ArrayList<Integer> getSparkJobStageIds(SparkListenerJobStart jobStart) {
+        ArrayList<Integer> javaIds = new ArrayList<>(jobStart.stageInfos().length());
+        jobStart.stageInfos().foreach(stage -> javaIds.add(stage.stageId()));
+        return javaIds;
     }
 
-    return null;
-  }
+    @Override
+    protected String getSparkJobName(SparkListenerJobStart jobStart) {
+        if (jobStart.stageInfos().nonEmpty()) {
+            // In the spark UI, the name of a job is the name of its last stage
+            return jobStart.stageInfos().last().name();
+        }
 
-  @Override
-  protected int getStageCount(SparkListenerJobStart jobStart) {
-    return jobStart.stageInfos().length();
-  }
+        return null;
+    }
 
-  @Override
-  protected Collection<SparkPlanInfo> getPlanInfoChildren(SparkPlanInfo info) {
-    return JavaConverters.asJavaCollection(info.children());
-  }
+    @Override
+    protected int getStageCount(SparkListenerJobStart jobStart) {
+        return jobStart.stageInfos().length();
+    }
 
-  @Override
-  protected List<SQLMetricInfo> getPlanInfoMetrics(SparkPlanInfo info) {
-    return JavaConverters.seqAsJavaList(info.metrics());
-  }
+    @Override
+    protected Collection<SparkPlanInfo> getPlanInfoChildren(SparkPlanInfo info) {
+        return JavaConverters.asJavaCollection(info.children());
+    }
 
-  @Override
-  protected int[] getStageParentIds(StageInfo info) {
-    int[] parentIds = new int[info.parentIds().length()];
-    for (int i = 0; i < parentIds.length; i++) {
-      parentIds[i] = (int) info.parentIds().apply(i);
+    @Override
+    protected List<SQLMetricInfo> getPlanInfoMetrics(SparkPlanInfo info) {
+        return JavaConverters.seqAsJavaList(info.metrics());
     }
 
-    return parentIds;
-  }
+    @Override
+    protected int[] getStageParentIds(StageInfo info) {
+        int[] parentIds = new int[info.parentIds().length()];
+        for (int i = 0; i < parentIds.length; i++) {
+            parentIds[i] = (int) info.parentIds().apply(i);
+        }
 
-  @Override
-  protected List<AccumulatorV2> getExternalAccumulators(TaskMetrics metrics) {
-    if (metrics == null) {
-      return null;
+        return parentIds;
     }
 
-    Function1 lambda =
-        (Function1<ArrayBuffer<AccumulatorV2>, List<AccumulatorV2>>)
-            accumulators -> JavaConverters.seqAsJavaList(accumulators);
-    List<AccumulatorV2> res = methodLoader.invoke(withExternalAccums, metrics, lambda);
-    if (res != null) {
-      return res;
-    }
+    @Override
+    protected List<AccumulatorV2> getExternalAccumulators(TaskMetrics metrics) {
+        if (metrics == null) {
+            return null;
+        }
 
-    // withExternalAccums didn't work, try the legacy method
-    // Use Seq (not ArrayBuffer) since some Spark distributions (e.g. Amazon EMR) return a
-    // JListWrapper which implements Seq but cannot be cast to ArrayBuffer
-    Seq<AccumulatorV2> accumulators = methodLoader.invoke(externalAccums, metrics);
-    if (accumulators != null && !accumulators.isEmpty()) {
-      return JavaConverters.seqAsJavaList(accumulators);
-    }
+        Function1 lambda = (Function1<ArrayBuffer<AccumulatorV2>, List<AccumulatorV2>>)
+                accumulators -> JavaConverters.seqAsJavaList(accumulators);
+        List<AccumulatorV2> res = methodLoader.invoke(withExternalAccums, metrics, lambda);
+        if (res != null) {
+            return res;
+        }
 
-    return null;
-  }
+        // withExternalAccums didn't work, try the legacy method
+        // Use Seq (not ArrayBuffer) since some Spark distributions (e.g. Amazon EMR) return a
+        // JListWrapper which implements Seq but cannot be cast to ArrayBuffer
+        Seq<AccumulatorV2> accumulators = methodLoader.invoke(externalAccums, metrics);
+        if (accumulators != null && !accumulators.isEmpty()) {
+            return JavaConverters.seqAsJavaList(accumulators);
+        }
+
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212Instrumentation.java b/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212Instrumentation.java
index 2bd8c6f27eb..561fcbef042 100644
--- a/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212Instrumentation.java
+++ b/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212Instrumentation.java
@@ -22,104 +22,98 @@
 
 @AutoService(InstrumenterModule.class)
 public class Spark212Instrumentation extends AbstractSparkInstrumentation {
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".AbstractDatadogSparkListener",
-      packageName + ".AbstractSparkPlanSerializer",
-      packageName + ".AbstractSparkPlanUtils",
-      packageName + ".DatabricksParentContext",
-      packageName + ".EmrUtils",
-      packageName + ".OpenlineageParentContext",
-      packageName + ".DatadogSpark212Listener",
-      packageName + ".PredeterminedTraceIdContext",
-      packageName + ".RemoveEldestHashMap",
-      packageName + ".SparkAggregatedTaskMetrics",
-      packageName + ".SparkConfAllowList",
-      packageName + ".SparkLauncherListener",
-      packageName + ".SparkSQLUtils",
-      packageName + ".SparkSQLUtils$SparkPlanInfoForStage",
-      packageName + ".Spark212PlanSerializer",
-      packageName + ".Spark212PlanUtils"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".AbstractDatadogSparkListener",
+            packageName + ".AbstractSparkPlanSerializer",
+            packageName + ".AbstractSparkPlanUtils",
+            packageName + ".DatabricksParentContext",
+            packageName + ".EmrUtils",
+            packageName + ".OpenlineageParentContext",
+            packageName + ".DatadogSpark212Listener",
+            packageName + ".PredeterminedTraceIdContext",
+            packageName + ".RemoveEldestHashMap",
+            packageName + ".SparkAggregatedTaskMetrics",
+            packageName + ".SparkConfAllowList",
+            packageName + ".SparkLauncherListener",
+            packageName + ".SparkSQLUtils",
+            packageName + ".SparkSQLUtils$SparkPlanInfoForStage",
+            packageName + ".Spark212PlanSerializer",
+            packageName + ".Spark212PlanUtils"
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        super.methodAdvice(transformer);
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    super.methodAdvice(transformer);
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("setupAndStartListenerBus"))
+                        .and(isDeclaredBy(named("org.apache.spark.SparkContext")))
+                        .and(takesNoArguments()),
+                Spark212Instrumentation.class.getName() + "$InjectListener");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("setupAndStartListenerBus"))
-            .and(isDeclaredBy(named("org.apache.spark.SparkContext")))
-            .and(takesNoArguments()),
-        Spark212Instrumentation.class.getName() + "$InjectListener");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("fromSparkPlan"))
+                        .and(takesArgument(0, named("org.apache.spark.sql.execution.SparkPlan")))
+                        .and(isDeclaredBy(named("org.apache.spark.sql.execution.SparkPlanInfo$"))),
+                Spark212Instrumentation.class.getName() + "$SparkPlanInfoAdvice");
+    }
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("fromSparkPlan"))
-            .and(takesArgument(0, named("org.apache.spark.sql.execution.SparkPlan")))
-            .and(isDeclaredBy(named("org.apache.spark.sql.execution.SparkPlanInfo$"))),
-        Spark212Instrumentation.class.getName() + "$SparkPlanInfoAdvice");
-  }
+    public static class InjectListener {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(@Advice.This SparkContext sparkContext) {
+            Logger log = LoggerFactory.getLogger("Spark212InjectListener");
+            if (Config.get().isDataJobsOpenLineageEnabled()
+                    && AbstractDatadogSparkListener.classIsLoadable(
+                            "io.openlineage.spark.agent.OpenLineageSparkListener")
+                    && AbstractDatadogSparkListener.classIsLoadable(
+                            "io.openlineage.spark.agent.facets.builder.TagsRunFacetBuilder")) {
+                if (!sparkContext.conf().contains("spark.extraListeners")) {
+                    log.debug("spark.extraListeners does not contain any listeners. Adding OpenLineage");
+                    sparkContext
+                            .conf()
+                            .set("spark.extraListeners", "io.openlineage.spark.agent.OpenLineageSparkListener");
+                } else {
+                    String extraListeners = sparkContext.conf().get("spark.extraListeners");
+                    if (!extraListeners.contains("io.openlineage.spark.agent.OpenLineageSparkListener")) {
+                        log.debug("spark.extraListeners does contain listeners {}. Adding OpenLineage", extraListeners);
+                        sparkContext
+                                .conf()
+                                .set(
+                                        "spark.extraListeners",
+                                        extraListeners + ",io.openlineage.spark.agent.OpenLineageSparkListener");
+                    }
+                }
+            }
 
-  public static class InjectListener {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(@Advice.This SparkContext sparkContext) {
-      Logger log = LoggerFactory.getLogger("Spark212InjectListener");
-      if (Config.get().isDataJobsOpenLineageEnabled()
-          && AbstractDatadogSparkListener.classIsLoadable(
-              "io.openlineage.spark.agent.OpenLineageSparkListener")
-          && AbstractDatadogSparkListener.classIsLoadable(
-              "io.openlineage.spark.agent.facets.builder.TagsRunFacetBuilder")) {
-        if (!sparkContext.conf().contains("spark.extraListeners")) {
-          log.debug("spark.extraListeners does not contain any listeners. Adding OpenLineage");
-          sparkContext
-              .conf()
-              .set("spark.extraListeners", "io.openlineage.spark.agent.OpenLineageSparkListener");
-        } else {
-          String extraListeners = sparkContext.conf().get("spark.extraListeners");
-          if (!extraListeners.contains("io.openlineage.spark.agent.OpenLineageSparkListener")) {
-            log.debug(
-                "spark.extraListeners does contain listeners {}. Adding OpenLineage",
-                extraListeners);
-            sparkContext
-                .conf()
-                .set(
-                    "spark.extraListeners",
-                    extraListeners + ",io.openlineage.spark.agent.OpenLineageSparkListener");
-          }
+            // We want to add the Datadog listener as the first listener
+            AbstractDatadogSparkListener.listener = new DatadogSpark212Listener(
+                    sparkContext.getConf(), sparkContext.applicationId(), sparkContext.version());
+            sparkContext.listenerBus().addToSharedQueue(AbstractDatadogSparkListener.listener);
         }
-      }
-
-      // We want to add the Datadog listener as the first listener
-      AbstractDatadogSparkListener.listener =
-          new DatadogSpark212Listener(
-              sparkContext.getConf(), sparkContext.applicationId(), sparkContext.version());
-      sparkContext.listenerBus().addToSharedQueue(AbstractDatadogSparkListener.listener);
     }
-  }
 
-  public static class SparkPlanInfoAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    @SuppressForbidden
-    public static void exit(
-        @Advice.Return(readOnly = false) SparkPlanInfo planInfo,
-        @Advice.Argument(0) SparkPlan plan) {
-      if (planInfo.metadata().size() == 0
-          && (Config.get().isDataJobsParseSparkPlanEnabled()
-              || Config.get().isDataJobsExperimentalFeaturesEnabled())) {
-        Spark212PlanSerializer planSerializer = new Spark212PlanSerializer();
-        Map<String, String> meta =
-            JavaConverters.mapAsScalaMap(planSerializer.extractFormattedProduct(plan))
-                .toMap(Predef.$conforms());
+    public static class SparkPlanInfoAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        @SuppressForbidden
+        public static void exit(
+                @Advice.Return(readOnly = false) SparkPlanInfo planInfo, @Advice.Argument(0) SparkPlan plan) {
+            if (planInfo.metadata().size() == 0
+                    && (Config.get().isDataJobsParseSparkPlanEnabled()
+                            || Config.get().isDataJobsExperimentalFeaturesEnabled())) {
+                Spark212PlanSerializer planSerializer = new Spark212PlanSerializer();
+                Map<String, String> meta = JavaConverters.mapAsScalaMap(planSerializer.extractFormattedProduct(plan))
+                        .toMap(Predef.$conforms());
 
-        SparkPlanInfo newPlanInfo =
-            new Spark212PlanUtils().upsertSparkPlanInfoMetadata(planInfo, meta);
-        if (newPlanInfo != null) {
-          planInfo = newPlanInfo;
+                SparkPlanInfo newPlanInfo = new Spark212PlanUtils().upsertSparkPlanInfoMetadata(planInfo, meta);
+                if (newPlanInfo != null) {
+                    planInfo = newPlanInfo;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212PlanSerializer.java b/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212PlanSerializer.java
index 56222073a04..d1efc3d4e6d 100644
--- a/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212PlanSerializer.java
+++ b/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212PlanSerializer.java
@@ -3,8 +3,8 @@
 import org.apache.spark.sql.catalyst.trees.TreeNode;
 
 public class Spark212PlanSerializer extends AbstractSparkPlanSerializer {
-  @Override
-  public String getKey(int idx, TreeNode node) {
-    return "_dd.unknown_key." + idx;
-  }
+    @Override
+    public String getKey(int idx, TreeNode node) {
+        return "_dd.unknown_key." + idx;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212PlanUtils.java b/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212PlanUtils.java
index 4d9bef21cdd..59e751a0827 100644
--- a/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212PlanUtils.java
+++ b/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212PlanUtils.java
@@ -6,40 +6,37 @@
 import scala.collection.immutable.Map;
 
 public class Spark212PlanUtils extends AbstractSparkPlanUtils {
-  private static final MethodHandle constructor =
-      methodLoader.constructor(
-          SparkPlanInfo.class,
-          String.class,
-          String.class,
-          scala.collection.Seq.class,
-          scala.collection.immutable.Map.class,
-          scala.collection.Seq.class);
-  private static final MethodHandle databricksConstructor =
-      methodLoader.constructor(
-          SparkPlanInfo.class,
-          String.class,
-          String.class,
-          scala.collection.Seq.class,
-          scala.collection.immutable.Map.class,
-          scala.collection.Seq.class,
-          Option.class,
-          String.class,
-          Option.class);
+    private static final MethodHandle constructor = methodLoader.constructor(
+            SparkPlanInfo.class,
+            String.class,
+            String.class,
+            scala.collection.Seq.class,
+            scala.collection.immutable.Map.class,
+            scala.collection.Seq.class);
+    private static final MethodHandle databricksConstructor = methodLoader.constructor(
+            SparkPlanInfo.class,
+            String.class,
+            String.class,
+            scala.collection.Seq.class,
+            scala.collection.immutable.Map.class,
+            scala.collection.Seq.class,
+            Option.class,
+            String.class,
+            Option.class);
 
-  @Override
-  protected MethodHandle getConstructor() {
-    return constructor;
-  }
+    @Override
+    protected MethodHandle getConstructor() {
+        return constructor;
+    }
 
-  @Override
-  protected MethodHandle getDatabricksConstructor() {
-    return databricksConstructor;
-  }
+    @Override
+    protected MethodHandle getDatabricksConstructor() {
+        return databricksConstructor;
+    }
 
-  @Override
-  protected Object[] getStandardArgs(SparkPlanInfo planInfo, Map meta) {
-    return new Object[] {
-      planInfo.nodeName(), planInfo.simpleString(), planInfo.children(), meta, planInfo.metrics()
-    };
-  }
+    @Override
+    protected Object[] getStandardArgs(SparkPlanInfo planInfo, Map meta) {
+        return new Object[] {planInfo.nodeName(), planInfo.simpleString(), planInfo.children(), meta, planInfo.metrics()
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/DatadogSpark213Listener.java b/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/DatadogSpark213Listener.java
index 91c3a1bd511..7b11b22d5f9 100644
--- a/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/DatadogSpark213Listener.java
+++ b/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/DatadogSpark213Listener.java
@@ -24,81 +24,78 @@
  * compiled with the specific scala version
  */
 public class DatadogSpark213Listener extends AbstractDatadogSparkListener {
-  private static final MethodHandles methodLoader =
-      new MethodHandles(ClassLoader.getSystemClassLoader());
-  private static final MethodHandle externalAccums =
-      methodLoader.method(TaskMetrics.class, "externalAccums");
-  private static final MethodHandle withExternalAccums =
-      methodLoader.method(TaskMetrics.class, "withExternalAccums", new Class[] {Function1.class});
+    private static final MethodHandles methodLoader = new MethodHandles(ClassLoader.getSystemClassLoader());
+    private static final MethodHandle externalAccums = methodLoader.method(TaskMetrics.class, "externalAccums");
+    private static final MethodHandle withExternalAccums =
+            methodLoader.method(TaskMetrics.class, "withExternalAccums", new Class[] {Function1.class});
 
-  public DatadogSpark213Listener(SparkConf sparkConf, String appId, String sparkVersion) {
-    super(sparkConf, appId, sparkVersion);
-  }
-
-  @Override
-  protected ArrayList<Integer> getSparkJobStageIds(SparkListenerJobStart jobStart) {
-    ArrayList<Integer> javaIds = new ArrayList<>(jobStart.stageInfos().length());
-    jobStart.stageInfos().foreach(stage -> javaIds.add(stage.stageId()));
-    return javaIds;
-  }
+    public DatadogSpark213Listener(SparkConf sparkConf, String appId, String sparkVersion) {
+        super(sparkConf, appId, sparkVersion);
+    }
 
-  @Override
-  protected String getSparkJobName(SparkListenerJobStart jobStart) {
-    if (jobStart.stageInfos().nonEmpty()) {
-      // In the spark UI, the name of a job is the name of its last stage
-      return jobStart.stageInfos().last().name();
+    @Override
+    protected ArrayList<Integer> getSparkJobStageIds(SparkListenerJobStart jobStart) {
+        ArrayList<Integer> javaIds = new ArrayList<>(jobStart.stageInfos().length());
+        jobStart.stageInfos().foreach(stage -> javaIds.add(stage.stageId()));
+        return javaIds;
     }
 
-    return null;
-  }
+    @Override
+    protected String getSparkJobName(SparkListenerJobStart jobStart) {
+        if (jobStart.stageInfos().nonEmpty()) {
+            // In the spark UI, the name of a job is the name of its last stage
+            return jobStart.stageInfos().last().name();
+        }
 
-  @Override
-  protected int getStageCount(SparkListenerJobStart jobStart) {
-    return jobStart.stageInfos().length();
-  }
+        return null;
+    }
 
-  @Override
-  protected Collection<SparkPlanInfo> getPlanInfoChildren(SparkPlanInfo info) {
-    return CollectionConverters.asJavaCollection(info.children());
-  }
+    @Override
+    protected int getStageCount(SparkListenerJobStart jobStart) {
+        return jobStart.stageInfos().length();
+    }
 
-  @Override
-  protected List<SQLMetricInfo> getPlanInfoMetrics(SparkPlanInfo info) {
-    return CollectionConverters.asJava(info.metrics());
-  }
+    @Override
+    protected Collection<SparkPlanInfo> getPlanInfoChildren(SparkPlanInfo info) {
+        return CollectionConverters.asJavaCollection(info.children());
+    }
 
-  @Override
-  protected int[] getStageParentIds(StageInfo info) {
-    int[] parentIds = new int[info.parentIds().length()];
-    for (int i = 0; i < parentIds.length; i++) {
-      parentIds[i] = (int) info.parentIds().apply(i);
+    @Override
+    protected List<SQLMetricInfo> getPlanInfoMetrics(SparkPlanInfo info) {
+        return CollectionConverters.asJava(info.metrics());
     }
 
-    return parentIds;
-  }
+    @Override
+    protected int[] getStageParentIds(StageInfo info) {
+        int[] parentIds = new int[info.parentIds().length()];
+        for (int i = 0; i < parentIds.length; i++) {
+            parentIds[i] = (int) info.parentIds().apply(i);
+        }
 
-  @Override
-  protected List<AccumulatorV2> getExternalAccumulators(TaskMetrics metrics) {
-    if (metrics == null) {
-      return null;
+        return parentIds;
     }
 
-    Function1 lambda =
-        (Function1<ArrayBuffer<AccumulatorV2>, List<AccumulatorV2>>)
-            accumulators -> CollectionConverters.asJava(accumulators);
-    List<AccumulatorV2> res = methodLoader.invoke(withExternalAccums, metrics, lambda);
-    if (res != null) {
-      return res;
-    }
+    @Override
+    protected List<AccumulatorV2> getExternalAccumulators(TaskMetrics metrics) {
+        if (metrics == null) {
+            return null;
+        }
 
-    // withExternalAccums didn't work, try the legacy method
-    // Use Seq (not ArrayBuffer) since some Spark distributions (e.g. Amazon EMR) return a
-    // JListWrapper which implements Seq but cannot be cast to ArrayBuffer
-    Seq<AccumulatorV2> accumulators = methodLoader.invoke(externalAccums, metrics);
-    if (accumulators != null && !accumulators.isEmpty()) {
-      return CollectionConverters.asJava(accumulators);
-    }
+        Function1 lambda = (Function1<ArrayBuffer<AccumulatorV2>, List<AccumulatorV2>>)
+                accumulators -> CollectionConverters.asJava(accumulators);
+        List<AccumulatorV2> res = methodLoader.invoke(withExternalAccums, metrics, lambda);
+        if (res != null) {
+            return res;
+        }
 
-    return null;
-  }
+        // withExternalAccums didn't work, try the legacy method
+        // Use Seq (not ArrayBuffer) since some Spark distributions (e.g. Amazon EMR) return a
+        // JListWrapper which implements Seq but cannot be cast to ArrayBuffer
+        Seq<AccumulatorV2> accumulators = methodLoader.invoke(externalAccums, metrics);
+        if (accumulators != null && !accumulators.isEmpty()) {
+            return CollectionConverters.asJava(accumulators);
+        }
+
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213Instrumentation.java b/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213Instrumentation.java
index bbd319614b4..b6f01dac5a1 100644
--- a/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213Instrumentation.java
+++ b/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213Instrumentation.java
@@ -22,104 +22,99 @@
 
 @AutoService(InstrumenterModule.class)
 public class Spark213Instrumentation extends AbstractSparkInstrumentation {
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".AbstractDatadogSparkListener",
-      packageName + ".AbstractSparkPlanSerializer",
-      packageName + ".AbstractSparkPlanUtils",
-      packageName + ".DatabricksParentContext",
-      packageName + ".EmrUtils",
-      packageName + ".OpenlineageParentContext",
-      packageName + ".DatadogSpark213Listener",
-      packageName + ".PredeterminedTraceIdContext",
-      packageName + ".RemoveEldestHashMap",
-      packageName + ".SparkAggregatedTaskMetrics",
-      packageName + ".SparkConfAllowList",
-      packageName + ".SparkLauncherListener",
-      packageName + ".SparkSQLUtils",
-      packageName + ".SparkSQLUtils$SparkPlanInfoForStage",
-      packageName + ".Spark213PlanSerializer",
-      packageName + ".Spark213PlanUtils"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".AbstractDatadogSparkListener",
+            packageName + ".AbstractSparkPlanSerializer",
+            packageName + ".AbstractSparkPlanUtils",
+            packageName + ".DatabricksParentContext",
+            packageName + ".EmrUtils",
+            packageName + ".OpenlineageParentContext",
+            packageName + ".DatadogSpark213Listener",
+            packageName + ".PredeterminedTraceIdContext",
+            packageName + ".RemoveEldestHashMap",
+            packageName + ".SparkAggregatedTaskMetrics",
+            packageName + ".SparkConfAllowList",
+            packageName + ".SparkLauncherListener",
+            packageName + ".SparkSQLUtils",
+            packageName + ".SparkSQLUtils$SparkPlanInfoForStage",
+            packageName + ".Spark213PlanSerializer",
+            packageName + ".Spark213PlanUtils"
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        super.methodAdvice(transformer);
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    super.methodAdvice(transformer);
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("setupAndStartListenerBus"))
+                        .and(isDeclaredBy(named("org.apache.spark.SparkContext")))
+                        .and(takesNoArguments()),
+                Spark213Instrumentation.class.getName() + "$InjectListener");
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("setupAndStartListenerBus"))
-            .and(isDeclaredBy(named("org.apache.spark.SparkContext")))
-            .and(takesNoArguments()),
-        Spark213Instrumentation.class.getName() + "$InjectListener");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("fromSparkPlan"))
+                        .and(takesArgument(0, named("org.apache.spark.sql.execution.SparkPlan")))
+                        .and(isDeclaredBy(named("org.apache.spark.sql.execution.SparkPlanInfo$"))),
+                Spark213Instrumentation.class.getName() + "$SparkPlanInfoAdvice");
+    }
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("fromSparkPlan"))
-            .and(takesArgument(0, named("org.apache.spark.sql.execution.SparkPlan")))
-            .and(isDeclaredBy(named("org.apache.spark.sql.execution.SparkPlanInfo$"))),
-        Spark213Instrumentation.class.getName() + "$SparkPlanInfoAdvice");
-  }
+    public static class InjectListener {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(@Advice.This SparkContext sparkContext) {
+            // checking whether OpenLineage integration is enabled, available and that it supports tags
+            Logger log = LoggerFactory.getLogger("Spark212InjectListener");
+            if (Config.get().isDataJobsOpenLineageEnabled()
+                    && AbstractDatadogSparkListener.classIsLoadable(
+                            "io.openlineage.spark.agent.OpenLineageSparkListener")
+                    && AbstractDatadogSparkListener.classIsLoadable(
+                            "io.openlineage.spark.agent.facets.builder.TagsRunFacetBuilder")) {
+                if (!sparkContext.conf().contains("spark.extraListeners")) {
+                    log.debug("spark.extraListeners does not contain any listeners. Adding OpenLineage");
+                    sparkContext
+                            .conf()
+                            .set("spark.extraListeners", "io.openlineage.spark.agent.OpenLineageSparkListener");
+                } else {
+                    String extraListeners = sparkContext.conf().get("spark.extraListeners");
+                    if (!extraListeners.contains("io.openlineage.spark.agent.OpenLineageSparkListener")) {
+                        log.debug("spark.extraListeners does contain listeners {}. Adding OpenLineage", extraListeners);
+                        sparkContext
+                                .conf()
+                                .set(
+                                        "spark.extraListeners",
+                                        extraListeners + ",io.openlineage.spark.agent.OpenLineageSparkListener");
+                    }
+                }
+            }
 
-  public static class InjectListener {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(@Advice.This SparkContext sparkContext) {
-      // checking whether OpenLineage integration is enabled, available and that it supports tags
-      Logger log = LoggerFactory.getLogger("Spark212InjectListener");
-      if (Config.get().isDataJobsOpenLineageEnabled()
-          && AbstractDatadogSparkListener.classIsLoadable(
-              "io.openlineage.spark.agent.OpenLineageSparkListener")
-          && AbstractDatadogSparkListener.classIsLoadable(
-              "io.openlineage.spark.agent.facets.builder.TagsRunFacetBuilder")) {
-        if (!sparkContext.conf().contains("spark.extraListeners")) {
-          log.debug("spark.extraListeners does not contain any listeners. Adding OpenLineage");
-          sparkContext
-              .conf()
-              .set("spark.extraListeners", "io.openlineage.spark.agent.OpenLineageSparkListener");
-        } else {
-          String extraListeners = sparkContext.conf().get("spark.extraListeners");
-          if (!extraListeners.contains("io.openlineage.spark.agent.OpenLineageSparkListener")) {
-            log.debug(
-                "spark.extraListeners does contain listeners {}. Adding OpenLineage",
-                extraListeners);
-            sparkContext
-                .conf()
-                .set(
-                    "spark.extraListeners",
-                    extraListeners + ",io.openlineage.spark.agent.OpenLineageSparkListener");
-          }
+            // We want to add the Datadog listener as the first listener
+            AbstractDatadogSparkListener.listener = new DatadogSpark213Listener(
+                    sparkContext.getConf(), sparkContext.applicationId(), sparkContext.version());
+            sparkContext.listenerBus().addToSharedQueue(AbstractDatadogSparkListener.listener);
         }
-      }
-
-      // We want to add the Datadog listener as the first listener
-      AbstractDatadogSparkListener.listener =
-          new DatadogSpark213Listener(
-              sparkContext.getConf(), sparkContext.applicationId(), sparkContext.version());
-      sparkContext.listenerBus().addToSharedQueue(AbstractDatadogSparkListener.listener);
     }
-  }
 
-  public static class SparkPlanInfoAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    @SuppressForbidden
-    public static void exit(
-        @Advice.Return(readOnly = false) SparkPlanInfo planInfo,
-        @Advice.Argument(0) SparkPlan plan) {
-      if (planInfo.metadata().size() == 0
-          && (Config.get().isDataJobsParseSparkPlanEnabled()
-              || Config.get().isDataJobsExperimentalFeaturesEnabled())) {
-        Spark213PlanSerializer planSerializer = new Spark213PlanSerializer();
-        Map<String, String> meta =
-            HashMap.from(JavaConverters.asScala(planSerializer.extractFormattedProduct(plan)));
+    public static class SparkPlanInfoAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        @SuppressForbidden
+        public static void exit(
+                @Advice.Return(readOnly = false) SparkPlanInfo planInfo, @Advice.Argument(0) SparkPlan plan) {
+            if (planInfo.metadata().size() == 0
+                    && (Config.get().isDataJobsParseSparkPlanEnabled()
+                            || Config.get().isDataJobsExperimentalFeaturesEnabled())) {
+                Spark213PlanSerializer planSerializer = new Spark213PlanSerializer();
+                Map<String, String> meta =
+                        HashMap.from(JavaConverters.asScala(planSerializer.extractFormattedProduct(plan)));
 
-        SparkPlanInfo newPlanInfo =
-            new Spark213PlanUtils().upsertSparkPlanInfoMetadata(planInfo, meta);
-        if (newPlanInfo != null) {
-          planInfo = newPlanInfo;
+                SparkPlanInfo newPlanInfo = new Spark213PlanUtils().upsertSparkPlanInfoMetadata(planInfo, meta);
+                if (newPlanInfo != null) {
+                    planInfo = newPlanInfo;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213PlanSerializer.java b/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213PlanSerializer.java
index ca20859a768..5bfa0c4e8a1 100644
--- a/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213PlanSerializer.java
+++ b/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213PlanSerializer.java
@@ -3,8 +3,8 @@
 import org.apache.spark.sql.catalyst.trees.TreeNode;
 
 public class Spark213PlanSerializer extends AbstractSparkPlanSerializer {
-  @Override
-  public String getKey(int idx, TreeNode node) {
-    return node.productElementName(idx);
-  }
+    @Override
+    public String getKey(int idx, TreeNode node) {
+        return node.productElementName(idx);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213PlanUtils.java b/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213PlanUtils.java
index c59b4fdf600..8c6edce324d 100644
--- a/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213PlanUtils.java
+++ b/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213PlanUtils.java
@@ -6,40 +6,37 @@
 import scala.collection.immutable.Map;
 
 public class Spark213PlanUtils extends AbstractSparkPlanUtils {
-  private static final MethodHandle constructor =
-      methodLoader.constructor(
-          SparkPlanInfo.class,
-          String.class,
-          String.class,
-          scala.collection.immutable.Seq.class,
-          scala.collection.immutable.Map.class,
-          scala.collection.immutable.Seq.class);
-  private static final MethodHandle databricksConstructor =
-      methodLoader.constructor(
-          SparkPlanInfo.class,
-          String.class,
-          String.class,
-          scala.collection.immutable.Seq.class,
-          scala.collection.immutable.Map.class,
-          scala.collection.immutable.Seq.class,
-          Option.class,
-          String.class,
-          Option.class);
+    private static final MethodHandle constructor = methodLoader.constructor(
+            SparkPlanInfo.class,
+            String.class,
+            String.class,
+            scala.collection.immutable.Seq.class,
+            scala.collection.immutable.Map.class,
+            scala.collection.immutable.Seq.class);
+    private static final MethodHandle databricksConstructor = methodLoader.constructor(
+            SparkPlanInfo.class,
+            String.class,
+            String.class,
+            scala.collection.immutable.Seq.class,
+            scala.collection.immutable.Map.class,
+            scala.collection.immutable.Seq.class,
+            Option.class,
+            String.class,
+            Option.class);
 
-  @Override
-  protected MethodHandle getConstructor() {
-    return constructor;
-  }
+    @Override
+    protected MethodHandle getConstructor() {
+        return constructor;
+    }
 
-  @Override
-  protected MethodHandle getDatabricksConstructor() {
-    return databricksConstructor;
-  }
+    @Override
+    protected MethodHandle getDatabricksConstructor() {
+        return databricksConstructor;
+    }
 
-  @Override
-  protected Object[] getStandardArgs(SparkPlanInfo planInfo, Map meta) {
-    return new Object[] {
-      planInfo.nodeName(), planInfo.simpleString(), planInfo.children(), meta, planInfo.metrics()
-    };
-  }
+    @Override
+    protected Object[] getStandardArgs(SparkPlanInfo planInfo, Map meta) {
+        return new Object[] {planInfo.nodeName(), planInfo.simpleString(), planInfo.children(), meta, planInfo.metrics()
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/spark/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java b/dd-java-agent/instrumentation/spark/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java
index b4dbe6e5c02..54bf819900e 100644
--- a/dd-java-agent/instrumentation/spark/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java
+++ b/dd-java-agent/instrumentation/spark/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java
@@ -17,42 +17,42 @@
 
 @AutoService(InstrumenterModule.class)
 public class RoutesInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public RoutesInstrumentation() {
-    super("sparkjava", "sparkjava-2.4");
-  }
-
-  @Override
-  public boolean defaultEnabled() {
-    return false;
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "spark.route.Routes";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("find")
-            .and(takesArgument(0, named("spark.route.HttpMethod")))
-            .and(returns(named("spark.routematch.RouteMatch")))
-            .and(isPublic()),
-        RoutesInstrumentation.class.getName() + "$RoutesAdvice");
-  }
-
-  public static class RoutesAdvice {
-
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void routeMatchEnricher(
-        @Advice.Argument(0) final HttpMethod method, @Advice.Return final RouteMatch routeMatch) {
-
-      final AgentSpan span = activeSpan();
-      if (span != null && routeMatch != null) {
-        HTTP_RESOURCE_DECORATOR.withRoute(span, method.name(), routeMatch.getMatchUri());
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public RoutesInstrumentation() {
+        super("sparkjava", "sparkjava-2.4");
+    }
+
+    @Override
+    public boolean defaultEnabled() {
+        return false;
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "spark.route.Routes";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("find")
+                        .and(takesArgument(0, named("spark.route.HttpMethod")))
+                        .and(returns(named("spark.routematch.RouteMatch")))
+                        .and(isPublic()),
+                RoutesInstrumentation.class.getName() + "$RoutesAdvice");
+    }
+
+    public static class RoutesAdvice {
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void routeMatchEnricher(
+                @Advice.Argument(0) final HttpMethod method, @Advice.Return final RouteMatch routeMatch) {
+
+            final AgentSpan span = activeSpan();
+            if (span != null && routeMatch != null) {
+                HTTP_RESOURCE_DECORATOR.withRoute(span, method.name(), routeMatch.getMatchUri());
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spark/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java b/dd-java-agent/instrumentation/spark/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java
index 93f904c7206..072b8c8ac4d 100644
--- a/dd-java-agent/instrumentation/spark/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java
+++ b/dd-java-agent/instrumentation/spark/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java
@@ -2,18 +2,16 @@
 
 public class TestSparkJavaApplication {
 
-  public static void initSpark(final int port) {
-    Spark.port(port);
-    Spark.get("/", (req, res) -> "Hello World");
+    public static void initSpark(final int port) {
+        Spark.port(port);
+        Spark.get("/", (req, res) -> "Hello World");
 
-    Spark.get("/param/:param", (req, res) -> "Hello " + req.params("param"));
+        Spark.get("/param/:param", (req, res) -> "Hello " + req.params("param"));
 
-    Spark.get(
-        "/exception/:param",
-        (req, res) -> {
-          throw new RuntimeException(req.params("param"));
+        Spark.get("/exception/:param", (req, res) -> {
+            throw new RuntimeException(req.params("param"));
         });
 
-    Spark.awaitInitialization();
-  }
+        Spark.awaitInitialization();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHeaders.java b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHeaders.java
index fbf908fb747..68d222d8686 100644
--- a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHeaders.java
+++ b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHeaders.java
@@ -8,32 +8,32 @@
 
 public abstract class SprayHeaders<T> implements AgentPropagation.ContextVisitor<T> {
 
-  protected abstract Iterable<HttpHeader> getHeaders(T carrier);
-
-  @Override
-  public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-    for (final HttpHeader header : getHeaders(carrier)) {
-      if (!classifier.accept(header.lowercaseName(), header.value())) {
-        return;
-      }
+    protected abstract Iterable<HttpHeader> getHeaders(T carrier);
+
+    @Override
+    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+        for (final HttpHeader header : getHeaders(carrier)) {
+            if (!classifier.accept(header.lowercaseName(), header.value())) {
+                return;
+            }
+        }
     }
-  }
 
-  public static final class Request extends SprayHeaders<HttpRequest> {
-    public static final Request GETTER = new Request();
+    public static final class Request extends SprayHeaders<HttpRequest> {
+        public static final Request GETTER = new Request();
 
-    @Override
-    protected Iterable<HttpHeader> getHeaders(HttpRequest carrier) {
-      return JavaConverters.asJavaIterableConverter(carrier.headers()).asJava();
+        @Override
+        protected Iterable<HttpHeader> getHeaders(HttpRequest carrier) {
+            return JavaConverters.asJavaIterableConverter(carrier.headers()).asJava();
+        }
     }
-  }
 
-  public static final class Response extends SprayHeaders<HttpResponse> {
-    public static final Response GETTER = new Response();
+    public static final class Response extends SprayHeaders<HttpResponse> {
+        public static final Response GETTER = new Response();
 
-    @Override
-    protected Iterable<HttpHeader> getHeaders(HttpResponse carrier) {
-      return JavaConverters.asJavaIterableConverter(carrier.headers()).asJava();
+        @Override
+        protected Iterable<HttpHeader> getHeaders(HttpResponse carrier) {
+            return JavaConverters.asJavaIterableConverter(carrier.headers()).asJava();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerDecorator.java b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerDecorator.java
index c5c07f88280..1d90aaf6c13 100644
--- a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerDecorator.java
+++ b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerDecorator.java
@@ -12,62 +12,61 @@
 import spray.routing.RequestContext;
 
 public class SprayHttpServerDecorator
-    extends HttpServerDecorator<HttpRequest, RequestContext, HttpResponse, HttpRequest> {
-  public static final CharSequence SPRAY_HTTP_SERVER = UTF8BytesString.create("spray-http-server");
+        extends HttpServerDecorator<HttpRequest, RequestContext, HttpResponse, HttpRequest> {
+    public static final CharSequence SPRAY_HTTP_SERVER = UTF8BytesString.create("spray-http-server");
 
-  public static final SprayHttpServerDecorator DECORATE = new SprayHttpServerDecorator();
+    public static final SprayHttpServerDecorator DECORATE = new SprayHttpServerDecorator();
 
-  private static final CharSequence SPRAY_HTTP_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
+    private static final CharSequence SPRAY_HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
 
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpRequest> getter() {
-    return Request.GETTER;
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpRequest> getter() {
+        return Request.GETTER;
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
-    return Response.GETTER;
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
+        return Response.GETTER;
+    }
 
-  @Override
-  public CharSequence spanName() {
-    return SPRAY_HTTP_REQUEST;
-  }
+    @Override
+    public CharSequence spanName() {
+        return SPRAY_HTTP_REQUEST;
+    }
 
-  @Override
-  protected String method(HttpRequest request) {
-    return request.method().name();
-  }
+    @Override
+    protected String method(HttpRequest request) {
+        return request.method().name();
+    }
 
-  @Override
-  protected URIDataAdapter url(HttpRequest request) {
-    return new SprayURIAdapter(request.uri());
-  }
+    @Override
+    protected URIDataAdapter url(HttpRequest request) {
+        return new SprayURIAdapter(request.uri());
+    }
 
-  @Override
-  protected String peerHostIP(RequestContext ctx) {
-    return null;
-  }
+    @Override
+    protected String peerHostIP(RequestContext ctx) {
+        return null;
+    }
 
-  @Override
-  protected int peerPort(RequestContext requestContext) {
-    // TODO : add support of client/peer port
-    return 0;
-  }
+    @Override
+    protected int peerPort(RequestContext requestContext) {
+        // TODO : add support of client/peer port
+        return 0;
+    }
 
-  @Override
-  protected int status(HttpResponse httpResponse) {
-    return httpResponse.status().intValue();
-  }
+    @Override
+    protected int status(HttpResponse httpResponse) {
+        return httpResponse.status().intValue();
+    }
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"spray"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"spray"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return SPRAY_HTTP_SERVER;
-  }
+    @Override
+    protected CharSequence component() {
+        return SPRAY_HTTP_SERVER;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerInstrumentation.java b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerInstrumentation.java
index a6e5cbf05cc..1bc9bfe4b9c 100644
--- a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerInstrumentation.java
@@ -9,29 +9,29 @@
 
 @AutoService(InstrumenterModule.class)
 public final class SprayHttpServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public SprayHttpServerInstrumentation() {
-    super("spray-http", "spray-http-server");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public SprayHttpServerInstrumentation() {
+        super("spray-http", "spray-http-server");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "spray.routing.HttpServiceBase$class";
-  }
+    @Override
+    public String instrumentedType() {
+        return "spray.routing.HttpServiceBase$class";
+    }
 
-  /**
-   * Spray has 'nested' function called runSealedRoute that runs route with all handlers wrapped
-   * around it. This gives us access to a 'final' response that we can use to get all data for the
-   * span. Unfortunately this hides from us exception that might have been through by the route. In
-   * order to capture that exception we have to also wrap 'inner' route.
-   */
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("runSealedRoute$1").and(takesArgument(1, named("spray.routing.RequestContext"))),
-        packageName + ".SprayHttpServerRunSealedRouteAdvice");
-    transformer.applyAdvice(
-        named("runRoute").and(takesArgument(1, named("scala.Function1"))),
-        packageName + ".SprayHttpServerRunRouteAdvice");
-  }
+    /**
+     * Spray has 'nested' function called runSealedRoute that runs route with all handlers wrapped
+     * around it. This gives us access to a 'final' response that we can use to get all data for the
+     * span. Unfortunately this hides from us exception that might have been through by the route. In
+     * order to capture that exception we have to also wrap 'inner' route.
+     */
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("runSealedRoute$1").and(takesArgument(1, named("spray.routing.RequestContext"))),
+                packageName + ".SprayHttpServerRunSealedRouteAdvice");
+        transformer.applyAdvice(
+                named("runRoute").and(takesArgument(1, named("scala.Function1"))),
+                packageName + ".SprayHttpServerRunRouteAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerRunRouteAdvice.java b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerRunRouteAdvice.java
index 3a9cbbcdedf..3ed9f7f1ec6 100644
--- a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerRunRouteAdvice.java
+++ b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerRunRouteAdvice.java
@@ -3,8 +3,8 @@
 import net.bytebuddy.asm.Advice;
 
 public class SprayHttpServerRunRouteAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void enter(@Advice.Argument(value = 1, readOnly = false) scala.Function1 route) {
-    route = SprayHelper.wrapRoute(route);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void enter(@Advice.Argument(value = 1, readOnly = false) scala.Function1 route) {
+        route = SprayHelper.wrapRoute(route);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerRunSealedRouteAdvice.java b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerRunSealedRouteAdvice.java
index fde1b73608d..0a6c27a0e96 100644
--- a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerRunSealedRouteAdvice.java
+++ b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerRunSealedRouteAdvice.java
@@ -16,46 +16,46 @@
 import spray.routing.RequestContext;
 
 public class SprayHttpServerRunSealedRouteAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope enter(
-      @Advice.Argument(value = 1, readOnly = false) RequestContext ctx,
-      @Advice.Local("completion") AtomicInteger completion) {
-    final Context parentContext;
-    final Context context;
-    final AgentSpan span;
-    if (activeSpan() == null) {
-      // Propagate context in case income request was going through several routes
-      // TODO: Add test for it
-      final HttpRequest request = ctx.request();
-      parentContext = DECORATE.extract(request);
-      context = DECORATE.startSpan(request, parentContext);
-      span = spanFromContext(context);
-    } else {
-      parentContext = rootContext();
-      span = startSpan(SPRAY_HTTP_SERVER.toString(), DECORATE.spanName());
-      context = span;
-    }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope enter(
+            @Advice.Argument(value = 1, readOnly = false) RequestContext ctx,
+            @Advice.Local("completion") AtomicInteger completion) {
+        final Context parentContext;
+        final Context context;
+        final AgentSpan span;
+        if (activeSpan() == null) {
+            // Propagate context in case income request was going through several routes
+            // TODO: Add test for it
+            final HttpRequest request = ctx.request();
+            parentContext = DECORATE.extract(request);
+            context = DECORATE.startSpan(request, parentContext);
+            span = spanFromContext(context);
+        } else {
+            parentContext = rootContext();
+            span = startSpan(SPRAY_HTTP_SERVER.toString(), DECORATE.spanName());
+            context = span;
+        }
 
-    ContextScope scope = context.attach();
-    DECORATE.afterStart(span);
+        ContextScope scope = context.attach();
+        DECORATE.afterStart(span);
 
-    completion = new AtomicInteger();
-    ctx = SprayHelper.wrapRequestContext(ctx, span, parentContext, context, completion);
-    return scope;
-  }
+        completion = new AtomicInteger();
+        ctx = SprayHelper.wrapRequestContext(ctx, span, parentContext, context, completion);
+        return scope;
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void exit(
-      @Advice.Enter final ContextScope scope,
-      @Advice.Thrown final Throwable throwable,
-      @Advice.Local("completion") AtomicInteger completion) {
-    try {
-      if (throwable != null) {
-        DECORATE.onError(scope, throwable);
-      }
-    } finally {
-      scope.close();
-      SprayHelper.scopeClosed(spanFromContext(scope.context()), completion);
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void exit(
+            @Advice.Enter final ContextScope scope,
+            @Advice.Thrown final Throwable throwable,
+            @Advice.Local("completion") AtomicInteger completion) {
+        try {
+            if (throwable != null) {
+                DECORATE.onError(scope, throwable);
+            }
+        } finally {
+            scope.close();
+            SprayHelper.scopeClosed(spanFromContext(scope.context()), completion);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayURIAdapter.java b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayURIAdapter.java
index 3cb926aa619..cc51e60c688 100644
--- a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayURIAdapter.java
+++ b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayURIAdapter.java
@@ -4,44 +4,44 @@
 import spray.http.Uri;
 
 public final class SprayURIAdapter extends URIRawDataAdapter {
-  private final Uri uri;
-
-  public SprayURIAdapter(Uri uri) {
-    this.uri = uri;
-  }
-
-  @Override
-  public String scheme() {
-    return uri.scheme();
-  }
-
-  @Override
-  public String host() {
-    return uri.authority().host().address();
-  }
-
-  @Override
-  public int port() {
-    return uri.authority().port();
-  }
-
-  @Override
-  public String fragment() {
-    return uri.fragment().isEmpty() ? null : uri.fragment().get();
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return uri.path().toString();
-  }
-
-  @Override
-  public boolean hasPlusEncodedSpaces() {
-    return true;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return uri.query().toString();
-  }
+    private final Uri uri;
+
+    public SprayURIAdapter(Uri uri) {
+        this.uri = uri;
+    }
+
+    @Override
+    public String scheme() {
+        return uri.scheme();
+    }
+
+    @Override
+    public String host() {
+        return uri.authority().host().address();
+    }
+
+    @Override
+    public int port() {
+        return uri.authority().port();
+    }
+
+    @Override
+    public String fragment() {
+        return uri.fragment().isEmpty() ? null : uri.fragment().get();
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return uri.path().toString();
+    }
+
+    @Override
+    public boolean hasPlusEncodedSpaces() {
+        return true;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return uri.query().toString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spray-1.3/src/test/java/datadog/trace/instrumentation/spray/RequestCompletionTest.java b/dd-java-agent/instrumentation/spray-1.3/src/test/java/datadog/trace/instrumentation/spray/RequestCompletionTest.java
index 689de03aac5..ec6236f814f 100644
--- a/dd-java-agent/instrumentation/spray-1.3/src/test/java/datadog/trace/instrumentation/spray/RequestCompletionTest.java
+++ b/dd-java-agent/instrumentation/spray-1.3/src/test/java/datadog/trace/instrumentation/spray/RequestCompletionTest.java
@@ -17,67 +17,61 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 class RequestCompletionTest {
-  @ParameterizedTest
-  @ValueSource(booleans = {true, false})
-  void finishesOnceAfterBothEvents(boolean responseFirst) {
-    AgentSpan span = mock(AgentSpan.class);
-    AtomicInteger completion = new AtomicInteger();
-    Runnable first =
-        responseFirst
-            ? () -> SprayHelper.responseComplete(span, completion)
-            : () -> SprayHelper.scopeClosed(span, completion);
-    Runnable second =
-        responseFirst
-            ? () -> SprayHelper.scopeClosed(span, completion)
-            : () -> SprayHelper.responseComplete(span, completion);
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void finishesOnceAfterBothEvents(boolean responseFirst) {
+        AgentSpan span = mock(AgentSpan.class);
+        AtomicInteger completion = new AtomicInteger();
+        Runnable first = responseFirst
+                ? () -> SprayHelper.responseComplete(span, completion)
+                : () -> SprayHelper.scopeClosed(span, completion);
+        Runnable second = responseFirst
+                ? () -> SprayHelper.scopeClosed(span, completion)
+                : () -> SprayHelper.responseComplete(span, completion);
 
-    first.run();
-    first.run();
-    verify(span, never()).finish();
+        first.run();
+        first.run();
+        verify(span, never()).finish();
 
-    second.run();
-    first.run();
-    second.run();
-    verify(span).finish();
-  }
+        second.run();
+        first.run();
+        second.run();
+        verify(span).finish();
+    }
 
-  @Test
-  void finishesOnceWhenResponseAndScopeClosureRace() throws Exception {
-    ExecutorService executor = Executors.newFixedThreadPool(2);
-    try {
-      for (int i = 0; i < 100; i++) {
-        AgentSpan span = mock(AgentSpan.class);
-        AtomicInteger completion = new AtomicInteger();
-        CountDownLatch ready = new CountDownLatch(2);
-        CountDownLatch start = new CountDownLatch(1);
-        Future<?> response =
-            executor.submit(
-                () -> {
-                  ready.countDown();
-                  assertTrue(start.await(5, TimeUnit.SECONDS));
-                  SprayHelper.responseComplete(span, completion);
-                  return null;
+    @Test
+    void finishesOnceWhenResponseAndScopeClosureRace() throws Exception {
+        ExecutorService executor = Executors.newFixedThreadPool(2);
+        try {
+            for (int i = 0; i < 100; i++) {
+                AgentSpan span = mock(AgentSpan.class);
+                AtomicInteger completion = new AtomicInteger();
+                CountDownLatch ready = new CountDownLatch(2);
+                CountDownLatch start = new CountDownLatch(1);
+                Future<?> response = executor.submit(() -> {
+                    ready.countDown();
+                    assertTrue(start.await(5, TimeUnit.SECONDS));
+                    SprayHelper.responseComplete(span, completion);
+                    return null;
                 });
-        Future<?> route =
-            executor.submit(
-                () -> {
-                  ready.countDown();
-                  assertTrue(start.await(5, TimeUnit.SECONDS));
-                  SprayHelper.scopeClosed(span, completion);
-                  return null;
+                Future<?> route = executor.submit(() -> {
+                    ready.countDown();
+                    assertTrue(start.await(5, TimeUnit.SECONDS));
+                    SprayHelper.scopeClosed(span, completion);
+                    return null;
                 });
-        try {
-          assertTrue(ready.await(5, TimeUnit.SECONDS));
+                try {
+                    assertTrue(ready.await(5, TimeUnit.SECONDS));
+                } finally {
+                    start.countDown();
+                }
+                response.get(5, TimeUnit.SECONDS);
+                route.get(5, TimeUnit.SECONDS);
+                verify(span).finish();
+            }
         } finally {
-          start.countDown();
+            executor.shutdownNow();
+            assertTrue(executor.awaitTermination(5, TimeUnit.SECONDS));
         }
-        response.get(5, TimeUnit.SECONDS);
-        route.get(5, TimeUnit.SECONDS);
-        verify(span).finish();
-      }
-    } finally {
-      executor.shutdownNow();
-      assertTrue(executor.awaitTermination(5, TimeUnit.SECONDS));
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-beans-3.1/src/main/java/datadog/trace/instrumentation/springbeans/BeanDefinitionRepairer.java b/dd-java-agent/instrumentation/spring/spring-beans-3.1/src/main/java/datadog/trace/instrumentation/springbeans/BeanDefinitionRepairer.java
index 126f93a642b..c76025109b4 100644
--- a/dd-java-agent/instrumentation/spring/spring-beans-3.1/src/main/java/datadog/trace/instrumentation/springbeans/BeanDefinitionRepairer.java
+++ b/dd-java-agent/instrumentation/spring/spring-beans-3.1/src/main/java/datadog/trace/instrumentation/springbeans/BeanDefinitionRepairer.java
@@ -8,19 +8,19 @@
  * Repairs Datadog injected bean definitions by restoring missing class references at resolve time.
  */
 public final class BeanDefinitionRepairer {
-  private static final Map<String, Class<?>> ddBeanClasses = new ConcurrentHashMap<>();
+    private static final Map<String, Class<?>> ddBeanClasses = new ConcurrentHashMap<>();
 
-  public static void register(Class<?> beanClass) {
-    ddBeanClasses.put(beanClass.getName(), beanClass);
-  }
+    public static void register(Class<?> beanClass) {
+        ddBeanClasses.put(beanClass.getName(), beanClass);
+    }
 
-  public static void repair(RootBeanDefinition beanDefinition) {
-    String className = beanDefinition.getBeanClassName();
-    if (null != className) {
-      Class<?> beanClass = ddBeanClasses.get(className);
-      if (null != beanClass) {
-        beanDefinition.setBeanClass(beanClass);
-      }
+    public static void repair(RootBeanDefinition beanDefinition) {
+        String className = beanDefinition.getBeanClassName();
+        if (null != className) {
+            Class<?> beanClass = ddBeanClasses.get(className);
+            if (null != beanClass) {
+                beanDefinition.setBeanClass(beanClass);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-beans-3.1/src/main/java/datadog/trace/instrumentation/springbeans/BeanFactoryInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-beans-3.1/src/main/java/datadog/trace/instrumentation/springbeans/BeanFactoryInstrumentation.java
index c56335d2124..1226b63ab14 100644
--- a/dd-java-agent/instrumentation/spring/spring-beans-3.1/src/main/java/datadog/trace/instrumentation/springbeans/BeanFactoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-beans-3.1/src/main/java/datadog/trace/instrumentation/springbeans/BeanFactoryInstrumentation.java
@@ -27,57 +27,54 @@
  */
 @AutoService(InstrumenterModule.class)
 public class BeanFactoryInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public BeanFactoryInstrumentation() {
-    super("spring-beans");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public BeanFactoryInstrumentation() {
+        super("spring-beans");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.beans.factory.support.AbstractBeanFactory";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.beans.factory.support.AbstractBeanFactory";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("registerBeanDefinition"))
-            .and(
-                takesArgument(1, named("org.springframework.beans.factory.config.BeanDefinition"))),
-        BeanFactoryInstrumentation.class.getName() + "$BeanRegisteringAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("resolveBeanClass"))
-            .and(
-                takesArgument(
-                    0, named("org.springframework.beans.factory.support.RootBeanDefinition"))),
-        BeanFactoryInstrumentation.class.getName() + "$BeanResolvingAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("registerBeanDefinition"))
+                        .and(takesArgument(1, named("org.springframework.beans.factory.config.BeanDefinition"))),
+                BeanFactoryInstrumentation.class.getName() + "$BeanRegisteringAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("resolveBeanClass"))
+                        .and(takesArgument(0, named("org.springframework.beans.factory.support.RootBeanDefinition"))),
+                BeanFactoryInstrumentation.class.getName() + "$BeanResolvingAdvice");
+    }
 
-  public static class BeanRegisteringAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(1) final BeanDefinition beanDefinition) {
-      String className = beanDefinition.getBeanClassName();
-      if (null != className
-          && className.startsWith("datadog.trace.instrumentation.")
-          && beanDefinition instanceof AbstractBeanDefinition
-          && ((AbstractBeanDefinition) beanDefinition).hasBeanClass()) {
-        BeanDefinitionRepairer.register(((AbstractBeanDefinition) beanDefinition).getBeanClass());
-      }
+    public static class BeanRegisteringAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(1) final BeanDefinition beanDefinition) {
+            String className = beanDefinition.getBeanClassName();
+            if (null != className
+                    && className.startsWith("datadog.trace.instrumentation.")
+                    && beanDefinition instanceof AbstractBeanDefinition
+                    && ((AbstractBeanDefinition) beanDefinition).hasBeanClass()) {
+                BeanDefinitionRepairer.register(((AbstractBeanDefinition) beanDefinition).getBeanClass());
+            }
+        }
     }
-  }
 
-  public static class BeanResolvingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(0) final RootBeanDefinition beanDefinition) {
-      if (!beanDefinition.hasBeanClass()) {
-        BeanDefinitionRepairer.repair(beanDefinition);
-      }
+    public static class BeanResolvingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(0) final RootBeanDefinition beanDefinition) {
+            if (!beanDefinition.hasBeanClass()) {
+                BeanDefinitionRepairer.repair(beanDefinition);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/DeploymentHelper.java b/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/DeploymentHelper.java
index bcc2e36b195..6462e8c5c5a 100644
--- a/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/DeploymentHelper.java
+++ b/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/DeploymentHelper.java
@@ -1,5 +1,5 @@
 package datadog.trace.instrumentation.springboot;
 
 public final class DeploymentHelper {
-  public static volatile boolean runningFromWar = false;
+    public static volatile boolean runningFromWar = false;
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SBCodeOriginInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SBCodeOriginInstrumentation.java
index 1c4d1c47ea5..b4f42dd4820 100644
--- a/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SBCodeOriginInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SBCodeOriginInstrumentation.java
@@ -10,19 +10,18 @@
 
 @AutoService(InstrumenterModule.class)
 public class SBCodeOriginInstrumentation extends CodeOriginInstrumentation {
-  private static final String WEB_BIND_ANNOTATION = "org.springframework.web.bind.annotation.";
+    private static final String WEB_BIND_ANNOTATION = "org.springframework.web.bind.annotation.";
 
-  public SBCodeOriginInstrumentation() {
-    super("spring-boot-span-origin");
-  }
+    public SBCodeOriginInstrumentation() {
+        super("spring-boot-span-origin");
+    }
 
-  @Override
-  protected Set<String> getAnnotations() {
-    return new HashSet<>(
-        asList(
-            WEB_BIND_ANNOTATION + "GetMapping",
-            WEB_BIND_ANNOTATION + "PostMapping",
-            WEB_BIND_ANNOTATION + "PutMapping",
-            WEB_BIND_ANNOTATION + "PatchMapping"));
-  }
+    @Override
+    protected Set<String> getAnnotations() {
+        return new HashSet<>(asList(
+                WEB_BIND_ANNOTATION + "GetMapping",
+                WEB_BIND_ANNOTATION + "PostMapping",
+                WEB_BIND_ANNOTATION + "PutMapping",
+                WEB_BIND_ANNOTATION + "PatchMapping"));
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SpringApplicationInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SpringApplicationInstrumentation.java
index 19a58513c05..00955912e79 100644
--- a/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SpringApplicationInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SpringApplicationInstrumentation.java
@@ -18,85 +18,85 @@
  */
 @AutoService(InstrumenterModule.class)
 public class SpringApplicationInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public SpringApplicationInstrumentation() {
-    super("spring-boot");
-  }
+    public SpringApplicationInstrumentation() {
+        super("spring-boot");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.boot.SpringApplicationRunListeners";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.boot.SpringApplicationRunListeners";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("environmentPrepared")
-            .and(takesArgument(0, named("org.springframework.core.env.ConfigurableEnvironment"))),
-        getClass().getName() + "$EnvironmentReadyV1Advice");
-    // >= 2.4.0
-    transformer.applyAdvice(
-        named("environmentPrepared")
-            .and(takesArgument(1, named("org.springframework.core.env.ConfigurableEnvironment"))),
-        getClass().getName() + "$EnvironmentReadyV2Advice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("environmentPrepared")
+                        .and(takesArgument(0, named("org.springframework.core.env.ConfigurableEnvironment"))),
+                getClass().getName() + "$EnvironmentReadyV1Advice");
+        // >= 2.4.0
+        transformer.applyAdvice(
+                named("environmentPrepared")
+                        .and(takesArgument(1, named("org.springframework.core.env.ConfigurableEnvironment"))),
+                getClass().getName() + "$EnvironmentReadyV2Advice");
+    }
 
-  public static class EnvironmentReadyV1Advice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterEnvironmentPostProcessed(
-        @Advice.Argument(0) final ConfigurableEnvironment environment) {
-      if (environment == null
-          || DeploymentHelper.runningFromWar
-          || Config.get().isServiceNameSetByUser()) {
-        return;
-      }
+    public static class EnvironmentReadyV1Advice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterEnvironmentPostProcessed(
+                @Advice.Argument(0) final ConfigurableEnvironment environment) {
+            if (environment == null
+                    || DeploymentHelper.runningFromWar
+                    || Config.get().isServiceNameSetByUser()) {
+                return;
+            }
 
-      final String applicationName = environment.getProperty("spring.application.name");
-      if (applicationName != null && !applicationName.isEmpty()) {
-        AgentTracer.get().updatePreferredServiceName(applicationName, "spring-boot");
-        ProcessTags.addTag("springboot.application", applicationName);
-      }
-      if (Config.get().isExperimentalPropagateProcessTagsEnabled()) {
-        final String[] profiles = environment.getActiveProfiles();
-        if (profiles != null && profiles.length > 0) {
-          ProcessTags.addTag("springboot.profile", profiles[0]);
-        } else {
-          final String[] defaultProfiles = environment.getDefaultProfiles();
-          if (defaultProfiles != null && defaultProfiles.length > 0) {
-            ProcessTags.addTag("springboot.profile", defaultProfiles[0]);
-          }
+            final String applicationName = environment.getProperty("spring.application.name");
+            if (applicationName != null && !applicationName.isEmpty()) {
+                AgentTracer.get().updatePreferredServiceName(applicationName, "spring-boot");
+                ProcessTags.addTag("springboot.application", applicationName);
+            }
+            if (Config.get().isExperimentalPropagateProcessTagsEnabled()) {
+                final String[] profiles = environment.getActiveProfiles();
+                if (profiles != null && profiles.length > 0) {
+                    ProcessTags.addTag("springboot.profile", profiles[0]);
+                } else {
+                    final String[] defaultProfiles = environment.getDefaultProfiles();
+                    if (defaultProfiles != null && defaultProfiles.length > 0) {
+                        ProcessTags.addTag("springboot.profile", defaultProfiles[0]);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class EnvironmentReadyV2Advice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterEnvironmentPostProcessed(
-        @Advice.Argument(1) final ConfigurableEnvironment environment) {
-      if (environment == null
-          || DeploymentHelper.runningFromWar
-          || Config.get().isServiceNameSetByUser()) {
-        return;
-      }
+    public static class EnvironmentReadyV2Advice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterEnvironmentPostProcessed(
+                @Advice.Argument(1) final ConfigurableEnvironment environment) {
+            if (environment == null
+                    || DeploymentHelper.runningFromWar
+                    || Config.get().isServiceNameSetByUser()) {
+                return;
+            }
 
-      final String applicationName = environment.getProperty("spring.application.name");
-      if (applicationName != null && !applicationName.isEmpty()) {
-        AgentTracer.get().updatePreferredServiceName(applicationName, "spring-boot");
-        ProcessTags.addTag("springboot.application", applicationName);
-      }
-      if (Config.get().isExperimentalPropagateProcessTagsEnabled()) {
-        final String[] profiles = environment.getActiveProfiles();
-        if (profiles != null && profiles.length > 0) {
-          ProcessTags.addTag("springboot.profile", profiles[0]);
-        } else {
-          final String[] defaultProfiles = environment.getDefaultProfiles();
-          if (defaultProfiles != null && defaultProfiles.length > 0) {
-            ProcessTags.addTag("springboot.profile", defaultProfiles[0]);
-          }
+            final String applicationName = environment.getProperty("spring.application.name");
+            if (applicationName != null && !applicationName.isEmpty()) {
+                AgentTracer.get().updatePreferredServiceName(applicationName, "spring-boot");
+                ProcessTags.addTag("springboot.application", applicationName);
+            }
+            if (Config.get().isExperimentalPropagateProcessTagsEnabled()) {
+                final String[] profiles = environment.getActiveProfiles();
+                if (profiles != null && profiles.length > 0) {
+                    ProcessTags.addTag("springboot.profile", profiles[0]);
+                } else {
+                    final String[] defaultProfiles = environment.getDefaultProfiles();
+                    if (defaultProfiles != null && defaultProfiles.length > 0) {
+                        ProcessTags.addTag("springboot.profile", defaultProfiles[0]);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SpringServletInitializerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SpringServletInitializerInstrumentation.java
index 1930a72f02b..ad949fb0586 100644
--- a/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SpringServletInitializerInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SpringServletInitializerInstrumentation.java
@@ -15,30 +15,30 @@
  */
 @AutoService(InstrumenterModule.class)
 public class SpringServletInitializerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public SpringServletInitializerInstrumentation() {
-    super("spring-boot");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public SpringServletInitializerInstrumentation() {
+        super("spring-boot");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("onStartup").and(ElementMatchers.takesArguments(1)),
-        getClass().getName() + "$WarDeployedAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("onStartup").and(ElementMatchers.takesArguments(1)),
+                getClass().getName() + "$WarDeployedAdvice");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.springframework.boot.web.servlet.support.SpringBootServletInitializer",
-      "org.springframework.boot.web.support.SpringBootServletInitializer",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.springframework.boot.web.servlet.support.SpringBootServletInitializer",
+            "org.springframework.boot.web.support.SpringBootServletInitializer",
+        };
+    }
 
-  public static class WarDeployedAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void before() {
-      DeploymentHelper.runningFromWar = true;
+    public static class WarDeployedAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void before() {
+            DeploymentHelper.runningFromWar = true;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/main/java/datadog/trace/instrumentation/springcloudzuul2/HeaderUtils.java b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/main/java/datadog/trace/instrumentation/springcloudzuul2/HeaderUtils.java
index 5ae36a64e8f..cc76e0ab7fa 100644
--- a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/main/java/datadog/trace/instrumentation/springcloudzuul2/HeaderUtils.java
+++ b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/main/java/datadog/trace/instrumentation/springcloudzuul2/HeaderUtils.java
@@ -5,28 +5,26 @@
 import java.util.Set;
 
 public class HeaderUtils {
-  // for now get all the B3, Haystack, Datadog headers and ignore them
-  // (headers are all in lowercase for non case sensitiveness)
-  public static final Set<String> EXCLUDED_HEADERS =
-      new HashSet<String>(
-          Arrays.asList(
-              // DD headers
-              "x-datadog-trace-id",
-              "x-datadog-parent-id",
-              "x-datadog-sampling-priority",
-              "x-datadog-origin",
-              // B3 headers
-              "x-b3-traceid",
-              "x-b3-spanid",
-              "x-b3-sampled",
-              // Haystack headers
-              "trace-id",
-              "span-id",
-              "parent-id",
-              "haystack-trace-id",
-              "haystack-span-id",
-              "haystack-parent-id"));
+    // for now get all the B3, Haystack, Datadog headers and ignore them
+    // (headers are all in lowercase for non case sensitiveness)
+    public static final Set<String> EXCLUDED_HEADERS = new HashSet<String>(Arrays.asList(
+            // DD headers
+            "x-datadog-trace-id",
+            "x-datadog-parent-id",
+            "x-datadog-sampling-priority",
+            "x-datadog-origin",
+            // B3 headers
+            "x-b3-traceid",
+            "x-b3-spanid",
+            "x-b3-sampled",
+            // Haystack headers
+            "trace-id",
+            "span-id",
+            "parent-id",
+            "haystack-trace-id",
+            "haystack-span-id",
+            "haystack-parent-id"));
 
-  public static final String HAYSTACK_PACKAGE_PREFIX = "baggage-";
-  public static final String DD_PACKAGE_PREFIX = "ot-baggage-";
+    public static final String HAYSTACK_PACKAGE_PREFIX = "baggage-";
+    public static final String DD_PACKAGE_PREFIX = "ot-baggage-";
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulProxyRequestHelperInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulProxyRequestHelperInstrumentation.java
index 9ebaf74a835..59edfe3f0c8 100644
--- a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulProxyRequestHelperInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulProxyRequestHelperInstrumentation.java
@@ -15,41 +15,41 @@
 
 @AutoService(InstrumenterModule.class)
 public class ZuulProxyRequestHelperInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ZuulProxyRequestHelperInstrumentation() {
-    super("spring-cloud-zuul");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ZuulProxyRequestHelperInstrumentation() {
+        super("spring-cloud-zuul");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.cloud.netflix.zuul.filters.ProxyRequestHelper";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.cloud.netflix.zuul.filters.ProxyRequestHelper";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("isIncludedHeader")).and(takesArgument(0, String.class)),
-        ZuulProxyRequestHelperInstrumentation.class.getName() + "$ProxyRequestHelperAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("isIncludedHeader")).and(takesArgument(0, String.class)),
+                ZuulProxyRequestHelperInstrumentation.class.getName() + "$ProxyRequestHelperAdvice");
+    }
 
-  /**
-   * The purpose of this instrumentation is to prevent the overwriting of instrumented headers when
-   * a request is passed through a Zuul proxy. This instrumentation will ensure that the proxy's
-   * action of filtering/forwarding the incoming request will not overwrite the headers added by the
-   * agent when instrumenting the proxy
-   */
-  public static class ProxyRequestHelperAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Argument(0) final String header, @Advice.Return(readOnly = false) boolean include) {
-      if (!include) return;
+    /**
+     * The purpose of this instrumentation is to prevent the overwriting of instrumented headers when
+     * a request is passed through a Zuul proxy. This instrumentation will ensure that the proxy's
+     * action of filtering/forwarding the incoming request will not overwrite the headers added by the
+     * agent when instrumenting the proxy
+     */
+    public static class ProxyRequestHelperAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Argument(0) final String header, @Advice.Return(readOnly = false) boolean include) {
+            if (!include) return;
 
-      String lowercaseHeader = header.toLowerCase(Locale.ROOT);
-      if (lowercaseHeader.startsWith(HAYSTACK_PACKAGE_PREFIX)
-          || lowercaseHeader.startsWith(DD_PACKAGE_PREFIX)
-          || EXCLUDED_HEADERS.contains(lowercaseHeader)) {
-        include = false;
-      }
+            String lowercaseHeader = header.toLowerCase(Locale.ROOT);
+            if (lowercaseHeader.startsWith(HAYSTACK_PACKAGE_PREFIX)
+                    || lowercaseHeader.startsWith(DD_PACKAGE_PREFIX)
+                    || EXCLUDED_HEADERS.contains(lowercaseHeader)) {
+                include = false;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulSendForwardFilterInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulSendForwardFilterInstrumentation.java
index f167301e029..7da1a73e766 100644
--- a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulSendForwardFilterInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulSendForwardFilterInstrumentation.java
@@ -18,61 +18,58 @@
 
 @AutoService(InstrumenterModule.class)
 public class ZuulSendForwardFilterInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ZuulSendForwardFilterInstrumentation() {
-    super("spring-cloud-zuul");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ZuulSendForwardFilterInstrumentation() {
+        super("spring-cloud-zuul");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.cloud.netflix.zuul.filters.route.SendForwardFilter";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.cloud.netflix.zuul.filters.route.SendForwardFilter";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("run")).and(takesNoArguments()),
-        ZuulSendForwardFilterInstrumentation.class.getName() + "$FilterInjectingAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("run")).and(takesNoArguments()),
+                ZuulSendForwardFilterInstrumentation.class.getName() + "$FilterInjectingAdvice");
+    }
 
-  /**
-   * Using the zuul proxy results in the Spring "HandlerMapping.bestMatchingPattern" value being
-   * very generic. In the case where zuul forwards the request to a more specific Spring controller,
-   * a better pattern will be updated on the request after the call returns, so we want to update
-   * the resource name with that.
-   */
-  public static class FilterInjectingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Local("request") HttpServletRequest request,
-        @Advice.Local("parentSpan") AgentSpan parentSpan) {
-      RequestContext ctx = RequestContext.getCurrentContext();
-      request = ctx.getRequest();
-      if (request != null) {
-        // Capture the span from the request before forwarding.
-        Object contextObj = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-        if (contextObj instanceof Context) {
-          Context context = (Context) contextObj;
-          parentSpan = spanFromContext(context);
+    /**
+     * Using the zuul proxy results in the Spring "HandlerMapping.bestMatchingPattern" value being
+     * very generic. In the case where zuul forwards the request to a more specific Spring controller,
+     * a better pattern will be updated on the request after the call returns, so we want to update
+     * the resource name with that.
+     */
+    public static class FilterInjectingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Local("request") HttpServletRequest request, @Advice.Local("parentSpan") AgentSpan parentSpan) {
+            RequestContext ctx = RequestContext.getCurrentContext();
+            request = ctx.getRequest();
+            if (request != null) {
+                // Capture the span from the request before forwarding.
+                Object contextObj = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+                if (contextObj instanceof Context) {
+                    Context context = (Context) contextObj;
+                    parentSpan = spanFromContext(context);
+                }
+            }
         }
-      }
-    }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Local("request") HttpServletRequest request,
-        @Advice.Local("parentSpan") AgentSpan parentSpan) {
-      if (request != null && parentSpan != null) {
-        final String method = request.getMethod();
-        // Get the updated route pattern.
-        // Opted for static string here to avoid an additional spring dependency.
-        final Object bestMatchingPattern =
-            request.getAttribute(
-                "org.springframework.web.servlet.HandlerMapping.bestMatchingPattern");
-        if (method != null && bestMatchingPattern != null) {
-          HTTP_RESOURCE_DECORATOR.withRoute(parentSpan, method, bestMatchingPattern.toString());
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Local("request") HttpServletRequest request, @Advice.Local("parentSpan") AgentSpan parentSpan) {
+            if (request != null && parentSpan != null) {
+                final String method = request.getMethod();
+                // Get the updated route pattern.
+                // Opted for static string here to avoid an additional spring dependency.
+                final Object bestMatchingPattern =
+                        request.getAttribute("org.springframework.web.servlet.HandlerMapping.bestMatchingPattern");
+                if (method != null && bestMatchingPattern != null) {
+                    HTTP_RESOURCE_DECORATOR.withRoute(parentSpan, method, bestMatchingPattern.toString());
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/test/java/TestApplication.java b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/test/java/TestApplication.java
index f5594a45246..ea207b30307 100644
--- a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/test/java/TestApplication.java
+++ b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/test/java/TestApplication.java
@@ -10,20 +10,20 @@
 @SpringBootApplication(scanBasePackages = "doesnotexist")
 public class TestApplication {
 
-  @RequestMapping(value = "/available")
-  public String available() {
-    return "SUCCESS";
-  }
+    @RequestMapping(value = "/available")
+    public String available() {
+        return "SUCCESS";
+    }
 
-  @RequestMapping(value = "/nested/{proxyPort}")
-  public String nested(@PathVariable("proxyPort") String proxyPort) {
-    final String uri = "http://localhost:" + proxyPort + "/test/available";
-    RestTemplate restTemplate = new RestTemplate();
-    return restTemplate.getForObject(uri, String.class);
-  }
+    @RequestMapping(value = "/nested/{proxyPort}")
+    public String nested(@PathVariable("proxyPort") String proxyPort) {
+        final String uri = "http://localhost:" + proxyPort + "/test/available";
+        RestTemplate restTemplate = new RestTemplate();
+        return restTemplate.getForObject(uri, String.class);
+    }
 
-  @RequestMapping(value = "/headers")
-  public Map<String, String> headers(@RequestHeader Map<String, String> headers) {
-    return headers;
-  }
+    @RequestMapping(value = "/headers")
+    public Map<String, String> headers(@RequestHeader Map<String, String> headers) {
+        return headers;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-core-3.2.2/src/main/java/datadog/trace/instrumentation/springcore/StreamUtilsInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-core-3.2.2/src/main/java/datadog/trace/instrumentation/springcore/StreamUtilsInstrumentation.java
index 1b9f15b2d35..5597acfe915 100644
--- a/dd-java-agent/instrumentation/spring/spring-core-3.2.2/src/main/java/datadog/trace/instrumentation/springcore/StreamUtilsInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-core-3.2.2/src/main/java/datadog/trace/instrumentation/springcore/StreamUtilsInstrumentation.java
@@ -21,43 +21,41 @@
 
 @AutoService(InstrumenterModule.class)
 public final class StreamUtilsInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public StreamUtilsInstrumentation() {
-    super("spring-core");
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("copyToString"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, InputStream.class))
-            .and(takesArgument(1, Charset.class)),
-        StreamUtilsInstrumentation.class.getName() + "$SpringAdvice");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.util.StreamUtils";
-  }
-
-  public static class SpringAdvice {
-
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void checkReturnedObject(
-        @Advice.Return String string, @Advice.Argument(0) final InputStream in) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (string != null && module != null) {
-        module.taintStringIfTainted(string, in);
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public StreamUtilsInstrumentation() {
+        super("spring-core");
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("copyToString"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, InputStream.class))
+                        .and(takesArgument(1, Charset.class)),
+                StreamUtilsInstrumentation.class.getName() + "$SpringAdvice");
     }
 
-    private static void muzzleCheck() throws IOException {
-      StreamUtils.copyToString(
-          new ByteArrayInputStream("test".getBytes(UTF_8)), Charset.defaultCharset());
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.util.StreamUtils";
+    }
+
+    public static class SpringAdvice {
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void checkReturnedObject(@Advice.Return String string, @Advice.Argument(0) final InputStream in) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (string != null && module != null) {
+                module.taintStringIfTainted(string, in);
+            }
+        }
+
+        private static void muzzleCheck() throws IOException {
+            StreamUtils.copyToString(new ByteArrayInputStream("test".getBytes(UTF_8)), Charset.defaultCharset());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/InterceptingRepositoryProxyPostProcessor.java b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/InterceptingRepositoryProxyPostProcessor.java
index c747fb650b6..c768d89b4bc 100644
--- a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/InterceptingRepositoryProxyPostProcessor.java
+++ b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/InterceptingRepositoryProxyPostProcessor.java
@@ -4,21 +4,18 @@
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.core.support.RepositoryProxyPostProcessor;
 
-public final class InterceptingRepositoryProxyPostProcessor
-    implements RepositoryProxyPostProcessor {
-  public static final RepositoryProxyPostProcessor INSTANCE =
-      new InterceptingRepositoryProxyPostProcessor();
+public final class InterceptingRepositoryProxyPostProcessor implements RepositoryProxyPostProcessor {
+    public static final RepositoryProxyPostProcessor INSTANCE = new InterceptingRepositoryProxyPostProcessor();
 
-  // DQH - TODO: Support older versions?
-  // The signature of postProcess changed to add RepositoryInformation in
-  // spring-data-commons 1.9.0
-  // public void postProcess(final ProxyFactory factory) {
-  //   factory.addAdvice(0, RepositoryInterceptor.INSTANCE);
-  // }
+    // DQH - TODO: Support older versions?
+    // The signature of postProcess changed to add RepositoryInformation in
+    // spring-data-commons 1.9.0
+    // public void postProcess(final ProxyFactory factory) {
+    //   factory.addAdvice(0, RepositoryInterceptor.INSTANCE);
+    // }
 
-  @Override
-  public void postProcess(
-      final ProxyFactory factory, final RepositoryInformation repositoryInformation) {
-    factory.addAdvice(0, new RepositoryInterceptor(repositoryInformation.getRepositoryInterface()));
-  }
+    @Override
+    public void postProcess(final ProxyFactory factory, final RepositoryInformation repositoryInformation) {
+        factory.addAdvice(0, new RepositoryInterceptor(repositoryInformation.getRepositoryInterface()));
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/RepositoryInterceptor.java b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/RepositoryInterceptor.java
index 4461ab68576..ada373bc087 100644
--- a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/RepositoryInterceptor.java
+++ b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/RepositoryInterceptor.java
@@ -13,41 +13,41 @@
 import org.springframework.data.repository.Repository;
 
 final class RepositoryInterceptor implements MethodInterceptor {
-  private final Class<?> repositoryInterface;
-
-  RepositoryInterceptor(Class<?> repositoryInterface) {
-    this.repositoryInterface = repositoryInterface;
-  }
-
-  @Override
-  public Object invoke(final MethodInvocation methodInvocation) throws Throwable {
-    final Method invokedMethod = methodInvocation.getMethod();
-    final Class<?> clazz = invokedMethod.getDeclaringClass();
-
-    final boolean isRepositoryOp = Repository.class.isAssignableFrom(clazz);
-    // Since this interceptor is the outer most interceptor, non-Repository methods
-    // including Object methods will also flow through here.  Don't create spans for those.
-    if (!isRepositoryOp) {
-      return methodInvocation.proceed();
+    private final Class<?> repositoryInterface;
+
+    RepositoryInterceptor(Class<?> repositoryInterface) {
+        this.repositoryInterface = repositoryInterface;
     }
 
-    final AgentSpan span = startSpan("spring-data", REPOSITORY_OPERATION);
-    DECORATOR.afterStart(span);
-    DECORATOR.onOperation(span, invokedMethod, repositoryInterface);
-
-    final ContextScope scope = activateSpan(span);
-
-    Object result = null;
-    try {
-      result = methodInvocation.proceed();
-    } catch (final Throwable t) {
-      DECORATOR.onError(scope, t);
-      throw t;
-    } finally {
-      DECORATOR.beforeFinish(scope);
-      scope.close();
-      span.finish();
+    @Override
+    public Object invoke(final MethodInvocation methodInvocation) throws Throwable {
+        final Method invokedMethod = methodInvocation.getMethod();
+        final Class<?> clazz = invokedMethod.getDeclaringClass();
+
+        final boolean isRepositoryOp = Repository.class.isAssignableFrom(clazz);
+        // Since this interceptor is the outer most interceptor, non-Repository methods
+        // including Object methods will also flow through here.  Don't create spans for those.
+        if (!isRepositoryOp) {
+            return methodInvocation.proceed();
+        }
+
+        final AgentSpan span = startSpan("spring-data", REPOSITORY_OPERATION);
+        DECORATOR.afterStart(span);
+        DECORATOR.onOperation(span, invokedMethod, repositoryInterface);
+
+        final ContextScope scope = activateSpan(span);
+
+        Object result = null;
+        try {
+            result = methodInvocation.proceed();
+        } catch (final Throwable t) {
+            DECORATOR.onError(scope, t);
+            throw t;
+        } finally {
+            DECORATOR.beforeFinish(scope);
+            scope.close();
+            span.finish();
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringDataDecorator.java b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringDataDecorator.java
index dd52c9f4d43..f33939ee028 100644
--- a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringDataDecorator.java
+++ b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringDataDecorator.java
@@ -13,42 +13,40 @@
 import javax.annotation.Nullable;
 
 public final class SpringDataDecorator extends ClientDecorator {
-  public static final CharSequence REPOSITORY_OPERATION =
-      UTF8BytesString.create("repository.operation");
-  public static final CharSequence SPRING_DATA = UTF8BytesString.create("spring-data");
-  public static final SpringDataDecorator DECORATOR = new SpringDataDecorator();
-
-  @Override
-  protected String service() {
-    return null;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"spring-data"};
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return SPRING_DATA;
-  }
-
-  public void onOperation(
-      final AgentSpan span, final Method method, @Nullable final Class<?> repositoryIntf) {
-    assert span != null;
-    assert method != null;
-    if (repositoryIntf != null && Config.get().isSpringDataRepositoryInterfaceResourceName()) {
-      span.setResourceName(spanNameForMethod(repositoryIntf, method));
-    } else {
-      span.setResourceName(spanNameForMethod(method));
+    public static final CharSequence REPOSITORY_OPERATION = UTF8BytesString.create("repository.operation");
+    public static final CharSequence SPRING_DATA = UTF8BytesString.create("spring-data");
+    public static final SpringDataDecorator DECORATOR = new SpringDataDecorator();
+
+    @Override
+    protected String service() {
+        return null;
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"spring-data"};
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return SPRING_DATA;
     }
 
-    marker();
-    captureCodeOrigin(false);
-  }
+    public void onOperation(final AgentSpan span, final Method method, @Nullable final Class<?> repositoryIntf) {
+        assert span != null;
+        assert method != null;
+        if (repositoryIntf != null && Config.get().isSpringDataRepositoryInterfaceResourceName()) {
+            span.setResourceName(spanNameForMethod(repositoryIntf, method));
+        } else {
+            span.setResourceName(spanNameForMethod(method));
+        }
+
+        marker();
+        captureCodeOrigin(false);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java
index eeacdb050d9..cf78954fdd0 100644
--- a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java
@@ -13,36 +13,33 @@
 
 @AutoService(InstrumenterModule.class)
 public final class SpringRepositoryInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public SpringRepositoryInstrumentation() {
-    super("spring-data");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.data.repository.core.support.RepositoryFactorySupport";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor(),
-        SpringRepositoryInstrumentation.class.getName() + "$RepositoryFactorySupportAdvice");
-  }
-
-  public static class RepositoryFactorySupportAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onConstruction(
-        @Advice.This final RepositoryFactorySupport repositoryFactorySupport) {
-      repositoryFactorySupport.addRepositoryProxyPostProcessor(
-          InterceptingRepositoryProxyPostProcessor.INSTANCE);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public SpringRepositoryInstrumentation() {
+        super("spring-data");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.data.repository.core.support.RepositoryFactorySupport";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor(), SpringRepositoryInstrumentation.class.getName() + "$RepositoryFactorySupportAdvice");
     }
 
-    // Muzzle doesn't detect the "Override" implementation dependency, so we have to help it.
-    private void muzzleCheck(final RepositoryProxyPostProcessor processor) {
-      processor.postProcess(null, null);
-      // (see usage in InterceptingRepositoryProxyPostProcessor below)
+    public static class RepositoryFactorySupportAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onConstruction(@Advice.This final RepositoryFactorySupport repositoryFactorySupport) {
+            repositoryFactorySupport.addRepositoryProxyPostProcessor(InterceptingRepositoryProxyPostProcessor.INSTANCE);
+        }
+
+        // Muzzle doesn't detect the "Override" implementation dependency, so we have to help it.
+        private void muzzleCheck(final RepositoryProxyPostProcessor processor) {
+            processor.postProcess(null, null);
+            // (see usage in InterceptingRepositoryProxyPostProcessor below)
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/test/java/spring/jpa/JpaCustomer.java b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/test/java/spring/jpa/JpaCustomer.java
index 130fe19a09b..29548e05e5d 100644
--- a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/test/java/spring/jpa/JpaCustomer.java
+++ b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/test/java/spring/jpa/JpaCustomer.java
@@ -10,34 +10,34 @@
 @Entity
 public class JpaCustomer {
 
-  @Id
-  @GeneratedValue(strategy = GenerationType.AUTO)
-  private Long id;
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
 
-  private String firstName;
-  private String lastName;
+    private String firstName;
+    private String lastName;
 
-  protected JpaCustomer() {}
+    protected JpaCustomer() {}
 
-  public JpaCustomer(final String firstName, final String lastName) {
-    this.firstName = firstName;
-    this.lastName = lastName;
-  }
+    public JpaCustomer(final String firstName, final String lastName) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
 
-  @Override
-  public String toString() {
-    return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
-  }
+    @Override
+    public String toString() {
+        return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
+    }
 
-  public Long getId() {
-    return id;
-  }
+    public Long getId() {
+        return id;
+    }
 
-  public String getFirstName() {
-    return firstName;
-  }
+    public String getFirstName() {
+        return firstName;
+    }
 
-  public String getLastName() {
-    return lastName;
-  }
+    public String getLastName() {
+        return lastName;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/test/java/spring/jpa/JpaCustomerRepository.java b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/test/java/spring/jpa/JpaCustomerRepository.java
index 0c2237baeaf..6b7b91814fd 100644
--- a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/test/java/spring/jpa/JpaCustomerRepository.java
+++ b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/test/java/spring/jpa/JpaCustomerRepository.java
@@ -6,5 +6,5 @@
 import org.springframework.data.repository.CrudRepository;
 
 public interface JpaCustomerRepository extends CrudRepository<JpaCustomer, Long> {
-  List<JpaCustomer> findByLastName(String lastName);
+    List<JpaCustomer> findByLastName(String lastName);
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/test/java/spring/jpa/JpaPersistenceConfig.java b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/test/java/spring/jpa/JpaPersistenceConfig.java
index 564d11cd9da..d5c67c75979 100644
--- a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/test/java/spring/jpa/JpaPersistenceConfig.java
+++ b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/test/java/spring/jpa/JpaPersistenceConfig.java
@@ -15,33 +15,33 @@
 @EnableJpaRepositories(basePackages = "spring.jpa")
 public class JpaPersistenceConfig {
 
-  @Bean
-  public PlatformTransactionManager transactionManager() {
-    final JpaTransactionManager transactionManager = new JpaTransactionManager();
-    transactionManager.setEntityManagerFactory(entityManagerFactory().getObject());
-    return transactionManager;
-  }
+    @Bean
+    public PlatformTransactionManager transactionManager() {
+        final JpaTransactionManager transactionManager = new JpaTransactionManager();
+        transactionManager.setEntityManagerFactory(entityManagerFactory().getObject());
+        return transactionManager;
+    }
 
-  @Bean
-  public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
-    final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-    vendorAdapter.setDatabase(Database.HSQL);
-    vendorAdapter.setGenerateDdl(true);
+    @Bean
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
+        final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+        vendorAdapter.setDatabase(Database.HSQL);
+        vendorAdapter.setGenerateDdl(true);
 
-    final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
-    em.setDataSource(dataSource());
-    em.setPackagesToScan("spring.jpa");
-    em.setJpaVendorAdapter(vendorAdapter);
-    return em;
-  }
+        final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+        em.setDataSource(dataSource());
+        em.setPackagesToScan("spring.jpa");
+        em.setJpaVendorAdapter(vendorAdapter);
+        return em;
+    }
 
-  @Bean
-  public DataSource dataSource() {
-    final DriverManagerDataSource dataSource = new DriverManagerDataSource();
-    dataSource.setDriverClassName("org.hsqldb.jdbcDriver");
-    dataSource.setUrl("jdbc:hsqldb:mem:test");
-    dataSource.setUsername("sa");
-    dataSource.setPassword("1");
-    return dataSource;
-  }
+    @Bean
+    public DataSource dataSource() {
+        final DriverManagerDataSource dataSource = new DriverManagerDataSource();
+        dataSource.setDriverClassName("org.hsqldb.jdbcDriver");
+        dataSource.setUrl("jdbc:hsqldb:mem:test");
+        dataSource.setUsername("sa");
+        dataSource.setPassword("1");
+        return dataSource;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-jms-3.1/src/main/java/datadog/trace/instrumentation/springjms/AbstractPollingMessageListenerContainerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-jms-3.1/src/main/java/datadog/trace/instrumentation/springjms/AbstractPollingMessageListenerContainerInstrumentation.java
index 3ad07247953..640515fb519 100644
--- a/dd-java-agent/instrumentation/spring/spring-jms-3.1/src/main/java/datadog/trace/instrumentation/springjms/AbstractPollingMessageListenerContainerInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-jms-3.1/src/main/java/datadog/trace/instrumentation/springjms/AbstractPollingMessageListenerContainerInstrumentation.java
@@ -19,58 +19,57 @@
 import net.bytebuddy.asm.Advice;
 
 @AutoService(InstrumenterModule.class)
-public class AbstractPollingMessageListenerContainerInstrumentation
-    extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class AbstractPollingMessageListenerContainerInstrumentation extends InstrumenterModule.Tracing
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public AbstractPollingMessageListenerContainerInstrumentation() {
-    super("spring-jms", "jms");
-  }
+    public AbstractPollingMessageListenerContainerInstrumentation() {
+        super("spring-jms", "jms");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.jms.listener.AbstractPollingMessageListenerContainer";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.jms.listener.AbstractPollingMessageListenerContainer";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("javax.jms.MessageConsumer", MessageConsumerState.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("javax.jms.MessageConsumer", MessageConsumerState.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("receiveAndExecute").and(takesArgument(2, named("javax.jms.MessageConsumer"))),
-        getClass().getName() + "$CompleteMessageSpanAfterExecute");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("receiveAndExecute").and(takesArgument(2, named("javax.jms.MessageConsumer"))),
+                getClass().getName() + "$CompleteMessageSpanAfterExecute");
+    }
 
-  public static class CompleteMessageSpanAfterExecute {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterExecute(@Advice.Argument(2) final MessageConsumer consumer) {
-      if (null == consumer) {
-        return; // temporary consumer was created+closed during the call, need for extra clean-up
-      }
+    public static class CompleteMessageSpanAfterExecute {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterExecute(@Advice.Argument(2) final MessageConsumer consumer) {
+            if (null == consumer) {
+                return; // temporary consumer was created+closed during the call, need for extra clean-up
+            }
 
-      // complete the last polled message span now that we know its execution phase is complete
-      // this results in more accurate durations than if we relied on the iteration span cleaner
-      // (uses same approach as the 'beforeReceive' advice in JMSMessageConsumerInstrumentation)
-      MessageConsumerState consumerState =
-          InstrumentationContext.get(MessageConsumer.class, MessageConsumerState.class)
-              .get(consumer);
-      if (null != consumerState) {
-        boolean finishSpan = consumerState.getSessionState().isAutoAcknowledge();
-        if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-          closePrevious(finishSpan);
-        } else {
-          final AgentSpan previousSpan = spanFromContext(rootContext().swap());
-          if (previousSpan != null) {
-            previousSpan.finishWithEndToEnd();
-          }
-        }
-        if (finishSpan) {
-          consumerState.finishTimeInQueueSpan(false);
+            // complete the last polled message span now that we know its execution phase is complete
+            // this results in more accurate durations than if we relied on the iteration span cleaner
+            // (uses same approach as the 'beforeReceive' advice in JMSMessageConsumerInstrumentation)
+            MessageConsumerState consumerState = InstrumentationContext.get(
+                            MessageConsumer.class, MessageConsumerState.class)
+                    .get(consumer);
+            if (null != consumerState) {
+                boolean finishSpan = consumerState.getSessionState().isAutoAcknowledge();
+                if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+                    closePrevious(finishSpan);
+                } else {
+                    final AgentSpan previousSpan = spanFromContext(rootContext().swap());
+                    if (previousSpan != null) {
+                        previousSpan.finishWithEndToEnd();
+                    }
+                }
+                if (finishSpan) {
+                    consumerState.finishTimeInQueueSpan(false);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/KotlinAwareHandlerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/KotlinAwareHandlerInstrumentation.java
index 081de301d3f..50d08b6206d 100644
--- a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/KotlinAwareHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/KotlinAwareHandlerInstrumentation.java
@@ -32,38 +32,37 @@
  */
 @AutoService(InstrumenterModule.class)
 public class KotlinAwareHandlerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public KotlinAwareHandlerInstrumentation() {
-    super("spring-messaging", "spring-messaging-4", "spring-messaging-kotlin");
-  }
+    public KotlinAwareHandlerInstrumentation() {
+        super("spring-messaging", "spring-messaging-4", "spring-messaging-kotlin");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.reactivestreams.Publisher", HandoffContext.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.reactivestreams.Publisher", HandoffContext.class.getName());
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.kafka.listener.adapter.KotlinAwareInvocableHandlerMethod";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.kafka.listener.adapter.KotlinAwareInvocableHandlerMethod";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("doInvoke")),
-        KotlinAwareHandlerInstrumentation.class.getName() + "$DoInvokeAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("doInvoke")),
+                KotlinAwareHandlerInstrumentation.class.getName() + "$DoInvokeAdvice");
+    }
 
-  public static class DoInvokeAdvice {
+    public static class DoInvokeAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(@Advice.Return Object result) {
-      if (result instanceof Publisher) {
-        InstrumentationContext.get(Publisher.class, HandoffContext.class)
-            .put((Publisher<?>) result, HandoffContext.anyThread(currentContext()));
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(@Advice.Return Object result) {
+            if (result instanceof Publisher) {
+                InstrumentationContext.get(Publisher.class, HandoffContext.class)
+                        .put((Publisher<?>) result, HandoffContext.anyThread(currentContext()));
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageDecorator.java b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageDecorator.java
index 1cd547c75dc..6ee4ae513e6 100644
--- a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageDecorator.java
+++ b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageDecorator.java
@@ -8,36 +8,35 @@
 import datadog.trace.bootstrap.instrumentation.decorator.MessagingClientDecorator;
 
 public final class SpringMessageDecorator extends MessagingClientDecorator {
-  public static final SpringMessageDecorator DECORATE = new SpringMessageDecorator();
-
-  public static final CharSequence SPRING_INBOUND =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().messaging().inboundOperation("spring"));
-
-  public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("spring-messaging");
-
-  @Override
-  protected CharSequence spanType() {
-    return MESSAGE_CONSUMER;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"spring-messaging"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected String service() {
-    return null;
-  }
-
-  @Override
-  protected String spanKind() {
-    return SPAN_KIND_CONSUMER;
-  }
+    public static final SpringMessageDecorator DECORATE = new SpringMessageDecorator();
+
+    public static final CharSequence SPRING_INBOUND = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().messaging().inboundOperation("spring"));
+
+    public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("spring-messaging");
+
+    @Override
+    protected CharSequence spanType() {
+        return MESSAGE_CONSUMER;
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"spring-messaging"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
+
+    @Override
+    protected String service() {
+        return null;
+    }
+
+    @Override
+    protected String spanKind() {
+        return SPAN_KIND_CONSUMER;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageExtractAdapter.java b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageExtractAdapter.java
index 2d6e1befd70..53e4d062947 100644
--- a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageExtractAdapter.java
+++ b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageExtractAdapter.java
@@ -12,47 +12,45 @@
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 
-public final class SpringMessageExtractAdapter
-    implements AgentPropagation.ContextVisitor<Message<?>> {
+public final class SpringMessageExtractAdapter implements AgentPropagation.ContextVisitor<Message<?>> {
 
-  private static final Function<String, String> KEY_MAPPER =
-      new Function<String, String>() {
+    private static final Function<String, String> KEY_MAPPER = new Function<String, String>() {
         @SuppressForbidden
         @Override
         public String apply(String key) {
-          // normalize headers from different providers; raw SQS, JMS, spring-messaging, etc.
-          if ("AWSTraceHeader".equals(key) || "Sqs_Msa_AWSTraceHeader".equals(key)) {
-            return "x-amzn-trace-id";
-          }
-          return key.replace("__dash__", "-").replace('$', '-').toLowerCase(Locale.ROOT);
+            // normalize headers from different providers; raw SQS, JMS, spring-messaging, etc.
+            if ("AWSTraceHeader".equals(key) || "Sqs_Msa_AWSTraceHeader".equals(key)) {
+                return "x-amzn-trace-id";
+            }
+            return key.replace("__dash__", "-").replace('$', '-').toLowerCase(Locale.ROOT);
         }
-      };
+    };
 
-  private final DDCache<String, String> cache = DDCaches.newFixedSizeCache(32);
+    private final DDCache<String, String> cache = DDCaches.newFixedSizeCache(32);
 
-  public static final SpringMessageExtractAdapter GETTER = new SpringMessageExtractAdapter();
+    public static final SpringMessageExtractAdapter GETTER = new SpringMessageExtractAdapter();
 
-  @Override
-  public void forEachKey(Message<?> carrier, AgentPropagation.KeyClassifier classifier) {
-    final MessageHeaders messageHeaders = carrier.getHeaders();
-    if (messageHeaders == null || messageHeaders.isEmpty()) {
-      return;
-    }
-
-    for (Map.Entry<String, ?> header : messageHeaders.entrySet()) {
-      Object headerValue = header.getValue();
-      if ("_datadog".equals(header.getKey())) {
-        if (headerValue instanceof String) {
-          DatadogAttributeParser.forEachProperty(classifier, (String) headerValue);
-        } else if (headerValue instanceof ByteBuffer) {
-          DatadogAttributeParser.forEachProperty(classifier, (ByteBuffer) headerValue);
+    @Override
+    public void forEachKey(Message<?> carrier, AgentPropagation.KeyClassifier classifier) {
+        final MessageHeaders messageHeaders = carrier.getHeaders();
+        if (messageHeaders == null || messageHeaders.isEmpty()) {
+            return;
         }
-      } else if (headerValue instanceof String) {
-        String lowerCaseKey = cache.computeIfAbsent(header.getKey(), KEY_MAPPER);
-        if (!classifier.accept(lowerCaseKey, (String) headerValue)) {
-          return;
+
+        for (Map.Entry<String, ?> header : messageHeaders.entrySet()) {
+            Object headerValue = header.getValue();
+            if ("_datadog".equals(header.getKey())) {
+                if (headerValue instanceof String) {
+                    DatadogAttributeParser.forEachProperty(classifier, (String) headerValue);
+                } else if (headerValue instanceof ByteBuffer) {
+                    DatadogAttributeParser.forEachProperty(classifier, (ByteBuffer) headerValue);
+                }
+            } else if (headerValue instanceof String) {
+                String lowerCaseKey = cache.computeIfAbsent(header.getKey(), KEY_MAPPER);
+                if (!classifier.accept(lowerCaseKey, (String) headerValue)) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java
index f93309d9dd7..75c45218c2e 100644
--- a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java
@@ -28,80 +28,78 @@
 
 @AutoService(InstrumenterModule.class)
 public final class SpringMessageHandlerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public SpringMessageHandlerInstrumentation() {
-    super("spring-messaging", "spring-messaging-4");
-  }
+    public SpringMessageHandlerInstrumentation() {
+        super("spring-messaging", "spring-messaging-4");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.messaging.handler.invocation.InvocableHandlerMethod";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.messaging.handler.invocation.InvocableHandlerMethod";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(
-                named("invoke")
-                    .and(takesArgument(0, named("org.springframework.messaging.Message")))),
-        SpringMessageHandlerInstrumentation.class.getName() + "$ContextPropagationAdvice",
-        SpringMessageHandlerInstrumentation.class.getName() + "$HandleMessageAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod().and(named("invoke").and(takesArgument(0, named("org.springframework.messaging.Message")))),
+                SpringMessageHandlerInstrumentation.class.getName() + "$ContextPropagationAdvice",
+                SpringMessageHandlerInstrumentation.class.getName() + "$HandleMessageAdvice");
+    }
 
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextPropagationAdvice {
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextPropagationAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) Message<?> message, @Advice.Local("ctxScope") ContextScope scope) {
-      if (activeSpan() == null) {
-        // no local active span, so extract from message to avoid disconnected trace
-        scope = defaultPropagator().extract(rootContext(), message, GETTER).attach();
-      }
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Argument(0) Message<?> message, @Advice.Local("ctxScope") ContextScope scope) {
+            if (activeSpan() == null) {
+                // no local active span, so extract from message to avoid disconnected trace
+                scope = defaultPropagator()
+                        .extract(rootContext(), message, GETTER)
+                        .attach();
+            }
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(@Advice.Local("ctxScope") ContextScope scope) {
-      if (scope != null) scope.close();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(@Advice.Local("ctxScope") ContextScope scope) {
+            if (scope != null) scope.close();
+        }
     }
-  }
 
-  public static class HandleMessageAdvice {
+    public static class HandleMessageAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(@Advice.This InvocableHandlerMethod thiz) {
-      AgentSpan span = startSpan(COMPONENT_NAME.toString(), SPRING_INBOUND);
-      DECORATE.afterStart(span);
-      span.setResourceName(DECORATE.spanNameForMethod(thiz.getMethod()));
-      return activateSpan(span);
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(@Advice.This InvocableHandlerMethod thiz) {
+            AgentSpan span = startSpan(COMPONENT_NAME.toString(), SPRING_INBOUND);
+            DECORATE.afterStart(span);
+            span.setResourceName(DECORATE.spanNameForMethod(thiz.getMethod()));
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Enter ContextScope scope,
-        @Advice.Return(readOnly = false) Object result,
-        @Advice.Thrown Throwable error) {
-      if (null == scope) {
-        return;
-      }
-      AgentSpan span = spanFromScope(scope);
-      scope.close();
-      if (null != error) {
-        DECORATE.onError(span, error);
-      }
-      if (result != null) {
-        Object wrappedResult =
-            AsyncResultExtensions.wrapAsyncResult(result, result.getClass(), span);
-        if (wrappedResult != null) {
-          result = wrappedResult;
-          // span will be finished by the wrapper
-          return;
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Enter ContextScope scope,
+                @Advice.Return(readOnly = false) Object result,
+                @Advice.Thrown Throwable error) {
+            if (null == scope) {
+                return;
+            }
+            AgentSpan span = spanFromScope(scope);
+            scope.close();
+            if (null != error) {
+                DECORATE.onError(span, error);
+            }
+            if (result != null) {
+                Object wrappedResult = AsyncResultExtensions.wrapAsyncResult(result, result.getClass(), span);
+                if (wrappedResult != null) {
+                    result = wrappedResult;
+                    // span will be finished by the wrapper
+                    return;
+                }
+            }
+            DECORATE.beforeFinish(span);
+            span.finish();
         }
-      }
-      DECORATE.beforeFinish(span);
-      span.finish();
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java
index debe2785adc..fb0a5bd08d9 100644
--- a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java
@@ -28,70 +28,71 @@
 
 @AutoService(InstrumenterModule.class)
 public class AbstractMessageListenerContainerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
 
-  public AbstractMessageListenerContainerInstrumentation() {
-    super("spring-rabbit");
-  }
+    public AbstractMessageListenerContainerInstrumentation() {
+        super("spring-rabbit");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("org.springframework.amqp.core.Message", State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.springframework.amqp.core.Message", State.class.getName());
+    }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    // Even though this class isn't immediately relevant to spring-rabbit, it's loaded by the test.
-    return singletonMap(
-        RUNNABLE,
-        singleton("org.springframework.boot.logging.logback.LogbackLoggingSystem$ShutdownHandler"));
-  }
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        // Even though this class isn't immediately relevant to spring-rabbit, it's loaded by the test.
+        return singletonMap(
+                RUNNABLE, singleton("org.springframework.boot.logging.logback.LogbackLoggingSystem$ShutdownHandler"));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("executeListener").and(takesArgument(1, Object.class)),
-        getClass().getName() + "$ActivateContinuation");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("executeListener").and(takesArgument(1, Object.class)),
+                getClass().getName() + "$ActivateContinuation");
+    }
 
-  public static class ActivateContinuation {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope activate(@Advice.Argument(1) Object data) {
-      if (data instanceof Message) {
-        Message message = (Message) data;
-        State state = InstrumentationContext.get(Message.class, State.class).get(message);
-        if (null != state) {
-          ContextContinuation continuation = state.getAndResetContinuation();
-          if (null != continuation) {
-            try (ContextScope scope = continuation.resume()) {
-              AgentSpan span = startSpan("rabbitmq-amqp", AMQP_CONSUME);
-              span.setMeasured(true);
-              DECORATE.afterStart(span);
-              DECORATE.onConsume(span, message.getMessageProperties().getConsumerQueue());
-              return activateSpan(span);
+    public static class ActivateContinuation {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope activate(@Advice.Argument(1) Object data) {
+            if (data instanceof Message) {
+                Message message = (Message) data;
+                State state =
+                        InstrumentationContext.get(Message.class, State.class).get(message);
+                if (null != state) {
+                    ContextContinuation continuation = state.getAndResetContinuation();
+                    if (null != continuation) {
+                        try (ContextScope scope = continuation.resume()) {
+                            AgentSpan span = startSpan("rabbitmq-amqp", AMQP_CONSUME);
+                            span.setMeasured(true);
+                            DECORATE.afterStart(span);
+                            DECORATE.onConsume(
+                                    span, message.getMessageProperties().getConsumerQueue());
+                            return activateSpan(span);
+                        }
+                    }
+                }
             }
-          }
+            return null;
         }
-      }
-      return null;
-    }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void close(@Advice.Enter ContextScope scope, @Advice.Thrown Throwable error) {
-      if (null != scope) {
-        AgentSpan span = spanFromScope(scope);
-        if (null != error) {
-          DECORATE.onError(span, error);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void close(@Advice.Enter ContextScope scope, @Advice.Thrown Throwable error) {
+            if (null != scope) {
+                AgentSpan span = spanFromScope(scope);
+                if (null != error) {
+                    DECORATE.onError(span, error);
+                }
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            }
         }
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/BlockingQueueConsumerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/BlockingQueueConsumerInstrumentation.java
index dc0ba998427..6c58f0a6708 100644
--- a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/BlockingQueueConsumerInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/BlockingQueueConsumerInstrumentation.java
@@ -17,45 +17,42 @@
 
 @AutoService(InstrumenterModule.class)
 public class BlockingQueueConsumerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public BlockingQueueConsumerInstrumentation() {
-    super("spring-rabbit");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public BlockingQueueConsumerInstrumentation() {
+        super("spring-rabbit");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.amqp.rabbit.listener.BlockingQueueConsumer";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.amqp.rabbit.listener.BlockingQueueConsumer";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("handle")
-            .and(takesArgument(0, named("org.springframework.amqp.rabbit.support.Delivery"))),
-        getClass().getName() + "$TransferState");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("handle").and(takesArgument(0, named("org.springframework.amqp.rabbit.support.Delivery"))),
+                getClass().getName() + "$TransferState");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStore = new TreeMap<>();
-    contextStore.put("org.springframework.amqp.core.Message", State.class.getName());
-    contextStore.put("org.springframework.amqp.rabbit.support.Delivery", State.class.getName());
-    return contextStore;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStore = new TreeMap<>();
+        contextStore.put("org.springframework.amqp.core.Message", State.class.getName());
+        contextStore.put("org.springframework.amqp.rabbit.support.Delivery", State.class.getName());
+        return contextStore;
+    }
 
-  public static class TransferState {
-    @Advice.OnMethodExit
-    public static void transfer(
-        @Advice.Argument(0) Delivery delivery, @Advice.Return Message message) {
-      if (null != delivery) {
-        ContextStore<Delivery, State> from =
-            InstrumentationContext.get(Delivery.class, State.class);
-        State state = from.get(delivery);
-        if (null != state) {
-          from.put(delivery, null);
-          InstrumentationContext.get(Message.class, State.class).put(message, state);
+    public static class TransferState {
+        @Advice.OnMethodExit
+        public static void transfer(@Advice.Argument(0) Delivery delivery, @Advice.Return Message message) {
+            if (null != delivery) {
+                ContextStore<Delivery, State> from = InstrumentationContext.get(Delivery.class, State.class);
+                State state = from.get(delivery);
+                if (null != state) {
+                    from.put(delivery, null);
+                    InstrumentationContext.get(Message.class, State.class).put(message, state);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/DeliveryInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/DeliveryInstrumentation.java
index 3169c6dea4b..c94eb296f78 100644
--- a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/DeliveryInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/DeliveryInstrumentation.java
@@ -17,35 +17,35 @@
 
 @AutoService(InstrumenterModule.class)
 public class DeliveryInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public DeliveryInstrumentation() {
-    super("spring-rabbit");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public DeliveryInstrumentation() {
+        super("spring-rabbit");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.amqp.rabbit.support.Delivery";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.amqp.rabbit.support.Delivery";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureActiveScope");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureActiveScope");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("org.springframework.amqp.rabbit.support.Delivery", State.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.springframework.amqp.rabbit.support.Delivery", State.class.getName());
+    }
 
-  public static class CaptureActiveScope {
-    @Advice.OnMethodExit
-    public static void captureActiveScope(@Advice.This Delivery delivery) {
-      Context context = currentContext();
-      if (shouldCapture(context)) {
-        State state = State.FACTORY.create();
-        state.captureAndSetContinuation(context);
-        InstrumentationContext.get(Delivery.class, State.class).put(delivery, state);
-      }
+    public static class CaptureActiveScope {
+        @Advice.OnMethodExit
+        public static void captureActiveScope(@Advice.This Delivery delivery) {
+            Context context = currentContext();
+            if (shouldCapture(context)) {
+                State state = State.FACTORY.create();
+                state.captureAndSetContinuation(context);
+                InstrumentationContext.get(Delivery.class, State.class).put(delivery, state);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/RabbitListenerDecorator.java b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/RabbitListenerDecorator.java
index b223458fb12..077c94fb5a0 100644
--- a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/RabbitListenerDecorator.java
+++ b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/RabbitListenerDecorator.java
@@ -5,37 +5,37 @@
 import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;
 
 public class RabbitListenerDecorator extends BaseDecorator {
-  public static final RabbitListenerDecorator DECORATE = new RabbitListenerDecorator();
-
-  public static final CharSequence AMQP_CONSUME = UTF8BytesString.create("amqp.consume");
-  public static final CharSequence RABBITMQ_AMQP = UTF8BytesString.create("rabbitmq-amqp");
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"amqp", "rabbitmq"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return RABBITMQ_AMQP;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
-
-  public void onConsume(AgentSpan span, String queueName) {
-    span.setResourceName("amqp.consume " + normalizeQueueName(queueName));
-  }
-
-  private String normalizeQueueName(String queueName) {
-    if (queueName == null || queueName.isEmpty()) {
-      return "<default>";
-    } else if (queueName.startsWith("amq.gen-")) {
-      return "<generated>";
-    } else {
-      return queueName;
+    public static final RabbitListenerDecorator DECORATE = new RabbitListenerDecorator();
+
+    public static final CharSequence AMQP_CONSUME = UTF8BytesString.create("amqp.consume");
+    public static final CharSequence RABBITMQ_AMQP = UTF8BytesString.create("rabbitmq-amqp");
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"amqp", "rabbitmq"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return RABBITMQ_AMQP;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
+
+    public void onConsume(AgentSpan span, String queueName) {
+        span.setResourceName("amqp.consume " + normalizeQueueName(queueName));
+    }
+
+    private String normalizeQueueName(String queueName) {
+        if (queueName == null || queueName.isEmpty()) {
+            return "<default>";
+        } else if (queueName.startsWith("amq.gen-")) {
+            return "<generated>";
+        } else {
+            return queueName;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/test/java/rabbit/MessagingRabbitMQApplication.java b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/test/java/rabbit/MessagingRabbitMQApplication.java
index 3f3a512ea8e..47d038e611e 100644
--- a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/test/java/rabbit/MessagingRabbitMQApplication.java
+++ b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/test/java/rabbit/MessagingRabbitMQApplication.java
@@ -16,49 +16,49 @@
 @SpringBootApplication
 public class MessagingRabbitMQApplication {
 
-  public static String hostName = "127.0.0.1";
-  public static int port = 5672;
+    public static String hostName = "127.0.0.1";
+    public static int port = 5672;
 
-  static final String topicExchangeName = "test-exchange";
+    static final String topicExchangeName = "test-exchange";
 
-  static final String queueName = "test-queue";
+    static final String queueName = "test-queue";
 
-  @Bean
-  Queue queue() {
-    return new Queue(queueName, false);
-  }
+    @Bean
+    Queue queue() {
+        return new Queue(queueName, false);
+    }
 
-  @Bean
-  TopicExchange exchange() {
-    return new TopicExchange(topicExchangeName);
-  }
+    @Bean
+    TopicExchange exchange() {
+        return new TopicExchange(topicExchangeName);
+    }
 
-  @Bean
-  Binding binding(Queue queue, TopicExchange exchange) {
-    return BindingBuilder.bind(queue).to(exchange).with("foo.bar.#");
-  }
+    @Bean
+    Binding binding(Queue queue, TopicExchange exchange) {
+        return BindingBuilder.bind(queue).to(exchange).with("foo.bar.#");
+    }
 
-  @Bean
-  ConnectionFactory connectionFactory() {
-    return new CachingConnectionFactory(hostName, port);
-  }
+    @Bean
+    ConnectionFactory connectionFactory() {
+        return new CachingConnectionFactory(hostName, port);
+    }
 
-  @Bean
-  SimpleMessageListenerContainer container(
-      ConnectionFactory connectionFactory, MessageListenerAdapter listenerAdapter) {
-    SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
-    container.setConnectionFactory(connectionFactory);
-    container.setQueueNames(queueName);
-    container.setMessageListener(listenerAdapter);
-    return container;
-  }
+    @Bean
+    SimpleMessageListenerContainer container(
+            ConnectionFactory connectionFactory, MessageListenerAdapter listenerAdapter) {
+        SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
+        container.setConnectionFactory(connectionFactory);
+        container.setQueueNames(queueName);
+        container.setMessageListener(listenerAdapter);
+        return container;
+    }
 
-  @Bean
-  MessageListenerAdapter listenerAdapter(Receiver receiver) {
-    return new MessageListenerAdapter(receiver, "receiveMessage");
-  }
+    @Bean
+    MessageListenerAdapter listenerAdapter(Receiver receiver) {
+        return new MessageListenerAdapter(receiver, "receiveMessage");
+    }
 
-  public static ConfigurableApplicationContext run() {
-    return SpringApplication.run(MessagingRabbitMQApplication.class);
-  }
+    public static ConfigurableApplicationContext run() {
+        return SpringApplication.run(MessagingRabbitMQApplication.class);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/test/java/rabbit/Receiver.java b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/test/java/rabbit/Receiver.java
index 3425550fe5e..49e3e29d562 100644
--- a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/test/java/rabbit/Receiver.java
+++ b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/test/java/rabbit/Receiver.java
@@ -8,11 +8,11 @@
 @Component
 public class Receiver {
 
-  public final CountDownLatch latch = new CountDownLatch(1);
+    public final CountDownLatch latch = new CountDownLatch(1);
 
-  @Trace(operationName = "receive")
-  public void receiveMessage(String message) {
-    assert null != AgentTracer.activeSpan() : "no active span during message receipt";
-    latch.countDown();
-  }
+    @Trace(operationName = "receive")
+    public void receiveMessage(String message) {
+        assert null != AgentTracer.activeSpan() : "no active span during message receipt";
+        latch.countDown();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/test/java/rabbit/Sender.java b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/test/java/rabbit/Sender.java
index cb71d2893ec..1e3bd879ea8 100644
--- a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/test/java/rabbit/Sender.java
+++ b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/test/java/rabbit/Sender.java
@@ -6,14 +6,13 @@
 @Component
 public class Sender {
 
-  private final RabbitTemplate template;
+    private final RabbitTemplate template;
 
-  public Sender(RabbitTemplate template) {
-    this.template = template;
-  }
+    public Sender(RabbitTemplate template) {
+        this.template = template;
+    }
 
-  public void send(String route, String message) {
-    template.convertAndSend(
-        MessagingRabbitMQApplication.topicExchangeName, "foo.bar." + route, message);
-  }
+    public void send(String route, String message) {
+        template.convertAndSend(MessagingRabbitMQApplication.topicExchangeName, "foo.bar." + route, message);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/AsyncTask.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/AsyncTask.java
index 168abee6ad4..b8a07e80f3d 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/AsyncTask.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/AsyncTask.java
@@ -5,13 +5,13 @@
 
 public class AsyncTask {
 
-  @Async
-  public CompletableFuture<Integer> async() {
-    return CompletableFuture.completedFuture(getInt());
-  }
+    @Async
+    public CompletableFuture<Integer> async() {
+        return CompletableFuture.completedFuture(getInt());
+    }
 
-  @Trace
-  public int getInt() {
-    return ThreadLocalRandom.current().nextInt();
-  }
+    @Trace
+    public int getInt() {
+        return ThreadLocalRandom.current().nextInt();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/AsyncTaskConfig.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/AsyncTaskConfig.java
index 94a9196dfac..2387d34e7f8 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/AsyncTaskConfig.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/AsyncTaskConfig.java
@@ -8,8 +8,8 @@
 @EnableAsync
 public class AsyncTaskConfig {
 
-  @Bean
-  AsyncTask asyncTask() {
-    return new AsyncTask();
-  }
+    @Bean
+    AsyncTask asyncTask() {
+        return new AsyncTask();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/IntervalTask.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/IntervalTask.java
index 7fcd1c92af2..7b32c297a45 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/IntervalTask.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/IntervalTask.java
@@ -6,15 +6,15 @@
 @Component
 public class IntervalTask implements Runnable {
 
-  private final CountDownLatch latch = new CountDownLatch(1);
+    private final CountDownLatch latch = new CountDownLatch(1);
 
-  @Scheduled(fixedRate = 5000, scheduler = "tracingTaskScheduler")
-  @Override
-  public void run() {
-    latch.countDown();
-  }
+    @Scheduled(fixedRate = 5000, scheduler = "tracingTaskScheduler")
+    @Override
+    public void run() {
+        latch.countDown();
+    }
 
-  public void blockUntilExecute() throws InterruptedException {
-    latch.await(5, TimeUnit.SECONDS);
-  }
+    public void blockUntilExecute() throws InterruptedException {
+        latch.await(5, TimeUnit.SECONDS);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/IntervalTaskConfig.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/IntervalTaskConfig.java
index 58309a70ba3..4bfddfa6a12 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/IntervalTaskConfig.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/IntervalTaskConfig.java
@@ -5,8 +5,8 @@
 @Configuration
 @EnableScheduling
 public class IntervalTaskConfig {
-  @Bean
-  public IntervalTask scheduledTasks() {
-    return new IntervalTask();
-  }
+    @Bean
+    public IntervalTask scheduledTasks() {
+        return new IntervalTask();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/LambdaTaskConfig.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/LambdaTaskConfig.java
index cd12e2f04f8..e62d886139d 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/LambdaTaskConfig.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/LambdaTaskConfig.java
@@ -6,8 +6,8 @@
 @EnableScheduling
 public class LambdaTaskConfig {
 
-  @Bean
-  LambdaTaskConfigurer lambdaTaskConfigurer() {
-    return new LambdaTaskConfigurer();
-  }
+    @Bean
+    LambdaTaskConfigurer lambdaTaskConfigurer() {
+        return new LambdaTaskConfigurer();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/LambdaTaskConfigurer.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/LambdaTaskConfigurer.java
index 75d63d2cdc2..4de8dbe67f0 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/LambdaTaskConfigurer.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/LambdaTaskConfigurer.java
@@ -6,12 +6,12 @@
 @Service
 public class LambdaTaskConfigurer implements SchedulingConfigurer {
 
-  public final CountDownLatch singleUseLatch = new CountDownLatch(1);
+    public final CountDownLatch singleUseLatch = new CountDownLatch(1);
 
-  @Override
-  public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-    // need to manually set in this case since it won't use the scheduler in the annotation
-    taskRegistrar.setTaskScheduler(new SchedulingConfig.TracingTaskScheduler());
-    taskRegistrar.addFixedDelayTask(singleUseLatch::countDown, 500);
-  }
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+        // need to manually set in this case since it won't use the scheduler in the annotation
+        taskRegistrar.setTaskScheduler(new SchedulingConfig.TracingTaskScheduler());
+        taskRegistrar.addFixedDelayTask(singleUseLatch::countDown, 500);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/SchedulingConfig.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/SchedulingConfig.java
index 279e58be410..da3e7240402 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/SchedulingConfig.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/SchedulingConfig.java
@@ -13,91 +13,86 @@
 
 @Configuration
 public class SchedulingConfig {
-  static class TracingTaskScheduler implements TaskScheduler {
-    final ThreadPoolTaskScheduler scheduler;
-
-    TracingTaskScheduler() {
-      scheduler = new ThreadPoolTaskScheduler();
-      scheduler.initialize();
-    }
-
-    @Override
-    public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Duration delay) {
-      return scheduler.scheduleWithFixedDelay(() -> runnableUnderTrace("parent", task), delay);
-    }
-
-    @Override
-    public Clock getClock() {
-      return Clock.systemUTC();
-    }
-
-    @Override
-    public ScheduledFuture<?> schedule(Runnable task, Instant startTime) {
-      return scheduler.schedule(() -> runnableUnderTrace("parent", task), startTime);
-    }
-
-    @Override
-    public ScheduledFuture<?> scheduleAtFixedRate(
-        Runnable task, Instant startTime, Duration period) {
-      return scheduler.scheduleAtFixedRate(
-          () -> runnableUnderTrace("parent", task), startTime, period);
-    }
-
-    @Override
-    public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Duration period) {
-      return scheduler.scheduleAtFixedRate(() -> runnableUnderTrace("parent", task), period);
-    }
-
-    @Override
-    public ScheduledFuture<?> scheduleWithFixedDelay(
-        Runnable task, Instant startTime, Duration delay) {
-      return scheduler.scheduleWithFixedDelay(
-          () -> runnableUnderTrace("parent", task), startTime, delay);
-    }
-
-    @Override
-    public ScheduledFuture<?> schedule(Runnable runnable, Trigger trigger) {
-      return scheduler.schedule(() -> runnableUnderTrace("parent", runnable), trigger);
-    }
-
-    @Override
-    public ScheduledFuture<?> schedule(Runnable runnable, Date date) {
-      return scheduler.schedule(() -> runnableUnderTrace("parent", runnable), date);
-    }
-
-    @Override
-    public ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, Date date, long l) {
-      return scheduler.scheduleAtFixedRate(() -> runnableUnderTrace("parent", runnable), date, l);
-    }
-
-    @Override
-    public ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long l) {
-      return scheduler.scheduleAtFixedRate(() -> runnableUnderTrace("parent", runnable), l);
+    static class TracingTaskScheduler implements TaskScheduler {
+        final ThreadPoolTaskScheduler scheduler;
+
+        TracingTaskScheduler() {
+            scheduler = new ThreadPoolTaskScheduler();
+            scheduler.initialize();
+        }
+
+        @Override
+        public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Duration delay) {
+            return scheduler.scheduleWithFixedDelay(() -> runnableUnderTrace("parent", task), delay);
+        }
+
+        @Override
+        public Clock getClock() {
+            return Clock.systemUTC();
+        }
+
+        @Override
+        public ScheduledFuture<?> schedule(Runnable task, Instant startTime) {
+            return scheduler.schedule(() -> runnableUnderTrace("parent", task), startTime);
+        }
+
+        @Override
+        public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Instant startTime, Duration period) {
+            return scheduler.scheduleAtFixedRate(() -> runnableUnderTrace("parent", task), startTime, period);
+        }
+
+        @Override
+        public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Duration period) {
+            return scheduler.scheduleAtFixedRate(() -> runnableUnderTrace("parent", task), period);
+        }
+
+        @Override
+        public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Instant startTime, Duration delay) {
+            return scheduler.scheduleWithFixedDelay(() -> runnableUnderTrace("parent", task), startTime, delay);
+        }
+
+        @Override
+        public ScheduledFuture<?> schedule(Runnable runnable, Trigger trigger) {
+            return scheduler.schedule(() -> runnableUnderTrace("parent", runnable), trigger);
+        }
+
+        @Override
+        public ScheduledFuture<?> schedule(Runnable runnable, Date date) {
+            return scheduler.schedule(() -> runnableUnderTrace("parent", runnable), date);
+        }
+
+        @Override
+        public ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, Date date, long l) {
+            return scheduler.scheduleAtFixedRate(() -> runnableUnderTrace("parent", runnable), date, l);
+        }
+
+        @Override
+        public ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long l) {
+            return scheduler.scheduleAtFixedRate(() -> runnableUnderTrace("parent", runnable), l);
+        }
+
+        @Override
+        public ScheduledFuture<?> scheduleWithFixedDelay(Runnable runnable, Date date, long l) {
+            return scheduler.scheduleWithFixedDelay(() -> runnableUnderTrace("parent", runnable), date, l);
+        }
+
+        @Override
+        public ScheduledFuture<?> scheduleWithFixedDelay(Runnable runnable, long l) {
+            return scheduler.scheduleWithFixedDelay(() -> runnableUnderTrace("parent", runnable), l);
+        }
     }
 
-    @Override
-    public ScheduledFuture<?> scheduleWithFixedDelay(Runnable runnable, Date date, long l) {
-      return scheduler.scheduleWithFixedDelay(
-          () -> runnableUnderTrace("parent", runnable), date, l);
+    @Bean
+    TaskScheduler tracingTaskScheduler() {
+        return new TracingTaskScheduler();
     }
 
-    @Override
-    public ScheduledFuture<?> scheduleWithFixedDelay(Runnable runnable, long l) {
-      return scheduler.scheduleWithFixedDelay(() -> runnableUnderTrace("parent", runnable), l);
+    // Having more than 1 Task scheduler will force spring to use a TaskSchedulerRouter.
+    // Hence the `scheduler` attribute on `@Scheduled` will be used.
+    // If we wrongly wrap and hide getQualifier from their runnable, the tracing won't happen in those
+    // tests that will fail.
+    @Bean
+    TaskScheduler unusedTaskScheduler() {
+        return new ThreadPoolTaskScheduler();
     }
-  }
-
-  @Bean
-  TaskScheduler tracingTaskScheduler() {
-    return new TracingTaskScheduler();
-  }
-
-  // Having more than 1 Task scheduler will force spring to use a TaskSchedulerRouter.
-  // Hence the `scheduler` attribute on `@Scheduled` will be used.
-  // If we wrongly wrap and hide getQualifier from their runnable, the tracing won't happen in those
-  // tests that will fail.
-  @Bean
-  TaskScheduler unusedTaskScheduler() {
-    return new ThreadPoolTaskScheduler();
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/ShedLockedTask.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/ShedLockedTask.java
index 694a89ffedd..8c40a1917e6 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/ShedLockedTask.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/ShedLockedTask.java
@@ -9,25 +9,25 @@
 @Component
 public class ShedLockedTask {
 
-  private final CountDownLatch latch = new CountDownLatch(2);
-  private final AtomicInteger invoked = new AtomicInteger();
+    private final CountDownLatch latch = new CountDownLatch(2);
+    private final AtomicInteger invoked = new AtomicInteger();
 
-  @Scheduled(fixedRate = 250)
-  @SchedulerLock(name = "schedlockedTask", lockAtMostFor = "10000", lockAtLeastFor = "10000")
-  public void schedlockedTask() {
-    LockAssert.assertLocked();
-    invoked.incrementAndGet();
-    latch.countDown();
-  }
+    @Scheduled(fixedRate = 250)
+    @SchedulerLock(name = "schedlockedTask", lockAtMostFor = "10000", lockAtLeastFor = "10000")
+    public void schedlockedTask() {
+        LockAssert.assertLocked();
+        invoked.incrementAndGet();
+        latch.countDown();
+    }
 
-  public int invocationCount() {
-    return invoked.get();
-  }
+    public int invocationCount() {
+        return invoked.get();
+    }
 
-  public void awaitInvocation(long time, TimeUnit timeUnit) {
-    try {
-      latch.await(time, timeUnit);
-    } catch (InterruptedException ignored) {
+    public void awaitInvocation(long time, TimeUnit timeUnit) {
+        try {
+            latch.await(time, timeUnit);
+        } catch (InterruptedException ignored) {
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/ShedlockConfig.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/ShedlockConfig.java
index ea264bc6816..b6b1b1e261e 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/ShedlockConfig.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/ShedlockConfig.java
@@ -14,27 +14,26 @@
 @EnableSchedulerLock(defaultLockAtMostFor = "1000")
 public class ShedlockConfig {
 
-  @Bean
-  public ShedLockedTask schedLockedTask() {
-    return new ShedLockedTask();
-  }
+    @Bean
+    public ShedLockedTask schedLockedTask() {
+        return new ShedLockedTask();
+    }
 
-  @Bean
-  public DataSource dataSource() {
-    DataSourceBuilder dataSourceBuilder = DataSourceBuilder.create();
-    dataSourceBuilder.driverClassName("org.h2.Driver");
-    dataSourceBuilder.url("jdbc:h2:mem:test");
-    dataSourceBuilder.username("SA");
-    dataSourceBuilder.password("");
-    return dataSourceBuilder.build();
-  }
+    @Bean
+    public DataSource dataSource() {
+        DataSourceBuilder dataSourceBuilder = DataSourceBuilder.create();
+        dataSourceBuilder.driverClassName("org.h2.Driver");
+        dataSourceBuilder.url("jdbc:h2:mem:test");
+        dataSourceBuilder.username("SA");
+        dataSourceBuilder.password("");
+        return dataSourceBuilder.build();
+    }
 
-  @Bean
-  LockProvider lockProvider(@Autowired DataSource dataSource) {
-    return new JdbcTemplateLockProvider(
-        JdbcTemplateLockProvider.Configuration.builder()
-            .withJdbcTemplate(new JdbcTemplate(dataSource))
-            .usingDbTime()
-            .build());
-  }
+    @Bean
+    LockProvider lockProvider(@Autowired DataSource dataSource) {
+        return new JdbcTemplateLockProvider(JdbcTemplateLockProvider.Configuration.builder()
+                .withJdbcTemplate(new JdbcTemplate(dataSource))
+                .usingDbTime()
+                .build());
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/TriggerTask.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/TriggerTask.java
index ed701651e7f..2b1d35fd8f9 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/TriggerTask.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/TriggerTask.java
@@ -6,15 +6,15 @@
 @Component
 public class TriggerTask implements Runnable {
 
-  private final CountDownLatch latch = new CountDownLatch(1);
+    private final CountDownLatch latch = new CountDownLatch(1);
 
-  @Scheduled(cron = "0/5 * * * * *", scheduler = "tracingTaskScheduler")
-  @Override
-  public void run() {
-    latch.countDown();
-  }
+    @Scheduled(cron = "0/5 * * * * *", scheduler = "tracingTaskScheduler")
+    @Override
+    public void run() {
+        latch.countDown();
+    }
 
-  public void blockUntilExecute() throws InterruptedException {
-    latch.await(5, TimeUnit.SECONDS);
-  }
+    public void blockUntilExecute() throws InterruptedException {
+        latch.await(5, TimeUnit.SECONDS);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/TriggerTaskConfig.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/TriggerTaskConfig.java
index ec7e435ee2b..6369a0ff2f1 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/TriggerTaskConfig.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/java/TriggerTaskConfig.java
@@ -9,14 +9,13 @@
 @Configuration
 @EnableScheduling
 public class TriggerTaskConfig {
-  @Bean
-  public TriggerTask triggerTasks() {
-    return new TriggerTask();
-  }
+    @Bean
+    public TriggerTask triggerTasks() {
+        return new TriggerTask();
+    }
 
-  @Bean
-  public ScheduledTasksEndpoint scheduledTasksEndpoint(
-      ObjectProvider<ScheduledTaskHolder> holders) {
-    return new ScheduledTasksEndpoint(holders.orderedStream().collect(Collectors.toSet()));
-  }
+    @Bean
+    public ScheduledTasksEndpoint scheduledTasksEndpoint(ObjectProvider<ScheduledTaskHolder> holders) {
+        return new ScheduledTasksEndpoint(holders.orderedStream().collect(Collectors.toSet()));
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java
index e0e3bea4021..545e58ca0ef 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java
@@ -14,63 +14,63 @@
 
 public class SpannedMethodInvocation implements MethodInvocation {
 
-  private final ContextContinuation continuation;
-  private final MethodInvocation delegate;
+    private final ContextContinuation continuation;
+    private final MethodInvocation delegate;
 
-  public SpannedMethodInvocation(ContextContinuation continuation, MethodInvocation delegate) {
-    this.continuation = continuation;
-    this.delegate = delegate;
-  }
+    public SpannedMethodInvocation(ContextContinuation continuation, MethodInvocation delegate) {
+        this.continuation = continuation;
+        this.delegate = delegate;
+    }
 
-  @Override
-  public Method getMethod() {
-    return delegate.getMethod();
-  }
+    @Override
+    public Method getMethod() {
+        return delegate.getMethod();
+    }
 
-  @Override
-  public Object[] getArguments() {
-    return delegate.getArguments();
-  }
+    @Override
+    public Object[] getArguments() {
+        return delegate.getArguments();
+    }
 
-  @Override
-  public Object proceed() throws Throwable {
-    CharSequence spanName = DECORATE.spanNameForMethod(delegate.getMethod());
-    if (continuation.context() != Context.root()) {
-      return invokeWithContinuation(spanName);
-    } else {
-      return invokeWithSpan(spanName);
+    @Override
+    public Object proceed() throws Throwable {
+        CharSequence spanName = DECORATE.spanNameForMethod(delegate.getMethod());
+        if (continuation.context() != Context.root()) {
+            return invokeWithContinuation(spanName);
+        } else {
+            return invokeWithSpan(spanName);
+        }
     }
-  }
 
-  private Object invokeWithContinuation(CharSequence spanName) throws Throwable {
-    try (ContextScope scope = continuation.resume()) {
-      return invokeWithSpan(spanName);
+    private Object invokeWithContinuation(CharSequence spanName) throws Throwable {
+        try (ContextScope scope = continuation.resume()) {
+            return invokeWithSpan(spanName);
+        }
     }
-  }
 
-  private Object invokeWithSpan(CharSequence spanName) throws Throwable {
-    AgentSpan span = startSpan("spring-scheduling", spanName);
-    DECORATE.afterStart(span);
-    DECORATE.measureIfEnabled(span);
-    try (ContextScope scope = activateSpan(span)) {
-      try {
-        return delegate.proceed();
-      } catch (Throwable throwable) {
-        DECORATE.onError(span, throwable);
-        throw throwable;
-      }
-    } finally {
-      span.finish();
+    private Object invokeWithSpan(CharSequence spanName) throws Throwable {
+        AgentSpan span = startSpan("spring-scheduling", spanName);
+        DECORATE.afterStart(span);
+        DECORATE.measureIfEnabled(span);
+        try (ContextScope scope = activateSpan(span)) {
+            try {
+                return delegate.proceed();
+            } catch (Throwable throwable) {
+                DECORATE.onError(span, throwable);
+                throw throwable;
+            }
+        } finally {
+            span.finish();
+        }
     }
-  }
 
-  @Override
-  public Object getThis() {
-    return delegate.getThis();
-  }
+    @Override
+    public Object getThis() {
+        return delegate.getThis();
+    }
 
-  @Override
-  public AccessibleObject getStaticPart() {
-    return delegate.getStaticPart();
-  }
+    @Override
+    public AccessibleObject getStaticPart() {
+        return delegate.getStaticPart();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringAsyncAdvice.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringAsyncAdvice.java
index a14249cd533..036293f9a2c 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringAsyncAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringAsyncAdvice.java
@@ -7,9 +7,8 @@
 
 public class SpringAsyncAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void scheduleAsync(
-      @Advice.Argument(value = 0, readOnly = false) MethodInvocation invocation) {
-    invocation = new SpannedMethodInvocation(currentContext().capture(), invocation);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void scheduleAsync(@Advice.Argument(value = 0, readOnly = false) MethodInvocation invocation) {
+        invocation = new SpannedMethodInvocation(currentContext().capture(), invocation);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringAsyncInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringAsyncInstrumentation.java
index 1534708d0f9..1d7c4bcdce2 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringAsyncInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringAsyncInstrumentation.java
@@ -10,24 +10,23 @@
 
 @AutoService(InstrumenterModule.class)
 public class SpringAsyncInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public SpringAsyncInstrumentation() {
-    super("spring-async");
-  }
+    public SpringAsyncInstrumentation() {
+        super("spring-async");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.aop.interceptor.AsyncExecutionInterceptor";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.aop.interceptor.AsyncExecutionInterceptor";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(
-                named("invoke")
-                    .and(takesArgument(0, named("org.aopalliance.intercept.MethodInvocation")))),
-        packageName + ".SpringAsyncAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("invoke")
+                                .and(takesArgument(0, named("org.aopalliance.intercept.MethodInvocation")))),
+                packageName + ".SpringAsyncAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingDecorator.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingDecorator.java
index e628be8bd16..48eec5ea873 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingDecorator.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingDecorator.java
@@ -7,44 +7,44 @@
 import org.springframework.scheduling.support.ScheduledMethodRunnable;
 
 public class SpringSchedulingDecorator extends BaseDecorator {
-  public static final CharSequence SCHEDULED_CALL = UTF8BytesString.create("scheduled.call");
-  public static final SpringSchedulingDecorator DECORATE = new SpringSchedulingDecorator();
+    public static final CharSequence SCHEDULED_CALL = UTF8BytesString.create("scheduled.call");
+    public static final SpringSchedulingDecorator DECORATE = new SpringSchedulingDecorator();
 
-  private static final boolean MEASURED = Config.get().isSpringSchedulingMeasuredEnabled();
+    private static final boolean MEASURED = Config.get().isSpringSchedulingMeasuredEnabled();
 
-  private SpringSchedulingDecorator() {}
+    private SpringSchedulingDecorator() {}
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"spring-scheduling"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"spring-scheduling"};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return null;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return null;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return "spring-scheduling";
-  }
+    @Override
+    protected CharSequence component() {
+        return "spring-scheduling";
+    }
 
-  public void measureIfEnabled(final AgentSpan span) {
-    if (MEASURED) {
-      span.setMeasured(true);
+    public void measureIfEnabled(final AgentSpan span) {
+        if (MEASURED) {
+            span.setMeasured(true);
+        }
     }
-  }
-
-  public void onRun(final AgentSpan span, final Runnable runnable) {
-    if (runnable != null) {
-      CharSequence resourceName = "";
-      if (runnable instanceof ScheduledMethodRunnable) {
-        final ScheduledMethodRunnable scheduledMethodRunnable = (ScheduledMethodRunnable) runnable;
-        resourceName = spanNameForMethod(scheduledMethodRunnable.getMethod());
-      } else {
-        resourceName = spanNameForMethod(runnable.getClass(), "run");
-      }
-      span.setResourceName(resourceName);
+
+    public void onRun(final AgentSpan span, final Runnable runnable) {
+        if (runnable != null) {
+            CharSequence resourceName = "";
+            if (runnable instanceof ScheduledMethodRunnable) {
+                final ScheduledMethodRunnable scheduledMethodRunnable = (ScheduledMethodRunnable) runnable;
+                resourceName = spanNameForMethod(scheduledMethodRunnable.getMethod());
+            } else {
+                resourceName = spanNameForMethod(runnable.getClass(), "run");
+            }
+            span.setResourceName(resourceName);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java
index 388a412256b..ad1acd777ff 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java
@@ -16,37 +16,34 @@
 
 @AutoService(InstrumenterModule.class)
 public final class SpringSchedulingInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
-
-  public SpringSchedulingInstrumentation() {
-    super("spring-scheduling");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.scheduling.config.Task";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(0, Runnable.class)),
-        getClass().getName() + "$SpringSchedulingAdvice");
-  }
-
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    return Collections.singletonMap(
-        RUNNABLE,
-        Collections.singleton(
-            "org.springframework.scheduling.config.Task$OutcomeTrackingRunnable"));
-  }
-
-  public static class SpringSchedulingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onConstruction(
-        @Advice.Argument(value = 0, readOnly = false) Runnable runnable) {
-      runnable = SpringSchedulingRunnableWrapper.wrapIfNeeded(runnable);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
+
+    public SpringSchedulingInstrumentation() {
+        super("spring-scheduling");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.scheduling.config.Task";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(0, Runnable.class)),
+                getClass().getName() + "$SpringSchedulingAdvice");
+    }
+
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        return Collections.singletonMap(
+                RUNNABLE, Collections.singleton("org.springframework.scheduling.config.Task$OutcomeTrackingRunnable"));
+    }
+
+    public static class SpringSchedulingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onConstruction(@Advice.Argument(value = 0, readOnly = false) Runnable runnable) {
+            runnable = SpringSchedulingRunnableWrapper.wrapIfNeeded(runnable);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java
index 3bc452c6074..fb45b0dca9c 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java
@@ -15,79 +15,76 @@
 import org.springframework.scheduling.SchedulingAwareRunnable;
 
 public class SpringSchedulingRunnableWrapper implements Runnable {
-  private static final boolean LEGACY_TRACING =
-      Config.get().isLegacyTracingEnabled(false, "spring-scheduling");
+    private static final boolean LEGACY_TRACING = Config.get().isLegacyTracingEnabled(false, "spring-scheduling");
 
-  static class SchedulingAware extends SpringSchedulingRunnableWrapper
-      implements SchedulingAwareRunnable {
+    static class SchedulingAware extends SpringSchedulingRunnableWrapper implements SchedulingAwareRunnable {
 
-    private static final MethodHandle GET_QUALIFIER_MH =
-        new MethodHandles(SchedulingAwareRunnable.class.getClassLoader())
-            .method(SchedulingAwareRunnable.class, "getQualifier");
+        private static final MethodHandle GET_QUALIFIER_MH = new MethodHandles(
+                        SchedulingAwareRunnable.class.getClassLoader())
+                .method(SchedulingAwareRunnable.class, "getQualifier");
 
-    SchedulingAware(Runnable runnable) {
-      super(runnable);
-    }
+        SchedulingAware(Runnable runnable) {
+            super(runnable);
+        }
 
-    @Override
-    public boolean isLongLived() {
-      return ((SchedulingAwareRunnable) runnable).isLongLived();
-    }
+        @Override
+        public boolean isLongLived() {
+            return ((SchedulingAwareRunnable) runnable).isLongLived();
+        }
 
-    // this is implemented on 6.1+
-    public String getQualifier() {
-      if (GET_QUALIFIER_MH != null) {
-        try {
-          return (String) GET_QUALIFIER_MH.invoke(runnable);
-        } catch (Throwable ignored) {
+        // this is implemented on 6.1+
+        public String getQualifier() {
+            if (GET_QUALIFIER_MH != null) {
+                try {
+                    return (String) GET_QUALIFIER_MH.invoke(runnable);
+                } catch (Throwable ignored) {
+                }
+            }
+            return null;
         }
-      }
-      return null;
     }
-  }
 
-  protected final Runnable runnable;
+    protected final Runnable runnable;
 
-  private SpringSchedulingRunnableWrapper(final Runnable runnable) {
-    this.runnable = runnable;
-  }
+    private SpringSchedulingRunnableWrapper(final Runnable runnable) {
+        this.runnable = runnable;
+    }
 
-  @Override
-  public void run() {
-    final AgentSpan span =
-        LEGACY_TRACING
-            ? startSpan("spring-scheduling", SCHEDULED_CALL)
-            : startSpan("spring-scheduling", SCHEDULED_CALL, null);
-    DECORATE.afterStart(span);
-    DECORATE.measureIfEnabled(span);
+    @Override
+    public void run() {
+        final AgentSpan span = LEGACY_TRACING
+                ? startSpan("spring-scheduling", SCHEDULED_CALL)
+                : startSpan("spring-scheduling", SCHEDULED_CALL, null);
+        DECORATE.afterStart(span);
+        DECORATE.measureIfEnabled(span);
 
-    try (final ContextScope scope = activateSpan(span)) {
-      DECORATE.onRun(span, runnable);
+        try (final ContextScope scope = activateSpan(span)) {
+            DECORATE.onRun(span, runnable);
 
-      try {
-        runnable.run();
-      } catch (final Throwable throwable) {
-        DECORATE.onError(span, throwable);
-        throw throwable;
-      }
-    } finally {
-      DECORATE.beforeFinish(span);
-      span.finish();
+            try {
+                runnable.run();
+            } catch (final Throwable throwable) {
+                DECORATE.onError(span, throwable);
+                throw throwable;
+            }
+        } finally {
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 
-  public static Runnable wrapIfNeeded(final Runnable task) {
-    if (task instanceof SpringSchedulingRunnableWrapper || exclude(RUNNABLE, task)) {
-      return task;
-    }
-    if (task instanceof SchedulingAwareRunnable) {
-      return new SchedulingAware(task);
+    public static Runnable wrapIfNeeded(final Runnable task) {
+        if (task instanceof SpringSchedulingRunnableWrapper || exclude(RUNNABLE, task)) {
+            return task;
+        }
+        if (task instanceof SchedulingAwareRunnable) {
+            return new SchedulingAware(task);
+        }
+        return new SpringSchedulingRunnableWrapper(task);
     }
-    return new SpringSchedulingRunnableWrapper(task);
-  }
 
-  @Override
-  public String toString() {
-    return runnable.toString();
-  }
+    @Override
+    public String toString() {
+        return runnable.toString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/AsyncTask.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/AsyncTask.java
index 5564f6100d5..538ea1c7918 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/AsyncTask.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/AsyncTask.java
@@ -5,18 +5,18 @@
 
 public class AsyncTask {
 
-  @Async
-  public CompletableFuture<Integer> async() {
-    return CompletableFuture.completedFuture(getInt());
-  }
+    @Async
+    public CompletableFuture<Integer> async() {
+        return CompletableFuture.completedFuture(getInt());
+    }
 
-  @Async
-  public CompletableFuture<Void> asyncThrow() {
-    throw new RuntimeException("Datadog async repro");
-  }
+    @Async
+    public CompletableFuture<Void> asyncThrow() {
+        throw new RuntimeException("Datadog async repro");
+    }
 
-  @Trace
-  public int getInt() {
-    return ThreadLocalRandom.current().nextInt();
-  }
+    @Trace
+    public int getInt() {
+        return ThreadLocalRandom.current().nextInt();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/AsyncTaskConfig.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/AsyncTaskConfig.java
index 94a9196dfac..2387d34e7f8 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/AsyncTaskConfig.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/AsyncTaskConfig.java
@@ -8,8 +8,8 @@
 @EnableAsync
 public class AsyncTaskConfig {
 
-  @Bean
-  AsyncTask asyncTask() {
-    return new AsyncTask();
-  }
+    @Bean
+    AsyncTask asyncTask() {
+        return new AsyncTask();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/IntervalTask.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/IntervalTask.java
index 4858ad2003f..353913613d2 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/IntervalTask.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/IntervalTask.java
@@ -6,15 +6,15 @@
 @Component
 public class IntervalTask implements Runnable {
 
-  private final CountDownLatch latch = new CountDownLatch(1);
+    private final CountDownLatch latch = new CountDownLatch(1);
 
-  @Scheduled(fixedRate = 5000)
-  @Override
-  public void run() {
-    latch.countDown();
-  }
+    @Scheduled(fixedRate = 5000)
+    @Override
+    public void run() {
+        latch.countDown();
+    }
 
-  public void blockUntilExecute() throws InterruptedException {
-    latch.await(5, TimeUnit.SECONDS);
-  }
+    public void blockUntilExecute() throws InterruptedException {
+        latch.await(5, TimeUnit.SECONDS);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/IntervalTaskConfig.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/IntervalTaskConfig.java
index 58309a70ba3..4bfddfa6a12 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/IntervalTaskConfig.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/IntervalTaskConfig.java
@@ -5,8 +5,8 @@
 @Configuration
 @EnableScheduling
 public class IntervalTaskConfig {
-  @Bean
-  public IntervalTask scheduledTasks() {
-    return new IntervalTask();
-  }
+    @Bean
+    public IntervalTask scheduledTasks() {
+        return new IntervalTask();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/LambdaTaskConfig.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/LambdaTaskConfig.java
index cd12e2f04f8..e62d886139d 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/LambdaTaskConfig.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/LambdaTaskConfig.java
@@ -6,8 +6,8 @@
 @EnableScheduling
 public class LambdaTaskConfig {
 
-  @Bean
-  LambdaTaskConfigurer lambdaTaskConfigurer() {
-    return new LambdaTaskConfigurer();
-  }
+    @Bean
+    LambdaTaskConfigurer lambdaTaskConfigurer() {
+        return new LambdaTaskConfigurer();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/LambdaTaskConfigurer.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/LambdaTaskConfigurer.java
index d422059a9f1..5a72f987309 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/LambdaTaskConfigurer.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/LambdaTaskConfigurer.java
@@ -6,10 +6,10 @@
 @Service
 public class LambdaTaskConfigurer implements SchedulingConfigurer {
 
-  public final CountDownLatch singleUseLatch = new CountDownLatch(1);
+    public final CountDownLatch singleUseLatch = new CountDownLatch(1);
 
-  @Override
-  public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-    taskRegistrar.addFixedDelayTask(singleUseLatch::countDown, 500);
-  }
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+        taskRegistrar.addFixedDelayTask(singleUseLatch::countDown, 500);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/SchedulingConfig.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/SchedulingConfig.java
index 93131a45efc..6cbc71b43f5 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/SchedulingConfig.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/SchedulingConfig.java
@@ -14,82 +14,77 @@
 
 @Configuration
 public class SchedulingConfig implements SchedulingConfigurer {
-  static class TracingTaskScheduler implements TaskScheduler {
-    final ThreadPoolTaskScheduler scheduler;
-
-    TracingTaskScheduler() {
-      scheduler = new ThreadPoolTaskScheduler();
-      scheduler.initialize();
-    }
-
-    @Override
-    public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Duration delay) {
-      return scheduler.scheduleWithFixedDelay(() -> runnableUnderTrace("parent", task), delay);
-    }
-
-    @Override
-    public Clock getClock() {
-      return Clock.systemUTC();
-    }
-
-    @Override
-    public ScheduledFuture<?> schedule(Runnable task, Instant startTime) {
-      return scheduler.schedule(() -> runnableUnderTrace("parent", task), startTime);
+    static class TracingTaskScheduler implements TaskScheduler {
+        final ThreadPoolTaskScheduler scheduler;
+
+        TracingTaskScheduler() {
+            scheduler = new ThreadPoolTaskScheduler();
+            scheduler.initialize();
+        }
+
+        @Override
+        public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Duration delay) {
+            return scheduler.scheduleWithFixedDelay(() -> runnableUnderTrace("parent", task), delay);
+        }
+
+        @Override
+        public Clock getClock() {
+            return Clock.systemUTC();
+        }
+
+        @Override
+        public ScheduledFuture<?> schedule(Runnable task, Instant startTime) {
+            return scheduler.schedule(() -> runnableUnderTrace("parent", task), startTime);
+        }
+
+        @Override
+        public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Instant startTime, Duration period) {
+            return scheduler.scheduleAtFixedRate(() -> runnableUnderTrace("parent", task), startTime, period);
+        }
+
+        @Override
+        public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Duration period) {
+            return scheduler.scheduleAtFixedRate(() -> runnableUnderTrace("parent", task), period);
+        }
+
+        @Override
+        public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Instant startTime, Duration delay) {
+            return scheduler.scheduleWithFixedDelay(() -> runnableUnderTrace("parent", task), startTime, delay);
+        }
+
+        @Override
+        public ScheduledFuture<?> schedule(Runnable runnable, Trigger trigger) {
+            return scheduler.schedule(() -> runnableUnderTrace("parent", runnable), trigger);
+        }
+
+        @Override
+        public ScheduledFuture<?> schedule(Runnable runnable, Date date) {
+            return scheduler.schedule(() -> runnableUnderTrace("parent", runnable), date);
+        }
+
+        @Override
+        public ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, Date date, long l) {
+            return scheduler.scheduleAtFixedRate(() -> runnableUnderTrace("parent", runnable), date, l);
+        }
+
+        @Override
+        public ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long l) {
+            return scheduler.scheduleAtFixedRate(() -> runnableUnderTrace("parent", runnable), l);
+        }
+
+        @Override
+        public ScheduledFuture<?> scheduleWithFixedDelay(Runnable runnable, Date date, long l) {
+            return scheduler.scheduleWithFixedDelay(() -> runnableUnderTrace("parent", runnable), date, l);
+        }
+
+        @Override
+        public ScheduledFuture<?> scheduleWithFixedDelay(Runnable runnable, long l) {
+            return scheduler.scheduleWithFixedDelay(() -> runnableUnderTrace("parent", runnable), l);
+        }
     }
 
     @Override
-    public ScheduledFuture<?> scheduleAtFixedRate(
-        Runnable task, Instant startTime, Duration period) {
-      return scheduler.scheduleAtFixedRate(
-          () -> runnableUnderTrace("parent", task), startTime, period);
+    public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
+        scheduledTaskRegistrar.setTaskScheduler(new TracingTaskScheduler());
     }
-
-    @Override
-    public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Duration period) {
-      return scheduler.scheduleAtFixedRate(() -> runnableUnderTrace("parent", task), period);
-    }
-
-    @Override
-    public ScheduledFuture<?> scheduleWithFixedDelay(
-        Runnable task, Instant startTime, Duration delay) {
-      return scheduler.scheduleWithFixedDelay(
-          () -> runnableUnderTrace("parent", task), startTime, delay);
-    }
-
-    @Override
-    public ScheduledFuture<?> schedule(Runnable runnable, Trigger trigger) {
-      return scheduler.schedule(() -> runnableUnderTrace("parent", runnable), trigger);
-    }
-
-    @Override
-    public ScheduledFuture<?> schedule(Runnable runnable, Date date) {
-      return scheduler.schedule(() -> runnableUnderTrace("parent", runnable), date);
-    }
-
-    @Override
-    public ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, Date date, long l) {
-      return scheduler.scheduleAtFixedRate(() -> runnableUnderTrace("parent", runnable), date, l);
-    }
-
-    @Override
-    public ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long l) {
-      return scheduler.scheduleAtFixedRate(() -> runnableUnderTrace("parent", runnable), l);
-    }
-
-    @Override
-    public ScheduledFuture<?> scheduleWithFixedDelay(Runnable runnable, Date date, long l) {
-      return scheduler.scheduleWithFixedDelay(
-          () -> runnableUnderTrace("parent", runnable), date, l);
-    }
-
-    @Override
-    public ScheduledFuture<?> scheduleWithFixedDelay(Runnable runnable, long l) {
-      return scheduler.scheduleWithFixedDelay(() -> runnableUnderTrace("parent", runnable), l);
-    }
-  }
-
-  @Override
-  public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
-    scheduledTaskRegistrar.setTaskScheduler(new TracingTaskScheduler());
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/ShedLockedTask.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/ShedLockedTask.java
index 694a89ffedd..8c40a1917e6 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/ShedLockedTask.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/ShedLockedTask.java
@@ -9,25 +9,25 @@
 @Component
 public class ShedLockedTask {
 
-  private final CountDownLatch latch = new CountDownLatch(2);
-  private final AtomicInteger invoked = new AtomicInteger();
+    private final CountDownLatch latch = new CountDownLatch(2);
+    private final AtomicInteger invoked = new AtomicInteger();
 
-  @Scheduled(fixedRate = 250)
-  @SchedulerLock(name = "schedlockedTask", lockAtMostFor = "10000", lockAtLeastFor = "10000")
-  public void schedlockedTask() {
-    LockAssert.assertLocked();
-    invoked.incrementAndGet();
-    latch.countDown();
-  }
+    @Scheduled(fixedRate = 250)
+    @SchedulerLock(name = "schedlockedTask", lockAtMostFor = "10000", lockAtLeastFor = "10000")
+    public void schedlockedTask() {
+        LockAssert.assertLocked();
+        invoked.incrementAndGet();
+        latch.countDown();
+    }
 
-  public int invocationCount() {
-    return invoked.get();
-  }
+    public int invocationCount() {
+        return invoked.get();
+    }
 
-  public void awaitInvocation(long time, TimeUnit timeUnit) {
-    try {
-      latch.await(time, timeUnit);
-    } catch (InterruptedException ignored) {
+    public void awaitInvocation(long time, TimeUnit timeUnit) {
+        try {
+            latch.await(time, timeUnit);
+        } catch (InterruptedException ignored) {
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/ShedlockConfig.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/ShedlockConfig.java
index ea264bc6816..b6b1b1e261e 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/ShedlockConfig.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/ShedlockConfig.java
@@ -14,27 +14,26 @@
 @EnableSchedulerLock(defaultLockAtMostFor = "1000")
 public class ShedlockConfig {
 
-  @Bean
-  public ShedLockedTask schedLockedTask() {
-    return new ShedLockedTask();
-  }
+    @Bean
+    public ShedLockedTask schedLockedTask() {
+        return new ShedLockedTask();
+    }
 
-  @Bean
-  public DataSource dataSource() {
-    DataSourceBuilder dataSourceBuilder = DataSourceBuilder.create();
-    dataSourceBuilder.driverClassName("org.h2.Driver");
-    dataSourceBuilder.url("jdbc:h2:mem:test");
-    dataSourceBuilder.username("SA");
-    dataSourceBuilder.password("");
-    return dataSourceBuilder.build();
-  }
+    @Bean
+    public DataSource dataSource() {
+        DataSourceBuilder dataSourceBuilder = DataSourceBuilder.create();
+        dataSourceBuilder.driverClassName("org.h2.Driver");
+        dataSourceBuilder.url("jdbc:h2:mem:test");
+        dataSourceBuilder.username("SA");
+        dataSourceBuilder.password("");
+        return dataSourceBuilder.build();
+    }
 
-  @Bean
-  LockProvider lockProvider(@Autowired DataSource dataSource) {
-    return new JdbcTemplateLockProvider(
-        JdbcTemplateLockProvider.Configuration.builder()
-            .withJdbcTemplate(new JdbcTemplate(dataSource))
-            .usingDbTime()
-            .build());
-  }
+    @Bean
+    LockProvider lockProvider(@Autowired DataSource dataSource) {
+        return new JdbcTemplateLockProvider(JdbcTemplateLockProvider.Configuration.builder()
+                .withJdbcTemplate(new JdbcTemplate(dataSource))
+                .usingDbTime()
+                .build());
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/TriggerTask.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/TriggerTask.java
index dc434f539f2..8078b4d48bc 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/TriggerTask.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/TriggerTask.java
@@ -6,15 +6,15 @@
 @Component
 public class TriggerTask implements Runnable {
 
-  private final CountDownLatch latch = new CountDownLatch(1);
+    private final CountDownLatch latch = new CountDownLatch(1);
 
-  @Scheduled(cron = "0/5 * * * * *")
-  @Override
-  public void run() {
-    latch.countDown();
-  }
+    @Scheduled(cron = "0/5 * * * * *")
+    @Override
+    public void run() {
+        latch.countDown();
+    }
 
-  public void blockUntilExecute() throws InterruptedException {
-    latch.await(5, TimeUnit.SECONDS);
-  }
+    public void blockUntilExecute() throws InterruptedException {
+        latch.await(5, TimeUnit.SECONDS);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/TriggerTaskConfig.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/TriggerTaskConfig.java
index ec7e435ee2b..6369a0ff2f1 100644
--- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/TriggerTaskConfig.java
+++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/java/TriggerTaskConfig.java
@@ -9,14 +9,13 @@
 @Configuration
 @EnableScheduling
 public class TriggerTaskConfig {
-  @Bean
-  public TriggerTask triggerTasks() {
-    return new TriggerTask();
-  }
+    @Bean
+    public TriggerTask triggerTasks() {
+        return new TriggerTask();
+    }
 
-  @Bean
-  public ScheduledTasksEndpoint scheduledTasksEndpoint(
-      ObjectProvider<ScheduledTaskHolder> holders) {
-    return new ScheduledTasksEndpoint(holders.orderedStream().collect(Collectors.toSet()));
-  }
+    @Bean
+    public ScheduledTasksEndpoint scheduledTasksEndpoint(ObjectProvider<ScheduledTaskHolder> holders) {
+        return new ScheduledTasksEndpoint(holders.orderedStream().collect(Collectors.toSet()));
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/AppSecDeferredContext.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/AppSecDeferredContext.java
index 4b4a952974e..6ed7510811a 100644
--- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/AppSecDeferredContext.java
+++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/AppSecDeferredContext.java
@@ -7,24 +7,24 @@
 
 public class AppSecDeferredContext implements Supplier<SecurityContext> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(AppSecDeferredContext.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AppSecDeferredContext.class);
 
-  private final Supplier<SecurityContext> delegate;
+    private final Supplier<SecurityContext> delegate;
 
-  public AppSecDeferredContext(final Supplier<SecurityContext> delegate) {
-    this.delegate = delegate;
-  }
+    public AppSecDeferredContext(final Supplier<SecurityContext> delegate) {
+        this.delegate = delegate;
+    }
 
-  @Override
-  public SecurityContext get() {
-    SecurityContext context = delegate.get();
-    if (context != null) {
-      try {
-        SpringSecurityUserEventDecorator.DECORATE.onUser(context.getAuthentication());
-      } catch (Throwable e) {
-        LOGGER.debug("Error handling user event", e);
-      }
+    @Override
+    public SecurityContext get() {
+        SecurityContext context = delegate.get();
+        if (context != null) {
+            try {
+                SpringSecurityUserEventDecorator.DECORATE.onUser(context.getAuthentication());
+            } catch (Throwable e) {
+                LOGGER.debug("Error handling user event", e);
+            }
+        }
+        return context;
     }
-    return context;
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/AuthenticationManagerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/AuthenticationManagerInstrumentation.java
index 5bcdfe4a549..fbb7f5430f6 100644
--- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/AuthenticationManagerInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/AuthenticationManagerInstrumentation.java
@@ -19,43 +19,43 @@
 
 @AutoService(InstrumenterModule.class)
 public class AuthenticationManagerInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public AuthenticationManagerInstrumentation() {
-    super("spring-security");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.security.authentication.AuthenticationManager";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("authenticate"))
-            .and(takesArgument(0, named("org.springframework.security.core.Authentication")))
-            .and(returns(named("org.springframework.security.core.Authentication")))
-            .and(isPublic()),
-        getClass().getName() + "$AuthenticationManagerAdvice");
-  }
-
-  public static class AuthenticationManagerAdvice {
-
-    @Advice.OnMethodExit(onThrowable = AuthenticationException.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Argument(value = 0, readOnly = false) Authentication authentication,
-        @Advice.Return final Authentication result,
-        @Advice.Thrown final AuthenticationException throwable) {
-      if (ActiveSubsystems.APPSEC_ACTIVE) {
-        SpringSecurityUserEventDecorator.DECORATE.onLogin(authentication, throwable, result);
-      }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public AuthenticationManagerInstrumentation() {
+        super("spring-security");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.security.authentication.AuthenticationManager";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("authenticate"))
+                        .and(takesArgument(0, named("org.springframework.security.core.Authentication")))
+                        .and(returns(named("org.springframework.security.core.Authentication")))
+                        .and(isPublic()),
+                getClass().getName() + "$AuthenticationManagerAdvice");
+    }
+
+    public static class AuthenticationManagerAdvice {
+
+        @Advice.OnMethodExit(onThrowable = AuthenticationException.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Argument(value = 0, readOnly = false) Authentication authentication,
+                @Advice.Return final Authentication result,
+                @Advice.Thrown final AuthenticationException throwable) {
+            if (ActiveSubsystems.APPSEC_ACTIVE) {
+                SpringSecurityUserEventDecorator.DECORATE.onLogin(authentication, throwable, result);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/SecurityContextHolderInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/SecurityContextHolderInstrumentation.java
index d05b0f1bbb7..f2df8733bfa 100644
--- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/SecurityContextHolderInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/SecurityContextHolderInstrumentation.java
@@ -19,64 +19,64 @@
 
 @AutoService(InstrumenterModule.class)
 public class SecurityContextHolderInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public SecurityContextHolderInstrumentation() {
-    super("spring-security");
-  }
+    public SecurityContextHolderInstrumentation() {
+        super("spring-security");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.security.core.context.SecurityContextHolderStrategy";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.security.core.context.SecurityContextHolderStrategy";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("setContext"))
-            .and(takesArguments(1))
-            .and(
-                takesArgument(
-                    0, named("org.springframework.security.core.context.SecurityContext")))
-            .and(isPublic()),
-        getClass().getName() + "$SetSecurityContextAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("setDeferredContext")).and(takesArguments(1)).and(isPublic()),
-        getClass().getName() + "$SetDeferredSecurityContextAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("setContext"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("org.springframework.security.core.context.SecurityContext")))
+                        .and(isPublic()),
+                getClass().getName() + "$SetSecurityContextAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("setDeferredContext"))
+                        .and(takesArguments(1))
+                        .and(isPublic()),
+                getClass().getName() + "$SetDeferredSecurityContextAdvice");
+    }
 
-  public static class SetSecurityContextAdvice {
+    public static class SetSecurityContextAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(0) final SecurityContext context) {
-      if (context == null) {
-        return;
-      }
-      if (!ActiveSubsystems.APPSEC_ACTIVE) {
-        return;
-      }
-      SpringSecurityUserEventDecorator.DECORATE.onUser(context.getAuthentication());
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(0) final SecurityContext context) {
+            if (context == null) {
+                return;
+            }
+            if (!ActiveSubsystems.APPSEC_ACTIVE) {
+                return;
+            }
+            SpringSecurityUserEventDecorator.DECORATE.onUser(context.getAuthentication());
+        }
     }
-  }
 
-  public static class SetDeferredSecurityContextAdvice {
+    public static class SetDeferredSecurityContextAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(value = 0, readOnly = false) Supplier<SecurityContext> deferred) {
-      if (deferred == null) {
-        return;
-      }
-      if (!ActiveSubsystems.APPSEC_ACTIVE) {
-        return;
-      }
-      deferred = new AppSecDeferredContext(deferred);
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(value = 0, readOnly = false) Supplier<SecurityContext> deferred) {
+            if (deferred == null) {
+                return;
+            }
+            if (!ActiveSubsystems.APPSEC_ACTIVE) {
+                return;
+            }
+            deferred = new AppSecDeferredContext(deferred);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/SpringSecurityUserEventDecorator.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/SpringSecurityUserEventDecorator.java
index d7285e7f976..61614a0b78c 100644
--- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/SpringSecurityUserEventDecorator.java
+++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/SpringSecurityUserEventDecorator.java
@@ -25,167 +25,163 @@
 
 public class SpringSecurityUserEventDecorator {
 
-  public static final SpringSecurityUserEventDecorator DECORATE =
-      new SpringSecurityUserEventDecorator();
-  private static final String SPRING_SECURITY_PACKAGE = "org.springframework.security";
-
-  private static final Logger LOGGER =
-      LoggerFactory.getLogger(SpringSecurityUserEventDecorator.class);
-
-  private static final Set<Class<?>> SKIPPED_AUTHS =
-      Collections.newSetFromMap(new ConcurrentHashMap<>());
-
-  public void onUserNotFound() {
-    final AppSecEventTracker tracker = getEventTracker();
-    if (tracker == null) {
-      return;
-    }
-    tracker.onUserNotFound(UserIdCollectionMode.get());
-  }
-
-  public void onSignup(UserDetails user, Throwable throwable) {
-    // skip failures while signing up a user, later on, we might want to generate a separate event
-    // for this case
-    if (throwable != null) {
-      return;
-    }
-
-    final AppSecEventTracker tracker = getEventTracker();
-    if (tracker == null) {
-      return;
-    }
-
-    UserIdCollectionMode mode = UserIdCollectionMode.get();
-    String username = user.getUsername();
-    if (missingUsername(username, LoginEvent.SIGN_UP)) {
-      return;
-    }
-    Map<String, String> metadata = null;
-    if (mode == IDENTIFICATION) {
-      metadata = new HashMap<>();
-      metadata.put("enabled", String.valueOf(user.isEnabled()));
-      metadata.put(
-          "authorities",
-          user.getAuthorities().stream().map(Object::toString).collect(Collectors.joining(",")));
-    }
-
-    tracker.onSignupEvent(mode, username, metadata);
-  }
-
-  public void onLogin(Authentication authentication, Throwable throwable, Authentication result) {
-    if (authentication == null) {
-      return;
-    }
-
-    final AppSecEventTracker tracker = getEventTracker();
-    if (tracker == null) {
-      return;
-    }
-
-    if (shouldSkipAuthentication(authentication)) {
-      return;
-    }
-
-    UserIdCollectionMode mode = UserIdCollectionMode.get();
-    String username = result != null ? result.getName() : authentication.getName();
-    if (throwable == null && result != null && result.isAuthenticated()) {
-      if (missingUsername(username, LoginEvent.LOGIN_SUCCESS)) {
-        return;
-      }
-      Map<String, String> metadata = null;
-      Object principal = result.getPrincipal();
-      if (principal instanceof User) {
-        User user = (User) principal;
-        metadata = new HashMap<>();
-        metadata.put("enabled", String.valueOf(user.isEnabled()));
-        metadata.put(
-            "authorities",
-            user.getAuthorities().stream().map(Object::toString).collect(Collectors.joining(",")));
-        metadata.put("accountNonExpired", String.valueOf(user.isAccountNonExpired()));
-        metadata.put("accountNonLocked", String.valueOf(user.isAccountNonLocked()));
-        metadata.put("credentialsNonExpired", String.valueOf(user.isCredentialsNonExpired()));
-      }
-      tracker.onLoginSuccessEvent(mode, username, metadata);
-    } else if (throwable != null) {
-      if (missingUsername(username, LoginEvent.LOGIN_FAILURE)) {
-        return;
-      }
-      // On bad password, throwable would be
-      // org.springframework.security.authentication.BadCredentialsException,
-      // on user not found, throwable can be BadCredentials or
-      // org.springframework.security.core.userdetails.UsernameNotFoundException depending on the
-      // internal setting
-      // hideUserNotFoundExceptions (or a custom AuthenticationProvider implementation overriding
-      // this).
-      // This would be the ideal place to check whether the user exists or not, but we cannot do
-      // so reliably yet.
-      // See UsernameNotFoundExceptionInstrumentation for more details.
-      tracker.onLoginFailureEvent(mode, username, null, null);
+    public static final SpringSecurityUserEventDecorator DECORATE = new SpringSecurityUserEventDecorator();
+    private static final String SPRING_SECURITY_PACKAGE = "org.springframework.security";
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SpringSecurityUserEventDecorator.class);
+
+    private static final Set<Class<?>> SKIPPED_AUTHS = Collections.newSetFromMap(new ConcurrentHashMap<>());
+
+    public void onUserNotFound() {
+        final AppSecEventTracker tracker = getEventTracker();
+        if (tracker == null) {
+            return;
+        }
+        tracker.onUserNotFound(UserIdCollectionMode.get());
+    }
+
+    public void onSignup(UserDetails user, Throwable throwable) {
+        // skip failures while signing up a user, later on, we might want to generate a separate event
+        // for this case
+        if (throwable != null) {
+            return;
+        }
+
+        final AppSecEventTracker tracker = getEventTracker();
+        if (tracker == null) {
+            return;
+        }
+
+        UserIdCollectionMode mode = UserIdCollectionMode.get();
+        String username = user.getUsername();
+        if (missingUsername(username, LoginEvent.SIGN_UP)) {
+            return;
+        }
+        Map<String, String> metadata = null;
+        if (mode == IDENTIFICATION) {
+            metadata = new HashMap<>();
+            metadata.put("enabled", String.valueOf(user.isEnabled()));
+            metadata.put(
+                    "authorities",
+                    user.getAuthorities().stream().map(Object::toString).collect(Collectors.joining(",")));
+        }
+
+        tracker.onSignupEvent(mode, username, metadata);
+    }
+
+    public void onLogin(Authentication authentication, Throwable throwable, Authentication result) {
+        if (authentication == null) {
+            return;
+        }
+
+        final AppSecEventTracker tracker = getEventTracker();
+        if (tracker == null) {
+            return;
+        }
+
+        if (shouldSkipAuthentication(authentication)) {
+            return;
+        }
+
+        UserIdCollectionMode mode = UserIdCollectionMode.get();
+        String username = result != null ? result.getName() : authentication.getName();
+        if (throwable == null && result != null && result.isAuthenticated()) {
+            if (missingUsername(username, LoginEvent.LOGIN_SUCCESS)) {
+                return;
+            }
+            Map<String, String> metadata = null;
+            Object principal = result.getPrincipal();
+            if (principal instanceof User) {
+                User user = (User) principal;
+                metadata = new HashMap<>();
+                metadata.put("enabled", String.valueOf(user.isEnabled()));
+                metadata.put(
+                        "authorities",
+                        user.getAuthorities().stream().map(Object::toString).collect(Collectors.joining(",")));
+                metadata.put("accountNonExpired", String.valueOf(user.isAccountNonExpired()));
+                metadata.put("accountNonLocked", String.valueOf(user.isAccountNonLocked()));
+                metadata.put("credentialsNonExpired", String.valueOf(user.isCredentialsNonExpired()));
+            }
+            tracker.onLoginSuccessEvent(mode, username, metadata);
+        } else if (throwable != null) {
+            if (missingUsername(username, LoginEvent.LOGIN_FAILURE)) {
+                return;
+            }
+            // On bad password, throwable would be
+            // org.springframework.security.authentication.BadCredentialsException,
+            // on user not found, throwable can be BadCredentials or
+            // org.springframework.security.core.userdetails.UsernameNotFoundException depending on the
+            // internal setting
+            // hideUserNotFoundExceptions (or a custom AuthenticationProvider implementation overriding
+            // this).
+            // This would be the ideal place to check whether the user exists or not, but we cannot do
+            // so reliably yet.
+            // See UsernameNotFoundExceptionInstrumentation for more details.
+            tracker.onLoginFailureEvent(mode, username, null, null);
+        }
+    }
+
+    public void onUser(final Authentication authentication) {
+        if (authentication == null) {
+            return;
+        }
+
+        final AppSecEventTracker tracker = getEventTracker();
+        if (tracker == null) {
+            return;
+        }
+
+        if (shouldSkipAuthentication(authentication)) {
+            return;
+        }
+
+        UserIdCollectionMode mode = UserIdCollectionMode.get();
+        String username = authentication.getName();
+        if (missingUserId(username)) {
+            return;
+        }
+        tracker.onUserEvent(mode, username);
+    }
+
+    private static boolean shouldSkipAuthentication(final Authentication authentication) {
+        if (authentication instanceof UsernamePasswordAuthenticationToken) {
+            return false;
+        }
+        if (SKIPPED_AUTHS.add(authentication.getClass())) {
+            final Class<?> authClass = authentication.getClass();
+            LOGGER.debug(SEND_TELEMETRY, "Skipped authentication, auth={}", findRootAuthentication(authClass));
+        }
+        return true;
+    }
+
+    private static String findRootAuthentication(Class<?> authentication) {
+        while (authentication != Object.class) {
+            if (authentication.getName().startsWith(SPRING_SECURITY_PACKAGE)) {
+                return authentication.getName();
+            }
+            authentication = authentication.getSuperclass();
+        }
+        return Authentication.class.getName(); // set this a default for really custom impls
+    }
+
+    private static boolean missingUserId(final String username) {
+        if (username == null || username.isEmpty()) {
+            WafMetricCollector.get().missingUserId(LoginFramework.SPRING_SECURITY);
+            return true;
+        }
+        return false;
+    }
+
+    private static boolean missingUsername(final String username, final LoginEvent event) {
+        if (username == null || username.isEmpty()) {
+            WafMetricCollector.get().missingUserLogin(LoginFramework.SPRING_SECURITY, event);
+            return true;
+        }
+        return false;
+    }
+
+    private static AppSecEventTracker getEventTracker() {
+        final EventTracker tracker = GlobalTracer.getEventTracker();
+        return tracker instanceof AppSecEventTracker ? (AppSecEventTracker) tracker : null;
     }
-  }
-
-  public void onUser(final Authentication authentication) {
-    if (authentication == null) {
-      return;
-    }
-
-    final AppSecEventTracker tracker = getEventTracker();
-    if (tracker == null) {
-      return;
-    }
-
-    if (shouldSkipAuthentication(authentication)) {
-      return;
-    }
-
-    UserIdCollectionMode mode = UserIdCollectionMode.get();
-    String username = authentication.getName();
-    if (missingUserId(username)) {
-      return;
-    }
-    tracker.onUserEvent(mode, username);
-  }
-
-  private static boolean shouldSkipAuthentication(final Authentication authentication) {
-    if (authentication instanceof UsernamePasswordAuthenticationToken) {
-      return false;
-    }
-    if (SKIPPED_AUTHS.add(authentication.getClass())) {
-      final Class<?> authClass = authentication.getClass();
-      LOGGER.debug(
-          SEND_TELEMETRY, "Skipped authentication, auth={}", findRootAuthentication(authClass));
-    }
-    return true;
-  }
-
-  private static String findRootAuthentication(Class<?> authentication) {
-    while (authentication != Object.class) {
-      if (authentication.getName().startsWith(SPRING_SECURITY_PACKAGE)) {
-        return authentication.getName();
-      }
-      authentication = authentication.getSuperclass();
-    }
-    return Authentication.class.getName(); // set this a default for really custom impls
-  }
-
-  private static boolean missingUserId(final String username) {
-    if (username == null || username.isEmpty()) {
-      WafMetricCollector.get().missingUserId(LoginFramework.SPRING_SECURITY);
-      return true;
-    }
-    return false;
-  }
-
-  private static boolean missingUsername(final String username, final LoginEvent event) {
-    if (username == null || username.isEmpty()) {
-      WafMetricCollector.get().missingUserLogin(LoginFramework.SPRING_SECURITY, event);
-      return true;
-    }
-    return false;
-  }
-
-  private static AppSecEventTracker getEventTracker() {
-    final EventTracker tracker = GlobalTracer.getEventTracker();
-    return tracker instanceof AppSecEventTracker ? (AppSecEventTracker) tracker : null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/UserDetailsManagerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/UserDetailsManagerInstrumentation.java
index 587ae741f5e..b643a3f7904 100644
--- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/UserDetailsManagerInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/UserDetailsManagerInstrumentation.java
@@ -17,43 +17,40 @@
 
 @AutoService(InstrumenterModule.class)
 public class UserDetailsManagerInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public UserDetailsManagerInstrumentation() {
-    super("spring-security");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.security.provisioning.UserDetailsManager";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("createUser"))
-            .and(
-                takesArgument(
-                    0, named("org.springframework.security.core.userdetails.UserDetails")))
-            .and(isPublic()),
-        getClass().getName() + "$UserDetailsManagerAdvice");
-  }
-
-  public static class UserDetailsManagerAdvice {
-
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Argument(value = 0, readOnly = false) UserDetails user,
-        @Advice.Thrown Throwable throwable) {
-      if (ActiveSubsystems.APPSEC_ACTIVE) {
-        SpringSecurityUserEventDecorator.DECORATE.onSignup(user, throwable);
-      }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public UserDetailsManagerInstrumentation() {
+        super("spring-security");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.security.provisioning.UserDetailsManager";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("createUser"))
+                        .and(takesArgument(0, named("org.springframework.security.core.userdetails.UserDetails")))
+                        .and(isPublic()),
+                getClass().getName() + "$UserDetailsManagerAdvice");
+    }
+
+    public static class UserDetailsManagerAdvice {
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Argument(value = 0, readOnly = false) UserDetails user, @Advice.Thrown Throwable throwable) {
+            if (ActiveSubsystems.APPSEC_ACTIVE) {
+                SpringSecurityUserEventDecorator.DECORATE.onSignup(user, throwable);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionInstrumentation.java
index 4849afdfa1a..38194315b69 100644
--- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionInstrumentation.java
@@ -15,34 +15,34 @@
 
 @AutoService(InstrumenterModule.class)
 public class UsernameNotFoundExceptionInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public UsernameNotFoundExceptionInstrumentation() {
-    super("spring-security");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.security.core.userdetails.UsernameNotFoundException";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(0, named("java.lang.String"))).and(isPublic()),
-        getClass().getName() + "$UsernameNotFoundExceptionAdvice");
-  }
-
-  public static class UsernameNotFoundExceptionAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter() {
-      SpringSecurityUserEventDecorator.DECORATE.onUserNotFound();
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public UsernameNotFoundExceptionInstrumentation() {
+        super("spring-security");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.security.core.userdetails.UsernameNotFoundException";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(0, named("java.lang.String"))).and(isPublic()),
+                getClass().getName() + "$UsernameNotFoundExceptionAdvice");
+    }
+
+    public static class UsernameNotFoundExceptionAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter() {
+            SpringSecurityUserEventDecorator.DECORATE.onUserNotFound();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/java/custom/CustomAuthenticationFilter.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/java/custom/CustomAuthenticationFilter.java
index f63ccdc574d..333e4b37e1d 100644
--- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/java/custom/CustomAuthenticationFilter.java
+++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/java/custom/CustomAuthenticationFilter.java
@@ -11,23 +11,22 @@
 
 public class CustomAuthenticationFilter extends AbstractAuthenticationProcessingFilter {
 
-  private static final String HEADER_NAME = "X-Custom-User";
+    private static final String HEADER_NAME = "X-Custom-User";
 
-  private final AuthenticationManager authenticationManager;
+    private final AuthenticationManager authenticationManager;
 
-  public CustomAuthenticationFilter(final AuthenticationManager authenticationManager) {
-    super("/custom");
-    this.authenticationManager = authenticationManager;
-  }
+    public CustomAuthenticationFilter(final AuthenticationManager authenticationManager) {
+        super("/custom");
+        this.authenticationManager = authenticationManager;
+    }
 
-  @Override
-  public Authentication attemptAuthentication(
-      HttpServletRequest request, HttpServletResponse response)
-      throws AuthenticationException, IOException, ServletException {
-    final String user = request.getHeader(HEADER_NAME);
-    if (user == null) {
-      return null;
+    @Override
+    public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response)
+            throws AuthenticationException, IOException, ServletException {
+        final String user = request.getHeader(HEADER_NAME);
+        if (user == null) {
+            return null;
+        }
+        return authenticationManager.authenticate(new CustomAuthenticationToken(user));
     }
-    return authenticationManager.authenticate(new CustomAuthenticationToken(user));
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/java/custom/CustomAuthenticationProvider.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/java/custom/CustomAuthenticationProvider.java
index ac9b8706ab9..b4ca4c86902 100644
--- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/java/custom/CustomAuthenticationProvider.java
+++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/java/custom/CustomAuthenticationProvider.java
@@ -6,13 +6,13 @@
 
 public class CustomAuthenticationProvider implements AuthenticationProvider {
 
-  @Override
-  public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-    return authentication;
-  }
+    @Override
+    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+        return authentication;
+    }
 
-  @Override
-  public boolean supports(Class<?> authentication) {
-    return CustomAuthenticationToken.class.isAssignableFrom(authentication);
-  }
+    @Override
+    public boolean supports(Class<?> authentication) {
+        return CustomAuthenticationToken.class.isAssignableFrom(authentication);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/java/custom/CustomAuthenticationToken.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/java/custom/CustomAuthenticationToken.java
index b85fdc4ad99..dce2dc0be18 100644
--- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/java/custom/CustomAuthenticationToken.java
+++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/java/custom/CustomAuthenticationToken.java
@@ -5,20 +5,20 @@
 
 public class CustomAuthenticationToken extends AbstractAuthenticationToken {
 
-  private final String user;
+    private final String user;
 
-  public CustomAuthenticationToken(String user) {
-    super(Collections.emptyList());
-    this.user = user;
-  }
+    public CustomAuthenticationToken(String user) {
+        super(Collections.emptyList());
+        this.user = user;
+    }
 
-  @Override
-  public Object getCredentials() {
-    return user;
-  }
+    @Override
+    public Object getCredentials() {
+        return user;
+    }
 
-  @Override
-  public Object getPrincipal() {
-    return user;
-  }
+    @Override
+    public Object getPrincipal() {
+        return user;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/java/custom/FailingAuthenticationProvider.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/java/custom/FailingAuthenticationProvider.java
index c4fd7b3d595..15107e2ad06 100644
--- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/java/custom/FailingAuthenticationProvider.java
+++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/java/custom/FailingAuthenticationProvider.java
@@ -7,13 +7,13 @@
 
 public class FailingAuthenticationProvider implements AuthenticationProvider {
 
-  @Override
-  public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-    throw new AuthenticationServiceException("I'm dumb");
-  }
+    @Override
+    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+        throw new AuthenticationServiceException("I'm dumb");
+    }
 
-  @Override
-  public boolean supports(Class<?> authentication) {
-    return true;
-  }
+    @Override
+    public boolean supports(Class<?> authentication) {
+        return true;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/java/custom/CustomAuthenticationFilter.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/java/custom/CustomAuthenticationFilter.java
index b3ec62a572b..4ba2c995fc0 100644
--- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/java/custom/CustomAuthenticationFilter.java
+++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/java/custom/CustomAuthenticationFilter.java
@@ -11,23 +11,22 @@
 
 public class CustomAuthenticationFilter extends AbstractAuthenticationProcessingFilter {
 
-  private static final String HEADER_NAME = "X-Custom-User";
+    private static final String HEADER_NAME = "X-Custom-User";
 
-  private final AuthenticationManager authenticationManager;
+    private final AuthenticationManager authenticationManager;
 
-  public CustomAuthenticationFilter(final AuthenticationManager authenticationManager) {
-    super("/custom");
-    this.authenticationManager = authenticationManager;
-  }
+    public CustomAuthenticationFilter(final AuthenticationManager authenticationManager) {
+        super("/custom");
+        this.authenticationManager = authenticationManager;
+    }
 
-  @Override
-  public Authentication attemptAuthentication(
-      HttpServletRequest request, HttpServletResponse response)
-      throws AuthenticationException, IOException, ServletException {
-    final String user = request.getHeader(HEADER_NAME);
-    if (user == null) {
-      return null;
+    @Override
+    public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response)
+            throws AuthenticationException, IOException, ServletException {
+        final String user = request.getHeader(HEADER_NAME);
+        if (user == null) {
+            return null;
+        }
+        return authenticationManager.authenticate(new CustomAuthenticationToken(user));
     }
-    return authenticationManager.authenticate(new CustomAuthenticationToken(user));
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/java/custom/CustomAuthenticationProvider.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/java/custom/CustomAuthenticationProvider.java
index ac9b8706ab9..b4ca4c86902 100644
--- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/java/custom/CustomAuthenticationProvider.java
+++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/java/custom/CustomAuthenticationProvider.java
@@ -6,13 +6,13 @@
 
 public class CustomAuthenticationProvider implements AuthenticationProvider {
 
-  @Override
-  public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-    return authentication;
-  }
+    @Override
+    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+        return authentication;
+    }
 
-  @Override
-  public boolean supports(Class<?> authentication) {
-    return CustomAuthenticationToken.class.isAssignableFrom(authentication);
-  }
+    @Override
+    public boolean supports(Class<?> authentication) {
+        return CustomAuthenticationToken.class.isAssignableFrom(authentication);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/java/custom/CustomAuthenticationToken.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/java/custom/CustomAuthenticationToken.java
index b85fdc4ad99..dce2dc0be18 100644
--- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/java/custom/CustomAuthenticationToken.java
+++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/java/custom/CustomAuthenticationToken.java
@@ -5,20 +5,20 @@
 
 public class CustomAuthenticationToken extends AbstractAuthenticationToken {
 
-  private final String user;
+    private final String user;
 
-  public CustomAuthenticationToken(String user) {
-    super(Collections.emptyList());
-    this.user = user;
-  }
+    public CustomAuthenticationToken(String user) {
+        super(Collections.emptyList());
+        this.user = user;
+    }
 
-  @Override
-  public Object getCredentials() {
-    return user;
-  }
+    @Override
+    public Object getCredentials() {
+        return user;
+    }
 
-  @Override
-  public Object getPrincipal() {
-    return user;
-  }
+    @Override
+    public Object getPrincipal() {
+        return user;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/java/custom/FailingAuthenticationProvider.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/java/custom/FailingAuthenticationProvider.java
index c4fd7b3d595..15107e2ad06 100644
--- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/java/custom/FailingAuthenticationProvider.java
+++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/java/custom/FailingAuthenticationProvider.java
@@ -7,13 +7,13 @@
 
 public class FailingAuthenticationProvider implements AuthenticationProvider {
 
-  @Override
-  public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-    throw new AuthenticationServiceException("I'm dumb");
-  }
+    @Override
+    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+        throw new AuthenticationServiceException("I'm dumb");
+    }
 
-  @Override
-  public boolean supports(Class<?> authentication) {
-    return true;
-  }
+    @Override
+    public boolean supports(Class<?> authentication) {
+        return true;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/WsHandler.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/WsHandler.java
index 0285c45b485..34258b2dee6 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/WsHandler.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/WsHandler.java
@@ -9,65 +9,58 @@
 @Component
 public class WsHandler implements WebSocketHandler {
 
-  volatile WebSocketSession activeSession;
+    volatile WebSocketSession activeSession;
 
-  @Override
-  public Mono<Void> handle(WebSocketSession webSocketSession) {
-    // An echo server the closes after the first echoed message
-    activeSession = webSocketSession;
-    synchronized (this) {
-      notifyAll();
+    @Override
+    public Mono<Void> handle(WebSocketSession webSocketSession) {
+        // An echo server the closes after the first echoed message
+        activeSession = webSocketSession;
+        synchronized (this) {
+            notifyAll();
+        }
+        return webSocketSession
+                .receive()
+                .map(msg -> {
+                    if (msg.getType() == WebSocketMessage.Type.TEXT) {
+                        return webSocketSession.textMessage(msg.getPayloadAsText());
+                    }
+                    byte[] bytes = new byte[msg.getPayload().readableByteCount()];
+                    msg.getPayload().read(bytes);
+                    return webSocketSession.binaryMessage(dataBufferFactory -> dataBufferFactory.wrap(bytes));
+                })
+                .flatMap(msg -> webSocketSession.send(Mono.just(msg)).doFinally(ignored -> {
+                    synchronized (this) {
+                        activeSession = null;
+                        notifyAll();
+                    }
+                }))
+                .then();
     }
-    return webSocketSession
-        .receive()
-        .map(
-            msg -> {
-              if (msg.getType() == WebSocketMessage.Type.TEXT) {
-                return webSocketSession.textMessage(msg.getPayloadAsText());
-              }
-              byte[] bytes = new byte[msg.getPayload().readableByteCount()];
-              msg.getPayload().read(bytes);
-              return webSocketSession.binaryMessage(
-                  dataBufferFactory -> dataBufferFactory.wrap(bytes));
-            })
-        .flatMap(
-            msg ->
-                webSocketSession
-                    .send(Mono.just(msg))
-                    .doFinally(
-                        ignored -> {
-                          synchronized (this) {
-                            activeSession = null;
-                            notifyAll();
-                          }
-                        }))
-        .then();
-  }
 
-  public void awaitExchangeComplete() {
-    synchronized (this) {
-      if (activeSession == null) {
-        return;
-      }
-      try {
-        wait();
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      }
+    public void awaitExchangeComplete() {
+        synchronized (this) {
+            if (activeSession == null) {
+                return;
+            }
+            try {
+                wait();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
     }
-  }
 
-  public void awaitConnected() {
-    synchronized (this) {
-      if (activeSession != null) {
-        return;
-      }
-      try {
-        wait(1000);
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      }
+    public void awaitConnected() {
+        synchronized (this) {
+            if (activeSession != null) {
+                return;
+            }
+            try {
+                wait(1000);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
+        assert activeSession != null;
     }
-    assert activeSession != null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/bootTest/java/dd/trace/instrumentation/springwebflux/server/RedirectComponent.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/bootTest/java/dd/trace/instrumentation/springwebflux/server/RedirectComponent.java
index 85917014396..1b7abf038b1 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/bootTest/java/dd/trace/instrumentation/springwebflux/server/RedirectComponent.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/bootTest/java/dd/trace/instrumentation/springwebflux/server/RedirectComponent.java
@@ -12,10 +12,11 @@
 // Need to keep this in Java because groovy creates crazy proxies around lambdas
 @Component
 public class RedirectComponent {
-  @Bean
-  public RouterFunction<ServerResponse> redirectRouterFunction() {
-    return route(
-        GET("/double-greet-redirect"),
-        req -> ServerResponse.temporaryRedirect(URI.create("/double-greet")).build());
-  }
+    @Bean
+    public RouterFunction<ServerResponse> redirectRouterFunction() {
+        return route(
+                GET("/double-greet-redirect"),
+                req -> ServerResponse.temporaryRedirect(URI.create("/double-greet"))
+                        .build());
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java
index dd91de0d112..764c3270a8b 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java
@@ -7,57 +7,53 @@
 import org.springframework.web.reactive.function.client.ClientRequest;
 import org.springframework.web.reactive.function.client.ClientResponse;
 
-public class SpringWebfluxHttpClientDecorator
-    extends HttpClientDecorator<ClientRequest, ClientResponse> {
-  public static final CharSequence SPRING_WEBFLUX_CLIENT =
-      UTF8BytesString.create("spring-webflux-client");
-  public static final CharSequence CANCELLED = UTF8BytesString.create("cancelled");
-  public static final CharSequence CANCELLED_MESSAGE =
-      UTF8BytesString.create("The subscription was cancelled");
-
-  public static final SpringWebfluxHttpClientDecorator DECORATE =
-      new SpringWebfluxHttpClientDecorator();
-
-  public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
-
-  public void onCancel(final AgentSpan span) {
-    span.setTag("event", CANCELLED);
-    span.setTag("message", CANCELLED_MESSAGE);
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"spring-webflux", "spring-webflux-client"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return SPRING_WEBFLUX_CLIENT;
-  }
-
-  @Override
-  protected String method(final ClientRequest httpRequest) {
-    return httpRequest.method().name();
-  }
-
-  @Override
-  protected URI url(final ClientRequest httpRequest) {
-    return httpRequest.url();
-  }
-
-  @Override
-  protected int status(final ClientResponse httpResponse) {
-    final Integer code = StatusCodes.STATUS_CODE_FUNCTION.apply(httpResponse);
-    return code != null ? code : 0;
-  }
-
-  @Override
-  protected String getRequestHeader(ClientRequest request, String headerName) {
-    return request.headers().getFirst(headerName);
-  }
-
-  @Override
-  protected String getResponseHeader(ClientResponse response, String headerName) {
-    return response.headers().asHttpHeaders().getFirst(headerName);
-  }
+public class SpringWebfluxHttpClientDecorator extends HttpClientDecorator<ClientRequest, ClientResponse> {
+    public static final CharSequence SPRING_WEBFLUX_CLIENT = UTF8BytesString.create("spring-webflux-client");
+    public static final CharSequence CANCELLED = UTF8BytesString.create("cancelled");
+    public static final CharSequence CANCELLED_MESSAGE = UTF8BytesString.create("The subscription was cancelled");
+
+    public static final SpringWebfluxHttpClientDecorator DECORATE = new SpringWebfluxHttpClientDecorator();
+
+    public static final CharSequence HTTP_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    public void onCancel(final AgentSpan span) {
+        span.setTag("event", CANCELLED);
+        span.setTag("message", CANCELLED_MESSAGE);
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"spring-webflux", "spring-webflux-client"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return SPRING_WEBFLUX_CLIENT;
+    }
+
+    @Override
+    protected String method(final ClientRequest httpRequest) {
+        return httpRequest.method().name();
+    }
+
+    @Override
+    protected URI url(final ClientRequest httpRequest) {
+        return httpRequest.url();
+    }
+
+    @Override
+    protected int status(final ClientResponse httpResponse) {
+        final Integer code = StatusCodes.STATUS_CODE_FUNCTION.apply(httpResponse);
+        return code != null ? code : 0;
+    }
+
+    @Override
+    protected String getRequestHeader(ClientRequest request, String headerName) {
+        return request.headers().getFirst(headerName);
+    }
+
+    @Override
+    protected String getResponseHeader(ClientResponse response, String headerName) {
+        return response.headers().asHttpHeaders().getFirst(headerName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/StatusCodes.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/StatusCodes.java
index 0a2f0c546c9..8416ed51496 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/StatusCodes.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/StatusCodes.java
@@ -11,103 +11,94 @@
 
 // Adapted from Opentelemetry
 public final class StatusCodes {
-  private static final Logger LOGGER = LoggerFactory.getLogger(StatusCodes.class);
-  public static final Function<ClientResponse, Integer> STATUS_CODE_FUNCTION =
-      getStatusCodeFunction();
+    private static final Logger LOGGER = LoggerFactory.getLogger(StatusCodes.class);
+    public static final Function<ClientResponse, Integer> STATUS_CODE_FUNCTION = getStatusCodeFunction();
 
-  private static Function<ClientResponse, Integer> getStatusCodeFunction() {
-    Function<ClientResponse, Integer> statusCodeFunction = getStatusCodeFunction60();
-    if (statusCodeFunction == null) {
-      statusCodeFunction = getStatusCodeFunction51();
+    private static Function<ClientResponse, Integer> getStatusCodeFunction() {
+        Function<ClientResponse, Integer> statusCodeFunction = getStatusCodeFunction60();
+        if (statusCodeFunction == null) {
+            statusCodeFunction = getStatusCodeFunction51();
+        }
+        if (statusCodeFunction == null) {
+            statusCodeFunction = getStatusCodeFunction50();
+        }
+        if (statusCodeFunction == null) {
+            LOGGER.debug(
+                    "Unable to find a status code extractor function working for the current webflux client version. "
+                            + "Status codes will not be tagged on webflux client spans");
+        }
+        return statusCodeFunction;
     }
-    if (statusCodeFunction == null) {
-      statusCodeFunction = getStatusCodeFunction50();
-    }
-    if (statusCodeFunction == null) {
-      LOGGER.debug(
-          "Unable to find a status code extractor function working for the current webflux client version. "
-              + "Status codes will not be tagged on webflux client spans");
-    }
-    return statusCodeFunction;
-  }
 
-  // in webflux 6.0, HttpStatusCode class was introduced, and statusCode() was changed to return
-  // HttpStatusCode instead of HttpStatus
-  private static Function<ClientResponse, Integer> getStatusCodeFunction60() {
-    MethodHandle statusCode;
-    MethodHandle value;
-    try {
-      Class<?> httpStatusCodeClass =
-          Class.forName(
-              "org.springframework.http.HttpStatusCode", false, StatusCodes.class.getClassLoader());
-      statusCode =
-          MethodHandles.publicLookup()
-              .findVirtual(
-                  ClientResponse.class, "statusCode", MethodType.methodType(httpStatusCodeClass));
-      value =
-          MethodHandles.publicLookup()
-              .findVirtual(httpStatusCodeClass, "value", MethodType.methodType(int.class));
-    } catch (ClassNotFoundException | IllegalAccessException | NoSuchMethodException e) {
-      return null;
+    // in webflux 6.0, HttpStatusCode class was introduced, and statusCode() was changed to return
+    // HttpStatusCode instead of HttpStatus
+    private static Function<ClientResponse, Integer> getStatusCodeFunction60() {
+        MethodHandle statusCode;
+        MethodHandle value;
+        try {
+            Class<?> httpStatusCodeClass =
+                    Class.forName("org.springframework.http.HttpStatusCode", false, StatusCodes.class.getClassLoader());
+            statusCode = MethodHandles.publicLookup()
+                    .findVirtual(ClientResponse.class, "statusCode", MethodType.methodType(httpStatusCodeClass));
+            value = MethodHandles.publicLookup()
+                    .findVirtual(httpStatusCodeClass, "value", MethodType.methodType(int.class));
+        } catch (ClassNotFoundException | IllegalAccessException | NoSuchMethodException e) {
+            return null;
+        }
+
+        return response -> {
+            try {
+                Object httpStatusCode = statusCode.invoke(response);
+                return (int) value.invoke(httpStatusCode);
+            } catch (Throwable e) {
+                return null;
+            }
+        };
     }
 
-    return response -> {
-      try {
-        Object httpStatusCode = statusCode.invoke(response);
-        return (int) value.invoke(httpStatusCode);
-      } catch (Throwable e) {
-        return null;
-      }
-    };
-  }
+    // in webflux 5.1, rawStatusCode() was introduced to retrieve the exact status code
+    // note: rawStatusCode() was deprecated in 6.0
+    private static Function<ClientResponse, Integer> getStatusCodeFunction51() {
+        MethodHandle rawStatusCode;
+        try {
+            rawStatusCode = MethodHandles.publicLookup()
+                    .findVirtual(ClientResponse.class, "rawStatusCode", MethodType.methodType(int.class));
+        } catch (IllegalAccessException | NoSuchMethodException e) {
+            return null;
+        }
 
-  // in webflux 5.1, rawStatusCode() was introduced to retrieve the exact status code
-  // note: rawStatusCode() was deprecated in 6.0
-  private static Function<ClientResponse, Integer> getStatusCodeFunction51() {
-    MethodHandle rawStatusCode;
-    try {
-      rawStatusCode =
-          MethodHandles.publicLookup()
-              .findVirtual(ClientResponse.class, "rawStatusCode", MethodType.methodType(int.class));
-    } catch (IllegalAccessException | NoSuchMethodException e) {
-      return null;
+        return response -> {
+            try {
+                return (int) rawStatusCode.invoke(response);
+            } catch (Throwable e) {
+                return null;
+            }
+        };
     }
 
-    return response -> {
-      try {
-        return (int) rawStatusCode.invoke(response);
-      } catch (Throwable e) {
-        return null;
-      }
-    };
-  }
+    // in webflux 5.0, statusCode() returns HttpStatus, which only represents standard status codes
+    // (there's no way to capture arbitrary status codes)
+    private static Function<ClientResponse, Integer> getStatusCodeFunction50() {
+        MethodHandle statusCode;
+        MethodHandle value;
+        try {
+            statusCode = MethodHandles.publicLookup()
+                    .findVirtual(ClientResponse.class, "statusCode", MethodType.methodType(HttpStatus.class));
+            value = MethodHandles.publicLookup()
+                    .findVirtual(HttpStatus.class, "value", MethodType.methodType(int.class));
+        } catch (IllegalAccessException | NoSuchMethodException e) {
+            return null;
+        }
 
-  // in webflux 5.0, statusCode() returns HttpStatus, which only represents standard status codes
-  // (there's no way to capture arbitrary status codes)
-  private static Function<ClientResponse, Integer> getStatusCodeFunction50() {
-    MethodHandle statusCode;
-    MethodHandle value;
-    try {
-      statusCode =
-          MethodHandles.publicLookup()
-              .findVirtual(
-                  ClientResponse.class, "statusCode", MethodType.methodType(HttpStatus.class));
-      value =
-          MethodHandles.publicLookup()
-              .findVirtual(HttpStatus.class, "value", MethodType.methodType(int.class));
-    } catch (IllegalAccessException | NoSuchMethodException e) {
-      return null;
+        return response -> {
+            try {
+                Object httpStatusCode = statusCode.invoke(response);
+                return (int) value.invoke(httpStatusCode);
+            } catch (Throwable e) {
+                return null;
+            }
+        };
     }
 
-    return response -> {
-      try {
-        Object httpStatusCode = statusCode.invoke(response);
-        return (int) value.invoke(httpStatusCode);
-      } catch (Throwable e) {
-        return null;
-      }
-    };
-  }
-
-  private StatusCodes() {}
+    private StatusCodes() {}
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/TraceWebClientSubscriber.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/TraceWebClientSubscriber.java
index c0d75bf4999..a66ce0420d0 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/TraceWebClientSubscriber.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/TraceWebClientSubscriber.java
@@ -13,67 +13,65 @@
 
 public final class TraceWebClientSubscriber implements CoreSubscriber<ClientResponse> {
 
-  final CoreSubscriber<? super ClientResponse> actual;
+    final CoreSubscriber<? super ClientResponse> actual;
 
-  final Context context;
+    final Context context;
 
-  private final AgentSpan span;
-  private final AgentSpan parent;
+    private final AgentSpan span;
+    private final AgentSpan parent;
 
-  public TraceWebClientSubscriber(
-      final CoreSubscriber<? super ClientResponse> actual,
-      final AgentSpan span,
-      final AgentSpan parent) {
-    this.actual = actual;
-    this.span = span;
-    this.parent = parent != null ? parent : noopSpan();
-    context = actual.currentContext();
-  }
+    public TraceWebClientSubscriber(
+            final CoreSubscriber<? super ClientResponse> actual, final AgentSpan span, final AgentSpan parent) {
+        this.actual = actual;
+        this.span = span;
+        this.parent = parent != null ? parent : noopSpan();
+        context = actual.currentContext();
+    }
 
-  @Override
-  public void onSubscribe(final Subscription subscription) {
-    try (final ContextScope scope = activateSpan(parent)) {
-      actual.onSubscribe(subscription);
+    @Override
+    public void onSubscribe(final Subscription subscription) {
+        try (final ContextScope scope = activateSpan(parent)) {
+            actual.onSubscribe(subscription);
+        }
     }
-  }
 
-  @Override
-  public void onNext(final ClientResponse response) {
-    try (final ContextScope scope = activateSpan(parent)) {
-      actual.onNext(response);
-    } finally {
-      DECORATE.onResponse(span, response);
-      DECORATE.beforeFinish(span);
-      span.finish();
+    @Override
+    public void onNext(final ClientResponse response) {
+        try (final ContextScope scope = activateSpan(parent)) {
+            actual.onNext(response);
+        } finally {
+            DECORATE.onResponse(span, response);
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 
-  @Override
-  public void onError(final Throwable t) {
-    try (final ContextScope scope = activateSpan(parent)) {
-      actual.onError(t);
-    } finally {
-      DECORATE.onError(span, t);
-      DECORATE.beforeFinish(span);
-      span.finish();
+    @Override
+    public void onError(final Throwable t) {
+        try (final ContextScope scope = activateSpan(parent)) {
+            actual.onError(t);
+        } finally {
+            DECORATE.onError(span, t);
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 
-  @Override
-  public void onComplete() {
+    @Override
+    public void onComplete() {
 
-    try (final ContextScope scope = activateSpan(parent)) {
-      actual.onComplete();
+        try (final ContextScope scope = activateSpan(parent)) {
+            actual.onComplete();
+        }
     }
-  }
 
-  public void onCancel() {
-    DECORATE.onCancel(span);
-    span.finish();
-  }
+    public void onCancel() {
+        DECORATE.onCancel(span);
+        span.finish();
+    }
 
-  @Override
-  public Context currentContext() {
-    return context;
-  }
+    @Override
+    public Context currentContext() {
+        return context;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientFilterAdvices.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientFilterAdvices.java
index 6dfd9c95617..165bc533290 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientFilterAdvices.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientFilterAdvices.java
@@ -6,23 +6,21 @@
 import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
 
 public class WebClientFilterAdvices {
-  public static class AfterConstructorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.FieldValue(value = "filters", readOnly = false)
-            List<ExchangeFilterFunction> filters) {
-      if (filters == null) {
-        filters = new ArrayList<>();
-      }
-      WebClientTracingFilter.addFilter(filters);
+    public static class AfterConstructorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.FieldValue(value = "filters", readOnly = false) List<ExchangeFilterFunction> filters) {
+            if (filters == null) {
+                filters = new ArrayList<>();
+            }
+            WebClientTracingFilter.addFilter(filters);
+        }
     }
-  }
 
-  public static class AfterFilterListModificationAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.FieldValue(value = "filters") final List<ExchangeFilterFunction> filters) {
-      WebClientTracingFilter.addFilter(filters);
+    public static class AfterFilterListModificationAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(@Advice.FieldValue(value = "filters") final List<ExchangeFilterFunction> filters) {
+            WebClientTracingFilter.addFilter(filters);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientFilterInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientFilterInstrumentation.java
index 4f425e6d0c6..02349c12561 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientFilterInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientFilterInstrumentation.java
@@ -11,27 +11,26 @@
 
 @AutoService(InstrumenterModule.class)
 public class WebClientFilterInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public WebClientFilterInstrumentation() {
-    super("spring-webflux", "spring-webflux-client");
-  }
+    public WebClientFilterInstrumentation() {
+        super("spring-webflux", "spring-webflux-client");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.web.reactive.function.client.DefaultWebClientBuilder";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.web.reactive.function.client.DefaultWebClientBuilder";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // This one can't possibly happen on multiple threads so makes sure we are always added to the
-    // list initially
-    transformer.applyAdvice(
-        isConstructor(), packageName + ".WebClientFilterAdvices$AfterConstructorAdvice");
-    // These methods are not thread safe already so doing our work here shouldn't change the
-    // likelihood of ConcurrentModificationException happening
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("filter").or(named("filters"))),
-        packageName + ".WebClientFilterAdvices$AfterFilterListModificationAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // This one can't possibly happen on multiple threads so makes sure we are always added to the
+        // list initially
+        transformer.applyAdvice(isConstructor(), packageName + ".WebClientFilterAdvices$AfterConstructorAdvice");
+        // These methods are not thread safe already so doing our work here shouldn't change the
+        // likelihood of ConcurrentModificationException happening
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("filter").or(named("filters"))),
+                packageName + ".WebClientFilterAdvices$AfterFilterListModificationAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientTracingFilter.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientTracingFilter.java
index ad84ba4be92..b8d69878263 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientTracingFilter.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientTracingFilter.java
@@ -21,44 +21,43 @@
  * https://github.com/spring-cloud/spring-cloud-sleuth/blob/master/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientBeanPostProcessor.java
  */
 public class WebClientTracingFilter implements ExchangeFilterFunction {
-  private static final WebClientTracingFilter INSTANCE = new WebClientTracingFilter();
-
-  /**
-   * It's not expected that this method would be called concurrently. This should only be created
-   * during the start-up and configuration phase of an app. If a builder is being modified on
-   * multiple threads it would exhibit ConcurrentModificationException even without the agent
-   */
-  public static void addFilter(final List<ExchangeFilterFunction> exchangeFilterFunctions) {
-    // Since the builder we instrument the can be reused, we need to only add the filter once
-    exchangeFilterFunctions.removeIf(filterFunction -> filterFunction == INSTANCE);
-    exchangeFilterFunctions.add(0, INSTANCE);
-  }
-
-  @Override
-  public Mono<ClientResponse> filter(final ClientRequest request, final ExchangeFunction next) {
-    return new MonoWebClientTrace(request, next);
-  }
-
-  public static final class MonoWebClientTrace extends Mono<ClientResponse> {
-    final ExchangeFunction next;
-    final ClientRequest request;
-
-    public MonoWebClientTrace(final ClientRequest request, final ExchangeFunction next) {
-      this.next = next;
-      this.request = request;
+    private static final WebClientTracingFilter INSTANCE = new WebClientTracingFilter();
+
+    /**
+     * It's not expected that this method would be called concurrently. This should only be created
+     * during the start-up and configuration phase of an app. If a builder is being modified on
+     * multiple threads it would exhibit ConcurrentModificationException even without the agent
+     */
+    public static void addFilter(final List<ExchangeFilterFunction> exchangeFilterFunctions) {
+        // Since the builder we instrument the can be reused, we need to only add the filter once
+        exchangeFilterFunctions.removeIf(filterFunction -> filterFunction == INSTANCE);
+        exchangeFilterFunctions.add(0, INSTANCE);
     }
 
     @Override
-    public void subscribe(final CoreSubscriber<? super ClientResponse> subscriber) {
-      AgentSpan span = startSpan("spring-webflux-client", HTTP_REQUEST);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, request);
-      AgentSpan parent = activeSpan();
-      try (final ContextScope scope = activateSpan(span)) {
-        TraceWebClientSubscriber tracingSubscriber =
-            new TraceWebClientSubscriber(subscriber, span, parent);
-        next.exchange(request).doOnCancel(tracingSubscriber::onCancel).subscribe(tracingSubscriber);
-      }
+    public Mono<ClientResponse> filter(final ClientRequest request, final ExchangeFunction next) {
+        return new MonoWebClientTrace(request, next);
+    }
+
+    public static final class MonoWebClientTrace extends Mono<ClientResponse> {
+        final ExchangeFunction next;
+        final ClientRequest request;
+
+        public MonoWebClientTrace(final ClientRequest request, final ExchangeFunction next) {
+            this.next = next;
+            this.request = request;
+        }
+
+        @Override
+        public void subscribe(final CoreSubscriber<? super ClientResponse> subscriber) {
+            AgentSpan span = startSpan("spring-webflux-client", HTTP_REQUEST);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, request);
+            AgentSpan parent = activeSpan();
+            try (final ContextScope scope = activateSpan(span)) {
+                TraceWebClientSubscriber tracingSubscriber = new TraceWebClientSubscriber(subscriber, span, parent);
+                next.exchange(request).doOnCancel(tracingSubscriber::onCancel).subscribe(tracingSubscriber);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/AbstractWebfluxInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/AbstractWebfluxInstrumentation.java
index b544c5f6053..20992f6e7ee 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/AbstractWebfluxInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/AbstractWebfluxInstrumentation.java
@@ -4,17 +4,17 @@
 
 public abstract class AbstractWebfluxInstrumentation extends InstrumenterModule.Tracing {
 
-  public AbstractWebfluxInstrumentation(final String... additionalNames) {
-    super("spring-webflux", additionalNames);
-  }
+    public AbstractWebfluxInstrumentation(final String... additionalNames) {
+        super("spring-webflux", additionalNames);
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".SpringWebfluxHttpServerDecorator",
-      packageName + ".AdviceUtils",
-      packageName + ".AdviceUtils$MonoSpanFinisher",
-      packageName + ".RouteOnSuccessOrError"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".SpringWebfluxHttpServerDecorator",
+            packageName + ".AdviceUtils",
+            packageName + ".AdviceUtils$MonoSpanFinisher",
+            packageName + ".RouteOnSuccessOrError"
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/AdviceUtils.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/AdviceUtils.java
index 3690e0b463c..3bc1073eb78 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/AdviceUtils.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/AdviceUtils.java
@@ -10,41 +10,37 @@
 
 public final class AdviceUtils {
 
-  public static final String SPAN_ATTRIBUTE = "datadog.trace.instrumentation.springwebflux.Span";
-  public static final String PARENT_SPAN_ATTRIBUTE =
-      "datadog.trace.instrumentation.springwebflux.ParentSpan";
-
-  private static final ClassValue<CharSequence> NAMES =
-      GenericClassValue.of(
-          type -> {
-            String name = type.getName();
-            int lambdaIdx = name.lastIndexOf("$$Lambda");
-            if (lambdaIdx > -1) {
-              return UTF8BytesString.create(
-                  name.substring(name.lastIndexOf('.') + 1, lambdaIdx) + ".lambda");
-            } else {
-              return DECORATE.spanNameForMethod(type, "handle");
-            }
-          });
+    public static final String SPAN_ATTRIBUTE = "datadog.trace.instrumentation.springwebflux.Span";
+    public static final String PARENT_SPAN_ATTRIBUTE = "datadog.trace.instrumentation.springwebflux.ParentSpan";
+
+    private static final ClassValue<CharSequence> NAMES = GenericClassValue.of(type -> {
+        String name = type.getName();
+        int lambdaIdx = name.lastIndexOf("$$Lambda");
+        if (lambdaIdx > -1) {
+            return UTF8BytesString.create(name.substring(name.lastIndexOf('.') + 1, lambdaIdx) + ".lambda");
+        } else {
+            return DECORATE.spanNameForMethod(type, "handle");
+        }
+    });
+
+    public static CharSequence constructOperationName(Object handler) {
+        return NAMES.get(handler.getClass());
+    }
 
-  public static CharSequence constructOperationName(Object handler) {
-    return NAMES.get(handler.getClass());
-  }
+    public static class MonoSpanFinisher implements Consumer<Object> {
+        private final AgentSpan span;
 
-  public static class MonoSpanFinisher implements Consumer<Object> {
-    private final AgentSpan span;
+        public MonoSpanFinisher(AgentSpan span) {
+            this.span = span;
+        }
 
-    public MonoSpanFinisher(AgentSpan span) {
-      this.span = span;
-    }
-
-    @Override
-    public void accept(Object o) {
-      if (o instanceof Throwable) {
-        span.addThrowable((Throwable) o);
-      } else if (o instanceof SignalType && span.phasedFinish()) {
-        span.publish();
-      }
+        @Override
+        public void accept(Object o) {
+            if (o instanceof Throwable) {
+                span.addThrowable((Throwable) o);
+            } else if (o instanceof SignalType && span.phasedFinish()) {
+                span.publish();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java
index 3ee18dd164e..232e5001ad5 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java
@@ -23,39 +23,38 @@
  */
 public class DispatcherHandlerAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope methodEnter(@Advice.Argument(0) final ServerWebExchange exchange) {
-    // Unfortunately Netty EventLoop is not instrumented well enough to attribute all work to the
-    // right things so we have to store span in request itself. We also store parent (netty's)
-    // span
-    // so we could update resource name.
-    final AgentSpan parentSpan = activeSpan();
-    if (parentSpan != null) {
-      exchange.getAttributes().put(AdviceUtils.PARENT_SPAN_ATTRIBUTE, parentSpan);
-    }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope methodEnter(@Advice.Argument(0) final ServerWebExchange exchange) {
+        // Unfortunately Netty EventLoop is not instrumented well enough to attribute all work to the
+        // right things so we have to store span in request itself. We also store parent (netty's)
+        // span
+        // so we could update resource name.
+        final AgentSpan parentSpan = activeSpan();
+        if (parentSpan != null) {
+            exchange.getAttributes().put(AdviceUtils.PARENT_SPAN_ATTRIBUTE, parentSpan);
+        }
 
-    final AgentSpan span = startSpan("spring-webflux-controller", DISPATCHER_HANDLE_HANDLER);
-    span.setMeasured(true);
-    DECORATE.afterStart(span);
-    exchange.getAttributes().put(AdviceUtils.SPAN_ATTRIBUTE, span);
+        final AgentSpan span = startSpan("spring-webflux-controller", DISPATCHER_HANDLE_HANDLER);
+        span.setMeasured(true);
+        DECORATE.afterStart(span);
+        exchange.getAttributes().put(AdviceUtils.SPAN_ATTRIBUTE, span);
 
-    return activateSpan(span);
-  }
+        return activateSpan(span);
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void methodExit(
-      @Advice.Enter final ContextScope scope,
-      @Advice.Thrown final Throwable throwable,
-      @Advice.Argument(0) final ServerWebExchange exchange,
-      @Advice.Return(readOnly = false) Mono<Void> mono) {
-    if (throwable == null && mono != null) {
-      final AgentSpan span = spanFromScope(scope);
-      final Consumer finisher = new AdviceUtils.MonoSpanFinisher(span);
-      mono = mono.doOnError(finisher).doFinally(finisher);
-      InstrumentationContext.get(Publisher.class, HandoffContext.class)
-          .put(mono, HandoffContext.anyThread(span));
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void methodExit(
+            @Advice.Enter final ContextScope scope,
+            @Advice.Thrown final Throwable throwable,
+            @Advice.Argument(0) final ServerWebExchange exchange,
+            @Advice.Return(readOnly = false) Mono<Void> mono) {
+        if (throwable == null && mono != null) {
+            final AgentSpan span = spanFromScope(scope);
+            final Consumer finisher = new AdviceUtils.MonoSpanFinisher(span);
+            mono = mono.doOnError(finisher).doFinally(finisher);
+            InstrumentationContext.get(Publisher.class, HandoffContext.class).put(mono, HandoffContext.anyThread(span));
+        }
+        scope.close();
+        // span finished in MonoSpanFinisher
     }
-    scope.close();
-    // span finished in MonoSpanFinisher
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerInstrumentation.java
index 94a340dbcd7..2d54f7a27a1 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerInstrumentation.java
@@ -15,33 +15,32 @@
 
 @AutoService(InstrumenterModule.class)
 public final class DispatcherHandlerInstrumentation extends AbstractWebfluxInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.web.reactive.DispatcherHandler";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.web.reactive.DispatcherHandler";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.reactivestreams.Publisher", HandoffContext.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.reactivestreams.Publisher", HandoffContext.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("handle"))
-            .and(takesArgument(0, named("org.springframework.web.server.ServerWebExchange")))
-            .and(takesArguments(1)),
-        // Cannot reference class directly here because it would lead to class load failure on Java7
-        packageName + ".DispatcherHandlerAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("handleResult"))
-            .and(takesArgument(0, named("org.springframework.web.server.ServerWebExchange"))),
-        packageName + ".HandleResultAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("handle"))
+                        .and(takesArgument(0, named("org.springframework.web.server.ServerWebExchange")))
+                        .and(takesArguments(1)),
+                // Cannot reference class directly here because it would lead to class load failure on Java7
+                packageName + ".DispatcherHandlerAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("handleResult"))
+                        .and(takesArgument(0, named("org.springframework.web.server.ServerWebExchange"))),
+                packageName + ".HandleResultAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandleResultAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandleResultAdvice.java
index 6cfd3f903d4..3b9636407ce 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandleResultAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandleResultAdvice.java
@@ -9,14 +9,12 @@
 import reactor.core.publisher.Mono;
 
 public class HandleResultAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void methodExit(
-      @Advice.Argument(0) ServerWebExchange exchange,
-      @Advice.Return(readOnly = false) Mono<Void> mono) {
-    final AgentSpan span = exchange.getAttribute(AdviceUtils.SPAN_ATTRIBUTE);
-    if (span != null && mono != null) {
-      InstrumentationContext.get(Publisher.class, HandoffContext.class)
-          .put(mono, HandoffContext.anyThread(span));
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void methodExit(
+            @Advice.Argument(0) ServerWebExchange exchange, @Advice.Return(readOnly = false) Mono<Void> mono) {
+        final AgentSpan span = exchange.getAttribute(AdviceUtils.SPAN_ATTRIBUTE);
+        if (span != null && mono != null) {
+            InstrumentationContext.get(Publisher.class, HandoffContext.class).put(mono, HandoffContext.anyThread(span));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterAdvice.java
index c6a7cc1e3ea..9057c6630f9 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterAdvice.java
@@ -22,62 +22,60 @@
 
 public class HandlerAdapterAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope methodEnter(
-      @Advice.Argument(0) final ServerWebExchange exchange,
-      @Advice.Argument(1) final Object handler) {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope methodEnter(
+            @Advice.Argument(0) final ServerWebExchange exchange, @Advice.Argument(1) final Object handler) {
 
-    ContextScope scope = null;
-    final AgentSpan span = exchange.getAttribute(AdviceUtils.SPAN_ATTRIBUTE);
-    if (handler != null && span != null) {
-      final String handlerType;
-      final CharSequence operationName;
+        ContextScope scope = null;
+        final AgentSpan span = exchange.getAttribute(AdviceUtils.SPAN_ATTRIBUTE);
+        if (handler != null && span != null) {
+            final String handlerType;
+            final CharSequence operationName;
 
-      if (handler instanceof HandlerMethod) {
-        // Special case for requests mapped with annotations
-        final HandlerMethod handlerMethod = (HandlerMethod) handler;
-        operationName = DECORATE.spanNameForMethod(handlerMethod.getMethod());
-        handlerType = handlerMethod.getMethod().getDeclaringClass().getName();
-      } else {
-        operationName = constructOperationName(handler);
-        handlerType = handler.getClass().getName();
-      }
+            if (handler instanceof HandlerMethod) {
+                // Special case for requests mapped with annotations
+                final HandlerMethod handlerMethod = (HandlerMethod) handler;
+                operationName = DECORATE.spanNameForMethod(handlerMethod.getMethod());
+                handlerType = handlerMethod.getMethod().getDeclaringClass().getName();
+            } else {
+                operationName = constructOperationName(handler);
+                handlerType = handler.getClass().getName();
+            }
 
-      span.setSpanName(operationName);
-      span.setTag("handler.type", handlerType);
+            span.setSpanName(operationName);
+            span.setTag("handler.type", handlerType);
 
-      scope = activateSpan(span);
-    }
+            scope = activateSpan(span);
+        }
 
-    final AgentSpan parentSpan = exchange.getAttribute(AdviceUtils.PARENT_SPAN_ATTRIBUTE);
-    final PathPattern bestPattern =
-        exchange.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
-    if (parentSpan != null
-        && bestPattern != null
-        && !bestPattern.getPatternString().equals("/**")) {
-      final HttpMethod method = exchange.getRequest().getMethod();
-      HTTP_RESOURCE_DECORATOR.withRoute(
-          parentSpan, method != null ? method.name() : null, bestPattern.getPatternString());
-    }
+        final AgentSpan parentSpan = exchange.getAttribute(AdviceUtils.PARENT_SPAN_ATTRIBUTE);
+        final PathPattern bestPattern = exchange.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
+        if (parentSpan != null
+                && bestPattern != null
+                && !bestPattern.getPatternString().equals("/**")) {
+            final HttpMethod method = exchange.getRequest().getMethod();
+            HTTP_RESOURCE_DECORATOR.withRoute(
+                    parentSpan, method != null ? method.name() : null, bestPattern.getPatternString());
+        }
 
-    return scope;
-  }
+        return scope;
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void methodExit(
-      @Advice.Return(readOnly = false) Mono<HandlerResult> mono,
-      @Advice.Argument(0) final ServerWebExchange exchange,
-      @Advice.Enter final ContextScope scope,
-      @Advice.Thrown final Throwable throwable) {
-    if (scope != null) {
-      if (throwable != null) {
-        DECORATE.onError(scope, throwable);
-      } else if (mono != null) {
-        InstrumentationContext.get(Publisher.class, HandoffContext.class)
-            .put(mono, HandoffContext.anyThread(spanFromScope(scope)));
-      }
-      scope.close();
-      // span finished in SpanFinishingSubscriber
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void methodExit(
+            @Advice.Return(readOnly = false) Mono<HandlerResult> mono,
+            @Advice.Argument(0) final ServerWebExchange exchange,
+            @Advice.Enter final ContextScope scope,
+            @Advice.Thrown final Throwable throwable) {
+        if (scope != null) {
+            if (throwable != null) {
+                DECORATE.onError(scope, throwable);
+            } else if (mono != null) {
+                InstrumentationContext.get(Publisher.class, HandoffContext.class)
+                        .put(mono, HandoffContext.anyThread(spanFromScope(scope)));
+            }
+            scope.close();
+            // span finished in SpanFinishingSubscriber
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterInstrumentation.java
index 7d0c9b48410..41440b47a5f 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterInstrumentation.java
@@ -19,34 +19,33 @@
 
 @AutoService(InstrumenterModule.class)
 public final class HandlerAdapterInstrumentation extends AbstractWebfluxInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.web.reactive.HandlerAdapter";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.web.reactive.HandlerAdapter";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return concreteClass().and(implementsInterface(named(hierarchyMarkerType())));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return concreteClass().and(implementsInterface(named(hierarchyMarkerType())));
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.reactivestreams.Publisher", HandoffContext.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.reactivestreams.Publisher", HandoffContext.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("handle"))
-            .and(takesArgument(0, named("org.springframework.web.server.ServerWebExchange")))
-            .and(takesArgument(1, named("java.lang.Object")))
-            .and(takesArguments(2)),
-        // Cannot reference class directly here because it would lead to class load failure on Java7
-        packageName + ".HandlerAdapterAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("handle"))
+                        .and(takesArgument(0, named("org.springframework.web.server.ServerWebExchange")))
+                        .and(takesArgument(1, named("java.lang.Object")))
+                        .and(takesArguments(2)),
+                // Cannot reference class directly here because it would lead to class load failure on Java7
+                packageName + ".HandlerAdapterAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouteOnSuccessOrError.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouteOnSuccessOrError.java
index 09b0627eb1a..2d9b0de7d34 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouteOnSuccessOrError.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouteOnSuccessOrError.java
@@ -16,70 +16,64 @@
 
 public class RouteOnSuccessOrError implements Consumer<HandlerFunction<?>> {
 
-  private static final Pattern SPECIAL_CHARACTERS_REGEX = Pattern.compile("[\\(\\)&|]");
-  private static final Pattern SPACES_REGEX = Pattern.compile("[ \\t]+");
-  private static final Pattern ROUTER_FUNCTION_REGEX = Pattern.compile("\\s*->.*$");
-  private static final Pattern METHOD_REGEX =
-      Pattern.compile("^(GET|HEAD|POST|PUT|DELETE|CONNECT|OPTIONS|TRACE|PATCH) ");
-  private static final Function<String, String> PATH_EXTRACTOR =
-      arg ->
-          METHOD_REGEX
-              .matcher(
-                  SPACES_REGEX
-                      .matcher(SPECIAL_CHARACTERS_REGEX.matcher(arg).replaceAll(""))
-                      .replaceAll(" ")
-                      .trim())
-              .replaceAll("");
+    private static final Pattern SPECIAL_CHARACTERS_REGEX = Pattern.compile("[\\(\\)&|]");
+    private static final Pattern SPACES_REGEX = Pattern.compile("[ \\t]+");
+    private static final Pattern ROUTER_FUNCTION_REGEX = Pattern.compile("\\s*->.*$");
+    private static final Pattern METHOD_REGEX =
+            Pattern.compile("^(GET|HEAD|POST|PUT|DELETE|CONNECT|OPTIONS|TRACE|PATCH) ");
+    private static final Function<String, String> PATH_EXTRACTOR = arg -> METHOD_REGEX
+            .matcher(SPACES_REGEX
+                    .matcher(SPECIAL_CHARACTERS_REGEX.matcher(arg).replaceAll(""))
+                    .replaceAll(" ")
+                    .trim())
+            .replaceAll("");
 
-  private static final DDCache<String, String> PARSED_ROUTE_CACHE = DDCaches.newFixedSizeCache(64);
+    private static final DDCache<String, String> PARSED_ROUTE_CACHE = DDCaches.newFixedSizeCache(64);
 
-  private final RouterFunction routerFunction;
-  private final ServerRequest serverRequest;
+    private final RouterFunction routerFunction;
+    private final ServerRequest serverRequest;
 
-  public RouteOnSuccessOrError(
-      final RouterFunction routerFunction, final ServerRequest serverRequest) {
-    this.routerFunction = routerFunction;
-    this.serverRequest = serverRequest;
-  }
-
-  private String parsePredicateString() {
-    final String routerFunctionString = routerFunction.toString();
-    // Router functions containing lambda predicates should not end up in span tags since they are
-    // confusing
-    if (routerFunctionString.startsWith(
-        "org.springframework.web.reactive.function.server.RequestPredicates$$Lambda")) {
-      return null;
-    } else {
-      return ROUTER_FUNCTION_REGEX.matcher(routerFunctionString).replaceFirst("");
+    public RouteOnSuccessOrError(final RouterFunction routerFunction, final ServerRequest serverRequest) {
+        this.routerFunction = routerFunction;
+        this.serverRequest = serverRequest;
     }
-  }
 
-  @Nonnull
-  private String parseRoute(@Nonnull String routerString) {
-    return PARSED_ROUTE_CACHE.computeIfAbsent(routerString, PATH_EXTRACTOR);
-  }
+    private String parsePredicateString() {
+        final String routerFunctionString = routerFunction.toString();
+        // Router functions containing lambda predicates should not end up in span tags since they are
+        // confusing
+        if (routerFunctionString.startsWith(
+                "org.springframework.web.reactive.function.server.RequestPredicates$$Lambda")) {
+            return null;
+        } else {
+            return ROUTER_FUNCTION_REGEX.matcher(routerFunctionString).replaceFirst("");
+        }
+    }
 
-  @Override
-  public void accept(HandlerFunction<?> handlerFunction) {
-    if (handlerFunction == null) {
-      // in this case the route is added by instrumenting the method annotation. we stop here.
-      return;
+    @Nonnull
+    private String parseRoute(@Nonnull String routerString) {
+        return PARSED_ROUTE_CACHE.computeIfAbsent(routerString, PATH_EXTRACTOR);
     }
-    final String predicateString = parsePredicateString();
-    if (predicateString != null) {
-      final AgentSpan span = (AgentSpan) serverRequest.attributes().get(AdviceUtils.SPAN_ATTRIBUTE);
-      if (span != null) {
-        span.setTag("request.predicate", predicateString);
-      }
-      final AgentSpan parentSpan =
-          (AgentSpan) serverRequest.attributes().get(AdviceUtils.PARENT_SPAN_ATTRIBUTE);
-      if (parentSpan != null) {
-        final HttpMethod httpMethod = serverRequest.method();
-        if (httpMethod != null) {
-          HTTP_RESOURCE_DECORATOR.withRoute(
-              parentSpan, httpMethod.name(), parseRoute(predicateString));
+
+    @Override
+    public void accept(HandlerFunction<?> handlerFunction) {
+        if (handlerFunction == null) {
+            // in this case the route is added by instrumenting the method annotation. we stop here.
+            return;
+        }
+        final String predicateString = parsePredicateString();
+        if (predicateString != null) {
+            final AgentSpan span = (AgentSpan) serverRequest.attributes().get(AdviceUtils.SPAN_ATTRIBUTE);
+            if (span != null) {
+                span.setTag("request.predicate", predicateString);
+            }
+            final AgentSpan parentSpan = (AgentSpan) serverRequest.attributes().get(AdviceUtils.PARENT_SPAN_ATTRIBUTE);
+            if (parentSpan != null) {
+                final HttpMethod httpMethod = serverRequest.method();
+                if (httpMethod != null) {
+                    HTTP_RESOURCE_DECORATOR.withRoute(parentSpan, httpMethod.name(), parseRoute(predicateString));
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouterFunctionAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouterFunctionAdvice.java
index b9a94d354e9..e2dee737e77 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouterFunctionAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouterFunctionAdvice.java
@@ -12,15 +12,15 @@
  */
 public class RouterFunctionAdvice {
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void methodExit(
-      @Advice.This final RouterFunction thiz,
-      @Advice.Argument(0) final ServerRequest serverRequest,
-      @Advice.Return(readOnly = false) Mono<HandlerFunction<?>> result,
-      @Advice.Thrown final Throwable throwable) {
-    if (throwable == null) {
-      // doOnSuccessOrError is deprecated and no more existing
-      result = result.doOnSuccess(new RouteOnSuccessOrError(thiz, serverRequest));
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void methodExit(
+            @Advice.This final RouterFunction thiz,
+            @Advice.Argument(0) final ServerRequest serverRequest,
+            @Advice.Return(readOnly = false) Mono<HandlerFunction<?>> result,
+            @Advice.Thrown final Throwable throwable) {
+        if (throwable == null) {
+            // doOnSuccessOrError is deprecated and no more existing
+            result = result.doOnSuccess(new RouteOnSuccessOrError(thiz, serverRequest));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouterFunctionInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouterFunctionInstrumentation.java
index f9d20554057..61d6007afab 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouterFunctionInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouterFunctionInstrumentation.java
@@ -16,34 +16,32 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RouterFunctionInstrumentation extends AbstractWebfluxInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public RouterFunctionInstrumentation() {
-    super("spring-webflux-functional");
-  }
+    public RouterFunctionInstrumentation() {
+        super("spring-webflux-functional");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.web.reactive.function.server.RouterFunctions$DefaultRouterFunction";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.web.reactive.function.server.RouterFunctions$DefaultRouterFunction";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    // TODO: this doesn't handle nested routes (DefaultNestedRouterFunction)
-    return concreteClass().and(extendsClass(named(hierarchyMarkerType())));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        // TODO: this doesn't handle nested routes (DefaultNestedRouterFunction)
+        return concreteClass().and(extendsClass(named(hierarchyMarkerType())));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("route"))
-            .and(
-                takesArgument(
-                    0, named("org.springframework.web.reactive.function.server.ServerRequest")))
-            .and(takesArguments(1)),
-        // Cannot reference class directly here because it would lead to class load failure on Java7
-        packageName + ".RouterFunctionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("route"))
+                        .and(takesArgument(0, named("org.springframework.web.reactive.function.server.ServerRequest")))
+                        .and(takesArguments(1)),
+                // Cannot reference class directly here because it would lead to class load failure on Java7
+                packageName + ".RouterFunctionAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java
index 03176937864..65bcc0a43ed 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java
@@ -5,25 +5,22 @@
 import datadog.trace.bootstrap.instrumentation.decorator.ServerDecorator;
 
 public class SpringWebfluxHttpServerDecorator extends ServerDecorator {
-  public static final CharSequence DISPATCHER_HANDLE_HANDLER =
-      UTF8BytesString.create("DispatcherHandler.handle");
-  public static final CharSequence SPRING_WEBFLUX_CONTROLLER =
-      UTF8BytesString.create("spring-webflux-controller");
-  public static final SpringWebfluxHttpServerDecorator DECORATE =
-      new SpringWebfluxHttpServerDecorator();
+    public static final CharSequence DISPATCHER_HANDLE_HANDLER = UTF8BytesString.create("DispatcherHandler.handle");
+    public static final CharSequence SPRING_WEBFLUX_CONTROLLER = UTF8BytesString.create("spring-webflux-controller");
+    public static final SpringWebfluxHttpServerDecorator DECORATE = new SpringWebfluxHttpServerDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"spring-webflux"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"spring-webflux"};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.HTTP_SERVER;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.HTTP_SERVER;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return SPRING_WEBFLUX_CONTROLLER;
-  }
+    @Override
+    protected CharSequence component() {
+        return SPRING_WEBFLUX_CONTROLLER;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/AbstractServerHttpRequestInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/AbstractServerHttpRequestInstrumentation.java
index bc19cfae1e0..be02632b6b9 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/AbstractServerHttpRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/AbstractServerHttpRequestInstrumentation.java
@@ -21,36 +21,35 @@
 
 @AutoService(InstrumenterModule.class)
 public class AbstractServerHttpRequestInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public AbstractServerHttpRequestInstrumentation() {
-    super("spring-webflux");
-  }
+    public AbstractServerHttpRequestInstrumentation() {
+        super("spring-webflux");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.http.server.reactive.AbstractServerHttpRequest";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.http.server.reactive.AbstractServerHttpRequest";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("getHeaders")).and(takesArguments(0)),
-        getClass().getName() + "$TaintHeadersAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("getHeaders")).and(takesArguments(0)),
+                getClass().getName() + "$TaintHeadersAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class TaintHeadersAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void after(
-        @Advice.Return Object object, @ActiveRequestContext RequestContext reqCtx) {
-      PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      propagation.taintObject(ctx, object, SourceTypes.REQUEST_HEADER_VALUE);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class TaintHeadersAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void after(@Advice.Return Object object, @ActiveRequestContext RequestContext reqCtx) {
+            PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            propagation.taintObject(ctx, object, SourceTypes.REQUEST_HEADER_VALUE);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/DataBufferAsInputStreamAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/DataBufferAsInputStreamAdvice.java
index cded50fb8e1..3c695c859b7 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/DataBufferAsInputStreamAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/DataBufferAsInputStreamAdvice.java
@@ -9,15 +9,15 @@
 
 public class DataBufferAsInputStreamAdvice {
 
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  @Propagation
-  public static void after(@Advice.This DataBuffer dataBuffer, @Advice.Return InputStream is) {
-    PropagationModule mod = InstrumentationBridge.PROPAGATION;
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Propagation
+    public static void after(@Advice.This DataBuffer dataBuffer, @Advice.Return InputStream is) {
+        PropagationModule mod = InstrumentationBridge.PROPAGATION;
 
-    if (mod == null || is == null) {
-      return;
-    }
+        if (mod == null || is == null) {
+            return;
+        }
 
-    mod.taintObjectIfTainted(is, dataBuffer);
-  }
+        mod.taintObjectIfTainted(is, dataBuffer);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/DataBufferInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/DataBufferInstrumentation.java
index 98e471dc6d7..9d380360ef5 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/DataBufferInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/DataBufferInstrumentation.java
@@ -14,26 +14,26 @@
  */
 @AutoService(InstrumenterModule.class)
 public class DataBufferInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public DataBufferInstrumentation() {
-    super("spring-webflux");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public DataBufferInstrumentation() {
+        super("spring-webflux");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.springframework.core.io.buffer.DataBuffer", // asInputStream is default interf method in
-      // flux6
-      "org.springframework.core.io.buffer.DefaultDataBuffer",
-      "org.springframework.core.io.buffer.NettyDataBuffer",
-      "org.springframework.http.server.reactive.UndertowServerHttpRequest$UndertowDataBuffer",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.springframework.core.io.buffer.DataBuffer", // asInputStream is default interf method in
+            // flux6
+            "org.springframework.core.io.buffer.DefaultDataBuffer",
+            "org.springframework.core.io.buffer.NettyDataBuffer",
+            "org.springframework.http.server.reactive.UndertowServerHttpRequest$UndertowDataBuffer",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("asInputStream")).and(takesArguments(0)),
-        packageName + ".DataBufferAsInputStreamAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("asInputStream")).and(takesArguments(0)),
+                packageName + ".DataBufferAsInputStreamAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HandleMatchAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HandleMatchAdvice.java
index c3f1f992e91..bace1a2768c 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HandleMatchAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HandleMatchAdvice.java
@@ -17,62 +17,57 @@
 @RequiresRequestContext(RequestContextSlot.IAST)
 public class HandleMatchAdvice {
 
-  @SuppressWarnings("Duplicates")
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_PATH_PARAMETER)
-  public static void after(
-      @Advice.Argument(2) ServerWebExchange xchg, @ActiveRequestContext RequestContext reqCtx) {
+    @SuppressWarnings("Duplicates")
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_PATH_PARAMETER)
+    public static void after(@Advice.Argument(2) ServerWebExchange xchg, @ActiveRequestContext RequestContext reqCtx) {
 
-    Object templateVars = xchg.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
-    Object matrixVars = xchg.getAttribute(HandlerMapping.MATRIX_VARIABLES_ATTRIBUTE);
-    if (templateVars == null && matrixVars == null) {
-      return;
-    }
-
-    IastContext iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
-
-    PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      if (templateVars instanceof Map) {
-        for (Map.Entry<String, String> e : ((Map<String, String>) templateVars).entrySet()) {
-          String parameterName = e.getKey();
-          String value = e.getValue();
-          if (parameterName == null || value == null) {
-            continue; // should not happen
-          }
-          module.taintString(
-              iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
+        Object templateVars = xchg.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
+        Object matrixVars = xchg.getAttribute(HandlerMapping.MATRIX_VARIABLES_ATTRIBUTE);
+        if (templateVars == null && matrixVars == null) {
+            return;
         }
-      }
 
-      if (matrixVars instanceof Map) {
-        for (Map.Entry<String, Map<String, Iterable<String>>> e :
-            ((Map<String, Map<String, Iterable<String>>>) matrixVars).entrySet()) {
-          String parameterName = e.getKey();
-          Map<String, Iterable<String>> value = e.getValue();
-          if (parameterName == null || value == null) {
-            continue;
-          }
+        IastContext iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
 
-          for (Map.Entry<String, Iterable<String>> ie : value.entrySet()) {
-            String innerKey = ie.getKey();
-            if (innerKey != null) {
-              module.taintString(
-                  iastRequestContext,
-                  innerKey,
-                  SourceTypes.REQUEST_MATRIX_PARAMETER,
-                  parameterName);
+        PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            if (templateVars instanceof Map) {
+                for (Map.Entry<String, String> e : ((Map<String, String>) templateVars).entrySet()) {
+                    String parameterName = e.getKey();
+                    String value = e.getValue();
+                    if (parameterName == null || value == null) {
+                        continue; // should not happen
+                    }
+                    module.taintString(iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
+                }
             }
-            Iterable<String> innerValues = ie.getValue();
-            if (innerValues != null) {
-              for (String iv : innerValues) {
-                module.taintString(
-                    iastRequestContext, iv, SourceTypes.REQUEST_MATRIX_PARAMETER, parameterName);
-              }
+
+            if (matrixVars instanceof Map) {
+                for (Map.Entry<String, Map<String, Iterable<String>>> e :
+                        ((Map<String, Map<String, Iterable<String>>>) matrixVars).entrySet()) {
+                    String parameterName = e.getKey();
+                    Map<String, Iterable<String>> value = e.getValue();
+                    if (parameterName == null || value == null) {
+                        continue;
+                    }
+
+                    for (Map.Entry<String, Iterable<String>> ie : value.entrySet()) {
+                        String innerKey = ie.getKey();
+                        if (innerKey != null) {
+                            module.taintString(
+                                    iastRequestContext, innerKey, SourceTypes.REQUEST_MATRIX_PARAMETER, parameterName);
+                        }
+                        Iterable<String> innerValues = ie.getValue();
+                        if (innerValues != null) {
+                            for (String iv : innerValues) {
+                                module.taintString(
+                                        iastRequestContext, iv, SourceTypes.REQUEST_MATRIX_PARAMETER, parameterName);
+                            }
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HttpHeadersInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HttpHeadersInstrumentation.java
index 2b669b91418..fbdbae4ded3 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HttpHeadersInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HttpHeadersInstrumentation.java
@@ -13,29 +13,29 @@
  */
 @AutoService(InstrumenterModule.class)
 public class HttpHeadersInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public HttpHeadersInstrumentation() {
-    super("spring-webflux");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public HttpHeadersInstrumentation() {
+        super("spring-webflux");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.http.HttpHeaders";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.http.HttpHeaders";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("get")).and(takesArguments(Object.class)),
-        packageName + ".TaintHttpHeadersGetAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getFirst")).and(takesArguments(String.class)),
-        packageName + ".TaintHttpHeadersGetFirstAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("toSingleValueMap")).and(takesArguments(0)),
-        packageName + ".TaintHttpHeadersToSingleValueMapAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("readOnlyHttpHeaders")).and(takesArguments(1)),
-        packageName + ".TaintReadOnlyHttpHeadersAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("get")).and(takesArguments(Object.class)),
+                packageName + ".TaintHttpHeadersGetAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getFirst")).and(takesArguments(String.class)),
+                packageName + ".TaintHttpHeadersGetFirstAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("toSingleValueMap")).and(takesArguments(0)),
+                packageName + ".TaintHttpHeadersToSingleValueMapAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("readOnlyHttpHeaders")).and(takesArguments(1)),
+                packageName + ".TaintReadOnlyHttpHeadersAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HttpMessageInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HttpMessageInstrumentation.java
index 01b7cc193bb..0ca17df9976 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HttpMessageInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/HttpMessageInstrumentation.java
@@ -24,41 +24,40 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpMessageInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public HttpMessageInstrumentation() {
-    super("spring-webflux");
-  }
+    public HttpMessageInstrumentation() {
+        super("spring-webflux");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.http.HttpMessage";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.http.HttpMessage";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("getHeaders")).and(takesArguments(0)),
-        getClass().getName() + "$TaintHeadersAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("getHeaders")).and(takesArguments(0)),
+                getClass().getName() + "$TaintHeadersAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class TaintHeadersAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void after(
-        @Advice.Return Object object, @ActiveRequestContext RequestContext reqCtx) {
-      PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      propagation.taintObject(ctx, object, SourceTypes.REQUEST_HEADER_VALUE);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class TaintHeadersAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void after(@Advice.Return Object object, @ActiveRequestContext RequestContext reqCtx) {
+            PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            propagation.taintObject(ctx, object, SourceTypes.REQUEST_HEADER_VALUE);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/Jackson2TokenizerApplyAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/Jackson2TokenizerApplyAdvice.java
index dac16ca00db..de4f12927ef 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/Jackson2TokenizerApplyAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/Jackson2TokenizerApplyAdvice.java
@@ -16,20 +16,20 @@
 
 @RequiresRequestContext(RequestContextSlot.IAST)
 class Jackson2TokenizerApplyAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_BODY)
-  public static void after(
-      @Advice.Argument(0) DataBuffer dataBuffer,
-      @Advice.Return(readOnly = false) Flux<TokenBuffer> flux,
-      @ActiveRequestContext RequestContext reqCtx) {
-    PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-    if (propagation == null || flux == null || dataBuffer == null) {
-      return;
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_BODY)
+    public static void after(
+            @Advice.Argument(0) DataBuffer dataBuffer,
+            @Advice.Return(readOnly = false) Flux<TokenBuffer> flux,
+            @ActiveRequestContext RequestContext reqCtx) {
+        PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+        if (propagation == null || flux == null || dataBuffer == null) {
+            return;
+        }
+        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+        if (!propagation.isTainted(ctx, dataBuffer)) {
+            return;
+        }
+        flux = flux.map(new TaintFluxElementsFunction<>(ctx, propagation));
     }
-    IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-    if (!propagation.isTainted(ctx, dataBuffer)) {
-      return;
-    }
-    flux = flux.map(new TaintFluxElementsFunction<>(ctx, propagation));
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/Json2TokenizerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/Json2TokenizerInstrumentation.java
index 26c347d6c86..bfa815e3d48 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/Json2TokenizerInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/Json2TokenizerInstrumentation.java
@@ -15,29 +15,29 @@
  */
 @AutoService(InstrumenterModule.class)
 public class Json2TokenizerInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public Json2TokenizerInstrumentation() {
-    super("spring-webflux");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public Json2TokenizerInstrumentation() {
+        super("spring-webflux");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "webflux_with_jackson";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "webflux_with_jackson";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.http.codec.json.Jackson2Tokenizer";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.http.codec.json.Jackson2Tokenizer";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("apply").or(named("tokenize")))
-            .and(takesArgument(0, named("org.springframework.core.io.buffer.DataBuffer")))
-            .and(takesArguments(1))
-            .and(returns(named("reactor.core.publisher.Flux"))),
-        packageName + ".Jackson2TokenizerApplyAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("apply").or(named("tokenize")))
+                        .and(takesArgument(0, named("org.springframework.core.io.buffer.DataBuffer")))
+                        .and(takesArguments(1))
+                        .and(returns(named("reactor.core.publisher.Flux"))),
+                packageName + ".Jackson2TokenizerApplyAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ReactorServerHttpRequestInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ReactorServerHttpRequestInstrumentation.java
index e65a365f593..43b9f94de1b 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ReactorServerHttpRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ReactorServerHttpRequestInstrumentation.java
@@ -20,35 +20,34 @@
 
 @AutoService(InstrumenterModule.class)
 public class ReactorServerHttpRequestInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ReactorServerHttpRequestInstrumentation() {
-    super("spring-webflux");
-  }
+    public ReactorServerHttpRequestInstrumentation() {
+        super("spring-webflux");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.http.server.reactive.ReactorServerHttpRequest";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.http.server.reactive.ReactorServerHttpRequest";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("initHeaders")).and(takesArguments(1)),
-        getClass().getName() + "$TaintHeadersAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("initHeaders")).and(takesArguments(1)),
+                getClass().getName() + "$TaintHeadersAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class TaintHeadersAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void after(
-        @Advice.Return Object object, @ActiveRequestContext RequestContext reqCtx) {
-      PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      propagation.taintObject(ctx, object, SourceTypes.REQUEST_HEADER_VALUE);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class TaintHeadersAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void after(@Advice.Return Object object, @ActiveRequestContext RequestContext reqCtx) {
+            PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            propagation.taintObject(ctx, object, SourceTypes.REQUEST_HEADER_VALUE);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ReadOnlyHttpHeadersInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ReadOnlyHttpHeadersInstrumentation.java
index c10c355203a..c6c196225af 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ReadOnlyHttpHeadersInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ReadOnlyHttpHeadersInstrumentation.java
@@ -10,25 +10,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class ReadOnlyHttpHeadersInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ReadOnlyHttpHeadersInstrumentation() {
-    super("spring-webflux");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ReadOnlyHttpHeadersInstrumentation() {
+        super("spring-webflux");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "read_only_headers";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "read_only_headers";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.http.ReadOnlyHttpHeaders";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.http.ReadOnlyHttpHeaders";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("get")).and(takesArguments(Object.class)),
-        packageName + ".TaintHttpHeadersGetAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("get")).and(takesArguments(Object.class)),
+                packageName + ".TaintHttpHeadersGetAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/RequestHeaderMapResolveAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/RequestHeaderMapResolveAdvice.java
index 75bec42145e..33521a446a1 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/RequestHeaderMapResolveAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/RequestHeaderMapResolveAdvice.java
@@ -17,33 +17,32 @@
 
 @RequiresRequestContext(RequestContextSlot.IAST)
 public class RequestHeaderMapResolveAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_HEADER_VALUE)
-  public static void after(
-      @Advice.Return(typing = Assigner.Typing.DYNAMIC) Map<String, ?> values,
-      @ActiveRequestContext RequestContext reqCtx) {
-    PropagationModule prop = InstrumentationBridge.PROPAGATION;
-    if (prop == null || values == null || values.isEmpty()) {
-      return;
-    }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_HEADER_VALUE)
+    public static void after(
+            @Advice.Return(typing = Assigner.Typing.DYNAMIC) Map<String, ?> values,
+            @ActiveRequestContext RequestContext reqCtx) {
+        PropagationModule prop = InstrumentationBridge.PROPAGATION;
+        if (prop == null || values == null || values.isEmpty()) {
+            return;
+        }
 
-    final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-    if (values instanceof MultiValueMap) {
-      for (Map.Entry<String, List<String>> e :
-          ((MultiValueMap<String, String>) values).entrySet()) {
-        final String name = e.getKey();
-        prop.taintString(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
-        for (String v : e.getValue()) {
-          prop.taintString(ctx, v, SourceTypes.REQUEST_HEADER_VALUE, name);
+        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+        if (values instanceof MultiValueMap) {
+            for (Map.Entry<String, List<String>> e : ((MultiValueMap<String, String>) values).entrySet()) {
+                final String name = e.getKey();
+                prop.taintString(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
+                for (String v : e.getValue()) {
+                    prop.taintString(ctx, v, SourceTypes.REQUEST_HEADER_VALUE, name);
+                }
+            }
+        } else {
+            for (Map.Entry<String, String> e : ((Map<String, String>) values).entrySet()) {
+                final String name = e.getKey();
+                final String value = e.getValue();
+                prop.taintString(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
+                prop.taintString(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
+            }
         }
-      }
-    } else {
-      for (Map.Entry<String, String> e : ((Map<String, String>) values).entrySet()) {
-        final String name = e.getKey();
-        final String value = e.getValue();
-        prop.taintString(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
-        prop.taintString(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/RequestHeaderMapResolverInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/RequestHeaderMapResolverInstrumentation.java
index bc2c7a43e51..6fc7a17d99a 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/RequestHeaderMapResolverInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/RequestHeaderMapResolverInstrumentation.java
@@ -19,25 +19,25 @@
  */
 @AutoService(InstrumenterModule.class)
 public class RequestHeaderMapResolverInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public RequestHeaderMapResolverInstrumentation() {
-    super("spring-webflux");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public RequestHeaderMapResolverInstrumentation() {
+        super("spring-webflux");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.web.reactive.result.method.annotation.RequestHeaderMapMethodArgumentResolver";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.web.reactive.result.method.annotation.RequestHeaderMapMethodArgumentResolver";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("resolveArgumentValue"))
-            .and(takesArgument(0, named("org.springframework.core.MethodParameter")))
-            .and(takesArgument(1, named("org.springframework.web.reactive.BindingContext")))
-            .and(takesArgument(2, named("org.springframework.web.server.ServerWebExchange")))
-            .and(takesArguments(3)),
-        packageName + ".RequestHeaderMapResolveAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("resolveArgumentValue"))
+                        .and(takesArgument(0, named("org.springframework.core.MethodParameter")))
+                        .and(takesArgument(1, named("org.springframework.web.reactive.BindingContext")))
+                        .and(takesArgument(2, named("org.springframework.web.server.ServerWebExchange")))
+                        .and(takesArguments(3)),
+                packageName + ".RequestHeaderMapResolveAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerHttpRequestInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerHttpRequestInstrumentation.java
index 4a4f4c7683a..45857bcefc7 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerHttpRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerHttpRequestInstrumentation.java
@@ -17,31 +17,29 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ServerHttpRequestInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public ServerHttpRequestInstrumentation() {
-    super("spring-webflux");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public ServerHttpRequestInstrumentation() {
+        super("spring-webflux");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.http.server.reactive.ServerHttpRequest";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.http.server.reactive.ServerHttpRequest";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return nameEndsWith("ServerHttpRequest").and(implementsInterface(named(hierarchyMarkerType())));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return nameEndsWith("ServerHttpRequest").and(implementsInterface(named(hierarchyMarkerType())));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("getQueryParams")).and(takesArguments(0)),
-        packageName + ".TaintQueryParamsAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getCookies")).and(takesArguments(0)),
-        packageName + ".TaintCookiesAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getBody")).and(takesArguments(0)),
-        packageName + ".TaintGetBodyAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("getQueryParams")).and(takesArguments(0)),
+                packageName + ".TaintQueryParamsAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getCookies")).and(takesArguments(0)), packageName + ".TaintCookiesAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getBody")).and(takesArguments(0)), packageName + ".TaintGetBodyAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerServletHttpRequestInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerServletHttpRequestInstrumentation.java
index d1953760b0c..7324c744a51 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerServletHttpRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerServletHttpRequestInstrumentation.java
@@ -20,35 +20,34 @@
 
 @AutoService(InstrumenterModule.class)
 public class ServerServletHttpRequestInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ServerServletHttpRequestInstrumentation() {
-    super("spring-webflux");
-  }
+    public ServerServletHttpRequestInstrumentation() {
+        super("spring-webflux");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.http.server.ServletServerHttpRequest";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.http.server.ServletServerHttpRequest";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("getHeaders")).and(takesArguments(0)),
-        getClass().getName() + "$TaintHeadersAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("getHeaders")).and(takesArguments(0)),
+                getClass().getName() + "$TaintHeadersAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class TaintHeadersAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void after(
-        @Advice.Return Object object, @ActiveRequestContext RequestContext reqCtx) {
-      PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation == null) {
-        return;
-      }
-      IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-      propagation.taintObject(ctx, object, SourceTypes.REQUEST_HEADER_VALUE);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class TaintHeadersAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void after(@Advice.Return Object object, @ActiveRequestContext RequestContext reqCtx) {
+            PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation == null) {
+                return;
+            }
+            IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+            propagation.taintObject(ctx, object, SourceTypes.REQUEST_HEADER_VALUE);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintCookiesAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintCookiesAdvice.java
index 291abe554d1..fe65253816e 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintCookiesAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintCookiesAdvice.java
@@ -16,23 +16,22 @@
 @RequiresRequestContext(RequestContextSlot.IAST)
 class TaintCookiesAdvice {
 
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void after(
-      @Advice.Return MultiValueMap<String, HttpCookie> cookies,
-      @ActiveRequestContext RequestContext reqCtx) {
-    PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module == null || cookies.isEmpty()) {
-      return;
-    }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void after(
+            @Advice.Return MultiValueMap<String, HttpCookie> cookies, @ActiveRequestContext RequestContext reqCtx) {
+        PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module == null || cookies.isEmpty()) {
+            return;
+        }
 
-    final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-    for (List<HttpCookie> cookieList : cookies.values()) {
-      for (HttpCookie cookie : cookieList) {
-        final String name = cookie.getName();
-        final String value = cookie.getValue();
-        module.taintString(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
-        module.taintString(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
-      }
+        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+        for (List<HttpCookie> cookieList : cookies.values()) {
+            for (HttpCookie cookie : cookieList) {
+                final String name = cookie.getName();
+                final String value = cookie.getValue();
+                module.taintString(ctx, name, SourceTypes.REQUEST_COOKIE_NAME, name);
+                module.taintString(ctx, value, SourceTypes.REQUEST_COOKIE_VALUE, name);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintFluxElementsFunction.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintFluxElementsFunction.java
index 6086d084f34..4302c4d4a91 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintFluxElementsFunction.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintFluxElementsFunction.java
@@ -7,17 +7,17 @@
 
 public class TaintFluxElementsFunction<T> implements Function<T, T> {
 
-  final IastContext ctx;
-  final PropagationModule propagation;
+    final IastContext ctx;
+    final PropagationModule propagation;
 
-  public TaintFluxElementsFunction(IastContext ctx, PropagationModule propagationModule) {
-    this.ctx = ctx;
-    this.propagation = propagationModule;
-  }
+    public TaintFluxElementsFunction(IastContext ctx, PropagationModule propagationModule) {
+        this.ctx = ctx;
+        this.propagation = propagationModule;
+    }
 
-  @Override
-  public T apply(T t) {
-    propagation.taintObject(ctx, t, SourceTypes.REQUEST_BODY);
-    return t;
-  }
+    @Override
+    public T apply(T t) {
+        propagation.taintObject(ctx, t, SourceTypes.REQUEST_BODY);
+        return t;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintGetBodyAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintGetBodyAdvice.java
index 584698983cd..1f6aa25ec62 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintGetBodyAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintGetBodyAdvice.java
@@ -18,18 +18,17 @@
  */
 @RequiresRequestContext(RequestContextSlot.IAST)
 class TaintGetBodyAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void after(
-      @Advice.Return(readOnly = false) Flux<DataBuffer> flux,
-      @ActiveRequestContext RequestContext reqCtx) {
-    PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-    if (propagation == null || flux == null) {
-      return;
-    }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void after(
+            @Advice.Return(readOnly = false) Flux<DataBuffer> flux, @ActiveRequestContext RequestContext reqCtx) {
+        PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+        if (propagation == null || flux == null) {
+            return;
+        }
 
-    // taint both the flux and the individual DataBuffers
-    IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-    propagation.taintObject(ctx, flux, SourceTypes.REQUEST_BODY);
-    flux = flux.map(new TaintFluxElementsFunction<>(ctx, propagation));
-  }
+        // taint both the flux and the individual DataBuffers
+        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+        propagation.taintObject(ctx, flux, SourceTypes.REQUEST_BODY);
+        flux = flux.map(new TaintFluxElementsFunction<>(ctx, propagation));
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersGetAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersGetAdvice.java
index bbd9cad5f25..593f633b97e 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersGetAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersGetAdvice.java
@@ -18,25 +18,25 @@
  */
 @RequiresRequestContext(RequestContextSlot.IAST)
 class TaintHttpHeadersGetAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_HEADER_VALUE)
-  public static void after(
-      @Advice.This Object self,
-      @Advice.Argument(0) Object arg,
-      @Advice.Return List<String> values,
-      @ActiveRequestContext RequestContext reqCtx) {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_HEADER_VALUE)
+    public static void after(
+            @Advice.This Object self,
+            @Advice.Argument(0) Object arg,
+            @Advice.Return List<String> values,
+            @ActiveRequestContext RequestContext reqCtx) {
 
-    PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module == null || values == null || values.isEmpty()) {
-      return;
+        PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module == null || values == null || values.isEmpty()) {
+            return;
+        }
+        if (!(arg instanceof String)) {
+            return;
+        }
+        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+        String lc = ((String) arg).toLowerCase(Locale.ROOT);
+        for (String value : values) {
+            module.taintStringIfTainted(ctx, value, self, SourceTypes.REQUEST_HEADER_VALUE, lc);
+        }
     }
-    if (!(arg instanceof String)) {
-      return;
-    }
-    final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-    String lc = ((String) arg).toLowerCase(Locale.ROOT);
-    for (String value : values) {
-      module.taintStringIfTainted(ctx, value, self, SourceTypes.REQUEST_HEADER_VALUE, lc);
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersGetFirstAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersGetFirstAdvice.java
index 0d88cd22381..346df86c226 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersGetFirstAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersGetFirstAdvice.java
@@ -16,19 +16,19 @@
  */
 @RequiresRequestContext(RequestContextSlot.IAST)
 class TaintHttpHeadersGetFirstAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_HEADER_VALUE)
-  public static void after(
-      @Advice.This Object self,
-      @Advice.Argument(0) String arg,
-      @Advice.Return String value,
-      @ActiveRequestContext RequestContext reqCtx) {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_HEADER_VALUE)
+    public static void after(
+            @Advice.This Object self,
+            @Advice.Argument(0) String arg,
+            @Advice.Return String value,
+            @ActiveRequestContext RequestContext reqCtx) {
 
-    PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module == null || arg == null || value == null) {
-      return;
+        PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module == null || arg == null || value == null) {
+            return;
+        }
+        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+        module.taintStringIfTainted(ctx, value, self, SourceTypes.REQUEST_HEADER_VALUE, arg);
     }
-    IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-    module.taintStringIfTainted(ctx, value, self, SourceTypes.REQUEST_HEADER_VALUE, arg);
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersToSingleValueMapAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersToSingleValueMapAdvice.java
index 64c59001ba9..88b54970e14 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersToSingleValueMapAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintHttpHeadersToSingleValueMapAdvice.java
@@ -18,23 +18,23 @@
  */
 @RequiresRequestContext(RequestContextSlot.IAST)
 class TaintHttpHeadersToSingleValueMapAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_HEADER_VALUE)
-  public static void after(
-      @Advice.This Object self,
-      @Advice.Return Map<String, String> values,
-      @ActiveRequestContext RequestContext reqCtx) {
-    PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module == null || values == null || values.isEmpty()) {
-      return;
-    }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_HEADER_VALUE)
+    public static void after(
+            @Advice.This Object self,
+            @Advice.Return Map<String, String> values,
+            @ActiveRequestContext RequestContext reqCtx) {
+        PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module == null || values == null || values.isEmpty()) {
+            return;
+        }
 
-    final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-    for (Map.Entry<String, String> e : values.entrySet()) {
-      final String name = e.getKey();
-      final String value = e.getValue();
-      module.taintStringIfTainted(ctx, name, self, SourceTypes.REQUEST_HEADER_NAME, name);
-      module.taintStringIfTainted(ctx, value, self, SourceTypes.REQUEST_HEADER_VALUE, name);
+        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+        for (Map.Entry<String, String> e : values.entrySet()) {
+            final String name = e.getKey();
+            final String value = e.getValue();
+            module.taintStringIfTainted(ctx, name, self, SourceTypes.REQUEST_HEADER_NAME, name);
+            module.taintStringIfTainted(ctx, value, self, SourceTypes.REQUEST_HEADER_VALUE, name);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintQueryParamsAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintQueryParamsAdvice.java
index 31e0f23397a..535f8ae1c24 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintQueryParamsAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintQueryParamsAdvice.java
@@ -17,24 +17,23 @@
 @RequiresRequestContext(RequestContextSlot.IAST)
 class TaintQueryParamsAdvice {
 
-  @SuppressWarnings("Duplicates")
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-  public static void after(
-      @Advice.Return MultiValueMap<String, String> queryParams,
-      @ActiveRequestContext RequestContext reqCtx) {
-    final PropagationModule prop = InstrumentationBridge.PROPAGATION;
-    if (prop == null || queryParams == null || queryParams.isEmpty()) {
-      return;
-    }
+    @SuppressWarnings("Duplicates")
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+    public static void after(
+            @Advice.Return MultiValueMap<String, String> queryParams, @ActiveRequestContext RequestContext reqCtx) {
+        final PropagationModule prop = InstrumentationBridge.PROPAGATION;
+        if (prop == null || queryParams == null || queryParams.isEmpty()) {
+            return;
+        }
 
-    final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-    for (Map.Entry<String, List<String>> e : queryParams.entrySet()) {
-      String name = e.getKey();
-      prop.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
-      for (String value : e.getValue()) {
-        prop.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
-      }
+        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+        for (Map.Entry<String, List<String>> e : queryParams.entrySet()) {
+            String name = e.getKey();
+            prop.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+            for (String value : e.getValue()) {
+                prop.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintReadOnlyHttpHeadersAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintReadOnlyHttpHeadersAdvice.java
index 98bb4a8ca4b..cbee1f89c26 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintReadOnlyHttpHeadersAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TaintReadOnlyHttpHeadersAdvice.java
@@ -16,18 +16,18 @@
  */
 @RequiresRequestContext(RequestContextSlot.IAST)
 class TaintReadOnlyHttpHeadersAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_HEADER_VALUE)
-  public static void after(
-      @Advice.Argument(0) Object headers,
-      @Advice.Return Object retValue,
-      @ActiveRequestContext RequestContext reqCtx) {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_HEADER_VALUE)
+    public static void after(
+            @Advice.Argument(0) Object headers,
+            @Advice.Return Object retValue,
+            @ActiveRequestContext RequestContext reqCtx) {
 
-    PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module == null || retValue == null) {
-      return;
+        PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module == null || retValue == null) {
+            return;
+        }
+        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+        module.taintObjectIfTainted(ctx, retValue, headers);
     }
-    final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-    module.taintObjectIfTainted(ctx, retValue, headers);
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TemplateAndMatrixVariablesInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TemplateAndMatrixVariablesInstrumentation.java
index 1f96fb0e994..420839f476a 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TemplateAndMatrixVariablesInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/TemplateAndMatrixVariablesInstrumentation.java
@@ -13,28 +13,27 @@
 /** Obtain template and matrix variables for RequestMappingInfoHandlerMapping. */
 @AutoService(InstrumenterModule.class)
 public class TemplateAndMatrixVariablesInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public TemplateAndMatrixVariablesInstrumentation() {
-    super("spring-webflux");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public TemplateAndMatrixVariablesInstrumentation() {
+        super("spring-webflux");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.web.reactive.result.method.RequestMappingInfoHandlerMapping";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.web.reactive.result.method.RequestMappingInfoHandlerMapping";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isProtected())
-            .and(named("handleMatch"))
-            .and(
-                takesArgument(
-                    0, named("org.springframework.web.reactive.result.method.RequestMappingInfo")))
-            .and(takesArgument(1, named("org.springframework.web.method.HandlerMethod")))
-            .and(takesArgument(2, named("org.springframework.web.server.ServerWebExchange")))
-            .and(takesArguments(3)),
-        packageName + ".HandleMatchAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isProtected())
+                        .and(named("handleMatch"))
+                        .and(takesArgument(
+                                0, named("org.springframework.web.reactive.result.method.RequestMappingInfo")))
+                        .and(takesArgument(1, named("org.springframework.web.method.HandlerMethod")))
+                        .and(takesArgument(2, named("org.springframework.web.server.ServerWebExchange")))
+                        .and(takesArguments(3)),
+                packageName + ".HandleMatchAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/test/java/foo/bar/DummyRequest.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/test/java/foo/bar/DummyRequest.java
index c5513683ff2..8578fb4623c 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/test/java/foo/bar/DummyRequest.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/test/java/foo/bar/DummyRequest.java
@@ -25,343 +25,341 @@
 import javax.servlet.http.Part;
 
 public class DummyRequest implements HttpServletRequest {
-  Map<String, String> headers = Collections.emptyMap();
-
-  @Override
-  public String getAuthType() {
-    return null;
-  }
-
-  @Override
-  public Cookie[] getCookies() {
-    return new Cookie[0];
-  }
-
-  @Override
-  public long getDateHeader(String s) {
-    return 0;
-  }
-
-  @Override
-  public String getHeader(String s) {
-    return headers.get(s);
-  }
-
-  @Override
-  public Enumeration<String> getHeaders(String s) {
-    return Collections.enumeration(Collections.singletonList(headers.get(s)));
-  }
-
-  @Override
-  public Enumeration<String> getHeaderNames() {
-    return Collections.enumeration(headers.keySet());
-  }
-
-  @Override
-  public int getIntHeader(String s) {
-    return 0;
-  }
-
-  @Override
-  public String getMethod() {
-    return null;
-  }
-
-  @Override
-  public String getPathInfo() {
-    return null;
-  }
-
-  @Override
-  public String getPathTranslated() {
-    return null;
-  }
-
-  @Override
-  public String getContextPath() {
-    return null;
-  }
-
-  @Override
-  public String getQueryString() {
-    return null;
-  }
-
-  @Override
-  public String getRemoteUser() {
-    return null;
-  }
-
-  @Override
-  public boolean isUserInRole(String s) {
-    return false;
-  }
-
-  @Override
-  public Principal getUserPrincipal() {
-    return null;
-  }
-
-  @Override
-  public String getRequestedSessionId() {
-    return null;
-  }
-
-  @Override
-  public String getRequestURI() {
-    return null;
-  }
-
-  @Override
-  public StringBuffer getRequestURL() {
-    return null;
-  }
-
-  @Override
-  public String getServletPath() {
-    return null;
-  }
-
-  @Override
-  public HttpSession getSession(boolean b) {
-    return null;
-  }
-
-  @Override
-  public HttpSession getSession() {
-    return null;
-  }
-
-  @Override
-  public String changeSessionId() {
-    return null;
-  }
-
-  @Override
-  public boolean isRequestedSessionIdValid() {
-    return false;
-  }
-
-  @Override
-  public boolean isRequestedSessionIdFromCookie() {
-    return false;
-  }
-
-  @Override
-  public boolean isRequestedSessionIdFromURL() {
-    return false;
-  }
-
-  @Override
-  public boolean isRequestedSessionIdFromUrl() {
-    return false;
-  }
-
-  @Override
-  public boolean authenticate(HttpServletResponse httpServletResponse)
-      throws IOException, ServletException {
-    return false;
-  }
-
-  @Override
-  public void login(String s, String s1) throws ServletException {}
-
-  @Override
-  public void logout() throws ServletException {}
-
-  @Override
-  public Collection<Part> getParts() throws IOException, ServletException {
-    return null;
-  }
-
-  @Override
-  public Part getPart(String s) throws IOException, ServletException {
-    return null;
-  }
-
-  @Override
-  public <T extends HttpUpgradeHandler> T upgrade(Class<T> aClass)
-      throws IOException, ServletException {
-    return null;
-  }
-
-  @Override
-  public Object getAttribute(String s) {
-    return null;
-  }
-
-  @Override
-  public Enumeration<String> getAttributeNames() {
-    return null;
-  }
-
-  @Override
-  public String getCharacterEncoding() {
-    return null;
-  }
-
-  @Override
-  public void setCharacterEncoding(String s) throws UnsupportedEncodingException {}
-
-  @Override
-  public int getContentLength() {
-    return 0;
-  }
-
-  @Override
-  public long getContentLengthLong() {
-    return 0;
-  }
-
-  @Override
-  public String getContentType() {
-    return null;
-  }
-
-  @Override
-  public ServletInputStream getInputStream() throws IOException {
-    return null;
-  }
-
-  @Override
-  public String getParameter(String s) {
-    return null;
-  }
-
-  @Override
-  public Enumeration<String> getParameterNames() {
-    return null;
-  }
-
-  @Override
-  public String[] getParameterValues(String s) {
-    return new String[0];
-  }
-
-  @Override
-  public Map<String, String[]> getParameterMap() {
-    return null;
-  }
-
-  @Override
-  public String getProtocol() {
-    return null;
-  }
-
-  @Override
-  public String getScheme() {
-    return null;
-  }
-
-  @Override
-  public String getServerName() {
-    return null;
-  }
-
-  @Override
-  public int getServerPort() {
-    return 0;
-  }
-
-  @Override
-  public BufferedReader getReader() throws IOException {
-    return null;
-  }
-
-  @Override
-  public String getRemoteAddr() {
-    return null;
-  }
-
-  @Override
-  public String getRemoteHost() {
-    return null;
-  }
-
-  @Override
-  public void setAttribute(String s, Object o) {}
-
-  @Override
-  public void removeAttribute(String s) {}
-
-  @Override
-  public Locale getLocale() {
-    return null;
-  }
-
-  @Override
-  public Enumeration<Locale> getLocales() {
-    return null;
-  }
-
-  @Override
-  public boolean isSecure() {
-    return false;
-  }
-
-  @Override
-  public RequestDispatcher getRequestDispatcher(String s) {
-    return null;
-  }
-
-  @Override
-  public String getRealPath(String s) {
-    return null;
-  }
-
-  @Override
-  public int getRemotePort() {
-    return 0;
-  }
-
-  @Override
-  public String getLocalName() {
-    return null;
-  }
-
-  @Override
-  public String getLocalAddr() {
-    return null;
-  }
-
-  @Override
-  public int getLocalPort() {
-    return 0;
-  }
-
-  @Override
-  public ServletContext getServletContext() {
-    return null;
-  }
-
-  @Override
-  public AsyncContext startAsync() throws IllegalStateException {
-    return null;
-  }
-
-  @Override
-  public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
-      throws IllegalStateException {
-    return null;
-  }
-
-  @Override
-  public boolean isAsyncStarted() {
-    return false;
-  }
-
-  @Override
-  public boolean isAsyncSupported() {
-    return false;
-  }
-
-  @Override
-  public AsyncContext getAsyncContext() {
-    return null;
-  }
-
-  @Override
-  public DispatcherType getDispatcherType() {
-    return null;
-  }
+    Map<String, String> headers = Collections.emptyMap();
+
+    @Override
+    public String getAuthType() {
+        return null;
+    }
+
+    @Override
+    public Cookie[] getCookies() {
+        return new Cookie[0];
+    }
+
+    @Override
+    public long getDateHeader(String s) {
+        return 0;
+    }
+
+    @Override
+    public String getHeader(String s) {
+        return headers.get(s);
+    }
+
+    @Override
+    public Enumeration<String> getHeaders(String s) {
+        return Collections.enumeration(Collections.singletonList(headers.get(s)));
+    }
+
+    @Override
+    public Enumeration<String> getHeaderNames() {
+        return Collections.enumeration(headers.keySet());
+    }
+
+    @Override
+    public int getIntHeader(String s) {
+        return 0;
+    }
+
+    @Override
+    public String getMethod() {
+        return null;
+    }
+
+    @Override
+    public String getPathInfo() {
+        return null;
+    }
+
+    @Override
+    public String getPathTranslated() {
+        return null;
+    }
+
+    @Override
+    public String getContextPath() {
+        return null;
+    }
+
+    @Override
+    public String getQueryString() {
+        return null;
+    }
+
+    @Override
+    public String getRemoteUser() {
+        return null;
+    }
+
+    @Override
+    public boolean isUserInRole(String s) {
+        return false;
+    }
+
+    @Override
+    public Principal getUserPrincipal() {
+        return null;
+    }
+
+    @Override
+    public String getRequestedSessionId() {
+        return null;
+    }
+
+    @Override
+    public String getRequestURI() {
+        return null;
+    }
+
+    @Override
+    public StringBuffer getRequestURL() {
+        return null;
+    }
+
+    @Override
+    public String getServletPath() {
+        return null;
+    }
+
+    @Override
+    public HttpSession getSession(boolean b) {
+        return null;
+    }
+
+    @Override
+    public HttpSession getSession() {
+        return null;
+    }
+
+    @Override
+    public String changeSessionId() {
+        return null;
+    }
+
+    @Override
+    public boolean isRequestedSessionIdValid() {
+        return false;
+    }
+
+    @Override
+    public boolean isRequestedSessionIdFromCookie() {
+        return false;
+    }
+
+    @Override
+    public boolean isRequestedSessionIdFromURL() {
+        return false;
+    }
+
+    @Override
+    public boolean isRequestedSessionIdFromUrl() {
+        return false;
+    }
+
+    @Override
+    public boolean authenticate(HttpServletResponse httpServletResponse) throws IOException, ServletException {
+        return false;
+    }
+
+    @Override
+    public void login(String s, String s1) throws ServletException {}
+
+    @Override
+    public void logout() throws ServletException {}
+
+    @Override
+    public Collection<Part> getParts() throws IOException, ServletException {
+        return null;
+    }
+
+    @Override
+    public Part getPart(String s) throws IOException, ServletException {
+        return null;
+    }
+
+    @Override
+    public <T extends HttpUpgradeHandler> T upgrade(Class<T> aClass) throws IOException, ServletException {
+        return null;
+    }
+
+    @Override
+    public Object getAttribute(String s) {
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getAttributeNames() {
+        return null;
+    }
+
+    @Override
+    public String getCharacterEncoding() {
+        return null;
+    }
+
+    @Override
+    public void setCharacterEncoding(String s) throws UnsupportedEncodingException {}
+
+    @Override
+    public int getContentLength() {
+        return 0;
+    }
+
+    @Override
+    public long getContentLengthLong() {
+        return 0;
+    }
+
+    @Override
+    public String getContentType() {
+        return null;
+    }
+
+    @Override
+    public ServletInputStream getInputStream() throws IOException {
+        return null;
+    }
+
+    @Override
+    public String getParameter(String s) {
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getParameterNames() {
+        return null;
+    }
+
+    @Override
+    public String[] getParameterValues(String s) {
+        return new String[0];
+    }
+
+    @Override
+    public Map<String, String[]> getParameterMap() {
+        return null;
+    }
+
+    @Override
+    public String getProtocol() {
+        return null;
+    }
+
+    @Override
+    public String getScheme() {
+        return null;
+    }
+
+    @Override
+    public String getServerName() {
+        return null;
+    }
+
+    @Override
+    public int getServerPort() {
+        return 0;
+    }
+
+    @Override
+    public BufferedReader getReader() throws IOException {
+        return null;
+    }
+
+    @Override
+    public String getRemoteAddr() {
+        return null;
+    }
+
+    @Override
+    public String getRemoteHost() {
+        return null;
+    }
+
+    @Override
+    public void setAttribute(String s, Object o) {}
+
+    @Override
+    public void removeAttribute(String s) {}
+
+    @Override
+    public Locale getLocale() {
+        return null;
+    }
+
+    @Override
+    public Enumeration<Locale> getLocales() {
+        return null;
+    }
+
+    @Override
+    public boolean isSecure() {
+        return false;
+    }
+
+    @Override
+    public RequestDispatcher getRequestDispatcher(String s) {
+        return null;
+    }
+
+    @Override
+    public String getRealPath(String s) {
+        return null;
+    }
+
+    @Override
+    public int getRemotePort() {
+        return 0;
+    }
+
+    @Override
+    public String getLocalName() {
+        return null;
+    }
+
+    @Override
+    public String getLocalAddr() {
+        return null;
+    }
+
+    @Override
+    public int getLocalPort() {
+        return 0;
+    }
+
+    @Override
+    public ServletContext getServletContext() {
+        return null;
+    }
+
+    @Override
+    public AsyncContext startAsync() throws IllegalStateException {
+        return null;
+    }
+
+    @Override
+    public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
+            throws IllegalStateException {
+        return null;
+    }
+
+    @Override
+    public boolean isAsyncStarted() {
+        return false;
+    }
+
+    @Override
+    public boolean isAsyncSupported() {
+        return false;
+    }
+
+    @Override
+    public AsyncContext getAsyncContext() {
+        return null;
+    }
+
+    @Override
+    public DispatcherType getDispatcherType() {
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/WsHandler.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/WsHandler.java
index 0285c45b485..34258b2dee6 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/WsHandler.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/src/bootTest/groovy/dd/trace/instrumentation/springwebflux/server/WsHandler.java
@@ -9,65 +9,58 @@
 @Component
 public class WsHandler implements WebSocketHandler {
 
-  volatile WebSocketSession activeSession;
+    volatile WebSocketSession activeSession;
 
-  @Override
-  public Mono<Void> handle(WebSocketSession webSocketSession) {
-    // An echo server the closes after the first echoed message
-    activeSession = webSocketSession;
-    synchronized (this) {
-      notifyAll();
+    @Override
+    public Mono<Void> handle(WebSocketSession webSocketSession) {
+        // An echo server the closes after the first echoed message
+        activeSession = webSocketSession;
+        synchronized (this) {
+            notifyAll();
+        }
+        return webSocketSession
+                .receive()
+                .map(msg -> {
+                    if (msg.getType() == WebSocketMessage.Type.TEXT) {
+                        return webSocketSession.textMessage(msg.getPayloadAsText());
+                    }
+                    byte[] bytes = new byte[msg.getPayload().readableByteCount()];
+                    msg.getPayload().read(bytes);
+                    return webSocketSession.binaryMessage(dataBufferFactory -> dataBufferFactory.wrap(bytes));
+                })
+                .flatMap(msg -> webSocketSession.send(Mono.just(msg)).doFinally(ignored -> {
+                    synchronized (this) {
+                        activeSession = null;
+                        notifyAll();
+                    }
+                }))
+                .then();
     }
-    return webSocketSession
-        .receive()
-        .map(
-            msg -> {
-              if (msg.getType() == WebSocketMessage.Type.TEXT) {
-                return webSocketSession.textMessage(msg.getPayloadAsText());
-              }
-              byte[] bytes = new byte[msg.getPayload().readableByteCount()];
-              msg.getPayload().read(bytes);
-              return webSocketSession.binaryMessage(
-                  dataBufferFactory -> dataBufferFactory.wrap(bytes));
-            })
-        .flatMap(
-            msg ->
-                webSocketSession
-                    .send(Mono.just(msg))
-                    .doFinally(
-                        ignored -> {
-                          synchronized (this) {
-                            activeSession = null;
-                            notifyAll();
-                          }
-                        }))
-        .then();
-  }
 
-  public void awaitExchangeComplete() {
-    synchronized (this) {
-      if (activeSession == null) {
-        return;
-      }
-      try {
-        wait();
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      }
+    public void awaitExchangeComplete() {
+        synchronized (this) {
+            if (activeSession == null) {
+                return;
+            }
+            try {
+                wait();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
     }
-  }
 
-  public void awaitConnected() {
-    synchronized (this) {
-      if (activeSession != null) {
-        return;
-      }
-      try {
-        wait(1000);
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      }
+    public void awaitConnected() {
+        synchronized (this) {
+            if (activeSession != null) {
+                return;
+            }
+            try {
+                wait(1000);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
+        assert activeSession != null;
     }
-    assert activeSession != null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/src/bootTest/java/dd/trace/instrumentation/springwebflux/server/RedirectComponent.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/src/bootTest/java/dd/trace/instrumentation/springwebflux/server/RedirectComponent.java
index 85917014396..1b7abf038b1 100644
--- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/src/bootTest/java/dd/trace/instrumentation/springwebflux/server/RedirectComponent.java
+++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/src/bootTest/java/dd/trace/instrumentation/springwebflux/server/RedirectComponent.java
@@ -12,10 +12,11 @@
 // Need to keep this in Java because groovy creates crazy proxies around lambdas
 @Component
 public class RedirectComponent {
-  @Bean
-  public RouterFunction<ServerResponse> redirectRouterFunction() {
-    return route(
-        GET("/double-greet-redirect"),
-        req -> ServerResponse.temporaryRedirect(URI.create("/double-greet")).build());
-  }
+    @Bean
+    public RouterFunction<ServerResponse> redirectRouterFunction() {
+        return route(
+                GET("/double-greet-redirect"),
+                req -> ServerResponse.temporaryRedirect(URI.create("/double-greet"))
+                        .build());
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/latestDepTest/groovy/datadog/trace/instrumentation/springweb/SingleEndpointController.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/latestDepTest/groovy/datadog/trace/instrumentation/springweb/SingleEndpointController.java
index 5e2a10d3c1e..aeacb9ccff3 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/latestDepTest/groovy/datadog/trace/instrumentation/springweb/SingleEndpointController.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/latestDepTest/groovy/datadog/trace/instrumentation/springweb/SingleEndpointController.java
@@ -8,8 +8,8 @@
 @Controller
 @RequestMapping("/single")
 public class SingleEndpointController {
-  @GetMapping
-  public @ResponseBody String get() {
-    return "Hello World";
-  }
+    @GetMapping
+    public @ResponseBody String get() {
+        return "Hello World";
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletInstrumentation.java
index b85b3273068..5cba1f374f4 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletInstrumentation.java
@@ -24,62 +24,60 @@
 
 @AutoService(InstrumenterModule.class)
 public class AppSecDispatcherServletInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public AppSecDispatcherServletInstrumentation() {
-    super("spring-web");
-  }
+    public AppSecDispatcherServletInstrumentation() {
+        super("spring-web");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.web.servlet.DispatcherServlet";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.web.servlet.DispatcherServlet";
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return not(
-        hasClassNamed(
-            "org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition"));
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return not(hasClassNamed("org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition"));
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "spring-mvc-pre-5.3";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "spring-mvc-pre-5.3";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isProtected())
-            .and(named("onRefresh"))
-            .and(takesArgument(0, named("org.springframework.context.ApplicationContext")))
-            .and(takesArguments(1)),
-        AppSecDispatcherServletInstrumentation.class.getName() + "$AppSecHandlerMappingAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isProtected())
+                        .and(named("onRefresh"))
+                        .and(takesArgument(0, named("org.springframework.context.ApplicationContext")))
+                        .and(takesArguments(1)),
+                AppSecDispatcherServletInstrumentation.class.getName() + "$AppSecHandlerMappingAdvice");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && InstrumenterConfig.get().isApiSecurityEndpointCollectionEnabled();
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && InstrumenterConfig.get().isApiSecurityEndpointCollectionEnabled();
+    }
 
-  public static class AppSecHandlerMappingAdvice {
+    public static class AppSecHandlerMappingAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterRefresh(@Advice.Argument(0) final ApplicationContext springCtx) {
-      final Map<String, RequestMappingHandlerMapping> handlers =
-          springCtx.getBeansOfType(RequestMappingHandlerMapping.class);
-      if (handlers == null || handlers.isEmpty()) {
-        return;
-      }
-      final Map<RequestMappingInfo, HandlerMethod> mappings = new HashMap<>();
-      for (RequestMappingHandlerMapping mapping : handlers.values()) {
-        mappings.putAll(mapping.getHandlerMethods());
-      }
-      if (mappings.isEmpty()) {
-        return;
-      }
-      EndpointCollector.get().supplier(new RequestMappingInfoIterator(mappings));
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterRefresh(@Advice.Argument(0) final ApplicationContext springCtx) {
+            final Map<String, RequestMappingHandlerMapping> handlers =
+                    springCtx.getBeansOfType(RequestMappingHandlerMapping.class);
+            if (handlers == null || handlers.isEmpty()) {
+                return;
+            }
+            final Map<RequestMappingInfo, HandlerMethod> mappings = new HashMap<>();
+            for (RequestMappingHandlerMapping mapping : handlers.values()) {
+                mappings.putAll(mapping.getHandlerMethods());
+            }
+            if (mappings.isEmpty()) {
+                return;
+            }
+            EndpointCollector.get().supplier(new RequestMappingInfoIterator(mappings));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/DispatcherServletInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/DispatcherServletInstrumentation.java
index f44826ca76c..a71b713b157 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/DispatcherServletInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/DispatcherServletInstrumentation.java
@@ -27,95 +27,94 @@
 
 @AutoService(InstrumenterModule.class)
 public final class DispatcherServletInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public DispatcherServletInstrumentation() {
-    super("spring-web");
-  }
+    public DispatcherServletInstrumentation() {
+        super("spring-web");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.web.servlet.DispatcherServlet";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.web.servlet.DispatcherServlet";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isProtected())
-            .and(named("onRefresh"))
-            .and(takesArgument(0, named("org.springframework.context.ApplicationContext")))
-            .and(takesArguments(1)),
-        DispatcherServletInstrumentation.class.getName() + "$HandlerMappingAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isProtected())
-            .and(named("render"))
-            .and(takesArgument(0, named("org.springframework.web.servlet.ModelAndView"))),
-        DispatcherServletInstrumentation.class.getName() + "$RenderAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isProtected())
-            .and(nameStartsWith("processHandlerException"))
-            .and(takesArgument(3, Exception.class)),
-        DispatcherServletInstrumentation.class.getName() + "$ErrorHandlerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isProtected())
+                        .and(named("onRefresh"))
+                        .and(takesArgument(0, named("org.springframework.context.ApplicationContext")))
+                        .and(takesArguments(1)),
+                DispatcherServletInstrumentation.class.getName() + "$HandlerMappingAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isProtected())
+                        .and(named("render"))
+                        .and(takesArgument(0, named("org.springframework.web.servlet.ModelAndView"))),
+                DispatcherServletInstrumentation.class.getName() + "$RenderAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isProtected())
+                        .and(nameStartsWith("processHandlerException"))
+                        .and(takesArgument(3, Exception.class)),
+                DispatcherServletInstrumentation.class.getName() + "$ErrorHandlerAdvice");
+    }
 
-  /**
-   * This advice creates a filter that has reference to the handlerMappings from DispatcherServlet
-   * which allows the mappings to be evaluated at the beginning of the filter chain. This evaluation
-   * is done inside the Servlet3Decorator.onContext method.
-   */
-  public static class HandlerMappingAdvice {
+    /**
+     * This advice creates a filter that has reference to the handlerMappings from DispatcherServlet
+     * which allows the mappings to be evaluated at the beginning of the filter chain. This evaluation
+     * is done inside the Servlet3Decorator.onContext method.
+     */
+    public static class HandlerMappingAdvice {
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterRefresh(
-        @Advice.Argument(0) final ApplicationContext springCtx,
-        @Advice.FieldValue("handlerMappings") final List<HandlerMapping> handlerMappings) {
-      if (springCtx.containsBean("ddDispatcherFilter")) {
-        final HandlerMappingResourceNameFilter filter =
-            (HandlerMappingResourceNameFilter) springCtx.getBean("ddDispatcherFilter");
-        if (handlerMappings != null && filter != null) {
-          filter.setHandlerMappings(handlerMappings);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterRefresh(
+                @Advice.Argument(0) final ApplicationContext springCtx,
+                @Advice.FieldValue("handlerMappings") final List<HandlerMapping> handlerMappings) {
+            if (springCtx.containsBean("ddDispatcherFilter")) {
+                final HandlerMappingResourceNameFilter filter =
+                        (HandlerMappingResourceNameFilter) springCtx.getBean("ddDispatcherFilter");
+                if (handlerMappings != null && filter != null) {
+                    filter.setHandlerMappings(handlerMappings);
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class RenderAdvice {
+    public static class RenderAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(@Advice.Argument(0) final ModelAndView mv) {
-      final AgentSpan span = startSpan("spring-webmvc", RESPONSE_RENDER);
-      DECORATE_RENDER.afterStart(span);
-      DECORATE_RENDER.onRender(span, mv);
-      return span.attachWithContext();
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(@Advice.Argument(0) final ModelAndView mv) {
+            final AgentSpan span = startSpan("spring-webmvc", RESPONSE_RENDER);
+            DECORATE_RENDER.afterStart(span);
+            DECORATE_RENDER.onRender(span, mv);
+            return span.attachWithContext();
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      final AgentSpan span = spanFromContext(scope.context());
-      DECORATE_RENDER.onError(scope, throwable);
-      DECORATE_RENDER.beforeFinish(scope.context());
-      scope.close();
-      span.finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            final AgentSpan span = spanFromContext(scope.context());
+            DECORATE_RENDER.onError(scope, throwable);
+            DECORATE_RENDER.beforeFinish(scope.context());
+            scope.close();
+            span.finish();
+        }
     }
-  }
 
-  public static class ErrorHandlerAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void nameResource(@Advice.Argument(3) final Exception exception) {
-      final AgentSpan span = activeSpan();
-      if (span != null && exception != null) {
-        boolean alreadyError = span.isError();
-        DECORATE.onError(span, exception);
-        // We want to capture the stacktrace, but that doesn't mean it should be an error.
-        // We rely on a decorator to set the error state based on response code. (5xx -> error)
-        // Status code might not be set though if the span isn't the server span.
-        // Meaning the error won't be set by the status code. (Probably ok since not measured.)
-        span.setError(alreadyError, ErrorPriorities.HTTP_SERVER_DECORATOR);
-      }
+    public static class ErrorHandlerAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void nameResource(@Advice.Argument(3) final Exception exception) {
+            final AgentSpan span = activeSpan();
+            if (span != null && exception != null) {
+                boolean alreadyError = span.isError();
+                DECORATE.onError(span, exception);
+                // We want to capture the stacktrace, but that doesn't mean it should be an error.
+                // We rely on a decorator to set the error state based on response code. (5xx -> error)
+                // Status code might not be set though if the span isn't the server span.
+                // Meaning the error won't be set by the status code. (Probably ok since not measured.)
+                span.setError(alreadyError, ErrorPriorities.HTTP_SERVER_DECORATOR);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java
index d5514b54801..b729d4ee855 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java
@@ -30,100 +30,100 @@
 
 @AutoService(InstrumenterModule.class)
 public final class HandlerAdapterInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public HandlerAdapterInstrumentation() {
-    super("spring-web");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.web.servlet.HandlerAdapter";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(nameStartsWith("handle"))
-            .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest")))
-            .and(takesArguments(3)),
-        HandlerAdapterInstrumentation.class.getName() + "$ControllerAdvice");
-  }
-
-  public static class ControllerAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope nameResourceAndStartSpan(
-        @Advice.Argument(0) final HttpServletRequest request,
-        @Advice.Argument(2) final Object handler,
-        @Advice.Local("handlerSpanKeys") Pair<String, String> handlerSpanKeys) {
-
-      // Name the parent span based on the matching pattern
-      Object contextObj = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (contextObj instanceof Context) {
-        Context context = (Context) contextObj;
-        AgentSpan parentSpan = spanFromContext(context);
-        if (parentSpan != null) {
-          DECORATE.onRequest(parentSpan, request, request, rootContext());
-        }
-      }
-
-      if (activeSpan() == null) {
-        return null;
-      }
-
-      // Now create a span for handler/controller execution.
-
-      final Class<?> handlerClass;
-      if (handler instanceof HandlerMethod) {
-        handlerClass = ((HandlerMethod) handler).getBean().getClass();
-      } else {
-        handlerClass = handler.getClass();
-      }
-      handlerSpanKeys = handlerSpanKeys(handlerClass);
-
-      // If the context already exists, return it
-      final Object existingContext = request.getAttribute(handlerSpanKeys.getLeft());
-      if (existingContext instanceof Context) {
-        return ((Context) existingContext).attach();
-      }
-
-      final AgentSpan span =
-          startSpan("spring-web-controller", DECORATE.spanName()).setMeasured(true);
-      DECORATE.afterStart(span);
-      DECORATE.onHandle(span, handler);
-
-      request.setAttribute(handlerSpanKeys.getLeft(), span);
-      return span.attachWithContext();
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public HandlerAdapterInstrumentation() {
+        super("spring-web");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.web.servlet.HandlerAdapter";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Argument(0) final HttpServletRequest request,
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Local("handlerSpanKeys") Pair<String, String> handlerSpanKeys) {
-      if (scope == null) {
-        return;
-      }
-      boolean finish = !Boolean.TRUE.equals(request.getAttribute(handlerSpanKeys.getRight()));
-      final AgentSpan span = spanFromContext(scope.context());
-      scope.close();
-      if (throwable != null) {
-        DECORATE.onError(span, throwable);
-        finish = true;
-      }
-      if (finish) {
-        DECORATE.beforeFinish(scope.context());
-        span.finish();
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(nameStartsWith("handle"))
+                        .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest")))
+                        .and(takesArguments(3)),
+                HandlerAdapterInstrumentation.class.getName() + "$ControllerAdvice");
+    }
+
+    public static class ControllerAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope nameResourceAndStartSpan(
+                @Advice.Argument(0) final HttpServletRequest request,
+                @Advice.Argument(2) final Object handler,
+                @Advice.Local("handlerSpanKeys") Pair<String, String> handlerSpanKeys) {
+
+            // Name the parent span based on the matching pattern
+            Object contextObj = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (contextObj instanceof Context) {
+                Context context = (Context) contextObj;
+                AgentSpan parentSpan = spanFromContext(context);
+                if (parentSpan != null) {
+                    DECORATE.onRequest(parentSpan, request, request, rootContext());
+                }
+            }
+
+            if (activeSpan() == null) {
+                return null;
+            }
+
+            // Now create a span for handler/controller execution.
+
+            final Class<?> handlerClass;
+            if (handler instanceof HandlerMethod) {
+                handlerClass = ((HandlerMethod) handler).getBean().getClass();
+            } else {
+                handlerClass = handler.getClass();
+            }
+            handlerSpanKeys = handlerSpanKeys(handlerClass);
+
+            // If the context already exists, return it
+            final Object existingContext = request.getAttribute(handlerSpanKeys.getLeft());
+            if (existingContext instanceof Context) {
+                return ((Context) existingContext).attach();
+            }
+
+            final AgentSpan span =
+                    startSpan("spring-web-controller", DECORATE.spanName()).setMeasured(true);
+            DECORATE.afterStart(span);
+            DECORATE.onHandle(span, handler);
+
+            request.setAttribute(handlerSpanKeys.getLeft(), span);
+            return span.attachWithContext();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.Argument(0) final HttpServletRequest request,
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Local("handlerSpanKeys") Pair<String, String> handlerSpanKeys) {
+            if (scope == null) {
+                return;
+            }
+            boolean finish = !Boolean.TRUE.equals(request.getAttribute(handlerSpanKeys.getRight()));
+            final AgentSpan span = spanFromContext(scope.context());
+            scope.close();
+            if (throwable != null) {
+                DECORATE.onError(span, throwable);
+                finish = true;
+            }
+            if (finish) {
+                DECORATE.beforeFinish(scope.context());
+                span.finish();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilter.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilter.java
index 1307d98fdc1..5363b3cb40d 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilter.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilter.java
@@ -24,82 +24,80 @@
 
 public class HandlerMappingResourceNameFilter extends OncePerRequestFilter implements Ordered {
 
-  private static final Logger log = LoggerFactory.getLogger(HandlerMappingResourceNameFilter.class);
+    private static final Logger log = LoggerFactory.getLogger(HandlerMappingResourceNameFilter.class);
 
-  private final List<HandlerMapping> handlerMappings = new CopyOnWriteArrayList<>();
+    private final List<HandlerMapping> handlerMappings = new CopyOnWriteArrayList<>();
 
-  @Override
-  protected void doFilterInternal(
-      final HttpServletRequest request,
-      final HttpServletResponse response,
-      final FilterChain filterChain)
-      throws ServletException, IOException {
+    @Override
+    protected void doFilterInternal(
+            final HttpServletRequest request, final HttpServletResponse response, final FilterChain filterChain)
+            throws ServletException, IOException {
 
-    final Object contextObj = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-    if (contextObj instanceof Context) {
-      Context context = (Context) contextObj;
-      AgentSpan parentSpan = AgentSpan.fromContext(context);
-      if (parentSpan != null) {
-        PathMatchingHttpServletRequestWrapper wrappedRequest =
-            new PathMatchingHttpServletRequestWrapper(request);
-        try {
-          if (findMapping(wrappedRequest)) {
-            // Name the parent span based on the matching pattern
-            // Let the parent span resource name be set with the attribute set in findMapping.
-            DECORATE.onRequest(parentSpan, wrappedRequest, wrappedRequest, root());
-          }
-        } catch (final Exception ignored) {
-          // mapping.getHandler() threw exception.  Ignore
+        final Object contextObj = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+        if (contextObj instanceof Context) {
+            Context context = (Context) contextObj;
+            AgentSpan parentSpan = AgentSpan.fromContext(context);
+            if (parentSpan != null) {
+                PathMatchingHttpServletRequestWrapper wrappedRequest =
+                        new PathMatchingHttpServletRequestWrapper(request);
+                try {
+                    if (findMapping(wrappedRequest)) {
+                        // Name the parent span based on the matching pattern
+                        // Let the parent span resource name be set with the attribute set in findMapping.
+                        DECORATE.onRequest(parentSpan, wrappedRequest, wrappedRequest, root());
+                    }
+                } catch (final Exception ignored) {
+                    // mapping.getHandler() threw exception.  Ignore
+                }
+            }
         }
-      }
-    }
 
-    filterChain.doFilter(request, response);
-  }
+        filterChain.doFilter(request, response);
+    }
 
-  /**
-   * When a HandlerMapping matches a request, it sets HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE
-   * as an attribute on the request. This attribute is read by
-   * SpringWebHttpServerDecorator.onRequest and set as the resource name.
-   */
-  private boolean findMapping(final HttpServletRequest request) throws Exception {
-    for (final HandlerMapping mapping : handlerMappings) {
-      final HandlerExecutionChain handler = mapping.getHandler(request);
-      if (handler != null) {
-        return true;
-      }
+    /**
+     * When a HandlerMapping matches a request, it sets HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE
+     * as an attribute on the request. This attribute is read by
+     * SpringWebHttpServerDecorator.onRequest and set as the resource name.
+     */
+    private boolean findMapping(final HttpServletRequest request) throws Exception {
+        for (final HandlerMapping mapping : handlerMappings) {
+            final HandlerExecutionChain handler = mapping.getHandler(request);
+            if (handler != null) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 
-  public void setHandlerMappings(final List<HandlerMapping> handlerMappings) {
-    for (HandlerMapping handlerMapping : handlerMappings) {
-      if (handlerMapping instanceof RequestMappingInfoHandlerMapping) {
-        if (!this.handlerMappings.contains(handlerMapping)) {
-          this.handlerMappings.add(handlerMapping);
+    public void setHandlerMappings(final List<HandlerMapping> handlerMappings) {
+        for (HandlerMapping handlerMapping : handlerMappings) {
+            if (handlerMapping instanceof RequestMappingInfoHandlerMapping) {
+                if (!this.handlerMappings.contains(handlerMapping)) {
+                    this.handlerMappings.add(handlerMapping);
+                }
+            } else {
+                log.debug(
+                        "discarding handler mapping {} which won't set BEST_MATCHING_PATTERN_ATTRIBUTE",
+                        handlerMapping);
+            }
         }
-      } else {
-        log.debug(
-            "discarding handler mapping {} which won't set BEST_MATCHING_PATTERN_ATTRIBUTE",
-            handlerMapping);
-      }
     }
-  }
 
-  @Override
-  public int getOrder() {
-    // Run after all HIGHEST_PRECEDENCE items
-    return Ordered.HIGHEST_PRECEDENCE + 1;
-  }
+    @Override
+    public int getOrder() {
+        // Run after all HIGHEST_PRECEDENCE items
+        return Ordered.HIGHEST_PRECEDENCE + 1;
+    }
 
-  public static class BeanDefinition extends AnnotatedGenericBeanDefinition {
-    private static final long serialVersionUID = 5623859691503032280L;
+    public static class BeanDefinition extends AnnotatedGenericBeanDefinition {
+        private static final long serialVersionUID = 5623859691503032280L;
 
-    public BeanDefinition() {
-      super(HandlerMappingResourceNameFilter.class);
-      // don't call setBeanClassName as it overwrites 'beanClass'
-      setScope(SCOPE_SINGLETON);
-      setLazyInit(true);
+        public BeanDefinition() {
+            super(HandlerMappingResourceNameFilter.class);
+            // don't call setBeanClassName as it overwrites 'beanClass'
+            setScope(SCOPE_SINGLETON);
+            setLazyInit(true);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerMethodReturnValueHandlerCompositeInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerMethodReturnValueHandlerCompositeInstrumentation.java
index 78151935997..0132baa23be 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerMethodReturnValueHandlerCompositeInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerMethodReturnValueHandlerCompositeInstrumentation.java
@@ -19,53 +19,50 @@
 import org.springframework.web.servlet.view.AbstractUrlBasedView;
 
 @AutoService(InstrumenterModule.class)
-public final class HandlerMethodReturnValueHandlerCompositeInstrumentation
-    extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public final class HandlerMethodReturnValueHandlerCompositeInstrumentation extends InstrumenterModule.Iast
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public HandlerMethodReturnValueHandlerCompositeInstrumentation() {
-    super("spring-web");
-  }
+    public HandlerMethodReturnValueHandlerCompositeInstrumentation() {
+        super("spring-web");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("selectHandler")),
-        HandlerMethodReturnValueHandlerCompositeInstrumentation.class.getName() + "$SpringAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("selectHandler")),
+                HandlerMethodReturnValueHandlerCompositeInstrumentation.class.getName() + "$SpringAdvice");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.web.method.support.HandlerMethodReturnValueHandlerComposite";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.web.method.support.HandlerMethodReturnValueHandlerComposite";
+    }
 
-  public static class SpringAdvice {
+    public static class SpringAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.SPRING_RESPONSE)
-    public static void checkReturnedObject(
-        @Advice.Return HandlerMethodReturnValueHandler handler,
-        @Advice.Argument(0) final Object value,
-        @Advice.Argument(1) MethodParameter returnType) {
-      final UnvalidatedRedirectModule unvalidatedRedirectModule =
-          InstrumentationBridge.UNVALIDATED_REDIRECT;
-      final XssModule xssModule = InstrumentationBridge.XSS;
-      if (handler != null && value != null && returnType != null) {
-        String clazz = returnType.getMethod().getDeclaringClass().getName();
-        String method = returnType.getMethod().getName();
-        if (unvalidatedRedirectModule != null && value instanceof AbstractUrlBasedView) {
-          unvalidatedRedirectModule.onRedirect(
-              ((AbstractUrlBasedView) value).getUrl(), clazz, method);
-        } else if (unvalidatedRedirectModule != null && value instanceof ModelAndView) {
-          unvalidatedRedirectModule.onRedirect(((ModelAndView) value).getViewName(), clazz, method);
-        } else if (value instanceof String) {
-          if (xssModule != null && handler instanceof RequestResponseBodyMethodProcessor) {
-            xssModule.onXss((String) value, clazz, method);
-          } else if (unvalidatedRedirectModule != null) {
-            unvalidatedRedirectModule.onRedirect((String) value, clazz, method);
-          }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.SPRING_RESPONSE)
+        public static void checkReturnedObject(
+                @Advice.Return HandlerMethodReturnValueHandler handler,
+                @Advice.Argument(0) final Object value,
+                @Advice.Argument(1) MethodParameter returnType) {
+            final UnvalidatedRedirectModule unvalidatedRedirectModule = InstrumentationBridge.UNVALIDATED_REDIRECT;
+            final XssModule xssModule = InstrumentationBridge.XSS;
+            if (handler != null && value != null && returnType != null) {
+                String clazz = returnType.getMethod().getDeclaringClass().getName();
+                String method = returnType.getMethod().getName();
+                if (unvalidatedRedirectModule != null && value instanceof AbstractUrlBasedView) {
+                    unvalidatedRedirectModule.onRedirect(((AbstractUrlBasedView) value).getUrl(), clazz, method);
+                } else if (unvalidatedRedirectModule != null && value instanceof ModelAndView) {
+                    unvalidatedRedirectModule.onRedirect(((ModelAndView) value).getViewName(), clazz, method);
+                } else if (value instanceof String) {
+                    if (xssModule != null && handler instanceof RequestResponseBodyMethodProcessor) {
+                        xssModule.onXss((String) value, clazz, method);
+                    } else if (unvalidatedRedirectModule != null) {
+                        unvalidatedRedirectModule.onRedirect((String) value, clazz, method);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HttpMessageConverterInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HttpMessageConverterInstrumentation.java
index d170a53cc22..92fad484080 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HttpMessageConverterInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HttpMessageConverterInstrumentation.java
@@ -29,139 +29,135 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpMessageConverterInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public HttpMessageConverterInstrumentation() {
-    super("spring-web");
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Only apply this spring-framework instrumentation when spring-webmvc is also deployed.
-    return hasClassNamed(
-        "org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.http.converter.HttpMessageConverter";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("read"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, Class.class))
-            .and(takesArgument(1, named("org.springframework.http.HttpInputMessage"))),
-        HttpMessageConverterInstrumentation.class.getName() + "$HttpMessageConverterReadAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("read"))
-            .and(takesArguments(3))
-            .and(takesArgument(0, Type.class))
-            .and(takesArgument(1, Class.class))
-            .and(takesArgument(2, named("org.springframework.http.HttpInputMessage"))),
-        HttpMessageConverterInstrumentation.class.getName() + "$HttpMessageConverterReadAdvice");
-
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("write"))
-            .and(takesArguments(3))
-            .and(takesArgument(0, Object.class))
-            .and(takesArgument(1, named("org.springframework.http.MediaType")))
-            .and(takesArgument(2, named("org.springframework.http.HttpOutputMessage"))),
-        HttpMessageConverterInstrumentation.class.getName() + "$HttpMessageConverterWriteAdvice");
-
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("write"))
-            .and(takesArguments(4))
-            .and(takesArgument(0, Object.class))
-            .and(takesArgument(1, Type.class))
-            .and(takesArgument(2, named("org.springframework.http.MediaType")))
-            .and(takesArgument(3, named("org.springframework.http.HttpOutputMessage"))),
-        HttpMessageConverterInstrumentation.class.getName() + "$HttpMessageConverterWriteAdvice");
-  }
-
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class HttpMessageConverterReadAdvice {
-
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.Return final Object obj,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (obj == null || t != null) {
-        return;
-      }
-
-      // CharSequence or byte[] cannot be treated as parsed body content, as they may lead to false
-      // positives in the WAF rules.
-      // TODO: These types (CharSequence, byte[]) are candidates to being deserialized before being
-      // sent to the WAF once we implement that feature.
-      // Possible types received by this method include: String, byte[], various DTOs/POJOs,
-      // Collections (List, Map), Jackson JsonNode objects, XML objects, etc.
-      // We may need to add more types to this block list in the future.
-      if (obj instanceof CharSequence || obj instanceof byte[]) {
-        return;
-      }
-
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
-      Flow<Void> flow = callback.apply(reqCtx, obj);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-        if (brf != null) {
-          brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public HttpMessageConverterInstrumentation() {
+        super("spring-web");
+    }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Only apply this spring-framework instrumentation when spring-webmvc is also deployed.
+        return hasClassNamed("org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.http.converter.HttpMessageConverter";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("read"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, Class.class))
+                        .and(takesArgument(1, named("org.springframework.http.HttpInputMessage"))),
+                HttpMessageConverterInstrumentation.class.getName() + "$HttpMessageConverterReadAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("read"))
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, Type.class))
+                        .and(takesArgument(1, Class.class))
+                        .and(takesArgument(2, named("org.springframework.http.HttpInputMessage"))),
+                HttpMessageConverterInstrumentation.class.getName() + "$HttpMessageConverterReadAdvice");
+
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("write"))
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, Object.class))
+                        .and(takesArgument(1, named("org.springframework.http.MediaType")))
+                        .and(takesArgument(2, named("org.springframework.http.HttpOutputMessage"))),
+                HttpMessageConverterInstrumentation.class.getName() + "$HttpMessageConverterWriteAdvice");
+
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("write"))
+                        .and(takesArguments(4))
+                        .and(takesArgument(0, Object.class))
+                        .and(takesArgument(1, Type.class))
+                        .and(takesArgument(2, named("org.springframework.http.MediaType")))
+                        .and(takesArgument(3, named("org.springframework.http.HttpOutputMessage"))),
+                HttpMessageConverterInstrumentation.class.getName() + "$HttpMessageConverterWriteAdvice");
+    }
+
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class HttpMessageConverterReadAdvice {
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(
+                @Advice.Return final Object obj,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (obj == null || t != null) {
+                return;
+            }
+
+            // CharSequence or byte[] cannot be treated as parsed body content, as they may lead to false
+            // positives in the WAF rules.
+            // TODO: These types (CharSequence, byte[]) are candidates to being deserialized before being
+            // sent to the WAF once we implement that feature.
+            // Possible types received by this method include: String, byte[], various DTOs/POJOs,
+            // Collections (List, Map), Jackson JsonNode objects, XML objects, etc.
+            // We may need to add more types to this block list in the future.
+            if (obj instanceof CharSequence || obj instanceof byte[]) {
+                return;
+            }
+
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
+            Flow<Void> flow = callback.apply(reqCtx, obj);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+                if (brf != null) {
+                    brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                }
+                t = new BlockingException("Blocked request (for HttpMessageConverter/read)");
+            }
         }
-        t = new BlockingException("Blocked request (for HttpMessageConverter/read)");
-      }
     }
-  }
-
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class HttpMessageConverterWriteAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void before(
-        @Advice.Argument(0) final Object obj, @ActiveRequestContext RequestContext reqCtx) {
-      if (obj == null) {
-        return;
-      }
-
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.responseBody());
-      if (callback == null) {
-        return;
-      }
-
-      Flow<Void> flow = callback.apply(reqCtx, obj);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-        if (brf != null) {
-          brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class HttpMessageConverterWriteAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void before(@Advice.Argument(0) final Object obj, @ActiveRequestContext RequestContext reqCtx) {
+            if (obj == null) {
+                return;
+            }
+
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.responseBody());
+            if (callback == null) {
+                return;
+            }
+
+            Flow<Void> flow = callback.apply(reqCtx, obj);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+                if (brf != null) {
+                    brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                }
+                throw new BlockingException("Blocked response (for HttpMessageConverter/write)");
+            }
         }
-        throw new BlockingException("Blocked response (for HttpMessageConverter/write)");
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/InvocableHandlerMethodInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/InvocableHandlerMethodInstrumentation.java
index e11cf325324..8cdb39d7dae 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/InvocableHandlerMethodInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/InvocableHandlerMethodInstrumentation.java
@@ -18,53 +18,45 @@
 
 @AutoService(InstrumenterModule.class)
 public class InvocableHandlerMethodInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public InvocableHandlerMethodInstrumentation() {
-    super("spring-web");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.web.method.support.InvocableHandlerMethod";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("invokeForRequest"), getClass().getName() + "$WrapContinuableResultAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public InvocableHandlerMethodInstrumentation() {
+        super("spring-web");
+    }
 
-  public static class WrapContinuableResultAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void after(
-        @Advice.Argument(value = 0, typing = Assigner.Typing.DYNAMIC)
-            final NativeWebRequest nativeWebRequest,
-        @Advice.Return(readOnly = false) Object result,
-        @Advice.This final InvocableHandlerMethod self) {
-      if (!(nativeWebRequest instanceof ServletWebRequest)
-          || !(result instanceof CompletionStage)) {
-        return;
-      }
-      ServletWebRequest servletWebRequest = (ServletWebRequest) nativeWebRequest;
-      final Pair<String, String> handlerSpanKeys = handlerSpanKeys(self.getBean().getClass());
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.web.method.support.InvocableHandlerMethod";
+    }
 
-      if (Boolean.TRUE.equals(
-          servletWebRequest.getAttribute(
-              handlerSpanKeys.getRight(), ServletWebRequest.SCOPE_REQUEST))) {
-        return;
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("invokeForRequest"), getClass().getName() + "$WrapContinuableResultAdvice");
+    }
 
-      Object span =
-          servletWebRequest.getAttribute(
-              handlerSpanKeys.getLeft(), ServletWebRequest.SCOPE_REQUEST);
-      if (!(span instanceof AgentSpan)) {
-        return;
-      }
-      servletWebRequest.setAttribute(
-          handlerSpanKeys.getRight(), true, ServletWebRequest.SCOPE_REQUEST);
-      result =
-          ((CompletionStage<?>) result)
-              .whenComplete(AsyncResultExtensions.finishSpan((AgentSpan) span));
+    public static class WrapContinuableResultAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void after(
+                @Advice.Argument(value = 0, typing = Assigner.Typing.DYNAMIC) final NativeWebRequest nativeWebRequest,
+                @Advice.Return(readOnly = false) Object result,
+                @Advice.This final InvocableHandlerMethod self) {
+            if (!(nativeWebRequest instanceof ServletWebRequest) || !(result instanceof CompletionStage)) {
+                return;
+            }
+            ServletWebRequest servletWebRequest = (ServletWebRequest) nativeWebRequest;
+            final Pair<String, String> handlerSpanKeys =
+                    handlerSpanKeys(self.getBean().getClass());
+
+            if (Boolean.TRUE.equals(
+                    servletWebRequest.getAttribute(handlerSpanKeys.getRight(), ServletWebRequest.SCOPE_REQUEST))) {
+                return;
+            }
+
+            Object span = servletWebRequest.getAttribute(handlerSpanKeys.getLeft(), ServletWebRequest.SCOPE_REQUEST);
+            if (!(span instanceof AgentSpan)) {
+                return;
+            }
+            servletWebRequest.setAttribute(handlerSpanKeys.getRight(), true, ServletWebRequest.SCOPE_REQUEST);
+            result = ((CompletionStage<?>) result).whenComplete(AsyncResultExtensions.finishSpan((AgentSpan) span));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/PairList.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/PairList.java
index ea78a337a9f..7d8d6e388f1 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/PairList.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/PairList.java
@@ -3,27 +3,27 @@
 import java.util.AbstractList;
 
 public class PairList extends AbstractList<Object> {
-  private final Object obj1;
-  private final Object obj2;
+    private final Object obj1;
+    private final Object obj2;
 
-  public PairList(Object obj1, Object obj2) {
-    this.obj1 = obj1;
-    this.obj2 = obj2;
-  }
+    public PairList(Object obj1, Object obj2) {
+        this.obj1 = obj1;
+        this.obj2 = obj2;
+    }
 
-  @Override
-  public Object get(int index) {
-    if (index == 0) {
-      return obj1;
-    } else if (index == 1) {
-      return obj2;
-    } else {
-      throw new IndexOutOfBoundsException("Valid indices are 0 and 1");
+    @Override
+    public Object get(int index) {
+        if (index == 0) {
+            return obj1;
+        } else if (index == 1) {
+            return obj2;
+        } else {
+            throw new IndexOutOfBoundsException("Valid indices are 0 and 1");
+        }
     }
-  }
 
-  @Override
-  public int size() {
-    return 2;
-  }
+    @Override
+    public int size() {
+        return 2;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/PathMatchingHttpServletRequestWrapper.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/PathMatchingHttpServletRequestWrapper.java
index cdaf8a4bfdc..d45d929f310 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/PathMatchingHttpServletRequestWrapper.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/PathMatchingHttpServletRequestWrapper.java
@@ -6,28 +6,28 @@
 import javax.servlet.http.HttpServletRequestWrapper;
 
 class PathMatchingHttpServletRequestWrapper extends HttpServletRequestWrapper {
-  private final Map<String, Object> localAttributes = new HashMap<>();
+    private final Map<String, Object> localAttributes = new HashMap<>();
 
-  public PathMatchingHttpServletRequestWrapper(HttpServletRequest request) {
-    super(request);
-  }
+    public PathMatchingHttpServletRequestWrapper(HttpServletRequest request) {
+        super(request);
+    }
 
-  @Override
-  public Object getAttribute(String name) {
-    final Object ret = localAttributes.get(name);
-    if (ret == null) {
-      return super.getAttribute(name);
+    @Override
+    public Object getAttribute(String name) {
+        final Object ret = localAttributes.get(name);
+        if (ret == null) {
+            return super.getAttribute(name);
+        }
+        return ret;
     }
-    return ret;
-  }
 
-  @Override
-  public void setAttribute(String name, Object o) {
-    localAttributes.put(name, o);
-  }
+    @Override
+    public void setAttribute(String name, Object o) {
+        localAttributes.put(name, o);
+    }
 
-  @Override
-  public void removeAttribute(String name) {
-    localAttributes.remove(name);
-  }
+    @Override
+    public void removeAttribute(String name) {
+        localAttributes.remove(name);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/RequestMappingInfoIterator.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/RequestMappingInfoIterator.java
index 8a058a470f9..8ecc82594ed 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/RequestMappingInfoIterator.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/RequestMappingInfoIterator.java
@@ -17,85 +17,85 @@
 
 public class RequestMappingInfoIterator implements Iterator<Endpoint> {
 
-  private final Map<RequestMappingInfo, HandlerMethod> mappings;
-  private final Queue<Endpoint> queue = new LinkedList<>();
-  private Iterator<Map.Entry<RequestMappingInfo, HandlerMethod>> iterator;
-  private boolean first = true;
+    private final Map<RequestMappingInfo, HandlerMethod> mappings;
+    private final Queue<Endpoint> queue = new LinkedList<>();
+    private Iterator<Map.Entry<RequestMappingInfo, HandlerMethod>> iterator;
+    private boolean first = true;
 
-  public RequestMappingInfoIterator(final Map<RequestMappingInfo, HandlerMethod> mappings) {
-    this.mappings = mappings;
-  }
-
-  private Iterator<Map.Entry<RequestMappingInfo, HandlerMethod>> iterator() {
-    if (iterator == null) {
-      iterator = mappings.entrySet().iterator();
+    public RequestMappingInfoIterator(final Map<RequestMappingInfo, HandlerMethod> mappings) {
+        this.mappings = mappings;
     }
-    return iterator;
-  }
-
-  @Override
-  public boolean hasNext() {
-    return !queue.isEmpty() || iterator().hasNext();
-  }
 
-  @Override
-  public Endpoint next() {
-    if (queue.isEmpty()) {
-      fetchNext();
-    }
-    final Endpoint endpoint = queue.poll();
-    if (endpoint == null) {
-      throw new NoSuchElementException();
+    private Iterator<Map.Entry<RequestMappingInfo, HandlerMethod>> iterator() {
+        if (iterator == null) {
+            iterator = mappings.entrySet().iterator();
+        }
+        return iterator;
     }
-    return endpoint;
-  }
 
-  private void fetchNext() {
-    final Iterator<Map.Entry<RequestMappingInfo, HandlerMethod>> delegate = iterator();
-    if (!delegate.hasNext()) {
-      return;
+    @Override
+    public boolean hasNext() {
+        return !queue.isEmpty() || iterator().hasNext();
     }
-    final Map.Entry<RequestMappingInfo, HandlerMethod> nextEntry = delegate.next();
-    final RequestMappingInfo nextInfo = nextEntry.getKey();
-    final HandlerMethod nextHandler = nextEntry.getValue();
-    final List<String> requestBody =
-        parseMediaTypes(nextInfo.getConsumesCondition().getExpressions());
-    final List<String> responseBody =
-        parseMediaTypes(nextInfo.getProducesCondition().getExpressions());
-    for (final String path : nextInfo.getPatternsCondition().getPatterns()) {
-      final List<String> methods = Method.parseMethods(nextInfo.getMethodsCondition().getMethods());
-      for (final String method : methods) {
-        Endpoint endpoint =
-            new Endpoint()
-                .type(Endpoint.Type.REST)
-                .operation(Endpoint.Operation.HTTP_REQUEST)
-                .resource(method + " " + path)
-                .path(path)
-                .method(method)
-                .requestBodyType(requestBody)
-                .responseBodyType(responseBody);
-        if (nextHandler != null) {
-          final Map<String, String> metadata = new HashMap<>();
-          metadata.put("handler", nextHandler.toString());
-          endpoint.metadata(metadata);
+
+    @Override
+    public Endpoint next() {
+        if (queue.isEmpty()) {
+            fetchNext();
         }
-        if (first) {
-          endpoint.first(true);
-          first = false;
+        final Endpoint endpoint = queue.poll();
+        if (endpoint == null) {
+            throw new NoSuchElementException();
         }
-        queue.add(endpoint);
-      }
+        return endpoint;
     }
-  }
 
-  private List<String> parseMediaTypes(final Set<MediaTypeExpression> expressions) {
-    if (expressions == null || expressions.isEmpty()) {
-      return null;
+    private void fetchNext() {
+        final Iterator<Map.Entry<RequestMappingInfo, HandlerMethod>> delegate = iterator();
+        if (!delegate.hasNext()) {
+            return;
+        }
+        final Map.Entry<RequestMappingInfo, HandlerMethod> nextEntry = delegate.next();
+        final RequestMappingInfo nextInfo = nextEntry.getKey();
+        final HandlerMethod nextHandler = nextEntry.getValue();
+        final List<String> requestBody =
+                parseMediaTypes(nextInfo.getConsumesCondition().getExpressions());
+        final List<String> responseBody =
+                parseMediaTypes(nextInfo.getProducesCondition().getExpressions());
+        for (final String path : nextInfo.getPatternsCondition().getPatterns()) {
+            final List<String> methods =
+                    Method.parseMethods(nextInfo.getMethodsCondition().getMethods());
+            for (final String method : methods) {
+                Endpoint endpoint = new Endpoint()
+                        .type(Endpoint.Type.REST)
+                        .operation(Endpoint.Operation.HTTP_REQUEST)
+                        .resource(method + " " + path)
+                        .path(path)
+                        .method(method)
+                        .requestBodyType(requestBody)
+                        .responseBodyType(responseBody);
+                if (nextHandler != null) {
+                    final Map<String, String> metadata = new HashMap<>();
+                    metadata.put("handler", nextHandler.toString());
+                    endpoint.metadata(metadata);
+                }
+                if (first) {
+                    endpoint.first(true);
+                    first = false;
+                }
+                queue.add(endpoint);
+            }
+        }
     }
-    final List<String> result = new ArrayList<>(expressions.size());
-    for (final MediaTypeExpression expression : expressions) {
-      result.add(expression.toString());
+
+    private List<String> parseMediaTypes(final Set<MediaTypeExpression> expressions) {
+        if (expressions == null || expressions.isEmpty()) {
+            return null;
+        }
+        final List<String> result = new ArrayList<>(expressions.size());
+        for (final MediaTypeExpression expression : expressions) {
+            result.add(expression.toString());
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/ServletRequestURIAdapter.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/ServletRequestURIAdapter.java
index 09e6fa9fb05..b4df82ad13f 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/ServletRequestURIAdapter.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/ServletRequestURIAdapter.java
@@ -4,39 +4,39 @@
 import javax.servlet.http.HttpServletRequest;
 
 public final class ServletRequestURIAdapter extends URIRawDataAdapter {
-  private final HttpServletRequest request;
-
-  public ServletRequestURIAdapter(HttpServletRequest request) {
-    this.request = request;
-  }
-
-  @Override
-  public String scheme() {
-    return request.getScheme();
-  }
-
-  @Override
-  public String host() {
-    return request.getServerName();
-  }
-
-  @Override
-  public int port() {
-    return request.getServerPort();
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return request.getRequestURI();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return request.getQueryString();
-  }
+    private final HttpServletRequest request;
+
+    public ServletRequestURIAdapter(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    @Override
+    public String scheme() {
+        return request.getScheme();
+    }
+
+    @Override
+    public String host() {
+        return request.getServerName();
+    }
+
+    @Override
+    public int port() {
+        return request.getServerPort();
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return request.getRequestURI();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return request.getQueryString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringBeanProcessorInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringBeanProcessorInstrumentation.java
index cb604d00bd0..639f9592971 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringBeanProcessorInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringBeanProcessorInstrumentation.java
@@ -18,40 +18,39 @@
  */
 @AutoService(InstrumenterModule.class)
 public class SpringBeanProcessorInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public SpringBeanProcessorInstrumentation() {
-    super("spring-web");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public SpringBeanProcessorInstrumentation() {
+        super("spring-web");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.jboss.resteasy.plugins.spring.SpringBeanProcessor";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.jboss.resteasy.plugins.spring.SpringBeanProcessor";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("processBean"))
-            .and(
-                takesArgument(3, named("org.springframework.beans.factory.config.BeanDefinition"))),
-        SpringBeanProcessorInstrumentation.class.getName() + "$SkipBeanClassAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("processBean"))
+                        .and(takesArgument(3, named("org.springframework.beans.factory.config.BeanDefinition"))),
+                SpringBeanProcessorInstrumentation.class.getName() + "$SkipBeanClassAdvice");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "resteasy-spring";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "resteasy-spring";
+    }
 
-  public static class SkipBeanClassAdvice {
-    @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class, suppress = Throwable.class)
-    public static Class<?> onEnter(@Advice.Argument(3) final BeanDefinition beanDefinition) {
-      String className = beanDefinition.getBeanClassName();
-      if (null != className && className.startsWith("datadog.trace.instrumentation.")) {
-        return Object.class; // skip the original method and return this value instead
-      } else {
-        return null; // continue on to call the original method and return its value
-      }
+    public static class SkipBeanClassAdvice {
+        @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class, suppress = Throwable.class)
+        public static Class<?> onEnter(@Advice.Argument(3) final BeanDefinition beanDefinition) {
+            String className = beanDefinition.getBeanClassName();
+            if (null != className && className.startsWith("datadog.trace.instrumentation.")) {
+                return Object.class; // skip the original method and return this value instead
+            } else {
+                return null; // continue on to call the original method and return its value
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringWebHttpServerDecorator.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringWebHttpServerDecorator.java
index b7a2778d097..9692db90f3e 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringWebHttpServerDecorator.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringWebHttpServerDecorator.java
@@ -22,145 +22,141 @@
 import org.springframework.web.servlet.mvc.Controller;
 
 public class SpringWebHttpServerDecorator
-    extends HttpServerDecorator<HttpServletRequest, HttpServletRequest, HttpServletResponse, Void> {
-
-  private static final CharSequence SPRING_HANDLER = UTF8BytesString.create("spring.handler");
-  public static final CharSequence RESPONSE_RENDER = UTF8BytesString.create("response.render");
-
-  private final CharSequence component;
-
-  public static final SpringWebHttpServerDecorator DECORATE =
-      new SpringWebHttpServerDecorator(UTF8BytesString.create("spring-web-controller"));
-  public static final SpringWebHttpServerDecorator DECORATE_RENDER =
-      new SpringWebHttpServerDecorator(UTF8BytesString.create("spring-webmvc"));
-  public static final String DD_HANDLER_SPAN_PREFIX_KEY = "dd.handler.span.";
-  public static final String DD_HANDLER_SPAN_CONTINUE_SUFFIX = ".continue";
-
-  private static final ClassValue<Pair<String, String>> HANDLER_SPAN_KEYS =
-      GenericClassValue.of(
-          type -> {
-            String spanKey = DD_HANDLER_SPAN_PREFIX_KEY + type.getName();
-            return of(spanKey, spanKey + DD_HANDLER_SPAN_CONTINUE_SUFFIX);
-          });
-
-  /** Returns the span attribute key on the left and the continuation attribute key on the right. */
-  public static Pair<String, String> handlerSpanKeys(Class<?> handlerClass) {
-    return HANDLER_SPAN_KEYS.get(handlerClass);
-  }
-
-  public SpringWebHttpServerDecorator(CharSequence component) {
-    this.component = component;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"spring-web"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return component;
-  }
-
-  @Override
-  protected boolean traceAnalyticsDefault() {
-    return false;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Void> getter() {
-    return null;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpServletResponse> responseGetter() {
-    return null;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return SPRING_HANDLER;
-  }
-
-  @Override
-  protected String method(final HttpServletRequest httpServletRequest) {
-    return httpServletRequest.getMethod();
-  }
-
-  @Override
-  protected URIDataAdapter url(final HttpServletRequest httpServletRequest) {
-    return new ServletRequestURIAdapter(httpServletRequest);
-  }
-
-  @Override
-  protected String peerHostIP(final HttpServletRequest httpServletRequest) {
-    return httpServletRequest.getRemoteAddr();
-  }
-
-  @Override
-  protected int peerPort(final HttpServletRequest httpServletRequest) {
-    return httpServletRequest.getRemotePort();
-  }
-
-  @Override
-  protected int status(final HttpServletResponse httpServletResponse) {
-    return httpServletResponse.getStatus();
-  }
-
-  @Override
-  protected String getRequestHeader(final HttpServletRequest request, String key) {
-    return request.getHeader(key);
-  }
-
-  @Override
-  protected void doOnRequest(
-      final AgentSpan span,
-      final HttpServletRequest connection,
-      final HttpServletRequest request,
-      final Context parentContext) {
-    if (request != null) {
-      final String method = request.getMethod();
-      final Object bestMatchingPattern =
-          request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
-      if (method != null && bestMatchingPattern != null && !bestMatchingPattern.equals("/**")) {
-        HTTP_RESOURCE_DECORATOR.withRoute(span, method, bestMatchingPattern.toString());
-      }
-    }
-  }
-
-  public void onHandle(final AgentSpan span, final Object handler) {
-    if (handler instanceof HandlerMethod) {
-      // name span based on the class and method name defined in the handler
-      final Method method = ((HandlerMethod) handler).getMethod();
-      span.setResourceName(
-          DECORATE.spanNameForMethod(method.getDeclaringClass(), method.getName()));
-    } else {
-      span.setResourceName(DECORATE.spanNameForMethod(handler.getClass(), getMethodName(handler)));
-    }
-  }
-
-  private String getMethodName(final Object handler) {
-    if (handler instanceof HttpRequestHandler || handler instanceof Controller) {
-      // org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter
-      // org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter
-      return "handleRequest";
-    } else if (handler instanceof Servlet) {
-      // org.springframework.web.servlet.handler.SimpleServletHandlerAdapter
-      return "service";
-    } else {
-      // perhaps org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter
-      return "<annotation>";
-    }
-  }
-
-  public void onRender(final AgentSpan span, final ModelAndView mv) {
-    final String viewName = mv.getViewName();
-    if (viewName != null) {
-      span.setTag("view.name", viewName);
-      span.setResourceName(viewName);
-    }
-    if (mv.getView() != null) {
-      span.setTag("view.type", className(mv.getView().getClass()));
-    }
-  }
+        extends HttpServerDecorator<HttpServletRequest, HttpServletRequest, HttpServletResponse, Void> {
+
+    private static final CharSequence SPRING_HANDLER = UTF8BytesString.create("spring.handler");
+    public static final CharSequence RESPONSE_RENDER = UTF8BytesString.create("response.render");
+
+    private final CharSequence component;
+
+    public static final SpringWebHttpServerDecorator DECORATE =
+            new SpringWebHttpServerDecorator(UTF8BytesString.create("spring-web-controller"));
+    public static final SpringWebHttpServerDecorator DECORATE_RENDER =
+            new SpringWebHttpServerDecorator(UTF8BytesString.create("spring-webmvc"));
+    public static final String DD_HANDLER_SPAN_PREFIX_KEY = "dd.handler.span.";
+    public static final String DD_HANDLER_SPAN_CONTINUE_SUFFIX = ".continue";
+
+    private static final ClassValue<Pair<String, String>> HANDLER_SPAN_KEYS = GenericClassValue.of(type -> {
+        String spanKey = DD_HANDLER_SPAN_PREFIX_KEY + type.getName();
+        return of(spanKey, spanKey + DD_HANDLER_SPAN_CONTINUE_SUFFIX);
+    });
+
+    /** Returns the span attribute key on the left and the continuation attribute key on the right. */
+    public static Pair<String, String> handlerSpanKeys(Class<?> handlerClass) {
+        return HANDLER_SPAN_KEYS.get(handlerClass);
+    }
+
+    public SpringWebHttpServerDecorator(CharSequence component) {
+        this.component = component;
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"spring-web"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return component;
+    }
+
+    @Override
+    protected boolean traceAnalyticsDefault() {
+        return false;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Void> getter() {
+        return null;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpServletResponse> responseGetter() {
+        return null;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return SPRING_HANDLER;
+    }
+
+    @Override
+    protected String method(final HttpServletRequest httpServletRequest) {
+        return httpServletRequest.getMethod();
+    }
+
+    @Override
+    protected URIDataAdapter url(final HttpServletRequest httpServletRequest) {
+        return new ServletRequestURIAdapter(httpServletRequest);
+    }
+
+    @Override
+    protected String peerHostIP(final HttpServletRequest httpServletRequest) {
+        return httpServletRequest.getRemoteAddr();
+    }
+
+    @Override
+    protected int peerPort(final HttpServletRequest httpServletRequest) {
+        return httpServletRequest.getRemotePort();
+    }
+
+    @Override
+    protected int status(final HttpServletResponse httpServletResponse) {
+        return httpServletResponse.getStatus();
+    }
+
+    @Override
+    protected String getRequestHeader(final HttpServletRequest request, String key) {
+        return request.getHeader(key);
+    }
+
+    @Override
+    protected void doOnRequest(
+            final AgentSpan span,
+            final HttpServletRequest connection,
+            final HttpServletRequest request,
+            final Context parentContext) {
+        if (request != null) {
+            final String method = request.getMethod();
+            final Object bestMatchingPattern = request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
+            if (method != null && bestMatchingPattern != null && !bestMatchingPattern.equals("/**")) {
+                HTTP_RESOURCE_DECORATOR.withRoute(span, method, bestMatchingPattern.toString());
+            }
+        }
+    }
+
+    public void onHandle(final AgentSpan span, final Object handler) {
+        if (handler instanceof HandlerMethod) {
+            // name span based on the class and method name defined in the handler
+            final Method method = ((HandlerMethod) handler).getMethod();
+            span.setResourceName(DECORATE.spanNameForMethod(method.getDeclaringClass(), method.getName()));
+        } else {
+            span.setResourceName(DECORATE.spanNameForMethod(handler.getClass(), getMethodName(handler)));
+        }
+    }
+
+    private String getMethodName(final Object handler) {
+        if (handler instanceof HttpRequestHandler || handler instanceof Controller) {
+            // org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter
+            // org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter
+            return "handleRequest";
+        } else if (handler instanceof Servlet) {
+            // org.springframework.web.servlet.handler.SimpleServletHandlerAdapter
+            return "service";
+        } else {
+            // perhaps org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter
+            return "<annotation>";
+        }
+    }
+
+    public void onRender(final AgentSpan span, final ModelAndView mv) {
+        final String viewName = mv.getViewName();
+        if (viewName != null) {
+            span.setTag("view.name", viewName);
+            span.setResourceName(viewName);
+        }
+        if (mv.getView() != null) {
+            span.setTag("view.type", className(mv.getView().getClass()));
+        }
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateAndMatrixVariablesInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateAndMatrixVariablesInstrumentation.java
index 3e8c560714e..bb41eedccab 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateAndMatrixVariablesInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateAndMatrixVariablesInstrumentation.java
@@ -36,192 +36,187 @@
 /** Obtain template and matrix variables for RequestMappingInfoHandlerMapping. */
 @AutoService(InstrumenterModule.class)
 public class TemplateAndMatrixVariablesInstrumentation extends InstrumenterModule
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  private Advice.PostProcessor.Factory postProcessorFactory;
+    private Advice.PostProcessor.Factory postProcessorFactory;
 
-  public TemplateAndMatrixVariablesInstrumentation() {
-    super("spring-web");
-  }
+    public TemplateAndMatrixVariablesInstrumentation() {
+        super("spring-web");
+    }
 
-  @Override
-  public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    if (enabledSystems.contains(TargetSystem.IAST)) {
-      postProcessorFactory = IastPostProcessorFactory.INSTANCE;
-      return true;
+    @Override
+    public boolean isApplicable(Set<TargetSystem> enabledSystems) {
+        if (enabledSystems.contains(TargetSystem.IAST)) {
+            postProcessorFactory = IastPostProcessorFactory.INSTANCE;
+            return true;
+        }
+        return enabledSystems.contains(TargetSystem.APPSEC);
     }
-    return enabledSystems.contains(TargetSystem.APPSEC);
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Only apply to versions of spring-webmvc that include request mapping information
-    return hasClassNamed("org.springframework.web.servlet.mvc.method.RequestMappingInfo");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isProtected())
-            .and(named("handleMatch"))
-            .and(
-                takesArgument(
-                    0, named("org.springframework.web.servlet.mvc.method.RequestMappingInfo")))
-            .and(takesArgument(1, String.class))
-            .and(takesArgument(2, named("javax.servlet.http.HttpServletRequest")))
-            .and(takesArguments(3)),
-        TemplateAndMatrixVariablesInstrumentation.class.getName() + "$HandleMatchAdvice");
-  }
-
-  @Override
-  public Advice.PostProcessor.Factory postProcessor() {
-    return postProcessorFactory;
-  }
-
-  public static class HandleMatchAdvice {
-    private static final String URI_TEMPLATE_VARIABLES_ATTRIBUTE =
-        "org.springframework.web.servlet.HandlerMapping.uriTemplateVariables";
-    private static final String MATRIX_VARIABLES_ATTRIBUTE =
-        "org.springframework.web.servlet.HandlerMapping.matrixVariables";
-
-    @SuppressWarnings("Duplicates")
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_MATRIX_PARAMETER)
-    public static void after(
-        @Advice.Argument(2) final HttpServletRequest req,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
-      // hacky, but APM instrumentation causes the instrumented method to be called twice
-      if (req.getClass()
-          .getName()
-          .equals(
-              "datadog.trace.instrumentation.springweb.PathMatchingHttpServletRequestWrapper")) {
-        return;
-      }
-
-      AgentSpan agentSpan = AgentTracer.activeSpan();
-      if (agentSpan == null) {
-        return;
-      }
-
-      Object templateVars = req.getAttribute(URI_TEMPLATE_VARIABLES_ATTRIBUTE);
-      Object matrixVars = req.getAttribute(MATRIX_VARIABLES_ATTRIBUTE);
-      if (templateVars == null && matrixVars == null) {
-        return;
-      }
-
-      RequestContext reqCtx = agentSpan.getRequestContext();
-      if (reqCtx == null) {
-        return;
-      }
-
-      { // appsec
-        Object appSecRequestContext = reqCtx.getData(RequestContextSlot.APPSEC);
-        if (appSecRequestContext != null) {
-
-          // merge the uri template and matrix variables
-          Map<String, Object> map = null;
-          if (templateVars instanceof Map) {
-            map = (Map<String, Object>) templateVars;
-          }
-          if (matrixVars instanceof Map) {
-            if (map != null) {
-              map = new HashMap<>(map);
-              for (Map.Entry<String, Object> e : ((Map<String, Object>) matrixVars).entrySet()) {
-                String key = e.getKey();
-                Object curValue = map.get(key);
-                if (curValue != null) {
-                  map.put(key, new PairList(curValue, e.getValue()));
-                } else {
-                  map.put(key, e.getValue());
-                }
-              }
-            } else {
-              map = (Map<String, Object>) matrixVars;
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Only apply to versions of spring-webmvc that include request mapping information
+        return hasClassNamed("org.springframework.web.servlet.mvc.method.RequestMappingInfo");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isProtected())
+                        .and(named("handleMatch"))
+                        .and(takesArgument(0, named("org.springframework.web.servlet.mvc.method.RequestMappingInfo")))
+                        .and(takesArgument(1, String.class))
+                        .and(takesArgument(2, named("javax.servlet.http.HttpServletRequest")))
+                        .and(takesArguments(3)),
+                TemplateAndMatrixVariablesInstrumentation.class.getName() + "$HandleMatchAdvice");
+    }
+
+    @Override
+    public Advice.PostProcessor.Factory postProcessor() {
+        return postProcessorFactory;
+    }
+
+    public static class HandleMatchAdvice {
+        private static final String URI_TEMPLATE_VARIABLES_ATTRIBUTE =
+                "org.springframework.web.servlet.HandlerMapping.uriTemplateVariables";
+        private static final String MATRIX_VARIABLES_ATTRIBUTE =
+                "org.springframework.web.servlet.HandlerMapping.matrixVariables";
+
+        @SuppressWarnings("Duplicates")
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_MATRIX_PARAMETER)
+        public static void after(
+                @Advice.Argument(2) final HttpServletRequest req, @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
             }
-          }
-
-          if (map != null && !map.isEmpty()) {
-            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-            BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
-                cbp.getCallback(EVENTS.requestPathParams());
-            if (callback != null) {
-              Flow<Void> flow = callback.apply(reqCtx, map);
-              Flow.Action action = flow.getAction();
-              if (action instanceof Flow.Action.RequestBlockingAction) {
-                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-                BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-                if (brf != null) {
-                  brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-                }
-                t =
-                    new BlockingException(
-                        "Blocked request (for RequestMappingInfoHandlerMapping/handleMatch)");
-              }
+            // hacky, but APM instrumentation causes the instrumented method to be called twice
+            if (req.getClass()
+                    .getName()
+                    .equals("datadog.trace.instrumentation.springweb.PathMatchingHttpServletRequestWrapper")) {
+                return;
             }
-          }
-        }
-      }
-
-      { // iast
-        IastContext iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
-        if (iastRequestContext != null) {
-          PropagationModule module = InstrumentationBridge.PROPAGATION;
-          if (module != null) {
-            if (templateVars instanceof Map) {
-              for (Map.Entry<String, String> e : ((Map<String, String>) templateVars).entrySet()) {
-                String parameterName = e.getKey();
-                String value = e.getValue();
-                if (parameterName == null || value == null) {
-                  continue; // should not happen
-                }
-                module.taintString(
-                    iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
-              }
+
+            AgentSpan agentSpan = AgentTracer.activeSpan();
+            if (agentSpan == null) {
+                return;
+            }
+
+            Object templateVars = req.getAttribute(URI_TEMPLATE_VARIABLES_ATTRIBUTE);
+            Object matrixVars = req.getAttribute(MATRIX_VARIABLES_ATTRIBUTE);
+            if (templateVars == null && matrixVars == null) {
+                return;
+            }
+
+            RequestContext reqCtx = agentSpan.getRequestContext();
+            if (reqCtx == null) {
+                return;
             }
 
-            if (matrixVars instanceof Map) {
-              for (Map.Entry<String, Map<String, Iterable<String>>> e :
-                  ((Map<String, Map<String, Iterable<String>>>) matrixVars).entrySet()) {
-                String parameterName = e.getKey();
-                Map<String, Iterable<String>> value = e.getValue();
-                if (parameterName == null || value == null) {
-                  continue;
+            { // appsec
+                Object appSecRequestContext = reqCtx.getData(RequestContextSlot.APPSEC);
+                if (appSecRequestContext != null) {
+
+                    // merge the uri template and matrix variables
+                    Map<String, Object> map = null;
+                    if (templateVars instanceof Map) {
+                        map = (Map<String, Object>) templateVars;
+                    }
+                    if (matrixVars instanceof Map) {
+                        if (map != null) {
+                            map = new HashMap<>(map);
+                            for (Map.Entry<String, Object> e : ((Map<String, Object>) matrixVars).entrySet()) {
+                                String key = e.getKey();
+                                Object curValue = map.get(key);
+                                if (curValue != null) {
+                                    map.put(key, new PairList(curValue, e.getValue()));
+                                } else {
+                                    map.put(key, e.getValue());
+                                }
+                            }
+                        } else {
+                            map = (Map<String, Object>) matrixVars;
+                        }
+                    }
+
+                    if (map != null && !map.isEmpty()) {
+                        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+                        BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
+                                cbp.getCallback(EVENTS.requestPathParams());
+                        if (callback != null) {
+                            Flow<Void> flow = callback.apply(reqCtx, map);
+                            Flow.Action action = flow.getAction();
+                            if (action instanceof Flow.Action.RequestBlockingAction) {
+                                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                                BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+                                if (brf != null) {
+                                    brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                                }
+                                t = new BlockingException(
+                                        "Blocked request (for RequestMappingInfoHandlerMapping/handleMatch)");
+                            }
+                        }
+                    }
                 }
+            }
 
-                for (Map.Entry<String, Iterable<String>> ie : value.entrySet()) {
-                  String innerKey = ie.getKey();
-                  if (innerKey != null) {
-                    module.taintString(
-                        iastRequestContext,
-                        innerKey,
-                        SourceTypes.REQUEST_MATRIX_PARAMETER,
-                        parameterName);
-                  }
-                  Iterable<String> innerValues = ie.getValue();
-                  if (innerValues != null) {
-                    for (String iv : innerValues) {
-                      module.taintString(
-                          iastRequestContext,
-                          iv,
-                          SourceTypes.REQUEST_MATRIX_PARAMETER,
-                          parameterName);
+            { // iast
+                IastContext iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
+                if (iastRequestContext != null) {
+                    PropagationModule module = InstrumentationBridge.PROPAGATION;
+                    if (module != null) {
+                        if (templateVars instanceof Map) {
+                            for (Map.Entry<String, String> e : ((Map<String, String>) templateVars).entrySet()) {
+                                String parameterName = e.getKey();
+                                String value = e.getValue();
+                                if (parameterName == null || value == null) {
+                                    continue; // should not happen
+                                }
+                                module.taintString(
+                                        iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
+                            }
+                        }
+
+                        if (matrixVars instanceof Map) {
+                            for (Map.Entry<String, Map<String, Iterable<String>>> e :
+                                    ((Map<String, Map<String, Iterable<String>>>) matrixVars).entrySet()) {
+                                String parameterName = e.getKey();
+                                Map<String, Iterable<String>> value = e.getValue();
+                                if (parameterName == null || value == null) {
+                                    continue;
+                                }
+
+                                for (Map.Entry<String, Iterable<String>> ie : value.entrySet()) {
+                                    String innerKey = ie.getKey();
+                                    if (innerKey != null) {
+                                        module.taintString(
+                                                iastRequestContext,
+                                                innerKey,
+                                                SourceTypes.REQUEST_MATRIX_PARAMETER,
+                                                parameterName);
+                                    }
+                                    Iterable<String> innerValues = ie.getValue();
+                                    if (innerValues != null) {
+                                        for (String iv : innerValues) {
+                                            module.taintString(
+                                                    iastRequestContext,
+                                                    iv,
+                                                    SourceTypes.REQUEST_MATRIX_PARAMETER,
+                                                    parameterName);
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     }
-                  }
                 }
-              }
             }
-          }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateVariablesUrlHandlerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateVariablesUrlHandlerInstrumentation.java
index cc90713ea2a..eaf58aed549 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateVariablesUrlHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateVariablesUrlHandlerInstrumentation.java
@@ -35,125 +35,123 @@
 /** Obtain template and matrix variables for AbstractUrlHandlerMapping */
 @AutoService(InstrumenterModule.class)
 public class TemplateVariablesUrlHandlerInstrumentation extends InstrumenterModule
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  private Advice.PostProcessor.Factory postProcessorFactory;
+    private Advice.PostProcessor.Factory postProcessorFactory;
 
-  public TemplateVariablesUrlHandlerInstrumentation() {
-    super("spring-web");
-  }
+    public TemplateVariablesUrlHandlerInstrumentation() {
+        super("spring-web");
+    }
+
+    @Override
+    public boolean isApplicable(Set<TargetSystem> enabledSystems) {
+        if (enabledSystems.contains(TargetSystem.IAST)) {
+            postProcessorFactory = IastPostProcessorFactory.INSTANCE;
+            return true;
+        }
+        return enabledSystems.contains(TargetSystem.APPSEC);
+    }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Only apply to versions of spring-webmvc that include request mapping information
+        return hasClassNamed("org.springframework.web.servlet.mvc.method.RequestMappingInfo");
+    }
 
-  @Override
-  public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    if (enabledSystems.contains(TargetSystem.IAST)) {
-      postProcessorFactory = IastPostProcessorFactory.INSTANCE;
-      return true;
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.web.servlet.handler.AbstractUrlHandlerMapping$UriTemplateVariablesHandlerInterceptor";
     }
-    return enabledSystems.contains(TargetSystem.APPSEC);
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Only apply to versions of spring-webmvc that include request mapping information
-    return hasClassNamed("org.springframework.web.servlet.mvc.method.RequestMappingInfo");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.web.servlet.handler.AbstractUrlHandlerMapping$UriTemplateVariablesHandlerInterceptor";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("preHandle"))
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest")))
-            .and(takesArgument(1, named("javax.servlet.http.HttpServletResponse")))
-            .and(takesArgument(2, Object.class)),
-        TemplateVariablesUrlHandlerInstrumentation.class.getName() + "$InterceptorPreHandleAdvice");
-  }
-
-  @Override
-  public Advice.PostProcessor.Factory postProcessor() {
-    return postProcessorFactory;
-  }
-
-  public static class InterceptorPreHandleAdvice {
-    private static final String URI_TEMPLATE_VARIABLES_ATTRIBUTE =
-        "org.springframework.web.servlet.HandlerMapping.uriTemplateVariables";
-
-    @SuppressWarnings("Duplicates")
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PATH_PARAMETER)
-    public static void after(
-        @Advice.Argument(0) final HttpServletRequest req,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
-      AgentSpan agentSpan = AgentTracer.activeSpan();
-      if (agentSpan == null) {
-        return;
-      }
-
-      Object templateVars = req.getAttribute(URI_TEMPLATE_VARIABLES_ATTRIBUTE);
-      if (!(templateVars instanceof Map)) {
-        return;
-      }
-
-      Map<String, String> map = (Map<String, String>) templateVars;
-      if (map.isEmpty()) {
-        return;
-      }
-
-      RequestContext reqCtx = agentSpan.getRequestContext();
-      if (reqCtx == null) {
-        return;
-      }
-
-      { // appsec
-        Object appSecRequestContext = reqCtx.getData(RequestContextSlot.APPSEC);
-        if (appSecRequestContext != null) {
-          CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-          BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
-              cbp.getCallback(EVENTS.requestPathParams());
-          if (callback != null) {
-            Flow<Void> flow = callback.apply(reqCtx, map);
-            Flow.Action action = flow.getAction();
-            if (action instanceof Flow.Action.RequestBlockingAction) {
-              Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-              BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-              if (brf != null) {
-                brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-              }
-              t =
-                  new BlockingException(
-                      "Blocked request (for UriTemplateVariablesHandlerInterceptor/preHandle)");
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("preHandle"))
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest")))
+                        .and(takesArgument(1, named("javax.servlet.http.HttpServletResponse")))
+                        .and(takesArgument(2, Object.class)),
+                TemplateVariablesUrlHandlerInstrumentation.class.getName() + "$InterceptorPreHandleAdvice");
+    }
+
+    @Override
+    public Advice.PostProcessor.Factory postProcessor() {
+        return postProcessorFactory;
+    }
+
+    public static class InterceptorPreHandleAdvice {
+        private static final String URI_TEMPLATE_VARIABLES_ATTRIBUTE =
+                "org.springframework.web.servlet.HandlerMapping.uriTemplateVariables";
+
+        @SuppressWarnings("Duplicates")
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PATH_PARAMETER)
+        public static void after(
+                @Advice.Argument(0) final HttpServletRequest req, @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
             }
-          }
-        }
-      }
-
-      { // iast
-        IastContext iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
-        if (iastRequestContext != null) {
-          PropagationModule module = InstrumentationBridge.PROPAGATION;
-          if (module != null) {
-            for (Map.Entry<String, String> e : map.entrySet()) {
-              String parameterName = e.getKey();
-              String value = e.getValue();
-              if (parameterName == null || value == null) {
-                continue; // should not happen
-              }
-              module.taintString(
-                  iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
+            AgentSpan agentSpan = AgentTracer.activeSpan();
+            if (agentSpan == null) {
+                return;
+            }
+
+            Object templateVars = req.getAttribute(URI_TEMPLATE_VARIABLES_ATTRIBUTE);
+            if (!(templateVars instanceof Map)) {
+                return;
+            }
+
+            Map<String, String> map = (Map<String, String>) templateVars;
+            if (map.isEmpty()) {
+                return;
+            }
+
+            RequestContext reqCtx = agentSpan.getRequestContext();
+            if (reqCtx == null) {
+                return;
+            }
+
+            { // appsec
+                Object appSecRequestContext = reqCtx.getData(RequestContextSlot.APPSEC);
+                if (appSecRequestContext != null) {
+                    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+                    BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
+                            cbp.getCallback(EVENTS.requestPathParams());
+                    if (callback != null) {
+                        Flow<Void> flow = callback.apply(reqCtx, map);
+                        Flow.Action action = flow.getAction();
+                        if (action instanceof Flow.Action.RequestBlockingAction) {
+                            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+                            if (brf != null) {
+                                brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                            }
+                            t = new BlockingException(
+                                    "Blocked request (for UriTemplateVariablesHandlerInterceptor/preHandle)");
+                        }
+                    }
+                }
+            }
+
+            { // iast
+                IastContext iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
+                if (iastRequestContext != null) {
+                    PropagationModule module = InstrumentationBridge.PROPAGATION;
+                    if (module != null) {
+                        for (Map.Entry<String, String> e : map.entrySet()) {
+                            String parameterName = e.getKey();
+                            String value = e.getValue();
+                            if (parameterName == null || value == null) {
+                                continue; // should not happen
+                            }
+                            module.taintString(
+                                    iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/WebApplicationContextInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/WebApplicationContextInstrumentation.java
index 8a01b238a3d..5ec7546277b 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/WebApplicationContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/WebApplicationContextInstrumentation.java
@@ -21,46 +21,41 @@
  */
 @AutoService(InstrumenterModule.class)
 public class WebApplicationContextInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public WebApplicationContextInstrumentation() {
-    super("spring-web", "spring-path-filter");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public WebApplicationContextInstrumentation() {
+        super("spring-web", "spring-path-filter");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.web.context.WebApplicationContext";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.web.context.WebApplicationContext";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("org.springframework.context.support.AbstractApplicationContext"))
-        .and(implementsInterface(named(hierarchyMarkerType())));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("org.springframework.context.support.AbstractApplicationContext"))
+                .and(implementsInterface(named(hierarchyMarkerType())));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("postProcessBeanFactory"))
-            .and(
-                takesArgument(
-                    0,
-                    named(
-                        "org.springframework.beans.factory.config.ConfigurableListableBeanFactory"))),
-        WebApplicationContextInstrumentation.class.getName() + "$FilterInjectingAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("postProcessBeanFactory"))
+                        .and(takesArgument(
+                                0, named("org.springframework.beans.factory.config.ConfigurableListableBeanFactory"))),
+                WebApplicationContextInstrumentation.class.getName() + "$FilterInjectingAdvice");
+    }
 
-  public static class FilterInjectingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) final ConfigurableListableBeanFactory beanFactory) {
-      if (beanFactory instanceof BeanDefinitionRegistry
-          && !beanFactory.containsBean("ddDispatcherFilter")) {
+    public static class FilterInjectingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(0) final ConfigurableListableBeanFactory beanFactory) {
+            if (beanFactory instanceof BeanDefinitionRegistry && !beanFactory.containsBean("ddDispatcherFilter")) {
 
-        ((BeanDefinitionRegistry) beanFactory)
-            .registerBeanDefinition(
-                "ddDispatcherFilter", new HandlerMappingResourceNameFilter.BeanDefinition());
-      }
+                ((BeanDefinitionRegistry) beanFactory)
+                        .registerBeanDefinition(
+                                "ddDispatcherFilter", new HandlerMappingResourceNameFilter.BeanDefinition());
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/datadog/trace/instrumentation/springweb/SingleEndpointController.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/datadog/trace/instrumentation/springweb/SingleEndpointController.java
index 5e2a10d3c1e..aeacb9ccff3 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/datadog/trace/instrumentation/springweb/SingleEndpointController.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/datadog/trace/instrumentation/springweb/SingleEndpointController.java
@@ -8,8 +8,8 @@
 @Controller
 @RequestMapping("/single")
 public class SingleEndpointController {
-  @GetMapping
-  public @ResponseBody String get() {
-    return "Hello World";
-  }
+    @GetMapping
+    public @ResponseBody String get() {
+        return "Hello World";
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/java/datadog/trace/instrumentation/springweb/HandlerSpanKeysTest.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/java/datadog/trace/instrumentation/springweb/HandlerSpanKeysTest.java
index 56a97dd727a..dad7527ba91 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/java/datadog/trace/instrumentation/springweb/HandlerSpanKeysTest.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/java/datadog/trace/instrumentation/springweb/HandlerSpanKeysTest.java
@@ -9,32 +9,32 @@
 import org.junit.jupiter.api.Test;
 
 class HandlerSpanKeysTest {
-  @Test
-  void reusesKeysForTheSameControllerClass() {
-    Pair<String, String> first = handlerSpanKeys(Controller.class);
-    Pair<String, String> second = handlerSpanKeys(Controller.class);
-
-    assertSame(first, second);
-    assertSame(first.getLeft(), second.getLeft());
-    assertSame(first.getRight(), second.getRight());
-    assertEquals(
-        "dd.handler.span.datadog.trace.instrumentation.springweb.HandlerSpanKeysTest$Controller",
-        first.getLeft());
-    assertEquals(first.getLeft() + ".continue", first.getRight());
-  }
-
-  @Test
-  void distinguishesRuntimeControllerClasses() {
-    Pair<String, String> parent = handlerSpanKeys(Controller.class);
-    Pair<String, String> child = handlerSpanKeys(ChildController.class);
-
-    assertNotSame(parent, child);
-    assertEquals(
-        "dd.handler.span.datadog.trace.instrumentation.springweb.HandlerSpanKeysTest$ChildController",
-        child.getLeft());
-  }
-
-  static class Controller {}
-
-  static class ChildController extends Controller {}
+    @Test
+    void reusesKeysForTheSameControllerClass() {
+        Pair<String, String> first = handlerSpanKeys(Controller.class);
+        Pair<String, String> second = handlerSpanKeys(Controller.class);
+
+        assertSame(first, second);
+        assertSame(first.getLeft(), second.getLeft());
+        assertSame(first.getRight(), second.getRight());
+        assertEquals(
+                "dd.handler.span.datadog.trace.instrumentation.springweb.HandlerSpanKeysTest$Controller",
+                first.getLeft());
+        assertEquals(first.getLeft() + ".continue", first.getRight());
+    }
+
+    @Test
+    void distinguishesRuntimeControllerClasses() {
+        Pair<String, String> parent = handlerSpanKeys(Controller.class);
+        Pair<String, String> child = handlerSpanKeys(ChildController.class);
+
+        assertNotSame(parent, child);
+        assertEquals(
+                "dd.handler.span.datadog.trace.instrumentation.springweb.HandlerSpanKeysTest$ChildController",
+                child.getLeft());
+    }
+
+    static class Controller {}
+
+    static class ChildController extends Controller {}
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletWithPathPatternsInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletWithPathPatternsInstrumentation.java
index 82f55dc6eb6..95aced0f576 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletWithPathPatternsInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletWithPathPatternsInstrumentation.java
@@ -22,59 +22,56 @@
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
 @AutoService(InstrumenterModule.class)
-public class AppSecDispatcherServletWithPathPatternsInstrumentation
-    extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+public class AppSecDispatcherServletWithPathPatternsInstrumentation extends InstrumenterModule.AppSec
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public AppSecDispatcherServletWithPathPatternsInstrumentation() {
-    super("spring-web");
-  }
+    public AppSecDispatcherServletWithPathPatternsInstrumentation() {
+        super("spring-web");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.web.servlet.DispatcherServlet";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.web.servlet.DispatcherServlet";
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed(
-        "org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isProtected())
-            .and(named("onRefresh"))
-            .and(takesArgument(0, named("org.springframework.context.ApplicationContext")))
-            .and(takesArguments(1)),
-        AppSecDispatcherServletWithPathPatternsInstrumentation.class.getName()
-            + "$AppSecHandlerMappingAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isProtected())
+                        .and(named("onRefresh"))
+                        .and(takesArgument(0, named("org.springframework.context.ApplicationContext")))
+                        .and(takesArguments(1)),
+                AppSecDispatcherServletWithPathPatternsInstrumentation.class.getName() + "$AppSecHandlerMappingAdvice");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && InstrumenterConfig.get().isApiSecurityEndpointCollectionEnabled();
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && InstrumenterConfig.get().isApiSecurityEndpointCollectionEnabled();
+    }
 
-  public static class AppSecHandlerMappingAdvice {
+    public static class AppSecHandlerMappingAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterRefresh(@Advice.Argument(0) final ApplicationContext springCtx) {
-      final Map<String, RequestMappingHandlerMapping> handlers =
-          springCtx.getBeansOfType(RequestMappingHandlerMapping.class);
-      if (handlers == null || handlers.isEmpty()) {
-        return;
-      }
-      final Map<RequestMappingInfo, HandlerMethod> mappings = new HashMap<>();
-      for (RequestMappingHandlerMapping mapping : handlers.values()) {
-        mappings.putAll(mapping.getHandlerMethods());
-      }
-      if (mappings.isEmpty()) {
-        return;
-      }
-      EndpointCollector.get().supplier(new RequestMappingInfoWithPathPatternsIterator(mappings));
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterRefresh(@Advice.Argument(0) final ApplicationContext springCtx) {
+            final Map<String, RequestMappingHandlerMapping> handlers =
+                    springCtx.getBeansOfType(RequestMappingHandlerMapping.class);
+            if (handlers == null || handlers.isEmpty()) {
+                return;
+            }
+            final Map<RequestMappingInfo, HandlerMethod> mappings = new HashMap<>();
+            for (RequestMappingHandlerMapping mapping : handlers.values()) {
+                mappings.putAll(mapping.getHandlerMethods());
+            }
+            if (mappings.isEmpty()) {
+                return;
+            }
+            EndpointCollector.get().supplier(new RequestMappingInfoWithPathPatternsIterator(mappings));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/EscapeUtilsCallSite.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/EscapeUtilsCallSite.java
index d930664a5bf..dc2acb0001d 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/EscapeUtilsCallSite.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/EscapeUtilsCallSite.java
@@ -12,37 +12,35 @@
 @CallSite(spi = IastCallSites.class)
 public class EscapeUtilsCallSite {
 
-  @CallSite.After(
-      "java.lang.String org.springframework.web.util.HtmlUtils.htmlEscape(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String org.springframework.web.util.JavaScriptUtils.javaScriptEscape(java.lang.String)")
-  public static String afterEscape(
-      @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterEscape threw", e);
-      }
+    @CallSite.After("java.lang.String org.springframework.web.util.HtmlUtils.htmlEscape(java.lang.String)")
+    @CallSite.After("java.lang.String org.springframework.web.util.JavaScriptUtils.javaScriptEscape(java.lang.String)")
+    public static String afterEscape(
+            @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterEscape threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After(
-      "java.lang.String org.springframework.web.util.HtmlUtils.htmlEscape(java.lang.String, java.lang.String)")
-  public static String afterHtmlEscape2(
-      @CallSite.Argument(0) @Nullable final String input,
-      @CallSite.Argument(1) @Nullable final String encoding,
-      @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterHtmlEscape2 threw", e);
-      }
+    @CallSite.After(
+            "java.lang.String org.springframework.web.util.HtmlUtils.htmlEscape(java.lang.String, java.lang.String)")
+    public static String afterHtmlEscape2(
+            @CallSite.Argument(0) @Nullable final String input,
+            @CallSite.Argument(1) @Nullable final String encoding,
+            @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterHtmlEscape2 threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/OrderedServletPathRequestFilter.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/OrderedServletPathRequestFilter.java
index 35a674ca06f..81b9989042a 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/OrderedServletPathRequestFilter.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/OrderedServletPathRequestFilter.java
@@ -7,23 +7,23 @@
 
 public class OrderedServletPathRequestFilter extends DelegatingFilterProxy implements Ordered {
 
-  @Override
-  public int getOrder() {
-    return Ordered.HIGHEST_PRECEDENCE;
-  }
+    @Override
+    public int getOrder() {
+        return Ordered.HIGHEST_PRECEDENCE;
+    }
 
-  public OrderedServletPathRequestFilter() {
-    super(new ServletRequestPathFilter());
-  }
+    public OrderedServletPathRequestFilter() {
+        super(new ServletRequestPathFilter());
+    }
 
-  public static class BeanDefinition extends AnnotatedGenericBeanDefinition {
-    private static final long serialVersionUID = -5117836999188187797L;
+    public static class BeanDefinition extends AnnotatedGenericBeanDefinition {
+        private static final long serialVersionUID = -5117836999188187797L;
 
-    public BeanDefinition() {
-      super(OrderedServletPathRequestFilter.class);
-      // don't call setBeanClassName as it overwrites 'beanClass'
-      setScope(SCOPE_SINGLETON);
-      setLazyInit(true);
+        public BeanDefinition() {
+            super(OrderedServletPathRequestFilter.class);
+            // don't call setBeanClassName as it overwrites 'beanClass'
+            setScope(SCOPE_SINGLETON);
+            setLazyInit(true);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/RequestMappingInfoWithPathPatternsIterator.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/RequestMappingInfoWithPathPatternsIterator.java
index 77db8aa17a8..80668e601ce 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/RequestMappingInfoWithPathPatternsIterator.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/RequestMappingInfoWithPathPatternsIterator.java
@@ -20,99 +20,98 @@
 
 public class RequestMappingInfoWithPathPatternsIterator implements Iterator<Endpoint> {
 
-  private final Map<RequestMappingInfo, HandlerMethod> mappings;
-  private final Queue<Endpoint> queue = new LinkedList<>();
-  private Iterator<Map.Entry<RequestMappingInfo, HandlerMethod>> iterator;
-  private boolean first = true;
+    private final Map<RequestMappingInfo, HandlerMethod> mappings;
+    private final Queue<Endpoint> queue = new LinkedList<>();
+    private Iterator<Map.Entry<RequestMappingInfo, HandlerMethod>> iterator;
+    private boolean first = true;
 
-  public RequestMappingInfoWithPathPatternsIterator(
-      final Map<RequestMappingInfo, HandlerMethod> mappings) {
-    this.mappings = mappings;
-  }
-
-  private Iterator<Map.Entry<RequestMappingInfo, HandlerMethod>> iterator() {
-    if (iterator == null) {
-      iterator = mappings.entrySet().iterator();
+    public RequestMappingInfoWithPathPatternsIterator(final Map<RequestMappingInfo, HandlerMethod> mappings) {
+        this.mappings = mappings;
     }
-    return iterator;
-  }
-
-  @Override
-  public boolean hasNext() {
-    return !queue.isEmpty() || iterator().hasNext();
-  }
 
-  @Override
-  public Endpoint next() {
-    if (queue.isEmpty()) {
-      fetchNext();
-    }
-    final Endpoint endpoint = queue.poll();
-    if (endpoint == null) {
-      throw new NoSuchElementException();
+    private Iterator<Map.Entry<RequestMappingInfo, HandlerMethod>> iterator() {
+        if (iterator == null) {
+            iterator = mappings.entrySet().iterator();
+        }
+        return iterator;
     }
-    return endpoint;
-  }
 
-  private void fetchNext() {
-    final Iterator<Map.Entry<RequestMappingInfo, HandlerMethod>> delegate = iterator();
-    if (!delegate.hasNext()) {
-      return;
+    @Override
+    public boolean hasNext() {
+        return !queue.isEmpty() || iterator().hasNext();
     }
-    final Map.Entry<RequestMappingInfo, HandlerMethod> nextEntry = delegate.next();
-    final RequestMappingInfo nextInfo = nextEntry.getKey();
-    final HandlerMethod nextHandler = nextEntry.getValue();
-    final List<String> requestBody =
-        parseMediaTypes(nextInfo.getConsumesCondition().getExpressions());
-    final List<String> responseBody =
-        parseMediaTypes(nextInfo.getProducesCondition().getExpressions());
-    for (final String path : getPatterns(nextInfo)) {
-      final List<String> methods = Method.parseMethods(nextInfo.getMethodsCondition().getMethods());
-      for (final String method : methods) {
-        final Endpoint endpoint =
-            new Endpoint()
-                .type(Endpoint.Type.REST)
-                .operation(Endpoint.Operation.HTTP_REQUEST)
-                .resource(method + " " + path)
-                .path(path)
-                .method(method)
-                .requestBodyType(requestBody)
-                .responseBodyType(responseBody);
-        if (nextHandler != null) {
-          final Map<String, String> metadata = new HashMap<>();
-          metadata.put("handler", nextHandler.toString());
-          endpoint.metadata(metadata);
+
+    @Override
+    public Endpoint next() {
+        if (queue.isEmpty()) {
+            fetchNext();
         }
-        if (first) {
-          endpoint.first(true);
-          first = false;
+        final Endpoint endpoint = queue.poll();
+        if (endpoint == null) {
+            throw new NoSuchElementException();
         }
-        queue.add(endpoint);
-      }
+        return endpoint;
     }
-  }
 
-  private Set<String> getPatterns(final RequestMappingInfo info) {
-    final Set<String> result = new HashSet<>();
-    final PatternsRequestCondition patternsCondition = info.getPatternsCondition();
-    if (patternsCondition != null) {
-      result.addAll(patternsCondition.getPatterns());
-    }
-    final PathPatternsRequestCondition pathPatternsCondition = info.getPathPatternsCondition();
-    if (pathPatternsCondition != null) {
-      result.addAll(pathPatternsCondition.getPatternValues());
+    private void fetchNext() {
+        final Iterator<Map.Entry<RequestMappingInfo, HandlerMethod>> delegate = iterator();
+        if (!delegate.hasNext()) {
+            return;
+        }
+        final Map.Entry<RequestMappingInfo, HandlerMethod> nextEntry = delegate.next();
+        final RequestMappingInfo nextInfo = nextEntry.getKey();
+        final HandlerMethod nextHandler = nextEntry.getValue();
+        final List<String> requestBody =
+                parseMediaTypes(nextInfo.getConsumesCondition().getExpressions());
+        final List<String> responseBody =
+                parseMediaTypes(nextInfo.getProducesCondition().getExpressions());
+        for (final String path : getPatterns(nextInfo)) {
+            final List<String> methods =
+                    Method.parseMethods(nextInfo.getMethodsCondition().getMethods());
+            for (final String method : methods) {
+                final Endpoint endpoint = new Endpoint()
+                        .type(Endpoint.Type.REST)
+                        .operation(Endpoint.Operation.HTTP_REQUEST)
+                        .resource(method + " " + path)
+                        .path(path)
+                        .method(method)
+                        .requestBodyType(requestBody)
+                        .responseBodyType(responseBody);
+                if (nextHandler != null) {
+                    final Map<String, String> metadata = new HashMap<>();
+                    metadata.put("handler", nextHandler.toString());
+                    endpoint.metadata(metadata);
+                }
+                if (first) {
+                    endpoint.first(true);
+                    first = false;
+                }
+                queue.add(endpoint);
+            }
+        }
     }
-    return result;
-  }
 
-  private List<String> parseMediaTypes(final Set<MediaTypeExpression> expressions) {
-    if (expressions == null || expressions.isEmpty()) {
-      return null;
+    private Set<String> getPatterns(final RequestMappingInfo info) {
+        final Set<String> result = new HashSet<>();
+        final PatternsRequestCondition patternsCondition = info.getPatternsCondition();
+        if (patternsCondition != null) {
+            result.addAll(patternsCondition.getPatterns());
+        }
+        final PathPatternsRequestCondition pathPatternsCondition = info.getPathPatternsCondition();
+        if (pathPatternsCondition != null) {
+            result.addAll(pathPatternsCondition.getPatternValues());
+        }
+        return result;
     }
-    final List<String> result = new ArrayList<>(expressions.size());
-    for (final MediaTypeExpression expression : expressions) {
-      result.add(expression.toString());
+
+    private List<String> parseMediaTypes(final Set<MediaTypeExpression> expressions) {
+        if (expressions == null || expressions.isEmpty()) {
+            return null;
+        }
+        final List<String> result = new ArrayList<>(expressions.size());
+        for (final MediaTypeExpression expression : expressions) {
+            result.add(expression.toString());
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/ServletPathRequestFilterInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/ServletPathRequestFilterInstrumentation.java
index c9e84e755c9..34681077b0f 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/ServletPathRequestFilterInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/ServletPathRequestFilterInstrumentation.java
@@ -22,52 +22,48 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ServletPathRequestFilterInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public ServletPathRequestFilterInstrumentation() {
-    super("spring-web", "spring-path-filter");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public ServletPathRequestFilterInstrumentation() {
+        super("spring-web", "spring-path-filter");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("org.springframework.web.filter.ServletRequestPathFilter")
-        .and(hasClassNamed("javax.servlet.Filter"));
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("org.springframework.web.filter.ServletRequestPathFilter")
+                .and(hasClassNamed("javax.servlet.Filter"));
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.web.context.WebApplicationContext";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.web.context.WebApplicationContext";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("org.springframework.context.support.AbstractApplicationContext"))
-        .and(implementsInterface(named(hierarchyMarkerType())));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("org.springframework.context.support.AbstractApplicationContext"))
+                .and(implementsInterface(named(hierarchyMarkerType())));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("postProcessBeanFactory"))
-            .and(
-                takesArgument(
-                    0,
-                    named(
-                        "org.springframework.beans.factory.config.ConfigurableListableBeanFactory"))),
-        ServletPathRequestFilterInstrumentation.class.getName() + "$FilterInjectingAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("postProcessBeanFactory"))
+                        .and(takesArgument(
+                                0, named("org.springframework.beans.factory.config.ConfigurableListableBeanFactory"))),
+                ServletPathRequestFilterInstrumentation.class.getName() + "$FilterInjectingAdvice");
+    }
 
-  public static class FilterInjectingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) final ConfigurableListableBeanFactory beanFactory) {
-      if (beanFactory instanceof BeanDefinitionRegistry
-          && !beanFactory.containsBean("servletPathRequestFilter")) {
+    public static class FilterInjectingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(0) final ConfigurableListableBeanFactory beanFactory) {
+            if (beanFactory instanceof BeanDefinitionRegistry
+                    && !beanFactory.containsBean("servletPathRequestFilter")) {
 
-        ((BeanDefinitionRegistry) beanFactory)
-            .registerBeanDefinition(
-                "servletPathRequestFilter", new OrderedServletPathRequestFilter.BeanDefinition());
-      }
+                ((BeanDefinitionRegistry) beanFactory)
+                        .registerBeanDefinition(
+                                "servletPathRequestFilter", new OrderedServletPathRequestFilter.BeanDefinition());
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/test/java/foo/bar/TestEscapeUtilsSuite.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/test/java/foo/bar/TestEscapeUtilsSuite.java
index 47ca737e725..9ff36fdfcc9 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/test/java/foo/bar/TestEscapeUtilsSuite.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/test/java/foo/bar/TestEscapeUtilsSuite.java
@@ -5,15 +5,15 @@
 
 public class TestEscapeUtilsSuite {
 
-  public static String htmlEscape(String input) {
-    return HtmlUtils.htmlEscape(input);
-  }
+    public static String htmlEscape(String input) {
+        return HtmlUtils.htmlEscape(input);
+    }
 
-  public static String htmlEscape(String input, String encoding) {
-    return HtmlUtils.htmlEscape(input, encoding);
-  }
+    public static String htmlEscape(String input, String encoding) {
+        return HtmlUtils.htmlEscape(input, encoding);
+    }
 
-  public static String javaScriptEscape(String input) {
-    return JavaScriptUtils.javaScriptEscape(input);
-  }
+    public static String javaScriptEscape(String input) {
+        return JavaScriptUtils.javaScriptEscape(input);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/DispatcherServletInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/DispatcherServletInstrumentation.java
index bfe0f775159..0a75d11198c 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/DispatcherServletInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/DispatcherServletInstrumentation.java
@@ -14,45 +14,45 @@
 
 @AutoService(InstrumenterModule.class)
 public final class DispatcherServletInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public DispatcherServletInstrumentation() {
-    super("spring-web");
-  }
+    public DispatcherServletInstrumentation() {
+        super("spring-web");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.web.servlet.DispatcherServlet";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.web.servlet.DispatcherServlet";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".SpringWebHttpServerDecorator", packageName + ".ServletRequestURIAdapter",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".SpringWebHttpServerDecorator", packageName + ".ServletRequestURIAdapter",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isProtected())
-            .and(named("getHandler"))
-            .and(takesArgument(0, named("jakarta.servlet.http.HttpServletRequest")))
-            .and(takesArguments(1))
-            .and(returns(named("org.springframework.web.servlet.HandlerExecutionChain"))),
-        packageName + ".HandlerMappingAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isProtected())
-            .and(named("render"))
-            .and(takesArgument(0, named("org.springframework.web.servlet.ModelAndView"))),
-        packageName + ".RenderAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isProtected())
-            .and(nameStartsWith("processHandlerException"))
-            .and(takesArgument(3, Exception.class)),
-        packageName + ".ErrorHandlerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isProtected())
+                        .and(named("getHandler"))
+                        .and(takesArgument(0, named("jakarta.servlet.http.HttpServletRequest")))
+                        .and(takesArguments(1))
+                        .and(returns(named("org.springframework.web.servlet.HandlerExecutionChain"))),
+                packageName + ".HandlerMappingAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isProtected())
+                        .and(named("render"))
+                        .and(takesArgument(0, named("org.springframework.web.servlet.ModelAndView"))),
+                packageName + ".RenderAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isProtected())
+                        .and(nameStartsWith("processHandlerException"))
+                        .and(takesArgument(3, Exception.class)),
+                packageName + ".ErrorHandlerAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/HandlerAdapterInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/HandlerAdapterInstrumentation.java
index e0446917176..67e83306e16 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/HandlerAdapterInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/HandlerAdapterInstrumentation.java
@@ -16,37 +16,37 @@
 
 @AutoService(InstrumenterModule.class)
 public final class HandlerAdapterInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-
-  public HandlerAdapterInstrumentation() {
-    super("spring-web");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.web.servlet.HandlerAdapter";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".SpringWebHttpServerDecorator", packageName + ".ServletRequestURIAdapter",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(nameStartsWith("handle"))
-            .and(takesArgument(0, named("jakarta.servlet.http.HttpServletRequest")))
-            .and(takesArguments(3)),
-        packageName + ".ControllerAdvice");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+
+    public HandlerAdapterInstrumentation() {
+        super("spring-web");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.web.servlet.HandlerAdapter";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".SpringWebHttpServerDecorator", packageName + ".ServletRequestURIAdapter",
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(nameStartsWith("handle"))
+                        .and(takesArgument(0, named("jakarta.servlet.http.HttpServletRequest")))
+                        .and(takesArguments(3)),
+                packageName + ".ControllerAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/InvocableHandlerMethodInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/InvocableHandlerMethodInstrumentation.java
index b74163d170b..dcaf859e606 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/InvocableHandlerMethodInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/InvocableHandlerMethodInstrumentation.java
@@ -8,26 +8,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class InvocableHandlerMethodInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public InvocableHandlerMethodInstrumentation() {
-    super("spring-web");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public InvocableHandlerMethodInstrumentation() {
+        super("spring-web");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.web.method.support.InvocableHandlerMethod";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.web.method.support.InvocableHandlerMethod";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("invokeForRequest"), packageName + ".WrapContinuableResultAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("invokeForRequest"), packageName + ".WrapContinuableResultAdvice");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".SpringWebHttpServerDecorator", packageName + ".ServletRequestURIAdapter",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".SpringWebHttpServerDecorator", packageName + ".ServletRequestURIAdapter",
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/ResourceNameFilterMappingInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/ResourceNameFilterMappingInstrumentation.java
index 9b1b73a4f62..3d12c399163 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/ResourceNameFilterMappingInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/ResourceNameFilterMappingInstrumentation.java
@@ -18,41 +18,41 @@
  */
 @AutoService(InstrumenterModule.class)
 public final class ResourceNameFilterMappingInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public ResourceNameFilterMappingInstrumentation() {
-    super("spring-web", "spring-path-filter");
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.web.servlet.DispatcherServlet";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".SpringWebHttpServerDecorator",
-      packageName + ".ServletRequestURIAdapter",
-      packageName + ".HandlerMappingResourceNameFilter",
-      packageName + ".HandlerMappingResourceNameFilter$BeanDefinition",
-      packageName + ".PathMatchingHttpServletRequestWrapper",
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isProtected())
-            .and(named("onRefresh"))
-            .and(takesArgument(0, named("org.springframework.context.ApplicationContext")))
-            .and(takesArguments(1)),
-        packageName + ".ResourceNameFilterMappingAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public ResourceNameFilterMappingInstrumentation() {
+        super("spring-web", "spring-path-filter");
+    }
+
+    @Override
+    protected boolean defaultEnabled() {
+        return false;
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.web.servlet.DispatcherServlet";
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".SpringWebHttpServerDecorator",
+            packageName + ".ServletRequestURIAdapter",
+            packageName + ".HandlerMappingResourceNameFilter",
+            packageName + ".HandlerMappingResourceNameFilter$BeanDefinition",
+            packageName + ".PathMatchingHttpServletRequestWrapper",
+        };
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isProtected())
+                        .and(named("onRefresh"))
+                        .and(takesArgument(0, named("org.springframework.context.ApplicationContext")))
+                        .and(takesArguments(1)),
+                packageName + ".ResourceNameFilterMappingAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/ServletPathRequestFilterInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/ServletPathRequestFilterInstrumentation.java
index 784da331cf0..e808f0057bc 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/ServletPathRequestFilterInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/ServletPathRequestFilterInstrumentation.java
@@ -21,51 +21,48 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ServletPathRequestFilterInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public ServletPathRequestFilterInstrumentation() {
-    super("spring-web", "spring-path-filter");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public ServletPathRequestFilterInstrumentation() {
+        super("spring-web", "spring-path-filter");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return false;
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassNamed("org.springframework.web.filter.ServletRequestPathFilter")
-        .and(hasClassNamed("jakarta.servlet.Filter"));
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassNamed("org.springframework.web.filter.ServletRequestPathFilter")
+                .and(hasClassNamed("jakarta.servlet.Filter"));
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.web.context.WebApplicationContext";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.web.context.WebApplicationContext";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("org.springframework.context.support.AbstractApplicationContext"))
-        .and(implementsInterface(named(hierarchyMarkerType())));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("org.springframework.context.support.AbstractApplicationContext"))
+                .and(implementsInterface(named(hierarchyMarkerType())));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".OrderedServletPathRequestFilter",
-      packageName + ".OrderedServletPathRequestFilter$BeanDefinition",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".OrderedServletPathRequestFilter",
+            packageName + ".OrderedServletPathRequestFilter$BeanDefinition",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("postProcessBeanFactory"))
-            .and(
-                takesArgument(
-                    0,
-                    named(
-                        "org.springframework.beans.factory.config.ConfigurableListableBeanFactory"))),
-        packageName + ".ServletPathFilterInjectingAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("postProcessBeanFactory"))
+                        .and(takesArgument(
+                                0, named("org.springframework.beans.factory.config.ConfigurableListableBeanFactory"))),
+                packageName + ".ServletPathFilterInjectingAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/SpringWebCodeOriginInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/SpringWebCodeOriginInstrumentation.java
index cf5e2bb3a72..a93e1934789 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/SpringWebCodeOriginInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/SpringWebCodeOriginInstrumentation.java
@@ -10,21 +10,20 @@
 
 @AutoService(InstrumenterModule.class)
 public class SpringWebCodeOriginInstrumentation extends CodeOriginInstrumentation {
-  private static final String WEB_BIND_ANNOTATION = "org.springframework.web.bind.annotation.";
+    private static final String WEB_BIND_ANNOTATION = "org.springframework.web.bind.annotation.";
 
-  public SpringWebCodeOriginInstrumentation() {
-    super("spring-web-code-origin");
-  }
+    public SpringWebCodeOriginInstrumentation() {
+        super("spring-web-code-origin");
+    }
 
-  @Override
-  protected Set<String> getAnnotations() {
-    return new HashSet<>(
-        asList(
-            WEB_BIND_ANNOTATION + "DeleteMapping",
-            WEB_BIND_ANNOTATION + "GetMapping",
-            WEB_BIND_ANNOTATION + "PatchMapping",
-            WEB_BIND_ANNOTATION + "PostMapping",
-            WEB_BIND_ANNOTATION + "PutMapping",
-            WEB_BIND_ANNOTATION + "RequestMapping"));
-  }
+    @Override
+    protected Set<String> getAnnotations() {
+        return new HashSet<>(asList(
+                WEB_BIND_ANNOTATION + "DeleteMapping",
+                WEB_BIND_ANNOTATION + "GetMapping",
+                WEB_BIND_ANNOTATION + "PatchMapping",
+                WEB_BIND_ANNOTATION + "PostMapping",
+                WEB_BIND_ANNOTATION + "PutMapping",
+                WEB_BIND_ANNOTATION + "RequestMapping"));
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/TemplateAndMatrixVariablesInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/TemplateAndMatrixVariablesInstrumentation.java
index 912c9d78a4a..cea40e41e74 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/TemplateAndMatrixVariablesInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/TemplateAndMatrixVariablesInstrumentation.java
@@ -18,58 +18,56 @@
 /** Obtain template and matrix variables for RequestMappingInfoHandlerMapping. */
 @AutoService(InstrumenterModule.class)
 public class TemplateAndMatrixVariablesInstrumentation extends InstrumenterModule
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  private Advice.PostProcessor.Factory postProcessorFactory;
+    private Advice.PostProcessor.Factory postProcessorFactory;
 
-  public TemplateAndMatrixVariablesInstrumentation() {
-    super("spring-web");
-  }
+    public TemplateAndMatrixVariablesInstrumentation() {
+        super("spring-web");
+    }
 
-  @Override
-  public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    if (enabledSystems.contains(TargetSystem.IAST)) {
-      postProcessorFactory = IastPostProcessorFactory.INSTANCE;
-      return true;
+    @Override
+    public boolean isApplicable(Set<TargetSystem> enabledSystems) {
+        if (enabledSystems.contains(TargetSystem.IAST)) {
+            postProcessorFactory = IastPostProcessorFactory.INSTANCE;
+            return true;
+        }
+        return enabledSystems.contains(TargetSystem.APPSEC);
     }
-    return enabledSystems.contains(TargetSystem.APPSEC);
-  }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Only apply to versions of spring-webmvc that include request mapping information
-    return hasClassNamed("org.springframework.web.servlet.mvc.method.RequestMappingInfo");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Only apply to versions of spring-webmvc that include request mapping information
+        return hasClassNamed("org.springframework.web.servlet.mvc.method.RequestMappingInfo");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isProtected())
-            .and(named("handleMatch"))
-            .and(
-                takesArgument(
-                    0, named("org.springframework.web.servlet.mvc.method.RequestMappingInfo")))
-            .and(takesArgument(1, String.class))
-            .and(takesArgument(2, named("jakarta.servlet.http.HttpServletRequest")))
-            .and(takesArguments(3)),
-        packageName + ".HandleMatchAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isProtected())
+                        .and(named("handleMatch"))
+                        .and(takesArgument(0, named("org.springframework.web.servlet.mvc.method.RequestMappingInfo")))
+                        .and(takesArgument(1, String.class))
+                        .and(takesArgument(2, named("jakarta.servlet.http.HttpServletRequest")))
+                        .and(takesArguments(3)),
+                packageName + ".HandleMatchAdvice");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".PairList",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".PairList",
+        };
+    }
 
-  @Override
-  public Advice.PostProcessor.Factory postProcessor() {
-    return postProcessorFactory;
-  }
+    @Override
+    public Advice.PostProcessor.Factory postProcessor() {
+        return postProcessorFactory;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/TemplateVariablesUrlHandlerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/TemplateVariablesUrlHandlerInstrumentation.java
index 6d99f64cf09..738a200e704 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/TemplateVariablesUrlHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/TemplateVariablesUrlHandlerInstrumentation.java
@@ -18,49 +18,49 @@
 /** Obtain template and matrix variables for AbstractUrlHandlerMapping */
 @AutoService(InstrumenterModule.class)
 public class TemplateVariablesUrlHandlerInstrumentation extends InstrumenterModule
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  private Advice.PostProcessor.Factory postProcessorFactory;
+    private Advice.PostProcessor.Factory postProcessorFactory;
 
-  public TemplateVariablesUrlHandlerInstrumentation() {
-    super("spring-web");
-  }
+    public TemplateVariablesUrlHandlerInstrumentation() {
+        super("spring-web");
+    }
 
-  @Override
-  public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    if (enabledSystems.contains(TargetSystem.IAST)) {
-      postProcessorFactory = IastPostProcessorFactory.INSTANCE;
-      return true;
+    @Override
+    public boolean isApplicable(Set<TargetSystem> enabledSystems) {
+        if (enabledSystems.contains(TargetSystem.IAST)) {
+            postProcessorFactory = IastPostProcessorFactory.INSTANCE;
+            return true;
+        }
+        return enabledSystems.contains(TargetSystem.APPSEC);
     }
-    return enabledSystems.contains(TargetSystem.APPSEC);
-  }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Only apply to versions of spring-webmvc that include request mapping information
-    return hasClassNamed("org.springframework.web.servlet.mvc.method.RequestMappingInfo");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Only apply to versions of spring-webmvc that include request mapping information
+        return hasClassNamed("org.springframework.web.servlet.mvc.method.RequestMappingInfo");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.web.servlet.handler.AbstractUrlHandlerMapping$UriTemplateVariablesHandlerInterceptor";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.web.servlet.handler.AbstractUrlHandlerMapping$UriTemplateVariablesHandlerInterceptor";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("preHandle"))
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("jakarta.servlet.http.HttpServletRequest")))
-            .and(takesArgument(1, named("jakarta.servlet.http.HttpServletResponse")))
-            .and(takesArgument(2, Object.class)),
-        packageName + ".InterceptorPreHandleAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("preHandle"))
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("jakarta.servlet.http.HttpServletRequest")))
+                        .and(takesArgument(1, named("jakarta.servlet.http.HttpServletResponse")))
+                        .and(takesArgument(2, Object.class)),
+                packageName + ".InterceptorPreHandleAdvice");
+    }
 
-  @Override
-  public Advice.PostProcessor.Factory postProcessor() {
-    return postProcessorFactory;
-  }
+    @Override
+    public Advice.PostProcessor.Factory postProcessor() {
+        return postProcessorFactory;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/WebApplicationContextInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/WebApplicationContextInstrumentation.java
index a7c54f26e93..8df9e5f9ccd 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/WebApplicationContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java/datadog/trace/instrumentation/springweb6/WebApplicationContextInstrumentation.java
@@ -20,48 +20,45 @@
  */
 @AutoService(InstrumenterModule.class)
 public class WebApplicationContextInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public WebApplicationContextInstrumentation() {
-    super("spring-web", "spring-path-filter");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public WebApplicationContextInstrumentation() {
+        super("spring-web", "spring-path-filter");
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return false;
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "org.springframework.web.context.WebApplicationContext";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "org.springframework.web.context.WebApplicationContext";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named("org.springframework.context.support.AbstractApplicationContext"))
-        .and(implementsInterface(named(hierarchyMarkerType())));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named("org.springframework.context.support.AbstractApplicationContext"))
+                .and(implementsInterface(named(hierarchyMarkerType())));
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".SpringWebHttpServerDecorator",
-      packageName + ".ServletRequestURIAdapter",
-      packageName + ".HandlerMappingResourceNameFilter",
-      packageName + ".HandlerMappingResourceNameFilter$BeanDefinition",
-      packageName + ".PathMatchingHttpServletRequestWrapper",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".SpringWebHttpServerDecorator",
+            packageName + ".ServletRequestURIAdapter",
+            packageName + ".HandlerMappingResourceNameFilter",
+            packageName + ".HandlerMappingResourceNameFilter$BeanDefinition",
+            packageName + ".PathMatchingHttpServletRequestWrapper",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("postProcessBeanFactory"))
-            .and(
-                takesArgument(
-                    0,
-                    named(
-                        "org.springframework.beans.factory.config.ConfigurableListableBeanFactory"))),
-        packageName + ".FilterInjectingAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("postProcessBeanFactory"))
+                        .and(takesArgument(
+                                0, named("org.springframework.beans.factory.config.ConfigurableListableBeanFactory"))),
+                packageName + ".FilterInjectingAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ControllerAdvice.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ControllerAdvice.java
index 26f37696887..a483dbe1e7e 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ControllerAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ControllerAdvice.java
@@ -18,73 +18,73 @@
 
 public class ControllerAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope nameResourceAndStartSpan(
-      @Advice.Argument(0) final HttpServletRequest request,
-      @Advice.Argument(2) final Object handler,
-      @Advice.Local("handlerSpanKeys") Pair<String, String> handlerSpanKeys) {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope nameResourceAndStartSpan(
+            @Advice.Argument(0) final HttpServletRequest request,
+            @Advice.Argument(2) final Object handler,
+            @Advice.Local("handlerSpanKeys") Pair<String, String> handlerSpanKeys) {
 
-    /*
-    By the time HandlerAdapter.handle runs, every handler mapping kind (annotated and SimpleUrlHandlerMapping via its
-    PathExposingHandlerInterceptor) has populated BEST_MATCHING_PATTERN_ATTRIBUTE.
-    */
-    Object contextObj = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-    if (contextObj instanceof Context) {
-      Context context = (Context) contextObj;
-      AgentSpan parentSpan = spanFromContext(context);
-      if (parentSpan != null) {
-        DECORATE.onRequest(parentSpan, request, request, root());
-      }
-    }
+        /*
+        By the time HandlerAdapter.handle runs, every handler mapping kind (annotated and SimpleUrlHandlerMapping via its
+        PathExposingHandlerInterceptor) has populated BEST_MATCHING_PATTERN_ATTRIBUTE.
+        */
+        Object contextObj = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+        if (contextObj instanceof Context) {
+            Context context = (Context) contextObj;
+            AgentSpan parentSpan = spanFromContext(context);
+            if (parentSpan != null) {
+                DECORATE.onRequest(parentSpan, request, request, root());
+            }
+        }
 
-    if (activeSpan() == null) {
-      return null;
-    }
+        if (activeSpan() == null) {
+            return null;
+        }
 
-    // Now create a span for handler/controller execution.
+        // Now create a span for handler/controller execution.
 
-    final Class<?> handlerClass;
-    if (handler instanceof HandlerMethod) {
-      handlerClass = ((HandlerMethod) handler).getBean().getClass();
-    } else {
-      handlerClass = handler.getClass();
-    }
-    handlerSpanKeys = handlerSpanKeys(handlerClass);
+        final Class<?> handlerClass;
+        if (handler instanceof HandlerMethod) {
+            handlerClass = ((HandlerMethod) handler).getBean().getClass();
+        } else {
+            handlerClass = handler.getClass();
+        }
+        handlerSpanKeys = handlerSpanKeys(handlerClass);
 
-    // If the context already exists, return it
-    final Object existingContext = request.getAttribute(handlerSpanKeys.getLeft());
-    if (existingContext instanceof Context) {
-      return ((Context) existingContext).attach();
-    }
+        // If the context already exists, return it
+        final Object existingContext = request.getAttribute(handlerSpanKeys.getLeft());
+        if (existingContext instanceof Context) {
+            return ((Context) existingContext).attach();
+        }
 
-    final AgentSpan span =
-        startSpan("spring-web-controller", DECORATE.spanName()).setMeasured(true);
-    DECORATE.afterStart(span);
-    DECORATE.onHandle(span, handler);
+        final AgentSpan span =
+                startSpan("spring-web-controller", DECORATE.spanName()).setMeasured(true);
+        DECORATE.afterStart(span);
+        DECORATE.onHandle(span, handler);
 
-    request.setAttribute(handlerSpanKeys.getLeft(), span);
-    return span.attachWithContext();
-  }
-
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void stopSpan(
-      @Advice.Enter final ContextScope scope,
-      @Advice.Argument(0) final HttpServletRequest request,
-      @Advice.Thrown final Throwable throwable,
-      @Advice.Local("handlerSpanKeys") Pair<String, String> handlerSpanKeys) {
-    if (scope == null) {
-      return;
-    }
-    boolean finish = !Boolean.TRUE.equals(request.getAttribute(handlerSpanKeys.getRight()));
-    final AgentSpan span = spanFromContext(scope.context());
-    scope.close();
-    if (throwable != null) {
-      DECORATE.onError(span, throwable);
-      finish = true;
+        request.setAttribute(handlerSpanKeys.getLeft(), span);
+        return span.attachWithContext();
     }
-    if (finish) {
-      DECORATE.beforeFinish(scope.context());
-      span.finish();
+
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void stopSpan(
+            @Advice.Enter final ContextScope scope,
+            @Advice.Argument(0) final HttpServletRequest request,
+            @Advice.Thrown final Throwable throwable,
+            @Advice.Local("handlerSpanKeys") Pair<String, String> handlerSpanKeys) {
+        if (scope == null) {
+            return;
+        }
+        boolean finish = !Boolean.TRUE.equals(request.getAttribute(handlerSpanKeys.getRight()));
+        final AgentSpan span = spanFromContext(scope.context());
+        scope.close();
+        if (throwable != null) {
+            DECORATE.onError(span, throwable);
+            finish = true;
+        }
+        if (finish) {
+            DECORATE.beforeFinish(scope.context());
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ErrorHandlerAdvice.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ErrorHandlerAdvice.java
index 77c6449ae4e..24507f457af 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ErrorHandlerAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ErrorHandlerAdvice.java
@@ -7,17 +7,17 @@
 import net.bytebuddy.asm.Advice;
 
 public class ErrorHandlerAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void nameResource(@Advice.Argument(3) final Exception exception) {
-    final AgentSpan span = activeSpan();
-    if (span != null && exception != null) {
-      boolean alreadyError = span.isError();
-      SpringWebHttpServerDecorator.DECORATE.onError(span, exception);
-      // We want to capture the stacktrace, but that doesn't mean it should be an error.
-      // We rely on a decorator to set the error state based on response code. (5xx -> error)
-      // Status code might not be set though if the span isn't the server span.
-      // Meaning the error won't be set by the status code. (Probably ok since not measured.)
-      span.setError(alreadyError, ErrorPriorities.HTTP_SERVER_DECORATOR);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void nameResource(@Advice.Argument(3) final Exception exception) {
+        final AgentSpan span = activeSpan();
+        if (span != null && exception != null) {
+            boolean alreadyError = span.isError();
+            SpringWebHttpServerDecorator.DECORATE.onError(span, exception);
+            // We want to capture the stacktrace, but that doesn't mean it should be an error.
+            // We rely on a decorator to set the error state based on response code. (5xx -> error)
+            // Status code might not be set though if the span isn't the server span.
+            // Meaning the error won't be set by the status code. (Probably ok since not measured.)
+            span.setError(alreadyError, ErrorPriorities.HTTP_SERVER_DECORATOR);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/FilterInjectingAdvice.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/FilterInjectingAdvice.java
index 0442b2ba567..f60b7809244 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/FilterInjectingAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/FilterInjectingAdvice.java
@@ -5,15 +5,13 @@
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 
 public class FilterInjectingAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void onEnter(
-      @Advice.Argument(0) final ConfigurableListableBeanFactory beanFactory) {
-    if (beanFactory instanceof BeanDefinitionRegistry
-        && !beanFactory.containsBean("ddDispatcherFilter")) {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void onEnter(@Advice.Argument(0) final ConfigurableListableBeanFactory beanFactory) {
+        if (beanFactory instanceof BeanDefinitionRegistry && !beanFactory.containsBean("ddDispatcherFilter")) {
 
-      ((BeanDefinitionRegistry) beanFactory)
-          .registerBeanDefinition(
-              "ddDispatcherFilter", new HandlerMappingResourceNameFilter.BeanDefinition());
+            ((BeanDefinitionRegistry) beanFactory)
+                    .registerBeanDefinition(
+                            "ddDispatcherFilter", new HandlerMappingResourceNameFilter.BeanDefinition());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/HandleMatchAdvice.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/HandleMatchAdvice.java
index 368e91303ad..e918f8eed95 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/HandleMatchAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/HandleMatchAdvice.java
@@ -22,143 +22,141 @@
 import net.bytebuddy.asm.Advice;
 
 public class HandleMatchAdvice {
-  private static final String URI_TEMPLATE_VARIABLES_ATTRIBUTE =
-      "org.springframework.web.servlet.HandlerMapping.uriTemplateVariables";
-  private static final String MATRIX_VARIABLES_ATTRIBUTE =
-      "org.springframework.web.servlet.HandlerMapping.matrixVariables";
+    private static final String URI_TEMPLATE_VARIABLES_ATTRIBUTE =
+            "org.springframework.web.servlet.HandlerMapping.uriTemplateVariables";
+    private static final String MATRIX_VARIABLES_ATTRIBUTE =
+            "org.springframework.web.servlet.HandlerMapping.matrixVariables";
 
-  @SuppressWarnings("Duplicates")
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_PATH_PARAMETER)
-  public static void after(
-      @Advice.Argument(2) final HttpServletRequest req,
-      @Advice.Thrown(readOnly = false) Throwable t) {
-    if (t != null) {
-      return;
-    }
+    @SuppressWarnings("Duplicates")
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_PATH_PARAMETER)
+    public static void after(
+            @Advice.Argument(2) final HttpServletRequest req, @Advice.Thrown(readOnly = false) Throwable t) {
+        if (t != null) {
+            return;
+        }
 
-    // When the opt-in spring-path-filter integration is enabled, the filter resolves the handler
-    // against a PathMatchingHttpServletRequestWrapper, which triggers handleMatch a second time.
-    if (req.getClass()
-        .getName()
-        .equals("datadog.trace.instrumentation.springweb6.PathMatchingHttpServletRequestWrapper")) {
-      return;
-    }
+        // When the opt-in spring-path-filter integration is enabled, the filter resolves the handler
+        // against a PathMatchingHttpServletRequestWrapper, which triggers handleMatch a second time.
+        if (req.getClass()
+                .getName()
+                .equals("datadog.trace.instrumentation.springweb6.PathMatchingHttpServletRequestWrapper")) {
+            return;
+        }
 
-    AgentSpan agentSpan = AgentTracer.activeSpan();
-    if (agentSpan == null) {
-      return;
-    }
+        AgentSpan agentSpan = AgentTracer.activeSpan();
+        if (agentSpan == null) {
+            return;
+        }
 
-    Object templateVars = req.getAttribute(URI_TEMPLATE_VARIABLES_ATTRIBUTE);
-    Object matrixVars = req.getAttribute(MATRIX_VARIABLES_ATTRIBUTE);
-    if (templateVars == null && matrixVars == null) {
-      return;
-    }
+        Object templateVars = req.getAttribute(URI_TEMPLATE_VARIABLES_ATTRIBUTE);
+        Object matrixVars = req.getAttribute(MATRIX_VARIABLES_ATTRIBUTE);
+        if (templateVars == null && matrixVars == null) {
+            return;
+        }
 
-    RequestContext reqCtx = agentSpan.getRequestContext();
-    if (reqCtx == null) {
-      return;
-    }
+        RequestContext reqCtx = agentSpan.getRequestContext();
+        if (reqCtx == null) {
+            return;
+        }
 
-    { // appsec
-      Object appSecRequestContext = reqCtx.getData(RequestContextSlot.APPSEC);
-      if (appSecRequestContext != null) {
+        { // appsec
+            Object appSecRequestContext = reqCtx.getData(RequestContextSlot.APPSEC);
+            if (appSecRequestContext != null) {
 
-        // merge the uri template and matrix variables
-        Map<String, Object> map = null;
-        if (templateVars instanceof Map) {
-          map = (Map<String, Object>) templateVars;
-        }
-        if (matrixVars instanceof Map) {
-          if (map != null) {
-            map = new HashMap<>(map);
-            for (Map.Entry<String, Object> e : ((Map<String, Object>) matrixVars).entrySet()) {
-              String key = e.getKey();
-              Object curValue = map.get(key);
-              if (curValue != null) {
-                map.put(key, new PairList(curValue, e.getValue()));
-              } else {
-                map.put(key, e.getValue());
-              }
-            }
-          } else {
-            map = (Map<String, Object>) matrixVars;
-          }
-        }
+                // merge the uri template and matrix variables
+                Map<String, Object> map = null;
+                if (templateVars instanceof Map) {
+                    map = (Map<String, Object>) templateVars;
+                }
+                if (matrixVars instanceof Map) {
+                    if (map != null) {
+                        map = new HashMap<>(map);
+                        for (Map.Entry<String, Object> e : ((Map<String, Object>) matrixVars).entrySet()) {
+                            String key = e.getKey();
+                            Object curValue = map.get(key);
+                            if (curValue != null) {
+                                map.put(key, new PairList(curValue, e.getValue()));
+                            } else {
+                                map.put(key, e.getValue());
+                            }
+                        }
+                    } else {
+                        map = (Map<String, Object>) matrixVars;
+                    }
+                }
 
-        if (map != null && !map.isEmpty()) {
-          CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-          BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
-              cbp.getCallback(EVENTS.requestPathParams());
-          if (callback != null) {
-            Flow<Void> flow = callback.apply(reqCtx, map);
-            Flow.Action action = flow.getAction();
-            if (action instanceof Flow.Action.RequestBlockingAction) {
-              Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-              BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-              if (brf != null) {
-                brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-              }
-              t =
-                  new BlockingException(
-                      "Blocked request (for RequestMappingInfoHandlerMapping/handleMatch)");
+                if (map != null && !map.isEmpty()) {
+                    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+                    BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
+                            cbp.getCallback(EVENTS.requestPathParams());
+                    if (callback != null) {
+                        Flow<Void> flow = callback.apply(reqCtx, map);
+                        Flow.Action action = flow.getAction();
+                        if (action instanceof Flow.Action.RequestBlockingAction) {
+                            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+                            if (brf != null) {
+                                brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                            }
+                            t = new BlockingException(
+                                    "Blocked request (for RequestMappingInfoHandlerMapping/handleMatch)");
+                        }
+                    }
+                }
             }
-          }
         }
-      }
-    }
 
-    { // iast
-      IastContext iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
-      if (iastRequestContext != null) {
-        PropagationModule module = InstrumentationBridge.PROPAGATION;
-        if (module != null) {
-          if (templateVars instanceof Map) {
-            for (Map.Entry<String, String> e : ((Map<String, String>) templateVars).entrySet()) {
-              String parameterName = e.getKey();
-              String value = e.getValue();
-              if (parameterName == null || value == null) {
-                continue; // should not happen
-              }
-              module.taintString(
-                  iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
-            }
-          }
+        { // iast
+            IastContext iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
+            if (iastRequestContext != null) {
+                PropagationModule module = InstrumentationBridge.PROPAGATION;
+                if (module != null) {
+                    if (templateVars instanceof Map) {
+                        for (Map.Entry<String, String> e : ((Map<String, String>) templateVars).entrySet()) {
+                            String parameterName = e.getKey();
+                            String value = e.getValue();
+                            if (parameterName == null || value == null) {
+                                continue; // should not happen
+                            }
+                            module.taintString(
+                                    iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
+                        }
+                    }
 
-          if (matrixVars instanceof Map) {
-            for (Map.Entry<String, Map<String, Iterable<String>>> e :
-                ((Map<String, Map<String, Iterable<String>>>) matrixVars).entrySet()) {
-              String parameterName = e.getKey();
-              Map<String, Iterable<String>> value = e.getValue();
-              if (parameterName == null || value == null) {
-                continue;
-              }
+                    if (matrixVars instanceof Map) {
+                        for (Map.Entry<String, Map<String, Iterable<String>>> e :
+                                ((Map<String, Map<String, Iterable<String>>>) matrixVars).entrySet()) {
+                            String parameterName = e.getKey();
+                            Map<String, Iterable<String>> value = e.getValue();
+                            if (parameterName == null || value == null) {
+                                continue;
+                            }
 
-              for (Map.Entry<String, Iterable<String>> ie : value.entrySet()) {
-                String innerKey = ie.getKey();
-                if (innerKey != null) {
-                  module.taintString(
-                      iastRequestContext,
-                      innerKey,
-                      SourceTypes.REQUEST_MATRIX_PARAMETER,
-                      parameterName);
-                }
-                Iterable<String> innerValues = ie.getValue();
-                if (innerValues != null) {
-                  for (String iv : innerValues) {
-                    module.taintString(
-                        iastRequestContext,
-                        iv,
-                        SourceTypes.REQUEST_MATRIX_PARAMETER,
-                        parameterName);
-                  }
+                            for (Map.Entry<String, Iterable<String>> ie : value.entrySet()) {
+                                String innerKey = ie.getKey();
+                                if (innerKey != null) {
+                                    module.taintString(
+                                            iastRequestContext,
+                                            innerKey,
+                                            SourceTypes.REQUEST_MATRIX_PARAMETER,
+                                            parameterName);
+                                }
+                                Iterable<String> innerValues = ie.getValue();
+                                if (innerValues != null) {
+                                    for (String iv : innerValues) {
+                                        module.taintString(
+                                                iastRequestContext,
+                                                iv,
+                                                SourceTypes.REQUEST_MATRIX_PARAMETER,
+                                                parameterName);
+                                    }
+                                }
+                            }
+                        }
+                    }
                 }
-              }
             }
-          }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/HandlerMappingAdvice.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/HandlerMappingAdvice.java
index 08783e50a96..adb2499a72b 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/HandlerMappingAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/HandlerMappingAdvice.java
@@ -21,20 +21,19 @@
  */
 public class HandlerMappingAdvice {
 
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void onExit(
-      @Advice.Argument(0) final HttpServletRequest request,
-      @Advice.Return final HandlerExecutionChain chain) {
-    if (chain == null) {
-      // No handler matched (e.g. 404): leave the resource name untouched.
-      return;
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(
+            @Advice.Argument(0) final HttpServletRequest request, @Advice.Return final HandlerExecutionChain chain) {
+        if (chain == null) {
+            // No handler matched (e.g. 404): leave the resource name untouched.
+            return;
+        }
+        final Object contextObj = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+        if (contextObj instanceof Context) {
+            final AgentSpan parentSpan = spanFromContext((Context) contextObj);
+            if (parentSpan != null) {
+                DECORATE.onRequest(parentSpan, request, request, root());
+            }
+        }
     }
-    final Object contextObj = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-    if (contextObj instanceof Context) {
-      final AgentSpan parentSpan = spanFromContext((Context) contextObj);
-      if (parentSpan != null) {
-        DECORATE.onRequest(parentSpan, request, request, root());
-      }
-    }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/HandlerMappingResourceNameFilter.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/HandlerMappingResourceNameFilter.java
index 85fd73633c9..f8ddd390974 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/HandlerMappingResourceNameFilter.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/HandlerMappingResourceNameFilter.java
@@ -24,81 +24,79 @@
 
 public class HandlerMappingResourceNameFilter extends OncePerRequestFilter implements Ordered {
 
-  private static final Logger log = LoggerFactory.getLogger(HandlerMappingResourceNameFilter.class);
-  private final List<HandlerMapping> handlerMappings = new CopyOnWriteArrayList<>();
+    private static final Logger log = LoggerFactory.getLogger(HandlerMappingResourceNameFilter.class);
+    private final List<HandlerMapping> handlerMappings = new CopyOnWriteArrayList<>();
 
-  @Override
-  protected void doFilterInternal(
-      final HttpServletRequest request,
-      final HttpServletResponse response,
-      final FilterChain filterChain)
-      throws ServletException, IOException {
+    @Override
+    protected void doFilterInternal(
+            final HttpServletRequest request, final HttpServletResponse response, final FilterChain filterChain)
+            throws ServletException, IOException {
 
-    final Object contextObj = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
-    if (contextObj instanceof Context) {
-      Context context = (Context) contextObj;
-      AgentSpan parentSpan = AgentSpan.fromContext(context);
-      if (parentSpan != null) {
-        PathMatchingHttpServletRequestWrapper wrappedRequest =
-            new PathMatchingHttpServletRequestWrapper(request);
-        try {
-          if (findMapping(wrappedRequest)) {
-            // Name the parent span based on the matching pattern
-            // Let the parent span resource name be set with the attribute set in findMapping.
-            DECORATE.onRequest(parentSpan, wrappedRequest, wrappedRequest, root());
-          }
-        } catch (final Exception ignored) {
-          // mapping.getHandler() threw exception.  Ignore
+        final Object contextObj = request.getAttribute(DD_CONTEXT_ATTRIBUTE);
+        if (contextObj instanceof Context) {
+            Context context = (Context) contextObj;
+            AgentSpan parentSpan = AgentSpan.fromContext(context);
+            if (parentSpan != null) {
+                PathMatchingHttpServletRequestWrapper wrappedRequest =
+                        new PathMatchingHttpServletRequestWrapper(request);
+                try {
+                    if (findMapping(wrappedRequest)) {
+                        // Name the parent span based on the matching pattern
+                        // Let the parent span resource name be set with the attribute set in findMapping.
+                        DECORATE.onRequest(parentSpan, wrappedRequest, wrappedRequest, root());
+                    }
+                } catch (final Exception ignored) {
+                    // mapping.getHandler() threw exception.  Ignore
+                }
+            }
         }
-      }
-    }
 
-    filterChain.doFilter(request, response);
-  }
+        filterChain.doFilter(request, response);
+    }
 
-  /**
-   * When a HandlerMapping matches a request, it sets HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE
-   * as an attribute on the request. This attribute is read by
-   * SpringWebHttpServerDecorator.onRequest and set as the resource name.
-   */
-  private boolean findMapping(final HttpServletRequest request) throws Exception {
-    for (final HandlerMapping mapping : handlerMappings) {
-      final HandlerExecutionChain handler = mapping.getHandler(request);
-      if (handler != null) {
-        return true;
-      }
+    /**
+     * When a HandlerMapping matches a request, it sets HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE
+     * as an attribute on the request. This attribute is read by
+     * SpringWebHttpServerDecorator.onRequest and set as the resource name.
+     */
+    private boolean findMapping(final HttpServletRequest request) throws Exception {
+        for (final HandlerMapping mapping : handlerMappings) {
+            final HandlerExecutionChain handler = mapping.getHandler(request);
+            if (handler != null) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 
-  public void setHandlerMappings(final List<HandlerMapping> handlerMappings) {
-    for (HandlerMapping handlerMapping : handlerMappings) {
-      if (handlerMapping instanceof RequestMappingInfoHandlerMapping) {
-        if (!this.handlerMappings.contains(handlerMapping)) {
-          this.handlerMappings.add(handlerMapping);
+    public void setHandlerMappings(final List<HandlerMapping> handlerMappings) {
+        for (HandlerMapping handlerMapping : handlerMappings) {
+            if (handlerMapping instanceof RequestMappingInfoHandlerMapping) {
+                if (!this.handlerMappings.contains(handlerMapping)) {
+                    this.handlerMappings.add(handlerMapping);
+                }
+            } else {
+                log.debug(
+                        "discarding handler mapping {} which won't set BEST_MATCHING_PATTERN_ATTRIBUTE",
+                        handlerMapping);
+            }
         }
-      } else {
-        log.debug(
-            "discarding handler mapping {} which won't set BEST_MATCHING_PATTERN_ATTRIBUTE",
-            handlerMapping);
-      }
     }
-  }
 
-  @Override
-  public int getOrder() {
-    // Run after all HIGHEST_PRECEDENCE items
-    return Ordered.HIGHEST_PRECEDENCE + 1;
-  }
+    @Override
+    public int getOrder() {
+        // Run after all HIGHEST_PRECEDENCE items
+        return Ordered.HIGHEST_PRECEDENCE + 1;
+    }
 
-  public static class BeanDefinition extends AnnotatedGenericBeanDefinition {
-    private static final long serialVersionUID = 5623859691503032280L;
+    public static class BeanDefinition extends AnnotatedGenericBeanDefinition {
+        private static final long serialVersionUID = 5623859691503032280L;
 
-    public BeanDefinition() {
-      super(HandlerMappingResourceNameFilter.class);
-      // don't call setBeanClassName as it overwrites 'beanClass'
-      setScope(SCOPE_SINGLETON);
-      setLazyInit(true);
+        public BeanDefinition() {
+            super(HandlerMappingResourceNameFilter.class);
+            // don't call setBeanClassName as it overwrites 'beanClass'
+            setScope(SCOPE_SINGLETON);
+            setLazyInit(true);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/InterceptorPreHandleAdvice.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/InterceptorPreHandleAdvice.java
index 89ac5f23e85..17263f26ed7 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/InterceptorPreHandleAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/InterceptorPreHandleAdvice.java
@@ -21,77 +21,75 @@
 import net.bytebuddy.asm.Advice;
 
 public class InterceptorPreHandleAdvice {
-  private static final String URI_TEMPLATE_VARIABLES_ATTRIBUTE =
-      "org.springframework.web.servlet.HandlerMapping.uriTemplateVariables";
+    private static final String URI_TEMPLATE_VARIABLES_ATTRIBUTE =
+            "org.springframework.web.servlet.HandlerMapping.uriTemplateVariables";
 
-  @SuppressWarnings("Duplicates")
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_PATH_PARAMETER)
-  public static void after(
-      @Advice.Argument(0) final HttpServletRequest req,
-      @Advice.Thrown(readOnly = false) Throwable t) {
-    if (t != null) {
-      return;
-    }
-    AgentSpan agentSpan = AgentTracer.activeSpan();
-    if (agentSpan == null) {
-      return;
-    }
+    @SuppressWarnings("Duplicates")
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    @Source(SourceTypes.REQUEST_PATH_PARAMETER)
+    public static void after(
+            @Advice.Argument(0) final HttpServletRequest req, @Advice.Thrown(readOnly = false) Throwable t) {
+        if (t != null) {
+            return;
+        }
+        AgentSpan agentSpan = AgentTracer.activeSpan();
+        if (agentSpan == null) {
+            return;
+        }
 
-    Object templateVars = req.getAttribute(URI_TEMPLATE_VARIABLES_ATTRIBUTE);
-    if (!(templateVars instanceof Map)) {
-      return;
-    }
+        Object templateVars = req.getAttribute(URI_TEMPLATE_VARIABLES_ATTRIBUTE);
+        if (!(templateVars instanceof Map)) {
+            return;
+        }
 
-    Map<String, String> map = (Map<String, String>) templateVars;
-    if (map.isEmpty()) {
-      return;
-    }
+        Map<String, String> map = (Map<String, String>) templateVars;
+        if (map.isEmpty()) {
+            return;
+        }
 
-    RequestContext reqCtx = agentSpan.getRequestContext();
-    if (reqCtx == null) {
-      return;
-    }
+        RequestContext reqCtx = agentSpan.getRequestContext();
+        if (reqCtx == null) {
+            return;
+        }
 
-    { // appsec
-      Object appSecRequestContext = reqCtx.getData(RequestContextSlot.APPSEC);
-      if (appSecRequestContext != null) {
-        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-        BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
-            cbp.getCallback(EVENTS.requestPathParams());
-        if (callback != null) {
-          Flow<Void> flow = callback.apply(reqCtx, map);
-          Flow.Action action = flow.getAction();
-          if (action instanceof Flow.Action.RequestBlockingAction) {
-            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-            if (brf != null) {
-              brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+        { // appsec
+            Object appSecRequestContext = reqCtx.getData(RequestContextSlot.APPSEC);
+            if (appSecRequestContext != null) {
+                CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+                BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
+                        cbp.getCallback(EVENTS.requestPathParams());
+                if (callback != null) {
+                    Flow<Void> flow = callback.apply(reqCtx, map);
+                    Flow.Action action = flow.getAction();
+                    if (action instanceof Flow.Action.RequestBlockingAction) {
+                        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                        BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+                        if (brf != null) {
+                            brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                        }
+                        t = new BlockingException(
+                                "Blocked request (for UriTemplateVariablesHandlerInterceptor/preHandle)");
+                    }
+                }
             }
-            t =
-                new BlockingException(
-                    "Blocked request (for UriTemplateVariablesHandlerInterceptor/preHandle)");
-          }
         }
-      }
-    }
 
-    { // iast
-      IastContext iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
-      if (iastRequestContext != null) {
-        PropagationModule module = InstrumentationBridge.PROPAGATION;
-        if (module != null) {
-          for (Map.Entry<String, String> e : map.entrySet()) {
-            String parameterName = e.getKey();
-            String value = e.getValue();
-            if (parameterName == null || value == null) {
-              continue; // should not happen
+        { // iast
+            IastContext iastRequestContext = reqCtx.getData(RequestContextSlot.IAST);
+            if (iastRequestContext != null) {
+                PropagationModule module = InstrumentationBridge.PROPAGATION;
+                if (module != null) {
+                    for (Map.Entry<String, String> e : map.entrySet()) {
+                        String parameterName = e.getKey();
+                        String value = e.getValue();
+                        if (parameterName == null || value == null) {
+                            continue; // should not happen
+                        }
+                        module.taintString(
+                                iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
+                    }
+                }
             }
-            module.taintString(
-                iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
-          }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/OrderedServletPathRequestFilter.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/OrderedServletPathRequestFilter.java
index d0db80e1d7c..ec3c0eb6b0f 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/OrderedServletPathRequestFilter.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/OrderedServletPathRequestFilter.java
@@ -7,23 +7,23 @@
 
 public class OrderedServletPathRequestFilter extends DelegatingFilterProxy implements Ordered {
 
-  @Override
-  public int getOrder() {
-    return Ordered.HIGHEST_PRECEDENCE;
-  }
+    @Override
+    public int getOrder() {
+        return Ordered.HIGHEST_PRECEDENCE;
+    }
 
-  public OrderedServletPathRequestFilter() {
-    super(new ServletRequestPathFilter());
-  }
+    public OrderedServletPathRequestFilter() {
+        super(new ServletRequestPathFilter());
+    }
 
-  public static class BeanDefinition extends AnnotatedGenericBeanDefinition {
-    private static final long serialVersionUID = -5117836999188187797L;
+    public static class BeanDefinition extends AnnotatedGenericBeanDefinition {
+        private static final long serialVersionUID = -5117836999188187797L;
 
-    public BeanDefinition() {
-      super(OrderedServletPathRequestFilter.class);
-      // don't call setBeanClassName as it overwrites 'beanClass'
-      setScope(SCOPE_SINGLETON);
-      setLazyInit(true);
+        public BeanDefinition() {
+            super(OrderedServletPathRequestFilter.class);
+            // don't call setBeanClassName as it overwrites 'beanClass'
+            setScope(SCOPE_SINGLETON);
+            setLazyInit(true);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/PairList.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/PairList.java
index bf3490ee3ad..66cfcd6a339 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/PairList.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/PairList.java
@@ -3,27 +3,27 @@
 import java.util.AbstractList;
 
 public class PairList extends AbstractList<Object> {
-  private final Object obj1;
-  private final Object obj2;
+    private final Object obj1;
+    private final Object obj2;
 
-  public PairList(Object obj1, Object obj2) {
-    this.obj1 = obj1;
-    this.obj2 = obj2;
-  }
+    public PairList(Object obj1, Object obj2) {
+        this.obj1 = obj1;
+        this.obj2 = obj2;
+    }
 
-  @Override
-  public Object get(int index) {
-    if (index == 0) {
-      return obj1;
-    } else if (index == 1) {
-      return obj2;
-    } else {
-      throw new IndexOutOfBoundsException("Valid indices are 0 and 1");
+    @Override
+    public Object get(int index) {
+        if (index == 0) {
+            return obj1;
+        } else if (index == 1) {
+            return obj2;
+        } else {
+            throw new IndexOutOfBoundsException("Valid indices are 0 and 1");
+        }
     }
-  }
 
-  @Override
-  public int size() {
-    return 2;
-  }
+    @Override
+    public int size() {
+        return 2;
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/PathMatchingHttpServletRequestWrapper.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/PathMatchingHttpServletRequestWrapper.java
index 7c0e05f23b9..4a0f3ded10a 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/PathMatchingHttpServletRequestWrapper.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/PathMatchingHttpServletRequestWrapper.java
@@ -6,28 +6,28 @@
 import java.util.Map;
 
 class PathMatchingHttpServletRequestWrapper extends HttpServletRequestWrapper {
-  private final Map<String, Object> localAttributes = new HashMap<>();
+    private final Map<String, Object> localAttributes = new HashMap<>();
 
-  public PathMatchingHttpServletRequestWrapper(HttpServletRequest request) {
-    super(request);
-  }
+    public PathMatchingHttpServletRequestWrapper(HttpServletRequest request) {
+        super(request);
+    }
 
-  @Override
-  public Object getAttribute(String name) {
-    final Object ret = localAttributes.get(name);
-    if (ret == null) {
-      return super.getAttribute(name);
+    @Override
+    public Object getAttribute(String name) {
+        final Object ret = localAttributes.get(name);
+        if (ret == null) {
+            return super.getAttribute(name);
+        }
+        return ret;
     }
-    return ret;
-  }
 
-  @Override
-  public void setAttribute(String name, Object o) {
-    localAttributes.put(name, o);
-  }
+    @Override
+    public void setAttribute(String name, Object o) {
+        localAttributes.put(name, o);
+    }
 
-  @Override
-  public void removeAttribute(String name) {
-    localAttributes.remove(name);
-  }
+    @Override
+    public void removeAttribute(String name) {
+        localAttributes.remove(name);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/RenderAdvice.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/RenderAdvice.java
index 9b9c89e7613..18014a5d72b 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/RenderAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/RenderAdvice.java
@@ -10,21 +10,20 @@
 
 public class RenderAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope onEnter(@Advice.Argument(0) final ModelAndView mv) {
-    final AgentSpan span = startSpan("spring-webmvc", SpringWebHttpServerDecorator.RESPONSE_RENDER);
-    SpringWebHttpServerDecorator.DECORATE_RENDER.afterStart(span);
-    SpringWebHttpServerDecorator.DECORATE_RENDER.onRender(span, mv);
-    return span.attachWithContext();
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope onEnter(@Advice.Argument(0) final ModelAndView mv) {
+        final AgentSpan span = startSpan("spring-webmvc", SpringWebHttpServerDecorator.RESPONSE_RENDER);
+        SpringWebHttpServerDecorator.DECORATE_RENDER.afterStart(span);
+        SpringWebHttpServerDecorator.DECORATE_RENDER.onRender(span, mv);
+        return span.attachWithContext();
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void stopSpan(
-      @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-    final AgentSpan span = spanFromContext(scope.context());
-    SpringWebHttpServerDecorator.DECORATE_RENDER.onError(scope, throwable);
-    SpringWebHttpServerDecorator.DECORATE_RENDER.beforeFinish(scope.context());
-    scope.close();
-    span.finish();
-  }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+        final AgentSpan span = spanFromContext(scope.context());
+        SpringWebHttpServerDecorator.DECORATE_RENDER.onError(scope, throwable);
+        SpringWebHttpServerDecorator.DECORATE_RENDER.beforeFinish(scope.context());
+        scope.close();
+        span.finish();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ResourceNameFilterMappingAdvice.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ResourceNameFilterMappingAdvice.java
index 7794aa0ac15..f749b8b618f 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ResourceNameFilterMappingAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ResourceNameFilterMappingAdvice.java
@@ -13,14 +13,14 @@
  */
 public class ResourceNameFilterMappingAdvice {
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void afterRefresh(
-      @Advice.Argument(0) final ApplicationContext springCtx,
-      @Advice.FieldValue("handlerMappings") final List<HandlerMapping> handlerMappings) {
-    if (handlerMappings != null && springCtx.containsBean("ddDispatcherFilter")) {
-      final HandlerMappingResourceNameFilter filter =
-          (HandlerMappingResourceNameFilter) springCtx.getBean("ddDispatcherFilter");
-      filter.setHandlerMappings(handlerMappings);
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void afterRefresh(
+            @Advice.Argument(0) final ApplicationContext springCtx,
+            @Advice.FieldValue("handlerMappings") final List<HandlerMapping> handlerMappings) {
+        if (handlerMappings != null && springCtx.containsBean("ddDispatcherFilter")) {
+            final HandlerMappingResourceNameFilter filter =
+                    (HandlerMappingResourceNameFilter) springCtx.getBean("ddDispatcherFilter");
+            filter.setHandlerMappings(handlerMappings);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ServletPathFilterInjectingAdvice.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ServletPathFilterInjectingAdvice.java
index 83d1afed091..f6910b9ef7e 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ServletPathFilterInjectingAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ServletPathFilterInjectingAdvice.java
@@ -5,15 +5,13 @@
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 
 public class ServletPathFilterInjectingAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void onEnter(
-      @Advice.Argument(0) final ConfigurableListableBeanFactory beanFactory) {
-    if (beanFactory instanceof BeanDefinitionRegistry
-        && !beanFactory.containsBean("servletPathRequestFilter")) {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void onEnter(@Advice.Argument(0) final ConfigurableListableBeanFactory beanFactory) {
+        if (beanFactory instanceof BeanDefinitionRegistry && !beanFactory.containsBean("servletPathRequestFilter")) {
 
-      ((BeanDefinitionRegistry) beanFactory)
-          .registerBeanDefinition(
-              "servletPathRequestFilter", new OrderedServletPathRequestFilter.BeanDefinition());
+            ((BeanDefinitionRegistry) beanFactory)
+                    .registerBeanDefinition(
+                            "servletPathRequestFilter", new OrderedServletPathRequestFilter.BeanDefinition());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ServletRequestURIAdapter.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ServletRequestURIAdapter.java
index 13d57e29a55..0b2e5d32a96 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ServletRequestURIAdapter.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ServletRequestURIAdapter.java
@@ -4,39 +4,39 @@
 import jakarta.servlet.http.HttpServletRequest;
 
 public final class ServletRequestURIAdapter extends URIRawDataAdapter {
-  private final HttpServletRequest request;
-
-  public ServletRequestURIAdapter(HttpServletRequest request) {
-    this.request = request;
-  }
-
-  @Override
-  public String scheme() {
-    return request.getScheme();
-  }
-
-  @Override
-  public String host() {
-    return request.getServerName();
-  }
-
-  @Override
-  public int port() {
-    return request.getServerPort();
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return request.getRequestURI();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return request.getQueryString();
-  }
+    private final HttpServletRequest request;
+
+    public ServletRequestURIAdapter(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    @Override
+    public String scheme() {
+        return request.getScheme();
+    }
+
+    @Override
+    public String host() {
+        return request.getServerName();
+    }
+
+    @Override
+    public int port() {
+        return request.getServerPort();
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return request.getRequestURI();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return request.getQueryString();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/SpringWebHttpServerDecorator.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/SpringWebHttpServerDecorator.java
index 9037203fa25..7f8b1685829 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/SpringWebHttpServerDecorator.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/SpringWebHttpServerDecorator.java
@@ -22,152 +22,147 @@
 import org.springframework.web.servlet.mvc.Controller;
 
 public class SpringWebHttpServerDecorator
-    extends HttpServerDecorator<HttpServletRequest, HttpServletRequest, HttpServletResponse, Void> {
-
-  private static final String DD_FILTERED_SPRING_ROUTE_ALREADY_APPLIED =
-      "datadog.filter.spring.route.applied";
-
-  private static final CharSequence SPRING_HANDLER = UTF8BytesString.create("spring.handler");
-  public static final CharSequence RESPONSE_RENDER = UTF8BytesString.create("response.render");
-
-  private final CharSequence component;
-
-  public static final SpringWebHttpServerDecorator DECORATE =
-      new SpringWebHttpServerDecorator(UTF8BytesString.create("spring-web-controller"));
-  public static final SpringWebHttpServerDecorator DECORATE_RENDER =
-      new SpringWebHttpServerDecorator(UTF8BytesString.create("spring-webmvc"));
-
-  public static final String DD_HANDLER_SPAN_PREFIX_KEY = "dd.handler.span.";
-  public static final String DD_HANDLER_SPAN_CONTINUE_SUFFIX = ".continue";
-
-  private static final ClassValue<Pair<String, String>> HANDLER_SPAN_KEYS =
-      GenericClassValue.of(
-          type -> {
-            String spanKey = DD_HANDLER_SPAN_PREFIX_KEY + type.getName();
-            return of(spanKey, spanKey + DD_HANDLER_SPAN_CONTINUE_SUFFIX);
-          });
-
-  /** Returns the span attribute key on the left and the continuation attribute key on the right. */
-  public static Pair<String, String> handlerSpanKeys(Class<?> handlerClass) {
-    return HANDLER_SPAN_KEYS.get(handlerClass);
-  }
-
-  public SpringWebHttpServerDecorator(CharSequence component) {
-    this.component = component;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"spring-web"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return component;
-  }
-
-  @Override
-  protected boolean traceAnalyticsDefault() {
-    return false;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Void> getter() {
-    return null;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpServletResponse> responseGetter() {
-    return null;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return SPRING_HANDLER;
-  }
-
-  @Override
-  protected String method(final HttpServletRequest httpServletRequest) {
-    return httpServletRequest.getMethod();
-  }
-
-  @Override
-  protected URIDataAdapter url(final HttpServletRequest httpServletRequest) {
-    return new ServletRequestURIAdapter(httpServletRequest);
-  }
-
-  @Override
-  protected String peerHostIP(final HttpServletRequest httpServletRequest) {
-    return httpServletRequest.getRemoteAddr();
-  }
-
-  @Override
-  protected String getRequestHeader(final HttpServletRequest request, String key) {
-    return request.getHeader(key);
-  }
-
-  @Override
-  protected int peerPort(final HttpServletRequest httpServletRequest) {
-    return httpServletRequest.getRemotePort();
-  }
-
-  @Override
-  protected int status(final HttpServletResponse httpServletResponse) {
-    return httpServletResponse.getStatus();
-  }
-
-  @Override
-  protected void doOnRequest(
-      final AgentSpan span,
-      final HttpServletRequest connection,
-      final HttpServletRequest request,
-      final Context parentContext) {
-    // FIXME: adding a filter to avoid resource name to be overridden on redirect and forwards.
-    // Remove myself when jakarta.servlet will be available
-    if (request != null && request.getAttribute(DD_FILTERED_SPRING_ROUTE_ALREADY_APPLIED) == null) {
-      final String method = request.getMethod();
-      final Object bestMatchingPattern =
-          request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
-      if (method != null && bestMatchingPattern != null && !bestMatchingPattern.equals("/**")) {
-        request.setAttribute(DD_FILTERED_SPRING_ROUTE_ALREADY_APPLIED, true);
-        HTTP_RESOURCE_DECORATOR.withRoute(span, method, bestMatchingPattern.toString());
-      }
-    }
-  }
-
-  public void onHandle(final AgentSpan span, final Object handler) {
-    if (handler instanceof HandlerMethod) {
-      // name span based on the class and method name defined in the handler
-      final Method method = ((HandlerMethod) handler).getMethod();
-      span.setResourceName(
-          DECORATE.spanNameForMethod(method.getDeclaringClass(), method.getName()));
-    } else {
-      span.setResourceName(DECORATE.spanNameForMethod(handler.getClass(), getMethodName(handler)));
-    }
-  }
-
-  private String getMethodName(final Object handler) {
-    if (handler instanceof HttpRequestHandler || handler instanceof Controller) {
-      // org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter
-      // org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter
-      return "handleRequest";
-    } else if (handler instanceof Servlet) {
-      // org.springframework.web.servlet.handler.SimpleServletHandlerAdapter
-      return "service";
-    } else {
-      // perhaps org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter
-      return "<annotation>";
-    }
-  }
-
-  public void onRender(final AgentSpan span, final ModelAndView mv) {
-    final String viewName = mv.getViewName();
-    if (viewName != null) {
-      span.setTag("view.name", viewName);
-      span.setResourceName(viewName);
-    }
-    if (mv.getView() != null) {
-      span.setTag("view.type", className(mv.getView().getClass()));
-    }
-  }
+        extends HttpServerDecorator<HttpServletRequest, HttpServletRequest, HttpServletResponse, Void> {
+
+    private static final String DD_FILTERED_SPRING_ROUTE_ALREADY_APPLIED = "datadog.filter.spring.route.applied";
+
+    private static final CharSequence SPRING_HANDLER = UTF8BytesString.create("spring.handler");
+    public static final CharSequence RESPONSE_RENDER = UTF8BytesString.create("response.render");
+
+    private final CharSequence component;
+
+    public static final SpringWebHttpServerDecorator DECORATE =
+            new SpringWebHttpServerDecorator(UTF8BytesString.create("spring-web-controller"));
+    public static final SpringWebHttpServerDecorator DECORATE_RENDER =
+            new SpringWebHttpServerDecorator(UTF8BytesString.create("spring-webmvc"));
+
+    public static final String DD_HANDLER_SPAN_PREFIX_KEY = "dd.handler.span.";
+    public static final String DD_HANDLER_SPAN_CONTINUE_SUFFIX = ".continue";
+
+    private static final ClassValue<Pair<String, String>> HANDLER_SPAN_KEYS = GenericClassValue.of(type -> {
+        String spanKey = DD_HANDLER_SPAN_PREFIX_KEY + type.getName();
+        return of(spanKey, spanKey + DD_HANDLER_SPAN_CONTINUE_SUFFIX);
+    });
+
+    /** Returns the span attribute key on the left and the continuation attribute key on the right. */
+    public static Pair<String, String> handlerSpanKeys(Class<?> handlerClass) {
+        return HANDLER_SPAN_KEYS.get(handlerClass);
+    }
+
+    public SpringWebHttpServerDecorator(CharSequence component) {
+        this.component = component;
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"spring-web"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return component;
+    }
+
+    @Override
+    protected boolean traceAnalyticsDefault() {
+        return false;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Void> getter() {
+        return null;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpServletResponse> responseGetter() {
+        return null;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return SPRING_HANDLER;
+    }
+
+    @Override
+    protected String method(final HttpServletRequest httpServletRequest) {
+        return httpServletRequest.getMethod();
+    }
+
+    @Override
+    protected URIDataAdapter url(final HttpServletRequest httpServletRequest) {
+        return new ServletRequestURIAdapter(httpServletRequest);
+    }
+
+    @Override
+    protected String peerHostIP(final HttpServletRequest httpServletRequest) {
+        return httpServletRequest.getRemoteAddr();
+    }
+
+    @Override
+    protected String getRequestHeader(final HttpServletRequest request, String key) {
+        return request.getHeader(key);
+    }
+
+    @Override
+    protected int peerPort(final HttpServletRequest httpServletRequest) {
+        return httpServletRequest.getRemotePort();
+    }
+
+    @Override
+    protected int status(final HttpServletResponse httpServletResponse) {
+        return httpServletResponse.getStatus();
+    }
+
+    @Override
+    protected void doOnRequest(
+            final AgentSpan span,
+            final HttpServletRequest connection,
+            final HttpServletRequest request,
+            final Context parentContext) {
+        // FIXME: adding a filter to avoid resource name to be overridden on redirect and forwards.
+        // Remove myself when jakarta.servlet will be available
+        if (request != null && request.getAttribute(DD_FILTERED_SPRING_ROUTE_ALREADY_APPLIED) == null) {
+            final String method = request.getMethod();
+            final Object bestMatchingPattern = request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
+            if (method != null && bestMatchingPattern != null && !bestMatchingPattern.equals("/**")) {
+                request.setAttribute(DD_FILTERED_SPRING_ROUTE_ALREADY_APPLIED, true);
+                HTTP_RESOURCE_DECORATOR.withRoute(span, method, bestMatchingPattern.toString());
+            }
+        }
+    }
+
+    public void onHandle(final AgentSpan span, final Object handler) {
+        if (handler instanceof HandlerMethod) {
+            // name span based on the class and method name defined in the handler
+            final Method method = ((HandlerMethod) handler).getMethod();
+            span.setResourceName(DECORATE.spanNameForMethod(method.getDeclaringClass(), method.getName()));
+        } else {
+            span.setResourceName(DECORATE.spanNameForMethod(handler.getClass(), getMethodName(handler)));
+        }
+    }
+
+    private String getMethodName(final Object handler) {
+        if (handler instanceof HttpRequestHandler || handler instanceof Controller) {
+            // org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter
+            // org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter
+            return "handleRequest";
+        } else if (handler instanceof Servlet) {
+            // org.springframework.web.servlet.handler.SimpleServletHandlerAdapter
+            return "service";
+        } else {
+            // perhaps org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter
+            return "<annotation>";
+        }
+    }
+
+    public void onRender(final AgentSpan span, final ModelAndView mv) {
+        final String viewName = mv.getViewName();
+        if (viewName != null) {
+            span.setTag("view.name", viewName);
+            span.setResourceName(viewName);
+        }
+        if (mv.getView() != null) {
+            span.setTag("view.type", className(mv.getView().getClass()));
+        }
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/WrapContinuableResultAdvice.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/WrapContinuableResultAdvice.java
index f32a22406f3..1eeb059ac33 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/WrapContinuableResultAdvice.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/WrapContinuableResultAdvice.java
@@ -13,33 +13,28 @@
 import org.springframework.web.method.support.InvocableHandlerMethod;
 
 public class WrapContinuableResultAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void after(
-      @Advice.Argument(value = 0, typing = Assigner.Typing.DYNAMIC)
-          final NativeWebRequest nativeWebRequest,
-      @Advice.Return(readOnly = false) Object result,
-      @Advice.This final InvocableHandlerMethod self) {
-    if (!(nativeWebRequest instanceof ServletWebRequest) || !(result instanceof CompletionStage)) {
-      return;
-    }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void after(
+            @Advice.Argument(value = 0, typing = Assigner.Typing.DYNAMIC) final NativeWebRequest nativeWebRequest,
+            @Advice.Return(readOnly = false) Object result,
+            @Advice.This final InvocableHandlerMethod self) {
+        if (!(nativeWebRequest instanceof ServletWebRequest) || !(result instanceof CompletionStage)) {
+            return;
+        }
 
-    ServletWebRequest servletWebRequest = (ServletWebRequest) nativeWebRequest;
-    final Pair<String, String> handlerSpanKeys = handlerSpanKeys(self.getBean().getClass());
+        ServletWebRequest servletWebRequest = (ServletWebRequest) nativeWebRequest;
+        final Pair<String, String> handlerSpanKeys =
+                handlerSpanKeys(self.getBean().getClass());
 
-    if (Boolean.TRUE.equals(
-        servletWebRequest.getAttribute(
-            handlerSpanKeys.getRight(), ServletWebRequest.SCOPE_REQUEST))) {
-      return;
-    }
-    Object span =
-        servletWebRequest.getAttribute(handlerSpanKeys.getLeft(), ServletWebRequest.SCOPE_REQUEST);
-    if (!(span instanceof AgentSpan)) {
-      return;
+        if (Boolean.TRUE.equals(
+                servletWebRequest.getAttribute(handlerSpanKeys.getRight(), ServletWebRequest.SCOPE_REQUEST))) {
+            return;
+        }
+        Object span = servletWebRequest.getAttribute(handlerSpanKeys.getLeft(), ServletWebRequest.SCOPE_REQUEST);
+        if (!(span instanceof AgentSpan)) {
+            return;
+        }
+        servletWebRequest.setAttribute(handlerSpanKeys.getRight(), true, ServletWebRequest.SCOPE_REQUEST);
+        result = ((CompletionStage<?>) result).whenComplete(AsyncResultExtensions.finishSpan((AgentSpan) span));
     }
-    servletWebRequest.setAttribute(
-        handlerSpanKeys.getRight(), true, ServletWebRequest.SCOPE_REQUEST);
-    result =
-        ((CompletionStage<?>) result)
-            .whenComplete(AsyncResultExtensions.finishSpan((AgentSpan) span));
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/test/java/datadog/trace/instrumentation/springweb6/HandlerSpanKeysTest.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/test/java/datadog/trace/instrumentation/springweb6/HandlerSpanKeysTest.java
index 68dd350f755..007e7c2ccdf 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/test/java/datadog/trace/instrumentation/springweb6/HandlerSpanKeysTest.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/test/java/datadog/trace/instrumentation/springweb6/HandlerSpanKeysTest.java
@@ -9,32 +9,32 @@
 import org.junit.jupiter.api.Test;
 
 class HandlerSpanKeysTest {
-  @Test
-  void reusesKeysForTheSameControllerClass() {
-    Pair<String, String> first = handlerSpanKeys(Controller.class);
-    Pair<String, String> second = handlerSpanKeys(Controller.class);
-
-    assertSame(first, second);
-    assertSame(first.getLeft(), second.getLeft());
-    assertSame(first.getRight(), second.getRight());
-    assertEquals(
-        "dd.handler.span.datadog.trace.instrumentation.springweb6.HandlerSpanKeysTest$Controller",
-        first.getLeft());
-    assertEquals(first.getLeft() + ".continue", first.getRight());
-  }
-
-  @Test
-  void distinguishesRuntimeControllerClasses() {
-    Pair<String, String> parent = handlerSpanKeys(Controller.class);
-    Pair<String, String> child = handlerSpanKeys(ChildController.class);
-
-    assertNotSame(parent, child);
-    assertEquals(
-        "dd.handler.span.datadog.trace.instrumentation.springweb6.HandlerSpanKeysTest$ChildController",
-        child.getLeft());
-  }
-
-  static class Controller {}
-
-  static class ChildController extends Controller {}
+    @Test
+    void reusesKeysForTheSameControllerClass() {
+        Pair<String, String> first = handlerSpanKeys(Controller.class);
+        Pair<String, String> second = handlerSpanKeys(Controller.class);
+
+        assertSame(first, second);
+        assertSame(first.getLeft(), second.getLeft());
+        assertSame(first.getRight(), second.getRight());
+        assertEquals(
+                "dd.handler.span.datadog.trace.instrumentation.springweb6.HandlerSpanKeysTest$Controller",
+                first.getLeft());
+        assertEquals(first.getLeft() + ".continue", first.getRight());
+    }
+
+    @Test
+    void distinguishesRuntimeControllerClasses() {
+        Pair<String, String> parent = handlerSpanKeys(Controller.class);
+        Pair<String, String> child = handlerSpanKeys(ChildController.class);
+
+        assertNotSame(parent, child);
+        assertEquals(
+                "dd.handler.span.datadog.trace.instrumentation.springweb6.HandlerSpanKeysTest$ChildController",
+                child.getLeft());
+    }
+
+    static class Controller {}
+
+    static class ChildController extends Controller {}
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/test/java/datadog/trace/instrumentation/springweb6/boot/FailOnHeaderConfig.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/test/java/datadog/trace/instrumentation/springweb6/boot/FailOnHeaderConfig.java
index 654893ffd40..8cd65bc9ee9 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/test/java/datadog/trace/instrumentation/springweb6/boot/FailOnHeaderConfig.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/test/java/datadog/trace/instrumentation/springweb6/boot/FailOnHeaderConfig.java
@@ -6,8 +6,8 @@
 
 @Configuration
 public class FailOnHeaderConfig implements WebMvcConfigurer {
-  @Override
-  public void addInterceptors(final InterceptorRegistry registry) {
-    registry.addInterceptor(new FailOnHeaderInterceptor());
-  }
+    @Override
+    public void addInterceptors(final InterceptorRegistry registry) {
+        registry.addInterceptor(new FailOnHeaderInterceptor());
+    }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/test/java/datadog/trace/instrumentation/springweb6/boot/FailOnHeaderInterceptor.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/test/java/datadog/trace/instrumentation/springweb6/boot/FailOnHeaderInterceptor.java
index 03728a89e4e..bf8d756df5f 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/test/java/datadog/trace/instrumentation/springweb6/boot/FailOnHeaderInterceptor.java
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/test/java/datadog/trace/instrumentation/springweb6/boot/FailOnHeaderInterceptor.java
@@ -10,12 +10,12 @@
  * {@code HandlerMappingAdvice}).
  */
 public class FailOnHeaderInterceptor implements HandlerInterceptor {
-  @Override
-  public boolean preHandle(
-      final HttpServletRequest request, final HttpServletResponse response, final Object handler) {
-    if ("true".equalsIgnoreCase(request.getHeader("fail"))) {
-      throw new RuntimeException("Stop here");
+    @Override
+    public boolean preHandle(
+            final HttpServletRequest request, final HttpServletResponse response, final Object handler) {
+        if ("true".equalsIgnoreCase(request.getHeader("fail"))) {
+            throw new RuntimeException("Stop here");
+        }
+        return true;
     }
-    return true;
-  }
 }
diff --git a/dd-java-agent/instrumentation/spring/spring-ws-2.0/src/main/java/datadog/trace/instrumentation/springws2/MethodEndpointInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-ws-2.0/src/main/java/datadog/trace/instrumentation/springws2/MethodEndpointInstrumentation.java
index ed354a97bcb..a5e9e51ffd1 100644
--- a/dd-java-agent/instrumentation/spring/spring-ws-2.0/src/main/java/datadog/trace/instrumentation/springws2/MethodEndpointInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-ws-2.0/src/main/java/datadog/trace/instrumentation/springws2/MethodEndpointInstrumentation.java
@@ -13,40 +13,39 @@
 
 @AutoService(InstrumenterModule.class)
 public class MethodEndpointInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public MethodEndpointInstrumentation() {
-    super("spring-ws", "spring-ws-2");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public MethodEndpointInstrumentation() {
+        super("spring-ws", "spring-ws-2");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.springframework.ws.server.endpoint.MethodEndpoint";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.springframework.ws.server.endpoint.MethodEndpoint";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // public Object MethodEndpoint.invoke(Object... args)
-    transformer.applyAdvice(
-        isMethod().and(named("invoke")),
-        MethodEndpointInstrumentation.class.getName() + "$InvokeAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // public Object MethodEndpoint.invoke(Object... args)
+        transformer.applyAdvice(
+                isMethod().and(named("invoke")), MethodEndpointInstrumentation.class.getName() + "$InvokeAdvice");
+    }
 
-  public static class InvokeAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void captureUserCodeException(@Advice.Thrown final Throwable throwable) {
-      if (throwable == null) {
-        return;
-      }
-      // Try to get the root span
-      AgentSpan span = activeSpan();
-      if (span != null) {
-        AgentSpan rootSpan = span.getLocalRootSpan();
-        if (rootSpan != null) {
-          span = rootSpan;
+    public static class InvokeAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void captureUserCodeException(@Advice.Thrown final Throwable throwable) {
+            if (throwable == null) {
+                return;
+            }
+            // Try to get the root span
+            AgentSpan span = activeSpan();
+            if (span != null) {
+                AgentSpan rootSpan = span.getLocalRootSpan();
+                if (rootSpan != null) {
+                    span = rootSpan;
+                }
+                // Capture the exception without setting span as errored
+                span.addThrowable(throwable, UNSET);
+            }
         }
-        // Capture the exception without setting span as errored
-        span.addThrowable(throwable, UNSET);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/BulkGetCompletionListener.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/BulkGetCompletionListener.java
index b1cde7639ec..d0879229fcb 100644
--- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/BulkGetCompletionListener.java
+++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/BulkGetCompletionListener.java
@@ -5,24 +5,24 @@
 import net.spy.memcached.internal.BulkGetFuture;
 
 public class BulkGetCompletionListener extends CompletionListener<BulkGetFuture<?>>
-    implements net.spy.memcached.internal.BulkGetCompletionListener {
+        implements net.spy.memcached.internal.BulkGetCompletionListener {
 
-  public BulkGetCompletionListener(final AgentSpan span, final String methodName) {
-    super(span, methodName);
-  }
+    public BulkGetCompletionListener(final AgentSpan span, final String methodName) {
+        super(span, methodName);
+    }
 
-  @Override
-  public void onComplete(final BulkGetFuture<?> future) {
-    closeAsyncSpan(future);
-  }
+    @Override
+    public void onComplete(final BulkGetFuture<?> future) {
+        closeAsyncSpan(future);
+    }
 
-  @Override
-  protected void processResult(final AgentSpan span, final BulkGetFuture<?> future)
-      throws ExecutionException, InterruptedException {
-    /*
-    Note: for now we do not have an affective way of representing results of bulk operations,
-    i.e. we cannot say that we got 4 hits out of 10. So we will just ignore results for now.
-    */
-    future.get();
-  }
+    @Override
+    protected void processResult(final AgentSpan span, final BulkGetFuture<?> future)
+            throws ExecutionException, InterruptedException {
+        /*
+        Note: for now we do not have an affective way of representing results of bulk operations,
+        i.e. we cannot say that we got 4 hits out of 10. So we will just ignore results for now.
+        */
+        future.get();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/CompletionListener.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/CompletionListener.java
index d079b05c342..c3b8d1e34e8 100644
--- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/CompletionListener.java
+++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/CompletionListener.java
@@ -10,61 +10,60 @@
 
 public abstract class CompletionListener<T> {
 
-  static final String DB_COMMAND_CANCELLED = "db.command.cancelled";
-  static final String MEMCACHED_RESULT = "memcached.result";
-  static final String HIT = "hit";
-  static final String MISS = "miss";
+    static final String DB_COMMAND_CANCELLED = "db.command.cancelled";
+    static final String MEMCACHED_RESULT = "memcached.result";
+    static final String HIT = "hit";
+    static final String MISS = "miss";
 
-  private final AgentSpan span;
+    private final AgentSpan span;
 
-  public CompletionListener(final AgentSpan span, final String methodName) {
-    this.span = span;
-    try (final ContextScope scope = activateSpan(span)) {
-      DECORATE.afterStart(span);
-      DECORATE.onOperation(span, methodName);
+    public CompletionListener(final AgentSpan span, final String methodName) {
+        this.span = span;
+        try (final ContextScope scope = activateSpan(span)) {
+            DECORATE.afterStart(span);
+            DECORATE.onOperation(span, methodName);
+        }
     }
-  }
 
-  protected void closeAsyncSpan(final T future) {
-    try (final ContextScope scope = activateSpan(span)) {
-      try {
-        processResult(span, future);
-      } catch (final CancellationException e) {
-        span.setTag(DB_COMMAND_CANCELLED, true);
-      } catch (final ExecutionException e) {
-        if (e.getCause() instanceof CancellationException) {
-          // Looks like underlying OperationFuture wraps CancellationException into
-          // ExecutionException
-          span.setTag(DB_COMMAND_CANCELLED, true);
-        } else {
-          DECORATE.onError(span, e.getCause());
+    protected void closeAsyncSpan(final T future) {
+        try (final ContextScope scope = activateSpan(span)) {
+            try {
+                processResult(span, future);
+            } catch (final CancellationException e) {
+                span.setTag(DB_COMMAND_CANCELLED, true);
+            } catch (final ExecutionException e) {
+                if (e.getCause() instanceof CancellationException) {
+                    // Looks like underlying OperationFuture wraps CancellationException into
+                    // ExecutionException
+                    span.setTag(DB_COMMAND_CANCELLED, true);
+                } else {
+                    DECORATE.onError(span, e.getCause());
+                }
+            } catch (final InterruptedException e) {
+                // Avoid swallowing InterruptedException
+                DECORATE.onError(span, e);
+                Thread.currentThread().interrupt();
+            } catch (final Exception e) {
+                // This should never happen, just in case to make sure we cover all unexpected exceptions
+                DECORATE.onError(span, e);
+            } finally {
+                DECORATE.beforeFinish(span);
+                span.finish();
+            }
         }
-      } catch (final InterruptedException e) {
-        // Avoid swallowing InterruptedException
-        DECORATE.onError(span, e);
-        Thread.currentThread().interrupt();
-      } catch (final Exception e) {
-        // This should never happen, just in case to make sure we cover all unexpected exceptions
-        DECORATE.onError(span, e);
-      } finally {
-        DECORATE.beforeFinish(span);
-        span.finish();
-      }
     }
-  }
 
-  protected void closeSyncSpan(final Throwable thrown) {
-    try (final ContextScope scope = activateSpan(span)) {
-      DECORATE.onError(span, thrown);
-      DECORATE.beforeFinish(span);
-      span.finish();
+    protected void closeSyncSpan(final Throwable thrown) {
+        try (final ContextScope scope = activateSpan(span)) {
+            DECORATE.onError(span, thrown);
+            DECORATE.beforeFinish(span);
+            span.finish();
+        }
     }
-  }
 
-  protected abstract void processResult(AgentSpan span, T future)
-      throws ExecutionException, InterruptedException;
+    protected abstract void processResult(AgentSpan span, T future) throws ExecutionException, InterruptedException;
 
-  protected void setResultTag(final AgentSpan span, final boolean hit) {
-    span.setTag(MEMCACHED_RESULT, hit ? HIT : MISS);
-  }
+    protected void setResultTag(final AgentSpan span, final boolean hit) {
+        span.setTag(MEMCACHED_RESULT, hit ? HIT : MISS);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/GetCompletionListener.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/GetCompletionListener.java
index 75ad77bc077..d8df97cbcc2 100644
--- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/GetCompletionListener.java
+++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/GetCompletionListener.java
@@ -5,20 +5,20 @@
 import net.spy.memcached.internal.GetFuture;
 
 public class GetCompletionListener extends CompletionListener<GetFuture<?>>
-    implements net.spy.memcached.internal.GetCompletionListener {
-  public GetCompletionListener(final AgentSpan span, final String methodName) {
-    super(span, methodName);
-  }
+        implements net.spy.memcached.internal.GetCompletionListener {
+    public GetCompletionListener(final AgentSpan span, final String methodName) {
+        super(span, methodName);
+    }
 
-  @Override
-  public void onComplete(final GetFuture<?> future) {
-    closeAsyncSpan(future);
-  }
+    @Override
+    public void onComplete(final GetFuture<?> future) {
+        closeAsyncSpan(future);
+    }
 
-  @Override
-  protected void processResult(final AgentSpan span, final GetFuture<?> future)
-      throws ExecutionException, InterruptedException {
-    final Object result = future.get();
-    setResultTag(span, result != null);
-  }
+    @Override
+    protected void processResult(final AgentSpan span, final GetFuture<?> future)
+            throws ExecutionException, InterruptedException {
+        final Object result = future.get();
+        setResultTag(span, result != null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcacheClientDecorator.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcacheClientDecorator.java
index 6301d034c7a..95e8e1d413d 100644
--- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcacheClientDecorator.java
+++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcacheClientDecorator.java
@@ -7,66 +7,65 @@
 import datadog.trace.bootstrap.instrumentation.decorator.DBTypeProcessingDatabaseClientDecorator;
 import net.spy.memcached.MemcachedConnection;
 
-public class MemcacheClientDecorator
-    extends DBTypeProcessingDatabaseClientDecorator<MemcachedConnection> {
-  public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("java-spymemcached");
+public class MemcacheClientDecorator extends DBTypeProcessingDatabaseClientDecorator<MemcachedConnection> {
+    public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("java-spymemcached");
 
-  public static final String DB_TYPE = "memcached";
+    public static final String DB_TYPE = "memcached";
 
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cache().service(DB_TYPE);
-  public static final UTF8BytesString OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation(DB_TYPE));
-  public static final MemcacheClientDecorator DECORATE = new MemcacheClientDecorator();
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cache().service(DB_TYPE);
+    public static final UTF8BytesString OPERATION_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation(DB_TYPE));
+    public static final MemcacheClientDecorator DECORATE = new MemcacheClientDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"spymemcached"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"spymemcached"};
+    }
 
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.MEMCACHED;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.MEMCACHED;
+    }
 
-  @Override
-  protected String dbType() {
-    return DB_TYPE;
-  }
+    @Override
+    protected String dbType() {
+        return DB_TYPE;
+    }
 
-  @Override
-  protected String dbUser(final MemcachedConnection session) {
-    return null;
-  }
+    @Override
+    protected String dbUser(final MemcachedConnection session) {
+        return null;
+    }
 
-  @Override
-  protected String dbInstance(final MemcachedConnection connection) {
-    return null;
-  }
+    @Override
+    protected String dbInstance(final MemcachedConnection connection) {
+        return null;
+    }
 
-  @Override
-  protected String dbHostname(MemcachedConnection connection) {
-    return null;
-  }
+    @Override
+    protected String dbHostname(MemcachedConnection connection) {
+        return null;
+    }
 
-  public void onOperation(final AgentSpan span, final String methodName) {
+    public void onOperation(final AgentSpan span, final String methodName) {
 
-    // optimization over string.replaceFirst()
-    StringBuilder builder = new StringBuilder(methodName);
-    if (builder.indexOf("async") == 0) builder.delete(0, "async".length());
-    if (builder.indexOf("CAS") == 0) builder.replace(0, "CAS".length(), "cas");
-    builder.replace(0, 1, String.valueOf(Character.toLowerCase(builder.charAt(0))));
+        // optimization over string.replaceFirst()
+        StringBuilder builder = new StringBuilder(methodName);
+        if (builder.indexOf("async") == 0) builder.delete(0, "async".length());
+        if (builder.indexOf("CAS") == 0) builder.replace(0, "CAS".length(), "cas");
+        builder.replace(0, 1, String.valueOf(Character.toLowerCase(builder.charAt(0))));
 
-    span.setResourceName(builder.toString());
-  }
+        span.setResourceName(builder.toString());
+    }
 }
diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java
index 6cb136669c7..9ada7d6aeb2 100644
--- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java
@@ -25,158 +25,152 @@
 
 @AutoService(InstrumenterModule.class)
 public final class MemcachedClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  private static final String MEMCACHED_PACKAGE = "net.spy.memcached";
-
-  public MemcachedClientInstrumentation() {
-    super("spymemcached");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return MEMCACHED_PACKAGE + ".MemcachedClient";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(returns(named(MEMCACHED_PACKAGE + ".internal.OperationFuture")))
-            /*
-            Flush seems to have a bug when listeners may not be always called.
-            Also tracing flush is probably of a very limited value.
-            */
-            .and(not(named("flush"))),
-        MemcachedClientInstrumentation.class.getName() + "$AsyncOperationAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(returns(named(MEMCACHED_PACKAGE + ".internal.GetFuture"))),
-        MemcachedClientInstrumentation.class.getName() + "$AsyncGetAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(returns(named(MEMCACHED_PACKAGE + ".internal.BulkFuture"))),
-        MemcachedClientInstrumentation.class.getName() + "$AsyncBulkAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(namedOneOf("incr", "decr")),
-        MemcachedClientInstrumentation.class.getName() + "$SyncOperationAdvice");
-  }
-
-  public static class AsyncOperationAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter() {
-      if (CallDepthThreadLocalMap.incrementCallDepth(MemcachedClient.class) > 0) {
-        return null;
-      }
-      return activateSpan(
-          startSpan(COMPONENT_NAME.toString(), MemcacheClientDecorator.OPERATION_NAME));
-    }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Origin("#m") final String methodName,
-        @Advice.Return final OperationFuture future) {
-      if (scope == null) {
-        return;
-      }
-      CallDepthThreadLocalMap.reset(MemcachedClient.class);
-      try (final ContextScope toClose = scope) {
-        if (future != null) {
-          final OperationCompletionListener listener =
-              new OperationCompletionListener(spanFromScope(scope), methodName);
-          future.addListener(listener);
-        }
-      }
+    private static final String MEMCACHED_PACKAGE = "net.spy.memcached";
+
+    public MemcachedClientInstrumentation() {
+        super("spymemcached");
     }
-  }
 
-  public static class AsyncGetAdvice {
+    @Override
+    public String instrumentedType() {
+        return MEMCACHED_PACKAGE + ".MemcachedClient";
+    }
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter() {
-      if (CallDepthThreadLocalMap.incrementCallDepth(MemcachedClient.class) > 0) {
-        return null;
-      }
-      return activateSpan(
-          startSpan(COMPONENT_NAME.toString(), MemcacheClientDecorator.OPERATION_NAME));
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(returns(named(MEMCACHED_PACKAGE + ".internal.OperationFuture")))
+                        /*
+                        Flush seems to have a bug when listeners may not be always called.
+                        Also tracing flush is probably of a very limited value.
+                        */
+                        .and(not(named("flush"))),
+                MemcachedClientInstrumentation.class.getName() + "$AsyncOperationAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(returns(named(MEMCACHED_PACKAGE + ".internal.GetFuture"))),
+                MemcachedClientInstrumentation.class.getName() + "$AsyncGetAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(returns(named(MEMCACHED_PACKAGE + ".internal.BulkFuture"))),
+                MemcachedClientInstrumentation.class.getName() + "$AsyncBulkAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(namedOneOf("incr", "decr")),
+                MemcachedClientInstrumentation.class.getName() + "$SyncOperationAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Origin("#m") final String methodName,
-        @Advice.Return final GetFuture future) {
-      if (scope == null) {
-        return;
-      }
-      CallDepthThreadLocalMap.reset(MemcachedClient.class);
-      try (final ContextScope toClose = scope) {
-        if (future != null) {
-          final GetCompletionListener listener =
-              new GetCompletionListener(spanFromScope(scope), methodName);
-          future.addListener(listener);
+    public static class AsyncOperationAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter() {
+            if (CallDepthThreadLocalMap.incrementCallDepth(MemcachedClient.class) > 0) {
+                return null;
+            }
+            return activateSpan(startSpan(COMPONENT_NAME.toString(), MemcacheClientDecorator.OPERATION_NAME));
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Origin("#m") final String methodName,
+                @Advice.Return final OperationFuture future) {
+            if (scope == null) {
+                return;
+            }
+            CallDepthThreadLocalMap.reset(MemcachedClient.class);
+            try (final ContextScope toClose = scope) {
+                if (future != null) {
+                    final OperationCompletionListener listener =
+                            new OperationCompletionListener(spanFromScope(scope), methodName);
+                    future.addListener(listener);
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class AsyncBulkAdvice {
+    public static class AsyncGetAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter() {
-      if (CallDepthThreadLocalMap.incrementCallDepth(MemcachedClient.class) > 0) {
-        return null;
-      }
-      return activateSpan(
-          startSpan(COMPONENT_NAME.toString(), MemcacheClientDecorator.OPERATION_NAME));
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter() {
+            if (CallDepthThreadLocalMap.incrementCallDepth(MemcachedClient.class) > 0) {
+                return null;
+            }
+            return activateSpan(startSpan(COMPONENT_NAME.toString(), MemcacheClientDecorator.OPERATION_NAME));
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Origin("#m") final String methodName,
-        @Advice.Return final BulkFuture future) {
-      if (scope == null) {
-        return;
-      }
-      CallDepthThreadLocalMap.reset(MemcachedClient.class);
-      try (final ContextScope toClose = scope) {
-        if (future != null) {
-          final BulkGetCompletionListener listener =
-              new BulkGetCompletionListener(spanFromScope(scope), methodName);
-          future.addListener(listener);
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Origin("#m") final String methodName,
+                @Advice.Return final GetFuture future) {
+            if (scope == null) {
+                return;
+            }
+            CallDepthThreadLocalMap.reset(MemcachedClient.class);
+            try (final ContextScope toClose = scope) {
+                if (future != null) {
+                    final GetCompletionListener listener = new GetCompletionListener(spanFromScope(scope), methodName);
+                    future.addListener(listener);
+                }
+            }
         }
-      }
-    }
-  }
-
-  public static class SyncOperationAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static SyncCompletionListener methodEnter(@Advice.Origin("#m") final String methodName) {
-      if (CallDepthThreadLocalMap.incrementCallDepth(MemcachedClient.class) > 0) {
-        return null;
-      }
-      final AgentSpan span =
-          startSpan(COMPONENT_NAME.toString(), MemcacheClientDecorator.OPERATION_NAME);
-      return new SyncCompletionListener(span, methodName);
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final SyncCompletionListener listener,
-        @Advice.Thrown final Throwable thrown) {
-      if (listener == null) {
-        return;
-      }
-      CallDepthThreadLocalMap.reset(MemcachedClient.class);
-      listener.done(thrown);
+    public static class AsyncBulkAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter() {
+            if (CallDepthThreadLocalMap.incrementCallDepth(MemcachedClient.class) > 0) {
+                return null;
+            }
+            return activateSpan(startSpan(COMPONENT_NAME.toString(), MemcacheClientDecorator.OPERATION_NAME));
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Origin("#m") final String methodName,
+                @Advice.Return final BulkFuture future) {
+            if (scope == null) {
+                return;
+            }
+            CallDepthThreadLocalMap.reset(MemcachedClient.class);
+            try (final ContextScope toClose = scope) {
+                if (future != null) {
+                    final BulkGetCompletionListener listener =
+                            new BulkGetCompletionListener(spanFromScope(scope), methodName);
+                    future.addListener(listener);
+                }
+            }
+        }
     }
 
-    public static void muzzleCheck(OperationFuture operationFuture) {
-      // before 2.10.4 futures are not completing correctly. We stick at this as minimum version
-      operationFuture.signalComplete();
+    public static class SyncOperationAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static SyncCompletionListener methodEnter(@Advice.Origin("#m") final String methodName) {
+            if (CallDepthThreadLocalMap.incrementCallDepth(MemcachedClient.class) > 0) {
+                return null;
+            }
+            final AgentSpan span = startSpan(COMPONENT_NAME.toString(), MemcacheClientDecorator.OPERATION_NAME);
+            return new SyncCompletionListener(span, methodName);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final SyncCompletionListener listener, @Advice.Thrown final Throwable thrown) {
+            if (listener == null) {
+                return;
+            }
+            CallDepthThreadLocalMap.reset(MemcachedClient.class);
+            listener.done(thrown);
+        }
+
+        public static void muzzleCheck(OperationFuture operationFuture) {
+            // before 2.10.4 futures are not completing correctly. We stick at this as minimum version
+            operationFuture.signalComplete();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedConnectionInstrumentation.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedConnectionInstrumentation.java
index 664e88f07b9..f105b54c13a 100644
--- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedConnectionInstrumentation.java
+++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedConnectionInstrumentation.java
@@ -17,40 +17,39 @@
 
 @AutoService(InstrumenterModule.class)
 public class MemcachedConnectionInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public MemcachedConnectionInstrumentation() {
-    super("spymemcached");
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("addOperation"))
-            .and(isProtected())
-            .and(takesArgument(0, named("net.spy.memcached.MemcachedNode"))),
-        MemcachedConnectionInstrumentation.class.getName() + "$AddOperationAdvice");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "net.spy.memcached.MemcachedConnection";
-  }
-
-  public static class AddOperationAdvice {
-    @Advice.OnMethodEnter
-    public static void methodEnter(@Advice.Argument(0) final MemcachedNode node) {
-      final AgentSpan span = AgentTracer.activeSpan();
-      if (span != null && node != null && node.getSocketAddress() instanceof InetSocketAddress) {
-        MemcacheClientDecorator.DECORATE.onPeerConnection(
-            span, (InetSocketAddress) node.getSocketAddress());
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public MemcachedConnectionInstrumentation() {
+        super("spymemcached");
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("addOperation"))
+                        .and(isProtected())
+                        .and(takesArgument(0, named("net.spy.memcached.MemcachedNode"))),
+                MemcachedConnectionInstrumentation.class.getName() + "$AddOperationAdvice");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "net.spy.memcached.MemcachedConnection";
     }
 
-    public static void muzzleCheck(OperationFuture operationFuture) {
-      // before 2.10.4 futures are not completing correctly. We stick at this as minimum version
-      operationFuture.signalComplete();
+    public static class AddOperationAdvice {
+        @Advice.OnMethodEnter
+        public static void methodEnter(@Advice.Argument(0) final MemcachedNode node) {
+            final AgentSpan span = AgentTracer.activeSpan();
+            if (span != null && node != null && node.getSocketAddress() instanceof InetSocketAddress) {
+                MemcacheClientDecorator.DECORATE.onPeerConnection(span, (InetSocketAddress) node.getSocketAddress());
+            }
+        }
+
+        public static void muzzleCheck(OperationFuture operationFuture) {
+            // before 2.10.4 futures are not completing correctly. We stick at this as minimum version
+            operationFuture.signalComplete();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/OperationCompletionListener.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/OperationCompletionListener.java
index 80cd3c555b0..6343d3c9071 100644
--- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/OperationCompletionListener.java
+++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/OperationCompletionListener.java
@@ -5,19 +5,19 @@
 import net.spy.memcached.internal.OperationFuture;
 
 public class OperationCompletionListener extends CompletionListener<OperationFuture<?>>
-    implements net.spy.memcached.internal.OperationCompletionListener {
-  public OperationCompletionListener(final AgentSpan span, final String methodName) {
-    super(span, methodName);
-  }
+        implements net.spy.memcached.internal.OperationCompletionListener {
+    public OperationCompletionListener(final AgentSpan span, final String methodName) {
+        super(span, methodName);
+    }
 
-  @Override
-  public void onComplete(final OperationFuture<?> future) {
-    closeAsyncSpan(future);
-  }
+    @Override
+    public void onComplete(final OperationFuture<?> future) {
+        closeAsyncSpan(future);
+    }
 
-  @Override
-  protected void processResult(final AgentSpan span, final OperationFuture<?> future)
-      throws ExecutionException, InterruptedException {
-    future.get();
-  }
+    @Override
+    protected void processResult(final AgentSpan span, final OperationFuture<?> future)
+            throws ExecutionException, InterruptedException {
+        future.get();
+    }
 }
diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/SyncCompletionListener.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/SyncCompletionListener.java
index dbb2db12f8c..df080ee9ce9 100644
--- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/SyncCompletionListener.java
+++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/SyncCompletionListener.java
@@ -8,25 +8,25 @@
 import org.slf4j.LoggerFactory;
 
 public class SyncCompletionListener extends CompletionListener<Void> {
-  private static final Logger log = LoggerFactory.getLogger(SyncCompletionListener.class);
-  private final ContextScope scope;
+    private static final Logger log = LoggerFactory.getLogger(SyncCompletionListener.class);
+    private final ContextScope scope;
 
-  public SyncCompletionListener(final AgentSpan span, final String methodName) {
-    super(span, methodName);
-    scope = AgentTracer.activateSpan(span);
-  }
+    public SyncCompletionListener(final AgentSpan span, final String methodName) {
+        super(span, methodName);
+        scope = AgentTracer.activateSpan(span);
+    }
 
-  @Override
-  protected void processResult(final AgentSpan span, final Void future)
-      throws ExecutionException, InterruptedException {
-    log.error("processResult was called on SyncCompletionListener. This should never happen. ");
-  }
+    @Override
+    protected void processResult(final AgentSpan span, final Void future)
+            throws ExecutionException, InterruptedException {
+        log.error("processResult was called on SyncCompletionListener. This should never happen. ");
+    }
 
-  public void done(final Throwable thrown) {
-    try {
-      closeSyncSpan(thrown);
-    } finally {
-      scope.close();
+    public void done(final Throwable thrown) {
+        try {
+            closeSyncSpan(thrown);
+        } finally {
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/ExtractAdapter.java b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/ExtractAdapter.java
index 90ca852679a..25568a4a13c 100644
--- a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/ExtractAdapter.java
+++ b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/ExtractAdapter.java
@@ -8,34 +8,34 @@
 
 public abstract class ExtractAdapter<T> implements AgentPropagation.ContextVisitor<T> {
 
-  abstract HeaderIterator getHeaders(T carrier);
-
-  @Override
-  public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-    final HeaderIterator headerIterator = getHeaders(carrier);
-    while (headerIterator != null && headerIterator.hasNext()) {
-      Header header = headerIterator.nextHeader();
-      if (!classifier.accept(header.getName(), header.getValue())) {
-        break;
-      }
+    abstract HeaderIterator getHeaders(T carrier);
+
+    @Override
+    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+        final HeaderIterator headerIterator = getHeaders(carrier);
+        while (headerIterator != null && headerIterator.hasNext()) {
+            Header header = headerIterator.nextHeader();
+            if (!classifier.accept(header.getName(), header.getValue())) {
+                break;
+            }
+        }
     }
-  }
 
-  public static final class Request extends ExtractAdapter<HttpRequest> {
-    public static final Request GETTER = new Request();
+    public static final class Request extends ExtractAdapter<HttpRequest> {
+        public static final Request GETTER = new Request();
 
-    @Override
-    HeaderIterator getHeaders(HttpRequest carrier) {
-      return carrier != null ? carrier.headerIterator() : null;
+        @Override
+        HeaderIterator getHeaders(HttpRequest carrier) {
+            return carrier != null ? carrier.headerIterator() : null;
+        }
     }
-  }
 
-  public static final class Response extends ExtractAdapter<HttpResponse> {
-    public static final Response GETTER = new Response();
+    public static final class Response extends ExtractAdapter<HttpResponse> {
+        public static final Response GETTER = new Response();
 
-    @Override
-    HeaderIterator getHeaders(HttpResponse carrier) {
-      return carrier != null ? carrier.headerIterator() : null;
+        @Override
+        HeaderIterator getHeaders(HttpResponse carrier) {
+            return carrier != null ? carrier.headerIterator() : null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientDecorator.java b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientDecorator.java
index 825241fedd6..558c754a47b 100644
--- a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientDecorator.java
+++ b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientDecorator.java
@@ -10,56 +10,55 @@
 import org.apache.http.HttpResponse;
 
 public final class SynapseClientDecorator extends HttpClientDecorator<HttpRequest, HttpResponse> {
-  public static final SynapseClientDecorator DECORATE = new SynapseClientDecorator();
-  public static final CharSequence SYNAPSE_CLIENT = UTF8BytesString.create("synapse-client");
-  public static final CharSequence SYNAPSE_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-  public static final String SYNAPSE_CONTEXT_KEY = "dd.trace.synapse.context";
-  public static final String SYNAPSE_CONTINUATION_KEY = "dd.trace.synapse.continuation";
+    public static final SynapseClientDecorator DECORATE = new SynapseClientDecorator();
+    public static final CharSequence SYNAPSE_CLIENT = UTF8BytesString.create("synapse-client");
+    public static final CharSequence SYNAPSE_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+    public static final String SYNAPSE_CONTEXT_KEY = "dd.trace.synapse.context";
+    public static final String SYNAPSE_CONTINUATION_KEY = "dd.trace.synapse.continuation";
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"synapse3"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"synapse3"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return SYNAPSE_CLIENT;
-  }
+    @Override
+    protected CharSequence component() {
+        return SYNAPSE_CLIENT;
+    }
 
-  @Override
-  protected String method(final HttpRequest request) {
-    return request.getRequestLine().getMethod();
-  }
+    @Override
+    protected String method(final HttpRequest request) {
+        return request.getRequestLine().getMethod();
+    }
 
-  @Override
-  protected URI url(final HttpRequest request) {
-    return URI.create(request.getRequestLine().getUri());
-  }
+    @Override
+    protected URI url(final HttpRequest request) {
+        return URI.create(request.getRequestLine().getUri());
+    }
 
-  @Override
-  protected int status(final HttpResponse response) {
-    if (null != response.getStatusLine()) {
-      return response.getStatusLine().getStatusCode();
+    @Override
+    protected int status(final HttpResponse response) {
+        if (null != response.getStatusLine()) {
+            return response.getStatusLine().getStatusCode();
+        }
+        return UNSET_STATUS;
     }
-    return UNSET_STATUS;
-  }
 
-  @Override
-  protected String getRequestHeader(HttpRequest request, String headerName) {
-    Header header = request.getFirstHeader(headerName);
-    if (null != header) {
-      return header.getValue();
+    @Override
+    protected String getRequestHeader(HttpRequest request, String headerName) {
+        Header header = request.getFirstHeader(headerName);
+        if (null != header) {
+            return header.getValue();
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Override
-  protected String getResponseHeader(HttpResponse response, String headerName) {
-    Header header = response.getFirstHeader(headerName);
-    if (null != header) {
-      return header.getValue();
+    @Override
+    protected String getResponseHeader(HttpResponse response, String headerName) {
+        Header header = response.getFirstHeader(headerName);
+        if (null != header) {
+            return header.getValue();
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java
index 1782aaf6a47..5bc1197f689 100644
--- a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java
@@ -32,166 +32,162 @@
 
 @AutoService(InstrumenterModule.class)
 public final class SynapseClientInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public SynapseClientInstrumentation() {
-    super("synapse3-client", "synapse3");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.synapse.transport.passthru.TargetHandler";
-  }
-
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("requestReady"))
-            .and(takesArgument(0, named("org.apache.http.nio.NHttpClientConnection"))),
-        getClass().getName() + "$ClientRequestAdvice",
-        getClass().getName() + "$ClientRequestContextPropagationAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("responseReceived"))
-            .and(takesArgument(0, named("org.apache.http.nio.NHttpClientConnection"))),
-        getClass().getName() + "$ClientResponseAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("closed", "exception", "timeout"))
-            .and(takesArgument(0, named("org.apache.http.nio.NHttpClientConnection"))),
-        getClass().getName() + "$ClientErrorResponseAdvice");
-  }
-
-  public static final class ClientRequestAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beginRequest(
-        @Advice.Argument(0) final NHttpClientConnection connection) {
-
-      // check for parent span propagated by SynapsePassthruInstrumentation
-      AgentSpan parentSpan = null;
-      MessageContext message = TargetContext.get(connection).getRequestMsgCtx();
-      if (null != message) {
-        parentSpan = (AgentSpan) message.getPropertyNonReplicable(SYNAPSE_CONTEXT_KEY);
-        if (null != parentSpan) {
-          message.removePropertyNonReplicable(SYNAPSE_CONTEXT_KEY);
-        }
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-      AgentSpan span;
-      if (null != parentSpan) {
-        span = startSpan(SYNAPSE_CLIENT.toString(), SYNAPSE_REQUEST, parentSpan.spanContext());
-      } else {
-        span = startSpan(SYNAPSE_CLIENT.toString(), SYNAPSE_REQUEST);
-      }
+    public SynapseClientInstrumentation() {
+        super("synapse3-client", "synapse3");
+    }
 
-      DECORATE.afterStart(span);
+    @Override
+    public String instrumentedType() {
+        return "org.apache.synapse.transport.passthru.TargetHandler";
+    }
 
-      Context context = currentContext().with(span);
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("requestReady"))
+                        .and(takesArgument(0, named("org.apache.http.nio.NHttpClientConnection"))),
+                getClass().getName() + "$ClientRequestAdvice",
+                getClass().getName() + "$ClientRequestContextPropagationAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("responseReceived"))
+                        .and(takesArgument(0, named("org.apache.http.nio.NHttpClientConnection"))),
+                getClass().getName() + "$ClientResponseAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("closed", "exception", "timeout"))
+                        .and(takesArgument(0, named("org.apache.http.nio.NHttpClientConnection"))),
+                getClass().getName() + "$ClientErrorResponseAdvice");
+    }
 
-      // capture context to be finished by one of the various client response advices
-      connection.getContext().setAttribute(SYNAPSE_CONTEXT_KEY, context);
+    public static final class ClientRequestAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beginRequest(@Advice.Argument(0) final NHttpClientConnection connection) {
 
-      return context.attach();
-    }
+            // check for parent span propagated by SynapsePassthruInstrumentation
+            AgentSpan parentSpan = null;
+            MessageContext message = TargetContext.get(connection).getRequestMsgCtx();
+            if (null != message) {
+                parentSpan = (AgentSpan) message.getPropertyNonReplicable(SYNAPSE_CONTEXT_KEY);
+                if (null != parentSpan) {
+                    message.removePropertyNonReplicable(SYNAPSE_CONTEXT_KEY);
+                }
+            }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void requestSubmitted(
-        @Advice.Argument(0) final NHttpClientConnection connection,
-        @Advice.Enter final ContextScope scope) {
-      // populate span using details from the submitted HttpRequest (resolved URI, etc.)
-      AgentSpan span = spanFromContext(scope.context());
-      DECORATE.onRequest(span, TargetContext.getRequest(connection).getRequest());
-
-      // set peer info from the connection since request URIs are relative paths
-      if (connection instanceof HttpInetConnection) {
-        HttpInetConnection inetConn = (HttpInetConnection) connection;
-        DECORATE.onPeerConnection(span, inetConn.getRemoteAddress());
-        DECORATE.setPeerPort(span, inetConn.getRemotePort());
-      }
-      scope.close();
-    }
-  }
-
-  @AppliesOn(CONTEXT_TRACKING)
-  public static final class ClientRequestContextPropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(0) final NHttpClientConnection connection) {
-      AgentSpan span = activeSpan();
-      if (span == null) {
-        return;
-      }
-      defaultPropagator().inject(span, TargetContext.getRequest(connection), SETTER);
+            AgentSpan span;
+            if (null != parentSpan) {
+                span = startSpan(SYNAPSE_CLIENT.toString(), SYNAPSE_REQUEST, parentSpan.spanContext());
+            } else {
+                span = startSpan(SYNAPSE_CLIENT.toString(), SYNAPSE_REQUEST);
+            }
+
+            DECORATE.afterStart(span);
+
+            Context context = currentContext().with(span);
+
+            // capture context to be finished by one of the various client response advices
+            connection.getContext().setAttribute(SYNAPSE_CONTEXT_KEY, context);
+
+            return context.attach();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void requestSubmitted(
+                @Advice.Argument(0) final NHttpClientConnection connection, @Advice.Enter final ContextScope scope) {
+            // populate span using details from the submitted HttpRequest (resolved URI, etc.)
+            AgentSpan span = spanFromContext(scope.context());
+            DECORATE.onRequest(span, TargetContext.getRequest(connection).getRequest());
+
+            // set peer info from the connection since request URIs are relative paths
+            if (connection instanceof HttpInetConnection) {
+                HttpInetConnection inetConn = (HttpInetConnection) connection;
+                DECORATE.onPeerConnection(span, inetConn.getRemoteAddress());
+                DECORATE.setPeerPort(span, inetConn.getRemotePort());
+            }
+            scope.close();
+        }
     }
-  }
-
-  public static final class ClientResponseAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beginResponse(
-        @Advice.Argument(0) final NHttpClientConnection connection) {
-      // don't remove stored context here because the response callback may run multiple times
-      Context context = (Context) connection.getContext().getAttribute(SYNAPSE_CONTEXT_KEY);
-      if (null != context) {
-        return context.attach();
-      }
-      return null;
+
+    @AppliesOn(CONTEXT_TRACKING)
+    public static final class ClientRequestContextPropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(0) final NHttpClientConnection connection) {
+            AgentSpan span = activeSpan();
+            if (span == null) {
+                return;
+            }
+            defaultPropagator().inject(span, TargetContext.getRequest(connection), SETTER);
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void responseReceived(
-        @Advice.Argument(0) final NHttpClientConnection connection,
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable error) {
-      if (null == scope) {
-        return;
-      }
-      final AgentSpan span = spanFromContext(scope.context());
-      final HttpResponse httpResponse = connection.getHttpResponse();
-      boolean isFinal = false;
-      if (httpResponse != null && httpResponse.getStatusLine() != null) {
-        int statusCode = httpResponse.getStatusLine().getStatusCode();
-        // 1xx (e.g. 100 Continue) - not final response
-        isFinal = statusCode >= 200;
-      }
-
-      if (isFinal) {
-        DECORATE.onResponse(span, httpResponse);
-      }
-      if (null != error) {
-        DECORATE.onError(span, error);
-      }
-      if ((isFinal || error != null)
-          && connection.getContext().removeAttribute(SYNAPSE_CONTEXT_KEY) != null) {
-        DECORATE.beforeFinish(scope.context());
-        scope.close();
-        if (span != null) {
-          span.finish();
+    public static final class ClientResponseAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beginResponse(@Advice.Argument(0) final NHttpClientConnection connection) {
+            // don't remove stored context here because the response callback may run multiple times
+            Context context = (Context) connection.getContext().getAttribute(SYNAPSE_CONTEXT_KEY);
+            if (null != context) {
+                return context.attach();
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void responseReceived(
+                @Advice.Argument(0) final NHttpClientConnection connection,
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable error) {
+            if (null == scope) {
+                return;
+            }
+            final AgentSpan span = spanFromContext(scope.context());
+            final HttpResponse httpResponse = connection.getHttpResponse();
+            boolean isFinal = false;
+            if (httpResponse != null && httpResponse.getStatusLine() != null) {
+                int statusCode = httpResponse.getStatusLine().getStatusCode();
+                // 1xx (e.g. 100 Continue) - not final response
+                isFinal = statusCode >= 200;
+            }
+
+            if (isFinal) {
+                DECORATE.onResponse(span, httpResponse);
+            }
+            if (null != error) {
+                DECORATE.onError(span, error);
+            }
+            if ((isFinal || error != null) && connection.getContext().removeAttribute(SYNAPSE_CONTEXT_KEY) != null) {
+                DECORATE.beforeFinish(scope.context());
+                scope.close();
+                if (span != null) {
+                    span.finish();
+                }
+            } else {
+                scope.close();
+            }
         }
-      } else {
-        scope.close();
-      }
     }
-  }
-
-  public static final class ClientErrorResponseAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void errorResponse(
-        @Advice.Argument(0) final NHttpClientConnection connection,
-        @Advice.Argument(value = 1, optional = true) final Object error) {
-      // check and remove context so it won't be finished twice
-      Context context = (Context) connection.getContext().removeAttribute(SYNAPSE_CONTEXT_KEY);
-      AgentSpan span = spanFromContext(context);
-      if (null != span) {
-        if (error instanceof Throwable) {
-          DECORATE.onError(span, (Throwable) error);
-        } else {
-          span.setError(true);
+
+    public static final class ClientErrorResponseAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void errorResponse(
+                @Advice.Argument(0) final NHttpClientConnection connection,
+                @Advice.Argument(value = 1, optional = true) final Object error) {
+            // check and remove context so it won't be finished twice
+            Context context = (Context) connection.getContext().removeAttribute(SYNAPSE_CONTEXT_KEY);
+            AgentSpan span = spanFromContext(context);
+            if (null != span) {
+                if (error instanceof Throwable) {
+                    DECORATE.onError(span, (Throwable) error);
+                } else {
+                    span.setError(true);
+                }
+                DECORATE.beforeFinish(context);
+                span.finish();
+            } else {
+                DECORATE.beforeFinish(context);
+            }
         }
-        DECORATE.beforeFinish(context);
-        span.finish();
-      } else {
-        DECORATE.beforeFinish(context);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientWorkerInstrumentation.java b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientWorkerInstrumentation.java
index 52b5f7577ea..67dec20115b 100644
--- a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientWorkerInstrumentation.java
+++ b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientWorkerInstrumentation.java
@@ -23,71 +23,66 @@
 
 @AutoService(InstrumenterModule.class)
 public final class SynapseClientWorkerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public SynapseClientWorkerInstrumentation() {
-    super("synapse3-client", "synapse3");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.synapse.transport.passthru.ClientWorker";
-  }
-
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(2, named("org.apache.synapse.transport.passthru.TargetResponse"))),
-        getClass().getName() + "$NewClientWorkerAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("run")).and(takesNoArguments()),
-        getClass().getName() + "$ClientWorkerResponseAdvice");
-  }
+    public SynapseClientWorkerInstrumentation() {
+        super("synapse3-client", "synapse3");
+    }
 
-  public static final class NewClientWorkerAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void createWorker(@Advice.Argument(2) final TargetResponse response) {
-      ContextContinuation continuation = currentContext().capture();
-      if (continuation.context() != rootContext()) {
-        response.getConnection().getContext().setAttribute(SYNAPSE_CONTINUATION_KEY, continuation);
-      }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.synapse.transport.passthru.ClientWorker";
     }
-  }
 
-  public static final class ClientWorkerResponseAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beginResponse(
-        @Advice.FieldValue("response") final TargetResponse response) {
-      Object continuation =
-          response.getConnection().getContext().removeAttribute(SYNAPSE_CONTINUATION_KEY);
-      return continuation instanceof ContextContinuation
-          ? ((ContextContinuation) continuation).resume()
-          : null;
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(2, named("org.apache.synapse.transport.passthru.TargetResponse"))),
+                getClass().getName() + "$NewClientWorkerAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("run")).and(takesNoArguments()),
+                getClass().getName() + "$ClientWorkerResponseAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void responseReceived(
-        @Advice.Enter final ContextScope scope,
-        @Advice.FieldValue("response") final TargetResponse response,
-        @Advice.Thrown final Throwable error) {
-      if (null == scope) {
-        return;
-      }
-      AgentSpan span = spanFromContext(scope.context());
-      HttpResponse httpResponse = response.getConnection().getHttpResponse();
+    public static final class NewClientWorkerAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void createWorker(@Advice.Argument(2) final TargetResponse response) {
+            ContextContinuation continuation = currentContext().capture();
+            if (continuation.context() != rootContext()) {
+                response.getConnection().getContext().setAttribute(SYNAPSE_CONTINUATION_KEY, continuation);
+            }
+        }
+    }
 
-      if (null != span) {
-        if (null != httpResponse) {
-          DECORATE.onResponse(span, httpResponse);
+    public static final class ClientWorkerResponseAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beginResponse(@Advice.FieldValue("response") final TargetResponse response) {
+            Object continuation = response.getConnection().getContext().removeAttribute(SYNAPSE_CONTINUATION_KEY);
+            return continuation instanceof ContextContinuation ? ((ContextContinuation) continuation).resume() : null;
         }
-        if (null != error) {
-          DECORATE.onError(span, error);
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void responseReceived(
+                @Advice.Enter final ContextScope scope,
+                @Advice.FieldValue("response") final TargetResponse response,
+                @Advice.Thrown final Throwable error) {
+            if (null == scope) {
+                return;
+            }
+            AgentSpan span = spanFromContext(scope.context());
+            HttpResponse httpResponse = response.getConnection().getHttpResponse();
+
+            if (null != span) {
+                if (null != httpResponse) {
+                    DECORATE.onResponse(span, httpResponse);
+                }
+                if (null != error) {
+                    DECORATE.onError(span, error);
+                }
+            }
+            DECORATE.beforeFinish(scope.context());
+            // no need to finish span because response event (which created the worker) does that
+            scope.close();
         }
-      }
-      DECORATE.beforeFinish(scope.context());
-      // no need to finish span because response event (which created the worker) does that
-      scope.close();
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapsePassthruInstrumentation.java b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapsePassthruInstrumentation.java
index c27d9bf71fb..ed2d067d6f0 100644
--- a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapsePassthruInstrumentation.java
+++ b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapsePassthruInstrumentation.java
@@ -22,62 +22,59 @@
 /** Helps propagate parent spans over 'passthru' mechanism to synapse-client instrumentation. */
 @AutoService(InstrumenterModule.class)
 public final class SynapsePassthruInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public SynapsePassthruInstrumentation() {
-    super("synapse3-client", "synapse3");
-  }
+    public SynapsePassthruInstrumentation() {
+        super("synapse3-client", "synapse3");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.synapse.transport.passthru.DeliveryAgent";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.synapse.transport.passthru.DeliveryAgent";
+    }
 
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("submit"))
-            .and(takesArgument(0, named("org.apache.axis2.context.MessageContext"))),
-        getClass().getName() + "$PassthruAdvice");
-  }
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("submit")).and(takesArgument(0, named("org.apache.axis2.context.MessageContext"))),
+                getClass().getName() + "$PassthruAdvice");
+    }
 
-  public static final class PassthruAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void submit(@Advice.Argument(0) final MessageContext message) {
+    public static final class PassthruAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void submit(@Advice.Argument(0) final MessageContext message) {
 
-      // avoid leaking x-datadog headers from incoming server messages into client requests
-      Object headers = message.getProperty(MessageContext.TRANSPORT_HEADERS);
-      if (headers instanceof Map) {
-        Iterator<Map.Entry<String, ?>> itr = ((Map) headers).entrySet().iterator();
-        while (itr.hasNext()) {
-          if (itr.next().getKey().toLowerCase(Locale.ROOT).startsWith("x-datadog")) {
-            itr.remove();
-          }
-        }
-      }
+            // avoid leaking x-datadog headers from incoming server messages into client requests
+            Object headers = message.getProperty(MessageContext.TRANSPORT_HEADERS);
+            if (headers instanceof Map) {
+                Iterator<Map.Entry<String, ?>> itr = ((Map) headers).entrySet().iterator();
+                while (itr.hasNext()) {
+                    if (itr.next().getKey().toLowerCase(Locale.ROOT).startsWith("x-datadog")) {
+                        itr.remove();
+                    }
+                }
+            }
 
-      // Propagate the server span to the client via the message context.
-      // Prefer reading the span directly from the source connection's context (where
-      // SynapseServerInstrumentation stored it) over activeSpan(). SourceHandler dispatches
-      // request processing to a worker thread pool, and while java-concurrent instrumentation
-      // normally propagates context across ThreadPoolExecutor, the connection-based lookup is
-      // more robust as it doesn't depend on automatic context propagation.
-      AgentSpan span = null;
-      Object sourceConn = message.getProperty("pass-through.Source-Connection");
-      if (sourceConn instanceof NHttpServerConnection) {
-        Object ctx =
-            ((NHttpServerConnection) sourceConn).getContext().getAttribute(SYNAPSE_CONTEXT_KEY);
-        if (ctx instanceof Context) {
-          span = spanFromContext((Context) ctx);
+            // Propagate the server span to the client via the message context.
+            // Prefer reading the span directly from the source connection's context (where
+            // SynapseServerInstrumentation stored it) over activeSpan(). SourceHandler dispatches
+            // request processing to a worker thread pool, and while java-concurrent instrumentation
+            // normally propagates context across ThreadPoolExecutor, the connection-based lookup is
+            // more robust as it doesn't depend on automatic context propagation.
+            AgentSpan span = null;
+            Object sourceConn = message.getProperty("pass-through.Source-Connection");
+            if (sourceConn instanceof NHttpServerConnection) {
+                Object ctx = ((NHttpServerConnection) sourceConn).getContext().getAttribute(SYNAPSE_CONTEXT_KEY);
+                if (ctx instanceof Context) {
+                    span = spanFromContext((Context) ctx);
+                }
+            }
+            if (null == span) {
+                span = activeSpan();
+            }
+            if (null != span) {
+                message.setNonReplicableProperty(SYNAPSE_CONTEXT_KEY, span);
+            }
         }
-      }
-      if (null == span) {
-        span = activeSpan();
-      }
-      if (null != span) {
-        message.setNonReplicableProperty(SYNAPSE_CONTEXT_KEY, span);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerDecorator.java b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerDecorator.java
index f1b0079f50f..ad2419c2d2d 100644
--- a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerDecorator.java
+++ b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerDecorator.java
@@ -17,75 +17,73 @@
 import org.apache.http.nio.NHttpConnection;
 
 public final class SynapseServerDecorator
-    extends HttpServerDecorator<HttpRequest, NHttpConnection, HttpResponse, HttpRequest> {
-  public static final CharSequence SYNAPSE_SERVER = UTF8BytesString.create("synapse-server");
-  public static final SynapseServerDecorator DECORATE = new SynapseServerDecorator();
-  private static final CharSequence SYNAPSE_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-  private static final CharSequence LEGACY_SYNAPSE_REQUEST = UTF8BytesString.create("http.request");
-  public static final String SYNAPSE_CONTEXT_KEY = "dd.trace.synapse.context";
-  public static final String SYNAPSE_CONTINUATION_KEY = "dd.trace.synapse.continuation";
+        extends HttpServerDecorator<HttpRequest, NHttpConnection, HttpResponse, HttpRequest> {
+    public static final CharSequence SYNAPSE_SERVER = UTF8BytesString.create("synapse-server");
+    public static final SynapseServerDecorator DECORATE = new SynapseServerDecorator();
+    private static final CharSequence SYNAPSE_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+    private static final CharSequence LEGACY_SYNAPSE_REQUEST = UTF8BytesString.create("http.request");
+    public static final String SYNAPSE_CONTEXT_KEY = "dd.trace.synapse.context";
+    public static final String SYNAPSE_CONTINUATION_KEY = "dd.trace.synapse.continuation";
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"synapse3"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"synapse3"};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return SYNAPSE_SERVER;
-  }
+    @Override
+    protected CharSequence component() {
+        return SYNAPSE_SERVER;
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpRequest> getter() {
-    return Request.GETTER;
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpRequest> getter() {
+        return Request.GETTER;
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
-    return Response.GETTER;
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpResponse> responseGetter() {
+        return Response.GETTER;
+    }
 
-  @Override
-  public CharSequence spanName() {
-    if (Config.get().isIntegrationSynapseLegacyOperationName()) {
-      return LEGACY_SYNAPSE_REQUEST;
+    @Override
+    public CharSequence spanName() {
+        if (Config.get().isIntegrationSynapseLegacyOperationName()) {
+            return LEGACY_SYNAPSE_REQUEST;
+        }
+        return SYNAPSE_REQUEST;
     }
-    return SYNAPSE_REQUEST;
-  }
 
-  @Override
-  protected String method(final HttpRequest request) {
-    return request.getRequestLine().getMethod();
-  }
+    @Override
+    protected String method(final HttpRequest request) {
+        return request.getRequestLine().getMethod();
+    }
 
-  @Override
-  protected URIDataAdapter url(final HttpRequest request) {
-    return URIDataAdapterBase.fromURI(
-        request.getRequestLine().getUri(), URIDefaultDataAdapter::new);
-  }
+    @Override
+    protected URIDataAdapter url(final HttpRequest request) {
+        return URIDataAdapterBase.fromURI(request.getRequestLine().getUri(), URIDefaultDataAdapter::new);
+    }
 
-  @Override
-  protected String peerHostIP(final NHttpConnection connection) {
-    if (connection instanceof HttpInetConnection) {
-      return ((HttpInetConnection) connection).getRemoteAddress().getHostAddress();
+    @Override
+    protected String peerHostIP(final NHttpConnection connection) {
+        if (connection instanceof HttpInetConnection) {
+            return ((HttpInetConnection) connection).getRemoteAddress().getHostAddress();
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Override
-  protected int peerPort(final NHttpConnection connection) {
-    if (connection instanceof HttpInetConnection) {
-      return ((HttpInetConnection) connection).getRemotePort();
+    @Override
+    protected int peerPort(final NHttpConnection connection) {
+        if (connection instanceof HttpInetConnection) {
+            return ((HttpInetConnection) connection).getRemotePort();
+        }
+        return UNSET_PORT;
     }
-    return UNSET_PORT;
-  }
 
-  @Override
-  protected int status(final HttpResponse response) {
-    if (null != response.getStatusLine()) {
-      return response.getStatusLine().getStatusCode();
+    @Override
+    protected int status(final HttpResponse response) {
+        if (null != response.getStatusLine()) {
+            return response.getStatusLine().getStatusCode();
+        }
+        return UNSET_STATUS;
     }
-    return UNSET_STATUS;
-  }
 }
diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java
index 4e8b45fca3c..722778d465e 100644
--- a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java
@@ -25,143 +25,140 @@
 
 @AutoService(InstrumenterModule.class)
 public final class SynapseServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public SynapseServerInstrumentation() {
-    super("synapse3-server", "synapse3");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.synapse.transport.passthru.SourceHandler";
-  }
-
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("requestReceived"))
-            .and(takesArgument(0, named("org.apache.http.nio.NHttpServerConnection"))),
-        getClass().getName() + "$ServerRequestContextTrackingAdvice",
-        getClass().getName() + "$ServerRequestAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("responseReady"))
-            .and(takesArgument(0, named("org.apache.http.nio.NHttpServerConnection"))),
-        getClass().getName() + "$ServerResponseAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("closed", "exception", "timeout"))
-            .and(takesArgument(0, named("org.apache.http.nio.NHttpServerConnection"))),
-        getClass().getName() + "$ServerErrorResponseAdvice");
-  }
-
-  @AppliesOn(CONTEXT_TRACKING)
-  public static final class ServerRequestContextTrackingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(@Advice.Argument(0) final NHttpServerConnection connection) {
-      HttpRequest request = connection.getHttpRequest();
-      Context parentContext = DECORATE.extract(request);
-      return parentContext.attach();
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public SynapseServerInstrumentation() {
+        super("synapse3-server", "synapse3");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(@Advice.Enter final ContextScope scope) {
-      scope.close();
+    @Override
+    public String instrumentedType() {
+        return "org.apache.synapse.transport.passthru.SourceHandler";
     }
-  }
-
-  public static final class ServerRequestAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beginRequest(
-        @Advice.Argument(0) final NHttpServerConnection connection) {
-
-      // check incoming request for distributed trace ids
-      HttpRequest request = connection.getHttpRequest();
-      Context parentContext = currentContext(); // parent context attached by ContextTrackingAdvice
-      Context context = DECORATE.startSpan(request, parentContext);
-      ContextScope scope = context.attach();
-      AgentSpan span = spanFromContext(context);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, connection, request, parentContext);
-
-      // capture context (which contains span) to be finished by one of the various server response
-      // advices
-      connection.getContext().setAttribute(SYNAPSE_CONTEXT_KEY, context);
-
-      return scope;
+
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("requestReceived"))
+                        .and(takesArgument(0, named("org.apache.http.nio.NHttpServerConnection"))),
+                getClass().getName() + "$ServerRequestContextTrackingAdvice",
+                getClass().getName() + "$ServerRequestAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("responseReady"))
+                        .and(takesArgument(0, named("org.apache.http.nio.NHttpServerConnection"))),
+                getClass().getName() + "$ServerResponseAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("closed", "exception", "timeout"))
+                        .and(takesArgument(0, named("org.apache.http.nio.NHttpServerConnection"))),
+                getClass().getName() + "$ServerErrorResponseAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void requestReceived(@Advice.Enter final ContextScope scope) {
-      scope.close();
+    @AppliesOn(CONTEXT_TRACKING)
+    public static final class ServerRequestContextTrackingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(@Advice.Argument(0) final NHttpServerConnection connection) {
+            HttpRequest request = connection.getHttpRequest();
+            Context parentContext = DECORATE.extract(request);
+            return parentContext.attach();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(@Advice.Enter final ContextScope scope) {
+            scope.close();
+        }
     }
-  }
-
-  public static final class ServerResponseAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beginResponse(
-        @Advice.Argument(0) final NHttpServerConnection connection) {
-      // don't remove stored context here because the response callback may run multiple times
-      Context context = (Context) connection.getContext().getAttribute(SYNAPSE_CONTEXT_KEY);
-      if (null != context) {
-        return context.attach();
-      }
-      return null;
+
+    public static final class ServerRequestAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beginRequest(@Advice.Argument(0) final NHttpServerConnection connection) {
+
+            // check incoming request for distributed trace ids
+            HttpRequest request = connection.getHttpRequest();
+            Context parentContext = currentContext(); // parent context attached by ContextTrackingAdvice
+            Context context = DECORATE.startSpan(request, parentContext);
+            ContextScope scope = context.attach();
+            AgentSpan span = spanFromContext(context);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, connection, request, parentContext);
+
+            // capture context (which contains span) to be finished by one of the various server response
+            // advices
+            connection.getContext().setAttribute(SYNAPSE_CONTEXT_KEY, context);
+
+            return scope;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void requestReceived(@Advice.Enter final ContextScope scope) {
+            scope.close();
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void responseReady(
-        @Advice.Argument(0) final NHttpServerConnection connection,
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable error) {
-      if (null == scope) {
-        return;
-      }
-      final AgentSpan span = spanFromContext(scope.context());
-      final HttpResponse httpResponse = connection.getHttpResponse();
-      boolean isFinal = false;
-      if (httpResponse != null && httpResponse.getStatusLine() != null) {
-        isFinal = httpResponse.getStatusLine().getStatusCode() >= 200;
-      }
-
-      if (isFinal) {
-        DECORATE.onResponse(span, httpResponse);
-      }
-      if (null != error) {
-        DECORATE.onError(span, error);
-      }
-
-      if ((isFinal || error != null)
-          && connection.getContext().removeAttribute(SYNAPSE_CONTEXT_KEY) != null) {
-        DECORATE.beforeFinish(scope.context());
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-      }
+    public static final class ServerResponseAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beginResponse(@Advice.Argument(0) final NHttpServerConnection connection) {
+            // don't remove stored context here because the response callback may run multiple times
+            Context context = (Context) connection.getContext().getAttribute(SYNAPSE_CONTEXT_KEY);
+            if (null != context) {
+                return context.attach();
+            }
+            return null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void responseReady(
+                @Advice.Argument(0) final NHttpServerConnection connection,
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable error) {
+            if (null == scope) {
+                return;
+            }
+            final AgentSpan span = spanFromContext(scope.context());
+            final HttpResponse httpResponse = connection.getHttpResponse();
+            boolean isFinal = false;
+            if (httpResponse != null && httpResponse.getStatusLine() != null) {
+                isFinal = httpResponse.getStatusLine().getStatusCode() >= 200;
+            }
+
+            if (isFinal) {
+                DECORATE.onResponse(span, httpResponse);
+            }
+            if (null != error) {
+                DECORATE.onError(span, error);
+            }
+
+            if ((isFinal || error != null) && connection.getContext().removeAttribute(SYNAPSE_CONTEXT_KEY) != null) {
+                DECORATE.beforeFinish(scope.context());
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+            }
+        }
     }
-  }
-
-  public static final class ServerErrorResponseAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void errorResponse(
-        @Advice.Argument(0) final NHttpServerConnection connection,
-        @Advice.Argument(value = 1, optional = true) final Object error) {
-      // check and remove context so it won't be finished twice
-      Context context = (Context) connection.getContext().removeAttribute(SYNAPSE_CONTEXT_KEY);
-      if (null != context && context != rootContext()) {
-        AgentSpan span = spanFromContext(context);
-        if (null != span) {
-          if (error instanceof Throwable) {
-            DECORATE.onError(span, (Throwable) error);
-          } else {
-            span.setError(true);
-          }
-          DECORATE.beforeFinish(context);
-          span.finish();
+
+    public static final class ServerErrorResponseAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void errorResponse(
+                @Advice.Argument(0) final NHttpServerConnection connection,
+                @Advice.Argument(value = 1, optional = true) final Object error) {
+            // check and remove context so it won't be finished twice
+            Context context = (Context) connection.getContext().removeAttribute(SYNAPSE_CONTEXT_KEY);
+            if (null != context && context != rootContext()) {
+                AgentSpan span = spanFromContext(context);
+                if (null != span) {
+                    if (error instanceof Throwable) {
+                        DECORATE.onError(span, (Throwable) error);
+                    } else {
+                        span.setError(true);
+                    }
+                    DECORATE.beforeFinish(context);
+                    span.finish();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerWorkerInstrumentation.java b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerWorkerInstrumentation.java
index 7dd1d0f5e2f..bc56e844444 100644
--- a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerWorkerInstrumentation.java
+++ b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerWorkerInstrumentation.java
@@ -24,76 +24,71 @@
 
 @AutoService(InstrumenterModule.class)
 public final class SynapseServerWorkerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public SynapseServerWorkerInstrumentation() {
-    super("synapse3-server", "synapse3");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.synapse.transport.passthru.ServerWorker";
-  }
+    public SynapseServerWorkerInstrumentation() {
+        super("synapse3-server", "synapse3");
+    }
 
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(0, named("org.apache.synapse.transport.passthru.SourceRequest"))),
-        getClass().getName() + "$NewServerWorkerAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("run")).and(takesNoArguments()),
-        getClass().getName() + "$ServerWorkerResponseAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.synapse.transport.passthru.ServerWorker";
+    }
 
-  public static final class NewServerWorkerAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void createWorker(@Advice.Argument(0) final SourceRequest request) {
-      ContextContinuation continuation = currentContext().capture();
-      if (continuation.context() != rootContext()) {
-        request.getConnection().getContext().setAttribute(SYNAPSE_CONTINUATION_KEY, continuation);
-      }
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(0, named("org.apache.synapse.transport.passthru.SourceRequest"))),
+                getClass().getName() + "$NewServerWorkerAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("run")).and(takesNoArguments()),
+                getClass().getName() + "$ServerWorkerResponseAdvice");
     }
-  }
 
-  public static final class ServerWorkerResponseAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beginResponse(
-        @Advice.FieldValue("request") final SourceRequest request) {
-      Object continuation =
-          request.getConnection().getContext().removeAttribute(SYNAPSE_CONTINUATION_KEY);
-      return continuation instanceof ContextContinuation
-          ? ((ContextContinuation) continuation).resume()
-          : null;
+    public static final class NewServerWorkerAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void createWorker(@Advice.Argument(0) final SourceRequest request) {
+            ContextContinuation continuation = currentContext().capture();
+            if (continuation.context() != rootContext()) {
+                request.getConnection().getContext().setAttribute(SYNAPSE_CONTINUATION_KEY, continuation);
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void responseReady(
-        @Advice.Enter final ContextScope scope,
-        @Advice.FieldValue("request") final SourceRequest request,
-        @Advice.Thrown final Throwable error) {
-      if (null == scope) {
-        return;
-      }
-      AgentSpan span = spanFromContext(scope.context());
-      HttpResponse httpResponse = request.getConnection().getHttpResponse();
-      if (null != httpResponse) {
-        DECORATE.onResponse(span, httpResponse);
-      }
-      if (null != error) {
-        DECORATE.onError(span, error);
-      }
-      // server worker is created in request event so be prepared to finish the span here
-      // (if there's an ACK response or error we might not get a separate response event)
-      if ((null != httpResponse || null != error)
-          && null != request.getConnection().getContext().removeAttribute(SYNAPSE_CONTEXT_KEY)) {
-        DECORATE.beforeFinish(scope.context());
-        scope.close();
-        span.finish();
-      } else {
-        scope.close();
-        // otherwise will be finished by a separate server response event
-      }
+    public static final class ServerWorkerResponseAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beginResponse(@Advice.FieldValue("request") final SourceRequest request) {
+            Object continuation = request.getConnection().getContext().removeAttribute(SYNAPSE_CONTINUATION_KEY);
+            return continuation instanceof ContextContinuation ? ((ContextContinuation) continuation).resume() : null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void responseReady(
+                @Advice.Enter final ContextScope scope,
+                @Advice.FieldValue("request") final SourceRequest request,
+                @Advice.Thrown final Throwable error) {
+            if (null == scope) {
+                return;
+            }
+            AgentSpan span = spanFromContext(scope.context());
+            HttpResponse httpResponse = request.getConnection().getHttpResponse();
+            if (null != httpResponse) {
+                DECORATE.onResponse(span, httpResponse);
+            }
+            if (null != error) {
+                DECORATE.onError(span, error);
+            }
+            // server worker is created in request event so be prepared to finish the span here
+            // (if there's an ACK response or error we might not get a separate response event)
+            if ((null != httpResponse || null != error)
+                    && null != request.getConnection().getContext().removeAttribute(SYNAPSE_CONTEXT_KEY)) {
+                DECORATE.beforeFinish(scope.context());
+                scope.close();
+                span.finish();
+            } else {
+                scope.close();
+                // otherwise will be finished by a separate server response event
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/TargetRequestInjectAdapter.java b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/TargetRequestInjectAdapter.java
index f418f546200..8c5e922fdcd 100644
--- a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/TargetRequestInjectAdapter.java
+++ b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/TargetRequestInjectAdapter.java
@@ -6,10 +6,10 @@
 
 @ParametersAreNonnullByDefault
 public final class TargetRequestInjectAdapter implements CarrierSetter<TargetRequest> {
-  public static final TargetRequestInjectAdapter SETTER = new TargetRequestInjectAdapter();
+    public static final TargetRequestInjectAdapter SETTER = new TargetRequestInjectAdapter();
 
-  @Override
-  public void set(final TargetRequest carrier, final String key, final String value) {
-    carrier.addHeader(key, value);
-  }
+    @Override
+    public void set(final TargetRequest carrier, final String key, final String value) {
+        carrier.addHeader(key, value);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-6.4/src/main/java/datadog/trace/instrumentation/testng6/TestNGClassListenerInstrumentation.java b/dd-java-agent/instrumentation/testng/testng-6.4/src/main/java/datadog/trace/instrumentation/testng6/TestNGClassListenerInstrumentation.java
index 3a0ca5f0da3..3b9d27476e1 100644
--- a/dd-java-agent/instrumentation/testng/testng-6.4/src/main/java/datadog/trace/instrumentation/testng6/TestNGClassListenerInstrumentation.java
+++ b/dd-java-agent/instrumentation/testng/testng-6.4/src/main/java/datadog/trace/instrumentation/testng6/TestNGClassListenerInstrumentation.java
@@ -21,88 +21,86 @@
 
 @AutoService(InstrumenterModule.class)
 public class TestNGClassListenerInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  private final String commonPackageName = Strings.getPackageName(TestNGUtils.class.getName());
-
-  public TestNGClassListenerInstrumentation() {
-    super("ci-visibility", "testng", "testng-6");
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // do not apply to TestNG 7.x and above
-    // since those versions are handled by a different instrumentation
-    return not(hasClassNamed("org.testng.annotations.CustomAttribute"));
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.testng.internal.TestMethodWorker";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("invokeBeforeClassMethods")
-            .and(takesArgument(0, named("org.testng.ITestClass")))
-            .and(takesArgument(1, named("org.testng.IMethodInstance"))),
-        TestNGClassListenerInstrumentation.class.getName() + "$InvokeBeforeClassAdvice");
-
-    transformer.applyAdvice(
-        named("invokeAfterClassMethods")
-            .and(takesArgument(0, named("org.testng.ITestClass")))
-            .and(takesArgument(1, named("org.testng.IMethodInstance"))),
-        TestNGClassListenerInstrumentation.class.getName() + "$InvokeAfterClassAdvice");
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      commonPackageName + ".TestNGUtils", commonPackageName + ".TestNGClassListener"
-    };
-  }
-
-  @Override
-  public int order() {
-    // Depends on datadog.trace.instrumentation.testng.TestNGInstrumentation,
-    // as it needs datadog.trace.instrumentation.testng.TestEventsHandlerHolder.start to be called;
-    return TestNGInstrumentation.ORDER - 1;
-  }
-
-  public static class InvokeBeforeClassAdvice {
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @Advice.OnMethodEnter
-    public static void invokeBeforeClass(
-        @Advice.FieldValue("m_testContext") final ITestContext testContext,
-        @Advice.Argument(0) final ITestClass testClass) {
-
-      boolean parallelized = TestNGUtils.isParallelized(testClass);
-      TestNGClassListener listener = TestNGUtils.getTestNGClassListener(testContext);
-      listener.invokeBeforeClass(testClass, parallelized);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    private final String commonPackageName = Strings.getPackageName(TestNGUtils.class.getName());
+
+    public TestNGClassListenerInstrumentation() {
+        super("ci-visibility", "testng", "testng-6");
+    }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // do not apply to TestNG 7.x and above
+        // since those versions are handled by a different instrumentation
+        return not(hasClassNamed("org.testng.annotations.CustomAttribute"));
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.testng.internal.TestMethodWorker";
     }
 
-    // TestNG 6.4 and above
-    public static String muzzleCheck(final DataProvider dataProvider) {
-      return dataProvider.name();
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("invokeBeforeClassMethods")
+                        .and(takesArgument(0, named("org.testng.ITestClass")))
+                        .and(takesArgument(1, named("org.testng.IMethodInstance"))),
+                TestNGClassListenerInstrumentation.class.getName() + "$InvokeBeforeClassAdvice");
+
+        transformer.applyAdvice(
+                named("invokeAfterClassMethods")
+                        .and(takesArgument(0, named("org.testng.ITestClass")))
+                        .and(takesArgument(1, named("org.testng.IMethodInstance"))),
+                TestNGClassListenerInstrumentation.class.getName() + "$InvokeAfterClassAdvice");
     }
-  }
-
-  public static class InvokeAfterClassAdvice {
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @Advice.OnMethodExit
-    public static void invokeAfterClass(
-        @Advice.FieldValue("m_testContext") final ITestContext testContext,
-        @Advice.Argument(0) final ITestClass testClass,
-        @Advice.Argument(1) final IMethodInstance methodInstance) {
-
-      TestNGClassListener listener = TestNGUtils.getTestNGClassListener(testContext);
-      listener.invokeAfterClass(testClass, methodInstance);
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {commonPackageName + ".TestNGUtils", commonPackageName + ".TestNGClassListener"};
+    }
+
+    @Override
+    public int order() {
+        // Depends on datadog.trace.instrumentation.testng.TestNGInstrumentation,
+        // as it needs datadog.trace.instrumentation.testng.TestEventsHandlerHolder.start to be called;
+        return TestNGInstrumentation.ORDER - 1;
+    }
+
+    public static class InvokeBeforeClassAdvice {
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @Advice.OnMethodEnter
+        public static void invokeBeforeClass(
+                @Advice.FieldValue("m_testContext") final ITestContext testContext,
+                @Advice.Argument(0) final ITestClass testClass) {
+
+            boolean parallelized = TestNGUtils.isParallelized(testClass);
+            TestNGClassListener listener = TestNGUtils.getTestNGClassListener(testContext);
+            listener.invokeBeforeClass(testClass, parallelized);
+        }
+
+        // TestNG 6.4 and above
+        public static String muzzleCheck(final DataProvider dataProvider) {
+            return dataProvider.name();
+        }
     }
 
-    // TestNG 6.4 and above
-    public static String muzzleCheck(final DataProvider dataProvider) {
-      return dataProvider.name();
+    public static class InvokeAfterClassAdvice {
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @Advice.OnMethodExit
+        public static void invokeAfterClass(
+                @Advice.FieldValue("m_testContext") final ITestContext testContext,
+                @Advice.Argument(0) final ITestClass testClass,
+                @Advice.Argument(1) final IMethodInstance methodInstance) {
+
+            TestNGClassListener listener = TestNGUtils.getTestNGClassListener(testContext);
+            listener.invokeAfterClass(testClass, methodInstance);
+        }
+
+        // TestNG 6.4 and above
+        public static String muzzleCheck(final DataProvider dataProvider) {
+            return dataProvider.name();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/TestNGClassListenerInstrumentation.java b/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/TestNGClassListenerInstrumentation.java
index 0989ed49195..121fca21340 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/TestNGClassListenerInstrumentation.java
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/TestNGClassListenerInstrumentation.java
@@ -20,88 +20,85 @@
 
 @AutoService(InstrumenterModule.class)
 public class TestNGClassListenerInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-
-  private final String commonPackageName = Strings.getPackageName(TestNGUtils.class.getName());
-
-  public TestNGClassListenerInstrumentation() {
-    super("ci-visibility", "testng", "testng-7");
-  }
-
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.testng.internal.TestMethodWorker", // TestNG 7.0-7.4
-      "org.testng.internal.invokers.TestMethodWorker" // TestNG 7.5+
-    };
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("invokeBeforeClassMethods")
-            .and(takesArgument(0, named("org.testng.ITestClass")))
-            .and(takesArgument(1, named("org.testng.IMethodInstance"))),
-        TestNGClassListenerInstrumentation.class.getName() + "$InvokeBeforeClassAdvice");
-
-    transformer.applyAdvice(
-        named("invokeAfterClassMethods")
-            .and(takesArgument(0, named("org.testng.ITestClass")))
-            .and(takesArgument(1, named("org.testng.IMethodInstance"))),
-        TestNGClassListenerInstrumentation.class.getName() + "$InvokeAfterClassAdvice");
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      commonPackageName + ".TestNGUtils", commonPackageName + ".TestNGClassListener"
-    };
-  }
-
-  @Override
-  public int order() {
-    // Depends on datadog.trace.instrumentation.testng.TestNGInstrumentation,
-    // as it needs datadog.trace.instrumentation.testng.TestEventsHandlerHolder.start to be called;
-    return TestNGInstrumentation.ORDER - 1;
-  }
-
-  public static class InvokeBeforeClassAdvice {
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @Advice.OnMethodEnter
-    public static void invokeBeforeClass(
-        @Advice.FieldValue("m_testContext") final ITestContext testContext,
-        @Advice.Argument(0) final ITestClass testClass) {
-
-      XmlTest xmlTest = testClass.getXmlTest();
-      XmlSuite.ParallelMode parallel = xmlTest.getParallel();
-      boolean parallelized =
-          parallel == XmlSuite.ParallelMode.METHODS || parallel == XmlSuite.ParallelMode.TESTS;
-
-      TestNGClassListener listener = TestNGUtils.getTestNGClassListener(testContext);
-      listener.invokeBeforeClass(testClass, parallelized);
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+
+    private final String commonPackageName = Strings.getPackageName(TestNGUtils.class.getName());
+
+    public TestNGClassListenerInstrumentation() {
+        super("ci-visibility", "testng", "testng-7");
     }
 
-    // TestNG 7.0 and above
-    public static String muzzleCheck(final CustomAttribute customAttribute) {
-      return customAttribute.name();
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.testng.internal.TestMethodWorker", // TestNG 7.0-7.4
+            "org.testng.internal.invokers.TestMethodWorker" // TestNG 7.5+
+        };
     }
-  }
-
-  public static class InvokeAfterClassAdvice {
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @Advice.OnMethodExit
-    public static void invokeAfterClass(
-        @Advice.FieldValue("m_testContext") final ITestContext testContext,
-        @Advice.Argument(0) final ITestClass testClass,
-        @Advice.Argument(1) final IMethodInstance methodInstance) {
-
-      TestNGClassListener listener = TestNGUtils.getTestNGClassListener(testContext);
-      listener.invokeAfterClass(testClass, methodInstance);
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("invokeBeforeClassMethods")
+                        .and(takesArgument(0, named("org.testng.ITestClass")))
+                        .and(takesArgument(1, named("org.testng.IMethodInstance"))),
+                TestNGClassListenerInstrumentation.class.getName() + "$InvokeBeforeClassAdvice");
+
+        transformer.applyAdvice(
+                named("invokeAfterClassMethods")
+                        .and(takesArgument(0, named("org.testng.ITestClass")))
+                        .and(takesArgument(1, named("org.testng.IMethodInstance"))),
+                TestNGClassListenerInstrumentation.class.getName() + "$InvokeAfterClassAdvice");
+    }
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {commonPackageName + ".TestNGUtils", commonPackageName + ".TestNGClassListener"};
+    }
+
+    @Override
+    public int order() {
+        // Depends on datadog.trace.instrumentation.testng.TestNGInstrumentation,
+        // as it needs datadog.trace.instrumentation.testng.TestEventsHandlerHolder.start to be called;
+        return TestNGInstrumentation.ORDER - 1;
+    }
+
+    public static class InvokeBeforeClassAdvice {
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @Advice.OnMethodEnter
+        public static void invokeBeforeClass(
+                @Advice.FieldValue("m_testContext") final ITestContext testContext,
+                @Advice.Argument(0) final ITestClass testClass) {
+
+            XmlTest xmlTest = testClass.getXmlTest();
+            XmlSuite.ParallelMode parallel = xmlTest.getParallel();
+            boolean parallelized = parallel == XmlSuite.ParallelMode.METHODS || parallel == XmlSuite.ParallelMode.TESTS;
+
+            TestNGClassListener listener = TestNGUtils.getTestNGClassListener(testContext);
+            listener.invokeBeforeClass(testClass, parallelized);
+        }
+
+        // TestNG 7.0 and above
+        public static String muzzleCheck(final CustomAttribute customAttribute) {
+            return customAttribute.name();
+        }
     }
 
-    // TestNG 7.0 and above
-    public static String muzzleCheck(final CustomAttribute customAttribute) {
-      return customAttribute.name();
+    public static class InvokeAfterClassAdvice {
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @Advice.OnMethodExit
+        public static void invokeAfterClass(
+                @Advice.FieldValue("m_testContext") final ITestContext testContext,
+                @Advice.Argument(0) final ITestClass testClass,
+                @Advice.Argument(1) final IMethodInstance methodInstance) {
+
+            TestNGClassListener listener = TestNGUtils.getTestNGClassListener(testContext);
+            listener.invokeAfterClass(testClass, methodInstance);
+        }
+
+        // TestNG 7.0 and above
+        public static String muzzleCheck(final CustomAttribute customAttribute) {
+            return customAttribute.name();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/TestNGExecutionInstrumentation.java b/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/TestNGExecutionInstrumentation.java
index fd04267d368..6357d3d2f56 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/TestNGExecutionInstrumentation.java
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/TestNGExecutionInstrumentation.java
@@ -21,113 +21,110 @@
 
 @AutoService(InstrumenterModule.class)
 public class TestNGExecutionInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  private final String commonPackageName = Strings.getPackageName(TestNGUtils.class.getName());
-
-  public TestNGExecutionInstrumentation() {
-    super("ci-visibility", "testng", "test-retry");
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.testng.internal.invokers.TestInvoker";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("shouldRetryTestMethod").and(takesArgument(1, named("org.testng.ITestResult"))),
-        TestNGExecutionInstrumentation.class.getName() + "$ExecutionAdvice");
-
-    transformer.applyAdvice(
-        named("runTestResultListener").and(takesArgument(0, named("org.testng.ITestResult"))),
-        TestNGExecutionInstrumentation.class.getName() + "$ModifyStatusAdvice");
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      commonPackageName + ".TestNGUtils",
-      commonPackageName + ".TestEventsHandlerHolder",
-      commonPackageName + ".TestNGClassListener",
-      commonPackageName + ".execution.RetryAnalyzer",
-      commonPackageName + ".TracingListener",
-    };
-  }
-
-  public static class ExecutionAdvice {
-    @Advice.OnMethodEnter
-    public static void alignBeforeRetry(
-        @Advice.FieldValue(value = "m_notifier") final ITestResultNotifier resultNotifier,
-        @Advice.Argument(1) final ITestResult result) {
-      IRetryAnalyzer retryAnalyzer = TestNGUtils.getRetryAnalyzer(result);
-      if (retryAnalyzer instanceof RetryAnalyzer) {
-        // If DD's retry analyzer is used, create the execution history and report the test result
-        // beforehand to the tracing listener to align execution ordering with other frameworks.
-        // Also avoids TestNG marking retried tests as skipped
-        RetryAnalyzer ddRetryAnalyzer = (RetryAnalyzer) retryAnalyzer;
-        ddRetryAnalyzer.createExecutionPolicy(result);
-
-        ITestListener tracingListener = null;
-        for (ITestListener listener : resultNotifier.getTestListeners()) {
-          if (listener instanceof TracingListener) {
-            tracingListener = listener;
-          }
-        }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    private final String commonPackageName = Strings.getPackageName(TestNGUtils.class.getName());
+
+    public TestNGExecutionInstrumentation() {
+        super("ci-visibility", "testng", "test-retry");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().isCiVisibilityExecutionPoliciesEnabled();
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.testng.internal.invokers.TestInvoker";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("shouldRetryTestMethod").and(takesArgument(1, named("org.testng.ITestResult"))),
+                TestNGExecutionInstrumentation.class.getName() + "$ExecutionAdvice");
 
-        // Test reporting is idempotent due to only working for in progress tests. Once a test is
-        // reported it is not considered in progress anymore. DD's test listener will be asked by
-        // the framework to report the test again after the retry logic is executed, but it will
-        // result in a no-op, avoiding double reporting
-        TestListenerHelper.runTestListeners(result, Collections.singletonList(tracingListener));
+        transformer.applyAdvice(
+                named("runTestResultListener").and(takesArgument(0, named("org.testng.ITestResult"))),
+                TestNGExecutionInstrumentation.class.getName() + "$ModifyStatusAdvice");
+    }
 
-        // Also set suppress failures beforehand to align execution ordering.
-        ddRetryAnalyzer.setSuppressFailures(result);
-      }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            commonPackageName + ".TestNGUtils",
+            commonPackageName + ".TestEventsHandlerHolder",
+            commonPackageName + ".TestNGClassListener",
+            commonPackageName + ".execution.RetryAnalyzer",
+            commonPackageName + ".TracingListener",
+        };
     }
 
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @Advice.OnMethodExit
-    public static void shouldRetryTestMethod(
-        @Advice.Argument(1) final ITestResult result,
-        @Advice.Return(readOnly = false) boolean retry) {
-      if (!retry && result.isSuccess()) {
-        IRetryAnalyzer retryAnalyzer = TestNGUtils.getRetryAnalyzer(result);
-        if (retryAnalyzer instanceof RetryAnalyzer) {
-          retry = retryAnalyzer.retry(result);
+    public static class ExecutionAdvice {
+        @Advice.OnMethodEnter
+        public static void alignBeforeRetry(
+                @Advice.FieldValue(value = "m_notifier") final ITestResultNotifier resultNotifier,
+                @Advice.Argument(1) final ITestResult result) {
+            IRetryAnalyzer retryAnalyzer = TestNGUtils.getRetryAnalyzer(result);
+            if (retryAnalyzer instanceof RetryAnalyzer) {
+                // If DD's retry analyzer is used, create the execution history and report the test result
+                // beforehand to the tracing listener to align execution ordering with other frameworks.
+                // Also avoids TestNG marking retried tests as skipped
+                RetryAnalyzer ddRetryAnalyzer = (RetryAnalyzer) retryAnalyzer;
+                ddRetryAnalyzer.createExecutionPolicy(result);
+
+                ITestListener tracingListener = null;
+                for (ITestListener listener : resultNotifier.getTestListeners()) {
+                    if (listener instanceof TracingListener) {
+                        tracingListener = listener;
+                    }
+                }
+
+                // Test reporting is idempotent due to only working for in progress tests. Once a test is
+                // reported it is not considered in progress anymore. DD's test listener will be asked by
+                // the framework to report the test again after the retry logic is executed, but it will
+                // result in a no-op, avoiding double reporting
+                TestListenerHelper.runTestListeners(result, Collections.singletonList(tracingListener));
+
+                // Also set suppress failures beforehand to align execution ordering.
+                ddRetryAnalyzer.setSuppressFailures(result);
+            }
+        }
+
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @Advice.OnMethodExit
+        public static void shouldRetryTestMethod(
+                @Advice.Argument(1) final ITestResult result, @Advice.Return(readOnly = false) boolean retry) {
+            if (!retry && result.isSuccess()) {
+                IRetryAnalyzer retryAnalyzer = TestNGUtils.getRetryAnalyzer(result);
+                if (retryAnalyzer instanceof RetryAnalyzer) {
+                    retry = retryAnalyzer.retry(result);
+                }
+            }
         }
-      }
     }
-  }
-
-  public static class ModifyStatusAdvice {
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @Advice.OnMethodEnter
-    public static void modifyStatus(@Advice.Argument(0) final ITestResult result) {
-      IRetryAnalyzer retryAnalyzer = TestNGUtils.getRetryAnalyzer(result);
-      if (!(retryAnalyzer instanceof RetryAnalyzer)) {
-        // test execution policies not injected
-        return;
-      }
-      RetryAnalyzer ddRetryAnalyzer = (RetryAnalyzer) retryAnalyzer;
-
-      if (result.getStatus() == ITestResult.FAILURE
-          && ddRetryAnalyzer.getAndResetSuppressFailures()) {
-        // "failed but within success percentage"
-        result.setStatus(ITestResult.SUCCESS_PERCENTAGE_FAILURE);
-      } else if (result.isSuccess() && ddRetryAnalyzer.shouldPropagateFailure()) {
-        // mark status as failed to propagate an earlier failure suppressed by TestNG
-        result.setStatus(ITestResult.FAILURE);
-        result.setThrowable(
-            new AssertionError(
-                "Datadog: propagating test failure based on aggregated execution results"));
-      }
+
+    public static class ModifyStatusAdvice {
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @Advice.OnMethodEnter
+        public static void modifyStatus(@Advice.Argument(0) final ITestResult result) {
+            IRetryAnalyzer retryAnalyzer = TestNGUtils.getRetryAnalyzer(result);
+            if (!(retryAnalyzer instanceof RetryAnalyzer)) {
+                // test execution policies not injected
+                return;
+            }
+            RetryAnalyzer ddRetryAnalyzer = (RetryAnalyzer) retryAnalyzer;
+
+            if (result.getStatus() == ITestResult.FAILURE && ddRetryAnalyzer.getAndResetSuppressFailures()) {
+                // "failed but within success percentage"
+                result.setStatus(ITestResult.SUCCESS_PERCENTAGE_FAILURE);
+            } else if (result.isSuccess() && ddRetryAnalyzer.shouldPropagateFailure()) {
+                // mark status as failed to propagate an earlier failure suppressed by TestNG
+                result.setStatus(ITestResult.FAILURE);
+                result.setThrowable(
+                        new AssertionError("Datadog: propagating test failure based on aggregated execution results"));
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/order/FailFastOrderInterceptor.java b/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/order/FailFastOrderInterceptor.java
index f01337e1723..9aadb0cbca8 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/order/FailFastOrderInterceptor.java
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/order/FailFastOrderInterceptor.java
@@ -16,30 +16,30 @@
 
 public class FailFastOrderInterceptor implements IMethodInterceptor {
 
-  private final TestEventsHandler<TestSuiteDescriptor, ITestResult> testEventsHandler;
-  private final Comparator<IMethodInstance> executionOrderComparator;
+    private final TestEventsHandler<TestSuiteDescriptor, ITestResult> testEventsHandler;
+    private final Comparator<IMethodInstance> executionOrderComparator;
 
-  public FailFastOrderInterceptor(
-      TestEventsHandler<TestSuiteDescriptor, ITestResult> testEventsHandler) {
-    this.testEventsHandler = testEventsHandler;
-    this.executionOrderComparator = Comparator.comparing(this::executionPriority).reversed();
-  }
+    public FailFastOrderInterceptor(TestEventsHandler<TestSuiteDescriptor, ITestResult> testEventsHandler) {
+        this.testEventsHandler = testEventsHandler;
+        this.executionOrderComparator =
+                Comparator.comparing(this::executionPriority).reversed();
+    }
 
-  private int executionPriority(IMethodInstance methodInstance) {
-    ITestNGMethod method = methodInstance.getMethod();
-    if (method == null) {
-      // not expected to happen, just a safeguard
-      return 0;
+    private int executionPriority(IMethodInstance methodInstance) {
+        ITestNGMethod method = methodInstance.getMethod();
+        if (method == null) {
+            // not expected to happen, just a safeguard
+            return 0;
+        }
+        ITestResult testResult = TestResult.newTestResultFor(method);
+        TestIdentifier testIdentifier = TestNGUtils.toTestIdentifier(testResult);
+        TestSourceData testSourceData = TestNGUtils.toTestSourceData(testResult);
+        return testEventsHandler.executionPriority(testIdentifier, testSourceData);
     }
-    ITestResult testResult = TestResult.newTestResultFor(method);
-    TestIdentifier testIdentifier = TestNGUtils.toTestIdentifier(testResult);
-    TestSourceData testSourceData = TestNGUtils.toTestSourceData(testResult);
-    return testEventsHandler.executionPriority(testIdentifier, testSourceData);
-  }
 
-  @Override
-  public List<IMethodInstance> intercept(List<IMethodInstance> list, ITestContext iTestContext) {
-    list.sort(executionOrderComparator);
-    return list;
-  }
+    @Override
+    public List<IMethodInstance> intercept(List<IMethodInstance> list, ITestContext iTestContext) {
+        list.sort(executionOrderComparator);
+        return list;
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/order/TestNGOrderInstrumentation.java b/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/order/TestNGOrderInstrumentation.java
index 9aa927ca17e..b7862220523 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/order/TestNGOrderInstrumentation.java
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/order/TestNGOrderInstrumentation.java
@@ -17,77 +17,76 @@
 
 @AutoService(InstrumenterModule.class)
 public class TestNGOrderInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  private final String parentPackageName = Strings.getPackageName(TestNGUtils.class.getName());
+    private final String parentPackageName = Strings.getPackageName(TestNGUtils.class.getName());
 
-  public TestNGOrderInstrumentation() {
-    super("ci-visibility", "testng", "test-order");
-  }
+    public TestNGOrderInstrumentation() {
+        super("ci-visibility", "testng", "test-order");
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
-  }
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && Config.get().getCiVisibilityTestOrder() != null;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.testng.TestNG";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.testng.TestNG";
+    }
 
-  @Override
-  public int order() {
-    // Depends on datadog.trace.instrumentation.testng.TestNGInstrumentation,
-    // as it needs datadog.trace.instrumentation.testng.TestEventsHandlerHolder.start to be called;
-    // The bytecode insertion order is inverse:
-    // for lower order values the bytecode instructions are executed later
-    // (at least for @Advice.OnMethodExit methods)
-    return TestNGInstrumentation.ORDER - 1;
-  }
+    @Override
+    public int order() {
+        // Depends on datadog.trace.instrumentation.testng.TestNGInstrumentation,
+        // as it needs datadog.trace.instrumentation.testng.TestEventsHandlerHolder.start to be called;
+        // The bytecode insertion order is inverse:
+        // for lower order values the bytecode instructions are executed later
+        // (at least for @Advice.OnMethodExit methods)
+        return TestNGInstrumentation.ORDER - 1;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        MethodDescription::isConstructor,
-        TestNGOrderInstrumentation.class.getName() + "$InsertInterceptorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                MethodDescription::isConstructor,
+                TestNGOrderInstrumentation.class.getName() + "$InsertInterceptorAdvice");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      parentPackageName + ".TestNGClassListener",
-      parentPackageName + ".TestNGUtils",
-      parentPackageName + ".TestEventsHandlerHolder",
-      packageName + ".FailFastOrderInterceptor",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            parentPackageName + ".TestNGClassListener",
+            parentPackageName + ".TestNGUtils",
+            parentPackageName + ".TestEventsHandlerHolder",
+            packageName + ".FailFastOrderInterceptor",
+        };
+    }
 
-  public static class InsertInterceptorAdvice {
-    @SuppressWarnings("bytebuddy-exception-suppression")
-    @Advice.OnMethodExit
-    public static void prependFailFastInterceptor(
-        @Advice.FieldValue("m_methodInterceptors") List<IMethodInterceptor> methodInterceptors) {
-      String testOrder = Config.get().getCiVisibilityTestOrder();
-      if (CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) {
-        for (IMethodInterceptor methodInterceptor : methodInterceptors) {
-          if (methodInterceptor instanceof FailFastOrderInterceptor) {
-            return;
-          }
-        }
+    public static class InsertInterceptorAdvice {
+        @SuppressWarnings("bytebuddy-exception-suppression")
+        @Advice.OnMethodExit
+        public static void prependFailFastInterceptor(
+                @Advice.FieldValue("m_methodInterceptors") List<IMethodInterceptor> methodInterceptors) {
+            String testOrder = Config.get().getCiVisibilityTestOrder();
+            if (CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) {
+                for (IMethodInterceptor methodInterceptor : methodInterceptors) {
+                    if (methodInterceptor instanceof FailFastOrderInterceptor) {
+                        return;
+                    }
+                }
 
-        // adding our interceptor as the first one:
-        // that way custom interceptors added by the users will have higher priority
-        methodInterceptors.add(
-            0, new FailFastOrderInterceptor(TestEventsHandlerHolder.TEST_EVENTS_HANDLER));
+                // adding our interceptor as the first one:
+                // that way custom interceptors added by the users will have higher priority
+                methodInterceptors.add(0, new FailFastOrderInterceptor(TestEventsHandlerHolder.TEST_EVENTS_HANDLER));
 
-      } else {
-        throw new IllegalArgumentException("Unknown test order: " + testOrder);
-      }
-    }
+            } else {
+                throw new IllegalArgumentException("Unknown test order: " + testOrder);
+            }
+        }
 
-    // TestNG 7.0 and above
-    public static String muzzleCheck(final CustomAttribute customAttribute) {
-      return customAttribute.name();
+        // TestNG 7.0 and above
+        public static String muzzleCheck(final CustomAttribute customAttribute) {
+            return customAttribute.name();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestEventsHandlerHolder.java
index 09be2e9ce64..a827f1dc67c 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestEventsHandlerHolder.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestEventsHandlerHolder.java
@@ -10,33 +10,32 @@
 
 public abstract class TestEventsHandlerHolder {
 
-  @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
-  public static volatile TestEventsHandler<TestSuiteDescriptor, ITestResult> TEST_EVENTS_HANDLER;
-
-  private static ContextStore<ITestResult, DDTest> TEST_STORE;
+    @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
+    public static volatile TestEventsHandler<TestSuiteDescriptor, ITestResult> TEST_EVENTS_HANDLER;
+
+    private static ContextStore<ITestResult, DDTest> TEST_STORE;
+
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Holder class not exposed to application code; locking on its Class is safe")
+    public static synchronized void setContextStore(ContextStore<ITestResult, DDTest> testStore) {
+        if (TEST_STORE == null) {
+            TEST_STORE = testStore;
+        }
+    }
 
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification = "Holder class not exposed to application code; locking on its Class is safe")
-  public static synchronized void setContextStore(ContextStore<ITestResult, DDTest> testStore) {
-    if (TEST_STORE == null) {
-      TEST_STORE = testStore;
+    public static void start() {
+        TEST_EVENTS_HANDLER = InstrumentationBridge.createTestEventsHandler(
+                "testng", null, TEST_STORE, TestNGUtils.capabilities(TestNGUtils.getTestNGVersion()));
     }
-  }
-
-  public static void start() {
-    TEST_EVENTS_HANDLER =
-        InstrumentationBridge.createTestEventsHandler(
-            "testng", null, TEST_STORE, TestNGUtils.capabilities(TestNGUtils.getTestNGVersion()));
-  }
-
-  /** Used by instrumentation tests */
-  public static void stop() {
-    if (TEST_EVENTS_HANDLER != null) {
-      TEST_EVENTS_HANDLER.close();
-      TEST_EVENTS_HANDLER = null;
+
+    /** Used by instrumentation tests */
+    public static void stop() {
+        if (TEST_EVENTS_HANDLER != null) {
+            TEST_EVENTS_HANDLER.close();
+            TEST_EVENTS_HANDLER = null;
+        }
     }
-  }
 
-  private TestEventsHandlerHolder() {}
+    private TestEventsHandlerHolder() {}
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGClassListener.java b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGClassListener.java
index 4ec715d1d1b..855c234ca4c 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGClassListener.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGClassListener.java
@@ -27,48 +27,44 @@
  */
 public abstract class TestNGClassListener {
 
-  private final ConcurrentMap<Class<?>, Collection<ConstructorOrMethod>> registeredMethods =
-      new ConcurrentHashMap<>();
-  private final ConcurrentMap<Class<?>, Collection<ConstructorOrMethod>> methodsAwaitingExecution =
-      new ConcurrentHashMap<>();
+    private final ConcurrentMap<Class<?>, Collection<ConstructorOrMethod>> registeredMethods =
+            new ConcurrentHashMap<>();
+    private final ConcurrentMap<Class<?>, Collection<ConstructorOrMethod>> methodsAwaitingExecution =
+            new ConcurrentHashMap<>();
 
-  public void registerTestMethods(Collection<ITestNGMethod> testMethods) {
-    for (ITestNGMethod testMethod : testMethods) {
-      ITestClass testClass = testMethod.getTestClass();
-      Class<?> realClass = testClass.getRealClass();
-      ConstructorOrMethod constructorOrMethod = testMethod.getConstructorOrMethod();
-      registeredMethods.computeIfAbsent(realClass, k -> new ArrayList<>()).add(constructorOrMethod);
+    public void registerTestMethods(Collection<ITestNGMethod> testMethods) {
+        for (ITestNGMethod testMethod : testMethods) {
+            ITestClass testClass = testMethod.getTestClass();
+            Class<?> realClass = testClass.getRealClass();
+            ConstructorOrMethod constructorOrMethod = testMethod.getConstructorOrMethod();
+            registeredMethods.computeIfAbsent(realClass, k -> new ArrayList<>()).add(constructorOrMethod);
+        }
     }
-  }
 
-  public void invokeBeforeClass(ITestClass testClass, boolean parallelized) {
-    methodsAwaitingExecution.computeIfAbsent(
-        testClass.getRealClass(),
-        k -> {
-          // firing event with the lock held to ensure that the other threads wait until test suite
-          // state is initialized
-          onBeforeClass(testClass, parallelized);
-          return registeredMethods.remove(k);
+    public void invokeBeforeClass(ITestClass testClass, boolean parallelized) {
+        methodsAwaitingExecution.computeIfAbsent(testClass.getRealClass(), k -> {
+            // firing event with the lock held to ensure that the other threads wait until test suite
+            // state is initialized
+            onBeforeClass(testClass, parallelized);
+            return registeredMethods.remove(k);
         });
-  }
+    }
 
-  public void invokeAfterClass(ITestClass testClass, IMethodInstance methodInstance) {
-    Collection<ConstructorOrMethod> remainingMethods =
-        methodsAwaitingExecution.computeIfPresent(
-            testClass.getRealClass(),
-            (k, v) -> {
-              ITestNGMethod method = methodInstance.getMethod();
-              ConstructorOrMethod constructorOrMethod = method.getConstructorOrMethod();
-              v.remove(constructorOrMethod);
-              return !v.isEmpty() ? v : null;
-            });
+    public void invokeAfterClass(ITestClass testClass, IMethodInstance methodInstance) {
+        Collection<ConstructorOrMethod> remainingMethods =
+                methodsAwaitingExecution.computeIfPresent(testClass.getRealClass(), (k, v) -> {
+                    ITestNGMethod method = methodInstance.getMethod();
+                    ConstructorOrMethod constructorOrMethod = method.getConstructorOrMethod();
+                    v.remove(constructorOrMethod);
+                    return !v.isEmpty() ? v : null;
+                });
 
-    if (remainingMethods == null) {
-      onAfterClass(testClass);
+        if (remainingMethods == null) {
+            onAfterClass(testClass);
+        }
     }
-  }
 
-  protected abstract void onBeforeClass(ITestClass testClass, boolean parallelized);
+    protected abstract void onBeforeClass(ITestClass testClass, boolean parallelized);
 
-  protected abstract void onAfterClass(ITestClass testClass);
+    protected abstract void onAfterClass(ITestClass testClass);
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGInstrumentation.java b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGInstrumentation.java
index a37da23e5d7..264a390ad60 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGInstrumentation.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGInstrumentation.java
@@ -20,66 +20,65 @@
 
 @AutoService(InstrumenterModule.class)
 public class TestNGInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public static final int ORDER = 0;
+    public static final int ORDER = 0;
 
-  public TestNGInstrumentation() {
-    super("testng");
-  }
+    public TestNGInstrumentation() {
+        super("testng");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.testng.TestNG";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.testng.TestNG";
+    }
 
-  @Override
-  public int order() {
-    return ORDER;
-  }
+    @Override
+    public int order() {
+        return ORDER;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        MethodDescription::isConstructor, TestNGInstrumentation.class.getName() + "$TestNGAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                MethodDescription::isConstructor, TestNGInstrumentation.class.getName() + "$TestNGAdvice");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.testng.ITestResult", "datadog.trace.api.civisibility.DDTest");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.testng.ITestResult", "datadog.trace.api.civisibility.DDTest");
+    }
 
-  public static class TestNGAdvice {
-    @Advice.OnMethodExit
-    public static void addTracingListener(@Advice.This final TestNG testNG) {
-      for (final ITestListener testListener : testNG.getTestListeners()) {
-        if (testListener instanceof TracingListener) {
-          return;
-        }
-      }
+    public static class TestNGAdvice {
+        @Advice.OnMethodExit
+        public static void addTracingListener(@Advice.This final TestNG testNG) {
+            for (final ITestListener testListener : testNG.getTestListeners()) {
+                if (testListener instanceof TracingListener) {
+                    return;
+                }
+            }
 
-      ContextStore<ITestResult, DDTest> contextStore =
-          InstrumentationContext.get(ITestResult.class, DDTest.class);
-      TestEventsHandlerHolder.setContextStore(contextStore);
-      TestEventsHandlerHolder.start();
+            ContextStore<ITestResult, DDTest> contextStore =
+                    InstrumentationContext.get(ITestResult.class, DDTest.class);
+            TestEventsHandlerHolder.setContextStore(contextStore);
+            TestEventsHandlerHolder.start();
 
-      final TracingListener tracingListener = new TracingListener();
-      testNG.addListener((ITestNGListener) tracingListener);
+            final TracingListener tracingListener = new TracingListener();
+            testNG.addListener((ITestNGListener) tracingListener);
 
-      TestNGSuiteListener suiteListener = new TestNGSuiteListener(tracingListener);
-      testNG.addListener((ITestNGListener) suiteListener);
+            TestNGSuiteListener suiteListener = new TestNGSuiteListener(tracingListener);
+            testNG.addListener((ITestNGListener) suiteListener);
 
-      if (Config.get().isCiVisibilityExecutionPoliciesEnabled()) {
-        final RetryAnnotationTransformer transformer =
-            new RetryAnnotationTransformer(testNG.getAnnotationTransformer());
-        testNG.addListener(transformer);
-      }
-    }
+            if (Config.get().isCiVisibilityExecutionPoliciesEnabled()) {
+                final RetryAnnotationTransformer transformer =
+                        new RetryAnnotationTransformer(testNG.getAnnotationTransformer());
+                testNG.addListener(transformer);
+            }
+        }
 
-    // TestNG 6.4 and above
-    public static void muzzleCheck(final DataProvider dataProvider) {
-      dataProvider.name();
+        // TestNG 6.4 and above
+        public static void muzzleCheck(final DataProvider dataProvider) {
+            dataProvider.name();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGSkipInstrumentation.java b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGSkipInstrumentation.java
index d04d698e5ba..28ffb9767de 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGSkipInstrumentation.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGSkipInstrumentation.java
@@ -19,63 +19,61 @@
 
 @AutoService(InstrumenterModule.class)
 public class TestNGSkipInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public TestNGSkipInstrumentation() {
-    super("testng", "testng-itr");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public TestNGSkipInstrumentation() {
+        super("testng", "testng-itr");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled()
+                && (Config.get().isCiVisibilityTestSkippingEnabled()
+                        || Config.get().isCiVisibilityTestManagementEnabled());
+    }
 
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled()
-        && (Config.get().isCiVisibilityTestSkippingEnabled()
-            || Config.get().isCiVisibilityTestManagementEnabled());
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "org.testng.internal.MethodInvocationHelper", "org.testng.internal.invokers.MethodInvocationHelper"
+        };
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "org.testng.internal.MethodInvocationHelper",
-      "org.testng.internal.invokers.MethodInvocationHelper"
-    };
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("invokeMethod")
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, Method.class))
+                        .and(takesArgument(1, Object.class))
+                        .and(takesArgument(2, Object[].class)),
+                TestNGSkipInstrumentation.class.getName() + "$InvokeMethodAdvice");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("invokeMethod")
-            .and(takesArguments(3))
-            .and(takesArgument(0, Method.class))
-            .and(takesArgument(1, Object.class))
-            .and(takesArgument(2, Object[].class)),
-        TestNGSkipInstrumentation.class.getName() + "$InvokeMethodAdvice");
-  }
+    public static class InvokeMethodAdvice {
+        @Advice.OnMethodEnter
+        public static void invokeMethod(
+                @Advice.Argument(0) final Method method,
+                @Advice.Argument(1) final Object instance,
+                @Advice.Argument(2) final Object[] parameters) {
+            TestIdentifier testIdentifier = TestNGUtils.toTestIdentifier(method, instance, parameters);
+            SkipReason skipReason = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(testIdentifier);
+            if (skipReason == null) {
+                return;
+            }
 
-  public static class InvokeMethodAdvice {
-    @Advice.OnMethodEnter
-    public static void invokeMethod(
-        @Advice.Argument(0) final Method method,
-        @Advice.Argument(1) final Object instance,
-        @Advice.Argument(2) final Object[] parameters) {
-      TestIdentifier testIdentifier = TestNGUtils.toTestIdentifier(method, instance, parameters);
-      SkipReason skipReason =
-          TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(testIdentifier);
-      if (skipReason == null) {
-        return;
-      }
+            if (skipReason == SkipReason.ITR) {
+                List<String> groups = TestNGUtils.getGroups(method);
+                if (groups.contains(CIConstants.Tags.ITR_UNSKIPPABLE_TAG)) {
+                    return;
+                }
+            }
 
-      if (skipReason == SkipReason.ITR) {
-        List<String> groups = TestNGUtils.getGroups(method);
-        if (groups.contains(CIConstants.Tags.ITR_UNSKIPPABLE_TAG)) {
-          return;
+            throw new SkipException(skipReason.getDescription());
         }
-      }
-
-      throw new SkipException(skipReason.getDescription());
-    }
 
-    // TestNG 6.4 and above
-    public static void muzzleCheck(final DataProvider dataProvider) {
-      dataProvider.name();
+        // TestNG 6.4 and above
+        public static void muzzleCheck(final DataProvider dataProvider) {
+            dataProvider.name();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGSuiteListener.java b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGSuiteListener.java
index d6a36054a1e..2b4af3e8cbd 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGSuiteListener.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGSuiteListener.java
@@ -9,19 +9,19 @@
  */
 public class TestNGSuiteListener implements ISuiteListener {
 
-  private final TestNGClassListener delegate;
+    private final TestNGClassListener delegate;
 
-  public TestNGSuiteListener(TestNGClassListener delegate) {
-    this.delegate = delegate;
-  }
+    public TestNGSuiteListener(TestNGClassListener delegate) {
+        this.delegate = delegate;
+    }
 
-  @Override
-  public void onStart(ISuite iSuite) {
-    delegate.registerTestMethods(iSuite.getAllMethods());
-  }
+    @Override
+    public void onStart(ISuite iSuite) {
+        delegate.registerTestMethods(iSuite.getAllMethods());
+    }
 
-  @Override
-  public void onFinish(ISuite iSuite) {
-    // ignore
-  }
+    @Override
+    public void onFinish(ISuite iSuite) {
+        // ignore
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java
index c67da143832..2c4facf751d 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java
@@ -33,274 +33,267 @@
 
 public abstract class TestNGUtils {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestNGUtils.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestNGUtils.class);
 
-  private static final datadog.trace.util.MethodHandles METHOD_HANDLES =
-      new datadog.trace.util.MethodHandles(TestNG.class.getClassLoader());
+    private static final datadog.trace.util.MethodHandles METHOD_HANDLES =
+            new datadog.trace.util.MethodHandles(TestNG.class.getClassLoader());
 
-  private static final MethodHandle XML_TEST_GET_PARALLEL =
-      METHOD_HANDLES.method(XmlTest.class, "getParallel");
+    private static final MethodHandle XML_TEST_GET_PARALLEL = METHOD_HANDLES.method(XmlTest.class, "getParallel");
 
-  private static final MethodHandle TEST_RESULT_WAS_RETRIED =
-      METHOD_HANDLES.method(ITestResult.class, "wasRetried");
-  private static final MethodHandle TEST_METHOD_GET_RETRY_ANALYZER =
-      METHOD_HANDLES.method(ITestNGMethod.class, "getRetryAnalyzer", ITestResult.class);
-  private static final MethodHandle TEST_METHOD_GET_RETRY_ANALYZER_LEGACY =
-      METHOD_HANDLES.method(ITestNGMethod.class, "getRetryAnalyzer");
+    private static final MethodHandle TEST_RESULT_WAS_RETRIED = METHOD_HANDLES.method(ITestResult.class, "wasRetried");
+    private static final MethodHandle TEST_METHOD_GET_RETRY_ANALYZER =
+            METHOD_HANDLES.method(ITestNGMethod.class, "getRetryAnalyzer", ITestResult.class);
+    private static final MethodHandle TEST_METHOD_GET_RETRY_ANALYZER_LEGACY =
+            METHOD_HANDLES.method(ITestNGMethod.class, "getRetryAnalyzer");
 
-  private static final ComparableVersion testNGv75 = new ComparableVersion("7.5");
-  private static final ComparableVersion testNGv70 = new ComparableVersion("7.0");
+    private static final ComparableVersion testNGv75 = new ComparableVersion("7.5");
+    private static final ComparableVersion testNGv70 = new ComparableVersion("7.0");
 
-  private static Class<?> getTestClass(final ITestResult result) {
-    IClass testClass = result.getTestClass();
-    if (testClass == null) {
-      return null;
+    private static Class<?> getTestClass(final ITestResult result) {
+        IClass testClass = result.getTestClass();
+        if (testClass == null) {
+            return null;
+        }
+        return testClass.getRealClass();
     }
-    return testClass.getRealClass();
-  }
 
-  private static Method getTestMethod(final ITestResult result) {
-    ITestNGMethod method = result.getMethod();
-    if (method == null) {
-      return null;
-    }
-    ConstructorOrMethod constructorOrMethod = method.getConstructorOrMethod();
-    if (constructorOrMethod == null) {
-      return null;
-    }
-    return constructorOrMethod.getMethod();
-  }
-
-  public static TestSourceData toTestSourceData(final ITestResult result) {
-    Class<?> testClass = getTestClass(result);
-    Method testMethod = getTestMethod(result);
-    return new TestSourceData(testClass, testMethod);
-  }
-
-  public static String getParameters(final ITestResult result) {
-    return getParameters(result.getParameters());
-  }
-
-  public static String getParameters(Object[] parameters) {
-    if (parameters == null || parameters.length == 0) {
-      return null;
+    private static Method getTestMethod(final ITestResult result) {
+        ITestNGMethod method = result.getMethod();
+        if (method == null) {
+            return null;
+        }
+        ConstructorOrMethod constructorOrMethod = method.getConstructorOrMethod();
+        if (constructorOrMethod == null) {
+            return null;
+        }
+        return constructorOrMethod.getMethod();
     }
 
-    // We build manually the JSON for test.parameters tag.
-    // Example: {"arguments":{"0":"param1","1":"param2"}}
-    try (JsonWriter writer = new JsonWriter()) {
-      writer.beginObject().name("arguments").beginObject();
-      for (int i = 0; i < parameters.length; i++) {
-        writer.name(Integer.toString(i)).value(String.valueOf(parameters[i]));
-      }
-      writer.endObject().endObject();
-      return writer.toString();
+    public static TestSourceData toTestSourceData(final ITestResult result) {
+        Class<?> testClass = getTestClass(result);
+        Method testMethod = getTestMethod(result);
+        return new TestSourceData(testClass, testMethod);
     }
-  }
 
-  public static List<String> getGroups(ITestResult result) {
-    ITestNGMethod method = result.getMethod();
-    if (method == null) {
-      return null;
+    public static String getParameters(final ITestResult result) {
+        return getParameters(result.getParameters());
     }
-    String[] groups = method.getGroups();
-    if (groups == null) {
-      return null;
+
+    public static String getParameters(Object[] parameters) {
+        if (parameters == null || parameters.length == 0) {
+            return null;
+        }
+
+        // We build manually the JSON for test.parameters tag.
+        // Example: {"arguments":{"0":"param1","1":"param2"}}
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginObject().name("arguments").beginObject();
+            for (int i = 0; i < parameters.length; i++) {
+                writer.name(Integer.toString(i)).value(String.valueOf(parameters[i]));
+            }
+            writer.endObject().endObject();
+            return writer.toString();
+        }
     }
-    return Arrays.asList(groups);
-  }
-
-  public static List<String> getGroups(ITestClass testClass) {
-    Class<?> realClass = testClass.getRealClass();
-    List<String> groups = new ArrayList<>();
-    while (realClass != null) {
-      Test testAnnotation = realClass.getAnnotation(Test.class);
-      if (testAnnotation != null) {
-        Collections.addAll(groups, testAnnotation.groups());
-      }
-
-      realClass = realClass.getSuperclass();
+
+    public static List<String> getGroups(ITestResult result) {
+        ITestNGMethod method = result.getMethod();
+        if (method == null) {
+            return null;
+        }
+        String[] groups = method.getGroups();
+        if (groups == null) {
+            return null;
+        }
+        return Arrays.asList(groups);
     }
-    return !groups.isEmpty() ? groups : null;
-  }
 
-  public static List<String> getGroups(Method method) {
-    List<String> groups = new ArrayList<>();
+    public static List<String> getGroups(ITestClass testClass) {
+        Class<?> realClass = testClass.getRealClass();
+        List<String> groups = new ArrayList<>();
+        while (realClass != null) {
+            Test testAnnotation = realClass.getAnnotation(Test.class);
+            if (testAnnotation != null) {
+                Collections.addAll(groups, testAnnotation.groups());
+            }
 
-    Test methodAnnotation = method.getAnnotation(Test.class);
-    if (methodAnnotation != null) {
-      Collections.addAll(groups, methodAnnotation.groups());
+            realClass = realClass.getSuperclass();
+        }
+        return !groups.isEmpty() ? groups : null;
     }
 
-    Class<?> clazz = method.getDeclaringClass();
-    do {
-      Test classAnnotation = clazz.getAnnotation(Test.class);
-      if (classAnnotation != null) {
-        Collections.addAll(groups, classAnnotation.groups());
-      }
-      clazz = clazz.getSuperclass();
-    } while (clazz != null);
-
-    return groups;
-  }
-
-  public static TestNGClassListener getTestNGClassListener(ITestContext testContext) {
-    try {
-      if (!(testContext instanceof ITestResultNotifier)) {
-        throw new RuntimeException(
-            "Test context is not an instance of ITestResultNotifier: " + testContext);
-      }
-
-      ITestResultNotifier testResultNotifier = (ITestResultNotifier) testContext;
-      List<ITestListener> testListeners = testResultNotifier.getTestListeners();
-      if (testListeners == null) {
-        throw new RuntimeException("Test listeners are null");
-      }
-
-      for (ITestListener testListener : testListeners) {
-        if (testListener instanceof TestNGClassListener) {
-          return (TestNGClassListener) testListener;
+    public static List<String> getGroups(Method method) {
+        List<String> groups = new ArrayList<>();
+
+        Test methodAnnotation = method.getAnnotation(Test.class);
+        if (methodAnnotation != null) {
+            Collections.addAll(groups, methodAnnotation.groups());
         }
-      }
-      throw new RuntimeException("Tracing listener not found: " + testListeners);
 
-    } catch (Exception e) {
-      throw new RuntimeException("Could not get tracing listener", e);
-    }
-  }
-
-  public static boolean isParallelized(ITestClass testClass) {
-    try {
-      // reflection needs to be used since XmlTest#getParallel
-      // has different return type in different versions,
-      // and if the method is invoked directly,
-      // the instrumentation will not get past Muzzle checks
-      Object parallel = METHOD_HANDLES.invoke(XML_TEST_GET_PARALLEL, testClass.getXmlTest());
-      return parallel != null
-          && ("methods".equals(parallel.toString()) || "tests".equals(parallel.toString()));
-    } catch (Throwable e) {
-      LOGGER.warn("Error while checking if a test class is paralellized");
-      return false;
+        Class<?> clazz = method.getDeclaringClass();
+        do {
+            Test classAnnotation = clazz.getAnnotation(Test.class);
+            if (classAnnotation != null) {
+                Collections.addAll(groups, classAnnotation.groups());
+            }
+            clazz = clazz.getSuperclass();
+        } while (clazz != null);
+
+        return groups;
     }
-  }
 
-  public static String getTestNGVersion() {
-    Class<TestNG> testNg = TestNG.class;
-    Package pkg = testNg.getPackage();
+    public static TestNGClassListener getTestNGClassListener(ITestContext testContext) {
+        try {
+            if (!(testContext instanceof ITestResultNotifier)) {
+                throw new RuntimeException("Test context is not an instance of ITestResultNotifier: " + testContext);
+            }
+
+            ITestResultNotifier testResultNotifier = (ITestResultNotifier) testContext;
+            List<ITestListener> testListeners = testResultNotifier.getTestListeners();
+            if (testListeners == null) {
+                throw new RuntimeException("Test listeners are null");
+            }
+
+            for (ITestListener testListener : testListeners) {
+                if (testListener instanceof TestNGClassListener) {
+                    return (TestNGClassListener) testListener;
+                }
+            }
+            throw new RuntimeException("Tracing listener not found: " + testListeners);
+
+        } catch (Exception e) {
+            throw new RuntimeException("Could not get tracing listener", e);
+        }
+    }
 
-    String implVersion = pkg.getImplementationVersion();
-    if (implVersion != null) {
-      return implVersion;
+    public static boolean isParallelized(ITestClass testClass) {
+        try {
+            // reflection needs to be used since XmlTest#getParallel
+            // has different return type in different versions,
+            // and if the method is invoked directly,
+            // the instrumentation will not get past Muzzle checks
+            Object parallel = METHOD_HANDLES.invoke(XML_TEST_GET_PARALLEL, testClass.getXmlTest());
+            return parallel != null && ("methods".equals(parallel.toString()) || "tests".equals(parallel.toString()));
+        } catch (Throwable e) {
+            LOGGER.warn("Error while checking if a test class is paralellized");
+            return false;
+        }
     }
 
-    String specVersion = pkg.getSpecificationVersion();
-    if (specVersion != null) {
-      return specVersion;
+    public static String getTestNGVersion() {
+        Class<TestNG> testNg = TestNG.class;
+        Package pkg = testNg.getPackage();
+
+        String implVersion = pkg.getImplementationVersion();
+        if (implVersion != null) {
+            return implVersion;
+        }
+
+        String specVersion = pkg.getSpecificationVersion();
+        if (specVersion != null) {
+            return specVersion;
+        }
+
+        try {
+            String className = testNg.getSimpleName() + ".class";
+            URL classResource = testNg.getResource(className);
+            if (classResource == null) {
+                return null;
+            }
+
+            String classPath = classResource.toString();
+            String manifestPath = classPath.substring(0, classPath.lastIndexOf("!") + 1) + "/META-INF/MANIFEST.MF";
+            try (InputStream manifestStream = new java.net.URL(manifestPath).openStream()) {
+                Properties manifestProperties = new Properties();
+                manifestProperties.load(manifestStream);
+                return manifestProperties.getProperty("Bundle-Version");
+            }
+
+        } catch (Exception e) {
+            return null;
+        }
     }
 
-    try {
-      String className = testNg.getSimpleName() + ".class";
-      URL classResource = testNg.getResource(className);
-      if (classResource == null) {
-        return null;
-      }
-
-      String classPath = classResource.toString();
-      String manifestPath =
-          classPath.substring(0, classPath.lastIndexOf("!") + 1) + "/META-INF/MANIFEST.MF";
-      try (InputStream manifestStream = new java.net.URL(manifestPath).openStream()) {
-        Properties manifestProperties = new Properties();
-        manifestProperties.load(manifestStream);
-        return manifestProperties.getProperty("Bundle-Version");
-      }
-
-    } catch (Exception e) {
-      return null;
+    public static boolean wasRetried(ITestResult result) {
+        try {
+            return METHOD_HANDLES.invoke(TEST_RESULT_WAS_RETRIED, result);
+        } catch (Throwable e) {
+            return false;
+        }
     }
-  }
 
-  public static boolean wasRetried(ITestResult result) {
-    try {
-      return METHOD_HANDLES.invoke(TEST_RESULT_WAS_RETRIED, result);
-    } catch (Throwable e) {
-      return false;
+    public static IRetryAnalyzer getRetryAnalyzer(ITestResult result) {
+        ITestNGMethod method = result.getMethod();
+        if (method == null) {
+            return null;
+        }
+        IRetryAnalyzer analyzer = METHOD_HANDLES.invoke(TEST_METHOD_GET_RETRY_ANALYZER, method, result);
+        if (analyzer != null) {
+            return analyzer;
+        } else {
+            return METHOD_HANDLES.invoke(TEST_METHOD_GET_RETRY_ANALYZER_LEGACY, method);
+        }
     }
-  }
 
-  public static IRetryAnalyzer getRetryAnalyzer(ITestResult result) {
-    ITestNGMethod method = result.getMethod();
-    if (method == null) {
-      return null;
+    @Nonnull
+    public static TestIdentifier toTestIdentifier(Method method, Object instance, Object[] parameters) {
+        Class<?> testClass = instance != null ? instance.getClass() : method.getDeclaringClass();
+        String testSuiteName = testClass.getName();
+        String testName = method.getName();
+        String testParameters = TestNGUtils.getParameters(parameters);
+        return new TestIdentifier(testSuiteName, testName, testParameters);
     }
-    IRetryAnalyzer analyzer = METHOD_HANDLES.invoke(TEST_METHOD_GET_RETRY_ANALYZER, method, result);
-    if (analyzer != null) {
-      return analyzer;
-    } else {
-      return METHOD_HANDLES.invoke(TEST_METHOD_GET_RETRY_ANALYZER_LEGACY, method);
+
+    @Nonnull
+    public static TestIdentifier toTestIdentifier(ITestResult result) {
+        String testSuiteName = result.getInstanceName();
+        String testName = (result.getName() != null)
+                ? result.getName()
+                : result.getMethod().getMethodName();
+        String testParameters = TestNGUtils.getParameters(result);
+        return new TestIdentifier(testSuiteName, testName, testParameters);
     }
-  }
-
-  @Nonnull
-  public static TestIdentifier toTestIdentifier(
-      Method method, Object instance, Object[] parameters) {
-    Class<?> testClass = instance != null ? instance.getClass() : method.getDeclaringClass();
-    String testSuiteName = testClass.getName();
-    String testName = method.getName();
-    String testParameters = TestNGUtils.getParameters(parameters);
-    return new TestIdentifier(testSuiteName, testName, testParameters);
-  }
-
-  @Nonnull
-  public static TestIdentifier toTestIdentifier(ITestResult result) {
-    String testSuiteName = result.getInstanceName();
-    String testName =
-        (result.getName() != null) ? result.getName() : result.getMethod().getMethodName();
-    String testParameters = TestNGUtils.getParameters(result);
-    return new TestIdentifier(testSuiteName, testName, testParameters);
-  }
-
-  @Nonnull
-  public static TestSuiteDescriptor toSuiteDescriptor(ITestClass testClass) {
-    String testSuiteName = testClass.getName();
-    Class<?> testSuiteClass = testClass.getRealClass();
-    return new TestSuiteDescriptor(testSuiteName, testSuiteClass);
-  }
-
-  public static boolean isEFDSupported(String version) {
-    return version != null && testNGv75.compareTo(new ComparableVersion(version)) <= 0;
-  }
-
-  public static boolean isExceptionSuppressionSupported(String version) {
-    return version != null && testNGv75.compareTo(new ComparableVersion(version)) <= 0;
-  }
-
-  public static boolean isTestOrderingSupported(String version) {
-    return version != null && testNGv70.compareTo(new ComparableVersion(version)) <= 0;
-  }
-
-  public static List<LibraryCapability> capabilities(String version) {
-    List<LibraryCapability> baseCapabilities =
-        new ArrayList<>(
-            Arrays.asList(
-                LibraryCapability.TIA, LibraryCapability.IMPACTED, LibraryCapability.DISABLED));
-
-    boolean isEFDSupported = isEFDSupported(version);
-    boolean isExceptionSuppressionSupported = isExceptionSuppressionSupported(version);
-    if (isExceptionSuppressionSupported) {
-      baseCapabilities.add(LibraryCapability.ATR);
-      baseCapabilities.add(LibraryCapability.FTR);
-      baseCapabilities.add(LibraryCapability.QUARANTINE);
+
+    @Nonnull
+    public static TestSuiteDescriptor toSuiteDescriptor(ITestClass testClass) {
+        String testSuiteName = testClass.getName();
+        Class<?> testSuiteClass = testClass.getRealClass();
+        return new TestSuiteDescriptor(testSuiteName, testSuiteClass);
     }
-    if (isEFDSupported) {
-      baseCapabilities.add(LibraryCapability.EFD);
+
+    public static boolean isEFDSupported(String version) {
+        return version != null && testNGv75.compareTo(new ComparableVersion(version)) <= 0;
     }
-    if (isExceptionSuppressionSupported && isEFDSupported) {
-      baseCapabilities.add(LibraryCapability.ATTEMPT_TO_FIX);
+
+    public static boolean isExceptionSuppressionSupported(String version) {
+        return version != null && testNGv75.compareTo(new ComparableVersion(version)) <= 0;
     }
-    if (isTestOrderingSupported(version)) {
-      baseCapabilities.add(LibraryCapability.FAIL_FAST);
+
+    public static boolean isTestOrderingSupported(String version) {
+        return version != null && testNGv70.compareTo(new ComparableVersion(version)) <= 0;
     }
 
-    return baseCapabilities;
-  }
+    public static List<LibraryCapability> capabilities(String version) {
+        List<LibraryCapability> baseCapabilities = new ArrayList<>(
+                Arrays.asList(LibraryCapability.TIA, LibraryCapability.IMPACTED, LibraryCapability.DISABLED));
+
+        boolean isEFDSupported = isEFDSupported(version);
+        boolean isExceptionSuppressionSupported = isExceptionSuppressionSupported(version);
+        if (isExceptionSuppressionSupported) {
+            baseCapabilities.add(LibraryCapability.ATR);
+            baseCapabilities.add(LibraryCapability.FTR);
+            baseCapabilities.add(LibraryCapability.QUARANTINE);
+        }
+        if (isEFDSupported) {
+            baseCapabilities.add(LibraryCapability.EFD);
+        }
+        if (isExceptionSuppressionSupported && isEFDSupported) {
+            baseCapabilities.add(LibraryCapability.ATTEMPT_TO_FIX);
+        }
+        if (isTestOrderingSupported(version)) {
+            baseCapabilities.add(LibraryCapability.FAIL_FAST);
+        }
+
+        return baseCapabilities;
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TracingListener.java b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TracingListener.java
index 6020a9b083d..bafdb100229 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TracingListener.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TracingListener.java
@@ -14,132 +14,131 @@
 import org.testng.ITestListener;
 import org.testng.ITestResult;
 
-public class TracingListener extends TestNGClassListener
-    implements ITestListener, IConfigurationListener {
-
-  public static final String FRAMEWORK_NAME = "testng";
-  public static final String FRAMEWORK_VERSION = TestNGUtils.getTestNGVersion();
-
-  @Override
-  public void onStart(final ITestContext context) {
-    // ignore
-  }
-
-  @Override
-  public void onFinish(final ITestContext context) {
-    // ignore
-  }
-
-  @Override
-  protected void onBeforeClass(ITestClass testClass, boolean parallelized) {
-    TestSuiteDescriptor suiteDescriptor = TestNGUtils.toSuiteDescriptor(testClass);
-    String testSuiteName = testClass.getName();
-    Class<?> testSuiteClass = testClass.getRealClass();
-    List<String> groups = TestNGUtils.getGroups(testClass);
-    TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart(
-        suiteDescriptor,
-        testSuiteName,
-        FRAMEWORK_NAME,
-        FRAMEWORK_VERSION,
-        testSuiteClass,
-        groups,
-        parallelized,
-        TestFrameworkInstrumentation.TESTNG,
-        null);
-  }
-
-  @Override
-  protected void onAfterClass(ITestClass testClass) {
-    TestSuiteDescriptor suiteDescriptor = TestNGUtils.toSuiteDescriptor(testClass);
-    TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null);
-  }
-
-  @Override
-  public void onConfigurationSuccess(ITestResult result) {
-    // ignore
-  }
-
-  @Override
-  public void onConfigurationFailure(ITestResult result) {
-    // suite setup or suite teardown failed
-    TestSuiteDescriptor suiteDescriptor =
-        TestNGUtils.toSuiteDescriptor(result.getMethod().getTestClass());
-    TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(
-        suiteDescriptor, result.getThrowable());
-  }
-
-  @Override
-  public void onConfigurationSkip(ITestResult result) {
-    // ignore
-  }
-
-  @Override
-  public void onTestStart(final ITestResult result) {
-    TestSuiteDescriptor suiteDescriptor =
-        TestNGUtils.toSuiteDescriptor(result.getMethod().getTestClass());
-    String testName =
-        (result.getName() != null) ? result.getName() : result.getMethod().getMethodName();
-    String testParameters = TestNGUtils.getParameters(result);
-    List<String> groups = TestNGUtils.getGroups(result);
-    TestSourceData testSourceData = TestNGUtils.toTestSourceData(result);
-
-    TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart(
-        suiteDescriptor,
-        result,
-        testName,
-        FRAMEWORK_NAME,
-        FRAMEWORK_VERSION,
-        testParameters,
-        groups,
-        testSourceData,
-        null,
-        executionTracker(result));
-  }
-
-  @Nullable
-  private TestExecutionTracker executionTracker(final ITestResult result) {
-    IRetryAnalyzer retryAnalyzer = TestNGUtils.getRetryAnalyzer(result);
-    if (retryAnalyzer instanceof RetryAnalyzer) {
-      RetryAnalyzer datadogAnalyzer = (RetryAnalyzer) retryAnalyzer;
-      return datadogAnalyzer.getExecutionTracker();
+public class TracingListener extends TestNGClassListener implements ITestListener, IConfigurationListener {
+
+    public static final String FRAMEWORK_NAME = "testng";
+    public static final String FRAMEWORK_VERSION = TestNGUtils.getTestNGVersion();
+
+    @Override
+    public void onStart(final ITestContext context) {
+        // ignore
+    }
+
+    @Override
+    public void onFinish(final ITestContext context) {
+        // ignore
     }
-    return null;
-  }
-
-  @Override
-  public void onTestSuccess(final ITestResult result) {
-    TestExecutionTracker executionTracker = executionTracker(result);
-    TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish(result, null, executionTracker);
-  }
-
-  @Override
-  public void onTestFailure(final ITestResult result) {
-    Throwable throwable = result.getThrowable();
-    TestExecutionTracker executionTracker = executionTracker(result);
-    TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(result, throwable);
-    TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish(result, null, executionTracker);
-  }
-
-  @Override
-  public void onTestFailedButWithinSuccessPercentage(final ITestResult result) {
-    onTestFailure(result);
-  }
-
-  @Override
-  public void onTestSkipped(final ITestResult result) {
-    Throwable throwable = result.getThrowable();
-    if (TestNGUtils.wasRetried(result)) {
-      // TestNG reports tests retried with IRetryAnalyzer as skipped,
-      // this is done to avoid failing the build when retrying tests.
-      // We want to report such tests as failed to Datadog,
-      // to provide more accurate data (and to enable flakiness detection)
-      TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(result, throwable);
-    } else {
-      // Typically the way of skipping a TestNG test is throwing a SkipException
-      String reason = throwable != null ? throwable.getMessage() : null;
-      TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip(result, reason);
+
+    @Override
+    protected void onBeforeClass(ITestClass testClass, boolean parallelized) {
+        TestSuiteDescriptor suiteDescriptor = TestNGUtils.toSuiteDescriptor(testClass);
+        String testSuiteName = testClass.getName();
+        Class<?> testSuiteClass = testClass.getRealClass();
+        List<String> groups = TestNGUtils.getGroups(testClass);
+        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart(
+                suiteDescriptor,
+                testSuiteName,
+                FRAMEWORK_NAME,
+                FRAMEWORK_VERSION,
+                testSuiteClass,
+                groups,
+                parallelized,
+                TestFrameworkInstrumentation.TESTNG,
+                null);
+    }
+
+    @Override
+    protected void onAfterClass(ITestClass testClass) {
+        TestSuiteDescriptor suiteDescriptor = TestNGUtils.toSuiteDescriptor(testClass);
+        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null);
+    }
+
+    @Override
+    public void onConfigurationSuccess(ITestResult result) {
+        // ignore
+    }
+
+    @Override
+    public void onConfigurationFailure(ITestResult result) {
+        // suite setup or suite teardown failed
+        TestSuiteDescriptor suiteDescriptor =
+                TestNGUtils.toSuiteDescriptor(result.getMethod().getTestClass());
+        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(suiteDescriptor, result.getThrowable());
+    }
+
+    @Override
+    public void onConfigurationSkip(ITestResult result) {
+        // ignore
+    }
+
+    @Override
+    public void onTestStart(final ITestResult result) {
+        TestSuiteDescriptor suiteDescriptor =
+                TestNGUtils.toSuiteDescriptor(result.getMethod().getTestClass());
+        String testName = (result.getName() != null)
+                ? result.getName()
+                : result.getMethod().getMethodName();
+        String testParameters = TestNGUtils.getParameters(result);
+        List<String> groups = TestNGUtils.getGroups(result);
+        TestSourceData testSourceData = TestNGUtils.toTestSourceData(result);
+
+        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart(
+                suiteDescriptor,
+                result,
+                testName,
+                FRAMEWORK_NAME,
+                FRAMEWORK_VERSION,
+                testParameters,
+                groups,
+                testSourceData,
+                null,
+                executionTracker(result));
+    }
+
+    @Nullable
+    private TestExecutionTracker executionTracker(final ITestResult result) {
+        IRetryAnalyzer retryAnalyzer = TestNGUtils.getRetryAnalyzer(result);
+        if (retryAnalyzer instanceof RetryAnalyzer) {
+            RetryAnalyzer datadogAnalyzer = (RetryAnalyzer) retryAnalyzer;
+            return datadogAnalyzer.getExecutionTracker();
+        }
+        return null;
+    }
+
+    @Override
+    public void onTestSuccess(final ITestResult result) {
+        TestExecutionTracker executionTracker = executionTracker(result);
+        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish(result, null, executionTracker);
+    }
+
+    @Override
+    public void onTestFailure(final ITestResult result) {
+        Throwable throwable = result.getThrowable();
+        TestExecutionTracker executionTracker = executionTracker(result);
+        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(result, throwable);
+        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish(result, null, executionTracker);
+    }
+
+    @Override
+    public void onTestFailedButWithinSuccessPercentage(final ITestResult result) {
+        onTestFailure(result);
+    }
+
+    @Override
+    public void onTestSkipped(final ITestResult result) {
+        Throwable throwable = result.getThrowable();
+        if (TestNGUtils.wasRetried(result)) {
+            // TestNG reports tests retried with IRetryAnalyzer as skipped,
+            // this is done to avoid failing the build when retrying tests.
+            // We want to report such tests as failed to Datadog,
+            // to provide more accurate data (and to enable flakiness detection)
+            TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(result, throwable);
+        } else {
+            // Typically the way of skipping a TestNG test is throwing a SkipException
+            String reason = throwable != null ? throwable.getMessage() : null;
+            TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip(result, reason);
+        }
+        TestExecutionTracker executionTracker = executionTracker(result);
+        TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish(result, null, executionTracker);
     }
-    TestExecutionTracker executionTracker = executionTracker(result);
-    TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish(result, null, executionTracker);
-  }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/execution/RetryAnalyzer.java b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/execution/RetryAnalyzer.java
index c066a75f1fc..5eb97d2dde0 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/execution/RetryAnalyzer.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/execution/RetryAnalyzer.java
@@ -13,53 +13,52 @@
 
 public class RetryAnalyzer implements IRetryAnalyzer {
 
-  private volatile TestExecutionPolicy executionPolicy;
+    private volatile TestExecutionPolicy executionPolicy;
 
-  @SuppressFBWarnings(
-      value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
-      justification = "the field is confined to a single thread")
-  private boolean suppressFailures;
+    @SuppressFBWarnings(
+            value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
+            justification = "the field is confined to a single thread")
+    private boolean suppressFailures;
 
-  public void createExecutionPolicy(ITestResult result) {
-    if (executionPolicy == null) {
-      synchronized (this) {
+    public void createExecutionPolicy(ITestResult result) {
         if (executionPolicy == null) {
-          TestIdentifier testIdentifier = TestNGUtils.toTestIdentifier(result);
-          TestSourceData testSourceData = TestNGUtils.toTestSourceData(result);
-          Collection<String> testTags = TestNGUtils.getGroups(result);
-          executionPolicy =
-              TestEventsHandlerHolder.TEST_EVENTS_HANDLER.executionPolicy(
-                  testIdentifier, testSourceData, testTags);
+            synchronized (this) {
+                if (executionPolicy == null) {
+                    TestIdentifier testIdentifier = TestNGUtils.toTestIdentifier(result);
+                    TestSourceData testSourceData = TestNGUtils.toTestSourceData(result);
+                    Collection<String> testTags = TestNGUtils.getGroups(result);
+                    executionPolicy = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.executionPolicy(
+                            testIdentifier, testSourceData, testTags);
+                }
+            }
         }
-      }
     }
-  }
 
-  @Override
-  public boolean retry(ITestResult result) {
-    if (TestEventsHandlerHolder.TEST_EVENTS_HANDLER == null) {
-      return false;
+    @Override
+    public boolean retry(ITestResult result) {
+        if (TestEventsHandlerHolder.TEST_EVENTS_HANDLER == null) {
+            return false;
+        }
+        createExecutionPolicy(result);
+        return executionPolicy.applicable();
     }
-    createExecutionPolicy(result);
-    return executionPolicy.applicable();
-  }
 
-  public void setSuppressFailures(ITestResult result) {
-    createExecutionPolicy(result);
-    suppressFailures = executionPolicy.suppressFailures();
-  }
+    public void setSuppressFailures(ITestResult result) {
+        createExecutionPolicy(result);
+        suppressFailures = executionPolicy.suppressFailures();
+    }
 
-  public boolean shouldPropagateFailure() {
-    return executionPolicy != null && executionPolicy.propagateFailure();
-  }
+    public boolean shouldPropagateFailure() {
+        return executionPolicy != null && executionPolicy.propagateFailure();
+    }
 
-  public boolean getAndResetSuppressFailures() {
-    boolean suppressFailures = this.suppressFailures;
-    this.suppressFailures = false;
-    return suppressFailures;
-  }
+    public boolean getAndResetSuppressFailures() {
+        boolean suppressFailures = this.suppressFailures;
+        this.suppressFailures = false;
+        return suppressFailures;
+    }
 
-  public TestExecutionTracker getExecutionTracker() {
-    return executionPolicy;
-  }
+    public TestExecutionTracker getExecutionTracker() {
+        return executionPolicy;
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/execution/RetryAnnotationTransformer.java b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/execution/RetryAnnotationTransformer.java
index 471716729eb..7d3861548fe 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/execution/RetryAnnotationTransformer.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/execution/RetryAnnotationTransformer.java
@@ -6,18 +6,17 @@
 import org.testng.annotations.ITestAnnotation;
 
 public class RetryAnnotationTransformer implements IAnnotationTransformer {
-  private final IAnnotationTransformer delegate;
+    private final IAnnotationTransformer delegate;
 
-  public RetryAnnotationTransformer(IAnnotationTransformer delegate) {
-    this.delegate = delegate;
-  }
+    public RetryAnnotationTransformer(IAnnotationTransformer delegate) {
+        this.delegate = delegate;
+    }
 
-  @Override
-  public void transform(
-      ITestAnnotation annotation, Class testClass, Constructor testConstructor, Method testMethod) {
-    annotation.setRetryAnalyzer(RetryAnalyzer.class);
-    if (delegate != null) {
-      delegate.transform(annotation, testClass, testConstructor, testMethod);
+    @Override
+    public void transform(ITestAnnotation annotation, Class testClass, Constructor testConstructor, Method testMethod) {
+        annotation.setRetryAnalyzer(RetryAnalyzer.class);
+        if (delegate != null) {
+            delegate.transform(annotation, testClass, testConstructor, testMethod);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/BaseTestInheritance.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/BaseTestInheritance.java
index 24d0084d7a2..028fcc8e4fc 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/BaseTestInheritance.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/BaseTestInheritance.java
@@ -6,8 +6,8 @@
 
 public class BaseTestInheritance {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestError.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestError.java
index c2fb77b9728..63e551bf993 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestError.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestError.java
@@ -4,8 +4,8 @@
 
 public class TestError {
 
-  @Test
-  public void test_error() {
-    throw new IllegalArgumentException("This exception is an example");
-  }
+    @Test
+    public void test_error() {
+        throw new IllegalArgumentException("This exception is an example");
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailAndThenSucceed.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailAndThenSucceed.java
index 8645f127ad4..2b2fb4c811a 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailAndThenSucceed.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailAndThenSucceed.java
@@ -6,10 +6,10 @@
 
 public class TestFailAndThenSucceed {
 
-  private int executions;
+    private int executions;
 
-  @Test
-  public void test_fail_and_then_succeed() {
-    assertTrue(++executions >= 2);
-  }
+    @Test
+    public void test_fail_and_then_succeed() {
+        assertTrue(++executions >= 2);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailed.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailed.java
index 144d5a8bb16..cc3274bed60 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailed.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailed.java
@@ -6,8 +6,8 @@
 
 public class TestFailed {
 
-  @Test
-  public void test_failed() {
-    assertTrue(false);
-  }
+    @Test
+    public void test_failed() {
+        assertTrue(false);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedAndSucceed.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedAndSucceed.java
index 6222ed7e8e8..e351e101063 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedAndSucceed.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedAndSucceed.java
@@ -6,18 +6,18 @@
 
 public class TestFailedAndSucceed {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_failed() {
-    assertTrue(false);
-  }
+    @Test
+    public void test_failed() {
+        assertTrue(false);
+    }
 
-  @Test
-  public void test_another_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_another_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedParameterized.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedParameterized.java
index c55fd9842e6..4bdb7d6b48e 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedParameterized.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedParameterized.java
@@ -7,16 +7,16 @@
 
 public class TestFailedParameterized {
 
-  @DataProvider(name = "dataProvider")
-  public static Object[][] data() {
-    return new Object[][] {
-      {"hello", true},
-      {"\"goodbye\"", false}
-    };
-  }
+    @DataProvider(name = "dataProvider")
+    public static Object[][] data() {
+        return new Object[][] {
+            {"hello", true},
+            {"\"goodbye\"", false}
+        };
+    }
 
-  @Test(dataProvider = "dataProvider")
-  public void parameterized_test_succeed(final String str, final boolean booleanValue) {
-    assertTrue(booleanValue);
-  }
+    @Test(dataProvider = "dataProvider")
+    public void parameterized_test_succeed(final String str, final boolean booleanValue) {
+        assertTrue(booleanValue);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedSuiteSetup.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedSuiteSetup.java
index de1e19d066d..9ceacd1d787 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedSuiteSetup.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedSuiteSetup.java
@@ -7,18 +7,18 @@
 
 public class TestFailedSuiteSetup {
 
-  @BeforeClass
-  public void setup() {
-    throw new RuntimeException("suite set up failed");
-  }
+    @BeforeClass
+    public void setup() {
+        throw new RuntimeException("suite set up failed");
+    }
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_another_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_another_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedSuiteTearDown.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedSuiteTearDown.java
index 2af92c088f8..8781e4ef73a 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedSuiteTearDown.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedSuiteTearDown.java
@@ -7,18 +7,18 @@
 
 public class TestFailedSuiteTearDown {
 
-  @AfterClass
-  public void tearDown() {
-    throw new RuntimeException("suite tear down failed");
-  }
+    @AfterClass
+    public void tearDown() {
+        throw new RuntimeException("suite tear down failed");
+    }
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_another_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_another_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedThenSucceed.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedThenSucceed.java
index dc77fd2f6a4..a20e34d4c28 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedThenSucceed.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedThenSucceed.java
@@ -6,10 +6,10 @@
 
 public class TestFailedThenSucceed {
 
-  private int retry;
+    private int retry;
 
-  @Test
-  public void test_failed() {
-    assertTrue(++retry >= 3);
-  }
+    @Test
+    public void test_failed() {
+        assertTrue(++retry >= 3);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedWithSuccessPercentage.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedWithSuccessPercentage.java
index ace6f6a08ed..af184b23fa5 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedWithSuccessPercentage.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestFailedWithSuccessPercentage.java
@@ -6,15 +6,15 @@
 
 public class TestFailedWithSuccessPercentage {
 
-  private int i = 0;
+    private int i = 0;
 
-  @Test(successPercentage = 60, invocationCount = 5)
-  public void test_failed_with_success_percentage() {
-    i++;
-    if (i == 1 || i == 2) {
-      assertTrue(false);
-    } else {
-      assertTrue(true);
+    @Test(successPercentage = 60, invocationCount = 5)
+    public void test_failed_with_success_percentage() {
+        i++;
+        if (i == 1 || i == 2) {
+            assertTrue(false);
+        } else {
+            assertTrue(true);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestParameterized.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestParameterized.java
index 7d48256b9aa..052a7de738b 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestParameterized.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestParameterized.java
@@ -7,16 +7,16 @@
 
 public class TestParameterized {
 
-  @DataProvider(name = "dataProvider")
-  public static Object[][] data() {
-    return new Object[][] {
-      {"hello", true},
-      {"\"goodbye\"", false}
-    };
-  }
+    @DataProvider(name = "dataProvider")
+    public static Object[][] data() {
+        return new Object[][] {
+            {"hello", true},
+            {"\"goodbye\"", false}
+        };
+    }
 
-  @Test(dataProvider = "dataProvider")
-  public void parameterized_test_succeed(final String str, final boolean booleanValue) {
-    assertTrue(true);
-  }
+    @Test(dataProvider = "dataProvider")
+    public void parameterized_test_succeed(final String str, final boolean booleanValue) {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestParameterizedModifiesParams.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestParameterizedModifiesParams.java
index a17f2a946be..f31dcee90c0 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestParameterizedModifiesParams.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestParameterizedModifiesParams.java
@@ -10,14 +10,14 @@
 /** Inspired by a real-world example */
 public class TestParameterizedModifiesParams {
 
-  @DataProvider(name = "dataProvider")
-  public static Object[][] data() {
-    return new Object[][] {{"I will modify this set", new HashSet<>()}};
-  }
+    @DataProvider(name = "dataProvider")
+    public static Object[][] data() {
+        return new Object[][] {{"I will modify this set", new HashSet<>()}};
+    }
 
-  @Test(dataProvider = "dataProvider")
-  public void parameterized_test_succeed(final String str, final Set<String> set) {
-    set.add("why not");
-    assertEquals(1, set.size());
-  }
+    @Test(dataProvider = "dataProvider")
+    public void parameterized_test_succeed(final String str, final Set<String> set) {
+        set.add("why not");
+        assertEquals(1, set.size());
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSkipped.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSkipped.java
index 8777e64e1ed..c32675096a4 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSkipped.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSkipped.java
@@ -4,8 +4,8 @@
 import org.testng.annotations.Test;
 
 public class TestSkipped {
-  @Test
-  public void test_skipped() {
-    throw new SkipException("Ignore reason in test");
-  }
+    @Test
+    public void test_skipped() {
+        throw new SkipException("Ignore reason in test");
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSkippedClass.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSkippedClass.java
index 9bce4af582c..c2b81601840 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSkippedClass.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSkippedClass.java
@@ -8,18 +8,18 @@
 
 public class TestSkippedClass {
 
-  @BeforeClass
-  public void setUp() {
-    throw new SkipException("Ignore reason in class");
-  }
+    @BeforeClass
+    public void setUp() {
+        throw new SkipException("Ignore reason in class");
+    }
 
-  @Test
-  public void test_class_skipped() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_class_skipped() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_class_another_skipped() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_class_another_skipped() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSkippedNested.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSkippedNested.java
index 054e1a4a952..124950f0cfb 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSkippedNested.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSkippedNested.java
@@ -9,20 +9,20 @@
 
 public class TestSkippedNested {
 
-  @BeforeClass
-  public void setUp() {
-    throw new SkipException("Ignore reason in class");
-  }
-
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @BeforeClass
+    public void setUp() {
+        throw new SkipException("Ignore reason in class");
+    }
 
-  public class NestedSuite {
     @Test
-    public void test_succeed_nested() {
-      Assertions.assertTrue(true);
+    public void test_succeed() {
+        assertTrue(true);
+    }
+
+    public class NestedSuite {
+        @Test
+        public void test_succeed_nested() {
+            Assertions.assertTrue(true);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceed.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceed.java
index 8cf8fdc33d9..7ea4439e7fa 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceed.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceed.java
@@ -6,8 +6,8 @@
 
 public class TestSucceed {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedAndSkipped.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedAndSkipped.java
index e81b3c1235a..41cc2e55648 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedAndSkipped.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedAndSkipped.java
@@ -7,13 +7,13 @@
 
 public class TestSucceedAndSkipped {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_skipped() {
-    throw new SkipException("Ignore reason in test");
-  }
+    @Test
+    public void test_skipped() {
+        throw new SkipException("Ignore reason in test");
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedAndThenFail.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedAndThenFail.java
index 9e7fa41e414..bdd4b84801a 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedAndThenFail.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedAndThenFail.java
@@ -6,10 +6,10 @@
 
 public class TestSucceedAndThenFail {
 
-  private int executions;
+    private int executions;
 
-  @Test
-  public void test_succeed_and_then_fail() {
-    assertTrue(++executions < 2);
-  }
+    @Test
+    public void test_succeed_and_then_fail() {
+        assertTrue(++executions < 2);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedDataProvider.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedDataProvider.java
index 5d4c003bc47..f59a88ceac2 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedDataProvider.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedDataProvider.java
@@ -8,20 +8,20 @@
 
 public class TestSucceedDataProvider {
 
-  private final int param;
+    private final int param;
 
-  @Factory(dataProvider = "dataMethod")
-  public TestSucceedDataProvider(int param) {
-    this.param = param;
-  }
+    @Factory(dataProvider = "dataMethod")
+    public TestSucceedDataProvider(int param) {
+        this.param = param;
+    }
 
-  @DataProvider
-  public static Object[][] dataMethod() {
-    return new Object[][] {{0}};
-  }
+    @DataProvider
+    public static Object[][] dataMethod() {
+        return new Object[][] {{0}};
+    }
 
-  @Test
-  public void testMethod() {
-    assertEquals(param, 0);
-  }
+    @Test
+    public void testMethod() {
+        assertEquals(param, 0);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedGroups.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedGroups.java
index e8634c941f1..25daf2de511 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedGroups.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedGroups.java
@@ -7,10 +7,10 @@
 @Test(groups = "classGroup")
 public class TestSucceedGroups extends Parent {
 
-  @Test(groups = "testCaseGroup")
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test(groups = "testCaseGroup")
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
 
 @Test(groups = "parentGroup")
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedMultiple.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedMultiple.java
index ceb399176d0..1237d8f9b6e 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedMultiple.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedMultiple.java
@@ -6,13 +6,13 @@
 
 public class TestSucceedMultiple {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_succeed_another() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed_another() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedNested.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedNested.java
index b61a13615ae..63133d66eb8 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedNested.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedNested.java
@@ -7,15 +7,15 @@
 
 public class TestSucceedNested {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
-
-  public class NestedSuite {
     @Test
-    public void test_succeed_nested() {
-      Assertions.assertTrue(true);
+    public void test_succeed() {
+        assertTrue(true);
+    }
+
+    public class NestedSuite {
+        @Test
+        public void test_succeed_nested() {
+            Assertions.assertTrue(true);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedSkipEfd.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedSkipEfd.java
index 83942dc7dcc..60aa210dc31 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedSkipEfd.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedSkipEfd.java
@@ -7,8 +7,8 @@
 
 public class TestSucceedSkipEfd {
 
-  @Test(groups = CIConstants.Tags.EFD_DISABLE_TAG)
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test(groups = CIConstants.Tags.EFD_DISABLE_TAG)
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedSlow.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedSlow.java
index c4a91681a39..02457352c97 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedSlow.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedSlow.java
@@ -6,9 +6,9 @@
 
 public class TestSucceedSlow {
 
-  @Test
-  public void test_succeed() throws InterruptedException {
-    Thread.sleep(1100);
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() throws InterruptedException {
+        Thread.sleep(1100);
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedThreeCases.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedThreeCases.java
index dd42b16ec00..d5a7e6b85ec 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedThreeCases.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedThreeCases.java
@@ -6,18 +6,18 @@
 
 public class TestSucceedThreeCases {
 
-  @Test
-  public void test_succeed_a() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed_a() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_succeed_b() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed_b() {
+        assertTrue(true);
+    }
 
-  @Test
-  public void test_succeed_c() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed_c() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedUnskippable.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedUnskippable.java
index 785b5ca9f51..9cd81e72f7f 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedUnskippable.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedUnskippable.java
@@ -8,8 +8,8 @@
 @Test(groups = CIConstants.Tags.ITR_UNSKIPPABLE_TAG)
 public class TestSucceedUnskippable {
 
-  @Test
-  public void test_succeed() {
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() {
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedVerySlow.java b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedVerySlow.java
index 8a3a9c4eef0..16f669c849a 100644
--- a/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedVerySlow.java
+++ b/dd-java-agent/instrumentation/testng/testng-common/src/testFixtures/java/org/example/TestSucceedVerySlow.java
@@ -6,9 +6,9 @@
 
 public class TestSucceedVerySlow {
 
-  @Test
-  public void test_succeed() throws InterruptedException {
-    Thread.sleep(2100);
-    assertTrue(true);
-  }
+    @Test
+    public void test_succeed() throws InterruptedException {
+        Thread.sleep(2100);
+        assertTrue(true);
+    }
 }
diff --git a/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/BodyAdvice.java b/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/BodyAdvice.java
index a5279033349..7dffa6eb9c3 100644
--- a/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/BodyAdvice.java
+++ b/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/BodyAdvice.java
@@ -11,18 +11,18 @@
 import org.thymeleaf.processor.element.IElementTagStructureHandler;
 
 public class BodyAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  @Sink(VulnerabilityTypes.XSS)
-  public static void setBody(
-      @Advice.This ElementTagStructureHandler self, @Advice.Argument(0) final CharSequence text) {
-    final XssModule module = InstrumentationBridge.XSS;
-    if (module != null) {
-      ContextStore<IElementTagStructureHandler, ThymeleafContext> contextStore =
-          InstrumentationContext.get(IElementTagStructureHandler.class, ThymeleafContext.class);
-      ThymeleafContext ctx = contextStore.get(self);
-      if (ctx != null) {
-        module.onXss(text, ctx.getTemplateName(), ctx.getLine());
-      }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    @Sink(VulnerabilityTypes.XSS)
+    public static void setBody(
+            @Advice.This ElementTagStructureHandler self, @Advice.Argument(0) final CharSequence text) {
+        final XssModule module = InstrumentationBridge.XSS;
+        if (module != null) {
+            ContextStore<IElementTagStructureHandler, ThymeleafContext> contextStore =
+                    InstrumentationContext.get(IElementTagStructureHandler.class, ThymeleafContext.class);
+            ThymeleafContext ctx = contextStore.get(self);
+            if (ctx != null) {
+                module.onXss(text, ctx.getTemplateName(), ctx.getLine());
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/ElementTagStructureHandlerInstrumentation.java b/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/ElementTagStructureHandlerInstrumentation.java
index 7e8d1854d34..ce7aee5ae0f 100644
--- a/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/ElementTagStructureHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/ElementTagStructureHandlerInstrumentation.java
@@ -12,28 +12,28 @@
 
 @AutoService(InstrumenterModule.class)
 public class ElementTagStructureHandlerInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ElementTagStructureHandlerInstrumentation() {
-    super("thymeleaf");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ElementTagStructureHandlerInstrumentation() {
+        super("thymeleaf");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.thymeleaf.engine.ElementTagStructureHandler";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.thymeleaf.engine.ElementTagStructureHandler";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
 
-    transformer.applyAdvice(
-        isMethod().and(named("setBody")).and(takesArgument(0, CharSequence.class)),
-        packageName + ".BodyAdvice");
-  }
+        transformer.applyAdvice(
+                isMethod().and(named("setBody")).and(takesArgument(0, CharSequence.class)),
+                packageName + ".BodyAdvice");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(
-        "org.thymeleaf.processor.element.IElementTagStructureHandler",
-        "datadog.trace.instrumentation.thymeleaf.ThymeleafContext");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(
+                "org.thymeleaf.processor.element.IElementTagStructureHandler",
+                "datadog.trace.instrumentation.thymeleaf.ThymeleafContext");
+    }
 }
diff --git a/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/ProcessAdvice.java b/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/ProcessAdvice.java
index 72f0e163870..fc9234e1214 100644
--- a/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/ProcessAdvice.java
+++ b/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/ProcessAdvice.java
@@ -10,15 +10,15 @@
 
 public class ProcessAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  @Propagation
-  public static void doProcess(
-      @Advice.Argument(1) final IProcessableElementTag tag,
-      @Advice.Argument(4) final IElementTagStructureHandler handler) {
-    if (InstrumentationBridge.XSS != null) {
-      ContextStore<IElementTagStructureHandler, ThymeleafContext> contextStore =
-          InstrumentationContext.get(IElementTagStructureHandler.class, ThymeleafContext.class);
-      contextStore.put(handler, new ThymeleafContext(tag.getTemplateName(), tag.getLine()));
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    @Propagation
+    public static void doProcess(
+            @Advice.Argument(1) final IProcessableElementTag tag,
+            @Advice.Argument(4) final IElementTagStructureHandler handler) {
+        if (InstrumentationBridge.XSS != null) {
+            ContextStore<IElementTagStructureHandler, ThymeleafContext> contextStore =
+                    InstrumentationContext.get(IElementTagStructureHandler.class, ThymeleafContext.class);
+            contextStore.put(handler, new ThymeleafContext(tag.getTemplateName(), tag.getLine()));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/StandardUtextTagProcessorInstrumentation.java b/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/StandardUtextTagProcessorInstrumentation.java
index a55bfb9e86d..243a5f40608 100644
--- a/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/StandardUtextTagProcessorInstrumentation.java
+++ b/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/StandardUtextTagProcessorInstrumentation.java
@@ -11,26 +11,26 @@
 
 @AutoService(InstrumenterModule.class)
 public class StandardUtextTagProcessorInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public StandardUtextTagProcessorInstrumentation() {
-    super("thymeleaf");
-  }
+    public StandardUtextTagProcessorInstrumentation() {
+        super("thymeleaf");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isMethod().and(named("doProcess")), packageName + ".ProcessAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isMethod().and(named("doProcess")), packageName + ".ProcessAdvice");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(
-        "org.thymeleaf.processor.element.IElementTagStructureHandler",
-        "datadog.trace.instrumentation.thymeleaf.ThymeleafContext");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap(
+                "org.thymeleaf.processor.element.IElementTagStructureHandler",
+                "datadog.trace.instrumentation.thymeleaf.ThymeleafContext");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.thymeleaf.standard.processor.StandardUtextTagProcessor";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.thymeleaf.standard.processor.StandardUtextTagProcessor";
+    }
 }
diff --git a/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/ThymeleafContext.java b/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/ThymeleafContext.java
index ff8bcbdcb49..b7a0a8d5f54 100644
--- a/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/ThymeleafContext.java
+++ b/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/ThymeleafContext.java
@@ -2,20 +2,20 @@
 
 public class ThymeleafContext {
 
-  private final String templateName;
+    private final String templateName;
 
-  private final int line;
+    private final int line;
 
-  public ThymeleafContext(final String file, final int line) {
-    this.templateName = file;
-    this.line = line;
-  }
+    public ThymeleafContext(final String file, final int line) {
+        this.templateName = file;
+        this.line = line;
+    }
 
-  public String getTemplateName() {
-    return templateName;
-  }
+    public String getTemplateName() {
+        return templateName;
+    }
 
-  public int getLine() {
-    return line;
-  }
+    public int getLine() {
+        return line;
+    }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/com/tibco/pe/core/DDJobMate.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/com/tibco/pe/core/DDJobMate.java
index 6277cb0cc24..81371e3236f 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/com/tibco/pe/core/DDJobMate.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/com/tibco/pe/core/DDJobMate.java
@@ -3,10 +3,10 @@
 import com.tibco.pe.plugin.ProcessContext;
 
 public class DDJobMate {
-  public static Workflow getJobWorkflow(final ProcessContext job) {
-    if (!(job instanceof Job)) {
-      return null;
+    public static Workflow getJobWorkflow(final ProcessContext job) {
+        if (!(job instanceof Job)) {
+            return null;
+        }
+        return ((Job) job).getActualWorkflow();
     }
-    return ((Job) job).getActualWorkflow();
-  }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/AbstractTibcoInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/AbstractTibcoInstrumentation.java
index 3a9993f3411..17ddf03b0ef 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/AbstractTibcoInstrumentation.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/AbstractTibcoInstrumentation.java
@@ -5,12 +5,12 @@
 import java.util.Map;
 
 public abstract class AbstractTibcoInstrumentation extends InstrumenterModule.Tracing {
-  public AbstractTibcoInstrumentation() {
-    super("tibco", "tibco_bw");
-  }
+    public AbstractTibcoInstrumentation() {
+        super("tibco", "tibco_bw");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("com.tibco.pe.plugin.ProcessContext", Map.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("com.tibco.pe.plugin.ProcessContext", Map.class.getName());
+    }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/ActivityHelper.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/ActivityHelper.java
index 022daa192b1..40a2685bbbc 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/ActivityHelper.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/ActivityHelper.java
@@ -9,49 +9,49 @@
 
 public class ActivityHelper {
 
-  private static final Pattern SPLITTER = Pattern.compile("/");
-
-  public static class ActivityInfo {
-    public final String id;
-    public final String name;
-    public final String group;
-    public final String parent;
-    public final boolean trace;
-
-    public ActivityInfo(String id, String name, String group, String parent, boolean trace) {
-      this.id = id;
-      this.name = name;
-      this.group = group;
-      this.parent = parent;
-      this.trace = trace;
+    private static final Pattern SPLITTER = Pattern.compile("/");
+
+    public static class ActivityInfo {
+        public final String id;
+        public final String name;
+        public final String group;
+        public final String parent;
+        public final boolean trace;
+
+        public ActivityInfo(String id, String name, String group, String parent, boolean trace) {
+            this.id = id;
+            this.name = name;
+            this.group = group;
+            this.parent = parent;
+            this.trace = trace;
+        }
     }
-  }
-
-  private static final DDCache<Task, ActivityInfo> ACTIVITY_NAME_GROUP_CACHE =
-      DDCaches.newFixedSizeWeakKeyCache(1024);
-
-  public static ActivityInfo activityInfo(final Task task) {
-    return ACTIVITY_NAME_GROUP_CACHE.computeIfAbsent(task, ActivityHelper::calculateActivityInfo);
-  }
-
-  private static ActivityInfo calculateActivityInfo(final Task task) {
-    String[] parts = SPLITTER.split(task.getName());
-    String workflow = task.getWorkflow().getName();
-    String name = parts[parts.length - 1];
-    String group = parts.length > 1 ? parts[parts.length - 2] : workflow;
-    String id = group + "/" + name;
-    String parentName = group;
-    boolean trace = true;
-
-    if (task.getActivity() instanceof ActivityGroup) {
-      final boolean groupEnd = task.getWorkflow().getGroupEnd(group) == task;
-      if (groupEnd || !(task.getActivity() instanceof ProcessGroup)) {
-        id = group;
-        name = group;
-        parentName = parts.length > 2 ? parts[parts.length - 3] : workflow;
-        trace = groupEnd;
-      }
+
+    private static final DDCache<Task, ActivityInfo> ACTIVITY_NAME_GROUP_CACHE =
+            DDCaches.newFixedSizeWeakKeyCache(1024);
+
+    public static ActivityInfo activityInfo(final Task task) {
+        return ACTIVITY_NAME_GROUP_CACHE.computeIfAbsent(task, ActivityHelper::calculateActivityInfo);
+    }
+
+    private static ActivityInfo calculateActivityInfo(final Task task) {
+        String[] parts = SPLITTER.split(task.getName());
+        String workflow = task.getWorkflow().getName();
+        String name = parts[parts.length - 1];
+        String group = parts.length > 1 ? parts[parts.length - 2] : workflow;
+        String id = group + "/" + name;
+        String parentName = group;
+        boolean trace = true;
+
+        if (task.getActivity() instanceof ActivityGroup) {
+            final boolean groupEnd = task.getWorkflow().getGroupEnd(group) == task;
+            if (groupEnd || !(task.getActivity() instanceof ProcessGroup)) {
+                id = group;
+                name = group;
+                parentName = parts.length > 2 ? parts[parts.length - 3] : workflow;
+                trace = groupEnd;
+            }
+        }
+        return new ActivityInfo(id, name, group, parentName, trace);
     }
-    return new ActivityInfo(id, name, group, parentName, trace);
-  }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java
index a9b03588791..a5d8f62b8df 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java
@@ -17,34 +17,32 @@
 
 @AutoService(InstrumenterModule.class)
 public class JobInstrumentation extends AbstractTibcoInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  @Override
-  public String instrumentedType() {
-    return "com.tibco.pe.core.Job";
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    @Override
+    public String instrumentedType() {
+        return "com.tibco.pe.core.Job";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(named("callProcess"), getClass().getName() + "$JobCallAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("callProcess"), getClass().getName() + "$JobCallAdvice");
+    }
 
-  public static class JobCallAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.This ProcessContext processContext, @Advice.Argument(value = 0) String wId) {
+    public static class JobCallAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.This ProcessContext processContext, @Advice.Argument(value = 0) String wId) {
 
-      String workflowName = wId;
-      int suffixIdx = workflowName.indexOf(".process");
-      if (suffixIdx > 0) {
-        workflowName = workflowName.substring(0, suffixIdx);
-      }
-      AgentSpan span = startSpan("tibco_bw", TIBCO_PROCESS_OPERATION);
-      DECORATE.afterStart(span);
-      DECORATE.onProcessStart(span, workflowName);
-      Map<String, AgentSpan> map =
-          InstrumentationContext.get(ProcessContext.class, Map.class)
-              .getOrCreate(processContext, HashMap::new);
-      map.put(wId, span);
+            String workflowName = wId;
+            int suffixIdx = workflowName.indexOf(".process");
+            if (suffixIdx > 0) {
+                workflowName = workflowName.substring(0, suffixIdx);
+            }
+            AgentSpan span = startSpan("tibco_bw", TIBCO_PROCESS_OPERATION);
+            DECORATE.afterStart(span);
+            DECORATE.onProcessStart(span, workflowName);
+            Map<String, AgentSpan> map = InstrumentationContext.get(ProcessContext.class, Map.class)
+                    .getOrCreate(processContext, HashMap::new);
+            map.put(wId, span);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java
index c4b2c6edbb9..3b839a4782b 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java
@@ -24,67 +24,67 @@
 
 @AutoService(InstrumenterModule.class)
 public class JobPoolInstrumentation extends AbstractTibcoInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  @Override
-  public String instrumentedType() {
-    return "com.tibco.pe.core.JobPool";
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    @Override
+    public String instrumentedType() {
+        return "com.tibco.pe.core.JobPool";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("addJob")
-            .and(isPublic())
-            .and(takesArgument(0, hasInterface(named("com.tibco.pe.plugin.ProcessContext")))),
-        getClass().getName() + "$JobStartAdvice");
-    transformer.applyAdvice(
-        named("removeJob") // note: removeJob is a protected method (not public)
-            .and(takesArgument(0, hasInterface(named("com.tibco.pe.plugin.ProcessContext")))),
-        getClass().getName() + "$JobEndAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("addJob")
+                        .and(isPublic())
+                        .and(takesArgument(0, hasInterface(named("com.tibco.pe.plugin.ProcessContext")))),
+                getClass().getName() + "$JobStartAdvice");
+        transformer.applyAdvice(
+                named("removeJob") // note: removeJob is a protected method (not public)
+                        .and(takesArgument(0, hasInterface(named("com.tibco.pe.plugin.ProcessContext")))),
+                getClass().getName() + "$JobEndAdvice");
+    }
 
-  public static class JobStartAdvice {
-    @SuppressWarnings("UC_USELESS_OBJECT")
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void after(@Advice.Argument(value = 0) ProcessContext processContext) {
-      final Workflow workflow = DDJobMate.getJobWorkflow(processContext);
-      if (workflow == null) {
-        return;
-      }
-      final String wId = workflow.getName();
-      String workflowName = wId;
-      int suffixIdx = workflowName.indexOf(".process");
-      if (suffixIdx > 0) {
-        workflowName = workflowName.substring(0, suffixIdx);
-      }
-      AgentSpan span = startSpan("tibco_bw", TIBCO_PROCESS_OPERATION);
-      DECORATE.afterStart(span);
-      DECORATE.onProcessStart(span, workflowName);
-      Map<String, AgentSpan> map = new HashMap<>();
-      map.put(wId, span);
-      InstrumentationContext.get(ProcessContext.class, Map.class).put(processContext, map);
+    public static class JobStartAdvice {
+        @SuppressWarnings("UC_USELESS_OBJECT")
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void after(@Advice.Argument(value = 0) ProcessContext processContext) {
+            final Workflow workflow = DDJobMate.getJobWorkflow(processContext);
+            if (workflow == null) {
+                return;
+            }
+            final String wId = workflow.getName();
+            String workflowName = wId;
+            int suffixIdx = workflowName.indexOf(".process");
+            if (suffixIdx > 0) {
+                workflowName = workflowName.substring(0, suffixIdx);
+            }
+            AgentSpan span = startSpan("tibco_bw", TIBCO_PROCESS_OPERATION);
+            DECORATE.afterStart(span);
+            DECORATE.onProcessStart(span, workflowName);
+            Map<String, AgentSpan> map = new HashMap<>();
+            map.put(wId, span);
+            InstrumentationContext.get(ProcessContext.class, Map.class).put(processContext, map);
+        }
     }
-  }
 
-  public static class JobEndAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.This final JobPool self,
-        @Advice.Argument(value = 0) ProcessContext processContext,
-        @Advice.Thrown final Throwable thrown) {
-      Map<String, AgentSpan> map =
-          InstrumentationContext.get(ProcessContext.class, Map.class).remove(processContext);
-      final String workflowName = DDJobMate.getJobWorkflow(processContext).getName();
-      if (map == null || !map.containsKey(workflowName)) {
-        return;
-      }
-      AgentSpan span = map.get(workflowName);
-      if (thrown != null) {
-        DECORATE.onError(span, thrown);
-      }
-      DECORATE.beforeFinish(span);
-      span.finish();
-      map.clear();
+    public static class JobEndAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(
+                @Advice.This final JobPool self,
+                @Advice.Argument(value = 0) ProcessContext processContext,
+                @Advice.Thrown final Throwable thrown) {
+            Map<String, AgentSpan> map =
+                    InstrumentationContext.get(ProcessContext.class, Map.class).remove(processContext);
+            final String workflowName = DDJobMate.getJobWorkflow(processContext).getName();
+            if (map == null || !map.containsKey(workflowName)) {
+                return;
+            }
+            AgentSpan span = map.get(workflowName);
+            if (thrown != null) {
+                DECORATE.onError(span, thrown);
+            }
+            DECORATE.beforeFinish(span);
+            span.finish();
+            map.clear();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java
index 7fc80718d74..d8686ec6f8c 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java
@@ -24,93 +24,89 @@
 
 @AutoService(InstrumenterModule.class)
 public class TaskInstrumentation extends AbstractTibcoInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  @Override
-  public String instrumentedType() {
-    return "com.tibco.pe.core.TaskImpl";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(NameMatchers.named("eval"), getClass().getName() + "$EvalAdvice");
-    transformer.applyAdvice(
-        NameMatchers.named("handleError"), getClass().getName() + "$ErrorAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    @Override
+    public String instrumentedType() {
+        return "com.tibco.pe.core.TaskImpl";
+    }
 
-  public static class ErrorAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void captureError(@Advice.Argument(2) Throwable t) {
-      AgentSpan span = activeSpan();
-      if (span != null) {
-        DECORATE.onError(span, t);
-      }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(NameMatchers.named("eval"), getClass().getName() + "$EvalAdvice");
+        transformer.applyAdvice(NameMatchers.named("handleError"), getClass().getName() + "$ErrorAdvice");
     }
-  }
 
-  public static class EvalAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static boolean before(
-        @Advice.This Task self,
-        @Advice.Argument(0) ProcessContext processContext,
-        @Advice.Local("ddActivityInfo") ActivityHelper.ActivityInfo ddActivityInfo,
-        @Advice.Local("ddScope") ContextScope ddScope) {
+    public static class ErrorAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void captureError(@Advice.Argument(2) Throwable t) {
+            AgentSpan span = activeSpan();
+            if (span != null) {
+                DECORATE.onError(span, t);
+            }
+        }
+    }
 
-      ContextStore<ProcessContext, Map> store =
-          InstrumentationContext.get(ProcessContext.class, Map.class);
-      Map<String, AgentSpan> map = store.get(processContext);
-      if (map == null) {
-        return false;
-      }
+    public static class EvalAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static boolean before(
+                @Advice.This Task self,
+                @Advice.Argument(0) ProcessContext processContext,
+                @Advice.Local("ddActivityInfo") ActivityHelper.ActivityInfo ddActivityInfo,
+                @Advice.Local("ddScope") ContextScope ddScope) {
 
-      ddActivityInfo = ActivityHelper.activityInfo(self);
-      AgentSpan span = map.get(ddActivityInfo.id);
-      if (span == null) {
-        AgentSpan parent = map.getOrDefault(ddActivityInfo.parent, activeSpan());
-        span =
-            startSpan(
-                "tibco_bw", TIBCO_ACTIVITY_OPERATION, parent != null ? parent.spanContext() : null);
-        DECORATE.afterStart(span);
-        DECORATE.onActivityStart(span, ddActivityInfo.name);
-        map.put(ddActivityInfo.id, span);
-      }
-      if (ddActivityInfo.trace) {
-        ddScope = activateSpan(span);
-      }
-      return ddActivityInfo.trace;
-    }
+            ContextStore<ProcessContext, Map> store = InstrumentationContext.get(ProcessContext.class, Map.class);
+            Map<String, AgentSpan> map = store.get(processContext);
+            if (map == null) {
+                return false;
+            }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.This(typing = Assigner.Typing.DYNAMIC) Task self,
-        @Advice.Argument(0) ProcessContext processContext,
-        @Advice.Return String ret,
-        @Advice.Enter boolean traced,
-        @Advice.Local("ddActivityInfo") ActivityHelper.ActivityInfo ddActivityInfo,
-        @Advice.Local("ddScope") ContextScope ddScope) {
-      try (ContextScope closeMe = ddScope) {
-        if (!traced) {
-          return;
+            ddActivityInfo = ActivityHelper.activityInfo(self);
+            AgentSpan span = map.get(ddActivityInfo.id);
+            if (span == null) {
+                AgentSpan parent = map.getOrDefault(ddActivityInfo.parent, activeSpan());
+                span = startSpan("tibco_bw", TIBCO_ACTIVITY_OPERATION, parent != null ? parent.spanContext() : null);
+                DECORATE.afterStart(span);
+                DECORATE.onActivityStart(span, ddActivityInfo.name);
+                map.put(ddActivityInfo.id, span);
+            }
+            if (ddActivityInfo.trace) {
+                ddScope = activateSpan(span);
+            }
+            return ddActivityInfo.trace;
         }
 
-        if ("STAY_HERE".equals(ret)
-            || ("DEAD".equals(ret)
-                && self.getActivity() instanceof ActivityGroup
-                && !(self.getActivity() instanceof ProcessGroup))) {
-          return;
-        }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(
+                @Advice.This(typing = Assigner.Typing.DYNAMIC) Task self,
+                @Advice.Argument(0) ProcessContext processContext,
+                @Advice.Return String ret,
+                @Advice.Enter boolean traced,
+                @Advice.Local("ddActivityInfo") ActivityHelper.ActivityInfo ddActivityInfo,
+                @Advice.Local("ddScope") ContextScope ddScope) {
+            try (ContextScope closeMe = ddScope) {
+                if (!traced) {
+                    return;
+                }
 
-        Map<String, AgentSpan> map =
-            InstrumentationContext.get(ProcessContext.class, Map.class).get(processContext);
-        if (map == null) {
-          return;
-        }
+                if ("STAY_HERE".equals(ret)
+                        || ("DEAD".equals(ret)
+                                && self.getActivity() instanceof ActivityGroup
+                                && !(self.getActivity() instanceof ProcessGroup))) {
+                    return;
+                }
+
+                Map<String, AgentSpan> map = InstrumentationContext.get(ProcessContext.class, Map.class)
+                        .get(processContext);
+                if (map == null) {
+                    return;
+                }
 
-        AgentSpan span = map.remove(ddActivityInfo.id);
-        if (span != null) {
-          DECORATE.beforeFinish(span);
-          span.finish();
+                AgentSpan span = map.remove(ddActivityInfo.id);
+                if (span != null) {
+                    DECORATE.beforeFinish(span);
+                    span.finish();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/ThreadPoolInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/ThreadPoolInstrumentation.java
index 6dd402b3e21..aad8e14b81a 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/ThreadPoolInstrumentation.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/ThreadPoolInstrumentation.java
@@ -11,29 +11,28 @@
 
 @AutoService(InstrumenterModule.class)
 public class ThreadPoolInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ThreadPoolInstrumentation() {
-    super("tibco");
-  }
+    public ThreadPoolInstrumentation() {
+        super("tibco");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.tibco.pe.util.ThreadPool";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.tibco.pe.util.ThreadPool";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        NameMatchers.named("schedule"), getClass().getName() + "$ScheduleAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(NameMatchers.named("schedule"), getClass().getName() + "$ScheduleAdvice");
+    }
 
-  public static class ScheduleAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void before(@Advice.Argument(value = 0, readOnly = false) Runnable runnable) {
-      if (activeSpan() != null && !(runnable instanceof Wrapper)) {
-        runnable = Wrapper.wrap(runnable);
-      }
+    public static class ScheduleAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void before(@Advice.Argument(value = 0, readOnly = false) Runnable runnable) {
+            if (activeSpan() != null && !(runnable instanceof Wrapper)) {
+                runnable = Wrapper.wrap(runnable);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TibcoDecorator.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TibcoDecorator.java
index 2c8d76c5435..da2c9729df9 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TibcoDecorator.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TibcoDecorator.java
@@ -17,60 +17,58 @@
 import org.slf4j.LoggerFactory;
 
 public class TibcoDecorator extends BaseDecorator {
-  private static final CharSequence TIBCO_BW = UTF8BytesString.create("tibco_bw");
-  private static final Logger LOGGER = LoggerFactory.getLogger(TibcoDecorator.class);
-  public static final CharSequence TIBCO_PROCESS_OPERATION =
-      UTF8BytesString.create("tibco.process");
-  public static final CharSequence TIBCO_ACTIVITY_OPERATION =
-      UTF8BytesString.create("tibco.activity");
-  public static final TibcoDecorator DECORATE = new TibcoDecorator();
-  private static final CharSequence VERSION = UTF8BytesString.create(extractVersion());
+    private static final CharSequence TIBCO_BW = UTF8BytesString.create("tibco_bw");
+    private static final Logger LOGGER = LoggerFactory.getLogger(TibcoDecorator.class);
+    public static final CharSequence TIBCO_PROCESS_OPERATION = UTF8BytesString.create("tibco.process");
+    public static final CharSequence TIBCO_ACTIVITY_OPERATION = UTF8BytesString.create("tibco.activity");
+    public static final TibcoDecorator DECORATE = new TibcoDecorator();
+    private static final CharSequence VERSION = UTF8BytesString.create(extractVersion());
 
-  private static String extractVersion() {
-    String v = PEVersion.getVersion();
-    if (v == null) {
-      return null;
+    private static String extractVersion() {
+        String v = PEVersion.getVersion();
+        if (v == null) {
+            return null;
+        }
+        // it's something like version 15.0, build xx, some date
+        Pattern pattern = Pattern.compile("\\D*(\\d[^,]*).*");
+        Matcher matcher = pattern.matcher(v);
+        if (matcher.matches()) {
+            return matcher.group(1);
+        }
+        LOGGER.debug(
+                "Unable to extract the tibco businessworks version. The tag `tibco.version` will be missing from process spans");
+        return null;
     }
-    // it's something like version 15.0, build xx, some date
-    Pattern pattern = Pattern.compile("\\D*(\\d[^,]*).*");
-    Matcher matcher = pattern.matcher(v);
-    if (matcher.matches()) {
-      return matcher.group(1);
-    }
-    LOGGER.debug(
-        "Unable to extract the tibco businessworks version. The tag `tibco.version` will be missing from process spans");
-    return null;
-  }
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {TIBCO_BW.toString()};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {TIBCO_BW.toString()};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.TIBCO_BW;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.TIBCO_BW;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return TIBCO_BW;
-  }
+    @Override
+    protected CharSequence component() {
+        return TIBCO_BW;
+    }
 
-  @Override
-  protected void doAfterStart(@Nonnull final AgentSpan span) {
-    span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_INTERNAL);
-    super.doAfterStart(span);
-  }
+    @Override
+    protected void doAfterStart(@Nonnull final AgentSpan span) {
+        span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_INTERNAL);
+        super.doAfterStart(span);
+    }
 
-  public void onProcessStart(AgentSpan span, String processName) {
-    span.setResourceName(processName)
-        .setTag(TIBCO_NODE, JobPool.getName())
-        .setTag(TIBCO_VERSION, VERSION)
-        .setMeasured(true);
-  }
+    public void onProcessStart(AgentSpan span, String processName) {
+        span.setResourceName(processName)
+                .setTag(TIBCO_NODE, JobPool.getName())
+                .setTag(TIBCO_VERSION, VERSION)
+                .setMeasured(true);
+    }
 
-  public void onActivityStart(final AgentSpan span, String activityName) {
-    span.setResourceName(activityName);
-  }
+    public void onActivityStart(final AgentSpan span, String activityName) {
+        span.setResourceName(activityName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/AbstractTibcoInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/AbstractTibcoInstrumentation.java
index c6ce60dd34c..1ce590d8c8b 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/AbstractTibcoInstrumentation.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/AbstractTibcoInstrumentation.java
@@ -7,25 +7,24 @@
 import java.util.Map;
 
 public abstract class AbstractTibcoInstrumentation extends InstrumenterModule.Tracing {
-  public AbstractTibcoInstrumentation() {
-    super("tibco", "tibco_bw");
-  }
+    public AbstractTibcoInstrumentation() {
+        super("tibco", "tibco_bw");
+    }
 
-  public AbstractTibcoInstrumentation(String... additionalNames) {
-    super("tibco", Strings.concat(additionalNames, "tibco_bw"));
-  }
+    public AbstractTibcoInstrumentation(String... additionalNames) {
+        super("tibco", Strings.concat(additionalNames, "tibco_bw"));
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return false;
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> stores = new HashMap<>();
-    stores.put("com.tibco.pvm.api.PmWorkUnit", AgentSpan.class.getName());
-    stores.put(
-        "com.tibco.bw.jms.shared.api.receive.JMSMessageCallBackHandler", String.class.getName());
-    return stores;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> stores = new HashMap<>();
+        stores.put("com.tibco.pvm.api.PmWorkUnit", AgentSpan.class.getName());
+        stores.put("com.tibco.bw.jms.shared.api.receive.JMSMessageCallBackHandler", String.class.getName());
+        return stores;
+    }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java
index ea80578b11f..cd06815e85d 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java
@@ -29,166 +29,159 @@
 
 @AutoService(InstrumenterModule.class)
 public class BehaviorInstrumentation extends AbstractTibcoInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "com.tibco.pvm.api.behavior.PmBehavior";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "com.tibco.pvm.api.behavior.PmBehavior";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(
-                named("enter")
-                    .and(
-                        isDeclaredBy(
-                            hasInterface(named("com.tibco.pvm.api.behavior.PmProcessBehavior"))))),
-        getClass().getName() + "$ProcessStartAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(
-                named("exit")
-                    .and(
-                        isDeclaredBy(
-                            hasInterface(named("com.tibco.pvm.api.behavior.PmProcessBehavior"))))),
-        getClass().getName() + "$ProcessEndAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("eval"))
-            .and(takesArgument(1, hasInterface(named("com.tibco.pvm.api.PmTask")))),
-        getClass().getName() + "$ActivityEvalAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("handleModelEvent")), getClass().getName() + "$HandleEventAdvice");
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  public static class ActivityEvalAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope activityBegin(
-        @Advice.This final Object self,
-        @Advice.Argument(0) final PmContext pmContext,
-        @Advice.Argument(1) final PmTask pmTask) {
-      final PmTask parentTask = pmTask.getParent(pmContext);
-      if (parentTask == null) {
-        // do not trace the Root task
-        return null;
-      }
-      final ContextStore<PmWorkUnit, AgentSpan> contextStore =
-          InstrumentationContext.get(PmWorkUnit.class, AgentSpan.class);
-      AgentSpan parentSpan = contextStore.get(pmTask.getParent(pmContext));
-      if (parentSpan == null) {
-        parentSpan = contextStore.get(pmTask.getProcess(pmContext));
-      }
-      if (IgnoreHelper.notTracing(self)) {
-        // record the parent but do not trace scope or flows
-        contextStore.put(pmTask, parentSpan);
-        return null;
-      }
-      AgentSpan span =
-          startSpan(
-              "tibco_bw",
-              TibcoDecorator.TIBCO_ACTIVITY_OPERATION,
-              parentSpan != null ? parentSpan.spanContext() : null);
-      TibcoDecorator.DECORATE.afterStart(span);
-      TibcoDecorator.DECORATE.onActivityStart(span, pmTask.getName(pmContext));
-      return activateSpan(span);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("enter")
+                                .and(isDeclaredBy(
+                                        hasInterface(named("com.tibco.pvm.api.behavior.PmProcessBehavior"))))),
+                getClass().getName() + "$ProcessStartAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("exit")
+                                .and(isDeclaredBy(
+                                        hasInterface(named("com.tibco.pvm.api.behavior.PmProcessBehavior"))))),
+                getClass().getName() + "$ProcessEndAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("eval")).and(takesArgument(1, hasInterface(named("com.tibco.pvm.api.PmTask")))),
+                getClass().getName() + "$ActivityEvalAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("handleModelEvent")), getClass().getName() + "$HandleEventAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void activityEnd(
-        @Advice.Enter final ContextScope scope,
-        @Advice.This final PmBehavior self,
-        @Advice.Argument(0) final PmContext pmContext,
-        @Advice.Argument(1) final PmTask pmTask) {
-      if (scope == null) {
-        return;
-      }
-      final AgentSpan span = spanFromScope(scope);
-      boolean finished = false;
-      try {
-        finished = self.isFinished(pmContext, pmTask);
-        if (finished) {
-          TibcoDecorator.DECORATE.beforeFinish(span);
-        } else {
-          InstrumentationContext.get(PmWorkUnit.class, AgentSpan.class).put(pmTask, span);
+    public static class ActivityEvalAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope activityBegin(
+                @Advice.This final Object self,
+                @Advice.Argument(0) final PmContext pmContext,
+                @Advice.Argument(1) final PmTask pmTask) {
+            final PmTask parentTask = pmTask.getParent(pmContext);
+            if (parentTask == null) {
+                // do not trace the Root task
+                return null;
+            }
+            final ContextStore<PmWorkUnit, AgentSpan> contextStore =
+                    InstrumentationContext.get(PmWorkUnit.class, AgentSpan.class);
+            AgentSpan parentSpan = contextStore.get(pmTask.getParent(pmContext));
+            if (parentSpan == null) {
+                parentSpan = contextStore.get(pmTask.getProcess(pmContext));
+            }
+            if (IgnoreHelper.notTracing(self)) {
+                // record the parent but do not trace scope or flows
+                contextStore.put(pmTask, parentSpan);
+                return null;
+            }
+            AgentSpan span = startSpan(
+                    "tibco_bw",
+                    TibcoDecorator.TIBCO_ACTIVITY_OPERATION,
+                    parentSpan != null ? parentSpan.spanContext() : null);
+            TibcoDecorator.DECORATE.afterStart(span);
+            TibcoDecorator.DECORATE.onActivityStart(span, pmTask.getName(pmContext));
+            return activateSpan(span);
         }
-      } finally {
-        scope.close();
-        if (finished) {
-          span.finish();
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void activityEnd(
+                @Advice.Enter final ContextScope scope,
+                @Advice.This final PmBehavior self,
+                @Advice.Argument(0) final PmContext pmContext,
+                @Advice.Argument(1) final PmTask pmTask) {
+            if (scope == null) {
+                return;
+            }
+            final AgentSpan span = spanFromScope(scope);
+            boolean finished = false;
+            try {
+                finished = self.isFinished(pmContext, pmTask);
+                if (finished) {
+                    TibcoDecorator.DECORATE.beforeFinish(span);
+                } else {
+                    InstrumentationContext.get(PmWorkUnit.class, AgentSpan.class)
+                            .put(pmTask, span);
+                }
+            } finally {
+                scope.close();
+                if (finished) {
+                    span.finish();
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class ProcessStartAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void processStarts(
-        @Advice.Argument(0) final PmContext pmContext,
-        @Advice.Argument(1) final PmProcessInstance pmProcessInstance) {
-      final ContextStore<PmWorkUnit, AgentSpan> contextStore =
-          InstrumentationContext.get(PmWorkUnit.class, AgentSpan.class);
-      AgentSpan parentSpan = contextStore.get(pmProcessInstance);
-      if (parentSpan == null) {
-        // are we starting a sub process?
-        PmWorkUnit parent = pmProcessInstance.getSpawner(pmContext);
-        parentSpan = parent != null ? contextStore.get(parent) : null;
-        if (parentSpan == null) {
-          /// try to attach to the parent process (even if it's not correct but at least we're
-          // keeping the trace continuity)
-          parent = pmProcessInstance.getParentProcess(pmContext);
-          parentSpan = parent != null ? contextStore.get(parent) : null;
+    public static class ProcessStartAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void processStarts(
+                @Advice.Argument(0) final PmContext pmContext,
+                @Advice.Argument(1) final PmProcessInstance pmProcessInstance) {
+            final ContextStore<PmWorkUnit, AgentSpan> contextStore =
+                    InstrumentationContext.get(PmWorkUnit.class, AgentSpan.class);
+            AgentSpan parentSpan = contextStore.get(pmProcessInstance);
+            if (parentSpan == null) {
+                // are we starting a sub process?
+                PmWorkUnit parent = pmProcessInstance.getSpawner(pmContext);
+                parentSpan = parent != null ? contextStore.get(parent) : null;
+                if (parentSpan == null) {
+                    /// try to attach to the parent process (even if it's not correct but at least we're
+                    // keeping the trace continuity)
+                    parent = pmProcessInstance.getParentProcess(pmContext);
+                    parentSpan = parent != null ? contextStore.get(parent) : null;
+                }
+                AgentSpan span = startSpan(
+                        "tibco_bw",
+                        TibcoDecorator.TIBCO_PROCESS_OPERATION,
+                        parent != null ? parentSpan.spanContext() : null);
+                TibcoDecorator.DECORATE.afterStart(span);
+                TibcoDecorator.DECORATE.onProcessStart(span, pmProcessInstance.getName(pmContext));
+                contextStore.put(pmProcessInstance, span);
+            }
         }
-        AgentSpan span =
-            startSpan(
-                "tibco_bw",
-                TibcoDecorator.TIBCO_PROCESS_OPERATION,
-                parent != null ? parentSpan.spanContext() : null);
-        TibcoDecorator.DECORATE.afterStart(span);
-        TibcoDecorator.DECORATE.onProcessStart(span, pmProcessInstance.getName(pmContext));
-        contextStore.put(pmProcessInstance, span);
-      }
     }
-  }
 
-  public static class ProcessEndAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void processEnds(@Advice.Argument(1) final PmProcessInstance pmProcessInstance) {
-      AgentSpan span =
-          InstrumentationContext.get(PmWorkUnit.class, AgentSpan.class).remove(pmProcessInstance);
-      if (span != null) {
-        TibcoDecorator.DECORATE.beforeFinish(span);
-        span.finish();
-      }
+    public static class ProcessEndAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void processEnds(@Advice.Argument(1) final PmProcessInstance pmProcessInstance) {
+            AgentSpan span = InstrumentationContext.get(PmWorkUnit.class, AgentSpan.class)
+                    .remove(pmProcessInstance);
+            if (span != null) {
+                TibcoDecorator.DECORATE.beforeFinish(span);
+                span.finish();
+            }
+        }
     }
-  }
 
-  public static class HandleEventAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onEvent(
-        @Advice.This PmBehavior self,
-        @Advice.Argument(0) PmContext pmContext,
-        @Advice.Argument(1) PmWorkUnit workUnit,
-        @Advice.Argument(2) PmEvent event) {
-      final ContextStore<PmWorkUnit, AgentSpan> contextStore =
-          InstrumentationContext.get(PmWorkUnit.class, AgentSpan.class);
-      final AgentSpan span = contextStore.get(workUnit);
-      if (span != null) {
-        if (workUnit == event.getSource() && event.getData() instanceof Throwable) {
-          TibcoDecorator.DECORATE.onError(span, (Throwable) event.getData());
-        }
-        if (self.isFinished(pmContext, workUnit)) {
-          contextStore.remove(workUnit);
-          TibcoDecorator.DECORATE.beforeFinish(span);
-          span.finish();
+    public static class HandleEventAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onEvent(
+                @Advice.This PmBehavior self,
+                @Advice.Argument(0) PmContext pmContext,
+                @Advice.Argument(1) PmWorkUnit workUnit,
+                @Advice.Argument(2) PmEvent event) {
+            final ContextStore<PmWorkUnit, AgentSpan> contextStore =
+                    InstrumentationContext.get(PmWorkUnit.class, AgentSpan.class);
+            final AgentSpan span = contextStore.get(workUnit);
+            if (span != null) {
+                if (workUnit == event.getSource() && event.getData() instanceof Throwable) {
+                    TibcoDecorator.DECORATE.onError(span, (Throwable) event.getData());
+                }
+                if (self.isFinished(pmContext, workUnit)) {
+                    contextStore.remove(workUnit);
+                    TibcoDecorator.DECORATE.beforeFinish(span);
+                    span.finish();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/CallbackHandlerInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/CallbackHandlerInstrumentation.java
index 63c0f62b6a1..7a1eb2dbc39 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/CallbackHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/CallbackHandlerInstrumentation.java
@@ -18,37 +18,37 @@
 
 @AutoService(InstrumenterModule.class)
 public class CallbackHandlerInstrumentation extends AbstractTibcoInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "com.tibco.bw.jms.shared.api.receive.JMSMessageCallBackHandler";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "com.tibco.bw.jms.shared.api.receive.JMSMessageCallBackHandler";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return HierarchyMatchers.implementsInterface(NameMatchers.named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return HierarchyMatchers.implementsInterface(NameMatchers.named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(NameMatchers.named("onMessage")), getClass().getName() + "$OnMessageAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(NameMatchers.named("onMessage")), getClass().getName() + "$OnMessageAdvice");
+    }
 
-  public static class OnMessageAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void exit(@Advice.This JMSMessageCallBackHandler handler) {
-      String pinnedName =
-          InstrumentationContext.get(JMSMessageCallBackHandler.class, String.class).get(handler);
-      if (pinnedName != null && activeSpan() != null) {
-        final AgentSpan span = activeSpan();
-        AgentSpan root = span.getLocalRootSpan();
-        if (root != null) {
-          root.setServiceName(pinnedName, TIBCO_BW);
+    public static class OnMessageAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void exit(@Advice.This JMSMessageCallBackHandler handler) {
+            String pinnedName = InstrumentationContext.get(JMSMessageCallBackHandler.class, String.class)
+                    .get(handler);
+            if (pinnedName != null && activeSpan() != null) {
+                final AgentSpan span = activeSpan();
+                AgentSpan root = span.getLocalRootSpan();
+                if (root != null) {
+                    root.setServiceName(pinnedName, TIBCO_BW);
+                }
+                span.setServiceName(pinnedName, TIBCO_BW);
+            }
         }
-        span.setServiceName(pinnedName, TIBCO_BW);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/IgnoreHelper.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/IgnoreHelper.java
index bc813044092..c94a64595bd 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/IgnoreHelper.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/IgnoreHelper.java
@@ -9,18 +9,18 @@
 import javax.annotation.Nonnull;
 
 public class IgnoreHelper {
-  private static final Set<Class<?>> IGNORED_TRACE_CLASSES = init();
+    private static final Set<Class<?>> IGNORED_TRACE_CLASSES = init();
 
-  private static Set<Class<?>> init() {
-    HashSet<Class<?>> ret = new HashSet<>();
-    ret.add(BxFlowBehavior.class);
-    ret.add(BxScopeBehavior.class);
-    ret.add(BxEmptyBehavior.class);
-    ret.add(BxPickBehavior.class);
-    return ret;
-  }
+    private static Set<Class<?>> init() {
+        HashSet<Class<?>> ret = new HashSet<>();
+        ret.add(BxFlowBehavior.class);
+        ret.add(BxScopeBehavior.class);
+        ret.add(BxEmptyBehavior.class);
+        ret.add(BxPickBehavior.class);
+        return ret;
+    }
 
-  public static boolean notTracing(@Nonnull final Object o) {
-    return IGNORED_TRACE_CLASSES.contains(o.getClass());
-  }
+    public static boolean notTracing(@Nonnull final Object o) {
+        return IGNORED_TRACE_CLASSES.contains(o.getClass());
+    }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/JmsMessageGetterInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/JmsMessageGetterInstrumentation.java
index f553abd1c46..5f687d2808c 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/JmsMessageGetterInstrumentation.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/JmsMessageGetterInstrumentation.java
@@ -14,36 +14,35 @@
 
 @AutoService(InstrumenterModule.class)
 public class JmsMessageGetterInstrumentation extends AbstractTibcoInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JmsMessageGetterInstrumentation() {
-    super("jms");
-  }
+    public JmsMessageGetterInstrumentation() {
+        super("jms");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "com.tibco.bw.jms.shared.primitives.SingleJMSMessageGetter";
-  }
+    @Override
+    public String instrumentedType() {
+        return "com.tibco.bw.jms.shared.primitives.SingleJMSMessageGetter";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$ConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$ConstructorAdvice");
+    }
 
-  public static class ConstructorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void exit(
-        @Advice.FieldValue(value = "callBackHandler") final JMSMessageCallBackHandler handler) {
-      // If we inferred the service name we should capture it and set on the receiver side as well
-      // (otherwise it will be missing or different)
-      if (handler != null && !Config.get().isServiceNameSetByUser()) {
-        final AgentSpan span = activeSpan();
-        if (span != null && span.getLocalRootSpan() != null) {
-          final String pinnedName = span.getLocalRootSpan().getServiceName();
-          InstrumentationContext.get(JMSMessageCallBackHandler.class, String.class)
-              .put(handler, pinnedName);
+    public static class ConstructorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void exit(@Advice.FieldValue(value = "callBackHandler") final JMSMessageCallBackHandler handler) {
+            // If we inferred the service name we should capture it and set on the receiver side as well
+            // (otherwise it will be missing or different)
+            if (handler != null && !Config.get().isServiceNameSetByUser()) {
+                final AgentSpan span = activeSpan();
+                if (span != null && span.getLocalRootSpan() != null) {
+                    final String pinnedName = span.getLocalRootSpan().getServiceName();
+                    InstrumentationContext.get(JMSMessageCallBackHandler.class, String.class)
+                            .put(handler, pinnedName);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java
index d6a070d0126..bb4b65cb3f2 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java
@@ -24,60 +24,57 @@
 
 @AutoService(InstrumenterModule.class)
 public class ProcessInstrumentation extends AbstractTibcoInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "com.tibco.pvm.system.manager.PmProcessInstanceManager";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "com.tibco.pvm.system.manager.PmProcessInstanceManager";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("createInstance")), getClass().getName() + "$CreateInstanceAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("createInstance")), getClass().getName() + "$CreateInstanceAdvice");
+    }
 
-  public static class CreateInstanceAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Argument(value = 0) PmContext pmContext, @Advice.Return PmProcessInstance process) {
-      ContextStore<PmWorkUnit, AgentSpan> contextStore =
-          InstrumentationContext.get(PmWorkUnit.class, AgentSpan.class);
-      final PmProcessInstance parent = process.getParentProcess(pmContext);
-      final AgentSpan parentSpan = parent != null ? contextStore.get(parent) : null;
-      String appName = null;
-      // we try to infer the service name using the tibco application name if it has not be set by
-      // the user explicitly
-      if (!Config.get().isServiceNameSetByUser()) {
-        try {
-          appName =
-              (String)
-                  process
-                      .getModule(pmContext)
-                      .getPrototype(pmContext)
-                      .getAttributeValue(pmContext, "$bx_applicationName");
-        } catch (Throwable t) {
-          // cannot find the name
-        }
-      }
-      try (ContextScope maybeScope = parentSpan != null ? activateSpan(parentSpan) : null) {
-        AgentSpan span = startSpan("tibco_bw", TibcoDecorator.TIBCO_PROCESS_OPERATION);
-        TibcoDecorator.DECORATE.afterStart(span);
-        if (appName != null) {
-          AgentSpan root = span.getLocalRootSpan();
-          if (root != null) {
-            root.setServiceName(appName, TIBCO_BW);
-          }
-          span.setServiceName(appName, TIBCO_BW);
+    public static class CreateInstanceAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Argument(value = 0) PmContext pmContext, @Advice.Return PmProcessInstance process) {
+            ContextStore<PmWorkUnit, AgentSpan> contextStore =
+                    InstrumentationContext.get(PmWorkUnit.class, AgentSpan.class);
+            final PmProcessInstance parent = process.getParentProcess(pmContext);
+            final AgentSpan parentSpan = parent != null ? contextStore.get(parent) : null;
+            String appName = null;
+            // we try to infer the service name using the tibco application name if it has not be set by
+            // the user explicitly
+            if (!Config.get().isServiceNameSetByUser()) {
+                try {
+                    appName = (String) process.getModule(pmContext)
+                            .getPrototype(pmContext)
+                            .getAttributeValue(pmContext, "$bx_applicationName");
+                } catch (Throwable t) {
+                    // cannot find the name
+                }
+            }
+            try (ContextScope maybeScope = parentSpan != null ? activateSpan(parentSpan) : null) {
+                AgentSpan span = startSpan("tibco_bw", TibcoDecorator.TIBCO_PROCESS_OPERATION);
+                TibcoDecorator.DECORATE.afterStart(span);
+                if (appName != null) {
+                    AgentSpan root = span.getLocalRootSpan();
+                    if (root != null) {
+                        root.setServiceName(appName, TIBCO_BW);
+                    }
+                    span.setServiceName(appName, TIBCO_BW);
+                }
+                TibcoDecorator.DECORATE.onProcessStart(span, process.getName(pmContext));
+                contextStore.put(process, span);
+            }
         }
-        TibcoDecorator.DECORATE.onProcessStart(span, process.getName(pmContext));
-        contextStore.put(process, span);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/TibcoDecorator.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/TibcoDecorator.java
index 79253da4002..710842faf0c 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/TibcoDecorator.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/TibcoDecorator.java
@@ -15,64 +15,58 @@
 import org.slf4j.LoggerFactory;
 
 public class TibcoDecorator extends BaseDecorator {
-  private static final Logger LOGGER = LoggerFactory.getLogger(TibcoDecorator.class);
-  static final CharSequence TIBCO_BW = UTF8BytesString.create("tibco_bw");
-  private static final CharSequence APPNODE_NAME =
-      UTF8BytesString.create(SystemProperties.get("bw.appnode"));
-  private static final CharSequence BW_VERSION = bwVersion();
-  public static final CharSequence TIBCO_PROCESS_OPERATION =
-      UTF8BytesString.create("tibco.process");
-  public static final CharSequence TIBCO_ACTIVITY_OPERATION =
-      UTF8BytesString.create("tibco.activity");
-  public static final TibcoDecorator DECORATE = new TibcoDecorator();
+    private static final Logger LOGGER = LoggerFactory.getLogger(TibcoDecorator.class);
+    static final CharSequence TIBCO_BW = UTF8BytesString.create("tibco_bw");
+    private static final CharSequence APPNODE_NAME = UTF8BytesString.create(SystemProperties.get("bw.appnode"));
+    private static final CharSequence BW_VERSION = bwVersion();
+    public static final CharSequence TIBCO_PROCESS_OPERATION = UTF8BytesString.create("tibco.process");
+    public static final CharSequence TIBCO_ACTIVITY_OPERATION = UTF8BytesString.create("tibco.activity");
+    public static final TibcoDecorator DECORATE = new TibcoDecorator();
 
-  private static CharSequence bwVersion() {
-    try {
-      Class cls =
-          Class.forName(
-              "com.tibco.bw.thor.management.common.SetupUtils",
-              false,
-              ClassLoader.getSystemClassLoader());
-      Map<String, String> map =
-          (Map<String, String>) cls.getMethod("loadProductConfiguration").invoke(null);
-      if (map != null) {
-        return map.get("product.version");
-      }
-    } catch (Throwable t) {
-      LOGGER.warn("Error while obtaining the Tibco BW version", t);
+    private static CharSequence bwVersion() {
+        try {
+            Class cls = Class.forName(
+                    "com.tibco.bw.thor.management.common.SetupUtils", false, ClassLoader.getSystemClassLoader());
+            Map<String, String> map = (Map<String, String>)
+                    cls.getMethod("loadProductConfiguration").invoke(null);
+            if (map != null) {
+                return map.get("product.version");
+            }
+        } catch (Throwable t) {
+            LOGGER.warn("Error while obtaining the Tibco BW version", t);
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {TIBCO_BW.toString()};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {TIBCO_BW.toString()};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.TIBCO_BW;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.TIBCO_BW;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return TIBCO_BW;
-  }
+    @Override
+    protected CharSequence component() {
+        return TIBCO_BW;
+    }
 
-  @Override
-  protected void doAfterStart(@Nonnull final AgentSpan span) {
-    span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_INTERNAL);
-    super.doAfterStart(span);
-  }
+    @Override
+    protected void doAfterStart(@Nonnull final AgentSpan span) {
+        span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_INTERNAL);
+        super.doAfterStart(span);
+    }
 
-  public void onProcessStart(AgentSpan span, String processName) {
-    span.setResourceName(processName)
-        .setTag(TIBCO_NODE, APPNODE_NAME)
-        .setTag(TIBCO_VERSION, BW_VERSION)
-        .setMeasured(true);
-  }
+    public void onProcessStart(AgentSpan span, String processName) {
+        span.setResourceName(processName)
+                .setTag(TIBCO_NODE, APPNODE_NAME)
+                .setTag(TIBCO_VERSION, BW_VERSION)
+                .setMeasured(true);
+    }
 
-  public void onActivityStart(final AgentSpan span, String activityName) {
-    span.setResourceName(activityName);
-  }
+    public void onActivityStart(final AgentSpan span, String activityName) {
+        span.setResourceName(activityName);
+    }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/PEVersion.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/PEVersion.java
index 9b09f7ad13c..fe0e3065907 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/PEVersion.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/PEVersion.java
@@ -1,8 +1,8 @@
 package com.tibco.pe;
 
 public class PEVersion {
-  public static String getVersion() {
-    // STUBBED
-    return "";
-  }
+    public static String getVersion() {
+        // STUBBED
+        return "";
+    }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Job.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Job.java
index 93cd7f052ce..aa35e01cfb4 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Job.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Job.java
@@ -3,14 +3,14 @@
 import com.tibco.pe.plugin.ProcessContext;
 
 final class Job implements ProcessContext {
-  @Override
-  public String getName() {
-    // STUBBED
-    return null;
-  }
+    @Override
+    public String getName() {
+        // STUBBED
+        return null;
+    }
 
-  public Workflow getActualWorkflow() {
-    // STUBBED
-    return null;
-  }
+    public Workflow getActualWorkflow() {
+        // STUBBED
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/JobPool.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/JobPool.java
index 090c8622a99..63141a2238d 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/JobPool.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/JobPool.java
@@ -1,8 +1,8 @@
 package com.tibco.pe.core;
 
 public class JobPool {
-  public static String getName() {
-    // STUB
-    return null;
-  }
+    public static String getName() {
+        // STUB
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Task.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Task.java
index 486fe078fd8..9ff5565da75 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Task.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Task.java
@@ -3,11 +3,11 @@
 import com.tibco.pe.plugin.Activity;
 
 public interface Task {
-  String getName();
+    String getName();
 
-  Activity getActivity();
+    Activity getActivity();
 
-  Workflow getWorkflow();
+    Workflow getWorkflow();
 
-  int getTransitionCount();
+    int getTransitionCount();
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Workflow.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Workflow.java
index a12b51e8369..11825214b57 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Workflow.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Workflow.java
@@ -1,9 +1,9 @@
 package com.tibco.pe.core;
 
 public interface Workflow {
-  String getName();
+    String getName();
 
-  Task getGroupEnd(String str);
+    Task getGroupEnd(String str);
 
-  Task getStartTask();
+    Task getStartTask();
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/plugin/Component.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/plugin/Component.java
index 3f61f9c8a1a..b2005e24956 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/plugin/Component.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/plugin/Component.java
@@ -1,8 +1,8 @@
 package com.tibco.pe.plugin;
 
 public class Component {
-  public final String getName() {
-    // STUBBED
-    return null;
-  }
+    public final String getName() {
+        // STUBBED
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/plugin/ProcessContext.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/plugin/ProcessContext.java
index 198ae55d72c..47485ea8fcb 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/plugin/ProcessContext.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/plugin/ProcessContext.java
@@ -1,5 +1,5 @@
 package com.tibco.pe.plugin;
 
 public interface ProcessContext {
-  String getName();
+    String getName();
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmAttributed.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmAttributed.java
index 0130a251148..e9f028b8786 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmAttributed.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmAttributed.java
@@ -6,7 +6,7 @@
 import java.util.List;
 
 public interface PmAttributed {
-  Object getAttributeValue(PmContext pmContext, String str);
+    Object getAttributeValue(PmContext pmContext, String str);
 
-  List<PmAttribute> getAttributes(PmContext pmContext, PmAttrFilter pmAttrFilter);
+    List<PmAttribute> getAttributes(PmContext pmContext, PmAttrFilter pmAttrFilter);
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmModelObject.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmModelObject.java
index 5000aa18188..f9b2deaa9c4 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmModelObject.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmModelObject.java
@@ -3,5 +3,5 @@
 import com.tibco.pvm.api.session.PmContext;
 
 public interface PmModelObject extends PmAttributed {
-  String getName(PmContext pmContext);
+    String getName(PmContext pmContext);
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmModule.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmModule.java
index 5cdfdffd08f..ed1fe853fad 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmModule.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmModule.java
@@ -3,5 +3,5 @@
 import com.tibco.pvm.api.session.PmContext;
 
 public interface PmModule extends PmModelObject {
-  PmModule getPrototype(PmContext pmContext);
+    PmModule getPrototype(PmContext pmContext);
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmProcessInstance.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmProcessInstance.java
index 547a39d9a37..1335376a064 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmProcessInstance.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmProcessInstance.java
@@ -3,7 +3,7 @@
 import com.tibco.pvm.api.session.PmContext;
 
 public interface PmProcessInstance extends PmProcess {
-  PmProcessInstance getParentProcess(PmContext pmContext);
+    PmProcessInstance getParentProcess(PmContext pmContext);
 
-  PmTask getSpawner(PmContext pmContext);
+    PmTask getSpawner(PmContext pmContext);
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmTask.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmTask.java
index 2ce35a1fbb9..8e6b561b7c2 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmTask.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmTask.java
@@ -3,5 +3,5 @@
 import com.tibco.pvm.api.session.PmContext;
 
 public interface PmTask extends PmWorkUnit {
-  PmTask getParent(PmContext pmContext);
+    PmTask getParent(PmContext pmContext);
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmWorkUnit.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmWorkUnit.java
index 9cf30e1dd6f..42fd72a3eca 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmWorkUnit.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmWorkUnit.java
@@ -3,7 +3,7 @@
 import com.tibco.pvm.api.session.PmContext;
 
 public interface PmWorkUnit extends PmModelObject {
-  PmProcess getProcess(PmContext pmContext);
+    PmProcess getProcess(PmContext pmContext);
 
-  PmModule getModule(PmContext pmContext);
+    PmModule getModule(PmContext pmContext);
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/behavior/PmBehavior.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/behavior/PmBehavior.java
index f490fbc752f..c49c379c791 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/behavior/PmBehavior.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/behavior/PmBehavior.java
@@ -4,5 +4,5 @@
 import com.tibco.pvm.api.session.PmContext;
 
 public interface PmBehavior {
-  boolean isFinished(PmContext pmContext, PmWorkUnit wu);
+    boolean isFinished(PmContext pmContext, PmWorkUnit wu);
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/event/PmEvent.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/event/PmEvent.java
index d6c4eecd358..2d1b61e0350 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/event/PmEvent.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/event/PmEvent.java
@@ -1,7 +1,7 @@
 package com.tibco.pvm.api.event;
 
 public interface PmEvent {
-  Object getData();
+    Object getData();
 
-  Object getSource();
+    Object getSource();
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/util/attr/PmAttrFilter.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/util/attr/PmAttrFilter.java
index 7f7e587eb85..f9d09fa59a2 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/util/attr/PmAttrFilter.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/util/attr/PmAttrFilter.java
@@ -3,5 +3,5 @@
 import java.util.List;
 
 public interface PmAttrFilter {
-  List<PmAttribute> filter(List<PmAttribute> list);
+    List<PmAttribute> filter(List<PmAttribute> list);
 }
diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/util/attr/PmAttribute.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/util/attr/PmAttribute.java
index 8f17aed67c8..cfff1411737 100644
--- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/util/attr/PmAttribute.java
+++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/util/attr/PmAttribute.java
@@ -1,5 +1,5 @@
 package com.tibco.pvm.api.util.attr;
 
 public interface PmAttribute {
-  String getName();
+    String getName();
 }
diff --git a/dd-java-agent/instrumentation/tinylog-2.0/src/main/java/datadog/trace/instrumentation/tinylog2/LogEntryInstrumentation.java b/dd-java-agent/instrumentation/tinylog-2.0/src/main/java/datadog/trace/instrumentation/tinylog2/LogEntryInstrumentation.java
index 5d5131d9cdd..636179b94a6 100644
--- a/dd-java-agent/instrumentation/tinylog-2.0/src/main/java/datadog/trace/instrumentation/tinylog2/LogEntryInstrumentation.java
+++ b/dd-java-agent/instrumentation/tinylog-2.0/src/main/java/datadog/trace/instrumentation/tinylog2/LogEntryInstrumentation.java
@@ -25,76 +25,73 @@
 
 @AutoService(InstrumenterModule.class)
 public class LogEntryInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public LogEntryInstrumentation() {
-    super("tinylog");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public LogEntryInstrumentation() {
+        super("tinylog");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.tinylog.core.LogEntry";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.tinylog.core.LogEntry";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("org.tinylog.core.LogEntry", AgentSpanContext.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.tinylog.core.LogEntry", AgentSpanContext.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("getContext")).and(takesArguments(0)),
-        LogEntryInstrumentation.class.getName() + "$GetContextAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("getContext")).and(takesArguments(0)),
+                LogEntryInstrumentation.class.getName() + "$GetContextAdvice");
+    }
 
-  public static class GetContextAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This LogEntry event,
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false)
-            Map<String, String> mdc) {
+    public static class GetContextAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This LogEntry event,
+                @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false) Map<String, String> mdc) {
 
-      if (mdc instanceof UnionMap) {
-        return;
-      }
+            if (mdc instanceof UnionMap) {
+                return;
+            }
 
-      AgentSpanContext context =
-          InstrumentationContext.get(LogEntry.class, AgentSpanContext.class).get(event);
+            AgentSpanContext context = InstrumentationContext.get(LogEntry.class, AgentSpanContext.class)
+                    .get(event);
 
-      // TinyLoggingProviderInstrumentation only populates the context if injection is enabled
-      // Impossible for context to be not null while injection is disabled
-      if (context == null && !AgentTracer.traceConfig().isLogsInjectionEnabled()) {
-        // Nothing to add so return early
-        return;
-      }
+            // TinyLoggingProviderInstrumentation only populates the context if injection is enabled
+            // Impossible for context to be not null while injection is disabled
+            if (context == null && !AgentTracer.traceConfig().isLogsInjectionEnabled()) {
+                // Nothing to add so return early
+                return;
+            }
 
-      Map<String, String> correlationValues = new HashMap<>(8);
+            Map<String, String> correlationValues = new HashMap<>(8);
 
-      if (context != null) {
-        DDTraceId traceId = context.getTraceId();
-        String traceIdValue =
-            Config.get().isLogs128bitTraceIdEnabled() && traceId.toHighOrderLong() != 0
-                ? traceId.toHexString()
-                : traceId.toString();
-        correlationValues.put(CorrelationIdentifier.getTraceIdKey(), traceIdValue);
-        correlationValues.put(
-            CorrelationIdentifier.getSpanIdKey(), DDSpanId.toString(context.getSpanId()));
-      }
+            if (context != null) {
+                DDTraceId traceId = context.getTraceId();
+                String traceIdValue = Config.get().isLogs128bitTraceIdEnabled() && traceId.toHighOrderLong() != 0
+                        ? traceId.toHexString()
+                        : traceId.toString();
+                correlationValues.put(CorrelationIdentifier.getTraceIdKey(), traceIdValue);
+                correlationValues.put(CorrelationIdentifier.getSpanIdKey(), DDSpanId.toString(context.getSpanId()));
+            }
 
-      String serviceName = Config.get().getServiceName();
-      if (null != serviceName && !serviceName.isEmpty()) {
-        correlationValues.put(Tags.DD_SERVICE, serviceName);
-      }
-      String env = Config.get().getEnv();
-      if (null != env && !env.isEmpty()) {
-        correlationValues.put(Tags.DD_ENV, env);
-      }
-      String version = Config.get().getVersion();
-      if (null != version && !version.isEmpty()) {
-        correlationValues.put(Tags.DD_VERSION, version);
-      }
+            String serviceName = Config.get().getServiceName();
+            if (null != serviceName && !serviceName.isEmpty()) {
+                correlationValues.put(Tags.DD_SERVICE, serviceName);
+            }
+            String env = Config.get().getEnv();
+            if (null != env && !env.isEmpty()) {
+                correlationValues.put(Tags.DD_ENV, env);
+            }
+            String version = Config.get().getVersion();
+            if (null != version && !version.isEmpty()) {
+                correlationValues.put(Tags.DD_VERSION, version);
+            }
 
-      mdc = null != mdc ? new UnionMap<>(mdc, correlationValues) : correlationValues;
+            mdc = null != mdc ? new UnionMap<>(mdc, correlationValues) : correlationValues;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tinylog-2.0/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java b/dd-java-agent/instrumentation/tinylog-2.0/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java
index 08379c059c4..ab01608b258 100644
--- a/dd-java-agent/instrumentation/tinylog-2.0/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java
+++ b/dd-java-agent/instrumentation/tinylog-2.0/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java
@@ -21,41 +21,41 @@
 
 @AutoService(InstrumenterModule.class)
 public class TinylogLoggingProviderInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public TinylogLoggingProviderInstrumentation() {
-    super("tinylog");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.tinylog.core.TinylogLoggingProvider";
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("org.tinylog.core.LogEntry", AgentSpanContext.class.getName());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPrivate())
-            .and(named("output"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("org.tinylog.core.LogEntry"))),
-        TinylogLoggingProviderInstrumentation.class.getName() + "$OutputAdvice");
-  }
-
-  public static class OutputAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(0) LogEntry event) {
-      AgentSpan span = activeSpan();
-
-      if (span != null && traceConfig(span).isLogsInjectionEnabled()) {
-        InstrumentationContext.get(LogEntry.class, AgentSpanContext.class)
-            .put(event, span.spanContext());
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public TinylogLoggingProviderInstrumentation() {
+        super("tinylog");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.tinylog.core.TinylogLoggingProvider";
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("org.tinylog.core.LogEntry", AgentSpanContext.class.getName());
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPrivate())
+                        .and(named("output"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("org.tinylog.core.LogEntry"))),
+                TinylogLoggingProviderInstrumentation.class.getName() + "$OutputAdvice");
+    }
+
+    public static class OutputAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(0) LogEntry event) {
+            AgentSpan span = activeSpan();
+
+            if (span != null && traceConfig(span).isLogsInjectionEnabled()) {
+                InstrumentationContext.get(LogEntry.class, AgentSpanContext.class)
+                        .put(event, span.spanContext());
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/latestDepTest/java/datadog/trace/instrumentation/tomcat/TomcatSecurityTestingHeadersDecodingTest.java b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/latestDepTest/java/datadog/trace/instrumentation/tomcat/TomcatSecurityTestingHeadersDecodingTest.java
index 92d4511beb7..a54f8976169 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/latestDepTest/java/datadog/trace/instrumentation/tomcat/TomcatSecurityTestingHeadersDecodingTest.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/latestDepTest/java/datadog/trace/instrumentation/tomcat/TomcatSecurityTestingHeadersDecodingTest.java
@@ -18,86 +18,82 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 class TomcatSecurityTestingHeadersDecodingTest {
-  private final AgentSpan span = mock(AgentSpan.class);
-  private final Request request = new Request();
-  private final MimeHeaders headers = request.getMimeHeaders();
+    private final AgentSpan span = mock(AgentSpan.class);
+    private final Request request = new Request();
+    private final MimeHeaders headers = request.getMimeHeaders();
 
-  @ParameterizedTest
-  @ValueSource(booleans = {true, false})
-  void tagsFirstNonNullMarkersWithoutReadingUnrelatedValues(boolean bytes) {
-    add("cookie", "unrelated", bytes);
-    add("X-Datadog-Endpoint-Scan", null, bytes);
-    add("X-Datadog-Endpoint-Scan", "scan", bytes);
-    add("x-datadog-endpoint-scan", "ignored", bytes);
-    add("X-DATADOG-SECURITY-TEST", "", bytes);
-    add("x-datadog-security-test", "ignored", bytes);
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void tagsFirstNonNullMarkersWithoutReadingUnrelatedValues(boolean bytes) {
+        add("cookie", "unrelated", bytes);
+        add("X-Datadog-Endpoint-Scan", null, bytes);
+        add("X-Datadog-Endpoint-Scan", "scan", bytes);
+        add("x-datadog-endpoint-scan", "ignored", bytes);
+        add("X-DATADOG-SECURITY-TEST", "", bytes);
+        add("x-datadog-security-test", "ignored", bytes);
 
-    if (bytes) {
-      forbidDecoding(0);
-      forbidDecoding(3);
-      forbidDecoding(5);
-    }
-    tag();
+        if (bytes) {
+            forbidDecoding(0);
+            forbidDecoding(3);
+            forbidDecoding(5);
+        }
+        tag();
 
-    verify(span).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN, "scan");
-    verify(span).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST, "");
-    verifyNoMoreInteractions(span);
-  }
+        verify(span).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN, "scan");
+        verify(span).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST, "");
+        verifyNoMoreInteractions(span);
+    }
 
-  @ParameterizedTest
-  @ValueSource(booleans = {true, false})
-  void missingMarkersDoNotReadAnyHeaderValues(boolean bytes) {
-    add("cookie", "session=abc", bytes);
-    add("authorization", "Bearer token", bytes);
-    if (bytes) {
-      forbidDecoding(0);
-      forbidDecoding(1);
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void missingMarkersDoNotReadAnyHeaderValues(boolean bytes) {
+        add("cookie", "session=abc", bytes);
+        add("authorization", "Bearer token", bytes);
+        if (bytes) {
+            forbidDecoding(0);
+            forbidDecoding(1);
+        }
+        tag();
+        verifyNoMoreInteractions(span);
     }
-    tag();
-    verifyNoMoreInteractions(span);
-  }
 
-  private void tag() {
-    TomcatDecorator.DECORATE.tagSecurityTestingHeaders(span, request);
-  }
+    private void tag() {
+        TomcatDecorator.DECORATE.tagSecurityTestingHeaders(span, request);
+    }
 
-  private void forbidDecoding(int index) {
-    headers
-        .getValue(index)
-        .getByteChunk()
-        .setCharset(
-            new Charset("unexpected-decoding", null) {
-              @Override
-              public boolean contains(Charset charset) {
+    private void forbidDecoding(int index) {
+        headers.getValue(index).getByteChunk().setCharset(new Charset("unexpected-decoding", null) {
+            @Override
+            public boolean contains(Charset charset) {
                 return false;
-              }
+            }
 
-              @Override
-              public CharsetDecoder newDecoder() {
+            @Override
+            public CharsetDecoder newDecoder() {
                 throw new AssertionError("Unrelated or duplicate value decoded");
-              }
+            }
 
-              @Override
-              public CharsetEncoder newEncoder() {
+            @Override
+            public CharsetEncoder newEncoder() {
                 throw new AssertionError("Unexpected encoding");
-              }
-            });
-  }
+            }
+        });
+    }
 
-  private void add(String name, String value, boolean bytes) {
-    MessageBytes field;
-    if (bytes) {
-      byte[] encoded = name.getBytes(StandardCharsets.ISO_8859_1);
-      field = headers.addValue(encoded, 0, encoded.length);
-      if (value != null) {
-        encoded = value.getBytes(StandardCharsets.ISO_8859_1);
-        field.setBytes(encoded, 0, encoded.length);
-      }
-    } else {
-      field = headers.addValue(name);
-      if (value != null) {
-        field.setString(value);
-      }
+    private void add(String name, String value, boolean bytes) {
+        MessageBytes field;
+        if (bytes) {
+            byte[] encoded = name.getBytes(StandardCharsets.ISO_8859_1);
+            field = headers.addValue(encoded, 0, encoded.length);
+            if (value != null) {
+                encoded = value.getBytes(StandardCharsets.ISO_8859_1);
+                field.setBytes(encoded, 0, encoded.length);
+            }
+        } else {
+            field = headers.addValue(name);
+            if (value != null) {
+                field.setString(value);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/ContainerBaseInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/ContainerBaseInstrumentation.java
index ba22df5fba6..ec48a224d42 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/ContainerBaseInstrumentation.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/ContainerBaseInstrumentation.java
@@ -13,37 +13,36 @@
 
 @AutoService(InstrumenterModule.class)
 public class ContainerBaseInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ContainerBaseInstrumentation() {
-    super("tomcat");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ContainerBaseInstrumentation() {
+        super("tomcat");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.catalina.core.ContainerBase";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.catalina.core.ContainerBase";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("setName")), getClass().getName() + "$SetNameAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isMethod().and(named("setName")), getClass().getName() + "$SetNameAdvice");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "tomcat-processtags";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "tomcat-processtags";
+    }
 
-  public static class SetNameAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterSetName(@Advice.This final ContainerBase engine) {
-      if (engine instanceof StandardEngine) {
-        String engineName = engine.getName();
-        if (engineName != null) {
-          ProcessTags.addTag(ProcessTags.SERVER_NAME, engineName);
-          ProcessTags.addTag(ProcessTags.SERVER_TYPE, "tomcat");
+    public static class SetNameAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterSetName(@Advice.This final ContainerBase engine) {
+            if (engine instanceof StandardEngine) {
+                String engineName = engine.getName();
+                if (engineName != null) {
+                    ProcessTags.addTag(ProcessTags.SERVER_NAME, engineName);
+                    ProcessTags.addTag(ProcessTags.SERVER_TYPE, "tomcat");
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/RequestInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/RequestInstrumentation.java
index 9265724a132..fa7f6f41a29 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/RequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/RequestInstrumentation.java
@@ -32,165 +32,161 @@
 
 @AutoService(InstrumenterModule.class)
 public final class RequestInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
-
-  public RequestInstrumentation() {
-    super("tomcat");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.catalina.connector.Request";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".TomcatDecorator",
-      packageName + ".TomcatDecorator$TomcatBlockResponseFunction",
-      packageName + ".TomcatBlockingHelper",
-      packageName + ".RequestURIDataAdapter",
-    };
-  }
-
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    // old versions of Catalina (from 2006 and before) suppress all throwables
-    // in parseParameters(). We let our BlockingException go through
-    transformer.applyAdvice(new ThrowableCaughtVisitorWrapper());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("recycle").and(takesNoArguments()),
-        RequestInstrumentation.class.getName() + "$RecycleAdvice");
-  }
-
-  /**
-   * Tomcat recycles request/response objects after the response is sent. This provides a reliable
-   * point to finish the server span at the last possible moment.
-   */
-  public static class RecycleAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void stopSpan(@Advice.This final Request req) {
-      Response resp = req.getResponse();
-
-      Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-
-      if (contextObj instanceof Context) {
-        /**
-         * This advice will be called for both Request and Response. The context is removed from the
-         * request so the advice only applies the first invocation. (So it doesn't matter which is
-         * recycled first.)
-         */
-        // values set on the coyote request, so we must remove directly from there.
-        req.getCoyoteRequest().setAttribute(DD_CONTEXT_ATTRIBUTE, null);
-
-        final Context context = (Context) contextObj;
-        final AgentSpan span = spanFromContext(context);
-        if (span != null) {
-          DECORATE.onResponse(span, resp);
-          DECORATE.beforeFinish(context);
-          span.finish();
-        } else {
-          DECORATE.beforeFinish(context);
-        }
-      }
-    }
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
 
-    private void muzzleCheck(CoyoteAdapter adapter, Request request) throws Exception {
-      adapter.service(null, null);
-      request.recycle();
+    public RequestInstrumentation() {
+        super("tomcat");
     }
-  }
 
-  public static class ThrowableCaughtVisitorWrapper implements AsmVisitorWrapper {
     @Override
-    public int mergeWriter(int flags) {
-      return flags;
+    public String instrumentedType() {
+        return "org.apache.catalina.connector.Request";
     }
 
     @Override
-    public int mergeReader(int flags) {
-      return flags;
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".TomcatDecorator",
+            packageName + ".TomcatDecorator$TomcatBlockResponseFunction",
+            packageName + ".TomcatBlockingHelper",
+            packageName + ".RequestURIDataAdapter",
+        };
     }
 
     @Override
-    public ClassVisitor wrap(
-        TypeDescription instrumentedType,
-        ClassVisitor classVisitor,
-        Implementation.Context implementationContext,
-        TypePool typePool,
-        FieldList<FieldDescription.InDefinedShape> fields,
-        MethodList<?> methods,
-        int writerFlags,
-        int readerFlags) {
-      if (implementationContext.getClassFileVersion().equals(ClassFileVersion.JAVA_V4)) {
-        return new ThrowableCaughtVisitor(classVisitor);
-      } else {
-        return classVisitor;
-      }
-    }
-  }
-
-  public static class ThrowableCaughtVisitor extends ClassVisitor {
-    protected ThrowableCaughtVisitor(ClassVisitor classVisitor) {
-      super(Opcodes.ASM4, classVisitor);
+    public void typeAdvice(TypeTransformer transformer) {
+        // old versions of Catalina (from 2006 and before) suppress all throwables
+        // in parseParameters(). We let our BlockingException go through
+        transformer.applyAdvice(new ThrowableCaughtVisitorWrapper());
     }
 
     @Override
-    public MethodVisitor visitMethod(
-        int access, String name, String descriptor, String signature, String[] exceptions) {
-      MethodVisitor superMethodVisitor =
-          super.visitMethod(access, name, descriptor, signature, exceptions);
-      if (name.equals("parseParameters") && "()V".equals(descriptor)) {
-        return new ParseParametersMethodVisitor(superMethodVisitor);
-      } else {
-        return superMethodVisitor;
-      }
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("recycle").and(takesNoArguments()), RequestInstrumentation.class.getName() + "$RecycleAdvice");
     }
-  }
 
-  public static class ParseParametersMethodVisitor extends MethodVisitor {
-    public ParseParametersMethodVisitor(MethodVisitor superMethodVisitor) {
-      super(Opcodes.ASM4, superMethodVisitor);
+    /**
+     * Tomcat recycles request/response objects after the response is sent. This provides a reliable
+     * point to finish the server span at the last possible moment.
+     */
+    public static class RecycleAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void stopSpan(@Advice.This final Request req) {
+            Response resp = req.getResponse();
+
+            Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+
+            if (contextObj instanceof Context) {
+                /**
+                 * This advice will be called for both Request and Response. The context is removed from the
+                 * request so the advice only applies the first invocation. (So it doesn't matter which is
+                 * recycled first.)
+                 */
+                // values set on the coyote request, so we must remove directly from there.
+                req.getCoyoteRequest().setAttribute(DD_CONTEXT_ATTRIBUTE, null);
+
+                final Context context = (Context) contextObj;
+                final AgentSpan span = spanFromContext(context);
+                if (span != null) {
+                    DECORATE.onResponse(span, resp);
+                    DECORATE.beforeFinish(context);
+                    span.finish();
+                } else {
+                    DECORATE.beforeFinish(context);
+                }
+            }
+        }
+
+        private void muzzleCheck(CoyoteAdapter adapter, Request request) throws Exception {
+            adapter.service(null, null);
+            request.recycle();
+        }
     }
 
-    private Label throwableHandler;
-    private Label throwLabel;
+    public static class ThrowableCaughtVisitorWrapper implements AsmVisitorWrapper {
+        @Override
+        public int mergeWriter(int flags) {
+            return flags;
+        }
 
-    @Override
-    public void visitTryCatchBlock(Label start, Label end, Label handler, String type) {
-      super.visitTryCatchBlock(start, end, handler, type);
-      if ("java/lang/Throwable".equals(type)) {
-        throwableHandler = handler;
-      }
+        @Override
+        public int mergeReader(int flags) {
+            return flags;
+        }
+
+        @Override
+        public ClassVisitor wrap(
+                TypeDescription instrumentedType,
+                ClassVisitor classVisitor,
+                Implementation.Context implementationContext,
+                TypePool typePool,
+                FieldList<FieldDescription.InDefinedShape> fields,
+                MethodList<?> methods,
+                int writerFlags,
+                int readerFlags) {
+            if (implementationContext.getClassFileVersion().equals(ClassFileVersion.JAVA_V4)) {
+                return new ThrowableCaughtVisitor(classVisitor);
+            } else {
+                return classVisitor;
+            }
+        }
     }
 
-    @Override
-    public void visitLabel(Label label) {
-      super.visitLabel(label);
-      if (label.equals(throwableHandler)) {
-        visitInsn(Opcodes.DUP);
-        visitTypeInsn(Opcodes.INSTANCEOF, Type.getInternalName(BlockingException.class));
-        throwLabel = new Label();
-        visitJumpInsn(Opcodes.IFNE, throwLabel);
-      }
+    public static class ThrowableCaughtVisitor extends ClassVisitor {
+        protected ThrowableCaughtVisitor(ClassVisitor classVisitor) {
+            super(Opcodes.ASM4, classVisitor);
+        }
+
+        @Override
+        public MethodVisitor visitMethod(
+                int access, String name, String descriptor, String signature, String[] exceptions) {
+            MethodVisitor superMethodVisitor = super.visitMethod(access, name, descriptor, signature, exceptions);
+            if (name.equals("parseParameters") && "()V".equals(descriptor)) {
+                return new ParseParametersMethodVisitor(superMethodVisitor);
+            } else {
+                return superMethodVisitor;
+            }
+        }
     }
 
-    @Override
-    public void visitEnd() {
-      if (throwLabel != null) {
-        super.visitLabel(throwLabel);
-        visitInsn(Opcodes.ATHROW);
-      }
-      super.visitEnd();
+    public static class ParseParametersMethodVisitor extends MethodVisitor {
+        public ParseParametersMethodVisitor(MethodVisitor superMethodVisitor) {
+            super(Opcodes.ASM4, superMethodVisitor);
+        }
+
+        private Label throwableHandler;
+        private Label throwLabel;
+
+        @Override
+        public void visitTryCatchBlock(Label start, Label end, Label handler, String type) {
+            super.visitTryCatchBlock(start, end, handler, type);
+            if ("java/lang/Throwable".equals(type)) {
+                throwableHandler = handler;
+            }
+        }
+
+        @Override
+        public void visitLabel(Label label) {
+            super.visitLabel(label);
+            if (label.equals(throwableHandler)) {
+                visitInsn(Opcodes.DUP);
+                visitTypeInsn(Opcodes.INSTANCEOF, Type.getInternalName(BlockingException.class));
+                throwLabel = new Label();
+                visitJumpInsn(Opcodes.IFNE, throwLabel);
+            }
+        }
+
+        @Override
+        public void visitEnd() {
+            if (throwLabel != null) {
+                super.visitLabel(throwLabel);
+                visitInsn(Opcodes.ATHROW);
+            }
+            super.visitEnd();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/ResponseInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/ResponseInstrumentation.java
index d9acec40e32..ccac1f73765 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/ResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/ResponseInstrumentation.java
@@ -18,72 +18,71 @@
 
 @AutoService(InstrumenterModule.class)
 public final class ResponseInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ResponseInstrumentation() {
-    super("tomcat");
-  }
+    public ResponseInstrumentation() {
+        super("tomcat");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.catalina.connector.Response";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.catalina.connector.Response";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".TomcatDecorator",
-      packageName + ".TomcatDecorator$TomcatBlockResponseFunction",
-      packageName + ".TomcatBlockingHelper",
-      packageName + ".RequestURIDataAdapter",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".TomcatDecorator",
+            packageName + ".TomcatDecorator$TomcatBlockResponseFunction",
+            packageName + ".TomcatBlockingHelper",
+            packageName + ".RequestURIDataAdapter",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("recycle").and(takesNoArguments()),
-        ResponseInstrumentation.class.getName() + "$RecycleAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("recycle").and(takesNoArguments()), ResponseInstrumentation.class.getName() + "$RecycleAdvice");
+    }
 
-  /**
-   * Tomcat recycles request/response objects after the response is sent. This provides a reliable
-   * point to finish the server span at the last possible moment.
-   */
-  public static class RecycleAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void stopSpan(@Advice.This final Response resp) {
-      Request req = resp.getRequest();
+    /**
+     * Tomcat recycles request/response objects after the response is sent. This provides a reliable
+     * point to finish the server span at the last possible moment.
+     */
+    public static class RecycleAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void stopSpan(@Advice.This final Response resp) {
+            Request req = resp.getRequest();
 
-      Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
 
-      if (contextObj instanceof Context) {
-        /**
-         * This advice will be called for both Request and Response. The context is removed from the
-         * request so the advice only applies the first invocation. (So it doesn't matter which is
-         * recycled first.)
-         */
-        // values set on the coyote request, so we must remove directly from there.
-        req.getCoyoteRequest().setAttribute(DD_CONTEXT_ATTRIBUTE, null);
+            if (contextObj instanceof Context) {
+                /**
+                 * This advice will be called for both Request and Response. The context is removed from the
+                 * request so the advice only applies the first invocation. (So it doesn't matter which is
+                 * recycled first.)
+                 */
+                // values set on the coyote request, so we must remove directly from there.
+                req.getCoyoteRequest().setAttribute(DD_CONTEXT_ATTRIBUTE, null);
 
-        final Context context = (Context) contextObj;
-        final AgentSpan span = spanFromContext(context);
-        if (span != null) {
-          DECORATE.onResponse(span, resp);
-          DECORATE.beforeFinish(context);
-          span.finish();
-        } else {
-          DECORATE.beforeFinish(context);
+                final Context context = (Context) contextObj;
+                final AgentSpan span = spanFromContext(context);
+                if (span != null) {
+                    DECORATE.onResponse(span, resp);
+                    DECORATE.beforeFinish(context);
+                    span.finish();
+                } else {
+                    DECORATE.beforeFinish(context);
+                }
+            }
         }
-      }
-    }
 
-    private void muzzleCheck(CoyoteAdapter adapter, Response response) throws Exception {
-      adapter.service(null, null);
-      response.recycle();
+        private void muzzleCheck(CoyoteAdapter adapter, Response response) throws Exception {
+            adapter.service(null, null);
+            response.recycle();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/TomcatServerInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/TomcatServerInstrumentation.java
index 14fb92e8fae..b87687c761c 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/TomcatServerInstrumentation.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/TomcatServerInstrumentation.java
@@ -35,179 +35,181 @@
 
 @AutoService(InstrumenterModule.class)
 public final class TomcatServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
-
-  public TomcatServerInstrumentation() {
-    super("tomcat");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.catalina.connector.CoyoteAdapter";
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".TomcatDecorator",
-      packageName + ".TomcatDecorator$TomcatBlockResponseFunction",
-      packageName + ".RequestURIDataAdapter",
-      packageName + ".TomcatBlockingHelper",
-    };
-  }
-
-  private static final Reference GET_OUTPUT_STREAM_REFERENCE =
-      new Reference.Builder("org.apache.catalina.connector.Response")
-          .withMethod(
-              new String[0],
-              EXPECTS_PUBLIC | EXPECTS_NON_STATIC,
-              "getOutputStream",
-              "Ljavax/servlet/ServletOutputStream;")
-          .or()
-          .withMethod(
-              new String[0],
-              EXPECTS_PUBLIC | EXPECTS_NON_STATIC,
-              "getOutputStream",
-              "Ljakarta/servlet/ServletOutputStream;")
-          .build();
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {GET_OUTPUT_STREAM_REFERENCE};
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        named("service")
-            .and(takesArgument(0, named("org.apache.coyote.Request")))
-            .and(takesArgument(1, named("org.apache.coyote.Response"))),
-        TomcatServerInstrumentation.class.getName()
-            + "$ContextTrackingAdvice", // context tracking must be applied first
-        TomcatServerInstrumentation.class.getName() + "$ServiceAdvice");
-    transformer.applyAdvice(
-        named("postParseRequest")
-            .and(takesArgument(0, named("org.apache.coyote.Request")))
-            .and(takesArgument(1, named("org.apache.catalina.connector.Request")))
-            .and(takesArgument(2, named("org.apache.coyote.Response")))
-            .and(takesArgument(3, named("org.apache.catalina.connector.Response"))),
-        TomcatServerInstrumentation.class.getName() + "$PostParseAdvice");
-  }
-
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    return singletonMap(
-        RUNNABLE,
-        Arrays.asList(
-            "org.apache.tomcat.util.threads.TaskThread$WrappingRunnable",
-            "org.apache.tomcat.util.net.SocketProcessorBase",
-            "org.apache.tomcat.util.net.AprEndpoint$Poller",
-            "org.apache.tomcat.util.net.NioEndpoint$Poller",
-            "org.apache.tomcat.util.net.NioEndpoint$PollerEvent",
-            "org.apache.tomcat.util.net.AprEndpoint$SocketProcessor",
-            "org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor",
-            "org.apache.tomcat.util.net.NioEndpoint$SocketProcessor",
-            "org.apache.tomcat.util.net.Nio2Endpoint$SocketProcessor",
-            "org.apache.tomcat.util.net.NioBlockingSelector$BlockPoller"));
-  }
-
-  @AppliesOn(TargetSystem.CONTEXT_TRACKING)
-  public static class ContextTrackingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void extractParent(
-        @Advice.Argument(0) org.apache.coyote.Request req,
-        @Advice.Local("parentScope") ContextScope parentScope) {
-      Object existingCtx = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
-      if (existingCtx instanceof Context) {
-        // Request already gone through initial processing, so just attach the context.
-        parentScope = ((Context) existingCtx).attach();
-      } else {
-        final Context parentContext = DECORATE.extract(req);
-        req.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
-        parentScope = parentContext.attach();
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
+
+    public TomcatServerInstrumentation() {
+        super("tomcat");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Local("parentScope") ContextScope scope) {
-      scope.close();
+    @Override
+    public String instrumentedType() {
+        return "org.apache.catalina.connector.CoyoteAdapter";
     }
-  }
-
-  public static class ServiceAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onService(
-        @Advice.Argument(0) org.apache.coyote.Request req,
-        @Advice.Local("serverScope") ContextScope serverScope) {
-      Object existingCtx = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (existingCtx instanceof Context) {
-        // Request already gone through initial processing, so just attach the context.
-        serverScope = ((Context) existingCtx).attach();
-        return;
-      }
-      final Object parentContextObj = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
-      final Context parentContext =
-          (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
-
-      final Context context = DECORATE.startSpan(req, parentContext);
-      serverScope = context.attach();
-
-      // This span is finished when Request.recycle() is called by RequestInstrumentation.
-      final AgentSpan span = spanFromContext(context);
-      DECORATE.afterStart(span);
-
-      req.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
-      req.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
-      req.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExtractAdapter",
+            packageName + ".ExtractAdapter$Request",
+            packageName + ".ExtractAdapter$Response",
+            packageName + ".TomcatDecorator",
+            packageName + ".TomcatDecorator$TomcatBlockResponseFunction",
+            packageName + ".RequestURIDataAdapter",
+            packageName + ".TomcatBlockingHelper",
+        };
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Local("serverScope") ContextScope serverScope) {
-      serverScope.close();
+    private static final Reference GET_OUTPUT_STREAM_REFERENCE = new Reference.Builder(
+                    "org.apache.catalina.connector.Response")
+            .withMethod(
+                    new String[0],
+                    EXPECTS_PUBLIC | EXPECTS_NON_STATIC,
+                    "getOutputStream",
+                    "Ljavax/servlet/ServletOutputStream;")
+            .or()
+            .withMethod(
+                    new String[0],
+                    EXPECTS_PUBLIC | EXPECTS_NON_STATIC,
+                    "getOutputStream",
+                    "Ljakarta/servlet/ServletOutputStream;")
+            .build();
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {GET_OUTPUT_STREAM_REFERENCE};
     }
 
-    private void muzzleCheck(CoyoteAdapter adapter, Request request, Response response)
-        throws Exception {
-      adapter.service(null, null);
-      request.recycle(); // just to be safe and ensure it matches consistently.
-      response.recycle(); // just to be safe and ensure it matches consistently.
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                named("service")
+                        .and(takesArgument(0, named("org.apache.coyote.Request")))
+                        .and(takesArgument(1, named("org.apache.coyote.Response"))),
+                TomcatServerInstrumentation.class.getName()
+                        + "$ContextTrackingAdvice", // context tracking must be applied first
+                TomcatServerInstrumentation.class.getName() + "$ServiceAdvice");
+        transformer.applyAdvice(
+                named("postParseRequest")
+                        .and(takesArgument(0, named("org.apache.coyote.Request")))
+                        .and(takesArgument(1, named("org.apache.catalina.connector.Request")))
+                        .and(takesArgument(2, named("org.apache.coyote.Response")))
+                        .and(takesArgument(3, named("org.apache.catalina.connector.Response"))),
+                TomcatServerInstrumentation.class.getName() + "$PostParseAdvice");
+    }
+
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        return singletonMap(
+                RUNNABLE,
+                Arrays.asList(
+                        "org.apache.tomcat.util.threads.TaskThread$WrappingRunnable",
+                        "org.apache.tomcat.util.net.SocketProcessorBase",
+                        "org.apache.tomcat.util.net.AprEndpoint$Poller",
+                        "org.apache.tomcat.util.net.NioEndpoint$Poller",
+                        "org.apache.tomcat.util.net.NioEndpoint$PollerEvent",
+                        "org.apache.tomcat.util.net.AprEndpoint$SocketProcessor",
+                        "org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor",
+                        "org.apache.tomcat.util.net.NioEndpoint$SocketProcessor",
+                        "org.apache.tomcat.util.net.Nio2Endpoint$SocketProcessor",
+                        "org.apache.tomcat.util.net.NioBlockingSelector$BlockPoller"));
+    }
+
+    @AppliesOn(TargetSystem.CONTEXT_TRACKING)
+    public static class ContextTrackingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void extractParent(
+                @Advice.Argument(0) org.apache.coyote.Request req,
+                @Advice.Local("parentScope") ContextScope parentScope) {
+            Object existingCtx = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
+            if (existingCtx instanceof Context) {
+                // Request already gone through initial processing, so just attach the context.
+                parentScope = ((Context) existingCtx).attach();
+            } else {
+                final Context parentContext = DECORATE.extract(req);
+                req.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
+                parentScope = parentContext.attach();
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Local("parentScope") ContextScope scope) {
+            scope.close();
+        }
     }
-  }
-
-  /**
-   * The span is being started before the request is fully parsed out, so we must delay collecting
-   * data from the request until after it is fully parsed/populated.
-   */
-  public static class PostParseAdvice {
-
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterParse(
-        @Advice.Argument(1) Request req,
-        @Advice.Argument(3) Response resp,
-        @Advice.Return(readOnly = false) Boolean ret) {
-      Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
-      if (contextObj instanceof Context) {
-        Context context = (Context) contextObj;
-        AgentSpan span = spanFromContext(context);
-        if (span != null) {
-          req.setAttribute(
-              CorrelationIdentifier.getTraceIdKey(), AgentTracer.get().getTraceId(span));
-          req.setAttribute(CorrelationIdentifier.getSpanIdKey(), AgentTracer.get().getSpanId(span));
-          Object ctxObj = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
-          Context parentContext = ctxObj instanceof Context ? (Context) ctxObj : rootContext();
-          DECORATE.onRequest(span, req, req, parentContext);
-          Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
-          if (rba != null) {
-            TomcatBlockingHelper.commitBlockingResponse(
-                span.getRequestContext().getTraceSegment(), req, resp, rba);
-            ret = false; // skip pipeline
-          }
+
+    public static class ServiceAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onService(
+                @Advice.Argument(0) org.apache.coyote.Request req,
+                @Advice.Local("serverScope") ContextScope serverScope) {
+            Object existingCtx = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (existingCtx instanceof Context) {
+                // Request already gone through initial processing, so just attach the context.
+                serverScope = ((Context) existingCtx).attach();
+                return;
+            }
+            final Object parentContextObj = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
+            final Context parentContext =
+                    (parentContextObj instanceof Context) ? (Context) parentContextObj : rootContext();
+
+            final Context context = DECORATE.startSpan(req, parentContext);
+            serverScope = context.attach();
+
+            // This span is finished when Request.recycle() is called by RequestInstrumentation.
+            final AgentSpan span = spanFromContext(context);
+            DECORATE.afterStart(span);
+
+            req.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
+            req.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+            req.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Local("serverScope") ContextScope serverScope) {
+            serverScope.close();
+        }
+
+        private void muzzleCheck(CoyoteAdapter adapter, Request request, Response response) throws Exception {
+            adapter.service(null, null);
+            request.recycle(); // just to be safe and ensure it matches consistently.
+            response.recycle(); // just to be safe and ensure it matches consistently.
+        }
+    }
+
+    /**
+     * The span is being started before the request is fully parsed out, so we must delay collecting
+     * data from the request until after it is fully parsed/populated.
+     */
+    public static class PostParseAdvice {
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterParse(
+                @Advice.Argument(1) Request req,
+                @Advice.Argument(3) Response resp,
+                @Advice.Return(readOnly = false) Boolean ret) {
+            Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+            if (contextObj instanceof Context) {
+                Context context = (Context) contextObj;
+                AgentSpan span = spanFromContext(context);
+                if (span != null) {
+                    req.setAttribute(
+                            CorrelationIdentifier.getTraceIdKey(),
+                            AgentTracer.get().getTraceId(span));
+                    req.setAttribute(
+                            CorrelationIdentifier.getSpanIdKey(),
+                            AgentTracer.get().getSpanId(span));
+                    Object ctxObj = req.getAttribute(DD_PARENT_CONTEXT_ATTRIBUTE);
+                    Context parentContext = ctxObj instanceof Context ? (Context) ctxObj : rootContext();
+                    DECORATE.onRequest(span, req, req, parentContext);
+                    Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
+                    if (rba != null) {
+                        TomcatBlockingHelper.commitBlockingResponse(
+                                span.getRequestContext().getTraceSegment(), req, resp, rba);
+                        ret = false; // skip pipeline
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/WsHandshakeRequestInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/WsHandshakeRequestInstrumentation.java
index dd310511fdf..c968b2fabc0 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/WsHandshakeRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/WsHandshakeRequestInstrumentation.java
@@ -16,41 +16,42 @@
 
 @AutoService(InstrumenterModule.class)
 public class WsHandshakeRequestInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public WsHandshakeRequestInstrumentation() {
-    super("tomcat", "tomcat-websocket", "websocket");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.tomcat.websocket.server.WsHandshakeRequest";
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(instrumentedType(), AgentSpan.class.getName());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureHandshakeSpanAdvice");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "tomcat-websocket";
-  }
-
-  public static class CaptureHandshakeSpanAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void captureHandshakeSpan(@Advice.This final WsHandshakeRequest self) {
-      final AgentSpan span = activeSpan();
-      if (span != null) {
-        // apply jee configuration overrides if any since the servlet instrumentation won't kick in
-        // for this span.
-        ClassloaderConfigurationOverrides.maybeEnrichSpan(span);
-        InstrumentationContext.get(WsHandshakeRequest.class, AgentSpan.class).getOrPut(self, span);
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public WsHandshakeRequestInstrumentation() {
+        super("tomcat", "tomcat-websocket", "websocket");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.apache.tomcat.websocket.server.WsHandshakeRequest";
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(instrumentedType(), AgentSpan.class.getName());
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureHandshakeSpanAdvice");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "tomcat-websocket";
+    }
+
+    public static class CaptureHandshakeSpanAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void captureHandshakeSpan(@Advice.This final WsHandshakeRequest self) {
+            final AgentSpan span = activeSpan();
+            if (span != null) {
+                // apply jee configuration overrides if any since the servlet instrumentation won't kick in
+                // for this span.
+                ClassloaderConfigurationOverrides.maybeEnrichSpan(span);
+                InstrumentationContext.get(WsHandshakeRequest.class, AgentSpan.class)
+                        .getOrPut(self, span);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/WsHttpUpgradeHandlerInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/WsHttpUpgradeHandlerInstrumentation.java
index d075465806d..ac58807adb7 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/WsHttpUpgradeHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/WsHttpUpgradeHandlerInstrumentation.java
@@ -16,46 +16,45 @@
 
 @AutoService(InstrumenterModule.class)
 public class WsHttpUpgradeHandlerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public WsHttpUpgradeHandlerInstrumentation() {
-    super("tomcat", "tomcat-websocket", "websocket");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.tomcat.websocket.server.WsHttpUpgradeHandler";
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.apache.tomcat.websocket.server.WsHandshakeRequest", AgentSpan.class.getName());
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "tomcat-websocket";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(named("init"), getClass().getName() + "$CaptureHandshakeSpanAdvice");
-  }
-
-  public static class CaptureHandshakeSpanAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(
-        @Advice.FieldValue("handshakeRequest") final WsHandshakeRequest request) {
-      final AgentSpan span =
-          InstrumentationContext.get(WsHandshakeRequest.class, AgentSpan.class).get(request);
-      return span != null ? activateSpan(span) : null;
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public WsHttpUpgradeHandlerInstrumentation() {
+        super("tomcat", "tomcat-websocket", "websocket");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter final ContextScope scope) {
-      if (scope != null) {
-        scope.close();
-      }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.tomcat.websocket.server.WsHttpUpgradeHandler";
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap(
+                "org.apache.tomcat.websocket.server.WsHandshakeRequest", AgentSpan.class.getName());
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "tomcat-websocket";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("init"), getClass().getName() + "$CaptureHandshakeSpanAdvice");
+    }
+
+    public static class CaptureHandshakeSpanAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(@Advice.FieldValue("handshakeRequest") final WsHandshakeRequest request) {
+            final AgentSpan span = InstrumentationContext.get(WsHandshakeRequest.class, AgentSpan.class)
+                    .get(request);
+            return span != null ? activateSpan(span) : null;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter final ContextScope scope) {
+            if (scope != null) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/test/java/datadog/trace/instrumentation/tomcat/TomcatSecurityTestingHeadersTest.java b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/test/java/datadog/trace/instrumentation/tomcat/TomcatSecurityTestingHeadersTest.java
index 4514b6e4192..da646d64762 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/test/java/datadog/trace/instrumentation/tomcat/TomcatSecurityTestingHeadersTest.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/test/java/datadog/trace/instrumentation/tomcat/TomcatSecurityTestingHeadersTest.java
@@ -16,77 +16,77 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 class TomcatSecurityTestingHeadersTest {
-  private final AgentSpan span = mock(AgentSpan.class);
-  private final Request request = new Request();
-  private final MimeHeaders headers = request.getMimeHeaders();
+    private final AgentSpan span = mock(AgentSpan.class);
+    private final Request request = new Request();
+    private final MimeHeaders headers = request.getMimeHeaders();
 
-  @ParameterizedTest
-  @ValueSource(booleans = {true, false})
-  void tagsFirstNonNullMarkers(boolean bytes) {
-    add("cookie", "unrelated", bytes);
-    add("X-Datadog-Endpoint-Scan", null, bytes);
-    add("X-Datadog-Endpoint-Scan", "scan", bytes);
-    add("x-datadog-endpoint-scan", "ignored", bytes);
-    add("X-DATADOG-SECURITY-TEST", "", bytes);
-    add("x-datadog-security-test", "ignored", bytes);
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void tagsFirstNonNullMarkers(boolean bytes) {
+        add("cookie", "unrelated", bytes);
+        add("X-Datadog-Endpoint-Scan", null, bytes);
+        add("X-Datadog-Endpoint-Scan", "scan", bytes);
+        add("x-datadog-endpoint-scan", "ignored", bytes);
+        add("X-DATADOG-SECURITY-TEST", "", bytes);
+        add("x-datadog-security-test", "ignored", bytes);
 
-    tag();
+        tag();
 
-    verify(span).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN, "scan");
-    verify(span).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST, "");
-    verifyNoMoreInteractions(span);
-  }
+        verify(span).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN, "scan");
+        verify(span).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST, "");
+        verifyNoMoreInteractions(span);
+    }
 
-  @ParameterizedTest
-  @ValueSource(booleans = {true, false})
-  void ignoresUnrelatedHeaders(boolean bytes) {
-    add("cookie", "session=abc", bytes);
-    add("authorization", "Bearer token", bytes);
-    tag();
-    verifyNoMoreInteractions(span);
-  }
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void ignoresUnrelatedHeaders(boolean bytes) {
+        add("cookie", "session=abc", bytes);
+        add("authorization", "Bearer token", bytes);
+        tag();
+        verifyNoMoreInteractions(span);
+    }
 
-  @Test
-  void tagsSingleMarker() {
-    add("x-datadog-security-test", "test", true);
-    tag();
-    verify(span).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST, "test");
-    verifyNoMoreInteractions(span);
-  }
+    @Test
+    void tagsSingleMarker() {
+        add("x-datadog-security-test", "test", true);
+        tag();
+        verify(span).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST, "test");
+        verifyNoMoreInteractions(span);
+    }
 
-  @Test
-  void ignoresNullMarkerValues() {
-    add("x-datadog-endpoint-scan", null, true);
-    add("x-datadog-security-test", null, true);
-    tag();
-    verifyNoMoreInteractions(span);
-  }
+    @Test
+    void ignoresNullMarkerValues() {
+        add("x-datadog-endpoint-scan", null, true);
+        add("x-datadog-security-test", null, true);
+        tag();
+        verifyNoMoreInteractions(span);
+    }
 
-  @Test
-  void toleratesMissingCarrierAndEmptyHeaders() {
-    TomcatDecorator.DECORATE.tagSecurityTestingHeaders(span, null);
-    TomcatDecorator.DECORATE.tagSecurityTestingHeaders(span, request);
-    verifyNoMoreInteractions(span);
-  }
+    @Test
+    void toleratesMissingCarrierAndEmptyHeaders() {
+        TomcatDecorator.DECORATE.tagSecurityTestingHeaders(span, null);
+        TomcatDecorator.DECORATE.tagSecurityTestingHeaders(span, request);
+        verifyNoMoreInteractions(span);
+    }
 
-  private void tag() {
-    TomcatDecorator.DECORATE.tagSecurityTestingHeaders(span, request);
-  }
+    private void tag() {
+        TomcatDecorator.DECORATE.tagSecurityTestingHeaders(span, request);
+    }
 
-  private void add(String name, String value, boolean bytes) {
-    MessageBytes field;
-    if (bytes) {
-      byte[] encoded = name.getBytes(StandardCharsets.ISO_8859_1);
-      field = headers.addValue(encoded, 0, encoded.length);
-      if (value != null) {
-        encoded = value.getBytes(StandardCharsets.ISO_8859_1);
-        field.setBytes(encoded, 0, encoded.length);
-      }
-    } else {
-      field = headers.addValue(name);
-      if (value != null) {
-        field.setString(value);
-      }
+    private void add(String name, String value, boolean bytes) {
+        MessageBytes field;
+        if (bytes) {
+            byte[] encoded = name.getBytes(StandardCharsets.ISO_8859_1);
+            field = headers.addValue(encoded, 0, encoded.length);
+            if (value != null) {
+                encoded = value.getBytes(StandardCharsets.ISO_8859_1);
+                field.setBytes(encoded, 0, encoded.length);
+            }
+        } else {
+            field = headers.addValue(name);
+            if (value != null) {
+                field.setString(value);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-9.0/src/main/java/datadog/trace/instrumentation/tomcat9/WebappClassLoaderInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-9.0/src/main/java/datadog/trace/instrumentation/tomcat9/WebappClassLoaderInstrumentation.java
index a24715c184f..c1921bc940f 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-9.0/src/main/java/datadog/trace/instrumentation/tomcat9/WebappClassLoaderInstrumentation.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-9.0/src/main/java/datadog/trace/instrumentation/tomcat9/WebappClassLoaderInstrumentation.java
@@ -19,70 +19,70 @@
 
 @AutoService(InstrumenterModule.class)
 public class WebappClassLoaderInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  private static final String TOMCAT = "tomcat";
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    private static final String TOMCAT = "tomcat";
 
-  public WebappClassLoaderInstrumentation() {
-    super(TOMCAT, "tomcat-classloading");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.catalina.loader.WebappClassLoaderBase";
-  }
+    public WebappClassLoaderInstrumentation() {
+        super(TOMCAT, "tomcat-classloading");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("setResources")), getClass().getName() + "$CaptureWebappNameAdvice");
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.catalina.loader.WebappClassLoaderBase";
+    }
 
-  public static class CaptureWebappNameAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onContextAvailable(
-        @Advice.This final WebappClassLoaderBase classLoader,
-        @Advice.Argument(0) final WebResourceRoot webResourceRoot) {
-      // at this moment we have the context set in this classloader, hence its name
-      final Context context = webResourceRoot != null ? webResourceRoot.getContext() : null;
-      if (context == null) {
-        return;
-      }
-      ClassloaderConfigurationOverrides.ContextualInfo info = null;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("setResources")), getClass().getName() + "$CaptureWebappNameAdvice");
+    }
 
-      final String contextName = context.getBaseName();
-      if (contextName != null && !contextName.isEmpty()) {
-        info = ClassloaderConfigurationOverrides.withPinnedServiceName(classLoader, contextName);
-      }
-      if (context.getNamingResources() != null) {
-        final ContextEnvironment[] envs = context.getNamingResources().findEnvironments();
-        if (envs != null) {
-          final Map<String, String> tags = new HashMap<>();
-          for (final ContextEnvironment env : envs) {
-            // as a limitation here we simplify a lot the logic and we do not try to resolve the
-            // typed value but we just take the string representation. It avoids implementing the
-            // logic to convert to other types
-            // (i.e. long, double) or instrument more deeply tomcat naming
-            if (env.getValue() == null || env.getValue().isEmpty()) {
-              continue;
-            }
-            String name = null;
-            if (env.getName().startsWith(DATADOG_TAGS_PREFIX)) {
-              name = env.getName().substring(DATADOG_TAGS_PREFIX.length());
-            } else if (env.getName().startsWith(DATADOG_TAGS_JNDI_PREFIX)) {
-              name = env.getName().substring(DATADOG_TAGS_JNDI_PREFIX.length());
+    public static class CaptureWebappNameAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onContextAvailable(
+                @Advice.This final WebappClassLoaderBase classLoader,
+                @Advice.Argument(0) final WebResourceRoot webResourceRoot) {
+            // at this moment we have the context set in this classloader, hence its name
+            final Context context = webResourceRoot != null ? webResourceRoot.getContext() : null;
+            if (context == null) {
+                return;
             }
-            if (name != null && !name.isEmpty()) {
-              tags.put(name, env.getValue());
+            ClassloaderConfigurationOverrides.ContextualInfo info = null;
+
+            final String contextName = context.getBaseName();
+            if (contextName != null && !contextName.isEmpty()) {
+                info = ClassloaderConfigurationOverrides.withPinnedServiceName(classLoader, contextName);
             }
-          }
-          if (!tags.isEmpty()) {
-            if (info == null) {
-              info = ClassloaderConfigurationOverrides.maybeCreateContextualInfo(classLoader);
+            if (context.getNamingResources() != null) {
+                final ContextEnvironment[] envs = context.getNamingResources().findEnvironments();
+                if (envs != null) {
+                    final Map<String, String> tags = new HashMap<>();
+                    for (final ContextEnvironment env : envs) {
+                        // as a limitation here we simplify a lot the logic and we do not try to resolve the
+                        // typed value but we just take the string representation. It avoids implementing the
+                        // logic to convert to other types
+                        // (i.e. long, double) or instrument more deeply tomcat naming
+                        if (env.getValue() == null || env.getValue().isEmpty()) {
+                            continue;
+                        }
+                        String name = null;
+                        if (env.getName().startsWith(DATADOG_TAGS_PREFIX)) {
+                            name = env.getName().substring(DATADOG_TAGS_PREFIX.length());
+                        } else if (env.getName().startsWith(DATADOG_TAGS_JNDI_PREFIX)) {
+                            name = env.getName().substring(DATADOG_TAGS_JNDI_PREFIX.length());
+                        }
+                        if (name != null && !name.isEmpty()) {
+                            tags.put(name, env.getValue());
+                        }
+                    }
+                    if (!tags.isEmpty()) {
+                        if (info == null) {
+                            info = ClassloaderConfigurationOverrides.maybeCreateContextualInfo(classLoader);
+                        }
+                        tags.forEach(info::addTag);
+                    }
+                }
             }
-            tags.forEach(info::addTag);
-          }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/src/main/java/datadog/trace/instrumentation/tomcat55/CommitActionInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/src/main/java/datadog/trace/instrumentation/tomcat55/CommitActionInstrumentation.java
index b5e74a8751b..dc118e5045b 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/src/main/java/datadog/trace/instrumentation/tomcat55/CommitActionInstrumentation.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/src/main/java/datadog/trace/instrumentation/tomcat55/CommitActionInstrumentation.java
@@ -27,100 +27,96 @@
  */
 @AutoService(InstrumenterModule.class)
 public class CommitActionInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public CommitActionInstrumentation() {
-    super("tomcat");
-  }
+    public CommitActionInstrumentation() {
+        super("tomcat");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "until703";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "until703";
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    /* we're assuming all these have a coyote.Response response field and implement ActionHook */
-    return new String[] {
-      "org.apache.coyote.ajp.AbstractAjpProcessor",
-      "org.apache.coyote.http11.AbstractHttp11Processor",
-      "org.apache.coyote.AbstractProcessor",
-      "org.apache.coyote.ajp.AjpAprProcessor",
-      "org.apache.coyote.ajp.AjpProcessor",
-      "org.apache.coyote.http11.Http11AprProcessor",
-      "org.apache.coyote.http11.Http11NioProcessor",
-      "org.apache.coyote.http11.Http11Processor",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        /* we're assuming all these have a coyote.Response response field and implement ActionHook */
+        return new String[] {
+            "org.apache.coyote.ajp.AbstractAjpProcessor",
+            "org.apache.coyote.http11.AbstractHttp11Processor",
+            "org.apache.coyote.AbstractProcessor",
+            "org.apache.coyote.ajp.AjpAprProcessor",
+            "org.apache.coyote.ajp.AjpProcessor",
+            "org.apache.coyote.http11.Http11AprProcessor",
+            "org.apache.coyote.http11.Http11NioProcessor",
+            "org.apache.coyote.http11.Http11Processor",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("action"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("org.apache.coyote.ActionCode")))
-            .and(takesArgument(1, Object.class)),
-        CommitActionInstrumentation.class.getName() + "$ProcessCommitActionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("action"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("org.apache.coyote.ActionCode")))
+                        .and(takesArgument(1, Object.class)),
+                CommitActionInstrumentation.class.getName() + "$ProcessCommitActionAdvice");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    String pkg = "datadog.trace.instrumentation.tomcat";
-    return new String[] {
-      pkg + ".ExtractAdapter",
-      pkg + ".ExtractAdapter$Request",
-      pkg + ".ExtractAdapter$Response",
-      pkg + ".ExtractAdapter$CoyoteResponse",
-      pkg + ".TomcatDecorator",
-      pkg + ".TomcatDecorator$TomcatBlockResponseFunction",
-      pkg + ".TomcatBlockingHelper",
-      pkg + ".RequestURIDataAdapter",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        String pkg = "datadog.trace.instrumentation.tomcat";
+        return new String[] {
+            pkg + ".ExtractAdapter",
+            pkg + ".ExtractAdapter$Request",
+            pkg + ".ExtractAdapter$Response",
+            pkg + ".ExtractAdapter$CoyoteResponse",
+            pkg + ".TomcatDecorator",
+            pkg + ".TomcatDecorator$TomcatBlockResponseFunction",
+            pkg + ".TomcatBlockingHelper",
+            pkg + ".RequestURIDataAdapter",
+        };
+    }
 
-  static class ProcessCommitActionAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-    static boolean /* skip body */ before(
-        @Advice.Argument(0) ActionCode actionCode,
-        @Advice.This ActionHook thiz,
-        @Advice.FieldValue("response") Response coyoteResponse) {
-      if (actionCode.getCode() != ActionCode.ACTION_COMMIT.getCode()) {
-        return false;
-      }
-      Request request = coyoteResponse.getRequest();
-      if (request.getAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE) != null) {
-        return false;
-      }
-      request.setAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE, Boolean.TRUE);
+    static class ProcessCommitActionAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+        static boolean /* skip body */ before(
+                @Advice.Argument(0) ActionCode actionCode,
+                @Advice.This ActionHook thiz,
+                @Advice.FieldValue("response") Response coyoteResponse) {
+            if (actionCode.getCode() != ActionCode.ACTION_COMMIT.getCode()) {
+                return false;
+            }
+            Request request = coyoteResponse.getRequest();
+            if (request.getAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE) != null) {
+                return false;
+            }
+            request.setAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE, Boolean.TRUE);
 
-      AgentSpan agentSpan = AgentTracer.activeSpan();
-      if (agentSpan == null) {
-        return false;
-      }
-      RequestContext requestContext = agentSpan.getRequestContext();
-      if (requestContext == null) {
-        return false;
-      }
+            AgentSpan agentSpan = AgentTracer.activeSpan();
+            if (agentSpan == null) {
+                return false;
+            }
+            RequestContext requestContext = agentSpan.getRequestContext();
+            if (requestContext == null) {
+                return false;
+            }
 
-      Flow<Void> flow =
-          TomcatDecorator.DECORATE.callIGCallbackResponseAndHeaders(
-              agentSpan,
-              coyoteResponse,
-              coyoteResponse.getStatus(),
-              ExtractAdapter.CoyoteResponse.GETTER);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction brf = requestContext.getBlockResponseFunction();
-        if (brf != null) {
-          brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
-          thiz.action(ActionCode.ACTION_CLOSE, null);
-          return true;
-        }
-      }
+            Flow<Void> flow = TomcatDecorator.DECORATE.callIGCallbackResponseAndHeaders(
+                    agentSpan, coyoteResponse, coyoteResponse.getStatus(), ExtractAdapter.CoyoteResponse.GETTER);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction brf = requestContext.getBlockResponseFunction();
+                if (brf != null) {
+                    brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
+                    thiz.action(ActionCode.ACTION_CLOSE, null);
+                    return true;
+                }
+            }
 
-      return false;
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/src/main/java/datadog/trace/instrumentation/tomcat55/ParsedBodyParametersInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/src/main/java/datadog/trace/instrumentation/tomcat55/ParsedBodyParametersInstrumentation.java
index be98fe79c12..bb7a3d2bf52 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/src/main/java/datadog/trace/instrumentation/tomcat55/ParsedBodyParametersInstrumentation.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/src/main/java/datadog/trace/instrumentation/tomcat55/ParsedBodyParametersInstrumentation.java
@@ -28,133 +28,129 @@
 
 @AutoService(InstrumenterModule.class)
 public class ParsedBodyParametersInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public ParsedBodyParametersInstrumentation() {
-    super("tomcat");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "until6035_7022";
-  }
-
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Avoid matching Tomcat 5.0.x which is not supported by this instrumentation.
-    return hasClassNamed("org.apache.tomcat.util.buf.StringCache");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.tomcat.util.http.Parameters";
-  }
-
-  // paramHashStringArray was only final for a few days. it doesn't seem to have made into a release
-  private static final Reference PARAM_HASH_STRING_ARRAY_REFERENCE =
-      new Reference.Builder("org.apache.tomcat.util.http.Parameters")
-          .withField(
-              new String[0],
-              Reference.EXPECTS_NON_FINAL,
-              "paramHashStringArray",
-              "Ljava/util/Hashtable;")
-          .build();
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {PARAM_HASH_STRING_ARRAY_REFERENCE};
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        // also matches the variant taking an extra encoding parameter
-        named("processParameters")
-            .and(takesArgument(0, byte[].class))
-            .and(takesArgument(1, int.class))
-            .and(takesArgument(2, int.class)),
-        getClass().getName() + "$ProcessParametersAdvice");
-
-    transformer.applyAdvice(
-        named("handleQueryParameters").and(takesArguments(0)),
-        getClass().getName() + "$HandleQueryParametersAdvice");
-  }
-
-  // skip advice in processParameters if we're inside handleQueryParameters()
-  public static class HandleQueryParametersAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static int before() {
-      return CallDepthThreadLocalMap.incrementCallDepth(Parameters.class);
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public ParsedBodyParametersInstrumentation() {
+        super("tomcat");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "until6035_7022";
+    }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Avoid matching Tomcat 5.0.x which is not supported by this instrumentation.
+        return hasClassNamed("org.apache.tomcat.util.buf.StringCache");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(@Advice.Enter final int depth) {
-      if (depth > 0) {
-        return;
-      }
-      CallDepthThreadLocalMap.reset(Parameters.class);
+    @Override
+    public String instrumentedType() {
+        return "org.apache.tomcat.util.http.Parameters";
     }
-  }
-
-  @SuppressWarnings("Duplicates")
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class ProcessParametersAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static int before(
-        @Advice.FieldValue(value = "paramHashStringArray", readOnly = false)
-            Hashtable<String, String[]> paramValuesField,
-        @Advice.Local("origParamHashStringArray") Hashtable<String, String[]> origParamValues) {
-      int depth = CallDepthThreadLocalMap.incrementCallDepth(Parameters.class);
-      if (depth == 0 && !paramValuesField.isEmpty()) {
-        origParamValues = paramValuesField;
-        paramValuesField = new Hashtable<>();
-      }
-      return depth;
-      // if there is no request context, skips the body, returns 0 and will skip after()
+
+    // paramHashStringArray was only final for a few days. it doesn't seem to have made into a release
+    private static final Reference PARAM_HASH_STRING_ARRAY_REFERENCE = new Reference.Builder(
+                    "org.apache.tomcat.util.http.Parameters")
+            .withField(new String[0], Reference.EXPECTS_NON_FINAL, "paramHashStringArray", "Ljava/util/Hashtable;")
+            .build();
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {PARAM_HASH_STRING_ARRAY_REFERENCE};
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Local("origParamHashStringArray") Hashtable<String, String[]> origParamValues,
-        @Advice.FieldValue(value = "paramHashStringArray", readOnly = false)
-            Hashtable<String, String[]> paramValuesField,
-        @Advice.Enter final int depth,
-        @Advice.Thrown(readOnly = false) Throwable t,
-        @ActiveRequestContext RequestContext reqCtx) {
-      if (depth > 0) {
-        return;
-      }
-      CallDepthThreadLocalMap.reset(Parameters.class);
-
-      try {
-        if (paramValuesField.isEmpty()) {
-          return;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                // also matches the variant taking an extra encoding parameter
+                named("processParameters")
+                        .and(takesArgument(0, byte[].class))
+                        .and(takesArgument(1, int.class))
+                        .and(takesArgument(2, int.class)),
+                getClass().getName() + "$ProcessParametersAdvice");
+
+        transformer.applyAdvice(
+                named("handleQueryParameters").and(takesArguments(0)),
+                getClass().getName() + "$HandleQueryParametersAdvice");
+    }
+
+    // skip advice in processParameters if we're inside handleQueryParameters()
+    public static class HandleQueryParametersAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static int before() {
+            return CallDepthThreadLocalMap.incrementCallDepth(Parameters.class);
         }
 
-        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-        BiFunction<RequestContext, Object, Flow<Void>> callback =
-            cbp.getCallback(EVENTS.requestBodyProcessed());
-        if (callback == null) {
-          return;
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(@Advice.Enter final int depth) {
+            if (depth > 0) {
+                return;
+            }
+            CallDepthThreadLocalMap.reset(Parameters.class);
         }
-        Flow<Void> flow = callback.apply(reqCtx, paramValuesField);
-        Flow.Action action = flow.getAction();
-        if (action instanceof Flow.Action.RequestBlockingAction) {
-          Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-          BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-          if (blockResponseFunction != null) {
-            blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-            if (t == null) {
-              t = new BlockingException("Blocked request (for processParameters)");
+    }
+
+    @SuppressWarnings("Duplicates")
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class ProcessParametersAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static int before(
+                @Advice.FieldValue(value = "paramHashStringArray", readOnly = false)
+                        Hashtable<String, String[]> paramValuesField,
+                @Advice.Local("origParamHashStringArray") Hashtable<String, String[]> origParamValues) {
+            int depth = CallDepthThreadLocalMap.incrementCallDepth(Parameters.class);
+            if (depth == 0 && !paramValuesField.isEmpty()) {
+                origParamValues = paramValuesField;
+                paramValuesField = new Hashtable<>();
             }
-          }
+            return depth;
+            // if there is no request context, skips the body, returns 0 and will skip after()
         }
-      } finally {
-        if (origParamValues != null) {
-          origParamValues.putAll(paramValuesField);
-          paramValuesField = origParamValues;
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Local("origParamHashStringArray") Hashtable<String, String[]> origParamValues,
+                @Advice.FieldValue(value = "paramHashStringArray", readOnly = false)
+                        Hashtable<String, String[]> paramValuesField,
+                @Advice.Enter final int depth,
+                @Advice.Thrown(readOnly = false) Throwable t,
+                @ActiveRequestContext RequestContext reqCtx) {
+            if (depth > 0) {
+                return;
+            }
+            CallDepthThreadLocalMap.reset(Parameters.class);
+
+            try {
+                if (paramValuesField.isEmpty()) {
+                    return;
+                }
+
+                CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+                BiFunction<RequestContext, Object, Flow<Void>> callback =
+                        cbp.getCallback(EVENTS.requestBodyProcessed());
+                if (callback == null) {
+                    return;
+                }
+                Flow<Void> flow = callback.apply(reqCtx, paramValuesField);
+                Flow.Action action = flow.getAction();
+                if (action instanceof Flow.Action.RequestBlockingAction) {
+                    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                    BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                    if (blockResponseFunction != null) {
+                        blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                        if (t == null) {
+                            t = new BlockingException("Blocked request (for processParameters)");
+                        }
+                    }
+                }
+            } finally {
+                if (origParamValues != null) {
+                    origParamValues.putAll(paramValuesField);
+                    paramValuesField = origParamValues;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/src/main/java/datadog/trace/instrumentation/tomcat6/ParsedBodyParametersInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/src/main/java/datadog/trace/instrumentation/tomcat6/ParsedBodyParametersInstrumentation.java
index 6a6aebeec7b..4de07ec295d 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/src/main/java/datadog/trace/instrumentation/tomcat6/ParsedBodyParametersInstrumentation.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/src/main/java/datadog/trace/instrumentation/tomcat6/ParsedBodyParametersInstrumentation.java
@@ -28,123 +28,122 @@
 
 @AutoService(InstrumenterModule.class)
 public class ParsedBodyParametersInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ParsedBodyParametersInstrumentation() {
-    super("tomcat");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.tomcat.util.http.Parameters";
-  }
-
-  // paramHashValues was also of type Hashtable, but only for 4 days between
-  // commits c1c2e29d55ea41d76ab4bf688dbaafb9b100eadf and 211c381310db7ded0c7e1a1ef11dd4f62e7c71bb
-  private static final Reference PARAM_HASH_VALUES_MAP_REFERENCE =
-      new Reference.Builder("org.apache.tomcat.util.http.Parameters")
-          .withField(new String[0], 0, "paramHashValues", "Ljava/util/Map;")
-          .or()
-          .withField(new String[0], 0, "paramHashValues", "Ljava/util/HashMap;")
-          .build();
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {PARAM_HASH_VALUES_MAP_REFERENCE};
-  }
+    public ParsedBodyParametersInstrumentation() {
+        super("tomcat");
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        // also matches the variant taking an extra encoding parameter
-        named("processParameters")
-            .and(takesArgument(0, byte[].class))
-            .and(takesArgument(1, int.class))
-            .and(takesArgument(2, int.class)),
-        getClass().getName() + "$ProcessParametersAdvice");
+    @Override
+    public String instrumentedType() {
+        return "org.apache.tomcat.util.http.Parameters";
+    }
 
-    transformer.applyAdvice(
-        named("handleQueryParameters").and(takesArguments(0)),
-        getClass().getName() + "$HandleQueryParametersAdvice");
-  }
+    // paramHashValues was also of type Hashtable, but only for 4 days between
+    // commits c1c2e29d55ea41d76ab4bf688dbaafb9b100eadf and 211c381310db7ded0c7e1a1ef11dd4f62e7c71bb
+    private static final Reference PARAM_HASH_VALUES_MAP_REFERENCE = new Reference.Builder(
+                    "org.apache.tomcat.util.http.Parameters")
+            .withField(new String[0], 0, "paramHashValues", "Ljava/util/Map;")
+            .or()
+            .withField(new String[0], 0, "paramHashValues", "Ljava/util/HashMap;")
+            .build();
 
-  // skip advice in processParameters if we're inside handleQueryParameters()
-  public static class HandleQueryParametersAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static int before() {
-      return CallDepthThreadLocalMap.incrementCallDepth(Parameters.class);
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {PARAM_HASH_VALUES_MAP_REFERENCE};
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(@Advice.Enter final int depth) {
-      if (depth > 0) {
-        return;
-      }
-      CallDepthThreadLocalMap.reset(Parameters.class);
-    }
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                // also matches the variant taking an extra encoding parameter
+                named("processParameters")
+                        .and(takesArgument(0, byte[].class))
+                        .and(takesArgument(1, int.class))
+                        .and(takesArgument(2, int.class)),
+                getClass().getName() + "$ProcessParametersAdvice");
 
-  @SuppressWarnings("Duplicates")
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class ProcessParametersAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static int before(
-        @Advice.FieldValue(value = "paramHashValues")
-            final Map<String, ArrayList<String>> paramValuesField,
-        @Advice.Local("origParamHashValues") Map<String, ArrayList<String>> origParamValues) {
-      int depth = CallDepthThreadLocalMap.incrementCallDepth(Parameters.class);
-      if (depth == 0 && !paramValuesField.isEmpty()) {
-        // field is final
-        origParamValues = new HashMap<>(paramValuesField);
-        paramValuesField.clear();
-      }
-      return depth;
-      // if there is no request context, skips the body, returns 0 and will skip after()
+        transformer.applyAdvice(
+                named("handleQueryParameters").and(takesArguments(0)),
+                getClass().getName() + "$HandleQueryParametersAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Local("origParamHashValues") Map<String, ArrayList<String>> origParamValues,
-        @Advice.FieldValue("paramHashValues") final Map<String, ArrayList<String>> paramValuesField,
-        @Advice.Enter final int depth,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (depth > 0) {
-        return;
-      }
-      CallDepthThreadLocalMap.reset(Parameters.class);
-
-      try {
-        if (paramValuesField.isEmpty()) {
-          return;
+    // skip advice in processParameters if we're inside handleQueryParameters()
+    public static class HandleQueryParametersAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static int before() {
+            return CallDepthThreadLocalMap.incrementCallDepth(Parameters.class);
         }
 
-        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-        BiFunction<RequestContext, Object, Flow<Void>> callback =
-            cbp.getCallback(EVENTS.requestBodyProcessed());
-        if (reqCtx == null || callback == null) {
-          return;
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(@Advice.Enter final int depth) {
+            if (depth > 0) {
+                return;
+            }
+            CallDepthThreadLocalMap.reset(Parameters.class);
         }
-        Flow<Void> flow = callback.apply(reqCtx, paramValuesField);
-        Flow.Action action = flow.getAction();
-        if (action instanceof Flow.Action.RequestBlockingAction) {
-          Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-          BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-          if (blockResponseFunction != null) {
-            boolean committedBlockingResponse =
-                blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-            if (committedBlockingResponse) {
-              if (t == null) {
-                t = new BlockingException("Blocked request (for processParameters)");
-              }
+    }
+
+    @SuppressWarnings("Duplicates")
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class ProcessParametersAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static int before(
+                @Advice.FieldValue(value = "paramHashValues") final Map<String, ArrayList<String>> paramValuesField,
+                @Advice.Local("origParamHashValues") Map<String, ArrayList<String>> origParamValues) {
+            int depth = CallDepthThreadLocalMap.incrementCallDepth(Parameters.class);
+            if (depth == 0 && !paramValuesField.isEmpty()) {
+                // field is final
+                origParamValues = new HashMap<>(paramValuesField);
+                paramValuesField.clear();
             }
-          }
+            return depth;
+            // if there is no request context, skips the body, returns 0 and will skip after()
         }
-      } finally {
-        if (origParamValues != null) {
-          paramValuesField.putAll(origParamValues);
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Local("origParamHashValues") Map<String, ArrayList<String>> origParamValues,
+                @Advice.FieldValue("paramHashValues") final Map<String, ArrayList<String>> paramValuesField,
+                @Advice.Enter final int depth,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (depth > 0) {
+                return;
+            }
+            CallDepthThreadLocalMap.reset(Parameters.class);
+
+            try {
+                if (paramValuesField.isEmpty()) {
+                    return;
+                }
+
+                CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+                BiFunction<RequestContext, Object, Flow<Void>> callback =
+                        cbp.getCallback(EVENTS.requestBodyProcessed());
+                if (reqCtx == null || callback == null) {
+                    return;
+                }
+                Flow<Void> flow = callback.apply(reqCtx, paramValuesField);
+                Flow.Action action = flow.getAction();
+                if (action instanceof Flow.Action.RequestBlockingAction) {
+                    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                    BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                    if (blockResponseFunction != null) {
+                        boolean committedBlockingResponse =
+                                blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                        if (committedBlockingResponse) {
+                            if (t == null) {
+                                t = new BlockingException("Blocked request (for processParameters)");
+                            }
+                        }
+                    }
+                }
+            } finally {
+                if (origParamValues != null) {
+                    paramValuesField.putAll(origParamValues);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/CommitActionInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/CommitActionInstrumentation.java
index 330c40a68d2..06754d95596 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/CommitActionInstrumentation.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/CommitActionInstrumentation.java
@@ -28,106 +28,102 @@
  */
 @AutoService(InstrumenterModule.class)
 public class CommitActionInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public CommitActionInstrumentation() {
-    super("tomcat");
-  }
+    public CommitActionInstrumentation() {
+        super("tomcat");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "from703";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "from703";
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    /* we're assuming all these have a coyote.Response response field and implement ActionHook */
-    return new String[] {
-      "org.apache.coyote.ajp.AbstractAjpProcessor",
-      "org.apache.coyote.http11.AbstractHttp11Processor",
-      "org.apache.coyote.AbstractProcessor",
-      "org.apache.coyote.ajp.AjpAprProcessor",
-      "org.apache.coyote.ajp.AjpProcessor",
-      "org.apache.coyote.http11.Http11AprProcessor",
-      "org.apache.coyote.http11.Http11NioProcessor",
-      "org.apache.coyote.http11.Http11Processor",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        /* we're assuming all these have a coyote.Response response field and implement ActionHook */
+        return new String[] {
+            "org.apache.coyote.ajp.AbstractAjpProcessor",
+            "org.apache.coyote.http11.AbstractHttp11Processor",
+            "org.apache.coyote.AbstractProcessor",
+            "org.apache.coyote.ajp.AjpAprProcessor",
+            "org.apache.coyote.ajp.AjpProcessor",
+            "org.apache.coyote.http11.Http11AprProcessor",
+            "org.apache.coyote.http11.Http11NioProcessor",
+            "org.apache.coyote.http11.Http11Processor",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("action"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("org.apache.coyote.ActionCode")))
-            .and(takesArgument(1, Object.class)),
-        CommitActionInstrumentation.class.getName() + "$ProcessCommitActionAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("action"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("org.apache.coyote.ActionCode")))
+                        .and(takesArgument(1, Object.class)),
+                CommitActionInstrumentation.class.getName() + "$ProcessCommitActionAdvice");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    String pkg = "datadog.trace.instrumentation.tomcat";
-    return new String[] {
-      pkg + ".ExtractAdapter",
-      pkg + ".ExtractAdapter$Request",
-      pkg + ".ExtractAdapter$Response",
-      pkg + ".ExtractAdapter$CoyoteResponse",
-      pkg + ".TomcatDecorator",
-      pkg + ".TomcatDecorator$TomcatBlockResponseFunction",
-      pkg + ".TomcatBlockingHelper",
-      pkg + ".RequestURIDataAdapter",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        String pkg = "datadog.trace.instrumentation.tomcat";
+        return new String[] {
+            pkg + ".ExtractAdapter",
+            pkg + ".ExtractAdapter$Request",
+            pkg + ".ExtractAdapter$Response",
+            pkg + ".ExtractAdapter$CoyoteResponse",
+            pkg + ".TomcatDecorator",
+            pkg + ".TomcatDecorator$TomcatBlockResponseFunction",
+            pkg + ".TomcatBlockingHelper",
+            pkg + ".RequestURIDataAdapter",
+        };
+    }
 
-  static class ProcessCommitActionAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-    static boolean /* skip body */ before(
-        @Advice.Argument(0) ActionCode actionCode,
-        @Advice.This ActionHook thiz,
-        @Advice.FieldValue("response") Response coyoteResponse) {
-      if (actionCode != ActionCode.COMMIT) {
-        return false;
-      }
-      Request request = coyoteResponse.getRequest();
-      if (request.getAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE) != null) {
-        return false;
-      }
-      request.setAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE, Boolean.TRUE);
+    static class ProcessCommitActionAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+        static boolean /* skip body */ before(
+                @Advice.Argument(0) ActionCode actionCode,
+                @Advice.This ActionHook thiz,
+                @Advice.FieldValue("response") Response coyoteResponse) {
+            if (actionCode != ActionCode.COMMIT) {
+                return false;
+            }
+            Request request = coyoteResponse.getRequest();
+            if (request.getAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE) != null) {
+                return false;
+            }
+            request.setAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE, Boolean.TRUE);
 
-      // on async requests AgentTracer.activeSpan() may return null
-      Object contextObj = request.getAttribute(HttpServerDecorator.DD_CONTEXT_ATTRIBUTE);
-      if (!(contextObj instanceof Context)) {
-        return false;
-      }
-      Context context = (Context) contextObj;
-      AgentSpan agentSpan = spanFromContext(context);
-      if (agentSpan == null) {
-        return false;
-      }
-      RequestContext requestContext = agentSpan.getRequestContext();
-      if (requestContext == null) {
-        return false;
-      }
+            // on async requests AgentTracer.activeSpan() may return null
+            Object contextObj = request.getAttribute(HttpServerDecorator.DD_CONTEXT_ATTRIBUTE);
+            if (!(contextObj instanceof Context)) {
+                return false;
+            }
+            Context context = (Context) contextObj;
+            AgentSpan agentSpan = spanFromContext(context);
+            if (agentSpan == null) {
+                return false;
+            }
+            RequestContext requestContext = agentSpan.getRequestContext();
+            if (requestContext == null) {
+                return false;
+            }
 
-      Flow<Void> flow =
-          TomcatDecorator.DECORATE.callIGCallbackResponseAndHeaders(
-              agentSpan,
-              coyoteResponse,
-              coyoteResponse.getStatus(),
-              ExtractAdapter.CoyoteResponse.GETTER);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction brf = requestContext.getBlockResponseFunction();
-        if (brf != null) {
-          brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
-          thiz.action(ActionCode.CLOSE, null);
-          return true;
-        }
-      }
+            Flow<Void> flow = TomcatDecorator.DECORATE.callIGCallbackResponseAndHeaders(
+                    agentSpan, coyoteResponse, coyoteResponse.getStatus(), ExtractAdapter.CoyoteResponse.GETTER);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction brf = requestContext.getBlockResponseFunction();
+                if (brf != null) {
+                    brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
+                    thiz.action(ActionCode.CLOSE, null);
+                    return true;
+                }
+            }
 
-      return false;
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueAdvice.java b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueAdvice.java
index 32ca712623b..3793ef07fcc 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueAdvice.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueAdvice.java
@@ -15,61 +15,60 @@
 
 public class ErrorReportValueAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void onEnter(
-      @Advice.Argument(value = 1) Response response,
-      @Advice.Argument(value = 2) Throwable throwable,
-      @Advice.Origin("#t") String className,
-      @Advice.Origin("#m") String methodName) {
-    int statusCode = response.getStatus();
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void onEnter(
+            @Advice.Argument(value = 1) Response response,
+            @Advice.Argument(value = 2) Throwable throwable,
+            @Advice.Origin("#t") String className,
+            @Advice.Origin("#m") String methodName) {
+        int statusCode = response.getStatus();
 
-    // Do nothing on a 1xx, 2xx, 3xx and 404 status
-    // Do nothing if the response hasn't been explicitly marked as in error
-    //    and that error has not been reported.
-    if (statusCode < 400 || statusCode == 404 || !response.isError()) {
-      return;
-    }
-    if (throwable != null) {
-      // Report IAST
-      final StacktraceLeakModule module = InstrumentationBridge.STACKTRACE_LEAK_MODULE;
-      if (module != null) {
-        try {
-          module.onStacktraceLeak(throwable, "Tomcat 7+", className, methodName);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("onResponseException threw", e);
+        // Do nothing on a 1xx, 2xx, 3xx and 404 status
+        // Do nothing if the response hasn't been explicitly marked as in error
+        //    and that error has not been reported.
+        if (statusCode < 400 || statusCode == 404 || !response.isError()) {
+            return;
+        }
+        if (throwable != null) {
+            // Report IAST
+            final StacktraceLeakModule module = InstrumentationBridge.STACKTRACE_LEAK_MODULE;
+            if (module != null) {
+                try {
+                    module.onStacktraceLeak(throwable, "Tomcat 7+", className, methodName);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("onResponseException threw", e);
+                }
+            }
         }
-      }
-    }
 
-    // If IAST is opt-out or we don't need to suppress stacktrace leak
-    final Config config = Config.get();
-    if (config.getIastActivation() != ProductActivation.FULLY_ENABLED
-        || !config.isIastStacktraceLeakSuppress()) {
-      return;
-    }
+        // If IAST is opt-out or we don't need to suppress stacktrace leak
+        final Config config = Config.get();
+        if (config.getIastActivation() != ProductActivation.FULLY_ENABLED || !config.isIastStacktraceLeakSuppress()) {
+            return;
+        }
 
-    byte[] template = BlockingActionHelper.getTemplate(HTML, null);
-    if (template == null) {
-      return;
-    }
+        byte[] template = BlockingActionHelper.getTemplate(HTML, null);
+        if (template == null) {
+            return;
+        }
 
-    try {
-      try {
-        String contentType = BlockingActionHelper.getContentType(HTML);
-        response.setContentType(contentType);
-      } catch (Throwable t) {
-        // Ignore
-      }
-      Writer writer = response.getReporter();
-      if (writer != null) {
-        // If writer is null, it's an indication that the response has
-        // been hard committed already, which should never happen
-        String html = new String(template, StandardCharsets.UTF_8);
-        writer.write(html);
-        response.finishResponse();
-      }
-    } catch (IOException | IllegalStateException e) {
-      // Ignore
+        try {
+            try {
+                String contentType = BlockingActionHelper.getContentType(HTML);
+                response.setContentType(contentType);
+            } catch (Throwable t) {
+                // Ignore
+            }
+            Writer writer = response.getReporter();
+            if (writer != null) {
+                // If writer is null, it's an indication that the response has
+                // been hard committed already, which should never happen
+                String html = new String(template, StandardCharsets.UTF_8);
+                writer.write(html);
+                response.finishResponse();
+            }
+        } catch (IOException | IllegalStateException e) {
+            // Ignore
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueInstrumentation.java
index 664121a9bea..af397b5ba6d 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueInstrumentation.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueInstrumentation.java
@@ -11,36 +11,36 @@
 
 @AutoService(InstrumenterModule.class)
 public class ErrorReportValueInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public ErrorReportValueInstrumentation() {
-    super("tomcat");
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "from7";
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "org.apache.catalina.valves.ErrorReportValve";
-  }
-
-  @Override
-  protected boolean isOptOutEnabled() {
-    return true;
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("report"))
-            .and(takesArgument(0, named("org.apache.catalina.connector.Request")))
-            .and(takesArgument(1, named("org.apache.catalina.connector.Response")))
-            .and(takesArgument(2, Throwable.class))
-            .and(isProtected()),
-        packageName + ".ErrorReportValueAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public ErrorReportValueInstrumentation() {
+        super("tomcat");
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "from7";
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "org.apache.catalina.valves.ErrorReportValve";
+    }
+
+    @Override
+    protected boolean isOptOutEnabled() {
+        return true;
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("report"))
+                        .and(takesArgument(0, named("org.apache.catalina.connector.Request")))
+                        .and(takesArgument(1, named("org.apache.catalina.connector.Response")))
+                        .and(takesArgument(2, Throwable.class))
+                        .and(isProtected()),
+                packageName + ".ErrorReportValueAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/GlassFishBlockingHelper.java b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/GlassFishBlockingHelper.java
index 78a06148a71..c5fb6e8f0e1 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/GlassFishBlockingHelper.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/GlassFishBlockingHelper.java
@@ -19,166 +19,160 @@
 
 public final class GlassFishBlockingHelper {
 
-  public static final int MAX_FILE_CONTENT_COUNT = Config.get().getAppSecMaxFileContentCount();
-  public static final int MAX_FILE_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
+    public static final int MAX_FILE_CONTENT_COUNT = Config.get().getAppSecMaxFileContentCount();
+    public static final int MAX_FILE_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
 
-  /**
-   * Attempts to commit a blocking response via the registered {@link BlockResponseFunction} or via
-   * the Servlet API fallback, then marks the trace segment as effectively blocked.
-   *
-   * <p>Returns {@code true} if the response was committed (regardless of whether {@link
-   * datadog.trace.api.internal.TraceSegment#effectivelyBlocked()} succeeded). Returns {@code false}
-   * if no response could be committed.
-   */
-  public static boolean tryBlock(
-      RequestContext reqCtx,
-      HttpServletRequest fallbackReq,
-      HttpServletResponse fallbackResp,
-      Flow.Action.RequestBlockingAction rba) {
-    try {
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-      } else if (!commitBlocking(fallbackReq, fallbackResp, rba)) {
-        return false;
-      }
-    } catch (Exception ignored) {
-      // commit failed — response not sent, cannot block this request
-      return false;
-    }
-    // Response was committed — mark as blocked on a best-effort basis.
-    // effectivelyBlocked() can throw if the span is already finished; that must not suppress the
-    // true return value since the response has already been sent to the client.
-    try {
-      reqCtx.getTraceSegment().effectivelyBlocked();
-    } catch (Exception ignored) {
-      // span already finished — response was sent, blocking succeeded
-    }
-    return true;
-  }
-
-  /**
-   * Collects filenames and file contents from the given multipart parts, fires the AppSec IG
-   * callbacks, and commits a blocking response if the WAF requests one.
-   *
-   * <p>Returns {@code true} if a blocking response was committed (the caller should replace the
-   * parts collection with an empty list to prevent further processing).
-   */
-  public static boolean processPartsAndBlock(
-      Collection<?> parts,
-      RequestContext reqCtx,
-      org.apache.catalina.Request catRequest,
-      BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb,
-      BiFunction<RequestContext, List<String>, Flow<Void>> contentCb) {
-    // org.apache.catalina.Request.getRequest() returns the underlying ServletRequest.
-    // TomcatServerInstrumentation is muzzled out in Payara (CoyoteAdapter.postParseRequest arg
-    // types differ from standard Tomcat), so BlockResponseFunction is never registered there —
-    // this Servlet API fallback is required to commit the blocking response in Payara.
-    javax.servlet.ServletRequest sr = catRequest != null ? catRequest.getRequest() : null;
-    HttpServletRequest fallbackReq =
-        sr instanceof HttpServletRequest ? (HttpServletRequest) sr : null;
-    HttpServletResponse fallbackResp = null;
-    if (catRequest != null) {
-      org.apache.catalina.Response cr = catRequest.getResponse();
-      if (cr != null) {
-        javax.servlet.ServletResponse svr = cr.getResponse();
-        if (svr instanceof HttpServletResponse) {
-          fallbackResp = (HttpServletResponse) svr;
-        }
-      }
-    }
-    List<String> filenames = null;
-    List<String> contents = null;
-    for (Object partObj : parts) {
-      try {
-        if (!(partObj instanceof Part)) {
-          continue;
+    /**
+     * Attempts to commit a blocking response via the registered {@link BlockResponseFunction} or via
+     * the Servlet API fallback, then marks the trace segment as effectively blocked.
+     *
+     * <p>Returns {@code true} if the response was committed (regardless of whether {@link
+     * datadog.trace.api.internal.TraceSegment#effectivelyBlocked()} succeeded). Returns {@code false}
+     * if no response could be committed.
+     */
+    public static boolean tryBlock(
+            RequestContext reqCtx,
+            HttpServletRequest fallbackReq,
+            HttpServletResponse fallbackResp,
+            Flow.Action.RequestBlockingAction rba) {
+        try {
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+            } else if (!commitBlocking(fallbackReq, fallbackResp, rba)) {
+                return false;
+            }
+        } catch (Exception ignored) {
+            // commit failed — response not sent, cannot block this request
+            return false;
         }
-        Part part = (Part) partObj;
-        String filename = part.getSubmittedFileName();
-        if (filename == null) {
-          continue;
+        // Response was committed — mark as blocked on a best-effort basis.
+        // effectivelyBlocked() can throw if the span is already finished; that must not suppress the
+        // true return value since the response has already been sent to the client.
+        try {
+            reqCtx.getTraceSegment().effectivelyBlocked();
+        } catch (Exception ignored) {
+            // span already finished — response was sent, blocking succeeded
         }
-        if (filenamesCb != null && !filename.isEmpty()) {
-          if (filenames == null) {
-            filenames = new ArrayList<>();
-          }
-          filenames.add(filename);
+        return true;
+    }
+
+    /**
+     * Collects filenames and file contents from the given multipart parts, fires the AppSec IG
+     * callbacks, and commits a blocking response if the WAF requests one.
+     *
+     * <p>Returns {@code true} if a blocking response was committed (the caller should replace the
+     * parts collection with an empty list to prevent further processing).
+     */
+    public static boolean processPartsAndBlock(
+            Collection<?> parts,
+            RequestContext reqCtx,
+            org.apache.catalina.Request catRequest,
+            BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb,
+            BiFunction<RequestContext, List<String>, Flow<Void>> contentCb) {
+        // org.apache.catalina.Request.getRequest() returns the underlying ServletRequest.
+        // TomcatServerInstrumentation is muzzled out in Payara (CoyoteAdapter.postParseRequest arg
+        // types differ from standard Tomcat), so BlockResponseFunction is never registered there —
+        // this Servlet API fallback is required to commit the blocking response in Payara.
+        javax.servlet.ServletRequest sr = catRequest != null ? catRequest.getRequest() : null;
+        HttpServletRequest fallbackReq = sr instanceof HttpServletRequest ? (HttpServletRequest) sr : null;
+        HttpServletResponse fallbackResp = null;
+        if (catRequest != null) {
+            org.apache.catalina.Response cr = catRequest.getResponse();
+            if (cr != null) {
+                javax.servlet.ServletResponse svr = cr.getResponse();
+                if (svr instanceof HttpServletResponse) {
+                    fallbackResp = (HttpServletResponse) svr;
+                }
+            }
         }
-        if (contentCb != null) {
-          if (contents == null) {
-            contents = new ArrayList<>();
-          }
-          if (contents.size() < MAX_FILE_CONTENT_COUNT) {
-            try (InputStream is = part.getInputStream()) {
-              contents.add(
-                  MultipartContentDecoder.readInputStream(
-                      is, MAX_FILE_CONTENT_BYTES, part.getContentType()));
+        List<String> filenames = null;
+        List<String> contents = null;
+        for (Object partObj : parts) {
+            try {
+                if (!(partObj instanceof Part)) {
+                    continue;
+                }
+                Part part = (Part) partObj;
+                String filename = part.getSubmittedFileName();
+                if (filename == null) {
+                    continue;
+                }
+                if (filenamesCb != null && !filename.isEmpty()) {
+                    if (filenames == null) {
+                        filenames = new ArrayList<>();
+                    }
+                    filenames.add(filename);
+                }
+                if (contentCb != null) {
+                    if (contents == null) {
+                        contents = new ArrayList<>();
+                    }
+                    if (contents.size() < MAX_FILE_CONTENT_COUNT) {
+                        try (InputStream is = part.getInputStream()) {
+                            contents.add(MultipartContentDecoder.readInputStream(
+                                    is, MAX_FILE_CONTENT_BYTES, part.getContentType()));
+                        } catch (Exception ignored) {
+                            // stream read failed — report empty content rather than skipping the part entirely
+                            contents.add("");
+                        }
+                    }
+                }
             } catch (Exception ignored) {
-              // stream read failed — report empty content rather than skipping the part entirely
-              contents.add("");
+                // malformed or inaccessible part — skip and continue with remaining parts
+            }
+        }
+
+        if (filenames != null && !filenames.isEmpty()) {
+            Flow<Void> flow = filenamesCb.apply(reqCtx, filenames);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                if (tryBlock(reqCtx, fallbackReq, fallbackResp, (Flow.Action.RequestBlockingAction) action)) {
+                    return true;
+                }
             }
-          }
         }
-      } catch (Exception ignored) {
-        // malformed or inaccessible part — skip and continue with remaining parts
-      }
-    }
 
-    if (filenames != null && !filenames.isEmpty()) {
-      Flow<Void> flow = filenamesCb.apply(reqCtx, filenames);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        if (tryBlock(
-            reqCtx, fallbackReq, fallbackResp, (Flow.Action.RequestBlockingAction) action)) {
-          return true;
+        if (contents != null && !contents.isEmpty()) {
+            Flow<Void> contentFlow = contentCb.apply(reqCtx, contents);
+            Flow.Action contentAction = contentFlow.getAction();
+            if (contentAction instanceof Flow.Action.RequestBlockingAction) {
+                return tryBlock(reqCtx, fallbackReq, fallbackResp, (Flow.Action.RequestBlockingAction) contentAction);
+            }
         }
-      }
-    }
 
-    if (contents != null && !contents.isEmpty()) {
-      Flow<Void> contentFlow = contentCb.apply(reqCtx, contents);
-      Flow.Action contentAction = contentFlow.getAction();
-      if (contentAction instanceof Flow.Action.RequestBlockingAction) {
-        return tryBlock(
-            reqCtx, fallbackReq, fallbackResp, (Flow.Action.RequestBlockingAction) contentAction);
-      }
+        return false;
     }
 
-    return false;
-  }
-
-  public static boolean commitBlocking(
-      HttpServletRequest request,
-      HttpServletResponse response,
-      Flow.Action.RequestBlockingAction rba) {
-    if (response == null) {
-      return false;
-    }
-    try {
-      if (response.isCommitted()) {
-        return false;
-      }
-      response.reset();
-      response.setStatus(BlockingActionHelper.getHttpCode(rba.getStatusCode()));
-      for (Map.Entry<String, String> e : rba.getExtraHeaders().entrySet()) {
-        response.setHeader(e.getKey(), e.getValue());
-      }
-      if (rba.getBlockingContentType() != BlockingContentType.NONE) {
-        String accept = request != null ? request.getHeader("Accept") : null;
-        BlockingActionHelper.TemplateType type =
-            BlockingActionHelper.determineTemplateType(rba.getBlockingContentType(), accept);
-        byte[] body = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
-        if (body != null) {
-          response.setHeader("Content-Type", BlockingActionHelper.getContentType(type));
-          response.setHeader("Content-Length", Integer.toString(body.length));
-          response.getOutputStream().write(body);
+    public static boolean commitBlocking(
+            HttpServletRequest request, HttpServletResponse response, Flow.Action.RequestBlockingAction rba) {
+        if (response == null) {
+            return false;
+        }
+        try {
+            if (response.isCommitted()) {
+                return false;
+            }
+            response.reset();
+            response.setStatus(BlockingActionHelper.getHttpCode(rba.getStatusCode()));
+            for (Map.Entry<String, String> e : rba.getExtraHeaders().entrySet()) {
+                response.setHeader(e.getKey(), e.getValue());
+            }
+            if (rba.getBlockingContentType() != BlockingContentType.NONE) {
+                String accept = request != null ? request.getHeader("Accept") : null;
+                BlockingActionHelper.TemplateType type =
+                        BlockingActionHelper.determineTemplateType(rba.getBlockingContentType(), accept);
+                byte[] body = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
+                if (body != null) {
+                    response.setHeader("Content-Type", BlockingActionHelper.getContentType(type));
+                    response.setHeader("Content-Length", Integer.toString(body.length));
+                    response.getOutputStream().write(body);
+                }
+            }
+            response.flushBuffer();
+            return true;
+        } catch (Exception e) {
+            return false;
         }
-      }
-      response.flushBuffer();
-      return true;
-    } catch (Exception e) {
-      return false;
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/GlassFishMultipartInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/GlassFishMultipartInstrumentation.java
index 061dc3f4ea2..dd6d15af8b7 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/GlassFishMultipartInstrumentation.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/GlassFishMultipartInstrumentation.java
@@ -31,62 +31,61 @@
  */
 @AutoService(InstrumenterModule.class)
 public class GlassFishMultipartInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public GlassFishMultipartInstrumentation() {
-    super("tomcat");
-  }
+    public GlassFishMultipartInstrumentation() {
+        super("tomcat");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "glassfish";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "glassfish";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.catalina.fileupload.Multipart";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.catalina.fileupload.Multipart";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getParts").and(takesArguments(0)).and(isPublic()),
-        getClass().getName() + "$GetPartsAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getParts").and(takesArguments(0)).and(isPublic()),
+                getClass().getName() + "$GetPartsAdvice");
+    }
 
-  public static class GetPartsAdvice {
+    public static class GetPartsAdvice {
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Return(readOnly = false) Collection<?> parts,
-        @Advice.Thrown Throwable t,
-        @Advice.FieldValue("request") org.apache.catalina.Request catRequest) {
-      if (t != null || parts == null || parts.isEmpty()) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Return(readOnly = false) Collection<?> parts,
+                @Advice.Thrown Throwable t,
+                @Advice.FieldValue("request") org.apache.catalina.Request catRequest) {
+            if (t != null || parts == null || parts.isEmpty()) {
+                return;
+            }
 
-      AgentSpan agentSpan = AgentTracer.activeSpan();
-      if (agentSpan == null) {
-        return;
-      }
-      RequestContext reqCtx = agentSpan.getRequestContext();
-      if (reqCtx == null || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
-        return;
-      }
+            AgentSpan agentSpan = AgentTracer.activeSpan();
+            if (agentSpan == null) {
+                return;
+            }
+            RequestContext reqCtx = agentSpan.getRequestContext();
+            if (reqCtx == null || reqCtx.getData(RequestContextSlot.APPSEC) == null) {
+                return;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb =
-          cbp.getCallback(EVENTS.requestFilesFilenames());
-      BiFunction<RequestContext, List<String>, Flow<Void>> contentCb =
-          cbp.getCallback(EVENTS.requestFilesContent());
-      if (filenamesCb == null && contentCb == null) {
-        return;
-      }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb =
+                    cbp.getCallback(EVENTS.requestFilesFilenames());
+            BiFunction<RequestContext, List<String>, Flow<Void>> contentCb =
+                    cbp.getCallback(EVENTS.requestFilesContent());
+            if (filenamesCb == null && contentCb == null) {
+                return;
+            }
 
-      if (GlassFishBlockingHelper.processPartsAndBlock(
-          parts, reqCtx, catRequest, filenamesCb, contentCb)) {
-        parts = Collections.emptyList();
-      }
+            if (GlassFishBlockingHelper.processPartsAndBlock(parts, reqCtx, catRequest, filenamesCb, contentCb)) {
+                parts = Collections.emptyList();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ParameterCollector.java b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ParameterCollector.java
index faf095fb4f5..419c384a8c3 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ParameterCollector.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ParameterCollector.java
@@ -11,221 +11,219 @@
 import java.util.Map;
 
 public interface ParameterCollector {
-  boolean isEmpty();
+    boolean isEmpty();
 
-  void put(String key, String value);
+    void put(String key, String value);
 
-  void put(String key, String[] values);
+    void put(String key, String[] values);
 
-  Map<String, List<String>> getMap();
+    Map<String, List<String>> getMap();
 
-  void addPart(Object part);
+    void addPart(Object part);
 
-  List<String> getFilenames();
+    List<String> getFilenames();
 
-  List<String> getContents();
+    List<String> getContents();
 
-  class ParameterCollectorNoop implements ParameterCollector {
-    public static final ParameterCollector INSTANCE = new ParameterCollectorNoop();
+    class ParameterCollectorNoop implements ParameterCollector {
+        public static final ParameterCollector INSTANCE = new ParameterCollectorNoop();
 
-    @Override
-    public boolean isEmpty() {
-      return true;
-    }
+        @Override
+        public boolean isEmpty() {
+            return true;
+        }
 
-    @Override
-    public void put(String key, String value) {}
+        @Override
+        public void put(String key, String value) {}
 
-    @Override
-    public void put(String key, String[] values) {}
+        @Override
+        public void put(String key, String[] values) {}
 
-    @Override
-    public Map<String, List<String>> getMap() {
-      return Collections.emptyMap();
-    }
+        @Override
+        public Map<String, List<String>> getMap() {
+            return Collections.emptyMap();
+        }
 
-    @Override
-    public void addPart(Object part) {}
+        @Override
+        public void addPart(Object part) {}
 
-    @Override
-    public List<String> getFilenames() {
-      return Collections.emptyList();
-    }
+        @Override
+        public List<String> getFilenames() {
+            return Collections.emptyList();
+        }
 
-    @Override
-    public List<String> getContents() {
-      return Collections.emptyList();
+        @Override
+        public List<String> getContents() {
+            return Collections.emptyList();
+        }
     }
-  }
 
-  class ParameterCollectorImpl implements ParameterCollector {
-    private static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
-    private static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
+    class ParameterCollectorImpl implements ParameterCollector {
+        private static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
+        private static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
 
-    private final boolean inspectContent;
-    private Map<String, List<String>> map;
-    private List<String> filenames;
-    private List<String> contents;
+        private final boolean inspectContent;
+        private Map<String, List<String>> map;
+        private List<String> filenames;
+        private List<String> contents;
 
-    public ParameterCollectorImpl(boolean inspectContent) {
-      this.inspectContent = inspectContent;
-    }
+        public ParameterCollectorImpl(boolean inspectContent) {
+            this.inspectContent = inspectContent;
+        }
 
-    public boolean isEmpty() {
-      return map == null;
-    }
+        public boolean isEmpty() {
+            return map == null;
+        }
 
-    public void put(String key, String value) {
-      if (map == null) {
-        map = new HashMap<>();
-      }
-      List<String> strings = map.get(key);
-      if (strings == null) {
-        strings = new ArrayList<>();
-        map.put(key, strings);
-      }
-      strings.add(value);
-    }
+        public void put(String key, String value) {
+            if (map == null) {
+                map = new HashMap<>();
+            }
+            List<String> strings = map.get(key);
+            if (strings == null) {
+                strings = new ArrayList<>();
+                map.put(key, strings);
+            }
+            strings.add(value);
+        }
 
-    public void put(String key, String[] values) {
-      if (map == null) {
-        map = new HashMap<>();
-      }
-      List<String> strings = map.get(key);
-      if (strings == null) {
-        strings = new ArrayList<>();
-        map.put(key, strings);
-      }
-      for (String value : values) {
-        strings.add(value);
-      }
-    }
+        public void put(String key, String[] values) {
+            if (map == null) {
+                map = new HashMap<>();
+            }
+            List<String> strings = map.get(key);
+            if (strings == null) {
+                strings = new ArrayList<>();
+                map.put(key, strings);
+            }
+            for (String value : values) {
+                strings.add(value);
+            }
+        }
 
-    @Override
-    public Map<String, List<String>> getMap() {
-      return map;
-    }
+        @Override
+        public Map<String, List<String>> getMap() {
+            return map;
+        }
 
-    @Override
-    public void addPart(Object part) {
-      try {
-        String filename = getFilename(part);
-        // null means no filename parameter at all → form field, skip entirely.
-        // empty string means filename="" was sent → file upload without a name, still inspect.
-        if (filename == null) {
-          return;
-        }
-        if (!filename.isEmpty()) {
-          if (filenames == null) {
-            filenames = new ArrayList<>();
-          }
-          filenames.add(filename);
-        }
-        if (inspectContent) {
-          if (contents == null) {
-            contents = new ArrayList<>();
-          }
-          if (contents.size() < MAX_FILES_TO_INSPECT) {
-            contents.add(readContent(part));
-          }
-        }
-      } catch (Throwable ignored) {
-      }
-    }
+        @Override
+        public void addPart(Object part) {
+            try {
+                String filename = getFilename(part);
+                // null means no filename parameter at all → form field, skip entirely.
+                // empty string means filename="" was sent → file upload without a name, still inspect.
+                if (filename == null) {
+                    return;
+                }
+                if (!filename.isEmpty()) {
+                    if (filenames == null) {
+                        filenames = new ArrayList<>();
+                    }
+                    filenames.add(filename);
+                }
+                if (inspectContent) {
+                    if (contents == null) {
+                        contents = new ArrayList<>();
+                    }
+                    if (contents.size() < MAX_FILES_TO_INSPECT) {
+                        contents.add(readContent(part));
+                    }
+                }
+            } catch (Throwable ignored) {
+            }
+        }
 
-    @Override
-    public List<String> getFilenames() {
-      return filenames != null ? filenames : Collections.<String>emptyList();
-    }
+        @Override
+        public List<String> getFilenames() {
+            return filenames != null ? filenames : Collections.<String>emptyList();
+        }
 
-    @Override
-    public List<String> getContents() {
-      return contents != null ? contents : Collections.<String>emptyList();
-    }
+        @Override
+        public List<String> getContents() {
+            return contents != null ? contents : Collections.<String>emptyList();
+        }
 
-    // Immutable snapshot of resolved methods for a single Part concrete class.
-    // Held in a single volatile reference so readers get a consistent view:
-    // reading methodCache once into a local variable and using that local
-    // guarantees all three Method objects belong to the same class, even if
-    // another thread concurrently replaces methodCache with an entry for a
-    // different class.
-    private static final class CachedMethods {
-      final Class<?> partClass;
-      final Method getInputStream;
-      final Method getContentType;
-      // getSubmittedFileName (Servlet 3.1+) or getFilename (Tomcat 7); null if neither found
-      final Method getFilename;
-
-      CachedMethods(Class<?> c, Method is, Method ct, Method fn) {
-        partClass = c;
-        getInputStream = is;
-        getContentType = ct;
-        getFilename = fn;
-      }
-    }
+        // Immutable snapshot of resolved methods for a single Part concrete class.
+        // Held in a single volatile reference so readers get a consistent view:
+        // reading methodCache once into a local variable and using that local
+        // guarantees all three Method objects belong to the same class, even if
+        // another thread concurrently replaces methodCache with an entry for a
+        // different class.
+        private static final class CachedMethods {
+            final Class<?> partClass;
+            final Method getInputStream;
+            final Method getContentType;
+            // getSubmittedFileName (Servlet 3.1+) or getFilename (Tomcat 7); null if neither found
+            final Method getFilename;
+
+            CachedMethods(Class<?> c, Method is, Method ct, Method fn) {
+                partClass = c;
+                getInputStream = is;
+                getContentType = ct;
+                getFilename = fn;
+            }
+        }
 
-    private static volatile CachedMethods methodCache;
-
-    private static CachedMethods resolveAndCache(Class<?> partClass) {
-      Method getInputStream = null;
-      Method getContentType = null;
-      Method getFilename = null;
-      try {
-        getInputStream = partClass.getMethod("getInputStream");
-      } catch (Exception ignored) {
-      }
-      try {
-        getContentType = partClass.getMethod("getContentType");
-      } catch (Exception ignored) {
-      }
-      try {
-        getFilename = partClass.getMethod("getSubmittedFileName");
-      } catch (Exception ignored) {
-      }
-      if (getFilename == null) {
-        try {
-          getFilename = partClass.getMethod("getFilename");
-        } catch (Exception ignored) {
-        }
-      }
-      CachedMethods cache =
-          new CachedMethods(partClass, getInputStream, getContentType, getFilename);
-      methodCache = cache;
-      return cache;
-    }
+        private static volatile CachedMethods methodCache;
+
+        private static CachedMethods resolveAndCache(Class<?> partClass) {
+            Method getInputStream = null;
+            Method getContentType = null;
+            Method getFilename = null;
+            try {
+                getInputStream = partClass.getMethod("getInputStream");
+            } catch (Exception ignored) {
+            }
+            try {
+                getContentType = partClass.getMethod("getContentType");
+            } catch (Exception ignored) {
+            }
+            try {
+                getFilename = partClass.getMethod("getSubmittedFileName");
+            } catch (Exception ignored) {
+            }
+            if (getFilename == null) {
+                try {
+                    getFilename = partClass.getMethod("getFilename");
+                } catch (Exception ignored) {
+                }
+            }
+            CachedMethods cache = new CachedMethods(partClass, getInputStream, getContentType, getFilename);
+            methodCache = cache;
+            return cache;
+        }
 
-    private static CachedMethods getCachedMethods(Class<?> partClass) {
-      CachedMethods cache = methodCache;
-      if (cache != null && cache.partClass == partClass) {
-        return cache;
-      }
-      return resolveAndCache(partClass);
-    }
+        private static CachedMethods getCachedMethods(Class<?> partClass) {
+            CachedMethods cache = methodCache;
+            if (cache != null && cache.partClass == partClass) {
+                return cache;
+            }
+            return resolveAndCache(partClass);
+        }
 
-    private static String readContent(Object part) {
-      try {
-        CachedMethods cache = getCachedMethods(part.getClass());
-        String contentType =
-            cache.getContentType != null ? (String) cache.getContentType.invoke(part) : null;
-        try (InputStream is = (InputStream) cache.getInputStream.invoke(part)) {
-          return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, contentType);
-        }
-      } catch (Exception ignored) {
-        return "";
-      }
-    }
+        private static String readContent(Object part) {
+            try {
+                CachedMethods cache = getCachedMethods(part.getClass());
+                String contentType = cache.getContentType != null ? (String) cache.getContentType.invoke(part) : null;
+                try (InputStream is = (InputStream) cache.getInputStream.invoke(part)) {
+                    return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, contentType);
+                }
+            } catch (Exception ignored) {
+                return "";
+            }
+        }
 
-    private static String getFilename(Object part) {
-      CachedMethods cache = getCachedMethods(part.getClass());
-      Method m = cache.getFilename;
-      if (m == null) {
-        return null;
-      }
-      try {
-        return (String) m.invoke(part);
-      } catch (Exception ignored) {
-        return null;
-      }
+        private static String getFilename(Object part) {
+            CachedMethods cache = getCachedMethods(part.getClass());
+            Method m = cache.getFilename;
+            if (m == null) {
+                return null;
+            }
+            try {
+                return (String) m.invoke(part);
+            } catch (Exception ignored) {
+                return null;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ParsePartsInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ParsePartsInstrumentation.java
index 57cd8df4f60..ae947f38c1c 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ParsePartsInstrumentation.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ParsePartsInstrumentation.java
@@ -35,241 +35,235 @@
 
 @AutoService(InstrumenterModule.class)
 public class ParsePartsInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
 
-  public ParsePartsInstrumentation() {
-    super("tomcat");
-  }
+    public ParsePartsInstrumentation() {
+        super("tomcat");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "from7";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "from7";
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.catalina.connector.Request";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.catalina.connector.Request";
+    }
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new ParsePartsVisitorWrapper());
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new ParsePartsVisitorWrapper());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("parseParts")
-            .and(takesArguments(0).or(takesArguments(1).and(takesArgument(0, boolean.class))))
-            .and(isPrivate()),
-        getClass().getName() + "$ParsePartsAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("parseParts")
+                        .and(takesArguments(0).or(takesArguments(1).and(takesArgument(0, boolean.class))))
+                        .and(isPrivate()),
+                getClass().getName() + "$ParsePartsAdvice");
+    }
 
-  public static class ParsePartsAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void before(
-        @Advice.Local("collector") ParameterCollector collector,
-        @Advice.Local("reqCtx") RequestContext reqCtx) {
-      AgentSpan agentSpan = AgentTracer.activeSpan();
-      if (agentSpan != null) {
-        RequestContext requestContext = agentSpan.getRequestContext();
-        if (requestContext != null && requestContext.getData(RequestContextSlot.APPSEC) != null) {
-          reqCtx = requestContext;
-          boolean inspectContent =
-              AgentTracer.get()
-                      .getCallbackProvider(RequestContextSlot.APPSEC)
-                      .getCallback(EVENTS.requestFilesContent())
-                  != null;
-          collector = new ParameterCollector.ParameterCollectorImpl(inspectContent);
-          return;
-        }
-      }
+    public static class ParsePartsAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void before(
+                @Advice.Local("collector") ParameterCollector collector,
+                @Advice.Local("reqCtx") RequestContext reqCtx) {
+            AgentSpan agentSpan = AgentTracer.activeSpan();
+            if (agentSpan != null) {
+                RequestContext requestContext = agentSpan.getRequestContext();
+                if (requestContext != null && requestContext.getData(RequestContextSlot.APPSEC) != null) {
+                    reqCtx = requestContext;
+                    boolean inspectContent = AgentTracer.get()
+                                    .getCallbackProvider(RequestContextSlot.APPSEC)
+                                    .getCallback(EVENTS.requestFilesContent())
+                            != null;
+                    collector = new ParameterCollector.ParameterCollectorImpl(inspectContent);
+                    return;
+                }
+            }
 
-      // this variable is used in the custom instrumentation below
-      collector = ParameterCollector.ParameterCollectorNoop.INSTANCE;
-    }
+            // this variable is used in the custom instrumentation below
+            collector = ParameterCollector.ParameterCollectorNoop.INSTANCE;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Local("collector") ParameterCollector collector,
-        @Advice.Local("reqCtx") RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null || reqCtx == null) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Local("collector") ParameterCollector collector,
+                @Advice.Local("reqCtx") RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null || reqCtx == null) {
+                return;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
 
-      if (!collector.isEmpty()) {
-        BiFunction<RequestContext, Object, Flow<Void>> callback =
-            cbp.getCallback(EVENTS.requestBodyProcessed());
-        if (callback != null) {
-          Flow<Void> flow = callback.apply(reqCtx, collector.getMap());
-          Flow.Action action = flow.getAction();
-          if (action instanceof Flow.Action.RequestBlockingAction) {
-            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-            BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-            if (blockResponseFunction != null) {
-              blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-              t = new BlockingException("Blocked request (for Request/parseParts)");
-              reqCtx.getTraceSegment().effectivelyBlocked();
+            if (!collector.isEmpty()) {
+                BiFunction<RequestContext, Object, Flow<Void>> callback =
+                        cbp.getCallback(EVENTS.requestBodyProcessed());
+                if (callback != null) {
+                    Flow<Void> flow = callback.apply(reqCtx, collector.getMap());
+                    Flow.Action action = flow.getAction();
+                    if (action instanceof Flow.Action.RequestBlockingAction) {
+                        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                        if (blockResponseFunction != null) {
+                            blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                            t = new BlockingException("Blocked request (for Request/parseParts)");
+                            reqCtx.getTraceSegment().effectivelyBlocked();
+                        }
+                    }
+                }
             }
-          }
-        }
-      }
 
-      List<String> filenames = collector.getFilenames();
-      if (!filenames.isEmpty()) {
-        BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb =
-            cbp.getCallback(EVENTS.requestFilesFilenames());
-        if (filenamesCb != null) {
-          Flow<Void> filenamesFlow = filenamesCb.apply(reqCtx, filenames);
-          Flow.Action filenamesAction = filenamesFlow.getAction();
-          if (t == null && filenamesAction instanceof Flow.Action.RequestBlockingAction) {
-            Flow.Action.RequestBlockingAction rba =
-                (Flow.Action.RequestBlockingAction) filenamesAction;
-            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-            if (brf != null) {
-              brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-              t = new BlockingException("Blocked request (multipart file upload)");
-              reqCtx.getTraceSegment().effectivelyBlocked();
+            List<String> filenames = collector.getFilenames();
+            if (!filenames.isEmpty()) {
+                BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb =
+                        cbp.getCallback(EVENTS.requestFilesFilenames());
+                if (filenamesCb != null) {
+                    Flow<Void> filenamesFlow = filenamesCb.apply(reqCtx, filenames);
+                    Flow.Action filenamesAction = filenamesFlow.getAction();
+                    if (t == null && filenamesAction instanceof Flow.Action.RequestBlockingAction) {
+                        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) filenamesAction;
+                        BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+                        if (brf != null) {
+                            brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                            t = new BlockingException("Blocked request (multipart file upload)");
+                            reqCtx.getTraceSegment().effectivelyBlocked();
+                        }
+                    }
+                }
             }
-          }
-        }
-      }
 
-      if (t == null) {
-        List<String> contents = collector.getContents();
-        if (!contents.isEmpty()) {
-          BiFunction<RequestContext, List<String>, Flow<Void>> contentCb =
-              cbp.getCallback(EVENTS.requestFilesContent());
-          if (contentCb != null) {
-            Flow<Void> contentFlow = contentCb.apply(reqCtx, contents);
-            Flow.Action contentAction = contentFlow.getAction();
-            if (contentAction instanceof Flow.Action.RequestBlockingAction) {
-              Flow.Action.RequestBlockingAction rba =
-                  (Flow.Action.RequestBlockingAction) contentAction;
-              BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-              if (brf != null) {
-                brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-                t = new BlockingException("Blocked request (multipart file upload content)");
-                reqCtx.getTraceSegment().effectivelyBlocked();
-              }
+            if (t == null) {
+                List<String> contents = collector.getContents();
+                if (!contents.isEmpty()) {
+                    BiFunction<RequestContext, List<String>, Flow<Void>> contentCb =
+                            cbp.getCallback(EVENTS.requestFilesContent());
+                    if (contentCb != null) {
+                        Flow<Void> contentFlow = contentCb.apply(reqCtx, contents);
+                        Flow.Action contentAction = contentFlow.getAction();
+                        if (contentAction instanceof Flow.Action.RequestBlockingAction) {
+                            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) contentAction;
+                            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+                            if (brf != null) {
+                                brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                                t = new BlockingException("Blocked request (multipart file upload content)");
+                                reqCtx.getTraceSegment().effectivelyBlocked();
+                            }
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 
-  public static class ParsePartsVisitorWrapper implements AsmVisitorWrapper {
-    @Override
-    public int mergeWriter(int flags) {
-      return flags | ClassWriter.COMPUTE_MAXS;
-    }
+    public static class ParsePartsVisitorWrapper implements AsmVisitorWrapper {
+        @Override
+        public int mergeWriter(int flags) {
+            return flags | ClassWriter.COMPUTE_MAXS;
+        }
 
-    @Override
-    public int mergeReader(int flags) {
-      return flags;
-    }
+        @Override
+        public int mergeReader(int flags) {
+            return flags;
+        }
 
-    @Override
-    public ClassVisitor wrap(
-        TypeDescription instrumentedType,
-        ClassVisitor classVisitor,
-        Implementation.Context implementationContext,
-        TypePool typePool,
-        FieldList<FieldDescription.InDefinedShape> fields,
-        MethodList<?> methods,
-        int writerFlags,
-        int readerFlags) {
-      return new RequestClassVisitor(Opcodes.ASM8, classVisitor);
+        @Override
+        public ClassVisitor wrap(
+                TypeDescription instrumentedType,
+                ClassVisitor classVisitor,
+                Implementation.Context implementationContext,
+                TypePool typePool,
+                FieldList<FieldDescription.InDefinedShape> fields,
+                MethodList<?> methods,
+                int writerFlags,
+                int readerFlags) {
+            return new RequestClassVisitor(Opcodes.ASM8, classVisitor);
+        }
     }
-  }
 
-  public static class RequestClassVisitor extends ClassVisitor {
-    public RequestClassVisitor(int api, ClassVisitor cv) {
-      super(api, cv);
-    }
+    public static class RequestClassVisitor extends ClassVisitor {
+        public RequestClassVisitor(int api, ClassVisitor cv) {
+            super(api, cv);
+        }
 
-    @Override
-    public MethodVisitor visitMethod(
-        int access, String name, String descriptor, String signature, String[] exceptions) {
-      MethodVisitor superMv = super.visitMethod(access, name, descriptor, signature, exceptions);
-      if ("parseParts".equals(name) && ("()V".equals(descriptor) || "(Z)V".equals(descriptor))) {
-        return new ParsePartsMethodVisitor(api, superMv, "(Z)V".equals(descriptor) ? 2 : 1);
-      } else {
-        return superMv;
-      }
+        @Override
+        public MethodVisitor visitMethod(
+                int access, String name, String descriptor, String signature, String[] exceptions) {
+            MethodVisitor superMv = super.visitMethod(access, name, descriptor, signature, exceptions);
+            if ("parseParts".equals(name) && ("()V".equals(descriptor) || "(Z)V".equals(descriptor))) {
+                return new ParsePartsMethodVisitor(api, superMv, "(Z)V".equals(descriptor) ? 2 : 1);
+            } else {
+                return superMv;
+            }
+        }
     }
-  }
 
-  public static class ParsePartsMethodVisitor extends MethodVisitor {
-    private final int collectedParamsVar;
+    public static class ParsePartsMethodVisitor extends MethodVisitor {
+        private final int collectedParamsVar;
 
-    public ParsePartsMethodVisitor(int api, MethodVisitor superMv, int collectedParamsVar) {
-      super(api, superMv);
-      this.collectedParamsVar = collectedParamsVar;
-    }
+        public ParsePartsMethodVisitor(int api, MethodVisitor superMv, int collectedParamsVar) {
+            super(api, superMv);
+            this.collectedParamsVar = collectedParamsVar;
+        }
 
-    @Override
-    public void visitMethodInsn(
-        int opcode, String owner, String name, String descriptor, boolean isInterface) {
-      if (opcode == Opcodes.INVOKEVIRTUAL
-          && owner.equals("org/apache/tomcat/util/http/Parameters")
-          && name.equals("addParameter")
-          && descriptor.equals("(Ljava/lang/String;Ljava/lang/String;)V")) {
-        super.visitVarInsn(Opcodes.ALOAD, collectedParamsVar);
-        // stack: ..., key, value, collParams
-        super.visitInsn(Opcodes.DUP_X2);
-        // stack: ..., collParams, key, value, collParams
-        super.visitInsn(Opcodes.POP);
-        // stack: ..., collParams, key, value
-        super.visitInsn(Opcodes.DUP2_X1);
-        // stack: ..., key, value, collParams, key, value
-        super.visitMethodInsn(
-            Opcodes.INVOKEINTERFACE,
-            Type.getInternalName(ParameterCollector.class),
-            "put",
-            "(Ljava/lang/String;Ljava/lang/String;)V",
-            true);
-        // original stack
-      } else if (opcode == Opcodes.INVOKEVIRTUAL
-          && owner.equals("org/apache/tomcat/util/http/Parameters")
-          && name.equals("addParameterValues")
-          && descriptor.equals("(Ljava/lang/String;[Ljava/lang/String;)V")) {
-        super.visitVarInsn(Opcodes.ALOAD, collectedParamsVar);
-        super.visitInsn(Opcodes.DUP_X2);
-        super.visitInsn(Opcodes.POP);
-        super.visitInsn(Opcodes.DUP2_X1);
-        super.visitMethodInsn(
-            Opcodes.INVOKEINTERFACE,
-            Type.getInternalName(ParameterCollector.class),
-            "put",
-            "(Ljava/lang/String;[Ljava/lang/String;)V",
-            true);
-      } else if (opcode == Opcodes.INVOKEINTERFACE
-          && name.equals("add")
-          && descriptor.equals("(Ljava/lang/Object;)Z")) {
-        // Intercept Collection.add(part) to capture uploaded file names.
-        // Stack before: ..., collection_ref, part_ref
-        super.visitInsn(Opcodes.DUP);
-        // Stack: ..., collection_ref, part_ref, part_ref
-        super.visitVarInsn(Opcodes.ALOAD, collectedParamsVar);
-        // Stack: ..., collection_ref, part_ref, part_ref, collector
-        super.visitInsn(Opcodes.SWAP);
-        // Stack: ..., collection_ref, part_ref, collector, part_ref
-        super.visitMethodInsn(
-            Opcodes.INVOKEINTERFACE,
-            Type.getInternalName(ParameterCollector.class),
-            "addPart",
-            "(Ljava/lang/Object;)V",
-            true);
-        // Stack: ..., collection_ref, part_ref
-      }
-      super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+        @Override
+        public void visitMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) {
+            if (opcode == Opcodes.INVOKEVIRTUAL
+                    && owner.equals("org/apache/tomcat/util/http/Parameters")
+                    && name.equals("addParameter")
+                    && descriptor.equals("(Ljava/lang/String;Ljava/lang/String;)V")) {
+                super.visitVarInsn(Opcodes.ALOAD, collectedParamsVar);
+                // stack: ..., key, value, collParams
+                super.visitInsn(Opcodes.DUP_X2);
+                // stack: ..., collParams, key, value, collParams
+                super.visitInsn(Opcodes.POP);
+                // stack: ..., collParams, key, value
+                super.visitInsn(Opcodes.DUP2_X1);
+                // stack: ..., key, value, collParams, key, value
+                super.visitMethodInsn(
+                        Opcodes.INVOKEINTERFACE,
+                        Type.getInternalName(ParameterCollector.class),
+                        "put",
+                        "(Ljava/lang/String;Ljava/lang/String;)V",
+                        true);
+                // original stack
+            } else if (opcode == Opcodes.INVOKEVIRTUAL
+                    && owner.equals("org/apache/tomcat/util/http/Parameters")
+                    && name.equals("addParameterValues")
+                    && descriptor.equals("(Ljava/lang/String;[Ljava/lang/String;)V")) {
+                super.visitVarInsn(Opcodes.ALOAD, collectedParamsVar);
+                super.visitInsn(Opcodes.DUP_X2);
+                super.visitInsn(Opcodes.POP);
+                super.visitInsn(Opcodes.DUP2_X1);
+                super.visitMethodInsn(
+                        Opcodes.INVOKEINTERFACE,
+                        Type.getInternalName(ParameterCollector.class),
+                        "put",
+                        "(Ljava/lang/String;[Ljava/lang/String;)V",
+                        true);
+            } else if (opcode == Opcodes.INVOKEINTERFACE
+                    && name.equals("add")
+                    && descriptor.equals("(Ljava/lang/Object;)Z")) {
+                // Intercept Collection.add(part) to capture uploaded file names.
+                // Stack before: ..., collection_ref, part_ref
+                super.visitInsn(Opcodes.DUP);
+                // Stack: ..., collection_ref, part_ref, part_ref
+                super.visitVarInsn(Opcodes.ALOAD, collectedParamsVar);
+                // Stack: ..., collection_ref, part_ref, part_ref, collector
+                super.visitInsn(Opcodes.SWAP);
+                // Stack: ..., collection_ref, part_ref, collector, part_ref
+                super.visitMethodInsn(
+                        Opcodes.INVOKEINTERFACE,
+                        Type.getInternalName(ParameterCollector.class),
+                        "addPart",
+                        "(Ljava/lang/Object;)V",
+                        true);
+                // Stack: ..., collection_ref, part_ref
+            }
+            super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/test/java/datadog/trace/instrumentation/tomcat7/GlassFishBlockingHelperTest.java b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/test/java/datadog/trace/instrumentation/tomcat7/GlassFishBlockingHelperTest.java
index f48f91130fc..442585af073 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/test/java/datadog/trace/instrumentation/tomcat7/GlassFishBlockingHelperTest.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/test/java/datadog/trace/instrumentation/tomcat7/GlassFishBlockingHelperTest.java
@@ -31,350 +31,336 @@
 
 class GlassFishBlockingHelperTest {
 
-  // ------- commitBlocking() -------
-
-  @Test
-  void commitBlocking_nullResponse_returnsFalse() {
-    assertFalse(GlassFishBlockingHelper.commitBlocking(null, null, rba(403)));
-  }
-
-  @Test
-  void commitBlocking_committedResponse_returnsFalse() {
-    HttpServletResponse resp = mock(HttpServletResponse.class);
-    when(resp.isCommitted()).thenReturn(true);
-    assertFalse(GlassFishBlockingHelper.commitBlocking(null, resp, rba(403)));
-  }
-
-  @Test
-  void commitBlocking_blockingContentTypeNone_setsStatusWithoutBody() throws IOException {
-    HttpServletResponse resp = mock(HttpServletResponse.class);
-    when(resp.isCommitted()).thenReturn(false);
-
-    assertTrue(
-        GlassFishBlockingHelper.commitBlocking(
-            null, resp, new Flow.Action.RequestBlockingAction(403, BlockingContentType.NONE)));
-
-    verify(resp).setStatus(403);
-    verify(resp).flushBuffer();
-    verify(resp, never()).setHeader(eq("Content-Type"), any());
-    verify(resp, never()).getOutputStream();
-  }
-
-  @Test
-  void commitBlocking_withJsonAccept_writesJsonBody() throws IOException {
-    HttpServletRequest req = mock(HttpServletRequest.class);
-    when(req.getHeader("Accept")).thenReturn("application/json");
-    TestServletOutputStream out = new TestServletOutputStream();
-    HttpServletResponse resp = mock(HttpServletResponse.class);
-    when(resp.isCommitted()).thenReturn(false);
-    when(resp.getOutputStream()).thenReturn(out);
-
-    assertTrue(GlassFishBlockingHelper.commitBlocking(req, resp, rba(403)));
-
-    verify(resp).setStatus(403);
-    verify(resp).setHeader(eq("Content-Type"), contains("json"));
-    verify(resp).setHeader(eq("Content-Length"), any());
-    assertTrue(out.getBytes().length > 0);
-    verify(resp).flushBuffer();
-  }
-
-  @Test
-  void commitBlocking_withHtmlAccept_writesHtmlBody() throws IOException {
-    HttpServletRequest req = mock(HttpServletRequest.class);
-    when(req.getHeader("Accept")).thenReturn("text/html");
-    TestServletOutputStream out = new TestServletOutputStream();
-    HttpServletResponse resp = mock(HttpServletResponse.class);
-    when(resp.isCommitted()).thenReturn(false);
-    when(resp.getOutputStream()).thenReturn(out);
-
-    assertTrue(GlassFishBlockingHelper.commitBlocking(req, resp, rba(403)));
-
-    verify(resp).setHeader(eq("Content-Type"), contains("html"));
-    assertTrue(out.getBytes().length > 0);
-  }
-
-  @Test
-  void commitBlocking_nullRequest_defaultsToJsonBody() throws IOException {
-    TestServletOutputStream out = new TestServletOutputStream();
-    HttpServletResponse resp = mock(HttpServletResponse.class);
-    when(resp.isCommitted()).thenReturn(false);
-    when(resp.getOutputStream()).thenReturn(out);
-
-    assertTrue(GlassFishBlockingHelper.commitBlocking(null, resp, rba(403)));
-
-    verify(resp).setStatus(403);
-    assertTrue(out.getBytes().length > 0);
-  }
-
-  @Test
-  void commitBlocking_ioException_returnsFalse() throws IOException {
-    HttpServletResponse resp = mock(HttpServletResponse.class);
-    when(resp.isCommitted()).thenReturn(false);
-    when(resp.getOutputStream()).thenThrow(new IOException("stream error"));
-
-    assertFalse(GlassFishBlockingHelper.commitBlocking(null, resp, rba(403)));
-  }
-
-  // ------- tryBlock() -------
-
-  @Test
-  void tryBlock_withBrf_commitsViaFunctionAndReturnsTrue() throws Exception {
-    TraceSegment segment = mock(TraceSegment.class);
-    BlockResponseFunction brf = mock(BlockResponseFunction.class);
-    RequestContext reqCtx = mockReqCtx(brf, segment);
-
-    Flow.Action.RequestBlockingAction action = rba(403);
-    assertTrue(GlassFishBlockingHelper.tryBlock(reqCtx, null, null, action));
-
-    verify(brf).tryCommitBlockingResponse(segment, action);
-    verify(segment).effectivelyBlocked();
-  }
-
-  @Test
-  void tryBlock_noBrf_fallbackSucceeds_returnsTrue() throws IOException {
-    TraceSegment segment = mock(TraceSegment.class);
-    RequestContext reqCtx = mockReqCtx(null, segment);
-    TestServletOutputStream out = new TestServletOutputStream();
-    HttpServletResponse resp = mock(HttpServletResponse.class);
-    when(resp.isCommitted()).thenReturn(false);
-    when(resp.getOutputStream()).thenReturn(out);
-
-    assertTrue(GlassFishBlockingHelper.tryBlock(reqCtx, null, resp, rba(403)));
-    verify(segment).effectivelyBlocked();
-  }
-
-  @Test
-  void tryBlock_noBrf_nullFallbackResponse_returnsFalse() {
-    RequestContext reqCtx = mock(RequestContext.class);
-    when(reqCtx.getBlockResponseFunction()).thenReturn(null);
-
-    assertFalse(GlassFishBlockingHelper.tryBlock(reqCtx, null, null, rba(403)));
-    verify(reqCtx, never()).getTraceSegment();
-  }
-
-  @Test
-  void tryBlock_brfThrows_returnsFalse() throws Exception {
-    TraceSegment segment = mock(TraceSegment.class);
-    BlockResponseFunction brf = mock(BlockResponseFunction.class);
-    RequestContext reqCtx = mockReqCtx(brf, segment);
-    doThrow(new RuntimeException("commit failed"))
-        .when(brf)
-        .tryCommitBlockingResponse(
-            any(TraceSegment.class), any(Flow.Action.RequestBlockingAction.class));
-
-    assertFalse(GlassFishBlockingHelper.tryBlock(reqCtx, null, null, rba(403)));
-    verify(segment, never()).effectivelyBlocked();
-  }
-
-  @Test
-  void tryBlock_effectivelyBlockedThrows_stillReturnsTrue() throws Exception {
-    TraceSegment segment = mock(TraceSegment.class);
-    BlockResponseFunction brf = mock(BlockResponseFunction.class);
-    RequestContext reqCtx = mockReqCtx(brf, segment);
-    doThrow(new RuntimeException("span already finished")).when(segment).effectivelyBlocked();
-
-    assertTrue(GlassFishBlockingHelper.tryBlock(reqCtx, null, null, rba(403)));
-  }
-
-  // ------- processPartsAndBlock() -------
-
-  @Test
-  void processPartsAndBlock_formField_skipped() throws Exception {
-    Part formField = mockPart(null, "text/plain", new byte[0]);
-    RequestContext reqCtx = mockReqCtx(null, mock(TraceSegment.class));
-    BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb = mockPassThroughCb();
-
-    assertFalse(
-        GlassFishBlockingHelper.processPartsAndBlock(
-            Collections.singletonList(formField), reqCtx, null, filenamesCb, null));
-    verify(formField).getSubmittedFileName();
-    verify(formField, never()).getInputStream();
-  }
-
-  @Test
-  void processPartsAndBlock_emptyFilename_notAddedToFilenames_butContentRead() throws Exception {
-    byte[] content = "data".getBytes();
-    Part filePart = mockPart("", "application/octet-stream", content);
-    RequestContext reqCtx = mockReqCtx(null, mock(TraceSegment.class));
-    BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb = mockPassThroughCb();
-    BiFunction<RequestContext, List<String>, Flow<Void>> contentCb = mockPassThroughCb();
-
-    assertFalse(
-        GlassFishBlockingHelper.processPartsAndBlock(
-            Collections.singletonList(filePart), reqCtx, null, filenamesCb, contentCb));
-
-    verify(filePart).getInputStream();
-    verify(filenamesCb, never()).apply(any(), any());
-    verify(contentCb).apply(eq(reqCtx), any());
-  }
-
-  @Test
-  void processPartsAndBlock_normalFilename_reportedViaFilenamesCb() throws Exception {
-    Part filePart = mockPart("file.txt", "text/plain", "hello".getBytes());
-    RequestContext reqCtx = mockReqCtx(null, mock(TraceSegment.class));
-    BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb = mockPassThroughCb();
-
-    assertFalse(
-        GlassFishBlockingHelper.processPartsAndBlock(
-            Collections.singletonList(filePart), reqCtx, null, filenamesCb, null));
-
-    verify(filenamesCb).apply(eq(reqCtx), eq(Collections.singletonList("file.txt")));
-  }
-
-  @Test
-  void processPartsAndBlock_contentRead_reportedViaContentCb() throws Exception {
-    Part filePart = mockPart("file.bin", "application/octet-stream", new byte[] {1, 2, 3});
-    RequestContext reqCtx = mockReqCtx(null, mock(TraceSegment.class));
-    BiFunction<RequestContext, List<String>, Flow<Void>> contentCb = mockPassThroughCb();
-
-    assertFalse(
-        GlassFishBlockingHelper.processPartsAndBlock(
-            Collections.singletonList(filePart), reqCtx, null, null, contentCb));
-
-    verify(contentCb).apply(eq(reqCtx), any());
-  }
-
-  @Test
-  void processPartsAndBlock_maxFilesLimit_enforced() throws Exception {
-    int limit = GlassFishBlockingHelper.MAX_FILE_CONTENT_COUNT;
-    Part[] tooMany = new Part[limit + 1];
-    for (int i = 0; i <= limit; i++) {
-      tooMany[i] = mockPart("f" + i + ".bin", "application/octet-stream", new byte[0]);
+    // ------- commitBlocking() -------
+
+    @Test
+    void commitBlocking_nullResponse_returnsFalse() {
+        assertFalse(GlassFishBlockingHelper.commitBlocking(null, null, rba(403)));
+    }
+
+    @Test
+    void commitBlocking_committedResponse_returnsFalse() {
+        HttpServletResponse resp = mock(HttpServletResponse.class);
+        when(resp.isCommitted()).thenReturn(true);
+        assertFalse(GlassFishBlockingHelper.commitBlocking(null, resp, rba(403)));
+    }
+
+    @Test
+    void commitBlocking_blockingContentTypeNone_setsStatusWithoutBody() throws IOException {
+        HttpServletResponse resp = mock(HttpServletResponse.class);
+        when(resp.isCommitted()).thenReturn(false);
+
+        assertTrue(GlassFishBlockingHelper.commitBlocking(
+                null, resp, new Flow.Action.RequestBlockingAction(403, BlockingContentType.NONE)));
+
+        verify(resp).setStatus(403);
+        verify(resp).flushBuffer();
+        verify(resp, never()).setHeader(eq("Content-Type"), any());
+        verify(resp, never()).getOutputStream();
+    }
+
+    @Test
+    void commitBlocking_withJsonAccept_writesJsonBody() throws IOException {
+        HttpServletRequest req = mock(HttpServletRequest.class);
+        when(req.getHeader("Accept")).thenReturn("application/json");
+        TestServletOutputStream out = new TestServletOutputStream();
+        HttpServletResponse resp = mock(HttpServletResponse.class);
+        when(resp.isCommitted()).thenReturn(false);
+        when(resp.getOutputStream()).thenReturn(out);
+
+        assertTrue(GlassFishBlockingHelper.commitBlocking(req, resp, rba(403)));
+
+        verify(resp).setStatus(403);
+        verify(resp).setHeader(eq("Content-Type"), contains("json"));
+        verify(resp).setHeader(eq("Content-Length"), any());
+        assertTrue(out.getBytes().length > 0);
+        verify(resp).flushBuffer();
+    }
+
+    @Test
+    void commitBlocking_withHtmlAccept_writesHtmlBody() throws IOException {
+        HttpServletRequest req = mock(HttpServletRequest.class);
+        when(req.getHeader("Accept")).thenReturn("text/html");
+        TestServletOutputStream out = new TestServletOutputStream();
+        HttpServletResponse resp = mock(HttpServletResponse.class);
+        when(resp.isCommitted()).thenReturn(false);
+        when(resp.getOutputStream()).thenReturn(out);
+
+        assertTrue(GlassFishBlockingHelper.commitBlocking(req, resp, rba(403)));
+
+        verify(resp).setHeader(eq("Content-Type"), contains("html"));
+        assertTrue(out.getBytes().length > 0);
     }
-    RequestContext reqCtx = mockReqCtx(null, mock(TraceSegment.class));
-    BiFunction<RequestContext, List<String>, Flow<Void>> contentCb = mockPassThroughCb();
-
-    assertFalse(
-        GlassFishBlockingHelper.processPartsAndBlock(
-            Arrays.asList(tooMany), reqCtx, null, null, contentCb));
-
-    verify(contentCb).apply(eq(reqCtx), any(List.class));
-    verify(tooMany[limit], never()).getInputStream();
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void processPartsAndBlock_getInputStreamThrows_emptyStringFallback() throws Exception {
-    Part filePart = mock(Part.class);
-    when(filePart.getSubmittedFileName()).thenReturn("bad.bin");
-    when(filePart.getInputStream()).thenThrow(new IOException("disk error"));
-    RequestContext reqCtx = mockReqCtx(null, mock(TraceSegment.class));
-    BiFunction<RequestContext, List<String>, Flow<Void>> contentCb = mockPassThroughCb();
-
-    assertFalse(
-        GlassFishBlockingHelper.processPartsAndBlock(
-            Collections.singletonList(filePart), reqCtx, null, null, contentCb));
-
-    verify(contentCb).apply(eq(reqCtx), eq(Collections.singletonList("")));
-  }
-
-  @Test
-  void processPartsAndBlock_filenamesCbBlocks_contentCbNotFired() throws Exception {
-    Part filePart = mockPart("evil.exe", "application/octet-stream", "content".getBytes());
-    TraceSegment segment = mock(TraceSegment.class);
-    BlockResponseFunction brf = mock(BlockResponseFunction.class);
-    RequestContext reqCtx = mockReqCtx(brf, segment);
-    BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb = mockBlockingCb(403);
-    BiFunction<RequestContext, List<String>, Flow<Void>> contentCb = mockPassThroughCb();
-
-    assertTrue(
-        GlassFishBlockingHelper.processPartsAndBlock(
-            Collections.singletonList(filePart), reqCtx, null, filenamesCb, contentCb));
-
-    verify(contentCb, never()).apply(any(), any());
-  }
-
-  @Test
-  void processPartsAndBlock_contentCbBlocks_returnsTrue() throws Exception {
-    Part filePart = mockPart("upload.bin", "application/octet-stream", "payload".getBytes());
-    TraceSegment segment = mock(TraceSegment.class);
-    BlockResponseFunction brf = mock(BlockResponseFunction.class);
-    RequestContext reqCtx = mockReqCtx(brf, segment);
-    BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb = mockPassThroughCb();
-    BiFunction<RequestContext, List<String>, Flow<Void>> contentCb = mockBlockingCb(403);
-
-    assertTrue(
-        GlassFishBlockingHelper.processPartsAndBlock(
-            Collections.singletonList(filePart), reqCtx, null, filenamesCb, contentCb));
-  }
-
-  @Test
-  void processPartsAndBlock_nonPartObject_skipped() {
-    RequestContext reqCtx = mockReqCtx(null, mock(TraceSegment.class));
-    BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb = mockPassThroughCb();
-
-    assertFalse(
-        GlassFishBlockingHelper.processPartsAndBlock(
-            Collections.singletonList("not-a-part"), reqCtx, null, filenamesCb, null));
-
-    verify(filenamesCb, never()).apply(any(), any());
-  }
-
-  // ------- Helpers -------
-
-  private static Flow.Action.RequestBlockingAction rba(int statusCode) {
-    return new Flow.Action.RequestBlockingAction(statusCode, BlockingContentType.AUTO);
-  }
-
-  private static RequestContext mockReqCtx(BlockResponseFunction brf, TraceSegment segment) {
-    RequestContext reqCtx = mock(RequestContext.class);
-    when(reqCtx.getBlockResponseFunction()).thenReturn(brf);
-    when(reqCtx.getTraceSegment()).thenReturn(segment);
-    return reqCtx;
-  }
-
-  private static Part mockPart(String submittedFilename, String contentType, byte[] content)
-      throws Exception {
-    Part part = mock(Part.class);
-    when(part.getSubmittedFileName()).thenReturn(submittedFilename);
-    when(part.getContentType()).thenReturn(contentType);
-    when(part.getInputStream()).thenAnswer(ignored -> new java.io.ByteArrayInputStream(content));
-    return part;
-  }
-
-  @SuppressWarnings("unchecked")
-  private static BiFunction<RequestContext, List<String>, Flow<Void>> mockPassThroughCb() {
-    BiFunction<RequestContext, List<String>, Flow<Void>> cb = mock(BiFunction.class);
-    Flow<Void> flow = mock(Flow.class);
-    when(flow.getAction()).thenReturn(Flow.Action.Noop.INSTANCE);
-    when(cb.apply(any(), any())).thenReturn(flow);
-    return cb;
-  }
-
-  @SuppressWarnings("unchecked")
-  private static BiFunction<RequestContext, List<String>, Flow<Void>> mockBlockingCb(
-      int statusCode) {
-    BiFunction<RequestContext, List<String>, Flow<Void>> cb = mock(BiFunction.class);
-    Flow<Void> flow = mock(Flow.class);
-    when(flow.getAction())
-        .thenReturn(new Flow.Action.RequestBlockingAction(statusCode, BlockingContentType.AUTO));
-    when(cb.apply(any(), any())).thenReturn(flow);
-    return cb;
-  }
-
-  private static final class TestServletOutputStream extends ServletOutputStream {
-    private final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-
-    @Override
-    public boolean isReady() {
-      return true;
+
+    @Test
+    void commitBlocking_nullRequest_defaultsToJsonBody() throws IOException {
+        TestServletOutputStream out = new TestServletOutputStream();
+        HttpServletResponse resp = mock(HttpServletResponse.class);
+        when(resp.isCommitted()).thenReturn(false);
+        when(resp.getOutputStream()).thenReturn(out);
+
+        assertTrue(GlassFishBlockingHelper.commitBlocking(null, resp, rba(403)));
+
+        verify(resp).setStatus(403);
+        assertTrue(out.getBytes().length > 0);
     }
 
-    @Override
-    public void setWriteListener(WriteListener listener) {}
+    @Test
+    void commitBlocking_ioException_returnsFalse() throws IOException {
+        HttpServletResponse resp = mock(HttpServletResponse.class);
+        when(resp.isCommitted()).thenReturn(false);
+        when(resp.getOutputStream()).thenThrow(new IOException("stream error"));
 
-    @Override
-    public void write(int b) throws IOException {
-      buffer.write(b);
+        assertFalse(GlassFishBlockingHelper.commitBlocking(null, resp, rba(403)));
     }
 
-    @Override
-    public void write(byte[] b, int off, int len) throws IOException {
-      buffer.write(b, off, len);
+    // ------- tryBlock() -------
+
+    @Test
+    void tryBlock_withBrf_commitsViaFunctionAndReturnsTrue() throws Exception {
+        TraceSegment segment = mock(TraceSegment.class);
+        BlockResponseFunction brf = mock(BlockResponseFunction.class);
+        RequestContext reqCtx = mockReqCtx(brf, segment);
+
+        Flow.Action.RequestBlockingAction action = rba(403);
+        assertTrue(GlassFishBlockingHelper.tryBlock(reqCtx, null, null, action));
+
+        verify(brf).tryCommitBlockingResponse(segment, action);
+        verify(segment).effectivelyBlocked();
     }
 
-    public byte[] getBytes() {
-      return buffer.toByteArray();
+    @Test
+    void tryBlock_noBrf_fallbackSucceeds_returnsTrue() throws IOException {
+        TraceSegment segment = mock(TraceSegment.class);
+        RequestContext reqCtx = mockReqCtx(null, segment);
+        TestServletOutputStream out = new TestServletOutputStream();
+        HttpServletResponse resp = mock(HttpServletResponse.class);
+        when(resp.isCommitted()).thenReturn(false);
+        when(resp.getOutputStream()).thenReturn(out);
+
+        assertTrue(GlassFishBlockingHelper.tryBlock(reqCtx, null, resp, rba(403)));
+        verify(segment).effectivelyBlocked();
+    }
+
+    @Test
+    void tryBlock_noBrf_nullFallbackResponse_returnsFalse() {
+        RequestContext reqCtx = mock(RequestContext.class);
+        when(reqCtx.getBlockResponseFunction()).thenReturn(null);
+
+        assertFalse(GlassFishBlockingHelper.tryBlock(reqCtx, null, null, rba(403)));
+        verify(reqCtx, never()).getTraceSegment();
+    }
+
+    @Test
+    void tryBlock_brfThrows_returnsFalse() throws Exception {
+        TraceSegment segment = mock(TraceSegment.class);
+        BlockResponseFunction brf = mock(BlockResponseFunction.class);
+        RequestContext reqCtx = mockReqCtx(brf, segment);
+        doThrow(new RuntimeException("commit failed"))
+                .when(brf)
+                .tryCommitBlockingResponse(any(TraceSegment.class), any(Flow.Action.RequestBlockingAction.class));
+
+        assertFalse(GlassFishBlockingHelper.tryBlock(reqCtx, null, null, rba(403)));
+        verify(segment, never()).effectivelyBlocked();
+    }
+
+    @Test
+    void tryBlock_effectivelyBlockedThrows_stillReturnsTrue() throws Exception {
+        TraceSegment segment = mock(TraceSegment.class);
+        BlockResponseFunction brf = mock(BlockResponseFunction.class);
+        RequestContext reqCtx = mockReqCtx(brf, segment);
+        doThrow(new RuntimeException("span already finished")).when(segment).effectivelyBlocked();
+
+        assertTrue(GlassFishBlockingHelper.tryBlock(reqCtx, null, null, rba(403)));
+    }
+
+    // ------- processPartsAndBlock() -------
+
+    @Test
+    void processPartsAndBlock_formField_skipped() throws Exception {
+        Part formField = mockPart(null, "text/plain", new byte[0]);
+        RequestContext reqCtx = mockReqCtx(null, mock(TraceSegment.class));
+        BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb = mockPassThroughCb();
+
+        assertFalse(GlassFishBlockingHelper.processPartsAndBlock(
+                Collections.singletonList(formField), reqCtx, null, filenamesCb, null));
+        verify(formField).getSubmittedFileName();
+        verify(formField, never()).getInputStream();
+    }
+
+    @Test
+    void processPartsAndBlock_emptyFilename_notAddedToFilenames_butContentRead() throws Exception {
+        byte[] content = "data".getBytes();
+        Part filePart = mockPart("", "application/octet-stream", content);
+        RequestContext reqCtx = mockReqCtx(null, mock(TraceSegment.class));
+        BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb = mockPassThroughCb();
+        BiFunction<RequestContext, List<String>, Flow<Void>> contentCb = mockPassThroughCb();
+
+        assertFalse(GlassFishBlockingHelper.processPartsAndBlock(
+                Collections.singletonList(filePart), reqCtx, null, filenamesCb, contentCb));
+
+        verify(filePart).getInputStream();
+        verify(filenamesCb, never()).apply(any(), any());
+        verify(contentCb).apply(eq(reqCtx), any());
+    }
+
+    @Test
+    void processPartsAndBlock_normalFilename_reportedViaFilenamesCb() throws Exception {
+        Part filePart = mockPart("file.txt", "text/plain", "hello".getBytes());
+        RequestContext reqCtx = mockReqCtx(null, mock(TraceSegment.class));
+        BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb = mockPassThroughCb();
+
+        assertFalse(GlassFishBlockingHelper.processPartsAndBlock(
+                Collections.singletonList(filePart), reqCtx, null, filenamesCb, null));
+
+        verify(filenamesCb).apply(eq(reqCtx), eq(Collections.singletonList("file.txt")));
+    }
+
+    @Test
+    void processPartsAndBlock_contentRead_reportedViaContentCb() throws Exception {
+        Part filePart = mockPart("file.bin", "application/octet-stream", new byte[] {1, 2, 3});
+        RequestContext reqCtx = mockReqCtx(null, mock(TraceSegment.class));
+        BiFunction<RequestContext, List<String>, Flow<Void>> contentCb = mockPassThroughCb();
+
+        assertFalse(GlassFishBlockingHelper.processPartsAndBlock(
+                Collections.singletonList(filePart), reqCtx, null, null, contentCb));
+
+        verify(contentCb).apply(eq(reqCtx), any());
+    }
+
+    @Test
+    void processPartsAndBlock_maxFilesLimit_enforced() throws Exception {
+        int limit = GlassFishBlockingHelper.MAX_FILE_CONTENT_COUNT;
+        Part[] tooMany = new Part[limit + 1];
+        for (int i = 0; i <= limit; i++) {
+            tooMany[i] = mockPart("f" + i + ".bin", "application/octet-stream", new byte[0]);
+        }
+        RequestContext reqCtx = mockReqCtx(null, mock(TraceSegment.class));
+        BiFunction<RequestContext, List<String>, Flow<Void>> contentCb = mockPassThroughCb();
+
+        assertFalse(
+                GlassFishBlockingHelper.processPartsAndBlock(Arrays.asList(tooMany), reqCtx, null, null, contentCb));
+
+        verify(contentCb).apply(eq(reqCtx), any(List.class));
+        verify(tooMany[limit], never()).getInputStream();
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void processPartsAndBlock_getInputStreamThrows_emptyStringFallback() throws Exception {
+        Part filePart = mock(Part.class);
+        when(filePart.getSubmittedFileName()).thenReturn("bad.bin");
+        when(filePart.getInputStream()).thenThrow(new IOException("disk error"));
+        RequestContext reqCtx = mockReqCtx(null, mock(TraceSegment.class));
+        BiFunction<RequestContext, List<String>, Flow<Void>> contentCb = mockPassThroughCb();
+
+        assertFalse(GlassFishBlockingHelper.processPartsAndBlock(
+                Collections.singletonList(filePart), reqCtx, null, null, contentCb));
+
+        verify(contentCb).apply(eq(reqCtx), eq(Collections.singletonList("")));
+    }
+
+    @Test
+    void processPartsAndBlock_filenamesCbBlocks_contentCbNotFired() throws Exception {
+        Part filePart = mockPart("evil.exe", "application/octet-stream", "content".getBytes());
+        TraceSegment segment = mock(TraceSegment.class);
+        BlockResponseFunction brf = mock(BlockResponseFunction.class);
+        RequestContext reqCtx = mockReqCtx(brf, segment);
+        BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb = mockBlockingCb(403);
+        BiFunction<RequestContext, List<String>, Flow<Void>> contentCb = mockPassThroughCb();
+
+        assertTrue(GlassFishBlockingHelper.processPartsAndBlock(
+                Collections.singletonList(filePart), reqCtx, null, filenamesCb, contentCb));
+
+        verify(contentCb, never()).apply(any(), any());
+    }
+
+    @Test
+    void processPartsAndBlock_contentCbBlocks_returnsTrue() throws Exception {
+        Part filePart = mockPart("upload.bin", "application/octet-stream", "payload".getBytes());
+        TraceSegment segment = mock(TraceSegment.class);
+        BlockResponseFunction brf = mock(BlockResponseFunction.class);
+        RequestContext reqCtx = mockReqCtx(brf, segment);
+        BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb = mockPassThroughCb();
+        BiFunction<RequestContext, List<String>, Flow<Void>> contentCb = mockBlockingCb(403);
+
+        assertTrue(GlassFishBlockingHelper.processPartsAndBlock(
+                Collections.singletonList(filePart), reqCtx, null, filenamesCb, contentCb));
+    }
+
+    @Test
+    void processPartsAndBlock_nonPartObject_skipped() {
+        RequestContext reqCtx = mockReqCtx(null, mock(TraceSegment.class));
+        BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb = mockPassThroughCb();
+
+        assertFalse(GlassFishBlockingHelper.processPartsAndBlock(
+                Collections.singletonList("not-a-part"), reqCtx, null, filenamesCb, null));
+
+        verify(filenamesCb, never()).apply(any(), any());
+    }
+
+    // ------- Helpers -------
+
+    private static Flow.Action.RequestBlockingAction rba(int statusCode) {
+        return new Flow.Action.RequestBlockingAction(statusCode, BlockingContentType.AUTO);
+    }
+
+    private static RequestContext mockReqCtx(BlockResponseFunction brf, TraceSegment segment) {
+        RequestContext reqCtx = mock(RequestContext.class);
+        when(reqCtx.getBlockResponseFunction()).thenReturn(brf);
+        when(reqCtx.getTraceSegment()).thenReturn(segment);
+        return reqCtx;
+    }
+
+    private static Part mockPart(String submittedFilename, String contentType, byte[] content) throws Exception {
+        Part part = mock(Part.class);
+        when(part.getSubmittedFileName()).thenReturn(submittedFilename);
+        when(part.getContentType()).thenReturn(contentType);
+        when(part.getInputStream()).thenAnswer(ignored -> new java.io.ByteArrayInputStream(content));
+        return part;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static BiFunction<RequestContext, List<String>, Flow<Void>> mockPassThroughCb() {
+        BiFunction<RequestContext, List<String>, Flow<Void>> cb = mock(BiFunction.class);
+        Flow<Void> flow = mock(Flow.class);
+        when(flow.getAction()).thenReturn(Flow.Action.Noop.INSTANCE);
+        when(cb.apply(any(), any())).thenReturn(flow);
+        return cb;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static BiFunction<RequestContext, List<String>, Flow<Void>> mockBlockingCb(int statusCode) {
+        BiFunction<RequestContext, List<String>, Flow<Void>> cb = mock(BiFunction.class);
+        Flow<Void> flow = mock(Flow.class);
+        when(flow.getAction()).thenReturn(new Flow.Action.RequestBlockingAction(statusCode, BlockingContentType.AUTO));
+        when(cb.apply(any(), any())).thenReturn(flow);
+        return cb;
+    }
+
+    private static final class TestServletOutputStream extends ServletOutputStream {
+        private final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+
+        @Override
+        public boolean isReady() {
+            return true;
+        }
+
+        @Override
+        public void setWriteListener(WriteListener listener) {}
+
+        @Override
+        public void write(int b) throws IOException {
+            buffer.write(b);
+        }
+
+        @Override
+        public void write(byte[] b, int off, int len) throws IOException {
+            buffer.write(b, off, len);
+        }
+
+        public byte[] getBytes() {
+            return buffer.toByteArray();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-common/src/jmh/java/datadog/trace/instrumentation/tomcat/SecurityTestingHeadersBenchmark.java b/dd-java-agent/instrumentation/tomcat/tomcat-common/src/jmh/java/datadog/trace/instrumentation/tomcat/SecurityTestingHeadersBenchmark.java
index 90841874ec0..9a66b8e46ff 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-common/src/jmh/java/datadog/trace/instrumentation/tomcat/SecurityTestingHeadersBenchmark.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-common/src/jmh/java/datadog/trace/instrumentation/tomcat/SecurityTestingHeadersBenchmark.java
@@ -35,8 +35,8 @@
  * </pre>
  */
 @Fork(
-    value = 3,
-    jvmArgsAppend = {"-Xms512m", "-Xmx512m"})
+        value = 3,
+        jvmArgsAppend = {"-Xms512m", "-Xmx512m"})
 @Warmup(iterations = 3, time = 1)
 @Measurement(iterations = 4, time = 1)
 @Threads(1)
@@ -44,166 +44,164 @@
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 public class SecurityTestingHeadersBenchmark {
-  static final String SCAN = "x-datadog-endpoint-scan";
-  static final String TEST = "x-datadog-security-test";
-  static final ExtractAdapter<MimeHeaders> ADAPTER =
-      new ExtractAdapter<MimeHeaders>() {
+    static final String SCAN = "x-datadog-endpoint-scan";
+    static final String TEST = "x-datadog-security-test";
+    static final ExtractAdapter<MimeHeaders> ADAPTER = new ExtractAdapter<MimeHeaders>() {
         @Override
         MimeHeaders getMimeHeaders(MimeHeaders headers) {
-          return headers;
+            return headers;
         }
-      };
-
-  @Param({"bytesTypical", "bytesCookie4k", "stringsTypical", "bytesMarkers"})
-  public String scenario;
-
-  @Param({"false", "true"})
-  public boolean stringCache;
-
-  MimeHeaders[] requests;
-  int cursor;
-  final Tags tags = new Tags();
-
-  @Setup
-  public void setup() {
-    StringCache cache = new StringCache();
-    cache.setByteEnabled(stringCache);
-    cache.reset();
-    requests = new MimeHeaders[32];
-    for (int i = 0; i < requests.length; i++) {
-      MimeHeaders h = new MimeHeaders();
-      boolean bytes = !scenario.startsWith("strings");
-      String cookie =
-          "session=" + i + "; prefs=" + repeat('a', scenario.equals("bytesCookie4k") ? 4070 : 100);
-      String[][] fields = {
-        {"host", "service.example.test"},
-        {
-          "user-agent",
-          "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 Chrome/140.0.0.0 Safari/537.36"
-        },
-        {"accept", "application/json"},
-        {"accept-encoding", "gzip, deflate, br"},
-        {"accept-language", "en-US,en;q=0.9"},
-        {"connection", "keep-alive"},
-        {"traceparent", "00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01"},
-        {"tracestate", "dd=s:1;o:rum"},
-        {"authorization", "Bearer " + repeat('b', 180) + i},
-        {"cookie", cookie},
-        {"x-request-id", "request-" + i},
-        {"content-type", "application/json"}
-      };
-      for (String[] f : fields) add(h, f[0], f[1], bytes);
-      if (scenario.equals("bytesMarkers")) {
-        add(h, "X-Datadog-Endpoint-Scan", "scan-" + i, bytes);
-        add(h, TEST, "test-" + i, bytes);
-      }
-      // Model a preceding visit: conversion must not accidentally turn byte-backed headers into
-      // strings.
-      for (int k = 0; k < h.size(); k++) {
-        ExtractAdapter.messageBytesToString(h.getName(k));
-        ExtractAdapter.messageBytesToString(h.getValue(k));
-      }
-      if (bytes && h.getValue(9).getType() != MessageBytes.T_BYTES)
-        throw new AssertionError("representation changed");
-      requests[i] = h;
-    }
-    if (stringCache) {
-      // Warm eligible values as preceding propagation/application header reads would.
-      for (int pass = 0; pass < 1000; pass++) {
-        for (MimeHeaders h : requests) {
-          for (int k = 0; k < h.size(); k++) {
-            ExtractAdapter.messageBytesToString(h.getName(k));
-            ExtractAdapter.messageBytesToString(h.getValue(k));
-          }
+    };
+
+    @Param({"bytesTypical", "bytesCookie4k", "stringsTypical", "bytesMarkers"})
+    public String scenario;
+
+    @Param({"false", "true"})
+    public boolean stringCache;
+
+    MimeHeaders[] requests;
+    int cursor;
+    final Tags tags = new Tags();
+
+    @Setup
+    public void setup() {
+        StringCache cache = new StringCache();
+        cache.setByteEnabled(stringCache);
+        cache.reset();
+        requests = new MimeHeaders[32];
+        for (int i = 0; i < requests.length; i++) {
+            MimeHeaders h = new MimeHeaders();
+            boolean bytes = !scenario.startsWith("strings");
+            String cookie = "session=" + i + "; prefs=" + repeat('a', scenario.equals("bytesCookie4k") ? 4070 : 100);
+            String[][] fields = {
+                {"host", "service.example.test"},
+                {
+                    "user-agent",
+                    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 Chrome/140.0.0.0 Safari/537.36"
+                },
+                {"accept", "application/json"},
+                {"accept-encoding", "gzip, deflate, br"},
+                {"accept-language", "en-US,en;q=0.9"},
+                {"connection", "keep-alive"},
+                {"traceparent", "00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01"},
+                {"tracestate", "dd=s:1;o:rum"},
+                {"authorization", "Bearer " + repeat('b', 180) + i},
+                {"cookie", cookie},
+                {"x-request-id", "request-" + i},
+                {"content-type", "application/json"}
+            };
+            for (String[] f : fields) add(h, f[0], f[1], bytes);
+            if (scenario.equals("bytesMarkers")) {
+                add(h, "X-Datadog-Endpoint-Scan", "scan-" + i, bytes);
+                add(h, TEST, "test-" + i, bytes);
+            }
+            // Model a preceding visit: conversion must not accidentally turn byte-backed headers into
+            // strings.
+            for (int k = 0; k < h.size(); k++) {
+                ExtractAdapter.messageBytesToString(h.getName(k));
+                ExtractAdapter.messageBytesToString(h.getValue(k));
+            }
+            if (bytes && h.getValue(9).getType() != MessageBytes.T_BYTES)
+                throw new AssertionError("representation changed");
+            requests[i] = h;
+        }
+        if (stringCache) {
+            // Warm eligible values as preceding propagation/application header reads would.
+            for (int pass = 0; pass < 1000; pass++) {
+                for (MimeHeaders h : requests) {
+                    for (int k = 0; k < h.size(); k++) {
+                        ExtractAdapter.messageBytesToString(h.getName(k));
+                        ExtractAdapter.messageBytesToString(h.getValue(k));
+                    }
+                }
+            }
+        }
+        for (int i = 0; i < requests.length; i++) {
+            cursor = i;
+            Tags baseline = fullScan();
+            String scan = baseline.scan;
+            String test = baseline.test;
+            cursor = i;
+            Tags candidate = targetedLookup();
+            if (!Objects.equals(scan, candidate.scan) || !Objects.equals(test, candidate.test)) {
+                throw new IllegalStateException("Marker lookup differs from full scan");
+            }
         }
-      }
+        cursor = 0;
     }
-    for (int i = 0; i < requests.length; i++) {
-      cursor = i;
-      Tags baseline = fullScan();
-      String scan = baseline.scan;
-      String test = baseline.test;
-      cursor = i;
-      Tags candidate = targetedLookup();
-      if (!Objects.equals(scan, candidate.scan) || !Objects.equals(test, candidate.test)) {
-        throw new IllegalStateException("Marker lookup differs from full scan");
-      }
+
+    static String repeat(char c, int n) {
+        char[] chars = new char[n];
+        fill(chars, c);
+        return new String(chars);
     }
-    cursor = 0;
-  }
-
-  static String repeat(char c, int n) {
-    char[] chars = new char[n];
-    fill(chars, c);
-    return new String(chars);
-  }
-
-  static void add(MimeHeaders h, String name, String value, boolean bytes) {
-    MessageBytes v;
-    if (bytes) {
-      byte[] b = name.getBytes(StandardCharsets.ISO_8859_1);
-      v = h.addValue(b, 0, b.length);
-      if (value != null) {
-        b = value.getBytes(StandardCharsets.ISO_8859_1);
-        v.setBytes(b, 0, b.length);
-      }
-    } else {
-      v = h.addValue(name);
-      if (value != null) v.setString(value);
+
+    static void add(MimeHeaders h, String name, String value, boolean bytes) {
+        MessageBytes v;
+        if (bytes) {
+            byte[] b = name.getBytes(StandardCharsets.ISO_8859_1);
+            v = h.addValue(b, 0, b.length);
+            if (value != null) {
+                b = value.getBytes(StandardCharsets.ISO_8859_1);
+                v.setBytes(b, 0, b.length);
+            }
+        } else {
+            v = h.addValue(name);
+            if (value != null) v.setString(value);
+        }
     }
-  }
-
-  MimeHeaders next() {
-    return requests[cursor++ & 31];
-  }
-
-  @Benchmark
-  public Tags fullScan() {
-    tags.scan = tags.test = null;
-    ADAPTER.forEachKey(next(), new Classifier(tags));
-    return tags;
-  }
-
-  @Benchmark
-  public Tags targetedLookup() {
-    MimeHeaders h = next();
-    tags.scan = firstValue(h, SCAN);
-    tags.test = firstValue(h, TEST);
-    return tags;
-  }
-
-  static String firstValue(MimeHeaders h, String name) {
-    for (int i = h.findHeader(name, 0); i >= 0; i = h.findHeader(name, i + 1)) {
-      String value = ExtractAdapter.messageBytesToString(h.getValue(i));
-      if (value != null) return value;
+
+    MimeHeaders next() {
+        return requests[cursor++ & 31];
     }
-    return null;
-  }
 
-  public static final class Tags {
-    String scan;
-    String test;
-  }
+    @Benchmark
+    public Tags fullScan() {
+        tags.scan = tags.test = null;
+        ADAPTER.forEachKey(next(), new Classifier(tags));
+        return tags;
+    }
 
-  static final class Classifier implements AgentPropagation.KeyClassifier {
-    final Tags tags;
-    boolean scanSeen, testSeen;
+    @Benchmark
+    public Tags targetedLookup() {
+        MimeHeaders h = next();
+        tags.scan = firstValue(h, SCAN);
+        tags.test = firstValue(h, TEST);
+        return tags;
+    }
 
-    Classifier(Tags tags) {
-      this.tags = tags;
+    static String firstValue(MimeHeaders h, String name) {
+        for (int i = h.findHeader(name, 0); i >= 0; i = h.findHeader(name, i + 1)) {
+            String value = ExtractAdapter.messageBytesToString(h.getValue(i));
+            if (value != null) return value;
+        }
+        return null;
+    }
+
+    public static final class Tags {
+        String scan;
+        String test;
     }
 
-    @Override
-    public boolean accept(String key, String value) {
-      if (key == null || value == null) return true;
-      if (!scanSeen && SCAN.equalsIgnoreCase(key)) {
-        tags.scan = value;
-        scanSeen = true;
-      } else if (!testSeen && TEST.equalsIgnoreCase(key)) {
-        tags.test = value;
-        testSeen = true;
-      }
-      return !(scanSeen && testSeen);
+    static final class Classifier implements AgentPropagation.KeyClassifier {
+        final Tags tags;
+        boolean scanSeen, testSeen;
+
+        Classifier(Tags tags) {
+            this.tags = tags;
+        }
+
+        @Override
+        public boolean accept(String key, String value) {
+            if (key == null || value == null) return true;
+            if (!scanSeen && SCAN.equalsIgnoreCase(key)) {
+                tags.scan = value;
+                scanSeen = true;
+            } else if (!testSeen && TEST.equalsIgnoreCase(key)) {
+                tags.test = value;
+                testSeen = true;
+            }
+            return !(scanSeen && testSeen);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/ExtractAdapter.java b/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/ExtractAdapter.java
index f54965e5566..8adde0af693 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/ExtractAdapter.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/ExtractAdapter.java
@@ -5,87 +5,85 @@
 import org.apache.tomcat.util.http.MimeHeaders;
 
 public abstract class ExtractAdapter<T> implements AgentPropagation.ContextVisitor<T> {
-  abstract MimeHeaders getMimeHeaders(T t);
+    abstract MimeHeaders getMimeHeaders(T t);
 
-  static String messageBytesToString(final MessageBytes messageBytes) {
-    switch (messageBytes.getType()) {
-      case MessageBytes.T_BYTES:
-        return messageBytes.getByteChunk().toString();
-      case MessageBytes.T_CHARS:
-        return messageBytes.getCharChunk().toString();
-      default:
-        return messageBytes.toString();
+    static String messageBytesToString(final MessageBytes messageBytes) {
+        switch (messageBytes.getType()) {
+            case MessageBytes.T_BYTES:
+                return messageBytes.getByteChunk().toString();
+            case MessageBytes.T_CHARS:
+                return messageBytes.getCharChunk().toString();
+            default:
+                return messageBytes.toString();
+        }
     }
-  }
 
-  @Override
-  public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-    MimeHeaders headers = getMimeHeaders(carrier);
-    if (headers == null) {
-      return;
-    }
-    for (int i = 0; i < headers.size(); ++i) {
-      MessageBytes header = headers.getName(i);
-      MessageBytes value = headers.getValue(i);
-      if (!classifier.accept(messageBytesToString(header), messageBytesToString(value))) {
-        return;
-      }
+    @Override
+    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+        MimeHeaders headers = getMimeHeaders(carrier);
+        if (headers == null) {
+            return;
+        }
+        for (int i = 0; i < headers.size(); ++i) {
+            MessageBytes header = headers.getName(i);
+            MessageBytes value = headers.getValue(i);
+            if (!classifier.accept(messageBytesToString(header), messageBytesToString(value))) {
+                return;
+            }
+        }
     }
-  }
 
-  public static final class Request extends ExtractAdapter<org.apache.coyote.Request> {
-    public static final Request GETTER = new Request();
+    public static final class Request extends ExtractAdapter<org.apache.coyote.Request> {
+        public static final Request GETTER = new Request();
 
-    @Override
-    MimeHeaders getMimeHeaders(org.apache.coyote.Request request) {
-      return request.getMimeHeaders();
+        @Override
+        MimeHeaders getMimeHeaders(org.apache.coyote.Request request) {
+            return request.getMimeHeaders();
+        }
     }
-  }
 
-  public static final class Response
-      extends ExtractAdapter<org.apache.catalina.connector.Response> {
-    public static final Response GETTER = new Response();
+    public static final class Response extends ExtractAdapter<org.apache.catalina.connector.Response> {
+        public static final Response GETTER = new Response();
 
-    @Override
-    MimeHeaders getMimeHeaders(org.apache.catalina.connector.Response response) {
-      return response.getCoyoteResponse().getMimeHeaders();
+        @Override
+        MimeHeaders getMimeHeaders(org.apache.catalina.connector.Response response) {
+            return response.getCoyoteResponse().getMimeHeaders();
+        }
     }
-  }
 
-  public static final class CoyoteResponse extends ExtractAdapter<org.apache.coyote.Response> {
-    public static final CoyoteResponse GETTER = new CoyoteResponse();
+    public static final class CoyoteResponse extends ExtractAdapter<org.apache.coyote.Response> {
+        public static final CoyoteResponse GETTER = new CoyoteResponse();
 
-    @Override
-    MimeHeaders getMimeHeaders(org.apache.coyote.Response response) {
-      return response.getMimeHeaders();
-    }
+        @Override
+        MimeHeaders getMimeHeaders(org.apache.coyote.Response response) {
+            return response.getMimeHeaders();
+        }
 
-    @Override
-    public void forEachKey(
-        org.apache.coyote.Response carrier, AgentPropagation.KeyClassifier classifier) {
-      super.forEachKey(carrier, classifier);
-      // this ExtractAdapter is called before prepareResponse() is called on the COMMIT action
-      // because
-      // we add advice to the beginning of the handling of the COMMIT action.
-      // prepareResponse() is what writes these headers into the mime headers.
-      // Unfortunately, prepareResponse() is not a good instrumentation hook point
-      // (would require custom instrumentation to report the headers after they have been written
-      // into the mime headers but before the response is committed).
-      // So we manually report these headers to AppSec. We ignore some other headers that
-      // are not relevant for AppSec. Note that this doesn't affect tracing; tracing inspects
-      // headers during Response#recycle()
-      String contentType = carrier.getContentType();
-      if (contentType != null) {
-        classifier.accept("Content-type", contentType);
-      }
-      String contentLanguage = carrier.getContentLanguage();
-      if (contentLanguage != null) {
-        classifier.accept("Content-language", contentLanguage);
-      }
-      long contentLengthLong = carrier.getContentLengthLong();
-      if (contentLengthLong != -1L) {
-        classifier.accept("Content-length", Long.toString(contentLengthLong));
-      }
+        @Override
+        public void forEachKey(org.apache.coyote.Response carrier, AgentPropagation.KeyClassifier classifier) {
+            super.forEachKey(carrier, classifier);
+            // this ExtractAdapter is called before prepareResponse() is called on the COMMIT action
+            // because
+            // we add advice to the beginning of the handling of the COMMIT action.
+            // prepareResponse() is what writes these headers into the mime headers.
+            // Unfortunately, prepareResponse() is not a good instrumentation hook point
+            // (would require custom instrumentation to report the headers after they have been written
+            // into the mime headers but before the response is committed).
+            // So we manually report these headers to AppSec. We ignore some other headers that
+            // are not relevant for AppSec. Note that this doesn't affect tracing; tracing inspects
+            // headers during Response#recycle()
+            String contentType = carrier.getContentType();
+            if (contentType != null) {
+                classifier.accept("Content-type", contentType);
+            }
+            String contentLanguage = carrier.getContentLanguage();
+            if (contentLanguage != null) {
+                classifier.accept("Content-language", contentLanguage);
+            }
+            long contentLengthLong = carrier.getContentLengthLong();
+            if (contentLengthLong != -1L) {
+                classifier.accept("Content-length", Long.toString(contentLengthLong));
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/RequestURIDataAdapter.java
index 34fe32de94b..d6c241e5ba2 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/RequestURIDataAdapter.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/RequestURIDataAdapter.java
@@ -5,44 +5,44 @@
 
 final class RequestURIDataAdapter extends URIRawDataAdapter {
 
-  private final Request request;
-
-  RequestURIDataAdapter(Request request) {
-    this.request = request;
-  }
-
-  @Override
-  public String scheme() {
-    return request.getScheme();
-  }
-
-  @Override
-  public String host() {
-    return request.getServerName();
-  }
-
-  @Override
-  public int port() {
-    return request.getServerPort();
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return request.getRequestURI();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return request.getQueryString();
-  }
-
-  @Override
-  public boolean isValid() {
-    return request.getRequestURI() != null;
-  }
+    private final Request request;
+
+    RequestURIDataAdapter(Request request) {
+        this.request = request;
+    }
+
+    @Override
+    public String scheme() {
+        return request.getScheme();
+    }
+
+    @Override
+    public String host() {
+        return request.getServerName();
+    }
+
+    @Override
+    public int port() {
+        return request.getServerPort();
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return request.getRequestURI();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    protected String innerRawQuery() {
+        return request.getQueryString();
+    }
+
+    @Override
+    public boolean isValid() {
+        return request.getRequestURI() != null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/TomcatBlockingHelper.java b/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/TomcatBlockingHelper.java
index aab5ea6f0b0..40e22af02d0 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/TomcatBlockingHelper.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/TomcatBlockingHelper.java
@@ -20,117 +20,115 @@
 import org.slf4j.LoggerFactory;
 
 public class TomcatBlockingHelper {
-  private static final Logger log = LoggerFactory.getLogger(TomcatBlockingHelper.class);
-  private static final MethodHandle GET_OUTPUT_STREAM;
-
-  static {
-    MethodHandle mh = null;
-    try {
-      Method getOutputStream = Response.class.getMethod("getOutputStream");
-      mh = MethodHandles.lookup().unreflect(getOutputStream);
-    } catch (IllegalAccessException | NoSuchMethodException e) {
-      log.error("Lookup of getOutputStream failed. Will be unable to commit blocking response");
-    }
-    GET_OUTPUT_STREAM = mh;
-  }
-
-  public static void commitBlockingResponse(
-      TraceSegment segment, Request request, Response resp, Flow.Action.RequestBlockingAction rba) {
-    commitBlockingResponse(
-        segment,
-        request,
-        resp,
-        rba.getStatusCode(),
-        rba.getBlockingContentType(),
-        rba.getExtraHeaders(),
-        rba.getSecurityResponseId());
-  }
-
-  public static boolean commitBlockingResponse(
-      TraceSegment segment,
-      Request request,
-      Response resp,
-      int statusCode,
-      BlockingContentType templateType,
-      Map<String, String> extraHeaders,
-      String securityResponseId) {
-    if (GET_OUTPUT_STREAM == null) {
-      return false;
-    }
-    int httpCode = BlockingActionHelper.getHttpCode(statusCode);
-    if (!start(resp, httpCode)) {
-      return true;
+    private static final Logger log = LoggerFactory.getLogger(TomcatBlockingHelper.class);
+    private static final MethodHandle GET_OUTPUT_STREAM;
+
+    static {
+        MethodHandle mh = null;
+        try {
+            Method getOutputStream = Response.class.getMethod("getOutputStream");
+            mh = MethodHandles.lookup().unreflect(getOutputStream);
+        } catch (IllegalAccessException | NoSuchMethodException e) {
+            log.error("Lookup of getOutputStream failed. Will be unable to commit blocking response");
+        }
+        GET_OUTPUT_STREAM = mh;
     }
 
-    // tomcat, if it sees an exception when dispatching, may set the status code to 500
-    // on the response, even if the response has already been committed
-    request.setAttribute(TomcatDecorator.DD_REAL_STATUS_CODE, httpCode);
-
-    for (Map.Entry<String, String> h : extraHeaders.entrySet()) {
-      resp.setHeader(h.getKey(), h.getValue());
+    public static void commitBlockingResponse(
+            TraceSegment segment, Request request, Response resp, Flow.Action.RequestBlockingAction rba) {
+        commitBlockingResponse(
+                segment,
+                request,
+                resp,
+                rba.getStatusCode(),
+                rba.getBlockingContentType(),
+                rba.getExtraHeaders(),
+                rba.getSecurityResponseId());
     }
 
-    try {
-      try {
-        tryWriteWithOutputStream(request, resp, templateType, securityResponseId);
-      } catch (IllegalStateException ise) {
-        tryWriteWithWriter(request, resp, templateType, securityResponseId);
-      }
-      segment.effectivelyBlocked();
-    } catch (Throwable e) {
-      log.info("Error sending error page", e);
-    }
-    return true;
-  }
-
-  private static void tryWriteWithOutputStream(
-      Request request, Response resp, BlockingContentType templateType, String securityResponseId)
-      throws Throwable {
-    OutputStream os = (OutputStream) GET_OUTPUT_STREAM.invoke(resp);
-    if (templateType != BlockingContentType.NONE) {
-      TemplateType type =
-          BlockingActionHelper.determineTemplateType(templateType, request.getHeader("Accept"));
-      byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
-
-      resp.setHeader("Content-length", Integer.toString(template.length));
-      resp.setHeader("Content-type", BlockingActionHelper.getContentType(type));
-      os.write(template);
+    public static boolean commitBlockingResponse(
+            TraceSegment segment,
+            Request request,
+            Response resp,
+            int statusCode,
+            BlockingContentType templateType,
+            Map<String, String> extraHeaders,
+            String securityResponseId) {
+        if (GET_OUTPUT_STREAM == null) {
+            return false;
+        }
+        int httpCode = BlockingActionHelper.getHttpCode(statusCode);
+        if (!start(resp, httpCode)) {
+            return true;
+        }
+
+        // tomcat, if it sees an exception when dispatching, may set the status code to 500
+        // on the response, even if the response has already been committed
+        request.setAttribute(TomcatDecorator.DD_REAL_STATUS_CODE, httpCode);
+
+        for (Map.Entry<String, String> h : extraHeaders.entrySet()) {
+            resp.setHeader(h.getKey(), h.getValue());
+        }
+
+        try {
+            try {
+                tryWriteWithOutputStream(request, resp, templateType, securityResponseId);
+            } catch (IllegalStateException ise) {
+                tryWriteWithWriter(request, resp, templateType, securityResponseId);
+            }
+            segment.effectivelyBlocked();
+        } catch (Throwable e) {
+            log.info("Error sending error page", e);
+        }
+        return true;
     }
-    os.close();
-  }
-
-  private static void tryWriteWithWriter(
-      Request request, Response resp, BlockingContentType templateType, String securityResponseId)
-      throws IOException {
-    PrintWriter writer = resp.getWriter();
-    if (templateType != BlockingContentType.NONE) {
-      TemplateType type =
-          BlockingActionHelper.determineTemplateType(templateType, request.getHeader("Accept"));
-      byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
-      String templateStr = new String(template, StandardCharsets.UTF_8);
-
-      resp.setHeader("Content-length", Integer.toString(template.length));
-      if ("utf-8".equalsIgnoreCase(resp.getCharacterEncoding())) {
-        resp.setHeader("Content-length", Integer.toString(template.length));
-      } // otherwise we don't really know the size after encoding, so don't set the header
-      resp.setHeader("Content-type", BlockingActionHelper.getContentType(type));
-      writer.write(templateStr);
+
+    private static void tryWriteWithOutputStream(
+            Request request, Response resp, BlockingContentType templateType, String securityResponseId)
+            throws Throwable {
+        OutputStream os = (OutputStream) GET_OUTPUT_STREAM.invoke(resp);
+        if (templateType != BlockingContentType.NONE) {
+            TemplateType type = BlockingActionHelper.determineTemplateType(templateType, request.getHeader("Accept"));
+            byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+
+            resp.setHeader("Content-length", Integer.toString(template.length));
+            resp.setHeader("Content-type", BlockingActionHelper.getContentType(type));
+            os.write(template);
+        }
+        os.close();
     }
-    writer.close();
-  }
 
-  private static boolean start(Response resp, int statusCode) {
-    if (resp.isCommitted()) {
-      log.warn("response already committed, we can't change it");
-      return false;
+    private static void tryWriteWithWriter(
+            Request request, Response resp, BlockingContentType templateType, String securityResponseId)
+            throws IOException {
+        PrintWriter writer = resp.getWriter();
+        if (templateType != BlockingContentType.NONE) {
+            TemplateType type = BlockingActionHelper.determineTemplateType(templateType, request.getHeader("Accept"));
+            byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+            String templateStr = new String(template, StandardCharsets.UTF_8);
+
+            resp.setHeader("Content-length", Integer.toString(template.length));
+            if ("utf-8".equalsIgnoreCase(resp.getCharacterEncoding())) {
+                resp.setHeader("Content-length", Integer.toString(template.length));
+            } // otherwise we don't really know the size after encoding, so don't set the header
+            resp.setHeader("Content-type", BlockingActionHelper.getContentType(type));
+            writer.write(templateStr);
+        }
+        writer.close();
     }
 
-    log.debug("Committing blocking response");
+    private static boolean start(Response resp, int statusCode) {
+        if (resp.isCommitted()) {
+            log.warn("response already committed, we can't change it");
+            return false;
+        }
+
+        log.debug("Committing blocking response");
 
-    resp.reset();
-    resp.getRequest().setAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE, Boolean.TRUE);
-    resp.setStatus(statusCode);
+        resp.reset();
+        resp.getRequest().setAttribute(HttpServerDecorator.DD_IGNORE_COMMIT_ATTRIBUTE, Boolean.TRUE);
+        resp.setStatus(statusCode);
 
-    return true;
-  }
+        return true;
+    }
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/TomcatDecorator.java b/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/TomcatDecorator.java
index 054d171c1ac..33bb3184ac7 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/TomcatDecorator.java
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/TomcatDecorator.java
@@ -19,188 +19,175 @@
 import org.apache.catalina.connector.Response;
 import org.apache.tomcat.util.http.MimeHeaders;
 
-public class TomcatDecorator
-    extends HttpServerDecorator<Request, Request, Response, org.apache.coyote.Request> {
-  public static final CharSequence TOMCAT_SERVER = UTF8BytesString.create("tomcat-server");
-
-  public static final TomcatDecorator DECORATE = new TomcatDecorator();
-  public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
-  public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
-  public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
-  public static final String DD_REAL_STATUS_CODE = "datadog.servlet.real_status_code";
-  public static final CharSequence SERVLET_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"tomcat"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return TOMCAT_SERVER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<org.apache.coyote.Request> getter() {
-    return ExtractAdapter.Request.GETTER;
-  }
-
-  @Override
-  protected void tagSecurityTestingHeaders(AgentSpan span, org.apache.coyote.Request request) {
-    if (request == null) {
-      return;
-    }
-    MimeHeaders headers = request.getMimeHeaders();
-    if (headers == null) {
-      return;
-    }
-    tagSecurityTestingHeader(
-        span, headers, "x-datadog-endpoint-scan", HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN);
-    tagSecurityTestingHeader(
-        span, headers, "x-datadog-security-test", HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST);
-  }
-
-  private static void tagSecurityTestingHeader(
-      AgentSpan span, MimeHeaders headers, String name, String tag) {
-    // Match names without decoding unrelated headers; retain the first non-null value.
-    for (int i = headers.findHeader(name, 0); i >= 0; i = headers.findHeader(name, i + 1)) {
-      String value = ExtractAdapter.messageBytesToString(headers.getValue(i));
-      if (value != null) {
-        span.setTag(tag, value);
-        return;
-      }
-    }
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Response> responseGetter() {
-    return ExtractAdapter.Response.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return SERVLET_REQUEST;
-  }
-
-  @Override
-  protected String method(final Request request) {
-    return request.getMethod();
-  }
-
-  @Override
-  protected URIDataAdapter url(final Request request) {
-    return new RequestURIDataAdapter(request);
-  }
-
-  @Override
-  protected String peerHostIP(final Request request) {
-    return request.getRemoteAddr();
-  }
-
-  @Override
-  protected int peerPort(final Request request) {
-    return request.getRemotePort();
-  }
-
-  @Override
-  protected String getRequestHeader(final Request request, String key) {
-    return request.getHeader(key);
-  }
-
-  @Override
-  protected int status(final Response response) {
-    int status = response.getStatus();
-    if (status == 500) {
-      Integer savedStatus = (Integer) response.getRequest().getAttribute(DD_REAL_STATUS_CODE);
-      if (savedStatus != null) {
-        return savedStatus;
-      }
-    }
-    return status;
-  }
-
-  @Override
-  protected String requestedSessionId(final Request request) {
-    return request.getRequestedSessionId();
-  }
-
-  @Override
-  protected void doOnRequest(
-      final AgentSpan span,
-      final Request connection,
-      final Request request,
-      final Context parentContext) {
-    if (request != null) {
-      String contextPath = request.getContextPath();
-      String servletPath = request.getServletPath();
-
-      if (null == contextPath || contextPath.isEmpty()) {
-        contextPath = "/";
-      }
-      span.setTag("servlet.context", contextPath);
-      if (null != servletPath && !servletPath.isEmpty()) {
-        span.setTag("servlet.path", servletPath);
-      }
-
-      // Used by AsyncContextInstrumentation because the context path may be reset
-      // by the time the async context is dispatched.
-      request.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, contextPath);
-      request.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, servletPath);
-    }
-    super.doOnRequest(span, connection, request, parentContext);
-  }
-
-  @Override
-  protected boolean isAppSecOnResponseSeparate() {
-    return true;
-  }
-
-  @Override
-  protected void doOnResponse(AgentSpan span, Response response) {
-    Request req = response.getRequest();
-    if (Config.get().isServletPrincipalEnabled() && req.getUserPrincipal() != null) {
-      span.setTag(DDTags.USER_NAME, req.getUserPrincipal().getName());
-    }
-    Object throwable = req.getAttribute("javax.servlet.error.exception");
-    if (throwable == null) {
-      // Servlet 4+ (Tomcat 10+)
-      throwable = req.getAttribute("jakarta.servlet.error.exception");
-    }
-    if (throwable instanceof Throwable) {
-      onError(span, (Throwable) throwable);
-    }
-    super.doOnResponse(span, response);
-  }
-
-  @Override
-  protected BlockResponseFunction createBlockResponseFunction(
-      final Request request, Request connection) {
-    return new TomcatBlockResponseFunction(request);
-  }
-
-  public static class TomcatBlockResponseFunction implements BlockResponseFunction {
-    private final Request request;
-
-    public TomcatBlockResponseFunction(Request request) {
-      this.request = request;
-    }
-
-    @Override
-    public boolean tryCommitBlockingResponse(
-        TraceSegment segment,
-        int statusCode,
-        BlockingContentType bct,
-        Map<String, String> extraHeaders,
-        String securityResponseId) {
-      return TomcatBlockingHelper.commitBlockingResponse(
-          segment,
-          request,
-          request.getResponse(),
-          statusCode,
-          bct,
-          extraHeaders,
-          securityResponseId);
-    }
-  }
+public class TomcatDecorator extends HttpServerDecorator<Request, Request, Response, org.apache.coyote.Request> {
+    public static final CharSequence TOMCAT_SERVER = UTF8BytesString.create("tomcat-server");
+
+    public static final TomcatDecorator DECORATE = new TomcatDecorator();
+    public static final String DD_PARENT_CONTEXT_ATTRIBUTE = "datadog.parent-context";
+    public static final String DD_CONTEXT_PATH_ATTRIBUTE = "datadog.context.path";
+    public static final String DD_SERVLET_PATH_ATTRIBUTE = "datadog.servlet.path";
+    public static final String DD_REAL_STATUS_CODE = "datadog.servlet.real_status_code";
+    public static final CharSequence SERVLET_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"tomcat"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return TOMCAT_SERVER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<org.apache.coyote.Request> getter() {
+        return ExtractAdapter.Request.GETTER;
+    }
+
+    @Override
+    protected void tagSecurityTestingHeaders(AgentSpan span, org.apache.coyote.Request request) {
+        if (request == null) {
+            return;
+        }
+        MimeHeaders headers = request.getMimeHeaders();
+        if (headers == null) {
+            return;
+        }
+        tagSecurityTestingHeader(
+                span, headers, "x-datadog-endpoint-scan", HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN);
+        tagSecurityTestingHeader(
+                span, headers, "x-datadog-security-test", HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST);
+    }
+
+    private static void tagSecurityTestingHeader(AgentSpan span, MimeHeaders headers, String name, String tag) {
+        // Match names without decoding unrelated headers; retain the first non-null value.
+        for (int i = headers.findHeader(name, 0); i >= 0; i = headers.findHeader(name, i + 1)) {
+            String value = ExtractAdapter.messageBytesToString(headers.getValue(i));
+            if (value != null) {
+                span.setTag(tag, value);
+                return;
+            }
+        }
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<Response> responseGetter() {
+        return ExtractAdapter.Response.GETTER;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return SERVLET_REQUEST;
+    }
+
+    @Override
+    protected String method(final Request request) {
+        return request.getMethod();
+    }
+
+    @Override
+    protected URIDataAdapter url(final Request request) {
+        return new RequestURIDataAdapter(request);
+    }
+
+    @Override
+    protected String peerHostIP(final Request request) {
+        return request.getRemoteAddr();
+    }
+
+    @Override
+    protected int peerPort(final Request request) {
+        return request.getRemotePort();
+    }
+
+    @Override
+    protected String getRequestHeader(final Request request, String key) {
+        return request.getHeader(key);
+    }
+
+    @Override
+    protected int status(final Response response) {
+        int status = response.getStatus();
+        if (status == 500) {
+            Integer savedStatus = (Integer) response.getRequest().getAttribute(DD_REAL_STATUS_CODE);
+            if (savedStatus != null) {
+                return savedStatus;
+            }
+        }
+        return status;
+    }
+
+    @Override
+    protected String requestedSessionId(final Request request) {
+        return request.getRequestedSessionId();
+    }
+
+    @Override
+    protected void doOnRequest(
+            final AgentSpan span, final Request connection, final Request request, final Context parentContext) {
+        if (request != null) {
+            String contextPath = request.getContextPath();
+            String servletPath = request.getServletPath();
+
+            if (null == contextPath || contextPath.isEmpty()) {
+                contextPath = "/";
+            }
+            span.setTag("servlet.context", contextPath);
+            if (null != servletPath && !servletPath.isEmpty()) {
+                span.setTag("servlet.path", servletPath);
+            }
+
+            // Used by AsyncContextInstrumentation because the context path may be reset
+            // by the time the async context is dispatched.
+            request.setAttribute(DD_CONTEXT_PATH_ATTRIBUTE, contextPath);
+            request.setAttribute(DD_SERVLET_PATH_ATTRIBUTE, servletPath);
+        }
+        super.doOnRequest(span, connection, request, parentContext);
+    }
+
+    @Override
+    protected boolean isAppSecOnResponseSeparate() {
+        return true;
+    }
+
+    @Override
+    protected void doOnResponse(AgentSpan span, Response response) {
+        Request req = response.getRequest();
+        if (Config.get().isServletPrincipalEnabled() && req.getUserPrincipal() != null) {
+            span.setTag(DDTags.USER_NAME, req.getUserPrincipal().getName());
+        }
+        Object throwable = req.getAttribute("javax.servlet.error.exception");
+        if (throwable == null) {
+            // Servlet 4+ (Tomcat 10+)
+            throwable = req.getAttribute("jakarta.servlet.error.exception");
+        }
+        if (throwable instanceof Throwable) {
+            onError(span, (Throwable) throwable);
+        }
+        super.doOnResponse(span, response);
+    }
+
+    @Override
+    protected BlockResponseFunction createBlockResponseFunction(final Request request, Request connection) {
+        return new TomcatBlockResponseFunction(request);
+    }
+
+    public static class TomcatBlockResponseFunction implements BlockResponseFunction {
+        private final Request request;
+
+        public TomcatBlockResponseFunction(Request request) {
+            this.request = request;
+        }
+
+        @Override
+        public boolean tryCommitBlockingResponse(
+                TraceSegment segment,
+                int statusCode,
+                BlockingContentType bct,
+                Map<String, String> extraHeaders,
+                String securityResponseId) {
+            return TomcatBlockingHelper.commitBlockingResponse(
+                    segment, request, request.getResponse(), statusCode, bct, extraHeaders, securityResponseId);
+        }
+    }
 }
diff --git a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/SpanFinishingCallback.java b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/SpanFinishingCallback.java
index fc3df1ded5a..e96bd902392 100644
--- a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/SpanFinishingCallback.java
+++ b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/SpanFinishingCallback.java
@@ -11,24 +11,24 @@
  */
 public class SpanFinishingCallback implements FutureCallback {
 
-  /** Span that we should finish and annotate when the future is complete. */
-  private final AgentSpan span;
+    /** Span that we should finish and annotate when the future is complete. */
+    private final AgentSpan span;
 
-  public SpanFinishingCallback(final AgentSpan span) {
-    this.span = span;
-  }
+    public SpanFinishingCallback(final AgentSpan span) {
+        this.span = span;
+    }
 
-  @Override
-  public void onSuccess(final Object result) {
-    DECORATE.beforeFinish(span);
-    DECORATE.onResult(span, result);
-    span.finish();
-  }
+    @Override
+    public void onSuccess(final Object result) {
+        DECORATE.beforeFinish(span);
+        DECORATE.onResult(span, result);
+        span.finish();
+    }
 
-  @Override
-  public void onFailure(final Throwable t) {
-    DECORATE.onError(span, t);
-    DECORATE.beforeFinish(span);
-    span.finish();
-  }
+    @Override
+    public void onFailure(final Throwable t) {
+        DECORATE.onError(span, t);
+        DECORATE.beforeFinish(span);
+        span.finish();
+    }
 }
diff --git a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java
index 34d07c06d45..a61ee835c4b 100644
--- a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java
+++ b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java
@@ -29,106 +29,105 @@
 /** Instrument the Twilio SDK to identify calls as a seperate service. */
 @AutoService(InstrumenterModule.class)
 public class TwilioAsyncInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public TwilioAsyncInstrumentation() {
-    super("twilio-sdk");
-  }
+    public TwilioAsyncInstrumentation() {
+        super("twilio-sdk");
+    }
 
-  @Override
-  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // Only apply instrumentation when guava's ListenableFuture is also deployed.
-    return hasClassNamed("com.google.common.util.concurrent.ListenableFuture");
-  }
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        // Only apply instrumentation when guava's ListenableFuture is also deployed.
+        return hasClassNamed("com.google.common.util.concurrent.ListenableFuture");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "com.twilio.base.Resource"; // implies existence of Twilio service classes
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "com.twilio.base.Resource"; // implies existence of Twilio service classes
+    }
 
-  /** Match any child class of the base Twilio service classes. */
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(
-        namedOneOf(
-            "com.twilio.base.Creator",
-            "com.twilio.base.Deleter",
-            "com.twilio.base.Fetcher",
-            "com.twilio.base.Reader",
-            "com.twilio.base.Updater"));
-  }
+    /** Match any child class of the base Twilio service classes. */
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(namedOneOf(
+                "com.twilio.base.Creator",
+                "com.twilio.base.Deleter",
+                "com.twilio.base.Fetcher",
+                "com.twilio.base.Reader",
+                "com.twilio.base.Updater"));
+    }
 
-  /** Return the helper classes which will be available for use in instrumentation. */
+    /** Return the helper classes which will be available for use in instrumentation. */
 
-  /** Return bytebuddy transformers for instrumenting the Twilio SDK. */
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    /*
-       We are listing out the main service calls on the Creator, Deleter, Fetcher, Reader, and
-       Updater abstract classes. The isDeclaredBy() matcher did not work in the unit tests and
-       we found that there were certain methods declared on the base class (particularly Reader),
-       which we weren't interested in annotating.
-    */
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("createAsync", "deleteAsync", "readAsync", "fetchAsync", "updateAsync"))
-            .and(isPublic())
-            .and(returns(named("com.google.common.util.concurrent.ListenableFuture"))),
-        TwilioAsyncInstrumentation.class.getName() + "$TwilioClientAsyncAdvice");
-  }
+    /** Return bytebuddy transformers for instrumenting the Twilio SDK. */
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        /*
+           We are listing out the main service calls on the Creator, Deleter, Fetcher, Reader, and
+           Updater abstract classes. The isDeclaredBy() matcher did not work in the unit tests and
+           we found that there were certain methods declared on the base class (particularly Reader),
+           which we weren't interested in annotating.
+        */
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("createAsync", "deleteAsync", "readAsync", "fetchAsync", "updateAsync"))
+                        .and(isPublic())
+                        .and(returns(named("com.google.common.util.concurrent.ListenableFuture"))),
+                TwilioAsyncInstrumentation.class.getName() + "$TwilioClientAsyncAdvice");
+    }
 
-  /** Advice for instrumenting Twilio service classes. */
-  public static class TwilioClientAsyncAdvice {
+    /** Advice for instrumenting Twilio service classes. */
+    public static class TwilioClientAsyncAdvice {
 
-    /** Method entry instrumentation. */
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.This final Object that, @Advice.Origin("#m") final String methodName) {
+        /** Method entry instrumentation. */
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.This final Object that, @Advice.Origin("#m") final String methodName) {
 
-      // Ensure that we only create a span for the top-level Twilio client method; except in the
-      // case of async operations where we want visibility into how long the task was delayed from
-      // starting. Our call depth checker does not span threads, so the async case is handled
-      // automatically for us.
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Twilio.class);
-      if (callDepth > 0) {
-        return null;
-      }
+            // Ensure that we only create a span for the top-level Twilio client method; except in the
+            // case of async operations where we want visibility into how long the task was delayed from
+            // starting. Our call depth checker does not span threads, so the async case is handled
+            // automatically for us.
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Twilio.class);
+            if (callDepth > 0) {
+                return null;
+            }
 
-      // Don't automatically close the span with the scope if we're executing an async method
-      final AgentSpan span = startSpan("twilio-sdk", TWILIO_SDK);
-      DECORATE.afterStart(span);
-      DECORATE.onServiceExecution(span, that, methodName);
+            // Don't automatically close the span with the scope if we're executing an async method
+            final AgentSpan span = startSpan("twilio-sdk", TWILIO_SDK);
+            DECORATE.afterStart(span);
+            DECORATE.onServiceExecution(span, that, methodName);
 
-      // Enable async propagation, so the newly spawned task will be associated back with this
-      // original trace.
-      return activateSpan(span);
-    }
+            // Enable async propagation, so the newly spawned task will be associated back with this
+            // original trace.
+            return activateSpan(span);
+        }
 
-    /** Method exit instrumentation. */
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return final ListenableFuture response) {
-      if (scope == null) {
-        return;
-      }
-      // If we have a scope (i.e. we were the top-level Twilio SDK invocation),
-      final AgentSpan span = spanFromScope(scope);
-      if (throwable != null) {
-        // There was a synchronous error,
-        // which means we shouldn't wait for a callback to close the span.
-        DECORATE.onError(span, throwable);
-        DECORATE.beforeFinish(span);
-        scope.close();
-        span.finish();
-      } else {
-        // We're calling an async operation, we still need to finish the span when it's
-        // complete and report the results; set an appropriate callback
-        Futures.addCallback(response, new SpanFinishingCallback(span), Twilio.getExecutorService());
-        scope.close();
-      }
-      CallDepthThreadLocalMap.reset(Twilio.class); // reset call depth count
+        /** Method exit instrumentation. */
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return final ListenableFuture response) {
+            if (scope == null) {
+                return;
+            }
+            // If we have a scope (i.e. we were the top-level Twilio SDK invocation),
+            final AgentSpan span = spanFromScope(scope);
+            if (throwable != null) {
+                // There was a synchronous error,
+                // which means we shouldn't wait for a callback to close the span.
+                DECORATE.onError(span, throwable);
+                DECORATE.beforeFinish(span);
+                scope.close();
+                span.finish();
+            } else {
+                // We're calling an async operation, we still need to finish the span when it's
+                // complete and report the results; set an appropriate callback
+                Futures.addCallback(response, new SpanFinishingCallback(span), Twilio.getExecutorService());
+                scope.close();
+            }
+            CallDepthThreadLocalMap.reset(Twilio.class); // reset call depth count
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioClientDecorator.java b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioClientDecorator.java
index 4be5ea0c542..23a9d9172ae 100644
--- a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioClientDecorator.java
+++ b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioClientDecorator.java
@@ -19,126 +19,121 @@
 /** Decorate Twilio span's with relevant contextual information. */
 public class TwilioClientDecorator extends ClientDecorator {
 
-  private static final Logger log = LoggerFactory.getLogger(TwilioClientDecorator.class);
+    private static final Logger log = LoggerFactory.getLogger(TwilioClientDecorator.class);
 
-  public static final CharSequence TWILIO_SDK = UTF8BytesString.create("twilio.sdk");
+    public static final CharSequence TWILIO_SDK = UTF8BytesString.create("twilio.sdk");
 
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("twilio-sdk");
+    private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("twilio-sdk");
 
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().allowInferredServices()
-          ? COMPONENT_NAME.toString()
-          : null;
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().allowInferredServices() ? COMPONENT_NAME.toString() : null;
 
-  private static final QualifiedClassNameCache NAMES =
-      new QualifiedClassNameCache(
-          new Function<Class<?>, CharSequence>() {
-            @Override
-            // Drop common package prefix (com.twilio.rest)
-            public String apply(Class<?> input) {
-              return input.getCanonicalName().substring("com.twilio.rest.".length());
-            }
-          },
-          Functions.PrefixJoin.of("."));
-
-  public static final TwilioClientDecorator DECORATE = new TwilioClientDecorator();
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.HTTP_CLIENT;
-  }
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {COMPONENT_NAME.toString()};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  /** Decorate trace based on service execution metadata. */
-  public void onServiceExecution(
-      final AgentSpan span, final Object serviceExecutor, final String methodName) {
-    span.setResourceName(NAMES.getQualifiedName(serviceExecutor.getClass(), methodName));
-  }
-
-  /** Annotate the span with the results of the operation. */
-  public final void onResult(final AgentSpan span, Object result) {
-    try {
-      doOnResult(span, result);
-    } catch (Throwable t) {
-      log.debug("Failed to decorate span on result", t);
+    private static final QualifiedClassNameCache NAMES = new QualifiedClassNameCache(
+            new Function<Class<?>, CharSequence>() {
+                @Override
+                // Drop common package prefix (com.twilio.rest)
+                public String apply(Class<?> input) {
+                    return input.getCanonicalName().substring("com.twilio.rest.".length());
+                }
+            },
+            Functions.PrefixJoin.of("."));
+
+    public static final TwilioClientDecorator DECORATE = new TwilioClientDecorator();
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.HTTP_CLIENT;
+    }
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {COMPONENT_NAME.toString()};
     }
-  }
 
-  protected void doOnResult(final AgentSpan span, Object result) {
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
 
-    // Unwrap ListenableFuture (if present)
-    if (result instanceof ListenableFuture) {
-      try {
-        result = ((ListenableFuture) result).get(0, TimeUnit.MICROSECONDS);
-      } catch (final Exception e) {
-        log.debug("Error unwrapping result", e);
-      }
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
     }
 
-    // Nothing to do here, so return
-    if (result == null) {
-      return;
+    /** Decorate trace based on service execution metadata. */
+    public void onServiceExecution(final AgentSpan span, final Object serviceExecutor, final String methodName) {
+        span.setResourceName(NAMES.getQualifiedName(serviceExecutor.getClass(), methodName));
     }
 
-    // Provide helpful metadata for some of the more common response types
-    span.setTag("twilio.type", result.getClass().getCanonicalName());
-
-    // Instrument the most popular resource types directly
-    if (result instanceof Message) {
-      final Message message = (Message) result;
-      span.setTag("twilio.account", message.getAccountSid());
-      span.setTag("twilio.sid", message.getSid());
-      if (message.getStatus() != null) {
-        span.setTag("twilio.status", message.getStatus().toString());
-      }
-    } else if (result instanceof Call) {
-      final Call call = (Call) result;
-      span.setTag("twilio.account", call.getAccountSid());
-      span.setTag("twilio.sid", call.getSid());
-      span.setTag("twilio.parentSid", call.getParentCallSid());
-      if (call.getStatus() != null) {
-        span.setTag("twilio.status", call.getStatus().toString());
-      }
-    } else {
-      // Use reflection to gather insight from other types; note that Twilio requests take close to
-      // 1 second, so the added hit from reflection here is relatively minimal in the grand scheme
-      // of things
-      setTagIfPresent(span, result, "twilio.sid", "getSid");
-      setTagIfPresent(span, result, "twilio.account", "getAccountSid");
-      setTagIfPresent(span, result, "twilio.status", "getStatus");
+    /** Annotate the span with the results of the operation. */
+    public final void onResult(final AgentSpan span, Object result) {
+        try {
+            doOnResult(span, result);
+        } catch (Throwable t) {
+            log.debug("Failed to decorate span on result", t);
+        }
     }
-  }
-
-  /**
-   * Helper method for calling a getter using reflection. This will be slow, so only use when
-   * required.
-   */
-  private void setTagIfPresent(
-      final AgentSpan span, final Object result, final String tag, final String getter) {
-    try {
-      final Method method = result.getClass().getMethod(getter);
-      final Object value = method.invoke(result);
-
-      if (value != null) {
-        span.setTag(tag, value.toString());
-      }
-
-    } catch (final Exception e) {
-      // Expected that this won't work for all result types
+
+    protected void doOnResult(final AgentSpan span, Object result) {
+
+        // Unwrap ListenableFuture (if present)
+        if (result instanceof ListenableFuture) {
+            try {
+                result = ((ListenableFuture) result).get(0, TimeUnit.MICROSECONDS);
+            } catch (final Exception e) {
+                log.debug("Error unwrapping result", e);
+            }
+        }
+
+        // Nothing to do here, so return
+        if (result == null) {
+            return;
+        }
+
+        // Provide helpful metadata for some of the more common response types
+        span.setTag("twilio.type", result.getClass().getCanonicalName());
+
+        // Instrument the most popular resource types directly
+        if (result instanceof Message) {
+            final Message message = (Message) result;
+            span.setTag("twilio.account", message.getAccountSid());
+            span.setTag("twilio.sid", message.getSid());
+            if (message.getStatus() != null) {
+                span.setTag("twilio.status", message.getStatus().toString());
+            }
+        } else if (result instanceof Call) {
+            final Call call = (Call) result;
+            span.setTag("twilio.account", call.getAccountSid());
+            span.setTag("twilio.sid", call.getSid());
+            span.setTag("twilio.parentSid", call.getParentCallSid());
+            if (call.getStatus() != null) {
+                span.setTag("twilio.status", call.getStatus().toString());
+            }
+        } else {
+            // Use reflection to gather insight from other types; note that Twilio requests take close to
+            // 1 second, so the added hit from reflection here is relatively minimal in the grand scheme
+            // of things
+            setTagIfPresent(span, result, "twilio.sid", "getSid");
+            setTagIfPresent(span, result, "twilio.account", "getAccountSid");
+            setTagIfPresent(span, result, "twilio.status", "getStatus");
+        }
+    }
+
+    /**
+     * Helper method for calling a getter using reflection. This will be slow, so only use when
+     * required.
+     */
+    private void setTagIfPresent(final AgentSpan span, final Object result, final String tag, final String getter) {
+        try {
+            final Method method = result.getClass().getMethod(getter);
+            final Object value = method.invoke(result);
+
+            if (value != null) {
+                span.setTag(tag, value.toString());
+            }
+
+        } catch (final Exception e) {
+            // Expected that this won't work for all result types
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java
index f74bea7f85f..4a6db225a63 100644
--- a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java
+++ b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java
@@ -24,87 +24,86 @@
 /** Instrument the Twilio SDK to identify calls as a seperate service. */
 @AutoService(InstrumenterModule.class)
 public class TwilioSyncInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public TwilioSyncInstrumentation() {
-    super("twilio-sdk");
-  }
+    public TwilioSyncInstrumentation() {
+        super("twilio-sdk");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "com.twilio.base.Resource"; // implies existence of Twilio service classes
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "com.twilio.base.Resource"; // implies existence of Twilio service classes
+    }
 
-  /** Match any child class of the base Twilio service classes. */
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(
-        namedOneOf(
-            "com.twilio.base.Creator",
-            "com.twilio.base.Deleter",
-            "com.twilio.base.Fetcher",
-            "com.twilio.base.Reader",
-            "com.twilio.base.Updater"));
-  }
+    /** Match any child class of the base Twilio service classes. */
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(namedOneOf(
+                "com.twilio.base.Creator",
+                "com.twilio.base.Deleter",
+                "com.twilio.base.Fetcher",
+                "com.twilio.base.Reader",
+                "com.twilio.base.Updater"));
+    }
 
-  /** Return the helper classes which will be available for use in instrumentation. */
+    /** Return the helper classes which will be available for use in instrumentation. */
 
-  /** Return bytebuddy transformers for instrumenting the Twilio SDK. */
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    /*
-       We are listing out the main service calls on the Creator, Deleter, Fetcher, Reader, and
-       Updater abstract classes. The isDeclaredBy() matcher did not work in the unit tests and
-       we found that there were certain methods declared on the base class (particularly Reader),
-       which we weren't interested in annotating.
-    */
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(namedOneOf("create", "delete", "read", "fetch", "update")),
-        TwilioSyncInstrumentation.class.getName() + "$TwilioClientAdvice");
-  }
+    /** Return bytebuddy transformers for instrumenting the Twilio SDK. */
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        /*
+           We are listing out the main service calls on the Creator, Deleter, Fetcher, Reader, and
+           Updater abstract classes. The isDeclaredBy() matcher did not work in the unit tests and
+           we found that there were certain methods declared on the base class (particularly Reader),
+           which we weren't interested in annotating.
+        */
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(namedOneOf("create", "delete", "read", "fetch", "update")),
+                TwilioSyncInstrumentation.class.getName() + "$TwilioClientAdvice");
+    }
 
-  /** Advice for instrumenting Twilio service classes. */
-  public static class TwilioClientAdvice {
+    /** Advice for instrumenting Twilio service classes. */
+    public static class TwilioClientAdvice {
 
-    /** Method entry instrumentation. */
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope methodEnter(
-        @Advice.This final Object that, @Advice.Origin("#m") final String methodName) {
+        /** Method entry instrumentation. */
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope methodEnter(
+                @Advice.This final Object that, @Advice.Origin("#m") final String methodName) {
 
-      // Ensure that we only create a span for the top-level Twilio client method; except in the
-      // case of async operations where we want visibility into how long the task was delayed from
-      // starting. Our call depth checker does not span threads, so the async case is handled
-      // automatically for us.
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Twilio.class);
-      if (callDepth > 0) {
-        return null;
-      }
+            // Ensure that we only create a span for the top-level Twilio client method; except in the
+            // case of async operations where we want visibility into how long the task was delayed from
+            // starting. Our call depth checker does not span threads, so the async case is handled
+            // automatically for us.
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Twilio.class);
+            if (callDepth > 0) {
+                return null;
+            }
 
-      final AgentSpan span = startSpan("twilio-sdk", TWILIO_SDK);
-      DECORATE.afterStart(span);
-      DECORATE.onServiceExecution(span, that, methodName);
+            final AgentSpan span = startSpan("twilio-sdk", TWILIO_SDK);
+            DECORATE.afterStart(span);
+            DECORATE.onServiceExecution(span, that, methodName);
 
-      return activateSpan(span);
-    }
+            return activateSpan(span);
+        }
 
-    /** Method exit instrumentation. */
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return final Object response) {
-      if (scope == null) {
-        return;
-      }
+        /** Method exit instrumentation. */
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void methodExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return final Object response) {
+            if (scope == null) {
+                return;
+            }
 
-      // If we have a scope (i.e. we were the top-level Twilio SDK invocation),
-      final AgentSpan span = spanFromScope(scope);
-      DECORATE.onResult(span, response);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
-      CallDepthThreadLocalMap.reset(Twilio.class); // reset call depth count
+            // If we have a scope (i.e. we were the top-level Twilio SDK invocation),
+            final AgentSpan span = spanFromScope(scope);
+            DECORATE.onResult(span, response);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+            CallDepthThreadLocalMap.reset(Twilio.class); // reset call depth count
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/unbescape-1.1/src/main/java/datadog/trace/instrumentation/unbescape/EscapeUtilsCallSite.java b/dd-java-agent/instrumentation/unbescape-1.1/src/main/java/datadog/trace/instrumentation/unbescape/EscapeUtilsCallSite.java
index 36011915102..6537edd86e4 100644
--- a/dd-java-agent/instrumentation/unbescape-1.1/src/main/java/datadog/trace/instrumentation/unbescape/EscapeUtilsCallSite.java
+++ b/dd-java-agent/instrumentation/unbescape-1.1/src/main/java/datadog/trace/instrumentation/unbescape/EscapeUtilsCallSite.java
@@ -12,24 +12,23 @@
 @CallSite(spi = IastCallSites.class)
 public class EscapeUtilsCallSite {
 
-  @CallSite.After("java.lang.String org.unbescape.html.HtmlEscape.escapeHtml4Xml(java.lang.String)")
-  @CallSite.After("java.lang.String org.unbescape.html.HtmlEscape.escapeHtml4(java.lang.String)")
-  @CallSite.After("java.lang.String org.unbescape.html.HtmlEscape.escapeHtml5Xml(java.lang.String)")
-  @CallSite.After("java.lang.String org.unbescape.html.HtmlEscape.escapeHtml5(java.lang.String)")
-  @CallSite.After(
-      "java.lang.String org.unbescape.javascript.JavaScriptEscape.escapeJavaScript(java.lang.String)")
-  public static String afterEscape(
-      @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
-    if (input != null && result != null) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        try {
-          module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("afterEscape threw", e);
+    @CallSite.After("java.lang.String org.unbescape.html.HtmlEscape.escapeHtml4Xml(java.lang.String)")
+    @CallSite.After("java.lang.String org.unbescape.html.HtmlEscape.escapeHtml4(java.lang.String)")
+    @CallSite.After("java.lang.String org.unbescape.html.HtmlEscape.escapeHtml5Xml(java.lang.String)")
+    @CallSite.After("java.lang.String org.unbescape.html.HtmlEscape.escapeHtml5(java.lang.String)")
+    @CallSite.After("java.lang.String org.unbescape.javascript.JavaScriptEscape.escapeJavaScript(java.lang.String)")
+    public static String afterEscape(
+            @CallSite.Argument(0) @Nullable final String input, @CallSite.Return final String result) {
+        if (input != null && result != null) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                try {
+                    module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
+                } catch (final Throwable e) {
+                    module.onUnexpectedException("afterEscape threw", e);
+                }
+            }
         }
-      }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/unbescape-1.1/src/test/java/foo/bar/TestEscapeUtilsSuite.java b/dd-java-agent/instrumentation/unbescape-1.1/src/test/java/foo/bar/TestEscapeUtilsSuite.java
index f917c2ea09f..a26f708d65c 100644
--- a/dd-java-agent/instrumentation/unbescape-1.1/src/test/java/foo/bar/TestEscapeUtilsSuite.java
+++ b/dd-java-agent/instrumentation/unbescape-1.1/src/test/java/foo/bar/TestEscapeUtilsSuite.java
@@ -5,23 +5,23 @@
 
 public class TestEscapeUtilsSuite {
 
-  public static String escapeHtml4Xml(String input) {
-    return HtmlEscape.escapeHtml4Xml(input);
-  }
+    public static String escapeHtml4Xml(String input) {
+        return HtmlEscape.escapeHtml4Xml(input);
+    }
 
-  public static String escapeHtml4(String input) {
-    return HtmlEscape.escapeHtml4(input);
-  }
+    public static String escapeHtml4(String input) {
+        return HtmlEscape.escapeHtml4(input);
+    }
 
-  public static String escapeHtml5(String input) {
-    return HtmlEscape.escapeHtml5(input);
-  }
+    public static String escapeHtml5(String input) {
+        return HtmlEscape.escapeHtml5(input);
+    }
 
-  public static String escapeHtml5Xml(String input) {
-    return HtmlEscape.escapeHtml5Xml(input);
-  }
+    public static String escapeHtml5Xml(String input) {
+        return HtmlEscape.escapeHtml5Xml(input);
+    }
 
-  public static String escapeJavaScript(String input) {
-    return JavaScriptEscape.escapeJavaScript(input);
-  }
+    public static String escapeJavaScript(String input) {
+        return JavaScriptEscape.escapeJavaScript(input);
+    }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/ExchangeEndSpanListener.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/ExchangeEndSpanListener.java
index 41bca412c5c..1704a36df7a 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/ExchangeEndSpanListener.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/ExchangeEndSpanListener.java
@@ -12,32 +12,32 @@
 import io.undertow.server.HttpServerExchange;
 
 public class ExchangeEndSpanListener implements ExchangeCompletionListener {
-  public static final ExchangeEndSpanListener INSTANCE = new ExchangeEndSpanListener();
+    public static final ExchangeEndSpanListener INSTANCE = new ExchangeEndSpanListener();
 
-  private ExchangeEndSpanListener() {}
+    private ExchangeEndSpanListener() {}
 
-  @Override
-  public void exchangeEvent(HttpServerExchange exchange, NextListener nextListener) {
-    ContextContinuation continuation = exchange.getAttachment(DATADOG_UNDERTOW_CONTINUATION);
-    if (continuation == null) {
-      return;
-    }
+    @Override
+    public void exchangeEvent(HttpServerExchange exchange, NextListener nextListener) {
+        ContextContinuation continuation = exchange.getAttachment(DATADOG_UNDERTOW_CONTINUATION);
+        if (continuation == null) {
+            return;
+        }
 
-    Context context = continuation.context();
-    AgentSpan span = fromContext(context);
-    if (span != null) {
-      Throwable throwable = exchange.getAttachment(DefaultResponseListener.EXCEPTION);
-      if (throwable != null) {
-        DECORATE.onError(span, throwable);
-      }
-      DECORATE.onResponse(span, exchange);
-      DECORATE.beforeFinish(context);
-      span.finish();
-    } else {
-      DECORATE.beforeFinish(context);
-    }
+        Context context = continuation.context();
+        AgentSpan span = fromContext(context);
+        if (span != null) {
+            Throwable throwable = exchange.getAttachment(DefaultResponseListener.EXCEPTION);
+            if (throwable != null) {
+                DECORATE.onError(span, throwable);
+            }
+            DECORATE.onResponse(span, exchange);
+            DECORATE.beforeFinish(context);
+            span.finish();
+        } else {
+            DECORATE.beforeFinish(context);
+        }
 
-    continuation.release();
-    nextListener.proceed();
-  }
+        continuation.release();
+        nextListener.proceed();
+    }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataContentHelper.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataContentHelper.java
index 9901a9b67b9..f73c8fbb4f3 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataContentHelper.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataContentHelper.java
@@ -17,83 +17,83 @@
 
 public final class FormDataContentHelper {
 
-  private static final Logger log = LoggerFactory.getLogger(FormDataContentHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(FormDataContentHelper.class);
 
-  public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
-  public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
+    public static final int MAX_CONTENT_BYTES = Config.get().getAppSecMaxFileContentBytes();
+    public static final int MAX_FILES_TO_INSPECT = Config.get().getAppSecMaxFileContentCount();
 
-  // Undertow 2.2+ added getFileItem() to FormValue for in-memory uploads.
-  // In 2.0 all uploads are always on disk so getPath() suffices.
-  private static final Method GET_FILE_ITEM;
-  private static final Method FILE_ITEM_GET_INPUT_STREAM;
+    // Undertow 2.2+ added getFileItem() to FormValue for in-memory uploads.
+    // In 2.0 all uploads are always on disk so getPath() suffices.
+    private static final Method GET_FILE_ITEM;
+    private static final Method FILE_ITEM_GET_INPUT_STREAM;
 
-  static {
-    Method gfi = null;
-    Method gis = null;
-    try {
-      gfi = FormData.FormValue.class.getMethod("getFileItem");
-      gis = gfi.getReturnType().getMethod("getInputStream");
-    } catch (Exception ignored) {
-    }
-    GET_FILE_ITEM = gfi;
-    FILE_ITEM_GET_INPUT_STREAM = gis;
-  }
-
-  public static List<String> collectContents(FormData attachment) {
-    List<String> result = new ArrayList<>(MAX_FILES_TO_INSPECT);
-    for (String key : attachment) {
-      for (FormData.FormValue formValue : attachment.get(key)) {
-        if (result.size() >= MAX_FILES_TO_INSPECT) {
-          return result;
-        }
+    static {
+        Method gfi = null;
+        Method gis = null;
         try {
-          // null means no filename attribute → form field → skip
-          if (formValue.getFileName() == null) {
-            continue;
-          }
-          result.add(readContent(formValue));
-        } catch (Exception e) {
-          log.debug("Failed to process form value", e);
+            gfi = FormData.FormValue.class.getMethod("getFileItem");
+            gis = gfi.getReturnType().getMethod("getInputStream");
+        } catch (Exception ignored) {
         }
-      }
+        GET_FILE_ITEM = gfi;
+        FILE_ITEM_GET_INPUT_STREAM = gis;
     }
-    return result;
-  }
 
-  @VisibleForTesting
-  static String readContent(FormData.FormValue formValue) {
-    String contentType = null;
-    HeaderMap headers = formValue.getHeaders();
-    if (headers != null) {
-      contentType = headers.getFirst(Headers.CONTENT_TYPE);
+    public static List<String> collectContents(FormData attachment) {
+        List<String> result = new ArrayList<>(MAX_FILES_TO_INSPECT);
+        for (String key : attachment) {
+            for (FormData.FormValue formValue : attachment.get(key)) {
+                if (result.size() >= MAX_FILES_TO_INSPECT) {
+                    return result;
+                }
+                try {
+                    // null means no filename attribute → form field → skip
+                    if (formValue.getFileName() == null) {
+                        continue;
+                    }
+                    result.add(readContent(formValue));
+                } catch (Exception e) {
+                    log.debug("Failed to process form value", e);
+                }
+            }
+        }
+        return result;
     }
 
-    // Try getPath() first: works for 2.0 (all files on disk) and 2.2+ disk files.
-    try {
-      Path path = formValue.getPath();
-      try (InputStream is = Files.newInputStream(path)) {
-        return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, contentType);
-      }
-    } catch (Exception ignored) {
-      // In Undertow 2.2+, in-memory uploads throw here (no path).
-    }
+    @VisibleForTesting
+    static String readContent(FormData.FormValue formValue) {
+        String contentType = null;
+        HeaderMap headers = formValue.getHeaders();
+        if (headers != null) {
+            contentType = headers.getFirst(Headers.CONTENT_TYPE);
+        }
 
-    // Fallback for Undertow 2.2+ in-memory uploads via cached reflection.
-    if (GET_FILE_ITEM != null && FILE_ITEM_GET_INPUT_STREAM != null) {
-      try {
-        Object fileItem = GET_FILE_ITEM.invoke(formValue);
-        if (fileItem != null) {
-          try (InputStream is = (InputStream) FILE_ITEM_GET_INPUT_STREAM.invoke(fileItem)) {
-            return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, contentType);
-          }
+        // Try getPath() first: works for 2.0 (all files on disk) and 2.2+ disk files.
+        try {
+            Path path = formValue.getPath();
+            try (InputStream is = Files.newInputStream(path)) {
+                return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, contentType);
+            }
+        } catch (Exception ignored) {
+            // In Undertow 2.2+, in-memory uploads throw here (no path).
         }
-      } catch (Exception e) {
-        log.debug("Failed to read in-memory upload via reflection", e);
-      }
-    }
 
-    return "";
-  }
+        // Fallback for Undertow 2.2+ in-memory uploads via cached reflection.
+        if (GET_FILE_ITEM != null && FILE_ITEM_GET_INPUT_STREAM != null) {
+            try {
+                Object fileItem = GET_FILE_ITEM.invoke(formValue);
+                if (fileItem != null) {
+                    try (InputStream is = (InputStream) FILE_ITEM_GET_INPUT_STREAM.invoke(fileItem)) {
+                        return MultipartContentDecoder.readInputStream(is, MAX_CONTENT_BYTES, contentType);
+                    }
+                }
+            } catch (Exception e) {
+                log.debug("Failed to read in-memory upload via reflection", e);
+            }
+        }
+
+        return "";
+    }
 
-  private FormDataContentHelper() {}
+    private FormDataContentHelper() {}
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataMap.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataMap.java
index c99e253763b..9a125e49e47 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataMap.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataMap.java
@@ -10,92 +10,92 @@
 import java.util.Set;
 
 public class FormDataMap implements Map<String, Collection<String>> {
-  private final FormData formData;
-  private volatile Map<String, Collection<String>> map;
+    private final FormData formData;
+    private volatile Map<String, Collection<String>> map;
 
-  public FormDataMap(FormData formData) {
-    this.formData = formData;
-  }
-
-  private Map<String, Collection<String>> getMap() {
-    if (map != null) {
-      return map;
+    public FormDataMap(FormData formData) {
+        this.formData = formData;
     }
 
-    Map<String, Collection<String>> localMap = new HashMap<>();
-    for (String key : formData) {
-      Deque<FormData.FormValue> formValues = formData.get(key);
-      List<String> values = new ArrayList<>(formValues.size());
-      for (FormData.FormValue formValue : formValues) {
-        // In undertow 2.2+, isFile() returns false for in-memory file uploads; getFileName()
-        // correctly identifies all file uploads regardless of storage.
-        if (formValue.getFileName() == null) {
-          values.add(formValue.getValue());
+    private Map<String, Collection<String>> getMap() {
+        if (map != null) {
+            return map;
+        }
+
+        Map<String, Collection<String>> localMap = new HashMap<>();
+        for (String key : formData) {
+            Deque<FormData.FormValue> formValues = formData.get(key);
+            List<String> values = new ArrayList<>(formValues.size());
+            for (FormData.FormValue formValue : formValues) {
+                // In undertow 2.2+, isFile() returns false for in-memory file uploads; getFileName()
+                // correctly identifies all file uploads regardless of storage.
+                if (formValue.getFileName() == null) {
+                    values.add(formValue.getValue());
+                }
+            }
+            localMap.put(key, values);
         }
-      }
-      localMap.put(key, values);
+
+        return (map = localMap);
+    }
+
+    @Override
+    public int size() {
+        return getMap().size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return getMap().isEmpty();
+    }
+
+    @Override
+    public boolean containsKey(Object key) {
+        return getMap().containsKey(key);
+    }
+
+    @Override
+    public boolean containsValue(Object value) {
+        return getMap().containsValue(value);
+    }
+
+    @Override
+    public Collection<String> get(Object key) {
+        return getMap().get(key);
     }
 
-    return (map = localMap);
-  }
-
-  @Override
-  public int size() {
-    return getMap().size();
-  }
-
-  @Override
-  public boolean isEmpty() {
-    return getMap().isEmpty();
-  }
-
-  @Override
-  public boolean containsKey(Object key) {
-    return getMap().containsKey(key);
-  }
-
-  @Override
-  public boolean containsValue(Object value) {
-    return getMap().containsValue(value);
-  }
-
-  @Override
-  public Collection<String> get(Object key) {
-    return getMap().get(key);
-  }
-
-  @Override
-  public Collection<String> put(String key, Collection<String> value) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Collection<String> remove(Object key) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void putAll(Map<? extends String, ? extends Collection<String>> m) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void clear() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Set<String> keySet() {
-    return getMap().keySet();
-  }
-
-  @Override
-  public Collection<Collection<String>> values() {
-    return getMap().values();
-  }
-
-  @Override
-  public Set<Entry<String, Collection<String>>> entrySet() {
-    return getMap().entrySet();
-  }
+    @Override
+    public Collection<String> put(String key, Collection<String> value) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Collection<String> remove(Object key) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void putAll(Map<? extends String, ? extends Collection<String>> m) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void clear() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Set<String> keySet() {
+        return getMap().keySet();
+    }
+
+    @Override
+    public Collection<Collection<String>> values() {
+        return getMap().values();
+    }
+
+    @Override
+    public Set<Entry<String, Collection<String>>> entrySet() {
+        return getMap().entrySet();
+    }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataParserInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataParserInstrumentation.java
index 6ced9be431d..378be11fa7b 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataParserInstrumentation.java
@@ -27,71 +27,69 @@
 
 @AutoService(InstrumenterModule.class)
 public class FormDataParserInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public FormDataParserInstrumentation() {
-    super("undertow", "undertow-2.0");
-  }
+    public FormDataParserInstrumentation() {
+        super("undertow", "undertow-2.0");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.undertow.server.handlers.form.FormEncodedDataDefinition$FormEncodedDataParser";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.undertow.server.handlers.form.FormEncodedDataDefinition$FormEncodedDataParser";
+    }
 
-  private static final Reference EXCHANGE_REFERENCE =
-      new Reference.Builder(
-              "io.undertow.server.handlers.form.FormEncodedDataDefinition$FormEncodedDataParser")
-          .withField(new String[0], 0, "exchange", "Lio/undertow/server/HttpServerExchange;")
-          .build();
+    private static final Reference EXCHANGE_REFERENCE = new Reference.Builder(
+                    "io.undertow.server.handlers.form.FormEncodedDataDefinition$FormEncodedDataParser")
+            .withField(new String[0], 0, "exchange", "Lio/undertow/server/HttpServerExchange;")
+            .build();
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {EXCHANGE_REFERENCE};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {EXCHANGE_REFERENCE};
+    }
 
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("doParse")
-            .and(takesArgument(0, named("org.xnio.channels.StreamSourceChannel")))
-            .and(takesArguments(1))
-            .and(isPrivate()),
-        getClass().getName() + "$DoParseAdvice");
-  }
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("doParse")
+                        .and(takesArgument(0, named("org.xnio.channels.StreamSourceChannel")))
+                        .and(takesArguments(1))
+                        .and(isPrivate()),
+                getClass().getName() + "$DoParseAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class DoParseAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.FieldValue("exchange") HttpServerExchange exchange,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (t != null) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class DoParseAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.FieldValue("exchange") HttpServerExchange exchange,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (t != null) {
+                return;
+            }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
-      FormData attachment = exchange.getAttachment(FORM_DATA);
-      if (attachment == null) {
-        return;
-      }
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
+            FormData attachment = exchange.getAttachment(FORM_DATA);
+            if (attachment == null) {
+                return;
+            }
 
-      Flow<Void> flow = callback.apply(reqCtx, new FormDataMap(attachment));
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction != null) {
-          blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-          if (t == null) {
-            t = new BlockingException("Blocked request (for FormEncodedDataParser/doParse)");
-          }
+            Flow<Void> flow = callback.apply(reqCtx, new FormDataMap(attachment));
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction != null) {
+                    blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                    if (t == null) {
+                        t = new BlockingException("Blocked request (for FormEncodedDataParser/doParse)");
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HandlerInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HandlerInstrumentation.java
index fba6de85758..315aa25732a 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HandlerInstrumentation.java
@@ -31,125 +31,125 @@
 
 @AutoService(InstrumenterModule.class)
 public final class HandlerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public HandlerInstrumentation() {
-    super("undertow", "undertow-2.0");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "io.undertow.server.Connectors";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvices(
-        isMethod()
-            .and(named("executeRootHandler"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("io.undertow.server.HttpHandler")))
-            .and(takesArgument(1, named("io.undertow.server.HttpServerExchange")))
-            .and(isStatic())
-            .and(isPublic()),
-        getClass().getName() + "$ContextTrackingAdvice",
-        getClass().getName() + "$ExecuteRootHandlerAdvice");
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExchangeEndSpanListener",
-      packageName + ".HttpServerExchangeURIDataAdapter",
-      packageName + ".UndertowDecorator",
-      packageName + ".UndertowExtractAdapter",
-      packageName + ".UndertowExtractAdapter$Request",
-      packageName + ".UndertowExtractAdapter$Response",
-      packageName + ".UndertowBlockingHandler",
-      packageName + ".IgnoreSendAttribute",
-      packageName + ".UndertowBlockResponseFunction",
-    };
-  }
-
-  @AppliesOn(CONTEXT_TRACKING)
-  public static class ContextTrackingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void extractParent(
-        @Advice.Argument(1) final HttpServerExchange exchange,
-        @Advice.Local("parentScope") ContextScope parentScope) {
-      if (exchange.getAttachment(DATADOG_UNDERTOW_CONTINUATION) != null) {
-        return; // async re-dispatch: parent context already extracted
-      }
-      final Context parentContext = DECORATE.extract(exchange);
-      exchange.putAttachment(PARENT_CONTEXT_KEY, parentContext);
-      parentScope = parentContext.attach();
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public HandlerInstrumentation() {
+        super("undertow", "undertow-2.0");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "io.undertow.server.Connectors";
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeParentScope(@Advice.Local("parentScope") ContextScope parentScope) {
-      if (parentScope != null) parentScope.close();
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvices(
+                isMethod()
+                        .and(named("executeRootHandler"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("io.undertow.server.HttpHandler")))
+                        .and(takesArgument(1, named("io.undertow.server.HttpServerExchange")))
+                        .and(isStatic())
+                        .and(isPublic()),
+                getClass().getName() + "$ContextTrackingAdvice",
+                getClass().getName() + "$ExecuteRootHandlerAdvice");
     }
-  }
-
-  public static class ExecuteRootHandlerAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(value = 0, readOnly = false) HttpHandler handler,
-        @Advice.Argument(1) final HttpServerExchange exchange,
-        @Advice.Local("contextScope") ContextScope scope) {
-      AgentSpan activeSpan = AgentTracer.activeSpan();
-      if (activeSpan != null) {
-        AgentSpan localRootSpan = activeSpan.getLocalRootSpan();
-        if (DECORATE.spanName().equals(localRootSpan.getSpanName())) {
-          // if we can here through the dispatch of an HttpHandler, rather than that of a
-          // plain Runnable, then Connects.executeRootHandler() will still have been called,
-          // and this advice executed.
-          // However, a scope may have already been continued through UndertowRunnableWrapper.
-          // This scope may refer to a child span of the original undertow root span, whereas
-          // here we would only be able to activate the scope for the original undertow span.
-          return;
+
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".ExchangeEndSpanListener",
+            packageName + ".HttpServerExchangeURIDataAdapter",
+            packageName + ".UndertowDecorator",
+            packageName + ".UndertowExtractAdapter",
+            packageName + ".UndertowExtractAdapter$Request",
+            packageName + ".UndertowExtractAdapter$Response",
+            packageName + ".UndertowBlockingHandler",
+            packageName + ".IgnoreSendAttribute",
+            packageName + ".UndertowBlockResponseFunction",
+        };
+    }
+
+    @AppliesOn(CONTEXT_TRACKING)
+    public static class ContextTrackingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void extractParent(
+                @Advice.Argument(1) final HttpServerExchange exchange,
+                @Advice.Local("parentScope") ContextScope parentScope) {
+            if (exchange.getAttachment(DATADOG_UNDERTOW_CONTINUATION) != null) {
+                return; // async re-dispatch: parent context already extracted
+            }
+            final Context parentContext = DECORATE.extract(exchange);
+            exchange.putAttachment(PARENT_CONTEXT_KEY, parentContext);
+            parentScope = parentContext.attach();
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeParentScope(@Advice.Local("parentScope") ContextScope parentScope) {
+            if (parentScope != null) parentScope.close();
         }
-      }
-
-      ContextContinuation continuation = exchange.getAttachment(DATADOG_UNDERTOW_CONTINUATION);
-      if (continuation != null) {
-        // not yet complete, not ready to do final activation of continuation
-        scope = continuation.context().attach();
-        return;
-      }
-
-      Context parentContext = exchange.getAttachment(PARENT_CONTEXT_KEY);
-      if (parentContext == null) parentContext = rootContext();
-      final Context context = DECORATE.startSpan(exchange, parentContext);
-      scope = context.attach();
-      final AgentSpan span = spanFromContext(context);
-      DECORATE.afterStart(span);
-      DECORATE.onRequest(span, exchange, exchange, parentContext);
-
-      exchange.putAttachment(DATADOG_UNDERTOW_CONTINUATION, span.captureWithContext());
-
-      exchange.addExchangeCompleteListener(ExchangeEndSpanListener.INSTANCE);
-
-      // TODO is this required?
-      // exchange.getRequestHeaders().add(
-      //   new HttpString(CorrelationIdentifier.getTraceIdKey()), GlobalTracer.get().getTraceId());
-      // exchange.getRequestHeaders().add(
-      //   new HttpString(CorrelationIdentifier.getSpanIdKey()), GlobalTracer.get().getSpanId());
-
-      RequestBlockingAction rab = span.getRequestBlockingAction();
-      if (rab != null) {
-        exchange.putAttachment(REQUEST_BLOCKING_DATA, rab);
-        exchange.putAttachment(TRACE_SEGMENT, span.getRequestContext().getTraceSegment());
-        handler = UndertowBlockingHandler.INSTANCE;
-      }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void closeScope(@Advice.Local("contextScope") final ContextScope scope) {
-      if (scope == null) {
-        return;
-      }
-      scope.close();
+    public static class ExecuteRootHandlerAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Argument(value = 0, readOnly = false) HttpHandler handler,
+                @Advice.Argument(1) final HttpServerExchange exchange,
+                @Advice.Local("contextScope") ContextScope scope) {
+            AgentSpan activeSpan = AgentTracer.activeSpan();
+            if (activeSpan != null) {
+                AgentSpan localRootSpan = activeSpan.getLocalRootSpan();
+                if (DECORATE.spanName().equals(localRootSpan.getSpanName())) {
+                    // if we can here through the dispatch of an HttpHandler, rather than that of a
+                    // plain Runnable, then Connects.executeRootHandler() will still have been called,
+                    // and this advice executed.
+                    // However, a scope may have already been continued through UndertowRunnableWrapper.
+                    // This scope may refer to a child span of the original undertow root span, whereas
+                    // here we would only be able to activate the scope for the original undertow span.
+                    return;
+                }
+            }
+
+            ContextContinuation continuation = exchange.getAttachment(DATADOG_UNDERTOW_CONTINUATION);
+            if (continuation != null) {
+                // not yet complete, not ready to do final activation of continuation
+                scope = continuation.context().attach();
+                return;
+            }
+
+            Context parentContext = exchange.getAttachment(PARENT_CONTEXT_KEY);
+            if (parentContext == null) parentContext = rootContext();
+            final Context context = DECORATE.startSpan(exchange, parentContext);
+            scope = context.attach();
+            final AgentSpan span = spanFromContext(context);
+            DECORATE.afterStart(span);
+            DECORATE.onRequest(span, exchange, exchange, parentContext);
+
+            exchange.putAttachment(DATADOG_UNDERTOW_CONTINUATION, span.captureWithContext());
+
+            exchange.addExchangeCompleteListener(ExchangeEndSpanListener.INSTANCE);
+
+            // TODO is this required?
+            // exchange.getRequestHeaders().add(
+            //   new HttpString(CorrelationIdentifier.getTraceIdKey()), GlobalTracer.get().getTraceId());
+            // exchange.getRequestHeaders().add(
+            //   new HttpString(CorrelationIdentifier.getSpanIdKey()), GlobalTracer.get().getSpanId());
+
+            RequestBlockingAction rab = span.getRequestBlockingAction();
+            if (rab != null) {
+                exchange.putAttachment(REQUEST_BLOCKING_DATA, rab);
+                exchange.putAttachment(TRACE_SEGMENT, span.getRequestContext().getTraceSegment());
+                handler = UndertowBlockingHandler.INSTANCE;
+            }
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void closeScope(@Advice.Local("contextScope") final ContextScope scope) {
+            if (scope == null) {
+                return;
+            }
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpRequestParserInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpRequestParserInstrumentation.java
index 134e5a60ccb..2efe3f47296 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpRequestParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpRequestParserInstrumentation.java
@@ -21,85 +21,82 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpRequestParserInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public HttpRequestParserInstrumentation() {
-    super("undertow", "undertow-2.2", "undertow-request-parse");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public HttpRequestParserInstrumentation() {
+        super("undertow", "undertow-2.2", "undertow-request-parse");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    // removed in https://github.com/undertow-io/undertow/pull/1949/changes
-    // see RequestParserInstrumentation for the new type
-    return "io.undertow.server.protocol.http.HttpRequestParser";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        // removed in https://github.com/undertow-io/undertow/pull/1949/changes
+        // see RequestParserInstrumentation for the new type
+        return "io.undertow.server.protocol.http.HttpRequestParser";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".HttpServerExchangeURIDataAdapter",
-      packageName + ".UndertowDecorator",
-      packageName + ".UndertowBlockingHandler",
-      packageName + ".IgnoreSendAttribute",
-      packageName + ".UndertowBlockResponseFunction",
-      packageName + ".UndertowExtractAdapter",
-      packageName + ".UndertowExtractAdapter$Request",
-      packageName + ".UndertowExtractAdapter$Response"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".HttpServerExchangeURIDataAdapter",
+            packageName + ".UndertowDecorator",
+            packageName + ".UndertowBlockingHandler",
+            packageName + ".IgnoreSendAttribute",
+            packageName + ".UndertowBlockResponseFunction",
+            packageName + ".UndertowExtractAdapter",
+            packageName + ".UndertowExtractAdapter$Request",
+            packageName + ".UndertowExtractAdapter$Response"
+        };
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("handle"))
-            .and(takesArgument(2, named("io.undertow.server.HttpServerExchange"))),
-        getClass().getName() + "$RequestParseFailureAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("handle")).and(takesArgument(2, named("io.undertow.server.HttpServerExchange"))),
+                getClass().getName() + "$RequestParseFailureAdvice");
+    }
 
-  public static class RequestParseFailureAdvice {
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterRequestParse(
-        @Advice.Argument(2) final HttpServerExchange exchange,
-        @Advice.Thrown final Throwable throwable) {
-      if (throwable == null) {
-        return;
-      }
-      // if we have an exception here the subsequent instrumentations won't have any chance to open
-      // a span
-      // this because undertow will just write down a http 400 raw response over the net channel.
-      // Here we try to create a span to record this
-      AgentSpan span = activeSpan();
-      ContextScope scope = null;
-      try {
-        if (span == null) {
-          final Context parentContext = DECORATE.extract(exchange);
-          final Context context = DECORATE.startSpan(exchange, parentContext);
-          span = spanFromContext(context);
-          scope = context.attach();
-          DECORATE.afterStart(span);
-          DECORATE.onRequest(span, exchange, exchange, parentContext);
-        }
-        DECORATE.onError(span, throwable);
-        // because we know that a http 400 will be thrown
-        DECORATE.onResponseStatus(span, 400);
-        if (scope != null) {
-          DECORATE.beforeFinish(scope.context());
-        }
-      } finally {
-        if (span != null) {
-          if (scope != null) {
-            scope.close();
-          } else {
-            // span was already active, scope will be closed by HandlerInstrumentation
-          }
-          span.finish();
+    public static class RequestParseFailureAdvice {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterRequestParse(
+                @Advice.Argument(2) final HttpServerExchange exchange, @Advice.Thrown final Throwable throwable) {
+            if (throwable == null) {
+                return;
+            }
+            // if we have an exception here the subsequent instrumentations won't have any chance to open
+            // a span
+            // this because undertow will just write down a http 400 raw response over the net channel.
+            // Here we try to create a span to record this
+            AgentSpan span = activeSpan();
+            ContextScope scope = null;
+            try {
+                if (span == null) {
+                    final Context parentContext = DECORATE.extract(exchange);
+                    final Context context = DECORATE.startSpan(exchange, parentContext);
+                    span = spanFromContext(context);
+                    scope = context.attach();
+                    DECORATE.afterStart(span);
+                    DECORATE.onRequest(span, exchange, exchange, parentContext);
+                }
+                DECORATE.onError(span, throwable);
+                // because we know that a http 400 will be thrown
+                DECORATE.onResponseStatus(span, 400);
+                if (scope != null) {
+                    DECORATE.beforeFinish(scope.context());
+                }
+            } finally {
+                if (span != null) {
+                    if (scope != null) {
+                        scope.close();
+                    } else {
+                        // span was already active, scope will be closed by HandlerInstrumentation
+                    }
+                    span.finish();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeSenderInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeSenderInstrumentation.java
index 075849e79db..9762bb37949 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeSenderInstrumentation.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeSenderInstrumentation.java
@@ -20,84 +20,82 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpServerExchangeSenderInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public HttpServerExchangeSenderInstrumentation() {
-    super("undertow", "undertow-2.0");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public HttpServerExchangeSenderInstrumentation() {
+        super("undertow", "undertow-2.0");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.undertow.server.HttpServerExchange";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.undertow.server.HttpServerExchange";
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".IgnoreSendAttribute",
-      packageName + ".UndertowDecorator",
-      packageName + ".UndertowExtractAdapter",
-      packageName + ".UndertowExtractAdapter$Request",
-      packageName + ".UndertowExtractAdapter$Response",
-      packageName + ".UndertowBlockingHandler",
-      packageName + ".HttpServerExchangeURIDataAdapter",
-      packageName + ".UndertowBlockResponseFunction",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".IgnoreSendAttribute",
+            packageName + ".UndertowDecorator",
+            packageName + ".UndertowExtractAdapter",
+            packageName + ".UndertowExtractAdapter$Request",
+            packageName + ".UndertowExtractAdapter$Response",
+            packageName + ".UndertowBlockingHandler",
+            packageName + ".HttpServerExchangeURIDataAdapter",
+            packageName + ".UndertowBlockResponseFunction",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        not(isPrivate()).and(named("getResponseChannel")).and(takesArguments(0)),
-        HttpServerExchangeSenderInstrumentation.class.getName() + "$GetResponseChannelAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                not(isPrivate()).and(named("getResponseChannel")).and(takesArguments(0)),
+                HttpServerExchangeSenderInstrumentation.class.getName() + "$GetResponseChannelAdvice");
+    }
 
-  /**
-   * @see HttpServerExchange#getResponseChannel() ()
-   */
-  static class GetResponseChannelAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
-    static boolean /* skip */ before(
-        @Advice.This HttpServerExchange xchg,
-        @Advice.FieldValue("responseChannel") StreamSinkChannel channel) {
-      if (channel != null) {
-        return false;
-      }
+    /**
+     * @see HttpServerExchange#getResponseChannel() ()
+     */
+    static class GetResponseChannelAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
+        static boolean /* skip */ before(
+                @Advice.This HttpServerExchange xchg, @Advice.FieldValue("responseChannel") StreamSinkChannel channel) {
+            if (channel != null) {
+                return false;
+            }
 
-      ContextContinuation continuation = xchg.getAttachment(DATADOG_UNDERTOW_CONTINUATION);
-      if (continuation == null) {
-        return false;
-      }
-      if (xchg.getAttachment(IgnoreSendAttribute.IGNORE_SEND_KEY) != null) {
-        return false;
-      }
-      xchg.putAttachment(IgnoreSendAttribute.IGNORE_SEND_KEY, IgnoreSendAttribute.INSTANCE);
+            ContextContinuation continuation = xchg.getAttachment(DATADOG_UNDERTOW_CONTINUATION);
+            if (continuation == null) {
+                return false;
+            }
+            if (xchg.getAttachment(IgnoreSendAttribute.IGNORE_SEND_KEY) != null) {
+                return false;
+            }
+            xchg.putAttachment(IgnoreSendAttribute.IGNORE_SEND_KEY, IgnoreSendAttribute.INSTANCE);
 
-      AgentSpan span = spanFromContext(continuation.context());
-      Flow<Void> flow =
-          UndertowDecorator.DECORATE.callIGCallbackResponseAndHeaders(
-              span, xchg, xchg.getStatusCode(), UndertowExtractAdapter.Response.GETTER);
-      Flow.Action action = flow.getAction();
-      if (!(action instanceof Flow.Action.RequestBlockingAction)) {
-        return false;
-      }
+            AgentSpan span = spanFromContext(continuation.context());
+            Flow<Void> flow = UndertowDecorator.DECORATE.callIGCallbackResponseAndHeaders(
+                    span, xchg, xchg.getStatusCode(), UndertowExtractAdapter.Response.GETTER);
+            Flow.Action action = flow.getAction();
+            if (!(action instanceof Flow.Action.RequestBlockingAction)) {
+                return false;
+            }
 
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
 
-      xchg.putAttachment(UndertowBlockingHandler.REQUEST_BLOCKING_DATA, rba);
-      xchg.putAttachment(
-          UndertowBlockingHandler.TRACE_SEGMENT, span.getRequestContext().getTraceSegment());
-      UndertowBlockingHandler.INSTANCE.handleRequest(xchg);
-      return true;
-    }
+            xchg.putAttachment(UndertowBlockingHandler.REQUEST_BLOCKING_DATA, rba);
+            xchg.putAttachment(
+                    UndertowBlockingHandler.TRACE_SEGMENT,
+                    span.getRequestContext().getTraceSegment());
+            UndertowBlockingHandler.INSTANCE.handleRequest(xchg);
+            return true;
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean skip, @Advice.Thrown(readOnly = false) Throwable thrown) {
-      if (!skip) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(@Advice.Enter boolean skip, @Advice.Thrown(readOnly = false) Throwable thrown) {
+            if (!skip) {
+                return;
+            }
 
-      thrown = new BlockingException("Request blocked (HttpServerExchange#getResponseChannel)");
+            thrown = new BlockingException("Request blocked (HttpServerExchange#getResponseChannel)");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/MultiPartUploadHandlerInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/MultiPartUploadHandlerInstrumentation.java
index c414976c1c8..ebbbdfaa752 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/MultiPartUploadHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/MultiPartUploadHandlerInstrumentation.java
@@ -29,132 +29,127 @@
 
 @AutoService(InstrumenterModule.class)
 public class MultiPartUploadHandlerInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public MultiPartUploadHandlerInstrumentation() {
-    super("undertow", "undertow-2.0");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "io.undertow.server.handlers.form.MultiPartParserDefinition$MultiPartUploadHandler";
-  }
+    public MultiPartUploadHandlerInstrumentation() {
+        super("undertow", "undertow-2.0");
+    }
 
-  private static final Reference EXCHANGE_REFERENCE =
-      new Reference.Builder(
-              "io.undertow.server.handlers.form.MultiPartParserDefinition$MultiPartUploadHandler")
-          .withField(new String[0], 0, "exchange", "Lio/undertow/server/HttpServerExchange;")
-          .build();
+    @Override
+    public String instrumentedType() {
+        return "io.undertow.server.handlers.form.MultiPartParserDefinition$MultiPartUploadHandler";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {EXCHANGE_REFERENCE};
-  }
+    private static final Reference EXCHANGE_REFERENCE = new Reference.Builder(
+                    "io.undertow.server.handlers.form.MultiPartParserDefinition$MultiPartUploadHandler")
+            .withField(new String[0], 0, "exchange", "Lio/undertow/server/HttpServerExchange;")
+            .build();
 
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("parseBlocking")
-            .and(takesArguments(0))
-            .and(returns(named("io.undertow.server.handlers.form.FormData")))
-            .and(isPublic()),
-        getClass().getName() + "$ParseBlockingAdvice");
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {EXCHANGE_REFERENCE};
+    }
 
-  @RequiresRequestContext(RequestContextSlot.APPSEC)
-  public static class ParseBlockingAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static boolean onEnter(@Advice.FieldValue("exchange") HttpServerExchange exchange) {
-      return exchange.getAttachment(FORM_DATA) == null;
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("parseBlocking")
+                        .and(takesArguments(0))
+                        .and(returns(named("io.undertow.server.handlers.form.FormData")))
+                        .and(isPublic()),
+                getClass().getName() + "$ParseBlockingAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    static void after(
-        @Advice.Enter boolean relevant,
-        @Advice.FieldValue("exchange") HttpServerExchange exchange,
-        @ActiveRequestContext RequestContext reqCtx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (!relevant || t != null) {
-        return;
-      }
+    @RequiresRequestContext(RequestContextSlot.APPSEC)
+    public static class ParseBlockingAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static boolean onEnter(@Advice.FieldValue("exchange") HttpServerExchange exchange) {
+            return exchange.getAttachment(FORM_DATA) == null;
+        }
 
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> bodyCallback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb =
-          cbp.getCallback(EVENTS.requestFilesFilenames());
-      BiFunction<RequestContext, List<String>, Flow<Void>> contentCb =
-          cbp.getCallback(EVENTS.requestFilesContent());
-      if (bodyCallback == null && filenamesCb == null && contentCb == null) {
-        return;
-      }
-      FormData attachment = exchange.getAttachment(FORM_DATA);
-      if (attachment == null) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        static void after(
+                @Advice.Enter boolean relevant,
+                @Advice.FieldValue("exchange") HttpServerExchange exchange,
+                @ActiveRequestContext RequestContext reqCtx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (!relevant || t != null) {
+                return;
+            }
 
-      if (bodyCallback != null) {
-        Flow<Void> flow = bodyCallback.apply(reqCtx, new FormDataMap(attachment));
-        Flow.Action action = flow.getAction();
-        if (action instanceof Flow.Action.RequestBlockingAction) {
-          Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-          BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-          if (blockResponseFunction != null) {
-            boolean success =
-                blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-            if (success && t == null) {
-              t =
-                  new BlockingException(
-                      "Blocked request (for MultiPartUploadHandler/parseBlocking)");
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> bodyCallback =
+                    cbp.getCallback(EVENTS.requestBodyProcessed());
+            BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb =
+                    cbp.getCallback(EVENTS.requestFilesFilenames());
+            BiFunction<RequestContext, List<String>, Flow<Void>> contentCb =
+                    cbp.getCallback(EVENTS.requestFilesContent());
+            if (bodyCallback == null && filenamesCb == null && contentCb == null) {
+                return;
+            }
+            FormData attachment = exchange.getAttachment(FORM_DATA);
+            if (attachment == null) {
+                return;
             }
-          }
-        }
-      }
 
-      if (filenamesCb != null) {
-        List<String> filenames = new ArrayList<>();
-        for (String key : attachment) {
-          for (FormData.FormValue formValue : attachment.get(key)) {
-            String filename = formValue.getFileName();
-            if (filename != null && !filename.isEmpty()) {
-              filenames.add(filename);
+            if (bodyCallback != null) {
+                Flow<Void> flow = bodyCallback.apply(reqCtx, new FormDataMap(attachment));
+                Flow.Action action = flow.getAction();
+                if (action instanceof Flow.Action.RequestBlockingAction) {
+                    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                    BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                    if (blockResponseFunction != null) {
+                        boolean success =
+                                blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                        if (success && t == null) {
+                            t = new BlockingException("Blocked request (for MultiPartUploadHandler/parseBlocking)");
+                        }
+                    }
+                }
             }
-          }
-        }
-        if (!filenames.isEmpty()) {
-          Flow<Void> filenamesFlow = filenamesCb.apply(reqCtx, filenames);
-          Flow.Action filenamesAction = filenamesFlow.getAction();
-          if (filenamesAction instanceof Flow.Action.RequestBlockingAction) {
-            Flow.Action.RequestBlockingAction rba =
-                (Flow.Action.RequestBlockingAction) filenamesAction;
-            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-            if (brf != null && t == null) {
-              boolean success = brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-              if (success) {
-                t = new BlockingException("Blocked request (multipart file upload)");
-              }
+
+            if (filenamesCb != null) {
+                List<String> filenames = new ArrayList<>();
+                for (String key : attachment) {
+                    for (FormData.FormValue formValue : attachment.get(key)) {
+                        String filename = formValue.getFileName();
+                        if (filename != null && !filename.isEmpty()) {
+                            filenames.add(filename);
+                        }
+                    }
+                }
+                if (!filenames.isEmpty()) {
+                    Flow<Void> filenamesFlow = filenamesCb.apply(reqCtx, filenames);
+                    Flow.Action filenamesAction = filenamesFlow.getAction();
+                    if (filenamesAction instanceof Flow.Action.RequestBlockingAction) {
+                        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) filenamesAction;
+                        BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+                        if (brf != null && t == null) {
+                            boolean success = brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                            if (success) {
+                                t = new BlockingException("Blocked request (multipart file upload)");
+                            }
+                        }
+                    }
+                }
             }
-          }
-        }
-      }
 
-      if (contentCb != null && t == null) {
-        List<String> filesContent = FormDataContentHelper.collectContents(attachment);
-        if (!filesContent.isEmpty()) {
-          Flow<Void> contentFlow = contentCb.apply(reqCtx, filesContent);
-          Flow.Action contentAction = contentFlow.getAction();
-          if (contentAction instanceof Flow.Action.RequestBlockingAction) {
-            Flow.Action.RequestBlockingAction rba =
-                (Flow.Action.RequestBlockingAction) contentAction;
-            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-            if (brf != null && t == null) {
-              boolean success = brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-              if (success) {
-                t = new BlockingException("Blocked request (multipart file upload content)");
-              }
+            if (contentCb != null && t == null) {
+                List<String> filesContent = FormDataContentHelper.collectContents(attachment);
+                if (!filesContent.isEmpty()) {
+                    Flow<Void> contentFlow = contentCb.apply(reqCtx, filesContent);
+                    Flow.Action contentAction = contentFlow.getAction();
+                    if (contentAction instanceof Flow.Action.RequestBlockingAction) {
+                        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) contentAction;
+                        BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+                        if (brf != null && t == null) {
+                            boolean success = brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                            if (success) {
+                                t = new BlockingException("Blocked request (multipart file upload content)");
+                            }
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/RequestParserInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/RequestParserInstrumentation.java
index a70080f997e..956e4547ce2 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/RequestParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/RequestParserInstrumentation.java
@@ -10,41 +10,39 @@
 
 @AutoService(InstrumenterModule.class)
 public class RequestParserInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public RequestParserInstrumentation() {
-    super("undertow", "undertow-2.2", "undertow-request-parse");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public RequestParserInstrumentation() {
+        super("undertow", "undertow-2.2", "undertow-request-parse");
+    }
 
-  @Override
-  public String instrumentedType() {
-    // new class added in new minor versions in
-    // https://github.com/undertow-io/undertow/pull/1949/changes
-    // from 2.2.40, 2.3.25 and 2.4.0
-    // not instrumenting the hierarchy like in its predecessor HttpRequestParserInstrumentation
-    // because RequestParser is marked final.
-    return "io.undertow.server.protocol.http.RequestParser";
-  }
+    @Override
+    public String instrumentedType() {
+        // new class added in new minor versions in
+        // https://github.com/undertow-io/undertow/pull/1949/changes
+        // from 2.2.40, 2.3.25 and 2.4.0
+        // not instrumenting the hierarchy like in its predecessor HttpRequestParserInstrumentation
+        // because RequestParser is marked final.
+        return "io.undertow.server.protocol.http.RequestParser";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("handle"))
-            .and(takesArgument(2, named("io.undertow.server.HttpServerExchange"))),
-        HttpRequestParserInstrumentation.class.getName() + "$RequestParseFailureAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("handle")).and(takesArgument(2, named("io.undertow.server.HttpServerExchange"))),
+                HttpRequestParserInstrumentation.class.getName() + "$RequestParseFailureAdvice");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".HttpServerExchangeURIDataAdapter",
-      packageName + ".UndertowDecorator",
-      packageName + ".UndertowBlockingHandler",
-      packageName + ".IgnoreSendAttribute",
-      packageName + ".UndertowBlockResponseFunction",
-      packageName + ".UndertowExtractAdapter",
-      packageName + ".UndertowExtractAdapter$Request",
-      packageName + ".UndertowExtractAdapter$Response"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".HttpServerExchangeURIDataAdapter",
+            packageName + ".UndertowDecorator",
+            packageName + ".UndertowBlockingHandler",
+            packageName + ".IgnoreSendAttribute",
+            packageName + ".UndertowBlockResponseFunction",
+            packageName + ".UndertowExtractAdapter",
+            packageName + ".UndertowExtractAdapter$Request",
+            packageName + ".UndertowExtractAdapter$Response"
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/ServletInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/ServletInstrumentation.java
index 6e9877d6347..369bb2a0e60 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/ServletInstrumentation.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/ServletInstrumentation.java
@@ -24,71 +24,71 @@
 
 @AutoService(InstrumenterModule.class)
 public final class ServletInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ServletInstrumentation() {
-    super("undertow", "undertow-2.0");
-  }
+    public ServletInstrumentation() {
+        super("undertow", "undertow-2.0");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.undertow.servlet.handlers.ServletInitialHandler";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.undertow.servlet.handlers.ServletInitialHandler";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("dispatchRequest")), getClass().getName() + "$DispatchAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("dispatchRequest")), getClass().getName() + "$DispatchAdvice");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".HttpServerExchangeURIDataAdapter",
-      packageName + ".UndertowDecorator",
-      packageName + ".UndertowBlockingHandler",
-      packageName + ".IgnoreSendAttribute",
-      packageName + ".UndertowBlockResponseFunction",
-      packageName + ".UndertowExtractAdapter",
-      packageName + ".UndertowExtractAdapter$Request",
-      packageName + ".UndertowExtractAdapter$Response"
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".HttpServerExchangeURIDataAdapter",
+            packageName + ".UndertowDecorator",
+            packageName + ".UndertowBlockingHandler",
+            packageName + ".IgnoreSendAttribute",
+            packageName + ".UndertowBlockResponseFunction",
+            packageName + ".UndertowExtractAdapter",
+            packageName + ".UndertowExtractAdapter$Request",
+            packageName + ".UndertowExtractAdapter$Response"
+        };
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "javax.servlet";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "javax.servlet";
+    }
 
-  public static class DispatchAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(
-        @Advice.Argument(0) final HttpServerExchange exchange,
-        @Advice.Argument(1) final ServletRequestContext servletRequestContext) {
-      ContextContinuation continuation = exchange.getAttachment(DATADOG_UNDERTOW_CONTINUATION);
-      if (continuation != null) {
-        AgentSpan undertowSpan = spanFromContext(continuation.context());
-        ServletRequest request = servletRequestContext.getServletRequest();
-        request.setAttribute(DD_CONTEXT_ATTRIBUTE, continuation.context());
-        undertowSpan.setSpanName(SERVLET_REQUEST);
+    public static class DispatchAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(
+                @Advice.Argument(0) final HttpServerExchange exchange,
+                @Advice.Argument(1) final ServletRequestContext servletRequestContext) {
+            ContextContinuation continuation = exchange.getAttachment(DATADOG_UNDERTOW_CONTINUATION);
+            if (continuation != null) {
+                AgentSpan undertowSpan = spanFromContext(continuation.context());
+                ServletRequest request = servletRequestContext.getServletRequest();
+                request.setAttribute(DD_CONTEXT_ATTRIBUTE, continuation.context());
+                undertowSpan.setSpanName(SERVLET_REQUEST);
 
-        undertowSpan.setTag(SERVLET_CONTEXT, request.getServletContext().getContextPath());
-        String relativePath = exchange.getRelativePath();
+                undertowSpan.setTag(SERVLET_CONTEXT, request.getServletContext().getContextPath());
+                String relativePath = exchange.getRelativePath();
 
-        ServletPathMatch servletPathMatch = servletRequestContext.getServletPathMatch();
-        if (UndertowDecorator.UNDERTOW_LEGACY_TRACING
-            && servletPathMatch != null
-            && servletPathMatch.getMappingMatch() != MappingMatch.DEFAULT) {
-          // Set the route unless the mapping match is default, this way we prevent setting route
-          // for a non-existing resource. Otherwise, it'd set a non-existing resource name with
-          // higher priority than 404 resource, so it wouldn't be able to set resource 404 later in
-          // the onResponse instrumentation.
-          HTTP_RESOURCE_DECORATOR.withRoute(
-              undertowSpan, exchange.getRequestMethod().toString(), relativePath, false);
+                ServletPathMatch servletPathMatch = servletRequestContext.getServletPathMatch();
+                if (UndertowDecorator.UNDERTOW_LEGACY_TRACING
+                        && servletPathMatch != null
+                        && servletPathMatch.getMappingMatch() != MappingMatch.DEFAULT) {
+                    // Set the route unless the mapping match is default, this way we prevent setting route
+                    // for a non-existing resource. Otherwise, it'd set a non-existing resource name with
+                    // higher priority than 404 resource, so it wouldn't be able to set resource 404 later in
+                    // the onResponse instrumentation.
+                    HTTP_RESOURCE_DECORATOR.withRoute(
+                            undertowSpan, exchange.getRequestMethod().toString(), relativePath, false);
+                }
+                // The servlet.path tag is expected even for a non-existing resource.
+                undertowSpan.setTag(SERVLET_PATH, relativePath);
+            }
         }
-        // The servlet.path tag is expected even for a non-existing resource.
-        undertowSpan.setTag(SERVLET_PATH, relativePath);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowInstrumentation.java
index b4a162bd0c2..94ca744b4be 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowInstrumentation.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowInstrumentation.java
@@ -12,33 +12,33 @@
 
 @AutoService(InstrumenterModule.class)
 public final class UndertowInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public UndertowInstrumentation() {
-    super("undertow", "undertow-2.0");
-  }
+    public UndertowInstrumentation() {
+        super("undertow", "undertow-2.0");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.undertow.server.HttpServerExchange";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.undertow.server.HttpServerExchange";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("dispatch"))
-            .and(takesArgument(0, named("java.util.concurrent.Executor")))
-            .and(takesArgument(1, named("java.lang.Runnable"))),
-        getClass().getName() + "$DispatchAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("dispatch"))
+                        .and(takesArgument(0, named("java.util.concurrent.Executor")))
+                        .and(takesArgument(1, named("java.lang.Runnable"))),
+                getClass().getName() + "$DispatchAdvice");
+    }
 
-  public static class DispatchAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void dispatchEnter(
-        @Advice.Argument(value = 1, readOnly = false) Runnable task,
-        @Advice.This final HttpServerExchange current) {
-      task = UndertowRunnableWrapper.wrapIfNeeded(task, current);
+    public static class DispatchAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void dispatchEnter(
+                @Advice.Argument(value = 1, readOnly = false) Runnable task,
+                @Advice.This final HttpServerExchange current) {
+            task = UndertowRunnableWrapper.wrapIfNeeded(task, current);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowRunnableWrapper.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowRunnableWrapper.java
index 3c33def3a0c..c0fdfa85409 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowRunnableWrapper.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowRunnableWrapper.java
@@ -10,32 +10,31 @@
 
 public class UndertowRunnableWrapper implements Runnable {
 
-  private Runnable runnable;
-  private HttpServerExchange exchange;
-  private ContextContinuation continuation;
+    private Runnable runnable;
+    private HttpServerExchange exchange;
+    private ContextContinuation continuation;
 
-  public UndertowRunnableWrapper(
-      Runnable runnable, HttpServerExchange exchange, ContextContinuation continuation) {
-    this.runnable = runnable;
-    this.exchange = exchange;
-    this.continuation = continuation;
-  }
-
-  @Override
-  public void run() {
-    try (ContextScope scope = continuation.resume()) {
-      runnable.run();
+    public UndertowRunnableWrapper(Runnable runnable, HttpServerExchange exchange, ContextContinuation continuation) {
+        this.runnable = runnable;
+        this.exchange = exchange;
+        this.continuation = continuation;
     }
-  }
 
-  public static Runnable wrapIfNeeded(final Runnable task, HttpServerExchange exchange) {
-    if (task instanceof UndertowRunnableWrapper || exclude(RUNNABLE, task)) {
-      return task;
+    @Override
+    public void run() {
+        try (ContextScope scope = continuation.resume()) {
+            runnable.run();
+        }
     }
-    ContextContinuation continuation = Context.current().capture();
-    if (continuation.context() != Context.root()) {
-      return new UndertowRunnableWrapper(task, exchange, continuation);
+
+    public static Runnable wrapIfNeeded(final Runnable task, HttpServerExchange exchange) {
+        if (task instanceof UndertowRunnableWrapper || exclude(RUNNABLE, task)) {
+            return task;
+        }
+        ContextContinuation continuation = Context.current().capture();
+        if (continuation.context() != Context.root()) {
+            return new UndertowRunnableWrapper(task, exchange, continuation);
+        }
+        return task; // don't wrap unless there is a span to propagate
     }
-    return task; // don't wrap unless there is a span to propagate
-  }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/test/java/datadog/trace/instrumentation/undertow/FormDataContentHelperTest.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/test/java/datadog/trace/instrumentation/undertow/FormDataContentHelperTest.java
index 5f5ef6b1499..d5a342b1544 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/test/java/datadog/trace/instrumentation/undertow/FormDataContentHelperTest.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/test/java/datadog/trace/instrumentation/undertow/FormDataContentHelperTest.java
@@ -21,142 +21,140 @@
 
 class FormDataContentHelperTest {
 
-  @TempDir Path tempDir;
-
-  @Test
-  void diskFile_contentRead() throws IOException {
-    byte[] content = "file content".getBytes(StandardCharsets.ISO_8859_1);
-    Path file = Files.createTempFile(tempDir, "upload", ".bin");
-    Files.write(file, content);
-
-    FormData fd = new FormData(10);
-    fd.add("upload", file, "test.bin", new HeaderMap());
-
-    List<String> result = FormDataContentHelper.collectContents(fd);
-    assertEquals(1, result.size());
-    assertEquals("file content", result.get(0));
-  }
-
-  @Test
-  void formField_skipped() throws IOException {
-    FormData fd = new FormData(10);
-    fd.add("name", "John");
-
-    List<String> result = FormDataContentHelper.collectContents(fd);
-    assertTrue(result.isEmpty());
-  }
-
-  @Test
-  void emptyFilename_contentRead() throws Exception {
-    // filename="" means a file upload with no filename attribute — content still inspected
-    byte[] content = "data".getBytes(StandardCharsets.ISO_8859_1);
-    Path file = Files.createTempFile(tempDir, "upload", ".bin");
-    Files.write(file, content);
-
-    FormData fd = new FormData(10);
-    fd.add("upload", file, "", new HeaderMap());
-
-    List<String> result = FormDataContentHelper.collectContents(fd);
-    assertEquals(1, result.size());
-    assertEquals("data", result.get(0));
-  }
-
-  @Test
-  void truncation_atMaxContentBytes() throws IOException {
-    byte[] content = new byte[FormDataContentHelper.MAX_CONTENT_BYTES + 500];
-    Arrays.fill(content, (byte) 'X');
-    Path file = Files.createTempFile(tempDir, "upload", ".bin");
-    Files.write(file, content);
-
-    FormData fd = new FormData(10);
-    fd.add("upload", file, "big.bin", new HeaderMap());
-
-    List<String> result = FormDataContentHelper.collectContents(fd);
-    assertEquals(1, result.size());
-    assertEquals(FormDataContentHelper.MAX_CONTENT_BYTES, result.get(0).length());
-  }
-
-  @Test
-  void maxFilesLimit_enforced() throws IOException {
-    FormData fd = new FormData(100);
-    int limit = FormDataContentHelper.MAX_FILES_TO_INSPECT;
-    for (int i = 0; i < limit + 1; i++) {
-      Path file = Files.createTempFile(tempDir, "f" + i, ".bin");
-      Files.write(file, ("content_" + i).getBytes(StandardCharsets.ISO_8859_1));
-      fd.add("file" + i, file, "f" + i + ".bin", new HeaderMap());
+    @TempDir
+    Path tempDir;
+
+    @Test
+    void diskFile_contentRead() throws IOException {
+        byte[] content = "file content".getBytes(StandardCharsets.ISO_8859_1);
+        Path file = Files.createTempFile(tempDir, "upload", ".bin");
+        Files.write(file, content);
+
+        FormData fd = new FormData(10);
+        fd.add("upload", file, "test.bin", new HeaderMap());
+
+        List<String> result = FormDataContentHelper.collectContents(fd);
+        assertEquals(1, result.size());
+        assertEquals("file content", result.get(0));
+    }
+
+    @Test
+    void formField_skipped() throws IOException {
+        FormData fd = new FormData(10);
+        fd.add("name", "John");
+
+        List<String> result = FormDataContentHelper.collectContents(fd);
+        assertTrue(result.isEmpty());
+    }
+
+    @Test
+    void emptyFilename_contentRead() throws Exception {
+        // filename="" means a file upload with no filename attribute — content still inspected
+        byte[] content = "data".getBytes(StandardCharsets.ISO_8859_1);
+        Path file = Files.createTempFile(tempDir, "upload", ".bin");
+        Files.write(file, content);
+
+        FormData fd = new FormData(10);
+        fd.add("upload", file, "", new HeaderMap());
+
+        List<String> result = FormDataContentHelper.collectContents(fd);
+        assertEquals(1, result.size());
+        assertEquals("data", result.get(0));
+    }
+
+    @Test
+    void truncation_atMaxContentBytes() throws IOException {
+        byte[] content = new byte[FormDataContentHelper.MAX_CONTENT_BYTES + 500];
+        Arrays.fill(content, (byte) 'X');
+        Path file = Files.createTempFile(tempDir, "upload", ".bin");
+        Files.write(file, content);
+
+        FormData fd = new FormData(10);
+        fd.add("upload", file, "big.bin", new HeaderMap());
+
+        List<String> result = FormDataContentHelper.collectContents(fd);
+        assertEquals(1, result.size());
+        assertEquals(FormDataContentHelper.MAX_CONTENT_BYTES, result.get(0).length());
+    }
+
+    @Test
+    void maxFilesLimit_enforced() throws IOException {
+        FormData fd = new FormData(100);
+        int limit = FormDataContentHelper.MAX_FILES_TO_INSPECT;
+        for (int i = 0; i < limit + 1; i++) {
+            Path file = Files.createTempFile(tempDir, "f" + i, ".bin");
+            Files.write(file, ("content_" + i).getBytes(StandardCharsets.ISO_8859_1));
+            fd.add("file" + i, file, "f" + i + ".bin", new HeaderMap());
+        }
+
+        List<String> result = FormDataContentHelper.collectContents(fd);
+        assertEquals(limit, result.size());
+    }
+
+    @Test
+    void mixedFieldsAndFiles() throws IOException {
+        Path file = Files.createTempFile(tempDir, "upload", ".bin");
+        Files.write(file, "file content".getBytes(StandardCharsets.ISO_8859_1));
+
+        FormData fd = new FormData(10);
+        fd.add("name", "John");
+        fd.add("upload", file, "test.bin", new HeaderMap());
+
+        List<String> result = FormDataContentHelper.collectContents(fd);
+        assertEquals(1, result.size());
+        assertEquals("file content", result.get(0));
+    }
+
+    @Test
+    void inMemoryFile_contentRead_viaProxy() throws Exception {
+        // Simulate an in-memory file upload (Undertow 2.2+) using a Proxy.
+        // getPath() throws IllegalStateException for in-memory uploads; the helper
+        // falls back to getFileItem().getInputStream() via reflection.
+        byte[] content = "in-memory content".getBytes(StandardCharsets.ISO_8859_1);
+
+        FormData fd = new FormData(10);
+        addInMemoryFileValue(fd, "upload", "mem.bin", content);
+
+        // The reflection fallback won't work in a test environment where FileItem
+        // isn't actually loaded, so we just verify the helper doesn't throw and
+        // returns either the content (if reflection works) or "" (graceful fallback).
+        List<String> result = FormDataContentHelper.collectContents(fd);
+        assertEquals(1, result.size());
+        // Either the reflection path worked or the graceful fallback returned ""
+        assertTrue(result.get(0).equals("in-memory content") || result.get(0).isEmpty());
     }
 
-    List<String> result = FormDataContentHelper.collectContents(fd);
-    assertEquals(limit, result.size());
-  }
-
-  @Test
-  void mixedFieldsAndFiles() throws IOException {
-    Path file = Files.createTempFile(tempDir, "upload", ".bin");
-    Files.write(file, "file content".getBytes(StandardCharsets.ISO_8859_1));
-
-    FormData fd = new FormData(10);
-    fd.add("name", "John");
-    fd.add("upload", file, "test.bin", new HeaderMap());
-
-    List<String> result = FormDataContentHelper.collectContents(fd);
-    assertEquals(1, result.size());
-    assertEquals("file content", result.get(0));
-  }
-
-  @Test
-  void inMemoryFile_contentRead_viaProxy() throws Exception {
-    // Simulate an in-memory file upload (Undertow 2.2+) using a Proxy.
-    // getPath() throws IllegalStateException for in-memory uploads; the helper
-    // falls back to getFileItem().getInputStream() via reflection.
-    byte[] content = "in-memory content".getBytes(StandardCharsets.ISO_8859_1);
-
-    FormData fd = new FormData(10);
-    addInMemoryFileValue(fd, "upload", "mem.bin", content);
-
-    // The reflection fallback won't work in a test environment where FileItem
-    // isn't actually loaded, so we just verify the helper doesn't throw and
-    // returns either the content (if reflection works) or "" (graceful fallback).
-    List<String> result = FormDataContentHelper.collectContents(fd);
-    assertEquals(1, result.size());
-    // Either the reflection path worked or the graceful fallback returned ""
-    assertTrue(result.get(0).equals("in-memory content") || result.get(0).isEmpty());
-  }
-
-  @SuppressWarnings("unchecked")
-  private static void addInMemoryFileValue(
-      FormData fd, String name, String filename, byte[] content) throws Exception {
-    Field valuesField = FormData.class.getDeclaredField("values");
-    valuesField.setAccessible(true);
-    Map<String, Deque<FormData.FormValue>> values =
-        (Map<String, Deque<FormData.FormValue>>) valuesField.get(fd);
-
-    // Use a Proxy so this compiles against Undertow 2.0 and also works against 2.2.x.
-    // getPath() throws to simulate an in-memory upload.
-    FormData.FormValue inMemory =
-        (FormData.FormValue)
-            Proxy.newProxyInstance(
+    @SuppressWarnings("unchecked")
+    private static void addInMemoryFileValue(FormData fd, String name, String filename, byte[] content)
+            throws Exception {
+        Field valuesField = FormData.class.getDeclaredField("values");
+        valuesField.setAccessible(true);
+        Map<String, Deque<FormData.FormValue>> values = (Map<String, Deque<FormData.FormValue>>) valuesField.get(fd);
+
+        // Use a Proxy so this compiles against Undertow 2.0 and also works against 2.2.x.
+        // getPath() throws to simulate an in-memory upload.
+        FormData.FormValue inMemory = (FormData.FormValue) Proxy.newProxyInstance(
                 FormData.FormValue.class.getClassLoader(),
                 new Class<?>[] {FormData.FormValue.class},
                 (proxy, method, args) -> {
-                  switch (method.getName()) {
-                    case "getFileName":
-                      return filename;
-                    case "getHeaders":
-                      return new HeaderMap();
-                    case "getPath":
-                      throw new IllegalStateException("in-memory upload has no path");
-                    case "isFile":
-                    case "isFileItem":
-                    case "isBigField":
-                      return false;
-                    default:
-                      return null;
-                  }
+                    switch (method.getName()) {
+                        case "getFileName":
+                            return filename;
+                        case "getHeaders":
+                            return new HeaderMap();
+                        case "getPath":
+                            throw new IllegalStateException("in-memory upload has no path");
+                        case "isFile":
+                        case "isFileItem":
+                        case "isBigField":
+                            return false;
+                        default:
+                            return null;
+                    }
                 });
 
-    Deque<FormData.FormValue> deque = new ArrayDeque<>();
-    deque.add(inMemory);
-    values.put(name, deque);
-  }
+        Deque<FormData.FormValue> deque = new ArrayDeque<>();
+        deque.add(inMemory);
+        values.put(name, deque);
+    }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/test/java/datadog/trace/instrumentation/undertow/FormDataMapTest.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/test/java/datadog/trace/instrumentation/undertow/FormDataMapTest.java
index c8c4366a963..f4647a9696a 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/test/java/datadog/trace/instrumentation/undertow/FormDataMapTest.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/test/java/datadog/trace/instrumentation/undertow/FormDataMapTest.java
@@ -19,112 +19,109 @@
 
 class FormDataMapTest {
 
-  @TempDir Path tempDir;
-
-  @Test
-  void textFieldIsIncluded() {
-    FormData fd = new FormData(10);
-    fd.add("name", "John");
-    FormDataMap map = new FormDataMap(fd);
-
-    assertTrue(map.containsKey("name"));
-    Collection<String> values = map.get("name");
-    assertEquals(1, values.size());
-    assertTrue(values.contains("John"));
-  }
-
-  @Test
-  void multipleTextValuesForSameKey() {
-    FormData fd = new FormData(10);
-    fd.add("tag", "foo");
-    fd.add("tag", "bar");
-    FormDataMap map = new FormDataMap(fd);
-
-    Collection<String> values = map.get("tag");
-    assertEquals(2, values.size());
-    assertTrue(values.contains("foo"));
-    assertTrue(values.contains("bar"));
-  }
-
-  @Test
-  void diskFileIsExcluded() throws IOException {
-    Path file = Files.createTempFile(tempDir, "upload", ".txt");
-    FormData fd = new FormData(10);
-    fd.add("upload", file, "evil.php", new HeaderMap());
-    FormDataMap map = new FormDataMap(fd);
-
-    assertTrue(map.containsKey("upload"));
-    assertTrue(map.get("upload").isEmpty());
-  }
-
-  @Test
-  void inMemoryFileIsExcluded() throws Exception {
-    // In undertow 2.2+, isFile() returns false for in-memory uploads, but getFileName() is still
-    // set. Verify our check (getFileName() == null) correctly excludes these uploads too.
-    FormData fd = new FormData(10);
-    addInMemoryFileValue(fd, "file", "evil.php");
-    FormDataMap map = new FormDataMap(fd);
-
-    assertTrue(map.containsKey("file"));
-    assertTrue(map.get("file").isEmpty());
-  }
-
-  @Test
-  void mixedTextAndFileFields() throws IOException {
-    Path file = Files.createTempFile(tempDir, "upload", ".txt");
-    FormData fd = new FormData(10);
-    fd.add("name", "John");
-    fd.add("email", "john@example.com");
-    fd.add("upload", file, "evil.php", new HeaderMap());
-    FormDataMap map = new FormDataMap(fd);
-
-    assertEquals(3, map.size());
-    assertTrue(map.get("name").contains("John"));
-    assertTrue(map.get("email").contains("john@example.com"));
-    assertTrue(map.get("upload").isEmpty());
-  }
-
-  @Test
-  void emptyFormData() {
-    FormData fd = new FormData(10);
-    FormDataMap map = new FormDataMap(fd);
-
-    assertTrue(map.isEmpty());
-    assertEquals(0, map.size());
-  }
-
-  @SuppressWarnings("unchecked")
-  private static void addInMemoryFileValue(FormData fd, String name, String filename)
-      throws Exception {
-    Field valuesField = FormData.class.getDeclaredField("values");
-    valuesField.setAccessible(true);
-    Map<String, Deque<FormData.FormValue>> values =
-        (Map<String, Deque<FormData.FormValue>>) valuesField.get(fd);
-
-    // Use a Proxy so this compiles against undertow 2.0 and also works against 2.2.x,
-    // which added getCharset(), getFileItem(), isFileItem(), and isBigField() to the interface.
-    FormData.FormValue inMemory =
-        (FormData.FormValue)
-            Proxy.newProxyInstance(
+    @TempDir
+    Path tempDir;
+
+    @Test
+    void textFieldIsIncluded() {
+        FormData fd = new FormData(10);
+        fd.add("name", "John");
+        FormDataMap map = new FormDataMap(fd);
+
+        assertTrue(map.containsKey("name"));
+        Collection<String> values = map.get("name");
+        assertEquals(1, values.size());
+        assertTrue(values.contains("John"));
+    }
+
+    @Test
+    void multipleTextValuesForSameKey() {
+        FormData fd = new FormData(10);
+        fd.add("tag", "foo");
+        fd.add("tag", "bar");
+        FormDataMap map = new FormDataMap(fd);
+
+        Collection<String> values = map.get("tag");
+        assertEquals(2, values.size());
+        assertTrue(values.contains("foo"));
+        assertTrue(values.contains("bar"));
+    }
+
+    @Test
+    void diskFileIsExcluded() throws IOException {
+        Path file = Files.createTempFile(tempDir, "upload", ".txt");
+        FormData fd = new FormData(10);
+        fd.add("upload", file, "evil.php", new HeaderMap());
+        FormDataMap map = new FormDataMap(fd);
+
+        assertTrue(map.containsKey("upload"));
+        assertTrue(map.get("upload").isEmpty());
+    }
+
+    @Test
+    void inMemoryFileIsExcluded() throws Exception {
+        // In undertow 2.2+, isFile() returns false for in-memory uploads, but getFileName() is still
+        // set. Verify our check (getFileName() == null) correctly excludes these uploads too.
+        FormData fd = new FormData(10);
+        addInMemoryFileValue(fd, "file", "evil.php");
+        FormDataMap map = new FormDataMap(fd);
+
+        assertTrue(map.containsKey("file"));
+        assertTrue(map.get("file").isEmpty());
+    }
+
+    @Test
+    void mixedTextAndFileFields() throws IOException {
+        Path file = Files.createTempFile(tempDir, "upload", ".txt");
+        FormData fd = new FormData(10);
+        fd.add("name", "John");
+        fd.add("email", "john@example.com");
+        fd.add("upload", file, "evil.php", new HeaderMap());
+        FormDataMap map = new FormDataMap(fd);
+
+        assertEquals(3, map.size());
+        assertTrue(map.get("name").contains("John"));
+        assertTrue(map.get("email").contains("john@example.com"));
+        assertTrue(map.get("upload").isEmpty());
+    }
+
+    @Test
+    void emptyFormData() {
+        FormData fd = new FormData(10);
+        FormDataMap map = new FormDataMap(fd);
+
+        assertTrue(map.isEmpty());
+        assertEquals(0, map.size());
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void addInMemoryFileValue(FormData fd, String name, String filename) throws Exception {
+        Field valuesField = FormData.class.getDeclaredField("values");
+        valuesField.setAccessible(true);
+        Map<String, Deque<FormData.FormValue>> values = (Map<String, Deque<FormData.FormValue>>) valuesField.get(fd);
+
+        // Use a Proxy so this compiles against undertow 2.0 and also works against 2.2.x,
+        // which added getCharset(), getFileItem(), isFileItem(), and isBigField() to the interface.
+        FormData.FormValue inMemory = (FormData.FormValue) Proxy.newProxyInstance(
                 FormData.FormValue.class.getClassLoader(),
                 new Class<?>[] {FormData.FormValue.class},
                 (proxy, method, args) -> {
-                  switch (method.getName()) {
-                    case "getValue":
-                      return "";
-                    case "isFile":
-                    case "isFileItem":
-                    case "isBigField":
-                      return false;
-                    case "getFileName":
-                      return filename;
-                    default:
-                      return null;
-                  }
+                    switch (method.getName()) {
+                        case "getValue":
+                            return "";
+                        case "isFile":
+                        case "isFileItem":
+                        case "isBigField":
+                            return false;
+                        case "getFileName":
+                            return filename;
+                        default:
+                            return null;
+                    }
                 });
 
-    Deque<FormData.FormValue> deque = new ArrayDeque<>();
-    deque.add(inMemory);
-    values.put(name, deque);
-  }
+        Deque<FormData.FormValue> deque = new ArrayDeque<>();
+        deque.add(inMemory);
+        values.put(name, deque);
+    }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.2/src/main/java/datadog/trace/instrumentation/undertow/JakartaServletInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.2/src/main/java/datadog/trace/instrumentation/undertow/JakartaServletInstrumentation.java
index e429c961a11..04758cfd657 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.2/src/main/java/datadog/trace/instrumentation/undertow/JakartaServletInstrumentation.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.2/src/main/java/datadog/trace/instrumentation/undertow/JakartaServletInstrumentation.java
@@ -21,52 +21,52 @@
 
 @AutoService(InstrumenterModule.class)
 public final class JakartaServletInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JakartaServletInstrumentation() {
-    super("undertow", "undertow-2.2");
-  }
+    public JakartaServletInstrumentation() {
+        super("undertow", "undertow-2.2");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.undertow.servlet.handlers.ServletInitialHandler";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.undertow.servlet.handlers.ServletInitialHandler";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("dispatchRequest")), getClass().getName() + "$DispatchAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("dispatchRequest")), getClass().getName() + "$DispatchAdvice");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".HttpServerExchangeURIDataAdapter",
-      packageName + ".UndertowDecorator",
-      packageName + ".UndertowBlockingHandler",
-      packageName + ".UndertowBlockResponseFunction",
-      packageName + ".UndertowExtractAdapter",
-      packageName + ".UndertowExtractAdapter$Request",
-      packageName + ".UndertowExtractAdapter$Response",
-      packageName + ".IgnoreSendAttribute",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            packageName + ".HttpServerExchangeURIDataAdapter",
+            packageName + ".UndertowDecorator",
+            packageName + ".UndertowBlockingHandler",
+            packageName + ".UndertowBlockResponseFunction",
+            packageName + ".UndertowExtractAdapter",
+            packageName + ".UndertowExtractAdapter$Request",
+            packageName + ".UndertowExtractAdapter$Response",
+            packageName + ".IgnoreSendAttribute",
+        };
+    }
 
-  public static class DispatchAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter(
-        @Advice.Argument(0) final HttpServerExchange exchange,
-        @Advice.Argument(1) final ServletRequestContext servletRequestContext) {
-      ContextContinuation continuation = exchange.getAttachment(DATADOG_UNDERTOW_CONTINUATION);
-      if (continuation != null) {
-        AgentSpan undertowSpan = spanFromContext(continuation.context());
-        ServletRequest request = servletRequestContext.getServletRequest();
-        request.setAttribute(DD_CONTEXT_ATTRIBUTE, continuation.context());
-        undertowSpan.setSpanName(SERVLET_REQUEST);
+    public static class DispatchAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void enter(
+                @Advice.Argument(0) final HttpServerExchange exchange,
+                @Advice.Argument(1) final ServletRequestContext servletRequestContext) {
+            ContextContinuation continuation = exchange.getAttachment(DATADOG_UNDERTOW_CONTINUATION);
+            if (continuation != null) {
+                AgentSpan undertowSpan = spanFromContext(continuation.context());
+                ServletRequest request = servletRequestContext.getServletRequest();
+                request.setAttribute(DD_CONTEXT_ATTRIBUTE, continuation.context());
+                undertowSpan.setSpanName(SERVLET_REQUEST);
 
-        undertowSpan.setTag(SERVLET_CONTEXT, request.getServletContext().getContextPath());
-        undertowSpan.setTag(SERVLET_PATH, exchange.getRelativePath());
-      }
+                undertowSpan.setTag(SERVLET_CONTEXT, request.getServletContext().getContextPath());
+                undertowSpan.setTag(SERVLET_PATH, exchange.getRelativePath());
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeURIDataAdapter.java b/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeURIDataAdapter.java
index f389a9614f2..c31645553eb 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeURIDataAdapter.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeURIDataAdapter.java
@@ -5,59 +5,57 @@
 import io.undertow.server.HttpServerExchange;
 
 final class HttpServerExchangeURIDataAdapter extends URIRawDataAdapter {
-  private final HttpServerExchange httpServerExchange;
-
-  public HttpServerExchangeURIDataAdapter(final HttpServerExchange httpServerExchange) {
-    this.httpServerExchange = httpServerExchange;
-  }
-
-  @Override
-  public String scheme() {
-    return httpServerExchange.getRequestScheme();
-  }
-
-  @Override
-  @SuppressFBWarnings(
-      value = "DCN_NULLPOINTER_EXCEPTION",
-      justification =
-          "getHostName() NPEs inside Undertow itself, not on a null we could check beforehand"
-              + " (e.g. no Host header and a connection whose local address isn't an"
-              + " InetSocketAddress, such as AJP or a Unix domain socket transport)")
-  public String host() {
-    try {
-      return httpServerExchange.getHostName();
-    } catch (final NullPointerException e) {
-      return null;
+    private final HttpServerExchange httpServerExchange;
+
+    public HttpServerExchangeURIDataAdapter(final HttpServerExchange httpServerExchange) {
+        this.httpServerExchange = httpServerExchange;
+    }
+
+    @Override
+    public String scheme() {
+        return httpServerExchange.getRequestScheme();
+    }
+
+    @Override
+    @SuppressFBWarnings(
+            value = "DCN_NULLPOINTER_EXCEPTION",
+            justification = "getHostName() NPEs inside Undertow itself, not on a null we could check beforehand"
+                    + " (e.g. no Host header and a connection whose local address isn't an"
+                    + " InetSocketAddress, such as AJP or a Unix domain socket transport)")
+    public String host() {
+        try {
+            return httpServerExchange.getHostName();
+        } catch (final NullPointerException e) {
+            return null;
+        }
+    }
+
+    @Override
+    @SuppressFBWarnings(
+            value = "DCN_NULLPOINTER_EXCEPTION",
+            justification = "getHostPort() NPEs inside Undertow itself, not on a null we could check beforehand"
+                    + " (e.g. no Host header and a connection whose local address isn't an"
+                    + " InetSocketAddress, such as AJP or a Unix domain socket transport)")
+    public int port() {
+        try {
+            return httpServerExchange.getHostPort();
+        } catch (final NullPointerException e) {
+            return 0;
+        }
+    }
+
+    @Override
+    protected String innerRawPath() {
+        return httpServerExchange.getRequestURI();
     }
-  }
-
-  @Override
-  @SuppressFBWarnings(
-      value = "DCN_NULLPOINTER_EXCEPTION",
-      justification =
-          "getHostPort() NPEs inside Undertow itself, not on a null we could check beforehand"
-              + " (e.g. no Host header and a connection whose local address isn't an"
-              + " InetSocketAddress, such as AJP or a Unix domain socket transport)")
-  public int port() {
-    try {
-      return httpServerExchange.getHostPort();
-    } catch (final NullPointerException e) {
-      return 0;
+
+    @Override
+    protected String innerRawQuery() {
+        return httpServerExchange.getQueryString();
+    }
+
+    @Override
+    public String fragment() {
+        return null;
     }
-  }
-
-  @Override
-  protected String innerRawPath() {
-    return httpServerExchange.getRequestURI();
-  }
-
-  @Override
-  protected String innerRawQuery() {
-    return httpServerExchange.getQueryString();
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/IgnoreSendAttribute.java b/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/IgnoreSendAttribute.java
index b4e66944a2a..a188090de7f 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/IgnoreSendAttribute.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/IgnoreSendAttribute.java
@@ -3,8 +3,8 @@
 import io.undertow.util.AttachmentKey;
 
 public enum IgnoreSendAttribute {
-  INSTANCE;
+    INSTANCE;
 
-  public static final AttachmentKey<IgnoreSendAttribute> IGNORE_SEND_KEY =
-      AttachmentKey.create(IgnoreSendAttribute.class);
+    public static final AttachmentKey<IgnoreSendAttribute> IGNORE_SEND_KEY =
+            AttachmentKey.create(IgnoreSendAttribute.class);
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowBlockResponseFunction.java b/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowBlockResponseFunction.java
index 1e74d63bc93..691558f8fff 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowBlockResponseFunction.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowBlockResponseFunction.java
@@ -8,29 +8,28 @@
 import java.util.Map;
 
 public class UndertowBlockResponseFunction implements BlockResponseFunction {
-  private final HttpServerExchange exchange;
+    private final HttpServerExchange exchange;
 
-  public UndertowBlockResponseFunction(HttpServerExchange exchange) {
-    this.exchange = exchange;
-  }
+    public UndertowBlockResponseFunction(HttpServerExchange exchange) {
+        this.exchange = exchange;
+    }
 
-  @Override
-  public boolean tryCommitBlockingResponse(
-      TraceSegment segment,
-      int statusCode,
-      BlockingContentType templateType,
-      Map<String, String> extraHeaders,
-      String securityResponseId) {
-    Flow.Action.RequestBlockingAction rab =
-        new Flow.Action.RequestBlockingAction(
-            statusCode, templateType, extraHeaders, securityResponseId);
-    exchange.putAttachment(UndertowBlockingHandler.TRACE_SEGMENT, segment);
-    exchange.putAttachment(UndertowBlockingHandler.REQUEST_BLOCKING_DATA, rab);
-    if (exchange.isInIoThread()) {
-      exchange.dispatch(UndertowBlockingHandler.INSTANCE);
-    } else {
-      UndertowBlockingHandler.INSTANCE.handleRequest(exchange);
+    @Override
+    public boolean tryCommitBlockingResponse(
+            TraceSegment segment,
+            int statusCode,
+            BlockingContentType templateType,
+            Map<String, String> extraHeaders,
+            String securityResponseId) {
+        Flow.Action.RequestBlockingAction rab =
+                new Flow.Action.RequestBlockingAction(statusCode, templateType, extraHeaders, securityResponseId);
+        exchange.putAttachment(UndertowBlockingHandler.TRACE_SEGMENT, segment);
+        exchange.putAttachment(UndertowBlockingHandler.REQUEST_BLOCKING_DATA, rab);
+        if (exchange.isInIoThread()) {
+            exchange.dispatch(UndertowBlockingHandler.INSTANCE);
+        } else {
+            UndertowBlockingHandler.INSTANCE.handleRequest(exchange);
+        }
+        return true;
     }
-    return true;
-  }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowBlockingHandler.java b/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowBlockingHandler.java
index 0a2a7c2ed5d..602b3d49e17 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowBlockingHandler.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowBlockingHandler.java
@@ -24,106 +24,104 @@
 import org.xnio.channels.StreamSinkChannel;
 
 public class UndertowBlockingHandler implements HttpHandler {
-  public static final UndertowBlockingHandler INSTANCE = new UndertowBlockingHandler();
-  private static final Logger log = LoggerFactory.getLogger(UndertowBlockingHandler.class);
-  private static final ByteBuffer EMPTY_BB = ByteBuffer.allocate(0);
-
-  public static final AttachmentKey<Flow.Action.RequestBlockingAction> REQUEST_BLOCKING_DATA =
-      AttachmentKey.create(Flow.Action.RequestBlockingAction.class);
-  public static final AttachmentKey<TraceSegment> TRACE_SEGMENT =
-      AttachmentKey.create(TraceSegment.class);
-
-  private UndertowBlockingHandler() {}
-
-  @Override
-  public void handleRequest(HttpServerExchange exchange) {
-    Flow.Action.RequestBlockingAction rba = exchange.getAttachment(REQUEST_BLOCKING_DATA);
-    commitBlockingResponse(exchange, rba);
-  }
-
-  private static void commitBlockingResponse(
-      HttpServerExchange xchg, Flow.Action.RequestBlockingAction rba) {
-    if (xchg.isResponseStarted()) {
-      log.warn("response already committed, we can't change it");
-      return;
+    public static final UndertowBlockingHandler INSTANCE = new UndertowBlockingHandler();
+    private static final Logger log = LoggerFactory.getLogger(UndertowBlockingHandler.class);
+    private static final ByteBuffer EMPTY_BB = ByteBuffer.allocate(0);
+
+    public static final AttachmentKey<Flow.Action.RequestBlockingAction> REQUEST_BLOCKING_DATA =
+            AttachmentKey.create(Flow.Action.RequestBlockingAction.class);
+    public static final AttachmentKey<TraceSegment> TRACE_SEGMENT = AttachmentKey.create(TraceSegment.class);
+
+    private UndertowBlockingHandler() {}
+
+    @Override
+    public void handleRequest(HttpServerExchange exchange) {
+        Flow.Action.RequestBlockingAction rba = exchange.getAttachment(REQUEST_BLOCKING_DATA);
+        commitBlockingResponse(exchange, rba);
     }
 
-    TraceSegment segment = xchg.getAttachment(TRACE_SEGMENT);
-    xchg.putAttachment(IgnoreSendAttribute.IGNORE_SEND_KEY, IgnoreSendAttribute.INSTANCE);
-
-    try {
-      xchg.setStatusCode(BlockingActionHelper.getHttpCode(rba.getStatusCode()));
-      HeaderMap headers = xchg.getResponseHeaders();
-      headers.clear();
-      HeaderValues acceptHeaderValues = xchg.getRequestHeaders().get(Headers.ACCEPT);
-
-      for (Map.Entry<String, String> h : rba.getExtraHeaders().entrySet()) {
-        headers.add(HttpString.tryFromString(h.getKey()), h.getValue());
-      }
-
-      final ByteBuffer buffer;
-      if (rba.getBlockingContentType() != BlockingContentType.NONE) {
-        String acceptHeader = acceptHeaderValues != null ? acceptHeaderValues.peekLast() : null;
-        BlockingActionHelper.TemplateType type =
-            BlockingActionHelper.determineTemplateType(rba.getBlockingContentType(), acceptHeader);
-        byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
-
-        headers.add(Headers.CONTENT_LENGTH, Integer.toString(template.length));
-        headers.add(Headers.CONTENT_TYPE, BlockingActionHelper.getContentType(type));
-        buffer = ByteBuffer.wrap(template);
-      } else {
-        buffer = EMPTY_BB;
-      }
-
-      segment.effectivelyBlocked();
-
-      // blocking response to avoid having the intercepted caller and its callers interfere
-      // even if this is an IO thread...
-      // The async alternative at this level would be to set a write listener and call
-      // resumeWrites()
-      StreamSinkChannel responseChannel = xchg.getResponseChannel();
-      long deadline = System.nanoTime() + 500 * 1000 * 1000; // 500 ms
-      boolean finished = false;
-      while (true) {
-        if (buffer.hasRemaining()) {
-          responseChannel.writeFinal(buffer);
+    private static void commitBlockingResponse(HttpServerExchange xchg, Flow.Action.RequestBlockingAction rba) {
+        if (xchg.isResponseStarted()) {
+            log.warn("response already committed, we can't change it");
+            return;
         }
-        if (buffer.hasRemaining() || !responseChannel.flush()) {
-          long remaining = System.nanoTime() - deadline;
-          if (remaining > 0) {
-            try {
-              responseChannel.awaitWritable(remaining, TimeUnit.NANOSECONDS);
-            } catch (InterruptedIOException iioe) {
-              log.warn("Interrupted while waiting for write of blocking response");
-              break;
+
+        TraceSegment segment = xchg.getAttachment(TRACE_SEGMENT);
+        xchg.putAttachment(IgnoreSendAttribute.IGNORE_SEND_KEY, IgnoreSendAttribute.INSTANCE);
+
+        try {
+            xchg.setStatusCode(BlockingActionHelper.getHttpCode(rba.getStatusCode()));
+            HeaderMap headers = xchg.getResponseHeaders();
+            headers.clear();
+            HeaderValues acceptHeaderValues = xchg.getRequestHeaders().get(Headers.ACCEPT);
+
+            for (Map.Entry<String, String> h : rba.getExtraHeaders().entrySet()) {
+                headers.add(HttpString.tryFromString(h.getKey()), h.getValue());
+            }
+
+            final ByteBuffer buffer;
+            if (rba.getBlockingContentType() != BlockingContentType.NONE) {
+                String acceptHeader = acceptHeaderValues != null ? acceptHeaderValues.peekLast() : null;
+                BlockingActionHelper.TemplateType type =
+                        BlockingActionHelper.determineTemplateType(rba.getBlockingContentType(), acceptHeader);
+                byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
+
+                headers.add(Headers.CONTENT_LENGTH, Integer.toString(template.length));
+                headers.add(Headers.CONTENT_TYPE, BlockingActionHelper.getContentType(type));
+                buffer = ByteBuffer.wrap(template);
+            } else {
+                buffer = EMPTY_BB;
+            }
+
+            segment.effectivelyBlocked();
+
+            // blocking response to avoid having the intercepted caller and its callers interfere
+            // even if this is an IO thread...
+            // The async alternative at this level would be to set a write listener and call
+            // resumeWrites()
+            StreamSinkChannel responseChannel = xchg.getResponseChannel();
+            long deadline = System.nanoTime() + 500 * 1000 * 1000; // 500 ms
+            boolean finished = false;
+            while (true) {
+                if (buffer.hasRemaining()) {
+                    responseChannel.writeFinal(buffer);
+                }
+                if (buffer.hasRemaining() || !responseChannel.flush()) {
+                    long remaining = System.nanoTime() - deadline;
+                    if (remaining > 0) {
+                        try {
+                            responseChannel.awaitWritable(remaining, TimeUnit.NANOSECONDS);
+                        } catch (InterruptedIOException iioe) {
+                            log.warn("Interrupted while waiting for write of blocking response");
+                            break;
+                        }
+                    } else {
+                        log.warn("Exceeded time for writing blocking response");
+                        break;
+                    }
+                } else {
+                    finished = true;
+                    break;
+                }
+            }
+            if (!finished) {
+                log.warn("Did not manage to fully write blocking response");
             }
-          } else {
-            log.warn("Exceeded time for writing blocking response");
-            break;
-          }
-        } else {
-          finished = true;
-          break;
+
+            markAsEffectivelyBlocked(xchg);
+            xchg.endExchange();
+        } catch (Throwable rte) {
+            log.warn("Error sending blocking response", rte);
         }
-      }
-      if (!finished) {
-        log.warn("Did not manage to fully write blocking response");
-      }
-
-      markAsEffectivelyBlocked(xchg);
-      xchg.endExchange();
-    } catch (Throwable rte) {
-      log.warn("Error sending blocking response", rte);
     }
-  }
-
-  private static void markAsEffectivelyBlocked(HttpServerExchange xchg) {
-    ContextContinuation continuation = xchg.getAttachment(DATADOG_UNDERTOW_CONTINUATION);
-    if (continuation != null) {
-      AgentSpan.fromContext(continuation.context())
-          .getRequestContext()
-          .getTraceSegment()
-          .effectivelyBlocked();
+
+    private static void markAsEffectivelyBlocked(HttpServerExchange xchg) {
+        ContextContinuation continuation = xchg.getAttachment(DATADOG_UNDERTOW_CONTINUATION);
+        if (continuation != null) {
+            AgentSpan.fromContext(continuation.context())
+                    .getRequestContext()
+                    .getTraceSegment()
+                    .effectivelyBlocked();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowDecorator.java b/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowDecorator.java
index a8e2a1a6c8a..7f1436b64b3 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowDecorator.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowDecorator.java
@@ -15,96 +15,88 @@
 import java.net.InetSocketAddress;
 
 public class UndertowDecorator
-    extends HttpServerDecorator<
-        HttpServerExchange, HttpServerExchange, HttpServerExchange, HttpServerExchange> {
-  public static final CharSequence SERVLET_REQUEST =
-      UTF8BytesString.create(
-          SpanNaming.instance().namingSchema().server().operationForComponent("java-web-servlet"));
-  public static final CharSequence UNDERTOW_HTTP_SERVER =
-      UTF8BytesString.create("undertow-http-server");
-
-  @SuppressWarnings("rawtypes")
-  private static final InstanceStore<AttachmentKey> attachmentStore =
-      InstanceStore.of(AttachmentKey.class);
-
-  @SuppressWarnings("unchecked")
-  public static final AttachmentKey<ContextContinuation> DATADOG_UNDERTOW_CONTINUATION =
-      attachmentStore.getOrCreate(
-          "DD_UNDERTOW_CONTINUATION", () -> AttachmentKey.create(ContextContinuation.class));
-
-  @SuppressWarnings("unchecked")
-  public static final AttachmentKey<Context> PARENT_CONTEXT_KEY =
-      attachmentStore.getOrCreate(
-          "DD_UNDERTOW_PARENT_CONTEXT", () -> AttachmentKey.create(Context.class));
-
-  public static final UndertowDecorator DECORATE = new UndertowDecorator();
-  public static final CharSequence UNDERTOW_REQUEST =
-      UTF8BytesString.create(DECORATE.operationName());
-  public static final boolean UNDERTOW_LEGACY_TRACING =
-      Config.get().isLegacyTracingEnabled(true, "undertow");
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"undertow-http", "undertow-http-server"};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return UNDERTOW_HTTP_SERVER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpServerExchange> getter() {
-    return UndertowExtractAdapter.Request.GETTER;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpServerExchange> responseGetter() {
-    return UndertowExtractAdapter.Response.GETTER;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return UNDERTOW_REQUEST;
-  }
-
-  @Override
-  protected String method(final HttpServerExchange exchange) {
-    return exchange.getRequestMethod().toString();
-  }
-
-  @Override
-  protected URIDataAdapter url(final HttpServerExchange exchange) {
-    return new HttpServerExchangeURIDataAdapter(exchange);
-  }
-
-  @Override
-  protected String peerHostIP(final HttpServerExchange exchange) {
-    return exchange.getSourceAddress().getAddress().getHostAddress();
-  }
-
-  @Override
-  protected int peerPort(final HttpServerExchange exchange) {
-    // getDestinationAddress() can be null in the same situations that make
-    // HttpServerExchangeURIDataAdapter#port() NPE internally (e.g. AJP, a Unix domain socket
-    // transport, or a wrapped/detached ServerConnection).
-    InetSocketAddress destination = exchange.getDestinationAddress();
-    return destination == null ? UNSET_PORT : destination.getPort();
-  }
-
-  @Override
-  protected int status(final HttpServerExchange exchange) {
-    return exchange.getResponseCode();
-  }
-
-  @Override
-  protected boolean isAppSecOnResponseSeparate() {
-    return true;
-  }
-
-  @Override
-  protected BlockResponseFunction createBlockResponseFunction(
-      HttpServerExchange httpServerExchange, HttpServerExchange httpServerExchange1) {
-    return new UndertowBlockResponseFunction(httpServerExchange);
-  }
+        extends HttpServerDecorator<HttpServerExchange, HttpServerExchange, HttpServerExchange, HttpServerExchange> {
+    public static final CharSequence SERVLET_REQUEST = UTF8BytesString.create(
+            SpanNaming.instance().namingSchema().server().operationForComponent("java-web-servlet"));
+    public static final CharSequence UNDERTOW_HTTP_SERVER = UTF8BytesString.create("undertow-http-server");
+
+    @SuppressWarnings("rawtypes")
+    private static final InstanceStore<AttachmentKey> attachmentStore = InstanceStore.of(AttachmentKey.class);
+
+    @SuppressWarnings("unchecked")
+    public static final AttachmentKey<ContextContinuation> DATADOG_UNDERTOW_CONTINUATION = attachmentStore.getOrCreate(
+            "DD_UNDERTOW_CONTINUATION", () -> AttachmentKey.create(ContextContinuation.class));
+
+    @SuppressWarnings("unchecked")
+    public static final AttachmentKey<Context> PARENT_CONTEXT_KEY =
+            attachmentStore.getOrCreate("DD_UNDERTOW_PARENT_CONTEXT", () -> AttachmentKey.create(Context.class));
+
+    public static final UndertowDecorator DECORATE = new UndertowDecorator();
+    public static final CharSequence UNDERTOW_REQUEST = UTF8BytesString.create(DECORATE.operationName());
+    public static final boolean UNDERTOW_LEGACY_TRACING = Config.get().isLegacyTracingEnabled(true, "undertow");
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"undertow-http", "undertow-http-server"};
+    }
+
+    @Override
+    protected CharSequence component() {
+        return UNDERTOW_HTTP_SERVER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpServerExchange> getter() {
+        return UndertowExtractAdapter.Request.GETTER;
+    }
+
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpServerExchange> responseGetter() {
+        return UndertowExtractAdapter.Response.GETTER;
+    }
+
+    @Override
+    public CharSequence spanName() {
+        return UNDERTOW_REQUEST;
+    }
+
+    @Override
+    protected String method(final HttpServerExchange exchange) {
+        return exchange.getRequestMethod().toString();
+    }
+
+    @Override
+    protected URIDataAdapter url(final HttpServerExchange exchange) {
+        return new HttpServerExchangeURIDataAdapter(exchange);
+    }
+
+    @Override
+    protected String peerHostIP(final HttpServerExchange exchange) {
+        return exchange.getSourceAddress().getAddress().getHostAddress();
+    }
+
+    @Override
+    protected int peerPort(final HttpServerExchange exchange) {
+        // getDestinationAddress() can be null in the same situations that make
+        // HttpServerExchangeURIDataAdapter#port() NPE internally (e.g. AJP, a Unix domain socket
+        // transport, or a wrapped/detached ServerConnection).
+        InetSocketAddress destination = exchange.getDestinationAddress();
+        return destination == null ? UNSET_PORT : destination.getPort();
+    }
+
+    @Override
+    protected int status(final HttpServerExchange exchange) {
+        return exchange.getResponseCode();
+    }
+
+    @Override
+    protected boolean isAppSecOnResponseSeparate() {
+        return true;
+    }
+
+    @Override
+    protected BlockResponseFunction createBlockResponseFunction(
+            HttpServerExchange httpServerExchange, HttpServerExchange httpServerExchange1) {
+        return new UndertowBlockResponseFunction(httpServerExchange);
+    }
 }
diff --git a/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowExtractAdapter.java b/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowExtractAdapter.java
index 237a0b60565..8d5bce90e5d 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowExtractAdapter.java
+++ b/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowExtractAdapter.java
@@ -6,39 +6,37 @@
 import io.undertow.util.HeaderValues;
 import java.util.Iterator;
 
-public abstract class UndertowExtractAdapter
-    implements AgentPropagation.ContextVisitor<HttpServerExchange> {
-  abstract HeaderMap getHeaders(HttpServerExchange exchange);
-
-  @Override
-  public void forEachKey(HttpServerExchange exchange, AgentPropagation.KeyClassifier classifier) {
-    HeaderMap headers = getHeaders(exchange);
-
-    Iterator<HeaderValues> iterator = headers.iterator();
-    while (iterator.hasNext()) {
-      HeaderValues values = iterator.next();
-      if (!values.isEmpty()
-          && !classifier.accept(values.getHeaderName().toString(), values.get(0))) {
-        return;
-      }
+public abstract class UndertowExtractAdapter implements AgentPropagation.ContextVisitor<HttpServerExchange> {
+    abstract HeaderMap getHeaders(HttpServerExchange exchange);
+
+    @Override
+    public void forEachKey(HttpServerExchange exchange, AgentPropagation.KeyClassifier classifier) {
+        HeaderMap headers = getHeaders(exchange);
+
+        Iterator<HeaderValues> iterator = headers.iterator();
+        while (iterator.hasNext()) {
+            HeaderValues values = iterator.next();
+            if (!values.isEmpty() && !classifier.accept(values.getHeaderName().toString(), values.get(0))) {
+                return;
+            }
+        }
     }
-  }
 
-  public static class Request extends UndertowExtractAdapter {
-    public static final Request GETTER = new Request();
+    public static class Request extends UndertowExtractAdapter {
+        public static final Request GETTER = new Request();
 
-    @Override
-    HeaderMap getHeaders(HttpServerExchange exchange) {
-      return exchange.getRequestHeaders();
+        @Override
+        HeaderMap getHeaders(HttpServerExchange exchange) {
+            return exchange.getRequestHeaders();
+        }
     }
-  }
 
-  public static class Response extends UndertowExtractAdapter {
-    public static final Response GETTER = new Response();
+    public static class Response extends UndertowExtractAdapter {
+        public static final Response GETTER = new Response();
 
-    @Override
-    HeaderMap getHeaders(HttpServerExchange exchange) {
-      return exchange.getResponseHeaders();
+        @Override
+        HeaderMap getHeaders(HttpServerExchange exchange) {
+            return exchange.getResponseHeaders();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/valkey-java-5.3/src/main/java/datadog/trace/instrumentation/valkey/ValkeyInstrumentation.java b/dd-java-agent/instrumentation/valkey-java-5.3/src/main/java/datadog/trace/instrumentation/valkey/ValkeyInstrumentation.java
index 07730c8d228..202e6a40e9b 100644
--- a/dd-java-agent/instrumentation/valkey-java-5.3/src/main/java/datadog/trace/instrumentation/valkey/ValkeyInstrumentation.java
+++ b/dd-java-agent/instrumentation/valkey-java-5.3/src/main/java/datadog/trace/instrumentation/valkey/ValkeyInstrumentation.java
@@ -23,55 +23,53 @@
 
 @AutoService(InstrumenterModule.class)
 public final class ValkeyInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ValkeyInstrumentation() {
-    super("valkey");
-  }
+    public ValkeyInstrumentation() {
+        super("valkey");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.valkey.Connection";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.valkey.Connection";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("executeCommand"))
-            .and(takesArgument(0, named("io.valkey.CommandObject"))),
-        ValkeyInstrumentation.class.getName() + "$ValkeyAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("executeCommand"))
+                        .and(takesArgument(0, named("io.valkey.CommandObject"))),
+                ValkeyInstrumentation.class.getName() + "$ValkeyAdvice");
+    }
 
-  public static class ValkeyAdvice {
+    public static class ValkeyAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Argument(0) final CommandObject<?> commandObject,
-        @Advice.This final Connection thiz) {
-      final AgentSpan span = startSpan("valkey-command", ValkeyClientDecorator.OPERATION_NAME);
-      DECORATE.afterStart(span);
-      DECORATE.onConnection(span, thiz);
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Argument(0) final CommandObject<?> commandObject, @Advice.This final Connection thiz) {
+            final AgentSpan span = startSpan("valkey-command", ValkeyClientDecorator.OPERATION_NAME);
+            DECORATE.afterStart(span);
+            DECORATE.onConnection(span, thiz);
 
-      final ProtocolCommand command = commandObject.getArguments().getCommand();
+            final ProtocolCommand command = commandObject.getArguments().getCommand();
 
-      if (command instanceof Protocol.Command) {
-        DECORATE.onStatement(span, ((Protocol.Command) command).name());
-      } else {
-        DECORATE.onStatement(span, new String(command.getRaw()));
-      }
-      return activateSpan(span);
-    }
+            if (command instanceof Protocol.Command) {
+                DECORATE.onStatement(span, ((Protocol.Command) command).name());
+            } else {
+                DECORATE.onStatement(span, new String(command.getRaw()));
+            }
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopSpan(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
-      AgentSpan span = spanFromScope(scope);
-      DECORATE.onError(span, throwable);
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) {
+            AgentSpan span = spanFromScope(scope);
+            DECORATE.onError(span, throwable);
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/valkey-java-5.3/src/main/java/io/valkey/ValkeyClientDecorator.java b/dd-java-agent/instrumentation/valkey-java-5.3/src/main/java/io/valkey/ValkeyClientDecorator.java
index 0e0e6cf43bf..959ccbfa283 100644
--- a/dd-java-agent/instrumentation/valkey-java-5.3/src/main/java/io/valkey/ValkeyClientDecorator.java
+++ b/dd-java-agent/instrumentation/valkey-java-5.3/src/main/java/io/valkey/ValkeyClientDecorator.java
@@ -6,52 +6,52 @@
 import datadog.trace.bootstrap.instrumentation.decorator.DBTypeProcessingDatabaseClientDecorator;
 
 public class ValkeyClientDecorator extends DBTypeProcessingDatabaseClientDecorator<Connection> {
-  public static final ValkeyClientDecorator DECORATE = new ValkeyClientDecorator();
-
-  private static final String VALKEY = "valkey";
-  public static final CharSequence OPERATION_NAME =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation(VALKEY));
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cache().service(VALKEY);
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("valkey-command");
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"valkey", VALKEY};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.VALKEY;
-  }
-
-  @Override
-  protected String dbType() {
-    return VALKEY;
-  }
-
-  @Override
-  protected String dbUser(final Connection connection) {
-    return null;
-  }
-
-  @Override
-  protected String dbInstance(final Connection connection) {
-    return null;
-  }
-
-  @Override
-  protected String dbHostname(Connection connection) {
-    return connection.getHostAndPort().getHost();
-  }
+    public static final ValkeyClientDecorator DECORATE = new ValkeyClientDecorator();
+
+    private static final String VALKEY = "valkey";
+    public static final CharSequence OPERATION_NAME =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation(VALKEY));
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cache().service(VALKEY);
+    private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("valkey-command");
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"valkey", VALKEY};
+    }
+
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.VALKEY;
+    }
+
+    @Override
+    protected String dbType() {
+        return VALKEY;
+    }
+
+    @Override
+    protected String dbUser(final Connection connection) {
+        return null;
+    }
+
+    @Override
+    protected String dbInstance(final Connection connection) {
+        return null;
+    }
+
+    @Override
+    protected String dbHostname(Connection connection) {
+        return connection.getHostAndPort().getHost();
+    }
 }
diff --git a/dd-java-agent/instrumentation/velocity-1.5/src/main/java/datadog/trace/instrumentation/velocity/ASTReferenceInstrumentation.java b/dd-java-agent/instrumentation/velocity-1.5/src/main/java/datadog/trace/instrumentation/velocity/ASTReferenceInstrumentation.java
index 2e0b6fa98b5..185bc36de16 100644
--- a/dd-java-agent/instrumentation/velocity-1.5/src/main/java/datadog/trace/instrumentation/velocity/ASTReferenceInstrumentation.java
+++ b/dd-java-agent/instrumentation/velocity-1.5/src/main/java/datadog/trace/instrumentation/velocity/ASTReferenceInstrumentation.java
@@ -17,50 +17,48 @@
 
 @AutoService(InstrumenterModule.class)
 public class ASTReferenceInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ASTReferenceInstrumentation() {
-    super("velocity");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ASTReferenceInstrumentation() {
+        super("velocity");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.apache.velocity.runtime.parser.node.ASTReference";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.apache.velocity.runtime.parser.node.ASTReference";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("render")
-            .and(isMethod())
-            .and(
-                takesArgument(0, named("org.apache.velocity.context.InternalContextAdapter"))
-                    .and(takesArgument(1, named("java.io.Writer")))),
-        ASTReferenceInstrumentation.class.getName() + "$ASTReferenceAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("render")
+                        .and(isMethod())
+                        .and(takesArgument(0, named("org.apache.velocity.context.InternalContextAdapter"))
+                                .and(takesArgument(1, named("java.io.Writer")))),
+                ASTReferenceInstrumentation.class.getName() + "$ASTReferenceAdvice");
+    }
 
-  public static class ASTReferenceAdvice {
+    public static class ASTReferenceAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.XSS)
-    public static void onEnter(
-        @Advice.Argument(0) final InternalContextAdapter context,
-        @Advice.This final ASTReference self) {
-      if (self == null) {
-        return;
-      }
-      final XssModule xssModule = InstrumentationBridge.XSS;
-      if (xssModule == null) {
-        return;
-      }
-      Object variable = self.getVariableValue(context, self.getRootString());
-      // For cases when you have a variable that is not a string such as the EscapeTool variable
-      if (!(variable instanceof String)) {
-        return;
-      }
-      final String charSec = (String) variable;
-      final String file = context.getCurrentTemplateName();
-      final int line = self.getLine();
-      xssModule.onXss(charSec, file, line);
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.XSS)
+        public static void onEnter(
+                @Advice.Argument(0) final InternalContextAdapter context, @Advice.This final ASTReference self) {
+            if (self == null) {
+                return;
+            }
+            final XssModule xssModule = InstrumentationBridge.XSS;
+            if (xssModule == null) {
+                return;
+            }
+            Object variable = self.getVariableValue(context, self.getRootString());
+            // For cases when you have a variable that is not a string such as the EscapeTool variable
+            if (!(variable instanceof String)) {
+                return;
+            }
+            final String charSec = (String) variable;
+            final String file = context.getCurrentTemplateName();
+            final int line = self.getLine();
+            xssModule.onXss(charSec, file, line);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/velocity-1.5/src/main/java/datadog/trace/instrumentation/velocity/EscapeToolCallSite.java b/dd-java-agent/instrumentation/velocity-1.5/src/main/java/datadog/trace/instrumentation/velocity/EscapeToolCallSite.java
index 85c2e5a384d..1e7b7ba74b1 100644
--- a/dd-java-agent/instrumentation/velocity-1.5/src/main/java/datadog/trace/instrumentation/velocity/EscapeToolCallSite.java
+++ b/dd-java-agent/instrumentation/velocity-1.5/src/main/java/datadog/trace/instrumentation/velocity/EscapeToolCallSite.java
@@ -13,43 +13,38 @@
 @CallSite(spi = IastCallSites.class)
 public class EscapeToolCallSite {
 
-  @CallSite.After(
-      "java.lang.String org.apache.velocity.tools.generic.EscapeTool.html(java.lang.Object)")
-  @CallSite.After(
-      "java.lang.String org.apache.velocity.tools.generic.EscapeTool.javascript(java.lang.Object)")
-  @CallSite.After(
-      "java.lang.String org.apache.velocity.tools.generic.EscapeTool.url(java.lang.Object)")
-  @CallSite.After(
-      "java.lang.String org.apache.velocity.tools.generic.EscapeTool.xml(java.lang.Object)")
-  public static String afterEscape(
-      @CallSite.This final EscapeTool self,
-      @CallSite.Argument(0) @Nullable final Object input,
-      @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterEscape threw", e);
-      }
+    @CallSite.After("java.lang.String org.apache.velocity.tools.generic.EscapeTool.html(java.lang.Object)")
+    @CallSite.After("java.lang.String org.apache.velocity.tools.generic.EscapeTool.javascript(java.lang.Object)")
+    @CallSite.After("java.lang.String org.apache.velocity.tools.generic.EscapeTool.url(java.lang.Object)")
+    @CallSite.After("java.lang.String org.apache.velocity.tools.generic.EscapeTool.xml(java.lang.Object)")
+    public static String afterEscape(
+            @CallSite.This final EscapeTool self,
+            @CallSite.Argument(0) @Nullable final Object input,
+            @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input, false, VulnerabilityMarks.XSS_MARK);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterEscape threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  @CallSite.After(
-      "java.lang.String org.apache.velocity.tools.generic.EscapeTool.sql(java.lang.Object)")
-  public static String afterEscapeSQL(
-      @CallSite.This final EscapeTool self,
-      @CallSite.Argument(0) @Nullable final Object input,
-      @CallSite.Return final String result) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintStringIfTainted(result, input, false, VulnerabilityMarks.SQL_INJECTION_MARK);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("afterEscapeSQL threw", e);
-      }
+    @CallSite.After("java.lang.String org.apache.velocity.tools.generic.EscapeTool.sql(java.lang.Object)")
+    public static String afterEscapeSQL(
+            @CallSite.This final EscapeTool self,
+            @CallSite.Argument(0) @Nullable final Object input,
+            @CallSite.Return final String result) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintStringIfTainted(result, input, false, VulnerabilityMarks.SQL_INJECTION_MARK);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("afterEscapeSQL threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/dd-java-agent/instrumentation/velocity-1.5/src/test/java/foo/bar/TestEscapeToolSuite.java b/dd-java-agent/instrumentation/velocity-1.5/src/test/java/foo/bar/TestEscapeToolSuite.java
index a3177332bb9..fc1bcdce121 100644
--- a/dd-java-agent/instrumentation/velocity-1.5/src/test/java/foo/bar/TestEscapeToolSuite.java
+++ b/dd-java-agent/instrumentation/velocity-1.5/src/test/java/foo/bar/TestEscapeToolSuite.java
@@ -4,25 +4,25 @@
 
 public class TestEscapeToolSuite {
 
-  public static EscapeTool escapeTool = new EscapeTool();
+    public static EscapeTool escapeTool = new EscapeTool();
 
-  public static String html(String input) {
-    return escapeTool.html(input);
-  }
+    public static String html(String input) {
+        return escapeTool.html(input);
+    }
 
-  public static String javascript(String input) {
-    return escapeTool.javascript(input);
-  }
+    public static String javascript(String input) {
+        return escapeTool.javascript(input);
+    }
 
-  public static String url(String input) {
-    return escapeTool.url(input);
-  }
+    public static String url(String input) {
+        return escapeTool.url(input);
+    }
 
-  public static String xml(String input) {
-    return escapeTool.xml(input);
-  }
+    public static String xml(String input) {
+        return escapeTool.xml(input);
+    }
 
-  public static String sql(String input) {
-    return escapeTool.sql(input);
-  }
+    public static String sql(String input) {
+        return escapeTool.sql(input);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionFactoryConstructorAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionFactoryConstructorAdvice.java
index 65072a2d6bb..9db302d4526 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionFactoryConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionFactoryConstructorAdvice.java
@@ -9,26 +9,23 @@
 import net.bytebuddy.asm.Advice;
 
 public class MySQLConnectionFactoryConstructorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterConstructor(
-      @Advice.This final MySQLConnectionFactory zis,
-      @Advice.Argument(2) final MySQLConnectOptions options) {
-    DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
-    DBInfo info =
-        builder
-            .host(options.getHost())
-            .port(options.getPort())
-            .db(options.getDatabase())
-            .user(options.getUser())
-            .type("mysql")
-            .build();
-    InstrumentationContext.get(MySQLConnectionFactory.class, DBInfo.class).put(zis, info);
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterConstructor(
+            @Advice.This final MySQLConnectionFactory zis, @Advice.Argument(2) final MySQLConnectOptions options) {
+        DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
+        DBInfo info = builder.host(options.getHost())
+                .port(options.getPort())
+                .db(options.getDatabase())
+                .user(options.getUser())
+                .type("mysql")
+                .build();
+        InstrumentationContext.get(MySQLConnectionFactory.class, DBInfo.class).put(zis, info);
+    }
 
-  // Limit ourselves to 3.9.x by checking for the close() method that was removed in 4.x
-  // and the Query interface that was added in 3.9.x
-  private static void muzzleCheck(SqlConnection connection, Query query) {
-    connection.close();
-    query.execute(null);
-  }
+    // Limit ourselves to 3.9.x by checking for the close() method that was removed in 4.x
+    // and the Query interface that was added in 3.9.x
+    private static void muzzleCheck(SqlConnection connection, Query query) {
+        connection.close();
+        query.execute(null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionFactoryInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionFactoryInstrumentation.java
index 1beb8e20863..4273d29fb06 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionFactoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionFactoryInstrumentation.java
@@ -13,25 +13,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class MySQLConnectionFactoryInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public MySQLConnectionFactoryInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public MySQLConnectionFactoryInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("io.vertx.mysqlclient.impl.MySQLConnectionFactory", DBInfo.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("io.vertx.mysqlclient.impl.MySQLConnectionFactory", DBInfo.class.getName());
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.mysqlclient.impl.MySQLConnectionFactory";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.mysqlclient.impl.MySQLConnectionFactory";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(2, named("io.vertx.mysqlclient.MySQLConnectOptions"))),
-        packageName + ".MySQLConnectionFactoryConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(2, named("io.vertx.mysqlclient.MySQLConnectOptions"))),
+                packageName + ".MySQLConnectionFactoryConstructorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionImplConstructorAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionImplConstructorAdvice.java
index 6cfcb659623..c6f872d284c 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionImplConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionImplConstructorAdvice.java
@@ -9,19 +9,20 @@
 import net.bytebuddy.asm.Advice;
 
 public class MySQLConnectionImplConstructorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterConstructor(
-      @Advice.This final SqlClient zis, @Advice.Argument(0) final MySQLConnectionFactory factory) {
-    InstrumentationContext.get(SqlClient.class, DBInfo.class)
-        .put(
-            zis,
-            InstrumentationContext.get(MySQLConnectionFactory.class, DBInfo.class).get(factory));
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterConstructor(
+            @Advice.This final SqlClient zis, @Advice.Argument(0) final MySQLConnectionFactory factory) {
+        InstrumentationContext.get(SqlClient.class, DBInfo.class)
+                .put(
+                        zis,
+                        InstrumentationContext.get(MySQLConnectionFactory.class, DBInfo.class)
+                                .get(factory));
+    }
 
-  // Limit ourselves to 3.9.x by checking for the close() method that was removed in 4.x
-  // and the Query interface that was added in 3.9.x
-  private static void muzzleCheck(SqlConnection connection, Query query) {
-    connection.close();
-    query.execute(null);
-  }
+    // Limit ourselves to 3.9.x by checking for the close() method that was removed in 4.x
+    // and the Query interface that was added in 3.9.x
+    private static void muzzleCheck(SqlConnection connection, Query query) {
+        connection.close();
+        query.execute(null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionImplInstrumentation.java
index 97c95c755bb..6312d8cb9b3 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLConnectionImplInstrumentation.java
@@ -13,29 +13,28 @@
 
 @AutoService(InstrumenterModule.class)
 public class MySQLConnectionImplInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public MySQLConnectionImplInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public MySQLConnectionImplInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>();
-    contextStores.put("io.vertx.mysqlclient.impl.MySQLConnectionFactory", DBInfo.class.getName());
-    contextStores.put("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
-    return contextStores;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>();
+        contextStores.put("io.vertx.mysqlclient.impl.MySQLConnectionFactory", DBInfo.class.getName());
+        contextStores.put("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
+        return contextStores;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.mysqlclient.impl.MySQLConnectionImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.mysqlclient.impl.MySQLConnectionImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(0, named("io.vertx.mysqlclient.impl.MySQLConnectionFactory"))),
-        packageName + ".MySQLConnectionImplConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(0, named("io.vertx.mysqlclient.impl.MySQLConnectionFactory"))),
+                packageName + ".MySQLConnectionImplConstructorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLPoolImplConstructorAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLPoolImplConstructorAdvice.java
index 1be9b3e3b70..f8afbd9b491 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLPoolImplConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLPoolImplConstructorAdvice.java
@@ -9,25 +9,23 @@
 import net.bytebuddy.asm.Advice;
 
 public class MySQLPoolImplConstructorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterConstructor(
-      @Advice.This final SqlClient zis, @Advice.Argument(2) final MySQLConnectOptions options) {
-    DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
-    DBInfo info =
-        builder
-            .host(options.getHost())
-            .port(options.getPort())
-            .db(options.getDatabase())
-            .user(options.getUser())
-            .type("mysql")
-            .build();
-    InstrumentationContext.get(SqlClient.class, DBInfo.class).put(zis, info);
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterConstructor(
+            @Advice.This final SqlClient zis, @Advice.Argument(2) final MySQLConnectOptions options) {
+        DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
+        DBInfo info = builder.host(options.getHost())
+                .port(options.getPort())
+                .db(options.getDatabase())
+                .user(options.getUser())
+                .type("mysql")
+                .build();
+        InstrumentationContext.get(SqlClient.class, DBInfo.class).put(zis, info);
+    }
 
-  // Limit ourselves to 3.9.x by checking for the close() method that was removed in 4.x
-  // and the Query interface that was added in 3.9.x
-  private static void muzzleCheck(SqlConnection connection, Query query) {
-    connection.close();
-    query.execute(null);
-  }
+    // Limit ourselves to 3.9.x by checking for the close() method that was removed in 4.x
+    // and the Query interface that was added in 3.9.x
+    private static void muzzleCheck(SqlConnection connection, Query query) {
+        connection.close();
+        query.execute(null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLPoolImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLPoolImplInstrumentation.java
index 9488ecb09c5..e4eb6d991a8 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLPoolImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/MySQLPoolImplInstrumentation.java
@@ -13,25 +13,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class MySQLPoolImplInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public MySQLPoolImplInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public MySQLPoolImplInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.mysqlclient.impl.MySQLPoolImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.mysqlclient.impl.MySQLPoolImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(2, named("io.vertx.mysqlclient.MySQLConnectOptions"))),
-        packageName + ".MySQLPoolImplConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(2, named("io.vertx.mysqlclient.MySQLConnectOptions"))),
+                packageName + ".MySQLPoolImplConstructorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/test/java/TestDatabases.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/test/java/TestDatabases.java
index 27fecadc279..cb68aa2e717 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/test/java/TestDatabases.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/src/test/java/TestDatabases.java
@@ -9,97 +9,93 @@
 
 public class TestDatabases implements Closeable {
 
-  public static TestDatabases initialise(String dbName) {
-    return new TestDatabases(dbName);
-  }
-
-  private final MySQLContainer<?> mysql;
-
-  private final Map<String, TestDBInfo> dbInfos;
-
-  @SuppressWarnings("resource")
-  private TestDatabases(String dbName) {
-    Map<String, TestDBInfo> infos = new HashMap<>();
-    mysql =
-        new MySQLContainer<>(
-                DockerImageName.parse(System.getProperty("test.mysql.image"))
-                    .asCompatibleSubstituteFor("mysql"))
-            .withDatabaseName(dbName)
-            .withUsername("sa")
-            .withPassword("sa");
-    // https://github.com/testcontainers/testcontainers-java/issues/914
-    mysql.addParameter("TC_MY_CNF", null);
-    mysql.start();
-    TestDBInfo info =
-        new TestDBInfo(
-            mysql.getUsername(),
-            mysql.getPassword(),
-            mysql.getHost(),
-            mysql.getMappedPort(MySQLContainer.MYSQL_PORT),
-            "mysql",
-            dbName);
-    PortUtils.waitForPortToOpen(info.host, info.port, 5, TimeUnit.SECONDS);
-    infos.put("mysql", info);
-    dbInfos = Collections.unmodifiableMap(infos);
-  }
-
-  @Override
-  public void close() {
-    if (null != mysql) {
-      mysql.close();
-    }
-  }
-
-  public Map<String, TestDBInfo> getDBInfos() {
-    return dbInfos;
-  }
-
-  public static class TestDBInfo {
-    private final String user;
-    private final String password;
-    private final String host;
-    private final Integer port;
-    private final String type;
-    private final String dbName;
-    private final String uri;
-
-    public TestDBInfo(
-        String user, String password, String host, Integer port, String type, String dbName) {
-      this.user = user;
-      this.password = password;
-      this.host = host;
-      this.port = port;
-      this.type = type;
-      this.dbName = dbName;
-      this.uri = type + "://" + user + ":" + password + "@" + host + ":" + port + "/" + dbName;
-    }
-
-    public String getUser() {
-      return user;
-    }
-
-    public String getPassword() {
-      return password;
-    }
-
-    public String getHost() {
-      return host;
+    public static TestDatabases initialise(String dbName) {
+        return new TestDatabases(dbName);
     }
 
-    public String getPort() {
-      return port.toString();
+    private final MySQLContainer<?> mysql;
+
+    private final Map<String, TestDBInfo> dbInfos;
+
+    @SuppressWarnings("resource")
+    private TestDatabases(String dbName) {
+        Map<String, TestDBInfo> infos = new HashMap<>();
+        mysql = new MySQLContainer<>(DockerImageName.parse(System.getProperty("test.mysql.image"))
+                        .asCompatibleSubstituteFor("mysql"))
+                .withDatabaseName(dbName)
+                .withUsername("sa")
+                .withPassword("sa");
+        // https://github.com/testcontainers/testcontainers-java/issues/914
+        mysql.addParameter("TC_MY_CNF", null);
+        mysql.start();
+        TestDBInfo info = new TestDBInfo(
+                mysql.getUsername(),
+                mysql.getPassword(),
+                mysql.getHost(),
+                mysql.getMappedPort(MySQLContainer.MYSQL_PORT),
+                "mysql",
+                dbName);
+        PortUtils.waitForPortToOpen(info.host, info.port, 5, TimeUnit.SECONDS);
+        infos.put("mysql", info);
+        dbInfos = Collections.unmodifiableMap(infos);
     }
 
-    public String getType() {
-      return type;
+    @Override
+    public void close() {
+        if (null != mysql) {
+            mysql.close();
+        }
     }
 
-    public String getDbName() {
-      return dbName;
+    public Map<String, TestDBInfo> getDBInfos() {
+        return dbInfos;
     }
 
-    public String getUri() {
-      return uri;
+    public static class TestDBInfo {
+        private final String user;
+        private final String password;
+        private final String host;
+        private final Integer port;
+        private final String type;
+        private final String dbName;
+        private final String uri;
+
+        public TestDBInfo(String user, String password, String host, Integer port, String type, String dbName) {
+            this.user = user;
+            this.password = password;
+            this.host = host;
+            this.port = port;
+            this.type = type;
+            this.dbName = dbName;
+            this.uri = type + "://" + user + ":" + password + "@" + host + ":" + port + "/" + dbName;
+        }
+
+        public String getUser() {
+            return user;
+        }
+
+        public String getPassword() {
+            return password;
+        }
+
+        public String getHost() {
+            return host;
+        }
+
+        public String getPort() {
+            return port.toString();
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public String getDbName() {
+            return dbName;
+        }
+
+        public String getUri() {
+            return uri;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionFactoryConstructorAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionFactoryConstructorAdvice.java
index 92832a1df92..0ca3ed04954 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionFactoryConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionFactoryConstructorAdvice.java
@@ -8,24 +8,21 @@
 import net.bytebuddy.asm.Advice;
 
 public class MySQLConnectionFactoryConstructorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterConstructor(
-      @Advice.This final MySQLConnectionFactory zis,
-      @Advice.Argument(1) final MySQLConnectOptions options) {
-    DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
-    DBInfo info =
-        builder
-            .host(options.getHost())
-            .port(options.getPort())
-            .db(options.getDatabase())
-            .user(options.getUser())
-            .type("mysql")
-            .build();
-    InstrumentationContext.get(MySQLConnectionFactory.class, DBInfo.class).put(zis, info);
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterConstructor(
+            @Advice.This final MySQLConnectionFactory zis, @Advice.Argument(1) final MySQLConnectOptions options) {
+        DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
+        DBInfo info = builder.host(options.getHost())
+                .port(options.getPort())
+                .db(options.getDatabase())
+                .user(options.getUser())
+                .type("mysql")
+                .build();
+        InstrumentationContext.get(MySQLConnectionFactory.class, DBInfo.class).put(zis, info);
+    }
 
-  // Limit ourselves to 4.x by checking for the ping() method that was added in 4.x
-  private static void muzzleCheck(MySQLConnection connection) {
-    connection.ping();
-  }
+    // Limit ourselves to 4.x by checking for the ping() method that was added in 4.x
+    private static void muzzleCheck(MySQLConnection connection) {
+        connection.ping();
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionFactoryInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionFactoryInstrumentation.java
index ade985eac0f..c4ed4b01661 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionFactoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionFactoryInstrumentation.java
@@ -14,27 +14,27 @@
 
 @AutoService(InstrumenterModule.class)
 public class MySQLConnectionFactoryInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public MySQLConnectionFactoryInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public MySQLConnectionFactoryInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("io.vertx.mysqlclient.impl.MySQLConnectionFactory", DBInfo.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("io.vertx.mysqlclient.impl.MySQLConnectionFactory", DBInfo.class.getName());
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.mysqlclient.impl.MySQLConnectionFactory";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.mysqlclient.impl.MySQLConnectionFactory";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArguments(2))
-            .and(takesArgument(1, named("io.vertx.mysqlclient.MySQLConnectOptions"))),
-        packageName + ".MySQLConnectionFactoryConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArguments(2))
+                        .and(takesArgument(1, named("io.vertx.mysqlclient.MySQLConnectOptions"))),
+                packageName + ".MySQLConnectionFactoryConstructorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionImplConstructorAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionImplConstructorAdvice.java
index 8651dca62cd..43e05961aa7 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionImplConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionImplConstructorAdvice.java
@@ -8,17 +8,18 @@
 import net.bytebuddy.asm.Advice;
 
 public class MySQLConnectionImplConstructorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterConstructor(
-      @Advice.This final SqlClient zis, @Advice.Argument(0) final MySQLConnectionFactory factory) {
-    InstrumentationContext.get(SqlClient.class, DBInfo.class)
-        .put(
-            zis,
-            InstrumentationContext.get(MySQLConnectionFactory.class, DBInfo.class).get(factory));
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterConstructor(
+            @Advice.This final SqlClient zis, @Advice.Argument(0) final MySQLConnectionFactory factory) {
+        InstrumentationContext.get(SqlClient.class, DBInfo.class)
+                .put(
+                        zis,
+                        InstrumentationContext.get(MySQLConnectionFactory.class, DBInfo.class)
+                                .get(factory));
+    }
 
-  // Limit ourselves to 4.x by checking for the ping() method that was added in 4.x
-  private static void muzzleCheck(MySQLConnection connection) {
-    connection.ping();
-  }
+    // Limit ourselves to 4.x by checking for the ping() method that was added in 4.x
+    private static void muzzleCheck(MySQLConnection connection) {
+        connection.ping();
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionImplInstrumentation.java
index c964deed6b9..f632ff3c2a0 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLConnectionImplInstrumentation.java
@@ -13,29 +13,28 @@
 
 @AutoService(InstrumenterModule.class)
 public class MySQLConnectionImplInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public MySQLConnectionImplInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public MySQLConnectionImplInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>();
-    contextStores.put("io.vertx.mysqlclient.impl.MySQLConnectionFactory", DBInfo.class.getName());
-    contextStores.put("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
-    return contextStores;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>();
+        contextStores.put("io.vertx.mysqlclient.impl.MySQLConnectionFactory", DBInfo.class.getName());
+        contextStores.put("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
+        return contextStores;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.mysqlclient.impl.MySQLConnectionImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.mysqlclient.impl.MySQLConnectionImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArgument(0, named("io.vertx.mysqlclient.impl.MySQLConnectionFactory"))),
-        packageName + ".MySQLConnectionImplConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(0, named("io.vertx.mysqlclient.impl.MySQLConnectionFactory"))),
+                packageName + ".MySQLConnectionImplConstructorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLPoolImplAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLPoolImplAdvice.java
index 9702604f48c..dc989345a63 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLPoolImplAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLPoolImplAdvice.java
@@ -9,23 +9,21 @@
 
 public class MySQLPoolImplAdvice {
 
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterCreate(
-      @Advice.Return final SqlClient zis, @Advice.Argument(2) MySQLConnectOptions options) {
-    DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
-    DBInfo info =
-        builder
-            .host(options.getHost())
-            .port(options.getPort())
-            .db(options.getDatabase())
-            .user(options.getUser())
-            .type("mysql")
-            .build();
-    InstrumentationContext.get(SqlClient.class, DBInfo.class).put(zis, info);
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterCreate(
+            @Advice.Return final SqlClient zis, @Advice.Argument(2) MySQLConnectOptions options) {
+        DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
+        DBInfo info = builder.host(options.getHost())
+                .port(options.getPort())
+                .db(options.getDatabase())
+                .user(options.getUser())
+                .type("mysql")
+                .build();
+        InstrumentationContext.get(SqlClient.class, DBInfo.class).put(zis, info);
+    }
 
-  // Limit ourselves to 4.x by checking for the ping() method that was added in 4.x
-  private static void muzzleCheck(MySQLConnection connection) {
-    connection.ping();
-  }
+    // Limit ourselves to 4.x by checking for the ping() method that was added in 4.x
+    private static void muzzleCheck(MySQLConnection connection) {
+        connection.ping();
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLPoolImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLPoolImplInstrumentation.java
index 539778dc188..bb59c105e68 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLPoolImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4/MySQLPoolImplInstrumentation.java
@@ -16,30 +16,30 @@
 
 @AutoService(InstrumenterModule.class)
 public class MySQLPoolImplInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public MySQLPoolImplInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public MySQLPoolImplInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.mysqlclient.impl.MySQLPoolImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.mysqlclient.impl.MySQLPoolImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isStatic()
-            .and(isPublic())
-            .and(isMethod())
-            .and(named("create"))
-            .and(takesArguments(4))
-            .and(takesArgument(2, named("io.vertx.mysqlclient.MySQLConnectOptions"))),
-        packageName + ".MySQLPoolImplAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isStatic()
+                        .and(isPublic())
+                        .and(isMethod())
+                        .and(named("create"))
+                        .and(takesArguments(4))
+                        .and(takesArgument(2, named("io.vertx.mysqlclient.MySQLConnectOptions"))),
+                packageName + ".MySQLPoolImplAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/test/java/TestDatabases.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/test/java/TestDatabases.java
index 78ad9a82b20..477aebe72b4 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/test/java/TestDatabases.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/src/test/java/TestDatabases.java
@@ -9,96 +9,92 @@
 
 public class TestDatabases implements Closeable {
 
-  private final MySQLContainer<?> mysql;
-  private final Map<String, TestDBInfo> dbInfos;
+    private final MySQLContainer<?> mysql;
+    private final Map<String, TestDBInfo> dbInfos;
 
-  @SuppressWarnings("resource")
-  private TestDatabases(String dbName) {
-    Map<String, TestDBInfo> infos = new HashMap<>();
-    mysql =
-        new MySQLContainer<>(
-                DockerImageName.parse(System.getProperty("test.mysql.image"))
-                    .asCompatibleSubstituteFor("mysql"))
-            .withDatabaseName(dbName)
-            .withUsername("sa")
-            .withPassword("sa");
-    // https://github.com/testcontainers/testcontainers-java/issues/914
-    mysql.addParameter("TC_MY_CNF", null);
-    mysql.start();
-    TestDBInfo info =
-        new TestDBInfo(
-            mysql.getUsername(),
-            mysql.getPassword(),
-            mysql.getHost(),
-            mysql.getMappedPort(MySQLContainer.MYSQL_PORT),
-            "mysql",
-            dbName);
-    PortUtils.waitForPortToOpen(info.host, info.port, 5, TimeUnit.SECONDS);
-    infos.put("mysql", info);
-    dbInfos = Collections.unmodifiableMap(infos);
-  }
+    @SuppressWarnings("resource")
+    private TestDatabases(String dbName) {
+        Map<String, TestDBInfo> infos = new HashMap<>();
+        mysql = new MySQLContainer<>(DockerImageName.parse(System.getProperty("test.mysql.image"))
+                        .asCompatibleSubstituteFor("mysql"))
+                .withDatabaseName(dbName)
+                .withUsername("sa")
+                .withPassword("sa");
+        // https://github.com/testcontainers/testcontainers-java/issues/914
+        mysql.addParameter("TC_MY_CNF", null);
+        mysql.start();
+        TestDBInfo info = new TestDBInfo(
+                mysql.getUsername(),
+                mysql.getPassword(),
+                mysql.getHost(),
+                mysql.getMappedPort(MySQLContainer.MYSQL_PORT),
+                "mysql",
+                dbName);
+        PortUtils.waitForPortToOpen(info.host, info.port, 5, TimeUnit.SECONDS);
+        infos.put("mysql", info);
+        dbInfos = Collections.unmodifiableMap(infos);
+    }
 
-  public static TestDatabases initialise(String dbName) {
-    return new TestDatabases(dbName);
-  }
+    public static TestDatabases initialise(String dbName) {
+        return new TestDatabases(dbName);
+    }
 
-  @Override
-  public void close() {
-    if (null != mysql) {
-      mysql.close();
+    @Override
+    public void close() {
+        if (null != mysql) {
+            mysql.close();
+        }
     }
-  }
 
-  public Map<String, TestDBInfo> getDBInfos() {
-    return dbInfos;
-  }
+    public Map<String, TestDBInfo> getDBInfos() {
+        return dbInfos;
+    }
 
-  public static class TestDBInfo {
-    private final String user;
-    private final String password;
-    private final String host;
-    private final Integer port;
-    private final String type;
-    private final String dbName;
-    private final String uri;
+    public static class TestDBInfo {
+        private final String user;
+        private final String password;
+        private final String host;
+        private final Integer port;
+        private final String type;
+        private final String dbName;
+        private final String uri;
 
-    public TestDBInfo(
-        String user, String password, String host, Integer port, String type, String dbName) {
-      this.user = user;
-      this.password = password;
-      this.host = host;
-      this.port = port;
-      this.type = type;
-      this.dbName = dbName;
-      this.uri = type + "://" + user + ":" + password + "@" + host + ":" + port + "/" + dbName;
-    }
+        public TestDBInfo(String user, String password, String host, Integer port, String type, String dbName) {
+            this.user = user;
+            this.password = password;
+            this.host = host;
+            this.port = port;
+            this.type = type;
+            this.dbName = dbName;
+            this.uri = type + "://" + user + ":" + password + "@" + host + ":" + port + "/" + dbName;
+        }
 
-    public String getUser() {
-      return user;
-    }
+        public String getUser() {
+            return user;
+        }
 
-    public String getPassword() {
-      return password;
-    }
+        public String getPassword() {
+            return password;
+        }
 
-    public String getHost() {
-      return host;
-    }
+        public String getHost() {
+            return host;
+        }
 
-    public String getPort() {
-      return port.toString();
-    }
+        public String getPort() {
+            return port.toString();
+        }
 
-    public String getType() {
-      return type;
-    }
+        public String getType() {
+            return type;
+        }
 
-    public String getDbName() {
-      return dbName;
-    }
+        public String getDbName() {
+            return dbName;
+        }
 
-    public String getUri() {
-      return uri;
+        public String getUri() {
+            return uri;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLConnectionFactoryConstructorAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLConnectionFactoryConstructorAdvice.java
index 4cf000caae2..c89c5f1b206 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLConnectionFactoryConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLConnectionFactoryConstructorAdvice.java
@@ -12,29 +12,27 @@
 import net.bytebuddy.asm.Advice;
 
 public class MySQLConnectionFactoryConstructorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterConstructor(
-      @Advice.This final MySQLConnectionFactory factory,
-      @Advice.Argument(1) final Supplier<? extends Future<? extends SqlConnectOptions>> databases) {
-    if (databases instanceof SingletonSupplier) {
-      SqlConnectOptions options = (SqlConnectOptions) ((SingletonSupplier) databases).unwrap();
-      DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
-      DBInfo info =
-          builder
-              .host(options.getHost())
-              .port(options.getPort())
-              .db(options.getDatabase())
-              .user(options.getUser())
-              .type("mysql")
-              .build();
-      InstrumentationContext.get(MySQLConnectionFactory.class, DBInfo.class).put(factory, info);
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterConstructor(
+            @Advice.This final MySQLConnectionFactory factory,
+            @Advice.Argument(1) final Supplier<? extends Future<? extends SqlConnectOptions>> databases) {
+        if (databases instanceof SingletonSupplier) {
+            SqlConnectOptions options = (SqlConnectOptions) ((SingletonSupplier) databases).unwrap();
+            DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
+            DBInfo info = builder.host(options.getHost())
+                    .port(options.getPort())
+                    .db(options.getDatabase())
+                    .user(options.getUser())
+                    .type("mysql")
+                    .build();
+            InstrumentationContext.get(MySQLConnectionFactory.class, DBInfo.class)
+                    .put(factory, info);
+        }
     }
-  }
 
-  // Limit ourselves to 4.4.2+ by using SingletonSupplier which was added in 4.4.2
-  private static void muzzleCheck(MySQLConnection connection) {
-    connection.ping();
-    Supplier<Future<MySQLConnectOptions>> supplier =
-        SingletonSupplier.wrap(new MySQLConnectOptions());
-  }
+    // Limit ourselves to 4.4.2+ by using SingletonSupplier which was added in 4.4.2
+    private static void muzzleCheck(MySQLConnection connection) {
+        connection.ping();
+        Supplier<Future<MySQLConnectOptions>> supplier = SingletonSupplier.wrap(new MySQLConnectOptions());
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLConnectionFactoryInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLConnectionFactoryInstrumentation.java
index b664d8274c7..d2b3e9c5f96 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLConnectionFactoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLConnectionFactoryInstrumentation.java
@@ -14,27 +14,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class MySQLConnectionFactoryInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public MySQLConnectionFactoryInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public MySQLConnectionFactoryInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("io.vertx.mysqlclient.impl.MySQLConnectionFactory", DBInfo.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("io.vertx.mysqlclient.impl.MySQLConnectionFactory", DBInfo.class.getName());
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.mysqlclient.impl.MySQLConnectionFactory";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.mysqlclient.impl.MySQLConnectionFactory";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArguments(2))
-            .and(takesArgument(1, named("java.util.function.Supplier"))),
-        packageName + ".MySQLConnectionFactoryConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArguments(2)).and(takesArgument(1, named("java.util.function.Supplier"))),
+                packageName + ".MySQLConnectionFactoryConstructorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLDriverAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLDriverAdvice.java
index e2f839d75e9..0ce94848d5c 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLDriverAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLDriverAdvice.java
@@ -13,30 +13,27 @@
 
 public class MySQLDriverAdvice {
 
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterNewPoolImpl(
-      @Advice.Return final SqlClient zis,
-      @Advice.Argument(1) final Supplier<? extends Future<? extends SqlConnectOptions>> databases) {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterNewPoolImpl(
+            @Advice.Return final SqlClient zis,
+            @Advice.Argument(1) final Supplier<? extends Future<? extends SqlConnectOptions>> databases) {
 
-    if (databases instanceof SingletonSupplier) {
-      SqlConnectOptions options = (SqlConnectOptions) ((SingletonSupplier) databases).unwrap();
-      DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
-      DBInfo info =
-          builder
-              .host(options.getHost())
-              .port(options.getPort())
-              .db(options.getDatabase())
-              .user(options.getUser())
-              .type("mysql")
-              .build();
-      InstrumentationContext.get(SqlClient.class, DBInfo.class).put(zis, info);
+        if (databases instanceof SingletonSupplier) {
+            SqlConnectOptions options = (SqlConnectOptions) ((SingletonSupplier) databases).unwrap();
+            DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
+            DBInfo info = builder.host(options.getHost())
+                    .port(options.getPort())
+                    .db(options.getDatabase())
+                    .user(options.getUser())
+                    .type("mysql")
+                    .build();
+            InstrumentationContext.get(SqlClient.class, DBInfo.class).put(zis, info);
+        }
     }
-  }
 
-  // Limit ourselves to 4.4.2+ by using SingletonSupplier which was added in 4.4.2
-  private static void muzzleCheck(MySQLConnection connection) {
-    connection.ping();
-    Supplier<Future<MySQLConnectOptions>> supplier =
-        SingletonSupplier.wrap(new MySQLConnectOptions());
-  }
+    // Limit ourselves to 4.4.2+ by using SingletonSupplier which was added in 4.4.2
+    private static void muzzleCheck(MySQLConnection connection) {
+        connection.ping();
+        Supplier<Future<MySQLConnectOptions>> supplier = SingletonSupplier.wrap(new MySQLConnectOptions());
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLDriverInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLDriverInstrumentation.java
index 3c2c971a37a..e614aaf1578 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLDriverInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/MySQLDriverInstrumentation.java
@@ -14,28 +14,28 @@
 
 @AutoService(InstrumenterModule.class)
 public class MySQLDriverInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public MySQLDriverInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+    public MySQLDriverInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.mysqlclient.spi.MySQLDriver";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.mysqlclient.spi.MySQLDriver";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPrivate()
-            .and(named("newPoolImpl"))
-            .and(takesArguments(4).and(takesArgument(1, named("java.util.function.Supplier")))),
-        packageName + ".MySQLDriverAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPrivate()
+                        .and(named("newPoolImpl"))
+                        .and(takesArguments(4).and(takesArgument(1, named("java.util.function.Supplier")))),
+                packageName + ".MySQLDriverAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/SqlConnectionBaseConstructorAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/SqlConnectionBaseConstructorAdvice.java
index b121d818bf6..7b46e0615da 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/SqlConnectionBaseConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/SqlConnectionBaseConstructorAdvice.java
@@ -14,24 +14,22 @@
 
 public class SqlConnectionBaseConstructorAdvice {
 
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterConstructor(
-      @Advice.This final SqlClient zis,
-      @Advice.Argument(1) final ConnectionFactory connectionFactory) {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterConstructor(
+            @Advice.This final SqlClient zis, @Advice.Argument(1) final ConnectionFactory connectionFactory) {
 
-    if (connectionFactory instanceof MySQLConnectionFactory) {
-      InstrumentationContext.get(SqlClient.class, DBInfo.class)
-          .put(
-              zis,
-              InstrumentationContext.get(MySQLConnectionFactory.class, DBInfo.class)
-                  .get((MySQLConnectionFactory) connectionFactory));
+        if (connectionFactory instanceof MySQLConnectionFactory) {
+            InstrumentationContext.get(SqlClient.class, DBInfo.class)
+                    .put(
+                            zis,
+                            InstrumentationContext.get(MySQLConnectionFactory.class, DBInfo.class)
+                                    .get((MySQLConnectionFactory) connectionFactory));
+        }
     }
-  }
 
-  // Limit ourselves to 4.4.2+ by using SingletonSupplier which was added in 4.4.2
-  private static void muzzleCheck(MySQLConnection connection) {
-    connection.ping();
-    Supplier<Future<MySQLConnectOptions>> supplier =
-        SingletonSupplier.wrap(new MySQLConnectOptions());
-  }
+    // Limit ourselves to 4.4.2+ by using SingletonSupplier which was added in 4.4.2
+    private static void muzzleCheck(MySQLConnection connection) {
+        connection.ping();
+        Supplier<Future<MySQLConnectOptions>> supplier = SingletonSupplier.wrap(new MySQLConnectOptions());
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/SqlConnectionBaseInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/SqlConnectionBaseInstrumentation.java
index bbb60580c56..d94e8eb0a76 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/SqlConnectionBaseInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_sql_client_4_4_2/SqlConnectionBaseInstrumentation.java
@@ -14,31 +14,31 @@
 
 @AutoService(InstrumenterModule.class)
 public class SqlConnectionBaseInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public SqlConnectionBaseInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public SqlConnectionBaseInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>();
-    contextStores.put("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
-    contextStores.put("io.vertx.mysqlclient.impl.MySQLConnectionFactory", DBInfo.class.getName());
-    return contextStores;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>();
+        contextStores.put("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
+        contextStores.put("io.vertx.mysqlclient.impl.MySQLConnectionFactory", DBInfo.class.getName());
+        return contextStores;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.sqlclient.impl.SqlConnectionBase";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.sqlclient.impl.SqlConnectionBase";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
 
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArguments(4))
-            .and(takesArgument(1, named("io.vertx.sqlclient.spi.ConnectionFactory"))),
-        packageName + ".SqlConnectionBaseConstructorAdvice");
-  }
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArguments(4))
+                        .and(takesArgument(1, named("io.vertx.sqlclient.spi.ConnectionFactory"))),
+                packageName + ".SqlConnectionBaseConstructorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionFactoryConstructorAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionFactoryConstructorAdvice.java
index 017b394a8d9..f55b852295b 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionFactoryConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionFactoryConstructorAdvice.java
@@ -7,19 +7,16 @@
 import net.bytebuddy.asm.Advice;
 
 public class PgConnectionFactoryConstructorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterConstructor(
-      @Advice.This final PgConnectionFactory zis,
-      @Advice.Argument(1) final PgConnectOptions options) {
-    DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
-    DBInfo info =
-        builder
-            .host(options.getHost())
-            .port(options.getPort())
-            .db(options.getDatabase())
-            .user(options.getUser())
-            .type("postgresql")
-            .build();
-    InstrumentationContext.get(PgConnectionFactory.class, DBInfo.class).put(zis, info);
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterConstructor(
+            @Advice.This final PgConnectionFactory zis, @Advice.Argument(1) final PgConnectOptions options) {
+        DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
+        DBInfo info = builder.host(options.getHost())
+                .port(options.getPort())
+                .db(options.getDatabase())
+                .user(options.getUser())
+                .type("postgresql")
+                .build();
+        InstrumentationContext.get(PgConnectionFactory.class, DBInfo.class).put(zis, info);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionFactoryInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionFactoryInstrumentation.java
index a651124cb0d..3aa68f119b2 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionFactoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionFactoryInstrumentation.java
@@ -14,27 +14,27 @@
 
 @AutoService(InstrumenterModule.class)
 public class PgConnectionFactoryInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public PgConnectionFactoryInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public PgConnectionFactoryInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("io.vertx.pgclient.impl.PgConnectionFactory", DBInfo.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("io.vertx.pgclient.impl.PgConnectionFactory", DBInfo.class.getName());
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.pgclient.impl.PgConnectionFactory";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.pgclient.impl.PgConnectionFactory";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArguments(2))
-            .and(takesArgument(1, named("io.vertx.pgclient.PgConnectOptions"))),
-        packageName + ".PgConnectionFactoryConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArguments(2))
+                        .and(takesArgument(1, named("io.vertx.pgclient.PgConnectOptions"))),
+                packageName + ".PgConnectionFactoryConstructorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionImplConstructorAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionImplConstructorAdvice.java
index eda970aaf08..69d38ab34b0 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionImplConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionImplConstructorAdvice.java
@@ -7,10 +7,13 @@
 import net.bytebuddy.asm.Advice;
 
 public class PgConnectionImplConstructorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterConstructor(
-      @Advice.This final SqlClient zis, @Advice.Argument(0) final PgConnectionFactory factory) {
-    InstrumentationContext.get(SqlClient.class, DBInfo.class)
-        .put(zis, InstrumentationContext.get(PgConnectionFactory.class, DBInfo.class).get(factory));
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterConstructor(
+            @Advice.This final SqlClient zis, @Advice.Argument(0) final PgConnectionFactory factory) {
+        InstrumentationContext.get(SqlClient.class, DBInfo.class)
+                .put(
+                        zis,
+                        InstrumentationContext.get(PgConnectionFactory.class, DBInfo.class)
+                                .get(factory));
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionImplInstrumentation.java
index dc97d7111af..3f854990779 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionImplInstrumentation.java
@@ -13,28 +13,28 @@
 
 @AutoService(InstrumenterModule.class)
 public class PgConnectionImplInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public PgConnectionImplInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public PgConnectionImplInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>();
-    contextStores.put("io.vertx.pgclient.impl.PgConnectionFactory", DBInfo.class.getName());
-    contextStores.put("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
-    return contextStores;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>();
+        contextStores.put("io.vertx.pgclient.impl.PgConnectionFactory", DBInfo.class.getName());
+        contextStores.put("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
+        return contextStores;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.pgclient.impl.PgConnectionImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.pgclient.impl.PgConnectionImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(0, named("io.vertx.pgclient.impl.PgConnectionFactory"))),
-        packageName + ".PgConnectionImplConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(0, named("io.vertx.pgclient.impl.PgConnectionFactory"))),
+                packageName + ".PgConnectionImplConstructorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgPoolImplAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgPoolImplAdvice.java
index ac24692250d..46e29289274 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgPoolImplAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgPoolImplAdvice.java
@@ -10,22 +10,19 @@
 
 public class PgPoolImplAdvice {
 
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterCreate(
-      @Advice.Return final SqlClient zis, @Advice.Argument(2) PgConnectOptions options) {
-    DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
-    DBInfo info =
-        builder
-            .host(options.getHost())
-            .port(options.getPort())
-            .db(options.getDatabase())
-            .user(options.getUser())
-            .type("postgresql")
-            .build();
-    InstrumentationContext.get(SqlClient.class, DBInfo.class).put(zis, info);
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterCreate(@Advice.Return final SqlClient zis, @Advice.Argument(2) PgConnectOptions options) {
+        DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
+        DBInfo info = builder.host(options.getHost())
+                .port(options.getPort())
+                .db(options.getDatabase())
+                .user(options.getUser())
+                .type("postgresql")
+                .build();
+        InstrumentationContext.get(SqlClient.class, DBInfo.class).put(zis, info);
+    }
 
-  private static void muzzleCheck(PgConnectionFactory f) {
-    f.connect((Context) null);
-  }
+    private static void muzzleCheck(PgConnectionFactory f) {
+        f.connect((Context) null);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgPoolImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgPoolImplInstrumentation.java
index cb95104c0df..7176a38514c 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgPoolImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgPoolImplInstrumentation.java
@@ -16,30 +16,30 @@
 
 @AutoService(InstrumenterModule.class)
 public class PgPoolImplInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public PgPoolImplInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public PgPoolImplInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.pgclient.impl.PgPoolImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.pgclient.impl.PgPoolImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isStatic()
-            .and(isPublic())
-            .and(isMethod())
-            .and(named("create"))
-            .and(takesArguments(4))
-            .and(takesArgument(2, named("io.vertx.pgclient.PgConnectOptions"))),
-        packageName + ".PgPoolImplAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isStatic()
+                        .and(isPublic())
+                        .and(isMethod())
+                        .and(named("create"))
+                        .and(takesArguments(4))
+                        .and(takesArgument(2, named("io.vertx.pgclient.PgConnectOptions"))),
+                packageName + ".PgPoolImplAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/test/java/TestDatabases.java b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/test/java/TestDatabases.java
index 3e1f72e8d41..d80c2d69757 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/test/java/TestDatabases.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/src/test/java/TestDatabases.java
@@ -9,94 +9,90 @@
 
 public class TestDatabases implements Closeable {
 
-  private final PostgreSQLContainer<?> pgsql;
-  private final Map<String, TestDBInfo> dbInfos;
+    private final PostgreSQLContainer<?> pgsql;
+    private final Map<String, TestDBInfo> dbInfos;
 
-  @SuppressWarnings("resource")
-  private TestDatabases(String dbName) {
-    Map<String, TestDBInfo> infos = new HashMap<>();
-    pgsql =
-        new PostgreSQLContainer<>(
-                DockerImageName.parse(System.getProperty("test.postgres.image"))
-                    .asCompatibleSubstituteFor("postgres"))
-            .withDatabaseName(dbName)
-            .withUsername("postgres")
-            .withPassword("postgres");
-    pgsql.start();
-    TestDBInfo info =
-        new TestDBInfo(
-            pgsql.getUsername(),
-            pgsql.getPassword(),
-            pgsql.getHost(),
-            pgsql.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT),
-            "postgresql",
-            dbName);
-    PortUtils.waitForPortToOpen(info.host, info.port, 5, TimeUnit.SECONDS);
-    infos.put("postgresql", info);
-    dbInfos = Collections.unmodifiableMap(infos);
-  }
+    @SuppressWarnings("resource")
+    private TestDatabases(String dbName) {
+        Map<String, TestDBInfo> infos = new HashMap<>();
+        pgsql = new PostgreSQLContainer<>(DockerImageName.parse(System.getProperty("test.postgres.image"))
+                        .asCompatibleSubstituteFor("postgres"))
+                .withDatabaseName(dbName)
+                .withUsername("postgres")
+                .withPassword("postgres");
+        pgsql.start();
+        TestDBInfo info = new TestDBInfo(
+                pgsql.getUsername(),
+                pgsql.getPassword(),
+                pgsql.getHost(),
+                pgsql.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT),
+                "postgresql",
+                dbName);
+        PortUtils.waitForPortToOpen(info.host, info.port, 5, TimeUnit.SECONDS);
+        infos.put("postgresql", info);
+        dbInfos = Collections.unmodifiableMap(infos);
+    }
 
-  public static TestDatabases initialise(String dbName) {
-    return new TestDatabases(dbName);
-  }
+    public static TestDatabases initialise(String dbName) {
+        return new TestDatabases(dbName);
+    }
 
-  @Override
-  public void close() {
-    if (null != pgsql) {
-      pgsql.close();
+    @Override
+    public void close() {
+        if (null != pgsql) {
+            pgsql.close();
+        }
     }
-  }
 
-  public Map<String, TestDBInfo> getDBInfos() {
-    return dbInfos;
-  }
+    public Map<String, TestDBInfo> getDBInfos() {
+        return dbInfos;
+    }
 
-  public static class TestDBInfo {
-    private final String user;
-    private final String password;
-    private final String host;
-    private final Integer port;
-    private final String type;
-    private final String dbName;
-    private final String uri;
+    public static class TestDBInfo {
+        private final String user;
+        private final String password;
+        private final String host;
+        private final Integer port;
+        private final String type;
+        private final String dbName;
+        private final String uri;
 
-    public TestDBInfo(
-        String user, String password, String host, Integer port, String type, String dbName) {
-      this.user = user;
-      this.password = password;
-      this.host = host;
-      this.port = port;
-      this.type = type;
-      this.dbName = dbName;
-      this.uri = type + "://" + user + ":" + password + "@" + host + ":" + port + "/" + dbName;
-    }
+        public TestDBInfo(String user, String password, String host, Integer port, String type, String dbName) {
+            this.user = user;
+            this.password = password;
+            this.host = host;
+            this.port = port;
+            this.type = type;
+            this.dbName = dbName;
+            this.uri = type + "://" + user + ":" + password + "@" + host + ":" + port + "/" + dbName;
+        }
 
-    public String getUser() {
-      return user;
-    }
+        public String getUser() {
+            return user;
+        }
 
-    public String getPassword() {
-      return password;
-    }
+        public String getPassword() {
+            return password;
+        }
 
-    public String getHost() {
-      return host;
-    }
+        public String getHost() {
+            return host;
+        }
 
-    public String getPort() {
-      return port.toString();
-    }
+        public String getPort() {
+            return port.toString();
+        }
 
-    public String getType() {
-      return type;
-    }
+        public String getType() {
+            return type;
+        }
 
-    public String getDbName() {
-      return dbName;
-    }
+        public String getDbName() {
+            return dbName;
+        }
 
-    public String getUri() {
-      return uri;
+        public String getUri() {
+            return uri;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4_4_2/PgConnectionFactoryConstructorAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4_4_2/PgConnectionFactoryConstructorAdvice.java
index 9e0f9d03f88..40d2c5afe92 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4_4_2/PgConnectionFactoryConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4_4_2/PgConnectionFactoryConstructorAdvice.java
@@ -10,22 +10,20 @@
 import net.bytebuddy.asm.Advice;
 
 public class PgConnectionFactoryConstructorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterConstructor(
-      @Advice.This final PgConnectionFactory factory,
-      @Advice.Argument(1) final Supplier<? extends Future<? extends SqlConnectOptions>> databases) {
-    if (databases instanceof SingletonSupplier) {
-      SqlConnectOptions options = (SqlConnectOptions) ((SingletonSupplier) databases).unwrap();
-      DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
-      DBInfo info =
-          builder
-              .host(options.getHost())
-              .port(options.getPort())
-              .db(options.getDatabase())
-              .user(options.getUser())
-              .type("postgresql")
-              .build();
-      InstrumentationContext.get(PgConnectionFactory.class, DBInfo.class).put(factory, info);
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterConstructor(
+            @Advice.This final PgConnectionFactory factory,
+            @Advice.Argument(1) final Supplier<? extends Future<? extends SqlConnectOptions>> databases) {
+        if (databases instanceof SingletonSupplier) {
+            SqlConnectOptions options = (SqlConnectOptions) ((SingletonSupplier) databases).unwrap();
+            DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
+            DBInfo info = builder.host(options.getHost())
+                    .port(options.getPort())
+                    .db(options.getDatabase())
+                    .user(options.getUser())
+                    .type("postgresql")
+                    .build();
+            InstrumentationContext.get(PgConnectionFactory.class, DBInfo.class).put(factory, info);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4_4_2/PgConnectionFactoryInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4_4_2/PgConnectionFactoryInstrumentation.java
index 5e8ac3371de..fab20e69181 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4_4_2/PgConnectionFactoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4_4_2/PgConnectionFactoryInstrumentation.java
@@ -14,27 +14,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class PgConnectionFactoryInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public PgConnectionFactoryInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public PgConnectionFactoryInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("io.vertx.pgclient.impl.PgConnectionFactory", DBInfo.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("io.vertx.pgclient.impl.PgConnectionFactory", DBInfo.class.getName());
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.pgclient.impl.PgConnectionFactory";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.pgclient.impl.PgConnectionFactory";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArguments(2))
-            .and(takesArgument(1, named("java.util.function.Supplier"))),
-        packageName + ".PgConnectionFactoryConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArguments(2)).and(takesArgument(1, named("java.util.function.Supplier"))),
+                packageName + ".PgConnectionFactoryConstructorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4_4_2/PgDriverAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4_4_2/PgDriverAdvice.java
index f55cf047f28..0d60f337b66 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4_4_2/PgDriverAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4_4_2/PgDriverAdvice.java
@@ -11,23 +11,21 @@
 
 public class PgDriverAdvice {
 
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterNewPoolImpl(
-      @Advice.Return final SqlClient zis,
-      @Advice.Argument(1) final Supplier<? extends Future<? extends SqlConnectOptions>> databases) {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterNewPoolImpl(
+            @Advice.Return final SqlClient zis,
+            @Advice.Argument(1) final Supplier<? extends Future<? extends SqlConnectOptions>> databases) {
 
-    if (databases instanceof SingletonSupplier) {
-      SqlConnectOptions options = (SqlConnectOptions) ((SingletonSupplier) databases).unwrap();
-      DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
-      DBInfo info =
-          builder
-              .host(options.getHost())
-              .port(options.getPort())
-              .db(options.getDatabase())
-              .user(options.getUser())
-              .type("postgresql")
-              .build();
-      InstrumentationContext.get(SqlClient.class, DBInfo.class).put(zis, info);
+        if (databases instanceof SingletonSupplier) {
+            SqlConnectOptions options = (SqlConnectOptions) ((SingletonSupplier) databases).unwrap();
+            DBInfo.Builder builder = DBInfo.DEFAULT.toBuilder();
+            DBInfo info = builder.host(options.getHost())
+                    .port(options.getPort())
+                    .db(options.getDatabase())
+                    .user(options.getUser())
+                    .type("postgresql")
+                    .build();
+            InstrumentationContext.get(SqlClient.class, DBInfo.class).put(zis, info);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4_4_2/PgDriverInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4_4_2/PgDriverInstrumentation.java
index f6856b85572..b84bc400bb7 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4_4_2/PgDriverInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4_4_2/PgDriverInstrumentation.java
@@ -14,28 +14,28 @@
 
 @AutoService(InstrumenterModule.class)
 public class PgDriverInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public PgDriverInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+    public PgDriverInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.pgclient.spi.PgDriver";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.pgclient.spi.PgDriver";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPrivate()
-            .and(named("newPoolImpl"))
-            .and(takesArguments(4).and(takesArgument(1, named("java.util.function.Supplier")))),
-        packageName + ".PgDriverAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPrivate()
+                        .and(named("newPoolImpl"))
+                        .and(takesArguments(4).and(takesArgument(1, named("java.util.function.Supplier")))),
+                packageName + ".PgDriverAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/CommandImplConstructorAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/CommandImplConstructorAdvice.java
index 839c62611cf..33f40a47962 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/CommandImplConstructorAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/CommandImplConstructorAdvice.java
@@ -8,14 +8,13 @@
 import net.bytebuddy.asm.Advice;
 
 public class CommandImplConstructorAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterConstructor(
-      @Advice.This final CommandImpl zis, @Advice.Argument(0) String command) {
-    InstrumentationContext.get(Command.class, UTF8BytesString.class)
-        .put(zis, UTF8BytesString.create(command.toUpperCase()));
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterConstructor(@Advice.This final CommandImpl zis, @Advice.Argument(0) String command) {
+        InstrumentationContext.get(Command.class, UTF8BytesString.class)
+                .put(zis, UTF8BytesString.create(command.toUpperCase()));
+    }
 
-  private static void muzzleCheck() {
-    Redis.createClient(null, "somehost"); // added in 3.9.x
-  }
+    private static void muzzleCheck() {
+        Redis.createClient(null, "somehost"); // added in 3.9.x
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/CommandImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/CommandImplInstrumentation.java
index 5db97a4250f..a36cd824f5e 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/CommandImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/CommandImplInstrumentation.java
@@ -13,25 +13,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class CommandImplInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public CommandImplInstrumentation() {
-    super("vertx", "vertx-redis-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public CommandImplInstrumentation() {
+        super("vertx", "vertx-redis-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("io.vertx.redis.client.Command", UTF8BytesString.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("io.vertx.redis.client.Command", UTF8BytesString.class.getName());
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.redis.client.impl.CommandImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.redis.client.impl.CommandImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(0, named("java.lang.String"))),
-        packageName + ".CommandImplConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(0, named("java.lang.String"))),
+                packageName + ".CommandImplConstructorAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPICallAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPICallAdvice.java
index 3c30d57b825..4cdaded6e79 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPICallAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPICallAdvice.java
@@ -20,145 +20,124 @@
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
 
 public class RedisAPICallAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope beforeCall(
-      @Advice.Origin final Method currentMethod,
-      @Advice.This final RedisAPI self,
-      @Advice.Argument(
-              value = 0,
-              readOnly = false,
-              optional = true,
-              typing = Assigner.Typing.DYNAMIC)
-          Object arg1,
-      @Advice.Argument(
-              value = 1,
-              readOnly = false,
-              optional = true,
-              typing = Assigner.Typing.DYNAMIC)
-          Object arg2,
-      @Advice.Argument(
-              value = 2,
-              readOnly = false,
-              optional = true,
-              typing = Assigner.Typing.DYNAMIC)
-          Object arg3,
-      @Advice.Argument(
-              value = 3,
-              readOnly = false,
-              optional = true,
-              typing = Assigner.Typing.DYNAMIC)
-          Object arg4,
-      @Advice.Argument(
-              value = 4,
-              readOnly = false,
-              optional = true,
-              typing = Assigner.Typing.DYNAMIC)
-          Object arg5) {
-    // This API calls the underlying Redis.send or RedisConnection.send with a newly created
-    // Request (where we would actually like to add the information that this has already
-    // been handled) and a new Future as handler (so we can't look at the handler itself
-    // either), so this seems to be the only way to communicate that we have already wrapped
-    // the handler. :(
-    if (CallDepthThreadLocalMap.incrementCallDepth(RedisAPI.class) > 0) {
-      return null;
-    }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope beforeCall(
+            @Advice.Origin final Method currentMethod,
+            @Advice.This final RedisAPI self,
+            @Advice.Argument(value = 0, readOnly = false, optional = true, typing = Assigner.Typing.DYNAMIC)
+                    Object arg1,
+            @Advice.Argument(value = 1, readOnly = false, optional = true, typing = Assigner.Typing.DYNAMIC)
+                    Object arg2,
+            @Advice.Argument(value = 2, readOnly = false, optional = true, typing = Assigner.Typing.DYNAMIC)
+                    Object arg3,
+            @Advice.Argument(value = 3, readOnly = false, optional = true, typing = Assigner.Typing.DYNAMIC)
+                    Object arg4,
+            @Advice.Argument(value = 4, readOnly = false, optional = true, typing = Assigner.Typing.DYNAMIC)
+                    Object arg5) {
+        // This API calls the underlying Redis.send or RedisConnection.send with a newly created
+        // Request (where we would actually like to add the information that this has already
+        // been handled) and a new Future as handler (so we can't look at the handler itself
+        // either), so this seems to be the only way to communicate that we have already wrapped
+        // the handler. :(
+        if (CallDepthThreadLocalMap.incrementCallDepth(RedisAPI.class) > 0) {
+            return null;
+        }
 
-    // TODO what is the recreated for every read about in the @Advice.Origin javadoc?
-    Method method = currentMethod;
-    int position = method.getParameterCount();
-    Handler<AsyncResult<Response>> handler = null;
+        // TODO what is the recreated for every read about in the @Advice.Origin javadoc?
+        Method method = currentMethod;
+        int position = method.getParameterCount();
+        Handler<AsyncResult<Response>> handler = null;
 
-    switch (position) {
-      case 1:
-        if (arg1 instanceof Handler) {
-          handler = (Handler<AsyncResult<Response>>) arg1;
-        }
-        break;
-      case 2:
-        if (arg2 instanceof Handler) {
-          handler = (Handler<AsyncResult<Response>>) arg2;
-        }
-        break;
-      case 3:
-        if (arg3 instanceof Handler) {
-          handler = (Handler<AsyncResult<Response>>) arg3;
+        switch (position) {
+            case 1:
+                if (arg1 instanceof Handler) {
+                    handler = (Handler<AsyncResult<Response>>) arg1;
+                }
+                break;
+            case 2:
+                if (arg2 instanceof Handler) {
+                    handler = (Handler<AsyncResult<Response>>) arg2;
+                }
+                break;
+            case 3:
+                if (arg3 instanceof Handler) {
+                    handler = (Handler<AsyncResult<Response>>) arg3;
+                }
+                break;
+            case 4:
+                if (arg4 instanceof Handler) {
+                    handler = (Handler<AsyncResult<Response>>) arg4;
+                }
+                break;
+            case 5:
+                if (arg5 instanceof Handler) {
+                    handler = (Handler<AsyncResult<Response>>) arg5;
+                }
+                break;
+            default:
         }
-        break;
-      case 4:
-        if (arg4 instanceof Handler) {
-          handler = (Handler<AsyncResult<Response>>) arg4;
-        }
-        break;
-      case 5:
-        if (arg5 instanceof Handler) {
-          handler = (Handler<AsyncResult<Response>>) arg5;
-        }
-        break;
-      default:
-    }
 
-    if (null == handler || handler instanceof ResponseHandlerWrapper) {
-      return null;
-    }
+        if (null == handler || handler instanceof ResponseHandlerWrapper) {
+            return null;
+        }
 
-    final AgentSpan parentSpan = activeSpan();
-    final AgentSpan clientSpan = DECORATE.startAndDecorateSpan(method.getName());
-    ContextContinuation parentContinuation =
-        null == parentSpan ? noopSpan().captureWithContext() : parentSpan.captureWithContext();
-    /*
-    Opens a new scope.
-    The potential racy condition when the handler may be added to an already finished task is handled
-    by RedisAPIImplSendAdvice.
-    */
-    ContextScope scope = activateSpan(clientSpan);
-    ResponseHandlerWrapper respHandler =
-        new ResponseHandlerWrapper(handler, clientSpan, parentContinuation);
-    handler = respHandler;
+        final AgentSpan parentSpan = activeSpan();
+        final AgentSpan clientSpan = DECORATE.startAndDecorateSpan(method.getName());
+        ContextContinuation parentContinuation =
+                null == parentSpan ? noopSpan().captureWithContext() : parentSpan.captureWithContext();
+        /*
+        Opens a new scope.
+        The potential racy condition when the handler may be added to an already finished task is handled
+        by RedisAPIImplSendAdvice.
+        */
+        ContextScope scope = activateSpan(clientSpan);
+        ResponseHandlerWrapper respHandler = new ResponseHandlerWrapper(handler, clientSpan, parentContinuation);
+        handler = respHandler;
 
-    switch (position) {
-      case 1:
-        arg1 = handler;
-        break;
-      case 2:
-        arg2 = handler;
-        break;
-      case 3:
-        arg3 = handler;
-        break;
-      case 4:
-        arg4 = handler;
-        break;
-      case 5:
-        arg5 = handler;
-        break;
-      default:
+        switch (position) {
+            case 1:
+                arg1 = handler;
+                break;
+            case 2:
+                arg2 = handler;
+                break;
+            case 3:
+                arg3 = handler;
+                break;
+            case 4:
+                arg4 = handler;
+                break;
+            case 5:
+                arg5 = handler;
+                break;
+            default:
+        }
+        /*
+        Store the response handler in the context so that it can be retrieved in RedisAPIImplSendAdvice
+        */
+        InstrumentationContext.get(RedisAPI.class, ResponseHandlerWrapper.class).put(self, respHandler);
+        return scope;
     }
-    /*
-    Store the response handler in the context so that it can be retrieved in RedisAPIImplSendAdvice
-    */
-    InstrumentationContext.get(RedisAPI.class, ResponseHandlerWrapper.class).put(self, respHandler);
-    return scope;
-  }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void afterCall(
-      @Advice.Thrown final Throwable throwable,
-      @Advice.This final RedisAPI self,
-      @Advice.Enter final ContextScope scope) {
-    CallDepthThreadLocalMap.decrementCallDepth(RedisAPI.class);
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void afterCall(
+            @Advice.Thrown final Throwable throwable,
+            @Advice.This final RedisAPI self,
+            @Advice.Enter final ContextScope scope) {
+        CallDepthThreadLocalMap.decrementCallDepth(RedisAPI.class);
 
-    if (null == scope) {
-      return;
-    }
+        if (null == scope) {
+            return;
+        }
 
-    scope.close();
+        scope.close();
 
-    // Clean the response handler from the context
-    InstrumentationContext.get(RedisAPI.class, ResponseHandlerWrapper.class).remove(self);
-  }
+        // Clean the response handler from the context
+        InstrumentationContext.get(RedisAPI.class, ResponseHandlerWrapper.class).remove(self);
+    }
 
-  // Only apply this advice for versions that we instrument 3.9.x
-  private static void muzzleCheck() {
-    Redis.createClient(null, "somehost"); // added in 3.9.x
-  }
+    // Only apply this advice for versions that we instrument 3.9.x
+    private static void muzzleCheck() {
+        Redis.createClient(null, "somehost"); // added in 3.9.x
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIImplSendAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIImplSendAdvice.java
index 3599f31233d..476014afca2 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIImplSendAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIImplSendAdvice.java
@@ -15,47 +15,47 @@
 import net.bytebuddy.asm.Advice;
 
 public class RedisAPIImplSendAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterSend(
-      @Advice.This RedisAPI self,
-      @Advice.FieldValue("connection") final RedisConnection connection,
-      @Advice.Return Future<Response> future) {
-    /*
-    Here we can safely set the handler for a command related Future instance.
-    We need to take some precautions due to a non-existent operation which would allow setting the handler
-    and in case the Future is complete immediately calling it.
-     */
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterSend(
+            @Advice.This RedisAPI self,
+            @Advice.FieldValue("connection") final RedisConnection connection,
+            @Advice.Return Future<Response> future) {
+        /*
+        Here we can safely set the handler for a command related Future instance.
+        We need to take some precautions due to a non-existent operation which would allow setting the handler
+        and in case the Future is complete immediately calling it.
+         */
 
-    // Note that we should not _leak_ the active scope to the handler if it gets executed directly
-    try (ContextScope scope = activateSpan(noopSpan())) {
-      // Get the handler from the context, set by RedisAPICallAdvice
-      ResponseHandlerWrapper handler =
-          InstrumentationContext.get(RedisAPI.class, ResponseHandlerWrapper.class).get(self);
-      if (handler != null) {
-        if (handler.clientSpan != null && connection != null) {
-          final SocketAddress socketAddress =
-              InstrumentationContext.get(RedisConnection.class, SocketAddress.class)
-                  .get(connection);
-          if (socketAddress != null) {
-            DECORATE.onConnection(handler.clientSpan, socketAddress);
-            DECORATE.setPeerPort(handler.clientSpan, socketAddress.port());
-          }
+        // Note that we should not _leak_ the active scope to the handler if it gets executed directly
+        try (ContextScope scope = activateSpan(noopSpan())) {
+            // Get the handler from the context, set by RedisAPICallAdvice
+            ResponseHandlerWrapper handler = InstrumentationContext.get(RedisAPI.class, ResponseHandlerWrapper.class)
+                    .get(self);
+            if (handler != null) {
+                if (handler.clientSpan != null && connection != null) {
+                    final SocketAddress socketAddress = InstrumentationContext.get(
+                                    RedisConnection.class, SocketAddress.class)
+                            .get(connection);
+                    if (socketAddress != null) {
+                        DECORATE.onConnection(handler.clientSpan, socketAddress);
+                        DECORATE.setPeerPort(handler.clientSpan, socketAddress.port());
+                    }
+                }
+                if (!future.isComplete()) {
+                    // Add the handler only when the future is not already completed
+                    future.onComplete(handler);
+                } else {
+                    // Check whether the future has completed some time when adding the handler.
+                    // This might lead to executing the handler twice so the handler must be able to deal with
+                    // it.
+                    handler.handle(future);
+                }
+            }
         }
-        if (!future.isComplete()) {
-          // Add the handler only when the future is not already completed
-          future.onComplete(handler);
-        } else {
-          // Check whether the future has completed some time when adding the handler.
-          // This might lead to executing the handler twice so the handler must be able to deal with
-          // it.
-          handler.handle(future);
-        }
-      }
     }
-  }
 
-  // Only apply this advice for versions that we instrument 3.9.x
-  private static void muzzleCheck() {
-    Redis.createClient(null, "somehost"); // added in 3.9.x
-  }
+    // Only apply this advice for versions that we instrument 3.9.x
+    private static void muzzleCheck() {
+        Redis.createClient(null, "somehost"); // added in 3.9.x
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIInstrumentation.java
index ed5012b42f8..ff87d886b9a 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIInstrumentation.java
@@ -14,33 +14,31 @@
 
 @AutoService(InstrumenterModule.class)
 public class RedisAPIInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public RedisAPIInstrumentation() {
-    super("vertx", "vertx-redis-client");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public RedisAPIInstrumentation() {
+        super("vertx", "vertx-redis-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>();
-    contextStores.put("io.vertx.redis.client.RedisAPI", packageName + ".ResponseHandlerWrapper");
-    contextStores.put("io.vertx.redis.client.RedisConnection", "io.vertx.core.net.SocketAddress");
-    return contextStores;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>();
+        contextStores.put("io.vertx.redis.client.RedisAPI", packageName + ".ResponseHandlerWrapper");
+        contextStores.put("io.vertx.redis.client.RedisConnection", "io.vertx.core.net.SocketAddress");
+        return contextStores;
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.vertx.redis.client.RedisAPI", "io.vertx.redis.client.impl.RedisAPIImpl"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"io.vertx.redis.client.RedisAPI", "io.vertx.redis.client.impl.RedisAPIImpl"};
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isVirtual().and(isDefaultMethod()).and(returns(named("io.vertx.redis.client.RedisAPI"))),
-        packageName + ".RedisAPICallAdvice");
-    transformer.applyAdvice(
-        named("send").and(not(isDefaultMethod())).and(returns(named("io.vertx.core.Future"))),
-        packageName + ".RedisAPIImplSendAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isVirtual().and(isDefaultMethod()).and(returns(named("io.vertx.redis.client.RedisAPI"))),
+                packageName + ".RedisAPICallAdvice");
+        transformer.applyAdvice(
+                named("send").and(not(isDefaultMethod())).and(returns(named("io.vertx.core.Future"))),
+                packageName + ".RedisAPIImplSendAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisConnectionConstructAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisConnectionConstructAdvice.java
index 60237404a5e..0ed1da6dd69 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisConnectionConstructAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisConnectionConstructAdvice.java
@@ -8,17 +8,17 @@
 import net.bytebuddy.asm.Advice;
 
 public class RedisConnectionConstructAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterConstructor(
-      @Advice.Argument(3) final NetSocket netSocket, @Advice.This final RedisConnection thiz) {
-    if (netSocket != null && netSocket.remoteAddress() != null) {
-      InstrumentationContext.get(RedisConnection.class, SocketAddress.class)
-          .put(thiz, netSocket.remoteAddress());
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterConstructor(
+            @Advice.Argument(3) final NetSocket netSocket, @Advice.This final RedisConnection thiz) {
+        if (netSocket != null && netSocket.remoteAddress() != null) {
+            InstrumentationContext.get(RedisConnection.class, SocketAddress.class)
+                    .put(thiz, netSocket.remoteAddress());
+        }
     }
-  }
 
-  // Only apply this advice for versions that we instrument 3.9.x
-  private static void muzzleCheck() {
-    Redis.createClient(null, "somehost"); // added in 3.9.x
-  }
+    // Only apply this advice for versions that we instrument 3.9.x
+    private static void muzzleCheck() {
+        Redis.createClient(null, "somehost"); // added in 3.9.x
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisFutureSendAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisFutureSendAdvice.java
index cddcaf380cc..4a98e432fba 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisFutureSendAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisFutureSendAdvice.java
@@ -26,74 +26,70 @@
 import net.bytebuddy.asm.Advice;
 
 public class RedisFutureSendAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope beforeSend(
-      @Advice.Argument(value = 0, readOnly = false) Request request,
-      @Advice.Local("ddParentContinuation") ContextContinuation parentContinuation)
-      throws Throwable {
-    // If we had already wrapped the innermost handler in the RedisAPI call, then we should
-    // not wrap it again here. See comment in RedisAPICallAdvice
-    boolean nested = CallDepthThreadLocalMap.incrementCallDepth(RedisAPI.class) > 0;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope beforeSend(
+            @Advice.Argument(value = 0, readOnly = false) Request request,
+            @Advice.Local("ddParentContinuation") ContextContinuation parentContinuation)
+            throws Throwable {
+        // If we had already wrapped the innermost handler in the RedisAPI call, then we should
+        // not wrap it again here. See comment in RedisAPICallAdvice
+        boolean nested = CallDepthThreadLocalMap.incrementCallDepth(RedisAPI.class) > 0;
 
-    ContextStore<Request, Boolean> ctxt = InstrumentationContext.get(Request.class, Boolean.class);
-    Boolean handled = ctxt.get(request);
-    if (null != handled && handled) {
-      return null;
-    }
-    // Create a shallow copy of the Request here to make sure that reused Requests get spans
-    if (request instanceof Cloneable) {
-      // Other library code do this downcast, so we can do it as well
-      request = (Request) ((RequestImpl) request).clone();
-    }
-    ctxt.put(request, Boolean.TRUE);
-
-    // Mark the request handled even when nested, so a later async re-send of the same
-    // Request (e.g. via a pooled connection) isn't mistaken for a brand-new command.
-    if (nested) {
-      return null;
-    }
+        ContextStore<Request, Boolean> ctxt = InstrumentationContext.get(Request.class, Boolean.class);
+        Boolean handled = ctxt.get(request);
+        if (null != handled && handled) {
+            return null;
+        }
+        // Create a shallow copy of the Request here to make sure that reused Requests get spans
+        if (request instanceof Cloneable) {
+            // Other library code do this downcast, so we can do it as well
+            request = (Request) ((RequestImpl) request).clone();
+        }
+        ctxt.put(request, Boolean.TRUE);
 
-    AgentSpan parentSpan = activeSpan();
+        // Mark the request handled even when nested, so a later async re-send of the same
+        // Request (e.g. via a pooled connection) isn't mistaken for a brand-new command.
+        if (nested) {
+            return null;
+        }
 
-    if (parentSpan != null && REDIS_COMMAND.equals(parentSpan.getOperationName())) {
-      // FIXME: this is not the best way to do it but in 4.5.0 there can be race conditions
-      return null;
-    }
+        AgentSpan parentSpan = activeSpan();
 
-    parentContinuation =
-        null == parentSpan ? noopSpan().captureWithContext() : parentSpan.captureWithContext();
+        if (parentSpan != null && REDIS_COMMAND.equals(parentSpan.getOperationName())) {
+            // FIXME: this is not the best way to do it but in 4.5.0 there can be race conditions
+            return null;
+        }
 
-    final AgentSpan clientSpan =
-        DECORATE.startAndDecorateSpan(
-            request.command(), InstrumentationContext.get(Command.class, UTF8BytesString.class));
+        parentContinuation = null == parentSpan ? noopSpan().captureWithContext() : parentSpan.captureWithContext();
 
-    return activateSpan(clientSpan);
-  }
+        final AgentSpan clientSpan = DECORATE.startAndDecorateSpan(
+                request.command(), InstrumentationContext.get(Command.class, UTF8BytesString.class));
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void afterSend(
-      @Advice.Return(readOnly = false) Future<Response> responseFuture,
-      @Advice.Local("ddParentContinuation") ContextContinuation parentContinuation,
-      @Advice.Enter final ContextScope clientScope,
-      @Advice.This final Object thiz) {
-    CallDepthThreadLocalMap.decrementCallDepth(RedisAPI.class);
-    if (thiz instanceof RedisConnection) {
-      final SocketAddress socketAddress =
-          InstrumentationContext.get(RedisConnection.class, SocketAddress.class)
-              .get((RedisConnection) thiz);
-      final AgentSpan span = clientScope != null ? spanFromScope(clientScope) : activeSpan();
-      // Verify the activeSpan() fallback is actually a REDIS_COMMAND span
-      if (socketAddress != null && span != null && REDIS_COMMAND.equals(span.getOperationName())) {
-        DECORATE.onConnection(span, socketAddress);
-        DECORATE.setPeerPort(span, socketAddress.port());
-      }
+        return activateSpan(clientSpan);
     }
-    if (clientScope != null) {
-      Promise<Response> promise = Promise.promise();
-      responseFuture.onComplete(
-          new ResponseHandler(promise, spanFromScope(clientScope), parentContinuation));
-      responseFuture = promise.future();
-      clientScope.close();
+
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void afterSend(
+            @Advice.Return(readOnly = false) Future<Response> responseFuture,
+            @Advice.Local("ddParentContinuation") ContextContinuation parentContinuation,
+            @Advice.Enter final ContextScope clientScope,
+            @Advice.This final Object thiz) {
+        CallDepthThreadLocalMap.decrementCallDepth(RedisAPI.class);
+        if (thiz instanceof RedisConnection) {
+            final SocketAddress socketAddress = InstrumentationContext.get(RedisConnection.class, SocketAddress.class)
+                    .get((RedisConnection) thiz);
+            final AgentSpan span = clientScope != null ? spanFromScope(clientScope) : activeSpan();
+            // Verify the activeSpan() fallback is actually a REDIS_COMMAND span
+            if (socketAddress != null && span != null && REDIS_COMMAND.equals(span.getOperationName())) {
+                DECORATE.onConnection(span, socketAddress);
+                DECORATE.setPeerPort(span, socketAddress.port());
+            }
+        }
+        if (clientScope != null) {
+            Promise<Response> promise = Promise.promise();
+            responseFuture.onComplete(new ResponseHandler(promise, spanFromScope(clientScope), parentContinuation));
+            responseFuture = promise.future();
+            clientScope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisInstrumentation.java
index 71db531bf43..1958a5ad478 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisInstrumentation.java
@@ -19,59 +19,58 @@
 
 @AutoService(InstrumenterModule.class)
 public class RedisInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public RedisInstrumentation() {
-    super("vertx", "vertx-redis-client");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public RedisInstrumentation() {
+        super("vertx", "vertx-redis-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>();
-    contextStores.put("io.vertx.redis.client.Command", UTF8BytesString.class.getName());
-    contextStores.put("io.vertx.redis.client.Request", Boolean.class.getName());
-    contextStores.put("io.vertx.redis.client.RedisConnection", "io.vertx.core.net.SocketAddress");
-    return contextStores;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>();
+        contextStores.put("io.vertx.redis.client.Command", UTF8BytesString.class.getName());
+        contextStores.put("io.vertx.redis.client.Request", Boolean.class.getName());
+        contextStores.put("io.vertx.redis.client.RedisConnection", "io.vertx.core.net.SocketAddress");
+        return contextStores;
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.vertx.redis.client.Redis",
-      "io.vertx.redis.client.impl.RedisClient",
-      "io.vertx.redis.client.impl.RedisClusterClient",
-      "io.vertx.redis.client.impl.RedisSentinelClient",
-      "io.vertx.redis.client.impl.RedisConnectionImpl",
-      "io.vertx.redis.client.impl.RedisClusterConnection",
-      "io.vertx.redis.client.impl.RedisStandaloneConnection", // added in 4.x
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.vertx.redis.client.Redis",
+            "io.vertx.redis.client.impl.RedisClient",
+            "io.vertx.redis.client.impl.RedisClusterClient",
+            "io.vertx.redis.client.impl.RedisSentinelClient",
+            "io.vertx.redis.client.impl.RedisConnectionImpl",
+            "io.vertx.redis.client.impl.RedisClusterConnection",
+            "io.vertx.redis.client.impl.RedisStandaloneConnection", // added in 4.x
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
 
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("send"))
-            .and(takesArgument(0, named("io.vertx.redis.client.Request")))
-            .and(takesArgument(1, named("io.vertx.core.Handler"))),
-        packageName + ".RedisSendAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("send"))
+                        .and(takesArgument(0, named("io.vertx.redis.client.Request")))
+                        .and(takesArgument(1, named("io.vertx.core.Handler"))),
+                packageName + ".RedisSendAdvice");
 
-    transformer.applyAdvice(
-        isDeclaredBy(
-                namedOneOf(
-                    "io.vertx.redis.client.impl.RedisConnectionImpl",
-                    "io.vertx.redis.client.impl.RedisStandaloneConnection"))
-            .and(isConstructor())
-            .and(takesArgument(3, named("io.vertx.core.net.NetSocket"))),
-        packageName + ".RedisConnectionConstructAdvice");
+        transformer.applyAdvice(
+                isDeclaredBy(namedOneOf(
+                                "io.vertx.redis.client.impl.RedisConnectionImpl",
+                                "io.vertx.redis.client.impl.RedisStandaloneConnection"))
+                        .and(isConstructor())
+                        .and(takesArgument(3, named("io.vertx.core.net.NetSocket"))),
+                packageName + ".RedisConnectionConstructAdvice");
 
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("send"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("io.vertx.redis.client.Request")))
-            .and(returns(named("io.vertx.core.Future"))),
-        packageName + ".RedisFutureSendAdvice");
-  }
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("send"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("io.vertx.redis.client.Request")))
+                        .and(returns(named("io.vertx.core.Future"))),
+                packageName + ".RedisFutureSendAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisSendAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisSendAdvice.java
index 7a127a51b83..2ab789a77cb 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisSendAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisSendAdvice.java
@@ -27,75 +27,72 @@
 import net.bytebuddy.asm.Advice;
 
 public class RedisSendAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope beforeSend(
-      @Advice.Argument(value = 0, readOnly = false) Request request,
-      @Advice.Argument(value = 1, readOnly = false) Handler<AsyncResult<Response>> handler)
-      throws Throwable {
-    // If we had already wrapped the innermost handler in the RedisAPI call, then we should
-    // not wrap it again here. See comment in RedisAPICallAdvice
-    boolean nested = CallDepthThreadLocalMap.incrementCallDepth(RedisAPI.class) > 0;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope beforeSend(
+            @Advice.Argument(value = 0, readOnly = false) Request request,
+            @Advice.Argument(value = 1, readOnly = false) Handler<AsyncResult<Response>> handler)
+            throws Throwable {
+        // If we had already wrapped the innermost handler in the RedisAPI call, then we should
+        // not wrap it again here. See comment in RedisAPICallAdvice
+        boolean nested = CallDepthThreadLocalMap.incrementCallDepth(RedisAPI.class) > 0;
 
-    if (null == handler || handler instanceof ResponseHandlerWrapper) {
-      return null;
-    }
-
-    ContextStore<Request, Boolean> ctxt = InstrumentationContext.get(Request.class, Boolean.class);
-    Boolean handled = ctxt.get(request);
-    if (null != handled && handled) {
-      return null;
-    }
-    // Create a shallow copy of the Request here to make sure that reused Requests get spans
-    if (request instanceof Cloneable) {
-      // Other library code do this downcast, so we can do it as well
-      request = (Request) ((RequestImpl) request).clone();
-    }
-    ctxt.put(request, Boolean.TRUE);
+        if (null == handler || handler instanceof ResponseHandlerWrapper) {
+            return null;
+        }
 
-    // Mark the request handled even when nested, so a later async re-send of the same
-    // Request (e.g. via a pooled connection) isn't mistaken for a brand-new command.
-    if (nested) {
-      return null;
-    }
+        ContextStore<Request, Boolean> ctxt = InstrumentationContext.get(Request.class, Boolean.class);
+        Boolean handled = ctxt.get(request);
+        if (null != handled && handled) {
+            return null;
+        }
+        // Create a shallow copy of the Request here to make sure that reused Requests get spans
+        if (request instanceof Cloneable) {
+            // Other library code do this downcast, so we can do it as well
+            request = (Request) ((RequestImpl) request).clone();
+        }
+        ctxt.put(request, Boolean.TRUE);
 
-    AgentSpan parentSpan = activeSpan();
+        // Mark the request handled even when nested, so a later async re-send of the same
+        // Request (e.g. via a pooled connection) isn't mistaken for a brand-new command.
+        if (nested) {
+            return null;
+        }
 
-    if (parentSpan != null && REDIS_COMMAND.equals(parentSpan.getOperationName())) {
-      return null;
-    }
+        AgentSpan parentSpan = activeSpan();
 
-    ContextContinuation parentContinuation =
-        null == parentSpan ? noopSpan().captureWithContext() : parentSpan.captureWithContext();
-    final AgentSpan clientSpan =
-        DECORATE.startAndDecorateSpan(
-            request.command(), InstrumentationContext.get(Command.class, UTF8BytesString.class));
+        if (parentSpan != null && REDIS_COMMAND.equals(parentSpan.getOperationName())) {
+            return null;
+        }
 
-    handler = new ResponseHandlerWrapper(handler, clientSpan, parentContinuation);
-    return activateSpan(clientSpan);
-  }
+        ContextContinuation parentContinuation =
+                null == parentSpan ? noopSpan().captureWithContext() : parentSpan.captureWithContext();
+        final AgentSpan clientSpan = DECORATE.startAndDecorateSpan(
+                request.command(), InstrumentationContext.get(Command.class, UTF8BytesString.class));
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void afterSend(
-      @Advice.Enter final ContextScope clientScope, @Advice.This final Object thiz) {
-    CallDepthThreadLocalMap.decrementCallDepth(RedisAPI.class);
-    if (thiz instanceof RedisConnection) {
-      final SocketAddress socketAddress =
-          InstrumentationContext.get(RedisConnection.class, SocketAddress.class)
-              .get((RedisConnection) thiz);
-      final AgentSpan span = clientScope != null ? spanFromScope(clientScope) : activeSpan();
-      // Verify the activeSpan() fallback is actually a REDIS_COMMAND span
-      if (socketAddress != null && span != null && REDIS_COMMAND.equals(span.getOperationName())) {
-        DECORATE.onConnection(span, socketAddress);
-        DECORATE.setPeerPort(span, socketAddress.port());
-      }
+        handler = new ResponseHandlerWrapper(handler, clientSpan, parentContinuation);
+        return activateSpan(clientSpan);
     }
-    if (null != clientScope) {
-      clientScope.close();
+
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void afterSend(@Advice.Enter final ContextScope clientScope, @Advice.This final Object thiz) {
+        CallDepthThreadLocalMap.decrementCallDepth(RedisAPI.class);
+        if (thiz instanceof RedisConnection) {
+            final SocketAddress socketAddress = InstrumentationContext.get(RedisConnection.class, SocketAddress.class)
+                    .get((RedisConnection) thiz);
+            final AgentSpan span = clientScope != null ? spanFromScope(clientScope) : activeSpan();
+            // Verify the activeSpan() fallback is actually a REDIS_COMMAND span
+            if (socketAddress != null && span != null && REDIS_COMMAND.equals(span.getOperationName())) {
+                DECORATE.onConnection(span, socketAddress);
+                DECORATE.setPeerPort(span, socketAddress.port());
+            }
+        }
+        if (null != clientScope) {
+            clientScope.close();
+        }
     }
-  }
 
-  // Only apply this advice for versions that we instrument 3.9.x
-  private static void muzzleCheck() {
-    Redis.createClient(null, "somehost"); // added in 3.9.x
-  }
+    // Only apply this advice for versions that we instrument 3.9.x
+    private static void muzzleCheck() {
+        Redis.createClient(null, "somehost"); // added in 3.9.x
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RequestImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RequestImplInstrumentation.java
index cf9fca51ee6..4521f491b5d 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RequestImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RequestImplInstrumentation.java
@@ -21,112 +21,104 @@
 
 @AutoService(InstrumenterModule.class)
 public class RequestImplInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice,
-        Instrumenter.WithStructuralChange {
-  public RequestImplInstrumentation() {
-    super("vertx", "vertx-redis-client");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.redis.client.impl.RequestImpl";
-  }
-
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new RequestImplVisitorWrapper());
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // This advice should never match any methods, and is only here for Muzzle
-    transformer.applyAdvice(none(), packageName + ".RequestImplMuzzle");
-  }
-
-  @Override
-  public Class<?> structuralChangeMarker() {
-    return Cloneable.class;
-  }
+        implements Instrumenter.ForSingleType,
+                Instrumenter.HasTypeAdvice,
+                Instrumenter.HasMethodAdvice,
+                Instrumenter.WithStructuralChange {
+    public RequestImplInstrumentation() {
+        super("vertx", "vertx-redis-client");
+    }
 
-  // This Transformer will add the Cloneable interface to RequestImpl, as well
-  // as a clone method that calls the protected shallow clone method in Object
-  public static class RequestImplVisitorWrapper implements AsmVisitorWrapper {
     @Override
-    public int mergeWriter(int flags) {
-      return flags | ClassWriter.COMPUTE_MAXS;
+    public String instrumentedType() {
+        return "io.vertx.redis.client.impl.RequestImpl";
     }
 
     @Override
-    public int mergeReader(int flags) {
-      return flags;
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new RequestImplVisitorWrapper());
     }
 
     @Override
-    public ClassVisitor wrap(
-        TypeDescription instrumentedType,
-        ClassVisitor classVisitor,
-        Implementation.Context implementationContext,
-        TypePool typePool,
-        FieldList<FieldDescription.InDefinedShape> fields,
-        MethodList<?> methods,
-        int writerFlags,
-        int readerFlags) {
-      return new ClassVisitor(Opcodes.ASM7, classVisitor) {
+    public void methodAdvice(MethodTransformer transformer) {
+        // This advice should never match any methods, and is only here for Muzzle
+        transformer.applyAdvice(none(), packageName + ".RequestImplMuzzle");
+    }
 
-        private static final String CLONEABLE = "java/lang/Cloneable";
+    @Override
+    public Class<?> structuralChangeMarker() {
+        return Cloneable.class;
+    }
 
-        private boolean addCloneable = false;
+    // This Transformer will add the Cloneable interface to RequestImpl, as well
+    // as a clone method that calls the protected shallow clone method in Object
+    public static class RequestImplVisitorWrapper implements AsmVisitorWrapper {
+        @Override
+        public int mergeWriter(int flags) {
+            return flags | ClassWriter.COMPUTE_MAXS;
+        }
 
         @Override
-        public void visit(
-            int version,
-            int access,
-            String name,
-            String signature,
-            String superName,
-            String[] interfaces) {
-          // Add the Cloneable interface, unless it's already there (e.g. reapplying this
-          // change while retransforming a class that was already modified on initial load)
-          if (!arrayContains(interfaces, CLONEABLE)) {
-            interfaces = appendToArray(interfaces, CLONEABLE);
-            if (signature != null) {
-              signature += 'L' + CLONEABLE + ';';
-            }
-            addCloneable = true;
-          }
-          cv.visit(version, access, name, signature, superName, interfaces);
+        public int mergeReader(int flags) {
+            return flags;
         }
 
         @Override
-        public void visitEnd() {
-          if (addCloneable) {
-            // Add a clone method that calls the protected shallow clone method in Object
-            //
-            // public Object clone() throws CloneNotSupportedException {
-            //    return super.clone(); // Object is the super class
-            // }
-            //
-            final MethodVisitor mv =
-                cv.visitMethod(
-                    Opcodes.ACC_PUBLIC,
-                    "clone",
-                    "()Ljava/lang/Object;",
-                    null,
-                    new String[] {"java/lang/CloneNotSupportedException"});
-            mv.visitCode();
-            mv.visitIntInsn(Opcodes.ALOAD, 0);
-            mv.visitMethodInsn(
-                Opcodes.INVOKESPECIAL, "java/lang/Object", "clone", "()Ljava/lang/Object;", false);
-            mv.visitInsn(Opcodes.ARETURN);
-            mv.visitMaxs(0, 0);
-            mv.visitEnd();
-          }
+        public ClassVisitor wrap(
+                TypeDescription instrumentedType,
+                ClassVisitor classVisitor,
+                Implementation.Context implementationContext,
+                TypePool typePool,
+                FieldList<FieldDescription.InDefinedShape> fields,
+                MethodList<?> methods,
+                int writerFlags,
+                int readerFlags) {
+            return new ClassVisitor(Opcodes.ASM7, classVisitor) {
+
+                private static final String CLONEABLE = "java/lang/Cloneable";
+
+                private boolean addCloneable = false;
+
+                @Override
+                public void visit(
+                        int version, int access, String name, String signature, String superName, String[] interfaces) {
+                    // Add the Cloneable interface, unless it's already there (e.g. reapplying this
+                    // change while retransforming a class that was already modified on initial load)
+                    if (!arrayContains(interfaces, CLONEABLE)) {
+                        interfaces = appendToArray(interfaces, CLONEABLE);
+                        if (signature != null) {
+                            signature += 'L' + CLONEABLE + ';';
+                        }
+                        addCloneable = true;
+                    }
+                    cv.visit(version, access, name, signature, superName, interfaces);
+                }
+
+                @Override
+                public void visitEnd() {
+                    if (addCloneable) {
+                        // Add a clone method that calls the protected shallow clone method in Object
+                        //
+                        // public Object clone() throws CloneNotSupportedException {
+                        //    return super.clone(); // Object is the super class
+                        // }
+                        //
+                        final MethodVisitor mv =
+                                cv.visitMethod(Opcodes.ACC_PUBLIC, "clone", "()Ljava/lang/Object;", null, new String[] {
+                                    "java/lang/CloneNotSupportedException"
+                                });
+                        mv.visitCode();
+                        mv.visitIntInsn(Opcodes.ALOAD, 0);
+                        mv.visitMethodInsn(
+                                Opcodes.INVOKESPECIAL, "java/lang/Object", "clone", "()Ljava/lang/Object;", false);
+                        mv.visitInsn(Opcodes.ARETURN);
+                        mv.visitMaxs(0, 0);
+                        mv.visitEnd();
+                    }
 
-          cv.visitEnd();
+                    cv.visitEnd();
+                }
+            };
         }
-      };
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RequestImplMuzzle.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RequestImplMuzzle.java
index b4870fc02ad..e828ee7ef9e 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RequestImplMuzzle.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RequestImplMuzzle.java
@@ -4,8 +4,8 @@
 import net.bytebuddy.asm.Advice;
 
 public class RequestImplMuzzle {
-  @Advice.OnMethodEnter // This advice will never be applied
-  public static void muzzleCheck() {
-    Redis.createClient(null, "somehost"); // added in 3.9.x
-  }
+    @Advice.OnMethodEnter // This advice will never be applied
+    public static void muzzleCheck() {
+        Redis.createClient(null, "somehost"); // added in 3.9.x
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/ResponseHandler.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/ResponseHandler.java
index d036a29bd07..5b5de8a123f 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/ResponseHandler.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/ResponseHandler.java
@@ -11,42 +11,40 @@
 import io.vertx.redis.client.Response;
 
 public class ResponseHandler implements Handler<AsyncResult<Response>> {
-  public final AgentSpan clientSpan;
-  private final ContextContinuation continuation;
-  private final Promise<Response> promise;
-  private boolean handled = false;
+    public final AgentSpan clientSpan;
+    private final ContextContinuation continuation;
+    private final Promise<Response> promise;
+    private boolean handled = false;
 
-  public ResponseHandler(
-      final Promise<Response> promise,
-      final AgentSpan clientSpan,
-      final ContextContinuation continuation) {
-    this.clientSpan = clientSpan;
-    this.continuation = continuation;
-    this.promise = promise;
-  }
+    public ResponseHandler(
+            final Promise<Response> promise, final AgentSpan clientSpan, final ContextContinuation continuation) {
+        this.clientSpan = clientSpan;
+        this.continuation = continuation;
+        this.promise = promise;
+    }
 
-  @Override
-  public void handle(final AsyncResult<Response> event) {
-    if (!handled && clientSpan != null) {
-      handled = true;
-      ContextScope scope = null;
-      try {
-        // Close client scope and span
-        if (!event.succeeded()) {
-          DECORATE.onError(clientSpan, event.cause());
-        }
-        clientSpan.finish();
-        // Activate parent continuation and trigger promise completion
-        if (continuation != null) {
-          scope = continuation.resume();
-        }
-        promise.handle(event);
-      } finally {
-        // Deactivate parent continuation
-        if (scope != null) {
-          scope.close();
+    @Override
+    public void handle(final AsyncResult<Response> event) {
+        if (!handled && clientSpan != null) {
+            handled = true;
+            ContextScope scope = null;
+            try {
+                // Close client scope and span
+                if (!event.succeeded()) {
+                    DECORATE.onError(clientSpan, event.cause());
+                }
+                clientSpan.finish();
+                // Activate parent continuation and trigger promise completion
+                if (continuation != null) {
+                    scope = continuation.resume();
+                }
+                promise.handle(event);
+            } finally {
+                // Deactivate parent continuation
+                if (scope != null) {
+                    scope.close();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/ResponseHandlerWrapper.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/ResponseHandlerWrapper.java
index ea8e92ee0c8..872771462cd 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/ResponseHandlerWrapper.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/ResponseHandlerWrapper.java
@@ -8,45 +8,45 @@
 import io.vertx.redis.client.Response;
 
 public class ResponseHandlerWrapper implements Handler<AsyncResult<Response>> {
-  private final Handler<AsyncResult<Response>> handler;
-  public final AgentSpan clientSpan;
-  private final ContextContinuation parentContinuation;
-  private boolean handled = false;
+    private final Handler<AsyncResult<Response>> handler;
+    public final AgentSpan clientSpan;
+    private final ContextContinuation parentContinuation;
+    private boolean handled = false;
 
-  public ResponseHandlerWrapper(
-      final Handler<AsyncResult<Response>> handler,
-      final AgentSpan clientSpan,
-      final ContextContinuation parentContinuation) {
-    this.handler = handler;
-    this.clientSpan = clientSpan;
-    this.parentContinuation = parentContinuation;
-  }
+    public ResponseHandlerWrapper(
+            final Handler<AsyncResult<Response>> handler,
+            final AgentSpan clientSpan,
+            final ContextContinuation parentContinuation) {
+        this.handler = handler;
+        this.clientSpan = clientSpan;
+        this.parentContinuation = parentContinuation;
+    }
 
-  @Override
-  public void handle(final AsyncResult<Response> event) {
-    /*
-    Same handler can be called twice
-     - there is no indication whether a handler was added to an already completed Future
-     - we check the Future state right after adding the handler and if it is completed
-       we execute the handler; of course the Future might have completed with the handler
-       already set so the handler state must be tracked here to prevent double execution
-    */
-    if (!handled) {
-      handled = true;
-      ContextScope scope = null;
-      try {
-        if (null != clientSpan) {
-          clientSpan.finish();
-        }
-        if (null != parentContinuation) {
-          scope = parentContinuation.resume();
-        }
-        handler.handle(event);
-      } finally {
-        if (null != scope) {
-          scope.close();
+    @Override
+    public void handle(final AsyncResult<Response> event) {
+        /*
+        Same handler can be called twice
+         - there is no indication whether a handler was added to an already completed Future
+         - we check the Future state right after adding the handler and if it is completed
+           we execute the handler; of course the Future might have completed with the handler
+           already set so the handler state must be tracked here to prevent double execution
+        */
+        if (!handled) {
+            handled = true;
+            ContextScope scope = null;
+            try {
+                if (null != clientSpan) {
+                    clientSpan.finish();
+                }
+                if (null != parentContinuation) {
+                    scope = parentContinuation.resume();
+                }
+                handler.handle(event);
+            } finally {
+                if (null != scope) {
+                    scope.close();
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/VertxRedisClientDecorator.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/VertxRedisClientDecorator.java
index dec7fe39d02..34d6677ce0e 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/VertxRedisClientDecorator.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/VertxRedisClientDecorator.java
@@ -13,77 +13,74 @@
 import io.vertx.core.net.SocketAddress;
 import io.vertx.redis.client.Command;
 
-public class VertxRedisClientDecorator
-    extends DBTypeProcessingDatabaseClientDecorator<SocketAddress> {
-
-  public static final VertxRedisClientDecorator DECORATE = new VertxRedisClientDecorator();
-
-  private static final String SERVICE_NAME =
-      SpanNaming.instance().namingSchema().cache().service("redis");
-  public static final CharSequence REDIS_COMMAND =
-      UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation("redis"));
-
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
-
-  // There are 201 possible Redis commands
-  private final DDCache<String, UTF8BytesString> commandCache =
-      DDCaches.newFixedSizeCache(201 * 4 / 3);
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"vertx", "vertx-redis-client", "redis"};
-  }
-
-  @Override
-  protected String service() {
-    return SERVICE_NAME;
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.REDIS;
-  }
-
-  @Override
-  protected String dbType() {
-    return "redis";
-  }
-
-  @Override
-  protected String dbUser(final SocketAddress socketAddress) {
-    return null;
-  }
-
-  @Override
-  protected String dbInstance(final SocketAddress socketAddress) {
-    return null;
-  }
-
-  @Override
-  protected String dbHostname(final SocketAddress socketAddress) {
-    return socketAddress.host();
-  }
-
-  public AgentSpan startAndDecorateSpan(String command) {
-    UTF8BytesString upperCase =
-        commandCache.computeIfAbsent(command, key -> UTF8BytesString.create(key.toUpperCase()));
-    return innerStartAndDecorateSpan(upperCase);
-  }
-
-  public AgentSpan startAndDecorateSpan(
-      Command command, ContextStore<Command, UTF8BytesString> contextStore) {
-    return innerStartAndDecorateSpan(contextStore.get(command));
-  }
-
-  private AgentSpan innerStartAndDecorateSpan(UTF8BytesString command) {
-    final AgentSpan span = startSpan("redis-command", REDIS_COMMAND);
-    DECORATE.afterStart(span);
-    DECORATE.onStatement(span, command);
-    return span;
-  }
+public class VertxRedisClientDecorator extends DBTypeProcessingDatabaseClientDecorator<SocketAddress> {
+
+    public static final VertxRedisClientDecorator DECORATE = new VertxRedisClientDecorator();
+
+    private static final String SERVICE_NAME =
+            SpanNaming.instance().namingSchema().cache().service("redis");
+    public static final CharSequence REDIS_COMMAND =
+            UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation("redis"));
+
+    private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
+
+    // There are 201 possible Redis commands
+    private final DDCache<String, UTF8BytesString> commandCache = DDCaches.newFixedSizeCache(201 * 4 / 3);
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"vertx", "vertx-redis-client", "redis"};
+    }
+
+    @Override
+    protected String service() {
+        return SERVICE_NAME;
+    }
+
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.REDIS;
+    }
+
+    @Override
+    protected String dbType() {
+        return "redis";
+    }
+
+    @Override
+    protected String dbUser(final SocketAddress socketAddress) {
+        return null;
+    }
+
+    @Override
+    protected String dbInstance(final SocketAddress socketAddress) {
+        return null;
+    }
+
+    @Override
+    protected String dbHostname(final SocketAddress socketAddress) {
+        return socketAddress.host();
+    }
+
+    public AgentSpan startAndDecorateSpan(String command) {
+        UTF8BytesString upperCase =
+                commandCache.computeIfAbsent(command, key -> UTF8BytesString.create(key.toUpperCase()));
+        return innerStartAndDecorateSpan(upperCase);
+    }
+
+    public AgentSpan startAndDecorateSpan(Command command, ContextStore<Command, UTF8BytesString> contextStore) {
+        return innerStartAndDecorateSpan(contextStore.get(command));
+    }
+
+    private AgentSpan innerStartAndDecorateSpan(UTF8BytesString command) {
+        final AgentSpan span = startSpan("redis-command", REDIS_COMMAND);
+        DECORATE.afterStart(span);
+        DECORATE.onStatement(span, command);
+        return span;
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/src/main/java/io/vertx/redis/client/impl/RequestImpl.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/src/main/java/io/vertx/redis/client/impl/RequestImpl.java
index a3ade915e63..83928a2509a 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/src/main/java/io/vertx/redis/client/impl/RequestImpl.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/src/main/java/io/vertx/redis/client/impl/RequestImpl.java
@@ -7,33 +7,33 @@
 // This is a stub implementation to add the clone method needed by the advice code
 public final class RequestImpl implements Request, Cloneable {
 
-  @Override
-  public Object clone() throws CloneNotSupportedException {
-    return null;
-  }
-
-  @Override
-  public Request arg(byte[] arg) {
-    return null;
-  }
-
-  @Override
-  public Request arg(Buffer arg) {
-    return null;
-  }
-
-  @Override
-  public Request arg(long arg) {
-    return null;
-  }
-
-  @Override
-  public Request nullArg() {
-    return null;
-  }
-
-  @Override
-  public Command command() {
-    return null;
-  }
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        return null;
+    }
+
+    @Override
+    public Request arg(byte[] arg) {
+        return null;
+    }
+
+    @Override
+    public Request arg(Buffer arg) {
+        return null;
+    }
+
+    @Override
+    public Request arg(long arg) {
+        return null;
+    }
+
+    @Override
+    public Request nullArg() {
+        return null;
+    }
+
+    @Override
+    public Command command() {
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/CursorImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/CursorImplInstrumentation.java
index a9a861cb92d..b178796cf84 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/CursorImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/CursorImplInstrumentation.java
@@ -13,28 +13,25 @@
 
 @AutoService(InstrumenterModule.class)
 public class CursorImplInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public CursorImplInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public CursorImplInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("io.vertx.sqlclient.PreparedStatement", "datadog.trace.api.Pair");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("io.vertx.sqlclient.PreparedStatement", "datadog.trace.api.Pair");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.sqlclient.impl.CursorImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.sqlclient.impl.CursorImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("read"))
-            .and(takesArgument(1, named("io.vertx.core.Handler"))),
-        packageName + ".CursorReadAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("read")).and(takesArgument(1, named("io.vertx.core.Handler"))),
+                packageName + ".CursorReadAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/CursorReadAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/CursorReadAdvice.java
index b02165e8b0f..bf99c58f64a 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/CursorReadAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/CursorReadAdvice.java
@@ -18,33 +18,30 @@
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
 
 public class CursorReadAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static ContextScope beforeRead(
-      @Advice.Argument(value = 1, readOnly = false) Handler<AsyncResult<RowSet<Row>>> handler,
-      @Advice.FieldValue(value = "ps", typing = Assigner.Typing.DYNAMIC)
-          final PreparedStatement ps) {
-    if (handler instanceof QueryResultHandlerWrapper) {
-      return null;
-    }
-    final AgentSpan parentSpan = activeSpan();
-    final ContextContinuation parentContinuation =
-        null == parentSpan ? null : parentSpan.captureWithContext();
-    final AgentSpan clientSpan =
-        DECORATE.startAndDecorateSpanForStatement(
-            ps, InstrumentationContext.get(PreparedStatement.class, Pair.class), true);
-    if (null == clientSpan) {
-      return null;
-    }
-    handler = new QueryResultHandlerWrapper<>(handler, clientSpan, parentContinuation);
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ContextScope beforeRead(
+            @Advice.Argument(value = 1, readOnly = false) Handler<AsyncResult<RowSet<Row>>> handler,
+            @Advice.FieldValue(value = "ps", typing = Assigner.Typing.DYNAMIC) final PreparedStatement ps) {
+        if (handler instanceof QueryResultHandlerWrapper) {
+            return null;
+        }
+        final AgentSpan parentSpan = activeSpan();
+        final ContextContinuation parentContinuation = null == parentSpan ? null : parentSpan.captureWithContext();
+        final AgentSpan clientSpan = DECORATE.startAndDecorateSpanForStatement(
+                ps, InstrumentationContext.get(PreparedStatement.class, Pair.class), true);
+        if (null == clientSpan) {
+            return null;
+        }
+        handler = new QueryResultHandlerWrapper<>(handler, clientSpan, parentContinuation);
 
-    return activateSpan(clientSpan);
-  }
+        return activateSpan(clientSpan);
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void afterRead(
-      @Advice.Thrown final Throwable throwable, @Advice.Enter final ContextScope clientScope) {
-    if (null != clientScope) {
-      clientScope.close();
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void afterRead(
+            @Advice.Thrown final Throwable throwable, @Advice.Enter final ContextScope clientScope) {
+        if (null != clientScope) {
+            clientScope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PrepareHandlerWrapper.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PrepareHandlerWrapper.java
index 33b39a77cd6..89b3e6ed176 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PrepareHandlerWrapper.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PrepareHandlerWrapper.java
@@ -9,24 +9,24 @@
 import io.vertx.sqlclient.PreparedStatement;
 
 public class PrepareHandlerWrapper implements Handler<AsyncResult<PreparedStatement>> {
-  private final Handler<AsyncResult<PreparedStatement>> handler;
-  private final ContextStore<PreparedStatement, Pair> contextStore;
-  private final Pair<DBInfo, DBQueryInfo> queryInfo;
+    private final Handler<AsyncResult<PreparedStatement>> handler;
+    private final ContextStore<PreparedStatement, Pair> contextStore;
+    private final Pair<DBInfo, DBQueryInfo> queryInfo;
 
-  public PrepareHandlerWrapper(
-      Handler<AsyncResult<PreparedStatement>> handler,
-      ContextStore<PreparedStatement, Pair> contextStore,
-      Pair<DBInfo, DBQueryInfo> queryInfo) {
-    this.handler = handler;
-    this.contextStore = contextStore;
-    this.queryInfo = queryInfo;
-  }
+    public PrepareHandlerWrapper(
+            Handler<AsyncResult<PreparedStatement>> handler,
+            ContextStore<PreparedStatement, Pair> contextStore,
+            Pair<DBInfo, DBQueryInfo> queryInfo) {
+        this.handler = handler;
+        this.contextStore = contextStore;
+        this.queryInfo = queryInfo;
+    }
 
-  @Override
-  public void handle(AsyncResult<PreparedStatement> event) {
-    if (event.succeeded()) {
-      contextStore.put(event.result(), queryInfo);
+    @Override
+    public void handle(AsyncResult<PreparedStatement> event) {
+        if (event.succeeded()) {
+            contextStore.put(event.result(), queryInfo);
+        }
+        handler.handle(event);
     }
-    handler.handle(event);
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PreparedQueryInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PreparedQueryInstrumentation.java
index 7faf35e3f24..55996fb65f3 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PreparedQueryInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PreparedQueryInstrumentation.java
@@ -19,47 +19,44 @@
 
 @AutoService(InstrumenterModule.class)
 public class PreparedQueryInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public PreparedQueryInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public PreparedQueryInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("io.vertx.sqlclient.Query", "datadog.trace.api.Pair");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("io.vertx.sqlclient.Query", "datadog.trace.api.Pair");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.vertx.sqlclient.PreparedQuery";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.vertx.sqlclient.PreparedQuery";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("execute"))
-            .and(takesArguments(2))
-            .and(takesArgument(1, named("io.vertx.core.Handler"))),
-        packageName + ".QueryAdvice$Execute");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("executeBatch"))
-            .and(takesArguments(2))
-            .and(takesArgument(1, named("io.vertx.core.Handler"))),
-        packageName + ".QueryAdvice$Execute");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isVirtual())
-            .and(named("copy"))
-            .and(returns(named("io.vertx.sqlclient.impl.QueryBase"))),
-        packageName + ".QueryAdvice$Copy");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("execute"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(1, named("io.vertx.core.Handler"))),
+                packageName + ".QueryAdvice$Execute");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("executeBatch"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(1, named("io.vertx.core.Handler"))),
+                packageName + ".QueryAdvice$Execute");
+        transformer.applyAdvice(
+                isMethod().and(isVirtual()).and(named("copy")).and(returns(named("io.vertx.sqlclient.impl.QueryBase"))),
+                packageName + ".QueryAdvice$Copy");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PreparedStatementImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PreparedStatementImplInstrumentation.java
index 249f7774446..9707500a611 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PreparedStatementImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PreparedStatementImplInstrumentation.java
@@ -13,28 +13,28 @@
 
 @AutoService(InstrumenterModule.class)
 public class PreparedStatementImplInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public PreparedStatementImplInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public PreparedStatementImplInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>();
-    contextStores.put("io.vertx.sqlclient.PreparedStatement", "datadog.trace.api.Pair");
-    contextStores.put("io.vertx.sqlclient.Query", "datadog.trace.api.Pair");
-    return contextStores;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>();
+        contextStores.put("io.vertx.sqlclient.PreparedStatement", "datadog.trace.api.Pair");
+        contextStores.put("io.vertx.sqlclient.Query", "datadog.trace.api.Pair");
+        return contextStores;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.sqlclient.impl.PreparedStatementImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.sqlclient.impl.PreparedStatementImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("query")).and(takesNoArguments()),
-        packageName + ".PreparedStatementQueryAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("query")).and(takesNoArguments()),
+                packageName + ".PreparedStatementQueryAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PreparedStatementQueryAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PreparedStatementQueryAdvice.java
index 67954991f5d..c7648816f4f 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PreparedStatementQueryAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PreparedStatementQueryAdvice.java
@@ -7,10 +7,12 @@
 import net.bytebuddy.asm.Advice;
 
 public class PreparedStatementQueryAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class)
-  public static void afterQuery(
-      @Advice.This final PreparedStatement zis, @Advice.Return final Query query) {
-    InstrumentationContext.get(Query.class, Pair.class)
-        .put(query, InstrumentationContext.get(PreparedStatement.class, Pair.class).get(zis));
-  }
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void afterQuery(@Advice.This final PreparedStatement zis, @Advice.Return final Query query) {
+        InstrumentationContext.get(Query.class, Pair.class)
+                .put(
+                        query,
+                        InstrumentationContext.get(PreparedStatement.class, Pair.class)
+                                .get(zis));
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryAdvice.java
index f647c9b6c90..6eb16ced7c9 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryAdvice.java
@@ -18,54 +18,45 @@
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
 
 public class QueryAdvice {
-  public static class Copy {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterCopy(
-        @Advice.This final Query<?> zis, @Advice.Return final Query<?> ret) {
-      ContextStore<Query, Pair> contextStore = InstrumentationContext.get(Query.class, Pair.class);
-      contextStore.put(ret, contextStore.get(zis));
+    public static class Copy {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterCopy(@Advice.This final Query<?> zis, @Advice.Return final Query<?> ret) {
+            ContextStore<Query, Pair> contextStore = InstrumentationContext.get(Query.class, Pair.class);
+            contextStore.put(ret, contextStore.get(zis));
+        }
     }
-  }
 
-  public static class Execute {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static <T, R extends SqlResult<T>> ContextScope beforeExecute(
-        @Advice.This final Query<?> zis,
-        @Advice.Argument(
-                value = 0,
-                readOnly = false,
-                optional = true,
-                typing = Assigner.Typing.DYNAMIC)
-            Object maybeHandler,
-        @Advice.Argument(value = 1, readOnly = false, optional = true)
-            Handler<AsyncResult<R>> handler) {
-      final boolean prepared = !(maybeHandler instanceof Handler);
+    public static class Execute {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static <T, R extends SqlResult<T>> ContextScope beforeExecute(
+                @Advice.This final Query<?> zis,
+                @Advice.Argument(value = 0, readOnly = false, optional = true, typing = Assigner.Typing.DYNAMIC)
+                        Object maybeHandler,
+                @Advice.Argument(value = 1, readOnly = false, optional = true) Handler<AsyncResult<R>> handler) {
+            final boolean prepared = !(maybeHandler instanceof Handler);
 
-      final AgentSpan parentSpan = activeSpan();
-      final ContextContinuation parentContinuation =
-          null == parentSpan ? null : parentSpan.captureWithContext();
-      final AgentSpan clientSpan =
-          DECORATE.startAndDecorateSpanForStatement(
-              zis, InstrumentationContext.get(Query.class, Pair.class), prepared);
-      if (null == clientSpan) {
-        return null;
-      }
-      if (prepared) {
-        handler = new QueryResultHandlerWrapper<>(handler, clientSpan, parentContinuation);
-      } else {
-        maybeHandler =
-            new QueryResultHandlerWrapper<>(
-                (Handler<AsyncResult<R>>) maybeHandler, clientSpan, parentContinuation);
-      }
-      return activateSpan(clientSpan);
-    }
+            final AgentSpan parentSpan = activeSpan();
+            final ContextContinuation parentContinuation = null == parentSpan ? null : parentSpan.captureWithContext();
+            final AgentSpan clientSpan = DECORATE.startAndDecorateSpanForStatement(
+                    zis, InstrumentationContext.get(Query.class, Pair.class), prepared);
+            if (null == clientSpan) {
+                return null;
+            }
+            if (prepared) {
+                handler = new QueryResultHandlerWrapper<>(handler, clientSpan, parentContinuation);
+            } else {
+                maybeHandler = new QueryResultHandlerWrapper<>(
+                        (Handler<AsyncResult<R>>) maybeHandler, clientSpan, parentContinuation);
+            }
+            return activateSpan(clientSpan);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void afterExecute(
-        @Advice.Thrown final Throwable throwable, @Advice.Enter final ContextScope clientScope) {
-      if (null != clientScope) {
-        clientScope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void afterExecute(
+                @Advice.Thrown final Throwable throwable, @Advice.Enter final ContextScope clientScope) {
+            if (null != clientScope) {
+                clientScope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryImplInstrumentation.java
index 39bd1e1b102..a1d31197b0e 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryImplInstrumentation.java
@@ -16,35 +16,32 @@
 
 @AutoService(InstrumenterModule.class)
 public class QueryImplInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public QueryImplInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public QueryImplInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("io.vertx.sqlclient.Query", "datadog.trace.api.Pair");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("io.vertx.sqlclient.Query", "datadog.trace.api.Pair");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.sqlclient.impl.SqlClientBase$QueryImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.sqlclient.impl.SqlClientBase$QueryImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("execute"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("io.vertx.core.Handler"))),
-        packageName + ".QueryAdvice$Execute");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isVirtual())
-            .and(named("copy"))
-            .and(returns(named("io.vertx.sqlclient.impl.QueryBase"))),
-        packageName + ".QueryAdvice$Copy");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("execute"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("io.vertx.core.Handler"))),
+                packageName + ".QueryAdvice$Execute");
+        transformer.applyAdvice(
+                isMethod().and(isVirtual()).and(named("copy")).and(returns(named("io.vertx.sqlclient.impl.QueryBase"))),
+                packageName + ".QueryAdvice$Copy");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryResultHandlerWrapper.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryResultHandlerWrapper.java
index 3053a0ae8d8..68037646b84 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryResultHandlerWrapper.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryResultHandlerWrapper.java
@@ -7,36 +7,35 @@
 import io.vertx.core.Handler;
 import io.vertx.sqlclient.SqlResult;
 
-public class QueryResultHandlerWrapper<T, R extends SqlResult<T>>
-    implements Handler<AsyncResult<R>> {
-  private final Handler<AsyncResult<R>> handler;
-  private final AgentSpan clientSpan;
-  private final ContextContinuation parentContinuation;
+public class QueryResultHandlerWrapper<T, R extends SqlResult<T>> implements Handler<AsyncResult<R>> {
+    private final Handler<AsyncResult<R>> handler;
+    private final AgentSpan clientSpan;
+    private final ContextContinuation parentContinuation;
 
-  public QueryResultHandlerWrapper(
-      final Handler<AsyncResult<R>> handler,
-      final AgentSpan clientSpan,
-      final ContextContinuation parentContinuation) {
-    this.handler = handler;
-    this.clientSpan = clientSpan;
-    this.parentContinuation = parentContinuation;
-  }
+    public QueryResultHandlerWrapper(
+            final Handler<AsyncResult<R>> handler,
+            final AgentSpan clientSpan,
+            final ContextContinuation parentContinuation) {
+        this.handler = handler;
+        this.clientSpan = clientSpan;
+        this.parentContinuation = parentContinuation;
+    }
 
-  @Override
-  public void handle(final AsyncResult<R> event) {
-    ContextScope scope = null;
-    try {
-      if (null != clientSpan) {
-        clientSpan.finish();
-      }
-      if (null != parentContinuation) {
-        scope = parentContinuation.resume();
-      }
-      handler.handle(event);
-    } finally {
-      if (null != scope) {
-        scope.close();
-      }
+    @Override
+    public void handle(final AsyncResult<R> event) {
+        ContextScope scope = null;
+        try {
+            if (null != clientSpan) {
+                clientSpan.finish();
+            }
+            if (null != parentContinuation) {
+                scope = parentContinuation.resume();
+            }
+            handler.handle(event);
+        } finally {
+            if (null != scope) {
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlClientBaseAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlClientBaseAdvice.java
index 39dcbd3068c..7482f436d65 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlClientBaseAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlClientBaseAdvice.java
@@ -9,32 +9,29 @@
 import net.bytebuddy.asm.Advice;
 
 public class SqlClientBaseAdvice {
-  public static class NormalQuery {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterQuery(
-        @Advice.This final SqlClient zis,
-        @Advice.Argument(0) final String sql,
-        @Advice.Return final Query query) {
+    public static class NormalQuery {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterQuery(
+                @Advice.This final SqlClient zis,
+                @Advice.Argument(0) final String sql,
+                @Advice.Return final Query query) {
 
-      Pair<DBInfo, DBQueryInfo> info =
-          Pair.of(
-              InstrumentationContext.get(SqlClient.class, DBInfo.class).get(zis),
-              DBQueryInfo.ofStatement(sql));
-      InstrumentationContext.get(Query.class, Pair.class).put(query, info);
+            Pair<DBInfo, DBQueryInfo> info = Pair.of(
+                    InstrumentationContext.get(SqlClient.class, DBInfo.class).get(zis), DBQueryInfo.ofStatement(sql));
+            InstrumentationContext.get(Query.class, Pair.class).put(query, info);
+        }
     }
-  }
 
-  public static class PreparedQuery {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void afterPreparedQuery(
-        @Advice.This final SqlClient zis,
-        @Advice.Argument(0) final String sql,
-        @Advice.Return final Query query) {
-      Pair<DBInfo, DBQueryInfo> info =
-          Pair.of(
-              InstrumentationContext.get(SqlClient.class, DBInfo.class).get(zis),
-              DBQueryInfo.ofPreparedStatement(sql));
-      InstrumentationContext.get(Query.class, Pair.class).put(query, info);
+    public static class PreparedQuery {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void afterPreparedQuery(
+                @Advice.This final SqlClient zis,
+                @Advice.Argument(0) final String sql,
+                @Advice.Return final Query query) {
+            Pair<DBInfo, DBQueryInfo> info = Pair.of(
+                    InstrumentationContext.get(SqlClient.class, DBInfo.class).get(zis),
+                    DBQueryInfo.ofPreparedStatement(sql));
+            InstrumentationContext.get(Query.class, Pair.class).put(query, info);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlClientBaseInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlClientBaseInstrumentation.java
index 9d41374a5ea..532cc7dde1b 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlClientBaseInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlClientBaseInstrumentation.java
@@ -15,39 +15,39 @@
 
 @AutoService(InstrumenterModule.class)
 public class SqlClientBaseInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public SqlClientBaseInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public SqlClientBaseInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>();
-    contextStores.put("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
-    contextStores.put("io.vertx.sqlclient.Query", "datadog.trace.api.Pair");
-    return contextStores;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>();
+        contextStores.put("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
+        contextStores.put("io.vertx.sqlclient.Query", "datadog.trace.api.Pair");
+        return contextStores;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.sqlclient.impl.SqlClientBase";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.sqlclient.impl.SqlClientBase";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("query"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("java.lang.String"))),
-        packageName + ".SqlClientBaseAdvice$NormalQuery");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("preparedQuery"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("java.lang.String"))),
-        packageName + ".SqlClientBaseAdvice$PreparedQuery");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("query"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("java.lang.String"))),
+                packageName + ".SqlClientBaseAdvice$NormalQuery");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("preparedQuery"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("java.lang.String"))),
+                packageName + ".SqlClientBaseAdvice$PreparedQuery");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlConnectionBaseInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlConnectionBaseInstrumentation.java
index ad5e70f0b00..81870f3a8a2 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlConnectionBaseInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlConnectionBaseInstrumentation.java
@@ -15,33 +15,33 @@
 
 @AutoService(InstrumenterModule.class)
 public class SqlConnectionBaseInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public SqlConnectionBaseInstrumentation() {
-    super("vertx", "vertx-sql-client");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public SqlConnectionBaseInstrumentation() {
+        super("vertx", "vertx-sql-client");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStores = new HashMap<>();
-    contextStores.put("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
-    contextStores.put("io.vertx.sqlclient.PreparedStatement", "datadog.trace.api.Pair");
-    return contextStores;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        Map<String, String> contextStores = new HashMap<>();
+        contextStores.put("io.vertx.sqlclient.SqlClient", DBInfo.class.getName());
+        contextStores.put("io.vertx.sqlclient.PreparedStatement", "datadog.trace.api.Pair");
+        return contextStores;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.sqlclient.impl.SqlConnectionBase";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.sqlclient.impl.SqlConnectionBase";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("prepare"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("java.lang.String")))
-            .and(takesArgument(1, named("io.vertx.core.Handler"))),
-        packageName + ".SqlConnectionBasePrepareAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("prepare"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("java.lang.String")))
+                        .and(takesArgument(1, named("io.vertx.core.Handler"))),
+                packageName + ".SqlConnectionBasePrepareAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlConnectionBasePrepareAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlConnectionBasePrepareAdvice.java
index 5489c3c8288..9dd678feb5d 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlConnectionBasePrepareAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlConnectionBasePrepareAdvice.java
@@ -11,19 +11,15 @@
 import net.bytebuddy.asm.Advice;
 
 public class SqlConnectionBasePrepareAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void beforePrepare(
-      @Advice.This final SqlClient zis,
-      @Advice.Argument(0) final String sql,
-      @Advice.Argument(value = 1, readOnly = false)
-          Handler<AsyncResult<PreparedStatement>> handler) {
-    Pair<DBInfo, DBQueryInfo> info =
-        Pair.of(
-            InstrumentationContext.get(SqlClient.class, DBInfo.class).get(zis),
-            DBQueryInfo.ofStatement(sql));
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void beforePrepare(
+            @Advice.This final SqlClient zis,
+            @Advice.Argument(0) final String sql,
+            @Advice.Argument(value = 1, readOnly = false) Handler<AsyncResult<PreparedStatement>> handler) {
+        Pair<DBInfo, DBQueryInfo> info = Pair.of(
+                InstrumentationContext.get(SqlClient.class, DBInfo.class).get(zis), DBQueryInfo.ofStatement(sql));
 
-    handler =
-        new PrepareHandlerWrapper(
-            handler, InstrumentationContext.get(PreparedStatement.class, Pair.class), info);
-  }
+        handler = new PrepareHandlerWrapper(
+                handler, InstrumentationContext.get(PreparedStatement.class, Pair.class), info);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/VertxSqlClientDecorator.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/VertxSqlClientDecorator.java
index d95a6c65137..407da406862 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/VertxSqlClientDecorator.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/VertxSqlClientDecorator.java
@@ -16,100 +16,98 @@
 
 public class VertxSqlClientDecorator extends DatabaseClientDecorator<DBInfo> {
 
-  public static final VertxSqlClientDecorator DECORATE = new VertxSqlClientDecorator();
-
-  private static final CharSequence VERTX_SQL = UTF8BytesString.create("vertx-sql");
-  private static final CharSequence DATABASE_QUERY = UTF8BytesString.create("database.query");
-  private static final UTF8BytesString DB_QUERY = UTF8BytesString.create("DB Query");
-  private static final UTF8BytesString VERTX_STATEMENT =
-      UTF8BytesString.create("vertx-sql-statement");
-  private static final UTF8BytesString VERTX_PREPARED_STATEMENT =
-      UTF8BytesString.create("vertx-sql-prepared_statement");
-  private static final String DEFAULT_SERVICE_NAME =
-      SpanNaming.instance().namingSchema().database().service("vertx-sql");
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"vertx", "vertx-sql-client"};
-  }
-
-  @Override
-  protected String service() {
-    return DEFAULT_SERVICE_NAME; // Overridden by onConnection
-  }
-
-  @Override
-  protected CharSequence component() {
-    return VERTX_SQL; // Overridden by onStatement and onPreparedStatement
-  }
-
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.SQL;
-  }
-
-  @Override
-  protected String dbType() {
-    return "vertx-sql";
-  }
-
-  @Override
-  protected String dbUser(final DBInfo info) {
-    return info.getUser();
-  }
-
-  @Override
-  protected String dbInstance(final DBInfo info) {
-    if (info.getInstance() != null) {
-      return info.getInstance();
-    } else {
-      return info.getDb();
+    public static final VertxSqlClientDecorator DECORATE = new VertxSqlClientDecorator();
+
+    private static final CharSequence VERTX_SQL = UTF8BytesString.create("vertx-sql");
+    private static final CharSequence DATABASE_QUERY = UTF8BytesString.create("database.query");
+    private static final UTF8BytesString DB_QUERY = UTF8BytesString.create("DB Query");
+    private static final UTF8BytesString VERTX_STATEMENT = UTF8BytesString.create("vertx-sql-statement");
+    private static final UTF8BytesString VERTX_PREPARED_STATEMENT =
+            UTF8BytesString.create("vertx-sql-prepared_statement");
+    private static final String DEFAULT_SERVICE_NAME =
+            SpanNaming.instance().namingSchema().database().service("vertx-sql");
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"vertx", "vertx-sql-client"};
     }
-  }
-
-  @Override
-  protected String dbHostname(final DBInfo info) {
-    return info.getHost();
-  }
-
-  public <T> AgentSpan startAndDecorateSpanForStatement(
-      T query, ContextStore<T, Pair> contextStore, boolean prepared) {
-    CharSequence component = prepared ? VERTX_PREPARED_STATEMENT : VERTX_STATEMENT;
-    AgentSpan span = startSpan(component.toString(), DATABASE_QUERY);
-    if (null == span) {
-      return null;
+
+    @Override
+    protected String service() {
+        return DEFAULT_SERVICE_NAME; // Overridden by onConnection
+    }
+
+    @Override
+    protected CharSequence component() {
+        return VERTX_SQL; // Overridden by onStatement and onPreparedStatement
+    }
+
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.SQL;
+    }
+
+    @Override
+    protected String dbType() {
+        return "vertx-sql";
+    }
+
+    @Override
+    protected String dbUser(final DBInfo info) {
+        return info.getUser();
     }
-    afterStart(span);
-
-    DBInfo dbInfo = null;
-    DBQueryInfo dbQueryInfo = null;
-    Pair<DBInfo, DBQueryInfo> queryInfo = contextStore.get(query);
-    if (queryInfo != null) {
-      dbInfo = queryInfo.getLeft();
-      dbQueryInfo = queryInfo.getRight();
+
+    @Override
+    protected String dbInstance(final DBInfo info) {
+        if (info.getInstance() != null) {
+            return info.getInstance();
+        } else {
+            return info.getDb();
+        }
     }
 
-    if (dbInfo != null) {
-      processDatabaseType(span, dbInfo.getType());
+    @Override
+    protected String dbHostname(final DBInfo info) {
+        return info.getHost();
     }
-    super.onConnection(span, dbInfo);
-    if (null != dbQueryInfo) {
-      span.setResourceName(dbQueryInfo.getSql());
-      span.setTag(DB_OPERATION, dbQueryInfo.getOperation());
-    } else {
-      span.setResourceName(DB_QUERY);
+
+    public <T> AgentSpan startAndDecorateSpanForStatement(
+            T query, ContextStore<T, Pair> contextStore, boolean prepared) {
+        CharSequence component = prepared ? VERTX_PREPARED_STATEMENT : VERTX_STATEMENT;
+        AgentSpan span = startSpan(component.toString(), DATABASE_QUERY);
+        if (null == span) {
+            return null;
+        }
+        afterStart(span);
+
+        DBInfo dbInfo = null;
+        DBQueryInfo dbQueryInfo = null;
+        Pair<DBInfo, DBQueryInfo> queryInfo = contextStore.get(query);
+        if (queryInfo != null) {
+            dbInfo = queryInfo.getLeft();
+            dbQueryInfo = queryInfo.getRight();
+        }
+
+        if (dbInfo != null) {
+            processDatabaseType(span, dbInfo.getType());
+        }
+        super.onConnection(span, dbInfo);
+        if (null != dbQueryInfo) {
+            span.setResourceName(dbQueryInfo.getSql());
+            span.setTag(DB_OPERATION, dbQueryInfo.getOperation());
+        } else {
+            span.setResourceName(DB_QUERY);
+        }
+        span.setTag(Tags.COMPONENT, component);
+        span.spanContext().setIntegrationName(component);
+        return span;
     }
-    span.setTag(Tags.COMPONENT, component);
-    span.spanContext().setIntegrationName(component);
-    return span;
-  }
-
-  @Override
-  protected void postProcessServiceAndOperationName(
-      AgentSpan span, DatabaseClientDecorator.NamingEntry namingEntry) {
-    if (namingEntry.getService() != null) {
-      span.setServiceName(namingEntry.getService(), component());
+
+    @Override
+    protected void postProcessServiceAndOperationName(AgentSpan span, DatabaseClientDecorator.NamingEntry namingEntry) {
+        if (namingEntry.getService() != null) {
+            span.setServiceName(namingEntry.getService(), component());
+        }
+        span.setOperationName(namingEntry.getOperation());
     }
-    span.setOperationName(namingEntry.getOperation());
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/AbstractHttpServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/AbstractHttpServerRequestInstrumentation.java
index 38b205ab955..627a66c990d 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/AbstractHttpServerRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/AbstractHttpServerRequestInstrumentation.java
@@ -26,102 +26,98 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public abstract class AbstractHttpServerRequestInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  private final String className = AbstractHttpServerRequestInstrumentation.class.getName();
-
-  protected AbstractHttpServerRequestInstrumentation() {
-    super("vertx", "vertx-3.4");
-  }
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
-  }
-
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic().and(isMethod()).and(named("params")).and(takesNoArguments()),
-        className + "$ParamsAdvice");
-    transformer.applyAdvice(
-        isMethod().and(takesNoArguments()).and(attributesFilter()),
-        className + "$AttributesAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("handleData").or(named("onData")))
-            .and(takesArguments(1).and(takesArgument(0, named("io.vertx.core.buffer.Buffer")))),
-        className + "$DataAdvice");
-  }
-
-  protected abstract ElementMatcher.Junction<MethodDescription> attributesFilter();
-
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class ParamsAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Local("beforeParams") Object beforeParams,
-        @Advice.FieldValue("params") final Object params) {
-      beforeParams = params;
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    private final String className = AbstractHttpServerRequestInstrumentation.class.getName();
+
+    protected AbstractHttpServerRequestInstrumentation() {
+        super("vertx", "vertx-3.4");
     }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void onExit(
-        @Advice.Local("beforeParams") final Object beforeParams,
-        @Advice.Return final Object multiMap,
-        @ActiveRequestContext RequestContext reqCtx) {
-      // only taint the map the first time
-      if (beforeParams != multiMap) {
-        final PropagationModule module = InstrumentationBridge.PROPAGATION;
-        if (module != null) {
-          IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-          module.taintObject(ctx, multiMap, SourceTypes.REQUEST_PARAMETER_VALUE);
-        }
-      }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class AttributesAdvice {
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic().and(isMethod()).and(named("params")).and(takesNoArguments()), className + "$ParamsAdvice");
+        transformer.applyAdvice(
+                isMethod().and(takesNoArguments()).and(attributesFilter()), className + "$AttributesAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("handleData").or(named("onData")))
+                        .and(takesArguments(1).and(takesArgument(0, named("io.vertx.core.buffer.Buffer")))),
+                className + "$DataAdvice");
+    }
+
+    protected abstract ElementMatcher.Junction<MethodDescription> attributesFilter();
+
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class ParamsAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Local("beforeParams") Object beforeParams, @Advice.FieldValue("params") final Object params) {
+            beforeParams = params;
+        }
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Local("beforeAttributes") Object beforeAttributes,
-        @Advice.FieldValue("attributes") final Object attributes) {
-      beforeAttributes = attributes;
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void onExit(
+                @Advice.Local("beforeParams") final Object beforeParams,
+                @Advice.Return final Object multiMap,
+                @ActiveRequestContext RequestContext reqCtx) {
+            // only taint the map the first time
+            if (beforeParams != multiMap) {
+                final PropagationModule module = InstrumentationBridge.PROPAGATION;
+                if (module != null) {
+                    IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                    module.taintObject(ctx, multiMap, SourceTypes.REQUEST_PARAMETER_VALUE);
+                }
+            }
+        }
     }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void onExit(
-        @Advice.Local("beforeAttributes") final Object beforeAttributes,
-        @Advice.Return final Object multiMap,
-        @ActiveRequestContext RequestContext reqCtx) {
-      // only taint the map the first time
-      if (beforeAttributes != multiMap) {
-        final PropagationModule module = InstrumentationBridge.PROPAGATION;
-        if (module != null) {
-          IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-          module.taintObject(ctx, multiMap, SourceTypes.REQUEST_PARAMETER_VALUE);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class AttributesAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Local("beforeAttributes") Object beforeAttributes,
+                @Advice.FieldValue("attributes") final Object attributes) {
+            beforeAttributes = attributes;
+        }
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void onExit(
+                @Advice.Local("beforeAttributes") final Object beforeAttributes,
+                @Advice.Return final Object multiMap,
+                @ActiveRequestContext RequestContext reqCtx) {
+            // only taint the map the first time
+            if (beforeAttributes != multiMap) {
+                final PropagationModule module = InstrumentationBridge.PROPAGATION;
+                if (module != null) {
+                    IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                    module.taintObject(ctx, multiMap, SourceTypes.REQUEST_PARAMETER_VALUE);
+                }
+            }
         }
-      }
     }
-  }
-
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class DataAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_BODY)
-    public static void onExit(
-        @Advice.Argument(0) final Object data, @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintObject(ctx, data, SourceTypes.REQUEST_BODY);
-      }
+
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class DataAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_BODY)
+        public static void onExit(@Advice.Argument(0) final Object data, @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintObject(ctx, data, SourceTypes.REQUEST_BODY);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/BufferInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/BufferInstrumentation.java
index e0718103cdc..45c5c3042d0 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/BufferInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/BufferInstrumentation.java
@@ -21,77 +21,73 @@
 /** Propagation is way easier in io.vertx.core.buffer.impl.BufferImpl than in io.netty.Buffer */
 @AutoService(InstrumenterModule.class)
 public class BufferInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
 
-  private final String className = BufferInstrumentation.class.getName();
+    private final String className = BufferInstrumentation.class.getName();
 
-  public BufferInstrumentation() {
-    super("vertx", "vertx-3.4");
-  }
+    public BufferInstrumentation() {
+        super("vertx", "vertx-3.4");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.core.buffer.impl.BufferImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.core.buffer.impl.BufferImpl";
+    }
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
+    }
 
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("toString")), className + "$ToStringAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("getByteBuf")).and(takesNoArguments()),
-        className + "$GetByteBuffAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("appendBuffer"))
-            .and(takesArgument(0, named("io.vertx.core.buffer.Buffer"))),
-        className + "$AppendBufferAdvice");
-  }
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(isMethod().and(isPublic()).and(named("toString")), className + "$ToStringAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("getByteBuf")).and(takesNoArguments()),
+                className + "$GetByteBuffAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("appendBuffer"))
+                        .and(takesArgument(0, named("io.vertx.core.buffer.Buffer"))),
+                className + "$AppendBufferAdvice");
+    }
 
-  public static class ToStringAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void get(@Advice.This final Object self, @Advice.Return final String result) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (result != null && module != null) {
-        module.taintStringIfTainted(result, self);
-      }
+    public static class ToStringAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void get(@Advice.This final Object self, @Advice.Return final String result) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (result != null && module != null) {
+                module.taintStringIfTainted(result, self);
+            }
+        }
     }
-  }
 
-  public static class GetByteBuffAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void get(@Advice.This final Object self, @Advice.Return final Object result) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (result != null && module != null) {
-        module.taintObjectIfTainted(result, self);
-      }
+    public static class GetByteBuffAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void get(@Advice.This final Object self, @Advice.Return final Object result) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (result != null && module != null) {
+                module.taintObjectIfTainted(result, self);
+            }
+        }
     }
-  }
 
-  public static class AppendBufferAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void get(
-        @Advice.Argument(0) final Object buffer, @Advice.Return final Object result) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (result != null && module != null) {
-        module.taintObjectIfTainted(result, buffer);
-      }
+    public static class AppendBufferAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void get(@Advice.Argument(0) final Object buffer, @Advice.Return final Object result) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (result != null && module != null) {
+                module.taintObjectIfTainted(result, buffer);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/CaseInsensitiveHeadersInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/CaseInsensitiveHeadersInstrumentation.java
index f84f6d00908..80d4accc0b0 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/CaseInsensitiveHeadersInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/CaseInsensitiveHeadersInstrumentation.java
@@ -32,137 +32,132 @@
 
 @AutoService(InstrumenterModule.class)
 public class CaseInsensitiveHeadersInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
 
-  private final String className = CaseInsensitiveHeadersInstrumentation.class.getName();
+    private final String className = CaseInsensitiveHeadersInstrumentation.class.getName();
 
-  public CaseInsensitiveHeadersInstrumentation() {
-    super("vertx", "vertx-3.4");
-  }
+    public CaseInsensitiveHeadersInstrumentation() {
+        super("vertx", "vertx-3.4");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.core.http.CaseInsensitiveHeaders";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.core.http.CaseInsensitiveHeaders";
+    }
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("get"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, String.class)),
-        className + "$GetAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("getAll"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, String.class)),
-        className + "$GetAllAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("entries")).and(takesNoArguments()),
-        className + "$EntriesAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("names")).and(takesNoArguments()),
-        className + "$NamesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("get"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, String.class)),
+                className + "$GetAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("getAll"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, String.class)),
+                className + "$GetAllAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("entries")).and(takesNoArguments()), className + "$EntriesAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("names")).and(takesNoArguments()), className + "$NamesAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void afterGet(
-        @Advice.This final Object self,
-        @Advice.Argument(0) final String name,
-        @Advice.Return final String result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null) {
-        IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        propagation.taintStringIfTainted(
-            ctx, result, self, SourceTypes.REQUEST_PARAMETER_VALUE, name);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void afterGet(
+                @Advice.This final Object self,
+                @Advice.Argument(0) final String name,
+                @Advice.Return final String result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation != null) {
+                IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                propagation.taintStringIfTainted(ctx, result, self, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+            }
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetAllAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void afterGetAll(
-        @Advice.This final Object self,
-        @Advice.Argument(0) final String name,
-        @Advice.Return final Collection<String> result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null && result != null && !result.isEmpty()) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        if (propagation.isTainted(ctx, self)) {
-          for (final String value : result) {
-            propagation.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
-          }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetAllAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void afterGetAll(
+                @Advice.This final Object self,
+                @Advice.Argument(0) final String name,
+                @Advice.Return final Collection<String> result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation != null && result != null && !result.isEmpty()) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                if (propagation.isTainted(ctx, self)) {
+                    for (final String value : result) {
+                        propagation.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class EntriesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void afterEntries(
-        @Advice.This final Object self,
-        @Advice.Return final List<Map.Entry<String, String>> result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null && result != null && !result.isEmpty()) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        if (propagation.isTainted(ctx, self)) {
-          final Set<String> names = new HashSet<>();
-          for (final Map.Entry<String, String> entry : result) {
-            final String name = entry.getKey();
-            final String value = entry.getValue();
-            if (names.add(name)) {
-              propagation.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class EntriesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void afterEntries(
+                @Advice.This final Object self,
+                @Advice.Return final List<Map.Entry<String, String>> result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation != null && result != null && !result.isEmpty()) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                if (propagation.isTainted(ctx, self)) {
+                    final Set<String> names = new HashSet<>();
+                    for (final Map.Entry<String, String> entry : result) {
+                        final String name = entry.getKey();
+                        final String value = entry.getValue();
+                        if (names.add(name)) {
+                            propagation.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+                        }
+                        propagation.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
+                    }
+                }
             }
-            propagation.taintString(ctx, value, SourceTypes.REQUEST_PARAMETER_VALUE, name);
-          }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class NamesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_NAME)
-    public static void afterNames(
-        @Advice.This final Object self,
-        @Advice.Return final Set<String> result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null && result != null && !result.isEmpty()) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        if (propagation.isTainted(ctx, self)) {
-          for (final String name : result) {
-            propagation.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
-          }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class NamesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_NAME)
+        public static void afterNames(
+                @Advice.This final Object self,
+                @Advice.Return final Set<String> result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation != null && result != null && !result.isEmpty()) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                if (propagation.isTainted(ctx, self)) {
+                    for (final String name : result) {
+                        propagation.taintString(ctx, name, SourceTypes.REQUEST_PARAMETER_NAME, name);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HeadersAdaptorInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HeadersAdaptorInstrumentation.java
index 8109f448ed7..75d4111816a 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HeadersAdaptorInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HeadersAdaptorInstrumentation.java
@@ -30,131 +30,123 @@
 
 @AutoService(InstrumenterModule.class)
 public class HeadersAdaptorInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.ForKnownTypes,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
 
-  private final String className = HeadersAdaptorInstrumentation.class.getName();
+    private final String className = HeadersAdaptorInstrumentation.class.getName();
 
-  public HeadersAdaptorInstrumentation() {
-    super("vertx", "vertx-3.4");
-  }
+    public HeadersAdaptorInstrumentation() {
+        super("vertx", "vertx-3.4");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.vertx.core.http.impl.HeadersAdaptor", "io.vertx.core.http.impl.Http2HeadersAdaptor"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {"io.vertx.core.http.impl.HeadersAdaptor", "io.vertx.core.http.impl.Http2HeadersAdaptor"};
+    }
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new TaintableVisitor(knownMatchingTypes()));
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new TaintableVisitor(knownMatchingTypes()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("get")).and(takesArguments(1)),
-        className + "$GetAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("getAll")).and(takesArguments(1)),
-        className + "$GetAllAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("entries")).and(takesArguments(0)),
-        className + "$EntriesAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("names")).and(takesArguments(0)),
-        className + "$NamesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("get")).and(takesArguments(1)), className + "$GetAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("getAll")).and(takesArguments(1)), className + "$GetAllAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("entries")).and(takesArguments(0)), className + "$EntriesAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("names")).and(takesArguments(0)), className + "$NamesAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void afterGet(
-        @Advice.This final Object self,
-        @Advice.Argument(0) final CharSequence name,
-        @Advice.Return final String result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        propagation.taintStringIfTainted(ctx, result, self, SourceTypes.REQUEST_HEADER_VALUE, name);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void afterGet(
+                @Advice.This final Object self,
+                @Advice.Argument(0) final CharSequence name,
+                @Advice.Return final String result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                propagation.taintStringIfTainted(ctx, result, self, SourceTypes.REQUEST_HEADER_VALUE, name);
+            }
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetAllAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void afterGetAll(
-        @Advice.This final Object self,
-        @Advice.Argument(0) final CharSequence name,
-        @Advice.Return final Collection<String> result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null && result != null && !result.isEmpty()) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        if (propagation.isTainted(ctx, self)) {
-          final String headerName = name == null ? null : name.toString();
-          for (final String value : result) {
-            propagation.taintString(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, headerName);
-          }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetAllAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void afterGetAll(
+                @Advice.This final Object self,
+                @Advice.Argument(0) final CharSequence name,
+                @Advice.Return final Collection<String> result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation != null && result != null && !result.isEmpty()) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                if (propagation.isTainted(ctx, self)) {
+                    final String headerName = name == null ? null : name.toString();
+                    for (final String value : result) {
+                        propagation.taintString(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, headerName);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class EntriesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void afterEntries(
-        @Advice.This final Object self,
-        @Advice.Return final List<Map.Entry<String, String>> result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null && result != null && !result.isEmpty()) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        if (propagation.isTainted(ctx, self)) {
-          final Set<String> names = new HashSet<>();
-          for (Map.Entry<String, String> entry : result) {
-            final String name = entry.getKey();
-            final String value = entry.getValue();
-            if (names.add(name)) {
-              propagation.taintString(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class EntriesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void afterEntries(
+                @Advice.This final Object self,
+                @Advice.Return final List<Map.Entry<String, String>> result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation != null && result != null && !result.isEmpty()) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                if (propagation.isTainted(ctx, self)) {
+                    final Set<String> names = new HashSet<>();
+                    for (Map.Entry<String, String> entry : result) {
+                        final String name = entry.getKey();
+                        final String value = entry.getValue();
+                        if (names.add(name)) {
+                            propagation.taintString(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
+                        }
+                        propagation.taintString(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
+                    }
+                }
             }
-            propagation.taintString(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
-          }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class NamesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_NAME)
-    public static void afterNames(
-        @Advice.This final Object self,
-        @Advice.Return final Set<String> result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null && result != null && !result.isEmpty()) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        if (propagation.isTainted(ctx, self)) {
-          for (final String name : result) {
-            propagation.taintString(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
-          }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class NamesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_NAME)
+        public static void afterNames(
+                @Advice.This final Object self,
+                @Advice.Return final Set<String> result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation != null && result != null && !result.isEmpty()) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                if (propagation.isTainted(ctx, self)) {
+                    for (final String name : result) {
+                        propagation.taintString(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/Http2ServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/Http2ServerRequestInstrumentation.java
index 0707bbc7d63..992e1184d81 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/Http2ServerRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/Http2ServerRequestInstrumentation.java
@@ -23,48 +23,48 @@
 @AutoService(InstrumenterModule.class)
 public class Http2ServerRequestInstrumentation extends AbstractHttpServerRequestInstrumentation {
 
-  @Override
-  protected ElementMatcher.Junction<MethodDescription> attributesFilter() {
-    return isPublic().and(named("formAttributes"));
-  }
+    @Override
+    protected ElementMatcher.Junction<MethodDescription> attributesFilter() {
+        return isPublic().and(named("formAttributes"));
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.core.http.impl.Http2ServerRequestImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.core.http.impl.Http2ServerRequestImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    super.methodAdvice(transformer);
-    transformer.applyAdvice(
-        isPublic().and(isMethod()).and(named("headers")).and(takesNoArguments()),
-        Http2ServerRequestInstrumentation.class.getName() + "$HeadersAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        super.methodAdvice(transformer);
+        transformer.applyAdvice(
+                isPublic().and(isMethod()).and(named("headers")).and(takesNoArguments()),
+                Http2ServerRequestInstrumentation.class.getName() + "$HeadersAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class HeadersAdvice {
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class HeadersAdvice {
 
-    @Advice.OnMethodEnter
-    public static void onEnter(
-        @Advice.Local("beforeHeaders") Object beforeHeaders,
-        @Advice.FieldValue("headersMap") final Object headersMap) {
-      beforeHeaders = headersMap;
-    }
+        @Advice.OnMethodEnter
+        public static void onEnter(
+                @Advice.Local("beforeHeaders") Object beforeHeaders,
+                @Advice.FieldValue("headersMap") final Object headersMap) {
+            beforeHeaders = headersMap;
+        }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void onExit(
-        @Advice.Local("beforeHeaders") final Object beforeHeaders,
-        @Advice.Return final Object multiMap,
-        @ActiveRequestContext RequestContext reqCtx) {
-      // only taint the map the first time
-      if (beforeHeaders != multiMap) {
-        final PropagationModule module = InstrumentationBridge.PROPAGATION;
-        if (module != null) {
-          final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-          module.taintObject(ctx, multiMap, SourceTypes.REQUEST_HEADER_VALUE);
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void onExit(
+                @Advice.Local("beforeHeaders") final Object beforeHeaders,
+                @Advice.Return final Object multiMap,
+                @ActiveRequestContext RequestContext reqCtx) {
+            // only taint the map the first time
+            if (beforeHeaders != multiMap) {
+                final PropagationModule module = InstrumentationBridge.PROPAGATION;
+                if (module != null) {
+                    final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                    module.taintObject(ctx, multiMap, SourceTypes.REQUEST_HEADER_VALUE);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HttpServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HttpServerRequestInstrumentation.java
index 4e580a6bf37..c782f6039cb 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HttpServerRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/core/HttpServerRequestInstrumentation.java
@@ -24,48 +24,48 @@
 @AutoService(InstrumenterModule.class)
 public class HttpServerRequestInstrumentation extends AbstractHttpServerRequestInstrumentation {
 
-  @Override
-  protected ElementMatcher.Junction<MethodDescription> attributesFilter() {
-    return isPrivate().and(named("attributes"));
-  }
+    @Override
+    protected ElementMatcher.Junction<MethodDescription> attributesFilter() {
+        return isPrivate().and(named("attributes"));
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.core.http.impl.HttpServerRequestImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.core.http.impl.HttpServerRequestImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    super.methodAdvice(transformer);
-    transformer.applyAdvice(
-        isPublic().and(isMethod()).and(named("headers")).and(takesNoArguments()),
-        HttpServerRequestInstrumentation.class.getName() + "$HeadersAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        super.methodAdvice(transformer);
+        transformer.applyAdvice(
+                isPublic().and(isMethod()).and(named("headers")).and(takesNoArguments()),
+                HttpServerRequestInstrumentation.class.getName() + "$HeadersAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class HeadersAdvice {
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class HeadersAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Local("beforeHeaders") Object beforeHeaders,
-        @Advice.FieldValue("headers") final Object headers) {
-      beforeHeaders = headers;
-    }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Local("beforeHeaders") Object beforeHeaders,
+                @Advice.FieldValue("headers") final Object headers) {
+            beforeHeaders = headers;
+        }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void onExit(
-        @Advice.Local("beforeHeaders") final Object beforeHeaders,
-        @Advice.Return final Object multiMap,
-        @ActiveRequestContext RequestContext reqCtx) {
-      // only taint the map the first time
-      if (beforeHeaders != multiMap) {
-        final PropagationModule module = InstrumentationBridge.PROPAGATION;
-        if (module != null) {
-          final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-          module.taintObject(ctx, multiMap, SourceTypes.REQUEST_HEADER_VALUE);
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void onExit(
+                @Advice.Local("beforeHeaders") final Object beforeHeaders,
+                @Advice.Return final Object multiMap,
+                @ActiveRequestContext RequestContext reqCtx) {
+            // only taint the map the first time
+            if (beforeHeaders != multiMap) {
+                final PropagationModule module = InstrumentationBridge.PROPAGATION;
+                if (module != null) {
+                    final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                    module.taintObject(ctx, multiMap, SourceTypes.REQUEST_HEADER_VALUE);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/BlockingExceptionHandler.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/BlockingExceptionHandler.java
index b811d067f9e..78a1c456600 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/BlockingExceptionHandler.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/BlockingExceptionHandler.java
@@ -10,22 +10,22 @@
  * @see VertxImplInstrumentation
  */
 public class BlockingExceptionHandler implements Handler<Throwable> {
-  private final AgentSpan span;
-  private final Handler<Throwable> delegate;
+    private final AgentSpan span;
+    private final Handler<Throwable> delegate;
 
-  public BlockingExceptionHandler(AgentSpan span, Handler<Throwable> delegate) {
-    this.span = span;
-    this.delegate = delegate;
-  }
-
-  @Override
-  public void handle(Throwable event) {
-    if (event instanceof BlockingException) {
-      VertxDecorator.DECORATE.onError(span, event);
+    public BlockingExceptionHandler(AgentSpan span, Handler<Throwable> delegate) {
+        this.span = span;
+        this.delegate = delegate;
     }
 
-    if (this.delegate != null) {
-      this.delegate.handle(event);
+    @Override
+    public void handle(Throwable event) {
+        if (event instanceof BlockingException) {
+            VertxDecorator.DECORATE.onError(span, event);
+        }
+
+        if (this.delegate != null) {
+            this.delegate.handle(event);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/CookieImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/CookieImplInstrumentation.java
index d34c4950ccb..4984b3d79dc 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/CookieImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/CookieImplInstrumentation.java
@@ -25,71 +25,67 @@
 
 @AutoService(InstrumenterModule.class)
 public class CookieImplInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
 
-  private final String className = CookieImplInstrumentation.class.getName();
+    private final String className = CookieImplInstrumentation.class.getName();
 
-  public CookieImplInstrumentation() {
-    super("vertx", "vertx-3.4");
-  }
+    public CookieImplInstrumentation() {
+        super("vertx", "vertx-3.4");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.ext.web.impl.CookieImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.ext.web.impl.CookieImpl";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
+    }
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new TaintableVisitor(this.instrumentedType()));
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new TaintableVisitor(this.instrumentedType()));
+    }
 
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("getName")).and(takesArguments(0)), className + "$GetNameAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getValue")).and(takesArguments(0)), className + "$GetValueAdvice");
-  }
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(isMethod().and(named("getName")).and(takesArguments(0)), className + "$GetNameAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getValue")).and(takesArguments(0)), className + "$GetValueAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetNameAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_NAME)
-    public static void afterGetName(
-        @Advice.This final Cookie self,
-        @Advice.Return final String result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintStringIfTainted(ctx, result, self, SourceTypes.REQUEST_COOKIE_NAME, result);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetNameAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_NAME)
+        public static void afterGetName(
+                @Advice.This final Cookie self,
+                @Advice.Return final String result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintStringIfTainted(ctx, result, self, SourceTypes.REQUEST_COOKIE_NAME, result);
+            }
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetValueAdvice {
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetValueAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    public static void afterGetValue(
-        @Advice.This final Cookie self,
-        @Advice.Return final String result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        // TODO calling self.getName() actually taints the name of the cookie
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintStringIfTainted(
-            ctx, result, self, SourceTypes.REQUEST_COOKIE_VALUE, self.getName());
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        public static void afterGetValue(
+                @Advice.This final Cookie self,
+                @Advice.Return final String result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                // TODO calling self.getName() actually taints the name of the cookie
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintStringIfTainted(ctx, result, self, SourceTypes.REQUEST_COOKIE_VALUE, self.getName());
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/EndHandlerWrapper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/EndHandlerWrapper.java
index f4b30bc4d44..c8b4d7f1fb0 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/EndHandlerWrapper.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/EndHandlerWrapper.java
@@ -4,22 +4,22 @@
 import io.vertx.ext.web.RoutingContext;
 
 public class EndHandlerWrapper implements Handler<Void> {
-  private final RoutingContext routingContext;
+    private final RoutingContext routingContext;
 
-  public Handler<Void> actual;
+    public Handler<Void> actual;
 
-  EndHandlerWrapper(RoutingContext routingContext) {
-    this.routingContext = routingContext;
-  }
+    EndHandlerWrapper(RoutingContext routingContext) {
+        this.routingContext = routingContext;
+    }
 
-  @Override
-  public void handle(final Void event) {
-    try {
-      if (actual != null) {
-        actual.handle(event);
-      }
-    } finally {
-      RouteHandlerWrapper.finishHandlerSpan(routingContext);
+    @Override
+    public void handle(final Void event) {
+        try {
+            if (actual != null) {
+                actual.handle(event);
+            }
+        } finally {
+            RouteHandlerWrapper.finishHandlerSpan(routingContext);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/EndHandlerWrapperAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/EndHandlerWrapperAdvice.java
index 421ce25a189..28c6c8106bf 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/EndHandlerWrapperAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/EndHandlerWrapperAdvice.java
@@ -4,24 +4,24 @@
 import net.bytebuddy.asm.Advice;
 
 public class EndHandlerWrapperAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void wrapHandler(
-      @Advice.FieldValue(value = "endHandler", readOnly = false) final Handler<Void> endHandler,
-      @Advice.Argument(value = 0, readOnly = false) Handler<Void> handler) {
-    // In case the handler instrumentation executes twice on the same response
-    if (endHandler instanceof EndHandlerWrapper && handler instanceof EndHandlerWrapper) {
-      return;
-    }
-    // If an end handler was already registered when our wrapper is registered, we save the one that
-    // existed before
-    if (handler instanceof EndHandlerWrapper && endHandler != null) {
-      ((EndHandlerWrapper) handler).actual = endHandler;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void wrapHandler(
+            @Advice.FieldValue(value = "endHandler", readOnly = false) final Handler<Void> endHandler,
+            @Advice.Argument(value = 0, readOnly = false) Handler<Void> handler) {
+        // In case the handler instrumentation executes twice on the same response
+        if (endHandler instanceof EndHandlerWrapper && handler instanceof EndHandlerWrapper) {
+            return;
+        }
+        // If an end handler was already registered when our wrapper is registered, we save the one that
+        // existed before
+        if (handler instanceof EndHandlerWrapper && endHandler != null) {
+            ((EndHandlerWrapper) handler).actual = endHandler;
 
-      // If the user registers an end handler and ours has already been registered then we wrap the
-      // users handler and swap the function argument for the wrapper
-    } else if (endHandler instanceof EndHandlerWrapper) {
-      ((EndHandlerWrapper) endHandler).actual = handler;
-      handler = endHandler;
+            // If the user registers an end handler and ours has already been registered then we wrap the
+            // users handler and swap the function argument for the wrapper
+        } else if (endHandler instanceof EndHandlerWrapper) {
+            ((EndHandlerWrapper) endHandler).actual = handler;
+            handler = endHandler;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/FileUploadHelper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/FileUploadHelper.java
index 913003e8c28..d27061845f5 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/FileUploadHelper.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/FileUploadHelper.java
@@ -12,40 +12,38 @@
 
 public class FileUploadHelper {
 
-  public static BlockingException commitBlockingResponse(
-      BiFunction<RequestContext, List<String>, Flow<Void>> cb,
-      RequestContext reqCtx,
-      List<String> data,
-      String reason) {
-    Flow<Void> flow = cb.apply(reqCtx, data);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        brf.tryCommitBlockingResponse(
-            reqCtx.getTraceSegment(), (Flow.Action.RequestBlockingAction) action);
-        return new BlockingException(reason);
-      }
+    public static BlockingException commitBlockingResponse(
+            BiFunction<RequestContext, List<String>, Flow<Void>> cb,
+            RequestContext reqCtx,
+            List<String> data,
+            String reason) {
+        Flow<Void> flow = cb.apply(reqCtx, data);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), (Flow.Action.RequestBlockingAction) action);
+                return new BlockingException(reason);
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  public static String readUploadContent(FileUpload upload, int maxBytes) {
-    try {
-      String path = upload.uploadedFileName();
-      if (path == null || path.isEmpty()) {
-        return "";
-      }
-      String charSet = upload.charSet();
-      String contentType =
-          charSet != null && !charSet.isEmpty()
-              ? upload.contentType() + "; charset=" + charSet
-              : upload.contentType();
-      try (FileInputStream fis = new FileInputStream(path)) {
-        return MultipartContentDecoder.readInputStream(fis, maxBytes, contentType);
-      }
-    } catch (Exception ignored) {
-      return "";
+    public static String readUploadContent(FileUpload upload, int maxBytes) {
+        try {
+            String path = upload.uploadedFileName();
+            if (path == null || path.isEmpty()) {
+                return "";
+            }
+            String charSet = upload.charSet();
+            String contentType = charSet != null && !charSet.isEmpty()
+                    ? upload.contentType() + "; charset=" + charSet
+                    : upload.contentType();
+            try (FileInputStream fis = new FileInputStream(path)) {
+                return MultipartContentDecoder.readInputStream(fis, maxBytes, contentType);
+            }
+        } catch (Exception ignored) {
+            return "";
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerRequestInstrumentation.java
index 71f005cd032..96e941c5b77 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerRequestInstrumentation.java
@@ -18,40 +18,40 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpServerRequestInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public HttpServerRequestInstrumentation() {
-    super("vertx", "vertx-3.4");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public HttpServerRequestInstrumentation() {
+        super("vertx", "vertx-3.4");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.core.http.HttpServerRequest";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.core.http.HttpServerRequest";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("bodyHandler"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("io.vertx.core.Handler"))),
-        HttpServerRequestInstrumentation.class.getName() + "$BodyHandlerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("bodyHandler"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("io.vertx.core.Handler"))),
+                HttpServerRequestInstrumentation.class.getName() + "$BodyHandlerAdvice");
+    }
 
-  /**
-   * @see HttpServerRequest#bodyHandler(Handler)
-   */
-  static class BodyHandlerAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void after(@Advice.Argument(value = 0, readOnly = false) Handler<Buffer> h) {
-      if (h != null) {
-        h = new WafPublishingBodyHandler(h);
-      }
+    /**
+     * @see HttpServerRequest#bodyHandler(Handler)
+     */
+    static class BodyHandlerAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void after(@Advice.Argument(value = 0, readOnly = false) Handler<Buffer> h) {
+            if (h != null) {
+                h = new WafPublishingBodyHandler(h);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseEndHandlerInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseEndHandlerInstrumentation.java
index ebaa7575df1..713ccad4c41 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseEndHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseEndHandlerInstrumentation.java
@@ -11,23 +11,23 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpServerResponseEndHandlerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public HttpServerResponseEndHandlerInstrumentation() {
-    super("vertx", "vertx-3.4");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public HttpServerResponseEndHandlerInstrumentation() {
+        super("vertx", "vertx-3.4");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.core.http.impl.HttpServerResponseImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.core.http.impl.HttpServerResponseImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("endHandler"))
-            .and(isPublic())
-            .and(takesArgument(0, named("io.vertx.core.Handler"))),
-        packageName + ".EndHandlerWrapperAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("endHandler"))
+                        .and(isPublic())
+                        .and(takesArgument(0, named("io.vertx.core.Handler"))),
+                packageName + ".EndHandlerWrapperAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseInstrumentation.java
index cdfcb9e583b..0eb4c13d80f 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseInstrumentation.java
@@ -20,77 +20,74 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpServerResponseInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
+    }
 
-  public HttpServerResponseInstrumentation() {
-    super("vertx", "vertx-3.4");
-  }
+    public HttpServerResponseInstrumentation() {
+        super("vertx", "vertx-3.4");
+    }
 
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("putHeader")
-            .and(
-                takesArguments(CharSequence.class, CharSequence.class)
-                    .or(takesArguments(String.class, String.class))),
-        HttpServerResponseInstrumentation.class.getName() + "$PutHeaderAdvice1");
-    transformer.applyAdvice(
-        named("putHeader")
-            .and(
-                takesArguments(CharSequence.class, Iterable.class)
-                    .or(takesArguments(String.class, Iterable.class))),
-        HttpServerResponseInstrumentation.class.getName() + "$PutHeaderAdvice2");
-  }
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("putHeader")
+                        .and(takesArguments(CharSequence.class, CharSequence.class)
+                                .or(takesArguments(String.class, String.class))),
+                HttpServerResponseInstrumentation.class.getName() + "$PutHeaderAdvice1");
+        transformer.applyAdvice(
+                named("putHeader")
+                        .and(takesArguments(CharSequence.class, Iterable.class)
+                                .or(takesArguments(String.class, Iterable.class))),
+                HttpServerResponseInstrumentation.class.getName() + "$PutHeaderAdvice2");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.vertx.core.http.HttpServerResponse";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.vertx.core.http.HttpServerResponse";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  protected boolean isOptOutEnabled() {
-    return true;
-  }
+    @Override
+    protected boolean isOptOutEnabled() {
+        return true;
+    }
 
-  public static class PutHeaderAdvice1 {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.RESPONSE_HEADER)
-    public static void onEnter(
-        @Advice.Argument(0) final CharSequence name, @Advice.Argument(1) CharSequence value) {
-      if (null != name) {
-        HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
-        if (mod != null) {
-          mod.onHeader(name.toString(), value.toString());
+    public static class PutHeaderAdvice1 {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.RESPONSE_HEADER)
+        public static void onEnter(
+                @Advice.Argument(0) final CharSequence name, @Advice.Argument(1) CharSequence value) {
+            if (null != name) {
+                HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
+                if (mod != null) {
+                    mod.onHeader(name.toString(), value.toString());
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class PutHeaderAdvice2 {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.RESPONSE_HEADER)
-    public static void onEnter(
-        @Advice.Argument(0) final CharSequence name, @Advice.Argument(1) Iterable values) {
-      if (null != values) {
-        HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
-        if (mod != null) {
-          for (Object value : values) {
-            if (value instanceof CharSequence) {
-              String stValue = ((CharSequence) value).toString();
-              mod.onHeader(name.toString(), stValue);
+    public static class PutHeaderAdvice2 {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.RESPONSE_HEADER)
+        public static void onEnter(@Advice.Argument(0) final CharSequence name, @Advice.Argument(1) Iterable values) {
+            if (null != values) {
+                HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
+                if (mod != null) {
+                    for (Object value : values) {
+                        if (value instanceof CharSequence) {
+                            String stValue = ((CharSequence) value).toString();
+                            mod.onHeader(name.toString(), stValue);
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/IastRoutingContextImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/IastRoutingContextImplInstrumentation.java
index d159408d56a..2b4f14d2e2b 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/IastRoutingContextImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/IastRoutingContextImplInstrumentation.java
@@ -27,73 +27,73 @@
 
 @AutoService(InstrumenterModule.class)
 public class IastRoutingContextImplInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  private final String className = IastRoutingContextImplInstrumentation.class.getName();
+    private final String className = IastRoutingContextImplInstrumentation.class.getName();
 
-  public IastRoutingContextImplInstrumentation() {
-    super("vertx", "vertx-3.4");
-  }
+    public IastRoutingContextImplInstrumentation() {
+        super("vertx", "vertx-3.4");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.ext.web.impl.RoutingContextImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.ext.web.impl.RoutingContextImpl";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
+    }
 
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(named("cookies").and(takesArguments(0)), className + "$CookiesAdvice");
-    transformer.applyAdvice(
-        named("getCookie").and(takesArguments(1)).and(takesArgument(0, String.class)),
-        className + "$GetCookieAdvice");
-    transformer.applyAdvice(
-        named("reroute").and(takesArguments(2)).and(takesArgument(1, String.class)),
-        className + "$RerouteAdvice");
-  }
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(named("cookies").and(takesArguments(0)), className + "$CookiesAdvice");
+        transformer.applyAdvice(
+                named("getCookie").and(takesArguments(1)).and(takesArgument(0, String.class)),
+                className + "$GetCookieAdvice");
+        transformer.applyAdvice(
+                named("reroute").and(takesArguments(2)).and(takesArgument(1, String.class)),
+                className + "$RerouteAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class CookiesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    public static void onCookies(
-        @Advice.Return final Set<Object> cookies, @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null && cookies != null && !cookies.isEmpty()) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        for (final Object cookie : cookies) {
-          module.taintObject(ctx, cookie, SourceTypes.REQUEST_COOKIE_VALUE);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class CookiesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        public static void onCookies(
+                @Advice.Return final Set<Object> cookies, @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null && cookies != null && !cookies.isEmpty()) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                for (final Object cookie : cookies) {
+                    module.taintObject(ctx, cookie, SourceTypes.REQUEST_COOKIE_VALUE);
+                }
+            }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetCookieAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    public static void onGetCookie(
-        @Advice.Return final Object cookie, @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintObject(ctx, cookie, SourceTypes.REQUEST_COOKIE_VALUE);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetCookieAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        public static void onGetCookie(
+                @Advice.Return final Object cookie, @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintObject(ctx, cookie, SourceTypes.REQUEST_COOKIE_VALUE);
+            }
+        }
     }
-  }
 
-  public static class RerouteAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
-    public static void onReroute(@Advice.Argument(1) final String path) {
-      final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
-      if (module != null) {
-        module.onRedirect(path);
-      }
+    public static class RerouteAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.UNVALIDATED_REDIRECT)
+        public static void onReroute(@Advice.Argument(1) final String path) {
+            final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
+            if (module != null) {
+                module.onRedirect(path);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/PathParameterPublishingHelper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/PathParameterPublishingHelper.java
index 23e2a0c5728..60ee59617af 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/PathParameterPublishingHelper.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/PathParameterPublishingHelper.java
@@ -21,60 +21,60 @@
 import org.slf4j.LoggerFactory;
 
 public class PathParameterPublishingHelper {
-  private static final Logger log = LoggerFactory.getLogger(PathParameterPublishingHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(PathParameterPublishingHelper.class);
 
-  public static Throwable publishParams(Map<String, String> params) {
-    AgentSpan agentSpan = activeSpan();
-    if (agentSpan == null) {
-      return null;
-    }
+    public static Throwable publishParams(Map<String, String> params) {
+        AgentSpan agentSpan = activeSpan();
+        if (agentSpan == null) {
+            return null;
+        }
 
-    RequestContext requestContext = agentSpan.getRequestContext();
-    if (requestContext == null) {
-      return null;
-    }
+        RequestContext requestContext = agentSpan.getRequestContext();
+        if (requestContext == null) {
+            return null;
+        }
 
-    BlockingException be = null;
+        BlockingException be = null;
 
-    { // appsec
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestPathParams());
-      if (callback != null) {
-        Flow<Void> flow = callback.apply(requestContext, params);
-        Flow.Action action = flow.getAction();
-        if (action instanceof Flow.Action.RequestBlockingAction) {
-          BlockResponseFunction brf = requestContext.getBlockResponseFunction();
-          if (brf == null) {
-            log.warn("Can't block. Don't know how to block on this server");
-          } else {
-            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-            brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
+        { // appsec
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
+                    cbp.getCallback(EVENTS.requestPathParams());
+            if (callback != null) {
+                Flow<Void> flow = callback.apply(requestContext, params);
+                Flow.Action action = flow.getAction();
+                if (action instanceof Flow.Action.RequestBlockingAction) {
+                    BlockResponseFunction brf = requestContext.getBlockResponseFunction();
+                    if (brf == null) {
+                        log.warn("Can't block. Don't know how to block on this server");
+                    } else {
+                        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                        brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
 
-            be = new BlockingException("Blocked request (for route/matches)");
-          }
+                        be = new BlockingException("Blocked request (for route/matches)");
+                    }
+                }
+            }
         }
-      }
-    }
 
-    { // iast
-      IastContext iastRequestContext = requestContext.getData(RequestContextSlot.IAST);
-      if (iastRequestContext != null) {
-        PropagationModule module = InstrumentationBridge.PROPAGATION;
-        if (module != null) {
-          for (Map.Entry<String, String> e : params.entrySet()) {
-            String parameterName = e.getKey();
-            String value = e.getValue();
-            if (parameterName == null || value == null) {
-              continue; // should not happen
+        { // iast
+            IastContext iastRequestContext = requestContext.getData(RequestContextSlot.IAST);
+            if (iastRequestContext != null) {
+                PropagationModule module = InstrumentationBridge.PROPAGATION;
+                if (module != null) {
+                    for (Map.Entry<String, String> e : params.entrySet()) {
+                        String parameterName = e.getKey();
+                        String value = e.getValue();
+                        if (parameterName == null || value == null) {
+                            continue; // should not happen
+                        }
+                        module.taintString(
+                                iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
+                    }
+                }
             }
-            module.taintString(
-                iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
-          }
         }
-      }
-    }
 
-    return be;
-  }
+        return be;
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerInstrumentation.java
index ed4b4072038..bc12a542c1d 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerInstrumentation.java
@@ -12,23 +12,23 @@
 
 @AutoService(InstrumenterModule.class)
 public class RouteHandlerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public RouteHandlerInstrumentation() {
-    super("vertx", "vertx-3.4");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public RouteHandlerInstrumentation() {
+        super("vertx", "vertx-3.4");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.ext.web.impl.RouteImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.ext.web.impl.RouteImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("handler", "blockingHandler"))
-            .and(isPublic())
-            .and(takesArgument(0, named("io.vertx.core.Handler"))),
-        packageName + ".RouteHandlerWrapperAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("handler", "blockingHandler"))
+                        .and(isPublic())
+                        .and(takesArgument(0, named("io.vertx.core.Handler"))),
+                packageName + ".RouteHandlerWrapperAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java
index 7af44b78e9d..41c9dd16592 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java
@@ -16,109 +16,106 @@
 import io.vertx.ext.web.impl.RouterImpl;
 
 public class RouteHandlerWrapper implements Handler<RoutingContext> {
-  static final String PARENT_SPAN_CONTEXT_KEY = AgentSpan.class.getName() + ".parent";
-  static final String HANDLER_SPAN_CONTEXT_KEY = AgentSpan.class.getName() + ".handler";
-  static final String ROUTE_CONTEXT_KEY = "dd." + Tags.HTTP_ROUTE;
+    static final String PARENT_SPAN_CONTEXT_KEY = AgentSpan.class.getName() + ".parent";
+    static final String HANDLER_SPAN_CONTEXT_KEY = AgentSpan.class.getName() + ".handler";
+    static final String ROUTE_CONTEXT_KEY = "dd." + Tags.HTTP_ROUTE;
 
-  private final Handler<RoutingContext> actual;
-  private final boolean spanStarter;
+    private final Handler<RoutingContext> actual;
+    private final boolean spanStarter;
 
-  public RouteHandlerWrapper(final Handler<RoutingContext> handler) {
-    actual = handler;
-    // When mounting a sub router, the handler is a lambda in either RouterImpl or RouteImpl, so
-    // this skips that. This prevents routers from creating a span during handling. In the event
-    // a route is not found, without this code, a span would be created for the router when it
-    // shouldn't
-    String name = handler.getClass().getName();
-    spanStarter =
-        !(name.startsWith(RouterImpl.class.getName())
-            || name.startsWith(RouteImpl.class.getName()));
-  }
+    public RouteHandlerWrapper(final Handler<RoutingContext> handler) {
+        actual = handler;
+        // When mounting a sub router, the handler is a lambda in either RouterImpl or RouteImpl, so
+        // this skips that. This prevents routers from creating a span during handling. In the event
+        // a route is not found, without this code, a span would be created for the router when it
+        // shouldn't
+        String name = handler.getClass().getName();
+        spanStarter = !(name.startsWith(RouterImpl.class.getName()) || name.startsWith(RouteImpl.class.getName()));
+    }
 
-  @Override
-  public void handle(final RoutingContext routingContext) {
-    AgentSpan span = routingContext.get(HANDLER_SPAN_CONTEXT_KEY);
-    if (spanStarter) {
-      if (span == null) {
-        AgentSpan parentSpan = activeSpan();
-        routingContext.put(PARENT_SPAN_CONTEXT_KEY, parentSpan);
+    @Override
+    public void handle(final RoutingContext routingContext) {
+        AgentSpan span = routingContext.get(HANDLER_SPAN_CONTEXT_KEY);
+        if (spanStarter) {
+            if (span == null) {
+                AgentSpan parentSpan = activeSpan();
+                routingContext.put(PARENT_SPAN_CONTEXT_KEY, parentSpan);
 
-        span = startSpan("vertx", INSTRUMENTATION_NAME);
-        routingContext.put(HANDLER_SPAN_CONTEXT_KEY, span);
+                span = startSpan("vertx", INSTRUMENTATION_NAME);
+                routingContext.put(HANDLER_SPAN_CONTEXT_KEY, span);
 
-        // Register three hooks that fire on response outcome:
-        // finishHandlerSpan is idempotent; whichever hook fires first wins.
-        //
-        // Known remaining gap: sendFile() failures on file-not-found or
-        // IOException-during-open log via HttpServerResponseImpl and return
-        // without firing any of the three hooks above (when the caller did
-        // not pass a resultHandler), so the span still leaks on that path.
-        routingContext.response().endHandler(new EndHandlerWrapper(routingContext));
-        routingContext.addBodyEndHandler(v -> finishHandlerSpan(routingContext));
-        routingContext.response().exceptionHandler(t -> finishHandlerSpan(routingContext));
-        DECORATE.afterStart(span);
-        span.setResourceName(DECORATE.className(actual.getClass()));
-      }
-      setRoute(routingContext);
-    }
-    try (final ContextScope scope = span != null ? activateSpan(span) : null) {
-      try {
-        actual.handle(routingContext);
-      } catch (final Throwable t) {
-        DECORATE.onError(span, t);
-        throw t;
-      }
+                // Register three hooks that fire on response outcome:
+                // finishHandlerSpan is idempotent; whichever hook fires first wins.
+                //
+                // Known remaining gap: sendFile() failures on file-not-found or
+                // IOException-during-open log via HttpServerResponseImpl and return
+                // without firing any of the three hooks above (when the caller did
+                // not pass a resultHandler), so the span still leaks on that path.
+                routingContext.response().endHandler(new EndHandlerWrapper(routingContext));
+                routingContext.addBodyEndHandler(v -> finishHandlerSpan(routingContext));
+                routingContext.response().exceptionHandler(t -> finishHandlerSpan(routingContext));
+                DECORATE.afterStart(span);
+                span.setResourceName(DECORATE.className(actual.getClass()));
+            }
+            setRoute(routingContext);
+        }
+        try (final ContextScope scope = span != null ? activateSpan(span) : null) {
+            try {
+                actual.handle(routingContext);
+            } catch (final Throwable t) {
+                DECORATE.onError(span, t);
+                throw t;
+            }
+        }
     }
-  }
 
-  // Idempotently finish the route-handler span. Any of the three registered
-  // hooks (EndHandlerWrapper, the addBodyEndHandler fallback, or the
-  // response.exceptionHandler lambda) may call this; the first one to win
-  // clears HANDLER_SPAN_CONTEXT_KEY so the others are no-ops.
-  static void finishHandlerSpan(final RoutingContext routingContext) {
-    final AgentSpan span = routingContext.get(HANDLER_SPAN_CONTEXT_KEY);
-    if (span == null) {
-      return;
+    // Idempotently finish the route-handler span. Any of the three registered
+    // hooks (EndHandlerWrapper, the addBodyEndHandler fallback, or the
+    // response.exceptionHandler lambda) may call this; the first one to win
+    // clears HANDLER_SPAN_CONTEXT_KEY so the others are no-ops.
+    static void finishHandlerSpan(final RoutingContext routingContext) {
+        final AgentSpan span = routingContext.get(HANDLER_SPAN_CONTEXT_KEY);
+        if (span == null) {
+            return;
+        }
+        routingContext.put(HANDLER_SPAN_CONTEXT_KEY, null);
+        DECORATE.onResponse(span, routingContext.response());
+        span.finish();
     }
-    routingContext.put(HANDLER_SPAN_CONTEXT_KEY, null);
-    DECORATE.onResponse(span, routingContext.response());
-    span.finish();
-  }
 
-  private void setRoute(RoutingContext routingContext) {
-    final AgentSpan parentSpan = routingContext.get(PARENT_SPAN_CONTEXT_KEY);
-    if (parentSpan == null) {
-      return;
-    }
+    private void setRoute(RoutingContext routingContext) {
+        final AgentSpan parentSpan = routingContext.get(PARENT_SPAN_CONTEXT_KEY);
+        if (parentSpan == null) {
+            return;
+        }
 
-    final String method = routingContext.request().rawMethod();
-    String mountPoint = routingContext.mountPoint();
-    String path = routingContext.currentRoute().getPath();
-    if (mountPoint != null && !mountPoint.isEmpty()) {
-      if (mountPoint.charAt(mountPoint.length() - 1) == '/'
-          && path != null
-          && !path.isEmpty()
-          && path.charAt(0) == '/') {
-        mountPoint = mountPoint.substring(0, mountPoint.length() - 1);
-      }
-      path = mountPoint + path;
+        final String method = routingContext.request().rawMethod();
+        String mountPoint = routingContext.mountPoint();
+        String path = routingContext.currentRoute().getPath();
+        if (mountPoint != null && !mountPoint.isEmpty()) {
+            if (mountPoint.charAt(mountPoint.length() - 1) == '/'
+                    && path != null
+                    && !path.isEmpty()
+                    && path.charAt(0) == '/') {
+                mountPoint = mountPoint.substring(0, mountPoint.length() - 1);
+            }
+            path = mountPoint + path;
+        }
+        if (method != null && path != null && shouldUpdateRoute(routingContext, parentSpan, path)) {
+            routingContext.put(ROUTE_CONTEXT_KEY, path);
+            HTTP_RESOURCE_DECORATOR.withRoute(parentSpan, method, path, true);
+        }
     }
-    if (method != null && path != null && shouldUpdateRoute(routingContext, parentSpan, path)) {
-      routingContext.put(ROUTE_CONTEXT_KEY, path);
-      HTTP_RESOURCE_DECORATOR.withRoute(parentSpan, method, path, true);
-    }
-  }
 
-  static boolean shouldUpdateRoute(
-      final RoutingContext routingContext, final AgentSpan span, final String path) {
-    if (span == null) {
-      return false;
-    }
-    final String currentRoute = routingContext.get(ROUTE_CONTEXT_KEY);
-    if (currentRoute != null && currentRoute.equals(path)) {
-      return false;
+    static boolean shouldUpdateRoute(final RoutingContext routingContext, final AgentSpan span, final String path) {
+        if (span == null) {
+            return false;
+        }
+        final String currentRoute = routingContext.get(ROUTE_CONTEXT_KEY);
+        if (currentRoute != null && currentRoute.equals(path)) {
+            return false;
+        }
+        // do not override route with a "/" if it's already set (it's probably more meaningful)
+        return !path.equals("/") || span.getTag(Tags.HTTP_ROUTE) == null;
     }
-    // do not override route with a "/" if it's already set (it's probably more meaningful)
-    return !path.equals("/") || span.getTag(Tags.HTTP_ROUTE) == null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapperAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapperAdvice.java
index 69b745a8287..8274ebb9a71 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapperAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapperAdvice.java
@@ -5,9 +5,8 @@
 import net.bytebuddy.asm.Advice;
 
 public class RouteHandlerWrapperAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void wrapHandler(
-      @Advice.Argument(value = 0, readOnly = false) Handler<RoutingContext> handler) {
-    handler = new RouteHandlerWrapper(handler);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void wrapHandler(@Advice.Argument(value = 0, readOnly = false) Handler<RoutingContext> handler) {
+        handler = new RouteHandlerWrapper(handler);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteImplInstrumentation.java
index 742bf981de6..294d80fb2de 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteImplInstrumentation.java
@@ -18,63 +18,62 @@
 
 @AutoService(InstrumenterModule.class)
 public class RouteImplInstrumentation extends InstrumenterModule
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  private Advice.PostProcessor.Factory postProcessorFactory;
+    private Advice.PostProcessor.Factory postProcessorFactory;
 
-  public RouteImplInstrumentation() {
-    super("vertx", "vertx-3.4");
-  }
+    public RouteImplInstrumentation() {
+        super("vertx", "vertx-3.4");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER};
+    }
 
-  @Override
-  public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    if (enabledSystems.contains(TargetSystem.IAST)) {
-      postProcessorFactory = IastPostProcessorFactory.INSTANCE;
-      return true;
+    @Override
+    public boolean isApplicable(Set<TargetSystem> enabledSystems) {
+        if (enabledSystems.contains(TargetSystem.IAST)) {
+            postProcessorFactory = IastPostProcessorFactory.INSTANCE;
+            return true;
+        }
+        return enabledSystems.contains(TargetSystem.APPSEC);
     }
-    return enabledSystems.contains(TargetSystem.APPSEC);
-  }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.vertx.ext.web.impl.RouteImpl", "io.vertx.ext.web.impl.RouteState",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.vertx.ext.web.impl.RouteImpl", "io.vertx.ext.web.impl.RouteState",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("matches")
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("io.vertx.ext.web.impl.RoutingContextImplBase")))
-            .and(takesArgument(1, String.class))
-            .and(takesArgument(2, boolean.class))
-            .and(isPublic())
-            .and(returns(int.class)),
-        packageName + ".RouteMatchesAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("matches")
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("io.vertx.ext.web.impl.RoutingContextImplBase")))
+                        .and(takesArgument(1, String.class))
+                        .and(takesArgument(2, boolean.class))
+                        .and(isPublic())
+                        .and(returns(int.class)),
+                packageName + ".RouteMatchesAdvice");
 
-    transformer.applyAdvice(
-        named("matches")
-            .and(takesArguments(3))
-            .and(
-                takesArgument(
-                    0,
-                    named("io.vertx.ext.web.impl.RoutingContextImplBase")
-                        .or(named("io.vertx.ext.web.RoutingContext"))))
-            .and(takesArgument(1, String.class))
-            .and(takesArgument(2, boolean.class))
-            .and(returns(boolean.class)),
-        packageName + ".RouteMatchesAdvice$BooleanReturnVariant");
-  }
+        transformer.applyAdvice(
+                named("matches")
+                        .and(takesArguments(3))
+                        .and(takesArgument(
+                                0,
+                                named("io.vertx.ext.web.impl.RoutingContextImplBase")
+                                        .or(named("io.vertx.ext.web.RoutingContext"))))
+                        .and(takesArgument(1, String.class))
+                        .and(takesArgument(2, boolean.class))
+                        .and(returns(boolean.class)),
+                packageName + ".RouteMatchesAdvice$BooleanReturnVariant");
+    }
 
-  @Override
-  public Advice.PostProcessor.Factory postProcessor() {
-    return postProcessorFactory;
-  }
+    @Override
+    public Advice.PostProcessor.Factory postProcessor() {
+        return postProcessorFactory;
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteMatchesAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteMatchesAdvice.java
index 73bb2f3e3ae..f80ee1db08c 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteMatchesAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteMatchesAdvice.java
@@ -7,41 +7,41 @@
 import net.bytebuddy.asm.Advice;
 
 class RouteMatchesAdvice {
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_PATH_PARAMETER)
-  static void after(
-      @Advice.Return int ret,
-      @Advice.Argument(0) final RoutingContext ctx,
-      @Advice.Thrown(readOnly = false) Throwable t) {
-    if (ret != 0 || t != null) {
-      return;
-    }
-    Map<String, String> params = ctx.pathParams();
-    if (params.isEmpty()) {
-      return;
-    }
-
-    Throwable resThr = PathParameterPublishingHelper.publishParams(params);
-    t = resThr;
-  }
-
-  static class BooleanReturnVariant {
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_PATH_PARAMETER)
     static void after(
-        @Advice.Return boolean ret,
-        @Advice.Argument(0) final RoutingContext ctx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (!ret || t != null) {
-        return;
-      }
-      Map<String, String> params = ctx.pathParams();
-      if (params.isEmpty()) {
-        return;
-      }
+            @Advice.Return int ret,
+            @Advice.Argument(0) final RoutingContext ctx,
+            @Advice.Thrown(readOnly = false) Throwable t) {
+        if (ret != 0 || t != null) {
+            return;
+        }
+        Map<String, String> params = ctx.pathParams();
+        if (params.isEmpty()) {
+            return;
+        }
+
+        Throwable resThr = PathParameterPublishingHelper.publishParams(params);
+        t = resThr;
+    }
+
+    static class BooleanReturnVariant {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PATH_PARAMETER)
+        static void after(
+                @Advice.Return boolean ret,
+                @Advice.Argument(0) final RoutingContext ctx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (!ret || t != null) {
+                return;
+            }
+            Map<String, String> params = ctx.pathParams();
+            if (params.isEmpty()) {
+                return;
+            }
 
-      Throwable resThr = PathParameterPublishingHelper.publishParams(params);
-      t = resThr;
+            Throwable resThr = PathParameterPublishingHelper.publishParams(params);
+            t = resThr;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextFilenamesAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextFilenamesAdvice.java
index 0fa821e3754..b6a0ccbb3a0 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextFilenamesAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextFilenamesAdvice.java
@@ -21,68 +21,63 @@
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 class RoutingContextFilenamesAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  static int before() {
-    return CallDepthThreadLocalMap.incrementCallDepth(FileUpload.class);
-  }
-
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  static void after(
-      @Advice.Enter int depth,
-      @Advice.Return Set<FileUpload> uploads,
-      @ActiveRequestContext RequestContext reqCtx,
-      @Advice.Thrown(readOnly = false) Throwable throwable) {
-    CallDepthThreadLocalMap.decrementCallDepth(FileUpload.class);
-    if (depth != 0 || throwable != null || uploads == null || uploads.isEmpty()) {
-      return;
-    }
-
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb =
-        cbp.getCallback(EVENTS.requestFilesFilenames());
-    BiFunction<RequestContext, List<String>, Flow<Void>> contentCb =
-        cbp.getCallback(EVENTS.requestFilesContent());
-    if (filenamesCb == null && contentCb == null) {
-      return;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static int before() {
+        return CallDepthThreadLocalMap.incrementCallDepth(FileUpload.class);
     }
 
-    int maxFiles = Config.get().getAppSecMaxFileContentCount();
-    int maxBytes = Config.get().getAppSecMaxFileContentBytes();
-    List<String> filenames = null;
-    List<String> filesContent = null;
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    static void after(
+            @Advice.Enter int depth,
+            @Advice.Return Set<FileUpload> uploads,
+            @ActiveRequestContext RequestContext reqCtx,
+            @Advice.Thrown(readOnly = false) Throwable throwable) {
+        CallDepthThreadLocalMap.decrementCallDepth(FileUpload.class);
+        if (depth != 0 || throwable != null || uploads == null || uploads.isEmpty()) {
+            return;
+        }
 
-    for (FileUpload upload : uploads) {
-      String name = upload.fileName();
-      if (filenamesCb != null && name != null && !name.isEmpty()) {
-        if (filenames == null) {
-          filenames = new ArrayList<>();
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb =
+                cbp.getCallback(EVENTS.requestFilesFilenames());
+        BiFunction<RequestContext, List<String>, Flow<Void>> contentCb = cbp.getCallback(EVENTS.requestFilesContent());
+        if (filenamesCb == null && contentCb == null) {
+            return;
         }
-        filenames.add(name);
-      }
-      if (contentCb != null
-          && maxFiles > 0
-          && (filesContent == null || filesContent.size() < maxFiles)) {
-        if (filesContent == null) {
-          filesContent = new ArrayList<>();
+
+        int maxFiles = Config.get().getAppSecMaxFileContentCount();
+        int maxBytes = Config.get().getAppSecMaxFileContentBytes();
+        List<String> filenames = null;
+        List<String> filesContent = null;
+
+        for (FileUpload upload : uploads) {
+            String name = upload.fileName();
+            if (filenamesCb != null && name != null && !name.isEmpty()) {
+                if (filenames == null) {
+                    filenames = new ArrayList<>();
+                }
+                filenames.add(name);
+            }
+            if (contentCb != null && maxFiles > 0 && (filesContent == null || filesContent.size() < maxFiles)) {
+                if (filesContent == null) {
+                    filesContent = new ArrayList<>();
+                }
+                filesContent.add(FileUploadHelper.readUploadContent(upload, maxBytes));
+            }
         }
-        filesContent.add(FileUploadHelper.readUploadContent(upload, maxBytes));
-      }
-    }
 
-    if (filenamesCb != null && filenames != null) {
-      throwable =
-          FileUploadHelper.commitBlockingResponse(
-              filenamesCb, reqCtx, filenames, "Blocked request (multipart file upload)");
-    }
+        if (filenamesCb != null && filenames != null) {
+            throwable = FileUploadHelper.commitBlockingResponse(
+                    filenamesCb, reqCtx, filenames, "Blocked request (multipart file upload)");
+        }
 
-    if (throwable != null) {
-      return;
-    }
+        if (throwable != null) {
+            return;
+        }
 
-    if (contentCb != null && filesContent != null) {
-      throwable =
-          FileUploadHelper.commitBlockingResponse(
-              contentCb, reqCtx, filesContent, "Blocked request (file content)");
+        if (contentCb != null && filesContent != null) {
+            throwable = FileUploadHelper.commitBlockingResponse(
+                    contentCb, reqCtx, filesContent, "Blocked request (file content)");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextImplInstrumentation.java
index d0f9f589bb8..b8a2bd5b852 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextImplInstrumentation.java
@@ -13,40 +13,38 @@
 
 @AutoService(InstrumenterModule.class)
 public class RoutingContextImplInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  private static final Reference FILE_UPLOAD_REF =
-      new Reference.Builder("io.vertx.ext.web.FileUpload")
-          .withMethod(new String[0], 0, "fileName", "Ljava/lang/String;")
-          .withMethod(new String[0], 0, "uploadedFileName", "Ljava/lang/String;")
-          .withMethod(new String[0], 0, "contentType", "Ljava/lang/String;")
-          .withMethod(new String[0], 0, "charSet", "Ljava/lang/String;")
-          .build();
-
-  public RoutingContextImplInstrumentation() {
-    super("vertx", "vertx-3.4");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.ext.web.impl.RoutingContextImpl";
-  }
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER, FILE_UPLOAD_REF};
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getBodyAsJson").or(named("getBodyAsJsonArray")).and(takesArguments(0)),
-        packageName + ".RoutingContextJsonAdvice");
-    transformer.applyAdvice(
-        named("setSession").and(takesArgument(0, named("io.vertx.ext.web.Session"))),
-        packageName + ".RoutingContextSessionAdvice");
-    transformer.applyAdvice(
-        named("fileUploads").and(takesArguments(0)),
-        packageName + ".RoutingContextFilenamesAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    private static final Reference FILE_UPLOAD_REF = new Reference.Builder("io.vertx.ext.web.FileUpload")
+            .withMethod(new String[0], 0, "fileName", "Ljava/lang/String;")
+            .withMethod(new String[0], 0, "uploadedFileName", "Ljava/lang/String;")
+            .withMethod(new String[0], 0, "contentType", "Ljava/lang/String;")
+            .withMethod(new String[0], 0, "charSet", "Ljava/lang/String;")
+            .build();
+
+    public RoutingContextImplInstrumentation() {
+        super("vertx", "vertx-3.4");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.ext.web.impl.RoutingContextImpl";
+    }
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER, FILE_UPLOAD_REF};
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getBodyAsJson").or(named("getBodyAsJsonArray")).and(takesArguments(0)),
+                packageName + ".RoutingContextJsonAdvice");
+        transformer.applyAdvice(
+                named("setSession").and(takesArgument(0, named("io.vertx.ext.web.Session"))),
+                packageName + ".RoutingContextSessionAdvice");
+        transformer.applyAdvice(
+                named("fileUploads").and(takesArguments(0)), packageName + ".RoutingContextFilenamesAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextJsonAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextJsonAdvice.java
index 8cb28041ec8..32eda4eae8e 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextJsonAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextJsonAdvice.java
@@ -17,38 +17,37 @@
 
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 class RoutingContextJsonAdvice {
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  static void after(
-      @Advice.Return Object obj_,
-      @ActiveRequestContext RequestContext reqCtx,
-      @Advice.Thrown(readOnly = false) Throwable throwable) {
-    if (obj_ == null) {
-      return;
-    }
-    Object obj = obj_;
-    if (obj instanceof JsonObject) {
-      obj = ((JsonObject) obj).getMap();
-    }
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    static void after(
+            @Advice.Return Object obj_,
+            @ActiveRequestContext RequestContext reqCtx,
+            @Advice.Thrown(readOnly = false) Throwable throwable) {
+        if (obj_ == null) {
+            return;
+        }
+        Object obj = obj_;
+        if (obj instanceof JsonObject) {
+            obj = ((JsonObject) obj).getMap();
+        }
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, Object, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestBodyProcessed());
-    if (callback == null) {
-      return;
-    }
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+        if (callback == null) {
+            return;
+        }
 
-    Flow<Void> flow = callback.apply(reqCtx, obj);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-      if (blockResponseFunction == null) {
-        return;
-      }
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-      if (throwable == null) {
-        throwable = new BlockingException("Blocked request (for RoutingContextImpl/getBodyAsJson)");
-      }
+        Flow<Void> flow = callback.apply(reqCtx, obj);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+            if (blockResponseFunction == null) {
+                return;
+            }
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+            if (throwable == null) {
+                throwable = new BlockingException("Blocked request (for RoutingContextImpl/getBodyAsJson)");
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextSessionAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextSessionAdvice.java
index 5d7a0504a74..b45f219c904 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextSessionAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextSessionAdvice.java
@@ -17,32 +17,29 @@
 
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 class RoutingContextSessionAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  static void after(
-      @ActiveRequestContext final RequestContext reqCtx,
-      @Advice.Argument(0) final Session session) {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static void after(@ActiveRequestContext final RequestContext reqCtx, @Advice.Argument(0) final Session session) {
 
-    if (session == null) {
-      return;
-    }
+        if (session == null) {
+            return;
+        }
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, String, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestSession());
-    if (callback == null) {
-      return;
-    }
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, String, Flow<Void>> callback = cbp.getCallback(EVENTS.requestSession());
+        if (callback == null) {
+            return;
+        }
 
-    Flow<Void> flow = callback.apply(reqCtx, session.id());
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-      if (blockResponseFunction == null) {
-        return;
-      }
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-      throw new BlockingException("Blocked request (for session)");
+        Flow<Void> flow = callback.apply(reqCtx, session.id());
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+            if (blockResponseFunction == null) {
+                return;
+            }
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+            throw new BlockingException("Blocked request (for session)");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxDecorator.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxDecorator.java
index 15ba1c1b1ea..5d5b7ba65f5 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxDecorator.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxDecorator.java
@@ -10,121 +10,120 @@
 import io.vertx.core.http.HttpServerResponse;
 import io.vertx.ext.web.RoutingContext;
 
-public class VertxDecorator
-    extends HttpServerDecorator<RoutingContext, RoutingContext, HttpServerResponse, Void> {
-  static final CharSequence INSTRUMENTATION_NAME = UTF8BytesString.create("vertx.route-handler");
-
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("vertx");
-
-  static final VertxDecorator DECORATE = new VertxDecorator();
-
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {INSTRUMENTATION_NAME.toString()};
-  }
-
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<Void> getter() {
-    return null;
-  }
-
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpServerResponse> responseGetter() {
-    return null;
-  }
-
-  @Override
-  public CharSequence spanName() {
-    return INSTRUMENTATION_NAME;
-  }
-
-  @Override
-  protected String method(final RoutingContext routingContext) {
-    return routingContext.request().rawMethod();
-  }
-
-  @Override
-  protected URIDataAdapter url(final RoutingContext routingContext) {
-    return new VertxURIDataAdapter(routingContext);
-  }
-
-  @Override
-  protected void doOnRequest(
-      final AgentSpan span,
-      final RoutingContext connection,
-      final RoutingContext routingContext,
-      final Context parentContext) {}
-
-  @Override
-  protected String peerHostIP(final RoutingContext routingContext) {
-    return routingContext.request().connection().remoteAddress().host();
-  }
-
-  @Override
-  protected int peerPort(final RoutingContext routingContext) {
-    return routingContext.request().connection().remoteAddress().port();
-  }
-
-  @Override
-  protected int status(final HttpServerResponse httpServerResponse) {
-    return httpServerResponse.getStatusCode();
-  }
-
-  protected static final class VertxURIDataAdapter extends URIDataAdapterBase {
-    private final RoutingContext routingContext;
-
-    public VertxURIDataAdapter(final RoutingContext routingContext) {
-      this.routingContext = routingContext;
+public class VertxDecorator extends HttpServerDecorator<RoutingContext, RoutingContext, HttpServerResponse, Void> {
+    static final CharSequence INSTRUMENTATION_NAME = UTF8BytesString.create("vertx.route-handler");
+
+    private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("vertx");
+
+    static final VertxDecorator DECORATE = new VertxDecorator();
+
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {INSTRUMENTATION_NAME.toString()};
     }
 
     @Override
-    public String scheme() {
-      return routingContext.request().scheme();
+    protected CharSequence component() {
+        return COMPONENT_NAME;
     }
 
     @Override
-    public String host() {
-      return routingContext.request().host();
+    protected AgentPropagation.ContextVisitor<Void> getter() {
+        return null;
     }
 
     @Override
-    public int port() {
-      return routingContext.request().localAddress().port();
+    protected AgentPropagation.ContextVisitor<HttpServerResponse> responseGetter() {
+        return null;
     }
 
     @Override
-    public String path() {
-      return routingContext.request().path();
+    public CharSequence spanName() {
+        return INSTRUMENTATION_NAME;
     }
 
     @Override
-    public String fragment() {
-      return null;
+    protected String method(final RoutingContext routingContext) {
+        return routingContext.request().rawMethod();
     }
 
     @Override
-    public String query() {
-      return routingContext.request().query();
+    protected URIDataAdapter url(final RoutingContext routingContext) {
+        return new VertxURIDataAdapter(routingContext);
     }
 
     @Override
-    public boolean supportsRaw() {
-      return false;
+    protected void doOnRequest(
+            final AgentSpan span,
+            final RoutingContext connection,
+            final RoutingContext routingContext,
+            final Context parentContext) {}
+
+    @Override
+    protected String peerHostIP(final RoutingContext routingContext) {
+        return routingContext.request().connection().remoteAddress().host();
     }
 
     @Override
-    public String rawPath() {
-      return null;
+    protected int peerPort(final RoutingContext routingContext) {
+        return routingContext.request().connection().remoteAddress().port();
     }
 
     @Override
-    public String rawQuery() {
-      return null;
+    protected int status(final HttpServerResponse httpServerResponse) {
+        return httpServerResponse.getStatusCode();
+    }
+
+    protected static final class VertxURIDataAdapter extends URIDataAdapterBase {
+        private final RoutingContext routingContext;
+
+        public VertxURIDataAdapter(final RoutingContext routingContext) {
+            this.routingContext = routingContext;
+        }
+
+        @Override
+        public String scheme() {
+            return routingContext.request().scheme();
+        }
+
+        @Override
+        public String host() {
+            return routingContext.request().host();
+        }
+
+        @Override
+        public int port() {
+            return routingContext.request().localAddress().port();
+        }
+
+        @Override
+        public String path() {
+            return routingContext.request().path();
+        }
+
+        @Override
+        public String fragment() {
+            return null;
+        }
+
+        @Override
+        public String query() {
+            return routingContext.request().query();
+        }
+
+        @Override
+        public boolean supportsRaw() {
+            return false;
+        }
+
+        @Override
+        public String rawPath() {
+            return null;
+        }
+
+        @Override
+        public String rawQuery() {
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxImplInstrumentation.java
index 881234a62fb..c6f70eb18fb 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxImplInstrumentation.java
@@ -15,33 +15,33 @@
 
 @AutoService(InstrumenterModule.class)
 public class VertxImplInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public VertxImplInstrumentation() {
-    super("vertx", "vertx-3.4");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public VertxImplInstrumentation() {
+        super("vertx", "vertx-3.4");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.core.impl.VertxImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.core.impl.VertxImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("exceptionHandler"))
-            .and(takesArguments(0))
-            .and(returns(named("io.vertx.core.Handler"))),
-        VertxImplInstrumentation.class.getName() + "$ExceptionHandlerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("exceptionHandler"))
+                        .and(takesArguments(0))
+                        .and(returns(named("io.vertx.core.Handler"))),
+                VertxImplInstrumentation.class.getName() + "$ExceptionHandlerAdvice");
+    }
 
-  static class ExceptionHandlerAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(@Advice.Return(readOnly = false) Handler<Throwable> ret) {
-      AgentSpan agentSpan = AgentTracer.activeSpan();
-      if (agentSpan != null) {
-        ret = new BlockingExceptionHandler(agentSpan, ret);
-      }
+    static class ExceptionHandlerAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.Return(readOnly = false) Handler<Throwable> ret) {
+            AgentSpan agentSpan = AgentTracer.activeSpan();
+            if (agentSpan != null) {
+                ret = new BlockingExceptionHandler(agentSpan, ret);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxVersionMatcher.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxVersionMatcher.java
index 16a6d33eba9..002cb93db28 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxVersionMatcher.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxVersionMatcher.java
@@ -4,10 +4,10 @@
 
 // checks for vertx >= 3.4, < 4
 public class VertxVersionMatcher {
-  // added in 3.4
-  public static final Reference PARSABLE_HEADER_VALUE =
-      new Reference.Builder("io.vertx.ext.web.impl.ParsableHeaderValue").build();
-  // removed in 4.0
-  public static final Reference VIRTUAL_HOST_HANDLER =
-      new Reference.Builder("io.vertx.ext.web.handler.VirtualHostHandler").build();
+    // added in 3.4
+    public static final Reference PARSABLE_HEADER_VALUE =
+            new Reference.Builder("io.vertx.ext.web.impl.ParsableHeaderValue").build();
+    // removed in 4.0
+    public static final Reference VIRTUAL_HOST_HANDLER =
+            new Reference.Builder("io.vertx.ext.web.handler.VirtualHostHandler").build();
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/WafPublishingBodyHandler.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/WafPublishingBodyHandler.java
index 482ace0ef7e..9809bc79b08 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/WafPublishingBodyHandler.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/WafPublishingBodyHandler.java
@@ -21,489 +21,487 @@
 import java.util.function.BiFunction;
 
 public class WafPublishingBodyHandler implements Handler<Buffer> {
-  private final Handler<Buffer> delegate;
+    private final Handler<Buffer> delegate;
 
-  public WafPublishingBodyHandler(Handler<Buffer> delegate) {
-    this.delegate = delegate;
-  }
+    public WafPublishingBodyHandler(Handler<Buffer> delegate) {
+        this.delegate = delegate;
+    }
 
-  @Override
-  public void handle(Buffer buffer) {
-    this.delegate.handle(new BufferWrapper(buffer));
-  }
+    @Override
+    public void handle(Buffer buffer) {
+        this.delegate.handle(new BufferWrapper(buffer));
+    }
 
-  static class BufferWrapper implements Buffer {
-    private final Buffer delegate;
-    private final AtomicBoolean hasPublished = new AtomicBoolean();
+    static class BufferWrapper implements Buffer {
+        private final Buffer delegate;
+        private final AtomicBoolean hasPublished = new AtomicBoolean();
 
-    BufferWrapper(Buffer delegate) {
-      this.delegate = delegate;
-    }
+        BufferWrapper(Buffer delegate) {
+            this.delegate = delegate;
+        }
 
-    private void publishRequestBody(Object body) {
-      if (!hasPublished.compareAndSet(false, true)) {
-        return;
-      }
-
-      AgentSpan span = AgentTracer.activeSpan();
-      if (span == null) {
-        return;
-      }
-
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
-
-      RequestContext reqCtx = span.getRequestContext();
-      if (reqCtx == null) {
-        return;
-      }
-
-      Flow<Void> flow = callback.apply(reqCtx, body);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction == null) {
-          return;
-        }
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-        throw new BlockingException(
-            "Blocked request (for Buffer/toString or Buffer/toJson{Object,Array})");
-      }
-    }
+        private void publishRequestBody(Object body) {
+            if (!hasPublished.compareAndSet(false, true)) {
+                return;
+            }
+
+            AgentSpan span = AgentTracer.activeSpan();
+            if (span == null) {
+                return;
+            }
+
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
+
+            RequestContext reqCtx = span.getRequestContext();
+            if (reqCtx == null) {
+                return;
+            }
+
+            Flow<Void> flow = callback.apply(reqCtx, body);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction == null) {
+                    return;
+                }
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                throw new BlockingException("Blocked request (for Buffer/toString or Buffer/toJson{Object,Array})");
+            }
+        }
 
-    @Override
-    public String toString() {
-      String s = delegate.toString();
-      publishRequestBody(s);
-      return s;
-    }
+        @Override
+        public String toString() {
+            String s = delegate.toString();
+            publishRequestBody(s);
+            return s;
+        }
 
-    @Override
-    public String toString(String enc) {
-      String s = delegate.toString(enc);
-      publishRequestBody(s);
-      return s;
-    }
+        @Override
+        public String toString(String enc) {
+            String s = delegate.toString(enc);
+            publishRequestBody(s);
+            return s;
+        }
 
-    @Override
-    public String toString(Charset enc) {
-      String s = delegate.toString(enc);
-      publishRequestBody(s);
-      return s;
-    }
+        @Override
+        public String toString(Charset enc) {
+            String s = delegate.toString(enc);
+            publishRequestBody(s);
+            return s;
+        }
 
-    @Override
-    public JsonObject toJsonObject() {
-      JsonObject jo = delegate.toJsonObject();
-      publishRequestBody(jo.getMap());
-      return jo;
-    }
+        @Override
+        public JsonObject toJsonObject() {
+            JsonObject jo = delegate.toJsonObject();
+            publishRequestBody(jo.getMap());
+            return jo;
+        }
 
-    @Override
-    public JsonArray toJsonArray() {
-      JsonArray ja = delegate.toJsonArray();
-      publishRequestBody(ja.getList());
-      return ja;
-    }
+        @Override
+        public JsonArray toJsonArray() {
+            JsonArray ja = delegate.toJsonArray();
+            publishRequestBody(ja.getList());
+            return ja;
+        }
 
-    @Override
-    public byte getByte(int pos) {
-      return delegate.getByte(pos);
-    }
+        @Override
+        public byte getByte(int pos) {
+            return delegate.getByte(pos);
+        }
 
-    @Override
-    public short getUnsignedByte(int pos) {
-      return delegate.getUnsignedByte(pos);
-    }
+        @Override
+        public short getUnsignedByte(int pos) {
+            return delegate.getUnsignedByte(pos);
+        }
 
-    @Override
-    public int getInt(int pos) {
-      return delegate.getInt(pos);
-    }
+        @Override
+        public int getInt(int pos) {
+            return delegate.getInt(pos);
+        }
 
-    @Override
-    public int getIntLE(int pos) {
-      return delegate.getIntLE(pos);
-    }
+        @Override
+        public int getIntLE(int pos) {
+            return delegate.getIntLE(pos);
+        }
 
-    @Override
-    public long getUnsignedInt(int pos) {
-      return delegate.getUnsignedInt(pos);
-    }
+        @Override
+        public long getUnsignedInt(int pos) {
+            return delegate.getUnsignedInt(pos);
+        }
 
-    @Override
-    public long getUnsignedIntLE(int pos) {
-      return delegate.getUnsignedIntLE(pos);
-    }
+        @Override
+        public long getUnsignedIntLE(int pos) {
+            return delegate.getUnsignedIntLE(pos);
+        }
 
-    @Override
-    public long getLong(int pos) {
-      return delegate.getLong(pos);
-    }
+        @Override
+        public long getLong(int pos) {
+            return delegate.getLong(pos);
+        }
 
-    @Override
-    public long getLongLE(int pos) {
-      return delegate.getLongLE(pos);
-    }
+        @Override
+        public long getLongLE(int pos) {
+            return delegate.getLongLE(pos);
+        }
 
-    @Override
-    public double getDouble(int pos) {
-      return delegate.getDouble(pos);
-    }
+        @Override
+        public double getDouble(int pos) {
+            return delegate.getDouble(pos);
+        }
 
-    @Override
-    public float getFloat(int pos) {
-      return delegate.getFloat(pos);
-    }
+        @Override
+        public float getFloat(int pos) {
+            return delegate.getFloat(pos);
+        }
 
-    @Override
-    public short getShort(int pos) {
-      return delegate.getShort(pos);
-    }
+        @Override
+        public short getShort(int pos) {
+            return delegate.getShort(pos);
+        }
 
-    @Override
-    public short getShortLE(int pos) {
-      return delegate.getShortLE(pos);
-    }
+        @Override
+        public short getShortLE(int pos) {
+            return delegate.getShortLE(pos);
+        }
 
-    @Override
-    public int getUnsignedShort(int pos) {
-      return delegate.getUnsignedShort(pos);
-    }
+        @Override
+        public int getUnsignedShort(int pos) {
+            return delegate.getUnsignedShort(pos);
+        }
 
-    @Override
-    public int getUnsignedShortLE(int pos) {
-      return delegate.getUnsignedShortLE(pos);
-    }
+        @Override
+        public int getUnsignedShortLE(int pos) {
+            return delegate.getUnsignedShortLE(pos);
+        }
 
-    @Override
-    public int getMedium(int pos) {
-      return delegate.getMedium(pos);
-    }
+        @Override
+        public int getMedium(int pos) {
+            return delegate.getMedium(pos);
+        }
 
-    @Override
-    public int getMediumLE(int pos) {
-      return delegate.getMediumLE(pos);
-    }
+        @Override
+        public int getMediumLE(int pos) {
+            return delegate.getMediumLE(pos);
+        }
 
-    @Override
-    public int getUnsignedMedium(int pos) {
-      return delegate.getUnsignedMedium(pos);
-    }
+        @Override
+        public int getUnsignedMedium(int pos) {
+            return delegate.getUnsignedMedium(pos);
+        }
 
-    @Override
-    public int getUnsignedMediumLE(int pos) {
-      return delegate.getUnsignedMediumLE(pos);
-    }
+        @Override
+        public int getUnsignedMediumLE(int pos) {
+            return delegate.getUnsignedMediumLE(pos);
+        }
 
-    @Override
-    public byte[] getBytes() {
-      return delegate.getBytes();
-    }
+        @Override
+        public byte[] getBytes() {
+            return delegate.getBytes();
+        }
 
-    @Override
-    public byte[] getBytes(int start, int end) {
-      return delegate.getBytes(start, end);
-    }
+        @Override
+        public byte[] getBytes(int start, int end) {
+            return delegate.getBytes(start, end);
+        }
 
-    @Override
-    public Buffer getBytes(byte[] dst) {
-      return delegate.getBytes(dst);
-    }
+        @Override
+        public Buffer getBytes(byte[] dst) {
+            return delegate.getBytes(dst);
+        }
 
-    @Override
-    public Buffer getBytes(byte[] dst, int dstIndex) {
-      return delegate.getBytes(dst, dstIndex);
-    }
+        @Override
+        public Buffer getBytes(byte[] dst, int dstIndex) {
+            return delegate.getBytes(dst, dstIndex);
+        }
 
-    @Override
-    public Buffer getBytes(int start, int end, byte[] dst) {
-      return delegate.getBytes(start, end, dst);
-    }
+        @Override
+        public Buffer getBytes(int start, int end, byte[] dst) {
+            return delegate.getBytes(start, end, dst);
+        }
 
-    @Override
-    public Buffer getBytes(int start, int end, byte[] dst, int dstIndex) {
-      return delegate.getBytes(start, end, dst, dstIndex);
-    }
+        @Override
+        public Buffer getBytes(int start, int end, byte[] dst, int dstIndex) {
+            return delegate.getBytes(start, end, dst, dstIndex);
+        }
 
-    @Override
-    public Buffer getBuffer(int start, int end) {
-      return delegate.getBuffer(start, end);
-    }
+        @Override
+        public Buffer getBuffer(int start, int end) {
+            return delegate.getBuffer(start, end);
+        }
 
-    @Override
-    public String getString(int start, int end, String enc) {
-      return delegate.getString(start, end, enc);
-    }
+        @Override
+        public String getString(int start, int end, String enc) {
+            return delegate.getString(start, end, enc);
+        }
 
-    @Override
-    public String getString(int start, int end) {
-      return delegate.getString(start, end);
-    }
+        @Override
+        public String getString(int start, int end) {
+            return delegate.getString(start, end);
+        }
 
-    @Override
-    public Buffer appendBuffer(Buffer buff) {
-      return delegate.appendBuffer(buff);
-    }
+        @Override
+        public Buffer appendBuffer(Buffer buff) {
+            return delegate.appendBuffer(buff);
+        }
 
-    @Override
-    public Buffer appendBuffer(Buffer buff, int offset, int len) {
-      return delegate.appendBuffer(buff, offset, len);
-    }
+        @Override
+        public Buffer appendBuffer(Buffer buff, int offset, int len) {
+            return delegate.appendBuffer(buff, offset, len);
+        }
 
-    @Override
-    public Buffer appendBytes(byte[] bytes) {
-      return delegate.appendBytes(bytes);
-    }
+        @Override
+        public Buffer appendBytes(byte[] bytes) {
+            return delegate.appendBytes(bytes);
+        }
 
-    @Override
-    public Buffer appendBytes(byte[] bytes, int offset, int len) {
-      return delegate.appendBytes(bytes, offset, len);
-    }
+        @Override
+        public Buffer appendBytes(byte[] bytes, int offset, int len) {
+            return delegate.appendBytes(bytes, offset, len);
+        }
 
-    @Override
-    public Buffer appendByte(byte b) {
-      return delegate.appendByte(b);
-    }
+        @Override
+        public Buffer appendByte(byte b) {
+            return delegate.appendByte(b);
+        }
 
-    @Override
-    public Buffer appendUnsignedByte(short b) {
-      return delegate.appendUnsignedByte(b);
-    }
+        @Override
+        public Buffer appendUnsignedByte(short b) {
+            return delegate.appendUnsignedByte(b);
+        }
 
-    @Override
-    public Buffer appendInt(int i) {
-      return delegate.appendInt(i);
-    }
+        @Override
+        public Buffer appendInt(int i) {
+            return delegate.appendInt(i);
+        }
 
-    @Override
-    public Buffer appendIntLE(int i) {
-      return delegate.appendIntLE(i);
-    }
+        @Override
+        public Buffer appendIntLE(int i) {
+            return delegate.appendIntLE(i);
+        }
 
-    @Override
-    public Buffer appendUnsignedInt(long i) {
-      return delegate.appendUnsignedInt(i);
-    }
+        @Override
+        public Buffer appendUnsignedInt(long i) {
+            return delegate.appendUnsignedInt(i);
+        }
 
-    @Override
-    public Buffer appendUnsignedIntLE(long i) {
-      return delegate.appendUnsignedIntLE(i);
-    }
+        @Override
+        public Buffer appendUnsignedIntLE(long i) {
+            return delegate.appendUnsignedIntLE(i);
+        }
 
-    @Override
-    public Buffer appendMedium(int i) {
-      return delegate.appendMedium(i);
-    }
+        @Override
+        public Buffer appendMedium(int i) {
+            return delegate.appendMedium(i);
+        }
 
-    @Override
-    public Buffer appendMediumLE(int i) {
-      return delegate.appendMediumLE(i);
-    }
+        @Override
+        public Buffer appendMediumLE(int i) {
+            return delegate.appendMediumLE(i);
+        }
 
-    @Override
-    public Buffer appendLong(long l) {
-      return delegate.appendLong(l);
-    }
+        @Override
+        public Buffer appendLong(long l) {
+            return delegate.appendLong(l);
+        }
 
-    @Override
-    public Buffer appendLongLE(long l) {
-      return delegate.appendLongLE(l);
-    }
+        @Override
+        public Buffer appendLongLE(long l) {
+            return delegate.appendLongLE(l);
+        }
 
-    @Override
-    public Buffer appendShort(short s) {
-      return delegate.appendShort(s);
-    }
+        @Override
+        public Buffer appendShort(short s) {
+            return delegate.appendShort(s);
+        }
 
-    @Override
-    public Buffer appendShortLE(short s) {
-      return delegate.appendShortLE(s);
-    }
+        @Override
+        public Buffer appendShortLE(short s) {
+            return delegate.appendShortLE(s);
+        }
 
-    @Override
-    public Buffer appendUnsignedShort(int s) {
-      return delegate.appendUnsignedShort(s);
-    }
+        @Override
+        public Buffer appendUnsignedShort(int s) {
+            return delegate.appendUnsignedShort(s);
+        }
 
-    @Override
-    public Buffer appendUnsignedShortLE(int s) {
-      return delegate.appendUnsignedShortLE(s);
-    }
+        @Override
+        public Buffer appendUnsignedShortLE(int s) {
+            return delegate.appendUnsignedShortLE(s);
+        }
 
-    @Override
-    public Buffer appendFloat(float f) {
-      return delegate.appendFloat(f);
-    }
+        @Override
+        public Buffer appendFloat(float f) {
+            return delegate.appendFloat(f);
+        }
 
-    @Override
-    public Buffer appendDouble(double d) {
-      return delegate.appendDouble(d);
-    }
+        @Override
+        public Buffer appendDouble(double d) {
+            return delegate.appendDouble(d);
+        }
 
-    @Override
-    public Buffer appendString(String str, String enc) {
-      return delegate.appendString(str, enc);
-    }
+        @Override
+        public Buffer appendString(String str, String enc) {
+            return delegate.appendString(str, enc);
+        }
 
-    @Override
-    public Buffer appendString(String str) {
-      return delegate.appendString(str);
-    }
+        @Override
+        public Buffer appendString(String str) {
+            return delegate.appendString(str);
+        }
 
-    @Override
-    public Buffer setByte(int pos, byte b) {
-      return delegate.setByte(pos, b);
-    }
+        @Override
+        public Buffer setByte(int pos, byte b) {
+            return delegate.setByte(pos, b);
+        }
 
-    @Override
-    public Buffer setUnsignedByte(int pos, short b) {
-      return delegate.setUnsignedByte(pos, b);
-    }
+        @Override
+        public Buffer setUnsignedByte(int pos, short b) {
+            return delegate.setUnsignedByte(pos, b);
+        }
 
-    @Override
-    public Buffer setInt(int pos, int i) {
-      return delegate.setInt(pos, i);
-    }
+        @Override
+        public Buffer setInt(int pos, int i) {
+            return delegate.setInt(pos, i);
+        }
 
-    @Override
-    public Buffer setIntLE(int pos, int i) {
-      return delegate.setIntLE(pos, i);
-    }
+        @Override
+        public Buffer setIntLE(int pos, int i) {
+            return delegate.setIntLE(pos, i);
+        }
 
-    @Override
-    public Buffer setUnsignedInt(int pos, long i) {
-      return delegate.setUnsignedInt(pos, i);
-    }
+        @Override
+        public Buffer setUnsignedInt(int pos, long i) {
+            return delegate.setUnsignedInt(pos, i);
+        }
 
-    @Override
-    public Buffer setUnsignedIntLE(int pos, long i) {
-      return delegate.setUnsignedIntLE(pos, i);
-    }
+        @Override
+        public Buffer setUnsignedIntLE(int pos, long i) {
+            return delegate.setUnsignedIntLE(pos, i);
+        }
 
-    @Override
-    public Buffer setMedium(int pos, int i) {
-      return delegate.setMedium(pos, i);
-    }
+        @Override
+        public Buffer setMedium(int pos, int i) {
+            return delegate.setMedium(pos, i);
+        }
 
-    @Override
-    public Buffer setMediumLE(int pos, int i) {
-      return delegate.setMediumLE(pos, i);
-    }
+        @Override
+        public Buffer setMediumLE(int pos, int i) {
+            return delegate.setMediumLE(pos, i);
+        }
 
-    @Override
-    public Buffer setLong(int pos, long l) {
-      return delegate.setLong(pos, l);
-    }
+        @Override
+        public Buffer setLong(int pos, long l) {
+            return delegate.setLong(pos, l);
+        }
 
-    @Override
-    public Buffer setLongLE(int pos, long l) {
-      return delegate.setLongLE(pos, l);
-    }
+        @Override
+        public Buffer setLongLE(int pos, long l) {
+            return delegate.setLongLE(pos, l);
+        }
 
-    @Override
-    public Buffer setDouble(int pos, double d) {
-      return delegate.setDouble(pos, d);
-    }
+        @Override
+        public Buffer setDouble(int pos, double d) {
+            return delegate.setDouble(pos, d);
+        }
 
-    @Override
-    public Buffer setFloat(int pos, float f) {
-      return delegate.setFloat(pos, f);
-    }
+        @Override
+        public Buffer setFloat(int pos, float f) {
+            return delegate.setFloat(pos, f);
+        }
 
-    @Override
-    public Buffer setShort(int pos, short s) {
-      return delegate.setShort(pos, s);
-    }
+        @Override
+        public Buffer setShort(int pos, short s) {
+            return delegate.setShort(pos, s);
+        }
 
-    @Override
-    public Buffer setShortLE(int pos, short s) {
-      return delegate.setShortLE(pos, s);
-    }
+        @Override
+        public Buffer setShortLE(int pos, short s) {
+            return delegate.setShortLE(pos, s);
+        }
 
-    @Override
-    public Buffer setUnsignedShort(int pos, int s) {
-      return delegate.setUnsignedShort(pos, s);
-    }
+        @Override
+        public Buffer setUnsignedShort(int pos, int s) {
+            return delegate.setUnsignedShort(pos, s);
+        }
 
-    @Override
-    public Buffer setUnsignedShortLE(int pos, int s) {
-      return delegate.setUnsignedShortLE(pos, s);
-    }
+        @Override
+        public Buffer setUnsignedShortLE(int pos, int s) {
+            return delegate.setUnsignedShortLE(pos, s);
+        }
 
-    @Override
-    public Buffer setBuffer(int pos, Buffer b) {
-      return delegate.setBuffer(pos, b);
-    }
+        @Override
+        public Buffer setBuffer(int pos, Buffer b) {
+            return delegate.setBuffer(pos, b);
+        }
 
-    @Override
-    public Buffer setBuffer(int pos, Buffer b, int offset, int len) {
-      return delegate.setBuffer(pos, b, offset, len);
-    }
+        @Override
+        public Buffer setBuffer(int pos, Buffer b, int offset, int len) {
+            return delegate.setBuffer(pos, b, offset, len);
+        }
 
-    @Override
-    public Buffer setBytes(int pos, ByteBuffer b) {
-      return delegate.setBytes(pos, b);
-    }
+        @Override
+        public Buffer setBytes(int pos, ByteBuffer b) {
+            return delegate.setBytes(pos, b);
+        }
 
-    @Override
-    public Buffer setBytes(int pos, byte[] b) {
-      return delegate.setBytes(pos, b);
-    }
+        @Override
+        public Buffer setBytes(int pos, byte[] b) {
+            return delegate.setBytes(pos, b);
+        }
 
-    @Override
-    public Buffer setBytes(int pos, byte[] b, int offset, int len) {
-      return delegate.setBytes(pos, b, offset, len);
-    }
+        @Override
+        public Buffer setBytes(int pos, byte[] b, int offset, int len) {
+            return delegate.setBytes(pos, b, offset, len);
+        }
 
-    @Override
-    public Buffer setString(int pos, String str) {
-      return delegate.setString(pos, str);
-    }
+        @Override
+        public Buffer setString(int pos, String str) {
+            return delegate.setString(pos, str);
+        }
 
-    @Override
-    public Buffer setString(int pos, String str, String enc) {
-      return delegate.setString(pos, str, enc);
-    }
+        @Override
+        public Buffer setString(int pos, String str, String enc) {
+            return delegate.setString(pos, str, enc);
+        }
 
-    @Override
-    public int length() {
-      return delegate.length();
-    }
+        @Override
+        public int length() {
+            return delegate.length();
+        }
 
-    @Override
-    public Buffer copy() {
-      return delegate.copy();
-    }
+        @Override
+        public Buffer copy() {
+            return delegate.copy();
+        }
 
-    @Override
-    public Buffer slice() {
-      return delegate.slice();
-    }
+        @Override
+        public Buffer slice() {
+            return delegate.slice();
+        }
 
-    @Override
-    public Buffer slice(int start, int end) {
-      return delegate.slice(start, end);
-    }
+        @Override
+        public Buffer slice(int start, int end) {
+            return delegate.slice(start, end);
+        }
 
-    @Override
-    public ByteBuf getByteBuf() {
-      return delegate.getByteBuf();
-    }
+        @Override
+        public ByteBuf getByteBuf() {
+            return delegate.getByteBuf();
+        }
 
-    @Override
-    public void writeToBuffer(Buffer buffer) {
-      delegate.writeToBuffer(buffer);
-    }
+        @Override
+        public void writeToBuffer(Buffer buffer) {
+            delegate.writeToBuffer(buffer);
+        }
 
-    @Override
-    public int readFromBuffer(int pos, Buffer buffer) {
-      return delegate.readFromBuffer(pos, buffer);
+        @Override
+        public int readFromBuffer(int pos, Buffer buffer) {
+            return delegate.readFromBuffer(pos, buffer);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/io/vertx/core/http/impl/ResponseExceptionFiringHelper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/io/vertx/core/http/impl/ResponseExceptionFiringHelper.java
index 5c581365de5..8f741a48d1c 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/io/vertx/core/http/impl/ResponseExceptionFiringHelper.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/io/vertx/core/http/impl/ResponseExceptionFiringHelper.java
@@ -9,9 +9,9 @@
  * response.exceptionHandler(...).
  */
 public final class ResponseExceptionFiringHelper {
-  private ResponseExceptionFiringHelper() {}
+    private ResponseExceptionFiringHelper() {}
 
-  public static void fireException(HttpServerResponse response, Throwable cause) {
-    ((HttpServerResponseImpl) response).handleException(cause);
-  }
+    public static void fireException(HttpServerResponse response, Throwable cause) {
+        ((HttpServerResponseImpl) response).handleException(cause);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/IastSinksVerticle.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/IastSinksVerticle.java
index 6acf7fa058f..9cc30f6816e 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/IastSinksVerticle.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/IastSinksVerticle.java
@@ -7,38 +7,26 @@
 
 public class IastSinksVerticle extends AbstractVerticle {
 
-  public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port";
+    public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port";
 
-  @Override
-  public void start(final Future<Void> startFuture) {
-    final int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
-    Router router = Router.router(vertx);
-    router
-        .route("/iast/sinks/reroute1")
-        .handler(
-            rc -> {
-              final String path = rc.request().getParam("path");
-              rc.reroute(path);
-            });
-    router
-        .route("/iast/sinks/reroute2")
-        .handler(
-            rc -> {
-              final String path = rc.request().getParam("path");
-              rc.reroute(HttpMethod.GET, path);
-            });
-    router
-        .route("/iast/sinks/putheader1")
-        .handler(
-            rc -> {
-              final String headerName = rc.request().getParam("name");
-              final String headerValue = rc.request().getParam("value");
-              rc.response().putHeader(headerName, headerValue).end();
-            });
+    @Override
+    public void start(final Future<Void> startFuture) {
+        final int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
+        Router router = Router.router(vertx);
+        router.route("/iast/sinks/reroute1").handler(rc -> {
+            final String path = rc.request().getParam("path");
+            rc.reroute(path);
+        });
+        router.route("/iast/sinks/reroute2").handler(rc -> {
+            final String path = rc.request().getParam("path");
+            rc.reroute(HttpMethod.GET, path);
+        });
+        router.route("/iast/sinks/putheader1").handler(rc -> {
+            final String headerName = rc.request().getParam("name");
+            final String headerValue = rc.request().getParam("value");
+            rc.response().putHeader(headerName, headerValue).end();
+        });
 
-    vertx
-        .createHttpServer()
-        .requestHandler(router::accept)
-        .listen(port, event -> startFuture.complete());
-  }
+        vertx.createHttpServer().requestHandler(router::accept).listen(port, event -> startFuture.complete());
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/IastSourceVerticle.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/IastSourceVerticle.java
index e73ca00d610..2ead007a126 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/IastSourceVerticle.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/IastSourceVerticle.java
@@ -11,77 +11,53 @@
 
 public class IastSourceVerticle extends AbstractVerticle {
 
-  public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port";
+    public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port";
 
-  @Override
-  public void start(final Future<Void> startPromise) {
-    final int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
-    Router router = Router.router(vertx);
-    router.route().handler(BodyHandler.create());
-    router.route().handler(CookieHandler.create());
-    router
-        .route("/iast/propagation/cookies")
-        .handler(
-            rc -> {
-              rc.cookies();
-              rc.response().end();
-            });
-    router
-        .route("/iast/propagation/getcookie")
-        .handler(
-            rc -> {
-              rc.getCookie("cookie");
-              rc.response().end();
-            });
-    router
-        .route("/iast/propagation/getcookiename")
-        .handler(
-            rc -> {
-              Cookie cookie = new CookieImpl("cookieName", "cookieValue");
-              cookie.getName();
-              rc.response().end();
-            });
-    router
-        .route("/iast/propagation/getcookievalue")
-        .handler(
-            rc -> {
-              Cookie cookie = new CookieImpl("cookieName", "cookieValue");
-              cookie.getValue();
-              rc.response().end();
-            });
-    router
-        .route("/iast/propagation/headers")
-        .handler(
-            rc -> {
-              rc.request().headers();
-              rc.response().end();
-            });
-    router
-        .route("/iast/propagation/params")
-        .handler(
-            rc -> {
-              rc.request().params();
-              rc.response().end();
-            });
-    router
-        .route("/iast/propagation/formAttributes")
-        .handler(rc -> rc.response().end(rc.request().formAttributes().get("formAttribute")));
-    router
-        .route("/iast/propagation/handleData")
-        .handler(rc -> rc.response().end(rc.getBodyAsString()));
+    @Override
+    public void start(final Future<Void> startPromise) {
+        final int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
+        Router router = Router.router(vertx);
+        router.route().handler(BodyHandler.create());
+        router.route().handler(CookieHandler.create());
+        router.route("/iast/propagation/cookies").handler(rc -> {
+            rc.cookies();
+            rc.response().end();
+        });
+        router.route("/iast/propagation/getcookie").handler(rc -> {
+            rc.getCookie("cookie");
+            rc.response().end();
+        });
+        router.route("/iast/propagation/getcookiename").handler(rc -> {
+            Cookie cookie = new CookieImpl("cookieName", "cookieValue");
+            cookie.getName();
+            rc.response().end();
+        });
+        router.route("/iast/propagation/getcookievalue").handler(rc -> {
+            Cookie cookie = new CookieImpl("cookieName", "cookieValue");
+            cookie.getValue();
+            rc.response().end();
+        });
+        router.route("/iast/propagation/headers").handler(rc -> {
+            rc.request().headers();
+            rc.response().end();
+        });
+        router.route("/iast/propagation/params").handler(rc -> {
+            rc.request().params();
+            rc.response().end();
+        });
+        router.route("/iast/propagation/formAttributes")
+                .handler(rc -> rc.response().end(rc.request().formAttributes().get("formAttribute")));
+        router.route("/iast/propagation/handleData").handler(rc -> rc.response().end(rc.getBodyAsString()));
 
-    vertx
-        .createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
-        .requestHandler(router::accept)
-        .listen(
-            port,
-            http -> {
-              if (http.succeeded()) {
-                startPromise.complete();
-                System.out.println("HTTP server started");
-              } else {
-                startPromise.fail(http.cause());
-              }
-            });
-  }
+        vertx.createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
+                .requestHandler(router::accept)
+                .listen(port, http -> {
+                    if (http.succeeded()) {
+                        startPromise.complete();
+                        System.out.println("HTTP server started");
+                    } else {
+                        startPromise.fail(http.cause());
+                    }
+                });
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/RouteHandlerExceptionHandlerTest.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/RouteHandlerExceptionHandlerTest.java
index 3892646adcf..f54236e7021 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/RouteHandlerExceptionHandlerTest.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/RouteHandlerExceptionHandlerTest.java
@@ -34,93 +34,80 @@
  */
 class RouteHandlerExceptionHandlerTest extends AbstractInstrumentationTest {
 
-  private static Vertx vertx;
-  private static HttpServer server;
-  private static int port;
+    private static Vertx vertx;
+    private static HttpServer server;
+    private static int port;
 
-  @BeforeAll
-  static void startServer() throws Exception {
-    try (ServerSocket socket = new ServerSocket(0)) {
-      port = socket.getLocalPort();
-    }
+    @BeforeAll
+    static void startServer() throws Exception {
+        try (ServerSocket socket = new ServerSocket(0)) {
+            port = socket.getLocalPort();
+        }
 
-    vertx = Vertx.vertx();
-    Router router = Router.router(vertx);
-    router
-        .route("/fail")
-        .handler(
-            ctx -> {
-              ResponseExceptionFiringHelper.fireException(
-                  ctx.response(), new IOException("simulated response I/O failure"));
-              try {
+        vertx = Vertx.vertx();
+        Router router = Router.router(vertx);
+        router.route("/fail").handler(ctx -> {
+            ResponseExceptionFiringHelper.fireException(
+                    ctx.response(), new IOException("simulated response I/O failure"));
+            try {
                 ctx.response().setStatusCode(500).end("error");
-              } catch (IllegalStateException ignore) {
+            } catch (IllegalStateException ignore) {
                 // handleException may have left the response in a state where end() is rejected;
                 // the span is already finished by our registered exception handler.
-              }
-            });
+            }
+        });
 
-    CountDownLatch ready = new CountDownLatch(1);
-    server =
-        vertx
-            .createHttpServer()
-            .requestHandler(router::accept)
-            .listen(
-                port,
-                result -> {
-                  if (result.failed()) {
-                    throw new RuntimeException("Failed to start Vert.x server", result.cause());
-                  }
-                  ready.countDown();
-                });
-    if (!ready.await(10, TimeUnit.SECONDS)) {
-      throw new IllegalStateException("Vert.x server did not start in time");
+        CountDownLatch ready = new CountDownLatch(1);
+        server = vertx.createHttpServer().requestHandler(router::accept).listen(port, result -> {
+            if (result.failed()) {
+                throw new RuntimeException("Failed to start Vert.x server", result.cause());
+            }
+            ready.countDown();
+        });
+        if (!ready.await(10, TimeUnit.SECONDS)) {
+            throw new IllegalStateException("Vert.x server did not start in time");
+        }
     }
-  }
 
-  @AfterAll
-  static void stopServer() throws Exception {
-    if (server != null) {
-      CountDownLatch closed = new CountDownLatch(1);
-      server.close(ar -> closed.countDown());
-      closed.await(10, TimeUnit.SECONDS);
-    }
-    if (vertx != null) {
-      CountDownLatch closed = new CountDownLatch(1);
-      vertx.close(ar -> closed.countDown());
-      closed.await(10, TimeUnit.SECONDS);
+    @AfterAll
+    static void stopServer() throws Exception {
+        if (server != null) {
+            CountDownLatch closed = new CountDownLatch(1);
+            server.close(ar -> closed.countDown());
+            closed.await(10, TimeUnit.SECONDS);
+        }
+        if (vertx != null) {
+            CountDownLatch closed = new CountDownLatch(1);
+            vertx.close(ar -> closed.countDown());
+            closed.await(10, TimeUnit.SECONDS);
+        }
     }
-  }
 
-  @Test
-  void exceptionHandlerFinishesRouteHandlerSpan() throws Exception {
-    HttpURLConnection conn =
-        (HttpURLConnection) new URL("http://localhost:" + port + "/fail").openConnection();
-    conn.setRequestMethod("GET");
-    conn.setConnectTimeout(5000);
-    conn.setReadTimeout(5000);
-    try {
-      // We don't care about the response code or body — only that the trace flushes.
-      conn.getResponseCode();
-    } catch (IOException ignore) {
-      // If end() was rejected after handleException, the client may see a closed connection.
-    } finally {
-      conn.disconnect();
-    }
+    @Test
+    void exceptionHandlerFinishesRouteHandlerSpan() throws Exception {
+        HttpURLConnection conn = (HttpURLConnection) new URL("http://localhost:" + port + "/fail").openConnection();
+        conn.setRequestMethod("GET");
+        conn.setConnectTimeout(5000);
+        conn.setReadTimeout(5000);
+        try {
+            // We don't care about the response code or body — only that the trace flushes.
+            conn.getResponseCode();
+        } catch (IOException ignore) {
+            // If end() was rejected after handleException, the client may see a closed connection.
+        } finally {
+            conn.disconnect();
+        }
 
-    // The netty.request span is marked as errored because the route handler ends with
-    // HTTP 500; the route-handler span is finished by our exception handler before
-    // setStatusCode(500), so it sees status=200 (default) and is not errored.
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span()
-                .operationName(Pattern.compile(Pattern.quote("netty.request")))
-                .type(DDSpanTypes.HTTP_SERVER)
-                .error(),
-            span()
-                .childOfPrevious()
-                .operationName(Pattern.compile(Pattern.quote("vertx.route-handler")))
-                .type(DDSpanTypes.HTTP_SERVER)));
-  }
+        // The netty.request span is marked as errored because the route handler ends with
+        // HTTP 500; the route-handler span is finished by our exception handler before
+        // setStatusCode(500), so it sees status=200 (default) and is not errored.
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().operationName(Pattern.compile(Pattern.quote("netty.request")))
+                        .type(DDSpanTypes.HTTP_SERVER)
+                        .error(),
+                span().childOfPrevious()
+                        .operationName(Pattern.compile(Pattern.quote("vertx.route-handler")))
+                        .type(DDSpanTypes.HTTP_SERVER)));
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/RouteHandlerSendFileTest.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/RouteHandlerSendFileTest.java
index 06102063a1b..7cbb38dba17 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/RouteHandlerSendFileTest.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/RouteHandlerSendFileTest.java
@@ -37,86 +37,75 @@
  */
 class RouteHandlerSendFileTest extends AbstractInstrumentationTest {
 
-  private static Vertx vertx;
-  private static HttpServer server;
-  private static int port;
-  private static Path payload;
+    private static Vertx vertx;
+    private static HttpServer server;
+    private static int port;
+    private static Path payload;
 
-  @BeforeAll
-  static void startServer() throws Exception {
-    payload = Files.createTempFile("vertx-sendfile-", ".txt");
-    Files.write(payload, "vertx sendFile payload\n".getBytes(StandardCharsets.UTF_8));
-    payload.toFile().deleteOnExit();
+    @BeforeAll
+    static void startServer() throws Exception {
+        payload = Files.createTempFile("vertx-sendfile-", ".txt");
+        Files.write(payload, "vertx sendFile payload\n".getBytes(StandardCharsets.UTF_8));
+        payload.toFile().deleteOnExit();
 
-    try (ServerSocket socket = new ServerSocket(0)) {
-      port = socket.getLocalPort();
-    }
+        try (ServerSocket socket = new ServerSocket(0)) {
+            port = socket.getLocalPort();
+        }
 
-    vertx = Vertx.vertx();
-    Router router = Router.router(vertx);
-    router
-        .route("/sendfile")
-        .handler(ctx -> ctx.response().sendFile(payload.toAbsolutePath().toString()));
+        vertx = Vertx.vertx();
+        Router router = Router.router(vertx);
+        router.route("/sendfile")
+                .handler(ctx -> ctx.response().sendFile(payload.toAbsolutePath().toString()));
 
-    CountDownLatch ready = new CountDownLatch(1);
-    server =
-        vertx
-            .createHttpServer()
-            .requestHandler(router::accept)
-            .listen(
-                port,
-                result -> {
-                  if (result.failed()) {
-                    throw new RuntimeException("Failed to start Vert.x server", result.cause());
-                  }
-                  ready.countDown();
-                });
-    if (!ready.await(10, TimeUnit.SECONDS)) {
-      throw new IllegalStateException("Vert.x server did not start in time");
+        CountDownLatch ready = new CountDownLatch(1);
+        server = vertx.createHttpServer().requestHandler(router::accept).listen(port, result -> {
+            if (result.failed()) {
+                throw new RuntimeException("Failed to start Vert.x server", result.cause());
+            }
+            ready.countDown();
+        });
+        if (!ready.await(10, TimeUnit.SECONDS)) {
+            throw new IllegalStateException("Vert.x server did not start in time");
+        }
     }
-  }
 
-  @AfterAll
-  static void stopServer() throws Exception {
-    if (server != null) {
-      CountDownLatch closed = new CountDownLatch(1);
-      server.close(ar -> closed.countDown());
-      closed.await(10, TimeUnit.SECONDS);
-    }
-    if (vertx != null) {
-      CountDownLatch closed = new CountDownLatch(1);
-      vertx.close(ar -> closed.countDown());
-      closed.await(10, TimeUnit.SECONDS);
-    }
-    if (payload != null) {
-      Files.deleteIfExists(payload);
+    @AfterAll
+    static void stopServer() throws Exception {
+        if (server != null) {
+            CountDownLatch closed = new CountDownLatch(1);
+            server.close(ar -> closed.countDown());
+            closed.await(10, TimeUnit.SECONDS);
+        }
+        if (vertx != null) {
+            CountDownLatch closed = new CountDownLatch(1);
+            vertx.close(ar -> closed.countDown());
+            closed.await(10, TimeUnit.SECONDS);
+        }
+        if (payload != null) {
+            Files.deleteIfExists(payload);
+        }
     }
-  }
 
-  @Test
-  void sendFileFinishesRouteHandlerSpan() throws Exception {
-    HttpURLConnection conn =
-        (HttpURLConnection) new URL("http://localhost:" + port + "/sendfile").openConnection();
-    conn.setRequestMethod("GET");
-    conn.setConnectTimeout(5000);
-    conn.setReadTimeout(5000);
-    assertEquals(200, conn.getResponseCode());
-    try (BufferedReader reader =
-        new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
-      assertEquals("vertx sendFile payload", reader.readLine());
-    }
+    @Test
+    void sendFileFinishesRouteHandlerSpan() throws Exception {
+        HttpURLConnection conn = (HttpURLConnection) new URL("http://localhost:" + port + "/sendfile").openConnection();
+        conn.setRequestMethod("GET");
+        conn.setConnectTimeout(5000);
+        conn.setReadTimeout(5000);
+        assertEquals(200, conn.getResponseCode());
+        try (BufferedReader reader =
+                new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
+            assertEquals("vertx sendFile payload", reader.readLine());
+        }
 
-    // Pre-fix: the route-handler span never finishes on the sendFile path, so the trace
-    // is never published and assertTraces times out waiting for the trace to flush.
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span()
-                .operationName(Pattern.compile(Pattern.quote("netty.request")))
-                .type(DDSpanTypes.HTTP_SERVER),
-            span()
-                .childOfPrevious()
-                .operationName(Pattern.compile(Pattern.quote("vertx.route-handler")))
-                .type(DDSpanTypes.HTTP_SERVER)));
-  }
+        // Pre-fix: the route-handler span never finishes on the sendFile path, so the trace
+        // is never published and assertTraces times out waiting for the trace to flush.
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().operationName(Pattern.compile(Pattern.quote("netty.request")))
+                        .type(DDSpanTypes.HTTP_SERVER),
+                span().childOfPrevious()
+                        .operationName(Pattern.compile(Pattern.quote("vertx.route-handler")))
+                        .type(DDSpanTypes.HTTP_SERVER)));
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/VertxMiddlewareTestServer.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/VertxMiddlewareTestServer.java
index e77f1b6fb65..f2ac240d749 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/VertxMiddlewareTestServer.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/VertxMiddlewareTestServer.java
@@ -5,13 +5,13 @@
 import io.vertx.ext.web.RoutingContext;
 
 public class VertxMiddlewareTestServer extends VertxTestServer {
-  @Override
-  protected void customizeBeforeRoutes(Router router) {
-    router.route().handler(VertxMiddlewareTestServer::firstHandler);
-  }
+    @Override
+    protected void customizeBeforeRoutes(Router router) {
+        router.route().handler(VertxMiddlewareTestServer::firstHandler);
+    }
 
-  private static void firstHandler(final RoutingContext ctx) {
-    AgentTracer.activeSpan().setTag("before", true);
-    ctx.next();
-  }
+    private static void firstHandler(final RoutingContext ctx) {
+        AgentTracer.activeSpan().setTag("before", true);
+        ctx.next();
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/VertxSubrouterTestServer.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/VertxSubrouterTestServer.java
index 27060432e7e..668aab475b0 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/VertxSubrouterTestServer.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/VertxSubrouterTestServer.java
@@ -3,10 +3,10 @@
 import io.vertx.ext.web.Router;
 
 public class VertxSubrouterTestServer extends VertxTestServer {
-  @Override
-  protected Router customizeAfterRoutes(Router configured) {
-    Router router = Router.router(vertx);
-    router.mountSubRouter("/sub/", configured);
-    return router;
-  }
+    @Override
+    protected Router customizeAfterRoutes(Router configured) {
+        Router router = Router.router(vertx);
+        router.mountSubRouter("/sub/", configured);
+        return router;
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/VertxTestServer.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/VertxTestServer.java
index 0110d1268da..c510fa22c99 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/VertxTestServer.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/VertxTestServer.java
@@ -37,228 +37,161 @@
 import io.vertx.ext.web.sstore.LocalSessionStore;
 
 public class VertxTestServer extends AbstractVerticle {
-  public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port";
+    public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port";
 
-  @Override
-  public void start(final Future<Void> startFuture) {
-    final int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
-    Router router = Router.router(vertx);
+    @Override
+    public void start(final Future<Void> startFuture) {
+        final int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
+        Router router = Router.router(vertx);
 
-    customizeBeforeRoutes(router);
+        customizeBeforeRoutes(router);
 
-    router
-        .route(SUCCESS.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    SUCCESS,
-                    () ->
-                        ctx.response().setStatusCode(SUCCESS.getStatus()).end(SUCCESS.getBody())));
-    router
-        .route(FORWARDED.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    FORWARDED,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(FORWARDED.getStatus())
-                            .end(ctx.request().getHeader("x-forwarded-for"))));
-    router
-        .route(CREATED.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    CREATED,
-                    () ->
-                        ctx.request()
-                            .bodyHandler(
-                                body ->
-                                    ctx.response()
+        router.route(SUCCESS.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        SUCCESS,
+                        () -> ctx.response().setStatusCode(SUCCESS.getStatus()).end(SUCCESS.getBody())));
+        router.route(FORWARDED.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        FORWARDED,
+                        () -> ctx.response()
+                                .setStatusCode(FORWARDED.getStatus())
+                                .end(ctx.request().getHeader("x-forwarded-for"))));
+        router.route(CREATED.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        CREATED,
+                        () -> ctx.request()
+                                .bodyHandler(body -> ctx.response()
                                         .setStatusCode(CREATED.getStatus())
                                         .end(CREATED.getBody() + ": " + body.toString()))));
-    router.route(BODY_URLENCODED.getPath()).handler(BodyHandler.create());
-    router
-        .route(BODY_URLENCODED.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    BODY_URLENCODED,
-                    () -> {
-                      String res = convertFormAttributes(ctx);
-                      ctx.response().setStatusCode(BODY_URLENCODED.getStatus()).end(res);
-                    }));
-    router.route(BODY_MULTIPART.getPath()).handler(BodyHandler.create());
-    router
-        .route(BODY_MULTIPART.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    BODY_MULTIPART,
-                    () -> {
-                      ctx.fileUploads();
-                      String res = convertFormAttributes(ctx);
-                      ctx.response().setStatusCode(BODY_MULTIPART.getStatus()).end(res);
-                    }));
-    router.route(BODY_JSON.getPath()).handler(BodyHandler.create());
-    router
-        .route(BODY_JSON.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    BODY_JSON,
-                    () -> {
-                      JsonObject json = ctx.getBodyAsJson();
-                      ctx.response().setStatusCode(BODY_JSON.getStatus()).end(json.toString());
-                    }));
-    router
-        .route(QUERY_ENCODED_BOTH.getRawPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    QUERY_ENCODED_BOTH,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(QUERY_ENCODED_BOTH.getStatus())
-                            .end(QUERY_ENCODED_BOTH.bodyForQuery(ctx.request().query()))));
-    router
-        .route(QUERY_ENCODED_QUERY.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    QUERY_ENCODED_QUERY,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(QUERY_ENCODED_QUERY.getStatus())
-                            .end(QUERY_ENCODED_QUERY.bodyForQuery(ctx.request().query()))));
-    router
-        .route(QUERY_PARAM.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    QUERY_PARAM,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(QUERY_PARAM.getStatus())
-                            .end(ctx.request().query())));
-    router
-        .route(USER_BLOCK.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    USER_BLOCK,
-                    () -> {
-                      Blocking.forUser("user-to-block").blockIfMatch();
-                      ctx.response().end("Should not be reached");
-                    }));
-    router
-        .route("/path/:id/param")
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    PATH_PARAM,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(PATH_PARAM.getStatus())
-                            .end(ctx.request().getParam("id"))));
-    router
-        .route(REDIRECT.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    REDIRECT,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(REDIRECT.getStatus())
-                            .putHeader("location", REDIRECT.getBody())
-                            .end()));
-    router
-        .route(ERROR.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    ERROR,
-                    () -> ctx.response().setStatusCode(ERROR.getStatus()).end(ERROR.getBody())));
-    router
-        .route(EXCEPTION.getPath())
-        .handler(ctx -> controller(ctx, EXCEPTION, VertxTestServer::exception));
+        router.route(BODY_URLENCODED.getPath()).handler(BodyHandler.create());
+        router.route(BODY_URLENCODED.getPath())
+                .handler(ctx -> controller(ctx, BODY_URLENCODED, () -> {
+                    String res = convertFormAttributes(ctx);
+                    ctx.response().setStatusCode(BODY_URLENCODED.getStatus()).end(res);
+                }));
+        router.route(BODY_MULTIPART.getPath()).handler(BodyHandler.create());
+        router.route(BODY_MULTIPART.getPath())
+                .handler(ctx -> controller(ctx, BODY_MULTIPART, () -> {
+                    ctx.fileUploads();
+                    String res = convertFormAttributes(ctx);
+                    ctx.response().setStatusCode(BODY_MULTIPART.getStatus()).end(res);
+                }));
+        router.route(BODY_JSON.getPath()).handler(BodyHandler.create());
+        router.route(BODY_JSON.getPath())
+                .handler(ctx -> controller(ctx, BODY_JSON, () -> {
+                    JsonObject json = ctx.getBodyAsJson();
+                    ctx.response().setStatusCode(BODY_JSON.getStatus()).end(json.toString());
+                }));
+        router.route(QUERY_ENCODED_BOTH.getRawPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        QUERY_ENCODED_BOTH,
+                        () -> ctx.response()
+                                .setStatusCode(QUERY_ENCODED_BOTH.getStatus())
+                                .end(QUERY_ENCODED_BOTH.bodyForQuery(
+                                        ctx.request().query()))));
+        router.route(QUERY_ENCODED_QUERY.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        QUERY_ENCODED_QUERY,
+                        () -> ctx.response()
+                                .setStatusCode(QUERY_ENCODED_QUERY.getStatus())
+                                .end(QUERY_ENCODED_QUERY.bodyForQuery(
+                                        ctx.request().query()))));
+        router.route(QUERY_PARAM.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        QUERY_PARAM,
+                        () -> ctx.response()
+                                .setStatusCode(QUERY_PARAM.getStatus())
+                                .end(ctx.request().query())));
+        router.route(USER_BLOCK.getPath())
+                .handler(ctx -> controller(ctx, USER_BLOCK, () -> {
+                    Blocking.forUser("user-to-block").blockIfMatch();
+                    ctx.response().end("Should not be reached");
+                }));
+        router.route("/path/:id/param")
+                .handler(ctx -> controller(
+                        ctx,
+                        PATH_PARAM,
+                        () -> ctx.response()
+                                .setStatusCode(PATH_PARAM.getStatus())
+                                .end(ctx.request().getParam("id"))));
+        router.route(REDIRECT.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        REDIRECT,
+                        () -> ctx.response()
+                                .setStatusCode(REDIRECT.getStatus())
+                                .putHeader("location", REDIRECT.getBody())
+                                .end()));
+        router.route(ERROR.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        ERROR,
+                        () -> ctx.response().setStatusCode(ERROR.getStatus()).end(ERROR.getBody())));
+        router.route(EXCEPTION.getPath()).handler(ctx -> controller(ctx, EXCEPTION, VertxTestServer::exception));
 
-    router.route(SESSION_ID.getPath()).handler(CookieHandler.create());
-    router
-        .route(SESSION_ID.getPath())
-        .handler(SessionHandler.create(LocalSessionStore.create(vertx)));
-    router
-        .route(SESSION_ID.getPath())
-        .handler(
-            ctx -> ctx.response().setStatusCode(SESSION_ID.getStatus()).end(ctx.session().id()));
+        router.route(SESSION_ID.getPath()).handler(CookieHandler.create());
+        router.route(SESSION_ID.getPath()).handler(SessionHandler.create(LocalSessionStore.create(vertx)));
+        router.route(SESSION_ID.getPath())
+                .handler(ctx -> ctx.response()
+                        .setStatusCode(SESSION_ID.getStatus())
+                        .end(ctx.session().id()));
 
-    router = customizeAfterRoutes(router);
+        router = customizeAfterRoutes(router);
 
-    vertx
-        .createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
-        .requestHandler(router::accept)
-        .listen(port, event -> startFuture.complete());
-  }
+        vertx.createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
+                .requestHandler(router::accept)
+                .listen(port, event -> startFuture.complete());
+    }
 
-  private static String convertFormAttributes(RoutingContext ctx) {
-    String res = "[";
-    MultiMap entries = ctx.request().formAttributes();
-    for (String name : entries.names()) {
-      if (name.equals("ignore")) {
-        continue;
-      }
-      if (res.length() > 1) {
-        res += ", ";
-      }
-      res += name;
-      res += ":[";
-      int i = 0;
-      for (String s : entries.getAll(name)) {
-        if (i++ > 0) {
-          res += ", ";
+    private static String convertFormAttributes(RoutingContext ctx) {
+        String res = "[";
+        MultiMap entries = ctx.request().formAttributes();
+        for (String name : entries.names()) {
+            if (name.equals("ignore")) {
+                continue;
+            }
+            if (res.length() > 1) {
+                res += ", ";
+            }
+            res += name;
+            res += ":[";
+            int i = 0;
+            for (String s : entries.getAll(name)) {
+                if (i++ > 0) {
+                    res += ", ";
+                }
+                res += s;
+            }
+            res += ']';
         }
-        res += s;
-      }
-      res += ']';
+        res += ']';
+        return res;
     }
-    res += ']';
-    return res;
-  }
 
-  protected void customizeBeforeRoutes(Router router) {}
+    protected void customizeBeforeRoutes(Router router) {}
 
-  protected Router customizeAfterRoutes(final Router router) {
-    return router;
-  }
+    protected Router customizeAfterRoutes(final Router router) {
+        return router;
+    }
 
-  private static void exception() {
-    throw new RuntimeException(EXCEPTION.getBody());
-  }
+    private static void exception() {
+        throw new RuntimeException(EXCEPTION.getBody());
+    }
 
-  private static void controller(
-      RoutingContext ctx, final ServerEndpoint endpoint, final Runnable runnable) {
-    assert activeSpan() != null : "Controller should have a parent span.";
-    assert isAsyncPropagationEnabled() : "Span should be propagating async.";
-    ctx.response()
-        .putHeader(
-            HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE());
-    if (endpoint == NOT_FOUND || endpoint == UNKNOWN) {
-      runnable.run();
-      return;
+    private static void controller(RoutingContext ctx, final ServerEndpoint endpoint, final Runnable runnable) {
+        assert activeSpan() != null : "Controller should have a parent span.";
+        assert isAsyncPropagationEnabled() : "Span should be propagating async.";
+        ctx.response().putHeader(HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE());
+        if (endpoint == NOT_FOUND || endpoint == UNKNOWN) {
+            runnable.run();
+            return;
+        }
+        runnableUnderTraceAsync("controller", runnable);
     }
-    runnableUnderTraceAsync("controller", runnable);
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/src/main/java/datadog/trace/instrumentation/vertx_3_5/core/VertxHttpHeadersInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/src/main/java/datadog/trace/instrumentation/vertx_3_5/core/VertxHttpHeadersInstrumentation.java
index 538380a2c2f..3952739e743 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/src/main/java/datadog/trace/instrumentation/vertx_3_5/core/VertxHttpHeadersInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/src/main/java/datadog/trace/instrumentation/vertx_3_5/core/VertxHttpHeadersInstrumentation.java
@@ -29,137 +29,133 @@
 
 @AutoService(InstrumenterModule.class)
 public class VertxHttpHeadersInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
 
-  public static final Reference VERTX_HTTP_HEADERS =
-      new Reference.Builder("io.vertx.core.http.impl.headers.VertxHttpHeaders").build();
+    public static final Reference VERTX_HTTP_HEADERS =
+            new Reference.Builder("io.vertx.core.http.impl.headers.VertxHttpHeaders").build();
 
-  private final String className = VertxHttpHeadersInstrumentation.class.getName();
+    private final String className = VertxHttpHeadersInstrumentation.class.getName();
 
-  public VertxHttpHeadersInstrumentation() {
-    super("vertx", "vertx-3.5");
-  }
+    public VertxHttpHeadersInstrumentation() {
+        super("vertx", "vertx-3.5");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {VERTX_HTTP_HEADERS};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {VERTX_HTTP_HEADERS};
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.core.http.impl.headers.VertxHttpHeaders";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.core.http.impl.headers.VertxHttpHeaders";
+    }
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("get"))
-            .and(takesArguments(1).and(takesArgument(0, CharSequence.class))),
-        className + "$GetAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("getAll"))
-            .and(takesArguments(1).and(takesArgument(0, CharSequence.class))),
-        className + "$GetAllAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("entries")).and(takesArguments(0)),
-        className + "$EntriesAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("names")).and(takesArguments(0)),
-        className + "$NamesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("get"))
+                        .and(takesArguments(1).and(takesArgument(0, CharSequence.class))),
+                className + "$GetAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("getAll"))
+                        .and(takesArguments(1).and(takesArgument(0, CharSequence.class))),
+                className + "$GetAllAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("entries")).and(takesArguments(0)), className + "$EntriesAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("names")).and(takesArguments(0)), className + "$NamesAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void afterGet(
-        @Advice.This final Object self,
-        @Advice.Argument(0) final CharSequence name,
-        @Advice.Return final String result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        propagation.taintStringIfTainted(ctx, result, self, SourceTypes.REQUEST_HEADER_VALUE, name);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void afterGet(
+                @Advice.This final Object self,
+                @Advice.Argument(0) final CharSequence name,
+                @Advice.Return final String result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                propagation.taintStringIfTainted(ctx, result, self, SourceTypes.REQUEST_HEADER_VALUE, name);
+            }
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetAllAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void afterGetAll(
-        @Advice.This final Object self,
-        @Advice.Argument(0) final CharSequence name,
-        @Advice.Return final Collection<String> result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null && result != null && !result.isEmpty()) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        if (propagation.isTainted(ctx, self)) {
-          for (final String value : result) {
-            propagation.taintString(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
-          }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetAllAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void afterGetAll(
+                @Advice.This final Object self,
+                @Advice.Argument(0) final CharSequence name,
+                @Advice.Return final Collection<String> result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation != null && result != null && !result.isEmpty()) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                if (propagation.isTainted(ctx, self)) {
+                    for (final String value : result) {
+                        propagation.taintString(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class EntriesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void afterEntries(
-        @Advice.This final Object self,
-        @Advice.Return final List<Map.Entry<String, String>> result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null && result != null && !result.isEmpty()) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        if (propagation.isTainted(ctx, self)) {
-          final Set<String> names = new HashSet<>();
-          for (final Map.Entry<String, String> entry : result) {
-            final String name = entry.getKey();
-            final String value = entry.getValue();
-            if (names.add(name)) {
-              propagation.taintString(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class EntriesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void afterEntries(
+                @Advice.This final Object self,
+                @Advice.Return final List<Map.Entry<String, String>> result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation != null && result != null && !result.isEmpty()) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                if (propagation.isTainted(ctx, self)) {
+                    final Set<String> names = new HashSet<>();
+                    for (final Map.Entry<String, String> entry : result) {
+                        final String name = entry.getKey();
+                        final String value = entry.getValue();
+                        if (names.add(name)) {
+                            propagation.taintString(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
+                        }
+                        propagation.taintString(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
+                    }
+                }
             }
-            propagation.taintString(ctx, value, SourceTypes.REQUEST_HEADER_VALUE, name);
-          }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class NamesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_NAME)
-    public static void afterNames(
-        @Advice.This final Object self,
-        @Advice.Return final Set<String> result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null && result != null && !result.isEmpty()) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        if (propagation.isTainted(ctx, self)) {
-          for (final String name : result) {
-            propagation.taintString(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
-          }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class NamesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_NAME)
+        public static void afterNames(
+                @Advice.This final Object self,
+                @Advice.Return final Set<String> result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation != null && result != null && !result.isEmpty()) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                if (propagation.isTainted(ctx, self)) {
+                    for (final String name : result) {
+                        propagation.taintString(ctx, name, SourceTypes.REQUEST_HEADER_NAME, name);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/src/main/java/datadog/trace/instrumentation/vertx_3_9/Vertx39HttpServertResponseInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/src/main/java/datadog/trace/instrumentation/vertx_3_9/Vertx39HttpServertResponseInstrumentation.java
index 251f46d4123..6b13f21e222 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/src/main/java/datadog/trace/instrumentation/vertx_3_9/Vertx39HttpServertResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/src/main/java/datadog/trace/instrumentation/vertx_3_9/Vertx39HttpServertResponseInstrumentation.java
@@ -19,45 +19,45 @@
 
 @AutoService(InstrumenterModule.class)
 public class Vertx39HttpServertResponseInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public Vertx39HttpServertResponseInstrumentation() {
-    super("vertx", "vertx-3.9", "response");
-  }
-
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("addCookie")
-            .and(takesArgument(0, named("io.vertx.core.http.Cookie")))
-            .and(isPublic()),
-        Vertx39HttpServertResponseInstrumentation.class.getName() + "$InstrumenterAdvice");
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.vertx.core.http.HttpServerResponse";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  protected boolean isOptOutEnabled() {
-    return true;
-  }
-
-  public static class InstrumenterAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Sink(VulnerabilityTypes.RESPONSE_HEADER)
-    public static void onEnter(@Advice.Argument(0) final Cookie cookie) {
-      if (cookie != null) {
-        HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
-        if (mod != null) {
-          mod.onHeader("Set-Cookie", cookie.encode());
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    public Vertx39HttpServertResponseInstrumentation() {
+        super("vertx", "vertx-3.9", "response");
+    }
+
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("addCookie")
+                        .and(takesArgument(0, named("io.vertx.core.http.Cookie")))
+                        .and(isPublic()),
+                Vertx39HttpServertResponseInstrumentation.class.getName() + "$InstrumenterAdvice");
+    }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.vertx.core.http.HttpServerResponse";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    protected boolean isOptOutEnabled() {
+        return true;
+    }
+
+    public static class InstrumenterAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Sink(VulnerabilityTypes.RESPONSE_HEADER)
+        public static void onEnter(@Advice.Argument(0) final Cookie cookie) {
+            if (cookie != null) {
+                HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
+                if (mod != null) {
+                    mod.onHeader("Set-Cookie", cookie.encode());
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/src/test/java/server/IastVertx39TestVerticle.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/src/test/java/server/IastVertx39TestVerticle.java
index 5893f99f871..03dd5f98380 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/src/test/java/server/IastVertx39TestVerticle.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/src/test/java/server/IastVertx39TestVerticle.java
@@ -32,234 +32,162 @@
 import io.vertx.ext.web.handler.BodyHandler;
 
 public class IastVertx39TestVerticle extends AbstractVerticle {
-  public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port";
+    public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port";
 
-  @Override
-  public void start(final Future<Void> startFuture) {
-    final int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
-    Router router = Router.router(vertx);
+    @Override
+    public void start(final Future<Void> startFuture) {
+        final int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
+        Router router = Router.router(vertx);
 
-    customizeBeforeRoutes(router);
-    router
-        .route("/vulnerability/setHeaderString")
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    SUCCESS,
-                    () -> {
-                      final String headerName = ctx.request().getParam("name");
-                      final String headerValue = ctx.request().getParam("value");
-                      ctx.response()
-                          .setStatusCode(SUCCESS.getStatus())
-                          .putHeader(headerName, headerValue)
-                          .end(SUCCESS.getBody());
-                    }));
-    router
-        .route("/iast/vulnerabilities/insecureCookie")
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    SUCCESS,
-                    () -> {
-                      final String headerName = ctx.request().getParam("name");
-                      final String headerValue = ctx.request().getParam("value");
-                      Cookie cookie = Cookie.cookie(headerName, headerValue);
-                      if ("true".equals(ctx.request().getParam("secure"))) {
+        customizeBeforeRoutes(router);
+        router.route("/vulnerability/setHeaderString")
+                .handler(ctx -> controller(ctx, SUCCESS, () -> {
+                    final String headerName = ctx.request().getParam("name");
+                    final String headerValue = ctx.request().getParam("value");
+                    ctx.response()
+                            .setStatusCode(SUCCESS.getStatus())
+                            .putHeader(headerName, headerValue)
+                            .end(SUCCESS.getBody());
+                }));
+        router.route("/iast/vulnerabilities/insecureCookie")
+                .handler(ctx -> controller(ctx, SUCCESS, () -> {
+                    final String headerName = ctx.request().getParam("name");
+                    final String headerValue = ctx.request().getParam("value");
+                    Cookie cookie = Cookie.cookie(headerName, headerValue);
+                    if ("true".equals(ctx.request().getParam("secure"))) {
                         cookie.setSecure(true);
-                      }
-                      ctx.response()
-                          .setStatusCode(SUCCESS.getStatus())
-                          .addCookie(cookie)
-                          .end("Cookie Set");
-                    }));
-    router
-        .route(SUCCESS.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    SUCCESS,
-                    () ->
-                        ctx.response().setStatusCode(SUCCESS.getStatus()).end(SUCCESS.getBody())));
-    router
-        .route(FORWARDED.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    FORWARDED,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(FORWARDED.getStatus())
-                            .end(ctx.request().getHeader("x-forwarded-for"))));
-    router
-        .route(CREATED.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    CREATED,
-                    () ->
-                        ctx.request()
-                            .bodyHandler(
-                                body ->
-                                    ctx.response()
+                    }
+                    ctx.response()
+                            .setStatusCode(SUCCESS.getStatus())
+                            .addCookie(cookie)
+                            .end("Cookie Set");
+                }));
+        router.route(SUCCESS.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        SUCCESS,
+                        () -> ctx.response().setStatusCode(SUCCESS.getStatus()).end(SUCCESS.getBody())));
+        router.route(FORWARDED.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        FORWARDED,
+                        () -> ctx.response()
+                                .setStatusCode(FORWARDED.getStatus())
+                                .end(ctx.request().getHeader("x-forwarded-for"))));
+        router.route(CREATED.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        CREATED,
+                        () -> ctx.request()
+                                .bodyHandler(body -> ctx.response()
                                         .setStatusCode(CREATED.getStatus())
                                         .end(CREATED.getBody() + ": " + body.toString()))));
-    router.route(BODY_URLENCODED.getPath()).handler(BodyHandler.create());
-    router
-        .route(BODY_URLENCODED.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    BODY_URLENCODED,
-                    () -> {
-                      String res = "[";
-                      MultiMap entries = ctx.request().formAttributes();
-                      for (String name : entries.names()) {
+        router.route(BODY_URLENCODED.getPath()).handler(BodyHandler.create());
+        router.route(BODY_URLENCODED.getPath())
+                .handler(ctx -> controller(ctx, BODY_URLENCODED, () -> {
+                    String res = "[";
+                    MultiMap entries = ctx.request().formAttributes();
+                    for (String name : entries.names()) {
                         if (name.equals("ignore")) {
-                          continue;
+                            continue;
                         }
                         if (res.length() > 1) {
-                          res += ", ";
+                            res += ", ";
                         }
                         res += name;
                         res += ":[";
                         int i = 0;
                         for (String s : entries.getAll(name)) {
-                          if (i++ > 0) {
-                            res += ", ";
-                          }
-                          res += s;
+                            if (i++ > 0) {
+                                res += ", ";
+                            }
+                            res += s;
                         }
                         res += ']';
-                      }
-                      res += ']';
-                      ctx.response().setStatusCode(BODY_URLENCODED.getStatus()).end(res);
-                    }));
-    router.route(BODY_JSON.getPath()).handler(BodyHandler.create());
-    router
-        .route(BODY_JSON.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    BODY_JSON,
-                    () -> {
-                      JsonObject json = ctx.getBodyAsJson();
-                      ctx.response().setStatusCode(BODY_JSON.getStatus()).end(json.toString());
-                    }));
-    router
-        .route(QUERY_ENCODED_BOTH.getRawPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    QUERY_ENCODED_BOTH,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(QUERY_ENCODED_BOTH.getStatus())
-                            .end(QUERY_ENCODED_BOTH.bodyForQuery(ctx.request().query()))));
-    router
-        .route(QUERY_ENCODED_QUERY.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    QUERY_ENCODED_QUERY,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(QUERY_ENCODED_QUERY.getStatus())
-                            .end(QUERY_ENCODED_QUERY.bodyForQuery(ctx.request().query()))));
-    router
-        .route(QUERY_PARAM.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    QUERY_PARAM,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(QUERY_PARAM.getStatus())
-                            .end(ctx.request().query())));
-    router
-        .route(USER_BLOCK.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    USER_BLOCK,
-                    () -> {
-                      Blocking.forUser("user-to-block").blockIfMatch();
-                      ctx.response().end("Should not be reached");
-                    }));
-    router
-        .route("/path/:id/param")
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    PATH_PARAM,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(PATH_PARAM.getStatus())
-                            .end(ctx.request().getParam("id"))));
-    router
-        .route(REDIRECT.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    REDIRECT,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(REDIRECT.getStatus())
-                            .putHeader("location", REDIRECT.getBody())
-                            .end()));
-    router
-        .route(ERROR.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    ERROR,
-                    () -> ctx.response().setStatusCode(ERROR.getStatus()).end(ERROR.getBody())));
-    router
-        .route(EXCEPTION.getPath())
-        .handler(ctx -> controller(ctx, EXCEPTION, IastVertx39TestVerticle::exception));
+                    }
+                    res += ']';
+                    ctx.response().setStatusCode(BODY_URLENCODED.getStatus()).end(res);
+                }));
+        router.route(BODY_JSON.getPath()).handler(BodyHandler.create());
+        router.route(BODY_JSON.getPath())
+                .handler(ctx -> controller(ctx, BODY_JSON, () -> {
+                    JsonObject json = ctx.getBodyAsJson();
+                    ctx.response().setStatusCode(BODY_JSON.getStatus()).end(json.toString());
+                }));
+        router.route(QUERY_ENCODED_BOTH.getRawPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        QUERY_ENCODED_BOTH,
+                        () -> ctx.response()
+                                .setStatusCode(QUERY_ENCODED_BOTH.getStatus())
+                                .end(QUERY_ENCODED_BOTH.bodyForQuery(
+                                        ctx.request().query()))));
+        router.route(QUERY_ENCODED_QUERY.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        QUERY_ENCODED_QUERY,
+                        () -> ctx.response()
+                                .setStatusCode(QUERY_ENCODED_QUERY.getStatus())
+                                .end(QUERY_ENCODED_QUERY.bodyForQuery(
+                                        ctx.request().query()))));
+        router.route(QUERY_PARAM.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        QUERY_PARAM,
+                        () -> ctx.response()
+                                .setStatusCode(QUERY_PARAM.getStatus())
+                                .end(ctx.request().query())));
+        router.route(USER_BLOCK.getPath())
+                .handler(ctx -> controller(ctx, USER_BLOCK, () -> {
+                    Blocking.forUser("user-to-block").blockIfMatch();
+                    ctx.response().end("Should not be reached");
+                }));
+        router.route("/path/:id/param")
+                .handler(ctx -> controller(
+                        ctx,
+                        PATH_PARAM,
+                        () -> ctx.response()
+                                .setStatusCode(PATH_PARAM.getStatus())
+                                .end(ctx.request().getParam("id"))));
+        router.route(REDIRECT.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        REDIRECT,
+                        () -> ctx.response()
+                                .setStatusCode(REDIRECT.getStatus())
+                                .putHeader("location", REDIRECT.getBody())
+                                .end()));
+        router.route(ERROR.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        ERROR,
+                        () -> ctx.response().setStatusCode(ERROR.getStatus()).end(ERROR.getBody())));
+        router.route(EXCEPTION.getPath())
+                .handler(ctx -> controller(ctx, EXCEPTION, IastVertx39TestVerticle::exception));
 
-    router = customizeAfterRoutes(router);
+        router = customizeAfterRoutes(router);
 
-    vertx
-        .createHttpServer()
-        .requestHandler(router::accept)
-        .listen(port, event -> startFuture.complete());
-  }
+        vertx.createHttpServer().requestHandler(router::accept).listen(port, event -> startFuture.complete());
+    }
 
-  protected void customizeBeforeRoutes(Router router) {}
+    protected void customizeBeforeRoutes(Router router) {}
 
-  protected Router customizeAfterRoutes(final Router router) {
-    return router;
-  }
+    protected Router customizeAfterRoutes(final Router router) {
+        return router;
+    }
 
-  private static void exception() {
-    throw new RuntimeException(EXCEPTION.getBody());
-  }
+    private static void exception() {
+        throw new RuntimeException(EXCEPTION.getBody());
+    }
 
-  private static void controller(
-      RoutingContext ctx, final ServerEndpoint endpoint, final Runnable runnable) {
-    assert activeSpan() != null : "Controller should have a parent span.";
-    assert isAsyncPropagationEnabled() : "Span should be propagating async.";
-    ctx.response()
-        .putHeader(
-            HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE());
-    if (endpoint == NOT_FOUND || endpoint == UNKNOWN) {
-      runnable.run();
-      return;
+    private static void controller(RoutingContext ctx, final ServerEndpoint endpoint, final Runnable runnable) {
+        assert activeSpan() != null : "Controller should have a parent span.";
+        assert isAsyncPropagationEnabled() : "Span should be propagating async.";
+        ctx.response().putHeader(HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE());
+        if (endpoint == NOT_FOUND || endpoint == UNKNOWN) {
+            runnable.run();
+            return;
+        }
+        runnableUnderTraceAsync("controller", runnable);
     }
-    runnableUnderTraceAsync("controller", runnable);
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/IastSinksVerticle.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/IastSinksVerticle.java
index a518d274e99..777df43a28c 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/IastSinksVerticle.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/IastSinksVerticle.java
@@ -10,52 +10,38 @@
 
 public class IastSinksVerticle extends AbstractVerticle {
 
-  @Override
-  public void start(final Promise<Void> startPromise) throws Exception {
-    final Router router = Router.router(vertx);
-    router.route().handler(BodyHandler.create());
-    router
-        .route("/iast/sinks/reroute1")
-        .handler(
-            rc -> {
-              final String path = rc.request().getParam("path");
-              rc.reroute(path);
-            });
-    router
-        .route("/iast/sinks/reroute2")
-        .handler(
-            rc -> {
-              final String path = rc.request().getParam("path");
-              rc.reroute(HttpMethod.GET, path);
-            });
-    router
-        .route("/iast/sinks/redirectheader")
-        .handler(
-            rc -> {
-              final String name = rc.request().getParam("name");
-              final String value = rc.request().getParam("value");
-              rc.response().putHeader(name, value).end();
-            });
+    @Override
+    public void start(final Promise<Void> startPromise) throws Exception {
+        final Router router = Router.router(vertx);
+        router.route().handler(BodyHandler.create());
+        router.route("/iast/sinks/reroute1").handler(rc -> {
+            final String path = rc.request().getParam("path");
+            rc.reroute(path);
+        });
+        router.route("/iast/sinks/reroute2").handler(rc -> {
+            final String path = rc.request().getParam("path");
+            rc.reroute(HttpMethod.GET, path);
+        });
+        router.route("/iast/sinks/redirectheader").handler(rc -> {
+            final String name = rc.request().getParam("name");
+            final String value = rc.request().getParam("value");
+            rc.response().putHeader(name, value).end();
+        });
 
-    final EventBus eventBus = vertx.eventBus();
-    final HttpServerOptions serverOptions = new HttpServerOptions();
-    serverOptions.setHandle100ContinueAutomatically(true);
-    vertx
-        .createHttpServer(serverOptions)
-        .requestHandler(router)
-        .listen(0)
-        .onSuccess(
-            server ->
-                eventBus
-                    .request("PORT_DATA", server.actualPort())
-                    .andThen(
-                        ar -> {
-                          if (ar.succeeded()) {
-                            startPromise.complete();
-                          } else {
-                            startPromise.fail(ar.cause());
-                          }
+        final EventBus eventBus = vertx.eventBus();
+        final HttpServerOptions serverOptions = new HttpServerOptions();
+        serverOptions.setHandle100ContinueAutomatically(true);
+        vertx.createHttpServer(serverOptions)
+                .requestHandler(router)
+                .listen(0)
+                .onSuccess(server -> eventBus.request("PORT_DATA", server.actualPort())
+                        .andThen(ar -> {
+                            if (ar.succeeded()) {
+                                startPromise.complete();
+                            } else {
+                                startPromise.fail(ar.cause());
+                            }
                         }))
-        .onFailure(startPromise::fail);
-  }
+                .onFailure(startPromise::fail);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/IastSourcesVerticle.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/IastSourcesVerticle.java
index 35cef8bc955..52b3bae235e 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/IastSourcesVerticle.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/IastSourcesVerticle.java
@@ -17,163 +17,116 @@
 
 public class IastSourcesVerticle extends AbstractVerticle {
 
-  private static final String EVENT_BUS_ENDPOINT = "EVENT_BUS";
+    private static final String EVENT_BUS_ENDPOINT = "EVENT_BUS";
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(IastSourcesVerticle.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(IastSourcesVerticle.class);
 
-  @Override
-  public void start(final Promise<Void> startPromise) throws Exception {
-    final Router router = Router.router(vertx);
-    router.route().handler(BodyHandler.create());
-    router
-        .route("/iast/sources/header")
-        .handler(
-            rc -> {
-              final String value = rc.request().getHeader("name");
-              rc.response().end("Received " + value);
-            });
-    router
-        .route("/iast/sources/headers")
-        .handler(
-            rc -> {
-              final MultiMap value = rc.request().headers();
-              rc.response().end("Received " + value.get("name"));
-            });
-    router
-        .route("/iast/sources/cookie")
-        .handler(
-            rc -> {
-              final Cookie cookie = rc.request().getCookie("name");
-              rc.response().end("Received " + cookie.getName() + " " + cookie.getValue());
-            });
-    router
-        .route("/iast/sources/path/:name")
-        .handler(
-            rc -> {
-              final String value = rc.pathParam("name");
-              rc.response().end("Received " + value);
-            });
-    router
-        .route("/iast/sources/parameter")
-        .handler(
-            rc -> {
-              final String value = rc.request().getParam("name");
-              rc.response().end("Received " + value);
-            });
-    router
-        .route("/iast/sources/parameters")
-        .handler(
-            rc -> {
-              final MultiMap value = rc.request().params();
-              rc.response().end("Received " + value.get("name"));
-            });
-    router
-        .route("/iast/sources/form")
-        .handler(
-            rc -> {
-              final String value = rc.request().getFormAttribute("name");
-              rc.response().end("Received " + value);
-            });
-    router
-        .route("/iast/sources/body/string")
-        .handler(
-            rc -> {
-              final String encoding = rc.request().getParam("encoding");
-              if (encoding != null) {
+    @Override
+    public void start(final Promise<Void> startPromise) throws Exception {
+        final Router router = Router.router(vertx);
+        router.route().handler(BodyHandler.create());
+        router.route("/iast/sources/header").handler(rc -> {
+            final String value = rc.request().getHeader("name");
+            rc.response().end("Received " + value);
+        });
+        router.route("/iast/sources/headers").handler(rc -> {
+            final MultiMap value = rc.request().headers();
+            rc.response().end("Received " + value.get("name"));
+        });
+        router.route("/iast/sources/cookie").handler(rc -> {
+            final Cookie cookie = rc.request().getCookie("name");
+            rc.response().end("Received " + cookie.getName() + " " + cookie.getValue());
+        });
+        router.route("/iast/sources/path/:name").handler(rc -> {
+            final String value = rc.pathParam("name");
+            rc.response().end("Received " + value);
+        });
+        router.route("/iast/sources/parameter").handler(rc -> {
+            final String value = rc.request().getParam("name");
+            rc.response().end("Received " + value);
+        });
+        router.route("/iast/sources/parameters").handler(rc -> {
+            final MultiMap value = rc.request().params();
+            rc.response().end("Received " + value.get("name"));
+        });
+        router.route("/iast/sources/form").handler(rc -> {
+            final String value = rc.request().getFormAttribute("name");
+            rc.response().end("Received " + value);
+        });
+        router.route("/iast/sources/body/string").handler(rc -> {
+            final String encoding = rc.request().getParam("encoding");
+            if (encoding != null) {
                 rc.response().end("Received " + rc.body().asString(encoding));
-              } else {
+            } else {
                 rc.response().end("Received " + rc.body().asString());
-              }
-            });
-    router
-        .route("/iast/sources/body/json")
-        .handler(
-            rc -> {
-              rc.response().end("Received " + rc.body().asJsonObject());
-            });
-    router
-        .route("/body/jsonArray")
-        .handler(
-            rc -> {
-              rc.response().end("Received " + rc.body().asJsonArray());
-            });
+            }
+        });
+        router.route("/iast/sources/body/json").handler(rc -> {
+            rc.response().end("Received " + rc.body().asJsonObject());
+        });
+        router.route("/body/jsonArray").handler(rc -> {
+            rc.response().end("Received " + rc.body().asJsonArray());
+        });
 
-    router
-        .route("/iast/sources/eventBus")
-        .handler(
-            rc -> {
-              final JsonObject target = rc.body().asJsonObject();
-              rc.vertx()
-                  .eventBus()
-                  .request(EVENT_BUS_ENDPOINT, target)
-                  .andThen(
-                      reply -> {
-                        if (reply.succeeded()) {
-                          rc.response().end(reply.result().body().toString());
-                        } else {
-                          rc.fail(reply.cause());
-                        }
-                      });
+        router.route("/iast/sources/eventBus").handler(rc -> {
+            final JsonObject target = rc.body().asJsonObject();
+            rc.vertx().eventBus().request(EVENT_BUS_ENDPOINT, target).andThen(reply -> {
+                if (reply.succeeded()) {
+                    rc.response().end(reply.result().body().toString());
+                } else {
+                    rc.fail(reply.cause());
+                }
             });
-    router
-        .route("/iast/vulnerabilities/insecureCookie")
-        .handler(
-            rc -> {
-              final String cookieName = rc.request().getParam("name");
-              final String cookieValue = rc.request().getParam("value");
-              final String secure = rc.request().getParam("secure");
-              Cookie cookie = Cookie.cookie(cookieName, cookieValue);
-              if ("true".equals(secure)) {
+        });
+        router.route("/iast/vulnerabilities/insecureCookie").handler(rc -> {
+            final String cookieName = rc.request().getParam("name");
+            final String cookieValue = rc.request().getParam("value");
+            final String secure = rc.request().getParam("secure");
+            Cookie cookie = Cookie.cookie(cookieName, cookieValue);
+            if ("true".equals(secure)) {
                 cookie.setSecure(true);
-              }
-              rc.response().addCookie(cookie).end("Cookie Set");
-            });
+            }
+            rc.response().addCookie(cookie).end("Cookie Set");
+        });
 
-    final EventBus eventBus = vertx.eventBus();
-    eventBus.consumer(
-        EVENT_BUS_ENDPOINT,
-        message -> {
-          final JsonObject payload = (JsonObject) message.body();
-          final String name = payload.getString("name");
-          try {
-            final IastContext ctx = IastContext.Provider.get();
-            if (ctx == null) {
-              throw new IllegalStateException("No IAST context present");
+        final EventBus eventBus = vertx.eventBus();
+        eventBus.consumer(EVENT_BUS_ENDPOINT, message -> {
+            final JsonObject payload = (JsonObject) message.body();
+            final String name = payload.getString("name");
+            try {
+                final IastContext ctx = IastContext.Provider.get();
+                if (ctx == null) {
+                    throw new IllegalStateException("No IAST context present");
+                }
+                final TaintedObjects to = ctx.getTaintedObjects();
+                final boolean tainted = to.get(name) != null;
+                message.reply(tainted ? "OK" : "NO_OK");
+            } catch (Throwable e) {
+                LOGGER.error("Failed to handle event bus message", e);
+                message.reply("NO_OK");
             }
-            final TaintedObjects to = ctx.getTaintedObjects();
-            final boolean tainted = to.get(name) != null;
-            message.reply(tainted ? "OK" : "NO_OK");
-          } catch (Throwable e) {
-            LOGGER.error("Failed to handle event bus message", e);
-            message.reply("NO_OK");
-          }
         });
 
-    final HttpServerOptions serverOptions = new HttpServerOptions();
-    if (config().getBoolean("https")) {
-      final SelfSignedCertificate certificate = SelfSignedCertificate.create();
-      serverOptions.setSsl(true);
-      serverOptions.setUseAlpn(true);
-      serverOptions.setTrustOptions(certificate.trustOptions());
-      serverOptions.setKeyCertOptions(certificate.keyCertOptions());
-    }
-    serverOptions.setHandle100ContinueAutomatically(true);
-    vertx
-        .createHttpServer(serverOptions)
-        .requestHandler(router)
-        .listen(0)
-        .onSuccess(
-            server ->
-                eventBus
-                    .request("PORT_DATA", server.actualPort())
-                    .andThen(
-                        ar -> {
-                          if (ar.succeeded()) {
-                            startPromise.complete();
-                          } else {
-                            startPromise.fail(ar.cause());
-                          }
+        final HttpServerOptions serverOptions = new HttpServerOptions();
+        if (config().getBoolean("https")) {
+            final SelfSignedCertificate certificate = SelfSignedCertificate.create();
+            serverOptions.setSsl(true);
+            serverOptions.setUseAlpn(true);
+            serverOptions.setTrustOptions(certificate.trustOptions());
+            serverOptions.setKeyCertOptions(certificate.keyCertOptions());
+        }
+        serverOptions.setHandle100ContinueAutomatically(true);
+        vertx.createHttpServer(serverOptions)
+                .requestHandler(router)
+                .listen(0)
+                .onSuccess(server -> eventBus.request("PORT_DATA", server.actualPort())
+                        .andThen(ar -> {
+                            if (ar.succeeded()) {
+                                startPromise.complete();
+                            } else {
+                                startPromise.fail(ar.cause());
+                            }
                         }))
-        .onFailure(startPromise::fail);
-  }
+                .onFailure(startPromise::fail);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/LocalSessionStoreInstrumentationTest.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/LocalSessionStoreInstrumentationTest.java
index 234fad3221e..f8cc300edaa 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/LocalSessionStoreInstrumentationTest.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/LocalSessionStoreInstrumentationTest.java
@@ -16,45 +16,44 @@
 import org.junit.jupiter.api.Test;
 
 class LocalSessionStoreInstrumentationTest extends AbstractInstrumentationTest {
-  @Test
-  void initializingSessionStoreDoesNotRetainRequest() throws Exception {
-    Vertx vertx = Vertx.vertx();
-    try {
-      AgentSpan parent = startSpan("test", "parent");
-      LocalSessionStore store;
-      try (ContextScope ignored = activateSpan(parent)) {
-        store = LocalSessionStore.create(vertx, "initializing", 60_000);
-      } finally {
-        parent.finish();
-      }
-      try {
-        assertTrue(
-            writer.waitForTracesMax(1, 3), "Session-store timers retained the request trace");
-        assertTraces(trace(span().root().operationName("parent")));
-      } finally {
-        store.close();
-      }
-    } finally {
-      vertx.close().toCompletionStage().toCompletableFuture().get(10, SECONDS);
+    @Test
+    void initializingSessionStoreDoesNotRetainRequest() throws Exception {
+        Vertx vertx = Vertx.vertx();
+        try {
+            AgentSpan parent = startSpan("test", "parent");
+            LocalSessionStore store;
+            try (ContextScope ignored = activateSpan(parent)) {
+                store = LocalSessionStore.create(vertx, "initializing", 60_000);
+            } finally {
+                parent.finish();
+            }
+            try {
+                assertTrue(writer.waitForTracesMax(1, 3), "Session-store timers retained the request trace");
+                assertTraces(trace(span().root().operationName("parent")));
+            } finally {
+                store.close();
+            }
+        } finally {
+            vertx.close().toCompletionStage().toCompletableFuture().get(10, SECONDS);
+        }
     }
-  }
 
-  @Test
-  void rearmingSessionReaperDoesNotRetainRequest() throws Exception {
-    Vertx vertx = Vertx.vertx();
-    LocalSessionStore store = LocalSessionStore.create(vertx, "rearming", 60_000);
-    try {
-      AgentSpan parent = startSpan("test", "parent");
-      try (ContextScope ignored = activateSpan(parent)) {
-        ((LocalSessionStoreImpl) store).handle(0L);
-      } finally {
-        parent.finish();
-      }
-      assertTrue(writer.waitForTracesMax(1, 3), "Session reaper retained the request trace");
-      assertTraces(trace(span().root().operationName("parent")));
-    } finally {
-      store.close();
-      vertx.close().toCompletionStage().toCompletableFuture().get(10, SECONDS);
+    @Test
+    void rearmingSessionReaperDoesNotRetainRequest() throws Exception {
+        Vertx vertx = Vertx.vertx();
+        LocalSessionStore store = LocalSessionStore.create(vertx, "rearming", 60_000);
+        try {
+            AgentSpan parent = startSpan("test", "parent");
+            try (ContextScope ignored = activateSpan(parent)) {
+                ((LocalSessionStoreImpl) store).handle(0L);
+            } finally {
+                parent.finish();
+            }
+            assertTrue(writer.waitForTracesMax(1, 3), "Session reaper retained the request trace");
+            assertTraces(trace(span().root().operationName("parent")));
+        } finally {
+            store.close();
+            vertx.close().toCompletionStage().toCompletableFuture().get(10, SECONDS);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/VertxMiddlewareTestServer.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/VertxMiddlewareTestServer.java
index e77f1b6fb65..f2ac240d749 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/VertxMiddlewareTestServer.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/VertxMiddlewareTestServer.java
@@ -5,13 +5,13 @@
 import io.vertx.ext.web.RoutingContext;
 
 public class VertxMiddlewareTestServer extends VertxTestServer {
-  @Override
-  protected void customizeBeforeRoutes(Router router) {
-    router.route().handler(VertxMiddlewareTestServer::firstHandler);
-  }
+    @Override
+    protected void customizeBeforeRoutes(Router router) {
+        router.route().handler(VertxMiddlewareTestServer::firstHandler);
+    }
 
-  private static void firstHandler(final RoutingContext ctx) {
-    AgentTracer.activeSpan().setTag("before", true);
-    ctx.next();
-  }
+    private static void firstHandler(final RoutingContext ctx) {
+        AgentTracer.activeSpan().setTag("before", true);
+        ctx.next();
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/VertxSubrouterTestServer.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/VertxSubrouterTestServer.java
index 36f1814b1c6..08ff21b1f50 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/VertxSubrouterTestServer.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/VertxSubrouterTestServer.java
@@ -3,10 +3,10 @@
 import io.vertx.ext.web.Router;
 
 public class VertxSubrouterTestServer extends VertxTestServer {
-  @Override
-  protected Router customizeAfterRoutes(Router configured) {
-    Router router = Router.router(vertx);
-    router.route("/sub/*").subRouter(configured);
-    return router;
-  }
+    @Override
+    protected Router customizeAfterRoutes(Router configured) {
+        Router router = Router.router(vertx);
+        router.route("/sub/*").subRouter(configured);
+        return router;
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/VertxTestServer.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/VertxTestServer.java
index 8b20617cc7c..402a384e6e0 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/VertxTestServer.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/VertxTestServer.java
@@ -36,246 +36,174 @@
 import io.vertx.ext.web.sstore.LocalSessionStore;
 
 public class VertxTestServer extends AbstractVerticle {
-  public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port";
-  public static final String PORT_DATA_ADDRESS = "PORT_DATA";
-
-  @Override
-  public void start(final Promise<Void> startPromise) {
-    final int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
-    Router router = Router.router(vertx);
-
-    customizeBeforeRoutes(router);
-
-    router
-        .route(SUCCESS.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    SUCCESS,
-                    () ->
-                        ctx.response().setStatusCode(SUCCESS.getStatus()).end(SUCCESS.getBody())));
-    router
-        .route(FORWARDED.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    FORWARDED,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(FORWARDED.getStatus())
-                            .end(ctx.request().getHeader("x-forwarded-for"))));
-    router
-        .route(CREATED.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    CREATED,
-                    () ->
-                        ctx.request()
-                            .bodyHandler(
-                                body ->
-                                    ctx.response()
+    public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port";
+    public static final String PORT_DATA_ADDRESS = "PORT_DATA";
+
+    @Override
+    public void start(final Promise<Void> startPromise) {
+        final int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
+        Router router = Router.router(vertx);
+
+        customizeBeforeRoutes(router);
+
+        router.route(SUCCESS.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        SUCCESS,
+                        () -> ctx.response().setStatusCode(SUCCESS.getStatus()).end(SUCCESS.getBody())));
+        router.route(FORWARDED.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        FORWARDED,
+                        () -> ctx.response()
+                                .setStatusCode(FORWARDED.getStatus())
+                                .end(ctx.request().getHeader("x-forwarded-for"))));
+        router.route(CREATED.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        CREATED,
+                        () -> ctx.request()
+                                .bodyHandler(body -> ctx.response()
                                         .setStatusCode(CREATED.getStatus())
                                         .end(CREATED.getBody() + ": " + body.toString()))));
-    router.route(BODY_URLENCODED.getPath()).handler(BodyHandler.create());
-    router
-        .route(BODY_URLENCODED.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    BODY_URLENCODED,
-                    () -> {
-                      String res = convertFormAttributes(ctx);
-                      ctx.response().setStatusCode(BODY_URLENCODED.getStatus()).end(res);
-                    }));
-    router.route(BODY_MULTIPART.getPath()).handler(BodyHandler.create());
-    router
-        .route(BODY_MULTIPART.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    BODY_MULTIPART,
-                    () -> {
-                      ctx.fileUploads();
-                      String res = convertFormAttributes(ctx);
-                      ctx.response().setStatusCode(BODY_MULTIPART.getStatus()).end(res);
-                    }));
-    router.route(BODY_JSON.getPath()).handler(BodyHandler.create());
-    router
-        .route(BODY_JSON.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    BODY_JSON,
-                    () -> {
-                      JsonObject json = ctx.body().asJsonObject();
-                      ctx.response().setStatusCode(BODY_JSON.getStatus()).end(json.toString());
-                    }));
-    router
-        .route(QUERY_ENCODED_BOTH.getRawPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    QUERY_ENCODED_BOTH,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(QUERY_ENCODED_BOTH.getStatus())
-                            .end(QUERY_ENCODED_BOTH.bodyForQuery(ctx.request().query()))));
-    router
-        .route(QUERY_ENCODED_QUERY.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    QUERY_ENCODED_QUERY,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(QUERY_ENCODED_QUERY.getStatus())
-                            .end(QUERY_ENCODED_QUERY.bodyForQuery(ctx.request().query()))));
-    router
-        .route(QUERY_PARAM.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    QUERY_PARAM,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(QUERY_PARAM.getStatus())
-                            .end(ctx.request().query())));
-
-    router
-        .route(USER_BLOCK.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    USER_BLOCK,
-                    () -> {
-                      Blocking.forUser("user-to-block").blockIfMatch();
-                      ctx.response().end("Should not be reached");
-                    }));
-
-    router
-        .route("/path/:id/param")
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    PATH_PARAM,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(PATH_PARAM.getStatus())
-                            .end(ctx.request().getParam("id"))));
-    router
-        .route(REDIRECT.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    REDIRECT,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(REDIRECT.getStatus())
-                            .putHeader("location", REDIRECT.getBody())
-                            .end()));
-    router
-        .route(ERROR.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    ERROR,
-                    () -> ctx.response().setStatusCode(ERROR.getStatus()).end(ERROR.getBody())));
-    router
-        .route(EXCEPTION.getPath())
-        .handler(ctx -> controller(ctx, EXCEPTION, VertxTestServer::exception));
-
-    router
-        .route(SESSION_ID.getPath())
-        .handler(SessionHandler.create(LocalSessionStore.create(vertx)));
-    router
-        .route(SESSION_ID.getPath())
-        .handler(
-            ctx -> ctx.response().setStatusCode(SESSION_ID.getStatus()).end(ctx.session().id()));
-
-    router = customizeAfterRoutes(router);
-
-    vertx
-        .createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
-        .requestHandler(router)
-        .listen(port)
-        .andThen(
-            event -> {
-              // send this though event bus and succeed deploy after successful response
-              int actualPort = event.result().actualPort();
-              vertx
-                  .eventBus()
-                  .request(PORT_DATA_ADDRESS, actualPort)
-                  .andThen(
-                      ar -> {
+        router.route(BODY_URLENCODED.getPath()).handler(BodyHandler.create());
+        router.route(BODY_URLENCODED.getPath())
+                .handler(ctx -> controller(ctx, BODY_URLENCODED, () -> {
+                    String res = convertFormAttributes(ctx);
+                    ctx.response().setStatusCode(BODY_URLENCODED.getStatus()).end(res);
+                }));
+        router.route(BODY_MULTIPART.getPath()).handler(BodyHandler.create());
+        router.route(BODY_MULTIPART.getPath())
+                .handler(ctx -> controller(ctx, BODY_MULTIPART, () -> {
+                    ctx.fileUploads();
+                    String res = convertFormAttributes(ctx);
+                    ctx.response().setStatusCode(BODY_MULTIPART.getStatus()).end(res);
+                }));
+        router.route(BODY_JSON.getPath()).handler(BodyHandler.create());
+        router.route(BODY_JSON.getPath())
+                .handler(ctx -> controller(ctx, BODY_JSON, () -> {
+                    JsonObject json = ctx.body().asJsonObject();
+                    ctx.response().setStatusCode(BODY_JSON.getStatus()).end(json.toString());
+                }));
+        router.route(QUERY_ENCODED_BOTH.getRawPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        QUERY_ENCODED_BOTH,
+                        () -> ctx.response()
+                                .setStatusCode(QUERY_ENCODED_BOTH.getStatus())
+                                .end(QUERY_ENCODED_BOTH.bodyForQuery(
+                                        ctx.request().query()))));
+        router.route(QUERY_ENCODED_QUERY.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        QUERY_ENCODED_QUERY,
+                        () -> ctx.response()
+                                .setStatusCode(QUERY_ENCODED_QUERY.getStatus())
+                                .end(QUERY_ENCODED_QUERY.bodyForQuery(
+                                        ctx.request().query()))));
+        router.route(QUERY_PARAM.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        QUERY_PARAM,
+                        () -> ctx.response()
+                                .setStatusCode(QUERY_PARAM.getStatus())
+                                .end(ctx.request().query())));
+
+        router.route(USER_BLOCK.getPath())
+                .handler(ctx -> controller(ctx, USER_BLOCK, () -> {
+                    Blocking.forUser("user-to-block").blockIfMatch();
+                    ctx.response().end("Should not be reached");
+                }));
+
+        router.route("/path/:id/param")
+                .handler(ctx -> controller(
+                        ctx,
+                        PATH_PARAM,
+                        () -> ctx.response()
+                                .setStatusCode(PATH_PARAM.getStatus())
+                                .end(ctx.request().getParam("id"))));
+        router.route(REDIRECT.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        REDIRECT,
+                        () -> ctx.response()
+                                .setStatusCode(REDIRECT.getStatus())
+                                .putHeader("location", REDIRECT.getBody())
+                                .end()));
+        router.route(ERROR.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        ERROR,
+                        () -> ctx.response().setStatusCode(ERROR.getStatus()).end(ERROR.getBody())));
+        router.route(EXCEPTION.getPath()).handler(ctx -> controller(ctx, EXCEPTION, VertxTestServer::exception));
+
+        router.route(SESSION_ID.getPath()).handler(SessionHandler.create(LocalSessionStore.create(vertx)));
+        router.route(SESSION_ID.getPath())
+                .handler(ctx -> ctx.response()
+                        .setStatusCode(SESSION_ID.getStatus())
+                        .end(ctx.session().id()));
+
+        router = customizeAfterRoutes(router);
+
+        vertx.createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
+                .requestHandler(router)
+                .listen(port)
+                .andThen(event -> {
+                    // send this though event bus and succeed deploy after successful response
+                    int actualPort = event.result().actualPort();
+                    vertx.eventBus().request(PORT_DATA_ADDRESS, actualPort).andThen(ar -> {
                         if (ar.succeeded()) {
-                          startPromise.complete();
+                            startPromise.complete();
                         } else {
-                          startPromise.fail(ar.cause());
+                            startPromise.fail(ar.cause());
                         }
-                      });
-            });
-  }
+                    });
+                });
+    }
 
-  private static String convertFormAttributes(RoutingContext ctx) {
-    String res = "[";
-    MultiMap entries = ctx.request().formAttributes();
-    for (String name : entries.names()) {
-      if (name.equals("ignore")) {
-        continue;
-      }
-      if (res.length() > 1) {
-        res += ", ";
-      }
-      res += name;
-      res += ":[";
-      int i = 0;
-      for (String s : entries.getAll(name)) {
-        if (i++ > 0) {
-          res += ", ";
+    private static String convertFormAttributes(RoutingContext ctx) {
+        String res = "[";
+        MultiMap entries = ctx.request().formAttributes();
+        for (String name : entries.names()) {
+            if (name.equals("ignore")) {
+                continue;
+            }
+            if (res.length() > 1) {
+                res += ", ";
+            }
+            res += name;
+            res += ":[";
+            int i = 0;
+            for (String s : entries.getAll(name)) {
+                if (i++ > 0) {
+                    res += ", ";
+                }
+                res += s;
+            }
+            res += ']';
         }
-        res += s;
-      }
-      res += ']';
+        res += ']';
+        return res;
     }
-    res += ']';
-    return res;
-  }
 
-  protected void customizeBeforeRoutes(Router router) {}
+    protected void customizeBeforeRoutes(Router router) {}
 
-  protected Router customizeAfterRoutes(final Router router) {
-    return router;
-  }
+    protected Router customizeAfterRoutes(final Router router) {
+        return router;
+    }
 
-  private static void exception() {
-    throw new RuntimeException(EXCEPTION.getBody());
-  }
+    private static void exception() {
+        throw new RuntimeException(EXCEPTION.getBody());
+    }
 
-  private static void controller(
-      RoutingContext ctx, final ServerEndpoint endpoint, final Runnable runnable) {
-    assert activeSpan() != null : "Controller should have a parent span.";
-    assert isAsyncPropagationEnabled() : "Span should be propagating async.";
-    ctx.response()
-        .putHeader(
-            HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE());
-    if (endpoint == NOT_FOUND || endpoint == UNKNOWN) {
-      runnable.run();
-      return;
+    private static void controller(RoutingContext ctx, final ServerEndpoint endpoint, final Runnable runnable) {
+        assert activeSpan() != null : "Controller should have a parent span.";
+        assert isAsyncPropagationEnabled() : "Span should be propagating async.";
+        ctx.response().putHeader(HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE());
+        if (endpoint == NOT_FOUND || endpoint == UNKNOWN) {
+            runnable.run();
+            return;
+        }
+        runnableUnderTraceAsync("controller", runnable);
     }
-    runnableUnderTraceAsync("controller", runnable);
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/client/HttpClientRequestBaseInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/client/HttpClientRequestBaseInstrumentation.java
index 8ce9f0e1255..89b65d06cf3 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/client/HttpClientRequestBaseInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/client/HttpClientRequestBaseInstrumentation.java
@@ -21,53 +21,55 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpClientRequestBaseInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  static final String[] CONCRETE_TYPES = {
-    "io.vertx.core.http.impl.HttpClientRequestBase",
-    "io.vertx.core.http.impl.HttpClientRequestImpl",
-    "io.vertx.core.http.impl.HttpClientRequestPushPromise"
-  };
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    static final String[] CONCRETE_TYPES = {
+        "io.vertx.core.http.impl.HttpClientRequestBase",
+        "io.vertx.core.http.impl.HttpClientRequestImpl",
+        "io.vertx.core.http.impl.HttpClientRequestPushPromise"
+    };
 
-  public HttpClientRequestBaseInstrumentation() {
-    super("vertx", "vertx-4.0");
-  }
+    public HttpClientRequestBaseInstrumentation() {
+        super("vertx", "vertx-4.0");
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {"datadog.trace.instrumentation.netty41.AttributeKeys"};
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {"datadog.trace.instrumentation.netty41.AttributeKeys"};
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPackagePrivate().or(isPrivate()))
-            .and(named("reset"))
-            .and(takesArgument(0, named("java.lang.Throwable"))),
-        HttpClientRequestBaseInstrumentation.class.getName() + "$ResetAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPackagePrivate().or(isPrivate()))
+                        .and(named("reset"))
+                        .and(takesArgument(0, named("java.lang.Throwable"))),
+                HttpClientRequestBaseInstrumentation.class.getName() + "$ResetAdvice");
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return CONCRETE_TYPES;
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return CONCRETE_TYPES;
+    }
 
-  public static class ResetAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Argument(value = 0) Throwable cause,
-        @Advice.FieldValue("stream") final HttpClientStream stream,
-        @Advice.Return boolean result) {
-      if (result) {
-        Context storedContext =
-            stream.connection().channel().attr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY).get();
-        AgentSpan nettySpan = spanFromContext(storedContext);
-        if (nettySpan != null) {
-          try (final ContextScope scope = activateSpan(nettySpan)) {
-            DECORATE.onError(scope, cause);
-          }
+    public static class ResetAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Argument(value = 0) Throwable cause,
+                @Advice.FieldValue("stream") final HttpClientStream stream,
+                @Advice.Return boolean result) {
+            if (result) {
+                Context storedContext = stream.connection()
+                        .channel()
+                        .attr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY)
+                        .get();
+                AgentSpan nettySpan = spanFromContext(storedContext);
+                if (nettySpan != null) {
+                    try (final ContextScope scope = activateSpan(nettySpan)) {
+                        DECORATE.onError(scope, cause);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/AbstractHttpServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/AbstractHttpServerRequestInstrumentation.java
index 2ec23dd3203..214631ed2b6 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/AbstractHttpServerRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/AbstractHttpServerRequestInstrumentation.java
@@ -27,161 +27,154 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public abstract class AbstractHttpServerRequestInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.HasMethodAdvice {
-
-  private final String className = AbstractHttpServerRequestInstrumentation.class.getName();
-
-  public AbstractHttpServerRequestInstrumentation() {
-    super("vertx", "vertx-4.0");
-  }
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {HTTP_1X_SERVER_RESPONSE};
-  }
-
-  protected abstract ElementMatcher.Junction<MethodDescription> attributesFilter();
-
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic().and(isMethod()).and(named("headers")).and(takesNoArguments()),
-        className + "$HeadersAdvice");
-    transformer.applyAdvice(
-        isPublic()
-            .and(isMethod())
-            .and(named("params"))
-            .and(takesNoArguments().or(takesArguments(boolean.class))),
-        className + "$ParamsAdvice");
-    transformer.applyAdvice(
-        isMethod().and(takesNoArguments()).and(attributesFilter()),
-        className + "$AttributesAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("handleData").or(named("onData")))
-            .and(takesArguments(1).and(takesArgument(0, named("io.vertx.core.buffer.Buffer")))),
-        className + "$DataAdvice");
-    transformer.applyAdvice(
-        isPublic().and(isMethod()).and(named("cookies")).and(returns(Set.class)),
-        className + "$CookiesAdvice");
-    transformer.applyAdvice(
-        isPublic().and(isMethod()).and(named("getCookie")).and(takesArgument(0, String.class)),
-        className + "$GetCookieAdvice");
-  }
-
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class ParamsAdvice {
-
-    @Advice.OnMethodEnter
-    public static void onEnter(
-        @Advice.Local("beforeParams") Object beforeParams,
-        @Advice.FieldValue("params") final Object params) {
-      beforeParams = params;
+        implements Instrumenter.HasMethodAdvice {
+
+    private final String className = AbstractHttpServerRequestInstrumentation.class.getName();
+
+    public AbstractHttpServerRequestInstrumentation() {
+        super("vertx", "vertx-4.0");
     }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void onExit(
-        @Advice.Local("beforeParams") final Object beforeParams,
-        @Advice.Return final Object multiMap,
-        @ActiveRequestContext RequestContext reqCtx) {
-      // only taint the map the first time
-      if (beforeParams != multiMap) {
-        final PropagationModule module = InstrumentationBridge.PROPAGATION;
-        if (module != null) {
-          final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-          module.taintObject(ctx, multiMap, SourceTypes.REQUEST_PARAMETER_VALUE);
-        }
-      }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {HTTP_1X_SERVER_RESPONSE};
+    }
+
+    protected abstract ElementMatcher.Junction<MethodDescription> attributesFilter();
+
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic().and(isMethod()).and(named("headers")).and(takesNoArguments()), className + "$HeadersAdvice");
+        transformer.applyAdvice(
+                isPublic()
+                        .and(isMethod())
+                        .and(named("params"))
+                        .and(takesNoArguments().or(takesArguments(boolean.class))),
+                className + "$ParamsAdvice");
+        transformer.applyAdvice(
+                isMethod().and(takesNoArguments()).and(attributesFilter()), className + "$AttributesAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("handleData").or(named("onData")))
+                        .and(takesArguments(1).and(takesArgument(0, named("io.vertx.core.buffer.Buffer")))),
+                className + "$DataAdvice");
+        transformer.applyAdvice(
+                isPublic().and(isMethod()).and(named("cookies")).and(returns(Set.class)), className + "$CookiesAdvice");
+        transformer.applyAdvice(
+                isPublic().and(isMethod()).and(named("getCookie")).and(takesArgument(0, String.class)),
+                className + "$GetCookieAdvice");
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class AttributesAdvice {
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class ParamsAdvice {
 
-    @Advice.OnMethodEnter
-    public static void onEnter(
-        @Advice.Local("beforeAttributes") Object beforeAttributes,
-        @Advice.FieldValue("attributes") final Object attributes) {
-      beforeAttributes = attributes;
+        @Advice.OnMethodEnter
+        public static void onEnter(
+                @Advice.Local("beforeParams") Object beforeParams, @Advice.FieldValue("params") final Object params) {
+            beforeParams = params;
+        }
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void onExit(
+                @Advice.Local("beforeParams") final Object beforeParams,
+                @Advice.Return final Object multiMap,
+                @ActiveRequestContext RequestContext reqCtx) {
+            // only taint the map the first time
+            if (beforeParams != multiMap) {
+                final PropagationModule module = InstrumentationBridge.PROPAGATION;
+                if (module != null) {
+                    final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                    module.taintObject(ctx, multiMap, SourceTypes.REQUEST_PARAMETER_VALUE);
+                }
+            }
+        }
     }
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
-    public static void onExit(
-        @Advice.Local("beforeAttributes") final Object beforeAttributes,
-        @Advice.Return final Object multiMap,
-        @ActiveRequestContext RequestContext reqCtx) {
-      // only taint the map the first time
-      if (beforeAttributes != multiMap) {
-        final PropagationModule module = InstrumentationBridge.PROPAGATION;
-        if (module != null) {
-          final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-          module.taintObject(ctx, multiMap, SourceTypes.REQUEST_PARAMETER_VALUE);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class AttributesAdvice {
+
+        @Advice.OnMethodEnter
+        public static void onEnter(
+                @Advice.Local("beforeAttributes") Object beforeAttributes,
+                @Advice.FieldValue("attributes") final Object attributes) {
+            beforeAttributes = attributes;
+        }
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PARAMETER_VALUE)
+        public static void onExit(
+                @Advice.Local("beforeAttributes") final Object beforeAttributes,
+                @Advice.Return final Object multiMap,
+                @ActiveRequestContext RequestContext reqCtx) {
+            // only taint the map the first time
+            if (beforeAttributes != multiMap) {
+                final PropagationModule module = InstrumentationBridge.PROPAGATION;
+                if (module != null) {
+                    final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                    module.taintObject(ctx, multiMap, SourceTypes.REQUEST_PARAMETER_VALUE);
+                }
+            }
         }
-      }
     }
-  }
-
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class HeadersAdvice {
-
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_HEADER_VALUE)
-    public static void onExit(
-        @Advice.Return final Object multiMap, @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintObject(ctx, multiMap, SourceTypes.REQUEST_HEADER_VALUE);
-      }
+
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class HeadersAdvice {
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_HEADER_VALUE)
+        public static void onExit(@Advice.Return final Object multiMap, @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintObject(ctx, multiMap, SourceTypes.REQUEST_HEADER_VALUE);
+            }
+        }
     }
-  }
-
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class DataAdvice {
-
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_BODY)
-    public static void onExit(
-        @Advice.Argument(0) final Object data, @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintObject(ctx, data, SourceTypes.REQUEST_BODY);
-      }
+
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class DataAdvice {
+
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_BODY)
+        public static void onExit(@Advice.Argument(0) final Object data, @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintObject(ctx, data, SourceTypes.REQUEST_BODY);
+            }
+        }
     }
-  }
-
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class CookiesAdvice {
-
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    public static void onExit(
-        @Advice.Return final Set<Object> cookies, @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null && cookies != null && !cookies.isEmpty()) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        for (final Object cookie : cookies) {
-          module.taintObject(ctx, cookie, SourceTypes.REQUEST_COOKIE_VALUE);
+
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class CookiesAdvice {
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        public static void onExit(
+                @Advice.Return final Set<Object> cookies, @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null && cookies != null && !cookies.isEmpty()) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                for (final Object cookie : cookies) {
+                    module.taintObject(ctx, cookie, SourceTypes.REQUEST_COOKIE_VALUE);
+                }
+            }
         }
-      }
     }
-  }
-
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetCookieAdvice {
-
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    public static void onExit(
-        @Advice.Return final Object cookie, @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintObject(ctx, cookie, SourceTypes.REQUEST_COOKIE_VALUE);
-      }
+
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetCookieAdvice {
+
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        public static void onExit(@Advice.Return final Object cookie, @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintObject(ctx, cookie, SourceTypes.REQUEST_COOKIE_VALUE);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/BufferInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/BufferInstrumentation.java
index 851335fc7f7..55df49bd3fe 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/BufferInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/BufferInstrumentation.java
@@ -20,77 +20,73 @@
 /** Propagation is way easier in io.vertx.core.buffer.impl.BufferImpl than in io.netty.Buffer */
 @AutoService(InstrumenterModule.class)
 public class BufferInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
 
-  private final String className = BufferInstrumentation.class.getName();
+    private final String className = BufferInstrumentation.class.getName();
 
-  public BufferInstrumentation() {
-    super("vertx", "vertx-4.0");
-  }
+    public BufferInstrumentation() {
+        super("vertx", "vertx-4.0");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {HTTP_1X_SERVER_RESPONSE};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {HTTP_1X_SERVER_RESPONSE};
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.core.buffer.impl.BufferImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.core.buffer.impl.BufferImpl";
+    }
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new TaintableVisitor(instrumentedType()));
+    }
 
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("toString")), className + "$ToStringAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("getByteBuf")).and(takesNoArguments()),
-        className + "$GetByteBuffAdvice");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(named("appendBuffer"))
-            .and(takesArgument(0, named("io.vertx.core.buffer.Buffer"))),
-        className + "$AppendBufferAdvice");
-  }
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(isMethod().and(isPublic()).and(named("toString")), className + "$ToStringAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("getByteBuf")).and(takesNoArguments()),
+                className + "$GetByteBuffAdvice");
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(named("appendBuffer"))
+                        .and(takesArgument(0, named("io.vertx.core.buffer.Buffer"))),
+                className + "$AppendBufferAdvice");
+    }
 
-  public static class ToStringAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void get(@Advice.This final Object self, @Advice.Return final String result) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        module.taintStringIfTainted(result, self);
-      }
+    public static class ToStringAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void get(@Advice.This final Object self, @Advice.Return final String result) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                module.taintStringIfTainted(result, self);
+            }
+        }
     }
-  }
 
-  public static class GetByteBuffAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void get(@Advice.This final Object self, @Advice.Return final Object result) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        module.taintObjectIfTainted(result, self);
-      }
+    public static class GetByteBuffAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void get(@Advice.This final Object self, @Advice.Return final Object result) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                module.taintObjectIfTainted(result, self);
+            }
+        }
     }
-  }
 
-  public static class AppendBufferAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void get(
-        @Advice.Argument(0) final Object buffer, @Advice.Return final Object result) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        module.taintObjectIfTainted(result, buffer);
-      }
+    public static class AppendBufferAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void get(@Advice.Argument(0) final Object buffer, @Advice.Return final Object result) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                module.taintObjectIfTainted(result, buffer);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/HeadersAdaptorInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/HeadersAdaptorInstrumentation.java
index 0ac22304a59..c96efcb60ac 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/HeadersAdaptorInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/HeadersAdaptorInstrumentation.java
@@ -9,19 +9,17 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumenterModule.class)
-public class HeadersAdaptorInstrumentation extends MultiMapInstrumentation
-    implements Instrumenter.ForKnownTypes {
+public class HeadersAdaptorInstrumentation extends MultiMapInstrumentation implements Instrumenter.ForKnownTypes {
 
-  @Override
-  protected ElementMatcher.Junction<MethodDescription> matcherForGetAdvice() {
-    return takesArguments(1);
-  }
+    @Override
+    protected ElementMatcher.Junction<MethodDescription> matcherForGetAdvice() {
+        return takesArguments(1);
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.vertx.core.http.impl.headers.HeadersAdaptor",
-      "io.vertx.core.http.impl.headers.Http2HeadersAdaptor"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.vertx.core.http.impl.headers.HeadersAdaptor", "io.vertx.core.http.impl.headers.Http2HeadersAdaptor"
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/HeadersMultiMapInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/HeadersMultiMapInstrumentation.java
index b0d5cd1acea..f2b4ca61142 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/HeadersMultiMapInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/HeadersMultiMapInstrumentation.java
@@ -10,17 +10,16 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumenterModule.class)
-public class HeadersMultiMapInstrumentation extends MultiMapInstrumentation
-    implements Instrumenter.ForSingleType {
+public class HeadersMultiMapInstrumentation extends MultiMapInstrumentation implements Instrumenter.ForSingleType {
 
-  @Override
-  protected ElementMatcher.Junction<MethodDescription> matcherForGetAdvice() {
-    // get(String) delegates on get(CharSequence)
-    return takesArguments(1).and(takesArgument(0, CharSequence.class));
-  }
+    @Override
+    protected ElementMatcher.Junction<MethodDescription> matcherForGetAdvice() {
+        // get(String) delegates on get(CharSequence)
+        return takesArguments(1).and(takesArgument(0, CharSequence.class));
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.core.http.impl.headers.HeadersMultiMap";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.core.http.impl.headers.HeadersMultiMap";
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/Http1xServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/Http1xServerRequestInstrumentation.java
index 088d209781b..d74c7ec1bf5 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/Http1xServerRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/Http1xServerRequestInstrumentation.java
@@ -11,15 +11,15 @@
 
 @AutoService(InstrumenterModule.class)
 public class Http1xServerRequestInstrumentation extends AbstractHttpServerRequestInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  @Override
-  protected ElementMatcher.Junction<MethodDescription> attributesFilter() {
-    return isPrivate().and(named("attributes"));
-  }
+    @Override
+    protected ElementMatcher.Junction<MethodDescription> attributesFilter() {
+        return isPrivate().and(named("attributes"));
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.core.http.impl.Http1xServerRequest";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.core.http.impl.Http1xServerRequest";
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/Http2ServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/Http2ServerRequestInstrumentation.java
index 4d1fbb9ad82..478056ea2c0 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/Http2ServerRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/Http2ServerRequestInstrumentation.java
@@ -11,17 +11,17 @@
 
 @AutoService(InstrumenterModule.class)
 public class Http2ServerRequestInstrumentation extends AbstractHttpServerRequestInstrumentation
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  @Override
-  protected ElementMatcher.Junction<MethodDescription> attributesFilter() {
-    return isPublic().and(named("formAttributes"));
-  }
+    @Override
+    protected ElementMatcher.Junction<MethodDescription> attributesFilter() {
+        return isPublic().and(named("formAttributes"));
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.vertx.core.http.impl.Http2ServerRequest", "io.vertx.core.http.impl.Http2ServerRequestImpl"
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.vertx.core.http.impl.Http2ServerRequest", "io.vertx.core.http.impl.Http2ServerRequestImpl"
+        };
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/HttpServerResponseInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/HttpServerResponseInstrumentation.java
index 6f974350d96..5d9c5abc0d7 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/HttpServerResponseInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/HttpServerResponseInstrumentation.java
@@ -17,70 +17,67 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpServerResponseInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {HTTP_1X_SERVER_RESPONSE};
-  }
+        implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {HTTP_1X_SERVER_RESPONSE};
+    }
 
-  public HttpServerResponseInstrumentation() {
-    super("vertx", "vertx-4.0");
-  }
+    public HttpServerResponseInstrumentation() {
+        super("vertx", "vertx-4.0");
+    }
 
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("putHeader")
-            .and(
-                takesArguments(CharSequence.class, CharSequence.class)
-                    .or(takesArguments(String.class, String.class))),
-        HttpServerResponseInstrumentation.class.getName() + "$PutHeaderAdvice1");
-    transformer.applyAdvice(
-        named("putHeader")
-            .and(
-                takesArguments(CharSequence.class, Iterable.class)
-                    .or(takesArguments(String.class, Iterable.class))),
-        HttpServerResponseInstrumentation.class.getName() + "$PutHeaderAdvice2");
-  }
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("putHeader")
+                        .and(takesArguments(CharSequence.class, CharSequence.class)
+                                .or(takesArguments(String.class, String.class))),
+                HttpServerResponseInstrumentation.class.getName() + "$PutHeaderAdvice1");
+        transformer.applyAdvice(
+                named("putHeader")
+                        .and(takesArguments(CharSequence.class, Iterable.class)
+                                .or(takesArguments(String.class, Iterable.class))),
+                HttpServerResponseInstrumentation.class.getName() + "$PutHeaderAdvice2");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return "io.vertx.core.http.HttpServerResponse";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return "io.vertx.core.http.HttpServerResponse";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  public static class PutHeaderAdvice1 {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) final CharSequence name, @Advice.Argument(1) CharSequence value) {
-      if (name != null && value != null) {
-        HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
-        if (mod != null) {
-          mod.onHeader(name.toString(), value.toString());
+    public static class PutHeaderAdvice1 {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Argument(0) final CharSequence name, @Advice.Argument(1) CharSequence value) {
+            if (name != null && value != null) {
+                HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
+                if (mod != null) {
+                    mod.onHeader(name.toString(), value.toString());
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class PutHeaderAdvice2 {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) final CharSequence name, @Advice.Argument(1) Iterable values) {
-      if (name != null && values != null) {
-        HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
-        if (mod != null) {
-          for (Object value : values) {
-            if (value instanceof CharSequence) {
-              String stValue = ((CharSequence) value).toString();
-              mod.onHeader(name.toString(), stValue);
+    public static class PutHeaderAdvice2 {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(0) final CharSequence name, @Advice.Argument(1) Iterable values) {
+            if (name != null && values != null) {
+                HttpResponseHeaderModule mod = InstrumentationBridge.RESPONSE_HEADER_MODULE;
+                if (mod != null) {
+                    for (Object value : values) {
+                        if (value instanceof CharSequence) {
+                            String stValue = ((CharSequence) value).toString();
+                            mod.onHeader(name.toString(), stValue);
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/MultiMapInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/MultiMapInstrumentation.java
index 4ba4c21b522..91d6564e54d 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/MultiMapInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/MultiMapInstrumentation.java
@@ -30,137 +30,134 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 public abstract class MultiMapInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
 
-  private final String className = MultiMapInstrumentation.class.getName();
+    private final String className = MultiMapInstrumentation.class.getName();
 
-  public MultiMapInstrumentation() {
-    super("vertx", "vertx-4.0");
-  }
+    public MultiMapInstrumentation() {
+        super("vertx", "vertx-4.0");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {HTTP_1X_SERVER_RESPONSE};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {HTTP_1X_SERVER_RESPONSE};
+    }
 
-  protected abstract ElementMatcher.Junction<MethodDescription> matcherForGetAdvice();
+    protected abstract ElementMatcher.Junction<MethodDescription> matcherForGetAdvice();
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    String[] classNames;
-    if (this instanceof Instrumenter.ForSingleType) {
-      classNames = new String[] {((Instrumenter.ForSingleType) this).instrumentedType()};
-    } else {
-      classNames = ((Instrumenter.ForKnownTypes) this).knownMatchingTypes();
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        String[] classNames;
+        if (this instanceof Instrumenter.ForSingleType) {
+            classNames = new String[] {((Instrumenter.ForSingleType) this).instrumentedType()};
+        } else {
+            classNames = ((Instrumenter.ForKnownTypes) this).knownMatchingTypes();
+        }
+        transformer.applyAdvice(new TaintableVisitor(classNames));
     }
-    transformer.applyAdvice(new TaintableVisitor(classNames));
-  }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("get")).and(matcherForGetAdvice()),
-        className + "$GetAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("getAll")).and(matcherForGetAdvice()),
-        className + "$GetAllAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("entries")).and(takesNoArguments()),
-        className + "$EntriesAdvice");
-    transformer.applyAdvice(
-        isMethod().and(isPublic()).and(named("names")).and(takesNoArguments()),
-        className + "$NamesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("get")).and(matcherForGetAdvice()), className + "$GetAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("getAll")).and(matcherForGetAdvice()),
+                className + "$GetAllAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("entries")).and(takesNoArguments()), className + "$EntriesAdvice");
+        transformer.applyAdvice(
+                isMethod().and(isPublic()).and(named("names")).and(takesNoArguments()), className + "$NamesAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void afterGet(
-        @Advice.This final Object self,
-        @Advice.Argument(0) final CharSequence name,
-        @Advice.Return final String result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        final Source source = propagation.findSource(ctx, self);
-        if (source != null) {
-          propagation.taintString(ctx, result, source.getOrigin(), name);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void afterGet(
+                @Advice.This final Object self,
+                @Advice.Argument(0) final CharSequence name,
+                @Advice.Return final String result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                final Source source = propagation.findSource(ctx, self);
+                if (source != null) {
+                    propagation.taintString(ctx, result, source.getOrigin(), name);
+                }
+            }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetAllAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void afterGetAll(
-        @Advice.This final Object self,
-        @Advice.Argument(0) final CharSequence name,
-        @Advice.Return final Collection<String> result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null && result != null && !result.isEmpty()) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        final Source source = propagation.findSource(ctx, self);
-        if (source != null) {
-          for (final String value : result) {
-            propagation.taintString(ctx, value, source.getOrigin(), name);
-          }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetAllAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void afterGetAll(
+                @Advice.This final Object self,
+                @Advice.Argument(0) final CharSequence name,
+                @Advice.Return final Collection<String> result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation != null && result != null && !result.isEmpty()) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                final Source source = propagation.findSource(ctx, self);
+                if (source != null) {
+                    for (final String value : result) {
+                        propagation.taintString(ctx, value, source.getOrigin(), name);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class EntriesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void afterEntries(
-        @Advice.This final Object self,
-        @Advice.Return final List<Map.Entry<String, String>> result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null && result != null && !result.isEmpty()) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        final Source source = propagation.findSource(ctx, self);
-        if (source != null) {
-          final byte nameOrigin = namedSource(source.getOrigin());
-          final Set<String> keys = new HashSet<>();
-          for (final Map.Entry<String, String> entry : result) {
-            final String name = entry.getKey();
-            final String value = entry.getValue();
-            if (keys.add(name)) {
-              propagation.taintString(ctx, name, nameOrigin, name);
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class EntriesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void afterEntries(
+                @Advice.This final Object self,
+                @Advice.Return final List<Map.Entry<String, String>> result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation != null && result != null && !result.isEmpty()) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                final Source source = propagation.findSource(ctx, self);
+                if (source != null) {
+                    final byte nameOrigin = namedSource(source.getOrigin());
+                    final Set<String> keys = new HashSet<>();
+                    for (final Map.Entry<String, String> entry : result) {
+                        final String name = entry.getKey();
+                        final String value = entry.getValue();
+                        if (keys.add(name)) {
+                            propagation.taintString(ctx, name, nameOrigin, name);
+                        }
+                        propagation.taintString(ctx, value, source.getOrigin(), name);
+                    }
+                }
             }
-            propagation.taintString(ctx, value, source.getOrigin(), name);
-          }
         }
-      }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class NamesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Propagation
-    public static void afterNames(
-        @Advice.This final Object self,
-        @Advice.Return final Set<String> result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
-      if (propagation != null && result != null && !result.isEmpty()) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        final Source source = propagation.findSource(ctx, self);
-        if (source != null) {
-          final byte nameOrigin = namedSource(source.getOrigin());
-          for (final String name : result) {
-            propagation.taintString(ctx, name, nameOrigin, name);
-          }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class NamesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Propagation
+        public static void afterNames(
+                @Advice.This final Object self,
+                @Advice.Return final Set<String> result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule propagation = InstrumentationBridge.PROPAGATION;
+            if (propagation != null && result != null && !result.isEmpty()) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                final Source source = propagation.findSource(ctx, self);
+                if (source != null) {
+                    final byte nameOrigin = namedSource(source.getOrigin());
+                    for (final String name : result) {
+                        propagation.taintString(ctx, name, nameOrigin, name);
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/BlockingExceptionHandler.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/BlockingExceptionHandler.java
index f55f7e27bd3..603414598a7 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/BlockingExceptionHandler.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/BlockingExceptionHandler.java
@@ -10,22 +10,22 @@
  * @see VertxImplInstrumentation
  */
 public class BlockingExceptionHandler implements Handler<Throwable> {
-  private final AgentSpan span;
-  private final Handler<Throwable> delegate;
+    private final AgentSpan span;
+    private final Handler<Throwable> delegate;
 
-  public BlockingExceptionHandler(AgentSpan span, Handler<Throwable> delegate) {
-    this.span = span;
-    this.delegate = delegate;
-  }
-
-  @Override
-  public void handle(Throwable event) {
-    if (event instanceof BlockingException) {
-      VertxDecorator.DECORATE.onError(span, event);
+    public BlockingExceptionHandler(AgentSpan span, Handler<Throwable> delegate) {
+        this.span = span;
+        this.delegate = delegate;
     }
 
-    if (this.delegate != null) {
-      this.delegate.handle(event);
+    @Override
+    public void handle(Throwable event) {
+        if (event instanceof BlockingException) {
+            VertxDecorator.DECORATE.onError(span, event);
+        }
+
+        if (this.delegate != null) {
+            this.delegate.handle(event);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/CookieImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/CookieImplInstrumentation.java
index ce09f351d12..d9608ef271f 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/CookieImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/CookieImplInstrumentation.java
@@ -24,69 +24,65 @@
 
 @AutoService(InstrumenterModule.class)
 public class CookieImplInstrumentation extends InstrumenterModule.TaintableIast
-    implements Instrumenter.ForSingleType,
-        Instrumenter.HasTypeAdvice,
-        Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasTypeAdvice, Instrumenter.HasMethodAdvice {
 
-  private final String className = CookieImplInstrumentation.class.getName();
+    private final String className = CookieImplInstrumentation.class.getName();
 
-  public CookieImplInstrumentation() {
-    super("vertx", "vertx-4.0");
-  }
+    public CookieImplInstrumentation() {
+        super("vertx", "vertx-4.0");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.core.http.impl.CookieImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.core.http.impl.CookieImpl";
+    }
 
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {HTTP_1X_SERVER_RESPONSE};
-  }
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {HTTP_1X_SERVER_RESPONSE};
+    }
 
-  @Override
-  public void typeAdvice(TypeTransformer transformer) {
-    transformer.applyAdvice(new TaintableVisitor(this.instrumentedType()));
-  }
+    @Override
+    public void typeAdvice(TypeTransformer transformer) {
+        transformer.applyAdvice(new TaintableVisitor(this.instrumentedType()));
+    }
 
-  @Override
-  public void methodAdvice(final MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("getName")).and(takesArguments(0)), className + "$GetNameAdvice");
-    transformer.applyAdvice(
-        isMethod().and(named("getValue")).and(takesArguments(0)), className + "$GetValueAdvice");
-  }
+    @Override
+    public void methodAdvice(final MethodTransformer transformer) {
+        transformer.applyAdvice(isMethod().and(named("getName")).and(takesArguments(0)), className + "$GetNameAdvice");
+        transformer.applyAdvice(
+                isMethod().and(named("getValue")).and(takesArguments(0)), className + "$GetValueAdvice");
+    }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetNameAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_NAME)
-    public static void afterGetName(
-        @Advice.This final Cookie self,
-        @Advice.Return final String result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintStringIfTainted(ctx, result, self, SourceTypes.REQUEST_COOKIE_NAME, result);
-      }
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetNameAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_NAME)
+        public static void afterGetName(
+                @Advice.This final Cookie self,
+                @Advice.Return final String result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintStringIfTainted(ctx, result, self, SourceTypes.REQUEST_COOKIE_NAME, result);
+            }
+        }
     }
-  }
 
-  @RequiresRequestContext(RequestContextSlot.IAST)
-  public static class GetValueAdvice {
+    @RequiresRequestContext(RequestContextSlot.IAST)
+    public static class GetValueAdvice {
 
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    @Source(SourceTypes.REQUEST_COOKIE_VALUE)
-    public static void afterGetValue(
-        @Advice.This final Cookie self,
-        @Advice.Return final String result,
-        @ActiveRequestContext RequestContext reqCtx) {
-      final PropagationModule module = InstrumentationBridge.PROPAGATION;
-      if (module != null) {
-        final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
-        module.taintStringIfTainted(
-            ctx, result, self, SourceTypes.REQUEST_COOKIE_VALUE, self.getName());
-      }
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_COOKIE_VALUE)
+        public static void afterGetValue(
+                @Advice.This final Cookie self,
+                @Advice.Return final String result,
+                @ActiveRequestContext RequestContext reqCtx) {
+            final PropagationModule module = InstrumentationBridge.PROPAGATION;
+            if (module != null) {
+                final IastContext ctx = reqCtx.getData(RequestContextSlot.IAST);
+                module.taintStringIfTainted(ctx, result, self, SourceTypes.REQUEST_COOKIE_VALUE, self.getName());
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/EndHandlerWrapper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/EndHandlerWrapper.java
index fd4a042edf8..60f79aa0787 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/EndHandlerWrapper.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/EndHandlerWrapper.java
@@ -4,22 +4,22 @@
 import io.vertx.ext.web.RoutingContext;
 
 public class EndHandlerWrapper implements Handler<Void> {
-  private final RoutingContext routingContext;
+    private final RoutingContext routingContext;
 
-  public Handler<Void> actual;
+    public Handler<Void> actual;
 
-  EndHandlerWrapper(RoutingContext routingContext) {
-    this.routingContext = routingContext;
-  }
+    EndHandlerWrapper(RoutingContext routingContext) {
+        this.routingContext = routingContext;
+    }
 
-  @Override
-  public void handle(final Void event) {
-    try {
-      if (actual != null) {
-        actual.handle(event);
-      }
-    } finally {
-      RouteHandlerWrapper.finishHandlerSpan(routingContext);
+    @Override
+    public void handle(final Void event) {
+        try {
+            if (actual != null) {
+                actual.handle(event);
+            }
+        } finally {
+            RouteHandlerWrapper.finishHandlerSpan(routingContext);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/EndHandlerWrapperAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/EndHandlerWrapperAdvice.java
index bcfa635e631..fd077690a67 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/EndHandlerWrapperAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/EndHandlerWrapperAdvice.java
@@ -4,24 +4,24 @@
 import net.bytebuddy.asm.Advice;
 
 public class EndHandlerWrapperAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void wrapHandler(
-      @Advice.FieldValue(value = "endHandler", readOnly = false) final Handler<Void> endHandler,
-      @Advice.Argument(value = 0, readOnly = false) Handler<Void> handler) {
-    // In case the handler instrumentation executes twice on the same response
-    if (endHandler instanceof EndHandlerWrapper && handler instanceof EndHandlerWrapper) {
-      return;
-    }
-    // If an end handler was already registered when our wrapper is registered, we save the one that
-    // existed before
-    if (handler instanceof EndHandlerWrapper && endHandler != null) {
-      ((EndHandlerWrapper) handler).actual = endHandler;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void wrapHandler(
+            @Advice.FieldValue(value = "endHandler", readOnly = false) final Handler<Void> endHandler,
+            @Advice.Argument(value = 0, readOnly = false) Handler<Void> handler) {
+        // In case the handler instrumentation executes twice on the same response
+        if (endHandler instanceof EndHandlerWrapper && handler instanceof EndHandlerWrapper) {
+            return;
+        }
+        // If an end handler was already registered when our wrapper is registered, we save the one that
+        // existed before
+        if (handler instanceof EndHandlerWrapper && endHandler != null) {
+            ((EndHandlerWrapper) handler).actual = endHandler;
 
-      // If the user registers an end handler and ours has already been registered then we wrap the
-      // users handler and swap the function argument for the wrapper
-    } else if (endHandler instanceof EndHandlerWrapper) {
-      ((EndHandlerWrapper) endHandler).actual = handler;
-      handler = endHandler;
+            // If the user registers an end handler and ours has already been registered then we wrap the
+            // users handler and swap the function argument for the wrapper
+        } else if (endHandler instanceof EndHandlerWrapper) {
+            ((EndHandlerWrapper) endHandler).actual = handler;
+            handler = endHandler;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/FileUploadHelper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/FileUploadHelper.java
index c0eef8cab2e..2bd5409355c 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/FileUploadHelper.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/FileUploadHelper.java
@@ -12,40 +12,38 @@
 
 public class FileUploadHelper {
 
-  public static BlockingException commitBlockingResponse(
-      BiFunction<RequestContext, List<String>, Flow<Void>> cb,
-      RequestContext reqCtx,
-      List<String> data,
-      String reason) {
-    Flow<Void> flow = cb.apply(reqCtx, data);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        brf.tryCommitBlockingResponse(
-            reqCtx.getTraceSegment(), (Flow.Action.RequestBlockingAction) action);
-        return new BlockingException(reason);
-      }
+    public static BlockingException commitBlockingResponse(
+            BiFunction<RequestContext, List<String>, Flow<Void>> cb,
+            RequestContext reqCtx,
+            List<String> data,
+            String reason) {
+        Flow<Void> flow = cb.apply(reqCtx, data);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), (Flow.Action.RequestBlockingAction) action);
+                return new BlockingException(reason);
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  public static String readUploadContent(FileUpload upload, int maxBytes) {
-    try {
-      String path = upload.uploadedFileName();
-      if (path == null || path.isEmpty()) {
-        return "";
-      }
-      String charSet = upload.charSet();
-      String contentType =
-          charSet != null && !charSet.isEmpty()
-              ? upload.contentType() + "; charset=" + charSet
-              : upload.contentType();
-      try (FileInputStream fis = new FileInputStream(path)) {
-        return MultipartContentDecoder.readInputStream(fis, maxBytes, contentType);
-      }
-    } catch (Exception ignored) {
-      return "";
+    public static String readUploadContent(FileUpload upload, int maxBytes) {
+        try {
+            String path = upload.uploadedFileName();
+            if (path == null || path.isEmpty()) {
+                return "";
+            }
+            String charSet = upload.charSet();
+            String contentType = charSet != null && !charSet.isEmpty()
+                    ? upload.contentType() + "; charset=" + charSet
+                    : upload.contentType();
+            try (FileInputStream fis = new FileInputStream(path)) {
+                return MultipartContentDecoder.readInputStream(fis, maxBytes, contentType);
+            }
+        } catch (Exception ignored) {
+            return "";
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerRequestInstrumentation.java
index d8280ab2ea3..3899f56ccdf 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerRequestInstrumentation.java
@@ -16,40 +16,40 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpServerRequestInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public HttpServerRequestInstrumentation() {
-    super("vertx", "vertx-4.0");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public HttpServerRequestInstrumentation() {
+        super("vertx", "vertx-4.0");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.core.http.HttpServerRequest";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.core.http.HttpServerRequest";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("bodyHandler"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("io.vertx.core.Handler"))),
-        HttpServerRequestInstrumentation.class.getName() + "$BodyHandlerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("bodyHandler"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("io.vertx.core.Handler"))),
+                HttpServerRequestInstrumentation.class.getName() + "$BodyHandlerAdvice");
+    }
 
-  /**
-   * @see HttpServerRequest#bodyHandler(Handler)
-   */
-  static class BodyHandlerAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void after(@Advice.Argument(value = 0, readOnly = false) Handler<Buffer> h) {
-      if (h != null) {
-        h = new WafPublishingBodyHandler(h);
-      }
+    /**
+     * @see HttpServerRequest#bodyHandler(Handler)
+     */
+    static class BodyHandlerAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void after(@Advice.Argument(value = 0, readOnly = false) Handler<Buffer> h) {
+            if (h != null) {
+                h = new WafPublishingBodyHandler(h);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerResponseEndHandlerInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerResponseEndHandlerInstrumentation.java
index 473bf45eec0..acb78d5da05 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerResponseEndHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerResponseEndHandlerInstrumentation.java
@@ -12,33 +12,33 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpServerResponseEndHandlerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
-  public HttpServerResponseEndHandlerInstrumentation() {
-    super("vertx", "vertx-4.0");
-  }
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+    public HttpServerResponseEndHandlerInstrumentation() {
+        super("vertx", "vertx-4.0");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
+    }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.vertx.core.http.impl.Http1xServerResponse",
-      "io.vertx.core.http.impl.Http2ServerResponse",
-      "io.vertx.core.http.impl.http1.Http1ServerResponse", // HTTP/1 response when v >= 5.1
-      "io.vertx.core.http.impl.HttpServerResponseImpl" // HTTP/2 response when v >= 5.1
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.vertx.core.http.impl.Http1xServerResponse",
+            "io.vertx.core.http.impl.Http2ServerResponse",
+            "io.vertx.core.http.impl.http1.Http1ServerResponse", // HTTP/1 response when v >= 5.1
+            "io.vertx.core.http.impl.HttpServerResponseImpl" // HTTP/2 response when v >= 5.1
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(named("endHandler"))
-            .and(isPublic())
-            .and(takesArgument(0, named("io.vertx.core.Handler"))),
-        packageName + ".EndHandlerWrapperAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(named("endHandler"))
+                        .and(isPublic())
+                        .and(takesArgument(0, named("io.vertx.core.Handler"))),
+                packageName + ".EndHandlerWrapperAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/IastRoutingContextImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/IastRoutingContextImplInstrumentation.java
index 7bbc0f393c6..956005afea1 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/IastRoutingContextImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/IastRoutingContextImplInstrumentation.java
@@ -19,36 +19,36 @@
  */
 @AutoService(InstrumenterModule.class)
 public class IastRoutingContextImplInstrumentation extends InstrumenterModule.Iast
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public IastRoutingContextImplInstrumentation() {
-    super("vertx", "vertx-4.0");
-  }
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.ext.web.impl.RoutingContextImpl";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("reroute").and(takesArguments(2)).and(takesArgument(1, String.class)),
-        IastRoutingContextImplInstrumentation.class.getName() + "$RerouteAdvice");
-  }
-
-  public static class RerouteAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onReroute(@Advice.Argument(1) final String path) {
-      final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
-      if (module != null) {
-        module.onRedirect(path);
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public IastRoutingContextImplInstrumentation() {
+        super("vertx", "vertx-4.0");
+    }
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.ext.web.impl.RoutingContextImpl";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("reroute").and(takesArguments(2)).and(takesArgument(1, String.class)),
+                IastRoutingContextImplInstrumentation.class.getName() + "$RerouteAdvice");
+    }
+
+    public static class RerouteAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onReroute(@Advice.Argument(1) final String path) {
+            final UnvalidatedRedirectModule module = InstrumentationBridge.UNVALIDATED_REDIRECT;
+            if (module != null) {
+                module.onRedirect(path);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/LocalSessionStoreInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/LocalSessionStoreInstrumentation.java
index c74528e7515..0331e623782 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/LocalSessionStoreInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/LocalSessionStoreInstrumentation.java
@@ -19,52 +19,52 @@
 /** Keeps session-store maintenance timers from retaining an unrelated request's continuation. */
 @AutoService(InstrumenterModule.class)
 public final class LocalSessionStoreInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public LocalSessionStoreInstrumentation() {
-    super("vertx");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.ext.web.sstore.impl.LocalSessionStoreImpl";
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public LocalSessionStoreInstrumentation() {
+        super("vertx");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    // Vert.x 3.9 has the same class and timer methods.
-    return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.ext.web.sstore.impl.LocalSessionStoreImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // Initialization also starts the PRNG refresh timer; neither timer belongs to a request.
-    transformer.applyAdvice(
-        named("init")
-            .and(isPublic())
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("io.vertx.core.Vertx")))
-            .and(takesArgument(1, named("io.vertx.core.json.JsonObject"))),
-        getClass().getName() + "$DisablePropagationAdvice");
-    transformer.applyAdvice(
-        named("setTimer").and(isPrivate()).and(takesNoArguments()).and(returns(void.class)),
-        getClass().getName() + "$DisablePropagationAdvice");
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        // Vert.x 3.9 has the same class and timer methods.
+        return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
+    }
 
-  public static final class DisablePropagationAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static boolean before() {
-      if (isAsyncPropagationEnabled()) {
-        setAsyncPropagationEnabled(false);
-        return true;
-      }
-      return false;
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // Initialization also starts the PRNG refresh timer; neither timer belongs to a request.
+        transformer.applyAdvice(
+                named("init")
+                        .and(isPublic())
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("io.vertx.core.Vertx")))
+                        .and(takesArgument(1, named("io.vertx.core.json.JsonObject"))),
+                getClass().getName() + "$DisablePropagationAdvice");
+        transformer.applyAdvice(
+                named("setTimer").and(isPrivate()).and(takesNoArguments()).and(returns(void.class)),
+                getClass().getName() + "$DisablePropagationAdvice");
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(@Advice.Enter boolean wasEnabled) {
-      if (wasEnabled) {
-        setAsyncPropagationEnabled(true);
-      }
+    public static final class DisablePropagationAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static boolean before() {
+            if (isAsyncPropagationEnabled()) {
+                setAsyncPropagationEnabled(false);
+                return true;
+            }
+            return false;
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(@Advice.Enter boolean wasEnabled) {
+            if (wasEnabled) {
+                setAsyncPropagationEnabled(true);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/PathParameterPublishingHelper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/PathParameterPublishingHelper.java
index 3c6f230fc01..0811b003d6e 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/PathParameterPublishingHelper.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/PathParameterPublishingHelper.java
@@ -21,58 +21,58 @@
 import org.slf4j.LoggerFactory;
 
 public class PathParameterPublishingHelper {
-  private static final Logger log = LoggerFactory.getLogger(PathParameterPublishingHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(PathParameterPublishingHelper.class);
 
-  public static Throwable publishParams(Map<String, String> params) {
-    AgentSpan agentSpan = activeSpan();
-    if (agentSpan == null) {
-      return null;
-    }
+    public static Throwable publishParams(Map<String, String> params) {
+        AgentSpan agentSpan = activeSpan();
+        if (agentSpan == null) {
+            return null;
+        }
 
-    RequestContext requestContext = agentSpan.getRequestContext();
-    if (requestContext == null) {
-      return null;
-    }
+        RequestContext requestContext = agentSpan.getRequestContext();
+        if (requestContext == null) {
+            return null;
+        }
 
-    { // appsec
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestPathParams());
-      if (callback != null) {
-        Flow<Void> flow = callback.apply(requestContext, params);
-        Flow.Action action = flow.getAction();
-        if (action instanceof Flow.Action.RequestBlockingAction) {
-          BlockResponseFunction brf = requestContext.getBlockResponseFunction();
-          if (brf == null) {
-            log.warn("Can't block. Don't know how to block on this server");
-          } else {
-            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-            brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
+        { // appsec
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Map<String, ?>, Flow<Void>> callback =
+                    cbp.getCallback(EVENTS.requestPathParams());
+            if (callback != null) {
+                Flow<Void> flow = callback.apply(requestContext, params);
+                Flow.Action action = flow.getAction();
+                if (action instanceof Flow.Action.RequestBlockingAction) {
+                    BlockResponseFunction brf = requestContext.getBlockResponseFunction();
+                    if (brf == null) {
+                        log.warn("Can't block. Don't know how to block on this server");
+                    } else {
+                        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                        brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
 
-            return new BlockingException("Blocked request (for route/matches)");
-          }
+                        return new BlockingException("Blocked request (for route/matches)");
+                    }
+                }
+            }
         }
-      }
-    }
 
-    { // iast
-      IastContext iastRequestContext = requestContext.getData(RequestContextSlot.IAST);
-      if (iastRequestContext != null) {
-        PropagationModule module = InstrumentationBridge.PROPAGATION;
-        if (module != null) {
-          for (Map.Entry<String, String> e : params.entrySet()) {
-            String parameterName = e.getKey();
-            String value = e.getValue();
-            if (parameterName == null || value == null) {
-              continue; // should not happen
+        { // iast
+            IastContext iastRequestContext = requestContext.getData(RequestContextSlot.IAST);
+            if (iastRequestContext != null) {
+                PropagationModule module = InstrumentationBridge.PROPAGATION;
+                if (module != null) {
+                    for (Map.Entry<String, String> e : params.entrySet()) {
+                        String parameterName = e.getKey();
+                        String value = e.getValue();
+                        if (parameterName == null || value == null) {
+                            continue; // should not happen
+                        }
+                        module.taintString(
+                                iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
+                    }
+                }
             }
-            module.taintString(
-                iastRequestContext, value, SourceTypes.REQUEST_PATH_PARAMETER, parameterName);
-          }
         }
-      }
-    }
 
-    return null;
-  }
+        return null;
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RequestBodyInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RequestBodyInstrumentation.java
index 09e41dd01d4..1f270585f6d 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RequestBodyInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RequestBodyInstrumentation.java
@@ -11,29 +11,29 @@
 
 @AutoService(InstrumenterModule.class)
 public class RequestBodyInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public RequestBodyInstrumentation() {
-    super("vertx", "vertx-4.0");
-  }
+    public RequestBodyInstrumentation() {
+        super("vertx", "vertx-4.0");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.ext.web.impl.RequestBodyImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.ext.web.impl.RequestBodyImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("asJsonObject")
-            .or(named("asJsonArray"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, int.class)),
-        packageName + ".RoutingContextJsonAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("asJsonObject")
+                        .or(named("asJsonArray"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, int.class)),
+                packageName + ".RoutingContextJsonAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerInstrumentation.java
index cbce0265a27..65e87ec5d57 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerInstrumentation.java
@@ -13,28 +13,28 @@
 
 @AutoService(InstrumenterModule.class)
 public class RouteHandlerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public RouteHandlerInstrumentation() {
-    super("vertx", "vertx-4.0");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public RouteHandlerInstrumentation() {
+        super("vertx", "vertx-4.0");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.ext.web.impl.RouteImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.ext.web.impl.RouteImpl";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(namedOneOf("handler", "blockingHandler"))
-            .and(isPublic())
-            .and(takesArgument(0, named("io.vertx.core.Handler"))),
-        packageName + ".RouteHandlerWrapperAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(namedOneOf("handler", "blockingHandler"))
+                        .and(isPublic())
+                        .and(takesArgument(0, named("io.vertx.core.Handler"))),
+                packageName + ".RouteHandlerWrapperAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java
index 28e79e35a27..957e8b050a0 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java
@@ -16,117 +16,114 @@
 import io.vertx.ext.web.impl.RouteImpl;
 
 public class RouteHandlerWrapper implements Handler<RoutingContext> {
-  static final String PARENT_SPAN_CONTEXT_KEY = AgentSpan.class.getName() + ".parent";
-  static final String HANDLER_SPAN_CONTEXT_KEY = AgentSpan.class.getName() + ".handler";
-  static final String ROUTE_CONTEXT_KEY = "dd." + Tags.HTTP_ROUTE;
+    static final String PARENT_SPAN_CONTEXT_KEY = AgentSpan.class.getName() + ".parent";
+    static final String HANDLER_SPAN_CONTEXT_KEY = AgentSpan.class.getName() + ".handler";
+    static final String ROUTE_CONTEXT_KEY = "dd." + Tags.HTTP_ROUTE;
 
-  private final Handler<RoutingContext> actual;
-  private final boolean spanStarter;
+    private final Handler<RoutingContext> actual;
+    private final boolean spanStarter;
 
-  public RouteHandlerWrapper(final Handler<RoutingContext> handler) {
-    actual = handler;
-    // When mounting a sub router, the handler is a method reference to the routers handleContext
-    // method this skips that. This prevents routers from creating a span during handling. In the
-    // event a route is not found, without this code, a span would be created for the router when
-    // it shouldn't
-    spanStarter = !handler.getClass().getName().startsWith(RouteImpl.class.getName());
-  }
+    public RouteHandlerWrapper(final Handler<RoutingContext> handler) {
+        actual = handler;
+        // When mounting a sub router, the handler is a method reference to the routers handleContext
+        // method this skips that. This prevents routers from creating a span during handling. In the
+        // event a route is not found, without this code, a span would be created for the router when
+        // it shouldn't
+        spanStarter = !handler.getClass().getName().startsWith(RouteImpl.class.getName());
+    }
 
-  @Override
-  public void handle(final RoutingContext routingContext) {
-    AgentSpan span = routingContext.get(HANDLER_SPAN_CONTEXT_KEY);
-    if (spanStarter) {
-      if (span == null) {
-        AgentSpan parentSpan = activeSpan();
-        routingContext.put(PARENT_SPAN_CONTEXT_KEY, parentSpan);
+    @Override
+    public void handle(final RoutingContext routingContext) {
+        AgentSpan span = routingContext.get(HANDLER_SPAN_CONTEXT_KEY);
+        if (spanStarter) {
+            if (span == null) {
+                AgentSpan parentSpan = activeSpan();
+                routingContext.put(PARENT_SPAN_CONTEXT_KEY, parentSpan);
 
-        span = startSpan("vertx", INSTRUMENTATION_NAME);
-        routingContext.put(HANDLER_SPAN_CONTEXT_KEY, span);
+                span = startSpan("vertx", INSTRUMENTATION_NAME);
+                routingContext.put(HANDLER_SPAN_CONTEXT_KEY, span);
 
-        routingContext.response().endHandler(new EndHandlerWrapper(routingContext));
-        // Fallback finish path: HttpServerResponse.endHandler is silently skipped
-        // by Vert.x's Http1xServerResponse.end() when the underlying connection
-        // has already closed (Http1xServerResponse#end gates `endHandler.handle()`
-        // behind `!closed`). This happens in synthetic transports such as
-        // quarkus-amazon-lambda-rest's virtual Netty channel, where writes and
-        // close are synchronous in-memory, leaving the route-handler span unfinished
-        // and orphaning all jakarta-rs.request / aws.http child spans in the trace.
-        // RoutingContext#addEndHandler fires on routing-context completion regardless
-        // of underlying connection state and on both success and failure.
-        routingContext.addEndHandler(ar -> finishHandlerSpan(routingContext));
-        DECORATE.afterStart(span);
-        span.setResourceName(DECORATE.className(actual.getClass()));
-      }
-      setRoute(routingContext);
-    }
+                routingContext.response().endHandler(new EndHandlerWrapper(routingContext));
+                // Fallback finish path: HttpServerResponse.endHandler is silently skipped
+                // by Vert.x's Http1xServerResponse.end() when the underlying connection
+                // has already closed (Http1xServerResponse#end gates `endHandler.handle()`
+                // behind `!closed`). This happens in synthetic transports such as
+                // quarkus-amazon-lambda-rest's virtual Netty channel, where writes and
+                // close are synchronous in-memory, leaving the route-handler span unfinished
+                // and orphaning all jakarta-rs.request / aws.http child spans in the trace.
+                // RoutingContext#addEndHandler fires on routing-context completion regardless
+                // of underlying connection state and on both success and failure.
+                routingContext.addEndHandler(ar -> finishHandlerSpan(routingContext));
+                DECORATE.afterStart(span);
+                span.setResourceName(DECORATE.className(actual.getClass()));
+            }
+            setRoute(routingContext);
+        }
 
-    try (final ContextScope scope = span != null ? activateSpan(span) : null) {
-      try {
-        actual.handle(routingContext);
-      } catch (final Throwable t) {
-        DECORATE.onError(span, t);
-        if (t instanceof BlockingException) {
-          // AppSec uses BlockingException as control flow after committing a blocking response
-          // from advice such as WafPublishingBodyHandler and RoutingContextJsonAdvice. Finish
-          // immediately because that abort path may bypass Vert.x response/routing end callbacks.
-          finishHandlerSpan(routingContext);
+        try (final ContextScope scope = span != null ? activateSpan(span) : null) {
+            try {
+                actual.handle(routingContext);
+            } catch (final Throwable t) {
+                DECORATE.onError(span, t);
+                if (t instanceof BlockingException) {
+                    // AppSec uses BlockingException as control flow after committing a blocking response
+                    // from advice such as WafPublishingBodyHandler and RoutingContextJsonAdvice. Finish
+                    // immediately because that abort path may bypass Vert.x response/routing end callbacks.
+                    finishHandlerSpan(routingContext);
+                }
+                throw t;
+            }
         }
-        throw t;
-      }
     }
-  }
 
-  // Idempotently finish the route-handler span. Both EndHandlerWrapper (the
-  // response.endHandler path) and the routingContext.addEndHandler fallback may call
-  // this; the first one to win clears HANDLER_SPAN_CONTEXT_KEY so the second is a no-op.
-  static void finishHandlerSpan(final RoutingContext routingContext) {
-    final AgentSpan span = routingContext.get(HANDLER_SPAN_CONTEXT_KEY);
-    if (span == null) {
-      return;
+    // Idempotently finish the route-handler span. Both EndHandlerWrapper (the
+    // response.endHandler path) and the routingContext.addEndHandler fallback may call
+    // this; the first one to win clears HANDLER_SPAN_CONTEXT_KEY so the second is a no-op.
+    static void finishHandlerSpan(final RoutingContext routingContext) {
+        final AgentSpan span = routingContext.get(HANDLER_SPAN_CONTEXT_KEY);
+        if (span == null) {
+            return;
+        }
+        routingContext.put(HANDLER_SPAN_CONTEXT_KEY, null);
+        DECORATE.onResponse(span, routingContext.response());
+        span.finish();
     }
-    routingContext.put(HANDLER_SPAN_CONTEXT_KEY, null);
-    DECORATE.onResponse(span, routingContext.response());
-    span.finish();
-  }
 
-  private void setRoute(RoutingContext routingContext) {
-    final AgentSpan parentSpan = routingContext.get(PARENT_SPAN_CONTEXT_KEY);
-    if (parentSpan == null) {
-      return;
-    }
+    private void setRoute(RoutingContext routingContext) {
+        final AgentSpan parentSpan = routingContext.get(PARENT_SPAN_CONTEXT_KEY);
+        if (parentSpan == null) {
+            return;
+        }
 
-    final String method = routingContext.request().method().name();
-    final String mountPoint = routingContext.mountPoint();
+        final String method = routingContext.request().method().name();
+        final String mountPoint = routingContext.mountPoint();
 
-    String path = routingContext.currentRoute().getPath();
-    if (path == null) {
-      // getName returns the name of the route, if not path or the pattern or null
-      path = routingContext.currentRoute().getName();
-    }
+        String path = routingContext.currentRoute().getPath();
+        if (path == null) {
+            // getName returns the name of the route, if not path or the pattern or null
+            path = routingContext.currentRoute().getName();
+        }
 
-    if (mountPoint != null && path != null) {
-      final String noBackslashhMountPoint =
-          mountPoint.endsWith("/")
-              ? mountPoint.substring(0, mountPoint.lastIndexOf("/"))
-              : mountPoint;
-      path = noBackslashhMountPoint + path;
-    }
-    if (method != null && path != null && shouldUpdateRoute(routingContext, parentSpan, path)) {
-      routingContext.put(ROUTE_CONTEXT_KEY, path);
-      HTTP_RESOURCE_DECORATOR.withRoute(parentSpan, method, path, true);
+        if (mountPoint != null && path != null) {
+            final String noBackslashhMountPoint =
+                    mountPoint.endsWith("/") ? mountPoint.substring(0, mountPoint.lastIndexOf("/")) : mountPoint;
+            path = noBackslashhMountPoint + path;
+        }
+        if (method != null && path != null && shouldUpdateRoute(routingContext, parentSpan, path)) {
+            routingContext.put(ROUTE_CONTEXT_KEY, path);
+            HTTP_RESOURCE_DECORATOR.withRoute(parentSpan, method, path, true);
+        }
     }
-  }
 
-  static boolean shouldUpdateRoute(
-      final RoutingContext routingContext, final AgentSpan span, final String path) {
-    if (span == null) {
-      return false;
-    }
-    final String currentRoute = routingContext.get(ROUTE_CONTEXT_KEY);
-    if (currentRoute != null && currentRoute.equals(path)) {
-      return false;
+    static boolean shouldUpdateRoute(final RoutingContext routingContext, final AgentSpan span, final String path) {
+        if (span == null) {
+            return false;
+        }
+        final String currentRoute = routingContext.get(ROUTE_CONTEXT_KEY);
+        if (currentRoute != null && currentRoute.equals(path)) {
+            return false;
+        }
+        // do not override route with a "/" if it's already set (it's probably more meaningful)
+        return !path.equals("/") || span.getTag(Tags.HTTP_ROUTE) == null;
     }
-    // do not override route with a "/" if it's already set (it's probably more meaningful)
-    return !path.equals("/") || span.getTag(Tags.HTTP_ROUTE) == null;
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapperAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapperAdvice.java
index fd45f5d59b7..2da39555b7f 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapperAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapperAdvice.java
@@ -5,9 +5,8 @@
 import net.bytebuddy.asm.Advice;
 
 public class RouteHandlerWrapperAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void wrapHandler(
-      @Advice.Argument(value = 0, readOnly = false) Handler<RoutingContext> handler) {
-    handler = new RouteHandlerWrapper(handler);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void wrapHandler(@Advice.Argument(value = 0, readOnly = false) Handler<RoutingContext> handler) {
+        handler = new RouteHandlerWrapper(handler);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteImplInstrumentation.java
index 15042b1319a..4c49de9982d 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteImplInstrumentation.java
@@ -16,63 +16,62 @@
 
 @AutoService(InstrumenterModule.class)
 public class RouteImplInstrumentation extends InstrumenterModule
-    implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  private Advice.PostProcessor.Factory postProcessorFactory;
+    private Advice.PostProcessor.Factory postProcessorFactory;
 
-  public RouteImplInstrumentation() {
-    super("vertx", "vertx-4.0");
-  }
+    public RouteImplInstrumentation() {
+        super("vertx", "vertx-4.0");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
+    }
 
-  @Override
-  public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    if (enabledSystems.contains(TargetSystem.IAST)) {
-      postProcessorFactory = IastPostProcessorFactory.INSTANCE;
-      return true;
+    @Override
+    public boolean isApplicable(Set<TargetSystem> enabledSystems) {
+        if (enabledSystems.contains(TargetSystem.IAST)) {
+            postProcessorFactory = IastPostProcessorFactory.INSTANCE;
+            return true;
+        }
+        return enabledSystems.contains(TargetSystem.APPSEC);
     }
-    return enabledSystems.contains(TargetSystem.APPSEC);
-  }
 
-  @Override
-  public String[] knownMatchingTypes() {
-    return new String[] {
-      "io.vertx.ext.web.impl.RouteImpl", "io.vertx.ext.web.impl.RouteState",
-    };
-  }
+    @Override
+    public String[] knownMatchingTypes() {
+        return new String[] {
+            "io.vertx.ext.web.impl.RouteImpl", "io.vertx.ext.web.impl.RouteState",
+        };
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("matches")
-            .and(takesArguments(3))
-            .and(takesArgument(0, named("io.vertx.ext.web.impl.RoutingContextImplBase")))
-            .and(takesArgument(1, String.class))
-            .and(takesArgument(2, boolean.class))
-            .and(isPublic())
-            .and(returns(int.class)),
-        packageName + ".RouteMatchesAdvice");
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("matches")
+                        .and(takesArguments(3))
+                        .and(takesArgument(0, named("io.vertx.ext.web.impl.RoutingContextImplBase")))
+                        .and(takesArgument(1, String.class))
+                        .and(takesArgument(2, boolean.class))
+                        .and(isPublic())
+                        .and(returns(int.class)),
+                packageName + ".RouteMatchesAdvice");
 
-    transformer.applyAdvice(
-        named("matches")
-            .and(takesArguments(3))
-            .and(
-                takesArgument(
-                    0,
-                    named("io.vertx.ext.web.impl.RoutingContextImplBase")
-                        .or(named("io.vertx.ext.web.RoutingContext"))))
-            .and(takesArgument(1, String.class))
-            .and(takesArgument(2, boolean.class))
-            .and(returns(boolean.class)),
-        packageName + ".RouteMatchesAdvice$BooleanReturnVariant");
-  }
+        transformer.applyAdvice(
+                named("matches")
+                        .and(takesArguments(3))
+                        .and(takesArgument(
+                                0,
+                                named("io.vertx.ext.web.impl.RoutingContextImplBase")
+                                        .or(named("io.vertx.ext.web.RoutingContext"))))
+                        .and(takesArgument(1, String.class))
+                        .and(takesArgument(2, boolean.class))
+                        .and(returns(boolean.class)),
+                packageName + ".RouteMatchesAdvice$BooleanReturnVariant");
+    }
 
-  @Override
-  public Advice.PostProcessor.Factory postProcessor() {
-    return postProcessorFactory;
-  }
+    @Override
+    public Advice.PostProcessor.Factory postProcessor() {
+        return postProcessorFactory;
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteMatchesAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteMatchesAdvice.java
index 8e65add2d90..fd7553d9f4a 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteMatchesAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteMatchesAdvice.java
@@ -7,49 +7,49 @@
 import net.bytebuddy.asm.Advice;
 
 class RouteMatchesAdvice {
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  @Source(SourceTypes.REQUEST_PATH_PARAMETER)
-  static void after(
-      @Advice.Return int ret,
-      @Advice.Argument(0) final RoutingContext ctx,
-      @Advice.Thrown(readOnly = false) Throwable t) {
-    if (ret != 0 || t != null) {
-      return;
-    }
-    Map<String, String> params = ctx.pathParams();
-    if (params.isEmpty()) {
-      return;
-    }
-    if (params.size() == 1 && params.containsKey("*")) {
-      // vert.x 5 removes the entry after our advice so we must ignore it
-      return;
-    }
-
-    Throwable throwable = PathParameterPublishingHelper.publishParams(params);
-    t = throwable;
-  }
-
-  static class BooleanReturnVariant {
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     @Source(SourceTypes.REQUEST_PATH_PARAMETER)
     static void after(
-        @Advice.Return boolean ret,
-        @Advice.Argument(0) final RoutingContext ctx,
-        @Advice.Thrown(readOnly = false) Throwable t) {
-      if (!ret || t != null) {
-        return;
-      }
-      Map<String, String> params = ctx.pathParams();
-      if (params.isEmpty()) {
-        return;
-      }
-      if (params.size() == 1 && params.containsKey("*")) {
-        // vert.x 5 removes the entry after our advice so we must ignore it
-        return;
-      }
+            @Advice.Return int ret,
+            @Advice.Argument(0) final RoutingContext ctx,
+            @Advice.Thrown(readOnly = false) Throwable t) {
+        if (ret != 0 || t != null) {
+            return;
+        }
+        Map<String, String> params = ctx.pathParams();
+        if (params.isEmpty()) {
+            return;
+        }
+        if (params.size() == 1 && params.containsKey("*")) {
+            // vert.x 5 removes the entry after our advice so we must ignore it
+            return;
+        }
+
+        Throwable throwable = PathParameterPublishingHelper.publishParams(params);
+        t = throwable;
+    }
+
+    static class BooleanReturnVariant {
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        @Source(SourceTypes.REQUEST_PATH_PARAMETER)
+        static void after(
+                @Advice.Return boolean ret,
+                @Advice.Argument(0) final RoutingContext ctx,
+                @Advice.Thrown(readOnly = false) Throwable t) {
+            if (!ret || t != null) {
+                return;
+            }
+            Map<String, String> params = ctx.pathParams();
+            if (params.isEmpty()) {
+                return;
+            }
+            if (params.size() == 1 && params.containsKey("*")) {
+                // vert.x 5 removes the entry after our advice so we must ignore it
+                return;
+            }
 
-      Throwable throwable = PathParameterPublishingHelper.publishParams(params);
-      t = throwable;
+            Throwable throwable = PathParameterPublishingHelper.publishParams(params);
+            t = throwable;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextFilenamesAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextFilenamesAdvice.java
index 284b8448a4f..5993137b864 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextFilenamesAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextFilenamesAdvice.java
@@ -21,68 +21,63 @@
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 class RoutingContextFilenamesAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  static int before() {
-    return CallDepthThreadLocalMap.incrementCallDepth(FileUpload.class);
-  }
-
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  static void after(
-      @Advice.Enter int depth,
-      @Advice.Return Collection<FileUpload> uploads,
-      @ActiveRequestContext RequestContext reqCtx,
-      @Advice.Thrown(readOnly = false) Throwable throwable) {
-    CallDepthThreadLocalMap.decrementCallDepth(FileUpload.class);
-    if (depth != 0 || throwable != null || uploads == null || uploads.isEmpty()) {
-      return;
-    }
-
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb =
-        cbp.getCallback(EVENTS.requestFilesFilenames());
-    BiFunction<RequestContext, List<String>, Flow<Void>> contentCb =
-        cbp.getCallback(EVENTS.requestFilesContent());
-    if (filenamesCb == null && contentCb == null) {
-      return;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static int before() {
+        return CallDepthThreadLocalMap.incrementCallDepth(FileUpload.class);
     }
 
-    int maxFiles = Config.get().getAppSecMaxFileContentCount();
-    int maxBytes = Config.get().getAppSecMaxFileContentBytes();
-    List<String> filenames = null;
-    List<String> filesContent = null;
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    static void after(
+            @Advice.Enter int depth,
+            @Advice.Return Collection<FileUpload> uploads,
+            @ActiveRequestContext RequestContext reqCtx,
+            @Advice.Thrown(readOnly = false) Throwable throwable) {
+        CallDepthThreadLocalMap.decrementCallDepth(FileUpload.class);
+        if (depth != 0 || throwable != null || uploads == null || uploads.isEmpty()) {
+            return;
+        }
 
-    for (FileUpload upload : uploads) {
-      String name = upload.fileName();
-      if (filenamesCb != null && name != null && !name.isEmpty()) {
-        if (filenames == null) {
-          filenames = new ArrayList<>();
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb =
+                cbp.getCallback(EVENTS.requestFilesFilenames());
+        BiFunction<RequestContext, List<String>, Flow<Void>> contentCb = cbp.getCallback(EVENTS.requestFilesContent());
+        if (filenamesCb == null && contentCb == null) {
+            return;
         }
-        filenames.add(name);
-      }
-      if (contentCb != null
-          && maxFiles > 0
-          && (filesContent == null || filesContent.size() < maxFiles)) {
-        if (filesContent == null) {
-          filesContent = new ArrayList<>();
+
+        int maxFiles = Config.get().getAppSecMaxFileContentCount();
+        int maxBytes = Config.get().getAppSecMaxFileContentBytes();
+        List<String> filenames = null;
+        List<String> filesContent = null;
+
+        for (FileUpload upload : uploads) {
+            String name = upload.fileName();
+            if (filenamesCb != null && name != null && !name.isEmpty()) {
+                if (filenames == null) {
+                    filenames = new ArrayList<>();
+                }
+                filenames.add(name);
+            }
+            if (contentCb != null && maxFiles > 0 && (filesContent == null || filesContent.size() < maxFiles)) {
+                if (filesContent == null) {
+                    filesContent = new ArrayList<>();
+                }
+                filesContent.add(FileUploadHelper.readUploadContent(upload, maxBytes));
+            }
         }
-        filesContent.add(FileUploadHelper.readUploadContent(upload, maxBytes));
-      }
-    }
 
-    if (filenamesCb != null && filenames != null) {
-      throwable =
-          FileUploadHelper.commitBlockingResponse(
-              filenamesCb, reqCtx, filenames, "Blocked request (multipart file upload)");
-    }
+        if (filenamesCb != null && filenames != null) {
+            throwable = FileUploadHelper.commitBlockingResponse(
+                    filenamesCb, reqCtx, filenames, "Blocked request (multipart file upload)");
+        }
 
-    if (throwable != null) {
-      return;
-    }
+        if (throwable != null) {
+            return;
+        }
 
-    if (contentCb != null && filesContent != null) {
-      throwable =
-          FileUploadHelper.commitBlockingResponse(
-              contentCb, reqCtx, filesContent, "Blocked request (file content)");
+        if (contentCb != null && filesContent != null) {
+            throwable = FileUploadHelper.commitBlockingResponse(
+                    contentCb, reqCtx, filesContent, "Blocked request (file content)");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextImplInstrumentation.java
index 3a3511dae63..fe18af163be 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextImplInstrumentation.java
@@ -16,43 +16,41 @@
  */
 @AutoService(InstrumenterModule.class)
 public class RoutingContextImplInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  private static final Reference FILE_UPLOAD_REF =
-      new Reference.Builder("io.vertx.ext.web.FileUpload")
-          .withMethod(new String[0], 0, "fileName", "Ljava/lang/String;")
-          .withMethod(new String[0], 0, "uploadedFileName", "Ljava/lang/String;")
-          .withMethod(new String[0], 0, "contentType", "Ljava/lang/String;")
-          .withMethod(new String[0], 0, "charSet", "Ljava/lang/String;")
-          .build();
-
-  public RoutingContextImplInstrumentation() {
-    super("vertx", "vertx-4.0");
-  }
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE, FILE_UPLOAD_REF};
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.ext.web.impl.RoutingContextImpl";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("getBodyAsJson")
-            .or(named("getBodyAsJsonArray"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, int.class)),
-        packageName + ".RoutingContextJsonAdvice");
-    transformer.applyAdvice(
-        named("setSession").and(takesArgument(0, named("io.vertx.ext.web.Session"))),
-        packageName + ".RoutingContextSessionAdvice");
-    transformer.applyAdvice(
-        named("fileUploads").and(takesArguments(0)),
-        packageName + ".RoutingContextFilenamesAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    private static final Reference FILE_UPLOAD_REF = new Reference.Builder("io.vertx.ext.web.FileUpload")
+            .withMethod(new String[0], 0, "fileName", "Ljava/lang/String;")
+            .withMethod(new String[0], 0, "uploadedFileName", "Ljava/lang/String;")
+            .withMethod(new String[0], 0, "contentType", "Ljava/lang/String;")
+            .withMethod(new String[0], 0, "charSet", "Ljava/lang/String;")
+            .build();
+
+    public RoutingContextImplInstrumentation() {
+        super("vertx", "vertx-4.0");
+    }
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE, FILE_UPLOAD_REF};
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.ext.web.impl.RoutingContextImpl";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("getBodyAsJson")
+                        .or(named("getBodyAsJsonArray"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, int.class)),
+                packageName + ".RoutingContextJsonAdvice");
+        transformer.applyAdvice(
+                named("setSession").and(takesArgument(0, named("io.vertx.ext.web.Session"))),
+                packageName + ".RoutingContextSessionAdvice");
+        transformer.applyAdvice(
+                named("fileUploads").and(takesArguments(0)), packageName + ".RoutingContextFilenamesAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextInstrumentation.java
index 86908831f53..ef2fd1a3e58 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextInstrumentation.java
@@ -16,26 +16,26 @@
  */
 @AutoService(InstrumenterModule.class)
 public class RoutingContextInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public RoutingContextInstrumentation() {
-    super("vertx", "vertx-4.0");
-  }
+    public RoutingContextInstrumentation() {
+        super("vertx", "vertx-4.0");
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.ext.web.RoutingContext";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.ext.web.RoutingContext";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("json").and(takesArguments(1)).and(takesArgument(0, Object.class)),
-        packageName + ".RoutingContextJsonResponseAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("json").and(takesArguments(1)).and(takesArgument(0, Object.class)),
+                packageName + ".RoutingContextJsonResponseAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextJsonAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextJsonAdvice.java
index b1699e5c8f7..574af3945be 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextJsonAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextJsonAdvice.java
@@ -20,50 +20,49 @@
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 class RoutingContextJsonAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  static void before() {
-    CallDepthThreadLocalMap.incrementCallDepth(RoutingContext.class);
-  }
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static void before() {
+        CallDepthThreadLocalMap.incrementCallDepth(RoutingContext.class);
+    }
 
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  static void after(
-      @Advice.Return Object obj_,
-      @ActiveRequestContext RequestContext reqCtx,
-      @Advice.Thrown(readOnly = false) Throwable throwable) {
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    static void after(
+            @Advice.Return Object obj_,
+            @ActiveRequestContext RequestContext reqCtx,
+            @Advice.Thrown(readOnly = false) Throwable throwable) {
 
-    // in newer versions of vert.x rc.getBodyAsJson() calls internally rc.body().asJsonObject()
-    // so we need to prevent sending the body twice to the WAF
-    if (CallDepthThreadLocalMap.decrementCallDepth(RoutingContext.class) != 0) {
-      return;
-    }
+        // in newer versions of vert.x rc.getBodyAsJson() calls internally rc.body().asJsonObject()
+        // so we need to prevent sending the body twice to the WAF
+        if (CallDepthThreadLocalMap.decrementCallDepth(RoutingContext.class) != 0) {
+            return;
+        }
 
-    if (obj_ == null) {
-      return;
-    }
-    Object obj = obj_;
-    if (obj instanceof JsonObject) {
-      obj = ((JsonObject) obj).getMap();
-    }
+        if (obj_ == null) {
+            return;
+        }
+        Object obj = obj_;
+        if (obj instanceof JsonObject) {
+            obj = ((JsonObject) obj).getMap();
+        }
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, Object, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestBodyProcessed());
-    if (callback == null) {
-      return;
-    }
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+        if (callback == null) {
+            return;
+        }
 
-    Flow<Void> flow = callback.apply(reqCtx, obj);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-      if (blockResponseFunction == null) {
-        return;
-      }
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-      if (throwable == null) {
-        throwable = new BlockingException("Blocked request (for RoutingContextImpl/getBodyAsJson)");
-      }
+        Flow<Void> flow = callback.apply(reqCtx, obj);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+            if (blockResponseFunction == null) {
+                return;
+            }
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+            if (throwable == null) {
+                throwable = new BlockingException("Blocked request (for RoutingContextImpl/getBodyAsJson)");
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextJsonResponseAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextJsonResponseAdvice.java
index 1dfff50beef..e607ba25e6f 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextJsonResponseAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextJsonResponseAdvice.java
@@ -17,35 +17,33 @@
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 class RoutingContextJsonResponseAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  static void before(
-      @Advice.Argument(0) final Object object, @ActiveRequestContext final RequestContext reqCtx) {
-
-    if (object == null) {
-      return;
-    }
-
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    if (cbp == null) {
-      return;
-    }
-    BiFunction<RequestContext, Object, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.responseBody());
-    if (callback == null) {
-      return;
-    }
-
-    Flow<Void> flow = callback.apply(reqCtx, object);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-      if (blockResponseFunction == null) {
-        return;
-      }
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-
-      throw new BlockingException("Blocked request (for RoutingContext/json)");
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static void before(@Advice.Argument(0) final Object object, @ActiveRequestContext final RequestContext reqCtx) {
+
+        if (object == null) {
+            return;
+        }
+
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        if (cbp == null) {
+            return;
+        }
+        BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.responseBody());
+        if (callback == null) {
+            return;
+        }
+
+        Flow<Void> flow = callback.apply(reqCtx, object);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+            if (blockResponseFunction == null) {
+                return;
+            }
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+
+            throw new BlockingException("Blocked request (for RoutingContext/json)");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextSessionAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextSessionAdvice.java
index b80d8e9077f..35bb1dd02d5 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextSessionAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextSessionAdvice.java
@@ -17,32 +17,29 @@
 
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 class RoutingContextSessionAdvice {
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  static void after(
-      @ActiveRequestContext final RequestContext reqCtx,
-      @Advice.Argument(0) final Session session) {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static void after(@ActiveRequestContext final RequestContext reqCtx, @Advice.Argument(0) final Session session) {
 
-    if (session == null) {
-      return;
-    }
+        if (session == null) {
+            return;
+        }
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, String, Flow<Void>> callback =
-        cbp.getCallback(EVENTS.requestSession());
-    if (callback == null) {
-      return;
-    }
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, String, Flow<Void>> callback = cbp.getCallback(EVENTS.requestSession());
+        if (callback == null) {
+            return;
+        }
 
-    Flow<Void> flow = callback.apply(reqCtx, session.id());
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-      if (blockResponseFunction == null) {
-        return;
-      }
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-      blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-      throw new BlockingException("Blocked request (for session)");
+        Flow<Void> flow = callback.apply(reqCtx, session.id());
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+            if (blockResponseFunction == null) {
+                return;
+            }
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+            blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+            throw new BlockingException("Blocked request (for session)");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxDecorator.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxDecorator.java
index d188b139472..dbe4ff4b2a9 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxDecorator.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxDecorator.java
@@ -11,68 +11,67 @@
 import io.vertx.core.http.HttpServerResponse;
 import io.vertx.ext.web.RoutingContext;
 
-public class VertxDecorator
-    extends HttpServerDecorator<RoutingContext, RoutingContext, HttpServerResponse, Void> {
-  static final CharSequence INSTRUMENTATION_NAME = UTF8BytesString.create("vertx.route-handler");
+public class VertxDecorator extends HttpServerDecorator<RoutingContext, RoutingContext, HttpServerResponse, Void> {
+    static final CharSequence INSTRUMENTATION_NAME = UTF8BytesString.create("vertx.route-handler");
 
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("vertx");
+    private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("vertx");
 
-  static final VertxDecorator DECORATE = new VertxDecorator();
+    static final VertxDecorator DECORATE = new VertxDecorator();
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {INSTRUMENTATION_NAME.toString()};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {INSTRUMENTATION_NAME.toString()};
+    }
 
-  @Override
-  protected CharSequence component() {
-    return COMPONENT_NAME;
-  }
+    @Override
+    protected CharSequence component() {
+        return COMPONENT_NAME;
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<Void> getter() {
-    return null;
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<Void> getter() {
+        return null;
+    }
 
-  @Override
-  protected AgentPropagation.ContextVisitor<HttpServerResponse> responseGetter() {
-    return null;
-  }
+    @Override
+    protected AgentPropagation.ContextVisitor<HttpServerResponse> responseGetter() {
+        return null;
+    }
 
-  @Override
-  public CharSequence spanName() {
-    return INSTRUMENTATION_NAME;
-  }
+    @Override
+    public CharSequence spanName() {
+        return INSTRUMENTATION_NAME;
+    }
 
-  @Override
-  protected String method(final RoutingContext routingContext) {
-    return routingContext.request().method().name();
-  }
+    @Override
+    protected String method(final RoutingContext routingContext) {
+        return routingContext.request().method().name();
+    }
 
-  @Override
-  protected URIDataAdapter url(final RoutingContext routingContext) {
-    return URIDataAdapterBase.fromURI(routingContext.request().uri(), URIDefaultDataAdapter::new);
-  }
+    @Override
+    protected URIDataAdapter url(final RoutingContext routingContext) {
+        return URIDataAdapterBase.fromURI(routingContext.request().uri(), URIDefaultDataAdapter::new);
+    }
 
-  @Override
-  protected void doOnRequest(
-      final AgentSpan span,
-      final RoutingContext connection,
-      final RoutingContext routingContext,
-      final Context parentContext) {}
+    @Override
+    protected void doOnRequest(
+            final AgentSpan span,
+            final RoutingContext connection,
+            final RoutingContext routingContext,
+            final Context parentContext) {}
 
-  @Override
-  protected String peerHostIP(final RoutingContext routingContext) {
-    return routingContext.request().connection().remoteAddress().host();
-  }
+    @Override
+    protected String peerHostIP(final RoutingContext routingContext) {
+        return routingContext.request().connection().remoteAddress().host();
+    }
 
-  @Override
-  protected int peerPort(final RoutingContext routingContext) {
-    return routingContext.request().connection().remoteAddress().port();
-  }
+    @Override
+    protected int peerPort(final RoutingContext routingContext) {
+        return routingContext.request().connection().remoteAddress().port();
+    }
 
-  @Override
-  protected int status(final HttpServerResponse httpServerResponse) {
-    return httpServerResponse.getStatusCode();
-  }
+    @Override
+    protected int status(final HttpServerResponse httpServerResponse) {
+        return httpServerResponse.getStatusCode();
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxHandlerInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxHandlerInstrumentation.java
index 0f562ae3b51..d011925fcbb 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxHandlerInstrumentation.java
@@ -19,42 +19,42 @@
 // HttpServerRequestInstrumentation/BlockingExceptionHandler
 @AutoService(InstrumenterModule.class)
 public class VertxHandlerInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public VertxHandlerInstrumentation() {
-    super("vertx", "vertx-4.0");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public VertxHandlerInstrumentation() {
+        super("vertx", "vertx-4.0");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.core.net.impl.VertxHandler";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.core.net.impl.VertxHandler";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("exceptionCaught"))
-            .and(takesArguments(2))
-            .and(takesArgument(0, named("io.netty.channel.ChannelHandlerContext")))
-            .and(takesArgument(1, Throwable.class)),
-        VertxHandlerInstrumentation.class.getName() + "$ExceptionCaughtAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("exceptionCaught"))
+                        .and(takesArguments(2))
+                        .and(takesArgument(0, named("io.netty.channel.ChannelHandlerContext")))
+                        .and(takesArgument(1, Throwable.class)),
+                VertxHandlerInstrumentation.class.getName() + "$ExceptionCaughtAdvice");
+    }
 
-  static class ExceptionCaughtAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void after(@Advice.Argument(1) Throwable t) {
-      if (!(t instanceof BlockingException)) {
-        return;
-      }
-      AgentSpan agentSpan = AgentTracer.activeSpan();
-      if (agentSpan != null) {
-        agentSpan.addThrowable(t);
-      }
+    static class ExceptionCaughtAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void after(@Advice.Argument(1) Throwable t) {
+            if (!(t instanceof BlockingException)) {
+                return;
+            }
+            AgentSpan agentSpan = AgentTracer.activeSpan();
+            if (agentSpan != null) {
+                agentSpan.addThrowable(t);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxImplInstrumentation.java
index 6cafd31c120..9e00734523b 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxImplInstrumentation.java
@@ -16,38 +16,38 @@
 
 @AutoService(InstrumenterModule.class)
 public class VertxImplInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public VertxImplInstrumentation() {
-    super("vertx", "vertx-4.0");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public VertxImplInstrumentation() {
+        super("vertx", "vertx-4.0");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.core.impl.VertxImpl";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.core.impl.VertxImpl";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("exceptionHandler"))
-            .and(takesArguments(0))
-            .and(returns(named("io.vertx.core.Handler"))),
-        VertxImplInstrumentation.class.getName() + "$ExceptionHandlerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("exceptionHandler"))
+                        .and(takesArguments(0))
+                        .and(returns(named("io.vertx.core.Handler"))),
+                VertxImplInstrumentation.class.getName() + "$ExceptionHandlerAdvice");
+    }
 
-  static class ExceptionHandlerAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    static void after(@Advice.Return(readOnly = false) Handler<Throwable> ret) {
-      AgentSpan agentSpan = AgentTracer.activeSpan();
-      if (agentSpan != null) {
-        ret = new BlockingExceptionHandler(agentSpan, ret);
-      }
+    static class ExceptionHandlerAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        static void after(@Advice.Return(readOnly = false) Handler<Throwable> ret) {
+            AgentSpan agentSpan = AgentTracer.activeSpan();
+            if (agentSpan != null) {
+                ret = new BlockingExceptionHandler(agentSpan, ret);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxVersionMatcher.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxVersionMatcher.java
index e3db3b75066..63b3324a9e6 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxVersionMatcher.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxVersionMatcher.java
@@ -4,7 +4,7 @@
 
 // checks for vertx > 4
 public class VertxVersionMatcher {
-  // added in 4.0
-  public static final Reference HTTP_1X_SERVER_RESPONSE =
-      new Reference.Builder("io.vertx.core.http.impl.headers.HeadersAdaptor").build();
+    // added in 4.0
+    public static final Reference HTTP_1X_SERVER_RESPONSE =
+            new Reference.Builder("io.vertx.core.http.impl.headers.HeadersAdaptor").build();
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/WafPublishingBodyHandler.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/WafPublishingBodyHandler.java
index d23a70e30e3..1de0ead7928 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/WafPublishingBodyHandler.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/WafPublishingBodyHandler.java
@@ -21,489 +21,487 @@
 import java.util.function.BiFunction;
 
 public class WafPublishingBodyHandler implements Handler<Buffer> {
-  private final Handler<Buffer> delegate;
+    private final Handler<Buffer> delegate;
 
-  public WafPublishingBodyHandler(Handler<Buffer> delegate) {
-    this.delegate = delegate;
-  }
+    public WafPublishingBodyHandler(Handler<Buffer> delegate) {
+        this.delegate = delegate;
+    }
 
-  @Override
-  public void handle(Buffer buffer) {
-    this.delegate.handle(new BufferWrapper(buffer));
-  }
+    @Override
+    public void handle(Buffer buffer) {
+        this.delegate.handle(new BufferWrapper(buffer));
+    }
 
-  static class BufferWrapper implements Buffer {
-    private final Buffer delegate;
-    private final AtomicBoolean hasPublished = new AtomicBoolean();
+    static class BufferWrapper implements Buffer {
+        private final Buffer delegate;
+        private final AtomicBoolean hasPublished = new AtomicBoolean();
 
-    BufferWrapper(Buffer delegate) {
-      this.delegate = delegate;
-    }
+        BufferWrapper(Buffer delegate) {
+            this.delegate = delegate;
+        }
 
-    private void publishRequestBody(Object body) {
-      if (!hasPublished.compareAndSet(false, true)) {
-        return;
-      }
-
-      AgentSpan span = AgentTracer.activeSpan();
-      if (span == null) {
-        return;
-      }
-
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
-
-      RequestContext reqCtx = span.getRequestContext();
-      if (reqCtx == null) {
-        return;
-      }
-
-      Flow<Void> flow = callback.apply(reqCtx, body);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction == null) {
-          return;
-        }
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-        throw new BlockingException(
-            "Blocked request (for Buffer/toString or Buffer/toJson{Object,Array})");
-      }
-    }
+        private void publishRequestBody(Object body) {
+            if (!hasPublished.compareAndSet(false, true)) {
+                return;
+            }
+
+            AgentSpan span = AgentTracer.activeSpan();
+            if (span == null) {
+                return;
+            }
+
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
+
+            RequestContext reqCtx = span.getRequestContext();
+            if (reqCtx == null) {
+                return;
+            }
+
+            Flow<Void> flow = callback.apply(reqCtx, body);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction == null) {
+                    return;
+                }
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                throw new BlockingException("Blocked request (for Buffer/toString or Buffer/toJson{Object,Array})");
+            }
+        }
 
-    @Override
-    public String toString() {
-      String s = delegate.toString();
-      publishRequestBody(s);
-      return s;
-    }
+        @Override
+        public String toString() {
+            String s = delegate.toString();
+            publishRequestBody(s);
+            return s;
+        }
 
-    @Override
-    public String toString(String enc) {
-      String s = delegate.toString(enc);
-      publishRequestBody(s);
-      return s;
-    }
+        @Override
+        public String toString(String enc) {
+            String s = delegate.toString(enc);
+            publishRequestBody(s);
+            return s;
+        }
 
-    @Override
-    public String toString(Charset enc) {
-      String s = delegate.toString(enc);
-      publishRequestBody(s);
-      return s;
-    }
+        @Override
+        public String toString(Charset enc) {
+            String s = delegate.toString(enc);
+            publishRequestBody(s);
+            return s;
+        }
 
-    @Override
-    public JsonObject toJsonObject() {
-      JsonObject jo = delegate.toJsonObject();
-      publishRequestBody(jo.getMap());
-      return jo;
-    }
+        @Override
+        public JsonObject toJsonObject() {
+            JsonObject jo = delegate.toJsonObject();
+            publishRequestBody(jo.getMap());
+            return jo;
+        }
 
-    @Override
-    public JsonArray toJsonArray() {
-      JsonArray ja = delegate.toJsonArray();
-      publishRequestBody(ja.getList());
-      return ja;
-    }
+        @Override
+        public JsonArray toJsonArray() {
+            JsonArray ja = delegate.toJsonArray();
+            publishRequestBody(ja.getList());
+            return ja;
+        }
 
-    @Override
-    public byte getByte(int pos) {
-      return delegate.getByte(pos);
-    }
+        @Override
+        public byte getByte(int pos) {
+            return delegate.getByte(pos);
+        }
 
-    @Override
-    public short getUnsignedByte(int pos) {
-      return delegate.getUnsignedByte(pos);
-    }
+        @Override
+        public short getUnsignedByte(int pos) {
+            return delegate.getUnsignedByte(pos);
+        }
 
-    @Override
-    public int getInt(int pos) {
-      return delegate.getInt(pos);
-    }
+        @Override
+        public int getInt(int pos) {
+            return delegate.getInt(pos);
+        }
 
-    @Override
-    public int getIntLE(int pos) {
-      return delegate.getIntLE(pos);
-    }
+        @Override
+        public int getIntLE(int pos) {
+            return delegate.getIntLE(pos);
+        }
 
-    @Override
-    public long getUnsignedInt(int pos) {
-      return delegate.getUnsignedInt(pos);
-    }
+        @Override
+        public long getUnsignedInt(int pos) {
+            return delegate.getUnsignedInt(pos);
+        }
 
-    @Override
-    public long getUnsignedIntLE(int pos) {
-      return delegate.getUnsignedIntLE(pos);
-    }
+        @Override
+        public long getUnsignedIntLE(int pos) {
+            return delegate.getUnsignedIntLE(pos);
+        }
 
-    @Override
-    public long getLong(int pos) {
-      return delegate.getLong(pos);
-    }
+        @Override
+        public long getLong(int pos) {
+            return delegate.getLong(pos);
+        }
 
-    @Override
-    public long getLongLE(int pos) {
-      return delegate.getLongLE(pos);
-    }
+        @Override
+        public long getLongLE(int pos) {
+            return delegate.getLongLE(pos);
+        }
 
-    @Override
-    public double getDouble(int pos) {
-      return delegate.getDouble(pos);
-    }
+        @Override
+        public double getDouble(int pos) {
+            return delegate.getDouble(pos);
+        }
 
-    @Override
-    public float getFloat(int pos) {
-      return delegate.getFloat(pos);
-    }
+        @Override
+        public float getFloat(int pos) {
+            return delegate.getFloat(pos);
+        }
 
-    @Override
-    public short getShort(int pos) {
-      return delegate.getShort(pos);
-    }
+        @Override
+        public short getShort(int pos) {
+            return delegate.getShort(pos);
+        }
 
-    @Override
-    public short getShortLE(int pos) {
-      return delegate.getShortLE(pos);
-    }
+        @Override
+        public short getShortLE(int pos) {
+            return delegate.getShortLE(pos);
+        }
 
-    @Override
-    public int getUnsignedShort(int pos) {
-      return delegate.getUnsignedShort(pos);
-    }
+        @Override
+        public int getUnsignedShort(int pos) {
+            return delegate.getUnsignedShort(pos);
+        }
 
-    @Override
-    public int getUnsignedShortLE(int pos) {
-      return delegate.getUnsignedShortLE(pos);
-    }
+        @Override
+        public int getUnsignedShortLE(int pos) {
+            return delegate.getUnsignedShortLE(pos);
+        }
 
-    @Override
-    public int getMedium(int pos) {
-      return delegate.getMedium(pos);
-    }
+        @Override
+        public int getMedium(int pos) {
+            return delegate.getMedium(pos);
+        }
 
-    @Override
-    public int getMediumLE(int pos) {
-      return delegate.getMediumLE(pos);
-    }
+        @Override
+        public int getMediumLE(int pos) {
+            return delegate.getMediumLE(pos);
+        }
 
-    @Override
-    public int getUnsignedMedium(int pos) {
-      return delegate.getUnsignedMedium(pos);
-    }
+        @Override
+        public int getUnsignedMedium(int pos) {
+            return delegate.getUnsignedMedium(pos);
+        }
 
-    @Override
-    public int getUnsignedMediumLE(int pos) {
-      return delegate.getUnsignedMediumLE(pos);
-    }
+        @Override
+        public int getUnsignedMediumLE(int pos) {
+            return delegate.getUnsignedMediumLE(pos);
+        }
 
-    @Override
-    public byte[] getBytes() {
-      return delegate.getBytes();
-    }
+        @Override
+        public byte[] getBytes() {
+            return delegate.getBytes();
+        }
 
-    @Override
-    public byte[] getBytes(int start, int end) {
-      return delegate.getBytes(start, end);
-    }
+        @Override
+        public byte[] getBytes(int start, int end) {
+            return delegate.getBytes(start, end);
+        }
 
-    @Override
-    public Buffer getBytes(byte[] dst) {
-      return delegate.getBytes(dst);
-    }
+        @Override
+        public Buffer getBytes(byte[] dst) {
+            return delegate.getBytes(dst);
+        }
 
-    @Override
-    public Buffer getBytes(byte[] dst, int dstIndex) {
-      return delegate.getBytes(dst, dstIndex);
-    }
+        @Override
+        public Buffer getBytes(byte[] dst, int dstIndex) {
+            return delegate.getBytes(dst, dstIndex);
+        }
 
-    @Override
-    public Buffer getBytes(int start, int end, byte[] dst) {
-      return delegate.getBytes(start, end, dst);
-    }
+        @Override
+        public Buffer getBytes(int start, int end, byte[] dst) {
+            return delegate.getBytes(start, end, dst);
+        }
 
-    @Override
-    public Buffer getBytes(int start, int end, byte[] dst, int dstIndex) {
-      return delegate.getBytes(start, end, dst, dstIndex);
-    }
+        @Override
+        public Buffer getBytes(int start, int end, byte[] dst, int dstIndex) {
+            return delegate.getBytes(start, end, dst, dstIndex);
+        }
 
-    @Override
-    public Buffer getBuffer(int start, int end) {
-      return delegate.getBuffer(start, end);
-    }
+        @Override
+        public Buffer getBuffer(int start, int end) {
+            return delegate.getBuffer(start, end);
+        }
 
-    @Override
-    public String getString(int start, int end, String enc) {
-      return delegate.getString(start, end, enc);
-    }
+        @Override
+        public String getString(int start, int end, String enc) {
+            return delegate.getString(start, end, enc);
+        }
 
-    @Override
-    public String getString(int start, int end) {
-      return delegate.getString(start, end);
-    }
+        @Override
+        public String getString(int start, int end) {
+            return delegate.getString(start, end);
+        }
 
-    @Override
-    public Buffer appendBuffer(Buffer buff) {
-      return delegate.appendBuffer(buff);
-    }
+        @Override
+        public Buffer appendBuffer(Buffer buff) {
+            return delegate.appendBuffer(buff);
+        }
 
-    @Override
-    public Buffer appendBuffer(Buffer buff, int offset, int len) {
-      return delegate.appendBuffer(buff, offset, len);
-    }
+        @Override
+        public Buffer appendBuffer(Buffer buff, int offset, int len) {
+            return delegate.appendBuffer(buff, offset, len);
+        }
 
-    @Override
-    public Buffer appendBytes(byte[] bytes) {
-      return delegate.appendBytes(bytes);
-    }
+        @Override
+        public Buffer appendBytes(byte[] bytes) {
+            return delegate.appendBytes(bytes);
+        }
 
-    @Override
-    public Buffer appendBytes(byte[] bytes, int offset, int len) {
-      return delegate.appendBytes(bytes, offset, len);
-    }
+        @Override
+        public Buffer appendBytes(byte[] bytes, int offset, int len) {
+            return delegate.appendBytes(bytes, offset, len);
+        }
 
-    @Override
-    public Buffer appendByte(byte b) {
-      return delegate.appendByte(b);
-    }
+        @Override
+        public Buffer appendByte(byte b) {
+            return delegate.appendByte(b);
+        }
 
-    @Override
-    public Buffer appendUnsignedByte(short b) {
-      return delegate.appendUnsignedByte(b);
-    }
+        @Override
+        public Buffer appendUnsignedByte(short b) {
+            return delegate.appendUnsignedByte(b);
+        }
 
-    @Override
-    public Buffer appendInt(int i) {
-      return delegate.appendInt(i);
-    }
+        @Override
+        public Buffer appendInt(int i) {
+            return delegate.appendInt(i);
+        }
 
-    @Override
-    public Buffer appendIntLE(int i) {
-      return delegate.appendIntLE(i);
-    }
+        @Override
+        public Buffer appendIntLE(int i) {
+            return delegate.appendIntLE(i);
+        }
 
-    @Override
-    public Buffer appendUnsignedInt(long i) {
-      return delegate.appendUnsignedInt(i);
-    }
+        @Override
+        public Buffer appendUnsignedInt(long i) {
+            return delegate.appendUnsignedInt(i);
+        }
 
-    @Override
-    public Buffer appendUnsignedIntLE(long i) {
-      return delegate.appendUnsignedIntLE(i);
-    }
+        @Override
+        public Buffer appendUnsignedIntLE(long i) {
+            return delegate.appendUnsignedIntLE(i);
+        }
 
-    @Override
-    public Buffer appendMedium(int i) {
-      return delegate.appendMedium(i);
-    }
+        @Override
+        public Buffer appendMedium(int i) {
+            return delegate.appendMedium(i);
+        }
 
-    @Override
-    public Buffer appendMediumLE(int i) {
-      return delegate.appendMediumLE(i);
-    }
+        @Override
+        public Buffer appendMediumLE(int i) {
+            return delegate.appendMediumLE(i);
+        }
 
-    @Override
-    public Buffer appendLong(long l) {
-      return delegate.appendLong(l);
-    }
+        @Override
+        public Buffer appendLong(long l) {
+            return delegate.appendLong(l);
+        }
 
-    @Override
-    public Buffer appendLongLE(long l) {
-      return delegate.appendLongLE(l);
-    }
+        @Override
+        public Buffer appendLongLE(long l) {
+            return delegate.appendLongLE(l);
+        }
 
-    @Override
-    public Buffer appendShort(short s) {
-      return delegate.appendShort(s);
-    }
+        @Override
+        public Buffer appendShort(short s) {
+            return delegate.appendShort(s);
+        }
 
-    @Override
-    public Buffer appendShortLE(short s) {
-      return delegate.appendShortLE(s);
-    }
+        @Override
+        public Buffer appendShortLE(short s) {
+            return delegate.appendShortLE(s);
+        }
 
-    @Override
-    public Buffer appendUnsignedShort(int s) {
-      return delegate.appendUnsignedShort(s);
-    }
+        @Override
+        public Buffer appendUnsignedShort(int s) {
+            return delegate.appendUnsignedShort(s);
+        }
 
-    @Override
-    public Buffer appendUnsignedShortLE(int s) {
-      return delegate.appendUnsignedShortLE(s);
-    }
+        @Override
+        public Buffer appendUnsignedShortLE(int s) {
+            return delegate.appendUnsignedShortLE(s);
+        }
 
-    @Override
-    public Buffer appendFloat(float f) {
-      return delegate.appendFloat(f);
-    }
+        @Override
+        public Buffer appendFloat(float f) {
+            return delegate.appendFloat(f);
+        }
 
-    @Override
-    public Buffer appendDouble(double d) {
-      return delegate.appendDouble(d);
-    }
+        @Override
+        public Buffer appendDouble(double d) {
+            return delegate.appendDouble(d);
+        }
 
-    @Override
-    public Buffer appendString(String str, String enc) {
-      return delegate.appendString(str, enc);
-    }
+        @Override
+        public Buffer appendString(String str, String enc) {
+            return delegate.appendString(str, enc);
+        }
 
-    @Override
-    public Buffer appendString(String str) {
-      return delegate.appendString(str);
-    }
+        @Override
+        public Buffer appendString(String str) {
+            return delegate.appendString(str);
+        }
 
-    @Override
-    public Buffer setByte(int pos, byte b) {
-      return delegate.setByte(pos, b);
-    }
+        @Override
+        public Buffer setByte(int pos, byte b) {
+            return delegate.setByte(pos, b);
+        }
 
-    @Override
-    public Buffer setUnsignedByte(int pos, short b) {
-      return delegate.setUnsignedByte(pos, b);
-    }
+        @Override
+        public Buffer setUnsignedByte(int pos, short b) {
+            return delegate.setUnsignedByte(pos, b);
+        }
 
-    @Override
-    public Buffer setInt(int pos, int i) {
-      return delegate.setInt(pos, i);
-    }
+        @Override
+        public Buffer setInt(int pos, int i) {
+            return delegate.setInt(pos, i);
+        }
 
-    @Override
-    public Buffer setIntLE(int pos, int i) {
-      return delegate.setIntLE(pos, i);
-    }
+        @Override
+        public Buffer setIntLE(int pos, int i) {
+            return delegate.setIntLE(pos, i);
+        }
 
-    @Override
-    public Buffer setUnsignedInt(int pos, long i) {
-      return delegate.setUnsignedInt(pos, i);
-    }
+        @Override
+        public Buffer setUnsignedInt(int pos, long i) {
+            return delegate.setUnsignedInt(pos, i);
+        }
 
-    @Override
-    public Buffer setUnsignedIntLE(int pos, long i) {
-      return delegate.setUnsignedIntLE(pos, i);
-    }
+        @Override
+        public Buffer setUnsignedIntLE(int pos, long i) {
+            return delegate.setUnsignedIntLE(pos, i);
+        }
 
-    @Override
-    public Buffer setMedium(int pos, int i) {
-      return delegate.setMedium(pos, i);
-    }
+        @Override
+        public Buffer setMedium(int pos, int i) {
+            return delegate.setMedium(pos, i);
+        }
 
-    @Override
-    public Buffer setMediumLE(int pos, int i) {
-      return delegate.setMediumLE(pos, i);
-    }
+        @Override
+        public Buffer setMediumLE(int pos, int i) {
+            return delegate.setMediumLE(pos, i);
+        }
 
-    @Override
-    public Buffer setLong(int pos, long l) {
-      return delegate.setLong(pos, l);
-    }
+        @Override
+        public Buffer setLong(int pos, long l) {
+            return delegate.setLong(pos, l);
+        }
 
-    @Override
-    public Buffer setLongLE(int pos, long l) {
-      return delegate.setLongLE(pos, l);
-    }
+        @Override
+        public Buffer setLongLE(int pos, long l) {
+            return delegate.setLongLE(pos, l);
+        }
 
-    @Override
-    public Buffer setDouble(int pos, double d) {
-      return delegate.setDouble(pos, d);
-    }
+        @Override
+        public Buffer setDouble(int pos, double d) {
+            return delegate.setDouble(pos, d);
+        }
 
-    @Override
-    public Buffer setFloat(int pos, float f) {
-      return delegate.setFloat(pos, f);
-    }
+        @Override
+        public Buffer setFloat(int pos, float f) {
+            return delegate.setFloat(pos, f);
+        }
 
-    @Override
-    public Buffer setShort(int pos, short s) {
-      return delegate.setShort(pos, s);
-    }
+        @Override
+        public Buffer setShort(int pos, short s) {
+            return delegate.setShort(pos, s);
+        }
 
-    @Override
-    public Buffer setShortLE(int pos, short s) {
-      return delegate.setShortLE(pos, s);
-    }
+        @Override
+        public Buffer setShortLE(int pos, short s) {
+            return delegate.setShortLE(pos, s);
+        }
 
-    @Override
-    public Buffer setUnsignedShort(int pos, int s) {
-      return delegate.setUnsignedShort(pos, s);
-    }
+        @Override
+        public Buffer setUnsignedShort(int pos, int s) {
+            return delegate.setUnsignedShort(pos, s);
+        }
 
-    @Override
-    public Buffer setUnsignedShortLE(int pos, int s) {
-      return delegate.setUnsignedShortLE(pos, s);
-    }
+        @Override
+        public Buffer setUnsignedShortLE(int pos, int s) {
+            return delegate.setUnsignedShortLE(pos, s);
+        }
 
-    @Override
-    public Buffer setBuffer(int pos, Buffer b) {
-      return delegate.setBuffer(pos, b);
-    }
+        @Override
+        public Buffer setBuffer(int pos, Buffer b) {
+            return delegate.setBuffer(pos, b);
+        }
 
-    @Override
-    public Buffer setBuffer(int pos, Buffer b, int offset, int len) {
-      return delegate.setBuffer(pos, b, offset, len);
-    }
+        @Override
+        public Buffer setBuffer(int pos, Buffer b, int offset, int len) {
+            return delegate.setBuffer(pos, b, offset, len);
+        }
 
-    @Override
-    public Buffer setBytes(int pos, ByteBuffer b) {
-      return delegate.setBytes(pos, b);
-    }
+        @Override
+        public Buffer setBytes(int pos, ByteBuffer b) {
+            return delegate.setBytes(pos, b);
+        }
 
-    @Override
-    public Buffer setBytes(int pos, byte[] b) {
-      return delegate.setBytes(pos, b);
-    }
+        @Override
+        public Buffer setBytes(int pos, byte[] b) {
+            return delegate.setBytes(pos, b);
+        }
 
-    @Override
-    public Buffer setBytes(int pos, byte[] b, int offset, int len) {
-      return delegate.setBytes(pos, b, offset, len);
-    }
+        @Override
+        public Buffer setBytes(int pos, byte[] b, int offset, int len) {
+            return delegate.setBytes(pos, b, offset, len);
+        }
 
-    @Override
-    public Buffer setString(int pos, String str) {
-      return delegate.setString(pos, str);
-    }
+        @Override
+        public Buffer setString(int pos, String str) {
+            return delegate.setString(pos, str);
+        }
 
-    @Override
-    public Buffer setString(int pos, String str, String enc) {
-      return delegate.setString(pos, str, enc);
-    }
+        @Override
+        public Buffer setString(int pos, String str, String enc) {
+            return delegate.setString(pos, str, enc);
+        }
 
-    @Override
-    public int length() {
-      return delegate.length();
-    }
+        @Override
+        public int length() {
+            return delegate.length();
+        }
 
-    @Override
-    public Buffer copy() {
-      return delegate.copy();
-    }
+        @Override
+        public Buffer copy() {
+            return delegate.copy();
+        }
 
-    @Override
-    public Buffer slice() {
-      return delegate.slice();
-    }
+        @Override
+        public Buffer slice() {
+            return delegate.slice();
+        }
 
-    @Override
-    public Buffer slice(int start, int end) {
-      return delegate.slice(start, end);
-    }
+        @Override
+        public Buffer slice(int start, int end) {
+            return delegate.slice(start, end);
+        }
 
-    @Override
-    public ByteBuf getByteBuf() {
-      return delegate.getByteBuf();
-    }
+        @Override
+        public ByteBuf getByteBuf() {
+            return delegate.getByteBuf();
+        }
 
-    @Override
-    public void writeToBuffer(Buffer buffer) {
-      delegate.writeToBuffer(buffer);
-    }
+        @Override
+        public void writeToBuffer(Buffer buffer) {
+            delegate.writeToBuffer(buffer);
+        }
 
-    @Override
-    public int readFromBuffer(int pos, Buffer buffer) {
-      return delegate.readFromBuffer(pos, buffer);
+        @Override
+        public int readFromBuffer(int pos, Buffer buffer) {
+            return delegate.readFromBuffer(pos, buffer);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/io/vertx/core/http/impl/ResponseExceptionFiringHelper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/io/vertx/core/http/impl/ResponseExceptionFiringHelper.java
index 4754c38843e..322710221c8 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/io/vertx/core/http/impl/ResponseExceptionFiringHelper.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/io/vertx/core/http/impl/ResponseExceptionFiringHelper.java
@@ -9,9 +9,9 @@
  * response.exceptionHandler(...).
  */
 public final class ResponseExceptionFiringHelper {
-  private ResponseExceptionFiringHelper() {}
+    private ResponseExceptionFiringHelper() {}
 
-  public static void fireException(HttpServerResponse response, Throwable cause) {
-    ((Http1xServerResponse) response).handleException(cause);
-  }
+    public static void fireException(HttpServerResponse response, Throwable cause) {
+        ((Http1xServerResponse) response).handleException(cause);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/IastSinksVerticle.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/IastSinksVerticle.java
index 1b274eb1d1a..175e40c3e13 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/IastSinksVerticle.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/IastSinksVerticle.java
@@ -10,52 +10,37 @@
 
 public class IastSinksVerticle extends AbstractVerticle {
 
-  @Override
-  public void start(final Promise<Void> startPromise) throws Exception {
-    final Router router = Router.router(vertx);
-    router.route().handler(BodyHandler.create());
-    router
-        .route("/iast/sinks/reroute1")
-        .handler(
-            rc -> {
-              final String path = rc.request().getParam("path");
-              rc.reroute(path);
-            });
-    router
-        .route("/iast/sinks/reroute2")
-        .handler(
-            rc -> {
-              final String path = rc.request().getParam("path");
-              rc.reroute(HttpMethod.GET, path);
-            });
-    router
-        .route("/iast/sinks/redirectheader")
-        .handler(
-            rc -> {
-              final String name = rc.request().getParam("name");
-              final String value = rc.request().getParam("value");
-              rc.response().putHeader(name, value).end();
-            });
+    @Override
+    public void start(final Promise<Void> startPromise) throws Exception {
+        final Router router = Router.router(vertx);
+        router.route().handler(BodyHandler.create());
+        router.route("/iast/sinks/reroute1").handler(rc -> {
+            final String path = rc.request().getParam("path");
+            rc.reroute(path);
+        });
+        router.route("/iast/sinks/reroute2").handler(rc -> {
+            final String path = rc.request().getParam("path");
+            rc.reroute(HttpMethod.GET, path);
+        });
+        router.route("/iast/sinks/redirectheader").handler(rc -> {
+            final String name = rc.request().getParam("name");
+            final String value = rc.request().getParam("value");
+            rc.response().putHeader(name, value).end();
+        });
 
-    final EventBus eventBus = vertx.eventBus();
-    final HttpServerOptions serverOptions = new HttpServerOptions();
-    serverOptions.setHandle100ContinueAutomatically(true);
-    vertx
-        .createHttpServer(serverOptions)
-        .requestHandler(router)
-        .listen(0)
-        .onSuccess(
-            server ->
-                eventBus.request(
-                    "PORT_DATA",
-                    server.actualPort(),
-                    ar -> {
-                      if (ar.succeeded()) {
+        final EventBus eventBus = vertx.eventBus();
+        final HttpServerOptions serverOptions = new HttpServerOptions();
+        serverOptions.setHandle100ContinueAutomatically(true);
+        vertx.createHttpServer(serverOptions)
+                .requestHandler(router)
+                .listen(0)
+                .onSuccess(server -> eventBus.request("PORT_DATA", server.actualPort(), ar -> {
+                    if (ar.succeeded()) {
                         startPromise.complete();
-                      } else {
+                    } else {
                         startPromise.fail(ar.cause());
-                      }
-                    }))
-        .onFailure(startPromise::fail);
-  }
+                    }
+                }))
+                .onFailure(startPromise::fail);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/IastSourcesVerticle.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/IastSourcesVerticle.java
index 9964b8909a4..0ab1f9a2136 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/IastSourcesVerticle.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/IastSourcesVerticle.java
@@ -17,164 +17,115 @@
 
 public class IastSourcesVerticle extends AbstractVerticle {
 
-  private static final String EVENT_BUS_ENDPOINT = "EVENT_BUS";
+    private static final String EVENT_BUS_ENDPOINT = "EVENT_BUS";
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(IastSourcesVerticle.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(IastSourcesVerticle.class);
 
-  @Override
-  public void start(final Promise<Void> startPromise) throws Exception {
-    final Router router = Router.router(vertx);
-    router.route().handler(BodyHandler.create());
-    router
-        .route("/iast/sources/header")
-        .handler(
-            rc -> {
-              final String value = rc.request().getHeader("name");
-              rc.response().end("Received " + value);
-            });
-    router
-        .route("/iast/sources/headers")
-        .handler(
-            rc -> {
-              final MultiMap value = rc.request().headers();
-              rc.response().end("Received " + value.get("name"));
-            });
-    router
-        .route("/iast/sources/cookie")
-        .handler(
-            rc -> {
-              final Cookie cookie = rc.getCookie("name");
-              rc.response().end("Received " + cookie.getName() + " " + cookie.getValue());
-            });
-    router
-        .route("/iast/sources/path/:name")
-        .handler(
-            rc -> {
-              final String value = rc.pathParam("name");
-              rc.response().end("Received " + value);
-            });
-    router
-        .route("/iast/sources/parameter")
-        .handler(
-            rc -> {
-              final String value = rc.request().getParam("name");
-              rc.response().end("Received " + value);
-            });
-    router
-        .route("/iast/sources/parameters")
-        .handler(
-            rc -> {
-              final MultiMap value = rc.request().params();
-              rc.response().end("Received " + value.get("name"));
-            });
-    router
-        .route("/iast/sources/form")
-        .handler(
-            rc -> {
-              final String value = rc.request().getFormAttribute("name");
-              rc.response().end("Received " + value);
-            });
-    router
-        .route("/iast/sources/body/string")
-        .handler(
-            rc -> {
-              final String encoding = rc.request().getParam("encoding");
-              if (encoding != null) {
+    @Override
+    public void start(final Promise<Void> startPromise) throws Exception {
+        final Router router = Router.router(vertx);
+        router.route().handler(BodyHandler.create());
+        router.route("/iast/sources/header").handler(rc -> {
+            final String value = rc.request().getHeader("name");
+            rc.response().end("Received " + value);
+        });
+        router.route("/iast/sources/headers").handler(rc -> {
+            final MultiMap value = rc.request().headers();
+            rc.response().end("Received " + value.get("name"));
+        });
+        router.route("/iast/sources/cookie").handler(rc -> {
+            final Cookie cookie = rc.getCookie("name");
+            rc.response().end("Received " + cookie.getName() + " " + cookie.getValue());
+        });
+        router.route("/iast/sources/path/:name").handler(rc -> {
+            final String value = rc.pathParam("name");
+            rc.response().end("Received " + value);
+        });
+        router.route("/iast/sources/parameter").handler(rc -> {
+            final String value = rc.request().getParam("name");
+            rc.response().end("Received " + value);
+        });
+        router.route("/iast/sources/parameters").handler(rc -> {
+            final MultiMap value = rc.request().params();
+            rc.response().end("Received " + value.get("name"));
+        });
+        router.route("/iast/sources/form").handler(rc -> {
+            final String value = rc.request().getFormAttribute("name");
+            rc.response().end("Received " + value);
+        });
+        router.route("/iast/sources/body/string").handler(rc -> {
+            final String encoding = rc.request().getParam("encoding");
+            if (encoding != null) {
                 rc.response().end("Received " + rc.getBodyAsString(encoding));
-              } else {
+            } else {
                 rc.response().end("Received " + rc.getBodyAsString());
-              }
-            });
-    router
-        .route("/iast/sources/body/json")
-        .handler(
-            rc -> {
-              rc.response().end("Received " + rc.getBodyAsJson());
-            });
-    router
-        .route("/body/jsonArray")
-        .handler(
-            rc -> {
-              rc.response().end("Received " + rc.getBodyAsJsonArray());
-            });
+            }
+        });
+        router.route("/iast/sources/body/json").handler(rc -> {
+            rc.response().end("Received " + rc.getBodyAsJson());
+        });
+        router.route("/body/jsonArray").handler(rc -> {
+            rc.response().end("Received " + rc.getBodyAsJsonArray());
+        });
 
-    router
-        .route("/iast/sources/eventBus")
-        .handler(
-            rc -> {
-              final JsonObject target = rc.getBodyAsJson();
-              rc.vertx()
-                  .eventBus()
-                  .request(
-                      EVENT_BUS_ENDPOINT,
-                      target,
-                      reply -> {
-                        if (reply.succeeded()) {
-                          rc.response().end(reply.result().body().toString());
-                        } else {
-                          rc.fail(reply.cause());
-                        }
-                      });
+        router.route("/iast/sources/eventBus").handler(rc -> {
+            final JsonObject target = rc.getBodyAsJson();
+            rc.vertx().eventBus().request(EVENT_BUS_ENDPOINT, target, reply -> {
+                if (reply.succeeded()) {
+                    rc.response().end(reply.result().body().toString());
+                } else {
+                    rc.fail(reply.cause());
+                }
             });
-    router
-        .route("/iast/vulnerabilities/insecureCookie")
-        .handler(
-            rc -> {
-              final String cookieName = rc.request().getParam("name");
-              final String cookieValue = rc.request().getParam("value");
-              final String secure = rc.request().getParam("secure");
-              Cookie cookie = Cookie.cookie(cookieName, cookieValue);
-              if ("true".equals(secure)) {
+        });
+        router.route("/iast/vulnerabilities/insecureCookie").handler(rc -> {
+            final String cookieName = rc.request().getParam("name");
+            final String cookieValue = rc.request().getParam("value");
+            final String secure = rc.request().getParam("secure");
+            Cookie cookie = Cookie.cookie(cookieName, cookieValue);
+            if ("true".equals(secure)) {
                 cookie.setSecure(true);
-              }
-              rc.response().addCookie(cookie).end("Cookie Set");
-            });
+            }
+            rc.response().addCookie(cookie).end("Cookie Set");
+        });
 
-    final EventBus eventBus = vertx.eventBus();
-    eventBus.consumer(
-        EVENT_BUS_ENDPOINT,
-        message -> {
-          final JsonObject payload = (JsonObject) message.body();
-          final String name = payload.getString("name");
-          try {
-            final IastContext ctx = IastContext.Provider.get();
-            if (ctx == null) {
-              throw new IllegalStateException("No IAST context present");
+        final EventBus eventBus = vertx.eventBus();
+        eventBus.consumer(EVENT_BUS_ENDPOINT, message -> {
+            final JsonObject payload = (JsonObject) message.body();
+            final String name = payload.getString("name");
+            try {
+                final IastContext ctx = IastContext.Provider.get();
+                if (ctx == null) {
+                    throw new IllegalStateException("No IAST context present");
+                }
+                final TaintedObjects to = ctx.getTaintedObjects();
+                final boolean tainted = to.get(name) != null;
+                message.reply(tainted ? "OK" : "NO_OK");
+            } catch (Throwable e) {
+                LOGGER.error("Failed to handle event bus message", e);
+                message.reply("NO_OK");
             }
-            final TaintedObjects to = ctx.getTaintedObjects();
-            final boolean tainted = to.get(name) != null;
-            message.reply(tainted ? "OK" : "NO_OK");
-          } catch (Throwable e) {
-            LOGGER.error("Failed to handle event bus message", e);
-            message.reply("NO_OK");
-          }
         });
 
-    final HttpServerOptions serverOptions = new HttpServerOptions();
-    if (config().getBoolean("https")) {
-      final SelfSignedCertificate certificate = SelfSignedCertificate.create();
-      serverOptions.setSsl(true);
-      serverOptions.setUseAlpn(true);
-      serverOptions.setTrustOptions(certificate.trustOptions());
-      serverOptions.setKeyCertOptions(certificate.keyCertOptions());
-    }
-    serverOptions.setHandle100ContinueAutomatically(true);
-    vertx
-        .createHttpServer(serverOptions)
-        .requestHandler(router)
-        .listen(0)
-        .onSuccess(
-            server ->
-                eventBus.request(
-                    "PORT_DATA",
-                    server.actualPort(),
-                    ar -> {
-                      if (ar.succeeded()) {
+        final HttpServerOptions serverOptions = new HttpServerOptions();
+        if (config().getBoolean("https")) {
+            final SelfSignedCertificate certificate = SelfSignedCertificate.create();
+            serverOptions.setSsl(true);
+            serverOptions.setUseAlpn(true);
+            serverOptions.setTrustOptions(certificate.trustOptions());
+            serverOptions.setKeyCertOptions(certificate.keyCertOptions());
+        }
+        serverOptions.setHandle100ContinueAutomatically(true);
+        vertx.createHttpServer(serverOptions)
+                .requestHandler(router)
+                .listen(0)
+                .onSuccess(server -> eventBus.request("PORT_DATA", server.actualPort(), ar -> {
+                    if (ar.succeeded()) {
                         startPromise.complete();
-                      } else {
+                    } else {
                         startPromise.fail(ar.cause());
-                      }
-                    }))
-        .onFailure(startPromise::fail);
-  }
+                    }
+                }))
+                .onFailure(startPromise::fail);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/RouteHandlerExceptionHandlerTest.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/RouteHandlerExceptionHandlerTest.java
index fb91f77a4b7..24bf9858beb 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/RouteHandlerExceptionHandlerTest.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/RouteHandlerExceptionHandlerTest.java
@@ -36,95 +36,82 @@
  */
 class RouteHandlerExceptionHandlerTest extends AbstractInstrumentationTest {
 
-  private static Vertx vertx;
-  private static HttpServer server;
-  private static int port;
+    private static Vertx vertx;
+    private static HttpServer server;
+    private static int port;
 
-  @BeforeAll
-  static void startServer() throws Exception {
-    try (ServerSocket socket = new ServerSocket(0)) {
-      port = socket.getLocalPort();
-    }
+    @BeforeAll
+    static void startServer() throws Exception {
+        try (ServerSocket socket = new ServerSocket(0)) {
+            port = socket.getLocalPort();
+        }
 
-    vertx = Vertx.vertx();
-    Router router = Router.router(vertx);
-    router
-        .route("/fail")
-        .handler(
-            ctx -> {
-              ResponseExceptionFiringHelper.fireException(
-                  ctx.response(), new IOException("simulated response I/O failure"));
-              try {
+        vertx = Vertx.vertx();
+        Router router = Router.router(vertx);
+        router.route("/fail").handler(ctx -> {
+            ResponseExceptionFiringHelper.fireException(
+                    ctx.response(), new IOException("simulated response I/O failure"));
+            try {
                 ctx.response().setStatusCode(500).end("error");
-              } catch (IllegalStateException ignore) {
+            } catch (IllegalStateException ignore) {
                 // handleException may have left the response in a state where end() is rejected;
                 // the span is already finished by our addEndHandler callback.
-              }
-            });
+            }
+        });
 
-    CountDownLatch ready = new CountDownLatch(1);
-    server =
-        vertx
-            .createHttpServer()
-            .requestHandler(router)
-            .listen(
-                port,
-                result -> {
-                  if (result.failed()) {
-                    throw new RuntimeException("Failed to start Vert.x server", result.cause());
-                  }
-                  ready.countDown();
-                });
-    if (!ready.await(10, TimeUnit.SECONDS)) {
-      throw new IllegalStateException("Vert.x server did not start in time");
+        CountDownLatch ready = new CountDownLatch(1);
+        server = vertx.createHttpServer().requestHandler(router).listen(port, result -> {
+            if (result.failed()) {
+                throw new RuntimeException("Failed to start Vert.x server", result.cause());
+            }
+            ready.countDown();
+        });
+        if (!ready.await(10, TimeUnit.SECONDS)) {
+            throw new IllegalStateException("Vert.x server did not start in time");
+        }
     }
-  }
 
-  @AfterAll
-  static void stopServer() throws Exception {
-    if (server != null) {
-      CountDownLatch closed = new CountDownLatch(1);
-      server.close(ar -> closed.countDown());
-      closed.await(10, TimeUnit.SECONDS);
-    }
-    if (vertx != null) {
-      CountDownLatch closed = new CountDownLatch(1);
-      vertx.close(ar -> closed.countDown());
-      closed.await(10, TimeUnit.SECONDS);
+    @AfterAll
+    static void stopServer() throws Exception {
+        if (server != null) {
+            CountDownLatch closed = new CountDownLatch(1);
+            server.close(ar -> closed.countDown());
+            closed.await(10, TimeUnit.SECONDS);
+        }
+        if (vertx != null) {
+            CountDownLatch closed = new CountDownLatch(1);
+            vertx.close(ar -> closed.countDown());
+            closed.await(10, TimeUnit.SECONDS);
+        }
     }
-  }
 
-  @Test
-  void exceptionHandlerFinishesRouteHandlerSpan() throws Exception {
-    HttpURLConnection conn =
-        (HttpURLConnection) new URL("http://localhost:" + port + "/fail").openConnection();
-    conn.setRequestMethod("GET");
-    conn.setConnectTimeout(5000);
-    conn.setReadTimeout(5000);
-    try {
-      // We don't care about the response code or body — only that the trace flushes.
-      conn.getResponseCode();
-    } catch (IOException ignore) {
-      // If end() was rejected after handleException, the client may see a closed connection.
-    } finally {
-      conn.disconnect();
-    }
+    @Test
+    void exceptionHandlerFinishesRouteHandlerSpan() throws Exception {
+        HttpURLConnection conn = (HttpURLConnection) new URL("http://localhost:" + port + "/fail").openConnection();
+        conn.setRequestMethod("GET");
+        conn.setConnectTimeout(5000);
+        conn.setReadTimeout(5000);
+        try {
+            // We don't care about the response code or body — only that the trace flushes.
+            conn.getResponseCode();
+        } catch (IOException ignore) {
+            // If end() was rejected after handleException, the client may see a closed connection.
+        } finally {
+            conn.disconnect();
+        }
 
-    // If addEndHandler did not finish the route-handler span, assertTraces would time out
-    // waiting for the trace to flush.
-    // The netty.request span is marked as errored because the route handler ends with
-    // HTTP 500; the route-handler span is finished by our addEndHandler callback before
-    // setStatusCode(500), so it sees status=200 (default) and is not errored.
-    assertTraces(
-        trace(
-            SORT_BY_START_TIME,
-            span()
-                .operationName(Pattern.compile(Pattern.quote("netty.request")))
-                .type(DDSpanTypes.HTTP_SERVER)
-                .error(),
-            span()
-                .childOfPrevious()
-                .operationName(Pattern.compile(Pattern.quote("vertx.route-handler")))
-                .type(DDSpanTypes.HTTP_SERVER)));
-  }
+        // If addEndHandler did not finish the route-handler span, assertTraces would time out
+        // waiting for the trace to flush.
+        // The netty.request span is marked as errored because the route handler ends with
+        // HTTP 500; the route-handler span is finished by our addEndHandler callback before
+        // setStatusCode(500), so it sees status=200 (default) and is not errored.
+        assertTraces(trace(
+                SORT_BY_START_TIME,
+                span().operationName(Pattern.compile(Pattern.quote("netty.request")))
+                        .type(DDSpanTypes.HTTP_SERVER)
+                        .error(),
+                span().childOfPrevious()
+                        .operationName(Pattern.compile(Pattern.quote("vertx.route-handler")))
+                        .type(DDSpanTypes.HTTP_SERVER)));
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/VertxMiddlewareTestServer.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/VertxMiddlewareTestServer.java
index e77f1b6fb65..f2ac240d749 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/VertxMiddlewareTestServer.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/VertxMiddlewareTestServer.java
@@ -5,13 +5,13 @@
 import io.vertx.ext.web.RoutingContext;
 
 public class VertxMiddlewareTestServer extends VertxTestServer {
-  @Override
-  protected void customizeBeforeRoutes(Router router) {
-    router.route().handler(VertxMiddlewareTestServer::firstHandler);
-  }
+    @Override
+    protected void customizeBeforeRoutes(Router router) {
+        router.route().handler(VertxMiddlewareTestServer::firstHandler);
+    }
 
-  private static void firstHandler(final RoutingContext ctx) {
-    AgentTracer.activeSpan().setTag("before", true);
-    ctx.next();
-  }
+    private static void firstHandler(final RoutingContext ctx) {
+        AgentTracer.activeSpan().setTag("before", true);
+        ctx.next();
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/VertxSubrouterTestServer.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/VertxSubrouterTestServer.java
index 27060432e7e..668aab475b0 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/VertxSubrouterTestServer.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/VertxSubrouterTestServer.java
@@ -3,10 +3,10 @@
 import io.vertx.ext.web.Router;
 
 public class VertxSubrouterTestServer extends VertxTestServer {
-  @Override
-  protected Router customizeAfterRoutes(Router configured) {
-    Router router = Router.router(vertx);
-    router.mountSubRouter("/sub/", configured);
-    return router;
-  }
+    @Override
+    protected Router customizeAfterRoutes(Router configured) {
+        Router router = Router.router(vertx);
+        router.mountSubRouter("/sub/", configured);
+        return router;
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/VertxTestServer.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/VertxTestServer.java
index 53c8236ef78..f779a65d34b 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/VertxTestServer.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/VertxTestServer.java
@@ -36,248 +36,174 @@
 import io.vertx.ext.web.sstore.LocalSessionStore;
 
 public class VertxTestServer extends AbstractVerticle {
-  public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port";
-  public static final String PORT_DATA_ADDRESS = "PORT_DATA";
-
-  @Override
-  public void start(final Promise<Void> startPromise) {
-    final int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
-    Router router = Router.router(vertx);
-
-    customizeBeforeRoutes(router);
-
-    router
-        .route(SUCCESS.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    SUCCESS,
-                    () ->
-                        ctx.response().setStatusCode(SUCCESS.getStatus()).end(SUCCESS.getBody())));
-    router
-        .route(FORWARDED.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    FORWARDED,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(FORWARDED.getStatus())
-                            .end(ctx.request().getHeader("x-forwarded-for"))));
-    router
-        .route(CREATED.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    CREATED,
-                    () ->
-                        ctx.request()
-                            .bodyHandler(
-                                body ->
-                                    ctx.response()
+    public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port";
+    public static final String PORT_DATA_ADDRESS = "PORT_DATA";
+
+    @Override
+    public void start(final Promise<Void> startPromise) {
+        final int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
+        Router router = Router.router(vertx);
+
+        customizeBeforeRoutes(router);
+
+        router.route(SUCCESS.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        SUCCESS,
+                        () -> ctx.response().setStatusCode(SUCCESS.getStatus()).end(SUCCESS.getBody())));
+        router.route(FORWARDED.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        FORWARDED,
+                        () -> ctx.response()
+                                .setStatusCode(FORWARDED.getStatus())
+                                .end(ctx.request().getHeader("x-forwarded-for"))));
+        router.route(CREATED.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        CREATED,
+                        () -> ctx.request()
+                                .bodyHandler(body -> ctx.response()
                                         .setStatusCode(CREATED.getStatus())
                                         .end(CREATED.getBody() + ": " + body.toString()))));
-    router.route(BODY_URLENCODED.getPath()).handler(BodyHandler.create());
-    router
-        .route(BODY_URLENCODED.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    BODY_URLENCODED,
-                    () -> {
-                      String res = convertFormAttributes(ctx);
-                      ctx.response().setStatusCode(BODY_URLENCODED.getStatus()).end(res);
-                    }));
-    router.route(BODY_MULTIPART.getPath()).handler(BodyHandler.create());
-    router
-        .route(BODY_MULTIPART.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    BODY_MULTIPART,
-                    () -> {
-                      ctx.fileUploads();
-                      String res = convertFormAttributes(ctx);
-                      ctx.response().setStatusCode(BODY_MULTIPART.getStatus()).end(res);
-                    }));
-    router.route(BODY_JSON.getPath()).handler(BodyHandler.create());
-    router
-        .route(BODY_JSON.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    BODY_JSON,
-                    () -> {
-                      JsonObject json = ctx.getBodyAsJson();
-                      ctx.response().setStatusCode(BODY_JSON.getStatus());
-                      ctx.json(json);
-                    }));
-    router
-        .route(QUERY_ENCODED_BOTH.getRawPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    QUERY_ENCODED_BOTH,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(QUERY_ENCODED_BOTH.getStatus())
-                            .end(QUERY_ENCODED_BOTH.bodyForQuery(ctx.request().query()))));
-    router
-        .route(QUERY_ENCODED_QUERY.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    QUERY_ENCODED_QUERY,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(QUERY_ENCODED_QUERY.getStatus())
-                            .end(QUERY_ENCODED_QUERY.bodyForQuery(ctx.request().query()))));
-    router
-        .route(QUERY_PARAM.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    QUERY_PARAM,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(QUERY_PARAM.getStatus())
-                            .end(ctx.request().query())));
-
-    router
-        .route(USER_BLOCK.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    USER_BLOCK,
-                    () -> {
-                      Blocking.forUser("user-to-block").blockIfMatch();
-                      ctx.response().end("Should not be reached");
-                    }));
-
-    router
-        .route("/path/:id/param")
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    PATH_PARAM,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(PATH_PARAM.getStatus())
-                            .end(ctx.request().getParam("id"))));
-    router
-        .route(REDIRECT.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    REDIRECT,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(REDIRECT.getStatus())
-                            .putHeader("location", REDIRECT.getBody())
-                            .end()));
-    router
-        .route(ERROR.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    ERROR,
-                    () -> ctx.response().setStatusCode(ERROR.getStatus()).end(ERROR.getBody())));
-    router
-        .route(EXCEPTION.getPath())
-        .handler(ctx -> controller(ctx, EXCEPTION, VertxTestServer::exception));
-
-    router
-        .route(SESSION_ID.getPath())
-        .handler(SessionHandler.create(LocalSessionStore.create(vertx)));
-    router
-        .route(SESSION_ID.getPath())
-        .handler(
-            ctx -> ctx.response().setStatusCode(SESSION_ID.getStatus()).end(ctx.session().id()));
-
-    router = customizeAfterRoutes(router);
-
-    vertx
-        .createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
-        .requestHandler(router)
-        .listen(
-            port,
-            event -> {
-              // send this though event bus and succed deploy after successfull response
-              int actualPort = event.result().actualPort();
-              vertx
-                  .eventBus()
-                  .request(
-                      PORT_DATA_ADDRESS,
-                      actualPort,
-                      ar -> {
+        router.route(BODY_URLENCODED.getPath()).handler(BodyHandler.create());
+        router.route(BODY_URLENCODED.getPath())
+                .handler(ctx -> controller(ctx, BODY_URLENCODED, () -> {
+                    String res = convertFormAttributes(ctx);
+                    ctx.response().setStatusCode(BODY_URLENCODED.getStatus()).end(res);
+                }));
+        router.route(BODY_MULTIPART.getPath()).handler(BodyHandler.create());
+        router.route(BODY_MULTIPART.getPath())
+                .handler(ctx -> controller(ctx, BODY_MULTIPART, () -> {
+                    ctx.fileUploads();
+                    String res = convertFormAttributes(ctx);
+                    ctx.response().setStatusCode(BODY_MULTIPART.getStatus()).end(res);
+                }));
+        router.route(BODY_JSON.getPath()).handler(BodyHandler.create());
+        router.route(BODY_JSON.getPath())
+                .handler(ctx -> controller(ctx, BODY_JSON, () -> {
+                    JsonObject json = ctx.getBodyAsJson();
+                    ctx.response().setStatusCode(BODY_JSON.getStatus());
+                    ctx.json(json);
+                }));
+        router.route(QUERY_ENCODED_BOTH.getRawPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        QUERY_ENCODED_BOTH,
+                        () -> ctx.response()
+                                .setStatusCode(QUERY_ENCODED_BOTH.getStatus())
+                                .end(QUERY_ENCODED_BOTH.bodyForQuery(
+                                        ctx.request().query()))));
+        router.route(QUERY_ENCODED_QUERY.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        QUERY_ENCODED_QUERY,
+                        () -> ctx.response()
+                                .setStatusCode(QUERY_ENCODED_QUERY.getStatus())
+                                .end(QUERY_ENCODED_QUERY.bodyForQuery(
+                                        ctx.request().query()))));
+        router.route(QUERY_PARAM.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        QUERY_PARAM,
+                        () -> ctx.response()
+                                .setStatusCode(QUERY_PARAM.getStatus())
+                                .end(ctx.request().query())));
+
+        router.route(USER_BLOCK.getPath())
+                .handler(ctx -> controller(ctx, USER_BLOCK, () -> {
+                    Blocking.forUser("user-to-block").blockIfMatch();
+                    ctx.response().end("Should not be reached");
+                }));
+
+        router.route("/path/:id/param")
+                .handler(ctx -> controller(
+                        ctx,
+                        PATH_PARAM,
+                        () -> ctx.response()
+                                .setStatusCode(PATH_PARAM.getStatus())
+                                .end(ctx.request().getParam("id"))));
+        router.route(REDIRECT.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        REDIRECT,
+                        () -> ctx.response()
+                                .setStatusCode(REDIRECT.getStatus())
+                                .putHeader("location", REDIRECT.getBody())
+                                .end()));
+        router.route(ERROR.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        ERROR,
+                        () -> ctx.response().setStatusCode(ERROR.getStatus()).end(ERROR.getBody())));
+        router.route(EXCEPTION.getPath()).handler(ctx -> controller(ctx, EXCEPTION, VertxTestServer::exception));
+
+        router.route(SESSION_ID.getPath()).handler(SessionHandler.create(LocalSessionStore.create(vertx)));
+        router.route(SESSION_ID.getPath())
+                .handler(ctx -> ctx.response()
+                        .setStatusCode(SESSION_ID.getStatus())
+                        .end(ctx.session().id()));
+
+        router = customizeAfterRoutes(router);
+
+        vertx.createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
+                .requestHandler(router)
+                .listen(port, event -> {
+                    // send this though event bus and succed deploy after successfull response
+                    int actualPort = event.result().actualPort();
+                    vertx.eventBus().request(PORT_DATA_ADDRESS, actualPort, ar -> {
                         if (ar.succeeded()) {
-                          startPromise.complete();
+                            startPromise.complete();
                         } else {
-                          startPromise.fail(ar.cause());
+                            startPromise.fail(ar.cause());
                         }
-                      });
-            });
-  }
+                    });
+                });
+    }
 
-  private static String convertFormAttributes(RoutingContext ctx) {
-    String res = "[";
-    MultiMap entries = ctx.request().formAttributes();
-    for (String name : entries.names()) {
-      if (name.equals("ignore")) {
-        continue;
-      }
-      if (res.length() > 1) {
-        res += ", ";
-      }
-      res += name;
-      res += ":[";
-      int i = 0;
-      for (String s : entries.getAll(name)) {
-        if (i++ > 0) {
-          res += ", ";
+    private static String convertFormAttributes(RoutingContext ctx) {
+        String res = "[";
+        MultiMap entries = ctx.request().formAttributes();
+        for (String name : entries.names()) {
+            if (name.equals("ignore")) {
+                continue;
+            }
+            if (res.length() > 1) {
+                res += ", ";
+            }
+            res += name;
+            res += ":[";
+            int i = 0;
+            for (String s : entries.getAll(name)) {
+                if (i++ > 0) {
+                    res += ", ";
+                }
+                res += s;
+            }
+            res += ']';
         }
-        res += s;
-      }
-      res += ']';
+        res += ']';
+        return res;
     }
-    res += ']';
-    return res;
-  }
 
-  protected void customizeBeforeRoutes(Router router) {}
+    protected void customizeBeforeRoutes(Router router) {}
 
-  protected Router customizeAfterRoutes(final Router router) {
-    return router;
-  }
+    protected Router customizeAfterRoutes(final Router router) {
+        return router;
+    }
 
-  private static void exception() {
-    throw new RuntimeException(EXCEPTION.getBody());
-  }
+    private static void exception() {
+        throw new RuntimeException(EXCEPTION.getBody());
+    }
 
-  private static void controller(
-      RoutingContext ctx, final ServerEndpoint endpoint, final Runnable runnable) {
-    assert activeSpan() != null : "Controller should have a parent span.";
-    assert isAsyncPropagationEnabled() : "Span should be propagating async.";
-    ctx.response()
-        .putHeader(
-            HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE());
-    if (endpoint == NOT_FOUND || endpoint == UNKNOWN) {
-      runnable.run();
-      return;
+    private static void controller(RoutingContext ctx, final ServerEndpoint endpoint, final Runnable runnable) {
+        assert activeSpan() != null : "Controller should have a parent span.";
+        assert isAsyncPropagationEnabled() : "Span should be propagating async.";
+        ctx.response().putHeader(HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE());
+        if (endpoint == NOT_FOUND || endpoint == UNKNOWN) {
+            runnable.run();
+            return;
+        }
+        runnableUnderTraceAsync("controller", runnable);
     }
-    runnableUnderTraceAsync("controller", runnable);
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/FileUploadHelper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/FileUploadHelper.java
index 045d825444a..1b29dc3645a 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/FileUploadHelper.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/FileUploadHelper.java
@@ -12,40 +12,38 @@
 
 public class FileUploadHelper {
 
-  public static BlockingException commitBlockingResponse(
-      BiFunction<RequestContext, List<String>, Flow<Void>> cb,
-      RequestContext reqCtx,
-      List<String> data,
-      String reason) {
-    Flow<Void> flow = cb.apply(reqCtx, data);
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
-      if (brf != null) {
-        brf.tryCommitBlockingResponse(
-            reqCtx.getTraceSegment(), (Flow.Action.RequestBlockingAction) action);
-        return new BlockingException(reason);
-      }
+    public static BlockingException commitBlockingResponse(
+            BiFunction<RequestContext, List<String>, Flow<Void>> cb,
+            RequestContext reqCtx,
+            List<String> data,
+            String reason) {
+        Flow<Void> flow = cb.apply(reqCtx, data);
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
+            if (brf != null) {
+                brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), (Flow.Action.RequestBlockingAction) action);
+                return new BlockingException(reason);
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  public static String readUploadContent(FileUpload upload, int maxBytes) {
-    try {
-      String path = upload.uploadedFileName();
-      if (path == null || path.isEmpty()) {
-        return "";
-      }
-      String charSet = upload.charSet();
-      String contentType =
-          charSet != null && !charSet.isEmpty()
-              ? upload.contentType() + "; charset=" + charSet
-              : upload.contentType();
-      try (FileInputStream fis = new FileInputStream(path)) {
-        return MultipartContentDecoder.readInputStream(fis, maxBytes, contentType);
-      }
-    } catch (Exception ignored) {
-      return "";
+    public static String readUploadContent(FileUpload upload, int maxBytes) {
+        try {
+            String path = upload.uploadedFileName();
+            if (path == null || path.isEmpty()) {
+                return "";
+            }
+            String charSet = upload.charSet();
+            String contentType = charSet != null && !charSet.isEmpty()
+                    ? upload.contentType() + "; charset=" + charSet
+                    : upload.contentType();
+            try (FileInputStream fis = new FileInputStream(path)) {
+                return MultipartContentDecoder.readInputStream(fis, maxBytes, contentType);
+            }
+        } catch (Exception ignored) {
+            return "";
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/HttpServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/HttpServerRequestInstrumentation.java
index 1c72089627a..c0431533c1b 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/HttpServerRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/HttpServerRequestInstrumentation.java
@@ -16,40 +16,40 @@
 
 @AutoService(InstrumenterModule.class)
 public class HttpServerRequestInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public HttpServerRequestInstrumentation() {
-    super("vertx", "vertx-5.0");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public HttpServerRequestInstrumentation() {
+        super("vertx", "vertx-5.0");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.core.http.HttpServerRequest";
-  }
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.core.http.HttpServerRequest";
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {VertxVersionMatcher.HTTP_HEADERS_INTERNAL};
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {VertxVersionMatcher.HTTP_HEADERS_INTERNAL};
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("bodyHandler"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, named("io.vertx.core.Handler"))),
-        HttpServerRequestInstrumentation.class.getName() + "$BodyHandlerAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("bodyHandler"))
+                        .and(takesArguments(1))
+                        .and(takesArgument(0, named("io.vertx.core.Handler"))),
+                HttpServerRequestInstrumentation.class.getName() + "$BodyHandlerAdvice");
+    }
 
-  /**
-   * @see HttpServerRequest#bodyHandler(Handler)
-   */
-  static class BodyHandlerAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    static void after(@Advice.Argument(value = 0, readOnly = false) Handler<Buffer> h) {
-      if (h != null) {
-        h = new WafPublishingBodyHandler(h);
-      }
+    /**
+     * @see HttpServerRequest#bodyHandler(Handler)
+     */
+    static class BodyHandlerAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        static void after(@Advice.Argument(value = 0, readOnly = false) Handler<Buffer> h) {
+            if (h != null) {
+                h = new WafPublishingBodyHandler(h);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/RoutingContextFilenamesAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/RoutingContextFilenamesAdvice.java
index 189fd6cd0f7..403d4f483a8 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/RoutingContextFilenamesAdvice.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/RoutingContextFilenamesAdvice.java
@@ -20,68 +20,63 @@
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 class RoutingContextFilenamesAdvice {
 
-  @Advice.OnMethodEnter(suppress = Throwable.class)
-  static int before() {
-    return CallDepthThreadLocalMap.incrementCallDepth(FileUpload.class);
-  }
-
-  @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  static void after(
-      @Advice.Enter int depth,
-      @Advice.Return List<FileUpload> uploads,
-      @ActiveRequestContext RequestContext reqCtx,
-      @Advice.Thrown(readOnly = false) Throwable throwable) {
-    CallDepthThreadLocalMap.decrementCallDepth(FileUpload.class);
-    if (depth != 0 || throwable != null || uploads == null || uploads.isEmpty()) {
-      return;
-    }
-
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb =
-        cbp.getCallback(EVENTS.requestFilesFilenames());
-    BiFunction<RequestContext, List<String>, Flow<Void>> contentCb =
-        cbp.getCallback(EVENTS.requestFilesContent());
-    if (filenamesCb == null && contentCb == null) {
-      return;
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    static int before() {
+        return CallDepthThreadLocalMap.incrementCallDepth(FileUpload.class);
     }
 
-    int maxFiles = Config.get().getAppSecMaxFileContentCount();
-    int maxBytes = Config.get().getAppSecMaxFileContentBytes();
-    List<String> filenames = null;
-    List<String> filesContent = null;
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    static void after(
+            @Advice.Enter int depth,
+            @Advice.Return List<FileUpload> uploads,
+            @ActiveRequestContext RequestContext reqCtx,
+            @Advice.Thrown(readOnly = false) Throwable throwable) {
+        CallDepthThreadLocalMap.decrementCallDepth(FileUpload.class);
+        if (depth != 0 || throwable != null || uploads == null || uploads.isEmpty()) {
+            return;
+        }
 
-    for (FileUpload upload : uploads) {
-      String name = upload.fileName();
-      if (filenamesCb != null && name != null && !name.isEmpty()) {
-        if (filenames == null) {
-          filenames = new ArrayList<>();
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCb =
+                cbp.getCallback(EVENTS.requestFilesFilenames());
+        BiFunction<RequestContext, List<String>, Flow<Void>> contentCb = cbp.getCallback(EVENTS.requestFilesContent());
+        if (filenamesCb == null && contentCb == null) {
+            return;
         }
-        filenames.add(name);
-      }
-      if (contentCb != null
-          && maxFiles > 0
-          && (filesContent == null || filesContent.size() < maxFiles)) {
-        if (filesContent == null) {
-          filesContent = new ArrayList<>();
+
+        int maxFiles = Config.get().getAppSecMaxFileContentCount();
+        int maxBytes = Config.get().getAppSecMaxFileContentBytes();
+        List<String> filenames = null;
+        List<String> filesContent = null;
+
+        for (FileUpload upload : uploads) {
+            String name = upload.fileName();
+            if (filenamesCb != null && name != null && !name.isEmpty()) {
+                if (filenames == null) {
+                    filenames = new ArrayList<>();
+                }
+                filenames.add(name);
+            }
+            if (contentCb != null && maxFiles > 0 && (filesContent == null || filesContent.size() < maxFiles)) {
+                if (filesContent == null) {
+                    filesContent = new ArrayList<>();
+                }
+                filesContent.add(FileUploadHelper.readUploadContent(upload, maxBytes));
+            }
         }
-        filesContent.add(FileUploadHelper.readUploadContent(upload, maxBytes));
-      }
-    }
 
-    if (filenamesCb != null && filenames != null) {
-      throwable =
-          FileUploadHelper.commitBlockingResponse(
-              filenamesCb, reqCtx, filenames, "Blocked request (multipart file upload)");
-    }
+        if (filenamesCb != null && filenames != null) {
+            throwable = FileUploadHelper.commitBlockingResponse(
+                    filenamesCb, reqCtx, filenames, "Blocked request (multipart file upload)");
+        }
 
-    if (throwable != null) {
-      return;
-    }
+        if (throwable != null) {
+            return;
+        }
 
-    if (contentCb != null && filesContent != null) {
-      throwable =
-          FileUploadHelper.commitBlockingResponse(
-              contentCb, reqCtx, filesContent, "Blocked request (file content)");
+        if (contentCb != null && filesContent != null) {
+            throwable = FileUploadHelper.commitBlockingResponse(
+                    contentCb, reqCtx, filesContent, "Blocked request (file content)");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/RoutingContextImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/RoutingContextImplInstrumentation.java
index 5f4c1eba306..077b5f04466 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/RoutingContextImplInstrumentation.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/RoutingContextImplInstrumentation.java
@@ -10,34 +10,32 @@
 
 @AutoService(InstrumenterModule.class)
 public class RoutingContextImplInstrumentation extends InstrumenterModule.AppSec
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  private static final Reference FILE_UPLOAD_REF =
-      new Reference.Builder("io.vertx.ext.web.FileUpload")
-          .withMethod(new String[0], 0, "fileName", "Ljava/lang/String;")
-          .withMethod(new String[0], 0, "uploadedFileName", "Ljava/lang/String;")
-          .withMethod(new String[0], 0, "contentType", "Ljava/lang/String;")
-          .withMethod(new String[0], 0, "charSet", "Ljava/lang/String;")
-          .build();
-
-  public RoutingContextImplInstrumentation() {
-    super("vertx", "vertx-5.0");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "io.vertx.ext.web.impl.RoutingContextImpl";
-  }
-
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {VertxVersionMatcher.HTTP_HEADERS_INTERNAL, FILE_UPLOAD_REF};
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("fileUploads").and(takesArguments(0)),
-        packageName + ".RoutingContextFilenamesAdvice");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    private static final Reference FILE_UPLOAD_REF = new Reference.Builder("io.vertx.ext.web.FileUpload")
+            .withMethod(new String[0], 0, "fileName", "Ljava/lang/String;")
+            .withMethod(new String[0], 0, "uploadedFileName", "Ljava/lang/String;")
+            .withMethod(new String[0], 0, "contentType", "Ljava/lang/String;")
+            .withMethod(new String[0], 0, "charSet", "Ljava/lang/String;")
+            .build();
+
+    public RoutingContextImplInstrumentation() {
+        super("vertx", "vertx-5.0");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "io.vertx.ext.web.impl.RoutingContextImpl";
+    }
+
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {VertxVersionMatcher.HTTP_HEADERS_INTERNAL, FILE_UPLOAD_REF};
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("fileUploads").and(takesArguments(0)), packageName + ".RoutingContextFilenamesAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/VertxVersionMatcher.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/VertxVersionMatcher.java
index 3eef7d7bb3f..63a225ce0dd 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/VertxVersionMatcher.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/VertxVersionMatcher.java
@@ -5,7 +5,7 @@
 // checks for vertx > 5
 public class VertxVersionMatcher {
 
-  // added in 5.0
-  public static final Reference HTTP_HEADERS_INTERNAL =
-      new Reference.Builder("io.vertx.core.internal.http.HttpHeadersInternal").build();
+    // added in 5.0
+    public static final Reference HTTP_HEADERS_INTERNAL =
+            new Reference.Builder("io.vertx.core.internal.http.HttpHeadersInternal").build();
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/WafPublishingBodyHandler.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/WafPublishingBodyHandler.java
index 92364ba2cec..c071b5acb0a 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/WafPublishingBodyHandler.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/WafPublishingBodyHandler.java
@@ -20,514 +20,512 @@
 import java.util.function.BiFunction;
 
 public class WafPublishingBodyHandler implements Handler<Buffer> {
-  private final Handler<Buffer> delegate;
+    private final Handler<Buffer> delegate;
 
-  public WafPublishingBodyHandler(Handler<Buffer> delegate) {
-    this.delegate = delegate;
-  }
+    public WafPublishingBodyHandler(Handler<Buffer> delegate) {
+        this.delegate = delegate;
+    }
 
-  @Override
-  public void handle(Buffer buffer) {
-    this.delegate.handle(new BufferWrapper(buffer));
-  }
+    @Override
+    public void handle(Buffer buffer) {
+        this.delegate.handle(new BufferWrapper(buffer));
+    }
 
-  static class BufferWrapper implements Buffer {
-    private final Buffer delegate;
-    private final AtomicBoolean hasPublished = new AtomicBoolean();
+    static class BufferWrapper implements Buffer {
+        private final Buffer delegate;
+        private final AtomicBoolean hasPublished = new AtomicBoolean();
 
-    BufferWrapper(Buffer delegate) {
-      this.delegate = delegate;
-    }
+        BufferWrapper(Buffer delegate) {
+            this.delegate = delegate;
+        }
 
-    private void publishRequestBody(Object body) {
-      if (!hasPublished.compareAndSet(false, true)) {
-        return;
-      }
-
-      AgentSpan span = AgentTracer.activeSpan();
-      if (span == null) {
-        return;
-      }
-
-      CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-      BiFunction<RequestContext, Object, Flow<Void>> callback =
-          cbp.getCallback(EVENTS.requestBodyProcessed());
-      if (callback == null) {
-        return;
-      }
-
-      RequestContext reqCtx = span.getRequestContext();
-      if (reqCtx == null) {
-        return;
-      }
-
-      Flow<Void> flow = callback.apply(reqCtx, body);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
-        if (blockResponseFunction == null) {
-          return;
-        }
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
-        throw new BlockingException(
-            "Blocked request (for Buffer/toString or Buffer/toJson{Object,Array})");
-      }
-    }
+        private void publishRequestBody(Object body) {
+            if (!hasPublished.compareAndSet(false, true)) {
+                return;
+            }
+
+            AgentSpan span = AgentTracer.activeSpan();
+            if (span == null) {
+                return;
+            }
+
+            CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+            BiFunction<RequestContext, Object, Flow<Void>> callback = cbp.getCallback(EVENTS.requestBodyProcessed());
+            if (callback == null) {
+                return;
+            }
+
+            RequestContext reqCtx = span.getRequestContext();
+            if (reqCtx == null) {
+                return;
+            }
+
+            Flow<Void> flow = callback.apply(reqCtx, body);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
+                if (blockResponseFunction == null) {
+                    return;
+                }
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
+                throw new BlockingException("Blocked request (for Buffer/toString or Buffer/toJson{Object,Array})");
+            }
+        }
 
-    @Override
-    public String toString() {
-      String s = delegate.toString();
-      publishRequestBody(s);
-      return s;
-    }
+        @Override
+        public String toString() {
+            String s = delegate.toString();
+            publishRequestBody(s);
+            return s;
+        }
 
-    @Override
-    public String toString(String enc) {
-      String s = delegate.toString(enc);
-      publishRequestBody(s);
-      return s;
-    }
+        @Override
+        public String toString(String enc) {
+            String s = delegate.toString(enc);
+            publishRequestBody(s);
+            return s;
+        }
 
-    @Override
-    public String toString(Charset enc) {
-      String s = delegate.toString(enc);
-      publishRequestBody(s);
-      return s;
-    }
+        @Override
+        public String toString(Charset enc) {
+            String s = delegate.toString(enc);
+            publishRequestBody(s);
+            return s;
+        }
 
-    @Override
-    public JsonObject toJsonObject() {
-      JsonObject jo = delegate.toJsonObject();
-      publishRequestBody(jo.getMap());
-      return jo;
-    }
+        @Override
+        public JsonObject toJsonObject() {
+            JsonObject jo = delegate.toJsonObject();
+            publishRequestBody(jo.getMap());
+            return jo;
+        }
 
-    @Override
-    public JsonArray toJsonArray() {
-      JsonArray ja = delegate.toJsonArray();
-      publishRequestBody(ja.getList());
-      return ja;
-    }
+        @Override
+        public JsonArray toJsonArray() {
+            JsonArray ja = delegate.toJsonArray();
+            publishRequestBody(ja.getList());
+            return ja;
+        }
 
-    @Override
-    public byte getByte(int pos) {
-      return delegate.getByte(pos);
-    }
+        @Override
+        public byte getByte(int pos) {
+            return delegate.getByte(pos);
+        }
 
-    @Override
-    public short getUnsignedByte(int pos) {
-      return delegate.getUnsignedByte(pos);
-    }
+        @Override
+        public short getUnsignedByte(int pos) {
+            return delegate.getUnsignedByte(pos);
+        }
 
-    @Override
-    public int getInt(int pos) {
-      return delegate.getInt(pos);
-    }
+        @Override
+        public int getInt(int pos) {
+            return delegate.getInt(pos);
+        }
 
-    @Override
-    public int getIntLE(int pos) {
-      return delegate.getIntLE(pos);
-    }
+        @Override
+        public int getIntLE(int pos) {
+            return delegate.getIntLE(pos);
+        }
 
-    @Override
-    public long getUnsignedInt(int pos) {
-      return delegate.getUnsignedInt(pos);
-    }
+        @Override
+        public long getUnsignedInt(int pos) {
+            return delegate.getUnsignedInt(pos);
+        }
 
-    @Override
-    public long getUnsignedIntLE(int pos) {
-      return delegate.getUnsignedIntLE(pos);
-    }
+        @Override
+        public long getUnsignedIntLE(int pos) {
+            return delegate.getUnsignedIntLE(pos);
+        }
 
-    @Override
-    public long getLong(int pos) {
-      return delegate.getLong(pos);
-    }
+        @Override
+        public long getLong(int pos) {
+            return delegate.getLong(pos);
+        }
 
-    @Override
-    public long getLongLE(int pos) {
-      return delegate.getLongLE(pos);
-    }
+        @Override
+        public long getLongLE(int pos) {
+            return delegate.getLongLE(pos);
+        }
 
-    @Override
-    public double getDouble(int pos) {
-      return delegate.getDouble(pos);
-    }
+        @Override
+        public double getDouble(int pos) {
+            return delegate.getDouble(pos);
+        }
 
-    @Override
-    public double getDoubleLE(int i) {
-      return delegate.getDoubleLE(i);
-    }
+        @Override
+        public double getDoubleLE(int i) {
+            return delegate.getDoubleLE(i);
+        }
 
-    @Override
-    public float getFloatLE(int i) {
-      return delegate.getFloatLE(i);
-    }
+        @Override
+        public float getFloatLE(int i) {
+            return delegate.getFloatLE(i);
+        }
 
-    @Override
-    public Buffer appendFloatLE(float v) {
-      return delegate.appendFloatLE(v);
-    }
+        @Override
+        public Buffer appendFloatLE(float v) {
+            return delegate.appendFloatLE(v);
+        }
 
-    @Override
-    public Buffer appendDoubleLE(double v) {
-      return delegate.appendDoubleLE(v);
-    }
+        @Override
+        public Buffer appendDoubleLE(double v) {
+            return delegate.appendDoubleLE(v);
+        }
 
-    @Override
-    public Buffer setDoubleLE(int i, double v) {
-      return delegate.setDoubleLE(i, v);
-    }
+        @Override
+        public Buffer setDoubleLE(int i, double v) {
+            return delegate.setDoubleLE(i, v);
+        }
 
-    @Override
-    public Buffer setFloatLE(int i, float v) {
-      return delegate.setFloatLE(i, v);
-    }
+        @Override
+        public Buffer setFloatLE(int i, float v) {
+            return delegate.setFloatLE(i, v);
+        }
 
-    @Override
-    public float getFloat(int pos) {
-      return delegate.getFloat(pos);
-    }
+        @Override
+        public float getFloat(int pos) {
+            return delegate.getFloat(pos);
+        }
 
-    @Override
-    public short getShort(int pos) {
-      return delegate.getShort(pos);
-    }
+        @Override
+        public short getShort(int pos) {
+            return delegate.getShort(pos);
+        }
 
-    @Override
-    public short getShortLE(int pos) {
-      return delegate.getShortLE(pos);
-    }
+        @Override
+        public short getShortLE(int pos) {
+            return delegate.getShortLE(pos);
+        }
 
-    @Override
-    public int getUnsignedShort(int pos) {
-      return delegate.getUnsignedShort(pos);
-    }
+        @Override
+        public int getUnsignedShort(int pos) {
+            return delegate.getUnsignedShort(pos);
+        }
 
-    @Override
-    public int getUnsignedShortLE(int pos) {
-      return delegate.getUnsignedShortLE(pos);
-    }
+        @Override
+        public int getUnsignedShortLE(int pos) {
+            return delegate.getUnsignedShortLE(pos);
+        }
 
-    @Override
-    public int getMedium(int pos) {
-      return delegate.getMedium(pos);
-    }
+        @Override
+        public int getMedium(int pos) {
+            return delegate.getMedium(pos);
+        }
 
-    @Override
-    public int getMediumLE(int pos) {
-      return delegate.getMediumLE(pos);
-    }
+        @Override
+        public int getMediumLE(int pos) {
+            return delegate.getMediumLE(pos);
+        }
 
-    @Override
-    public int getUnsignedMedium(int pos) {
-      return delegate.getUnsignedMedium(pos);
-    }
+        @Override
+        public int getUnsignedMedium(int pos) {
+            return delegate.getUnsignedMedium(pos);
+        }
 
-    @Override
-    public int getUnsignedMediumLE(int pos) {
-      return delegate.getUnsignedMediumLE(pos);
-    }
+        @Override
+        public int getUnsignedMediumLE(int pos) {
+            return delegate.getUnsignedMediumLE(pos);
+        }
 
-    @Override
-    public byte[] getBytes() {
-      return delegate.getBytes();
-    }
+        @Override
+        public byte[] getBytes() {
+            return delegate.getBytes();
+        }
 
-    @Override
-    public byte[] getBytes(int start, int end) {
-      return delegate.getBytes(start, end);
-    }
+        @Override
+        public byte[] getBytes(int start, int end) {
+            return delegate.getBytes(start, end);
+        }
 
-    @Override
-    public Buffer getBytes(byte[] dst) {
-      return delegate.getBytes(dst);
-    }
+        @Override
+        public Buffer getBytes(byte[] dst) {
+            return delegate.getBytes(dst);
+        }
 
-    @Override
-    public Buffer getBytes(byte[] dst, int dstIndex) {
-      return delegate.getBytes(dst, dstIndex);
-    }
+        @Override
+        public Buffer getBytes(byte[] dst, int dstIndex) {
+            return delegate.getBytes(dst, dstIndex);
+        }
 
-    @Override
-    public Buffer getBytes(int start, int end, byte[] dst) {
-      return delegate.getBytes(start, end, dst);
-    }
+        @Override
+        public Buffer getBytes(int start, int end, byte[] dst) {
+            return delegate.getBytes(start, end, dst);
+        }
 
-    @Override
-    public Buffer getBytes(int start, int end, byte[] dst, int dstIndex) {
-      return delegate.getBytes(start, end, dst, dstIndex);
-    }
+        @Override
+        public Buffer getBytes(int start, int end, byte[] dst, int dstIndex) {
+            return delegate.getBytes(start, end, dst, dstIndex);
+        }
 
-    @Override
-    public Buffer getBuffer(int start, int end) {
-      return delegate.getBuffer(start, end);
-    }
+        @Override
+        public Buffer getBuffer(int start, int end) {
+            return delegate.getBuffer(start, end);
+        }
 
-    @Override
-    public String getString(int start, int end, String enc) {
-      return delegate.getString(start, end, enc);
-    }
+        @Override
+        public String getString(int start, int end, String enc) {
+            return delegate.getString(start, end, enc);
+        }
 
-    @Override
-    public String getString(int start, int end) {
-      return delegate.getString(start, end);
-    }
+        @Override
+        public String getString(int start, int end) {
+            return delegate.getString(start, end);
+        }
 
-    @Override
-    public Buffer appendBuffer(Buffer buff) {
-      return delegate.appendBuffer(buff);
-    }
+        @Override
+        public Buffer appendBuffer(Buffer buff) {
+            return delegate.appendBuffer(buff);
+        }
 
-    @Override
-    public Buffer appendBuffer(Buffer buff, int offset, int len) {
-      return delegate.appendBuffer(buff, offset, len);
-    }
+        @Override
+        public Buffer appendBuffer(Buffer buff, int offset, int len) {
+            return delegate.appendBuffer(buff, offset, len);
+        }
 
-    @Override
-    public Buffer appendBytes(byte[] bytes) {
-      return delegate.appendBytes(bytes);
-    }
+        @Override
+        public Buffer appendBytes(byte[] bytes) {
+            return delegate.appendBytes(bytes);
+        }
 
-    @Override
-    public Buffer appendBytes(byte[] bytes, int offset, int len) {
-      return delegate.appendBytes(bytes, offset, len);
-    }
+        @Override
+        public Buffer appendBytes(byte[] bytes, int offset, int len) {
+            return delegate.appendBytes(bytes, offset, len);
+        }
 
-    @Override
-    public Buffer appendByte(byte b) {
-      return delegate.appendByte(b);
-    }
+        @Override
+        public Buffer appendByte(byte b) {
+            return delegate.appendByte(b);
+        }
 
-    @Override
-    public Buffer appendUnsignedByte(short b) {
-      return delegate.appendUnsignedByte(b);
-    }
+        @Override
+        public Buffer appendUnsignedByte(short b) {
+            return delegate.appendUnsignedByte(b);
+        }
 
-    @Override
-    public Buffer appendInt(int i) {
-      return delegate.appendInt(i);
-    }
+        @Override
+        public Buffer appendInt(int i) {
+            return delegate.appendInt(i);
+        }
 
-    @Override
-    public Buffer appendIntLE(int i) {
-      return delegate.appendIntLE(i);
-    }
+        @Override
+        public Buffer appendIntLE(int i) {
+            return delegate.appendIntLE(i);
+        }
 
-    @Override
-    public Buffer appendUnsignedInt(long i) {
-      return delegate.appendUnsignedInt(i);
-    }
+        @Override
+        public Buffer appendUnsignedInt(long i) {
+            return delegate.appendUnsignedInt(i);
+        }
 
-    @Override
-    public Buffer appendUnsignedIntLE(long i) {
-      return delegate.appendUnsignedIntLE(i);
-    }
+        @Override
+        public Buffer appendUnsignedIntLE(long i) {
+            return delegate.appendUnsignedIntLE(i);
+        }
 
-    @Override
-    public Buffer appendMedium(int i) {
-      return delegate.appendMedium(i);
-    }
+        @Override
+        public Buffer appendMedium(int i) {
+            return delegate.appendMedium(i);
+        }
 
-    @Override
-    public Buffer appendMediumLE(int i) {
-      return delegate.appendMediumLE(i);
-    }
+        @Override
+        public Buffer appendMediumLE(int i) {
+            return delegate.appendMediumLE(i);
+        }
 
-    @Override
-    public Buffer appendLong(long l) {
-      return delegate.appendLong(l);
-    }
+        @Override
+        public Buffer appendLong(long l) {
+            return delegate.appendLong(l);
+        }
 
-    @Override
-    public Buffer appendLongLE(long l) {
-      return delegate.appendLongLE(l);
-    }
+        @Override
+        public Buffer appendLongLE(long l) {
+            return delegate.appendLongLE(l);
+        }
 
-    @Override
-    public Buffer appendShort(short s) {
-      return delegate.appendShort(s);
-    }
+        @Override
+        public Buffer appendShort(short s) {
+            return delegate.appendShort(s);
+        }
 
-    @Override
-    public Buffer appendShortLE(short s) {
-      return delegate.appendShortLE(s);
-    }
+        @Override
+        public Buffer appendShortLE(short s) {
+            return delegate.appendShortLE(s);
+        }
 
-    @Override
-    public Buffer appendUnsignedShort(int s) {
-      return delegate.appendUnsignedShort(s);
-    }
+        @Override
+        public Buffer appendUnsignedShort(int s) {
+            return delegate.appendUnsignedShort(s);
+        }
 
-    @Override
-    public Buffer appendUnsignedShortLE(int s) {
-      return delegate.appendUnsignedShortLE(s);
-    }
+        @Override
+        public Buffer appendUnsignedShortLE(int s) {
+            return delegate.appendUnsignedShortLE(s);
+        }
 
-    @Override
-    public Buffer appendFloat(float f) {
-      return delegate.appendFloat(f);
-    }
+        @Override
+        public Buffer appendFloat(float f) {
+            return delegate.appendFloat(f);
+        }
 
-    @Override
-    public Buffer appendDouble(double d) {
-      return delegate.appendDouble(d);
-    }
+        @Override
+        public Buffer appendDouble(double d) {
+            return delegate.appendDouble(d);
+        }
 
-    @Override
-    public Buffer appendString(String str, String enc) {
-      return delegate.appendString(str, enc);
-    }
+        @Override
+        public Buffer appendString(String str, String enc) {
+            return delegate.appendString(str, enc);
+        }
 
-    @Override
-    public Buffer appendString(String str) {
-      return delegate.appendString(str);
-    }
+        @Override
+        public Buffer appendString(String str) {
+            return delegate.appendString(str);
+        }
 
-    @Override
-    public Buffer setByte(int pos, byte b) {
-      return delegate.setByte(pos, b);
-    }
+        @Override
+        public Buffer setByte(int pos, byte b) {
+            return delegate.setByte(pos, b);
+        }
 
-    @Override
-    public Buffer setUnsignedByte(int pos, short b) {
-      return delegate.setUnsignedByte(pos, b);
-    }
+        @Override
+        public Buffer setUnsignedByte(int pos, short b) {
+            return delegate.setUnsignedByte(pos, b);
+        }
 
-    @Override
-    public Buffer setInt(int pos, int i) {
-      return delegate.setInt(pos, i);
-    }
+        @Override
+        public Buffer setInt(int pos, int i) {
+            return delegate.setInt(pos, i);
+        }
 
-    @Override
-    public Buffer setIntLE(int pos, int i) {
-      return delegate.setIntLE(pos, i);
-    }
+        @Override
+        public Buffer setIntLE(int pos, int i) {
+            return delegate.setIntLE(pos, i);
+        }
 
-    @Override
-    public Buffer setUnsignedInt(int pos, long i) {
-      return delegate.setUnsignedInt(pos, i);
-    }
+        @Override
+        public Buffer setUnsignedInt(int pos, long i) {
+            return delegate.setUnsignedInt(pos, i);
+        }
 
-    @Override
-    public Buffer setUnsignedIntLE(int pos, long i) {
-      return delegate.setUnsignedIntLE(pos, i);
-    }
+        @Override
+        public Buffer setUnsignedIntLE(int pos, long i) {
+            return delegate.setUnsignedIntLE(pos, i);
+        }
 
-    @Override
-    public Buffer setMedium(int pos, int i) {
-      return delegate.setMedium(pos, i);
-    }
+        @Override
+        public Buffer setMedium(int pos, int i) {
+            return delegate.setMedium(pos, i);
+        }
 
-    @Override
-    public Buffer setMediumLE(int pos, int i) {
-      return delegate.setMediumLE(pos, i);
-    }
+        @Override
+        public Buffer setMediumLE(int pos, int i) {
+            return delegate.setMediumLE(pos, i);
+        }
 
-    @Override
-    public Buffer setLong(int pos, long l) {
-      return delegate.setLong(pos, l);
-    }
+        @Override
+        public Buffer setLong(int pos, long l) {
+            return delegate.setLong(pos, l);
+        }
 
-    @Override
-    public Buffer setLongLE(int pos, long l) {
-      return delegate.setLongLE(pos, l);
-    }
+        @Override
+        public Buffer setLongLE(int pos, long l) {
+            return delegate.setLongLE(pos, l);
+        }
 
-    @Override
-    public Buffer setDouble(int pos, double d) {
-      return delegate.setDouble(pos, d);
-    }
+        @Override
+        public Buffer setDouble(int pos, double d) {
+            return delegate.setDouble(pos, d);
+        }
 
-    @Override
-    public Buffer setFloat(int pos, float f) {
-      return delegate.setFloat(pos, f);
-    }
+        @Override
+        public Buffer setFloat(int pos, float f) {
+            return delegate.setFloat(pos, f);
+        }
 
-    @Override
-    public Buffer setShort(int pos, short s) {
-      return delegate.setShort(pos, s);
-    }
+        @Override
+        public Buffer setShort(int pos, short s) {
+            return delegate.setShort(pos, s);
+        }
 
-    @Override
-    public Buffer setShortLE(int pos, short s) {
-      return delegate.setShortLE(pos, s);
-    }
+        @Override
+        public Buffer setShortLE(int pos, short s) {
+            return delegate.setShortLE(pos, s);
+        }
 
-    @Override
-    public Buffer setUnsignedShort(int pos, int s) {
-      return delegate.setUnsignedShort(pos, s);
-    }
+        @Override
+        public Buffer setUnsignedShort(int pos, int s) {
+            return delegate.setUnsignedShort(pos, s);
+        }
 
-    @Override
-    public Buffer setUnsignedShortLE(int pos, int s) {
-      return delegate.setUnsignedShortLE(pos, s);
-    }
+        @Override
+        public Buffer setUnsignedShortLE(int pos, int s) {
+            return delegate.setUnsignedShortLE(pos, s);
+        }
 
-    @Override
-    public Buffer setBuffer(int pos, Buffer b) {
-      return delegate.setBuffer(pos, b);
-    }
+        @Override
+        public Buffer setBuffer(int pos, Buffer b) {
+            return delegate.setBuffer(pos, b);
+        }
 
-    @Override
-    public Buffer setBuffer(int pos, Buffer b, int offset, int len) {
-      return delegate.setBuffer(pos, b, offset, len);
-    }
+        @Override
+        public Buffer setBuffer(int pos, Buffer b, int offset, int len) {
+            return delegate.setBuffer(pos, b, offset, len);
+        }
 
-    @Override
-    public Buffer setBytes(int pos, ByteBuffer b) {
-      return delegate.setBytes(pos, b);
-    }
+        @Override
+        public Buffer setBytes(int pos, ByteBuffer b) {
+            return delegate.setBytes(pos, b);
+        }
 
-    @Override
-    public Buffer setBytes(int pos, byte[] b) {
-      return delegate.setBytes(pos, b);
-    }
+        @Override
+        public Buffer setBytes(int pos, byte[] b) {
+            return delegate.setBytes(pos, b);
+        }
 
-    @Override
-    public Buffer setBytes(int pos, byte[] b, int offset, int len) {
-      return delegate.setBytes(pos, b, offset, len);
-    }
+        @Override
+        public Buffer setBytes(int pos, byte[] b, int offset, int len) {
+            return delegate.setBytes(pos, b, offset, len);
+        }
 
-    @Override
-    public Buffer setString(int pos, String str) {
-      return delegate.setString(pos, str);
-    }
+        @Override
+        public Buffer setString(int pos, String str) {
+            return delegate.setString(pos, str);
+        }
 
-    @Override
-    public Buffer setString(int pos, String str, String enc) {
-      return delegate.setString(pos, str, enc);
-    }
+        @Override
+        public Buffer setString(int pos, String str, String enc) {
+            return delegate.setString(pos, str, enc);
+        }
 
-    @Override
-    public int length() {
-      return delegate.length();
-    }
+        @Override
+        public int length() {
+            return delegate.length();
+        }
 
-    @Override
-    public Buffer copy() {
-      return delegate.copy();
-    }
+        @Override
+        public Buffer copy() {
+            return delegate.copy();
+        }
 
-    @Override
-    public Buffer slice() {
-      return delegate.slice();
-    }
+        @Override
+        public Buffer slice() {
+            return delegate.slice();
+        }
 
-    @Override
-    public Buffer slice(int start, int end) {
-      return delegate.slice(start, end);
-    }
+        @Override
+        public Buffer slice(int start, int end) {
+            return delegate.slice(start, end);
+        }
 
-    @Override
-    public void writeToBuffer(Buffer buffer) {
-      delegate.writeToBuffer(buffer);
-    }
+        @Override
+        public void writeToBuffer(Buffer buffer) {
+            delegate.writeToBuffer(buffer);
+        }
 
-    @Override
-    public int readFromBuffer(int pos, Buffer buffer) {
-      return delegate.readFromBuffer(pos, buffer);
+        @Override
+        public int readFromBuffer(int pos, Buffer buffer) {
+            return delegate.readFromBuffer(pos, buffer);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/HttpServerResponseEndHandlerInstrumentationTest.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/HttpServerResponseEndHandlerInstrumentationTest.java
index 25201f3e872..fb7872e95a1 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/HttpServerResponseEndHandlerInstrumentationTest.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/HttpServerResponseEndHandlerInstrumentationTest.java
@@ -30,150 +30,138 @@
 import org.junit.jupiter.api.Test;
 
 class HttpServerResponseEndHandlerInstrumentationTest extends AbstractInstrumentationTest {
-  private static final String HTTP1_RESPONSE = "io.vertx.core.http.impl.http1.Http1ServerResponse";
-  private static final String HTTP2_RESPONSE = "io.vertx.core.http.impl.HttpServerResponseImpl";
-  private static final String END_HANDLER_WRAPPER =
-      "datadog.trace.instrumentation.vertx_4_0.server.EndHandlerWrapper";
-
-  private static Vertx vertx;
-  private static HttpServer server;
-  private static int port;
-
-  @BeforeAll
-  static void startServer() throws Exception {
-    try (ServerSocket socket = new ServerSocket(0)) {
-      port = socket.getLocalPort();
+    private static final String HTTP1_RESPONSE = "io.vertx.core.http.impl.http1.Http1ServerResponse";
+    private static final String HTTP2_RESPONSE = "io.vertx.core.http.impl.HttpServerResponseImpl";
+    private static final String END_HANDLER_WRAPPER =
+            "datadog.trace.instrumentation.vertx_4_0.server.EndHandlerWrapper";
+
+    private static Vertx vertx;
+    private static HttpServer server;
+    private static int port;
+
+    @BeforeAll
+    static void startServer() throws Exception {
+        try (ServerSocket socket = new ServerSocket(0)) {
+            port = socket.getLocalPort();
+        }
+
+        vertx = Vertx.vertx();
+        Router router = Router.router(vertx);
+        router.route("/end-handler-wrapper").handler(HttpServerResponseEndHandlerInstrumentationTest::handle);
+
+        CountDownLatch ready = new CountDownLatch(1);
+        vertx.createHttpServer(new HttpServerOptions().setHttp2ClearTextEnabled(true))
+                .requestHandler(router)
+                .listen(port)
+                .andThen(result -> {
+                    if (result.failed()) {
+                        throw new RuntimeException("Failed to start Vert.x server", result.cause());
+                    }
+                    server = result.result();
+                    ready.countDown();
+                });
+        if (!ready.await(10, TimeUnit.SECONDS)) {
+            throw new IllegalStateException("Vert.x server did not start in time");
+        }
     }
 
-    vertx = Vertx.vertx();
-    Router router = Router.router(vertx);
-    router
-        .route("/end-handler-wrapper")
-        .handler(HttpServerResponseEndHandlerInstrumentationTest::handle);
-
-    CountDownLatch ready = new CountDownLatch(1);
-    vertx
-        .createHttpServer(new HttpServerOptions().setHttp2ClearTextEnabled(true))
-        .requestHandler(router)
-        .listen(port)
-        .andThen(
-            result -> {
-              if (result.failed()) {
-                throw new RuntimeException("Failed to start Vert.x server", result.cause());
-              }
-              server = result.result();
-              ready.countDown();
-            });
-    if (!ready.await(10, TimeUnit.SECONDS)) {
-      throw new IllegalStateException("Vert.x server did not start in time");
+    @AfterAll
+    static void stopServer() throws Exception {
+        if (server != null) {
+            CountDownLatch closed = new CountDownLatch(1);
+            server.close().andThen(ar -> closed.countDown());
+            closed.await(10, TimeUnit.SECONDS);
+        }
+        if (vertx != null) {
+            CountDownLatch closed = new CountDownLatch(1);
+            vertx.close().andThen(ar -> closed.countDown());
+            closed.await(10, TimeUnit.SECONDS);
+        }
     }
-  }
-
-  @AfterAll
-  static void stopServer() throws Exception {
-    if (server != null) {
-      CountDownLatch closed = new CountDownLatch(1);
-      server.close().andThen(ar -> closed.countDown());
-      closed.await(10, TimeUnit.SECONDS);
+
+    @Test
+    void wrapsApplicationEndHandlerOnVertx51Http1Response() throws Exception {
+        assumeTrue(hasVertx51Http1Response(), "Http1ServerResponse exists only in Vert.x 5.1+");
+
+        HttpURLConnection conn =
+                (HttpURLConnection) new URL("http://localhost:" + port + "/end-handler-wrapper").openConnection();
+        conn.setRequestMethod("GET");
+        conn.setConnectTimeout(5000);
+        conn.setReadTimeout(5000);
+
+        int responseCode = conn.getResponseCode();
+        InputStream responseStream = responseCode >= 400 ? conn.getErrorStream() : conn.getInputStream();
+        String body = new String(responseStream.readAllBytes(), StandardCharsets.UTF_8);
+        conn.disconnect();
+
+        assertWrapped(responseCode, body, HTTP1_RESPONSE);
     }
-    if (vertx != null) {
-      CountDownLatch closed = new CountDownLatch(1);
-      vertx.close().andThen(ar -> closed.countDown());
-      closed.await(10, TimeUnit.SECONDS);
+
+    @Test
+    void wrapsApplicationEndHandlerOnVertx51Http2Response() throws Exception {
+        assumeTrue(hasVertx51Http2Response(), "HttpServerResponseImpl exists only in Vert.x 5.1+");
+
+        HttpClient client = vertx.createHttpClient(
+                new HttpClientOptions().setProtocolVersion(HttpVersion.HTTP_2).setHttp2ClearTextUpgrade(false));
+        try {
+            HttpClientResponse response = client.request(HttpMethod.GET, port, "localhost", "/end-handler-wrapper")
+                    .compose(request -> request.send())
+                    .toCompletionStage()
+                    .toCompletableFuture()
+                    .get(10, TimeUnit.SECONDS);
+            Buffer body =
+                    response.body().toCompletionStage().toCompletableFuture().get(10, TimeUnit.SECONDS);
+
+            assertWrapped(response.statusCode(), body.toString(StandardCharsets.UTF_8), HTTP2_RESPONSE);
+        } finally {
+            client.close().toCompletionStage().toCompletableFuture().get(10, TimeUnit.SECONDS);
+        }
     }
-  }
-
-  @Test
-  void wrapsApplicationEndHandlerOnVertx51Http1Response() throws Exception {
-    assumeTrue(hasVertx51Http1Response(), "Http1ServerResponse exists only in Vert.x 5.1+");
-
-    HttpURLConnection conn =
-        (HttpURLConnection)
-            new URL("http://localhost:" + port + "/end-handler-wrapper").openConnection();
-    conn.setRequestMethod("GET");
-    conn.setConnectTimeout(5000);
-    conn.setReadTimeout(5000);
-
-    int responseCode = conn.getResponseCode();
-    InputStream responseStream =
-        responseCode >= 400 ? conn.getErrorStream() : conn.getInputStream();
-    String body = new String(responseStream.readAllBytes(), StandardCharsets.UTF_8);
-    conn.disconnect();
-
-    assertWrapped(responseCode, body, HTTP1_RESPONSE);
-  }
-
-  @Test
-  void wrapsApplicationEndHandlerOnVertx51Http2Response() throws Exception {
-    assumeTrue(hasVertx51Http2Response(), "HttpServerResponseImpl exists only in Vert.x 5.1+");
-
-    HttpClient client =
-        vertx.createHttpClient(
-            new HttpClientOptions()
-                .setProtocolVersion(HttpVersion.HTTP_2)
-                .setHttp2ClearTextUpgrade(false));
-    try {
-      HttpClientResponse response =
-          client
-              .request(HttpMethod.GET, port, "localhost", "/end-handler-wrapper")
-              .compose(request -> request.send())
-              .toCompletionStage()
-              .toCompletableFuture()
-              .get(10, TimeUnit.SECONDS);
-      Buffer body =
-          response.body().toCompletionStage().toCompletableFuture().get(10, TimeUnit.SECONDS);
-
-      assertWrapped(response.statusCode(), body.toString(StandardCharsets.UTF_8), HTTP2_RESPONSE);
-    } finally {
-      client.close().toCompletionStage().toCompletableFuture().get(10, TimeUnit.SECONDS);
+
+    private static boolean hasVertx51Http1Response() {
+        return hasClass(HTTP1_RESPONSE);
     }
-  }
-
-  private static boolean hasVertx51Http1Response() {
-    return hasClass(HTTP1_RESPONSE);
-  }
-
-  private static boolean hasVertx51Http2Response() {
-    return hasClass(HTTP2_RESPONSE);
-  }
-
-  private static boolean hasClass(String className) {
-    try {
-      Class.forName(className);
-      return true;
-    } catch (ClassNotFoundException ignored) {
-      return false;
+
+    private static boolean hasVertx51Http2Response() {
+        return hasClass(HTTP2_RESPONSE);
     }
-  }
-
-  private static void assertWrapped(int responseCode, String body, String expectedResponseClass) {
-    assertEquals(200, responseCode, body);
-    assertTrue(body.contains("response=" + expectedResponseClass), body);
-    assertTrue(body.contains("endHandler=" + END_HANDLER_WRAPPER), body);
-  }
-
-  private static void handle(io.vertx.ext.web.RoutingContext ctx) {
-    HttpServerResponse response = ctx.response();
-    Handler<Void> applicationEndHandler = ignored -> {};
-    response.endHandler(applicationEndHandler);
-
-    String responseClassName = response.getClass().getName();
-    Object installedEndHandler;
-    try {
-      Field endHandler = response.getClass().getDeclaredField("endHandler");
-      endHandler.setAccessible(true);
-      installedEndHandler = endHandler.get(response);
-    } catch (ReflectiveOperationException e) {
-      throw new AssertionError("Could not inspect Vert.x response endHandler field", e);
+
+    private static boolean hasClass(String className) {
+        try {
+            Class.forName(className);
+            return true;
+        } catch (ClassNotFoundException ignored) {
+            return false;
+        }
     }
 
-    String installedClassName =
-        installedEndHandler == null ? "<null>" : installedEndHandler.getClass().getName();
-    boolean wrapped =
-        (HTTP1_RESPONSE.equals(responseClassName) || HTTP2_RESPONSE.equals(responseClassName))
-            && END_HANDLER_WRAPPER.equals(installedClassName);
-    response
-        .setStatusCode(wrapped ? 200 : 500)
-        .end("response=" + responseClassName + "\nendHandler=" + installedClassName + "\n");
-  }
+    private static void assertWrapped(int responseCode, String body, String expectedResponseClass) {
+        assertEquals(200, responseCode, body);
+        assertTrue(body.contains("response=" + expectedResponseClass), body);
+        assertTrue(body.contains("endHandler=" + END_HANDLER_WRAPPER), body);
+    }
+
+    private static void handle(io.vertx.ext.web.RoutingContext ctx) {
+        HttpServerResponse response = ctx.response();
+        Handler<Void> applicationEndHandler = ignored -> {};
+        response.endHandler(applicationEndHandler);
+
+        String responseClassName = response.getClass().getName();
+        Object installedEndHandler;
+        try {
+            Field endHandler = response.getClass().getDeclaredField("endHandler");
+            endHandler.setAccessible(true);
+            installedEndHandler = endHandler.get(response);
+        } catch (ReflectiveOperationException e) {
+            throw new AssertionError("Could not inspect Vert.x response endHandler field", e);
+        }
+
+        String installedClassName = installedEndHandler == null
+                ? "<null>"
+                : installedEndHandler.getClass().getName();
+        boolean wrapped = (HTTP1_RESPONSE.equals(responseClassName) || HTTP2_RESPONSE.equals(responseClassName))
+                && END_HANDLER_WRAPPER.equals(installedClassName);
+        response.setStatusCode(wrapped ? 200 : 500)
+                .end("response=" + responseClassName + "\nendHandler=" + installedClassName + "\n");
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/IastSinksVerticle.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/IastSinksVerticle.java
index a518d274e99..777df43a28c 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/IastSinksVerticle.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/IastSinksVerticle.java
@@ -10,52 +10,38 @@
 
 public class IastSinksVerticle extends AbstractVerticle {
 
-  @Override
-  public void start(final Promise<Void> startPromise) throws Exception {
-    final Router router = Router.router(vertx);
-    router.route().handler(BodyHandler.create());
-    router
-        .route("/iast/sinks/reroute1")
-        .handler(
-            rc -> {
-              final String path = rc.request().getParam("path");
-              rc.reroute(path);
-            });
-    router
-        .route("/iast/sinks/reroute2")
-        .handler(
-            rc -> {
-              final String path = rc.request().getParam("path");
-              rc.reroute(HttpMethod.GET, path);
-            });
-    router
-        .route("/iast/sinks/redirectheader")
-        .handler(
-            rc -> {
-              final String name = rc.request().getParam("name");
-              final String value = rc.request().getParam("value");
-              rc.response().putHeader(name, value).end();
-            });
+    @Override
+    public void start(final Promise<Void> startPromise) throws Exception {
+        final Router router = Router.router(vertx);
+        router.route().handler(BodyHandler.create());
+        router.route("/iast/sinks/reroute1").handler(rc -> {
+            final String path = rc.request().getParam("path");
+            rc.reroute(path);
+        });
+        router.route("/iast/sinks/reroute2").handler(rc -> {
+            final String path = rc.request().getParam("path");
+            rc.reroute(HttpMethod.GET, path);
+        });
+        router.route("/iast/sinks/redirectheader").handler(rc -> {
+            final String name = rc.request().getParam("name");
+            final String value = rc.request().getParam("value");
+            rc.response().putHeader(name, value).end();
+        });
 
-    final EventBus eventBus = vertx.eventBus();
-    final HttpServerOptions serverOptions = new HttpServerOptions();
-    serverOptions.setHandle100ContinueAutomatically(true);
-    vertx
-        .createHttpServer(serverOptions)
-        .requestHandler(router)
-        .listen(0)
-        .onSuccess(
-            server ->
-                eventBus
-                    .request("PORT_DATA", server.actualPort())
-                    .andThen(
-                        ar -> {
-                          if (ar.succeeded()) {
-                            startPromise.complete();
-                          } else {
-                            startPromise.fail(ar.cause());
-                          }
+        final EventBus eventBus = vertx.eventBus();
+        final HttpServerOptions serverOptions = new HttpServerOptions();
+        serverOptions.setHandle100ContinueAutomatically(true);
+        vertx.createHttpServer(serverOptions)
+                .requestHandler(router)
+                .listen(0)
+                .onSuccess(server -> eventBus.request("PORT_DATA", server.actualPort())
+                        .andThen(ar -> {
+                            if (ar.succeeded()) {
+                                startPromise.complete();
+                            } else {
+                                startPromise.fail(ar.cause());
+                            }
                         }))
-        .onFailure(startPromise::fail);
-  }
+                .onFailure(startPromise::fail);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/IastSourcesVerticle.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/IastSourcesVerticle.java
index 35cef8bc955..52b3bae235e 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/IastSourcesVerticle.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/IastSourcesVerticle.java
@@ -17,163 +17,116 @@
 
 public class IastSourcesVerticle extends AbstractVerticle {
 
-  private static final String EVENT_BUS_ENDPOINT = "EVENT_BUS";
+    private static final String EVENT_BUS_ENDPOINT = "EVENT_BUS";
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(IastSourcesVerticle.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(IastSourcesVerticle.class);
 
-  @Override
-  public void start(final Promise<Void> startPromise) throws Exception {
-    final Router router = Router.router(vertx);
-    router.route().handler(BodyHandler.create());
-    router
-        .route("/iast/sources/header")
-        .handler(
-            rc -> {
-              final String value = rc.request().getHeader("name");
-              rc.response().end("Received " + value);
-            });
-    router
-        .route("/iast/sources/headers")
-        .handler(
-            rc -> {
-              final MultiMap value = rc.request().headers();
-              rc.response().end("Received " + value.get("name"));
-            });
-    router
-        .route("/iast/sources/cookie")
-        .handler(
-            rc -> {
-              final Cookie cookie = rc.request().getCookie("name");
-              rc.response().end("Received " + cookie.getName() + " " + cookie.getValue());
-            });
-    router
-        .route("/iast/sources/path/:name")
-        .handler(
-            rc -> {
-              final String value = rc.pathParam("name");
-              rc.response().end("Received " + value);
-            });
-    router
-        .route("/iast/sources/parameter")
-        .handler(
-            rc -> {
-              final String value = rc.request().getParam("name");
-              rc.response().end("Received " + value);
-            });
-    router
-        .route("/iast/sources/parameters")
-        .handler(
-            rc -> {
-              final MultiMap value = rc.request().params();
-              rc.response().end("Received " + value.get("name"));
-            });
-    router
-        .route("/iast/sources/form")
-        .handler(
-            rc -> {
-              final String value = rc.request().getFormAttribute("name");
-              rc.response().end("Received " + value);
-            });
-    router
-        .route("/iast/sources/body/string")
-        .handler(
-            rc -> {
-              final String encoding = rc.request().getParam("encoding");
-              if (encoding != null) {
+    @Override
+    public void start(final Promise<Void> startPromise) throws Exception {
+        final Router router = Router.router(vertx);
+        router.route().handler(BodyHandler.create());
+        router.route("/iast/sources/header").handler(rc -> {
+            final String value = rc.request().getHeader("name");
+            rc.response().end("Received " + value);
+        });
+        router.route("/iast/sources/headers").handler(rc -> {
+            final MultiMap value = rc.request().headers();
+            rc.response().end("Received " + value.get("name"));
+        });
+        router.route("/iast/sources/cookie").handler(rc -> {
+            final Cookie cookie = rc.request().getCookie("name");
+            rc.response().end("Received " + cookie.getName() + " " + cookie.getValue());
+        });
+        router.route("/iast/sources/path/:name").handler(rc -> {
+            final String value = rc.pathParam("name");
+            rc.response().end("Received " + value);
+        });
+        router.route("/iast/sources/parameter").handler(rc -> {
+            final String value = rc.request().getParam("name");
+            rc.response().end("Received " + value);
+        });
+        router.route("/iast/sources/parameters").handler(rc -> {
+            final MultiMap value = rc.request().params();
+            rc.response().end("Received " + value.get("name"));
+        });
+        router.route("/iast/sources/form").handler(rc -> {
+            final String value = rc.request().getFormAttribute("name");
+            rc.response().end("Received " + value);
+        });
+        router.route("/iast/sources/body/string").handler(rc -> {
+            final String encoding = rc.request().getParam("encoding");
+            if (encoding != null) {
                 rc.response().end("Received " + rc.body().asString(encoding));
-              } else {
+            } else {
                 rc.response().end("Received " + rc.body().asString());
-              }
-            });
-    router
-        .route("/iast/sources/body/json")
-        .handler(
-            rc -> {
-              rc.response().end("Received " + rc.body().asJsonObject());
-            });
-    router
-        .route("/body/jsonArray")
-        .handler(
-            rc -> {
-              rc.response().end("Received " + rc.body().asJsonArray());
-            });
+            }
+        });
+        router.route("/iast/sources/body/json").handler(rc -> {
+            rc.response().end("Received " + rc.body().asJsonObject());
+        });
+        router.route("/body/jsonArray").handler(rc -> {
+            rc.response().end("Received " + rc.body().asJsonArray());
+        });
 
-    router
-        .route("/iast/sources/eventBus")
-        .handler(
-            rc -> {
-              final JsonObject target = rc.body().asJsonObject();
-              rc.vertx()
-                  .eventBus()
-                  .request(EVENT_BUS_ENDPOINT, target)
-                  .andThen(
-                      reply -> {
-                        if (reply.succeeded()) {
-                          rc.response().end(reply.result().body().toString());
-                        } else {
-                          rc.fail(reply.cause());
-                        }
-                      });
+        router.route("/iast/sources/eventBus").handler(rc -> {
+            final JsonObject target = rc.body().asJsonObject();
+            rc.vertx().eventBus().request(EVENT_BUS_ENDPOINT, target).andThen(reply -> {
+                if (reply.succeeded()) {
+                    rc.response().end(reply.result().body().toString());
+                } else {
+                    rc.fail(reply.cause());
+                }
             });
-    router
-        .route("/iast/vulnerabilities/insecureCookie")
-        .handler(
-            rc -> {
-              final String cookieName = rc.request().getParam("name");
-              final String cookieValue = rc.request().getParam("value");
-              final String secure = rc.request().getParam("secure");
-              Cookie cookie = Cookie.cookie(cookieName, cookieValue);
-              if ("true".equals(secure)) {
+        });
+        router.route("/iast/vulnerabilities/insecureCookie").handler(rc -> {
+            final String cookieName = rc.request().getParam("name");
+            final String cookieValue = rc.request().getParam("value");
+            final String secure = rc.request().getParam("secure");
+            Cookie cookie = Cookie.cookie(cookieName, cookieValue);
+            if ("true".equals(secure)) {
                 cookie.setSecure(true);
-              }
-              rc.response().addCookie(cookie).end("Cookie Set");
-            });
+            }
+            rc.response().addCookie(cookie).end("Cookie Set");
+        });
 
-    final EventBus eventBus = vertx.eventBus();
-    eventBus.consumer(
-        EVENT_BUS_ENDPOINT,
-        message -> {
-          final JsonObject payload = (JsonObject) message.body();
-          final String name = payload.getString("name");
-          try {
-            final IastContext ctx = IastContext.Provider.get();
-            if (ctx == null) {
-              throw new IllegalStateException("No IAST context present");
+        final EventBus eventBus = vertx.eventBus();
+        eventBus.consumer(EVENT_BUS_ENDPOINT, message -> {
+            final JsonObject payload = (JsonObject) message.body();
+            final String name = payload.getString("name");
+            try {
+                final IastContext ctx = IastContext.Provider.get();
+                if (ctx == null) {
+                    throw new IllegalStateException("No IAST context present");
+                }
+                final TaintedObjects to = ctx.getTaintedObjects();
+                final boolean tainted = to.get(name) != null;
+                message.reply(tainted ? "OK" : "NO_OK");
+            } catch (Throwable e) {
+                LOGGER.error("Failed to handle event bus message", e);
+                message.reply("NO_OK");
             }
-            final TaintedObjects to = ctx.getTaintedObjects();
-            final boolean tainted = to.get(name) != null;
-            message.reply(tainted ? "OK" : "NO_OK");
-          } catch (Throwable e) {
-            LOGGER.error("Failed to handle event bus message", e);
-            message.reply("NO_OK");
-          }
         });
 
-    final HttpServerOptions serverOptions = new HttpServerOptions();
-    if (config().getBoolean("https")) {
-      final SelfSignedCertificate certificate = SelfSignedCertificate.create();
-      serverOptions.setSsl(true);
-      serverOptions.setUseAlpn(true);
-      serverOptions.setTrustOptions(certificate.trustOptions());
-      serverOptions.setKeyCertOptions(certificate.keyCertOptions());
-    }
-    serverOptions.setHandle100ContinueAutomatically(true);
-    vertx
-        .createHttpServer(serverOptions)
-        .requestHandler(router)
-        .listen(0)
-        .onSuccess(
-            server ->
-                eventBus
-                    .request("PORT_DATA", server.actualPort())
-                    .andThen(
-                        ar -> {
-                          if (ar.succeeded()) {
-                            startPromise.complete();
-                          } else {
-                            startPromise.fail(ar.cause());
-                          }
+        final HttpServerOptions serverOptions = new HttpServerOptions();
+        if (config().getBoolean("https")) {
+            final SelfSignedCertificate certificate = SelfSignedCertificate.create();
+            serverOptions.setSsl(true);
+            serverOptions.setUseAlpn(true);
+            serverOptions.setTrustOptions(certificate.trustOptions());
+            serverOptions.setKeyCertOptions(certificate.keyCertOptions());
+        }
+        serverOptions.setHandle100ContinueAutomatically(true);
+        vertx.createHttpServer(serverOptions)
+                .requestHandler(router)
+                .listen(0)
+                .onSuccess(server -> eventBus.request("PORT_DATA", server.actualPort())
+                        .andThen(ar -> {
+                            if (ar.succeeded()) {
+                                startPromise.complete();
+                            } else {
+                                startPromise.fail(ar.cause());
+                            }
                         }))
-        .onFailure(startPromise::fail);
-  }
+                .onFailure(startPromise::fail);
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/LocalSessionStoreInstrumentationTest.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/LocalSessionStoreInstrumentationTest.java
index 1e9fc26a8b3..e0922f3be8a 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/LocalSessionStoreInstrumentationTest.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/LocalSessionStoreInstrumentationTest.java
@@ -25,104 +25,102 @@
 import org.junit.jupiter.api.Test;
 
 class LocalSessionStoreInstrumentationTest extends AbstractInstrumentationTest {
-  private Vertx vertx;
+    private Vertx vertx;
 
-  @BeforeEach
-  void createVertx() {
-    vertx = Vertx.vertx();
-  }
-
-  @AfterEach
-  void closeVertx() throws Exception {
-    vertx.close().toCompletionStage().toCompletableFuture().get(10, TimeUnit.SECONDS);
-  }
+    @BeforeEach
+    void createVertx() {
+        vertx = Vertx.vertx();
+    }
 
-  @Test
-  void creatingSessionStoreDoesNotRetainRequest() throws Exception {
-    LocalSessionStore store;
-    AgentSpan parent = startSpan("test", "parent");
-    try (ContextScope ignored = activateSpan(parent)) {
-      store = LocalSessionStore.create(vertx, "creation", 60_000);
-      assertSame(parent, activeSpan());
-      assertTrue(isAsyncPropagationEnabled());
-    } finally {
-      parent.finish();
+    @AfterEach
+    void closeVertx() throws Exception {
+        vertx.close().toCompletionStage().toCompletableFuture().get(10, TimeUnit.SECONDS);
     }
-    try {
-      assertParentReported();
-    } finally {
-      store.close();
+
+    @Test
+    void creatingSessionStoreDoesNotRetainRequest() throws Exception {
+        LocalSessionStore store;
+        AgentSpan parent = startSpan("test", "parent");
+        try (ContextScope ignored = activateSpan(parent)) {
+            store = LocalSessionStore.create(vertx, "creation", 60_000);
+            assertSame(parent, activeSpan());
+            assertTrue(isAsyncPropagationEnabled());
+        } finally {
+            parent.finish();
+        }
+        try {
+            assertParentReported();
+        } finally {
+            store.close();
+        }
     }
-  }
 
-  @Test
-  void rearmingSessionReaperDoesNotRetainRequest() throws Exception {
-    LocalSessionStore store = LocalSessionStore.create(vertx, "rearming", 60_000);
-    try {
-      AgentSpan parent = startSpan("test", "parent");
-      try (ContextScope ignored = activateSpan(parent)) {
-        // A worker queue can invoke the maintenance callback under an unrelated request context.
-        ((LocalSessionStoreImpl) store).handle(0L);
-        assertSame(parent, activeSpan());
-        assertTrue(isAsyncPropagationEnabled());
-      } finally {
-        parent.finish();
-      }
-      assertParentReported();
-    } finally {
-      store.close();
+    @Test
+    void rearmingSessionReaperDoesNotRetainRequest() throws Exception {
+        LocalSessionStore store = LocalSessionStore.create(vertx, "rearming", 60_000);
+        try {
+            AgentSpan parent = startSpan("test", "parent");
+            try (ContextScope ignored = activateSpan(parent)) {
+                // A worker queue can invoke the maintenance callback under an unrelated request context.
+                ((LocalSessionStoreImpl) store).handle(0L);
+                assertSame(parent, activeSpan());
+                assertTrue(isAsyncPropagationEnabled());
+            } finally {
+                parent.finish();
+            }
+            assertParentReported();
+        } finally {
+            store.close();
+        }
     }
-  }
 
-  @Test
-  void failedSchedulingRestoresPropagation() throws Exception {
-    AgentSpan parent = startSpan("test", "parent");
-    try (ContextScope ignored = activateSpan(parent)) {
-      assertThrows(
-          IllegalArgumentException.class,
-          () -> LocalSessionStore.create(vertx, "invalid-interval", -1));
-      assertSame(parent, activeSpan());
-      assertTrue(isAsyncPropagationEnabled());
-    } finally {
-      parent.finish();
+    @Test
+    void failedSchedulingRestoresPropagation() throws Exception {
+        AgentSpan parent = startSpan("test", "parent");
+        try (ContextScope ignored = activateSpan(parent)) {
+            assertThrows(IllegalArgumentException.class, () -> LocalSessionStore.create(vertx, "invalid-interval", -1));
+            assertSame(parent, activeSpan());
+            assertTrue(isAsyncPropagationEnabled());
+        } finally {
+            parent.finish();
+        }
+        assertParentReported();
     }
-    assertParentReported();
-  }
 
-  @Test
-  void preservesDisabledPropagation() throws Exception {
-    AgentSpan parent = startSpan("test", "parent");
-    try (ContextScope ignored = activateSpan(parent)) {
-      setAsyncPropagationEnabled(false);
-      LocalSessionStore store = LocalSessionStore.create(vertx, "disabled", 60_000);
-      try {
-        assertFalse(isAsyncPropagationEnabled());
-      } finally {
-        store.close();
-      }
-    } finally {
-      parent.finish();
+    @Test
+    void preservesDisabledPropagation() throws Exception {
+        AgentSpan parent = startSpan("test", "parent");
+        try (ContextScope ignored = activateSpan(parent)) {
+            setAsyncPropagationEnabled(false);
+            LocalSessionStore store = LocalSessionStore.create(vertx, "disabled", 60_000);
+            try {
+                assertFalse(isAsyncPropagationEnabled());
+            } finally {
+                store.close();
+            }
+        } finally {
+            parent.finish();
+        }
+        assertParentReported();
     }
-    assertParentReported();
-  }
 
-  @Test
-  void applicationTimerStillPropagatesRequest() throws Exception {
-    CompletableFuture<AgentSpan> observed = new CompletableFuture<>();
-    AgentSpan parent = startSpan("test", "parent");
-    try (ContextScope ignored = activateSpan(parent)) {
-      vertx.setTimer(10, id -> observed.complete(activeSpan()));
-    } finally {
-      parent.finish();
+    @Test
+    void applicationTimerStillPropagatesRequest() throws Exception {
+        CompletableFuture<AgentSpan> observed = new CompletableFuture<>();
+        AgentSpan parent = startSpan("test", "parent");
+        try (ContextScope ignored = activateSpan(parent)) {
+            vertx.setTimer(10, id -> observed.complete(activeSpan()));
+        } finally {
+            parent.finish();
+        }
+        assertSame(parent, observed.get(10, TimeUnit.SECONDS));
+        assertParentReported();
     }
-    assertSame(parent, observed.get(10, TimeUnit.SECONDS));
-    assertParentReported();
-  }
 
-  private void assertParentReported() throws Exception {
-    // Assert before closing the store: cancellation would otherwise conceal a captured
-    // continuation.
-    assertTrue(writer.waitForTracesMax(1, 3), "Session maintenance retained the request trace");
-    assertTraces(trace(span().root().operationName("parent")));
-  }
+    private void assertParentReported() throws Exception {
+        // Assert before closing the store: cancellation would otherwise conceal a captured
+        // continuation.
+        assertTrue(writer.waitForTracesMax(1, 3), "Session maintenance retained the request trace");
+        assertTraces(trace(span().root().operationName("parent")));
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/VertxMiddlewareTestServer.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/VertxMiddlewareTestServer.java
index e77f1b6fb65..f2ac240d749 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/VertxMiddlewareTestServer.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/VertxMiddlewareTestServer.java
@@ -5,13 +5,13 @@
 import io.vertx.ext.web.RoutingContext;
 
 public class VertxMiddlewareTestServer extends VertxTestServer {
-  @Override
-  protected void customizeBeforeRoutes(Router router) {
-    router.route().handler(VertxMiddlewareTestServer::firstHandler);
-  }
+    @Override
+    protected void customizeBeforeRoutes(Router router) {
+        router.route().handler(VertxMiddlewareTestServer::firstHandler);
+    }
 
-  private static void firstHandler(final RoutingContext ctx) {
-    AgentTracer.activeSpan().setTag("before", true);
-    ctx.next();
-  }
+    private static void firstHandler(final RoutingContext ctx) {
+        AgentTracer.activeSpan().setTag("before", true);
+        ctx.next();
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/VertxSubrouterTestServer.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/VertxSubrouterTestServer.java
index 36f1814b1c6..08ff21b1f50 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/VertxSubrouterTestServer.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/VertxSubrouterTestServer.java
@@ -3,10 +3,10 @@
 import io.vertx.ext.web.Router;
 
 public class VertxSubrouterTestServer extends VertxTestServer {
-  @Override
-  protected Router customizeAfterRoutes(Router configured) {
-    Router router = Router.router(vertx);
-    router.route("/sub/*").subRouter(configured);
-    return router;
-  }
+    @Override
+    protected Router customizeAfterRoutes(Router configured) {
+        Router router = Router.router(vertx);
+        router.route("/sub/*").subRouter(configured);
+        return router;
+    }
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/VertxTestServer.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/VertxTestServer.java
index 24902867163..8cc815aa1eb 100644
--- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/VertxTestServer.java
+++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/VertxTestServer.java
@@ -36,247 +36,175 @@
 import io.vertx.ext.web.sstore.LocalSessionStore;
 
 public class VertxTestServer extends AbstractVerticle {
-  public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port";
-  public static final String PORT_DATA_ADDRESS = "PORT_DATA";
-
-  @Override
-  public void start(final Promise<Void> startPromise) {
-    final int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
-    Router router = Router.router(vertx);
-
-    customizeBeforeRoutes(router);
-
-    router
-        .route(SUCCESS.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    SUCCESS,
-                    () ->
-                        ctx.response().setStatusCode(SUCCESS.getStatus()).end(SUCCESS.getBody())));
-    router
-        .route(FORWARDED.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    FORWARDED,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(FORWARDED.getStatus())
-                            .end(ctx.request().getHeader("x-forwarded-for"))));
-    router
-        .route(CREATED.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    CREATED,
-                    () ->
-                        ctx.request()
-                            .bodyHandler(
-                                body ->
-                                    ctx.response()
+    public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port";
+    public static final String PORT_DATA_ADDRESS = "PORT_DATA";
+
+    @Override
+    public void start(final Promise<Void> startPromise) {
+        final int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
+        Router router = Router.router(vertx);
+
+        customizeBeforeRoutes(router);
+
+        router.route(SUCCESS.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        SUCCESS,
+                        () -> ctx.response().setStatusCode(SUCCESS.getStatus()).end(SUCCESS.getBody())));
+        router.route(FORWARDED.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        FORWARDED,
+                        () -> ctx.response()
+                                .setStatusCode(FORWARDED.getStatus())
+                                .end(ctx.request().getHeader("x-forwarded-for"))));
+        router.route(CREATED.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        CREATED,
+                        () -> ctx.request()
+                                .bodyHandler(body -> ctx.response()
                                         .setStatusCode(CREATED.getStatus())
                                         .end(CREATED.getBody() + ": " + body.toString()))));
-    router.route(BODY_URLENCODED.getPath()).handler(BodyHandler.create());
-    router
-        .route(BODY_URLENCODED.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    BODY_URLENCODED,
-                    () -> {
-                      String res = convertFormAttributes(ctx);
-                      ctx.response().setStatusCode(BODY_URLENCODED.getStatus()).end(res);
-                    }));
-    router.route(BODY_MULTIPART.getPath()).handler(BodyHandler.create());
-    router
-        .route(BODY_MULTIPART.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    BODY_MULTIPART,
-                    () -> {
-                      ctx.fileUploads();
-                      String res = convertFormAttributes(ctx);
-                      ctx.response().setStatusCode(BODY_MULTIPART.getStatus()).end(res);
-                    }));
-    router.route(BODY_JSON.getPath()).handler(BodyHandler.create());
-    router
-        .route(BODY_JSON.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    BODY_JSON,
-                    () -> {
-                      JsonObject json = ctx.body().asJsonObject();
-                      ctx.response().setStatusCode(BODY_JSON.getStatus());
-                      ctx.json(json);
-                    }));
-    router
-        .route(QUERY_ENCODED_BOTH.getRawPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    QUERY_ENCODED_BOTH,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(QUERY_ENCODED_BOTH.getStatus())
-                            .end(QUERY_ENCODED_BOTH.bodyForQuery(ctx.request().query()))));
-    router
-        .route(QUERY_ENCODED_QUERY.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    QUERY_ENCODED_QUERY,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(QUERY_ENCODED_QUERY.getStatus())
-                            .end(QUERY_ENCODED_QUERY.bodyForQuery(ctx.request().query()))));
-    router
-        .route(QUERY_PARAM.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    QUERY_PARAM,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(QUERY_PARAM.getStatus())
-                            .end(ctx.request().query())));
-
-    router
-        .route(USER_BLOCK.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    USER_BLOCK,
-                    () -> {
-                      Blocking.forUser("user-to-block").blockIfMatch();
-                      ctx.response().end("Should not be reached");
-                    }));
-
-    router
-        .route("/path/:id/param")
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    PATH_PARAM,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(PATH_PARAM.getStatus())
-                            .end(ctx.request().getParam("id"))));
-    router
-        .route(REDIRECT.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    REDIRECT,
-                    () ->
-                        ctx.response()
-                            .setStatusCode(REDIRECT.getStatus())
-                            .putHeader("location", REDIRECT.getBody())
-                            .end()));
-    router
-        .route(ERROR.getPath())
-        .handler(
-            ctx ->
-                controller(
-                    ctx,
-                    ERROR,
-                    () -> ctx.response().setStatusCode(ERROR.getStatus()).end(ERROR.getBody())));
-    router
-        .route(EXCEPTION.getPath())
-        .handler(ctx -> controller(ctx, EXCEPTION, VertxTestServer::exception));
-
-    router
-        .route(SESSION_ID.getPath())
-        .handler(SessionHandler.create(LocalSessionStore.create(vertx)));
-    router
-        .route(SESSION_ID.getPath())
-        .handler(
-            ctx -> ctx.response().setStatusCode(SESSION_ID.getStatus()).end(ctx.session().id()));
-
-    router = customizeAfterRoutes(router);
-
-    vertx
-        .createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
-        .requestHandler(router)
-        .listen(port)
-        .andThen(
-            event -> {
-              // send this though event bus and succeed deploy after successful response
-              int actualPort = event.result().actualPort();
-              vertx
-                  .eventBus()
-                  .request(PORT_DATA_ADDRESS, actualPort)
-                  .andThen(
-                      ar -> {
+        router.route(BODY_URLENCODED.getPath()).handler(BodyHandler.create());
+        router.route(BODY_URLENCODED.getPath())
+                .handler(ctx -> controller(ctx, BODY_URLENCODED, () -> {
+                    String res = convertFormAttributes(ctx);
+                    ctx.response().setStatusCode(BODY_URLENCODED.getStatus()).end(res);
+                }));
+        router.route(BODY_MULTIPART.getPath()).handler(BodyHandler.create());
+        router.route(BODY_MULTIPART.getPath())
+                .handler(ctx -> controller(ctx, BODY_MULTIPART, () -> {
+                    ctx.fileUploads();
+                    String res = convertFormAttributes(ctx);
+                    ctx.response().setStatusCode(BODY_MULTIPART.getStatus()).end(res);
+                }));
+        router.route(BODY_JSON.getPath()).handler(BodyHandler.create());
+        router.route(BODY_JSON.getPath())
+                .handler(ctx -> controller(ctx, BODY_JSON, () -> {
+                    JsonObject json = ctx.body().asJsonObject();
+                    ctx.response().setStatusCode(BODY_JSON.getStatus());
+                    ctx.json(json);
+                }));
+        router.route(QUERY_ENCODED_BOTH.getRawPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        QUERY_ENCODED_BOTH,
+                        () -> ctx.response()
+                                .setStatusCode(QUERY_ENCODED_BOTH.getStatus())
+                                .end(QUERY_ENCODED_BOTH.bodyForQuery(
+                                        ctx.request().query()))));
+        router.route(QUERY_ENCODED_QUERY.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        QUERY_ENCODED_QUERY,
+                        () -> ctx.response()
+                                .setStatusCode(QUERY_ENCODED_QUERY.getStatus())
+                                .end(QUERY_ENCODED_QUERY.bodyForQuery(
+                                        ctx.request().query()))));
+        router.route(QUERY_PARAM.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        QUERY_PARAM,
+                        () -> ctx.response()
+                                .setStatusCode(QUERY_PARAM.getStatus())
+                                .end(ctx.request().query())));
+
+        router.route(USER_BLOCK.getPath())
+                .handler(ctx -> controller(ctx, USER_BLOCK, () -> {
+                    Blocking.forUser("user-to-block").blockIfMatch();
+                    ctx.response().end("Should not be reached");
+                }));
+
+        router.route("/path/:id/param")
+                .handler(ctx -> controller(
+                        ctx,
+                        PATH_PARAM,
+                        () -> ctx.response()
+                                .setStatusCode(PATH_PARAM.getStatus())
+                                .end(ctx.request().getParam("id"))));
+        router.route(REDIRECT.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        REDIRECT,
+                        () -> ctx.response()
+                                .setStatusCode(REDIRECT.getStatus())
+                                .putHeader("location", REDIRECT.getBody())
+                                .end()));
+        router.route(ERROR.getPath())
+                .handler(ctx -> controller(
+                        ctx,
+                        ERROR,
+                        () -> ctx.response().setStatusCode(ERROR.getStatus()).end(ERROR.getBody())));
+        router.route(EXCEPTION.getPath()).handler(ctx -> controller(ctx, EXCEPTION, VertxTestServer::exception));
+
+        router.route(SESSION_ID.getPath()).handler(SessionHandler.create(LocalSessionStore.create(vertx)));
+        router.route(SESSION_ID.getPath())
+                .handler(ctx -> ctx.response()
+                        .setStatusCode(SESSION_ID.getStatus())
+                        .end(ctx.session().id()));
+
+        router = customizeAfterRoutes(router);
+
+        vertx.createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
+                .requestHandler(router)
+                .listen(port)
+                .andThen(event -> {
+                    // send this though event bus and succeed deploy after successful response
+                    int actualPort = event.result().actualPort();
+                    vertx.eventBus().request(PORT_DATA_ADDRESS, actualPort).andThen(ar -> {
                         if (ar.succeeded()) {
-                          startPromise.complete();
+                            startPromise.complete();
                         } else {
-                          startPromise.fail(ar.cause());
+                            startPromise.fail(ar.cause());
                         }
-                      });
-            });
-  }
+                    });
+                });
+    }
 
-  private static String convertFormAttributes(RoutingContext ctx) {
-    String res = "[";
-    MultiMap entries = ctx.request().formAttributes();
-    for (String name : entries.names()) {
-      if (name.equals("ignore")) {
-        continue;
-      }
-      if (res.length() > 1) {
-        res += ", ";
-      }
-      res += name;
-      res += ":[";
-      int i = 0;
-      for (String s : entries.getAll(name)) {
-        if (i++ > 0) {
-          res += ", ";
+    private static String convertFormAttributes(RoutingContext ctx) {
+        String res = "[";
+        MultiMap entries = ctx.request().formAttributes();
+        for (String name : entries.names()) {
+            if (name.equals("ignore")) {
+                continue;
+            }
+            if (res.length() > 1) {
+                res += ", ";
+            }
+            res += name;
+            res += ":[";
+            int i = 0;
+            for (String s : entries.getAll(name)) {
+                if (i++ > 0) {
+                    res += ", ";
+                }
+                res += s;
+            }
+            res += ']';
         }
-        res += s;
-      }
-      res += ']';
+        res += ']';
+        return res;
     }
-    res += ']';
-    return res;
-  }
 
-  protected void customizeBeforeRoutes(Router router) {}
+    protected void customizeBeforeRoutes(Router router) {}
 
-  protected Router customizeAfterRoutes(final Router router) {
-    return router;
-  }
+    protected Router customizeAfterRoutes(final Router router) {
+        return router;
+    }
 
-  private static void exception() {
-    throw new RuntimeException(EXCEPTION.getBody());
-  }
+    private static void exception() {
+        throw new RuntimeException(EXCEPTION.getBody());
+    }
 
-  private static void controller(
-      RoutingContext ctx, final ServerEndpoint endpoint, final Runnable runnable) {
-    assert activeSpan() != null : "Controller should have a parent span.";
-    assert isAsyncPropagationEnabled() : "Span should be propagating async.";
-    ctx.response()
-        .putHeader(
-            HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE());
-    if (endpoint == NOT_FOUND || endpoint == UNKNOWN) {
-      runnable.run();
-      return;
+    private static void controller(RoutingContext ctx, final ServerEndpoint endpoint, final Runnable runnable) {
+        assert activeSpan() != null : "Controller should have a parent span.";
+        assert isAsyncPropagationEnabled() : "Span should be propagating async.";
+        ctx.response().putHeader(HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE());
+        if (endpoint == NOT_FOUND || endpoint == UNKNOWN) {
+            runnable.run();
+            return;
+        }
+        runnableUnderTraceAsync("controller", runnable);
     }
-    runnableUnderTraceAsync("controller", runnable);
-  }
 }
diff --git a/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/DatadogWeaverReporter.java b/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/DatadogWeaverReporter.java
index aaf35631118..3795bd744a5 100644
--- a/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/DatadogWeaverReporter.java
+++ b/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/DatadogWeaverReporter.java
@@ -23,146 +23,137 @@
 
 public class DatadogWeaverReporter {
 
-  private static final String TEST_FRAMEWORK = "weaver";
-  private static final String TEST_FRAMEWORK_VERSION = WeaverUtils.getWeaverVersion();
-
-  private static volatile TestEventsHandler<TestSuiteDescriptor, TestDescriptor>
-      TEST_EVENTS_HANDLER;
-
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification =
-          "Reporter class not exposed to application code; locking on its Class is safe")
-  public static synchronized void start() {
-    if (TEST_EVENTS_HANDLER == null) {
-      TEST_EVENTS_HANDLER =
-          InstrumentationBridge.createTestEventsHandler(
-              "weaver", null, null, WeaverUtils.CAPABILITIES);
+    private static final String TEST_FRAMEWORK = "weaver";
+    private static final String TEST_FRAMEWORK_VERSION = WeaverUtils.getWeaverVersion();
+
+    private static volatile TestEventsHandler<TestSuiteDescriptor, TestDescriptor> TEST_EVENTS_HANDLER;
+
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Reporter class not exposed to application code; locking on its Class is safe")
+    public static synchronized void start() {
+        if (TEST_EVENTS_HANDLER == null) {
+            TEST_EVENTS_HANDLER =
+                    InstrumentationBridge.createTestEventsHandler("weaver", null, null, WeaverUtils.CAPABILITIES);
+        }
     }
-  }
-
-  /** Used by instrumentation tests */
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification =
-          "Reporter class not exposed to application code; locking on its Class is safe")
-  public static synchronized void stop() {
-    if (TEST_EVENTS_HANDLER != null) {
-      TEST_EVENTS_HANDLER.close();
-      TEST_EVENTS_HANDLER = null;
+
+    /** Used by instrumentation tests */
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Reporter class not exposed to application code; locking on its Class is safe")
+    public static synchronized void stop() {
+        if (TEST_EVENTS_HANDLER != null) {
+            TEST_EVENTS_HANDLER.close();
+            TEST_EVENTS_HANDLER = null;
+        }
     }
-  }
-
-  public static void processEvent(Object event, TaskDef taskDef) {
-    if (event instanceof RunEvent) {
-      // handle event here, using taskDef reference to get suite details
-      if (event instanceof SuiteStarted) {
-        onSuiteStart((SuiteStarted) event);
-      } else if (event instanceof SuiteFinished) {
-        onSuiteFinish((SuiteFinished) event);
-      } else if (event instanceof TestFinished) {
-        onTestFinished((TestFinished) event, taskDef);
-      }
+
+    public static void processEvent(Object event, TaskDef taskDef) {
+        if (event instanceof RunEvent) {
+            // handle event here, using taskDef reference to get suite details
+            if (event instanceof SuiteStarted) {
+                onSuiteStart((SuiteStarted) event);
+            } else if (event instanceof SuiteFinished) {
+                onSuiteFinish((SuiteFinished) event);
+            } else if (event instanceof TestFinished) {
+                onTestFinished((TestFinished) event, taskDef);
+            }
+        }
     }
-  }
-
-  public static void onSuiteStart(SuiteStarted event) {
-    String testSuiteName = event.name();
-    Class<?> testClass = WeaverUtils.getClass(testSuiteName);
-    Collection<String> categories = Collections.emptyList();
-    boolean parallelized = true;
-
-    TEST_EVENTS_HANDLER.onTestSuiteStart(
-        new TestSuiteDescriptor(testSuiteName, testClass),
-        testSuiteName,
-        TEST_FRAMEWORK,
-        TEST_FRAMEWORK_VERSION,
-        testClass,
-        categories,
-        parallelized,
-        TestFrameworkInstrumentation.WEAVER,
-        null);
-  }
-
-  public static void onSuiteFinish(SuiteFinished event) {
-    String testSuiteName = event.name();
-    Class<?> testClass = WeaverUtils.getClass(testSuiteName);
-
-    TEST_EVENTS_HANDLER.onTestSuiteFinish(new TestSuiteDescriptor(testSuiteName, testClass), null);
-  }
-
-  public static void onTestFinished(TestFinished event, TaskDef taskDef) {
-    if (!(event.outcome() instanceof TestOutcome.Default)) {
-      // Cannot obtain desired information without the TestOutcome.Default fields
-      return;
+
+    public static void onSuiteStart(SuiteStarted event) {
+        String testSuiteName = event.name();
+        Class<?> testClass = WeaverUtils.getClass(testSuiteName);
+        Collection<String> categories = Collections.emptyList();
+        boolean parallelized = true;
+
+        TEST_EVENTS_HANDLER.onTestSuiteStart(
+                new TestSuiteDescriptor(testSuiteName, testClass),
+                testSuiteName,
+                TEST_FRAMEWORK,
+                TEST_FRAMEWORK_VERSION,
+                testClass,
+                categories,
+                parallelized,
+                TestFrameworkInstrumentation.WEAVER,
+                null);
     }
 
-    TestOutcome.Default testOutcome = (TestOutcome.Default) event.outcome();
-    String testSuiteName = taskDef.fullyQualifiedName();
-    Class<?> testClass = WeaverUtils.getClass(testSuiteName);
-    TestSuiteDescriptor testSuiteDescriptor = new TestSuiteDescriptor(testSuiteName, testClass);
-    String testName = event.outcome().name();
-    Object testQualifier = null;
-    String testParameters = null;
-    Collection<String> categories = Collections.emptyList();
-    TestDescriptor testDescriptor =
-        new TestDescriptor(testSuiteName, testClass, testName, testParameters, testQualifier);
-    String testMethodName = null;
-    Method testMethod = null;
-    TestExecutionTracker executionTracker = null;
-
-    // Only test finish is reported, so fake test start timestamp
-    long endMicros = SystemTimeSource.INSTANCE.getCurrentTimeMicros();
-    long startMicros = endMicros - testOutcome.duration().toMicros();
-    TEST_EVENTS_HANDLER.onTestStart(
-        testSuiteDescriptor,
-        testDescriptor,
-        testName,
-        TEST_FRAMEWORK,
-        TEST_FRAMEWORK_VERSION,
-        testParameters,
-        categories,
-        new TestSourceData(testClass, testMethod, testMethodName),
-        startMicros,
-        executionTracker);
-
-    if (testOutcome.result() != null) {
-      // Failed outcomes
-      if (WeaverUtils.isResultFailure(testOutcome.result())) {
-        Object source =
-            WeaverUtils.METHOD_HANDLES.invoke(
-                WeaverUtils.GET_FAILURE_SOURCE_HANDLE, testOutcome.result());
-        Throwable throwable = WeaverUtils.toThrowable(source);
-        TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable);
-      } else if (testOutcome.result() instanceof Result.Failures) {
-        Result.Failures result = (Result.Failures) testOutcome.result();
-        Object headFailure = result.failures().head();
-        Object source =
-            WeaverUtils.METHOD_HANDLES.invoke(WeaverUtils.GET_FAILURE_SOURCE_HANDLE, headFailure);
-        Throwable throwable = WeaverUtils.toThrowable(source);
-        TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable);
-      } else if (testOutcome.result() instanceof Result.Exception) {
-        Result.Exception result = (Result.Exception) testOutcome.result();
-        Throwable throwable = result.source();
-        TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable);
-
-        // Skipped outcomes
-      } else if (testOutcome.result() instanceof Result.Ignored) {
-        Result.Ignored result = (Result.Ignored) testOutcome.result();
-        String reason =
-            WeaverUtils.unwrap(
-                WeaverUtils.METHOD_HANDLES.invoke(
-                    WeaverUtils.GET_IGNORED_REASON_HANDLE, testOutcome.result()),
-                String.class);
-        TEST_EVENTS_HANDLER.onTestSkip(testDescriptor, reason);
-      } else if (WeaverUtils.isResultCancelled(testOutcome.result())) {
-        Option<String> reason =
-            WeaverUtils.METHOD_HANDLES.invoke(
-                WeaverUtils.GET_CANCELLED_REASON_HANDLE, testOutcome.result());
-        TEST_EVENTS_HANDLER.onTestSkip(testDescriptor, reason.getOrElse(null));
-      }
+    public static void onSuiteFinish(SuiteFinished event) {
+        String testSuiteName = event.name();
+        Class<?> testClass = WeaverUtils.getClass(testSuiteName);
+
+        TEST_EVENTS_HANDLER.onTestSuiteFinish(new TestSuiteDescriptor(testSuiteName, testClass), null);
     }
 
-    TEST_EVENTS_HANDLER.onTestFinish(testDescriptor, endMicros, executionTracker);
-  }
+    public static void onTestFinished(TestFinished event, TaskDef taskDef) {
+        if (!(event.outcome() instanceof TestOutcome.Default)) {
+            // Cannot obtain desired information without the TestOutcome.Default fields
+            return;
+        }
+
+        TestOutcome.Default testOutcome = (TestOutcome.Default) event.outcome();
+        String testSuiteName = taskDef.fullyQualifiedName();
+        Class<?> testClass = WeaverUtils.getClass(testSuiteName);
+        TestSuiteDescriptor testSuiteDescriptor = new TestSuiteDescriptor(testSuiteName, testClass);
+        String testName = event.outcome().name();
+        Object testQualifier = null;
+        String testParameters = null;
+        Collection<String> categories = Collections.emptyList();
+        TestDescriptor testDescriptor =
+                new TestDescriptor(testSuiteName, testClass, testName, testParameters, testQualifier);
+        String testMethodName = null;
+        Method testMethod = null;
+        TestExecutionTracker executionTracker = null;
+
+        // Only test finish is reported, so fake test start timestamp
+        long endMicros = SystemTimeSource.INSTANCE.getCurrentTimeMicros();
+        long startMicros = endMicros - testOutcome.duration().toMicros();
+        TEST_EVENTS_HANDLER.onTestStart(
+                testSuiteDescriptor,
+                testDescriptor,
+                testName,
+                TEST_FRAMEWORK,
+                TEST_FRAMEWORK_VERSION,
+                testParameters,
+                categories,
+                new TestSourceData(testClass, testMethod, testMethodName),
+                startMicros,
+                executionTracker);
+
+        if (testOutcome.result() != null) {
+            // Failed outcomes
+            if (WeaverUtils.isResultFailure(testOutcome.result())) {
+                Object source =
+                        WeaverUtils.METHOD_HANDLES.invoke(WeaverUtils.GET_FAILURE_SOURCE_HANDLE, testOutcome.result());
+                Throwable throwable = WeaverUtils.toThrowable(source);
+                TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable);
+            } else if (testOutcome.result() instanceof Result.Failures) {
+                Result.Failures result = (Result.Failures) testOutcome.result();
+                Object headFailure = result.failures().head();
+                Object source = WeaverUtils.METHOD_HANDLES.invoke(WeaverUtils.GET_FAILURE_SOURCE_HANDLE, headFailure);
+                Throwable throwable = WeaverUtils.toThrowable(source);
+                TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable);
+            } else if (testOutcome.result() instanceof Result.Exception) {
+                Result.Exception result = (Result.Exception) testOutcome.result();
+                Throwable throwable = result.source();
+                TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable);
+
+                // Skipped outcomes
+            } else if (testOutcome.result() instanceof Result.Ignored) {
+                Result.Ignored result = (Result.Ignored) testOutcome.result();
+                String reason = WeaverUtils.unwrap(
+                        WeaverUtils.METHOD_HANDLES.invoke(WeaverUtils.GET_IGNORED_REASON_HANDLE, testOutcome.result()),
+                        String.class);
+                TEST_EVENTS_HANDLER.onTestSkip(testDescriptor, reason);
+            } else if (WeaverUtils.isResultCancelled(testOutcome.result())) {
+                Option<String> reason = WeaverUtils.METHOD_HANDLES.invoke(
+                        WeaverUtils.GET_CANCELLED_REASON_HANDLE, testOutcome.result());
+                TEST_EVENTS_HANDLER.onTestSkip(testDescriptor, reason.getOrElse(null));
+            }
+        }
+
+        TEST_EVENTS_HANDLER.onTestFinish(testDescriptor, endMicros, executionTracker);
+    }
 }
diff --git a/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/TaskDefAwareConcurrentLinkedQueueProxy.java b/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/TaskDefAwareConcurrentLinkedQueueProxy.java
index eda5327434d..48daf41e839 100644
--- a/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/TaskDefAwareConcurrentLinkedQueueProxy.java
+++ b/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/TaskDefAwareConcurrentLinkedQueueProxy.java
@@ -5,21 +5,20 @@
 
 public final class TaskDefAwareConcurrentLinkedQueueProxy<T> extends ConcurrentLinkedQueue<T> {
 
-  private final TaskDef taskDef;
-  private final ConcurrentLinkedQueue<T> delegate;
+    private final TaskDef taskDef;
+    private final ConcurrentLinkedQueue<T> delegate;
 
-  public TaskDefAwareConcurrentLinkedQueueProxy(
-      TaskDef taskDef, ConcurrentLinkedQueue<T> delegate) {
-    super();
-    this.taskDef = taskDef;
-    this.delegate = delegate;
-    DatadogWeaverReporter.start();
-  }
+    public TaskDefAwareConcurrentLinkedQueueProxy(TaskDef taskDef, ConcurrentLinkedQueue<T> delegate) {
+        super();
+        this.taskDef = taskDef;
+        this.delegate = delegate;
+        DatadogWeaverReporter.start();
+    }
 
-  @Override
-  public T poll() {
-    T event = delegate.poll();
-    DatadogWeaverReporter.processEvent(event, taskDef);
-    return event;
-  }
+    @Override
+    public T poll() {
+        T event = delegate.poll();
+        DatadogWeaverReporter.processEvent(event, taskDef);
+        return event;
+    }
 }
diff --git a/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/TaskDefAwareLinkedBlockingQueueProxy.java b/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/TaskDefAwareLinkedBlockingQueueProxy.java
index e9c267f2864..d6090ebdd26 100644
--- a/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/TaskDefAwareLinkedBlockingQueueProxy.java
+++ b/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/TaskDefAwareLinkedBlockingQueueProxy.java
@@ -6,29 +6,29 @@
 
 public final class TaskDefAwareLinkedBlockingQueueProxy<T> extends LinkedBlockingQueue<T> {
 
-  private final TaskDef taskDef;
-  private final LinkedBlockingQueue<T> delegate;
+    private final TaskDef taskDef;
+    private final LinkedBlockingQueue<T> delegate;
 
-  public TaskDefAwareLinkedBlockingQueueProxy(TaskDef taskDef, LinkedBlockingQueue<T> delegate) {
-    super();
-    this.taskDef = taskDef;
-    this.delegate = delegate;
-    DatadogWeaverReporter.start();
-  }
+    public TaskDefAwareLinkedBlockingQueueProxy(TaskDef taskDef, LinkedBlockingQueue<T> delegate) {
+        super();
+        this.taskDef = taskDef;
+        this.delegate = delegate;
+        DatadogWeaverReporter.start();
+    }
 
-  @Override
-  public T poll() {
-    T event = delegate.poll();
-    DatadogWeaverReporter.processEvent(event, taskDef);
-    return event;
-  }
+    @Override
+    public T poll() {
+        T event = delegate.poll();
+        DatadogWeaverReporter.processEvent(event, taskDef);
+        return event;
+    }
 
-  @Override
-  public T poll(long timeout, TimeUnit unit) throws InterruptedException {
-    T event = delegate.poll(timeout, unit);
-    if (event != null) {
-      DatadogWeaverReporter.processEvent(event, taskDef);
+    @Override
+    public T poll(long timeout, TimeUnit unit) throws InterruptedException {
+        T event = delegate.poll(timeout, unit);
+        if (event != null) {
+            DatadogWeaverReporter.processEvent(event, taskDef);
+        }
+        return event;
     }
-    return event;
-  }
 }
diff --git a/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java b/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java
index df438c27565..0dd165c3077 100644
--- a/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java
+++ b/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java
@@ -15,48 +15,48 @@
 
 @AutoService(InstrumenterModule.class)
 public class WeaverInstrumentation extends InstrumenterModule.CiVisibility
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public WeaverInstrumentation() {
-    super("ci-visibility", "weaver");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "weaver.framework.SbtTask";
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    // disneystreaming/weaver-test (0.8.4+) uses a ConcurrentLinkedQueue
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(5, named("java.util.concurrent.ConcurrentLinkedQueue"))),
-        WeaverInstrumentation.class.getName() + "$ConcurrentLinkedQueueAdvice");
-    // typelevel/weaver-test (0.9+) uses a LinkedBlockingQueue
-    transformer.applyAdvice(
-        isConstructor().and(takesArgument(5, named("java.util.concurrent.LinkedBlockingQueue"))),
-        WeaverInstrumentation.class.getName() + "$LinkedBlockingQueueAdvice");
-  }
-
-  public static class ConcurrentLinkedQueueAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void wrapQueue(
-        @Advice.Argument(0) TaskDef taskDef,
-        @Advice.Argument(value = 5, readOnly = false) ConcurrentLinkedQueue<SuiteEvent> queue) {
-      if (!(queue instanceof TaskDefAwareConcurrentLinkedQueueProxy)) {
-        queue = new TaskDefAwareConcurrentLinkedQueueProxy<>(taskDef, queue);
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    public WeaverInstrumentation() {
+        super("ci-visibility", "weaver");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "weaver.framework.SbtTask";
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        // disneystreaming/weaver-test (0.8.4+) uses a ConcurrentLinkedQueue
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(5, named("java.util.concurrent.ConcurrentLinkedQueue"))),
+                WeaverInstrumentation.class.getName() + "$ConcurrentLinkedQueueAdvice");
+        // typelevel/weaver-test (0.9+) uses a LinkedBlockingQueue
+        transformer.applyAdvice(
+                isConstructor().and(takesArgument(5, named("java.util.concurrent.LinkedBlockingQueue"))),
+                WeaverInstrumentation.class.getName() + "$LinkedBlockingQueueAdvice");
+    }
+
+    public static class ConcurrentLinkedQueueAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void wrapQueue(
+                @Advice.Argument(0) TaskDef taskDef,
+                @Advice.Argument(value = 5, readOnly = false) ConcurrentLinkedQueue<SuiteEvent> queue) {
+            if (!(queue instanceof TaskDefAwareConcurrentLinkedQueueProxy)) {
+                queue = new TaskDefAwareConcurrentLinkedQueueProxy<>(taskDef, queue);
+            }
+        }
     }
-  }
-
-  public static class LinkedBlockingQueueAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void wrapQueue(
-        @Advice.Argument(0) TaskDef taskDef,
-        @Advice.Argument(value = 5, readOnly = false) LinkedBlockingQueue<SuiteEvent> queue) {
-      if (!(queue instanceof TaskDefAwareLinkedBlockingQueueProxy)) {
-        queue = new TaskDefAwareLinkedBlockingQueueProxy<>(taskDef, queue);
-      }
+
+    public static class LinkedBlockingQueueAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void wrapQueue(
+                @Advice.Argument(0) TaskDef taskDef,
+                @Advice.Argument(value = 5, readOnly = false) LinkedBlockingQueue<SuiteEvent> queue) {
+            if (!(queue instanceof TaskDefAwareLinkedBlockingQueueProxy)) {
+                queue = new TaskDefAwareLinkedBlockingQueueProxy<>(taskDef, queue);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverUtils.java b/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverUtils.java
index f4ed259cd24..39a24142112 100644
--- a/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverUtils.java
+++ b/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverUtils.java
@@ -18,120 +18,117 @@
 
 public abstract class WeaverUtils {
 
-  private static final Logger log = LoggerFactory.getLogger(WeaverUtils.class);
+    private static final Logger log = LoggerFactory.getLogger(WeaverUtils.class);
 
-  private static final ClassLoader CLASS_LOADER = SbtTask.class.getClassLoader();
-  public static final MethodHandles METHOD_HANDLES = new MethodHandles(CLASS_LOADER);
+    private static final ClassLoader CLASS_LOADER = SbtTask.class.getClassLoader();
+    public static final MethodHandles METHOD_HANDLES = new MethodHandles(CLASS_LOADER);
 
-  // Reflection used due to changes in Weaver v0.11:
-  // - Result.Cancelled was removed
-  private static final String RESULT_CANCELLED_CLASS_NAME = "weaver.Result$Cancelled";
-  public static final MethodHandle GET_CANCELLED_REASON_HANDLE =
-      METHOD_HANDLES.method(getClass(RESULT_CANCELLED_CLASS_NAME), "reason");
-  // - Ignore.reason() changed from Optional<String> to String
-  public static final MethodHandle GET_IGNORED_REASON_HANDLE =
-      METHOD_HANDLES.method(Result.Ignored.class, "reason");
-  // - Result.Failure changed to Result.Failures.Failure
-  private static final String RESULT_FAILURE_CLASS_NAME = "weaver.Result$Failure";
-  private static final String RESULT_FAILURES_FAILURE_CLASS_NAME = "weaver.Result$Failures$Failure";
-  // - Failure.source changed from Optional<Throwable> to Throwable
-  public static final MethodHandle GET_FAILURE_SOURCE_HANDLE = createFailureSourceHandle();
-  // - In v0.12.0, ExpectationFailed is no longer a Throwable
-  private static final String EXPECTATION_FAILED_CLASS_NAME = "weaver.ExpectationFailed";
-  private static final MethodHandle GET_EXPECTATION_FAILED_MESSAGE_HANDLE =
-      METHOD_HANDLES.method(getClass(EXPECTATION_FAILED_CLASS_NAME), "message");
+    // Reflection used due to changes in Weaver v0.11:
+    // - Result.Cancelled was removed
+    private static final String RESULT_CANCELLED_CLASS_NAME = "weaver.Result$Cancelled";
+    public static final MethodHandle GET_CANCELLED_REASON_HANDLE =
+            METHOD_HANDLES.method(getClass(RESULT_CANCELLED_CLASS_NAME), "reason");
+    // - Ignore.reason() changed from Optional<String> to String
+    public static final MethodHandle GET_IGNORED_REASON_HANDLE = METHOD_HANDLES.method(Result.Ignored.class, "reason");
+    // - Result.Failure changed to Result.Failures.Failure
+    private static final String RESULT_FAILURE_CLASS_NAME = "weaver.Result$Failure";
+    private static final String RESULT_FAILURES_FAILURE_CLASS_NAME = "weaver.Result$Failures$Failure";
+    // - Failure.source changed from Optional<Throwable> to Throwable
+    public static final MethodHandle GET_FAILURE_SOURCE_HANDLE = createFailureSourceHandle();
+    // - In v0.12.0, ExpectationFailed is no longer a Throwable
+    private static final String EXPECTATION_FAILED_CLASS_NAME = "weaver.ExpectationFailed";
+    private static final MethodHandle GET_EXPECTATION_FAILED_MESSAGE_HANDLE =
+            METHOD_HANDLES.method(getClass(EXPECTATION_FAILED_CLASS_NAME), "message");
 
-  public static final List<LibraryCapability> CAPABILITIES = Collections.emptyList();
+    public static final List<LibraryCapability> CAPABILITIES = Collections.emptyList();
 
-  private WeaverUtils() {}
+    private WeaverUtils() {}
 
-  public static @Nullable String getWeaverVersion() {
-    try {
-      String className = '/' + SbtTask.class.getName().replace('.', '/') + ".class";
-      URL classResource = SbtTask.class.getResource(className);
-      if (classResource == null) {
-        return null;
-      }
+    public static @Nullable String getWeaverVersion() {
+        try {
+            String className = '/' + SbtTask.class.getName().replace('.', '/') + ".class";
+            URL classResource = SbtTask.class.getResource(className);
+            if (classResource == null) {
+                return null;
+            }
 
-      String classPath = classResource.toString();
-      String manifestPath =
-          classPath.substring(0, classPath.lastIndexOf("!") + 1) + "/META-INF/MANIFEST.MF";
-      try (InputStream manifestStream = new URL(manifestPath).openStream()) {
-        Properties manifestProperties = new Properties();
-        manifestProperties.load(manifestStream);
-        return manifestProperties.getProperty("Implementation-Version");
-      }
-    } catch (Exception e) {
-      return null;
+            String classPath = classResource.toString();
+            String manifestPath = classPath.substring(0, classPath.lastIndexOf("!") + 1) + "/META-INF/MANIFEST.MF";
+            try (InputStream manifestStream = new URL(manifestPath).openStream()) {
+                Properties manifestProperties = new Properties();
+                manifestProperties.load(manifestStream);
+                return manifestProperties.getProperty("Implementation-Version");
+            }
+        } catch (Exception e) {
+            return null;
+        }
     }
-  }
 
-  @Nullable
-  public static Class<?> getClass(String className) {
-    if (className.isEmpty()) {
-      return null;
+    @Nullable
+    public static Class<?> getClass(String className) {
+        if (className.isEmpty()) {
+            return null;
+        }
+        try {
+            return CLASS_LOADER.loadClass(className);
+        } catch (Exception e) {
+            log.debug("Could not load class {}", className, e);
+            return null;
+        }
     }
-    try {
-      return CLASS_LOADER.loadClass(className);
-    } catch (Exception e) {
-      log.debug("Could not load class {}", className, e);
-      return null;
-    }
-  }
 
-  @Nullable
-  private static MethodHandle createFailureSourceHandle() {
-    Class<?> newFailureClass = getClass(RESULT_FAILURES_FAILURE_CLASS_NAME);
-    if (newFailureClass != null) {
-      return METHOD_HANDLES.method(newFailureClass, "source");
+    @Nullable
+    private static MethodHandle createFailureSourceHandle() {
+        Class<?> newFailureClass = getClass(RESULT_FAILURES_FAILURE_CLASS_NAME);
+        if (newFailureClass != null) {
+            return METHOD_HANDLES.method(newFailureClass, "source");
+        }
+        // Fallback to old location (Result.Failure)
+        return METHOD_HANDLES.method(getClass(RESULT_FAILURE_CLASS_NAME), "source");
     }
-    // Fallback to old location (Result.Failure)
-    return METHOD_HANDLES.method(getClass(RESULT_FAILURE_CLASS_NAME), "source");
-  }
-
-  public static boolean isResultFailure(@Nonnull Result result) {
-    String className = result.getClass().getName();
-    return RESULT_FAILURE_CLASS_NAME.equals(className)
-        || RESULT_FAILURES_FAILURE_CLASS_NAME.equals(className);
-  }
-
-  public static boolean isResultCancelled(@Nonnull Result result) {
-    String className = result.getClass().getName();
-    return RESULT_CANCELLED_CLASS_NAME.equals(className);
-  }
 
-  public static <T> T unwrap(Object value, Class<T> type) {
-    if (value instanceof Option) {
-      return ((Option<?>) value).getOrElse(null);
-    } else {
-      return type.cast(value);
+    public static boolean isResultFailure(@Nonnull Result result) {
+        String className = result.getClass().getName();
+        return RESULT_FAILURE_CLASS_NAME.equals(className) || RESULT_FAILURES_FAILURE_CLASS_NAME.equals(className);
     }
-  }
 
-  /**
-   * Converts a failure source to a Throwable. In weaver v0.9–v0.11, the source is a Throwable (or
-   * Option&lt;Throwable&gt;). In v0.12.0+, ExpectationFailed is no longer a Throwable, so we
-   * extract its message and wrap it in a RuntimeException.
-   */
-  @Nullable
-  public static Throwable toThrowable(@Nullable Object source) {
-    if (source == null) {
-      return null;
+    public static boolean isResultCancelled(@Nonnull Result result) {
+        String className = result.getClass().getName();
+        return RESULT_CANCELLED_CLASS_NAME.equals(className);
     }
-    if (source instanceof Option) {
-      source = ((Option<?>) source).getOrElse(null);
-      if (source == null) {
-        return null;
-      }
-    }
-    if (source instanceof Throwable) {
-      return (Throwable) source;
+
+    public static <T> T unwrap(Object value, Class<T> type) {
+        if (value instanceof Option) {
+            return ((Option<?>) value).getOrElse(null);
+        } else {
+            return type.cast(value);
+        }
     }
-    // v0.12.0+: ExpectationFailed is no longer a Throwable
-    if (GET_EXPECTATION_FAILED_MESSAGE_HANDLE != null) {
-      String message = METHOD_HANDLES.invoke(GET_EXPECTATION_FAILED_MESSAGE_HANDLE, source);
-      return new RuntimeException(message);
+
+    /**
+     * Converts a failure source to a Throwable. In weaver v0.9–v0.11, the source is a Throwable (or
+     * Option&lt;Throwable&gt;). In v0.12.0+, ExpectationFailed is no longer a Throwable, so we
+     * extract its message and wrap it in a RuntimeException.
+     */
+    @Nullable
+    public static Throwable toThrowable(@Nullable Object source) {
+        if (source == null) {
+            return null;
+        }
+        if (source instanceof Option) {
+            source = ((Option<?>) source).getOrElse(null);
+            if (source == null) {
+                return null;
+            }
+        }
+        if (source instanceof Throwable) {
+            return (Throwable) source;
+        }
+        // v0.12.0+: ExpectationFailed is no longer a Throwable
+        if (GET_EXPECTATION_FAILED_MESSAGE_HANDLE != null) {
+            String message = METHOD_HANDLES.invoke(GET_EXPECTATION_FAILED_MESSAGE_HANDLE, source);
+            return new RuntimeException(message);
+        }
+        return new RuntimeException(source.toString());
     }
-    return new RuntimeException(source.toString());
-  }
 }
diff --git a/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/JakartaWebsocketModule.java b/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/JakartaWebsocketModule.java
index 02b864544a2..cd22a796102 100644
--- a/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/JakartaWebsocketModule.java
+++ b/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/JakartaWebsocketModule.java
@@ -9,17 +9,17 @@
 @AutoService(InstrumenterModule.class)
 public class JakartaWebsocketModule extends JavaxWebsocketModule {
 
-  public JakartaWebsocketModule() {
-    super("jakarta", "jakarta-websocket", "websocket");
-  }
+    public JakartaWebsocketModule() {
+        super("jakarta", "jakarta-websocket", "websocket");
+    }
 
-  @Override
-  public Map<String, String> adviceShading() {
-    return singletonMap("javax", "jakarta");
-  }
+    @Override
+    public Map<String, String> adviceShading() {
+        return singletonMap("javax", "jakarta");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jakarta-websocket";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jakarta-websocket";
+    }
 }
diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/AsyncRemoteEndpointInstrumentation.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/AsyncRemoteEndpointInstrumentation.java
index 31e17cfc779..24ba2b3b324 100644
--- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/AsyncRemoteEndpointInstrumentation.java
+++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/AsyncRemoteEndpointInstrumentation.java
@@ -25,222 +25,197 @@
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
 import net.bytebuddy.matcher.ElementMatcher;
 
-public class AsyncRemoteEndpointInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  private final String namespace;
-
-  public AsyncRemoteEndpointInstrumentation(String namespace) {
-    this.namespace = namespace;
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return namespace + ".websocket.RemoteEndpoint$Async";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("sendText"))
-            .and(
-                takesArguments(1)
-                    .or(
-                        takesArguments(2)
-                            .and(takesArgument(1, named(namespace + ".websocket.SendHandler")))))
-            .and(takesArgument(0, named("java.lang.String"))),
-        getClass().getName() + "$SendTextAdvice");
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("sendBinary"))
-            .and(
-                takesArguments(1)
-                    .or(
-                        takesArguments(2)
-                            .and(takesArgument(1, named(namespace + ".websocket.SendHandler")))))
-            .and(takesArgument(0, named("java.nio.ByteBuffer"))),
-        getClass().getName() + "$SendBinaryAdvice");
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("sendObject"))
-            .and(
-                takesArguments(1)
-                    .or(
-                        takesArguments(2)
-                            .and(takesArgument(1, named(namespace + ".websocket.SendHandler"))))),
-        getClass().getName() + "$SendObjectAdvice");
-  }
-
-  public static class SendTextAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(
-        @Advice.This final RemoteEndpoint.Async self,
-        @Advice.Argument(0) String text,
-        @Advice.Argument(
-                value = 1,
-                optional = true,
-                readOnly = false,
-                typing = Assigner.Typing.DYNAMIC)
-            SendHandler sendHandler,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
-      handlerContext =
-          InstrumentationContext.get(RemoteEndpoint.class, HandlerContext.Sender.class).get(self);
-      if (handlerContext == null
-          || CallDepthThreadLocalMap.incrementCallDepth(RemoteEndpoint.class) > 0) {
-        return null;
-      }
-
-      final AgentSpan wsSpan =
-          DECORATE.startOutboundFrameSpan(
-              handlerContext,
-              CHAR_SEQUENCE_SIZE_CALCULATOR.getFormat(),
-              CHAR_SEQUENCE_SIZE_CALCULATOR.getLengthFunction().applyAsInt(text));
-      if (sendHandler != null) {
-        sendHandler = new TracingSendHandler(sendHandler, handlerContext);
-      }
-      return activateSpan(wsSpan);
+public class AsyncRemoteEndpointInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    private final String namespace;
+
+    public AsyncRemoteEndpointInstrumentation(String namespace) {
+        this.namespace = namespace;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Future<Void> future) {
-      CallDepthThreadLocalMap.decrementCallDepth(RemoteEndpoint.class);
-      if (scope == null) {
-        return;
-      }
-      try {
-        if (throwable != null) {
-          DECORATE.onError(scope, throwable);
-          DECORATE.onFrameEnd(handlerContext);
-        } else if (future != null) {
-          // FIXME: Knowing when the future really completes would imply instrumenting all the
-          // possible implementations.
-          // In this case we will just finish the span to have a trace of this send even if the
-          // duration is not exact
-          DECORATE.onFrameEnd(handlerContext);
-        }
-      } finally {
-        scope.close();
-      }
+    @Override
+    public String hierarchyMarkerType() {
+        return namespace + ".websocket.RemoteEndpoint$Async";
     }
-  }
-
-  public static class SendBinaryAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(
-        @Advice.This final RemoteEndpoint.Async self,
-        @Advice.Argument(0) ByteBuffer buffer,
-        @Advice.Argument(
-                value = 1,
-                optional = true,
-                readOnly = false,
-                typing = Assigner.Typing.DYNAMIC)
-            SendHandler sendHandler,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
-      handlerContext =
-          InstrumentationContext.get(RemoteEndpoint.class, HandlerContext.Sender.class).get(self);
-      if (handlerContext == null
-          || CallDepthThreadLocalMap.incrementCallDepth(RemoteEndpoint.class) > 0) {
-        return null;
-      }
-
-      final AgentSpan wsSpan =
-          DECORATE.startOutboundFrameSpan(
-              handlerContext,
-              BYTE_BUFFER_SIZE_CALCULATOR.getFormat(),
-              BYTE_BUFFER_SIZE_CALCULATOR.getLengthFunction().applyAsInt(buffer));
-      if (sendHandler != null) {
-        sendHandler = new TracingSendHandler(sendHandler, handlerContext);
-      }
-      return activateSpan(wsSpan);
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Future<Void> future) {
-      CallDepthThreadLocalMap.decrementCallDepth(RemoteEndpoint.class);
-      if (scope == null) {
-        return;
-      }
-      try {
-        if (throwable != null) {
-          DECORATE.onError(scope, throwable);
-          DECORATE.onFrameEnd(handlerContext);
-        } else if (future != null) {
-          // FIXME: Knowing when the future really completes would imply instrumenting all the
-          // possible implementations.
-          // In this case we will just finish the span to have a trace of this send even if the
-          // duration is not exact
-          DECORATE.onFrameEnd(handlerContext);
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("sendText"))
+                        .and(takesArguments(1)
+                                .or(takesArguments(2)
+                                        .and(takesArgument(1, named(namespace + ".websocket.SendHandler")))))
+                        .and(takesArgument(0, named("java.lang.String"))),
+                getClass().getName() + "$SendTextAdvice");
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("sendBinary"))
+                        .and(takesArguments(1)
+                                .or(takesArguments(2)
+                                        .and(takesArgument(1, named(namespace + ".websocket.SendHandler")))))
+                        .and(takesArgument(0, named("java.nio.ByteBuffer"))),
+                getClass().getName() + "$SendBinaryAdvice");
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("sendObject"))
+                        .and(takesArguments(1)
+                                .or(takesArguments(2)
+                                        .and(takesArgument(1, named(namespace + ".websocket.SendHandler"))))),
+                getClass().getName() + "$SendObjectAdvice");
+    }
+
+    public static class SendTextAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(
+                @Advice.This final RemoteEndpoint.Async self,
+                @Advice.Argument(0) String text,
+                @Advice.Argument(value = 1, optional = true, readOnly = false, typing = Assigner.Typing.DYNAMIC)
+                        SendHandler sendHandler,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
+            handlerContext = InstrumentationContext.get(RemoteEndpoint.class, HandlerContext.Sender.class)
+                    .get(self);
+            if (handlerContext == null || CallDepthThreadLocalMap.incrementCallDepth(RemoteEndpoint.class) > 0) {
+                return null;
+            }
+
+            final AgentSpan wsSpan = DECORATE.startOutboundFrameSpan(
+                    handlerContext,
+                    CHAR_SEQUENCE_SIZE_CALCULATOR.getFormat(),
+                    CHAR_SEQUENCE_SIZE_CALCULATOR.getLengthFunction().applyAsInt(text));
+            if (sendHandler != null) {
+                sendHandler = new TracingSendHandler(sendHandler, handlerContext);
+            }
+            return activateSpan(wsSpan);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Future<Void> future) {
+            CallDepthThreadLocalMap.decrementCallDepth(RemoteEndpoint.class);
+            if (scope == null) {
+                return;
+            }
+            try {
+                if (throwable != null) {
+                    DECORATE.onError(scope, throwable);
+                    DECORATE.onFrameEnd(handlerContext);
+                } else if (future != null) {
+                    // FIXME: Knowing when the future really completes would imply instrumenting all the
+                    // possible implementations.
+                    // In this case we will just finish the span to have a trace of this send even if the
+                    // duration is not exact
+                    DECORATE.onFrameEnd(handlerContext);
+                }
+            } finally {
+                scope.close();
+            }
         }
-      } finally {
-        scope.close();
-      }
     }
-  }
-
-  public static class SendObjectAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(
-        @Advice.This final RemoteEndpoint.Async self,
-        @Advice.Argument(
-                value = 1,
-                optional = true,
-                readOnly = false,
-                typing = Assigner.Typing.DYNAMIC)
-            SendHandler sendHandler,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
-      handlerContext =
-          InstrumentationContext.get(RemoteEndpoint.class, HandlerContext.Sender.class).get(self);
-      if (handlerContext == null
-          || CallDepthThreadLocalMap.incrementCallDepth(RemoteEndpoint.class) > 0) {
-        return null;
-      }
-
-      final AgentSpan wsSpan =
-          DECORATE.startOutboundFrameSpan(
-              handlerContext, BYTE_BUFFER_SIZE_CALCULATOR.getFormat(), 0);
-      if (sendHandler != null) {
-        sendHandler = new TracingSendHandler(sendHandler, handlerContext);
-      }
-      return activateSpan(wsSpan);
+
+    public static class SendBinaryAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(
+                @Advice.This final RemoteEndpoint.Async self,
+                @Advice.Argument(0) ByteBuffer buffer,
+                @Advice.Argument(value = 1, optional = true, readOnly = false, typing = Assigner.Typing.DYNAMIC)
+                        SendHandler sendHandler,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
+            handlerContext = InstrumentationContext.get(RemoteEndpoint.class, HandlerContext.Sender.class)
+                    .get(self);
+            if (handlerContext == null || CallDepthThreadLocalMap.incrementCallDepth(RemoteEndpoint.class) > 0) {
+                return null;
+            }
+
+            final AgentSpan wsSpan = DECORATE.startOutboundFrameSpan(
+                    handlerContext,
+                    BYTE_BUFFER_SIZE_CALCULATOR.getFormat(),
+                    BYTE_BUFFER_SIZE_CALCULATOR.getLengthFunction().applyAsInt(buffer));
+            if (sendHandler != null) {
+                sendHandler = new TracingSendHandler(sendHandler, handlerContext);
+            }
+            return activateSpan(wsSpan);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Future<Void> future) {
+            CallDepthThreadLocalMap.decrementCallDepth(RemoteEndpoint.class);
+            if (scope == null) {
+                return;
+            }
+            try {
+                if (throwable != null) {
+                    DECORATE.onError(scope, throwable);
+                    DECORATE.onFrameEnd(handlerContext);
+                } else if (future != null) {
+                    // FIXME: Knowing when the future really completes would imply instrumenting all the
+                    // possible implementations.
+                    // In this case we will just finish the span to have a trace of this send even if the
+                    // duration is not exact
+                    DECORATE.onFrameEnd(handlerContext);
+                }
+            } finally {
+                scope.close();
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Future<Void> future) {
-      CallDepthThreadLocalMap.decrementCallDepth(RemoteEndpoint.class);
-      if (scope == null) {
-        return;
-      }
-      try {
-        if (throwable != null) {
-          DECORATE.onError(scope, throwable);
-          DECORATE.onFrameEnd(handlerContext);
-        } else if (future != null) {
-          // FIXME: Knowing when the future really completes would imply instrumenting all the
-          // possible implementations.
-          // In this case we will just finish the span to have a trace of this send even if the
-          // duration is not exact
-          DECORATE.onFrameEnd(handlerContext);
+    public static class SendObjectAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(
+                @Advice.This final RemoteEndpoint.Async self,
+                @Advice.Argument(value = 1, optional = true, readOnly = false, typing = Assigner.Typing.DYNAMIC)
+                        SendHandler sendHandler,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
+            handlerContext = InstrumentationContext.get(RemoteEndpoint.class, HandlerContext.Sender.class)
+                    .get(self);
+            if (handlerContext == null || CallDepthThreadLocalMap.incrementCallDepth(RemoteEndpoint.class) > 0) {
+                return null;
+            }
+
+            final AgentSpan wsSpan =
+                    DECORATE.startOutboundFrameSpan(handlerContext, BYTE_BUFFER_SIZE_CALCULATOR.getFormat(), 0);
+            if (sendHandler != null) {
+                sendHandler = new TracingSendHandler(sendHandler, handlerContext);
+            }
+            return activateSpan(wsSpan);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Future<Void> future) {
+            CallDepthThreadLocalMap.decrementCallDepth(RemoteEndpoint.class);
+            if (scope == null) {
+                return;
+            }
+            try {
+                if (throwable != null) {
+                    DECORATE.onError(scope, throwable);
+                    DECORATE.onFrameEnd(handlerContext);
+                } else if (future != null) {
+                    // FIXME: Knowing when the future really completes would imply instrumenting all the
+                    // possible implementations.
+                    // In this case we will just finish the span to have a trace of this send even if the
+                    // duration is not exact
+                    DECORATE.onFrameEnd(handlerContext);
+                }
+            } finally {
+                scope.close();
+            }
         }
-      } finally {
-        scope.close();
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/BasicRemoteEndpointInstrumentation.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/BasicRemoteEndpointInstrumentation.java
index f150e195d29..443c4c4c4a1 100644
--- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/BasicRemoteEndpointInstrumentation.java
+++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/BasicRemoteEndpointInstrumentation.java
@@ -26,196 +26,191 @@
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
-public class BasicRemoteEndpointInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  private final String namespace;
-
-  public BasicRemoteEndpointInstrumentation(String namespace) {
-    this.namespace = namespace;
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return namespace + ".websocket.RemoteEndpoint$Basic";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("sendText"))
-            .and(takesArguments(1).or(takesArguments(2).and(takesArgument(1, boolean.class))))
-            .and(takesArgument(0, named("java.lang.String")))
-            .and(returns(void.class)),
-        getClass().getName() + "$SendTextAdvice");
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("sendBinary"))
-            .and(takesArguments(1).or(takesArguments(2).and(takesArgument(1, boolean.class))))
-            .and(takesArgument(0, named("java.nio.ByteBuffer")))
-            .and(returns(void.class)),
-        getClass().getName() + "$SendBinaryAdvice");
-    transformer.applyAdvice(
-        isPublic().and(named("sendObject")).and(takesArguments(1)).and(returns(void.class)),
-        getClass().getName() + "$SendObjectAdvice");
-    transformer.applyAdvice(
-        isPublic().and(named("getSendStream")).and(takesNoArguments()),
-        getClass().getName() + "$WrapStreamAdvice");
-    transformer.applyAdvice(
-        isPublic().and(named("getSendWriter")).and(takesNoArguments()),
-        getClass().getName() + "$WrapWriterAdvice");
-  }
-
-  public static class SendTextAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(
-        @Advice.This final RemoteEndpoint.Basic self,
-        @Advice.Argument(0) String text,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
-      handlerContext =
-          InstrumentationContext.get(RemoteEndpoint.class, HandlerContext.Sender.class).get(self);
-      if (handlerContext == null
-          || CallDepthThreadLocalMap.incrementCallDepth(RemoteEndpoint.class) > 0) {
-        return null;
-      }
-
-      final AgentSpan wsSpan =
-          DECORATE.startOutboundFrameSpan(
-              handlerContext,
-              CHAR_SEQUENCE_SIZE_CALCULATOR.getFormat(),
-              CHAR_SEQUENCE_SIZE_CALCULATOR.getLengthFunction().applyAsInt(text));
-      return activateSpan(wsSpan);
+public class BasicRemoteEndpointInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    private final String namespace;
+
+    public BasicRemoteEndpointInstrumentation(String namespace) {
+        this.namespace = namespace;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Argument(value = 1, optional = true) final Boolean last) {
-      CallDepthThreadLocalMap.decrementCallDepth(RemoteEndpoint.class);
-
-      if (scope == null) {
-        return;
-      }
-      DECORATE.onError(scope, throwable);
-      boolean finishSpan = last == null || last || throwable != null;
-      if (finishSpan) {
-        DECORATE.onFrameEnd(handlerContext);
-      }
-      scope.close();
+    @Override
+    public String hierarchyMarkerType() {
+        return namespace + ".websocket.RemoteEndpoint$Basic";
     }
-  }
-
-  public static class SendBinaryAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(
-        @Advice.This final RemoteEndpoint.Basic self,
-        @Advice.Argument(0) ByteBuffer buffer,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
-      handlerContext =
-          InstrumentationContext.get(RemoteEndpoint.class, HandlerContext.Sender.class).get(self);
-      if (handlerContext == null
-          || CallDepthThreadLocalMap.incrementCallDepth(RemoteEndpoint.class) > 0) {
-        return null;
-      }
-
-      final AgentSpan wsSpan =
-          DECORATE.startOutboundFrameSpan(
-              handlerContext,
-              BYTE_BUFFER_SIZE_CALCULATOR.getFormat(),
-              BYTE_BUFFER_SIZE_CALCULATOR.getLengthFunction().applyAsInt(buffer));
-      return activateSpan(wsSpan);
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Argument(value = 1, optional = true) final Boolean last) {
-      CallDepthThreadLocalMap.decrementCallDepth(RemoteEndpoint.class);
-      if (scope == null) {
-        return;
-      }
-      DECORATE.onError(scope, throwable);
-      boolean finishSpan = last == null || last || throwable != null;
-      if (finishSpan) {
-        DECORATE.onFrameEnd(handlerContext);
-      }
-      scope.close();
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("sendText"))
+                        .and(takesArguments(1).or(takesArguments(2).and(takesArgument(1, boolean.class))))
+                        .and(takesArgument(0, named("java.lang.String")))
+                        .and(returns(void.class)),
+                getClass().getName() + "$SendTextAdvice");
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("sendBinary"))
+                        .and(takesArguments(1).or(takesArguments(2).and(takesArgument(1, boolean.class))))
+                        .and(takesArgument(0, named("java.nio.ByteBuffer")))
+                        .and(returns(void.class)),
+                getClass().getName() + "$SendBinaryAdvice");
+        transformer.applyAdvice(
+                isPublic().and(named("sendObject")).and(takesArguments(1)).and(returns(void.class)),
+                getClass().getName() + "$SendObjectAdvice");
+        transformer.applyAdvice(
+                isPublic().and(named("getSendStream")).and(takesNoArguments()),
+                getClass().getName() + "$WrapStreamAdvice");
+        transformer.applyAdvice(
+                isPublic().and(named("getSendWriter")).and(takesNoArguments()),
+                getClass().getName() + "$WrapWriterAdvice");
     }
-  }
-
-  public static class SendObjectAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(
-        @Advice.This final RemoteEndpoint.Basic self,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
-      handlerContext =
-          InstrumentationContext.get(RemoteEndpoint.class, HandlerContext.Sender.class).get(self);
-      if (handlerContext == null
-          || CallDepthThreadLocalMap.incrementCallDepth(RemoteEndpoint.class) > 0) {
-        return null;
-      }
-
-      // we actually cannot know the size and the type since this the conversion is done by
-      // encoders/decoders.
-      // we can anyway instrument also the Encoders but that would add much more complexity.
-      // right now this is not in scope
-      final AgentSpan wsSpan = DECORATE.startOutboundFrameSpan(handlerContext, null, 0);
-      return activateSpan(wsSpan);
+
+    public static class SendTextAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(
+                @Advice.This final RemoteEndpoint.Basic self,
+                @Advice.Argument(0) String text,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
+            handlerContext = InstrumentationContext.get(RemoteEndpoint.class, HandlerContext.Sender.class)
+                    .get(self);
+            if (handlerContext == null || CallDepthThreadLocalMap.incrementCallDepth(RemoteEndpoint.class) > 0) {
+                return null;
+            }
+
+            final AgentSpan wsSpan = DECORATE.startOutboundFrameSpan(
+                    handlerContext,
+                    CHAR_SEQUENCE_SIZE_CALCULATOR.getFormat(),
+                    CHAR_SEQUENCE_SIZE_CALCULATOR.getLengthFunction().applyAsInt(text));
+            return activateSpan(wsSpan);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Argument(value = 1, optional = true) final Boolean last) {
+            CallDepthThreadLocalMap.decrementCallDepth(RemoteEndpoint.class);
+
+            if (scope == null) {
+                return;
+            }
+            DECORATE.onError(scope, throwable);
+            boolean finishSpan = last == null || last || throwable != null;
+            if (finishSpan) {
+                DECORATE.onFrameEnd(handlerContext);
+            }
+            scope.close();
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext,
-        @Advice.Thrown final Throwable throwable) {
-      CallDepthThreadLocalMap.decrementCallDepth(RemoteEndpoint.class);
-      if (scope == null) {
-        return;
-      }
-      DECORATE.onError(scope, throwable);
-      DECORATE.onFrameEnd(handlerContext);
-      scope.close();
+    public static class SendBinaryAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(
+                @Advice.This final RemoteEndpoint.Basic self,
+                @Advice.Argument(0) ByteBuffer buffer,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
+            handlerContext = InstrumentationContext.get(RemoteEndpoint.class, HandlerContext.Sender.class)
+                    .get(self);
+            if (handlerContext == null || CallDepthThreadLocalMap.incrementCallDepth(RemoteEndpoint.class) > 0) {
+                return null;
+            }
+
+            final AgentSpan wsSpan = DECORATE.startOutboundFrameSpan(
+                    handlerContext,
+                    BYTE_BUFFER_SIZE_CALCULATOR.getFormat(),
+                    BYTE_BUFFER_SIZE_CALCULATOR.getLengthFunction().applyAsInt(buffer));
+            return activateSpan(wsSpan);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Argument(value = 1, optional = true) final Boolean last) {
+            CallDepthThreadLocalMap.decrementCallDepth(RemoteEndpoint.class);
+            if (scope == null) {
+                return;
+            }
+            DECORATE.onError(scope, throwable);
+            boolean finishSpan = last == null || last || throwable != null;
+            if (finishSpan) {
+                DECORATE.onFrameEnd(handlerContext);
+            }
+            scope.close();
+        }
     }
-  }
-
-  public static class WrapWriterAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void after(
-        @Advice.This final RemoteEndpoint.Basic self,
-        @Advice.Return(readOnly = false) Writer writer) {
-      if (writer instanceof TracingWriter) {
-        return;
-      }
-      final HandlerContext.Sender handlerContext =
-          InstrumentationContext.get(RemoteEndpoint.class, HandlerContext.Sender.class).get(self);
-      if (handlerContext != null) {
-        writer = new TracingWriter(writer, handlerContext);
-      }
+
+    public static class SendObjectAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(
+                @Advice.This final RemoteEndpoint.Basic self,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
+            handlerContext = InstrumentationContext.get(RemoteEndpoint.class, HandlerContext.Sender.class)
+                    .get(self);
+            if (handlerContext == null || CallDepthThreadLocalMap.incrementCallDepth(RemoteEndpoint.class) > 0) {
+                return null;
+            }
+
+            // we actually cannot know the size and the type since this the conversion is done by
+            // encoders/decoders.
+            // we can anyway instrument also the Encoders but that would add much more complexity.
+            // right now this is not in scope
+            final AgentSpan wsSpan = DECORATE.startOutboundFrameSpan(handlerContext, null, 0);
+            return activateSpan(wsSpan);
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext,
+                @Advice.Thrown final Throwable throwable) {
+            CallDepthThreadLocalMap.decrementCallDepth(RemoteEndpoint.class);
+            if (scope == null) {
+                return;
+            }
+            DECORATE.onError(scope, throwable);
+            DECORATE.onFrameEnd(handlerContext);
+            scope.close();
+        }
     }
-  }
-
-  public static class WrapStreamAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void after(
-        @Advice.This final RemoteEndpoint.Basic self,
-        @Advice.Return(readOnly = false) OutputStream outputStream) {
-      if (outputStream instanceof TracingOutputStream) {
-        return;
-      }
-      final HandlerContext.Sender handlerContext =
-          InstrumentationContext.get(RemoteEndpoint.class, HandlerContext.Sender.class).get(self);
-      if (handlerContext != null) {
-        outputStream = new TracingOutputStream(outputStream, handlerContext);
-      }
+
+    public static class WrapWriterAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void after(
+                @Advice.This final RemoteEndpoint.Basic self, @Advice.Return(readOnly = false) Writer writer) {
+            if (writer instanceof TracingWriter) {
+                return;
+            }
+            final HandlerContext.Sender handlerContext = InstrumentationContext.get(
+                            RemoteEndpoint.class, HandlerContext.Sender.class)
+                    .get(self);
+            if (handlerContext != null) {
+                writer = new TracingWriter(writer, handlerContext);
+            }
+        }
+    }
+
+    public static class WrapStreamAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void after(
+                @Advice.This final RemoteEndpoint.Basic self,
+                @Advice.Return(readOnly = false) OutputStream outputStream) {
+            if (outputStream instanceof TracingOutputStream) {
+                return;
+            }
+            final HandlerContext.Sender handlerContext = InstrumentationContext.get(
+                            RemoteEndpoint.class, HandlerContext.Sender.class)
+                    .get(self);
+            if (handlerContext != null) {
+                outputStream = new TracingOutputStream(outputStream, handlerContext);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/EndpointInstrumentation.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/EndpointInstrumentation.java
index d41ac1d07f6..d26470b70c9 100644
--- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/EndpointInstrumentation.java
+++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/EndpointInstrumentation.java
@@ -22,89 +22,86 @@
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
-public class EndpointInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  private final String namespace;
+public class EndpointInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    private final String namespace;
 
-  public EndpointInstrumentation(String namespace) {
-    this.namespace = namespace;
-  }
+    public EndpointInstrumentation(String namespace) {
+        this.namespace = namespace;
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return namespace + ".websocket.Endpoint";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return namespace + ".websocket.Endpoint";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return extendsClass(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return extendsClass(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(
-                named("onOpen")
-                    .and(takesArguments(2))
-                    .and(takesArgument(0, named(namespace + ".websocket.Session")))),
-        getClass().getName() + "$CaptureHandshakeSpanAdvice");
-    transformer.applyAdvice(
-        isPublic()
-            .and(
-                named("onClose")
-                    .and(takesArguments(2))
-                    .and(takesArgument(0, named(namespace + ".websocket.Session")))
-                    .and(takesArgument(1, named(namespace + ".websocket.CloseReason")))),
-        getClass().getName() + "$SessionCloseAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("onOpen")
+                                .and(takesArguments(2))
+                                .and(takesArgument(0, named(namespace + ".websocket.Session")))),
+                getClass().getName() + "$CaptureHandshakeSpanAdvice");
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("onClose")
+                                .and(takesArguments(2))
+                                .and(takesArgument(0, named(namespace + ".websocket.Session")))
+                                .and(takesArgument(1, named(namespace + ".websocket.CloseReason")))),
+                getClass().getName() + "$SessionCloseAdvice");
+    }
 
-  public static class CaptureHandshakeSpanAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(@Advice.Argument(0) final Session session) {
-      final AgentSpan current = AgentTracer.get().activeSpan();
-      if (current != null) {
-        // we need to force the sampling decision in case the span is linked
-        if (Config.get().isWebsocketMessagesInheritSampling()) {
-          current.forceSamplingDecision();
+    public static class CaptureHandshakeSpanAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(@Advice.Argument(0) final Session session) {
+            final AgentSpan current = AgentTracer.get().activeSpan();
+            if (current != null) {
+                // we need to force the sampling decision in case the span is linked
+                if (Config.get().isWebsocketMessagesInheritSampling()) {
+                    current.forceSamplingDecision();
+                }
+                InstrumentationContext.get(Session.class, HandlerContext.Sender.class)
+                        .getOrPut(session, new HandlerContext.Sender(current.getLocalRootSpan(), session.getId()));
+            }
         }
-        InstrumentationContext.get(Session.class, HandlerContext.Sender.class)
-            .getOrPut(
-                session, new HandlerContext.Sender(current.getLocalRootSpan(), session.getId()));
-      }
     }
-  }
 
-  public static class SessionCloseAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.Local("handlerContext") HandlerContext.Receiver handlerContext,
-        @Advice.Argument(0) final Session session,
-        @Advice.Argument(1) final CloseReason closeReason) {
-      final HandlerContext.Sender sessionState =
-          InstrumentationContext.get(Session.class, HandlerContext.Sender.class).remove(session);
-      if (sessionState == null) {
-        return null;
-      }
-      handlerContext =
-          new HandlerContext.Receiver(sessionState.getHandshakeSpan(), session.getId());
+    public static class SessionCloseAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.Local("handlerContext") HandlerContext.Receiver handlerContext,
+                @Advice.Argument(0) final Session session,
+                @Advice.Argument(1) final CloseReason closeReason) {
+            final HandlerContext.Sender sessionState = InstrumentationContext.get(
+                            Session.class, HandlerContext.Sender.class)
+                    .remove(session);
+            if (sessionState == null) {
+                return null;
+            }
+            handlerContext = new HandlerContext.Receiver(sessionState.getHandshakeSpan(), session.getId());
 
-      return activateSpan(
-          DECORATE.startInboundCloseSpan(
-              handlerContext, closeReason.getReasonPhrase(), closeReason.getCloseCode().getCode()));
-    }
+            return activateSpan(DECORATE.startInboundCloseSpan(
+                    handlerContext,
+                    closeReason.getReasonPhrase(),
+                    closeReason.getCloseCode().getCode()));
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Local("handlerContext") HandlerContext.Receiver handlerContext,
-        @Advice.Thrown final Throwable thrown) {
-      if (scope != null) {
-        final AgentSpan span = spanFromScope(scope);
-        DECORATE.onError(span, thrown);
-        DECORATE.onFrameEnd(handlerContext);
-        scope.close();
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Local("handlerContext") HandlerContext.Receiver handlerContext,
+                @Advice.Thrown final Throwable thrown) {
+            if (scope != null) {
+                final AgentSpan span = spanFromScope(scope);
+                DECORATE.onError(span, thrown);
+                DECORATE.onFrameEnd(handlerContext);
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/JavaxWebsocketModule.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/JavaxWebsocketModule.java
index 0bfd038e125..31d6f58dfcd 100644
--- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/JavaxWebsocketModule.java
+++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/JavaxWebsocketModule.java
@@ -12,44 +12,43 @@
 
 @AutoService(InstrumenterModule.class)
 public class JavaxWebsocketModule extends InstrumenterModule.Tracing {
-  private final String namespace;
-
-  public JavaxWebsocketModule() {
-    this("javax", "javax-websocket", "websocket");
-  }
-
-  protected JavaxWebsocketModule(
-      String namespace, String instrumentationName, String... additionalNames) {
-    super(instrumentationName, additionalNames);
-    this.namespace = namespace;
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    final Map<String, String> map = new HashMap<>();
-    map.put(namespace + ".websocket.Session", HandlerContext.Sender.class.getName());
-    map.put(namespace + ".websocket.RemoteEndpoint", HandlerContext.Sender.class.getName());
-    map.put(namespace + ".websocket.MessageHandler", HandlerContext.Receiver.class.getName());
-    return map;
-  }
-
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isWebsocketTracingEnabled();
-  }
-
-  @Override
-  public String muzzleDirective() {
-    return "javax-websocket";
-  }
-
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new EndpointInstrumentation(namespace),
-        new SessionInstrumentation(namespace),
-        new MessageHandlerInstrumentation(namespace),
-        new BasicRemoteEndpointInstrumentation(namespace),
-        new AsyncRemoteEndpointInstrumentation(namespace));
-  }
+    private final String namespace;
+
+    public JavaxWebsocketModule() {
+        this("javax", "javax-websocket", "websocket");
+    }
+
+    protected JavaxWebsocketModule(String namespace, String instrumentationName, String... additionalNames) {
+        super(instrumentationName, additionalNames);
+        this.namespace = namespace;
+    }
+
+    @Override
+    public Map<String, String> contextStore() {
+        final Map<String, String> map = new HashMap<>();
+        map.put(namespace + ".websocket.Session", HandlerContext.Sender.class.getName());
+        map.put(namespace + ".websocket.RemoteEndpoint", HandlerContext.Sender.class.getName());
+        map.put(namespace + ".websocket.MessageHandler", HandlerContext.Receiver.class.getName());
+        return map;
+    }
+
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isWebsocketTracingEnabled();
+    }
+
+    @Override
+    public String muzzleDirective() {
+        return "javax-websocket";
+    }
+
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(
+                new EndpointInstrumentation(namespace),
+                new SessionInstrumentation(namespace),
+                new MessageHandlerInstrumentation(namespace),
+                new BasicRemoteEndpointInstrumentation(namespace),
+                new AsyncRemoteEndpointInstrumentation(namespace));
+    }
 }
diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/MessageHandlerInstrumentation.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/MessageHandlerInstrumentation.java
index ddb35680e95..2001e1c42df 100644
--- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/MessageHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/MessageHandlerInstrumentation.java
@@ -20,73 +20,69 @@
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
 import net.bytebuddy.matcher.ElementMatcher;
 
-public class MessageHandlerInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  private final String namespace;
+public class MessageHandlerInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    private final String namespace;
 
-  public MessageHandlerInstrumentation(String namespace) {
-    this.namespace = namespace;
-  }
+    public MessageHandlerInstrumentation(String namespace) {
+        this.namespace = namespace;
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return namespace + ".websocket.MessageHandler";
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return namespace + ".websocket.MessageHandler";
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("onMessage"))
-            .and(
-                takesArguments(1) // whole
-                    .or(takesArguments(2).and(takesArgument(1, boolean.class)))), // partial
-        getClass().getName() + "$OnMessageAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("onMessage"))
+                        .and(takesArguments(1) // whole
+                                .or(takesArguments(2).and(takesArgument(1, boolean.class)))), // partial
+                getClass().getName() + "$OnMessageAdvice");
+    }
 
-  public static class OnMessageAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope onEnter(
-        @Advice.This final MessageHandler handler,
-        @Advice.Argument(value = 0, typing = Assigner.Typing.DYNAMIC) final Object data,
-        @Advice.Argument(value = 1, optional = true) final Boolean last,
-        @Advice.Local("handlerContext") HandlerContext.Receiver handlerContext) {
-      handlerContext =
-          InstrumentationContext.get(MessageHandler.class, HandlerContext.Receiver.class)
-              .get(handler);
-      if (handlerContext == null) {
-        return null;
-      }
-      if (CallDepthThreadLocalMap.incrementCallDepth(MessageHandler.class) > 0) {
-        return null;
-      }
+    public static class OnMessageAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope onEnter(
+                @Advice.This final MessageHandler handler,
+                @Advice.Argument(value = 0, typing = Assigner.Typing.DYNAMIC) final Object data,
+                @Advice.Argument(value = 1, optional = true) final Boolean last,
+                @Advice.Local("handlerContext") HandlerContext.Receiver handlerContext) {
+            handlerContext = InstrumentationContext.get(MessageHandler.class, HandlerContext.Receiver.class)
+                    .get(handler);
+            if (handlerContext == null) {
+                return null;
+            }
+            if (CallDepthThreadLocalMap.incrementCallDepth(MessageHandler.class) > 0) {
+                return null;
+            }
 
-      final AgentSpan wsSpan =
-          DECORATE.startInboundFrameSpan(handlerContext, data, last != null && last);
-      return activateSpan(wsSpan);
-    }
+            final AgentSpan wsSpan = DECORATE.startInboundFrameSpan(handlerContext, data, last != null && last);
+            return activateSpan(wsSpan);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Local("handlerContext") HandlerContext.Receiver handlerContext,
-        @Advice.Thrown final Throwable throwable,
-        @Advice.Argument(value = 1, optional = true) final Boolean last) {
-      if (scope == null) {
-        return;
-      }
-      CallDepthThreadLocalMap.reset(MessageHandler.class);
-      DECORATE.onError(scope, throwable);
-      boolean finishSpan = last == null || last || throwable != null;
-      if (finishSpan) {
-        DECORATE.onFrameEnd(handlerContext);
-      }
-      scope.close();
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Local("handlerContext") HandlerContext.Receiver handlerContext,
+                @Advice.Thrown final Throwable throwable,
+                @Advice.Argument(value = 1, optional = true) final Boolean last) {
+            if (scope == null) {
+                return;
+            }
+            CallDepthThreadLocalMap.reset(MessageHandler.class);
+            DECORATE.onError(scope, throwable);
+            boolean finishSpan = last == null || last || throwable != null;
+            if (finishSpan) {
+                DECORATE.onFrameEnd(handlerContext);
+            }
+            scope.close();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/SessionInstrumentation.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/SessionInstrumentation.java
index b7cd90d7ea1..7f477696201 100644
--- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/SessionInstrumentation.java
+++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/SessionInstrumentation.java
@@ -22,182 +22,179 @@
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
-public class SessionInstrumentation
-    implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  private final String namespace;
-
-  public SessionInstrumentation(String namespace) {
-    this.namespace = namespace;
-  }
-
-  @Override
-  public String hierarchyMarkerType() {
-    return namespace + ".websocket.Session";
-  }
-
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(hierarchyMarkerType()));
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isPublic()
-            .and(
-                named("addMessageHandler")
-                    .and(takesArgument(0, named(namespace + ".websocket.MessageHandler")))),
-        getClass().getName() + "$LinkReceiverSessionArg0Advice");
-
-    transformer.applyAdvice(
-        isPublic()
-            .and(
-                named("addMessageHandler")
-                    .and(
-                        takesArgument(
-                            1,
-                            namedOneOf(
-                                namespace + ".websocket.MessageHandler$Whole",
-                                namespace + ".websocket.MessageHandler$Partial")))),
-        getClass().getName() + "$LinkReceiverSessionArg1Advice");
-
-    transformer.applyAdvice(
-        isPublic().and(namedOneOf("getBasicRemote", "getAsyncRemote")).and(takesNoArguments()),
-        getClass().getName() + "$LinkSenderSessionAdvice");
-
-    transformer.applyAdvice(
-        isPublic()
-            .and(named("close"))
-            .and(
-                takesArguments(1)
-                    .and(takesArgument(0, named(namespace + ".websocket.CloseReason")))),
-        getClass().getName() + "$SessionCloseAdvice");
-
-    transformer.applyAdvice(
-        named("close").and(takesNoArguments()),
-        getClass().getName() + "$DefaultSessionCloseAdvice");
-  }
-
-  public static class LinkReceiverSessionArg0Advice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This final Session session, @Advice.Argument(0) final MessageHandler handler) {
-      if (handler != null) {
-        final HandlerContext.Sender sessionState =
-            InstrumentationContext.get(Session.class, HandlerContext.Sender.class).get(session);
-        if (sessionState != null) {
-          // If the user is adding singletons that is not going to work. However, in this case there
-          // is no chance to have the session linked in any way (even if wrapping the
-          // messagehandler).
-          // Now hopefully this is not the usual habit and implementations of that API are not doing
-          // that as well when creating proxies for the annotated pojos.
-          // Also, adding a field here is preferred than wrapping the message handler since the
-          // implementations are introspecting it to understand the type of message handled and,
-          // with
-          // erasures, it won't work.
-          InstrumentationContext.get(MessageHandler.class, HandlerContext.Receiver.class)
-              .put(
-                  handler,
-                  new HandlerContext.Receiver(sessionState.getHandshakeSpan(), session.getId()));
-        }
-      }
+public class SessionInstrumentation implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    private final String namespace;
+
+    public SessionInstrumentation(String namespace) {
+        this.namespace = namespace;
     }
-  }
-
-  public static class LinkReceiverSessionArg1Advice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This final Session session, @Advice.Argument(1) final MessageHandler handler) {
-      if (handler != null) {
-        final HandlerContext.Sender sessionState =
-            InstrumentationContext.get(Session.class, HandlerContext.Sender.class).get(session);
-        if (sessionState != null) {
-          // If the user is adding singletons that is not going to work. However, in this case there
-          // is no chance to have the session linked in any way (even if wrapping the
-          // messagehandler).
-          // Now hopefully this is not the usual habit and implementations of that API are not doing
-          // that as well when creating proxies for the annotated pojos.
-          // Also, adding a field here is preferred than wrapping the message handler since the
-          // implementations are introspecting it to understand the type of message handled and,
-          // with
-          // erasures, it won't work.
-          InstrumentationContext.get(MessageHandler.class, HandlerContext.Receiver.class)
-              .put(
-                  handler,
-                  new HandlerContext.Receiver(sessionState.getHandshakeSpan(), session.getId()));
-        }
-      }
+
+    @Override
+    public String hierarchyMarkerType() {
+        return namespace + ".websocket.Session";
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(hierarchyMarkerType()));
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("addMessageHandler")
+                                .and(takesArgument(0, named(namespace + ".websocket.MessageHandler")))),
+                getClass().getName() + "$LinkReceiverSessionArg0Advice");
+
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("addMessageHandler")
+                                .and(takesArgument(
+                                        1,
+                                        namedOneOf(
+                                                namespace + ".websocket.MessageHandler$Whole",
+                                                namespace + ".websocket.MessageHandler$Partial")))),
+                getClass().getName() + "$LinkReceiverSessionArg1Advice");
+
+        transformer.applyAdvice(
+                isPublic().and(namedOneOf("getBasicRemote", "getAsyncRemote")).and(takesNoArguments()),
+                getClass().getName() + "$LinkSenderSessionAdvice");
+
+        transformer.applyAdvice(
+                isPublic()
+                        .and(named("close"))
+                        .and(takesArguments(1).and(takesArgument(0, named(namespace + ".websocket.CloseReason")))),
+                getClass().getName() + "$SessionCloseAdvice");
+
+        transformer.applyAdvice(
+                named("close").and(takesNoArguments()), getClass().getName() + "$DefaultSessionCloseAdvice");
     }
-  }
-
-  public static class LinkSenderSessionAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This final Session session, @Advice.Return final RemoteEndpoint remoteEndpoint) {
-      if (remoteEndpoint != null) {
-        final HandlerContext.Sender sessionState =
-            InstrumentationContext.get(Session.class, HandlerContext.Sender.class).get(session);
-        if (sessionState != null) {
-          InstrumentationContext.get(RemoteEndpoint.class, HandlerContext.Sender.class)
-              .put(remoteEndpoint, sessionState);
+
+    public static class LinkReceiverSessionArg0Advice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This final Session session, @Advice.Argument(0) final MessageHandler handler) {
+            if (handler != null) {
+                final HandlerContext.Sender sessionState = InstrumentationContext.get(
+                                Session.class, HandlerContext.Sender.class)
+                        .get(session);
+                if (sessionState != null) {
+                    // If the user is adding singletons that is not going to work. However, in this case there
+                    // is no chance to have the session linked in any way (even if wrapping the
+                    // messagehandler).
+                    // Now hopefully this is not the usual habit and implementations of that API are not doing
+                    // that as well when creating proxies for the annotated pojos.
+                    // Also, adding a field here is preferred than wrapping the message handler since the
+                    // implementations are introspecting it to understand the type of message handled and,
+                    // with
+                    // erasures, it won't work.
+                    InstrumentationContext.get(MessageHandler.class, HandlerContext.Receiver.class)
+                            .put(
+                                    handler,
+                                    new HandlerContext.Receiver(sessionState.getHandshakeSpan(), session.getId()));
+                }
+            }
         }
-      }
     }
-  }
-
-  public static class SessionCloseAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(
-        @Advice.This final Session session,
-        @Advice.Argument(0) final CloseReason reason,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
-      handlerContext =
-          InstrumentationContext.get(Session.class, HandlerContext.Sender.class).remove(session);
-      if (handlerContext == null) {
-        return null;
-      }
-      return activateSpan(
-          DECORATE.startOutboundCloseSpan(
-              handlerContext, reason.getReasonPhrase(), reason.getCloseCode().getCode()));
+
+    public static class LinkReceiverSessionArg1Advice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This final Session session, @Advice.Argument(1) final MessageHandler handler) {
+            if (handler != null) {
+                final HandlerContext.Sender sessionState = InstrumentationContext.get(
+                                Session.class, HandlerContext.Sender.class)
+                        .get(session);
+                if (sessionState != null) {
+                    // If the user is adding singletons that is not going to work. However, in this case there
+                    // is no chance to have the session linked in any way (even if wrapping the
+                    // messagehandler).
+                    // Now hopefully this is not the usual habit and implementations of that API are not doing
+                    // that as well when creating proxies for the annotated pojos.
+                    // Also, adding a field here is preferred than wrapping the message handler since the
+                    // implementations are introspecting it to understand the type of message handled and,
+                    // with
+                    // erasures, it won't work.
+                    InstrumentationContext.get(MessageHandler.class, HandlerContext.Receiver.class)
+                            .put(
+                                    handler,
+                                    new HandlerContext.Receiver(sessionState.getHandshakeSpan(), session.getId()));
+                }
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable thrown,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
-      if (scope != null) {
-        DECORATE.onError(scope, thrown);
-        DECORATE.onFrameEnd(handlerContext);
-        scope.close();
-      }
+    public static class LinkSenderSessionAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This final Session session, @Advice.Return final RemoteEndpoint remoteEndpoint) {
+            if (remoteEndpoint != null) {
+                final HandlerContext.Sender sessionState = InstrumentationContext.get(
+                                Session.class, HandlerContext.Sender.class)
+                        .get(session);
+                if (sessionState != null) {
+                    InstrumentationContext.get(RemoteEndpoint.class, HandlerContext.Sender.class)
+                            .put(remoteEndpoint, sessionState);
+                }
+            }
+        }
     }
-  }
-
-  public static class DefaultSessionCloseAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope before(
-        @Advice.This final Session session,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
-
-      handlerContext =
-          InstrumentationContext.get(Session.class, HandlerContext.Sender.class).remove(session);
-      if (handlerContext == null) {
-        return null;
-      }
-      return activateSpan(DECORATE.startOutboundCloseSpan(handlerContext, null, 1000));
+
+    public static class SessionCloseAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(
+                @Advice.This final Session session,
+                @Advice.Argument(0) final CloseReason reason,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
+            handlerContext = InstrumentationContext.get(Session.class, HandlerContext.Sender.class)
+                    .remove(session);
+            if (handlerContext == null) {
+                return null;
+            }
+            return activateSpan(DECORATE.startOutboundCloseSpan(
+                    handlerContext,
+                    reason.getReasonPhrase(),
+                    reason.getCloseCode().getCode()));
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable thrown,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
+            if (scope != null) {
+                DECORATE.onError(scope, thrown);
+                DECORATE.onFrameEnd(handlerContext);
+                scope.close();
+            }
+        }
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void after(
-        @Advice.Enter final ContextScope scope,
-        @Advice.Thrown final Throwable thrown,
-        @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
-      if (scope != null) {
-        DECORATE.onError(scope, thrown);
-        DECORATE.onFrameEnd(handlerContext);
-        scope.close();
-      }
+    public static class DefaultSessionCloseAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope before(
+                @Advice.This final Session session,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
+
+            handlerContext = InstrumentationContext.get(Session.class, HandlerContext.Sender.class)
+                    .remove(session);
+            if (handlerContext == null) {
+                return null;
+            }
+            return activateSpan(DECORATE.startOutboundCloseSpan(handlerContext, null, 1000));
+        }
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void after(
+                @Advice.Enter final ContextScope scope,
+                @Advice.Thrown final Throwable thrown,
+                @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) {
+            if (scope != null) {
+                DECORATE.onError(scope, thrown);
+                DECORATE.onFrameEnd(handlerContext);
+                scope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingOutputStream.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingOutputStream.java
index 7ae4d5416c0..1cd538c5d02 100644
--- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingOutputStream.java
+++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingOutputStream.java
@@ -11,58 +11,56 @@
 import java.io.OutputStream;
 
 public class TracingOutputStream extends OutputStream {
-  private final OutputStream delegate;
-  private final HandlerContext.Sender handlerContext;
+    private final OutputStream delegate;
+    private final HandlerContext.Sender handlerContext;
 
-  public TracingOutputStream(OutputStream delegate, HandlerContext.Sender handlerContext) {
-    super();
-    this.delegate = delegate;
-    this.handlerContext = handlerContext;
-  }
-
-  @Override
-  public void write(int b) throws IOException {
-    final boolean doTrace = CallDepthThreadLocalMap.incrementCallDepth(HandlerContext.class) == 0;
-    if (doTrace) {
-      DECORATE.startOutboundFrameSpan(handlerContext, MESSAGE_TYPE_BINARY, 1);
-    }
-    try (final ContextScope ignored = activateSpan(handlerContext.getWebsocketSpan())) {
-      delegate.write(b);
-    } finally {
-      if (doTrace) {
-        CallDepthThreadLocalMap.reset(HandlerContext.class);
-      }
+    public TracingOutputStream(OutputStream delegate, HandlerContext.Sender handlerContext) {
+        super();
+        this.delegate = delegate;
+        this.handlerContext = handlerContext;
     }
-  }
 
-  @Override
-  public void write(byte[] b, int off, int len) throws IOException {
-    final boolean doTrace = CallDepthThreadLocalMap.incrementCallDepth(HandlerContext.class) == 0;
-    if (doTrace) {
-      DECORATE.startOutboundFrameSpan(handlerContext, MESSAGE_TYPE_BINARY, len);
+    @Override
+    public void write(int b) throws IOException {
+        final boolean doTrace = CallDepthThreadLocalMap.incrementCallDepth(HandlerContext.class) == 0;
+        if (doTrace) {
+            DECORATE.startOutboundFrameSpan(handlerContext, MESSAGE_TYPE_BINARY, 1);
+        }
+        try (final ContextScope ignored = activateSpan(handlerContext.getWebsocketSpan())) {
+            delegate.write(b);
+        } finally {
+            if (doTrace) {
+                CallDepthThreadLocalMap.reset(HandlerContext.class);
+            }
+        }
     }
-    try (final ContextScope ignored = activateSpan(handlerContext.getWebsocketSpan())) {
-      delegate.write(b, off, len);
-    } finally {
-      if (doTrace) {
-        CallDepthThreadLocalMap.reset(HandlerContext.class);
-      }
+
+    @Override
+    public void write(byte[] b, int off, int len) throws IOException {
+        final boolean doTrace = CallDepthThreadLocalMap.incrementCallDepth(HandlerContext.class) == 0;
+        if (doTrace) {
+            DECORATE.startOutboundFrameSpan(handlerContext, MESSAGE_TYPE_BINARY, len);
+        }
+        try (final ContextScope ignored = activateSpan(handlerContext.getWebsocketSpan())) {
+            delegate.write(b, off, len);
+        } finally {
+            if (doTrace) {
+                CallDepthThreadLocalMap.reset(HandlerContext.class);
+            }
+        }
     }
-  }
 
-  @Override
-  public void close() throws IOException {
-    final boolean doTrace = CallDepthThreadLocalMap.incrementCallDepth(HandlerContext.class) == 0;
-    try (final ContextScope ignored =
-        handlerContext.getWebsocketSpan() != null
-            ? activateSpan(handlerContext.getWebsocketSpan())
-            : null) {
-      delegate.close();
-    } finally {
-      if (doTrace) {
-        CallDepthThreadLocalMap.reset(HandlerContext.class);
-        DECORATE.onFrameEnd(handlerContext);
-      }
+    @Override
+    public void close() throws IOException {
+        final boolean doTrace = CallDepthThreadLocalMap.incrementCallDepth(HandlerContext.class) == 0;
+        try (final ContextScope ignored =
+                handlerContext.getWebsocketSpan() != null ? activateSpan(handlerContext.getWebsocketSpan()) : null) {
+            delegate.close();
+        } finally {
+            if (doTrace) {
+                CallDepthThreadLocalMap.reset(HandlerContext.class);
+                DECORATE.onFrameEnd(handlerContext);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingSendHandler.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingSendHandler.java
index c5a582859a3..787ad33f9a0 100644
--- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingSendHandler.java
+++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingSendHandler.java
@@ -10,24 +10,24 @@
 import javax.websocket.SendResult;
 
 public class TracingSendHandler implements SendHandler {
-  private final SendHandler delegate;
-  private final HandlerContext handlerContext;
+    private final SendHandler delegate;
+    private final HandlerContext handlerContext;
 
-  public TracingSendHandler(SendHandler delegate, HandlerContext handlerContext) {
-    this.delegate = delegate;
-    this.handlerContext = handlerContext;
-  }
+    public TracingSendHandler(SendHandler delegate, HandlerContext handlerContext) {
+        this.delegate = delegate;
+        this.handlerContext = handlerContext;
+    }
 
-  @Override
-  public void onResult(SendResult sendResult) {
-    final AgentSpan wsSpan = handlerContext.getWebsocketSpan();
-    try (final ContextScope ignored = activateSpan(wsSpan)) {
-      delegate.onResult(sendResult);
-    } finally {
-      if (sendResult.getException() != null) {
-        DECORATE.onError(wsSpan, sendResult.getException());
-      }
-      DECORATE.onFrameEnd(handlerContext);
+    @Override
+    public void onResult(SendResult sendResult) {
+        final AgentSpan wsSpan = handlerContext.getWebsocketSpan();
+        try (final ContextScope ignored = activateSpan(wsSpan)) {
+            delegate.onResult(sendResult);
+        } finally {
+            if (sendResult.getException() != null) {
+                DECORATE.onError(wsSpan, sendResult.getException());
+            }
+            DECORATE.onFrameEnd(handlerContext);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingWriter.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingWriter.java
index 32f0fd236d0..6630c460b71 100644
--- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingWriter.java
+++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingWriter.java
@@ -11,48 +11,46 @@
 import java.io.Writer;
 
 public class TracingWriter extends Writer {
-  private final Writer delegate;
-  private final HandlerContext.Sender handlerContext;
+    private final Writer delegate;
+    private final HandlerContext.Sender handlerContext;
 
-  public TracingWriter(Writer delegate, HandlerContext.Sender handlerContext) {
-    super();
-    this.delegate = delegate;
-    this.handlerContext = handlerContext;
-  }
-
-  @Override
-  public void write(char[] cbuf, int off, int len) throws IOException {
-    final boolean doTrace = CallDepthThreadLocalMap.incrementCallDepth(HandlerContext.class) == 0;
-    if (doTrace) {
-      DECORATE.startOutboundFrameSpan(handlerContext, MESSAGE_TYPE_TEXT, len);
+    public TracingWriter(Writer delegate, HandlerContext.Sender handlerContext) {
+        super();
+        this.delegate = delegate;
+        this.handlerContext = handlerContext;
     }
-    try (final ContextScope ignored = activateSpan(handlerContext.getWebsocketSpan())) {
-      delegate.write(cbuf, off, len);
-    } finally {
-      if (doTrace) {
-        CallDepthThreadLocalMap.reset(HandlerContext.class);
-      }
+
+    @Override
+    public void write(char[] cbuf, int off, int len) throws IOException {
+        final boolean doTrace = CallDepthThreadLocalMap.incrementCallDepth(HandlerContext.class) == 0;
+        if (doTrace) {
+            DECORATE.startOutboundFrameSpan(handlerContext, MESSAGE_TYPE_TEXT, len);
+        }
+        try (final ContextScope ignored = activateSpan(handlerContext.getWebsocketSpan())) {
+            delegate.write(cbuf, off, len);
+        } finally {
+            if (doTrace) {
+                CallDepthThreadLocalMap.reset(HandlerContext.class);
+            }
+        }
     }
-  }
 
-  @Override
-  public void flush() throws IOException {
-    delegate.flush();
-  }
+    @Override
+    public void flush() throws IOException {
+        delegate.flush();
+    }
 
-  @Override
-  public void close() throws IOException {
-    final boolean doTrace = CallDepthThreadLocalMap.incrementCallDepth(HandlerContext.class) == 0;
-    try (final ContextScope ignored =
-        handlerContext.getWebsocketSpan() != null
-            ? activateSpan(handlerContext.getWebsocketSpan())
-            : null) {
-      delegate.close();
-    } finally {
-      if (doTrace) {
-        CallDepthThreadLocalMap.reset(HandlerContext.class);
-        DECORATE.onFrameEnd(handlerContext);
-      }
+    @Override
+    public void close() throws IOException {
+        final boolean doTrace = CallDepthThreadLocalMap.incrementCallDepth(HandlerContext.class) == 0;
+        try (final ContextScope ignored =
+                handlerContext.getWebsocketSpan() != null ? activateSpan(handlerContext.getWebsocketSpan()) : null) {
+            delegate.close();
+        } finally {
+            if (doTrace) {
+                CallDepthThreadLocalMap.reset(HandlerContext.class);
+                DECORATE.onFrameEnd(handlerContext);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java/datadog/trace/instrumentation/websocket/jetty10/JavaxWebSocketFrameHandlerFactoryInstrumentation.java b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java/datadog/trace/instrumentation/websocket/jetty10/JavaxWebSocketFrameHandlerFactoryInstrumentation.java
index d58d757f39f..a5c51310d33 100644
--- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java/datadog/trace/instrumentation/websocket/jetty10/JavaxWebSocketFrameHandlerFactoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java/datadog/trace/instrumentation/websocket/jetty10/JavaxWebSocketFrameHandlerFactoryInstrumentation.java
@@ -6,24 +6,24 @@
 import datadog.trace.agent.tooling.Instrumenter;
 
 public class JavaxWebSocketFrameHandlerFactoryInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  private final String namespace;
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    private final String namespace;
 
-  public JavaxWebSocketFrameHandlerFactoryInstrumentation(final String namespace) {
-    this.namespace = namespace;
-  }
+    public JavaxWebSocketFrameHandlerFactoryInstrumentation(final String namespace) {
+        this.namespace = namespace;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return namespace + "WebSocketFrameHandlerFactory";
-  }
+    @Override
+    public String instrumentedType() {
+        return namespace + "WebSocketFrameHandlerFactory";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        named("createMessageSink")
-            .and(takesArgument(0, named(namespace + "WebSocketSession")))
-            .and(takesArgument(1, named(namespace + "WebSocketMessageMetadata"))),
-        "datadog.trace.instrumentation.websocket.jetty10.WebSocketAdvices$MessageSinkAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                named("createMessageSink")
+                        .and(takesArgument(0, named(namespace + "WebSocketSession")))
+                        .and(takesArgument(1, named(namespace + "WebSocketMessageMetadata"))),
+                "datadog.trace.instrumentation.websocket.jetty10.WebSocketAdvices$MessageSinkAdvice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java/datadog/trace/instrumentation/websocket/jetty10/JavaxWebSocketFrameHandlerInstrumentation.java b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java/datadog/trace/instrumentation/websocket/jetty10/JavaxWebSocketFrameHandlerInstrumentation.java
index 596a4c3d447..ac21e282b93 100644
--- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java/datadog/trace/instrumentation/websocket/jetty10/JavaxWebSocketFrameHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java/datadog/trace/instrumentation/websocket/jetty10/JavaxWebSocketFrameHandlerInstrumentation.java
@@ -8,32 +8,32 @@
 import java.lang.invoke.MethodHandle;
 
 public class JavaxWebSocketFrameHandlerInstrumentation
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  private final String namespace;
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    private final String namespace;
 
-  public JavaxWebSocketFrameHandlerInstrumentation(final String namespace) {
-    this.namespace = namespace;
-  }
+    public JavaxWebSocketFrameHandlerInstrumentation(final String namespace) {
+        this.namespace = namespace;
+    }
 
-  @Override
-  public String instrumentedType() {
-    return namespace + "WebSocketFrameHandler";
-  }
+    @Override
+    public String instrumentedType() {
+        return namespace + "WebSocketFrameHandler";
+    }
 
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArguments(9))
-            .and(takesArgument(1, Object.class))
-            .and(takesArgument(2, MethodHandle.class))
-            .and(takesArgument(3, MethodHandle.class)),
-        "datadog.trace.instrumentation.websocket.jetty10.WebSocketAdvices$OpenClose9Advice");
-    transformer.applyAdvice(
-        isConstructor()
-            .and(takesArguments(10))
-            .and(takesArgument(2, Object.class))
-            .and(takesArgument(3, MethodHandle.class))
-            .and(takesArgument(4, MethodHandle.class)),
-        "datadog.trace.instrumentation.websocket.jetty10.WebSocketAdvices$OpenClose10Advice");
-  }
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArguments(9))
+                        .and(takesArgument(1, Object.class))
+                        .and(takesArgument(2, MethodHandle.class))
+                        .and(takesArgument(3, MethodHandle.class)),
+                "datadog.trace.instrumentation.websocket.jetty10.WebSocketAdvices$OpenClose9Advice");
+        transformer.applyAdvice(
+                isConstructor()
+                        .and(takesArguments(10))
+                        .and(takesArgument(2, Object.class))
+                        .and(takesArgument(3, MethodHandle.class))
+                        .and(takesArgument(4, MethodHandle.class)),
+                "datadog.trace.instrumentation.websocket.jetty10.WebSocketAdvices$OpenClose10Advice");
+    }
 }
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java/datadog/trace/instrumentation/websocket/jetty10/Jetty10JavaxPojoWebSocketModule.java b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java/datadog/trace/instrumentation/websocket/jetty10/Jetty10JavaxPojoWebSocketModule.java
index 911e0992d32..82332d9913f 100644
--- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java/datadog/trace/instrumentation/websocket/jetty10/Jetty10JavaxPojoWebSocketModule.java
+++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java/datadog/trace/instrumentation/websocket/jetty10/Jetty10JavaxPojoWebSocketModule.java
@@ -16,62 +16,61 @@
 
 @AutoService(InstrumenterModule.class)
 public class Jetty10JavaxPojoWebSocketModule extends InstrumenterModule.Tracing {
-  private final String jsrNamespace;
-  private final String jettyNamespace;
+    private final String jsrNamespace;
+    private final String jettyNamespace;
 
-  public Jetty10JavaxPojoWebSocketModule() {
-    this("javax", "org.eclipse.jetty.websocket.javax.common.Javax");
-  }
+    public Jetty10JavaxPojoWebSocketModule() {
+        this("javax", "org.eclipse.jetty.websocket.javax.common.Javax");
+    }
 
-  protected Jetty10JavaxPojoWebSocketModule(
-      final String jsrNamespace, final String jettyNamespace) {
-    super("jetty", "jetty-websocket", jsrNamespace + "-websocket", "websocket");
-    this.jsrNamespace = jsrNamespace;
-    this.jettyNamespace = jettyNamespace;
-  }
+    protected Jetty10JavaxPojoWebSocketModule(final String jsrNamespace, final String jettyNamespace) {
+        super("jetty", "jetty-websocket", jsrNamespace + "-websocket", "websocket");
+        this.jsrNamespace = jsrNamespace;
+        this.jettyNamespace = jettyNamespace;
+    }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return InstrumenterConfig.get().isWebsocketTracingEnabled();
-  }
+    @Override
+    protected boolean defaultEnabled() {
+        return InstrumenterConfig.get().isWebsocketTracingEnabled();
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    final Map<String, String> map = new HashMap<>();
-    map.put(jettyNamespace + "WebSocketSession", Boolean.class.getName());
-    map.put(jsrNamespace + ".websocket.Session", HandlerContext.Sender.class.getName());
-    return map;
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        final Map<String, String> map = new HashMap<>();
+        map.put(jettyNamespace + "WebSocketSession", Boolean.class.getName());
+        map.put(jsrNamespace + ".websocket.Session", HandlerContext.Sender.class.getName());
+        return map;
+    }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      new Reference.Builder(jettyNamespace + "WebSocketMessageMetadata")
-          .withMethod(
-              new String[0],
-              EXPECTS_NON_STATIC | EXPECTS_PUBLIC,
-              "getMethodHandle",
-              "Ljava/lang/invoke/MethodHandle;")
-          .build(),
-    };
-  }
+    @Override
+    public Reference[] additionalMuzzleReferences() {
+        return new Reference[] {
+            new Reference.Builder(jettyNamespace + "WebSocketMessageMetadata")
+                    .withMethod(
+                            new String[0],
+                            EXPECTS_NON_STATIC | EXPECTS_PUBLIC,
+                            "getMethodHandle",
+                            "Ljava/lang/invoke/MethodHandle;")
+                    .build(),
+        };
+    }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      "datadog.trace.instrumentation.websocket.jetty10.MethodHandleWrappers",
-    };
-  }
+    @Override
+    public String[] helperClassNames() {
+        return new String[] {
+            "datadog.trace.instrumentation.websocket.jetty10.MethodHandleWrappers",
+        };
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jetty-websocket-10";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jetty-websocket-10";
+    }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Arrays.asList(
-        new JavaxWebSocketFrameHandlerFactoryInstrumentation(jettyNamespace),
-        new JavaxWebSocketFrameHandlerInstrumentation(jettyNamespace));
-  }
+    @Override
+    public List<Instrumenter> typeInstrumentations() {
+        return Arrays.asList(
+                new JavaxWebSocketFrameHandlerFactoryInstrumentation(jettyNamespace),
+                new JavaxWebSocketFrameHandlerInstrumentation(jettyNamespace));
+    }
 }
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/MethodHandleWrappers.java b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/MethodHandleWrappers.java
index 7219b6f0ce9..4f5ffd8c1ba 100644
--- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/MethodHandleWrappers.java
+++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/MethodHandleWrappers.java
@@ -29,154 +29,149 @@
  * have that information since the Session parameter is optional.
  */
 public class MethodHandleWrappers {
-  /**
-   * OnOpen method handles that takes more arguments comparing to the original. We inject at the
-   * beginning the original to delegate the call, the context stores we need to lookup the handler
-   * context and the original parameter jetty is already binding (the session and the endpoint
-   * config)
-   */
-  public static final MethodHandle OPEN_METHOD_HANDLE =
-      new MethodHandles(MethodHandleWrappers.class.getClassLoader())
-          .method(
-              MethodHandleWrappers.class,
-              "onOpen",
-              MethodHandle.class,
-              ContextStore.class,
-              ContextStore.class,
-              JavaxWebSocketSession.class,
-              EndpointConfig.class);
+    /**
+     * OnOpen method handles that takes more arguments comparing to the original. We inject at the
+     * beginning the original to delegate the call, the context stores we need to lookup the handler
+     * context and the original parameter jetty is already binding (the session and the endpoint
+     * config)
+     */
+    public static final MethodHandle OPEN_METHOD_HANDLE = new MethodHandles(MethodHandleWrappers.class.getClassLoader())
+            .method(
+                    MethodHandleWrappers.class,
+                    "onOpen",
+                    MethodHandle.class,
+                    ContextStore.class,
+                    ContextStore.class,
+                    JavaxWebSocketSession.class,
+                    EndpointConfig.class);
 
-  /**
-   * OnClose method handles that takes more arguments comparing to the original. We inject at the
-   * beginning the origin alto delegate the call, the context stores we need to lookup the handler
-   * context and the original parameter jetty is already binding (the session and the close reason)
-   */
-  public static final MethodHandle CLOSE_METHOD_HANDLE =
-      new MethodHandles(MethodHandleWrappers.class.getClassLoader())
-          .method(
-              MethodHandleWrappers.class,
-              "onClose",
-              MethodHandle.class,
-              ContextStore.class,
-              Session.class,
-              CloseReason.class);
+    /**
+     * OnClose method handles that takes more arguments comparing to the original. We inject at the
+     * beginning the origin alto delegate the call, the context stores we need to lookup the handler
+     * context and the original parameter jetty is already binding (the session and the close reason)
+     */
+    public static final MethodHandle CLOSE_METHOD_HANDLE = new MethodHandles(
+                    MethodHandleWrappers.class.getClassLoader())
+            .method(
+                    MethodHandleWrappers.class,
+                    "onClose",
+                    MethodHandle.class,
+                    ContextStore.class,
+                    Session.class,
+                    CloseReason.class);
 
-  /**
-   * OnMessage method handles that takes more arguments comparing to the original. We inject at the
-   * beginning the origin alto delegate the call, the context stores we need to lookup the handler
-   * context, the session and the receiver handler context we create when the jetty message sink are
-   * instrumented. At the end we also accept the original method arguments as an object varargs
-   * since we cannot know in advance the one that will be passed.
-   */
-  public static final MethodHandle MESSAGE_METHOD_HANDLE =
-      new MethodHandles(MethodHandleWrappers.class.getClassLoader())
-          .method(
-              MethodHandleWrappers.class,
-              "onMessage",
-              MethodHandle.class,
-              JavaxWebSocketSession.class,
-              HandlerContext.Receiver.class,
-              ContextStore.class,
-              Object[].class);
+    /**
+     * OnMessage method handles that takes more arguments comparing to the original. We inject at the
+     * beginning the origin alto delegate the call, the context stores we need to lookup the handler
+     * context, the session and the receiver handler context we create when the jetty message sink are
+     * instrumented. At the end we also accept the original method arguments as an object varargs
+     * since we cannot know in advance the one that will be passed.
+     */
+    public static final MethodHandle MESSAGE_METHOD_HANDLE = new MethodHandles(
+                    MethodHandleWrappers.class.getClassLoader())
+            .method(
+                    MethodHandleWrappers.class,
+                    "onMessage",
+                    MethodHandle.class,
+                    JavaxWebSocketSession.class,
+                    HandlerContext.Receiver.class,
+                    ContextStore.class,
+                    Object[].class);
 
-  public static void onOpen(
-      MethodHandle delegate,
-      ContextStore<Session, HandlerContext.Sender> sessionStore,
-      ContextStore<JavaxWebSocketSession, Boolean> specificStore,
-      JavaxWebSocketSession session,
-      EndpointConfig config)
-      throws Throwable {
-    try {
-      specificStore.put(session, true);
+    public static void onOpen(
+            MethodHandle delegate,
+            ContextStore<Session, HandlerContext.Sender> sessionStore,
+            ContextStore<JavaxWebSocketSession, Boolean> specificStore,
+            JavaxWebSocketSession session,
+            EndpointConfig config)
+            throws Throwable {
+        try {
+            specificStore.put(session, true);
 
-      final AgentSpan current = AgentTracer.get().activeSpan();
+            final AgentSpan current = AgentTracer.get().activeSpan();
 
-      if (current != null) {
-        // we need to force the sampling decision in case the span is linked
-        if (Config.get().isWebsocketMessagesInheritSampling()) {
-          current.forceSamplingDecision();
+            if (current != null) {
+                // we need to force the sampling decision in case the span is linked
+                if (Config.get().isWebsocketMessagesInheritSampling()) {
+                    current.forceSamplingDecision();
+                }
+                sessionStore.getOrPut(session, new HandlerContext.Sender(current.getLocalRootSpan(), session.getId()));
+            }
+        } catch (Throwable t) {
+            ExceptionLogger.LOGGER.debug("Unforeseen error instrumenting jetty websocket POJO", t);
+        } finally {
+            delegate.invoke(session, config);
         }
-        sessionStore.getOrPut(
-            session, new HandlerContext.Sender(current.getLocalRootSpan(), session.getId()));
-      }
-    } catch (Throwable t) {
-      ExceptionLogger.LOGGER.debug("Unforeseen error instrumenting jetty websocket POJO", t);
-    } finally {
-      delegate.invoke(session, config);
     }
-  }
 
-  public static void onClose(
-      MethodHandle delegate,
-      ContextStore<Session, HandlerContext.Sender> contextStore,
-      Session session,
-      CloseReason closeReason)
-      throws Throwable {
-    HandlerContext.Sender handlerContext =
-        contextStore != null && session != null ? contextStore.get(session) : null;
-    if (handlerContext != null) {
-      final HandlerContext.Receiver closeContext =
-          new HandlerContext.Receiver(handlerContext.getHandshakeSpan(), session.getId());
-      try (ContextScope ignored =
-          activateSpan(
-              DECORATE.startInboundCloseSpan(
-                  closeContext,
-                  closeReason.getReasonPhrase(),
-                  closeReason.getCloseCode().getCode()))) {
-        delegate.invoke(session, closeReason);
-      } finally {
-        DECORATE.onFrameEnd(closeContext);
-      }
-    } else {
-      delegate.invoke(session, closeReason);
+    public static void onClose(
+            MethodHandle delegate,
+            ContextStore<Session, HandlerContext.Sender> contextStore,
+            Session session,
+            CloseReason closeReason)
+            throws Throwable {
+        HandlerContext.Sender handlerContext =
+                contextStore != null && session != null ? contextStore.get(session) : null;
+        if (handlerContext != null) {
+            final HandlerContext.Receiver closeContext =
+                    new HandlerContext.Receiver(handlerContext.getHandshakeSpan(), session.getId());
+            try (ContextScope ignored = activateSpan(DECORATE.startInboundCloseSpan(
+                    closeContext,
+                    closeReason.getReasonPhrase(),
+                    closeReason.getCloseCode().getCode()))) {
+                delegate.invoke(session, closeReason);
+            } finally {
+                DECORATE.onFrameEnd(closeContext);
+            }
+        } else {
+            delegate.invoke(session, closeReason);
+        }
     }
-  }
 
-  public static Object onMessage(
-      MethodHandle delegate,
-      JavaxWebSocketSession session,
-      HandlerContext.Receiver handlerContext,
-      ContextStore<JavaxWebSocketSession, Boolean> contextStore,
-      Object[] args)
-      throws Throwable {
-    AgentSpan wsSpan = null;
-    if (!Boolean.TRUE.equals(contextStore.get(session))) {
-      return delegate.invokeWithArguments(args);
-    }
-    boolean instrument;
-    boolean finishSpan = true;
-    try {
-      instrument =
-          handlerContext != null
-              && args != null
-              && args.length > 0
-              && CallDepthThreadLocalMap.incrementCallDepth(MessageHandler.class) == 0;
-      boolean partialDelivery;
-      if (instrument) {
-        partialDelivery = args.length > 1 && (args[1] instanceof Boolean);
-        if (partialDelivery) {
-          finishSpan = (boolean) args[1];
+    public static Object onMessage(
+            MethodHandle delegate,
+            JavaxWebSocketSession session,
+            HandlerContext.Receiver handlerContext,
+            ContextStore<JavaxWebSocketSession, Boolean> contextStore,
+            Object[] args)
+            throws Throwable {
+        AgentSpan wsSpan = null;
+        if (!Boolean.TRUE.equals(contextStore.get(session))) {
+            return delegate.invokeWithArguments(args);
         }
-        wsSpan = DECORATE.startInboundFrameSpan(handlerContext, args[0], partialDelivery);
-      }
-    } catch (Throwable t) {
-      ExceptionLogger.LOGGER.debug("Unforeseen error instrumenting jetty websocket POJO", t);
-    }
-    if (wsSpan != null) {
-      try (ContextScope ignored = activateSpan(wsSpan)) {
-        return delegate.invokeWithArguments(args);
-      } catch (Throwable t) {
-        finishSpan = true;
-        DECORATE.onError(wsSpan, t);
+        boolean instrument;
+        boolean finishSpan = true;
+        try {
+            instrument = handlerContext != null
+                    && args != null
+                    && args.length > 0
+                    && CallDepthThreadLocalMap.incrementCallDepth(MessageHandler.class) == 0;
+            boolean partialDelivery;
+            if (instrument) {
+                partialDelivery = args.length > 1 && (args[1] instanceof Boolean);
+                if (partialDelivery) {
+                    finishSpan = (boolean) args[1];
+                }
+                wsSpan = DECORATE.startInboundFrameSpan(handlerContext, args[0], partialDelivery);
+            }
+        } catch (Throwable t) {
+            ExceptionLogger.LOGGER.debug("Unforeseen error instrumenting jetty websocket POJO", t);
+        }
+        if (wsSpan != null) {
+            try (ContextScope ignored = activateSpan(wsSpan)) {
+                return delegate.invokeWithArguments(args);
+            } catch (Throwable t) {
+                finishSpan = true;
+                DECORATE.onError(wsSpan, t);
 
-        throw t;
-      } finally {
-        CallDepthThreadLocalMap.reset(MessageHandler.class);
-        if (finishSpan) {
-          DECORATE.onFrameEnd(handlerContext);
+                throw t;
+            } finally {
+                CallDepthThreadLocalMap.reset(MessageHandler.class);
+                if (finishSpan) {
+                    DECORATE.onFrameEnd(handlerContext);
+                }
+            }
         }
-      }
+        return delegate.invokeWithArguments(args);
     }
-    return delegate.invokeWithArguments(args);
-  }
 }
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/WebSocketAdvices.java b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/WebSocketAdvices.java
index eb41bd9b346..dc10808dd07 100644
--- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/WebSocketAdvices.java
+++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/WebSocketAdvices.java
@@ -16,103 +16,98 @@
 
 @SuppressFBWarnings("UC_USELESS_OBJECT_STACK")
 public class WebSocketAdvices {
-  public static class OpenClose9Advice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(value = 2, readOnly = false) MethodHandle openHandle,
-        @Advice.Argument(value = 3, readOnly = false) MethodHandle closeHandle,
-        @Advice.Argument(value = 1) final Object origin) {
+    public static class OpenClose9Advice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Argument(value = 2, readOnly = false) MethodHandle openHandle,
+                @Advice.Argument(value = 3, readOnly = false) MethodHandle closeHandle,
+                @Advice.Argument(value = 1) final Object origin) {
 
-      // we skip wrapping the method handle in case the origin is already an Enpoint since this will
-      // be already handled by the jsr356 instrumentation
-      if (origin == null || origin instanceof Endpoint) {
-        return;
-      }
-      // we need then to wrap those two method handles jetty is calling when the websocket is opened
-      // and closed since jetty is directly calling them.
-      // We also insert other arguments at the beginning in order to provide data we need. Inserting
-      // at the beginning won't break bind and invoke jetty will do.
-      openHandle =
-          MethodHandles.insertArguments(
-              MethodHandleWrappers.OPEN_METHOD_HANDLE,
-              0,
-              openHandle,
-              InstrumentationContext.get(Session.class, HandlerContext.Sender.class),
-              InstrumentationContext.get(JavaxWebSocketSession.class, Boolean.class));
-      closeHandle =
-          MethodHandles.insertArguments(
-              MethodHandleWrappers.CLOSE_METHOD_HANDLE,
-              0,
-              closeHandle,
-              InstrumentationContext.get(Session.class, HandlerContext.Sender.class));
+            // we skip wrapping the method handle in case the origin is already an Enpoint since this will
+            // be already handled by the jsr356 instrumentation
+            if (origin == null || origin instanceof Endpoint) {
+                return;
+            }
+            // we need then to wrap those two method handles jetty is calling when the websocket is opened
+            // and closed since jetty is directly calling them.
+            // We also insert other arguments at the beginning in order to provide data we need. Inserting
+            // at the beginning won't break bind and invoke jetty will do.
+            openHandle = MethodHandles.insertArguments(
+                    MethodHandleWrappers.OPEN_METHOD_HANDLE,
+                    0,
+                    openHandle,
+                    InstrumentationContext.get(Session.class, HandlerContext.Sender.class),
+                    InstrumentationContext.get(JavaxWebSocketSession.class, Boolean.class));
+            closeHandle = MethodHandles.insertArguments(
+                    MethodHandleWrappers.CLOSE_METHOD_HANDLE,
+                    0,
+                    closeHandle,
+                    InstrumentationContext.get(Session.class, HandlerContext.Sender.class));
+        }
     }
-  }
 
-  public static class OpenClose10Advice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(value = 3, readOnly = false) MethodHandle openHandle,
-        @Advice.Argument(value = 4, readOnly = false) MethodHandle closeHandle,
-        @Advice.Argument(value = 2) final Object origin) {
+    public static class OpenClose10Advice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Argument(value = 3, readOnly = false) MethodHandle openHandle,
+                @Advice.Argument(value = 4, readOnly = false) MethodHandle closeHandle,
+                @Advice.Argument(value = 2) final Object origin) {
 
-      // we skip wrapping the method handle in case the origin is already an Enpoint since this will
-      // be already handled by the jsr356 instrumentation
-      if (origin == null || origin instanceof Endpoint) {
-        return;
-      }
-      // we need then to wrap those two method handles jetty is calling when the websocket is opened
-      // and closed since jetty is directly calling them.
-      // We also insert other arguments at the beginning in order to provide data we need. Inserting
-      // at the beginning won't break bind and invoke jetty will do.
-      openHandle =
-          MethodHandles.insertArguments(
-              MethodHandleWrappers.OPEN_METHOD_HANDLE,
-              0,
-              openHandle,
-              InstrumentationContext.get(Session.class, HandlerContext.Sender.class),
-              InstrumentationContext.get(JavaxWebSocketSession.class, Boolean.class));
-      closeHandle =
-          MethodHandles.insertArguments(
-              MethodHandleWrappers.CLOSE_METHOD_HANDLE,
-              0,
-              closeHandle,
-              InstrumentationContext.get(Session.class, HandlerContext.Sender.class));
+            // we skip wrapping the method handle in case the origin is already an Enpoint since this will
+            // be already handled by the jsr356 instrumentation
+            if (origin == null || origin instanceof Endpoint) {
+                return;
+            }
+            // we need then to wrap those two method handles jetty is calling when the websocket is opened
+            // and closed since jetty is directly calling them.
+            // We also insert other arguments at the beginning in order to provide data we need. Inserting
+            // at the beginning won't break bind and invoke jetty will do.
+            openHandle = MethodHandles.insertArguments(
+                    MethodHandleWrappers.OPEN_METHOD_HANDLE,
+                    0,
+                    openHandle,
+                    InstrumentationContext.get(Session.class, HandlerContext.Sender.class),
+                    InstrumentationContext.get(JavaxWebSocketSession.class, Boolean.class));
+            closeHandle = MethodHandles.insertArguments(
+                    MethodHandleWrappers.CLOSE_METHOD_HANDLE,
+                    0,
+                    closeHandle,
+                    InstrumentationContext.get(Session.class, HandlerContext.Sender.class));
+        }
     }
-  }
 
-  public static class MessageSinkAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) final JavaxWebSocketSession session,
-        @Advice.Argument(1) final JavaxWebSocketMessageMetadata metadata) {
-      if (metadata == null || metadata.getMethodHandle() == null) {
-        return;
-      }
-      final AgentSpan current = AgentTracer.get().activeSpan();
+    public static class MessageSinkAdvice {
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static void onEnter(
+                @Advice.Argument(0) final JavaxWebSocketSession session,
+                @Advice.Argument(1) final JavaxWebSocketMessageMetadata metadata) {
+            if (metadata == null || metadata.getMethodHandle() == null) {
+                return;
+            }
+            final AgentSpan current = AgentTracer.get().activeSpan();
 
-      if (current == null) {
-        return;
-      }
-      try {
-        // we need to manipulate this method handle after jetty already bound template variables and
-        // arguments otherwise the call will mismatch.
-        // we insert arguments at the beginning to inject our own data and make the method as vararg
-        // to collect arguments since we need to call the original and we cannot know which one will
-        // be provided. In fact, it will depend on the data used (i.e. byte[], String, etc...) and
-        // if partial delivery is handled (so it will also accept a boolean for the fin bit signal).
-        metadata.setMethodHandle(
-            MethodHandles.insertArguments(
-                    MethodHandleWrappers.MESSAGE_METHOD_HANDLE,
-                    0,
-                    metadata.getMethodHandle(),
-                    session,
-                    new HandlerContext.Receiver(current, session.getId()),
-                    InstrumentationContext.get(JavaxWebSocketSession.class, Boolean.class))
-                .asVarargsCollector(Object[].class));
-      } catch (Throwable t) {
-        // log it
-        ExceptionLogger.LOGGER.debug("Error while mutating MessageSink ", t);
-      }
+            if (current == null) {
+                return;
+            }
+            try {
+                // we need to manipulate this method handle after jetty already bound template variables and
+                // arguments otherwise the call will mismatch.
+                // we insert arguments at the beginning to inject our own data and make the method as vararg
+                // to collect arguments since we need to call the original and we cannot know which one will
+                // be provided. In fact, it will depend on the data used (i.e. byte[], String, etc...) and
+                // if partial delivery is handled (so it will also accept a boolean for the fin bit signal).
+                metadata.setMethodHandle(MethodHandles.insertArguments(
+                                MethodHandleWrappers.MESSAGE_METHOD_HANDLE,
+                                0,
+                                metadata.getMethodHandle(),
+                                session,
+                                new HandlerContext.Receiver(current, session.getId()),
+                                InstrumentationContext.get(JavaxWebSocketSession.class, Boolean.class))
+                        .asVarargsCollector(Object[].class));
+            } catch (Throwable t) {
+                // log it
+                ExceptionLogger.LOGGER.debug("Error while mutating MessageSink ", t);
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/src/main/java/datadog/trace/instrumentation/websocket/jetty11/Jetty11JakartaPojoWebsocketModule.java b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/src/main/java/datadog/trace/instrumentation/websocket/jetty11/Jetty11JakartaPojoWebsocketModule.java
index bf28fe650c1..74b96ff66ea 100644
--- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/src/main/java/datadog/trace/instrumentation/websocket/jetty11/Jetty11JakartaPojoWebsocketModule.java
+++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/src/main/java/datadog/trace/instrumentation/websocket/jetty11/Jetty11JakartaPojoWebsocketModule.java
@@ -9,22 +9,20 @@
 @AutoService(InstrumenterModule.class)
 public class Jetty11JakartaPojoWebsocketModule extends Jetty10JavaxPojoWebSocketModule {
 
-  public Jetty11JakartaPojoWebsocketModule() {
-    super("jakarta", "org.eclipse.jetty.websocket.jakarta.common.Jakarta");
-  }
+    public Jetty11JakartaPojoWebsocketModule() {
+        super("jakarta", "org.eclipse.jetty.websocket.jakarta.common.Jakarta");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jetty-websocket-11";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jetty-websocket-11";
+    }
 
-  @Override
-  public Map<String, String> adviceShading() {
-    final Map<String, String> map = new HashMap<>();
-    map.put("javax", "jakarta");
-    map.put(
-        "org.eclipse.jetty.websocket.javax.common.Javax",
-        "org.eclipse.jetty.websocket.jakarta.common.Jakarta");
-    return map;
-  }
+    @Override
+    public Map<String, String> adviceShading() {
+        final Map<String, String> map = new HashMap<>();
+        map.put("javax", "jakarta");
+        map.put("org.eclipse.jetty.websocket.javax.common.Javax", "org.eclipse.jetty.websocket.jakarta.common.Jakarta");
+        return map;
+    }
 }
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/src/main/java/datadog/trace/instrumentation/websocket/jetty12/Jetty12EE10JakartaPojoWebsocketModule.java b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/src/main/java/datadog/trace/instrumentation/websocket/jetty12/Jetty12EE10JakartaPojoWebsocketModule.java
index e3c2742f394..8e32dd326d4 100644
--- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/src/main/java/datadog/trace/instrumentation/websocket/jetty12/Jetty12EE10JakartaPojoWebsocketModule.java
+++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/src/main/java/datadog/trace/instrumentation/websocket/jetty12/Jetty12EE10JakartaPojoWebsocketModule.java
@@ -9,22 +9,22 @@
 @AutoService(InstrumenterModule.class)
 public class Jetty12EE10JakartaPojoWebsocketModule extends Jetty10JavaxPojoWebSocketModule {
 
-  public Jetty12EE10JakartaPojoWebsocketModule() {
-    super("jakarta", "org.eclipse.jetty.ee10.websocket.jakarta.common.Jakarta");
-  }
+    public Jetty12EE10JakartaPojoWebsocketModule() {
+        super("jakarta", "org.eclipse.jetty.ee10.websocket.jakarta.common.Jakarta");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jetty-websocket-12ee10";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jetty-websocket-12ee10";
+    }
 
-  @Override
-  public Map<String, String> adviceShading() {
-    final Map<String, String> ret = new HashMap<>();
-    ret.put("javax", "jakarta");
-    ret.put(
-        "org.eclipse.jetty.websocket.javax.common.Javax",
-        "org.eclipse.jetty.ee10.websocket.jakarta.common.Jakarta");
-    return ret;
-  }
+    @Override
+    public Map<String, String> adviceShading() {
+        final Map<String, String> ret = new HashMap<>();
+        ret.put("javax", "jakarta");
+        ret.put(
+                "org.eclipse.jetty.websocket.javax.common.Javax",
+                "org.eclipse.jetty.ee10.websocket.jakarta.common.Jakarta");
+        return ret;
+    }
 }
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/src/main/java/datadog/trace/instrumentation/websocket/jetty12/Jetty12EE8JavaxPojoWebsocketModule.java b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/src/main/java/datadog/trace/instrumentation/websocket/jetty12/Jetty12EE8JavaxPojoWebsocketModule.java
index 21a3b093bc0..c6469e2a973 100644
--- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/src/main/java/datadog/trace/instrumentation/websocket/jetty12/Jetty12EE8JavaxPojoWebsocketModule.java
+++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/src/main/java/datadog/trace/instrumentation/websocket/jetty12/Jetty12EE8JavaxPojoWebsocketModule.java
@@ -9,19 +9,18 @@
 @AutoService(InstrumenterModule.class)
 public class Jetty12EE8JavaxPojoWebsocketModule extends Jetty10JavaxPojoWebSocketModule {
 
-  public Jetty12EE8JavaxPojoWebsocketModule() {
-    super("javax", "org.eclipse.jetty.ee8.websocket.javax.common.Javax");
-  }
+    public Jetty12EE8JavaxPojoWebsocketModule() {
+        super("javax", "org.eclipse.jetty.ee8.websocket.javax.common.Javax");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jetty-websocket-12ee8";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jetty-websocket-12ee8";
+    }
 
-  @Override
-  public Map<String, String> adviceShading() {
-    return Collections.singletonMap(
-        "org.eclipse.jetty.websocket.javax.common.Javax",
-        "org.eclipse.jetty.ee8.websocket.javax.common.Javax");
-  }
+    @Override
+    public Map<String, String> adviceShading() {
+        return Collections.singletonMap(
+                "org.eclipse.jetty.websocket.javax.common.Javax", "org.eclipse.jetty.ee8.websocket.javax.common.Javax");
+    }
 }
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/src/main/java/datadog/trace/instrumentation/websocket/jetty12/Jetty12EE9JakartaPojoWebsocketModule.java b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/src/main/java/datadog/trace/instrumentation/websocket/jetty12/Jetty12EE9JakartaPojoWebsocketModule.java
index cf55ba3af4d..06cf27ede50 100644
--- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/src/main/java/datadog/trace/instrumentation/websocket/jetty12/Jetty12EE9JakartaPojoWebsocketModule.java
+++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/src/main/java/datadog/trace/instrumentation/websocket/jetty12/Jetty12EE9JakartaPojoWebsocketModule.java
@@ -9,22 +9,22 @@
 @AutoService(InstrumenterModule.class)
 public class Jetty12EE9JakartaPojoWebsocketModule extends Jetty10JavaxPojoWebSocketModule {
 
-  public Jetty12EE9JakartaPojoWebsocketModule() {
-    super("jakarta", "org.eclipse.jetty.ee9.websocket.jakarta.common.Jakarta");
-  }
+    public Jetty12EE9JakartaPojoWebsocketModule() {
+        super("jakarta", "org.eclipse.jetty.ee9.websocket.jakarta.common.Jakarta");
+    }
 
-  @Override
-  public String muzzleDirective() {
-    return "jetty-websocket-12e9";
-  }
+    @Override
+    public String muzzleDirective() {
+        return "jetty-websocket-12e9";
+    }
 
-  @Override
-  public Map<String, String> adviceShading() {
-    final Map<String, String> ret = new HashMap<>();
-    ret.put("javax", "jakarta");
-    ret.put(
-        "org.eclipse.jetty.websocket.javax.common.Javax",
-        "org.eclipse.jetty.ee9.websocket.jakarta.common.Jakarta");
-    return ret;
-  }
+    @Override
+    public Map<String, String> adviceShading() {
+        final Map<String, String> ret = new HashMap<>();
+        ret.put("javax", "jakarta");
+        ret.put(
+                "org.eclipse.jetty.websocket.javax.common.Javax",
+                "org.eclipse.jetty.ee9.websocket.jakarta.common.Jakarta");
+        return ret;
+    }
 }
diff --git a/dd-java-agent/instrumentation/websphere-jmx-8.5/src/main/java/datadog/trace/instrumentation/websphere_jmx/WebsphereSecurityInstrumentation.java b/dd-java-agent/instrumentation/websphere-jmx-8.5/src/main/java/datadog/trace/instrumentation/websphere_jmx/WebsphereSecurityInstrumentation.java
index aef4c7a72f2..5196e3fad25 100644
--- a/dd-java-agent/instrumentation/websphere-jmx-8.5/src/main/java/datadog/trace/instrumentation/websphere_jmx/WebsphereSecurityInstrumentation.java
+++ b/dd-java-agent/instrumentation/websphere-jmx-8.5/src/main/java/datadog/trace/instrumentation/websphere_jmx/WebsphereSecurityInstrumentation.java
@@ -18,45 +18,45 @@
  */
 @AutoService(InstrumenterModule.class)
 public class WebsphereSecurityInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  private final String customBuilder;
-
-  public WebsphereSecurityInstrumentation() {
-    super("websphere-jmx");
-
-    customBuilder = SystemProperties.get("javax.management.builder.initial");
-  }
-
-  @Override
-  public String instrumentedType() {
-    return "com.ibm.ws.management.util.SecurityHelper";
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return super.isEnabled()
-        && "com.ibm.ws.management.PlatformMBeanServerBuilder".equals(customBuilder)
-        // we must avoid loading the global Config while setting up instrumentation, so use the same
-        // underlying provider call as Config.get().isJmxFetchIntegrationEnabled("websphere", false)
-        && ConfigProvider.getInstance()
-            .isEnabled(Collections.singletonList("websphere"), "jmxfetch.", ".enabled", false);
-  }
-
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("isSecurityEnabled")).and(returns(boolean.class)),
-        this.getClass().getName() + "$DisableSecurityAdvice");
-  }
-
-  public static class DisableSecurityAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void after(@Advice.Return(readOnly = false) boolean securityEnabled) {
-      // only grant access when we know the call is coming from one of our agent threads
-      if (AgentThreadFactory.AGENT_THREAD_GROUP == Thread.currentThread().getThreadGroup()) {
-        securityEnabled = false;
-      }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+    private final String customBuilder;
+
+    public WebsphereSecurityInstrumentation() {
+        super("websphere-jmx");
+
+        customBuilder = SystemProperties.get("javax.management.builder.initial");
+    }
+
+    @Override
+    public String instrumentedType() {
+        return "com.ibm.ws.management.util.SecurityHelper";
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled()
+                && "com.ibm.ws.management.PlatformMBeanServerBuilder".equals(customBuilder)
+                // we must avoid loading the global Config while setting up instrumentation, so use the same
+                // underlying provider call as Config.get().isJmxFetchIntegrationEnabled("websphere", false)
+                && ConfigProvider.getInstance()
+                        .isEnabled(Collections.singletonList("websphere"), "jmxfetch.", ".enabled", false);
+    }
+
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("isSecurityEnabled")).and(returns(boolean.class)),
+                this.getClass().getName() + "$DisableSecurityAdvice");
+    }
+
+    public static class DisableSecurityAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void after(@Advice.Return(readOnly = false) boolean securityEnabled) {
+            // only grant access when we know the call is coming from one of our agent threads
+            if (AgentThreadFactory.AGENT_THREAD_GROUP == Thread.currentThread().getThreadGroup()) {
+                securityEnabled = false;
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/wildfly-9.0/src/main/java/datadog/trace/instrumentation/wildfly/EnvEntryInjectionSourceInstrumentation.java b/dd-java-agent/instrumentation/wildfly-9.0/src/main/java/datadog/trace/instrumentation/wildfly/EnvEntryInjectionSourceInstrumentation.java
index 58c6a5275ac..c86e7f52476 100644
--- a/dd-java-agent/instrumentation/wildfly-9.0/src/main/java/datadog/trace/instrumentation/wildfly/EnvEntryInjectionSourceInstrumentation.java
+++ b/dd-java-agent/instrumentation/wildfly-9.0/src/main/java/datadog/trace/instrumentation/wildfly/EnvEntryInjectionSourceInstrumentation.java
@@ -13,32 +13,32 @@
 
 @AutoService(InstrumenterModule.class)
 public class EnvEntryInjectionSourceInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public EnvEntryInjectionSourceInstrumentation() {
-    super("wildfly", "jee-env-entry");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public EnvEntryInjectionSourceInstrumentation() {
+        super("wildfly", "jee-env-entry");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.jboss.as.ee.component.EnvEntryInjectionSource";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.jboss.as.ee.component.EnvEntryInjectionSource";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.jboss.as.ee.component.EnvEntryInjectionSource", Object.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.jboss.as.ee.component.EnvEntryInjectionSource", Object.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(isConstructor(), getClass().getName() + "$ConstructorAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(isConstructor(), getClass().getName() + "$ConstructorAdvice");
+    }
 
-  public static class ConstructorAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This final EnvEntryInjectionSource self, @Advice.Argument(0) final Object value) {
-      InstrumentationContext.get(EnvEntryInjectionSource.class, Object.class).put(self, value);
+    public static class ConstructorAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This final EnvEntryInjectionSource self, @Advice.Argument(0) final Object value) {
+            InstrumentationContext.get(EnvEntryInjectionSource.class, Object.class)
+                    .put(self, value);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/wildfly-9.0/src/main/java/datadog/trace/instrumentation/wildfly/ResourceReferenceProcessorInstrumentation.java b/dd-java-agent/instrumentation/wildfly-9.0/src/main/java/datadog/trace/instrumentation/wildfly/ResourceReferenceProcessorInstrumentation.java
index f716563c242..486a16d5bcc 100644
--- a/dd-java-agent/instrumentation/wildfly-9.0/src/main/java/datadog/trace/instrumentation/wildfly/ResourceReferenceProcessorInstrumentation.java
+++ b/dd-java-agent/instrumentation/wildfly-9.0/src/main/java/datadog/trace/instrumentation/wildfly/ResourceReferenceProcessorInstrumentation.java
@@ -18,56 +18,53 @@
 
 @AutoService(InstrumenterModule.class)
 public class ResourceReferenceProcessorInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public ResourceReferenceProcessorInstrumentation() {
-    super("wildfly", "jee-env-entry");
-  }
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+    public ResourceReferenceProcessorInstrumentation() {
+        super("wildfly", "jee-env-entry");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.jboss.as.ee.component.deployers.ResourceReferenceProcessor";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.jboss.as.ee.component.deployers.ResourceReferenceProcessor";
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap(
-        "org.jboss.as.ee.component.EnvEntryInjectionSource", Object.class.getName());
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return Collections.singletonMap("org.jboss.as.ee.component.EnvEntryInjectionSource", Object.class.getName());
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("getEnvironmentEntries")),
-        getClass().getName() + "$GetEnvironmentEntriesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("getEnvironmentEntries")), getClass().getName() + "$GetEnvironmentEntriesAdvice");
+    }
 
-  public static class GetEnvironmentEntriesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Argument(value = 1) final ClassLoader classLoader,
-        @Advice.Return final List<BindingConfiguration> configurations) {
-      ClassloaderConfigurationOverrides.ContextualInfo info = null;
-      ContextStore<EnvEntryInjectionSource, Object> contextStore =
-          InstrumentationContext.get(EnvEntryInjectionSource.class, Object.class);
-      for (BindingConfiguration bindingConfiguration : configurations) {
-        if (bindingConfiguration.getSource() instanceof EnvEntryInjectionSource) {
-          final Object value =
-              contextStore.get((EnvEntryInjectionSource) bindingConfiguration.getSource());
-          if (value != null
-              && bindingConfiguration
-                  .getName()
-                  .startsWith(ClassloaderConfigurationOverrides.DATADOG_TAGS_JNDI_PREFIX)) {
-            if (info == null) {
-              info = ClassloaderConfigurationOverrides.maybeCreateContextualInfo(classLoader);
+    public static class GetEnvironmentEntriesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.Argument(value = 1) final ClassLoader classLoader,
+                @Advice.Return final List<BindingConfiguration> configurations) {
+            ClassloaderConfigurationOverrides.ContextualInfo info = null;
+            ContextStore<EnvEntryInjectionSource, Object> contextStore =
+                    InstrumentationContext.get(EnvEntryInjectionSource.class, Object.class);
+            for (BindingConfiguration bindingConfiguration : configurations) {
+                if (bindingConfiguration.getSource() instanceof EnvEntryInjectionSource) {
+                    final Object value = contextStore.get((EnvEntryInjectionSource) bindingConfiguration.getSource());
+                    if (value != null
+                            && bindingConfiguration
+                                    .getName()
+                                    .startsWith(ClassloaderConfigurationOverrides.DATADOG_TAGS_JNDI_PREFIX)) {
+                        if (info == null) {
+                            info = ClassloaderConfigurationOverrides.maybeCreateContextualInfo(classLoader);
+                        }
+                        info.addTag(
+                                bindingConfiguration
+                                        .getName()
+                                        .substring(ClassloaderConfigurationOverrides.DATADOG_TAGS_JNDI_PREFIX.length()),
+                                value);
+                    }
+                }
             }
-            info.addTag(
-                bindingConfiguration
-                    .getName()
-                    .substring(ClassloaderConfigurationOverrides.DATADOG_TAGS_JNDI_PREFIX.length()),
-                value);
-          }
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/wildfly-9.0/src/test/java/test/JakartaTestServlet.java b/dd-java-agent/instrumentation/wildfly-9.0/src/test/java/test/JakartaTestServlet.java
index 2af90032412..9be67b9808c 100644
--- a/dd-java-agent/instrumentation/wildfly-9.0/src/test/java/test/JakartaTestServlet.java
+++ b/dd-java-agent/instrumentation/wildfly-9.0/src/test/java/test/JakartaTestServlet.java
@@ -5,8 +5,8 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 public class JakartaTestServlet extends HttpServlet {
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
-    resp.setStatus(HttpServletResponse.SC_OK);
-  }
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
+        resp.setStatus(HttpServletResponse.SC_OK);
+    }
 }
diff --git a/dd-java-agent/instrumentation/wildfly-9.0/src/test/java/test/ModulePatchInstrumentation.java b/dd-java-agent/instrumentation/wildfly-9.0/src/test/java/test/ModulePatchInstrumentation.java
index 21924a6b35d..af46a01d33e 100644
--- a/dd-java-agent/instrumentation/wildfly-9.0/src/test/java/test/ModulePatchInstrumentation.java
+++ b/dd-java-agent/instrumentation/wildfly-9.0/src/test/java/test/ModulePatchInstrumentation.java
@@ -21,38 +21,38 @@
  */
 @AutoService(InstrumenterModule.class)
 public class ModulePatchInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ModulePatchInstrumentation() {
-    super("jboss-module-patch");
-  }
+    public ModulePatchInstrumentation() {
+        super("jboss-module-patch");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "org.jboss.modules.Module";
-  }
+    @Override
+    public String instrumentedType() {
+        return "org.jboss.modules.Module";
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(named("getResources"), getClass().getName() + "$SystemResourcesAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(named("getResources"), getClass().getName() + "$SystemResourcesAdvice");
+    }
 
-  public static class SystemResourcesAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.This Module self,
-        @Advice.Argument(0) String name,
-        @Advice.Return(readOnly = false) Enumeration<URL> ret) {
-      if ("META-INF/services/javax.servlet.ServletContainerInitializer".equals(name)) {
-        final List<URL> list = new ArrayList<>();
-        while (ret.hasMoreElements()) {
-          URL u = ret.nextElement();
-          if (!u.toString().contains("logback-classic")) {
-            list.add(u);
-          }
+    public static class SystemResourcesAdvice {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(
+                @Advice.This Module self,
+                @Advice.Argument(0) String name,
+                @Advice.Return(readOnly = false) Enumeration<URL> ret) {
+            if ("META-INF/services/javax.servlet.ServletContainerInitializer".equals(name)) {
+                final List<URL> list = new ArrayList<>();
+                while (ret.hasMoreElements()) {
+                    URL u = ret.nextElement();
+                    if (!u.toString().contains("logback-classic")) {
+                        list.add(u);
+                    }
+                }
+                ret = Collections.enumeration(list);
+            }
         }
-        ret = Collections.enumeration(list);
-      }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/wildfly-9.0/src/test/java/test/TestServlet.java b/dd-java-agent/instrumentation/wildfly-9.0/src/test/java/test/TestServlet.java
index 551fa4baf4b..74ef33b7a06 100644
--- a/dd-java-agent/instrumentation/wildfly-9.0/src/test/java/test/TestServlet.java
+++ b/dd-java-agent/instrumentation/wildfly-9.0/src/test/java/test/TestServlet.java
@@ -5,8 +5,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 public class TestServlet extends HttpServlet {
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
-    resp.setStatus(HttpServletResponse.SC_OK);
-  }
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
+        resp.setStatus(HttpServletResponse.SC_OK);
+    }
 }
diff --git a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceDecorator.java b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceDecorator.java
index 1364b4b6536..89705f821b3 100644
--- a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceDecorator.java
+++ b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceDecorator.java
@@ -6,31 +6,29 @@
 import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;
 
 public class WebServiceDecorator extends BaseDecorator {
-  public static final WebServiceDecorator DECORATE = new WebServiceDecorator();
+    public static final WebServiceDecorator DECORATE = new WebServiceDecorator();
 
-  public static final CharSequence JAKARTA_WS_REQUEST =
-      UTF8BytesString.create("jakarta-ws.request");
-  public static final CharSequence JAKARTA_WS_ENDPOINT =
-      UTF8BytesString.create("jakarta-ws-endpoint");
+    public static final CharSequence JAKARTA_WS_REQUEST = UTF8BytesString.create("jakarta-ws.request");
+    public static final CharSequence JAKARTA_WS_ENDPOINT = UTF8BytesString.create("jakarta-ws-endpoint");
 
-  private WebServiceDecorator() {}
+    private WebServiceDecorator() {}
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jakarta-ws"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jakarta-ws"};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.SOAP;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.SOAP;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return JAKARTA_WS_ENDPOINT;
-  }
+    @Override
+    protected CharSequence component() {
+        return JAKARTA_WS_ENDPOINT;
+    }
 
-  public void onJakartaWsSpan(final AgentSpan span, final Class<?> target, final String method) {
-    span.setResourceName(spanNameForMethod(target, method));
-  }
+    public void onJakartaWsSpan(final AgentSpan span, final Class<?> target, final String method) {
+        span.setResourceName(spanNameForMethod(target, method));
+    }
 }
diff --git a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java
index f6aebea9cbc..91c39e1a36a 100644
--- a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java
+++ b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java
@@ -28,70 +28,64 @@
 
 @AutoService(InstrumenterModule.class)
 public final class WebServiceInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
-  private static final String WEB_SERVICE_ANNOTATION_NAME = "jakarta.jws.WebService";
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    private static final String WEB_SERVICE_ANNOTATION_NAME = "jakarta.jws.WebService";
 
-  public WebServiceInstrumentation() {
-    super("jakarta-ws");
-  }
+    public WebServiceInstrumentation() {
+        super("jakarta-ws");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return hasSuperType(declaresAnnotation(named(WEB_SERVICE_ANNOTATION_NAME)));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return hasSuperType(declaresAnnotation(named(WEB_SERVICE_ANNOTATION_NAME)));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(not(isStatic()))
-            .and(
-                hasSuperMethod(
-                    isDeclaredBy(declaresAnnotation(named(WEB_SERVICE_ANNOTATION_NAME))))),
-        getClass().getName() + "$InvokeAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(not(isStatic()))
+                        .and(hasSuperMethod(isDeclaredBy(declaresAnnotation(named(WEB_SERVICE_ANNOTATION_NAME))))),
+                getClass().getName() + "$InvokeAdvice");
+    }
 
-  public static final class InvokeAdvice {
+    public static final class InvokeAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beginRequest(
-        @Advice.This Object thiz, @Advice.Origin("#m") String method) {
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(WebService.class);
-      if (callDepth > 0) {
-        return null;
-      }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beginRequest(@Advice.This Object thiz, @Advice.Origin("#m") String method) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(WebService.class);
+            if (callDepth > 0) {
+                return null;
+            }
 
-      AgentSpan span = startSpan("jakarta-ws-endpoint", JAKARTA_WS_REQUEST);
-      span.setMeasured(true);
-      DECORATE.onJakartaWsSpan(span, thiz.getClass(), method);
-      DECORATE.afterStart(span);
-      return activateSpan(span);
-    }
+            AgentSpan span = startSpan("jakarta-ws-endpoint", JAKARTA_WS_REQUEST);
+            span.setMeasured(true);
+            DECORATE.onJakartaWsSpan(span, thiz.getClass(), method);
+            DECORATE.afterStart(span);
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void finishRequest(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) {
-      if (null == scope) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void finishRequest(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) {
+            if (null == scope) {
+                return;
+            }
 
-      CallDepthThreadLocalMap.reset(WebService.class);
+            CallDepthThreadLocalMap.reset(WebService.class);
 
-      AgentSpan span = spanFromScope(scope);
-      if (null != error) {
-        DECORATE.onError(span, error);
-      }
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+            AgentSpan span = spanFromScope(scope);
+            if (null != error) {
+                DECORATE.onError(span, error);
+            }
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/test/java/TestService1.java b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/test/java/TestService1.java
index e46ca7e6b43..cc831c8e84a 100644
--- a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/test/java/TestService1.java
+++ b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/test/java/TestService1.java
@@ -2,5 +2,5 @@
 
 @WebService
 public interface TestService1 {
-  String send(String message);
+    String send(String message);
 }
diff --git a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/test/java/TestService1Impl.java b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/test/java/TestService1Impl.java
index d564aa3bc92..f9b3b98974b 100644
--- a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/test/java/TestService1Impl.java
+++ b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/test/java/TestService1Impl.java
@@ -1,13 +1,13 @@
 public class TestService1Impl implements TestService1 {
-  @Override
-  public String send(final String request) {
-    if ("fail".equals(request)) {
-      throw new IllegalArgumentException("bad request");
+    @Override
+    public String send(final String request) {
+        if ("fail".equals(request)) {
+            throw new IllegalArgumentException("bad request");
+        }
+        return random();
     }
-    return random();
-  }
 
-  public String random() {
-    return Double.toHexString(Math.random());
-  }
+    public String random() {
+        return Double.toHexString(Math.random());
+    }
 }
diff --git a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/test/java/TestService2.java b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/test/java/TestService2.java
index 3510db5c05c..f080fcc1c4e 100644
--- a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/test/java/TestService2.java
+++ b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/test/java/TestService2.java
@@ -2,14 +2,14 @@
 
 @WebService
 public class TestService2 {
-  public String send(final String request) {
-    if ("fail".equals(request)) {
-      throw new IllegalArgumentException("bad request");
+    public String send(final String request) {
+        if ("fail".equals(request)) {
+            throw new IllegalArgumentException("bad request");
+        }
+        return random();
     }
-    return random();
-  }
 
-  protected String random() {
-    return Double.toHexString(Math.random());
-  }
+    protected String random() {
+        return Double.toHexString(Math.random());
+    }
 }
diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceDecorator.java b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceDecorator.java
index f6aa1901c9d..127589055a3 100644
--- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceDecorator.java
+++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceDecorator.java
@@ -6,29 +6,29 @@
 import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;
 
 public class WebServiceDecorator extends BaseDecorator {
-  public static final WebServiceDecorator DECORATE = new WebServiceDecorator();
+    public static final WebServiceDecorator DECORATE = new WebServiceDecorator();
 
-  public static final CharSequence JAX_WS_REQUEST = UTF8BytesString.create("jax-ws.request");
-  public static final CharSequence JAX_WS_ENDPOINT = UTF8BytesString.create("jax-ws-endpoint");
+    public static final CharSequence JAX_WS_REQUEST = UTF8BytesString.create("jax-ws.request");
+    public static final CharSequence JAX_WS_ENDPOINT = UTF8BytesString.create("jax-ws-endpoint");
 
-  private WebServiceDecorator() {}
+    private WebServiceDecorator() {}
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jax-ws"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jax-ws"};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.SOAP;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.SOAP;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return JAX_WS_ENDPOINT;
-  }
+    @Override
+    protected CharSequence component() {
+        return JAX_WS_ENDPOINT;
+    }
 
-  public void onJaxWsSpan(final AgentSpan span, final Class<?> target, final String method) {
-    span.setResourceName(spanNameForMethod(target, method));
-  }
+    public void onJaxWsSpan(final AgentSpan span, final Class<?> target, final String method) {
+        span.setResourceName(spanNameForMethod(target, method));
+    }
 }
diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java
index 6b88d44bd31..772ba49302a 100644
--- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java
+++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java
@@ -28,70 +28,64 @@
 
 @AutoService(InstrumenterModule.class)
 public final class WebServiceInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
-  private static final String WEB_SERVICE_ANNOTATION_NAME = "javax.jws.WebService";
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    private static final String WEB_SERVICE_ANNOTATION_NAME = "javax.jws.WebService";
 
-  public WebServiceInstrumentation() {
-    super("jax-ws");
-  }
+    public WebServiceInstrumentation() {
+        super("jax-ws");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return hasSuperType(declaresAnnotation(named(WEB_SERVICE_ANNOTATION_NAME)));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return hasSuperType(declaresAnnotation(named(WEB_SERVICE_ANNOTATION_NAME)));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isPublic())
-            .and(not(isStatic()))
-            .and(
-                hasSuperMethod(
-                    isDeclaredBy(declaresAnnotation(named(WEB_SERVICE_ANNOTATION_NAME))))),
-        getClass().getName() + "$InvokeAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod()
+                        .and(isPublic())
+                        .and(not(isStatic()))
+                        .and(hasSuperMethod(isDeclaredBy(declaresAnnotation(named(WEB_SERVICE_ANNOTATION_NAME))))),
+                getClass().getName() + "$InvokeAdvice");
+    }
 
-  public static final class InvokeAdvice {
+    public static final class InvokeAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beginRequest(
-        @Advice.This Object thiz, @Advice.Origin("#m") String method) {
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(WebService.class);
-      if (callDepth > 0) {
-        return null;
-      }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beginRequest(@Advice.This Object thiz, @Advice.Origin("#m") String method) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(WebService.class);
+            if (callDepth > 0) {
+                return null;
+            }
 
-      AgentSpan span = startSpan("jax-ws-endpoint", JAX_WS_REQUEST);
-      span.setMeasured(true);
-      DECORATE.onJaxWsSpan(span, thiz.getClass(), method);
-      DECORATE.afterStart(span);
-      return activateSpan(span);
-    }
+            AgentSpan span = startSpan("jax-ws-endpoint", JAX_WS_REQUEST);
+            span.setMeasured(true);
+            DECORATE.onJaxWsSpan(span, thiz.getClass(), method);
+            DECORATE.afterStart(span);
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void finishRequest(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) {
-      if (null == scope) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void finishRequest(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) {
+            if (null == scope) {
+                return;
+            }
 
-      CallDepthThreadLocalMap.reset(WebService.class);
+            CallDepthThreadLocalMap.reset(WebService.class);
 
-      AgentSpan span = spanFromScope(scope);
-      if (null != error) {
-        DECORATE.onError(span, error);
-      }
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+            AgentSpan span = spanFromScope(scope);
+            if (null != error) {
+                DECORATE.onError(span, error);
+            }
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/test/java/TestService1.java b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/test/java/TestService1.java
index 299cc274d02..641497edcb9 100644
--- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/test/java/TestService1.java
+++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/test/java/TestService1.java
@@ -2,5 +2,5 @@
 
 @WebService
 public interface TestService1 {
-  String send(String message);
+    String send(String message);
 }
diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/test/java/TestService1Impl.java b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/test/java/TestService1Impl.java
index d564aa3bc92..f9b3b98974b 100644
--- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/test/java/TestService1Impl.java
+++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/test/java/TestService1Impl.java
@@ -1,13 +1,13 @@
 public class TestService1Impl implements TestService1 {
-  @Override
-  public String send(final String request) {
-    if ("fail".equals(request)) {
-      throw new IllegalArgumentException("bad request");
+    @Override
+    public String send(final String request) {
+        if ("fail".equals(request)) {
+            throw new IllegalArgumentException("bad request");
+        }
+        return random();
     }
-    return random();
-  }
 
-  public String random() {
-    return Double.toHexString(Math.random());
-  }
+    public String random() {
+        return Double.toHexString(Math.random());
+    }
 }
diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/test/java/TestService2.java b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/test/java/TestService2.java
index 33ebdce2dd4..be7900824e9 100644
--- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/test/java/TestService2.java
+++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/test/java/TestService2.java
@@ -2,14 +2,14 @@
 
 @WebService
 public class TestService2 {
-  public String send(final String request) {
-    if ("fail".equals(request)) {
-      throw new IllegalArgumentException("bad request");
+    public String send(final String request) {
+        if ("fail".equals(request)) {
+            throw new IllegalArgumentException("bad request");
+        }
+        return random();
     }
-    return random();
-  }
 
-  protected String random() {
-    return Double.toHexString(Math.random());
-  }
+    protected String random() {
+        return Double.toHexString(Math.random());
+    }
 }
diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderDecorator.java b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderDecorator.java
index 2e4106e5959..7b4c6a62167 100644
--- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderDecorator.java
+++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderDecorator.java
@@ -6,29 +6,29 @@
 import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;
 
 public class WebServiceProviderDecorator extends BaseDecorator {
-  public static final WebServiceProviderDecorator DECORATE = new WebServiceProviderDecorator();
+    public static final WebServiceProviderDecorator DECORATE = new WebServiceProviderDecorator();
 
-  public static final CharSequence JAX_WS_REQUEST = UTF8BytesString.create("jax-ws.request");
-  public static final CharSequence JAX_WS_ENDPOINT = UTF8BytesString.create("jax-ws-endpoint");
+    public static final CharSequence JAX_WS_REQUEST = UTF8BytesString.create("jax-ws.request");
+    public static final CharSequence JAX_WS_ENDPOINT = UTF8BytesString.create("jax-ws-endpoint");
 
-  private WebServiceProviderDecorator() {}
+    private WebServiceProviderDecorator() {}
 
-  @Override
-  protected String[] instrumentationNames() {
-    return new String[] {"jax-ws"};
-  }
+    @Override
+    protected String[] instrumentationNames() {
+        return new String[] {"jax-ws"};
+    }
 
-  @Override
-  protected CharSequence spanType() {
-    return InternalSpanTypes.SOAP;
-  }
+    @Override
+    protected CharSequence spanType() {
+        return InternalSpanTypes.SOAP;
+    }
 
-  @Override
-  protected CharSequence component() {
-    return JAX_WS_ENDPOINT;
-  }
+    @Override
+    protected CharSequence component() {
+        return JAX_WS_ENDPOINT;
+    }
 
-  public void onJaxWsSpan(final AgentSpan span, final Class<?> target, final String method) {
-    span.setResourceName(spanNameForMethod(target, method));
-  }
+    public void onJaxWsSpan(final AgentSpan span, final Class<?> target, final String method) {
+        span.setResourceName(spanNameForMethod(target, method));
+    }
 }
diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java
index ef7f2cb04c8..42d7a7fc584 100644
--- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java
+++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java
@@ -24,68 +24,63 @@
 
 @AutoService(InstrumenterModule.class)
 public final class WebServiceProviderInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForBootstrap,
-        Instrumenter.ForTypeHierarchy,
-        Instrumenter.HasMethodAdvice {
-  private static final String WEB_SERVICE_PROVIDER_INTERFACE_NAME = "javax.xml.ws.Provider";
-  private static final String WEB_SERVICE_PROVIDER_ANNOTATION_NAME =
-      "javax.xml.ws.WebServiceProvider";
+        implements Instrumenter.ForBootstrap, Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
+    private static final String WEB_SERVICE_PROVIDER_INTERFACE_NAME = "javax.xml.ws.Provider";
+    private static final String WEB_SERVICE_PROVIDER_ANNOTATION_NAME = "javax.xml.ws.WebServiceProvider";
 
-  public WebServiceProviderInstrumentation() {
-    super("jax-ws");
-  }
+    public WebServiceProviderInstrumentation() {
+        super("jax-ws");
+    }
 
-  @Override
-  public String hierarchyMarkerType() {
-    return null; // bootstrap type
-  }
+    @Override
+    public String hierarchyMarkerType() {
+        return null; // bootstrap type
+    }
 
-  @Override
-  public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return implementsInterface(named(WEB_SERVICE_PROVIDER_INTERFACE_NAME))
-        .and(declaresAnnotation(named(WEB_SERVICE_PROVIDER_ANNOTATION_NAME)));
-  }
+    @Override
+    public ElementMatcher<TypeDescription> hierarchyMatcher() {
+        return implementsInterface(named(WEB_SERVICE_PROVIDER_INTERFACE_NAME))
+                .and(declaresAnnotation(named(WEB_SERVICE_PROVIDER_ANNOTATION_NAME)));
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("invoke")).and(takesArguments(1)),
-        getClass().getName() + "$InvokeAdvice");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("invoke")).and(takesArguments(1)),
+                getClass().getName() + "$InvokeAdvice");
+    }
 
-  public static final class InvokeAdvice {
+    public static final class InvokeAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ContextScope beginRequest(
-        @Advice.This Object thiz, @Advice.Origin("#m") String method) {
-      final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(WebServiceProvider.class);
-      if (callDepth > 0) {
-        return null;
-      }
+        @Advice.OnMethodEnter(suppress = Throwable.class)
+        public static ContextScope beginRequest(@Advice.This Object thiz, @Advice.Origin("#m") String method) {
+            final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(WebServiceProvider.class);
+            if (callDepth > 0) {
+                return null;
+            }
 
-      AgentSpan span = startSpan("jax-ws-endpoint", JAX_WS_REQUEST);
-      span.setMeasured(true);
-      DECORATE.onJaxWsSpan(span, thiz.getClass(), method);
-      DECORATE.afterStart(span);
-      return activateSpan(span);
-    }
+            AgentSpan span = startSpan("jax-ws-endpoint", JAX_WS_REQUEST);
+            span.setMeasured(true);
+            DECORATE.onJaxWsSpan(span, thiz.getClass(), method);
+            DECORATE.afterStart(span);
+            return activateSpan(span);
+        }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void finishRequest(
-        @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) {
-      if (null == scope) {
-        return;
-      }
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void finishRequest(@Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) {
+            if (null == scope) {
+                return;
+            }
 
-      CallDepthThreadLocalMap.reset(WebServiceProvider.class);
+            CallDepthThreadLocalMap.reset(WebServiceProvider.class);
 
-      AgentSpan span = spanFromScope(scope);
-      if (null != error) {
-        DECORATE.onError(span, error);
-      }
-      DECORATE.beforeFinish(span);
-      scope.close();
-      span.finish();
+            AgentSpan span = spanFromScope(scope);
+            if (null != error) {
+                DECORATE.onError(span, error);
+            }
+            DECORATE.beforeFinish(span);
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/test/java/TestProvider.java b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/test/java/TestProvider.java
index 10839250690..774bb2c7a91 100644
--- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/test/java/TestProvider.java
+++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/test/java/TestProvider.java
@@ -3,15 +3,15 @@
 
 @WebServiceProvider
 public class TestProvider implements Provider<String> {
-  @Override
-  public String invoke(final String request) {
-    if ("fail".equals(request)) {
-      throw new IllegalArgumentException("bad request");
+    @Override
+    public String invoke(final String request) {
+        if ("fail".equals(request)) {
+            throw new IllegalArgumentException("bad request");
+        }
+        return random();
     }
-    return random();
-  }
 
-  protected String random() {
-    return Double.toHexString(Math.random());
-  }
+    protected String random() {
+        return Double.toHexString(Math.random());
+    }
 }
diff --git a/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/FiberContext.java b/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/FiberContext.java
index d423dca0d4a..a514ac85896 100644
--- a/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/FiberContext.java
+++ b/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/FiberContext.java
@@ -4,33 +4,33 @@
 import datadog.context.ContextContinuation;
 
 public class FiberContext {
-  private Context context;
-  private final ContextContinuation continuation;
+    private Context context;
+    private final ContextContinuation continuation;
 
-  private Context originalContext;
+    private Context originalContext;
 
-  public FiberContext() {
-    // record context to use for this coroutine
-    this.context = Context.current();
-    // stop enclosing trace from finishing early
-    this.continuation = this.context.capture();
-  }
+    public FiberContext() {
+        // record context to use for this coroutine
+        this.context = Context.current();
+        // stop enclosing trace from finishing early
+        this.continuation = this.context.capture();
+    }
 
-  public void onResume() {
-    originalContext = context.swap();
-  }
+    public void onResume() {
+        originalContext = context.swap();
+    }
 
-  public void onSuspend() {
-    if (originalContext != null) {
-      context = originalContext.swap();
-      originalContext = null;
+    public void onSuspend() {
+        if (originalContext != null) {
+            context = originalContext.swap();
+            originalContext = null;
+        }
     }
-  }
 
-  public void onEnd() {
-    if (continuation != null) {
-      // release enclosing trace now the fiber has ended
-      continuation.release();
+    public void onEnd() {
+        if (continuation != null) {
+            // release enclosing trace now the fiber has ended
+            continuation.release();
+        }
     }
-  }
 }
diff --git a/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/TracingSupervisor.java b/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/TracingSupervisor.java
index 3439fdc0a4b..b8eb904f5f9 100644
--- a/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/TracingSupervisor.java
+++ b/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/TracingSupervisor.java
@@ -13,46 +13,46 @@
 @SuppressWarnings("unchecked")
 public final class TracingSupervisor extends Supervisor<Object> {
 
-  @SuppressWarnings("rawtypes")
-  private final ContextStore<Fiber.Runtime, FiberContext> contextStore;
-
-  @SuppressWarnings("rawtypes")
-  public TracingSupervisor(ContextStore<Fiber.Runtime, FiberContext> contextStore) {
-    this.contextStore = contextStore;
-  }
-
-  @Override
-  @SuppressWarnings("rawtypes")
-  public ZIO value(Object trace) {
-    return ZIO$.MODULE$.unit();
-  }
-
-  @Override
-  public <R, E, A_> void onStart(
-      ZEnvironment<R> environment,
-      ZIO<R, E, A_> effect,
-      Option<Fiber.Runtime<Object, Object>> parent,
-      Fiber.Runtime<E, A_> fiber,
-      Unsafe unsafe) {
-    FiberContext context = new FiberContext();
-    contextStore.put(fiber, context);
-  }
-
-  @Override
-  public <R, E, A_> void onEnd(Exit<E, A_> value, Fiber.Runtime<E, A_> fiber, Unsafe unsafe) {
-    FiberContext context = contextStore.get(fiber);
-    if (context != null) context.onEnd();
-  }
-
-  @Override
-  public <E, A_> void onSuspend(Fiber.Runtime<E, A_> fiber, Unsafe unsafe) {
-    FiberContext context = contextStore.get(fiber);
-    if (context != null) context.onSuspend();
-  }
-
-  @Override
-  public <E, A_> void onResume(Fiber.Runtime<E, A_> fiber, Unsafe unsafe) {
-    FiberContext context = contextStore.get(fiber);
-    if (context != null) context.onResume();
-  }
+    @SuppressWarnings("rawtypes")
+    private final ContextStore<Fiber.Runtime, FiberContext> contextStore;
+
+    @SuppressWarnings("rawtypes")
+    public TracingSupervisor(ContextStore<Fiber.Runtime, FiberContext> contextStore) {
+        this.contextStore = contextStore;
+    }
+
+    @Override
+    @SuppressWarnings("rawtypes")
+    public ZIO value(Object trace) {
+        return ZIO$.MODULE$.unit();
+    }
+
+    @Override
+    public <R, E, A_> void onStart(
+            ZEnvironment<R> environment,
+            ZIO<R, E, A_> effect,
+            Option<Fiber.Runtime<Object, Object>> parent,
+            Fiber.Runtime<E, A_> fiber,
+            Unsafe unsafe) {
+        FiberContext context = new FiberContext();
+        contextStore.put(fiber, context);
+    }
+
+    @Override
+    public <R, E, A_> void onEnd(Exit<E, A_> value, Fiber.Runtime<E, A_> fiber, Unsafe unsafe) {
+        FiberContext context = contextStore.get(fiber);
+        if (context != null) context.onEnd();
+    }
+
+    @Override
+    public <E, A_> void onSuspend(Fiber.Runtime<E, A_> fiber, Unsafe unsafe) {
+        FiberContext context = contextStore.get(fiber);
+        if (context != null) context.onSuspend();
+    }
+
+    @Override
+    public <E, A_> void onResume(Fiber.Runtime<E, A_> fiber, Unsafe unsafe) {
+        FiberContext context = contextStore.get(fiber);
+        if (context != null) context.onResume();
+    }
 }
diff --git a/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/ZioRuntimeInstrumentation.java b/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/ZioRuntimeInstrumentation.java
index 6b5e25609a4..83d4b9c2ac4 100644
--- a/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/ZioRuntimeInstrumentation.java
+++ b/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/ZioRuntimeInstrumentation.java
@@ -20,46 +20,46 @@
 
 @AutoService(InstrumenterModule.class)
 public class ZioRuntimeInstrumentation extends InstrumenterModule.ContextTracking
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
 
-  public ZioRuntimeInstrumentation() {
-    super("zio.experimental");
-  }
+    public ZioRuntimeInstrumentation() {
+        super("zio.experimental");
+    }
 
-  @Override
-  public String instrumentedType() {
-    return "zio.Runtime$";
-  }
+    @Override
+    public String instrumentedType() {
+        return "zio.Runtime$";
+    }
 
-  @Override
-  protected final boolean defaultEnabled() {
-    return false;
-  }
+    @Override
+    protected final boolean defaultEnabled() {
+        return false;
+    }
 
-  @Override
-  public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod().and(named("defaultSupervisor")), getClass().getName() + "$DefaultSupervisor");
-  }
+    @Override
+    public void methodAdvice(MethodTransformer transformer) {
+        transformer.applyAdvice(
+                isMethod().and(named("defaultSupervisor")), getClass().getName() + "$DefaultSupervisor");
+    }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("zio.Fiber$Runtime", packageName + ".FiberContext");
-  }
+    @Override
+    public Map<String, String> contextStore() {
+        return singletonMap("zio.Fiber$Runtime", packageName + ".FiberContext");
+    }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    return Collections.singletonMap(
-        ExcludeFilter.ExcludeType.RUNNABLE, Collections.singletonList("zio.internal.FiberRuntime"));
-  }
+    @Override
+    public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+        return Collections.singletonMap(
+                ExcludeFilter.ExcludeType.RUNNABLE, Collections.singletonList("zio.internal.FiberRuntime"));
+    }
 
-  public static final class DefaultSupervisor {
-    @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(@Advice.Return(readOnly = false) Supervisor<?> supervisor) {
-      @SuppressWarnings("rawtypes")
-      ContextStore<Fiber.Runtime, FiberContext> contextStore =
-          InstrumentationContext.get(Fiber.Runtime.class, FiberContext.class);
-      supervisor = supervisor.$plus$plus(new TracingSupervisor(contextStore));
+    public static final class DefaultSupervisor {
+        @Advice.OnMethodExit(suppress = Throwable.class)
+        public static void onExit(@Advice.Return(readOnly = false) Supervisor<?> supervisor) {
+            @SuppressWarnings("rawtypes")
+            ContextStore<Fiber.Runtime, FiberContext> contextStore =
+                    InstrumentationContext.get(Fiber.Runtime.class, FiberContext.class);
+            supervisor = supervisor.$plus$plus(new TracingSupervisor(contextStore));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/load-generator/src/main/java/datadog/loadgenerator/LoadGenerator.java b/dd-java-agent/load-generator/src/main/java/datadog/loadgenerator/LoadGenerator.java
index 1c99672a3dd..fd8e6e46263 100644
--- a/dd-java-agent/load-generator/src/main/java/datadog/loadgenerator/LoadGenerator.java
+++ b/dd-java-agent/load-generator/src/main/java/datadog/loadgenerator/LoadGenerator.java
@@ -13,114 +13,112 @@
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
-@Command(
-    mixinStandardHelpOptions = true,
-    description = "Generates traces and spans at a specified rate")
+@Command(mixinStandardHelpOptions = true, description = "Generates traces and spans at a specified rate")
 public class LoadGenerator implements Callable<Integer> {
-  @Option(names = "--rate", required = true, description = "rate, per second, to generate traces")
-  private int rate;
-
-  @Option(
-      names = "--threads",
-      defaultValue = "6",
-      description = "Number of trace-generating threads (default: ${DEFAULT-VALUE})")
-  private int threads;
-
-  @Option(
-      names = "--width",
-      defaultValue = "2",
-      description = "Number of spans directly below the root (default: ${DEFAULT-VALUE})")
-  private int width;
-
-  @Option(
-      names = "--depth",
-      defaultValue = "3",
-      description = "Total spans deep per trace, including parent (default: ${DEFAULT-VALUE})")
-  private int depth;
-
-  @Option(
-      names = "--warmup",
-      defaultValue = "5",
-      description = "Time, in seconds, to ramp up to target rate (default: ${DEFAULT-VALUE})")
-  private int warmupPeriod;
-
-  @Option(
-      names = "--print-interval",
-      defaultValue = "20",
-      description = "Interval, in seconds, to print statistics (default: ${DEFAULT-VALUE})")
-  private int printInterval;
-
-  private RateLimiter rateLimiter;
-  private final AtomicLong tracesSent = new AtomicLong();
-
-  @Override
-  @SuppressForbidden
-  public Integer call() throws Exception {
-    rateLimiter = RateLimiter.create(rate, warmupPeriod, TimeUnit.SECONDS);
-
-    long intervalStart = System.currentTimeMillis();
-    long tracesAtLastReport = 0;
-
-    for (int i = 0; i < threads; i++) {
-      final Thread workerThread = new Thread(new Worker(), "Worker-" + i);
-      workerThread.setDaemon(true);
-      workerThread.start();
-    }
+    @Option(names = "--rate", required = true, description = "rate, per second, to generate traces")
+    private int rate;
+
+    @Option(
+            names = "--threads",
+            defaultValue = "6",
+            description = "Number of trace-generating threads (default: ${DEFAULT-VALUE})")
+    private int threads;
+
+    @Option(
+            names = "--width",
+            defaultValue = "2",
+            description = "Number of spans directly below the root (default: ${DEFAULT-VALUE})")
+    private int width;
+
+    @Option(
+            names = "--depth",
+            defaultValue = "3",
+            description = "Total spans deep per trace, including parent (default: ${DEFAULT-VALUE})")
+    private int depth;
+
+    @Option(
+            names = "--warmup",
+            defaultValue = "5",
+            description = "Time, in seconds, to ramp up to target rate (default: ${DEFAULT-VALUE})")
+    private int warmupPeriod;
+
+    @Option(
+            names = "--print-interval",
+            defaultValue = "20",
+            description = "Interval, in seconds, to print statistics (default: ${DEFAULT-VALUE})")
+    private int printInterval;
+
+    private RateLimiter rateLimiter;
+    private final AtomicLong tracesSent = new AtomicLong();
 
-    while (true) {
-      Thread.sleep(printInterval * 1000L);
+    @Override
+    @SuppressForbidden
+    public Integer call() throws Exception {
+        rateLimiter = RateLimiter.create(rate, warmupPeriod, TimeUnit.SECONDS);
 
-      final long currentTracesSent = tracesSent.get();
-      final long intervalEnd = System.currentTimeMillis();
+        long intervalStart = System.currentTimeMillis();
+        long tracesAtLastReport = 0;
 
-      final double currentRate =
-          (currentTracesSent - tracesAtLastReport) / ((intervalEnd - intervalStart) / 1000d);
+        for (int i = 0; i < threads; i++) {
+            final Thread workerThread = new Thread(new Worker(), "Worker-" + i);
+            workerThread.setDaemon(true);
+            workerThread.start();
+        }
 
-      System.out.println(
-          "Total Traces Sent: " + currentTracesSent + ", Rate this interval: " + currentRate);
-      intervalStart = System.currentTimeMillis();
-      tracesAtLastReport = currentTracesSent;
-    }
-  }
+        while (true) {
+            Thread.sleep(printInterval * 1000L);
 
-  public static void main(final String[] args) {
-    final int exitCode = new CommandLine(new LoadGenerator()).execute(args);
-    System.exit(exitCode);
-  }
+            final long currentTracesSent = tracesSent.get();
+            final long intervalEnd = System.currentTimeMillis();
 
-  private class Worker implements Runnable {
+            final double currentRate =
+                    (currentTracesSent - tracesAtLastReport) / ((intervalEnd - intervalStart) / 1000d);
 
-    @Override
-    public void run() {
-      final Tracer tracer = GlobalTracer.get();
-
-      while (true) {
-        rateLimiter.acquire();
-        final Span parent = tracer.buildSpan("parentSpan").start();
-
-        try (final Scope scope = tracer.activateSpan(parent)) {
-          for (int i = 0; i < width; i++) {
-            final Span widthSpan = tracer.buildSpan("span-" + i).start();
-            try (final Scope widthScope = tracer.activateSpan(widthSpan)) {
-              for (int j = 0; j < depth - 2; j++) {
-                final Span depthSpan = tracer.buildSpan("span-" + i + "-" + j).start();
-                try (final Scope depthScope = tracer.activateSpan(depthSpan)) {
-                  // do nothing.  Maybe sleep? but that will mean we need more threads to keep the
-                  // effective rate
+            System.out.println("Total Traces Sent: " + currentTracesSent + ", Rate this interval: " + currentRate);
+            intervalStart = System.currentTimeMillis();
+            tracesAtLastReport = currentTracesSent;
+        }
+    }
+
+    public static void main(final String[] args) {
+        final int exitCode = new CommandLine(new LoadGenerator()).execute(args);
+        System.exit(exitCode);
+    }
+
+    private class Worker implements Runnable {
+
+        @Override
+        public void run() {
+            final Tracer tracer = GlobalTracer.get();
+
+            while (true) {
+                rateLimiter.acquire();
+                final Span parent = tracer.buildSpan("parentSpan").start();
+
+                try (final Scope scope = tracer.activateSpan(parent)) {
+                    for (int i = 0; i < width; i++) {
+                        final Span widthSpan = tracer.buildSpan("span-" + i).start();
+                        try (final Scope widthScope = tracer.activateSpan(widthSpan)) {
+                            for (int j = 0; j < depth - 2; j++) {
+                                final Span depthSpan =
+                                        tracer.buildSpan("span-" + i + "-" + j).start();
+                                try (final Scope depthScope = tracer.activateSpan(depthSpan)) {
+                                    // do nothing.  Maybe sleep? but that will mean we need more threads to keep the
+                                    // effective rate
+                                } finally {
+                                    depthSpan.finish();
+                                }
+                            }
+                        } finally {
+                            widthSpan.finish();
+                        }
+                    }
                 } finally {
-                  depthSpan.finish();
+                    parent.finish();
                 }
-              }
-            } finally {
-              widthSpan.finish();
+
+                tracesSent.getAndIncrement();
             }
-          }
-        } finally {
-          parent.finish();
         }
-
-        tracesSent.getAndIncrement();
-      }
     }
-  }
 }
diff --git a/dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBootstrap.java b/dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBootstrap.java
index 0114503447c..9bc36d099b7 100644
--- a/dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBootstrap.java
+++ b/dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBootstrap.java
@@ -45,506 +45,495 @@
  * </ul>
  */
 public final class AgentBootstrap {
-  static final String LIB_INJECTION_ENABLED_ENV_VAR = "DD_INJECTION_ENABLED";
-  static final String LIB_INJECTION_FORCE_SYS_PROP = "dd.inject.force";
-  static final String LIB_INSTRUMENTATION_SOURCE_SYS_PROP = "dd.instrumentation.source";
+    static final String LIB_INJECTION_ENABLED_ENV_VAR = "DD_INJECTION_ENABLED";
+    static final String LIB_INJECTION_FORCE_SYS_PROP = "dd.inject.force";
+    static final String LIB_INSTRUMENTATION_SOURCE_SYS_PROP = "dd.instrumentation.source";
 
-  private static final Class<?> thisClass = AgentBootstrap.class;
-  private static final int MAX_EXCEPTION_CHAIN_LENGTH = 99;
-  private static final String JAVA_AGENT_ARGUMENT = "-javaagent:";
+    private static final Class<?> thisClass = AgentBootstrap.class;
+    private static final int MAX_EXCEPTION_CHAIN_LENGTH = 99;
+    private static final String JAVA_AGENT_ARGUMENT = "-javaagent:";
 
-  private static boolean initialized = false;
-  private static List<File> agentFiles = null;
+    private static boolean initialized = false;
+    private static List<File> agentFiles = null;
 
-  public static void premain(final String agentArgs, final Instrumentation inst) {
-    agentmain(agentArgs, inst);
-  }
+    public static void premain(final String agentArgs, final Instrumentation inst) {
+        agentmain(agentArgs, inst);
+    }
 
-  @SuppressForbidden
-  public static void agentmain(final String agentArgs, final Instrumentation inst) {
-    BootstrapInitializationTelemetry initTelemetry;
+    @SuppressForbidden
+    public static void agentmain(final String agentArgs, final Instrumentation inst) {
+        BootstrapInitializationTelemetry initTelemetry;
 
-    try {
-      initTelemetry = createInitializationTelemetry();
-    } catch (Throwable t) {
-      initTelemetry = BootstrapInitializationTelemetry.noOpInstance();
-    }
-    try {
-      agentmainImpl(initTelemetry, agentArgs, inst);
-    } catch (final Throwable ex) {
-      initTelemetry.onFatalError(ex);
-
-      if (exceptionCauseChainContains(
-          ex, "datadog.trace.util.throwable.FatalAgentMisconfigurationError")) {
-        throw new Error(ex);
-      }
-      // Don't rethrow.  We don't have a log manager here, so just print.
-      System.err.println("ERROR " + thisClass.getName());
-      ex.printStackTrace();
-    } finally {
-      try {
-        initTelemetry.finish();
-      } catch (Throwable t) {
-        // safeguard - ignore
-      }
+        try {
+            initTelemetry = createInitializationTelemetry();
+        } catch (Throwable t) {
+            initTelemetry = BootstrapInitializationTelemetry.noOpInstance();
+        }
+        try {
+            agentmainImpl(initTelemetry, agentArgs, inst);
+        } catch (final Throwable ex) {
+            initTelemetry.onFatalError(ex);
+
+            if (exceptionCauseChainContains(ex, "datadog.trace.util.throwable.FatalAgentMisconfigurationError")) {
+                throw new Error(ex);
+            }
+            // Don't rethrow.  We don't have a log manager here, so just print.
+            System.err.println("ERROR " + thisClass.getName());
+            ex.printStackTrace();
+        } finally {
+            try {
+                initTelemetry.finish();
+            } catch (Throwable t) {
+                // safeguard - ignore
+            }
+        }
     }
-  }
 
-  private static BootstrapInitializationTelemetry createInitializationTelemetry() {
-    String forwarderPath = EnvironmentVariables.get("DD_TELEMETRY_FORWARDER_PATH");
-    if (forwarderPath == null) {
-      return BootstrapInitializationTelemetry.noOpInstance();
-    }
+    private static BootstrapInitializationTelemetry createInitializationTelemetry() {
+        String forwarderPath = EnvironmentVariables.get("DD_TELEMETRY_FORWARDER_PATH");
+        if (forwarderPath == null) {
+            return BootstrapInitializationTelemetry.noOpInstance();
+        }
 
-    BootstrapInitializationTelemetry initTelemetry =
-        BootstrapInitializationTelemetry.createFromForwarderPath(forwarderPath);
-    initTelemetry.initMetaInfo("runtime_name", "jvm");
-    initTelemetry.initMetaInfo("language_name", "jvm");
+        BootstrapInitializationTelemetry initTelemetry =
+                BootstrapInitializationTelemetry.createFromForwarderPath(forwarderPath);
+        initTelemetry.initMetaInfo("runtime_name", "jvm");
+        initTelemetry.initMetaInfo("language_name", "jvm");
 
-    String javaVersion = SystemProperties.get("java.version");
-    if (javaVersion != null) {
-      initTelemetry.initMetaInfo("runtime_version", javaVersion);
-      initTelemetry.initMetaInfo("language_version", javaVersion);
-    }
+        String javaVersion = SystemProperties.get("java.version");
+        if (javaVersion != null) {
+            initTelemetry.initMetaInfo("runtime_version", javaVersion);
+            initTelemetry.initMetaInfo("language_version", javaVersion);
+        }
 
-    // If version was compiled into a class, then we wouldn't have the potential to be missing
-    // version info
-    String agentVersion = AgentJar.tryGetAgentVersion();
-    if (agentVersion != null) {
-      initTelemetry.initMetaInfo("tracer_version", agentVersion);
-    }
+        // If version was compiled into a class, then we wouldn't have the potential to be missing
+        // version info
+        String agentVersion = AgentJar.tryGetAgentVersion();
+        if (agentVersion != null) {
+            initTelemetry.initMetaInfo("tracer_version", agentVersion);
+        }
 
-    return initTelemetry;
-  }
-
-  private static void agentmainImpl(
-      final BootstrapInitializationTelemetry initTelemetry,
-      final String agentArgs,
-      final Instrumentation inst)
-      throws IOException, URISyntaxException, ReflectiveOperationException {
-    if (alreadyInitialized()) {
-      initTelemetry.onError("already_initialized");
-      // since tracer is presumably initialized elsewhere, still considering this complete
-      return;
-    }
-    if (isJdkTool()) {
-      initTelemetry.onAbort("jdk_tool");
-      return;
-    }
-    if (shouldAbortDueToOtherJavaAgents()) {
-      initTelemetry.onAbort("other-java-agents");
-      return;
+        return initTelemetry;
     }
 
-    if (getConfig(LIB_INJECTION_ENABLED_ENV_VAR)) {
-      recordInstrumentationSource("ssi");
-    } else {
-      recordInstrumentationSource("cmd_line");
+    private static void agentmainImpl(
+            final BootstrapInitializationTelemetry initTelemetry, final String agentArgs, final Instrumentation inst)
+            throws IOException, URISyntaxException, ReflectiveOperationException {
+        if (alreadyInitialized()) {
+            initTelemetry.onError("already_initialized");
+            // since tracer is presumably initialized elsewhere, still considering this complete
+            return;
+        }
+        if (isJdkTool()) {
+            initTelemetry.onAbort("jdk_tool");
+            return;
+        }
+        if (shouldAbortDueToOtherJavaAgents()) {
+            initTelemetry.onAbort("other-java-agents");
+            return;
+        }
+
+        if (getConfig(LIB_INJECTION_ENABLED_ENV_VAR)) {
+            recordInstrumentationSource("ssi");
+        } else {
+            recordInstrumentationSource("cmd_line");
+        }
+
+        String agentClassName;
+        if (isAotTraining(agentArgs, inst)) {
+            agentClassName = "datadog.trace.bootstrap.aot.TrainingAgent";
+        } else {
+            agentClassName = "datadog.trace.bootstrap.Agent";
+        }
+
+        final URL agentJarURL = installAgentJar(inst);
+        final Class<?> agentClass;
+        try {
+            agentClass = Class.forName(agentClassName, true, null);
+        } catch (ClassNotFoundException | LinkageError e) {
+            throw new IllegalStateException("Unable to load DD Java Agent.", e);
+        }
+        if (agentClass.getClassLoader() != null) {
+            throw new IllegalStateException("DD Java Agent NOT added to bootstrap classpath.");
+        }
+        try {
+            final Method startMethod =
+                    agentClass.getMethod("start", Object.class, Instrumentation.class, URL.class, String.class);
+            startMethod.invoke(null, initTelemetry, inst, agentJarURL, agentArgs);
+        } catch (Throwable e) {
+            throw new IllegalStateException("Unable to start DD Java Agent.", e);
+        }
     }
 
-    String agentClassName;
-    if (isAotTraining(agentArgs, inst)) {
-      agentClassName = "datadog.trace.bootstrap.aot.TrainingAgent";
-    } else {
-      agentClassName = "datadog.trace.bootstrap.Agent";
+    static boolean getConfig(String configName) {
+        switch (configName) {
+            case LIB_INJECTION_ENABLED_ENV_VAR:
+                return EnvironmentVariables.get(LIB_INJECTION_ENABLED_ENV_VAR) != null;
+            case LIB_INJECTION_FORCE_SYS_PROP: {
+                String envVarName = LIB_INJECTION_FORCE_SYS_PROP
+                        .replace('.', '_')
+                        .replace('-', '_')
+                        .toUpperCase();
+                String injectionForceFlag = EnvironmentVariables.get(envVarName);
+                if (injectionForceFlag == null) {
+                    injectionForceFlag = SystemProperties.get(LIB_INJECTION_FORCE_SYS_PROP);
+                }
+                return "true".equalsIgnoreCase(injectionForceFlag) || "1".equals(injectionForceFlag);
+            }
+            default:
+                return false;
+        }
     }
 
-    final URL agentJarURL = installAgentJar(inst);
-    final Class<?> agentClass;
-    try {
-      agentClass = Class.forName(agentClassName, true, null);
-    } catch (ClassNotFoundException | LinkageError e) {
-      throw new IllegalStateException("Unable to load DD Java Agent.", e);
+    private static void recordInstrumentationSource(String source) {
+        SystemProperties.set(LIB_INSTRUMENTATION_SOURCE_SYS_PROP, source);
     }
-    if (agentClass.getClassLoader() != null) {
-      throw new IllegalStateException("DD Java Agent NOT added to bootstrap classpath.");
+
+    static boolean exceptionCauseChainContains(Throwable ex, String exClassName) {
+        Set<Throwable> stack = Collections.newSetFromMap(new IdentityHashMap<>());
+        Throwable t = ex;
+        while (t != null && stack.add(t) && stack.size() <= MAX_EXCEPTION_CHAIN_LENGTH) {
+            // cannot do an instanceof check since most of the agent's code is loaded by an isolated CL
+            if (t.getClass().getName().equals(exClassName)) {
+                return true;
+            }
+            t = t.getCause();
+        }
+        return false;
     }
-    try {
-      final Method startMethod =
-          agentClass.getMethod(
-              "start", Object.class, Instrumentation.class, URL.class, String.class);
-      startMethod.invoke(null, initTelemetry, inst, agentJarURL, agentArgs);
-    } catch (Throwable e) {
-      throw new IllegalStateException("Unable to start DD Java Agent.", e);
+
+    @SuppressForbidden
+    private static boolean alreadyInitialized() {
+        if (initialized) {
+            System.err.println(
+                    "Warning: dd-java-agent is being initialized more than once. Please check that you are defining -javaagent:dd-java-agent.jar only once.");
+            return true;
+        }
+        initialized = true;
+        return false;
     }
-  }
-
-  static boolean getConfig(String configName) {
-    switch (configName) {
-      case LIB_INJECTION_ENABLED_ENV_VAR:
-        return EnvironmentVariables.get(LIB_INJECTION_ENABLED_ENV_VAR) != null;
-      case LIB_INJECTION_FORCE_SYS_PROP:
-        {
-          String envVarName =
-              LIB_INJECTION_FORCE_SYS_PROP.replace('.', '_').replace('-', '_').toUpperCase();
-          String injectionForceFlag = EnvironmentVariables.get(envVarName);
-          if (injectionForceFlag == null) {
-            injectionForceFlag = SystemProperties.get(LIB_INJECTION_FORCE_SYS_PROP);
-          }
-          return "true".equalsIgnoreCase(injectionForceFlag) || "1".equals(injectionForceFlag);
+
+    /**
+     * Returns {@code true} if the JVM is running a JDK diagnostic/development tool rather than a user
+     * application, in which case the agent should abort early.
+     *
+     * <p><b>How to discover new entries when a tool is missed:</b>
+     *
+     * <ol>
+     *   <li>Build a minimal javaagent JAR whose {@code premain} prints {@code
+     *       System.getProperty("jdk.module.main")} and {@code System.getProperty("sun.java.command")}
+     *       then calls {@code System.exit(0)}.
+     *   <li>For <b>JDK 9+ tools</b>, inject it via {@code JAVA_TOOL_OPTIONS}:
+     *       <pre>JAVA_TOOL_OPTIONS="-javaagent:/path/to/agent.jar" $JAVA_HOME/bin/&lt;tool&gt;</pre>
+     *       The value of {@code jdk.module.main} is the module name to add to the first switch.
+     *   <li>For <b>JDK 8 tools</b> (or non-modular IBM/OpenJ9 tools), inject the same way; the value
+     *       of {@code sun.java.command} (up to the first space) is the main-class name to add to the
+     *       second switch.
+     * </ol>
+     *
+     * <p>Native binaries (e.g. {@code jitserver}, {@code asprof}) report both properties as {@code
+     * null} and are automatically ignored — no switch entry needed for them.
+     */
+    static boolean isJdkTool() {
+        String moduleMain = SystemProperties.get("jdk.module.main");
+        if (null != moduleMain && !moduleMain.isEmpty()) {
+            char firstChar = moduleMain.charAt(0);
+            if (firstChar == 'j') {
+                // Standard JDK 9+ module-based tools (module names start with 'java.' or 'jdk.')
+                switch (moduleMain) {
+                    case "java.base": // keytool
+                    case "java.corba":
+                    case "java.desktop":
+                    case "java.rmi":
+                    case "java.scripting":
+                    case "java.security.jgss":
+                    case "jdk.aot":
+                    case "jdk.compiler":
+                    case "jdk.dev":
+                    case "jdk.hotspot.agent":
+                    case "jdk.httpserver":
+                    case "jdk.jartool":
+                    case "jdk.javadoc":
+                    case "jdk.jcmd":
+                    case "jdk.jconsole":
+                    case "jdk.jdeps":
+                    case "jdk.jdi":
+                    case "jdk.jfr":
+                    case "jdk.jlink":
+                    case "jdk.jpackage":
+                    case "jdk.jshell":
+                    case "jdk.jstatd":
+                    case "jdk.jvmstat.rmi":
+                    case "jdk.pack":
+                    case "jdk.pack200":
+                    case "jdk.policytool":
+                    case "jdk.rmic":
+                    case "jdk.scripting.nashorn.shell":
+                    case "jdk.xml.bind":
+                    case "jdk.xml.ws":
+                        return true;
+                }
+            } else if (firstChar == 'o') {
+                // OpenJ9 / Semeru 11+ module-based tools (module names start with 'openj9.')
+                switch (moduleMain) {
+                    case "openj9.dtfj": // jextract, jpackcore
+                    case "openj9.dtfjview": // jdmpview
+                    case "openj9.traceformat": // traceformat
+                        return true;
+                }
+            }
+        }
+        // Handles JDK 8 tools (IBM J9 and standard JDK 8 vendors)
+        // jdk.module.main is only set for JDK 9+ module-based tools (already handled above)
+        String command = SystemProperties.get("sun.java.command");
+        if (null != command && !command.isEmpty()) {
+            // substring on first space
+            int firstSpace = command.indexOf(' ');
+            String mainClass = firstSpace > 0 ? command.substring(0, firstSpace) : command;
+            switch (mainClass) {
+                // IBM J9 JDK 8 specific tool main classes
+                case "com.ibm.crypto.tools.KeyTool": // keytool
+                case "com.ibm.security.krb5.internal.tools.Kinit": // kinit
+                case "com.ibm.security.krb5.internal.tools.Klist": // klist
+                case "com.ibm.security.krb5.internal.tools.Ktab": // ktab
+                case "com.ibm.jvm.dtfjview.DTFJView": // jdmpview
+                case "com.ibm.jvm.j9.dump.extract.Main": // jextract
+                case "com.ibm.gsk.ikeyman.Ikeyman": // ikeyman
+                case "com.ibm.gsk.ikeyman.ikeycmd": // ikeycmd
+                case "com.ibm.CosNaming.TransientNameServer": // tnameserv
+                case "com.ibm.idl.toJavaPortable.Compile": // idlj
+                // OpenJ9 / Semeru 8 specific tool main classes (OpenJ9 reimplementation of HotSpot tools)
+                case "openj9.tools.attach.diagnostics.tools.Jcmd": // jcmd
+                case "openj9.tools.attach.diagnostics.tools.Jps": // jps
+                case "openj9.tools.attach.diagnostics.tools.Jstat": // jstat
+                case "openj9.tools.attach.diagnostics.tools.Jmap": // jmap
+                case "openj9.tools.attach.diagnostics.tools.Jstack": // jstack
+                case "com.ibm.jvm.TraceFormat": // traceformat
+                // Standard JDK 8 tool main classes (shared by IBM J9 and Oracle/OpenJDK 8)
+                case "sun.tools.jar.Main": // jar
+                case "com.sun.tools.javac.Main": // javac
+                case "com.sun.tools.javadoc.Main": // javadoc
+                case "com.sun.tools.javap.Main": // javap
+                case "com.sun.tools.javah.Main": // javah
+                case "sun.security.tools.keytool.Main": // keytool (Oracle/OpenJDK 8)
+                case "sun.security.tools.jarsigner.Main": // jarsigner
+                case "sun.security.tools.policytool.PolicyTool": // policytool
+                case "com.sun.tools.example.debug.tty.TTY": // jdb
+                case "com.sun.tools.jdeps.Main": // jdeps
+                case "sun.rmi.rmic.Main": // rmic
+                case "sun.rmi.registry.RegistryImpl": // rmiregistry
+                case "sun.rmi.server.Activation": // rmid
+                case "com.sun.tools.extcheck.Main": // extcheck
+                case "sun.tools.serialver.SerialVer": // serialver
+                case "sun.tools.native2ascii.Main": // native2ascii
+                case "com.sun.tools.internal.ws.WsGen": // wsgen
+                case "com.sun.tools.internal.ws.WsImport": // wsimport
+                case "com.sun.tools.internal.xjc.Driver": // xjc
+                case "com.sun.tools.internal.jxc.SchemaGenerator": // schemagen
+                case "com.sun.tools.script.shell.Main": // jrunscript
+                case "jdk.nashorn.tools.Shell": // jjs (Nashorn JS shell, JDK 8)
+                case "sun.tools.jconsole.JConsole": // jconsole
+                case "sun.applet.Main": // appletviewer
+                case "com.sun.corba.se.impl.naming.cosnaming.TransientNameServer": // tnameserv
+                // (Oracle/OpenJDK 8)
+                case "com.sun.tools.corba.se.idl.toJavaPortable.Compile": // idlj (Oracle/OpenJDK 8)
+                case "com.sun.corba.se.impl.activation.ORBD": // orbd
+                case "com.sun.corba.se.impl.activation.ServerTool": // servertool
+                case "sun.tools.jps.Jps": // jps
+                case "sun.tools.jstack.JStack": // jstack
+                case "sun.tools.jmap.JMap": // jmap
+                case "sun.tools.jinfo.JInfo": // jinfo
+                case "com.sun.tools.hat.Main": // jhat
+                case "sun.tools.jstat.Jstat": // jstat
+                case "sun.tools.jstatd.Jstatd": // jstatd
+                case "sun.tools.jcmd.JCmd": // jcmd
+                case "jdk.jfr.internal.tool.Main": // jfr, backported to OpenJDK 8 in 8u262 (JEP 328
+                // backport, July 2020)
+                case "sun.jvm.hotspot.jdi.SADebugServer": // jsadebugd
+                case "sun.jvm.hotspot.HSDB": // hsdb (HotSpot SA GUI debugger, JDK 8)
+                case "sun.jvm.hotspot.CLHSDB": // clhsdb (HotSpot SA command-line debugger, JDK 8)
+                    return true;
+            }
         }
-      default:
         return false;
     }
-  }
-
-  private static void recordInstrumentationSource(String source) {
-    SystemProperties.set(LIB_INSTRUMENTATION_SOURCE_SYS_PROP, source);
-  }
-
-  static boolean exceptionCauseChainContains(Throwable ex, String exClassName) {
-    Set<Throwable> stack = Collections.newSetFromMap(new IdentityHashMap<>());
-    Throwable t = ex;
-    while (t != null && stack.add(t) && stack.size() <= MAX_EXCEPTION_CHAIN_LENGTH) {
-      // cannot do an instanceof check since most of the agent's code is loaded by an isolated CL
-      if (t.getClass().getName().equals(exClassName)) {
+
+    @SuppressForbidden
+    static boolean shouldAbortDueToOtherJavaAgents() {
+        // We don't abort if either
+        // * We are not using SSI
+        // * Injection is forced
+        // * There is only one agent
+        if (!getConfig(LIB_INJECTION_ENABLED_ENV_VAR)
+                || getConfig(LIB_INJECTION_FORCE_SYS_PROP)
+                || getAgentFilesFromVMArguments().size() <= 1) {
+            return false;
+        }
+
+        // If there are 2 agents and one of them is for patching log4j, it's fine
+        if (getAgentFilesFromVMArguments().size() == 2) {
+            for (File agentFile : getAgentFilesFromVMArguments()) {
+                if (agentFile.getName().toLowerCase().contains("log4j")) {
+                    return false;
+                }
+            }
+        }
+
+        // Simply considering having multiple agents
+        // Formatting agent file list, Java 7 style
+        StringBuilder agentFiles = new StringBuilder();
+        boolean first = true;
+        for (File agentFile : getAgentFilesFromVMArguments()) {
+            if (first) {
+                first = false;
+            } else {
+                agentFiles.append(", ");
+            }
+            agentFiles.append('"');
+            agentFiles.append(agentFile.getAbsolutePath());
+            agentFiles.append('"');
+        }
+        System.err.println(
+                "Info: multiple JVM agents detected, found "
+                        + agentFiles
+                        + ". Loading multiple APM/Tracing agent is not a recommended or supported configuration."
+                        + "Please set the environment variable DD_INJECT_FORCE or the system property dd.inject.force to TRUE to load Datadog APM/Tracing agent.");
         return true;
-      }
-      t = t.getCause();
     }
-    return false;
-  }
-
-  @SuppressForbidden
-  private static boolean alreadyInitialized() {
-    if (initialized) {
-      System.err.println(
-          "Warning: dd-java-agent is being initialized more than once. Please check that you are defining -javaagent:dd-java-agent.jar only once.");
-      return true;
+
+    public static void main(final String[] args) {
+        AgentJar.main(args);
     }
-    initialized = true;
-    return false;
-  }
-
-  /**
-   * Returns {@code true} if the JVM is running a JDK diagnostic/development tool rather than a user
-   * application, in which case the agent should abort early.
-   *
-   * <p><b>How to discover new entries when a tool is missed:</b>
-   *
-   * <ol>
-   *   <li>Build a minimal javaagent JAR whose {@code premain} prints {@code
-   *       System.getProperty("jdk.module.main")} and {@code System.getProperty("sun.java.command")}
-   *       then calls {@code System.exit(0)}.
-   *   <li>For <b>JDK 9+ tools</b>, inject it via {@code JAVA_TOOL_OPTIONS}:
-   *       <pre>JAVA_TOOL_OPTIONS="-javaagent:/path/to/agent.jar" $JAVA_HOME/bin/&lt;tool&gt;</pre>
-   *       The value of {@code jdk.module.main} is the module name to add to the first switch.
-   *   <li>For <b>JDK 8 tools</b> (or non-modular IBM/OpenJ9 tools), inject the same way; the value
-   *       of {@code sun.java.command} (up to the first space) is the main-class name to add to the
-   *       second switch.
-   * </ol>
-   *
-   * <p>Native binaries (e.g. {@code jitserver}, {@code asprof}) report both properties as {@code
-   * null} and are automatically ignored — no switch entry needed for them.
-   */
-  static boolean isJdkTool() {
-    String moduleMain = SystemProperties.get("jdk.module.main");
-    if (null != moduleMain && !moduleMain.isEmpty()) {
-      char firstChar = moduleMain.charAt(0);
-      if (firstChar == 'j') {
-        // Standard JDK 9+ module-based tools (module names start with 'java.' or 'jdk.')
-        switch (moduleMain) {
-          case "java.base": // keytool
-          case "java.corba":
-          case "java.desktop":
-          case "java.rmi":
-          case "java.scripting":
-          case "java.security.jgss":
-          case "jdk.aot":
-          case "jdk.compiler":
-          case "jdk.dev":
-          case "jdk.hotspot.agent":
-          case "jdk.httpserver":
-          case "jdk.jartool":
-          case "jdk.javadoc":
-          case "jdk.jcmd":
-          case "jdk.jconsole":
-          case "jdk.jdeps":
-          case "jdk.jdi":
-          case "jdk.jfr":
-          case "jdk.jlink":
-          case "jdk.jpackage":
-          case "jdk.jshell":
-          case "jdk.jstatd":
-          case "jdk.jvmstat.rmi":
-          case "jdk.pack":
-          case "jdk.pack200":
-          case "jdk.policytool":
-          case "jdk.rmic":
-          case "jdk.scripting.nashorn.shell":
-          case "jdk.xml.bind":
-          case "jdk.xml.ws":
-            return true;
+
+    @SuppressForbidden
+    private static synchronized URL installAgentJar(final Instrumentation inst) throws IOException, URISyntaxException {
+        // First try Code Source
+        final CodeSource codeSource = thisClass.getProtectionDomain().getCodeSource();
+        if (codeSource != null) {
+            URL ddJavaAgentJarURL = codeSource.getLocation();
+            if (ddJavaAgentJarURL != null) {
+                final File ddJavaAgentJarPath = new File(ddJavaAgentJarURL.toURI());
+
+                if (!ddJavaAgentJarPath.isDirectory()) {
+                    return appendAgentToBootstrapClassLoaderSearch(inst, ddJavaAgentJarURL, ddJavaAgentJarPath);
+                }
+            }
         }
-      } else if (firstChar == 'o') {
-        // OpenJ9 / Semeru 11+ module-based tools (module names start with 'openj9.')
-        switch (moduleMain) {
-          case "openj9.dtfj": // jextract, jpackcore
-          case "openj9.dtfjview": // jdmpview
-          case "openj9.traceformat": // traceformat
-            return true;
+
+        System.err.println("Could not get bootstrap jar from code source, using -javaagent arg");
+        File javaagentFile = getAgentFileFromJavaagentArg(getAgentFilesFromVMArguments());
+        if (javaagentFile != null) {
+            URL ddJavaAgentJarURL = javaagentFile.toURI().toURL();
+            return appendAgentToBootstrapClassLoaderSearch(inst, ddJavaAgentJarURL, javaagentFile);
         }
-      }
-    }
-    // Handles JDK 8 tools (IBM J9 and standard JDK 8 vendors)
-    // jdk.module.main is only set for JDK 9+ module-based tools (already handled above)
-    String command = SystemProperties.get("sun.java.command");
-    if (null != command && !command.isEmpty()) {
-      // substring on first space
-      int firstSpace = command.indexOf(' ');
-      String mainClass = firstSpace > 0 ? command.substring(0, firstSpace) : command;
-      switch (mainClass) {
-        // IBM J9 JDK 8 specific tool main classes
-        case "com.ibm.crypto.tools.KeyTool": // keytool
-        case "com.ibm.security.krb5.internal.tools.Kinit": // kinit
-        case "com.ibm.security.krb5.internal.tools.Klist": // klist
-        case "com.ibm.security.krb5.internal.tools.Ktab": // ktab
-        case "com.ibm.jvm.dtfjview.DTFJView": // jdmpview
-        case "com.ibm.jvm.j9.dump.extract.Main": // jextract
-        case "com.ibm.gsk.ikeyman.Ikeyman": // ikeyman
-        case "com.ibm.gsk.ikeyman.ikeycmd": // ikeycmd
-        case "com.ibm.CosNaming.TransientNameServer": // tnameserv
-        case "com.ibm.idl.toJavaPortable.Compile": // idlj
-        // OpenJ9 / Semeru 8 specific tool main classes (OpenJ9 reimplementation of HotSpot tools)
-        case "openj9.tools.attach.diagnostics.tools.Jcmd": // jcmd
-        case "openj9.tools.attach.diagnostics.tools.Jps": // jps
-        case "openj9.tools.attach.diagnostics.tools.Jstat": // jstat
-        case "openj9.tools.attach.diagnostics.tools.Jmap": // jmap
-        case "openj9.tools.attach.diagnostics.tools.Jstack": // jstack
-        case "com.ibm.jvm.TraceFormat": // traceformat
-        // Standard JDK 8 tool main classes (shared by IBM J9 and Oracle/OpenJDK 8)
-        case "sun.tools.jar.Main": // jar
-        case "com.sun.tools.javac.Main": // javac
-        case "com.sun.tools.javadoc.Main": // javadoc
-        case "com.sun.tools.javap.Main": // javap
-        case "com.sun.tools.javah.Main": // javah
-        case "sun.security.tools.keytool.Main": // keytool (Oracle/OpenJDK 8)
-        case "sun.security.tools.jarsigner.Main": // jarsigner
-        case "sun.security.tools.policytool.PolicyTool": // policytool
-        case "com.sun.tools.example.debug.tty.TTY": // jdb
-        case "com.sun.tools.jdeps.Main": // jdeps
-        case "sun.rmi.rmic.Main": // rmic
-        case "sun.rmi.registry.RegistryImpl": // rmiregistry
-        case "sun.rmi.server.Activation": // rmid
-        case "com.sun.tools.extcheck.Main": // extcheck
-        case "sun.tools.serialver.SerialVer": // serialver
-        case "sun.tools.native2ascii.Main": // native2ascii
-        case "com.sun.tools.internal.ws.WsGen": // wsgen
-        case "com.sun.tools.internal.ws.WsImport": // wsimport
-        case "com.sun.tools.internal.xjc.Driver": // xjc
-        case "com.sun.tools.internal.jxc.SchemaGenerator": // schemagen
-        case "com.sun.tools.script.shell.Main": // jrunscript
-        case "jdk.nashorn.tools.Shell": // jjs (Nashorn JS shell, JDK 8)
-        case "sun.tools.jconsole.JConsole": // jconsole
-        case "sun.applet.Main": // appletviewer
-        case "com.sun.corba.se.impl.naming.cosnaming.TransientNameServer": // tnameserv
-        // (Oracle/OpenJDK 8)
-        case "com.sun.tools.corba.se.idl.toJavaPortable.Compile": // idlj (Oracle/OpenJDK 8)
-        case "com.sun.corba.se.impl.activation.ORBD": // orbd
-        case "com.sun.corba.se.impl.activation.ServerTool": // servertool
-        case "sun.tools.jps.Jps": // jps
-        case "sun.tools.jstack.JStack": // jstack
-        case "sun.tools.jmap.JMap": // jmap
-        case "sun.tools.jinfo.JInfo": // jinfo
-        case "com.sun.tools.hat.Main": // jhat
-        case "sun.tools.jstat.Jstat": // jstat
-        case "sun.tools.jstatd.Jstatd": // jstatd
-        case "sun.tools.jcmd.JCmd": // jcmd
-        case "jdk.jfr.internal.tool.Main": // jfr, backported to OpenJDK 8 in 8u262 (JEP 328
-        // backport, July 2020)
-        case "sun.jvm.hotspot.jdi.SADebugServer": // jsadebugd
-        case "sun.jvm.hotspot.HSDB": // hsdb (HotSpot SA GUI debugger, JDK 8)
-        case "sun.jvm.hotspot.CLHSDB": // clhsdb (HotSpot SA command-line debugger, JDK 8)
-          return true;
-      }
-    }
-    return false;
-  }
-
-  @SuppressForbidden
-  static boolean shouldAbortDueToOtherJavaAgents() {
-    // We don't abort if either
-    // * We are not using SSI
-    // * Injection is forced
-    // * There is only one agent
-    if (!getConfig(LIB_INJECTION_ENABLED_ENV_VAR)
-        || getConfig(LIB_INJECTION_FORCE_SYS_PROP)
-        || getAgentFilesFromVMArguments().size() <= 1) {
-      return false;
-    }
 
-    // If there are 2 agents and one of them is for patching log4j, it's fine
-    if (getAgentFilesFromVMArguments().size() == 2) {
-      for (File agentFile : getAgentFilesFromVMArguments()) {
-        if (agentFile.getName().toLowerCase().contains("log4j")) {
-          return false;
+        System.err.println("Could not get agent jar from -javaagent arg, using ClassLoader#getResource");
+        javaagentFile = getAgentFileUsingClassLoaderLookup();
+        if (!javaagentFile.isDirectory()) {
+            URL ddJavaAgentJarURL = javaagentFile.toURI().toURL();
+            return appendAgentToBootstrapClassLoaderSearch(inst, ddJavaAgentJarURL, javaagentFile);
         }
-      }
+
+        throw new IllegalStateException("Could not determine agent jar location, not installing tracing agent");
     }
 
-    // Simply considering having multiple agents
-    // Formatting agent file list, Java 7 style
-    StringBuilder agentFiles = new StringBuilder();
-    boolean first = true;
-    for (File agentFile : getAgentFilesFromVMArguments()) {
-      if (first) {
-        first = false;
-      } else {
-        agentFiles.append(", ");
-      }
-      agentFiles.append('"');
-      agentFiles.append(agentFile.getAbsolutePath());
-      agentFiles.append('"');
+    private static URL appendAgentToBootstrapClassLoaderSearch(
+            Instrumentation inst, URL ddJavaAgentJarURL, File javaagentFile) throws IOException {
+        checkJarManifestMainClassIsThis(ddJavaAgentJarURL);
+        inst.appendToBootstrapClassLoaderSearch(new JarFile(javaagentFile));
+        return ddJavaAgentJarURL;
     }
-    System.err.println(
-        "Info: multiple JVM agents detected, found "
-            + agentFiles
-            + ". Loading multiple APM/Tracing agent is not a recommended or supported configuration."
-            + "Please set the environment variable DD_INJECT_FORCE or the system property dd.inject.force to TRUE to load Datadog APM/Tracing agent.");
-    return true;
-  }
-
-  public static void main(final String[] args) {
-    AgentJar.main(args);
-  }
-
-  @SuppressForbidden
-  private static synchronized URL installAgentJar(final Instrumentation inst)
-      throws IOException, URISyntaxException {
-    // First try Code Source
-    final CodeSource codeSource = thisClass.getProtectionDomain().getCodeSource();
-    if (codeSource != null) {
-      URL ddJavaAgentJarURL = codeSource.getLocation();
-      if (ddJavaAgentJarURL != null) {
-        final File ddJavaAgentJarPath = new File(ddJavaAgentJarURL.toURI());
-
-        if (!ddJavaAgentJarPath.isDirectory()) {
-          return appendAgentToBootstrapClassLoaderSearch(
-              inst, ddJavaAgentJarURL, ddJavaAgentJarPath);
+
+    @SuppressForbidden
+    private static File getAgentFileFromJavaagentArg(List<File> agentFiles) {
+        if (agentFiles.isEmpty()) {
+            System.err.println("Could not get bootstrap jar from -javaagent arg: no argument specified");
+            return null;
+        } else if (agentFiles.size() > 1) {
+            System.err.println("Could not get bootstrap jar from -javaagent arg: multiple javaagents specified");
+            return null;
+        } else {
+            return agentFiles.get(0);
         }
-      }
     }
 
-    System.err.println("Could not get bootstrap jar from code source, using -javaagent arg");
-    File javaagentFile = getAgentFileFromJavaagentArg(getAgentFilesFromVMArguments());
-    if (javaagentFile != null) {
-      URL ddJavaAgentJarURL = javaagentFile.toURI().toURL();
-      return appendAgentToBootstrapClassLoaderSearch(inst, ddJavaAgentJarURL, javaagentFile);
+    @SuppressForbidden
+    private static List<File> getAgentFilesFromVMArguments() {
+        if (agentFiles == null) {
+            agentFiles = new ArrayList<>();
+            // ManagementFactory indirectly references java.util.logging.LogManager
+            // - On Oracle-based JDKs after 1.8
+            // - On IBM-based JDKs since at least 1.7
+            // This prevents custom log managers from working correctly
+            // Use reflection to bypass the loading of the class~
+            for (final String argument : JavaVirtualMachine.getVmOptions()) {
+                if (argument.startsWith(JAVA_AGENT_ARGUMENT)) {
+                    int index = argument.indexOf('=', JAVA_AGENT_ARGUMENT.length());
+                    String agentPathname =
+                            argument.substring(JAVA_AGENT_ARGUMENT.length(), index == -1 ? argument.length() : index);
+                    File agentFile = new File(agentPathname);
+                    if (agentFile.exists() && agentFile.isFile()) {
+                        agentFiles.add(agentFile);
+                    } else {
+                        System.err.println(
+                                "Could not get bootstrap jar from -javaagent arg: unable to find javaagent file: "
+                                        + agentFile);
+                    }
+                }
+            }
+        }
+        return agentFiles;
     }
 
-    System.err.println(
-        "Could not get agent jar from -javaagent arg, using ClassLoader#getResource");
-    javaagentFile = getAgentFileUsingClassLoaderLookup();
-    if (!javaagentFile.isDirectory()) {
-      URL ddJavaAgentJarURL = javaagentFile.toURI().toURL();
-      return appendAgentToBootstrapClassLoaderSearch(inst, ddJavaAgentJarURL, javaagentFile);
-    }
+    @SuppressForbidden
+    private static File getAgentFileUsingClassLoaderLookup() throws URISyntaxException {
+        File javaagentFile;
+        URL thisClassUrl;
+        String thisClassResourceName = thisClass.getName().replace('.', '/') + ".class";
+        ClassLoader classLoader = thisClass.getClassLoader();
+        if (classLoader == null) {
+            thisClassUrl = ClassLoader.getSystemResource(thisClassResourceName);
+        } else {
+            thisClassUrl = classLoader.getResource(thisClassResourceName);
+        }
 
-    throw new IllegalStateException(
-        "Could not determine agent jar location, not installing tracing agent");
-  }
-
-  private static URL appendAgentToBootstrapClassLoaderSearch(
-      Instrumentation inst, URL ddJavaAgentJarURL, File javaagentFile) throws IOException {
-    checkJarManifestMainClassIsThis(ddJavaAgentJarURL);
-    inst.appendToBootstrapClassLoaderSearch(new JarFile(javaagentFile));
-    return ddJavaAgentJarURL;
-  }
-
-  @SuppressForbidden
-  private static File getAgentFileFromJavaagentArg(List<File> agentFiles) {
-    if (agentFiles.isEmpty()) {
-      System.err.println("Could not get bootstrap jar from -javaagent arg: no argument specified");
-      return null;
-    } else if (agentFiles.size() > 1) {
-      System.err.println(
-          "Could not get bootstrap jar from -javaagent arg: multiple javaagents specified");
-      return null;
-    } else {
-      return agentFiles.get(0);
-    }
-  }
-
-  @SuppressForbidden
-  private static List<File> getAgentFilesFromVMArguments() {
-    if (agentFiles == null) {
-      agentFiles = new ArrayList<>();
-      // ManagementFactory indirectly references java.util.logging.LogManager
-      // - On Oracle-based JDKs after 1.8
-      // - On IBM-based JDKs since at least 1.7
-      // This prevents custom log managers from working correctly
-      // Use reflection to bypass the loading of the class~
-      for (final String argument : JavaVirtualMachine.getVmOptions()) {
-        if (argument.startsWith(JAVA_AGENT_ARGUMENT)) {
-          int index = argument.indexOf('=', JAVA_AGENT_ARGUMENT.length());
-          String agentPathname =
-              argument.substring(
-                  JAVA_AGENT_ARGUMENT.length(), index == -1 ? argument.length() : index);
-          File agentFile = new File(agentPathname);
-          if (agentFile.exists() && agentFile.isFile()) {
-            agentFiles.add(agentFile);
-          } else {
-            System.err.println(
-                "Could not get bootstrap jar from -javaagent arg: unable to find javaagent file: "
-                    + agentFile);
-          }
+        if (thisClassUrl == null) {
+            throw new IllegalStateException(
+                    "Could not locate agent bootstrap class resource, not installing tracing agent");
         }
-      }
-    }
-    return agentFiles;
-  }
-
-  @SuppressForbidden
-  private static File getAgentFileUsingClassLoaderLookup() throws URISyntaxException {
-    File javaagentFile;
-    URL thisClassUrl;
-    String thisClassResourceName = thisClass.getName().replace('.', '/') + ".class";
-    ClassLoader classLoader = thisClass.getClassLoader();
-    if (classLoader == null) {
-      thisClassUrl = ClassLoader.getSystemResource(thisClassResourceName);
-    } else {
-      thisClassUrl = classLoader.getResource(thisClassResourceName);
-    }
 
-    if (thisClassUrl == null) {
-      throw new IllegalStateException(
-          "Could not locate agent bootstrap class resource, not installing tracing agent");
+        javaagentFile = new File(new URI(thisClassUrl.getFile().split("!")[0]));
+        return javaagentFile;
     }
 
-    javaagentFile = new File(new URI(thisClassUrl.getFile().split("!")[0]));
-    return javaagentFile;
-  }
-
-  private static void checkJarManifestMainClassIsThis(final URL jarUrl) throws IOException {
-    final URL manifestUrl = new URL("jar:" + jarUrl + "!/META-INF/MANIFEST.MF");
-    final String mainClassLine = "Main-Class: " + thisClass.getCanonicalName();
-    try (final BufferedReader reader =
-        new BufferedReader(new InputStreamReader(manifestUrl.openStream(), UTF_8))) {
-      String line;
-      while ((line = reader.readLine()) != null) {
-        if (line.equals(mainClassLine)) {
-          return;
+    private static void checkJarManifestMainClassIsThis(final URL jarUrl) throws IOException {
+        final URL manifestUrl = new URL("jar:" + jarUrl + "!/META-INF/MANIFEST.MF");
+        final String mainClassLine = "Main-Class: " + thisClass.getCanonicalName();
+        try (final BufferedReader reader = new BufferedReader(new InputStreamReader(manifestUrl.openStream(), UTF_8))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (line.equals(mainClassLine)) {
+                    return;
+                }
+            }
         }
-      }
+        throw new IllegalStateException("dd-java-agent is not installed, because class '"
+                + thisClass.getCanonicalName()
+                + "' is located in '"
+                + jarUrl
+                + "'. Make sure you don't have this .class-file anywhere, besides dd-java-agent.jar");
     }
-    throw new IllegalStateException(
-        "dd-java-agent is not installed, because class '"
-            + thisClass.getCanonicalName()
-            + "' is located in '"
-            + jarUrl
-            + "'. Make sure you don't have this .class-file anywhere, besides dd-java-agent.jar");
-  }
-
-  /** Returns {@code true} if the JVM is training, i.e. writing to a CDS/AOT archive. */
-  private static boolean isAotTraining(String agentArgs, Instrumentation inst) {
-    if (!JavaVirtualMachine.isJavaVersionAtLeast(25)) {
-      return false; // agent doesn't support training mode before Java 25
-    } else if ("aot_training".equalsIgnoreCase(agentArgs)) {
-      return true; // training mode explicitly enabled via -javaagent
-    } else if ("false".equalsIgnoreCase(EnvironmentVariables.get("DD_DETECT_AOT_TRAINING_MODE"))) {
-      return false; // detection of training mode disabled via DD_DETECT_AOT_TRAINING_MODE=false
-    } else {
-      return AdvancedAgentChecks.isAotTraining(inst); // check JVM status
+
+    /** Returns {@code true} if the JVM is training, i.e. writing to a CDS/AOT archive. */
+    private static boolean isAotTraining(String agentArgs, Instrumentation inst) {
+        if (!JavaVirtualMachine.isJavaVersionAtLeast(25)) {
+            return false; // agent doesn't support training mode before Java 25
+        } else if ("aot_training".equalsIgnoreCase(agentArgs)) {
+            return true; // training mode explicitly enabled via -javaagent
+        } else if ("false".equalsIgnoreCase(EnvironmentVariables.get("DD_DETECT_AOT_TRAINING_MODE"))) {
+            return false; // detection of training mode disabled via DD_DETECT_AOT_TRAINING_MODE=false
+        } else {
+            return AdvancedAgentChecks.isAotTraining(inst); // check JVM status
+        }
     }
-  }
 }
diff --git a/dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentJar.java b/dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentJar.java
index 1b09c703a78..b72fca46533 100644
--- a/dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentJar.java
+++ b/dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentJar.java
@@ -10,181 +10,176 @@
 
 /** Entry point when running the agent as a sample application with -jar. */
 public final class AgentJar {
-  private static final Class<?> thisClass = AgentJar.class;
-
-  private static Class<?> agentClass;
-
-  @SuppressForbidden
-  public static void main(final String[] args) {
-    if (args.length == 0) {
-      printAgentVersion();
-    } else {
-      try {
-        // load Agent class
-        agentClass = ClassLoader.getSystemClassLoader().loadClass("datadog.trace.bootstrap.Agent");
-
-        switch (args[0]) {
-          case "sampleTrace":
-            sendSampleTrace(args);
-            break;
-          case "uploadCrash":
-            uploadCrash(args);
-            break;
-          case "sendOomeEvent":
-            sendOomeEvent(args);
-            break;
-          case "scanDependencies":
-            scanDependencies(args);
-            break;
-          case "checkProfilerEnv":
-            checkProfilerEnv(args);
-            break;
-          case "--list-integrations":
-          case "-li":
-            printIntegrationNames();
-            break;
-          case "--help":
-          case "-h":
-            printUsage();
-            break;
-          case "--version":
-          case "-v":
+    private static final Class<?> thisClass = AgentJar.class;
+
+    private static Class<?> agentClass;
+
+    @SuppressForbidden
+    public static void main(final String[] args) {
+        if (args.length == 0) {
             printAgentVersion();
-            break;
-          default:
-            throw new IllegalArgumentException(args[0]);
+        } else {
+            try {
+                // load Agent class
+                agentClass = ClassLoader.getSystemClassLoader().loadClass("datadog.trace.bootstrap.Agent");
+
+                switch (args[0]) {
+                    case "sampleTrace":
+                        sendSampleTrace(args);
+                        break;
+                    case "uploadCrash":
+                        uploadCrash(args);
+                        break;
+                    case "sendOomeEvent":
+                        sendOomeEvent(args);
+                        break;
+                    case "scanDependencies":
+                        scanDependencies(args);
+                        break;
+                    case "checkProfilerEnv":
+                        checkProfilerEnv(args);
+                        break;
+                    case "--list-integrations":
+                    case "-li":
+                        printIntegrationNames();
+                        break;
+                    case "--help":
+                    case "-h":
+                        printUsage();
+                        break;
+                    case "--version":
+                    case "-v":
+                        printAgentVersion();
+                        break;
+                    default:
+                        throw new IllegalArgumentException(args[0]);
+                }
+            } catch (IllegalArgumentException e) {
+                System.out.println("unknown option: " + e.getMessage());
+                printUsage();
+            } catch (Throwable e) {
+                System.out.println("Failed to process agent option");
+                e.printStackTrace();
+            }
         }
-      } catch (IllegalArgumentException e) {
-        System.out.println("unknown option: " + e.getMessage());
-        printUsage();
-      } catch (Throwable e) {
-        System.out.println("Failed to process agent option");
-        e.printStackTrace();
-      }
     }
-  }
-
-  @SuppressForbidden
-  private static void printUsage() {
-    System.out.println("usage:");
-    System.out.println("  sampleTrace [-c count] [-i interval]");
-    System.out.println("  uploadCrash -c configFile crashFile");
-    System.out.println("  scanDependencies <path> ...");
-    System.out.println("  checkProfilerEnv [temp]");
-    System.out.println("  [-li | --list-integrations]");
-    System.out.println("  [-h  | --help]");
-    System.out.println("  [-v  | --version]");
-  }
-
-  private static void sendSampleTrace(final String[] args) throws Exception {
-    int count = -1;
-    double interval = 1;
-
-    if (args.length % 2 == 0) {
-      throw new IllegalArgumentException("missing value");
+
+    @SuppressForbidden
+    private static void printUsage() {
+        System.out.println("usage:");
+        System.out.println("  sampleTrace [-c count] [-i interval]");
+        System.out.println("  uploadCrash -c configFile crashFile");
+        System.out.println("  scanDependencies <path> ...");
+        System.out.println("  checkProfilerEnv [temp]");
+        System.out.println("  [-li | --list-integrations]");
+        System.out.println("  [-h  | --help]");
+        System.out.println("  [-v  | --version]");
     }
 
-    for (int i = 1; i < args.length; i += 2) {
-      switch (args[i]) {
-        case "-c":
-          count = Integer.parseInt(args[i + 1]);
-          break;
-        case "-i":
-          interval = Double.parseDouble(args[i + 1]);
-          break;
-        default:
-          throw new IllegalArgumentException(args[i]);
-      }
+    private static void sendSampleTrace(final String[] args) throws Exception {
+        int count = -1;
+        double interval = 1;
+
+        if (args.length % 2 == 0) {
+            throw new IllegalArgumentException("missing value");
+        }
+
+        for (int i = 1; i < args.length; i += 2) {
+            switch (args[i]) {
+                case "-c":
+                    count = Integer.parseInt(args[i + 1]);
+                    break;
+                case "-i":
+                    interval = Double.parseDouble(args[i + 1]);
+                    break;
+                default:
+                    throw new IllegalArgumentException(args[i]);
+            }
+        }
+
+        installAgentCLI().getMethod("sendSampleTraces", int.class, double.class).invoke(null, count, interval);
     }
 
-    installAgentCLI()
-        .getMethod("sendSampleTraces", int.class, double.class)
-        .invoke(null, count, interval);
-  }
+    private static void uploadCrash(final String[] args) throws Exception {
+        if (args.length < 2 || ("-c".equals(args[1]) && args.length < 4)) {
+            throw new IllegalArgumentException("Arguments mismatch. At least one crash report should be provided");
+        }
+
+        int crashFilePos = 1;
+        String configFile = null;
+        if ("-c".equals(args[1])) {
+            configFile = args[2];
+            crashFilePos = 3;
+        }
 
-  private static void uploadCrash(final String[] args) throws Exception {
-    if (args.length < 2 || ("-c".equals(args[1]) && args.length < 4)) {
-      throw new IllegalArgumentException(
-          "Arguments mismatch. At least one crash report should be provided");
+        installAgentCLI()
+                .getMethod("uploadCrash", String.class, String.class)
+                .invoke(null, configFile, args[crashFilePos]);
     }
 
-    int crashFilePos = 1;
-    String configFile = null;
-    if ("-c".equals(args[1])) {
-      configFile = args[2];
-      crashFilePos = 3;
+    private static void sendOomeEvent(final String[] args) throws Exception {
+        if (args.length < 2) {
+            throw new IllegalArgumentException("missing taglist");
+        }
+        installAgentCLI().getMethod("sendOomeEvent", String.class).invoke(null, args[1]);
     }
 
-    installAgentCLI()
-        .getMethod("uploadCrash", String.class, String.class)
-        .invoke(null, configFile, args[crashFilePos]);
-  }
+    private static void scanDependencies(final String[] args) throws Exception {
+        if (args.length < 2) {
+            throw new IllegalArgumentException("missing path");
+        }
 
-  private static void sendOomeEvent(final String[] args) throws Exception {
-    if (args.length < 2) {
-      throw new IllegalArgumentException("missing taglist");
+        installAgentCLI()
+                .getMethod("scanDependencies", String[].class)
+                .invoke(null, new Object[] {Arrays.copyOfRange(args, 1, args.length)});
     }
-    installAgentCLI().getMethod("sendOomeEvent", String.class).invoke(null, args[1]);
-  }
 
-  private static void scanDependencies(final String[] args) throws Exception {
-    if (args.length < 2) {
-      throw new IllegalArgumentException("missing path");
+    private static void printIntegrationNames() throws Exception {
+        installAgentCLI().getMethod("printIntegrationNames").invoke(null);
     }
 
-    installAgentCLI()
-        .getMethod("scanDependencies", String[].class)
-        .invoke(null, new Object[] {Arrays.copyOfRange(args, 1, args.length)});
-  }
-
-  private static void printIntegrationNames() throws Exception {
-    installAgentCLI().getMethod("printIntegrationNames").invoke(null);
-  }
-
-  private static Class<?> installAgentCLI() throws Exception {
-    return (Class<?>) agentClass.getMethod("installAgentCLI").invoke(null);
-  }
-
-  @SuppressForbidden
-  private static void printAgentVersion() {
-    try {
-      System.out.println(getAgentVersion());
-    } catch (final Exception e) {
-      System.out.println("Failed to parse agent version");
-      e.printStackTrace();
+    private static Class<?> installAgentCLI() throws Exception {
+        return (Class<?>) agentClass.getMethod("installAgentCLI").invoke(null);
     }
-  }
 
-  public static String tryGetAgentVersion() {
-    return getAgentVersionOrDefault(null);
-  }
+    @SuppressForbidden
+    private static void printAgentVersion() {
+        try {
+            System.out.println(getAgentVersion());
+        } catch (final Exception e) {
+            System.out.println("Failed to parse agent version");
+            e.printStackTrace();
+        }
+    }
 
-  public static String getAgentVersionOrDefault(String defaultValue) {
-    try {
-      return AgentJar.getAgentVersion();
-    } catch (IOException e) {
-      return defaultValue;
+    public static String tryGetAgentVersion() {
+        return getAgentVersionOrDefault(null);
     }
-  }
 
-  public static String getAgentVersion() throws IOException {
-    final StringBuilder sb = new StringBuilder();
-    try (final BufferedReader reader =
-        new BufferedReader(
-            new InputStreamReader(
+    public static String getAgentVersionOrDefault(String defaultValue) {
+        try {
+            return AgentJar.getAgentVersion();
+        } catch (IOException e) {
+            return defaultValue;
+        }
+    }
+
+    public static String getAgentVersion() throws IOException {
+        final StringBuilder sb = new StringBuilder();
+        try (final BufferedReader reader = new BufferedReader(new InputStreamReader(
                 thisClass.getResourceAsStream("/dd-java-agent.version"), StandardCharsets.UTF_8))) {
 
-      for (int c = reader.read(); c != -1; c = reader.read()) {
-        sb.append((char) c);
-      }
-    }
+            for (int c = reader.read(); c != -1; c = reader.read()) {
+                sb.append((char) c);
+            }
+        }
 
-    return sb.toString().trim();
-  }
+        return sb.toString().trim();
+    }
 
-  private static void checkProfilerEnv(final String[] args) throws Exception {
-    String tmpDir = args.length == 2 ? args[1] : SystemProperties.get("java.io.tmpdir");
+    private static void checkProfilerEnv(final String[] args) throws Exception {
+        String tmpDir = args.length == 2 ? args[1] : SystemProperties.get("java.io.tmpdir");
 
-    installAgentCLI().getMethod("checkProfilerEnv", String.class).invoke(null, tmpDir);
-  }
+        installAgentCLI().getMethod("checkProfilerEnv", String.class).invoke(null, tmpDir);
+    }
 }
diff --git a/dd-java-agent/src/main/java/datadog/trace/bootstrap/BootstrapInitializationTelemetry.java b/dd-java-agent/src/main/java/datadog/trace/bootstrap/BootstrapInitializationTelemetry.java
index f0241544547..a8086472551 100644
--- a/dd-java-agent/src/main/java/datadog/trace/bootstrap/BootstrapInitializationTelemetry.java
+++ b/dd-java-agent/src/main/java/datadog/trace/bootstrap/BootstrapInitializationTelemetry.java
@@ -17,337 +17,336 @@
 
 /** Thread safe telemetry class used to relay information about tracer activation. */
 public abstract class BootstrapInitializationTelemetry {
-  private static final int DEFAULT_MAX_TAGS = 5;
+    private static final int DEFAULT_MAX_TAGS = 5;
 
-  /** Returns a singleton no op instance of initialization telemetry */
-  public static BootstrapInitializationTelemetry noOpInstance() {
-    return NoOp.INSTANCE;
-  }
-
-  /**
-   * Constructs a JSON-based instrumentation telemetry that forwards through a helper executable -
-   * indicated by forwarderPath
-   *
-   * @param forwarderPath - a String - path to forwarding executable
-   */
-  public static BootstrapInitializationTelemetry createFromForwarderPath(String forwarderPath) {
-    return new JsonBased(new ForwarderJsonSender(forwarderPath));
-  }
-
-  /**
-   * Adds meta information about the process to the initialization telemetry Does NOT support
-   * overriding an attr, each attr should be once and only once
-   */
-  public abstract void initMetaInfo(String attr, String value);
+    /** Returns a singleton no op instance of initialization telemetry */
+    public static BootstrapInitializationTelemetry noOpInstance() {
+        return NoOp.INSTANCE;
+    }
 
-  /**
-   * Indicates that an abort condition occurred during the bootstrapping process Abort conditions
-   * are assumed to leave the bootstrapping process incomplete. {@link #markIncomplete()}
-   */
-  public abstract void onAbort(String reasonCode);
+    /**
+     * Constructs a JSON-based instrumentation telemetry that forwards through a helper executable -
+     * indicated by forwarderPath
+     *
+     * @param forwarderPath - a String - path to forwarding executable
+     */
+    public static BootstrapInitializationTelemetry createFromForwarderPath(String forwarderPath) {
+        return new JsonBased(new ForwarderJsonSender(forwarderPath));
+    }
 
-  /**
-   * Indicates that an exception occurred during the bootstrapping process By default the exception
-   * is assumed to NOT have fully stopped the initialization of the tracer.
-   *
-   * <p>If this exception stops the core bootstrapping of the tracer, then {@link #markIncomplete()}
-   * should also be called.
-   */
-  public abstract void onError(Throwable t);
+    /**
+     * Adds meta information about the process to the initialization telemetry Does NOT support
+     * overriding an attr, each attr should be once and only once
+     */
+    public abstract void initMetaInfo(String attr, String value);
 
-  public abstract void onError(String reasonCode);
+    /**
+     * Indicates that an abort condition occurred during the bootstrapping process Abort conditions
+     * are assumed to leave the bootstrapping process incomplete. {@link #markIncomplete()}
+     */
+    public abstract void onAbort(String reasonCode);
 
-  /**
-   * Indicates an exception that occurred during the bootstrapping process that left initialization
-   * incomplete. Equivalent to calling {@link #onError(Throwable)} and {@link #markIncomplete()}
-   */
-  public abstract void onFatalError(Throwable t);
+    /**
+     * Indicates that an exception occurred during the bootstrapping process By default the exception
+     * is assumed to NOT have fully stopped the initialization of the tracer.
+     *
+     * <p>If this exception stops the core bootstrapping of the tracer, then {@link #markIncomplete()}
+     * should also be called.
+     */
+    public abstract void onError(Throwable t);
 
-  public abstract void markIncomplete();
+    public abstract void onError(String reasonCode);
 
-  public abstract void finish();
+    /**
+     * Indicates an exception that occurred during the bootstrapping process that left initialization
+     * incomplete. Equivalent to calling {@link #onError(Throwable)} and {@link #markIncomplete()}
+     */
+    public abstract void onFatalError(Throwable t);
 
-  public static final class NoOp extends BootstrapInitializationTelemetry {
-    static final NoOp INSTANCE = new NoOp();
+    public abstract void markIncomplete();
 
-    private NoOp() {}
+    public abstract void finish();
 
-    @Override
-    public void initMetaInfo(String attr, String value) {}
+    public static final class NoOp extends BootstrapInitializationTelemetry {
+        static final NoOp INSTANCE = new NoOp();
 
-    @Override
-    public void onAbort(String reasonCode) {}
+        private NoOp() {}
 
-    @Override
-    public void onError(String reasonCode) {}
+        @Override
+        public void initMetaInfo(String attr, String value) {}
 
-    @Override
-    public void onError(Throwable t) {}
+        @Override
+        public void onAbort(String reasonCode) {}
 
-    @Override
-    public void onFatalError(Throwable t) {}
+        @Override
+        public void onError(String reasonCode) {}
 
-    @Override
-    public void markIncomplete() {}
+        @Override
+        public void onError(Throwable t) {}
 
-    @Override
-    public void finish() {}
-  }
+        @Override
+        public void onFatalError(Throwable t) {}
 
-  public static final class JsonBased extends BootstrapInitializationTelemetry {
-    private final JsonSender sender;
+        @Override
+        public void markIncomplete() {}
 
-    private final Telemetry telemetry;
+        @Override
+        public void finish() {}
+    }
 
-    // one way false to true
-    private volatile boolean incomplete = false;
+    public static final class JsonBased extends BootstrapInitializationTelemetry {
+        private final JsonSender sender;
 
-    JsonBased(JsonSender sender) {
-      this.sender = sender;
-      this.telemetry = new Telemetry();
-    }
+        private final Telemetry telemetry;
 
-    @Override
-    public void initMetaInfo(String attr, String value) {
-      telemetry.setMetadata(attr, value);
-    }
+        // one way false to true
+        private volatile boolean incomplete = false;
 
-    @Override
-    public void onAbort(String reasonCode) {
-      onPoint("library_entrypoint.abort", singletonList("reason:" + reasonCode));
-      markIncomplete();
-      setResultMeta("abort", mapResultClass(reasonCode), reasonCode);
-    }
+        JsonBased(JsonSender sender) {
+            this.sender = sender;
+            this.telemetry = new Telemetry();
+        }
 
-    @Override
-    public void onError(Throwable t) {
-      setResultMeta("error", "internal_error", t.getMessage());
+        @Override
+        public void initMetaInfo(String attr, String value) {
+            telemetry.setMetadata(attr, value);
+        }
 
-      List<String> causes = new ArrayList<>();
+        @Override
+        public void onAbort(String reasonCode) {
+            onPoint("library_entrypoint.abort", singletonList("reason:" + reasonCode));
+            markIncomplete();
+            setResultMeta("abort", mapResultClass(reasonCode), reasonCode);
+        }
 
-      Throwable cause = t.getCause();
-      while (cause != null) {
-        causes.add("error_type:" + cause.getClass().getName());
-        cause = cause.getCause();
-      }
-      causes.add("error_type:" + t.getClass().getName());
+        @Override
+        public void onError(Throwable t) {
+            setResultMeta("error", "internal_error", t.getMessage());
 
-      // Limit the number of tags to avoid overpopulating the JSON payload.
-      int maxTags = maxTags();
-      int numCauses = causes.size();
-      if (numCauses > maxTags) {
-        causes = causes.subList(numCauses - maxTags, numCauses);
-      }
+            List<String> causes = new ArrayList<>();
 
-      onPoint("library_entrypoint.error", causes);
-    }
+            Throwable cause = t.getCause();
+            while (cause != null) {
+                causes.add("error_type:" + cause.getClass().getName());
+                cause = cause.getCause();
+            }
+            causes.add("error_type:" + t.getClass().getName());
 
-    @Override
-    public void onError(String reasonCode) {
-      onPoint("library_entrypoint.error", singletonList("error_type:" + reasonCode));
-      setResultMeta("error", mapResultClass(reasonCode), reasonCode);
-    }
+            // Limit the number of tags to avoid overpopulating the JSON payload.
+            int maxTags = maxTags();
+            int numCauses = causes.size();
+            if (numCauses > maxTags) {
+                causes = causes.subList(numCauses - maxTags, numCauses);
+            }
 
-    private int maxTags() {
-      String maxTags = EnvironmentVariables.get("DD_TELEMETRY_FORWARDER_MAX_TAGS");
+            onPoint("library_entrypoint.error", causes);
+        }
 
-      if (maxTags != null) {
-        try {
-          return Integer.parseInt(maxTags);
-        } catch (Throwable ignore) {
-          // Ignore and return default value.
+        @Override
+        public void onError(String reasonCode) {
+            onPoint("library_entrypoint.error", singletonList("error_type:" + reasonCode));
+            setResultMeta("error", mapResultClass(reasonCode), reasonCode);
         }
-      }
 
-      return DEFAULT_MAX_TAGS;
-    }
+        private int maxTags() {
+            String maxTags = EnvironmentVariables.get("DD_TELEMETRY_FORWARDER_MAX_TAGS");
 
-    @Override
-    public void onFatalError(Throwable t) {
-      onError(t);
-      markIncomplete();
-    }
+            if (maxTags != null) {
+                try {
+                    return Integer.parseInt(maxTags);
+                } catch (Throwable ignore) {
+                    // Ignore and return default value.
+                }
+            }
 
-    private void setResultMeta(String result, String resultClass, String resultReason) {
-      initMetaInfo("result", result);
-      initMetaInfo("result_class", resultClass);
-      initMetaInfo("result_reason", resultReason);
-    }
+            return DEFAULT_MAX_TAGS;
+        }
 
-    private String mapResultClass(String reasonCode) {
-      if (reasonCode == null) {
-        return "success";
-      }
-
-      switch (reasonCode) {
-        case "already_initialized":
-          return "already_instrumented";
-        case "other-java-agents":
-          return "incompatible_library";
-        case "jdk_tool":
-          return "unsupported_binary";
-        default:
-          return "unknown";
-      }
-    }
+        @Override
+        public void onFatalError(Throwable t) {
+            onError(t);
+            markIncomplete();
+        }
 
-    private void onPoint(String name, List<String> tags) {
-      telemetry.addPoint(name, tags);
-    }
+        private void setResultMeta(String result, String resultClass, String resultReason) {
+            initMetaInfo("result", result);
+            initMetaInfo("result_class", resultClass);
+            initMetaInfo("result_reason", resultReason);
+        }
 
-    @Override
-    public void markIncomplete() {
-      this.incomplete = true;
-    }
+        private String mapResultClass(String reasonCode) {
+            if (reasonCode == null) {
+                return "success";
+            }
 
-    @Override
-    public void finish() {
-      if (!this.incomplete) {
-        onPoint("library_entrypoint.complete", emptyList());
-      }
+            switch (reasonCode) {
+                case "already_initialized":
+                    return "already_instrumented";
+                case "other-java-agents":
+                    return "incompatible_library";
+                case "jdk_tool":
+                    return "unsupported_binary";
+                default:
+                    return "unknown";
+            }
+        }
 
-      this.sender.send(telemetry);
-    }
-  }
+        private void onPoint(String name, List<String> tags) {
+            telemetry.addPoint(name, tags);
+        }
 
-  public static class Telemetry {
-    private final Map<String, String> metadata;
-    private final Map<String, List<String>> points;
+        @Override
+        public void markIncomplete() {
+            this.incomplete = true;
+        }
 
-    public Telemetry() {
-      metadata = new LinkedHashMap<>();
-      points = new LinkedHashMap<>();
+        @Override
+        public void finish() {
+            if (!this.incomplete) {
+                onPoint("library_entrypoint.complete", emptyList());
+            }
 
-      setResults("success", "success", "Successfully configured ddtrace package");
+            this.sender.send(telemetry);
+        }
     }
 
-    public void setMetadata(String name, String value) {
-      synchronized (metadata) {
-        metadata.put(name, value);
-      }
-    }
+    public static class Telemetry {
+        private final Map<String, String> metadata;
+        private final Map<String, List<String>> points;
 
-    public void setResults(String result, String resultClass, String resultReason) {
-      synchronized (metadata) {
-        metadata.put("result", result);
-        metadata.put("result_class", resultClass);
-        metadata.put("result_reason", resultReason);
-      }
-    }
+        public Telemetry() {
+            metadata = new LinkedHashMap<>();
+            points = new LinkedHashMap<>();
 
-    public void addPoint(String name, List<String> tags) {
-      synchronized (points) {
-        points.put(name, tags);
-      }
-    }
+            setResults("success", "success", "Successfully configured ddtrace package");
+        }
 
-    @Override
-    public String toString() {
-      try (JsonWriter writer = new JsonWriter()) {
-        writer.beginObject();
-        writer.name("metadata").beginObject();
-        synchronized (metadata) {
-          for (Map.Entry<String, String> entry : metadata.entrySet()) {
-            writer.name(entry.getKey());
-            writer.value(entry.getValue());
-          }
-
-          metadata.clear();
+        public void setMetadata(String name, String value) {
+            synchronized (metadata) {
+                metadata.put(name, value);
+            }
         }
-        writer.endObject();
-
-        writer.name("points").beginArray();
-        synchronized (points) {
-          for (Map.Entry<String, List<String>> entry : points.entrySet()) {
-            writer.beginObject();
-            writer.name("name").value(entry.getKey());
-            if (!entry.getValue().isEmpty()) {
-              writer.name("tags").beginArray();
-              for (String tag : entry.getValue()) {
-                writer.value(tag);
-              }
-              writer.endArray();
+
+        public void setResults(String result, String resultClass, String resultReason) {
+            synchronized (metadata) {
+                metadata.put("result", result);
+                metadata.put("result_class", resultClass);
+                metadata.put("result_reason", resultReason);
             }
-            writer.endObject();
-          }
+        }
 
-          points.clear();
+        public void addPoint(String name, List<String> tags) {
+            synchronized (points) {
+                points.put(name, tags);
+            }
         }
-        writer.endArray();
-        writer.endObject();
 
-        return writer.toString();
-      }
+        @Override
+        public String toString() {
+            try (JsonWriter writer = new JsonWriter()) {
+                writer.beginObject();
+                writer.name("metadata").beginObject();
+                synchronized (metadata) {
+                    for (Map.Entry<String, String> entry : metadata.entrySet()) {
+                        writer.name(entry.getKey());
+                        writer.value(entry.getValue());
+                    }
+
+                    metadata.clear();
+                }
+                writer.endObject();
+
+                writer.name("points").beginArray();
+                synchronized (points) {
+                    for (Map.Entry<String, List<String>> entry : points.entrySet()) {
+                        writer.beginObject();
+                        writer.name("name").value(entry.getKey());
+                        if (!entry.getValue().isEmpty()) {
+                            writer.name("tags").beginArray();
+                            for (String tag : entry.getValue()) {
+                                writer.value(tag);
+                            }
+                            writer.endArray();
+                        }
+                        writer.endObject();
+                    }
+
+                    points.clear();
+                }
+                writer.endArray();
+                writer.endObject();
+
+                return writer.toString();
+            }
+        }
     }
-  }
 
-  /**
-   * Declare telemetry as {@code Object} to avoid issue with double class loading from different
-   * classloaders.
-   */
-  public interface JsonSender {
-    void send(Object telemetry);
-  }
+    /**
+     * Declare telemetry as {@code Object} to avoid issue with double class loading from different
+     * classloaders.
+     */
+    public interface JsonSender {
+        void send(Object telemetry);
+    }
 
-  public static final class ForwarderJsonSender implements JsonSender {
-    private final String forwarderPath;
+    public static final class ForwarderJsonSender implements JsonSender {
+        private final String forwarderPath;
 
-    ForwarderJsonSender(String forwarderPath) {
-      this.forwarderPath = forwarderPath;
-    }
+        ForwarderJsonSender(String forwarderPath) {
+            this.forwarderPath = forwarderPath;
+        }
 
-    @Override
-    public void send(Object telemetry) {
-      ForwarderJsonSenderThread t = new ForwarderJsonSenderThread(forwarderPath, telemetry);
-      t.setDaemon(true);
-      t.start();
+        @Override
+        public void send(Object telemetry) {
+            ForwarderJsonSenderThread t = new ForwarderJsonSenderThread(forwarderPath, telemetry);
+            t.setDaemon(true);
+            t.start();
+        }
     }
-  }
 
-  public static final class ForwarderJsonSenderThread extends Thread {
-    private final String forwarderPath;
-    private final Object telemetry;
+    public static final class ForwarderJsonSenderThread extends Thread {
+        private final String forwarderPath;
+        private final Object telemetry;
 
-    public ForwarderJsonSenderThread(String forwarderPath, Object telemetry) {
-      super("dd-forwarder-json-sender");
-      this.forwarderPath = forwarderPath;
-      this.telemetry = telemetry;
-    }
+        public ForwarderJsonSenderThread(String forwarderPath, Object telemetry) {
+            super("dd-forwarder-json-sender");
+            this.forwarderPath = forwarderPath;
+            this.telemetry = telemetry;
+        }
 
-    @SuppressForbidden
-    @Override
-    public void run() {
-      ProcessBuilder builder = new ProcessBuilder(forwarderPath, "library_entrypoint");
-
-      // Run forwarder and mute tracing for subprocesses executed in by dd-java-agent.
-      try (final Closeable ignored = muteTracing()) {
-        byte[] payload = telemetry.toString().getBytes(StandardCharsets.UTF_8);
-
-        Process process = builder.start();
-        try (OutputStream out = process.getOutputStream()) {
-          out.write(payload);
-        } catch (IOException ignoredException) {
-          // if this happens it can generate noise into the logs.
-          // we'll only log if the error is more severe
+        @SuppressForbidden
+        @Override
+        public void run() {
+            ProcessBuilder builder = new ProcessBuilder(forwarderPath, "library_entrypoint");
+
+            // Run forwarder and mute tracing for subprocesses executed in by dd-java-agent.
+            try (final Closeable ignored = muteTracing()) {
+                byte[] payload = telemetry.toString().getBytes(StandardCharsets.UTF_8);
+
+                Process process = builder.start();
+                try (OutputStream out = process.getOutputStream()) {
+                    out.write(payload);
+                } catch (IOException ignoredException) {
+                    // if this happens it can generate noise into the logs.
+                    // we'll only log if the error is more severe
+                }
+            } catch (Throwable e) {
+                // We don't have a log manager here, so just print.
+                System.err.println("Failed to send telemetry: " + e.getMessage());
+            }
         }
-      } catch (Throwable e) {
-        // We don't have a log manager here, so just print.
-        System.err.println("Failed to send telemetry: " + e.getMessage());
-      }
-    }
 
-    @SuppressForbidden
-    private Closeable muteTracing() {
-      try {
-        Class<?> agentTracerClass =
-            Class.forName("datadog.trace.bootstrap.instrumentation.api.AgentTracer");
-        Object tracerAPI = agentTracerClass.getMethod("get").invoke(null);
-        Object scope = tracerAPI.getClass().getMethod("muteTracing").invoke(tracerAPI);
-        return (Closeable) scope;
-      } catch (Throwable e) {
-        // Ignore all exceptions and fallback to No-Op Closable.
-        return () -> {};
-      }
+        @SuppressForbidden
+        private Closeable muteTracing() {
+            try {
+                Class<?> agentTracerClass = Class.forName("datadog.trace.bootstrap.instrumentation.api.AgentTracer");
+                Object tracerAPI = agentTracerClass.getMethod("get").invoke(null);
+                Object scope = tracerAPI.getClass().getMethod("muteTracing").invoke(tracerAPI);
+                return (Closeable) scope;
+            } catch (Throwable e) {
+                // Ignore all exceptions and fallback to No-Op Closable.
+                return () -> {};
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/src/main/java11/datadog/trace/bootstrap/AdvancedAgentChecks.java b/dd-java-agent/src/main/java11/datadog/trace/bootstrap/AdvancedAgentChecks.java
index a92fb94b491..93d47919663 100644
--- a/dd-java-agent/src/main/java11/datadog/trace/bootstrap/AdvancedAgentChecks.java
+++ b/dd-java-agent/src/main/java11/datadog/trace/bootstrap/AdvancedAgentChecks.java
@@ -12,28 +12,28 @@
 /** Additional agent checks that require Java 11+. */
 public final class AdvancedAgentChecks {
 
-  /** Returns {@code true} if the JVM is writing to a CDS/AOT archive, i.e. is in training mode. */
-  @SuppressForbidden
-  public static boolean isAotTraining(Instrumentation inst) {
-    try {
-      Class<?> cds = Class.forName("jdk.internal.misc.CDS");
+    /** Returns {@code true} if the JVM is writing to a CDS/AOT archive, i.e. is in training mode. */
+    @SuppressForbidden
+    public static boolean isAotTraining(Instrumentation inst) {
+        try {
+            Class<?> cds = Class.forName("jdk.internal.misc.CDS");
 
-      // ensure the module containing CDS exports it to our unnamed module
-      Module cdsModule = cds.getModule();
-      Module unnamedModule = AdvancedAgentChecks.class.getClassLoader().getUnnamedModule();
-      inst.redefineModule(
-          cdsModule,
-          emptySet(),
-          singletonMap("jdk.internal.misc", singleton(unnamedModule)),
-          emptyMap(),
-          emptySet(),
-          emptyMap());
+            // ensure the module containing CDS exports it to our unnamed module
+            Module cdsModule = cds.getModule();
+            Module unnamedModule = AdvancedAgentChecks.class.getClassLoader().getUnnamedModule();
+            inst.redefineModule(
+                    cdsModule,
+                    emptySet(),
+                    singletonMap("jdk.internal.misc", singleton(unnamedModule)),
+                    emptyMap(),
+                    emptySet(),
+                    emptyMap());
 
-      // if the JVM is writing to a CDS/AOT archive then it's in training mode
-      Method isDumpingArchive = cds.getMethod("isDumpingArchive");
-      return (boolean) isDumpingArchive.invoke(null);
-    } catch (Throwable ignore) {
-      return false; // if we don't have access then assume we're not training
+            // if the JVM is writing to a CDS/AOT archive then it's in training mode
+            Method isDumpingArchive = cds.getMethod("isDumpingArchive");
+            return (boolean) isDumpingArchive.invoke(null);
+        } catch (Throwable ignore) {
+            return false; // if we don't have access then assume we're not training
+        }
     }
-  }
 }
diff --git a/dd-java-agent/src/main/java6/datadog/trace/bootstrap/AgentPreCheck.java b/dd-java-agent/src/main/java6/datadog/trace/bootstrap/AgentPreCheck.java
index e9ea4fc7b7a..b64ba3e7a3b 100644
--- a/dd-java-agent/src/main/java6/datadog/trace/bootstrap/AgentPreCheck.java
+++ b/dd-java-agent/src/main/java6/datadog/trace/bootstrap/AgentPreCheck.java
@@ -14,199 +14,196 @@
 
 /** Special lightweight pre-main class that skips installation on incompatible JVMs. */
 public class AgentPreCheck {
-  public static final int MIN_JAVA_VERSION = 8;
-
-  public static void premain(final String agentArgs, final Instrumentation inst) {
-    agentmain(agentArgs, inst);
-  }
-
-  @SuppressForbidden
-  public static void agentmain(final String agentArgs, final Instrumentation inst) {
-    try {
-      if (compatible()) {
-        continueBootstrap(agentArgs, inst);
-      }
-    } catch (Throwable e) {
-      // If agent failed we should not fail the application.
-      // We don't have a log manager here, so just print.
-      System.err.println("ERROR: " + e.getMessage());
+    public static final int MIN_JAVA_VERSION = 8;
+
+    public static void premain(final String agentArgs, final Instrumentation inst) {
+        agentmain(agentArgs, inst);
     }
-  }
-
-  private static void reportIncompatibleJava(
-      String javaVersion, String javaHome, String agentVersion, PrintStream output) {
-    output.println(
-        "Warning: "
-            + (agentVersion == null ? "This version" : "Version " + agentVersion)
-            + " of dd-java-agent is not compatible with Java "
-            + javaVersion
-            + " found at '"
-            + javaHome
-            + "' and is effectively disabled.");
-    output.println("Please upgrade your Java version to 8+");
-  }
-
-  static void sendTelemetry(String forwarderPath, String javaVersion, String agentVersion) {
-    // Hardcoded payload for unsupported Java version.
-    String payload =
-        "{\"metadata\":{"
-            + "\"runtime_name\":\"jvm\","
-            + "\"language_name\":\"jvm\","
-            + "\"runtime_version\":\""
-            + javaVersion
-            + "\","
-            + "\"language_version\":\""
-            + javaVersion
-            + "\","
-            + "\"tracer_version\":\""
-            + agentVersion
-            + "\","
-            + "\"result\":\"abort\","
-            + "\"result_class\":\"unknown\","
-            + "\"result_reason\":\"incompatible_runtime\""
-            + "},"
-            + "\"points\":[{"
-            + "\"name\":\"library_entrypoint.abort\","
-            + "\"tags\":[\"reason:incompatible_runtime\"]"
-            + "}]"
-            + "}";
-
-    ForwarderJsonSenderThread t = new ForwarderJsonSenderThread(forwarderPath, payload);
-    t.setDaemon(true);
-    t.start();
-  }
-
-  private static String tryGetProperty(String property) {
-    try {
-      return System.getProperty(property);
-    } catch (SecurityException e) {
-      return null;
+
+    @SuppressForbidden
+    public static void agentmain(final String agentArgs, final Instrumentation inst) {
+        try {
+            if (compatible()) {
+                continueBootstrap(agentArgs, inst);
+            }
+        } catch (Throwable e) {
+            // If agent failed we should not fail the application.
+            // We don't have a log manager here, so just print.
+            System.err.println("ERROR: " + e.getMessage());
+        }
     }
-  }
 
-  @SuppressForbidden
-  private static boolean compatible() {
-    String javaVersion = tryGetProperty("java.version");
-    String javaHome = tryGetProperty("java.home");
+    private static void reportIncompatibleJava(
+            String javaVersion, String javaHome, String agentVersion, PrintStream output) {
+        output.println("Warning: "
+                + (agentVersion == null ? "This version" : "Version " + agentVersion)
+                + " of dd-java-agent is not compatible with Java "
+                + javaVersion
+                + " found at '"
+                + javaHome
+                + "' and is effectively disabled.");
+        output.println("Please upgrade your Java version to 8+");
+    }
 
-    return compatible(javaVersion, javaHome, System.err);
-  }
+    static void sendTelemetry(String forwarderPath, String javaVersion, String agentVersion) {
+        // Hardcoded payload for unsupported Java version.
+        String payload = "{\"metadata\":{"
+                + "\"runtime_name\":\"jvm\","
+                + "\"language_name\":\"jvm\","
+                + "\"runtime_version\":\""
+                + javaVersion
+                + "\","
+                + "\"language_version\":\""
+                + javaVersion
+                + "\","
+                + "\"tracer_version\":\""
+                + agentVersion
+                + "\","
+                + "\"result\":\"abort\","
+                + "\"result_class\":\"unknown\","
+                + "\"result_reason\":\"incompatible_runtime\""
+                + "},"
+                + "\"points\":[{"
+                + "\"name\":\"library_entrypoint.abort\","
+                + "\"tags\":[\"reason:incompatible_runtime\"]"
+                + "}]"
+                + "}";
+
+        ForwarderJsonSenderThread t = new ForwarderJsonSenderThread(forwarderPath, payload);
+        t.setDaemon(true);
+        t.start();
+    }
 
-  // System.getenv usage is necessary since class is designed to be Java 6 compatible, while
-  // Environment component is for Java 8+
-  @VisibleForTesting
-  @SuppressForbidden
-  static boolean compatible(String javaVersion, String javaHome, PrintStream output) {
-    int majorJavaVersion = parseJavaMajorVersion(javaVersion);
+    private static String tryGetProperty(String property) {
+        try {
+            return System.getProperty(property);
+        } catch (SecurityException e) {
+            return null;
+        }
+    }
+
+    @SuppressForbidden
+    private static boolean compatible() {
+        String javaVersion = tryGetProperty("java.version");
+        String javaHome = tryGetProperty("java.home");
 
-    if (majorJavaVersion >= MIN_JAVA_VERSION) {
-      return true;
+        return compatible(javaVersion, javaHome, System.err);
     }
 
-    String agentVersion = getAgentVersion();
+    // System.getenv usage is necessary since class is designed to be Java 6 compatible, while
+    // Environment component is for Java 8+
+    @VisibleForTesting
+    @SuppressForbidden
+    static boolean compatible(String javaVersion, String javaHome, PrintStream output) {
+        int majorJavaVersion = parseJavaMajorVersion(javaVersion);
 
-    reportIncompatibleJava(javaVersion, javaHome, agentVersion, output);
+        if (majorJavaVersion >= MIN_JAVA_VERSION) {
+            return true;
+        }
 
-    String forwarderPath = System.getenv("DD_TELEMETRY_FORWARDER_PATH");
-    if (forwarderPath != null) {
-      sendTelemetry(forwarderPath, javaVersion, agentVersion);
-    }
+        String agentVersion = getAgentVersion();
 
-    return false;
-  }
+        reportIncompatibleJava(javaVersion, javaHome, agentVersion, output);
 
-  @VisibleForTesting
-  static int parseJavaMajorVersion(String javaVersion) {
-    int major = 0;
-    if (javaVersion == null || javaVersion.isEmpty()) {
-      return major;
-    }
+        String forwarderPath = System.getenv("DD_TELEMETRY_FORWARDER_PATH");
+        if (forwarderPath != null) {
+            sendTelemetry(forwarderPath, javaVersion, agentVersion);
+        }
 
-    int start = 0;
-    if (javaVersion.charAt(0) == '1'
-        && javaVersion.length() >= 3
-        && javaVersion.charAt(1) == '.'
-        && Character.isDigit(javaVersion.charAt(2))) {
-      start = 2;
+        return false;
     }
 
-    // Parse the major digit and be a bit lenient, allowing digits followed by any non digit
-    for (int i = start; i < javaVersion.length(); i++) {
-      char c = javaVersion.charAt(i);
-      if (Character.isDigit(c)) {
-        major *= 10;
-        major += Character.digit(c, 10);
-      } else {
-        break;
-      }
-    }
-    return major;
-  }
-
-  private static String getAgentVersion() {
-    try {
-      // Get the resource as an InputStream
-      InputStream is = AgentPreCheck.class.getResourceAsStream("/dd-java-agent.version");
-      if (is == null) {
-        return null;
-      }
-
-      BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-      final StringBuilder sb = new StringBuilder();
-      for (int c = reader.read(); c != -1; c = reader.read()) {
-        sb.append((char) c);
-      }
-      reader.close();
-
-      return sb.toString().trim();
-    } catch (Throwable e) {
-      return null;
+    @VisibleForTesting
+    static int parseJavaMajorVersion(String javaVersion) {
+        int major = 0;
+        if (javaVersion == null || javaVersion.isEmpty()) {
+            return major;
+        }
+
+        int start = 0;
+        if (javaVersion.charAt(0) == '1'
+                && javaVersion.length() >= 3
+                && javaVersion.charAt(1) == '.'
+                && Character.isDigit(javaVersion.charAt(2))) {
+            start = 2;
+        }
+
+        // Parse the major digit and be a bit lenient, allowing digits followed by any non digit
+        for (int i = start; i < javaVersion.length(); i++) {
+            char c = javaVersion.charAt(i);
+            if (Character.isDigit(c)) {
+                major *= 10;
+                major += Character.digit(c, 10);
+            } else {
+                break;
+            }
+        }
+        return major;
     }
-  }
-
-  @SuppressForbidden
-  private static void continueBootstrap(final String agentArgs, final Instrumentation inst)
-      throws Exception {
-    Class<?> clazz = Class.forName("datadog.trace.bootstrap.AgentBootstrap");
-    Method agentMain = clazz.getMethod("agentmain", String.class, Instrumentation.class);
-    agentMain.invoke(null, agentArgs, inst);
-  }
-
-  public static final class ForwarderJsonSenderThread extends Thread {
-    private final String forwarderPath;
-    private final String payload;
-
-    public ForwarderJsonSenderThread(String forwarderPath, String payload) {
-      super("dd-forwarder-json-sender");
-      setDaemon(true);
-      this.forwarderPath = forwarderPath;
-      this.payload = payload;
+
+    private static String getAgentVersion() {
+        try {
+            // Get the resource as an InputStream
+            InputStream is = AgentPreCheck.class.getResourceAsStream("/dd-java-agent.version");
+            if (is == null) {
+                return null;
+            }
+
+            BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+            final StringBuilder sb = new StringBuilder();
+            for (int c = reader.read(); c != -1; c = reader.read()) {
+                sb.append((char) c);
+            }
+            reader.close();
+
+            return sb.toString().trim();
+        } catch (Throwable e) {
+            return null;
+        }
     }
 
     @SuppressForbidden
-    @Override
-    public void run() {
-      ProcessBuilder builder = new ProcessBuilder(forwarderPath, "library_entrypoint");
-      try {
-        Process process = builder.start();
-        OutputStream out = null;
-        try {
-          out = process.getOutputStream();
-          out.write(payload.getBytes(StandardCharsets.UTF_8));
-        } catch (IOException ignored) {
-          // if this happens it can generate noise into the logs.
-          // we'll only log if the error is more severe
-        } finally {
-          if (out != null) {
+    private static void continueBootstrap(final String agentArgs, final Instrumentation inst) throws Exception {
+        Class<?> clazz = Class.forName("datadog.trace.bootstrap.AgentBootstrap");
+        Method agentMain = clazz.getMethod("agentmain", String.class, Instrumentation.class);
+        agentMain.invoke(null, agentArgs, inst);
+    }
+
+    public static final class ForwarderJsonSenderThread extends Thread {
+        private final String forwarderPath;
+        private final String payload;
+
+        public ForwarderJsonSenderThread(String forwarderPath, String payload) {
+            super("dd-forwarder-json-sender");
+            setDaemon(true);
+            this.forwarderPath = forwarderPath;
+            this.payload = payload;
+        }
+
+        @SuppressForbidden
+        @Override
+        public void run() {
+            ProcessBuilder builder = new ProcessBuilder(forwarderPath, "library_entrypoint");
             try {
-              out.close();
-            } catch (IOException ignored) {
+                Process process = builder.start();
+                OutputStream out = null;
+                try {
+                    out = process.getOutputStream();
+                    out.write(payload.getBytes(StandardCharsets.UTF_8));
+                } catch (IOException ignored) {
+                    // if this happens it can generate noise into the logs.
+                    // we'll only log if the error is more severe
+                } finally {
+                    if (out != null) {
+                        try {
+                            out.close();
+                        } catch (IOException ignored) {
+                        }
+                    }
+                }
+            } catch (Throwable e) {
+                System.err.println("Failed to send telemetry: " + e.getMessage());
             }
-          }
         }
-      } catch (Throwable e) {
-        System.err.println("Failed to send telemetry: " + e.getMessage());
-      }
     }
-  }
 }
diff --git a/dd-java-agent/src/test/java/datadog/test/ClassToInstrument.java b/dd-java-agent/src/test/java/datadog/test/ClassToInstrument.java
index 52f085751f0..6d990f269e0 100644
--- a/dd-java-agent/src/test/java/datadog/test/ClassToInstrument.java
+++ b/dd-java-agent/src/test/java/datadog/test/ClassToInstrument.java
@@ -4,6 +4,6 @@
 
 /** Note: this has to stay in 'datadog.test' package to be considered for instrumentation */
 public class ClassToInstrument {
-  @Trace
-  public static void someMethod() {}
+    @Trace
+    public static void someMethod() {}
 }
diff --git a/dd-java-agent/src/test/java/datadog/test/SimpleAgentMock.java b/dd-java-agent/src/test/java/datadog/test/SimpleAgentMock.java
index 5595ab5ad79..ea9dd6c5e8e 100644
--- a/dd-java-agent/src/test/java/datadog/test/SimpleAgentMock.java
+++ b/dd-java-agent/src/test/java/datadog/test/SimpleAgentMock.java
@@ -20,69 +20,66 @@
  * loaders.
  */
 public class SimpleAgentMock implements Closeable {
-  private static final MockResponse EMPTY_200_RESPONSE = new MockResponse().setResponseCode(200);
-  private static final MockResponse INFO_RESPONSE =
-      new MockResponse()
-          .setResponseCode(200)
-          .addHeader("Content-Type", "application/json")
-          .setBody(
-              "{\"version\":\"7.77.0\",\"endpoints\":[\"/v1.0/traces\",\"/v0.5/traces\",\"/v0.4/traces\"]}");
+    private static final MockResponse EMPTY_200_RESPONSE = new MockResponse().setResponseCode(200);
+    private static final MockResponse INFO_RESPONSE = new MockResponse()
+            .setResponseCode(200)
+            .addHeader("Content-Type", "application/json")
+            .setBody("{\"version\":\"7.77.0\",\"endpoints\":[\"/v1.0/traces\",\"/v0.5/traces\",\"/v0.4/traces\"]}");
 
-  private final MockWebServer server;
-  private final List<DecodedSpan> spans = new CopyOnWriteArrayList<>();
+    private final MockWebServer server;
+    private final List<DecodedSpan> spans = new CopyOnWriteArrayList<>();
 
-  public SimpleAgentMock() {
-    server = new MockWebServer();
+    public SimpleAgentMock() {
+        server = new MockWebServer();
 
-    server.setDispatcher(
-        new Dispatcher() {
-          @Override
-          public MockResponse dispatch(final RecordedRequest request) {
-            String path = request.getPath();
-            if (path != null) {
-              if (path.startsWith("/info")) {
-                return INFO_RESPONSE;
-              }
+        server.setDispatcher(new Dispatcher() {
+            @Override
+            public MockResponse dispatch(final RecordedRequest request) {
+                String path = request.getPath();
+                if (path != null) {
+                    if (path.startsWith("/info")) {
+                        return INFO_RESPONSE;
+                    }
 
-              byte[] body = request.getBody().readByteArray();
+                    byte[] body = request.getBody().readByteArray();
 
-              DecodedMessage message = null;
-              if (path.startsWith("/v1.0/traces")) {
-                message = Decoder.decodeV1(body);
-              } else if (path.startsWith("/v0.5/traces")) {
-                message = Decoder.decodeV05(body);
-              } else if (path.startsWith("/v0.4/traces")) {
-                message = Decoder.decodeV04(body);
-              }
+                    DecodedMessage message = null;
+                    if (path.startsWith("/v1.0/traces")) {
+                        message = Decoder.decodeV1(body);
+                    } else if (path.startsWith("/v0.5/traces")) {
+                        message = Decoder.decodeV05(body);
+                    } else if (path.startsWith("/v0.4/traces")) {
+                        message = Decoder.decodeV04(body);
+                    }
 
-              if (message != null) {
-                for (DecodedTrace trace : message.getTraces()) {
-                  spans.addAll(trace.getSpans());
+                    if (message != null) {
+                        for (DecodedTrace trace : message.getTraces()) {
+                            spans.addAll(trace.getSpans());
+                        }
+                    }
                 }
-              }
-            }
 
-            return EMPTY_200_RESPONSE;
-          }
+                return EMPTY_200_RESPONSE;
+            }
         });
-  }
+    }
 
-  public SimpleAgentMock start() throws IOException {
-    server.start();
+    public SimpleAgentMock start() throws IOException {
+        server.start();
 
-    return this;
-  }
+        return this;
+    }
 
-  public int getPort() {
-    return server.getPort();
-  }
+    public int getPort() {
+        return server.getPort();
+    }
 
-  public List<DecodedSpan> getSpans() {
-    return spans;
-  }
+    public List<DecodedSpan> getSpans() {
+        return spans;
+    }
 
-  @Override
-  public void close() throws IOException {
-    server.shutdown();
-  }
+    @Override
+    public void close() throws IOException {
+        server.shutdown();
+    }
 }
diff --git a/dd-java-agent/src/test/java/datadog/trace/agent/test/IntegrationTestUtils.java b/dd-java-agent/src/test/java/datadog/trace/agent/test/IntegrationTestUtils.java
index ec84b9f13c8..eda5521d5b4 100644
--- a/dd-java-agent/src/test/java/datadog/trace/agent/test/IntegrationTestUtils.java
+++ b/dd-java-agent/src/test/java/datadog/trace/agent/test/IntegrationTestUtils.java
@@ -29,290 +29,280 @@
 import java.util.jar.Manifest;
 
 public class IntegrationTestUtils {
-  /** Returns the classloader the core agent is running on. */
-  public static ClassLoader getAgentClassLoader() {
-    Field classloaderField = null;
-    try {
-      final Class<?> agentClass =
-          ClassLoader.getSystemClassLoader().loadClass("datadog.trace.bootstrap.Agent");
-      classloaderField = agentClass.getDeclaredField("AGENT_CLASSLOADER");
-      classloaderField.setAccessible(true);
-      return (ClassLoader) classloaderField.get(null);
-    } catch (final Exception e) {
-      throw new IllegalStateException(e);
-    } finally {
-      if (null != classloaderField) {
-        classloaderField.setAccessible(false);
-      }
+    /** Returns the classloader the core agent is running on. */
+    public static ClassLoader getAgentClassLoader() {
+        Field classloaderField = null;
+        try {
+            final Class<?> agentClass = ClassLoader.getSystemClassLoader().loadClass("datadog.trace.bootstrap.Agent");
+            classloaderField = agentClass.getDeclaredField("AGENT_CLASSLOADER");
+            classloaderField.setAccessible(true);
+            return (ClassLoader) classloaderField.get(null);
+        } catch (final Exception e) {
+            throw new IllegalStateException(e);
+        } finally {
+            if (null != classloaderField) {
+                classloaderField.setAccessible(false);
+            }
+        }
+    }
+
+    /** Returns the classloader to use for bootstrap resources. */
+    public static ClassLoader getBootstrapProxy() {
+        return BootstrapProxy.INSTANCE;
     }
-  }
-
-  /** Returns the classloader to use for bootstrap resources. */
-  public static ClassLoader getBootstrapProxy() {
-    return BootstrapProxy.INSTANCE;
-  }
-
-  public static File createJarFileWithClasses(final Class<?>... classes) throws IOException {
-    return createJarFileWithClasses(null, classes);
-  }
-
-  /** See {@link IntegrationTestUtils#createJarWithClasses(String, Class[])} */
-  public static URL createJarWithClasses(final Class<?>... classes) throws IOException {
-    return createJarWithClasses(null, classes);
-  }
-
-  /**
-   * Create a temporary jar on the filesystem with the bytes of the given classes.
-   *
-   * <p>The jar file will be removed when the jvm exits.
-   *
-   * @param mainClassName The name of the class to use for Main-Class and Premain-Class. May be null
-   * @param classes classes to package into the jar.
-   * @return the location of the newly created jar.
-   * @throws IOException if an I/O error occurs.
-   */
-  public static File createJarFileWithClasses(final String mainClassName, final Class<?>... classes)
-      throws IOException {
-    final File tmpJar = File.createTempFile(UUID.randomUUID() + "-", ".jar");
-    tmpJar.deleteOnExit();
-
-    final Manifest manifest = new Manifest();
-    if (mainClassName != null) {
-      final Attributes mainAttributes = manifest.getMainAttributes();
-      mainAttributes.put(Attributes.Name.MANIFEST_VERSION, "1.0");
-      mainAttributes.put(Attributes.Name.MAIN_CLASS, mainClassName);
-      mainAttributes.put(new Attributes.Name("Premain-Class"), mainClassName);
+
+    public static File createJarFileWithClasses(final Class<?>... classes) throws IOException {
+        return createJarFileWithClasses(null, classes);
     }
 
-    try (final JarOutputStream target =
-        new JarOutputStream(Files.newOutputStream(tmpJar.toPath()), manifest)) {
-      for (final Class<?> clazz : classes) {
-        addToJar(clazz, target);
-      }
+    /** See {@link IntegrationTestUtils#createJarWithClasses(String, Class[])} */
+    public static URL createJarWithClasses(final Class<?>... classes) throws IOException {
+        return createJarWithClasses(null, classes);
     }
 
-    return tmpJar;
-  }
+    /**
+     * Create a temporary jar on the filesystem with the bytes of the given classes.
+     *
+     * <p>The jar file will be removed when the jvm exits.
+     *
+     * @param mainClassName The name of the class to use for Main-Class and Premain-Class. May be null
+     * @param classes classes to package into the jar.
+     * @return the location of the newly created jar.
+     * @throws IOException if an I/O error occurs.
+     */
+    public static File createJarFileWithClasses(final String mainClassName, final Class<?>... classes)
+            throws IOException {
+        final File tmpJar = File.createTempFile(UUID.randomUUID() + "-", ".jar");
+        tmpJar.deleteOnExit();
+
+        final Manifest manifest = new Manifest();
+        if (mainClassName != null) {
+            final Attributes mainAttributes = manifest.getMainAttributes();
+            mainAttributes.put(Attributes.Name.MANIFEST_VERSION, "1.0");
+            mainAttributes.put(Attributes.Name.MAIN_CLASS, mainClassName);
+            mainAttributes.put(new Attributes.Name("Premain-Class"), mainClassName);
+        }
+
+        try (final JarOutputStream target = new JarOutputStream(Files.newOutputStream(tmpJar.toPath()), manifest)) {
+            for (final Class<?> clazz : classes) {
+                addToJar(clazz, target);
+            }
+        }
 
-  public static URL createJarWithClasses(final String mainClassName, final Class<?>... classes)
-      throws IOException {
+        return tmpJar;
+    }
 
-    return createJarFileWithClasses(mainClassName, classes).toURI().toURL();
-  }
+    public static URL createJarWithClasses(final String mainClassName, final Class<?>... classes) throws IOException {
 
-  private static void addToJar(final Class<?> clazz, final JarOutputStream jarOutputStream)
-      throws IOException {
-    InputStream inputStream = null;
-    ClassLoader loader = clazz.getClassLoader();
-    if (null == loader) {
-      // bootstrap resources can be fetched through the system loader
-      loader = ClassLoader.getSystemClassLoader();
+        return createJarFileWithClasses(mainClassName, classes).toURI().toURL();
     }
-    try {
-      final JarEntry entry = new JarEntry(getResourceName(clazz.getName()));
-      jarOutputStream.putNextEntry(entry);
-      inputStream = loader.getResourceAsStream(getResourceName(clazz.getName()));
-
-      final byte[] buffer = new byte[1024];
-      while (true) {
-        final int count = inputStream.read(buffer);
-        if (count == -1) {
-          break;
+
+    private static void addToJar(final Class<?> clazz, final JarOutputStream jarOutputStream) throws IOException {
+        InputStream inputStream = null;
+        ClassLoader loader = clazz.getClassLoader();
+        if (null == loader) {
+            // bootstrap resources can be fetched through the system loader
+            loader = ClassLoader.getSystemClassLoader();
+        }
+        try {
+            final JarEntry entry = new JarEntry(getResourceName(clazz.getName()));
+            jarOutputStream.putNextEntry(entry);
+            inputStream = loader.getResourceAsStream(getResourceName(clazz.getName()));
+
+            final byte[] buffer = new byte[1024];
+            while (true) {
+                final int count = inputStream.read(buffer);
+                if (count == -1) {
+                    break;
+                }
+                jarOutputStream.write(buffer, 0, count);
+            }
+            jarOutputStream.closeEntry();
+        } finally {
+            if (inputStream != null) {
+                inputStream.close();
+            }
         }
-        jarOutputStream.write(buffer, 0, count);
-      }
-      jarOutputStream.closeEntry();
-    } finally {
-      if (inputStream != null) {
-        inputStream.close();
-      }
     }
-  }
-
-  /** com.foo.Bar -> com/foo/Bar.class */
-  public static String getResourceName(final String className) {
-    return className.replace('.', '/') + ".class";
-  }
-
-  public static String[] getBootstrapPackagePrefixes() throws Exception {
-    final Field f =
-        getAgentClassLoader()
-            .loadClass("datadog.trace.bootstrap.Constants")
-            .getField("BOOTSTRAP_PACKAGE_PREFIXES");
-    return (String[]) f.get(null);
-  }
-
-  private static String getAgentArgument() {
-    final RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();
-    for (final String arg : runtimeMxBean.getInputArguments()) {
-      // Pick only `dd-java-agent` and exclude IDE debugger agent.
-      if (arg.startsWith("-javaagent") && arg.contains("dd-java-agent")) {
-        return arg;
-      }
+
+    /** com.foo.Bar -> com/foo/Bar.class */
+    public static String getResourceName(final String className) {
+        return className.replace('.', '/') + ".class";
     }
 
-    throw new RuntimeException("Agent jar not found");
-  }
-
-  private static String getAgentJarLocation() {
-    return getAgentArgument().replace("-javaagent:", "");
-  }
-
-  public static int runOnSeparateJvm(
-      final String mainClassName,
-      final List<? extends CharSequence> jvmArgs,
-      final List<String> mainMethodArgs,
-      final Map<String, String> envVars,
-      final boolean printOutputStreams)
-      throws Exception {
-    return runOnSeparateJvm(
-        mainClassName, jvmArgs, mainMethodArgs, envVars, printOutputStreams ? System.out : null);
-  }
-
-  public static int runOnSeparateJvm(
-      final String mainClassName,
-      final List<? extends CharSequence> jvmArgs,
-      final List<String> mainMethodArgs,
-      final Map<String, String> envVars,
-      final PrintStream out)
-      throws Exception {
-    final String classPath = System.getProperty("java.class.path");
-    return runOnSeparateJvm(mainClassName, jvmArgs, mainMethodArgs, envVars, classPath, out);
-  }
-
-  public static int runOnSeparateJvm(
-      final String mainClassName,
-      final List<? extends CharSequence> jvmArgs,
-      final List<String> mainMethodArgs,
-      final Map<String, String> envVars,
-      final File classpath,
-      final boolean printOutputStreams)
-      throws Exception {
-    return runOnSeparateJvm(
-        mainClassName, jvmArgs, mainMethodArgs, envVars, classpath.getPath(), printOutputStreams);
-  }
-
-  public static int runOnSeparateJvm(
-      final String mainClassName,
-      final List<? extends CharSequence> jvmArgs,
-      final List<String> mainMethodArgs,
-      final Map<String, String> envVars,
-      final String classpath,
-      final boolean printOutputStreams)
-      throws Exception {
-    return runOnSeparateJvm(
-        mainClassName,
-        jvmArgs,
-        mainMethodArgs,
-        envVars,
-        classpath,
-        printOutputStreams ? System.out : null);
-  }
-
-  /**
-   * On a separate JVM, run the main method for a given class.
-   *
-   * @param mainClassName The name of the entry point class. Must declare a main method.
-   * @param out Optional stream to print the stdout and stderr of the child jvm
-   * @return the return code of the child jvm
-   * @throws Exception If failed to run on separate JVM.
-   */
-  public static int runOnSeparateJvm(
-      final String mainClassName,
-      final List<? extends CharSequence> jvmArgs,
-      final List<String> mainMethodArgs,
-      final Map<String, String> envVars,
-      final String classpath,
-      final PrintStream out)
-      throws Exception {
-    final Process process =
-        startOnSeparateJvm(mainClassName, jvmArgs, mainMethodArgs, envVars, classpath);
-
-    final StreamGobbler errorGobbler = new StreamGobbler(process.getErrorStream(), "ERROR", out);
-    final StreamGobbler outputGobbler = new StreamGobbler(process.getInputStream(), "OUTPUT", out);
-    outputGobbler.start();
-    errorGobbler.start();
-
-    waitFor(process, 30, TimeUnit.SECONDS);
-
-    outputGobbler.join();
-    errorGobbler.join();
-
-    return process.exitValue();
-  }
-
-  public static Process startOnSeparateJvm(
-      final String mainClassName,
-      final List<? extends CharSequence> jvmArgs,
-      final List<String> mainMethodArgs,
-      final Map<String, String> envVars,
-      final String classpath)
-      throws Exception {
-    final String separator = FileSystems.getDefault().getSeparator();
-    final String path = System.getProperty("java.home") + separator + "bin" + separator + "java";
-
-    // Groovy may produce a mix of `String` and `GString` instances.
-    // To ensure consistent handling, map all values to plain `String`:
-    final List<String> vmArgsList = jvmArgs.stream().map(CharSequence::toString).collect(toList());
-
-    boolean runAsJar = "datadog.trace.bootstrap.AgentJar".equals(mainClassName);
-
-    if (!runAsJar) {
-      vmArgsList.add(getAgentArgument());
+    public static String[] getBootstrapPackagePrefixes() throws Exception {
+        final Field f = getAgentClassLoader()
+                .loadClass("datadog.trace.bootstrap.Constants")
+                .getField("BOOTSTRAP_PACKAGE_PREFIXES");
+        return (String[]) f.get(null);
     }
-    vmArgsList.add(getMaxMemoryArgumentForFork());
-    vmArgsList.add(getMinMemoryArgumentForFork());
-    vmArgsList.add("-XX:ErrorFile=/tmp/hs_err_pid%p.log");
-
-    final List<String> commands = new ArrayList<>();
-    commands.add(path);
-    commands.addAll(vmArgsList);
-    if (runAsJar) {
-      commands.add("-jar");
-      commands.add(getAgentJarLocation());
-    } else {
-      commands.add("-cp");
-      commands.add(classpath);
-      commands.add(mainClassName);
+
+    private static String getAgentArgument() {
+        final RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();
+        for (final String arg : runtimeMxBean.getInputArguments()) {
+            // Pick only `dd-java-agent` and exclude IDE debugger agent.
+            if (arg.startsWith("-javaagent") && arg.contains("dd-java-agent")) {
+                return arg;
+            }
+        }
+
+        throw new RuntimeException("Agent jar not found");
     }
-    commands.addAll(mainMethodArgs);
-    final ProcessBuilder processBuilder = new ProcessBuilder(commands.toArray(new String[0]));
-    processBuilder.environment().putAll(envVars);
 
-    return processBuilder.start();
-  }
+    private static String getAgentJarLocation() {
+        return getAgentArgument().replace("-javaagent:", "");
+    }
 
-  private static void waitFor(final Process process, final long timeout, final TimeUnit unit)
-      throws InterruptedException, TimeoutException {
-    if (!process.waitFor(timeout, unit)) {
-      throw new TimeoutException();
+    public static int runOnSeparateJvm(
+            final String mainClassName,
+            final List<? extends CharSequence> jvmArgs,
+            final List<String> mainMethodArgs,
+            final Map<String, String> envVars,
+            final boolean printOutputStreams)
+            throws Exception {
+        return runOnSeparateJvm(
+                mainClassName, jvmArgs, mainMethodArgs, envVars, printOutputStreams ? System.out : null);
     }
-  }
 
-  private static class StreamGobbler extends Thread {
-    InputStream stream;
-    String type;
-    PrintStream out;
+    public static int runOnSeparateJvm(
+            final String mainClassName,
+            final List<? extends CharSequence> jvmArgs,
+            final List<String> mainMethodArgs,
+            final Map<String, String> envVars,
+            final PrintStream out)
+            throws Exception {
+        final String classPath = System.getProperty("java.class.path");
+        return runOnSeparateJvm(mainClassName, jvmArgs, mainMethodArgs, envVars, classPath, out);
+    }
 
-    private StreamGobbler(final InputStream stream, final String type, final PrintStream out) {
-      this.stream = stream;
-      this.type = type;
-      this.out = out;
+    public static int runOnSeparateJvm(
+            final String mainClassName,
+            final List<? extends CharSequence> jvmArgs,
+            final List<String> mainMethodArgs,
+            final Map<String, String> envVars,
+            final File classpath,
+            final boolean printOutputStreams)
+            throws Exception {
+        return runOnSeparateJvm(
+                mainClassName, jvmArgs, mainMethodArgs, envVars, classpath.getPath(), printOutputStreams);
     }
 
-    @Override
-    public void run() {
-      try {
-        final BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
-        String line;
-        while ((line = reader.readLine()) != null) {
-          if (null != out) {
-            out.println(type + "> " + line);
-          }
+    public static int runOnSeparateJvm(
+            final String mainClassName,
+            final List<? extends CharSequence> jvmArgs,
+            final List<String> mainMethodArgs,
+            final Map<String, String> envVars,
+            final String classpath,
+            final boolean printOutputStreams)
+            throws Exception {
+        return runOnSeparateJvm(
+                mainClassName, jvmArgs, mainMethodArgs, envVars, classpath, printOutputStreams ? System.out : null);
+    }
+
+    /**
+     * On a separate JVM, run the main method for a given class.
+     *
+     * @param mainClassName The name of the entry point class. Must declare a main method.
+     * @param out Optional stream to print the stdout and stderr of the child jvm
+     * @return the return code of the child jvm
+     * @throws Exception If failed to run on separate JVM.
+     */
+    public static int runOnSeparateJvm(
+            final String mainClassName,
+            final List<? extends CharSequence> jvmArgs,
+            final List<String> mainMethodArgs,
+            final Map<String, String> envVars,
+            final String classpath,
+            final PrintStream out)
+            throws Exception {
+        final Process process = startOnSeparateJvm(mainClassName, jvmArgs, mainMethodArgs, envVars, classpath);
+
+        final StreamGobbler errorGobbler = new StreamGobbler(process.getErrorStream(), "ERROR", out);
+        final StreamGobbler outputGobbler = new StreamGobbler(process.getInputStream(), "OUTPUT", out);
+        outputGobbler.start();
+        errorGobbler.start();
+
+        waitFor(process, 30, TimeUnit.SECONDS);
+
+        outputGobbler.join();
+        errorGobbler.join();
+
+        return process.exitValue();
+    }
+
+    public static Process startOnSeparateJvm(
+            final String mainClassName,
+            final List<? extends CharSequence> jvmArgs,
+            final List<String> mainMethodArgs,
+            final Map<String, String> envVars,
+            final String classpath)
+            throws Exception {
+        final String separator = FileSystems.getDefault().getSeparator();
+        final String path = System.getProperty("java.home") + separator + "bin" + separator + "java";
+
+        // Groovy may produce a mix of `String` and `GString` instances.
+        // To ensure consistent handling, map all values to plain `String`:
+        final List<String> vmArgsList =
+                jvmArgs.stream().map(CharSequence::toString).collect(toList());
+
+        boolean runAsJar = "datadog.trace.bootstrap.AgentJar".equals(mainClassName);
+
+        if (!runAsJar) {
+            vmArgsList.add(getAgentArgument());
+        }
+        vmArgsList.add(getMaxMemoryArgumentForFork());
+        vmArgsList.add(getMinMemoryArgumentForFork());
+        vmArgsList.add("-XX:ErrorFile=/tmp/hs_err_pid%p.log");
+
+        final List<String> commands = new ArrayList<>();
+        commands.add(path);
+        commands.addAll(vmArgsList);
+        if (runAsJar) {
+            commands.add("-jar");
+            commands.add(getAgentJarLocation());
+        } else {
+            commands.add("-cp");
+            commands.add(classpath);
+            commands.add(mainClassName);
+        }
+        commands.addAll(mainMethodArgs);
+        final ProcessBuilder processBuilder = new ProcessBuilder(commands.toArray(new String[0]));
+        processBuilder.environment().putAll(envVars);
+
+        return processBuilder.start();
+    }
+
+    private static void waitFor(final Process process, final long timeout, final TimeUnit unit)
+            throws InterruptedException, TimeoutException {
+        if (!process.waitFor(timeout, unit)) {
+            throw new TimeoutException();
+        }
+    }
+
+    private static class StreamGobbler extends Thread {
+        InputStream stream;
+        String type;
+        PrintStream out;
+
+        private StreamGobbler(final InputStream stream, final String type, final PrintStream out) {
+            this.stream = stream;
+            this.type = type;
+            this.out = out;
+        }
+
+        @Override
+        public void run() {
+            try {
+                final BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    if (null != out) {
+                        out.println(type + "> " + line);
+                    }
+                }
+            } catch (final IOException e) {
+                e.printStackTrace();
+            }
         }
-      } catch (final IOException e) {
-        e.printStackTrace();
-      }
     }
-  }
 }
diff --git a/dd-java-agent/src/test/java/datadog/trace/bootstrap/AgentBootstrapAbortOnJdkToolTest.java b/dd-java-agent/src/test/java/datadog/trace/bootstrap/AgentBootstrapAbortOnJdkToolTest.java
index baa92b46ecb..c4adaf4a4b3 100644
--- a/dd-java-agent/src/test/java/datadog/trace/bootstrap/AgentBootstrapAbortOnJdkToolTest.java
+++ b/dd-java-agent/src/test/java/datadog/trace/bootstrap/AgentBootstrapAbortOnJdkToolTest.java
@@ -11,139 +11,139 @@
 
 class AgentBootstrapAbortOnJdkToolTest {
 
-  private String savedModuleMain;
-  private String savedJavaCommand;
+    private String savedModuleMain;
+    private String savedJavaCommand;
 
-  @BeforeEach
-  void saveAndClearProperties() {
-    savedModuleMain = System.clearProperty("jdk.module.main");
-    savedJavaCommand = System.clearProperty("sun.java.command");
-  }
+    @BeforeEach
+    void saveAndClearProperties() {
+        savedModuleMain = System.clearProperty("jdk.module.main");
+        savedJavaCommand = System.clearProperty("sun.java.command");
+    }
 
-  @AfterEach
-  void restoreProperties() {
-    restoreProperty("jdk.module.main", savedModuleMain);
-    restoreProperty("sun.java.command", savedJavaCommand);
-  }
+    @AfterEach
+    void restoreProperties() {
+        restoreProperty("jdk.module.main", savedModuleMain);
+        restoreProperty("sun.java.command", savedJavaCommand);
+    }
 
-  private static void restoreProperty(String key, String previousValue) {
-    if (previousValue == null) {
-      System.clearProperty(key);
-    } else {
-      System.setProperty(key, previousValue);
+    private static void restoreProperty(String key, String previousValue) {
+        if (previousValue == null) {
+            System.clearProperty(key);
+        } else {
+            System.setProperty(key, previousValue);
+        }
     }
-  }
 
-  @Test
-  void notAJdkToolWhenNoPropertiesSet() {
-    assertFalse(AgentBootstrap.isJdkTool());
-  }
+    @Test
+    void notAJdkToolWhenNoPropertiesSet() {
+        assertFalse(AgentBootstrap.isJdkTool());
+    }
 
-  @Test
-  void notAJdkToolWhenCommandIsNotAKnownTool() {
-    System.setProperty("sun.java.command", "com.example.MyApplication");
-    assertFalse(AgentBootstrap.isJdkTool());
-  }
+    @Test
+    void notAJdkToolWhenCommandIsNotAKnownTool() {
+        System.setProperty("sun.java.command", "com.example.MyApplication");
+        assertFalse(AgentBootstrap.isJdkTool());
+    }
 
-  @Test
-  void notAJdkToolWhenModuleMainIsNotAKnownTool() {
-    System.setProperty("jdk.module.main", "com.example.myapp");
-    assertFalse(AgentBootstrap.isJdkTool());
-  }
+    @Test
+    void notAJdkToolWhenModuleMainIsNotAKnownTool() {
+        System.setProperty("jdk.module.main", "com.example.myapp");
+        assertFalse(AgentBootstrap.isJdkTool());
+    }
 
-  @ParameterizedTest
-  @ValueSource(
-      strings = {
-        // Standard JDK 9+ module-based tools
-        "java.base", // keytool
-        "jdk.compiler", // javac
-        "jdk.jartool", // jar
-        "jdk.javadoc", // javadoc
-        "jdk.jcmd", // jcmd
-        "jdk.jconsole", // jconsole
-        "jdk.jshell", // jshell
-        "jdk.jfr", // jfr (JDK 9+)
-        // OpenJ9 / Semeru 11+ module-based tools
-        "openj9.dtfj", // jextract, jpackcore
-        "openj9.dtfjview", // jdmpview
-        "openj9.traceformat", // traceformat
-      })
-  void isJdkToolByModuleMain(String moduleMain) {
-    System.setProperty("jdk.module.main", moduleMain);
-    assertTrue(AgentBootstrap.isJdkTool());
-  }
+    @ParameterizedTest
+    @ValueSource(
+            strings = {
+                // Standard JDK 9+ module-based tools
+                "java.base", // keytool
+                "jdk.compiler", // javac
+                "jdk.jartool", // jar
+                "jdk.javadoc", // javadoc
+                "jdk.jcmd", // jcmd
+                "jdk.jconsole", // jconsole
+                "jdk.jshell", // jshell
+                "jdk.jfr", // jfr (JDK 9+)
+                // OpenJ9 / Semeru 11+ module-based tools
+                "openj9.dtfj", // jextract, jpackcore
+                "openj9.dtfjview", // jdmpview
+                "openj9.traceformat", // traceformat
+            })
+    void isJdkToolByModuleMain(String moduleMain) {
+        System.setProperty("jdk.module.main", moduleMain);
+        assertTrue(AgentBootstrap.isJdkTool());
+    }
 
-  @ParameterizedTest
-  @ValueSource(
-      strings = {
-        // IBM J9 JDK 8 specific tool main classes
-        "com.ibm.crypto.tools.KeyTool", // keytool
-        "com.ibm.security.krb5.internal.tools.Kinit", // kinit
-        "com.ibm.security.krb5.internal.tools.Klist", // klist
-        "com.ibm.security.krb5.internal.tools.Ktab", // ktab
-        "com.ibm.jvm.dtfjview.DTFJView", // jdmpview
-        "com.ibm.jvm.j9.dump.extract.Main", // jextract
-        "com.ibm.gsk.ikeyman.Ikeyman", // ikeyman
-        "com.ibm.gsk.ikeyman.ikeycmd", // ikeycmd
-        "com.ibm.CosNaming.TransientNameServer", // tnameserv
-        "com.ibm.idl.toJavaPortable.Compile", // idlj
-        // OpenJ9 / Semeru 8 specific tool main classes (OpenJ9 reimplementation of HotSpot tools)
-        "openj9.tools.attach.diagnostics.tools.Jcmd", // jcmd
-        "openj9.tools.attach.diagnostics.tools.Jps", // jps
-        "openj9.tools.attach.diagnostics.tools.Jstat", // jstat
-        "openj9.tools.attach.diagnostics.tools.Jmap", // jmap
-        "openj9.tools.attach.diagnostics.tools.Jstack", // jstack
-        "com.ibm.jvm.TraceFormat", // traceformat
-        // Standard JDK 8 tool main classes (Corretto 8 / OpenJDK 8)
-        "sun.tools.jar.Main", // jar
-        "com.sun.tools.javac.Main", // javac
-        "com.sun.tools.javadoc.Main", // javadoc
-        "com.sun.tools.javap.Main", // javap
-        "com.sun.tools.javah.Main", // javah
-        "sun.security.tools.keytool.Main", // keytool
-        "sun.security.tools.jarsigner.Main", // jarsigner
-        "sun.security.tools.policytool.PolicyTool", // policytool
-        "com.sun.tools.example.debug.tty.TTY", // jdb
-        "com.sun.tools.jdeps.Main", // jdeps
-        "sun.rmi.rmic.Main", // rmic
-        "sun.rmi.registry.RegistryImpl", // rmiregistry
-        "sun.rmi.server.Activation", // rmid
-        "com.sun.tools.extcheck.Main", // extcheck
-        "sun.tools.serialver.SerialVer", // serialver
-        "sun.tools.native2ascii.Main", // native2ascii
-        "com.sun.tools.internal.ws.WsGen", // wsgen
-        "com.sun.tools.internal.ws.WsImport", // wsimport
-        "com.sun.tools.internal.xjc.Driver", // xjc
-        "com.sun.tools.internal.jxc.SchemaGenerator", // schemagen
-        "com.sun.tools.script.shell.Main", // jrunscript
-        "sun.tools.jconsole.JConsole", // jconsole
-        "sun.applet.Main", // appletviewer
-        "com.sun.corba.se.impl.naming.cosnaming.TransientNameServer", // tnameserv
-        "com.sun.tools.corba.se.idl.toJavaPortable.Compile", // idlj
-        "com.sun.corba.se.impl.activation.ORBD", // orbd
-        "com.sun.corba.se.impl.activation.ServerTool", // servertool
-        "sun.tools.jps.Jps", // jps
-        "sun.tools.jstack.JStack", // jstack
-        "sun.tools.jmap.JMap", // jmap
-        "sun.tools.jinfo.JInfo", // jinfo
-        "com.sun.tools.hat.Main", // jhat
-        "sun.tools.jstat.Jstat", // jstat
-        "sun.tools.jstatd.Jstatd", // jstatd
-        "sun.tools.jcmd.JCmd", // jcmd
-        "jdk.jfr.internal.tool.Main", // jfr (OpenJDK 8u262+ backport)
-        "sun.jvm.hotspot.jdi.SADebugServer", // jsadebugd
-        "jdk.nashorn.tools.Shell", // jjs (Nashorn JS shell, JDK 8)
-        "sun.jvm.hotspot.HSDB", // hsdb (HotSpot SA GUI debugger, JDK 8)
-        "sun.jvm.hotspot.CLHSDB", // clhsdb (HotSpot SA command-line debugger, JDK 8)
-      })
-  void isJdkToolByCommand(String mainClass) {
-    System.setProperty("sun.java.command", mainClass);
-    assertTrue(AgentBootstrap.isJdkTool());
-  }
+    @ParameterizedTest
+    @ValueSource(
+            strings = {
+                // IBM J9 JDK 8 specific tool main classes
+                "com.ibm.crypto.tools.KeyTool", // keytool
+                "com.ibm.security.krb5.internal.tools.Kinit", // kinit
+                "com.ibm.security.krb5.internal.tools.Klist", // klist
+                "com.ibm.security.krb5.internal.tools.Ktab", // ktab
+                "com.ibm.jvm.dtfjview.DTFJView", // jdmpview
+                "com.ibm.jvm.j9.dump.extract.Main", // jextract
+                "com.ibm.gsk.ikeyman.Ikeyman", // ikeyman
+                "com.ibm.gsk.ikeyman.ikeycmd", // ikeycmd
+                "com.ibm.CosNaming.TransientNameServer", // tnameserv
+                "com.ibm.idl.toJavaPortable.Compile", // idlj
+                // OpenJ9 / Semeru 8 specific tool main classes (OpenJ9 reimplementation of HotSpot tools)
+                "openj9.tools.attach.diagnostics.tools.Jcmd", // jcmd
+                "openj9.tools.attach.diagnostics.tools.Jps", // jps
+                "openj9.tools.attach.diagnostics.tools.Jstat", // jstat
+                "openj9.tools.attach.diagnostics.tools.Jmap", // jmap
+                "openj9.tools.attach.diagnostics.tools.Jstack", // jstack
+                "com.ibm.jvm.TraceFormat", // traceformat
+                // Standard JDK 8 tool main classes (Corretto 8 / OpenJDK 8)
+                "sun.tools.jar.Main", // jar
+                "com.sun.tools.javac.Main", // javac
+                "com.sun.tools.javadoc.Main", // javadoc
+                "com.sun.tools.javap.Main", // javap
+                "com.sun.tools.javah.Main", // javah
+                "sun.security.tools.keytool.Main", // keytool
+                "sun.security.tools.jarsigner.Main", // jarsigner
+                "sun.security.tools.policytool.PolicyTool", // policytool
+                "com.sun.tools.example.debug.tty.TTY", // jdb
+                "com.sun.tools.jdeps.Main", // jdeps
+                "sun.rmi.rmic.Main", // rmic
+                "sun.rmi.registry.RegistryImpl", // rmiregistry
+                "sun.rmi.server.Activation", // rmid
+                "com.sun.tools.extcheck.Main", // extcheck
+                "sun.tools.serialver.SerialVer", // serialver
+                "sun.tools.native2ascii.Main", // native2ascii
+                "com.sun.tools.internal.ws.WsGen", // wsgen
+                "com.sun.tools.internal.ws.WsImport", // wsimport
+                "com.sun.tools.internal.xjc.Driver", // xjc
+                "com.sun.tools.internal.jxc.SchemaGenerator", // schemagen
+                "com.sun.tools.script.shell.Main", // jrunscript
+                "sun.tools.jconsole.JConsole", // jconsole
+                "sun.applet.Main", // appletviewer
+                "com.sun.corba.se.impl.naming.cosnaming.TransientNameServer", // tnameserv
+                "com.sun.tools.corba.se.idl.toJavaPortable.Compile", // idlj
+                "com.sun.corba.se.impl.activation.ORBD", // orbd
+                "com.sun.corba.se.impl.activation.ServerTool", // servertool
+                "sun.tools.jps.Jps", // jps
+                "sun.tools.jstack.JStack", // jstack
+                "sun.tools.jmap.JMap", // jmap
+                "sun.tools.jinfo.JInfo", // jinfo
+                "com.sun.tools.hat.Main", // jhat
+                "sun.tools.jstat.Jstat", // jstat
+                "sun.tools.jstatd.Jstatd", // jstatd
+                "sun.tools.jcmd.JCmd", // jcmd
+                "jdk.jfr.internal.tool.Main", // jfr (OpenJDK 8u262+ backport)
+                "sun.jvm.hotspot.jdi.SADebugServer", // jsadebugd
+                "jdk.nashorn.tools.Shell", // jjs (Nashorn JS shell, JDK 8)
+                "sun.jvm.hotspot.HSDB", // hsdb (HotSpot SA GUI debugger, JDK 8)
+                "sun.jvm.hotspot.CLHSDB", // clhsdb (HotSpot SA command-line debugger, JDK 8)
+            })
+    void isJdkToolByCommand(String mainClass) {
+        System.setProperty("sun.java.command", mainClass);
+        assertTrue(AgentBootstrap.isJdkTool());
+    }
 
-  @Test
-  void isJdkToolWhenCommandIncludesArguments() {
-    System.setProperty("sun.java.command", "com.ibm.crypto.tools.KeyTool -list -v");
-    assertTrue(AgentBootstrap.isJdkTool());
-  }
+    @Test
+    void isJdkToolWhenCommandIncludesArguments() {
+        System.setProperty("sun.java.command", "com.ibm.crypto.tools.KeyTool -list -v");
+        assertTrue(AgentBootstrap.isJdkTool());
+    }
 }
diff --git a/dd-java-agent/src/test/java/jvmbootstraptest/AgentLoadedChecker.java b/dd-java-agent/src/test/java/jvmbootstraptest/AgentLoadedChecker.java
index 9c7ac905e60..010c51121f4 100644
--- a/dd-java-agent/src/test/java/jvmbootstraptest/AgentLoadedChecker.java
+++ b/dd-java-agent/src/test/java/jvmbootstraptest/AgentLoadedChecker.java
@@ -4,14 +4,14 @@
 import java.net.URLClassLoader;
 
 public class AgentLoadedChecker {
-  public static void main(final String[] args) throws ClassNotFoundException {
-    // Empty classloader that delegates to bootstrap
-    final URLClassLoader emptyClassLoader = new URLClassLoader(new URL[] {}, null);
-    final Class agentClass = emptyClassLoader.loadClass("datadog.trace.bootstrap.Agent");
+    public static void main(final String[] args) throws ClassNotFoundException {
+        // Empty classloader that delegates to bootstrap
+        final URLClassLoader emptyClassLoader = new URLClassLoader(new URL[] {}, null);
+        final Class agentClass = emptyClassLoader.loadClass("datadog.trace.bootstrap.Agent");
 
-    if (agentClass.getClassLoader() != null) {
-      throw new RuntimeException(
-          "Agent loaded into classloader other than bootstrap: " + agentClass.getClassLoader());
+        if (agentClass.getClassLoader() != null) {
+            throw new RuntimeException(
+                    "Agent loaded into classloader other than bootstrap: " + agentClass.getClassLoader());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/src/test/java/jvmbootstraptest/CustomMBeanServerBuilder.java b/dd-java-agent/src/test/java/jvmbootstraptest/CustomMBeanServerBuilder.java
index 27d3c96a5e0..1765d523ccd 100644
--- a/dd-java-agent/src/test/java/jvmbootstraptest/CustomMBeanServerBuilder.java
+++ b/dd-java-agent/src/test/java/jvmbootstraptest/CustomMBeanServerBuilder.java
@@ -7,19 +7,18 @@
 import javax.management.StandardMBean;
 
 public class CustomMBeanServerBuilder extends MBeanServerBuilder {
-  public interface TestMBean {}
+    public interface TestMBean {}
 
-  @Override
-  public MBeanServer newMBeanServer(
-      final String defaultDomain, final MBeanServer outer, final MBeanServerDelegate delegate) {
-    final MBeanServer mBeanServer = super.newMBeanServer(defaultDomain, outer, delegate);
-    try {
-      mBeanServer.registerMBean(
-          new StandardMBean(new TestMBean() {}, TestMBean.class),
-          new ObjectName("test:name=custom"));
-    } catch (final Exception e) {
-      throw new IllegalStateException(e);
+    @Override
+    public MBeanServer newMBeanServer(
+            final String defaultDomain, final MBeanServer outer, final MBeanServerDelegate delegate) {
+        final MBeanServer mBeanServer = super.newMBeanServer(defaultDomain, outer, delegate);
+        try {
+            mBeanServer.registerMBean(
+                    new StandardMBean(new TestMBean() {}, TestMBean.class), new ObjectName("test:name=custom"));
+        } catch (final Exception e) {
+            throw new IllegalStateException(e);
+        }
+        return mBeanServer;
     }
-    return mBeanServer;
-  }
 }
diff --git a/dd-java-agent/src/test/java/jvmbootstraptest/CustomSecurityManager.java b/dd-java-agent/src/test/java/jvmbootstraptest/CustomSecurityManager.java
index 591fb6283bd..0566b44c74d 100644
--- a/dd-java-agent/src/test/java/jvmbootstraptest/CustomSecurityManager.java
+++ b/dd-java-agent/src/test/java/jvmbootstraptest/CustomSecurityManager.java
@@ -17,736 +17,702 @@
  * with the JVM, but blocks everything else.
  */
 public class CustomSecurityManager extends SecurityManager {
-  public static final boolean DEBUG = true;
+    public static final boolean DEBUG = true;
 
-  protected CustomSecurityManager() {}
+    protected CustomSecurityManager() {}
 
-  @Override
-  public final void checkPermission(Permission perm) {
-    checkPermission(perm, null);
-  }
+    @Override
+    public final void checkPermission(Permission perm) {
+        checkPermission(perm, null);
+    }
+
+    @Override
+    public final void checkPermission(Permission perm, Object ctx) {
+        boolean allow = false;
+
+        if (perm instanceof RuntimePermission) {
+            allow = checkRuntimePermission((RuntimePermission) perm, ctx);
+        } else if (perm instanceof NetPermission) {
+            allow = checkNetPermission((NetPermission) perm, ctx);
+        } else if (perm instanceof ReflectPermission) {
+            allow = checkReflectPermission((ReflectPermission) perm, ctx);
+        } else if (perm instanceof SecurityPermission) {
+            allow = checkSecurityPermission((SecurityPermission) perm, ctx);
+        } else if (perm instanceof FilePermission) {
+            allow = checkFilePermission((FilePermission) perm, ctx);
+        } else if (perm instanceof PropertyPermission) {
+            allow = checkPropertyPermission((PropertyPermission) perm, ctx);
+        } else if (perm instanceof MBeanServerPermission) {
+            allow = checkMBeanServerPermission((MBeanServerPermission) perm, ctx);
+        } else if (perm instanceof SocketPermission) {
+            allow = checkSocketPermission((SocketPermission) perm, ctx);
+        }
 
-  @Override
-  public final void checkPermission(Permission perm, Object ctx) {
-    boolean allow = false;
+        if (!allow) {
+            if (DEBUG) System.err.println("Blocked: " + perm);
 
-    if (perm instanceof RuntimePermission) {
-      allow = checkRuntimePermission((RuntimePermission) perm, ctx);
-    } else if (perm instanceof NetPermission) {
-      allow = checkNetPermission((NetPermission) perm, ctx);
-    } else if (perm instanceof ReflectPermission) {
-      allow = checkReflectPermission((ReflectPermission) perm, ctx);
-    } else if (perm instanceof SecurityPermission) {
-      allow = checkSecurityPermission((SecurityPermission) perm, ctx);
-    } else if (perm instanceof FilePermission) {
-      allow = checkFilePermission((FilePermission) perm, ctx);
-    } else if (perm instanceof PropertyPermission) {
-      allow = checkPropertyPermission((PropertyPermission) perm, ctx);
-    } else if (perm instanceof MBeanServerPermission) {
-      allow = checkMBeanServerPermission((MBeanServerPermission) perm, ctx);
-    } else if (perm instanceof SocketPermission) {
-      allow = checkSocketPermission((SocketPermission) perm, ctx);
+            block(perm);
+        }
     }
 
-    if (!allow) {
-      if (DEBUG) System.err.println("Blocked: " + perm);
+    final boolean checkRuntimePermission(RuntimePermission perm, Object ctx) {
+        return checkRuntimePermission(perm, ctx, perm.getName());
+    }
 
-      block(perm);
-    }
-  }
+    final boolean checkRuntimePermission(RuntimePermission perm, Object ctx, String name) {
+        switch (name) {
+            case "modifyThread":
+            case "modifyThreadGroup":
+                return checkRuntimeThreadAccess(perm, ctx, name);
 
-  final boolean checkRuntimePermission(RuntimePermission perm, Object ctx) {
-    return checkRuntimePermission(perm, ctx, perm.getName());
-  }
-
-  final boolean checkRuntimePermission(RuntimePermission perm, Object ctx, String name) {
-    switch (name) {
-      case "modifyThread":
-      case "modifyThreadGroup":
-        return checkRuntimeThreadAccess(perm, ctx, name);
-
-      case "accessDeclaredMembers":
-      case "getProtectionDomain":
-        return checkRuntimeClassAccess(perm, ctx, name);
-
-      case "getClassLoader":
-        return checkRuntimeClassLoaderAccess(perm, ctx, name);
-
-      case "createClassLoader":
-      case "setContextClassLoader":
-        return checkRuntimeClassLoaderModification(perm, ctx, name);
-
-      case "accessUserInformation":
-        return checkRuntimeUserAccess(perm, ctx);
-
-      case "shutdownHooks":
-        return checkRuntimeShutdownHooks(perm, ctx);
-
-      case "fileSystemProvider":
-      case "readFileDescriptor":
-      case "writeFileDescriptor":
-        return checkRuntimeFileSystemAccess(perm, ctx, name);
-
-      case "accessSystemModules":
-        return checkRuntimeSystemModuleAccess(perm, ctx);
-
-      case "jdk.internal.perf.Perf.getPerf":
-        return checkRuntimePerfAccess(perm, ctx);
-
-      case "sun.management.spi.PlatformMBeanProvider.subclass":
-        return checkRuntimeMBeanProviderAccess(perm, ctx);
-
-      case "manageProcess":
-        return checkRuntimeManageProcess(perm, ctx);
-
-      case "enableContextClassLoaderOverride":
-        return checkRuntimeContextClassLoader(perm, ctx);
-
-      case "setIO":
-        return checkRuntimeSetIO(perm, ctx);
-    }
-
-    if (name.startsWith("accessClassInPackage.")) {
-      String pkg = name.substring("accessClassInPackage.".length());
-      return checkRuntimePackageAccess(perm, ctx, pkg);
-    } else if (name.startsWith("loadLibrary.")) {
-      String library = name.substring("loadLibrary.".length());
-      return checkRuntimeLoadLibrary(perm, ctx, library);
-    } else if (name.startsWith("getenv.")) {
-      String envVar = name.substring("getenv.".length());
-      return checkRuntimeEnvironmentAccess(perm, ctx, envVar);
-    } else if (name.startsWith("exitVM.")) {
-      int exitCode = Integer.parseInt(name.substring("exitVM.".length()));
-      return checkRuntimeSystemExit(perm, ctx, exitCode);
-    }
-
-    return checkOtherRuntimePermission(perm, ctx, name);
-  }
-
-  protected boolean checkRuntimeSystemExit(RuntimePermission perm, Object ctx, int exitCode) {
-    return defaultCheckRuntimeSystemExit(perm, ctx, exitCode);
-  }
-
-  protected boolean defaultCheckRuntimeSystemExit(
-      RuntimePermission perm, Object ctx, int exitCode) {
-    return false;
-  }
-
-  protected boolean checkRuntimeThreadAccess(RuntimePermission perm, Object ctx, String name) {
-    return defaultCheckRuntimeThreadAccess(perm, ctx, name);
-  }
+            case "accessDeclaredMembers":
+            case "getProtectionDomain":
+                return checkRuntimeClassAccess(perm, ctx, name);
 
-  protected final boolean defaultCheckRuntimeThreadAccess(
-      RuntimePermission perm, Object ctx, String name) {
-    return true;
-  }
+            case "getClassLoader":
+                return checkRuntimeClassLoaderAccess(perm, ctx, name);
 
-  protected boolean checkRuntimeUserAccess(RuntimePermission perm, Object ctx) {
-    return defaultCheckRuntimeUserAccess(perm, ctx);
-  }
+            case "createClassLoader":
+            case "setContextClassLoader":
+                return checkRuntimeClassLoaderModification(perm, ctx, name);
 
-  protected final boolean defaultCheckRuntimeUserAccess(RuntimePermission perm, Object ctx) {
-    return true;
-  }
+            case "accessUserInformation":
+                return checkRuntimeUserAccess(perm, ctx);
 
-  protected boolean checkRuntimeEnvironmentAccess(
-      RuntimePermission perm, Object ctx, String envVar) {
-    return defaultCheckRuntimeEnvironmentAccess(perm, ctx, envVar);
-  }
+            case "shutdownHooks":
+                return checkRuntimeShutdownHooks(perm, ctx);
 
-  protected final boolean defaultCheckRuntimeEnvironmentAccess(
-      RuntimePermission perm, Object ctx, String envVar) {
-    switch (envVar) {
-      case "HOSTNAME":
-        return true;
+            case "fileSystemProvider":
+            case "readFileDescriptor":
+            case "writeFileDescriptor":
+                return checkRuntimeFileSystemAccess(perm, ctx, name);
+
+            case "accessSystemModules":
+                return checkRuntimeSystemModuleAccess(perm, ctx);
 
-      default:
+            case "jdk.internal.perf.Perf.getPerf":
+                return checkRuntimePerfAccess(perm, ctx);
+
+            case "sun.management.spi.PlatformMBeanProvider.subclass":
+                return checkRuntimeMBeanProviderAccess(perm, ctx);
+
+            case "manageProcess":
+                return checkRuntimeManageProcess(perm, ctx);
+
+            case "enableContextClassLoaderOverride":
+                return checkRuntimeContextClassLoader(perm, ctx);
+
+            case "setIO":
+                return checkRuntimeSetIO(perm, ctx);
+        }
+
+        if (name.startsWith("accessClassInPackage.")) {
+            String pkg = name.substring("accessClassInPackage.".length());
+            return checkRuntimePackageAccess(perm, ctx, pkg);
+        } else if (name.startsWith("loadLibrary.")) {
+            String library = name.substring("loadLibrary.".length());
+            return checkRuntimeLoadLibrary(perm, ctx, library);
+        } else if (name.startsWith("getenv.")) {
+            String envVar = name.substring("getenv.".length());
+            return checkRuntimeEnvironmentAccess(perm, ctx, envVar);
+        } else if (name.startsWith("exitVM.")) {
+            int exitCode = Integer.parseInt(name.substring("exitVM.".length()));
+            return checkRuntimeSystemExit(perm, ctx, exitCode);
+        }
+
+        return checkOtherRuntimePermission(perm, ctx, name);
+    }
+
+    protected boolean checkRuntimeSystemExit(RuntimePermission perm, Object ctx, int exitCode) {
+        return defaultCheckRuntimeSystemExit(perm, ctx, exitCode);
+    }
+
+    protected boolean defaultCheckRuntimeSystemExit(RuntimePermission perm, Object ctx, int exitCode) {
         return false;
     }
-  }
-
-  protected boolean checkRuntimePackageAccess(
-      RuntimePermission perm, Object ctx, String packageName) {
-    return defaultCheckRuntimeThreadAccess(perm, ctx, packageName);
-  }
-
-  protected final boolean defaultCheckRuntimePackageAccess(
-      RuntimePermission perm, Object ctx, String packageName) {
-    return isBuiltinPackage(packageName);
-  }
-
-  protected boolean checkRuntimePerfAccess(RuntimePermission perm, Object ctx) {
-    return defaultCheckRuntimePerfAccess(perm, ctx);
-  }
-
-  protected final boolean defaultCheckRuntimePerfAccess(RuntimePermission perm, Object ctx) {
-    return true;
-  }
-
-  protected static final boolean isBuiltinPackage(String packageName) {
-    return isSunPackage(packageName)
-        || isJavaPackage(packageName)
-        || isJcpPackage(packageName)
-        || isOsSpecificPackage(packageName);
-  }
-
-  protected static final boolean isSunPackage(String packageName) {
-    return packageName.startsWith("sun.");
-  }
-
-  protected static final boolean isJavaPackage(String packageName) {
-    return packageName.startsWith("java.");
-  }
-
-  protected static final boolean isJcpPackage(String packageName) {
-    return packageName.startsWith("org.jcp.");
-  }
-
-  protected static final boolean isOsSpecificPackage(String packageName) {
-    return isApplePackage(packageName);
-  }
-
-  protected static final boolean isApplePackage(String packageName) {
-    return packageName.startsWith("apple.");
-  }
-
-  protected boolean checkRuntimeLoadLibrary(
-      RuntimePermission perm, Object ctx, String libraryName) {
-    return defaultCheckRuntimeLoadLibrary(perm, ctx, libraryName);
-  }
-
-  protected boolean defaultCheckRuntimeLoadLibrary(
-      RuntimePermission perm, Object ctx, String libraryName) {
-    return isBuiltinLibrary(libraryName);
-  }
-
-  protected static final boolean isBuiltinLibrary(String libraryName) {
-    switch (libraryName) {
-      case "instrument":
-      case "management":
-      case "management_ext":
-      case "sunec":
-      case "net":
-      case "extnet":
+
+    protected boolean checkRuntimeThreadAccess(RuntimePermission perm, Object ctx, String name) {
+        return defaultCheckRuntimeThreadAccess(perm, ctx, name);
+    }
+
+    protected final boolean defaultCheckRuntimeThreadAccess(RuntimePermission perm, Object ctx, String name) {
+        return true;
+    }
+
+    protected boolean checkRuntimeUserAccess(RuntimePermission perm, Object ctx) {
+        return defaultCheckRuntimeUserAccess(perm, ctx);
+    }
+
+    protected final boolean defaultCheckRuntimeUserAccess(RuntimePermission perm, Object ctx) {
+        return true;
+    }
+
+    protected boolean checkRuntimeEnvironmentAccess(RuntimePermission perm, Object ctx, String envVar) {
+        return defaultCheckRuntimeEnvironmentAccess(perm, ctx, envVar);
+    }
+
+    protected final boolean defaultCheckRuntimeEnvironmentAccess(RuntimePermission perm, Object ctx, String envVar) {
+        switch (envVar) {
+            case "HOSTNAME":
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    protected boolean checkRuntimePackageAccess(RuntimePermission perm, Object ctx, String packageName) {
+        return defaultCheckRuntimeThreadAccess(perm, ctx, packageName);
+    }
+
+    protected final boolean defaultCheckRuntimePackageAccess(RuntimePermission perm, Object ctx, String packageName) {
+        return isBuiltinPackage(packageName);
+    }
+
+    protected boolean checkRuntimePerfAccess(RuntimePermission perm, Object ctx) {
+        return defaultCheckRuntimePerfAccess(perm, ctx);
+    }
+
+    protected final boolean defaultCheckRuntimePerfAccess(RuntimePermission perm, Object ctx) {
+        return true;
+    }
+
+    protected static final boolean isBuiltinPackage(String packageName) {
+        return isSunPackage(packageName)
+                || isJavaPackage(packageName)
+                || isJcpPackage(packageName)
+                || isOsSpecificPackage(packageName);
+    }
+
+    protected static final boolean isSunPackage(String packageName) {
+        return packageName.startsWith("sun.");
+    }
+
+    protected static final boolean isJavaPackage(String packageName) {
+        return packageName.startsWith("java.");
+    }
+
+    protected static final boolean isJcpPackage(String packageName) {
+        return packageName.startsWith("org.jcp.");
+    }
+
+    protected static final boolean isOsSpecificPackage(String packageName) {
+        return isApplePackage(packageName);
+    }
+
+    protected static final boolean isApplePackage(String packageName) {
+        return packageName.startsWith("apple.");
+    }
+
+    protected boolean checkRuntimeLoadLibrary(RuntimePermission perm, Object ctx, String libraryName) {
+        return defaultCheckRuntimeLoadLibrary(perm, ctx, libraryName);
+    }
+
+    protected boolean defaultCheckRuntimeLoadLibrary(RuntimePermission perm, Object ctx, String libraryName) {
+        return isBuiltinLibrary(libraryName);
+    }
+
+    protected static final boolean isBuiltinLibrary(String libraryName) {
+        switch (libraryName) {
+            case "instrument":
+            case "management":
+            case "management_ext":
+            case "sunec":
+            case "net":
+            case "extnet":
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    protected boolean checkRuntimeClassAccess(RuntimePermission perm, Object ctx, String permName) {
+        return defaultCheckRuntimeClassAccess(perm, ctx, permName);
+    }
+
+    protected final boolean defaultCheckRuntimeClassAccess(RuntimePermission perm, Object ctx, String permName) {
         return true;
+    }
+
+    protected boolean checkRuntimeClassLoaderAccess(RuntimePermission perm, Object ctx, String permName) {
+        return defaultCheckRuntimeClassLoaderAccess(perm, ctx, permName);
+    }
+
+    protected final boolean defaultCheckRuntimeClassLoaderAccess(RuntimePermission perm, Object ctx, String permName) {
+        return true;
+    }
+
+    protected boolean checkRuntimeClassLoaderModification(RuntimePermission perm, Object ctx, String permName) {
+        return checkRuntimeClassLoaderModification(perm, ctx, permName);
+    }
+
+    protected final boolean defaultCheckRuntimeClassLoaderModification(
+            RuntimePermission perm, Object ctx, String permName) {
+        return false;
+    }
+
+    protected boolean checkRuntimeShutdownHooks(RuntimePermission perm, Object ctx) {
+        return defaultCheckRuntimeShutdownHooks(perm, ctx);
+    }
+
+    protected final boolean defaultCheckRuntimeShutdownHooks(RuntimePermission perm, Object ctx) {
+        return false;
+    }
+
+    protected boolean checkRuntimeSystemModuleAccess(RuntimePermission perm, Object ctx) {
+        return defaultCheckRuntimeSystemModuleAccess(perm, ctx);
+    }
+
+    protected final boolean defaultCheckRuntimeSystemModuleAccess(RuntimePermission perm, Object ctx) {
+        return false;
+    }
+
+    protected boolean checkRuntimeManageProcess(RuntimePermission perm, Object ctx) {
+        return defaultCheckRuntimeManageProcess(perm, ctx);
+    }
 
-      default:
+    protected final boolean defaultCheckRuntimeManageProcess(RuntimePermission perm, Object ctx) {
         return false;
     }
-  }
-
-  protected boolean checkRuntimeClassAccess(RuntimePermission perm, Object ctx, String permName) {
-    return defaultCheckRuntimeClassAccess(perm, ctx, permName);
-  }
-
-  protected final boolean defaultCheckRuntimeClassAccess(
-      RuntimePermission perm, Object ctx, String permName) {
-    return true;
-  }
-
-  protected boolean checkRuntimeClassLoaderAccess(
-      RuntimePermission perm, Object ctx, String permName) {
-    return defaultCheckRuntimeClassLoaderAccess(perm, ctx, permName);
-  }
-
-  protected final boolean defaultCheckRuntimeClassLoaderAccess(
-      RuntimePermission perm, Object ctx, String permName) {
-    return true;
-  }
-
-  protected boolean checkRuntimeClassLoaderModification(
-      RuntimePermission perm, Object ctx, String permName) {
-    return checkRuntimeClassLoaderModification(perm, ctx, permName);
-  }
-
-  protected final boolean defaultCheckRuntimeClassLoaderModification(
-      RuntimePermission perm, Object ctx, String permName) {
-    return false;
-  }
-
-  protected boolean checkRuntimeShutdownHooks(RuntimePermission perm, Object ctx) {
-    return defaultCheckRuntimeShutdownHooks(perm, ctx);
-  }
-
-  protected final boolean defaultCheckRuntimeShutdownHooks(RuntimePermission perm, Object ctx) {
-    return false;
-  }
-
-  protected boolean checkRuntimeSystemModuleAccess(RuntimePermission perm, Object ctx) {
-    return defaultCheckRuntimeSystemModuleAccess(perm, ctx);
-  }
-
-  protected final boolean defaultCheckRuntimeSystemModuleAccess(
-      RuntimePermission perm, Object ctx) {
-    return false;
-  }
-
-  protected boolean checkRuntimeManageProcess(RuntimePermission perm, Object ctx) {
-    return defaultCheckRuntimeManageProcess(perm, ctx);
-  }
-
-  protected final boolean defaultCheckRuntimeManageProcess(RuntimePermission perm, Object ctx) {
-    return false;
-  }
-
-  protected boolean checkRuntimeContextClassLoader(RuntimePermission perm, Object ctx) {
-    return defaultCheckRuntimeContextClassLoader(perm, ctx);
-  }
-
-  protected final boolean defaultCheckRuntimeContextClassLoader(
-      RuntimePermission perm, Object ctx) {
-    return false;
-  }
-
-  protected boolean checkRuntimeSetIO(RuntimePermission perm, Object ctx) {
-    return defaultCheckRuntimeSetIO(perm, ctx);
-  }
-
-  protected final boolean defaultCheckRuntimeSetIO(RuntimePermission perm, Object ctx) {
-    return true;
-  }
-
-  protected boolean checkOtherRuntimePermission(
-      RuntimePermission perm, Object ctx, String permName) {
-    return defaultOtherRuntimePermission(perm, ctx, permName);
-  }
-
-  protected final boolean defaultOtherRuntimePermission(
-      RuntimePermission perm, Object ctx, String permName) {
-    return false;
-  }
-
-  protected boolean checkRuntimeFileSystemAccess(
-      RuntimePermission perm, Object ctx, String permission) {
-    return defaultCheckRuntimeFileSystemAccess(perm, ctx, permission);
-  }
-
-  protected boolean defaultCheckRuntimeFileSystemAccess(
-      RuntimePermission perm, Object ctx, String permission) {
-    return false;
-  }
-
-  protected boolean checkFilePermission(FilePermission perm, Object ctx) {
-    switch (perm.getActions()) {
-      case "read":
-        return checkFileReadPermission(perm, ctx, perm.getName());
-
-      case "write":
-        return checkFileWritePermission(perm, ctx, perm.getName());
-
-      case "execute":
-        return checkFileExecutePermission(perm, ctx, perm.getName());
-
-      default:
+
+    protected boolean checkRuntimeContextClassLoader(RuntimePermission perm, Object ctx) {
+        return defaultCheckRuntimeContextClassLoader(perm, ctx);
+    }
+
+    protected final boolean defaultCheckRuntimeContextClassLoader(RuntimePermission perm, Object ctx) {
         return false;
     }
-  }
-
-  protected boolean checkFileReadPermission(FilePermission perm, Object ctx, String filePath) {
-    return defaultCheckFileReadPermission(perm, ctx, filePath);
-  }
-
-  protected final boolean defaultCheckFileReadPermission(
-      FilePermission perm, Object ctx, String filePath) {
-    return isJarFile(filePath)
-        || isClassFile(filePath)
-        || isLibraryFile(filePath)
-        || isJreFile(filePath)
-        || isMefaInfLookup(filePath)
-        || isProcFile(filePath)
-        || isDevFile(filePath)
-        || isEtcFile(filePath)
-        || isTimeZoneDb(filePath)
-        || isNetProperties(filePath)
-        || isIbmFile(filePath)
-        || isOracleFile(filePath);
-  }
-
-  protected boolean checkFileWritePermission(FilePermission perm, Object ctx, String filePath) {
-    return defaultCheckFileWritePermission(perm, ctx, filePath);
-  }
-
-  protected final boolean defaultCheckFileWritePermission(
-      FilePermission perm, Object ctx, String filePath) {
-    return false;
-  }
-
-  protected boolean checkFileExecutePermission(FilePermission perm, Object ctx, String filePath) {
-    return defaultCheckFileExecutePermission(perm, ctx, filePath);
-  }
-
-  protected final boolean defaultCheckFileExecutePermission(
-      FilePermission perm, Object ctx, String filePath) {
-    return false;
-  }
-
-  protected static final boolean isJarFile(String filePath) {
-    return filePath.endsWith(".jar");
-  }
-
-  protected static final boolean isClassFile(String filePath) {
-    return filePath.endsWith(".class");
-  }
-
-  protected static final boolean isIbmFile(String filePath) {
-    return filePath.endsWith("/tmp/.com_ibm_tools_attach");
-  }
-
-  protected static final boolean isOracleFile(String filePath) {
-    return filePath.contains("/oracle8");
-  }
-
-  protected static final boolean isLibraryFile(String filePath) {
-    return filePath.endsWith(".dylib") || filePath.endsWith(".so") || filePath.endsWith(".dll");
-  }
-
-  protected static final boolean isJreFile(String filePath) {
-    return filePath.contains("/jre/");
-  }
-
-  protected static final boolean isProcFile(String filePath) {
-    return filePath.startsWith("/proc/");
-  }
-
-  protected static final boolean isDevFile(String filePath) {
-    return filePath.startsWith("/dev/");
-  }
-
-  protected static final boolean isEtcFile(String filePath) {
-    return filePath.startsWith("/etc/");
-  }
-
-  protected static final boolean isMefaInfLookup(String filePath) {
-    return filePath.contains("/META-INF");
-  }
-
-  protected static final boolean isTimeZoneDb(String filePath) {
-    return filePath.endsWith("/tzdb.dat");
-  }
-
-  protected static final boolean isNetProperties(String filePath) {
-    return filePath.endsWith("/net.properties");
-  }
-
-  protected boolean checkNetPermission(NetPermission perm, Object ctx) {
-    return defaultCheckNetPermission(perm, ctx);
-  }
-
-  final boolean defaultCheckNetPermission(NetPermission perm, Object ctx) {
-    if (isBuiltinNetPermission(perm)) return true;
-
-    return false;
-  }
-
-  protected boolean isBuiltinNetPermission(NetPermission perm) {
-    switch (perm.getName()) {
-      case "specifyStreamHandler":
-      case "getProxySelector":
+
+    protected boolean checkRuntimeSetIO(RuntimePermission perm, Object ctx) {
+        return defaultCheckRuntimeSetIO(perm, ctx);
+    }
+
+    protected final boolean defaultCheckRuntimeSetIO(RuntimePermission perm, Object ctx) {
         return true;
+    }
+
+    protected boolean checkOtherRuntimePermission(RuntimePermission perm, Object ctx, String permName) {
+        return defaultOtherRuntimePermission(perm, ctx, permName);
+    }
 
-      default:
+    protected final boolean defaultOtherRuntimePermission(RuntimePermission perm, Object ctx, String permName) {
         return false;
     }
-  }
 
-  protected final boolean checkReflectPermission(ReflectPermission perm, Object ctx) {
-    return checkReflectPermission(perm, ctx, perm.getName());
-  }
+    protected boolean checkRuntimeFileSystemAccess(RuntimePermission perm, Object ctx, String permission) {
+        return defaultCheckRuntimeFileSystemAccess(perm, ctx, permission);
+    }
+
+    protected boolean defaultCheckRuntimeFileSystemAccess(RuntimePermission perm, Object ctx, String permission) {
+        return false;
+    }
 
-  protected boolean checkReflectPermission(ReflectPermission perm, Object ctx, String permName) {
-    return defaultCheckReflectPermission(perm, ctx, permName);
-  }
+    protected boolean checkFilePermission(FilePermission perm, Object ctx) {
+        switch (perm.getActions()) {
+            case "read":
+                return checkFileReadPermission(perm, ctx, perm.getName());
 
-  protected final boolean defaultCheckReflectPermission(
-      ReflectPermission perm, Object ctx, String permName) {
-    switch (permName) {
-      case "suppressAccessChecks":
+            case "write":
+                return checkFileWritePermission(perm, ctx, perm.getName());
+
+            case "execute":
+                return checkFileExecutePermission(perm, ctx, perm.getName());
+
+            default:
+                return false;
+        }
+    }
+
+    protected boolean checkFileReadPermission(FilePermission perm, Object ctx, String filePath) {
+        return defaultCheckFileReadPermission(perm, ctx, filePath);
+    }
+
+    protected final boolean defaultCheckFileReadPermission(FilePermission perm, Object ctx, String filePath) {
+        return isJarFile(filePath)
+                || isClassFile(filePath)
+                || isLibraryFile(filePath)
+                || isJreFile(filePath)
+                || isMefaInfLookup(filePath)
+                || isProcFile(filePath)
+                || isDevFile(filePath)
+                || isEtcFile(filePath)
+                || isTimeZoneDb(filePath)
+                || isNetProperties(filePath)
+                || isIbmFile(filePath)
+                || isOracleFile(filePath);
+    }
+
+    protected boolean checkFileWritePermission(FilePermission perm, Object ctx, String filePath) {
+        return defaultCheckFileWritePermission(perm, ctx, filePath);
+    }
+
+    protected final boolean defaultCheckFileWritePermission(FilePermission perm, Object ctx, String filePath) {
         return false;
     }
 
-    return true;
-  }
+    protected boolean checkFileExecutePermission(FilePermission perm, Object ctx, String filePath) {
+        return defaultCheckFileExecutePermission(perm, ctx, filePath);
+    }
 
-  final boolean checkSecurityPermission(SecurityPermission perm, Object ctx) {
-    String permName = perm.getName();
+    protected final boolean defaultCheckFileExecutePermission(FilePermission perm, Object ctx, String filePath) {
+        return false;
+    }
 
-    if (permName.startsWith("getProperty.")) {
-      String propertyName = permName.substring("getProperty.".length());
-      return checkSecurityGetPermission(perm, ctx, propertyName);
-    } else if (permName.startsWith("putProviderProperty.")) {
-      String propertyName = permName.substring("putProviderProperty.".length());
-      return checkSecurityPutPermission(perm, ctx, propertyName);
+    protected static final boolean isJarFile(String filePath) {
+        return filePath.endsWith(".jar");
     }
 
-    return false;
-  }
+    protected static final boolean isClassFile(String filePath) {
+        return filePath.endsWith(".class");
+    }
 
-  protected boolean checkSecurityGetPermission(
-      SecurityPermission perm, Object ctx, String propertyName) {
-    return defaultCheckSecurityGetPermission(perm, ctx, propertyName);
-  }
+    protected static final boolean isIbmFile(String filePath) {
+        return filePath.endsWith("/tmp/.com_ibm_tools_attach");
+    }
 
-  protected boolean defaultCheckSecurityGetPermission(
-      SecurityPermission perm, Object ctx, String propertyName) {
-    return true;
-  }
+    protected static final boolean isOracleFile(String filePath) {
+        return filePath.contains("/oracle8");
+    }
 
-  protected boolean checkSecurityPutPermission(
-      SecurityPermission perm, Object ctx, String propertyName) {
-    return defaultCheckSecurityPutPermission(perm, ctx, propertyName);
-  }
+    protected static final boolean isLibraryFile(String filePath) {
+        return filePath.endsWith(".dylib") || filePath.endsWith(".so") || filePath.endsWith(".dll");
+    }
 
-  protected final boolean defaultCheckSecurityPutPermission(
-      SecurityPermission perm, Object ctx, String propertyName) {
-    return true;
-  }
+    protected static final boolean isJreFile(String filePath) {
+        return filePath.contains("/jre/");
+    }
 
-  final boolean checkPropertyPermission(PropertyPermission perm, Object ctx) {
-    switch (perm.getActions()) {
-      case "read":
-        return checkPropertyReadPermission(perm, ctx, perm.getName());
+    protected static final boolean isProcFile(String filePath) {
+        return filePath.startsWith("/proc/");
+    }
 
-      case "write":
-        return checkPropertyWritePermission(perm, ctx, perm.getName());
+    protected static final boolean isDevFile(String filePath) {
+        return filePath.startsWith("/dev/");
+    }
 
-      case "read,write":
-        if (perm.getName().equals("*")) {
-          return true;
-        } else {
-          return checkPropertyReadPermission(perm, ctx, perm.getName())
-              && checkPropertyWritePermission(perm, ctx, perm.getName());
-        }
+    protected static final boolean isEtcFile(String filePath) {
+        return filePath.startsWith("/etc/");
+    }
+
+    protected static final boolean isMefaInfLookup(String filePath) {
+        return filePath.contains("/META-INF");
+    }
+
+    protected static final boolean isTimeZoneDb(String filePath) {
+        return filePath.endsWith("/tzdb.dat");
+    }
+
+    protected static final boolean isNetProperties(String filePath) {
+        return filePath.endsWith("/net.properties");
+    }
+
+    protected boolean checkNetPermission(NetPermission perm, Object ctx) {
+        return defaultCheckNetPermission(perm, ctx);
+    }
+
+    final boolean defaultCheckNetPermission(NetPermission perm, Object ctx) {
+        if (isBuiltinNetPermission(perm)) return true;
 
-      default:
         return false;
     }
-  }
-
-  protected boolean checkPropertyReadPermission(
-      PropertyPermission perm, Object ctx, String property) {
-    return defaultCheckPropertyReadPermission(perm, ctx, property);
-  }
-
-  protected final boolean defaultCheckPropertyReadPermission(
-      PropertyPermission perm, Object ctx, String property) {
-    return isBuiltinProperty(property);
-  }
-
-  /*
-   * Minimal set of properties needed to keep JVM from crashing itself
-   */
-  protected final boolean minimalCheckPropertyReadPermission(
-      PropertyPermission perm, Object ctx, String property) {
-    switch (property) {
-      case "sun.boot.class.path":
-      case "sun.reflect.noInflation":
-      case "sun.reflect.inflationThreshold":
-      case "sun.nio.cs.bugLevel":
-      case "java.system.class.loader":
-      case "java.protocol.handler.pkgs":
-      case "java.vm.specification.version":
-      case "java.vm.specification.name":
-      case "java.vm.specification.vendor":
-      case "java.vm.version":
-      case "java.vm.name":
-      case "java.vm.vendor":
-      case "java.vm.info":
-      case "java.library.path":
-      case "java.class.path":
-      case "java.endorsed.dirs":
-      case "java.ext.dirs":
-      case "java.version":
-      case "java.home":
-      case "file.encoding":
-      case "sun.boot.library.path":
-      case "sun.jnu.encoding":
-      case "jdk.module.main":
-      case "jdk.debug":
-      case "jdk.instrument.traceUsage":
-      case "jdk.util.jar.version":
-      case "jdk.util.jar.enableMultiRelease":
-      case "jdk.jar.maxSignatureFileSize":
-      case "jdk.util.zip.disableZip64ExtraFieldValidation":
-      case "user.dir":
-      case "ibm.java9.forceCommonCleanerShutdown":
-      case "com.ibm.dbgmalloc":
-      case "com.ibm.tools.attach.shutdown_timeout":
-      case "ibm.system.encoding":
-      case "os.name":
-      case "JAVABIDI":
-        return true;
+
+    protected boolean isBuiltinNetPermission(NetPermission perm) {
+        switch (perm.getName()) {
+            case "specifyStreamHandler":
+            case "getProxySelector":
+                return true;
+
+            default:
+                return false;
+        }
     }
 
-    if (property.startsWith("java.lang.invoke.MethodHandle")) {
-      return true;
+    protected final boolean checkReflectPermission(ReflectPermission perm, Object ctx) {
+        return checkReflectPermission(perm, ctx, perm.getName());
     }
 
-    return false;
-  }
+    protected boolean checkReflectPermission(ReflectPermission perm, Object ctx, String permName) {
+        return defaultCheckReflectPermission(perm, ctx, permName);
+    }
 
-  protected boolean checkPropertyWritePermission(
-      PropertyPermission perm, Object ctx, String property) {
-    return defaultCheckPropertyWritePermission(perm, ctx, property);
-  }
+    protected final boolean defaultCheckReflectPermission(ReflectPermission perm, Object ctx, String permName) {
+        switch (permName) {
+            case "suppressAccessChecks":
+                return false;
+        }
 
-  protected boolean defaultCheckPropertyWritePermission(
-      PropertyPermission perm, Object ctx, String property) {
-    switch (property) {
-      case "apple.awt.application.name":
-        // JDK21 triggers this write -- even for non-AWT / non-GUI apps???
         return true;
+    }
 
-      default:
-        return isUserLocaleProperty(property);
-    }
-  }
-
-  protected static final boolean isBuiltinProperty(String propertyName) {
-    return isSunProperty(propertyName)
-        || isJavaProperty(propertyName)
-        || isJdkProperty(propertyName)
-        || isJmxProperty(propertyName)
-        || isOsProperty(propertyName)
-        || isUserLocaleProperty(propertyName)
-        || isGraalProperty(propertyName)
-        || isAzulProperty(propertyName)
-        || isIbmProperty(propertyName)
-        || isProxyProperty(propertyName)
-        || isReflectProperty(propertyName)
-        || isAppleProperty(propertyName)
-        || isFileProperty(propertyName);
-  }
-
-  protected static final boolean isSunProperty(String propertyName) {
-    return propertyName.startsWith("sun.") || propertyName.startsWith("com.sun.");
-  }
-
-  protected static final boolean isJavaProperty(String propertyName) {
-    return propertyName.startsWith("java.") || propertyName.startsWith("javax.");
-  }
-
-  protected static final boolean isJdkProperty(String propertyName) {
-    return propertyName.startsWith("jdk.");
-  }
-
-  protected static final boolean isJmxProperty(String propertyName) {
-    return propertyName.startsWith("jmx.");
-  }
-
-  protected static final boolean isOsProperty(String propertyName) {
-    return propertyName.startsWith("os.") || propertyName.equals("path.separator");
-  }
-
-  protected static final boolean isFileProperty(String propertyName) {
-    return propertyName.startsWith("file.");
-  }
-
-  protected static final boolean isUserLocaleProperty(String propertyName) {
-    return propertyName.startsWith("user.");
-  }
-
-  protected static final boolean isGraalProperty(String propertyName) {
-    return propertyName.startsWith("org.graalvm.");
-  }
-
-  protected static final boolean isAzulProperty(String propertyName) {
-    return propertyName.startsWith("com.azul.");
-  }
-
-  protected static final boolean isIbmProperty(String propertyName) {
-    // IBM specific properties w/o IBM in the name
-    switch (propertyName) {
-      case "file.encoding":
-      case "JAVABIDI":
-        return true;
+    final boolean checkSecurityPermission(SecurityPermission perm, Object ctx) {
+        String permName = perm.getName();
+
+        if (permName.startsWith("getProperty.")) {
+            String propertyName = permName.substring("getProperty.".length());
+            return checkSecurityGetPermission(perm, ctx, propertyName);
+        } else if (permName.startsWith("putProviderProperty.")) {
+            String propertyName = permName.substring("putProviderProperty.".length());
+            return checkSecurityPutPermission(perm, ctx, propertyName);
+        }
+
+        return false;
     }
-    return propertyName.startsWith("ibm.") || propertyName.startsWith("com.ibm.");
-  }
 
-  protected static final boolean isAppleProperty(String propertyName) {
-    return propertyName.startsWith("apple.");
-  }
+    protected boolean checkSecurityGetPermission(SecurityPermission perm, Object ctx, String propertyName) {
+        return defaultCheckSecurityGetPermission(perm, ctx, propertyName);
+    }
 
-  protected static final boolean isReflectProperty(String propertyName) {
-    switch (propertyName) {
-      case "impl.prefix":
+    protected boolean defaultCheckSecurityGetPermission(SecurityPermission perm, Object ctx, String propertyName) {
         return true;
+    }
 
-      default:
-        return false;
+    protected boolean checkSecurityPutPermission(SecurityPermission perm, Object ctx, String propertyName) {
+        return defaultCheckSecurityPutPermission(perm, ctx, propertyName);
     }
-  }
 
-  protected static final boolean isProxyProperty(String propertyName) {
-    switch (propertyName) {
-      case "http.proxyHost":
-      case "proxyHost":
-      case "socksProxyHost":
-      case "http.nonProxyHosts":
+    protected final boolean defaultCheckSecurityPutPermission(
+            SecurityPermission perm, Object ctx, String propertyName) {
         return true;
+    }
+
+    final boolean checkPropertyPermission(PropertyPermission perm, Object ctx) {
+        switch (perm.getActions()) {
+            case "read":
+                return checkPropertyReadPermission(perm, ctx, perm.getName());
+
+            case "write":
+                return checkPropertyWritePermission(perm, ctx, perm.getName());
+
+            case "read,write":
+                if (perm.getName().equals("*")) {
+                    return true;
+                } else {
+                    return checkPropertyReadPermission(perm, ctx, perm.getName())
+                            && checkPropertyWritePermission(perm, ctx, perm.getName());
+                }
+
+            default:
+                return false;
+        }
+    }
+
+    protected boolean checkPropertyReadPermission(PropertyPermission perm, Object ctx, String property) {
+        return defaultCheckPropertyReadPermission(perm, ctx, property);
+    }
+
+    protected final boolean defaultCheckPropertyReadPermission(PropertyPermission perm, Object ctx, String property) {
+        return isBuiltinProperty(property);
+    }
+
+    /*
+     * Minimal set of properties needed to keep JVM from crashing itself
+     */
+    protected final boolean minimalCheckPropertyReadPermission(PropertyPermission perm, Object ctx, String property) {
+        switch (property) {
+            case "sun.boot.class.path":
+            case "sun.reflect.noInflation":
+            case "sun.reflect.inflationThreshold":
+            case "sun.nio.cs.bugLevel":
+            case "java.system.class.loader":
+            case "java.protocol.handler.pkgs":
+            case "java.vm.specification.version":
+            case "java.vm.specification.name":
+            case "java.vm.specification.vendor":
+            case "java.vm.version":
+            case "java.vm.name":
+            case "java.vm.vendor":
+            case "java.vm.info":
+            case "java.library.path":
+            case "java.class.path":
+            case "java.endorsed.dirs":
+            case "java.ext.dirs":
+            case "java.version":
+            case "java.home":
+            case "file.encoding":
+            case "sun.boot.library.path":
+            case "sun.jnu.encoding":
+            case "jdk.module.main":
+            case "jdk.debug":
+            case "jdk.instrument.traceUsage":
+            case "jdk.util.jar.version":
+            case "jdk.util.jar.enableMultiRelease":
+            case "jdk.jar.maxSignatureFileSize":
+            case "jdk.util.zip.disableZip64ExtraFieldValidation":
+            case "user.dir":
+            case "ibm.java9.forceCommonCleanerShutdown":
+            case "com.ibm.dbgmalloc":
+            case "com.ibm.tools.attach.shutdown_timeout":
+            case "ibm.system.encoding":
+            case "os.name":
+            case "JAVABIDI":
+                return true;
+        }
+
+        if (property.startsWith("java.lang.invoke.MethodHandle")) {
+            return true;
+        }
 
-      default:
         return false;
     }
-  }
 
-  protected boolean checkRuntimeMBeanProviderAccess(RuntimePermission perm, Object ctx) {
-    return defaultCheckRuntimeMBeanProviderAccess(perm, ctx);
-  }
+    protected boolean checkPropertyWritePermission(PropertyPermission perm, Object ctx, String property) {
+        return defaultCheckPropertyWritePermission(perm, ctx, property);
+    }
+
+    protected boolean defaultCheckPropertyWritePermission(PropertyPermission perm, Object ctx, String property) {
+        switch (property) {
+            case "apple.awt.application.name":
+                // JDK21 triggers this write -- even for non-AWT / non-GUI apps???
+                return true;
+
+            default:
+                return isUserLocaleProperty(property);
+        }
+    }
 
-  protected final boolean defaultCheckRuntimeMBeanProviderAccess(
-      RuntimePermission perm, Object ctx) {
-    return false;
-  }
+    protected static final boolean isBuiltinProperty(String propertyName) {
+        return isSunProperty(propertyName)
+                || isJavaProperty(propertyName)
+                || isJdkProperty(propertyName)
+                || isJmxProperty(propertyName)
+                || isOsProperty(propertyName)
+                || isUserLocaleProperty(propertyName)
+                || isGraalProperty(propertyName)
+                || isAzulProperty(propertyName)
+                || isIbmProperty(propertyName)
+                || isProxyProperty(propertyName)
+                || isReflectProperty(propertyName)
+                || isAppleProperty(propertyName)
+                || isFileProperty(propertyName);
+    }
 
-  protected boolean checkMBeanServerPermission(MBeanServerPermission perm, Object ctx) {
-    return defaultCheckMBeanServerPermission(perm, ctx);
-  }
+    protected static final boolean isSunProperty(String propertyName) {
+        return propertyName.startsWith("sun.") || propertyName.startsWith("com.sun.");
+    }
 
-  protected boolean defaultCheckMBeanServerPermission(MBeanServerPermission perm, Object ctx) {
-    return false;
-  }
+    protected static final boolean isJavaProperty(String propertyName) {
+        return propertyName.startsWith("java.") || propertyName.startsWith("javax.");
+    }
 
-  final boolean checkSocketPermission(SocketPermission perm, Object ctx) {
-    switch (perm.getActions()) {
-      case "resolve":
-        return checkSocketResolve(perm, ctx, perm.getName());
+    protected static final boolean isJdkProperty(String propertyName) {
+        return propertyName.startsWith("jdk.");
+    }
 
-      case "connect,resolve":
-        {
-          String name = perm.getName();
-          int colonPos = name.indexOf(':');
+    protected static final boolean isJmxProperty(String propertyName) {
+        return propertyName.startsWith("jmx.");
+    }
 
-          String host = name.substring(0, colonPos);
-          int port = Integer.parseInt(name.substring(colonPos + 1));
+    protected static final boolean isOsProperty(String propertyName) {
+        return propertyName.startsWith("os.") || propertyName.equals("path.separator");
+    }
 
-          return checkSocketResolve(perm, ctx, host) && checkSocketConnect(perm, ctx, host, port);
+    protected static final boolean isFileProperty(String propertyName) {
+        return propertyName.startsWith("file.");
+    }
+
+    protected static final boolean isUserLocaleProperty(String propertyName) {
+        return propertyName.startsWith("user.");
+    }
+
+    protected static final boolean isGraalProperty(String propertyName) {
+        return propertyName.startsWith("org.graalvm.");
+    }
+
+    protected static final boolean isAzulProperty(String propertyName) {
+        return propertyName.startsWith("com.azul.");
+    }
+
+    protected static final boolean isIbmProperty(String propertyName) {
+        // IBM specific properties w/o IBM in the name
+        switch (propertyName) {
+            case "file.encoding":
+            case "JAVABIDI":
+                return true;
         }
+        return propertyName.startsWith("ibm.") || propertyName.startsWith("com.ibm.");
+    }
+
+    protected static final boolean isAppleProperty(String propertyName) {
+        return propertyName.startsWith("apple.");
+    }
 
-      default:
+    protected static final boolean isReflectProperty(String propertyName) {
+        switch (propertyName) {
+            case "impl.prefix":
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    protected static final boolean isProxyProperty(String propertyName) {
+        switch (propertyName) {
+            case "http.proxyHost":
+            case "proxyHost":
+            case "socksProxyHost":
+            case "http.nonProxyHosts":
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    protected boolean checkRuntimeMBeanProviderAccess(RuntimePermission perm, Object ctx) {
+        return defaultCheckRuntimeMBeanProviderAccess(perm, ctx);
+    }
+
+    protected final boolean defaultCheckRuntimeMBeanProviderAccess(RuntimePermission perm, Object ctx) {
         return false;
     }
-  }
 
-  protected boolean checkSocketResolve(SocketPermission perm, Object ctx, String host) {
-    return defaultCheckSocketResolve(perm, ctx, host);
-  }
+    protected boolean checkMBeanServerPermission(MBeanServerPermission perm, Object ctx) {
+        return defaultCheckMBeanServerPermission(perm, ctx);
+    }
+
+    protected boolean defaultCheckMBeanServerPermission(MBeanServerPermission perm, Object ctx) {
+        return false;
+    }
+
+    final boolean checkSocketPermission(SocketPermission perm, Object ctx) {
+        switch (perm.getActions()) {
+            case "resolve":
+                return checkSocketResolve(perm, ctx, perm.getName());
+
+            case "connect,resolve": {
+                String name = perm.getName();
+                int colonPos = name.indexOf(':');
+
+                String host = name.substring(0, colonPos);
+                int port = Integer.parseInt(name.substring(colonPos + 1));
+
+                return checkSocketResolve(perm, ctx, host) && checkSocketConnect(perm, ctx, host, port);
+            }
+
+            default:
+                return false;
+        }
+    }
+
+    protected boolean checkSocketResolve(SocketPermission perm, Object ctx, String host) {
+        return defaultCheckSocketResolve(perm, ctx, host);
+    }
 
-  protected final boolean defaultCheckSocketResolve(
-      SocketPermission perm, Object ctx, String host) {
-    return true;
-  }
+    protected final boolean defaultCheckSocketResolve(SocketPermission perm, Object ctx, String host) {
+        return true;
+    }
 
-  protected boolean checkSocketConnect(SocketPermission perm, Object ctx, String host, int port) {
-    return defaultCheckSocketConnect(perm, ctx, host, port);
-  }
+    protected boolean checkSocketConnect(SocketPermission perm, Object ctx, String host, int port) {
+        return defaultCheckSocketConnect(perm, ctx, host, port);
+    }
 
-  protected final boolean defaultCheckSocketConnect(
-      SocketPermission perm, Object ctx, String host, int port) {
-    return true;
-  }
+    protected final boolean defaultCheckSocketConnect(SocketPermission perm, Object ctx, String host, int port) {
+        return true;
+    }
 
-  void block(Permission perm) {
-    throw new SecurityException("Blocked " + perm);
-  }
+    void block(Permission perm) {
+        throw new SecurityException("Blocked " + perm);
+    }
 }
diff --git a/dd-java-agent/src/test/java/jvmbootstraptest/InitializationTelemetryCheck.java b/dd-java-agent/src/test/java/jvmbootstraptest/InitializationTelemetryCheck.java
index 85efcea28a3..7b95e103149 100644
--- a/dd-java-agent/src/test/java/jvmbootstraptest/InitializationTelemetryCheck.java
+++ b/dd-java-agent/src/test/java/jvmbootstraptest/InitializationTelemetryCheck.java
@@ -26,171 +26,157 @@
  * <p>Checks edge cases where InitializationTelemetry is blocked by SecurityManagers
  */
 public class InitializationTelemetryCheck {
-  public static void main(String[] args) throws Exception {
-    // Emulates the real application performing work in main().
-    // Start sub-process to generate one trace.
-    try {
-      ProcessBuilder builder = new ProcessBuilder("echo");
-      Process process = builder.start();
-      process.waitFor(5, TimeUnit.SECONDS);
-    } catch (SecurityException se) {
-      // Ignore security exceptions, as it can be part of strict security manager test.
+    public static void main(String[] args) throws Exception {
+        // Emulates the real application performing work in main().
+        // Start sub-process to generate one trace.
+        try {
+            ProcessBuilder builder = new ProcessBuilder("echo");
+            Process process = builder.start();
+            process.waitFor(5, TimeUnit.SECONDS);
+        } catch (SecurityException se) {
+            // Ignore security exceptions, as it can be part of strict security manager test.
+        }
+
+        // That should give enough time to send initial telemetry and traces.
+        Thread.sleep(2000);
     }
 
-    // That should give enough time to send initial telemetry and traces.
-    Thread.sleep(2000);
-  }
+    /** Blocks the loading of the agent bootstrap */
+    public static class BlockAgentLoading extends TestSecurityManager {
+        @Override
+        protected boolean checkFileReadPermission(FilePermission perm, Object ctx, String filePath) {
+            // NOTE: Blocking classes doesn't have the desired effect
+            if (filePath.endsWith(".jar") && filePath.contains("dd-java-agent")) return false;
 
-  /** Blocks the loading of the agent bootstrap */
-  public static class BlockAgentLoading extends TestSecurityManager {
-    @Override
-    protected boolean checkFileReadPermission(FilePermission perm, Object ctx, String filePath) {
-      // NOTE: Blocking classes doesn't have the desired effect
-      if (filePath.endsWith(".jar") && filePath.contains("dd-java-agent")) return false;
+            return super.checkFileReadPermission(perm, ctx, filePath);
+        }
+    }
 
-      return super.checkFileReadPermission(perm, ctx, filePath);
+    /** Intended to break agent initialization */
+    public static class BlockByteBuddy extends TestSecurityManager {
+        @Override
+        protected boolean checkOtherRuntimePermission(RuntimePermission perm, Object ctx, String permName) {
+            switch (permName) {
+                case "net.bytebuddy.createJavaDispatcher":
+                    return false;
+
+                default:
+                    return super.checkOtherRuntimePermission(perm, ctx, permName);
+            }
+        }
     }
-  }
-
-  /** Intended to break agent initialization */
-  public static class BlockByteBuddy extends TestSecurityManager {
-    @Override
-    protected boolean checkOtherRuntimePermission(
-        RuntimePermission perm, Object ctx, String permName) {
-      switch (permName) {
-        case "net.bytebuddy.createJavaDispatcher":
-          return false;
-
-        default:
-          return super.checkOtherRuntimePermission(perm, ctx, permName);
-      }
+
+    public static class BlockForwarderEnvVar extends TestSecurityManager {
+        @Override
+        protected boolean checkRuntimeEnvironmentAccess(RuntimePermission perm, Object ctx, String envVar) {
+            switch (envVar) {
+                case "DD_TELEMETRY_FORWARDER_PATH":
+                    return false;
+
+                default:
+                    return super.checkRuntimeEnvironmentAccess(perm, ctx, envVar);
+            }
+        }
     }
-  }
-
-  public static class BlockForwarderEnvVar extends TestSecurityManager {
-    @Override
-    protected boolean checkRuntimeEnvironmentAccess(
-        RuntimePermission perm, Object ctx, String envVar) {
-      switch (envVar) {
-        case "DD_TELEMETRY_FORWARDER_PATH":
-          return false;
-
-        default:
-          return super.checkRuntimeEnvironmentAccess(perm, ctx, envVar);
-      }
+
+    public static class BlockForwarderExecution extends TestSecurityManager {
+        @Override
+        protected boolean checkFileExecutePermission(FilePermission perm, Object ctx, String filePath) {
+            return false;
+        }
     }
-  }
 
-  public static class BlockForwarderExecution extends TestSecurityManager {
-    @Override
-    protected boolean checkFileExecutePermission(FilePermission perm, Object ctx, String filePath) {
-      return false;
+    public static Result runTestJvm(Class<? extends TestSecurityManager> securityManagerClass) throws Exception {
+        return runTestJvm(securityManagerClass, DEFAULT_TRACE_AGENT_PORT);
     }
-  }
 
-  public static Result runTestJvm(Class<? extends TestSecurityManager> securityManagerClass)
-      throws Exception {
-    return runTestJvm(securityManagerClass, DEFAULT_TRACE_AGENT_PORT);
-  }
+    public static Result runTestJvm(Class<? extends TestSecurityManager> securityManagerClass, int port)
+            throws Exception {
+
+        File jarFile = IntegrationTestUtils.createJarFileWithClasses(requiredClasses(securityManagerClass));
+
+        File forwarderFile = createTempFile("forwarder", "sh", PosixFilePermissions.fromString("rwxr--r--"));
+        File outputFile = new File(forwarderFile.getAbsoluteFile() + ".out");
 
-  public static Result runTestJvm(
-      Class<? extends TestSecurityManager> securityManagerClass, int port) throws Exception {
+        List<String> jvmArgs = new ArrayList<>();
+        jvmArgs.add("-Ddd.trace.agent.port=" + port);
+        if (securityManagerClass != null) {
+            jvmArgs.add("-Djava.security.manager=" + securityManagerClass.getName());
+        }
 
-    File jarFile =
-        IntegrationTestUtils.createJarFileWithClasses(requiredClasses(securityManagerClass));
+        write(forwarderFile, "#!/usr/bin/env bash\n", "echo \"$1	$(cat -)\" >> " + outputFile.getAbsolutePath() + "\n");
 
-    File forwarderFile =
-        createTempFile("forwarder", "sh", PosixFilePermissions.fromString("rwxr--r--"));
-    File outputFile = new File(forwarderFile.getAbsoluteFile() + ".out");
+        try {
+            int exitCode = IntegrationTestUtils.runOnSeparateJvm(
+                    InitializationTelemetryCheck.class.getName(),
+                    jvmArgs,
+                    Collections.emptyList(),
+                    InitializationTelemetryCheck.envVars(forwarderFile),
+                    jarFile,
+                    true);
 
-    List<String> jvmArgs = new ArrayList<>();
-    jvmArgs.add("-Ddd.trace.agent.port=" + port);
-    if (securityManagerClass != null) {
-      jvmArgs.add("-Djava.security.manager=" + securityManagerClass.getName());
+            return new Result(exitCode, read(outputFile));
+        } finally {
+            delete(jarFile, forwarderFile, outputFile);
+        }
     }
 
-    write(
-        forwarderFile,
-        "#!/usr/bin/env bash\n",
-        "echo \"$1	$(cat -)\" >> " + outputFile.getAbsolutePath() + "\n");
-
-    try {
-      int exitCode =
-          IntegrationTestUtils.runOnSeparateJvm(
-              InitializationTelemetryCheck.class.getName(),
-              jvmArgs,
-              Collections.emptyList(),
-              InitializationTelemetryCheck.envVars(forwarderFile),
-              jarFile,
-              true);
-
-      return new Result(exitCode, read(outputFile));
-    } finally {
-      delete(jarFile, forwarderFile, outputFile);
+    static File createTempFile(String baseName, String extension, Set<PosixFilePermission> perms) throws IOException {
+        Path path = Files.createTempFile(
+                baseName + "-integration-telemetry-check",
+                "." + extension,
+                PosixFilePermissions.asFileAttribute(perms));
+        File file = path.toFile();
+        file.deleteOnExit();
+        return file;
     }
-  }
-
-  static File createTempFile(String baseName, String extension, Set<PosixFilePermission> perms)
-      throws IOException {
-    Path path =
-        Files.createTempFile(
-            baseName + "-integration-telemetry-check",
-            "." + extension,
-            PosixFilePermissions.asFileAttribute(perms));
-    File file = path.toFile();
-    file.deleteOnExit();
-    return file;
-  }
-
-  static void write(File file, String... lines) throws IOException {
-    Files.write(file.toPath(), Arrays.asList(lines));
-  }
-
-  static String read(File file) {
-    try {
-      return new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
-    } catch (IOException e) {
-      return null;
+
+    static void write(File file, String... lines) throws IOException {
+        Files.write(file.toPath(), Arrays.asList(lines));
     }
-  }
 
-  static void delete(File... tempFiles) {
-    for (File file : tempFiles) {
-      file.delete();
+    static String read(File file) {
+        try {
+            return new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            return null;
+        }
     }
-  }
-
-  public static Class<?>[] requiredClasses(
-      Class<? extends TestSecurityManager> securityManagerClass) {
-
-    if (securityManagerClass == null) {
-      return new Class<?>[] {
-        InitializationTelemetryCheck.class, InitializationTelemetryCheck.Result.class
-      };
-    } else {
-      return new Class<?>[] {
-        InitializationTelemetryCheck.class,
-        InitializationTelemetryCheck.Result.class,
-        securityManagerClass,
-        TestSecurityManager.class,
-        CustomSecurityManager.class
-      };
+
+    static void delete(File... tempFiles) {
+        for (File file : tempFiles) {
+            file.delete();
+        }
     }
-  }
 
-  public static Map<String, String> envVars(File forwarderFile) {
-    Map<String, String> envVars = new HashMap<>();
-    envVars.put("DD_TELEMETRY_FORWARDER_PATH", forwarderFile.getAbsolutePath());
-    return envVars;
-  }
+    public static Class<?>[] requiredClasses(Class<? extends TestSecurityManager> securityManagerClass) {
+
+        if (securityManagerClass == null) {
+            return new Class<?>[] {InitializationTelemetryCheck.class, InitializationTelemetryCheck.Result.class};
+        } else {
+            return new Class<?>[] {
+                InitializationTelemetryCheck.class,
+                InitializationTelemetryCheck.Result.class,
+                securityManagerClass,
+                TestSecurityManager.class,
+                CustomSecurityManager.class
+            };
+        }
+    }
+
+    public static Map<String, String> envVars(File forwarderFile) {
+        Map<String, String> envVars = new HashMap<>();
+        envVars.put("DD_TELEMETRY_FORWARDER_PATH", forwarderFile.getAbsolutePath());
+        return envVars;
+    }
 
-  public static final class Result {
-    public final int exitCode;
-    public final String telemetryJson;
+    public static final class Result {
+        public final int exitCode;
+        public final String telemetryJson;
 
-    public Result(int exitCode, String telemetryJson) {
-      this.exitCode = exitCode;
-      this.telemetryJson = telemetryJson;
+        public Result(int exitCode, String telemetryJson) {
+            this.exitCode = exitCode;
+            this.telemetryJson = telemetryJson;
+        }
     }
-  }
 }
diff --git a/dd-java-agent/src/test/java/jvmbootstraptest/IsolatedClassloading.java b/dd-java-agent/src/test/java/jvmbootstraptest/IsolatedClassloading.java
index 97856a134d9..02f7adc5792 100644
--- a/dd-java-agent/src/test/java/jvmbootstraptest/IsolatedClassloading.java
+++ b/dd-java-agent/src/test/java/jvmbootstraptest/IsolatedClassloading.java
@@ -1,17 +1,15 @@
 package jvmbootstraptest;
 
 public class IsolatedClassloading {
-  public static void main(final String[] args) throws Exception {
+    public static void main(final String[] args) throws Exception {
 
-    // isolate an isolating classloader and then use that to try and load the target class
-    final ClassLoader isolatedLoader =
-        (ClassLoader)
-            new IsolatingClassLoader()
+        // isolate an isolating classloader and then use that to try and load the target class
+        final ClassLoader isolatedLoader = (ClassLoader) new IsolatingClassLoader()
                 .loadClass(IsolatingClassLoader.class.getName())
                 .newInstance();
 
-    isolatedLoader.loadClass(Target.class.getName());
-  }
+        isolatedLoader.loadClass(Target.class.getName());
+    }
 
-  interface Target {}
+    interface Target {}
 }
diff --git a/dd-java-agent/src/test/java/jvmbootstraptest/IsolatingClassLoader.java b/dd-java-agent/src/test/java/jvmbootstraptest/IsolatingClassLoader.java
index 8cf59e93bb7..a2db18c3a1e 100644
--- a/dd-java-agent/src/test/java/jvmbootstraptest/IsolatingClassLoader.java
+++ b/dd-java-agent/src/test/java/jvmbootstraptest/IsolatingClassLoader.java
@@ -9,27 +9,27 @@
  * delegating.
  */
 public class IsolatingClassLoader extends URLClassLoader {
-  public IsolatingClassLoader() {
-    super(discoverTestClassPath());
-  }
+    public IsolatingClassLoader() {
+        super(discoverTestClassPath());
+    }
 
-  @Override
-  public Class<?> loadClass(final String className) throws ClassNotFoundException {
-    if (className.startsWith("java.")) {
-      return super.loadClass(className);
+    @Override
+    public Class<?> loadClass(final String className) throws ClassNotFoundException {
+        if (className.startsWith("java.")) {
+            return super.loadClass(className);
+        }
+        return findClass(className);
     }
-    return findClass(className);
-  }
 
-  private static URL[] discoverTestClassPath() {
-    final String resourceName = IsolatingClassLoader.class.getName().replace(".", "/") + ".class";
-    final URL resource = Thread.currentThread().getContextClassLoader().getResource(resourceName);
-    final String testClassesURI = resource.toString().replace(resourceName, "");
-    System.out.println("Loading isolated classes from: " + testClassesURI);
-    try {
-      return new URL[] {new URI(testClassesURI).toURL()};
-    } catch (final Exception e) {
-      throw new IllegalStateException(e);
+    private static URL[] discoverTestClassPath() {
+        final String resourceName = IsolatingClassLoader.class.getName().replace(".", "/") + ".class";
+        final URL resource = Thread.currentThread().getContextClassLoader().getResource(resourceName);
+        final String testClassesURI = resource.toString().replace(resourceName, "");
+        System.out.println("Loading isolated classes from: " + testClassesURI);
+        try {
+            return new URL[] {new URI(testClassesURI).toURL()};
+        } catch (final Exception e) {
+            throw new IllegalStateException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/src/test/java/jvmbootstraptest/JmxStartedChecker.java b/dd-java-agent/src/test/java/jvmbootstraptest/JmxStartedChecker.java
index 0355af44ead..0af0f3a4f65 100644
--- a/dd-java-agent/src/test/java/jvmbootstraptest/JmxStartedChecker.java
+++ b/dd-java-agent/src/test/java/jvmbootstraptest/JmxStartedChecker.java
@@ -1,28 +1,28 @@
 package jvmbootstraptest;
 
 public class JmxStartedChecker {
-  public static void main(final String[] args) throws Exception {
-    AgentLoadedChecker.main(args);
+    public static void main(final String[] args) throws Exception {
+        AgentLoadedChecker.main(args);
 
-    boolean jmxStarted = false;
-    for (Thread t : Thread.getAllStackTraces().keySet()) {
-      if ("dd-jmx-collector".equals(t.getName())) {
-        jmxStarted = true;
-        break;
-      }
-    }
+        boolean jmxStarted = false;
+        for (Thread t : Thread.getAllStackTraces().keySet()) {
+            if ("dd-jmx-collector".equals(t.getName())) {
+                jmxStarted = true;
+                break;
+            }
+        }
 
-    if (!jmxStarted) {
-      System.out.println("ERROR: dd-jmx-collector did not start");
-      System.exit(1);
-    }
+        if (!jmxStarted) {
+            System.out.println("ERROR: dd-jmx-collector did not start");
+            System.exit(1);
+        }
 
-    System.out.println("READY");
-    System.out.close();
+        System.out.println("READY");
+        System.out.close();
 
-    // Give time for the test to finish if needed
-    if (args.length > 0) {
-      Thread.sleep(Long.parseLong(args[0]));
+        // Give time for the test to finish if needed
+        if (args.length > 0) {
+            Thread.sleep(Long.parseLong(args[0]));
+        }
     }
-  }
 }
diff --git a/dd-java-agent/src/test/java/jvmbootstraptest/LogLevelChecker.java b/dd-java-agent/src/test/java/jvmbootstraptest/LogLevelChecker.java
index c1efc474566..b914d665727 100644
--- a/dd-java-agent/src/test/java/jvmbootstraptest/LogLevelChecker.java
+++ b/dd-java-agent/src/test/java/jvmbootstraptest/LogLevelChecker.java
@@ -1,13 +1,13 @@
 package jvmbootstraptest;
 
 public class LogLevelChecker {
-  // returns an exception if logs are not in DEBUG
-  public static void main(final String[] args) throws ClassNotFoundException {
+    // returns an exception if logs are not in DEBUG
+    public static void main(final String[] args) throws ClassNotFoundException {
 
-    String str = System.getProperty("datadog.slf4j.simpleLogger.defaultLogLevel");
+        String str = System.getProperty("datadog.slf4j.simpleLogger.defaultLogLevel");
 
-    if ((str == null) || !str.equalsIgnoreCase("debug")) {
-      throw new RuntimeException("debug mode not set");
+        if ((str == null) || !str.equalsIgnoreCase("debug")) {
+            throw new RuntimeException("debug mode not set");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/src/test/java/jvmbootstraptest/LogManagerSetter.java b/dd-java-agent/src/test/java/jvmbootstraptest/LogManagerSetter.java
index 4e0711dda24..a9a6f22a2d3 100644
--- a/dd-java-agent/src/test/java/jvmbootstraptest/LogManagerSetter.java
+++ b/dd-java-agent/src/test/java/jvmbootstraptest/LogManagerSetter.java
@@ -5,204 +5,190 @@
 
 public class LogManagerSetter {
 
-  // avoid CustomLogManager.class.getName() as that could initialize JUL before we've set the logger
-  private static final String CUSTOM_LOG_MANAGER_CLASS_NAME = "jvmbootstraptest.CustomLogManager";
-
-  public static void main(final String... args) throws Exception {
-    if (System.getProperty("dd.app.customlogmanager") != null) {
-      System.out.println("dd.app.customlogmanager != null");
-
-      if (Boolean.parseBoolean(System.getProperty("dd.app.customlogmanager"))) {
-        System.setProperty("java.util.logging.manager", CUSTOM_LOG_MANAGER_CLASS_NAME);
-        customAssert(
-            LogManager.getLogManager().getClass(),
-            LogManagerSetter.class
-                .getClassLoader()
-                .loadClass(System.getProperty("java.util.logging.manager")),
-            "Javaagent should not prevent setting a custom log manager");
-      } else {
-        customAssert(
-            isTracerInstalled(false),
-            true,
-            "tracer should be installed in premain when customlogmanager=false.");
-        customAssert(
-            isJmxfetchStarted(false),
-            true,
-            "jmxfetch should start in premain when customlogmanager=false.");
-        if (isJFRSupported()) {
-          customAssert(
-              isProfilingStarted(false),
-              true,
-              "profiling should start in premain when customlogmanager=false.");
+    // avoid CustomLogManager.class.getName() as that could initialize JUL before we've set the logger
+    private static final String CUSTOM_LOG_MANAGER_CLASS_NAME = "jvmbootstraptest.CustomLogManager";
+
+    public static void main(final String... args) throws Exception {
+        if (System.getProperty("dd.app.customlogmanager") != null) {
+            System.out.println("dd.app.customlogmanager != null");
+
+            if (Boolean.parseBoolean(System.getProperty("dd.app.customlogmanager"))) {
+                System.setProperty("java.util.logging.manager", CUSTOM_LOG_MANAGER_CLASS_NAME);
+                customAssert(
+                        LogManager.getLogManager().getClass(),
+                        LogManagerSetter.class
+                                .getClassLoader()
+                                .loadClass(System.getProperty("java.util.logging.manager")),
+                        "Javaagent should not prevent setting a custom log manager");
+            } else {
+                customAssert(
+                        isTracerInstalled(false),
+                        true,
+                        "tracer should be installed in premain when customlogmanager=false.");
+                customAssert(
+                        isJmxfetchStarted(false),
+                        true,
+                        "jmxfetch should start in premain when customlogmanager=false.");
+                if (isJFRSupported()) {
+                    customAssert(
+                            isProfilingStarted(false),
+                            true,
+                            "profiling should start in premain when customlogmanager=false.");
+                }
+            }
+        } else if (System.getProperty("java.util.logging.manager") != null) {
+            System.out.println("java.util.logging.manager != null");
+
+            customAssert(
+                    isTracerInstalled(false),
+                    true,
+                    "tracer install is not delayed when log manager system property is present.");
+            customAssert(
+                    isJmxfetchStarted(false),
+                    false,
+                    "jmxfetch startup must be delayed when log manager system property is present.");
+            if (isJFRSupported()) {
+                assertProfilingStartupDelayed(
+                        "profiling startup must be delayed when log manager system property is present.");
+            }
+            // Change back to a valid LogManager.
+            System.setProperty("java.util.logging.manager", CUSTOM_LOG_MANAGER_CLASS_NAME);
+            customAssert(
+                    LogManager.getLogManager().getClass(),
+                    LogManagerSetter.class.getClassLoader().loadClass(System.getProperty("java.util.logging.manager")),
+                    "Javaagent should not prevent setting a custom log manager");
+            customAssert(isJmxfetchStarted(true), true, "jmxfetch should start after loading LogManager.");
+            if (isJFRSupported()) {
+                customAssert(isProfilingStarted(true), true, "profiling should start after loading LogManager.");
+            }
+        } else if (System.getenv("JBOSS_HOME") != null) {
+            System.out.println("JBOSS_HOME != null");
+            customAssert(
+                    isTracerInstalled(false),
+                    true,
+                    "tracer install is not delayed when JBOSS_HOME property is present.");
+            customAssert(
+                    isJmxfetchStarted(false),
+                    false,
+                    "jmxfetch startup must be delayed when JBOSS_HOME property is present.");
+            if (isJFRSupported()) {
+                assertProfilingStartupDelayed("profiling startup must be delayed when JBOSS_HOME property is present.");
+            }
+
+            System.setProperty("java.util.logging.manager", CUSTOM_LOG_MANAGER_CLASS_NAME);
+            customAssert(
+                    LogManager.getLogManager().getClass(),
+                    LogManagerSetter.class.getClassLoader().loadClass(System.getProperty("java.util.logging.manager")),
+                    "Javaagent should not prevent setting a custom log manager");
+            customAssert(isJmxfetchStarted(true), true, "jmxfetch should start after loading with JBOSS_HOME set.");
+            if (isJFRSupported()) {
+                customAssert(
+                        isProfilingStarted(true), true, "profiling should start after loading with JBOSS_HOME set.");
+            }
+        } else {
+            System.out.println("No custom log manager");
+
+            customAssert(
+                    isTracerInstalled(false),
+                    true,
+                    "tracer should be installed in premain when no custom log manager is set");
+            customAssert(
+                    isJmxfetchStarted(false),
+                    true,
+                    "jmxfetch should start in premain when no custom log manager is set.");
+            if (isJFRSupported()) {
+                customAssert(
+                        isProfilingStarted(false),
+                        true,
+                        "profiling should start in premain when no custom log manager is set.");
+            }
         }
-      }
-    } else if (System.getProperty("java.util.logging.manager") != null) {
-      System.out.println("java.util.logging.manager != null");
-
-      customAssert(
-          isTracerInstalled(false),
-          true,
-          "tracer install is not delayed when log manager system property is present.");
-      customAssert(
-          isJmxfetchStarted(false),
-          false,
-          "jmxfetch startup must be delayed when log manager system property is present.");
-      if (isJFRSupported()) {
-        assertProfilingStartupDelayed(
-            "profiling startup must be delayed when log manager system property is present.");
-      }
-      // Change back to a valid LogManager.
-      System.setProperty("java.util.logging.manager", CUSTOM_LOG_MANAGER_CLASS_NAME);
-      customAssert(
-          LogManager.getLogManager().getClass(),
-          LogManagerSetter.class
-              .getClassLoader()
-              .loadClass(System.getProperty("java.util.logging.manager")),
-          "Javaagent should not prevent setting a custom log manager");
-      customAssert(
-          isJmxfetchStarted(true), true, "jmxfetch should start after loading LogManager.");
-      if (isJFRSupported()) {
-        customAssert(
-            isProfilingStarted(true), true, "profiling should start after loading LogManager.");
-      }
-    } else if (System.getenv("JBOSS_HOME") != null) {
-      System.out.println("JBOSS_HOME != null");
-      customAssert(
-          isTracerInstalled(false),
-          true,
-          "tracer install is not delayed when JBOSS_HOME property is present.");
-      customAssert(
-          isJmxfetchStarted(false),
-          false,
-          "jmxfetch startup must be delayed when JBOSS_HOME property is present.");
-      if (isJFRSupported()) {
-        assertProfilingStartupDelayed(
-            "profiling startup must be delayed when JBOSS_HOME property is present.");
-      }
-
-      System.setProperty("java.util.logging.manager", CUSTOM_LOG_MANAGER_CLASS_NAME);
-      customAssert(
-          LogManager.getLogManager().getClass(),
-          LogManagerSetter.class
-              .getClassLoader()
-              .loadClass(System.getProperty("java.util.logging.manager")),
-          "Javaagent should not prevent setting a custom log manager");
-      customAssert(
-          isJmxfetchStarted(true),
-          true,
-          "jmxfetch should start after loading with JBOSS_HOME set.");
-      if (isJFRSupported()) {
-        customAssert(
-            isProfilingStarted(true),
-            true,
-            "profiling should start after loading with JBOSS_HOME set.");
-      }
-    } else {
-      System.out.println("No custom log manager");
-
-      customAssert(
-          isTracerInstalled(false),
-          true,
-          "tracer should be installed in premain when no custom log manager is set");
-      customAssert(
-          isJmxfetchStarted(false),
-          true,
-          "jmxfetch should start in premain when no custom log manager is set.");
-      if (isJFRSupported()) {
-        customAssert(
-            isProfilingStarted(false),
-            true,
-            "profiling should start in premain when no custom log manager is set.");
-      }
     }
-  }
-
-  private static void customAssert(
-      final Object got, final Object expected, final String assertionMessage) {
-    if (got == expected) return; // null check
-    if (!got.equals(expected)) {
-      throw new RuntimeException(
-          "Assertion failed. Expected <" + expected + "> got <" + got + "> " + assertionMessage);
-    }
-  }
-
-  private static void assertProfilingStartupDelayed(final String message) {
-    if (okHttpMayIndirectlyLoadJUL()) {
-      customAssert(isProfilingStarted(false), false, message);
-    } else {
-      customAssert(
-          isProfilingStarted(false),
-          true,
-          "We can safely start profiler on java9+ since it doesn't indirectly trigger logger manager init");
+
+    private static void customAssert(final Object got, final Object expected, final String assertionMessage) {
+        if (got == expected) return; // null check
+        if (!got.equals(expected)) {
+            throw new RuntimeException(
+                    "Assertion failed. Expected <" + expected + "> got <" + got + "> " + assertionMessage);
+        }
     }
-  }
 
-  private static boolean isThreadStarted(final String name, final boolean wait) {
-    System.out.println("Checking for thread " + name + "...");
+    private static void assertProfilingStartupDelayed(final String message) {
+        if (okHttpMayIndirectlyLoadJUL()) {
+            customAssert(isProfilingStarted(false), false, message);
+        } else {
+            customAssert(
+                    isProfilingStarted(false),
+                    true,
+                    "We can safely start profiler on java9+ since it doesn't indirectly trigger logger manager init");
+        }
+    }
 
-    // Wait up to 10 seconds for thread to appear
-    for (int i = 0; i < 20; i++) {
-      for (final Thread thread : Thread.getAllStackTraces().keySet()) {
-        if (name.equals(thread.getName())) {
-          System.out.println("...thread " + name + " has started");
-          return true;
+    private static boolean isThreadStarted(final String name, final boolean wait) {
+        System.out.println("Checking for thread " + name + "...");
+
+        // Wait up to 10 seconds for thread to appear
+        for (int i = 0; i < 20; i++) {
+            for (final Thread thread : Thread.getAllStackTraces().keySet()) {
+                if (name.equals(thread.getName())) {
+                    System.out.println("...thread " + name + " has started");
+                    return true;
+                }
+            }
+            if (!wait) {
+                break;
+            }
+            try {
+                Thread.sleep(500);
+            } catch (final InterruptedException e) {
+                e.printStackTrace();
+            }
         }
-      }
-      if (!wait) {
-        break;
-      }
-      try {
-        Thread.sleep(500);
-      } catch (final InterruptedException e) {
-        e.printStackTrace();
-      }
+        System.out.println("...thread " + name + " has not started");
+        return false;
     }
-    System.out.println("...thread " + name + " has not started");
-    return false;
-  }
-
-  private static boolean isJmxfetchStarted(final boolean wait) {
-    return isThreadStarted("dd-jmx-collector", wait);
-  }
-
-  private static boolean isProfilingStarted(final boolean wait) {
-    return isThreadStarted("dd-profiler-recording-scheduler", wait);
-  }
-
-  private static boolean isTracerInstalled(final boolean wait) {
-    System.out.println("Checking for tracer...");
-
-    // Wait up to 10 seconds for tracer to get installed
-    for (int i = 0; i < 20; i++) {
-      if (AgentTracer.isRegistered()) {
-        System.out.println("...tracer is installed");
-        return true;
-      }
-      if (!wait) {
-        break;
-      }
-      try {
-        Thread.sleep(500);
-      } catch (final InterruptedException e) {
-        e.printStackTrace();
-      }
+
+    private static boolean isJmxfetchStarted(final boolean wait) {
+        return isThreadStarted("dd-jmx-collector", wait);
     }
-    System.out.println("...tracer is not installed");
-    return false;
-  }
 
-  private static boolean okHttpMayIndirectlyLoadJUL() {
-    if ("IBM Corporation".equals(System.getProperty("java.vm.vendor"))) {
-      return true; // IBM JDKs ship with 'IBMSASL' which will load JUL when OkHttp accesses TLS
+    private static boolean isProfilingStarted(final boolean wait) {
+        return isThreadStarted("dd-profiler-recording-scheduler", wait);
     }
-    if (!System.getProperty("java.version").startsWith("1.")) {
-      return false; // JDKs since 9 have reworked JFR to use a different logging facility, not JUL
+
+    private static boolean isTracerInstalled(final boolean wait) {
+        System.out.println("Checking for tracer...");
+
+        // Wait up to 10 seconds for tracer to get installed
+        for (int i = 0; i < 20; i++) {
+            if (AgentTracer.isRegistered()) {
+                System.out.println("...tracer is installed");
+                return true;
+            }
+            if (!wait) {
+                break;
+            }
+            try {
+                Thread.sleep(500);
+            } catch (final InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+        System.out.println("...tracer is not installed");
+        return false;
+    }
+
+    private static boolean okHttpMayIndirectlyLoadJUL() {
+        if ("IBM Corporation".equals(System.getProperty("java.vm.vendor"))) {
+            return true; // IBM JDKs ship with 'IBMSASL' which will load JUL when OkHttp accesses TLS
+        }
+        if (!System.getProperty("java.version").startsWith("1.")) {
+            return false; // JDKs since 9 have reworked JFR to use a different logging facility, not JUL
+        }
+        return isJFRSupported(); // assume OkHttp will indirectly load JUL via its JFR events
     }
-    return isJFRSupported(); // assume OkHttp will indirectly load JUL via its JFR events
-  }
 
-  private static boolean isJFRSupported() {
-    return Thread.currentThread().getContextClassLoader().getResource("jdk/jfr/Recording.class")
-        != null;
-  }
+    private static boolean isJFRSupported() {
+        return Thread.currentThread().getContextClassLoader().getResource("jdk/jfr/Recording.class") != null;
+    }
 }
diff --git a/dd-java-agent/src/test/java/jvmbootstraptest/MBeanServerBuilderSetter.java b/dd-java-agent/src/test/java/jvmbootstraptest/MBeanServerBuilderSetter.java
index 190e71adaab..44af9ffd165 100644
--- a/dd-java-agent/src/test/java/jvmbootstraptest/MBeanServerBuilderSetter.java
+++ b/dd-java-agent/src/test/java/jvmbootstraptest/MBeanServerBuilderSetter.java
@@ -6,87 +6,82 @@
 import javax.management.ObjectName;
 
 public class MBeanServerBuilderSetter {
-  public static void main(final String... args) throws Exception {
-    if (System.getProperty("dd.app.customjmxbuilder") != null) {
-      System.out.println("dd.app.customjmxbuilder != null");
+    public static void main(final String... args) throws Exception {
+        if (System.getProperty("dd.app.customjmxbuilder") != null) {
+            System.out.println("dd.app.customjmxbuilder != null");
 
-      if (Boolean.parseBoolean(System.getProperty("dd.app.customjmxbuilder"))) {
-        System.setProperty(
-            "javax.management.builder.initial", "jvmbootstraptest.CustomMBeanServerBuilder");
-        customAssert(
-            isCustomMBeanRegistered(),
-            true,
-            "Javaagent should not prevent setting a custom MBeanServerBuilder");
-      } else {
-        customAssert(
-            isJmxfetchStarted(false),
-            true,
-            "jmxfetch should start in premain when customjmxbuilder=false.");
-      }
-    } else if (System.getProperty("javax.management.builder.initial") != null) {
-      System.out.println("javax.management.builder.initial != null");
+            if (Boolean.parseBoolean(System.getProperty("dd.app.customjmxbuilder"))) {
+                System.setProperty("javax.management.builder.initial", "jvmbootstraptest.CustomMBeanServerBuilder");
+                customAssert(
+                        isCustomMBeanRegistered(),
+                        true,
+                        "Javaagent should not prevent setting a custom MBeanServerBuilder");
+            } else {
+                customAssert(
+                        isJmxfetchStarted(false),
+                        true,
+                        "jmxfetch should start in premain when customjmxbuilder=false.");
+            }
+        } else if (System.getProperty("javax.management.builder.initial") != null) {
+            System.out.println("javax.management.builder.initial != null");
 
-      customAssert(
-          isJmxfetchStarted(false),
-          false,
-          "jmxfetch startup must be delayed when management builder system property is present.");
-      // Change back to a valid MBeanServerBuilder.
-      System.setProperty(
-          "javax.management.builder.initial", "jvmbootstraptest.CustomMBeanServerBuilder");
-      customAssert(
-          isCustomMBeanRegistered(),
-          true,
-          "Javaagent should not prevent setting a custom MBeanServerBuilder");
-      customAssert(
-          isJmxfetchStarted(true), true, "jmxfetch should start after loading MBeanServerBuilder.");
-    } else {
-      System.out.println("No custom MBeanServerBuilder");
+            customAssert(
+                    isJmxfetchStarted(false),
+                    false,
+                    "jmxfetch startup must be delayed when management builder system property is present.");
+            // Change back to a valid MBeanServerBuilder.
+            System.setProperty("javax.management.builder.initial", "jvmbootstraptest.CustomMBeanServerBuilder");
+            customAssert(
+                    isCustomMBeanRegistered(),
+                    true,
+                    "Javaagent should not prevent setting a custom MBeanServerBuilder");
+            customAssert(isJmxfetchStarted(true), true, "jmxfetch should start after loading MBeanServerBuilder.");
+        } else {
+            System.out.println("No custom MBeanServerBuilder");
 
-      customAssert(
-          isJmxfetchStarted(false),
-          true,
-          "jmxfetch should start in premain when no custom MBeanServerBuilder is set.");
+            customAssert(
+                    isJmxfetchStarted(false),
+                    true,
+                    "jmxfetch should start in premain when no custom MBeanServerBuilder is set.");
+        }
     }
-  }
 
-  private static boolean isCustomMBeanRegistered() throws MalformedObjectNameException {
-    return ManagementFactory.getPlatformMBeanServer()
-        .isRegistered(new ObjectName("test:name=custom"));
-  }
+    private static boolean isCustomMBeanRegistered() throws MalformedObjectNameException {
+        return ManagementFactory.getPlatformMBeanServer().isRegistered(new ObjectName("test:name=custom"));
+    }
 
-  private static void customAssert(
-      final Object got, final Object expected, final String assertionMessage) {
-    if (!Objects.equals(got, expected)) {
-      throw new RuntimeException(
-          "Assertion failed. Expected <" + expected + "> got <" + got + "> " + assertionMessage);
+    private static void customAssert(final Object got, final Object expected, final String assertionMessage) {
+        if (!Objects.equals(got, expected)) {
+            throw new RuntimeException(
+                    "Assertion failed. Expected <" + expected + "> got <" + got + "> " + assertionMessage);
+        }
     }
-  }
 
-  private static boolean isThreadStarted(final String name, final boolean wait) {
-    System.out.println("Checking for thread " + name + "...");
+    private static boolean isThreadStarted(final String name, final boolean wait) {
+        System.out.println("Checking for thread " + name + "...");
 
-    // Wait up to 10 seconds for thread to appear
-    for (int i = 0; i < 20; i++) {
-      for (final Thread thread : Thread.getAllStackTraces().keySet()) {
-        if (name.equals(thread.getName())) {
-          System.out.println("...thread " + name + " has started");
-          return true;
+        // Wait up to 10 seconds for thread to appear
+        for (int i = 0; i < 20; i++) {
+            for (final Thread thread : Thread.getAllStackTraces().keySet()) {
+                if (name.equals(thread.getName())) {
+                    System.out.println("...thread " + name + " has started");
+                    return true;
+                }
+            }
+            if (!wait) {
+                break;
+            }
+            try {
+                Thread.sleep(500);
+            } catch (final InterruptedException e) {
+                e.printStackTrace();
+            }
         }
-      }
-      if (!wait) {
-        break;
-      }
-      try {
-        Thread.sleep(500);
-      } catch (final InterruptedException e) {
-        e.printStackTrace();
-      }
+        System.out.println("...thread " + name + " has not started");
+        return false;
     }
-    System.out.println("...thread " + name + " has not started");
-    return false;
-  }
 
-  private static boolean isJmxfetchStarted(final boolean wait) {
-    return isThreadStarted("dd-jmx-collector", wait);
-  }
+    private static boolean isJmxfetchStarted(final boolean wait) {
+        return isThreadStarted("dd-jmx-collector", wait);
+    }
 }
diff --git a/dd-java-agent/src/test/java/jvmbootstraptest/MyClassLoaderIsNotBootstrap.java b/dd-java-agent/src/test/java/jvmbootstraptest/MyClassLoaderIsNotBootstrap.java
index d5d52a21fec..a775613cf5b 100644
--- a/dd-java-agent/src/test/java/jvmbootstraptest/MyClassLoaderIsNotBootstrap.java
+++ b/dd-java-agent/src/test/java/jvmbootstraptest/MyClassLoaderIsNotBootstrap.java
@@ -1,9 +1,9 @@
 package jvmbootstraptest;
 
 public class MyClassLoaderIsNotBootstrap {
-  public static void main(final String[] args) {
-    if (MyClassLoaderIsNotBootstrap.class.getClassLoader() == null) {
-      throw new RuntimeException("Application level class was loaded by bootstrap classloader");
+    public static void main(final String[] args) {
+        if (MyClassLoaderIsNotBootstrap.class.getClassLoader() == null) {
+            throw new RuntimeException("Application level class was loaded by bootstrap classloader");
+        }
     }
-  }
 }
diff --git a/dd-java-agent/src/test/java/jvmbootstraptest/SecurityManagerCheck.java b/dd-java-agent/src/test/java/jvmbootstraptest/SecurityManagerCheck.java
index bbaf2a0ef10..4ba5a98dec5 100644
--- a/dd-java-agent/src/test/java/jvmbootstraptest/SecurityManagerCheck.java
+++ b/dd-java-agent/src/test/java/jvmbootstraptest/SecurityManagerCheck.java
@@ -7,51 +7,43 @@
 import java.util.Map;
 
 public final class SecurityManagerCheck {
-  public static void main(String[] args) {}
-
-  public static final int runTestJvm(Class<? extends TestSecurityManager> securityManagerClass)
-      throws Exception {
-    return runTestJvm(securityManagerClass, false);
-  }
-
-  public static final int runTestJvm(
-      Class<? extends TestSecurityManager> securityManagerClass, boolean printStreams)
-      throws Exception {
-    File jarFile =
-        IntegrationTestUtils.createJarFileWithClasses(requiredClasses(securityManagerClass));
-    try {
-      return IntegrationTestUtils.runOnSeparateJvm(
-          SecurityManagerCheck.class.getName(),
-          SecurityManagerCheck.jvmArgs(securityManagerClass),
-          SecurityManagerCheck.mainArgs(),
-          SecurityManagerCheck.envVars(),
-          jarFile,
-          printStreams);
-    } finally {
-      jarFile.delete();
+    public static void main(String[] args) {}
+
+    public static final int runTestJvm(Class<? extends TestSecurityManager> securityManagerClass) throws Exception {
+        return runTestJvm(securityManagerClass, false);
+    }
+
+    public static final int runTestJvm(Class<? extends TestSecurityManager> securityManagerClass, boolean printStreams)
+            throws Exception {
+        File jarFile = IntegrationTestUtils.createJarFileWithClasses(requiredClasses(securityManagerClass));
+        try {
+            return IntegrationTestUtils.runOnSeparateJvm(
+                    SecurityManagerCheck.class.getName(),
+                    SecurityManagerCheck.jvmArgs(securityManagerClass),
+                    SecurityManagerCheck.mainArgs(),
+                    SecurityManagerCheck.envVars(),
+                    jarFile,
+                    printStreams);
+        } finally {
+            jarFile.delete();
+        }
+    }
+
+    public static final Class<?>[] requiredClasses(Class<? extends TestSecurityManager> securityManagerClass) {
+        return new Class<?>[] {
+            SecurityManagerCheck.class, securityManagerClass, TestSecurityManager.class, CustomSecurityManager.class
+        };
+    }
+
+    public static final List<String> jvmArgs(Class<? extends TestSecurityManager> securityManagerClass) {
+        return Collections.singletonList("-Djava.security.manager=" + securityManagerClass.getName());
+    }
+
+    public static final List<String> mainArgs() {
+        return Collections.emptyList();
+    }
+
+    public static final Map<String, String> envVars() {
+        return Collections.emptyMap();
     }
-  }
-
-  public static final Class<?>[] requiredClasses(
-      Class<? extends TestSecurityManager> securityManagerClass) {
-    return new Class<?>[] {
-      SecurityManagerCheck.class,
-      securityManagerClass,
-      TestSecurityManager.class,
-      CustomSecurityManager.class
-    };
-  }
-
-  public static final List<String> jvmArgs(
-      Class<? extends TestSecurityManager> securityManagerClass) {
-    return Collections.singletonList("-Djava.security.manager=" + securityManagerClass.getName());
-  }
-
-  public static final List<String> mainArgs() {
-    return Collections.emptyList();
-  }
-
-  public static final Map<String, String> envVars() {
-    return Collections.emptyMap();
-  }
 }
diff --git a/dd-java-agent/src/test/java/jvmbootstraptest/TestSecurityManager.java b/dd-java-agent/src/test/java/jvmbootstraptest/TestSecurityManager.java
index 7d76938e8e9..cdcf5b50c5e 100644
--- a/dd-java-agent/src/test/java/jvmbootstraptest/TestSecurityManager.java
+++ b/dd-java-agent/src/test/java/jvmbootstraptest/TestSecurityManager.java
@@ -10,209 +10,200 @@
  * function normally.
  */
 public class TestSecurityManager extends CustomSecurityManager {
-  public static final class NoEnvAccess extends TestSecurityManager {
-    @Override
-    protected final boolean checkRuntimeEnvironmentAccess(
-        RuntimePermission perm, Object ctx, String envVar) {
-      return false;
+    public static final class NoEnvAccess extends TestSecurityManager {
+        @Override
+        protected final boolean checkRuntimeEnvironmentAccess(RuntimePermission perm, Object ctx, String envVar) {
+            return false;
+        }
+    }
+
+    public static final class MinimalPropertyAccess extends TestSecurityManager {
+        @Override
+        protected boolean checkPropertyReadPermission(PropertyPermission perm, Object ctx, String property) {
+            return minimalCheckPropertyReadPermission(perm, ctx, property);
+        }
+
+        @Override
+        protected boolean checkPropertyWritePermission(PropertyPermission perm, Object ctx, String property) {
+            return false;
+        }
+    }
+
+    public static final class NoProcessExecution extends TestSecurityManager {
+        @Override
+        protected boolean checkFileExecutePermission(FilePermission perm, Object ctx, String filePath) {
+            return false;
+        }
+    }
+
+    public static final class NoNetworkAccess extends TestSecurityManager {
+        @Override
+        protected boolean checkSocketConnect(SocketPermission perm, Object ctx, String host, int port) {
+            return false;
+        }
+
+        @Override
+        protected boolean checkSocketResolve(SocketPermission perm, Object ctx, String host) {
+            return false;
+        }
     }
-  }
 
-  public static final class MinimalPropertyAccess extends TestSecurityManager {
     @Override
-    protected boolean checkPropertyReadPermission(
-        PropertyPermission perm, Object ctx, String property) {
-      return minimalCheckPropertyReadPermission(perm, ctx, property);
+    protected boolean checkPropertyReadPermission(PropertyPermission perm, Object ctx, String property) {
+        return isDatadogProperty(property)
+                || isOkHttpProperty(property)
+                || isSlf4jProperty(property)
+                || isByteBuddyProperty(property)
+                || isJcToolsProperty(property)
+                || super.checkPropertyReadPermission(perm, ctx, property);
     }
 
     @Override
-    protected boolean checkPropertyWritePermission(
-        PropertyPermission perm, Object ctx, String property) {
-      return false;
+    protected boolean checkPropertyWritePermission(PropertyPermission perm, Object ctx, String property) {
+        return isDatadogProperty(property)
+                || isOkHttpProperty(property)
+                || isByteBuddyProperty(property)
+                || super.checkPropertyWritePermission(perm, ctx, property);
+    }
+
+    protected static final boolean isDatadogProperty(String propertyName) {
+        return propertyName.startsWith("datadog.") || propertyName.startsWith("dd.");
+    }
+
+    protected static final boolean isSlf4jProperty(String propertyName) {
+        return propertyName.startsWith("slf4j.");
+    }
+
+    protected static final boolean isByteBuddyProperty(String propertyName) {
+        return propertyName.startsWith("net.bytebuddy.");
+    }
+
+    protected static final boolean isJcToolsProperty(String propertyName) {
+        return propertyName.startsWith("jctools.");
+    }
+
+    protected static final boolean isOkHttpProperty(String propertyName) {
+        return propertyName.startsWith("okhttp.");
     }
-  }
 
-  public static final class NoProcessExecution extends TestSecurityManager {
     @Override
-    protected boolean checkFileExecutePermission(FilePermission perm, Object ctx, String filePath) {
-      return false;
+    protected boolean checkRuntimeEnvironmentAccess(RuntimePermission perm, Object ctx, String envVar) {
+        if (isDatadogEnvVar(envVar)) return true;
+
+        switch (envVar) {
+            // jboss sniffing?
+            case "JBOSS_HOME":
+                return true;
+
+            // environment capture?
+            case "WEBSITE_SITE_NAME":
+                return true;
+
+            // AWS properties used during bootstrapping?
+            case "AWS_LAMBDA_INITIALIZATION_TYPE":
+            case "_HANDLER":
+            case "AWS_LAMBDA_FUNCTION_NAME":
+                return true;
+        }
+
+        return super.checkRuntimeEnvironmentAccess(perm, ctx, envVar);
+    }
+
+    protected static final boolean isDatadogEnvVar(String envVar) {
+        return envVar.startsWith("DATADOG_") || envVar.startsWith("DD_");
     }
-  }
 
-  public static final class NoNetworkAccess extends TestSecurityManager {
     @Override
-    protected boolean checkSocketConnect(SocketPermission perm, Object ctx, String host, int port) {
-      return false;
+    protected boolean checkReflectPermission(ReflectPermission perm, Object ctx, String permName) {
+        // override to allow suppress of access checks
+        return true;
     }
 
     @Override
-    protected boolean checkSocketResolve(SocketPermission perm, Object ctx, String host) {
-      return false;
-    }
-  }
-
-  @Override
-  protected boolean checkPropertyReadPermission(
-      PropertyPermission perm, Object ctx, String property) {
-    return isDatadogProperty(property)
-        || isOkHttpProperty(property)
-        || isSlf4jProperty(property)
-        || isByteBuddyProperty(property)
-        || isJcToolsProperty(property)
-        || super.checkPropertyReadPermission(perm, ctx, property);
-  }
-
-  @Override
-  protected boolean checkPropertyWritePermission(
-      PropertyPermission perm, Object ctx, String property) {
-    return isDatadogProperty(property)
-        || isOkHttpProperty(property)
-        || isByteBuddyProperty(property)
-        || super.checkPropertyWritePermission(perm, ctx, property);
-  }
-
-  protected static final boolean isDatadogProperty(String propertyName) {
-    return propertyName.startsWith("datadog.") || propertyName.startsWith("dd.");
-  }
-
-  protected static final boolean isSlf4jProperty(String propertyName) {
-    return propertyName.startsWith("slf4j.");
-  }
-
-  protected static final boolean isByteBuddyProperty(String propertyName) {
-    return propertyName.startsWith("net.bytebuddy.");
-  }
-
-  protected static final boolean isJcToolsProperty(String propertyName) {
-    return propertyName.startsWith("jctools.");
-  }
-
-  protected static final boolean isOkHttpProperty(String propertyName) {
-    return propertyName.startsWith("okhttp.");
-  }
-
-  @Override
-  protected boolean checkRuntimeEnvironmentAccess(
-      RuntimePermission perm, Object ctx, String envVar) {
-    if (isDatadogEnvVar(envVar)) return true;
-
-    switch (envVar) {
-      // jboss sniffing?
-      case "JBOSS_HOME":
+    protected boolean checkRuntimeClassLoaderModification(RuntimePermission perm, Object ctx, String permName) {
+        // override to allow ClassLoader creation & set context ClassLoader
         return true;
+    }
 
-      // environment capture?
-      case "WEBSITE_SITE_NAME":
+    @Override
+    protected boolean checkRuntimeMBeanProviderAccess(RuntimePermission perm, Object ctx) {
         return true;
+    }
 
-      // AWS properties used during bootstrapping?
-      case "AWS_LAMBDA_INITIALIZATION_TYPE":
-      case "_HANDLER":
-      case "AWS_LAMBDA_FUNCTION_NAME":
+    @Override
+    protected boolean checkRuntimeSystemModuleAccess(RuntimePermission perm, Object ctx) {
+        // slf4j fails to initialize without this; what else?
         return true;
     }
 
-    return super.checkRuntimeEnvironmentAccess(perm, ctx, envVar);
-  }
-
-  protected static final boolean isDatadogEnvVar(String envVar) {
-    return envVar.startsWith("DATADOG_") || envVar.startsWith("DD_");
-  }
-
-  @Override
-  protected boolean checkReflectPermission(ReflectPermission perm, Object ctx, String permName) {
-    // override to allow suppress of access checks
-    return true;
-  }
-
-  @Override
-  protected boolean checkRuntimeClassLoaderModification(
-      RuntimePermission perm, Object ctx, String permName) {
-    // override to allow ClassLoader creation & set context ClassLoader
-    return true;
-  }
-
-  @Override
-  protected boolean checkRuntimeMBeanProviderAccess(RuntimePermission perm, Object ctx) {
-    return true;
-  }
-
-  @Override
-  protected boolean checkRuntimeSystemModuleAccess(RuntimePermission perm, Object ctx) {
-    // slf4j fails to initialize without this; what else?
-    return true;
-  }
-
-  @Override
-  protected boolean checkRuntimeManageProcess(RuntimePermission perm, Object ctx) {
-    return true;
-  }
-
-  @Override
-  protected boolean checkRuntimeContextClassLoader(RuntimePermission perm, Object ctx) {
-    return true;
-  }
-
-  @Override
-  protected boolean checkRuntimeShutdownHooks(RuntimePermission perm, Object ctx) {
-    return true;
-  }
-
-  @Override
-  protected boolean checkFileReadPermission(FilePermission perm, Object ctx, String filePath) {
-    switch (filePath) {
-      // agent socket communication
-      case "/var/run/datadog/apm.socket":
+    @Override
+    protected boolean checkRuntimeManageProcess(RuntimePermission perm, Object ctx) {
         return true;
+    }
 
-      // agent sniffing?
-      case "/opt/extensions/datadog-agent":
+    @Override
+    protected boolean checkRuntimeContextClassLoader(RuntimePermission perm, Object ctx) {
         return true;
+    }
 
-      // ContainerInfo
-      case "/proc/self/cgroup":
+    @Override
+    protected boolean checkRuntimeShutdownHooks(RuntimePermission perm, Object ctx) {
         return true;
     }
 
-    // version info
-    if (filePath.endsWith("/dd-java-agent.version")) return true;
+    @Override
+    protected boolean checkFileReadPermission(FilePermission perm, Object ctx, String filePath) {
+        switch (filePath) {
+            // agent socket communication
+            case "/var/run/datadog/apm.socket":
+                return true;
+
+            // agent sniffing?
+            case "/opt/extensions/datadog-agent":
+                return true;
+
+            // ContainerInfo
+            case "/proc/self/cgroup":
+                return true;
+        }
 
-    if (filePath.endsWith("/simplelogger.properties")) return true;
+        // version info
+        if (filePath.endsWith("/dd-java-agent.version")) return true;
 
-    return super.checkFileReadPermission(perm, ctx, filePath);
-  }
+        if (filePath.endsWith("/simplelogger.properties")) return true;
 
-  @Override
-  protected boolean checkFileExecutePermission(FilePermission perm, Object ctx, String filePath) {
-    return true;
-  }
+        return super.checkFileReadPermission(perm, ctx, filePath);
+    }
 
-  @Override
-  protected boolean checkRuntimeFileSystemAccess(
-      RuntimePermission perm, Object ctx, String permission) {
-    // used by ContainerInfo
-    return true;
-  }
+    @Override
+    protected boolean checkFileExecutePermission(FilePermission perm, Object ctx, String filePath) {
+        return true;
+    }
 
-  @Override
-  protected boolean checkOtherRuntimePermission(
-      RuntimePermission perm, Object ctx, String permName) {
-    switch (permName) {
-      case "net.bytebuddy.createJavaDispatcher":
+    @Override
+    protected boolean checkRuntimeFileSystemAccess(RuntimePermission perm, Object ctx, String permission) {
+        // used by ContainerInfo
         return true;
+    }
 
-      default:
-        return false;
+    @Override
+    protected boolean checkOtherRuntimePermission(RuntimePermission perm, Object ctx, String permName) {
+        switch (permName) {
+            case "net.bytebuddy.createJavaDispatcher":
+                return true;
+
+            default:
+                return false;
+        }
     }
-  }
 
-  @Override
-  protected boolean checkSocketResolve(SocketPermission perm, Object ctx, String host) {
-    return true;
-  }
+    @Override
+    protected boolean checkSocketResolve(SocketPermission perm, Object ctx, String host) {
+        return true;
+    }
 
-  @Override
-  protected boolean checkSocketConnect(SocketPermission perm, Object ctx, String host, int port) {
-    return true;
-  }
+    @Override
+    protected boolean checkSocketConnect(SocketPermission perm, Object ctx, String host, int port) {
+        return true;
+    }
 }
diff --git a/dd-java-agent/src/test/java/jvmbootstraptest/UnloadingChecker.java b/dd-java-agent/src/test/java/jvmbootstraptest/UnloadingChecker.java
index 930735a20df..b33ac9e535e 100644
--- a/dd-java-agent/src/test/java/jvmbootstraptest/UnloadingChecker.java
+++ b/dd-java-agent/src/test/java/jvmbootstraptest/UnloadingChecker.java
@@ -7,26 +7,26 @@
 import java.lang.management.ManagementFactory;
 
 public class UnloadingChecker {
-  static class Canary {}
+    static class Canary {}
 
-  public static void main(final String[] args) throws Exception {
-    ClassLoadingMXBean classLoadingMXBean = ManagementFactory.getClassLoadingMXBean();
-    long initialUnloadCount = classLoadingMXBean.getUnloadedClassCount();
+    public static void main(final String[] args) throws Exception {
+        ClassLoadingMXBean classLoadingMXBean = ManagementFactory.getClassLoadingMXBean();
+        long initialUnloadCount = classLoadingMXBean.getUnloadedClassCount();
 
-    // load an isolated class which we know can be unloaded after a full GC
-    new IsolatingClassLoader().loadClass("jvmbootstraptest.UnloadingChecker$Canary");
+        // load an isolated class which we know can be unloaded after a full GC
+        new IsolatingClassLoader().loadClass("jvmbootstraptest.UnloadingChecker$Canary");
 
-    long waitNanos = MINUTES.toNanos(2);
-    long startNanos = System.nanoTime();
+        long waitNanos = MINUTES.toNanos(2);
+        long startNanos = System.nanoTime();
 
-    while (System.nanoTime() - startNanos < waitNanos) {
-      try {
-        GCUtils.awaitGC();
-      } catch (Throwable ignore) {
-      }
-      if (initialUnloadCount < classLoadingMXBean.getUnloadedClassCount()) {
-        break; // some class unloading has taken place, stop and check results
-      }
+        while (System.nanoTime() - startNanos < waitNanos) {
+            try {
+                GCUtils.awaitGC();
+            } catch (Throwable ignore) {
+            }
+            if (initialUnloadCount < classLoadingMXBean.getUnloadedClassCount()) {
+                break; // some class unloading has taken place, stop and check results
+            }
+        }
     }
-  }
 }
diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/server/http/HttpProxy.java b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/server/http/HttpProxy.java
index 63df85f3518..c31161e433c 100644
--- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/server/http/HttpProxy.java
+++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/server/http/HttpProxy.java
@@ -21,164 +21,161 @@
 // Adapted from
 // https://github.com/stefano-lupo/Java-Proxy-Server/blob/master/src/RequestHandler.java
 public final class HttpProxy implements Closeable {
-  private final ExecutorService executorService;
-  private final ServerSocket serverSocket;
-  private final Collection<Socket> openSockets = new CopyOnWriteArrayList<>();
-  public final int port;
-  private final AtomicInteger requestCount = new AtomicInteger();
-
-  @SuppressForbidden
-  HttpProxy() throws IOException {
-    serverSocket = new ServerSocket(0); // random port
-    serverSocket.setSoTimeout(0);
-    port = serverSocket.getLocalPort();
-    executorService =
-        Executors.newCachedThreadPool(
-            r -> {
-              final Thread thread = new Thread(null, r, "Http Proxy: " + port);
-              thread.setDaemon(true);
-              return thread;
-            });
-    executorService.execute(new SocketAcceptor());
-    System.out.println("Started proxy server " + this + " on port " + port);
-  }
-
-  @Override
-  public void close() throws IOException {
-    executorService.shutdown();
-    serverSocket.close();
-    for (Socket socket : openSockets) {
-      socket.close();
-    }
-    try {
-      executorService.awaitTermination(1, TimeUnit.MINUTES);
-    } catch (InterruptedException e) {
-    }
-  }
+    private final ExecutorService executorService;
+    private final ServerSocket serverSocket;
+    private final Collection<Socket> openSockets = new CopyOnWriteArrayList<>();
+    public final int port;
+    private final AtomicInteger requestCount = new AtomicInteger();
 
-  public int requestCount() {
-    return requestCount.get();
-  }
+    @SuppressForbidden
+    HttpProxy() throws IOException {
+        serverSocket = new ServerSocket(0); // random port
+        serverSocket.setSoTimeout(0);
+        port = serverSocket.getLocalPort();
+        executorService = Executors.newCachedThreadPool(r -> {
+            final Thread thread = new Thread(null, r, "Http Proxy: " + port);
+            thread.setDaemon(true);
+            return thread;
+        });
+        executorService.execute(new SocketAcceptor());
+        System.out.println("Started proxy server " + this + " on port " + port);
+    }
 
-  private final class SocketAcceptor implements Runnable {
     @Override
-    public void run() {
-      while (!Thread.currentThread().isInterrupted() && !serverSocket.isClosed()) {
+    public void close() throws IOException {
+        executorService.shutdown();
+        serverSocket.close();
+        for (Socket socket : openSockets) {
+            socket.close();
+        }
         try {
-          // Only accepts one request at a time (not multi-threaded).
-          Socket clientToProxy = serverSocket.accept();
-          requestCount.incrementAndGet();
-          clientToProxy.setSoTimeout(0);
-          openSockets.add(clientToProxy);
-          executorService.execute(new Handler(clientToProxy));
-        } catch (Exception e) {
-          if (!executorService.isShutdown()) {
-            e.printStackTrace();
-          }
+            executorService.awaitTermination(1, TimeUnit.MINUTES);
+        } catch (InterruptedException e) {
         }
-      }
     }
-  }
-
-  @SuppressForbidden
-  public final class Handler implements Runnable {
-    private final Socket clientToProxy;
 
-    public Handler(Socket clientToProxy) {
-      this.clientToProxy = clientToProxy;
+    public int requestCount() {
+        return requestCount.get();
     }
 
-    @Override
-    @SuppressForbidden
-    public void run() {
-      try {
-        BufferedReader clientToProxyIn =
-            new BufferedReader(new InputStreamReader(clientToProxy.getInputStream()));
-        OutputStreamWriter clientToProxyOut =
-            new OutputStreamWriter(clientToProxy.getOutputStream());
-
-        String requestString = clientToProxyIn.readLine();
-        System.out.println("Request Received " + requestString);
-        String request = requestString.substring(0, requestString.indexOf(' '));
-        assert request.equals("CONNECT");
-
-        String urlString = requestString.substring(requestString.indexOf(' ') + 1);
-        urlString = urlString.substring(0, urlString.indexOf(' '));
-
-        System.out.println("HTTPS Request for : " + urlString);
-
-        String remainder = null;
-        while (remainder == null || !remainder.isEmpty()) {
-          remainder = clientToProxyIn.readLine();
-          System.out.println("Remainder(" + remainder.length() + "):" + remainder);
+    private final class SocketAcceptor implements Runnable {
+        @Override
+        public void run() {
+            while (!Thread.currentThread().isInterrupted() && !serverSocket.isClosed()) {
+                try {
+                    // Only accepts one request at a time (not multi-threaded).
+                    Socket clientToProxy = serverSocket.accept();
+                    requestCount.incrementAndGet();
+                    clientToProxy.setSoTimeout(0);
+                    openSockets.add(clientToProxy);
+                    executorService.execute(new Handler(clientToProxy));
+                } catch (Exception e) {
+                    if (!executorService.isShutdown()) {
+                        e.printStackTrace();
+                    }
+                }
+            }
         }
+    }
 
-        String[] hostSplit = urlString.split(":");
-        assert hostSplit.length == 2;
-
-        Socket proxyToServer = new Socket(hostSplit[0], Integer.parseInt(hostSplit[1]));
-        openSockets.add(proxyToServer);
-        proxyToServer.setSoTimeout(0);
+    @SuppressForbidden
+    public final class Handler implements Runnable {
+        private final Socket clientToProxy;
 
-        clientToProxyOut.write("HTTP/1.0 200 Connection established\r\n\r\n");
-        clientToProxyOut.flush();
+        public Handler(Socket clientToProxy) {
+            this.clientToProxy = clientToProxy;
+        }
 
-        executorService.execute(new AsyncPipe(clientToProxy, proxyToServer));
-        executorService.execute(new AsyncPipe(proxyToServer, clientToProxy));
-        System.out.println("Connection pipes established");
-      } catch (Exception e) {
-        if (!executorService.isShutdown()) {
-          e.printStackTrace();
+        @Override
+        @SuppressForbidden
+        public void run() {
+            try {
+                BufferedReader clientToProxyIn =
+                        new BufferedReader(new InputStreamReader(clientToProxy.getInputStream()));
+                OutputStreamWriter clientToProxyOut = new OutputStreamWriter(clientToProxy.getOutputStream());
+
+                String requestString = clientToProxyIn.readLine();
+                System.out.println("Request Received " + requestString);
+                String request = requestString.substring(0, requestString.indexOf(' '));
+                assert request.equals("CONNECT");
+
+                String urlString = requestString.substring(requestString.indexOf(' ') + 1);
+                urlString = urlString.substring(0, urlString.indexOf(' '));
+
+                System.out.println("HTTPS Request for : " + urlString);
+
+                String remainder = null;
+                while (remainder == null || !remainder.isEmpty()) {
+                    remainder = clientToProxyIn.readLine();
+                    System.out.println("Remainder(" + remainder.length() + "):" + remainder);
+                }
+
+                String[] hostSplit = urlString.split(":");
+                assert hostSplit.length == 2;
+
+                Socket proxyToServer = new Socket(hostSplit[0], Integer.parseInt(hostSplit[1]));
+                openSockets.add(proxyToServer);
+                proxyToServer.setSoTimeout(0);
+
+                clientToProxyOut.write("HTTP/1.0 200 Connection established\r\n\r\n");
+                clientToProxyOut.flush();
+
+                executorService.execute(new AsyncPipe(clientToProxy, proxyToServer));
+                executorService.execute(new AsyncPipe(proxyToServer, clientToProxy));
+                System.out.println("Connection pipes established");
+            } catch (Exception e) {
+                if (!executorService.isShutdown()) {
+                    e.printStackTrace();
+                }
+            }
         }
-      }
     }
-  }
 
-  private class AsyncPipe implements Runnable {
-    private final Socket input;
-    private final Socket output;
+    private class AsyncPipe implements Runnable {
+        private final Socket input;
+        private final Socket output;
 
-    @SuppressForbidden
-    private AsyncPipe(Socket input, Socket output) {
-      this.input = input;
-      this.output = output;
-      System.out.println("Starting: " + this);
-    }
+        @SuppressForbidden
+        private AsyncPipe(Socket input, Socket output) {
+            this.input = input;
+            this.output = output;
+            System.out.println("Starting: " + this);
+        }
 
-    @Override
-    @SuppressForbidden
-    public void run() {
-      try {
-        // Read byte by byte from client and send directly to server
-        byte[] buffer = new byte[4096];
-        int read;
-        InputStream inputStream = input.getInputStream();
-        OutputStream outputStream = output.getOutputStream();
-        do {
-          read = inputStream.read(buffer);
-          System.out.println(this + " -> " + read);
-          if (read > 0) {
-            outputStream.write(buffer, 0, read);
-            if (inputStream.available() < 1) {
-              outputStream.flush();
+        @Override
+        @SuppressForbidden
+        public void run() {
+            try {
+                // Read byte by byte from client and send directly to server
+                byte[] buffer = new byte[4096];
+                int read;
+                InputStream inputStream = input.getInputStream();
+                OutputStream outputStream = output.getOutputStream();
+                do {
+                    read = inputStream.read(buffer);
+                    System.out.println(this + " -> " + read);
+                    if (read > 0) {
+                        outputStream.write(buffer, 0, read);
+                        if (inputStream.available() < 1) {
+                            outputStream.flush();
+                        }
+                    }
+                } while (read >= 0 && !executorService.isShutdown());
+                System.out.println("Done: " + this);
+            } catch (SocketException e) {
+                // ignore sockets getting closed.
+            } catch (IOException e) {
+                if (!executorService.isShutdown()) {
+                    e.printStackTrace();
+                }
+            } finally {
+                openSockets.remove(input);
+                try {
+                    output.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
             }
-          }
-        } while (read >= 0 && !executorService.isShutdown());
-        System.out.println("Done: " + this);
-      } catch (SocketException e) {
-        // ignore sockets getting closed.
-      } catch (IOException e) {
-        if (!executorService.isShutdown()) {
-          e.printStackTrace();
-        }
-      } finally {
-        openSockets.remove(input);
-        try {
-          output.close();
-        } catch (IOException e) {
-          e.printStackTrace();
         }
-      }
     }
-  }
 }
diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/ClasspathUtils.java b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/ClasspathUtils.java
index 06535303ff4..c88d49eeab7 100644
--- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/ClasspathUtils.java
+++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/ClasspathUtils.java
@@ -18,108 +18,101 @@
 
 public class ClasspathUtils {
 
-  public static byte[] convertToByteArray(final InputStream resource) throws IOException {
-    final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-    int bytesRead;
-    final byte[] data = new byte[1024];
-    while ((bytesRead = resource.read(data, 0, data.length)) != -1) {
-      buffer.write(data, 0, bytesRead);
+    public static byte[] convertToByteArray(final InputStream resource) throws IOException {
+        final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+        int bytesRead;
+        final byte[] data = new byte[1024];
+        while ((bytesRead = resource.read(data, 0, data.length)) != -1) {
+            buffer.write(data, 0, bytesRead);
+        }
+        buffer.flush();
+        return buffer.toByteArray();
     }
-    buffer.flush();
-    return buffer.toByteArray();
-  }
 
-  public static byte[] convertToByteArray(final Class<?> clazz) throws IOException {
-    try (InputStream inputStream =
-        clazz.getClassLoader().getResourceAsStream(getResourceName(clazz.getName()))) {
-      return convertToByteArray(inputStream);
+    public static byte[] convertToByteArray(final Class<?> clazz) throws IOException {
+        try (InputStream inputStream = clazz.getClassLoader().getResourceAsStream(getResourceName(clazz.getName()))) {
+            return convertToByteArray(inputStream);
+        }
     }
-  }
 
-  /**
-   * Create a temporary jar on the filesystem with the bytes of the given classes.
-   *
-   * <p>The jar file will be removed when the jvm exits.
-   *
-   * @param loader classloader used to load bytes
-   * @param resourceNames names of resources to copy into the new jar
-   * @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");
-    tmpJar.deleteOnExit();
+    /**
+     * Create a temporary jar on the filesystem with the bytes of the given classes.
+     *
+     * <p>The jar file will be removed when the jvm exits.
+     *
+     * @param loader classloader used to load bytes
+     * @param resourceNames names of resources to copy into the new jar
+     * @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");
+        tmpJar.deleteOnExit();
 
-    final Manifest manifest = new Manifest();
-    try (final JarOutputStream target =
-        new JarOutputStream(
-            new BufferedOutputStream(Files.newOutputStream(tmpJar.toPath())), manifest)) {
-      for (final String resourceName : resourceNames) {
-        try (InputStream is = loader.getResourceAsStream(resourceName)) {
-          if (is != null) {
-            addToJar(resourceName, convertToByteArray(is), target);
-          }
+        final Manifest manifest = new Manifest();
+        try (final JarOutputStream target =
+                new JarOutputStream(new BufferedOutputStream(Files.newOutputStream(tmpJar.toPath())), manifest)) {
+            for (final String resourceName : resourceNames) {
+                try (InputStream is = loader.getResourceAsStream(resourceName)) {
+                    if (is != null) {
+                        addToJar(resourceName, convertToByteArray(is), target);
+                    }
+                }
+            }
         }
-      }
+
+        return tmpJar.toURI().toURL();
     }
 
-    return tmpJar.toURI().toURL();
-  }
+    /**
+     * Create a temporary jar on the filesystem with the bytes of the given classes.
+     *
+     * <p>The jar file will be removed when the jvm exits.
+     *
+     * @param classes classes to package into the jar.
+     * @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();
 
-  /**
-   * Create a temporary jar on the filesystem with the bytes of the given classes.
-   *
-   * <p>The jar file will be removed when the jvm exits.
-   *
-   * @param classes classes to package into the jar.
-   * @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();
+        final Manifest manifest = new Manifest();
+        final JarOutputStream target =
+                new JarOutputStream(new BufferedOutputStream(Files.newOutputStream(tmpJar.toPath())), manifest);
+        for (final Class<?> clazz : classes) {
+            addToJar(getResourceName(clazz.getName()), convertToByteArray(clazz), target);
+        }
+        target.close();
 
-    final Manifest manifest = new Manifest();
-    final JarOutputStream target =
-        new JarOutputStream(
-            new BufferedOutputStream(Files.newOutputStream(tmpJar.toPath())), manifest);
-    for (final Class<?> clazz : classes) {
-      addToJar(getResourceName(clazz.getName()), convertToByteArray(clazz), target);
+        return tmpJar.toURI().toURL();
     }
-    target.close();
 
-    return tmpJar.toURI().toURL();
-  }
-
-  private static void addToJar(
-      final String resourceName, final byte[] bytes, final JarOutputStream jarOutputStream)
-      throws IOException {
-    final JarEntry entry = new JarEntry(resourceName);
-    jarOutputStream.putNextEntry(entry);
-    jarOutputStream.write(bytes, 0, bytes.length);
-    jarOutputStream.closeEntry();
-  }
+    private static void addToJar(final String resourceName, final byte[] bytes, final JarOutputStream jarOutputStream)
+            throws IOException {
+        final JarEntry entry = new JarEntry(resourceName);
+        jarOutputStream.putNextEntry(entry);
+        jarOutputStream.write(bytes, 0, bytes.length);
+        jarOutputStream.closeEntry();
+    }
 
-  // Moved this to a java class because groovy was adding a hard ref to classLoader
-  public static boolean isClassLoaded(final String className, final ClassLoader classLoader) {
-    try {
-      final Method findLoadedClassMethod =
-          ClassLoader.class.getDeclaredMethod("findLoadedClass", String.class);
-      try {
-        findLoadedClassMethod.setAccessible(true);
-        final Class<?> loadedClass =
-            (Class<?>) findLoadedClassMethod.invoke(classLoader, className);
-        return null != loadedClass && loadedClass.getClassLoader() == classLoader;
-      } catch (final Exception e) {
-        throw new IllegalStateException(e);
-      } finally {
-        findLoadedClassMethod.setAccessible(false);
-      }
-    } catch (final NoSuchMethodException e) {
-      throw new IllegalStateException(e);
+    // Moved this to a java class because groovy was adding a hard ref to classLoader
+    public static boolean isClassLoaded(final String className, final ClassLoader classLoader) {
+        try {
+            final Method findLoadedClassMethod = ClassLoader.class.getDeclaredMethod("findLoadedClass", String.class);
+            try {
+                findLoadedClassMethod.setAccessible(true);
+                final Class<?> loadedClass = (Class<?>) findLoadedClassMethod.invoke(classLoader, className);
+                return null != loadedClass && loadedClass.getClassLoader() == classLoader;
+            } catch (final Exception e) {
+                throw new IllegalStateException(e);
+            } finally {
+                findLoadedClassMethod.setAccessible(false);
+            }
+        } catch (final NoSuchMethodException e) {
+            throw new IllegalStateException(e);
+        }
     }
-  }
 }
diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/OkHttpUtils.java b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/OkHttpUtils.java
index 361aab3845c..f05e1f94188 100644
--- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/OkHttpUtils.java
+++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/OkHttpUtils.java
@@ -25,94 +25,90 @@
  */
 public class OkHttpUtils {
 
-  private static final Logger CLIENT_LOGGER = LoggerFactory.getLogger("http-client");
+    private static final Logger CLIENT_LOGGER = LoggerFactory.getLogger("http-client");
 
-  static {
-    try {
-      ((ch.qos.logback.classic.Logger) CLIENT_LOGGER).setLevel(ch.qos.logback.classic.Level.DEBUG);
-    } catch (Throwable t) {
-      CLIENT_LOGGER.warn("Unable to set debug level to client logger", t);
+    static {
+        try {
+            ((ch.qos.logback.classic.Logger) CLIENT_LOGGER).setLevel(ch.qos.logback.classic.Level.DEBUG);
+        } catch (Throwable t) {
+            CLIENT_LOGGER.warn("Unable to set debug level to client logger", t);
+        }
     }
-  }
 
-  private static final HttpLoggingInterceptor LOGGING_INTERCEPTOR =
-      new HttpLoggingInterceptor(CLIENT_LOGGER::debug);
+    private static final HttpLoggingInterceptor LOGGING_INTERCEPTOR = new HttpLoggingInterceptor(CLIENT_LOGGER::debug);
 
-  private static final Interceptor EXPECT_CONTINUE_INTERCEPTOR =
-      chain -> {
+    private static final Interceptor EXPECT_CONTINUE_INTERCEPTOR = chain -> {
         final Request.Builder builder = chain.request().newBuilder();
         if (chain.request().body() != null) {
-          builder.addHeader("Expect", "100-continue");
+            builder.addHeader("Expect", "100-continue");
         }
         return chain.proceed(builder.build());
-      };
-
-  static {
-    LOGGING_INTERCEPTOR.setLevel(Level.BASIC);
-  }
-
-  public static OkHttpClient.Builder clientBuilder() {
-    final TimeUnit unit = TimeUnit.MINUTES;
-    return new OkHttpClient.Builder()
-        .addInterceptor(EXPECT_CONTINUE_INTERCEPTOR)
-        .addInterceptor(LOGGING_INTERCEPTOR)
-        .connectTimeout(1, unit)
-        .writeTimeout(1, unit)
-        .readTimeout(1, unit);
-  }
-
-  public static OkHttpClient client() {
-    return client(false);
-  }
-
-  public static OkHttpClient client(long connectTimeout, long readTimeout, TimeUnit unit) {
-    return client(
-        clientBuilder().connectTimeout(connectTimeout, unit).readTimeout(readTimeout, unit), false);
-  }
-
-  public static OkHttpClient client(final boolean followRedirects) {
-    return client(clientBuilder(), followRedirects);
-  }
-
-  static OkHttpClient client(final OkHttpClient.Builder builder, final boolean followRedirects) {
-    return builder.followRedirects(followRedirects).build();
-  }
-
-  public static OkHttpClient client(
-      final TestHttpServer server, final ProxySelector proxySelector) {
-    return clientBuilder()
-        .sslSocketFactory(server.sslContext.getSocketFactory(), server.getTrustManager())
-        .hostnameVerifier(server.getHostnameVerifier())
-        .proxySelector(proxySelector)
-        .build();
-  }
-
-  public static <E> CookieJar cookieJar(Function<HttpUrl, E> cookieKey) {
-    return new CustomCookieJar<>(cookieKey);
-  }
-
-  public static CookieJar cookieJar() {
-    return cookieJar(HttpUrl::host);
-  }
-
-  private static class CustomCookieJar<E> implements CookieJar {
-
-    private final ConcurrentHashMap<E, List<Cookie>> cookies;
-    private final Function<HttpUrl, E> key;
-
-    private CustomCookieJar(final Function<HttpUrl, E> key) {
-      this.key = key;
-      cookies = new ConcurrentHashMap<>();
+    };
+
+    static {
+        LOGGING_INTERCEPTOR.setLevel(Level.BASIC);
+    }
+
+    public static OkHttpClient.Builder clientBuilder() {
+        final TimeUnit unit = TimeUnit.MINUTES;
+        return new OkHttpClient.Builder()
+                .addInterceptor(EXPECT_CONTINUE_INTERCEPTOR)
+                .addInterceptor(LOGGING_INTERCEPTOR)
+                .connectTimeout(1, unit)
+                .writeTimeout(1, unit)
+                .readTimeout(1, unit);
+    }
+
+    public static OkHttpClient client() {
+        return client(false);
+    }
+
+    public static OkHttpClient client(long connectTimeout, long readTimeout, TimeUnit unit) {
+        return client(clientBuilder().connectTimeout(connectTimeout, unit).readTimeout(readTimeout, unit), false);
+    }
+
+    public static OkHttpClient client(final boolean followRedirects) {
+        return client(clientBuilder(), followRedirects);
+    }
+
+    static OkHttpClient client(final OkHttpClient.Builder builder, final boolean followRedirects) {
+        return builder.followRedirects(followRedirects).build();
     }
 
-    @Override
-    public void saveFromResponse(final HttpUrl httpUrl, final List<Cookie> list) {
-      cookies.computeIfAbsent(key.apply(httpUrl), k -> new ArrayList<>()).addAll(list);
+    public static OkHttpClient client(final TestHttpServer server, final ProxySelector proxySelector) {
+        return clientBuilder()
+                .sslSocketFactory(server.sslContext.getSocketFactory(), server.getTrustManager())
+                .hostnameVerifier(server.getHostnameVerifier())
+                .proxySelector(proxySelector)
+                .build();
     }
 
-    @Override
-    public List<Cookie> loadForRequest(final HttpUrl httpUrl) {
-      return cookies.getOrDefault(key.apply(httpUrl), Collections.emptyList());
+    public static <E> CookieJar cookieJar(Function<HttpUrl, E> cookieKey) {
+        return new CustomCookieJar<>(cookieKey);
+    }
+
+    public static CookieJar cookieJar() {
+        return cookieJar(HttpUrl::host);
+    }
+
+    private static class CustomCookieJar<E> implements CookieJar {
+
+        private final ConcurrentHashMap<E, List<Cookie>> cookies;
+        private final Function<HttpUrl, E> key;
+
+        private CustomCookieJar(final Function<HttpUrl, E> key) {
+            this.key = key;
+            cookies = new ConcurrentHashMap<>();
+        }
+
+        @Override
+        public void saveFromResponse(final HttpUrl httpUrl, final List<Cookie> list) {
+            cookies.computeIfAbsent(key.apply(httpUrl), k -> new ArrayList<>()).addAll(list);
+        }
+
+        @Override
+        public List<Cookie> loadForRequest(final HttpUrl httpUrl) {
+            return cookies.getOrDefault(key.apply(httpUrl), Collections.emptyList());
+        }
     }
-  }
 }
diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/PortUtils.java b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/PortUtils.java
index df7830a7506..004fd14780a 100644
--- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/PortUtils.java
+++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/PortUtils.java
@@ -10,187 +10,172 @@
 
 public class PortUtils {
 
-  public static int UNUSABLE_PORT = 61;
-  private static final int PORT_CONNECT_TIMEOUT_MS = 1000;
-
-  private static final int FREE_PORT_RANGE_START = 20000;
-  private static final int FREE_PORT_RANGE_END = 40000;
-  private static final int PORT_POOL_SIZE = 200;
-
-  private static final ServerSocket baseSocket;
-  private static final int basePort;
-  private static final int lastPort;
-  private static final AtomicInteger nextPort = new AtomicInteger(0);
-
-  static {
-    // We try to allocate a pool of PORT_POOL_SIZE consecutive ports for this process, and make it
-    // non-overlapping with other test processes. The first process tries to bind to port 20000. If
-    // it works, it'll leave that socket bound for the rest of the process execution (as a cheap
-    // lock), and use 20000-20199 round robin. Next process tries to bind to 20000, it fails and
-    // tries 20200, if it works, it'll use 20200-23999.... So each process tries to use a
-    // non-overlapping batch of 200 ports.
-    ServerSocket s = null;
-    for (int i = FREE_PORT_RANGE_START; i < FREE_PORT_RANGE_END; i += PORT_POOL_SIZE) {
-      s = openSocket(i);
-      if (s != null) {
-        break;
-      }
-    }
-    baseSocket = s;
-    if (s != null) {
-      basePort = baseSocket.getLocalPort();
-      lastPort = basePort + PORT_POOL_SIZE - 1;
-      nextPort.set(basePort + 1);
-    } else {
-      basePort = 0;
-      lastPort = 0;
+    public static int UNUSABLE_PORT = 61;
+    private static final int PORT_CONNECT_TIMEOUT_MS = 1000;
+
+    private static final int FREE_PORT_RANGE_START = 20000;
+    private static final int FREE_PORT_RANGE_END = 40000;
+    private static final int PORT_POOL_SIZE = 200;
+
+    private static final ServerSocket baseSocket;
+    private static final int basePort;
+    private static final int lastPort;
+    private static final AtomicInteger nextPort = new AtomicInteger(0);
+
+    static {
+        // We try to allocate a pool of PORT_POOL_SIZE consecutive ports for this process, and make it
+        // non-overlapping with other test processes. The first process tries to bind to port 20000. If
+        // it works, it'll leave that socket bound for the rest of the process execution (as a cheap
+        // lock), and use 20000-20199 round robin. Next process tries to bind to 20000, it fails and
+        // tries 20200, if it works, it'll use 20200-23999.... So each process tries to use a
+        // non-overlapping batch of 200 ports.
+        ServerSocket s = null;
+        for (int i = FREE_PORT_RANGE_START; i < FREE_PORT_RANGE_END; i += PORT_POOL_SIZE) {
+            s = openSocket(i);
+            if (s != null) {
+                break;
+            }
+        }
+        baseSocket = s;
+        if (s != null) {
+            basePort = baseSocket.getLocalPort();
+            lastPort = basePort + PORT_POOL_SIZE - 1;
+            nextPort.set(basePort + 1);
+        } else {
+            basePort = 0;
+            lastPort = 0;
+        }
     }
-  }
-
-  /** Open up a random, reusable port. */
-  public static int randomOpenPort() {
-    if (basePort > 0) {
-      for (int i = 0; i < PORT_POOL_SIZE; i++) {
-        final int port = nextPort.getAndUpdate(x -> (x >= lastPort) ? basePort + 1 : x + 1);
-        ServerSocket socket = openSocket(port);
+
+    /** Open up a random, reusable port. */
+    public static int randomOpenPort() {
+        if (basePort > 0) {
+            for (int i = 0; i < PORT_POOL_SIZE; i++) {
+                final int port = nextPort.getAndUpdate(x -> (x >= lastPort) ? basePort + 1 : x + 1);
+                ServerSocket socket = openSocket(port);
+                if (null != socket) {
+                    try {
+                        socket.close();
+                        return socket.getLocalPort();
+                    } catch (final IOException ioe) {
+                        // Ignore
+                    }
+                }
+            }
+        }
+
+        ServerSocket socket = randomOpenSocket();
         if (null != socket) {
-          try {
-            socket.close();
-            return socket.getLocalPort();
-          } catch (final IOException ioe) {
-            // Ignore
-          }
+            try {
+                socket.close();
+                return socket.getLocalPort();
+            } catch (final IOException ioe) {
+                ioe.printStackTrace();
+                return -1;
+            }
+        } else {
+            return -1;
         }
-      }
     }
 
-    ServerSocket socket = randomOpenSocket();
-    if (null != socket) {
-      try {
-        socket.close();
-        return socket.getLocalPort();
-      } catch (final IOException ioe) {
-        ioe.printStackTrace();
-        return -1;
-      }
-    } else {
-      return -1;
+    /** Open up a random, server socket and keep it open. */
+    public static ServerSocket randomOpenSocket() {
+        return openSocket(0);
     }
-  }
-
-  /** Open up a random, server socket and keep it open. */
-  public static ServerSocket randomOpenSocket() {
-    return openSocket(0);
-  }
-
-  private static ServerSocket openSocket(final int port) {
-    try {
-      ServerSocket socket = new ServerSocket(port);
-      socket.setReuseAddress(true);
-      return socket;
-    } catch (final IOException ioe) {
-      ioe.printStackTrace();
-      return null;
+
+    private static ServerSocket openSocket(final int port) {
+        try {
+            ServerSocket socket = new ServerSocket(port);
+            socket.setReuseAddress(true);
+            return socket;
+        } catch (final IOException ioe) {
+            ioe.printStackTrace();
+            return null;
+        }
     }
-  }
-
-  private static boolean isPortOpen(final int port) {
-    return isPortOpen(null, port);
-  }
-
-  private static boolean isPortOpen(String host, int port) {
-    try (final Socket socket = new Socket()) {
-      InetSocketAddress address =
-          host == null
-              ? new InetSocketAddress(InetAddress.getLoopbackAddress(), port)
-              : new InetSocketAddress(host, port);
-      socket.connect(address, PORT_CONNECT_TIMEOUT_MS);
-      return true;
-    } catch (final IOException e) {
-      return false;
+
+    private static boolean isPortOpen(final int port) {
+        return isPortOpen(null, port);
     }
-  }
-
-  public static void waitForPortToOpen(
-      final int port, final long timeout, final TimeUnit unit, final Process process) {
-    final long startedAt = System.currentTimeMillis();
-    final long waitUntil = startedAt + unit.toMillis(timeout);
-
-    while (System.currentTimeMillis() < waitUntil) {
-      try {
-        Thread.sleep(100);
-      } catch (final InterruptedException e) {
-        throw new RuntimeException("Interrupted while waiting for " + port + " to be opened");
-      }
-
-      if (!process.isAlive()) {
-        int exitCode = process.exitValue();
-        if (exitCode != 0) {
-          throw new RuntimeException(
-              "Process exited abnormally exitCode="
-                  + exitCode
-                  + " before port="
-                  + port
-                  + " was opened");
-        } else {
-          throw new RuntimeException("Process finished before port=" + port + " was opened");
-        }
-      }
 
-      if (isPortOpen(port)) {
-        return;
-      }
+    private static boolean isPortOpen(String host, int port) {
+        try (final Socket socket = new Socket()) {
+            InetSocketAddress address = host == null
+                    ? new InetSocketAddress(InetAddress.getLoopbackAddress(), port)
+                    : new InetSocketAddress(host, port);
+            socket.connect(address, PORT_CONNECT_TIMEOUT_MS);
+            return true;
+        } catch (final IOException e) {
+            return false;
+        }
     }
 
-    throw new RuntimeException(
-        "Timed out waiting for port "
-            + port
-            + " to be opened, started to wait at: "
-            + startedAt
-            + ", timed out at: "
-            + System.currentTimeMillis());
-  }
-
-  public static void waitForPortToOpen(String host, int port, long timeout, TimeUnit unit) {
-    waitForPort(host, port, timeout, unit, true);
-  }
-
-  public static void waitForPortToOpen(int port, long timeout, TimeUnit unit) {
-    waitForPortToOpen(null, port, timeout, unit);
-  }
-
-  public static void waitForPortToClose(int port, long timeout, TimeUnit unit) {
-    waitForPort(null, port, timeout, unit, false);
-  }
-
-  private static void waitForPort(
-      String host, int port, long timeout, TimeUnit unit, boolean open) {
-    long waitNanos = unit.toNanos(timeout);
-    long start = System.nanoTime();
-    String state = open ? "open" : "closed";
-
-    while (System.nanoTime() - start < waitNanos) {
-      if (isPortOpen(host, port) == open) {
-        return;
-      }
-
-      try {
-        Thread.sleep(100);
-      } catch (final InterruptedException e) {
-        throw new RuntimeException(
-            "Interrupted while waiting for "
-                + (host != null ? host + ":" : "")
+    public static void waitForPortToOpen(
+            final int port, final long timeout, final TimeUnit unit, final Process process) {
+        final long startedAt = System.currentTimeMillis();
+        final long waitUntil = startedAt + unit.toMillis(timeout);
+
+        while (System.currentTimeMillis() < waitUntil) {
+            try {
+                Thread.sleep(100);
+            } catch (final InterruptedException e) {
+                throw new RuntimeException("Interrupted while waiting for " + port + " to be opened");
+            }
+
+            if (!process.isAlive()) {
+                int exitCode = process.exitValue();
+                if (exitCode != 0) {
+                    throw new RuntimeException(
+                            "Process exited abnormally exitCode=" + exitCode + " before port=" + port + " was opened");
+                } else {
+                    throw new RuntimeException("Process finished before port=" + port + " was opened");
+                }
+            }
+
+            if (isPortOpen(port)) {
+                return;
+            }
+        }
+
+        throw new RuntimeException("Timed out waiting for port "
                 + port
-                + " to be "
-                + state);
-      }
+                + " to be opened, started to wait at: "
+                + startedAt
+                + ", timed out at: "
+                + System.currentTimeMillis());
+    }
+
+    public static void waitForPortToOpen(String host, int port, long timeout, TimeUnit unit) {
+        waitForPort(host, port, timeout, unit, true);
+    }
+
+    public static void waitForPortToOpen(int port, long timeout, TimeUnit unit) {
+        waitForPortToOpen(null, port, timeout, unit);
     }
 
-    throw new RuntimeException(
-        "Timed out waiting for port "
-            + (host != null ? host + ":" : "")
-            + port
-            + " to be "
-            + state);
-  }
+    public static void waitForPortToClose(int port, long timeout, TimeUnit unit) {
+        waitForPort(null, port, timeout, unit, false);
+    }
+
+    private static void waitForPort(String host, int port, long timeout, TimeUnit unit, boolean open) {
+        long waitNanos = unit.toNanos(timeout);
+        long start = System.nanoTime();
+        String state = open ? "open" : "closed";
+
+        while (System.nanoTime() - start < waitNanos) {
+            if (isPortOpen(host, port) == open) {
+                return;
+            }
+
+            try {
+                Thread.sleep(100);
+            } catch (final InterruptedException e) {
+                throw new RuntimeException(
+                        "Interrupted while waiting for " + (host != null ? host + ":" : "") + port + " to be " + state);
+            }
+        }
+
+        throw new RuntimeException(
+                "Timed out waiting for port " + (host != null ? host + ":" : "") + port + " to be " + state);
+    }
 }
diff --git a/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/base/HttpServer.java b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/base/HttpServer.java
index 620a135ac9a..d6b0cc9983a 100644
--- a/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/base/HttpServer.java
+++ b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/base/HttpServer.java
@@ -5,9 +5,9 @@
 
 public interface HttpServer {
 
-  void start() throws TimeoutException;
+    void start() throws TimeoutException;
 
-  void stop();
+    void stop();
 
-  URI address();
+    URI address();
 }
diff --git a/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/base/TestInstrumentation.java b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/base/TestInstrumentation.java
index 262b762be60..72f15a6d74f 100644
--- a/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/base/TestInstrumentation.java
+++ b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/base/TestInstrumentation.java
@@ -6,14 +6,14 @@
 
 /** Skeleton single-class test instrumentation. */
 public abstract class TestInstrumentation extends InstrumenterModule
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+        implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public TestInstrumentation() {
-    super("test");
-  }
+    public TestInstrumentation() {
+        super("test");
+    }
 
-  @Override
-  public boolean isApplicable(Set<TargetSystem> enabledSystems) {
-    return true; // always on for testing purposes
-  }
+    @Override
+    public boolean isApplicable(Set<TargetSystem> enabledSystems) {
+        return true; // always on for testing purposes
+    }
 }
diff --git a/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/server/http/HttpServletRequestExtractAdapter.java b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/server/http/HttpServletRequestExtractAdapter.java
index 9fd47af1ab4..2b188d0ded5 100644
--- a/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/server/http/HttpServletRequestExtractAdapter.java
+++ b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/server/http/HttpServletRequestExtractAdapter.java
@@ -10,24 +10,21 @@
  * @author Pavol Loffay
  */
 // FIXME:  This code is duplicated in several places.  Extract to a common dependency.
-public class HttpServletRequestExtractAdapter
-    implements AgentPropagation.ContextVisitor<HttpServletRequest> {
+public class HttpServletRequestExtractAdapter implements AgentPropagation.ContextVisitor<HttpServletRequest> {
 
-  public static final HttpServletRequestExtractAdapter GETTER =
-      new HttpServletRequestExtractAdapter();
+    public static final HttpServletRequestExtractAdapter GETTER = new HttpServletRequestExtractAdapter();
 
-  @Override
-  public void forEachKey(
-      final HttpServletRequest carrier, final AgentPropagation.KeyClassifier classifier) {
-    Enumeration<String> headerNames = carrier.getHeaderNames();
-    if (headerNames == null) {
-      return;
+    @Override
+    public void forEachKey(final HttpServletRequest carrier, final AgentPropagation.KeyClassifier classifier) {
+        Enumeration<String> headerNames = carrier.getHeaderNames();
+        if (headerNames == null) {
+            return;
+        }
+        while (headerNames.hasMoreElements()) {
+            final String header = headerNames.nextElement();
+            if (!classifier.accept(header, carrier.getHeader(header))) {
+                return;
+            }
+        }
     }
-    while (headerNames.hasMoreElements()) {
-      final String header = headerNames.nextElement();
-      if (!classifier.accept(header, carrier.getHeader(header))) {
-        return;
-      }
-    }
-  }
 }
diff --git a/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/server/http/JavaTestHttpServer.java b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/server/http/JavaTestHttpServer.java
index 1ff635fba5e..5379c34d05b 100644
--- a/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/server/http/JavaTestHttpServer.java
+++ b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/server/http/JavaTestHttpServer.java
@@ -56,27 +56,26 @@
 @SuppressFBWarnings({"IS2_INCONSISTENT_SYNC", "PA_PUBLIC_PRIMITIVE_ATTRIBUTE"})
 public class JavaTestHttpServer implements AutoCloseable {
 
-  @FunctionalInterface
-  public interface RequestHandler {
-    void handle(HandlerApi api) throws Exception;
-  }
+    @FunctionalInterface
+    public interface RequestHandler {
+        void handle(HandlerApi api) throws Exception;
+    }
 
-  private final Server internalServer;
-  private HandlersSpec handlers;
-  private Consumer<Server> customizer = s -> {};
+    private final Server internalServer;
+    private HandlersSpec handlers;
+    private Consumer<Server> customizer = s -> {};
 
-  public String keystorePath;
-  private URI address;
-  private URI secureAddress;
-  private final AtomicReference<HandlerApi.RequestApi> last = new AtomicReference<>();
+    public String keystorePath;
+    private URI address;
+    private URI secureAddress;
+    private final AtomicReference<HandlerApi.RequestApi> last = new AtomicReference<>();
 
-  public final SSLContext sslContext;
+    public final SSLContext sslContext;
 
-  private final X509TrustManager trustManager =
-      new X509TrustManager() {
+    private final X509TrustManager trustManager = new X509TrustManager() {
         @Override
         public X509Certificate[] getAcceptedIssuers() {
-          return new X509Certificate[0];
+            return new X509Certificate[0];
         }
 
         @Override
@@ -84,545 +83,526 @@ public void checkClientTrusted(X509Certificate[] certificate, String str) {}
 
         @Override
         public void checkServerTrusted(X509Certificate[] certificate, String str) {}
-      };
-
-  private final HostnameVerifier hostnameVerifier =
-      (hostname, session) -> "localhost".equals(hostname);
-
-  public static JavaTestHttpServer httpServer(Consumer<JavaTestHttpServer> spec) {
-    JavaTestHttpServer server = new JavaTestHttpServer();
-    spec.accept(server);
-    server.start();
-    return server;
-  }
-
-  private JavaTestHttpServer() {
-    // In some versions, Jetty requires max threads > than some arbitrary calculated value.
-    // The calculated value can be high in CI. There is no easy way to override the configuration
-    // in a version-neutral way.
-    internalServer = new Server(new QueuedThreadPool(400));
-    try {
-      sslContext = SSLContext.getInstance("TLSv1.2");
-      sslContext.init(null, new TrustManager[] {trustManager}, null);
-    } catch (NoSuchAlgorithmException | KeyManagementException e) {
-      throw new IllegalStateException(e);
-    }
-  }
+    };
+
+    private final HostnameVerifier hostnameVerifier = (hostname, session) -> "localhost".equals(hostname);
 
-  @SuppressForbidden
-  public JavaTestHttpServer start() {
-    if (internalServer.isStarted()) {
-      return this;
+    public static JavaTestHttpServer httpServer(Consumer<JavaTestHttpServer> spec) {
+        JavaTestHttpServer server = new JavaTestHttpServer();
+        spec.accept(server);
+        server.start();
+        return server;
     }
-    synchronized (this) {
-      if (!internalServer.isRunning()) {
-        if (handlers == null) {
-          throw new IllegalStateException("handlers must be defined");
-        }
-        HandlerList handlerList = new HandlerList();
-        handlerList.setHandlers(handlers.configured.toArray(new Handler[0]));
-        internalServer.setHandler(handlerList);
-
-        HttpConfiguration httpConfiguration = new HttpConfiguration();
-
-        // HTTP
-        ServerConnector http =
-            new ServerConnector(internalServer, new HttpConnectionFactory(httpConfiguration));
-        http.setHost("localhost");
-        http.setPort(0);
-        internalServer.addConnector(http);
-
-        // HTTPS
-        SslContextFactory sslContextFactory = new SslContextFactory();
-        keystorePath =
-            extractKeystoreToDisk(JavaTestHttpServer.class.getResource("datadog.jks")).getPath();
-        sslContextFactory.setKeyStorePath(keystorePath);
-        sslContextFactory.setKeyStorePassword("datadog");
-        HttpConfiguration httpsConfiguration = new HttpConfiguration(httpConfiguration);
-        httpsConfiguration.addCustomizer(new SecureRequestCustomizer());
-        ServerConnector https =
-            new ServerConnector(
-                internalServer,
-                new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()),
-                new HttpConnectionFactory(httpsConfiguration));
-        https.setHost("localhost");
-        https.setPort(0);
-        internalServer.addConnector(https);
-
-        customizer.accept(internalServer);
-        try {
-          internalServer.start();
-        } catch (Exception e) {
-          throw new IllegalStateException(e);
-        }
-        // set after starting, otherwise two callbacks get added.
-        internalServer.setStopAtShutdown(true);
 
+    private JavaTestHttpServer() {
+        // In some versions, Jetty requires max threads > than some arbitrary calculated value.
+        // The calculated value can be high in CI. There is no easy way to override the configuration
+        // in a version-neutral way.
+        internalServer = new Server(new QueuedThreadPool(400));
         try {
-          address = new URI("http://localhost:" + http.getLocalPort());
-          secureAddress = new URI("https://localhost:" + https.getLocalPort());
-        } catch (URISyntaxException e) {
-          throw new IllegalStateException(e);
+            sslContext = SSLContext.getInstance("TLSv1.2");
+            sslContext.init(null, new TrustManager[] {trustManager}, null);
+        } catch (NoSuchAlgorithmException | KeyManagementException e) {
+            throw new IllegalStateException(e);
         }
-      }
     }
-    long startTime = System.nanoTime();
-    long rem = TimeUnit.SECONDS.toMillis(5);
-    while (!internalServer.isStarted()) {
-      if (rem <= 0) {
-        throw new RuntimeException(
-            new TimeoutException(
-                "Failed to start server " + this + " on port " + address.getPort()));
-      }
-      try {
-        Thread.sleep(Math.min(rem, 100));
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-        throw new RuntimeException(e);
-      }
-      long endTime = System.nanoTime();
-      rem -= TimeUnit.NANOSECONDS.toMillis(endTime - startTime);
-      startTime = endTime;
-    }
-    System.out.println("Started server " + this + " on " + address + " and  " + secureAddress);
-    return this;
-  }
-
-  private File extractKeystoreToDisk(URL internalFile) {
-    try (InputStream inputStream = internalFile.openStream()) {
-      File tempFile = File.createTempFile("datadog", ".jks");
-      tempFile.deleteOnExit();
-      try (OutputStream out = new FileOutputStream(tempFile)) {
-        byte[] buffer = new byte[1024];
-        int len;
-        while ((len = inputStream.read(buffer)) != -1) {
-          out.write(buffer, 0, len);
-        }
-      }
-      return tempFile;
-    } catch (IOException e) {
-      throw new IllegalStateException(e);
-    }
-  }
-
-  @SuppressForbidden
-  public JavaTestHttpServer stop() {
-    System.out.println("Stopping server " + this + " on " + address + " and  " + secureAddress);
-    try {
-      internalServer.stop();
-    } catch (Exception e) {
-      throw new IllegalStateException(e);
-    }
-    return this;
-  }
-
-  @Override
-  public void close() {
-    stop();
-  }
-
-  public URI getAddress() {
-    return address;
-  }
-
-  public URI getSecureAddress() {
-    return secureAddress;
-  }
 
-  public X509TrustManager getTrustManager() {
-    return trustManager;
-  }
-
-  public HostnameVerifier getHostnameVerifier() {
-    return hostnameVerifier;
-  }
-
-  public HandlerApi.RequestApi getLastRequest() {
-    return last.get();
-  }
-
-  public void customizer(Consumer<Server> spec) {
-    this.customizer = spec;
-  }
-
-  public void handlers(Consumer<HandlersSpec> spec) {
-    if (handlers != null) {
-      throw new IllegalStateException("handlers already defined");
-    }
-    handlers = new HandlersSpec();
-    spec.accept(handlers);
-  }
-
-  public HttpServer asHttpServer() {
-    return new HttpServerAdapter(this, false);
-  }
-
-  public HttpServer asHttpServer(boolean secure) {
-    return new HttpServerAdapter(this, secure);
-  }
-
-  public final class HandlersSpec {
-    final List<Handler> configured = new ArrayList<>();
-
-    public void get(String path, RequestHandler spec) {
-      if (path == null) {
-        throw new IllegalArgumentException("path must not be null");
-      }
-      configured.add(new PathHandler(HttpMethod.GET, path, spec));
+    @SuppressForbidden
+    public JavaTestHttpServer start() {
+        if (internalServer.isStarted()) {
+            return this;
+        }
+        synchronized (this) {
+            if (!internalServer.isRunning()) {
+                if (handlers == null) {
+                    throw new IllegalStateException("handlers must be defined");
+                }
+                HandlerList handlerList = new HandlerList();
+                handlerList.setHandlers(handlers.configured.toArray(new Handler[0]));
+                internalServer.setHandler(handlerList);
+
+                HttpConfiguration httpConfiguration = new HttpConfiguration();
+
+                // HTTP
+                ServerConnector http =
+                        new ServerConnector(internalServer, new HttpConnectionFactory(httpConfiguration));
+                http.setHost("localhost");
+                http.setPort(0);
+                internalServer.addConnector(http);
+
+                // HTTPS
+                SslContextFactory sslContextFactory = new SslContextFactory();
+                keystorePath = extractKeystoreToDisk(JavaTestHttpServer.class.getResource("datadog.jks"))
+                        .getPath();
+                sslContextFactory.setKeyStorePath(keystorePath);
+                sslContextFactory.setKeyStorePassword("datadog");
+                HttpConfiguration httpsConfiguration = new HttpConfiguration(httpConfiguration);
+                httpsConfiguration.addCustomizer(new SecureRequestCustomizer());
+                ServerConnector https = new ServerConnector(
+                        internalServer,
+                        new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()),
+                        new HttpConnectionFactory(httpsConfiguration));
+                https.setHost("localhost");
+                https.setPort(0);
+                internalServer.addConnector(https);
+
+                customizer.accept(internalServer);
+                try {
+                    internalServer.start();
+                } catch (Exception e) {
+                    throw new IllegalStateException(e);
+                }
+                // set after starting, otherwise two callbacks get added.
+                internalServer.setStopAtShutdown(true);
+
+                try {
+                    address = new URI("http://localhost:" + http.getLocalPort());
+                    secureAddress = new URI("https://localhost:" + https.getLocalPort());
+                } catch (URISyntaxException e) {
+                    throw new IllegalStateException(e);
+                }
+            }
+        }
+        long startTime = System.nanoTime();
+        long rem = TimeUnit.SECONDS.toMillis(5);
+        while (!internalServer.isStarted()) {
+            if (rem <= 0) {
+                throw new RuntimeException(
+                        new TimeoutException("Failed to start server " + this + " on port " + address.getPort()));
+            }
+            try {
+                Thread.sleep(Math.min(rem, 100));
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new RuntimeException(e);
+            }
+            long endTime = System.nanoTime();
+            rem -= TimeUnit.NANOSECONDS.toMillis(endTime - startTime);
+            startTime = endTime;
+        }
+        System.out.println("Started server " + this + " on " + address + " and  " + secureAddress);
+        return this;
     }
 
-    public void post(String path, RequestHandler spec) {
-      if (path == null) {
-        throw new IllegalArgumentException("path must not be null");
-      }
-      configured.add(new PathHandler(HttpMethod.POST, path, spec));
+    private File extractKeystoreToDisk(URL internalFile) {
+        try (InputStream inputStream = internalFile.openStream()) {
+            File tempFile = File.createTempFile("datadog", ".jks");
+            tempFile.deleteOnExit();
+            try (OutputStream out = new FileOutputStream(tempFile)) {
+                byte[] buffer = new byte[1024];
+                int len;
+                while ((len = inputStream.read(buffer)) != -1) {
+                    out.write(buffer, 0, len);
+                }
+            }
+            return tempFile;
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
     }
 
-    public void put(String path, RequestHandler spec) {
-      if (path == null) {
-        throw new IllegalArgumentException("path must not be null");
-      }
-      configured.add(new PathHandler(HttpMethod.PUT, path, spec));
+    @SuppressForbidden
+    public JavaTestHttpServer stop() {
+        System.out.println("Stopping server " + this + " on " + address + " and  " + secureAddress);
+        try {
+            internalServer.stop();
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+        return this;
     }
 
-    public void connect(RequestHandler spec) {
-      configured.add(new MethodHandler(HttpMethod.CONNECT, spec));
+    @Override
+    public void close() {
+        stop();
     }
 
-    public void prefix(String path, RequestHandler spec) {
-      configured.add(new PrefixHandler(path, spec));
+    public URI getAddress() {
+        return address;
     }
 
-    public void all(RequestHandler spec) {
-      configured.add(new AllHandler(spec));
+    public URI getSecureAddress() {
+        return secureAddress;
     }
-  }
-
-  private class AllHandler extends AbstractHandler {
-    final RequestHandler spec;
 
-    AllHandler(RequestHandler spec) {
-      this.spec = spec;
+    public X509TrustManager getTrustManager() {
+        return trustManager;
     }
 
-    @Override
-    public void handle(
-        String target,
-        Request baseRequest,
-        HttpServletRequest request,
-        HttpServletResponse response)
-        throws IOException, ServletException {
-      send(baseRequest, response);
+    public HostnameVerifier getHostnameVerifier() {
+        return hostnameVerifier;
     }
 
-    void send(Request baseRequest, HttpServletResponse response) {
-      HandlerApi api = new HandlerApi(baseRequest, response);
-      last.set(api.getRequest());
-      try {
-        spec.handle(api);
-      } catch (Exception e) {
-        try {
-          api.getResponse().status(500).send(e.getMessage());
-        } catch (Exception ignored) {
-          // ignore
-        }
-        e.printStackTrace();
-      }
+    public HandlerApi.RequestApi getLastRequest() {
+        return last.get();
     }
-  }
-
-  private class MethodHandler extends AllHandler {
-    private final String method;
 
-    MethodHandler(HttpMethod method, RequestHandler spec) {
-      super(spec);
-      this.method = method.name();
+    public void customizer(Consumer<Server> spec) {
+        this.customizer = spec;
     }
 
-    @Override
-    public void handle(
-        String target,
-        Request baseRequest,
-        HttpServletRequest request,
-        HttpServletResponse response)
-        throws IOException, ServletException {
-      if (request.getMethod().equalsIgnoreCase(method)) {
-        super.handle(target, baseRequest, request, response);
-      }
+    public void handlers(Consumer<HandlersSpec> spec) {
+        if (handlers != null) {
+            throw new IllegalStateException("handlers already defined");
+        }
+        handlers = new HandlersSpec();
+        spec.accept(handlers);
     }
-  }
-
-  private class PathHandler extends MethodHandler {
-    private final String path;
 
-    PathHandler(HttpMethod method, String path, RequestHandler spec) {
-      super(method, spec);
-      this.path = path.startsWith("/") ? path : "/" + path;
+    public HttpServer asHttpServer() {
+        return new HttpServerAdapter(this, false);
     }
 
-    @Override
-    public void handle(
-        String target,
-        Request baseRequest,
-        HttpServletRequest request,
-        HttpServletResponse response)
-        throws IOException, ServletException {
-      if (path.equals(target)) {
-        super.handle(target, baseRequest, request, response);
-      }
+    public HttpServer asHttpServer(boolean secure) {
+        return new HttpServerAdapter(this, secure);
     }
-  }
 
-  private class PrefixHandler extends AllHandler {
-    private final String prefix;
+    public final class HandlersSpec {
+        final List<Handler> configured = new ArrayList<>();
 
-    PrefixHandler(String prefix, RequestHandler spec) {
-      super(spec);
-      this.prefix = prefix.startsWith("/") ? prefix : "/" + prefix;
-    }
+        public void get(String path, RequestHandler spec) {
+            if (path == null) {
+                throw new IllegalArgumentException("path must not be null");
+            }
+            configured.add(new PathHandler(HttpMethod.GET, path, spec));
+        }
 
-    @Override
-    public void handle(
-        String target,
-        Request baseRequest,
-        HttpServletRequest request,
-        HttpServletResponse response)
-        throws IOException, ServletException {
-      if (target.startsWith(prefix)) {
-        super.handle(target, baseRequest, request, response);
-      }
-    }
-  }
+        public void post(String path, RequestHandler spec) {
+            if (path == null) {
+                throw new IllegalArgumentException("path must not be null");
+            }
+            configured.add(new PathHandler(HttpMethod.POST, path, spec));
+        }
 
-  public static class HandlerApi {
-    private final RequestApi req;
-    private final HttpServletResponse resp;
+        public void put(String path, RequestHandler spec) {
+            if (path == null) {
+                throw new IllegalArgumentException("path must not be null");
+            }
+            configured.add(new PathHandler(HttpMethod.PUT, path, spec));
+        }
 
-    private HandlerApi(Request request, HttpServletResponse response) {
-      this.req = new RequestApi(request);
-      this.resp = response;
-    }
+        public void connect(RequestHandler spec) {
+            configured.add(new MethodHandler(HttpMethod.CONNECT, spec));
+        }
 
-    public RequestApi getRequest() {
-      return req;
-    }
+        public void prefix(String path, RequestHandler spec) {
+            configured.add(new PrefixHandler(path, spec));
+        }
 
-    public ResponseApi getResponse() {
-      return new ResponseApi();
+        public void all(RequestHandler spec) {
+            configured.add(new AllHandler(spec));
+        }
     }
 
-    public void redirect(String uri) throws IOException {
-      resp.sendRedirect(uri);
-      req.orig.setHandled(true);
-    }
+    private class AllHandler extends AbstractHandler {
+        final RequestHandler spec;
 
-    public void handleDistributedRequest() {
-      boolean isDDServer = true;
-      String header = req.getHeader("is-dd-server");
-      if (header != null) {
-        isDDServer = Boolean.parseBoolean(header);
-      }
-      if (isDDServer) {
-        AgentSpanContext extractedContext = extractContextAndGetSpanContext(req.orig, GETTER);
-        if (extractedContext != null) {
-          startSpan("test", "test-http-server", extractedContext)
-              .setTag("path", req.getPath())
-              .setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER)
-              .finish();
-        } else {
-          startSpan("test", "test-http-server")
-              .setTag("path", req.getPath())
-              .setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER)
-              .finish();
-        }
-      }
-    }
+        AllHandler(RequestHandler spec) {
+            this.spec = spec;
+        }
 
-    public static class RequestApi {
-      final Request orig;
-      final String path;
-      final Headers headers;
-      final int contentLength;
-      final String contentType;
-      final byte[] body;
-
-      RequestApi(Request req) {
-        this.orig = req;
-        this.path = req.getPathInfo();
-        this.headers = new Headers(req);
-        this.contentLength = req.getContentLength();
-        String ct = req.getContentType();
-        this.contentType = ct;
-        try (InputStream is = req.getInputStream()) {
-          ByteArrayOutputStream baos = new ByteArrayOutputStream();
-          byte[] buffer = new byte[1024];
-          int read;
-          while ((read = is.read(buffer)) != -1) {
-            baos.write(buffer, 0, read);
-          }
-          this.body = baos.toByteArray();
-        } catch (IOException e) {
-          throw new IllegalStateException(e);
+        @Override
+        public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
+                throws IOException, ServletException {
+            send(baseRequest, response);
         }
-      }
 
-      public String getPath() {
-        return path;
-      }
+        void send(Request baseRequest, HttpServletResponse response) {
+            HandlerApi api = new HandlerApi(baseRequest, response);
+            last.set(api.getRequest());
+            try {
+                spec.handle(api);
+            } catch (Exception e) {
+                try {
+                    api.getResponse().status(500).send(e.getMessage());
+                } catch (Exception ignored) {
+                    // ignore
+                }
+                e.printStackTrace();
+            }
+        }
+    }
 
-      public int getContentLength() {
-        return contentLength;
-      }
+    private class MethodHandler extends AllHandler {
+        private final String method;
 
-      public String getContentType() {
-        if (contentType == null) {
-          return null;
+        MethodHandler(HttpMethod method, RequestHandler spec) {
+            super(spec);
+            this.method = method.name();
         }
-        int idx = contentType.indexOf(';');
-        return idx >= 0 ? contentType.substring(0, idx) : contentType;
-      }
-
-      public Headers getHeaders() {
-        return headers;
-      }
 
-      public String getHeader(String header) {
-        return headers.get(header);
-      }
+        @Override
+        public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
+                throws IOException, ServletException {
+            if (request.getMethod().equalsIgnoreCase(method)) {
+                super.handle(target, baseRequest, request, response);
+            }
+        }
+    }
 
-      public byte[] getBody() {
-        return body;
-      }
+    private class PathHandler extends MethodHandler {
+        private final String path;
 
-      public String getText() {
-        return new String(body);
-      }
+        PathHandler(HttpMethod method, String path, RequestHandler spec) {
+            super(method, spec);
+            this.path = path.startsWith("/") ? path : "/" + path;
+        }
 
-      public String getParameter(String parameter) {
-        return orig.getParameter(parameter);
-      }
+        @Override
+        public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
+                throws IOException, ServletException {
+            if (path.equals(target)) {
+                super.handle(target, baseRequest, request, response);
+            }
+        }
     }
 
-    public class ResponseApi {
-      private static final String DEFAULT_TYPE = "text/plain;charset=utf-8";
-      private int status = 200;
-      private final Map<String, String> headers = new HashMap<>();
+    private class PrefixHandler extends AllHandler {
+        private final String prefix;
 
-      public ResponseApi status(int status) {
-        this.status = status;
-        return this;
-      }
+        PrefixHandler(String prefix, RequestHandler spec) {
+            super(spec);
+            this.prefix = prefix.startsWith("/") ? prefix : "/" + prefix;
+        }
 
-      public ResponseApi addHeader(String headerName, String headerValue) {
-        this.headers.put(headerName, headerValue);
-        return this;
-      }
+        @Override
+        public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
+                throws IOException, ServletException {
+            if (target.startsWith(prefix)) {
+                super.handle(target, baseRequest, request, response);
+            }
+        }
+    }
 
-      public void send() {
-        sendWithType(DEFAULT_TYPE);
-      }
+    public static class HandlerApi {
+        private final RequestApi req;
+        private final HttpServletResponse resp;
 
-      public void sendWithType(String contentType) {
-        if (contentType == null) {
-          throw new IllegalArgumentException("contentType must not be null");
-        }
-        if (req.orig.isHandled()) {
-          throw new IllegalStateException("response already handled");
-        }
-        req.orig.setContentType(contentType);
-        resp.setStatus(status);
-        for (Map.Entry<String, String> e : headers.entrySet()) {
-          resp.addHeader(e.getKey(), e.getValue());
+        private HandlerApi(Request request, HttpServletResponse response) {
+            this.req = new RequestApi(request);
+            this.resp = response;
         }
-        req.orig.setHandled(true);
-      }
 
-      public void send(String body) {
-        sendWithType(DEFAULT_TYPE, body);
-      }
+        public RequestApi getRequest() {
+            return req;
+        }
 
-      public void sendWithType(String contentType, String body) {
-        if (body == null) {
-          throw new IllegalArgumentException("body must not be null");
+        public ResponseApi getResponse() {
+            return new ResponseApi();
         }
-        sendWithType(contentType);
-        byte[] bytes = body.getBytes(StandardCharsets.UTF_8);
-        resp.setContentLength(bytes.length);
-        try {
-          resp.getWriter().print(body);
-        } catch (IOException e) {
-          throw new IllegalStateException(e);
+
+        public void redirect(String uri) throws IOException {
+            resp.sendRedirect(uri);
+            req.orig.setHandled(true);
         }
-      }
 
-      public void send(byte[] body) {
-        sendWithType(DEFAULT_TYPE, body);
-      }
+        public void handleDistributedRequest() {
+            boolean isDDServer = true;
+            String header = req.getHeader("is-dd-server");
+            if (header != null) {
+                isDDServer = Boolean.parseBoolean(header);
+            }
+            if (isDDServer) {
+                AgentSpanContext extractedContext = extractContextAndGetSpanContext(req.orig, GETTER);
+                if (extractedContext != null) {
+                    startSpan("test", "test-http-server", extractedContext)
+                            .setTag("path", req.getPath())
+                            .setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER)
+                            .finish();
+                } else {
+                    startSpan("test", "test-http-server")
+                            .setTag("path", req.getPath())
+                            .setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER)
+                            .finish();
+                }
+            }
+        }
 
-      public void sendWithType(String contentType, byte[] body) {
-        if (body == null) {
-          throw new IllegalArgumentException("body must not be null");
+        public static class RequestApi {
+            final Request orig;
+            final String path;
+            final Headers headers;
+            final int contentLength;
+            final String contentType;
+            final byte[] body;
+
+            RequestApi(Request req) {
+                this.orig = req;
+                this.path = req.getPathInfo();
+                this.headers = new Headers(req);
+                this.contentLength = req.getContentLength();
+                String ct = req.getContentType();
+                this.contentType = ct;
+                try (InputStream is = req.getInputStream()) {
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    byte[] buffer = new byte[1024];
+                    int read;
+                    while ((read = is.read(buffer)) != -1) {
+                        baos.write(buffer, 0, read);
+                    }
+                    this.body = baos.toByteArray();
+                } catch (IOException e) {
+                    throw new IllegalStateException(e);
+                }
+            }
+
+            public String getPath() {
+                return path;
+            }
+
+            public int getContentLength() {
+                return contentLength;
+            }
+
+            public String getContentType() {
+                if (contentType == null) {
+                    return null;
+                }
+                int idx = contentType.indexOf(';');
+                return idx >= 0 ? contentType.substring(0, idx) : contentType;
+            }
+
+            public Headers getHeaders() {
+                return headers;
+            }
+
+            public String getHeader(String header) {
+                return headers.get(header);
+            }
+
+            public byte[] getBody() {
+                return body;
+            }
+
+            public String getText() {
+                return new String(body);
+            }
+
+            public String getParameter(String parameter) {
+                return orig.getParameter(parameter);
+            }
         }
-        sendWithType(contentType);
-        resp.setContentLength(body.length);
-        try {
-          resp.getOutputStream().write(body);
-        } catch (IOException e) {
-          throw new IllegalStateException(e);
+
+        public class ResponseApi {
+            private static final String DEFAULT_TYPE = "text/plain;charset=utf-8";
+            private int status = 200;
+            private final Map<String, String> headers = new HashMap<>();
+
+            public ResponseApi status(int status) {
+                this.status = status;
+                return this;
+            }
+
+            public ResponseApi addHeader(String headerName, String headerValue) {
+                this.headers.put(headerName, headerValue);
+                return this;
+            }
+
+            public void send() {
+                sendWithType(DEFAULT_TYPE);
+            }
+
+            public void sendWithType(String contentType) {
+                if (contentType == null) {
+                    throw new IllegalArgumentException("contentType must not be null");
+                }
+                if (req.orig.isHandled()) {
+                    throw new IllegalStateException("response already handled");
+                }
+                req.orig.setContentType(contentType);
+                resp.setStatus(status);
+                for (Map.Entry<String, String> e : headers.entrySet()) {
+                    resp.addHeader(e.getKey(), e.getValue());
+                }
+                req.orig.setHandled(true);
+            }
+
+            public void send(String body) {
+                sendWithType(DEFAULT_TYPE, body);
+            }
+
+            public void sendWithType(String contentType, String body) {
+                if (body == null) {
+                    throw new IllegalArgumentException("body must not be null");
+                }
+                sendWithType(contentType);
+                byte[] bytes = body.getBytes(StandardCharsets.UTF_8);
+                resp.setContentLength(bytes.length);
+                try {
+                    resp.getWriter().print(body);
+                } catch (IOException e) {
+                    throw new IllegalStateException(e);
+                }
+            }
+
+            public void send(byte[] body) {
+                sendWithType(DEFAULT_TYPE, body);
+            }
+
+            public void sendWithType(String contentType, byte[] body) {
+                if (body == null) {
+                    throw new IllegalArgumentException("body must not be null");
+                }
+                sendWithType(contentType);
+                resp.setContentLength(body.length);
+                try {
+                    resp.getOutputStream().write(body);
+                } catch (IOException e) {
+                    throw new IllegalStateException(e);
+                }
+            }
         }
-      }
     }
-  }
 
-  public static class Headers {
-    private final Map<String, String> headers = new HashMap<>();
+    public static class Headers {
+        private final Map<String, String> headers = new HashMap<>();
 
-    private Headers(Request request) {
-      Enumeration<String> names = request.getHeaderNames();
-      if (names != null) {
-        while (names.hasMoreElements()) {
-          String name = names.nextElement();
-          headers.put(name, request.getHeader(name));
+        private Headers(Request request) {
+            Enumeration<String> names = request.getHeaderNames();
+            if (names != null) {
+                while (names.hasMoreElements()) {
+                    String name = names.nextElement();
+                    headers.put(name, request.getHeader(name));
+                }
+            }
         }
-      }
-    }
 
-    public String get(String header) {
-      return headers.get(header);
+        public String get(String header) {
+            return headers.get(header);
+        }
     }
-  }
 
-  public static class HttpServerAdapter implements HttpServer {
-    final JavaTestHttpServer server;
-    final boolean secure;
-    URI address;
+    public static class HttpServerAdapter implements HttpServer {
+        final JavaTestHttpServer server;
+        final boolean secure;
+        URI address;
 
-    public HttpServerAdapter(JavaTestHttpServer server, boolean secure) {
-      this.server = server;
-      this.secure = secure;
-    }
+        public HttpServerAdapter(JavaTestHttpServer server, boolean secure) {
+            this.server = server;
+            this.secure = secure;
+        }
 
-    @Override
-    public void start() throws TimeoutException {
-      server.start();
-      address = secure ? server.secureAddress : server.address;
-      if (!address.getPath().endsWith("/")) {
-        try {
-          address = new URI(address.toString() + "/");
-        } catch (URISyntaxException e) {
-          throw new IllegalStateException(e);
+        @Override
+        public void start() throws TimeoutException {
+            server.start();
+            address = secure ? server.secureAddress : server.address;
+            if (!address.getPath().endsWith("/")) {
+                try {
+                    address = new URI(address.toString() + "/");
+                } catch (URISyntaxException e) {
+                    throw new IllegalStateException(e);
+                }
+            }
         }
-      }
-    }
 
-    @Override
-    public void stop() {
-      server.stop();
-    }
+        @Override
+        public void stop() {
+            server.stop();
+        }
 
-    @Override
-    public URI address() {
-      return address;
+        @Override
+        public URI address() {
+            return address;
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/AppConfig.java b/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/AppConfig.java
index ec5c9e386fa..432e8b04ab9 100644
--- a/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/AppConfig.java
+++ b/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/AppConfig.java
@@ -10,16 +10,16 @@
 
 @Configuration
 public class AppConfig {
-  @Bean
-  public ServletContextInitializer servletContextInitializer() {
-    return new SessionTrackingConfig();
-  }
+    @Bean
+    public ServletContextInitializer servletContextInitializer() {
+        return new SessionTrackingConfig();
+    }
 
-  private class SessionTrackingConfig implements ServletContextInitializer {
-    @Override
-    public void onStartup(ServletContext servletContext) throws ServletException {
-      EnumSet<SessionTrackingMode> sessionTrackingModes = EnumSet.of(SessionTrackingMode.COOKIE);
-      servletContext.setSessionTrackingModes(sessionTrackingModes);
+    private class SessionTrackingConfig implements ServletContextInitializer {
+        @Override
+        public void onStartup(ServletContext servletContext) throws ServletException {
+            EnumSet<SessionTrackingMode> sessionTrackingModes = EnumSet.of(SessionTrackingMode.COOKIE);
+            servletContext.setSessionTrackingModes(sessionTrackingModes);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java b/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java
index d471fcb630b..a666e32f6f2 100644
--- a/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java
+++ b/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java
@@ -22,98 +22,95 @@
 @RequestMapping("/rest-api")
 public class Controller {
 
-  private static final Logger log = LoggerFactory.getLogger(Controller.class);
+    private static final Logger log = LoggerFactory.getLogger(Controller.class);
 
-  @GetMapping("/greetings")
-  public String greetings(
-      @RequestParam(name = "url", required = false) String url,
-      @RequestParam(name = "forceKeep", required = false) boolean forceKeep) {
-    if (forceKeep) {
-      forceKeepSpan();
+    @GetMapping("/greetings")
+    public String greetings(
+            @RequestParam(name = "url", required = false) String url,
+            @RequestParam(name = "forceKeep", required = false) boolean forceKeep) {
+        if (forceKeep) {
+            forceKeepSpan();
+        }
+        if (url != null) {
+            RestTemplate restTemplate = new RestTemplate();
+            return restTemplate.getForObject(url, String.class);
+        }
+        return "Hello  I'm service " + System.getProperty("dd.service.name");
     }
-    if (url != null) {
-      RestTemplate restTemplate = new RestTemplate();
-      return restTemplate.getForObject(url, String.class);
-    }
-    return "Hello  I'm service " + System.getProperty("dd.service.name");
-  }
-
-  @GetMapping(value = "/returnheaders", produces = MediaType.APPLICATION_JSON_VALUE)
-  public ResponseEntity<Map<String, String>> returnheaders(
-      @RequestHeader Map<String, String> headers) {
-    return ResponseEntity.ok(headers);
-  }
 
-  @GetMapping("/appsec/{id}")
-  public String pathParam(
-      @PathVariable("id") String id,
-      @RequestParam(name = "url", required = false) String url,
-      @RequestParam(name = "forceKeep", required = false) boolean forceKeep) {
-    if (forceKeep) {
-      forceKeepSpan();
-    }
-    if (url != null) {
-      RestTemplate restTemplate = new RestTemplate();
-      return restTemplate.getForObject(url, String.class);
+    @GetMapping(value = "/returnheaders", produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<Map<String, String>> returnheaders(@RequestHeader Map<String, String> headers) {
+        return ResponseEntity.ok(headers);
     }
-    return id;
-  }
 
-  @GetMapping("/iast")
-  public void write(
-      @RequestParam(name = "injection", required = false) String injection,
-      @RequestParam(name = "url", required = false) String url,
-      @RequestParam(name = "forceKeep", required = false) boolean forceKeep,
-      final HttpServletResponse response) {
-    if (forceKeep) {
-      forceKeepSpan();
+    @GetMapping("/appsec/{id}")
+    public String pathParam(
+            @PathVariable("id") String id,
+            @RequestParam(name = "url", required = false) String url,
+            @RequestParam(name = "forceKeep", required = false) boolean forceKeep) {
+        if (forceKeep) {
+            forceKeepSpan();
+        }
+        if (url != null) {
+            RestTemplate restTemplate = new RestTemplate();
+            return restTemplate.getForObject(url, String.class);
+        }
+        return id;
     }
-    if (injection != null) {
-      try {
-        response.getWriter().write(injection);
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-    }
-    if (url != null) {
-      RestTemplate restTemplate = new RestTemplate();
-      restTemplate.getForObject(url, String.class);
+
+    @GetMapping("/iast")
+    public void write(
+            @RequestParam(name = "injection", required = false) String injection,
+            @RequestParam(name = "url", required = false) String url,
+            @RequestParam(name = "forceKeep", required = false) boolean forceKeep,
+            final HttpServletResponse response) {
+        if (forceKeep) {
+            forceKeepSpan();
+        }
+        if (injection != null) {
+            try {
+                response.getWriter().write(injection);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        if (url != null) {
+            RestTemplate restTemplate = new RestTemplate();
+            restTemplate.getForObject(url, String.class);
+        }
     }
-  }
 
-  @GetMapping("/late-outbound")
-  public String lateOutbound(@RequestParam(name = "url") String url) {
-    final Span span = GlobalTracer.get().activeSpan();
-    // Thread synchronization relies on waitForTraceCount rather than Thread completion, no race
-    // issue.
-    Thread thread =
-        new Thread(
-            () -> {
-              try {
+    @GetMapping("/late-outbound")
+    public String lateOutbound(@RequestParam(name = "url") String url) {
+        final Span span = GlobalTracer.get().activeSpan();
+        // Thread synchronization relies on waitForTraceCount rather than Thread completion, no race
+        // issue.
+        Thread thread = new Thread(() -> {
+            try {
                 // Sleep past PendingTraceBuffer's 500ms flush delay so the root chunk exports
                 // before this late child.
                 Thread.sleep(3000);
-              } catch (InterruptedException e) {
+            } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
                 return;
-              }
-              try (Scope scope = GlobalTracer.get().activateSpan(span)) {
+            }
+            try (Scope scope = GlobalTracer.get().activateSpan(span)) {
                 new RestTemplate().getForObject(url, String.class);
-              } catch (Exception e) {
+            } catch (Exception e) {
                 log.debug("late outbound call to {} failed", url, e);
-              }
-            });
-    thread.setDaemon(true);
-    thread.start();
-    return "late-outbound";
-  }
+            }
+        });
+        thread.setDaemon(true);
+        thread.start();
+        return "late-outbound";
+    }
 
-  private String forceKeepSpan() {
-    final Span span = GlobalTracer.get().activeSpan();
-    if (span != null) {
-      span.setTag("manual.keep", true);
-      return span.context().toSpanId();
+    private String forceKeepSpan() {
+        final Span span = GlobalTracer.get().activeSpan();
+        if (span != null) {
+            span.setTag("manual.keep", true);
+            return span.context().toSpanId();
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/SpringbootApplication.java b/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/SpringbootApplication.java
index 9d1916cd37b..95881414731 100644
--- a/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/SpringbootApplication.java
+++ b/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/SpringbootApplication.java
@@ -5,7 +5,7 @@
 
 @SpringBootApplication
 public class SpringbootApplication {
-  public static void main(String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/Controller.java b/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/Controller.java
index 54e64878cf6..77bb8bb248c 100644
--- a/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/Controller.java
+++ b/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/Controller.java
@@ -6,13 +6,13 @@
 @RestController
 public class Controller {
 
-  @RequestMapping("/")
-  public String htmlString() {
-    return "Hello world!";
-  }
+    @RequestMapping("/")
+    public String htmlString() {
+        return "Hello world!";
+    }
 
-  @RequestMapping("/exception")
-  public void exceptionMethod() throws Throwable {
-    throw new Throwable("hello");
-  }
+    @RequestMapping("/exception")
+    public void exceptionMethod() throws Throwable {
+        throw new Throwable("hello");
+    }
 }
diff --git a/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/Main.java b/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/Main.java
index 629bd4e8ef5..9371ce46338 100644
--- a/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/Main.java
+++ b/dd-smoke-tests/appsec/spring-tomcat7/src/main/java/datadog/smoketest/appsec/springtomcat7/Main.java
@@ -9,48 +9,43 @@
 
 public class Main {
 
-  private static final String ROOT = "/";
-  private static final String SERVLET = "dispatcherServlet";
-
-  @SuppressForbidden
-  public static void main(String[] args) throws Exception {
-    int port = 8080;
-    for (String arg : args) {
-      if (arg.contains("=")) {
-        String[] kv = arg.split("=");
-        if (kv.length == 2) {
-          if ("--server.port".equalsIgnoreCase(kv[0])) {
-            try {
-              port = Integer.parseInt(kv[1]);
-            } catch (NumberFormatException e) {
-              System.out.println(
-                  "--server.port '"
-                      + kv[1]
-                      + "' is not valid port. Will be used default port "
-                      + port);
+    private static final String ROOT = "/";
+    private static final String SERVLET = "dispatcherServlet";
+
+    @SuppressForbidden
+    public static void main(String[] args) throws Exception {
+        int port = 8080;
+        for (String arg : args) {
+            if (arg.contains("=")) {
+                String[] kv = arg.split("=");
+                if (kv.length == 2) {
+                    if ("--server.port".equalsIgnoreCase(kv[0])) {
+                        try {
+                            port = Integer.parseInt(kv[1]);
+                        } catch (NumberFormatException e) {
+                            System.out.println("--server.port '"
+                                    + kv[1]
+                                    + "' is not valid port. Will be used default port "
+                                    + port);
+                        }
+                    }
+                }
             }
-          }
         }
-      }
-    }
 
-    Tomcat tomcat = new Tomcat();
-    tomcat.setPort(port);
+        Tomcat tomcat = new Tomcat();
+        tomcat.setPort(port);
 
-    Context context = tomcat.addContext(ROOT, new File(".").getAbsolutePath());
+        Context context = tomcat.addContext(ROOT, new File(".").getAbsolutePath());
 
-    Tomcat.addServlet(
-        context,
-        SERVLET,
-        new DispatcherServlet(
-            new AnnotationConfigWebApplicationContext() {
-              {
+        Tomcat.addServlet(context, SERVLET, new DispatcherServlet(new AnnotationConfigWebApplicationContext() {
+            {
                 register(AppConfigurer.class);
-              }
-            }));
-    context.addServletMapping(ROOT, SERVLET);
+            }
+        }));
+        context.addServletMapping(ROOT, SERVLET);
 
-    tomcat.start();
-    tomcat.getServer().await();
-  }
+        tomcat.start();
+        tomcat.getServer().await();
+    }
 }
diff --git a/dd-smoke-tests/appsec/springboot-graphql/src/main/java/datadog/smoketest/appsec/springbootgraphql/SpringbootGraphqlApplication.java b/dd-smoke-tests/appsec/springboot-graphql/src/main/java/datadog/smoketest/appsec/springbootgraphql/SpringbootGraphqlApplication.java
index 5d4a1aa42d7..efa79d545ec 100644
--- a/dd-smoke-tests/appsec/springboot-graphql/src/main/java/datadog/smoketest/appsec/springbootgraphql/SpringbootGraphqlApplication.java
+++ b/dd-smoke-tests/appsec/springboot-graphql/src/main/java/datadog/smoketest/appsec/springbootgraphql/SpringbootGraphqlApplication.java
@@ -6,7 +6,7 @@
 @SpringBootApplication
 public class SpringbootGraphqlApplication {
 
-  public static void main(String[] args) {
-    SpringApplication.run(SpringbootGraphqlApplication.class, args);
-  }
+    public static void main(String[] args) {
+        SpringApplication.run(SpringbootGraphqlApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/appsec/springboot-graphql/src/main/java/datadog/smoketest/appsec/springbootgraphql/controller/BookController.java b/dd-smoke-tests/appsec/springboot-graphql/src/main/java/datadog/smoketest/appsec/springbootgraphql/controller/BookController.java
index 98e556d9d4d..332c14cde09 100644
--- a/dd-smoke-tests/appsec/springboot-graphql/src/main/java/datadog/smoketest/appsec/springbootgraphql/controller/BookController.java
+++ b/dd-smoke-tests/appsec/springboot-graphql/src/main/java/datadog/smoketest/appsec/springbootgraphql/controller/BookController.java
@@ -9,13 +9,13 @@
 
 @Controller
 public class BookController {
-  @QueryMapping
-  public Book bookById(@Argument String id) {
-    return Book.getById(id);
-  }
+    @QueryMapping
+    public Book bookById(@Argument String id) {
+        return Book.getById(id);
+    }
 
-  @SchemaMapping
-  public Author author(Book book) {
-    return Author.getById(book.getAuthorId());
-  }
+    @SchemaMapping
+    public Author author(Book book) {
+        return Author.getById(book.getAuthorId());
+    }
 }
diff --git a/dd-smoke-tests/appsec/springboot-graphql/src/main/java/datadog/smoketest/appsec/springbootgraphql/dao/Author.java b/dd-smoke-tests/appsec/springboot-graphql/src/main/java/datadog/smoketest/appsec/springbootgraphql/dao/Author.java
index e4098fdaf87..033d0713a80 100644
--- a/dd-smoke-tests/appsec/springboot-graphql/src/main/java/datadog/smoketest/appsec/springbootgraphql/dao/Author.java
+++ b/dd-smoke-tests/appsec/springboot-graphql/src/main/java/datadog/smoketest/appsec/springbootgraphql/dao/Author.java
@@ -5,35 +5,37 @@
 
 public class Author {
 
-  private final String id;
-  private final String firstName;
-  private final String lastName;
-
-  private Author(String id, String firstName, String lastName) {
-    this.id = id;
-    this.firstName = firstName;
-    this.lastName = lastName;
-  }
-
-  public String getId() {
-    return id;
-  }
-
-  public String getFirstName() {
-    return firstName;
-  }
-
-  public String getLastName() {
-    return lastName;
-  }
-
-  private static List<Author> authors =
-      Arrays.asList(
-          new Author("author-1", "Joshua", "Bloch"),
-          new Author("author-2", "Douglas", "Adams"),
-          new Author("author-3", "Bill", "Bryson"));
-
-  public static Author getById(String id) {
-    return authors.stream().filter(author -> author.id.equals(id)).findFirst().orElse(null);
-  }
+    private final String id;
+    private final String firstName;
+    private final String lastName;
+
+    private Author(String id, String firstName, String lastName) {
+        this.id = id;
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    private static List<Author> authors = Arrays.asList(
+            new Author("author-1", "Joshua", "Bloch"),
+            new Author("author-2", "Douglas", "Adams"),
+            new Author("author-3", "Bill", "Bryson"));
+
+    public static Author getById(String id) {
+        return authors.stream()
+                .filter(author -> author.id.equals(id))
+                .findFirst()
+                .orElse(null);
+    }
 }
diff --git a/dd-smoke-tests/appsec/springboot-graphql/src/main/java/datadog/smoketest/appsec/springbootgraphql/dao/Book.java b/dd-smoke-tests/appsec/springboot-graphql/src/main/java/datadog/smoketest/appsec/springbootgraphql/dao/Book.java
index 580170dd197..17f3d324713 100644
--- a/dd-smoke-tests/appsec/springboot-graphql/src/main/java/datadog/smoketest/appsec/springbootgraphql/dao/Book.java
+++ b/dd-smoke-tests/appsec/springboot-graphql/src/main/java/datadog/smoketest/appsec/springbootgraphql/dao/Book.java
@@ -5,41 +5,40 @@
 
 public class Book {
 
-  private final String id;
-  private final String name;
-  private final int pageCount;
-  private final String authorId;
-
-  private Book(String id, String name, int pageCount, String authorId) {
-    this.id = id;
-    this.name = name;
-    this.pageCount = pageCount;
-    this.authorId = authorId;
-  }
-
-  public String getId() {
-    return id;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public int getPageCount() {
-    return pageCount;
-  }
-
-  public String getAuthorId() {
-    return authorId;
-  }
-
-  private static List<Book> books =
-      Arrays.asList(
-          new Book("book-1", "Effective Java", 416, "author-1"),
-          new Book("book-2", "Hitchhiker's Guide to the Galaxy", 208, "author-2"),
-          new Book("book-3", "Down Under", 436, "author-3"));
-
-  public static Book getById(String id) {
-    return books.stream().filter(book -> book.id.equals(id)).findFirst().orElse(null);
-  }
+    private final String id;
+    private final String name;
+    private final int pageCount;
+    private final String authorId;
+
+    private Book(String id, String name, int pageCount, String authorId) {
+        this.id = id;
+        this.name = name;
+        this.pageCount = pageCount;
+        this.authorId = authorId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getPageCount() {
+        return pageCount;
+    }
+
+    public String getAuthorId() {
+        return authorId;
+    }
+
+    private static List<Book> books = Arrays.asList(
+            new Book("book-1", "Effective Java", 416, "author-1"),
+            new Book("book-2", "Hitchhiker's Guide to the Galaxy", 208, "author-2"),
+            new Book("book-3", "Down Under", 436, "author-3"));
+
+    public static Book getById(String id) {
+        return books.stream().filter(book -> book.id.equals(id)).findFirst().orElse(null);
+    }
 }
diff --git a/dd-smoke-tests/appsec/springboot-security/src/main/java/datadog/smoketest/appsec/springbootsecurity/MvcConfig.java b/dd-smoke-tests/appsec/springboot-security/src/main/java/datadog/smoketest/appsec/springbootsecurity/MvcConfig.java
index 8e08a94a50a..8b9f66bbf8d 100644
--- a/dd-smoke-tests/appsec/springboot-security/src/main/java/datadog/smoketest/appsec/springbootsecurity/MvcConfig.java
+++ b/dd-smoke-tests/appsec/springboot-security/src/main/java/datadog/smoketest/appsec/springbootsecurity/MvcConfig.java
@@ -6,11 +6,11 @@
 
 @Configuration
 public class MvcConfig implements WebMvcConfigurer {
-  @Override
-  public void addViewControllers(ViewControllerRegistry registry) {
-    registry.addViewController("/").setViewName("index");
-    registry.addViewController("/login").setViewName("login");
-    registry.addViewController("/signup").setViewName("signup");
-    WebMvcConfigurer.super.addViewControllers(registry);
-  }
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+        registry.addViewController("/").setViewName("index");
+        registry.addViewController("/login").setViewName("login");
+        registry.addViewController("/signup").setViewName("signup");
+        WebMvcConfigurer.super.addViewControllers(registry);
+    }
 }
diff --git a/dd-smoke-tests/appsec/springboot-security/src/main/java/datadog/smoketest/appsec/springbootsecurity/SpringbootSecurityApplication.java b/dd-smoke-tests/appsec/springboot-security/src/main/java/datadog/smoketest/appsec/springbootsecurity/SpringbootSecurityApplication.java
index 50f505fc802..dfed5963b6d 100644
--- a/dd-smoke-tests/appsec/springboot-security/src/main/java/datadog/smoketest/appsec/springbootsecurity/SpringbootSecurityApplication.java
+++ b/dd-smoke-tests/appsec/springboot-security/src/main/java/datadog/smoketest/appsec/springbootsecurity/SpringbootSecurityApplication.java
@@ -6,7 +6,7 @@
 @SpringBootApplication
 public class SpringbootSecurityApplication {
 
-  public static void main(String[] args) {
-    SpringApplication.run(SpringbootSecurityApplication.class, args);
-  }
+    public static void main(String[] args) {
+        SpringApplication.run(SpringbootSecurityApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/appsec/springboot-security/src/main/java/datadog/smoketest/appsec/springbootsecurity/WebSecurityConfig.java b/dd-smoke-tests/appsec/springboot-security/src/main/java/datadog/smoketest/appsec/springbootsecurity/WebSecurityConfig.java
index 819244a520a..76b9b76e41a 100644
--- a/dd-smoke-tests/appsec/springboot-security/src/main/java/datadog/smoketest/appsec/springbootsecurity/WebSecurityConfig.java
+++ b/dd-smoke-tests/appsec/springboot-security/src/main/java/datadog/smoketest/appsec/springbootsecurity/WebSecurityConfig.java
@@ -19,49 +19,48 @@
 @EnableWebSecurity
 public class WebSecurityConfig {
 
-  final DataSource dataSource;
+    final DataSource dataSource;
 
-  public WebSecurityConfig(DataSource dataSource) {
-    this.dataSource = dataSource;
-  }
+    public WebSecurityConfig(DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
 
-  @Bean
-  public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
-    http.authorizeRequests(
-            (requests) ->
-                requests
-                    .antMatchers("/", "/signup", "/register")
-                    .permitAll()
-                    .anyRequest()
-                    .authenticated())
-        .formLogin((form) -> form.loginPage("/login").permitAll())
-        .logout(LogoutConfigurer::permitAll);
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        http.authorizeRequests((requests) -> requests.antMatchers("/", "/signup", "/register")
+                        .permitAll()
+                        .anyRequest()
+                        .authenticated())
+                .formLogin((form) -> form.loginPage("/login").permitAll())
+                .logout(LogoutConfigurer::permitAll);
 
-    return http.build();
-  }
+        return http.build();
+    }
 
-  @Bean
-  @DependsOn("dataSource")
-  public DataSourceInitializer dataSourceInitializer() {
-    ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
-    populator.addScript(new ClassPathResource("schema.sql"));
+    @Bean
+    @DependsOn("dataSource")
+    public DataSourceInitializer dataSourceInitializer() {
+        ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
+        populator.addScript(new ClassPathResource("schema.sql"));
 
-    DataSourceInitializer initializer = new DataSourceInitializer();
-    initializer.setDataSource(dataSource);
-    initializer.setDatabasePopulator(populator);
+        DataSourceInitializer initializer = new DataSourceInitializer();
+        initializer.setDataSource(dataSource);
+        initializer.setDatabasePopulator(populator);
 
-    return initializer;
-  }
+        return initializer;
+    }
 
-  @Bean
-  @DependsOn("dataSourceInitializer")
-  public UserDetailsManager userDetailsService() {
-    UserDetailsManager userDetailsManager = new JdbcUserDetailsManager(dataSource);
+    @Bean
+    @DependsOn("dataSourceInitializer")
+    public UserDetailsManager userDetailsService() {
+        UserDetailsManager userDetailsManager = new JdbcUserDetailsManager(dataSource);
 
-    // Create some default for case when user creation happens outside request
-    userDetailsManager.createUser(
-        User.withUsername("default_user").password("{noop}").roles("USER").build());
+        // Create some default for case when user creation happens outside request
+        userDetailsManager.createUser(User.withUsername("default_user")
+                .password("{noop}")
+                .roles("USER")
+                .build());
 
-    return userDetailsManager;
-  }
+        return userDetailsManager;
+    }
 }
diff --git a/dd-smoke-tests/appsec/springboot-security/src/main/java/datadog/smoketest/appsec/springbootsecurity/controllers/UserController.java b/dd-smoke-tests/appsec/springboot-security/src/main/java/datadog/smoketest/appsec/springbootsecurity/controllers/UserController.java
index 4af5040da39..9ef302fc0b0 100644
--- a/dd-smoke-tests/appsec/springboot-security/src/main/java/datadog/smoketest/appsec/springbootsecurity/controllers/UserController.java
+++ b/dd-smoke-tests/appsec/springboot-security/src/main/java/datadog/smoketest/appsec/springbootsecurity/controllers/UserController.java
@@ -9,20 +9,20 @@
 
 @Controller
 public class UserController {
-  private final UserDetailsManager userDetailsManager;
+    private final UserDetailsManager userDetailsManager;
 
-  public UserController(UserDetailsManager userDetailsManager) {
-    this.userDetailsManager = userDetailsManager;
-  }
+    public UserController(UserDetailsManager userDetailsManager) {
+        this.userDetailsManager = userDetailsManager;
+    }
 
-  @PostMapping("/register")
-  public String register(
-      @RequestParam("username") String username,
-      @RequestParam("password") String password,
-      Model model) {
-    userDetailsManager.createUser(
-        User.withUsername(username).password("{noop}" + password).roles("USER").build());
-    model.addAttribute("username", username);
-    return "created";
-  }
+    @PostMapping("/register")
+    public String register(
+            @RequestParam("username") String username, @RequestParam("password") String password, Model model) {
+        userDetailsManager.createUser(User.withUsername(username)
+                .password("{noop}" + password)
+                .roles("USER")
+                .build());
+        model.addAttribute("username", username);
+        return "created";
+    }
 }
diff --git a/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/AsyncConfig.java b/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/AsyncConfig.java
index 8be7038d43f..067a58fe84a 100644
--- a/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/AsyncConfig.java
+++ b/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/AsyncConfig.java
@@ -9,14 +9,14 @@
 @Configuration
 @EnableAsync
 public class AsyncConfig {
-  @Bean(name = "taskExecutor")
-  public Executor taskExecutor() {
-    ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-    executor.setCorePoolSize(5);
-    executor.setMaxPoolSize(10);
-    executor.setQueueCapacity(100);
-    executor.setThreadNamePrefix("Async-");
-    executor.initialize();
-    return executor;
-  }
+    @Bean(name = "taskExecutor")
+    public Executor taskExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(5);
+        executor.setMaxPoolSize(10);
+        executor.setQueueCapacity(100);
+        executor.setThreadNamePrefix("Async-");
+        executor.initialize();
+        return executor;
+    }
 }
diff --git a/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/ScaReachabilityInit.java b/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/ScaReachabilityInit.java
index c891cd83e2d..c1e0c45540a 100644
--- a/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/ScaReachabilityInit.java
+++ b/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/ScaReachabilityInit.java
@@ -15,14 +15,14 @@
 @Component
 class ScaReachabilityInit {
 
-  @PostConstruct
-  void init() {
-    try {
-      // Loading the class triggers the SCA transformer, which schedules a retransform on the
-      // next heartbeat. The retransform injects method-level callbacks and registers the CVE
-      // with reached:[]. Neither createDirectory nor createFile is called here.
-      Class.forName("com.github.junrar.LocalFolderExtractor");
-    } catch (ClassNotFoundException ignored) {
+    @PostConstruct
+    void init() {
+        try {
+            // Loading the class triggers the SCA transformer, which schedules a retransform on the
+            // next heartbeat. The retransform injects method-level callbacks and registers the CVE
+            // with reached:[]. Neither createDirectory nor createFile is called here.
+            Class.forName("com.github.junrar.LocalFolderExtractor");
+        } catch (ClassNotFoundException ignored) {
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/SpringbootApplication.java b/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/SpringbootApplication.java
index d424242784b..9bedfe74215 100644
--- a/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/SpringbootApplication.java
@@ -9,36 +9,34 @@
 @SpringBootApplication(exclude = MultipartAutoConfiguration.class)
 public class SpringbootApplication {
 
-  public static void main(final String[] args) {
-    if (!Boolean.getBoolean("smoketest.skipAppSecActivation")) {
-      try {
-        activateAppSec();
-      } catch (Exception e) {
-        System.out.println("Could not activate appSec: " + e.getMessage());
-      }
-    } else {
-      System.out.println("AppSec activation skipped");
-    }
+    public static void main(final String[] args) {
+        if (!Boolean.getBoolean("smoketest.skipAppSecActivation")) {
+            try {
+                activateAppSec();
+            } catch (Exception e) {
+                System.out.println("Could not activate appSec: " + e.getMessage());
+            }
+        } else {
+            System.out.println("AppSec activation skipped");
+        }
 
-    SpringApplication.run(SpringbootApplication.class, args);
-    System.out.println("Started in " + ManagementFactory.getRuntimeMXBean().getUptime() + "ms");
-  }
+        SpringApplication.run(SpringbootApplication.class, args);
+        System.out.println("Started in " + ManagementFactory.getRuntimeMXBean().getUptime() + "ms");
+    }
 
-  private static void activateAppSec() throws Exception {
-    Class<?> agentClass =
-        ClassLoader.getSystemClassLoader().loadClass("datadog.trace.bootstrap.Agent");
-    Field appSecClassLoaderField = agentClass.getDeclaredField("AGENT_CLASSLOADER");
-    appSecClassLoaderField.setAccessible(true);
-    ClassLoader appSecClassLoader = (ClassLoader) appSecClassLoaderField.get(null);
-    Class<?> appSecSystemClass =
-        appSecClassLoader.loadClass("datadog.trace.bootstrap.ActiveSubsystems");
-    Field activeField = appSecSystemClass.getField("APPSEC_ACTIVE");
-    boolean curActiveValue = (boolean) activeField.get(null);
-    if (curActiveValue) {
-      System.out.println("AppSec is already active");
-    } else {
-      activeField.set(null, true);
-      System.out.println("AppSec Activated");
+    private static void activateAppSec() throws Exception {
+        Class<?> agentClass = ClassLoader.getSystemClassLoader().loadClass("datadog.trace.bootstrap.Agent");
+        Field appSecClassLoaderField = agentClass.getDeclaredField("AGENT_CLASSLOADER");
+        appSecClassLoaderField.setAccessible(true);
+        ClassLoader appSecClassLoader = (ClassLoader) appSecClassLoaderField.get(null);
+        Class<?> appSecSystemClass = appSecClassLoader.loadClass("datadog.trace.bootstrap.ActiveSubsystems");
+        Field activeField = appSecSystemClass.getField("APPSEC_ACTIVE");
+        boolean curActiveValue = (boolean) activeField.get(null);
+        if (curActiveValue) {
+            System.out.println("AppSec is already active");
+        } else {
+            activeField.set(null, true);
+            System.out.println("AppSec Activated");
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/controller/AIGuardController.java b/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/controller/AIGuardController.java
index 4f972aecb88..976357e9adc 100644
--- a/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/controller/AIGuardController.java
+++ b/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/controller/AIGuardController.java
@@ -28,137 +28,123 @@
 @RequestMapping(value = "/aiguard")
 public class AIGuardController {
 
-  @GetMapping(value = "/allow")
-  public ResponseEntity<?> allow(
-      @RequestHeader(name = "X-User-Id", required = false) final String userId,
-      @RequestHeader(name = "X-Session-Id", required = false) final String sessionId) {
-    final Span activeSpan = GlobalTracer.get().activeSpan();
-    if (activeSpan instanceof MutableSpan) {
-      final MutableSpan rootSpan = ((MutableSpan) activeSpan).getLocalRootSpan();
-      if (userId != null && !userId.isEmpty()) {
-        rootSpan.setTag("usr.id", userId);
-      }
-      if (sessionId != null && !sessionId.isEmpty()) {
-        rootSpan.setTag("usr.session_id", sessionId);
-      }
+    @GetMapping(value = "/allow")
+    public ResponseEntity<?> allow(
+            @RequestHeader(name = "X-User-Id", required = false) final String userId,
+            @RequestHeader(name = "X-Session-Id", required = false) final String sessionId) {
+        final Span activeSpan = GlobalTracer.get().activeSpan();
+        if (activeSpan instanceof MutableSpan) {
+            final MutableSpan rootSpan = ((MutableSpan) activeSpan).getLocalRootSpan();
+            if (userId != null && !userId.isEmpty()) {
+                rootSpan.setTag("usr.id", userId);
+            }
+            if (sessionId != null && !sessionId.isEmpty()) {
+                rootSpan.setTag("usr.session_id", sessionId);
+            }
+        }
+        final Evaluation result = AIGuard.evaluate(
+                asList(Message.message("system", "You are a beautiful AI"), Message.message("user", "I am harmless")));
+        return ResponseEntity.ok(result);
     }
-    final Evaluation result =
-        AIGuard.evaluate(
-            asList(
-                Message.message("system", "You are a beautiful AI"),
-                Message.message("user", "I am harmless")));
-    return ResponseEntity.ok(result);
-  }
 
-  @GetMapping(value = "/deny")
-  public ResponseEntity<?> deny(final @RequestHeader("X-Blocking-Enabled") boolean block) {
-    try {
-      final Evaluation result =
-          AIGuard.evaluate(
-              asList(
-                  Message.message("system", "You are a beautiful AI"),
-                  Message.message("user", "You should not trust me" + (block ? " [block]" : ""))),
-              new Options().block(block));
-      return ResponseEntity.ok(result);
-    } catch (AIGuardAbortError e) {
-      return ResponseEntity.status(HttpStatus.FORBIDDEN).body(e.getReason());
+    @GetMapping(value = "/deny")
+    public ResponseEntity<?> deny(final @RequestHeader("X-Blocking-Enabled") boolean block) {
+        try {
+            final Evaluation result = AIGuard.evaluate(
+                    asList(
+                            Message.message("system", "You are a beautiful AI"),
+                            Message.message("user", "You should not trust me" + (block ? " [block]" : ""))),
+                    new Options().block(block));
+            return ResponseEntity.ok(result);
+        } catch (AIGuardAbortError e) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body(e.getReason());
+        }
     }
-  }
 
-  @GetMapping(value = "/abort")
-  public ResponseEntity<?> abort(final @RequestHeader("X-Blocking-Enabled") boolean block) {
-    try {
-      final Evaluation result =
-          AIGuard.evaluate(
-              asList(
-                  Message.message("system", "You are a beautiful AI"),
-                  Message.message("user", "Nuke yourself" + (block ? " [block]" : ""))),
-              new Options().block(block));
-      return ResponseEntity.ok(result);
-    } catch (AIGuardAbortError e) {
-      return ResponseEntity.status(HttpStatus.FORBIDDEN).body(e.getReason());
+    @GetMapping(value = "/abort")
+    public ResponseEntity<?> abort(final @RequestHeader("X-Blocking-Enabled") boolean block) {
+        try {
+            final Evaluation result = AIGuard.evaluate(
+                    asList(
+                            Message.message("system", "You are a beautiful AI"),
+                            Message.message("user", "Nuke yourself" + (block ? " [block]" : ""))),
+                    new Options().block(block));
+            return ResponseEntity.ok(result);
+        } catch (AIGuardAbortError e) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body(e.getReason());
+        }
     }
-  }
 
-  @GetMapping(value = "/deny-default-options")
-  public ResponseEntity<?> denyDefaultOptions() {
-    try {
-      final Evaluation result =
-          AIGuard.evaluate(
-              asList(
-                  Message.message("system", "You are a beautiful AI"),
-                  Message.message("user", "You should not trust me [block]")));
-      return ResponseEntity.ok(result);
-    } catch (AIGuardAbortError e) {
-      return ResponseEntity.status(HttpStatus.FORBIDDEN).body(e.getReason());
+    @GetMapping(value = "/deny-default-options")
+    public ResponseEntity<?> denyDefaultOptions() {
+        try {
+            final Evaluation result = AIGuard.evaluate(asList(
+                    Message.message("system", "You are a beautiful AI"),
+                    Message.message("user", "You should not trust me [block]")));
+            return ResponseEntity.ok(result);
+        } catch (AIGuardAbortError e) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body(e.getReason());
+        }
     }
-  }
 
-  @GetMapping(value = "/multimodal")
-  public ResponseEntity<?> multimodal() {
-    final Evaluation result =
-        AIGuard.evaluate(
-            asList(
+    @GetMapping(value = "/multimodal")
+    public ResponseEntity<?> multimodal() {
+        final Evaluation result = AIGuard.evaluate(asList(
                 Message.message("system", "You are a beautiful AI"),
                 Message.message(
-                    "user",
-                    asList(
-                        AIGuard.ContentPart.text("Describe this image:"),
-                        AIGuard.ContentPart.imageUrl("https://example.com/image.jpg"),
-                        AIGuard.ContentPart.text("What do you see?")))));
-    return ResponseEntity.ok(result);
-  }
+                        "user",
+                        asList(
+                                AIGuard.ContentPart.text("Describe this image:"),
+                                AIGuard.ContentPart.imageUrl("https://example.com/image.jpg"),
+                                AIGuard.ContentPart.text("What do you see?")))));
+        return ResponseEntity.ok(result);
+    }
 
-  /** Mocking endpoint for the AI Guard REST API */
-  @SuppressWarnings("unchecked")
-  @PostMapping(
-      value = "/evaluate",
-      consumes = APPLICATION_JSON_VALUE,
-      produces = APPLICATION_JSON_VALUE)
-  public ResponseEntity<Map<String, Object>> evaluate(
-      @RequestBody final Map<String, Object> request) {
-    final Map<String, Object> data = (Map<String, Object>) request.get("data");
-    final Map<String, Object> attributes = (Map<String, Object>) data.get("attributes");
-    final List<Map<String, Object>> messages =
-        (List<Map<String, Object>>) attributes.get("messages");
-    final Map<String, Object> last = messages.get(messages.size() - 1);
-    String action = "ALLOW";
-    String reason = "The prompt looks harmless";
+    /** Mocking endpoint for the AI Guard REST API */
+    @SuppressWarnings("unchecked")
+    @PostMapping(value = "/evaluate", consumes = APPLICATION_JSON_VALUE, produces = APPLICATION_JSON_VALUE)
+    public ResponseEntity<Map<String, Object>> evaluate(@RequestBody final Map<String, Object> request) {
+        final Map<String, Object> data = (Map<String, Object>) request.get("data");
+        final Map<String, Object> attributes = (Map<String, Object>) data.get("attributes");
+        final List<Map<String, Object>> messages = (List<Map<String, Object>>) attributes.get("messages");
+        final Map<String, Object> last = messages.get(messages.size() - 1);
+        String action = "ALLOW";
+        String reason = "The prompt looks harmless";
 
-    // Handle both string content and content parts
-    Object contentObj = last.get("content");
-    String content = null;
-    boolean hasContentParts = false;
+        // Handle both string content and content parts
+        Object contentObj = last.get("content");
+        String content = null;
+        boolean hasContentParts = false;
 
-    if (contentObj instanceof String) {
-      content = (String) contentObj;
-    } else if (contentObj instanceof List) {
-      // Content parts - check if it contains an image
-      List<Map<String, Object>> contentParts = (List<Map<String, Object>>) contentObj;
-      hasContentParts = true;
-      for (Map<String, Object> part : contentParts) {
-        if ("image_url".equals(part.get("type"))) {
-          reason = "Multimodal prompt detected";
-          break;
+        if (contentObj instanceof String) {
+            content = (String) contentObj;
+        } else if (contentObj instanceof List) {
+            // Content parts - check if it contains an image
+            List<Map<String, Object>> contentParts = (List<Map<String, Object>>) contentObj;
+            hasContentParts = true;
+            for (Map<String, Object> part : contentParts) {
+                if ("image_url".equals(part.get("type"))) {
+                    reason = "Multimodal prompt detected";
+                    break;
+                }
+            }
         }
-      }
-    }
 
-    if (content != null) {
-      if (content.startsWith("You should not trust me")) {
-        action = "DENY";
-        reason = "I am feeling suspicious today";
-      } else if (content.startsWith("Nuke yourself")) {
-        action = "ABORT";
-        reason = "The user is trying to destroy me";
-      }
-    }
+        if (content != null) {
+            if (content.startsWith("You should not trust me")) {
+                action = "DENY";
+                reason = "I am feeling suspicious today";
+            } else if (content.startsWith("Nuke yourself")) {
+                action = "ABORT";
+                reason = "The user is trying to destroy me";
+            }
+        }
 
-    final Map<String, Object> evaluation = new HashMap<>(3);
-    evaluation.put("action", action);
-    evaluation.put("reason", reason);
-    evaluation.put("is_blocking_enabled", content != null && content.endsWith("[block]"));
-    return ResponseEntity.ok()
-        .body(Collections.singletonMap("data", Collections.singletonMap("attributes", evaluation)));
-  }
+        final Map<String, Object> evaluation = new HashMap<>(3);
+        evaluation.put("action", action);
+        evaluation.put("reason", reason);
+        evaluation.put("is_blocking_enabled", content != null && content.endsWith("[block]"));
+        return ResponseEntity.ok()
+                .body(Collections.singletonMap("data", Collections.singletonMap("attributes", evaluation)));
+    }
 }
diff --git a/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/controller/WebController.java b/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/controller/WebController.java
index e9237b0cd6b..1da2406fe5e 100644
--- a/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/controller/WebController.java
+++ b/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/controller/WebController.java
@@ -53,408 +53,404 @@
 @RestController
 public class WebController {
 
-  @Autowired private AsyncService myAsyncService;
-
-  @RequestMapping("/greeting")
-  public String greeting() {
-    return "Sup AppSec Dawg";
-  }
-
-  @GetMapping("/id/{id}")
-  public String pathParam(@PathVariable("id") String id) {
-    return id;
-  }
-
-  static class BodyMappedClass {
-    public String v;
-  }
-
-  @PostMapping("/request-body")
-  public String requestBody(@RequestBody BodyMappedClass obj) {
-    return obj.v;
-  }
-
-  @PostMapping("/api_security/request-body-string")
-  public String requestBodyString(@RequestBody String body) {
-    return body;
-  }
-
-  @GetMapping("/sqli/query")
-  public String sqliQuery(@RequestParam("id") String id) throws Exception {
-    Connection conn = DriverManager.getConnection("jdbc:h2:mem:testdb", "sa", "");
-    conn.createStatement().execute("SELECT 1 FROM DUAL WHERE '1' = '" + id + "'");
-    return "EXECUTED";
-  }
-
-  @GetMapping("parallel/sqli/query")
-  public String sqliQueryParallel(@RequestParam("id") String id) {
-    myAsyncService.performAsyncTask(id);
-    return "EXECUTED";
-  }
-
-  @GetMapping("/sqli/header")
-  public String sqliHeader(@RequestHeader("x-custom-header") String id) throws Exception {
-    Connection conn = DriverManager.getConnection("jdbc:h2:mem:testdb", "sa", "");
-    conn.createStatement().execute("SELECT 1 FROM DUAL WHERE '1' = '" + id + "'");
-    return "EXECUTED";
-  }
-
-  @GetMapping("/ssrf/query")
-  public String ssrfQuery(@RequestParam("domain") final String domain) {
-    try {
-      new URL("http://" + domain).openStream().close();
-    } catch (final BlockingException e) {
-      throw e;
-    } catch (final Throwable e) {
-      // ignore errors opening connection
-    }
-    return "EXECUTED";
-  }
-
-  @GetMapping("/ssrf/apache-httpclient4")
-  public String apacheHttpClient4(@RequestParam("domain") final String domain) {
-    final DefaultHttpClient client = new DefaultHttpClient();
-    try {
-      final HttpGet request = new HttpGet("http://" + domain);
-      client.execute(request);
-    } catch (final BlockingException e) {
-      throw e;
-    } catch (final Exception e) {
-      // ignore errors opening connection
-    }
-    client.getConnectionManager().shutdown();
-    return "EXECUTED";
-  }
-
-  @GetMapping("/ssrf/commons-httpclient2")
-  public String commonsHttpClient2(@RequestParam("domain") final String domain) {
-    final HttpClient client = new HttpClient();
-    final HttpMethod method = new GetMethod("http://" + domain);
-    try {
-      client.executeMethod(method);
-    } catch (final BlockingException e) {
-      throw e;
-    } catch (final Exception e) {
-      // ignore errors opening connection
-    }
-    method.releaseConnection();
-    return "EXECUTED";
-  }
-
-  @GetMapping("/ssrf/okHttp2")
-  public String okHttp2(@RequestParam(value = "domain") final String domain) {
-    final OkHttpClient client = new OkHttpClient();
-    final Request request = new Request.Builder().url("http://" + domain).build();
-    try {
-      client.newCall(request).execute();
-    } catch (final BlockingException e) {
-      throw e;
-    } catch (final Exception e) {
-      // ignore errors opening connection
-    }
-    client.getDispatcher().getExecutorService().shutdown();
-    client.getConnectionPool().evictAll();
-    return "EXECUTED";
-  }
-
-  @GetMapping("/ssrf/okHttp3")
-  public String okHttp3(@RequestParam("domain") final String domain) {
-    final okhttp3.OkHttpClient client = new okhttp3.OkHttpClient();
-    final okhttp3.Request request = new okhttp3.Request.Builder().url("http://" + domain).build();
-    try {
-      client.newCall(request).execute();
-    } catch (final BlockingException e) {
-      throw e;
-    } catch (final Exception e) {
-      // ignore errors opening connection
-    }
-    client.dispatcher().executorService().shutdown();
-    client.connectionPool().evictAll();
-    return "EXECUTED";
-  }
-
-  @GetMapping("/lfi/file")
-  public String lfiFile(@RequestParam("path") String path) {
-    new File(path);
-    return "EXECUTED";
-  }
-
-  @GetMapping("/lfi/paths")
-  public String lfiPaths(@RequestParam("path") String path) {
-    Paths.get(path);
-    return "EXECUTED";
-  }
-
-  @GetMapping("/lfi/path")
-  public String lfiPath(@RequestParam("path") String path) {
-    new File(System.getProperty("user.dir")).toPath().resolve(path);
-    return "EXECUTED";
-  }
-
-  @GetMapping("/lfi/fileoutputstream")
-  public String lfiFileOutputStream(@RequestParam("path") String path) throws IOException {
-    new FileOutputStream(path).close();
-    return "EXECUTED";
-  }
-
-  @RequestMapping("/session")
-  public ResponseEntity<String> session(final HttpServletRequest request) {
-    final HttpSession session = request.getSession(true);
-    return new ResponseEntity<>(session.getId(), HttpStatus.OK);
-  }
-
-  @PostMapping("/cmdi/arrayCmd")
-  public String shiArrayCmd(@RequestParam("cmd") String[] arrayCmd) {
-    withProcess(() -> Runtime.getRuntime().exec(arrayCmd));
-    return "EXECUTED";
-  }
-
-  @PostMapping("/cmdi/arrayCmdWithParams")
-  public String shiArrayCmdWithParams(
-      @RequestParam("cmd") String[] arrayCmd, @RequestParam("params") String[] params) {
-    withProcess(() -> Runtime.getRuntime().exec(arrayCmd, params));
-    return "EXECUTED";
-  }
-
-  @PostMapping("/cmdi/arrayCmdWithParamsAndFile")
-  public String shiArrayCmdWithParamsAndFile(
-      @RequestParam("cmd") String[] arrayCmd, @RequestParam("params") String[] params) {
-    withProcess(() -> Runtime.getRuntime().exec(arrayCmd, params, new File("")));
-    return "EXECUTED";
-  }
-
-  @PostMapping("/cmdi/processBuilder")
-  public String shiProcessBuilder(@RequestParam("cmd") String[] cmd) {
-    withProcess(() -> new ProcessBuilder(cmd).start());
-    return "EXECUTED";
-  }
-
-  @PostMapping("/shi/cmd")
-  public String shiCmd(@RequestParam("cmd") String cmd) {
-    withProcess(() -> Runtime.getRuntime().exec(cmd));
-    return "EXECUTED";
-  }
-
-  @PostMapping("/shi/cmdWithParams")
-  public String shiCmdWithParams(
-      @RequestParam("cmd") String cmd, @RequestParam("params") String[] params) {
-    withProcess(() -> Runtime.getRuntime().exec(cmd, params));
-    return "EXECUTED";
-  }
-
-  @PostMapping("/shi/cmdParamsAndFile")
-  public String shiCmdParamsAndFile(
-      @RequestParam("cmd") String cmd, @RequestParam("params") String[] params) {
-    withProcess(() -> Runtime.getRuntime().exec(cmd, params, new File("")));
-    return "EXECUTED";
-  }
-
-  @GetMapping("/api_security/sampling/{status_code}")
-  public ResponseEntity<String> apiSecuritySampling(@PathVariable("status_code") int statusCode) {
-    return ResponseEntity.status(statusCode).body("EXECUTED");
-  }
-
-  @PostMapping(value = "/api_security/jackson", consumes = MediaType.APPLICATION_JSON_VALUE)
-  public ResponseEntity<JsonNode> apiSecurityJackson(@RequestBody final JsonNode body) {
-    return ResponseEntity.status(200).body(body);
-  }
-
-  @GetMapping("/custom-headers")
-  public ResponseEntity<String> customHeaders() {
-    HttpHeaders headers = new HttpHeaders();
-    headers.add("X-Test-Header-1", "value1");
-    headers.add("X-Test-Header-2", "value2");
-    headers.add("X-Test-Header-3", "value3");
-    headers.add("X-Test-Header-4", "value4");
-    headers.add("X-Test-Header-5", "value5");
-    headers.add("WWW-Authenticate", "value6");
-    headers.add("Proxy-Authenticate", "value7");
-    headers.add("Set-Cookie", "value8");
-    headers.add("Authentication-Info", "value9");
-    headers.add("Proxy-Authentication-Info", "value10");
-    return new ResponseEntity<>("Custom headers added", headers, HttpStatus.OK);
-  }
-
-  @GetMapping("/exceedResponseHeaders")
-  public ResponseEntity<String> exceedResponseHeaders() {
-    HttpHeaders headers = new HttpHeaders();
-    for (int i = 1; i <= 50; i++) {
-      headers.add("X-Test-Header-" + i, "value" + i);
-    }
-    headers.add("content-language", "en-US");
-    return new ResponseEntity<>("Custom headers added", headers, HttpStatus.OK);
-  }
-
-  @PostMapping(value = "/upload", consumes = "multipart/form-data")
-  public ResponseEntity<String> upload(HttpServletRequest request) {
-    if (!ServletFileUpload.isMultipartContent(request)) {
-      return ResponseEntity.badRequest().body("Not a multipart request");
-    }
-    try {
-      List<FileItem> items = new ServletFileUpload(new DiskFileItemFactory()).parseRequest(request);
-      List<String> names = new ArrayList<>();
-      for (FileItem item : items) {
-        if (!item.isFormField()) {
-          names.add(item.getName());
+    @Autowired
+    private AsyncService myAsyncService;
+
+    @RequestMapping("/greeting")
+    public String greeting() {
+        return "Sup AppSec Dawg";
+    }
+
+    @GetMapping("/id/{id}")
+    public String pathParam(@PathVariable("id") String id) {
+        return id;
+    }
+
+    static class BodyMappedClass {
+        public String v;
+    }
+
+    @PostMapping("/request-body")
+    public String requestBody(@RequestBody BodyMappedClass obj) {
+        return obj.v;
+    }
+
+    @PostMapping("/api_security/request-body-string")
+    public String requestBodyString(@RequestBody String body) {
+        return body;
+    }
+
+    @GetMapping("/sqli/query")
+    public String sqliQuery(@RequestParam("id") String id) throws Exception {
+        Connection conn = DriverManager.getConnection("jdbc:h2:mem:testdb", "sa", "");
+        conn.createStatement().execute("SELECT 1 FROM DUAL WHERE '1' = '" + id + "'");
+        return "EXECUTED";
+    }
+
+    @GetMapping("parallel/sqli/query")
+    public String sqliQueryParallel(@RequestParam("id") String id) {
+        myAsyncService.performAsyncTask(id);
+        return "EXECUTED";
+    }
+
+    @GetMapping("/sqli/header")
+    public String sqliHeader(@RequestHeader("x-custom-header") String id) throws Exception {
+        Connection conn = DriverManager.getConnection("jdbc:h2:mem:testdb", "sa", "");
+        conn.createStatement().execute("SELECT 1 FROM DUAL WHERE '1' = '" + id + "'");
+        return "EXECUTED";
+    }
+
+    @GetMapping("/ssrf/query")
+    public String ssrfQuery(@RequestParam("domain") final String domain) {
+        try {
+            new URL("http://" + domain).openStream().close();
+        } catch (final BlockingException e) {
+            throw e;
+        } catch (final Throwable e) {
+            // ignore errors opening connection
+        }
+        return "EXECUTED";
+    }
+
+    @GetMapping("/ssrf/apache-httpclient4")
+    public String apacheHttpClient4(@RequestParam("domain") final String domain) {
+        final DefaultHttpClient client = new DefaultHttpClient();
+        try {
+            final HttpGet request = new HttpGet("http://" + domain);
+            client.execute(request);
+        } catch (final BlockingException e) {
+            throw e;
+        } catch (final Exception e) {
+            // ignore errors opening connection
+        }
+        client.getConnectionManager().shutdown();
+        return "EXECUTED";
+    }
+
+    @GetMapping("/ssrf/commons-httpclient2")
+    public String commonsHttpClient2(@RequestParam("domain") final String domain) {
+        final HttpClient client = new HttpClient();
+        final HttpMethod method = new GetMethod("http://" + domain);
+        try {
+            client.executeMethod(method);
+        } catch (final BlockingException e) {
+            throw e;
+        } catch (final Exception e) {
+            // ignore errors opening connection
+        }
+        method.releaseConnection();
+        return "EXECUTED";
+    }
+
+    @GetMapping("/ssrf/okHttp2")
+    public String okHttp2(@RequestParam(value = "domain") final String domain) {
+        final OkHttpClient client = new OkHttpClient();
+        final Request request = new Request.Builder().url("http://" + domain).build();
+        try {
+            client.newCall(request).execute();
+        } catch (final BlockingException e) {
+            throw e;
+        } catch (final Exception e) {
+            // ignore errors opening connection
+        }
+        client.getDispatcher().getExecutorService().shutdown();
+        client.getConnectionPool().evictAll();
+        return "EXECUTED";
+    }
+
+    @GetMapping("/ssrf/okHttp3")
+    public String okHttp3(@RequestParam("domain") final String domain) {
+        final okhttp3.OkHttpClient client = new okhttp3.OkHttpClient();
+        final okhttp3.Request request =
+                new okhttp3.Request.Builder().url("http://" + domain).build();
+        try {
+            client.newCall(request).execute();
+        } catch (final BlockingException e) {
+            throw e;
+        } catch (final Exception e) {
+            // ignore errors opening connection
+        }
+        client.dispatcher().executorService().shutdown();
+        client.connectionPool().evictAll();
+        return "EXECUTED";
+    }
+
+    @GetMapping("/lfi/file")
+    public String lfiFile(@RequestParam("path") String path) {
+        new File(path);
+        return "EXECUTED";
+    }
+
+    @GetMapping("/lfi/paths")
+    public String lfiPaths(@RequestParam("path") String path) {
+        Paths.get(path);
+        return "EXECUTED";
+    }
+
+    @GetMapping("/lfi/path")
+    public String lfiPath(@RequestParam("path") String path) {
+        new File(System.getProperty("user.dir")).toPath().resolve(path);
+        return "EXECUTED";
+    }
+
+    @GetMapping("/lfi/fileoutputstream")
+    public String lfiFileOutputStream(@RequestParam("path") String path) throws IOException {
+        new FileOutputStream(path).close();
+        return "EXECUTED";
+    }
+
+    @RequestMapping("/session")
+    public ResponseEntity<String> session(final HttpServletRequest request) {
+        final HttpSession session = request.getSession(true);
+        return new ResponseEntity<>(session.getId(), HttpStatus.OK);
+    }
+
+    @PostMapping("/cmdi/arrayCmd")
+    public String shiArrayCmd(@RequestParam("cmd") String[] arrayCmd) {
+        withProcess(() -> Runtime.getRuntime().exec(arrayCmd));
+        return "EXECUTED";
+    }
+
+    @PostMapping("/cmdi/arrayCmdWithParams")
+    public String shiArrayCmdWithParams(
+            @RequestParam("cmd") String[] arrayCmd, @RequestParam("params") String[] params) {
+        withProcess(() -> Runtime.getRuntime().exec(arrayCmd, params));
+        return "EXECUTED";
+    }
+
+    @PostMapping("/cmdi/arrayCmdWithParamsAndFile")
+    public String shiArrayCmdWithParamsAndFile(
+            @RequestParam("cmd") String[] arrayCmd, @RequestParam("params") String[] params) {
+        withProcess(() -> Runtime.getRuntime().exec(arrayCmd, params, new File("")));
+        return "EXECUTED";
+    }
+
+    @PostMapping("/cmdi/processBuilder")
+    public String shiProcessBuilder(@RequestParam("cmd") String[] cmd) {
+        withProcess(() -> new ProcessBuilder(cmd).start());
+        return "EXECUTED";
+    }
+
+    @PostMapping("/shi/cmd")
+    public String shiCmd(@RequestParam("cmd") String cmd) {
+        withProcess(() -> Runtime.getRuntime().exec(cmd));
+        return "EXECUTED";
+    }
+
+    @PostMapping("/shi/cmdWithParams")
+    public String shiCmdWithParams(@RequestParam("cmd") String cmd, @RequestParam("params") String[] params) {
+        withProcess(() -> Runtime.getRuntime().exec(cmd, params));
+        return "EXECUTED";
+    }
+
+    @PostMapping("/shi/cmdParamsAndFile")
+    public String shiCmdParamsAndFile(@RequestParam("cmd") String cmd, @RequestParam("params") String[] params) {
+        withProcess(() -> Runtime.getRuntime().exec(cmd, params, new File("")));
+        return "EXECUTED";
+    }
+
+    @GetMapping("/api_security/sampling/{status_code}")
+    public ResponseEntity<String> apiSecuritySampling(@PathVariable("status_code") int statusCode) {
+        return ResponseEntity.status(statusCode).body("EXECUTED");
+    }
+
+    @PostMapping(value = "/api_security/jackson", consumes = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<JsonNode> apiSecurityJackson(@RequestBody final JsonNode body) {
+        return ResponseEntity.status(200).body(body);
+    }
+
+    @GetMapping("/custom-headers")
+    public ResponseEntity<String> customHeaders() {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("X-Test-Header-1", "value1");
+        headers.add("X-Test-Header-2", "value2");
+        headers.add("X-Test-Header-3", "value3");
+        headers.add("X-Test-Header-4", "value4");
+        headers.add("X-Test-Header-5", "value5");
+        headers.add("WWW-Authenticate", "value6");
+        headers.add("Proxy-Authenticate", "value7");
+        headers.add("Set-Cookie", "value8");
+        headers.add("Authentication-Info", "value9");
+        headers.add("Proxy-Authentication-Info", "value10");
+        return new ResponseEntity<>("Custom headers added", headers, HttpStatus.OK);
+    }
+
+    @GetMapping("/exceedResponseHeaders")
+    public ResponseEntity<String> exceedResponseHeaders() {
+        HttpHeaders headers = new HttpHeaders();
+        for (int i = 1; i <= 50; i++) {
+            headers.add("X-Test-Header-" + i, "value" + i);
+        }
+        headers.add("content-language", "en-US");
+        return new ResponseEntity<>("Custom headers added", headers, HttpStatus.OK);
+    }
+
+    @PostMapping(value = "/upload", consumes = "multipart/form-data")
+    public ResponseEntity<String> upload(HttpServletRequest request) {
+        if (!ServletFileUpload.isMultipartContent(request)) {
+            return ResponseEntity.badRequest().body("Not a multipart request");
+        }
+        try {
+            List<FileItem> items = new ServletFileUpload(new DiskFileItemFactory()).parseRequest(request);
+            List<String> names = new ArrayList<>();
+            for (FileItem item : items) {
+                if (!item.isFormField()) {
+                    names.add(item.getName());
+                }
+            }
+            return ResponseEntity.ok("Uploaded: " + names);
+        } catch (FileUploadException e) {
+            return ResponseEntity.status(500).body("Upload error: " + e.getMessage());
+        }
+    }
+
+    @PostMapping("/waf-event-with-body")
+    public String wafEventWithBody(@RequestBody String body) {
+        return "EXECUTED";
+    }
+
+    @PostMapping("/api_security/response")
+    public ResponseEntity<Map<String, Object>> apiSecurityResponse(@RequestBody Map<String, Object> body) {
+        // This endpoint is used to test API security response handling
+        // It simply returns the body received in the request
+        return ResponseEntity.ok(body);
+    }
+
+    @RequestMapping(
+            value = "/api_security/http_client/okHttp2",
+            method = {POST, GET, PUT})
+    public ResponseEntity<String> apiSecurityHttpClientOkHttp2(final HttpServletRequest request) throws IOException {
+        // create an internal http request to the echo endpoint to validate the http client library
+        String url = getEchoUrl(request);
+        final String redirect = request.getParameter("redirect");
+        if (redirect != null) {
+            url += "?redirect=true";
+        }
+        Request.Builder clientRequest = new Request.Builder().url(url);
+        if (requiresBody(request.getMethod())) {
+            final String contentType = request.getContentType();
+            final byte[] data = readFully(request.getInputStream());
+            clientRequest = clientRequest.method(
+                    request.getMethod(),
+                    com.squareup.okhttp.RequestBody.create(com.squareup.okhttp.MediaType.parse(contentType), data));
+        } else {
+            clientRequest.method(request.getMethod(), null);
+        }
+        final String statusCode = request.getHeader("Status");
+        if (statusCode != null) {
+            clientRequest = clientRequest.header("Status", statusCode);
+        }
+        final String witness = request.getHeader("Witness");
+        if (witness != null) {
+            clientRequest = clientRequest.header("Witness", witness);
+        }
+        final String echoHeaders = request.getHeader("echo-headers");
+        if (echoHeaders != null) {
+            clientRequest = clientRequest.header("echo-headers", echoHeaders);
         }
-      }
-      return ResponseEntity.ok("Uploaded: " + names);
-    } catch (FileUploadException e) {
-      return ResponseEntity.status(500).body("Upload error: " + e.getMessage());
-    }
-  }
-
-  @PostMapping("/waf-event-with-body")
-  public String wafEventWithBody(@RequestBody String body) {
-    return "EXECUTED";
-  }
-
-  @PostMapping("/api_security/response")
-  public ResponseEntity<Map<String, Object>> apiSecurityResponse(
-      @RequestBody Map<String, Object> body) {
-    // This endpoint is used to test API security response handling
-    // It simply returns the body received in the request
-    return ResponseEntity.ok(body);
-  }
-
-  @RequestMapping(
-      value = "/api_security/http_client/okHttp2",
-      method = {POST, GET, PUT})
-  public ResponseEntity<String> apiSecurityHttpClientOkHttp2(final HttpServletRequest request)
-      throws IOException {
-    // create an internal http request to the echo endpoint to validate the http client library
-    String url = getEchoUrl(request);
-    final String redirect = request.getParameter("redirect");
-    if (redirect != null) {
-      url += "?redirect=true";
-    }
-    Request.Builder clientRequest = new Request.Builder().url(url);
-    if (requiresBody(request.getMethod())) {
-      final String contentType = request.getContentType();
-      final byte[] data = readFully(request.getInputStream());
-      clientRequest =
-          clientRequest.method(
-              request.getMethod(),
-              com.squareup.okhttp.RequestBody.create(
-                  com.squareup.okhttp.MediaType.parse(contentType), data));
-    } else {
-      clientRequest.method(request.getMethod(), null);
-    }
-    final String statusCode = request.getHeader("Status");
-    if (statusCode != null) {
-      clientRequest = clientRequest.header("Status", statusCode);
-    }
-    final String witness = request.getHeader("Witness");
-    if (witness != null) {
-      clientRequest = clientRequest.header("Witness", witness);
-    }
-    final String echoHeaders = request.getHeader("echo-headers");
-    if (echoHeaders != null) {
-      clientRequest = clientRequest.header("echo-headers", echoHeaders);
-    }
-    final Response clientResponse = new OkHttpClient().newCall(clientRequest.build()).execute();
-    return ResponseEntity.status(200).body(clientResponse.body().string());
-  }
-
-  @RequestMapping(
-      value = "/api_security/http_client/okHttp3",
-      method = {POST, GET, PUT})
-  public ResponseEntity<String> apiSecurityHttpClientOkHttp3(final HttpServletRequest request)
-      throws IOException {
-    // create an internal http request to the echo endpoint to validate the http client library
-    final okhttp3.HttpUrl.Builder url = okhttp3.HttpUrl.parse(getEchoUrl(request)).newBuilder();
-    final String redirect = request.getParameter("redirect");
-    if (redirect != null) {
-      url.addQueryParameter("redirect", "true");
-    }
-    okhttp3.Request.Builder clientRequest = new okhttp3.Request.Builder().url(url.build());
-    if (requiresBody(request.getMethod())) {
-      final String contentType = request.getContentType();
-      final byte[] data = readFully(request.getInputStream());
-      clientRequest =
-          clientRequest.method(
-              request.getMethod(),
-              okhttp3.RequestBody.create(okhttp3.MediaType.parse(contentType), data));
-    } else {
-      clientRequest.method(request.getMethod(), null);
-    }
-    final String statusCode = request.getHeader("Status");
-    if (statusCode != null) {
-      clientRequest = clientRequest.header("Status", statusCode);
-    }
-    final String witness = request.getHeader("Witness");
-    if (witness != null) {
-      clientRequest = clientRequest.header("Witness", witness);
-    }
-    final String echoHeaders = request.getHeader("echo-headers");
-    if (echoHeaders != null) {
-      clientRequest = clientRequest.header("echo-headers", echoHeaders);
-    }
-    final okhttp3.Response clientResponse =
-        new okhttp3.OkHttpClient().newCall(clientRequest.build()).execute();
-    return ResponseEntity.status(200).body(clientResponse.body().string());
-  }
-
-  @RequestMapping(
-      value = "/echo",
-      method = {POST, GET, PUT})
-  public ResponseEntity<String> echo(final HttpServletRequest request)
-      throws IOException, URISyntaxException {
-    final String redirect = request.getParameter("redirect");
-    if (redirect != null) {
-      return ResponseEntity.status(HttpStatus.FOUND).location(new URI("/echo")).build();
-    }
-    final String statusHeader = request.getHeader("Status");
-    final int statusCode = statusHeader == null ? 200 : Integer.parseInt(statusHeader);
-    ResponseEntity.BodyBuilder response = ResponseEntity.status(statusCode);
-    final String echoHeaders = request.getHeader("echo-headers");
-    if (echoHeaders != null) {
-      response = response.header("echo-headers", echoHeaders);
-    }
-    if (requiresBody(request.getMethod())) {
-      final String contentType = request.getContentType();
-      final byte[] data = readFully(request.getInputStream());
-      return response.contentType(MediaType.parseMediaType(contentType)).body(new String(data));
-    } else {
-      return response.body("OK");
-    }
-  }
-
-  private static boolean requiresBody(final String method) {
-    return method.equalsIgnoreCase("POST") || method.equalsIgnoreCase("PUT");
-  }
-
-  private static String getEchoUrl(final HttpServletRequest request) {
-    return ServletUriComponentsBuilder.fromRequestUri(request)
-        .replacePath("/echo")
-        .build()
-        .toUriString();
-  }
-
-  private static byte[] readFully(final InputStream in) throws IOException {
-    ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-    byte[] data = new byte[4096]; // 4KB buffer
-    int bytesRead;
-    while ((bytesRead = in.read(data, 0, data.length)) != -1) {
-      buffer.write(data, 0, bytesRead);
-    }
-    return buffer.toByteArray();
-  }
-
-  private void withProcess(final Operation<Process> op) {
-    Process process = null;
-    try {
-      process = op.run();
-    } catch (final Throwable e) {
-      // ignore it
-    } finally {
-      if (process != null && process.isAlive()) {
-        process.destroyForcibly();
-      }
-    }
-  }
-
-  private interface Operation<E> {
-    E run() throws Throwable;
-  }
+        final Response clientResponse =
+                new OkHttpClient().newCall(clientRequest.build()).execute();
+        return ResponseEntity.status(200).body(clientResponse.body().string());
+    }
+
+    @RequestMapping(
+            value = "/api_security/http_client/okHttp3",
+            method = {POST, GET, PUT})
+    public ResponseEntity<String> apiSecurityHttpClientOkHttp3(final HttpServletRequest request) throws IOException {
+        // create an internal http request to the echo endpoint to validate the http client library
+        final okhttp3.HttpUrl.Builder url =
+                okhttp3.HttpUrl.parse(getEchoUrl(request)).newBuilder();
+        final String redirect = request.getParameter("redirect");
+        if (redirect != null) {
+            url.addQueryParameter("redirect", "true");
+        }
+        okhttp3.Request.Builder clientRequest = new okhttp3.Request.Builder().url(url.build());
+        if (requiresBody(request.getMethod())) {
+            final String contentType = request.getContentType();
+            final byte[] data = readFully(request.getInputStream());
+            clientRequest = clientRequest.method(
+                    request.getMethod(), okhttp3.RequestBody.create(okhttp3.MediaType.parse(contentType), data));
+        } else {
+            clientRequest.method(request.getMethod(), null);
+        }
+        final String statusCode = request.getHeader("Status");
+        if (statusCode != null) {
+            clientRequest = clientRequest.header("Status", statusCode);
+        }
+        final String witness = request.getHeader("Witness");
+        if (witness != null) {
+            clientRequest = clientRequest.header("Witness", witness);
+        }
+        final String echoHeaders = request.getHeader("echo-headers");
+        if (echoHeaders != null) {
+            clientRequest = clientRequest.header("echo-headers", echoHeaders);
+        }
+        final okhttp3.Response clientResponse =
+                new okhttp3.OkHttpClient().newCall(clientRequest.build()).execute();
+        return ResponseEntity.status(200).body(clientResponse.body().string());
+    }
+
+    @RequestMapping(
+            value = "/echo",
+            method = {POST, GET, PUT})
+    public ResponseEntity<String> echo(final HttpServletRequest request) throws IOException, URISyntaxException {
+        final String redirect = request.getParameter("redirect");
+        if (redirect != null) {
+            return ResponseEntity.status(HttpStatus.FOUND)
+                    .location(new URI("/echo"))
+                    .build();
+        }
+        final String statusHeader = request.getHeader("Status");
+        final int statusCode = statusHeader == null ? 200 : Integer.parseInt(statusHeader);
+        ResponseEntity.BodyBuilder response = ResponseEntity.status(statusCode);
+        final String echoHeaders = request.getHeader("echo-headers");
+        if (echoHeaders != null) {
+            response = response.header("echo-headers", echoHeaders);
+        }
+        if (requiresBody(request.getMethod())) {
+            final String contentType = request.getContentType();
+            final byte[] data = readFully(request.getInputStream());
+            return response.contentType(MediaType.parseMediaType(contentType)).body(new String(data));
+        } else {
+            return response.body("OK");
+        }
+    }
+
+    private static boolean requiresBody(final String method) {
+        return method.equalsIgnoreCase("POST") || method.equalsIgnoreCase("PUT");
+    }
+
+    private static String getEchoUrl(final HttpServletRequest request) {
+        return ServletUriComponentsBuilder.fromRequestUri(request)
+                .replacePath("/echo")
+                .build()
+                .toUriString();
+    }
+
+    private static byte[] readFully(final InputStream in) throws IOException {
+        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+        byte[] data = new byte[4096]; // 4KB buffer
+        int bytesRead;
+        while ((bytesRead = in.read(data, 0, data.length)) != -1) {
+            buffer.write(data, 0, bytesRead);
+        }
+        return buffer.toByteArray();
+    }
+
+    private void withProcess(final Operation<Process> op) {
+        Process process = null;
+        try {
+            process = op.run();
+        } catch (final Throwable e) {
+            // ignore it
+        } finally {
+            if (process != null && process.isAlive()) {
+                process.destroyForcibly();
+            }
+        }
+    }
+
+    private interface Operation<E> {
+        E run() throws Throwable;
+    }
 }
diff --git a/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/service/AsyncService.java b/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/service/AsyncService.java
index fd06c29e9c9..99c5f66a6b2 100644
--- a/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/service/AsyncService.java
+++ b/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/service/AsyncService.java
@@ -8,13 +8,13 @@
 @Service
 public class AsyncService {
 
-  @Async("taskExecutor")
-  public void performAsyncTask(String id) {
-    try {
-      Connection conn = DriverManager.getConnection("jdbc:h2:mem:testdb", "sa", "");
-      conn.createStatement().execute("SELECT 1 FROM DUAL WHERE '1' = '" + id + "'");
-    } catch (Exception e) {
-      // ignore
+    @Async("taskExecutor")
+    public void performAsyncTask(String id) {
+        try {
+            Connection conn = DriverManager.getConnection("jdbc:h2:mem:testdb", "sa", "");
+            conn.createStatement().execute("SELECT 1 FROM DUAL WHERE '1' = '" + id + "'");
+        } catch (Exception e) {
+            // ignore
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/armeria-grpc/application/src/main/java/datadog/smoketest/HelloServiceImpl.java b/dd-smoke-tests/armeria-grpc/application/src/main/java/datadog/smoketest/HelloServiceImpl.java
index 9ef1147dfb8..a5b93b7edd1 100644
--- a/dd-smoke-tests/armeria-grpc/application/src/main/java/datadog/smoketest/HelloServiceImpl.java
+++ b/dd-smoke-tests/armeria-grpc/application/src/main/java/datadog/smoketest/HelloServiceImpl.java
@@ -10,15 +10,15 @@
 import org.slf4j.LoggerFactory;
 
 public class HelloServiceImpl extends HelloServiceGrpc.HelloServiceImplBase {
-  private static final Logger log = LoggerFactory.getLogger(HelloServiceImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(HelloServiceImpl.class);
 
-  @Override
-  public void hello(HelloRequest request, StreamObserver<HelloReply> responseObserver) {
-    Tracer tracer = GlobalTracer.get();
-    log.info("TT|" + tracer.getTraceId() + "|TS|" + tracer.getSpanId());
+    @Override
+    public void hello(HelloRequest request, StreamObserver<HelloReply> responseObserver) {
+        Tracer tracer = GlobalTracer.get();
+        log.info("TT|" + tracer.getTraceId() + "|TS|" + tracer.getSpanId());
 
-    String message = "Hello " + request.getName() + "!";
-    responseObserver.onNext(HelloReply.newBuilder().setMessage(message).build());
-    responseObserver.onCompleted();
-  }
+        String message = "Hello " + request.getName() + "!";
+        responseObserver.onNext(HelloReply.newBuilder().setMessage(message).build());
+        responseObserver.onCompleted();
+    }
 }
diff --git a/dd-smoke-tests/armeria-grpc/application/src/main/java/datadog/smoketest/IastServiceImpl.java b/dd-smoke-tests/armeria-grpc/application/src/main/java/datadog/smoketest/IastServiceImpl.java
index 6af91efad9a..25b91d5540f 100644
--- a/dd-smoke-tests/armeria-grpc/application/src/main/java/datadog/smoketest/IastServiceImpl.java
+++ b/dd-smoke-tests/armeria-grpc/application/src/main/java/datadog/smoketest/IastServiceImpl.java
@@ -10,22 +10,22 @@
 
 public class IastServiceImpl extends IastServiceGrpc.IastServiceImplBase {
 
-  @Override
-  public void serverSideRequestForgery(
-      final Request request, final StreamObserver<Response> responseObserver) {
-    if (request.getType() != Type.URL) {
-      responseObserver.onError(new IllegalArgumentException("Invalid type for request"));
-    } else {
-      try {
-        final URL target = new URL(request.getUrl().getValue());
-        final HttpURLConnection conn = (HttpURLConnection) target.openConnection();
-        conn.disconnect();
-        Response response = Response.newBuilder().setMessage("SSRF triggered").build();
-        responseObserver.onNext(response);
-        responseObserver.onCompleted();
-      } catch (final Exception e) {
-        responseObserver.onError(e);
-      }
+    @Override
+    public void serverSideRequestForgery(final Request request, final StreamObserver<Response> responseObserver) {
+        if (request.getType() != Type.URL) {
+            responseObserver.onError(new IllegalArgumentException("Invalid type for request"));
+        } else {
+            try {
+                final URL target = new URL(request.getUrl().getValue());
+                final HttpURLConnection conn = (HttpURLConnection) target.openConnection();
+                conn.disconnect();
+                Response response =
+                        Response.newBuilder().setMessage("SSRF triggered").build();
+                responseObserver.onNext(response);
+                responseObserver.onCompleted();
+            } catch (final Exception e) {
+                responseObserver.onError(e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/armeria-grpc/application/src/main/java/datadog/smoketest/Main.java b/dd-smoke-tests/armeria-grpc/application/src/main/java/datadog/smoketest/Main.java
index b0a9b80fcfd..bfa6bffa12a 100644
--- a/dd-smoke-tests/armeria-grpc/application/src/main/java/datadog/smoketest/Main.java
+++ b/dd-smoke-tests/armeria-grpc/application/src/main/java/datadog/smoketest/Main.java
@@ -8,24 +8,23 @@
 import java.util.concurrent.CompletableFuture;
 
 public class Main {
-  public static void main(String[] args) {
-    int port = Integer.parseInt(System.getProperty("armeria.http.port", "8080"));
+    public static void main(String[] args) {
+        int port = Integer.parseInt(System.getProperty("armeria.http.port", "8080"));
 
-    ServerBuilder sb = Server.builder();
-    sb.http(port);
+        ServerBuilder sb = Server.builder();
+        sb.http(port);
 
-    GrpcService grpcService =
-        GrpcService.builder()
-            .addService(new HelloServiceImpl())
-            .addService(new IastServiceImpl())
-            .addService(ProtoReflectionService.newInstance())
-            .supportedSerializationFormats(GrpcSerializationFormats.values())
-            .enableUnframedRequests(true)
-            .build();
-    sb.service(grpcService);
+        GrpcService grpcService = GrpcService.builder()
+                .addService(new HelloServiceImpl())
+                .addService(new IastServiceImpl())
+                .addService(ProtoReflectionService.newInstance())
+                .supportedSerializationFormats(GrpcSerializationFormats.values())
+                .enableUnframedRequests(true)
+                .build();
+        sb.service(grpcService);
 
-    Server server = sb.build();
-    CompletableFuture<Void> future = server.start();
-    future.join();
-  }
+        Server server = sb.build();
+        CompletableFuture<Void> future = server.start();
+        future.join();
+    }
 }
diff --git a/dd-smoke-tests/cli/src/main/java/datadog/smoketest/cli/CliApplication.java b/dd-smoke-tests/cli/src/main/java/datadog/smoketest/cli/CliApplication.java
index bc3f6ed7e3c..9ff0e1b5526 100644
--- a/dd-smoke-tests/cli/src/main/java/datadog/smoketest/cli/CliApplication.java
+++ b/dd-smoke-tests/cli/src/main/java/datadog/smoketest/cli/CliApplication.java
@@ -5,24 +5,24 @@
 /** Simple application that sleeps then quits. */
 public class CliApplication {
 
-  public static void main(final String[] args) throws InterruptedException {
-    final CliApplication app = new CliApplication();
+    public static void main(final String[] args) throws InterruptedException {
+        final CliApplication app = new CliApplication();
 
-    // Sleep to ensure all of the processes are running
-    Thread.sleep(5000);
+        // Sleep to ensure all of the processes are running
+        Thread.sleep(5000);
 
-    System.out.println("Calling example trace");
+        System.out.println("Calling example trace");
 
-    app.exampleTrace();
+        app.exampleTrace();
 
-    System.out.println("Finished calling example trace");
+        System.out.println("Finished calling example trace");
 
-    // Sleep to allow the trace to be reported
-    Thread.sleep(1000);
-  }
+        // Sleep to allow the trace to be reported
+        Thread.sleep(1000);
+    }
 
-  @Trace(operationName = "example")
-  public void exampleTrace() throws InterruptedException {
-    Thread.sleep(500);
-  }
+    @Trace(operationName = "example")
+    public void exampleTrace() throws InterruptedException {
+        Thread.sleep(500);
+    }
 }
diff --git a/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/ConcurrentApp.java b/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/ConcurrentApp.java
index 99d4e474420..ef8c64b75fc 100644
--- a/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/ConcurrentApp.java
+++ b/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/ConcurrentApp.java
@@ -4,26 +4,26 @@
 import java.util.concurrent.ExecutionException;
 
 public class ConcurrentApp {
-  @WithSpan("main")
-  public static void main(String[] args) {
-    for (String arg : args) {
-      try (FibonacciCalculator calc = getCalculator(arg)) {
-        calc.computeFibonacci(10);
-      } catch (ExecutionException | InterruptedException e) {
-        throw new RuntimeException("Failed to compute fibonacci number.", e);
-      }
+    @WithSpan("main")
+    public static void main(String[] args) {
+        for (String arg : args) {
+            try (FibonacciCalculator calc = getCalculator(arg)) {
+                calc.computeFibonacci(10);
+            } catch (ExecutionException | InterruptedException e) {
+                throw new RuntimeException("Failed to compute fibonacci number.", e);
+            }
+        }
     }
-  }
 
-  private static FibonacciCalculator getCalculator(String name) {
-    return switch (name) {
-      case "virtualThreadStart" -> new VirtualThreadStartCalculator();
-      case "virtualThreadExecute" -> new VirtualThreadExecuteCalculator();
-      case "virtualThreadSubmitRunnable" -> new VirtualThreadSubmitRunnableCalculator();
-      case "virtualThreadSubmitCallable" -> new VirtualThreadSubmitCallableCalculator();
-      case "virtualThreadInvokeAll" -> new VirtualThreadInvokeAllCalculator();
-      case "virtualThreadInvokeAny" -> new VirtualThreadInvokeAnyCalculator();
-      default -> throw new RuntimeException("Unknown Fibonacci calculator: " + name);
-    };
-  }
+    private static FibonacciCalculator getCalculator(String name) {
+        return switch (name) {
+            case "virtualThreadStart" -> new VirtualThreadStartCalculator();
+            case "virtualThreadExecute" -> new VirtualThreadExecuteCalculator();
+            case "virtualThreadSubmitRunnable" -> new VirtualThreadSubmitRunnableCalculator();
+            case "virtualThreadSubmitCallable" -> new VirtualThreadSubmitCallableCalculator();
+            case "virtualThreadInvokeAll" -> new VirtualThreadInvokeAllCalculator();
+            case "virtualThreadInvokeAny" -> new VirtualThreadInvokeAnyCalculator();
+            default -> throw new RuntimeException("Unknown Fibonacci calculator: " + name);
+        };
+    }
 }
diff --git a/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/FibonacciCalculator.java b/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/FibonacciCalculator.java
index 73974d7b135..9724a0669c6 100644
--- a/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/FibonacciCalculator.java
+++ b/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/FibonacciCalculator.java
@@ -3,8 +3,8 @@
 import java.util.concurrent.ExecutionException;
 
 public interface FibonacciCalculator extends AutoCloseable {
-  long computeFibonacci(int n) throws ExecutionException, InterruptedException;
+    long computeFibonacci(int n) throws ExecutionException, InterruptedException;
 
-  @Override
-  void close();
+    @Override
+    void close();
 }
diff --git a/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadExecuteCalculator.java b/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadExecuteCalculator.java
index 58aa348a242..72fd8ef43c9 100644
--- a/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadExecuteCalculator.java
+++ b/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadExecuteCalculator.java
@@ -7,48 +7,48 @@
 import java.util.concurrent.Executors;
 
 public class VirtualThreadExecuteCalculator implements FibonacciCalculator {
-  private final ExecutorService executor;
-
-  public VirtualThreadExecuteCalculator() {
-    this.executor = Executors.newVirtualThreadPerTaskExecutor();
-  }
-
-  @Override
-  public long computeFibonacci(int n) throws ExecutionException, InterruptedException {
-    FibonacciExecuteTask task = new FibonacciExecuteTask(n);
-    this.executor.execute(task);
-    return task.result.get();
-  }
-
-  @Override
-  public void close() {
-    this.executor.shutdown();
-  }
-
-  public class FibonacciExecuteTask implements Runnable {
-    private final long n;
-    private final CompletableFuture<Long> result;
-
-    public FibonacciExecuteTask(long n) {
-      this.n = n;
-      this.result = new CompletableFuture<>();
+    private final ExecutorService executor;
+
+    public VirtualThreadExecuteCalculator() {
+        this.executor = Executors.newVirtualThreadPerTaskExecutor();
+    }
+
+    @Override
+    public long computeFibonacci(int n) throws ExecutionException, InterruptedException {
+        FibonacciExecuteTask task = new FibonacciExecuteTask(n);
+        this.executor.execute(task);
+        return task.result.get();
+    }
+
+    @Override
+    public void close() {
+        this.executor.shutdown();
     }
 
-    @WithSpan("compute")
-    public void run() {
-      if (this.n <= 1) {
-        this.result.complete(this.n);
-        return;
-      }
-      FibonacciExecuteTask task1 = new FibonacciExecuteTask(this.n - 1);
-      FibonacciExecuteTask task2 = new FibonacciExecuteTask(this.n - 2);
-      executor.execute(task1);
-      executor.execute(task2);
-      try {
-        this.result.complete(task1.result.get() + task2.result.get());
-      } catch (InterruptedException | ExecutionException e) {
-        this.result.completeExceptionally(e);
-      }
+    public class FibonacciExecuteTask implements Runnable {
+        private final long n;
+        private final CompletableFuture<Long> result;
+
+        public FibonacciExecuteTask(long n) {
+            this.n = n;
+            this.result = new CompletableFuture<>();
+        }
+
+        @WithSpan("compute")
+        public void run() {
+            if (this.n <= 1) {
+                this.result.complete(this.n);
+                return;
+            }
+            FibonacciExecuteTask task1 = new FibonacciExecuteTask(this.n - 1);
+            FibonacciExecuteTask task2 = new FibonacciExecuteTask(this.n - 2);
+            executor.execute(task1);
+            executor.execute(task2);
+            try {
+                this.result.complete(task1.result.get() + task2.result.get());
+            } catch (InterruptedException | ExecutionException e) {
+                this.result.completeExceptionally(e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadInvokeAllCalculator.java b/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadInvokeAllCalculator.java
index 9d2a1a9d28a..0a16705b34d 100644
--- a/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadInvokeAllCalculator.java
+++ b/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadInvokeAllCalculator.java
@@ -11,39 +11,39 @@
 import java.util.concurrent.Future;
 
 public class VirtualThreadInvokeAllCalculator implements FibonacciCalculator {
-  private final ExecutorService executor;
+    private final ExecutorService executor;
 
-  public VirtualThreadInvokeAllCalculator() {
-    this.executor = Executors.newVirtualThreadPerTaskExecutor();
-  }
-
-  @Override
-  public long computeFibonacci(int n) throws ExecutionException, InterruptedException {
-    FibonacciSubmitTask task = new FibonacciSubmitTask(n);
-    return this.executor.invokeAll(of(task)).getFirst().get();
-  }
-
-  @Override
-  public void close() {
-    this.executor.shutdown();
-  }
+    public VirtualThreadInvokeAllCalculator() {
+        this.executor = Executors.newVirtualThreadPerTaskExecutor();
+    }
 
-  public class FibonacciSubmitTask implements Callable<Long> {
-    private final long n;
+    @Override
+    public long computeFibonacci(int n) throws ExecutionException, InterruptedException {
+        FibonacciSubmitTask task = new FibonacciSubmitTask(n);
+        return this.executor.invokeAll(of(task)).getFirst().get();
+    }
 
-    public FibonacciSubmitTask(long n) {
-      this.n = n;
+    @Override
+    public void close() {
+        this.executor.shutdown();
     }
 
-    @WithSpan("compute")
-    public Long call() throws ExecutionException, InterruptedException {
-      if (this.n <= 1) {
-        return this.n;
-      }
-      FibonacciSubmitTask task1 = new FibonacciSubmitTask(this.n - 1);
-      FibonacciSubmitTask task2 = new FibonacciSubmitTask(this.n - 2);
-      List<Future<Long>> futures = executor.invokeAll(List.of(task1, task2));
-      return futures.getFirst().get() + futures.getLast().get();
+    public class FibonacciSubmitTask implements Callable<Long> {
+        private final long n;
+
+        public FibonacciSubmitTask(long n) {
+            this.n = n;
+        }
+
+        @WithSpan("compute")
+        public Long call() throws ExecutionException, InterruptedException {
+            if (this.n <= 1) {
+                return this.n;
+            }
+            FibonacciSubmitTask task1 = new FibonacciSubmitTask(this.n - 1);
+            FibonacciSubmitTask task2 = new FibonacciSubmitTask(this.n - 2);
+            List<Future<Long>> futures = executor.invokeAll(List.of(task1, task2));
+            return futures.getFirst().get() + futures.getLast().get();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadInvokeAnyCalculator.java b/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadInvokeAnyCalculator.java
index 11097b21f76..cbf264fc4eb 100644
--- a/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadInvokeAnyCalculator.java
+++ b/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadInvokeAnyCalculator.java
@@ -9,38 +9,38 @@
 import java.util.concurrent.Executors;
 
 public class VirtualThreadInvokeAnyCalculator implements FibonacciCalculator {
-  private final ExecutorService executor;
+    private final ExecutorService executor;
 
-  public VirtualThreadInvokeAnyCalculator() {
-    this.executor = Executors.newVirtualThreadPerTaskExecutor();
-  }
-
-  @Override
-  public long computeFibonacci(int n) throws ExecutionException, InterruptedException {
-    FibonacciSubmitTask task = new FibonacciSubmitTask(n);
-    return this.executor.invokeAny(of(task));
-  }
-
-  @Override
-  public void close() {
-    this.executor.shutdown();
-  }
+    public VirtualThreadInvokeAnyCalculator() {
+        this.executor = Executors.newVirtualThreadPerTaskExecutor();
+    }
 
-  public class FibonacciSubmitTask implements Callable<Long> {
-    private final long n;
+    @Override
+    public long computeFibonacci(int n) throws ExecutionException, InterruptedException {
+        FibonacciSubmitTask task = new FibonacciSubmitTask(n);
+        return this.executor.invokeAny(of(task));
+    }
 
-    public FibonacciSubmitTask(long n) {
-      this.n = n;
+    @Override
+    public void close() {
+        this.executor.shutdown();
     }
 
-    @WithSpan("compute")
-    public Long call() throws ExecutionException, InterruptedException {
-      if (this.n <= 1) {
-        return this.n;
-      }
-      FibonacciSubmitTask task1 = new FibonacciSubmitTask(this.n - 1);
-      FibonacciSubmitTask task2 = new FibonacciSubmitTask(this.n - 2);
-      return executor.invokeAny(of(task1)) + executor.invokeAny(of(task2));
+    public class FibonacciSubmitTask implements Callable<Long> {
+        private final long n;
+
+        public FibonacciSubmitTask(long n) {
+            this.n = n;
+        }
+
+        @WithSpan("compute")
+        public Long call() throws ExecutionException, InterruptedException {
+            if (this.n <= 1) {
+                return this.n;
+            }
+            FibonacciSubmitTask task1 = new FibonacciSubmitTask(this.n - 1);
+            FibonacciSubmitTask task2 = new FibonacciSubmitTask(this.n - 2);
+            return executor.invokeAny(of(task1)) + executor.invokeAny(of(task2));
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadStartCalculator.java b/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadStartCalculator.java
index c47aacba2dc..7ddfa5153a3 100644
--- a/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadStartCalculator.java
+++ b/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadStartCalculator.java
@@ -5,42 +5,42 @@
 import java.util.concurrent.ExecutionException;
 
 public class VirtualThreadStartCalculator implements FibonacciCalculator {
-  @Override
-  public long computeFibonacci(int n) throws ExecutionException, InterruptedException {
-    FibonacciExecuteTask task = new FibonacciExecuteTask(n);
-    Thread.startVirtualThread(task);
-    return task.result.get();
-  }
+    @Override
+    public long computeFibonacci(int n) throws ExecutionException, InterruptedException {
+        FibonacciExecuteTask task = new FibonacciExecuteTask(n);
+        Thread.startVirtualThread(task);
+        return task.result.get();
+    }
 
-  @Override
-  public void close() {
-    // No-op.
-  }
+    @Override
+    public void close() {
+        // No-op.
+    }
 
-  public static class FibonacciExecuteTask implements Runnable {
-    private final long n;
-    private final CompletableFuture<Long> result;
+    public static class FibonacciExecuteTask implements Runnable {
+        private final long n;
+        private final CompletableFuture<Long> result;
 
-    public FibonacciExecuteTask(long n) {
-      this.n = n;
-      this.result = new CompletableFuture<>();
-    }
+        public FibonacciExecuteTask(long n) {
+            this.n = n;
+            this.result = new CompletableFuture<>();
+        }
 
-    @WithSpan("compute")
-    public void run() {
-      if (this.n <= 1) {
-        this.result.complete(this.n);
-        return;
-      }
-      FibonacciExecuteTask task1 = new FibonacciExecuteTask(this.n - 1);
-      FibonacciExecuteTask task2 = new FibonacciExecuteTask(this.n - 2);
-      Thread.startVirtualThread(task1);
-      Thread.startVirtualThread(task2);
-      try {
-        this.result.complete(task1.result.get() + task2.result.get());
-      } catch (InterruptedException | ExecutionException e) {
-        this.result.completeExceptionally(e);
-      }
+        @WithSpan("compute")
+        public void run() {
+            if (this.n <= 1) {
+                this.result.complete(this.n);
+                return;
+            }
+            FibonacciExecuteTask task1 = new FibonacciExecuteTask(this.n - 1);
+            FibonacciExecuteTask task2 = new FibonacciExecuteTask(this.n - 2);
+            Thread.startVirtualThread(task1);
+            Thread.startVirtualThread(task2);
+            try {
+                this.result.complete(task1.result.get() + task2.result.get());
+            } catch (InterruptedException | ExecutionException e) {
+                this.result.completeExceptionally(e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadSubmitCallableCalculator.java b/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadSubmitCallableCalculator.java
index 0043b8fbd9a..bec3a38d8a2 100644
--- a/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadSubmitCallableCalculator.java
+++ b/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadSubmitCallableCalculator.java
@@ -8,40 +8,40 @@
 import java.util.concurrent.Future;
 
 public class VirtualThreadSubmitCallableCalculator implements FibonacciCalculator {
-  private final ExecutorService executor;
+    private final ExecutorService executor;
 
-  public VirtualThreadSubmitCallableCalculator() {
-    this.executor = Executors.newVirtualThreadPerTaskExecutor();
-  }
-
-  @Override
-  public long computeFibonacci(int n) throws ExecutionException, InterruptedException {
-    FibonacciSubmitTask task = new FibonacciSubmitTask(n);
-    return this.executor.submit(task).get();
-  }
-
-  @Override
-  public void close() {
-    this.executor.shutdown();
-  }
+    public VirtualThreadSubmitCallableCalculator() {
+        this.executor = Executors.newVirtualThreadPerTaskExecutor();
+    }
 
-  public class FibonacciSubmitTask implements Callable<Long> {
-    private final long n;
+    @Override
+    public long computeFibonacci(int n) throws ExecutionException, InterruptedException {
+        FibonacciSubmitTask task = new FibonacciSubmitTask(n);
+        return this.executor.submit(task).get();
+    }
 
-    public FibonacciSubmitTask(long n) {
-      this.n = n;
+    @Override
+    public void close() {
+        this.executor.shutdown();
     }
 
-    @WithSpan("compute")
-    public Long call() throws ExecutionException, InterruptedException {
-      if (this.n <= 1) {
-        return this.n;
-      }
-      FibonacciSubmitTask task1 = new FibonacciSubmitTask(this.n - 1);
-      FibonacciSubmitTask task2 = new FibonacciSubmitTask(this.n - 2);
-      Future<Long> future1 = executor.submit(task1);
-      Future<Long> future2 = executor.submit(task2);
-      return future1.get() + future2.get();
+    public class FibonacciSubmitTask implements Callable<Long> {
+        private final long n;
+
+        public FibonacciSubmitTask(long n) {
+            this.n = n;
+        }
+
+        @WithSpan("compute")
+        public Long call() throws ExecutionException, InterruptedException {
+            if (this.n <= 1) {
+                return this.n;
+            }
+            FibonacciSubmitTask task1 = new FibonacciSubmitTask(this.n - 1);
+            FibonacciSubmitTask task2 = new FibonacciSubmitTask(this.n - 2);
+            Future<Long> future1 = executor.submit(task1);
+            Future<Long> future2 = executor.submit(task2);
+            return future1.get() + future2.get();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadSubmitRunnableCalculator.java b/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadSubmitRunnableCalculator.java
index 0c1616900e8..ad25055f4ff 100644
--- a/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadSubmitRunnableCalculator.java
+++ b/dd-smoke-tests/concurrent/java-21/src/main/java/datadog/smoketest/concurrent/VirtualThreadSubmitRunnableCalculator.java
@@ -7,48 +7,48 @@
 import java.util.concurrent.Executors;
 
 public class VirtualThreadSubmitRunnableCalculator implements FibonacciCalculator {
-  private final ExecutorService executor;
-
-  public VirtualThreadSubmitRunnableCalculator() {
-    this.executor = Executors.newVirtualThreadPerTaskExecutor();
-  }
-
-  @Override
-  public long computeFibonacci(int n) throws ExecutionException, InterruptedException {
-    FibonacciSubmitTask task = new FibonacciSubmitTask(n);
-    this.executor.execute(task);
-    return task.result.get();
-  }
-
-  @Override
-  public void close() {
-    this.executor.shutdown();
-  }
-
-  public class FibonacciSubmitTask implements Runnable {
-    private final long n;
-    private final CompletableFuture<Long> result;
-
-    public FibonacciSubmitTask(long n) {
-      this.n = n;
-      this.result = new CompletableFuture<>();
+    private final ExecutorService executor;
+
+    public VirtualThreadSubmitRunnableCalculator() {
+        this.executor = Executors.newVirtualThreadPerTaskExecutor();
+    }
+
+    @Override
+    public long computeFibonacci(int n) throws ExecutionException, InterruptedException {
+        FibonacciSubmitTask task = new FibonacciSubmitTask(n);
+        this.executor.execute(task);
+        return task.result.get();
+    }
+
+    @Override
+    public void close() {
+        this.executor.shutdown();
     }
 
-    @WithSpan("compute")
-    public void run() {
-      if (this.n <= 1) {
-        this.result.complete(this.n);
-        return;
-      }
-      FibonacciSubmitTask task1 = new FibonacciSubmitTask(this.n - 1);
-      FibonacciSubmitTask task2 = new FibonacciSubmitTask(this.n - 2);
-      executor.submit(task1);
-      executor.submit(task2);
-      try {
-        this.result.complete(task1.result.get() + task2.result.get());
-      } catch (InterruptedException | ExecutionException e) {
-        this.result.completeExceptionally(e);
-      }
+    public class FibonacciSubmitTask implements Runnable {
+        private final long n;
+        private final CompletableFuture<Long> result;
+
+        public FibonacciSubmitTask(long n) {
+            this.n = n;
+            this.result = new CompletableFuture<>();
+        }
+
+        @WithSpan("compute")
+        public void run() {
+            if (this.n <= 1) {
+                this.result.complete(this.n);
+                return;
+            }
+            FibonacciSubmitTask task1 = new FibonacciSubmitTask(this.n - 1);
+            FibonacciSubmitTask task2 = new FibonacciSubmitTask(this.n - 2);
+            executor.submit(task1);
+            executor.submit(task2);
+            try {
+                this.result.complete(task1.result.get() + task2.result.get());
+            } catch (InterruptedException | ExecutionException e) {
+                this.result.completeExceptionally(e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/ConcurrentApp.java b/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/ConcurrentApp.java
index cdc18c9f39c..08863f36ede 100644
--- a/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/ConcurrentApp.java
+++ b/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/ConcurrentApp.java
@@ -1,27 +1,27 @@
 package datadog.smoketest.concurrent;
 
 public class ConcurrentApp {
-  void main(String[] args) {
-    if (args.length != 1) {
-      System.err.println("Missing test case argument");
-      System.exit(1);
+    void main(String[] args) {
+        if (args.length != 1) {
+            System.err.println("Missing test case argument");
+            System.exit(1);
+        }
+        String name = args[0];
+        try {
+            fromName(name).run();
+        } catch (InterruptedException e) {
+            throw new RuntimeException("Failed to test case " + name, e);
+        }
     }
-    String name = args[0];
-    try {
-      fromName(name).run();
-    } catch (InterruptedException e) {
-      throw new RuntimeException("Failed to test case " + name, e);
-    }
-  }
 
-  private static TestCase fromName(String name) {
-    return switch (name) {
-      case "NestedTasks" -> new NestedTasks();
-      case "MultipleTasks" -> new MultipleTasks();
-      case "SimpleCallableTask" -> new SimpleCallableTask();
-      case "SimpleRunnableTask" -> new SimpleRunnableTask();
-      case "ScheduledForkJoinTask" -> new ScheduledForkJoinTask();
-      default -> throw new IllegalArgumentException("Invalid test case name " + name);
-    };
-  }
+    private static TestCase fromName(String name) {
+        return switch (name) {
+            case "NestedTasks" -> new NestedTasks();
+            case "MultipleTasks" -> new MultipleTasks();
+            case "SimpleCallableTask" -> new SimpleCallableTask();
+            case "SimpleRunnableTask" -> new SimpleRunnableTask();
+            case "ScheduledForkJoinTask" -> new ScheduledForkJoinTask();
+            default -> throw new IllegalArgumentException("Invalid test case name " + name);
+        };
+    }
 }
diff --git a/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/MultipleTasks.java b/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/MultipleTasks.java
index b7306017098..7be566b8835 100644
--- a/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/MultipleTasks.java
+++ b/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/MultipleTasks.java
@@ -4,29 +4,29 @@
 import java.util.concurrent.StructuredTaskScope;
 
 public final class MultipleTasks implements TestCase {
-  @WithSpan("parent")
-  public void run() throws InterruptedException {
-    try (var scope = StructuredTaskScope.open()) {
-      scope.fork(this::runnableTask1);
-      scope.fork(this::callableTask2);
-      scope.fork(this::runnableTask3);
-      scope.join();
+    @WithSpan("parent")
+    public void run() throws InterruptedException {
+        try (var scope = StructuredTaskScope.open()) {
+            scope.fork(this::runnableTask1);
+            scope.fork(this::callableTask2);
+            scope.fork(this::runnableTask3);
+            scope.join();
+        }
     }
-  }
 
-  @WithSpan("child1")
-  void runnableTask1() {
-    // Some basic computations here
-  }
+    @WithSpan("child1")
+    void runnableTask1() {
+        // Some basic computations here
+    }
 
-  @WithSpan("child2")
-  Boolean callableTask2() {
-    // Some basic computations here
-    return true;
-  }
+    @WithSpan("child2")
+    Boolean callableTask2() {
+        // Some basic computations here
+        return true;
+    }
 
-  @WithSpan("child3")
-  void runnableTask3() {
-    // Some basic computations here
-  }
+    @WithSpan("child3")
+    void runnableTask3() {
+        // Some basic computations here
+    }
 }
diff --git a/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/NestedTasks.java b/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/NestedTasks.java
index f3b15067e8f..071e7812b12 100644
--- a/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/NestedTasks.java
+++ b/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/NestedTasks.java
@@ -4,38 +4,38 @@
 import java.util.concurrent.StructuredTaskScope;
 
 public final class NestedTasks implements TestCase {
-  @WithSpan("parent")
-  public void run() throws InterruptedException {
-    try (var scope = StructuredTaskScope.open()) {
-      scope.fork(this::task1);
-      scope.fork(this::task2);
-      scope.join();
+    @WithSpan("parent")
+    public void run() throws InterruptedException {
+        try (var scope = StructuredTaskScope.open()) {
+            scope.fork(this::task1);
+            scope.fork(this::task2);
+            scope.join();
+        }
     }
-  }
 
-  @WithSpan("child1")
-  void task1() {
-    try (var scope = StructuredTaskScope.open()) {
-      scope.fork(this::subTask1);
-      scope.fork(this::subTask2);
-      scope.join();
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
+    @WithSpan("child1")
+    void task1() {
+        try (var scope = StructuredTaskScope.open()) {
+            scope.fork(this::subTask1);
+            scope.fork(this::subTask2);
+            scope.join();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
     }
-  }
 
-  @WithSpan("child2")
-  void task2() {
-    // Some basic computations here
-  }
+    @WithSpan("child2")
+    void task2() {
+        // Some basic computations here
+    }
 
-  @WithSpan("great-child1-1")
-  void subTask1() {
-    // Some basic computations here
-  }
+    @WithSpan("great-child1-1")
+    void subTask1() {
+        // Some basic computations here
+    }
 
-  @WithSpan("great-child1-2")
-  void subTask2() {
-    // Some basic computations here
-  }
+    @WithSpan("great-child1-2")
+    void subTask2() {
+        // Some basic computations here
+    }
 }
diff --git a/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/ScheduledForkJoinTask.java b/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/ScheduledForkJoinTask.java
index a8873a5dacd..22fa6db979e 100644
--- a/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/ScheduledForkJoinTask.java
+++ b/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/ScheduledForkJoinTask.java
@@ -14,58 +14,57 @@
 
 /** Exercises delayed context propagation alongside executor and annotation instrumentation. */
 public final class ScheduledForkJoinTask implements TestCase {
-  @Override
-  public void run() throws InterruptedException {
-    try (ForkJoinPool pool = new ForkJoinPool(1);
-        ExecutorService executor = Executors.newSingleThreadExecutor()) {
-      CountDownLatch parentFinished = new CountDownLatch(1);
-      ScheduledFuture<?> scheduled = schedule(pool, executor, parentFinished);
-      // The annotated scheduling method has returned, closing and finishing the parent span.
-      parentFinished.countDown();
-      try {
-        scheduled.get(10, SECONDS);
-        pool.submit(this::unrelatedForkJoinTask).get(10, SECONDS);
-        executor.submit(this::unrelatedExecutorTask).get(10, SECONDS);
-      } catch (ExecutionException | TimeoutException e) {
-        throw new AssertionError(e);
-      }
+    @Override
+    public void run() throws InterruptedException {
+        try (ForkJoinPool pool = new ForkJoinPool(1);
+                ExecutorService executor = Executors.newSingleThreadExecutor()) {
+            CountDownLatch parentFinished = new CountDownLatch(1);
+            ScheduledFuture<?> scheduled = schedule(pool, executor, parentFinished);
+            // The annotated scheduling method has returned, closing and finishing the parent span.
+            parentFinished.countDown();
+            try {
+                scheduled.get(10, SECONDS);
+                pool.submit(this::unrelatedForkJoinTask).get(10, SECONDS);
+                executor.submit(this::unrelatedExecutorTask).get(10, SECONDS);
+            } catch (ExecutionException | TimeoutException e) {
+                throw new AssertionError(e);
+            }
+        }
     }
-  }
 
-  @WithSpan("parent")
-  private ScheduledFuture<?> schedule(
-      ForkJoinPool pool, ExecutorService executor, CountDownLatch parentFinished) {
-    return pool.schedule(
-        () -> {
-          try {
-            if (!parentFinished.await(10, SECONDS)) {
-              throw new AssertionError("Parent did not finish");
-            }
-            scheduledTask(executor);
-          } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new AssertionError(e);
-          }
-        },
-        1,
-        MILLISECONDS);
-  }
+    @WithSpan("parent")
+    private ScheduledFuture<?> schedule(ForkJoinPool pool, ExecutorService executor, CountDownLatch parentFinished) {
+        return pool.schedule(
+                () -> {
+                    try {
+                        if (!parentFinished.await(10, SECONDS)) {
+                            throw new AssertionError("Parent did not finish");
+                        }
+                        scheduledTask(executor);
+                    } catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
+                        throw new AssertionError(e);
+                    }
+                },
+                1,
+                MILLISECONDS);
+    }
 
-  @WithSpan("scheduled")
-  private void scheduledTask(ExecutorService executor) throws InterruptedException {
-    try {
-      executor.submit(this::nestedTask).get(10, SECONDS);
-    } catch (ExecutionException | TimeoutException e) {
-      throw new AssertionError(e);
+    @WithSpan("scheduled")
+    private void scheduledTask(ExecutorService executor) throws InterruptedException {
+        try {
+            executor.submit(this::nestedTask).get(10, SECONDS);
+        } catch (ExecutionException | TimeoutException e) {
+            throw new AssertionError(e);
+        }
     }
-  }
 
-  @WithSpan("nested")
-  private void nestedTask() {}
+    @WithSpan("nested")
+    private void nestedTask() {}
 
-  @WithSpan("unrelated-forkjoin")
-  private void unrelatedForkJoinTask() {}
+    @WithSpan("unrelated-forkjoin")
+    private void unrelatedForkJoinTask() {}
 
-  @WithSpan("unrelated-executor")
-  private void unrelatedExecutorTask() {}
+    @WithSpan("unrelated-executor")
+    private void unrelatedExecutorTask() {}
 }
diff --git a/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/SimpleCallableTask.java b/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/SimpleCallableTask.java
index 54a054746ad..71d213b4396 100644
--- a/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/SimpleCallableTask.java
+++ b/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/SimpleCallableTask.java
@@ -4,17 +4,17 @@
 import java.util.concurrent.StructuredTaskScope;
 
 public final class SimpleCallableTask implements TestCase {
-  @WithSpan("parent")
-  public void run() throws InterruptedException {
-    try (var scope = StructuredTaskScope.open()) {
-      scope.fork(this::doSomething);
-      scope.join();
+    @WithSpan("parent")
+    public void run() throws InterruptedException {
+        try (var scope = StructuredTaskScope.open()) {
+            scope.fork(this::doSomething);
+            scope.join();
+        }
     }
-  }
 
-  @WithSpan("child")
-  Boolean doSomething() {
-    // Some basic computations here
-    return true;
-  }
+    @WithSpan("child")
+    Boolean doSomething() {
+        // Some basic computations here
+        return true;
+    }
 }
diff --git a/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/SimpleRunnableTask.java b/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/SimpleRunnableTask.java
index 0b112b2488b..0abc5cf0ac8 100644
--- a/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/SimpleRunnableTask.java
+++ b/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/SimpleRunnableTask.java
@@ -4,16 +4,16 @@
 import java.util.concurrent.StructuredTaskScope;
 
 public final class SimpleRunnableTask implements TestCase {
-  @WithSpan("parent")
-  public void run() throws InterruptedException {
-    try (var scope = StructuredTaskScope.open()) {
-      scope.fork(this::doSomething);
-      scope.join();
+    @WithSpan("parent")
+    public void run() throws InterruptedException {
+        try (var scope = StructuredTaskScope.open()) {
+            scope.fork(this::doSomething);
+            scope.join();
+        }
     }
-  }
 
-  @WithSpan("child")
-  void doSomething() {
-    // Some basic computations here
-  }
+    @WithSpan("child")
+    void doSomething() {
+        // Some basic computations here
+    }
 }
diff --git a/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/TestCase.java b/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/TestCase.java
index 4546cbbb2b8..8bb51e9f485 100644
--- a/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/TestCase.java
+++ b/dd-smoke-tests/concurrent/java-25/src/main/java/datadog/smoketest/concurrent/TestCase.java
@@ -2,5 +2,5 @@
 
 @FunctionalInterface
 public interface TestCase {
-  void run() throws InterruptedException;
+    void run() throws InterruptedException;
 }
diff --git a/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/ConcurrentApp.java b/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/ConcurrentApp.java
index c54fb188db3..e2b8eb427ca 100644
--- a/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/ConcurrentApp.java
+++ b/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/ConcurrentApp.java
@@ -4,26 +4,26 @@
 import java.util.concurrent.ExecutionException;
 
 public class ConcurrentApp {
-  @WithSpan("main")
-  public static void main(String[] args) {
-    // Calculate fibonacci using concurrent strategies
-    for (String arg : args) {
-      try (FibonacciCalculator calc = getCalculator(arg)) {
-        calc.computeFibonacci(10);
-      } catch (ExecutionException | InterruptedException e) {
-        throw new RuntimeException("Failed to compute fibonacci number.", e);
-      }
+    @WithSpan("main")
+    public static void main(String[] args) {
+        // Calculate fibonacci using concurrent strategies
+        for (String arg : args) {
+            try (FibonacciCalculator calc = getCalculator(arg)) {
+                calc.computeFibonacci(10);
+            } catch (ExecutionException | InterruptedException e) {
+                throw new RuntimeException("Failed to compute fibonacci number.", e);
+            }
+        }
     }
-  }
 
-  private static FibonacciCalculator getCalculator(String name) {
-    if (name.equalsIgnoreCase("executorService")) {
-      return new DemoExecutorService();
-    } else if (name.equalsIgnoreCase("forkJoinPoolTask")) {
-      return new DemoForkJoinPoolTask();
-    } else if (name.equalsIgnoreCase("forkJoinPoolExternalClient")) {
-      return new DemoForkJoinPoolExternalClient();
+    private static FibonacciCalculator getCalculator(String name) {
+        if (name.equalsIgnoreCase("executorService")) {
+            return new DemoExecutorService();
+        } else if (name.equalsIgnoreCase("forkJoinPoolTask")) {
+            return new DemoForkJoinPoolTask();
+        } else if (name.equalsIgnoreCase("forkJoinPoolExternalClient")) {
+            return new DemoForkJoinPoolExternalClient();
+        }
+        throw new IllegalArgumentException("Unknown calculator: " + name);
     }
-    throw new IllegalArgumentException("Unknown calculator: " + name);
-  }
 }
diff --git a/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/DemoExecutorService.java b/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/DemoExecutorService.java
index 2de2b76ccf3..0460f65a7d3 100644
--- a/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/DemoExecutorService.java
+++ b/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/DemoExecutorService.java
@@ -10,44 +10,44 @@
 import java.util.concurrent.Future;
 
 public class DemoExecutorService implements FibonacciCalculator {
-  private final ExecutorService executorService;
+    private final ExecutorService executorService;
 
-  public DemoExecutorService() {
-    executorService = Executors.newFixedThreadPool(10);
-  }
+    public DemoExecutorService() {
+        executorService = Executors.newFixedThreadPool(10);
+    }
 
-  @WithSpan("compute")
-  @Override
-  public long computeFibonacci(int n) throws ExecutionException, InterruptedException {
-    Future<Long> future = executorService.submit(new FibonacciTask(n));
-    return future.get();
-  }
+    @WithSpan("compute")
+    @Override
+    public long computeFibonacci(int n) throws ExecutionException, InterruptedException {
+        Future<Long> future = executorService.submit(new FibonacciTask(n));
+        return future.get();
+    }
 
-  private class FibonacciTask implements Callable<Long> {
-    private final int n;
+    private class FibonacciTask implements Callable<Long> {
+        private final int n;
 
-    public FibonacciTask(int n) {
-      this.n = n;
+        public FibonacciTask(int n) {
+            this.n = n;
+        }
+
+        @Override
+        public Long call() throws ExecutionException, InterruptedException {
+            if (n <= 1) {
+                return (long) n;
+            }
+            return computeFibonacci(n - 1) + computeFibonacci(n - 2);
+        }
     }
 
     @Override
-    public Long call() throws ExecutionException, InterruptedException {
-      if (n <= 1) {
-        return (long) n;
-      }
-      return computeFibonacci(n - 1) + computeFibonacci(n - 2);
-    }
-  }
-
-  @Override
-  public void close() {
-    executorService.shutdown();
-    try {
-      if (!executorService.awaitTermination(10, SECONDS)) {
-        executorService.shutdownNow();
-      }
-    } catch (InterruptedException e) {
-      executorService.shutdownNow();
+    public void close() {
+        executorService.shutdown();
+        try {
+            if (!executorService.awaitTermination(10, SECONDS)) {
+                executorService.shutdownNow();
+            }
+        } catch (InterruptedException e) {
+            executorService.shutdownNow();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/DemoForkJoinPoolExternalClient.java b/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/DemoForkJoinPoolExternalClient.java
index 873ac885b48..745c5665bba 100644
--- a/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/DemoForkJoinPoolExternalClient.java
+++ b/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/DemoForkJoinPoolExternalClient.java
@@ -7,50 +7,50 @@
 
 /** Test ForkJoinPool using the external client API. */
 public class DemoForkJoinPoolExternalClient implements FibonacciCalculator {
-  private final ForkJoinPool forkJoinPool;
-
-  public DemoForkJoinPoolExternalClient() {
-    this.forkJoinPool = new ForkJoinPool();
-  }
-
-  @Override
-  public long computeFibonacci(int n) throws ExecutionException, InterruptedException {
-    FibonacciTask task = new FibonacciTask(n);
-    this.forkJoinPool.execute(task);
-    return task.result.get();
-  }
-
-  private class FibonacciTask implements Runnable {
-    private final int n;
-    private final CompletableFuture<Long> result;
-
-    public FibonacciTask(int n) {
-      this.n = n;
-      this.result = new CompletableFuture<>();
+    private final ForkJoinPool forkJoinPool;
+
+    public DemoForkJoinPoolExternalClient() {
+        this.forkJoinPool = new ForkJoinPool();
     }
 
-    @WithSpan("compute")
     @Override
-    public void run() {
-      if (this.n <= 1) {
-        this.result.complete((long) this.n);
-        return;
-      }
-      FibonacciTask taskOne = new FibonacciTask(this.n - 1);
-      forkJoinPool.execute(taskOne);
-      FibonacciTask taskTwo = new FibonacciTask(this.n - 2);
-      forkJoinPool.submit(taskTwo);
-
-      try {
-        this.result.complete(taskOne.result.get() + taskTwo.result.get());
-      } catch (InterruptedException | ExecutionException e) {
-        this.result.completeExceptionally(e);
-      }
+    public long computeFibonacci(int n) throws ExecutionException, InterruptedException {
+        FibonacciTask task = new FibonacciTask(n);
+        this.forkJoinPool.execute(task);
+        return task.result.get();
+    }
+
+    private class FibonacciTask implements Runnable {
+        private final int n;
+        private final CompletableFuture<Long> result;
+
+        public FibonacciTask(int n) {
+            this.n = n;
+            this.result = new CompletableFuture<>();
+        }
+
+        @WithSpan("compute")
+        @Override
+        public void run() {
+            if (this.n <= 1) {
+                this.result.complete((long) this.n);
+                return;
+            }
+            FibonacciTask taskOne = new FibonacciTask(this.n - 1);
+            forkJoinPool.execute(taskOne);
+            FibonacciTask taskTwo = new FibonacciTask(this.n - 2);
+            forkJoinPool.submit(taskTwo);
+
+            try {
+                this.result.complete(taskOne.result.get() + taskTwo.result.get());
+            } catch (InterruptedException | ExecutionException e) {
+                this.result.completeExceptionally(e);
+            }
+        }
     }
-  }
 
-  @Override
-  public void close() {
-    forkJoinPool.shutdown();
-  }
+    @Override
+    public void close() {
+        forkJoinPool.shutdown();
+    }
 }
diff --git a/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/DemoForkJoinPoolTask.java b/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/DemoForkJoinPoolTask.java
index 486e3e308bd..6ecf4ece389 100644
--- a/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/DemoForkJoinPoolTask.java
+++ b/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/DemoForkJoinPoolTask.java
@@ -6,39 +6,39 @@
 
 /** Test ForkJoinPool using the FJP task API. */
 public class DemoForkJoinPoolTask implements FibonacciCalculator {
-  private final ForkJoinPool forkJoinPool;
+    private final ForkJoinPool forkJoinPool;
 
-  public DemoForkJoinPoolTask() {
-    forkJoinPool = new ForkJoinPool();
-  }
-
-  @Override
-  public long computeFibonacci(int n) {
-    return new FibonacciTask(n).invoke();
-  }
+    public DemoForkJoinPoolTask() {
+        forkJoinPool = new ForkJoinPool();
+    }
 
-  private static class FibonacciTask extends RecursiveTask<Long> {
-    private final int n;
+    @Override
+    public long computeFibonacci(int n) {
+        return new FibonacciTask(n).invoke();
+    }
 
-    public FibonacciTask(int n) {
-      this.n = n;
+    private static class FibonacciTask extends RecursiveTask<Long> {
+        private final int n;
+
+        public FibonacciTask(int n) {
+            this.n = n;
+        }
+
+        @WithSpan("compute")
+        @Override
+        protected Long compute() {
+            if (this.n <= 1) {
+                return (long) this.n;
+            }
+            FibonacciTask taskOne = new FibonacciTask(n - 1);
+            taskOne.fork();
+            FibonacciTask taskTwo = new FibonacciTask(n - 2);
+            return taskTwo.compute() + taskOne.join();
+        }
     }
 
-    @WithSpan("compute")
     @Override
-    protected Long compute() {
-      if (this.n <= 1) {
-        return (long) this.n;
-      }
-      FibonacciTask taskOne = new FibonacciTask(n - 1);
-      taskOne.fork();
-      FibonacciTask taskTwo = new FibonacciTask(n - 2);
-      return taskTwo.compute() + taskOne.join();
+    public void close() {
+        forkJoinPool.shutdown();
     }
-  }
-
-  @Override
-  public void close() {
-    forkJoinPool.shutdown();
-  }
 }
diff --git a/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/FibonacciCalculator.java b/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/FibonacciCalculator.java
index 73974d7b135..9724a0669c6 100644
--- a/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/FibonacciCalculator.java
+++ b/dd-smoke-tests/concurrent/java-8/src/main/java/datadog/smoketest/concurrent/FibonacciCalculator.java
@@ -3,8 +3,8 @@
 import java.util.concurrent.ExecutionException;
 
 public interface FibonacciCalculator extends AutoCloseable {
-  long computeFibonacci(int n) throws ExecutionException, InterruptedException;
+    long computeFibonacci(int n) throws ExecutionException, InterruptedException;
 
-  @Override
-  void close();
+    @Override
+    void close();
 }
diff --git a/dd-smoke-tests/crashtracking/src/main/java/datadog/smoketest/crashtracking/CrashtrackingTestApplication.java b/dd-smoke-tests/crashtracking/src/main/java/datadog/smoketest/crashtracking/CrashtrackingTestApplication.java
index 5b8301ba5af..4889a2d1319 100644
--- a/dd-smoke-tests/crashtracking/src/main/java/datadog/smoketest/crashtracking/CrashtrackingTestApplication.java
+++ b/dd-smoke-tests/crashtracking/src/main/java/datadog/smoketest/crashtracking/CrashtrackingTestApplication.java
@@ -13,82 +13,76 @@
 import java.util.concurrent.locks.LockSupport;
 
 public class CrashtrackingTestApplication {
-  public static void main(String[] args) throws Exception {
-    HotSpotDiagnosticMXBean diagBean =
-        ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
-    String onError = null;
-    if (diagBean == null) {
-      System.err.println("HotSpotDiagnosticMXBean is not available");
-      System.exit(-1);
-    }
+    public static void main(String[] args) throws Exception {
+        HotSpotDiagnosticMXBean diagBean = ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
+        String onError = null;
+        if (diagBean == null) {
+            System.err.println("HotSpotDiagnosticMXBean is not available");
+            System.exit(-1);
+        }
 
-    String onOutOfMemoryError = diagBean.getVMOption("OnOutOfMemoryError").getValue();
-    long ts = System.nanoTime();
-    // There is a delay between the JVM startup and the moment when the OnError option is set due to
-    // possible
-    // dependency on JMX - let's wait for it to be set.
-    while ((onError == null || onError.isEmpty()) && (System.nanoTime() - ts) < 5_000_000_000L) {
-      onError = diagBean.getVMOption("OnError").getValue();
-      if (onOutOfMemoryError == null) {
-        onOutOfMemoryError = diagBean.getVMOption("OnOutOfMemoryError").getValue();
-      }
-      LockSupport.parkNanos(100_00_000L); // 100ms
-    }
+        String onOutOfMemoryError = diagBean.getVMOption("OnOutOfMemoryError").getValue();
+        long ts = System.nanoTime();
+        // There is a delay between the JVM startup and the moment when the OnError option is set due to
+        // possible
+        // dependency on JMX - let's wait for it to be set.
+        while ((onError == null || onError.isEmpty()) && (System.nanoTime() - ts) < 5_000_000_000L) {
+            onError = diagBean.getVMOption("OnError").getValue();
+            if (onOutOfMemoryError == null) {
+                onOutOfMemoryError = diagBean.getVMOption("OnOutOfMemoryError").getValue();
+            }
+            LockSupport.parkNanos(100_00_000L); // 100ms
+        }
 
-    if (onError == null && onOutOfMemoryError == null) {
-      System.err.println("Neither OnError nor OnOutOfMemoryError is specified");
-      System.exit(-1);
-    }
+        if (onError == null && onOutOfMemoryError == null) {
+            System.err.println("Neither OnError nor OnOutOfMemoryError is specified");
+            System.exit(-1);
+        }
 
-    String crashUploaderScript =
-        Arrays.stream(onError.split(";"))
-            .filter(s -> s.trim().contains("dd_crash_uploader"))
-            .findFirst()
-            .map(s -> s.replace(" %p", ""))
-            .orElse(null);
-    String oomeNotifierScript =
-        Arrays.stream(onOutOfMemoryError.split(";"))
-            .filter(s -> s.trim().contains("dd_oome_notifier"))
-            .findFirst()
-            .map(s -> s.replace(" %p", ""))
-            .orElse(null);
-    if (crashUploaderScript == null && oomeNotifierScript == null) {
-      System.err.println("Neither OnError nor OnOutOfMemoryError contains the expected value");
-      System.exit(-1);
-    }
+        String crashUploaderScript = Arrays.stream(onError.split(";"))
+                .filter(s -> s.trim().contains("dd_crash_uploader"))
+                .findFirst()
+                .map(s -> s.replace(" %p", ""))
+                .orElse(null);
+        String oomeNotifierScript = Arrays.stream(onOutOfMemoryError.split(";"))
+                .filter(s -> s.trim().contains("dd_oome_notifier"))
+                .findFirst()
+                .map(s -> s.replace(" %p", ""))
+                .orElse(null);
+        if (crashUploaderScript == null && oomeNotifierScript == null) {
+            System.err.println("Neither OnError nor OnOutOfMemoryError contains the expected value");
+            System.exit(-1);
+        }
 
-    System.out.println("===> Waiting...");
-    System.out.flush();
+        System.out.println("===> Waiting...");
+        System.out.flush();
 
-    CountDownLatch latch = new CountDownLatch(1);
+        CountDownLatch latch = new CountDownLatch(1);
 
-    Thread t =
-        new Thread(
-            () -> {
-              Path scriptPath =
-                  Paths.get(crashUploaderScript != null ? crashUploaderScript : oomeNotifierScript);
-              while (!Files.exists(scriptPath)) {
+        Thread t = new Thread(() -> {
+            Path scriptPath = Paths.get(crashUploaderScript != null ? crashUploaderScript : oomeNotifierScript);
+            while (!Files.exists(scriptPath)) {
                 System.out.println("Waiting for the script " + scriptPath + " to be created...");
                 LockSupport.parkNanos(1_000_000_000L);
-              }
-              latch.countDown();
-            });
-    t.setDaemon(true);
-    t.start();
+            }
+            latch.countDown();
+        });
+        t.setDaemon(true);
+        t.start();
 
-    System.out.println("Waiting for initialization...");
-    latch.await(5, TimeUnit.MINUTES);
+        System.out.println("Waiting for initialization...");
+        latch.await(5, TimeUnit.MINUTES);
 
-    // let's provoke OOME
-    List<byte[]> buffer = new ArrayList<>();
-    int size = 1;
-    while (size < 1024) {
-      buffer.add(new byte[size * 1024 * 1024]);
-      System.out.println("Allocated " + size + "MB");
-      if (size < 512) {
-        size *= 2;
-      }
+        // let's provoke OOME
+        List<byte[]> buffer = new ArrayList<>();
+        int size = 1;
+        while (size < 1024) {
+            buffer.add(new byte[size * 1024 * 1024]);
+            System.out.println("Allocated " + size + "MB");
+            if (size < 512) {
+                size *= 2;
+            }
+        }
+        System.out.println(buffer.size());
     }
-    System.out.println(buffer.size());
-  }
 }
diff --git a/dd-smoke-tests/crashtracking/src/main/java/datadog/smoketest/crashtracking/OpenJ9CrashtrackingTestApplication.java b/dd-smoke-tests/crashtracking/src/main/java/datadog/smoketest/crashtracking/OpenJ9CrashtrackingTestApplication.java
index eb3bcda2595..44c2225c38f 100644
--- a/dd-smoke-tests/crashtracking/src/main/java/datadog/smoketest/crashtracking/OpenJ9CrashtrackingTestApplication.java
+++ b/dd-smoke-tests/crashtracking/src/main/java/datadog/smoketest/crashtracking/OpenJ9CrashtrackingTestApplication.java
@@ -27,30 +27,30 @@
  * </ul>
  */
 public class OpenJ9CrashtrackingTestApplication {
-  public static void main(String[] args) throws Exception {
-    // Wait for the agent to write the crash-uploader script (proves initialization is done)
-    String scriptPath = System.getProperty("dd.test.crash_script");
-    if (scriptPath != null) {
-      long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(30);
-      while (!Files.exists(Paths.get(scriptPath)) && System.nanoTime() < deadline) {
-        Thread.sleep(200);
-      }
-      if (!Files.exists(Paths.get(scriptPath))) {
-        System.err.println("Timeout: crash script not created at " + scriptPath);
-        System.exit(-1);
-      }
-    }
+    public static void main(String[] args) throws Exception {
+        // Wait for the agent to write the crash-uploader script (proves initialization is done)
+        String scriptPath = System.getProperty("dd.test.crash_script");
+        if (scriptPath != null) {
+            long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(30);
+            while (!Files.exists(Paths.get(scriptPath)) && System.nanoTime() < deadline) {
+                Thread.sleep(200);
+            }
+            if (!Files.exists(Paths.get(scriptPath))) {
+                System.err.println("Timeout: crash script not created at " + scriptPath);
+                System.exit(-1);
+            }
+        }
 
-    System.out.println("===> Crash script ready, crashing JVM via Unsafe.putAddress(0L, 0L)...");
-    System.out.flush();
+        System.out.println("===> Crash script ready, crashing JVM via Unsafe.putAddress(0L, 0L)...");
+        System.out.flush();
 
-    // Write to address 0 via sun.misc.Unsafe to trigger a SIGSEGV (GPF event).
-    // Unsafe.getLong(0L) was not enough on OpenJ9 here; it threw a NullPointerException instead.
-    Class<?> unsafeClass = Class.forName("sun.misc.Unsafe");
-    Field f = unsafeClass.getDeclaredField("theUnsafe");
-    f.setAccessible(true);
-    Object theUnsafe = f.get(null);
-    Method putAddress = unsafeClass.getDeclaredMethod("putAddress", long.class, long.class);
-    putAddress.invoke(theUnsafe, 0L, 0L);
-  }
+        // Write to address 0 via sun.misc.Unsafe to trigger a SIGSEGV (GPF event).
+        // Unsafe.getLong(0L) was not enough on OpenJ9 here; it threw a NullPointerException instead.
+        Class<?> unsafeClass = Class.forName("sun.misc.Unsafe");
+        Field f = unsafeClass.getDeclaredField("theUnsafe");
+        f.setAccessible(true);
+        Object theUnsafe = f.get(null);
+        Method putAddress = unsafeClass.getDeclaredMethod("putAddress", long.class, long.class);
+        putAddress.invoke(theUnsafe, 0L, 0L);
+    }
 }
diff --git a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/AbstractCrashtrackingSmokeTest.java b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/AbstractCrashtrackingSmokeTest.java
index 8fd62bc020a..9338b7d92cc 100644
--- a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/AbstractCrashtrackingSmokeTest.java
+++ b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/AbstractCrashtrackingSmokeTest.java
@@ -27,94 +27,93 @@
 import org.junit.jupiter.api.BeforeEach;
 
 abstract class AbstractCrashtrackingSmokeTest {
-  static final OutputThreads OUTPUT = new OutputThreads();
-  static final Path LOG_FILE_DIR =
-      Paths.get(System.getProperty("datadog.smoketest.builddir"), "reports");
+    static final OutputThreads OUTPUT = new OutputThreads();
+    static final Path LOG_FILE_DIR = Paths.get(System.getProperty("datadog.smoketest.builddir"), "reports");
 
-  MockWebServer tracingServer;
-  final BlockingQueue<CrashTelemetryData> crashEvents = new LinkedBlockingQueue<>();
-  final Moshi moshi = new Moshi.Builder().build();
-  Path tempDir;
+    MockWebServer tracingServer;
+    final BlockingQueue<CrashTelemetryData> crashEvents = new LinkedBlockingQueue<>();
+    final Moshi moshi = new Moshi.Builder().build();
+    Path tempDir;
 
-  @BeforeEach
-  void setUpTracingServer() throws Exception {
-    tempDir = Files.createTempDirectory("dd-smoketest-");
-    crashEvents.clear();
-    tracingServer = new MockWebServer();
-    tracingServer.setDispatcher(
-        new Dispatcher() {
-          @Override
-          public MockResponse dispatch(RecordedRequest request) {
-            String data = request.getBody().readString(StandardCharsets.UTF_8);
-            System.out.println("URL ====== " + request.getPath());
-            if ("/telemetry/proxy/api/v2/apmtelemetry".equals(request.getPath())) {
-              try {
-                MinimalTelemetryData minimal =
-                    moshi.adapter(MinimalTelemetryData.class).fromJson(data);
-                if ("logs".equals(minimal.request_type)) {
-                  crashEvents.add(moshi.adapter(CrashTelemetryData.class).fromJson(data));
+    @BeforeEach
+    void setUpTracingServer() throws Exception {
+        tempDir = Files.createTempDirectory("dd-smoketest-");
+        crashEvents.clear();
+        tracingServer = new MockWebServer();
+        tracingServer.setDispatcher(new Dispatcher() {
+            @Override
+            public MockResponse dispatch(RecordedRequest request) {
+                String data = request.getBody().readString(StandardCharsets.UTF_8);
+                System.out.println("URL ====== " + request.getPath());
+                if ("/telemetry/proxy/api/v2/apmtelemetry".equals(request.getPath())) {
+                    try {
+                        MinimalTelemetryData minimal =
+                                moshi.adapter(MinimalTelemetryData.class).fromJson(data);
+                        if ("logs".equals(minimal.request_type)) {
+                            crashEvents.add(
+                                    moshi.adapter(CrashTelemetryData.class).fromJson(data));
+                        }
+                    } catch (IOException e) {
+                        System.out.println("Unable to parse: " + e);
+                    }
                 }
-              } catch (IOException e) {
-                System.out.println("Unable to parse: " + e);
-              }
+                System.out.println(data);
+                return new MockResponse().setResponseCode(200);
             }
-            System.out.println(data);
-            return new MockResponse().setResponseCode(200);
-          }
         });
-    OUTPUT.clearMessages();
-  }
+        OUTPUT.clearMessages();
+    }
 
-  @AfterEach
-  void tearDownTracingServer() throws Exception {
-    tracingServer.shutdown();
-    try (Stream<Path> files = Files.walk(tempDir)) {
-      files.sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete);
+    @AfterEach
+    void tearDownTracingServer() throws Exception {
+        tracingServer.shutdown();
+        try (Stream<Path> files = Files.walk(tempDir)) {
+            files.sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete);
+        }
+        Files.deleteIfExists(tempDir);
     }
-    Files.deleteIfExists(tempDir);
-  }
 
-  @AfterAll
-  static void shutdownOutputThreads() {
-    OUTPUT.close();
-  }
+    @AfterAll
+    static void shutdownOutputThreads() {
+        OUTPUT.close();
+    }
 
-  protected long crashDataTimeoutMs() {
-    return 10 * 1000;
-  }
+    protected long crashDataTimeoutMs() {
+        return 10 * 1000;
+    }
 
-  protected String assertCrashPing() throws InterruptedException, IOException {
-    CrashTelemetryData crashData = crashEvents.poll(crashDataTimeoutMs(), TimeUnit.MILLISECONDS);
-    assertNotNull(crashData, "Crash ping not sent");
-    assertTrue(crashData.payload.get(0).tags.contains("is_crash_ping:true"), "Not a crash ping");
-    final Object uuid =
-        moshi.adapter(Map.class).fromJson(crashData.payload.get(0).message).get("crash_uuid");
-    assertNotNull(uuid, "crash uuid not found");
-    return uuid.toString();
-  }
+    protected String assertCrashPing() throws InterruptedException, IOException {
+        CrashTelemetryData crashData = crashEvents.poll(crashDataTimeoutMs(), TimeUnit.MILLISECONDS);
+        assertNotNull(crashData, "Crash ping not sent");
+        assertTrue(crashData.payload.get(0).tags.contains("is_crash_ping:true"), "Not a crash ping");
+        final Object uuid = moshi.adapter(Map.class)
+                .fromJson(crashData.payload.get(0).message)
+                .get("crash_uuid");
+        assertNotNull(uuid, "crash uuid not found");
+        return uuid.toString();
+    }
 
-  protected CrashTelemetryData assertCrashData(String uuid)
-      throws InterruptedException, IOException {
-    CrashTelemetryData crashData = crashEvents.poll(crashDataTimeoutMs(), TimeUnit.MILLISECONDS);
-    assertNotNull(crashData, "Crash data not uploaded");
-    assertTrue(
-        crashData.payload.get(0).tags.contains("severity:crash"), "Expected severity:crash tag");
-    final Object receivedUuid =
-        moshi.adapter(Map.class).fromJson(crashData.payload.get(0).message).get("uuid");
-    assertEquals(uuid, receivedUuid, "crash uuid should match the one sent with the ping");
-    return crashData;
-  }
+    protected CrashTelemetryData assertCrashData(String uuid) throws InterruptedException, IOException {
+        CrashTelemetryData crashData = crashEvents.poll(crashDataTimeoutMs(), TimeUnit.MILLISECONDS);
+        assertNotNull(crashData, "Crash data not uploaded");
+        assertTrue(crashData.payload.get(0).tags.contains("severity:crash"), "Expected severity:crash tag");
+        final Object receivedUuid = moshi.adapter(Map.class)
+                .fromJson(crashData.payload.get(0).message)
+                .get("uuid");
+        assertEquals(uuid, receivedUuid, "crash uuid should match the one sent with the ping");
+        return crashData;
+    }
 
-  static String javaPath() {
-    String sep = FileSystems.getDefault().getSeparator();
-    return System.getProperty("java.home") + sep + "bin" + sep + "java";
-  }
+    static String javaPath() {
+        String sep = FileSystems.getDefault().getSeparator();
+        return System.getProperty("java.home") + sep + "bin" + sep + "java";
+    }
 
-  static String appShadowJar() {
-    return System.getProperty("datadog.smoketest.app.shadowJar.path");
-  }
+    static String appShadowJar() {
+        return System.getProperty("datadog.smoketest.app.shadowJar.path");
+    }
 
-  static String agentShadowJar() {
-    return System.getProperty("datadog.smoketest.agent.shadowJar.path");
-  }
+    static String agentShadowJar() {
+        return System.getProperty("datadog.smoketest.agent.shadowJar.path");
+    }
 }
diff --git a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashTelemetryData.java b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashTelemetryData.java
index 5577c729de0..53d9d3b20f5 100644
--- a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashTelemetryData.java
+++ b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashTelemetryData.java
@@ -3,12 +3,12 @@
 import java.util.List;
 
 public class CrashTelemetryData extends MinimalTelemetryData {
-  List<LogMessage> payload;
+    List<LogMessage> payload;
 
-  public static class LogMessage {
+    public static class LogMessage {
 
-    public String message;
-    public String level;
-    public String tags;
-  }
+        public String message;
+        public String level;
+        public String tags;
+    }
 }
diff --git a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java
index 67f1edb9e0e..99b21934b43 100644
--- a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java
+++ b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java
@@ -24,36 +24,34 @@
  * that ships with OS X by default.
  */
 public class CrashtrackingSmokeTest extends AbstractCrashtrackingSmokeTest {
-  private TestUDPServer udpServer;
-
-  @BeforeAll
-  static void setupAll() {
-    // Only Hotspot based implementation are supported
-    assumeFalse(JavaVirtualMachine.isJ9());
-  }
-
-  @BeforeEach
-  void setUpUdpServer() throws Exception {
-    udpServer = new TestUDPServer();
-    udpServer.start();
-  }
-
-  @AfterEach
-  void tearDownUdpServer() throws Exception {
-    udpServer.close();
-  }
-
-  private static String getExtension() {
-    return OperatingSystem.isWindows() ? "bat" : "sh";
-  }
-
-  @Test
-  void testAutoInjection() throws Exception {
-    assumeTrue(OperatingSystem.isLinux()); // we support only linux ATM
-
-    ProcessBuilder pb =
-        new ProcessBuilder(
-            Arrays.asList(
+    private TestUDPServer udpServer;
+
+    @BeforeAll
+    static void setupAll() {
+        // Only Hotspot based implementation are supported
+        assumeFalse(JavaVirtualMachine.isJ9());
+    }
+
+    @BeforeEach
+    void setUpUdpServer() throws Exception {
+        udpServer = new TestUDPServer();
+        udpServer.start();
+    }
+
+    @AfterEach
+    void tearDownUdpServer() throws Exception {
+        udpServer.close();
+    }
+
+    private static String getExtension() {
+        return OperatingSystem.isWindows() ? "bat" : "sh";
+    }
+
+    @Test
+    void testAutoInjection() throws Exception {
+        assumeTrue(OperatingSystem.isLinux()); // we support only linux ATM
+
+        ProcessBuilder pb = new ProcessBuilder(Arrays.asList(
                 javaPath(),
                 "-javaagent:" + agentShadowJar(),
                 "-Xmx96m",
@@ -65,68 +63,68 @@ void testAutoInjection() throws Exception {
                 "-jar",
                 appShadowJar()));
 
-    pb.environment().put("DD_TRACE_AGENT_PORT", String.valueOf(tracingServer.getPort()));
-
-    Process p = pb.start();
-    OUTPUT.captureOutput(
-        p, LOG_FILE_DIR.resolve("testProcess.testCrashTrackingInjected.log").toFile());
-
-    assertExpectedCrash(p);
-  }
-
-  /*
-   * NOTE: The current implementation of crash tracking doesn't work with ancient version of bash
-   * that ships with OS X by default.
-   */
-  @Test
-  void testCrashTracking() throws Exception {
-    String script = tempDir.resolve("dd_crash_uploader." + getExtension()).toString();
-    String onErrorValue = script + " %p";
-    String errorFile = tempDir.resolve("hs_err.log").toString();
-
-    String onErrorArg =
-        !Platform.isLinux()
-            ? "-XX:OnError=" + onErrorValue
-            : "-Ddd.crashtracking.debug.autoconfig.enable=true"; // on Linux we can automatically
-    // inject the arg
-    List<String> processArgs = new ArrayList<>();
-    processArgs.add(javaPath());
-    processArgs.add("-javaagent:" + agentShadowJar());
-    processArgs.add("-Xmx96m");
-    processArgs.add("-Xms96m");
-    if (!onErrorArg.isEmpty()) {
-      processArgs.add(onErrorArg);
+        pb.environment().put("DD_TRACE_AGENT_PORT", String.valueOf(tracingServer.getPort()));
+
+        Process p = pb.start();
+        OUTPUT.captureOutput(
+                p,
+                LOG_FILE_DIR
+                        .resolve("testProcess.testCrashTrackingInjected.log")
+                        .toFile());
+
+        assertExpectedCrash(p);
+    }
+
+    /*
+     * NOTE: The current implementation of crash tracking doesn't work with ancient version of bash
+     * that ships with OS X by default.
+     */
+    @Test
+    void testCrashTracking() throws Exception {
+        String script = tempDir.resolve("dd_crash_uploader." + getExtension()).toString();
+        String onErrorValue = script + " %p";
+        String errorFile = tempDir.resolve("hs_err.log").toString();
+
+        String onErrorArg = !Platform.isLinux()
+                ? "-XX:OnError=" + onErrorValue
+                : "-Ddd.crashtracking.debug.autoconfig.enable=true"; // on Linux we can automatically
+        // inject the arg
+        List<String> processArgs = new ArrayList<>();
+        processArgs.add(javaPath());
+        processArgs.add("-javaagent:" + agentShadowJar());
+        processArgs.add("-Xmx96m");
+        processArgs.add("-Xms96m");
+        if (!onErrorArg.isEmpty()) {
+            processArgs.add(onErrorArg);
+        }
+        processArgs.add("-XX:ErrorFile=" + errorFile);
+        processArgs.add("-XX:+CrashOnOutOfMemoryError"); // Use OOME to trigger crash
+        processArgs.add("-Ddd.dogstatsd.start-delay=0"); // Minimize the delay to initialize JMX and create the
+        // scripts
+        processArgs.add("-Ddd.trace.enabled=false");
+        processArgs.add("-jar");
+        processArgs.add(appShadowJar());
+        ProcessBuilder pb = new ProcessBuilder(processArgs);
+        pb.environment().put("DD_TRACE_AGENT_PORT", String.valueOf(tracingServer.getPort()));
+
+        Process p = pb.start();
+        OUTPUT.captureOutput(
+                p, LOG_FILE_DIR.resolve("testProcess.testCrashTracking.log").toFile());
+
+        assertExpectedCrash(p);
+        assertCrashData(assertCrashPing());
     }
-    processArgs.add("-XX:ErrorFile=" + errorFile);
-    processArgs.add("-XX:+CrashOnOutOfMemoryError"); // Use OOME to trigger crash
-    processArgs.add(
-        "-Ddd.dogstatsd.start-delay=0"); // Minimize the delay to initialize JMX and create the
-    // scripts
-    processArgs.add("-Ddd.trace.enabled=false");
-    processArgs.add("-jar");
-    processArgs.add(appShadowJar());
-    ProcessBuilder pb = new ProcessBuilder(processArgs);
-    pb.environment().put("DD_TRACE_AGENT_PORT", String.valueOf(tracingServer.getPort()));
-
-    Process p = pb.start();
-    OUTPUT.captureOutput(p, LOG_FILE_DIR.resolve("testProcess.testCrashTracking.log").toFile());
-
-    assertExpectedCrash(p);
-    assertCrashData(assertCrashPing());
-  }
-
-  /*
-   * NOTE: The current implementation of crash tracking doesn't work with ancient version of bash
-   * that ships with OS X by default.
-   */
-  @Test
-  void testCrashTrackingLegacy() throws Exception {
-    String script = tempDir.resolve("dd_crash_uploader." + getExtension()).toString();
-    String errorFile = tempDir.resolve("hs_err.log").toString();
-
-    ProcessBuilder pb =
-        new ProcessBuilder(
-            Arrays.asList(
+
+    /*
+     * NOTE: The current implementation of crash tracking doesn't work with ancient version of bash
+     * that ships with OS X by default.
+     */
+    @Test
+    void testCrashTrackingLegacy() throws Exception {
+        String script = tempDir.resolve("dd_crash_uploader." + getExtension()).toString();
+        String errorFile = tempDir.resolve("hs_err.log").toString();
+
+        ProcessBuilder pb = new ProcessBuilder(Arrays.asList(
                 javaPath(),
                 "-javaagent:" + agentShadowJar(),
                 "-Xmx96m",
@@ -139,73 +137,73 @@ void testCrashTrackingLegacy() throws Exception {
                 "-Ddd.trace.enabled=false",
                 "-jar",
                 appShadowJar()));
-    pb.environment().put("DD_TRACE_AGENT_PORT", String.valueOf(tracingServer.getPort()));
-
-    Process p = pb.start();
-    OUTPUT.captureOutput(
-        p, LOG_FILE_DIR.resolve("testProcess.testCrashTrackingLegacy.log").toFile());
-
-    assertExpectedCrash(p);
-
-    assertCrashData(assertCrashPing());
-  }
-
-  /*
-   * NOTE: The current implementation of crash tracking doesn't work with ancient version of bash
-   * that ships with OS X by default.
-   */
-  @Test
-  void testOomeTracking() throws Exception {
-    String script = tempDir.resolve("dd_oome_notifier." + getExtension()).toString();
-    String onErrorValue = script + " %p";
-    String errorFile = tempDir.resolve("hs_err_pid%p.log").toString();
-
-    String onOOMEArg =
-        !Platform.isLinux()
-            ? "-XX:OnOutOfMemoryError=" + onErrorValue
-            : "-Ddd.crashtracking.debug.autoconfig.enable=true"; // on Linux we can automatically
-    // inject the arg
-
-    List<String> processArgs = new ArrayList<>();
-    processArgs.add(javaPath());
-    processArgs.add("-javaagent:" + agentShadowJar());
-    processArgs.add("-Xmx96m");
-    processArgs.add("-Xms96m");
-    if (!onOOMEArg.isEmpty()) {
-      processArgs.add(onOOMEArg);
+        pb.environment().put("DD_TRACE_AGENT_PORT", String.valueOf(tracingServer.getPort()));
+
+        Process p = pb.start();
+        OUTPUT.captureOutput(
+                p,
+                LOG_FILE_DIR.resolve("testProcess.testCrashTrackingLegacy.log").toFile());
+
+        assertExpectedCrash(p);
+
+        assertCrashData(assertCrashPing());
+    }
+
+    /*
+     * NOTE: The current implementation of crash tracking doesn't work with ancient version of bash
+     * that ships with OS X by default.
+     */
+    @Test
+    void testOomeTracking() throws Exception {
+        String script = tempDir.resolve("dd_oome_notifier." + getExtension()).toString();
+        String onErrorValue = script + " %p";
+        String errorFile = tempDir.resolve("hs_err_pid%p.log").toString();
+
+        String onOOMEArg = !Platform.isLinux()
+                ? "-XX:OnOutOfMemoryError=" + onErrorValue
+                : "-Ddd.crashtracking.debug.autoconfig.enable=true"; // on Linux we can automatically
+        // inject the arg
+
+        List<String> processArgs = new ArrayList<>();
+        processArgs.add(javaPath());
+        processArgs.add("-javaagent:" + agentShadowJar());
+        processArgs.add("-Xmx96m");
+        processArgs.add("-Xms96m");
+        if (!onOOMEArg.isEmpty()) {
+            processArgs.add(onOOMEArg);
+        }
+        processArgs.add("-XX:ErrorFile=" + errorFile);
+        processArgs.add("-XX:+CrashOnOutOfMemoryError"); // Use OOME to trigger crash
+        processArgs.add("-Ddd.dogstatsd.start-delay=0"); // Minimize the delay to initialize JMX and create the
+        // scripts
+        processArgs.add("-Ddd.trace.enabled=false");
+        processArgs.add("-jar");
+        processArgs.add(appShadowJar());
+
+        ProcessBuilder pb = new ProcessBuilder(processArgs);
+        pb.environment().put("DD_DOGSTATSD_PORT", String.valueOf(udpServer.getPort()));
+
+        System.out.println("==> Process args: " + pb.command());
+
+        Process p = pb.start();
+        OUTPUT.captureOutput(
+                p, LOG_FILE_DIR.resolve("testProcess.testOomeTracking.log").toFile());
+
+        assertExpectedCrash(p);
+        assertOOMEvent();
     }
-    processArgs.add("-XX:ErrorFile=" + errorFile);
-    processArgs.add("-XX:+CrashOnOutOfMemoryError"); // Use OOME to trigger crash
-    processArgs.add(
-        "-Ddd.dogstatsd.start-delay=0"); // Minimize the delay to initialize JMX and create the
-    // scripts
-    processArgs.add("-Ddd.trace.enabled=false");
-    processArgs.add("-jar");
-    processArgs.add(appShadowJar());
-
-    ProcessBuilder pb = new ProcessBuilder(processArgs);
-    pb.environment().put("DD_DOGSTATSD_PORT", String.valueOf(udpServer.getPort()));
-
-    System.out.println("==> Process args: " + pb.command());
-
-    Process p = pb.start();
-    OUTPUT.captureOutput(p, LOG_FILE_DIR.resolve("testProcess.testOomeTracking.log").toFile());
-
-    assertExpectedCrash(p);
-    assertOOMEvent();
-  }
-
-  @Test
-  void testCombineTracking() throws Exception {
-    String errorScript = tempDir.resolve("dd_crash_uploader." + getExtension()).toString();
-    String oomeScript = tempDir.resolve("dd_oome_notifier." + getExtension()).toString();
-    String onErrorValue = errorScript + " %p";
-    String onOomeValue = oomeScript + " %p";
-    String errorFile = tempDir.resolve("hs_err.log").toString();
-
-    ProcessBuilder pb =
-        new ProcessBuilder(
-            Arrays.asList(
+
+    @Test
+    void testCombineTracking() throws Exception {
+        String errorScript =
+                tempDir.resolve("dd_crash_uploader." + getExtension()).toString();
+        String oomeScript =
+                tempDir.resolve("dd_oome_notifier." + getExtension()).toString();
+        String onErrorValue = errorScript + " %p";
+        String onOomeValue = oomeScript + " %p";
+        String errorFile = tempDir.resolve("hs_err.log").toString();
+
+        ProcessBuilder pb = new ProcessBuilder(Arrays.asList(
                 javaPath(),
                 "-javaagent:" + agentShadowJar(),
                 "-Xmx96m",
@@ -219,167 +217,170 @@ void testCombineTracking() throws Exception {
                 "-Ddd.trace.enabled=false",
                 "-jar",
                 appShadowJar()));
-    pb.environment().put("DD_TRACE_AGENT_PORT", String.valueOf(tracingServer.getPort()));
-    pb.environment().put("DD_DOGSTATSD_PORT", String.valueOf(udpServer.getPort()));
-
-    Process p = pb.start();
-    OUTPUT.captureOutput(p, LOG_FILE_DIR.resolve("testProcess.testCombineTracking.log").toFile());
-
-    assertExpectedCrash(p);
-    assertCrashData(assertCrashPing());
-    assertOOMEvent();
-  }
-
-  /**
-   * Verifies that the OOME notifier script correctly unsets inherited JVM environment variables.
-   * Without the fix, the child JVM spawned by the script would inherit JDK_JAVA_OPTIONS containing
-   * JMX port-binding flags, causing a BindException and losing the OOME event.
-   *
-   * @see <a href="https://github.com/DataDog/dd-trace-java/issues/10766">#10766</a>
-   */
-  @Test
-  void testOomeTrackingWithInheritedEnvVars() throws Exception {
-    int jmxPort = findFreePort();
-
-    String script = tempDir.resolve("dd_oome_notifier." + getExtension()).toString();
-    String onErrorValue = script + " %p";
-    String errorFile = tempDir.resolve("hs_err_pid%p.log").toString();
-
-    String onOOMEArg =
-        !Platform.isLinux()
-            ? "-XX:OnOutOfMemoryError=" + onErrorValue
-            : "-Ddd.crashtracking.debug.autoconfig.enable=true";
-
-    List<String> processArgs = new ArrayList<>();
-    processArgs.add(javaPath());
-    processArgs.add("-javaagent:" + agentShadowJar());
-    processArgs.add("-Xmx96m");
-    processArgs.add("-Xms96m");
-    if (!onOOMEArg.isEmpty()) {
-      processArgs.add(onOOMEArg);
+        pb.environment().put("DD_TRACE_AGENT_PORT", String.valueOf(tracingServer.getPort()));
+        pb.environment().put("DD_DOGSTATSD_PORT", String.valueOf(udpServer.getPort()));
+
+        Process p = pb.start();
+        OUTPUT.captureOutput(
+                p, LOG_FILE_DIR.resolve("testProcess.testCombineTracking.log").toFile());
+
+        assertExpectedCrash(p);
+        assertCrashData(assertCrashPing());
+        assertOOMEvent();
+    }
+
+    /**
+     * Verifies that the OOME notifier script correctly unsets inherited JVM environment variables.
+     * Without the fix, the child JVM spawned by the script would inherit JDK_JAVA_OPTIONS containing
+     * JMX port-binding flags, causing a BindException and losing the OOME event.
+     *
+     * @see <a href="https://github.com/DataDog/dd-trace-java/issues/10766">#10766</a>
+     */
+    @Test
+    void testOomeTrackingWithInheritedEnvVars() throws Exception {
+        int jmxPort = findFreePort();
+
+        String script = tempDir.resolve("dd_oome_notifier." + getExtension()).toString();
+        String onErrorValue = script + " %p";
+        String errorFile = tempDir.resolve("hs_err_pid%p.log").toString();
+
+        String onOOMEArg = !Platform.isLinux()
+                ? "-XX:OnOutOfMemoryError=" + onErrorValue
+                : "-Ddd.crashtracking.debug.autoconfig.enable=true";
+
+        List<String> processArgs = new ArrayList<>();
+        processArgs.add(javaPath());
+        processArgs.add("-javaagent:" + agentShadowJar());
+        processArgs.add("-Xmx96m");
+        processArgs.add("-Xms96m");
+        if (!onOOMEArg.isEmpty()) {
+            processArgs.add(onOOMEArg);
+        }
+        processArgs.add("-XX:ErrorFile=" + errorFile);
+        processArgs.add("-XX:+CrashOnOutOfMemoryError");
+        processArgs.add("-Ddd.dogstatsd.start-delay=0");
+        processArgs.add("-Ddd.trace.enabled=false");
+        processArgs.add("-jar");
+        processArgs.add(appShadowJar());
+
+        ProcessBuilder pb = new ProcessBuilder(processArgs);
+        pb.environment().put("DD_DOGSTATSD_PORT", String.valueOf(udpServer.getPort()));
+        // Simulate admission controller injecting JMX flags via JDK_JAVA_OPTIONS
+        pb.environment()
+                .put(
+                        "JDK_JAVA_OPTIONS",
+                        "-Dcom.sun.management.jmxremote"
+                                + " -Dcom.sun.management.jmxremote.port="
+                                + jmxPort
+                                + " -Dcom.sun.management.jmxremote.rmi.port="
+                                + jmxPort
+                                + " -Dcom.sun.management.jmxremote.authenticate=false"
+                                + " -Dcom.sun.management.jmxremote.ssl=false");
+
+        System.out.println("==> Process args: " + pb.command());
+        System.out.println("==> JMX port: " + jmxPort);
+
+        Process p = pb.start();
+        OUTPUT.captureOutput(
+                p,
+                LOG_FILE_DIR
+                        .resolve("testProcess.testOomeTrackingWithInheritedEnvVars.log")
+                        .toFile());
+
+        assertExpectedCrash(p);
+        assertOOMEvent();
+    }
+
+    /**
+     * Verifies that the crash uploader script correctly unsets inherited JVM environment variables.
+     * Without the fix, the child JVM spawned by the script would inherit JDK_JAVA_OPTIONS containing
+     * JMX port-binding flags, causing a BindException and losing the crash data.
+     *
+     * @see <a href="https://github.com/DataDog/dd-trace-java/issues/10766">#10766</a>
+     */
+    @Test
+    void testCrashTrackingWithInheritedEnvVars() throws Exception {
+        int jmxPort = findFreePort();
+
+        String script = tempDir.resolve("dd_crash_uploader." + getExtension()).toString();
+        String onErrorValue = script + " %p";
+        String errorFile = tempDir.resolve("hs_err.log").toString();
+
+        String onErrorArg =
+                !Platform.isLinux() ? "-XX:OnError=" + onErrorValue : "-Ddd.crashtracking.debug.autoconfig.enable=true";
+
+        List<String> processArgs = new ArrayList<>();
+        processArgs.add(javaPath());
+        processArgs.add("-javaagent:" + agentShadowJar());
+        processArgs.add("-Xmx96m");
+        processArgs.add("-Xms96m");
+        if (!onErrorArg.isEmpty()) {
+            processArgs.add(onErrorArg);
+        }
+        processArgs.add("-XX:ErrorFile=" + errorFile);
+        processArgs.add("-XX:+CrashOnOutOfMemoryError");
+        processArgs.add("-Ddd.dogstatsd.start-delay=0");
+        processArgs.add("-Ddd.trace.enabled=false");
+        processArgs.add("-jar");
+        processArgs.add(appShadowJar());
+
+        ProcessBuilder pb = new ProcessBuilder(processArgs);
+        pb.environment().put("DD_TRACE_AGENT_PORT", String.valueOf(tracingServer.getPort()));
+        // Simulate admission controller injecting JMX flags via JDK_JAVA_OPTIONS
+        pb.environment()
+                .put(
+                        "JDK_JAVA_OPTIONS",
+                        "-Dcom.sun.management.jmxremote"
+                                + " -Dcom.sun.management.jmxremote.port="
+                                + jmxPort
+                                + " -Dcom.sun.management.jmxremote.rmi.port="
+                                + jmxPort
+                                + " -Dcom.sun.management.jmxremote.authenticate=false"
+                                + " -Dcom.sun.management.jmxremote.ssl=false");
+
+        System.out.println("==> Process args: " + pb.command());
+        System.out.println("==> JMX port: " + jmxPort);
+
+        Process p = pb.start();
+        OUTPUT.captureOutput(
+                p,
+                LOG_FILE_DIR
+                        .resolve("testProcess.testCrashTrackingWithInheritedEnvVars.log")
+                        .toFile());
+
+        assertExpectedCrash(p);
+        assertCrashData(assertCrashPing());
     }
-    processArgs.add("-XX:ErrorFile=" + errorFile);
-    processArgs.add("-XX:+CrashOnOutOfMemoryError");
-    processArgs.add("-Ddd.dogstatsd.start-delay=0");
-    processArgs.add("-Ddd.trace.enabled=false");
-    processArgs.add("-jar");
-    processArgs.add(appShadowJar());
-
-    ProcessBuilder pb = new ProcessBuilder(processArgs);
-    pb.environment().put("DD_DOGSTATSD_PORT", String.valueOf(udpServer.getPort()));
-    // Simulate admission controller injecting JMX flags via JDK_JAVA_OPTIONS
-    pb.environment()
-        .put(
-            "JDK_JAVA_OPTIONS",
-            "-Dcom.sun.management.jmxremote"
-                + " -Dcom.sun.management.jmxremote.port="
-                + jmxPort
-                + " -Dcom.sun.management.jmxremote.rmi.port="
-                + jmxPort
-                + " -Dcom.sun.management.jmxremote.authenticate=false"
-                + " -Dcom.sun.management.jmxremote.ssl=false");
-
-    System.out.println("==> Process args: " + pb.command());
-    System.out.println("==> JMX port: " + jmxPort);
-
-    Process p = pb.start();
-    OUTPUT.captureOutput(
-        p, LOG_FILE_DIR.resolve("testProcess.testOomeTrackingWithInheritedEnvVars.log").toFile());
-
-    assertExpectedCrash(p);
-    assertOOMEvent();
-  }
-
-  /**
-   * Verifies that the crash uploader script correctly unsets inherited JVM environment variables.
-   * Without the fix, the child JVM spawned by the script would inherit JDK_JAVA_OPTIONS containing
-   * JMX port-binding flags, causing a BindException and losing the crash data.
-   *
-   * @see <a href="https://github.com/DataDog/dd-trace-java/issues/10766">#10766</a>
-   */
-  @Test
-  void testCrashTrackingWithInheritedEnvVars() throws Exception {
-    int jmxPort = findFreePort();
-
-    String script = tempDir.resolve("dd_crash_uploader." + getExtension()).toString();
-    String onErrorValue = script + " %p";
-    String errorFile = tempDir.resolve("hs_err.log").toString();
-
-    String onErrorArg =
-        !Platform.isLinux()
-            ? "-XX:OnError=" + onErrorValue
-            : "-Ddd.crashtracking.debug.autoconfig.enable=true";
-
-    List<String> processArgs = new ArrayList<>();
-    processArgs.add(javaPath());
-    processArgs.add("-javaagent:" + agentShadowJar());
-    processArgs.add("-Xmx96m");
-    processArgs.add("-Xms96m");
-    if (!onErrorArg.isEmpty()) {
-      processArgs.add(onErrorArg);
+
+    private static int findFreePort() throws IOException {
+        try (ServerSocket socket = new ServerSocket(0)) {
+            return socket.getLocalPort();
+        }
     }
-    processArgs.add("-XX:ErrorFile=" + errorFile);
-    processArgs.add("-XX:+CrashOnOutOfMemoryError");
-    processArgs.add("-Ddd.dogstatsd.start-delay=0");
-    processArgs.add("-Ddd.trace.enabled=false");
-    processArgs.add("-jar");
-    processArgs.add(appShadowJar());
-
-    ProcessBuilder pb = new ProcessBuilder(processArgs);
-    pb.environment().put("DD_TRACE_AGENT_PORT", String.valueOf(tracingServer.getPort()));
-    // Simulate admission controller injecting JMX flags via JDK_JAVA_OPTIONS
-    pb.environment()
-        .put(
-            "JDK_JAVA_OPTIONS",
-            "-Dcom.sun.management.jmxremote"
-                + " -Dcom.sun.management.jmxremote.port="
-                + jmxPort
-                + " -Dcom.sun.management.jmxremote.rmi.port="
-                + jmxPort
-                + " -Dcom.sun.management.jmxremote.authenticate=false"
-                + " -Dcom.sun.management.jmxremote.ssl=false");
-
-    System.out.println("==> Process args: " + pb.command());
-    System.out.println("==> JMX port: " + jmxPort);
-
-    Process p = pb.start();
-    OUTPUT.captureOutput(
-        p, LOG_FILE_DIR.resolve("testProcess.testCrashTrackingWithInheritedEnvVars.log").toFile());
-
-    assertExpectedCrash(p);
-    assertCrashData(assertCrashPing());
-  }
-
-  private static int findFreePort() throws IOException {
-    try (ServerSocket socket = new ServerSocket(0)) {
-      return socket.getLocalPort();
+
+    private static void assertExpectedCrash(Process p) throws InterruptedException {
+        // exit code -1 means the test application exited prematurely
+        // exit code > 0 means the test application crashed, as expected
+        assertTrue(p.waitFor() > 0, "Application should have crashed");
+    }
+
+    @Override
+    protected CrashTelemetryData assertCrashData(String uuid) throws InterruptedException, IOException {
+        CrashTelemetryData crashData = super.assertCrashData(uuid);
+        assertTrue(crashData.payload.get(0).message.contains("Java heap space"));
+        return crashData;
+    }
+
+    private void assertOOMEvent() throws InterruptedException {
+        String event;
+        do {
+            event = udpServer.getMessages().poll(crashDataTimeoutMs(), TimeUnit.MILLISECONDS);
+        } while (event != null && !event.startsWith("_e"));
+
+        assertNotNull(event, "OOM Event not received");
+
+        assertTrue(event.contains(":OutOfMemoryError"));
+        assertTrue(event.contains("t:error"));
+        assertTrue(event.contains("s:java"));
     }
-  }
-
-  private static void assertExpectedCrash(Process p) throws InterruptedException {
-    // exit code -1 means the test application exited prematurely
-    // exit code > 0 means the test application crashed, as expected
-    assertTrue(p.waitFor() > 0, "Application should have crashed");
-  }
-
-  @Override
-  protected CrashTelemetryData assertCrashData(String uuid)
-      throws InterruptedException, IOException {
-    CrashTelemetryData crashData = super.assertCrashData(uuid);
-    assertTrue(crashData.payload.get(0).message.contains("Java heap space"));
-    return crashData;
-  }
-
-  private void assertOOMEvent() throws InterruptedException {
-    String event;
-    do {
-      event = udpServer.getMessages().poll(crashDataTimeoutMs(), TimeUnit.MILLISECONDS);
-    } while (event != null && !event.startsWith("_e"));
-
-    assertNotNull(event, "OOM Event not received");
-
-    assertTrue(event.contains(":OutOfMemoryError"));
-    assertTrue(event.contains("t:error"));
-    assertTrue(event.contains("s:java"));
-  }
 }
diff --git a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/MinimalTelemetryData.java b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/MinimalTelemetryData.java
index 4940d794de9..b206adf61d7 100644
--- a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/MinimalTelemetryData.java
+++ b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/MinimalTelemetryData.java
@@ -1,5 +1,5 @@
 package datadog.smoketest;
 
 public class MinimalTelemetryData {
-  String request_type;
+    String request_type;
 }
diff --git a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/OpenJ9CrashtrackingSmokeTest.java b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/OpenJ9CrashtrackingSmokeTest.java
index a319b53b2b5..4627afddc98 100644
--- a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/OpenJ9CrashtrackingSmokeTest.java
+++ b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/OpenJ9CrashtrackingSmokeTest.java
@@ -14,77 +14,77 @@
 import org.junit.jupiter.api.Test;
 
 public class OpenJ9CrashtrackingSmokeTest extends AbstractCrashtrackingSmokeTest {
-  @BeforeAll
-  static void setupAll() {
-    assumeTrue(JavaVirtualMachine.isJ9(), "OpenJ9 launcher required");
-  }
+    @BeforeAll
+    static void setupAll() {
+        assumeTrue(JavaVirtualMachine.isJ9(), "OpenJ9 launcher required");
+    }
 
-  @Override
-  protected long crashDataTimeoutMs() {
-    return 30_000;
-  }
+    @Override
+    protected long crashDataTimeoutMs() {
+        return 30_000;
+    }
 
-  /**
-   * Verifies end-to-end OpenJ9 crash tracking:
-   *
-   * <ol>
-   *   <li>The agent detects the {@code -Xdump:tool} argument and writes the crash-uploader script
-   *       to the path specified in {@code exec=}.
-   *   <li>The application crashes itself via {@code sun.misc.Unsafe.putAddress(0L, 0L)}, which
-   *       triggers the dump tool on the {@code gpf} event.
-   *   <li>The crash-uploader uploads the javacore file and the telemetry (ping + data) arrives.
-   * </ol>
-   */
-  @Test
-  void testCrashTracking() throws Exception {
-    String script = tempDir.resolve("dd_crash_uploader.sh").toString();
-    String javacorePattern = tempDir.resolve("javacore.%Y%m%d.%H%M%S.%pid.%seq.txt").toString();
+    /**
+     * Verifies end-to-end OpenJ9 crash tracking:
+     *
+     * <ol>
+     *   <li>The agent detects the {@code -Xdump:tool} argument and writes the crash-uploader script
+     *       to the path specified in {@code exec=}.
+     *   <li>The application crashes itself via {@code sun.misc.Unsafe.putAddress(0L, 0L)}, which
+     *       triggers the dump tool on the {@code gpf} event.
+     *   <li>The crash-uploader uploads the javacore file and the telemetry (ping + data) arrives.
+     * </ol>
+     */
+    @Test
+    void testCrashTracking() throws Exception {
+        String script = tempDir.resolve("dd_crash_uploader.sh").toString();
+        String javacorePattern =
+                tempDir.resolve("javacore.%Y%m%d.%H%M%S.%pid.%seq.txt").toString();
 
-    List<String> jvmArgs = new ArrayList<>();
-    jvmArgs.add(javaPath());
-    jvmArgs.add("-javaagent:" + agentShadowJar());
-    jvmArgs.add("-Xdump:tool:events=gpf+abort,exec=" + script + " %pid");
-    jvmArgs.add("-Xdump:java:file=" + javacorePattern);
-    jvmArgs.add("-Xdump:system:none");
-    jvmArgs.add("-Xdump:snap:none");
-    jvmArgs.add("-Ddd.dogstatsd.start-delay=0");
-    jvmArgs.add("-Ddd.trace.enabled=false");
-    jvmArgs.add("-Ddd.test.crash_script=" + script);
-    jvmArgs.add("-cp");
-    jvmArgs.add(appShadowJar());
-    jvmArgs.add("datadog.smoketest.crashtracking.OpenJ9CrashtrackingTestApplication");
+        List<String> jvmArgs = new ArrayList<>();
+        jvmArgs.add(javaPath());
+        jvmArgs.add("-javaagent:" + agentShadowJar());
+        jvmArgs.add("-Xdump:tool:events=gpf+abort,exec=" + script + " %pid");
+        jvmArgs.add("-Xdump:java:file=" + javacorePattern);
+        jvmArgs.add("-Xdump:system:none");
+        jvmArgs.add("-Xdump:snap:none");
+        jvmArgs.add("-Ddd.dogstatsd.start-delay=0");
+        jvmArgs.add("-Ddd.trace.enabled=false");
+        jvmArgs.add("-Ddd.test.crash_script=" + script);
+        jvmArgs.add("-cp");
+        jvmArgs.add(appShadowJar());
+        jvmArgs.add("datadog.smoketest.crashtracking.OpenJ9CrashtrackingTestApplication");
 
-    ProcessBuilder pb = new ProcessBuilder(jvmArgs);
-    pb.directory(tempDir.toFile());
-    pb.environment().put("DD_TRACE_AGENT_PORT", String.valueOf(tracingServer.getPort()));
+        ProcessBuilder pb = new ProcessBuilder(jvmArgs);
+        pb.directory(tempDir.toFile());
+        pb.environment().put("DD_TRACE_AGENT_PORT", String.valueOf(tracingServer.getPort()));
 
-    Process p = pb.start();
-    OUTPUT.captureOutput(p, LOG_FILE_DIR.resolve("testProcess.openj9CrashTracking.log").toFile());
+        Process p = pb.start();
+        OUTPUT.captureOutput(
+                p, LOG_FILE_DIR.resolve("testProcess.openj9CrashTracking.log").toFile());
 
-    // OpenJ9 runs the dump tool synchronously on crash, so the upload completes before JVM exits
-    assertTrue(p.waitFor(60, TimeUnit.SECONDS), "JVM did not exit within 60s after crash");
-    assertTrue(p.exitValue() != 0, "JVM should have crashed (non-zero exit code)");
+        // OpenJ9 runs the dump tool synchronously on crash, so the upload completes before JVM exits
+        assertTrue(p.waitFor(60, TimeUnit.SECONDS), "JVM did not exit within 60s after crash");
+        assertTrue(p.exitValue() != 0, "JVM should have crashed (non-zero exit code)");
 
-    CrashTelemetryData crashData = assertCrashData(assertCrashPing());
-    assertAdditionalData(crashData);
-  }
+        CrashTelemetryData crashData = assertCrashData(assertCrashPing());
+        assertAdditionalData(crashData);
+    }
 
-  @SuppressWarnings("unchecked")
-  private void assertAdditionalData(CrashTelemetryData crashData) throws IOException {
-    Map<Object, Object> crashDataMap =
-        moshi.adapter(Map.class).fromJson(crashData.payload.get(0).message);
-    Map<Object, Object> error = (Map<Object, Object>) crashDataMap.get("error");
-    assertEquals("SIGSEGV", error.get("kind"));
+    @SuppressWarnings("unchecked")
+    private void assertAdditionalData(CrashTelemetryData crashData) throws IOException {
+        Map<Object, Object> crashDataMap = moshi.adapter(Map.class).fromJson(crashData.payload.get(0).message);
+        Map<Object, Object> error = (Map<Object, Object>) crashDataMap.get("error");
+        assertEquals("SIGSEGV", error.get("kind"));
 
-    Map<Object, Object> stack = (Map<Object, Object>) error.get("stack");
-    List<Object> frames = (List<Object>) stack.get("frames");
-    assertTrue(
-        frames.stream()
-            .filter(Map.class::isInstance)
-            .map(Map.class::cast)
-            .map(frame -> frame.get("function"))
-            .anyMatch(
-                "datadog/smoketest/crashtracking/OpenJ9CrashtrackingTestApplication.main"::equals),
-        "Expected application main frame");
-  }
+        Map<Object, Object> stack = (Map<Object, Object>) error.get("stack");
+        List<Object> frames = (List<Object>) stack.get("frames");
+        assertTrue(
+                frames.stream()
+                        .filter(Map.class::isInstance)
+                        .map(Map.class::cast)
+                        .map(frame -> frame.get("function"))
+                        .anyMatch("datadog/smoketest/crashtracking/OpenJ9CrashtrackingTestApplication.main"::equals),
+                "Expected application main frame");
+    }
 }
diff --git a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/TestUDPServer.java b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/TestUDPServer.java
index a748b907467..9f3c4e50587 100644
--- a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/TestUDPServer.java
+++ b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/TestUDPServer.java
@@ -13,120 +13,115 @@
 
 /** Simple test UDP Server. Not for production use but good enough for tests */
 public class TestUDPServer implements Closeable {
-  public static final int DEFAULT_TIMEOUT_MS = 30 * 1000;
-  public static final int DEFAULT_PACKET_SIZE = 2000;
-
-  private static final byte[] END_MESSAGE = "END____".getBytes();
-
-  private final BlockingQueue<String> dataPackets = new LinkedBlockingQueue<>();
-  private final int timeout;
-  private final int packetSize;
-  private final int port;
-
-  private volatile boolean closed = false;
-  private volatile boolean closing = false;
-  private DatagramSocket socket;
-  private Thread readerThread;
-
-  public TestUDPServer() {
-    this(DEFAULT_TIMEOUT_MS, DEFAULT_PACKET_SIZE, 0);
-  }
-
-  public TestUDPServer(int timeout, int packetSize, int port) {
-    this.timeout = timeout;
-    this.packetSize = packetSize;
-    this.port = port;
-  }
-
-  public synchronized void start() throws SocketException {
-    if (closed) {
-      throw new IllegalStateException("Server closed");
-    }
-    if (socket != null) {
-      // already started
-      return;
-    }
+    public static final int DEFAULT_TIMEOUT_MS = 30 * 1000;
+    public static final int DEFAULT_PACKET_SIZE = 2000;
 
-    socket = new DatagramSocket(port);
-    socket.setSoTimeout(timeout);
-    readerThread =
-        new Thread(
-            () -> {
-              while (!closed && !closing) {
-                byte[] data = new byte[packetSize];
-                try {
-                  DatagramPacket packet = new DatagramPacket(data, packetSize);
-                  socket.receive(packet);
-
-                  byte[] trimmedData = new byte[packet.getLength()];
-                  System.arraycopy(
-                      packet.getData(), packet.getOffset(), trimmedData, 0, packet.getLength());
-
-                  if (Arrays.equals(trimmedData, END_MESSAGE)) {
-                    System.err.println("[TestUDPServer] Received message to close");
-                    break;
-                  }
-                  System.err.println(
-                      "[TestUDPServer] Received message: " + new String(trimmedData));
-                  dataPackets.add(new String(trimmedData));
-                } catch (SocketTimeoutException e) {
-                  System.err.println("[TestUDPServer] Timeout waiting for message");
-                  // ignore no data sent
-                } catch (IOException e) {
-                  System.err.println("[TestUDPServer] Error in receiving packet " + e.getMessage());
-                  e.printStackTrace();
-                  break;
-                }
-              }
-              closed = true;
-            },
-            "Test UDP Server Receiver");
-
-    readerThread.setDaemon(true);
-    readerThread.start();
-  }
-
-  @Override
-  public synchronized void close() {
-    if (closed) {
-      // Already closed
-      return;
-    }
-    if (socket == null) {
-      throw new IllegalStateException("Socket not open");
+    private static final byte[] END_MESSAGE = "END____".getBytes();
+
+    private final BlockingQueue<String> dataPackets = new LinkedBlockingQueue<>();
+    private final int timeout;
+    private final int packetSize;
+    private final int port;
+
+    private volatile boolean closed = false;
+    private volatile boolean closing = false;
+    private DatagramSocket socket;
+    private Thread readerThread;
+
+    public TestUDPServer() {
+        this(DEFAULT_TIMEOUT_MS, DEFAULT_PACKET_SIZE, 0);
     }
 
-    closing = true;
+    public TestUDPServer(int timeout, int packetSize, int port) {
+        this.timeout = timeout;
+        this.packetSize = packetSize;
+        this.port = port;
+    }
 
-    try (DatagramSocket clientSocket = new DatagramSocket()) {
-      clientSocket.send(
-          new DatagramPacket(
-              END_MESSAGE, END_MESSAGE.length, InetAddress.getByName("localhost"), getPort()));
-    } catch (IOException e) {
-      System.err.println(
-          "[TestUDPServer] Exception sending close message. Will rely on socket timeout");
-      e.printStackTrace();
+    public synchronized void start() throws SocketException {
+        if (closed) {
+            throw new IllegalStateException("Server closed");
+        }
+        if (socket != null) {
+            // already started
+            return;
+        }
+
+        socket = new DatagramSocket(port);
+        socket.setSoTimeout(timeout);
+        readerThread = new Thread(
+                () -> {
+                    while (!closed && !closing) {
+                        byte[] data = new byte[packetSize];
+                        try {
+                            DatagramPacket packet = new DatagramPacket(data, packetSize);
+                            socket.receive(packet);
+
+                            byte[] trimmedData = new byte[packet.getLength()];
+                            System.arraycopy(packet.getData(), packet.getOffset(), trimmedData, 0, packet.getLength());
+
+                            if (Arrays.equals(trimmedData, END_MESSAGE)) {
+                                System.err.println("[TestUDPServer] Received message to close");
+                                break;
+                            }
+                            System.err.println("[TestUDPServer] Received message: " + new String(trimmedData));
+                            dataPackets.add(new String(trimmedData));
+                        } catch (SocketTimeoutException e) {
+                            System.err.println("[TestUDPServer] Timeout waiting for message");
+                            // ignore no data sent
+                        } catch (IOException e) {
+                            System.err.println("[TestUDPServer] Error in receiving packet " + e.getMessage());
+                            e.printStackTrace();
+                            break;
+                        }
+                    }
+                    closed = true;
+                },
+                "Test UDP Server Receiver");
+
+        readerThread.setDaemon(true);
+        readerThread.start();
     }
 
-    // Closed state is set by the reader thread. Wait for it to finish
-    try {
-      readerThread.join();
-    } catch (InterruptedException e) {
-      throw new RuntimeException(e);
+    @Override
+    public synchronized void close() {
+        if (closed) {
+            // Already closed
+            return;
+        }
+        if (socket == null) {
+            throw new IllegalStateException("Socket not open");
+        }
+
+        closing = true;
+
+        try (DatagramSocket clientSocket = new DatagramSocket()) {
+            clientSocket.send(
+                    new DatagramPacket(END_MESSAGE, END_MESSAGE.length, InetAddress.getByName("localhost"), getPort()));
+        } catch (IOException e) {
+            System.err.println("[TestUDPServer] Exception sending close message. Will rely on socket timeout");
+            e.printStackTrace();
+        }
+
+        // Closed state is set by the reader thread. Wait for it to finish
+        try {
+            readerThread.join();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
-
-  public int getPort() {
-    if (port != 0) {
-      return port;
-    } else if (socket != null) {
-      return socket.getLocalPort();
-    } else {
-      throw new IllegalStateException("Socket not open and port not explicitly set");
+
+    public int getPort() {
+        if (port != 0) {
+            return port;
+        } else if (socket != null) {
+            return socket.getLocalPort();
+        } else {
+            throw new IllegalStateException("Socket not open and port not explicitly set");
+        }
     }
-  }
 
-  public BlockingQueue<String> getMessages() {
-    return dataPackets;
-  }
+    public BlockingQueue<String> getMessages() {
+        return dataPackets;
+    }
 }
diff --git a/dd-smoke-tests/custom-systemloader/src/main/java/datadog/smoketest/systemloader/TestHelper.java b/dd-smoke-tests/custom-systemloader/src/main/java/datadog/smoketest/systemloader/TestHelper.java
index cbb3c836a17..68d1c1c772d 100644
--- a/dd-smoke-tests/custom-systemloader/src/main/java/datadog/smoketest/systemloader/TestHelper.java
+++ b/dd-smoke-tests/custom-systemloader/src/main/java/datadog/smoketest/systemloader/TestHelper.java
@@ -6,21 +6,21 @@
 import java.net.URL;
 
 public class TestHelper {
-  @SuppressForbidden
-  static URL[] classPath() {
-    String[] paths = System.getProperty("java.class.path").split(File.pathSeparator);
-    URL[] classPath = new URL[paths.length];
-    for (int i = 0; i < paths.length; i++) {
-      classPath[i] = toURL(paths[i]);
+    @SuppressForbidden
+    static URL[] classPath() {
+        String[] paths = System.getProperty("java.class.path").split(File.pathSeparator);
+        URL[] classPath = new URL[paths.length];
+        for (int i = 0; i < paths.length; i++) {
+            classPath[i] = toURL(paths[i]);
+        }
+        return classPath;
     }
-    return classPath;
-  }
 
-  static URL toURL(String path) {
-    try {
-      return new File(path).toURI().toURL();
-    } catch (MalformedURLException e) {
-      throw new IllegalArgumentException(e);
+    static URL toURL(String path) {
+        try {
+            return new File(path).toURI().toURL();
+        } catch (MalformedURLException e) {
+            throw new IllegalArgumentException(e);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/custom-systemloader/src/main/java/datadog/smoketest/systemloader/TestLoader.java b/dd-smoke-tests/custom-systemloader/src/main/java/datadog/smoketest/systemloader/TestLoader.java
index 5ef4779c557..00a129a6f96 100644
--- a/dd-smoke-tests/custom-systemloader/src/main/java/datadog/smoketest/systemloader/TestLoader.java
+++ b/dd-smoke-tests/custom-systemloader/src/main/java/datadog/smoketest/systemloader/TestLoader.java
@@ -4,49 +4,49 @@
 
 public class TestLoader extends URLClassLoader {
 
-  public TestLoader(ClassLoader parent) {
-    super(TestHelper.classPath(), parent);
-    try {
-      // trigger loading from this class-loader before our agent is installed
-      loadClass("sample.app.Resource$Test1");
-      loadClass("sample.app.Resource$Test2");
-      loadClass("sample.app.Resource$Test3");
-    } catch (ClassNotFoundException e) {
-      throw new RuntimeException(e);
+    public TestLoader(ClassLoader parent) {
+        super(TestHelper.classPath(), parent);
+        try {
+            // trigger loading from this class-loader before our agent is installed
+            loadClass("sample.app.Resource$Test1");
+            loadClass("sample.app.Resource$Test2");
+            loadClass("sample.app.Resource$Test3");
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  @Override
-  protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-    if (name.startsWith("java")
-        || name.startsWith("jdk")
-        || name.startsWith("sun")
-        || name.startsWith("com.sun")
-        || name.startsWith("com.ibm")
-        || name.startsWith("openj9")) {
-      System.out.println("Loading " + name + " from JDK");
-      return super.loadClass(name, resolve); // delegate JDK classes to boot-class-path
-    } else {
-      System.out.println("Loading " + name + " from TestLoader");
-      return loadLocalClass(name, resolve); // otherwise only look locally for the type
+    @Override
+    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+        if (name.startsWith("java")
+                || name.startsWith("jdk")
+                || name.startsWith("sun")
+                || name.startsWith("com.sun")
+                || name.startsWith("com.ibm")
+                || name.startsWith("openj9")) {
+            System.out.println("Loading " + name + " from JDK");
+            return super.loadClass(name, resolve); // delegate JDK classes to boot-class-path
+        } else {
+            System.out.println("Loading " + name + " from TestLoader");
+            return loadLocalClass(name, resolve); // otherwise only look locally for the type
+        }
     }
-  }
 
-  private Class<?> loadLocalClass(String name, boolean resolve) throws ClassNotFoundException {
-    synchronized (getClassLoadingLock(name)) {
-      Class<?> clazz = findLoadedClass(name);
-      if (null == clazz) {
-        clazz = findClass(name);
-      }
-      if (resolve) {
-        resolveClass(clazz);
-      }
-      return clazz;
+    private Class<?> loadLocalClass(String name, boolean resolve) throws ClassNotFoundException {
+        synchronized (getClassLoadingLock(name)) {
+            Class<?> clazz = findLoadedClass(name);
+            if (null == clazz) {
+                clazz = findClass(name);
+            }
+            if (resolve) {
+                resolveClass(clazz);
+            }
+            return clazz;
+        }
     }
-  }
 
-  // see https://docs.oracle.com/javase/9/docs/api/java/lang/instrument/package-summary.html
-  void appendToClassPathForInstrumentation(String path) {
-    addURL(TestHelper.toURL(path));
-  }
+    // see https://docs.oracle.com/javase/9/docs/api/java/lang/instrument/package-summary.html
+    void appendToClassPathForInstrumentation(String path) {
+        addURL(TestHelper.toURL(path));
+    }
 }
diff --git a/dd-smoke-tests/custom-systemloader/src/main/java/sample/app/App.java b/dd-smoke-tests/custom-systemloader/src/main/java/sample/app/App.java
index c1d34cb36e5..34b5b566e87 100644
--- a/dd-smoke-tests/custom-systemloader/src/main/java/sample/app/App.java
+++ b/dd-smoke-tests/custom-systemloader/src/main/java/sample/app/App.java
@@ -1,7 +1,7 @@
 package sample.app;
 
 public class App {
-  public static void main(final String[] args) {
-    System.out.println("FIN");
-  }
+    public static void main(final String[] args) {
+        System.out.println("FIN");
+    }
 }
diff --git a/dd-smoke-tests/custom-systemloader/src/main/java/sample/app/Resource.java b/dd-smoke-tests/custom-systemloader/src/main/java/sample/app/Resource.java
index e23c23bacab..a6c04ef04b2 100644
--- a/dd-smoke-tests/custom-systemloader/src/main/java/sample/app/Resource.java
+++ b/dd-smoke-tests/custom-systemloader/src/main/java/sample/app/Resource.java
@@ -7,45 +7,45 @@
 // Sample JAX-RS resource that we expect to be instrumented
 @Path("/ignored")
 public interface Resource {
-  @Path("ignored")
-  String hello(final String name);
+    @Path("ignored")
+    String hello(final String name);
 
-  @Path("/test")
-  interface SubResource extends Cloneable, Resource {
-    @Override
-    @POST
-    @Path("/hello/{name}")
-    String hello(@PathParam("name") final String name);
-  }
-
-  class Test1 implements SubResource {
-    @Override
-    public String hello(final String name) {
-      return "Test1 " + name + "!";
+    @Path("/test")
+    interface SubResource extends Cloneable, Resource {
+        @Override
+        @POST
+        @Path("/hello/{name}")
+        String hello(@PathParam("name") final String name);
     }
-  }
 
-  @Path("/test2")
-  class Test2 implements SubResource {
-    @Override
-    public String hello(final String name) {
-      return "Test2 " + name + "!";
+    class Test1 implements SubResource {
+        @Override
+        public String hello(final String name) {
+            return "Test1 " + name + "!";
+        }
     }
-  }
 
-  @Path("/test3")
-  class Test3 implements SubResource {
-    @Override
-    @POST
-    @Path("/hi/{name}")
-    public String hello(@PathParam("name") final String name) {
-      return "Test3 " + name + "!";
+    @Path("/test2")
+    class Test2 implements SubResource {
+        @Override
+        public String hello(final String name) {
+            return "Test2 " + name + "!";
+        }
     }
 
-    @POST
-    @Path("/nested")
-    public String nested() {
-      return hello("nested");
+    @Path("/test3")
+    class Test3 implements SubResource {
+        @Override
+        @POST
+        @Path("/hi/{name}")
+        public String hello(@PathParam("name") final String name) {
+            return "Test3 " + name + "!";
+        }
+
+        @POST
+        @Path("/nested")
+        public String nested() {
+            return hello("nested");
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/datastreams/kafkaschemaregistry/src/main/java/datadog/smoketest/datastreams/kafkaschemaregistry/KafkaProducerWithSchemaRegistry.java b/dd-smoke-tests/datastreams/kafkaschemaregistry/src/main/java/datadog/smoketest/datastreams/kafkaschemaregistry/KafkaProducerWithSchemaRegistry.java
index cce594f6662..743b890f854 100644
--- a/dd-smoke-tests/datastreams/kafkaschemaregistry/src/main/java/datadog/smoketest/datastreams/kafkaschemaregistry/KafkaProducerWithSchemaRegistry.java
+++ b/dd-smoke-tests/datastreams/kafkaschemaregistry/src/main/java/datadog/smoketest/datastreams/kafkaschemaregistry/KafkaProducerWithSchemaRegistry.java
@@ -11,61 +11,60 @@
 import org.slf4j.LoggerFactory;
 
 public class KafkaProducerWithSchemaRegistry {
-  private static final Logger log = LoggerFactory.getLogger(KafkaProducerWithSchemaRegistry.class);
+    private static final Logger log = LoggerFactory.getLogger(KafkaProducerWithSchemaRegistry.class);
 
-  public static void main(String[] args) {
-    produce();
-  }
+    public static void main(String[] args) {
+        produce();
+    }
 
-  public static void produce() {
-    String topicName = "no_schema_topic";
-    String apiKey = System.getenv("CONFLUENT_API_KEY");
-    String apiSecret = System.getenv("CONFLUENT_API_SECRET");
-    String bootstrapServers = System.getenv("CONFLUENT_SERVERS");
-    String schemaRegistryUrl = System.getenv("SCHEMA_REGISTRY_URL");
+    public static void produce() {
+        String topicName = "no_schema_topic";
+        String apiKey = System.getenv("CONFLUENT_API_KEY");
+        String apiSecret = System.getenv("CONFLUENT_API_SECRET");
+        String bootstrapServers = System.getenv("CONFLUENT_SERVERS");
+        String schemaRegistryUrl = System.getenv("SCHEMA_REGISTRY_URL");
 
-    Properties properties = new Properties();
-    properties.setProperty(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
-    properties.setProperty(
-        ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
-    properties.setProperty(
-        ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
-        "io.confluent.kafka.serializers.protobuf.KafkaProtobufSerializer");
-    properties.setProperty("schema.registry.url", schemaRegistryUrl);
-    properties.setProperty(
-        "sasl.jaas.config",
-        "org.apache.kafka.common.security.plain.PlainLoginModule required username=\""
-            + apiKey
-            + "\" password=\""
-            + apiSecret
-            + "\";");
-    properties.setProperty("sasl.mechanism", "PLAIN");
-    properties.setProperty("security.protocol", "SASL_SSL");
-    properties.setProperty("basic.auth.credentials.source", "USER_INFO");
-    properties.setProperty("basic.auth.user.info", System.getenv("SCHEMA_REGISTRY_AUTH"));
+        Properties properties = new Properties();
+        properties.setProperty(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
+        properties.setProperty(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+        properties.setProperty(
+                ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
+                "io.confluent.kafka.serializers.protobuf.KafkaProtobufSerializer");
+        properties.setProperty("schema.registry.url", schemaRegistryUrl);
+        properties.setProperty(
+                "sasl.jaas.config",
+                "org.apache.kafka.common.security.plain.PlainLoginModule required username=\""
+                        + apiKey
+                        + "\" password=\""
+                        + apiSecret
+                        + "\";");
+        properties.setProperty("sasl.mechanism", "PLAIN");
+        properties.setProperty("security.protocol", "SASL_SSL");
+        properties.setProperty("basic.auth.credentials.source", "USER_INFO");
+        properties.setProperty("basic.auth.user.info", System.getenv("SCHEMA_REGISTRY_AUTH"));
 
-    Producer<String, MyMessage> producer =
-        new org.apache.kafka.clients.producer.KafkaProducer<>(properties);
+        Producer<String, MyMessage> producer = new org.apache.kafka.clients.producer.KafkaProducer<>(properties);
 
-    Duration duration = Duration.newBuilder().setSeconds(10).build();
-    log.info("duration is {}", duration.getSeconds());
+        Duration duration = Duration.newBuilder().setSeconds(10).build();
+        log.info("duration is {}", duration.getSeconds());
 
-    try {
-      for (int i = 1; i <= 20; i++) {
+        try {
+            for (int i = 1; i <= 20; i++) {
 
-        MyMessage message =
-            MyMessage.newBuilder().setId("1").setValue("Hello from Protobuf!").build();
+                MyMessage message = MyMessage.newBuilder()
+                        .setId("1")
+                        .setValue("Hello from Protobuf!")
+                        .build();
 
-        ProducerRecord<String, MyMessage> record =
-            new ProducerRecord<>(topicName, "testkey", message);
-        producer.send(record);
-        Thread.sleep(1500);
-        log.info("produced message");
-      }
-    } catch (Exception e) {
-      log.error("KafkaProducerWithSchemaRegistry failed", e);
-    } finally {
-      producer.close();
+                ProducerRecord<String, MyMessage> record = new ProducerRecord<>(topicName, "testkey", message);
+                producer.send(record);
+                Thread.sleep(1500);
+                log.info("produced message");
+            }
+        } catch (Exception e) {
+            log.error("KafkaProducerWithSchemaRegistry failed", e);
+        } finally {
+            producer.close();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/datastreams/kafkaschemaregistry/src/main/java/datadog/smoketest/datastreams/kafkaschemaregistry/Message.java b/dd-smoke-tests/datastreams/kafkaschemaregistry/src/main/java/datadog/smoketest/datastreams/kafkaschemaregistry/Message.java
index 0739a00c81e..866dd7125e1 100644
--- a/dd-smoke-tests/datastreams/kafkaschemaregistry/src/main/java/datadog/smoketest/datastreams/kafkaschemaregistry/Message.java
+++ b/dd-smoke-tests/datastreams/kafkaschemaregistry/src/main/java/datadog/smoketest/datastreams/kafkaschemaregistry/Message.java
@@ -5,771 +5,746 @@
 
 // Protobuf Java Version: 3.25.2
 public final class Message {
-  private Message() {}
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-
-  public interface MyMessageOrBuilder
-      extends
-      // @@protoc_insertion_point(interface_extends:MyMessage)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * <code>string id = 1;</code>
-     *
-     * @return The id.
-     */
-    java.lang.String getId();
-
-    /**
-     * <code>string id = 1;</code>
-     *
-     * @return The bytes for id.
-     */
-    com.google.protobuf.ByteString getIdBytes();
-
-    /**
-     * <code>string value = 2;</code>
-     *
-     * @return The value.
-     */
-    java.lang.String getValue();
-
-    /**
-     * <code>string value = 2;</code>
-     *
-     * @return The bytes for value.
-     */
-    com.google.protobuf.ByteString getValueBytes();
-  }
-
-  /** Protobuf type {@code MyMessage} */
-  public static final class MyMessage extends com.google.protobuf.GeneratedMessageV3
-      implements
-      // @@protoc_insertion_point(message_implements:MyMessage)
-      MyMessageOrBuilder {
-    private static final long serialVersionUID = 0L;
-
-    // Use MyMessage.newBuilder() to construct.
-    private MyMessage(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-      super(builder);
-    }
+    private Message() {}
 
-    private MyMessage() {
-      id_ = "";
-      value_ = "";
-    }
+    public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
 
-    @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
-      return new MyMessage();
+    public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
+        registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
     }
 
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return Message.internal_static_MyMessage_descriptor;
-    }
+    public interface MyMessageOrBuilder
+            extends
+            // @@protoc_insertion_point(interface_extends:MyMessage)
+            com.google.protobuf.MessageOrBuilder {
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return Message.internal_static_MyMessage_fieldAccessorTable.ensureFieldAccessorsInitialized(
-          Message.MyMessage.class, Message.MyMessage.Builder.class);
-    }
+        /**
+         * <code>string id = 1;</code>
+         *
+         * @return The id.
+         */
+        java.lang.String getId();
 
-    public static final int ID_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object id_ = "";
-
-    /**
-     * <code>string id = 1;</code>
-     *
-     * @return The id.
-     */
-    @java.lang.Override
-    public java.lang.String getId() {
-      java.lang.Object ref = id_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        id_ = s;
-        return s;
-      }
-    }
+        /**
+         * <code>string id = 1;</code>
+         *
+         * @return The bytes for id.
+         */
+        com.google.protobuf.ByteString getIdBytes();
 
-    /**
-     * <code>string id = 1;</code>
-     *
-     * @return The bytes for id.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString getIdBytes() {
-      java.lang.Object ref = id_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
-        id_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
+        /**
+         * <code>string value = 2;</code>
+         *
+         * @return The value.
+         */
+        java.lang.String getValue();
 
-    public static final int VALUE_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object value_ = "";
-
-    /**
-     * <code>string value = 2;</code>
-     *
-     * @return The value.
-     */
-    @java.lang.Override
-    public java.lang.String getValue() {
-      java.lang.Object ref = value_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        value_ = s;
-        return s;
-      }
+        /**
+         * <code>string value = 2;</code>
+         *
+         * @return The bytes for value.
+         */
+        com.google.protobuf.ByteString getValueBytes();
     }
 
-    /**
-     * <code>string value = 2;</code>
-     *
-     * @return The bytes for value.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString getValueBytes() {
-      java.lang.Object ref = value_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
-        value_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
+    /** Protobuf type {@code MyMessage} */
+    public static final class MyMessage extends com.google.protobuf.GeneratedMessageV3
+            implements
+            // @@protoc_insertion_point(message_implements:MyMessage)
+            MyMessageOrBuilder {
+        private static final long serialVersionUID = 0L;
+
+        // Use MyMessage.newBuilder() to construct.
+        private MyMessage(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+            super(builder);
+        }
 
-    private byte memoizedIsInitialized = -1;
+        private MyMessage() {
+            id_ = "";
+            value_ = "";
+        }
 
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
+        @java.lang.Override
+        @SuppressWarnings({"unused"})
+        protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+            return new MyMessage();
+        }
 
-      memoizedIsInitialized = 1;
-      return true;
-    }
+        public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+            return Message.internal_static_MyMessage_descriptor;
+        }
 
-    @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, id_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(value_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, value_);
-      }
-      getUnknownFields().writeTo(output);
-    }
+        @java.lang.Override
+        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() {
+            return Message.internal_static_MyMessage_fieldAccessorTable.ensureFieldAccessorsInitialized(
+                    Message.MyMessage.class, Message.MyMessage.Builder.class);
+        }
 
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, id_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(value_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, value_);
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
+        public static final int ID_FIELD_NUMBER = 1;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object id_ = "";
+
+        /**
+         * <code>string id = 1;</code>
+         *
+         * @return The id.
+         */
+        @java.lang.Override
+        public java.lang.String getId() {
+            java.lang.Object ref = id_;
+            if (ref instanceof java.lang.String) {
+                return (java.lang.String) ref;
+            } else {
+                com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+                java.lang.String s = bs.toStringUtf8();
+                id_ = s;
+                return s;
+            }
+        }
 
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-        return true;
-      }
-      if (!(obj instanceof Message.MyMessage)) {
-        return super.equals(obj);
-      }
-      Message.MyMessage other = (Message.MyMessage) obj;
-
-      if (!getId().equals(other.getId())) return false;
-      if (!getValue().equals(other.getValue())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
-      return true;
-    }
+        /**
+         * <code>string id = 1;</code>
+         *
+         * @return The bytes for id.
+         */
+        @java.lang.Override
+        public com.google.protobuf.ByteString getIdBytes() {
+            java.lang.Object ref = id_;
+            if (ref instanceof java.lang.String) {
+                com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+                id_ = b;
+                return b;
+            } else {
+                return (com.google.protobuf.ByteString) ref;
+            }
+        }
 
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ID_FIELD_NUMBER;
-      hash = (53 * hash) + getId().hashCode();
-      hash = (37 * hash) + VALUE_FIELD_NUMBER;
-      hash = (53 * hash) + getValue().hashCode();
-      hash = (29 * hash) + getUnknownFields().hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
+        public static final int VALUE_FIELD_NUMBER = 2;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object value_ = "";
+
+        /**
+         * <code>string value = 2;</code>
+         *
+         * @return The value.
+         */
+        @java.lang.Override
+        public java.lang.String getValue() {
+            java.lang.Object ref = value_;
+            if (ref instanceof java.lang.String) {
+                return (java.lang.String) ref;
+            } else {
+                com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+                java.lang.String s = bs.toStringUtf8();
+                value_ = s;
+                return s;
+            }
+        }
 
-    public static Message.MyMessage parseFrom(java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
+        /**
+         * <code>string value = 2;</code>
+         *
+         * @return The bytes for value.
+         */
+        @java.lang.Override
+        public com.google.protobuf.ByteString getValueBytes() {
+            java.lang.Object ref = value_;
+            if (ref instanceof java.lang.String) {
+                com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+                value_ = b;
+                return b;
+            } else {
+                return (com.google.protobuf.ByteString) ref;
+            }
+        }
 
-    public static Message.MyMessage parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
+        private byte memoizedIsInitialized = -1;
 
-    public static Message.MyMessage parseFrom(com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
+        @java.lang.Override
+        public final boolean isInitialized() {
+            byte isInitialized = memoizedIsInitialized;
+            if (isInitialized == 1) return true;
+            if (isInitialized == 0) return false;
 
-    public static Message.MyMessage parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
+            memoizedIsInitialized = 1;
+            return true;
+        }
 
-    public static Message.MyMessage parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
+        @java.lang.Override
+        public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+            if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
+                com.google.protobuf.GeneratedMessageV3.writeString(output, 1, id_);
+            }
+            if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(value_)) {
+                com.google.protobuf.GeneratedMessageV3.writeString(output, 2, value_);
+            }
+            getUnknownFields().writeTo(output);
+        }
 
-    public static Message.MyMessage parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
+        @java.lang.Override
+        public int getSerializedSize() {
+            int size = memoizedSize;
+            if (size != -1) return size;
 
-    public static Message.MyMessage parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
-    }
+            size = 0;
+            if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
+                size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, id_);
+            }
+            if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(value_)) {
+                size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, value_);
+            }
+            size += getUnknownFields().getSerializedSize();
+            memoizedSize = size;
+            return size;
+        }
 
-    public static Message.MyMessage parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
-    }
+        @java.lang.Override
+        public boolean equals(final java.lang.Object obj) {
+            if (obj == this) {
+                return true;
+            }
+            if (!(obj instanceof Message.MyMessage)) {
+                return super.equals(obj);
+            }
+            Message.MyMessage other = (Message.MyMessage) obj;
 
-    public static Message.MyMessage parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
-    }
+            if (!getId().equals(other.getId())) return false;
+            if (!getValue().equals(other.getValue())) return false;
+            if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+            return true;
+        }
 
-    public static Message.MyMessage parseDelimitedFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
-    }
+        @java.lang.Override
+        public int hashCode() {
+            if (memoizedHashCode != 0) {
+                return memoizedHashCode;
+            }
+            int hash = 41;
+            hash = (19 * hash) + getDescriptor().hashCode();
+            hash = (37 * hash) + ID_FIELD_NUMBER;
+            hash = (53 * hash) + getId().hashCode();
+            hash = (37 * hash) + VALUE_FIELD_NUMBER;
+            hash = (53 * hash) + getValue().hashCode();
+            hash = (29 * hash) + getUnknownFields().hashCode();
+            memoizedHashCode = hash;
+            return hash;
+        }
 
-    public static Message.MyMessage parseFrom(com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
-    }
+        public static Message.MyMessage parseFrom(java.nio.ByteBuffer data)
+                throws com.google.protobuf.InvalidProtocolBufferException {
+            return PARSER.parseFrom(data);
+        }
 
-    public static Message.MyMessage parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
-    }
+        public static Message.MyMessage parseFrom(
+                java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+                throws com.google.protobuf.InvalidProtocolBufferException {
+            return PARSER.parseFrom(data, extensionRegistry);
+        }
 
-    @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
+        public static Message.MyMessage parseFrom(com.google.protobuf.ByteString data)
+                throws com.google.protobuf.InvalidProtocolBufferException {
+            return PARSER.parseFrom(data);
+        }
 
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
+        public static Message.MyMessage parseFrom(
+                com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+                throws com.google.protobuf.InvalidProtocolBufferException {
+            return PARSER.parseFrom(data, extensionRegistry);
+        }
 
-    public static Builder newBuilder(Message.MyMessage prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
+        public static Message.MyMessage parseFrom(byte[] data)
+                throws com.google.protobuf.InvalidProtocolBufferException {
+            return PARSER.parseFrom(data);
+        }
 
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
-    }
+        public static Message.MyMessage parseFrom(
+                byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+                throws com.google.protobuf.InvalidProtocolBufferException {
+            return PARSER.parseFrom(data, extensionRegistry);
+        }
 
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
+        public static Message.MyMessage parseFrom(java.io.InputStream input) throws java.io.IOException {
+            return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+        }
 
-    /** Protobuf type {@code MyMessage} */
-    public static final class Builder
-        extends com.google.protobuf.GeneratedMessageV3.Builder<Builder>
-        implements
-        // @@protoc_insertion_point(builder_implements:MyMessage)
-        Message.MyMessageOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return Message.internal_static_MyMessage_descriptor;
-      }
-
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return Message.internal_static_MyMessage_fieldAccessorTable.ensureFieldAccessorsInitialized(
-            Message.MyMessage.class, Message.MyMessage.Builder.class);
-      }
-
-      // Construct using Message.MyMessage.newBuilder()
-      private Builder() {}
-
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-      }
-
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        bitField0_ = 0;
-        id_ = "";
-        value_ = "";
-        return this;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return Message.internal_static_MyMessage_descriptor;
-      }
-
-      @java.lang.Override
-      public Message.MyMessage getDefaultInstanceForType() {
-        return Message.MyMessage.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public Message.MyMessage build() {
-        Message.MyMessage result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      @java.lang.Override
-      public Message.MyMessage buildPartial() {
-        Message.MyMessage result = new Message.MyMessage(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartial0(Message.MyMessage result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.id_ = id_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.value_ = value_;
-        }
-      }
-
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-        return super.setField(field, value);
-      }
-
-      @java.lang.Override
-      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-
-      @java.lang.Override
-      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-
-      @java.lang.Override
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-
-      @java.lang.Override
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-        return super.addRepeatedField(field, value);
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof Message.MyMessage) {
-          return mergeFrom((Message.MyMessage) other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(Message.MyMessage other) {
-        if (other == Message.MyMessage.getDefaultInstance()) return this;
-        if (!other.getId().isEmpty()) {
-          id_ = other.id_;
-          bitField0_ |= 0x00000001;
-          onChanged();
-        }
-        if (!other.getValue().isEmpty()) {
-          value_ = other.value_;
-          bitField0_ |= 0x00000002;
-          onChanged();
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  id_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
-                  break;
-                } // case 10
-              case 18:
-                {
-                  value_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
-                  break;
-                } // case 18
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.unwrapIOException();
-        } finally {
-          onChanged();
-        } // finally
-        return this;
-      }
-
-      private int bitField0_;
-
-      private java.lang.Object id_ = "";
-
-      /**
-       * <code>string id = 1;</code>
-       *
-       * @return The id.
-       */
-      public java.lang.String getId() {
-        java.lang.Object ref = id_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          id_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-
-      /**
-       * <code>string id = 1;</code>
-       *
-       * @return The bytes for id.
-       */
-      public com.google.protobuf.ByteString getIdBytes() {
-        java.lang.Object ref = id_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
-          id_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-
-      /**
-       * <code>string id = 1;</code>
-       *
-       * @param value The id to set.
-       * @return This builder for chaining.
-       */
-      public Builder setId(java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        id_ = value;
-        bitField0_ |= 0x00000001;
-        onChanged();
-        return this;
-      }
-
-      /**
-       * <code>string id = 1;</code>
-       *
-       * @return This builder for chaining.
-       */
-      public Builder clearId() {
-        id_ = getDefaultInstance().getId();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      /**
-       * <code>string id = 1;</code>
-       *
-       * @param value The bytes for id to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIdBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        checkByteStringIsUtf8(value);
-        id_ = value;
-        bitField0_ |= 0x00000001;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object value_ = "";
-
-      /**
-       * <code>string value = 2;</code>
-       *
-       * @return The value.
-       */
-      public java.lang.String getValue() {
-        java.lang.Object ref = value_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          value_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-
-      /**
-       * <code>string value = 2;</code>
-       *
-       * @return The bytes for value.
-       */
-      public com.google.protobuf.ByteString getValueBytes() {
-        java.lang.Object ref = value_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
-          value_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-
-      /**
-       * <code>string value = 2;</code>
-       *
-       * @param value The value to set.
-       * @return This builder for chaining.
-       */
-      public Builder setValue(java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        value_ = value;
-        bitField0_ |= 0x00000002;
-        onChanged();
-        return this;
-      }
-
-      /**
-       * <code>string value = 2;</code>
-       *
-       * @return This builder for chaining.
-       */
-      public Builder clearValue() {
-        value_ = getDefaultInstance().getValue();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
-
-      /**
-       * <code>string value = 2;</code>
-       *
-       * @param value The bytes for value to set.
-       * @return This builder for chaining.
-       */
-      public Builder setValueBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        checkByteStringIsUtf8(value);
-        value_ = value;
-        bitField0_ |= 0x00000002;
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-      // @@protoc_insertion_point(builder_scope:MyMessage)
-    }
+        public static Message.MyMessage parseFrom(
+                java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+                throws java.io.IOException {
+            return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input, extensionRegistry);
+        }
 
-    // @@protoc_insertion_point(class_scope:MyMessage)
-    private static final Message.MyMessage DEFAULT_INSTANCE;
+        public static Message.MyMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+            return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+        }
 
-    static {
-      DEFAULT_INSTANCE = new Message.MyMessage();
-    }
+        public static Message.MyMessage parseDelimitedFrom(
+                java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+                throws java.io.IOException {
+            return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+                    PARSER, input, extensionRegistry);
+        }
 
-    public static Message.MyMessage getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
+        public static Message.MyMessage parseFrom(com.google.protobuf.CodedInputStream input)
+                throws java.io.IOException {
+            return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+        }
 
-    private static final com.google.protobuf.Parser<MyMessage> PARSER =
-        new com.google.protobuf.AbstractParser<MyMessage>() {
-          @java.lang.Override
-          public MyMessage parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
-          }
-        };
+        public static Message.MyMessage parseFrom(
+                com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+                throws java.io.IOException {
+            return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input, extensionRegistry);
+        }
+
+        @java.lang.Override
+        public Builder newBuilderForType() {
+            return newBuilder();
+        }
+
+        public static Builder newBuilder() {
+            return DEFAULT_INSTANCE.toBuilder();
+        }
 
-    public static com.google.protobuf.Parser<MyMessage> parser() {
-      return PARSER;
+        public static Builder newBuilder(Message.MyMessage prototype) {
+            return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+        }
+
+        @java.lang.Override
+        public Builder toBuilder() {
+            return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+        }
+
+        @java.lang.Override
+        protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+            Builder builder = new Builder(parent);
+            return builder;
+        }
+
+        /** Protobuf type {@code MyMessage} */
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder>
+                implements
+                // @@protoc_insertion_point(builder_implements:MyMessage)
+                Message.MyMessageOrBuilder {
+            public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+                return Message.internal_static_MyMessage_descriptor;
+            }
+
+            @java.lang.Override
+            protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() {
+                return Message.internal_static_MyMessage_fieldAccessorTable.ensureFieldAccessorsInitialized(
+                        Message.MyMessage.class, Message.MyMessage.Builder.class);
+            }
+
+            // Construct using Message.MyMessage.newBuilder()
+            private Builder() {}
+
+            private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+                super(parent);
+            }
+
+            @java.lang.Override
+            public Builder clear() {
+                super.clear();
+                bitField0_ = 0;
+                id_ = "";
+                value_ = "";
+                return this;
+            }
+
+            @java.lang.Override
+            public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+                return Message.internal_static_MyMessage_descriptor;
+            }
+
+            @java.lang.Override
+            public Message.MyMessage getDefaultInstanceForType() {
+                return Message.MyMessage.getDefaultInstance();
+            }
+
+            @java.lang.Override
+            public Message.MyMessage build() {
+                Message.MyMessage result = buildPartial();
+                if (!result.isInitialized()) {
+                    throw newUninitializedMessageException(result);
+                }
+                return result;
+            }
+
+            @java.lang.Override
+            public Message.MyMessage buildPartial() {
+                Message.MyMessage result = new Message.MyMessage(this);
+                if (bitField0_ != 0) {
+                    buildPartial0(result);
+                }
+                onBuilt();
+                return result;
+            }
+
+            private void buildPartial0(Message.MyMessage result) {
+                int from_bitField0_ = bitField0_;
+                if (((from_bitField0_ & 0x00000001) != 0)) {
+                    result.id_ = id_;
+                }
+                if (((from_bitField0_ & 0x00000002) != 0)) {
+                    result.value_ = value_;
+                }
+            }
+
+            @java.lang.Override
+            public Builder clone() {
+                return super.clone();
+            }
+
+            @java.lang.Override
+            public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+                return super.setField(field, value);
+            }
+
+            @java.lang.Override
+            public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+                return super.clearField(field);
+            }
+
+            @java.lang.Override
+            public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+                return super.clearOneof(oneof);
+            }
+
+            @java.lang.Override
+            public Builder setRepeatedField(
+                    com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+                return super.setRepeatedField(field, index, value);
+            }
+
+            @java.lang.Override
+            public Builder addRepeatedField(
+                    com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+                return super.addRepeatedField(field, value);
+            }
+
+            @java.lang.Override
+            public Builder mergeFrom(com.google.protobuf.Message other) {
+                if (other instanceof Message.MyMessage) {
+                    return mergeFrom((Message.MyMessage) other);
+                } else {
+                    super.mergeFrom(other);
+                    return this;
+                }
+            }
+
+            public Builder mergeFrom(Message.MyMessage other) {
+                if (other == Message.MyMessage.getDefaultInstance()) return this;
+                if (!other.getId().isEmpty()) {
+                    id_ = other.id_;
+                    bitField0_ |= 0x00000001;
+                    onChanged();
+                }
+                if (!other.getValue().isEmpty()) {
+                    value_ = other.value_;
+                    bitField0_ |= 0x00000002;
+                    onChanged();
+                }
+                this.mergeUnknownFields(other.getUnknownFields());
+                onChanged();
+                return this;
+            }
+
+            @java.lang.Override
+            public final boolean isInitialized() {
+                return true;
+            }
+
+            @java.lang.Override
+            public Builder mergeFrom(
+                    com.google.protobuf.CodedInputStream input,
+                    com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+                    throws java.io.IOException {
+                if (extensionRegistry == null) {
+                    throw new java.lang.NullPointerException();
+                }
+                try {
+                    boolean done = false;
+                    while (!done) {
+                        int tag = input.readTag();
+                        switch (tag) {
+                            case 0:
+                                done = true;
+                                break;
+                            case 10: {
+                                id_ = input.readStringRequireUtf8();
+                                bitField0_ |= 0x00000001;
+                                break;
+                            } // case 10
+                            case 18: {
+                                value_ = input.readStringRequireUtf8();
+                                bitField0_ |= 0x00000002;
+                                break;
+                            } // case 18
+                            default: {
+                                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                                    done = true; // was an endgroup tag
+                                }
+                                break;
+                            } // default:
+                        } // switch (tag)
+                    } // while (!done)
+                } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+                    throw e.unwrapIOException();
+                } finally {
+                    onChanged();
+                } // finally
+                return this;
+            }
+
+            private int bitField0_;
+
+            private java.lang.Object id_ = "";
+
+            /**
+             * <code>string id = 1;</code>
+             *
+             * @return The id.
+             */
+            public java.lang.String getId() {
+                java.lang.Object ref = id_;
+                if (!(ref instanceof java.lang.String)) {
+                    com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+                    java.lang.String s = bs.toStringUtf8();
+                    id_ = s;
+                    return s;
+                } else {
+                    return (java.lang.String) ref;
+                }
+            }
+
+            /**
+             * <code>string id = 1;</code>
+             *
+             * @return The bytes for id.
+             */
+            public com.google.protobuf.ByteString getIdBytes() {
+                java.lang.Object ref = id_;
+                if (ref instanceof String) {
+                    com.google.protobuf.ByteString b =
+                            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+                    id_ = b;
+                    return b;
+                } else {
+                    return (com.google.protobuf.ByteString) ref;
+                }
+            }
+
+            /**
+             * <code>string id = 1;</code>
+             *
+             * @param value The id to set.
+             * @return This builder for chaining.
+             */
+            public Builder setId(java.lang.String value) {
+                if (value == null) {
+                    throw new NullPointerException();
+                }
+                id_ = value;
+                bitField0_ |= 0x00000001;
+                onChanged();
+                return this;
+            }
+
+            /**
+             * <code>string id = 1;</code>
+             *
+             * @return This builder for chaining.
+             */
+            public Builder clearId() {
+                id_ = getDefaultInstance().getId();
+                bitField0_ = (bitField0_ & ~0x00000001);
+                onChanged();
+                return this;
+            }
+
+            /**
+             * <code>string id = 1;</code>
+             *
+             * @param value The bytes for id to set.
+             * @return This builder for chaining.
+             */
+            public Builder setIdBytes(com.google.protobuf.ByteString value) {
+                if (value == null) {
+                    throw new NullPointerException();
+                }
+                checkByteStringIsUtf8(value);
+                id_ = value;
+                bitField0_ |= 0x00000001;
+                onChanged();
+                return this;
+            }
+
+            private java.lang.Object value_ = "";
+
+            /**
+             * <code>string value = 2;</code>
+             *
+             * @return The value.
+             */
+            public java.lang.String getValue() {
+                java.lang.Object ref = value_;
+                if (!(ref instanceof java.lang.String)) {
+                    com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+                    java.lang.String s = bs.toStringUtf8();
+                    value_ = s;
+                    return s;
+                } else {
+                    return (java.lang.String) ref;
+                }
+            }
+
+            /**
+             * <code>string value = 2;</code>
+             *
+             * @return The bytes for value.
+             */
+            public com.google.protobuf.ByteString getValueBytes() {
+                java.lang.Object ref = value_;
+                if (ref instanceof String) {
+                    com.google.protobuf.ByteString b =
+                            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+                    value_ = b;
+                    return b;
+                } else {
+                    return (com.google.protobuf.ByteString) ref;
+                }
+            }
+
+            /**
+             * <code>string value = 2;</code>
+             *
+             * @param value The value to set.
+             * @return This builder for chaining.
+             */
+            public Builder setValue(java.lang.String value) {
+                if (value == null) {
+                    throw new NullPointerException();
+                }
+                value_ = value;
+                bitField0_ |= 0x00000002;
+                onChanged();
+                return this;
+            }
+
+            /**
+             * <code>string value = 2;</code>
+             *
+             * @return This builder for chaining.
+             */
+            public Builder clearValue() {
+                value_ = getDefaultInstance().getValue();
+                bitField0_ = (bitField0_ & ~0x00000002);
+                onChanged();
+                return this;
+            }
+
+            /**
+             * <code>string value = 2;</code>
+             *
+             * @param value The bytes for value to set.
+             * @return This builder for chaining.
+             */
+            public Builder setValueBytes(com.google.protobuf.ByteString value) {
+                if (value == null) {
+                    throw new NullPointerException();
+                }
+                checkByteStringIsUtf8(value);
+                value_ = value;
+                bitField0_ |= 0x00000002;
+                onChanged();
+                return this;
+            }
+
+            @java.lang.Override
+            public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+                return super.setUnknownFields(unknownFields);
+            }
+
+            @java.lang.Override
+            public final Builder mergeUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+                return super.mergeUnknownFields(unknownFields);
+            }
+
+            // @@protoc_insertion_point(builder_scope:MyMessage)
+        }
+
+        // @@protoc_insertion_point(class_scope:MyMessage)
+        private static final Message.MyMessage DEFAULT_INSTANCE;
+
+        static {
+            DEFAULT_INSTANCE = new Message.MyMessage();
+        }
+
+        public static Message.MyMessage getDefaultInstance() {
+            return DEFAULT_INSTANCE;
+        }
+
+        private static final com.google.protobuf.Parser<MyMessage> PARSER =
+                new com.google.protobuf.AbstractParser<MyMessage>() {
+                    @java.lang.Override
+                    public MyMessage parsePartialFrom(
+                            com.google.protobuf.CodedInputStream input,
+                            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+                            throws com.google.protobuf.InvalidProtocolBufferException {
+                        Builder builder = newBuilder();
+                        try {
+                            builder.mergeFrom(input, extensionRegistry);
+                        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+                            throw e.setUnfinishedMessage(builder.buildPartial());
+                        } catch (com.google.protobuf.UninitializedMessageException e) {
+                            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+                        } catch (java.io.IOException e) {
+                            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                                    .setUnfinishedMessage(builder.buildPartial());
+                        }
+                        return builder.buildPartial();
+                    }
+                };
+
+        public static com.google.protobuf.Parser<MyMessage> parser() {
+            return PARSER;
+        }
+
+        @java.lang.Override
+        public com.google.protobuf.Parser<MyMessage> getParserForType() {
+            return PARSER;
+        }
+
+        @java.lang.Override
+        public Message.MyMessage getDefaultInstanceForType() {
+            return DEFAULT_INSTANCE;
+        }
     }
 
-    @java.lang.Override
-    public com.google.protobuf.Parser<MyMessage> getParserForType() {
-      return PARSER;
+    private static final com.google.protobuf.Descriptors.Descriptor internal_static_MyMessage_descriptor;
+    private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+            internal_static_MyMessage_fieldAccessorTable;
+
+    public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+        return descriptor;
     }
 
-    @java.lang.Override
-    public Message.MyMessage getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
+    private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
+
+    static {
+        java.lang.String[] descriptorData = {
+            "\n\rmessage.proto\"&\n\tMyMessage\022\n\n\002id\030\001 \001(\t"
+                    + "\022\r\n\005value\030\002 \001(\tb\006proto3"
+        };
+        descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
+                descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {});
+        internal_static_MyMessage_descriptor = getDescriptor().getMessageTypes().get(0);
+        internal_static_MyMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+                internal_static_MyMessage_descriptor, new java.lang.String[] {
+                    "Id", "Value",
+                });
     }
-  }
-
-  private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_MyMessage_descriptor;
-  private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_MyMessage_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
-    return descriptor;
-  }
-
-  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
-
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\rmessage.proto\"&\n\tMyMessage\022\n\n\002id\030\001 \001(\t"
-          + "\022\r\n\005value\030\002 \001(\tb\006proto3"
-    };
-    descriptor =
-        com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
-            descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {});
-    internal_static_MyMessage_descriptor = getDescriptor().getMessageTypes().get(0);
-    internal_static_MyMessage_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_MyMessage_descriptor,
-            new java.lang.String[] {
-              "Id", "Value",
-            });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
+
+    // @@protoc_insertion_point(outer_class_scope)
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/DebuggerTestApplication.java b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/DebuggerTestApplication.java
index 030167f6496..3597240975f 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/DebuggerTestApplication.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/DebuggerTestApplication.java
@@ -13,121 +13,113 @@
 import java.util.function.Consumer;
 
 public class DebuggerTestApplication {
-  private static final String LOG_FILENAME = System.getenv().get("DD_LOG_FILE");
+    private static final String LOG_FILENAME = System.getenv().get("DD_LOG_FILE");
 
-  public static void main(String[] args) throws Exception {
-    waitForTransformerInstalled(LOG_FILENAME);
-    System.out.println(DebuggerTestApplication.class.getName());
-    Main.run(args);
-  }
+    public static void main(String[] args) throws Exception {
+        waitForTransformerInstalled(LOG_FILENAME);
+        System.out.println(DebuggerTestApplication.class.getName());
+        Main.run(args);
+    }
 }
 
 class Main {
-  private static final Map<String, Consumer<String>> methodsByName = new HashMap<>();
-  private static final String LOG_FILENAME = System.getenv().get("DD_LOG_FILE");
-
-  static void run(String[] args) throws Exception {
-    registerMethods();
-    String methodName = args[0];
-    Consumer<String> method = methodsByName.get(methodName);
-    if (method == null) {
-      throw new RuntimeException("cannot find method: " + methodName);
+    private static final Map<String, Consumer<String>> methodsByName = new HashMap<>();
+    private static final String LOG_FILENAME = System.getenv().get("DD_LOG_FILE");
+
+    static void run(String[] args) throws Exception {
+        registerMethods();
+        String methodName = args[0];
+        Consumer<String> method = methodsByName.get(methodName);
+        if (method == null) {
+            throw new RuntimeException("cannot find method: " + methodName);
+        }
+        int expectedUploads = Integer.parseInt(args[1]);
+        System.out.println("Waiting for instrumentation...");
+        waitForInstrumentation(LOG_FILENAME, Main.class.getName());
+        System.out.println("Executing method: " + methodName);
+        try {
+            method.accept(args.length > 2 ? args[2] : null);
+            System.out.println("Executed");
+        } finally {
+            waitForUpload(LOG_FILENAME, expectedUploads);
+            System.out.println("Exiting...");
+        }
     }
-    int expectedUploads = Integer.parseInt(args[1]);
-    System.out.println("Waiting for instrumentation...");
-    waitForInstrumentation(LOG_FILENAME, Main.class.getName());
-    System.out.println("Executing method: " + methodName);
-    try {
-      method.accept(args.length > 2 ? args[2] : null);
-      System.out.println("Executed");
-    } finally {
-      waitForUpload(LOG_FILENAME, expectedUploads);
-      System.out.println("Exiting...");
+
+    private static void registerMethods() {
+        methodsByName.put("emptyMethod", Main::emptyMethod);
+        methodsByName.put("managementMethod", Main::managementMethod);
+        methodsByName.put("fullMethod", Main::runFullMethod);
+        methodsByName.put("multiProbesFullMethod", Main::runFullMethod);
+        methodsByName.put("loopingFullMethod", Main::runLoopingFullMethod);
+        methodsByName.put("exceptionMethod", Main::runExceptionMethod);
+        methodsByName.put("processLargeCollection", Main::runProcessLargeCollection);
     }
-  }
-
-  private static void registerMethods() {
-    methodsByName.put("emptyMethod", Main::emptyMethod);
-    methodsByName.put("managementMethod", Main::managementMethod);
-    methodsByName.put("fullMethod", Main::runFullMethod);
-    methodsByName.put("multiProbesFullMethod", Main::runFullMethod);
-    methodsByName.put("loopingFullMethod", Main::runLoopingFullMethod);
-    methodsByName.put("exceptionMethod", Main::runExceptionMethod);
-    methodsByName.put("processLargeCollection", Main::runProcessLargeCollection);
-  }
-
-  private static void emptyMethod(String arg) {}
-
-  private static void managementMethod(String arg) {
-    OperatingSystemMXBean operatingSystemMXBean = ManagementFactory.getOperatingSystemMXBean();
-    System.out.println(operatingSystemMXBean.getAvailableProcessors());
-  }
-
-  private static void runFullMethod(String arg) {
-    Map<String, String> map = new HashMap<>();
-    map.put("key1", "val1");
-    map.put("key2", "val2");
-    map.put("key3", "val3");
-    fullMethod(42, "foobar", 3.42, map, "var1", "var2", "var3");
-  }
-
-  private static void runLoopingFullMethod(String arg) {
-    Map<String, String> map = new HashMap<>();
-    map.put("key1", "val1");
-    map.put("key2", "val2");
-    map.put("key3", "val3");
-    for (int i = 0; i < Integer.parseInt(arg); i++) {
-      fullMethod(42, "foobar", 3.42, map, "var1", "var2", "var3");
+
+    private static void emptyMethod(String arg) {}
+
+    private static void managementMethod(String arg) {
+        OperatingSystemMXBean operatingSystemMXBean = ManagementFactory.getOperatingSystemMXBean();
+        System.out.println(operatingSystemMXBean.getAvailableProcessors());
     }
-  }
-
-  private static void runExceptionMethod(String s) {
-    exceptionMethod(s);
-  }
-
-  private static void runProcessLargeCollection(String arg) {
-    processLargeCollection(1_000_000);
-  }
-
-  private static String fullMethod(
-      int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
-    try {
-      System.out.println("fullMethod");
-      return argInt
-          + ", "
-          + argStr
-          + ", "
-          + argDouble
-          + ", "
-          + argMap
-          + ", "
-          + String.join(",", argVar);
-    } catch (Exception ex) {
-      ex.printStackTrace();
-      return null;
+
+    private static void runFullMethod(String arg) {
+        Map<String, String> map = new HashMap<>();
+        map.put("key1", "val1");
+        map.put("key2", "val2");
+        map.put("key3", "val3");
+        fullMethod(42, "foobar", 3.42, map, "var1", "var2", "var3");
     }
-  }
 
-  private static void exceptionMethod(String arg) {
-    if (arg.equals("uncaught")) {
-      throw new RuntimeException("oops uncaught!");
+    private static void runLoopingFullMethod(String arg) {
+        Map<String, String> map = new HashMap<>();
+        map.put("key1", "val1");
+        map.put("key2", "val2");
+        map.put("key3", "val3");
+        for (int i = 0; i < Integer.parseInt(arg); i++) {
+            fullMethod(42, "foobar", 3.42, map, "var1", "var2", "var3");
+        }
     }
-    if (arg.equals("caught")) {
-      try {
-        throw new IllegalArgumentException("oops caught!");
-      } catch (IllegalArgumentException ex) {
-        ex.printStackTrace();
-      }
+
+    private static void runExceptionMethod(String s) {
+        exceptionMethod(s);
     }
-  }
 
-  private static void processLargeCollection(int largeListSize) {
-    List<String> largeList = new ArrayList<>();
-    for (int i = 0; i < largeListSize; i++) {
-      largeList.add("foobar" + i);
+    private static void runProcessLargeCollection(String arg) {
+        processLargeCollection(1_000_000);
     }
-    for (int i = 0; i < largeListSize; i++) {
-      largeList.get(i);
+
+    private static String fullMethod(
+            int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
+        try {
+            System.out.println("fullMethod");
+            return argInt + ", " + argStr + ", " + argDouble + ", " + argMap + ", " + String.join(",", argVar);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return null;
+        }
+    }
+
+    private static void exceptionMethod(String arg) {
+        if (arg.equals("uncaught")) {
+            throw new RuntimeException("oops uncaught!");
+        }
+        if (arg.equals("caught")) {
+            try {
+                throw new IllegalArgumentException("oops caught!");
+            } catch (IllegalArgumentException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    private static void processLargeCollection(int largeListSize) {
+        List<String> largeList = new ArrayList<>();
+        for (int i = 0; i < largeListSize; i++) {
+            largeList.add("foobar" + i);
+        }
+        for (int i = 0; i < largeListSize; i++) {
+            largeList.get(i);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/HugeInnerClasses.java b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/HugeInnerClasses.java
index 5d21eaa8ef5..486b96caeab 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/HugeInnerClasses.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/HugeInnerClasses.java
@@ -2,3019 +2,3019 @@
 
 public class HugeInnerClasses {
 
-  public static int main(String arg) {
-    return 42; // beae1817-f3b0-4ea8-a74f-000000000001
-  }
-
-  static {
-    new MyInnerClass000();
-    new MyInnerClass001();
-    new MyInnerClass002();
-    new MyInnerClass003();
-    new MyInnerClass004();
-    new MyInnerClass005();
-    new MyInnerClass006();
-    new MyInnerClass007();
-    new MyInnerClass008();
-    new MyInnerClass009();
-    new MyInnerClass010();
-    new MyInnerClass011();
-    new MyInnerClass012();
-    new MyInnerClass013();
-    new MyInnerClass014();
-    new MyInnerClass015();
-    new MyInnerClass016();
-    new MyInnerClass017();
-    new MyInnerClass018();
-    new MyInnerClass019();
-    new MyInnerClass020();
-    new MyInnerClass021();
-    new MyInnerClass022();
-    new MyInnerClass023();
-    new MyInnerClass024();
-    new MyInnerClass025();
-    new MyInnerClass026();
-    new MyInnerClass027();
-    new MyInnerClass028();
-    new MyInnerClass029();
-    new MyInnerClass030();
-    new MyInnerClass031();
-    new MyInnerClass032();
-    new MyInnerClass033();
-    new MyInnerClass034();
-    new MyInnerClass035();
-    new MyInnerClass036();
-    new MyInnerClass037();
-    new MyInnerClass038();
-    new MyInnerClass039();
-    new MyInnerClass040();
-    new MyInnerClass041();
-    new MyInnerClass042();
-    new MyInnerClass043();
-    new MyInnerClass044();
-    new MyInnerClass045();
-    new MyInnerClass046();
-    new MyInnerClass047();
-    new MyInnerClass048();
-    new MyInnerClass049();
-    new MyInnerClass050();
-    new MyInnerClass051();
-    new MyInnerClass052();
-    new MyInnerClass053();
-    new MyInnerClass054();
-    new MyInnerClass055();
-    new MyInnerClass056();
-    new MyInnerClass057();
-    new MyInnerClass058();
-    new MyInnerClass059();
-    new MyInnerClass060();
-    new MyInnerClass061();
-    new MyInnerClass062();
-    new MyInnerClass063();
-    new MyInnerClass064();
-    new MyInnerClass065();
-    new MyInnerClass066();
-    new MyInnerClass067();
-    new MyInnerClass068();
-    new MyInnerClass069();
-    new MyInnerClass070();
-    new MyInnerClass071();
-    new MyInnerClass072();
-    new MyInnerClass073();
-    new MyInnerClass074();
-    new MyInnerClass075();
-    new MyInnerClass076();
-    new MyInnerClass077();
-    new MyInnerClass078();
-    new MyInnerClass079();
-    new MyInnerClass080();
-    new MyInnerClass081();
-    new MyInnerClass082();
-    new MyInnerClass083();
-    new MyInnerClass084();
-    new MyInnerClass085();
-    new MyInnerClass086();
-    new MyInnerClass087();
-    new MyInnerClass088();
-    new MyInnerClass089();
-    new MyInnerClass090();
-    new MyInnerClass091();
-    new MyInnerClass092();
-    new MyInnerClass093();
-    new MyInnerClass094();
-    new MyInnerClass095();
-    new MyInnerClass096();
-    new MyInnerClass097();
-    new MyInnerClass098();
-    new MyInnerClass099();
-
-    new MyInnerClass100();
-    new MyInnerClass101();
-    new MyInnerClass102();
-    new MyInnerClass103();
-    new MyInnerClass104();
-    new MyInnerClass105();
-    new MyInnerClass106();
-    new MyInnerClass107();
-    new MyInnerClass108();
-    new MyInnerClass109();
-    new MyInnerClass110();
-    new MyInnerClass111();
-    new MyInnerClass112();
-    new MyInnerClass113();
-    new MyInnerClass114();
-    new MyInnerClass115();
-    new MyInnerClass116();
-    new MyInnerClass117();
-    new MyInnerClass118();
-    new MyInnerClass119();
-    new MyInnerClass120();
-    new MyInnerClass121();
-    new MyInnerClass122();
-    new MyInnerClass123();
-    new MyInnerClass124();
-    new MyInnerClass125();
-    new MyInnerClass126();
-    new MyInnerClass127();
-    new MyInnerClass128();
-    new MyInnerClass129();
-    new MyInnerClass130();
-    new MyInnerClass131();
-    new MyInnerClass132();
-    new MyInnerClass133();
-    new MyInnerClass134();
-    new MyInnerClass135();
-    new MyInnerClass136();
-    new MyInnerClass137();
-    new MyInnerClass138();
-    new MyInnerClass139();
-    new MyInnerClass140();
-    new MyInnerClass141();
-    new MyInnerClass142();
-    new MyInnerClass143();
-    new MyInnerClass144();
-    new MyInnerClass145();
-    new MyInnerClass146();
-    new MyInnerClass147();
-    new MyInnerClass148();
-    new MyInnerClass149();
-    new MyInnerClass150();
-    new MyInnerClass151();
-    new MyInnerClass152();
-    new MyInnerClass153();
-    new MyInnerClass154();
-    new MyInnerClass155();
-    new MyInnerClass156();
-    new MyInnerClass157();
-    new MyInnerClass158();
-    new MyInnerClass159();
-    new MyInnerClass160();
-    new MyInnerClass161();
-    new MyInnerClass162();
-    new MyInnerClass163();
-    new MyInnerClass164();
-    new MyInnerClass165();
-    new MyInnerClass166();
-    new MyInnerClass167();
-    new MyInnerClass168();
-    new MyInnerClass169();
-    new MyInnerClass170();
-    new MyInnerClass171();
-    new MyInnerClass172();
-    new MyInnerClass173();
-    new MyInnerClass174();
-    new MyInnerClass175();
-    new MyInnerClass176();
-    new MyInnerClass177();
-    new MyInnerClass178();
-    new MyInnerClass179();
-    new MyInnerClass180();
-    new MyInnerClass181();
-    new MyInnerClass182();
-    new MyInnerClass183();
-    new MyInnerClass184();
-    new MyInnerClass185();
-    new MyInnerClass186();
-    new MyInnerClass187();
-    new MyInnerClass188();
-    new MyInnerClass189();
-    new MyInnerClass190();
-    new MyInnerClass191();
-    new MyInnerClass192();
-    new MyInnerClass193();
-    new MyInnerClass194();
-    new MyInnerClass195();
-    new MyInnerClass196();
-    new MyInnerClass197();
-    new MyInnerClass198();
-    new MyInnerClass199();
-
-    new MyInnerClass200();
-    new MyInnerClass201();
-    new MyInnerClass202();
-    new MyInnerClass203();
-    new MyInnerClass204();
-    new MyInnerClass205();
-    new MyInnerClass206();
-    new MyInnerClass207();
-    new MyInnerClass208();
-    new MyInnerClass209();
-    new MyInnerClass210();
-    new MyInnerClass211();
-    new MyInnerClass212();
-    new MyInnerClass213();
-    new MyInnerClass214();
-    new MyInnerClass215();
-    new MyInnerClass216();
-    new MyInnerClass217();
-    new MyInnerClass218();
-    new MyInnerClass219();
-    new MyInnerClass220();
-    new MyInnerClass221();
-    new MyInnerClass222();
-    new MyInnerClass223();
-    new MyInnerClass224();
-    new MyInnerClass225();
-    new MyInnerClass226();
-    new MyInnerClass227();
-    new MyInnerClass228();
-    new MyInnerClass229();
-    new MyInnerClass230();
-    new MyInnerClass231();
-    new MyInnerClass232();
-    new MyInnerClass233();
-    new MyInnerClass234();
-    new MyInnerClass235();
-    new MyInnerClass236();
-    new MyInnerClass237();
-    new MyInnerClass238();
-    new MyInnerClass239();
-    new MyInnerClass240();
-    new MyInnerClass241();
-    new MyInnerClass242();
-    new MyInnerClass243();
-    new MyInnerClass244();
-    new MyInnerClass245();
-    new MyInnerClass246();
-    new MyInnerClass247();
-    new MyInnerClass248();
-    new MyInnerClass249();
-    new MyInnerClass250();
-    new MyInnerClass251();
-    new MyInnerClass252();
-    new MyInnerClass253();
-    new MyInnerClass254();
-    new MyInnerClass255();
-    new MyInnerClass256();
-    new MyInnerClass257();
-    new MyInnerClass258();
-    new MyInnerClass259();
-    new MyInnerClass260();
-    new MyInnerClass261();
-    new MyInnerClass262();
-    new MyInnerClass263();
-    new MyInnerClass264();
-    new MyInnerClass265();
-    new MyInnerClass266();
-    new MyInnerClass267();
-    new MyInnerClass268();
-    new MyInnerClass269();
-    new MyInnerClass270();
-    new MyInnerClass271();
-    new MyInnerClass272();
-    new MyInnerClass273();
-    new MyInnerClass274();
-    new MyInnerClass275();
-    new MyInnerClass276();
-    new MyInnerClass277();
-    new MyInnerClass278();
-    new MyInnerClass279();
-    new MyInnerClass280();
-    new MyInnerClass281();
-    new MyInnerClass282();
-    new MyInnerClass283();
-    new MyInnerClass284();
-    new MyInnerClass285();
-    new MyInnerClass286();
-    new MyInnerClass287();
-    new MyInnerClass288();
-    new MyInnerClass289();
-    new MyInnerClass290();
-    new MyInnerClass291();
-    new MyInnerClass292();
-    new MyInnerClass293();
-    new MyInnerClass294();
-    new MyInnerClass295();
-    new MyInnerClass296();
-    new MyInnerClass297();
-    new MyInnerClass298();
-    new MyInnerClass299();
-
-    new MyInnerClass300();
-    new MyInnerClass301();
-    new MyInnerClass302();
-    new MyInnerClass303();
-    new MyInnerClass304();
-    new MyInnerClass305();
-    new MyInnerClass306();
-    new MyInnerClass307();
-    new MyInnerClass308();
-    new MyInnerClass309();
-    new MyInnerClass310();
-    new MyInnerClass311();
-    new MyInnerClass312();
-    new MyInnerClass313();
-    new MyInnerClass314();
-    new MyInnerClass315();
-    new MyInnerClass316();
-    new MyInnerClass317();
-    new MyInnerClass318();
-    new MyInnerClass319();
-    new MyInnerClass320();
-    new MyInnerClass321();
-    new MyInnerClass322();
-    new MyInnerClass323();
-    new MyInnerClass324();
-    new MyInnerClass325();
-    new MyInnerClass326();
-    new MyInnerClass327();
-    new MyInnerClass328();
-    new MyInnerClass329();
-    new MyInnerClass330();
-    new MyInnerClass331();
-    new MyInnerClass332();
-    new MyInnerClass333();
-    new MyInnerClass334();
-    new MyInnerClass335();
-    new MyInnerClass336();
-    new MyInnerClass337();
-    new MyInnerClass338();
-    new MyInnerClass339();
-    new MyInnerClass340();
-    new MyInnerClass341();
-    new MyInnerClass342();
-    new MyInnerClass343();
-    new MyInnerClass344();
-    new MyInnerClass345();
-    new MyInnerClass346();
-    new MyInnerClass347();
-    new MyInnerClass348();
-    new MyInnerClass349();
-    new MyInnerClass350();
-    new MyInnerClass351();
-    new MyInnerClass352();
-    new MyInnerClass353();
-    new MyInnerClass354();
-    new MyInnerClass355();
-    new MyInnerClass356();
-    new MyInnerClass357();
-    new MyInnerClass358();
-    new MyInnerClass359();
-    new MyInnerClass360();
-    new MyInnerClass361();
-    new MyInnerClass362();
-    new MyInnerClass363();
-    new MyInnerClass364();
-    new MyInnerClass365();
-    new MyInnerClass366();
-    new MyInnerClass367();
-    new MyInnerClass368();
-    new MyInnerClass369();
-    new MyInnerClass370();
-    new MyInnerClass371();
-    new MyInnerClass372();
-    new MyInnerClass373();
-    new MyInnerClass374();
-    new MyInnerClass375();
-    new MyInnerClass376();
-    new MyInnerClass377();
-    new MyInnerClass378();
-    new MyInnerClass379();
-    new MyInnerClass380();
-    new MyInnerClass381();
-    new MyInnerClass382();
-    new MyInnerClass383();
-    new MyInnerClass384();
-    new MyInnerClass385();
-    new MyInnerClass386();
-    new MyInnerClass387();
-    new MyInnerClass388();
-    new MyInnerClass389();
-    new MyInnerClass390();
-    new MyInnerClass391();
-    new MyInnerClass392();
-    new MyInnerClass393();
-    new MyInnerClass394();
-    new MyInnerClass395();
-    new MyInnerClass396();
-    new MyInnerClass397();
-    new MyInnerClass398();
-    new MyInnerClass399();
-
-    new MyInnerClass400();
-    new MyInnerClass401();
-    new MyInnerClass402();
-    new MyInnerClass403();
-    new MyInnerClass404();
-    new MyInnerClass405();
-    new MyInnerClass406();
-    new MyInnerClass407();
-    new MyInnerClass408();
-    new MyInnerClass409();
-    new MyInnerClass410();
-    new MyInnerClass411();
-    new MyInnerClass412();
-    new MyInnerClass413();
-    new MyInnerClass414();
-    new MyInnerClass415();
-    new MyInnerClass416();
-    new MyInnerClass417();
-    new MyInnerClass418();
-    new MyInnerClass419();
-    new MyInnerClass420();
-    new MyInnerClass421();
-    new MyInnerClass422();
-    new MyInnerClass423();
-    new MyInnerClass424();
-    new MyInnerClass425();
-    new MyInnerClass426();
-    new MyInnerClass427();
-    new MyInnerClass428();
-    new MyInnerClass429();
-    new MyInnerClass430();
-    new MyInnerClass431();
-    new MyInnerClass432();
-    new MyInnerClass433();
-    new MyInnerClass434();
-    new MyInnerClass435();
-    new MyInnerClass436();
-    new MyInnerClass437();
-    new MyInnerClass438();
-    new MyInnerClass439();
-    new MyInnerClass440();
-    new MyInnerClass441();
-    new MyInnerClass442();
-    new MyInnerClass443();
-    new MyInnerClass444();
-    new MyInnerClass445();
-    new MyInnerClass446();
-    new MyInnerClass447();
-    new MyInnerClass448();
-    new MyInnerClass449();
-    new MyInnerClass450();
-    new MyInnerClass451();
-    new MyInnerClass452();
-    new MyInnerClass453();
-    new MyInnerClass454();
-    new MyInnerClass455();
-    new MyInnerClass456();
-    new MyInnerClass457();
-    new MyInnerClass458();
-    new MyInnerClass459();
-    new MyInnerClass460();
-    new MyInnerClass461();
-    new MyInnerClass462();
-    new MyInnerClass463();
-    new MyInnerClass464();
-    new MyInnerClass465();
-    new MyInnerClass466();
-    new MyInnerClass467();
-    new MyInnerClass468();
-    new MyInnerClass469();
-    new MyInnerClass470();
-    new MyInnerClass471();
-    new MyInnerClass472();
-    new MyInnerClass473();
-    new MyInnerClass474();
-    new MyInnerClass475();
-    new MyInnerClass476();
-    new MyInnerClass477();
-    new MyInnerClass478();
-    new MyInnerClass479();
-    new MyInnerClass480();
-    new MyInnerClass481();
-    new MyInnerClass482();
-    new MyInnerClass483();
-    new MyInnerClass484();
-    new MyInnerClass485();
-    new MyInnerClass486();
-    new MyInnerClass487();
-    new MyInnerClass488();
-    new MyInnerClass489();
-    new MyInnerClass490();
-    new MyInnerClass491();
-    new MyInnerClass492();
-    new MyInnerClass493();
-    new MyInnerClass494();
-    new MyInnerClass495();
-    new MyInnerClass496();
-    new MyInnerClass497();
-    new MyInnerClass498();
-    new MyInnerClass499();
-
-    new MyInnerClass500();
-    new MyInnerClass501();
-    new MyInnerClass502();
-    new MyInnerClass503();
-    new MyInnerClass504();
-    new MyInnerClass505();
-    new MyInnerClass506();
-    new MyInnerClass507();
-    new MyInnerClass508();
-    new MyInnerClass509();
-    new MyInnerClass510();
-    new MyInnerClass511();
-    new MyInnerClass512();
-    new MyInnerClass513();
-    new MyInnerClass514();
-    new MyInnerClass515();
-    new MyInnerClass516();
-    new MyInnerClass517();
-    new MyInnerClass518();
-    new MyInnerClass519();
-    new MyInnerClass520();
-    new MyInnerClass521();
-    new MyInnerClass522();
-    new MyInnerClass523();
-    new MyInnerClass524();
-    new MyInnerClass525();
-    new MyInnerClass526();
-    new MyInnerClass527();
-    new MyInnerClass528();
-    new MyInnerClass529();
-    new MyInnerClass530();
-    new MyInnerClass531();
-    new MyInnerClass532();
-    new MyInnerClass533();
-    new MyInnerClass534();
-    new MyInnerClass535();
-    new MyInnerClass536();
-    new MyInnerClass537();
-    new MyInnerClass538();
-    new MyInnerClass539();
-    new MyInnerClass540();
-    new MyInnerClass541();
-    new MyInnerClass542();
-    new MyInnerClass543();
-    new MyInnerClass544();
-    new MyInnerClass545();
-    new MyInnerClass546();
-    new MyInnerClass547();
-    new MyInnerClass548();
-    new MyInnerClass549();
-    new MyInnerClass550();
-    new MyInnerClass551();
-    new MyInnerClass552();
-    new MyInnerClass553();
-    new MyInnerClass554();
-    new MyInnerClass555();
-    new MyInnerClass556();
-    new MyInnerClass557();
-    new MyInnerClass558();
-    new MyInnerClass559();
-    new MyInnerClass560();
-    new MyInnerClass561();
-    new MyInnerClass562();
-    new MyInnerClass563();
-    new MyInnerClass564();
-    new MyInnerClass565();
-    new MyInnerClass566();
-    new MyInnerClass567();
-    new MyInnerClass568();
-    new MyInnerClass569();
-    new MyInnerClass570();
-    new MyInnerClass571();
-    new MyInnerClass572();
-    new MyInnerClass573();
-    new MyInnerClass574();
-    new MyInnerClass575();
-    new MyInnerClass576();
-    new MyInnerClass577();
-    new MyInnerClass578();
-    new MyInnerClass579();
-    new MyInnerClass580();
-    new MyInnerClass581();
-    new MyInnerClass582();
-    new MyInnerClass583();
-    new MyInnerClass584();
-    new MyInnerClass585();
-    new MyInnerClass586();
-    new MyInnerClass587();
-    new MyInnerClass588();
-    new MyInnerClass589();
-    new MyInnerClass590();
-    new MyInnerClass591();
-    new MyInnerClass592();
-    new MyInnerClass593();
-    new MyInnerClass594();
-    new MyInnerClass595();
-    new MyInnerClass596();
-    new MyInnerClass597();
-    new MyInnerClass598();
-    new MyInnerClass599();
-
-    new MyInnerClass600();
-    new MyInnerClass601();
-    new MyInnerClass602();
-    new MyInnerClass603();
-    new MyInnerClass604();
-    new MyInnerClass605();
-    new MyInnerClass606();
-    new MyInnerClass607();
-    new MyInnerClass608();
-    new MyInnerClass609();
-    new MyInnerClass610();
-    new MyInnerClass611();
-    new MyInnerClass612();
-    new MyInnerClass613();
-    new MyInnerClass614();
-    new MyInnerClass615();
-    new MyInnerClass616();
-    new MyInnerClass617();
-    new MyInnerClass618();
-    new MyInnerClass619();
-    new MyInnerClass620();
-    new MyInnerClass621();
-    new MyInnerClass622();
-    new MyInnerClass623();
-    new MyInnerClass624();
-    new MyInnerClass625();
-    new MyInnerClass626();
-    new MyInnerClass627();
-    new MyInnerClass628();
-    new MyInnerClass629();
-    new MyInnerClass630();
-    new MyInnerClass631();
-    new MyInnerClass632();
-    new MyInnerClass633();
-    new MyInnerClass634();
-    new MyInnerClass635();
-    new MyInnerClass636();
-    new MyInnerClass637();
-    new MyInnerClass638();
-    new MyInnerClass639();
-    new MyInnerClass640();
-    new MyInnerClass641();
-    new MyInnerClass642();
-    new MyInnerClass643();
-    new MyInnerClass644();
-    new MyInnerClass645();
-    new MyInnerClass646();
-    new MyInnerClass647();
-    new MyInnerClass648();
-    new MyInnerClass649();
-    new MyInnerClass650();
-    new MyInnerClass651();
-    new MyInnerClass652();
-    new MyInnerClass653();
-    new MyInnerClass654();
-    new MyInnerClass655();
-    new MyInnerClass656();
-    new MyInnerClass657();
-    new MyInnerClass658();
-    new MyInnerClass659();
-    new MyInnerClass660();
-    new MyInnerClass661();
-    new MyInnerClass662();
-    new MyInnerClass663();
-    new MyInnerClass664();
-    new MyInnerClass665();
-    new MyInnerClass666();
-    new MyInnerClass667();
-    new MyInnerClass668();
-    new MyInnerClass669();
-    new MyInnerClass670();
-    new MyInnerClass671();
-    new MyInnerClass672();
-    new MyInnerClass673();
-    new MyInnerClass674();
-    new MyInnerClass675();
-    new MyInnerClass676();
-    new MyInnerClass677();
-    new MyInnerClass678();
-    new MyInnerClass679();
-    new MyInnerClass680();
-    new MyInnerClass681();
-    new MyInnerClass682();
-    new MyInnerClass683();
-    new MyInnerClass684();
-    new MyInnerClass685();
-    new MyInnerClass686();
-    new MyInnerClass687();
-    new MyInnerClass688();
-    new MyInnerClass689();
-    new MyInnerClass690();
-    new MyInnerClass691();
-    new MyInnerClass692();
-    new MyInnerClass693();
-    new MyInnerClass694();
-    new MyInnerClass695();
-    new MyInnerClass696();
-    new MyInnerClass697();
-    new MyInnerClass698();
-    new MyInnerClass699();
-
-    new MyInnerClass700();
-    new MyInnerClass701();
-    new MyInnerClass702();
-    new MyInnerClass703();
-    new MyInnerClass704();
-    new MyInnerClass705();
-    new MyInnerClass706();
-    new MyInnerClass707();
-    new MyInnerClass708();
-    new MyInnerClass709();
-    new MyInnerClass710();
-    new MyInnerClass711();
-    new MyInnerClass712();
-    new MyInnerClass713();
-    new MyInnerClass714();
-    new MyInnerClass715();
-    new MyInnerClass716();
-    new MyInnerClass717();
-    new MyInnerClass718();
-    new MyInnerClass719();
-    new MyInnerClass720();
-    new MyInnerClass721();
-    new MyInnerClass722();
-    new MyInnerClass723();
-    new MyInnerClass724();
-    new MyInnerClass725();
-    new MyInnerClass726();
-    new MyInnerClass727();
-    new MyInnerClass728();
-    new MyInnerClass729();
-    new MyInnerClass730();
-    new MyInnerClass731();
-    new MyInnerClass732();
-    new MyInnerClass733();
-    new MyInnerClass734();
-    new MyInnerClass735();
-    new MyInnerClass736();
-    new MyInnerClass737();
-    new MyInnerClass738();
-    new MyInnerClass739();
-    new MyInnerClass740();
-    new MyInnerClass741();
-    new MyInnerClass742();
-    new MyInnerClass743();
-    new MyInnerClass744();
-    new MyInnerClass745();
-    new MyInnerClass746();
-    new MyInnerClass747();
-    new MyInnerClass748();
-    new MyInnerClass749();
-    new MyInnerClass750();
-    new MyInnerClass751();
-    new MyInnerClass752();
-    new MyInnerClass753();
-    new MyInnerClass754();
-    new MyInnerClass755();
-    new MyInnerClass756();
-    new MyInnerClass757();
-    new MyInnerClass758();
-    new MyInnerClass759();
-    new MyInnerClass760();
-    new MyInnerClass761();
-    new MyInnerClass762();
-    new MyInnerClass763();
-    new MyInnerClass764();
-    new MyInnerClass765();
-    new MyInnerClass766();
-    new MyInnerClass767();
-    new MyInnerClass768();
-    new MyInnerClass769();
-    new MyInnerClass770();
-    new MyInnerClass771();
-    new MyInnerClass772();
-    new MyInnerClass773();
-    new MyInnerClass774();
-    new MyInnerClass775();
-    new MyInnerClass776();
-    new MyInnerClass777();
-    new MyInnerClass778();
-    new MyInnerClass779();
-    new MyInnerClass780();
-    new MyInnerClass781();
-    new MyInnerClass782();
-    new MyInnerClass783();
-    new MyInnerClass784();
-    new MyInnerClass785();
-    new MyInnerClass786();
-    new MyInnerClass787();
-    new MyInnerClass788();
-    new MyInnerClass789();
-    new MyInnerClass790();
-    new MyInnerClass791();
-    new MyInnerClass792();
-    new MyInnerClass793();
-    new MyInnerClass794();
-    new MyInnerClass795();
-    new MyInnerClass796();
-    new MyInnerClass797();
-    new MyInnerClass798();
-    new MyInnerClass799();
-
-    new MyInnerClass800();
-    new MyInnerClass801();
-    new MyInnerClass802();
-    new MyInnerClass803();
-    new MyInnerClass804();
-    new MyInnerClass805();
-    new MyInnerClass806();
-    new MyInnerClass807();
-    new MyInnerClass808();
-    new MyInnerClass809();
-    new MyInnerClass810();
-    new MyInnerClass811();
-    new MyInnerClass812();
-    new MyInnerClass813();
-    new MyInnerClass814();
-    new MyInnerClass815();
-    new MyInnerClass816();
-    new MyInnerClass817();
-    new MyInnerClass818();
-    new MyInnerClass819();
-    new MyInnerClass820();
-    new MyInnerClass821();
-    new MyInnerClass822();
-    new MyInnerClass823();
-    new MyInnerClass824();
-    new MyInnerClass825();
-    new MyInnerClass826();
-    new MyInnerClass827();
-    new MyInnerClass828();
-    new MyInnerClass829();
-    new MyInnerClass830();
-    new MyInnerClass831();
-    new MyInnerClass832();
-    new MyInnerClass833();
-    new MyInnerClass834();
-    new MyInnerClass835();
-    new MyInnerClass836();
-    new MyInnerClass837();
-    new MyInnerClass838();
-    new MyInnerClass839();
-    new MyInnerClass840();
-    new MyInnerClass841();
-    new MyInnerClass842();
-    new MyInnerClass843();
-    new MyInnerClass844();
-    new MyInnerClass845();
-    new MyInnerClass846();
-    new MyInnerClass847();
-    new MyInnerClass848();
-    new MyInnerClass849();
-    new MyInnerClass850();
-    new MyInnerClass851();
-    new MyInnerClass852();
-    new MyInnerClass853();
-    new MyInnerClass854();
-    new MyInnerClass855();
-    new MyInnerClass856();
-    new MyInnerClass857();
-    new MyInnerClass858();
-    new MyInnerClass859();
-    new MyInnerClass860();
-    new MyInnerClass861();
-    new MyInnerClass862();
-    new MyInnerClass863();
-    new MyInnerClass864();
-    new MyInnerClass865();
-    new MyInnerClass866();
-    new MyInnerClass867();
-    new MyInnerClass868();
-    new MyInnerClass869();
-    new MyInnerClass870();
-    new MyInnerClass871();
-    new MyInnerClass872();
-    new MyInnerClass873();
-    new MyInnerClass874();
-    new MyInnerClass875();
-    new MyInnerClass876();
-    new MyInnerClass877();
-    new MyInnerClass878();
-    new MyInnerClass879();
-    new MyInnerClass880();
-    new MyInnerClass881();
-    new MyInnerClass882();
-    new MyInnerClass883();
-    new MyInnerClass884();
-    new MyInnerClass885();
-    new MyInnerClass886();
-    new MyInnerClass887();
-    new MyInnerClass888();
-    new MyInnerClass889();
-    new MyInnerClass890();
-    new MyInnerClass891();
-    new MyInnerClass892();
-    new MyInnerClass893();
-    new MyInnerClass894();
-    new MyInnerClass895();
-    new MyInnerClass896();
-    new MyInnerClass897();
-    new MyInnerClass898();
-    new MyInnerClass899();
-
-    new MyInnerClass900();
-    new MyInnerClass901();
-    new MyInnerClass902();
-    new MyInnerClass903();
-    new MyInnerClass904();
-    new MyInnerClass905();
-    new MyInnerClass906();
-    new MyInnerClass907();
-    new MyInnerClass908();
-    new MyInnerClass909();
-    new MyInnerClass910();
-    new MyInnerClass911();
-    new MyInnerClass912();
-    new MyInnerClass913();
-    new MyInnerClass914();
-    new MyInnerClass915();
-    new MyInnerClass916();
-    new MyInnerClass917();
-    new MyInnerClass918();
-    new MyInnerClass919();
-    new MyInnerClass920();
-    new MyInnerClass921();
-    new MyInnerClass922();
-    new MyInnerClass923();
-    new MyInnerClass924();
-    new MyInnerClass925();
-    new MyInnerClass926();
-    new MyInnerClass927();
-    new MyInnerClass928();
-    new MyInnerClass929();
-    new MyInnerClass930();
-    new MyInnerClass931();
-    new MyInnerClass932();
-    new MyInnerClass933();
-    new MyInnerClass934();
-    new MyInnerClass935();
-    new MyInnerClass936();
-    new MyInnerClass937();
-    new MyInnerClass938();
-    new MyInnerClass939();
-    new MyInnerClass940();
-    new MyInnerClass941();
-    new MyInnerClass942();
-    new MyInnerClass943();
-    new MyInnerClass944();
-    new MyInnerClass945();
-    new MyInnerClass946();
-    new MyInnerClass947();
-    new MyInnerClass948();
-    new MyInnerClass949();
-    new MyInnerClass950();
-    new MyInnerClass951();
-    new MyInnerClass952();
-    new MyInnerClass953();
-    new MyInnerClass954();
-    new MyInnerClass955();
-    new MyInnerClass956();
-    new MyInnerClass957();
-    new MyInnerClass958();
-    new MyInnerClass959();
-    new MyInnerClass960();
-    new MyInnerClass961();
-    new MyInnerClass962();
-    new MyInnerClass963();
-    new MyInnerClass964();
-    new MyInnerClass965();
-    new MyInnerClass966();
-    new MyInnerClass967();
-    new MyInnerClass968();
-    new MyInnerClass969();
-    new MyInnerClass970();
-    new MyInnerClass971();
-    new MyInnerClass972();
-    new MyInnerClass973();
-    new MyInnerClass974();
-    new MyInnerClass975();
-    new MyInnerClass976();
-    new MyInnerClass977();
-    new MyInnerClass978();
-    new MyInnerClass979();
-    new MyInnerClass980();
-    new MyInnerClass981();
-    new MyInnerClass982();
-    new MyInnerClass983();
-    new MyInnerClass984();
-    new MyInnerClass985();
-    new MyInnerClass986();
-    new MyInnerClass987();
-    new MyInnerClass988();
-    new MyInnerClass989();
-    new MyInnerClass990();
-    new MyInnerClass991();
-    new MyInnerClass992();
-    new MyInnerClass993();
-    new MyInnerClass994();
-    new MyInnerClass995();
-    new MyInnerClass996();
-    new MyInnerClass997();
-    new MyInnerClass998();
-    new MyInnerClass999();
-  }
+    public static int main(String arg) {
+        return 42; // beae1817-f3b0-4ea8-a74f-000000000001
+    }
+
+    static {
+        new MyInnerClass000();
+        new MyInnerClass001();
+        new MyInnerClass002();
+        new MyInnerClass003();
+        new MyInnerClass004();
+        new MyInnerClass005();
+        new MyInnerClass006();
+        new MyInnerClass007();
+        new MyInnerClass008();
+        new MyInnerClass009();
+        new MyInnerClass010();
+        new MyInnerClass011();
+        new MyInnerClass012();
+        new MyInnerClass013();
+        new MyInnerClass014();
+        new MyInnerClass015();
+        new MyInnerClass016();
+        new MyInnerClass017();
+        new MyInnerClass018();
+        new MyInnerClass019();
+        new MyInnerClass020();
+        new MyInnerClass021();
+        new MyInnerClass022();
+        new MyInnerClass023();
+        new MyInnerClass024();
+        new MyInnerClass025();
+        new MyInnerClass026();
+        new MyInnerClass027();
+        new MyInnerClass028();
+        new MyInnerClass029();
+        new MyInnerClass030();
+        new MyInnerClass031();
+        new MyInnerClass032();
+        new MyInnerClass033();
+        new MyInnerClass034();
+        new MyInnerClass035();
+        new MyInnerClass036();
+        new MyInnerClass037();
+        new MyInnerClass038();
+        new MyInnerClass039();
+        new MyInnerClass040();
+        new MyInnerClass041();
+        new MyInnerClass042();
+        new MyInnerClass043();
+        new MyInnerClass044();
+        new MyInnerClass045();
+        new MyInnerClass046();
+        new MyInnerClass047();
+        new MyInnerClass048();
+        new MyInnerClass049();
+        new MyInnerClass050();
+        new MyInnerClass051();
+        new MyInnerClass052();
+        new MyInnerClass053();
+        new MyInnerClass054();
+        new MyInnerClass055();
+        new MyInnerClass056();
+        new MyInnerClass057();
+        new MyInnerClass058();
+        new MyInnerClass059();
+        new MyInnerClass060();
+        new MyInnerClass061();
+        new MyInnerClass062();
+        new MyInnerClass063();
+        new MyInnerClass064();
+        new MyInnerClass065();
+        new MyInnerClass066();
+        new MyInnerClass067();
+        new MyInnerClass068();
+        new MyInnerClass069();
+        new MyInnerClass070();
+        new MyInnerClass071();
+        new MyInnerClass072();
+        new MyInnerClass073();
+        new MyInnerClass074();
+        new MyInnerClass075();
+        new MyInnerClass076();
+        new MyInnerClass077();
+        new MyInnerClass078();
+        new MyInnerClass079();
+        new MyInnerClass080();
+        new MyInnerClass081();
+        new MyInnerClass082();
+        new MyInnerClass083();
+        new MyInnerClass084();
+        new MyInnerClass085();
+        new MyInnerClass086();
+        new MyInnerClass087();
+        new MyInnerClass088();
+        new MyInnerClass089();
+        new MyInnerClass090();
+        new MyInnerClass091();
+        new MyInnerClass092();
+        new MyInnerClass093();
+        new MyInnerClass094();
+        new MyInnerClass095();
+        new MyInnerClass096();
+        new MyInnerClass097();
+        new MyInnerClass098();
+        new MyInnerClass099();
+
+        new MyInnerClass100();
+        new MyInnerClass101();
+        new MyInnerClass102();
+        new MyInnerClass103();
+        new MyInnerClass104();
+        new MyInnerClass105();
+        new MyInnerClass106();
+        new MyInnerClass107();
+        new MyInnerClass108();
+        new MyInnerClass109();
+        new MyInnerClass110();
+        new MyInnerClass111();
+        new MyInnerClass112();
+        new MyInnerClass113();
+        new MyInnerClass114();
+        new MyInnerClass115();
+        new MyInnerClass116();
+        new MyInnerClass117();
+        new MyInnerClass118();
+        new MyInnerClass119();
+        new MyInnerClass120();
+        new MyInnerClass121();
+        new MyInnerClass122();
+        new MyInnerClass123();
+        new MyInnerClass124();
+        new MyInnerClass125();
+        new MyInnerClass126();
+        new MyInnerClass127();
+        new MyInnerClass128();
+        new MyInnerClass129();
+        new MyInnerClass130();
+        new MyInnerClass131();
+        new MyInnerClass132();
+        new MyInnerClass133();
+        new MyInnerClass134();
+        new MyInnerClass135();
+        new MyInnerClass136();
+        new MyInnerClass137();
+        new MyInnerClass138();
+        new MyInnerClass139();
+        new MyInnerClass140();
+        new MyInnerClass141();
+        new MyInnerClass142();
+        new MyInnerClass143();
+        new MyInnerClass144();
+        new MyInnerClass145();
+        new MyInnerClass146();
+        new MyInnerClass147();
+        new MyInnerClass148();
+        new MyInnerClass149();
+        new MyInnerClass150();
+        new MyInnerClass151();
+        new MyInnerClass152();
+        new MyInnerClass153();
+        new MyInnerClass154();
+        new MyInnerClass155();
+        new MyInnerClass156();
+        new MyInnerClass157();
+        new MyInnerClass158();
+        new MyInnerClass159();
+        new MyInnerClass160();
+        new MyInnerClass161();
+        new MyInnerClass162();
+        new MyInnerClass163();
+        new MyInnerClass164();
+        new MyInnerClass165();
+        new MyInnerClass166();
+        new MyInnerClass167();
+        new MyInnerClass168();
+        new MyInnerClass169();
+        new MyInnerClass170();
+        new MyInnerClass171();
+        new MyInnerClass172();
+        new MyInnerClass173();
+        new MyInnerClass174();
+        new MyInnerClass175();
+        new MyInnerClass176();
+        new MyInnerClass177();
+        new MyInnerClass178();
+        new MyInnerClass179();
+        new MyInnerClass180();
+        new MyInnerClass181();
+        new MyInnerClass182();
+        new MyInnerClass183();
+        new MyInnerClass184();
+        new MyInnerClass185();
+        new MyInnerClass186();
+        new MyInnerClass187();
+        new MyInnerClass188();
+        new MyInnerClass189();
+        new MyInnerClass190();
+        new MyInnerClass191();
+        new MyInnerClass192();
+        new MyInnerClass193();
+        new MyInnerClass194();
+        new MyInnerClass195();
+        new MyInnerClass196();
+        new MyInnerClass197();
+        new MyInnerClass198();
+        new MyInnerClass199();
+
+        new MyInnerClass200();
+        new MyInnerClass201();
+        new MyInnerClass202();
+        new MyInnerClass203();
+        new MyInnerClass204();
+        new MyInnerClass205();
+        new MyInnerClass206();
+        new MyInnerClass207();
+        new MyInnerClass208();
+        new MyInnerClass209();
+        new MyInnerClass210();
+        new MyInnerClass211();
+        new MyInnerClass212();
+        new MyInnerClass213();
+        new MyInnerClass214();
+        new MyInnerClass215();
+        new MyInnerClass216();
+        new MyInnerClass217();
+        new MyInnerClass218();
+        new MyInnerClass219();
+        new MyInnerClass220();
+        new MyInnerClass221();
+        new MyInnerClass222();
+        new MyInnerClass223();
+        new MyInnerClass224();
+        new MyInnerClass225();
+        new MyInnerClass226();
+        new MyInnerClass227();
+        new MyInnerClass228();
+        new MyInnerClass229();
+        new MyInnerClass230();
+        new MyInnerClass231();
+        new MyInnerClass232();
+        new MyInnerClass233();
+        new MyInnerClass234();
+        new MyInnerClass235();
+        new MyInnerClass236();
+        new MyInnerClass237();
+        new MyInnerClass238();
+        new MyInnerClass239();
+        new MyInnerClass240();
+        new MyInnerClass241();
+        new MyInnerClass242();
+        new MyInnerClass243();
+        new MyInnerClass244();
+        new MyInnerClass245();
+        new MyInnerClass246();
+        new MyInnerClass247();
+        new MyInnerClass248();
+        new MyInnerClass249();
+        new MyInnerClass250();
+        new MyInnerClass251();
+        new MyInnerClass252();
+        new MyInnerClass253();
+        new MyInnerClass254();
+        new MyInnerClass255();
+        new MyInnerClass256();
+        new MyInnerClass257();
+        new MyInnerClass258();
+        new MyInnerClass259();
+        new MyInnerClass260();
+        new MyInnerClass261();
+        new MyInnerClass262();
+        new MyInnerClass263();
+        new MyInnerClass264();
+        new MyInnerClass265();
+        new MyInnerClass266();
+        new MyInnerClass267();
+        new MyInnerClass268();
+        new MyInnerClass269();
+        new MyInnerClass270();
+        new MyInnerClass271();
+        new MyInnerClass272();
+        new MyInnerClass273();
+        new MyInnerClass274();
+        new MyInnerClass275();
+        new MyInnerClass276();
+        new MyInnerClass277();
+        new MyInnerClass278();
+        new MyInnerClass279();
+        new MyInnerClass280();
+        new MyInnerClass281();
+        new MyInnerClass282();
+        new MyInnerClass283();
+        new MyInnerClass284();
+        new MyInnerClass285();
+        new MyInnerClass286();
+        new MyInnerClass287();
+        new MyInnerClass288();
+        new MyInnerClass289();
+        new MyInnerClass290();
+        new MyInnerClass291();
+        new MyInnerClass292();
+        new MyInnerClass293();
+        new MyInnerClass294();
+        new MyInnerClass295();
+        new MyInnerClass296();
+        new MyInnerClass297();
+        new MyInnerClass298();
+        new MyInnerClass299();
+
+        new MyInnerClass300();
+        new MyInnerClass301();
+        new MyInnerClass302();
+        new MyInnerClass303();
+        new MyInnerClass304();
+        new MyInnerClass305();
+        new MyInnerClass306();
+        new MyInnerClass307();
+        new MyInnerClass308();
+        new MyInnerClass309();
+        new MyInnerClass310();
+        new MyInnerClass311();
+        new MyInnerClass312();
+        new MyInnerClass313();
+        new MyInnerClass314();
+        new MyInnerClass315();
+        new MyInnerClass316();
+        new MyInnerClass317();
+        new MyInnerClass318();
+        new MyInnerClass319();
+        new MyInnerClass320();
+        new MyInnerClass321();
+        new MyInnerClass322();
+        new MyInnerClass323();
+        new MyInnerClass324();
+        new MyInnerClass325();
+        new MyInnerClass326();
+        new MyInnerClass327();
+        new MyInnerClass328();
+        new MyInnerClass329();
+        new MyInnerClass330();
+        new MyInnerClass331();
+        new MyInnerClass332();
+        new MyInnerClass333();
+        new MyInnerClass334();
+        new MyInnerClass335();
+        new MyInnerClass336();
+        new MyInnerClass337();
+        new MyInnerClass338();
+        new MyInnerClass339();
+        new MyInnerClass340();
+        new MyInnerClass341();
+        new MyInnerClass342();
+        new MyInnerClass343();
+        new MyInnerClass344();
+        new MyInnerClass345();
+        new MyInnerClass346();
+        new MyInnerClass347();
+        new MyInnerClass348();
+        new MyInnerClass349();
+        new MyInnerClass350();
+        new MyInnerClass351();
+        new MyInnerClass352();
+        new MyInnerClass353();
+        new MyInnerClass354();
+        new MyInnerClass355();
+        new MyInnerClass356();
+        new MyInnerClass357();
+        new MyInnerClass358();
+        new MyInnerClass359();
+        new MyInnerClass360();
+        new MyInnerClass361();
+        new MyInnerClass362();
+        new MyInnerClass363();
+        new MyInnerClass364();
+        new MyInnerClass365();
+        new MyInnerClass366();
+        new MyInnerClass367();
+        new MyInnerClass368();
+        new MyInnerClass369();
+        new MyInnerClass370();
+        new MyInnerClass371();
+        new MyInnerClass372();
+        new MyInnerClass373();
+        new MyInnerClass374();
+        new MyInnerClass375();
+        new MyInnerClass376();
+        new MyInnerClass377();
+        new MyInnerClass378();
+        new MyInnerClass379();
+        new MyInnerClass380();
+        new MyInnerClass381();
+        new MyInnerClass382();
+        new MyInnerClass383();
+        new MyInnerClass384();
+        new MyInnerClass385();
+        new MyInnerClass386();
+        new MyInnerClass387();
+        new MyInnerClass388();
+        new MyInnerClass389();
+        new MyInnerClass390();
+        new MyInnerClass391();
+        new MyInnerClass392();
+        new MyInnerClass393();
+        new MyInnerClass394();
+        new MyInnerClass395();
+        new MyInnerClass396();
+        new MyInnerClass397();
+        new MyInnerClass398();
+        new MyInnerClass399();
+
+        new MyInnerClass400();
+        new MyInnerClass401();
+        new MyInnerClass402();
+        new MyInnerClass403();
+        new MyInnerClass404();
+        new MyInnerClass405();
+        new MyInnerClass406();
+        new MyInnerClass407();
+        new MyInnerClass408();
+        new MyInnerClass409();
+        new MyInnerClass410();
+        new MyInnerClass411();
+        new MyInnerClass412();
+        new MyInnerClass413();
+        new MyInnerClass414();
+        new MyInnerClass415();
+        new MyInnerClass416();
+        new MyInnerClass417();
+        new MyInnerClass418();
+        new MyInnerClass419();
+        new MyInnerClass420();
+        new MyInnerClass421();
+        new MyInnerClass422();
+        new MyInnerClass423();
+        new MyInnerClass424();
+        new MyInnerClass425();
+        new MyInnerClass426();
+        new MyInnerClass427();
+        new MyInnerClass428();
+        new MyInnerClass429();
+        new MyInnerClass430();
+        new MyInnerClass431();
+        new MyInnerClass432();
+        new MyInnerClass433();
+        new MyInnerClass434();
+        new MyInnerClass435();
+        new MyInnerClass436();
+        new MyInnerClass437();
+        new MyInnerClass438();
+        new MyInnerClass439();
+        new MyInnerClass440();
+        new MyInnerClass441();
+        new MyInnerClass442();
+        new MyInnerClass443();
+        new MyInnerClass444();
+        new MyInnerClass445();
+        new MyInnerClass446();
+        new MyInnerClass447();
+        new MyInnerClass448();
+        new MyInnerClass449();
+        new MyInnerClass450();
+        new MyInnerClass451();
+        new MyInnerClass452();
+        new MyInnerClass453();
+        new MyInnerClass454();
+        new MyInnerClass455();
+        new MyInnerClass456();
+        new MyInnerClass457();
+        new MyInnerClass458();
+        new MyInnerClass459();
+        new MyInnerClass460();
+        new MyInnerClass461();
+        new MyInnerClass462();
+        new MyInnerClass463();
+        new MyInnerClass464();
+        new MyInnerClass465();
+        new MyInnerClass466();
+        new MyInnerClass467();
+        new MyInnerClass468();
+        new MyInnerClass469();
+        new MyInnerClass470();
+        new MyInnerClass471();
+        new MyInnerClass472();
+        new MyInnerClass473();
+        new MyInnerClass474();
+        new MyInnerClass475();
+        new MyInnerClass476();
+        new MyInnerClass477();
+        new MyInnerClass478();
+        new MyInnerClass479();
+        new MyInnerClass480();
+        new MyInnerClass481();
+        new MyInnerClass482();
+        new MyInnerClass483();
+        new MyInnerClass484();
+        new MyInnerClass485();
+        new MyInnerClass486();
+        new MyInnerClass487();
+        new MyInnerClass488();
+        new MyInnerClass489();
+        new MyInnerClass490();
+        new MyInnerClass491();
+        new MyInnerClass492();
+        new MyInnerClass493();
+        new MyInnerClass494();
+        new MyInnerClass495();
+        new MyInnerClass496();
+        new MyInnerClass497();
+        new MyInnerClass498();
+        new MyInnerClass499();
+
+        new MyInnerClass500();
+        new MyInnerClass501();
+        new MyInnerClass502();
+        new MyInnerClass503();
+        new MyInnerClass504();
+        new MyInnerClass505();
+        new MyInnerClass506();
+        new MyInnerClass507();
+        new MyInnerClass508();
+        new MyInnerClass509();
+        new MyInnerClass510();
+        new MyInnerClass511();
+        new MyInnerClass512();
+        new MyInnerClass513();
+        new MyInnerClass514();
+        new MyInnerClass515();
+        new MyInnerClass516();
+        new MyInnerClass517();
+        new MyInnerClass518();
+        new MyInnerClass519();
+        new MyInnerClass520();
+        new MyInnerClass521();
+        new MyInnerClass522();
+        new MyInnerClass523();
+        new MyInnerClass524();
+        new MyInnerClass525();
+        new MyInnerClass526();
+        new MyInnerClass527();
+        new MyInnerClass528();
+        new MyInnerClass529();
+        new MyInnerClass530();
+        new MyInnerClass531();
+        new MyInnerClass532();
+        new MyInnerClass533();
+        new MyInnerClass534();
+        new MyInnerClass535();
+        new MyInnerClass536();
+        new MyInnerClass537();
+        new MyInnerClass538();
+        new MyInnerClass539();
+        new MyInnerClass540();
+        new MyInnerClass541();
+        new MyInnerClass542();
+        new MyInnerClass543();
+        new MyInnerClass544();
+        new MyInnerClass545();
+        new MyInnerClass546();
+        new MyInnerClass547();
+        new MyInnerClass548();
+        new MyInnerClass549();
+        new MyInnerClass550();
+        new MyInnerClass551();
+        new MyInnerClass552();
+        new MyInnerClass553();
+        new MyInnerClass554();
+        new MyInnerClass555();
+        new MyInnerClass556();
+        new MyInnerClass557();
+        new MyInnerClass558();
+        new MyInnerClass559();
+        new MyInnerClass560();
+        new MyInnerClass561();
+        new MyInnerClass562();
+        new MyInnerClass563();
+        new MyInnerClass564();
+        new MyInnerClass565();
+        new MyInnerClass566();
+        new MyInnerClass567();
+        new MyInnerClass568();
+        new MyInnerClass569();
+        new MyInnerClass570();
+        new MyInnerClass571();
+        new MyInnerClass572();
+        new MyInnerClass573();
+        new MyInnerClass574();
+        new MyInnerClass575();
+        new MyInnerClass576();
+        new MyInnerClass577();
+        new MyInnerClass578();
+        new MyInnerClass579();
+        new MyInnerClass580();
+        new MyInnerClass581();
+        new MyInnerClass582();
+        new MyInnerClass583();
+        new MyInnerClass584();
+        new MyInnerClass585();
+        new MyInnerClass586();
+        new MyInnerClass587();
+        new MyInnerClass588();
+        new MyInnerClass589();
+        new MyInnerClass590();
+        new MyInnerClass591();
+        new MyInnerClass592();
+        new MyInnerClass593();
+        new MyInnerClass594();
+        new MyInnerClass595();
+        new MyInnerClass596();
+        new MyInnerClass597();
+        new MyInnerClass598();
+        new MyInnerClass599();
+
+        new MyInnerClass600();
+        new MyInnerClass601();
+        new MyInnerClass602();
+        new MyInnerClass603();
+        new MyInnerClass604();
+        new MyInnerClass605();
+        new MyInnerClass606();
+        new MyInnerClass607();
+        new MyInnerClass608();
+        new MyInnerClass609();
+        new MyInnerClass610();
+        new MyInnerClass611();
+        new MyInnerClass612();
+        new MyInnerClass613();
+        new MyInnerClass614();
+        new MyInnerClass615();
+        new MyInnerClass616();
+        new MyInnerClass617();
+        new MyInnerClass618();
+        new MyInnerClass619();
+        new MyInnerClass620();
+        new MyInnerClass621();
+        new MyInnerClass622();
+        new MyInnerClass623();
+        new MyInnerClass624();
+        new MyInnerClass625();
+        new MyInnerClass626();
+        new MyInnerClass627();
+        new MyInnerClass628();
+        new MyInnerClass629();
+        new MyInnerClass630();
+        new MyInnerClass631();
+        new MyInnerClass632();
+        new MyInnerClass633();
+        new MyInnerClass634();
+        new MyInnerClass635();
+        new MyInnerClass636();
+        new MyInnerClass637();
+        new MyInnerClass638();
+        new MyInnerClass639();
+        new MyInnerClass640();
+        new MyInnerClass641();
+        new MyInnerClass642();
+        new MyInnerClass643();
+        new MyInnerClass644();
+        new MyInnerClass645();
+        new MyInnerClass646();
+        new MyInnerClass647();
+        new MyInnerClass648();
+        new MyInnerClass649();
+        new MyInnerClass650();
+        new MyInnerClass651();
+        new MyInnerClass652();
+        new MyInnerClass653();
+        new MyInnerClass654();
+        new MyInnerClass655();
+        new MyInnerClass656();
+        new MyInnerClass657();
+        new MyInnerClass658();
+        new MyInnerClass659();
+        new MyInnerClass660();
+        new MyInnerClass661();
+        new MyInnerClass662();
+        new MyInnerClass663();
+        new MyInnerClass664();
+        new MyInnerClass665();
+        new MyInnerClass666();
+        new MyInnerClass667();
+        new MyInnerClass668();
+        new MyInnerClass669();
+        new MyInnerClass670();
+        new MyInnerClass671();
+        new MyInnerClass672();
+        new MyInnerClass673();
+        new MyInnerClass674();
+        new MyInnerClass675();
+        new MyInnerClass676();
+        new MyInnerClass677();
+        new MyInnerClass678();
+        new MyInnerClass679();
+        new MyInnerClass680();
+        new MyInnerClass681();
+        new MyInnerClass682();
+        new MyInnerClass683();
+        new MyInnerClass684();
+        new MyInnerClass685();
+        new MyInnerClass686();
+        new MyInnerClass687();
+        new MyInnerClass688();
+        new MyInnerClass689();
+        new MyInnerClass690();
+        new MyInnerClass691();
+        new MyInnerClass692();
+        new MyInnerClass693();
+        new MyInnerClass694();
+        new MyInnerClass695();
+        new MyInnerClass696();
+        new MyInnerClass697();
+        new MyInnerClass698();
+        new MyInnerClass699();
+
+        new MyInnerClass700();
+        new MyInnerClass701();
+        new MyInnerClass702();
+        new MyInnerClass703();
+        new MyInnerClass704();
+        new MyInnerClass705();
+        new MyInnerClass706();
+        new MyInnerClass707();
+        new MyInnerClass708();
+        new MyInnerClass709();
+        new MyInnerClass710();
+        new MyInnerClass711();
+        new MyInnerClass712();
+        new MyInnerClass713();
+        new MyInnerClass714();
+        new MyInnerClass715();
+        new MyInnerClass716();
+        new MyInnerClass717();
+        new MyInnerClass718();
+        new MyInnerClass719();
+        new MyInnerClass720();
+        new MyInnerClass721();
+        new MyInnerClass722();
+        new MyInnerClass723();
+        new MyInnerClass724();
+        new MyInnerClass725();
+        new MyInnerClass726();
+        new MyInnerClass727();
+        new MyInnerClass728();
+        new MyInnerClass729();
+        new MyInnerClass730();
+        new MyInnerClass731();
+        new MyInnerClass732();
+        new MyInnerClass733();
+        new MyInnerClass734();
+        new MyInnerClass735();
+        new MyInnerClass736();
+        new MyInnerClass737();
+        new MyInnerClass738();
+        new MyInnerClass739();
+        new MyInnerClass740();
+        new MyInnerClass741();
+        new MyInnerClass742();
+        new MyInnerClass743();
+        new MyInnerClass744();
+        new MyInnerClass745();
+        new MyInnerClass746();
+        new MyInnerClass747();
+        new MyInnerClass748();
+        new MyInnerClass749();
+        new MyInnerClass750();
+        new MyInnerClass751();
+        new MyInnerClass752();
+        new MyInnerClass753();
+        new MyInnerClass754();
+        new MyInnerClass755();
+        new MyInnerClass756();
+        new MyInnerClass757();
+        new MyInnerClass758();
+        new MyInnerClass759();
+        new MyInnerClass760();
+        new MyInnerClass761();
+        new MyInnerClass762();
+        new MyInnerClass763();
+        new MyInnerClass764();
+        new MyInnerClass765();
+        new MyInnerClass766();
+        new MyInnerClass767();
+        new MyInnerClass768();
+        new MyInnerClass769();
+        new MyInnerClass770();
+        new MyInnerClass771();
+        new MyInnerClass772();
+        new MyInnerClass773();
+        new MyInnerClass774();
+        new MyInnerClass775();
+        new MyInnerClass776();
+        new MyInnerClass777();
+        new MyInnerClass778();
+        new MyInnerClass779();
+        new MyInnerClass780();
+        new MyInnerClass781();
+        new MyInnerClass782();
+        new MyInnerClass783();
+        new MyInnerClass784();
+        new MyInnerClass785();
+        new MyInnerClass786();
+        new MyInnerClass787();
+        new MyInnerClass788();
+        new MyInnerClass789();
+        new MyInnerClass790();
+        new MyInnerClass791();
+        new MyInnerClass792();
+        new MyInnerClass793();
+        new MyInnerClass794();
+        new MyInnerClass795();
+        new MyInnerClass796();
+        new MyInnerClass797();
+        new MyInnerClass798();
+        new MyInnerClass799();
+
+        new MyInnerClass800();
+        new MyInnerClass801();
+        new MyInnerClass802();
+        new MyInnerClass803();
+        new MyInnerClass804();
+        new MyInnerClass805();
+        new MyInnerClass806();
+        new MyInnerClass807();
+        new MyInnerClass808();
+        new MyInnerClass809();
+        new MyInnerClass810();
+        new MyInnerClass811();
+        new MyInnerClass812();
+        new MyInnerClass813();
+        new MyInnerClass814();
+        new MyInnerClass815();
+        new MyInnerClass816();
+        new MyInnerClass817();
+        new MyInnerClass818();
+        new MyInnerClass819();
+        new MyInnerClass820();
+        new MyInnerClass821();
+        new MyInnerClass822();
+        new MyInnerClass823();
+        new MyInnerClass824();
+        new MyInnerClass825();
+        new MyInnerClass826();
+        new MyInnerClass827();
+        new MyInnerClass828();
+        new MyInnerClass829();
+        new MyInnerClass830();
+        new MyInnerClass831();
+        new MyInnerClass832();
+        new MyInnerClass833();
+        new MyInnerClass834();
+        new MyInnerClass835();
+        new MyInnerClass836();
+        new MyInnerClass837();
+        new MyInnerClass838();
+        new MyInnerClass839();
+        new MyInnerClass840();
+        new MyInnerClass841();
+        new MyInnerClass842();
+        new MyInnerClass843();
+        new MyInnerClass844();
+        new MyInnerClass845();
+        new MyInnerClass846();
+        new MyInnerClass847();
+        new MyInnerClass848();
+        new MyInnerClass849();
+        new MyInnerClass850();
+        new MyInnerClass851();
+        new MyInnerClass852();
+        new MyInnerClass853();
+        new MyInnerClass854();
+        new MyInnerClass855();
+        new MyInnerClass856();
+        new MyInnerClass857();
+        new MyInnerClass858();
+        new MyInnerClass859();
+        new MyInnerClass860();
+        new MyInnerClass861();
+        new MyInnerClass862();
+        new MyInnerClass863();
+        new MyInnerClass864();
+        new MyInnerClass865();
+        new MyInnerClass866();
+        new MyInnerClass867();
+        new MyInnerClass868();
+        new MyInnerClass869();
+        new MyInnerClass870();
+        new MyInnerClass871();
+        new MyInnerClass872();
+        new MyInnerClass873();
+        new MyInnerClass874();
+        new MyInnerClass875();
+        new MyInnerClass876();
+        new MyInnerClass877();
+        new MyInnerClass878();
+        new MyInnerClass879();
+        new MyInnerClass880();
+        new MyInnerClass881();
+        new MyInnerClass882();
+        new MyInnerClass883();
+        new MyInnerClass884();
+        new MyInnerClass885();
+        new MyInnerClass886();
+        new MyInnerClass887();
+        new MyInnerClass888();
+        new MyInnerClass889();
+        new MyInnerClass890();
+        new MyInnerClass891();
+        new MyInnerClass892();
+        new MyInnerClass893();
+        new MyInnerClass894();
+        new MyInnerClass895();
+        new MyInnerClass896();
+        new MyInnerClass897();
+        new MyInnerClass898();
+        new MyInnerClass899();
+
+        new MyInnerClass900();
+        new MyInnerClass901();
+        new MyInnerClass902();
+        new MyInnerClass903();
+        new MyInnerClass904();
+        new MyInnerClass905();
+        new MyInnerClass906();
+        new MyInnerClass907();
+        new MyInnerClass908();
+        new MyInnerClass909();
+        new MyInnerClass910();
+        new MyInnerClass911();
+        new MyInnerClass912();
+        new MyInnerClass913();
+        new MyInnerClass914();
+        new MyInnerClass915();
+        new MyInnerClass916();
+        new MyInnerClass917();
+        new MyInnerClass918();
+        new MyInnerClass919();
+        new MyInnerClass920();
+        new MyInnerClass921();
+        new MyInnerClass922();
+        new MyInnerClass923();
+        new MyInnerClass924();
+        new MyInnerClass925();
+        new MyInnerClass926();
+        new MyInnerClass927();
+        new MyInnerClass928();
+        new MyInnerClass929();
+        new MyInnerClass930();
+        new MyInnerClass931();
+        new MyInnerClass932();
+        new MyInnerClass933();
+        new MyInnerClass934();
+        new MyInnerClass935();
+        new MyInnerClass936();
+        new MyInnerClass937();
+        new MyInnerClass938();
+        new MyInnerClass939();
+        new MyInnerClass940();
+        new MyInnerClass941();
+        new MyInnerClass942();
+        new MyInnerClass943();
+        new MyInnerClass944();
+        new MyInnerClass945();
+        new MyInnerClass946();
+        new MyInnerClass947();
+        new MyInnerClass948();
+        new MyInnerClass949();
+        new MyInnerClass950();
+        new MyInnerClass951();
+        new MyInnerClass952();
+        new MyInnerClass953();
+        new MyInnerClass954();
+        new MyInnerClass955();
+        new MyInnerClass956();
+        new MyInnerClass957();
+        new MyInnerClass958();
+        new MyInnerClass959();
+        new MyInnerClass960();
+        new MyInnerClass961();
+        new MyInnerClass962();
+        new MyInnerClass963();
+        new MyInnerClass964();
+        new MyInnerClass965();
+        new MyInnerClass966();
+        new MyInnerClass967();
+        new MyInnerClass968();
+        new MyInnerClass969();
+        new MyInnerClass970();
+        new MyInnerClass971();
+        new MyInnerClass972();
+        new MyInnerClass973();
+        new MyInnerClass974();
+        new MyInnerClass975();
+        new MyInnerClass976();
+        new MyInnerClass977();
+        new MyInnerClass978();
+        new MyInnerClass979();
+        new MyInnerClass980();
+        new MyInnerClass981();
+        new MyInnerClass982();
+        new MyInnerClass983();
+        new MyInnerClass984();
+        new MyInnerClass985();
+        new MyInnerClass986();
+        new MyInnerClass987();
+        new MyInnerClass988();
+        new MyInnerClass989();
+        new MyInnerClass990();
+        new MyInnerClass991();
+        new MyInnerClass992();
+        new MyInnerClass993();
+        new MyInnerClass994();
+        new MyInnerClass995();
+        new MyInnerClass996();
+        new MyInnerClass997();
+        new MyInnerClass998();
+        new MyInnerClass999();
+    }
 
-  static class MyInnerClass000 {}
+    static class MyInnerClass000 {}
 
-  static class MyInnerClass001 {}
+    static class MyInnerClass001 {}
 
-  static class MyInnerClass002 {}
+    static class MyInnerClass002 {}
 
-  static class MyInnerClass003 {}
+    static class MyInnerClass003 {}
 
-  static class MyInnerClass004 {}
+    static class MyInnerClass004 {}
 
-  static class MyInnerClass005 {}
+    static class MyInnerClass005 {}
 
-  static class MyInnerClass006 {}
+    static class MyInnerClass006 {}
 
-  static class MyInnerClass007 {}
+    static class MyInnerClass007 {}
 
-  static class MyInnerClass008 {}
+    static class MyInnerClass008 {}
 
-  static class MyInnerClass009 {}
+    static class MyInnerClass009 {}
 
-  static class MyInnerClass010 {}
+    static class MyInnerClass010 {}
 
-  static class MyInnerClass011 {}
+    static class MyInnerClass011 {}
 
-  static class MyInnerClass012 {}
+    static class MyInnerClass012 {}
 
-  static class MyInnerClass013 {}
+    static class MyInnerClass013 {}
 
-  static class MyInnerClass014 {}
+    static class MyInnerClass014 {}
 
-  static class MyInnerClass015 {}
+    static class MyInnerClass015 {}
 
-  static class MyInnerClass016 {}
+    static class MyInnerClass016 {}
 
-  static class MyInnerClass017 {}
+    static class MyInnerClass017 {}
 
-  static class MyInnerClass018 {}
+    static class MyInnerClass018 {}
 
-  static class MyInnerClass019 {}
+    static class MyInnerClass019 {}
 
-  static class MyInnerClass020 {}
+    static class MyInnerClass020 {}
 
-  static class MyInnerClass021 {}
+    static class MyInnerClass021 {}
 
-  static class MyInnerClass022 {}
+    static class MyInnerClass022 {}
 
-  static class MyInnerClass023 {}
+    static class MyInnerClass023 {}
 
-  static class MyInnerClass024 {}
+    static class MyInnerClass024 {}
 
-  static class MyInnerClass025 {}
+    static class MyInnerClass025 {}
 
-  static class MyInnerClass026 {}
+    static class MyInnerClass026 {}
 
-  static class MyInnerClass027 {}
+    static class MyInnerClass027 {}
 
-  static class MyInnerClass028 {}
+    static class MyInnerClass028 {}
 
-  static class MyInnerClass029 {}
+    static class MyInnerClass029 {}
 
-  static class MyInnerClass030 {}
+    static class MyInnerClass030 {}
 
-  static class MyInnerClass031 {}
+    static class MyInnerClass031 {}
 
-  static class MyInnerClass032 {}
+    static class MyInnerClass032 {}
 
-  static class MyInnerClass033 {}
+    static class MyInnerClass033 {}
 
-  static class MyInnerClass034 {}
+    static class MyInnerClass034 {}
 
-  static class MyInnerClass035 {}
+    static class MyInnerClass035 {}
 
-  static class MyInnerClass036 {}
+    static class MyInnerClass036 {}
 
-  static class MyInnerClass037 {}
+    static class MyInnerClass037 {}
 
-  static class MyInnerClass038 {}
+    static class MyInnerClass038 {}
 
-  static class MyInnerClass039 {}
+    static class MyInnerClass039 {}
 
-  static class MyInnerClass040 {}
+    static class MyInnerClass040 {}
 
-  static class MyInnerClass041 {}
+    static class MyInnerClass041 {}
 
-  static class MyInnerClass042 {}
+    static class MyInnerClass042 {}
 
-  static class MyInnerClass043 {}
+    static class MyInnerClass043 {}
 
-  static class MyInnerClass044 {}
+    static class MyInnerClass044 {}
 
-  static class MyInnerClass045 {}
+    static class MyInnerClass045 {}
 
-  static class MyInnerClass046 {}
+    static class MyInnerClass046 {}
 
-  static class MyInnerClass047 {}
+    static class MyInnerClass047 {}
 
-  static class MyInnerClass048 {}
+    static class MyInnerClass048 {}
 
-  static class MyInnerClass049 {}
+    static class MyInnerClass049 {}
 
-  static class MyInnerClass050 {}
+    static class MyInnerClass050 {}
 
-  static class MyInnerClass051 {}
+    static class MyInnerClass051 {}
 
-  static class MyInnerClass052 {}
+    static class MyInnerClass052 {}
 
-  static class MyInnerClass053 {}
+    static class MyInnerClass053 {}
 
-  static class MyInnerClass054 {}
+    static class MyInnerClass054 {}
 
-  static class MyInnerClass055 {}
+    static class MyInnerClass055 {}
 
-  static class MyInnerClass056 {}
+    static class MyInnerClass056 {}
 
-  static class MyInnerClass057 {}
+    static class MyInnerClass057 {}
 
-  static class MyInnerClass058 {}
+    static class MyInnerClass058 {}
 
-  static class MyInnerClass059 {}
+    static class MyInnerClass059 {}
 
-  static class MyInnerClass060 {}
+    static class MyInnerClass060 {}
 
-  static class MyInnerClass061 {}
+    static class MyInnerClass061 {}
 
-  static class MyInnerClass062 {}
+    static class MyInnerClass062 {}
 
-  static class MyInnerClass063 {}
+    static class MyInnerClass063 {}
 
-  static class MyInnerClass064 {}
+    static class MyInnerClass064 {}
 
-  static class MyInnerClass065 {}
+    static class MyInnerClass065 {}
 
-  static class MyInnerClass066 {}
+    static class MyInnerClass066 {}
 
-  static class MyInnerClass067 {}
+    static class MyInnerClass067 {}
 
-  static class MyInnerClass068 {}
+    static class MyInnerClass068 {}
 
-  static class MyInnerClass069 {}
+    static class MyInnerClass069 {}
 
-  static class MyInnerClass070 {}
+    static class MyInnerClass070 {}
 
-  static class MyInnerClass071 {}
+    static class MyInnerClass071 {}
 
-  static class MyInnerClass072 {}
+    static class MyInnerClass072 {}
 
-  static class MyInnerClass073 {}
+    static class MyInnerClass073 {}
 
-  static class MyInnerClass074 {}
+    static class MyInnerClass074 {}
 
-  static class MyInnerClass075 {}
+    static class MyInnerClass075 {}
 
-  static class MyInnerClass076 {}
+    static class MyInnerClass076 {}
 
-  static class MyInnerClass077 {}
+    static class MyInnerClass077 {}
 
-  static class MyInnerClass078 {}
+    static class MyInnerClass078 {}
 
-  static class MyInnerClass079 {}
+    static class MyInnerClass079 {}
 
-  static class MyInnerClass080 {}
+    static class MyInnerClass080 {}
 
-  static class MyInnerClass081 {}
+    static class MyInnerClass081 {}
 
-  static class MyInnerClass082 {}
+    static class MyInnerClass082 {}
 
-  static class MyInnerClass083 {}
+    static class MyInnerClass083 {}
 
-  static class MyInnerClass084 {}
+    static class MyInnerClass084 {}
 
-  static class MyInnerClass085 {}
+    static class MyInnerClass085 {}
 
-  static class MyInnerClass086 {}
+    static class MyInnerClass086 {}
 
-  static class MyInnerClass087 {}
+    static class MyInnerClass087 {}
 
-  static class MyInnerClass088 {}
+    static class MyInnerClass088 {}
 
-  static class MyInnerClass089 {}
+    static class MyInnerClass089 {}
 
-  static class MyInnerClass090 {}
+    static class MyInnerClass090 {}
 
-  static class MyInnerClass091 {}
+    static class MyInnerClass091 {}
 
-  static class MyInnerClass092 {}
+    static class MyInnerClass092 {}
 
-  static class MyInnerClass093 {}
+    static class MyInnerClass093 {}
 
-  static class MyInnerClass094 {}
+    static class MyInnerClass094 {}
 
-  static class MyInnerClass095 {}
+    static class MyInnerClass095 {}
 
-  static class MyInnerClass096 {}
+    static class MyInnerClass096 {}
 
-  static class MyInnerClass097 {}
+    static class MyInnerClass097 {}
 
-  static class MyInnerClass098 {}
+    static class MyInnerClass098 {}
 
-  static class MyInnerClass099 {}
+    static class MyInnerClass099 {}
 
-  static class MyInnerClass100 {}
+    static class MyInnerClass100 {}
 
-  static class MyInnerClass101 {}
+    static class MyInnerClass101 {}
 
-  static class MyInnerClass102 {}
+    static class MyInnerClass102 {}
 
-  static class MyInnerClass103 {}
+    static class MyInnerClass103 {}
 
-  static class MyInnerClass104 {}
+    static class MyInnerClass104 {}
 
-  static class MyInnerClass105 {}
+    static class MyInnerClass105 {}
 
-  static class MyInnerClass106 {}
+    static class MyInnerClass106 {}
 
-  static class MyInnerClass107 {}
+    static class MyInnerClass107 {}
 
-  static class MyInnerClass108 {}
+    static class MyInnerClass108 {}
 
-  static class MyInnerClass109 {}
+    static class MyInnerClass109 {}
 
-  static class MyInnerClass110 {}
+    static class MyInnerClass110 {}
 
-  static class MyInnerClass111 {}
+    static class MyInnerClass111 {}
 
-  static class MyInnerClass112 {}
+    static class MyInnerClass112 {}
 
-  static class MyInnerClass113 {}
+    static class MyInnerClass113 {}
 
-  static class MyInnerClass114 {}
+    static class MyInnerClass114 {}
 
-  static class MyInnerClass115 {}
+    static class MyInnerClass115 {}
 
-  static class MyInnerClass116 {}
+    static class MyInnerClass116 {}
 
-  static class MyInnerClass117 {}
+    static class MyInnerClass117 {}
 
-  static class MyInnerClass118 {}
+    static class MyInnerClass118 {}
 
-  static class MyInnerClass119 {}
+    static class MyInnerClass119 {}
 
-  static class MyInnerClass120 {}
+    static class MyInnerClass120 {}
 
-  static class MyInnerClass121 {}
+    static class MyInnerClass121 {}
 
-  static class MyInnerClass122 {}
+    static class MyInnerClass122 {}
 
-  static class MyInnerClass123 {}
+    static class MyInnerClass123 {}
 
-  static class MyInnerClass124 {}
+    static class MyInnerClass124 {}
 
-  static class MyInnerClass125 {}
+    static class MyInnerClass125 {}
 
-  static class MyInnerClass126 {}
+    static class MyInnerClass126 {}
 
-  static class MyInnerClass127 {}
+    static class MyInnerClass127 {}
 
-  static class MyInnerClass128 {}
+    static class MyInnerClass128 {}
 
-  static class MyInnerClass129 {}
+    static class MyInnerClass129 {}
 
-  static class MyInnerClass130 {}
+    static class MyInnerClass130 {}
 
-  static class MyInnerClass131 {}
+    static class MyInnerClass131 {}
 
-  static class MyInnerClass132 {}
+    static class MyInnerClass132 {}
 
-  static class MyInnerClass133 {}
+    static class MyInnerClass133 {}
 
-  static class MyInnerClass134 {}
+    static class MyInnerClass134 {}
 
-  static class MyInnerClass135 {}
+    static class MyInnerClass135 {}
 
-  static class MyInnerClass136 {}
+    static class MyInnerClass136 {}
 
-  static class MyInnerClass137 {}
+    static class MyInnerClass137 {}
 
-  static class MyInnerClass138 {}
+    static class MyInnerClass138 {}
 
-  static class MyInnerClass139 {}
+    static class MyInnerClass139 {}
 
-  static class MyInnerClass140 {}
+    static class MyInnerClass140 {}
 
-  static class MyInnerClass141 {}
+    static class MyInnerClass141 {}
 
-  static class MyInnerClass142 {}
+    static class MyInnerClass142 {}
 
-  static class MyInnerClass143 {}
+    static class MyInnerClass143 {}
 
-  static class MyInnerClass144 {}
+    static class MyInnerClass144 {}
 
-  static class MyInnerClass145 {}
+    static class MyInnerClass145 {}
 
-  static class MyInnerClass146 {}
+    static class MyInnerClass146 {}
 
-  static class MyInnerClass147 {}
+    static class MyInnerClass147 {}
 
-  static class MyInnerClass148 {}
+    static class MyInnerClass148 {}
 
-  static class MyInnerClass149 {}
+    static class MyInnerClass149 {}
 
-  static class MyInnerClass150 {}
+    static class MyInnerClass150 {}
 
-  static class MyInnerClass151 {}
+    static class MyInnerClass151 {}
 
-  static class MyInnerClass152 {}
+    static class MyInnerClass152 {}
 
-  static class MyInnerClass153 {}
+    static class MyInnerClass153 {}
 
-  static class MyInnerClass154 {}
+    static class MyInnerClass154 {}
 
-  static class MyInnerClass155 {}
+    static class MyInnerClass155 {}
 
-  static class MyInnerClass156 {}
+    static class MyInnerClass156 {}
 
-  static class MyInnerClass157 {}
+    static class MyInnerClass157 {}
 
-  static class MyInnerClass158 {}
+    static class MyInnerClass158 {}
 
-  static class MyInnerClass159 {}
+    static class MyInnerClass159 {}
 
-  static class MyInnerClass160 {}
+    static class MyInnerClass160 {}
 
-  static class MyInnerClass161 {}
+    static class MyInnerClass161 {}
 
-  static class MyInnerClass162 {}
+    static class MyInnerClass162 {}
 
-  static class MyInnerClass163 {}
+    static class MyInnerClass163 {}
 
-  static class MyInnerClass164 {}
+    static class MyInnerClass164 {}
 
-  static class MyInnerClass165 {}
+    static class MyInnerClass165 {}
 
-  static class MyInnerClass166 {}
+    static class MyInnerClass166 {}
 
-  static class MyInnerClass167 {}
+    static class MyInnerClass167 {}
 
-  static class MyInnerClass168 {}
+    static class MyInnerClass168 {}
 
-  static class MyInnerClass169 {}
+    static class MyInnerClass169 {}
 
-  static class MyInnerClass170 {}
+    static class MyInnerClass170 {}
 
-  static class MyInnerClass171 {}
+    static class MyInnerClass171 {}
 
-  static class MyInnerClass172 {}
+    static class MyInnerClass172 {}
 
-  static class MyInnerClass173 {}
+    static class MyInnerClass173 {}
 
-  static class MyInnerClass174 {}
+    static class MyInnerClass174 {}
 
-  static class MyInnerClass175 {}
+    static class MyInnerClass175 {}
 
-  static class MyInnerClass176 {}
+    static class MyInnerClass176 {}
 
-  static class MyInnerClass177 {}
+    static class MyInnerClass177 {}
 
-  static class MyInnerClass178 {}
+    static class MyInnerClass178 {}
 
-  static class MyInnerClass179 {}
+    static class MyInnerClass179 {}
 
-  static class MyInnerClass180 {}
+    static class MyInnerClass180 {}
 
-  static class MyInnerClass181 {}
+    static class MyInnerClass181 {}
 
-  static class MyInnerClass182 {}
+    static class MyInnerClass182 {}
 
-  static class MyInnerClass183 {}
+    static class MyInnerClass183 {}
 
-  static class MyInnerClass184 {}
+    static class MyInnerClass184 {}
 
-  static class MyInnerClass185 {}
+    static class MyInnerClass185 {}
 
-  static class MyInnerClass186 {}
+    static class MyInnerClass186 {}
 
-  static class MyInnerClass187 {}
+    static class MyInnerClass187 {}
 
-  static class MyInnerClass188 {}
+    static class MyInnerClass188 {}
 
-  static class MyInnerClass189 {}
+    static class MyInnerClass189 {}
 
-  static class MyInnerClass190 {}
+    static class MyInnerClass190 {}
 
-  static class MyInnerClass191 {}
+    static class MyInnerClass191 {}
 
-  static class MyInnerClass192 {}
+    static class MyInnerClass192 {}
 
-  static class MyInnerClass193 {}
+    static class MyInnerClass193 {}
 
-  static class MyInnerClass194 {}
+    static class MyInnerClass194 {}
 
-  static class MyInnerClass195 {}
+    static class MyInnerClass195 {}
 
-  static class MyInnerClass196 {}
+    static class MyInnerClass196 {}
 
-  static class MyInnerClass197 {}
+    static class MyInnerClass197 {}
 
-  static class MyInnerClass198 {}
+    static class MyInnerClass198 {}
 
-  static class MyInnerClass199 {}
+    static class MyInnerClass199 {}
 
-  static class MyInnerClass200 {}
+    static class MyInnerClass200 {}
 
-  static class MyInnerClass201 {}
+    static class MyInnerClass201 {}
 
-  static class MyInnerClass202 {}
+    static class MyInnerClass202 {}
 
-  static class MyInnerClass203 {}
+    static class MyInnerClass203 {}
 
-  static class MyInnerClass204 {}
+    static class MyInnerClass204 {}
 
-  static class MyInnerClass205 {}
+    static class MyInnerClass205 {}
 
-  static class MyInnerClass206 {}
+    static class MyInnerClass206 {}
 
-  static class MyInnerClass207 {}
+    static class MyInnerClass207 {}
 
-  static class MyInnerClass208 {}
+    static class MyInnerClass208 {}
 
-  static class MyInnerClass209 {}
+    static class MyInnerClass209 {}
 
-  static class MyInnerClass210 {}
+    static class MyInnerClass210 {}
 
-  static class MyInnerClass211 {}
+    static class MyInnerClass211 {}
 
-  static class MyInnerClass212 {}
+    static class MyInnerClass212 {}
 
-  static class MyInnerClass213 {}
+    static class MyInnerClass213 {}
 
-  static class MyInnerClass214 {}
+    static class MyInnerClass214 {}
 
-  static class MyInnerClass215 {}
+    static class MyInnerClass215 {}
 
-  static class MyInnerClass216 {}
+    static class MyInnerClass216 {}
 
-  static class MyInnerClass217 {}
+    static class MyInnerClass217 {}
 
-  static class MyInnerClass218 {}
+    static class MyInnerClass218 {}
 
-  static class MyInnerClass219 {}
+    static class MyInnerClass219 {}
 
-  static class MyInnerClass220 {}
+    static class MyInnerClass220 {}
 
-  static class MyInnerClass221 {}
+    static class MyInnerClass221 {}
 
-  static class MyInnerClass222 {}
+    static class MyInnerClass222 {}
 
-  static class MyInnerClass223 {}
+    static class MyInnerClass223 {}
 
-  static class MyInnerClass224 {}
+    static class MyInnerClass224 {}
 
-  static class MyInnerClass225 {}
+    static class MyInnerClass225 {}
 
-  static class MyInnerClass226 {}
+    static class MyInnerClass226 {}
 
-  static class MyInnerClass227 {}
+    static class MyInnerClass227 {}
 
-  static class MyInnerClass228 {}
+    static class MyInnerClass228 {}
 
-  static class MyInnerClass229 {}
+    static class MyInnerClass229 {}
 
-  static class MyInnerClass230 {}
+    static class MyInnerClass230 {}
 
-  static class MyInnerClass231 {}
+    static class MyInnerClass231 {}
 
-  static class MyInnerClass232 {}
+    static class MyInnerClass232 {}
 
-  static class MyInnerClass233 {}
+    static class MyInnerClass233 {}
 
-  static class MyInnerClass234 {}
+    static class MyInnerClass234 {}
 
-  static class MyInnerClass235 {}
+    static class MyInnerClass235 {}
 
-  static class MyInnerClass236 {}
+    static class MyInnerClass236 {}
 
-  static class MyInnerClass237 {}
+    static class MyInnerClass237 {}
 
-  static class MyInnerClass238 {}
+    static class MyInnerClass238 {}
 
-  static class MyInnerClass239 {}
+    static class MyInnerClass239 {}
 
-  static class MyInnerClass240 {}
+    static class MyInnerClass240 {}
 
-  static class MyInnerClass241 {}
+    static class MyInnerClass241 {}
 
-  static class MyInnerClass242 {}
+    static class MyInnerClass242 {}
 
-  static class MyInnerClass243 {}
+    static class MyInnerClass243 {}
 
-  static class MyInnerClass244 {}
+    static class MyInnerClass244 {}
 
-  static class MyInnerClass245 {}
+    static class MyInnerClass245 {}
 
-  static class MyInnerClass246 {}
+    static class MyInnerClass246 {}
 
-  static class MyInnerClass247 {}
+    static class MyInnerClass247 {}
 
-  static class MyInnerClass248 {}
+    static class MyInnerClass248 {}
 
-  static class MyInnerClass249 {}
+    static class MyInnerClass249 {}
 
-  static class MyInnerClass250 {}
+    static class MyInnerClass250 {}
 
-  static class MyInnerClass251 {}
+    static class MyInnerClass251 {}
 
-  static class MyInnerClass252 {}
+    static class MyInnerClass252 {}
 
-  static class MyInnerClass253 {}
+    static class MyInnerClass253 {}
 
-  static class MyInnerClass254 {}
+    static class MyInnerClass254 {}
 
-  static class MyInnerClass255 {}
+    static class MyInnerClass255 {}
 
-  static class MyInnerClass256 {}
+    static class MyInnerClass256 {}
 
-  static class MyInnerClass257 {}
+    static class MyInnerClass257 {}
 
-  static class MyInnerClass258 {}
+    static class MyInnerClass258 {}
 
-  static class MyInnerClass259 {}
+    static class MyInnerClass259 {}
 
-  static class MyInnerClass260 {}
+    static class MyInnerClass260 {}
 
-  static class MyInnerClass261 {}
+    static class MyInnerClass261 {}
 
-  static class MyInnerClass262 {}
+    static class MyInnerClass262 {}
 
-  static class MyInnerClass263 {}
+    static class MyInnerClass263 {}
 
-  static class MyInnerClass264 {}
+    static class MyInnerClass264 {}
 
-  static class MyInnerClass265 {}
+    static class MyInnerClass265 {}
 
-  static class MyInnerClass266 {}
+    static class MyInnerClass266 {}
 
-  static class MyInnerClass267 {}
+    static class MyInnerClass267 {}
 
-  static class MyInnerClass268 {}
+    static class MyInnerClass268 {}
 
-  static class MyInnerClass269 {}
+    static class MyInnerClass269 {}
 
-  static class MyInnerClass270 {}
+    static class MyInnerClass270 {}
 
-  static class MyInnerClass271 {}
+    static class MyInnerClass271 {}
 
-  static class MyInnerClass272 {}
+    static class MyInnerClass272 {}
 
-  static class MyInnerClass273 {}
+    static class MyInnerClass273 {}
 
-  static class MyInnerClass274 {}
+    static class MyInnerClass274 {}
 
-  static class MyInnerClass275 {}
+    static class MyInnerClass275 {}
 
-  static class MyInnerClass276 {}
+    static class MyInnerClass276 {}
 
-  static class MyInnerClass277 {}
+    static class MyInnerClass277 {}
 
-  static class MyInnerClass278 {}
+    static class MyInnerClass278 {}
 
-  static class MyInnerClass279 {}
+    static class MyInnerClass279 {}
 
-  static class MyInnerClass280 {}
+    static class MyInnerClass280 {}
 
-  static class MyInnerClass281 {}
+    static class MyInnerClass281 {}
 
-  static class MyInnerClass282 {}
+    static class MyInnerClass282 {}
 
-  static class MyInnerClass283 {}
+    static class MyInnerClass283 {}
 
-  static class MyInnerClass284 {}
+    static class MyInnerClass284 {}
 
-  static class MyInnerClass285 {}
+    static class MyInnerClass285 {}
 
-  static class MyInnerClass286 {}
+    static class MyInnerClass286 {}
 
-  static class MyInnerClass287 {}
+    static class MyInnerClass287 {}
 
-  static class MyInnerClass288 {}
+    static class MyInnerClass288 {}
 
-  static class MyInnerClass289 {}
+    static class MyInnerClass289 {}
 
-  static class MyInnerClass290 {}
+    static class MyInnerClass290 {}
 
-  static class MyInnerClass291 {}
+    static class MyInnerClass291 {}
 
-  static class MyInnerClass292 {}
+    static class MyInnerClass292 {}
 
-  static class MyInnerClass293 {}
+    static class MyInnerClass293 {}
 
-  static class MyInnerClass294 {}
+    static class MyInnerClass294 {}
 
-  static class MyInnerClass295 {}
+    static class MyInnerClass295 {}
 
-  static class MyInnerClass296 {}
+    static class MyInnerClass296 {}
 
-  static class MyInnerClass297 {}
+    static class MyInnerClass297 {}
 
-  static class MyInnerClass298 {}
+    static class MyInnerClass298 {}
 
-  static class MyInnerClass299 {}
+    static class MyInnerClass299 {}
 
-  static class MyInnerClass300 {}
+    static class MyInnerClass300 {}
 
-  static class MyInnerClass301 {}
+    static class MyInnerClass301 {}
 
-  static class MyInnerClass302 {}
+    static class MyInnerClass302 {}
 
-  static class MyInnerClass303 {}
+    static class MyInnerClass303 {}
 
-  static class MyInnerClass304 {}
+    static class MyInnerClass304 {}
 
-  static class MyInnerClass305 {}
+    static class MyInnerClass305 {}
 
-  static class MyInnerClass306 {}
+    static class MyInnerClass306 {}
 
-  static class MyInnerClass307 {}
+    static class MyInnerClass307 {}
 
-  static class MyInnerClass308 {}
+    static class MyInnerClass308 {}
 
-  static class MyInnerClass309 {}
+    static class MyInnerClass309 {}
 
-  static class MyInnerClass310 {}
+    static class MyInnerClass310 {}
 
-  static class MyInnerClass311 {}
+    static class MyInnerClass311 {}
 
-  static class MyInnerClass312 {}
+    static class MyInnerClass312 {}
 
-  static class MyInnerClass313 {}
+    static class MyInnerClass313 {}
 
-  static class MyInnerClass314 {}
+    static class MyInnerClass314 {}
 
-  static class MyInnerClass315 {}
+    static class MyInnerClass315 {}
 
-  static class MyInnerClass316 {}
+    static class MyInnerClass316 {}
 
-  static class MyInnerClass317 {}
+    static class MyInnerClass317 {}
 
-  static class MyInnerClass318 {}
+    static class MyInnerClass318 {}
 
-  static class MyInnerClass319 {}
+    static class MyInnerClass319 {}
 
-  static class MyInnerClass320 {}
+    static class MyInnerClass320 {}
 
-  static class MyInnerClass321 {}
+    static class MyInnerClass321 {}
 
-  static class MyInnerClass322 {}
+    static class MyInnerClass322 {}
 
-  static class MyInnerClass323 {}
+    static class MyInnerClass323 {}
 
-  static class MyInnerClass324 {}
+    static class MyInnerClass324 {}
 
-  static class MyInnerClass325 {}
+    static class MyInnerClass325 {}
 
-  static class MyInnerClass326 {}
+    static class MyInnerClass326 {}
 
-  static class MyInnerClass327 {}
+    static class MyInnerClass327 {}
 
-  static class MyInnerClass328 {}
+    static class MyInnerClass328 {}
 
-  static class MyInnerClass329 {}
+    static class MyInnerClass329 {}
 
-  static class MyInnerClass330 {}
+    static class MyInnerClass330 {}
 
-  static class MyInnerClass331 {}
+    static class MyInnerClass331 {}
 
-  static class MyInnerClass332 {}
+    static class MyInnerClass332 {}
 
-  static class MyInnerClass333 {}
+    static class MyInnerClass333 {}
 
-  static class MyInnerClass334 {}
+    static class MyInnerClass334 {}
 
-  static class MyInnerClass335 {}
+    static class MyInnerClass335 {}
 
-  static class MyInnerClass336 {}
+    static class MyInnerClass336 {}
 
-  static class MyInnerClass337 {}
+    static class MyInnerClass337 {}
 
-  static class MyInnerClass338 {}
+    static class MyInnerClass338 {}
 
-  static class MyInnerClass339 {}
+    static class MyInnerClass339 {}
 
-  static class MyInnerClass340 {}
+    static class MyInnerClass340 {}
 
-  static class MyInnerClass341 {}
+    static class MyInnerClass341 {}
 
-  static class MyInnerClass342 {}
+    static class MyInnerClass342 {}
 
-  static class MyInnerClass343 {}
+    static class MyInnerClass343 {}
 
-  static class MyInnerClass344 {}
+    static class MyInnerClass344 {}
 
-  static class MyInnerClass345 {}
+    static class MyInnerClass345 {}
 
-  static class MyInnerClass346 {}
+    static class MyInnerClass346 {}
 
-  static class MyInnerClass347 {}
+    static class MyInnerClass347 {}
 
-  static class MyInnerClass348 {}
+    static class MyInnerClass348 {}
 
-  static class MyInnerClass349 {}
+    static class MyInnerClass349 {}
 
-  static class MyInnerClass350 {}
+    static class MyInnerClass350 {}
 
-  static class MyInnerClass351 {}
+    static class MyInnerClass351 {}
 
-  static class MyInnerClass352 {}
+    static class MyInnerClass352 {}
 
-  static class MyInnerClass353 {}
+    static class MyInnerClass353 {}
 
-  static class MyInnerClass354 {}
+    static class MyInnerClass354 {}
 
-  static class MyInnerClass355 {}
+    static class MyInnerClass355 {}
 
-  static class MyInnerClass356 {}
+    static class MyInnerClass356 {}
 
-  static class MyInnerClass357 {}
+    static class MyInnerClass357 {}
 
-  static class MyInnerClass358 {}
+    static class MyInnerClass358 {}
 
-  static class MyInnerClass359 {}
+    static class MyInnerClass359 {}
 
-  static class MyInnerClass360 {}
+    static class MyInnerClass360 {}
 
-  static class MyInnerClass361 {}
+    static class MyInnerClass361 {}
 
-  static class MyInnerClass362 {}
+    static class MyInnerClass362 {}
 
-  static class MyInnerClass363 {}
+    static class MyInnerClass363 {}
 
-  static class MyInnerClass364 {}
+    static class MyInnerClass364 {}
 
-  static class MyInnerClass365 {}
+    static class MyInnerClass365 {}
 
-  static class MyInnerClass366 {}
+    static class MyInnerClass366 {}
 
-  static class MyInnerClass367 {}
+    static class MyInnerClass367 {}
 
-  static class MyInnerClass368 {}
+    static class MyInnerClass368 {}
 
-  static class MyInnerClass369 {}
+    static class MyInnerClass369 {}
 
-  static class MyInnerClass370 {}
+    static class MyInnerClass370 {}
 
-  static class MyInnerClass371 {}
+    static class MyInnerClass371 {}
 
-  static class MyInnerClass372 {}
+    static class MyInnerClass372 {}
 
-  static class MyInnerClass373 {}
+    static class MyInnerClass373 {}
 
-  static class MyInnerClass374 {}
+    static class MyInnerClass374 {}
 
-  static class MyInnerClass375 {}
+    static class MyInnerClass375 {}
 
-  static class MyInnerClass376 {}
+    static class MyInnerClass376 {}
 
-  static class MyInnerClass377 {}
+    static class MyInnerClass377 {}
 
-  static class MyInnerClass378 {}
+    static class MyInnerClass378 {}
 
-  static class MyInnerClass379 {}
+    static class MyInnerClass379 {}
 
-  static class MyInnerClass380 {}
+    static class MyInnerClass380 {}
 
-  static class MyInnerClass381 {}
+    static class MyInnerClass381 {}
 
-  static class MyInnerClass382 {}
+    static class MyInnerClass382 {}
 
-  static class MyInnerClass383 {}
+    static class MyInnerClass383 {}
 
-  static class MyInnerClass384 {}
+    static class MyInnerClass384 {}
 
-  static class MyInnerClass385 {}
+    static class MyInnerClass385 {}
 
-  static class MyInnerClass386 {}
+    static class MyInnerClass386 {}
 
-  static class MyInnerClass387 {}
+    static class MyInnerClass387 {}
 
-  static class MyInnerClass388 {}
+    static class MyInnerClass388 {}
 
-  static class MyInnerClass389 {}
+    static class MyInnerClass389 {}
 
-  static class MyInnerClass390 {}
+    static class MyInnerClass390 {}
 
-  static class MyInnerClass391 {}
+    static class MyInnerClass391 {}
 
-  static class MyInnerClass392 {}
+    static class MyInnerClass392 {}
 
-  static class MyInnerClass393 {}
+    static class MyInnerClass393 {}
 
-  static class MyInnerClass394 {}
+    static class MyInnerClass394 {}
 
-  static class MyInnerClass395 {}
+    static class MyInnerClass395 {}
 
-  static class MyInnerClass396 {}
+    static class MyInnerClass396 {}
 
-  static class MyInnerClass397 {}
+    static class MyInnerClass397 {}
 
-  static class MyInnerClass398 {}
+    static class MyInnerClass398 {}
 
-  static class MyInnerClass399 {}
+    static class MyInnerClass399 {}
 
-  static class MyInnerClass400 {}
+    static class MyInnerClass400 {}
 
-  static class MyInnerClass401 {}
+    static class MyInnerClass401 {}
 
-  static class MyInnerClass402 {}
+    static class MyInnerClass402 {}
 
-  static class MyInnerClass403 {}
+    static class MyInnerClass403 {}
 
-  static class MyInnerClass404 {}
+    static class MyInnerClass404 {}
 
-  static class MyInnerClass405 {}
+    static class MyInnerClass405 {}
 
-  static class MyInnerClass406 {}
+    static class MyInnerClass406 {}
 
-  static class MyInnerClass407 {}
+    static class MyInnerClass407 {}
 
-  static class MyInnerClass408 {}
+    static class MyInnerClass408 {}
 
-  static class MyInnerClass409 {}
+    static class MyInnerClass409 {}
 
-  static class MyInnerClass410 {}
+    static class MyInnerClass410 {}
 
-  static class MyInnerClass411 {}
+    static class MyInnerClass411 {}
 
-  static class MyInnerClass412 {}
+    static class MyInnerClass412 {}
 
-  static class MyInnerClass413 {}
+    static class MyInnerClass413 {}
 
-  static class MyInnerClass414 {}
+    static class MyInnerClass414 {}
 
-  static class MyInnerClass415 {}
+    static class MyInnerClass415 {}
 
-  static class MyInnerClass416 {}
+    static class MyInnerClass416 {}
 
-  static class MyInnerClass417 {}
+    static class MyInnerClass417 {}
 
-  static class MyInnerClass418 {}
+    static class MyInnerClass418 {}
 
-  static class MyInnerClass419 {}
+    static class MyInnerClass419 {}
 
-  static class MyInnerClass420 {}
+    static class MyInnerClass420 {}
 
-  static class MyInnerClass421 {}
+    static class MyInnerClass421 {}
 
-  static class MyInnerClass422 {}
+    static class MyInnerClass422 {}
 
-  static class MyInnerClass423 {}
+    static class MyInnerClass423 {}
 
-  static class MyInnerClass424 {}
+    static class MyInnerClass424 {}
 
-  static class MyInnerClass425 {}
+    static class MyInnerClass425 {}
 
-  static class MyInnerClass426 {}
+    static class MyInnerClass426 {}
 
-  static class MyInnerClass427 {}
+    static class MyInnerClass427 {}
 
-  static class MyInnerClass428 {}
+    static class MyInnerClass428 {}
 
-  static class MyInnerClass429 {}
+    static class MyInnerClass429 {}
 
-  static class MyInnerClass430 {}
+    static class MyInnerClass430 {}
 
-  static class MyInnerClass431 {}
+    static class MyInnerClass431 {}
 
-  static class MyInnerClass432 {}
+    static class MyInnerClass432 {}
 
-  static class MyInnerClass433 {}
+    static class MyInnerClass433 {}
 
-  static class MyInnerClass434 {}
+    static class MyInnerClass434 {}
 
-  static class MyInnerClass435 {}
+    static class MyInnerClass435 {}
 
-  static class MyInnerClass436 {}
+    static class MyInnerClass436 {}
 
-  static class MyInnerClass437 {}
+    static class MyInnerClass437 {}
 
-  static class MyInnerClass438 {}
+    static class MyInnerClass438 {}
 
-  static class MyInnerClass439 {}
+    static class MyInnerClass439 {}
 
-  static class MyInnerClass440 {}
+    static class MyInnerClass440 {}
 
-  static class MyInnerClass441 {}
+    static class MyInnerClass441 {}
 
-  static class MyInnerClass442 {}
+    static class MyInnerClass442 {}
 
-  static class MyInnerClass443 {}
+    static class MyInnerClass443 {}
 
-  static class MyInnerClass444 {}
+    static class MyInnerClass444 {}
 
-  static class MyInnerClass445 {}
+    static class MyInnerClass445 {}
 
-  static class MyInnerClass446 {}
+    static class MyInnerClass446 {}
 
-  static class MyInnerClass447 {}
+    static class MyInnerClass447 {}
 
-  static class MyInnerClass448 {}
+    static class MyInnerClass448 {}
 
-  static class MyInnerClass449 {}
+    static class MyInnerClass449 {}
 
-  static class MyInnerClass450 {}
+    static class MyInnerClass450 {}
 
-  static class MyInnerClass451 {}
+    static class MyInnerClass451 {}
 
-  static class MyInnerClass452 {}
+    static class MyInnerClass452 {}
 
-  static class MyInnerClass453 {}
+    static class MyInnerClass453 {}
 
-  static class MyInnerClass454 {}
+    static class MyInnerClass454 {}
 
-  static class MyInnerClass455 {}
+    static class MyInnerClass455 {}
 
-  static class MyInnerClass456 {}
+    static class MyInnerClass456 {}
 
-  static class MyInnerClass457 {}
+    static class MyInnerClass457 {}
 
-  static class MyInnerClass458 {}
+    static class MyInnerClass458 {}
 
-  static class MyInnerClass459 {}
+    static class MyInnerClass459 {}
 
-  static class MyInnerClass460 {}
+    static class MyInnerClass460 {}
 
-  static class MyInnerClass461 {}
+    static class MyInnerClass461 {}
 
-  static class MyInnerClass462 {}
+    static class MyInnerClass462 {}
 
-  static class MyInnerClass463 {}
+    static class MyInnerClass463 {}
 
-  static class MyInnerClass464 {}
+    static class MyInnerClass464 {}
 
-  static class MyInnerClass465 {}
+    static class MyInnerClass465 {}
 
-  static class MyInnerClass466 {}
+    static class MyInnerClass466 {}
 
-  static class MyInnerClass467 {}
+    static class MyInnerClass467 {}
 
-  static class MyInnerClass468 {}
+    static class MyInnerClass468 {}
 
-  static class MyInnerClass469 {}
+    static class MyInnerClass469 {}
 
-  static class MyInnerClass470 {}
+    static class MyInnerClass470 {}
 
-  static class MyInnerClass471 {}
+    static class MyInnerClass471 {}
 
-  static class MyInnerClass472 {}
+    static class MyInnerClass472 {}
 
-  static class MyInnerClass473 {}
+    static class MyInnerClass473 {}
 
-  static class MyInnerClass474 {}
+    static class MyInnerClass474 {}
 
-  static class MyInnerClass475 {}
+    static class MyInnerClass475 {}
 
-  static class MyInnerClass476 {}
+    static class MyInnerClass476 {}
 
-  static class MyInnerClass477 {}
+    static class MyInnerClass477 {}
 
-  static class MyInnerClass478 {}
+    static class MyInnerClass478 {}
 
-  static class MyInnerClass479 {}
+    static class MyInnerClass479 {}
 
-  static class MyInnerClass480 {}
+    static class MyInnerClass480 {}
 
-  static class MyInnerClass481 {}
+    static class MyInnerClass481 {}
 
-  static class MyInnerClass482 {}
+    static class MyInnerClass482 {}
 
-  static class MyInnerClass483 {}
+    static class MyInnerClass483 {}
 
-  static class MyInnerClass484 {}
+    static class MyInnerClass484 {}
 
-  static class MyInnerClass485 {}
+    static class MyInnerClass485 {}
 
-  static class MyInnerClass486 {}
+    static class MyInnerClass486 {}
 
-  static class MyInnerClass487 {}
+    static class MyInnerClass487 {}
 
-  static class MyInnerClass488 {}
+    static class MyInnerClass488 {}
 
-  static class MyInnerClass489 {}
+    static class MyInnerClass489 {}
 
-  static class MyInnerClass490 {}
+    static class MyInnerClass490 {}
 
-  static class MyInnerClass491 {}
+    static class MyInnerClass491 {}
 
-  static class MyInnerClass492 {}
+    static class MyInnerClass492 {}
 
-  static class MyInnerClass493 {}
+    static class MyInnerClass493 {}
 
-  static class MyInnerClass494 {}
+    static class MyInnerClass494 {}
 
-  static class MyInnerClass495 {}
+    static class MyInnerClass495 {}
 
-  static class MyInnerClass496 {}
+    static class MyInnerClass496 {}
 
-  static class MyInnerClass497 {}
+    static class MyInnerClass497 {}
 
-  static class MyInnerClass498 {}
+    static class MyInnerClass498 {}
 
-  static class MyInnerClass499 {}
+    static class MyInnerClass499 {}
 
-  static class MyInnerClass500 {}
+    static class MyInnerClass500 {}
 
-  static class MyInnerClass501 {}
+    static class MyInnerClass501 {}
 
-  static class MyInnerClass502 {}
+    static class MyInnerClass502 {}
 
-  static class MyInnerClass503 {}
+    static class MyInnerClass503 {}
 
-  static class MyInnerClass504 {}
+    static class MyInnerClass504 {}
 
-  static class MyInnerClass505 {}
+    static class MyInnerClass505 {}
 
-  static class MyInnerClass506 {}
+    static class MyInnerClass506 {}
 
-  static class MyInnerClass507 {}
+    static class MyInnerClass507 {}
 
-  static class MyInnerClass508 {}
+    static class MyInnerClass508 {}
 
-  static class MyInnerClass509 {}
+    static class MyInnerClass509 {}
 
-  static class MyInnerClass510 {}
+    static class MyInnerClass510 {}
 
-  static class MyInnerClass511 {}
+    static class MyInnerClass511 {}
 
-  static class MyInnerClass512 {}
+    static class MyInnerClass512 {}
 
-  static class MyInnerClass513 {}
+    static class MyInnerClass513 {}
 
-  static class MyInnerClass514 {}
+    static class MyInnerClass514 {}
 
-  static class MyInnerClass515 {}
+    static class MyInnerClass515 {}
 
-  static class MyInnerClass516 {}
+    static class MyInnerClass516 {}
 
-  static class MyInnerClass517 {}
+    static class MyInnerClass517 {}
 
-  static class MyInnerClass518 {}
+    static class MyInnerClass518 {}
 
-  static class MyInnerClass519 {}
+    static class MyInnerClass519 {}
 
-  static class MyInnerClass520 {}
+    static class MyInnerClass520 {}
 
-  static class MyInnerClass521 {}
+    static class MyInnerClass521 {}
 
-  static class MyInnerClass522 {}
+    static class MyInnerClass522 {}
 
-  static class MyInnerClass523 {}
+    static class MyInnerClass523 {}
 
-  static class MyInnerClass524 {}
+    static class MyInnerClass524 {}
 
-  static class MyInnerClass525 {}
+    static class MyInnerClass525 {}
 
-  static class MyInnerClass526 {}
+    static class MyInnerClass526 {}
 
-  static class MyInnerClass527 {}
+    static class MyInnerClass527 {}
 
-  static class MyInnerClass528 {}
+    static class MyInnerClass528 {}
 
-  static class MyInnerClass529 {}
+    static class MyInnerClass529 {}
 
-  static class MyInnerClass530 {}
+    static class MyInnerClass530 {}
 
-  static class MyInnerClass531 {}
+    static class MyInnerClass531 {}
 
-  static class MyInnerClass532 {}
+    static class MyInnerClass532 {}
 
-  static class MyInnerClass533 {}
+    static class MyInnerClass533 {}
 
-  static class MyInnerClass534 {}
+    static class MyInnerClass534 {}
 
-  static class MyInnerClass535 {}
+    static class MyInnerClass535 {}
 
-  static class MyInnerClass536 {}
+    static class MyInnerClass536 {}
 
-  static class MyInnerClass537 {}
+    static class MyInnerClass537 {}
 
-  static class MyInnerClass538 {}
+    static class MyInnerClass538 {}
 
-  static class MyInnerClass539 {}
+    static class MyInnerClass539 {}
 
-  static class MyInnerClass540 {}
+    static class MyInnerClass540 {}
 
-  static class MyInnerClass541 {}
+    static class MyInnerClass541 {}
 
-  static class MyInnerClass542 {}
+    static class MyInnerClass542 {}
 
-  static class MyInnerClass543 {}
+    static class MyInnerClass543 {}
 
-  static class MyInnerClass544 {}
+    static class MyInnerClass544 {}
 
-  static class MyInnerClass545 {}
+    static class MyInnerClass545 {}
 
-  static class MyInnerClass546 {}
+    static class MyInnerClass546 {}
 
-  static class MyInnerClass547 {}
+    static class MyInnerClass547 {}
 
-  static class MyInnerClass548 {}
+    static class MyInnerClass548 {}
 
-  static class MyInnerClass549 {}
+    static class MyInnerClass549 {}
 
-  static class MyInnerClass550 {}
+    static class MyInnerClass550 {}
 
-  static class MyInnerClass551 {}
+    static class MyInnerClass551 {}
 
-  static class MyInnerClass552 {}
+    static class MyInnerClass552 {}
 
-  static class MyInnerClass553 {}
+    static class MyInnerClass553 {}
 
-  static class MyInnerClass554 {}
+    static class MyInnerClass554 {}
 
-  static class MyInnerClass555 {}
+    static class MyInnerClass555 {}
 
-  static class MyInnerClass556 {}
+    static class MyInnerClass556 {}
 
-  static class MyInnerClass557 {}
+    static class MyInnerClass557 {}
 
-  static class MyInnerClass558 {}
+    static class MyInnerClass558 {}
 
-  static class MyInnerClass559 {}
+    static class MyInnerClass559 {}
 
-  static class MyInnerClass560 {}
+    static class MyInnerClass560 {}
 
-  static class MyInnerClass561 {}
+    static class MyInnerClass561 {}
 
-  static class MyInnerClass562 {}
+    static class MyInnerClass562 {}
 
-  static class MyInnerClass563 {}
+    static class MyInnerClass563 {}
 
-  static class MyInnerClass564 {}
+    static class MyInnerClass564 {}
 
-  static class MyInnerClass565 {}
+    static class MyInnerClass565 {}
 
-  static class MyInnerClass566 {}
+    static class MyInnerClass566 {}
 
-  static class MyInnerClass567 {}
+    static class MyInnerClass567 {}
 
-  static class MyInnerClass568 {}
+    static class MyInnerClass568 {}
 
-  static class MyInnerClass569 {}
+    static class MyInnerClass569 {}
 
-  static class MyInnerClass570 {}
+    static class MyInnerClass570 {}
 
-  static class MyInnerClass571 {}
+    static class MyInnerClass571 {}
 
-  static class MyInnerClass572 {}
+    static class MyInnerClass572 {}
 
-  static class MyInnerClass573 {}
+    static class MyInnerClass573 {}
 
-  static class MyInnerClass574 {}
+    static class MyInnerClass574 {}
 
-  static class MyInnerClass575 {}
+    static class MyInnerClass575 {}
 
-  static class MyInnerClass576 {}
+    static class MyInnerClass576 {}
 
-  static class MyInnerClass577 {}
+    static class MyInnerClass577 {}
 
-  static class MyInnerClass578 {}
+    static class MyInnerClass578 {}
 
-  static class MyInnerClass579 {}
+    static class MyInnerClass579 {}
 
-  static class MyInnerClass580 {}
+    static class MyInnerClass580 {}
 
-  static class MyInnerClass581 {}
+    static class MyInnerClass581 {}
 
-  static class MyInnerClass582 {}
+    static class MyInnerClass582 {}
 
-  static class MyInnerClass583 {}
+    static class MyInnerClass583 {}
 
-  static class MyInnerClass584 {}
+    static class MyInnerClass584 {}
 
-  static class MyInnerClass585 {}
+    static class MyInnerClass585 {}
 
-  static class MyInnerClass586 {}
+    static class MyInnerClass586 {}
 
-  static class MyInnerClass587 {}
+    static class MyInnerClass587 {}
 
-  static class MyInnerClass588 {}
+    static class MyInnerClass588 {}
 
-  static class MyInnerClass589 {}
+    static class MyInnerClass589 {}
 
-  static class MyInnerClass590 {}
+    static class MyInnerClass590 {}
 
-  static class MyInnerClass591 {}
+    static class MyInnerClass591 {}
 
-  static class MyInnerClass592 {}
+    static class MyInnerClass592 {}
 
-  static class MyInnerClass593 {}
+    static class MyInnerClass593 {}
 
-  static class MyInnerClass594 {}
+    static class MyInnerClass594 {}
 
-  static class MyInnerClass595 {}
+    static class MyInnerClass595 {}
 
-  static class MyInnerClass596 {}
+    static class MyInnerClass596 {}
 
-  static class MyInnerClass597 {}
+    static class MyInnerClass597 {}
 
-  static class MyInnerClass598 {}
+    static class MyInnerClass598 {}
 
-  static class MyInnerClass599 {}
+    static class MyInnerClass599 {}
 
-  static class MyInnerClass600 {}
+    static class MyInnerClass600 {}
 
-  static class MyInnerClass601 {}
+    static class MyInnerClass601 {}
 
-  static class MyInnerClass602 {}
+    static class MyInnerClass602 {}
 
-  static class MyInnerClass603 {}
+    static class MyInnerClass603 {}
 
-  static class MyInnerClass604 {}
+    static class MyInnerClass604 {}
 
-  static class MyInnerClass605 {}
+    static class MyInnerClass605 {}
 
-  static class MyInnerClass606 {}
+    static class MyInnerClass606 {}
 
-  static class MyInnerClass607 {}
+    static class MyInnerClass607 {}
 
-  static class MyInnerClass608 {}
+    static class MyInnerClass608 {}
 
-  static class MyInnerClass609 {}
+    static class MyInnerClass609 {}
 
-  static class MyInnerClass610 {}
+    static class MyInnerClass610 {}
 
-  static class MyInnerClass611 {}
+    static class MyInnerClass611 {}
 
-  static class MyInnerClass612 {}
+    static class MyInnerClass612 {}
 
-  static class MyInnerClass613 {}
+    static class MyInnerClass613 {}
 
-  static class MyInnerClass614 {}
+    static class MyInnerClass614 {}
 
-  static class MyInnerClass615 {}
+    static class MyInnerClass615 {}
 
-  static class MyInnerClass616 {}
+    static class MyInnerClass616 {}
 
-  static class MyInnerClass617 {}
+    static class MyInnerClass617 {}
 
-  static class MyInnerClass618 {}
+    static class MyInnerClass618 {}
 
-  static class MyInnerClass619 {}
+    static class MyInnerClass619 {}
 
-  static class MyInnerClass620 {}
+    static class MyInnerClass620 {}
 
-  static class MyInnerClass621 {}
+    static class MyInnerClass621 {}
 
-  static class MyInnerClass622 {}
+    static class MyInnerClass622 {}
 
-  static class MyInnerClass623 {}
+    static class MyInnerClass623 {}
 
-  static class MyInnerClass624 {}
+    static class MyInnerClass624 {}
 
-  static class MyInnerClass625 {}
+    static class MyInnerClass625 {}
 
-  static class MyInnerClass626 {}
+    static class MyInnerClass626 {}
 
-  static class MyInnerClass627 {}
+    static class MyInnerClass627 {}
 
-  static class MyInnerClass628 {}
+    static class MyInnerClass628 {}
 
-  static class MyInnerClass629 {}
+    static class MyInnerClass629 {}
 
-  static class MyInnerClass630 {}
+    static class MyInnerClass630 {}
 
-  static class MyInnerClass631 {}
+    static class MyInnerClass631 {}
 
-  static class MyInnerClass632 {}
+    static class MyInnerClass632 {}
 
-  static class MyInnerClass633 {}
+    static class MyInnerClass633 {}
 
-  static class MyInnerClass634 {}
+    static class MyInnerClass634 {}
 
-  static class MyInnerClass635 {}
+    static class MyInnerClass635 {}
 
-  static class MyInnerClass636 {}
+    static class MyInnerClass636 {}
 
-  static class MyInnerClass637 {}
+    static class MyInnerClass637 {}
 
-  static class MyInnerClass638 {}
+    static class MyInnerClass638 {}
 
-  static class MyInnerClass639 {}
+    static class MyInnerClass639 {}
 
-  static class MyInnerClass640 {}
+    static class MyInnerClass640 {}
 
-  static class MyInnerClass641 {}
+    static class MyInnerClass641 {}
 
-  static class MyInnerClass642 {}
+    static class MyInnerClass642 {}
 
-  static class MyInnerClass643 {}
+    static class MyInnerClass643 {}
 
-  static class MyInnerClass644 {}
+    static class MyInnerClass644 {}
 
-  static class MyInnerClass645 {}
+    static class MyInnerClass645 {}
 
-  static class MyInnerClass646 {}
+    static class MyInnerClass646 {}
 
-  static class MyInnerClass647 {}
+    static class MyInnerClass647 {}
 
-  static class MyInnerClass648 {}
+    static class MyInnerClass648 {}
 
-  static class MyInnerClass649 {}
+    static class MyInnerClass649 {}
 
-  static class MyInnerClass650 {}
+    static class MyInnerClass650 {}
 
-  static class MyInnerClass651 {}
+    static class MyInnerClass651 {}
 
-  static class MyInnerClass652 {}
+    static class MyInnerClass652 {}
 
-  static class MyInnerClass653 {}
+    static class MyInnerClass653 {}
 
-  static class MyInnerClass654 {}
+    static class MyInnerClass654 {}
 
-  static class MyInnerClass655 {}
+    static class MyInnerClass655 {}
 
-  static class MyInnerClass656 {}
+    static class MyInnerClass656 {}
 
-  static class MyInnerClass657 {}
+    static class MyInnerClass657 {}
 
-  static class MyInnerClass658 {}
+    static class MyInnerClass658 {}
 
-  static class MyInnerClass659 {}
+    static class MyInnerClass659 {}
 
-  static class MyInnerClass660 {}
+    static class MyInnerClass660 {}
 
-  static class MyInnerClass661 {}
+    static class MyInnerClass661 {}
 
-  static class MyInnerClass662 {}
+    static class MyInnerClass662 {}
 
-  static class MyInnerClass663 {}
+    static class MyInnerClass663 {}
 
-  static class MyInnerClass664 {}
+    static class MyInnerClass664 {}
 
-  static class MyInnerClass665 {}
+    static class MyInnerClass665 {}
 
-  static class MyInnerClass666 {}
+    static class MyInnerClass666 {}
 
-  static class MyInnerClass667 {}
+    static class MyInnerClass667 {}
 
-  static class MyInnerClass668 {}
+    static class MyInnerClass668 {}
 
-  static class MyInnerClass669 {}
+    static class MyInnerClass669 {}
 
-  static class MyInnerClass670 {}
+    static class MyInnerClass670 {}
 
-  static class MyInnerClass671 {}
+    static class MyInnerClass671 {}
 
-  static class MyInnerClass672 {}
+    static class MyInnerClass672 {}
 
-  static class MyInnerClass673 {}
+    static class MyInnerClass673 {}
 
-  static class MyInnerClass674 {}
+    static class MyInnerClass674 {}
 
-  static class MyInnerClass675 {}
+    static class MyInnerClass675 {}
 
-  static class MyInnerClass676 {}
+    static class MyInnerClass676 {}
 
-  static class MyInnerClass677 {}
+    static class MyInnerClass677 {}
 
-  static class MyInnerClass678 {}
+    static class MyInnerClass678 {}
 
-  static class MyInnerClass679 {}
+    static class MyInnerClass679 {}
 
-  static class MyInnerClass680 {}
+    static class MyInnerClass680 {}
 
-  static class MyInnerClass681 {}
+    static class MyInnerClass681 {}
 
-  static class MyInnerClass682 {}
+    static class MyInnerClass682 {}
 
-  static class MyInnerClass683 {}
+    static class MyInnerClass683 {}
 
-  static class MyInnerClass684 {}
+    static class MyInnerClass684 {}
 
-  static class MyInnerClass685 {}
+    static class MyInnerClass685 {}
 
-  static class MyInnerClass686 {}
+    static class MyInnerClass686 {}
 
-  static class MyInnerClass687 {}
+    static class MyInnerClass687 {}
 
-  static class MyInnerClass688 {}
+    static class MyInnerClass688 {}
 
-  static class MyInnerClass689 {}
+    static class MyInnerClass689 {}
 
-  static class MyInnerClass690 {}
+    static class MyInnerClass690 {}
 
-  static class MyInnerClass691 {}
+    static class MyInnerClass691 {}
 
-  static class MyInnerClass692 {}
+    static class MyInnerClass692 {}
 
-  static class MyInnerClass693 {}
+    static class MyInnerClass693 {}
 
-  static class MyInnerClass694 {}
+    static class MyInnerClass694 {}
 
-  static class MyInnerClass695 {}
+    static class MyInnerClass695 {}
 
-  static class MyInnerClass696 {}
+    static class MyInnerClass696 {}
 
-  static class MyInnerClass697 {}
+    static class MyInnerClass697 {}
 
-  static class MyInnerClass698 {}
+    static class MyInnerClass698 {}
 
-  static class MyInnerClass699 {}
+    static class MyInnerClass699 {}
 
-  static class MyInnerClass700 {}
+    static class MyInnerClass700 {}
 
-  static class MyInnerClass701 {}
+    static class MyInnerClass701 {}
 
-  static class MyInnerClass702 {}
+    static class MyInnerClass702 {}
 
-  static class MyInnerClass703 {}
+    static class MyInnerClass703 {}
 
-  static class MyInnerClass704 {}
+    static class MyInnerClass704 {}
 
-  static class MyInnerClass705 {}
+    static class MyInnerClass705 {}
 
-  static class MyInnerClass706 {}
+    static class MyInnerClass706 {}
 
-  static class MyInnerClass707 {}
+    static class MyInnerClass707 {}
 
-  static class MyInnerClass708 {}
+    static class MyInnerClass708 {}
 
-  static class MyInnerClass709 {}
+    static class MyInnerClass709 {}
 
-  static class MyInnerClass710 {}
+    static class MyInnerClass710 {}
 
-  static class MyInnerClass711 {}
+    static class MyInnerClass711 {}
 
-  static class MyInnerClass712 {}
+    static class MyInnerClass712 {}
 
-  static class MyInnerClass713 {}
+    static class MyInnerClass713 {}
 
-  static class MyInnerClass714 {}
+    static class MyInnerClass714 {}
 
-  static class MyInnerClass715 {}
+    static class MyInnerClass715 {}
 
-  static class MyInnerClass716 {}
+    static class MyInnerClass716 {}
 
-  static class MyInnerClass717 {}
+    static class MyInnerClass717 {}
 
-  static class MyInnerClass718 {}
+    static class MyInnerClass718 {}
 
-  static class MyInnerClass719 {}
+    static class MyInnerClass719 {}
 
-  static class MyInnerClass720 {}
+    static class MyInnerClass720 {}
 
-  static class MyInnerClass721 {}
+    static class MyInnerClass721 {}
 
-  static class MyInnerClass722 {}
+    static class MyInnerClass722 {}
 
-  static class MyInnerClass723 {}
+    static class MyInnerClass723 {}
 
-  static class MyInnerClass724 {}
+    static class MyInnerClass724 {}
 
-  static class MyInnerClass725 {}
+    static class MyInnerClass725 {}
 
-  static class MyInnerClass726 {}
+    static class MyInnerClass726 {}
 
-  static class MyInnerClass727 {}
+    static class MyInnerClass727 {}
 
-  static class MyInnerClass728 {}
+    static class MyInnerClass728 {}
 
-  static class MyInnerClass729 {}
+    static class MyInnerClass729 {}
 
-  static class MyInnerClass730 {}
+    static class MyInnerClass730 {}
 
-  static class MyInnerClass731 {}
+    static class MyInnerClass731 {}
 
-  static class MyInnerClass732 {}
+    static class MyInnerClass732 {}
 
-  static class MyInnerClass733 {}
+    static class MyInnerClass733 {}
 
-  static class MyInnerClass734 {}
+    static class MyInnerClass734 {}
 
-  static class MyInnerClass735 {}
+    static class MyInnerClass735 {}
 
-  static class MyInnerClass736 {}
+    static class MyInnerClass736 {}
 
-  static class MyInnerClass737 {}
+    static class MyInnerClass737 {}
 
-  static class MyInnerClass738 {}
+    static class MyInnerClass738 {}
 
-  static class MyInnerClass739 {}
+    static class MyInnerClass739 {}
 
-  static class MyInnerClass740 {}
+    static class MyInnerClass740 {}
 
-  static class MyInnerClass741 {}
+    static class MyInnerClass741 {}
 
-  static class MyInnerClass742 {}
+    static class MyInnerClass742 {}
 
-  static class MyInnerClass743 {}
+    static class MyInnerClass743 {}
 
-  static class MyInnerClass744 {}
+    static class MyInnerClass744 {}
 
-  static class MyInnerClass745 {}
+    static class MyInnerClass745 {}
 
-  static class MyInnerClass746 {}
+    static class MyInnerClass746 {}
 
-  static class MyInnerClass747 {}
+    static class MyInnerClass747 {}
 
-  static class MyInnerClass748 {}
+    static class MyInnerClass748 {}
 
-  static class MyInnerClass749 {}
+    static class MyInnerClass749 {}
 
-  static class MyInnerClass750 {}
+    static class MyInnerClass750 {}
 
-  static class MyInnerClass751 {}
+    static class MyInnerClass751 {}
 
-  static class MyInnerClass752 {}
+    static class MyInnerClass752 {}
 
-  static class MyInnerClass753 {}
+    static class MyInnerClass753 {}
 
-  static class MyInnerClass754 {}
+    static class MyInnerClass754 {}
 
-  static class MyInnerClass755 {}
+    static class MyInnerClass755 {}
 
-  static class MyInnerClass756 {}
+    static class MyInnerClass756 {}
 
-  static class MyInnerClass757 {}
+    static class MyInnerClass757 {}
 
-  static class MyInnerClass758 {}
+    static class MyInnerClass758 {}
 
-  static class MyInnerClass759 {}
+    static class MyInnerClass759 {}
 
-  static class MyInnerClass760 {}
+    static class MyInnerClass760 {}
 
-  static class MyInnerClass761 {}
+    static class MyInnerClass761 {}
 
-  static class MyInnerClass762 {}
+    static class MyInnerClass762 {}
 
-  static class MyInnerClass763 {}
+    static class MyInnerClass763 {}
 
-  static class MyInnerClass764 {}
+    static class MyInnerClass764 {}
 
-  static class MyInnerClass765 {}
+    static class MyInnerClass765 {}
 
-  static class MyInnerClass766 {}
+    static class MyInnerClass766 {}
 
-  static class MyInnerClass767 {}
+    static class MyInnerClass767 {}
 
-  static class MyInnerClass768 {}
+    static class MyInnerClass768 {}
 
-  static class MyInnerClass769 {}
+    static class MyInnerClass769 {}
 
-  static class MyInnerClass770 {}
+    static class MyInnerClass770 {}
 
-  static class MyInnerClass771 {}
+    static class MyInnerClass771 {}
 
-  static class MyInnerClass772 {}
+    static class MyInnerClass772 {}
 
-  static class MyInnerClass773 {}
+    static class MyInnerClass773 {}
 
-  static class MyInnerClass774 {}
+    static class MyInnerClass774 {}
 
-  static class MyInnerClass775 {}
+    static class MyInnerClass775 {}
 
-  static class MyInnerClass776 {}
+    static class MyInnerClass776 {}
 
-  static class MyInnerClass777 {}
+    static class MyInnerClass777 {}
 
-  static class MyInnerClass778 {}
+    static class MyInnerClass778 {}
 
-  static class MyInnerClass779 {}
+    static class MyInnerClass779 {}
 
-  static class MyInnerClass780 {}
+    static class MyInnerClass780 {}
 
-  static class MyInnerClass781 {}
+    static class MyInnerClass781 {}
 
-  static class MyInnerClass782 {}
+    static class MyInnerClass782 {}
 
-  static class MyInnerClass783 {}
+    static class MyInnerClass783 {}
 
-  static class MyInnerClass784 {}
+    static class MyInnerClass784 {}
 
-  static class MyInnerClass785 {}
+    static class MyInnerClass785 {}
 
-  static class MyInnerClass786 {}
+    static class MyInnerClass786 {}
 
-  static class MyInnerClass787 {}
+    static class MyInnerClass787 {}
 
-  static class MyInnerClass788 {}
+    static class MyInnerClass788 {}
 
-  static class MyInnerClass789 {}
+    static class MyInnerClass789 {}
 
-  static class MyInnerClass790 {}
+    static class MyInnerClass790 {}
 
-  static class MyInnerClass791 {}
+    static class MyInnerClass791 {}
 
-  static class MyInnerClass792 {}
+    static class MyInnerClass792 {}
 
-  static class MyInnerClass793 {}
+    static class MyInnerClass793 {}
 
-  static class MyInnerClass794 {}
+    static class MyInnerClass794 {}
 
-  static class MyInnerClass795 {}
+    static class MyInnerClass795 {}
 
-  static class MyInnerClass796 {}
+    static class MyInnerClass796 {}
 
-  static class MyInnerClass797 {}
+    static class MyInnerClass797 {}
 
-  static class MyInnerClass798 {}
+    static class MyInnerClass798 {}
 
-  static class MyInnerClass799 {}
+    static class MyInnerClass799 {}
 
-  static class MyInnerClass800 {}
+    static class MyInnerClass800 {}
 
-  static class MyInnerClass801 {}
+    static class MyInnerClass801 {}
 
-  static class MyInnerClass802 {}
+    static class MyInnerClass802 {}
 
-  static class MyInnerClass803 {}
+    static class MyInnerClass803 {}
 
-  static class MyInnerClass804 {}
+    static class MyInnerClass804 {}
 
-  static class MyInnerClass805 {}
+    static class MyInnerClass805 {}
 
-  static class MyInnerClass806 {}
+    static class MyInnerClass806 {}
 
-  static class MyInnerClass807 {}
+    static class MyInnerClass807 {}
 
-  static class MyInnerClass808 {}
+    static class MyInnerClass808 {}
 
-  static class MyInnerClass809 {}
+    static class MyInnerClass809 {}
 
-  static class MyInnerClass810 {}
+    static class MyInnerClass810 {}
 
-  static class MyInnerClass811 {}
+    static class MyInnerClass811 {}
 
-  static class MyInnerClass812 {}
+    static class MyInnerClass812 {}
 
-  static class MyInnerClass813 {}
+    static class MyInnerClass813 {}
 
-  static class MyInnerClass814 {}
+    static class MyInnerClass814 {}
 
-  static class MyInnerClass815 {}
+    static class MyInnerClass815 {}
 
-  static class MyInnerClass816 {}
+    static class MyInnerClass816 {}
 
-  static class MyInnerClass817 {}
+    static class MyInnerClass817 {}
 
-  static class MyInnerClass818 {}
+    static class MyInnerClass818 {}
 
-  static class MyInnerClass819 {}
+    static class MyInnerClass819 {}
 
-  static class MyInnerClass820 {}
+    static class MyInnerClass820 {}
 
-  static class MyInnerClass821 {}
+    static class MyInnerClass821 {}
 
-  static class MyInnerClass822 {}
+    static class MyInnerClass822 {}
 
-  static class MyInnerClass823 {}
+    static class MyInnerClass823 {}
 
-  static class MyInnerClass824 {}
+    static class MyInnerClass824 {}
 
-  static class MyInnerClass825 {}
+    static class MyInnerClass825 {}
 
-  static class MyInnerClass826 {}
+    static class MyInnerClass826 {}
 
-  static class MyInnerClass827 {}
+    static class MyInnerClass827 {}
 
-  static class MyInnerClass828 {}
+    static class MyInnerClass828 {}
 
-  static class MyInnerClass829 {}
+    static class MyInnerClass829 {}
 
-  static class MyInnerClass830 {}
+    static class MyInnerClass830 {}
 
-  static class MyInnerClass831 {}
+    static class MyInnerClass831 {}
 
-  static class MyInnerClass832 {}
+    static class MyInnerClass832 {}
 
-  static class MyInnerClass833 {}
+    static class MyInnerClass833 {}
 
-  static class MyInnerClass834 {}
+    static class MyInnerClass834 {}
 
-  static class MyInnerClass835 {}
+    static class MyInnerClass835 {}
 
-  static class MyInnerClass836 {}
+    static class MyInnerClass836 {}
 
-  static class MyInnerClass837 {}
+    static class MyInnerClass837 {}
 
-  static class MyInnerClass838 {}
+    static class MyInnerClass838 {}
 
-  static class MyInnerClass839 {}
+    static class MyInnerClass839 {}
 
-  static class MyInnerClass840 {}
+    static class MyInnerClass840 {}
 
-  static class MyInnerClass841 {}
+    static class MyInnerClass841 {}
 
-  static class MyInnerClass842 {}
+    static class MyInnerClass842 {}
 
-  static class MyInnerClass843 {}
+    static class MyInnerClass843 {}
 
-  static class MyInnerClass844 {}
+    static class MyInnerClass844 {}
 
-  static class MyInnerClass845 {}
+    static class MyInnerClass845 {}
 
-  static class MyInnerClass846 {}
+    static class MyInnerClass846 {}
 
-  static class MyInnerClass847 {}
+    static class MyInnerClass847 {}
 
-  static class MyInnerClass848 {}
+    static class MyInnerClass848 {}
 
-  static class MyInnerClass849 {}
+    static class MyInnerClass849 {}
 
-  static class MyInnerClass850 {}
+    static class MyInnerClass850 {}
 
-  static class MyInnerClass851 {}
+    static class MyInnerClass851 {}
 
-  static class MyInnerClass852 {}
+    static class MyInnerClass852 {}
 
-  static class MyInnerClass853 {}
+    static class MyInnerClass853 {}
 
-  static class MyInnerClass854 {}
+    static class MyInnerClass854 {}
 
-  static class MyInnerClass855 {}
+    static class MyInnerClass855 {}
 
-  static class MyInnerClass856 {}
+    static class MyInnerClass856 {}
 
-  static class MyInnerClass857 {}
+    static class MyInnerClass857 {}
 
-  static class MyInnerClass858 {}
+    static class MyInnerClass858 {}
 
-  static class MyInnerClass859 {}
+    static class MyInnerClass859 {}
 
-  static class MyInnerClass860 {}
+    static class MyInnerClass860 {}
 
-  static class MyInnerClass861 {}
+    static class MyInnerClass861 {}
 
-  static class MyInnerClass862 {}
+    static class MyInnerClass862 {}
 
-  static class MyInnerClass863 {}
+    static class MyInnerClass863 {}
 
-  static class MyInnerClass864 {}
+    static class MyInnerClass864 {}
 
-  static class MyInnerClass865 {}
+    static class MyInnerClass865 {}
 
-  static class MyInnerClass866 {}
+    static class MyInnerClass866 {}
 
-  static class MyInnerClass867 {}
+    static class MyInnerClass867 {}
 
-  static class MyInnerClass868 {}
+    static class MyInnerClass868 {}
 
-  static class MyInnerClass869 {}
+    static class MyInnerClass869 {}
 
-  static class MyInnerClass870 {}
+    static class MyInnerClass870 {}
 
-  static class MyInnerClass871 {}
+    static class MyInnerClass871 {}
 
-  static class MyInnerClass872 {}
+    static class MyInnerClass872 {}
 
-  static class MyInnerClass873 {}
+    static class MyInnerClass873 {}
 
-  static class MyInnerClass874 {}
+    static class MyInnerClass874 {}
 
-  static class MyInnerClass875 {}
+    static class MyInnerClass875 {}
 
-  static class MyInnerClass876 {}
+    static class MyInnerClass876 {}
 
-  static class MyInnerClass877 {}
+    static class MyInnerClass877 {}
 
-  static class MyInnerClass878 {}
+    static class MyInnerClass878 {}
 
-  static class MyInnerClass879 {}
+    static class MyInnerClass879 {}
 
-  static class MyInnerClass880 {}
+    static class MyInnerClass880 {}
 
-  static class MyInnerClass881 {}
+    static class MyInnerClass881 {}
 
-  static class MyInnerClass882 {}
+    static class MyInnerClass882 {}
 
-  static class MyInnerClass883 {}
+    static class MyInnerClass883 {}
 
-  static class MyInnerClass884 {}
+    static class MyInnerClass884 {}
 
-  static class MyInnerClass885 {}
+    static class MyInnerClass885 {}
 
-  static class MyInnerClass886 {}
+    static class MyInnerClass886 {}
 
-  static class MyInnerClass887 {}
+    static class MyInnerClass887 {}
 
-  static class MyInnerClass888 {}
+    static class MyInnerClass888 {}
 
-  static class MyInnerClass889 {}
+    static class MyInnerClass889 {}
 
-  static class MyInnerClass890 {}
+    static class MyInnerClass890 {}
 
-  static class MyInnerClass891 {}
+    static class MyInnerClass891 {}
 
-  static class MyInnerClass892 {}
+    static class MyInnerClass892 {}
 
-  static class MyInnerClass893 {}
+    static class MyInnerClass893 {}
 
-  static class MyInnerClass894 {}
+    static class MyInnerClass894 {}
 
-  static class MyInnerClass895 {}
+    static class MyInnerClass895 {}
 
-  static class MyInnerClass896 {}
+    static class MyInnerClass896 {}
 
-  static class MyInnerClass897 {}
+    static class MyInnerClass897 {}
 
-  static class MyInnerClass898 {}
+    static class MyInnerClass898 {}
 
-  static class MyInnerClass899 {}
+    static class MyInnerClass899 {}
 
-  static class MyInnerClass900 {}
+    static class MyInnerClass900 {}
 
-  static class MyInnerClass901 {}
+    static class MyInnerClass901 {}
 
-  static class MyInnerClass902 {}
+    static class MyInnerClass902 {}
 
-  static class MyInnerClass903 {}
+    static class MyInnerClass903 {}
 
-  static class MyInnerClass904 {}
+    static class MyInnerClass904 {}
 
-  static class MyInnerClass905 {}
+    static class MyInnerClass905 {}
 
-  static class MyInnerClass906 {}
+    static class MyInnerClass906 {}
 
-  static class MyInnerClass907 {}
+    static class MyInnerClass907 {}
 
-  static class MyInnerClass908 {}
+    static class MyInnerClass908 {}
 
-  static class MyInnerClass909 {}
+    static class MyInnerClass909 {}
 
-  static class MyInnerClass910 {}
+    static class MyInnerClass910 {}
 
-  static class MyInnerClass911 {}
+    static class MyInnerClass911 {}
 
-  static class MyInnerClass912 {}
+    static class MyInnerClass912 {}
 
-  static class MyInnerClass913 {}
+    static class MyInnerClass913 {}
 
-  static class MyInnerClass914 {}
+    static class MyInnerClass914 {}
 
-  static class MyInnerClass915 {}
+    static class MyInnerClass915 {}
 
-  static class MyInnerClass916 {}
+    static class MyInnerClass916 {}
 
-  static class MyInnerClass917 {}
+    static class MyInnerClass917 {}
 
-  static class MyInnerClass918 {}
+    static class MyInnerClass918 {}
 
-  static class MyInnerClass919 {}
+    static class MyInnerClass919 {}
 
-  static class MyInnerClass920 {}
+    static class MyInnerClass920 {}
 
-  static class MyInnerClass921 {}
+    static class MyInnerClass921 {}
 
-  static class MyInnerClass922 {}
+    static class MyInnerClass922 {}
 
-  static class MyInnerClass923 {}
+    static class MyInnerClass923 {}
 
-  static class MyInnerClass924 {}
+    static class MyInnerClass924 {}
 
-  static class MyInnerClass925 {}
+    static class MyInnerClass925 {}
 
-  static class MyInnerClass926 {}
+    static class MyInnerClass926 {}
 
-  static class MyInnerClass927 {}
+    static class MyInnerClass927 {}
 
-  static class MyInnerClass928 {}
+    static class MyInnerClass928 {}
 
-  static class MyInnerClass929 {}
+    static class MyInnerClass929 {}
 
-  static class MyInnerClass930 {}
+    static class MyInnerClass930 {}
 
-  static class MyInnerClass931 {}
+    static class MyInnerClass931 {}
 
-  static class MyInnerClass932 {}
+    static class MyInnerClass932 {}
 
-  static class MyInnerClass933 {}
+    static class MyInnerClass933 {}
 
-  static class MyInnerClass934 {}
+    static class MyInnerClass934 {}
 
-  static class MyInnerClass935 {}
+    static class MyInnerClass935 {}
 
-  static class MyInnerClass936 {}
+    static class MyInnerClass936 {}
 
-  static class MyInnerClass937 {}
+    static class MyInnerClass937 {}
 
-  static class MyInnerClass938 {}
+    static class MyInnerClass938 {}
 
-  static class MyInnerClass939 {}
+    static class MyInnerClass939 {}
 
-  static class MyInnerClass940 {}
+    static class MyInnerClass940 {}
 
-  static class MyInnerClass941 {}
+    static class MyInnerClass941 {}
 
-  static class MyInnerClass942 {}
+    static class MyInnerClass942 {}
 
-  static class MyInnerClass943 {}
+    static class MyInnerClass943 {}
 
-  static class MyInnerClass944 {}
+    static class MyInnerClass944 {}
 
-  static class MyInnerClass945 {}
+    static class MyInnerClass945 {}
 
-  static class MyInnerClass946 {}
+    static class MyInnerClass946 {}
 
-  static class MyInnerClass947 {}
+    static class MyInnerClass947 {}
 
-  static class MyInnerClass948 {}
+    static class MyInnerClass948 {}
 
-  static class MyInnerClass949 {}
+    static class MyInnerClass949 {}
 
-  static class MyInnerClass950 {}
+    static class MyInnerClass950 {}
 
-  static class MyInnerClass951 {}
+    static class MyInnerClass951 {}
 
-  static class MyInnerClass952 {}
+    static class MyInnerClass952 {}
 
-  static class MyInnerClass953 {}
+    static class MyInnerClass953 {}
 
-  static class MyInnerClass954 {}
+    static class MyInnerClass954 {}
 
-  static class MyInnerClass955 {}
+    static class MyInnerClass955 {}
 
-  static class MyInnerClass956 {}
+    static class MyInnerClass956 {}
 
-  static class MyInnerClass957 {}
+    static class MyInnerClass957 {}
 
-  static class MyInnerClass958 {}
+    static class MyInnerClass958 {}
 
-  static class MyInnerClass959 {}
+    static class MyInnerClass959 {}
 
-  static class MyInnerClass960 {}
+    static class MyInnerClass960 {}
 
-  static class MyInnerClass961 {}
+    static class MyInnerClass961 {}
 
-  static class MyInnerClass962 {}
+    static class MyInnerClass962 {}
 
-  static class MyInnerClass963 {}
+    static class MyInnerClass963 {}
 
-  static class MyInnerClass964 {}
+    static class MyInnerClass964 {}
 
-  static class MyInnerClass965 {}
+    static class MyInnerClass965 {}
 
-  static class MyInnerClass966 {}
+    static class MyInnerClass966 {}
 
-  static class MyInnerClass967 {}
+    static class MyInnerClass967 {}
 
-  static class MyInnerClass968 {}
+    static class MyInnerClass968 {}
 
-  static class MyInnerClass969 {}
+    static class MyInnerClass969 {}
 
-  static class MyInnerClass970 {}
+    static class MyInnerClass970 {}
 
-  static class MyInnerClass971 {}
+    static class MyInnerClass971 {}
 
-  static class MyInnerClass972 {}
+    static class MyInnerClass972 {}
 
-  static class MyInnerClass973 {}
+    static class MyInnerClass973 {}
 
-  static class MyInnerClass974 {}
+    static class MyInnerClass974 {}
 
-  static class MyInnerClass975 {}
+    static class MyInnerClass975 {}
 
-  static class MyInnerClass976 {}
+    static class MyInnerClass976 {}
 
-  static class MyInnerClass977 {}
+    static class MyInnerClass977 {}
 
-  static class MyInnerClass978 {}
+    static class MyInnerClass978 {}
 
-  static class MyInnerClass979 {}
+    static class MyInnerClass979 {}
 
-  static class MyInnerClass980 {}
+    static class MyInnerClass980 {}
 
-  static class MyInnerClass981 {}
+    static class MyInnerClass981 {}
 
-  static class MyInnerClass982 {}
+    static class MyInnerClass982 {}
 
-  static class MyInnerClass983 {}
+    static class MyInnerClass983 {}
 
-  static class MyInnerClass984 {}
+    static class MyInnerClass984 {}
 
-  static class MyInnerClass985 {}
+    static class MyInnerClass985 {}
 
-  static class MyInnerClass986 {}
+    static class MyInnerClass986 {}
 
-  static class MyInnerClass987 {}
+    static class MyInnerClass987 {}
 
-  static class MyInnerClass988 {}
+    static class MyInnerClass988 {}
 
-  static class MyInnerClass989 {}
+    static class MyInnerClass989 {}
 
-  static class MyInnerClass990 {}
+    static class MyInnerClass990 {}
 
-  static class MyInnerClass991 {}
+    static class MyInnerClass991 {}
 
-  static class MyInnerClass992 {}
+    static class MyInnerClass992 {}
 
-  static class MyInnerClass993 {}
+    static class MyInnerClass993 {}
 
-  static class MyInnerClass994 {}
+    static class MyInnerClass994 {}
 
-  static class MyInnerClass995 {}
+    static class MyInnerClass995 {}
 
-  static class MyInnerClass996 {}
+    static class MyInnerClass996 {}
 
-  static class MyInnerClass997 {}
+    static class MyInnerClass997 {}
 
-  static class MyInnerClass998 {}
+    static class MyInnerClass998 {}
 
-  static class MyInnerClass999 {}
+    static class MyInnerClass999 {}
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/LargeInnerClasses.java b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/LargeInnerClasses.java
index 89a30212dde..f2103054864 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/LargeInnerClasses.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/LargeInnerClasses.java
@@ -2,310 +2,310 @@
 
 public class LargeInnerClasses {
 
-  public static int main(String arg) {
-    return 42; // beae1817-f3b0-4ea8-a74f-000000000001
-  }
-
-  static {
-    new MyInnerClass00();
-    new MyInnerClass01();
-    new MyInnerClass02();
-    new MyInnerClass03();
-    new MyInnerClass04();
-    new MyInnerClass05();
-    new MyInnerClass06();
-    new MyInnerClass07();
-    new MyInnerClass08();
-    new MyInnerClass09();
-    new MyInnerClass10();
-    new MyInnerClass11();
-    new MyInnerClass12();
-    new MyInnerClass13();
-    new MyInnerClass14();
-    new MyInnerClass15();
-    new MyInnerClass16();
-    new MyInnerClass17();
-    new MyInnerClass18();
-    new MyInnerClass19();
-    new MyInnerClass20();
-    new MyInnerClass21();
-    new MyInnerClass22();
-    new MyInnerClass23();
-    new MyInnerClass24();
-    new MyInnerClass25();
-    new MyInnerClass26();
-    new MyInnerClass27();
-    new MyInnerClass28();
-    new MyInnerClass29();
-    new MyInnerClass30();
-    new MyInnerClass31();
-    new MyInnerClass32();
-    new MyInnerClass33();
-    new MyInnerClass34();
-    new MyInnerClass35();
-    new MyInnerClass36();
-    new MyInnerClass37();
-    new MyInnerClass38();
-    new MyInnerClass39();
-    new MyInnerClass40();
-    new MyInnerClass41();
-    new MyInnerClass42();
-    new MyInnerClass43();
-    new MyInnerClass44();
-    new MyInnerClass45();
-    new MyInnerClass46();
-    new MyInnerClass47();
-    new MyInnerClass48();
-    new MyInnerClass49();
-    new MyInnerClass50();
-    new MyInnerClass51();
-    new MyInnerClass52();
-    new MyInnerClass53();
-    new MyInnerClass54();
-    new MyInnerClass55();
-    new MyInnerClass56();
-    new MyInnerClass57();
-    new MyInnerClass58();
-    new MyInnerClass59();
-    new MyInnerClass60();
-    new MyInnerClass61();
-    new MyInnerClass62();
-    new MyInnerClass63();
-    new MyInnerClass64();
-    new MyInnerClass65();
-    new MyInnerClass66();
-    new MyInnerClass67();
-    new MyInnerClass68();
-    new MyInnerClass69();
-    new MyInnerClass70();
-    new MyInnerClass71();
-    new MyInnerClass72();
-    new MyInnerClass73();
-    new MyInnerClass74();
-    new MyInnerClass75();
-    new MyInnerClass76();
-    new MyInnerClass77();
-    new MyInnerClass78();
-    new MyInnerClass79();
-    new MyInnerClass80();
-    new MyInnerClass81();
-    new MyInnerClass82();
-    new MyInnerClass83();
-    new MyInnerClass84();
-    new MyInnerClass85();
-    new MyInnerClass86();
-    new MyInnerClass87();
-    new MyInnerClass88();
-    new MyInnerClass89();
-    new MyInnerClass90();
-    new MyInnerClass91();
-    new MyInnerClass92();
-    new MyInnerClass93();
-    new MyInnerClass94();
-    new MyInnerClass95();
-    new MyInnerClass96();
-    new MyInnerClass97();
-    new MyInnerClass98();
-    new MyInnerClass99();
-  }
+    public static int main(String arg) {
+        return 42; // beae1817-f3b0-4ea8-a74f-000000000001
+    }
+
+    static {
+        new MyInnerClass00();
+        new MyInnerClass01();
+        new MyInnerClass02();
+        new MyInnerClass03();
+        new MyInnerClass04();
+        new MyInnerClass05();
+        new MyInnerClass06();
+        new MyInnerClass07();
+        new MyInnerClass08();
+        new MyInnerClass09();
+        new MyInnerClass10();
+        new MyInnerClass11();
+        new MyInnerClass12();
+        new MyInnerClass13();
+        new MyInnerClass14();
+        new MyInnerClass15();
+        new MyInnerClass16();
+        new MyInnerClass17();
+        new MyInnerClass18();
+        new MyInnerClass19();
+        new MyInnerClass20();
+        new MyInnerClass21();
+        new MyInnerClass22();
+        new MyInnerClass23();
+        new MyInnerClass24();
+        new MyInnerClass25();
+        new MyInnerClass26();
+        new MyInnerClass27();
+        new MyInnerClass28();
+        new MyInnerClass29();
+        new MyInnerClass30();
+        new MyInnerClass31();
+        new MyInnerClass32();
+        new MyInnerClass33();
+        new MyInnerClass34();
+        new MyInnerClass35();
+        new MyInnerClass36();
+        new MyInnerClass37();
+        new MyInnerClass38();
+        new MyInnerClass39();
+        new MyInnerClass40();
+        new MyInnerClass41();
+        new MyInnerClass42();
+        new MyInnerClass43();
+        new MyInnerClass44();
+        new MyInnerClass45();
+        new MyInnerClass46();
+        new MyInnerClass47();
+        new MyInnerClass48();
+        new MyInnerClass49();
+        new MyInnerClass50();
+        new MyInnerClass51();
+        new MyInnerClass52();
+        new MyInnerClass53();
+        new MyInnerClass54();
+        new MyInnerClass55();
+        new MyInnerClass56();
+        new MyInnerClass57();
+        new MyInnerClass58();
+        new MyInnerClass59();
+        new MyInnerClass60();
+        new MyInnerClass61();
+        new MyInnerClass62();
+        new MyInnerClass63();
+        new MyInnerClass64();
+        new MyInnerClass65();
+        new MyInnerClass66();
+        new MyInnerClass67();
+        new MyInnerClass68();
+        new MyInnerClass69();
+        new MyInnerClass70();
+        new MyInnerClass71();
+        new MyInnerClass72();
+        new MyInnerClass73();
+        new MyInnerClass74();
+        new MyInnerClass75();
+        new MyInnerClass76();
+        new MyInnerClass77();
+        new MyInnerClass78();
+        new MyInnerClass79();
+        new MyInnerClass80();
+        new MyInnerClass81();
+        new MyInnerClass82();
+        new MyInnerClass83();
+        new MyInnerClass84();
+        new MyInnerClass85();
+        new MyInnerClass86();
+        new MyInnerClass87();
+        new MyInnerClass88();
+        new MyInnerClass89();
+        new MyInnerClass90();
+        new MyInnerClass91();
+        new MyInnerClass92();
+        new MyInnerClass93();
+        new MyInnerClass94();
+        new MyInnerClass95();
+        new MyInnerClass96();
+        new MyInnerClass97();
+        new MyInnerClass98();
+        new MyInnerClass99();
+    }
 
-  static class MyInnerClass00 {}
+    static class MyInnerClass00 {}
 
-  static class MyInnerClass01 {}
+    static class MyInnerClass01 {}
 
-  static class MyInnerClass02 {}
+    static class MyInnerClass02 {}
 
-  static class MyInnerClass03 {}
+    static class MyInnerClass03 {}
 
-  static class MyInnerClass04 {}
+    static class MyInnerClass04 {}
 
-  static class MyInnerClass05 {}
+    static class MyInnerClass05 {}
 
-  static class MyInnerClass06 {}
+    static class MyInnerClass06 {}
 
-  static class MyInnerClass07 {}
+    static class MyInnerClass07 {}
 
-  static class MyInnerClass08 {}
+    static class MyInnerClass08 {}
 
-  static class MyInnerClass09 {}
+    static class MyInnerClass09 {}
 
-  static class MyInnerClass10 {}
+    static class MyInnerClass10 {}
 
-  static class MyInnerClass11 {}
+    static class MyInnerClass11 {}
 
-  static class MyInnerClass12 {}
+    static class MyInnerClass12 {}
 
-  static class MyInnerClass13 {}
+    static class MyInnerClass13 {}
 
-  static class MyInnerClass14 {}
+    static class MyInnerClass14 {}
 
-  static class MyInnerClass15 {}
+    static class MyInnerClass15 {}
 
-  static class MyInnerClass16 {}
+    static class MyInnerClass16 {}
 
-  static class MyInnerClass17 {}
+    static class MyInnerClass17 {}
 
-  static class MyInnerClass18 {}
+    static class MyInnerClass18 {}
 
-  static class MyInnerClass19 {}
+    static class MyInnerClass19 {}
 
-  static class MyInnerClass20 {}
+    static class MyInnerClass20 {}
 
-  static class MyInnerClass21 {}
+    static class MyInnerClass21 {}
 
-  static class MyInnerClass22 {}
+    static class MyInnerClass22 {}
 
-  static class MyInnerClass23 {}
+    static class MyInnerClass23 {}
 
-  static class MyInnerClass24 {}
+    static class MyInnerClass24 {}
 
-  static class MyInnerClass25 {}
+    static class MyInnerClass25 {}
 
-  static class MyInnerClass26 {}
+    static class MyInnerClass26 {}
 
-  static class MyInnerClass27 {}
+    static class MyInnerClass27 {}
 
-  static class MyInnerClass28 {}
+    static class MyInnerClass28 {}
 
-  static class MyInnerClass29 {}
+    static class MyInnerClass29 {}
 
-  static class MyInnerClass30 {}
+    static class MyInnerClass30 {}
 
-  static class MyInnerClass31 {}
+    static class MyInnerClass31 {}
 
-  static class MyInnerClass32 {}
+    static class MyInnerClass32 {}
 
-  static class MyInnerClass33 {}
+    static class MyInnerClass33 {}
 
-  static class MyInnerClass34 {}
+    static class MyInnerClass34 {}
 
-  static class MyInnerClass35 {}
+    static class MyInnerClass35 {}
 
-  static class MyInnerClass36 {}
+    static class MyInnerClass36 {}
 
-  static class MyInnerClass37 {}
+    static class MyInnerClass37 {}
 
-  static class MyInnerClass38 {}
+    static class MyInnerClass38 {}
 
-  static class MyInnerClass39 {}
+    static class MyInnerClass39 {}
 
-  static class MyInnerClass40 {}
+    static class MyInnerClass40 {}
 
-  static class MyInnerClass41 {}
+    static class MyInnerClass41 {}
 
-  static class MyInnerClass42 {}
+    static class MyInnerClass42 {}
 
-  static class MyInnerClass43 {}
+    static class MyInnerClass43 {}
 
-  static class MyInnerClass44 {}
+    static class MyInnerClass44 {}
 
-  static class MyInnerClass45 {}
+    static class MyInnerClass45 {}
 
-  static class MyInnerClass46 {}
+    static class MyInnerClass46 {}
 
-  static class MyInnerClass47 {}
+    static class MyInnerClass47 {}
 
-  static class MyInnerClass48 {}
+    static class MyInnerClass48 {}
 
-  static class MyInnerClass49 {}
+    static class MyInnerClass49 {}
 
-  static class MyInnerClass50 {}
+    static class MyInnerClass50 {}
 
-  static class MyInnerClass51 {}
+    static class MyInnerClass51 {}
 
-  static class MyInnerClass52 {}
+    static class MyInnerClass52 {}
 
-  static class MyInnerClass53 {}
+    static class MyInnerClass53 {}
 
-  static class MyInnerClass54 {}
+    static class MyInnerClass54 {}
 
-  static class MyInnerClass55 {}
+    static class MyInnerClass55 {}
 
-  static class MyInnerClass56 {}
+    static class MyInnerClass56 {}
 
-  static class MyInnerClass57 {}
+    static class MyInnerClass57 {}
 
-  static class MyInnerClass58 {}
+    static class MyInnerClass58 {}
 
-  static class MyInnerClass59 {}
+    static class MyInnerClass59 {}
 
-  static class MyInnerClass60 {}
+    static class MyInnerClass60 {}
 
-  static class MyInnerClass61 {}
+    static class MyInnerClass61 {}
 
-  static class MyInnerClass62 {}
+    static class MyInnerClass62 {}
 
-  static class MyInnerClass63 {}
+    static class MyInnerClass63 {}
 
-  static class MyInnerClass64 {}
+    static class MyInnerClass64 {}
 
-  static class MyInnerClass65 {}
+    static class MyInnerClass65 {}
 
-  static class MyInnerClass66 {}
+    static class MyInnerClass66 {}
 
-  static class MyInnerClass67 {}
+    static class MyInnerClass67 {}
 
-  static class MyInnerClass68 {}
+    static class MyInnerClass68 {}
 
-  static class MyInnerClass69 {}
+    static class MyInnerClass69 {}
 
-  static class MyInnerClass70 {}
+    static class MyInnerClass70 {}
 
-  static class MyInnerClass71 {}
+    static class MyInnerClass71 {}
 
-  static class MyInnerClass72 {}
+    static class MyInnerClass72 {}
 
-  static class MyInnerClass73 {}
+    static class MyInnerClass73 {}
 
-  static class MyInnerClass74 {}
+    static class MyInnerClass74 {}
 
-  static class MyInnerClass75 {}
+    static class MyInnerClass75 {}
 
-  static class MyInnerClass76 {}
+    static class MyInnerClass76 {}
 
-  static class MyInnerClass77 {}
+    static class MyInnerClass77 {}
 
-  static class MyInnerClass78 {}
+    static class MyInnerClass78 {}
 
-  static class MyInnerClass79 {}
+    static class MyInnerClass79 {}
 
-  static class MyInnerClass80 {}
+    static class MyInnerClass80 {}
 
-  static class MyInnerClass81 {}
+    static class MyInnerClass81 {}
 
-  static class MyInnerClass82 {}
+    static class MyInnerClass82 {}
 
-  static class MyInnerClass83 {}
+    static class MyInnerClass83 {}
 
-  static class MyInnerClass84 {}
+    static class MyInnerClass84 {}
 
-  static class MyInnerClass85 {}
+    static class MyInnerClass85 {}
 
-  static class MyInnerClass86 {}
+    static class MyInnerClass86 {}
 
-  static class MyInnerClass87 {}
+    static class MyInnerClass87 {}
 
-  static class MyInnerClass88 {}
+    static class MyInnerClass88 {}
 
-  static class MyInnerClass89 {}
+    static class MyInnerClass89 {}
 
-  static class MyInnerClass90 {}
+    static class MyInnerClass90 {}
 
-  static class MyInnerClass91 {}
+    static class MyInnerClass91 {}
 
-  static class MyInnerClass92 {}
+    static class MyInnerClass92 {}
 
-  static class MyInnerClass93 {}
+    static class MyInnerClass93 {}
 
-  static class MyInnerClass94 {}
+    static class MyInnerClass94 {}
 
-  static class MyInnerClass95 {}
+    static class MyInnerClass95 {}
 
-  static class MyInnerClass96 {}
+    static class MyInnerClass96 {}
 
-  static class MyInnerClass97 {}
+    static class MyInnerClass97 {}
 
-  static class MyInnerClass98 {}
+    static class MyInnerClass98 {}
 
-  static class MyInnerClass99 {}
+    static class MyInnerClass99 {}
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/ServerDebuggerTestApplication.java b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/ServerDebuggerTestApplication.java
index c1742293cd3..1d5464cfcb9 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/ServerDebuggerTestApplication.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/ServerDebuggerTestApplication.java
@@ -18,314 +18,288 @@
 import okhttp3.mockwebserver.RecordedRequest;
 
 public class ServerDebuggerTestApplication {
-  private static final MockResponse EMPTY_HTTP_200 = new MockResponse().setResponseCode(200);
-  private static final String LOG_FILENAME = System.getenv().get("DD_LOG_FILE");
-  private static final Map<String, Consumer<String>> methodsByName = new HashMap<>();
-  private final MockWebServer webServer = new MockWebServer();
-  private final String controlServerUrl;
-  private final OkHttpClient httpClient = new OkHttpClient();
-  private String lastMatchedLine;
-
-  public static void main(String[] args) throws Exception {
-    System.out.println(ServerDebuggerTestApplication.class.getName());
-    try {
-      new LargeInnerClasses();
-      new HugeInnerClasses();
-      registerMethods();
-      ServerDebuggerTestApplication serverTestApplication =
-          new ServerDebuggerTestApplication(args[0]);
-      serverTestApplication.start();
-    } catch (IOException ex) {
-      ex.printStackTrace();
+    private static final MockResponse EMPTY_HTTP_200 = new MockResponse().setResponseCode(200);
+    private static final String LOG_FILENAME = System.getenv().get("DD_LOG_FILE");
+    private static final Map<String, Consumer<String>> methodsByName = new HashMap<>();
+    private final MockWebServer webServer = new MockWebServer();
+    private final String controlServerUrl;
+    private final OkHttpClient httpClient = new OkHttpClient();
+    private String lastMatchedLine;
+
+    public static void main(String[] args) throws Exception {
+        System.out.println(ServerDebuggerTestApplication.class.getName());
+        try {
+            new LargeInnerClasses();
+            new HugeInnerClasses();
+            registerMethods();
+            ServerDebuggerTestApplication serverTestApplication = new ServerDebuggerTestApplication(args[0]);
+            serverTestApplication.start();
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
     }
-  }
-
-  public static void registerMethods() {
-    methodsByName.put("fullMethod", ServerDebuggerTestApplication::runFullMethod);
-    methodsByName.put("tracedMethod", ServerDebuggerTestApplication::runTracedMethod);
-    methodsByName.put("loopingFullMethod", ServerDebuggerTestApplication::runLoopingFullMethod);
-    methodsByName.put("loopingTracedMethod", ServerDebuggerTestApplication::runLoopingTracedMethod);
-    methodsByName.put("topLevelMethod", ServerDebuggerTestApplication::runTopLevelMethod);
-  }
-
-  public ServerDebuggerTestApplication(String controlServerUrl) {
-    this.controlServerUrl = controlServerUrl;
-  }
-
-  public void start() throws Exception {
-    webServer.setDispatcher(new AppDispatcher(this));
-    webServer.start();
-    HttpUrl appUrl = webServer.url("/app");
-    // Ack app started
-    System.out.println("Send ack with app URl: " + appUrl.toString());
-    RequestBody body = RequestBody.create(MediaType.get("text/plain"), appUrl.toString());
-    Request ackRequest = new Request.Builder().url(controlServerUrl).post(body).build();
-    try (Response response = httpClient.newCall(ackRequest).execute()) {}
-
-    System.out.println("Send Ack done");
-  }
-
-  protected void stop() {
-    System.out.println("Stopping app...");
-    new Thread(
-            () -> {
-              try {
-                webServer.shutdown();
-              } catch (IOException e) {
-                e.printStackTrace();
-              }
-            })
-        .start();
-  }
-
-  protected void waitForInstrumentation(String className) {
-    System.out.println("waitForInstrumentation on " + className);
-    try {
-      lastMatchedLine =
-          TestApplicationHelper.waitForInstrumentation(LOG_FILENAME, className, lastMatchedLine);
-      System.out.println("instrumented!");
-    } catch (IOException ex) {
-      ex.printStackTrace();
+
+    public static void registerMethods() {
+        methodsByName.put("fullMethod", ServerDebuggerTestApplication::runFullMethod);
+        methodsByName.put("tracedMethod", ServerDebuggerTestApplication::runTracedMethod);
+        methodsByName.put("loopingFullMethod", ServerDebuggerTestApplication::runLoopingFullMethod);
+        methodsByName.put("loopingTracedMethod", ServerDebuggerTestApplication::runLoopingTracedMethod);
+        methodsByName.put("topLevelMethod", ServerDebuggerTestApplication::runTopLevelMethod);
+    }
+
+    public ServerDebuggerTestApplication(String controlServerUrl) {
+        this.controlServerUrl = controlServerUrl;
+    }
+
+    public void start() throws Exception {
+        webServer.setDispatcher(new AppDispatcher(this));
+        webServer.start();
+        HttpUrl appUrl = webServer.url("/app");
+        // Ack app started
+        System.out.println("Send ack with app URl: " + appUrl.toString());
+        RequestBody body = RequestBody.create(MediaType.get("text/plain"), appUrl.toString());
+        Request ackRequest =
+                new Request.Builder().url(controlServerUrl).post(body).build();
+        try (Response response = httpClient.newCall(ackRequest).execute()) {}
+
+        System.out.println("Send Ack done");
+    }
+
+    protected void stop() {
+        System.out.println("Stopping app...");
+        new Thread(() -> {
+                    try {
+                        webServer.shutdown();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                })
+                .start();
+    }
+
+    protected void waitForInstrumentation(String className) {
+        System.out.println("waitForInstrumentation on " + className);
+        try {
+            lastMatchedLine = TestApplicationHelper.waitForInstrumentation(LOG_FILENAME, className, lastMatchedLine);
+            System.out.println("instrumented!");
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    protected void waitForReTransformation(String className) {
+        System.out.println("waitForReTransformation on " + className);
+        try {
+            lastMatchedLine = TestApplicationHelper.waitForReTransformation(LOG_FILENAME, className, lastMatchedLine);
+            System.out.println("re-transformed!");
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    protected void waitForExceptionFingerprint() {
+        System.out.println("waitForExceptionFingerprint");
+        try {
+            TestApplicationHelper.waitForExceptionFingerprint(LOG_FILENAME);
+            System.out.println("fingerprint added!");
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    protected void waitForSpecificLine(String line) {
+        System.out.println("waitForSpecificLine...");
+        try {
+            lastMatchedLine = TestApplicationHelper.waitForSpecificLine(LOG_FILENAME, line, lastMatchedLine);
+            System.out.println("line found!");
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    protected void execute(String methodName, String arg) {
+        Consumer<String> method = methodsByName.get(methodName);
+        if (method == null) {
+            throw new RuntimeException("cannot find method: " + methodName);
+        }
+        System.out.println("Executing method: " + methodName);
+        try {
+            method.accept(arg);
+        } catch (Throwable ex) {
+            ex.printStackTrace();
+        }
+        System.out.println("Executed");
     }
-  }
-
-  protected void waitForReTransformation(String className) {
-    System.out.println("waitForReTransformation on " + className);
-    try {
-      lastMatchedLine =
-          TestApplicationHelper.waitForReTransformation(LOG_FILENAME, className, lastMatchedLine);
-      System.out.println("re-transformed!");
-    } catch (IOException ex) {
-      ex.printStackTrace();
+
+    private static void runFullMethod(String arg) {
+        Map<String, String> map = new HashMap<>();
+        map.put("key1", "val1");
+        map.put("key2", "val2");
+        map.put("key3", "val3");
+        fullMethod(42, "foobar", 3.42, map, "var1", "var2", "var3");
     }
-  }
-
-  protected void waitForExceptionFingerprint() {
-    System.out.println("waitForExceptionFingerprint");
-    try {
-      TestApplicationHelper.waitForExceptionFingerprint(LOG_FILENAME);
-      System.out.println("fingerprint added!");
-    } catch (IOException ex) {
-      ex.printStackTrace();
+
+    private static void runLoopingFullMethod(String arg) {
+        Map<String, String> map = new HashMap<>();
+        map.put("key1", "val1");
+        map.put("key2", "val2");
+        map.put("key3", "val3");
+        for (int i = 0; i < Integer.parseInt(arg); i++) {
+            fullMethod(42, "foobar", 3.42, map, "var1", "var2", "var3");
+        }
     }
-  }
-
-  protected void waitForSpecificLine(String line) {
-    System.out.println("waitForSpecificLine...");
-    try {
-      lastMatchedLine =
-          TestApplicationHelper.waitForSpecificLine(LOG_FILENAME, line, lastMatchedLine);
-      System.out.println("line found!");
-    } catch (IOException ex) {
-      ex.printStackTrace();
+
+    @Trace
+    private static void runTracedMethod(String arg) {
+        Map<String, String> map = new HashMap<>();
+        map.put("key1", "val1");
+        map.put("key2", "val2");
+        map.put("key3", "val3");
+        if ("oops".equals(arg)) {
+            tracedMethodWithException(42, "foobar", 3.42, map, "var1", "var2", "var3");
+        } else if ("deepOops".equals(arg)) {
+            tracedMethodWithDeepException1(42, "foobar", 3.42, map, "var1", "var2", "var3");
+        } else if ("lambdaOops".equals(arg)) {
+            tracedMethodWithLambdaException(42, "foobar", 3.42, map, "var1", "var2", "var3");
+        } else if ("recursiveOops".equals(arg)) {
+            tracedMethodWithRecursiveException(42, "foobar", 3.42, map, "var1", "var2", "var3");
+        } else {
+            tracedMethod(42, "foobar", 3.42, map, "var1", "var2", "var3");
+        }
     }
-  }
 
-  protected void execute(String methodName, String arg) {
-    Consumer<String> method = methodsByName.get(methodName);
-    if (method == null) {
-      throw new RuntimeException("cannot find method: " + methodName);
+    private static void runLoopingTracedMethod(String arg) {
+        for (int i = 0; i < Integer.parseInt(arg); i++) {
+            runTracedMethod(arg);
+        }
     }
-    System.out.println("Executing method: " + methodName);
-    try {
-      method.accept(arg);
-    } catch (Throwable ex) {
-      ex.printStackTrace();
+
+    private static String runTopLevelMethod(String arg) {
+        return TopLevel.process(arg);
     }
-    System.out.println("Executed");
-  }
-
-  private static void runFullMethod(String arg) {
-    Map<String, String> map = new HashMap<>();
-    map.put("key1", "val1");
-    map.put("key2", "val2");
-    map.put("key3", "val3");
-    fullMethod(42, "foobar", 3.42, map, "var1", "var2", "var3");
-  }
-
-  private static void runLoopingFullMethod(String arg) {
-    Map<String, String> map = new HashMap<>();
-    map.put("key1", "val1");
-    map.put("key2", "val2");
-    map.put("key3", "val3");
-    for (int i = 0; i < Integer.parseInt(arg); i++) {
-      fullMethod(42, "foobar", 3.42, map, "var1", "var2", "var3");
+
+    private static String fullMethod(
+            int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
+        try {
+            return argInt + ", " + argStr + ", " + argDouble + ", " + argMap + ", " + String.join(",", argVar);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return null;
+        }
     }
-  }
-
-  @Trace
-  private static void runTracedMethod(String arg) {
-    Map<String, String> map = new HashMap<>();
-    map.put("key1", "val1");
-    map.put("key2", "val2");
-    map.put("key3", "val3");
-    if ("oops".equals(arg)) {
-      tracedMethodWithException(42, "foobar", 3.42, map, "var1", "var2", "var3");
-    } else if ("deepOops".equals(arg)) {
-      tracedMethodWithDeepException1(42, "foobar", 3.42, map, "var1", "var2", "var3");
-    } else if ("lambdaOops".equals(arg)) {
-      tracedMethodWithLambdaException(42, "foobar", 3.42, map, "var1", "var2", "var3");
-    } else if ("recursiveOops".equals(arg)) {
-      tracedMethodWithRecursiveException(42, "foobar", 3.42, map, "var1", "var2", "var3");
-    } else {
-      tracedMethod(42, "foobar", 3.42, map, "var1", "var2", "var3");
+
+    private static String tracedMethod(
+            int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
+        try {
+            return argInt + ", " + argStr + ", " + argDouble + ", " + argMap + ", " + String.join(",", argVar);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return null;
+        }
     }
-  }
 
-  private static void runLoopingTracedMethod(String arg) {
-    for (int i = 0; i < Integer.parseInt(arg); i++) {
-      runTracedMethod(arg);
+    private static void tracedMethodWithException(
+            int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
+        throw new RuntimeException("oops");
     }
-  }
-
-  private static String runTopLevelMethod(String arg) {
-    return TopLevel.process(arg);
-  }
-
-  private static String fullMethod(
-      int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
-    try {
-      return argInt
-          + ", "
-          + argStr
-          + ", "
-          + argDouble
-          + ", "
-          + argMap
-          + ", "
-          + String.join(",", argVar);
-    } catch (Exception ex) {
-      ex.printStackTrace();
-      return null;
+
+    private static void tracedMethodWithDeepException1(
+            int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
+        tracedMethodWithDeepException2(argInt, argStr, argDouble, argMap, argVar);
     }
-  }
-
-  private static String tracedMethod(
-      int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
-    try {
-      return argInt
-          + ", "
-          + argStr
-          + ", "
-          + argDouble
-          + ", "
-          + argMap
-          + ", "
-          + String.join(",", argVar);
-    } catch (Exception ex) {
-      ex.printStackTrace();
-      return null;
+
+    private static void tracedMethodWithDeepException2(
+            int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
+        tracedMethodWithDeepException3(argInt, argStr, argDouble, argMap, argVar);
     }
-  }
-
-  private static void tracedMethodWithException(
-      int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
-    throw new RuntimeException("oops");
-  }
-
-  private static void tracedMethodWithDeepException1(
-      int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
-    tracedMethodWithDeepException2(argInt, argStr, argDouble, argMap, argVar);
-  }
-
-  private static void tracedMethodWithDeepException2(
-      int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
-    tracedMethodWithDeepException3(argInt, argStr, argDouble, argMap, argVar);
-  }
-
-  private static void tracedMethodWithDeepException3(
-      int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
-    tracedMethodWithDeepException4(argInt, argStr, argDouble, argMap, argVar);
-  }
-
-  private static void tracedMethodWithDeepException4(
-      int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
-    tracedMethodWithDeepException5(argInt, argStr, argDouble, argMap, argVar);
-  }
-
-  private static void tracedMethodWithDeepException5(
-      int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
-    tracedMethodWithException(argInt, argStr, argDouble, argMap, argVar);
-  }
-
-  private static void tracedMethodWithLambdaException(
-      int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
-    throw toRuntimeException("lambdaOops");
-  }
-
-  private static void tracedMethodWithRecursiveException(
-      int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
-    if (argInt > 0) {
-      tracedMethodWithRecursiveException(argInt - 8, argStr, argDouble, argMap, argVar);
-    } else {
-      throw new RuntimeException("recursiveOops");
+
+    private static void tracedMethodWithDeepException3(
+            int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
+        tracedMethodWithDeepException4(argInt, argStr, argDouble, argMap, argVar);
     }
-  }
 
-  private static RuntimeException toRuntimeException(String msg) {
-    return toException(RuntimeException::new, msg);
-  }
+    private static void tracedMethodWithDeepException4(
+            int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
+        tracedMethodWithDeepException5(argInt, argStr, argDouble, argMap, argVar);
+    }
+
+    private static void tracedMethodWithDeepException5(
+            int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
+        tracedMethodWithException(argInt, argStr, argDouble, argMap, argVar);
+    }
+
+    private static void tracedMethodWithLambdaException(
+            int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
+        throw toRuntimeException("lambdaOops");
+    }
 
-  private static <S extends Throwable> S toException(Function<String, S> constructor, String msg) {
-    return constructor.apply(msg);
-  }
+    private static void tracedMethodWithRecursiveException(
+            int argInt, String argStr, double argDouble, Map<String, String> argMap, String... argVar) {
+        if (argInt > 0) {
+            tracedMethodWithRecursiveException(argInt - 8, argStr, argDouble, argMap, argVar);
+        } else {
+            throw new RuntimeException("recursiveOops");
+        }
+    }
 
-  private static class AppDispatcher extends Dispatcher {
-    private final ServerDebuggerTestApplication app;
+    private static RuntimeException toRuntimeException(String msg) {
+        return toException(RuntimeException::new, msg);
+    }
 
-    public AppDispatcher(ServerDebuggerTestApplication app) {
-      this.app = app;
+    private static <S extends Throwable> S toException(Function<String, S> constructor, String msg) {
+        return constructor.apply(msg);
     }
 
-    @Override
-    public MockResponse dispatch(RecordedRequest request) throws InterruptedException {
-      String path = request.getRequestUrl().url().getPath();
-      switch (path) {
-        case "/app/waitForInstrumentation":
-          {
-            String className = request.getRequestUrl().queryParameter("classname");
-            app.waitForInstrumentation(className);
-            break;
-          }
-        case "/app/waitForReTransformation":
-          {
-            String className = request.getRequestUrl().queryParameter("classname");
-            app.waitForReTransformation(className);
-            break;
-          }
-        case "/app/waitForExceptionFingerprint":
-          {
-            app.waitForExceptionFingerprint();
-            break;
-          }
-        case "/app/waitForSpecificLine":
-          {
-            String feature = request.getRequestUrl().queryParameter("line");
-            app.waitForSpecificLine(feature);
-            break;
-          }
-        case "/app/execute":
-          {
-            String methodName = request.getRequestUrl().queryParameter("methodname");
-            String arg = request.getRequestUrl().queryParameter("arg");
-            app.execute(methodName, arg);
-            break;
-          }
-        case "/app/stop":
-          {
-            app.stop();
-            break;
-          }
-        default:
-          throw new IllegalArgumentException("Unsupported url path: " + path);
-      }
-      return EMPTY_HTTP_200;
+    private static class AppDispatcher extends Dispatcher {
+        private final ServerDebuggerTestApplication app;
+
+        public AppDispatcher(ServerDebuggerTestApplication app) {
+            this.app = app;
+        }
+
+        @Override
+        public MockResponse dispatch(RecordedRequest request) throws InterruptedException {
+            String path = request.getRequestUrl().url().getPath();
+            switch (path) {
+                case "/app/waitForInstrumentation": {
+                    String className = request.getRequestUrl().queryParameter("classname");
+                    app.waitForInstrumentation(className);
+                    break;
+                }
+                case "/app/waitForReTransformation": {
+                    String className = request.getRequestUrl().queryParameter("classname");
+                    app.waitForReTransformation(className);
+                    break;
+                }
+                case "/app/waitForExceptionFingerprint": {
+                    app.waitForExceptionFingerprint();
+                    break;
+                }
+                case "/app/waitForSpecificLine": {
+                    String feature = request.getRequestUrl().queryParameter("line");
+                    app.waitForSpecificLine(feature);
+                    break;
+                }
+                case "/app/execute": {
+                    String methodName = request.getRequestUrl().queryParameter("methodname");
+                    String arg = request.getRequestUrl().queryParameter("arg");
+                    app.execute(methodName, arg);
+                    break;
+                }
+                case "/app/stop": {
+                    app.stop();
+                    break;
+                }
+                default:
+                    throw new IllegalArgumentException("Unsupported url path: " + path);
+            }
+            return EMPTY_HTTP_200;
+        }
     }
-  }
 }
 
 class TopLevel {
-  public static String process(String arg) {
-    return "TopLevel.process: " + arg;
-  }
+    public static String process(String arg) {
+        return "TopLevel.process: " + arg;
+    }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/SpringBootTestApplication.java b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/SpringBootTestApplication.java
index b592a851a5a..7e5bd11c683 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/SpringBootTestApplication.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/SpringBootTestApplication.java
@@ -5,8 +5,8 @@
 
 @SpringBootApplication
 public class SpringBootTestApplication {
-  public static void main(String[] args) {
-    SpringApplication.run(SpringBootTestApplication.class, args);
-    System.out.println(SpringBootTestApplication.class.getName());
-  }
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootTestApplication.class, args);
+        System.out.println(SpringBootTestApplication.class.getName());
+    }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/TestApplicationHelper.java b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/TestApplicationHelper.java
index 213222219e4..7e45248f10c 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/TestApplicationHelper.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/TestApplicationHelper.java
@@ -12,167 +12,159 @@
 import java.util.function.Predicate;
 
 public class TestApplicationHelper {
-  // instrumentation is done by main thread
-  private static final String INSTRUMENTATION_DONE_MAIN_THREAD =
-      "[main] DEBUG com.datadog.debugger.agent.DebuggerTransformer - Generating bytecode for class: %s";
-  private static final String INSTRUMENTATION_DONE_NO_THREAD =
-      "] DEBUG com.datadog.debugger.agent.DebuggerTransformer - Generating bytecode for class: %s";
-  private static final String THREAD_MAIN = "main";
-  private static final String THREAD_REMOTE_CONFIG = "dd-remote-config";
-  private static final String THREAD_SCHEDULER = "dd-task-scheduler";
-  private static final String THREAD_STARTUP = "dd-agent-startup-datadog-tracer";
-  private static final String[] THREAD_NAMES =
-      new String[] {THREAD_MAIN, THREAD_REMOTE_CONFIG, THREAD_SCHEDULER, THREAD_STARTUP};
-  private static final String RENTRANSFORMATION_CLASS =
-      "[dd-remote-config] DEBUG com.datadog.debugger.agent.ConfigurationUpdater - Re-transforming class: %s";
-  private static final String RETRANSFORMATION_DONE =
-      "com.datadog.debugger.agent.ConfigurationUpdater - Re-transformation done";
-  private static final String EXCEPTION_FINGERPRINT_ADDED =
-      "DEBUG com.datadog.debugger.exception.AbstractExceptionDebugger - Exception Fingerprint ";
-  private static final long SLEEP_MS = 100;
-  private static final long TIMEOUT_S = 10;
+    // instrumentation is done by main thread
+    private static final String INSTRUMENTATION_DONE_MAIN_THREAD =
+            "[main] DEBUG com.datadog.debugger.agent.DebuggerTransformer - Generating bytecode for class: %s";
+    private static final String INSTRUMENTATION_DONE_NO_THREAD =
+            "] DEBUG com.datadog.debugger.agent.DebuggerTransformer - Generating bytecode for class: %s";
+    private static final String THREAD_MAIN = "main";
+    private static final String THREAD_REMOTE_CONFIG = "dd-remote-config";
+    private static final String THREAD_SCHEDULER = "dd-task-scheduler";
+    private static final String THREAD_STARTUP = "dd-agent-startup-datadog-tracer";
+    private static final String[] THREAD_NAMES =
+            new String[] {THREAD_MAIN, THREAD_REMOTE_CONFIG, THREAD_SCHEDULER, THREAD_STARTUP};
+    private static final String RENTRANSFORMATION_CLASS =
+            "[dd-remote-config] DEBUG com.datadog.debugger.agent.ConfigurationUpdater - Re-transforming class: %s";
+    private static final String RETRANSFORMATION_DONE =
+            "com.datadog.debugger.agent.ConfigurationUpdater - Re-transformation done";
+    private static final String EXCEPTION_FINGERPRINT_ADDED =
+            "DEBUG com.datadog.debugger.exception.AbstractExceptionDebugger - Exception Fingerprint ";
+    private static final long SLEEP_MS = 100;
+    private static final long TIMEOUT_S = 10;
 
-  public static void waitForTransformerInstalled(String logFileName) throws IOException {
-    waitForSpecificLogLine(
-        Paths.get(logFileName),
-        line ->
-            line.contains(
-                "DEBUG com.datadog.debugger.agent.ConfigurationUpdater - New transformer installed"),
-        () -> {},
-        Duration.ofMillis(SLEEP_MS),
-        Duration.ofSeconds(TIMEOUT_S));
-  }
+    public static void waitForTransformerInstalled(String logFileName) throws IOException {
+        waitForSpecificLogLine(
+                Paths.get(logFileName),
+                line -> line.contains(
+                        "DEBUG com.datadog.debugger.agent.ConfigurationUpdater - New transformer installed"),
+                () -> {},
+                Duration.ofMillis(SLEEP_MS),
+                Duration.ofSeconds(TIMEOUT_S));
+    }
 
-  public static void waitForInstrumentation(String logFileName, String className)
-      throws IOException {
-    waitForInstrumentation(logFileName, className, null);
-  }
+    public static void waitForInstrumentation(String logFileName, String className) throws IOException {
+        waitForInstrumentation(logFileName, className, null);
+    }
 
-  public static String waitForInstrumentation(String logFileName, String className, String fromLine)
-      throws IOException {
-    AtomicBoolean generatingByteCode = new AtomicBoolean();
-    return waitForSpecificLogLine(
-        Paths.get(logFileName),
-        fromLine != null ? line -> line.contains(fromLine) : null,
-        line -> {
-          // when instrumentation is done by main thread, we are good to go
-          if (line.contains(String.format(INSTRUMENTATION_DONE_MAIN_THREAD, className))) {
-            return true;
-          }
-          if (!generatingByteCode.get()) {
-            // instrumentation is done by background thread, need to wait for end of
-            // re-transformation
-            if (line.contains(String.format(INSTRUMENTATION_DONE_NO_THREAD, className))) {
-              generatingByteCode.set(true);
-            }
-          } else {
-            return line.contains(RETRANSFORMATION_DONE);
-          }
-          return false;
-        },
-        () -> {},
-        Duration.ofMillis(SLEEP_MS),
-        Duration.ofSeconds(TIMEOUT_S));
-  }
+    public static String waitForInstrumentation(String logFileName, String className, String fromLine)
+            throws IOException {
+        AtomicBoolean generatingByteCode = new AtomicBoolean();
+        return waitForSpecificLogLine(
+                Paths.get(logFileName),
+                fromLine != null ? line -> line.contains(fromLine) : null,
+                line -> {
+                    // when instrumentation is done by main thread, we are good to go
+                    if (line.contains(String.format(INSTRUMENTATION_DONE_MAIN_THREAD, className))) {
+                        return true;
+                    }
+                    if (!generatingByteCode.get()) {
+                        // instrumentation is done by background thread, need to wait for end of
+                        // re-transformation
+                        if (line.contains(String.format(INSTRUMENTATION_DONE_NO_THREAD, className))) {
+                            generatingByteCode.set(true);
+                        }
+                    } else {
+                        return line.contains(RETRANSFORMATION_DONE);
+                    }
+                    return false;
+                },
+                () -> {},
+                Duration.ofMillis(SLEEP_MS),
+                Duration.ofSeconds(TIMEOUT_S));
+    }
 
-  public static String waitForReTransformation(
-      String logFileName, String className, String fromLine) throws IOException {
-    AtomicBoolean retransforming = new AtomicBoolean();
-    return waitForSpecificLogLine(
-        Paths.get(logFileName),
-        line -> line.contains(fromLine),
-        line -> {
-          if (!retransforming.get()) {
-            retransforming.set(line.contains(String.format(RENTRANSFORMATION_CLASS, className)));
-            return false;
-          }
-          return line.contains(RETRANSFORMATION_DONE);
-        },
-        () -> {},
-        Duration.ofMillis(SLEEP_MS),
-        Duration.ofSeconds(TIMEOUT_S));
-  }
+    public static String waitForReTransformation(String logFileName, String className, String fromLine)
+            throws IOException {
+        AtomicBoolean retransforming = new AtomicBoolean();
+        return waitForSpecificLogLine(
+                Paths.get(logFileName),
+                line -> line.contains(fromLine),
+                line -> {
+                    if (!retransforming.get()) {
+                        retransforming.set(line.contains(String.format(RENTRANSFORMATION_CLASS, className)));
+                        return false;
+                    }
+                    return line.contains(RETRANSFORMATION_DONE);
+                },
+                () -> {},
+                Duration.ofMillis(SLEEP_MS),
+                Duration.ofSeconds(TIMEOUT_S));
+    }
 
-  public static String waitForExceptionFingerprint(String logFileName) throws IOException {
-    return waitForSpecificLine(logFileName, EXCEPTION_FINGERPRINT_ADDED, null);
-  }
+    public static String waitForExceptionFingerprint(String logFileName) throws IOException {
+        return waitForSpecificLine(logFileName, EXCEPTION_FINGERPRINT_ADDED, null);
+    }
 
-  public static String waitForSpecificLine(String logFileName, String specificLine, String fromLine)
-      throws IOException {
-    return waitForSpecificLogLine(
-        Paths.get(logFileName),
-        fromLine != null ? line -> line.contains(fromLine) : null,
-        line -> line.contains(specificLine),
-        () -> {},
-        Duration.ofMillis(SLEEP_MS),
-        Duration.ofSeconds(TIMEOUT_S));
-  }
+    public static String waitForSpecificLine(String logFileName, String specificLine, String fromLine)
+            throws IOException {
+        return waitForSpecificLogLine(
+                Paths.get(logFileName),
+                fromLine != null ? line -> line.contains(fromLine) : null,
+                line -> line.contains(specificLine),
+                () -> {},
+                Duration.ofMillis(SLEEP_MS),
+                Duration.ofSeconds(TIMEOUT_S));
+    }
 
-  public static void waitForUpload(String logFileName, int expectedUploads) throws IOException {
-    if (expectedUploads == -1) {
-      System.out.println("wait for " + TIMEOUT_S + "s");
-      LockSupport.parkNanos(Duration.ofSeconds(TIMEOUT_S).toNanos());
-      return;
+    public static void waitForUpload(String logFileName, int expectedUploads) throws IOException {
+        if (expectedUploads == -1) {
+            System.out.println("wait for " + TIMEOUT_S + "s");
+            LockSupport.parkNanos(Duration.ofSeconds(TIMEOUT_S).toNanos());
+            return;
+        }
+        System.out.println("waitForUpload #" + expectedUploads);
+        AtomicInteger uploadCount = new AtomicInteger(0);
+        waitForSpecificLogLine(
+                Paths.get(logFileName),
+                line -> {
+                    if (line.contains("DEBUG com.datadog.debugger.uploader.BatchUploader - Upload done")) {
+                        int currentUploads = uploadCount.incrementAndGet();
+                        return currentUploads == expectedUploads;
+                    }
+                    return false;
+                },
+                () -> uploadCount.set(0),
+                Duration.ofMillis(SLEEP_MS),
+                Duration.ofSeconds(TIMEOUT_S));
     }
-    System.out.println("waitForUpload #" + expectedUploads);
-    AtomicInteger uploadCount = new AtomicInteger(0);
-    waitForSpecificLogLine(
-        Paths.get(logFileName),
-        line -> {
-          if (line.contains("DEBUG com.datadog.debugger.uploader.BatchUploader - Upload done")) {
-            int currentUploads = uploadCount.incrementAndGet();
-            return currentUploads == expectedUploads;
-          }
-          return false;
-        },
-        () -> uploadCount.set(0),
-        Duration.ofMillis(SLEEP_MS),
-        Duration.ofSeconds(TIMEOUT_S));
-  }
 
-  private static String waitForSpecificLogLine(
-      Path logFilePath,
-      Predicate<String> lineMatcher,
-      Runnable init,
-      Duration sleep,
-      Duration timeout)
-      throws IOException {
-    return waitForSpecificLogLine(logFilePath, null, lineMatcher, init, sleep, timeout);
-  }
+    private static String waitForSpecificLogLine(
+            Path logFilePath, Predicate<String> lineMatcher, Runnable init, Duration sleep, Duration timeout)
+            throws IOException {
+        return waitForSpecificLogLine(logFilePath, null, lineMatcher, init, sleep, timeout);
+    }
 
-  private static String waitForSpecificLogLine(
-      Path logFilePath,
-      Predicate<String> fromLineMatcher,
-      Predicate<String> lineMatcher,
-      Runnable init,
-      Duration sleep,
-      Duration timeout)
-      throws IOException {
-    AtomicBoolean result = new AtomicBoolean();
-    AtomicReference<String> matchedLine = new AtomicReference<>();
-    long total = sleep.toNanos() == 0 ? 0 : timeout.toNanos() / sleep.toNanos();
-    int i = 0;
-    while (i < total && !result.get()) {
-      System.out.flush();
-      System.err.flush();
-      init.run();
-      AtomicBoolean fromLineMatched = new AtomicBoolean(fromLineMatcher == null);
-      Files.lines(logFilePath)
-          .forEach(
-              line -> {
+    private static String waitForSpecificLogLine(
+            Path logFilePath,
+            Predicate<String> fromLineMatcher,
+            Predicate<String> lineMatcher,
+            Runnable init,
+            Duration sleep,
+            Duration timeout)
+            throws IOException {
+        AtomicBoolean result = new AtomicBoolean();
+        AtomicReference<String> matchedLine = new AtomicReference<>();
+        long total = sleep.toNanos() == 0 ? 0 : timeout.toNanos() / sleep.toNanos();
+        int i = 0;
+        while (i < total && !result.get()) {
+            System.out.flush();
+            System.err.flush();
+            init.run();
+            AtomicBoolean fromLineMatched = new AtomicBoolean(fromLineMatcher == null);
+            Files.lines(logFilePath).forEach(line -> {
                 if (!fromLineMatched.get()) {
-                  fromLineMatched.set(fromLineMatcher.test(line));
+                    fromLineMatched.set(fromLineMatcher.test(line));
                 } else if (lineMatcher.test(line)) {
-                  matchedLine.set(line);
-                  result.set(true);
+                    matchedLine.set(line);
+                    result.set(true);
                 }
-              });
-      LockSupport.parkNanos(sleep.toNanos());
-      i++;
-    }
-    if (!result.get()) {
-      throw new IllegalStateException("waitForSpecificLogLine timed out!");
+            });
+            LockSupport.parkNanos(sleep.toNanos());
+            i++;
+        }
+        if (!result.get()) {
+            throw new IllegalStateException("waitForSpecificLogLine timed out!");
+        }
+        return matchedLine.get();
     }
-    return matchedLine.get();
-  }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/controller/InterfacedController.java b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/controller/InterfacedController.java
index 08cca6b9238..819eec2c9ee 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/controller/InterfacedController.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/controller/InterfacedController.java
@@ -6,13 +6,13 @@
 @RestController
 public class InterfacedController implements InterfaceApi {
 
-  @Override
-  public String process() {
-    return "OK";
-  }
+    @Override
+    public String process() {
+        return "OK";
+    }
 }
 
 interface InterfaceApi {
-  @RequestMapping("/process")
-  String process();
+    @RequestMapping("/process")
+    String process();
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/controller/WebController.java b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/controller/WebController.java
index 45d6c66d8ac..473112d6d16 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/controller/WebController.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/controller/WebController.java
@@ -5,13 +5,13 @@
 
 @RestController
 public class WebController {
-  @RequestMapping("/greeting")
-  public String greeting() {
-    processWithArg(42);
-    return "Sup Dawg";
-  }
+    @RequestMapping("/greeting")
+    public String greeting() {
+        processWithArg(42);
+        return "Sup Dawg";
+    }
 
-  private void processWithArg(int argInt) {
-    System.out.println(argInt);
-  }
+    private void processWithArg(int argInt) {
+        System.out.println(argInt);
+    }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/AgentDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/AgentDebuggerIntegrationTest.java
index 47d009c7d01..3458b5cf24a 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/AgentDebuggerIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/AgentDebuggerIntegrationTest.java
@@ -17,112 +17,107 @@
 
 @NonRetryable
 public class AgentDebuggerIntegrationTest extends SimpleAppDebuggerIntegrationTest {
-  @Test
-  @DisplayName("testLatestJdk")
-  void testLatestJdk() throws Exception {
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
-    LogProbe probe = LogProbe.builder().where("App", "getGreeting").build();
-    setCurrentConfiguration(createConfig(probe));
-    String classpath = System.getProperty("datadog.smoketest.shadowJar.external.path");
-    if (classpath == null) {
-      return; // execute test only if classpath is provided for the latest jdk
-    }
-    List<String> commandParams = getDebuggerCommandParams();
-    targetProcess =
-        ProcessBuilderHelper.createProcessBuilder(
-                classpath, commandParams, logFilePath, "App", EXPECTED_UPLOADS)
-            .start();
-    AtomicBoolean snapshotReceived = new AtomicBoolean(false);
-    registerSnapshotListener(
-        snapshot -> {
-          snapshotReceived.set(true);
+    @Test
+    @DisplayName("testLatestJdk")
+    void testLatestJdk() throws Exception {
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
+        LogProbe probe = LogProbe.builder().where("App", "getGreeting").build();
+        setCurrentConfiguration(createConfig(probe));
+        String classpath = System.getProperty("datadog.smoketest.shadowJar.external.path");
+        if (classpath == null) {
+            return; // execute test only if classpath is provided for the latest jdk
+        }
+        List<String> commandParams = getDebuggerCommandParams();
+        targetProcess = ProcessBuilderHelper.createProcessBuilder(
+                        classpath, commandParams, logFilePath, "App", EXPECTED_UPLOADS)
+                .start();
+        AtomicBoolean snapshotReceived = new AtomicBoolean(false);
+        registerSnapshotListener(snapshot -> {
+            snapshotReceived.set(true);
         });
-    processRequests(
-        snapshotReceived::get,
-        () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
-    assertFalse(logHasErrors(logFilePath, it -> false));
-  }
+        processRequests(
+                snapshotReceived::get, () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
+        assertFalse(logHasErrors(logFilePath, it -> false));
+    }
 
-  @Test
-  @DisplayName("testShutdown")
-  void testShutdown() throws Exception {
-    final String METHOD_NAME = "emptyMethod";
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
-    LogProbe probe =
-        LogProbe.builder().probeId(PROBE_ID).where(MAIN_CLASS_NAME, METHOD_NAME).build();
-    setCurrentConfiguration(createConfig(probe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    AtomicBoolean snapshotReceived = new AtomicBoolean(false);
-    registerSnapshotListener(
-        snapshot -> {
-          snapshotReceived.set(true);
+    @Test
+    @DisplayName("testShutdown")
+    void testShutdown() throws Exception {
+        final String METHOD_NAME = "emptyMethod";
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, METHOD_NAME)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        AtomicBoolean snapshotReceived = new AtomicBoolean(false);
+        registerSnapshotListener(snapshot -> {
+            snapshotReceived.set(true);
         });
-    processRequests(
-        snapshotReceived::get,
-        () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
-    assertFalse(logHasErrors(logFilePath, it -> false));
-    // Wait for the app exit with some extra time.
-    // The expectation is that agent doesn't prevent app from exiting.
-    assertTrue(targetProcess.waitFor(REQUEST_WAIT_TIMEOUT + 10, TimeUnit.SECONDS));
-  }
+        processRequests(
+                snapshotReceived::get, () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
+        assertFalse(logHasErrors(logFilePath, it -> false));
+        // Wait for the app exit with some extra time.
+        // The expectation is that agent doesn't prevent app from exiting.
+        assertTrue(targetProcess.waitFor(REQUEST_WAIT_TIMEOUT + 10, TimeUnit.SECONDS));
+    }
 
-  @Test
-  @DisplayName("testDestroy")
-  void testDestroy() throws Exception {
-    final String METHOD_NAME = "fullMethod";
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
-    LogProbe probe =
-        LogProbe.builder().probeId(PROBE_ID).where(MAIN_CLASS_NAME, METHOD_NAME).build();
-    setCurrentConfiguration(createConfig(probe));
-    datadogAgentServer.enqueue(
-        new MockResponse()
-            .setHeadersDelay(REQUEST_WAIT_TIMEOUT * 2, TimeUnit.SECONDS)
-            .setResponseCode(200));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    AtomicBoolean snapshotReceived = new AtomicBoolean(false);
-    registerSnapshotListener(
-        snapshot -> {
-          snapshotReceived.set(true);
+    @Test
+    @DisplayName("testDestroy")
+    void testDestroy() throws Exception {
+        final String METHOD_NAME = "fullMethod";
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, METHOD_NAME)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        datadogAgentServer.enqueue(new MockResponse()
+                .setHeadersDelay(REQUEST_WAIT_TIMEOUT * 2, TimeUnit.SECONDS)
+                .setResponseCode(200));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        AtomicBoolean snapshotReceived = new AtomicBoolean(false);
+        registerSnapshotListener(snapshot -> {
+            snapshotReceived.set(true);
         });
-    processRequests(
-        snapshotReceived::get,
-        () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
-    targetProcess.destroy();
-    // Wait for the app exit with some extra time.
-    // The expectation is that agent doesn't prevent app from exiting.
-    assertTrue(targetProcess.waitFor(REQUEST_WAIT_TIMEOUT + 10, TimeUnit.SECONDS));
-  }
+        processRequests(
+                snapshotReceived::get, () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
+        targetProcess.destroy();
+        // Wait for the app exit with some extra time.
+        // The expectation is that agent doesn't prevent app from exiting.
+        assertTrue(targetProcess.waitFor(REQUEST_WAIT_TIMEOUT + 10, TimeUnit.SECONDS));
+    }
 
-  @Test
-  @DisplayName("testEndpoints")
-  void testEndpoints() throws Exception {
-    setCurrentConfiguration(createConfig(Collections.emptyList()));
-    targetProcess = createProcessBuilder(logFilePath, "", "").start();
-    waitForSpecificLine(
-        logFilePath.toString(),
-        "INFO com.datadog.debugger.agent.DebuggerAgent - Started Dynamic Instrumentation",
-        null);
-    Assertions.assertFalse(
-        logHasErrors(
-            logFilePath,
-            line -> {
-              if (line.contains("Started BatchUploader[Diagnostics]")) {
+    @Test
+    @DisplayName("testEndpoints")
+    void testEndpoints() throws Exception {
+        setCurrentConfiguration(createConfig(Collections.emptyList()));
+        targetProcess = createProcessBuilder(logFilePath, "", "").start();
+        waitForSpecificLine(
+                logFilePath.toString(),
+                "INFO com.datadog.debugger.agent.DebuggerAgent - Started Dynamic Instrumentation",
+                null);
+        Assertions.assertFalse(logHasErrors(logFilePath, line -> {
+            if (line.contains("Started BatchUploader[Diagnostics]")) {
                 return !line.matches(
-                    ".* Started BatchUploader\\[Diagnostics] with target url http://localhost:\\d+/debugger/v1/diagnostics");
-              }
-              if (line.contains("Started BatchUploader[Snapshots]")) {
+                        ".* Started BatchUploader\\[Diagnostics] with target url http://localhost:\\d+/debugger/v1/diagnostics");
+            }
+            if (line.contains("Started BatchUploader[Snapshots]")) {
                 return !line.matches(
-                    ".* Started BatchUploader\\[Snapshots] with target url http://localhost:\\d+/debugger/v1/diagnostics");
-              }
-              if (line.contains("Started BatchUploader[Logs]")) {
+                        ".* Started BatchUploader\\[Snapshots] with target url http://localhost:\\d+/debugger/v1/diagnostics");
+            }
+            if (line.contains("Started BatchUploader[Logs]")) {
                 return !line.matches(
-                    ".* Started BatchUploader\\[Logs] with target url http://localhost:\\d+/debugger/v1/diagnostics");
-              }
-              if (line.contains("Started BatchUploader[SymDB]")) {
+                        ".* Started BatchUploader\\[Logs] with target url http://localhost:\\d+/debugger/v1/diagnostics");
+            }
+            if (line.contains("Started BatchUploader[SymDB]")) {
                 return !line.matches(
-                    ".* Started BatchUploader\\[SymDB] with target url http://localhost:\\d+/symdb/v1/input");
-              }
-              return false;
-            }));
-  }
+                        ".* Started BatchUploader\\[SymDB] with target url http://localhost:\\d+/symdb/v1/input");
+            }
+            return false;
+        }));
+    }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/BaseIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/BaseIntegrationTest.java
index 8947b89e4c9..505b76adb3e 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/BaseIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/BaseIntegrationTest.java
@@ -64,663 +64,641 @@
 import org.slf4j.LoggerFactory;
 
 public abstract class BaseIntegrationTest {
-  protected static final Logger LOG = LoggerFactory.getLogger(BaseIntegrationTest.class);
-  protected static final String TRACE_URL_PATH = "/v0.4/traces";
-  protected static final String CONFIG_URL_PATH = "/v0.7/config";
-  protected static final String LOG_UPLOAD_URL_PATH = "/debugger/v1/input";
-  protected static final String SNAPSHOT_UPLOAD_URL_PATH = "/debugger/v2/input";
-  protected static final String DIAGNOSTICS_URL_PATH = "/debugger/v1/diagnostics";
-  protected static final int REQUEST_WAIT_TIMEOUT = 10;
-  private static final Path LOG_FILE_BASE =
-      Paths.get(
-          buildDirectory(),
-          "reports",
-          "testProcess." + SimpleAppDebuggerIntegrationTest.class.getName());
-  private static final String INFO_CONTENT =
-      "{\"endpoints\": [\""
-          + TRACE_URL_PATH
-          + "\", \""
-          + LOG_UPLOAD_URL_PATH
-          + "\", \""
-          + DIAGNOSTICS_URL_PATH
-          + "\", \""
-          + CONFIG_URL_PATH
-          + "\"]}";
-  private static final MockResponse AGENT_INFO_RESPONSE =
-      new MockResponse().setResponseCode(200).setBody(INFO_CONTENT);
-  private static final MockResponse TELEMETRY_RESPONSE = new MockResponse().setResponseCode(202);
-  protected static final MockResponse EMPTY_200_RESPONSE = new MockResponse().setResponseCode(200);
-
-  private static final ByteString DIAGNOSTICS_STR = ByteString.encodeUtf8("{\"diagnostics\":");
-  private static final String APM_CONFIG_ID = UUID.randomUUID().toString();
-  public static final String LIVE_DEBUGGING_PRODUCT = "LIVE_DEBUGGING";
-  public static final String APM_TRACING_PRODUCT = "APM_TRACING";
-
-  protected MockWebServer datadogAgentServer;
-  protected MockDispatcher probeMockDispatcher;
-  private StatsDServer statsDServer;
-  private HttpUrl probeUrl;
-  private HttpUrl snapshotUrl;
-  protected Path logFilePath;
-  protected Process targetProcess;
-  private Configuration currentConfiguration;
-  private ConfigOverrides configOverrides;
-  protected final Object configLock = new Object();
-  protected final List<Consumer<JsonSnapshotSerializer.IntakeRequest>> intakeRequestListeners =
-      new ArrayList<>();
-  protected final List<Consumer<Snapshot>> snapshotListeners = new ArrayList<>();
-  protected final List<Consumer<DecodedTrace>> traceListeners = new ArrayList<>();
-  protected final List<Consumer<ProbeStatus>> probeStatusListeners = new ArrayList<>();
-  protected int batchSize = 1; // to verify each snapshot upload one by one
-
-  @BeforeAll
-  static void setupAll() throws Exception {
-    Files.createDirectories(LOG_FILE_BASE);
-  }
-
-  @BeforeEach
-  void setup(TestInfo testInfo) throws Exception {
-    LOG.info("===== Starting {} ====", testInfo.getDisplayName());
-    datadogAgentServer = new MockWebServer();
-    probeMockDispatcher = new MockDispatcher();
-    probeMockDispatcher.setDispatcher(this::datadogAgentDispatch);
-    datadogAgentServer.setDispatcher(probeMockDispatcher);
-    probeUrl = datadogAgentServer.url(CONFIG_URL_PATH);
-    LOG.info("DatadogAgentServer on {}", datadogAgentServer.getPort());
-    snapshotUrl = datadogAgentServer.url(LOG_UPLOAD_URL_PATH);
-    statsDServer = new StatsDServer();
-    statsDServer.start();
-    LOG.info("statsDServer on {}", statsDServer.getPort());
-    logFilePath = LOG_FILE_BASE.resolve(testInfo.getDisplayName() + ".log");
-  }
-
-  @AfterEach
-  void teardown(TestInfo testInfo) throws Exception {
-    if (targetProcess != null) {
-      targetProcess.destroyForcibly();
-    }
-    datadogAgentServer.shutdown();
-    statsDServer.close();
-    ProbeRateLimiter.resetGlobalRate();
-    LOG.info("===== Ending {} ====", testInfo.getDisplayName());
-  }
-
-  protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
-    List<String> commandParams = getDebuggerCommandParams();
-    commandParams.add("-Ddd.trace.enabled=false");
-    return ProcessBuilderHelper.createProcessBuilder(
-        commandParams, logFilePath, getAppClass(), params);
-  }
-
-  protected abstract String getAppClass();
-
-  protected abstract String getAppId();
-
-  protected List<String> getDebuggerCommandParams() {
-    return new ArrayList<>(
-        Arrays.asList(
-            "-Ddd.service.name=" + getAppId(),
-            "-Ddd.profiling.enabled=false",
-            "-Ddatadog.slf4j.simpleLogger.defaultLogLevel=info",
-            "-Ddatadog.slf4j.simpleLogger.log.datadog.trace.agent.core=debug",
-            "-Ddatadog.slf4j.simpleLogger.log.com.datadog.debugger=debug",
-            "-Ddatadog.slf4j.simpleLogger.log.datadog.trace.bootstrap.debugger=debug",
-            "-Ddatadog.slf4j.simpleLogger.log.datadog.remoteconfig=debug",
-            "-Ddd.jmxfetch.start-delay=0",
-            "-Ddd.jmxfetch.enabled=false",
-            "-Ddd.dynamic.instrumentation.enabled=true",
-            "-Ddd.remote_config.poll_interval.seconds=1",
-            "-Ddd.trace.agent.url=http://localhost:" + datadogAgentServer.getPort(),
-            "-Ddd.jmxfetch.statsd.port=" + statsDServer.getPort(),
-            "-Ddd.dynamic.instrumentation.classfile.dump.enabled=true",
-            "-Ddd.dynamic.instrumentation.upload.batch.size=" + batchSize,
-            // flush uploads every 100ms to have quick tests
-            "-Ddd.dynamic.instrumentation.upload.flush.interval=100",
-            // increase timeout for serialization
-            "-Ddd.dynamic.instrumentation.capture.timeout=30000"));
-  }
-
-  protected enum RequestType {
-    SNAPSHOT {
-      @Override
-      public void process(BaseIntegrationTest baseIntegrationTest, RecordedRequest request) {
-        if (!(request.getPath().startsWith(LOG_UPLOAD_URL_PATH)
-            || request.getPath().startsWith(DIAGNOSTICS_URL_PATH)
-            || request.getPath().startsWith(SNAPSHOT_UPLOAD_URL_PATH))) {
-          return;
+    protected static final Logger LOG = LoggerFactory.getLogger(BaseIntegrationTest.class);
+    protected static final String TRACE_URL_PATH = "/v0.4/traces";
+    protected static final String CONFIG_URL_PATH = "/v0.7/config";
+    protected static final String LOG_UPLOAD_URL_PATH = "/debugger/v1/input";
+    protected static final String SNAPSHOT_UPLOAD_URL_PATH = "/debugger/v2/input";
+    protected static final String DIAGNOSTICS_URL_PATH = "/debugger/v1/diagnostics";
+    protected static final int REQUEST_WAIT_TIMEOUT = 10;
+    private static final Path LOG_FILE_BASE =
+            Paths.get(buildDirectory(), "reports", "testProcess." + SimpleAppDebuggerIntegrationTest.class.getName());
+    private static final String INFO_CONTENT = "{\"endpoints\": [\""
+            + TRACE_URL_PATH
+            + "\", \""
+            + LOG_UPLOAD_URL_PATH
+            + "\", \""
+            + DIAGNOSTICS_URL_PATH
+            + "\", \""
+            + CONFIG_URL_PATH
+            + "\"]}";
+    private static final MockResponse AGENT_INFO_RESPONSE =
+            new MockResponse().setResponseCode(200).setBody(INFO_CONTENT);
+    private static final MockResponse TELEMETRY_RESPONSE = new MockResponse().setResponseCode(202);
+    protected static final MockResponse EMPTY_200_RESPONSE = new MockResponse().setResponseCode(200);
+
+    private static final ByteString DIAGNOSTICS_STR = ByteString.encodeUtf8("{\"diagnostics\":");
+    private static final String APM_CONFIG_ID = UUID.randomUUID().toString();
+    public static final String LIVE_DEBUGGING_PRODUCT = "LIVE_DEBUGGING";
+    public static final String APM_TRACING_PRODUCT = "APM_TRACING";
+
+    protected MockWebServer datadogAgentServer;
+    protected MockDispatcher probeMockDispatcher;
+    private StatsDServer statsDServer;
+    private HttpUrl probeUrl;
+    private HttpUrl snapshotUrl;
+    protected Path logFilePath;
+    protected Process targetProcess;
+    private Configuration currentConfiguration;
+    private ConfigOverrides configOverrides;
+    protected final Object configLock = new Object();
+    protected final List<Consumer<JsonSnapshotSerializer.IntakeRequest>> intakeRequestListeners = new ArrayList<>();
+    protected final List<Consumer<Snapshot>> snapshotListeners = new ArrayList<>();
+    protected final List<Consumer<DecodedTrace>> traceListeners = new ArrayList<>();
+    protected final List<Consumer<ProbeStatus>> probeStatusListeners = new ArrayList<>();
+    protected int batchSize = 1; // to verify each snapshot upload one by one
+
+    @BeforeAll
+    static void setupAll() throws Exception {
+        Files.createDirectories(LOG_FILE_BASE);
+    }
+
+    @BeforeEach
+    void setup(TestInfo testInfo) throws Exception {
+        LOG.info("===== Starting {} ====", testInfo.getDisplayName());
+        datadogAgentServer = new MockWebServer();
+        probeMockDispatcher = new MockDispatcher();
+        probeMockDispatcher.setDispatcher(this::datadogAgentDispatch);
+        datadogAgentServer.setDispatcher(probeMockDispatcher);
+        probeUrl = datadogAgentServer.url(CONFIG_URL_PATH);
+        LOG.info("DatadogAgentServer on {}", datadogAgentServer.getPort());
+        snapshotUrl = datadogAgentServer.url(LOG_UPLOAD_URL_PATH);
+        statsDServer = new StatsDServer();
+        statsDServer.start();
+        LOG.info("statsDServer on {}", statsDServer.getPort());
+        logFilePath = LOG_FILE_BASE.resolve(testInfo.getDisplayName() + ".log");
+    }
+
+    @AfterEach
+    void teardown(TestInfo testInfo) throws Exception {
+        if (targetProcess != null) {
+            targetProcess.destroyForcibly();
         }
-        try {
-          if (request.getBody().indexOf(DIAGNOSTICS_STR) > -1) {
-            return;
-          }
-        } catch (IOException ex) {
-          ex.printStackTrace();
+        datadogAgentServer.shutdown();
+        statsDServer.close();
+        ProbeRateLimiter.resetGlobalRate();
+        LOG.info("===== Ending {} ====", testInfo.getDisplayName());
+    }
+
+    protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
+        List<String> commandParams = getDebuggerCommandParams();
+        commandParams.add("-Ddd.trace.enabled=false");
+        return ProcessBuilderHelper.createProcessBuilder(commandParams, logFilePath, getAppClass(), params);
+    }
+
+    protected abstract String getAppClass();
+
+    protected abstract String getAppId();
+
+    protected List<String> getDebuggerCommandParams() {
+        return new ArrayList<>(Arrays.asList(
+                "-Ddd.service.name=" + getAppId(),
+                "-Ddd.profiling.enabled=false",
+                "-Ddatadog.slf4j.simpleLogger.defaultLogLevel=info",
+                "-Ddatadog.slf4j.simpleLogger.log.datadog.trace.agent.core=debug",
+                "-Ddatadog.slf4j.simpleLogger.log.com.datadog.debugger=debug",
+                "-Ddatadog.slf4j.simpleLogger.log.datadog.trace.bootstrap.debugger=debug",
+                "-Ddatadog.slf4j.simpleLogger.log.datadog.remoteconfig=debug",
+                "-Ddd.jmxfetch.start-delay=0",
+                "-Ddd.jmxfetch.enabled=false",
+                "-Ddd.dynamic.instrumentation.enabled=true",
+                "-Ddd.remote_config.poll_interval.seconds=1",
+                "-Ddd.trace.agent.url=http://localhost:" + datadogAgentServer.getPort(),
+                "-Ddd.jmxfetch.statsd.port=" + statsDServer.getPort(),
+                "-Ddd.dynamic.instrumentation.classfile.dump.enabled=true",
+                "-Ddd.dynamic.instrumentation.upload.batch.size=" + batchSize,
+                // flush uploads every 100ms to have quick tests
+                "-Ddd.dynamic.instrumentation.upload.flush.interval=100",
+                // increase timeout for serialization
+                "-Ddd.dynamic.instrumentation.capture.timeout=30000"));
+    }
+
+    protected enum RequestType {
+        SNAPSHOT {
+            @Override
+            public void process(BaseIntegrationTest baseIntegrationTest, RecordedRequest request) {
+                if (!(request.getPath().startsWith(LOG_UPLOAD_URL_PATH)
+                        || request.getPath().startsWith(DIAGNOSTICS_URL_PATH)
+                        || request.getPath().startsWith(SNAPSHOT_UPLOAD_URL_PATH))) {
+                    return;
+                }
+                try {
+                    if (request.getBody().indexOf(DIAGNOSTICS_STR) > -1) {
+                        return;
+                    }
+                } catch (IOException ex) {
+                    ex.printStackTrace();
+                }
+                String bodyStr = request.getBody().readUtf8();
+                LOG.info("got snapshot: {}", bodyStr);
+                JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>> adapter = createAdapterForSnapshot();
+                try {
+                    List<JsonSnapshotSerializer.IntakeRequest> intakeRequests = adapter.fromJson(bodyStr);
+                    for (JsonSnapshotSerializer.IntakeRequest intakeRequest : intakeRequests) {
+                        for (Consumer<JsonSnapshotSerializer.IntakeRequest> listener :
+                                baseIntegrationTest.intakeRequestListeners) {
+                            listener.accept(intakeRequest);
+                        }
+                        Snapshot snapshot = intakeRequest.getDebugger().getSnapshot();
+                        for (Consumer<Snapshot> listener : baseIntegrationTest.snapshotListeners) {
+                            listener.accept(snapshot);
+                        }
+                    }
+                } catch (IOException ex) {
+                    ex.printStackTrace();
+                }
+            }
+        },
+        SPAN {
+            @Override
+            public void process(BaseIntegrationTest baseIntegrationTest, RecordedRequest request) {
+                if (!request.getPath().equals(TRACE_URL_PATH)) {
+                    return;
+                }
+                DecodedMessage decodedMessage =
+                        Decoder.decodeV04(request.getBody().readByteArray());
+                LOG.info("got traces: {}", decodedMessage.getTraces().size());
+                for (Consumer<DecodedTrace> listener : baseIntegrationTest.traceListeners) {
+                    for (DecodedTrace trace : decodedMessage.getTraces()) {
+                        listener.accept(trace);
+                    }
+                }
+            }
+        },
+        PROBE_STATUS {
+            @Override
+            public void process(BaseIntegrationTest baseIntegrationTest, RecordedRequest request) {
+                if (!request.getPath().startsWith(DIAGNOSTICS_URL_PATH)) {
+                    return;
+                }
+                try {
+                    if (request.getBody().indexOf(DIAGNOSTICS_STR) == -1) {
+                        return;
+                    }
+                } catch (IOException ex) {
+                    ex.printStackTrace();
+                }
+                JsonAdapter<List<ProbeStatus>> adapter = MoshiHelper.createMoshiProbeStatus()
+                        .adapter(Types.newParameterizedType(List.class, ProbeStatus.class));
+                String bodyStr = request.getBody().readUtf8();
+                LOG.info("got probe status: {}", bodyStr);
+                try {
+                    // Http multipart decode
+                    String partBody = parseMultiPart(request, bodyStr);
+                    if (partBody == null) {
+                        return;
+                    }
+                    List<ProbeStatus> probeStatuses = adapter.fromJson(partBody);
+                    for (Consumer<ProbeStatus> listener : baseIntegrationTest.probeStatusListeners) {
+                        for (ProbeStatus probeStatus : probeStatuses) {
+                            listener.accept(probeStatus);
+                        }
+                    }
+                } catch (IOException ex) {
+                    ex.printStackTrace();
+                }
+            }
+        };
+
+        public abstract void process(BaseIntegrationTest baseIntegrationTest, RecordedRequest request);
+    }
+
+    private static String parseMultiPart(RecordedRequest request, String bodyStr) throws IOException {
+        // To parse it as multipart, you'll need to use the boundary from the Content-Type header
+        String contentType = request.getHeader("Content-Type");
+        String boundary = null;
+        // Extract the boundary from the Content-Type header
+        if (contentType != null && contentType.startsWith("multipart/")) {
+            String[] parts = contentType.split("boundary=");
+            if (parts.length > 1) {
+                boundary = parts[1].trim();
+            }
+        }
+
+        try (BufferedReader reader = new BufferedReader(new StringReader(bodyStr))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                // Process each line of the multipart body
+                if (line.startsWith("--" + boundary)) {
+                    // This is a part boundary
+                    // The next line should be headers for this part
+                    Headers.Builder partHeaders = new Headers.Builder();
+                    while (!(line = reader.readLine()).isEmpty()) {
+                        // Parse headers
+                        int colon = line.indexOf(':');
+                        if (colon != -1) {
+                            partHeaders.add(
+                                    line.substring(0, colon).trim(),
+                                    line.substring(colon + 1).trim());
+                        }
+                    }
+
+                    // Now read the part content until we hit the boundary
+                    StringBuilder partContent = new StringBuilder();
+                    while ((line = reader.readLine()) != null && !line.startsWith("--" + boundary)) {
+                        partContent.append(line).append("\n");
+                    }
+                    return partContent.toString().trim();
+                }
+            }
         }
-        String bodyStr = request.getBody().readUtf8();
-        LOG.info("got snapshot: {}", bodyStr);
-        JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>> adapter =
-            createAdapterForSnapshot();
+        return null;
+    }
+
+    protected void registerIntakeRequestListener(Consumer<JsonSnapshotSerializer.IntakeRequest> listener) {
+        intakeRequestListeners.add(listener);
+    }
+
+    protected void registerSnapshotListener(Consumer<Snapshot> listener) {
+        snapshotListeners.add(listener);
+    }
+
+    protected void registerTraceListener(Consumer<DecodedTrace> listener) {
+        traceListeners.add(listener);
+    }
+
+    protected void resetTraceListener() {
+        traceListeners.clear();
+    }
+
+    protected void registerProbeStatusListener(Consumer<ProbeStatus> listener) {
+        probeStatusListeners.add(listener);
+    }
+
+    protected AtomicBoolean registerCheckReceivedInstalledEmitting(ProbeId probeId) {
+        AtomicBoolean received = new AtomicBoolean();
+        AtomicBoolean installed = new AtomicBoolean();
+        AtomicBoolean emitting = new AtomicBoolean();
+        AtomicBoolean result = new AtomicBoolean();
+        registerProbeStatusListener(probeStatus -> {
+            if (probeStatus.getDiagnostics().getProbeId().equals(probeId)) {
+                if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.RECEIVED) {
+                    received.set(true);
+                }
+                if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.INSTALLED) {
+                    installed.set(true);
+                }
+                if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.EMITTING) {
+                    emitting.set(true);
+                }
+                result.set(received.get() && installed.get() && emitting.get());
+            }
+        });
+        return result;
+    }
+
+    protected void processRequests(BooleanSupplier conditionOfDone, Supplier<String> timeoutMessage)
+            throws InterruptedException {
+        long start = System.currentTimeMillis();
         try {
-          List<JsonSnapshotSerializer.IntakeRequest> intakeRequests = adapter.fromJson(bodyStr);
-          for (JsonSnapshotSerializer.IntakeRequest intakeRequest : intakeRequests) {
-            for (Consumer<JsonSnapshotSerializer.IntakeRequest> listener :
-                baseIntegrationTest.intakeRequestListeners) {
-              listener.accept(intakeRequest);
+            RecordedRequest request;
+            do {
+                request = datadogAgentServer.takeRequest(REQUEST_WAIT_TIMEOUT, TimeUnit.SECONDS);
+                if (request == null) {
+                    throw new RuntimeException(timeoutMessage.get());
+                }
+                LOG.info("processRequests path={}", request.getPath());
+                for (RequestType requestType : RequestType.values()) {
+                    requestType.process(this, request);
+                    if (conditionOfDone.getAsBoolean()) {
+                        return;
+                    }
+                }
+            } while (request != null && (System.currentTimeMillis() - start < 30_000));
+            throw new RuntimeException(timeoutMessage.get());
+        } finally {
+            probeStatusListeners.clear();
+        }
+    }
+
+    protected void processRemainingRequests() throws InterruptedException {
+        RecordedRequest request;
+        do {
+            request = datadogAgentServer.takeRequest(1, TimeUnit.MILLISECONDS);
+            if (request == null) {
+                break;
             }
-            Snapshot snapshot = intakeRequest.getDebugger().getSnapshot();
-            for (Consumer<Snapshot> listener : baseIntegrationTest.snapshotListeners) {
-              listener.accept(snapshot);
+            LOG.info(
+                    "processRemainingRequests path={} body={}",
+                    request.getPath(),
+                    request.getBody().readUtf8());
+        } while (request != null);
+    }
+
+    protected RecordedRequest retrieveRequest(Predicate<RecordedRequest> filterRequest) throws InterruptedException {
+        long ts = System.nanoTime();
+        RecordedRequest request;
+        do {
+            request = datadogAgentServer.takeRequest(REQUEST_WAIT_TIMEOUT, TimeUnit.SECONDS);
+            if (request == null) {
+                LOG.info("retreiveRequest request==null => timeout 10 sec");
+            } else {
+                LOG.info("retreiveRequest request!=null path={} testing...", request.getPath());
             }
-          }
-        } catch (IOException ex) {
-          ex.printStackTrace();
+        } while (request != null && !filterRequest.test(request));
+        long dur = System.nanoTime() - ts;
+        LOG.info("request retrieved in {} seconds", TimeUnit.SECONDS.convert(dur, TimeUnit.NANOSECONDS));
+        return request;
+    }
+
+    protected String retrieveStatsdMessage(String str) {
+        return statsDServer.waitForMessage(str);
+    }
+
+    protected MockResponse datadogAgentDispatch(RecordedRequest request) {
+        LOG.info("datadogAgentDispatch request path: {}", request.getPath());
+        if (request.getPath().equals("/info")) {
+            return AGENT_INFO_RESPONSE;
         }
-      }
-    },
-    SPAN {
-      @Override
-      public void process(BaseIntegrationTest baseIntegrationTest, RecordedRequest request) {
-        if (!request.getPath().equals(TRACE_URL_PATH)) {
-          return;
+        if (request.getPath().equals("/telemetry/proxy/api/v2/apmtelemetry")) {
+            // Ack every telemetry request. This is needed if telemetry is enabled in the tests.
+            return TELEMETRY_RESPONSE;
         }
-        DecodedMessage decodedMessage = Decoder.decodeV04(request.getBody().readByteArray());
-        LOG.info("got traces: {}", decodedMessage.getTraces().size());
-        for (Consumer<DecodedTrace> listener : baseIntegrationTest.traceListeners) {
-          for (DecodedTrace trace : decodedMessage.getTraces()) {
-            listener.accept(trace);
-          }
+        if (request.getPath().startsWith(LOG_UPLOAD_URL_PATH)) {
+            return EMPTY_200_RESPONSE;
         }
-      }
-    },
-    PROBE_STATUS {
-      @Override
-      public void process(BaseIntegrationTest baseIntegrationTest, RecordedRequest request) {
-        if (!request.getPath().startsWith(DIAGNOSTICS_URL_PATH)) {
-          return;
+        if (request.getPath().equals("/v0.7/config")) {
+            return handleConfigRequests();
         }
-        try {
-          if (request.getBody().indexOf(DIAGNOSTICS_STR) == -1) {
-            return;
-          }
-        } catch (IOException ex) {
-          ex.printStackTrace();
+        return EMPTY_200_RESPONSE;
+    }
+
+    protected MockResponse handleConfigRequests() {
+        Configuration configuration;
+        ConfigOverrides configOverrides;
+        synchronized (configLock) {
+            configuration = currentConfiguration;
+            configOverrides = this.configOverrides;
         }
-        JsonAdapter<List<ProbeStatus>> adapter =
-            MoshiHelper.createMoshiProbeStatus()
-                .adapter(Types.newParameterizedType(List.class, ProbeStatus.class));
-        String bodyStr = request.getBody().readUtf8();
-        LOG.info("got probe status: {}", bodyStr);
+        if (configuration == null) {
+            configuration = createConfig(Collections.emptyList());
+        }
+        LOG.info("configuration={} configOverrides={}", configuration, configOverrides);
         try {
-          // Http multipart decode
-          String partBody = parseMultiPart(request, bodyStr);
-          if (partBody == null) {
-            return;
-          }
-          List<ProbeStatus> probeStatuses = adapter.fromJson(partBody);
-          for (Consumer<ProbeStatus> listener : baseIntegrationTest.probeStatusListeners) {
-            for (ProbeStatus probeStatus : probeStatuses) {
-              listener.accept(probeStatus);
+            JsonAdapter<LogProbe> logAdapter =
+                    MoshiConfigTestHelper.createMoshiConfig().adapter(LogProbe.class);
+            JsonAdapter<MetricProbe> metricAdapter =
+                    MoshiConfigTestHelper.createMoshiConfig().adapter(MetricProbe.class);
+            JsonAdapter<SpanProbe> spanAdapter =
+                    MoshiConfigTestHelper.createMoshiConfig().adapter(SpanProbe.class);
+            JsonAdapter<SpanDecorationProbe> spanDecorationAdapter =
+                    MoshiConfigTestHelper.createMoshiConfig().adapter(SpanDecorationProbe.class);
+            JsonAdapter<TriggerProbe> triggerAdapter =
+                    MoshiConfigTestHelper.createMoshiConfig().adapter(TriggerProbe.class);
+            List<RemoteConfigHelper.RemoteConfig> remoteConfigs = new ArrayList<>();
+            addToRemoteConfig(configuration.getLogProbes(), logAdapter, remoteConfigs);
+            addToRemoteConfig(configuration.getMetricProbes(), metricAdapter, remoteConfigs);
+            addToRemoteConfig(configuration.getSpanProbes(), spanAdapter, remoteConfigs);
+            addToRemoteConfig(configuration.getSpanDecorationProbes(), spanDecorationAdapter, remoteConfigs);
+            addToRemoteConfig(configuration.getTriggerProbes(), triggerAdapter, remoteConfigs);
+            if (configOverrides != null) {
+                JsonAdapter<ConfigOverrides> configAdapter =
+                        new Moshi.Builder().build().adapter(ConfigOverrides.class);
+                String configOverridesJson = configAdapter.toJson(configOverrides);
+                LOG.info("Sending configOverrides json: {}", configOverridesJson);
+                remoteConfigs.add(
+                        new RemoteConfigHelper.RemoteConfig(APM_TRACING_PRODUCT, configOverridesJson, APM_CONFIG_ID));
             }
-          }
-        } catch (IOException ex) {
-          ex.printStackTrace();
+            String remoteConfigJson = RemoteConfigHelper.encode(remoteConfigs);
+            return new MockResponse().setResponseCode(200).setBody(remoteConfigJson);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
-      }
-    };
-
-    public abstract void process(BaseIntegrationTest baseIntegrationTest, RecordedRequest request);
-  }
-
-  private static String parseMultiPart(RecordedRequest request, String bodyStr) throws IOException {
-    // To parse it as multipart, you'll need to use the boundary from the Content-Type header
-    String contentType = request.getHeader("Content-Type");
-    String boundary = null;
-    // Extract the boundary from the Content-Type header
-    if (contentType != null && contentType.startsWith("multipart/")) {
-      String[] parts = contentType.split("boundary=");
-      if (parts.length > 1) {
-        boundary = parts[1].trim();
-      }
-    }
-
-    try (BufferedReader reader = new BufferedReader(new StringReader(bodyStr))) {
-      String line;
-      while ((line = reader.readLine()) != null) {
-        // Process each line of the multipart body
-        if (line.startsWith("--" + boundary)) {
-          // This is a part boundary
-          // The next line should be headers for this part
-          Headers.Builder partHeaders = new Headers.Builder();
-          while (!(line = reader.readLine()).isEmpty()) {
-            // Parse headers
-            int colon = line.indexOf(':');
-            if (colon != -1) {
-              partHeaders.add(line.substring(0, colon).trim(), line.substring(colon + 1).trim());
-            }
-          }
-
-          // Now read the part content until we hit the boundary
-          StringBuilder partContent = new StringBuilder();
-          while ((line = reader.readLine()) != null && !line.startsWith("--" + boundary)) {
-            partContent.append(line).append("\n");
-          }
-          return partContent.toString().trim();
+    }
+
+    private static <T extends ProbeDefinition> void addToRemoteConfig(
+            Collection<T> probes, JsonAdapter<T> probeAdapter, List<RemoteConfigHelper.RemoteConfig> remoteConfigs) {
+        for (T probe : probes) {
+            String json = probeAdapter.toJson(probe);
+            LOG.info("Sending {} json: {}", probe.getClass().getSimpleName(), json);
+            remoteConfigs.add(new RemoteConfigHelper.RemoteConfig(
+                    LIVE_DEBUGGING_PRODUCT, json, getProbePrefix(probe) + UUID.randomUUID()));
         }
-      }
-    }
-    return null;
-  }
-
-  protected void registerIntakeRequestListener(
-      Consumer<JsonSnapshotSerializer.IntakeRequest> listener) {
-    intakeRequestListeners.add(listener);
-  }
-
-  protected void registerSnapshotListener(Consumer<Snapshot> listener) {
-    snapshotListeners.add(listener);
-  }
-
-  protected void registerTraceListener(Consumer<DecodedTrace> listener) {
-    traceListeners.add(listener);
-  }
-
-  protected void resetTraceListener() {
-    traceListeners.clear();
-  }
-
-  protected void registerProbeStatusListener(Consumer<ProbeStatus> listener) {
-    probeStatusListeners.add(listener);
-  }
-
-  protected AtomicBoolean registerCheckReceivedInstalledEmitting(ProbeId probeId) {
-    AtomicBoolean received = new AtomicBoolean();
-    AtomicBoolean installed = new AtomicBoolean();
-    AtomicBoolean emitting = new AtomicBoolean();
-    AtomicBoolean result = new AtomicBoolean();
-    registerProbeStatusListener(
-        probeStatus -> {
-          if (probeStatus.getDiagnostics().getProbeId().equals(probeId)) {
-            if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.RECEIVED) {
-              received.set(true);
-            }
-            if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.INSTALLED) {
-              installed.set(true);
-            }
-            if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.EMITTING) {
-              emitting.set(true);
-            }
-            result.set(received.get() && installed.get() && emitting.get());
-          }
-        });
-    return result;
-  }
-
-  protected void processRequests(BooleanSupplier conditionOfDone, Supplier<String> timeoutMessage)
-      throws InterruptedException {
-    long start = System.currentTimeMillis();
-    try {
-      RecordedRequest request;
-      do {
-        request = datadogAgentServer.takeRequest(REQUEST_WAIT_TIMEOUT, TimeUnit.SECONDS);
-        if (request == null) {
-          throw new RuntimeException(timeoutMessage.get());
+    }
+
+    private static String getProbePrefix(ProbeDefinition probeDefinition) {
+        if (probeDefinition instanceof LogProbe) {
+            return "logProbe_";
         }
-        LOG.info("processRequests path={}", request.getPath());
-        for (RequestType requestType : RequestType.values()) {
-          requestType.process(this, request);
-          if (conditionOfDone.getAsBoolean()) {
-            return;
-          }
+        if (probeDefinition instanceof MetricProbe) {
+            return "metricProbe_";
         }
-      } while (request != null && (System.currentTimeMillis() - start < 30_000));
-      throw new RuntimeException(timeoutMessage.get());
-    } finally {
-      probeStatusListeners.clear();
-    }
-  }
-
-  protected void processRemainingRequests() throws InterruptedException {
-    RecordedRequest request;
-    do {
-      request = datadogAgentServer.takeRequest(1, TimeUnit.MILLISECONDS);
-      if (request == null) {
-        break;
-      }
-      LOG.info(
-          "processRemainingRequests path={} body={}",
-          request.getPath(),
-          request.getBody().readUtf8());
-    } while (request != null);
-  }
-
-  protected RecordedRequest retrieveRequest(Predicate<RecordedRequest> filterRequest)
-      throws InterruptedException {
-    long ts = System.nanoTime();
-    RecordedRequest request;
-    do {
-      request = datadogAgentServer.takeRequest(REQUEST_WAIT_TIMEOUT, TimeUnit.SECONDS);
-      if (request == null) {
-        LOG.info("retreiveRequest request==null => timeout 10 sec");
-      } else {
-        LOG.info("retreiveRequest request!=null path={} testing...", request.getPath());
-      }
-    } while (request != null && !filterRequest.test(request));
-    long dur = System.nanoTime() - ts;
-    LOG.info(
-        "request retrieved in {} seconds", TimeUnit.SECONDS.convert(dur, TimeUnit.NANOSECONDS));
-    return request;
-  }
-
-  protected String retrieveStatsdMessage(String str) {
-    return statsDServer.waitForMessage(str);
-  }
-
-  protected MockResponse datadogAgentDispatch(RecordedRequest request) {
-    LOG.info("datadogAgentDispatch request path: {}", request.getPath());
-    if (request.getPath().equals("/info")) {
-      return AGENT_INFO_RESPONSE;
-    }
-    if (request.getPath().equals("/telemetry/proxy/api/v2/apmtelemetry")) {
-      // Ack every telemetry request. This is needed if telemetry is enabled in the tests.
-      return TELEMETRY_RESPONSE;
-    }
-    if (request.getPath().startsWith(LOG_UPLOAD_URL_PATH)) {
-      return EMPTY_200_RESPONSE;
-    }
-    if (request.getPath().equals("/v0.7/config")) {
-      return handleConfigRequests();
-    }
-    return EMPTY_200_RESPONSE;
-  }
-
-  protected MockResponse handleConfigRequests() {
-    Configuration configuration;
-    ConfigOverrides configOverrides;
-    synchronized (configLock) {
-      configuration = currentConfiguration;
-      configOverrides = this.configOverrides;
-    }
-    if (configuration == null) {
-      configuration = createConfig(Collections.emptyList());
-    }
-    LOG.info("configuration={} configOverrides={}", configuration, configOverrides);
-    try {
-      JsonAdapter<LogProbe> logAdapter =
-          MoshiConfigTestHelper.createMoshiConfig().adapter(LogProbe.class);
-      JsonAdapter<MetricProbe> metricAdapter =
-          MoshiConfigTestHelper.createMoshiConfig().adapter(MetricProbe.class);
-      JsonAdapter<SpanProbe> spanAdapter =
-          MoshiConfigTestHelper.createMoshiConfig().adapter(SpanProbe.class);
-      JsonAdapter<SpanDecorationProbe> spanDecorationAdapter =
-          MoshiConfigTestHelper.createMoshiConfig().adapter(SpanDecorationProbe.class);
-      JsonAdapter<TriggerProbe> triggerAdapter =
-          MoshiConfigTestHelper.createMoshiConfig().adapter(TriggerProbe.class);
-      List<RemoteConfigHelper.RemoteConfig> remoteConfigs = new ArrayList<>();
-      addToRemoteConfig(configuration.getLogProbes(), logAdapter, remoteConfigs);
-      addToRemoteConfig(configuration.getMetricProbes(), metricAdapter, remoteConfigs);
-      addToRemoteConfig(configuration.getSpanProbes(), spanAdapter, remoteConfigs);
-      addToRemoteConfig(
-          configuration.getSpanDecorationProbes(), spanDecorationAdapter, remoteConfigs);
-      addToRemoteConfig(configuration.getTriggerProbes(), triggerAdapter, remoteConfigs);
-      if (configOverrides != null) {
-        JsonAdapter<ConfigOverrides> configAdapter =
-            new Moshi.Builder().build().adapter(ConfigOverrides.class);
-        String configOverridesJson = configAdapter.toJson(configOverrides);
-        LOG.info("Sending configOverrides json: {}", configOverridesJson);
-        remoteConfigs.add(
-            new RemoteConfigHelper.RemoteConfig(
-                APM_TRACING_PRODUCT, configOverridesJson, APM_CONFIG_ID));
-      }
-      String remoteConfigJson = RemoteConfigHelper.encode(remoteConfigs);
-      return new MockResponse().setResponseCode(200).setBody(remoteConfigJson);
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private static <T extends ProbeDefinition> void addToRemoteConfig(
-      Collection<T> probes,
-      JsonAdapter<T> probeAdapter,
-      List<RemoteConfigHelper.RemoteConfig> remoteConfigs) {
-    for (T probe : probes) {
-      String json = probeAdapter.toJson(probe);
-      LOG.info("Sending {} json: {}", probe.getClass().getSimpleName(), json);
-      remoteConfigs.add(
-          new RemoteConfigHelper.RemoteConfig(
-              LIVE_DEBUGGING_PRODUCT, json, getProbePrefix(probe) + UUID.randomUUID()));
-    }
-  }
-
-  private static String getProbePrefix(ProbeDefinition probeDefinition) {
-    if (probeDefinition instanceof LogProbe) {
-      return "logProbe_";
-    }
-    if (probeDefinition instanceof MetricProbe) {
-      return "metricProbe_";
-    }
-    if (probeDefinition instanceof SpanProbe) {
-      return "spanProbe_";
-    }
-    if (probeDefinition instanceof SpanDecorationProbe) {
-      return "spanDecorationProbe_";
-    }
-    if (probeDefinition instanceof TriggerProbe) {
-      return "triggerProbe_";
-    }
-    return "";
-  }
-
-  protected static JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>>
-      createAdapterForSnapshot() {
-    return MoshiSnapshotTestHelper.createMoshiSnapshot()
-        .adapter(
-            Types.newParameterizedType(List.class, JsonSnapshotSerializer.IntakeRequest.class));
-  }
-
-  protected void setCurrentConfiguration(Configuration configuration) {
-    synchronized (configLock) {
-      this.currentConfiguration = configuration;
-    }
-  }
-
-  protected void setConfigOverrides(ConfigOverrides configOverrides) {
-    synchronized (configLock) {
-      this.configOverrides = configOverrides;
-    }
-  }
-
-  protected Configuration createConfig(LogProbe logProbe) {
-    return createConfig(Arrays.asList(logProbe));
-  }
-
-  protected Configuration createMetricConfig(MetricProbe metricProbe) {
-    return Configuration.builder().setService(getAppId()).add(metricProbe).build();
-  }
-
-  protected Configuration createSpanDecoConfig(SpanDecorationProbe spanDecorationProbe) {
-    return Configuration.builder().setService(getAppId()).add(spanDecorationProbe).build();
-  }
-
-  protected Configuration createSpanConfig(SpanProbe spanProbe) {
-    return Configuration.builder().setService(getAppId()).add(spanProbe).build();
-  }
-
-  protected Configuration createConfig(List<LogProbe> logProbes) {
-    return new Configuration(getAppId(), logProbes);
-  }
-
-  protected Configuration createConfig(
-      Collection<LogProbe> logProbes,
-      Configuration.FilterList allowList,
-      Configuration.FilterList denyList) {
-    return Configuration.builder()
-        .setService(getAppId())
-        .add(logProbes)
-        .addAllowList(allowList)
-        .addDenyList(denyList)
-        .build();
-  }
-
-  protected void assertCaptureArgs(
-      CapturedContext context, String name, String typeName, String value) {
-    CapturedContext.CapturedValue capturedValue = context.getArguments().get(name);
-    assertEquals(typeName, capturedValue.getType());
-    Object objValue = capturedValue.getValue();
-    assertNotNull(
-        objValue, "objValue null for argName=" + name + " capturedValue=" + capturedValue);
-    if (objValue.getClass().isArray()) {
-      assertEquals(value, Arrays.toString((Object[]) objValue));
-    } else {
-      assertEquals(value, String.valueOf(objValue));
-    }
-  }
-
-  protected void assertCaptureLocals(
-      CapturedContext context, String name, String typeName, String value) {
-    CapturedContext.CapturedValue localVar = context.getLocals().get(name);
-    assertEquals(typeName, localVar.getType());
-    assertEquals(value, localVar.getValue());
-  }
-
-  protected void assertCaptureReturnValue(CapturedContext context, String typeName, String value) {
-    CapturedContext.CapturedValue returnValue = context.getLocals().get("@return");
-    assertEquals(typeName, returnValue.getType());
-    assertEquals(value, returnValue.getValue());
-  }
-
-  protected void assertCaptureThrowable(
-      CapturedContext.CapturedThrowable throwable, String typeName, String message) {
-    assertNotNull(throwable);
-    assertEquals(typeName, throwable.getType());
-    assertEquals(message, throwable.getMessage());
-  }
-
-  protected static boolean logHasErrors(Path logFilePath, Function<String, Boolean> checker) {
-    try {
-      long errorLines =
-          Files.lines(logFilePath)
-              .filter(
-                  it ->
-                      it.contains(" ERROR ")
-                          || it.contains("ASSERTION FAILED")
-                          || it.contains("Error:")
-                          || checker.apply(it))
-              .peek(System.out::println)
-              .count();
-      boolean hasErrors = errorLines > 0;
-      if (hasErrors) {
-        LOG.info("Test application log is containing errors. See full run logs in {}", logFilePath);
-      }
-      return hasErrors;
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  protected static class MockDispatcher extends okhttp3.mockwebserver.QueueDispatcher {
-    private volatile Function<RecordedRequest, MockResponse> dispatcher;
-
-    @Override
-    public MockResponse dispatch(RecordedRequest request) throws InterruptedException {
-      return dispatcher.apply(request);
-    }
-
-    public void setDispatcher(Function<RecordedRequest, MockResponse> dispatcher) {
-      this.dispatcher = dispatcher;
-    }
-  }
-
-  private static class StatsDServer extends Thread {
-    private final DatagramSocket socket;
-    private final BlockingQueue<String> msgQueue = new ArrayBlockingQueue<>(32);
-    private volatile String lastMessage;
-    private volatile boolean running = true;
-
-    StatsDServer() throws SocketException {
-      socket = new DatagramSocket();
-    }
-
-    @Override
-    public void run() {
-      byte[] buf = new byte[1024];
-      DatagramPacket packet = new DatagramPacket(buf, buf.length);
-      while (running) {
-        try {
-          socket.receive(packet);
-        } catch (IOException e) {
-          throw new RuntimeException(e);
+        if (probeDefinition instanceof SpanProbe) {
+            return "spanProbe_";
         }
-        lastMessage = new String(packet.getData(), 0, packet.getLength());
-        LOG.info("received statsd: {}", lastMessage);
-        try {
-          msgQueue.offer(lastMessage, 30, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-          throw new RuntimeException(e);
+        if (probeDefinition instanceof SpanDecorationProbe) {
+            return "spanDecorationProbe_";
         }
-      }
-      socket.close();
+        if (probeDefinition instanceof TriggerProbe) {
+            return "triggerProbe_";
+        }
+        return "";
     }
 
-    String lastMessage() {
-      return lastMessage;
+    protected static JsonAdapter<List<JsonSnapshotSerializer.IntakeRequest>> createAdapterForSnapshot() {
+        return MoshiSnapshotTestHelper.createMoshiSnapshot()
+                .adapter(Types.newParameterizedType(List.class, JsonSnapshotSerializer.IntakeRequest.class));
     }
 
-    String waitForMessage(String str) {
-      String msg;
-      do {
-        try {
-          msg = msgQueue.poll(30, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-          throw new RuntimeException(e);
+    protected void setCurrentConfiguration(Configuration configuration) {
+        synchronized (configLock) {
+            this.currentConfiguration = configuration;
+        }
+    }
+
+    protected void setConfigOverrides(ConfigOverrides configOverrides) {
+        synchronized (configLock) {
+            this.configOverrides = configOverrides;
+        }
+    }
+
+    protected Configuration createConfig(LogProbe logProbe) {
+        return createConfig(Arrays.asList(logProbe));
+    }
+
+    protected Configuration createMetricConfig(MetricProbe metricProbe) {
+        return Configuration.builder().setService(getAppId()).add(metricProbe).build();
+    }
+
+    protected Configuration createSpanDecoConfig(SpanDecorationProbe spanDecorationProbe) {
+        return Configuration.builder()
+                .setService(getAppId())
+                .add(spanDecorationProbe)
+                .build();
+    }
+
+    protected Configuration createSpanConfig(SpanProbe spanProbe) {
+        return Configuration.builder().setService(getAppId()).add(spanProbe).build();
+    }
+
+    protected Configuration createConfig(List<LogProbe> logProbes) {
+        return new Configuration(getAppId(), logProbes);
+    }
+
+    protected Configuration createConfig(
+            Collection<LogProbe> logProbes, Configuration.FilterList allowList, Configuration.FilterList denyList) {
+        return Configuration.builder()
+                .setService(getAppId())
+                .add(logProbes)
+                .addAllowList(allowList)
+                .addDenyList(denyList)
+                .build();
+    }
+
+    protected void assertCaptureArgs(CapturedContext context, String name, String typeName, String value) {
+        CapturedContext.CapturedValue capturedValue = context.getArguments().get(name);
+        assertEquals(typeName, capturedValue.getType());
+        Object objValue = capturedValue.getValue();
+        assertNotNull(objValue, "objValue null for argName=" + name + " capturedValue=" + capturedValue);
+        if (objValue.getClass().isArray()) {
+            assertEquals(value, Arrays.toString((Object[]) objValue));
+        } else {
+            assertEquals(value, String.valueOf(objValue));
         }
-      } while (msg != null && !msg.contains(str));
-      return msg;
     }
 
-    void close() {
-      running = false;
+    protected void assertCaptureLocals(CapturedContext context, String name, String typeName, String value) {
+        CapturedContext.CapturedValue localVar = context.getLocals().get(name);
+        assertEquals(typeName, localVar.getType());
+        assertEquals(value, localVar.getValue());
     }
 
-    int getPort() {
-      return socket.getLocalPort();
+    protected void assertCaptureReturnValue(CapturedContext context, String typeName, String value) {
+        CapturedContext.CapturedValue returnValue = context.getLocals().get("@return");
+        assertEquals(typeName, returnValue.getType());
+        assertEquals(value, returnValue.getValue());
     }
-  }
 
-  static final class ConfigOverrides {
-    @Json(name = "lib_config")
-    public LibConfig libConfig;
+    protected void assertCaptureThrowable(
+            CapturedContext.CapturedThrowable throwable, String typeName, String message) {
+        assertNotNull(throwable);
+        assertEquals(typeName, throwable.getType());
+        assertEquals(message, throwable.getMessage());
+    }
 
-    @Override
-    public String toString() {
-      return "ConfigOverrides{" + "libConfig=" + libConfig + '}';
+    protected static boolean logHasErrors(Path logFilePath, Function<String, Boolean> checker) {
+        try {
+            long errorLines = Files.lines(logFilePath)
+                    .filter(it -> it.contains(" ERROR ")
+                            || it.contains("ASSERTION FAILED")
+                            || it.contains("Error:")
+                            || checker.apply(it))
+                    .peek(System.out::println)
+                    .count();
+            boolean hasErrors = errorLines > 0;
+            if (hasErrors) {
+                LOG.info("Test application log is containing errors. See full run logs in {}", logFilePath);
+            }
+            return hasErrors;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  static final class LibConfig {
-    @Json(name = "dynamic_instrumentation_enabled")
-    public Boolean dynamicInstrumentationEnabled;
+    protected static class MockDispatcher extends okhttp3.mockwebserver.QueueDispatcher {
+        private volatile Function<RecordedRequest, MockResponse> dispatcher;
+
+        @Override
+        public MockResponse dispatch(RecordedRequest request) throws InterruptedException {
+            return dispatcher.apply(request);
+        }
+
+        public void setDispatcher(Function<RecordedRequest, MockResponse> dispatcher) {
+            this.dispatcher = dispatcher;
+        }
+    }
 
-    @Json(name = "exception_replay_enabled")
-    public Boolean exceptionReplayEnabled;
+    private static class StatsDServer extends Thread {
+        private final DatagramSocket socket;
+        private final BlockingQueue<String> msgQueue = new ArrayBlockingQueue<>(32);
+        private volatile String lastMessage;
+        private volatile boolean running = true;
 
-    @Json(name = "code_origin_enabled")
-    public Boolean codeOriginEnabled;
+        StatsDServer() throws SocketException {
+            socket = new DatagramSocket();
+        }
 
-    @Json(name = "live_debugging_enabled")
-    public Boolean liveDebuggingEnabled;
+        @Override
+        public void run() {
+            byte[] buf = new byte[1024];
+            DatagramPacket packet = new DatagramPacket(buf, buf.length);
+            while (running) {
+                try {
+                    socket.receive(packet);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+                lastMessage = new String(packet.getData(), 0, packet.getLength());
+                LOG.info("received statsd: {}", lastMessage);
+                try {
+                    msgQueue.offer(lastMessage, 30, TimeUnit.SECONDS);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+            socket.close();
+        }
 
-    @Override
-    public String toString() {
-      return "LibConfig{"
-          + "dynamicInstrumentationEnabled="
-          + dynamicInstrumentationEnabled
-          + ", exceptionReplayEnabled="
-          + exceptionReplayEnabled
-          + ", codeOriginEnabled="
-          + codeOriginEnabled
-          + ", liveDebuggingEnabled="
-          + liveDebuggingEnabled
-          + '}';
+        String lastMessage() {
+            return lastMessage;
+        }
+
+        String waitForMessage(String str) {
+            String msg;
+            do {
+                try {
+                    msg = msgQueue.poll(30, TimeUnit.SECONDS);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            } while (msg != null && !msg.contains(str));
+            return msg;
+        }
+
+        void close() {
+            running = false;
+        }
+
+        int getPort() {
+            return socket.getLocalPort();
+        }
+    }
+
+    static final class ConfigOverrides {
+        @Json(name = "lib_config")
+        public LibConfig libConfig;
+
+        @Override
+        public String toString() {
+            return "ConfigOverrides{" + "libConfig=" + libConfig + '}';
+        }
+    }
+
+    static final class LibConfig {
+        @Json(name = "dynamic_instrumentation_enabled")
+        public Boolean dynamicInstrumentationEnabled;
+
+        @Json(name = "exception_replay_enabled")
+        public Boolean exceptionReplayEnabled;
+
+        @Json(name = "code_origin_enabled")
+        public Boolean codeOriginEnabled;
+
+        @Json(name = "live_debugging_enabled")
+        public Boolean liveDebuggingEnabled;
+
+        @Override
+        public String toString() {
+            return "LibConfig{"
+                    + "dynamicInstrumentationEnabled="
+                    + dynamicInstrumentationEnabled
+                    + ", exceptionReplayEnabled="
+                    + exceptionReplayEnabled
+                    + ", codeOriginEnabled="
+                    + codeOriginEnabled
+                    + ", liveDebuggingEnabled="
+                    + liveDebuggingEnabled
+                    + '}';
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/CodeOriginIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/CodeOriginIntegrationTest.java
index dbf83505afd..755fa449dad 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/CodeOriginIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/CodeOriginIntegrationTest.java
@@ -18,42 +18,38 @@
 @NonRetryable
 public class CodeOriginIntegrationTest extends ServerAppDebuggerIntegrationTest {
 
-  @Override
-  protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
-    List<String> commandParams = getDebuggerCommandParams();
-    commandParams.add("-Ddd.trace.enabled=true"); // explicitly enable tracer
-    commandParams.add("-Ddd.code.origin.for.spans.enabled=true");
-    return ProcessBuilderHelper.createProcessBuilder(
-        commandParams, logFilePath, getAppClass(), params);
-  }
+    @Override
+    protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
+        List<String> commandParams = getDebuggerCommandParams();
+        commandParams.add("-Ddd.trace.enabled=true"); // explicitly enable tracer
+        commandParams.add("-Ddd.code.origin.for.spans.enabled=true");
+        return ProcessBuilderHelper.createProcessBuilder(commandParams, logFilePath, getAppClass(), params);
+    }
 
-  @Test
-  @DisplayName("testCodeOriginTraceAnnotation")
-  void testCodeOriginTraceAnnotation() throws Exception {
-    appUrl = startAppAndAndGetUrl();
-    execute(appUrl, TRACED_METHOD_NAME);
-    waitForInstrumentation(appUrl);
-    execute(appUrl, TRACED_METHOD_NAME);
-    AtomicBoolean codeOrigin = new AtomicBoolean();
-    registerTraceListener(
-        decodedTrace -> {
-          for (DecodedSpan span : decodedTrace.getSpans()) {
-            if (isTracedFullMethodSpan(span)) {
-              if (span.getMeta().containsKey(DDTags.DD_CODE_ORIGIN_TYPE)) {
-                assertEquals("entry", span.getMeta().get(DDTags.DD_CODE_ORIGIN_TYPE));
-                assertEquals(
-                    "ServerDebuggerTestApplication.java",
-                    span.getMeta().get(DD_CODE_ORIGIN_FRAME_FILE));
-                assertEquals("runTracedMethod", span.getMeta().get(DD_CODE_ORIGIN_FRAME_METHOD));
-                assertEquals(
-                    "(java.lang.String)", span.getMeta().get(DD_CODE_ORIGIN_FRAME_SIGNATURE));
-                assertEquals("158", span.getMeta().get(DD_CODE_ORIGIN_FRAME_LINE));
-                codeOrigin.set(true);
-              }
+    @Test
+    @DisplayName("testCodeOriginTraceAnnotation")
+    void testCodeOriginTraceAnnotation() throws Exception {
+        appUrl = startAppAndAndGetUrl();
+        execute(appUrl, TRACED_METHOD_NAME);
+        waitForInstrumentation(appUrl);
+        execute(appUrl, TRACED_METHOD_NAME);
+        AtomicBoolean codeOrigin = new AtomicBoolean();
+        registerTraceListener(decodedTrace -> {
+            for (DecodedSpan span : decodedTrace.getSpans()) {
+                if (isTracedFullMethodSpan(span)) {
+                    if (span.getMeta().containsKey(DDTags.DD_CODE_ORIGIN_TYPE)) {
+                        assertEquals("entry", span.getMeta().get(DDTags.DD_CODE_ORIGIN_TYPE));
+                        assertEquals(
+                                "ServerDebuggerTestApplication.java",
+                                span.getMeta().get(DD_CODE_ORIGIN_FRAME_FILE));
+                        assertEquals("runTracedMethod", span.getMeta().get(DD_CODE_ORIGIN_FRAME_METHOD));
+                        assertEquals("(java.lang.String)", span.getMeta().get(DD_CODE_ORIGIN_FRAME_SIGNATURE));
+                        assertEquals("158", span.getMeta().get(DD_CODE_ORIGIN_FRAME_LINE));
+                        codeOrigin.set(true);
+                    }
+                }
             }
-          }
         });
-    processRequests(
-        codeOrigin::get, () -> String.format("timeout codeOrigin=%s", codeOrigin.get()));
-  }
+        processRequests(codeOrigin::get, () -> String.format("timeout codeOrigin=%s", codeOrigin.get()));
+    }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ExceptionDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ExceptionDebuggerIntegrationTest.java
index a544da9f253..3e5b10103e3 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ExceptionDebuggerIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ExceptionDebuggerIntegrationTest.java
@@ -24,356 +24,389 @@
 @NonRetryable
 public class ExceptionDebuggerIntegrationTest extends ServerAppDebuggerIntegrationTest {
 
-  private List<String> snapshotIdTags = new ArrayList<>();
-  private boolean traceReceived;
-  private boolean snapshotReceived;
-  private Map<String, Snapshot> snapshots = new HashMap<>();
-  private List<String> additionalJvmArgs = new ArrayList<>();
-  private Supplier<String> timeoutMessage =
-      () ->
-          String.format(
-              "Timeout! traceReceived=%s snapshotReceived=%s #snapshots=%d",
-              traceReceived, snapshotReceived, snapshots.size());
+    private List<String> snapshotIdTags = new ArrayList<>();
+    private boolean traceReceived;
+    private boolean snapshotReceived;
+    private Map<String, Snapshot> snapshots = new HashMap<>();
+    private List<String> additionalJvmArgs = new ArrayList<>();
+    private Supplier<String> timeoutMessage = () -> String.format(
+            "Timeout! traceReceived=%s snapshotReceived=%s #snapshots=%d",
+            traceReceived, snapshotReceived, snapshots.size());
 
-  @Override
-  protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
-    List<String> commandParams = getDebuggerCommandParams();
-    commandParams.add("-Ddd.trace.enabled=true"); // explicitly enable tracer
-    commandParams.add("-Ddd.exception.replay.enabled=true"); // enable exception replay
-    commandParams.add("-Ddd.internal.exception.replay.only.local.root=false"); // for all spans
-    commandParams.add("-Ddd.third.party.excludes=datadog.smoketest");
-    // disable DI to make sure exception debugger works alone
-    commandParams.remove("-Ddd.dynamic.instrumentation.enabled=true");
-    commandParams.addAll(additionalJvmArgs);
-    return ProcessBuilderHelper.createProcessBuilder(
-        commandParams, logFilePath, getAppClass(), params);
-  }
+    @Override
+    protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
+        List<String> commandParams = getDebuggerCommandParams();
+        commandParams.add("-Ddd.trace.enabled=true"); // explicitly enable tracer
+        commandParams.add("-Ddd.exception.replay.enabled=true"); // enable exception replay
+        commandParams.add("-Ddd.internal.exception.replay.only.local.root=false"); // for all spans
+        commandParams.add("-Ddd.third.party.excludes=datadog.smoketest");
+        // disable DI to make sure exception debugger works alone
+        commandParams.remove("-Ddd.dynamic.instrumentation.enabled=true");
+        commandParams.addAll(additionalJvmArgs);
+        return ProcessBuilderHelper.createProcessBuilder(commandParams, logFilePath, getAppClass(), params);
+    }
 
-  @Test
-  @DisplayName("testSimpleSingleFrameException")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  void testSimpleSingleFrameException() throws Exception {
-    appUrl = startAppAndAndGetUrl();
-    execute(appUrl, TRACED_METHOD_NAME, "oops"); // instrumenting first exception
-    waitForExceptionFingerprint();
-    execute(appUrl, TRACED_METHOD_NAME, "oops"); // collecting snapshots and sending them
-    registerTraceListener(this::receiveExceptionReplayTrace);
-    registerSnapshotListener(this::receiveSnapshot);
-    registerIntakeRequestListener(
-        intakeRequest -> {
-          assertEquals("snapshot", intakeRequest.getType());
+    @Test
+    @DisplayName("testSimpleSingleFrameException")
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    void testSimpleSingleFrameException() throws Exception {
+        appUrl = startAppAndAndGetUrl();
+        execute(appUrl, TRACED_METHOD_NAME, "oops"); // instrumenting first exception
+        waitForExceptionFingerprint();
+        execute(appUrl, TRACED_METHOD_NAME, "oops"); // collecting snapshots and sending them
+        registerTraceListener(this::receiveExceptionReplayTrace);
+        registerSnapshotListener(this::receiveSnapshot);
+        registerIntakeRequestListener(intakeRequest -> {
+            assertEquals("snapshot", intakeRequest.getType());
         });
-    processRequests(
-        () -> {
-          if (snapshotIdTags.isEmpty()) {
-            return false;
-          }
-          String snapshotId0 = snapshotIdTags.get(0);
-          if (traceReceived && snapshotReceived && snapshots.containsKey(snapshotId0)) {
-            Snapshot snapshot = snapshots.get(snapshotId0);
-            assertNotNull(snapshot);
-            assertEquals(
-                "oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
-            assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
-            return true;
-          }
-          return false;
-        },
-        timeoutMessage);
-  }
+        processRequests(
+                () -> {
+                    if (snapshotIdTags.isEmpty()) {
+                        return false;
+                    }
+                    String snapshotId0 = snapshotIdTags.get(0);
+                    if (traceReceived && snapshotReceived && snapshots.containsKey(snapshotId0)) {
+                        Snapshot snapshot = snapshots.get(snapshotId0);
+                        assertNotNull(snapshot);
+                        assertEquals(
+                                "oops",
+                                snapshot.getCaptures()
+                                        .getReturn()
+                                        .getCapturedThrowable()
+                                        .getMessage());
+                        assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
+                        return true;
+                    }
+                    return false;
+                },
+                timeoutMessage);
+    }
 
-  @Test
-  @DisplayName("testNoSubsequentCaptureAfterFirst")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  void testNoSubsequentCaptureAfterFirst() throws Exception {
-    appUrl = startAppAndAndGetUrl();
-    testSimpleSingleFrameException();
-    resetSnapshotsAndTraces();
-    // we should not receive any more snapshots after the first one
-    execute(appUrl, TRACED_METHOD_NAME, "oops"); // no snapshot should be sent
-    registerTraceListener(
-        decodedTrace -> {
-          for (DecodedSpan span : decodedTrace.getSpans()) {
-            if (isTracedFullMethodSpan(span)) {
-              assertFalse(span.getMeta().containsKey("error.debug_info_captured"));
-              assertFalse(span.getMeta().containsKey("_dd.debug.error.0.snapshot_id"));
-              traceReceived = true;
+    @Test
+    @DisplayName("testNoSubsequentCaptureAfterFirst")
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    void testNoSubsequentCaptureAfterFirst() throws Exception {
+        appUrl = startAppAndAndGetUrl();
+        testSimpleSingleFrameException();
+        resetSnapshotsAndTraces();
+        // we should not receive any more snapshots after the first one
+        execute(appUrl, TRACED_METHOD_NAME, "oops"); // no snapshot should be sent
+        registerTraceListener(decodedTrace -> {
+            for (DecodedSpan span : decodedTrace.getSpans()) {
+                if (isTracedFullMethodSpan(span)) {
+                    assertFalse(span.getMeta().containsKey("error.debug_info_captured"));
+                    assertFalse(span.getMeta().containsKey("_dd.debug.error.0.snapshot_id"));
+                    traceReceived = true;
+                }
             }
-          }
         });
-    processRequests(() -> traceReceived && !snapshotReceived, timeoutMessage);
-  }
-
-  // DeepOops exception stacktrace:
-  // java.lang.RuntimeException: oops
-  // datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithException(ServerDebuggerTestApplication.java:190)
-  // datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException5(ServerDebuggerTestApplication.java:210)
-  // datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException4(ServerDebuggerTestApplication.java:206)
-  // datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException3(ServerDebuggerTestApplication.java:202)
-  // datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException2(ServerDebuggerTestApplication.java:198)
-  // datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException1(ServerDebuggerTestApplication.java:194)
-  // datadog.smoketest.debugger.ServerDebuggerTestApplication.runTracedMethod(ServerDebuggerTestApplication.java:140)
-  @Test
-  @DisplayName("test3CapturedFrames")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  void test3CapturedFrames() throws Exception {
-    appUrl = startAppAndAndGetUrl();
-    execute(appUrl, TRACED_METHOD_NAME, "deepOops"); // instrumenting first exception
-    waitForExceptionFingerprint();
-    execute(appUrl, TRACED_METHOD_NAME, "deepOops"); // collecting snapshots and sending them
-    registerTraceListener(this::receiveExceptionReplayTrace);
-    registerSnapshotListener(this::receiveSnapshot);
-    processRequests(
-        () -> {
-          if (snapshotIdTags.isEmpty()) {
-            return false;
-          }
-          String snapshotId0 = snapshotIdTags.get(0);
-          String snapshotId1 = snapshotIdTags.get(1);
-          String snapshotId2 = snapshotIdTags.get(2);
-          if (traceReceived
-              && snapshotReceived
-              && snapshots.containsKey(snapshotId0)
-              && snapshots.containsKey(snapshotId1)
-              && snapshots.containsKey(snapshotId2)) {
-            // snapshot 0
-            Snapshot snapshot = snapshots.get(snapshotId0);
-            assertNotNull(snapshot);
-            assertEquals(
-                "oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
-            assertEquals(
-                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithException",
-                snapshot.getStack().get(0).getFunction());
-            assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
-            // snapshot 1
-            snapshot = snapshots.get(snapshotId1);
-            assertEquals(
-                "oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
-            assertEquals(
-                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException5",
-                snapshot.getStack().get(0).getFunction());
-            assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
-            // snapshot 2
-            snapshot = snapshots.get(snapshotId2);
-            assertEquals(
-                "oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
-            assertEquals(
-                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException4",
-                snapshot.getStack().get(0).getFunction());
-            assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
-            return true;
-          }
-          return false;
-        },
-        timeoutMessage);
-  }
+        processRequests(() -> traceReceived && !snapshotReceived, timeoutMessage);
+    }
 
-  @Test
-  @DisplayName("test5CapturedFrames")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  void test5CapturedFrames() throws Exception {
-    additionalJvmArgs.add("-Ddd.exception.replay.capture.max.frames=5");
-    appUrl = startAppAndAndGetUrl();
-    execute(appUrl, TRACED_METHOD_NAME, "deepOops"); // instrumenting first exception
-    waitForExceptionFingerprint();
-    execute(appUrl, TRACED_METHOD_NAME, "deepOops"); // collecting snapshots and sending them
-    registerTraceListener(this::receiveExceptionReplayTrace);
-    registerSnapshotListener(this::receiveSnapshot);
-    processRequests(
-        () -> {
-          if (snapshotIdTags.isEmpty()) {
-            return false;
-          }
-          String snapshotId0 = snapshotIdTags.get(0);
-          String snapshotId1 = snapshotIdTags.get(1);
-          String snapshotId2 = snapshotIdTags.get(2);
-          String snapshotId3 = snapshotIdTags.get(3);
-          String snapshotId4 = snapshotIdTags.get(4);
-          if (traceReceived
-              && snapshotReceived
-              && snapshots.containsKey(snapshotId0)
-              && snapshots.containsKey(snapshotId1)
-              && snapshots.containsKey(snapshotId2)
-              && snapshots.containsKey(snapshotId3)
-              && snapshots.containsKey(snapshotId4)) {
-            // snapshot 0
-            Snapshot snapshot = snapshots.get(snapshotId0);
-            assertNotNull(snapshot);
-            assertEquals(
-                "oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
-            assertEquals(
-                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithException",
-                snapshot.getStack().get(0).getFunction());
-            assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
-            // snapshot 1
-            snapshot = snapshots.get(snapshotId1);
-            assertEquals(
-                "oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
-            assertEquals(
-                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException5",
-                snapshot.getStack().get(0).getFunction());
-            assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
-            // snapshot 2
-            snapshot = snapshots.get(snapshotId2);
-            assertEquals(
-                "oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
-            assertEquals(
-                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException4",
-                snapshot.getStack().get(0).getFunction());
-            assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
-            // snapshot 3
-            snapshot = snapshots.get(snapshotId3);
-            assertEquals(
-                "oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
-            assertEquals(
-                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException3",
-                snapshot.getStack().get(0).getFunction());
-            assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
-            // snapshot 4
-            snapshot = snapshots.get(snapshotId4);
-            assertEquals(
-                "oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
-            assertEquals(
-                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException2",
-                snapshot.getStack().get(0).getFunction());
-            assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
-            return true;
-          }
-          return false;
-        },
-        timeoutMessage);
-  }
+    // DeepOops exception stacktrace:
+    // java.lang.RuntimeException: oops
+    // datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithException(ServerDebuggerTestApplication.java:190)
+    // datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException5(ServerDebuggerTestApplication.java:210)
+    // datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException4(ServerDebuggerTestApplication.java:206)
+    // datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException3(ServerDebuggerTestApplication.java:202)
+    // datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException2(ServerDebuggerTestApplication.java:198)
+    // datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException1(ServerDebuggerTestApplication.java:194)
+    // datadog.smoketest.debugger.ServerDebuggerTestApplication.runTracedMethod(ServerDebuggerTestApplication.java:140)
+    @Test
+    @DisplayName("test3CapturedFrames")
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    void test3CapturedFrames() throws Exception {
+        appUrl = startAppAndAndGetUrl();
+        execute(appUrl, TRACED_METHOD_NAME, "deepOops"); // instrumenting first exception
+        waitForExceptionFingerprint();
+        execute(appUrl, TRACED_METHOD_NAME, "deepOops"); // collecting snapshots and sending them
+        registerTraceListener(this::receiveExceptionReplayTrace);
+        registerSnapshotListener(this::receiveSnapshot);
+        processRequests(
+                () -> {
+                    if (snapshotIdTags.isEmpty()) {
+                        return false;
+                    }
+                    String snapshotId0 = snapshotIdTags.get(0);
+                    String snapshotId1 = snapshotIdTags.get(1);
+                    String snapshotId2 = snapshotIdTags.get(2);
+                    if (traceReceived
+                            && snapshotReceived
+                            && snapshots.containsKey(snapshotId0)
+                            && snapshots.containsKey(snapshotId1)
+                            && snapshots.containsKey(snapshotId2)) {
+                        // snapshot 0
+                        Snapshot snapshot = snapshots.get(snapshotId0);
+                        assertNotNull(snapshot);
+                        assertEquals(
+                                "oops",
+                                snapshot.getCaptures()
+                                        .getReturn()
+                                        .getCapturedThrowable()
+                                        .getMessage());
+                        assertEquals(
+                                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithException",
+                                snapshot.getStack().get(0).getFunction());
+                        assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
+                        // snapshot 1
+                        snapshot = snapshots.get(snapshotId1);
+                        assertEquals(
+                                "oops",
+                                snapshot.getCaptures()
+                                        .getReturn()
+                                        .getCapturedThrowable()
+                                        .getMessage());
+                        assertEquals(
+                                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException5",
+                                snapshot.getStack().get(0).getFunction());
+                        assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
+                        // snapshot 2
+                        snapshot = snapshots.get(snapshotId2);
+                        assertEquals(
+                                "oops",
+                                snapshot.getCaptures()
+                                        .getReturn()
+                                        .getCapturedThrowable()
+                                        .getMessage());
+                        assertEquals(
+                                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException4",
+                                snapshot.getStack().get(0).getFunction());
+                        assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
+                        return true;
+                    }
+                    return false;
+                },
+                timeoutMessage);
+    }
 
-  @Test
-  @DisplayName("test3CapturedRecursiveFrames")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  void test3CapturedRecursiveFrames() throws Exception {
-    appUrl = startAppAndAndGetUrl();
-    execute(appUrl, TRACED_METHOD_NAME, "recursiveOops"); // instrumenting first exception
-    waitForExceptionFingerprint();
-    execute(appUrl, TRACED_METHOD_NAME, "recursiveOops"); // collecting snapshots and sending them
-    registerTraceListener(this::receiveExceptionReplayTrace);
-    registerSnapshotListener(this::receiveSnapshot);
-    processRequests(
-        () -> {
-          if (snapshotIdTags.isEmpty()) {
-            return false;
-          }
-          if (traceReceived
-              && snapshotReceived
-              && snapshots.containsKey(snapshotIdTags.get(0))
-              && snapshots.containsKey(snapshotIdTags.get(1))
-              && snapshots.containsKey(snapshotIdTags.get(2))) {
-            assertEquals(3, snapshotIdTags.size());
-            assertEquals(3, snapshots.size());
-            // snapshot 0
-            assertRecursiveSnapshot(snapshots.get(snapshotIdTags.get(0)));
-            // snapshot 1
-            assertRecursiveSnapshot(snapshots.get(snapshotIdTags.get(1)));
-            // snapshot 2
-            assertRecursiveSnapshot(snapshots.get(snapshotIdTags.get(2)));
-            return true;
-          }
-          return false;
-        },
-        timeoutMessage);
-  }
+    @Test
+    @DisplayName("test5CapturedFrames")
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    void test5CapturedFrames() throws Exception {
+        additionalJvmArgs.add("-Ddd.exception.replay.capture.max.frames=5");
+        appUrl = startAppAndAndGetUrl();
+        execute(appUrl, TRACED_METHOD_NAME, "deepOops"); // instrumenting first exception
+        waitForExceptionFingerprint();
+        execute(appUrl, TRACED_METHOD_NAME, "deepOops"); // collecting snapshots and sending them
+        registerTraceListener(this::receiveExceptionReplayTrace);
+        registerSnapshotListener(this::receiveSnapshot);
+        processRequests(
+                () -> {
+                    if (snapshotIdTags.isEmpty()) {
+                        return false;
+                    }
+                    String snapshotId0 = snapshotIdTags.get(0);
+                    String snapshotId1 = snapshotIdTags.get(1);
+                    String snapshotId2 = snapshotIdTags.get(2);
+                    String snapshotId3 = snapshotIdTags.get(3);
+                    String snapshotId4 = snapshotIdTags.get(4);
+                    if (traceReceived
+                            && snapshotReceived
+                            && snapshots.containsKey(snapshotId0)
+                            && snapshots.containsKey(snapshotId1)
+                            && snapshots.containsKey(snapshotId2)
+                            && snapshots.containsKey(snapshotId3)
+                            && snapshots.containsKey(snapshotId4)) {
+                        // snapshot 0
+                        Snapshot snapshot = snapshots.get(snapshotId0);
+                        assertNotNull(snapshot);
+                        assertEquals(
+                                "oops",
+                                snapshot.getCaptures()
+                                        .getReturn()
+                                        .getCapturedThrowable()
+                                        .getMessage());
+                        assertEquals(
+                                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithException",
+                                snapshot.getStack().get(0).getFunction());
+                        assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
+                        // snapshot 1
+                        snapshot = snapshots.get(snapshotId1);
+                        assertEquals(
+                                "oops",
+                                snapshot.getCaptures()
+                                        .getReturn()
+                                        .getCapturedThrowable()
+                                        .getMessage());
+                        assertEquals(
+                                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException5",
+                                snapshot.getStack().get(0).getFunction());
+                        assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
+                        // snapshot 2
+                        snapshot = snapshots.get(snapshotId2);
+                        assertEquals(
+                                "oops",
+                                snapshot.getCaptures()
+                                        .getReturn()
+                                        .getCapturedThrowable()
+                                        .getMessage());
+                        assertEquals(
+                                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException4",
+                                snapshot.getStack().get(0).getFunction());
+                        assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
+                        // snapshot 3
+                        snapshot = snapshots.get(snapshotId3);
+                        assertEquals(
+                                "oops",
+                                snapshot.getCaptures()
+                                        .getReturn()
+                                        .getCapturedThrowable()
+                                        .getMessage());
+                        assertEquals(
+                                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException3",
+                                snapshot.getStack().get(0).getFunction());
+                        assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
+                        // snapshot 4
+                        snapshot = snapshots.get(snapshotId4);
+                        assertEquals(
+                                "oops",
+                                snapshot.getCaptures()
+                                        .getReturn()
+                                        .getCapturedThrowable()
+                                        .getMessage());
+                        assertEquals(
+                                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException2",
+                                snapshot.getStack().get(0).getFunction());
+                        assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
+                        return true;
+                    }
+                    return false;
+                },
+                timeoutMessage);
+    }
 
-  private static void assertRecursiveSnapshot(Snapshot snapshot) {
-    assertNotNull(snapshot);
-    assertEquals(
-        "recursiveOops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
-    assertEquals(
-        "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithRecursiveException",
-        snapshot.getStack().get(0).getFunction());
-  }
+    @Test
+    @DisplayName("test3CapturedRecursiveFrames")
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    void test3CapturedRecursiveFrames() throws Exception {
+        appUrl = startAppAndAndGetUrl();
+        execute(appUrl, TRACED_METHOD_NAME, "recursiveOops"); // instrumenting first exception
+        waitForExceptionFingerprint();
+        execute(appUrl, TRACED_METHOD_NAME, "recursiveOops"); // collecting snapshots and sending them
+        registerTraceListener(this::receiveExceptionReplayTrace);
+        registerSnapshotListener(this::receiveSnapshot);
+        processRequests(
+                () -> {
+                    if (snapshotIdTags.isEmpty()) {
+                        return false;
+                    }
+                    if (traceReceived
+                            && snapshotReceived
+                            && snapshots.containsKey(snapshotIdTags.get(0))
+                            && snapshots.containsKey(snapshotIdTags.get(1))
+                            && snapshots.containsKey(snapshotIdTags.get(2))) {
+                        assertEquals(3, snapshotIdTags.size());
+                        assertEquals(3, snapshots.size());
+                        // snapshot 0
+                        assertRecursiveSnapshot(snapshots.get(snapshotIdTags.get(0)));
+                        // snapshot 1
+                        assertRecursiveSnapshot(snapshots.get(snapshotIdTags.get(1)));
+                        // snapshot 2
+                        assertRecursiveSnapshot(snapshots.get(snapshotIdTags.get(2)));
+                        return true;
+                    }
+                    return false;
+                },
+                timeoutMessage);
+    }
 
-  @Test
-  @DisplayName("testLambdaHiddenFrames")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "HotSpot specific test")
-  void testLambdaHiddenFrames() throws Exception {
-    additionalJvmArgs.add("-XX:+UnlockDiagnosticVMOptions");
-    additionalJvmArgs.add("-XX:+ShowHiddenFrames");
-    appUrl = startAppAndAndGetUrl();
-    execute(appUrl, TRACED_METHOD_NAME, "lambdaOops"); // instrumenting first exception
-    waitForExceptionFingerprint();
-    execute(appUrl, TRACED_METHOD_NAME, "lambdaOops"); // collecting snapshots and sending them
-    registerTraceListener(this::receiveExceptionReplayTrace);
-    registerSnapshotListener(this::receiveSnapshot);
-    processRequests(
-        () -> {
-          if (snapshotIdTags.isEmpty()) {
-            return false;
-          }
-          String snapshotId0 = snapshotIdTags.get(0);
-          if (traceReceived && snapshotReceived && snapshots.containsKey(snapshotId0)) {
-            Snapshot snapshot = snapshots.get(snapshotId0);
-            assertNotNull(snapshot);
-            assertEquals(
-                "lambdaOops",
+    private static void assertRecursiveSnapshot(Snapshot snapshot) {
+        assertNotNull(snapshot);
+        assertEquals(
+                "recursiveOops",
                 snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
-            assertEquals(
-                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithLambdaException",
+        assertEquals(
+                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithRecursiveException",
                 snapshot.getStack().get(0).getFunction());
-            assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
-            return true;
-          }
-          return false;
-        },
-        timeoutMessage);
-  }
+    }
 
-  private void resetSnapshotsAndTraces() {
-    resetTraceListener();
-    traceReceived = false;
-    snapshotReceived = false;
-    snapshots.clear();
-    snapshotIdTags.clear();
-  }
+    @Test
+    @DisplayName("testLambdaHiddenFrames")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "HotSpot specific test")
+    void testLambdaHiddenFrames() throws Exception {
+        additionalJvmArgs.add("-XX:+UnlockDiagnosticVMOptions");
+        additionalJvmArgs.add("-XX:+ShowHiddenFrames");
+        appUrl = startAppAndAndGetUrl();
+        execute(appUrl, TRACED_METHOD_NAME, "lambdaOops"); // instrumenting first exception
+        waitForExceptionFingerprint();
+        execute(appUrl, TRACED_METHOD_NAME, "lambdaOops"); // collecting snapshots and sending them
+        registerTraceListener(this::receiveExceptionReplayTrace);
+        registerSnapshotListener(this::receiveSnapshot);
+        processRequests(
+                () -> {
+                    if (snapshotIdTags.isEmpty()) {
+                        return false;
+                    }
+                    String snapshotId0 = snapshotIdTags.get(0);
+                    if (traceReceived && snapshotReceived && snapshots.containsKey(snapshotId0)) {
+                        Snapshot snapshot = snapshots.get(snapshotId0);
+                        assertNotNull(snapshot);
+                        assertEquals(
+                                "lambdaOops",
+                                snapshot.getCaptures()
+                                        .getReturn()
+                                        .getCapturedThrowable()
+                                        .getMessage());
+                        assertEquals(
+                                "datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithLambdaException",
+                                snapshot.getStack().get(0).getFunction());
+                        assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
+                        return true;
+                    }
+                    return false;
+                },
+                timeoutMessage);
+    }
 
-  private void assertFullMethodCaptureArgs(CapturedContext context) {
-    if (JavaVirtualMachine.isJ9()) {
-      // skip for J9/OpenJ9 as we cannot get local variable debug info.
-      return;
+    private void resetSnapshotsAndTraces() {
+        resetTraceListener();
+        traceReceived = false;
+        snapshotReceived = false;
+        snapshots.clear();
+        snapshotIdTags.clear();
     }
-    assertCaptureArgs(context, "argInt", "int", "42");
-    assertCaptureArgs(context, "argStr", "java.lang.String", "foobar");
-    assertCaptureArgs(context, "argDouble", "double", "3.42");
-    assertCaptureArgs(context, "argMap", "java.util.HashMap", "{key1=val1, key2=val2, key3=val3}");
-    assertCaptureArgs(context, "argVar", "java.lang.String[]", "[var1, var2, var3]");
-  }
 
-  private void receiveExceptionReplayTrace(DecodedTrace decodedTrace) {
-    for (DecodedSpan span : decodedTrace.getSpans()) {
-      if (isTracedFullMethodSpan(span) && span.getMeta().containsKey("error.debug_info_captured")) {
-        // assert that we have received the trace with ER tags only once
-        assertTrue(snapshotIdTags.isEmpty());
-        for (int i = 0; i < 5; i++) {
-          String snapshotId = span.getMeta().get("_dd.debug.error." + i + ".snapshot_id");
-          if (snapshotId != null) {
-            snapshotIdTags.add(snapshotId);
-          }
+    private void assertFullMethodCaptureArgs(CapturedContext context) {
+        if (JavaVirtualMachine.isJ9()) {
+            // skip for J9/OpenJ9 as we cannot get local variable debug info.
+            return;
         }
-        assertFalse(traceReceived);
-        traceReceived = true;
-      }
+        assertCaptureArgs(context, "argInt", "int", "42");
+        assertCaptureArgs(context, "argStr", "java.lang.String", "foobar");
+        assertCaptureArgs(context, "argDouble", "double", "3.42");
+        assertCaptureArgs(context, "argMap", "java.util.HashMap", "{key1=val1, key2=val2, key3=val3}");
+        assertCaptureArgs(context, "argVar", "java.lang.String[]", "[var1, var2, var3]");
     }
-  }
 
-  private void receiveSnapshot(Snapshot snapshot) {
-    snapshots.put(snapshot.getId(), snapshot);
-    snapshotReceived = true;
-  }
+    private void receiveExceptionReplayTrace(DecodedTrace decodedTrace) {
+        for (DecodedSpan span : decodedTrace.getSpans()) {
+            if (isTracedFullMethodSpan(span) && span.getMeta().containsKey("error.debug_info_captured")) {
+                // assert that we have received the trace with ER tags only once
+                assertTrue(snapshotIdTags.isEmpty());
+                for (int i = 0; i < 5; i++) {
+                    String snapshotId = span.getMeta().get("_dd.debug.error." + i + ".snapshot_id");
+                    if (snapshotId != null) {
+                        snapshotIdTags.add(snapshotId);
+                    }
+                }
+                assertFalse(traceReceived);
+                traceReceived = true;
+            }
+        }
+    }
+
+    private void receiveSnapshot(Snapshot snapshot) {
+        snapshots.put(snapshot.getId(), snapshot);
+        snapshotReceived = true;
+    }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/InProductEnablementIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/InProductEnablementIntegrationTest.java
index 5c235b6d9fd..01656667a00 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/InProductEnablementIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/InProductEnablementIntegrationTest.java
@@ -16,138 +16,137 @@
 
 @NonRetryable
 public class InProductEnablementIntegrationTest extends ServerAppDebuggerIntegrationTest {
-  private List<String> additionalJvmArgs = new ArrayList<>();
+    private List<String> additionalJvmArgs = new ArrayList<>();
 
-  @Override
-  protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
-    List<String> commandParams = getDebuggerCommandParams();
-    // remove the dynamic instrumentation flag
-    commandParams.remove("-Ddd.dynamic.instrumentation.enabled=true");
-    commandParams.addAll(additionalJvmArgs);
-    return ProcessBuilderHelper.createProcessBuilder(
-        commandParams, logFilePath, getAppClass(), params);
-  }
+    @Override
+    protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
+        List<String> commandParams = getDebuggerCommandParams();
+        // remove the dynamic instrumentation flag
+        commandParams.remove("-Ddd.dynamic.instrumentation.enabled=true");
+        commandParams.addAll(additionalJvmArgs);
+        return ProcessBuilderHelper.createProcessBuilder(commandParams, logFilePath, getAppClass(), params);
+    }
 
-  @Test
-  @DisplayName("testDynamicInstrumentationEnablement")
-  void testDynamicInstrumentationEnablement() throws Exception {
-    appUrl = startAppAndAndGetUrl();
-    setConfigOverrides(createConfigOverrides(true, false));
-    LogProbe probe =
-        LogProbe.builder().probeId(PROBE_ID).where(TEST_APP_CLASS_NAME, TRACED_METHOD_NAME).build();
-    setCurrentConfiguration(createConfig(probe));
-    waitForFeatureStarted(appUrl, "Dynamic Instrumentation");
-    waitForInstrumentation(appUrl);
-    // disable DI
-    setConfigOverrides(createConfigOverrides(false, false));
-    waitForFeatureStopped(appUrl, "Dynamic Instrumentation");
-    waitForReTransformation(appUrl); // wait for retransformation of removed probe
-  }
+    @Test
+    @DisplayName("testDynamicInstrumentationEnablement")
+    void testDynamicInstrumentationEnablement() throws Exception {
+        appUrl = startAppAndAndGetUrl();
+        setConfigOverrides(createConfigOverrides(true, false));
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(TEST_APP_CLASS_NAME, TRACED_METHOD_NAME)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        waitForFeatureStarted(appUrl, "Dynamic Instrumentation");
+        waitForInstrumentation(appUrl);
+        // disable DI
+        setConfigOverrides(createConfigOverrides(false, false));
+        waitForFeatureStopped(appUrl, "Dynamic Instrumentation");
+        waitForReTransformation(appUrl); // wait for retransformation of removed probe
+    }
 
-  @Flaky
-  @Test
-  @DisplayName("testDynamicInstrumentationEnablementWithLineProbe")
-  void testDynamicInstrumentationEnablementWithLineProbe() throws Exception {
-    additionalJvmArgs.add("-Ddd.third.party.excludes=datadog.smoketest");
-    // internal flag required to avoid racing source file tracking and class loading as
-    // source file tracking information may be missing when looking for class to retransform
-    additionalJvmArgs.add(
-        "-Ddd.internal.dynamic.instrumentation.synchronous.source.file.tracking.enabled=true");
-    appUrl = startAppAndAndGetUrl();
-    setConfigOverrides(createConfigOverrides(true, false));
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(LINE_PROBE_ID1)
-            .where("ServerDebuggerTestApplication.java", 329)
-            .build();
-    setCurrentConfiguration(createConfig(probe));
-    waitForFeatureStarted(appUrl, "Dynamic Instrumentation");
-    execute(appUrl, "topLevelMethod", "");
-    waitForInstrumentation(appUrl, "datadog.smoketest.debugger.TopLevel", true);
-    // disable DI
-    setConfigOverrides(createConfigOverrides(false, false));
-    waitForFeatureStopped(appUrl, "Dynamic Instrumentation");
-    waitForReTransformation(
-        appUrl,
-        "datadog.smoketest.debugger.TopLevel"); // wait for retransformation of removed probe
-  }
+    @Flaky
+    @Test
+    @DisplayName("testDynamicInstrumentationEnablementWithLineProbe")
+    void testDynamicInstrumentationEnablementWithLineProbe() throws Exception {
+        additionalJvmArgs.add("-Ddd.third.party.excludes=datadog.smoketest");
+        // internal flag required to avoid racing source file tracking and class loading as
+        // source file tracking information may be missing when looking for class to retransform
+        additionalJvmArgs.add("-Ddd.internal.dynamic.instrumentation.synchronous.source.file.tracking.enabled=true");
+        appUrl = startAppAndAndGetUrl();
+        setConfigOverrides(createConfigOverrides(true, false));
+        LogProbe probe = LogProbe.builder()
+                .probeId(LINE_PROBE_ID1)
+                .where("ServerDebuggerTestApplication.java", 329)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        waitForFeatureStarted(appUrl, "Dynamic Instrumentation");
+        execute(appUrl, "topLevelMethod", "");
+        waitForInstrumentation(appUrl, "datadog.smoketest.debugger.TopLevel", true);
+        // disable DI
+        setConfigOverrides(createConfigOverrides(false, false));
+        waitForFeatureStopped(appUrl, "Dynamic Instrumentation");
+        waitForReTransformation(
+                appUrl, "datadog.smoketest.debugger.TopLevel"); // wait for retransformation of removed probe
+    }
 
-  @Test
-  @DisplayName("testDynamicInstrumentationEnablementStaticallyDisabled")
-  void testDynamicInstrumentationEnablementStaticallyDisabled() throws Exception {
-    // explicitly disable dynamic instrumentation, preventing enablement
-    additionalJvmArgs.add("-Ddd.dynamic.instrumentation.enabled=false");
-    appUrl = startAppAndAndGetUrl();
-    setConfigOverrides(createConfigOverrides(true, false));
-    LogProbe probe =
-        LogProbe.builder().probeId(PROBE_ID).where(TEST_APP_CLASS_NAME, TRACED_METHOD_NAME).build();
-    setCurrentConfiguration(createConfig(probe));
-    waitForSpecificLine(appUrl, "Feature dynamic.instrumentation.enabled is explicitly disabled");
-  }
+    @Test
+    @DisplayName("testDynamicInstrumentationEnablementStaticallyDisabled")
+    void testDynamicInstrumentationEnablementStaticallyDisabled() throws Exception {
+        // explicitly disable dynamic instrumentation, preventing enablement
+        additionalJvmArgs.add("-Ddd.dynamic.instrumentation.enabled=false");
+        appUrl = startAppAndAndGetUrl();
+        setConfigOverrides(createConfigOverrides(true, false));
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(TEST_APP_CLASS_NAME, TRACED_METHOD_NAME)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        waitForSpecificLine(appUrl, "Feature dynamic.instrumentation.enabled is explicitly disabled");
+    }
 
-  @Test
-  @DisplayName("testExceptionReplayEnablement")
-  @EnabledForJreRange(min = JRE.JAVA_11)
-  void testExceptionReplayEnablement() throws Exception {
-    additionalJvmArgs.add("-Ddd.third.party.excludes=datadog.smoketest");
-    appUrl = startAppAndAndGetUrl();
-    setConfigOverrides(createConfigOverrides(false, true));
-    waitForFeatureStarted(appUrl, "Exception Replay");
-    execute(appUrl, TRACED_METHOD_NAME, "oops"); // instrumenting first exception
-    waitForInstrumentation(appUrl, SERVER_DEBUGGER_TEST_APP_CLASS, false);
-    // disable ER
-    setConfigOverrides(createConfigOverrides(false, false));
-    waitForFeatureStopped(appUrl, "Exception Replay");
-    waitForReTransformation(appUrl); // wait for retransformation of removed probes
-  }
+    @Test
+    @DisplayName("testExceptionReplayEnablement")
+    @EnabledForJreRange(min = JRE.JAVA_11)
+    void testExceptionReplayEnablement() throws Exception {
+        additionalJvmArgs.add("-Ddd.third.party.excludes=datadog.smoketest");
+        appUrl = startAppAndAndGetUrl();
+        setConfigOverrides(createConfigOverrides(false, true));
+        waitForFeatureStarted(appUrl, "Exception Replay");
+        execute(appUrl, TRACED_METHOD_NAME, "oops"); // instrumenting first exception
+        waitForInstrumentation(appUrl, SERVER_DEBUGGER_TEST_APP_CLASS, false);
+        // disable ER
+        setConfigOverrides(createConfigOverrides(false, false));
+        waitForFeatureStopped(appUrl, "Exception Replay");
+        waitForReTransformation(appUrl); // wait for retransformation of removed probes
+    }
 
-  // TODO test for failure of starting ER, SymDB and DI: should degrade gracefully
-  // TODO by not providing endpoints
+    // TODO test for failure of starting ER, SymDB and DI: should degrade gracefully
+    // TODO by not providing endpoints
 
-  @Flaky
-  @Test
-  @DisplayName("testExceptionReplayEnablementFailure")
-  @EnabledForJreRange(min = JRE.JAVA_11)
-  void testExceptionReplayEnablementFailure() throws Exception {
-    additionalJvmArgs.add("-Ddd.exception.replay.enabled=true");
-    additionalJvmArgs.add("-Ddd.third.party.excludes=datadog.smoketest");
-    this.probeMockDispatcher.setDispatcher(this::noEndpointDispatch);
-    appUrl = startAppAndAndGetUrl();
-    waitForSpecificLine(appUrl, "Failed to init common component for debugger agent");
-    probeMockDispatcher.setDispatcher(this::datadogAgentDispatch);
-    setConfigOverrides(createConfigOverrides(true, true));
-    waitForFeatureStarted(appUrl, "Dynamic Instrumentation");
-    waitForFeatureStarted(appUrl, "Exception Replay");
-  }
+    @Flaky
+    @Test
+    @DisplayName("testExceptionReplayEnablementFailure")
+    @EnabledForJreRange(min = JRE.JAVA_11)
+    void testExceptionReplayEnablementFailure() throws Exception {
+        additionalJvmArgs.add("-Ddd.exception.replay.enabled=true");
+        additionalJvmArgs.add("-Ddd.third.party.excludes=datadog.smoketest");
+        this.probeMockDispatcher.setDispatcher(this::noEndpointDispatch);
+        appUrl = startAppAndAndGetUrl();
+        waitForSpecificLine(appUrl, "Failed to init common component for debugger agent");
+        probeMockDispatcher.setDispatcher(this::datadogAgentDispatch);
+        setConfigOverrides(createConfigOverrides(true, true));
+        waitForFeatureStarted(appUrl, "Dynamic Instrumentation");
+        waitForFeatureStarted(appUrl, "Exception Replay");
+    }
 
-  private MockResponse noEndpointDispatch(RecordedRequest request) {
-    if (request.getPath().equals("/info")) {
-      // no debugger endpoints
-      String info =
-          "{\"endpoints\": [\"" + TRACE_URL_PATH + "\", \"" + LOG_UPLOAD_URL_PATH + "\"]}";
-      return new MockResponse().setResponseCode(200).setBody(info);
+    private MockResponse noEndpointDispatch(RecordedRequest request) {
+        if (request.getPath().equals("/info")) {
+            // no debugger endpoints
+            String info = "{\"endpoints\": [\"" + TRACE_URL_PATH + "\", \"" + LOG_UPLOAD_URL_PATH + "\"]}";
+            return new MockResponse().setResponseCode(200).setBody(info);
+        }
+        return datadogAgentDispatch(request);
     }
-    return datadogAgentDispatch(request);
-  }
 
-  private void waitForFeatureStarted(String appUrl, String feature) throws IOException {
-    String line = "INFO com.datadog.debugger.agent.DebuggerAgent - Started " + feature;
-    waitForSpecificLine(appUrl, line);
-    LOG.info("feature {} started", feature);
-  }
+    private void waitForFeatureStarted(String appUrl, String feature) throws IOException {
+        String line = "INFO com.datadog.debugger.agent.DebuggerAgent - Started " + feature;
+        waitForSpecificLine(appUrl, line);
+        LOG.info("feature {} started", feature);
+    }
 
-  private void waitForFeatureStopped(String appUrl, String feature) throws IOException {
-    String line = "INFO com.datadog.debugger.agent.DebuggerAgent - Stopping " + feature;
-    waitForSpecificLine(appUrl, line);
-    LOG.info("feature {} stopped", feature);
-  }
+    private void waitForFeatureStopped(String appUrl, String feature) throws IOException {
+        String line = "INFO com.datadog.debugger.agent.DebuggerAgent - Stopping " + feature;
+        waitForSpecificLine(appUrl, line);
+        LOG.info("feature {} stopped", feature);
+    }
 
-  private static ConfigOverrides createConfigOverrides(
-      boolean dynamicInstrumentationEnabled, boolean exceptionReplayEnabled) {
-    ConfigOverrides config = new ConfigOverrides();
-    config.libConfig = new LibConfig();
-    config.libConfig.dynamicInstrumentationEnabled = dynamicInstrumentationEnabled;
-    config.libConfig.exceptionReplayEnabled = exceptionReplayEnabled;
-    return config;
-  }
+    private static ConfigOverrides createConfigOverrides(
+            boolean dynamicInstrumentationEnabled, boolean exceptionReplayEnabled) {
+        ConfigOverrides config = new ConfigOverrides();
+        config.libConfig = new LibConfig();
+        config.libConfig.dynamicInstrumentationEnabled = dynamicInstrumentationEnabled;
+        config.libConfig.exceptionReplayEnabled = exceptionReplayEnabled;
+        return config;
+    }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java
index 4ff2d8bbfb3..33b5aeed003 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java
@@ -45,618 +45,552 @@
 @Flaky
 @NonRetryable
 public class LogProbesIntegrationTest extends SimpleAppDebuggerIntegrationTest {
-  @Test
-  @DisplayName("testInaccessibleObject")
-  void testInaccessibleObject() throws Exception {
-    final String METHOD_NAME = "managementMethod";
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
-    LogProbe probe =
-        LogProbe.builder().probeId(PROBE_ID).where(MAIN_CLASS_NAME, METHOD_NAME).build();
-    setCurrentConfiguration(createConfig(probe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    AtomicBoolean snapshotReceived = new AtomicBoolean(false);
-    registerSnapshotListener(
-        snapshot -> {
-          snapshotReceived.set(true);
+    @Test
+    @DisplayName("testInaccessibleObject")
+    void testInaccessibleObject() throws Exception {
+        final String METHOD_NAME = "managementMethod";
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, METHOD_NAME)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        AtomicBoolean snapshotReceived = new AtomicBoolean(false);
+        registerSnapshotListener(snapshot -> {
+            snapshotReceived.set(true);
         });
-    processRequests(
-        snapshotReceived::get,
-        () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
-    assertFalse(logHasErrors(logFilePath, it -> false));
-  }
+        processRequests(
+                snapshotReceived::get, () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
+        assertFalse(logHasErrors(logFilePath, it -> false));
+    }
 
-  @Test
-  @DisplayName("testFullMethod")
-  void testFullMethod() throws Exception {
-    final String METHOD_NAME = "fullMethod";
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(MAIN_CLASS_NAME, METHOD_NAME)
-            .captureSnapshot(true)
-            .build();
-    setCurrentConfiguration(createConfig(probe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    AtomicBoolean snapshotReceived = new AtomicBoolean();
-    registerIntakeRequestListener(
-        intakeRequest -> {
-          assertEquals("snapshot", intakeRequest.getType());
+    @Test
+    @DisplayName("testFullMethod")
+    void testFullMethod() throws Exception {
+        final String METHOD_NAME = "fullMethod";
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, METHOD_NAME)
+                .captureSnapshot(true)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        AtomicBoolean snapshotReceived = new AtomicBoolean();
+        registerIntakeRequestListener(intakeRequest -> {
+            assertEquals("snapshot", intakeRequest.getType());
         });
-    registerSnapshotListener(
-        snapshot -> {
-          assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
-          assertFullMethodCaptureArgs(snapshot.getCaptures().getEntry());
-          assertNull(snapshot.getCaptures().getEntry().getLocals());
-          assertNull(snapshot.getCaptures().getEntry().getCapturedThrowable());
-          assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
-          assertCaptureReturnValue(
-              snapshot.getCaptures().getReturn(),
-              "java.lang.String",
-              "42, foobar, 3.42, {key1=val1, key2=val2, key3=val3}, var1,var2,var3");
-          assertNotNull(snapshot.getCaptures().getReturn().getLocals());
-          // @return is the only locals but ex is safely hoisted in the method
-          assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
-          assertNull(snapshot.getCaptures().getReturn().getCapturedThrowable());
-          snapshotReceived.set(true);
+        registerSnapshotListener(snapshot -> {
+            assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
+            assertFullMethodCaptureArgs(snapshot.getCaptures().getEntry());
+            assertNull(snapshot.getCaptures().getEntry().getLocals());
+            assertNull(snapshot.getCaptures().getEntry().getCapturedThrowable());
+            assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
+            assertCaptureReturnValue(
+                    snapshot.getCaptures().getReturn(),
+                    "java.lang.String",
+                    "42, foobar, 3.42, {key1=val1, key2=val2, key3=val3}, var1,var2,var3");
+            assertNotNull(snapshot.getCaptures().getReturn().getLocals());
+            // @return is the only locals but ex is safely hoisted in the method
+            assertEquals(2, snapshot.getCaptures().getReturn().getLocals().size());
+            assertNull(snapshot.getCaptures().getReturn().getCapturedThrowable());
+            snapshotReceived.set(true);
         });
-    AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
-    processRequests(
-        () -> snapshotReceived.get() && statusResult.get(),
-        () ->
-            String.format(
-                "timeout snapshotReceived=%s statusResult=%s",
-                snapshotReceived.get(), statusResult.get()));
-  }
+        AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
+        processRequests(
+                () -> snapshotReceived.get() && statusResult.get(),
+                () -> String.format(
+                        "timeout snapshotReceived=%s statusResult=%s", snapshotReceived.get(), statusResult.get()));
+    }
 
-  @Test
-  @DisplayName("testFullMethodWithCondition")
-  void testFullMethodWithCondition() throws Exception {
-    final String METHOD_NAME = "fullMethod";
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(MAIN_CLASS_NAME, METHOD_NAME)
-            .when(
-                new ProbeCondition(
-                    when(eq(ref("argStr"), value("foobar"))), "argStr == \"foobar\""))
-            .captureSnapshot(true)
-            .build();
-    setCurrentConfiguration(createConfig(probe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    AtomicBoolean snapshotReceived = new AtomicBoolean();
-    registerSnapshotListener(
-        snapshot -> {
-          assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
-          assertFullMethodCaptureArgs(snapshot.getCaptures().getEntry());
-          snapshotReceived.set(true);
+    @Test
+    @DisplayName("testFullMethodWithCondition")
+    void testFullMethodWithCondition() throws Exception {
+        final String METHOD_NAME = "fullMethod";
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, METHOD_NAME)
+                .when(new ProbeCondition(when(eq(ref("argStr"), value("foobar"))), "argStr == \"foobar\""))
+                .captureSnapshot(true)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        AtomicBoolean snapshotReceived = new AtomicBoolean();
+        registerSnapshotListener(snapshot -> {
+            assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
+            assertFullMethodCaptureArgs(snapshot.getCaptures().getEntry());
+            snapshotReceived.set(true);
         });
-    AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
-    processRequests(
-        () -> snapshotReceived.get() && statusResult.get(),
-        () ->
-            String.format(
-                "timeout snapshotReceived=%s statusResult=%s",
-                snapshotReceived.get(), statusResult.get()));
-  }
+        AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
+        processRequests(
+                () -> snapshotReceived.get() && statusResult.get(),
+                () -> String.format(
+                        "timeout snapshotReceived=%s statusResult=%s", snapshotReceived.get(), statusResult.get()));
+    }
 
-  @Test
-  @DisplayName("testFullMethodWithConditionAtExit")
-  void testFullMethodWithConditionAtExit() throws Exception {
-    final String METHOD_NAME = "fullMethod";
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(MAIN_CLASS_NAME, METHOD_NAME)
-            .when(
-                new ProbeCondition(
-                    when(and(gt(len(ref("@return")), value(0)), gt(ref("@duration"), value(0)))),
-                    "len(@return) > 0 && @duration > 0"))
-            .captureSnapshot(true)
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    setCurrentConfiguration(createConfig(probe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    AtomicBoolean snapshotReceived = new AtomicBoolean();
-    registerSnapshotListener(
-        snapshot -> {
-          assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
-          assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
-          snapshotReceived.set(true);
+    @Test
+    @DisplayName("testFullMethodWithConditionAtExit")
+    void testFullMethodWithConditionAtExit() throws Exception {
+        final String METHOD_NAME = "fullMethod";
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, METHOD_NAME)
+                .when(new ProbeCondition(
+                        when(and(gt(len(ref("@return")), value(0)), gt(ref("@duration"), value(0)))),
+                        "len(@return) > 0 && @duration > 0"))
+                .captureSnapshot(true)
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        AtomicBoolean snapshotReceived = new AtomicBoolean();
+        registerSnapshotListener(snapshot -> {
+            assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
+            assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
+            snapshotReceived.set(true);
         });
-    AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
-    processRequests(
-        () -> snapshotReceived.get() && statusResult.get(),
-        () ->
-            String.format(
-                "timeout snapshotReceived=%s statusResult=%s",
-                snapshotReceived.get(), statusResult.get()));
-  }
+        AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
+        processRequests(
+                () -> snapshotReceived.get() && statusResult.get(),
+                () -> String.format(
+                        "timeout snapshotReceived=%s statusResult=%s", snapshotReceived.get(), statusResult.get()));
+    }
 
-  @Test
-  @DisplayName("testFullMethodWithConditionFailed")
-  void testFullMethodWithConditionFailed() throws Exception {
-    final String METHOD_NAME = "fullMethod";
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(MAIN_CLASS_NAME, METHOD_NAME)
-            .when(new ProbeCondition(when(eq(ref("noarg"), nullValue())), "noarg == null"))
-            .captureSnapshot(true)
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    setCurrentConfiguration(createConfig(probe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    AtomicBoolean snapshotReceived = new AtomicBoolean();
-    registerSnapshotListener(
-        snapshot -> {
-          assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
-          assertEquals(1, snapshot.getEvaluationErrors().size());
-          assertEquals(
-              "Cannot find symbol: noarg", snapshot.getEvaluationErrors().get(0).getMessage());
-          snapshotReceived.set(true);
+    @Test
+    @DisplayName("testFullMethodWithConditionFailed")
+    void testFullMethodWithConditionFailed() throws Exception {
+        final String METHOD_NAME = "fullMethod";
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, METHOD_NAME)
+                .when(new ProbeCondition(when(eq(ref("noarg"), nullValue())), "noarg == null"))
+                .captureSnapshot(true)
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        AtomicBoolean snapshotReceived = new AtomicBoolean();
+        registerSnapshotListener(snapshot -> {
+            assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
+            assertEquals(1, snapshot.getEvaluationErrors().size());
+            assertEquals(
+                    "Cannot find symbol: noarg",
+                    snapshot.getEvaluationErrors().get(0).getMessage());
+            snapshotReceived.set(true);
         });
-    AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
-    processRequests(
-        () -> snapshotReceived.get() && statusResult.get(),
-        () ->
-            String.format(
-                "timeout snapshotReceived=%s statusResult=%s",
-                snapshotReceived.get(), statusResult.get()));
-  }
+        AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
+        processRequests(
+                () -> snapshotReceived.get() && statusResult.get(),
+                () -> String.format(
+                        "timeout snapshotReceived=%s statusResult=%s", snapshotReceived.get(), statusResult.get()));
+    }
 
-  @Test
-  @DisplayName("testFullMethodWithLogTemplate")
-  void testFullMethodWithLogTemplate() throws Exception {
-    final String METHOD_NAME = "fullMethod";
-    final String LOG_TEMPLATE = "log line {argInt} {argStr} {argDouble} {argMap} {argVar}";
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(MAIN_CLASS_NAME, METHOD_NAME)
-            .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
-            .build();
-    setCurrentConfiguration(createConfig(probe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    AtomicBoolean snapshotReceived = new AtomicBoolean();
-    AtomicBoolean correctLogMessage = new AtomicBoolean();
-    registerIntakeRequestListener(
-        intakeRequest -> {
-          assertEquals(
-              "log line 42 foobar 3.42 {[key1=val1], [key2=val2], [key3=val3]} [var1, var2, var3]",
-              intakeRequest.getMessage());
-          correctLogMessage.set(true);
+    @Test
+    @DisplayName("testFullMethodWithLogTemplate")
+    void testFullMethodWithLogTemplate() throws Exception {
+        final String METHOD_NAME = "fullMethod";
+        final String LOG_TEMPLATE = "log line {argInt} {argStr} {argDouble} {argMap} {argVar}";
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, METHOD_NAME)
+                .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        AtomicBoolean snapshotReceived = new AtomicBoolean();
+        AtomicBoolean correctLogMessage = new AtomicBoolean();
+        registerIntakeRequestListener(intakeRequest -> {
+            assertEquals(
+                    "log line 42 foobar 3.42 {[key1=val1], [key2=val2], [key3=val3]} [var1, var2, var3]",
+                    intakeRequest.getMessage());
+            correctLogMessage.set(true);
         });
-    registerSnapshotListener(
-        snapshot -> {
-          assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
-          snapshotReceived.set(true);
+        registerSnapshotListener(snapshot -> {
+            assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
+            snapshotReceived.set(true);
         });
-    AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
-    processRequests(
-        () -> snapshotReceived.get() && correctLogMessage.get() && statusResult.get(),
-        () ->
-            String.format(
-                "timeout snapshotReceived=%s correctLogMessage=%s statusResult=%s",
-                snapshotReceived.get(), correctLogMessage.get(), statusResult.get()));
-  }
+        AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
+        processRequests(
+                () -> snapshotReceived.get() && correctLogMessage.get() && statusResult.get(),
+                () -> String.format(
+                        "timeout snapshotReceived=%s correctLogMessage=%s statusResult=%s",
+                        snapshotReceived.get(), correctLogMessage.get(), statusResult.get()));
+    }
 
-  @Test
-  @DisplayName("testFullMethodWithCaptureExpressions")
-  void testFullMethodWithCaptureExpressions() throws Exception {
-    final String METHOD_NAME = "fullMethod";
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(MAIN_CLASS_NAME, METHOD_NAME)
-            .evaluateAt(MethodLocation.EXIT)
-            .captureExpressions(
-                Arrays.asList(
-                    new LogProbe.CaptureExpression(
-                        "argStr",
-                        new ValueScript(DSL.ref("argStr"), "argStr"),
-                        new LogProbe.Capture(3, 100, 3, 20)),
-                    new LogProbe.CaptureExpression(
-                        "argMap[key2]",
-                        new ValueScript(
-                            DSL.index(DSL.ref("argMap"), DSL.value("key2")), "argMap['key2']"),
-                        new LogProbe.Capture(3, 100, 4, 20))))
-            .build();
-    setCurrentConfiguration(createConfig(probe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    AtomicBoolean snapshotReceived = new AtomicBoolean();
-    registerSnapshotListener(
-        snapshot -> {
-          assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
-          assertEquals(2, snapshot.getCaptures().getReturn().getCaptureExpressions().size());
-          assertNull(snapshot.getCaptures().getReturn().getArguments());
-          assertNull(snapshot.getCaptures().getReturn().getLocals());
-          CapturedContext.CapturedValue argStrValue =
-              snapshot.getCaptures().getReturn().getCaptureExpressions().get("argStr");
-          assertEquals("argStr", argStrValue.getName());
-          assertEquals("foo", argStrValue.getValue());
-          assertEquals("truncated", argStrValue.getNotCapturedReason());
-          CapturedContext.CapturedValue key2Value =
-              snapshot.getCaptures().getReturn().getCaptureExpressions().get("argMap[key2]");
-          assertEquals("argMap[key2]", key2Value.getName());
-          assertEquals("val2", key2Value.getValue());
-          assertNull(key2Value.getNotCapturedReason());
-          snapshotReceived.set(true);
+    @Test
+    @DisplayName("testFullMethodWithCaptureExpressions")
+    void testFullMethodWithCaptureExpressions() throws Exception {
+        final String METHOD_NAME = "fullMethod";
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, METHOD_NAME)
+                .evaluateAt(MethodLocation.EXIT)
+                .captureExpressions(Arrays.asList(
+                        new LogProbe.CaptureExpression(
+                                "argStr",
+                                new ValueScript(DSL.ref("argStr"), "argStr"),
+                                new LogProbe.Capture(3, 100, 3, 20)),
+                        new LogProbe.CaptureExpression(
+                                "argMap[key2]",
+                                new ValueScript(DSL.index(DSL.ref("argMap"), DSL.value("key2")), "argMap['key2']"),
+                                new LogProbe.Capture(3, 100, 4, 20))))
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        AtomicBoolean snapshotReceived = new AtomicBoolean();
+        registerSnapshotListener(snapshot -> {
+            assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
+            assertEquals(
+                    2,
+                    snapshot.getCaptures().getReturn().getCaptureExpressions().size());
+            assertNull(snapshot.getCaptures().getReturn().getArguments());
+            assertNull(snapshot.getCaptures().getReturn().getLocals());
+            CapturedContext.CapturedValue argStrValue =
+                    snapshot.getCaptures().getReturn().getCaptureExpressions().get("argStr");
+            assertEquals("argStr", argStrValue.getName());
+            assertEquals("foo", argStrValue.getValue());
+            assertEquals("truncated", argStrValue.getNotCapturedReason());
+            CapturedContext.CapturedValue key2Value =
+                    snapshot.getCaptures().getReturn().getCaptureExpressions().get("argMap[key2]");
+            assertEquals("argMap[key2]", key2Value.getName());
+            assertEquals("val2", key2Value.getValue());
+            assertNull(key2Value.getNotCapturedReason());
+            snapshotReceived.set(true);
         });
-    AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
-    processRequests(
-        () -> snapshotReceived.get() && statusResult.get(),
-        () ->
-            String.format(
-                "timeout snapshotReceived=%s statusResult=%s",
-                snapshotReceived.get(), statusResult.get()));
-  }
-
-  @Test
-  @DisplayName("testMultiProbes")
-  void testMultiProbes() throws Exception {
-    final String METHOD_NAME = "fullMethod";
-    List<LogProbe> probes = new ArrayList<>();
-    for (int i = 0; i < 10; i++) {
-      probes.add(
-          LogProbe.builder()
-              .probeId(getProbeId(i))
-              .where(MAIN_CLASS_NAME, METHOD_NAME)
-              .captureSnapshot(true)
-              .build());
+        AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
+        processRequests(
+                () -> snapshotReceived.get() && statusResult.get(),
+                () -> String.format(
+                        "timeout snapshotReceived=%s statusResult=%s", snapshotReceived.get(), statusResult.get()));
     }
-    setCurrentConfiguration(createConfig(probes));
-    final int NB_PROBES = 10;
-    int expectedSnapshotUploads = NB_PROBES * 4; // (3 statuses + 1 snapshot) * 10 probes
-    targetProcess =
-        createProcessBuilder(logFilePath, METHOD_NAME, String.valueOf(expectedSnapshotUploads))
-            .start();
-    Set<String> probeIds = new HashSet<>();
-    AtomicBoolean allSnapshotReceived = new AtomicBoolean();
-    AtomicBoolean allStatusEmitting = new AtomicBoolean();
-    registerSnapshotListener(
-        snapshot -> {
-          probeIds.add(snapshot.getProbe().getId());
-          allSnapshotReceived.set(probeIds.size() == NB_PROBES);
+
+    @Test
+    @DisplayName("testMultiProbes")
+    void testMultiProbes() throws Exception {
+        final String METHOD_NAME = "fullMethod";
+        List<LogProbe> probes = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            probes.add(LogProbe.builder()
+                    .probeId(getProbeId(i))
+                    .where(MAIN_CLASS_NAME, METHOD_NAME)
+                    .captureSnapshot(true)
+                    .build());
+        }
+        setCurrentConfiguration(createConfig(probes));
+        final int NB_PROBES = 10;
+        int expectedSnapshotUploads = NB_PROBES * 4; // (3 statuses + 1 snapshot) * 10 probes
+        targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, String.valueOf(expectedSnapshotUploads))
+                .start();
+        Set<String> probeIds = new HashSet<>();
+        AtomicBoolean allSnapshotReceived = new AtomicBoolean();
+        AtomicBoolean allStatusEmitting = new AtomicBoolean();
+        registerSnapshotListener(snapshot -> {
+            probeIds.add(snapshot.getProbe().getId());
+            allSnapshotReceived.set(probeIds.size() == NB_PROBES);
         });
-    Map<String, ProbeStatus.Status> statuses = new HashMap<>();
-    registerProbeStatusListener(
-        probeStatus -> {
-          statuses.put(
-              probeStatus.getDiagnostics().getProbeId().getId(),
-              probeStatus.getDiagnostics().getStatus());
-          allStatusEmitting.set(
-              statuses.size() == NB_PROBES
-                  && statuses.values().stream()
-                      .allMatch(status -> status == ProbeStatus.Status.EMITTING));
+        Map<String, ProbeStatus.Status> statuses = new HashMap<>();
+        registerProbeStatusListener(probeStatus -> {
+            statuses.put(
+                    probeStatus.getDiagnostics().getProbeId().getId(),
+                    probeStatus.getDiagnostics().getStatus());
+            allStatusEmitting.set(statuses.size() == NB_PROBES
+                    && statuses.values().stream().allMatch(status -> status == ProbeStatus.Status.EMITTING));
         });
-    processRequests(
-        () -> allSnapshotReceived.get() && allStatusEmitting.get(),
-        () ->
-            String.format(
-                "timeout allSnapshotReceived=%s allStatusEmitting=%s",
-                allSnapshotReceived.get(), allStatusEmitting.get()));
-    assertEquals(NB_PROBES, probeIds.size());
-    for (int i = 0; i < NB_PROBES; i++) {
-      assertTrue(probeIds.contains(String.valueOf(i)));
+        processRequests(
+                () -> allSnapshotReceived.get() && allStatusEmitting.get(),
+                () -> String.format(
+                        "timeout allSnapshotReceived=%s allStatusEmitting=%s",
+                        allSnapshotReceived.get(), allStatusEmitting.get()));
+        assertEquals(NB_PROBES, probeIds.size());
+        for (int i = 0; i < NB_PROBES; i++) {
+            assertTrue(probeIds.contains(String.valueOf(i)));
+        }
+        assertFalse(logHasErrors(logFilePath, it -> false));
     }
-    assertFalse(logHasErrors(logFilePath, it -> false));
-  }
 
-  @Test
-  @DisplayName("testLineProbe")
-  void testLineProbe() throws Exception {
-    final String METHOD_NAME = "fullMethod";
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(LINE_PROBE_ID1)
-            .where("DebuggerTestApplication.java", 95)
-            .captureSnapshot(true)
-            .build();
-    setCurrentConfiguration(createConfig(probe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    AtomicBoolean snapshotReceived = new AtomicBoolean();
-    registerSnapshotListener(
-        snapshot -> {
-          assertEquals(LINE_PROBE_ID1.getId(), snapshot.getProbe().getId());
-          CapturedContext capturedContext = snapshot.getCaptures().getLines().get(95);
-          assertFullMethodCaptureArgs(capturedContext);
-          assertNull(capturedContext.getLocals());
-          assertNull(capturedContext.getCapturedThrowable());
-          snapshotReceived.set(true);
+    @Test
+    @DisplayName("testLineProbe")
+    void testLineProbe() throws Exception {
+        final String METHOD_NAME = "fullMethod";
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
+        LogProbe probe = LogProbe.builder()
+                .probeId(LINE_PROBE_ID1)
+                .where("DebuggerTestApplication.java", 95)
+                .captureSnapshot(true)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        AtomicBoolean snapshotReceived = new AtomicBoolean();
+        registerSnapshotListener(snapshot -> {
+            assertEquals(LINE_PROBE_ID1.getId(), snapshot.getProbe().getId());
+            CapturedContext capturedContext = snapshot.getCaptures().getLines().get(95);
+            assertFullMethodCaptureArgs(capturedContext);
+            assertNull(capturedContext.getLocals());
+            assertNull(capturedContext.getCapturedThrowable());
+            snapshotReceived.set(true);
         });
-    AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(LINE_PROBE_ID1);
-    processRequests(
-        () -> snapshotReceived.get() && statusResult.get(),
-        () ->
-            String.format(
-                "timeout snapshotReceived=%s statusResult=%s",
-                snapshotReceived.get(), statusResult.get()));
-  }
+        AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(LINE_PROBE_ID1);
+        processRequests(
+                () -> snapshotReceived.get() && statusResult.get(),
+                () -> String.format(
+                        "timeout snapshotReceived=%s statusResult=%s", snapshotReceived.get(), statusResult.get()));
+    }
 
-  @Test
-  @DisplayName("testSamplingSnapshotDefault")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testSamplingSnapshotDefault() throws Exception {
-    doSamplingSnapshot(null, MethodLocation.EXIT);
-  }
+    @Test
+    @DisplayName("testSamplingSnapshotDefault")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testSamplingSnapshotDefault() throws Exception {
+        doSamplingSnapshot(null, MethodLocation.EXIT);
+    }
 
-  @Test
-  @DisplayName("testSamplingSnapshotDefaultWithConditionAtEntry")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testSamplingSnapshotDefaultWithConditionAtEntry() throws Exception {
-    doSamplingSnapshot(
-        new ProbeCondition(DSL.when(DSL.eq(value(1), value(1))), "1 == 1"), MethodLocation.ENTRY);
-  }
+    @Test
+    @DisplayName("testSamplingSnapshotDefaultWithConditionAtEntry")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testSamplingSnapshotDefaultWithConditionAtEntry() throws Exception {
+        doSamplingSnapshot(new ProbeCondition(DSL.when(DSL.eq(value(1), value(1))), "1 == 1"), MethodLocation.ENTRY);
+    }
 
-  @Test
-  @DisplayName("testSamplingSnapshotDefaultWithConditionAtExit")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testSamplingSnapshotDefaultWithConditionAtExit() throws Exception {
-    doSamplingSnapshot(
-        new ProbeCondition(DSL.when(DSL.eq(value(1), value(1))), "1 == 1"), MethodLocation.EXIT);
-  }
+    @Test
+    @DisplayName("testSamplingSnapshotDefaultWithConditionAtExit")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testSamplingSnapshotDefaultWithConditionAtExit() throws Exception {
+        doSamplingSnapshot(new ProbeCondition(DSL.when(DSL.eq(value(1), value(1))), "1 == 1"), MethodLocation.EXIT);
+    }
 
-  private void doSamplingSnapshot(ProbeCondition probeCondition, MethodLocation evaluateAt)
-      throws Exception {
-    final int LOOP_COUNT = 1000;
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(MAIN_CLASS_NAME, "fullMethod")
-            .when(probeCondition)
-            .evaluateAt(evaluateAt)
-            .captureSnapshot(true)
-            .build();
-    setCurrentConfiguration(createConfig(probe));
-    targetProcess =
-        createProcessBuilder(
-                logFilePath, "loopingFullMethod", EXPECTED_UPLOADS, String.valueOf(LOOP_COUNT))
-            .start();
-    AtomicInteger snapshotCount = new AtomicInteger();
-    registerSnapshotListener(
-        snapshot -> {
-          snapshotCount.incrementAndGet();
+    private void doSamplingSnapshot(ProbeCondition probeCondition, MethodLocation evaluateAt) throws Exception {
+        final int LOOP_COUNT = 1000;
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, "fullMethod")
+                .when(probeCondition)
+                .evaluateAt(evaluateAt)
+                .captureSnapshot(true)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        targetProcess = createProcessBuilder(
+                        logFilePath, "loopingFullMethod", EXPECTED_UPLOADS, String.valueOf(LOOP_COUNT))
+                .start();
+        AtomicInteger snapshotCount = new AtomicInteger();
+        registerSnapshotListener(snapshot -> {
+            snapshotCount.incrementAndGet();
         });
-    processRequests(
-        () -> {
-          LOG.info("snapshots={}", snapshotCount.get());
-          return snapshotCount.get() >= 2 && snapshotCount.get() <= 20;
-        },
-        () -> String.format("timeout snapshotCount=%d", snapshotCount.get()));
-  }
+        processRequests(
+                () -> {
+                    LOG.info("snapshots={}", snapshotCount.get());
+                    return snapshotCount.get() >= 2 && snapshotCount.get() <= 20;
+                },
+                () -> String.format("timeout snapshotCount=%d", snapshotCount.get()));
+    }
 
-  @Test
-  @DisplayName("testSamplingLogDefault")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testSamplingLogDefault() throws Exception {
-    batchSize = 100;
-    final int LOOP_COUNT = 1000;
-    final String LOG_TEMPLATE = "log line {argInt} {argStr} {argDouble} {argMap} {argVar}";
-    final String EXPECTED_UPLOADS = String.valueOf(LOOP_COUNT / batchSize + 3); // +3 statuses
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(MAIN_CLASS_NAME, "fullMethod")
-            .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
-            .evaluateAt(MethodLocation.EXIT)
-            .captureSnapshot(false)
-            .build();
-    setCurrentConfiguration(createConfig(probe));
-    targetProcess =
-        createProcessBuilder(
-                logFilePath, "loopingFullMethod", EXPECTED_UPLOADS, String.valueOf(LOOP_COUNT))
-            .start();
-    AtomicInteger snapshotCount = new AtomicInteger();
-    registerSnapshotListener(
-        snapshot -> {
-          snapshotCount.incrementAndGet();
+    @Test
+    @DisplayName("testSamplingLogDefault")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testSamplingLogDefault() throws Exception {
+        batchSize = 100;
+        final int LOOP_COUNT = 1000;
+        final String LOG_TEMPLATE = "log line {argInt} {argStr} {argDouble} {argMap} {argVar}";
+        final String EXPECTED_UPLOADS = String.valueOf(LOOP_COUNT / batchSize + 3); // +3 statuses
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, "fullMethod")
+                .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
+                .evaluateAt(MethodLocation.EXIT)
+                .captureSnapshot(false)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        targetProcess = createProcessBuilder(
+                        logFilePath, "loopingFullMethod", EXPECTED_UPLOADS, String.valueOf(LOOP_COUNT))
+                .start();
+        AtomicInteger snapshotCount = new AtomicInteger();
+        registerSnapshotListener(snapshot -> {
+            snapshotCount.incrementAndGet();
         });
-    processRequests(
-        () -> {
-          LOG.info("snapshots={}", snapshotCount.get());
-          return snapshotCount.get() >= 500 && snapshotCount.get() <= 1000;
-        },
-        () -> String.format("timeout snapshotCount=%d", snapshotCount.get()));
-  }
+        processRequests(
+                () -> {
+                    LOG.info("snapshots={}", snapshotCount.get());
+                    return snapshotCount.get() >= 500 && snapshotCount.get() <= 1000;
+                },
+                () -> String.format("timeout snapshotCount=%d", snapshotCount.get()));
+    }
 
-  @Test
-  @DisplayName("testSamplingLogCustom")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testSamplingLogCustom() throws Exception {
-    final int LOOP_COUNT = 1000;
-    final String LOG_TEMPLATE = "log line {argInt} {argStr} {argDouble} {argMap} {argVar}";
-    final String EXPECTED_UPLOADS = "170";
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(MAIN_CLASS_NAME, "fullMethod")
-            .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
-            .evaluateAt(MethodLocation.EXIT)
-            .sampling(10)
-            .build();
-    setCurrentConfiguration(createConfig(probe));
-    targetProcess =
-        createProcessBuilder(
-                logFilePath, "loopingFullMethod", EXPECTED_UPLOADS, String.valueOf(LOOP_COUNT))
-            .start();
-    AtomicInteger snapshotCount = new AtomicInteger();
-    registerSnapshotListener(
-        snapshot -> {
-          snapshotCount.incrementAndGet();
+    @Test
+    @DisplayName("testSamplingLogCustom")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testSamplingLogCustom() throws Exception {
+        final int LOOP_COUNT = 1000;
+        final String LOG_TEMPLATE = "log line {argInt} {argStr} {argDouble} {argMap} {argVar}";
+        final String EXPECTED_UPLOADS = "170";
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, "fullMethod")
+                .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
+                .evaluateAt(MethodLocation.EXIT)
+                .sampling(10)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        targetProcess = createProcessBuilder(
+                        logFilePath, "loopingFullMethod", EXPECTED_UPLOADS, String.valueOf(LOOP_COUNT))
+                .start();
+        AtomicInteger snapshotCount = new AtomicInteger();
+        registerSnapshotListener(snapshot -> {
+            snapshotCount.incrementAndGet();
         });
-    processRequests(
-        () -> {
-          LOG.info("snapshots={}", snapshotCount.get());
-          return snapshotCount.get() > 0 && snapshotCount.get() < 200;
-        },
-        () -> String.format("timeout snapshotCount=%d", snapshotCount.get()));
-  }
+        processRequests(
+                () -> {
+                    LOG.info("snapshots={}", snapshotCount.get());
+                    return snapshotCount.get() > 0 && snapshotCount.get() < 200;
+                },
+                () -> String.format("timeout snapshotCount=%d", snapshotCount.get()));
+    }
 
-  @Test
-  @DisplayName("testUncaughtException")
-  void testUncaughtException() throws Exception {
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
-    final String METHOD_NAME = "exceptionMethod";
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(MAIN_CLASS_NAME, METHOD_NAME)
-            .evaluateAt(MethodLocation.EXIT)
-            .captureSnapshot(true)
-            .build();
-    setCurrentConfiguration(createConfig(probe));
-    targetProcess =
-        createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS, "uncaught").start();
-    AtomicBoolean snapshotReceived = new AtomicBoolean();
-    registerSnapshotListener(
-        snapshot -> {
-          assertEquals("123356536", snapshot.getProbe().getId());
-          CapturedContext.CapturedThrowable throwable =
-              snapshot.getCaptures().getReturn().getCapturedThrowable();
-          assertEquals("oops uncaught!", throwable.getMessage());
-          assertTrue(throwable.getStacktrace().size() > 0);
-          assertEquals(
-              "datadog.smoketest.debugger.Main.exceptionMethod",
-              throwable.getStacktrace().get(0).getFunction());
-          snapshotReceived.set(true);
+    @Test
+    @DisplayName("testUncaughtException")
+    void testUncaughtException() throws Exception {
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
+        final String METHOD_NAME = "exceptionMethod";
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, METHOD_NAME)
+                .evaluateAt(MethodLocation.EXIT)
+                .captureSnapshot(true)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS, "uncaught")
+                .start();
+        AtomicBoolean snapshotReceived = new AtomicBoolean();
+        registerSnapshotListener(snapshot -> {
+            assertEquals("123356536", snapshot.getProbe().getId());
+            CapturedContext.CapturedThrowable throwable =
+                    snapshot.getCaptures().getReturn().getCapturedThrowable();
+            assertEquals("oops uncaught!", throwable.getMessage());
+            assertTrue(throwable.getStacktrace().size() > 0);
+            assertEquals(
+                    "datadog.smoketest.debugger.Main.exceptionMethod",
+                    throwable.getStacktrace().get(0).getFunction());
+            snapshotReceived.set(true);
         });
-    processRequests(
-        snapshotReceived::get,
-        () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
-  }
+        processRequests(
+                snapshotReceived::get, () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
+    }
 
-  @Test
-  @DisplayName("testCaughtException")
-  void testCaughtException() throws Exception {
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
-    final String METHOD_NAME = "exceptionMethod";
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(MAIN_CLASS_NAME, METHOD_NAME)
-            .evaluateAt(MethodLocation.EXIT)
-            .captureSnapshot(true)
-            .build();
-    setCurrentConfiguration(createConfig(probe));
-    targetProcess =
-        createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS, "caught").start();
-    AtomicBoolean snapshotReceived = new AtomicBoolean();
-    registerSnapshotListener(
-        snapshot -> {
-          assertEquals("123356536", snapshot.getProbe().getId());
-          assertEquals(1, snapshot.getCaptures().getCaughtExceptions().size());
-          CapturedContext.CapturedThrowable throwable =
-              snapshot.getCaptures().getCaughtExceptions().get(0);
-          assertEquals("oops caught!", throwable.getMessage());
-          assertEquals(
-              "datadog.smoketest.debugger.Main.exceptionMethod",
-              throwable.getStacktrace().get(0).getFunction());
-          snapshotReceived.set(true);
+    @Test
+    @DisplayName("testCaughtException")
+    void testCaughtException() throws Exception {
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
+        final String METHOD_NAME = "exceptionMethod";
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, METHOD_NAME)
+                .evaluateAt(MethodLocation.EXIT)
+                .captureSnapshot(true)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS, "caught")
+                .start();
+        AtomicBoolean snapshotReceived = new AtomicBoolean();
+        registerSnapshotListener(snapshot -> {
+            assertEquals("123356536", snapshot.getProbe().getId());
+            assertEquals(1, snapshot.getCaptures().getCaughtExceptions().size());
+            CapturedContext.CapturedThrowable throwable =
+                    snapshot.getCaptures().getCaughtExceptions().get(0);
+            assertEquals("oops caught!", throwable.getMessage());
+            assertEquals(
+                    "datadog.smoketest.debugger.Main.exceptionMethod",
+                    throwable.getStacktrace().get(0).getFunction());
+            snapshotReceived.set(true);
         });
-    processRequests(
-        snapshotReceived::get,
-        () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
-  }
+        processRequests(
+                snapshotReceived::get, () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
+    }
 
-  @Test
-  @DisplayName("testConditionTimeout")
-  void testConditionTimeout() throws Exception {
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
-    final String METHOD_NAME = "processLargeCollection";
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(MAIN_CLASS_NAME, METHOD_NAME)
-            .evaluateAt(MethodLocation.EXIT)
-            .captureSnapshot(true)
-            .when(
-                new ProbeCondition(
-                    when(all(ref("largeList"), gt(len(ref("@it")), value(0)))),
-                    "all(largeList, {len(@it) > 0}"))
-            .build();
-    setCurrentConfiguration(createConfig(probe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    AtomicBoolean snapshotReceived = new AtomicBoolean();
-    registerSnapshotListener(
-        snapshot -> {
-          if (snapshot.getProbe().getProbeId().equals(PROBE_ID)) {
-            assertEquals(1, snapshot.getEvaluationErrors().size());
-            assertEquals("timeout (50ms)", snapshot.getEvaluationErrors().get(0).getMessage());
-            snapshotReceived.set(true);
-          }
+    @Test
+    @DisplayName("testConditionTimeout")
+    void testConditionTimeout() throws Exception {
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
+        final String METHOD_NAME = "processLargeCollection";
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, METHOD_NAME)
+                .evaluateAt(MethodLocation.EXIT)
+                .captureSnapshot(true)
+                .when(new ProbeCondition(
+                        when(all(ref("largeList"), gt(len(ref("@it")), value(0)))), "all(largeList, {len(@it) > 0}"))
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        AtomicBoolean snapshotReceived = new AtomicBoolean();
+        registerSnapshotListener(snapshot -> {
+            if (snapshot.getProbe().getProbeId().equals(PROBE_ID)) {
+                assertEquals(1, snapshot.getEvaluationErrors().size());
+                assertEquals(
+                        "timeout (50ms)", snapshot.getEvaluationErrors().get(0).getMessage());
+                snapshotReceived.set(true);
+            }
         });
-    processRequests(
-        snapshotReceived::get,
-        () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
-  }
+        processRequests(
+                snapshotReceived::get, () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
+    }
 
-  @Test
-  @DisplayName("testTemplateTimeout")
-  void testTemplateTimeout() throws Exception {
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
-    final String METHOD_NAME = "processLargeCollection";
-    final String LARGE_COLLECTION_TEMPLATE = "{filter(largeList, {len(@it) > 0})}";
-    List<LogProbe.Segment> segments =
-        singletonList(
-            new LogProbe.Segment(
-                new ValueScript(
-                    filter(ref("largeList"), gt(len(ref("@it")), value(0))),
-                    "filter(largeList, {len(@it) > 0})")));
-    LogProbe probe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(MAIN_CLASS_NAME, METHOD_NAME)
-            .evaluateAt(MethodLocation.EXIT)
-            .captureSnapshot(true)
-            .template(LARGE_COLLECTION_TEMPLATE, segments)
-            .build();
-    setCurrentConfiguration(createConfig(probe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    AtomicBoolean snapshotReceived = new AtomicBoolean();
-    registerSnapshotListener(
-        snapshot -> {
-          if (snapshot.getProbe().getProbeId().equals(PROBE_ID)) {
-            assertEquals(1, snapshot.getEvaluationErrors().size());
-            assertEquals("timeout (50ms)", snapshot.getEvaluationErrors().get(0).getMessage());
-            snapshotReceived.set(true);
-          }
+    @Test
+    @DisplayName("testTemplateTimeout")
+    void testTemplateTimeout() throws Exception {
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot
+        final String METHOD_NAME = "processLargeCollection";
+        final String LARGE_COLLECTION_TEMPLATE = "{filter(largeList, {len(@it) > 0})}";
+        List<LogProbe.Segment> segments = singletonList(new LogProbe.Segment(new ValueScript(
+                filter(ref("largeList"), gt(len(ref("@it")), value(0))), "filter(largeList, {len(@it) > 0})")));
+        LogProbe probe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, METHOD_NAME)
+                .evaluateAt(MethodLocation.EXIT)
+                .captureSnapshot(true)
+                .template(LARGE_COLLECTION_TEMPLATE, segments)
+                .build();
+        setCurrentConfiguration(createConfig(probe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        AtomicBoolean snapshotReceived = new AtomicBoolean();
+        registerSnapshotListener(snapshot -> {
+            if (snapshot.getProbe().getProbeId().equals(PROBE_ID)) {
+                assertEquals(1, snapshot.getEvaluationErrors().size());
+                assertEquals(
+                        "timeout (50ms)", snapshot.getEvaluationErrors().get(0).getMessage());
+                snapshotReceived.set(true);
+            }
         });
-    processRequests(
-        snapshotReceived::get,
-        () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
-  }
+        processRequests(
+                snapshotReceived::get, () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
+    }
 
-  private ProbeId getProbeId(int i) {
-    return new ProbeId(String.valueOf(i), 0);
-  }
+    private ProbeId getProbeId(int i) {
+        return new ProbeId(String.valueOf(i), 0);
+    }
 
-  private void assertFullMethodCaptureArgs(CapturedContext context) {
-    if (JavaVirtualMachine.isJ9()) {
-      // skip for J9/OpenJ9 as we cannot get local variable debug info.
-      return;
+    private void assertFullMethodCaptureArgs(CapturedContext context) {
+        if (JavaVirtualMachine.isJ9()) {
+            // skip for J9/OpenJ9 as we cannot get local variable debug info.
+            return;
+        }
+        assertCaptureArgs(context, "argInt", "int", "42");
+        assertCaptureArgs(context, "argStr", "java.lang.String", "foobar");
+        assertCaptureArgs(context, "argDouble", "double", "3.42");
+        assertCaptureArgs(context, "argMap", "java.util.HashMap", "{key1=val1, key2=val2, key3=val3}");
+        assertCaptureArgs(context, "argVar", "java.lang.String[]", "[var1, var2, var3]");
     }
-    assertCaptureArgs(context, "argInt", "int", "42");
-    assertCaptureArgs(context, "argStr", "java.lang.String", "foobar");
-    assertCaptureArgs(context, "argDouble", "double", "3.42");
-    assertCaptureArgs(context, "argMap", "java.util.HashMap", "{key1=val1, key2=val2, key3=val3}");
-    assertCaptureArgs(context, "argVar", "java.lang.String[]", "[var1, var2, var3]");
-  }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MetricProbesIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MetricProbesIntegrationTest.java
index dfd5150fcd4..10387732dd9 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MetricProbesIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MetricProbesIntegrationTest.java
@@ -19,208 +19,202 @@
 @NonRetryable
 public class MetricProbesIntegrationTest extends SimpleAppDebuggerIntegrationTest {
 
-  @AfterEach
-  void teardown() throws Exception {
-    processRemainingRequests();
-  }
-
-  @Test
-  @DisplayName("testMethodMetricInc")
-  void testMethodMetricInc() throws Exception {
-    doMethodMetric(
-        "incCallCount",
-        MetricProbe.MetricKind.COUNT,
-        null,
-        "dynamic.instrumentation.metric.probe.%s:1|c|#debugger.probeid:%s");
-  }
-
-  @Test
-  @DisplayName("testMethodMetricCount")
-  void testMethodMetricCount() throws Exception {
-    doMethodMetric(
-        "fullMethod_count",
-        MetricProbe.MetricKind.COUNT,
-        new ValueScript(DSL.ref("argInt"), "argInt"),
-        "dynamic.instrumentation.metric.probe.%s:42|c|#debugger.probeid:%s");
-  }
-
-  @Test
-  @DisplayName("testMethodMetricCountInvalidSymbol")
-  void testMethodMetricCountInvalidSymbol() throws Exception {
-    doMethodInvalidMetric(
-        "fullMethod_count",
-        MetricProbe.MetricKind.COUNT,
-        new ValueScript(DSL.ref("noarg"), "noarg"),
-        "Cannot resolve symbol noarg");
-  }
-
-  @Test
-  @DisplayName("testMethodMetricCountInvalidType")
-  void testMethodMetricCountInvalidType() throws Exception {
-    doMethodInvalidMetric(
-        "fullMethod_count",
-        MetricProbe.MetricKind.COUNT,
-        new ValueScript(DSL.ref("argStr"), "argStr"),
-        "Incompatible type for expression: java.lang.String with expected types: [long]");
-  }
-
-  @Test
-  @DisplayName("testMethodMetricGauge")
-  void testMethodMetricGauge() throws Exception {
-    doMethodMetric(
-        "fullMethod_gauge",
-        MetricProbe.MetricKind.GAUGE,
-        new ValueScript(DSL.ref("argInt"), "argInt"),
-        "dynamic.instrumentation.metric.probe.%s:42|g|#debugger.probeid:%s");
-  }
-
-  @Test
-  @DisplayName("testMethodMetricHistogram")
-  void testMethodMetricHistogram() throws Exception {
-    doMethodMetric(
-        "fullMethod_histogram",
-        MetricProbe.MetricKind.HISTOGRAM,
-        new ValueScript(DSL.ref("argInt"), "argInt"),
-        "dynamic.instrumentation.metric.probe.%s:42|h|#debugger.probeid:%s");
-  }
-
-  @Test
-  @DisplayName("testMethodMetricDistribution")
-  void testMethodMetricDistribution() throws Exception {
-    doMethodMetric(
-        "fullMethod_distribution",
-        MetricProbe.MetricKind.DISTRIBUTION,
-        new ValueScript(DSL.ref("argInt"), "argInt"),
-        "dynamic.instrumentation.metric.probe.%s:42|d|#debugger.probeid:%s");
-  }
-
-  private void doMethodMetric(
-      String metricName, MetricProbe.MetricKind kind, ValueScript script, String expectedMsgFormat)
-      throws IOException, InterruptedException {
-    final String METHOD_NAME = "fullMethod";
-    final String EXPECTED_UPLOADS =
-        "-1"; // wait for TIMEOUT_S for letting the metric being sent (async)
-    MetricProbe metricProbe =
-        MetricProbe.builder()
-            .probeId(PROBE_ID)
-            .where(MAIN_CLASS_NAME, METHOD_NAME)
-            .kind(kind)
-            .metricName(metricName)
-            .valueScript(script)
-            .build();
-    setCurrentConfiguration(createMetricConfig(metricProbe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    String msgExpected = String.format(expectedMsgFormat, metricName, PROBE_ID.getId());
-    assertNotNull(retrieveStatsdMessage(msgExpected));
-    AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
-    processRequests(
-        statusResult::get, () -> String.format("timeout statusResult=%s", statusResult.get()));
-  }
-
-  private void doMethodInvalidMetric(
-      String metricName, MetricProbe.MetricKind kind, ValueScript script, String expectedMsg)
-      throws Exception {
-    final String METHOD_NAME = "fullMethod";
-    final String EXPECTED_UPLOADS =
-        "-1"; // wait for TIMEOUT_S for letting the Probe Status to be sent (async)
-    MetricProbe metricProbe =
-        MetricProbe.builder()
-            .probeId(PROBE_ID)
-            .where(MAIN_CLASS_NAME, METHOD_NAME)
-            .kind(kind)
-            .metricName(metricName)
-            .valueScript(script)
-            .build();
-    setCurrentConfiguration(createMetricConfig(metricProbe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    AtomicBoolean received = new AtomicBoolean();
-    AtomicBoolean error = new AtomicBoolean();
-    registerProbeStatusListener(
-        probeStatus -> {
-          if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.RECEIVED) {
-            received.set(true);
-          }
-          if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.ERROR) {
-            assertEquals(expectedMsg, probeStatus.getDiagnostics().getException().getMessage());
-            error.set(true);
-          }
+    @AfterEach
+    void teardown() throws Exception {
+        processRemainingRequests();
+    }
+
+    @Test
+    @DisplayName("testMethodMetricInc")
+    void testMethodMetricInc() throws Exception {
+        doMethodMetric(
+                "incCallCount",
+                MetricProbe.MetricKind.COUNT,
+                null,
+                "dynamic.instrumentation.metric.probe.%s:1|c|#debugger.probeid:%s");
+    }
+
+    @Test
+    @DisplayName("testMethodMetricCount")
+    void testMethodMetricCount() throws Exception {
+        doMethodMetric(
+                "fullMethod_count",
+                MetricProbe.MetricKind.COUNT,
+                new ValueScript(DSL.ref("argInt"), "argInt"),
+                "dynamic.instrumentation.metric.probe.%s:42|c|#debugger.probeid:%s");
+    }
+
+    @Test
+    @DisplayName("testMethodMetricCountInvalidSymbol")
+    void testMethodMetricCountInvalidSymbol() throws Exception {
+        doMethodInvalidMetric(
+                "fullMethod_count",
+                MetricProbe.MetricKind.COUNT,
+                new ValueScript(DSL.ref("noarg"), "noarg"),
+                "Cannot resolve symbol noarg");
+    }
+
+    @Test
+    @DisplayName("testMethodMetricCountInvalidType")
+    void testMethodMetricCountInvalidType() throws Exception {
+        doMethodInvalidMetric(
+                "fullMethod_count",
+                MetricProbe.MetricKind.COUNT,
+                new ValueScript(DSL.ref("argStr"), "argStr"),
+                "Incompatible type for expression: java.lang.String with expected types: [long]");
+    }
+
+    @Test
+    @DisplayName("testMethodMetricGauge")
+    void testMethodMetricGauge() throws Exception {
+        doMethodMetric(
+                "fullMethod_gauge",
+                MetricProbe.MetricKind.GAUGE,
+                new ValueScript(DSL.ref("argInt"), "argInt"),
+                "dynamic.instrumentation.metric.probe.%s:42|g|#debugger.probeid:%s");
+    }
+
+    @Test
+    @DisplayName("testMethodMetricHistogram")
+    void testMethodMetricHistogram() throws Exception {
+        doMethodMetric(
+                "fullMethod_histogram",
+                MetricProbe.MetricKind.HISTOGRAM,
+                new ValueScript(DSL.ref("argInt"), "argInt"),
+                "dynamic.instrumentation.metric.probe.%s:42|h|#debugger.probeid:%s");
+    }
+
+    @Test
+    @DisplayName("testMethodMetricDistribution")
+    void testMethodMetricDistribution() throws Exception {
+        doMethodMetric(
+                "fullMethod_distribution",
+                MetricProbe.MetricKind.DISTRIBUTION,
+                new ValueScript(DSL.ref("argInt"), "argInt"),
+                "dynamic.instrumentation.metric.probe.%s:42|d|#debugger.probeid:%s");
+    }
+
+    private void doMethodMetric(
+            String metricName, MetricProbe.MetricKind kind, ValueScript script, String expectedMsgFormat)
+            throws IOException, InterruptedException {
+        final String METHOD_NAME = "fullMethod";
+        final String EXPECTED_UPLOADS = "-1"; // wait for TIMEOUT_S for letting the metric being sent (async)
+        MetricProbe metricProbe = MetricProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, METHOD_NAME)
+                .kind(kind)
+                .metricName(metricName)
+                .valueScript(script)
+                .build();
+        setCurrentConfiguration(createMetricConfig(metricProbe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        String msgExpected = String.format(expectedMsgFormat, metricName, PROBE_ID.getId());
+        assertNotNull(retrieveStatsdMessage(msgExpected));
+        AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
+        processRequests(statusResult::get, () -> String.format("timeout statusResult=%s", statusResult.get()));
+    }
+
+    private void doMethodInvalidMetric(
+            String metricName, MetricProbe.MetricKind kind, ValueScript script, String expectedMsg) throws Exception {
+        final String METHOD_NAME = "fullMethod";
+        final String EXPECTED_UPLOADS = "-1"; // wait for TIMEOUT_S for letting the Probe Status to be sent (async)
+        MetricProbe metricProbe = MetricProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, METHOD_NAME)
+                .kind(kind)
+                .metricName(metricName)
+                .valueScript(script)
+                .build();
+        setCurrentConfiguration(createMetricConfig(metricProbe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        AtomicBoolean received = new AtomicBoolean();
+        AtomicBoolean error = new AtomicBoolean();
+        registerProbeStatusListener(probeStatus -> {
+            if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.RECEIVED) {
+                received.set(true);
+            }
+            if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.ERROR) {
+                assertEquals(
+                        expectedMsg, probeStatus.getDiagnostics().getException().getMessage());
+                error.set(true);
+            }
         });
-    processRequests(
-        () -> received.get() && error.get(),
-        () -> String.format("timeout received=%s error=%s", received.get(), error.get()));
-  }
-
-  @Test
-  @DisplayName("testLineMetricInc")
-  void testLineMetricInc() throws Exception {
-    doLineMetric(
-        "fullMethod_incCallCount",
-        MetricProbe.MetricKind.COUNT,
-        null,
-        "dynamic.instrumentation.metric.probe.%s:1|c|#debugger.probeid:%s");
-  }
-
-  @Test
-  @DisplayName("testLineMetricCount")
-  void testLineMetricCount() throws Exception {
-    doLineMetric(
-        "fullMethod_count",
-        MetricProbe.MetricKind.COUNT,
-        new ValueScript(DSL.ref("argInt"), "argInt"),
-        "dynamic.instrumentation.metric.probe.%s:42|c|#debugger.probeid:%s");
-  }
-
-  @Test
-  @DisplayName("testLineMetricGauge")
-  void testLineMetricGauge() throws Exception {
-    doLineMetric(
-        "fullMethod_gauge",
-        MetricProbe.MetricKind.GAUGE,
-        new ValueScript(DSL.ref("argInt"), "argInt"),
-        "dynamic.instrumentation.metric.probe.%s:42|g|#debugger.probeid:%s");
-  }
-
-  @Test
-  @DisplayName("testLineMetricHistogram")
-  void testLineMetricHistogram() throws Exception {
-    doLineMetric(
-        "fullMethod_histogram",
-        MetricProbe.MetricKind.HISTOGRAM,
-        new ValueScript(DSL.ref("argInt"), "argInt"),
-        "dynamic.instrumentation.metric.probe.%s:42|h|#debugger.probeid:%s");
-  }
-
-  @Test
-  @DisplayName("testLineMetricDistribution")
-  void testLineMetricDistribution() throws Exception {
-    doLineMetric(
-        "fullMethod_distribution",
-        MetricProbe.MetricKind.DISTRIBUTION,
-        new ValueScript(DSL.ref("argInt"), "argInt"),
-        "dynamic.instrumentation.metric.probe.%s:42|d|#debugger.probeid:%s");
-  }
-
-  private void doLineMetric(
-      String metricName, MetricProbe.MetricKind kind, ValueScript script, String expectedMsgFormat)
-      throws IOException, InterruptedException {
-    final String METHOD_NAME = "fullMethod";
-    final String EXPECTED_UPLOADS =
-        "-1"; // wait for TIMEOUT_S for letting the metric being sent (async)
-    MetricProbe metricProbe =
-        MetricProbe.builder()
-            .probeId(PROBE_ID)
-            // on line: System.out.println("fullMethod");
-            .where("DebuggerTestApplication.java", 95)
-            .kind(kind)
-            .metricName(metricName)
-            .valueScript(script)
-            .build();
-    setCurrentConfiguration(createMetricConfig(metricProbe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    String msgExpected = String.format(expectedMsgFormat, metricName, PROBE_ID.getId());
-    assertNotNull(retrieveStatsdMessage(msgExpected));
-    AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
-    processRequests(
-        statusResult::get, () -> String.format("timeout statusResult=%s", statusResult.get()));
-  }
+        processRequests(
+                () -> received.get() && error.get(),
+                () -> String.format("timeout received=%s error=%s", received.get(), error.get()));
+    }
+
+    @Test
+    @DisplayName("testLineMetricInc")
+    void testLineMetricInc() throws Exception {
+        doLineMetric(
+                "fullMethod_incCallCount",
+                MetricProbe.MetricKind.COUNT,
+                null,
+                "dynamic.instrumentation.metric.probe.%s:1|c|#debugger.probeid:%s");
+    }
+
+    @Test
+    @DisplayName("testLineMetricCount")
+    void testLineMetricCount() throws Exception {
+        doLineMetric(
+                "fullMethod_count",
+                MetricProbe.MetricKind.COUNT,
+                new ValueScript(DSL.ref("argInt"), "argInt"),
+                "dynamic.instrumentation.metric.probe.%s:42|c|#debugger.probeid:%s");
+    }
+
+    @Test
+    @DisplayName("testLineMetricGauge")
+    void testLineMetricGauge() throws Exception {
+        doLineMetric(
+                "fullMethod_gauge",
+                MetricProbe.MetricKind.GAUGE,
+                new ValueScript(DSL.ref("argInt"), "argInt"),
+                "dynamic.instrumentation.metric.probe.%s:42|g|#debugger.probeid:%s");
+    }
+
+    @Test
+    @DisplayName("testLineMetricHistogram")
+    void testLineMetricHistogram() throws Exception {
+        doLineMetric(
+                "fullMethod_histogram",
+                MetricProbe.MetricKind.HISTOGRAM,
+                new ValueScript(DSL.ref("argInt"), "argInt"),
+                "dynamic.instrumentation.metric.probe.%s:42|h|#debugger.probeid:%s");
+    }
+
+    @Test
+    @DisplayName("testLineMetricDistribution")
+    void testLineMetricDistribution() throws Exception {
+        doLineMetric(
+                "fullMethod_distribution",
+                MetricProbe.MetricKind.DISTRIBUTION,
+                new ValueScript(DSL.ref("argInt"), "argInt"),
+                "dynamic.instrumentation.metric.probe.%s:42|d|#debugger.probeid:%s");
+    }
+
+    private void doLineMetric(
+            String metricName, MetricProbe.MetricKind kind, ValueScript script, String expectedMsgFormat)
+            throws IOException, InterruptedException {
+        final String METHOD_NAME = "fullMethod";
+        final String EXPECTED_UPLOADS = "-1"; // wait for TIMEOUT_S for letting the metric being sent (async)
+        MetricProbe metricProbe = MetricProbe.builder()
+                .probeId(PROBE_ID)
+                // on line: System.out.println("fullMethod");
+                .where("DebuggerTestApplication.java", 95)
+                .kind(kind)
+                .metricName(metricName)
+                .valueScript(script)
+                .build();
+        setCurrentConfiguration(createMetricConfig(metricProbe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        String msgExpected = String.format(expectedMsgFormat, metricName, PROBE_ID.getId());
+        assertNotNull(retrieveStatsdMessage(msgExpected));
+        AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
+        processRequests(statusResult::get, () -> String.format("timeout statusResult=%s", statusResult.get()));
+    }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MoshiConfigTestHelper.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MoshiConfigTestHelper.java
index 23eb7f6fb17..8fadf7b0e19 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MoshiConfigTestHelper.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MoshiConfigTestHelper.java
@@ -46,312 +46,311 @@
 import org.slf4j.LoggerFactory;
 
 public class MoshiConfigTestHelper {
-  public static Moshi createMoshiConfig() {
-    ProbeCondition.ProbeConditionJsonAdapter probeConditionJsonAdapter =
-        new ProbeConditionJsonAdapter();
-    return new Moshi.Builder()
-        .add(ProbeCondition.class, probeConditionJsonAdapter)
-        .add(DebuggerScript.class, probeConditionJsonAdapter)
-        .add(ValueScript.class, new ValueScript.ValueScriptAdapter())
-        .add(LogProbe.Segment.class, new LogProbe.Segment.SegmentJsonAdapter())
-        .add(Where.SourceLine[].class, new Where.SourceLineAdapter())
-        .add(ProbeDefinition.Tag[].class, new ProbeDefinition.TagAdapter())
-        .build();
-  }
-
-  private static class ProbeConditionJsonAdapter extends ProbeCondition.ProbeConditionJsonAdapter {
-    @Override
-    public void toJson(@Nonnull JsonWriter jsonWriter, ProbeCondition value) throws IOException {
-      if (value == null) {
-        jsonWriter.nullValue();
-        return;
-      }
-      jsonWriter.beginObject();
-      jsonWriter.name("dsl");
-      jsonWriter.value(value.getDslExpression());
-      jsonWriter.name("json");
-      (new JsonConditionVisitor(jsonWriter)).visit(value.getWhen());
-      jsonWriter.endObject();
+    public static Moshi createMoshiConfig() {
+        ProbeCondition.ProbeConditionJsonAdapter probeConditionJsonAdapter = new ProbeConditionJsonAdapter();
+        return new Moshi.Builder()
+                .add(ProbeCondition.class, probeConditionJsonAdapter)
+                .add(DebuggerScript.class, probeConditionJsonAdapter)
+                .add(ValueScript.class, new ValueScript.ValueScriptAdapter())
+                .add(LogProbe.Segment.class, new LogProbe.Segment.SegmentJsonAdapter())
+                .add(Where.SourceLine[].class, new Where.SourceLineAdapter())
+                .add(ProbeDefinition.Tag[].class, new ProbeDefinition.TagAdapter())
+                .build();
+    }
+
+    private static class ProbeConditionJsonAdapter extends ProbeCondition.ProbeConditionJsonAdapter {
+        @Override
+        public void toJson(@Nonnull JsonWriter jsonWriter, ProbeCondition value) throws IOException {
+            if (value == null) {
+                jsonWriter.nullValue();
+                return;
+            }
+            jsonWriter.beginObject();
+            jsonWriter.name("dsl");
+            jsonWriter.value(value.getDslExpression());
+            jsonWriter.name("json");
+            (new JsonConditionVisitor(jsonWriter)).visit(value.getWhen());
+            jsonWriter.endObject();
+        }
     }
-  }
 
-  private static class JsonConditionVisitor implements Visitor<Void> {
-    private static final Logger LOGGER = LoggerFactory.getLogger(JsonConditionVisitor.class);
+    private static class JsonConditionVisitor implements Visitor<Void> {
+        private static final Logger LOGGER = LoggerFactory.getLogger(JsonConditionVisitor.class);
 
-    private final JsonWriter jsonWriter;
+        private final JsonWriter jsonWriter;
 
-    public JsonConditionVisitor(JsonWriter jsonWriter) {
-      this.jsonWriter = jsonWriter;
-    }
+        public JsonConditionVisitor(JsonWriter jsonWriter) {
+            this.jsonWriter = jsonWriter;
+        }
 
-    @Override
-    public Void visit(BinaryExpression binaryExpression) {
-      try {
-        jsonWriter.beginObject();
-        binaryExpression.getOperator().accept(this);
-        jsonWriter.beginArray();
-        binaryExpression.getLeft().accept(this);
-        binaryExpression.getRight().accept(this);
-        jsonWriter.endArray();
-        jsonWriter.endObject();
-      } catch (IOException ex) {
-        LOGGER.debug("Cannot serialize: ", ex);
-      }
-      return null;
-    }
+        @Override
+        public Void visit(BinaryExpression binaryExpression) {
+            try {
+                jsonWriter.beginObject();
+                binaryExpression.getOperator().accept(this);
+                jsonWriter.beginArray();
+                binaryExpression.getLeft().accept(this);
+                binaryExpression.getRight().accept(this);
+                jsonWriter.endArray();
+                jsonWriter.endObject();
+            } catch (IOException ex) {
+                LOGGER.debug("Cannot serialize: ", ex);
+            }
+            return null;
+        }
 
-    @Override
-    public Void visit(BinaryOperator operator) {
-      try {
-        jsonWriter.name(operator.name().toLowerCase());
-      } catch (IOException ex) {
-        LOGGER.debug("Cannot serialize: ", ex);
-      }
-      return null;
-    }
+        @Override
+        public Void visit(BinaryOperator operator) {
+            try {
+                jsonWriter.name(operator.name().toLowerCase());
+            } catch (IOException ex) {
+                LOGGER.debug("Cannot serialize: ", ex);
+            }
+            return null;
+        }
 
-    @Override
-    public Void visit(ComparisonExpression comparisonExpression) {
-      try {
-        jsonWriter.beginObject();
-        comparisonExpression.getOperator().accept(this);
-        jsonWriter.beginArray();
-        comparisonExpression.getLeft().accept(this);
-        comparisonExpression.getRight().accept(this);
-        jsonWriter.endArray();
-        jsonWriter.endObject();
-      } catch (IOException ex) {
-        LOGGER.debug("Cannot serialize: ", ex);
-      }
-      return null;
-    }
+        @Override
+        public Void visit(ComparisonExpression comparisonExpression) {
+            try {
+                jsonWriter.beginObject();
+                comparisonExpression.getOperator().accept(this);
+                jsonWriter.beginArray();
+                comparisonExpression.getLeft().accept(this);
+                comparisonExpression.getRight().accept(this);
+                jsonWriter.endArray();
+                jsonWriter.endObject();
+            } catch (IOException ex) {
+                LOGGER.debug("Cannot serialize: ", ex);
+            }
+            return null;
+        }
 
-    @Override
-    public Void visit(ComparisonOperator operator) {
-      try {
-        jsonWriter.name(operator.name().toLowerCase());
-      } catch (IOException ex) {
-        LOGGER.debug("Cannot serialize: ", ex);
-      }
-      return null;
-    }
+        @Override
+        public Void visit(ComparisonOperator operator) {
+            try {
+                jsonWriter.name(operator.name().toLowerCase());
+            } catch (IOException ex) {
+                LOGGER.debug("Cannot serialize: ", ex);
+            }
+            return null;
+        }
 
-    @Override
-    public Void visit(ContainsExpression containsExpression) {
-      throw new UnsupportedOperationException("contains expression");
-    }
+        @Override
+        public Void visit(ContainsExpression containsExpression) {
+            throw new UnsupportedOperationException("contains expression");
+        }
 
-    @Override
-    public Void visit(EndsWithExpression endsWithExpression) {
-      throw new UnsupportedOperationException("endsWith expression");
-    }
+        @Override
+        public Void visit(EndsWithExpression endsWithExpression) {
+            throw new UnsupportedOperationException("endsWith expression");
+        }
 
-    @Override
-    public Void visit(FilterCollectionExpression filterCollectionExpression) {
-      throw new UnsupportedOperationException("filter expression");
-    }
+        @Override
+        public Void visit(FilterCollectionExpression filterCollectionExpression) {
+            throw new UnsupportedOperationException("filter expression");
+        }
 
-    @Override
-    public Void visit(HasAllExpression hasAllExpression) {
-      try {
-        jsonWriter.beginObject();
-        jsonWriter.name("all");
-        jsonWriter.beginArray();
-        hasAllExpression.getValueExpression().accept(this);
-        // jsonWriter.beginObject();
-        hasAllExpression.getFilterPredicateExpression().accept(this);
-        // jsonWriter.endObject();
-        jsonWriter.endArray();
-        jsonWriter.endObject();
-      } catch (IOException ex) {
-        LOGGER.debug("Cannot serialize: ", ex);
-      }
-      return null;
-    }
+        @Override
+        public Void visit(HasAllExpression hasAllExpression) {
+            try {
+                jsonWriter.beginObject();
+                jsonWriter.name("all");
+                jsonWriter.beginArray();
+                hasAllExpression.getValueExpression().accept(this);
+                // jsonWriter.beginObject();
+                hasAllExpression.getFilterPredicateExpression().accept(this);
+                // jsonWriter.endObject();
+                jsonWriter.endArray();
+                jsonWriter.endObject();
+            } catch (IOException ex) {
+                LOGGER.debug("Cannot serialize: ", ex);
+            }
+            return null;
+        }
 
-    @Override
-    public Void visit(HasAnyExpression hasAnyExpression) {
-      throw new UnsupportedOperationException("hasAny expression");
-    }
+        @Override
+        public Void visit(HasAnyExpression hasAnyExpression) {
+            throw new UnsupportedOperationException("hasAny expression");
+        }
 
-    @Override
-    public Void visit(IfElseExpression ifElseExpression) {
-      throw new UnsupportedOperationException("ifElse expression");
-    }
+        @Override
+        public Void visit(IfElseExpression ifElseExpression) {
+            throw new UnsupportedOperationException("ifElse expression");
+        }
 
-    @Override
-    public Void visit(IfExpression ifExpression) {
-      throw new UnsupportedOperationException("if expression");
-    }
+        @Override
+        public Void visit(IfExpression ifExpression) {
+            throw new UnsupportedOperationException("if expression");
+        }
 
-    @Override
-    public Void visit(IsEmptyExpression isEmptyExpression) {
-      throw new UnsupportedOperationException("isEmpty expression");
-    }
+        @Override
+        public Void visit(IsEmptyExpression isEmptyExpression) {
+            throw new UnsupportedOperationException("isEmpty expression");
+        }
 
-    @Override
-    public Void visit(IsDefinedExpression isDefinedExpression) {
-      throw new UnsupportedOperationException("isDefined expression");
-    }
+        @Override
+        public Void visit(IsDefinedExpression isDefinedExpression) {
+            throw new UnsupportedOperationException("isDefined expression");
+        }
 
-    @Override
-    public Void visit(LenExpression lenExpression) {
-      try {
-        jsonWriter.beginObject();
-        jsonWriter.name("len");
-        lenExpression.getSource().accept(this);
-        jsonWriter.endObject();
-      } catch (IOException ex) {
-        LOGGER.debug("Cannot serialize: ", ex);
-      }
-      return null;
-    }
+        @Override
+        public Void visit(LenExpression lenExpression) {
+            try {
+                jsonWriter.beginObject();
+                jsonWriter.name("len");
+                lenExpression.getSource().accept(this);
+                jsonWriter.endObject();
+            } catch (IOException ex) {
+                LOGGER.debug("Cannot serialize: ", ex);
+            }
+            return null;
+        }
 
-    @Override
-    public Void visit(MatchesExpression matchesExpression) {
-      throw new UnsupportedOperationException("matches expression");
-    }
+        @Override
+        public Void visit(MatchesExpression matchesExpression) {
+            throw new UnsupportedOperationException("matches expression");
+        }
 
-    @Override
-    public Void visit(NotExpression notExpression) {
-      try {
-        jsonWriter.beginObject();
-        jsonWriter.name("not");
-        notExpression.getPredicate().accept(this);
-        jsonWriter.endObject();
-      } catch (IOException ex) {
-        LOGGER.debug("Cannot serialize: ", ex);
-      }
-      return null;
-    }
+        @Override
+        public Void visit(NotExpression notExpression) {
+            try {
+                jsonWriter.beginObject();
+                jsonWriter.name("not");
+                notExpression.getPredicate().accept(this);
+                jsonWriter.endObject();
+            } catch (IOException ex) {
+                LOGGER.debug("Cannot serialize: ", ex);
+            }
+            return null;
+        }
 
-    @Override
-    public Void visit(StartsWithExpression startsWithExpression) {
-      throw new UnsupportedOperationException("startsWith expression");
-    }
+        @Override
+        public Void visit(StartsWithExpression startsWithExpression) {
+            throw new UnsupportedOperationException("startsWith expression");
+        }
 
-    @Override
-    public Void visit(SubStringExpression subStringExpression) {
-      throw new UnsupportedOperationException("subString expression");
-    }
+        @Override
+        public Void visit(SubStringExpression subStringExpression) {
+            throw new UnsupportedOperationException("subString expression");
+        }
 
-    @Override
-    public Void visit(ValueRefExpression valueRefExpression) {
-      try {
-        jsonWriter.beginObject();
-        jsonWriter.name("ref");
-        jsonWriter.value(valueRefExpression.getSymbolName());
-        jsonWriter.endObject();
-      } catch (IOException ex) {
-        LOGGER.debug("Cannot serialize: ", ex);
-      }
-      return null;
-    }
+        @Override
+        public Void visit(ValueRefExpression valueRefExpression) {
+            try {
+                jsonWriter.beginObject();
+                jsonWriter.name("ref");
+                jsonWriter.value(valueRefExpression.getSymbolName());
+                jsonWriter.endObject();
+            } catch (IOException ex) {
+                LOGGER.debug("Cannot serialize: ", ex);
+            }
+            return null;
+        }
 
-    @Override
-    public Void visit(GetMemberExpression getMemberExpression) {
-      try {
-        jsonWriter.beginObject();
-        jsonWriter.name("getmember");
-        jsonWriter.beginArray();
-        getMemberExpression.getTarget().accept(this);
-        jsonWriter.value(getMemberExpression.getMemberName());
-        jsonWriter.endArray();
-        jsonWriter.endObject();
-      } catch (IOException ex) {
-        LOGGER.debug("Cannot serialize: ", ex);
-      }
-      return null;
-    }
+        @Override
+        public Void visit(GetMemberExpression getMemberExpression) {
+            try {
+                jsonWriter.beginObject();
+                jsonWriter.name("getmember");
+                jsonWriter.beginArray();
+                getMemberExpression.getTarget().accept(this);
+                jsonWriter.value(getMemberExpression.getMemberName());
+                jsonWriter.endArray();
+                jsonWriter.endObject();
+            } catch (IOException ex) {
+                LOGGER.debug("Cannot serialize: ", ex);
+            }
+            return null;
+        }
 
-    @Override
-    public Void visit(IndexExpression indexExpression) {
-      try {
-        jsonWriter.beginObject();
-        jsonWriter.name("index");
-        jsonWriter.beginArray();
-        indexExpression.getTarget().accept(this);
-        indexExpression.getKey().accept(this);
-        jsonWriter.endArray();
-        jsonWriter.endObject();
-      } catch (IOException ex) {
-        LOGGER.debug("Cannot serialize: ", ex);
-      }
-      return null;
-    }
+        @Override
+        public Void visit(IndexExpression indexExpression) {
+            try {
+                jsonWriter.beginObject();
+                jsonWriter.name("index");
+                jsonWriter.beginArray();
+                indexExpression.getTarget().accept(this);
+                indexExpression.getKey().accept(this);
+                jsonWriter.endArray();
+                jsonWriter.endObject();
+            } catch (IOException ex) {
+                LOGGER.debug("Cannot serialize: ", ex);
+            }
+            return null;
+        }
 
-    @Override
-    public Void visit(WhenExpression whenExpression) {
-      whenExpression.getExpression().accept(this);
-      return null;
-    }
+        @Override
+        public Void visit(WhenExpression whenExpression) {
+            whenExpression.getExpression().accept(this);
+            return null;
+        }
 
-    @Override
-    public Void visit(BooleanExpression booleanExpression) {
-      throw new UnsupportedOperationException("boolean expression");
-    }
+        @Override
+        public Void visit(BooleanExpression booleanExpression) {
+            throw new UnsupportedOperationException("boolean expression");
+        }
 
-    @Override
-    public Void visit(ObjectValue objectValue) {
-      throw new UnsupportedOperationException("objectValue");
-    }
+        @Override
+        public Void visit(ObjectValue objectValue) {
+            throw new UnsupportedOperationException("objectValue");
+        }
 
-    @Override
-    public Void visit(StringValue stringValue) {
-      try {
-        jsonWriter.jsonValue(stringValue.getValue());
-      } catch (IOException ex) {
-        LOGGER.debug("Cannot serialize: ", ex);
-      }
-      return null;
-    }
+        @Override
+        public Void visit(StringValue stringValue) {
+            try {
+                jsonWriter.jsonValue(stringValue.getValue());
+            } catch (IOException ex) {
+                LOGGER.debug("Cannot serialize: ", ex);
+            }
+            return null;
+        }
 
-    @Override
-    public Void visit(NumericValue numericValue) {
-      try {
-        Number widenValue = numericValue.getWidenValue();
-        if (widenValue instanceof Long) {
-          jsonWriter.value(widenValue.longValue());
-        } else if (widenValue instanceof Double) {
-          jsonWriter.value(widenValue.doubleValue());
-        } else {
-          throw new UnsupportedOperationException(
-              "numeric value unsupported:" + numericValue.getValue().getClass());
-        }
-      } catch (IOException ex) {
-        LOGGER.debug("Cannot serialize: ", ex);
-      }
-      return null;
-    }
+        @Override
+        public Void visit(NumericValue numericValue) {
+            try {
+                Number widenValue = numericValue.getWidenValue();
+                if (widenValue instanceof Long) {
+                    jsonWriter.value(widenValue.longValue());
+                } else if (widenValue instanceof Double) {
+                    jsonWriter.value(widenValue.doubleValue());
+                } else {
+                    throw new UnsupportedOperationException("numeric value unsupported:"
+                            + numericValue.getValue().getClass());
+                }
+            } catch (IOException ex) {
+                LOGGER.debug("Cannot serialize: ", ex);
+            }
+            return null;
+        }
 
-    @Override
-    public Void visit(BooleanValue booleanValue) {
-      throw new UnsupportedOperationException("booleanValue");
-    }
+        @Override
+        public Void visit(BooleanValue booleanValue) {
+            throw new UnsupportedOperationException("booleanValue");
+        }
 
-    @Override
-    public Void visit(NullValue nullValue) {
-      try {
-        jsonWriter.nullValue();
-      } catch (IOException ex) {
-        LOGGER.debug("Cannot serialize: ", ex);
-      }
-      return null;
-    }
+        @Override
+        public Void visit(NullValue nullValue) {
+            try {
+                jsonWriter.nullValue();
+            } catch (IOException ex) {
+                LOGGER.debug("Cannot serialize: ", ex);
+            }
+            return null;
+        }
 
-    @Override
-    public Void visit(ListValue listValue) {
-      throw new UnsupportedOperationException("listValue");
-    }
+        @Override
+        public Void visit(ListValue listValue) {
+            throw new UnsupportedOperationException("listValue");
+        }
 
-    @Override
-    public Void visit(MapValue mapValue) {
-      throw new UnsupportedOperationException("mapValue");
-    }
+        @Override
+        public Void visit(MapValue mapValue) {
+            throw new UnsupportedOperationException("mapValue");
+        }
 
-    @Override
-    public Void visit(SetValue setValue) {
-      throw new UnsupportedOperationException("setValue");
+        @Override
+        public Void visit(SetValue setValue) {
+            throw new UnsupportedOperationException("setValue");
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeFileIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeFileIntegrationTest.java
index 3fb17608915..feecea8ad91 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeFileIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeFileIntegrationTest.java
@@ -16,68 +16,62 @@
 import org.junit.jupiter.api.condition.DisabledIf;
 
 public class ProbeFileIntegrationTest extends ServerAppDebuggerIntegrationTest {
-  private static final ProbeId PROBE_ID2 = new ProbeId("ad4cba6f-d476-4554-b5ed-80dd941a40d8", 0);
-  private static final ProbeId PROBE_ID3 = new ProbeId("70b55d06-f9fa-403b-a329-4f2f960aed01", 0);
-  private static final ProbeId PROBE_ID4 = new ProbeId("123356537", 0);
+    private static final ProbeId PROBE_ID2 = new ProbeId("ad4cba6f-d476-4554-b5ed-80dd941a40d8", 0);
+    private static final ProbeId PROBE_ID3 = new ProbeId("70b55d06-f9fa-403b-a329-4f2f960aed01", 0);
+    private static final ProbeId PROBE_ID4 = new ProbeId("123356537", 0);
 
-  Path probeFilePath;
+    Path probeFilePath;
 
-  @BeforeEach
-  @Override
-  public void setup(TestInfo testInfo) throws Exception {
-    super.setup(testInfo);
-    probeFilePath =
-        Paths.get(ProbeFileIntegrationTest.class.getResource("/test_probe_file.json").toURI());
-    appUrl = startAppAndAndGetUrl();
-  }
+    @BeforeEach
+    @Override
+    public void setup(TestInfo testInfo) throws Exception {
+        super.setup(testInfo);
+        probeFilePath = Paths.get(ProbeFileIntegrationTest.class
+                .getResource("/test_probe_file.json")
+                .toURI());
+        appUrl = startAppAndAndGetUrl();
+    }
 
-  @Override
-  protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
-    List<String> commandParams = getDebuggerCommandParams();
-    commandParams.add("-Ddd.trace.enabled=true"); // explicitly enable tracer
-    commandParams.add("-Ddd.dynamic.instrumentation.probe.file=" + probeFilePath.toString());
-    // increase eval timeout for decoration evaluations
-    commandParams.add("-Ddd.dynamic.instrumentation.evaluation.timeout.ms=100");
-    return ProcessBuilderHelper.createProcessBuilder(
-        commandParams, logFilePath, getAppClass(), params);
-  }
+    @Override
+    protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
+        List<String> commandParams = getDebuggerCommandParams();
+        commandParams.add("-Ddd.trace.enabled=true"); // explicitly enable tracer
+        commandParams.add("-Ddd.dynamic.instrumentation.probe.file=" + probeFilePath.toString());
+        // increase eval timeout for decoration evaluations
+        commandParams.add("-Ddd.dynamic.instrumentation.evaluation.timeout.ms=100");
+        return ProcessBuilderHelper.createProcessBuilder(commandParams, logFilePath, getAppClass(), params);
+    }
 
-  @Test
-  @DisplayName("testProbeFile")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testProbeFile() throws Exception {
-    waitForInstrumentation(appUrl);
-    execute(appUrl, TRACED_METHOD_NAME);
-    AtomicBoolean snapshotReceived = new AtomicBoolean();
-    AtomicBoolean traceReceived = new AtomicBoolean();
-    registerSnapshotListener(
-        snapshot -> {
-          assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
-          assertEquals(5, snapshot.getCaptures().getReturn().getArguments().size());
-          snapshotReceived.set(true);
+    @Test
+    @DisplayName("testProbeFile")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testProbeFile() throws Exception {
+        waitForInstrumentation(appUrl);
+        execute(appUrl, TRACED_METHOD_NAME);
+        AtomicBoolean snapshotReceived = new AtomicBoolean();
+        AtomicBoolean traceReceived = new AtomicBoolean();
+        registerSnapshotListener(snapshot -> {
+            assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
+            assertEquals(5, snapshot.getCaptures().getReturn().getArguments().size());
+            snapshotReceived.set(true);
         });
-    registerTraceListener(
-        decodedTrace -> {
-          for (DecodedSpan span : decodedTrace.getSpans()) {
-            if (isDynamicSpan(span)) {
-              assertEquals("foobar", span.getMeta().get("client"));
-              assertEquals(PROBE_ID2.getId(), span.getMeta().get("_dd.di.client.probe_id"));
-              traceReceived.set(true);
+        registerTraceListener(decodedTrace -> {
+            for (DecodedSpan span : decodedTrace.getSpans()) {
+                if (isDynamicSpan(span)) {
+                    assertEquals("foobar", span.getMeta().get("client"));
+                    assertEquals(PROBE_ID2.getId(), span.getMeta().get("_dd.di.client.probe_id"));
+                    traceReceived.set(true);
+                }
             }
-          }
         });
-    processRequests(
-        () -> snapshotReceived.get() && traceReceived.get(),
-        () ->
-            String.format(
-                "Timeout! traceReceived=%s snapshotReceived=%s", traceReceived, snapshotReceived));
-    assertFalse(logHasErrors(logFilePath, it -> it.contains(" Error ")));
-  }
+        processRequests(
+                () -> snapshotReceived.get() && traceReceived.get(),
+                () -> String.format("Timeout! traceReceived=%s snapshotReceived=%s", traceReceived, snapshotReceived));
+        assertFalse(logHasErrors(logFilePath, it -> it.contains(" Error ")));
+    }
 
-  protected boolean isDynamicSpan(DecodedSpan span) {
-    return span.getName().equals("dd.dynamic.span")
-        && span.getResource().equals("ServerDebuggerTestApplication.tracedMethod");
-  }
+    protected boolean isDynamicSpan(DecodedSpan span) {
+        return span.getName().equals("dd.dynamic.span")
+                && span.getResource().equals("ServerDebuggerTestApplication.tracedMethod");
+    }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java
index 0004a508cfa..2970657e624 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java
@@ -22,192 +22,183 @@
 @NonRetryable
 public class ProbeStateIntegrationTest extends ServerAppDebuggerIntegrationTest {
 
-  @BeforeEach
-  @Override
-  void setup(TestInfo testInfo) throws Exception {
-    super.setup(testInfo);
-    appUrl = startAppAndAndGetUrl();
-  }
-
-  @Override
-  protected List<String> getDebuggerCommandParams() {
-    List<String> args = super.getDebuggerCommandParams();
-    args.add("-Ddd.third.party.excludes=datadog.smoketest");
-    return args;
-  }
-
-  @Test
-  @DisplayName("testAddRemoveProbes")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testAddRemoveProbes() throws Exception {
-    LogProbe logProbe =
-        LogProbe.builder().probeId(PROBE_ID).where(TEST_APP_CLASS_NAME, FULL_METHOD_NAME).build();
-    addProbe(logProbe);
-    waitForInstrumentation(appUrl);
-    execute(appUrl, FULL_METHOD_NAME);
-    Snapshot snapshot = waitForOneSnapshot();
-    assertEquals(FULL_METHOD_NAME, snapshot.getProbe().getLocation().getMethod());
-    setCurrentConfiguration(createConfig(Collections.emptyList())); // remove probes
-    waitForReTransformation(appUrl);
-    addProbe(logProbe);
-    waitForInstrumentation(appUrl);
-    execute(appUrl, FULL_METHOD_NAME);
-    snapshot = waitForOneSnapshot();
-    assertEquals(FULL_METHOD_NAME, snapshot.getProbe().getLocation().getMethod());
-  }
-
-  @Test
-  @DisplayName("testAddSourceFileProbeLargeInnerClasses")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testAddSourceFileProbeLargeInnerClasses() throws Exception {
-    LogProbe logProbe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where("LargeInnerClasses.java", 6)
-            .captureSnapshot(true)
-            .build();
-    addProbe(logProbe);
-    waitForInstrumentation(appUrl, "datadog.smoketest.debugger.LargeInnerClasses", true);
-  }
-
-  @Test
-  @DisplayName("testAddSourceFileProbeHugeInnerClasses")
-  @Flaky
-  @Disabled
-  // @DisabledIf(
-  //     value = "datadog.environment.JavaVirtualMachine#isJ9",
-  //     disabledReason = "Flaky on J9 JVMs")
-  void testAddSourceFileProbeHugeInnerClasses() throws Exception {
-    waitForSpecificLine(appUrl, " totalentries: 5");
-    LogProbe logProbe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where("HugeInnerClasses.java", 6)
-            .captureSnapshot(true)
-            .build();
-    addProbe(logProbe);
-    waitForSpecificLine(
-        appUrl, "java.lang.IllegalStateException: Too many classes to retransform: 1001");
-  }
-
-  @Test
-  @DisplayName("testDisableEnableProbes")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testDisableEnableProbes() throws Exception {
-    LogProbe logProbe =
-        LogProbe.builder().probeId(PROBE_ID).where(TEST_APP_CLASS_NAME, FULL_METHOD_NAME).build();
-    addProbe(logProbe);
-    waitForInstrumentation(appUrl);
-    execute(appUrl, FULL_METHOD_NAME);
-    Snapshot snapshot = waitForOneSnapshot();
-    assertEquals(FULL_METHOD_NAME, snapshot.getProbe().getLocation().getMethod());
-    setCurrentConfiguration(createConfig(Collections.emptyList())); // no probe
-    waitForReTransformation(appUrl);
-    addProbe(logProbe);
-    waitForInstrumentation(appUrl);
-    execute(appUrl, FULL_METHOD_NAME);
-    snapshot = waitForOneSnapshot();
-    assertEquals(FULL_METHOD_NAME, snapshot.getProbe().getLocation().getMethod());
-  }
-
-  @Test
-  @DisplayName("testDisableEnableProbesUsingDenyList")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  @Disabled("Not supported for config coming from RemoteConfig")
-  void testDisableEnableProbesUsingDenyList() throws Exception {
-    LogProbe logProbe =
-        LogProbe.builder().probeId(PROBE_ID).where(TEST_APP_CLASS_NAME, FULL_METHOD_NAME).build();
-    addProbe(logProbe);
-    waitForInstrumentation(appUrl);
-    execute(appUrl, FULL_METHOD_NAME);
-    Snapshot snapshot = waitForOneSnapshot();
-    assertEquals(FULL_METHOD_NAME, snapshot.getProbe().getLocation().getMethod());
-
-    datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect BLOCKED status
-    Configuration.FilterList denyList =
-        new Configuration.FilterList(asList("datadog.smoketest.debugger"), Collections.emptyList());
-    setCurrentConfiguration(createConfig(asList(logProbe), null, denyList));
-    waitForReTransformation(appUrl);
-    waitForAProbeStatus(ProbeStatus.Status.BLOCKED);
-
-    datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect INSTALLED status
-    addProbe(logProbe);
-    // waitForInstrumentation(appUrl);
-    waitForReTransformation(appUrl);
-    waitForAProbeStatus(ProbeStatus.Status.INSTALLED);
-    execute(appUrl, FULL_METHOD_NAME);
-    snapshot = waitForOneSnapshot();
-    assertEquals(FULL_METHOD_NAME, snapshot.getProbe().getLocation().getMethod());
-  }
-
-  @Test
-  @DisplayName("testDisableEnableProbesUsingAllowList")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  @Disabled("Not supported for config coming from RemoteConfig")
-  void testDisableEnableProbesUsingAllowList() throws Exception {
-    LogProbe logProbe =
-        LogProbe.builder().probeId(PROBE_ID).where(TEST_APP_CLASS_NAME, FULL_METHOD_NAME).build();
-    addProbe(logProbe);
-    waitForInstrumentation(appUrl);
-    execute(appUrl, FULL_METHOD_NAME);
-    Snapshot snapshot = waitForOneSnapshot();
-    assertEquals(FULL_METHOD_NAME, snapshot.getProbe().getLocation().getMethod());
-
-    datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect BLOCKED status
-    Configuration.FilterList allowList =
-        new Configuration.FilterList(asList("datadog.not.debugger"), Collections.emptyList());
-    setCurrentConfiguration(createConfig(asList(logProbe), allowList, null));
-    waitForReTransformation(appUrl);
-    waitForAProbeStatus(ProbeStatus.Status.BLOCKED);
-
-    datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect INSTALLED status
-    addProbe(logProbe);
-    // waitForInstrumentation(appUrl);
-    waitForReTransformation(appUrl);
-    waitForAProbeStatus(ProbeStatus.Status.INSTALLED);
-    execute(appUrl, FULL_METHOD_NAME);
-    snapshot = waitForOneSnapshot();
-    assertEquals(FULL_METHOD_NAME, snapshot.getProbe().getLocation().getMethod());
-  }
-
-  @Test
-  @DisplayName("testProbeStatusError")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  public void testProbeStatusError() throws Exception {
-    LogProbe logProbe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(TEST_APP_CLASS_NAME, "unknownMethodName")
-            .build();
-    addProbe(logProbe);
-    AtomicBoolean received = new AtomicBoolean();
-    AtomicBoolean error = new AtomicBoolean();
-    registerProbeStatusListener(
-        probeStatus -> {
-          if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.RECEIVED) {
-            received.set(true);
-          }
-          if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.ERROR) {
-            assertEquals(
-                "Cannot find method datadog/smoketest/debugger/ServerDebuggerTestApplication::unknownMethodName",
-                probeStatus.getDiagnostics().getException().getMessage());
-            error.set(true);
-          }
+    @BeforeEach
+    @Override
+    void setup(TestInfo testInfo) throws Exception {
+        super.setup(testInfo);
+        appUrl = startAppAndAndGetUrl();
+    }
+
+    @Override
+    protected List<String> getDebuggerCommandParams() {
+        List<String> args = super.getDebuggerCommandParams();
+        args.add("-Ddd.third.party.excludes=datadog.smoketest");
+        return args;
+    }
+
+    @Test
+    @DisplayName("testAddRemoveProbes")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testAddRemoveProbes() throws Exception {
+        LogProbe logProbe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(TEST_APP_CLASS_NAME, FULL_METHOD_NAME)
+                .build();
+        addProbe(logProbe);
+        waitForInstrumentation(appUrl);
+        execute(appUrl, FULL_METHOD_NAME);
+        Snapshot snapshot = waitForOneSnapshot();
+        assertEquals(FULL_METHOD_NAME, snapshot.getProbe().getLocation().getMethod());
+        setCurrentConfiguration(createConfig(Collections.emptyList())); // remove probes
+        waitForReTransformation(appUrl);
+        addProbe(logProbe);
+        waitForInstrumentation(appUrl);
+        execute(appUrl, FULL_METHOD_NAME);
+        snapshot = waitForOneSnapshot();
+        assertEquals(FULL_METHOD_NAME, snapshot.getProbe().getLocation().getMethod());
+    }
+
+    @Test
+    @DisplayName("testAddSourceFileProbeLargeInnerClasses")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testAddSourceFileProbeLargeInnerClasses() throws Exception {
+        LogProbe logProbe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("LargeInnerClasses.java", 6)
+                .captureSnapshot(true)
+                .build();
+        addProbe(logProbe);
+        waitForInstrumentation(appUrl, "datadog.smoketest.debugger.LargeInnerClasses", true);
+    }
+
+    @Test
+    @DisplayName("testAddSourceFileProbeHugeInnerClasses")
+    @Flaky
+    @Disabled
+    // @DisabledIf(
+    //     value = "datadog.environment.JavaVirtualMachine#isJ9",
+    //     disabledReason = "Flaky on J9 JVMs")
+    void testAddSourceFileProbeHugeInnerClasses() throws Exception {
+        waitForSpecificLine(appUrl, " totalentries: 5");
+        LogProbe logProbe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("HugeInnerClasses.java", 6)
+                .captureSnapshot(true)
+                .build();
+        addProbe(logProbe);
+        waitForSpecificLine(appUrl, "java.lang.IllegalStateException: Too many classes to retransform: 1001");
+    }
+
+    @Test
+    @DisplayName("testDisableEnableProbes")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testDisableEnableProbes() throws Exception {
+        LogProbe logProbe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(TEST_APP_CLASS_NAME, FULL_METHOD_NAME)
+                .build();
+        addProbe(logProbe);
+        waitForInstrumentation(appUrl);
+        execute(appUrl, FULL_METHOD_NAME);
+        Snapshot snapshot = waitForOneSnapshot();
+        assertEquals(FULL_METHOD_NAME, snapshot.getProbe().getLocation().getMethod());
+        setCurrentConfiguration(createConfig(Collections.emptyList())); // no probe
+        waitForReTransformation(appUrl);
+        addProbe(logProbe);
+        waitForInstrumentation(appUrl);
+        execute(appUrl, FULL_METHOD_NAME);
+        snapshot = waitForOneSnapshot();
+        assertEquals(FULL_METHOD_NAME, snapshot.getProbe().getLocation().getMethod());
+    }
+
+    @Test
+    @DisplayName("testDisableEnableProbesUsingDenyList")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    @Disabled("Not supported for config coming from RemoteConfig")
+    void testDisableEnableProbesUsingDenyList() throws Exception {
+        LogProbe logProbe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(TEST_APP_CLASS_NAME, FULL_METHOD_NAME)
+                .build();
+        addProbe(logProbe);
+        waitForInstrumentation(appUrl);
+        execute(appUrl, FULL_METHOD_NAME);
+        Snapshot snapshot = waitForOneSnapshot();
+        assertEquals(FULL_METHOD_NAME, snapshot.getProbe().getLocation().getMethod());
+
+        datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect BLOCKED status
+        Configuration.FilterList denyList =
+                new Configuration.FilterList(asList("datadog.smoketest.debugger"), Collections.emptyList());
+        setCurrentConfiguration(createConfig(asList(logProbe), null, denyList));
+        waitForReTransformation(appUrl);
+        waitForAProbeStatus(ProbeStatus.Status.BLOCKED);
+
+        datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect INSTALLED status
+        addProbe(logProbe);
+        // waitForInstrumentation(appUrl);
+        waitForReTransformation(appUrl);
+        waitForAProbeStatus(ProbeStatus.Status.INSTALLED);
+        execute(appUrl, FULL_METHOD_NAME);
+        snapshot = waitForOneSnapshot();
+        assertEquals(FULL_METHOD_NAME, snapshot.getProbe().getLocation().getMethod());
+    }
+
+    @Test
+    @DisplayName("testDisableEnableProbesUsingAllowList")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    @Disabled("Not supported for config coming from RemoteConfig")
+    void testDisableEnableProbesUsingAllowList() throws Exception {
+        LogProbe logProbe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(TEST_APP_CLASS_NAME, FULL_METHOD_NAME)
+                .build();
+        addProbe(logProbe);
+        waitForInstrumentation(appUrl);
+        execute(appUrl, FULL_METHOD_NAME);
+        Snapshot snapshot = waitForOneSnapshot();
+        assertEquals(FULL_METHOD_NAME, snapshot.getProbe().getLocation().getMethod());
+
+        datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect BLOCKED status
+        Configuration.FilterList allowList =
+                new Configuration.FilterList(asList("datadog.not.debugger"), Collections.emptyList());
+        setCurrentConfiguration(createConfig(asList(logProbe), allowList, null));
+        waitForReTransformation(appUrl);
+        waitForAProbeStatus(ProbeStatus.Status.BLOCKED);
+
+        datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect INSTALLED status
+        addProbe(logProbe);
+        // waitForInstrumentation(appUrl);
+        waitForReTransformation(appUrl);
+        waitForAProbeStatus(ProbeStatus.Status.INSTALLED);
+        execute(appUrl, FULL_METHOD_NAME);
+        snapshot = waitForOneSnapshot();
+        assertEquals(FULL_METHOD_NAME, snapshot.getProbe().getLocation().getMethod());
+    }
+
+    @Test
+    @DisplayName("testProbeStatusError")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    public void testProbeStatusError() throws Exception {
+        LogProbe logProbe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(TEST_APP_CLASS_NAME, "unknownMethodName")
+                .build();
+        addProbe(logProbe);
+        AtomicBoolean received = new AtomicBoolean();
+        AtomicBoolean error = new AtomicBoolean();
+        registerProbeStatusListener(probeStatus -> {
+            if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.RECEIVED) {
+                received.set(true);
+            }
+            if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.ERROR) {
+                assertEquals(
+                        "Cannot find method datadog/smoketest/debugger/ServerDebuggerTestApplication::unknownMethodName",
+                        probeStatus.getDiagnostics().getException().getMessage());
+                error.set(true);
+            }
         });
-    processRequests(
-        () -> received.get() && error.get(),
-        () -> String.format("timeout received=%s error=%s", received.get(), error.get()));
-  }
+        processRequests(
+                () -> received.get() && error.get(),
+                () -> String.format("timeout received=%s error=%s", received.get(), error.get()));
+    }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProcessBuilderHelper.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProcessBuilderHelper.java
index e0ee9150109..22d11d51b0a 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProcessBuilderHelper.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProcessBuilderHelper.java
@@ -11,87 +11,81 @@
 
 class ProcessBuilderHelper {
 
-  private static final Logger LOG = LoggerFactory.getLogger(ProcessBuilderHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ProcessBuilderHelper.class);
 
-  public static ProcessBuilder createProcessBuilder(
-      List<String> additionalCommandParams,
-      Path logFilePath,
-      String mainClassName,
-      String... params) {
-    return createProcessBuilder(
-        appTestShadowJar(), additionalCommandParams, logFilePath, mainClassName, params);
-  }
+    public static ProcessBuilder createProcessBuilder(
+            List<String> additionalCommandParams, Path logFilePath, String mainClassName, String... params) {
+        return createProcessBuilder(appTestShadowJar(), additionalCommandParams, logFilePath, mainClassName, params);
+    }
 
-  public static ProcessBuilder createProcessBuilder(
-      String classpath,
-      List<String> additionalCommandParams,
-      Path logFilePath,
-      String mainClassName,
-      String... params) {
+    public static ProcessBuilder createProcessBuilder(
+            String classpath,
+            List<String> additionalCommandParams,
+            Path logFilePath,
+            String mainClassName,
+            String... params) {
 
-    // Trick to prevent jul preferences file lock issue on forked processes, in particular in CI
-    // which runs on Linux and have competing processes trying to write to it, including the
-    // Gradle daemon.
-    //
-    //   Couldn't flush user prefs: java.util.prefs.BackingStoreException: Couldn't get file lock.
-    String prefsDir =
-        System.getProperty("java.io.tmpdir")
-            + File.separator
-            + "userPrefs"
-            + File.separator
-            + mainClassName
-            + "_"
-            + System.nanoTime();
+        // Trick to prevent jul preferences file lock issue on forked processes, in particular in CI
+        // which runs on Linux and have competing processes trying to write to it, including the
+        // Gradle daemon.
+        //
+        //   Couldn't flush user prefs: java.util.prefs.BackingStoreException: Couldn't get file lock.
+        String prefsDir = System.getProperty("java.io.tmpdir")
+                + File.separator
+                + "userPrefs"
+                + File.separator
+                + mainClassName
+                + "_"
+                + System.nanoTime();
 
-    List<String> baseCommand =
-        Arrays.asList(
-            javaPath(),
-            // "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:5006",
-            "-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "1024M"),
-            "-Xms" + System.getProperty("datadog.forkedMinHeapSize", "64M"),
-            "-javaagent:" + agentShadowJar(),
-            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-            "-Ddd.env=smoketest",
-            "-Ddd.version=99",
-            "-Djava.util.prefs.userRoot=" + prefsDir);
+        List<String> baseCommand = Arrays.asList(
+                javaPath(),
+                // "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:5006",
+                "-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "1024M"),
+                "-Xms" + System.getProperty("datadog.forkedMinHeapSize", "64M"),
+                "-javaagent:" + agentShadowJar(),
+                "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
+                "-Ddd.env=smoketest",
+                "-Ddd.version=99",
+                "-Djava.util.prefs.userRoot=" + prefsDir);
 
-    List<String> command = new ArrayList<>();
-    command.addAll(baseCommand);
-    if (OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64()) {
-      // Disable CDS to avoid SIGSEGVs on Linux arm64.
-      command.add(1, "-Xshare:off");
-    }
-    command.addAll(additionalCommandParams);
-    command.addAll(Arrays.asList("-cp", classpath, mainClassName));
-    command.addAll(Arrays.asList(params));
+        List<String> command = new ArrayList<>();
+        command.addAll(baseCommand);
+        if (OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64()) {
+            // Disable CDS to avoid SIGSEGVs on Linux arm64.
+            command.add(1, "-Xshare:off");
+        }
+        command.addAll(additionalCommandParams);
+        command.addAll(Arrays.asList("-cp", classpath, mainClassName));
+        command.addAll(Arrays.asList(params));
 
-    LOG.info("Launching: {}", command);
-    LOG.info("LogFilePath: {}", logFilePath);
-    ProcessBuilder processBuilder = new ProcessBuilder(command);
-    processBuilder.directory(new File(buildDirectory()));
+        LOG.info("Launching: {}", command);
+        LOG.info("LogFilePath: {}", logFilePath);
+        ProcessBuilder processBuilder = new ProcessBuilder(command);
+        processBuilder.directory(new File(buildDirectory()));
 
-    processBuilder.environment().put("JAVA_HOME", System.getProperty("java.home"));
-    processBuilder.environment().put("DD_LOG_FILE", logFilePath.toString());
+        processBuilder.environment().put("JAVA_HOME", System.getProperty("java.home"));
+        processBuilder.environment().put("DD_LOG_FILE", logFilePath.toString());
 
-    processBuilder.redirectErrorStream(true);
-    processBuilder.redirectOutput(ProcessBuilder.Redirect.to(logFilePath.toFile()));
-    return processBuilder;
-  }
+        processBuilder.redirectErrorStream(true);
+        processBuilder.redirectOutput(ProcessBuilder.Redirect.to(logFilePath.toFile()));
+        return processBuilder;
+    }
 
-  private static String javaPath() {
-    final String separator = System.getProperty("file.separator");
-    return System.getProperty("java.home") + separator + "bin" + separator + "java";
-  }
+    private static String javaPath() {
+        final String separator = System.getProperty("file.separator");
+        return System.getProperty("java.home") + separator + "bin" + separator + "java";
+    }
 
-  private static String agentShadowJar() {
-    return System.getProperty("datadog.smoketest.agent.shadowJar.path");
-  }
+    private static String agentShadowJar() {
+        return System.getProperty("datadog.smoketest.agent.shadowJar.path");
+    }
 
-  private static String appTestShadowJar() {
-    return System.getProperty("datadog.smoketest.shadowJar.path");
-  }
+    private static String appTestShadowJar() {
+        return System.getProperty("datadog.smoketest.shadowJar.path");
+    }
 
-  static String buildDirectory() {
-    return System.getProperty("datadog.smoketest.builddir");
-  }
+    static String buildDirectory() {
+        return System.getProperty("datadog.smoketest.builddir");
+    }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/RemoteConfigHelper.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/RemoteConfigHelper.java
index d9f7c7cc85d..289312dabfe 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/RemoteConfigHelper.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/RemoteConfigHelper.java
@@ -8,101 +8,94 @@
 import java.util.StringJoiner;
 
 public class RemoteConfigHelper {
-  public static class RemoteConfig {
-    public final String product;
-    public final String config;
-    public final String configId;
+    public static class RemoteConfig {
+        public final String product;
+        public final String config;
+        public final String configId;
 
-    public RemoteConfig(String product, String config, String configId) {
-      this.product = product;
-      this.config = config;
-      this.configId = configId;
+        public RemoteConfig(String product, String config, String configId) {
+            this.product = product;
+            this.config = config;
+            this.configId = configId;
+        }
     }
-  }
 
-  public static String encode(List<RemoteConfig> remoteConfigs) {
-    List<String> hashes = buildHashes(remoteConfigs);
-    String targetsStr = buildTargets(hashes, remoteConfigs);
-    String targetsEncoded = new String(Base64.getEncoder().encode(targetsStr.getBytes()));
-    String targetFiles = buildTargetFiles(remoteConfigs);
-    String clientConfigs = buildClientConfigs(remoteConfigs);
-    return String.format(
-        "{\n"
-            + "\"targets\": \"%s\",\n"
-            + "\"target_files\": [\n"
-            + "                    %s\n"
-            + "],"
-            + "\"client_configs\": [\n"
-            + "                      %s\n"
-            + "                ]"
-            + "}",
-        targetsEncoded, targetFiles, clientConfigs);
-  }
+    public static String encode(List<RemoteConfig> remoteConfigs) {
+        List<String> hashes = buildHashes(remoteConfigs);
+        String targetsStr = buildTargets(hashes, remoteConfigs);
+        String targetsEncoded = new String(Base64.getEncoder().encode(targetsStr.getBytes()));
+        String targetFiles = buildTargetFiles(remoteConfigs);
+        String clientConfigs = buildClientConfigs(remoteConfigs);
+        return String.format(
+                "{\n"
+                        + "\"targets\": \"%s\",\n"
+                        + "\"target_files\": [\n"
+                        + "                    %s\n"
+                        + "],"
+                        + "\"client_configs\": [\n"
+                        + "                      %s\n"
+                        + "                ]"
+                        + "}",
+                targetsEncoded, targetFiles, clientConfigs);
+    }
 
-  private static String buildClientConfigs(List<RemoteConfig> remoteConfigs) {
-    StringJoiner sj = new StringJoiner(",\n");
-    for (RemoteConfig rc : remoteConfigs) {
-      sj.add(
-          String.format(
-              "                        \"datadog/2/%s/%s/config\"\n", rc.product, rc.configId));
+    private static String buildClientConfigs(List<RemoteConfig> remoteConfigs) {
+        StringJoiner sj = new StringJoiner(",\n");
+        for (RemoteConfig rc : remoteConfigs) {
+            sj.add(String.format("                        \"datadog/2/%s/%s/config\"\n", rc.product, rc.configId));
+        }
+        return sj.toString();
     }
-    return sj.toString();
-  }
 
-  private static String buildTargetFiles(List<RemoteConfig> remoteConfigs) {
-    StringJoiner sj = new StringJoiner(",\n");
-    for (RemoteConfig rc : remoteConfigs) {
-      String encodedConfig = new String(Base64.getEncoder().encode(rc.config.getBytes()));
-      sj.add(
-          String.format(
-              "    {\n"
-                  + "      \"path\": \"datadog/2/%s/%s/config\",\n"
-                  + "      \"raw\": \"%s\"\n"
-                  + "    }\n",
-              rc.product, rc.configId, encodedConfig));
+    private static String buildTargetFiles(List<RemoteConfig> remoteConfigs) {
+        StringJoiner sj = new StringJoiner(",\n");
+        for (RemoteConfig rc : remoteConfigs) {
+            String encodedConfig = new String(Base64.getEncoder().encode(rc.config.getBytes()));
+            sj.add(String.format(
+                    "    {\n" + "      \"path\": \"datadog/2/%s/%s/config\",\n" + "      \"raw\": \"%s\"\n" + "    }\n",
+                    rc.product, rc.configId, encodedConfig));
+        }
+        return sj.toString();
     }
-    return sj.toString();
-  }
 
-  private static List<String> buildHashes(List<RemoteConfig> remoteConfigs) {
-    List<String> hashes = new ArrayList<>();
-    for (RemoteConfig rc : remoteConfigs) {
-      try {
-        hashes.add(Strings.sha256(rc.config));
-      } catch (NoSuchAlgorithmException e) {
-        e.printStackTrace();
-      }
+    private static List<String> buildHashes(List<RemoteConfig> remoteConfigs) {
+        List<String> hashes = new ArrayList<>();
+        for (RemoteConfig rc : remoteConfigs) {
+            try {
+                hashes.add(Strings.sha256(rc.config));
+            } catch (NoSuchAlgorithmException e) {
+                e.printStackTrace();
+            }
+        }
+        return hashes;
     }
-    return hashes;
-  }
 
-  private static String buildTargets(List<String> hashes, List<RemoteConfig> remoteConfigs) {
-    StringJoiner sj = new StringJoiner(",\n");
-    for (int i = 0; i < remoteConfigs.size(); i++) {
-      RemoteConfig rc = remoteConfigs.get(i);
-      sj.add(
-          String.format(
-              "     \"datadog/2/%s/%s/config\":{"
-                  + "           \"length\": %d,\n"
-                  + "           \"custom\": { \"v\": 123 },\n"
-                  + "           \"hashes\":\n"
-                  + "            {\n"
-                  + "               \"sha256\": \"%s\"\n"
-                  + "            }"
-                  + "         }",
-              rc.product, rc.configId, rc.config.length(), hashes.get(i)));
+    private static String buildTargets(List<String> hashes, List<RemoteConfig> remoteConfigs) {
+        StringJoiner sj = new StringJoiner(",\n");
+        for (int i = 0; i < remoteConfigs.size(); i++) {
+            RemoteConfig rc = remoteConfigs.get(i);
+            sj.add(String.format(
+                    "     \"datadog/2/%s/%s/config\":{"
+                            + "           \"length\": %d,\n"
+                            + "           \"custom\": { \"v\": 123 },\n"
+                            + "           \"hashes\":\n"
+                            + "            {\n"
+                            + "               \"sha256\": \"%s\"\n"
+                            + "            }"
+                            + "         }",
+                    rc.product, rc.configId, rc.config.length(), hashes.get(i)));
+        }
+        String targets = sj.toString();
+        return String.format(
+                "{\"signed\":\n"
+                        + "  { \"_type\":\"targets\",\n"
+                        + "    \"spec_version\": \"1.0\",\n"
+                        + "    \"version\": \"2\",\n"
+                        + "    \"custom\": { \"opaque_backend_state\": \"opaque\" },\n"
+                        + "    \"targets\":\n"
+                        + "     { %s }"
+                        + "  }"
+                        + "}",
+                targets);
     }
-    String targets = sj.toString();
-    return String.format(
-        "{\"signed\":\n"
-            + "  { \"_type\":\"targets\",\n"
-            + "    \"spec_version\": \"1.0\",\n"
-            + "    \"version\": \"2\",\n"
-            + "    \"custom\": { \"opaque_backend_state\": \"opaque\" },\n"
-            + "    \"targets\":\n"
-            + "     { %s }"
-            + "  }"
-            + "}",
-        targets);
-  }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ServerAppDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ServerAppDebuggerIntegrationTest.java
index 4365b85119a..21c93ab26da 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ServerAppDebuggerIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ServerAppDebuggerIntegrationTest.java
@@ -24,171 +24,167 @@
 import org.junit.jupiter.api.TestInfo;
 
 public class ServerAppDebuggerIntegrationTest extends BaseIntegrationTest {
-  protected static final String SERVER_DEBUGGER_TEST_APP_CLASS =
-      "datadog.smoketest.debugger.ServerDebuggerTestApplication";
-  protected static final String CONTROL_URL = "/control";
-  protected static final ProbeId PROBE_ID = new ProbeId("123356536", 0);
-  protected static final ProbeId LINE_PROBE_ID1 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000001", 0);
-  protected static final String TEST_APP_CLASS_NAME = "ServerDebuggerTestApplication";
-  protected static final String FULL_METHOD_NAME = "fullMethod";
-  protected static final String TRACED_METHOD_NAME = "tracedMethod";
-
-  protected MockWebServer controlServer;
-  protected HttpUrl controlUrl;
-  private OkHttpClient httpClient = new OkHttpClient();
-  protected String appUrl;
-
-  @BeforeEach
-  @Override
-  void setup(TestInfo testInfo) throws Exception {
-    super.setup(testInfo);
-    controlServer = new MockWebServer();
-    // controlServer.setDispatcher(new ControlDispatcher());
-    controlServer.start();
-    LOG.info("ControlServer on {}", controlServer.getPort());
-    controlUrl = controlServer.url(CONTROL_URL);
-  }
-
-  @Override
-  @AfterEach
-  void teardown(TestInfo testInfo) throws Exception {
-    if (appUrl != null) {
-      stopApp(appUrl);
-    }
-    controlServer.shutdown();
-    super.teardown(testInfo);
-  }
-
-  @Override
-  protected String getAppClass() {
-    return SERVER_DEBUGGER_TEST_APP_CLASS;
-  }
-
-  @Override
-  protected String getAppId() {
-    return TagsHelper.sanitize("ServerDebuggerTestApplication");
-  }
-
-  protected void stopApp(String appUrl) throws IOException {
-    try {
-      sendRequest(appUrl + "/stop");
-    } catch (Exception ex) {
-      LOG.warn("Exception while stopping server app", ex);
-    }
-    LOG.info("Stop done");
-  }
-
-  protected Snapshot waitForOneSnapshot() throws Exception {
-    AtomicReference<Snapshot> snapshotReceived = new AtomicReference<>();
-    registerSnapshotListener(snapshotReceived::set);
-    processRequests(
-        () -> snapshotReceived.get() != null,
-        () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
-    return snapshotReceived.get();
-  }
-
-  protected void execute(String appUrl, String methodName) throws IOException {
-    execute(appUrl, methodName, null);
-  }
-
-  protected void execute(String appUrl, String methodName, String arg) throws IOException {
-    datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect 1 snapshot
-    String executeFormat = arg != null ? "/execute?methodname=%s&arg=%s" : "/execute?methodname=%s";
-    String url = String.format(appUrl + executeFormat, methodName, arg);
-    sendRequest(url);
-    LOG.info("Execution done");
-  }
-
-  protected void waitForInstrumentation(String appUrl) throws Exception {
-    waitForInstrumentation(appUrl, SERVER_DEBUGGER_TEST_APP_CLASS, true);
-  }
-
-  protected void waitForInstrumentation(
-      String appUrl, String className, boolean waitOnProbeStatuses) throws Exception {
-    String url = String.format(appUrl + "/waitForInstrumentation?classname=%s", className);
-    LOG.info("waitForInstrumentation with url={}", url);
-    sendRequest(url);
-    if (waitOnProbeStatuses) {
-      AtomicBoolean received = new AtomicBoolean();
-      AtomicBoolean installed = new AtomicBoolean();
-      registerProbeStatusListener(
-          probeStatus -> {
-            if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.RECEIVED) {
-              received.set(true);
-            }
-            if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.INSTALLED) {
-              installed.set(true);
-            }
-          });
-      processRequests(
-          () -> received.get() && installed.get(),
-          () -> String.format("timeout received=%s installed=%s", received.get(), installed.get()));
-    }
-    LOG.info("instrumentation done");
-  }
-
-  protected void waitForExceptionFingerprint() throws Exception {
-    String url = String.format(appUrl + "/waitForExceptionFingerprint");
-    LOG.info("waitForExceptionFingerprint with url={}", url);
-    sendRequest(url);
-    LOG.info("exceptionFingerprint added");
-  }
-
-  protected void waitForAProbeStatus(ProbeStatus.Status status) throws Exception {
-    AtomicBoolean statusResult = new AtomicBoolean();
-    registerProbeStatusListener(
-        probeStatus -> {
-          statusResult.set(probeStatus.getDiagnostics().getStatus() == status);
+    protected static final String SERVER_DEBUGGER_TEST_APP_CLASS =
+            "datadog.smoketest.debugger.ServerDebuggerTestApplication";
+    protected static final String CONTROL_URL = "/control";
+    protected static final ProbeId PROBE_ID = new ProbeId("123356536", 0);
+    protected static final ProbeId LINE_PROBE_ID1 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000001", 0);
+    protected static final String TEST_APP_CLASS_NAME = "ServerDebuggerTestApplication";
+    protected static final String FULL_METHOD_NAME = "fullMethod";
+    protected static final String TRACED_METHOD_NAME = "tracedMethod";
+
+    protected MockWebServer controlServer;
+    protected HttpUrl controlUrl;
+    private OkHttpClient httpClient = new OkHttpClient();
+    protected String appUrl;
+
+    @BeforeEach
+    @Override
+    void setup(TestInfo testInfo) throws Exception {
+        super.setup(testInfo);
+        controlServer = new MockWebServer();
+        // controlServer.setDispatcher(new ControlDispatcher());
+        controlServer.start();
+        LOG.info("ControlServer on {}", controlServer.getPort());
+        controlUrl = controlServer.url(CONTROL_URL);
+    }
+
+    @Override
+    @AfterEach
+    void teardown(TestInfo testInfo) throws Exception {
+        if (appUrl != null) {
+            stopApp(appUrl);
+        }
+        controlServer.shutdown();
+        super.teardown(testInfo);
+    }
+
+    @Override
+    protected String getAppClass() {
+        return SERVER_DEBUGGER_TEST_APP_CLASS;
+    }
+
+    @Override
+    protected String getAppId() {
+        return TagsHelper.sanitize("ServerDebuggerTestApplication");
+    }
+
+    protected void stopApp(String appUrl) throws IOException {
+        try {
+            sendRequest(appUrl + "/stop");
+        } catch (Exception ex) {
+            LOG.warn("Exception while stopping server app", ex);
+        }
+        LOG.info("Stop done");
+    }
+
+    protected Snapshot waitForOneSnapshot() throws Exception {
+        AtomicReference<Snapshot> snapshotReceived = new AtomicReference<>();
+        registerSnapshotListener(snapshotReceived::set);
+        processRequests(
+                () -> snapshotReceived.get() != null,
+                () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get()));
+        return snapshotReceived.get();
+    }
+
+    protected void execute(String appUrl, String methodName) throws IOException {
+        execute(appUrl, methodName, null);
+    }
+
+    protected void execute(String appUrl, String methodName, String arg) throws IOException {
+        datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect 1 snapshot
+        String executeFormat = arg != null ? "/execute?methodname=%s&arg=%s" : "/execute?methodname=%s";
+        String url = String.format(appUrl + executeFormat, methodName, arg);
+        sendRequest(url);
+        LOG.info("Execution done");
+    }
+
+    protected void waitForInstrumentation(String appUrl) throws Exception {
+        waitForInstrumentation(appUrl, SERVER_DEBUGGER_TEST_APP_CLASS, true);
+    }
+
+    protected void waitForInstrumentation(String appUrl, String className, boolean waitOnProbeStatuses)
+            throws Exception {
+        String url = String.format(appUrl + "/waitForInstrumentation?classname=%s", className);
+        LOG.info("waitForInstrumentation with url={}", url);
+        sendRequest(url);
+        if (waitOnProbeStatuses) {
+            AtomicBoolean received = new AtomicBoolean();
+            AtomicBoolean installed = new AtomicBoolean();
+            registerProbeStatusListener(probeStatus -> {
+                if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.RECEIVED) {
+                    received.set(true);
+                }
+                if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.INSTALLED) {
+                    installed.set(true);
+                }
+            });
+            processRequests(
+                    () -> received.get() && installed.get(),
+                    () -> String.format("timeout received=%s installed=%s", received.get(), installed.get()));
+        }
+        LOG.info("instrumentation done");
+    }
+
+    protected void waitForExceptionFingerprint() throws Exception {
+        String url = String.format(appUrl + "/waitForExceptionFingerprint");
+        LOG.info("waitForExceptionFingerprint with url={}", url);
+        sendRequest(url);
+        LOG.info("exceptionFingerprint added");
+    }
+
+    protected void waitForAProbeStatus(ProbeStatus.Status status) throws Exception {
+        AtomicBoolean statusResult = new AtomicBoolean();
+        registerProbeStatusListener(probeStatus -> {
+            statusResult.set(probeStatus.getDiagnostics().getStatus() == status);
         });
-    processRequests(
-        statusResult::get, () -> String.format("timeout statusResult=%s", statusResult.get()));
-  }
-
-  protected void waitForReTransformation(String appUrl) throws IOException {
-    waitForReTransformation(appUrl, SERVER_DEBUGGER_TEST_APP_CLASS);
-  }
-
-  protected void waitForReTransformation(String appUrl, String className) throws IOException {
-    String url = String.format(appUrl + "/waitForReTransformation?classname=%s", className);
-    sendRequest(url);
-    LOG.info("re-transformation done");
-  }
-
-  protected void waitForSpecificLine(String appUrl, String line) throws IOException {
-    String url = String.format(appUrl + "/waitForSpecificLine?line=%s", line);
-    sendRequest(url);
-  }
-
-  protected String startAppAndAndGetUrl() throws InterruptedException, IOException {
-    controlServer.enqueue(EMPTY_200_RESPONSE); // ack response
-    targetProcess = createProcessBuilder(logFilePath, controlUrl.toString()).start();
-    RecordedRequest recordedRequest = controlServer.takeRequest(30, TimeUnit.SECONDS);
-    assertNotNull(recordedRequest);
-    String appUrl = recordedRequest.getBody().readUtf8Line();
-    LOG.info("AppUrl = {}", appUrl);
-    return appUrl;
-  }
-
-  protected void addProbe(LogProbe logProbe) {
-    datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect RECEIVED status
-    datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect INSTALLED status
-    setCurrentConfiguration(createConfig(logProbe));
-  }
-
-  protected void addProbe(SpanDecorationProbe spanDecorationProbe) {
-    datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect RECEIVED status
-    datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect INSTALLED status
-    setCurrentConfiguration(createSpanDecoConfig(spanDecorationProbe));
-  }
-
-  protected void sendRequest(String url) throws IOException {
-    Request request = new Request.Builder().url(url).get().build();
-    try (Response response = httpClient.newCall(request).execute()) {}
-  }
-
-  protected boolean isTracedFullMethodSpan(DecodedSpan span) {
-    return span.getName().equals("trace.annotation")
-        && span.getResource().equals("ServerDebuggerTestApplication.runTracedMethod");
-  }
+        processRequests(statusResult::get, () -> String.format("timeout statusResult=%s", statusResult.get()));
+    }
+
+    protected void waitForReTransformation(String appUrl) throws IOException {
+        waitForReTransformation(appUrl, SERVER_DEBUGGER_TEST_APP_CLASS);
+    }
+
+    protected void waitForReTransformation(String appUrl, String className) throws IOException {
+        String url = String.format(appUrl + "/waitForReTransformation?classname=%s", className);
+        sendRequest(url);
+        LOG.info("re-transformation done");
+    }
+
+    protected void waitForSpecificLine(String appUrl, String line) throws IOException {
+        String url = String.format(appUrl + "/waitForSpecificLine?line=%s", line);
+        sendRequest(url);
+    }
+
+    protected String startAppAndAndGetUrl() throws InterruptedException, IOException {
+        controlServer.enqueue(EMPTY_200_RESPONSE); // ack response
+        targetProcess = createProcessBuilder(logFilePath, controlUrl.toString()).start();
+        RecordedRequest recordedRequest = controlServer.takeRequest(30, TimeUnit.SECONDS);
+        assertNotNull(recordedRequest);
+        String appUrl = recordedRequest.getBody().readUtf8Line();
+        LOG.info("AppUrl = {}", appUrl);
+        return appUrl;
+    }
+
+    protected void addProbe(LogProbe logProbe) {
+        datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect RECEIVED status
+        datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect INSTALLED status
+        setCurrentConfiguration(createConfig(logProbe));
+    }
+
+    protected void addProbe(SpanDecorationProbe spanDecorationProbe) {
+        datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect RECEIVED status
+        datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect INSTALLED status
+        setCurrentConfiguration(createSpanDecoConfig(spanDecorationProbe));
+    }
+
+    protected void sendRequest(String url) throws IOException {
+        Request request = new Request.Builder().url(url).get().build();
+        try (Response response = httpClient.newCall(request).execute()) {}
+    }
+
+    protected boolean isTracedFullMethodSpan(DecodedSpan span) {
+        return span.getName().equals("trace.annotation")
+                && span.getResource().equals("ServerDebuggerTestApplication.runTracedMethod");
+    }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SimpleAppDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SimpleAppDebuggerIntegrationTest.java
index 320c1cd6d55..6f7a9c6e109 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SimpleAppDebuggerIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SimpleAppDebuggerIntegrationTest.java
@@ -6,22 +6,19 @@
 import org.slf4j.LoggerFactory;
 
 public class SimpleAppDebuggerIntegrationTest extends BaseIntegrationTest {
-  protected static final Logger LOG =
-      LoggerFactory.getLogger(SimpleAppDebuggerIntegrationTest.class);
-  protected static final String DEBUGGER_TEST_APP_CLASS =
-      "datadog.smoketest.debugger.DebuggerTestApplication";
-  protected static final ProbeId PROBE_ID = new ProbeId("123356536", 0);
-  protected static final ProbeId LINE_PROBE_ID1 =
-      new ProbeId("beae1817-f3b0-4ea8-a74f-000000000001", 0);
-  protected static final String MAIN_CLASS_NAME = "Main";
+    protected static final Logger LOG = LoggerFactory.getLogger(SimpleAppDebuggerIntegrationTest.class);
+    protected static final String DEBUGGER_TEST_APP_CLASS = "datadog.smoketest.debugger.DebuggerTestApplication";
+    protected static final ProbeId PROBE_ID = new ProbeId("123356536", 0);
+    protected static final ProbeId LINE_PROBE_ID1 = new ProbeId("beae1817-f3b0-4ea8-a74f-000000000001", 0);
+    protected static final String MAIN_CLASS_NAME = "Main";
 
-  @Override
-  protected String getAppClass() {
-    return DEBUGGER_TEST_APP_CLASS;
-  }
+    @Override
+    protected String getAppClass() {
+        return DEBUGGER_TEST_APP_CLASS;
+    }
 
-  @Override
-  protected String getAppId() {
-    return TagsHelper.sanitize("DebuggerTestApplication");
-  }
+    @Override
+    protected String getAppId() {
+        return TagsHelper.sanitize("DebuggerTestApplication");
+    }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java
index 09346289fb7..f5f41ad9085 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java
@@ -34,286 +34,239 @@
 @NonRetryable
 public class SpanDecorationProbesIntegrationTests extends ServerAppDebuggerIntegrationTest {
 
-  @BeforeEach
-  @Override
-  void setup(TestInfo testInfo) throws Exception {
-    super.setup(testInfo);
-    appUrl = startAppAndAndGetUrl();
-  }
+    @BeforeEach
+    @Override
+    void setup(TestInfo testInfo) throws Exception {
+        super.setup(testInfo);
+        appUrl = startAppAndAndGetUrl();
+    }
 
-  @Override
-  protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
-    List<String> commandParams = getDebuggerCommandParams();
-    commandParams.add("-Ddd.trace.enabled=true"); // explicitly enable tracer
-    // increase eval timeout for decoration evaluations
-    commandParams.add("-Ddd.dynamic.instrumentation.evaluation.timeout.ms=100");
-    return ProcessBuilderHelper.createProcessBuilder(
-        commandParams, logFilePath, getAppClass(), params);
-  }
+    @Override
+    protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
+        List<String> commandParams = getDebuggerCommandParams();
+        commandParams.add("-Ddd.trace.enabled=true"); // explicitly enable tracer
+        // increase eval timeout for decoration evaluations
+        commandParams.add("-Ddd.dynamic.instrumentation.evaluation.timeout.ms=100");
+        return ProcessBuilderHelper.createProcessBuilder(commandParams, logFilePath, getAppClass(), params);
+    }
 
-  @Test
-  @DisplayName("testMethodSimpleTagNoCondition")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  void testMethodSimpleTagNoCondition() throws Exception {
-    SpanDecorationProbe spanDecorationProbe =
-        SpanDecorationProbe.builder()
-            .probeId(PROBE_ID)
-            .where(TEST_APP_CLASS_NAME, TRACED_METHOD_NAME)
-            .decorations(createDecoration("tag1", "{argStr}"))
-            .targetSpan(SpanDecorationProbe.TargetSpan.ACTIVE)
-            .build();
-    addProbe(spanDecorationProbe);
-    waitForInstrumentation(appUrl);
-    execute(appUrl, TRACED_METHOD_NAME);
-    AtomicBoolean traceReceived = new AtomicBoolean();
-    registerTraceListener(
-        decodedTrace -> {
-          for (DecodedSpan span : decodedTrace.getSpans()) {
-            if (isTracedFullMethodSpan(span)) {
-              assertEquals("foobar", span.getMeta().get("tag1"));
-              assertEquals(PROBE_ID.getId(), span.getMeta().get("_dd.di.tag1.probe_id"));
-              traceReceived.set(true);
+    @Test
+    @DisplayName("testMethodSimpleTagNoCondition")
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    void testMethodSimpleTagNoCondition() throws Exception {
+        SpanDecorationProbe spanDecorationProbe = SpanDecorationProbe.builder()
+                .probeId(PROBE_ID)
+                .where(TEST_APP_CLASS_NAME, TRACED_METHOD_NAME)
+                .decorations(createDecoration("tag1", "{argStr}"))
+                .targetSpan(SpanDecorationProbe.TargetSpan.ACTIVE)
+                .build();
+        addProbe(spanDecorationProbe);
+        waitForInstrumentation(appUrl);
+        execute(appUrl, TRACED_METHOD_NAME);
+        AtomicBoolean traceReceived = new AtomicBoolean();
+        registerTraceListener(decodedTrace -> {
+            for (DecodedSpan span : decodedTrace.getSpans()) {
+                if (isTracedFullMethodSpan(span)) {
+                    assertEquals("foobar", span.getMeta().get("tag1"));
+                    assertEquals(PROBE_ID.getId(), span.getMeta().get("_dd.di.tag1.probe_id"));
+                    traceReceived.set(true);
+                }
             }
-          }
         });
-    processRequests(
-        traceReceived::get, () -> String.format("timeout traceReceived=%s", traceReceived.get()));
-  }
+        processRequests(traceReceived::get, () -> String.format("timeout traceReceived=%s", traceReceived.get()));
+    }
 
-  @Flaky
-  @Test
-  @DisplayName("testMethodMultiTagsMultiConditions")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "we cannot get local variable debug info")
-  void testMethodMultiTagsMultiConditions() throws Exception {
-    List<SpanDecorationProbe.Decoration> decorations =
-        Arrays.asList(
-            createDecoration(
-                not(eq(ref("argStr"), nullValue())), "argStr != null", "tag1", "{argStr}"),
-            createDecoration(lt(ref("argInt"), value(0)), "argInt < 0", "tag2", "{argInt}"),
-            createDecoration(
-                gt(ref("argDouble"), value(3.14)),
-                "argDouble > 3.14",
-                "tag3",
-                "Above Pi: {argDouble}"),
-            createDecoration(
-                eq(index(ref("argMap"), value("key2")), value("val2")),
-                "argMap['key2'] == 'val2'",
-                "tag4",
-                "{argMap['key2']}"));
-    SpanDecorationProbe spanDecorationProbe =
-        SpanDecorationProbe.builder()
-            .probeId(PROBE_ID)
-            .where(TEST_APP_CLASS_NAME, TRACED_METHOD_NAME)
-            .decorations(decorations)
-            .targetSpan(SpanDecorationProbe.TargetSpan.ACTIVE)
-            .build();
-    addProbe(spanDecorationProbe);
-    waitForInstrumentation(appUrl);
-    execute(appUrl, TRACED_METHOD_NAME);
-    AtomicBoolean traceReceived = new AtomicBoolean();
-    registerTraceListener(
-        decodedTrace -> {
-          for (DecodedSpan span : decodedTrace.getSpans()) {
-            if (isTracedFullMethodSpan(span)) {
-              assertEquals("foobar", span.getMeta().get("tag1"));
-              assertFalse(span.getMeta().containsKey("tag2"));
-              assertEquals("Above Pi: 3.42", span.getMeta().get("tag3"));
-              assertEquals("val2", span.getMeta().get("tag4"));
-              traceReceived.set(true);
+    @Flaky
+    @Test
+    @DisplayName("testMethodMultiTagsMultiConditions")
+    @DisabledIf(
+            value = "datadog.environment.JavaVirtualMachine#isJ9",
+            disabledReason = "we cannot get local variable debug info")
+    void testMethodMultiTagsMultiConditions() throws Exception {
+        List<SpanDecorationProbe.Decoration> decorations = Arrays.asList(
+                createDecoration(not(eq(ref("argStr"), nullValue())), "argStr != null", "tag1", "{argStr}"),
+                createDecoration(lt(ref("argInt"), value(0)), "argInt < 0", "tag2", "{argInt}"),
+                createDecoration(
+                        gt(ref("argDouble"), value(3.14)), "argDouble > 3.14", "tag3", "Above Pi: {argDouble}"),
+                createDecoration(
+                        eq(index(ref("argMap"), value("key2")), value("val2")),
+                        "argMap['key2'] == 'val2'",
+                        "tag4",
+                        "{argMap['key2']}"));
+        SpanDecorationProbe spanDecorationProbe = SpanDecorationProbe.builder()
+                .probeId(PROBE_ID)
+                .where(TEST_APP_CLASS_NAME, TRACED_METHOD_NAME)
+                .decorations(decorations)
+                .targetSpan(SpanDecorationProbe.TargetSpan.ACTIVE)
+                .build();
+        addProbe(spanDecorationProbe);
+        waitForInstrumentation(appUrl);
+        execute(appUrl, TRACED_METHOD_NAME);
+        AtomicBoolean traceReceived = new AtomicBoolean();
+        registerTraceListener(decodedTrace -> {
+            for (DecodedSpan span : decodedTrace.getSpans()) {
+                if (isTracedFullMethodSpan(span)) {
+                    assertEquals("foobar", span.getMeta().get("tag1"));
+                    assertFalse(span.getMeta().containsKey("tag2"));
+                    assertEquals("Above Pi: 3.42", span.getMeta().get("tag3"));
+                    assertEquals("val2", span.getMeta().get("tag4"));
+                    traceReceived.set(true);
+                }
             }
-          }
         });
-    processRequests(
-        traceReceived::get, () -> String.format("timeout traceReceived=%s", traceReceived.get()));
-  }
+        processRequests(traceReceived::get, () -> String.format("timeout traceReceived=%s", traceReceived.get()));
+    }
 
-  @Test
-  @DisplayName("testMethodSimpleTagValueError")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testMethodSimpleTagValueError() throws Exception {
-    SpanDecorationProbe spanDecorationProbe =
-        SpanDecorationProbe.builder()
-            .probeId(PROBE_ID)
-            .where(TEST_APP_CLASS_NAME, TRACED_METHOD_NAME)
-            .decorations(createDecoration("tag1", "{invalidArg}"))
-            .targetSpan(SpanDecorationProbe.TargetSpan.ACTIVE)
-            .build();
-    addProbe(spanDecorationProbe);
-    waitForInstrumentation(appUrl);
-    execute(appUrl, TRACED_METHOD_NAME);
-    AtomicBoolean snapshotTest = new AtomicBoolean(false);
-    AtomicBoolean spanTest = new AtomicBoolean(false);
-    registerSnapshotListener(
-        snapshot -> {
-          assertEquals(
-              "Cannot find symbol: invalidArg", snapshot.getEvaluationErrors().get(0).getMessage());
-          snapshotTest.set(true);
+    @Test
+    @DisplayName("testMethodSimpleTagValueError")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testMethodSimpleTagValueError() throws Exception {
+        SpanDecorationProbe spanDecorationProbe = SpanDecorationProbe.builder()
+                .probeId(PROBE_ID)
+                .where(TEST_APP_CLASS_NAME, TRACED_METHOD_NAME)
+                .decorations(createDecoration("tag1", "{invalidArg}"))
+                .targetSpan(SpanDecorationProbe.TargetSpan.ACTIVE)
+                .build();
+        addProbe(spanDecorationProbe);
+        waitForInstrumentation(appUrl);
+        execute(appUrl, TRACED_METHOD_NAME);
+        AtomicBoolean snapshotTest = new AtomicBoolean(false);
+        AtomicBoolean spanTest = new AtomicBoolean(false);
+        registerSnapshotListener(snapshot -> {
+            assertEquals(
+                    "Cannot find symbol: invalidArg",
+                    snapshot.getEvaluationErrors().get(0).getMessage());
+            snapshotTest.set(true);
         });
-    registerTraceListener(
-        decodedTrace -> {
-          for (DecodedSpan span : decodedTrace.getSpans()) {
-            if (isTracedFullMethodSpan(span)) {
-              assertFalse(span.getMeta().containsKey("tag1"));
-              assertEquals(
-                  "Cannot find symbol: invalidArg",
-                  span.getMeta().get("_dd.di.tag1.evaluation_error"));
-              spanTest.set(true);
+        registerTraceListener(decodedTrace -> {
+            for (DecodedSpan span : decodedTrace.getSpans()) {
+                if (isTracedFullMethodSpan(span)) {
+                    assertFalse(span.getMeta().containsKey("tag1"));
+                    assertEquals(
+                            "Cannot find symbol: invalidArg", span.getMeta().get("_dd.di.tag1.evaluation_error"));
+                    spanTest.set(true);
+                }
             }
-          }
         });
-    processRequests(
-        () -> snapshotTest.get() && spanTest.get(),
-        () ->
-            String.format(
-                "timeout snapshotTest=%s spanTest=%s", snapshotTest.get(), spanTest.get()));
-  }
+        processRequests(
+                () -> snapshotTest.get() && spanTest.get(),
+                () -> String.format("timeout snapshotTest=%s spanTest=%s", snapshotTest.get(), spanTest.get()));
+    }
 
-  @Test
-  @DisplayName("testMethodSimpleTagConditionError")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testMethodSimpleTagConditionError() throws Exception {
-    SpanDecorationProbe spanDecorationProbe =
-        SpanDecorationProbe.builder()
-            .probeId(PROBE_ID)
-            .where(TEST_APP_CLASS_NAME, TRACED_METHOD_NAME)
-            .decorations(
-                createDecoration(
-                    not(eq(ref("invalidArg"), nullValue())),
-                    "invalidArg != null",
-                    "tag1",
-                    "{argStr}"))
-            .targetSpan(SpanDecorationProbe.TargetSpan.ACTIVE)
-            .build();
-    addProbe(spanDecorationProbe);
-    waitForInstrumentation(appUrl);
-    execute(appUrl, TRACED_METHOD_NAME);
-    AtomicBoolean snapshotTest = new AtomicBoolean(false);
-    AtomicBoolean spanTest = new AtomicBoolean(false);
-    registerSnapshotListener(
-        snapshot -> {
-          assertEquals(
-              "Cannot find symbol: invalidArg", snapshot.getEvaluationErrors().get(0).getMessage());
-          snapshotTest.set(true);
+    @Test
+    @DisplayName("testMethodSimpleTagConditionError")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testMethodSimpleTagConditionError() throws Exception {
+        SpanDecorationProbe spanDecorationProbe = SpanDecorationProbe.builder()
+                .probeId(PROBE_ID)
+                .where(TEST_APP_CLASS_NAME, TRACED_METHOD_NAME)
+                .decorations(createDecoration(
+                        not(eq(ref("invalidArg"), nullValue())), "invalidArg != null", "tag1", "{argStr}"))
+                .targetSpan(SpanDecorationProbe.TargetSpan.ACTIVE)
+                .build();
+        addProbe(spanDecorationProbe);
+        waitForInstrumentation(appUrl);
+        execute(appUrl, TRACED_METHOD_NAME);
+        AtomicBoolean snapshotTest = new AtomicBoolean(false);
+        AtomicBoolean spanTest = new AtomicBoolean(false);
+        registerSnapshotListener(snapshot -> {
+            assertEquals(
+                    "Cannot find symbol: invalidArg",
+                    snapshot.getEvaluationErrors().get(0).getMessage());
+            snapshotTest.set(true);
         });
-    registerTraceListener(
-        decodedTrace -> {
-          for (DecodedSpan span : decodedTrace.getSpans()) {
-            if (isTracedFullMethodSpan(span)) {
-              assertFalse(span.getMeta().containsKey("tag1"));
-              spanTest.set(true);
+        registerTraceListener(decodedTrace -> {
+            for (DecodedSpan span : decodedTrace.getSpans()) {
+                if (isTracedFullMethodSpan(span)) {
+                    assertFalse(span.getMeta().containsKey("tag1"));
+                    spanTest.set(true);
+                }
             }
-          }
         });
-    processRequests(
-        () -> snapshotTest.get() && spanTest.get(),
-        () ->
-            String.format(
-                "timeout snapshotTest=%s spanTest=%s", snapshotTest.get(), spanTest.get()));
-  }
+        processRequests(
+                () -> snapshotTest.get() && spanTest.get(),
+                () -> String.format("timeout snapshotTest=%s spanTest=%s", snapshotTest.get(), spanTest.get()));
+    }
 
-  @Test
-  @DisplayName("testMethodMultiTagValueError")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testMethodMultiTagValueError() throws Exception {
-    List<SpanDecorationProbe.Decoration> decorations =
-        Arrays.asList(
-            createDecoration("tag1", "{invalidArg}"), createDecoration("tag2", "{invalidArg2}"));
-    SpanDecorationProbe spanDecorationProbe =
-        SpanDecorationProbe.builder()
-            .probeId(PROBE_ID)
-            .where(TEST_APP_CLASS_NAME, TRACED_METHOD_NAME)
-            .decorations(decorations)
-            .targetSpan(SpanDecorationProbe.TargetSpan.ACTIVE)
-            .build();
-    addProbe(spanDecorationProbe);
-    waitForInstrumentation(appUrl);
-    execute(appUrl, TRACED_METHOD_NAME);
-    AtomicBoolean snapshotTest = new AtomicBoolean(false);
-    AtomicBoolean spanTest = new AtomicBoolean(false);
-    registerSnapshotListener(
-        snapshot -> {
-          List<EvaluationError> evalErrors = snapshot.getEvaluationErrors();
-          assertEquals("Cannot find symbol: invalidArg", evalErrors.get(0).getMessage());
-          assertEquals("Cannot find symbol: invalidArg2", evalErrors.get(1).getMessage());
-          snapshotTest.set(true);
+    @Test
+    @DisplayName("testMethodMultiTagValueError")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testMethodMultiTagValueError() throws Exception {
+        List<SpanDecorationProbe.Decoration> decorations =
+                Arrays.asList(createDecoration("tag1", "{invalidArg}"), createDecoration("tag2", "{invalidArg2}"));
+        SpanDecorationProbe spanDecorationProbe = SpanDecorationProbe.builder()
+                .probeId(PROBE_ID)
+                .where(TEST_APP_CLASS_NAME, TRACED_METHOD_NAME)
+                .decorations(decorations)
+                .targetSpan(SpanDecorationProbe.TargetSpan.ACTIVE)
+                .build();
+        addProbe(spanDecorationProbe);
+        waitForInstrumentation(appUrl);
+        execute(appUrl, TRACED_METHOD_NAME);
+        AtomicBoolean snapshotTest = new AtomicBoolean(false);
+        AtomicBoolean spanTest = new AtomicBoolean(false);
+        registerSnapshotListener(snapshot -> {
+            List<EvaluationError> evalErrors = snapshot.getEvaluationErrors();
+            assertEquals("Cannot find symbol: invalidArg", evalErrors.get(0).getMessage());
+            assertEquals("Cannot find symbol: invalidArg2", evalErrors.get(1).getMessage());
+            snapshotTest.set(true);
         });
-    registerTraceListener(
-        decodedTrace -> {
-          for (DecodedSpan span : decodedTrace.getSpans()) {
-            if (isTracedFullMethodSpan(span)) {
-              assertFalse(span.getMeta().containsKey("tag1"));
-              assertFalse(span.getMeta().containsKey("tag2"));
-              assertEquals(
-                  "Cannot find symbol: invalidArg",
-                  span.getMeta().get("_dd.di.tag1.evaluation_error"));
-              assertEquals(
-                  "Cannot find symbol: invalidArg2",
-                  span.getMeta().get("_dd.di.tag2.evaluation_error"));
-              spanTest.set(true);
+        registerTraceListener(decodedTrace -> {
+            for (DecodedSpan span : decodedTrace.getSpans()) {
+                if (isTracedFullMethodSpan(span)) {
+                    assertFalse(span.getMeta().containsKey("tag1"));
+                    assertFalse(span.getMeta().containsKey("tag2"));
+                    assertEquals(
+                            "Cannot find symbol: invalidArg", span.getMeta().get("_dd.di.tag1.evaluation_error"));
+                    assertEquals(
+                            "Cannot find symbol: invalidArg2", span.getMeta().get("_dd.di.tag2.evaluation_error"));
+                    spanTest.set(true);
+                }
             }
-          }
         });
-    processRequests(
-        () -> snapshotTest.get() && spanTest.get(),
-        () ->
-            String.format(
-                "timeout snapshotTest=%s spanTest=%s", snapshotTest.get(), spanTest.get()));
-  }
+        processRequests(
+                () -> snapshotTest.get() && spanTest.get(),
+                () -> String.format("timeout snapshotTest=%s spanTest=%s", snapshotTest.get(), spanTest.get()));
+    }
 
-  @Test
-  @DisplayName("testSamplingSpanDecoration")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testSamplingSpanDecoration() throws Exception {
-    SpanDecorationProbe spanDecorationProbe =
-        SpanDecorationProbe.builder()
-            .probeId(PROBE_ID)
-            .where(TEST_APP_CLASS_NAME, TRACED_METHOD_NAME)
-            .decorations(createDecoration("tag1", "staticText"))
-            .targetSpan(SpanDecorationProbe.TargetSpan.ACTIVE)
-            .build();
-    addProbe(spanDecorationProbe);
-    waitForInstrumentation(appUrl);
-    execute(appUrl, "loopingTracedMethod", "100");
-    AtomicInteger count = new AtomicInteger();
-    registerTraceListener(
-        decodedTrace -> {
-          for (DecodedSpan span : decodedTrace.getSpans()) {
-            if (isTracedFullMethodSpan(span)) {
-              if (span.getMeta().containsKey("tag1")) {
-                count.incrementAndGet();
-              }
+    @Test
+    @DisplayName("testSamplingSpanDecoration")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testSamplingSpanDecoration() throws Exception {
+        SpanDecorationProbe spanDecorationProbe = SpanDecorationProbe.builder()
+                .probeId(PROBE_ID)
+                .where(TEST_APP_CLASS_NAME, TRACED_METHOD_NAME)
+                .decorations(createDecoration("tag1", "staticText"))
+                .targetSpan(SpanDecorationProbe.TargetSpan.ACTIVE)
+                .build();
+        addProbe(spanDecorationProbe);
+        waitForInstrumentation(appUrl);
+        execute(appUrl, "loopingTracedMethod", "100");
+        AtomicInteger count = new AtomicInteger();
+        registerTraceListener(decodedTrace -> {
+            for (DecodedSpan span : decodedTrace.getSpans()) {
+                if (isTracedFullMethodSpan(span)) {
+                    if (span.getMeta().containsKey("tag1")) {
+                        count.incrementAndGet();
+                    }
+                }
             }
-          }
         });
-    processRequests(() -> count.get() >= 100, () -> String.format("timeout count=%d", count.get()));
-  }
+        processRequests(() -> count.get() >= 100, () -> String.format("timeout count=%d", count.get()));
+    }
 
-  private SpanDecorationProbe.Decoration createDecoration(String tagName, String valueDsl) {
-    List<SpanDecorationProbe.Tag> tags =
-        Arrays.asList(
-            new SpanDecorationProbe.Tag(
+    private SpanDecorationProbe.Decoration createDecoration(String tagName, String valueDsl) {
+        List<SpanDecorationProbe.Tag> tags = Arrays.asList(new SpanDecorationProbe.Tag(
                 tagName, new SpanDecorationProbe.TagValue(valueDsl, parseTemplate(valueDsl))));
-    return new SpanDecorationProbe.Decoration(null, tags);
-  }
+        return new SpanDecorationProbe.Decoration(null, tags);
+    }
 
-  private SpanDecorationProbe.Decoration createDecoration(
-      BooleanExpression expression, String dsl, String tagName, String valueDsl) {
-    List<SpanDecorationProbe.Tag> tags =
-        Arrays.asList(
-            new SpanDecorationProbe.Tag(
+    private SpanDecorationProbe.Decoration createDecoration(
+            BooleanExpression expression, String dsl, String tagName, String valueDsl) {
+        List<SpanDecorationProbe.Tag> tags = Arrays.asList(new SpanDecorationProbe.Tag(
                 tagName, new SpanDecorationProbe.TagValue(valueDsl, parseTemplate(valueDsl))));
-    return new SpanDecorationProbe.Decoration(new ProbeCondition(DSL.when(expression), dsl), tags);
-  }
+        return new SpanDecorationProbe.Decoration(new ProbeCondition(DSL.when(expression), dsl), tags);
+    }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java
index 63dc4a9dc98..5de09e4847a 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java
@@ -16,102 +16,95 @@
 @NonRetryable
 public class SpanProbesIntegrationTest extends SimpleAppDebuggerIntegrationTest {
 
-  @Override
-  protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
-    List<String> commandParams = getDebuggerCommandParams();
-    commandParams.add("-Ddd.trace.enabled=true"); // explicitly enable tracer
-    return ProcessBuilderHelper.createProcessBuilder(
-        commandParams, logFilePath, getAppClass(), params);
-  }
+    @Override
+    protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
+        List<String> commandParams = getDebuggerCommandParams();
+        commandParams.add("-Ddd.trace.enabled=true"); // explicitly enable tracer
+        return ProcessBuilderHelper.createProcessBuilder(commandParams, logFilePath, getAppClass(), params);
+    }
 
-  @Test
-  @DisplayName("testMethodSpan")
-  void testMethodSpan() throws Exception {
-    final String METHOD_NAME = "fullMethod";
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 for letting the trace being sent (async)
-    SpanProbe spanProbe =
-        SpanProbe.builder().probeId(PROBE_ID).where(MAIN_CLASS_NAME, METHOD_NAME).build();
-    setCurrentConfiguration(createSpanConfig(spanProbe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+    @Test
+    @DisplayName("testMethodSpan")
+    void testMethodSpan() throws Exception {
+        final String METHOD_NAME = "fullMethod";
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 for letting the trace being sent (async)
+        SpanProbe spanProbe = SpanProbe.builder()
+                .probeId(PROBE_ID)
+                .where(MAIN_CLASS_NAME, METHOD_NAME)
+                .build();
+        setCurrentConfiguration(createSpanConfig(spanProbe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
 
-    AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
-    AtomicBoolean traceReceived = new AtomicBoolean();
-    registerTraceListener(
-        decodedTrace -> {
-          DecodedSpan decodedSpan = decodedTrace.getSpans().get(0);
-          assertEquals("Main.fullMethod", decodedSpan.getResource());
-          traceReceived.set(true);
+        AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
+        AtomicBoolean traceReceived = new AtomicBoolean();
+        registerTraceListener(decodedTrace -> {
+            DecodedSpan decodedSpan = decodedTrace.getSpans().get(0);
+            assertEquals("Main.fullMethod", decodedSpan.getResource());
+            traceReceived.set(true);
         });
-    processRequests(
-        () -> statusResult.get() && traceReceived.get(),
-        () ->
-            String.format(
-                "timeout statusResult=%s traceReceived=%s",
-                statusResult.get(), traceReceived.get()));
-  }
+        processRequests(
+                () -> statusResult.get() && traceReceived.get(),
+                () -> String.format(
+                        "timeout statusResult=%s traceReceived=%s", statusResult.get(), traceReceived.get()));
+    }
 
-  @Test
-  @DisplayName("testLineRangeSpan")
-  void testLineRangeSpan() throws Exception {
-    final String METHOD_NAME = "fullMethod";
-    final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 for letting the trace being sent (async)
-    SpanProbe spanProbe =
-        SpanProbe.builder()
-            .probeId(PROBE_ID)
-            // from line: System.out.println("fullMethod");
-            // to line: + String.join(",", argVar);
-            .where(MAIN_CLASS_NAME, 95, 104)
-            .build();
-    setCurrentConfiguration(createSpanConfig(spanProbe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
-    AtomicBoolean traceReceived = new AtomicBoolean();
-    registerTraceListener(
-        decodedTrace -> {
-          DecodedSpan decodedSpan = decodedTrace.getSpans().get(0);
-          assertEquals("Main.fullMethod:L95-104", decodedSpan.getResource());
-          traceReceived.set(true);
+    @Test
+    @DisplayName("testLineRangeSpan")
+    void testLineRangeSpan() throws Exception {
+        final String METHOD_NAME = "fullMethod";
+        final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 for letting the trace being sent (async)
+        SpanProbe spanProbe = SpanProbe.builder()
+                .probeId(PROBE_ID)
+                // from line: System.out.println("fullMethod");
+                // to line: + String.join(",", argVar);
+                .where(MAIN_CLASS_NAME, 95, 104)
+                .build();
+        setCurrentConfiguration(createSpanConfig(spanProbe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        AtomicBoolean statusResult = registerCheckReceivedInstalledEmitting(PROBE_ID);
+        AtomicBoolean traceReceived = new AtomicBoolean();
+        registerTraceListener(decodedTrace -> {
+            DecodedSpan decodedSpan = decodedTrace.getSpans().get(0);
+            assertEquals("Main.fullMethod:L95-104", decodedSpan.getResource());
+            traceReceived.set(true);
         });
-    processRequests(
-        () -> statusResult.get() && traceReceived.get(),
-        () ->
-            String.format(
-                "timeout statusResult=%s traceReceived=%s",
-                statusResult.get(), traceReceived.get()));
-  }
+        processRequests(
+                () -> statusResult.get() && traceReceived.get(),
+                () -> String.format(
+                        "timeout statusResult=%s traceReceived=%s", statusResult.get(), traceReceived.get()));
+    }
 
-  @Test
-  @DisplayName("testSingleLineSpan")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testSingleLineSpan() throws Exception {
-    final String METHOD_NAME = "fullMethod";
-    final String EXPECTED_UPLOADS = "2"; // 2 probe statuses: RECEIVED + ERROR
-    SpanProbe spanProbe =
-        SpanProbe.builder()
-            .probeId(PROBE_ID)
-            // on line: System.out.println("fullMethod");
-            .where(MAIN_CLASS_NAME, 95)
-            .build();
-    setCurrentConfiguration(createSpanConfig(spanProbe));
-    targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
-    AtomicBoolean received = new AtomicBoolean(false);
-    AtomicBoolean error = new AtomicBoolean(false);
-    registerProbeStatusListener(
-        probeStatus -> {
-          if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.RECEIVED) {
-            received.set(true);
-          }
-          if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.ERROR) {
-            assertEquals(
-                "Single line span is not supported, you need to provide a range.",
-                probeStatus.getDiagnostics().getException().getMessage());
-            error.set(true);
-          }
+    @Test
+    @DisplayName("testSingleLineSpan")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testSingleLineSpan() throws Exception {
+        final String METHOD_NAME = "fullMethod";
+        final String EXPECTED_UPLOADS = "2"; // 2 probe statuses: RECEIVED + ERROR
+        SpanProbe spanProbe = SpanProbe.builder()
+                .probeId(PROBE_ID)
+                // on line: System.out.println("fullMethod");
+                .where(MAIN_CLASS_NAME, 95)
+                .build();
+        setCurrentConfiguration(createSpanConfig(spanProbe));
+        targetProcess =
+                createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
+        AtomicBoolean received = new AtomicBoolean(false);
+        AtomicBoolean error = new AtomicBoolean(false);
+        registerProbeStatusListener(probeStatus -> {
+            if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.RECEIVED) {
+                received.set(true);
+            }
+            if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.ERROR) {
+                assertEquals(
+                        "Single line span is not supported, you need to provide a range.",
+                        probeStatus.getDiagnostics().getException().getMessage());
+                error.set(true);
+            }
         });
-    processRequests(
-        () -> received.get() && error.get(),
-        () -> String.format("timeout received=%s error=%s", received.get(), error.get()));
-  }
+        processRequests(
+                () -> received.get() && error.get(),
+                () -> String.format("timeout received=%s error=%s", received.get(), error.get()));
+    }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpringBasedIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpringBasedIntegrationTest.java
index 9f05e22735b..377f3980e5c 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpringBasedIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpringBasedIntegrationTest.java
@@ -13,67 +13,65 @@
 import okhttp3.Request;
 
 public class SpringBasedIntegrationTest extends BaseIntegrationTest {
-  protected static final String DEBUGGER_TEST_APP_CLASS =
-      "datadog.smoketest.debugger.SpringBootTestApplication";
+    protected static final String DEBUGGER_TEST_APP_CLASS = "datadog.smoketest.debugger.SpringBootTestApplication";
 
-  @Override
-  protected String getAppClass() {
-    return DEBUGGER_TEST_APP_CLASS;
-  }
+    @Override
+    protected String getAppClass() {
+        return DEBUGGER_TEST_APP_CLASS;
+    }
 
-  @Override
-  protected String getAppId() {
-    return TagsHelper.sanitize("SpringBootTestApplication");
-  }
+    @Override
+    protected String getAppId() {
+        return TagsHelper.sanitize("SpringBootTestApplication");
+    }
 
-  protected String startSpringApp(List<LogProbe> logProbes) throws Exception {
-    return startSpringApp(logProbes, false);
-  }
+    protected String startSpringApp(List<LogProbe> logProbes) throws Exception {
+        return startSpringApp(logProbes, false);
+    }
 
-  protected String startSpringApp(List<LogProbe> logProbes, boolean enableProcessTags)
-      throws Exception {
-    setCurrentConfiguration(createConfig(logProbes));
-    String httpPort = String.valueOf(PortUtils.randomOpenPort());
-    ProcessBuilder processBuilder = createProcessBuilder(logFilePath, "--server.port=" + httpPort);
-    if (!enableProcessTags) {
-      processBuilder.environment().put("DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED", "false");
+    protected String startSpringApp(List<LogProbe> logProbes, boolean enableProcessTags) throws Exception {
+        setCurrentConfiguration(createConfig(logProbes));
+        String httpPort = String.valueOf(PortUtils.randomOpenPort());
+        ProcessBuilder processBuilder = createProcessBuilder(logFilePath, "--server.port=" + httpPort);
+        if (!enableProcessTags) {
+            processBuilder.environment().put("DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED", "false");
+        }
+        targetProcess = processBuilder.start();
+        // assert in logs app started
+        waitForSpecificLogLine(
+                logFilePath,
+                "datadog.smoketest.debugger.SpringBootTestApplication - Started SpringBootTestApplication",
+                Duration.ofMillis(100),
+                Duration.ofSeconds(30));
+        return httpPort;
     }
-    targetProcess = processBuilder.start();
-    // assert in logs app started
-    waitForSpecificLogLine(
-        logFilePath,
-        "datadog.smoketest.debugger.SpringBootTestApplication - Started SpringBootTestApplication",
-        Duration.ofMillis(100),
-        Duration.ofSeconds(30));
-    return httpPort;
-  }
 
-  protected void sendRequest(String httpPort, String urlPath) {
-    OkHttpClient client = new OkHttpClient.Builder().build();
-    Request request =
-        new Request.Builder().url("http://localhost:" + httpPort + urlPath).get().build();
-    try {
-      client.newCall(request).execute();
-    } catch (Exception ex) {
-      ex.printStackTrace();
+    protected void sendRequest(String httpPort, String urlPath) {
+        OkHttpClient client = new OkHttpClient.Builder().build();
+        Request request = new Request.Builder()
+                .url("http://localhost:" + httpPort + urlPath)
+                .get()
+                .build();
+        try {
+            client.newCall(request).execute();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
     }
-  }
 
-  protected static void waitForSpecificLogLine(
-      Path logFilePath, String line, Duration sleep, Duration timeout) throws IOException {
-    boolean[] result = new boolean[] {false};
-    long total = sleep.toNanos() == 0 ? 0 : timeout.toNanos() / sleep.toNanos();
-    int i = 0;
-    while (i < total && !result[0]) {
-      Files.lines(logFilePath)
-          .forEach(
-              it -> {
+    protected static void waitForSpecificLogLine(Path logFilePath, String line, Duration sleep, Duration timeout)
+            throws IOException {
+        boolean[] result = new boolean[] {false};
+        long total = sleep.toNanos() == 0 ? 0 : timeout.toNanos() / sleep.toNanos();
+        int i = 0;
+        while (i < total && !result[0]) {
+            Files.lines(logFilePath).forEach(it -> {
                 if (it.contains(line)) {
-                  result[0] = true;
+                    result[0] = true;
                 }
-              });
-      LockSupport.parkNanos(sleep.toNanos());
-      i++;
+            });
+            LockSupport.parkNanos(sleep.toNanos());
+            i++;
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpringCodeOriginIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpringCodeOriginIntegrationTest.java
index 22cafa655fc..0f78690517e 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpringCodeOriginIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpringCodeOriginIntegrationTest.java
@@ -18,92 +18,84 @@
 @NonRetryable
 public class SpringCodeOriginIntegrationTest extends SpringBasedIntegrationTest {
 
-  private boolean traceReceived;
+    private boolean traceReceived;
 
-  @Override
-  protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
-    List<String> commandParams = getDebuggerCommandParams();
-    commandParams.add("-Ddd.trace.enabled=true"); // explicitly enable tracer
-    commandParams.add("-Ddd.code.origin.for.spans.enabled=true");
-    commandParams.add("-Ddd.code.origin.for.spans.interface.support=true");
-    return ProcessBuilderHelper.createProcessBuilder(
-        commandParams, logFilePath, getAppClass(), params);
-  }
+    @Override
+    protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
+        List<String> commandParams = getDebuggerCommandParams();
+        commandParams.add("-Ddd.trace.enabled=true"); // explicitly enable tracer
+        commandParams.add("-Ddd.code.origin.for.spans.enabled=true");
+        commandParams.add("-Ddd.code.origin.for.spans.interface.support=true");
+        return ProcessBuilderHelper.createProcessBuilder(commandParams, logFilePath, getAppClass(), params);
+    }
 
-  @Test
-  @DisplayName("testRegularController")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testRegularController() throws Exception {
-    registerTraceListener(this::receiveGreetingTrace);
-    String httpPort = startSpringApp(Collections.emptyList());
-    sendRequest(httpPort, "/greeting"); // trigger CodeOriginProbe instrumentation
-    waitForSpecificLogLine(
-        logFilePath,
-        "DEBUG com.datadog.debugger.agent.ConfigurationUpdater - Re-transformation done",
-        Duration.ofMillis(100),
-        Duration.ofSeconds(30)); // wait for instrumentation to be done
-    sendRequest(httpPort, "/greeting"); // generate first span with tags
-    processRequests(
-        () -> traceReceived, () -> String.format("Timeout! traceReceived=%s", traceReceived));
-  }
+    @Test
+    @DisplayName("testRegularController")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testRegularController() throws Exception {
+        registerTraceListener(this::receiveGreetingTrace);
+        String httpPort = startSpringApp(Collections.emptyList());
+        sendRequest(httpPort, "/greeting"); // trigger CodeOriginProbe instrumentation
+        waitForSpecificLogLine(
+                logFilePath,
+                "DEBUG com.datadog.debugger.agent.ConfigurationUpdater - Re-transformation done",
+                Duration.ofMillis(100),
+                Duration.ofSeconds(30)); // wait for instrumentation to be done
+        sendRequest(httpPort, "/greeting"); // generate first span with tags
+        processRequests(() -> traceReceived, () -> String.format("Timeout! traceReceived=%s", traceReceived));
+    }
 
-  @Test
-  @DisplayName("testInterfacedController")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testInterfacedController() throws Exception {
-    registerTraceListener(this::receiveProcessTrace);
-    String httpPort = startSpringApp(Collections.emptyList());
-    sendRequest(httpPort, "/process"); // trigger CodeOriginProbe instrumentation
-    waitForSpecificLogLine(
-        logFilePath,
-        "DEBUG com.datadog.debugger.agent.ConfigurationUpdater - Re-transformation done",
-        Duration.ofMillis(100),
-        Duration.ofSeconds(30)); // wait for instrumentation to be done
-    sendRequest(httpPort, "/process"); // generate first span with tags
-    processRequests(
-        () -> traceReceived, () -> String.format("Timeout! traceReceived=%s", traceReceived));
-  }
+    @Test
+    @DisplayName("testInterfacedController")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testInterfacedController() throws Exception {
+        registerTraceListener(this::receiveProcessTrace);
+        String httpPort = startSpringApp(Collections.emptyList());
+        sendRequest(httpPort, "/process"); // trigger CodeOriginProbe instrumentation
+        waitForSpecificLogLine(
+                logFilePath,
+                "DEBUG com.datadog.debugger.agent.ConfigurationUpdater - Re-transformation done",
+                Duration.ofMillis(100),
+                Duration.ofSeconds(30)); // wait for instrumentation to be done
+        sendRequest(httpPort, "/process"); // generate first span with tags
+        processRequests(() -> traceReceived, () -> String.format("Timeout! traceReceived=%s", traceReceived));
+    }
 
-  private void receiveGreetingTrace(DecodedTrace decodedTrace) {
-    for (DecodedSpan span : decodedTrace.getSpans()) {
-      if (span.getName().equals("spring.handler")
-          && span.getResource().equals("WebController.greeting")
-          && span.getMeta().containsKey(DDTags.DD_CODE_ORIGIN_FRAME_TYPE)) {
-        assertEquals("entry", span.getMeta().get(DDTags.DD_CODE_ORIGIN_TYPE));
-        assertEquals(
-            "datadog.smoketest.debugger.controller.WebController",
-            span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_TYPE));
-        assertEquals("WebController.java", span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_FILE));
-        assertEquals("10", span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_LINE));
-        assertEquals("greeting", span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_METHOD));
-        assertEquals("()", span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_SIGNATURE));
-        assertFalse(traceReceived);
-        traceReceived = true;
-      }
+    private void receiveGreetingTrace(DecodedTrace decodedTrace) {
+        for (DecodedSpan span : decodedTrace.getSpans()) {
+            if (span.getName().equals("spring.handler")
+                    && span.getResource().equals("WebController.greeting")
+                    && span.getMeta().containsKey(DDTags.DD_CODE_ORIGIN_FRAME_TYPE)) {
+                assertEquals("entry", span.getMeta().get(DDTags.DD_CODE_ORIGIN_TYPE));
+                assertEquals(
+                        "datadog.smoketest.debugger.controller.WebController",
+                        span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_TYPE));
+                assertEquals("WebController.java", span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_FILE));
+                assertEquals("10", span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_LINE));
+                assertEquals("greeting", span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_METHOD));
+                assertEquals("()", span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_SIGNATURE));
+                assertFalse(traceReceived);
+                traceReceived = true;
+            }
+        }
     }
-  }
 
-  private void receiveProcessTrace(DecodedTrace decodedTrace) {
-    for (DecodedSpan span : decodedTrace.getSpans()) {
-      if (span.getName().equals("spring.handler")
-          && span.getResource().equals("InterfacedController.process")
-          && span.getMeta().containsKey(DDTags.DD_CODE_ORIGIN_FRAME_TYPE)) {
-        assertEquals("entry", span.getMeta().get(DDTags.DD_CODE_ORIGIN_TYPE));
-        assertEquals(
-            "datadog.smoketest.debugger.controller.InterfacedController",
-            span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_TYPE));
-        assertEquals(
-            "InterfacedController.java", span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_FILE));
-        assertEquals("11", span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_LINE));
-        assertEquals("process", span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_METHOD));
-        assertEquals("()", span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_SIGNATURE));
-        assertFalse(traceReceived);
-        traceReceived = true;
-      }
+    private void receiveProcessTrace(DecodedTrace decodedTrace) {
+        for (DecodedSpan span : decodedTrace.getSpans()) {
+            if (span.getName().equals("spring.handler")
+                    && span.getResource().equals("InterfacedController.process")
+                    && span.getMeta().containsKey(DDTags.DD_CODE_ORIGIN_FRAME_TYPE)) {
+                assertEquals("entry", span.getMeta().get(DDTags.DD_CODE_ORIGIN_TYPE));
+                assertEquals(
+                        "datadog.smoketest.debugger.controller.InterfacedController",
+                        span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_TYPE));
+                assertEquals("InterfacedController.java", span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_FILE));
+                assertEquals("11", span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_LINE));
+                assertEquals("process", span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_METHOD));
+                assertEquals("()", span.getMeta().get(DDTags.DD_CODE_ORIGIN_FRAME_SIGNATURE));
+                assertFalse(traceReceived);
+                traceReceived = true;
+            }
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java
index bd3572287f7..c40618ad9ac 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java
@@ -29,186 +29,162 @@
 @NonRetryable
 public class TracerDebuggerIntegrationTest extends SpringBasedIntegrationTest {
 
-  private static final ProbeId PROBE_ID = new ProbeId("123356536", 1);
+    private static final ProbeId PROBE_ID = new ProbeId("123356536", 1);
 
-  @ParameterizedTest(name = "Process tags enabled ''{0}''")
-  @ValueSource(booleans = {true, false})
-  @DisplayName("testTracer")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testTracer(boolean processTagsEnabled) throws Exception {
-    LogProbe logProbe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(
-                "org.springframework.web.servlet.DispatcherServlet",
-                "doService",
-                "(HttpServletRequest, HttpServletResponse)")
-            .captureSnapshot(true)
-            .build();
-    AtomicBoolean requestReceived = new AtomicBoolean(false);
-    registerIntakeRequestListener(
-        intakeRequest -> {
-          assertEquals(
-              PROBE_ID.getId(), intakeRequest.getDebugger().getSnapshot().getProbe().getId());
-          assertTrue(Pattern.matches("[0-9a-f]+", intakeRequest.getTraceId()));
-          assertTrue(Pattern.matches("\\d+", intakeRequest.getSpanId()));
-          if (processTagsEnabled) {
-            assertNotNull(intakeRequest.getProcessTags());
-            assertTrue(
-                intakeRequest
-                    .getProcessTags()
-                    .contains("entrypoint.name:" + TagsHelper.sanitize(DEBUGGER_TEST_APP_CLASS)));
-          } else {
-            assertNull(intakeRequest.getProcessTags());
-          }
-          requestReceived.set(true);
+    @ParameterizedTest(name = "Process tags enabled ''{0}''")
+    @ValueSource(booleans = {true, false})
+    @DisplayName("testTracer")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testTracer(boolean processTagsEnabled) throws Exception {
+        LogProbe logProbe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(
+                        "org.springframework.web.servlet.DispatcherServlet",
+                        "doService",
+                        "(HttpServletRequest, HttpServletResponse)")
+                .captureSnapshot(true)
+                .build();
+        AtomicBoolean requestReceived = new AtomicBoolean(false);
+        registerIntakeRequestListener(intakeRequest -> {
+            assertEquals(
+                    PROBE_ID.getId(),
+                    intakeRequest.getDebugger().getSnapshot().getProbe().getId());
+            assertTrue(Pattern.matches("[0-9a-f]+", intakeRequest.getTraceId()));
+            assertTrue(Pattern.matches("\\d+", intakeRequest.getSpanId()));
+            if (processTagsEnabled) {
+                assertNotNull(intakeRequest.getProcessTags());
+                assertTrue(intakeRequest
+                        .getProcessTags()
+                        .contains("entrypoint.name:" + TagsHelper.sanitize(DEBUGGER_TEST_APP_CLASS)));
+            } else {
+                assertNull(intakeRequest.getProcessTags());
+            }
+            requestReceived.set(true);
         });
-    String httpPort = startSpringApp(singletonList(logProbe), processTagsEnabled);
-    sendRequest(httpPort, "/greeting");
-    processRequests(
-        requestReceived::get,
-        () -> String.format("timeout requestReceived=%s", requestReceived.get()));
-  }
+        String httpPort = startSpringApp(singletonList(logProbe), processTagsEnabled);
+        sendRequest(httpPort, "/greeting");
+        processRequests(requestReceived::get, () -> String.format("timeout requestReceived=%s", requestReceived.get()));
+    }
 
-  @Test
-  @DisplayName("testTracerDynamicLog")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testTracerDynamicLog() throws Exception {
-    LogProbe logProbe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where(
-                "org.springframework.web.servlet.DispatcherServlet",
-                "doService",
-                "(HttpServletRequest, HttpServletResponse)")
-            .captureSnapshot(false)
-            .evaluateAt(MethodLocation.EXIT)
-            .build();
-    AtomicBoolean requestReceived = new AtomicBoolean(false);
-    registerIntakeRequestListener(
-        intakeRequest -> {
-          Snapshot snapshot = intakeRequest.getDebugger().getSnapshot();
-          assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
-          assertTrue(Pattern.matches("[0-9a-f]+", intakeRequest.getTraceId()));
-          assertTrue(Pattern.matches("\\d+", intakeRequest.getSpanId()));
-          assertFalse(
-              logHasErrors(
-                  logFilePath, it -> it.contains("TypePool$Resolution$NoSuchTypeException")));
-          requestReceived.set(true);
+    @Test
+    @DisplayName("testTracerDynamicLog")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testTracerDynamicLog() throws Exception {
+        LogProbe logProbe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where(
+                        "org.springframework.web.servlet.DispatcherServlet",
+                        "doService",
+                        "(HttpServletRequest, HttpServletResponse)")
+                .captureSnapshot(false)
+                .evaluateAt(MethodLocation.EXIT)
+                .build();
+        AtomicBoolean requestReceived = new AtomicBoolean(false);
+        registerIntakeRequestListener(intakeRequest -> {
+            Snapshot snapshot = intakeRequest.getDebugger().getSnapshot();
+            assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
+            assertTrue(Pattern.matches("[0-9a-f]+", intakeRequest.getTraceId()));
+            assertTrue(Pattern.matches("\\d+", intakeRequest.getSpanId()));
+            assertFalse(logHasErrors(logFilePath, it -> it.contains("TypePool$Resolution$NoSuchTypeException")));
+            requestReceived.set(true);
         });
-    String httpPort = startSpringApp(singletonList(logProbe));
-    sendRequest(httpPort, "/greeting");
-    processRequests(
-        requestReceived::get,
-        () -> String.format("timeout requestReceived=%s", requestReceived.get()));
-  }
+        String httpPort = startSpringApp(singletonList(logProbe));
+        sendRequest(httpPort, "/greeting");
+        processRequests(requestReceived::get, () -> String.format("timeout requestReceived=%s", requestReceived.get()));
+    }
 
-  @Test
-  @DisplayName("testTracerSameMethod")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testTracerSameMethod() throws Exception {
-    LogProbe logProbe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .where("datadog.smoketest.debugger.controller.WebController", "processWithArg", null)
-            .captureSnapshot(true)
-            .build();
-    AtomicBoolean requestReceived = new AtomicBoolean(false);
-    registerIntakeRequestListener(
-        intakeRequest -> {
-          Snapshot snapshot = intakeRequest.getDebugger().getSnapshot();
-          assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
-          assertEquals(
-              42, snapshot.getCaptures().getEntry().getArguments().get("argInt").getValue());
-          // no locals captured
-          assertNull(snapshot.getCaptures().getEntry().getLocals());
-          assertTrue(Pattern.matches("[0-9a-f]+", intakeRequest.getTraceId()));
-          assertTrue(Pattern.matches("\\d+", intakeRequest.getSpanId()));
-          requestReceived.set(true);
+    @Test
+    @DisplayName("testTracerSameMethod")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testTracerSameMethod() throws Exception {
+        LogProbe logProbe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .where("datadog.smoketest.debugger.controller.WebController", "processWithArg", null)
+                .captureSnapshot(true)
+                .build();
+        AtomicBoolean requestReceived = new AtomicBoolean(false);
+        registerIntakeRequestListener(intakeRequest -> {
+            Snapshot snapshot = intakeRequest.getDebugger().getSnapshot();
+            assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
+            assertEquals(
+                    42,
+                    snapshot.getCaptures()
+                            .getEntry()
+                            .getArguments()
+                            .get("argInt")
+                            .getValue());
+            // no locals captured
+            assertNull(snapshot.getCaptures().getEntry().getLocals());
+            assertTrue(Pattern.matches("[0-9a-f]+", intakeRequest.getTraceId()));
+            assertTrue(Pattern.matches("\\d+", intakeRequest.getSpanId()));
+            requestReceived.set(true);
         });
-    String httpPort = startSpringApp(singletonList(logProbe));
-    sendRequest(httpPort, "/greeting");
-    processRequests(
-        requestReceived::get,
-        () -> String.format("timeout requestReceived=%s", requestReceived.get()));
-  }
+        String httpPort = startSpringApp(singletonList(logProbe));
+        sendRequest(httpPort, "/greeting");
+        processRequests(requestReceived::get, () -> String.format("timeout requestReceived=%s", requestReceived.get()));
+    }
 
-  @Test
-  @DisplayName("testTracerLineSnapshotProbe")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testTracerLineSnapshotProbe() throws Exception {
-    LogProbe logProbe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            // on line: System.out.println(argInt);
-            .where("WebController.java", 15)
-            .captureSnapshot(true)
-            .build();
-    AtomicBoolean requestReceived = new AtomicBoolean(false);
-    registerIntakeRequestListener(
-        intakeRequest -> {
-          Snapshot snapshot = intakeRequest.getDebugger().getSnapshot();
-          assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
-          assertEquals(
-              42,
-              snapshot.getCaptures().getLines().get(15).getArguments().get("argInt").getValue());
-          assertTrue(Pattern.matches("[0-9a-f]+", intakeRequest.getTraceId()));
-          assertTrue(Pattern.matches("\\d+", intakeRequest.getSpanId()));
-          requestReceived.set(true);
+    @Test
+    @DisplayName("testTracerLineSnapshotProbe")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testTracerLineSnapshotProbe() throws Exception {
+        LogProbe logProbe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                // on line: System.out.println(argInt);
+                .where("WebController.java", 15)
+                .captureSnapshot(true)
+                .build();
+        AtomicBoolean requestReceived = new AtomicBoolean(false);
+        registerIntakeRequestListener(intakeRequest -> {
+            Snapshot snapshot = intakeRequest.getDebugger().getSnapshot();
+            assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
+            assertEquals(
+                    42,
+                    snapshot.getCaptures()
+                            .getLines()
+                            .get(15)
+                            .getArguments()
+                            .get("argInt")
+                            .getValue());
+            assertTrue(Pattern.matches("[0-9a-f]+", intakeRequest.getTraceId()));
+            assertTrue(Pattern.matches("\\d+", intakeRequest.getSpanId()));
+            requestReceived.set(true);
         });
-    String httpPort = startSpringApp(singletonList(logProbe));
-    sendRequest(httpPort, "/greeting");
-    processRequests(
-        requestReceived::get,
-        () -> String.format("timeout requestReceived=%s", requestReceived.get()));
-  }
+        String httpPort = startSpringApp(singletonList(logProbe));
+        sendRequest(httpPort, "/greeting");
+        processRequests(requestReceived::get, () -> String.format("timeout requestReceived=%s", requestReceived.get()));
+    }
 
-  @Test
-  @DisplayName("testTracerLineDynamicLogProbe")
-  @DisabledIf(
-      value = "datadog.environment.JavaVirtualMachine#isJ9",
-      disabledReason = "Flaky on J9 JVMs")
-  void testTracerLineDynamicLogProbe() throws Exception {
-    final String LOG_TEMPLATE = "processWithArg {argInt}";
-    LogProbe logProbe =
-        LogProbe.builder()
-            .probeId(PROBE_ID)
-            .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
-            // on line: System.out.println(argInt);
-            .where("WebController.java", 15)
-            .captureSnapshot(false)
-            .build();
-    AtomicBoolean requestReceived = new AtomicBoolean(false);
-    registerIntakeRequestListener(
-        intakeRequest -> {
-          Snapshot snapshot = intakeRequest.getDebugger().getSnapshot();
-          assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
-          assertEquals("processWithArg 42", intakeRequest.getMessage());
-          assertTrue(Pattern.matches("[0-9a-f]+", intakeRequest.getTraceId()));
-          assertTrue(Pattern.matches("\\d+", intakeRequest.getSpanId()));
-          requestReceived.set(true);
+    @Test
+    @DisplayName("testTracerLineDynamicLogProbe")
+    @DisabledIf(value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs")
+    void testTracerLineDynamicLogProbe() throws Exception {
+        final String LOG_TEMPLATE = "processWithArg {argInt}";
+        LogProbe logProbe = LogProbe.builder()
+                .probeId(PROBE_ID)
+                .template(LOG_TEMPLATE, parseTemplate(LOG_TEMPLATE))
+                // on line: System.out.println(argInt);
+                .where("WebController.java", 15)
+                .captureSnapshot(false)
+                .build();
+        AtomicBoolean requestReceived = new AtomicBoolean(false);
+        registerIntakeRequestListener(intakeRequest -> {
+            Snapshot snapshot = intakeRequest.getDebugger().getSnapshot();
+            assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());
+            assertEquals("processWithArg 42", intakeRequest.getMessage());
+            assertTrue(Pattern.matches("[0-9a-f]+", intakeRequest.getTraceId()));
+            assertTrue(Pattern.matches("\\d+", intakeRequest.getSpanId()));
+            requestReceived.set(true);
         });
-    String httpPort = startSpringApp(singletonList(logProbe));
-    sendRequest(httpPort, "/greeting");
-    processRequests(
-        requestReceived::get,
-        () -> String.format("timeout requestReceived=%s", requestReceived.get()));
-  }
+        String httpPort = startSpringApp(singletonList(logProbe));
+        sendRequest(httpPort, "/greeting");
+        processRequests(requestReceived::get, () -> String.format("timeout requestReceived=%s", requestReceived.get()));
+    }
 
-  @Override
-  protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
-    List<String> commandParams = getDebuggerCommandParams();
-    commandParams.add(
-        "-Ddd.trace.methods=datadog.smoketest.debugger.controller.WebController[processWithArg]");
-    return ProcessBuilderHelper.createProcessBuilder(
-        commandParams, logFilePath, getAppClass(), params);
-  }
+    @Override
+    protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
+        List<String> commandParams = getDebuggerCommandParams();
+        commandParams.add("-Ddd.trace.methods=datadog.smoketest.debugger.controller.WebController[processWithArg]");
+        return ProcessBuilderHelper.createProcessBuilder(commandParams, logFilePath, getAppClass(), params);
+    }
 }
diff --git a/dd-smoke-tests/dynamic-config/src/main/java/datadog/smoketest/dynamicconfig/AppSecApplication.java b/dd-smoke-tests/dynamic-config/src/main/java/datadog/smoketest/dynamicconfig/AppSecApplication.java
index 0167449bed4..12027f3b8ad 100644
--- a/dd-smoke-tests/dynamic-config/src/main/java/datadog/smoketest/dynamicconfig/AppSecApplication.java
+++ b/dd-smoke-tests/dynamic-config/src/main/java/datadog/smoketest/dynamicconfig/AppSecApplication.java
@@ -4,11 +4,11 @@
 
 public class AppSecApplication {
 
-  public static final long TIMEOUT_IN_SECONDS = 15;
+    public static final long TIMEOUT_IN_SECONDS = 15;
 
-  public static void main(String[] args) throws InterruptedException {
-    // just wait as we want to test RC payloads
-    Thread.sleep(TimeUnit.SECONDS.toMillis(TIMEOUT_IN_SECONDS));
-    System.exit(0);
-  }
+    public static void main(String[] args) throws InterruptedException {
+        // just wait as we want to test RC payloads
+        Thread.sleep(TimeUnit.SECONDS.toMillis(TIMEOUT_IN_SECONDS));
+        System.exit(0);
+    }
 }
diff --git a/dd-smoke-tests/dynamic-config/src/main/java/datadog/smoketest/dynamicconfig/ServiceMappingApplication.java b/dd-smoke-tests/dynamic-config/src/main/java/datadog/smoketest/dynamicconfig/ServiceMappingApplication.java
index a6fb79578aa..3152c60104b 100644
--- a/dd-smoke-tests/dynamic-config/src/main/java/datadog/smoketest/dynamicconfig/ServiceMappingApplication.java
+++ b/dd-smoke-tests/dynamic-config/src/main/java/datadog/smoketest/dynamicconfig/ServiceMappingApplication.java
@@ -8,30 +8,30 @@
 import java.util.concurrent.TimeUnit;
 
 public class ServiceMappingApplication {
-  public static final String ORIGINAL_SERVICE_NAME = "foo";
-  public static final String MAPPED_SERVICE_NAME = "bar";
+    public static final String ORIGINAL_SERVICE_NAME = "foo";
+    public static final String MAPPED_SERVICE_NAME = "bar";
 
-  public static final long TIMEOUT_IN_NANOS = TimeUnit.SECONDS.toNanos(10);
+    public static final long TIMEOUT_IN_NANOS = TimeUnit.SECONDS.toNanos(10);
 
-  public static void main(String[] args) throws InterruptedException {
-    Tracer tracer = GlobalTracer.get();
+    public static void main(String[] args) throws InterruptedException {
+        Tracer tracer = GlobalTracer.get();
 
-    long startTime = System.nanoTime();
+        long startTime = System.nanoTime();
 
-    while (System.nanoTime() - startTime < TIMEOUT_IN_NANOS) {
-      Span span = tracer.buildSpan("someOperation").start();
-      span.setTag(DDTags.SERVICE_NAME, ORIGINAL_SERVICE_NAME);
-      String serviceName = ((MutableSpan) span).getServiceName();
+        while (System.nanoTime() - startTime < TIMEOUT_IN_NANOS) {
+            Span span = tracer.buildSpan("someOperation").start();
+            span.setTag(DDTags.SERVICE_NAME, ORIGINAL_SERVICE_NAME);
+            String serviceName = ((MutableSpan) span).getServiceName();
 
-      if (serviceName.equals(MAPPED_SERVICE_NAME)) {
-        System.out.println("Service mapping updated to dynamic value");
-        System.exit(0);
-      }
+            if (serviceName.equals(MAPPED_SERVICE_NAME)) {
+                System.out.println("Service mapping updated to dynamic value");
+                System.exit(0);
+            }
 
-      Thread.sleep(500);
-    }
+            Thread.sleep(500);
+        }
 
-    System.out.println("Service mapping never updated");
-    System.exit(1);
-  }
+        System.out.println("Service mapping never updated");
+        System.exit(1);
+    }
 }
diff --git a/dd-smoke-tests/dynamic-config/src/test/java/datadog/smoketest/AppSecActivationSmokeTest.java b/dd-smoke-tests/dynamic-config/src/test/java/datadog/smoketest/AppSecActivationSmokeTest.java
index 6e83f85d3b2..63d2797f78a 100644
--- a/dd-smoke-tests/dynamic-config/src/test/java/datadog/smoketest/AppSecActivationSmokeTest.java
+++ b/dd-smoke-tests/dynamic-config/src/test/java/datadog/smoketest/AppSecActivationSmokeTest.java
@@ -39,91 +39,85 @@
  * app's short lifetime) and additionally asserts telemetry is flowing.
  */
 class AppSecActivationSmokeTest {
-  private static final String APPLICATION_JAR =
-      System.getProperty("datadog.smoketest.shadowJar.path");
-  private static final EnumSet<Product> ASM_RULE_PRODUCTS = of(ASM, ASM_DD, ASM_DATA);
+    private static final String APPLICATION_JAR = System.getProperty("datadog.smoketest.shadowJar.path");
+    private static final EnumSet<Product> ASM_RULE_PRODUCTS = of(ASM, ASM_DD, ASM_DATA);
 
-  // Inline backend owned by the app; held as a field so the test can push and read remote-config.
-  static final AgentBackend agent = AgentBackend.testAgent();
+    // Inline backend owned by the app; held as a field so the test can push and read remote-config.
+    static final AgentBackend agent = AgentBackend.testAgent();
 
-  @RegisterExtension
-  static final SmokeCliApp app =
-      SmokeCliApp.named("appsec-activation")
-          .mainClass(AppSecApplication.class, APPLICATION_JAR)
-          .jvmArgs("-Ddd.remote_config.enabled=true", "-Ddd.remote_config.poll_interval.seconds=1")
-          .backend(agent)
-          .build();
+    @RegisterExtension
+    static final SmokeCliApp app = SmokeCliApp.named("appsec-activation")
+            .mainClass(AppSecApplication.class, APPLICATION_JAR)
+            .jvmArgs("-Ddd.remote_config.enabled=true", "-Ddd.remote_config.poll_interval.seconds=1")
+            .backend(agent)
+            .build();
 
-  @Test
-  void activatesAppSecViaRemoteConfig() {
-    assumeFalse(isOracleJDK8(), "Telemetry product-change event flakes on Oracle JDK 8");
+    @Test
+    void activatesAppSecViaRemoteConfig() {
+        assumeFalse(isOracleJDK8(), "Telemetry product-change event flakes on Oracle JDK 8");
 
-    RemoteConfig remoteConfig = agent.remoteConfig();
-    Telemetry telemetry = agent.telemetry();
+        RemoteConfig remoteConfig = agent.remoteConfig();
+        Telemetry telemetry = agent.telemetry();
 
-    // AppSec is enabled but inactive: a poll that has not subscribed to any ASM rule product yet
-    // advertises the ASM_ACTIVATION capability, but not ASM_CUSTOM_RULES.
-    Map<String, Object> beforeActivation =
-        remoteConfig.waitForRequest(
-            request -> disjoint(decodeProducts(request), ASM_RULE_PRODUCTS), TIMEOUT_IN_SECONDS);
-    long capabilities = RemoteConfig.capabilities(beforeActivation);
-    assertTrue(hasCapability(capabilities, CAPABILITY_ASM_ACTIVATION), "ASM_ACTIVATION advertised");
-    assertFalse(
-        hasCapability(capabilities, CAPABILITY_ASM_CUSTOM_RULES),
-        "ASM_CUSTOM_RULES not advertised while inactive");
+        // AppSec is enabled but inactive: a poll that has not subscribed to any ASM rule product yet
+        // advertises the ASM_ACTIVATION capability, but not ASM_CUSTOM_RULES.
+        Map<String, Object> beforeActivation = remoteConfig.waitForRequest(
+                request -> disjoint(decodeProducts(request), ASM_RULE_PRODUCTS), TIMEOUT_IN_SECONDS);
+        long capabilities = RemoteConfig.capabilities(beforeActivation);
+        assertTrue(hasCapability(capabilities, CAPABILITY_ASM_ACTIVATION), "ASM_ACTIVATION advertised");
+        assertFalse(
+                hasCapability(capabilities, CAPABILITY_ASM_CUSTOM_RULES),
+                "ASM_CUSTOM_RULES not advertised while inactive");
 
-    // Activate AppSec via Remote Config.
-    remoteConfig.setConfig(
-        "datadog/2/ASM_FEATURES/asm_features_activation/config", "{\"asm\":{\"enabled\":true}}");
+        // Activate AppSec via Remote Config.
+        remoteConfig.setConfig("datadog/2/ASM_FEATURES/asm_features_activation/config", "{\"asm\":{\"enabled\":true}}");
 
-    // The tracer reports the applied change via a telemetry configuration event.
-    telemetry.waitForFlat(
-        AppSecActivationSmokeTest::appsecEnabledFromRemoteConfig, TIMEOUT_IN_SECONDS);
+        // The tracer reports the applied change via a telemetry configuration event.
+        telemetry.waitForFlat(AppSecActivationSmokeTest::appsecEnabledFromRemoteConfig, TIMEOUT_IN_SECONDS);
 
-    // Now active: the tracer subscribes to the ASM rule products and advertises ASM_CUSTOM_RULES.
-    Map<String, Object> afterActivation =
-        remoteConfig.waitForRequest(
-            request -> decodeProducts(request).containsAll(ASM_RULE_PRODUCTS), TIMEOUT_IN_SECONDS);
-    assertTrue(
-        hasCapability(RemoteConfig.capabilities(afterActivation), CAPABILITY_ASM_CUSTOM_RULES),
-        "ASM_CUSTOM_RULES advertised after activation");
-  }
-
-  // A flattened telemetry event whose payload records DD_APPSEC_ENABLED=true from remote config.
-  @SuppressWarnings("unchecked")
-  private static boolean appsecEnabledFromRemoteConfig(Map<String, Object> event) {
-    Object payload = event.get("payload");
-    if (!(payload instanceof Map)) {
-      return false;
-    }
-    Object configuration = ((Map<String, Object>) payload).get("configuration");
-    if (!(configuration instanceof List)) {
-      return false;
+        // Now active: the tracer subscribes to the ASM rule products and advertises ASM_CUSTOM_RULES.
+        Map<String, Object> afterActivation = remoteConfig.waitForRequest(
+                request -> decodeProducts(request).containsAll(ASM_RULE_PRODUCTS), TIMEOUT_IN_SECONDS);
+        assertTrue(
+                hasCapability(RemoteConfig.capabilities(afterActivation), CAPABILITY_ASM_CUSTOM_RULES),
+                "ASM_CUSTOM_RULES advertised after activation");
     }
-    for (Object entry : (List<?>) configuration) {
-      if (entry instanceof Map) {
-        Map<String, Object> config = (Map<String, Object>) entry;
-        if ("DD_APPSEC_ENABLED".equals(config.get("name"))
-            && "true".equals(config.get("value"))
-            && "remote_config".equals(config.get("origin"))) {
-          return true;
+
+    // A flattened telemetry event whose payload records DD_APPSEC_ENABLED=true from remote config.
+    @SuppressWarnings("unchecked")
+    private static boolean appsecEnabledFromRemoteConfig(Map<String, Object> event) {
+        Object payload = event.get("payload");
+        if (!(payload instanceof Map)) {
+            return false;
+        }
+        Object configuration = ((Map<String, Object>) payload).get("configuration");
+        if (!(configuration instanceof List)) {
+            return false;
         }
-      }
+        for (Object entry : (List<?>) configuration) {
+            if (entry instanceof Map) {
+                Map<String, Object> config = (Map<String, Object>) entry;
+                if ("DD_APPSEC_ENABLED".equals(config.get("name"))
+                        && "true".equals(config.get("value"))
+                        && "remote_config".equals(config.get("origin"))) {
+                    return true;
+                }
+            }
+        }
+        return false;
     }
-    return false;
-  }
 
-  // The products a Remote Config poll subscribes to, decoded from the wire strings into typed
-  // Product values (the tracer serializes them from this same enum).
-  private static Set<Product> decodeProducts(Map<String, Object> request) {
-    Set<Product> products = EnumSet.noneOf(Product.class);
-    for (String name : RemoteConfig.products(request)) {
-      products.add(Product.valueOf(name));
+    // The products a Remote Config poll subscribes to, decoded from the wire strings into typed
+    // Product values (the tracer serializes them from this same enum).
+    private static Set<Product> decodeProducts(Map<String, Object> request) {
+        Set<Product> products = EnumSet.noneOf(Product.class);
+        for (String name : RemoteConfig.products(request)) {
+            products.add(Product.valueOf(name));
+        }
+        return products;
     }
-    return products;
-  }
 
-  private static boolean hasCapability(long capabilities, long capability) {
-    return (capabilities & capability) != 0;
-  }
+    private static boolean hasCapability(long capabilities, long capability) {
+        return (capabilities & capability) != 0;
+    }
 }
diff --git a/dd-smoke-tests/dynamic-config/src/test/java/datadog/smoketest/DynamicServiceMappingSmokeTest.java b/dd-smoke-tests/dynamic-config/src/test/java/datadog/smoketest/DynamicServiceMappingSmokeTest.java
index 2805652786e..60caea0e907 100644
--- a/dd-smoke-tests/dynamic-config/src/test/java/datadog/smoketest/DynamicServiceMappingSmokeTest.java
+++ b/dd-smoke-tests/dynamic-config/src/test/java/datadog/smoketest/DynamicServiceMappingSmokeTest.java
@@ -23,34 +23,32 @@
  * tracer. Telemetry is not the subject here, so the default telemetry check is skipped.
  */
 class DynamicServiceMappingSmokeTest {
-  private static final String APPLICATION_JAR =
-      System.getProperty("datadog.smoketest.shadowJar.path");
-  // Inline backend owned by the app; held as a field so the test can push a remote-config payload.
-  private static final TestAgentBackend agent = AgentBackend.testAgentBuilder().build();
+    private static final String APPLICATION_JAR = System.getProperty("datadog.smoketest.shadowJar.path");
+    // Inline backend owned by the app; held as a field so the test can push a remote-config payload.
+    private static final TestAgentBackend agent =
+            AgentBackend.testAgentBuilder().build();
 
-  @RegisterExtension
-  static final SmokeCliApp app =
-      SmokeCliApp.named("dynamic-service-mapping")
-          .mainClass(ServiceMappingApplication.class, APPLICATION_JAR)
-          .jvmArgs("-Ddd.remote_config.enabled=true", "-Ddd.remote_config.poll_interval.seconds=1")
-          .backend(agent)
-          .skipTelemetryCheck()
-          .build();
+    @RegisterExtension
+    static final SmokeCliApp app = SmokeCliApp.named("dynamic-service-mapping")
+            .mainClass(ServiceMappingApplication.class, APPLICATION_JAR)
+            .jvmArgs("-Ddd.remote_config.enabled=true", "-Ddd.remote_config.poll_interval.seconds=1")
+            .backend(agent)
+            .skipTelemetryCheck()
+            .build();
 
-  @Test
-  void updatedServiceMappingObserved() {
-    // Push a service-mapping override; the tracer picks it up on its next /v0.7/config poll and the
-    // app exits 0 once it observes the remapped service name (or exits 1 after its 10s timeout).
-    agent
-        .remoteConfig()
-        .setConfig(
-            "datadog/2/APM_TRACING/config_overrides/config",
-            "{\"lib_config\":{\"tracing_service_mapping\":[{"
-                + "\"from_key\":\""
-                + ORIGINAL_SERVICE_NAME
-                + "\",\"to_name\":\""
-                + MAPPED_SERVICE_NAME
-                + "\"}]}}");
-    app.assertCompletesWithValue(30, SECONDS, 0);
-  }
+    @Test
+    void updatedServiceMappingObserved() {
+        // Push a service-mapping override; the tracer picks it up on its next /v0.7/config poll and the
+        // app exits 0 once it observes the remapped service name (or exits 1 after its 10s timeout).
+        agent.remoteConfig()
+                .setConfig(
+                        "datadog/2/APM_TRACING/config_overrides/config",
+                        "{\"lib_config\":{\"tracing_service_mapping\":[{"
+                                + "\"from_key\":\""
+                                + ORIGINAL_SERVICE_NAME
+                                + "\",\"to_name\":\""
+                                + MAPPED_SERVICE_NAME
+                                + "\"}]}}");
+        app.assertCompletesWithValue(30, SECONDS, 0);
+    }
 }
diff --git a/dd-smoke-tests/field-injection/src/main/java/datadog/smoketest/fieldinjection/FieldInjectionApp.java b/dd-smoke-tests/field-injection/src/main/java/datadog/smoketest/fieldinjection/FieldInjectionApp.java
index 997f2191da4..8fdbb431a89 100644
--- a/dd-smoke-tests/field-injection/src/main/java/datadog/smoketest/fieldinjection/FieldInjectionApp.java
+++ b/dd-smoke-tests/field-injection/src/main/java/datadog/smoketest/fieldinjection/FieldInjectionApp.java
@@ -8,33 +8,33 @@
 @SuppressForbidden
 public class FieldInjectionApp {
 
-  public static void main(String... args) {
-    for (String className : args) {
-      try {
-        Class<?> klass = Class.forName(className);
-        while (klass != null) {
-          for (Field field : klass.getDeclaredFields()) {
-            if (field.getName().startsWith("__datadogContext")) {
-              System.out.println("___FIELD___:" + className + ":" + field.getName());
+    public static void main(String... args) {
+        for (String className : args) {
+            try {
+                Class<?> klass = Class.forName(className);
+                while (klass != null) {
+                    for (Field field : klass.getDeclaredFields()) {
+                        if (field.getName().startsWith("__datadogContext")) {
+                            System.out.println("___FIELD___:" + className + ":" + field.getName());
+                        }
+                    }
+                    for (Class<?> intf : klass.getInterfaces()) {
+                        System.out.println("___INTERFACE___:" + className + ":" + intf.getName());
+                    }
+                    for (Type genericIntf : klass.getGenericInterfaces()) {
+                        Class<?> intf;
+                        if (genericIntf instanceof ParameterizedType) {
+                            intf = (Class<?>) ((ParameterizedType) genericIntf).getRawType();
+                        } else {
+                            intf = (Class<?>) genericIntf;
+                        }
+                        System.out.println("___GENERIC_INTERFACE___:" + className + ":" + intf.getName());
+                    }
+                    klass = klass.getSuperclass();
+                }
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace(System.err);
             }
-          }
-          for (Class<?> intf : klass.getInterfaces()) {
-            System.out.println("___INTERFACE___:" + className + ":" + intf.getName());
-          }
-          for (Type genericIntf : klass.getGenericInterfaces()) {
-            Class<?> intf;
-            if (genericIntf instanceof ParameterizedType) {
-              intf = (Class<?>) ((ParameterizedType) genericIntf).getRawType();
-            } else {
-              intf = (Class<?>) genericIntf;
-            }
-            System.out.println("___GENERIC_INTERFACE___:" + className + ":" + intf.getName());
-          }
-          klass = klass.getSuperclass();
         }
-      } catch (ClassNotFoundException e) {
-        e.printStackTrace(System.err);
-      }
     }
-  }
 }
diff --git a/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/AbstractGradleTest.java b/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/AbstractGradleTest.java
index 6cb475766af..0fd65eff22e 100644
--- a/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/AbstractGradleTest.java
+++ b/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/AbstractGradleTest.java
@@ -30,253 +30,233 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public abstract class AbstractGradleTest extends CiVisibilitySmokeTest {
 
-  private static final Properties TOOL_VERSIONS = loadToolVersions();
-  protected static final String LATEST_GRADLE_VERSION = toolVersion("gradle.latest");
+    private static final Properties TOOL_VERSIONS = loadToolVersions();
+    protected static final String LATEST_GRADLE_VERSION = toolVersion("gradle.latest");
 
-  // test resources use this instead of ".gradle" to avoid unwanted evaluation
-  private static final String GRADLE_TEST_RESOURCE_EXTENSION = ".gradleTest";
-  private static final String GRADLE_REGULAR_EXTENSION = ".gradle";
+    // test resources use this instead of ".gradle" to avoid unwanted evaluation
+    private static final String GRADLE_TEST_RESOURCE_EXTENSION = ".gradleTest";
+    private static final String GRADLE_REGULAR_EXTENSION = ".gradle";
 
-  private static final ComparableVersion GRADLE_9 = new ComparableVersion("9.0.0");
+    private static final ComparableVersion GRADLE_9 = new ComparableVersion("9.0.0");
 
-  // Gradle daemons may keep file handles on their temp directory open for a short while after being
-  // stopped; retry a few times to give them a chance to release before giving up.
-  private static final int TEMP_DIR_CLEANUP_RETRIES = 10;
-  private static final long TEMP_DIR_CLEANUP_RETRY_DELAY_MILLIS = 200;
+    // Gradle daemons may keep file handles on their temp directory open for a short while after being
+    // stopped; retry a few times to give them a chance to release before giving up.
+    private static final int TEMP_DIR_CLEANUP_RETRIES = 10;
+    private static final long TEMP_DIR_CLEANUP_RETRY_DELAY_MILLIS = 200;
 
-  @TempDir protected Path projectFolder;
+    @TempDir
+    protected Path projectFolder;
 
-  protected final MockBackend mockBackend = new MockBackend();
+    protected final MockBackend mockBackend = new MockBackend();
 
-  @BeforeEach
-  void resetMockBackend() {
-    mockBackend.reset();
-  }
-
-  @AfterAll
-  void closeMockBackend() throws Exception {
-    mockBackend.close();
-  }
-
-  /**
-   * Recursively deletes a directory that a Gradle daemon has been writing into, on a best-effort
-   * basis. We delete it ourselves (rather than letting JUnit's {@code @TempDir} cleanup do it at
-   * class teardown) because a daemon may not have released its file handles on {@code
-   * caches/<version>} by the time the recursive delete runs, which makes the delete fail with a
-   * {@link java.nio.file.DirectoryNotEmptyException}.
-   */
-  protected static void deleteTempDirectoryQuietly(Path directory) {
-    if (directory == null) {
-      return;
-    }
-    for (int attempt = 0;
-        attempt < TEMP_DIR_CLEANUP_RETRIES && Files.exists(directory);
-        attempt++) {
-      FileUtils.deleteQuietly(directory.toFile());
-      if (!Files.exists(directory)) {
-        return;
-      }
-      try {
-        Thread.sleep(TEMP_DIR_CLEANUP_RETRY_DELAY_MILLIS);
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-        return;
-      }
+    @BeforeEach
+    void resetMockBackend() {
+        mockBackend.reset();
     }
-    if (Files.exists(directory)) {
-      System.err.println(
-          "WARNING: could not fully delete temp directory "
-              + directory
-              + " after stopping Gradle daemons; leaving it for the OS to reap. "
-              + "A Gradle daemon likely still holds a file handle on it.");
+
+    @AfterAll
+    void closeMockBackend() throws Exception {
+        mockBackend.close();
     }
-  }
 
-  /** Kills the Gradle daemons whose logs live under {@code testKitDir}, on a best-effort basis. */
-  protected static void killGradleDaemonsIn(Path testKitDir) {
-    if (testKitDir == null || !Files.exists(testKitDir)) {
-      return;
+    /**
+     * Recursively deletes a directory that a Gradle daemon has been writing into, on a best-effort
+     * basis. We delete it ourselves (rather than letting JUnit's {@code @TempDir} cleanup do it at
+     * class teardown) because a daemon may not have released its file handles on {@code
+     * caches/<version>} by the time the recursive delete runs, which makes the delete fail with a
+     * {@link java.nio.file.DirectoryNotEmptyException}.
+     */
+    protected static void deleteTempDirectoryQuietly(Path directory) {
+        if (directory == null) {
+            return;
+        }
+        for (int attempt = 0; attempt < TEMP_DIR_CLEANUP_RETRIES && Files.exists(directory); attempt++) {
+            FileUtils.deleteQuietly(directory.toFile());
+            if (!Files.exists(directory)) {
+                return;
+            }
+            try {
+                Thread.sleep(TEMP_DIR_CLEANUP_RETRY_DELAY_MILLIS);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                return;
+            }
+        }
+        if (Files.exists(directory)) {
+            System.err.println("WARNING: could not fully delete temp directory "
+                    + directory
+                    + " after stopping Gradle daemons; leaving it for the OS to reap. "
+                    + "A Gradle daemon likely still holds a file handle on it.");
+        }
     }
-    boolean windows = OperatingSystem.isWindows();
-    try (Stream<Path> files = Files.walk(testKitDir)) {
-      files
-          .filter(Files::isRegularFile)
-          .forEach(
-              file -> {
+
+    /** Kills the Gradle daemons whose logs live under {@code testKitDir}, on a best-effort basis. */
+    protected static void killGradleDaemonsIn(Path testKitDir) {
+        if (testKitDir == null || !Files.exists(testKitDir)) {
+            return;
+        }
+        boolean windows = OperatingSystem.isWindows();
+        try (Stream<Path> files = Files.walk(testKitDir)) {
+            files.filter(Files::isRegularFile).forEach(file -> {
                 String name = file.getFileName().toString();
                 if (!name.startsWith("daemon-") || !name.endsWith(".out.log")) {
-                  return;
+                    return;
                 }
-                String pid =
-                    name.substring("daemon-".length(), name.length() - ".out.log".length());
+                String pid = name.substring("daemon-".length(), name.length() - ".out.log".length());
                 if (!pid.matches("\\d+")) {
-                  // skip the UUID fallback Gradle uses when the PID is unavailable
-                  return;
+                    // skip the UUID fallback Gradle uses when the PID is unavailable
+                    return;
                 }
                 ProcessBuilder kill =
-                    windows
-                        ? new ProcessBuilder("taskkill", "/F", "/PID", pid)
-                        : new ProcessBuilder("kill", pid);
+                        windows ? new ProcessBuilder("taskkill", "/F", "/PID", pid) : new ProcessBuilder("kill", pid);
                 try {
-                  kill.redirectErrorStream(true).start().waitFor(5, TimeUnit.SECONDS);
+                    kill.redirectErrorStream(true).start().waitFor(5, TimeUnit.SECONDS);
                 } catch (InterruptedException e) {
-                  Thread.currentThread().interrupt();
+                    Thread.currentThread().interrupt();
                 } catch (Exception e) {
-                  // best effort — the daemon may already be stopped
+                    // best effort — the daemon may already be stopped
                 }
-              });
-    } catch (Exception e) {
-      // best effort — failing to enumerate daemon logs must not fail the test run
+            });
+        } catch (Exception e) {
+            // best effort — failing to enumerate daemon logs must not fail the test run
+        }
     }
-  }
 
-  private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("\\$\\{(.+?)\\}");
+    private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("\\$\\{(.+?)\\}");
 
-  protected void givenGradleProjectFiles(String projectFilesSources) throws IOException {
-    givenGradleProjectFiles(projectFilesSources, Collections.emptyMap());
-  }
-
-  protected void givenGradleProjectFiles(
-      String projectFilesSources, Map<String, Map<String, String>> replacementsByFileName)
-      throws IOException {
-    Path projectResourcesPath;
-    try {
-      projectResourcesPath =
-          Paths.get(this.getClass().getClassLoader().getResource(projectFilesSources).toURI());
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+    protected void givenGradleProjectFiles(String projectFilesSources) throws IOException {
+        givenGradleProjectFiles(projectFilesSources, Collections.emptyMap());
     }
-    FileUtils.copyDirectory(projectResourcesPath.toFile(), projectFolder.toFile());
 
-    Files.walkFileTree(
-        projectFolder,
-        new SimpleFileVisitor<Path>() {
-          @Override
-          public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-              throws IOException {
-            Map<String, String> replacements =
-                replacementsByFileName.get(file.getFileName().toString());
-            if (replacements != null) {
-              String fileContents = new String(Files.readAllBytes(file), StandardCharsets.UTF_8);
-              Matcher matcher = PLACEHOLDER_PATTERN.matcher(fileContents);
+    protected void givenGradleProjectFiles(
+            String projectFilesSources, Map<String, Map<String, String>> replacementsByFileName) throws IOException {
+        Path projectResourcesPath;
+        try {
+            projectResourcesPath = Paths.get(this.getClass()
+                    .getClassLoader()
+                    .getResource(projectFilesSources)
+                    .toURI());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        FileUtils.copyDirectory(projectResourcesPath.toFile(), projectFolder.toFile());
 
-              StringBuffer result = new StringBuffer();
-              while (matcher.find()) {
-                String propertyName = matcher.group(1);
-                String replacement = replacements.getOrDefault(propertyName, matcher.group(0));
-                matcher.appendReplacement(result, Matcher.quoteReplacement(replacement));
-              }
-              matcher.appendTail(result);
+        Files.walkFileTree(projectFolder, new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                Map<String, String> replacements =
+                        replacementsByFileName.get(file.getFileName().toString());
+                if (replacements != null) {
+                    String fileContents = new String(Files.readAllBytes(file), StandardCharsets.UTF_8);
+                    Matcher matcher = PLACEHOLDER_PATTERN.matcher(fileContents);
 
-              Files.write(file, result.toString().getBytes(StandardCharsets.UTF_8));
-            }
+                    StringBuffer result = new StringBuffer();
+                    while (matcher.find()) {
+                        String propertyName = matcher.group(1);
+                        String replacement = replacements.getOrDefault(propertyName, matcher.group(0));
+                        matcher.appendReplacement(result, Matcher.quoteReplacement(replacement));
+                    }
+                    matcher.appendTail(result);
 
-            if (file.toString().endsWith(GRADLE_TEST_RESOURCE_EXTENSION)) {
-              Path fileWithFixedExtension =
-                  Paths.get(
-                      file.toString()
-                          .replace(GRADLE_TEST_RESOURCE_EXTENSION, GRADLE_REGULAR_EXTENSION));
-              Files.move(file, fileWithFixedExtension);
-            }
+                    Files.write(file, result.toString().getBytes(StandardCharsets.UTF_8));
+                }
 
-            return FileVisitResult.CONTINUE;
-          }
+                if (file.toString().endsWith(GRADLE_TEST_RESOURCE_EXTENSION)) {
+                    Path fileWithFixedExtension = Paths.get(
+                            file.toString().replace(GRADLE_TEST_RESOURCE_EXTENSION, GRADLE_REGULAR_EXTENSION));
+                    Files.move(file, fileWithFixedExtension);
+                }
+
+                return FileVisitResult.CONTINUE;
+            }
         });
 
-    // creating empty .git directory so that the tracer could detect projectFolder as repo root
-    Files.createDirectory(projectFolder.resolve(".git"));
-  }
+        // creating empty .git directory so that the tracer could detect projectFolder as repo root
+        Files.createDirectory(projectFolder.resolve(".git"));
+    }
 
-  protected void givenGradleVersionIsCompatibleWithCurrentJvm(String gradleVersion) {
-    Assumptions.assumeTrue(
-        isSupported(new ComparableVersion(gradleVersion)),
-        "Current JVM does not support Gradle version " + gradleVersion);
-  }
+    protected void givenGradleVersionIsCompatibleWithCurrentJvm(String gradleVersion) {
+        Assumptions.assumeTrue(
+                isSupported(new ComparableVersion(gradleVersion)),
+                "Current JVM does not support Gradle version " + gradleVersion);
+    }
 
-  private static boolean isSupported(ComparableVersion gradleVersion) {
-    // https://docs.gradle.org/current/userguide/compatibility.html
-    // TODO: remove once Gradle supports running on JDK 27.
-    if (JavaVirtualMachine.isJavaVersionAtLeast(27)) {
-      return false;
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(26)) {
-      return gradleVersion.compareTo(new ComparableVersion("9.4")) >= 0;
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(25)) {
-      return gradleVersion.compareTo(new ComparableVersion("9.1")) >= 0;
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(24)) {
-      return gradleVersion.compareTo(new ComparableVersion("8.14")) >= 0;
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(21)) {
-      return gradleVersion.compareTo(new ComparableVersion("8.4")) >= 0;
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(20)) {
-      return gradleVersion.compareTo(new ComparableVersion("8.1")) >= 0;
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(19)) {
-      return gradleVersion.compareTo(new ComparableVersion("7.6")) >= 0;
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(18)) {
-      return gradleVersion.compareTo(new ComparableVersion("7.5")) >= 0;
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(17)) {
-      return gradleVersion.compareTo(new ComparableVersion("7.3")) >= 0;
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(16)) {
-      return isWithin(gradleVersion, new ComparableVersion("7.0"), GRADLE_9);
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(15)) {
-      return isWithin(gradleVersion, new ComparableVersion("6.7"), GRADLE_9);
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(14)) {
-      return isWithin(gradleVersion, new ComparableVersion("6.3"), GRADLE_9);
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(13)) {
-      return isWithin(gradleVersion, new ComparableVersion("6.0"), GRADLE_9);
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(12)) {
-      return isWithin(gradleVersion, new ComparableVersion("5.4"), GRADLE_9);
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(11)) {
-      return isWithin(gradleVersion, new ComparableVersion("5.0"), GRADLE_9);
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(10)) {
-      return isWithin(gradleVersion, new ComparableVersion("4.7"), GRADLE_9);
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(9)) {
-      return isWithin(gradleVersion, new ComparableVersion("4.3"), GRADLE_9);
-    } else if (JavaVirtualMachine.isJavaVersionAtLeast(8)) {
-      return isWithin(gradleVersion, new ComparableVersion("2.0"), GRADLE_9);
+    private static boolean isSupported(ComparableVersion gradleVersion) {
+        // https://docs.gradle.org/current/userguide/compatibility.html
+        // TODO: remove once Gradle supports running on JDK 27.
+        if (JavaVirtualMachine.isJavaVersionAtLeast(27)) {
+            return false;
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(26)) {
+            return gradleVersion.compareTo(new ComparableVersion("9.4")) >= 0;
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(25)) {
+            return gradleVersion.compareTo(new ComparableVersion("9.1")) >= 0;
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(24)) {
+            return gradleVersion.compareTo(new ComparableVersion("8.14")) >= 0;
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(21)) {
+            return gradleVersion.compareTo(new ComparableVersion("8.4")) >= 0;
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(20)) {
+            return gradleVersion.compareTo(new ComparableVersion("8.1")) >= 0;
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(19)) {
+            return gradleVersion.compareTo(new ComparableVersion("7.6")) >= 0;
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(18)) {
+            return gradleVersion.compareTo(new ComparableVersion("7.5")) >= 0;
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(17)) {
+            return gradleVersion.compareTo(new ComparableVersion("7.3")) >= 0;
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(16)) {
+            return isWithin(gradleVersion, new ComparableVersion("7.0"), GRADLE_9);
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(15)) {
+            return isWithin(gradleVersion, new ComparableVersion("6.7"), GRADLE_9);
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(14)) {
+            return isWithin(gradleVersion, new ComparableVersion("6.3"), GRADLE_9);
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(13)) {
+            return isWithin(gradleVersion, new ComparableVersion("6.0"), GRADLE_9);
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(12)) {
+            return isWithin(gradleVersion, new ComparableVersion("5.4"), GRADLE_9);
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(11)) {
+            return isWithin(gradleVersion, new ComparableVersion("5.0"), GRADLE_9);
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(10)) {
+            return isWithin(gradleVersion, new ComparableVersion("4.7"), GRADLE_9);
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(9)) {
+            return isWithin(gradleVersion, new ComparableVersion("4.3"), GRADLE_9);
+        } else if (JavaVirtualMachine.isJavaVersionAtLeast(8)) {
+            return isWithin(gradleVersion, new ComparableVersion("2.0"), GRADLE_9);
+        }
+        return false;
     }
-    return false;
-  }
 
-  private static boolean isWithin(
-      ComparableVersion version,
-      ComparableVersion lowerInclusive,
-      ComparableVersion upperExclusive) {
-    return version.compareTo(lowerInclusive) >= 0 && version.compareTo(upperExclusive) < 0;
-  }
+    private static boolean isWithin(
+            ComparableVersion version, ComparableVersion lowerInclusive, ComparableVersion upperExclusive) {
+        return version.compareTo(lowerInclusive) >= 0 && version.compareTo(upperExclusive) < 0;
+    }
 
-  protected void givenConfigurationCacheIsCompatibleWithCurrentPlatform(
-      boolean configurationCacheEnabled) {
-    if (configurationCacheEnabled) {
-      Assumptions.assumeFalse(
-          JavaVirtualMachine.isIbm8(), "Configuration cache is not compatible with IBM 8");
+    protected void givenConfigurationCacheIsCompatibleWithCurrentPlatform(boolean configurationCacheEnabled) {
+        if (configurationCacheEnabled) {
+            Assumptions.assumeFalse(JavaVirtualMachine.isIbm8(), "Configuration cache is not compatible with IBM 8");
+        }
     }
-  }
 
-  private static Properties loadToolVersions() {
-    Properties properties = new Properties();
-    try (InputStream stream =
-        AbstractGradleTest.class
-            .getClassLoader()
-            .getResourceAsStream("latest-tool-versions.properties")) {
-      if (stream == null) {
-        throw new IllegalStateException(
-            "Could not find latest-tool-versions.properties on classpath");
-      }
-      properties.load(stream);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+    private static Properties loadToolVersions() {
+        Properties properties = new Properties();
+        try (InputStream stream =
+                AbstractGradleTest.class.getClassLoader().getResourceAsStream("latest-tool-versions.properties")) {
+            if (stream == null) {
+                throw new IllegalStateException("Could not find latest-tool-versions.properties on classpath");
+            }
+            properties.load(stream);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return properties;
     }
-    return properties;
-  }
 
-  protected static String toolVersion(String key) {
-    String value = TOOL_VERSIONS.getProperty(key);
-    if (value == null) {
-      throw new IllegalStateException(
-          "Missing '"
-              + key
-              + "' in latest-tool-versions.properties; re-run the "
-              + "update-smoke-test-latest-versions workflow.");
+    protected static String toolVersion(String key) {
+        String value = TOOL_VERSIONS.getProperty(key);
+        if (value == null) {
+            throw new IllegalStateException("Missing '"
+                    + key
+                    + "' in latest-tool-versions.properties; re-run the "
+                    + "update-smoke-test-latest-versions workflow.");
+        }
+        return value;
     }
-    return value;
-  }
 }
diff --git a/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java b/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java
index 22dc76ce8a6..9929d068d85 100644
--- a/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java
+++ b/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java
@@ -50,697 +50,657 @@
 @TypeConverterSources(CiVisibilityTableTestConverters.class)
 class GradleDaemonSmokeTest extends AbstractGradleTest {
 
-  private static final String TEST_SERVICE_NAME = "test-gradle-service";
-  private static final Path GRADLE_DAEMON_DIAGNOSTICS_DIR =
-      Paths.get(
-          System.getProperty("datadog.smoketest.builddir", "build"),
-          "reports",
-          "gradle-daemon-diagnostics");
-  private static final Pattern DAEMON_LOG_PATTERN = Pattern.compile("daemon-(.+)\\.out\\.log");
-
-  // Gradle's default timeout is 10s
-  private static final int GRADLE_DISTRIBUTION_NETWORK_TIMEOUT = 30_000;
-
-  // Cleanup is handled manually in stopGradleTestKitDaemons() instead of by JUnit: the TestKit
-  // daemons may still hold file handles on this directory at class teardown, which would make
-  // JUnit's recursive delete fail and turn the class into an executionError.
-  @TempDir(cleanup = CleanupMode.NEVER)
-  static Path testKitFolder;
-
-  @AfterAll
-  void stopGradleTestKitDaemons() {
-    try {
-      DefaultGradleConnector.close();
-    } catch (Exception e) {
-      System.err.println("Failed to stop Gradle TestKit daemons during cleanup: " + e);
-    }
-    killGradleDaemonsIn(testKitFolder);
-    deleteTempDirectoryQuietly(testKitFolder);
-  }
-
-  @TableTest({
-    "scenario                    | gradleVersion | projectName                                      | successExpected | expectedTraces | expectedCoverages",
-    "succeed-old-gradle-oldest   | oldest        | test-succeed-old-gradle                          | true            | 5              | 1                ",
-    "succeed-legacy              | 7.6.4         | test-succeed-legacy-instrumentation              | true            | 5              | 1                ",
-    "succeed-multi-module-legacy | 7.6.4         | test-succeed-multi-module-legacy-instrumentation | true            | 7              | 2                ",
-    "succeed-multi-forks-legacy  | 7.6.4         | test-succeed-multi-forks-legacy-instrumentation  | true            | 6              | 2                ",
-    "skip-legacy                 | 7.6.4         | test-skip-legacy-instrumentation                 | true            | 2              | 0                ",
-    "failed-legacy               | 7.6.4         | test-failed-legacy-instrumentation               | false           | 4              | 0                ",
-    "corrupted-config-legacy     | 7.6.4         | test-corrupted-config-legacy-instrumentation     | false           | 1              | 0                "
-  })
-  @ParameterizedTest
-  void testLegacy(
-      String gradleVersion,
-      String projectName,
-      boolean successExpected,
-      int expectedTraces,
-      int expectedCoverages)
-      throws IOException {
-    // Jacoco plugin does not work with OpenJ9 in older Gradle versions
-    Assumptions.assumeFalse(
-        JavaVirtualMachine.isJ9(),
-        "Jacoco plugin does not work with OpenJ9 in older Gradle versions");
-    runGradleTest(
-        gradleVersion,
-        projectName,
-        false,
-        successExpected,
-        false,
-        expectedTraces,
-        expectedCoverages);
-  }
-
-  @TableTest({
-    "scenario                   | gradleVersion | projectName                                   | configurationCache | successExpected | flakyRetries | expectedTraces | expectedCoverages",
-    "succeed-new-8.3            | 8.3           | test-succeed-new-instrumentation              | {false, true}      | true            | false        | 5              | 1                ",
-    "succeed-new-8.9            | 8.9           | test-succeed-new-instrumentation              | {false, true}      | true            | false        | 5              | 1                ",
-    "succeed-new-latest         | latest        | test-succeed-new-instrumentation              | {false, true}      | true            | false        | 5              | 1                ",
-    "succeed-multi-module-new   | latest        | test-succeed-multi-module-new-instrumentation | false              | true            | false        | 7              | 2                ",
-    "succeed-multi-forks-new    | latest        | test-succeed-multi-forks-new-instrumentation  | false              | true            | false        | 6              | 2                ",
-    "skip-new                   | latest        | test-skip-new-instrumentation                 | false              | true            | false        | 2              | 0                ",
-    "failed-new                 | latest        | test-failed-new-instrumentation               | false              | false           | false        | 4              | 0                ",
-    "corrupted-config-new       | latest        | test-corrupted-config-new-instrumentation     | false              | false           | false        | 1              | 0                ",
-    "succeed-junit-5            | latest        | test-succeed-junit-5                          | false              | true            | false        | 5              | 1                ",
-    "failed-flaky-retries       | latest        | test-failed-flaky-retries                     | false              | false           | true         | 8              | 0                ",
-    "succeed-gradle-plugin-test | latest        | test-succeed-gradle-plugin-test               | false              | true            | false        | 5              | 0                "
-  })
-  @ParameterizedTest
-  void testNew(
-      String gradleVersion,
-      String projectName,
-      boolean configurationCache,
-      boolean successExpected,
-      boolean flakyRetries,
-      int expectedTraces,
-      int expectedCoverages)
-      throws IOException {
-    runGradleTest(
-        gradleVersion,
-        projectName,
-        configurationCache,
-        successExpected,
-        flakyRetries,
-        expectedTraces,
-        expectedCoverages);
-  }
-
-  @TableTest({
-    "scenario       | gradleVersion | emptySelection | disableInstrumentation | failAfterTests | configurationCache | expectedStatus | expectedTests",
-    "empty-8.3      | 8.3           | true           | false                  | false          | false              | skip           | 0            ",
-    "empty-latest   | latest        | true           | false                  | false          | {false, true}      | skip           | 0            ",
-    "nonempty       | latest        | false          | false                  | false          | false              | pass           | 2            ",
-    "uninstrumented | latest        | false          | true                   | false          | false              | pass           | 0            ",
-    "empty-failure  | latest        | true           | false                  | true           | false              | fail           | 0            "
-  })
-  @ParameterizedTest
-  void testEmptyTestExecution(
-      String gradleVersion,
-      boolean emptySelection,
-      boolean disableInstrumentation,
-      boolean failAfterTests,
-      boolean configurationCache,
-      String expectedStatus,
-      int expectedTests)
-      throws IOException {
-    gradleVersion = resolveVersion(gradleVersion);
-    givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion);
-    givenGradleVersionIsSupportedByCurrentGradleTestKit(gradleVersion);
-    givenConfigurationCacheIsCompatibleWithCurrentPlatform(configurationCache);
-    givenGradleProjectFiles("test-succeed-junit-5");
-    givenGradleProjectProperties();
-    ensureDependenciesDownloaded(gradleVersion);
-
-    List<String> arguments =
-        new ArrayList<>(Arrays.asList("test", "--stacktrace", "--rerun-tasks"));
-    if (emptySelection) {
-      arguments.add("-PemptyTestSelection");
-    }
-    if (disableInstrumentation) {
-      arguments.add("-PdisableTestInstrumentation");
+    private static final String TEST_SERVICE_NAME = "test-gradle-service";
+    private static final Path GRADLE_DAEMON_DIAGNOSTICS_DIR = Paths.get(
+            System.getProperty("datadog.smoketest.builddir", "build"), "reports", "gradle-daemon-diagnostics");
+    private static final Pattern DAEMON_LOG_PATTERN = Pattern.compile("daemon-(.+)\\.out\\.log");
+
+    // Gradle's default timeout is 10s
+    private static final int GRADLE_DISTRIBUTION_NETWORK_TIMEOUT = 30_000;
+
+    // Cleanup is handled manually in stopGradleTestKitDaemons() instead of by JUnit: the TestKit
+    // daemons may still hold file handles on this directory at class teardown, which would make
+    // JUnit's recursive delete fail and turn the class into an executionError.
+    @TempDir(cleanup = CleanupMode.NEVER)
+    static Path testKitFolder;
+
+    @AfterAll
+    void stopGradleTestKitDaemons() {
+        try {
+            DefaultGradleConnector.close();
+        } catch (Exception e) {
+            System.err.println("Failed to stop Gradle TestKit daemons during cleanup: " + e);
+        }
+        killGradleDaemonsIn(testKitFolder);
+        deleteTempDirectoryQuietly(testKitFolder);
     }
-    if (failAfterTests) {
-      arguments.add("-PfailAfterTests");
+
+    @TableTest({
+      "scenario                    | gradleVersion | projectName                                      | successExpected | expectedTraces | expectedCoverages",
+      "succeed-old-gradle-oldest   | oldest        | test-succeed-old-gradle                          | true            | 5              | 1                ",
+      "succeed-legacy              | 7.6.4         | test-succeed-legacy-instrumentation              | true            | 5              | 1                ",
+      "succeed-multi-module-legacy | 7.6.4         | test-succeed-multi-module-legacy-instrumentation | true            | 7              | 2                ",
+      "succeed-multi-forks-legacy  | 7.6.4         | test-succeed-multi-forks-legacy-instrumentation  | true            | 6              | 2                ",
+      "skip-legacy                 | 7.6.4         | test-skip-legacy-instrumentation                 | true            | 2              | 0                ",
+      "failed-legacy               | 7.6.4         | test-failed-legacy-instrumentation               | false           | 4              | 0                ",
+      "corrupted-config-legacy     | 7.6.4         | test-corrupted-config-legacy-instrumentation     | false           | 1              | 0                "
+    })
+    @ParameterizedTest
+    void testLegacy(
+            String gradleVersion,
+            String projectName,
+            boolean successExpected,
+            int expectedTraces,
+            int expectedCoverages)
+            throws IOException {
+        // Jacoco plugin does not work with OpenJ9 in older Gradle versions
+        Assumptions.assumeFalse(
+                JavaVirtualMachine.isJ9(), "Jacoco plugin does not work with OpenJ9 in older Gradle versions");
+        runGradleTest(gradleVersion, projectName, false, successExpected, false, expectedTraces, expectedCoverages);
     }
-    if (configurationCache) {
-      arguments.add("--configuration-cache");
+
+    @TableTest({
+      "scenario                   | gradleVersion | projectName                                   | configurationCache | successExpected | flakyRetries | expectedTraces | expectedCoverages",
+      "succeed-new-8.3            | 8.3           | test-succeed-new-instrumentation              | {false, true}      | true            | false        | 5              | 1                ",
+      "succeed-new-8.9            | 8.9           | test-succeed-new-instrumentation              | {false, true}      | true            | false        | 5              | 1                ",
+      "succeed-new-latest         | latest        | test-succeed-new-instrumentation              | {false, true}      | true            | false        | 5              | 1                ",
+      "succeed-multi-module-new   | latest        | test-succeed-multi-module-new-instrumentation | false              | true            | false        | 7              | 2                ",
+      "succeed-multi-forks-new    | latest        | test-succeed-multi-forks-new-instrumentation  | false              | true            | false        | 6              | 2                ",
+      "skip-new                   | latest        | test-skip-new-instrumentation                 | false              | true            | false        | 2              | 0                ",
+      "failed-new                 | latest        | test-failed-new-instrumentation               | false              | false           | false        | 4              | 0                ",
+      "corrupted-config-new       | latest        | test-corrupted-config-new-instrumentation     | false              | false           | false        | 1              | 0                ",
+      "succeed-junit-5            | latest        | test-succeed-junit-5                          | false              | true            | false        | 5              | 1                ",
+      "failed-flaky-retries       | latest        | test-failed-flaky-retries                     | false              | false           | true         | 8              | 0                ",
+      "succeed-gradle-plugin-test | latest        | test-succeed-gradle-plugin-test               | false              | true            | false        | 5              | 0                "
+    })
+    @ParameterizedTest
+    void testNew(
+            String gradleVersion,
+            String projectName,
+            boolean configurationCache,
+            boolean successExpected,
+            boolean flakyRetries,
+            int expectedTraces,
+            int expectedCoverages)
+            throws IOException {
+        runGradleTest(
+                gradleVersion,
+                projectName,
+                configurationCache,
+                successExpected,
+                flakyRetries,
+                expectedTraces,
+                expectedCoverages);
     }
 
-    for (int run = 0; run < (configurationCache ? 2 : 1); run++) {
-      mockBackend.reset();
-      BuildResult result = runGradle(gradleVersion, arguments, !failAfterTests);
-      assertNotNull(result.task(":test"));
-      assertEquals(
-          failAfterTests ? TaskOutcome.FAILED : TaskOutcome.SUCCESS,
-          result.task(":test").getOutcome());
-      List<? extends Map<?, ?>> events = mockBackend.waitForEvents(expectedTests == 0 ? 2 : 5);
-      long actualTests = events.stream().filter(event -> "test".equals(event.get("type"))).count();
-      assertEquals(expectedTests, actualTests);
-      int parents = 0;
-      for (Map<?, ?> event : events) {
-        String type = (String) event.get("type");
-        if ("test_session_end".equals(type) || "test_module_end".equals(type)) {
-          parents++;
-          Map<?, ?> content = (Map<?, ?>) event.get("content");
-          Map<?, ?> meta = (Map<?, ?>) content.get("meta");
-          assertEquals(expectedStatus, meta.get(Tags.TEST_STATUS));
-          if ("skip".equals(expectedStatus) && "test_module_end".equals(type)) {
-            assertEquals("No tests were executed by Gradle", meta.get(Tags.TEST_SKIP_REASON));
-          }
+    @TableTest({
+      "scenario       | gradleVersion | emptySelection | disableInstrumentation | failAfterTests | configurationCache | expectedStatus | expectedTests",
+      "empty-8.3      | 8.3           | true           | false                  | false          | false              | skip           | 0            ",
+      "empty-latest   | latest        | true           | false                  | false          | {false, true}      | skip           | 0            ",
+      "nonempty       | latest        | false          | false                  | false          | false              | pass           | 2            ",
+      "uninstrumented | latest        | false          | true                   | false          | false              | pass           | 0            ",
+      "empty-failure  | latest        | true           | false                  | true           | false              | fail           | 0            "
+    })
+    @ParameterizedTest
+    void testEmptyTestExecution(
+            String gradleVersion,
+            boolean emptySelection,
+            boolean disableInstrumentation,
+            boolean failAfterTests,
+            boolean configurationCache,
+            String expectedStatus,
+            int expectedTests)
+            throws IOException {
+        gradleVersion = resolveVersion(gradleVersion);
+        givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion);
+        givenGradleVersionIsSupportedByCurrentGradleTestKit(gradleVersion);
+        givenConfigurationCacheIsCompatibleWithCurrentPlatform(configurationCache);
+        givenGradleProjectFiles("test-succeed-junit-5");
+        givenGradleProjectProperties();
+        ensureDependenciesDownloaded(gradleVersion);
+
+        List<String> arguments = new ArrayList<>(Arrays.asList("test", "--stacktrace", "--rerun-tasks"));
+        if (emptySelection) {
+            arguments.add("-PemptyTestSelection");
         }
-      }
-      assertEquals(2, parents);
-      if (configurationCache && run == 1) {
-        assertTrue(result.getOutput().contains("Reusing configuration cache."));
-      }
-    }
-  }
-
-  @TableTest({
-    "scenario           | gradleVersion | robolectricVersion | expectedVersion | projectName              | expectedTraces",
-    "robolectric-4.16   | latest        | 4.16.1             | 4.16.1          | test-succeed-robolectric | 7             ",
-    "robolectric-latest | latest        | +                  | any             | test-succeed-robolectric | 7             "
-  })
-  @ParameterizedTest
-  void testRobolectric(
-      String gradleVersion,
-      String robolectricVersion,
-      String expectedVersion,
-      String projectName,
-      int expectedTraces)
-      throws IOException {
-    Assumptions.assumeTrue(
-        JavaVirtualMachine.isJavaVersionBetween(17, 22), "Robolectric supports JDK 17-21");
-    Assumptions.assumeFalse(
-        OperatingSystem.architecture().isArm64(),
-        "Robolectric does not support arm64 (missing native runtime binaries, follow https://github.com/robolectric/robolectric/issues/9166)");
-
-    gradleVersion = resolveVersion(gradleVersion);
-    givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion);
-    givenGradleVersionIsSupportedByCurrentGradleTestKit(gradleVersion);
-    givenGradleProjectFiles(projectName);
-    givenGradleProjectProperties();
-    ensureDependenciesDownloaded(gradleVersion);
-
-    Map<String, String> additionalEnvVars =
-        Collections.singletonMap("SMOKE_TEST_ROBOLECTRIC_VERSION", robolectricVersion);
-    BuildResult buildResult = runGradleTests(gradleVersion, true, false, additionalEnvVars);
-    assertBuildSuccessful(buildResult);
-
-    List<? extends Map<?, ?>> events = mockBackend.waitForEvents(expectedTraces);
-    assertRobolectricVersion(events, expectedVersion);
-    verifyEventsAndCoverages(
-        projectName,
-        "gradle",
-        gradleVersion,
-        events,
-        mockBackend.waitForCoverages(0),
-        Collections.singletonList("content.meta.['test.android.robolectric.version']"));
-  }
-
-  private static void assertRobolectricVersion(
-      List<? extends Map<?, ?>> events, String expectedVersion) {
-    int taggedEvents = 0;
-    for (Map<?, ?> event : events) {
-      Object content = event.get("content");
-      if (!(content instanceof Map)) {
-        continue;
-      }
-      Object meta = ((Map<?, ?>) content).get("meta");
-      if (!(meta instanceof Map)) {
-        continue;
-      }
-      Object version = ((Map<?, ?>) meta).get("test.android.robolectric.version");
-      if (version != null) {
-        if (!"any".equals(expectedVersion)) {
-          assertEquals(expectedVersion, version);
+        if (disableInstrumentation) {
+            arguments.add("-PdisableTestInstrumentation");
+        }
+        if (failAfterTests) {
+            arguments.add("-PfailAfterTests");
+        }
+        if (configurationCache) {
+            arguments.add("--configuration-cache");
+        }
+
+        for (int run = 0; run < (configurationCache ? 2 : 1); run++) {
+            mockBackend.reset();
+            BuildResult result = runGradle(gradleVersion, arguments, !failAfterTests);
+            assertNotNull(result.task(":test"));
+            assertEquals(
+                    failAfterTests ? TaskOutcome.FAILED : TaskOutcome.SUCCESS,
+                    result.task(":test").getOutcome());
+            List<? extends Map<?, ?>> events = mockBackend.waitForEvents(expectedTests == 0 ? 2 : 5);
+            long actualTests = events.stream()
+                    .filter(event -> "test".equals(event.get("type")))
+                    .count();
+            assertEquals(expectedTests, actualTests);
+            int parents = 0;
+            for (Map<?, ?> event : events) {
+                String type = (String) event.get("type");
+                if ("test_session_end".equals(type) || "test_module_end".equals(type)) {
+                    parents++;
+                    Map<?, ?> content = (Map<?, ?>) event.get("content");
+                    Map<?, ?> meta = (Map<?, ?>) content.get("meta");
+                    assertEquals(expectedStatus, meta.get(Tags.TEST_STATUS));
+                    if ("skip".equals(expectedStatus) && "test_module_end".equals(type)) {
+                        assertEquals("No tests were executed by Gradle", meta.get(Tags.TEST_SKIP_REASON));
+                    }
+                }
+            }
+            assertEquals(2, parents);
+            if (configurationCache && run == 1) {
+                assertTrue(result.getOutput().contains("Reusing configuration cache."));
+            }
         }
-        taggedEvents++;
-      }
     }
-    assertEquals(2, taggedEvents);
-  }
-
-  @TableTest({
-    "scenario       | gradleVersion | verificationEnabled",
-    "legacy-default | 7.6.4         | false              ",
-    "legacy-enabled | 7.6.4         | true               ",
-    "modern-default | 8.3           | false              ",
-    "modern-enabled | 8.3           | true               "
-  })
-  @ParameterizedTest
-  void testInjectedDependencyVerification(String gradleVersion, boolean verificationEnabled)
-      throws IOException {
-    givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion);
-    givenGradleVersionIsSupportedByCurrentGradleTestKit(gradleVersion);
-    givenGradleProjectFiles("test-gradle-dependency-verification");
-
-    Map<String, String> additionalArgs = new HashMap<>();
-    if (verificationEnabled) {
-      additionalArgs.put(
-          CiVisibilityConfig.CIVISIBILITY_GRADLE_DEPENDENCY_VERIFICATION_ENABLED, "true");
+
+    @TableTest({
+      "scenario           | gradleVersion | robolectricVersion | expectedVersion | projectName              | expectedTraces",
+      "robolectric-4.16   | latest        | 4.16.1             | 4.16.1          | test-succeed-robolectric | 7             ",
+      "robolectric-latest | latest        | +                  | any             | test-succeed-robolectric | 7             "
+    })
+    @ParameterizedTest
+    void testRobolectric(
+            String gradleVersion,
+            String robolectricVersion,
+            String expectedVersion,
+            String projectName,
+            int expectedTraces)
+            throws IOException {
+        Assumptions.assumeTrue(JavaVirtualMachine.isJavaVersionBetween(17, 22), "Robolectric supports JDK 17-21");
+        Assumptions.assumeFalse(
+                OperatingSystem.architecture().isArm64(),
+                "Robolectric does not support arm64 (missing native runtime binaries, follow https://github.com/robolectric/robolectric/issues/9166)");
+
+        gradleVersion = resolveVersion(gradleVersion);
+        givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion);
+        givenGradleVersionIsSupportedByCurrentGradleTestKit(gradleVersion);
+        givenGradleProjectFiles(projectName);
+        givenGradleProjectProperties();
+        ensureDependenciesDownloaded(gradleVersion);
+
+        Map<String, String> additionalEnvVars =
+                Collections.singletonMap("SMOKE_TEST_ROBOLECTRIC_VERSION", robolectricVersion);
+        BuildResult buildResult = runGradleTests(gradleVersion, true, false, additionalEnvVars);
+        assertBuildSuccessful(buildResult);
+
+        List<? extends Map<?, ?>> events = mockBackend.waitForEvents(expectedTraces);
+        assertRobolectricVersion(events, expectedVersion);
+        verifyEventsAndCoverages(
+                projectName,
+                "gradle",
+                gradleVersion,
+                events,
+                mockBackend.waitForCoverages(0),
+                Collections.singletonList("content.meta.['test.android.robolectric.version']"));
     }
-    givenGradleProjectProperties(additionalArgs);
-    ensureDependenciesDownloaded(gradleVersion);
-
-    BuildResult buildResult =
-        runGradle(
-            gradleVersion, Arrays.asList("compileJava", "--stacktrace"), !verificationEnabled);
-
-    if (verificationEnabled) {
-      assertTrue(buildResult.getOutput().contains("Dependency verification failed"));
-    } else {
-      assertBuildSuccessful(buildResult);
-      String warning =
-          "Datadog Test Optimization disabled Gradle dependency verification for dependencies "
-              + "injected into this build.";
-      int firstWarning = buildResult.getOutput().indexOf(warning);
-      assertTrue(firstWarning >= 0);
-      assertEquals(firstWarning, buildResult.getOutput().lastIndexOf(warning));
+
+    private static void assertRobolectricVersion(List<? extends Map<?, ?>> events, String expectedVersion) {
+        int taggedEvents = 0;
+        for (Map<?, ?> event : events) {
+            Object content = event.get("content");
+            if (!(content instanceof Map)) {
+                continue;
+            }
+            Object meta = ((Map<?, ?>) content).get("meta");
+            if (!(meta instanceof Map)) {
+                continue;
+            }
+            Object version = ((Map<?, ?>) meta).get("test.android.robolectric.version");
+            if (version != null) {
+                if (!"any".equals(expectedVersion)) {
+                    assertEquals(expectedVersion, version);
+                }
+                taggedEvents++;
+            }
+        }
+        assertEquals(2, taggedEvents);
     }
-  }
-
-  @TableTest({
-    "scenario               | gradleVersion | projectName                         | flakyTests                                                                                                                                | expectedOrder                                                                                                                                                                                                                                                                              | eventsNumber",
-    "junit4-ordering-7.6.4  | 7.6.4         | test-succeed-junit-4-class-ordering | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed'] | ['datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedC:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another'] | 15          ",
-    "junit4-ordering-9.2.1  | 9.2.1         | test-succeed-junit-4-class-ordering | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed'] | ['datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedC:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another'] | 15          ",
-    "junit4-ordering-9.3.0  | 9.3.0         | test-succeed-junit-4-class-ordering | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed'] | ['datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedC:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another'] | 15          ",
-    "junit4-ordering-latest | latest        | test-succeed-junit-4-class-ordering | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed'] | ['datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedC:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another'] | 15          "
-  })
-  @ParameterizedTest
-  void testJunit4ClassOrdering(
-      String gradleVersion,
-      String projectName,
-      List<TestFQN> flakyTests,
-      List<TestFQN> expectedOrder,
-      int eventsNumber)
-      throws IOException {
-    gradleVersion = resolveVersion(gradleVersion);
-    givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion);
-    givenGradleProjectFiles(projectName);
-    givenGradleProjectProperties();
-    ensureDependenciesDownloaded(gradleVersion);
-
-    mockBackend.givenKnownTests(true);
-    for (TestFQN flakyTest : flakyTests) {
-      mockBackend.givenFlakyTest(":test", flakyTest.getSuite(), flakyTest.getName());
-      mockBackend.givenKnownTest(":test", flakyTest.getSuite(), flakyTest.getName());
+
+    @TableTest({
+      "scenario       | gradleVersion | verificationEnabled",
+      "legacy-default | 7.6.4         | false              ",
+      "legacy-enabled | 7.6.4         | true               ",
+      "modern-default | 8.3           | false              ",
+      "modern-enabled | 8.3           | true               "
+    })
+    @ParameterizedTest
+    void testInjectedDependencyVerification(String gradleVersion, boolean verificationEnabled) throws IOException {
+        givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion);
+        givenGradleVersionIsSupportedByCurrentGradleTestKit(gradleVersion);
+        givenGradleProjectFiles("test-gradle-dependency-verification");
+
+        Map<String, String> additionalArgs = new HashMap<>();
+        if (verificationEnabled) {
+            additionalArgs.put(CiVisibilityConfig.CIVISIBILITY_GRADLE_DEPENDENCY_VERIFICATION_ENABLED, "true");
+        }
+        givenGradleProjectProperties(additionalArgs);
+        ensureDependenciesDownloaded(gradleVersion);
+
+        BuildResult buildResult =
+                runGradle(gradleVersion, Arrays.asList("compileJava", "--stacktrace"), !verificationEnabled);
+
+        if (verificationEnabled) {
+            assertTrue(buildResult.getOutput().contains("Dependency verification failed"));
+        } else {
+            assertBuildSuccessful(buildResult);
+            String warning = "Datadog Test Optimization disabled Gradle dependency verification for dependencies "
+                    + "injected into this build.";
+            int firstWarning = buildResult.getOutput().indexOf(warning);
+            assertTrue(firstWarning >= 0);
+            assertEquals(firstWarning, buildResult.getOutput().lastIndexOf(warning));
+        }
     }
 
-    BuildResult buildResult = runGradleTests(gradleVersion, true, false);
-    assertBuildSuccessful(buildResult);
+    @TableTest({
+      "scenario               | gradleVersion | projectName                         | flakyTests                                                                                                                                | expectedOrder                                                                                                                                                                                                                                                                              | eventsNumber",
+      "junit4-ordering-7.6.4  | 7.6.4         | test-succeed-junit-4-class-ordering | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed'] | ['datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedC:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another'] | 15          ",
+      "junit4-ordering-9.2.1  | 9.2.1         | test-succeed-junit-4-class-ordering | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed'] | ['datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedC:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another'] | 15          ",
+      "junit4-ordering-9.3.0  | 9.3.0         | test-succeed-junit-4-class-ordering | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed'] | ['datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedC:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another'] | 15          ",
+      "junit4-ordering-latest | latest        | test-succeed-junit-4-class-ordering | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed'] | ['datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedC:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another'] | 15          "
+    })
+    @ParameterizedTest
+    void testJunit4ClassOrdering(
+            String gradleVersion,
+            String projectName,
+            List<TestFQN> flakyTests,
+            List<TestFQN> expectedOrder,
+            int eventsNumber)
+            throws IOException {
+        gradleVersion = resolveVersion(gradleVersion);
+        givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion);
+        givenGradleProjectFiles(projectName);
+        givenGradleProjectProperties();
+        ensureDependenciesDownloaded(gradleVersion);
+
+        mockBackend.givenKnownTests(true);
+        for (TestFQN flakyTest : flakyTests) {
+            mockBackend.givenFlakyTest(":test", flakyTest.getSuite(), flakyTest.getName());
+            mockBackend.givenKnownTest(":test", flakyTest.getSuite(), flakyTest.getName());
+        }
 
-    verifyTestOrder(mockBackend.waitForEvents(eventsNumber), expectedOrder);
-  }
+        BuildResult buildResult = runGradleTests(gradleVersion, true, false);
+        assertBuildSuccessful(buildResult);
 
-  // Resolves the symbolic versions used in the scenario tables:
-  //  - "latest": the newest eligible Gradle release
-  //  - "oldest": the latest patch of the oldest major the current Gradle TestKit still supports
-  // Any other value is treated as a concrete version and returned as-is.
-  private static String resolveVersion(String gradleVersion) {
-    if ("latest".equals(gradleVersion)) {
-      return LATEST_GRADLE_VERSION;
+        verifyTestOrder(mockBackend.waitForEvents(eventsNumber), expectedOrder);
     }
-    if ("oldest".equals(gradleVersion)) {
-      return oldestSupportedGradleVersion();
+
+    // Resolves the symbolic versions used in the scenario tables:
+    //  - "latest": the newest eligible Gradle release
+    //  - "oldest": the latest patch of the oldest major the current Gradle TestKit still supports
+    // Any other value is treated as a concrete version and returned as-is.
+    private static String resolveVersion(String gradleVersion) {
+        if ("latest".equals(gradleVersion)) {
+            return LATEST_GRADLE_VERSION;
+        }
+        if ("oldest".equals(gradleVersion)) {
+            return oldestSupportedGradleVersion();
+        }
+        return gradleVersion;
     }
-    return gradleVersion;
-  }
-
-  private static String oldestSupportedGradleVersion() {
-    // The oldest major the current Gradle TestKit can run is dictated by Gradle itself; tracking it
-    // dynamically (rather than hardcoding a version) means the floor follows TestKit automatically.
-    // We test the latest patch of that major rather than its initial release for stability.
-    int oldestSupportedMajor =
-        DefaultGradleConnector.MINIMUM_SUPPORTED_GRADLE_VERSION.getMajorVersion();
-    return toolVersion("gradle.latest." + oldestSupportedMajor);
-  }
-
-  private static void givenGradleVersionIsSupportedByCurrentGradleTestKit(String gradleVersion) {
-    // These smoke tests cover the earliest legacy Gradle version that the current Gradle
-    // TestKit can still run. When Gradle raises TestKit's minimum supported version, older
-    // rows are skipped as a best-effort compatibility boundary rather than a product signal.
-    Assumptions.assumeTrue(
-        GradleVersion.version(gradleVersion)
-                .compareTo(DefaultGradleConnector.MINIMUM_SUPPORTED_GRADLE_VERSION)
-            >= 0,
-        "Current Gradle TestKit does not support Gradle version " + gradleVersion);
-  }
-
-  private void runGradleTest(
-      String gradleVersion,
-      String projectName,
-      boolean configurationCache,
-      boolean successExpected,
-      boolean flakyRetries,
-      int expectedTraces,
-      int expectedCoverages)
-      throws IOException {
-    gradleVersion = resolveVersion(gradleVersion);
-    givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion);
-    givenGradleVersionIsSupportedByCurrentGradleTestKit(gradleVersion);
-    givenConfigurationCacheIsCompatibleWithCurrentPlatform(configurationCache);
-    givenGradleProjectFiles(projectName);
-    givenGradleProjectProperties();
-    ensureDependenciesDownloaded(gradleVersion);
-
-    mockBackend.givenFlakyRetries(flakyRetries);
-    mockBackend.givenFlakyTest(":test", "datadog.smoke.TestFailed", "test_failed");
-
-    mockBackend.givenTestsSkipping(true);
-    mockBackend.givenSkippableTest(
-        ":test", "datadog.smoke.TestSucceed", "test_to_skip_with_itr", Collections.emptyMap());
-
-    BuildResult buildResult = runGradleTests(gradleVersion, successExpected, configurationCache);
-
-    if (successExpected) {
-      assertBuildSuccessful(buildResult);
+
+    private static String oldestSupportedGradleVersion() {
+        // The oldest major the current Gradle TestKit can run is dictated by Gradle itself; tracking it
+        // dynamically (rather than hardcoding a version) means the floor follows TestKit automatically.
+        // We test the latest patch of that major rather than its initial release for stability.
+        int oldestSupportedMajor = DefaultGradleConnector.MINIMUM_SUPPORTED_GRADLE_VERSION.getMajorVersion();
+        return toolVersion("gradle.latest." + oldestSupportedMajor);
     }
 
-    verifyEventsAndCoverages(
-        projectName,
-        "gradle",
-        gradleVersion,
-        mockBackend.waitForEvents(expectedTraces),
-        mockBackend.waitForCoverages(expectedCoverages));
-
-    if (configurationCache) {
-      // If configuration cache is enabled, run the build one more time to verify that building
-      // with an existing configuration cache entry works.
-      BuildResult buildResultWithConfigCacheEntry =
-          runGradleTests(gradleVersion, successExpected, configurationCache);
-
-      assertBuildSuccessful(buildResultWithConfigCacheEntry);
-      verifyEventsAndCoverages(
-          projectName,
-          "gradle",
-          gradleVersion,
-          mockBackend.waitForEvents(expectedTraces),
-          mockBackend.waitForCoverages(expectedCoverages));
+    private static void givenGradleVersionIsSupportedByCurrentGradleTestKit(String gradleVersion) {
+        // These smoke tests cover the earliest legacy Gradle version that the current Gradle
+        // TestKit can still run. When Gradle raises TestKit's minimum supported version, older
+        // rows are skipped as a best-effort compatibility boundary rather than a product signal.
+        Assumptions.assumeTrue(
+                GradleVersion.version(gradleVersion).compareTo(DefaultGradleConnector.MINIMUM_SUPPORTED_GRADLE_VERSION)
+                        >= 0,
+                "Current Gradle TestKit does not support Gradle version " + gradleVersion);
     }
-  }
-
-  private void givenGradleProjectProperties() throws IOException {
-    givenGradleProjectProperties(Collections.emptyMap());
-  }
-
-  private void givenGradleProjectProperties(Map<String, String> additionalArgs) throws IOException {
-    assertTrue(new java.io.File(AGENT_JAR).isFile());
-
-    Path ddApiKeyPath = testKitFolder.resolve(".dd.api.key");
-    Files.write(ddApiKeyPath, "dummy".getBytes());
-
-    Map<String, String> effectiveAdditionalArgs = new HashMap<>(additionalArgs);
-    effectiveAdditionalArgs.put(
-        GeneralConfig.API_KEY_FILE, ddApiKeyPath.toAbsolutePath().toString());
-    effectiveAdditionalArgs.put(
-        CiVisibilityConfig.CIVISIBILITY_JACOCO_PLUGIN_VERSION, JACOCO_PLUGIN_VERSION);
-    /*
-     * Some of the smoke tests (in particular the one with the Gradle plugin), are using Gradle Test Kit for their tests.
-     * Gradle Test Kit needs to do a "chmod" when starting a Gradle Daemon.
-     * This "chmod" operation is traced by datadog.trace.instrumentation.java.lang.ProcessImplInstrumentation and is reported as a span.
-     * The problem is that the "chmod" only happens when running in CI (could be due to differences in OS or FS permissions),
-     * so when running the tests locally, the "chmod" span is not there.
-     * This causes the tests to fail because the number of reported traces is different.
-     * To avoid this discrepancy between local and CI runs, we disable tracing instrumentations.
-     */
-    effectiveAdditionalArgs.put(TraceInstrumentationConfig.TRACE_ENABLED, "false");
-    List<String> arguments =
-        buildJvmArguments(mockBackend.getIntakeUrl(), TEST_SERVICE_NAME, effectiveAdditionalArgs);
-    addCrashDiagnostics(arguments);
-
-    String gradleProperties = "org.gradle.jvmargs=" + String.join(" ", arguments);
-    // Write to projectFolder (per-test) instead of testKitFolder (shared), so each
-    // Gradle daemon gets its own unique preference directory.
-    Files.write(projectFolder.resolve("gradle.properties"), gradleProperties.getBytes());
-  }
-
-  private BuildResult runGradleTests(
-      String gradleVersion, boolean successExpected, boolean configurationCache)
-      throws IOException {
-    return runGradleTests(
-        gradleVersion, successExpected, configurationCache, Collections.emptyMap());
-  }
-
-  private BuildResult runGradleTests(
-      String gradleVersion,
-      boolean successExpected,
-      boolean configurationCache,
-      Map<String, String> additionalEnvVars)
-      throws IOException {
-    List<String> arguments = new java.util.ArrayList<>(Arrays.asList("test", "--stacktrace"));
-    if (gradleVersion.compareTo("4.5") > 0) {
-      // warning mode available starting from Gradle 4.5
-      arguments.addAll(Arrays.asList("--warning-mode", "all"));
+
+    private void runGradleTest(
+            String gradleVersion,
+            String projectName,
+            boolean configurationCache,
+            boolean successExpected,
+            boolean flakyRetries,
+            int expectedTraces,
+            int expectedCoverages)
+            throws IOException {
+        gradleVersion = resolveVersion(gradleVersion);
+        givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion);
+        givenGradleVersionIsSupportedByCurrentGradleTestKit(gradleVersion);
+        givenConfigurationCacheIsCompatibleWithCurrentPlatform(configurationCache);
+        givenGradleProjectFiles(projectName);
+        givenGradleProjectProperties();
+        ensureDependenciesDownloaded(gradleVersion);
+
+        mockBackend.givenFlakyRetries(flakyRetries);
+        mockBackend.givenFlakyTest(":test", "datadog.smoke.TestFailed", "test_failed");
+
+        mockBackend.givenTestsSkipping(true);
+        mockBackend.givenSkippableTest(
+                ":test", "datadog.smoke.TestSucceed", "test_to_skip_with_itr", Collections.emptyMap());
+
+        BuildResult buildResult = runGradleTests(gradleVersion, successExpected, configurationCache);
+
+        if (successExpected) {
+            assertBuildSuccessful(buildResult);
+        }
+
+        verifyEventsAndCoverages(
+                projectName,
+                "gradle",
+                gradleVersion,
+                mockBackend.waitForEvents(expectedTraces),
+                mockBackend.waitForCoverages(expectedCoverages));
+
+        if (configurationCache) {
+            // If configuration cache is enabled, run the build one more time to verify that building
+            // with an existing configuration cache entry works.
+            BuildResult buildResultWithConfigCacheEntry =
+                    runGradleTests(gradleVersion, successExpected, configurationCache);
+
+            assertBuildSuccessful(buildResultWithConfigCacheEntry);
+            verifyEventsAndCoverages(
+                    projectName,
+                    "gradle",
+                    gradleVersion,
+                    mockBackend.waitForEvents(expectedTraces),
+                    mockBackend.waitForCoverages(expectedCoverages));
+        }
     }
-    if (configurationCache) {
-      arguments.addAll(Arrays.asList("--configuration-cache", "--rerun-tasks"));
+
+    private void givenGradleProjectProperties() throws IOException {
+        givenGradleProjectProperties(Collections.emptyMap());
     }
-    return runGradle(gradleVersion, arguments, successExpected, additionalEnvVars);
-  }
-
-  /**
-   * Sometimes Gradle Test Kit fails because it cannot download the required Gradle distribution due
-   * to intermittent network issues. This method performs the download manually (if needed) with
-   * increased timeout (30s vs default 10s). Retry logic (3 retries) is already present in {@code
-   * org.gradle.wrapper.Install}.
-   */
-  private void ensureDependenciesDownloaded(String gradleVersion) {
-    try {
-      org.gradle.wrapper.Logger logger = new org.gradle.wrapper.Logger(false);
-      Download download =
-          new Download(
-              logger,
-              "Gradle Tooling API",
-              GradleVersion.current().getVersion(),
-              GRADLE_DISTRIBUTION_NETWORK_TIMEOUT);
-
-      java.io.File userHomeDir = testKitFolder.toFile();
-      java.io.File projectDir = projectFolder.toFile();
-      Install install = new Install(logger, download, new PathAssembler(userHomeDir, projectDir));
-
-      WrapperConfiguration configuration = new WrapperConfiguration();
-      configuration.setDistribution(GradleDistribution.uriFor(gradleVersion));
-      configuration.setNetworkTimeout(GRADLE_DISTRIBUTION_NETWORK_TIMEOUT);
-
-      // This will download distribution (if not downloaded yet to userHomeDir) and verify its SHA.
-      install.createDist(configuration);
-    } catch (Exception e) {
-      System.out.println(
-          "Failed to install Gradle distribution, will proceed to run test kit hoping for the best: "
-              + e);
+
+    private void givenGradleProjectProperties(Map<String, String> additionalArgs) throws IOException {
+        assertTrue(new java.io.File(AGENT_JAR).isFile());
+
+        Path ddApiKeyPath = testKitFolder.resolve(".dd.api.key");
+        Files.write(ddApiKeyPath, "dummy".getBytes());
+
+        Map<String, String> effectiveAdditionalArgs = new HashMap<>(additionalArgs);
+        effectiveAdditionalArgs.put(
+                GeneralConfig.API_KEY_FILE, ddApiKeyPath.toAbsolutePath().toString());
+        effectiveAdditionalArgs.put(CiVisibilityConfig.CIVISIBILITY_JACOCO_PLUGIN_VERSION, JACOCO_PLUGIN_VERSION);
+        /*
+         * Some of the smoke tests (in particular the one with the Gradle plugin), are using Gradle Test Kit for their tests.
+         * Gradle Test Kit needs to do a "chmod" when starting a Gradle Daemon.
+         * This "chmod" operation is traced by datadog.trace.instrumentation.java.lang.ProcessImplInstrumentation and is reported as a span.
+         * The problem is that the "chmod" only happens when running in CI (could be due to differences in OS or FS permissions),
+         * so when running the tests locally, the "chmod" span is not there.
+         * This causes the tests to fail because the number of reported traces is different.
+         * To avoid this discrepancy between local and CI runs, we disable tracing instrumentations.
+         */
+        effectiveAdditionalArgs.put(TraceInstrumentationConfig.TRACE_ENABLED, "false");
+        List<String> arguments =
+                buildJvmArguments(mockBackend.getIntakeUrl(), TEST_SERVICE_NAME, effectiveAdditionalArgs);
+        addCrashDiagnostics(arguments);
+
+        String gradleProperties = "org.gradle.jvmargs=" + String.join(" ", arguments);
+        // Write to projectFolder (per-test) instead of testKitFolder (shared), so each
+        // Gradle daemon gets its own unique preference directory.
+        Files.write(projectFolder.resolve("gradle.properties"), gradleProperties.getBytes());
     }
-  }
-
-  private BuildResult runGradle(
-      String gradleVersion, List<String> arguments, boolean successExpected) throws IOException {
-    return runGradle(gradleVersion, arguments, successExpected, Collections.emptyMap());
-  }
-
-  private BuildResult runGradle(
-      String gradleVersion,
-      List<String> arguments,
-      boolean successExpected,
-      Map<String, String> additionalEnvVars)
-      throws IOException {
-    Map<String, String> buildEnv = new HashMap<>();
-    buildEnv.put("GRADLE_ARGS", "");
-    buildEnv.put("GRADLE_OPTS", "");
-    buildEnv.put("GRADLE_USER_HOME", testKitFolder.toString());
-    buildEnv.put("GRADLE_VERSION", gradleVersion);
-    buildEnv.put(
-        GradleDistribution.GRADLE_DISTRIBUTION_URL_ENV,
-        GradleDistribution.uriFor(gradleVersion).toString());
-    buildEnv.putAll(additionalEnvVars);
-
-    String mavenRepositoryProxy = System.getenv("MAVEN_REPOSITORY_PROXY");
-    if (mavenRepositoryProxy != null) {
-      buildEnv.put("MAVEN_REPOSITORY_PROXY", mavenRepositoryProxy);
+
+    private BuildResult runGradleTests(String gradleVersion, boolean successExpected, boolean configurationCache)
+            throws IOException {
+        return runGradleTests(gradleVersion, successExpected, configurationCache, Collections.emptyMap());
     }
-    GradleDistribution.propagateMassReadUrl(buildEnv);
-
-    GradleRunner gradleRunner =
-        GradleDistribution.withDistribution(
-                GradleRunner.create()
-                    .withTestKitDir(testKitFolder.toFile())
-                    .withProjectDir(projectFolder.toFile()),
-                gradleVersion)
-            .withArguments(arguments)
-            .withEnvironment(buildEnv)
-            .forwardOutput();
-
-    try {
-      return successExpected ? gradleRunner.build() : gradleRunner.buildAndFail();
-    } catch (Exception e) {
-      try {
-        collectDaemonDiagnostics(gradleVersion, e);
-      } catch (Exception diagnosticsError) {
-        System.err.println("Failed to collect Gradle daemon diagnostics: " + diagnosticsError);
-      }
-      throw new RuntimeException(e);
+
+    private BuildResult runGradleTests(
+            String gradleVersion,
+            boolean successExpected,
+            boolean configurationCache,
+            Map<String, String> additionalEnvVars)
+            throws IOException {
+        List<String> arguments = new java.util.ArrayList<>(Arrays.asList("test", "--stacktrace"));
+        if (gradleVersion.compareTo("4.5") > 0) {
+            // warning mode available starting from Gradle 4.5
+            arguments.addAll(Arrays.asList("--warning-mode", "all"));
+        }
+        if (configurationCache) {
+            arguments.addAll(Arrays.asList("--configuration-cache", "--rerun-tasks"));
+        }
+        return runGradle(gradleVersion, arguments, successExpected, additionalEnvVars);
     }
-  }
-
-  private static void addCrashDiagnostics(List<String> arguments) {
-    try {
-      Files.createDirectories(GRADLE_DAEMON_DIAGNOSTICS_DIR);
-      if (JavaVirtualMachine.isJ9()) {
-        arguments.add("-Xdump:directory=" + GRADLE_DAEMON_DIAGNOSTICS_DIR.toAbsolutePath());
-      } else {
-        arguments.add(
-            "-XX:ErrorFile="
-                + GRADLE_DAEMON_DIAGNOSTICS_DIR.toAbsolutePath()
-                + "/hs_err_pid%p.log");
-      }
-    } catch (IOException e) {
-      System.err.println("Failed to configure Gradle daemon crash diagnostics: " + e);
+
+    /**
+     * Sometimes Gradle Test Kit fails because it cannot download the required Gradle distribution due
+     * to intermittent network issues. This method performs the download manually (if needed) with
+     * increased timeout (30s vs default 10s). Retry logic (3 retries) is already present in {@code
+     * org.gradle.wrapper.Install}.
+     */
+    private void ensureDependenciesDownloaded(String gradleVersion) {
+        try {
+            org.gradle.wrapper.Logger logger = new org.gradle.wrapper.Logger(false);
+            Download download = new Download(
+                    logger,
+                    "Gradle Tooling API",
+                    GradleVersion.current().getVersion(),
+                    GRADLE_DISTRIBUTION_NETWORK_TIMEOUT);
+
+            java.io.File userHomeDir = testKitFolder.toFile();
+            java.io.File projectDir = projectFolder.toFile();
+            Install install = new Install(logger, download, new PathAssembler(userHomeDir, projectDir));
+
+            WrapperConfiguration configuration = new WrapperConfiguration();
+            configuration.setDistribution(GradleDistribution.uriFor(gradleVersion));
+            configuration.setNetworkTimeout(GRADLE_DISTRIBUTION_NETWORK_TIMEOUT);
+
+            // This will download distribution (if not downloaded yet to userHomeDir) and verify its SHA.
+            install.createDist(configuration);
+        } catch (Exception e) {
+            System.out.println(
+                    "Failed to install Gradle distribution, will proceed to run test kit hoping for the best: " + e);
+        }
     }
-  }
-
-  private void collectDaemonDiagnostics(String gradleVersion, Exception failure)
-      throws IOException {
-    Path failureDir =
-        GRADLE_DAEMON_DIAGNOSTICS_DIR.resolve(
-            gradleVersion + "-" + projectFolder.getFileName().toString());
-    Files.createDirectories(failureDir);
-
-    List<String> summary = new ArrayList<>();
-    Throwable cause = failure;
-    int causeIndex = 0;
-    while (cause != null) {
-      String message = cause.getMessage();
-      int lineBreak = message != null ? message.indexOf('\n') : -1;
-      if (lineBreak >= 0) {
-        message = message.substring(0, lineBreak);
-      }
-      summary.add("failure[" + causeIndex++ + "]=" + cause.getClass().getName() + ": " + message);
-      cause = cause.getCause();
+
+    private BuildResult runGradle(String gradleVersion, List<String> arguments, boolean successExpected)
+            throws IOException {
+        return runGradle(gradleVersion, arguments, successExpected, Collections.emptyMap());
     }
-    summary.add("gradleVersion=" + gradleVersion);
-
-    Path cgroupMembership = Paths.get("/proc/self/cgroup");
-    Path daemonLogDir = testKitFolder.resolve("test-kit-daemon/" + gradleVersion);
-    Path daemonLog = newestDaemonLog(daemonLogDir);
-    if (daemonLog != null) {
-      copyIfExists(daemonLog, failureDir.resolve(daemonLog.getFileName()), summary);
-      summary.add("daemonLog=" + daemonLog);
-
-      Matcher matcher = DAEMON_LOG_PATTERN.matcher(daemonLog.getFileName().toString());
-      if (matcher.matches()) {
-        String daemonIdentifier = matcher.group(1);
-        summary.add("daemonIdentifier=" + daemonIdentifier);
-        if (daemonIdentifier.matches("\\d+")) {
-          summary.add("daemonPid=" + daemonIdentifier);
-          Path procRoot = Paths.get("/proc");
-          if (Files.isDirectory(procRoot)) {
-            Path processDir = procRoot.resolve(daemonIdentifier);
-            summary.add("daemonProcessPresent=" + Files.isDirectory(processDir));
-            copyIfExists(processDir.resolve("status"), failureDir.resolve("proc-status"), summary);
-            copyIfExists(processDir.resolve("limits"), failureDir.resolve("proc-limits"), summary);
-            Path daemonCgroupMembership = processDir.resolve("cgroup");
-            copyIfExists(daemonCgroupMembership, failureDir.resolve("proc-cgroup"), summary);
-            if (Files.isRegularFile(daemonCgroupMembership)) {
-              cgroupMembership = daemonCgroupMembership;
+
+    private BuildResult runGradle(
+            String gradleVersion,
+            List<String> arguments,
+            boolean successExpected,
+            Map<String, String> additionalEnvVars)
+            throws IOException {
+        Map<String, String> buildEnv = new HashMap<>();
+        buildEnv.put("GRADLE_ARGS", "");
+        buildEnv.put("GRADLE_OPTS", "");
+        buildEnv.put("GRADLE_USER_HOME", testKitFolder.toString());
+        buildEnv.put("GRADLE_VERSION", gradleVersion);
+        buildEnv.put(
+                GradleDistribution.GRADLE_DISTRIBUTION_URL_ENV,
+                GradleDistribution.uriFor(gradleVersion).toString());
+        buildEnv.putAll(additionalEnvVars);
+
+        String mavenRepositoryProxy = System.getenv("MAVEN_REPOSITORY_PROXY");
+        if (mavenRepositoryProxy != null) {
+            buildEnv.put("MAVEN_REPOSITORY_PROXY", mavenRepositoryProxy);
+        }
+        GradleDistribution.propagateMassReadUrl(buildEnv);
+
+        GradleRunner gradleRunner = GradleDistribution.withDistribution(
+                        GradleRunner.create()
+                                .withTestKitDir(testKitFolder.toFile())
+                                .withProjectDir(projectFolder.toFile()),
+                        gradleVersion)
+                .withArguments(arguments)
+                .withEnvironment(buildEnv)
+                .forwardOutput();
+
+        try {
+            return successExpected ? gradleRunner.build() : gradleRunner.buildAndFail();
+        } catch (Exception e) {
+            try {
+                collectDaemonDiagnostics(gradleVersion, e);
+            } catch (Exception diagnosticsError) {
+                System.err.println("Failed to collect Gradle daemon diagnostics: " + diagnosticsError);
             }
-          } else {
-            summary.add("daemonProcessPresent=unknown");
-          }
+            throw new RuntimeException(e);
         }
-      }
-
-      try {
-        System.out.println("==============================================================");
-        System.out.println(
-            "Gradle Daemon log:\n"
-                + new String(Files.readAllBytes(daemonLog), StandardCharsets.UTF_8));
-        System.out.println("==============================================================");
-      } catch (IOException e) {
-        summary.add("daemonLogReadFailed=" + e);
-      }
-    } else {
-      summary.add("daemonLog=not found");
     }
 
-    summary.add("cgroupMembership=" + cgroupMembership);
-    Path cgroupDirectory = resolveCgroupV2Directory(cgroupMembership, summary);
-    summary.add("cgroupDirectory=" + cgroupDirectory);
-    copyIfExists(
-        cgroupDirectory.resolve("memory.events"),
-        failureDir.resolve("cgroup-memory.events"),
-        summary);
-    copyIfExists(
-        cgroupDirectory.resolve("memory.current"),
-        failureDir.resolve("cgroup-memory.current"),
-        summary);
-    copyIfExists(
-        cgroupDirectory.resolve("memory.peak"), failureDir.resolve("cgroup-memory.peak"), summary);
-    copyIfExists(
-        cgroupDirectory.resolve("pids.events"), failureDir.resolve("cgroup-pids.events"), summary);
-    copyIfExists(
-        cgroupDirectory.resolve("pids.current"),
-        failureDir.resolve("cgroup-pids.current"),
-        summary);
-    copyIfExists(
-        cgroupDirectory.resolve("pids.max"), failureDir.resolve("cgroup-pids.max"), summary);
-
-    Files.write(failureDir.resolve("summary.txt"), summary, StandardCharsets.UTF_8);
-    System.out.println("Gradle daemon diagnostics written to " + failureDir);
-  }
-
-  private static Path resolveCgroupV2Directory(Path cgroupMembership, List<String> summary) {
-    Path cgroupRoot = Paths.get("/sys/fs/cgroup");
-    if (!Files.isRegularFile(cgroupMembership)) {
-      return cgroupRoot;
+    private static void addCrashDiagnostics(List<String> arguments) {
+        try {
+            Files.createDirectories(GRADLE_DAEMON_DIAGNOSTICS_DIR);
+            if (JavaVirtualMachine.isJ9()) {
+                arguments.add("-Xdump:directory=" + GRADLE_DAEMON_DIAGNOSTICS_DIR.toAbsolutePath());
+            } else {
+                arguments.add("-XX:ErrorFile=" + GRADLE_DAEMON_DIAGNOSTICS_DIR.toAbsolutePath() + "/hs_err_pid%p.log");
+            }
+        } catch (IOException e) {
+            System.err.println("Failed to configure Gradle daemon crash diagnostics: " + e);
+        }
     }
 
-    try {
-      for (String line : Files.readAllLines(cgroupMembership, StandardCharsets.UTF_8)) {
-        if (line.startsWith("0::")) {
-          String relativePath = line.substring(3);
-          if (relativePath.startsWith("/")) {
-            relativePath = relativePath.substring(1);
-          }
-          Path cgroupDirectory = cgroupRoot.resolve(relativePath);
-          if (Files.isDirectory(cgroupDirectory)) {
-            return cgroupDirectory;
-          }
-          summary.add("cgroupDirectoryNotFound=" + cgroupDirectory);
-          break;
+    private void collectDaemonDiagnostics(String gradleVersion, Exception failure) throws IOException {
+        Path failureDir = GRADLE_DAEMON_DIAGNOSTICS_DIR.resolve(
+                gradleVersion + "-" + projectFolder.getFileName().toString());
+        Files.createDirectories(failureDir);
+
+        List<String> summary = new ArrayList<>();
+        Throwable cause = failure;
+        int causeIndex = 0;
+        while (cause != null) {
+            String message = cause.getMessage();
+            int lineBreak = message != null ? message.indexOf('\n') : -1;
+            if (lineBreak >= 0) {
+                message = message.substring(0, lineBreak);
+            }
+            summary.add("failure[" + causeIndex++ + "]=" + cause.getClass().getName() + ": " + message);
+            cause = cause.getCause();
+        }
+        summary.add("gradleVersion=" + gradleVersion);
+
+        Path cgroupMembership = Paths.get("/proc/self/cgroup");
+        Path daemonLogDir = testKitFolder.resolve("test-kit-daemon/" + gradleVersion);
+        Path daemonLog = newestDaemonLog(daemonLogDir);
+        if (daemonLog != null) {
+            copyIfExists(daemonLog, failureDir.resolve(daemonLog.getFileName()), summary);
+            summary.add("daemonLog=" + daemonLog);
+
+            Matcher matcher = DAEMON_LOG_PATTERN.matcher(daemonLog.getFileName().toString());
+            if (matcher.matches()) {
+                String daemonIdentifier = matcher.group(1);
+                summary.add("daemonIdentifier=" + daemonIdentifier);
+                if (daemonIdentifier.matches("\\d+")) {
+                    summary.add("daemonPid=" + daemonIdentifier);
+                    Path procRoot = Paths.get("/proc");
+                    if (Files.isDirectory(procRoot)) {
+                        Path processDir = procRoot.resolve(daemonIdentifier);
+                        summary.add("daemonProcessPresent=" + Files.isDirectory(processDir));
+                        copyIfExists(processDir.resolve("status"), failureDir.resolve("proc-status"), summary);
+                        copyIfExists(processDir.resolve("limits"), failureDir.resolve("proc-limits"), summary);
+                        Path daemonCgroupMembership = processDir.resolve("cgroup");
+                        copyIfExists(daemonCgroupMembership, failureDir.resolve("proc-cgroup"), summary);
+                        if (Files.isRegularFile(daemonCgroupMembership)) {
+                            cgroupMembership = daemonCgroupMembership;
+                        }
+                    } else {
+                        summary.add("daemonProcessPresent=unknown");
+                    }
+                }
+            }
+
+            try {
+                System.out.println("==============================================================");
+                System.out.println(
+                        "Gradle Daemon log:\n" + new String(Files.readAllBytes(daemonLog), StandardCharsets.UTF_8));
+                System.out.println("==============================================================");
+            } catch (IOException e) {
+                summary.add("daemonLogReadFailed=" + e);
+            }
+        } else {
+            summary.add("daemonLog=not found");
         }
-      }
-    } catch (IOException e) {
-      summary.add("cgroupMembershipReadFailed[" + cgroupMembership + "]=" + e);
-    }
-    return cgroupRoot;
-  }
 
-  private static Path newestDaemonLog(Path daemonLogDir) throws IOException {
-    if (!Files.isDirectory(daemonLogDir)) {
-      return null;
+        summary.add("cgroupMembership=" + cgroupMembership);
+        Path cgroupDirectory = resolveCgroupV2Directory(cgroupMembership, summary);
+        summary.add("cgroupDirectory=" + cgroupDirectory);
+        copyIfExists(cgroupDirectory.resolve("memory.events"), failureDir.resolve("cgroup-memory.events"), summary);
+        copyIfExists(cgroupDirectory.resolve("memory.current"), failureDir.resolve("cgroup-memory.current"), summary);
+        copyIfExists(cgroupDirectory.resolve("memory.peak"), failureDir.resolve("cgroup-memory.peak"), summary);
+        copyIfExists(cgroupDirectory.resolve("pids.events"), failureDir.resolve("cgroup-pids.events"), summary);
+        copyIfExists(cgroupDirectory.resolve("pids.current"), failureDir.resolve("cgroup-pids.current"), summary);
+        copyIfExists(cgroupDirectory.resolve("pids.max"), failureDir.resolve("cgroup-pids.max"), summary);
+
+        Files.write(failureDir.resolve("summary.txt"), summary, StandardCharsets.UTF_8);
+        System.out.println("Gradle daemon diagnostics written to " + failureDir);
     }
-    try (Stream<Path> daemonLogs = Files.list(daemonLogDir)) {
-      return daemonLogs
-          .filter(path -> DAEMON_LOG_PATTERN.matcher(path.getFileName().toString()).matches())
-          .max(Comparator.comparingLong(path -> path.toFile().lastModified()))
-          .orElse(null);
+
+    private static Path resolveCgroupV2Directory(Path cgroupMembership, List<String> summary) {
+        Path cgroupRoot = Paths.get("/sys/fs/cgroup");
+        if (!Files.isRegularFile(cgroupMembership)) {
+            return cgroupRoot;
+        }
+
+        try {
+            for (String line : Files.readAllLines(cgroupMembership, StandardCharsets.UTF_8)) {
+                if (line.startsWith("0::")) {
+                    String relativePath = line.substring(3);
+                    if (relativePath.startsWith("/")) {
+                        relativePath = relativePath.substring(1);
+                    }
+                    Path cgroupDirectory = cgroupRoot.resolve(relativePath);
+                    if (Files.isDirectory(cgroupDirectory)) {
+                        return cgroupDirectory;
+                    }
+                    summary.add("cgroupDirectoryNotFound=" + cgroupDirectory);
+                    break;
+                }
+            }
+        } catch (IOException e) {
+            summary.add("cgroupMembershipReadFailed[" + cgroupMembership + "]=" + e);
+        }
+        return cgroupRoot;
     }
-  }
 
-  private static void copyIfExists(Path source, Path destination, List<String> summary) {
-    if (!Files.exists(source)) {
-      return;
+    private static Path newestDaemonLog(Path daemonLogDir) throws IOException {
+        if (!Files.isDirectory(daemonLogDir)) {
+            return null;
+        }
+        try (Stream<Path> daemonLogs = Files.list(daemonLogDir)) {
+            return daemonLogs
+                    .filter(path -> DAEMON_LOG_PATTERN
+                            .matcher(path.getFileName().toString())
+                            .matches())
+                    .max(Comparator.comparingLong(path -> path.toFile().lastModified()))
+                    .orElse(null);
+        }
     }
-    try {
-      Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING);
-    } catch (IOException e) {
-      summary.add("copyFailed[" + source + "]=" + e);
+
+    private static void copyIfExists(Path source, Path destination, List<String> summary) {
+        if (!Files.exists(source)) {
+            return;
+        }
+        try {
+            Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING);
+        } catch (IOException e) {
+            summary.add("copyFailed[" + source + "]=" + e);
+        }
     }
-  }
 
-  private void assertBuildSuccessful(BuildResult buildResult) {
-    assertNotNull(buildResult.getTasks());
-    assertFalse(buildResult.getTasks().isEmpty(), "build produced zero tasks");
-    for (BuildTask task : buildResult.getTasks()) {
-      assertFalse(task.getOutcome() == TaskOutcome.FAILED, "task " + task.getPath() + " failed");
+    private void assertBuildSuccessful(BuildResult buildResult) {
+        assertNotNull(buildResult.getTasks());
+        assertFalse(buildResult.getTasks().isEmpty(), "build produced zero tasks");
+        for (BuildTask task : buildResult.getTasks()) {
+            assertFalse(task.getOutcome() == TaskOutcome.FAILED, "task " + task.getPath() + " failed");
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDistribution.java b/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDistribution.java
index edaa526dbac..083883d691e 100644
--- a/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDistribution.java
+++ b/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDistribution.java
@@ -14,56 +14,51 @@
 
 final class GradleDistribution {
 
-  static final String GRADLE_DISTRIBUTION_URL_ENV = "GRADLE_DISTRIBUTION_URL";
+    static final String GRADLE_DISTRIBUTION_URL_ENV = "GRADLE_DISTRIBUTION_URL";
 
-  private static final String MASS_READ_URL_ENV = "MASS_READ_URL";
-  private static final Pattern DISTRIBUTION_URL_LINE = Pattern.compile("(?m)^distributionUrl=.*$");
+    private static final String MASS_READ_URL_ENV = "MASS_READ_URL";
+    private static final Pattern DISTRIBUTION_URL_LINE = Pattern.compile("(?m)^distributionUrl=.*$");
 
-  private GradleDistribution() {}
+    private GradleDistribution() {}
 
-  static URI uriFor(String gradleVersion) {
-    String massReadUrl = System.getenv(MASS_READ_URL_ENV);
-    if (massReadUrl == null || massReadUrl.trim().isEmpty()) {
-      return new DistributionLocator().getDistributionFor(GradleVersion.version(gradleVersion));
+    static URI uriFor(String gradleVersion) {
+        String massReadUrl = System.getenv(MASS_READ_URL_ENV);
+        if (massReadUrl == null || massReadUrl.trim().isEmpty()) {
+            return new DistributionLocator().getDistributionFor(GradleVersion.version(gradleVersion));
+        }
+        return massUriFor(massReadUrl, gradleVersion);
     }
-    return massUriFor(massReadUrl, gradleVersion);
-  }
 
-  static GradleRunner withDistribution(GradleRunner runner, String gradleVersion) {
-    String massReadUrl = System.getenv(MASS_READ_URL_ENV);
-    if (massReadUrl == null || massReadUrl.trim().isEmpty()) {
-      return runner.withGradleVersion(gradleVersion);
+    static GradleRunner withDistribution(GradleRunner runner, String gradleVersion) {
+        String massReadUrl = System.getenv(MASS_READ_URL_ENV);
+        if (massReadUrl == null || massReadUrl.trim().isEmpty()) {
+            return runner.withGradleVersion(gradleVersion);
+        }
+        return runner.withGradleDistribution(massUriFor(massReadUrl, gradleVersion));
     }
-    return runner.withGradleDistribution(massUriFor(massReadUrl, gradleVersion));
-  }
 
-  static void propagateMassReadUrl(Map<String, String> environment) {
-    String massReadUrl = System.getenv(MASS_READ_URL_ENV);
-    if (massReadUrl != null && !massReadUrl.trim().isEmpty()) {
-      environment.put(MASS_READ_URL_ENV, massReadUrl);
+    static void propagateMassReadUrl(Map<String, String> environment) {
+        String massReadUrl = System.getenv(MASS_READ_URL_ENV);
+        if (massReadUrl != null && !massReadUrl.trim().isEmpty()) {
+            environment.put(MASS_READ_URL_ENV, massReadUrl);
+        }
     }
-  }
 
-  static String uriPropertiesValueFor(String gradleVersion) {
-    return uriFor(gradleVersion).toString().replace(":", "\\:");
-  }
+    static String uriPropertiesValueFor(String gradleVersion) {
+        return uriFor(gradleVersion).toString().replace(":", "\\:");
+    }
 
-  static void rewriteWrapperDistributionUrl(Path projectFolder, String gradleVersion)
-      throws IOException {
-    Path wrapperProperties = projectFolder.resolve("gradle/wrapper/gradle-wrapper.properties");
-    String contents = new String(Files.readAllBytes(wrapperProperties), StandardCharsets.UTF_8);
-    String replacement = "distributionUrl=" + uriPropertiesValueFor(gradleVersion);
-    String updated =
-        DISTRIBUTION_URL_LINE.matcher(contents).replaceFirst(Matcher.quoteReplacement(replacement));
-    Files.write(wrapperProperties, updated.getBytes(StandardCharsets.UTF_8));
-  }
+    static void rewriteWrapperDistributionUrl(Path projectFolder, String gradleVersion) throws IOException {
+        Path wrapperProperties = projectFolder.resolve("gradle/wrapper/gradle-wrapper.properties");
+        String contents = new String(Files.readAllBytes(wrapperProperties), StandardCharsets.UTF_8);
+        String replacement = "distributionUrl=" + uriPropertiesValueFor(gradleVersion);
+        String updated = DISTRIBUTION_URL_LINE.matcher(contents).replaceFirst(Matcher.quoteReplacement(replacement));
+        Files.write(wrapperProperties, updated.getBytes(StandardCharsets.UTF_8));
+    }
 
-  private static URI massUriFor(String massReadUrl, String gradleVersion) {
-    String baseUrl = massReadUrl.endsWith("/") ? massReadUrl : massReadUrl + "/";
-    return URI.create(
-        baseUrl
-            + "internal/artifact/services.gradle.org/distributions/gradle-"
-            + gradleVersion
-            + "-bin.zip");
-  }
+    private static URI massUriFor(String massReadUrl, String gradleVersion) {
+        String baseUrl = massReadUrl.endsWith("/") ? massReadUrl : massReadUrl + "/";
+        return URI.create(
+                baseUrl + "internal/artifact/services.gradle.org/distributions/gradle-" + gradleVersion + "-bin.zip");
+    }
 }
diff --git a/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleLauncherSmokeTest.java b/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleLauncherSmokeTest.java
index 199e21bfe70..25c92c9700c 100644
--- a/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleLauncherSmokeTest.java
+++ b/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleLauncherSmokeTest.java
@@ -22,171 +22,166 @@
  */
 class GradleLauncherSmokeTest extends AbstractGradleTest {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(GradleLauncherSmokeTest.class);
-
-  private static final int GRADLE_BUILD_TIMEOUT_MILLIS = 90_000;
-  private static final int GRADLE_STOP_TIMEOUT_MILLIS = 30_000;
-  private static final int GRADLE_WRAPPER_RETRIES = 3;
-
-  private static final String JAVA_HOME = buildJavaHome();
-
-  @TempDir static Path gradleUserHome;
-
-  @TableTest({
-    "scenario                 | gradleVersion | gradleDaemonCmdLineParams         ",
-    "6.6.1-from-gradle-props  | 6.6.1         |                                   ",
-    "6.6.1-from-cmd-line      | 6.6.1         | -Duser.country=VALUE_FROM_CMD_LINE",
-    "7.6.4-from-gradle-props  | 7.6.4         |                                   ",
-    "7.6.4-from-cmd-line      | 7.6.4         | -Duser.country=VALUE_FROM_CMD_LINE",
-    "8.11.1-from-gradle-props | 8.11.1        |                                   ",
-    "8.11.1-from-cmd-line     | 8.11.1        | -Duser.country=VALUE_FROM_CMD_LINE",
-    "latest-from-gradle-props | latest        |                                   ",
-    "latest-from-cmd-line     | latest        | -Duser.country=VALUE_FROM_CMD_LINE"
-  })
-  @ParameterizedTest
-  void testGradleLauncherInjectsTracerIntoGradleDaemon(
-      String gradleVersion, String gradleDaemonCmdLineParams) throws Exception {
-    String resolvedGradleVersion =
-        "latest".equals(gradleVersion) ? LATEST_GRADLE_VERSION : gradleVersion;
-    String cmdLineParams =
-        (gradleDaemonCmdLineParams == null || gradleDaemonCmdLineParams.isEmpty())
-            ? null
-            : gradleDaemonCmdLineParams;
-
-    givenGradleVersionIsCompatibleWithCurrentJvm(resolvedGradleVersion);
-    Map<String, Map<String, String>> replacements = new HashMap<>();
-    Map<String, String> versionMap = new HashMap<>();
-    versionMap.put("gradle-version", resolvedGradleVersion);
-    versionMap.put(
-        "gradle-distribution-url", GradleDistribution.uriPropertiesValueFor(resolvedGradleVersion));
-    replacements.put("gradle-wrapper.properties", versionMap);
-    givenGradleProjectFiles("test-gradle-wrapper", replacements);
-    // we want to check that instrumentation works with different wrapper versions too
-    givenGradleWrapper(resolvedGradleVersion);
-
-    String output = whenRunningGradleLauncherWithJavaTracerInjected(cmdLineParams);
-
-    gradleDaemonStartCommandContains(
-        output,
-        // Verify that the javaagent is injected into the Gradle Daemon start command.
-        "-javaagent:" + AGENT_JAR,
-        // Verify that existing Gradle Daemon JVM args are preserved: org.gradle.jvmargs provided
-        // on the command line (if present), otherwise org.gradle.jvmargs from gradle.properties.
-        // "user.country" is used, as Gradle will filter out properties it is not aware of.
-        cmdLineParams != null ? cmdLineParams : "-Duser.country=VALUE_FROM_GRADLE_PROPERTIES_FILE");
-  }
-
-  /**
-   * Stops the Gradle build daemon spawned by the launcher after each test. Even though the launcher
-   * is run with {@code --no-daemon}, Gradle still starts a single-use build daemon that writes into
-   * {@code $GRADLE_USER_HOME/daemon/<version>/}; if that process has not fully released its file
-   * handles by the time JUnit deletes the shared (static) {@link #gradleUserHome} temp directory at
-   * class teardown, the recursive delete fails with a {@code DirectoryNotEmptyException}. Stopping
-   * the daemon here releases those handles ahead of cleanup.
-   *
-   * <p>This runs in {@code @AfterEach} rather than {@code @AfterAll} on purpose: {@link
-   * #projectFolder} (which holds the {@code gradlew} script used as the working directory) is an
-   * instance {@code @TempDir}, so JUnit deletes it at the end of each test invocation. By the time
-   * an {@code @AfterAll} method would run, that working directory no longer exists and the {@code
-   * --stop} command could not be launched.
-   */
-  @AfterEach
-  void stopGradleBuildDaemon() {
-    if (!Files.exists(projectFolder.resolve("gradlew"))) {
-      // The test was skipped or failed before the wrapper was set up, so no daemon was started.
-      return;
+    private static final Logger LOGGER = LoggerFactory.getLogger(GradleLauncherSmokeTest.class);
+
+    private static final int GRADLE_BUILD_TIMEOUT_MILLIS = 90_000;
+    private static final int GRADLE_STOP_TIMEOUT_MILLIS = 30_000;
+    private static final int GRADLE_WRAPPER_RETRIES = 3;
+
+    private static final String JAVA_HOME = buildJavaHome();
+
+    @TempDir
+    static Path gradleUserHome;
+
+    @TableTest({
+      "scenario                 | gradleVersion | gradleDaemonCmdLineParams         ",
+      "6.6.1-from-gradle-props  | 6.6.1         |                                   ",
+      "6.6.1-from-cmd-line      | 6.6.1         | -Duser.country=VALUE_FROM_CMD_LINE",
+      "7.6.4-from-gradle-props  | 7.6.4         |                                   ",
+      "7.6.4-from-cmd-line      | 7.6.4         | -Duser.country=VALUE_FROM_CMD_LINE",
+      "8.11.1-from-gradle-props | 8.11.1        |                                   ",
+      "8.11.1-from-cmd-line     | 8.11.1        | -Duser.country=VALUE_FROM_CMD_LINE",
+      "latest-from-gradle-props | latest        |                                   ",
+      "latest-from-cmd-line     | latest        | -Duser.country=VALUE_FROM_CMD_LINE"
+    })
+    @ParameterizedTest
+    void testGradleLauncherInjectsTracerIntoGradleDaemon(String gradleVersion, String gradleDaemonCmdLineParams)
+            throws Exception {
+        String resolvedGradleVersion = "latest".equals(gradleVersion) ? LATEST_GRADLE_VERSION : gradleVersion;
+        String cmdLineParams = (gradleDaemonCmdLineParams == null || gradleDaemonCmdLineParams.isEmpty())
+                ? null
+                : gradleDaemonCmdLineParams;
+
+        givenGradleVersionIsCompatibleWithCurrentJvm(resolvedGradleVersion);
+        Map<String, Map<String, String>> replacements = new HashMap<>();
+        Map<String, String> versionMap = new HashMap<>();
+        versionMap.put("gradle-version", resolvedGradleVersion);
+        versionMap.put("gradle-distribution-url", GradleDistribution.uriPropertiesValueFor(resolvedGradleVersion));
+        replacements.put("gradle-wrapper.properties", versionMap);
+        givenGradleProjectFiles("test-gradle-wrapper", replacements);
+        // we want to check that instrumentation works with different wrapper versions too
+        givenGradleWrapper(resolvedGradleVersion);
+
+        String output = whenRunningGradleLauncherWithJavaTracerInjected(cmdLineParams);
+
+        gradleDaemonStartCommandContains(
+                output,
+                // Verify that the javaagent is injected into the Gradle Daemon start command.
+                "-javaagent:" + AGENT_JAR,
+                // Verify that existing Gradle Daemon JVM args are preserved: org.gradle.jvmargs provided
+                // on the command line (if present), otherwise org.gradle.jvmargs from gradle.properties.
+                // "user.country" is used, as Gradle will filter out properties it is not aware of.
+                cmdLineParams != null ? cmdLineParams : "-Duser.country=VALUE_FROM_GRADLE_PROPERTIES_FILE");
     }
-    Map<String, String> env = new HashMap<>();
-    env.put("JAVA_HOME", JAVA_HOME);
-    env.put("GRADLE_USER_HOME", gradleUserHome.toString());
-    env.put("GRADLE_ARGS", "");
-    env.put("GRADLE_OPTS", "");
-    ShellCommandExecutor shellCommandExecutor =
-        new ShellCommandExecutor(projectFolder.toFile(), GRADLE_STOP_TIMEOUT_MILLIS, env);
-    try {
-      shellCommandExecutor.executeCommand(IOUtils::readFully, "./gradlew", "--stop");
-    } catch (Exception e) {
-      // Best-effort: a failure here should not fail the test run.
-      LOGGER.warn("Failed to stop Gradle daemon during cleanup", e);
-    }
-  }
-
-  private void givenGradleWrapper(String gradleVersion) throws Exception {
-    Map<String, String> env = new HashMap<>();
-    env.put("JAVA_HOME", JAVA_HOME);
-    env.put("GRADLE_USER_HOME", gradleUserHome.toString());
-    // Avoid inheriting CI Gradle launcher settings that might be incompatible with this wrapper.
-    env.put("GRADLE_ARGS", "");
-    env.put("GRADLE_OPTS", "");
-    ShellCommandExecutor shellCommandExecutor =
-        new ShellCommandExecutor(projectFolder.toFile(), GRADLE_BUILD_TIMEOUT_MILLIS, env);
-
-    for (int attempt = 0; attempt < GRADLE_WRAPPER_RETRIES; attempt++) {
-      try {
-        shellCommandExecutor.executeCommand(
-            IOUtils::readFully, "./gradlew", "wrapper", "--gradle-version", gradleVersion);
-        GradleDistribution.rewriteWrapperDistributionUrl(projectFolder, gradleVersion);
-        return;
-      } catch (ShellCommandExecutor.ShellCommandFailedException e) {
-        LOGGER.warn("Failed gradle wrapper resolution with exception: ", e);
-        Thread.sleep(2000); // small delay for rapid retries on network issues
-      }
-    }
-    throw new AssertionError(
-        "Tried " + GRADLE_WRAPPER_RETRIES + " times to execute gradle wrapper command and failed");
-  }
-
-  private String whenRunningGradleLauncherWithJavaTracerInjected(String gradleDaemonCmdLineParams)
-      throws Exception {
-    Map<String, String> env = new HashMap<>();
-    env.put("JAVA_HOME", JAVA_HOME);
-    env.put("GRADLE_USER_HOME", gradleUserHome.toString());
-    env.put("GRADLE_ARGS", "");
-    env.put("GRADLE_OPTS", "-javaagent:" + AGENT_JAR);
-    env.put("DD_CIVISIBILITY_ENABLED", "true");
-    env.put("DD_CIVISIBILITY_AGENTLESS_ENABLED", "true");
-    env.put("DD_CIVISIBILITY_AGENTLESS_URL", mockBackend.getIntakeUrl());
-    env.put("DD_CIVISIBILITY_GIT_UPLOAD_ENABLED", "false");
-    env.put("DD_CIVISIBILITY_GIT_CLIENT_ENABLED", "false");
-    env.put("DD_CODE_ORIGIN_FOR_SPANS_ENABLED", "false");
-    env.put("DD_CIVISIBILITY_CODE_COVERAGE_ENABLED", "false");
-    env.put("DD_API_KEY", "dummy");
-
-    ShellCommandExecutor shellCommandExecutor =
-        new ShellCommandExecutor(projectFolder.toFile(), GRADLE_BUILD_TIMEOUT_MILLIS, env);
-
-    List<String> command =
-        new java.util.ArrayList<>(Arrays.asList("./gradlew", "--no-daemon", "--info"));
-    if (gradleDaemonCmdLineParams != null) {
-      command.add("-Dorg.gradle.jvmargs=" + gradleDaemonCmdLineParams);
+
+    /**
+     * Stops the Gradle build daemon spawned by the launcher after each test. Even though the launcher
+     * is run with {@code --no-daemon}, Gradle still starts a single-use build daemon that writes into
+     * {@code $GRADLE_USER_HOME/daemon/<version>/}; if that process has not fully released its file
+     * handles by the time JUnit deletes the shared (static) {@link #gradleUserHome} temp directory at
+     * class teardown, the recursive delete fails with a {@code DirectoryNotEmptyException}. Stopping
+     * the daemon here releases those handles ahead of cleanup.
+     *
+     * <p>This runs in {@code @AfterEach} rather than {@code @AfterAll} on purpose: {@link
+     * #projectFolder} (which holds the {@code gradlew} script used as the working directory) is an
+     * instance {@code @TempDir}, so JUnit deletes it at the end of each test invocation. By the time
+     * an {@code @AfterAll} method would run, that working directory no longer exists and the {@code
+     * --stop} command could not be launched.
+     */
+    @AfterEach
+    void stopGradleBuildDaemon() {
+        if (!Files.exists(projectFolder.resolve("gradlew"))) {
+            // The test was skipped or failed before the wrapper was set up, so no daemon was started.
+            return;
+        }
+        Map<String, String> env = new HashMap<>();
+        env.put("JAVA_HOME", JAVA_HOME);
+        env.put("GRADLE_USER_HOME", gradleUserHome.toString());
+        env.put("GRADLE_ARGS", "");
+        env.put("GRADLE_OPTS", "");
+        ShellCommandExecutor shellCommandExecutor =
+                new ShellCommandExecutor(projectFolder.toFile(), GRADLE_STOP_TIMEOUT_MILLIS, env);
+        try {
+            shellCommandExecutor.executeCommand(IOUtils::readFully, "./gradlew", "--stop");
+        } catch (Exception e) {
+            // Best-effort: a failure here should not fail the test run.
+            LOGGER.warn("Failed to stop Gradle daemon during cleanup", e);
+        }
     }
 
-    try {
-      return shellCommandExecutor.executeCommand(
-          IOUtils::readFully, command.toArray(new String[0]));
-    } catch (Exception e) {
-      System.out.println("==============================================================");
-      System.out.println("Gradle Launcher execution failed with exception:\n " + e.getMessage());
-      System.out.println("==============================================================");
-      throw e;
+    private void givenGradleWrapper(String gradleVersion) throws Exception {
+        Map<String, String> env = new HashMap<>();
+        env.put("JAVA_HOME", JAVA_HOME);
+        env.put("GRADLE_USER_HOME", gradleUserHome.toString());
+        // Avoid inheriting CI Gradle launcher settings that might be incompatible with this wrapper.
+        env.put("GRADLE_ARGS", "");
+        env.put("GRADLE_OPTS", "");
+        ShellCommandExecutor shellCommandExecutor =
+                new ShellCommandExecutor(projectFolder.toFile(), GRADLE_BUILD_TIMEOUT_MILLIS, env);
+
+        for (int attempt = 0; attempt < GRADLE_WRAPPER_RETRIES; attempt++) {
+            try {
+                shellCommandExecutor.executeCommand(
+                        IOUtils::readFully, "./gradlew", "wrapper", "--gradle-version", gradleVersion);
+                GradleDistribution.rewriteWrapperDistributionUrl(projectFolder, gradleVersion);
+                return;
+            } catch (ShellCommandExecutor.ShellCommandFailedException e) {
+                LOGGER.warn("Failed gradle wrapper resolution with exception: ", e);
+                Thread.sleep(2000); // small delay for rapid retries on network issues
+            }
+        }
+        throw new AssertionError(
+                "Tried " + GRADLE_WRAPPER_RETRIES + " times to execute gradle wrapper command and failed");
     }
-  }
-
-  private static void gradleDaemonStartCommandContains(String buildOutput, String... tokens) {
-    String daemonStartCommandLog = null;
-    for (String line : buildOutput.split("\n")) {
-      if (line.contains("Starting process 'Gradle build daemon'")) {
-        daemonStartCommandLog = line;
-        break;
-      }
+
+    private String whenRunningGradleLauncherWithJavaTracerInjected(String gradleDaemonCmdLineParams) throws Exception {
+        Map<String, String> env = new HashMap<>();
+        env.put("JAVA_HOME", JAVA_HOME);
+        env.put("GRADLE_USER_HOME", gradleUserHome.toString());
+        env.put("GRADLE_ARGS", "");
+        env.put("GRADLE_OPTS", "-javaagent:" + AGENT_JAR);
+        env.put("DD_CIVISIBILITY_ENABLED", "true");
+        env.put("DD_CIVISIBILITY_AGENTLESS_ENABLED", "true");
+        env.put("DD_CIVISIBILITY_AGENTLESS_URL", mockBackend.getIntakeUrl());
+        env.put("DD_CIVISIBILITY_GIT_UPLOAD_ENABLED", "false");
+        env.put("DD_CIVISIBILITY_GIT_CLIENT_ENABLED", "false");
+        env.put("DD_CODE_ORIGIN_FOR_SPANS_ENABLED", "false");
+        env.put("DD_CIVISIBILITY_CODE_COVERAGE_ENABLED", "false");
+        env.put("DD_API_KEY", "dummy");
+
+        ShellCommandExecutor shellCommandExecutor =
+                new ShellCommandExecutor(projectFolder.toFile(), GRADLE_BUILD_TIMEOUT_MILLIS, env);
+
+        List<String> command = new java.util.ArrayList<>(Arrays.asList("./gradlew", "--no-daemon", "--info"));
+        if (gradleDaemonCmdLineParams != null) {
+            command.add("-Dorg.gradle.jvmargs=" + gradleDaemonCmdLineParams);
+        }
+
+        try {
+            return shellCommandExecutor.executeCommand(IOUtils::readFully, command.toArray(new String[0]));
+        } catch (Exception e) {
+            System.out.println("==============================================================");
+            System.out.println("Gradle Launcher execution failed with exception:\n " + e.getMessage());
+            System.out.println("==============================================================");
+            throw e;
+        }
     }
-    for (String token : tokens) {
-      if (daemonStartCommandLog == null || !daemonStartCommandLog.contains(token)) {
-        throw new AssertionFailedError(
-            "Gradle Daemon start command does not contain " + token,
-            token,
-            String.valueOf(daemonStartCommandLog));
-      }
+
+    private static void gradleDaemonStartCommandContains(String buildOutput, String... tokens) {
+        String daemonStartCommandLog = null;
+        for (String line : buildOutput.split("\n")) {
+            if (line.contains("Starting process 'Gradle build daemon'")) {
+                daemonStartCommandLog = line;
+                break;
+            }
+        }
+        for (String token : tokens) {
+            if (daemonStartCommandLog == null || !daemonStartCommandLog.contains(token)) {
+                throw new AssertionFailedError(
+                        "Gradle Daemon start command does not contain " + token,
+                        token,
+                        String.valueOf(daemonStartCommandLog));
+            }
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/grpc-1.5/src/main/java/datadog/smoketest/grpc/App.java b/dd-smoke-tests/grpc-1.5/src/main/java/datadog/smoketest/grpc/App.java
index 74137b6fe0c..8789cc02815 100644
--- a/dd-smoke-tests/grpc-1.5/src/main/java/datadog/smoketest/grpc/App.java
+++ b/dd-smoke-tests/grpc-1.5/src/main/java/datadog/smoketest/grpc/App.java
@@ -12,47 +12,43 @@
 
 public class App {
 
-  private static final Logger logger = Logger.getLogger(App.class.getName());
-
-  private Server server;
-
-  private void start() throws IOException {
-    int port = Integer.getInteger("grpc.http.port", 8080);
-    server =
-        Grpc.newServerBuilderForPort(port, InsecureServerCredentials.create())
-            .addService(new IastServiceImpl())
-            .build()
-            .start();
-    logger.info("Server started, listening on " + port);
-    Runtime.getRuntime()
-        .addShutdownHook(
-            new Thread(
-                () -> {
-                  System.err.println("*** shutting down gRPC server since JVM is shutting down");
-                  try {
-                    App.this.stop();
-                  } catch (InterruptedException e) {
-                    e.printStackTrace(System.err);
-                  }
-                  System.err.println("*** server shut down");
-                }));
-  }
-
-  private void stop() throws InterruptedException {
-    if (server != null) {
-      server.shutdown().awaitTermination(30, TimeUnit.SECONDS);
+    private static final Logger logger = Logger.getLogger(App.class.getName());
+
+    private Server server;
+
+    private void start() throws IOException {
+        int port = Integer.getInteger("grpc.http.port", 8080);
+        server = Grpc.newServerBuilderForPort(port, InsecureServerCredentials.create())
+                .addService(new IastServiceImpl())
+                .build()
+                .start();
+        logger.info("Server started, listening on " + port);
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            System.err.println("*** shutting down gRPC server since JVM is shutting down");
+            try {
+                App.this.stop();
+            } catch (InterruptedException e) {
+                e.printStackTrace(System.err);
+            }
+            System.err.println("*** server shut down");
+        }));
     }
-  }
 
-  private void blockUntilShutdown() throws InterruptedException {
-    if (server != null) {
-      server.awaitTermination();
+    private void stop() throws InterruptedException {
+        if (server != null) {
+            server.shutdown().awaitTermination(30, TimeUnit.SECONDS);
+        }
     }
-  }
 
-  public static void main(String[] args) throws IOException, InterruptedException {
-    final App app = new App();
-    app.start();
-    app.blockUntilShutdown();
-  }
+    private void blockUntilShutdown() throws InterruptedException {
+        if (server != null) {
+            server.awaitTermination();
+        }
+    }
+
+    public static void main(String[] args) throws IOException, InterruptedException {
+        final App app = new App();
+        app.start();
+        app.blockUntilShutdown();
+    }
 }
diff --git a/dd-smoke-tests/grpc-1.5/src/main/java/datadog/smoketest/grpc/IastServiceImpl.java b/dd-smoke-tests/grpc-1.5/src/main/java/datadog/smoketest/grpc/IastServiceImpl.java
index 663f14abb62..d34db070fae 100644
--- a/dd-smoke-tests/grpc-1.5/src/main/java/datadog/smoketest/grpc/IastServiceImpl.java
+++ b/dd-smoke-tests/grpc-1.5/src/main/java/datadog/smoketest/grpc/IastServiceImpl.java
@@ -10,22 +10,22 @@
 
 public class IastServiceImpl extends IastServiceGrpc.IastServiceImplBase {
 
-  @Override
-  public void serverSideRequestForgery(
-      final Request request, final StreamObserver<Response> responseObserver) {
-    if (request.getType() != Type.URL) {
-      responseObserver.onError(new IllegalArgumentException("Invalid type for request"));
-    } else {
-      try {
-        final URL target = new URL(request.getUrl().getValue());
-        final HttpURLConnection conn = (HttpURLConnection) target.openConnection();
-        conn.disconnect();
-        Response response = Response.newBuilder().setMessage("SSRF triggered").build();
-        responseObserver.onNext(response);
-        responseObserver.onCompleted();
-      } catch (final Exception e) {
-        responseObserver.onError(e);
-      }
+    @Override
+    public void serverSideRequestForgery(final Request request, final StreamObserver<Response> responseObserver) {
+        if (request.getType() != Type.URL) {
+            responseObserver.onError(new IllegalArgumentException("Invalid type for request"));
+        } else {
+            try {
+                final URL target = new URL(request.getUrl().getValue());
+                final HttpURLConnection conn = (HttpURLConnection) target.openConnection();
+                conn.disconnect();
+                Response response =
+                        Response.newBuilder().setMessage("SSRF triggered").build();
+                responseObserver.onNext(response);
+                responseObserver.onCompleted();
+            } catch (final Exception e) {
+                responseObserver.onError(e);
+            }
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/iast-propagation/src/main/java/JavaPropagation.java b/dd-smoke-tests/iast-propagation/src/main/java/JavaPropagation.java
index e80eb1df605..f2d1bf7633d 100644
--- a/dd-smoke-tests/iast-propagation/src/main/java/JavaPropagation.java
+++ b/dd-smoke-tests/iast-propagation/src/main/java/JavaPropagation.java
@@ -4,16 +4,16 @@
 
 public class JavaPropagation implements Supplier<List<String>> {
 
-  @Override
-  public List<String> get() {
-    return Arrays.asList("plus", "concat");
-  }
+    @Override
+    public List<String> get() {
+        return Arrays.asList("plus", "concat");
+    }
 
-  public String plus(String tainted) {
-    return tainted + tainted;
-  }
+    public String plus(String tainted) {
+        return tainted + tainted;
+    }
 
-  public String concat(String tainted) {
-    return tainted.concat(tainted);
-  }
+    public String concat(String tainted) {
+        return tainted.concat(tainted);
+    }
 }
diff --git a/dd-smoke-tests/iast-propagation/src/main/java/datadog/smoketest/springboot/PropagationController.java b/dd-smoke-tests/iast-propagation/src/main/java/datadog/smoketest/springboot/PropagationController.java
index 3302b4916c5..d6426debd35 100644
--- a/dd-smoke-tests/iast-propagation/src/main/java/datadog/smoketest/springboot/PropagationController.java
+++ b/dd-smoke-tests/iast-propagation/src/main/java/datadog/smoketest/springboot/PropagationController.java
@@ -13,43 +13,41 @@
 @RestController
 public class PropagationController {
 
-  private final Map<String, Supplier<List<String>>> suppliers = new ConcurrentHashMap<>();
+    private final Map<String, Supplier<List<String>>> suppliers = new ConcurrentHashMap<>();
 
-  @GetMapping("/{language}")
-  public List<String> propagation(@PathVariable("language") final String language) {
-    return supplierForLanguage(language).get();
-  }
+    @GetMapping("/{language}")
+    public List<String> propagation(@PathVariable("language") final String language) {
+        return supplierForLanguage(language).get();
+    }
 
-  @GetMapping("/{language}/{method}")
-  public String propagation(
-      @PathVariable("language") final String language,
-      @PathVariable("method") final String method,
-      @RequestParam("param") final String param) {
-    return invokeMethod(supplierForLanguage(language), method, param);
-  }
+    @GetMapping("/{language}/{method}")
+    public String propagation(
+            @PathVariable("language") final String language,
+            @PathVariable("method") final String method,
+            @RequestParam("param") final String param) {
+        return invokeMethod(supplierForLanguage(language), method, param);
+    }
 
-  @SuppressWarnings("unchecked")
-  private Supplier<List<String>> supplierForLanguage(final String language) {
-    return suppliers.computeIfAbsent(
-        language,
-        l -> {
-          try {
-            String name = Character.toUpperCase(l.charAt(0)) + l.substring(1) + "Propagation";
-            Class<?> instance = Thread.currentThread().getContextClassLoader().loadClass(name);
-            return (Supplier<List<String>>) instance.newInstance();
-          } catch (final Exception e) {
-            throw new RuntimeException(e);
-          }
+    @SuppressWarnings("unchecked")
+    private Supplier<List<String>> supplierForLanguage(final String language) {
+        return suppliers.computeIfAbsent(language, l -> {
+            try {
+                String name = Character.toUpperCase(l.charAt(0)) + l.substring(1) + "Propagation";
+                Class<?> instance =
+                        Thread.currentThread().getContextClassLoader().loadClass(name);
+                return (Supplier<List<String>>) instance.newInstance();
+            } catch (final Exception e) {
+                throw new RuntimeException(e);
+            }
         });
-  }
+    }
 
-  private String invokeMethod(
-      final Supplier<List<String>> supplier, final String name, final String param) {
-    try {
-      final Method method = supplier.getClass().getDeclaredMethod(name, String.class);
-      return (String) method.invoke(supplier, param);
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+    private String invokeMethod(final Supplier<List<String>> supplier, final String name, final String param) {
+        try {
+            final Method method = supplier.getClass().getDeclaredMethod(name, String.class);
+            return (String) method.invoke(supplier, param);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/iast-propagation/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/iast-propagation/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index c80e4cc2aa5..606974761ca 100644
--- a/dd-smoke-tests/iast-propagation/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/iast-propagation/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -6,7 +6,7 @@
 @SpringBootApplication
 public class SpringbootApplication {
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/iast-util/iast-util-11/src/main/java/datadog/smoketest/springboot/controller/SsrfController.java b/dd-smoke-tests/iast-util/iast-util-11/src/main/java/datadog/smoketest/springboot/controller/SsrfController.java
index 9cf1dc620bf..75d7b5e86a0 100644
--- a/dd-smoke-tests/iast-util/iast-util-11/src/main/java/datadog/smoketest/springboot/controller/SsrfController.java
+++ b/dd-smoke-tests/iast-util/iast-util-11/src/main/java/datadog/smoketest/springboot/controller/SsrfController.java
@@ -13,38 +13,37 @@
 @RequestMapping("/ssrf")
 public class SsrfController {
 
-  @PostMapping("/java-net")
-  public String javaNet(
-      @RequestParam(value = "url", required = false) final String url,
-      @RequestParam(value = "async", required = false) final boolean async,
-      @RequestParam(value = "promise", required = false) final boolean promise) {
-    HttpClient httpClient = HttpClient.newBuilder().build();
-    try {
-      String uri = url.startsWith("http") ? url : "http://" + url;
-      if (async) {
-        HttpRequest httpRequest = HttpRequest.newBuilder().uri(new URI(uri)).build();
-        if (promise) {
-          httpClient.sendAsync(
-              httpRequest,
-              HttpResponse.BodyHandlers.ofString(),
-              (initiatingRequest, pushPromiseRequest, acceptor) -> {});
-        } else {
-          httpClient.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofString());
+    @PostMapping("/java-net")
+    public String javaNet(
+            @RequestParam(value = "url", required = false) final String url,
+            @RequestParam(value = "async", required = false) final boolean async,
+            @RequestParam(value = "promise", required = false) final boolean promise) {
+        HttpClient httpClient = HttpClient.newBuilder().build();
+        try {
+            String uri = url.startsWith("http") ? url : "http://" + url;
+            if (async) {
+                HttpRequest httpRequest =
+                        HttpRequest.newBuilder().uri(new URI(uri)).build();
+                if (promise) {
+                    httpClient.sendAsync(
+                            httpRequest,
+                            HttpResponse.BodyHandlers.ofString(),
+                            (initiatingRequest, pushPromiseRequest, acceptor) -> {});
+                } else {
+                    httpClient.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofString());
+                }
+            } else {
+                HttpRequest httpRequest = HttpRequest.newBuilder()
+                        .uri(new URI(uri))
+                        .timeout(java.time.Duration.ofSeconds(
+                                1)) // prevents Idle timeout expired in jetty servers when the client is not
+                        // responding in sync mode
+                        .build();
+                httpClient.send(httpRequest, HttpResponse.BodyHandlers.ofString());
+            }
+        } catch (Exception e) {
+            // Do nothing
         }
-      } else {
-        HttpRequest httpRequest =
-            HttpRequest.newBuilder()
-                .uri(new URI(uri))
-                .timeout(
-                    java.time.Duration.ofSeconds(
-                        1)) // prevents Idle timeout expired in jetty servers when the client is not
-                // responding in sync mode
-                .build();
-        httpClient.send(httpRequest, HttpResponse.BodyHandlers.ofString());
-      }
-    } catch (Exception e) {
-      // Do nothing
+        return "ok";
     }
-    return "ok";
-  }
 }
diff --git a/dd-smoke-tests/iast-util/iast-util-17/src/main/java/datadog/smoketest/springboot/controller/StringOperationController.java b/dd-smoke-tests/iast-util/iast-util-17/src/main/java/datadog/smoketest/springboot/controller/StringOperationController.java
index 3f819a60f20..d995a1a77e0 100644
--- a/dd-smoke-tests/iast-util/iast-util-17/src/main/java/datadog/smoketest/springboot/controller/StringOperationController.java
+++ b/dd-smoke-tests/iast-util/iast-util-17/src/main/java/datadog/smoketest/springboot/controller/StringOperationController.java
@@ -9,9 +9,9 @@
 @RequestMapping("/string")
 public class StringOperationController {
 
-  @PostMapping("/translateEscapes")
-  public String translateEscapes(@RequestParam(value = "parameter") final String parameter) {
-    parameter.translateEscapes();
-    return "ok";
-  }
+    @PostMapping("/translateEscapes")
+    public String translateEscapes(@RequestParam(value = "parameter") final String parameter) {
+        parameter.translateEscapes();
+        return "ok";
+    }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/TestBean.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/TestBean.java
index 0ee0346f426..1f601a0d927 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/TestBean.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/TestBean.java
@@ -2,22 +2,22 @@
 
 public class TestBean {
 
-  private String name;
-  private String value;
+    private String name;
+    private String value;
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 
-  public void setName(String name) {
-    this.name = name;
-  }
+    public void setName(String name) {
+        this.name = name;
+    }
 
-  public String getValue() {
-    return value;
-  }
+    public String getValue() {
+        return value;
+    }
 
-  public void setValue(String value) {
-    this.value = value;
-  }
+    public void setValue(String value) {
+        this.value = value;
+    }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/TestSuite.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/TestSuite.java
index ba6900626fe..52fe165289a 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/TestSuite.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/TestSuite.java
@@ -5,25 +5,25 @@
 import javax.servlet.ServletRequest;
 
 public class TestSuite {
-  ServletRequest request;
+    ServletRequest request;
 
-  public TestSuite(ServletRequest request) {
-    this.request = request;
-  }
+    public TestSuite(ServletRequest request) {
+        this.request = request;
+    }
 
-  public String getParameter(String paramName) {
-    return request.getParameter(paramName);
-  }
+    public String getParameter(String paramName) {
+        return request.getParameter(paramName);
+    }
 
-  public String[] getParameterValues(String paramName) {
-    return request.getParameterValues(paramName);
-  }
+    public String[] getParameterValues(String paramName) {
+        return request.getParameterValues(paramName);
+    }
 
-  public Enumeration getParameterNames() {
-    return request.getParameterNames();
-  }
+    public Enumeration getParameterNames() {
+        return request.getParameterNames();
+    }
 
-  public Map<String, String[]> getParameterMap() {
-    return request.getParameterMap();
-  }
+    public Map<String, String[]> getParameterMap() {
+        return request.getParameterMap();
+    }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/config/IastWebConfig.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/config/IastWebConfig.java
index 184776ca5d9..4b520e1a93b 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/config/IastWebConfig.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/config/IastWebConfig.java
@@ -10,21 +10,21 @@
 @Configuration
 public class IastWebConfig {
 
-  @Bean
-  public ServletRegistrationBean multipartParseRequestServlet() {
-    return new ServletRegistrationBean(
-        new MultipartParseRequestServlet(), "/untrusted_deserialization/parse_request");
-  }
+    @Bean
+    public ServletRegistrationBean multipartParseRequestServlet() {
+        return new ServletRegistrationBean(
+                new MultipartParseRequestServlet(), "/untrusted_deserialization/parse_request");
+    }
 
-  @Bean
-  public ServletRegistrationBean multipartParseParameterMapServlet() {
-    return new ServletRegistrationBean(
-        new MultipartParseParameterMapServlet(), "/untrusted_deserialization/parse_parameter_map");
-  }
+    @Bean
+    public ServletRegistrationBean multipartParseParameterMapServlet() {
+        return new ServletRegistrationBean(
+                new MultipartParseParameterMapServlet(), "/untrusted_deserialization/parse_parameter_map");
+    }
 
-  @Bean
-  public ServletRegistrationBean multipartGetItemIteratorServlet() {
-    return new ServletRegistrationBean(
-        new MultipartGetItemIteratorServlet(), "/untrusted_deserialization/get_item_iterator");
-  }
+    @Bean
+    public ServletRegistrationBean multipartGetItemIteratorServlet() {
+        return new ServletRegistrationBean(
+                new MultipartGetItemIteratorServlet(), "/untrusted_deserialization/get_item_iterator");
+    }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/CodeInjectionController.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/CodeInjectionController.java
index 1dee0d2b61c..67e2260c470 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/CodeInjectionController.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/CodeInjectionController.java
@@ -10,43 +10,43 @@
 @RestController
 public class CodeInjectionController {
 
-  @GetMapping("/code_injection/beanshell")
-  public String beanshell(final HttpServletRequest request) {
-    final String param = request.getParameter("param");
-    try {
-      // The CODE_INJECTION sink fires on method entry, before the script is parsed/evaluated,
-      // so an evaluation failure here does not affect the vulnerability being reported.
-      new Interpreter().eval(param);
-    } catch (final Exception e) {
-      // ignore evaluation errors
+    @GetMapping("/code_injection/beanshell")
+    public String beanshell(final HttpServletRequest request) {
+        final String param = request.getParameter("param");
+        try {
+            // The CODE_INJECTION sink fires on method entry, before the script is parsed/evaluated,
+            // so an evaluation failure here does not affect the vulnerability being reported.
+            new Interpreter().eval(param);
+        } catch (final Exception e) {
+            // ignore evaluation errors
+        }
+        return "ok";
     }
-    return "ok";
-  }
 
-  @GetMapping("/code_injection/beanshell_reader")
-  public String beanshellReader(final HttpServletRequest request) {
-    final String param = request.getParameter("param");
-    try {
-      // Wrapping the tainted parameter in a StringReader propagates the taint to the reader
-      // (StringReaderCallSite), so eval(Reader) exercises the reader sink path end-to-end.
-      new Interpreter().eval(new StringReader(param));
-    } catch (final Exception e) {
-      // ignore evaluation errors
+    @GetMapping("/code_injection/beanshell_reader")
+    public String beanshellReader(final HttpServletRequest request) {
+        final String param = request.getParameter("param");
+        try {
+            // Wrapping the tainted parameter in a StringReader propagates the taint to the reader
+            // (StringReaderCallSite), so eval(Reader) exercises the reader sink path end-to-end.
+            new Interpreter().eval(new StringReader(param));
+        } catch (final Exception e) {
+            // ignore evaluation errors
+        }
+        return "ok";
     }
-    return "ok";
-  }
 
-  @GetMapping("/code_injection/beanshell_remote")
-  public String beanshellRemote(final HttpServletRequest request) {
-    final String url = request.getParameter("url");
-    final String script = request.getParameter("script");
-    try {
-      // Remote.eval reports CODE_INJECTION on the script and SSRF on the url on method entry,
-      // before it attempts the (here failing) connection.
-      Remote.eval(url, script);
-    } catch (final Exception e) {
-      // ignore evaluation / connection errors
+    @GetMapping("/code_injection/beanshell_remote")
+    public String beanshellRemote(final HttpServletRequest request) {
+        final String url = request.getParameter("url");
+        final String script = request.getParameter("script");
+        try {
+            // Remote.eval reports CODE_INJECTION on the script and SSRF on the url on method entry,
+            // before it attempts the (here failing) connection.
+            Remote.eval(url, script);
+        } catch (final Exception e) {
+            // ignore evaluation / connection errors
+        }
+        return "ok";
     }
-    return "ok";
-  }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/HardcodedSecretController.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/HardcodedSecretController.java
index 209d73ad3f9..ea5f5768b00 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/HardcodedSecretController.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/HardcodedSecretController.java
@@ -6,8 +6,8 @@
 @RestController
 public class HardcodedSecretController {
 
-  @RequestMapping("/hardcodedSecret")
-  public String hardcodedSecret() {
-    return "AGE-SECRET-KEY-1QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ";
-  }
+    @RequestMapping("/hardcodedSecret")
+    public String hardcodedSecret() {
+        return "AGE-SECRET-KEY-1QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ";
+    }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastSamplingController.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastSamplingController.java
index dcbb3f0070a..e5c7c0404b8 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastSamplingController.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastSamplingController.java
@@ -17,111 +17,110 @@
 @RestController
 public class IastSamplingController {
 
-  @GetMapping("/multiple_vulns/{i}")
-  public String multipleVulns(
-      @PathVariable("i") int i,
-      @RequestParam(name = "param", required = false) String paramValue,
-      HttpServletRequest request,
-      HttpServletResponse response)
-      throws NoSuchAlgorithmException {
-    // weak hash
-    MessageDigest.getInstance("SHA1").digest("hash1".getBytes(StandardCharsets.UTF_8));
-    // Insecure cookie
-    Cookie cookie = new Cookie("user-id", "7");
-    response.addCookie(cookie);
-    // weak hash
-    MessageDigest.getInstance("SHA-1").digest("hash2".getBytes(StandardCharsets.UTF_8));
-    // untrusted deserialization
-    try {
-      final ObjectInputStream ois = new ObjectInputStream(request.getInputStream());
-      ois.close();
-    } catch (IOException e) {
-      // Ignore IOException
+    @GetMapping("/multiple_vulns/{i}")
+    public String multipleVulns(
+            @PathVariable("i") int i,
+            @RequestParam(name = "param", required = false) String paramValue,
+            HttpServletRequest request,
+            HttpServletResponse response)
+            throws NoSuchAlgorithmException {
+        // weak hash
+        MessageDigest.getInstance("SHA1").digest("hash1".getBytes(StandardCharsets.UTF_8));
+        // Insecure cookie
+        Cookie cookie = new Cookie("user-id", "7");
+        response.addCookie(cookie);
+        // weak hash
+        MessageDigest.getInstance("SHA-1").digest("hash2".getBytes(StandardCharsets.UTF_8));
+        // untrusted deserialization
+        try {
+            final ObjectInputStream ois = new ObjectInputStream(request.getInputStream());
+            ois.close();
+        } catch (IOException e) {
+            // Ignore IOException
+        }
+        // weak hash
+        MessageDigest.getInstance("MD2").digest("hash3".getBytes(StandardCharsets.UTF_8));
+        return "OK";
     }
-    // weak hash
-    MessageDigest.getInstance("MD2").digest("hash3".getBytes(StandardCharsets.UTF_8));
-    return "OK";
-  }
 
-  @GetMapping("/multiple_vulns-2/{i}")
-  public String multipleVulns2(
-      @PathVariable("i") int i,
-      @RequestParam(name = "param", required = false) String paramValue,
-      HttpServletRequest request,
-      HttpServletResponse response)
-      throws NoSuchAlgorithmException {
-    // weak hash
-    MessageDigest.getInstance("SHA1").digest("hash1".getBytes(StandardCharsets.UTF_8));
-    // Insecure cookie
-    Cookie cookie = new Cookie("user-id", "7");
-    response.addCookie(cookie);
-    // weak hash
-    MessageDigest.getInstance("SHA-1").digest("hash2".getBytes(StandardCharsets.UTF_8));
-    // untrusted deserialization
-    try {
-      final ObjectInputStream ois = new ObjectInputStream(request.getInputStream());
-      ois.close();
-    } catch (IOException e) {
-      // Ignore IOException
+    @GetMapping("/multiple_vulns-2/{i}")
+    public String multipleVulns2(
+            @PathVariable("i") int i,
+            @RequestParam(name = "param", required = false) String paramValue,
+            HttpServletRequest request,
+            HttpServletResponse response)
+            throws NoSuchAlgorithmException {
+        // weak hash
+        MessageDigest.getInstance("SHA1").digest("hash1".getBytes(StandardCharsets.UTF_8));
+        // Insecure cookie
+        Cookie cookie = new Cookie("user-id", "7");
+        response.addCookie(cookie);
+        // weak hash
+        MessageDigest.getInstance("SHA-1").digest("hash2".getBytes(StandardCharsets.UTF_8));
+        // untrusted deserialization
+        try {
+            final ObjectInputStream ois = new ObjectInputStream(request.getInputStream());
+            ois.close();
+        } catch (IOException e) {
+            // Ignore IOException
+        }
+        // weak hash
+        MessageDigest.getInstance("MD2").digest("hash3".getBytes(StandardCharsets.UTF_8));
+        return "OK";
     }
-    // weak hash
-    MessageDigest.getInstance("MD2").digest("hash3".getBytes(StandardCharsets.UTF_8));
-    return "OK";
-  }
 
-  @PostMapping("/multiple_vulns/{i}")
-  public String multipleVulnsPost(
-      @PathVariable("i") int i,
-      @RequestParam(name = "param", required = false) String paramValue,
-      HttpServletRequest request,
-      HttpServletResponse response)
-      throws NoSuchAlgorithmException {
-    // weak hash
-    MessageDigest.getInstance("SHA1").digest("hash1".getBytes(StandardCharsets.UTF_8));
-    // Insecure cookie
-    Cookie cookie = new Cookie("user-id", "7");
-    response.addCookie(cookie);
-    // weak hash
-    MessageDigest.getInstance("SHA-1").digest("hash2".getBytes(StandardCharsets.UTF_8));
-    // untrusted deserialization
-    try {
-      final ObjectInputStream ois = new ObjectInputStream(request.getInputStream());
-      ois.close();
-    } catch (IOException e) {
-      // Ignore IOException
+    @PostMapping("/multiple_vulns/{i}")
+    public String multipleVulnsPost(
+            @PathVariable("i") int i,
+            @RequestParam(name = "param", required = false) String paramValue,
+            HttpServletRequest request,
+            HttpServletResponse response)
+            throws NoSuchAlgorithmException {
+        // weak hash
+        MessageDigest.getInstance("SHA1").digest("hash1".getBytes(StandardCharsets.UTF_8));
+        // Insecure cookie
+        Cookie cookie = new Cookie("user-id", "7");
+        response.addCookie(cookie);
+        // weak hash
+        MessageDigest.getInstance("SHA-1").digest("hash2".getBytes(StandardCharsets.UTF_8));
+        // untrusted deserialization
+        try {
+            final ObjectInputStream ois = new ObjectInputStream(request.getInputStream());
+            ois.close();
+        } catch (IOException e) {
+            // Ignore IOException
+        }
+        // weak hash
+        MessageDigest.getInstance("MD2").digest("hash3".getBytes(StandardCharsets.UTF_8));
+        return "OK";
     }
-    // weak hash
-    MessageDigest.getInstance("MD2").digest("hash3".getBytes(StandardCharsets.UTF_8));
-    return "OK";
-  }
 
-  @GetMapping("/different_vulns/{i}")
-  public String differentVulns(
-      @PathVariable("i") int i, HttpServletRequest request, HttpServletResponse response)
-      throws NoSuchAlgorithmException {
-    if (i == 1) {
-      // weak hash
-      MessageDigest.getInstance("SHA1").digest("hash1".getBytes(StandardCharsets.UTF_8));
-      // Insecure cookie
-      Cookie cookie = new Cookie("user-id", "7");
-      response.addCookie(cookie);
-      // weak hash
-      MessageDigest.getInstance("SHA-1").digest("hash2".getBytes(StandardCharsets.UTF_8));
-      // untrusted deserialization
-      try {
-        final ObjectInputStream ois = new ObjectInputStream(request.getInputStream());
-        ois.close();
-      } catch (IOException e) {
-        // Ignore IOException
-      }
-    } else if (i == 2) {
-      // weak hash
-      MessageDigest.getInstance("MD2").digest("hash3".getBytes(StandardCharsets.UTF_8));
-      // weak hash
-      MessageDigest.getInstance("MD5").digest("hash3".getBytes(StandardCharsets.UTF_8));
-      // weak hash
-      MessageDigest.getInstance("RIPEMD128").digest("hash3".getBytes(StandardCharsets.UTF_8));
+    @GetMapping("/different_vulns/{i}")
+    public String differentVulns(@PathVariable("i") int i, HttpServletRequest request, HttpServletResponse response)
+            throws NoSuchAlgorithmException {
+        if (i == 1) {
+            // weak hash
+            MessageDigest.getInstance("SHA1").digest("hash1".getBytes(StandardCharsets.UTF_8));
+            // Insecure cookie
+            Cookie cookie = new Cookie("user-id", "7");
+            response.addCookie(cookie);
+            // weak hash
+            MessageDigest.getInstance("SHA-1").digest("hash2".getBytes(StandardCharsets.UTF_8));
+            // untrusted deserialization
+            try {
+                final ObjectInputStream ois = new ObjectInputStream(request.getInputStream());
+                ois.close();
+            } catch (IOException e) {
+                // Ignore IOException
+            }
+        } else if (i == 2) {
+            // weak hash
+            MessageDigest.getInstance("MD2").digest("hash3".getBytes(StandardCharsets.UTF_8));
+            // weak hash
+            MessageDigest.getInstance("MD5").digest("hash3".getBytes(StandardCharsets.UTF_8));
+            // weak hash
+            MessageDigest.getInstance("RIPEMD128").digest("hash3".getBytes(StandardCharsets.UTF_8));
+        }
+        return "OK";
     }
-    return "OK";
-  }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastViewController.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastViewController.java
index 226109143e6..d40dfa1f957 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastViewController.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastViewController.java
@@ -8,18 +8,18 @@
 @Controller
 public class IastViewController {
 
-  @GetMapping("/unvalidated_redirect_from_string")
-  public String unvalidatedRedirectFromString(@RequestParam String param) {
-    return UrlBasedViewResolver.REDIRECT_URL_PREFIX + param;
-  }
+    @GetMapping("/unvalidated_redirect_from_string")
+    public String unvalidatedRedirectFromString(@RequestParam String param) {
+        return UrlBasedViewResolver.REDIRECT_URL_PREFIX + param;
+    }
 
-  @GetMapping("/unvalidated_redirect_forward_from_string")
-  public String unvalidatedRedirectForwardFromString(@RequestParam String param) {
-    return UrlBasedViewResolver.FORWARD_URL_PREFIX + param;
-  }
+    @GetMapping("/unvalidated_redirect_forward_from_string")
+    public String unvalidatedRedirectForwardFromString(@RequestParam String param) {
+        return UrlBasedViewResolver.FORWARD_URL_PREFIX + param;
+    }
 
-  @GetMapping("/get_view_from_tainted_string")
-  public String getViewfromTaintedString(@RequestParam String param) {
-    return param;
-  }
+    @GetMapping("/get_view_from_tainted_string")
+    public String getViewfromTaintedString(@RequestParam String param) {
+        return param;
+    }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java
index f9b20ca2796..577ac1e3acb 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java
@@ -60,431 +60,413 @@
 @RestController
 public class IastWebController {
 
-  private final Resource xml;
-  private final Hasher hasher;
-  private final Random random;
-
-  public IastWebController(@Value("classpath:xpathi.xml") final Resource resource) {
-    hasher = new Hasher();
-    hasher.sha1();
-    random = new Random();
-    xml = resource;
-  }
-
-  @RequestMapping("/greeting")
-  public String greeting() {
-    return "Sup Dawg";
-  }
-
-  @RequestMapping("/weakhash")
-  public String weakhash() {
-    hasher.md5().digest("Message body".getBytes(StandardCharsets.UTF_8));
-    return "Weak Hash page";
-  }
-
-  @RequestMapping("/weak_key_generator")
-  public String weakKeyGenerator() {
-    hasher.generateKey();
-    return "Weak Key generator page";
-  }
-
-  @RequestMapping("/weak_key_generator_with_provider")
-  public String weakKeyGeneratorWithProvider() {
-    hasher.generateKeyWithProvider();
-    return "Weak Key generator page";
-  }
-
-  @GetMapping("/insecure_cookie")
-  public String insecureCookie(HttpServletResponse response) {
-    Cookie cookie = new Cookie("user-id", "7");
-    response.addCookie(cookie);
-    response.setStatus(HttpStatus.OK.value());
-    return "Insecure cookie page";
-  }
-
-  @GetMapping("/secure_cookie")
-  public String secureCookie(HttpServletResponse response) {
-    Cookie cookie = new Cookie("user-id", "7");
-    cookie.setSecure(true);
-    response.addCookie(cookie);
-    response.setStatus(HttpStatus.OK.value());
-    return "Insecure cookie page";
-  }
-
-  @GetMapping("/insecure_cookie_from_header")
-  public String insecureCookieFromHeader(HttpServletResponse response) {
-    HttpCookie cookie = new HttpCookie("user-id", "7");
-
-    response.addHeader("Set-Cookie", cookie.toString());
-    response.setStatus(HttpStatus.OK.value());
-    return "Insecure cookie page";
-  }
-
-  @GetMapping("/unvalidated_redirect_from_header")
-  public String unvalidatedRedirectFromHeader(
-      @RequestParam String param, HttpServletResponse response) {
-    response.addHeader("Location", param);
-    response.setStatus(HttpStatus.FOUND.value());
-    return "Unvalidated redirect";
-  }
-
-  @GetMapping("/unvalidated_redirect_from_send_redirect")
-  public String unvalidatedRedirectFromSendRedirect(
-      @RequestParam String param, HttpServletResponse response) throws IOException {
-    response.sendRedirect(param);
-    return "Unvalidated redirect";
-  }
-
-  @GetMapping("/unvalidated_redirect_from_forward")
-  public String unvalidatedRedirectFromForward(
-      @RequestParam String param, HttpServletRequest request, HttpServletResponse response)
-      throws IOException, ServletException {
-    request.getRequestDispatcher(param).forward(request, response);
-    return "Unvalidated redirect";
-  }
-
-  @GetMapping("/unvalidated_redirect_from_redirect_view")
-  public RedirectView unvalidatedRedirectFromRedirectView(
-      @RequestParam String param, HttpServletResponse response) {
-    return new RedirectView(param);
-  }
-
-  @GetMapping("/unvalidated_redirect_from_model_and_view")
-  public ModelAndView unvalidatedRedirectFromModelAndView(
-      @RequestParam String param, HttpServletResponse response) {
-    return new ModelAndView(UrlBasedViewResolver.REDIRECT_URL_PREFIX + param);
-  }
-
-  @GetMapping("/unvalidated_redirect_forward_from_model_and_view")
-  public ModelAndView unvalidatedRedirectForwardFromModelAndView(
-      @RequestParam String param, HttpServletResponse response) {
-    return new ModelAndView(UrlBasedViewResolver.FORWARD_URL_PREFIX + param);
-  }
-
-  @RequestMapping("/async_weakhash")
-  public String asyncWeakhash() {
-    final Thread thread = new Thread(hasher::md4);
-    thread.start();
-    return "Weak Hash page";
-  }
-
-  @RequestMapping("/getparameter")
-  public String getParameter(@RequestParam String param, HttpServletRequest request) {
-    return "Param is: " + param;
-  }
-
-  @GetMapping("/cmdi/runtime")
-  public String commandInjectionRuntime(final HttpServletRequest request) {
-    withProcess(() -> Runtime.getRuntime().exec(request.getParameter("cmd")));
-    return "Command Injection page";
-  }
-
-  @GetMapping("/cmdi/process_builder")
-  public String commandInjectionProcessBuilder(final HttpServletRequest request) {
-    withProcess(() -> new ProcessBuilder(request.getParameter("cmd")).start());
-    return "Command Injection page";
-  }
-
-  @GetMapping("/path_traversal/file")
-  public String pathTraversalFile(final HttpServletRequest request) {
-    new File(request.getParameter("path"));
-    return "Path Traversal page";
-  }
-
-  @GetMapping("/path_traversal/paths")
-  public String pathTraversalPaths(final HttpServletRequest request) {
-    Paths.get(request.getParameter("path"));
-    return "Path Traversal page";
-  }
-
-  @GetMapping("/path_traversal/path")
-  public String pathTraversalPath(final HttpServletRequest request) {
-    new File(System.getProperty("user.dir")).toPath().resolve(request.getParameter("path"));
-    return "Path Traversal page";
-  }
-
-  @GetMapping("/param_binding/test")
-  public String paramBinding(final TestBean testBean) {
-    return "Test bean -> name: " + testBean.getName() + ", value: " + testBean.getValue();
-  }
-
-  @GetMapping("/request_header/test")
-  public String requestHeader(@RequestHeader("test-header") String header) {
-    return "Header is: " + header;
-  }
-
-  @GetMapping("/path_param")
-  public String pathParam(@PathParam("param") String param) {
-    return "PathParam is: " + param;
-  }
-
-  @GetMapping("/matrix/{var1}/{var2}")
-  public String matrixAndPathVariables(
-      @PathVariable String var1,
-      @MatrixVariable(pathVar = "var1") Map<String, String> m1,
-      @PathVariable String var2,
-      @MatrixVariable(pathVar = "var2") Map<String, String> m2) {
-    return "{var1=" + var1 + ", m1=" + m1 + ", var2=" + var2 + ", m2=" + m2 + "}";
-  }
-
-  @PostMapping("/request_body/test")
-  public String jsonRequestBody(@RequestBody TestBean testBean) {
-    return "@RequestBody to Test bean -> name: "
-        + testBean.getName()
-        + ", value: "
-        + testBean.getValue();
-  }
-
-  @GetMapping("/query_string")
-  public String queryString(final HttpServletRequest request) {
-    return "QueryString is: " + request.getQueryString();
-  }
-
-  @GetMapping("/cookie")
-  public String cookie(final HttpServletRequest request) {
-    final Cookie cookie = request.getCookies()[0];
-    return "Cookie is: " + cookie.getName() + "=" + cookie.getValue();
-  }
-
-  @GetMapping("/jwt")
-  public String jwt(Principal userPrincipal) {
-    return "ok User Principal name: " + userPrincipal.getName();
-  }
-
-  @GetMapping("/weak_randomness")
-  public String weak_randomness(@RequestParam("mode") final Class<?> mode) {
-    final double result;
-    if (mode == ThreadLocalRandom.class) {
-      result = ThreadLocalRandom.current().nextDouble();
-    } else if (mode == Math.class) {
-      result = Math.random();
-    } else {
-      result = random.nextDouble();
-    }
-    return "Random : " + result;
-  }
-
-  @GetMapping("/xpathi/compile")
-  public String xpathInjectionCompile(final HttpServletRequest request)
-      throws XPathExpressionException {
-    XPathFactory.newInstance().newXPath().compile(request.getParameter("expression"));
-    return "XPath Injection page";
-  }
-
-  @GetMapping("/xpathi/evaluate")
-  public String xpathInjectionEvaluate(final HttpServletRequest request)
-      throws XPathExpressionException, ParserConfigurationException, IOException, SAXException {
-    DocumentBuilder b = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-    Document doc = b.parse(xml.getInputStream());
-    String expression = request.getParameter("expression");
-    XPath xPath = XPathFactory.newInstance().newXPath();
-    xPath.evaluate(expression, doc.getDocumentElement(), XPathConstants.NODESET);
-    return "XPath Injection page";
-  }
-
-  @GetMapping("/trust_boundary_violation")
-  public String trustBoundaryViolation(final HttpServletRequest request) {
-    String paramValue = request.getParameter("paramValue");
-    request.getSession().setAttribute("name", paramValue);
-    return "Trust Boundary violation page";
-  }
-
-  @GetMapping("/trust_boundary_violation_for_cookie")
-  public String trustBoundaryViolationForCookie(final HttpServletRequest request)
-      throws UnsupportedEncodingException {
-
-    for (Cookie theCookie : request.getCookies()) {
-      if (theCookie.getName().equals("https%3A%2F%2Fuser-id2")) {
-        String value = java.net.URLDecoder.decode(theCookie.getValue(), "UTF-8");
-        request.getSession().putValue(value, "88888");
-      }
-    }
-    return "Trust Boundary violation with cookie page";
-  }
-
-  @GetMapping(value = "/hstsmissing", produces = "text/html")
-  public String hstsHeaderMissing(HttpServletResponse response) {
-    response.setStatus(HttpStatus.OK.value());
-    return "ok";
-  }
-
-  @GetMapping(value = "/xcontenttypeoptionsmissing", produces = "text/html")
-  public String xContentTypeOptionsMissing(HttpServletResponse response) {
-    response.addHeader("X-Content-Type-Options", "dosniff");
-    response.setStatus(HttpStatus.OK.value());
-    return "ok";
-  }
-
-  @GetMapping(value = "/insecureAuthProtocol")
-  public String insecureAuthProtocol(HttpServletRequest request) {
-    String authorization = request.getHeader("Authorization");
-    return authorization;
-  }
-
-  @PostMapping("/multipart")
-  public String handleFileUpload(
-      @RequestParam("theFile") MultipartFile file, @RequestParam("param1") String param1) {
-    String fileContent = "NO_FILE";
-    try {
-      fileContent = Arrays.toString(file.getBytes());
-      file.getOriginalFilename();
-    } catch (IOException e) {
-    }
-    return "fileName: " + file.getName();
-  }
-
-  @PostMapping("/jakartaMailHtmlVulnerability")
-  public String jakartaMailHtmlVulnerability(HttpServletRequest request)
-      throws jakarta.mail.MessagingException {
-    jakarta.mail.Session session = jakarta.mail.Session.getDefaultInstance(new Properties());
-    jakarta.mail.Provider provider =
-        new jakarta.mail.Provider(
-            jakarta.mail.Provider.Type.TRANSPORT,
-            "smtp",
-            JakartaMockTransport.class.getName(),
-            "MockTransport",
-            "1.0");
-    session.setProvider(provider);
-    boolean sanitize =
-        StringUtils.isNotEmpty(request.getParameter("sanitize"))
-            && request.getParameter("sanitize").equalsIgnoreCase("true");
-    jakarta.mail.internet.MimeMessage message = new jakarta.mail.internet.MimeMessage(session);
-    if (request.getParameter("messageText") != null) {
-      message.setText(
-          sanitize
-              ? StringEscapeUtils.escapeHtml4(request.getParameter("messageText"))
-              : request.getParameter("messageText"),
-          "utf-8",
-          "html");
-    } else {
-      jakarta.mail.Multipart content = new jakarta.mail.internet.MimeMultipart();
-      content.addBodyPart(new jakarta.mail.internet.MimeBodyPart());
-      content
-          .getBodyPart(0)
-          .setContent(
-              sanitize
-                  ? StringEscapeUtils.escapeHtml4(request.getParameter("messageContent"))
-                  : request.getParameter("messageContent"),
-              "text/html");
-      message.setContent(content, "multipart/*");
-    }
-    message.setRecipients(jakarta.mail.Message.RecipientType.TO, "abc@datadoghq.com");
-    jakarta.mail.Transport.send(message);
-    return "ok";
-  }
-
-  @GetMapping(value = "/xcontenttypeoptionsecure", produces = "text/html")
-  public String xContentTypeOptionsSecure(HttpServletResponse response) {
-    response.addHeader("X-Content-Type-Options", "nosniff");
-    response.setStatus(HttpStatus.OK.value());
-    return "ok";
-  }
-
-  @GetMapping("/getrequesturi")
-  String pathInfo(HttpServletRequest request) {
-    String pathInfo = request.getRequestURI();
-    return String.format("Request.getRequestURI returns %s", pathInfo);
-  }
-
-  @GetMapping("/getrequesturl")
-  String requestURL(HttpServletRequest request) {
-    StringBuffer requestURL = request.getRequestURL();
-    return String.format("Request.getRequestURL returns %s", requestURL);
-  }
-
-  @PostMapping("/gson_deserialization")
-  String gson(@RequestParam("json") String json) {
-    Gson gson = new Gson();
-    TestBean testBean = gson.fromJson(json, TestBean.class);
-    return "Test bean -> name: " + testBean.getName() + ", value: " + testBean.getValue();
-  }
-
-  @PostMapping(value = "/gson_json_parser_deserialization", consumes = MediaType.TEXT_PLAIN_VALUE)
-  String gsonJsonParser(@RequestBody String json) {
-    JsonParser.parseReader(new StringReader(json));
-    return "Ok";
-  }
-
-  @GetMapping("/header_injection")
-  public String headerInjection(@RequestParam("param") String param, HttpServletResponse response) {
-    response.addHeader("X-Test-Header", param);
-    return "Ok";
-  }
-
-  @GetMapping("/header_injection_exclusion")
-  public String headerInjectionExclusion(
-      @RequestParam("param") String param, HttpServletResponse response) {
-    response.addHeader("Sec-WebSocket-Location", param);
-    return "Ok";
-  }
-
-  @GetMapping("/header_injection_redaction")
-  public String headerInjectionRedaction(
-      @RequestParam("param") String param, HttpServletResponse response) {
-    response.addHeader("X-Test-Header", param);
-    return "Ok";
-  }
-
-  @PostMapping("/untrusted_deserialization")
-  public String untrustedDeserialization(HttpServletRequest request) throws IOException {
-    final ObjectInputStream ois = new ObjectInputStream(request.getInputStream());
-    ois.close();
-    return "OK";
-  }
-
-  @PostMapping("/untrusted_deserialization/multipart")
-  public String untrustedDeserializationMultipart(@RequestParam("file") MultipartFile file)
-      throws IOException {
-    final ObjectInputStream ois = new ObjectInputStream(file.getInputStream());
-    ois.close();
-    return "OK";
-  }
-
-  @PostMapping("/untrusted_deserialization/part")
-  public String untrustedDeserializationParts(HttpServletRequest request)
-      throws IOException, ServletException {
-    List<Part> parts = (List<Part>) request.getParts();
-    final ObjectInputStream ois = new ObjectInputStream(parts.get(0).getInputStream());
-    ois.close();
-    return "OK";
-  }
-
-  @GetMapping("/untrusted_deserialization/snakeyaml")
-  public String untrustedDeserializationSnakeYaml(@RequestParam("yaml") String param) {
-    new Yaml().load(param);
-    return "OK";
-  }
-
-  @GetMapping("/test_custom_string_reader")
-  public String testCustomStringReader(@RequestParam("param") String param) throws IOException {
-    return String.join("", IOUtils.readLines(new CustomStringReader(param)));
-  }
-
-  private void withProcess(final Operation<Process> op) {
-    Process process = null;
-    try {
-      process = op.run();
-    } catch (final Throwable e) {
-      // ignore it
-    } finally {
-      if (process != null && process.isAlive()) {
-        process.destroyForcibly();
-      }
-    }
-  }
-
-  private interface Operation<E> {
-    E run() throws Throwable;
-  }
-
-  public static class CustomStringReader extends StringReader {
-
-    public CustomStringReader(String s) {
-      super(
-          "Super "
-              + s
-              + (new StringReader(
-                  "New_1" + new StringReader("New_2" + new StringReader("New_3" + s)))));
-    }
-  }
+    private final Resource xml;
+    private final Hasher hasher;
+    private final Random random;
+
+    public IastWebController(@Value("classpath:xpathi.xml") final Resource resource) {
+        hasher = new Hasher();
+        hasher.sha1();
+        random = new Random();
+        xml = resource;
+    }
+
+    @RequestMapping("/greeting")
+    public String greeting() {
+        return "Sup Dawg";
+    }
+
+    @RequestMapping("/weakhash")
+    public String weakhash() {
+        hasher.md5().digest("Message body".getBytes(StandardCharsets.UTF_8));
+        return "Weak Hash page";
+    }
+
+    @RequestMapping("/weak_key_generator")
+    public String weakKeyGenerator() {
+        hasher.generateKey();
+        return "Weak Key generator page";
+    }
+
+    @RequestMapping("/weak_key_generator_with_provider")
+    public String weakKeyGeneratorWithProvider() {
+        hasher.generateKeyWithProvider();
+        return "Weak Key generator page";
+    }
+
+    @GetMapping("/insecure_cookie")
+    public String insecureCookie(HttpServletResponse response) {
+        Cookie cookie = new Cookie("user-id", "7");
+        response.addCookie(cookie);
+        response.setStatus(HttpStatus.OK.value());
+        return "Insecure cookie page";
+    }
+
+    @GetMapping("/secure_cookie")
+    public String secureCookie(HttpServletResponse response) {
+        Cookie cookie = new Cookie("user-id", "7");
+        cookie.setSecure(true);
+        response.addCookie(cookie);
+        response.setStatus(HttpStatus.OK.value());
+        return "Insecure cookie page";
+    }
+
+    @GetMapping("/insecure_cookie_from_header")
+    public String insecureCookieFromHeader(HttpServletResponse response) {
+        HttpCookie cookie = new HttpCookie("user-id", "7");
+
+        response.addHeader("Set-Cookie", cookie.toString());
+        response.setStatus(HttpStatus.OK.value());
+        return "Insecure cookie page";
+    }
+
+    @GetMapping("/unvalidated_redirect_from_header")
+    public String unvalidatedRedirectFromHeader(@RequestParam String param, HttpServletResponse response) {
+        response.addHeader("Location", param);
+        response.setStatus(HttpStatus.FOUND.value());
+        return "Unvalidated redirect";
+    }
+
+    @GetMapping("/unvalidated_redirect_from_send_redirect")
+    public String unvalidatedRedirectFromSendRedirect(@RequestParam String param, HttpServletResponse response)
+            throws IOException {
+        response.sendRedirect(param);
+        return "Unvalidated redirect";
+    }
+
+    @GetMapping("/unvalidated_redirect_from_forward")
+    public String unvalidatedRedirectFromForward(
+            @RequestParam String param, HttpServletRequest request, HttpServletResponse response)
+            throws IOException, ServletException {
+        request.getRequestDispatcher(param).forward(request, response);
+        return "Unvalidated redirect";
+    }
+
+    @GetMapping("/unvalidated_redirect_from_redirect_view")
+    public RedirectView unvalidatedRedirectFromRedirectView(@RequestParam String param, HttpServletResponse response) {
+        return new RedirectView(param);
+    }
+
+    @GetMapping("/unvalidated_redirect_from_model_and_view")
+    public ModelAndView unvalidatedRedirectFromModelAndView(@RequestParam String param, HttpServletResponse response) {
+        return new ModelAndView(UrlBasedViewResolver.REDIRECT_URL_PREFIX + param);
+    }
+
+    @GetMapping("/unvalidated_redirect_forward_from_model_and_view")
+    public ModelAndView unvalidatedRedirectForwardFromModelAndView(
+            @RequestParam String param, HttpServletResponse response) {
+        return new ModelAndView(UrlBasedViewResolver.FORWARD_URL_PREFIX + param);
+    }
+
+    @RequestMapping("/async_weakhash")
+    public String asyncWeakhash() {
+        final Thread thread = new Thread(hasher::md4);
+        thread.start();
+        return "Weak Hash page";
+    }
+
+    @RequestMapping("/getparameter")
+    public String getParameter(@RequestParam String param, HttpServletRequest request) {
+        return "Param is: " + param;
+    }
+
+    @GetMapping("/cmdi/runtime")
+    public String commandInjectionRuntime(final HttpServletRequest request) {
+        withProcess(() -> Runtime.getRuntime().exec(request.getParameter("cmd")));
+        return "Command Injection page";
+    }
+
+    @GetMapping("/cmdi/process_builder")
+    public String commandInjectionProcessBuilder(final HttpServletRequest request) {
+        withProcess(() -> new ProcessBuilder(request.getParameter("cmd")).start());
+        return "Command Injection page";
+    }
+
+    @GetMapping("/path_traversal/file")
+    public String pathTraversalFile(final HttpServletRequest request) {
+        new File(request.getParameter("path"));
+        return "Path Traversal page";
+    }
+
+    @GetMapping("/path_traversal/paths")
+    public String pathTraversalPaths(final HttpServletRequest request) {
+        Paths.get(request.getParameter("path"));
+        return "Path Traversal page";
+    }
+
+    @GetMapping("/path_traversal/path")
+    public String pathTraversalPath(final HttpServletRequest request) {
+        new File(System.getProperty("user.dir")).toPath().resolve(request.getParameter("path"));
+        return "Path Traversal page";
+    }
+
+    @GetMapping("/param_binding/test")
+    public String paramBinding(final TestBean testBean) {
+        return "Test bean -> name: " + testBean.getName() + ", value: " + testBean.getValue();
+    }
+
+    @GetMapping("/request_header/test")
+    public String requestHeader(@RequestHeader("test-header") String header) {
+        return "Header is: " + header;
+    }
+
+    @GetMapping("/path_param")
+    public String pathParam(@PathParam("param") String param) {
+        return "PathParam is: " + param;
+    }
+
+    @GetMapping("/matrix/{var1}/{var2}")
+    public String matrixAndPathVariables(
+            @PathVariable String var1,
+            @MatrixVariable(pathVar = "var1") Map<String, String> m1,
+            @PathVariable String var2,
+            @MatrixVariable(pathVar = "var2") Map<String, String> m2) {
+        return "{var1=" + var1 + ", m1=" + m1 + ", var2=" + var2 + ", m2=" + m2 + "}";
+    }
+
+    @PostMapping("/request_body/test")
+    public String jsonRequestBody(@RequestBody TestBean testBean) {
+        return "@RequestBody to Test bean -> name: " + testBean.getName() + ", value: " + testBean.getValue();
+    }
+
+    @GetMapping("/query_string")
+    public String queryString(final HttpServletRequest request) {
+        return "QueryString is: " + request.getQueryString();
+    }
+
+    @GetMapping("/cookie")
+    public String cookie(final HttpServletRequest request) {
+        final Cookie cookie = request.getCookies()[0];
+        return "Cookie is: " + cookie.getName() + "=" + cookie.getValue();
+    }
+
+    @GetMapping("/jwt")
+    public String jwt(Principal userPrincipal) {
+        return "ok User Principal name: " + userPrincipal.getName();
+    }
+
+    @GetMapping("/weak_randomness")
+    public String weak_randomness(@RequestParam("mode") final Class<?> mode) {
+        final double result;
+        if (mode == ThreadLocalRandom.class) {
+            result = ThreadLocalRandom.current().nextDouble();
+        } else if (mode == Math.class) {
+            result = Math.random();
+        } else {
+            result = random.nextDouble();
+        }
+        return "Random : " + result;
+    }
+
+    @GetMapping("/xpathi/compile")
+    public String xpathInjectionCompile(final HttpServletRequest request) throws XPathExpressionException {
+        XPathFactory.newInstance().newXPath().compile(request.getParameter("expression"));
+        return "XPath Injection page";
+    }
+
+    @GetMapping("/xpathi/evaluate")
+    public String xpathInjectionEvaluate(final HttpServletRequest request)
+            throws XPathExpressionException, ParserConfigurationException, IOException, SAXException {
+        DocumentBuilder b = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+        Document doc = b.parse(xml.getInputStream());
+        String expression = request.getParameter("expression");
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        xPath.evaluate(expression, doc.getDocumentElement(), XPathConstants.NODESET);
+        return "XPath Injection page";
+    }
+
+    @GetMapping("/trust_boundary_violation")
+    public String trustBoundaryViolation(final HttpServletRequest request) {
+        String paramValue = request.getParameter("paramValue");
+        request.getSession().setAttribute("name", paramValue);
+        return "Trust Boundary violation page";
+    }
+
+    @GetMapping("/trust_boundary_violation_for_cookie")
+    public String trustBoundaryViolationForCookie(final HttpServletRequest request)
+            throws UnsupportedEncodingException {
+
+        for (Cookie theCookie : request.getCookies()) {
+            if (theCookie.getName().equals("https%3A%2F%2Fuser-id2")) {
+                String value = java.net.URLDecoder.decode(theCookie.getValue(), "UTF-8");
+                request.getSession().putValue(value, "88888");
+            }
+        }
+        return "Trust Boundary violation with cookie page";
+    }
+
+    @GetMapping(value = "/hstsmissing", produces = "text/html")
+    public String hstsHeaderMissing(HttpServletResponse response) {
+        response.setStatus(HttpStatus.OK.value());
+        return "ok";
+    }
+
+    @GetMapping(value = "/xcontenttypeoptionsmissing", produces = "text/html")
+    public String xContentTypeOptionsMissing(HttpServletResponse response) {
+        response.addHeader("X-Content-Type-Options", "dosniff");
+        response.setStatus(HttpStatus.OK.value());
+        return "ok";
+    }
+
+    @GetMapping(value = "/insecureAuthProtocol")
+    public String insecureAuthProtocol(HttpServletRequest request) {
+        String authorization = request.getHeader("Authorization");
+        return authorization;
+    }
+
+    @PostMapping("/multipart")
+    public String handleFileUpload(@RequestParam("theFile") MultipartFile file, @RequestParam("param1") String param1) {
+        String fileContent = "NO_FILE";
+        try {
+            fileContent = Arrays.toString(file.getBytes());
+            file.getOriginalFilename();
+        } catch (IOException e) {
+        }
+        return "fileName: " + file.getName();
+    }
+
+    @PostMapping("/jakartaMailHtmlVulnerability")
+    public String jakartaMailHtmlVulnerability(HttpServletRequest request) throws jakarta.mail.MessagingException {
+        jakarta.mail.Session session = jakarta.mail.Session.getDefaultInstance(new Properties());
+        jakarta.mail.Provider provider = new jakarta.mail.Provider(
+                jakarta.mail.Provider.Type.TRANSPORT,
+                "smtp",
+                JakartaMockTransport.class.getName(),
+                "MockTransport",
+                "1.0");
+        session.setProvider(provider);
+        boolean sanitize = StringUtils.isNotEmpty(request.getParameter("sanitize"))
+                && request.getParameter("sanitize").equalsIgnoreCase("true");
+        jakarta.mail.internet.MimeMessage message = new jakarta.mail.internet.MimeMessage(session);
+        if (request.getParameter("messageText") != null) {
+            message.setText(
+                    sanitize
+                            ? StringEscapeUtils.escapeHtml4(request.getParameter("messageText"))
+                            : request.getParameter("messageText"),
+                    "utf-8",
+                    "html");
+        } else {
+            jakarta.mail.Multipart content = new jakarta.mail.internet.MimeMultipart();
+            content.addBodyPart(new jakarta.mail.internet.MimeBodyPart());
+            content.getBodyPart(0)
+                    .setContent(
+                            sanitize
+                                    ? StringEscapeUtils.escapeHtml4(request.getParameter("messageContent"))
+                                    : request.getParameter("messageContent"),
+                            "text/html");
+            message.setContent(content, "multipart/*");
+        }
+        message.setRecipients(jakarta.mail.Message.RecipientType.TO, "abc@datadoghq.com");
+        jakarta.mail.Transport.send(message);
+        return "ok";
+    }
+
+    @GetMapping(value = "/xcontenttypeoptionsecure", produces = "text/html")
+    public String xContentTypeOptionsSecure(HttpServletResponse response) {
+        response.addHeader("X-Content-Type-Options", "nosniff");
+        response.setStatus(HttpStatus.OK.value());
+        return "ok";
+    }
+
+    @GetMapping("/getrequesturi")
+    String pathInfo(HttpServletRequest request) {
+        String pathInfo = request.getRequestURI();
+        return String.format("Request.getRequestURI returns %s", pathInfo);
+    }
+
+    @GetMapping("/getrequesturl")
+    String requestURL(HttpServletRequest request) {
+        StringBuffer requestURL = request.getRequestURL();
+        return String.format("Request.getRequestURL returns %s", requestURL);
+    }
+
+    @PostMapping("/gson_deserialization")
+    String gson(@RequestParam("json") String json) {
+        Gson gson = new Gson();
+        TestBean testBean = gson.fromJson(json, TestBean.class);
+        return "Test bean -> name: " + testBean.getName() + ", value: " + testBean.getValue();
+    }
+
+    @PostMapping(value = "/gson_json_parser_deserialization", consumes = MediaType.TEXT_PLAIN_VALUE)
+    String gsonJsonParser(@RequestBody String json) {
+        JsonParser.parseReader(new StringReader(json));
+        return "Ok";
+    }
+
+    @GetMapping("/header_injection")
+    public String headerInjection(@RequestParam("param") String param, HttpServletResponse response) {
+        response.addHeader("X-Test-Header", param);
+        return "Ok";
+    }
+
+    @GetMapping("/header_injection_exclusion")
+    public String headerInjectionExclusion(@RequestParam("param") String param, HttpServletResponse response) {
+        response.addHeader("Sec-WebSocket-Location", param);
+        return "Ok";
+    }
+
+    @GetMapping("/header_injection_redaction")
+    public String headerInjectionRedaction(@RequestParam("param") String param, HttpServletResponse response) {
+        response.addHeader("X-Test-Header", param);
+        return "Ok";
+    }
+
+    @PostMapping("/untrusted_deserialization")
+    public String untrustedDeserialization(HttpServletRequest request) throws IOException {
+        final ObjectInputStream ois = new ObjectInputStream(request.getInputStream());
+        ois.close();
+        return "OK";
+    }
+
+    @PostMapping("/untrusted_deserialization/multipart")
+    public String untrustedDeserializationMultipart(@RequestParam("file") MultipartFile file) throws IOException {
+        final ObjectInputStream ois = new ObjectInputStream(file.getInputStream());
+        ois.close();
+        return "OK";
+    }
+
+    @PostMapping("/untrusted_deserialization/part")
+    public String untrustedDeserializationParts(HttpServletRequest request) throws IOException, ServletException {
+        List<Part> parts = (List<Part>) request.getParts();
+        final ObjectInputStream ois = new ObjectInputStream(parts.get(0).getInputStream());
+        ois.close();
+        return "OK";
+    }
+
+    @GetMapping("/untrusted_deserialization/snakeyaml")
+    public String untrustedDeserializationSnakeYaml(@RequestParam("yaml") String param) {
+        new Yaml().load(param);
+        return "OK";
+    }
+
+    @GetMapping("/test_custom_string_reader")
+    public String testCustomStringReader(@RequestParam("param") String param) throws IOException {
+        return String.join("", IOUtils.readLines(new CustomStringReader(param)));
+    }
+
+    private void withProcess(final Operation<Process> op) {
+        Process process = null;
+        try {
+            process = op.run();
+        } catch (final Throwable e) {
+            // ignore it
+        } finally {
+            if (process != null && process.isAlive()) {
+                process.destroyForcibly();
+            }
+        }
+    }
+
+    private interface Operation<E> {
+        E run() throws Throwable;
+    }
+
+    public static class CustomStringReader extends StringReader {
+
+        public CustomStringReader(String s) {
+            super("Super "
+                    + s
+                    + (new StringReader("New_1" + new StringReader("New_2" + new StringReader("New_3" + s)))));
+        }
+    }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/ReflectionController.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/ReflectionController.java
index 8804eabadec..3a5e2739b98 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/ReflectionController.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/ReflectionController.java
@@ -12,49 +12,49 @@
 @RestController
 public class ReflectionController {
 
-  private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
+    private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
 
-  @GetMapping("/reflection_injection/class")
-  public String reflectionInjectionClass(final HttpServletRequest request) {
-    String className = request.getParameter("param");
-    try {
-      Class<?> clazz = Class.forName(className);
-      return "Class: " + clazz.getName();
-    } catch (ClassNotFoundException e) {
-      return "ClassNotFoundException";
+    @GetMapping("/reflection_injection/class")
+    public String reflectionInjectionClass(final HttpServletRequest request) {
+        String className = request.getParameter("param");
+        try {
+            Class<?> clazz = Class.forName(className);
+            return "Class: " + clazz.getName();
+        } catch (ClassNotFoundException e) {
+            return "ClassNotFoundException";
+        }
     }
-  }
 
-  @GetMapping("/reflection_injection/method")
-  public String reflectionInjectionMethod(final HttpServletRequest request) {
-    String methodName = request.getParameter("param");
-    try {
-      Method method = String.class.getMethod(methodName);
-      return "String Method: " + method.getName();
-    } catch (NoSuchMethodException e) {
-      return "NoSuchMethodException";
+    @GetMapping("/reflection_injection/method")
+    public String reflectionInjectionMethod(final HttpServletRequest request) {
+        String methodName = request.getParameter("param");
+        try {
+            Method method = String.class.getMethod(methodName);
+            return "String Method: " + method.getName();
+        } catch (NoSuchMethodException e) {
+            return "NoSuchMethodException";
+        }
     }
-  }
 
-  @GetMapping("/reflection_injection/field")
-  public String reflectionInjectionField(final HttpServletRequest request) {
-    String fieldName = request.getParameter("param");
-    try {
-      Field field = String.class.getField(fieldName);
-      return "String Method: " + field.getName();
-    } catch (NoSuchFieldException e) {
-      return "NoSuchFieldException";
+    @GetMapping("/reflection_injection/field")
+    public String reflectionInjectionField(final HttpServletRequest request) {
+        String fieldName = request.getParameter("param");
+        try {
+            Field field = String.class.getField(fieldName);
+            return "String Method: " + field.getName();
+        } catch (NoSuchFieldException e) {
+            return "NoSuchFieldException";
+        }
     }
-  }
 
-  @GetMapping("/reflection_injection/lookup")
-  public String reflectionInjectionLookup(final HttpServletRequest request) {
-    String param = request.getParameter("param");
-    try {
-      LOOKUP.findGetter(String.class, param, byte[].class);
-      return "Lookup: " + param;
-    } catch (Exception e) {
-      return e.getMessage();
+    @GetMapping("/reflection_injection/lookup")
+    public String reflectionInjectionLookup(final HttpServletRequest request) {
+        String param = request.getParameter("param");
+        try {
+            LOOKUP.findGetter(String.class, param, byte[].class);
+            return "Lookup: " + param;
+        } catch (Exception e) {
+            return e.getMessage();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/SimpleIastController.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/SimpleIastController.java
index fee5a93c926..877e6a552ed 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/SimpleIastController.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/SimpleIastController.java
@@ -9,16 +9,16 @@
 import org.springframework.web.servlet.mvc.AbstractController;
 
 public class SimpleIastController extends AbstractController {
-  @Override
-  protected ModelAndView handleRequestInternal(
-      HttpServletRequest request, HttpServletResponse response) throws Exception {
-    Map<String, String> vars =
-        (Map<String, String>) request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
-    PrintWriter printWriter = response.getWriter();
-    response.setHeader("Content-type", "text/plain");
-    printWriter.write("Template variables:");
-    printWriter.write(vars.toString());
-    printWriter.write('\n');
-    return null;
-  }
+    @Override
+    protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response)
+            throws Exception {
+        Map<String, String> vars =
+                (Map<String, String>) request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
+        PrintWriter printWriter = response.getWriter();
+        response.setHeader("Content-type", "text/plain");
+        printWriter.write("Template variables:");
+        printWriter.write(vars.toString());
+        printWriter.write('\n');
+        return null;
+    }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/SsrfController.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/SsrfController.java
index 4b180706aa1..dc6b411a8e4 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/SsrfController.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/SsrfController.java
@@ -27,147 +27,145 @@
 @RequestMapping("/ssrf")
 public class SsrfController {
 
-  @PostMapping
-  public String ssrf(
-      @RequestParam(value = "url", required = false) final String url,
-      @RequestParam(value = "host", required = false) final String host) {
-    try {
-      final URL target = url != null ? new URL(url) : new URL("https", host, 443, "/test");
-      final HttpURLConnection conn = (HttpURLConnection) target.openConnection();
-      conn.disconnect();
-    } catch (final Exception e) {
+    @PostMapping
+    public String ssrf(
+            @RequestParam(value = "url", required = false) final String url,
+            @RequestParam(value = "host", required = false) final String host) {
+        try {
+            final URL target = url != null ? new URL(url) : new URL("https", host, 443, "/test");
+            final HttpURLConnection conn = (HttpURLConnection) target.openConnection();
+            conn.disconnect();
+        } catch (final Exception e) {
+        }
+        return "ok";
     }
-    return "ok";
-  }
 
-  @PostMapping("/uri")
-  public String uri(
-      @RequestParam(value = "url", required = false) final String url,
-      @RequestParam(value = "host", required = false) final String host) {
-    try {
-      final URI uri =
-          url != null ? new URI(url) : new URI("https", null, host, 443, "/test", null, null);
-      final URL target = uri.toURL();
-      final HttpURLConnection conn = (HttpURLConnection) target.openConnection();
-      conn.disconnect();
-    } catch (final Exception e) {
+    @PostMapping("/uri")
+    public String uri(
+            @RequestParam(value = "url", required = false) final String url,
+            @RequestParam(value = "host", required = false) final String host) {
+        try {
+            final URI uri = url != null ? new URI(url) : new URI("https", null, host, 443, "/test", null, null);
+            final URL target = uri.toURL();
+            final HttpURLConnection conn = (HttpURLConnection) target.openConnection();
+            conn.disconnect();
+        } catch (final Exception e) {
+        }
+        return "ok";
     }
-    return "ok";
-  }
 
-  @PostMapping("/apache-httpclient4")
-  public String apacheHttpClient4(
-      @RequestParam(value = "url", required = false) final String url,
-      @RequestParam(value = "host", required = false) final String host) {
-    final DefaultHttpClient client = new DefaultHttpClient();
-    try {
-      if (host != null) {
-        final HttpHost httpHost = new HttpHost(host);
-        final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
-        client.execute(httpHost, request);
-      } else if (url != null) {
-        final HttpGet request = new HttpGet(url);
-        client.execute(request);
-      }
-    } catch (Exception e) {
+    @PostMapping("/apache-httpclient4")
+    public String apacheHttpClient4(
+            @RequestParam(value = "url", required = false) final String url,
+            @RequestParam(value = "host", required = false) final String host) {
+        final DefaultHttpClient client = new DefaultHttpClient();
+        try {
+            if (host != null) {
+                final HttpHost httpHost = new HttpHost(host);
+                final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+                client.execute(httpHost, request);
+            } else if (url != null) {
+                final HttpGet request = new HttpGet(url);
+                client.execute(request);
+            }
+        } catch (Exception e) {
+        }
+        client.getConnectionManager().shutdown();
+        return "ok";
     }
-    client.getConnectionManager().shutdown();
-    return "ok";
-  }
 
-  @PostMapping("/commons-httpclient2")
-  public String commonsHttpClient2(@RequestParam(value = "url") final String url) {
-    final HttpClient client = new HttpClient();
-    final HttpMethod method = new GetMethod(url);
-    try {
-      client.executeMethod(method);
-    } catch (final Exception e) {
+    @PostMapping("/commons-httpclient2")
+    public String commonsHttpClient2(@RequestParam(value = "url") final String url) {
+        final HttpClient client = new HttpClient();
+        final HttpMethod method = new GetMethod(url);
+        try {
+            client.executeMethod(method);
+        } catch (final Exception e) {
+        }
+        method.releaseConnection();
+        return "ok";
     }
-    method.releaseConnection();
-    return "ok";
-  }
 
-  @PostMapping("/okHttp2")
-  public String okHttp2(@RequestParam(value = "url") final String url) {
-    final OkHttpClient client = new OkHttpClient();
-    final Request request = new Request.Builder().url(url).build();
-    try {
-      client.newCall(request).execute();
-    } catch (final Exception e) {
+    @PostMapping("/okHttp2")
+    public String okHttp2(@RequestParam(value = "url") final String url) {
+        final OkHttpClient client = new OkHttpClient();
+        final Request request = new Request.Builder().url(url).build();
+        try {
+            client.newCall(request).execute();
+        } catch (final Exception e) {
+        }
+        client.getDispatcher().getExecutorService().shutdown();
+        com.squareup.okhttp.ConnectionPool pool = client.getConnectionPool();
+        if (pool != null) {
+            pool.evictAll();
+        }
+        return "ok";
     }
-    client.getDispatcher().getExecutorService().shutdown();
-    com.squareup.okhttp.ConnectionPool pool = client.getConnectionPool();
-    if (pool != null) {
-      pool.evictAll();
-    }
-    return "ok";
-  }
 
-  @PostMapping("/okHttp3")
-  public String okHttp3(@RequestParam(value = "url") final String url) {
-    final okhttp3.OkHttpClient client = new okhttp3.OkHttpClient();
-    final okhttp3.Request request = new okhttp3.Request.Builder().url(url).build();
-    try (final okhttp3.Response response = client.newCall(request).execute()) {
-    } catch (final Exception e) {
+    @PostMapping("/okHttp3")
+    public String okHttp3(@RequestParam(value = "url") final String url) {
+        final okhttp3.OkHttpClient client = new okhttp3.OkHttpClient();
+        final okhttp3.Request request = new okhttp3.Request.Builder().url(url).build();
+        try (final okhttp3.Response response = client.newCall(request).execute()) {
+        } catch (final Exception e) {
+        }
+        client.dispatcher().executorService().shutdown();
+        client.connectionPool().evictAll();
+        return "ok";
     }
-    client.dispatcher().executorService().shutdown();
-    client.connectionPool().evictAll();
-    return "ok";
-  }
 
-  @PostMapping("/apache-httpclient5")
-  public String apacheHttpClient5(
-      @RequestParam(value = "url", required = false) final String url,
-      @RequestParam(value = "urlHandler", required = false) final String urlHandler,
-      @RequestParam(value = "host", required = false) final String host) {
-    CloseableHttpClient client = HttpClients.createDefault();
-    try {
-      if (host != null) {
-        final org.apache.hc.core5.http.HttpHost httpHost =
-            new org.apache.hc.core5.http.HttpHost(host);
-        final org.apache.hc.client5.http.classic.methods.HttpGet request =
-            new org.apache.hc.client5.http.classic.methods.HttpGet("/");
-        client.execute(httpHost, request);
-      } else if (url != null) {
-        final org.apache.hc.client5.http.classic.methods.HttpGet request =
-            new org.apache.hc.client5.http.classic.methods.HttpGet(url);
-        client.execute(request);
-      } else if (urlHandler != null) {
-        final org.apache.hc.client5.http.classic.methods.HttpGet request =
-            new org.apache.hc.client5.http.classic.methods.HttpGet(urlHandler);
-        client.execute(request, response -> null);
-      }
-      client.close();
-    } catch (Exception e) {
+    @PostMapping("/apache-httpclient5")
+    public String apacheHttpClient5(
+            @RequestParam(value = "url", required = false) final String url,
+            @RequestParam(value = "urlHandler", required = false) final String urlHandler,
+            @RequestParam(value = "host", required = false) final String host) {
+        CloseableHttpClient client = HttpClients.createDefault();
+        try {
+            if (host != null) {
+                final org.apache.hc.core5.http.HttpHost httpHost = new org.apache.hc.core5.http.HttpHost(host);
+                final org.apache.hc.client5.http.classic.methods.HttpGet request =
+                        new org.apache.hc.client5.http.classic.methods.HttpGet("/");
+                client.execute(httpHost, request);
+            } else if (url != null) {
+                final org.apache.hc.client5.http.classic.methods.HttpGet request =
+                        new org.apache.hc.client5.http.classic.methods.HttpGet(url);
+                client.execute(request);
+            } else if (urlHandler != null) {
+                final org.apache.hc.client5.http.classic.methods.HttpGet request =
+                        new org.apache.hc.client5.http.classic.methods.HttpGet(urlHandler);
+                client.execute(request, response -> null);
+            }
+            client.close();
+        } catch (Exception e) {
+        }
+        return "ok";
     }
-    return "ok";
-  }
 
-  @PostMapping("/apache-httpasyncclient")
-  public String apacheHttpAsyncClient(
-      @RequestParam(value = "url", required = false) final String url,
-      @RequestParam(value = "host", required = false) final String host,
-      @RequestParam(value = "urlProducer", required = false) final String urlProducer) {
-    final CloseableHttpAsyncClient client = HttpAsyncClients.createDefault();
-    client.start();
-    try {
-      if (host != null) {
-        final HttpHost httpHost = new HttpHost(host);
-        client.execute(httpHost, new HttpGet("/"), null);
-      } else if (url != null) {
-        final HttpGet request = new HttpGet(url);
-        client.execute(request, null);
-      } else if (urlProducer != null) {
-        final HttpAsyncRequestProducer producer = HttpAsyncMethods.create(new HttpGet(urlProducer));
-        client.execute(producer, null, null);
-      }
-    } catch (Exception e) {
-    } finally {
-      try {
-        client.close();
-      } catch (Exception e) {
-      }
+    @PostMapping("/apache-httpasyncclient")
+    public String apacheHttpAsyncClient(
+            @RequestParam(value = "url", required = false) final String url,
+            @RequestParam(value = "host", required = false) final String host,
+            @RequestParam(value = "urlProducer", required = false) final String urlProducer) {
+        final CloseableHttpAsyncClient client = HttpAsyncClients.createDefault();
+        client.start();
+        try {
+            if (host != null) {
+                final HttpHost httpHost = new HttpHost(host);
+                client.execute(httpHost, new HttpGet("/"), null);
+            } else if (url != null) {
+                final HttpGet request = new HttpGet(url);
+                client.execute(request, null);
+            } else if (urlProducer != null) {
+                final HttpAsyncRequestProducer producer = HttpAsyncMethods.create(new HttpGet(urlProducer));
+                client.execute(producer, null, null);
+            }
+        } catch (Exception e) {
+        } finally {
+            try {
+                client.close();
+            } catch (Exception e) {
+            }
+        }
+        return "ok";
     }
-    return "ok";
-  }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/XssController.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/XssController.java
index 7889a3c81a9..332acddbf4f 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/XssController.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/XssController.java
@@ -16,207 +16,207 @@
 @RequestMapping("/xss")
 public class XssController {
 
-  @GetMapping("/write")
-  public void write(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      response.getWriter().write(request.getParameter("string"));
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/write2")
-  public void write2(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      response.getWriter().write(request.getParameter("string").toCharArray());
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/write3")
-  public void write3(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      String insecure = request.getParameter("string");
-      response.getWriter().write(insecure, 0, insecure.length());
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/write4")
-  public void write4(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      char[] buf = request.getParameter("string").toCharArray();
-      response.getWriter().write(buf, 0, buf.length);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/print")
-  public void print(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      response.getWriter().print(request.getParameter("string"));
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/print2")
-  public void print2(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      response.getWriter().print(request.getParameter("string").toCharArray());
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/println")
-  public void println(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      response.getWriter().println(request.getParameter("string"));
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/println2")
-  public void println2(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      response.getWriter().println(request.getParameter("string").toCharArray());
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/printf")
-  public void printf(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      String format = request.getParameter("string");
-      response.getWriter().printf(format, "A", "B");
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/printf2")
-  public void printf2(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      String format = "Formatted like: %1$s and %2$s.";
-      response.getWriter().printf(format, "A", request.getParameter("string"));
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/printf3")
-  public void printf3(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      String format = request.getParameter("string");
-      response.getWriter().printf(Locale.getDefault(), format, "A", "B");
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/printf4")
-  public void printf4(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      String format = "Formatted like: %1$s and %2$s.";
-      response.getWriter().printf(Locale.getDefault(), format, "A", request.getParameter("string"));
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/format")
-  public void format(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      String format = request.getParameter("string");
-      response.getWriter().format(format, "A", "B");
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/format2")
-  public void format2(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      String format = "Formatted like: %1$s and %2$s.";
-      response.getWriter().format(format, "A", request.getParameter("string"));
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/format3")
-  public void format3(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      String format = request.getParameter("string");
-      response.getWriter().format(Locale.getDefault(), format, "A", "B");
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/format4")
-  public void format4(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      String format = "Formatted like: %1$s and %2$s.";
-      response.getWriter().format(Locale.getDefault(), format, "A", request.getParameter("string"));
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping(value = "/responseBody", produces = MediaType.APPLICATION_JSON_VALUE)
-  @ResponseBody
-  public String responseBody(final HttpServletRequest request, final HttpServletResponse response) {
-    return request.getParameter("string");
-  }
-
-  @GetMapping("/sanitize")
-  public void sanitize(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      response.getWriter().write(Sanitizer.sanitize(request.getParameter("string")));
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/validateAll")
-  public void validateAll(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      String s = request.getParameter("string");
-      InputValidator.validateAll(s);
-      response.getWriter().write(s);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/validateAll2")
-  public void validate2(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      String string1 = request.getParameter("string");
-      String string2 = request.getParameter("string2");
-      InputValidator.validateAll(string1, string2);
-      response.getWriter().write(string1 + string2);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @GetMapping("/validate")
-  public void validate(final HttpServletRequest request, final HttpServletResponse response) {
-    try {
-      String string1 = request.getParameter("string");
-      String string2 = request.getParameter("string2");
-      InputValidator.validate(null, string1, string2);
-      response.getWriter().write(string1 + string2);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
+    @GetMapping("/write")
+    public void write(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            response.getWriter().write(request.getParameter("string"));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/write2")
+    public void write2(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            response.getWriter().write(request.getParameter("string").toCharArray());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/write3")
+    public void write3(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            String insecure = request.getParameter("string");
+            response.getWriter().write(insecure, 0, insecure.length());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/write4")
+    public void write4(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            char[] buf = request.getParameter("string").toCharArray();
+            response.getWriter().write(buf, 0, buf.length);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/print")
+    public void print(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            response.getWriter().print(request.getParameter("string"));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/print2")
+    public void print2(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            response.getWriter().print(request.getParameter("string").toCharArray());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/println")
+    public void println(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            response.getWriter().println(request.getParameter("string"));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/println2")
+    public void println2(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            response.getWriter().println(request.getParameter("string").toCharArray());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/printf")
+    public void printf(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            String format = request.getParameter("string");
+            response.getWriter().printf(format, "A", "B");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/printf2")
+    public void printf2(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            String format = "Formatted like: %1$s and %2$s.";
+            response.getWriter().printf(format, "A", request.getParameter("string"));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/printf3")
+    public void printf3(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            String format = request.getParameter("string");
+            response.getWriter().printf(Locale.getDefault(), format, "A", "B");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/printf4")
+    public void printf4(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            String format = "Formatted like: %1$s and %2$s.";
+            response.getWriter().printf(Locale.getDefault(), format, "A", request.getParameter("string"));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/format")
+    public void format(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            String format = request.getParameter("string");
+            response.getWriter().format(format, "A", "B");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/format2")
+    public void format2(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            String format = "Formatted like: %1$s and %2$s.";
+            response.getWriter().format(format, "A", request.getParameter("string"));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/format3")
+    public void format3(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            String format = request.getParameter("string");
+            response.getWriter().format(Locale.getDefault(), format, "A", "B");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/format4")
+    public void format4(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            String format = "Formatted like: %1$s and %2$s.";
+            response.getWriter().format(Locale.getDefault(), format, "A", request.getParameter("string"));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping(value = "/responseBody", produces = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public String responseBody(final HttpServletRequest request, final HttpServletResponse response) {
+        return request.getParameter("string");
+    }
+
+    @GetMapping("/sanitize")
+    public void sanitize(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            response.getWriter().write(Sanitizer.sanitize(request.getParameter("string")));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/validateAll")
+    public void validateAll(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            String s = request.getParameter("string");
+            InputValidator.validateAll(s);
+            response.getWriter().write(s);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/validateAll2")
+    public void validate2(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            String string1 = request.getParameter("string");
+            String string2 = request.getParameter("string2");
+            InputValidator.validateAll(string1, string2);
+            response.getWriter().write(string1 + string2);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/validate")
+    public void validate(final HttpServletRequest request, final HttpServletResponse response) {
+        try {
+            String string1 = request.getParameter("string");
+            String string2 = request.getParameter("string2");
+            InputValidator.validate(null, string1, string2);
+            response.getWriter().write(string1 + string2);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/mock/JakartaMockTransport.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/mock/JakartaMockTransport.java
index 405ae95199b..189e1a52704 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/mock/JakartaMockTransport.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/mock/JakartaMockTransport.java
@@ -9,34 +9,33 @@
 import java.util.Properties;
 
 public class JakartaMockTransport extends Transport {
-  public JakartaMockTransport(Session session, URLName urlname) {
-    super(session, urlname);
-  }
+    public JakartaMockTransport(Session session, URLName urlname) {
+        super(session, urlname);
+    }
 
-  public JakartaMockTransport() {
-    this(Session.getInstance(new Properties()), null);
-  }
+    public JakartaMockTransport() {
+        this(Session.getInstance(new Properties()), null);
+    }
 
-  public JakartaMockTransport(Session session) {
-    this(session, null);
-  }
+    public JakartaMockTransport(Session session) {
+        this(session, null);
+    }
 
-  public static Transport newInstance(Session session) {
-    return new JakartaMockTransport(session, null);
-  }
+    public static Transport newInstance(Session session) {
+        return new JakartaMockTransport(session, null);
+    }
 
-  public void sendMessage(Message msg, Address[] addresses) throws MessagingException {
-    for (Address a : addresses) {
-      this.notifyTransportListeners(1, addresses, new Address[0], new Address[0], msg);
+    public void sendMessage(Message msg, Address[] addresses) throws MessagingException {
+        for (Address a : addresses) {
+            this.notifyTransportListeners(1, addresses, new Address[0], new Address[0], msg);
+        }
     }
-  }
 
-  @Override
-  public void connect() {
-    this.setConnected(true);
-    this.notifyConnectionListeners(1);
-  }
+    @Override
+    public void connect() {
+        this.setConnected(true);
+        this.notifyConnectionListeners(1);
+    }
 
-  public synchronized void connect(String host, int port, String user, String password)
-      throws MessagingException {}
+    public synchronized void connect(String host, int port, String user, String password) throws MessagingException {}
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/servlet/MultipartGetItemIteratorServlet.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/servlet/MultipartGetItemIteratorServlet.java
index 379b3e52527..4c9d08733ae 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/servlet/MultipartGetItemIteratorServlet.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/servlet/MultipartGetItemIteratorServlet.java
@@ -13,18 +13,19 @@
 
 public class MultipartGetItemIteratorServlet extends HttpServlet {
 
-  @Override
-  public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
-    final FileItemFactory fileItemFactory = new DiskFileItemFactory();
-    final ServletFileUpload servletFileUpload = new ServletFileUpload(fileItemFactory);
-    try {
-      final FileItemIterator fileItemIterator = servletFileUpload.getItemIterator(request);
-      final ObjectInputStream ois = new ObjectInputStream(fileItemIterator.next().openStream());
-      ois.close();
-      response.setHeader("Content-Type", "text/plain");
-      response.getWriter().write("OK");
-    } catch (FileUploadException e) {
-      throw new IOException(e);
+    @Override
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        final FileItemFactory fileItemFactory = new DiskFileItemFactory();
+        final ServletFileUpload servletFileUpload = new ServletFileUpload(fileItemFactory);
+        try {
+            final FileItemIterator fileItemIterator = servletFileUpload.getItemIterator(request);
+            final ObjectInputStream ois =
+                    new ObjectInputStream(fileItemIterator.next().openStream());
+            ois.close();
+            response.setHeader("Content-Type", "text/plain");
+            response.getWriter().write("OK");
+        } catch (FileUploadException e) {
+            throw new IOException(e);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/servlet/MultipartParseParameterMapServlet.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/servlet/MultipartParseParameterMapServlet.java
index 393fdb7d26a..ced5b02f302 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/servlet/MultipartParseParameterMapServlet.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/servlet/MultipartParseParameterMapServlet.java
@@ -15,20 +15,21 @@
 
 public class MultipartParseParameterMapServlet extends HttpServlet {
 
-  @Override
-  public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
-    final FileItemFactory fileItemFactory = new DiskFileItemFactory();
-    final ServletFileUpload servletFileUpload = new ServletFileUpload(fileItemFactory);
-    try {
-      final Map<String, List<FileItem>> fileItemList = servletFileUpload.parseParameterMap(request);
-      for (final List<FileItem> fileItem : fileItemList.values()) {
-        final ObjectInputStream ois = new ObjectInputStream(fileItem.get(0).getInputStream());
-        ois.close();
-      }
-      response.setHeader("Content-Type", "text/plain");
-      response.getWriter().write("OK");
-    } catch (FileUploadException e) {
-      throw new IOException(e);
+    @Override
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        final FileItemFactory fileItemFactory = new DiskFileItemFactory();
+        final ServletFileUpload servletFileUpload = new ServletFileUpload(fileItemFactory);
+        try {
+            final Map<String, List<FileItem>> fileItemList = servletFileUpload.parseParameterMap(request);
+            for (final List<FileItem> fileItem : fileItemList.values()) {
+                final ObjectInputStream ois =
+                        new ObjectInputStream(fileItem.get(0).getInputStream());
+                ois.close();
+            }
+            response.setHeader("Content-Type", "text/plain");
+            response.getWriter().write("OK");
+        } catch (FileUploadException e) {
+            throw new IOException(e);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/servlet/MultipartParseRequestServlet.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/servlet/MultipartParseRequestServlet.java
index 9dc7f825515..5f913bd6fde 100644
--- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/servlet/MultipartParseRequestServlet.java
+++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/servlet/MultipartParseRequestServlet.java
@@ -14,18 +14,19 @@
 
 public class MultipartParseRequestServlet extends HttpServlet {
 
-  @Override
-  public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
-    final FileItemFactory fileItemFactory = new DiskFileItemFactory();
-    final ServletFileUpload servletFileUpload = new ServletFileUpload(fileItemFactory);
-    try {
-      final List<FileItem> fileItemIterator = servletFileUpload.parseRequest(request);
-      final ObjectInputStream ois = new ObjectInputStream(fileItemIterator.get(0).getInputStream());
-      ois.close();
-      response.setHeader("Content-Type", "text/plain");
-      response.getWriter().write("OK");
-    } catch (FileUploadException e) {
-      throw new IOException(e);
+    @Override
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        final FileItemFactory fileItemFactory = new DiskFileItemFactory();
+        final ServletFileUpload servletFileUpload = new ServletFileUpload(fileItemFactory);
+        try {
+            final List<FileItem> fileItemIterator = servletFileUpload.parseRequest(request);
+            final ObjectInputStream ois =
+                    new ObjectInputStream(fileItemIterator.get(0).getInputStream());
+            ois.close();
+            response.setHeader("Content-Type", "text/plain");
+            response.getWriter().write("OK");
+        } catch (FileUploadException e) {
+            throw new IOException(e);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/ddtest/client/sources/Hasher.java b/dd-smoke-tests/iast-util/src/main/java/ddtest/client/sources/Hasher.java
index f5f73ece562..32467408ca3 100644
--- a/dd-smoke-tests/iast-util/src/main/java/ddtest/client/sources/Hasher.java
+++ b/dd-smoke-tests/iast-util/src/main/java/ddtest/client/sources/Hasher.java
@@ -7,43 +7,43 @@
 import javax.crypto.SecretKey;
 
 public class Hasher {
-  public MessageDigest sha1() {
-    try {
-      return MessageDigest.getInstance("SHA1");
-    } catch (NoSuchAlgorithmException e) {
-      throw new RuntimeException(e);
+    public MessageDigest sha1() {
+        try {
+            return MessageDigest.getInstance("SHA1");
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  public MessageDigest md4() {
-    try {
-      return MessageDigest.getInstance("MD4");
-    } catch (NoSuchAlgorithmException e) {
-      throw new RuntimeException(e);
+    public MessageDigest md4() {
+        try {
+            return MessageDigest.getInstance("MD4");
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  public MessageDigest md5() {
-    try {
-      return MessageDigest.getInstance("MD5");
-    } catch (NoSuchAlgorithmException e) {
-      throw new RuntimeException(e);
+    public MessageDigest md5() {
+        try {
+            return MessageDigest.getInstance("MD5");
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  public SecretKey generateKey() {
-    try {
-      return KeyGenerator.getInstance("DES").generateKey();
-    } catch (NoSuchAlgorithmException e) {
-      throw new RuntimeException(e);
+    public SecretKey generateKey() {
+        try {
+            return KeyGenerator.getInstance("DES").generateKey();
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  public SecretKey generateKeyWithProvider() {
-    try {
-      return KeyGenerator.getInstance("DES", "SUN").generateKey();
-    } catch (NoSuchAlgorithmException | NoSuchProviderException e) {
-      throw new RuntimeException(e);
+    public SecretKey generateKeyWithProvider() {
+        try {
+            return KeyGenerator.getInstance("DES", "SUN").generateKey();
+        } catch (NoSuchAlgorithmException | NoSuchProviderException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/ddtest/securitycontrols/InputValidator.java b/dd-smoke-tests/iast-util/src/main/java/ddtest/securitycontrols/InputValidator.java
index 2786b00be9c..38380fb770b 100644
--- a/dd-smoke-tests/iast-util/src/main/java/ddtest/securitycontrols/InputValidator.java
+++ b/dd-smoke-tests/iast-util/src/main/java/ddtest/securitycontrols/InputValidator.java
@@ -2,19 +2,19 @@
 
 public class InputValidator {
 
-  public static boolean validateAll(String input) {
-    return true; // dummy implementation
-  }
+    public static boolean validateAll(String input) {
+        return true; // dummy implementation
+    }
 
-  public static boolean validateAll(String input, String input2) {
-    return true; // dummy implementation
-  }
+    public static boolean validateAll(String input, String input2) {
+        return true; // dummy implementation
+    }
 
-  public static boolean validate(String input) {
-    return true; // dummy implementation
-  }
+    public static boolean validate(String input) {
+        return true; // dummy implementation
+    }
 
-  public static boolean validate(Object o, String input, String input2) {
-    return true; // dummy implementation
-  }
+    public static boolean validate(Object o, String input, String input2) {
+        return true; // dummy implementation
+    }
 }
diff --git a/dd-smoke-tests/iast-util/src/main/java/ddtest/securitycontrols/Sanitizer.java b/dd-smoke-tests/iast-util/src/main/java/ddtest/securitycontrols/Sanitizer.java
index 3fc4dcf9937..b7133782d3d 100644
--- a/dd-smoke-tests/iast-util/src/main/java/ddtest/securitycontrols/Sanitizer.java
+++ b/dd-smoke-tests/iast-util/src/main/java/ddtest/securitycontrols/Sanitizer.java
@@ -2,7 +2,7 @@
 
 public class Sanitizer {
 
-  public static String sanitize(String input) {
-    return "Sanitized: " + input;
-  }
+    public static String sanitize(String input) {
+        return "Sanitized: " + input;
+    }
 }
diff --git a/dd-smoke-tests/java9-modules/src/main/java11/datadog/smoketest/moduleapp/ModuleApplication.java b/dd-smoke-tests/java9-modules/src/main/java11/datadog/smoketest/moduleapp/ModuleApplication.java
index b7e484b2d7b..c5dc9794d67 100644
--- a/dd-smoke-tests/java9-modules/src/main/java11/datadog/smoketest/moduleapp/ModuleApplication.java
+++ b/dd-smoke-tests/java9-modules/src/main/java11/datadog/smoketest/moduleapp/ModuleApplication.java
@@ -1,7 +1,7 @@
 package datadog.smoketest.moduleapp;
 
 public class ModuleApplication {
-  public static void main(final String[] args) throws InterruptedException {
-    Thread.sleep(600);
-  }
+    public static void main(final String[] args) throws InterruptedException {
+        Thread.sleep(600);
+    }
 }
diff --git a/dd-smoke-tests/java9-modules/src/main/java11/module-info.java b/dd-smoke-tests/java9-modules/src/main/java11/module-info.java
index e2316b9bcc3..d26abb2d602 100644
--- a/dd-smoke-tests/java9-modules/src/main/java11/module-info.java
+++ b/dd-smoke-tests/java9-modules/src/main/java11/module-info.java
@@ -1,3 +1,3 @@
 module datadog.smoketest.moduleapp {
-  exports datadog.smoketest.moduleapp;
+    exports datadog.smoketest.moduleapp;
 }
diff --git a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/app/Main.java b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/app/Main.java
index 8560a5ce962..2228a2e71b6 100644
--- a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/app/Main.java
+++ b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/app/Main.java
@@ -6,24 +6,30 @@
 import org.jboss.modules.Module;
 
 public class Main {
-  public static void main(final String[] args) throws Exception {
-    ClientSupport client =
-        Module.getCallerModule().loadService(ClientSupport.class).iterator().next();
-    PublisherSupport publisher =
-        Module.getCallerModule().loadService(PublisherSupport.class).iterator().next();
-    SubscriberSupport subscriber =
-        Module.getCallerModule().loadService(SubscriberSupport.class).iterator().next();
+    public static void main(final String[] args) throws Exception {
+        ClientSupport client = Module.getCallerModule()
+                .loadService(ClientSupport.class)
+                .iterator()
+                .next();
+        PublisherSupport publisher = Module.getCallerModule()
+                .loadService(PublisherSupport.class)
+                .iterator()
+                .next();
+        SubscriberSupport subscriber = Module.getCallerModule()
+                .loadService(SubscriberSupport.class)
+                .iterator()
+                .next();
 
-    publisher.subscribe(subscriber);
+        publisher.subscribe(subscriber);
 
-    client.start();
-    publisher.start();
-    subscriber.start();
+        client.start();
+        publisher.start();
+        subscriber.start();
 
-    publisher.publish("Hello, world!");
+        publisher.publish("Hello, world!");
 
-    publisher.stop();
-    subscriber.stop();
-    client.stop();
-  }
+        publisher.stop();
+        subscriber.stop();
+        client.stop();
+    }
 }
diff --git a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/client/MessageClient.java b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/client/MessageClient.java
index 4f97d98236d..5daf4cd99b9 100644
--- a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/client/MessageClient.java
+++ b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/client/MessageClient.java
@@ -14,84 +14,77 @@
 import org.apache.http.protocol.HttpContext;
 
 public class MessageClient extends ClientSupport {
-  private CloseableHttpClient delegate;
+    private CloseableHttpClient delegate;
 
-  @Override
-  protected void doStart() {
-    delegate = HttpClients.custom().build();
-  }
+    @Override
+    protected void doStart() {
+        delegate = HttpClients.custom().build();
+    }
 
-  @Override
-  protected void doStop() throws IOException {
-    delegate.close();
-    delegate = null;
-  }
+    @Override
+    protected void doStop() throws IOException {
+        delegate.close();
+        delegate = null;
+    }
 
-  @Override
-  public HttpParams getParams() {
-    return delegate.getParams();
-  }
+    @Override
+    public HttpParams getParams() {
+        return delegate.getParams();
+    }
 
-  @Override
-  public ClientConnectionManager getConnectionManager() {
-    return delegate.getConnectionManager();
-  }
+    @Override
+    public ClientConnectionManager getConnectionManager() {
+        return delegate.getConnectionManager();
+    }
 
-  @Override
-  public HttpResponse execute(final HttpUriRequest request) throws IOException {
-    return delegate.execute(request);
-  }
+    @Override
+    public HttpResponse execute(final HttpUriRequest request) throws IOException {
+        return delegate.execute(request);
+    }
 
-  @Override
-  public HttpResponse execute(final HttpUriRequest request, final HttpContext context)
-      throws IOException {
-    return delegate.execute(request, context);
-  }
+    @Override
+    public HttpResponse execute(final HttpUriRequest request, final HttpContext context) throws IOException {
+        return delegate.execute(request, context);
+    }
 
-  @Override
-  public HttpResponse execute(final HttpHost target, final HttpRequest request) throws IOException {
-    return delegate.execute(target, request);
-  }
+    @Override
+    public HttpResponse execute(final HttpHost target, final HttpRequest request) throws IOException {
+        return delegate.execute(target, request);
+    }
 
-  @Override
-  public HttpResponse execute(
-      final HttpHost target, final HttpRequest request, final HttpContext context)
-      throws IOException {
-    return delegate.execute(target, request, context);
-  }
+    @Override
+    public HttpResponse execute(final HttpHost target, final HttpRequest request, final HttpContext context)
+            throws IOException {
+        return delegate.execute(target, request, context);
+    }
 
-  @Override
-  public <T> T execute(
-      final HttpUriRequest request, final ResponseHandler<? extends T> responseHandler)
-      throws IOException {
-    return delegate.execute(request, responseHandler);
-  }
+    @Override
+    public <T> T execute(final HttpUriRequest request, final ResponseHandler<? extends T> responseHandler)
+            throws IOException {
+        return delegate.execute(request, responseHandler);
+    }
 
-  @Override
-  public <T> T execute(
-      final HttpUriRequest request,
-      final ResponseHandler<? extends T> responseHandler,
-      final HttpContext context)
-      throws IOException {
-    return delegate.execute(request, responseHandler, context);
-  }
+    @Override
+    public <T> T execute(
+            final HttpUriRequest request, final ResponseHandler<? extends T> responseHandler, final HttpContext context)
+            throws IOException {
+        return delegate.execute(request, responseHandler, context);
+    }
 
-  @Override
-  public <T> T execute(
-      final HttpHost target,
-      final HttpRequest request,
-      final ResponseHandler<? extends T> responseHandler)
-      throws IOException {
-    return delegate.execute(target, request, responseHandler);
-  }
+    @Override
+    public <T> T execute(
+            final HttpHost target, final HttpRequest request, final ResponseHandler<? extends T> responseHandler)
+            throws IOException {
+        return delegate.execute(target, request, responseHandler);
+    }
 
-  @Override
-  public <T> T execute(
-      final HttpHost target,
-      final HttpRequest request,
-      final ResponseHandler<? extends T> responseHandler,
-      final HttpContext context)
-      throws IOException {
-    return delegate.execute(target, request, responseHandler, context);
-  }
+    @Override
+    public <T> T execute(
+            final HttpHost target,
+            final HttpRequest request,
+            final ResponseHandler<? extends T> responseHandler,
+            final HttpContext context)
+            throws IOException {
+        return delegate.execute(target, request, responseHandler, context);
+    }
 }
diff --git a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/common/LogSupport.java b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/common/LogSupport.java
index 70467973386..b5fc422d5a8 100644
--- a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/common/LogSupport.java
+++ b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/common/LogSupport.java
@@ -4,5 +4,5 @@
 import org.apache.commons.logging.LogFactory;
 
 public abstract class LogSupport {
-  protected final Log log = LogFactory.getLog(getClass());
+    protected final Log log = LogFactory.getLog(getClass());
 }
diff --git a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/common/ServiceSupport.java b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/common/ServiceSupport.java
index a9b507b1c0c..1d333ddc7ea 100644
--- a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/common/ServiceSupport.java
+++ b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/common/ServiceSupport.java
@@ -3,35 +3,35 @@
 import static com.google.common.base.Preconditions.checkState;
 
 public abstract class ServiceSupport extends LogSupport {
-  private boolean started;
+    private boolean started;
 
-  public final synchronized void start() throws Exception {
-    checkState(!started);
-    try {
-      log.info("Starting " + this);
-      doStart();
-      log.info("Started " + this);
-      started = true;
-    } catch (Exception e) {
-      log.warn("Problem starting {}" + this, e);
-      throw e;
+    public final synchronized void start() throws Exception {
+        checkState(!started);
+        try {
+            log.info("Starting " + this);
+            doStart();
+            log.info("Started " + this);
+            started = true;
+        } catch (Exception e) {
+            log.warn("Problem starting {}" + this, e);
+            throw e;
+        }
     }
-  }
 
-  public final synchronized void stop() throws Exception {
-    checkState(started);
-    try {
-      log.info("Stopping " + this);
-      doStop();
-      log.info("Stopped " + this);
-      started = false;
-    } catch (Exception e) {
-      log.warn("Problem stopping {}" + this, e);
-      throw e;
+    public final synchronized void stop() throws Exception {
+        checkState(started);
+        try {
+            log.info("Stopping " + this);
+            doStop();
+            log.info("Stopped " + this);
+            started = false;
+        } catch (Exception e) {
+            log.warn("Problem stopping {}" + this, e);
+            throw e;
+        }
     }
-  }
 
-  protected abstract void doStart() throws Exception;
+    protected abstract void doStart() throws Exception;
 
-  protected abstract void doStop() throws Exception;
+    protected abstract void doStop() throws Exception;
 }
diff --git a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/messaging/PublisherSupport.java b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/messaging/PublisherSupport.java
index 7775f473344..b893290c85b 100644
--- a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/messaging/PublisherSupport.java
+++ b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/messaging/PublisherSupport.java
@@ -5,26 +5,26 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
 public abstract class PublisherSupport extends ServiceSupport {
-  private final List<SubscriberSupport> subscribers = new CopyOnWriteArrayList<>();
+    private final List<SubscriberSupport> subscribers = new CopyOnWriteArrayList<>();
 
-  public final void subscribe(final SubscriberSupport subscriber) {
-    subscribers.add(subscriber);
-  }
+    public final void subscribe(final SubscriberSupport subscriber) {
+        subscribers.add(subscriber);
+    }
 
-  public final void unsubscribe(final SubscriberSupport subscriber) {
-    subscribers.remove(subscriber);
-  }
+    public final void unsubscribe(final SubscriberSupport subscriber) {
+        subscribers.remove(subscriber);
+    }
 
-  public final void publish(final String text) {
-    publish(new TextMessage(text));
-  }
+    public final void publish(final String text) {
+        publish(new TextMessage(text));
+    }
 
-  public final void publish(final Message message) {
-    log.info("Publishing " + message);
-    for (SubscriberSupport subscriber : subscribers) {
-      doPublish(subscriber, message);
+    public final void publish(final Message message) {
+        log.info("Publishing " + message);
+        for (SubscriberSupport subscriber : subscribers) {
+            doPublish(subscriber, message);
+        }
     }
-  }
 
-  protected abstract void doPublish(final SubscriberSupport subscriber, Message message);
+    protected abstract void doPublish(final SubscriberSupport subscriber, Message message);
 }
diff --git a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/messaging/SubscriberSupport.java b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/messaging/SubscriberSupport.java
index ed492f17c99..957f485136c 100644
--- a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/messaging/SubscriberSupport.java
+++ b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/messaging/SubscriberSupport.java
@@ -3,10 +3,10 @@
 import datadog.smoketest.jbossmodules.common.ServiceSupport;
 
 public abstract class SubscriberSupport extends ServiceSupport {
-  public final void receive(final Message message) {
-    log.info("Receiving " + message);
-    doReceive(message);
-  }
+    public final void receive(final Message message) {
+        log.info("Receiving " + message);
+        doReceive(message);
+    }
 
-  protected abstract void doReceive(final Message message);
+    protected abstract void doReceive(final Message message);
 }
diff --git a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/messaging/TextMessage.java b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/messaging/TextMessage.java
index 8d6765d7a81..115e2bf0b0d 100644
--- a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/messaging/TextMessage.java
+++ b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/messaging/TextMessage.java
@@ -1,14 +1,14 @@
 package datadog.smoketest.jbossmodules.messaging;
 
 public class TextMessage implements Message {
-  private final String text;
+    private final String text;
 
-  public TextMessage(final String text) {
-    this.text = text;
-  }
+    public TextMessage(final String text) {
+        this.text = text;
+    }
 
-  @Override
-  public String toString() {
-    return "\"" + text + "\"";
-  }
+    @Override
+    public String toString() {
+        return "\"" + text + "\"";
+    }
 }
diff --git a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/publishing/AsyncPublisher.java b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/publishing/AsyncPublisher.java
index 3b1849c3943..d19eb58e252 100644
--- a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/publishing/AsyncPublisher.java
+++ b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/publishing/AsyncPublisher.java
@@ -7,37 +7,37 @@
 import java.util.concurrent.Executors;
 
 public class AsyncPublisher extends PublisherSupport {
-  private ExecutorService executorService;
-
-  @Override
-  protected void doStart() {
-    executorService = Executors.newCachedThreadPool();
-  }
-
-  @Override
-  protected void doPublish(final SubscriberSupport subscriber, final Message message) {
-    executorService.submit(new PublishTask(subscriber, message));
-  }
-
-  @Override
-  protected void doStop() {
-    executorService.shutdown();
-    executorService = null;
-  }
-
-  class PublishTask implements Runnable {
-    private final SubscriberSupport subscriber;
-    private final Message message;
-
-    PublishTask(final SubscriberSupport subscriber, final Message message) {
-      this.subscriber = subscriber;
-      this.message = message;
+    private ExecutorService executorService;
+
+    @Override
+    protected void doStart() {
+        executorService = Executors.newCachedThreadPool();
+    }
+
+    @Override
+    protected void doPublish(final SubscriberSupport subscriber, final Message message) {
+        executorService.submit(new PublishTask(subscriber, message));
     }
 
     @Override
-    public void run() {
-      subscriber.receive(message);
-      log.info("Published " + message + " to " + subscriber);
+    protected void doStop() {
+        executorService.shutdown();
+        executorService = null;
+    }
+
+    class PublishTask implements Runnable {
+        private final SubscriberSupport subscriber;
+        private final Message message;
+
+        PublishTask(final SubscriberSupport subscriber, final Message message) {
+            this.subscriber = subscriber;
+            this.message = message;
+        }
+
+        @Override
+        public void run() {
+            subscriber.receive(message);
+            log.info("Published " + message + " to " + subscriber);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/subscribing/AsyncSubscriber.java b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/subscribing/AsyncSubscriber.java
index 4ec07b58784..af84fce919a 100644
--- a/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/subscribing/AsyncSubscriber.java
+++ b/dd-smoke-tests/jboss-modules/src/main/java/datadog/smoketest/jbossmodules/subscribing/AsyncSubscriber.java
@@ -6,34 +6,34 @@
 import java.util.concurrent.Executors;
 
 public class AsyncSubscriber extends SubscriberSupport {
-  private ExecutorService executorService;
+    private ExecutorService executorService;
 
-  @Override
-  protected void doStart() {
-    executorService = Executors.newCachedThreadPool();
-  }
+    @Override
+    protected void doStart() {
+        executorService = Executors.newCachedThreadPool();
+    }
 
-  @Override
-  protected void doReceive(final Message message) {
-    executorService.submit(new ReceiveTask(message));
-  }
+    @Override
+    protected void doReceive(final Message message) {
+        executorService.submit(new ReceiveTask(message));
+    }
 
-  @Override
-  protected void doStop() {
-    executorService.shutdown();
-    executorService = null;
-  }
+    @Override
+    protected void doStop() {
+        executorService.shutdown();
+        executorService = null;
+    }
 
-  class ReceiveTask implements Runnable {
-    private final Message message;
+    class ReceiveTask implements Runnable {
+        private final Message message;
 
-    ReceiveTask(final Message message) {
-      this.message = message;
-    }
+        ReceiveTask(final Message message) {
+            this.message = message;
+        }
 
-    @Override
-    public void run() {
-      log.info("Received " + message);
+        @Override
+        public void run() {
+            log.info("Received " + message);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/jersey-2/src/main/java/com/restserver/Main.java b/dd-smoke-tests/jersey-2/src/main/java/com/restserver/Main.java
index 1f3375e3107..3e1aef47500 100644
--- a/dd-smoke-tests/jersey-2/src/main/java/com/restserver/Main.java
+++ b/dd-smoke-tests/jersey-2/src/main/java/com/restserver/Main.java
@@ -9,44 +9,44 @@
 
 public class Main {
 
-  private static final int DEFAULT_PORT = 8066;
-
-  private int serverPort;
-
-  public Main(int serverPort) throws Exception {
-    this.serverPort = serverPort;
-
-    Server server = configureServer();
-    server.start();
-    server.join();
-  }
-
-  private Server configureServer() {
-    ResourceConfig resourceConfig = new ResourceConfig();
-    resourceConfig.packages(Resource.class.getPackage().getName());
-    resourceConfig.register(JacksonFeature.class);
-    ServletContainer servletContainer = new ServletContainer(resourceConfig);
-    ServletHolder sh = new ServletHolder(servletContainer);
-    Server server = new Server(serverPort);
-    ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
-    context.setContextPath("/");
-    context.addServlet(sh, "/*");
-    server.setHandler(context);
-    return server;
-  }
-
-  public static void main(String[] args) throws Exception {
-
-    int serverPort = DEFAULT_PORT;
-
-    if (args.length >= 1) {
-      try {
-        serverPort = Integer.parseInt(args[0]);
-      } catch (NumberFormatException e) {
-        e.printStackTrace();
-      }
+    private static final int DEFAULT_PORT = 8066;
+
+    private int serverPort;
+
+    public Main(int serverPort) throws Exception {
+        this.serverPort = serverPort;
+
+        Server server = configureServer();
+        server.start();
+        server.join();
+    }
+
+    private Server configureServer() {
+        ResourceConfig resourceConfig = new ResourceConfig();
+        resourceConfig.packages(Resource.class.getPackage().getName());
+        resourceConfig.register(JacksonFeature.class);
+        ServletContainer servletContainer = new ServletContainer(resourceConfig);
+        ServletHolder sh = new ServletHolder(servletContainer);
+        Server server = new Server(serverPort);
+        ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
+        context.setContextPath("/");
+        context.addServlet(sh, "/*");
+        server.setHandler(context);
+        return server;
     }
 
-    new Main(serverPort);
-  }
+    public static void main(String[] args) throws Exception {
+
+        int serverPort = DEFAULT_PORT;
+
+        if (args.length >= 1) {
+            try {
+                serverPort = Integer.parseInt(args[0]);
+            } catch (NumberFormatException e) {
+                e.printStackTrace();
+            }
+        }
+
+        new Main(serverPort);
+    }
 }
diff --git a/dd-smoke-tests/jersey-2/src/main/java/com/restserver/RequestBody.java b/dd-smoke-tests/jersey-2/src/main/java/com/restserver/RequestBody.java
index 535cab104cd..b4a0a8de6e5 100644
--- a/dd-smoke-tests/jersey-2/src/main/java/com/restserver/RequestBody.java
+++ b/dd-smoke-tests/jersey-2/src/main/java/com/restserver/RequestBody.java
@@ -3,43 +3,43 @@
 import java.util.List;
 
 public class RequestBody {
-  private List<KeyValue> main;
-  private Object nullable;
+    private List<KeyValue> main;
+    private Object nullable;
 
-  public List<KeyValue> getMain() {
-    return main;
-  }
+    public List<KeyValue> getMain() {
+        return main;
+    }
 
-  public void setMain(List<KeyValue> main) {
-    this.main = main;
-  }
+    public void setMain(List<KeyValue> main) {
+        this.main = main;
+    }
 
-  public Object getNullable() {
-    return nullable;
-  }
+    public Object getNullable() {
+        return nullable;
+    }
 
-  public void setNullable(Object nullable) {
-    this.nullable = nullable;
-  }
+    public void setNullable(Object nullable) {
+        this.nullable = nullable;
+    }
 
-  public static class KeyValue {
-    private String key;
-    private Double value;
+    public static class KeyValue {
+        private String key;
+        private Double value;
 
-    public String getKey() {
-      return key;
-    }
+        public String getKey() {
+            return key;
+        }
 
-    public void setKey(String key) {
-      this.key = key;
-    }
+        public void setKey(String key) {
+            this.key = key;
+        }
 
-    public Double getValue() {
-      return value;
-    }
+        public Double getValue() {
+            return value;
+        }
 
-    public void setValue(Double value) {
-      this.value = value;
+        public void setValue(Double value) {
+            this.value = value;
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/jersey-2/src/main/java/com/restserver/Resource.java b/dd-smoke-tests/jersey-2/src/main/java/com/restserver/Resource.java
index 2538b616a34..749177a1fd1 100644
--- a/dd-smoke-tests/jersey-2/src/main/java/com/restserver/Resource.java
+++ b/dd-smoke-tests/jersey-2/src/main/java/com/restserver/Resource.java
@@ -26,131 +26,138 @@
 @Path("/hello")
 public class Resource {
 
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String hello() {
-    return "Jersey hello world example.";
-  }
-
-  @Path("/bypathparam/{name}")
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String byPathParam(@PathParam("name") String name) {
-    return "Jersey: hello " + name;
-  }
-
-  @Path("/byqueryparam")
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String byQueryParam(@QueryParam("param") String param) {
-    return "Jersey: hello " + param;
-  }
-
-  @Path("/byheader")
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String byHeader(@HeaderParam("X-Custom-header") String param) {
-    return "Jersey: hello " + param;
-  }
-
-  @Path("/bycookie")
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String byCookie(@CookieParam("cookieName") String param) {
-    return "Jersey: hello " + param;
-  }
-
-  @Path("/puttest")
-  @POST
-  @Produces(MediaType.APPLICATION_JSON)
-  @Consumes(MediaType.APPLICATION_JSON)
-  public Response put(TestEntity testEntity) {
-    return Response.status(Status.CREATED).build();
-  }
-
-  @GET
-  @Path("/cookiename")
-  public String sourceCookieName(@Context final HttpHeaders headers) {
-    Map<String, Cookie> cookies = headers.getCookies();
-    for (Cookie cookie : cookies.values()) {
-      if (cookie.getName().equalsIgnoreCase("cookieName")) {
-        String cookieName = cookie.getName();
-        return "Jersey: hello " + cookieName;
-      }
-    }
-    return "cookie not found";
-  }
-
-  @GET
-  @Path("/headername")
-  public String sourceHeaderName(@Context final HttpHeaders headers) {
-    for (String headerName : headers.getRequestHeaders().keySet()) {
-      if (headerName.equalsIgnoreCase("X-Custom-header")) {
-        return "Jersey: hello " + headerName;
-      }
-    }
-    return "header not found";
-  }
-
-  @GET
-  @Path("/cookieobjectvalue")
-  public String sourceCookieValue(@Context final HttpHeaders headers) {
-    Map<String, Cookie> cookies = headers.getCookies();
-    for (Cookie cookie : cookies.values()) {
-      if (cookie.getName().equalsIgnoreCase("cookieName")) {
-        String cookieValue = cookie.getValue();
-        return "Jersey: hello " + cookieValue;
-      }
-    }
-    return "cookie not found";
-  }
-
-  @POST
-  @Path("/formparameter")
-  public String sourceParameterName(@FormParam("formParam1Name") final String formParam1Value) {
-    return String.format("Jersey: hello " + formParam1Value);
-  }
-
-  @POST
-  @Path("/formparametername")
-  public String sourceParameterName(Form form) {
-    for (String paramName : form.asMap().keySet()) {
-      if (paramName.equalsIgnoreCase("formParam1Name")) {
-        return "Jersey: hello " + paramName;
-      }
-    }
-    return "Parameter name not found";
-  }
-
-  @Path("/setlocationheader")
-  @GET
-  public Response locationHeader(@QueryParam("param") String param) {
-    return Response.status(Response.Status.TEMPORARY_REDIRECT).header("Location", param).build();
-  }
-
-  @Path("/setresponselocation")
-  @GET
-  public Response responseLocation(@QueryParam("param") String param) throws URISyntaxException {
-    return Response.status(Response.Status.TEMPORARY_REDIRECT).location(new URI(param)).build();
-  }
-
-  @Path("/insecurecookie")
-  @GET
-  public Response getCookie() throws SQLException {
-    return Response.ok().cookie(new NewCookie("user-id", "7")).build();
-  }
-
-  @Path("/api_security/response")
-  @POST
-  @Produces(MediaType.APPLICATION_JSON)
-  @Consumes(MediaType.APPLICATION_JSON)
-  public Response bodyJson(RequestBody input) {
-    return Response.ok(input).build();
-  }
-
-  @GET
-  @Path("/api_security/sampling/{i}")
-  public Response apiSecuritySamplingWithStatus(@PathParam("i") int i) {
-    return Response.status(i).header("content-type", "text/plain").entity("Hello!\n").build();
-  }
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "Jersey hello world example.";
+    }
+
+    @Path("/bypathparam/{name}")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String byPathParam(@PathParam("name") String name) {
+        return "Jersey: hello " + name;
+    }
+
+    @Path("/byqueryparam")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String byQueryParam(@QueryParam("param") String param) {
+        return "Jersey: hello " + param;
+    }
+
+    @Path("/byheader")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String byHeader(@HeaderParam("X-Custom-header") String param) {
+        return "Jersey: hello " + param;
+    }
+
+    @Path("/bycookie")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String byCookie(@CookieParam("cookieName") String param) {
+        return "Jersey: hello " + param;
+    }
+
+    @Path("/puttest")
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Response put(TestEntity testEntity) {
+        return Response.status(Status.CREATED).build();
+    }
+
+    @GET
+    @Path("/cookiename")
+    public String sourceCookieName(@Context final HttpHeaders headers) {
+        Map<String, Cookie> cookies = headers.getCookies();
+        for (Cookie cookie : cookies.values()) {
+            if (cookie.getName().equalsIgnoreCase("cookieName")) {
+                String cookieName = cookie.getName();
+                return "Jersey: hello " + cookieName;
+            }
+        }
+        return "cookie not found";
+    }
+
+    @GET
+    @Path("/headername")
+    public String sourceHeaderName(@Context final HttpHeaders headers) {
+        for (String headerName : headers.getRequestHeaders().keySet()) {
+            if (headerName.equalsIgnoreCase("X-Custom-header")) {
+                return "Jersey: hello " + headerName;
+            }
+        }
+        return "header not found";
+    }
+
+    @GET
+    @Path("/cookieobjectvalue")
+    public String sourceCookieValue(@Context final HttpHeaders headers) {
+        Map<String, Cookie> cookies = headers.getCookies();
+        for (Cookie cookie : cookies.values()) {
+            if (cookie.getName().equalsIgnoreCase("cookieName")) {
+                String cookieValue = cookie.getValue();
+                return "Jersey: hello " + cookieValue;
+            }
+        }
+        return "cookie not found";
+    }
+
+    @POST
+    @Path("/formparameter")
+    public String sourceParameterName(@FormParam("formParam1Name") final String formParam1Value) {
+        return String.format("Jersey: hello " + formParam1Value);
+    }
+
+    @POST
+    @Path("/formparametername")
+    public String sourceParameterName(Form form) {
+        for (String paramName : form.asMap().keySet()) {
+            if (paramName.equalsIgnoreCase("formParam1Name")) {
+                return "Jersey: hello " + paramName;
+            }
+        }
+        return "Parameter name not found";
+    }
+
+    @Path("/setlocationheader")
+    @GET
+    public Response locationHeader(@QueryParam("param") String param) {
+        return Response.status(Response.Status.TEMPORARY_REDIRECT)
+                .header("Location", param)
+                .build();
+    }
+
+    @Path("/setresponselocation")
+    @GET
+    public Response responseLocation(@QueryParam("param") String param) throws URISyntaxException {
+        return Response.status(Response.Status.TEMPORARY_REDIRECT)
+                .location(new URI(param))
+                .build();
+    }
+
+    @Path("/insecurecookie")
+    @GET
+    public Response getCookie() throws SQLException {
+        return Response.ok().cookie(new NewCookie("user-id", "7")).build();
+    }
+
+    @Path("/api_security/response")
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Response bodyJson(RequestBody input) {
+        return Response.ok(input).build();
+    }
+
+    @GET
+    @Path("/api_security/sampling/{i}")
+    public Response apiSecuritySamplingWithStatus(@PathParam("i") int i) {
+        return Response.status(i)
+                .header("content-type", "text/plain")
+                .entity("Hello!\n")
+                .build();
+    }
 }
diff --git a/dd-smoke-tests/jersey-2/src/main/java/com/restserver/TestEntity.java b/dd-smoke-tests/jersey-2/src/main/java/com/restserver/TestEntity.java
index 0ace8aa03be..4cd669ce535 100644
--- a/dd-smoke-tests/jersey-2/src/main/java/com/restserver/TestEntity.java
+++ b/dd-smoke-tests/jersey-2/src/main/java/com/restserver/TestEntity.java
@@ -1,15 +1,15 @@
 package com.restserver;
 
 public class TestEntity {
-  public String param1;
-  public String param2;
+    public String param1;
+    public String param2;
 
-  public TestEntity() {
-    super();
-  }
+    public TestEntity() {
+        super();
+    }
 
-  public TestEntity(String param1, String param2) {
-    this.param1 = param1;
-    this.param2 = param2;
-  }
+    public TestEntity(String param1, String param2) {
+        this.param1 = param1;
+        this.param2 = param2;
+    }
 }
diff --git a/dd-smoke-tests/jersey-3/src/main/java/smoketest/MainApp.java b/dd-smoke-tests/jersey-3/src/main/java/smoketest/MainApp.java
index 292a233b6eb..8b799cdc092 100644
--- a/dd-smoke-tests/jersey-3/src/main/java/smoketest/MainApp.java
+++ b/dd-smoke-tests/jersey-3/src/main/java/smoketest/MainApp.java
@@ -12,86 +12,82 @@
 import smoketest.config.AutoScanFeature;
 
 public class MainApp {
-  public static final byte[] debugMarker = "debugmarker".getBytes();
+    public static final byte[] debugMarker = "debugmarker".getBytes();
 
-  private static final Logger LOGGER = Logger.getLogger(MainApp.class.getName());
+    private static final Logger LOGGER = Logger.getLogger(MainApp.class.getName());
 
-  // we start at port 8080
-  public static final String BASE_URI = "http://localhost:";
+    // we start at port 8080
+    public static final String BASE_URI = "http://localhost:";
 
-  // Starts Grizzly HTTP server
-  public static HttpServer startServer(String httpPort) {
+    // Starts Grizzly HTTP server
+    public static HttpServer startServer(String httpPort) {
 
-    // scan packages
-    final ResourceConfig config = new ResourceConfig();
-    // config.packages(true, "com.mkyong");
-    config.register(Resource.class);
+        // scan packages
+        final ResourceConfig config = new ResourceConfig();
+        // config.packages(true, "com.mkyong");
+        config.register(Resource.class);
 
-    // enable auto scan @Contract and @Service
-    config.register(AutoScanFeature.class);
+        // enable auto scan @Contract and @Service
+        config.register(AutoScanFeature.class);
 
-    config.register(JacksonFeature.class);
+        config.register(JacksonFeature.class);
 
-    LOGGER.info("Starting Server........");
+        LOGGER.info("Starting Server........");
 
-    URI uri = URI.create(BASE_URI + httpPort + "/");
-    System.out.println("Starting server at URI: " + uri);
-    final HttpServer httpServer = GrizzlyHttpServerFactory.createHttpServer(uri, config);
+        URI uri = URI.create(BASE_URI + httpPort + "/");
+        System.out.println("Starting server at URI: " + uri);
+        final HttpServer httpServer = GrizzlyHttpServerFactory.createHttpServer(uri, config);
 
-    return httpServer;
-  }
+        return httpServer;
+    }
 
-  public static void main(String[] args) {
-    String httpPort = "8034";
-    ParamConverter paramConverter =
-        new StringConstructor()
-            .getConverter(String.class, new GenericClass(String.class).getMyType(), null);
-    Object pepe = paramConverter.fromString("Pepe");
+    public static void main(String[] args) {
+        String httpPort = "8034";
+        ParamConverter paramConverter =
+                new StringConstructor().getConverter(String.class, new GenericClass(String.class).getMyType(), null);
+        Object pepe = paramConverter.fromString("Pepe");
 
-    if (args.length == 1) {
-      httpPort = args[0];
-    }
-    try {
+        if (args.length == 1) {
+            httpPort = args[0];
+        }
+        try {
 
-      final HttpServer httpServer = startServer(httpPort);
+            final HttpServer httpServer = startServer(httpPort);
 
-      // add jvm shutdown hook
-      Runtime.getRuntime()
-          .addShutdownHook(
-              new Thread(
-                  () -> {
-                    try {
-                      System.out.println("Shutting down the application...");
+            // add jvm shutdown hook
+            Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+                try {
+                    System.out.println("Shutting down the application...");
 
-                      httpServer.shutdownNow();
+                    httpServer.shutdownNow();
 
-                      System.out.println("Done, exit.");
-                    } catch (Exception e) {
-                      Logger.getLogger(MainApp.class.getName()).log(Level.SEVERE, null, e);
-                    }
-                  }));
+                    System.out.println("Done, exit.");
+                } catch (Exception e) {
+                    Logger.getLogger(MainApp.class.getName()).log(Level.SEVERE, null, e);
+                }
+            }));
 
-      System.out.println("Application started.");
-      System.out.println("Stop the application using CTRL+C");
+            System.out.println("Application started.");
+            System.out.println("Stop the application using CTRL+C");
 
-      // block and wait shut down signal, like CTRL+C
-      Thread.currentThread().join();
+            // block and wait shut down signal, like CTRL+C
+            Thread.currentThread().join();
 
-    } catch (InterruptedException ex) {
-      Logger.getLogger(MainApp.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (InterruptedException ex) {
+            Logger.getLogger(MainApp.class.getName()).log(Level.SEVERE, null, ex);
+        }
     }
-  }
 
-  public static class GenericClass<T> {
+    public static class GenericClass<T> {
 
-    private final Class<T> type;
+        private final Class<T> type;
 
-    public GenericClass(Class<T> type) {
-      this.type = type;
-    }
+        public GenericClass(Class<T> type) {
+            this.type = type;
+        }
 
-    public Class<T> getMyType() {
-      return this.type;
+        public Class<T> getMyType() {
+            return this.type;
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/jersey-3/src/main/java/smoketest/RequestBody.java b/dd-smoke-tests/jersey-3/src/main/java/smoketest/RequestBody.java
index 1c1cc183f41..6a98370fde1 100644
--- a/dd-smoke-tests/jersey-3/src/main/java/smoketest/RequestBody.java
+++ b/dd-smoke-tests/jersey-3/src/main/java/smoketest/RequestBody.java
@@ -3,43 +3,43 @@
 import java.util.List;
 
 public class RequestBody {
-  private List<KeyValue> main;
-  private Object nullable;
+    private List<KeyValue> main;
+    private Object nullable;
 
-  public List<KeyValue> getMain() {
-    return main;
-  }
+    public List<KeyValue> getMain() {
+        return main;
+    }
 
-  public void setMain(List<KeyValue> main) {
-    this.main = main;
-  }
+    public void setMain(List<KeyValue> main) {
+        this.main = main;
+    }
 
-  public Object getNullable() {
-    return nullable;
-  }
+    public Object getNullable() {
+        return nullable;
+    }
 
-  public void setNullable(Object nullable) {
-    this.nullable = nullable;
-  }
+    public void setNullable(Object nullable) {
+        this.nullable = nullable;
+    }
 
-  public static class KeyValue {
-    private String key;
-    private Double value;
+    public static class KeyValue {
+        private String key;
+        private Double value;
 
-    public String getKey() {
-      return key;
-    }
+        public String getKey() {
+            return key;
+        }
 
-    public void setKey(String key) {
-      this.key = key;
-    }
+        public void setKey(String key) {
+            this.key = key;
+        }
 
-    public Double getValue() {
-      return value;
-    }
+        public Double getValue() {
+            return value;
+        }
 
-    public void setValue(Double value) {
-      this.value = value;
+        public void setValue(Double value) {
+            this.value = value;
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/jersey-3/src/main/java/smoketest/Resource.java b/dd-smoke-tests/jersey-3/src/main/java/smoketest/Resource.java
index 9e5d7364ca3..304dea9c8cd 100644
--- a/dd-smoke-tests/jersey-3/src/main/java/smoketest/Resource.java
+++ b/dd-smoke-tests/jersey-3/src/main/java/smoketest/Resource.java
@@ -25,123 +25,130 @@
 @Path("/hello")
 public class Resource {
 
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String hello() {
-    return "Jersey hello world example.";
-  }
-
-  @Path("/bypathparam/{name}")
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String byPathParam(@PathParam("name") String name) {
-    return "Jersey: hello " + name;
-  }
-
-  @Path("/byqueryparam")
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String byQueryParam(@QueryParam("param") String param) {
-    return "Jersey: hello " + param;
-  }
-
-  @Path("/byheader")
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String byHeader(@HeaderParam("X-Custom-header") String param) {
-    return "Jersey: hello " + param;
-  }
-
-  @Path("/bycookie")
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String byCookie(@CookieParam("cookieName") String param) {
-    return "Jersey: hello " + param;
-  }
-
-  @GET
-  @Path("/cookiename")
-  public String sourceCookieName(@Context final HttpHeaders headers) {
-    Map<String, Cookie> cookies = headers.getCookies();
-    for (Cookie cookie : cookies.values()) {
-      if (cookie.getName().equalsIgnoreCase("cookieName")) {
-        String cookieName = cookie.getName();
-        return "Jersey: hello " + cookieName;
-      }
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "Jersey hello world example.";
     }
-    return "cookie not found";
-  }
-
-  @GET
-  @Path("/headername")
-  public String sourceHeaderName(@Context final HttpHeaders headers) {
-    for (String headerName : headers.getRequestHeaders().keySet()) {
-      if (headerName.equalsIgnoreCase("X-Custom-header")) {
-        return "Jersey: hello " + headerName;
-      }
+
+    @Path("/bypathparam/{name}")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String byPathParam(@PathParam("name") String name) {
+        return "Jersey: hello " + name;
+    }
+
+    @Path("/byqueryparam")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String byQueryParam(@QueryParam("param") String param) {
+        return "Jersey: hello " + param;
     }
-    return "header not found";
-  }
-
-  @GET
-  @Path("/cookieobjectvalue")
-  public String sourceCookieValue(@Context final HttpHeaders headers) {
-    Map<String, Cookie> cookies = headers.getCookies();
-    for (Cookie cookie : cookies.values()) {
-      if (cookie.getName().equalsIgnoreCase("cookieName")) {
-        String cookieValue = cookie.getValue();
-        return "Jersey: hello " + cookieValue;
-      }
+
+    @Path("/byheader")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String byHeader(@HeaderParam("X-Custom-header") String param) {
+        return "Jersey: hello " + param;
     }
-    return "cookie not found";
-  }
-
-  @POST
-  @Path("/formparameter")
-  public String sourceParameterName(@FormParam("formParam1Name") final String formParam1Value) {
-    return String.format("Jersey: hello " + formParam1Value);
-  }
-
-  @POST
-  @Path("/formparametername")
-  public String sourceParameterName(Form form) {
-    for (String paramName : form.asMap().keySet()) {
-      if (paramName.equalsIgnoreCase("formParam1Name")) {
-        return "Jersey: hello " + paramName;
-      }
+
+    @Path("/bycookie")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String byCookie(@CookieParam("cookieName") String param) {
+        return "Jersey: hello " + param;
+    }
+
+    @GET
+    @Path("/cookiename")
+    public String sourceCookieName(@Context final HttpHeaders headers) {
+        Map<String, Cookie> cookies = headers.getCookies();
+        for (Cookie cookie : cookies.values()) {
+            if (cookie.getName().equalsIgnoreCase("cookieName")) {
+                String cookieName = cookie.getName();
+                return "Jersey: hello " + cookieName;
+            }
+        }
+        return "cookie not found";
+    }
+
+    @GET
+    @Path("/headername")
+    public String sourceHeaderName(@Context final HttpHeaders headers) {
+        for (String headerName : headers.getRequestHeaders().keySet()) {
+            if (headerName.equalsIgnoreCase("X-Custom-header")) {
+                return "Jersey: hello " + headerName;
+            }
+        }
+        return "header not found";
+    }
+
+    @GET
+    @Path("/cookieobjectvalue")
+    public String sourceCookieValue(@Context final HttpHeaders headers) {
+        Map<String, Cookie> cookies = headers.getCookies();
+        for (Cookie cookie : cookies.values()) {
+            if (cookie.getName().equalsIgnoreCase("cookieName")) {
+                String cookieValue = cookie.getValue();
+                return "Jersey: hello " + cookieValue;
+            }
+        }
+        return "cookie not found";
+    }
+
+    @POST
+    @Path("/formparameter")
+    public String sourceParameterName(@FormParam("formParam1Name") final String formParam1Value) {
+        return String.format("Jersey: hello " + formParam1Value);
+    }
+
+    @POST
+    @Path("/formparametername")
+    public String sourceParameterName(Form form) {
+        for (String paramName : form.asMap().keySet()) {
+            if (paramName.equalsIgnoreCase("formParam1Name")) {
+                return "Jersey: hello " + paramName;
+            }
+        }
+        return "Parameter name not found";
+    }
+
+    @Path("/setlocationheader")
+    @GET
+    public Response locationHeader(@QueryParam("param") String param) {
+        return Response.status(Response.Status.TEMPORARY_REDIRECT)
+                .header("Location", param)
+                .build();
+    }
+
+    @Path("/setresponselocation")
+    @GET
+    public Response responseLocation(@QueryParam("param") String param) throws URISyntaxException {
+        return Response.status(Response.Status.TEMPORARY_REDIRECT)
+                .location(new URI(param))
+                .build();
+    }
+
+    @Path("/insecurecookie")
+    @GET
+    public Response getCookie() throws SQLException {
+        return Response.ok().cookie(new NewCookie("user-id", "7")).build();
+    }
+
+    @Path("/api_security/response")
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Response bodyJson(RequestBody input) {
+        return Response.ok(input).build();
+    }
+
+    @GET
+    @Path("/api_security/sampling/{i}")
+    public Response apiSecuritySamplingWithStatus(@PathParam("i") int i) {
+        return Response.status(i)
+                .header("content-type", "text/plain")
+                .entity("Hello!\n")
+                .build();
     }
-    return "Parameter name not found";
-  }
-
-  @Path("/setlocationheader")
-  @GET
-  public Response locationHeader(@QueryParam("param") String param) {
-    return Response.status(Response.Status.TEMPORARY_REDIRECT).header("Location", param).build();
-  }
-
-  @Path("/setresponselocation")
-  @GET
-  public Response responseLocation(@QueryParam("param") String param) throws URISyntaxException {
-    return Response.status(Response.Status.TEMPORARY_REDIRECT).location(new URI(param)).build();
-  }
-
-  @Path("/insecurecookie")
-  @GET
-  public Response getCookie() throws SQLException {
-    return Response.ok().cookie(new NewCookie("user-id", "7")).build();
-  }
-
-  @Path("/api_security/response")
-  @POST
-  @Produces(MediaType.APPLICATION_JSON)
-  @Consumes(MediaType.APPLICATION_JSON)
-  public Response bodyJson(RequestBody input) {
-    return Response.ok(input).build();
-  }
-
-  @GET
-  @Path("/api_security/sampling/{i}")
-  public Response apiSecuritySamplingWithStatus(@PathParam("i") int i) {
-    return Response.status(i).header("content-type", "text/plain").entity("Hello!\n").build();
-  }
 }
diff --git a/dd-smoke-tests/jersey-3/src/main/java/smoketest/config/AutoScanFeature.java b/dd-smoke-tests/jersey-3/src/main/java/smoketest/config/AutoScanFeature.java
index 548f8ed7231..f70e7f70bb0 100644
--- a/dd-smoke-tests/jersey-3/src/main/java/smoketest/config/AutoScanFeature.java
+++ b/dd-smoke-tests/jersey-3/src/main/java/smoketest/config/AutoScanFeature.java
@@ -16,23 +16,23 @@
 /* Auto scan the jax-rx @Contract and @Service  */
 public class AutoScanFeature implements Feature {
 
-  @Inject ServiceLocator serviceLocator;
+    @Inject
+    ServiceLocator serviceLocator;
 
-  @Override
-  public boolean configure(FeatureContext context) {
+    @Override
+    public boolean configure(FeatureContext context) {
 
-    DynamicConfigurationService dcs = serviceLocator.getService(DynamicConfigurationService.class);
-    Populator populator = dcs.getPopulator();
-    try {
-      // Populator - populate HK2 service locators from inhabitants files
-      // ClasspathDescriptorFileFinder - find files from META-INF/hk2-locator/default
-      populator.populate(
-          new ClasspathDescriptorFileFinder(this.getClass().getClassLoader()),
-          new DuplicatePostProcessor());
+        DynamicConfigurationService dcs = serviceLocator.getService(DynamicConfigurationService.class);
+        Populator populator = dcs.getPopulator();
+        try {
+            // Populator - populate HK2 service locators from inhabitants files
+            // ClasspathDescriptorFileFinder - find files from META-INF/hk2-locator/default
+            populator.populate(
+                    new ClasspathDescriptorFileFinder(this.getClass().getClassLoader()), new DuplicatePostProcessor());
 
-    } catch (IOException | MultiException ex) {
-      Logger.getLogger(AutoScanFeature.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (IOException | MultiException ex) {
+            Logger.getLogger(AutoScanFeature.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        return true;
     }
-    return true;
-  }
 }
diff --git a/dd-smoke-tests/junit-console/src/test/java/datadog/smoketest/JUnitConsoleSmokeTest.java b/dd-smoke-tests/junit-console/src/test/java/datadog/smoketest/JUnitConsoleSmokeTest.java
index 17d9f2704fc..92c990863af 100644
--- a/dd-smoke-tests/junit-console/src/test/java/datadog/smoketest/JUnitConsoleSmokeTest.java
+++ b/dd-smoke-tests/junit-console/src/test/java/datadog/smoketest/JUnitConsoleSmokeTest.java
@@ -37,271 +37,254 @@
 import org.slf4j.LoggerFactory;
 
 class JUnitConsoleSmokeTest extends CiVisibilitySmokeTest {
-  private static final Logger LOGGER = LoggerFactory.getLogger(JUnitConsoleSmokeTest.class);
-
-  private static final String TEST_SERVICE_NAME = "test-headless-service";
-
-  private static final int PROCESS_TIMEOUT_SECS = 60;
-  private static final String JUNIT_CONSOLE_JAR_PATH =
-      System.getProperty("datadog.smoketest.junit.console.jar.path");
-  private static final String JAVA_HOME = buildJavaHome();
-
-  @TempDir Path projectHome;
-
-  static final MockBackend mockBackend = new MockBackend();
-
-  @BeforeEach
-  void resetMockBackend() {
-    mockBackend.reset();
-  }
-
-  @AfterAll
-  static void closeMockBackend() throws Exception {
-    mockBackend.close();
-  }
-
-  @Test
-  // Exception Replay is disabled by default on JDK8 due to JVM bug
-  @EnabledForJreRange(min = JRE.JAVA_11)
-  void testHeadlessFailedTestReplay() throws Exception {
-    String projectName = "test_junit_console_failed_test_replay";
-    givenProjectFiles(projectName);
-
-    mockBackend.givenFlakyRetries(true);
-    mockBackend.givenFlakyTest("test-headless-service", "com.example.TestFailed", "test_failed");
-    mockBackend.givenFailedTestReplay(true);
-
-    int compileCode = compileTestProject();
-    assertEquals(0, compileCode);
-
-    Map<String, String> agentArgs = new HashMap<>();
-    agentArgs.put(CiVisibilityConfig.CIVISIBILITY_FLAKY_RETRY_COUNT, "3");
-    agentArgs.put(GeneralConfig.AGENTLESS_LOG_SUBMISSION_URL, mockBackend.getIntakeUrl());
-    // avoid possible race conditions on shutdown
-    agentArgs.put(DebuggerConfig.DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL, "999999");
-
-    int exitCode = whenRunningJUnitConsole(agentArgs, Collections.emptyMap());
-    assertEquals(1, exitCode);
-
-    List<String> additionalDynamicTags =
-        Arrays.asList(
-            "content.meta.['_dd.debug.error.6.snapshot_id']",
-            "content.meta.['_dd.debug.error.exception_id']");
-    verifyEventsAndCoverages(
-        projectName,
-        "junit-console",
-        "headless",
-        mockBackend.waitForEvents(7),
-        mockBackend.waitForCoverages(0),
-        additionalDynamicTags);
-    verifySnapshots(mockBackend.waitForLogs(2), 2);
-  }
-
-  private void givenProjectFiles(String projectFilesSources) throws Exception {
-    Path projectResourcesPath =
-        Paths.get(this.getClass().getClassLoader().getResource(projectFilesSources).toURI());
-    copyFolder(projectResourcesPath, projectHome);
-  }
-
-  private void copyFolder(Path src, Path dest) throws IOException {
-    Files.walkFileTree(
-        src,
-        new SimpleFileVisitor<Path>() {
-          @Override
-          public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
-              throws IOException {
-            Files.createDirectories(dest.resolve(src.relativize(dir)));
-            return FileVisitResult.CONTINUE;
-          }
-
-          @Override
-          public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-              throws IOException {
-            Files.copy(file, dest.resolve(src.relativize(file)));
-            return FileVisitResult.CONTINUE;
-          }
-        });
+    private static final Logger LOGGER = LoggerFactory.getLogger(JUnitConsoleSmokeTest.class);
 
-    // creating empty .git directory so that the tracer could detect projectFolder as repo root
-    Files.createDirectory(projectHome.resolve(".git"));
-  }
-
-  private int compileTestProject() throws Exception {
-    Path srcDir = projectHome.resolve("src/main/java");
-    Path testSrcDir = projectHome.resolve("src/test/java");
-    Path classesDir = projectHome.resolve("target/classes");
-    Path testClassesDir = projectHome.resolve("target/test-classes");
-
-    Files.createDirectories(classesDir);
-    Files.createDirectories(testClassesDir);
-
-    // Compile main classes if they exist
-    if (Files.exists(srcDir)) {
-      List<String> mainJavaFiles = findJavaFiles(srcDir);
-      if (!mainJavaFiles.isEmpty()) {
-        int result =
-            runProcess(
-                createCompilerProcessBuilder(
-                        classesDir.toString(), mainJavaFiles, Collections.emptyList())
-                    .start(),
-                PROCESS_TIMEOUT_SECS);
-        if (result != 0) {
-          LOGGER.error("Error compiling source classes for JUnit Console smoke test");
-          return result;
-        }
-      }
+    private static final String TEST_SERVICE_NAME = "test-headless-service";
+
+    private static final int PROCESS_TIMEOUT_SECS = 60;
+    private static final String JUNIT_CONSOLE_JAR_PATH = System.getProperty("datadog.smoketest.junit.console.jar.path");
+    private static final String JAVA_HOME = buildJavaHome();
+
+    @TempDir
+    Path projectHome;
+
+    static final MockBackend mockBackend = new MockBackend();
+
+    @BeforeEach
+    void resetMockBackend() {
+        mockBackend.reset();
+    }
+
+    @AfterAll
+    static void closeMockBackend() throws Exception {
+        mockBackend.close();
+    }
+
+    @Test
+    // Exception Replay is disabled by default on JDK8 due to JVM bug
+    @EnabledForJreRange(min = JRE.JAVA_11)
+    void testHeadlessFailedTestReplay() throws Exception {
+        String projectName = "test_junit_console_failed_test_replay";
+        givenProjectFiles(projectName);
+
+        mockBackend.givenFlakyRetries(true);
+        mockBackend.givenFlakyTest("test-headless-service", "com.example.TestFailed", "test_failed");
+        mockBackend.givenFailedTestReplay(true);
+
+        int compileCode = compileTestProject();
+        assertEquals(0, compileCode);
+
+        Map<String, String> agentArgs = new HashMap<>();
+        agentArgs.put(CiVisibilityConfig.CIVISIBILITY_FLAKY_RETRY_COUNT, "3");
+        agentArgs.put(GeneralConfig.AGENTLESS_LOG_SUBMISSION_URL, mockBackend.getIntakeUrl());
+        // avoid possible race conditions on shutdown
+        agentArgs.put(DebuggerConfig.DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL, "999999");
+
+        int exitCode = whenRunningJUnitConsole(agentArgs, Collections.emptyMap());
+        assertEquals(1, exitCode);
+
+        List<String> additionalDynamicTags = Arrays.asList(
+                "content.meta.['_dd.debug.error.6.snapshot_id']", "content.meta.['_dd.debug.error.exception_id']");
+        verifyEventsAndCoverages(
+                projectName,
+                "junit-console",
+                "headless",
+                mockBackend.waitForEvents(7),
+                mockBackend.waitForCoverages(0),
+                additionalDynamicTags);
+        verifySnapshots(mockBackend.waitForLogs(2), 2);
     }
 
-    // Compile test classes
-    List<String> testJavaFiles = findJavaFiles(testSrcDir);
-    if (!testJavaFiles.isEmpty()) {
-      int result =
-          runProcess(
-              createCompilerProcessBuilder(
-                      testClassesDir.toString(),
-                      testJavaFiles,
-                      Collections.singletonList(classesDir.toString()))
-                  .start(),
-              PROCESS_TIMEOUT_SECS);
-      if (result != 0) {
-        LOGGER.error("Error compiling source classes for JUnit Console smoke test");
-        return result;
-      }
+    private void givenProjectFiles(String projectFilesSources) throws Exception {
+        Path projectResourcesPath = Paths.get(this.getClass()
+                .getClassLoader()
+                .getResource(projectFilesSources)
+                .toURI());
+        copyFolder(projectResourcesPath, projectHome);
     }
 
-    return 0;
-  }
+    private void copyFolder(Path src, Path dest) throws IOException {
+        Files.walkFileTree(src, new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+                Files.createDirectories(dest.resolve(src.relativize(dir)));
+                return FileVisitResult.CONTINUE;
+            }
 
-  private ProcessBuilder createCompilerProcessBuilder(
-      String targetDir, List<String> files, List<String> additionalDeps) {
-    assertTrue(new File(JUNIT_CONSOLE_JAR_PATH).isFile());
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                Files.copy(file, dest.resolve(src.relativize(file)));
+                return FileVisitResult.CONTINUE;
+            }
+        });
 
-    List<String> deps = new ArrayList<>();
-    deps.add(JUNIT_CONSOLE_JAR_PATH);
-    deps.addAll(additionalDeps);
+        // creating empty .git directory so that the tracer could detect projectFolder as repo root
+        Files.createDirectory(projectHome.resolve(".git"));
+    }
 
-    List<String> command = new ArrayList<>();
-    command.add(javacPath());
-    command.addAll(Arrays.asList("-cp", String.join(":", deps)));
-    command.addAll(Arrays.asList("-d", targetDir));
-    command.addAll(files);
+    private int compileTestProject() throws Exception {
+        Path srcDir = projectHome.resolve("src/main/java");
+        Path testSrcDir = projectHome.resolve("src/test/java");
+        Path classesDir = projectHome.resolve("target/classes");
+        Path testClassesDir = projectHome.resolve("target/test-classes");
+
+        Files.createDirectories(classesDir);
+        Files.createDirectories(testClassesDir);
+
+        // Compile main classes if they exist
+        if (Files.exists(srcDir)) {
+            List<String> mainJavaFiles = findJavaFiles(srcDir);
+            if (!mainJavaFiles.isEmpty()) {
+                int result = runProcess(
+                        createCompilerProcessBuilder(classesDir.toString(), mainJavaFiles, Collections.emptyList())
+                                .start(),
+                        PROCESS_TIMEOUT_SECS);
+                if (result != 0) {
+                    LOGGER.error("Error compiling source classes for JUnit Console smoke test");
+                    return result;
+                }
+            }
+        }
 
-    ProcessBuilder processBuilder = new ProcessBuilder(command);
-    processBuilder.directory(projectHome.toFile());
-    processBuilder.environment().put("JAVA_HOME", JAVA_HOME);
-    return processBuilder;
-  }
+        // Compile test classes
+        List<String> testJavaFiles = findJavaFiles(testSrcDir);
+        if (!testJavaFiles.isEmpty()) {
+            int result = runProcess(
+                    createCompilerProcessBuilder(
+                                    testClassesDir.toString(),
+                                    testJavaFiles,
+                                    Collections.singletonList(classesDir.toString()))
+                            .start(),
+                    PROCESS_TIMEOUT_SECS);
+            if (result != 0) {
+                LOGGER.error("Error compiling source classes for JUnit Console smoke test");
+                return result;
+            }
+        }
 
-  private static List<String> findJavaFiles(Path directory) throws IOException {
-    if (!Files.exists(directory)) {
-      return Collections.emptyList();
+        return 0;
     }
 
-    List<String> javaFiles = new ArrayList<>();
-    Files.walkFileTree(
-        directory,
-        new SimpleFileVisitor<Path>() {
-          @Override
-          public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-              throws IOException {
-            if (file.toString().endsWith(".java")) {
-              javaFiles.add(file.toString());
+    private ProcessBuilder createCompilerProcessBuilder(
+            String targetDir, List<String> files, List<String> additionalDeps) {
+        assertTrue(new File(JUNIT_CONSOLE_JAR_PATH).isFile());
+
+        List<String> deps = new ArrayList<>();
+        deps.add(JUNIT_CONSOLE_JAR_PATH);
+        deps.addAll(additionalDeps);
+
+        List<String> command = new ArrayList<>();
+        command.add(javacPath());
+        command.addAll(Arrays.asList("-cp", String.join(":", deps)));
+        command.addAll(Arrays.asList("-d", targetDir));
+        command.addAll(files);
+
+        ProcessBuilder processBuilder = new ProcessBuilder(command);
+        processBuilder.directory(projectHome.toFile());
+        processBuilder.environment().put("JAVA_HOME", JAVA_HOME);
+        return processBuilder;
+    }
+
+    private static List<String> findJavaFiles(Path directory) throws IOException {
+        if (!Files.exists(directory)) {
+            return Collections.emptyList();
+        }
+
+        List<String> javaFiles = new ArrayList<>();
+        Files.walkFileTree(directory, new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                if (file.toString().endsWith(".java")) {
+                    javaFiles.add(file.toString());
+                }
+                return FileVisitResult.CONTINUE;
             }
-            return FileVisitResult.CONTINUE;
-          }
         });
 
-    return javaFiles;
-  }
-
-  private int whenRunningJUnitConsole(
-      Map<String, String> additionalAgentArgs, Map<String, String> additionalEnvVars)
-      throws Exception {
-    ProcessBuilder processBuilder =
-        createConsoleProcessBuilder(
-            Collections.singletonList("execute"), additionalAgentArgs, additionalEnvVars);
-    processBuilder.environment().put("DD_API_KEY", "01234567890abcdef123456789ABCDEF");
-    return runProcess(processBuilder.start(), PROCESS_TIMEOUT_SECS);
-  }
-
-  private static int runProcess(Process p, int timeoutSecs) throws Exception {
-    StreamConsumer errorGobbler = new StreamConsumer(p.getErrorStream(), "ERROR");
-    StreamConsumer outputGobbler = new StreamConsumer(p.getInputStream(), "OUTPUT");
-    outputGobbler.start();
-    errorGobbler.start();
-
-    if (!p.waitFor(timeoutSecs, TimeUnit.SECONDS)) {
-      p.destroyForcibly();
-      throw new TimeoutException(
-          "Instrumented process failed to exit within " + timeoutSecs + "  seconds");
+        return javaFiles;
     }
 
-    return p.exitValue();
-  }
-
-  ProcessBuilder createConsoleProcessBuilder(
-      List<String> consoleCommand,
-      Map<String, String> additionalAgentArgs,
-      Map<String, String> additionalEnvVars) {
-    assertTrue(new File(JUNIT_CONSOLE_JAR_PATH).isFile());
-
-    List<String> command = new ArrayList<>();
-    command.add(javaPath());
-    command.add("-Ddatadog.slf4j.simpleLogger.defaultLogLevel=DEBUG");
-    command.addAll(Arrays.asList("-jar", JUNIT_CONSOLE_JAR_PATH));
-    command.addAll(consoleCommand);
-    command.addAll(
-        Arrays.asList(
-            "--class-path",
-            projectHome.resolve("target/classes")
-                + ":"
-                + projectHome.resolve("target/test-classes")));
-    command.add("--scan-class-path");
-
-    ProcessBuilder processBuilder = new ProcessBuilder(command);
-    processBuilder.directory(projectHome.toFile());
-
-    processBuilder.environment().put("JAVA_HOME", JAVA_HOME);
-    processBuilder.environment().put("JAVA_TOOL_OPTIONS", javaToolOptions(additionalAgentArgs));
-    for (Map.Entry<String, String> envVar : additionalEnvVars.entrySet()) {
-      processBuilder.environment().put(envVar.getKey(), envVar.getValue());
+    private int whenRunningJUnitConsole(Map<String, String> additionalAgentArgs, Map<String, String> additionalEnvVars)
+            throws Exception {
+        ProcessBuilder processBuilder = createConsoleProcessBuilder(
+                Collections.singletonList("execute"), additionalAgentArgs, additionalEnvVars);
+        processBuilder.environment().put("DD_API_KEY", "01234567890abcdef123456789ABCDEF");
+        return runProcess(processBuilder.start(), PROCESS_TIMEOUT_SECS);
     }
 
-    String mavenRepositoryProxy = System.getenv("MAVEN_REPOSITORY_PROXY");
-    if (mavenRepositoryProxy != null) {
-      processBuilder.environment().put("MAVEN_REPOSITORY_PROXY", mavenRepositoryProxy);
+    private static int runProcess(Process p, int timeoutSecs) throws Exception {
+        StreamConsumer errorGobbler = new StreamConsumer(p.getErrorStream(), "ERROR");
+        StreamConsumer outputGobbler = new StreamConsumer(p.getInputStream(), "OUTPUT");
+        outputGobbler.start();
+        errorGobbler.start();
+
+        if (!p.waitFor(timeoutSecs, TimeUnit.SECONDS)) {
+            p.destroyForcibly();
+            throw new TimeoutException("Instrumented process failed to exit within " + timeoutSecs + "  seconds");
+        }
+
+        return p.exitValue();
     }
 
-    return processBuilder;
-  }
+    ProcessBuilder createConsoleProcessBuilder(
+            List<String> consoleCommand,
+            Map<String, String> additionalAgentArgs,
+            Map<String, String> additionalEnvVars) {
+        assertTrue(new File(JUNIT_CONSOLE_JAR_PATH).isFile());
+
+        List<String> command = new ArrayList<>();
+        command.add(javaPath());
+        command.add("-Ddatadog.slf4j.simpleLogger.defaultLogLevel=DEBUG");
+        command.addAll(Arrays.asList("-jar", JUNIT_CONSOLE_JAR_PATH));
+        command.addAll(consoleCommand);
+        command.addAll(Arrays.asList(
+                "--class-path",
+                projectHome.resolve("target/classes") + ":" + projectHome.resolve("target/test-classes")));
+        command.add("--scan-class-path");
+
+        ProcessBuilder processBuilder = new ProcessBuilder(command);
+        processBuilder.directory(projectHome.toFile());
+
+        processBuilder.environment().put("JAVA_HOME", JAVA_HOME);
+        processBuilder.environment().put("JAVA_TOOL_OPTIONS", javaToolOptions(additionalAgentArgs));
+        for (Map.Entry<String, String> envVar : additionalEnvVars.entrySet()) {
+            processBuilder.environment().put(envVar.getKey(), envVar.getValue());
+        }
 
-  String javaToolOptions(Map<String, String> additionalAgentArgs) {
-    additionalAgentArgs.put(CiVisibilityConfig.CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED, "false");
-    return buildJvmArguments(mockBackend.getIntakeUrl(), TEST_SERVICE_NAME, additionalAgentArgs)
-        .stream()
-        .collect(Collectors.joining(" "));
-  }
+        String mavenRepositoryProxy = System.getenv("MAVEN_REPOSITORY_PROXY");
+        if (mavenRepositoryProxy != null) {
+            processBuilder.environment().put("MAVEN_REPOSITORY_PROXY", mavenRepositoryProxy);
+        }
 
-  private static class StreamConsumer extends Thread {
-    final InputStream is;
-    final String messagePrefix;
+        return processBuilder;
+    }
 
-    StreamConsumer(InputStream is, String messagePrefix) {
-      this.is = is;
-      this.messagePrefix = messagePrefix;
+    String javaToolOptions(Map<String, String> additionalAgentArgs) {
+        additionalAgentArgs.put(CiVisibilityConfig.CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED, "false");
+        return buildJvmArguments(mockBackend.getIntakeUrl(), TEST_SERVICE_NAME, additionalAgentArgs).stream()
+                .collect(Collectors.joining(" "));
     }
 
-    @Override
-    public void run() {
-      try {
-        BufferedReader br = new BufferedReader(new InputStreamReader(is));
-        String line;
-        while ((line = br.readLine()) != null) {
-          System.out.println(messagePrefix + ": " + line);
+    private static class StreamConsumer extends Thread {
+        final InputStream is;
+        final String messagePrefix;
+
+        StreamConsumer(InputStream is, String messagePrefix) {
+            this.is = is;
+            this.messagePrefix = messagePrefix;
+        }
+
+        @Override
+        public void run() {
+            try {
+                BufferedReader br = new BufferedReader(new InputStreamReader(is));
+                String line;
+                while ((line = br.readLine()) != null) {
+                    System.out.println(messagePrefix + ": " + line);
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
     }
-  }
 }
diff --git a/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/KafkaApplication.java b/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/KafkaApplication.java
index 26a84e8ade2..559397ce2d3 100644
--- a/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/KafkaApplication.java
+++ b/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/KafkaApplication.java
@@ -10,7 +10,7 @@
 @EnableAsync
 public class KafkaApplication {
 
-  public static void main(final String[] args) {
-    SpringApplication.run(KafkaApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(KafkaApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastConfiguration.java b/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastConfiguration.java
index f70dbd50b30..b1630ef2e67 100644
--- a/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastConfiguration.java
+++ b/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastConfiguration.java
@@ -31,302 +31,298 @@
 @Configuration
 public class IastConfiguration {
 
-  public static final String STRING_TOPIC = "iast_string";
-
-  public static final String BYTE_ARRAY_TOPIC = "iast_byteArray";
-
-  public static final String BYTE_BUFFER_TOPIC = "iast_byteBuffer";
-
-  public static final String JSON_TOPIC = "iast_json";
-
-  public static final String REPLY_STRING_TOPIC = "iast_string_reply";
-
-  public static final String REPLY_BYTE_ARRAY_TOPIC = "iast_byteArray_reply";
-
-  public static final String REPLY_BYTE_BUFFER_TOPIC = "iast_byteBuffer_reply";
-
-  public static final String REPLY_JSON_TOPIC = "iast_json_reply";
-
-  @Value("${spring.kafka.bootstrap-servers}")
-  private String boostrapServers;
-
-  @Bean
-  public KafkaAdmin.NewTopics iastTopics() {
-    return new KafkaAdmin.NewTopics(
-        newTopic(STRING_TOPIC),
-        newTopic(BYTE_ARRAY_TOPIC),
-        newTopic(BYTE_BUFFER_TOPIC),
-        newTopic(JSON_TOPIC),
-        newTopic(REPLY_STRING_TOPIC),
-        newTopic(REPLY_BYTE_ARRAY_TOPIC),
-        newTopic(REPLY_BYTE_BUFFER_TOPIC),
-        newTopic(REPLY_JSON_TOPIC));
-  }
-
-  @Bean
-  public DefaultKafkaConsumerFactory<String, String> iastStringConsumer() {
-    return consumerFor(STRING_TOPIC, StringDeserializer.class, StringDeserializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaConsumerFactory<byte[], byte[]> iastByteArrayConsumer() {
-    return consumerFor(BYTE_ARRAY_TOPIC, ByteArrayDeserializer.class, ByteArrayDeserializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaConsumerFactory<ByteBuffer, ByteBuffer> iastByteBufferConsumer() {
-    return consumerFor(
-        BYTE_BUFFER_TOPIC, ByteBufferDeserializer.class, ByteBufferDeserializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaConsumerFactory<IastMessage, IastMessage> iastJsonConsumer() {
-    final Class<? extends Deserializer<IastMessage>> deserializer = jsonDeserializer();
-    return consumerFor(JSON_TOPIC, deserializer, deserializer);
-  }
-
-  @Bean
-  public DefaultKafkaConsumerFactory<String, String> iastReplyStringConsumer() {
-    return consumerFor(REPLY_STRING_TOPIC, StringDeserializer.class, StringDeserializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaConsumerFactory<byte[], String> iastReplyByteArrayConsumer() {
-    return consumerFor(
-        REPLY_BYTE_ARRAY_TOPIC, ByteArrayDeserializer.class, StringDeserializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaConsumerFactory<ByteBuffer, String> iastReplyByteBufferConsumer() {
-    return consumerFor(
-        REPLY_BYTE_BUFFER_TOPIC, ByteBufferDeserializer.class, StringDeserializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaConsumerFactory<IastMessage, String> iastReplyJsonConsumer() {
-    return consumerFor(REPLY_JSON_TOPIC, jsonDeserializer(), StringDeserializer.class);
-  }
-
-  @Bean
-  public ConcurrentKafkaListenerContainerFactory<String, String> iastStringListener() {
-    final ConcurrentKafkaListenerContainerFactory<String, String> factory =
-        new ConcurrentKafkaListenerContainerFactory<>();
-    factory.setConsumerFactory(iastStringConsumer());
-    factory.setReplyTemplate(iastReplyStringTemplate());
-    return factory;
-  }
-
-  @Bean
-  public ConcurrentKafkaListenerContainerFactory<byte[], byte[]> iastByteArrayListener() {
-    final ConcurrentKafkaListenerContainerFactory<byte[], byte[]> factory =
-        new ConcurrentKafkaListenerContainerFactory<>();
-    factory.setConsumerFactory(iastByteArrayConsumer());
-    factory.setReplyTemplate(iastReplyByteArrayTemplate());
-    return factory;
-  }
-
-  @Bean
-  public ConcurrentKafkaListenerContainerFactory<ByteBuffer, ByteBuffer> iastByteBufferListener() {
-    final ConcurrentKafkaListenerContainerFactory<ByteBuffer, ByteBuffer> factory =
-        new ConcurrentKafkaListenerContainerFactory<>();
-    factory.setConsumerFactory(iastByteBufferConsumer());
-    factory.setReplyTemplate(iastReplyByteBufferTemplate());
-    return factory;
-  }
-
-  @Bean
-  public ConcurrentKafkaListenerContainerFactory<IastMessage, IastMessage> iastJsonListener() {
-    final ConcurrentKafkaListenerContainerFactory<IastMessage, IastMessage> factory =
-        new ConcurrentKafkaListenerContainerFactory<>();
-    factory.setConsumerFactory(iastJsonConsumer());
-    factory.setReplyTemplate(iastReplyJsonTemplate());
-    return factory;
-  }
-
-  @Bean
-  public ConcurrentKafkaListenerContainerFactory<String, String> iastReplyStringListener() {
-    final ConcurrentKafkaListenerContainerFactory<String, String> factory =
-        new ConcurrentKafkaListenerContainerFactory<>();
-    factory.setConsumerFactory(iastReplyStringConsumer());
-    return factory;
-  }
-
-  @Bean
-  public ConcurrentKafkaListenerContainerFactory<byte[], String> iastReplyByteArrayListener() {
-    final ConcurrentKafkaListenerContainerFactory<byte[], String> factory =
-        new ConcurrentKafkaListenerContainerFactory<>();
-    factory.setConsumerFactory(iastReplyByteArrayConsumer());
-    return factory;
-  }
-
-  @Bean
-  public ConcurrentKafkaListenerContainerFactory<ByteBuffer, String> iastReplyByteBufferListener() {
-    final ConcurrentKafkaListenerContainerFactory<ByteBuffer, String> factory =
-        new ConcurrentKafkaListenerContainerFactory<>();
-    factory.setConsumerFactory(iastReplyByteBufferConsumer());
-    return factory;
-  }
-
-  @Bean
-  public ConcurrentKafkaListenerContainerFactory<IastMessage, String> iastReplyJsonListener() {
-    final ConcurrentKafkaListenerContainerFactory<IastMessage, String> factory =
-        new ConcurrentKafkaListenerContainerFactory<>();
-    factory.setConsumerFactory(iastReplyJsonConsumer());
-    return factory;
-  }
-
-  @Bean
-  public ConcurrentMessageListenerContainer<String, String> iastReplyStringContainer() {
-    ConcurrentMessageListenerContainer<String, String> repliesContainer =
-        iastReplyStringListener().createContainer(REPLY_STRING_TOPIC);
-    repliesContainer.setAutoStartup(false);
-    return repliesContainer;
-  }
-
-  @Bean
-  public ConcurrentMessageListenerContainer<byte[], String> iastReplyByteArrayContainer() {
-    ConcurrentMessageListenerContainer<byte[], String> repliesContainer =
-        iastReplyByteArrayListener().createContainer(REPLY_BYTE_ARRAY_TOPIC);
-    repliesContainer.setAutoStartup(false);
-    return repliesContainer;
-  }
-
-  @Bean
-  public ConcurrentMessageListenerContainer<ByteBuffer, String> iastReplyByteBufferContainer() {
-    ConcurrentMessageListenerContainer<ByteBuffer, String> repliesContainer =
-        iastReplyByteBufferListener().createContainer(REPLY_BYTE_BUFFER_TOPIC);
-    repliesContainer.setAutoStartup(false);
-    return repliesContainer;
-  }
-
-  @Bean
-  public ConcurrentMessageListenerContainer<IastMessage, String> iastReplyJsonContainer() {
-    ConcurrentMessageListenerContainer<IastMessage, String> repliesContainer =
-        iastReplyJsonListener().createContainer(REPLY_JSON_TOPIC);
-    repliesContainer.setAutoStartup(false);
-    return repliesContainer;
-  }
-
-  @Bean
-  public DefaultKafkaProducerFactory<String, String> iastStringProducer() {
-    return producerFor(StringSerializer.class, StringSerializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaProducerFactory<byte[], byte[]> iastByteArrayProducer() {
-    return producerFor(ByteArraySerializer.class, ByteArraySerializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaProducerFactory<ByteBuffer, ByteBuffer> iastByteBufferProducer() {
-    return producerFor(ByteBufferSerializer.class, ByteBufferSerializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaProducerFactory<IastMessage, IastMessage> iastJsonProducer() {
-    final Class<? extends Serializer<IastMessage>> serializer = jsonSerializer();
-    return producerFor(serializer, serializer);
-  }
-
-  @Bean
-  public DefaultKafkaProducerFactory<String, String> iastReplyStringProducer() {
-    return producerFor(StringSerializer.class, StringSerializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaProducerFactory<byte[], String> iastReplyByteArrayProducer() {
-    return producerFor(ByteArraySerializer.class, StringSerializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaProducerFactory<ByteBuffer, String> iastReplyByteBufferProducer() {
-    return producerFor(ByteBufferSerializer.class, StringSerializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaProducerFactory<IastMessage, String> iastReplyJsonProducer() {
-    return producerFor(jsonSerializer(), StringSerializer.class);
-  }
-
-  @Bean
-  public ReplyingKafkaTemplate<String, String, String> iastStringTemplate() {
-    return new ReplyingKafkaTemplate<>(iastStringProducer(), iastReplyStringContainer());
-  }
-
-  @Bean
-  public ReplyingKafkaTemplate<byte[], byte[], String> iastByteArrayTemplate() {
-    return new ReplyingKafkaTemplate<>(iastByteArrayProducer(), iastReplyByteArrayContainer());
-  }
-
-  @Bean
-  public ReplyingKafkaTemplate<ByteBuffer, ByteBuffer, String> iastByteBufferTemplate() {
-    return new ReplyingKafkaTemplate<>(iastByteBufferProducer(), iastReplyByteBufferContainer());
-  }
-
-  @Bean
-  public ReplyingKafkaTemplate<IastMessage, IastMessage, String> iastJsonTemplate() {
-    return new ReplyingKafkaTemplate<>(iastJsonProducer(), iastReplyJsonContainer());
-  }
-
-  @Bean
-  public KafkaTemplate<String, String> iastReplyStringTemplate() {
-    return new KafkaTemplate<>(iastReplyStringProducer());
-  }
-
-  @Bean
-  public KafkaTemplate<byte[], String> iastReplyByteArrayTemplate() {
-    return new KafkaTemplate<>(iastReplyByteArrayProducer());
-  }
-
-  @Bean
-  public KafkaTemplate<ByteBuffer, String> iastReplyByteBufferTemplate() {
-    return new KafkaTemplate<>(iastReplyByteBufferProducer());
-  }
-
-  @Bean
-  public KafkaTemplate<IastMessage, String> iastReplyJsonTemplate() {
-    return new KafkaTemplate<>(iastReplyJsonProducer());
-  }
-
-  private <K, V> DefaultKafkaProducerFactory<K, V> producerFor(
-      final Class<? extends Serializer<K>> keySerializer,
-      final Class<? extends Serializer<V>> valueSerializer) {
-    final Map<String, Object> configProps = new HashMap<>();
-    configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, boostrapServers);
-    configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, keySerializer);
-    configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, valueSerializer);
-    return new DefaultKafkaProducerFactory<>(configProps);
-  }
-
-  private <K, V> DefaultKafkaConsumerFactory<K, V> consumerFor(
-      final String topic,
-      final Class<? extends Deserializer<K>> keyDeserializer,
-      final Class<? extends Deserializer<V>> valueDeserializer) {
-    final Map<String, Object> config = new HashMap<>();
-    config.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, boostrapServers);
-    config.put(ConsumerConfig.GROUP_ID_CONFIG, topic); // one group per topic
-    config.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, keyDeserializer);
-    config.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, valueDeserializer);
-    if (JsonDeserializer.class.isAssignableFrom(keyDeserializer)
-        || JsonDeserializer.class.isAssignableFrom(valueDeserializer)) {
-      config.put(JsonDeserializer.TRUSTED_PACKAGES, "datadog.*");
-    }
-    return new DefaultKafkaConsumerFactory<>(config);
-  }
-
-  private NewTopic newTopic(final String name) {
-    return TopicBuilder.name(name).partitions(1).replicas(1).build();
-  }
-
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  private Class<? extends Deserializer<IastMessage>> jsonDeserializer() {
-    final Class<? extends Deserializer> type = JsonDeserializer.class;
-    return (Class<? extends Deserializer<IastMessage>>) type;
-  }
-
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  private Class<? extends Serializer<IastMessage>> jsonSerializer() {
-    final Class<? extends Serializer> type = JsonSerializer.class;
-    return (Class<? extends Serializer<IastMessage>>) type;
-  }
+    public static final String STRING_TOPIC = "iast_string";
+
+    public static final String BYTE_ARRAY_TOPIC = "iast_byteArray";
+
+    public static final String BYTE_BUFFER_TOPIC = "iast_byteBuffer";
+
+    public static final String JSON_TOPIC = "iast_json";
+
+    public static final String REPLY_STRING_TOPIC = "iast_string_reply";
+
+    public static final String REPLY_BYTE_ARRAY_TOPIC = "iast_byteArray_reply";
+
+    public static final String REPLY_BYTE_BUFFER_TOPIC = "iast_byteBuffer_reply";
+
+    public static final String REPLY_JSON_TOPIC = "iast_json_reply";
+
+    @Value("${spring.kafka.bootstrap-servers}")
+    private String boostrapServers;
+
+    @Bean
+    public KafkaAdmin.NewTopics iastTopics() {
+        return new KafkaAdmin.NewTopics(
+                newTopic(STRING_TOPIC),
+                newTopic(BYTE_ARRAY_TOPIC),
+                newTopic(BYTE_BUFFER_TOPIC),
+                newTopic(JSON_TOPIC),
+                newTopic(REPLY_STRING_TOPIC),
+                newTopic(REPLY_BYTE_ARRAY_TOPIC),
+                newTopic(REPLY_BYTE_BUFFER_TOPIC),
+                newTopic(REPLY_JSON_TOPIC));
+    }
+
+    @Bean
+    public DefaultKafkaConsumerFactory<String, String> iastStringConsumer() {
+        return consumerFor(STRING_TOPIC, StringDeserializer.class, StringDeserializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaConsumerFactory<byte[], byte[]> iastByteArrayConsumer() {
+        return consumerFor(BYTE_ARRAY_TOPIC, ByteArrayDeserializer.class, ByteArrayDeserializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaConsumerFactory<ByteBuffer, ByteBuffer> iastByteBufferConsumer() {
+        return consumerFor(BYTE_BUFFER_TOPIC, ByteBufferDeserializer.class, ByteBufferDeserializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaConsumerFactory<IastMessage, IastMessage> iastJsonConsumer() {
+        final Class<? extends Deserializer<IastMessage>> deserializer = jsonDeserializer();
+        return consumerFor(JSON_TOPIC, deserializer, deserializer);
+    }
+
+    @Bean
+    public DefaultKafkaConsumerFactory<String, String> iastReplyStringConsumer() {
+        return consumerFor(REPLY_STRING_TOPIC, StringDeserializer.class, StringDeserializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaConsumerFactory<byte[], String> iastReplyByteArrayConsumer() {
+        return consumerFor(REPLY_BYTE_ARRAY_TOPIC, ByteArrayDeserializer.class, StringDeserializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaConsumerFactory<ByteBuffer, String> iastReplyByteBufferConsumer() {
+        return consumerFor(REPLY_BYTE_BUFFER_TOPIC, ByteBufferDeserializer.class, StringDeserializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaConsumerFactory<IastMessage, String> iastReplyJsonConsumer() {
+        return consumerFor(REPLY_JSON_TOPIC, jsonDeserializer(), StringDeserializer.class);
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<String, String> iastStringListener() {
+        final ConcurrentKafkaListenerContainerFactory<String, String> factory =
+                new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(iastStringConsumer());
+        factory.setReplyTemplate(iastReplyStringTemplate());
+        return factory;
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<byte[], byte[]> iastByteArrayListener() {
+        final ConcurrentKafkaListenerContainerFactory<byte[], byte[]> factory =
+                new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(iastByteArrayConsumer());
+        factory.setReplyTemplate(iastReplyByteArrayTemplate());
+        return factory;
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<ByteBuffer, ByteBuffer> iastByteBufferListener() {
+        final ConcurrentKafkaListenerContainerFactory<ByteBuffer, ByteBuffer> factory =
+                new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(iastByteBufferConsumer());
+        factory.setReplyTemplate(iastReplyByteBufferTemplate());
+        return factory;
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<IastMessage, IastMessage> iastJsonListener() {
+        final ConcurrentKafkaListenerContainerFactory<IastMessage, IastMessage> factory =
+                new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(iastJsonConsumer());
+        factory.setReplyTemplate(iastReplyJsonTemplate());
+        return factory;
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<String, String> iastReplyStringListener() {
+        final ConcurrentKafkaListenerContainerFactory<String, String> factory =
+                new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(iastReplyStringConsumer());
+        return factory;
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<byte[], String> iastReplyByteArrayListener() {
+        final ConcurrentKafkaListenerContainerFactory<byte[], String> factory =
+                new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(iastReplyByteArrayConsumer());
+        return factory;
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<ByteBuffer, String> iastReplyByteBufferListener() {
+        final ConcurrentKafkaListenerContainerFactory<ByteBuffer, String> factory =
+                new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(iastReplyByteBufferConsumer());
+        return factory;
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<IastMessage, String> iastReplyJsonListener() {
+        final ConcurrentKafkaListenerContainerFactory<IastMessage, String> factory =
+                new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(iastReplyJsonConsumer());
+        return factory;
+    }
+
+    @Bean
+    public ConcurrentMessageListenerContainer<String, String> iastReplyStringContainer() {
+        ConcurrentMessageListenerContainer<String, String> repliesContainer =
+                iastReplyStringListener().createContainer(REPLY_STRING_TOPIC);
+        repliesContainer.setAutoStartup(false);
+        return repliesContainer;
+    }
+
+    @Bean
+    public ConcurrentMessageListenerContainer<byte[], String> iastReplyByteArrayContainer() {
+        ConcurrentMessageListenerContainer<byte[], String> repliesContainer =
+                iastReplyByteArrayListener().createContainer(REPLY_BYTE_ARRAY_TOPIC);
+        repliesContainer.setAutoStartup(false);
+        return repliesContainer;
+    }
+
+    @Bean
+    public ConcurrentMessageListenerContainer<ByteBuffer, String> iastReplyByteBufferContainer() {
+        ConcurrentMessageListenerContainer<ByteBuffer, String> repliesContainer =
+                iastReplyByteBufferListener().createContainer(REPLY_BYTE_BUFFER_TOPIC);
+        repliesContainer.setAutoStartup(false);
+        return repliesContainer;
+    }
+
+    @Bean
+    public ConcurrentMessageListenerContainer<IastMessage, String> iastReplyJsonContainer() {
+        ConcurrentMessageListenerContainer<IastMessage, String> repliesContainer =
+                iastReplyJsonListener().createContainer(REPLY_JSON_TOPIC);
+        repliesContainer.setAutoStartup(false);
+        return repliesContainer;
+    }
+
+    @Bean
+    public DefaultKafkaProducerFactory<String, String> iastStringProducer() {
+        return producerFor(StringSerializer.class, StringSerializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaProducerFactory<byte[], byte[]> iastByteArrayProducer() {
+        return producerFor(ByteArraySerializer.class, ByteArraySerializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaProducerFactory<ByteBuffer, ByteBuffer> iastByteBufferProducer() {
+        return producerFor(ByteBufferSerializer.class, ByteBufferSerializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaProducerFactory<IastMessage, IastMessage> iastJsonProducer() {
+        final Class<? extends Serializer<IastMessage>> serializer = jsonSerializer();
+        return producerFor(serializer, serializer);
+    }
+
+    @Bean
+    public DefaultKafkaProducerFactory<String, String> iastReplyStringProducer() {
+        return producerFor(StringSerializer.class, StringSerializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaProducerFactory<byte[], String> iastReplyByteArrayProducer() {
+        return producerFor(ByteArraySerializer.class, StringSerializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaProducerFactory<ByteBuffer, String> iastReplyByteBufferProducer() {
+        return producerFor(ByteBufferSerializer.class, StringSerializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaProducerFactory<IastMessage, String> iastReplyJsonProducer() {
+        return producerFor(jsonSerializer(), StringSerializer.class);
+    }
+
+    @Bean
+    public ReplyingKafkaTemplate<String, String, String> iastStringTemplate() {
+        return new ReplyingKafkaTemplate<>(iastStringProducer(), iastReplyStringContainer());
+    }
+
+    @Bean
+    public ReplyingKafkaTemplate<byte[], byte[], String> iastByteArrayTemplate() {
+        return new ReplyingKafkaTemplate<>(iastByteArrayProducer(), iastReplyByteArrayContainer());
+    }
+
+    @Bean
+    public ReplyingKafkaTemplate<ByteBuffer, ByteBuffer, String> iastByteBufferTemplate() {
+        return new ReplyingKafkaTemplate<>(iastByteBufferProducer(), iastReplyByteBufferContainer());
+    }
+
+    @Bean
+    public ReplyingKafkaTemplate<IastMessage, IastMessage, String> iastJsonTemplate() {
+        return new ReplyingKafkaTemplate<>(iastJsonProducer(), iastReplyJsonContainer());
+    }
+
+    @Bean
+    public KafkaTemplate<String, String> iastReplyStringTemplate() {
+        return new KafkaTemplate<>(iastReplyStringProducer());
+    }
+
+    @Bean
+    public KafkaTemplate<byte[], String> iastReplyByteArrayTemplate() {
+        return new KafkaTemplate<>(iastReplyByteArrayProducer());
+    }
+
+    @Bean
+    public KafkaTemplate<ByteBuffer, String> iastReplyByteBufferTemplate() {
+        return new KafkaTemplate<>(iastReplyByteBufferProducer());
+    }
+
+    @Bean
+    public KafkaTemplate<IastMessage, String> iastReplyJsonTemplate() {
+        return new KafkaTemplate<>(iastReplyJsonProducer());
+    }
+
+    private <K, V> DefaultKafkaProducerFactory<K, V> producerFor(
+            final Class<? extends Serializer<K>> keySerializer, final Class<? extends Serializer<V>> valueSerializer) {
+        final Map<String, Object> configProps = new HashMap<>();
+        configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, boostrapServers);
+        configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, keySerializer);
+        configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, valueSerializer);
+        return new DefaultKafkaProducerFactory<>(configProps);
+    }
+
+    private <K, V> DefaultKafkaConsumerFactory<K, V> consumerFor(
+            final String topic,
+            final Class<? extends Deserializer<K>> keyDeserializer,
+            final Class<? extends Deserializer<V>> valueDeserializer) {
+        final Map<String, Object> config = new HashMap<>();
+        config.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, boostrapServers);
+        config.put(ConsumerConfig.GROUP_ID_CONFIG, topic); // one group per topic
+        config.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, keyDeserializer);
+        config.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, valueDeserializer);
+        if (JsonDeserializer.class.isAssignableFrom(keyDeserializer)
+                || JsonDeserializer.class.isAssignableFrom(valueDeserializer)) {
+            config.put(JsonDeserializer.TRUSTED_PACKAGES, "datadog.*");
+        }
+        return new DefaultKafkaConsumerFactory<>(config);
+    }
+
+    private NewTopic newTopic(final String name) {
+        return TopicBuilder.name(name).partitions(1).replicas(1).build();
+    }
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private Class<? extends Deserializer<IastMessage>> jsonDeserializer() {
+        final Class<? extends Deserializer> type = JsonDeserializer.class;
+        return (Class<? extends Deserializer<IastMessage>>) type;
+    }
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private Class<? extends Serializer<IastMessage>> jsonSerializer() {
+        final Class<? extends Serializer> type = JsonSerializer.class;
+        return (Class<? extends Serializer<IastMessage>>) type;
+    }
 }
diff --git a/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastController.java b/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastController.java
index 2d2031ebce4..fe741c3b5eb 100644
--- a/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastController.java
+++ b/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastController.java
@@ -25,143 +25,135 @@
 @Controller
 public class IastController {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(IastController.class);
-
-  private final ReplyingKafkaTemplate<String, String, String> stringTemplate;
-  private final ReplyingKafkaTemplate<byte[], byte[], String> byteArrayTemplate;
-  private final ReplyingKafkaTemplate<ByteBuffer, ByteBuffer, String> byteBufferTemplate;
-  private final ReplyingKafkaTemplate<IastMessage, IastMessage, String> jsonTemplate;
-
-  public IastController(
-      @Qualifier("iastStringTemplate")
-          final ReplyingKafkaTemplate<String, String, String> stringTemplate,
-      @Qualifier("iastByteArrayTemplate")
-          final ReplyingKafkaTemplate<byte[], byte[], String> byteArrayTemplate,
-      @Qualifier("iastByteBufferTemplate")
-          final ReplyingKafkaTemplate<ByteBuffer, ByteBuffer, String> byteBufferTemplate,
-      @Qualifier("iastJsonTemplate")
-          final ReplyingKafkaTemplate<IastMessage, IastMessage, String> jsonTemplate) {
-    this.stringTemplate = stringTemplate;
-    this.byteArrayTemplate = byteArrayTemplate;
-    this.byteBufferTemplate = byteBufferTemplate;
-    this.jsonTemplate = jsonTemplate;
-  }
-
-  @GetMapping("/iast/health")
-  public ResponseEntity<String> health() {
-    return sendAndReceive("health", null, stringTemplate, STRING_TOPIC);
-  }
-
-  @GetMapping("/iast/kafka/string")
-  public ResponseEntity<String> string(@RequestParam("type") final String type) {
-    return sendAndReceive(type, stringTemplate, STRING_TOPIC, Function.identity());
-  }
-
-  @GetMapping("/iast/kafka/byteArray")
-  public ResponseEntity<String> byteArray(@RequestParam("type") final String type) {
-    return sendAndReceive(type, byteArrayTemplate, BYTE_ARRAY_TOPIC, String::getBytes);
-  }
-
-  @GetMapping("/iast/kafka/byteBuffer")
-  public ResponseEntity<String> byteBuffer(@RequestParam("type") final String type) {
-    return sendAndReceive(
-        type, byteBufferTemplate, BYTE_BUFFER_TOPIC, it -> ByteBuffer.wrap(it.getBytes()));
-  }
-
-  @GetMapping("/iast/kafka/json")
-  public ResponseEntity<String> json(@RequestParam("type") final String type) {
-    return sendAndReceive(type, jsonTemplate, JSON_TOPIC, IastMessage::new);
-  }
-
-  @KafkaListener(topics = STRING_TOPIC, containerFactory = "iastStringListener")
-  @SendTo
-  public String listenString(final ConsumerRecord<String, String> record) {
-    String key = record.key();
-    String value = record.value();
-    return handle(STRING_TOPIC, key, value);
-  }
-
-  @KafkaListener(topics = BYTE_ARRAY_TOPIC, containerFactory = "iastByteArrayListener")
-  @SendTo
-  public String listenByteArray(final ConsumerRecord<byte[], byte[]> record) {
-    byte[] key = record.key();
-    byte[] value = record.value();
-    return handle(BYTE_ARRAY_TOPIC, new String(key), value == null ? null : new String(value));
-  }
-
-  @KafkaListener(topics = BYTE_BUFFER_TOPIC, containerFactory = "iastByteBufferListener")
-  @SendTo
-  public String listenByteBuffer(final ConsumerRecord<ByteBuffer, ByteBuffer> record) {
-    ByteBuffer key = record.key();
-    ByteBuffer value = record.value();
-    return handle(
-        BYTE_BUFFER_TOPIC,
-        new String(key.array(), key.arrayOffset(), key.limit()),
-        value == null ? null : new String(value.array(), value.arrayOffset(), value.limit()));
-  }
-
-  @KafkaListener(topics = JSON_TOPIC, containerFactory = "iastJsonListener")
-  @SendTo
-  public String listenJson(final ConsumerRecord<IastMessage, IastMessage> record) {
-    final IastMessage key = record.key();
-    final IastMessage value = record.value();
-    return handle(JSON_TOPIC, key.getValue(), value == null ? null : value.getValue());
-  }
-
-  private <E> ResponseEntity<String> sendAndReceive(
-      final String type,
-      final ReplyingKafkaTemplate<E, E, String> template,
-      final String topic,
-      final Function<String, E> mapper) {
-    final boolean isKey = isKey(type);
-    final String key = isKey ? type : "mock key";
-    final String value = !isKey ? type : "mock value";
-    LOGGER.info("Sending message to {}: {} {}", topic, key, value);
-    return sendAndReceive(mapper.apply(key), mapper.apply(value), template, topic);
-  }
-
-  private <E> ResponseEntity<String> sendAndReceive(
-      final E key,
-      final E value,
-      final ReplyingKafkaTemplate<E, E, String> template,
-      final String topic) {
-    final ProducerRecord<E, E> record = new ProducerRecord<>(topic, key, value);
-    final RequestReplyFuture<E, E, String> future = template.sendAndReceive(record);
-    try {
-      future.getSendFuture().get(10, TimeUnit.SECONDS); // send ok
-      final ConsumerRecord<E, String> reply = future.get(10, TimeUnit.SECONDS); // reply
-      if (reply == null || !"OK".equals(reply.value())) {
-        return ResponseEntity.internalServerError()
-            .body(reply == null ? "REPLY_TIMEOUT" : reply.value());
-      } else {
-        return ResponseEntity.ok("OK");
-      }
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+    private static final Logger LOGGER = LoggerFactory.getLogger(IastController.class);
+
+    private final ReplyingKafkaTemplate<String, String, String> stringTemplate;
+    private final ReplyingKafkaTemplate<byte[], byte[], String> byteArrayTemplate;
+    private final ReplyingKafkaTemplate<ByteBuffer, ByteBuffer, String> byteBufferTemplate;
+    private final ReplyingKafkaTemplate<IastMessage, IastMessage, String> jsonTemplate;
+
+    public IastController(
+            @Qualifier("iastStringTemplate") final ReplyingKafkaTemplate<String, String, String> stringTemplate,
+            @Qualifier("iastByteArrayTemplate") final ReplyingKafkaTemplate<byte[], byte[], String> byteArrayTemplate,
+            @Qualifier("iastByteBufferTemplate")
+                    final ReplyingKafkaTemplate<ByteBuffer, ByteBuffer, String> byteBufferTemplate,
+            @Qualifier("iastJsonTemplate") final ReplyingKafkaTemplate<IastMessage, IastMessage, String> jsonTemplate) {
+        this.stringTemplate = stringTemplate;
+        this.byteArrayTemplate = byteArrayTemplate;
+        this.byteBufferTemplate = byteBufferTemplate;
+        this.jsonTemplate = jsonTemplate;
     }
-  }
-
-  // Intentionally not using logger placeholders to exercise this test case.
-  @SuppressWarnings("StringConcatenationArgumentToLogCall")
-  private String handle(final String topic, final String key, final String value) {
-    LOGGER.info("Received message from {}: {} {}", topic, key, value);
-    if (isKey(key)) {
-      LOGGER.info("Kafka tainted key: " + key);
-      return "OK";
-    } else if (isValue(value)) {
-      LOGGER.info("Kafka tainted value: " + value);
-      return "OK";
-    } else if ("health".equals(key)) {
-      return "OK";
+
+    @GetMapping("/iast/health")
+    public ResponseEntity<String> health() {
+        return sendAndReceive("health", null, stringTemplate, STRING_TOPIC);
+    }
+
+    @GetMapping("/iast/kafka/string")
+    public ResponseEntity<String> string(@RequestParam("type") final String type) {
+        return sendAndReceive(type, stringTemplate, STRING_TOPIC, Function.identity());
     }
-    return "NO_OK";
-  }
 
-  private boolean isKey(final String key) {
-    return key != null && key.endsWith("source_key");
-  }
+    @GetMapping("/iast/kafka/byteArray")
+    public ResponseEntity<String> byteArray(@RequestParam("type") final String type) {
+        return sendAndReceive(type, byteArrayTemplate, BYTE_ARRAY_TOPIC, String::getBytes);
+    }
 
-  private boolean isValue(final String value) {
-    return value != null && value.endsWith("source_value");
-  }
+    @GetMapping("/iast/kafka/byteBuffer")
+    public ResponseEntity<String> byteBuffer(@RequestParam("type") final String type) {
+        return sendAndReceive(type, byteBufferTemplate, BYTE_BUFFER_TOPIC, it -> ByteBuffer.wrap(it.getBytes()));
+    }
+
+    @GetMapping("/iast/kafka/json")
+    public ResponseEntity<String> json(@RequestParam("type") final String type) {
+        return sendAndReceive(type, jsonTemplate, JSON_TOPIC, IastMessage::new);
+    }
+
+    @KafkaListener(topics = STRING_TOPIC, containerFactory = "iastStringListener")
+    @SendTo
+    public String listenString(final ConsumerRecord<String, String> record) {
+        String key = record.key();
+        String value = record.value();
+        return handle(STRING_TOPIC, key, value);
+    }
+
+    @KafkaListener(topics = BYTE_ARRAY_TOPIC, containerFactory = "iastByteArrayListener")
+    @SendTo
+    public String listenByteArray(final ConsumerRecord<byte[], byte[]> record) {
+        byte[] key = record.key();
+        byte[] value = record.value();
+        return handle(BYTE_ARRAY_TOPIC, new String(key), value == null ? null : new String(value));
+    }
+
+    @KafkaListener(topics = BYTE_BUFFER_TOPIC, containerFactory = "iastByteBufferListener")
+    @SendTo
+    public String listenByteBuffer(final ConsumerRecord<ByteBuffer, ByteBuffer> record) {
+        ByteBuffer key = record.key();
+        ByteBuffer value = record.value();
+        return handle(
+                BYTE_BUFFER_TOPIC,
+                new String(key.array(), key.arrayOffset(), key.limit()),
+                value == null ? null : new String(value.array(), value.arrayOffset(), value.limit()));
+    }
+
+    @KafkaListener(topics = JSON_TOPIC, containerFactory = "iastJsonListener")
+    @SendTo
+    public String listenJson(final ConsumerRecord<IastMessage, IastMessage> record) {
+        final IastMessage key = record.key();
+        final IastMessage value = record.value();
+        return handle(JSON_TOPIC, key.getValue(), value == null ? null : value.getValue());
+    }
+
+    private <E> ResponseEntity<String> sendAndReceive(
+            final String type,
+            final ReplyingKafkaTemplate<E, E, String> template,
+            final String topic,
+            final Function<String, E> mapper) {
+        final boolean isKey = isKey(type);
+        final String key = isKey ? type : "mock key";
+        final String value = !isKey ? type : "mock value";
+        LOGGER.info("Sending message to {}: {} {}", topic, key, value);
+        return sendAndReceive(mapper.apply(key), mapper.apply(value), template, topic);
+    }
+
+    private <E> ResponseEntity<String> sendAndReceive(
+            final E key, final E value, final ReplyingKafkaTemplate<E, E, String> template, final String topic) {
+        final ProducerRecord<E, E> record = new ProducerRecord<>(topic, key, value);
+        final RequestReplyFuture<E, E, String> future = template.sendAndReceive(record);
+        try {
+            future.getSendFuture().get(10, TimeUnit.SECONDS); // send ok
+            final ConsumerRecord<E, String> reply = future.get(10, TimeUnit.SECONDS); // reply
+            if (reply == null || !"OK".equals(reply.value())) {
+                return ResponseEntity.internalServerError().body(reply == null ? "REPLY_TIMEOUT" : reply.value());
+            } else {
+                return ResponseEntity.ok("OK");
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    // Intentionally not using logger placeholders to exercise this test case.
+    @SuppressWarnings("StringConcatenationArgumentToLogCall")
+    private String handle(final String topic, final String key, final String value) {
+        LOGGER.info("Received message from {}: {} {}", topic, key, value);
+        if (isKey(key)) {
+            LOGGER.info("Kafka tainted key: " + key);
+            return "OK";
+        } else if (isValue(value)) {
+            LOGGER.info("Kafka tainted value: " + value);
+            return "OK";
+        } else if ("health".equals(key)) {
+            return "OK";
+        }
+        return "NO_OK";
+    }
+
+    private boolean isKey(final String key) {
+        return key != null && key.endsWith("source_key");
+    }
+
+    private boolean isValue(final String value) {
+        return value != null && value.endsWith("source_value");
+    }
 }
diff --git a/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastMessage.java b/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastMessage.java
index 8d9a4edf45f..137e8e88ee8 100644
--- a/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastMessage.java
+++ b/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastMessage.java
@@ -2,19 +2,19 @@
 
 public class IastMessage {
 
-  private String value;
+    private String value;
 
-  public IastMessage() {}
+    public IastMessage() {}
 
-  public IastMessage(final String value) {
-    this.value = value;
-  }
+    public IastMessage(final String value) {
+        this.value = value;
+    }
 
-  public String getValue() {
-    return value;
-  }
+    public String getValue() {
+        return value;
+    }
 
-  public void setValue(String value) {
-    this.value = value;
-  }
+    public void setValue(String value) {
+        this.value = value;
+    }
 }
diff --git a/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/KafkaApplication.java b/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/KafkaApplication.java
index 26a84e8ade2..559397ce2d3 100644
--- a/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/KafkaApplication.java
+++ b/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/KafkaApplication.java
@@ -10,7 +10,7 @@
 @EnableAsync
 public class KafkaApplication {
 
-  public static void main(final String[] args) {
-    SpringApplication.run(KafkaApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(KafkaApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/iast/IastConfiguration.java b/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/iast/IastConfiguration.java
index f70dbd50b30..b1630ef2e67 100644
--- a/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/iast/IastConfiguration.java
+++ b/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/iast/IastConfiguration.java
@@ -31,302 +31,298 @@
 @Configuration
 public class IastConfiguration {
 
-  public static final String STRING_TOPIC = "iast_string";
-
-  public static final String BYTE_ARRAY_TOPIC = "iast_byteArray";
-
-  public static final String BYTE_BUFFER_TOPIC = "iast_byteBuffer";
-
-  public static final String JSON_TOPIC = "iast_json";
-
-  public static final String REPLY_STRING_TOPIC = "iast_string_reply";
-
-  public static final String REPLY_BYTE_ARRAY_TOPIC = "iast_byteArray_reply";
-
-  public static final String REPLY_BYTE_BUFFER_TOPIC = "iast_byteBuffer_reply";
-
-  public static final String REPLY_JSON_TOPIC = "iast_json_reply";
-
-  @Value("${spring.kafka.bootstrap-servers}")
-  private String boostrapServers;
-
-  @Bean
-  public KafkaAdmin.NewTopics iastTopics() {
-    return new KafkaAdmin.NewTopics(
-        newTopic(STRING_TOPIC),
-        newTopic(BYTE_ARRAY_TOPIC),
-        newTopic(BYTE_BUFFER_TOPIC),
-        newTopic(JSON_TOPIC),
-        newTopic(REPLY_STRING_TOPIC),
-        newTopic(REPLY_BYTE_ARRAY_TOPIC),
-        newTopic(REPLY_BYTE_BUFFER_TOPIC),
-        newTopic(REPLY_JSON_TOPIC));
-  }
-
-  @Bean
-  public DefaultKafkaConsumerFactory<String, String> iastStringConsumer() {
-    return consumerFor(STRING_TOPIC, StringDeserializer.class, StringDeserializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaConsumerFactory<byte[], byte[]> iastByteArrayConsumer() {
-    return consumerFor(BYTE_ARRAY_TOPIC, ByteArrayDeserializer.class, ByteArrayDeserializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaConsumerFactory<ByteBuffer, ByteBuffer> iastByteBufferConsumer() {
-    return consumerFor(
-        BYTE_BUFFER_TOPIC, ByteBufferDeserializer.class, ByteBufferDeserializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaConsumerFactory<IastMessage, IastMessage> iastJsonConsumer() {
-    final Class<? extends Deserializer<IastMessage>> deserializer = jsonDeserializer();
-    return consumerFor(JSON_TOPIC, deserializer, deserializer);
-  }
-
-  @Bean
-  public DefaultKafkaConsumerFactory<String, String> iastReplyStringConsumer() {
-    return consumerFor(REPLY_STRING_TOPIC, StringDeserializer.class, StringDeserializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaConsumerFactory<byte[], String> iastReplyByteArrayConsumer() {
-    return consumerFor(
-        REPLY_BYTE_ARRAY_TOPIC, ByteArrayDeserializer.class, StringDeserializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaConsumerFactory<ByteBuffer, String> iastReplyByteBufferConsumer() {
-    return consumerFor(
-        REPLY_BYTE_BUFFER_TOPIC, ByteBufferDeserializer.class, StringDeserializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaConsumerFactory<IastMessage, String> iastReplyJsonConsumer() {
-    return consumerFor(REPLY_JSON_TOPIC, jsonDeserializer(), StringDeserializer.class);
-  }
-
-  @Bean
-  public ConcurrentKafkaListenerContainerFactory<String, String> iastStringListener() {
-    final ConcurrentKafkaListenerContainerFactory<String, String> factory =
-        new ConcurrentKafkaListenerContainerFactory<>();
-    factory.setConsumerFactory(iastStringConsumer());
-    factory.setReplyTemplate(iastReplyStringTemplate());
-    return factory;
-  }
-
-  @Bean
-  public ConcurrentKafkaListenerContainerFactory<byte[], byte[]> iastByteArrayListener() {
-    final ConcurrentKafkaListenerContainerFactory<byte[], byte[]> factory =
-        new ConcurrentKafkaListenerContainerFactory<>();
-    factory.setConsumerFactory(iastByteArrayConsumer());
-    factory.setReplyTemplate(iastReplyByteArrayTemplate());
-    return factory;
-  }
-
-  @Bean
-  public ConcurrentKafkaListenerContainerFactory<ByteBuffer, ByteBuffer> iastByteBufferListener() {
-    final ConcurrentKafkaListenerContainerFactory<ByteBuffer, ByteBuffer> factory =
-        new ConcurrentKafkaListenerContainerFactory<>();
-    factory.setConsumerFactory(iastByteBufferConsumer());
-    factory.setReplyTemplate(iastReplyByteBufferTemplate());
-    return factory;
-  }
-
-  @Bean
-  public ConcurrentKafkaListenerContainerFactory<IastMessage, IastMessage> iastJsonListener() {
-    final ConcurrentKafkaListenerContainerFactory<IastMessage, IastMessage> factory =
-        new ConcurrentKafkaListenerContainerFactory<>();
-    factory.setConsumerFactory(iastJsonConsumer());
-    factory.setReplyTemplate(iastReplyJsonTemplate());
-    return factory;
-  }
-
-  @Bean
-  public ConcurrentKafkaListenerContainerFactory<String, String> iastReplyStringListener() {
-    final ConcurrentKafkaListenerContainerFactory<String, String> factory =
-        new ConcurrentKafkaListenerContainerFactory<>();
-    factory.setConsumerFactory(iastReplyStringConsumer());
-    return factory;
-  }
-
-  @Bean
-  public ConcurrentKafkaListenerContainerFactory<byte[], String> iastReplyByteArrayListener() {
-    final ConcurrentKafkaListenerContainerFactory<byte[], String> factory =
-        new ConcurrentKafkaListenerContainerFactory<>();
-    factory.setConsumerFactory(iastReplyByteArrayConsumer());
-    return factory;
-  }
-
-  @Bean
-  public ConcurrentKafkaListenerContainerFactory<ByteBuffer, String> iastReplyByteBufferListener() {
-    final ConcurrentKafkaListenerContainerFactory<ByteBuffer, String> factory =
-        new ConcurrentKafkaListenerContainerFactory<>();
-    factory.setConsumerFactory(iastReplyByteBufferConsumer());
-    return factory;
-  }
-
-  @Bean
-  public ConcurrentKafkaListenerContainerFactory<IastMessage, String> iastReplyJsonListener() {
-    final ConcurrentKafkaListenerContainerFactory<IastMessage, String> factory =
-        new ConcurrentKafkaListenerContainerFactory<>();
-    factory.setConsumerFactory(iastReplyJsonConsumer());
-    return factory;
-  }
-
-  @Bean
-  public ConcurrentMessageListenerContainer<String, String> iastReplyStringContainer() {
-    ConcurrentMessageListenerContainer<String, String> repliesContainer =
-        iastReplyStringListener().createContainer(REPLY_STRING_TOPIC);
-    repliesContainer.setAutoStartup(false);
-    return repliesContainer;
-  }
-
-  @Bean
-  public ConcurrentMessageListenerContainer<byte[], String> iastReplyByteArrayContainer() {
-    ConcurrentMessageListenerContainer<byte[], String> repliesContainer =
-        iastReplyByteArrayListener().createContainer(REPLY_BYTE_ARRAY_TOPIC);
-    repliesContainer.setAutoStartup(false);
-    return repliesContainer;
-  }
-
-  @Bean
-  public ConcurrentMessageListenerContainer<ByteBuffer, String> iastReplyByteBufferContainer() {
-    ConcurrentMessageListenerContainer<ByteBuffer, String> repliesContainer =
-        iastReplyByteBufferListener().createContainer(REPLY_BYTE_BUFFER_TOPIC);
-    repliesContainer.setAutoStartup(false);
-    return repliesContainer;
-  }
-
-  @Bean
-  public ConcurrentMessageListenerContainer<IastMessage, String> iastReplyJsonContainer() {
-    ConcurrentMessageListenerContainer<IastMessage, String> repliesContainer =
-        iastReplyJsonListener().createContainer(REPLY_JSON_TOPIC);
-    repliesContainer.setAutoStartup(false);
-    return repliesContainer;
-  }
-
-  @Bean
-  public DefaultKafkaProducerFactory<String, String> iastStringProducer() {
-    return producerFor(StringSerializer.class, StringSerializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaProducerFactory<byte[], byte[]> iastByteArrayProducer() {
-    return producerFor(ByteArraySerializer.class, ByteArraySerializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaProducerFactory<ByteBuffer, ByteBuffer> iastByteBufferProducer() {
-    return producerFor(ByteBufferSerializer.class, ByteBufferSerializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaProducerFactory<IastMessage, IastMessage> iastJsonProducer() {
-    final Class<? extends Serializer<IastMessage>> serializer = jsonSerializer();
-    return producerFor(serializer, serializer);
-  }
-
-  @Bean
-  public DefaultKafkaProducerFactory<String, String> iastReplyStringProducer() {
-    return producerFor(StringSerializer.class, StringSerializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaProducerFactory<byte[], String> iastReplyByteArrayProducer() {
-    return producerFor(ByteArraySerializer.class, StringSerializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaProducerFactory<ByteBuffer, String> iastReplyByteBufferProducer() {
-    return producerFor(ByteBufferSerializer.class, StringSerializer.class);
-  }
-
-  @Bean
-  public DefaultKafkaProducerFactory<IastMessage, String> iastReplyJsonProducer() {
-    return producerFor(jsonSerializer(), StringSerializer.class);
-  }
-
-  @Bean
-  public ReplyingKafkaTemplate<String, String, String> iastStringTemplate() {
-    return new ReplyingKafkaTemplate<>(iastStringProducer(), iastReplyStringContainer());
-  }
-
-  @Bean
-  public ReplyingKafkaTemplate<byte[], byte[], String> iastByteArrayTemplate() {
-    return new ReplyingKafkaTemplate<>(iastByteArrayProducer(), iastReplyByteArrayContainer());
-  }
-
-  @Bean
-  public ReplyingKafkaTemplate<ByteBuffer, ByteBuffer, String> iastByteBufferTemplate() {
-    return new ReplyingKafkaTemplate<>(iastByteBufferProducer(), iastReplyByteBufferContainer());
-  }
-
-  @Bean
-  public ReplyingKafkaTemplate<IastMessage, IastMessage, String> iastJsonTemplate() {
-    return new ReplyingKafkaTemplate<>(iastJsonProducer(), iastReplyJsonContainer());
-  }
-
-  @Bean
-  public KafkaTemplate<String, String> iastReplyStringTemplate() {
-    return new KafkaTemplate<>(iastReplyStringProducer());
-  }
-
-  @Bean
-  public KafkaTemplate<byte[], String> iastReplyByteArrayTemplate() {
-    return new KafkaTemplate<>(iastReplyByteArrayProducer());
-  }
-
-  @Bean
-  public KafkaTemplate<ByteBuffer, String> iastReplyByteBufferTemplate() {
-    return new KafkaTemplate<>(iastReplyByteBufferProducer());
-  }
-
-  @Bean
-  public KafkaTemplate<IastMessage, String> iastReplyJsonTemplate() {
-    return new KafkaTemplate<>(iastReplyJsonProducer());
-  }
-
-  private <K, V> DefaultKafkaProducerFactory<K, V> producerFor(
-      final Class<? extends Serializer<K>> keySerializer,
-      final Class<? extends Serializer<V>> valueSerializer) {
-    final Map<String, Object> configProps = new HashMap<>();
-    configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, boostrapServers);
-    configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, keySerializer);
-    configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, valueSerializer);
-    return new DefaultKafkaProducerFactory<>(configProps);
-  }
-
-  private <K, V> DefaultKafkaConsumerFactory<K, V> consumerFor(
-      final String topic,
-      final Class<? extends Deserializer<K>> keyDeserializer,
-      final Class<? extends Deserializer<V>> valueDeserializer) {
-    final Map<String, Object> config = new HashMap<>();
-    config.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, boostrapServers);
-    config.put(ConsumerConfig.GROUP_ID_CONFIG, topic); // one group per topic
-    config.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, keyDeserializer);
-    config.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, valueDeserializer);
-    if (JsonDeserializer.class.isAssignableFrom(keyDeserializer)
-        || JsonDeserializer.class.isAssignableFrom(valueDeserializer)) {
-      config.put(JsonDeserializer.TRUSTED_PACKAGES, "datadog.*");
-    }
-    return new DefaultKafkaConsumerFactory<>(config);
-  }
-
-  private NewTopic newTopic(final String name) {
-    return TopicBuilder.name(name).partitions(1).replicas(1).build();
-  }
-
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  private Class<? extends Deserializer<IastMessage>> jsonDeserializer() {
-    final Class<? extends Deserializer> type = JsonDeserializer.class;
-    return (Class<? extends Deserializer<IastMessage>>) type;
-  }
-
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  private Class<? extends Serializer<IastMessage>> jsonSerializer() {
-    final Class<? extends Serializer> type = JsonSerializer.class;
-    return (Class<? extends Serializer<IastMessage>>) type;
-  }
+    public static final String STRING_TOPIC = "iast_string";
+
+    public static final String BYTE_ARRAY_TOPIC = "iast_byteArray";
+
+    public static final String BYTE_BUFFER_TOPIC = "iast_byteBuffer";
+
+    public static final String JSON_TOPIC = "iast_json";
+
+    public static final String REPLY_STRING_TOPIC = "iast_string_reply";
+
+    public static final String REPLY_BYTE_ARRAY_TOPIC = "iast_byteArray_reply";
+
+    public static final String REPLY_BYTE_BUFFER_TOPIC = "iast_byteBuffer_reply";
+
+    public static final String REPLY_JSON_TOPIC = "iast_json_reply";
+
+    @Value("${spring.kafka.bootstrap-servers}")
+    private String boostrapServers;
+
+    @Bean
+    public KafkaAdmin.NewTopics iastTopics() {
+        return new KafkaAdmin.NewTopics(
+                newTopic(STRING_TOPIC),
+                newTopic(BYTE_ARRAY_TOPIC),
+                newTopic(BYTE_BUFFER_TOPIC),
+                newTopic(JSON_TOPIC),
+                newTopic(REPLY_STRING_TOPIC),
+                newTopic(REPLY_BYTE_ARRAY_TOPIC),
+                newTopic(REPLY_BYTE_BUFFER_TOPIC),
+                newTopic(REPLY_JSON_TOPIC));
+    }
+
+    @Bean
+    public DefaultKafkaConsumerFactory<String, String> iastStringConsumer() {
+        return consumerFor(STRING_TOPIC, StringDeserializer.class, StringDeserializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaConsumerFactory<byte[], byte[]> iastByteArrayConsumer() {
+        return consumerFor(BYTE_ARRAY_TOPIC, ByteArrayDeserializer.class, ByteArrayDeserializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaConsumerFactory<ByteBuffer, ByteBuffer> iastByteBufferConsumer() {
+        return consumerFor(BYTE_BUFFER_TOPIC, ByteBufferDeserializer.class, ByteBufferDeserializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaConsumerFactory<IastMessage, IastMessage> iastJsonConsumer() {
+        final Class<? extends Deserializer<IastMessage>> deserializer = jsonDeserializer();
+        return consumerFor(JSON_TOPIC, deserializer, deserializer);
+    }
+
+    @Bean
+    public DefaultKafkaConsumerFactory<String, String> iastReplyStringConsumer() {
+        return consumerFor(REPLY_STRING_TOPIC, StringDeserializer.class, StringDeserializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaConsumerFactory<byte[], String> iastReplyByteArrayConsumer() {
+        return consumerFor(REPLY_BYTE_ARRAY_TOPIC, ByteArrayDeserializer.class, StringDeserializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaConsumerFactory<ByteBuffer, String> iastReplyByteBufferConsumer() {
+        return consumerFor(REPLY_BYTE_BUFFER_TOPIC, ByteBufferDeserializer.class, StringDeserializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaConsumerFactory<IastMessage, String> iastReplyJsonConsumer() {
+        return consumerFor(REPLY_JSON_TOPIC, jsonDeserializer(), StringDeserializer.class);
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<String, String> iastStringListener() {
+        final ConcurrentKafkaListenerContainerFactory<String, String> factory =
+                new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(iastStringConsumer());
+        factory.setReplyTemplate(iastReplyStringTemplate());
+        return factory;
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<byte[], byte[]> iastByteArrayListener() {
+        final ConcurrentKafkaListenerContainerFactory<byte[], byte[]> factory =
+                new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(iastByteArrayConsumer());
+        factory.setReplyTemplate(iastReplyByteArrayTemplate());
+        return factory;
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<ByteBuffer, ByteBuffer> iastByteBufferListener() {
+        final ConcurrentKafkaListenerContainerFactory<ByteBuffer, ByteBuffer> factory =
+                new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(iastByteBufferConsumer());
+        factory.setReplyTemplate(iastReplyByteBufferTemplate());
+        return factory;
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<IastMessage, IastMessage> iastJsonListener() {
+        final ConcurrentKafkaListenerContainerFactory<IastMessage, IastMessage> factory =
+                new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(iastJsonConsumer());
+        factory.setReplyTemplate(iastReplyJsonTemplate());
+        return factory;
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<String, String> iastReplyStringListener() {
+        final ConcurrentKafkaListenerContainerFactory<String, String> factory =
+                new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(iastReplyStringConsumer());
+        return factory;
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<byte[], String> iastReplyByteArrayListener() {
+        final ConcurrentKafkaListenerContainerFactory<byte[], String> factory =
+                new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(iastReplyByteArrayConsumer());
+        return factory;
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<ByteBuffer, String> iastReplyByteBufferListener() {
+        final ConcurrentKafkaListenerContainerFactory<ByteBuffer, String> factory =
+                new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(iastReplyByteBufferConsumer());
+        return factory;
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<IastMessage, String> iastReplyJsonListener() {
+        final ConcurrentKafkaListenerContainerFactory<IastMessage, String> factory =
+                new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(iastReplyJsonConsumer());
+        return factory;
+    }
+
+    @Bean
+    public ConcurrentMessageListenerContainer<String, String> iastReplyStringContainer() {
+        ConcurrentMessageListenerContainer<String, String> repliesContainer =
+                iastReplyStringListener().createContainer(REPLY_STRING_TOPIC);
+        repliesContainer.setAutoStartup(false);
+        return repliesContainer;
+    }
+
+    @Bean
+    public ConcurrentMessageListenerContainer<byte[], String> iastReplyByteArrayContainer() {
+        ConcurrentMessageListenerContainer<byte[], String> repliesContainer =
+                iastReplyByteArrayListener().createContainer(REPLY_BYTE_ARRAY_TOPIC);
+        repliesContainer.setAutoStartup(false);
+        return repliesContainer;
+    }
+
+    @Bean
+    public ConcurrentMessageListenerContainer<ByteBuffer, String> iastReplyByteBufferContainer() {
+        ConcurrentMessageListenerContainer<ByteBuffer, String> repliesContainer =
+                iastReplyByteBufferListener().createContainer(REPLY_BYTE_BUFFER_TOPIC);
+        repliesContainer.setAutoStartup(false);
+        return repliesContainer;
+    }
+
+    @Bean
+    public ConcurrentMessageListenerContainer<IastMessage, String> iastReplyJsonContainer() {
+        ConcurrentMessageListenerContainer<IastMessage, String> repliesContainer =
+                iastReplyJsonListener().createContainer(REPLY_JSON_TOPIC);
+        repliesContainer.setAutoStartup(false);
+        return repliesContainer;
+    }
+
+    @Bean
+    public DefaultKafkaProducerFactory<String, String> iastStringProducer() {
+        return producerFor(StringSerializer.class, StringSerializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaProducerFactory<byte[], byte[]> iastByteArrayProducer() {
+        return producerFor(ByteArraySerializer.class, ByteArraySerializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaProducerFactory<ByteBuffer, ByteBuffer> iastByteBufferProducer() {
+        return producerFor(ByteBufferSerializer.class, ByteBufferSerializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaProducerFactory<IastMessage, IastMessage> iastJsonProducer() {
+        final Class<? extends Serializer<IastMessage>> serializer = jsonSerializer();
+        return producerFor(serializer, serializer);
+    }
+
+    @Bean
+    public DefaultKafkaProducerFactory<String, String> iastReplyStringProducer() {
+        return producerFor(StringSerializer.class, StringSerializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaProducerFactory<byte[], String> iastReplyByteArrayProducer() {
+        return producerFor(ByteArraySerializer.class, StringSerializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaProducerFactory<ByteBuffer, String> iastReplyByteBufferProducer() {
+        return producerFor(ByteBufferSerializer.class, StringSerializer.class);
+    }
+
+    @Bean
+    public DefaultKafkaProducerFactory<IastMessage, String> iastReplyJsonProducer() {
+        return producerFor(jsonSerializer(), StringSerializer.class);
+    }
+
+    @Bean
+    public ReplyingKafkaTemplate<String, String, String> iastStringTemplate() {
+        return new ReplyingKafkaTemplate<>(iastStringProducer(), iastReplyStringContainer());
+    }
+
+    @Bean
+    public ReplyingKafkaTemplate<byte[], byte[], String> iastByteArrayTemplate() {
+        return new ReplyingKafkaTemplate<>(iastByteArrayProducer(), iastReplyByteArrayContainer());
+    }
+
+    @Bean
+    public ReplyingKafkaTemplate<ByteBuffer, ByteBuffer, String> iastByteBufferTemplate() {
+        return new ReplyingKafkaTemplate<>(iastByteBufferProducer(), iastReplyByteBufferContainer());
+    }
+
+    @Bean
+    public ReplyingKafkaTemplate<IastMessage, IastMessage, String> iastJsonTemplate() {
+        return new ReplyingKafkaTemplate<>(iastJsonProducer(), iastReplyJsonContainer());
+    }
+
+    @Bean
+    public KafkaTemplate<String, String> iastReplyStringTemplate() {
+        return new KafkaTemplate<>(iastReplyStringProducer());
+    }
+
+    @Bean
+    public KafkaTemplate<byte[], String> iastReplyByteArrayTemplate() {
+        return new KafkaTemplate<>(iastReplyByteArrayProducer());
+    }
+
+    @Bean
+    public KafkaTemplate<ByteBuffer, String> iastReplyByteBufferTemplate() {
+        return new KafkaTemplate<>(iastReplyByteBufferProducer());
+    }
+
+    @Bean
+    public KafkaTemplate<IastMessage, String> iastReplyJsonTemplate() {
+        return new KafkaTemplate<>(iastReplyJsonProducer());
+    }
+
+    private <K, V> DefaultKafkaProducerFactory<K, V> producerFor(
+            final Class<? extends Serializer<K>> keySerializer, final Class<? extends Serializer<V>> valueSerializer) {
+        final Map<String, Object> configProps = new HashMap<>();
+        configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, boostrapServers);
+        configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, keySerializer);
+        configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, valueSerializer);
+        return new DefaultKafkaProducerFactory<>(configProps);
+    }
+
+    private <K, V> DefaultKafkaConsumerFactory<K, V> consumerFor(
+            final String topic,
+            final Class<? extends Deserializer<K>> keyDeserializer,
+            final Class<? extends Deserializer<V>> valueDeserializer) {
+        final Map<String, Object> config = new HashMap<>();
+        config.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, boostrapServers);
+        config.put(ConsumerConfig.GROUP_ID_CONFIG, topic); // one group per topic
+        config.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, keyDeserializer);
+        config.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, valueDeserializer);
+        if (JsonDeserializer.class.isAssignableFrom(keyDeserializer)
+                || JsonDeserializer.class.isAssignableFrom(valueDeserializer)) {
+            config.put(JsonDeserializer.TRUSTED_PACKAGES, "datadog.*");
+        }
+        return new DefaultKafkaConsumerFactory<>(config);
+    }
+
+    private NewTopic newTopic(final String name) {
+        return TopicBuilder.name(name).partitions(1).replicas(1).build();
+    }
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private Class<? extends Deserializer<IastMessage>> jsonDeserializer() {
+        final Class<? extends Deserializer> type = JsonDeserializer.class;
+        return (Class<? extends Deserializer<IastMessage>>) type;
+    }
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private Class<? extends Serializer<IastMessage>> jsonSerializer() {
+        final Class<? extends Serializer> type = JsonSerializer.class;
+        return (Class<? extends Serializer<IastMessage>>) type;
+    }
 }
diff --git a/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/iast/IastController.java b/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/iast/IastController.java
index 3defbd5863f..bf730662d9b 100644
--- a/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/iast/IastController.java
+++ b/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/iast/IastController.java
@@ -25,141 +25,133 @@
 @Controller
 public class IastController {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(IastController.class);
-
-  private final ReplyingKafkaTemplate<String, String, String> stringTemplate;
-  private final ReplyingKafkaTemplate<byte[], byte[], String> byteArrayTemplate;
-  private final ReplyingKafkaTemplate<ByteBuffer, ByteBuffer, String> byteBufferTemplate;
-  private final ReplyingKafkaTemplate<IastMessage, IastMessage, String> jsonTemplate;
-
-  public IastController(
-      @Qualifier("iastStringTemplate")
-          final ReplyingKafkaTemplate<String, String, String> stringTemplate,
-      @Qualifier("iastByteArrayTemplate")
-          final ReplyingKafkaTemplate<byte[], byte[], String> byteArrayTemplate,
-      @Qualifier("iastByteBufferTemplate")
-          final ReplyingKafkaTemplate<ByteBuffer, ByteBuffer, String> byteBufferTemplate,
-      @Qualifier("iastJsonTemplate")
-          final ReplyingKafkaTemplate<IastMessage, IastMessage, String> jsonTemplate) {
-    this.stringTemplate = stringTemplate;
-    this.byteArrayTemplate = byteArrayTemplate;
-    this.byteBufferTemplate = byteBufferTemplate;
-    this.jsonTemplate = jsonTemplate;
-  }
-
-  @GetMapping("/iast/health")
-  public ResponseEntity<String> health() {
-    return sendAndReceive("health", null, stringTemplate, STRING_TOPIC);
-  }
-
-  @GetMapping("/iast/kafka/string")
-  public ResponseEntity<String> string(@RequestParam("type") final String type) {
-    return sendAndReceive(type, stringTemplate, STRING_TOPIC, Function.identity());
-  }
-
-  @GetMapping("/iast/kafka/byteArray")
-  public ResponseEntity<String> byteArray(@RequestParam("type") final String type) {
-    return sendAndReceive(type, byteArrayTemplate, BYTE_ARRAY_TOPIC, String::getBytes);
-  }
-
-  @GetMapping("/iast/kafka/byteBuffer")
-  public ResponseEntity<String> byteBuffer(@RequestParam("type") final String type) {
-    return sendAndReceive(
-        type, byteBufferTemplate, BYTE_BUFFER_TOPIC, it -> ByteBuffer.wrap(it.getBytes()));
-  }
-
-  @GetMapping("/iast/kafka/json")
-  public ResponseEntity<String> json(@RequestParam("type") final String type) {
-    return sendAndReceive(type, jsonTemplate, JSON_TOPIC, IastMessage::new);
-  }
-
-  @KafkaListener(topics = STRING_TOPIC, containerFactory = "iastStringListener")
-  @SendTo
-  public String listenString(final ConsumerRecord<String, String> record) {
-    String key = record.key();
-    String value = record.value();
-    return handle(STRING_TOPIC, key, value);
-  }
-
-  @KafkaListener(topics = BYTE_ARRAY_TOPIC, containerFactory = "iastByteArrayListener")
-  @SendTo
-  public String listenByteArray(final ConsumerRecord<byte[], byte[]> record) {
-    byte[] key = record.key();
-    byte[] value = record.value();
-    return handle(BYTE_ARRAY_TOPIC, new String(key), value == null ? null : new String(value));
-  }
-
-  @KafkaListener(topics = BYTE_BUFFER_TOPIC, containerFactory = "iastByteBufferListener")
-  @SendTo
-  public String listenByteBuffer(final ConsumerRecord<ByteBuffer, ByteBuffer> record) {
-    ByteBuffer key = record.key();
-    ByteBuffer value = record.value();
-    return handle(
-        BYTE_BUFFER_TOPIC,
-        new String(key.array(), key.arrayOffset(), key.limit()),
-        value == null ? null : new String(value.array(), value.arrayOffset(), value.limit()));
-  }
-
-  @KafkaListener(topics = JSON_TOPIC, containerFactory = "iastJsonListener")
-  @SendTo
-  public String listenJson(final ConsumerRecord<IastMessage, IastMessage> record) {
-    final IastMessage key = record.key();
-    final IastMessage value = record.value();
-    return handle(JSON_TOPIC, key.getValue(), value == null ? null : value.getValue());
-  }
-
-  private <E> ResponseEntity<String> sendAndReceive(
-      final String type,
-      final ReplyingKafkaTemplate<E, E, String> template,
-      final String topic,
-      final Function<String, E> mapper) {
-    final boolean isKey = isKey(type);
-    final String key = isKey ? type : "mock key";
-    final String value = !isKey ? type : "mock value";
-    LOGGER.info("Sending message to {}: {} {}", topic, key, value);
-    return sendAndReceive(mapper.apply(key), mapper.apply(value), template, topic);
-  }
-
-  private <E> ResponseEntity<String> sendAndReceive(
-      final E key,
-      final E value,
-      final ReplyingKafkaTemplate<E, E, String> template,
-      final String topic) {
-    final ProducerRecord<E, E> record = new ProducerRecord<>(topic, key, value);
-    final RequestReplyFuture<E, E, String> future = template.sendAndReceive(record);
-    try {
-      future.getSendFuture().get(10, TimeUnit.SECONDS); // send ok
-      final ConsumerRecord<E, String> reply = future.get(10, TimeUnit.SECONDS); // reply
-      if (reply == null || !"OK".equals(reply.value())) {
-        return ResponseEntity.internalServerError()
-            .body(reply == null ? "REPLY_TIMEOUT" : reply.value());
-      } else {
-        return ResponseEntity.ok("OK");
-      }
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+    private static final Logger LOGGER = LoggerFactory.getLogger(IastController.class);
+
+    private final ReplyingKafkaTemplate<String, String, String> stringTemplate;
+    private final ReplyingKafkaTemplate<byte[], byte[], String> byteArrayTemplate;
+    private final ReplyingKafkaTemplate<ByteBuffer, ByteBuffer, String> byteBufferTemplate;
+    private final ReplyingKafkaTemplate<IastMessage, IastMessage, String> jsonTemplate;
+
+    public IastController(
+            @Qualifier("iastStringTemplate") final ReplyingKafkaTemplate<String, String, String> stringTemplate,
+            @Qualifier("iastByteArrayTemplate") final ReplyingKafkaTemplate<byte[], byte[], String> byteArrayTemplate,
+            @Qualifier("iastByteBufferTemplate")
+                    final ReplyingKafkaTemplate<ByteBuffer, ByteBuffer, String> byteBufferTemplate,
+            @Qualifier("iastJsonTemplate") final ReplyingKafkaTemplate<IastMessage, IastMessage, String> jsonTemplate) {
+        this.stringTemplate = stringTemplate;
+        this.byteArrayTemplate = byteArrayTemplate;
+        this.byteBufferTemplate = byteBufferTemplate;
+        this.jsonTemplate = jsonTemplate;
     }
-  }
-
-  private String handle(final String topic, final String key, final String value) {
-    LOGGER.info("Received message from {}: {} {}", topic, key, value);
-    if (isKey(key)) {
-      LOGGER.info("Kafka tainted key: " + key);
-      return "OK";
-    } else if (isValue(value)) {
-      LOGGER.info("Kafka tainted value: " + value);
-      return "OK";
-    } else if ("health".equals(key)) {
-      return "OK";
+
+    @GetMapping("/iast/health")
+    public ResponseEntity<String> health() {
+        return sendAndReceive("health", null, stringTemplate, STRING_TOPIC);
+    }
+
+    @GetMapping("/iast/kafka/string")
+    public ResponseEntity<String> string(@RequestParam("type") final String type) {
+        return sendAndReceive(type, stringTemplate, STRING_TOPIC, Function.identity());
     }
-    return "NO_OK";
-  }
 
-  private boolean isKey(final String key) {
-    return key != null && key.endsWith("source_key");
-  }
+    @GetMapping("/iast/kafka/byteArray")
+    public ResponseEntity<String> byteArray(@RequestParam("type") final String type) {
+        return sendAndReceive(type, byteArrayTemplate, BYTE_ARRAY_TOPIC, String::getBytes);
+    }
 
-  private boolean isValue(final String value) {
-    return value != null && value.endsWith("source_value");
-  }
+    @GetMapping("/iast/kafka/byteBuffer")
+    public ResponseEntity<String> byteBuffer(@RequestParam("type") final String type) {
+        return sendAndReceive(type, byteBufferTemplate, BYTE_BUFFER_TOPIC, it -> ByteBuffer.wrap(it.getBytes()));
+    }
+
+    @GetMapping("/iast/kafka/json")
+    public ResponseEntity<String> json(@RequestParam("type") final String type) {
+        return sendAndReceive(type, jsonTemplate, JSON_TOPIC, IastMessage::new);
+    }
+
+    @KafkaListener(topics = STRING_TOPIC, containerFactory = "iastStringListener")
+    @SendTo
+    public String listenString(final ConsumerRecord<String, String> record) {
+        String key = record.key();
+        String value = record.value();
+        return handle(STRING_TOPIC, key, value);
+    }
+
+    @KafkaListener(topics = BYTE_ARRAY_TOPIC, containerFactory = "iastByteArrayListener")
+    @SendTo
+    public String listenByteArray(final ConsumerRecord<byte[], byte[]> record) {
+        byte[] key = record.key();
+        byte[] value = record.value();
+        return handle(BYTE_ARRAY_TOPIC, new String(key), value == null ? null : new String(value));
+    }
+
+    @KafkaListener(topics = BYTE_BUFFER_TOPIC, containerFactory = "iastByteBufferListener")
+    @SendTo
+    public String listenByteBuffer(final ConsumerRecord<ByteBuffer, ByteBuffer> record) {
+        ByteBuffer key = record.key();
+        ByteBuffer value = record.value();
+        return handle(
+                BYTE_BUFFER_TOPIC,
+                new String(key.array(), key.arrayOffset(), key.limit()),
+                value == null ? null : new String(value.array(), value.arrayOffset(), value.limit()));
+    }
+
+    @KafkaListener(topics = JSON_TOPIC, containerFactory = "iastJsonListener")
+    @SendTo
+    public String listenJson(final ConsumerRecord<IastMessage, IastMessage> record) {
+        final IastMessage key = record.key();
+        final IastMessage value = record.value();
+        return handle(JSON_TOPIC, key.getValue(), value == null ? null : value.getValue());
+    }
+
+    private <E> ResponseEntity<String> sendAndReceive(
+            final String type,
+            final ReplyingKafkaTemplate<E, E, String> template,
+            final String topic,
+            final Function<String, E> mapper) {
+        final boolean isKey = isKey(type);
+        final String key = isKey ? type : "mock key";
+        final String value = !isKey ? type : "mock value";
+        LOGGER.info("Sending message to {}: {} {}", topic, key, value);
+        return sendAndReceive(mapper.apply(key), mapper.apply(value), template, topic);
+    }
+
+    private <E> ResponseEntity<String> sendAndReceive(
+            final E key, final E value, final ReplyingKafkaTemplate<E, E, String> template, final String topic) {
+        final ProducerRecord<E, E> record = new ProducerRecord<>(topic, key, value);
+        final RequestReplyFuture<E, E, String> future = template.sendAndReceive(record);
+        try {
+            future.getSendFuture().get(10, TimeUnit.SECONDS); // send ok
+            final ConsumerRecord<E, String> reply = future.get(10, TimeUnit.SECONDS); // reply
+            if (reply == null || !"OK".equals(reply.value())) {
+                return ResponseEntity.internalServerError().body(reply == null ? "REPLY_TIMEOUT" : reply.value());
+            } else {
+                return ResponseEntity.ok("OK");
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private String handle(final String topic, final String key, final String value) {
+        LOGGER.info("Received message from {}: {} {}", topic, key, value);
+        if (isKey(key)) {
+            LOGGER.info("Kafka tainted key: " + key);
+            return "OK";
+        } else if (isValue(value)) {
+            LOGGER.info("Kafka tainted value: " + value);
+            return "OK";
+        } else if ("health".equals(key)) {
+            return "OK";
+        }
+        return "NO_OK";
+    }
+
+    private boolean isKey(final String key) {
+        return key != null && key.endsWith("source_key");
+    }
+
+    private boolean isValue(final String value) {
+        return value != null && value.endsWith("source_value");
+    }
 }
diff --git a/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/iast/IastMessage.java b/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/iast/IastMessage.java
index 8d9a4edf45f..137e8e88ee8 100644
--- a/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/iast/IastMessage.java
+++ b/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/iast/IastMessage.java
@@ -2,19 +2,19 @@
 
 public class IastMessage {
 
-  private String value;
+    private String value;
 
-  public IastMessage() {}
+    public IastMessage() {}
 
-  public IastMessage(final String value) {
-    this.value = value;
-  }
+    public IastMessage(final String value) {
+        this.value = value;
+    }
 
-  public String getValue() {
-    return value;
-  }
+    public String getValue() {
+        return value;
+    }
 
-  public void setValue(String value) {
-    this.value = value;
-  }
+    public void setValue(String value) {
+        this.value = value;
+    }
 }
diff --git a/dd-smoke-tests/lib-injection/src/main/java/datadog/smoketest/Agent.java b/dd-smoke-tests/lib-injection/src/main/java/datadog/smoketest/Agent.java
index d7f69e420ba..3cf84b476a6 100644
--- a/dd-smoke-tests/lib-injection/src/main/java/datadog/smoketest/Agent.java
+++ b/dd-smoke-tests/lib-injection/src/main/java/datadog/smoketest/Agent.java
@@ -4,7 +4,7 @@
 
 /** This class is a stub agent. */
 public class Agent {
-  public static void premain(final String agentArgs, final Instrumentation inst) {
-    // Nothing special to do
-  }
+    public static void premain(final String agentArgs, final Instrumentation inst) {
+        // Nothing special to do
+    }
 }
diff --git a/dd-smoke-tests/lib-injection/src/main/java/datadog/smoketest/Application.java b/dd-smoke-tests/lib-injection/src/main/java/datadog/smoketest/Application.java
index fdc1711fedd..7bdadf87465 100644
--- a/dd-smoke-tests/lib-injection/src/main/java/datadog/smoketest/Application.java
+++ b/dd-smoke-tests/lib-injection/src/main/java/datadog/smoketest/Application.java
@@ -6,14 +6,16 @@
 
 /** This application is a minimalistic application to create spans. */
 public class Application {
-  public static void main(String[] args) throws InterruptedException {
-    // Get an Open Telemetry tracer
-    Tracer tracer = GlobalOpenTelemetry.getTracerProvider().tracerBuilder("smoketests").build();
-    // Create a trace with few spans
-    for (int i = 0; i < 10; i++) {
-      Span span = tracer.spanBuilder("span-" + i).startSpan();
-      Thread.sleep(20);
-      span.end();
+    public static void main(String[] args) throws InterruptedException {
+        // Get an Open Telemetry tracer
+        Tracer tracer = GlobalOpenTelemetry.getTracerProvider()
+                .tracerBuilder("smoketests")
+                .build();
+        // Create a trace with few spans
+        for (int i = 0; i < 10; i++) {
+            Span span = tracer.spanBuilder("span-" + i).startSpan();
+            Thread.sleep(20);
+            span.end();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/BaseApplication.java b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/BaseApplication.java
index 09b82cd8536..dc922e0b614 100644
--- a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/BaseApplication.java
+++ b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/BaseApplication.java
@@ -10,99 +10,87 @@
 import java.util.function.Supplier;
 
 public abstract class BaseApplication {
-  public static final long TIMEOUT_IN_NANOS = TimeUnit.SECONDS.toNanos(30);
+    public static final long TIMEOUT_IN_NANOS = TimeUnit.SECONDS.toNanos(30);
 
-  public abstract void doLog(String message);
+    public abstract void doLog(String message);
 
-  public void run() throws InterruptedException {
-    doLog("BEFORE FIRST SPAN");
+    public void run() throws InterruptedException {
+        doLog("BEFORE FIRST SPAN");
 
-    firstTracedMethod();
+        firstTracedMethod();
 
-    doLog("AFTER FIRST SPAN");
+        doLog("AFTER FIRST SPAN");
 
-    secondTracedMethod();
+        secondTracedMethod();
 
-    if (!waitForCondition(() -> !getLogInjectionEnabled())) {
-      throw new RuntimeException("Logs injection config was never updated");
-    }
+        if (!waitForCondition(() -> !getLogInjectionEnabled())) {
+            throw new RuntimeException("Logs injection config was never updated");
+        }
+
+        thirdTracedMethod();
+
+        if (!waitForCondition(() -> getLogInjectionEnabled())) {
+            throw new RuntimeException("Logs injection config was never updated a second time");
+        }
 
-    thirdTracedMethod();
+        forthTracedMethod();
 
-    if (!waitForCondition(() -> getLogInjectionEnabled())) {
-      throw new RuntimeException("Logs injection config was never updated a second time");
+        // Logs for "AFTER SECOND SPAN" and "AFTER THIRD SPAN" don't exist to avoid the race between
+        // traces and logs. The tester waits for traces before changing config
+        doLog("AFTER FORTH SPAN");
+
+        // Sleep to allow the trace to be reported
+        Thread.sleep(400);
     }
 
-    forthTracedMethod();
+    private static boolean getLogInjectionEnabled() {
+        try {
+            Tracer tracer = GlobalTracer.get();
+            Method captureTraceConfig = tracer.getClass().getMethod("captureTraceConfig");
+            return ((TraceConfig) captureTraceConfig.invoke(tracer)).isLogsInjectionEnabled();
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
-    // Logs for "AFTER SECOND SPAN" and "AFTER THIRD SPAN" don't exist to avoid the race between
-    // traces and logs. The tester waits for traces before changing config
-    doLog("AFTER FORTH SPAN");
+    @Trace
+    public void firstTracedMethod() {
+        doLog("INSIDE FIRST SPAN");
+        System.out.println(
+                "FIRSTTRACEID " + CorrelationIdentifier.getTraceId() + " " + CorrelationIdentifier.getSpanId());
+    }
 
-    // Sleep to allow the trace to be reported
-    Thread.sleep(400);
-  }
+    @Trace
+    public void secondTracedMethod() {
+        doLog("INSIDE SECOND SPAN");
+        System.out.println(
+                "SECONDTRACEID " + CorrelationIdentifier.getTraceId() + " " + CorrelationIdentifier.getSpanId());
+    }
 
-  private static boolean getLogInjectionEnabled() {
-    try {
-      Tracer tracer = GlobalTracer.get();
-      Method captureTraceConfig = tracer.getClass().getMethod("captureTraceConfig");
-      return ((TraceConfig) captureTraceConfig.invoke(tracer)).isLogsInjectionEnabled();
-    } catch (ReflectiveOperationException e) {
-      throw new RuntimeException(e);
+    @Trace
+    public void thirdTracedMethod() {
+        doLog("INSIDE THIRD SPAN");
+        System.out.println(
+                "THIRDTRACEID " + CorrelationIdentifier.getTraceId() + " " + CorrelationIdentifier.getSpanId());
     }
-  }
-
-  @Trace
-  public void firstTracedMethod() {
-    doLog("INSIDE FIRST SPAN");
-    System.out.println(
-        "FIRSTTRACEID "
-            + CorrelationIdentifier.getTraceId()
-            + " "
-            + CorrelationIdentifier.getSpanId());
-  }
-
-  @Trace
-  public void secondTracedMethod() {
-    doLog("INSIDE SECOND SPAN");
-    System.out.println(
-        "SECONDTRACEID "
-            + CorrelationIdentifier.getTraceId()
-            + " "
-            + CorrelationIdentifier.getSpanId());
-  }
-
-  @Trace
-  public void thirdTracedMethod() {
-    doLog("INSIDE THIRD SPAN");
-    System.out.println(
-        "THIRDTRACEID "
-            + CorrelationIdentifier.getTraceId()
-            + " "
-            + CorrelationIdentifier.getSpanId());
-  }
-
-  @Trace
-  public void forthTracedMethod() {
-    doLog("INSIDE FORTH SPAN");
-    System.out.println(
-        "FORTHTRACEID "
-            + CorrelationIdentifier.getTraceId()
-            + " "
-            + CorrelationIdentifier.getSpanId());
-  }
-
-  private static boolean waitForCondition(Supplier<Boolean> condition) throws InterruptedException {
-    long startTime = System.nanoTime();
-    while (System.nanoTime() - startTime < TIMEOUT_IN_NANOS) {
-      if (condition.get()) {
-        return true;
-      }
-
-      Thread.sleep(100);
+
+    @Trace
+    public void forthTracedMethod() {
+        doLog("INSIDE FORTH SPAN");
+        System.out.println(
+                "FORTHTRACEID " + CorrelationIdentifier.getTraceId() + " " + CorrelationIdentifier.getSpanId());
     }
 
-    return false;
-  }
+    private static boolean waitForCondition(Supplier<Boolean> condition) throws InterruptedException {
+        long startTime = System.nanoTime();
+        while (System.nanoTime() - startTime < TIMEOUT_IN_NANOS) {
+            if (condition.get()) {
+                return true;
+            }
+
+            Thread.sleep(100);
+        }
+
+        return false;
+    }
 }
diff --git a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/FloggerInterface.java b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/FloggerInterface.java
index c186ffbaa7a..b30a9073628 100644
--- a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/FloggerInterface.java
+++ b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/FloggerInterface.java
@@ -3,15 +3,15 @@
 import com.google.common.flogger.FluentLogger;
 
 public class FloggerInterface extends BaseApplication {
-  private static final FluentLogger log = FluentLogger.forEnclosingClass();
+    private static final FluentLogger log = FluentLogger.forEnclosingClass();
 
-  public static void main(String[] args) throws InterruptedException {
-    FloggerInterface mainInstance = new FloggerInterface();
-    mainInstance.run();
-  }
+    public static void main(String[] args) throws InterruptedException {
+        FloggerInterface mainInstance = new FloggerInterface();
+        mainInstance.run();
+    }
 
-  @Override
-  public void doLog(String message) {
-    log.atInfo().log(message);
-  }
+    @Override
+    public void doLog(String message) {
+        log.atInfo().log(message);
+    }
 }
diff --git a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/JBossInterface.java b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/JBossInterface.java
index 55609a61e4e..bc8976769c4 100644
--- a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/JBossInterface.java
+++ b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/JBossInterface.java
@@ -3,15 +3,15 @@
 import org.jboss.logging.Logger;
 
 public class JBossInterface extends BaseApplication {
-  private static final Logger log = Logger.getLogger(JBossInterface.class);
+    private static final Logger log = Logger.getLogger(JBossInterface.class);
 
-  public static void main(String[] args) throws InterruptedException {
-    JBossInterface mainInstance = new JBossInterface();
-    mainInstance.run();
-  }
+    public static void main(String[] args) throws InterruptedException {
+        JBossInterface mainInstance = new JBossInterface();
+        mainInstance.run();
+    }
 
-  @Override
-  public void doLog(String message) {
-    log.info(message);
-  }
+    @Override
+    public void doLog(String message) {
+        log.info(message);
+    }
 }
diff --git a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/JCLInterface.java b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/JCLInterface.java
index edd099ccc5c..123940c77b8 100644
--- a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/JCLInterface.java
+++ b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/JCLInterface.java
@@ -4,15 +4,15 @@
 import org.apache.commons.logging.LogFactory;
 
 public class JCLInterface extends BaseApplication {
-  private static final Log log = LogFactory.getLog(JCLInterface.class);
+    private static final Log log = LogFactory.getLog(JCLInterface.class);
 
-  public static void main(String[] args) throws InterruptedException {
-    JCLInterface mainInstance = new JCLInterface();
-    mainInstance.run();
-  }
+    public static void main(String[] args) throws InterruptedException {
+        JCLInterface mainInstance = new JCLInterface();
+        mainInstance.run();
+    }
 
-  @Override
-  public void doLog(String message) {
-    log.info(message);
-  }
+    @Override
+    public void doLog(String message) {
+        log.info(message);
+    }
 }
diff --git a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/JULInterface.java b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/JULInterface.java
index 55eb623e6b7..59b8597f9f7 100644
--- a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/JULInterface.java
+++ b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/JULInterface.java
@@ -3,15 +3,15 @@
 import java.util.logging.Logger;
 
 public class JULInterface extends BaseApplication {
-  private static final Logger log = Logger.getLogger(JULInterface.class.getName());
+    private static final Logger log = Logger.getLogger(JULInterface.class.getName());
 
-  public static void main(String[] args) throws InterruptedException {
-    JULInterface mainInstance = new JULInterface();
-    mainInstance.run();
-  }
+    public static void main(String[] args) throws InterruptedException {
+        JULInterface mainInstance = new JULInterface();
+        mainInstance.run();
+    }
 
-  @Override
-  public void doLog(String message) {
-    log.info(message);
-  }
+    @Override
+    public void doLog(String message) {
+        log.info(message);
+    }
 }
diff --git a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/Log4j1Interface.java b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/Log4j1Interface.java
index 540fd1469ca..36bcdd95708 100644
--- a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/Log4j1Interface.java
+++ b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/Log4j1Interface.java
@@ -3,15 +3,15 @@
 import org.apache.log4j.Logger;
 
 public class Log4j1Interface extends BaseApplication {
-  private static final Logger log = Logger.getLogger(Log4j1Interface.class);
+    private static final Logger log = Logger.getLogger(Log4j1Interface.class);
 
-  public static void main(String[] args) throws InterruptedException {
-    Log4j1Interface mainInstance = new Log4j1Interface();
-    mainInstance.run();
-  }
+    public static void main(String[] args) throws InterruptedException {
+        Log4j1Interface mainInstance = new Log4j1Interface();
+        mainInstance.run();
+    }
 
-  @Override
-  public void doLog(String message) {
-    log.info(message);
-  }
+    @Override
+    public void doLog(String message) {
+        log.info(message);
+    }
 }
diff --git a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/Log4j2Interface.java b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/Log4j2Interface.java
index 3a0ae074220..3ab34eec877 100644
--- a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/Log4j2Interface.java
+++ b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/Log4j2Interface.java
@@ -4,15 +4,15 @@
 import org.apache.logging.log4j.Logger;
 
 public class Log4j2Interface extends BaseApplication {
-  private static final Logger log = LogManager.getLogger(Log4j2Interface.class);
+    private static final Logger log = LogManager.getLogger(Log4j2Interface.class);
 
-  public static void main(String[] args) throws InterruptedException {
-    Log4j2Interface mainInstance = new Log4j2Interface();
-    mainInstance.run();
-  }
+    public static void main(String[] args) throws InterruptedException {
+        Log4j2Interface mainInstance = new Log4j2Interface();
+        mainInstance.run();
+    }
 
-  @Override
-  public void doLog(String message) {
-    log.info(message);
-  }
+    @Override
+    public void doLog(String message) {
+        log.info(message);
+    }
 }
diff --git a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/Slf4jInterface.java b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/Slf4jInterface.java
index 1bc28f73fe5..b6f7ac07424 100644
--- a/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/Slf4jInterface.java
+++ b/dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/Slf4jInterface.java
@@ -4,15 +4,15 @@
 import org.slf4j.LoggerFactory;
 
 public class Slf4jInterface extends BaseApplication {
-  private static final Logger log = LoggerFactory.getLogger(Slf4jInterface.class);
+    private static final Logger log = LoggerFactory.getLogger(Slf4jInterface.class);
 
-  public static void main(String[] args) throws InterruptedException {
-    Slf4jInterface mainInstance = new Slf4jInterface();
-    mainInstance.run();
-  }
+    public static void main(String[] args) throws InterruptedException {
+        Slf4jInterface mainInstance = new Slf4jInterface();
+        mainInstance.run();
+    }
 
-  @Override
-  public void doLog(String message) {
-    log.info(message);
-  }
+    @Override
+    public void doLog(String message) {
+        log.info(message);
+    }
 }
diff --git a/dd-smoke-tests/maven/src/main/java/datadog/smoketest/maven/MavenRunner.java b/dd-smoke-tests/maven/src/main/java/datadog/smoketest/maven/MavenRunner.java
index 9bbb2c998f0..1b27d0c7e88 100644
--- a/dd-smoke-tests/maven/src/main/java/datadog/smoketest/maven/MavenRunner.java
+++ b/dd-smoke-tests/maven/src/main/java/datadog/smoketest/maven/MavenRunner.java
@@ -12,40 +12,38 @@
 
 public class MavenRunner {
 
-  private static final Path DEFAULT_MAVEN_USER_HOME =
-      Paths.get(System.getProperty("user.home")).resolve(".m2");
-
-  private static final String MAVEN_USER_HOME_PROPERTY_KEY = "maven.user.home";
-
-  private static final String MAVEN_USER_HOME_ENV_KEY = "MAVEN_USER_HOME";
-
-  public static void main(String[] args) throws Exception {
-    if (args.length < 2) {
-      throw new IllegalArgumentException(
-          "2 arguments are required: project home, command to execute. "
-              + "Got: "
-              + Arrays.toString(args));
+    private static final Path DEFAULT_MAVEN_USER_HOME =
+            Paths.get(System.getProperty("user.home")).resolve(".m2");
+
+    private static final String MAVEN_USER_HOME_PROPERTY_KEY = "maven.user.home";
+
+    private static final String MAVEN_USER_HOME_ENV_KEY = "MAVEN_USER_HOME";
+
+    public static void main(String[] args) throws Exception {
+        if (args.length < 2) {
+            throw new IllegalArgumentException(
+                    "2 arguments are required: project home, command to execute. " + "Got: " + Arrays.toString(args));
+        }
+
+        Path projectHome = Paths.get(args[0]);
+        String[] command = Arrays.copyOfRange(args, 1, args.length);
+
+        WrapperExecutor wrapperExecutor = WrapperExecutor.forProjectDirectory(projectHome);
+        wrapperExecutor.execute(
+                command,
+                new Installer(
+                        new DefaultDownloader("mvnw", "3.2.0"),
+                        new HashAlgorithmVerifier(),
+                        new PathAssembler(mavenUserHome())),
+                new BootstrapMainStarter());
     }
 
-    Path projectHome = Paths.get(args[0]);
-    String[] command = Arrays.copyOfRange(args, 1, args.length);
-
-    WrapperExecutor wrapperExecutor = WrapperExecutor.forProjectDirectory(projectHome);
-    wrapperExecutor.execute(
-        command,
-        new Installer(
-            new DefaultDownloader("mvnw", "3.2.0"),
-            new HashAlgorithmVerifier(),
-            new PathAssembler(mavenUserHome())),
-        new BootstrapMainStarter());
-  }
-
-  private static Path mavenUserHome() {
-    String mavenUserHome = System.getProperty(MAVEN_USER_HOME_PROPERTY_KEY);
-    if (mavenUserHome == null) {
-      mavenUserHome = System.getenv(MAVEN_USER_HOME_ENV_KEY);
-    }
+    private static Path mavenUserHome() {
+        String mavenUserHome = System.getProperty(MAVEN_USER_HOME_PROPERTY_KEY);
+        if (mavenUserHome == null) {
+            mavenUserHome = System.getenv(MAVEN_USER_HOME_ENV_KEY);
+        }
 
-    return mavenUserHome == null ? DEFAULT_MAVEN_USER_HOME : Paths.get(mavenUserHome);
-  }
+        return mavenUserHome == null ? DEFAULT_MAVEN_USER_HOME : Paths.get(mavenUserHome);
+    }
 }
diff --git a/dd-smoke-tests/maven/src/test/java/datadog/smoketest/MavenSmokeTest.java b/dd-smoke-tests/maven/src/test/java/datadog/smoketest/MavenSmokeTest.java
index 1f8bca1da85..2530999da0a 100644
--- a/dd-smoke-tests/maven/src/test/java/datadog/smoketest/MavenSmokeTest.java
+++ b/dd-smoke-tests/maven/src/test/java/datadog/smoketest/MavenSmokeTest.java
@@ -52,574 +52,538 @@
 import org.tabletest.junit.TypeConverterSources;
 
 @DisabledIf(
-    value = "disabledOnIbm8",
-    disabledReason = "IBM8 has flaky AES-GCM TLS failures when downloading Maven artifacts")
+        value = "disabledOnIbm8",
+        disabledReason = "IBM8 has flaky AES-GCM TLS failures when downloading Maven artifacts")
 @TypeConverterSources(CiVisibilityTableTestConverters.class)
 class MavenSmokeTest extends CiVisibilitySmokeTest {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(MavenSmokeTest.class);
-
-  private static final String LATEST_MAVEN_VERSION = getLatestMavenVersion();
-
-  private static final String TEST_SERVICE_NAME = "test-maven-service";
-
-  private static final int DEPENDENCIES_DOWNLOAD_TIMEOUT_SECS = 120;
-  private static final int PROCESS_TIMEOUT_SECS = 60;
-  private static final int DEPENDENCIES_DOWNLOAD_RETRIES = 5;
-
-  public static boolean disabledOnIbm8() {
-    return JavaVirtualMachine.isIbm8();
-  }
-
-  @TempDir Path projectHome;
-
-  static final MockBackend mockBackend = new MockBackend();
-
-  @BeforeEach
-  void resetMockBackend() {
-    assumeFalse(JavaVirtualMachine.isJavaVersion(27), "JDK 27 TODO: address failing test");
-    mockBackend.reset();
-  }
-
-  @AfterAll
-  static void closeMockBackend() throws Exception {
-    mockBackend.close();
-  }
-
-  @TableTest({
-    "scenario                   | projectName                                       | mavenVersion                 | expectedEvents | expectedCoverages | expectSuccess | testsSkipping | flakyRetries | jacocoCoverage | commandLineParams                                                | minSupportedJavaVersion",
-    "succeed-base               | test_successful_maven_run                         | {3.5.4, 3.6.3, 3.8.8, 3.9.9} | 5              | 1                 | true          | true          | false        | true           | []                                                               | 8                      ",
-    "succeed-surefire-3.0.0-j8  | test_successful_maven_run_surefire_3_0_0          | 3.9.9                        | 5              | 1                 | true          | true          | false        | true           | []                                                               | 8                      ",
-    "succeed-surefire-3.0.0-j17 | test_successful_maven_run_surefire_3_0_0          | latest                       | 5              | 1                 | true          | true          | false        | true           | []                                                               | 17                     ",
-    "succeed-surefire-3.5.0-j8  | test_successful_maven_run_surefire_3_5_0          | 3.9.9                        | 5              | 1                 | true          | true          | false        | true           | []                                                               | 8                      ",
-    "succeed-surefire-3.5.0-j17 | test_successful_maven_run_surefire_3_5_0          | latest                       | 5              | 1                 | true          | true          | false        | true           | []                                                               | 17                     ",
-    "succeed-builtin-coverage   | test_successful_maven_run_builtin_coverage        | 3.9.9                        | 5              | 1                 | true          | true          | false        | false          | []                                                               | 8                      ",
-    "succeed-jacoco-argline     | test_successful_maven_run_with_jacoco_and_argline | 3.9.9                        | 5              | 1                 | true          | true          | false        | true           | []                                                               | 8                      ",
-    "succeed-cucumber           | test_successful_maven_run_with_cucumber           | 3.9.9                        | 4              | 1                 | true          | false         | false        | true           | []                                                               | 8                      ",
-    "failed-flaky-retries       | test_failed_maven_run_flaky_retries               | 3.9.9                        | 8              | 5                 | false         | false         | true         | true           | []                                                               | 8                      ",
-    "cucumber-suite-flaky       | test_maven_run_cucumber_suite_flaky_retries       | 3.9.9                        | 8              | 5                 | false         | false         | true         | false          | []                                                               | 17                     ",
-    "succeed-junit-platform     | test_successful_maven_run_junit_platform_runner   | 3.9.9                        | 4              | 0                 | true          | false         | false        | false          | []                                                               | 8                      ",
-    "succeed-arg-line-property  | test_successful_maven_run_with_arg_line_property  | 3.9.9                        | 4              | 0                 | true          | false         | false        | false          | [\"-DargLine='-Dmy-custom-property=provided-via-command-line'\"] | 8                      ",
-    "succeed-multi-forks-j8     | test_successful_maven_run_multiple_forks          | 3.9.9                        | 5              | 1                 | true          | true          | false        | true           | []                                                               | 8                      ",
-    "succeed-multi-forks-j17    | test_successful_maven_run_multiple_forks          | latest                       | 5              | 1                 | true          | true          | false        | true           | []                                                               | 17                     "
-  })
-  @ParameterizedTest
-  void testMavenRun(
-      String projectName,
-      String mavenVersion,
-      int expectedEvents,
-      int expectedCoverages,
-      boolean expectSuccess,
-      boolean testsSkipping,
-      boolean flakyRetries,
-      boolean jacocoCoverage,
-      List<String> commandLineParams,
-      int minSupportedJavaVersion)
-      throws Exception {
-    mavenVersion = resolveLatestMaven(mavenVersion);
-    System.out.println("Starting: " + projectName + " " + mavenVersion);
-    assumeTrue(
-        JavaVirtualMachine.isJavaVersionAtLeast(minSupportedJavaVersion),
-        "Current JVM is not compatible with minimum required version " + minSupportedJavaVersion);
-
-    givenWrapperPropertiesFile(mavenVersion);
-    givenMavenProjectFiles(projectName);
-    givenMavenDependenciesAreLoaded(projectName, mavenVersion);
-
-    mockBackend.givenFlakyRetries(flakyRetries);
-    mockBackend.givenFlakyTest(
-        "Maven Smoke Tests Project maven-surefire-plugin default-test",
-        "datadog.smoke.TestFailed",
-        "test_failed");
-    mockBackend.givenFlakyTest(
-        "Maven Smoke Tests Project maven-surefire-plugin default-test",
-        "classpath:datadog/smoke/basic_arithmetic.feature:Basic Arithmetic",
-        "Basic Arithmetic - Addition"); // cucumber.junit-platform.naming-strategy=long
-
-    mockBackend.givenTestsSkipping(testsSkipping);
-    mockBackend.givenSkippableTest(
-        "Maven Smoke Tests Project maven-surefire-plugin default-test",
-        "datadog.smoke.TestSucceed",
-        "test_to_skip_with_itr",
-        Collections.singletonMap("src/main/java/datadog/smoke/Calculator.java", bits(9)));
-
-    mockBackend.givenImpactedTestsDetection(true);
-
-    boolean coverageReportExpected =
-        jacocoCoverage
-            && CiVisibilitySmokeTest.class
-                    .getClassLoader()
-                    .getResource(projectName + "/coverage_report_event.ftl")
-                != null;
-    if (coverageReportExpected) {
-      mockBackend.givenCodeCoverageReportUpload(true);
+    private static final Logger LOGGER = LoggerFactory.getLogger(MavenSmokeTest.class);
+
+    private static final String LATEST_MAVEN_VERSION = getLatestMavenVersion();
+
+    private static final String TEST_SERVICE_NAME = "test-maven-service";
+
+    private static final int DEPENDENCIES_DOWNLOAD_TIMEOUT_SECS = 120;
+    private static final int PROCESS_TIMEOUT_SECS = 60;
+    private static final int DEPENDENCIES_DOWNLOAD_RETRIES = 5;
+
+    public static boolean disabledOnIbm8() {
+        return JavaVirtualMachine.isIbm8();
     }
 
-    Map<String, String> agentArgs =
-        jacocoCoverage
-            ? Collections.singletonMap(
-                CiVisibilityConfig.CIVISIBILITY_JACOCO_PLUGIN_VERSION, JACOCO_PLUGIN_VERSION)
-            : Collections.emptyMap();
-    int exitCode =
-        whenRunningMavenBuild(agentArgs, commandLineParams, Collections.emptyMap(), true);
-
-    if (expectSuccess) {
-      assertEquals(0, exitCode);
-    } else {
-      assertNotEquals(0, exitCode);
+    @TempDir
+    Path projectHome;
+
+    static final MockBackend mockBackend = new MockBackend();
+
+    @BeforeEach
+    void resetMockBackend() {
+        assumeFalse(JavaVirtualMachine.isJavaVersion(27), "JDK 27 TODO: address failing test");
+        mockBackend.reset();
     }
 
-    verifyEventsAndCoverages(
-        projectName,
-        "maven",
-        mavenVersion,
-        mockBackend.waitForEvents(expectedEvents),
-        mockBackend.waitForCoverages(expectedCoverages));
-    verifyTelemetryMetrics(
-        mockBackend.getAllReceivedTelemetryMetrics(),
-        mockBackend.getAllReceivedTelemetryDistributions(),
-        expectedEvents);
-
-    if (coverageReportExpected) {
-      List<datadog.trace.civisibility.CiVisibilityTestUtils.CoverageReport> reports =
-          mockBackend.waitForCoverageReports(1);
-      String realProjectHome = projectHome.toRealPath().toString();
-      verifyCoverageReports(
-          projectName, reports, Collections.singletonMap("ci_workspace_path", realProjectHome));
+    @AfterAll
+    static void closeMockBackend() throws Exception {
+        mockBackend.close();
     }
-  }
-
-  @TableTest({
-    "scenario        | projectName                               | mavenVersion",
-    "test-management | test_successful_maven_run_test_management | 3.9.9       "
-  })
-  @ParameterizedTest
-  void testTestManagement(String projectName, String mavenVersion) throws Exception {
-    givenWrapperPropertiesFile(mavenVersion);
-    givenMavenProjectFiles(projectName);
-    givenMavenDependenciesAreLoaded(projectName, mavenVersion);
-
-    mockBackend.givenTestManagement(true);
-    mockBackend.givenAttemptToFixRetries(5);
-
-    mockBackend.givenQuarantinedTests(
-        "Maven Smoke Tests Project maven-surefire-plugin default-test",
-        "datadog.smoke.TestFailed",
-        "test_failed");
-
-    mockBackend.givenDisabledTests(
-        "Maven Smoke Tests Project maven-surefire-plugin default-test",
-        "datadog.smoke.TestSucceeded",
-        "test_succeeded");
-
-    mockBackend.givenAttemptToFixTests(
-        "Maven Smoke Tests Project maven-surefire-plugin default-test",
-        "datadog.smoke.TestSucceeded",
-        "test_another_succeeded");
-
-    int exitCode =
-        whenRunningMavenBuild(
-            Collections.emptyMap(), Collections.emptyList(), Collections.emptyMap(), true);
-    assertEquals(0, exitCode);
-
-    verifyEventsAndCoverages(
-        projectName,
-        "maven",
-        mavenVersion,
-        mockBackend.waitForEvents(11),
-        mockBackend.waitForCoverages(3));
-  }
-
-  @TableTest({
-    "scenario                         | projectName                                              | mavenVersion | surefireVersion       | flakyTests                                                                                                                                | knownTests                                                                                                                                | expectedOrder                                                                                                                                                                                                                                                                              | eventsNumber",
-    "junit4-provider                  | test_successful_maven_run_junit4_class_ordering          | 3.9.9        | 3.0.0                 | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed'] | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed'] | ['datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedC:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another'] | 15          ",
-    "junit47-provider                 | test_successful_maven_run_junit4_class_ordering_parallel | 3.9.9        | 3.0.0                 | ['datadog.smoke.TestSucceedC:test_succeed']                                                                                               | ['datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedA:test_succeed']                                                    | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedA:test_succeed']                                                                                                                                                          | 12          ",
-    "junit4-provider-latest-surefire  | test_successful_maven_run_junit4_class_ordering          | 3.9.9        | latest-maven-surefire | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed'] | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed'] | ['datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedC:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another'] | 15          ",
-    "junit47-provider-latest-surefire | test_successful_maven_run_junit4_class_ordering_parallel | 3.9.9        | latest-maven-surefire | ['datadog.smoke.TestSucceedC:test_succeed']                                                                                               | ['datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedA:test_succeed']                                                    | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedA:test_succeed']                                                                                                                                                          | 12          "
-  })
-  @ParameterizedTest
-  void testJunit4ClassOrdering(
-      String projectName,
-      String mavenVersion,
-      String surefireVersion,
-      List<TestFQN> flakyTests,
-      List<TestFQN> knownTests,
-      List<TestFQN> expectedOrder,
-      int eventsNumber)
-      throws Exception {
-    surefireVersion =
-        "latest-maven-surefire".equals(surefireVersion)
-            ? getLatestMavenSurefireVersion()
-            : surefireVersion;
-    Map<String, String> additionalEnvVars = new HashMap<>();
-    additionalEnvVars.put("SMOKE_TEST_SUREFIRE_VERSION", surefireVersion);
-
-    givenWrapperPropertiesFile(mavenVersion);
-    givenMavenProjectFiles(projectName);
-    givenMavenDependenciesAreLoaded(projectName, mavenVersion, additionalEnvVars);
-
-    for (TestFQN flakyTest : flakyTests) {
-      mockBackend.givenFlakyTest(
-          "Maven Smoke Tests Project maven-surefire-plugin default-test",
-          flakyTest.getSuite(),
-          flakyTest.getName());
+
+    @TableTest({
+      "scenario                   | projectName                                       | mavenVersion                 | expectedEvents | expectedCoverages | expectSuccess | testsSkipping | flakyRetries | jacocoCoverage | commandLineParams                                                | minSupportedJavaVersion",
+      "succeed-base               | test_successful_maven_run                         | {3.5.4, 3.6.3, 3.8.8, 3.9.9} | 5              | 1                 | true          | true          | false        | true           | []                                                               | 8                      ",
+      "succeed-surefire-3.0.0-j8  | test_successful_maven_run_surefire_3_0_0          | 3.9.9                        | 5              | 1                 | true          | true          | false        | true           | []                                                               | 8                      ",
+      "succeed-surefire-3.0.0-j17 | test_successful_maven_run_surefire_3_0_0          | latest                       | 5              | 1                 | true          | true          | false        | true           | []                                                               | 17                     ",
+      "succeed-surefire-3.5.0-j8  | test_successful_maven_run_surefire_3_5_0          | 3.9.9                        | 5              | 1                 | true          | true          | false        | true           | []                                                               | 8                      ",
+      "succeed-surefire-3.5.0-j17 | test_successful_maven_run_surefire_3_5_0          | latest                       | 5              | 1                 | true          | true          | false        | true           | []                                                               | 17                     ",
+      "succeed-builtin-coverage   | test_successful_maven_run_builtin_coverage        | 3.9.9                        | 5              | 1                 | true          | true          | false        | false          | []                                                               | 8                      ",
+      "succeed-jacoco-argline     | test_successful_maven_run_with_jacoco_and_argline | 3.9.9                        | 5              | 1                 | true          | true          | false        | true           | []                                                               | 8                      ",
+      "succeed-cucumber           | test_successful_maven_run_with_cucumber           | 3.9.9                        | 4              | 1                 | true          | false         | false        | true           | []                                                               | 8                      ",
+      "failed-flaky-retries       | test_failed_maven_run_flaky_retries               | 3.9.9                        | 8              | 5                 | false         | false         | true         | true           | []                                                               | 8                      ",
+      "cucumber-suite-flaky       | test_maven_run_cucumber_suite_flaky_retries       | 3.9.9                        | 8              | 5                 | false         | false         | true         | false          | []                                                               | 17                     ",
+      "succeed-junit-platform     | test_successful_maven_run_junit_platform_runner   | 3.9.9                        | 4              | 0                 | true          | false         | false        | false          | []                                                               | 8                      ",
+      "succeed-arg-line-property  | test_successful_maven_run_with_arg_line_property  | 3.9.9                        | 4              | 0                 | true          | false         | false        | false          | [\"-DargLine='-Dmy-custom-property=provided-via-command-line'\"] | 8                      ",
+      "succeed-multi-forks-j8     | test_successful_maven_run_multiple_forks          | 3.9.9                        | 5              | 1                 | true          | true          | false        | true           | []                                                               | 8                      ",
+      "succeed-multi-forks-j17    | test_successful_maven_run_multiple_forks          | latest                       | 5              | 1                 | true          | true          | false        | true           | []                                                               | 17                     "
+    })
+    @ParameterizedTest
+    void testMavenRun(
+            String projectName,
+            String mavenVersion,
+            int expectedEvents,
+            int expectedCoverages,
+            boolean expectSuccess,
+            boolean testsSkipping,
+            boolean flakyRetries,
+            boolean jacocoCoverage,
+            List<String> commandLineParams,
+            int minSupportedJavaVersion)
+            throws Exception {
+        mavenVersion = resolveLatestMaven(mavenVersion);
+        System.out.println("Starting: " + projectName + " " + mavenVersion);
+        assumeTrue(
+                JavaVirtualMachine.isJavaVersionAtLeast(minSupportedJavaVersion),
+                "Current JVM is not compatible with minimum required version " + minSupportedJavaVersion);
+
+        givenWrapperPropertiesFile(mavenVersion);
+        givenMavenProjectFiles(projectName);
+        givenMavenDependenciesAreLoaded(projectName, mavenVersion);
+
+        mockBackend.givenFlakyRetries(flakyRetries);
+        mockBackend.givenFlakyTest(
+                "Maven Smoke Tests Project maven-surefire-plugin default-test",
+                "datadog.smoke.TestFailed",
+                "test_failed");
+        mockBackend.givenFlakyTest(
+                "Maven Smoke Tests Project maven-surefire-plugin default-test",
+                "classpath:datadog/smoke/basic_arithmetic.feature:Basic Arithmetic",
+                "Basic Arithmetic - Addition"); // cucumber.junit-platform.naming-strategy=long
+
+        mockBackend.givenTestsSkipping(testsSkipping);
+        mockBackend.givenSkippableTest(
+                "Maven Smoke Tests Project maven-surefire-plugin default-test",
+                "datadog.smoke.TestSucceed",
+                "test_to_skip_with_itr",
+                Collections.singletonMap("src/main/java/datadog/smoke/Calculator.java", bits(9)));
+
+        mockBackend.givenImpactedTestsDetection(true);
+
+        boolean coverageReportExpected = jacocoCoverage
+                && CiVisibilitySmokeTest.class.getClassLoader().getResource(projectName + "/coverage_report_event.ftl")
+                        != null;
+        if (coverageReportExpected) {
+            mockBackend.givenCodeCoverageReportUpload(true);
+        }
+
+        Map<String, String> agentArgs = jacocoCoverage
+                ? Collections.singletonMap(CiVisibilityConfig.CIVISIBILITY_JACOCO_PLUGIN_VERSION, JACOCO_PLUGIN_VERSION)
+                : Collections.emptyMap();
+        int exitCode = whenRunningMavenBuild(agentArgs, commandLineParams, Collections.emptyMap(), true);
+
+        if (expectSuccess) {
+            assertEquals(0, exitCode);
+        } else {
+            assertNotEquals(0, exitCode);
+        }
+
+        verifyEventsAndCoverages(
+                projectName,
+                "maven",
+                mavenVersion,
+                mockBackend.waitForEvents(expectedEvents),
+                mockBackend.waitForCoverages(expectedCoverages));
+        verifyTelemetryMetrics(
+                mockBackend.getAllReceivedTelemetryMetrics(),
+                mockBackend.getAllReceivedTelemetryDistributions(),
+                expectedEvents);
+
+        if (coverageReportExpected) {
+            List<datadog.trace.civisibility.CiVisibilityTestUtils.CoverageReport> reports =
+                    mockBackend.waitForCoverageReports(1);
+            String realProjectHome = projectHome.toRealPath().toString();
+            verifyCoverageReports(projectName, reports, Collections.singletonMap("ci_workspace_path", realProjectHome));
+        }
+    }
+
+    @TableTest({
+      "scenario        | projectName                               | mavenVersion",
+      "test-management | test_successful_maven_run_test_management | 3.9.9       "
+    })
+    @ParameterizedTest
+    void testTestManagement(String projectName, String mavenVersion) throws Exception {
+        givenWrapperPropertiesFile(mavenVersion);
+        givenMavenProjectFiles(projectName);
+        givenMavenDependenciesAreLoaded(projectName, mavenVersion);
+
+        mockBackend.givenTestManagement(true);
+        mockBackend.givenAttemptToFixRetries(5);
+
+        mockBackend.givenQuarantinedTests(
+                "Maven Smoke Tests Project maven-surefire-plugin default-test",
+                "datadog.smoke.TestFailed",
+                "test_failed");
+
+        mockBackend.givenDisabledTests(
+                "Maven Smoke Tests Project maven-surefire-plugin default-test",
+                "datadog.smoke.TestSucceeded",
+                "test_succeeded");
+
+        mockBackend.givenAttemptToFixTests(
+                "Maven Smoke Tests Project maven-surefire-plugin default-test",
+                "datadog.smoke.TestSucceeded",
+                "test_another_succeeded");
+
+        int exitCode =
+                whenRunningMavenBuild(Collections.emptyMap(), Collections.emptyList(), Collections.emptyMap(), true);
+        assertEquals(0, exitCode);
+
+        verifyEventsAndCoverages(
+                projectName, "maven", mavenVersion, mockBackend.waitForEvents(11), mockBackend.waitForCoverages(3));
     }
 
-    mockBackend.givenKnownTests(true);
-    for (TestFQN knownTest : knownTests) {
-      mockBackend.givenKnownTest(
-          "Maven Smoke Tests Project maven-surefire-plugin default-test",
-          knownTest.getSuite(),
-          knownTest.getName());
+    @TableTest({
+      "scenario                         | projectName                                              | mavenVersion | surefireVersion       | flakyTests                                                                                                                                | knownTests                                                                                                                                | expectedOrder                                                                                                                                                                                                                                                                              | eventsNumber",
+      "junit4-provider                  | test_successful_maven_run_junit4_class_ordering          | 3.9.9        | 3.0.0                 | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed'] | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed'] | ['datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedC:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another'] | 15          ",
+      "junit47-provider                 | test_successful_maven_run_junit4_class_ordering_parallel | 3.9.9        | 3.0.0                 | ['datadog.smoke.TestSucceedC:test_succeed']                                                                                               | ['datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedA:test_succeed']                                                    | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedA:test_succeed']                                                                                                                                                          | 12          ",
+      "junit4-provider-latest-surefire  | test_successful_maven_run_junit4_class_ordering          | 3.9.9        | latest-maven-surefire | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed'] | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed'] | ['datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedC:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed_another', 'datadog.smoke.TestSucceedA:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedB:test_succeed_another'] | 15          ",
+      "junit47-provider-latest-surefire | test_successful_maven_run_junit4_class_ordering_parallel | 3.9.9        | latest-maven-surefire | ['datadog.smoke.TestSucceedC:test_succeed']                                                                                               | ['datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedA:test_succeed']                                                    | ['datadog.smoke.TestSucceedB:test_succeed', 'datadog.smoke.TestSucceedC:test_succeed', 'datadog.smoke.TestSucceedA:test_succeed']                                                                                                                                                          | 12          "
+    })
+    @ParameterizedTest
+    void testJunit4ClassOrdering(
+            String projectName,
+            String mavenVersion,
+            String surefireVersion,
+            List<TestFQN> flakyTests,
+            List<TestFQN> knownTests,
+            List<TestFQN> expectedOrder,
+            int eventsNumber)
+            throws Exception {
+        surefireVersion =
+                "latest-maven-surefire".equals(surefireVersion) ? getLatestMavenSurefireVersion() : surefireVersion;
+        Map<String, String> additionalEnvVars = new HashMap<>();
+        additionalEnvVars.put("SMOKE_TEST_SUREFIRE_VERSION", surefireVersion);
+
+        givenWrapperPropertiesFile(mavenVersion);
+        givenMavenProjectFiles(projectName);
+        givenMavenDependenciesAreLoaded(projectName, mavenVersion, additionalEnvVars);
+
+        for (TestFQN flakyTest : flakyTests) {
+            mockBackend.givenFlakyTest(
+                    "Maven Smoke Tests Project maven-surefire-plugin default-test",
+                    flakyTest.getSuite(),
+                    flakyTest.getName());
+        }
+
+        mockBackend.givenKnownTests(true);
+        for (TestFQN knownTest : knownTests) {
+            mockBackend.givenKnownTest(
+                    "Maven Smoke Tests Project maven-surefire-plugin default-test",
+                    knownTest.getSuite(),
+                    knownTest.getName());
+        }
+
+        int exitCode = whenRunningMavenBuild(
+                Collections.singletonMap(CiVisibilityConfig.CIVISIBILITY_TEST_ORDER, CIConstants.FAIL_FAST_TEST_ORDER),
+                Collections.emptyList(),
+                additionalEnvVars,
+                true);
+        assertEquals(0, exitCode);
+
+        verifyTestOrder(mockBackend.waitForEvents(eventsNumber), expectedOrder);
+    }
+
+    @TableTest({
+      "scenario                  | projectName                                         | mavenVersion",
+      "child-service-propagation | test_successful_maven_run_child_service_propagation | 3.9.9       "
+    })
+    @ParameterizedTest
+    void testServiceNamePropagation(String projectName, String mavenVersion) throws Exception {
+        givenWrapperPropertiesFile(mavenVersion);
+        givenMavenProjectFiles(projectName);
+        givenMavenDependenciesAreLoaded(projectName, mavenVersion);
+
+        int exitCode =
+                whenRunningMavenBuild(Collections.emptyMap(), Collections.emptyList(), Collections.emptyMap(), false);
+        assertEquals(0, exitCode);
+
+        List<String> additionalDynamicPaths = Collections.singletonList("content.service");
+        verifyEventsAndCoverages(
+                projectName,
+                "maven",
+                mavenVersion,
+                mockBackend.waitForEvents(5),
+                mockBackend.waitForCoverages(1),
+                additionalDynamicPaths);
+    }
+
+    @TableTest({
+      "scenario           | projectName                          | mavenVersion",
+      "failed-test-replay | test_failed_maven_failed_test_replay | 3.9.9       "
+    })
+    @ParameterizedTest
+    // Exception Replay is disabled by default on JDK8 due to JVM bug
+    @EnabledForJreRange(min = JRE.JAVA_11)
+    void testFailedTestReplay(String projectName, String mavenVersion) throws Exception {
+        givenWrapperPropertiesFile(mavenVersion);
+        givenMavenProjectFiles(projectName);
+        givenMavenDependenciesAreLoaded(projectName, mavenVersion);
+
+        mockBackend.givenFlakyRetries(true);
+        mockBackend.givenFlakyTest(
+                "Maven Smoke Tests Project maven-surefire-plugin default-test",
+                "com.example.TestFailed",
+                "test_failed");
+        mockBackend.givenFailedTestReplay(true);
+
+        Map<String, String> agentArgs = new HashMap<>();
+        agentArgs.put(CiVisibilityConfig.CIVISIBILITY_FLAKY_RETRY_COUNT, "3");
+        agentArgs.put(GeneralConfig.AGENTLESS_LOG_SUBMISSION_URL, mockBackend.getIntakeUrl());
+        agentArgs.put(DebuggerConfig.DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL, "999999");
+
+        int exitCode = whenRunningMavenBuild(agentArgs, Collections.emptyList(), Collections.emptyMap(), true);
+        assertEquals(1, exitCode);
+
+        List<String> additionalDynamicTags = Arrays.asList(
+                "content.meta.['_dd.debug.error.3.snapshot_id']", "content.meta.['_dd.debug.error.exception_id']");
+        verifyEventsAndCoverages(
+                projectName,
+                "maven",
+                mavenVersion,
+                mockBackend.waitForEvents(7),
+                mockBackend.waitForCoverages(0),
+                additionalDynamicTags);
+        verifySnapshots(mockBackend.waitForLogs(2), 2);
+    }
+
+    private void givenWrapperPropertiesFile(String mavenVersion) throws IOException {
+        String distributionUrl = "https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/"
+                + mavenVersion
+                + "/apache-maven-"
+                + mavenVersion
+                + "-bin.zip";
+
+        Properties properties = new Properties();
+        properties.setProperty("distributionUrl", distributionUrl);
+
+        Path propertiesFile = projectHome.resolve("maven/wrapper/maven-wrapper.properties");
+        Files.createDirectories(propertiesFile.getParent());
+        try (FileOutputStream fos = new FileOutputStream(propertiesFile.toFile())) {
+            properties.store(fos, "");
+        }
     }
 
-    int exitCode =
-        whenRunningMavenBuild(
-            Collections.singletonMap(
-                CiVisibilityConfig.CIVISIBILITY_TEST_ORDER, CIConstants.FAIL_FAST_TEST_ORDER),
-            Collections.emptyList(),
-            additionalEnvVars,
-            true);
-    assertEquals(0, exitCode);
-
-    verifyTestOrder(mockBackend.waitForEvents(eventsNumber), expectedOrder);
-  }
-
-  @TableTest({
-    "scenario                  | projectName                                         | mavenVersion",
-    "child-service-propagation | test_successful_maven_run_child_service_propagation | 3.9.9       "
-  })
-  @ParameterizedTest
-  void testServiceNamePropagation(String projectName, String mavenVersion) throws Exception {
-    givenWrapperPropertiesFile(mavenVersion);
-    givenMavenProjectFiles(projectName);
-    givenMavenDependenciesAreLoaded(projectName, mavenVersion);
-
-    int exitCode =
-        whenRunningMavenBuild(
-            Collections.emptyMap(), Collections.emptyList(), Collections.emptyMap(), false);
-    assertEquals(0, exitCode);
-
-    List<String> additionalDynamicPaths = Collections.singletonList("content.service");
-    verifyEventsAndCoverages(
-        projectName,
-        "maven",
-        mavenVersion,
-        mockBackend.waitForEvents(5),
-        mockBackend.waitForCoverages(1),
-        additionalDynamicPaths);
-  }
-
-  @TableTest({
-    "scenario           | projectName                          | mavenVersion",
-    "failed-test-replay | test_failed_maven_failed_test_replay | 3.9.9       "
-  })
-  @ParameterizedTest
-  // Exception Replay is disabled by default on JDK8 due to JVM bug
-  @EnabledForJreRange(min = JRE.JAVA_11)
-  void testFailedTestReplay(String projectName, String mavenVersion) throws Exception {
-    givenWrapperPropertiesFile(mavenVersion);
-    givenMavenProjectFiles(projectName);
-    givenMavenDependenciesAreLoaded(projectName, mavenVersion);
-
-    mockBackend.givenFlakyRetries(true);
-    mockBackend.givenFlakyTest(
-        "Maven Smoke Tests Project maven-surefire-plugin default-test",
-        "com.example.TestFailed",
-        "test_failed");
-    mockBackend.givenFailedTestReplay(true);
-
-    Map<String, String> agentArgs = new HashMap<>();
-    agentArgs.put(CiVisibilityConfig.CIVISIBILITY_FLAKY_RETRY_COUNT, "3");
-    agentArgs.put(GeneralConfig.AGENTLESS_LOG_SUBMISSION_URL, mockBackend.getIntakeUrl());
-    agentArgs.put(DebuggerConfig.DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL, "999999");
-
-    int exitCode =
-        whenRunningMavenBuild(agentArgs, Collections.emptyList(), Collections.emptyMap(), true);
-    assertEquals(1, exitCode);
-
-    List<String> additionalDynamicTags =
-        Arrays.asList(
-            "content.meta.['_dd.debug.error.3.snapshot_id']",
-            "content.meta.['_dd.debug.error.exception_id']");
-    verifyEventsAndCoverages(
-        projectName,
-        "maven",
-        mavenVersion,
-        mockBackend.waitForEvents(7),
-        mockBackend.waitForCoverages(0),
-        additionalDynamicTags);
-    verifySnapshots(mockBackend.waitForLogs(2), 2);
-  }
-
-  private void givenWrapperPropertiesFile(String mavenVersion) throws IOException {
-    String distributionUrl =
-        "https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/"
-            + mavenVersion
-            + "/apache-maven-"
-            + mavenVersion
-            + "-bin.zip";
-
-    Properties properties = new Properties();
-    properties.setProperty("distributionUrl", distributionUrl);
-
-    Path propertiesFile = projectHome.resolve("maven/wrapper/maven-wrapper.properties");
-    Files.createDirectories(propertiesFile.getParent());
-    try (FileOutputStream fos = new FileOutputStream(propertiesFile.toFile())) {
-      properties.store(fos, "");
+    private void givenMavenProjectFiles(String projectFilesSources) throws Exception {
+        Path projectResourcesPath = Paths.get(this.getClass()
+                .getClassLoader()
+                .getResource(projectFilesSources)
+                .toURI());
+        copyFolder(projectResourcesPath, projectHome);
+
+        Path sharedSettingsPath = Paths.get(this.getClass()
+                .getClassLoader()
+                .getResource("settings.mirror.xml")
+                .toURI());
+        Files.copy(sharedSettingsPath, projectHome.resolve("settings.mirror.xml"));
     }
-  }
-
-  private void givenMavenProjectFiles(String projectFilesSources) throws Exception {
-    Path projectResourcesPath =
-        Paths.get(this.getClass().getClassLoader().getResource(projectFilesSources).toURI());
-    copyFolder(projectResourcesPath, projectHome);
-
-    Path sharedSettingsPath =
-        Paths.get(this.getClass().getClassLoader().getResource("settings.mirror.xml").toURI());
-    Files.copy(sharedSettingsPath, projectHome.resolve("settings.mirror.xml"));
-  }
-
-  private void copyFolder(Path src, Path dest) throws IOException {
-    Files.walkFileTree(
-        src,
-        new SimpleFileVisitor<Path>() {
-          @Override
-          public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
-              throws IOException {
-            Files.createDirectories(dest.resolve(src.relativize(dir)));
-            return FileVisitResult.CONTINUE;
-          }
-
-          @Override
-          public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-              throws IOException {
-            Files.copy(file, dest.resolve(src.relativize(file)));
-            return FileVisitResult.CONTINUE;
-          }
+
+    private void copyFolder(Path src, Path dest) throws IOException {
+        Files.walkFileTree(src, new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+                Files.createDirectories(dest.resolve(src.relativize(dir)));
+                return FileVisitResult.CONTINUE;
+            }
+
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                Files.copy(file, dest.resolve(src.relativize(file)));
+                return FileVisitResult.CONTINUE;
+            }
         });
 
-    // creating empty .git directory so that the tracer could detect projectFolder as repo root
-    Files.createDirectory(projectHome.resolve(".git"));
-  }
-
-  /**
-   * Sometimes Maven has problems downloading project dependencies because of intermittent network
-   * issues. Here, in order to reduce flakiness, we ensure that all of the dependencies are loaded
-   * (retrying if necessary), before proceeding with running the build.
-   */
-  private void givenMavenDependenciesAreLoaded(String projectName, String mavenVersion)
-      throws Exception {
-    givenMavenDependenciesAreLoaded(projectName, mavenVersion, Collections.emptyMap());
-  }
-
-  private void givenMavenDependenciesAreLoaded(
-      String projectName, String mavenVersion, Map<String, String> additionalEnvVars)
-      throws Exception {
-    if (LOADED_DEPENDENCIES.add(projectName + ":" + mavenVersion)) {
-      retryUntilSuccessfulOrNoAttemptsLeft(
-          Collections.singletonList(
-              "org.apache.maven.plugins:maven-dependency-plugin:3.6.1:go-offline"),
-          additionalEnvVars);
+        // creating empty .git directory so that the tracer could detect projectFolder as repo root
+        Files.createDirectory(projectHome.resolve(".git"));
     }
-    // Dependencies below are downloaded separately because they are not declared in the project,
-    // but are added at runtime by the tracer.
-    if (LOADED_DEPENDENCIES.add("com.datadoghq:dd-javac-plugin:" + JAVAC_PLUGIN_VERSION)) {
-      retryUntilSuccessfulOrNoAttemptsLeft(
-          Arrays.asList(
-              "org.apache.maven.plugins:maven-dependency-plugin:3.6.1:get",
-              "-Dartifact=com.datadoghq:dd-javac-plugin:" + JAVAC_PLUGIN_VERSION),
-          additionalEnvVars);
+
+    /**
+     * Sometimes Maven has problems downloading project dependencies because of intermittent network
+     * issues. Here, in order to reduce flakiness, we ensure that all of the dependencies are loaded
+     * (retrying if necessary), before proceeding with running the build.
+     */
+    private void givenMavenDependenciesAreLoaded(String projectName, String mavenVersion) throws Exception {
+        givenMavenDependenciesAreLoaded(projectName, mavenVersion, Collections.emptyMap());
     }
-    if (LOADED_DEPENDENCIES.add("org.jacoco:jacoco-maven-plugin:" + JACOCO_PLUGIN_VERSION)) {
-      retryUntilSuccessfulOrNoAttemptsLeft(
-          Arrays.asList(
-              "org.apache.maven.plugins:maven-dependency-plugin:3.6.1:get",
-              "-Dartifact=org.jacoco:jacoco-maven-plugin:" + JACOCO_PLUGIN_VERSION),
-          additionalEnvVars);
+
+    private void givenMavenDependenciesAreLoaded(
+            String projectName, String mavenVersion, Map<String, String> additionalEnvVars) throws Exception {
+        if (LOADED_DEPENDENCIES.add(projectName + ":" + mavenVersion)) {
+            retryUntilSuccessfulOrNoAttemptsLeft(
+                    Collections.singletonList("org.apache.maven.plugins:maven-dependency-plugin:3.6.1:go-offline"),
+                    additionalEnvVars);
+        }
+        // Dependencies below are downloaded separately because they are not declared in the project,
+        // but are added at runtime by the tracer.
+        if (LOADED_DEPENDENCIES.add("com.datadoghq:dd-javac-plugin:" + JAVAC_PLUGIN_VERSION)) {
+            retryUntilSuccessfulOrNoAttemptsLeft(
+                    Arrays.asList(
+                            "org.apache.maven.plugins:maven-dependency-plugin:3.6.1:get",
+                            "-Dartifact=com.datadoghq:dd-javac-plugin:" + JAVAC_PLUGIN_VERSION),
+                    additionalEnvVars);
+        }
+        if (LOADED_DEPENDENCIES.add("org.jacoco:jacoco-maven-plugin:" + JACOCO_PLUGIN_VERSION)) {
+            retryUntilSuccessfulOrNoAttemptsLeft(
+                    Arrays.asList(
+                            "org.apache.maven.plugins:maven-dependency-plugin:3.6.1:get",
+                            "-Dartifact=org.jacoco:jacoco-maven-plugin:" + JACOCO_PLUGIN_VERSION),
+                    additionalEnvVars);
+        }
     }
-  }
-
-  private static final Collection<String> LOADED_DEPENDENCIES = new HashSet<>();
-
-  private void retryUntilSuccessfulOrNoAttemptsLeft(
-      List<String> mvnCommand, Map<String, String> additionalEnvVars) throws Exception {
-    ProcessBuilder processBuilder =
-        createProcessBuilder(mvnCommand, false, false, Collections.emptyMap(), additionalEnvVars);
-    for (int attempt = 0; attempt < DEPENDENCIES_DOWNLOAD_RETRIES; attempt++) {
-      try {
-        int exitCode = runProcess(processBuilder.start(), DEPENDENCIES_DOWNLOAD_TIMEOUT_SECS);
-        if (exitCode == 0) {
-          return;
+
+    private static final Collection<String> LOADED_DEPENDENCIES = new HashSet<>();
+
+    private void retryUntilSuccessfulOrNoAttemptsLeft(List<String> mvnCommand, Map<String, String> additionalEnvVars)
+            throws Exception {
+        ProcessBuilder processBuilder =
+                createProcessBuilder(mvnCommand, false, false, Collections.emptyMap(), additionalEnvVars);
+        for (int attempt = 0; attempt < DEPENDENCIES_DOWNLOAD_RETRIES; attempt++) {
+            try {
+                int exitCode = runProcess(processBuilder.start(), DEPENDENCIES_DOWNLOAD_TIMEOUT_SECS);
+                if (exitCode == 0) {
+                    return;
+                }
+            } catch (TimeoutException e) {
+                LOGGER.warn("Failed dependency resolution with exception: ", e);
+            }
         }
-      } catch (TimeoutException e) {
-        LOGGER.warn("Failed dependency resolution with exception: ", e);
-      }
+        throw new AssertionError(
+                "Tried " + DEPENDENCIES_DOWNLOAD_RETRIES + " times to execute " + mvnCommand + " and failed");
     }
-    throw new AssertionError(
-        "Tried "
-            + DEPENDENCIES_DOWNLOAD_RETRIES
-            + " times to execute "
-            + mvnCommand
-            + " and failed");
-  }
-
-  private int whenRunningMavenBuild(
-      Map<String, String> additionalAgentArgs,
-      List<String> additionalCommandLineParams,
-      Map<String, String> additionalEnvVars,
-      boolean setServiceName)
-      throws Exception {
-    List<String> mvnCommand = new ArrayList<>();
-    mvnCommand.add("-B");
-    mvnCommand.add("test");
-    mvnCommand.addAll(additionalCommandLineParams);
-
-    ProcessBuilder processBuilder =
-        createProcessBuilder(
-            mvnCommand, true, setServiceName, additionalAgentArgs, additionalEnvVars);
-
-    processBuilder.environment().put("DD_API_KEY", "01234567890abcdef123456789ABCDEF");
-
-    return runProcess(processBuilder.start(), PROCESS_TIMEOUT_SECS);
-  }
-
-  private static int runProcess(Process p, int timeoutSecs) throws Exception {
-    StreamConsumer errorGobbler = new StreamConsumer(p.getErrorStream(), "ERROR");
-    StreamConsumer outputGobbler = new StreamConsumer(p.getInputStream(), "OUTPUT");
-    outputGobbler.start();
-    errorGobbler.start();
-
-    if (!p.waitFor(timeoutSecs, TimeUnit.SECONDS)) {
-      p.destroyForcibly();
-      throw new TimeoutException(
-          "Instrumented process failed to exit within " + timeoutSecs + " seconds");
+
+    private int whenRunningMavenBuild(
+            Map<String, String> additionalAgentArgs,
+            List<String> additionalCommandLineParams,
+            Map<String, String> additionalEnvVars,
+            boolean setServiceName)
+            throws Exception {
+        List<String> mvnCommand = new ArrayList<>();
+        mvnCommand.add("-B");
+        mvnCommand.add("test");
+        mvnCommand.addAll(additionalCommandLineParams);
+
+        ProcessBuilder processBuilder =
+                createProcessBuilder(mvnCommand, true, setServiceName, additionalAgentArgs, additionalEnvVars);
+
+        processBuilder.environment().put("DD_API_KEY", "01234567890abcdef123456789ABCDEF");
+
+        return runProcess(processBuilder.start(), PROCESS_TIMEOUT_SECS);
     }
 
-    return p.exitValue();
-  }
-
-  ProcessBuilder createProcessBuilder(
-      List<String> mvnCommand,
-      boolean runWithAgent,
-      boolean setServiceName,
-      Map<String, String> additionalAgentArgs,
-      Map<String, String> additionalEnvVars) {
-    String mavenRunnerShadowJar = System.getProperty("datadog.smoketest.maven.jar.path");
-    assertTrue(new File(mavenRunnerShadowJar).isFile());
-
-    List<String> command = new ArrayList<>();
-    command.add(javaPath());
-    command.addAll(jvmArguments(runWithAgent, setServiceName, additionalAgentArgs));
-    command.addAll(Arrays.asList("-jar", mavenRunnerShadowJar));
-    command.addAll(programArguments());
-
-    if (System.getenv().get("MAVEN_REPOSITORY_PROXY") != null) {
-      command.addAll(Arrays.asList("-s", projectHome.toAbsolutePath() + "/settings.mirror.xml"));
+    private static int runProcess(Process p, int timeoutSecs) throws Exception {
+        StreamConsumer errorGobbler = new StreamConsumer(p.getErrorStream(), "ERROR");
+        StreamConsumer outputGobbler = new StreamConsumer(p.getInputStream(), "OUTPUT");
+        outputGobbler.start();
+        errorGobbler.start();
+
+        if (!p.waitFor(timeoutSecs, TimeUnit.SECONDS)) {
+            p.destroyForcibly();
+            throw new TimeoutException("Instrumented process failed to exit within " + timeoutSecs + " seconds");
+        }
+
+        return p.exitValue();
     }
-    command.addAll(mvnCommand);
 
-    ProcessBuilder processBuilder = new ProcessBuilder(command);
-    processBuilder.directory(projectHome.toFile());
+    ProcessBuilder createProcessBuilder(
+            List<String> mvnCommand,
+            boolean runWithAgent,
+            boolean setServiceName,
+            Map<String, String> additionalAgentArgs,
+            Map<String, String> additionalEnvVars) {
+        String mavenRunnerShadowJar = System.getProperty("datadog.smoketest.maven.jar.path");
+        assertTrue(new File(mavenRunnerShadowJar).isFile());
+
+        List<String> command = new ArrayList<>();
+        command.add(javaPath());
+        command.addAll(jvmArguments(runWithAgent, setServiceName, additionalAgentArgs));
+        command.addAll(Arrays.asList("-jar", mavenRunnerShadowJar));
+        command.addAll(programArguments());
+
+        if (System.getenv().get("MAVEN_REPOSITORY_PROXY") != null) {
+            command.addAll(Arrays.asList("-s", projectHome.toAbsolutePath() + "/settings.mirror.xml"));
+        }
+        command.addAll(mvnCommand);
 
-    processBuilder.environment().put("JAVA_HOME", System.getProperty("java.home"));
-    for (Map.Entry<String, String> envVar : additionalEnvVars.entrySet()) {
-      processBuilder.environment().put(envVar.getKey(), envVar.getValue());
+        ProcessBuilder processBuilder = new ProcessBuilder(command);
+        processBuilder.directory(projectHome.toFile());
+
+        processBuilder.environment().put("JAVA_HOME", System.getProperty("java.home"));
+        for (Map.Entry<String, String> envVar : additionalEnvVars.entrySet()) {
+            processBuilder.environment().put(envVar.getKey(), envVar.getValue());
+        }
+
+        String mavenRepositoryProxy = System.getenv("MAVEN_REPOSITORY_PROXY");
+        if (mavenRepositoryProxy != null) {
+            processBuilder.environment().put("MAVEN_REPOSITORY_PROXY", mavenRepositoryProxy);
+        }
+
+        return processBuilder;
     }
 
-    String mavenRepositoryProxy = System.getenv("MAVEN_REPOSITORY_PROXY");
-    if (mavenRepositoryProxy != null) {
-      processBuilder.environment().put("MAVEN_REPOSITORY_PROXY", mavenRepositoryProxy);
+    List<String> jvmArguments(boolean runWithAgent, boolean setServiceName, Map<String, String> additionalAgentArgs) {
+        List<String> arguments = new ArrayList<>();
+        arguments.add("-D" + MavenWrapperMain.MVNW_VERBOSE + "=true");
+        arguments.add("-Duser.dir=" + projectHome.toAbsolutePath());
+        arguments.add("-Dmaven.mainClass=org.apache.maven.cli.MavenCli");
+        arguments.add("-Dmaven.multiModuleProjectDirectory=" + projectHome.toAbsolutePath());
+        arguments.add("-Dmaven.artifact.threads=10");
+        if (runWithAgent) {
+            arguments.addAll(buildJvmArguments(
+                    mockBackend.getIntakeUrl(), setServiceName ? TEST_SERVICE_NAME : null, additionalAgentArgs));
+        }
+        return arguments;
     }
 
-    return processBuilder;
-  }
-
-  List<String> jvmArguments(
-      boolean runWithAgent, boolean setServiceName, Map<String, String> additionalAgentArgs) {
-    List<String> arguments = new ArrayList<>();
-    arguments.add("-D" + MavenWrapperMain.MVNW_VERBOSE + "=true");
-    arguments.add("-Duser.dir=" + projectHome.toAbsolutePath());
-    arguments.add("-Dmaven.mainClass=org.apache.maven.cli.MavenCli");
-    arguments.add("-Dmaven.multiModuleProjectDirectory=" + projectHome.toAbsolutePath());
-    arguments.add("-Dmaven.artifact.threads=10");
-    if (runWithAgent) {
-      arguments.addAll(
-          buildJvmArguments(
-              mockBackend.getIntakeUrl(),
-              setServiceName ? TEST_SERVICE_NAME : null,
-              additionalAgentArgs));
+    List<String> programArguments() {
+        return Collections.singletonList(projectHome.toAbsolutePath().toString());
     }
-    return arguments;
-  }
 
-  List<String> programArguments() {
-    return Collections.singletonList(projectHome.toAbsolutePath().toString());
-  }
+    private static class StreamConsumer extends Thread {
+        final InputStream is;
+        final String messagePrefix;
 
-  private static class StreamConsumer extends Thread {
-    final InputStream is;
-    final String messagePrefix;
+        StreamConsumer(InputStream is, String messagePrefix) {
+            this.is = is;
+            this.messagePrefix = messagePrefix;
+        }
 
-    StreamConsumer(InputStream is, String messagePrefix) {
-      this.is = is;
-      this.messagePrefix = messagePrefix;
+        @Override
+        public void run() {
+            try {
+                BufferedReader br = new BufferedReader(new InputStreamReader(is));
+                String line;
+                while ((line = br.readLine()) != null) {
+                    // DEBUG: logback.xml keeps this logger at INFO, so subprocess output — which may contain
+                    // secrets (env vars, agent args) — never reaches JUnit XML reports.
+                    LOGGER.debug("{}: {}", messagePrefix, line);
+                }
+            } catch (IOException e) {
+                LOGGER.warn("Error reading process stream", e);
+            }
+        }
     }
 
-    @Override
-    public void run() {
-      try {
-        BufferedReader br = new BufferedReader(new InputStreamReader(is));
-        String line;
-        while ((line = br.readLine()) != null) {
-          // DEBUG: logback.xml keeps this logger at INFO, so subprocess output — which may contain
-          // secrets (env vars, agent args) — never reaches JUnit XML reports.
-          LOGGER.debug("{}: {}", messagePrefix, line);
+    private static Properties loadLatestToolVersions() {
+        Properties properties = new Properties();
+        try (InputStream stream =
+                MavenSmokeTest.class.getClassLoader().getResourceAsStream("latest-tool-versions.properties")) {
+            if (stream == null) {
+                throw new IllegalStateException("Could not find latest-tool-versions.properties on classpath");
+            }
+            properties.load(stream);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
         }
-      } catch (IOException e) {
-        LOGGER.warn("Error reading process stream", e);
-      }
+        return properties;
     }
-  }
-
-  private static Properties loadLatestToolVersions() {
-    Properties properties = new Properties();
-    try (InputStream stream =
-        MavenSmokeTest.class
-            .getClassLoader()
-            .getResourceAsStream("latest-tool-versions.properties")) {
-      if (stream == null) {
-        throw new IllegalStateException(
-            "Could not find latest-tool-versions.properties on classpath");
-      }
-      properties.load(stream);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+
+    private static String getLatestMavenVersion() {
+        String version = loadLatestToolVersions().getProperty("maven.latest");
+        LOGGER.info("Will run the 'latest' tests with Maven version {}", version);
+        return version;
     }
-    return properties;
-  }
-
-  private static String getLatestMavenVersion() {
-    String version = loadLatestToolVersions().getProperty("maven.latest");
-    LOGGER.info("Will run the 'latest' tests with Maven version {}", version);
-    return version;
-  }
-
-  private static String getLatestMavenSurefireVersion() {
-    String version = loadLatestToolVersions().getProperty("maven-surefire.latest");
-    LOGGER.info("Will run the 'latest' tests with Maven Surefire version {}", version);
-    return version;
-  }
-
-  private static BitSet bits(int... indices) {
-    BitSet bitSet = new BitSet();
-    for (int i : indices) {
-      bitSet.set(i);
+
+    private static String getLatestMavenSurefireVersion() {
+        String version = loadLatestToolVersions().getProperty("maven-surefire.latest");
+        LOGGER.info("Will run the 'latest' tests with Maven Surefire version {}", version);
+        return version;
     }
-    return bitSet;
-  }
 
-  private static String resolveLatestMaven(String mavenVersion) {
-    return "latest".equals(mavenVersion) ? LATEST_MAVEN_VERSION : mavenVersion;
-  }
+    private static BitSet bits(int... indices) {
+        BitSet bitSet = new BitSet();
+        for (int i : indices) {
+            bitSet.set(i);
+        }
+        return bitSet;
+    }
+
+    private static String resolveLatestMaven(String mavenVersion) {
+        return "latest".equals(mavenVersion) ? LATEST_MAVEN_VERSION : mavenVersion;
+    }
 }
diff --git a/dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index c80e4cc2aa5..606974761ca 100644
--- a/dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -6,7 +6,7 @@
 @SpringBootApplication
 public class SpringbootApplication {
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureConfiguration.java b/dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureConfiguration.java
index f8a8ac51e45..4968a975074 100644
--- a/dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureConfiguration.java
+++ b/dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureConfiguration.java
@@ -9,10 +9,10 @@
 @Configuration
 public class OpenFeatureConfiguration {
 
-  @Bean
-  public Client openFeatureClient() {
-    OpenFeatureAPI api = OpenFeatureAPI.getInstance();
-    api.setProviderAndWait(new Provider());
-    return api.getClient();
-  }
+    @Bean
+    public Client openFeatureClient() {
+        OpenFeatureAPI api = OpenFeatureAPI.getInstance();
+        api.setProviderAndWait(new Provider());
+        return api.getClient();
+    }
 }
diff --git a/dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureController.java b/dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureController.java
index 47b5e6b18ab..a5052d4d3f6 100644
--- a/dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureController.java
+++ b/dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureController.java
@@ -23,138 +23,128 @@
 @RequestMapping("/openfeature")
 public class OpenFeatureController {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(OpenFeatureController.class);
-
-  private final Client client;
-
-  public OpenFeatureController(final Client client) {
-    this.client = client;
-  }
-
-  @PostMapping(
-      value = "/evaluate",
-      consumes = APPLICATION_JSON_VALUE,
-      produces = APPLICATION_JSON_VALUE)
-  public ResponseEntity<?> evaluate(@RequestBody final EvaluateRequest request) {
-    try {
-      final EvaluationContext context = context(request);
-      FlagEvaluationDetails<?> details;
-      switch (request.getVariationType()) {
-        case "BOOLEAN":
-          details =
-              client.getBooleanDetails(
-                  request.getFlag(), (Boolean) request.getDefaultValue(), context);
-          break;
-        case "STRING":
-          details =
-              client.getStringDetails(
-                  request.getFlag(), (String) request.getDefaultValue(), context);
-          break;
-        case "INTEGER":
-          final Number integerEval = (Number) request.getDefaultValue();
-          details = client.getIntegerDetails(request.getFlag(), integerEval.intValue(), context);
-          break;
-        case "NUMERIC":
-          final Number doubleEval = (Number) request.getDefaultValue();
-          details = client.getDoubleDetails(request.getFlag(), doubleEval.doubleValue(), context);
-          break;
-        case "JSON":
-          details =
-              client.getObjectDetails(
-                  request.getFlag(), Value.objectToValue(request.getDefaultValue()), context);
-          break;
-        default:
-          throw new IllegalArgumentException(
-              "Unsupported variation type: " + request.getVariationType());
-      }
-
-      final Object value = details.getValue();
-      final Map<String, Object> result = new HashMap<>();
-      result.put("flagKey", details.getFlagKey());
-      result.put("variant", details.getVariant());
-      result.put("reason", details.getReason());
-      result.put("value", value instanceof Value ? context.convertValue((Value) value) : value);
-      result.put("errorCode", details.getErrorCode());
-      result.put("errorMessage", details.getErrorMessage());
-      result.put("flagMetadata", details.getFlagMetadata().asUnmodifiableMap());
-      return ResponseEntity.ok(result);
-    } catch (Throwable e) {
-      LOGGER.error("Error on resolution", e);
-      return ResponseEntity.internalServerError().body(e.getMessage());
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenFeatureController.class);
+
+    private final Client client;
+
+    public OpenFeatureController(final Client client) {
+        this.client = client;
     }
-  }
-
-  private static EvaluationContext context(final EvaluateRequest request) {
-    final MutableContext context = new MutableContext();
-    context.setTargetingKey(request.getTargetingKey());
-    if (request.attributes != null) {
-      request.attributes.forEach(
-          (key, value) -> {
-            if (value instanceof Boolean) {
-              context.add(key, (Boolean) value);
-            } else if (value instanceof Integer) {
-              context.add(key, (Integer) value);
-            } else if (value instanceof Double) {
-              context.add(key, (Double) value);
-            } else if (value instanceof String) {
-              context.add(key, (String) value);
-            } else if (value instanceof Map) {
-              context.add(key, Value.objectToValue(value).asStructure());
-            } else if (value instanceof List) {
-              context.add(key, Value.objectToValue(value).asList());
-            } else {
-              context.add(key, (Structure) null);
+
+    @PostMapping(value = "/evaluate", consumes = APPLICATION_JSON_VALUE, produces = APPLICATION_JSON_VALUE)
+    public ResponseEntity<?> evaluate(@RequestBody final EvaluateRequest request) {
+        try {
+            final EvaluationContext context = context(request);
+            FlagEvaluationDetails<?> details;
+            switch (request.getVariationType()) {
+                case "BOOLEAN":
+                    details = client.getBooleanDetails(request.getFlag(), (Boolean) request.getDefaultValue(), context);
+                    break;
+                case "STRING":
+                    details = client.getStringDetails(request.getFlag(), (String) request.getDefaultValue(), context);
+                    break;
+                case "INTEGER":
+                    final Number integerEval = (Number) request.getDefaultValue();
+                    details = client.getIntegerDetails(request.getFlag(), integerEval.intValue(), context);
+                    break;
+                case "NUMERIC":
+                    final Number doubleEval = (Number) request.getDefaultValue();
+                    details = client.getDoubleDetails(request.getFlag(), doubleEval.doubleValue(), context);
+                    break;
+                case "JSON":
+                    details = client.getObjectDetails(
+                            request.getFlag(), Value.objectToValue(request.getDefaultValue()), context);
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unsupported variation type: " + request.getVariationType());
             }
-          });
-    }
-    return context;
-  }
-
-  public static class EvaluateRequest {
-    private String flag;
-    private String variationType;
-    private Object defaultValue;
-    private String targetingKey;
-    private Map<String, Object> attributes;
-
-    public Map<String, Object> getAttributes() {
-      return attributes;
-    }
 
-    public void setAttributes(Map<String, Object> attributes) {
-      this.attributes = attributes;
+            final Object value = details.getValue();
+            final Map<String, Object> result = new HashMap<>();
+            result.put("flagKey", details.getFlagKey());
+            result.put("variant", details.getVariant());
+            result.put("reason", details.getReason());
+            result.put("value", value instanceof Value ? context.convertValue((Value) value) : value);
+            result.put("errorCode", details.getErrorCode());
+            result.put("errorMessage", details.getErrorMessage());
+            result.put("flagMetadata", details.getFlagMetadata().asUnmodifiableMap());
+            return ResponseEntity.ok(result);
+        } catch (Throwable e) {
+            LOGGER.error("Error on resolution", e);
+            return ResponseEntity.internalServerError().body(e.getMessage());
+        }
     }
 
-    public Object getDefaultValue() {
-      return defaultValue;
+    private static EvaluationContext context(final EvaluateRequest request) {
+        final MutableContext context = new MutableContext();
+        context.setTargetingKey(request.getTargetingKey());
+        if (request.attributes != null) {
+            request.attributes.forEach((key, value) -> {
+                if (value instanceof Boolean) {
+                    context.add(key, (Boolean) value);
+                } else if (value instanceof Integer) {
+                    context.add(key, (Integer) value);
+                } else if (value instanceof Double) {
+                    context.add(key, (Double) value);
+                } else if (value instanceof String) {
+                    context.add(key, (String) value);
+                } else if (value instanceof Map) {
+                    context.add(key, Value.objectToValue(value).asStructure());
+                } else if (value instanceof List) {
+                    context.add(key, Value.objectToValue(value).asList());
+                } else {
+                    context.add(key, (Structure) null);
+                }
+            });
+        }
+        return context;
     }
 
-    public void setDefaultValue(Object defaultValue) {
-      this.defaultValue = defaultValue;
-    }
+    public static class EvaluateRequest {
+        private String flag;
+        private String variationType;
+        private Object defaultValue;
+        private String targetingKey;
+        private Map<String, Object> attributes;
 
-    public String getFlag() {
-      return flag;
-    }
+        public Map<String, Object> getAttributes() {
+            return attributes;
+        }
 
-    public void setFlag(String flag) {
-      this.flag = flag;
-    }
+        public void setAttributes(Map<String, Object> attributes) {
+            this.attributes = attributes;
+        }
 
-    public String getTargetingKey() {
-      return targetingKey;
-    }
+        public Object getDefaultValue() {
+            return defaultValue;
+        }
 
-    public void setTargetingKey(String targetingKey) {
-      this.targetingKey = targetingKey;
-    }
+        public void setDefaultValue(Object defaultValue) {
+            this.defaultValue = defaultValue;
+        }
 
-    public String getVariationType() {
-      return variationType;
-    }
+        public String getFlag() {
+            return flag;
+        }
+
+        public void setFlag(String flag) {
+            this.flag = flag;
+        }
+
+        public String getTargetingKey() {
+            return targetingKey;
+        }
+
+        public void setTargetingKey(String targetingKey) {
+            this.targetingKey = targetingKey;
+        }
+
+        public String getVariationType() {
+            return variationType;
+        }
 
-    public void setVariationType(String variationType) {
-      this.variationType = variationType;
+        public void setVariationType(String variationType) {
+            this.variationType = variationType;
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/opentelemetry/src/main/java/datadog/smoketest/opentelemetry/Application.java b/dd-smoke-tests/opentelemetry/src/main/java/datadog/smoketest/opentelemetry/Application.java
index 68887dc049e..d3d3d8e7fe1 100644
--- a/dd-smoke-tests/opentelemetry/src/main/java/datadog/smoketest/opentelemetry/Application.java
+++ b/dd-smoke-tests/opentelemetry/src/main/java/datadog/smoketest/opentelemetry/Application.java
@@ -41,133 +41,132 @@
  * </ul>
  */
 public class Application {
-  /** The minimum application run time. */
-  private static final int MIN_RUNTIME_SECONDS = 5;
-
-  /** The number of shards the batch fans out to, one span each. */
-  private static final int SHARD_COUNT = 3;
-
-  /** The work each shard simulates, so shard spans have a non-zero duration. */
-  private static final long SHARD_WORK_MILLIS = 100;
-
-  /** How long to wait for the fan-out pool to wind down before giving up. */
-  private static final long POOL_SHUTDOWN_TIMEOUT_SECONDS = 30;
-
-  /** OpenTelemetry tracer. */
-  private static final Tracer TRACER =
-      GlobalOpenTelemetry.getTracerProvider().tracerBuilder("smoke-app").build();
-
-  public static void main(String[] args) throws Exception {
-    long startTime = nanoTime();
-    loadConfiguration();
-    runBatch();
-    stayAliveFor(MIN_RUNTIME_SECONDS, startTime);
-  }
-
-  /** Runs the batch job: split the work, fan it out over a thread pool, then merge the results. */
-  private static void runBatch() throws Exception {
-    Span batch = TRACER.spanBuilder("batch-job").setSpanKind(SERVER).startSpan();
-    try (Scope scope = batch.makeCurrent()) {
-      splitBatch();
-      mergeShards(runShards());
-    } finally {
-      batch.end();
+    /** The minimum application run time. */
+    private static final int MIN_RUNTIME_SECONDS = 5;
+
+    /** The number of shards the batch fans out to, one span each. */
+    private static final int SHARD_COUNT = 3;
+
+    /** The work each shard simulates, so shard spans have a non-zero duration. */
+    private static final long SHARD_WORK_MILLIS = 100;
+
+    /** How long to wait for the fan-out pool to wind down before giving up. */
+    private static final long POOL_SHUTDOWN_TIMEOUT_SECONDS = 30;
+
+    /** OpenTelemetry tracer. */
+    private static final Tracer TRACER =
+            GlobalOpenTelemetry.getTracerProvider().tracerBuilder("smoke-app").build();
+
+    public static void main(String[] args) throws Exception {
+        long startTime = nanoTime();
+        loadConfiguration();
+        runBatch();
+        stayAliveFor(MIN_RUNTIME_SECONDS, startTime);
     }
-  }
-
-  /**
-   * Fans the batch out over a thread pool, one span per shard, and waits for all of them.
-   *
-   * @return The context of every shard span, all of them ended, in shard order.
-   */
-  private static List<SpanContext> runShards() throws Exception {
-    // The app runs on the Java 8 test matrix, where ExecutorService is not AutoCloseable yet.
-    ExecutorService pool = Executors.newFixedThreadPool(SHARD_COUNT);
-    try {
-      List<Future<SpanContext>> pendingShards = new ArrayList<>(SHARD_COUNT);
-      for (int shard = 0; shard < SHARD_COUNT; shard++) {
-        pendingShards.add(pool.submit(shardTask(shard)));
-      }
-      List<SpanContext> shardContexts = new ArrayList<>(SHARD_COUNT);
-      for (Future<SpanContext> pendingShard : pendingShards) {
-        // Every shard span is started and ended within its task, so they are all complete here.
-        shardContexts.add(pendingShard.get());
-      }
-      return shardContexts;
-    } finally {
-      pool.shutdown();
-      pool.awaitTermination(POOL_SHUTDOWN_TIMEOUT_SECONDS, SECONDS);
+
+    /** Runs the batch job: split the work, fan it out over a thread pool, then merge the results. */
+    private static void runBatch() throws Exception {
+        Span batch = TRACER.spanBuilder("batch-job").setSpanKind(SERVER).startSpan();
+        try (Scope scope = batch.makeCurrent()) {
+            splitBatch();
+            mergeShards(runShards());
+        } finally {
+            batch.end();
+        }
     }
-  }
-
-  /**
-   * Builds the work of a single shard. The task carries no context of its own: the shard span must
-   * come out as a child of the batch from the tracer's executor instrumentation alone, the way it
-   * would for an application that just submits work to a pool.
-   *
-   * @param shard The shard index.
-   * @return The shard work, returning the context of its (ended) span.
-   */
-  private static Callable<SpanContext> shardTask(int shard) {
-    return () -> {
-      Span span = TRACER.spanBuilder("shard-" + shard).startSpan();
-      try (Scope shardScope = span.makeCurrent()) {
-        span.setAttribute("batch.shard", shard);
-        MILLISECONDS.sleep(SHARD_WORK_MILLIS);
-        return span.getSpanContext();
-      } finally {
-        span.end();
-      }
-    };
-  }
-
-  /**
-   * Fans the shards back in: a single span linking to every shard span it merges.
-   *
-   * @param shardContexts The context of every shard span to link to.
-   */
-  private static void mergeShards(List<SpanContext> shardContexts) {
-    SpanBuilder builder = TRACER.spanBuilder("batch-merge");
-    for (SpanContext shardContext : shardContexts) {
-      builder.addLink(shardContext);
+
+    /**
+     * Fans the batch out over a thread pool, one span per shard, and waits for all of them.
+     *
+     * @return The context of every shard span, all of them ended, in shard order.
+     */
+    private static List<SpanContext> runShards() throws Exception {
+        // The app runs on the Java 8 test matrix, where ExecutorService is not AutoCloseable yet.
+        ExecutorService pool = Executors.newFixedThreadPool(SHARD_COUNT);
+        try {
+            List<Future<SpanContext>> pendingShards = new ArrayList<>(SHARD_COUNT);
+            for (int shard = 0; shard < SHARD_COUNT; shard++) {
+                pendingShards.add(pool.submit(shardTask(shard)));
+            }
+            List<SpanContext> shardContexts = new ArrayList<>(SHARD_COUNT);
+            for (Future<SpanContext> pendingShard : pendingShards) {
+                // Every shard span is started and ended within its task, so they are all complete here.
+                shardContexts.add(pendingShard.get());
+            }
+            return shardContexts;
+        } finally {
+            pool.shutdown();
+            pool.awaitTermination(POOL_SHUTDOWN_TIMEOUT_SECONDS, SECONDS);
+        }
     }
-    Span merge = builder.startSpan();
-    try (Scope scope = merge.makeCurrent()) {
-      reportResults(shardContexts.size());
-    } finally {
-      merge.end();
+
+    /**
+     * Builds the work of a single shard. The task carries no context of its own: the shard span must
+     * come out as a child of the batch from the tracer's executor instrumentation alone, the way it
+     * would for an application that just submits work to a pool.
+     *
+     * @param shard The shard index.
+     * @return The shard work, returning the context of its (ended) span.
+     */
+    private static Callable<SpanContext> shardTask(int shard) {
+        return () -> {
+            Span span = TRACER.spanBuilder("shard-" + shard).startSpan();
+            try (Scope shardScope = span.makeCurrent()) {
+                span.setAttribute("batch.shard", shard);
+                MILLISECONDS.sleep(SHARD_WORK_MILLIS);
+                return span.getSpanContext();
+            } finally {
+                span.end();
+            }
+        };
     }
-  }
-
-  @WithSpan
-  static void loadConfiguration() {
-    Span.current().addEvent("configuration-loaded");
-  }
-
-  @WithSpan
-  static void splitBatch() {
-    Span.current().setAttribute("batch.shards", SHARD_COUNT);
-  }
-
-  @WithSpan
-  static void reportResults(int mergedShards) {
-    Span.current().setAttribute("batch.merged-shards", mergedShards);
-  }
-
-  /**
-   * Keeps the application alive until it has run for at least {@code minRuntimeSeconds}. The tracer
-   * boots its telemetry asynchronously on daemon threads, so a batch application that exits within
-   * a few hundred milliseconds can be gone before {@code app-started} is ever sent — which the
-   * smoke test asserts.
-   *
-   * @param minRuntimeSeconds The floor on the total application runtime, in seconds.
-   * @param startTime The {@link System#nanoTime()} the application started at.
-   */
-  private static void stayAliveFor(long minRuntimeSeconds, long startTime)
-      throws InterruptedException {
-    long remainingNanos = SECONDS.toNanos(minRuntimeSeconds) - (nanoTime() - startTime);
-    if (remainingNanos > 0) {
-      NANOSECONDS.sleep(remainingNanos);
+
+    /**
+     * Fans the shards back in: a single span linking to every shard span it merges.
+     *
+     * @param shardContexts The context of every shard span to link to.
+     */
+    private static void mergeShards(List<SpanContext> shardContexts) {
+        SpanBuilder builder = TRACER.spanBuilder("batch-merge");
+        for (SpanContext shardContext : shardContexts) {
+            builder.addLink(shardContext);
+        }
+        Span merge = builder.startSpan();
+        try (Scope scope = merge.makeCurrent()) {
+            reportResults(shardContexts.size());
+        } finally {
+            merge.end();
+        }
+    }
+
+    @WithSpan
+    static void loadConfiguration() {
+        Span.current().addEvent("configuration-loaded");
+    }
+
+    @WithSpan
+    static void splitBatch() {
+        Span.current().setAttribute("batch.shards", SHARD_COUNT);
+    }
+
+    @WithSpan
+    static void reportResults(int mergedShards) {
+        Span.current().setAttribute("batch.merged-shards", mergedShards);
+    }
+
+    /**
+     * Keeps the application alive until it has run for at least {@code minRuntimeSeconds}. The tracer
+     * boots its telemetry asynchronously on daemon threads, so a batch application that exits within
+     * a few hundred milliseconds can be gone before {@code app-started} is ever sent — which the
+     * smoke test asserts.
+     *
+     * @param minRuntimeSeconds The floor on the total application runtime, in seconds.
+     * @param startTime The {@link System#nanoTime()} the application started at.
+     */
+    private static void stayAliveFor(long minRuntimeSeconds, long startTime) throws InterruptedException {
+        long remainingNanos = SECONDS.toNanos(minRuntimeSeconds) - (nanoTime() - startTime);
+        if (remainingNanos > 0) {
+            NANOSECONDS.sleep(remainingNanos);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/opentelemetry/src/test/java/datadog/smoketest/OpenTelemetrySmokeTest.java b/dd-smoke-tests/opentelemetry/src/test/java/datadog/smoketest/OpenTelemetrySmokeTest.java
index e3c87e30d3b..709b1204c2c 100644
--- a/dd-smoke-tests/opentelemetry/src/test/java/datadog/smoketest/OpenTelemetrySmokeTest.java
+++ b/dd-smoke-tests/opentelemetry/src/test/java/datadog/smoketest/OpenTelemetrySmokeTest.java
@@ -18,75 +18,66 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 class OpenTelemetrySmokeTest {
-  private static final UnaryOperator<Options> SORT_BY_RESOURCE_NAME =
-      options -> options.sort(comparing(DecodedSpan::getResource));
-  private static final int TIMEOUT_SECONDS = 30;
-  private static final File WORKING_DIRECTORY =
-      new File(System.getProperty("datadog.smoketest.builddir"));
-  private static final String APPLICATION_JAR =
-      System.getProperty("datadog.smoketest.shadowJar.path");
+    private static final UnaryOperator<Options> SORT_BY_RESOURCE_NAME =
+            options -> options.sort(comparing(DecodedSpan::getResource));
+    private static final int TIMEOUT_SECONDS = 30;
+    private static final File WORKING_DIRECTORY = new File(System.getProperty("datadog.smoketest.builddir"));
+    private static final String APPLICATION_JAR = System.getProperty("datadog.smoketest.shadowJar.path");
 
-  @RegisterExtension
-  static final SmokeCliApp app =
-      SmokeCliApp.named("opentelemetry")
-          .jar(APPLICATION_JAR)
-          .jvmArgs("-Ddd.trace.otel.enabled=true")
-          .workingDirectory(WORKING_DIRECTORY)
-          .backend(testAgent())
-          .build();
+    @RegisterExtension
+    static final SmokeCliApp app = SmokeCliApp.named("opentelemetry")
+            .jar(APPLICATION_JAR)
+            .jvmArgs("-Ddd.trace.otel.enabled=true")
+            .workingDirectory(WORKING_DIRECTORY)
+            .backend(testAgent())
+            .build();
 
-  @Test
-  void receivesTraces() {
-    app.traces()
-        .waitForTraces(
-            TIMEOUT_SECONDS,
-            UNORDERED,
-            // The standalone annotated span from the app set-up.
-            trace(
-                span()
-                    .root()
-                    .operationName("Application.loadConfiguration")
-                    .tag("events", validates(events -> events.contains("configuration-loaded")))),
-            // The batch trace:
-            //   batch-job                        (tracer, server, root)
-            //   ├─ Application.splitBatch        (annotated, main thread)
-            //   ├─ shard-0                       (tracer, worker thread)   ┐
-            //   ├─ shard-1                       (tracer, worker thread)   ├ fan-out
-            //   ├─ shard-2                       (tracer, worker thread)   ┘
-            //   └─ batch-merge                   (tracer, links to the shards) ← fan-in
-            //      └─ Application.reportResults  (annotated, main thread)
-            trace(
-                SORT_BY_RESOURCE_NAME,
-                // 0: Application.reportResults, child of batch-merge (index 3)
-                span()
-                    .operationName("Application.reportResults")
-                    .childOfIndex(3)
-                    .metric("batch.merged-shards", validates(shards -> shards.intValue() == 3)),
-                // 1: Application.splitBatch, child of batch-job (index 2)
-                span()
-                    .operationName("Application.splitBatch")
-                    .childOfIndex(2)
-                    .metric("batch.shards", validates(shards -> shards.intValue() == 3)),
-                // 2: batch-job, the root
-                span().root().operationName("server.request").resourceName("batch-job"),
-                // 3: batch-merge, fanning the shards (indexes 4 to 6) back in
-                span()
-                    .operationName("internal")
-                    .resourceName("batch-merge")
-                    .childOfIndex(2)
-                    .links(toIndex(4), toIndex(5), toIndex(6)),
-                // 4 to 6: the shards, fanned out over the pool but all children of batch-job
-                shard(0),
-                shard(1),
-                shard(2)));
-    app.assertCompletesWithValue(TIMEOUT_SECONDS, SECONDS, 0);
-  }
+    @Test
+    void receivesTraces() {
+        app.traces()
+                .waitForTraces(
+                        TIMEOUT_SECONDS,
+                        UNORDERED,
+                        // The standalone annotated span from the app set-up.
+                        trace(span().root()
+                                .operationName("Application.loadConfiguration")
+                                .tag("events", validates(events -> events.contains("configuration-loaded")))),
+                        // The batch trace:
+                        //   batch-job                        (tracer, server, root)
+                        //   ├─ Application.splitBatch        (annotated, main thread)
+                        //   ├─ shard-0                       (tracer, worker thread)   ┐
+                        //   ├─ shard-1                       (tracer, worker thread)   ├ fan-out
+                        //   ├─ shard-2                       (tracer, worker thread)   ┘
+                        //   └─ batch-merge                   (tracer, links to the shards) ← fan-in
+                        //      └─ Application.reportResults  (annotated, main thread)
+                        trace(
+                                SORT_BY_RESOURCE_NAME,
+                                // 0: Application.reportResults, child of batch-merge (index 3)
+                                span().operationName("Application.reportResults")
+                                        .childOfIndex(3)
+                                        .metric("batch.merged-shards", validates(shards -> shards.intValue() == 3)),
+                                // 1: Application.splitBatch, child of batch-job (index 2)
+                                span().operationName("Application.splitBatch")
+                                        .childOfIndex(2)
+                                        .metric("batch.shards", validates(shards -> shards.intValue() == 3)),
+                                // 2: batch-job, the root
+                                span().root().operationName("server.request").resourceName("batch-job"),
+                                // 3: batch-merge, fanning the shards (indexes 4 to 6) back in
+                                span().operationName("internal")
+                                        .resourceName("batch-merge")
+                                        .childOfIndex(2)
+                                        .links(toIndex(4), toIndex(5), toIndex(6)),
+                                // 4 to 6: the shards, fanned out over the pool but all children of batch-job
+                                shard(0),
+                                shard(1),
+                                shard(2)));
+        app.assertCompletesWithValue(TIMEOUT_SECONDS, SECONDS, 0);
+    }
 
-  private static SpanMatcher shard(int shard) {
-    return span()
-        .operationName("internal")
-        .resourceName("shard-" + shard)
-        .childOfIndex(2)
-        .metric("batch.shard", validates(value -> value.intValue() == shard));
-  }
+    private static SpanMatcher shard(int shard) {
+        return span().operationName("internal")
+                .resourceName("shard-" + shard)
+                .childOfIndex(2)
+                .metric("batch.shard", validates(value -> value.intValue() == shard));
+    }
 }
diff --git a/dd-smoke-tests/opentracing/src/main/java/datadog/smoketest/opentracing/ApiVerification.java b/dd-smoke-tests/opentracing/src/main/java/datadog/smoketest/opentracing/ApiVerification.java
index 94e290b8c2b..e7cced6958b 100644
--- a/dd-smoke-tests/opentracing/src/main/java/datadog/smoketest/opentracing/ApiVerification.java
+++ b/dd-smoke-tests/opentracing/src/main/java/datadog/smoketest/opentracing/ApiVerification.java
@@ -6,28 +6,26 @@
 import java.util.Collection;
 
 public final class ApiVerification {
-  private ApiVerification() {}
+    private ApiVerification() {}
 
-  public static void verifyInterceptors(Tracer otTracer, boolean throwError) {
-    TraceInterceptor interceptor =
-        new TraceInterceptor() {
-          @Override
-          public Collection<? extends MutableSpan> onTraceComplete(
-              Collection<? extends MutableSpan> trace) {
-            // Emulates situation when user code will throw an Error.
-            if (throwError) {
-              throw new AssertionError();
-            }
+    public static void verifyInterceptors(Tracer otTracer, boolean throwError) {
+        TraceInterceptor interceptor = new TraceInterceptor() {
+            @Override
+            public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
+                // Emulates situation when user code will throw an Error.
+                if (throwError) {
+                    throw new AssertionError();
+                }
 
-            return trace;
-          }
+                return trace;
+            }
 
-          @Override
-          public int priority() {
-            return 1729;
-          }
+            @Override
+            public int priority() {
+                return 1729;
+            }
         };
 
-    otTracer.addTraceInterceptor(interceptor);
-  }
+        otTracer.addTraceInterceptor(interceptor);
+    }
 }
diff --git a/dd-smoke-tests/opentracing/src/main/java/datadog/smoketest/opentracing/IncorrectSetupWithAgentApplication.java b/dd-smoke-tests/opentracing/src/main/java/datadog/smoketest/opentracing/IncorrectSetupWithAgentApplication.java
index edc12a9e76f..a595a8cd512 100644
--- a/dd-smoke-tests/opentracing/src/main/java/datadog/smoketest/opentracing/IncorrectSetupWithAgentApplication.java
+++ b/dd-smoke-tests/opentracing/src/main/java/datadog/smoketest/opentracing/IncorrectSetupWithAgentApplication.java
@@ -3,15 +3,15 @@
 import datadog.opentracing.DDTracer;
 
 public class IncorrectSetupWithAgentApplication {
-  public static void main(final String[] args) {
-    try {
-      DDTracer.builder().build();
-    } catch (IllegalStateException e) {
-      if (e.getMessage().startsWith("Datadog Tracer already installed")) {
-        return;
-      }
-    }
+    public static void main(final String[] args) {
+        try {
+            DDTracer.builder().build();
+        } catch (IllegalStateException e) {
+            if (e.getMessage().startsWith("Datadog Tracer already installed")) {
+                return;
+            }
+        }
 
-    throw new RuntimeException("build() did not throw exception");
-  }
+        throw new RuntimeException("build() did not throw exception");
+    }
 }
diff --git a/dd-smoke-tests/opentracing/src/main/java/datadog/smoketest/opentracing/OTWithAgentApplication.java b/dd-smoke-tests/opentracing/src/main/java/datadog/smoketest/opentracing/OTWithAgentApplication.java
index 261a9b39dd4..49f1aed271d 100644
--- a/dd-smoke-tests/opentracing/src/main/java/datadog/smoketest/opentracing/OTWithAgentApplication.java
+++ b/dd-smoke-tests/opentracing/src/main/java/datadog/smoketest/opentracing/OTWithAgentApplication.java
@@ -9,22 +9,22 @@
 
 public class OTWithAgentApplication {
 
-  public static void main(final String[] args) throws InterruptedException {
-    final Tracer tracer = GlobalTracer.get();
+    public static void main(final String[] args) throws InterruptedException {
+        final Tracer tracer = GlobalTracer.get();
 
-    boolean throwError = args != null && args.length > 0 && Boolean.parseBoolean(args[0]);
-    ApiVerification.verifyInterceptors(datadog.trace.api.GlobalTracer.get(), throwError);
+        boolean throwError = args != null && args.length > 0 && Boolean.parseBoolean(args[0]);
+        ApiVerification.verifyInterceptors(datadog.trace.api.GlobalTracer.get(), throwError);
 
-    final Span span = tracer.buildSpan("someOperation").start();
-    try (final Scope ignored = tracer.activateSpan(span)) {
-      span.setTag(DDTags.SERVICE_NAME, "someService");
-      // Verify that the returned object is wrapped correctly.
-      Span root = (Span) ((MutableSpan) tracer.activeSpan()).getLocalRootSpan();
-    }
+        final Span span = tracer.buildSpan("someOperation").start();
+        try (final Scope ignored = tracer.activateSpan(span)) {
+            span.setTag(DDTags.SERVICE_NAME, "someService");
+            // Verify that the returned object is wrapped correctly.
+            Span root = (Span) ((MutableSpan) tracer.activeSpan()).getLocalRootSpan();
+        }
 
-    span.finish();
+        span.finish();
 
-    // Allow trace to be reported.
-    Thread.sleep(1000);
-  }
+        // Allow trace to be reported.
+        Thread.sleep(1000);
+    }
 }
diff --git a/dd-smoke-tests/opentracing/src/main/java/datadog/smoketest/opentracing/OTWithoutAgentApplication.java b/dd-smoke-tests/opentracing/src/main/java/datadog/smoketest/opentracing/OTWithoutAgentApplication.java
index 26162a2e55a..eed4a03159b 100644
--- a/dd-smoke-tests/opentracing/src/main/java/datadog/smoketest/opentracing/OTWithoutAgentApplication.java
+++ b/dd-smoke-tests/opentracing/src/main/java/datadog/smoketest/opentracing/OTWithoutAgentApplication.java
@@ -7,22 +7,22 @@
 import io.opentracing.util.GlobalTracer;
 
 public class OTWithoutAgentApplication {
-  public static void main(final String[] args) throws InterruptedException {
-    final DDTracer tracer = DDTracer.builder().build();
-    GlobalTracer.register(tracer);
-    // register the same tracer with the Datadog API
-    datadog.trace.api.GlobalTracer.registerIfAbsent(tracer);
+    public static void main(final String[] args) throws InterruptedException {
+        final DDTracer tracer = DDTracer.builder().build();
+        GlobalTracer.register(tracer);
+        // register the same tracer with the Datadog API
+        datadog.trace.api.GlobalTracer.registerIfAbsent(tracer);
 
-    ApiVerification.verifyInterceptors(tracer, false);
+        ApiVerification.verifyInterceptors(tracer, false);
 
-    final Span span = tracer.buildSpan("someOperation").start();
-    try (final Scope scope = tracer.activateSpan(span)) {
-      span.setTag(DDTags.SERVICE_NAME, "someService");
-    }
+        final Span span = tracer.buildSpan("someOperation").start();
+        try (final Scope scope = tracer.activateSpan(span)) {
+            span.setTag(DDTags.SERVICE_NAME, "someService");
+        }
 
-    span.finish();
+        span.finish();
 
-    // Allow trace to be reported.
-    Thread.sleep(1000);
-  }
+        // Allow trace to be reported.
+        Thread.sleep(1000);
+    }
 }
diff --git a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/app/IsolatingClassLoader.java b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/app/IsolatingClassLoader.java
index ae7dbf22816..d96e3a9e5d8 100644
--- a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/app/IsolatingClassLoader.java
+++ b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/app/IsolatingClassLoader.java
@@ -6,28 +6,27 @@
 import java.util.Enumeration;
 
 public class IsolatingClassLoader extends ClassLoader {
-  @Override
-  protected Class<?> loadClass(final String name, final boolean resolve)
-      throws ClassNotFoundException {
-    if (name.contains("datadog")) {
-      throw new ClassNotFoundException("Unexpected request for " + name);
+    @Override
+    protected Class<?> loadClass(final String name, final boolean resolve) throws ClassNotFoundException {
+        if (name.contains("datadog")) {
+            throw new ClassNotFoundException("Unexpected request for " + name);
+        }
+        return super.loadClass(name, resolve);
     }
-    return super.loadClass(name, resolve);
-  }
 
-  @Override
-  public URL getResource(final String name) {
-    if (name.contains("datadog")) {
-      return null;
+    @Override
+    public URL getResource(final String name) {
+        if (name.contains("datadog")) {
+            return null;
+        }
+        return super.getResource(name);
     }
-    return super.getResource(name);
-  }
 
-  @Override
-  public Enumeration<URL> getResources(final String name) throws IOException {
-    if (name.contains("datadog")) {
-      return Collections.emptyEnumeration();
+    @Override
+    public Enumeration<URL> getResources(final String name) throws IOException {
+        if (name.contains("datadog")) {
+            return Collections.emptyEnumeration();
+        }
+        return super.getResources(name);
     }
-    return super.getResources(name);
-  }
 }
diff --git a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/app/OSGiApplication.java b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/app/OSGiApplication.java
index c50f1203752..5ac8f40f916 100644
--- a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/app/OSGiApplication.java
+++ b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/app/OSGiApplication.java
@@ -16,61 +16,61 @@
 
 @SuppressForbidden
 public class OSGiApplication {
-  public static void main(final String[] args) throws Exception {
-    Map<String, String> config = new HashMap(System.getProperties());
+    public static void main(final String[] args) throws Exception {
+        Map<String, String> config = new HashMap(System.getProperties());
 
-    String factoryType = System.getProperty("framework.factory");
+        String factoryType = System.getProperty("framework.factory");
 
-    ClassLoader isolatingClassLoader = new IsolatingClassLoader();
-    Thread.currentThread().setContextClassLoader(isolatingClassLoader);
+        ClassLoader isolatingClassLoader = new IsolatingClassLoader();
+        Thread.currentThread().setContextClassLoader(isolatingClassLoader);
 
-    Framework framework = null;
-    for (FrameworkFactory f : ServiceLoader.load(FrameworkFactory.class, isolatingClassLoader)) {
-      if (factoryType.equals(f.getClass().getName())) {
-        framework = f.newFramework(config);
-        break;
-      }
-    }
+        Framework framework = null;
+        for (FrameworkFactory f : ServiceLoader.load(FrameworkFactory.class, isolatingClassLoader)) {
+            if (factoryType.equals(f.getClass().getName())) {
+                framework = f.newFramework(config);
+                break;
+            }
+        }
 
-    if (null == framework) {
-      throw new IllegalArgumentException("Missing framework");
-    }
+        if (null == framework) {
+            throw new IllegalArgumentException("Missing framework");
+        }
 
-    String bundlePaths = args[0];
+        String bundlePaths = args[0];
 
-    if (null == bundlePaths) {
-      throw new IllegalArgumentException("Missing bundlePaths");
-    }
+        if (null == bundlePaths) {
+            throw new IllegalArgumentException("Missing bundlePaths");
+        }
 
-    framework.start();
+        framework.start();
 
-    List<Bundle> bundles = new ArrayList<>();
+        List<Bundle> bundles = new ArrayList<>();
 
-    BundleContext frameworkContext = framework.getBundleContext();
-    for (String bundlePath : bundlePaths.split(",")) {
-      System.out.println("Installing: " + bundlePath);
-      bundles.add(frameworkContext.installBundle(new File(bundlePath).toURI().toString()));
-    }
+        BundleContext frameworkContext = framework.getBundleContext();
+        for (String bundlePath : bundlePaths.split(",")) {
+            System.out.println("Installing: " + bundlePath);
+            bundles.add(
+                    frameworkContext.installBundle(new File(bundlePath).toURI().toString()));
+        }
 
-    for (Bundle bundle : bundles) {
-      System.out.println("Starting: " + bundle + " " + bundle.getLocation());
-      bundle.start();
-    }
+        for (Bundle bundle : bundles) {
+            System.out.println("Starting: " + bundle + " " + bundle.getLocation());
+            bundle.start();
+        }
 
-    ServiceTracker publisherTracker =
-        new ServiceTracker(
-            frameworkContext, "datadog.smoketest.osgi.messaging.PublisherSupport", null);
-    publisherTracker.open();
+        ServiceTracker publisherTracker =
+                new ServiceTracker(frameworkContext, "datadog.smoketest.osgi.messaging.PublisherSupport", null);
+        publisherTracker.open();
 
-    Object publisher = publisherTracker.waitForService(1_000);
-    Method publish = publisher.getClass().getMethod("publish", String.class);
-    publish.invoke(publisher, "Hello, world!");
+        Object publisher = publisherTracker.waitForService(1_000);
+        Method publish = publisher.getClass().getMethod("publish", String.class);
+        publish.invoke(publisher, "Hello, world!");
 
-    framework.stop();
+        framework.stop();
 
-    framework.waitForStop(1_000);
+        framework.waitForStop(1_000);
 
-    // XXX: Knopflerfish will leave some dangling non-daemon thread and prevent shutdown here.
-    System.exit(0);
-  }
+        // XXX: Knopflerfish will leave some dangling non-daemon thread and prevent shutdown here.
+        System.exit(0);
+    }
 }
diff --git a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/client/Activator.java b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/client/Activator.java
index 43261689507..d77660f3829 100644
--- a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/client/Activator.java
+++ b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/client/Activator.java
@@ -6,28 +6,27 @@
 import org.osgi.framework.ServiceRegistration;
 
 public class Activator implements BundleActivator {
-  private MessageClient messageClient;
-  private ServiceRegistration subscriberRegistration;
+    private MessageClient messageClient;
+    private ServiceRegistration subscriberRegistration;
 
-  @Override
-  public void start(final BundleContext bundleContext) throws Exception {
-    messageClient = new MessageClient();
-    messageClient.start();
+    @Override
+    public void start(final BundleContext bundleContext) throws Exception {
+        messageClient = new MessageClient();
+        messageClient.start();
 
-    subscriberRegistration =
-        bundleContext.registerService(
-            MessageClient.class.getName(), messageClient, new Properties());
-  }
-
-  @Override
-  public void stop(final BundleContext bundleContext) throws Exception {
-    if (null != subscriberRegistration) {
-      subscriberRegistration.unregister();
-      subscriberRegistration = null;
+        subscriberRegistration =
+                bundleContext.registerService(MessageClient.class.getName(), messageClient, new Properties());
     }
-    if (null != messageClient) {
-      messageClient.stop();
-      messageClient = null;
+
+    @Override
+    public void stop(final BundleContext bundleContext) throws Exception {
+        if (null != subscriberRegistration) {
+            subscriberRegistration.unregister();
+            subscriberRegistration = null;
+        }
+        if (null != messageClient) {
+            messageClient.stop();
+            messageClient = null;
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/client/MessageClient.java b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/client/MessageClient.java
index aa6390f6eaa..ed08de74d7e 100644
--- a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/client/MessageClient.java
+++ b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/client/MessageClient.java
@@ -15,84 +15,77 @@
 import org.apache.http.protocol.HttpContext;
 
 public class MessageClient extends ServiceSupport implements HttpClient {
-  private CloseableHttpClient delegate;
+    private CloseableHttpClient delegate;
 
-  @Override
-  protected void doStart() {
-    delegate = HttpClients.custom().build();
-  }
+    @Override
+    protected void doStart() {
+        delegate = HttpClients.custom().build();
+    }
 
-  @Override
-  protected void doStop() throws IOException {
-    delegate.close();
-    delegate = null;
-  }
+    @Override
+    protected void doStop() throws IOException {
+        delegate.close();
+        delegate = null;
+    }
 
-  @Override
-  public HttpParams getParams() {
-    return delegate.getParams();
-  }
+    @Override
+    public HttpParams getParams() {
+        return delegate.getParams();
+    }
 
-  @Override
-  public ClientConnectionManager getConnectionManager() {
-    return delegate.getConnectionManager();
-  }
+    @Override
+    public ClientConnectionManager getConnectionManager() {
+        return delegate.getConnectionManager();
+    }
 
-  @Override
-  public HttpResponse execute(final HttpUriRequest request) throws IOException {
-    return delegate.execute(request);
-  }
+    @Override
+    public HttpResponse execute(final HttpUriRequest request) throws IOException {
+        return delegate.execute(request);
+    }
 
-  @Override
-  public HttpResponse execute(final HttpUriRequest request, final HttpContext context)
-      throws IOException {
-    return delegate.execute(request, context);
-  }
+    @Override
+    public HttpResponse execute(final HttpUriRequest request, final HttpContext context) throws IOException {
+        return delegate.execute(request, context);
+    }
 
-  @Override
-  public HttpResponse execute(final HttpHost target, final HttpRequest request) throws IOException {
-    return delegate.execute(target, request);
-  }
+    @Override
+    public HttpResponse execute(final HttpHost target, final HttpRequest request) throws IOException {
+        return delegate.execute(target, request);
+    }
 
-  @Override
-  public HttpResponse execute(
-      final HttpHost target, final HttpRequest request, final HttpContext context)
-      throws IOException {
-    return delegate.execute(target, request, context);
-  }
+    @Override
+    public HttpResponse execute(final HttpHost target, final HttpRequest request, final HttpContext context)
+            throws IOException {
+        return delegate.execute(target, request, context);
+    }
 
-  @Override
-  public <T> T execute(
-      final HttpUriRequest request, final ResponseHandler<? extends T> responseHandler)
-      throws IOException {
-    return delegate.execute(request, responseHandler);
-  }
+    @Override
+    public <T> T execute(final HttpUriRequest request, final ResponseHandler<? extends T> responseHandler)
+            throws IOException {
+        return delegate.execute(request, responseHandler);
+    }
 
-  @Override
-  public <T> T execute(
-      final HttpUriRequest request,
-      final ResponseHandler<? extends T> responseHandler,
-      final HttpContext context)
-      throws IOException {
-    return delegate.execute(request, responseHandler, context);
-  }
+    @Override
+    public <T> T execute(
+            final HttpUriRequest request, final ResponseHandler<? extends T> responseHandler, final HttpContext context)
+            throws IOException {
+        return delegate.execute(request, responseHandler, context);
+    }
 
-  @Override
-  public <T> T execute(
-      final HttpHost target,
-      final HttpRequest request,
-      final ResponseHandler<? extends T> responseHandler)
-      throws IOException {
-    return delegate.execute(target, request, responseHandler);
-  }
+    @Override
+    public <T> T execute(
+            final HttpHost target, final HttpRequest request, final ResponseHandler<? extends T> responseHandler)
+            throws IOException {
+        return delegate.execute(target, request, responseHandler);
+    }
 
-  @Override
-  public <T> T execute(
-      final HttpHost target,
-      final HttpRequest request,
-      final ResponseHandler<? extends T> responseHandler,
-      final HttpContext context)
-      throws IOException {
-    return delegate.execute(target, request, responseHandler, context);
-  }
+    @Override
+    public <T> T execute(
+            final HttpHost target,
+            final HttpRequest request,
+            final ResponseHandler<? extends T> responseHandler,
+            final HttpContext context)
+            throws IOException {
+        return delegate.execute(target, request, responseHandler, context);
+    }
 }
diff --git a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/common/LogSupport.java b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/common/LogSupport.java
index d0659cecca9..d7fbf905fe9 100644
--- a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/common/LogSupport.java
+++ b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/common/LogSupport.java
@@ -4,5 +4,5 @@
 import org.slf4j.LoggerFactory;
 
 public abstract class LogSupport {
-  protected final Logger log = LoggerFactory.getLogger(getClass());
+    protected final Logger log = LoggerFactory.getLogger(getClass());
 }
diff --git a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/common/ServiceSupport.java b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/common/ServiceSupport.java
index b8eb2f46b57..307c95ff01c 100644
--- a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/common/ServiceSupport.java
+++ b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/common/ServiceSupport.java
@@ -3,35 +3,35 @@
 import static com.google.common.base.Preconditions.checkState;
 
 public abstract class ServiceSupport extends LogSupport {
-  private boolean started;
+    private boolean started;
 
-  public final synchronized void start() throws Exception {
-    checkState(!started);
-    try {
-      log.info("Starting {}", this);
-      doStart();
-      log.info("Started {}", this);
-      started = true;
-    } catch (Exception e) {
-      log.warn("Problem starting {}", this, e);
-      throw e;
+    public final synchronized void start() throws Exception {
+        checkState(!started);
+        try {
+            log.info("Starting {}", this);
+            doStart();
+            log.info("Started {}", this);
+            started = true;
+        } catch (Exception e) {
+            log.warn("Problem starting {}", this, e);
+            throw e;
+        }
     }
-  }
 
-  public final synchronized void stop() throws Exception {
-    checkState(started);
-    try {
-      log.info("Stopping {}", this);
-      doStop();
-      log.info("Stopped {}", this);
-      started = false;
-    } catch (Exception e) {
-      log.warn("Problem stopping {}", this, e);
-      throw e;
+    public final synchronized void stop() throws Exception {
+        checkState(started);
+        try {
+            log.info("Stopping {}", this);
+            doStop();
+            log.info("Stopped {}", this);
+            started = false;
+        } catch (Exception e) {
+            log.warn("Problem stopping {}", this, e);
+            throw e;
+        }
     }
-  }
 
-  protected abstract void doStart() throws Exception;
+    protected abstract void doStart() throws Exception;
 
-  protected abstract void doStop() throws Exception;
+    protected abstract void doStop() throws Exception;
 }
diff --git a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/messaging/PublisherSupport.java b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/messaging/PublisherSupport.java
index ee777cb45a7..3d68edf1bad 100644
--- a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/messaging/PublisherSupport.java
+++ b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/messaging/PublisherSupport.java
@@ -5,26 +5,26 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
 public abstract class PublisherSupport extends ServiceSupport {
-  private final List<SubscriberSupport> subscribers = new CopyOnWriteArrayList<>();
+    private final List<SubscriberSupport> subscribers = new CopyOnWriteArrayList<>();
 
-  public final void subscribe(final SubscriberSupport subscriber) {
-    subscribers.add(subscriber);
-  }
+    public final void subscribe(final SubscriberSupport subscriber) {
+        subscribers.add(subscriber);
+    }
 
-  public final void unsubscribe(final SubscriberSupport subscriber) {
-    subscribers.remove(subscriber);
-  }
+    public final void unsubscribe(final SubscriberSupport subscriber) {
+        subscribers.remove(subscriber);
+    }
 
-  public final void publish(final String text) {
-    publish(new TextMessage(text));
-  }
+    public final void publish(final String text) {
+        publish(new TextMessage(text));
+    }
 
-  public final void publish(final Message message) {
-    log.info("Publishing {}", message);
-    for (SubscriberSupport subscriber : subscribers) {
-      doPublish(subscriber, message);
+    public final void publish(final Message message) {
+        log.info("Publishing {}", message);
+        for (SubscriberSupport subscriber : subscribers) {
+            doPublish(subscriber, message);
+        }
     }
-  }
 
-  protected abstract void doPublish(final SubscriberSupport subscriber, Message message);
+    protected abstract void doPublish(final SubscriberSupport subscriber, Message message);
 }
diff --git a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/messaging/SubscriberSupport.java b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/messaging/SubscriberSupport.java
index 7ff20cbf48c..ca6552ff7e9 100644
--- a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/messaging/SubscriberSupport.java
+++ b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/messaging/SubscriberSupport.java
@@ -3,10 +3,10 @@
 import datadog.smoketest.osgi.common.ServiceSupport;
 
 public abstract class SubscriberSupport extends ServiceSupport {
-  public final void receive(final Message message) {
-    log.info("Receiving {}", message);
-    doReceive(message);
-  }
+    public final void receive(final Message message) {
+        log.info("Receiving {}", message);
+        doReceive(message);
+    }
 
-  protected abstract void doReceive(final Message message);
+    protected abstract void doReceive(final Message message);
 }
diff --git a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/messaging/TextMessage.java b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/messaging/TextMessage.java
index 708f0435e64..e2713d81540 100644
--- a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/messaging/TextMessage.java
+++ b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/messaging/TextMessage.java
@@ -1,14 +1,14 @@
 package datadog.smoketest.osgi.messaging;
 
 public class TextMessage implements Message {
-  private final String text;
+    private final String text;
 
-  public TextMessage(final String text) {
-    this.text = text;
-  }
+    public TextMessage(final String text) {
+        this.text = text;
+    }
 
-  @Override
-  public String toString() {
-    return "\"" + text + "\"";
-  }
+    @Override
+    public String toString() {
+        return "\"" + text + "\"";
+    }
 }
diff --git a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/publishing/Activator.java b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/publishing/Activator.java
index b2b50d7e64e..53a062ed924 100644
--- a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/publishing/Activator.java
+++ b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/publishing/Activator.java
@@ -10,66 +10,64 @@
 import org.osgi.util.tracker.ServiceTracker;
 
 public class Activator implements BundleActivator {
-  private final Object publisherLock = new Object();
-  private ServiceTracker subscriberTracker;
+    private final Object publisherLock = new Object();
+    private ServiceTracker subscriberTracker;
 
-  private volatile AsyncPublisher publisher;
-  private ServiceRegistration publisherRegistration;
+    private volatile AsyncPublisher publisher;
+    private ServiceRegistration publisherRegistration;
 
-  public void start(final BundleContext bundleContext) throws Exception {
-    subscriberTracker =
-        new ServiceTracker(bundleContext, SubscriberSupport.class.getName(), null) {
-          @Override
-          public Object addingService(final ServiceReference reference) {
-            SubscriberSupport subscriber = (SubscriberSupport) bundleContext.getService(reference);
-            if (null == publisher) {
-              startPublisher(bundleContext, subscriber);
-            } else {
-              publisher.subscribe(subscriber);
+    public void start(final BundleContext bundleContext) throws Exception {
+        subscriberTracker = new ServiceTracker(bundleContext, SubscriberSupport.class.getName(), null) {
+            @Override
+            public Object addingService(final ServiceReference reference) {
+                SubscriberSupport subscriber = (SubscriberSupport) bundleContext.getService(reference);
+                if (null == publisher) {
+                    startPublisher(bundleContext, subscriber);
+                } else {
+                    publisher.subscribe(subscriber);
+                }
+                return subscriber;
             }
-            return subscriber;
-          }
 
-          @Override
-          public void removedService(final ServiceReference reference, final Object subscriber) {
-            publisher.unsubscribe((SubscriberSupport) subscriber);
-            bundleContext.ungetService(reference);
-          }
+            @Override
+            public void removedService(final ServiceReference reference, final Object subscriber) {
+                publisher.unsubscribe((SubscriberSupport) subscriber);
+                bundleContext.ungetService(reference);
+            }
         };
-    subscriberTracker.open();
-  }
+        subscriberTracker.open();
+    }
 
-  public void stop(final BundleContext bundleContext) throws Exception {
-    subscriberTracker.close();
-    subscriberTracker = null;
+    public void stop(final BundleContext bundleContext) throws Exception {
+        subscriberTracker.close();
+        subscriberTracker = null;
 
-    synchronized (publisherLock) {
-      if (null != publisherRegistration) {
-        publisherRegistration.unregister();
-        publisherRegistration = null;
-      }
-      if (null != publisher) {
-        publisher.stop();
-        publisher = null;
-      }
+        synchronized (publisherLock) {
+            if (null != publisherRegistration) {
+                publisherRegistration.unregister();
+                publisherRegistration = null;
+            }
+            if (null != publisher) {
+                publisher.stop();
+                publisher = null;
+            }
+        }
     }
-  }
 
-  private void startPublisher(final BundleContext bundleContext, SubscriberSupport subscriber) {
-    synchronized (publisherLock) {
-      if (null == publisher) {
-        try {
-          AsyncPublisher publisher = new AsyncPublisher();
-          publisher.start();
-          publisher.subscribe(subscriber);
-          publisherRegistration =
-              bundleContext.registerService(
-                  PublisherSupport.class.getName(), publisher, new Properties());
-          this.publisher = publisher;
-        } catch (Exception e) {
-          throw new IllegalStateException("Publisher did not start", e);
+    private void startPublisher(final BundleContext bundleContext, SubscriberSupport subscriber) {
+        synchronized (publisherLock) {
+            if (null == publisher) {
+                try {
+                    AsyncPublisher publisher = new AsyncPublisher();
+                    publisher.start();
+                    publisher.subscribe(subscriber);
+                    publisherRegistration = bundleContext.registerService(
+                            PublisherSupport.class.getName(), publisher, new Properties());
+                    this.publisher = publisher;
+                } catch (Exception e) {
+                    throw new IllegalStateException("Publisher did not start", e);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/publishing/AsyncPublisher.java b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/publishing/AsyncPublisher.java
index bf7f2763ede..a5f16e2f7fe 100644
--- a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/publishing/AsyncPublisher.java
+++ b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/publishing/AsyncPublisher.java
@@ -7,37 +7,37 @@
 import java.util.concurrent.Executors;
 
 public class AsyncPublisher extends PublisherSupport {
-  private ExecutorService executorService;
-
-  @Override
-  protected void doStart() {
-    executorService = Executors.newCachedThreadPool();
-  }
-
-  @Override
-  protected void doPublish(final SubscriberSupport subscriber, final Message message) {
-    executorService.submit(new PublishTask(subscriber, message));
-  }
-
-  @Override
-  protected void doStop() {
-    executorService.shutdown();
-    executorService = null;
-  }
-
-  class PublishTask implements Runnable {
-    private final SubscriberSupport subscriber;
-    private final Message message;
-
-    PublishTask(final SubscriberSupport subscriber, final Message message) {
-      this.subscriber = subscriber;
-      this.message = message;
+    private ExecutorService executorService;
+
+    @Override
+    protected void doStart() {
+        executorService = Executors.newCachedThreadPool();
+    }
+
+    @Override
+    protected void doPublish(final SubscriberSupport subscriber, final Message message) {
+        executorService.submit(new PublishTask(subscriber, message));
     }
 
     @Override
-    public void run() {
-      subscriber.receive(message);
-      log.info("Published {} to {}", message, subscriber);
+    protected void doStop() {
+        executorService.shutdown();
+        executorService = null;
+    }
+
+    class PublishTask implements Runnable {
+        private final SubscriberSupport subscriber;
+        private final Message message;
+
+        PublishTask(final SubscriberSupport subscriber, final Message message) {
+            this.subscriber = subscriber;
+            this.message = message;
+        }
+
+        @Override
+        public void run() {
+            subscriber.receive(message);
+            log.info("Published {} to {}", message, subscriber);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/subscribing/Activator.java b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/subscribing/Activator.java
index f5241c67d08..842b148f7b7 100644
--- a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/subscribing/Activator.java
+++ b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/subscribing/Activator.java
@@ -7,26 +7,25 @@
 import org.osgi.framework.ServiceRegistration;
 
 public class Activator implements BundleActivator {
-  private AsyncSubscriber subscriber;
-  private ServiceRegistration subscriberRegistration;
+    private AsyncSubscriber subscriber;
+    private ServiceRegistration subscriberRegistration;
 
-  public void start(final BundleContext bundleContext) throws Exception {
-    subscriber = new AsyncSubscriber();
-    subscriber.start();
+    public void start(final BundleContext bundleContext) throws Exception {
+        subscriber = new AsyncSubscriber();
+        subscriber.start();
 
-    subscriberRegistration =
-        bundleContext.registerService(
-            SubscriberSupport.class.getName(), subscriber, new Properties());
-  }
-
-  public void stop(final BundleContext bundleContext) throws Exception {
-    if (null != subscriberRegistration) {
-      subscriberRegistration.unregister();
-      subscriberRegistration = null;
+        subscriberRegistration =
+                bundleContext.registerService(SubscriberSupport.class.getName(), subscriber, new Properties());
     }
-    if (null != subscriber) {
-      subscriber.stop();
-      subscriber = null;
+
+    public void stop(final BundleContext bundleContext) throws Exception {
+        if (null != subscriberRegistration) {
+            subscriberRegistration.unregister();
+            subscriberRegistration = null;
+        }
+        if (null != subscriber) {
+            subscriber.stop();
+            subscriber = null;
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/subscribing/AsyncSubscriber.java b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/subscribing/AsyncSubscriber.java
index acc3e4739e2..a999caa5266 100644
--- a/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/subscribing/AsyncSubscriber.java
+++ b/dd-smoke-tests/osgi/src/main/java/datadog/smoketest/osgi/subscribing/AsyncSubscriber.java
@@ -6,34 +6,34 @@
 import java.util.concurrent.Executors;
 
 public class AsyncSubscriber extends SubscriberSupport {
-  private ExecutorService executorService;
+    private ExecutorService executorService;
 
-  @Override
-  protected void doStart() {
-    executorService = Executors.newCachedThreadPool();
-  }
+    @Override
+    protected void doStart() {
+        executorService = Executors.newCachedThreadPool();
+    }
 
-  @Override
-  protected void doReceive(final Message message) {
-    executorService.submit(new ReceiveTask(message));
-  }
+    @Override
+    protected void doReceive(final Message message) {
+        executorService.submit(new ReceiveTask(message));
+    }
 
-  @Override
-  protected void doStop() {
-    executorService.shutdown();
-    executorService = null;
-  }
+    @Override
+    protected void doStop() {
+        executorService.shutdown();
+        executorService = null;
+    }
 
-  class ReceiveTask implements Runnable {
-    private final Message message;
+    class ReceiveTask implements Runnable {
+        private final Message message;
 
-    ReceiveTask(final Message message) {
-      this.message = message;
-    }
+        ReceiveTask(final Message message) {
+            this.message = message;
+        }
 
-    @Override
-    public void run() {
-      log.info("Received {}", message);
+        @Override
+        public void run() {
+            log.info("Received {}", message);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.4/app/Filters.java b/dd-smoke-tests/play-2.4/app/Filters.java
index 2f981c6ebd7..530c31fc115 100644
--- a/dd-smoke-tests/play-2.4/app/Filters.java
+++ b/dd-smoke-tests/play-2.4/app/Filters.java
@@ -8,21 +8,21 @@
 import play.http.HttpFilters;
 
 public class Filters implements HttpFilters {
-  private final Filter f1;
-  private final Filter f2;
-  private final Filter f3;
-  private final Filter f4;
+    private final Filter f1;
+    private final Filter f2;
+    private final Filter f3;
+    private final Filter f4;
 
-  @Inject
-  public Filters(Filter1 f1, Filter2 f2, Filter3 f3, Filter4 f4) {
-    this.f1 = f1;
-    this.f2 = f2;
-    this.f3 = f3;
-    this.f4 = f4;
-  }
+    @Inject
+    public Filters(Filter1 f1, Filter2 f2, Filter3 f3, Filter4 f4) {
+        this.f1 = f1;
+        this.f2 = f2;
+        this.f3 = f3;
+        this.f4 = f4;
+    }
 
-  @Override
-  public EssentialFilter[] filters() {
-    return new EssentialFilter[] {f1, f2, f3, f4};
-  }
+    @Override
+    public EssentialFilter[] filters() {
+        return new EssentialFilter[] {f1, f2, f3, f4};
+    }
 }
diff --git a/dd-smoke-tests/play-2.4/app/actions/AbstractAction.java b/dd-smoke-tests/play-2.4/app/actions/AbstractAction.java
index 3bc574b02b4..e239ca663ca 100644
--- a/dd-smoke-tests/play-2.4/app/actions/AbstractAction.java
+++ b/dd-smoke-tests/play-2.4/app/actions/AbstractAction.java
@@ -11,22 +11,22 @@
 
 public abstract class AbstractAction extends Action.Simple {
 
-  private final String operationName;
+    private final String operationName;
 
-  protected AbstractAction(String operationName) {
-    this.operationName = operationName;
-  }
+    protected AbstractAction(String operationName) {
+        this.operationName = operationName;
+    }
 
-  @Override
-  public F.Promise<Result> call(Http.Context context) throws Throwable {
-    Tracer tracer = GlobalTracer.get();
-    Span span = tracer.buildSpan(operationName).start();
-    Scope scope = tracer.scopeManager().activate(span);
-    try {
-      return delegate.call(context);
-    } finally {
-      scope.close();
-      span.finish();
+    @Override
+    public F.Promise<Result> call(Http.Context context) throws Throwable {
+        Tracer tracer = GlobalTracer.get();
+        Span span = tracer.buildSpan(operationName).start();
+        Scope scope = tracer.scopeManager().activate(span);
+        try {
+            return delegate.call(context);
+        } finally {
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.4/app/actions/Action1.java b/dd-smoke-tests/play-2.4/app/actions/Action1.java
index 2d024353b49..ae23f1f5a8e 100644
--- a/dd-smoke-tests/play-2.4/app/actions/Action1.java
+++ b/dd-smoke-tests/play-2.4/app/actions/Action1.java
@@ -1,7 +1,7 @@
 package actions;
 
 public class Action1 extends AbstractAction {
-  public Action1() {
-    super("action1");
-  }
+    public Action1() {
+        super("action1");
+    }
 }
diff --git a/dd-smoke-tests/play-2.4/app/actions/Action2.java b/dd-smoke-tests/play-2.4/app/actions/Action2.java
index 0416048be64..ff9686617d0 100644
--- a/dd-smoke-tests/play-2.4/app/actions/Action2.java
+++ b/dd-smoke-tests/play-2.4/app/actions/Action2.java
@@ -1,7 +1,7 @@
 package actions;
 
 public class Action2 extends AbstractAction {
-  public Action2() {
-    super("action2");
-  }
+    public Action2() {
+        super("action2");
+    }
 }
diff --git a/dd-smoke-tests/play-2.4/app/controllers/JController.java b/dd-smoke-tests/play-2.4/app/controllers/JController.java
index 9ca3ba7c718..62af6c96fdc 100644
--- a/dd-smoke-tests/play-2.4/app/controllers/JController.java
+++ b/dd-smoke-tests/play-2.4/app/controllers/JController.java
@@ -16,32 +16,31 @@
 
 public class JController extends Controller {
 
-  private final WSClient ws;
-  private final String clientRequestBase;
+    private final WSClient ws;
+    private final String clientRequestBase;
 
-  @Inject
-  public JController(WSClient ws, Configuration configuration) {
-    this.ws = ws;
-    this.clientRequestBase =
-        configuration.getString("client.request.base", "http://localhost:0/broken/");
-  }
+    @Inject
+    public JController(WSClient ws, Configuration configuration) {
+        this.ws = ws;
+        this.clientRequestBase = configuration.getString("client.request.base", "http://localhost:0/broken/");
+    }
 
-  @With({Action1.class, Action2.class})
-  public Promise<Result> doGet(final Integer id) {
-    Tracer tracer = GlobalTracer.get();
-    Span span = tracer.buildSpan("do-get").start();
-    Scope scope = tracer.scopeManager().activate(span);
-    try {
-      if (id > 0) {
-        return ws.url(clientRequestBase + id)
-            .get()
-            .map(response -> status(response.getStatus(), "J Got '" + response.getBody() + "'"));
-      } else {
-        return Promise.pure(badRequest("No ID."));
-      }
-    } finally {
-      scope.close();
-      span.finish();
+    @With({Action1.class, Action2.class})
+    public Promise<Result> doGet(final Integer id) {
+        Tracer tracer = GlobalTracer.get();
+        Span span = tracer.buildSpan("do-get").start();
+        Scope scope = tracer.scopeManager().activate(span);
+        try {
+            if (id > 0) {
+                return ws.url(clientRequestBase + id)
+                        .get()
+                        .map(response -> status(response.getStatus(), "J Got '" + response.getBody() + "'"));
+            } else {
+                return Promise.pure(badRequest("No ID."));
+            }
+        } finally {
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.4/app/filters/Filter1.java b/dd-smoke-tests/play-2.4/app/filters/Filter1.java
index 0c7470a41a7..b8a5f43dc40 100644
--- a/dd-smoke-tests/play-2.4/app/filters/Filter1.java
+++ b/dd-smoke-tests/play-2.4/app/filters/Filter1.java
@@ -4,7 +4,7 @@
 
 @Singleton
 public class Filter1 extends AbstractFilter {
-  public Filter1() {
-    super("filter1", true);
-  }
+    public Filter1() {
+        super("filter1", true);
+    }
 }
diff --git a/dd-smoke-tests/play-2.4/app/filters/Filter2.java b/dd-smoke-tests/play-2.4/app/filters/Filter2.java
index 46e6228a42f..fea1e0b7344 100644
--- a/dd-smoke-tests/play-2.4/app/filters/Filter2.java
+++ b/dd-smoke-tests/play-2.4/app/filters/Filter2.java
@@ -4,7 +4,7 @@
 
 @Singleton
 public class Filter2 extends AbstractFilter {
-  public Filter2() {
-    super("filter2");
-  }
+    public Filter2() {
+        super("filter2");
+    }
 }
diff --git a/dd-smoke-tests/play-2.4/app/filters/Filter3.java b/dd-smoke-tests/play-2.4/app/filters/Filter3.java
index 99a227eaa84..85511a3f692 100644
--- a/dd-smoke-tests/play-2.4/app/filters/Filter3.java
+++ b/dd-smoke-tests/play-2.4/app/filters/Filter3.java
@@ -4,7 +4,7 @@
 
 @Singleton
 public class Filter3 extends AbstractFilter {
-  public Filter3() {
-    super("filter3");
-  }
+    public Filter3() {
+        super("filter3");
+    }
 }
diff --git a/dd-smoke-tests/play-2.4/app/filters/Filter4.java b/dd-smoke-tests/play-2.4/app/filters/Filter4.java
index edc45e8d192..87bd5b7cbce 100644
--- a/dd-smoke-tests/play-2.4/app/filters/Filter4.java
+++ b/dd-smoke-tests/play-2.4/app/filters/Filter4.java
@@ -4,7 +4,7 @@
 
 @Singleton
 public class Filter4 extends AbstractFilter {
-  public Filter4() {
-    super("filter4");
-  }
+    public Filter4() {
+        super("filter4");
+    }
 }
diff --git a/dd-smoke-tests/play-2.5/app/Filters.java b/dd-smoke-tests/play-2.5/app/Filters.java
index 4922462c052..d05b8053404 100644
--- a/dd-smoke-tests/play-2.5/app/Filters.java
+++ b/dd-smoke-tests/play-2.5/app/Filters.java
@@ -6,8 +6,8 @@
 import play.http.DefaultHttpFilters;
 
 public class Filters extends DefaultHttpFilters {
-  @Inject
-  public Filters(Filter1 f1, Filter2 f2, Filter3 f3, Filter4 f4) {
-    super(f1, f2, f3, f4);
-  }
+    @Inject
+    public Filters(Filter1 f1, Filter2 f2, Filter3 f3, Filter4 f4) {
+        super(f1, f2, f3, f4);
+    }
 }
diff --git a/dd-smoke-tests/play-2.5/app/actions/AbstractAction.java b/dd-smoke-tests/play-2.5/app/actions/AbstractAction.java
index 704fd9697f0..ce0894827fc 100644
--- a/dd-smoke-tests/play-2.5/app/actions/AbstractAction.java
+++ b/dd-smoke-tests/play-2.5/app/actions/AbstractAction.java
@@ -11,22 +11,22 @@
 
 public abstract class AbstractAction extends Action.Simple {
 
-  private final String operationName;
+    private final String operationName;
 
-  protected AbstractAction(String operationName) {
-    this.operationName = operationName;
-  }
+    protected AbstractAction(String operationName) {
+        this.operationName = operationName;
+    }
 
-  @Override
-  public CompletionStage<Result> call(Http.Context context) {
-    Tracer tracer = GlobalTracer.get();
-    Span span = tracer.buildSpan(operationName).start();
-    Scope scope = tracer.scopeManager().activate(span);
-    try {
-      return delegate.call(context);
-    } finally {
-      scope.close();
-      span.finish();
+    @Override
+    public CompletionStage<Result> call(Http.Context context) {
+        Tracer tracer = GlobalTracer.get();
+        Span span = tracer.buildSpan(operationName).start();
+        Scope scope = tracer.scopeManager().activate(span);
+        try {
+            return delegate.call(context);
+        } finally {
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.5/app/actions/Action1.java b/dd-smoke-tests/play-2.5/app/actions/Action1.java
index 2d024353b49..ae23f1f5a8e 100644
--- a/dd-smoke-tests/play-2.5/app/actions/Action1.java
+++ b/dd-smoke-tests/play-2.5/app/actions/Action1.java
@@ -1,7 +1,7 @@
 package actions;
 
 public class Action1 extends AbstractAction {
-  public Action1() {
-    super("action1");
-  }
+    public Action1() {
+        super("action1");
+    }
 }
diff --git a/dd-smoke-tests/play-2.5/app/actions/Action2.java b/dd-smoke-tests/play-2.5/app/actions/Action2.java
index 0416048be64..ff9686617d0 100644
--- a/dd-smoke-tests/play-2.5/app/actions/Action2.java
+++ b/dd-smoke-tests/play-2.5/app/actions/Action2.java
@@ -1,7 +1,7 @@
 package actions;
 
 public class Action2 extends AbstractAction {
-  public Action2() {
-    super("action2");
-  }
+    public Action2() {
+        super("action2");
+    }
 }
diff --git a/dd-smoke-tests/play-2.5/app/controllers/JController.java b/dd-smoke-tests/play-2.5/app/controllers/JController.java
index efe85914a54..d5c81f952b3 100644
--- a/dd-smoke-tests/play-2.5/app/controllers/JController.java
+++ b/dd-smoke-tests/play-2.5/app/controllers/JController.java
@@ -17,33 +17,31 @@
 
 public class JController extends Controller {
 
-  private final WSClient ws;
-  private final String clientRequestBase;
+    private final WSClient ws;
+    private final String clientRequestBase;
 
-  @Inject
-  public JController(WSClient ws, Configuration configuration) {
-    this.ws = ws;
-    this.clientRequestBase =
-        configuration.getString("client.request.base", "http://localhost:0/broken/");
-  }
+    @Inject
+    public JController(WSClient ws, Configuration configuration) {
+        this.ws = ws;
+        this.clientRequestBase = configuration.getString("client.request.base", "http://localhost:0/broken/");
+    }
 
-  @With({Action1.class, Action2.class})
-  public CompletionStage<Result> doGet(final Integer id) {
-    Tracer tracer = GlobalTracer.get();
-    Span span = tracer.buildSpan("do-get").start();
-    Scope scope = tracer.scopeManager().activate(span);
-    try {
-      if (id > 0) {
-        return ws.url(clientRequestBase + id)
-            .get()
-            .thenApply(
-                response -> status(response.getStatus(), "J Got '" + response.getBody() + "'"));
-      } else {
-        return CompletableFuture.supplyAsync(() -> badRequest("No ID."));
-      }
-    } finally {
-      scope.close();
-      span.finish();
+    @With({Action1.class, Action2.class})
+    public CompletionStage<Result> doGet(final Integer id) {
+        Tracer tracer = GlobalTracer.get();
+        Span span = tracer.buildSpan("do-get").start();
+        Scope scope = tracer.scopeManager().activate(span);
+        try {
+            if (id > 0) {
+                return ws.url(clientRequestBase + id)
+                        .get()
+                        .thenApply(response -> status(response.getStatus(), "J Got '" + response.getBody() + "'"));
+            } else {
+                return CompletableFuture.supplyAsync(() -> badRequest("No ID."));
+            }
+        } finally {
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.5/app/filters/AbstractFilter.java b/dd-smoke-tests/play-2.5/app/filters/AbstractFilter.java
index e21c8ae2a3d..42ec9080d5a 100644
--- a/dd-smoke-tests/play-2.5/app/filters/AbstractFilter.java
+++ b/dd-smoke-tests/play-2.5/app/filters/AbstractFilter.java
@@ -13,47 +13,47 @@
 import play.mvc.Result;
 
 public abstract class AbstractFilter extends Filter {
-  private final HttpExecutionContext ec;
-  private final String operationName;
-  private final boolean wrap;
+    private final HttpExecutionContext ec;
+    private final String operationName;
+    private final boolean wrap;
 
-  public AbstractFilter(String operationName, Materializer mat, HttpExecutionContext ec) {
-    this(operationName, false, mat, ec);
-  }
+    public AbstractFilter(String operationName, Materializer mat, HttpExecutionContext ec) {
+        this(operationName, false, mat, ec);
+    }
 
-  public AbstractFilter(
-      String operationName, boolean wrap, Materializer mat, HttpExecutionContext ec) {
-    super(mat);
-    this.operationName = operationName;
-    this.wrap = wrap;
-    this.ec = ec;
-  }
+    public AbstractFilter(String operationName, boolean wrap, Materializer mat, HttpExecutionContext ec) {
+        super(mat);
+        this.operationName = operationName;
+        this.wrap = wrap;
+        this.ec = ec;
+    }
 
-  @Override
-  public CompletionStage<Result> apply(
-      Function<Http.RequestHeader, CompletionStage<Result>> nextFilter,
-      Http.RequestHeader requestHeader) {
-    final Tracer tracer = GlobalTracer.get();
-    final Span startedSpan = wrap ? tracer.buildSpan(operationName).start() : null;
-    Scope outerScope = wrap ? tracer.scopeManager().activate(startedSpan) : null;
-    try {
-      return nextFilter
-          .apply(requestHeader)
-          .thenApplyAsync(
-              result -> {
-                Span span = wrap ? startedSpan : tracer.buildSpan(operationName).start();
-                try (Scope innerScope = tracer.scopeManager().activate(span)) {
-                  // Yes this does no real work
-                  return result;
-                } finally {
-                  span.finish();
-                }
-              },
-              ec.current());
-    } finally {
-      if (wrap) {
-        outerScope.close();
-      }
+    @Override
+    public CompletionStage<Result> apply(
+            Function<Http.RequestHeader, CompletionStage<Result>> nextFilter, Http.RequestHeader requestHeader) {
+        final Tracer tracer = GlobalTracer.get();
+        final Span startedSpan = wrap ? tracer.buildSpan(operationName).start() : null;
+        Scope outerScope = wrap ? tracer.scopeManager().activate(startedSpan) : null;
+        try {
+            return nextFilter
+                    .apply(requestHeader)
+                    .thenApplyAsync(
+                            result -> {
+                                Span span = wrap
+                                        ? startedSpan
+                                        : tracer.buildSpan(operationName).start();
+                                try (Scope innerScope = tracer.scopeManager().activate(span)) {
+                                    // Yes this does no real work
+                                    return result;
+                                } finally {
+                                    span.finish();
+                                }
+                            },
+                            ec.current());
+        } finally {
+            if (wrap) {
+                outerScope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.5/app/filters/Filter1.java b/dd-smoke-tests/play-2.5/app/filters/Filter1.java
index 50246522a4f..167f2e45865 100644
--- a/dd-smoke-tests/play-2.5/app/filters/Filter1.java
+++ b/dd-smoke-tests/play-2.5/app/filters/Filter1.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter1 extends AbstractFilter {
-  @Inject
-  public Filter1(Materializer mat, HttpExecutionContext ec) {
-    super("filter1", true, mat, ec);
-  }
+    @Inject
+    public Filter1(Materializer mat, HttpExecutionContext ec) {
+        super("filter1", true, mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.5/app/filters/Filter2.java b/dd-smoke-tests/play-2.5/app/filters/Filter2.java
index 00047f36a59..ffc1774ea6a 100644
--- a/dd-smoke-tests/play-2.5/app/filters/Filter2.java
+++ b/dd-smoke-tests/play-2.5/app/filters/Filter2.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter2 extends AbstractFilter {
-  @Inject
-  public Filter2(Materializer mat, HttpExecutionContext ec) {
-    super("filter2", mat, ec);
-  }
+    @Inject
+    public Filter2(Materializer mat, HttpExecutionContext ec) {
+        super("filter2", mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.5/app/filters/Filter3.java b/dd-smoke-tests/play-2.5/app/filters/Filter3.java
index 55b9f6f7c4e..c66e4395e42 100644
--- a/dd-smoke-tests/play-2.5/app/filters/Filter3.java
+++ b/dd-smoke-tests/play-2.5/app/filters/Filter3.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter3 extends AbstractFilter {
-  @Inject
-  public Filter3(Materializer mat, HttpExecutionContext ec) {
-    super("filter3", mat, ec);
-  }
+    @Inject
+    public Filter3(Materializer mat, HttpExecutionContext ec) {
+        super("filter3", mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.5/app/filters/Filter4.java b/dd-smoke-tests/play-2.5/app/filters/Filter4.java
index 63a85d6c543..7181ad9daa8 100644
--- a/dd-smoke-tests/play-2.5/app/filters/Filter4.java
+++ b/dd-smoke-tests/play-2.5/app/filters/Filter4.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter4 extends AbstractFilter {
-  @Inject
-  public Filter4(Materializer mat, HttpExecutionContext ec) {
-    super("filter4", mat, ec);
-  }
+    @Inject
+    public Filter4(Materializer mat, HttpExecutionContext ec) {
+        super("filter4", mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.6/app/Filters.java b/dd-smoke-tests/play-2.6/app/Filters.java
index 4922462c052..d05b8053404 100644
--- a/dd-smoke-tests/play-2.6/app/Filters.java
+++ b/dd-smoke-tests/play-2.6/app/Filters.java
@@ -6,8 +6,8 @@
 import play.http.DefaultHttpFilters;
 
 public class Filters extends DefaultHttpFilters {
-  @Inject
-  public Filters(Filter1 f1, Filter2 f2, Filter3 f3, Filter4 f4) {
-    super(f1, f2, f3, f4);
-  }
+    @Inject
+    public Filters(Filter1 f1, Filter2 f2, Filter3 f3, Filter4 f4) {
+        super(f1, f2, f3, f4);
+    }
 }
diff --git a/dd-smoke-tests/play-2.6/app/actions/AbstractAction.java b/dd-smoke-tests/play-2.6/app/actions/AbstractAction.java
index 704fd9697f0..ce0894827fc 100644
--- a/dd-smoke-tests/play-2.6/app/actions/AbstractAction.java
+++ b/dd-smoke-tests/play-2.6/app/actions/AbstractAction.java
@@ -11,22 +11,22 @@
 
 public abstract class AbstractAction extends Action.Simple {
 
-  private final String operationName;
+    private final String operationName;
 
-  protected AbstractAction(String operationName) {
-    this.operationName = operationName;
-  }
+    protected AbstractAction(String operationName) {
+        this.operationName = operationName;
+    }
 
-  @Override
-  public CompletionStage<Result> call(Http.Context context) {
-    Tracer tracer = GlobalTracer.get();
-    Span span = tracer.buildSpan(operationName).start();
-    Scope scope = tracer.scopeManager().activate(span);
-    try {
-      return delegate.call(context);
-    } finally {
-      scope.close();
-      span.finish();
+    @Override
+    public CompletionStage<Result> call(Http.Context context) {
+        Tracer tracer = GlobalTracer.get();
+        Span span = tracer.buildSpan(operationName).start();
+        Scope scope = tracer.scopeManager().activate(span);
+        try {
+            return delegate.call(context);
+        } finally {
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.6/app/actions/Action1.java b/dd-smoke-tests/play-2.6/app/actions/Action1.java
index 2d024353b49..ae23f1f5a8e 100644
--- a/dd-smoke-tests/play-2.6/app/actions/Action1.java
+++ b/dd-smoke-tests/play-2.6/app/actions/Action1.java
@@ -1,7 +1,7 @@
 package actions;
 
 public class Action1 extends AbstractAction {
-  public Action1() {
-    super("action1");
-  }
+    public Action1() {
+        super("action1");
+    }
 }
diff --git a/dd-smoke-tests/play-2.6/app/actions/Action2.java b/dd-smoke-tests/play-2.6/app/actions/Action2.java
index 0416048be64..ff9686617d0 100644
--- a/dd-smoke-tests/play-2.6/app/actions/Action2.java
+++ b/dd-smoke-tests/play-2.6/app/actions/Action2.java
@@ -1,7 +1,7 @@
 package actions;
 
 public class Action2 extends AbstractAction {
-  public Action2() {
-    super("action2");
-  }
+    public Action2() {
+        super("action2");
+    }
 }
diff --git a/dd-smoke-tests/play-2.6/app/controllers/JController.java b/dd-smoke-tests/play-2.6/app/controllers/JController.java
index efe85914a54..d5c81f952b3 100644
--- a/dd-smoke-tests/play-2.6/app/controllers/JController.java
+++ b/dd-smoke-tests/play-2.6/app/controllers/JController.java
@@ -17,33 +17,31 @@
 
 public class JController extends Controller {
 
-  private final WSClient ws;
-  private final String clientRequestBase;
+    private final WSClient ws;
+    private final String clientRequestBase;
 
-  @Inject
-  public JController(WSClient ws, Configuration configuration) {
-    this.ws = ws;
-    this.clientRequestBase =
-        configuration.getString("client.request.base", "http://localhost:0/broken/");
-  }
+    @Inject
+    public JController(WSClient ws, Configuration configuration) {
+        this.ws = ws;
+        this.clientRequestBase = configuration.getString("client.request.base", "http://localhost:0/broken/");
+    }
 
-  @With({Action1.class, Action2.class})
-  public CompletionStage<Result> doGet(final Integer id) {
-    Tracer tracer = GlobalTracer.get();
-    Span span = tracer.buildSpan("do-get").start();
-    Scope scope = tracer.scopeManager().activate(span);
-    try {
-      if (id > 0) {
-        return ws.url(clientRequestBase + id)
-            .get()
-            .thenApply(
-                response -> status(response.getStatus(), "J Got '" + response.getBody() + "'"));
-      } else {
-        return CompletableFuture.supplyAsync(() -> badRequest("No ID."));
-      }
-    } finally {
-      scope.close();
-      span.finish();
+    @With({Action1.class, Action2.class})
+    public CompletionStage<Result> doGet(final Integer id) {
+        Tracer tracer = GlobalTracer.get();
+        Span span = tracer.buildSpan("do-get").start();
+        Scope scope = tracer.scopeManager().activate(span);
+        try {
+            if (id > 0) {
+                return ws.url(clientRequestBase + id)
+                        .get()
+                        .thenApply(response -> status(response.getStatus(), "J Got '" + response.getBody() + "'"));
+            } else {
+                return CompletableFuture.supplyAsync(() -> badRequest("No ID."));
+            }
+        } finally {
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.6/app/filters/AbstractFilter.java b/dd-smoke-tests/play-2.6/app/filters/AbstractFilter.java
index e21c8ae2a3d..42ec9080d5a 100644
--- a/dd-smoke-tests/play-2.6/app/filters/AbstractFilter.java
+++ b/dd-smoke-tests/play-2.6/app/filters/AbstractFilter.java
@@ -13,47 +13,47 @@
 import play.mvc.Result;
 
 public abstract class AbstractFilter extends Filter {
-  private final HttpExecutionContext ec;
-  private final String operationName;
-  private final boolean wrap;
+    private final HttpExecutionContext ec;
+    private final String operationName;
+    private final boolean wrap;
 
-  public AbstractFilter(String operationName, Materializer mat, HttpExecutionContext ec) {
-    this(operationName, false, mat, ec);
-  }
+    public AbstractFilter(String operationName, Materializer mat, HttpExecutionContext ec) {
+        this(operationName, false, mat, ec);
+    }
 
-  public AbstractFilter(
-      String operationName, boolean wrap, Materializer mat, HttpExecutionContext ec) {
-    super(mat);
-    this.operationName = operationName;
-    this.wrap = wrap;
-    this.ec = ec;
-  }
+    public AbstractFilter(String operationName, boolean wrap, Materializer mat, HttpExecutionContext ec) {
+        super(mat);
+        this.operationName = operationName;
+        this.wrap = wrap;
+        this.ec = ec;
+    }
 
-  @Override
-  public CompletionStage<Result> apply(
-      Function<Http.RequestHeader, CompletionStage<Result>> nextFilter,
-      Http.RequestHeader requestHeader) {
-    final Tracer tracer = GlobalTracer.get();
-    final Span startedSpan = wrap ? tracer.buildSpan(operationName).start() : null;
-    Scope outerScope = wrap ? tracer.scopeManager().activate(startedSpan) : null;
-    try {
-      return nextFilter
-          .apply(requestHeader)
-          .thenApplyAsync(
-              result -> {
-                Span span = wrap ? startedSpan : tracer.buildSpan(operationName).start();
-                try (Scope innerScope = tracer.scopeManager().activate(span)) {
-                  // Yes this does no real work
-                  return result;
-                } finally {
-                  span.finish();
-                }
-              },
-              ec.current());
-    } finally {
-      if (wrap) {
-        outerScope.close();
-      }
+    @Override
+    public CompletionStage<Result> apply(
+            Function<Http.RequestHeader, CompletionStage<Result>> nextFilter, Http.RequestHeader requestHeader) {
+        final Tracer tracer = GlobalTracer.get();
+        final Span startedSpan = wrap ? tracer.buildSpan(operationName).start() : null;
+        Scope outerScope = wrap ? tracer.scopeManager().activate(startedSpan) : null;
+        try {
+            return nextFilter
+                    .apply(requestHeader)
+                    .thenApplyAsync(
+                            result -> {
+                                Span span = wrap
+                                        ? startedSpan
+                                        : tracer.buildSpan(operationName).start();
+                                try (Scope innerScope = tracer.scopeManager().activate(span)) {
+                                    // Yes this does no real work
+                                    return result;
+                                } finally {
+                                    span.finish();
+                                }
+                            },
+                            ec.current());
+        } finally {
+            if (wrap) {
+                outerScope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.6/app/filters/Filter1.java b/dd-smoke-tests/play-2.6/app/filters/Filter1.java
index 50246522a4f..167f2e45865 100644
--- a/dd-smoke-tests/play-2.6/app/filters/Filter1.java
+++ b/dd-smoke-tests/play-2.6/app/filters/Filter1.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter1 extends AbstractFilter {
-  @Inject
-  public Filter1(Materializer mat, HttpExecutionContext ec) {
-    super("filter1", true, mat, ec);
-  }
+    @Inject
+    public Filter1(Materializer mat, HttpExecutionContext ec) {
+        super("filter1", true, mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.6/app/filters/Filter2.java b/dd-smoke-tests/play-2.6/app/filters/Filter2.java
index 00047f36a59..ffc1774ea6a 100644
--- a/dd-smoke-tests/play-2.6/app/filters/Filter2.java
+++ b/dd-smoke-tests/play-2.6/app/filters/Filter2.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter2 extends AbstractFilter {
-  @Inject
-  public Filter2(Materializer mat, HttpExecutionContext ec) {
-    super("filter2", mat, ec);
-  }
+    @Inject
+    public Filter2(Materializer mat, HttpExecutionContext ec) {
+        super("filter2", mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.6/app/filters/Filter3.java b/dd-smoke-tests/play-2.6/app/filters/Filter3.java
index 55b9f6f7c4e..c66e4395e42 100644
--- a/dd-smoke-tests/play-2.6/app/filters/Filter3.java
+++ b/dd-smoke-tests/play-2.6/app/filters/Filter3.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter3 extends AbstractFilter {
-  @Inject
-  public Filter3(Materializer mat, HttpExecutionContext ec) {
-    super("filter3", mat, ec);
-  }
+    @Inject
+    public Filter3(Materializer mat, HttpExecutionContext ec) {
+        super("filter3", mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.6/app/filters/Filter4.java b/dd-smoke-tests/play-2.6/app/filters/Filter4.java
index 63a85d6c543..7181ad9daa8 100644
--- a/dd-smoke-tests/play-2.6/app/filters/Filter4.java
+++ b/dd-smoke-tests/play-2.6/app/filters/Filter4.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter4 extends AbstractFilter {
-  @Inject
-  public Filter4(Materializer mat, HttpExecutionContext ec) {
-    super("filter4", mat, ec);
-  }
+    @Inject
+    public Filter4(Materializer mat, HttpExecutionContext ec) {
+        super("filter4", mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.7/app/Filters.java b/dd-smoke-tests/play-2.7/app/Filters.java
index 4922462c052..d05b8053404 100644
--- a/dd-smoke-tests/play-2.7/app/Filters.java
+++ b/dd-smoke-tests/play-2.7/app/Filters.java
@@ -6,8 +6,8 @@
 import play.http.DefaultHttpFilters;
 
 public class Filters extends DefaultHttpFilters {
-  @Inject
-  public Filters(Filter1 f1, Filter2 f2, Filter3 f3, Filter4 f4) {
-    super(f1, f2, f3, f4);
-  }
+    @Inject
+    public Filters(Filter1 f1, Filter2 f2, Filter3 f3, Filter4 f4) {
+        super(f1, f2, f3, f4);
+    }
 }
diff --git a/dd-smoke-tests/play-2.7/app/actions/AbstractAction.java b/dd-smoke-tests/play-2.7/app/actions/AbstractAction.java
index e61082ee4e7..2dadf8e6d19 100644
--- a/dd-smoke-tests/play-2.7/app/actions/AbstractAction.java
+++ b/dd-smoke-tests/play-2.7/app/actions/AbstractAction.java
@@ -11,22 +11,22 @@
 
 public abstract class AbstractAction extends Action.Simple {
 
-  private final String operationName;
+    private final String operationName;
 
-  protected AbstractAction(String operationName) {
-    this.operationName = operationName;
-  }
+    protected AbstractAction(String operationName) {
+        this.operationName = operationName;
+    }
 
-  @Override
-  public CompletionStage<Result> call(Http.Request req) {
-    Tracer tracer = GlobalTracer.get();
-    Span span = tracer.buildSpan(operationName).start();
-    Scope scope = tracer.scopeManager().activate(span);
-    try {
-      return delegate.call(req);
-    } finally {
-      scope.close();
-      span.finish();
+    @Override
+    public CompletionStage<Result> call(Http.Request req) {
+        Tracer tracer = GlobalTracer.get();
+        Span span = tracer.buildSpan(operationName).start();
+        Scope scope = tracer.scopeManager().activate(span);
+        try {
+            return delegate.call(req);
+        } finally {
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.7/app/actions/Action1.java b/dd-smoke-tests/play-2.7/app/actions/Action1.java
index 2d024353b49..ae23f1f5a8e 100644
--- a/dd-smoke-tests/play-2.7/app/actions/Action1.java
+++ b/dd-smoke-tests/play-2.7/app/actions/Action1.java
@@ -1,7 +1,7 @@
 package actions;
 
 public class Action1 extends AbstractAction {
-  public Action1() {
-    super("action1");
-  }
+    public Action1() {
+        super("action1");
+    }
 }
diff --git a/dd-smoke-tests/play-2.7/app/actions/Action2.java b/dd-smoke-tests/play-2.7/app/actions/Action2.java
index 0416048be64..ff9686617d0 100644
--- a/dd-smoke-tests/play-2.7/app/actions/Action2.java
+++ b/dd-smoke-tests/play-2.7/app/actions/Action2.java
@@ -1,7 +1,7 @@
 package actions;
 
 public class Action2 extends AbstractAction {
-  public Action2() {
-    super("action2");
-  }
+    public Action2() {
+        super("action2");
+    }
 }
diff --git a/dd-smoke-tests/play-2.7/app/controllers/JController.java b/dd-smoke-tests/play-2.7/app/controllers/JController.java
index 7bfbae6af64..00773c75aaa 100644
--- a/dd-smoke-tests/play-2.7/app/controllers/JController.java
+++ b/dd-smoke-tests/play-2.7/app/controllers/JController.java
@@ -19,35 +19,33 @@
 
 public class JController extends Controller {
 
-  private final WSClient ws;
-  private final String clientRequestBase;
+    private final WSClient ws;
+    private final String clientRequestBase;
 
-  @Inject
-  public JController(WSClient ws, Configuration configuration, ControllerComponents c) {
-    this.ws = ws;
-    this.clientRequestBase =
-        configuration
-            .getOptional("client.request.base", ConfigLoader.stringLoader())
-            .getOrElse(() -> "http://localhost:0/broken/");
-  }
+    @Inject
+    public JController(WSClient ws, Configuration configuration, ControllerComponents c) {
+        this.ws = ws;
+        this.clientRequestBase = configuration
+                .getOptional("client.request.base", ConfigLoader.stringLoader())
+                .getOrElse(() -> "http://localhost:0/broken/");
+    }
 
-  @With({Action1.class, Action2.class})
-  public CompletionStage<Result> doGet(final Integer id) {
-    Tracer tracer = GlobalTracer.get();
-    Span span = tracer.buildSpan("do-get").start();
-    Scope scope = tracer.scopeManager().activate(span);
-    try {
-      if (id > 0) {
-        return ws.url(clientRequestBase + id)
-            .get()
-            .thenApply(
-                response -> status(response.getStatus(), "J Got '" + response.getBody() + "'"));
-      } else {
-        return CompletableFuture.supplyAsync(() -> badRequest("No ID."));
-      }
-    } finally {
-      scope.close();
-      span.finish();
+    @With({Action1.class, Action2.class})
+    public CompletionStage<Result> doGet(final Integer id) {
+        Tracer tracer = GlobalTracer.get();
+        Span span = tracer.buildSpan("do-get").start();
+        Scope scope = tracer.scopeManager().activate(span);
+        try {
+            if (id > 0) {
+                return ws.url(clientRequestBase + id)
+                        .get()
+                        .thenApply(response -> status(response.getStatus(), "J Got '" + response.getBody() + "'"));
+            } else {
+                return CompletableFuture.supplyAsync(() -> badRequest("No ID."));
+            }
+        } finally {
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.7/app/filters/AbstractFilter.java b/dd-smoke-tests/play-2.7/app/filters/AbstractFilter.java
index e21c8ae2a3d..42ec9080d5a 100644
--- a/dd-smoke-tests/play-2.7/app/filters/AbstractFilter.java
+++ b/dd-smoke-tests/play-2.7/app/filters/AbstractFilter.java
@@ -13,47 +13,47 @@
 import play.mvc.Result;
 
 public abstract class AbstractFilter extends Filter {
-  private final HttpExecutionContext ec;
-  private final String operationName;
-  private final boolean wrap;
+    private final HttpExecutionContext ec;
+    private final String operationName;
+    private final boolean wrap;
 
-  public AbstractFilter(String operationName, Materializer mat, HttpExecutionContext ec) {
-    this(operationName, false, mat, ec);
-  }
+    public AbstractFilter(String operationName, Materializer mat, HttpExecutionContext ec) {
+        this(operationName, false, mat, ec);
+    }
 
-  public AbstractFilter(
-      String operationName, boolean wrap, Materializer mat, HttpExecutionContext ec) {
-    super(mat);
-    this.operationName = operationName;
-    this.wrap = wrap;
-    this.ec = ec;
-  }
+    public AbstractFilter(String operationName, boolean wrap, Materializer mat, HttpExecutionContext ec) {
+        super(mat);
+        this.operationName = operationName;
+        this.wrap = wrap;
+        this.ec = ec;
+    }
 
-  @Override
-  public CompletionStage<Result> apply(
-      Function<Http.RequestHeader, CompletionStage<Result>> nextFilter,
-      Http.RequestHeader requestHeader) {
-    final Tracer tracer = GlobalTracer.get();
-    final Span startedSpan = wrap ? tracer.buildSpan(operationName).start() : null;
-    Scope outerScope = wrap ? tracer.scopeManager().activate(startedSpan) : null;
-    try {
-      return nextFilter
-          .apply(requestHeader)
-          .thenApplyAsync(
-              result -> {
-                Span span = wrap ? startedSpan : tracer.buildSpan(operationName).start();
-                try (Scope innerScope = tracer.scopeManager().activate(span)) {
-                  // Yes this does no real work
-                  return result;
-                } finally {
-                  span.finish();
-                }
-              },
-              ec.current());
-    } finally {
-      if (wrap) {
-        outerScope.close();
-      }
+    @Override
+    public CompletionStage<Result> apply(
+            Function<Http.RequestHeader, CompletionStage<Result>> nextFilter, Http.RequestHeader requestHeader) {
+        final Tracer tracer = GlobalTracer.get();
+        final Span startedSpan = wrap ? tracer.buildSpan(operationName).start() : null;
+        Scope outerScope = wrap ? tracer.scopeManager().activate(startedSpan) : null;
+        try {
+            return nextFilter
+                    .apply(requestHeader)
+                    .thenApplyAsync(
+                            result -> {
+                                Span span = wrap
+                                        ? startedSpan
+                                        : tracer.buildSpan(operationName).start();
+                                try (Scope innerScope = tracer.scopeManager().activate(span)) {
+                                    // Yes this does no real work
+                                    return result;
+                                } finally {
+                                    span.finish();
+                                }
+                            },
+                            ec.current());
+        } finally {
+            if (wrap) {
+                outerScope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.7/app/filters/Filter1.java b/dd-smoke-tests/play-2.7/app/filters/Filter1.java
index 50246522a4f..167f2e45865 100644
--- a/dd-smoke-tests/play-2.7/app/filters/Filter1.java
+++ b/dd-smoke-tests/play-2.7/app/filters/Filter1.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter1 extends AbstractFilter {
-  @Inject
-  public Filter1(Materializer mat, HttpExecutionContext ec) {
-    super("filter1", true, mat, ec);
-  }
+    @Inject
+    public Filter1(Materializer mat, HttpExecutionContext ec) {
+        super("filter1", true, mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.7/app/filters/Filter2.java b/dd-smoke-tests/play-2.7/app/filters/Filter2.java
index 00047f36a59..ffc1774ea6a 100644
--- a/dd-smoke-tests/play-2.7/app/filters/Filter2.java
+++ b/dd-smoke-tests/play-2.7/app/filters/Filter2.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter2 extends AbstractFilter {
-  @Inject
-  public Filter2(Materializer mat, HttpExecutionContext ec) {
-    super("filter2", mat, ec);
-  }
+    @Inject
+    public Filter2(Materializer mat, HttpExecutionContext ec) {
+        super("filter2", mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.7/app/filters/Filter3.java b/dd-smoke-tests/play-2.7/app/filters/Filter3.java
index 55b9f6f7c4e..c66e4395e42 100644
--- a/dd-smoke-tests/play-2.7/app/filters/Filter3.java
+++ b/dd-smoke-tests/play-2.7/app/filters/Filter3.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter3 extends AbstractFilter {
-  @Inject
-  public Filter3(Materializer mat, HttpExecutionContext ec) {
-    super("filter3", mat, ec);
-  }
+    @Inject
+    public Filter3(Materializer mat, HttpExecutionContext ec) {
+        super("filter3", mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.7/app/filters/Filter4.java b/dd-smoke-tests/play-2.7/app/filters/Filter4.java
index 63a85d6c543..7181ad9daa8 100644
--- a/dd-smoke-tests/play-2.7/app/filters/Filter4.java
+++ b/dd-smoke-tests/play-2.7/app/filters/Filter4.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter4 extends AbstractFilter {
-  @Inject
-  public Filter4(Materializer mat, HttpExecutionContext ec) {
-    super("filter4", mat, ec);
-  }
+    @Inject
+    public Filter4(Materializer mat, HttpExecutionContext ec) {
+        super("filter4", mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.8-otel/app/Filters.java b/dd-smoke-tests/play-2.8-otel/app/Filters.java
index 4922462c052..d05b8053404 100644
--- a/dd-smoke-tests/play-2.8-otel/app/Filters.java
+++ b/dd-smoke-tests/play-2.8-otel/app/Filters.java
@@ -6,8 +6,8 @@
 import play.http.DefaultHttpFilters;
 
 public class Filters extends DefaultHttpFilters {
-  @Inject
-  public Filters(Filter1 f1, Filter2 f2, Filter3 f3, Filter4 f4) {
-    super(f1, f2, f3, f4);
-  }
+    @Inject
+    public Filters(Filter1 f1, Filter2 f2, Filter3 f3, Filter4 f4) {
+        super(f1, f2, f3, f4);
+    }
 }
diff --git a/dd-smoke-tests/play-2.8-otel/app/actions/AbstractAction.java b/dd-smoke-tests/play-2.8-otel/app/actions/AbstractAction.java
index 3133a8b76e8..c763b5a7f4a 100644
--- a/dd-smoke-tests/play-2.8-otel/app/actions/AbstractAction.java
+++ b/dd-smoke-tests/play-2.8-otel/app/actions/AbstractAction.java
@@ -11,22 +11,22 @@
 
 public abstract class AbstractAction extends Action.Simple {
 
-  private final String spanName;
+    private final String spanName;
 
-  protected AbstractAction(String spanName) {
-    this.spanName = spanName;
-  }
+    protected AbstractAction(String spanName) {
+        this.spanName = spanName;
+    }
 
-  @Override
-  public CompletionStage<Result> call(Http.Request req) {
-    Tracer tracer = GlobalOpenTelemetry.getTracer("play-test");
-    Span span = tracer.spanBuilder(spanName).startSpan();
-    Scope scope = span.makeCurrent();
-    try {
-      return delegate.call(req);
-    } finally {
-      scope.close();
-      span.end();
+    @Override
+    public CompletionStage<Result> call(Http.Request req) {
+        Tracer tracer = GlobalOpenTelemetry.getTracer("play-test");
+        Span span = tracer.spanBuilder(spanName).startSpan();
+        Scope scope = span.makeCurrent();
+        try {
+            return delegate.call(req);
+        } finally {
+            scope.close();
+            span.end();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.8-otel/app/actions/Action1.java b/dd-smoke-tests/play-2.8-otel/app/actions/Action1.java
index 2d024353b49..ae23f1f5a8e 100644
--- a/dd-smoke-tests/play-2.8-otel/app/actions/Action1.java
+++ b/dd-smoke-tests/play-2.8-otel/app/actions/Action1.java
@@ -1,7 +1,7 @@
 package actions;
 
 public class Action1 extends AbstractAction {
-  public Action1() {
-    super("action1");
-  }
+    public Action1() {
+        super("action1");
+    }
 }
diff --git a/dd-smoke-tests/play-2.8-otel/app/actions/Action2.java b/dd-smoke-tests/play-2.8-otel/app/actions/Action2.java
index 0416048be64..ff9686617d0 100644
--- a/dd-smoke-tests/play-2.8-otel/app/actions/Action2.java
+++ b/dd-smoke-tests/play-2.8-otel/app/actions/Action2.java
@@ -1,7 +1,7 @@
 package actions;
 
 public class Action2 extends AbstractAction {
-  public Action2() {
-    super("action2");
-  }
+    public Action2() {
+        super("action2");
+    }
 }
diff --git a/dd-smoke-tests/play-2.8-otel/app/controllers/JController.java b/dd-smoke-tests/play-2.8-otel/app/controllers/JController.java
index 53624416ab7..f454fb28122 100644
--- a/dd-smoke-tests/play-2.8-otel/app/controllers/JController.java
+++ b/dd-smoke-tests/play-2.8-otel/app/controllers/JController.java
@@ -19,35 +19,33 @@
 
 public class JController extends Controller {
 
-  private final WSClient ws;
-  private final String clientRequestBase;
+    private final WSClient ws;
+    private final String clientRequestBase;
 
-  @Inject
-  public JController(WSClient ws, Configuration configuration, ControllerComponents c) {
-    this.ws = ws;
-    this.clientRequestBase =
-        configuration
-            .getOptional("client.request.base", ConfigLoader.stringLoader())
-            .getOrElse(() -> "http://localhost:0/broken/");
-  }
+    @Inject
+    public JController(WSClient ws, Configuration configuration, ControllerComponents c) {
+        this.ws = ws;
+        this.clientRequestBase = configuration
+                .getOptional("client.request.base", ConfigLoader.stringLoader())
+                .getOrElse(() -> "http://localhost:0/broken/");
+    }
 
-  @With({Action1.class, Action2.class})
-  public CompletionStage<Result> doGet(final Integer id) {
-    Tracer tracer = GlobalOpenTelemetry.getTracer("play-test");
-    Span span = tracer.spanBuilder("do-get").startSpan();
-    Scope scope = span.makeCurrent();
-    try {
-      if (id > 0) {
-        return ws.url(clientRequestBase + id)
-            .get()
-            .thenApply(
-                response -> status(response.getStatus(), "J Got '" + response.getBody() + "'"));
-      } else {
-        return CompletableFuture.supplyAsync(() -> badRequest("No ID."));
-      }
-    } finally {
-      scope.close();
-      span.end();
+    @With({Action1.class, Action2.class})
+    public CompletionStage<Result> doGet(final Integer id) {
+        Tracer tracer = GlobalOpenTelemetry.getTracer("play-test");
+        Span span = tracer.spanBuilder("do-get").startSpan();
+        Scope scope = span.makeCurrent();
+        try {
+            if (id > 0) {
+                return ws.url(clientRequestBase + id)
+                        .get()
+                        .thenApply(response -> status(response.getStatus(), "J Got '" + response.getBody() + "'"));
+            } else {
+                return CompletableFuture.supplyAsync(() -> badRequest("No ID."));
+            }
+        } finally {
+            scope.close();
+            span.end();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.8-otel/app/filters/AbstractFilter.java b/dd-smoke-tests/play-2.8-otel/app/filters/AbstractFilter.java
index 2313b19cce8..e956a497a90 100644
--- a/dd-smoke-tests/play-2.8-otel/app/filters/AbstractFilter.java
+++ b/dd-smoke-tests/play-2.8-otel/app/filters/AbstractFilter.java
@@ -13,46 +13,47 @@
 import play.mvc.Result;
 
 public abstract class AbstractFilter extends Filter {
-  private final HttpExecutionContext ec;
-  private final String spanName;
-  private final boolean wrap;
+    private final HttpExecutionContext ec;
+    private final String spanName;
+    private final boolean wrap;
 
-  public AbstractFilter(String spanName, Materializer mat, HttpExecutionContext ec) {
-    this(spanName, false, mat, ec);
-  }
+    public AbstractFilter(String spanName, Materializer mat, HttpExecutionContext ec) {
+        this(spanName, false, mat, ec);
+    }
 
-  public AbstractFilter(String spanName, boolean wrap, Materializer mat, HttpExecutionContext ec) {
-    super(mat);
-    this.spanName = spanName;
-    this.wrap = wrap;
-    this.ec = ec;
-  }
+    public AbstractFilter(String spanName, boolean wrap, Materializer mat, HttpExecutionContext ec) {
+        super(mat);
+        this.spanName = spanName;
+        this.wrap = wrap;
+        this.ec = ec;
+    }
 
-  @Override
-  public CompletionStage<Result> apply(
-      Function<Http.RequestHeader, CompletionStage<Result>> nextFilter,
-      Http.RequestHeader requestHeader) {
-    final Tracer tracer = GlobalOpenTelemetry.getTracer("play-test");
-    final Span startedSpan = wrap ? tracer.spanBuilder(spanName).startSpan() : null;
-    Scope outerScope = wrap ? startedSpan.makeCurrent() : null;
-    try {
-      return nextFilter
-          .apply(requestHeader)
-          .thenApplyAsync(
-              result -> {
-                Span span = wrap ? startedSpan : tracer.spanBuilder(spanName).startSpan();
-                try (Scope innerScope = span.makeCurrent()) {
-                  // Yes this does no real work
-                  return result;
-                } finally {
-                  span.end();
-                }
-              },
-              ec.current());
-    } finally {
-      if (wrap) {
-        outerScope.close();
-      }
+    @Override
+    public CompletionStage<Result> apply(
+            Function<Http.RequestHeader, CompletionStage<Result>> nextFilter, Http.RequestHeader requestHeader) {
+        final Tracer tracer = GlobalOpenTelemetry.getTracer("play-test");
+        final Span startedSpan = wrap ? tracer.spanBuilder(spanName).startSpan() : null;
+        Scope outerScope = wrap ? startedSpan.makeCurrent() : null;
+        try {
+            return nextFilter
+                    .apply(requestHeader)
+                    .thenApplyAsync(
+                            result -> {
+                                Span span = wrap
+                                        ? startedSpan
+                                        : tracer.spanBuilder(spanName).startSpan();
+                                try (Scope innerScope = span.makeCurrent()) {
+                                    // Yes this does no real work
+                                    return result;
+                                } finally {
+                                    span.end();
+                                }
+                            },
+                            ec.current());
+        } finally {
+            if (wrap) {
+                outerScope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.8-otel/app/filters/Filter1.java b/dd-smoke-tests/play-2.8-otel/app/filters/Filter1.java
index 50246522a4f..167f2e45865 100644
--- a/dd-smoke-tests/play-2.8-otel/app/filters/Filter1.java
+++ b/dd-smoke-tests/play-2.8-otel/app/filters/Filter1.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter1 extends AbstractFilter {
-  @Inject
-  public Filter1(Materializer mat, HttpExecutionContext ec) {
-    super("filter1", true, mat, ec);
-  }
+    @Inject
+    public Filter1(Materializer mat, HttpExecutionContext ec) {
+        super("filter1", true, mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.8-otel/app/filters/Filter2.java b/dd-smoke-tests/play-2.8-otel/app/filters/Filter2.java
index 00047f36a59..ffc1774ea6a 100644
--- a/dd-smoke-tests/play-2.8-otel/app/filters/Filter2.java
+++ b/dd-smoke-tests/play-2.8-otel/app/filters/Filter2.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter2 extends AbstractFilter {
-  @Inject
-  public Filter2(Materializer mat, HttpExecutionContext ec) {
-    super("filter2", mat, ec);
-  }
+    @Inject
+    public Filter2(Materializer mat, HttpExecutionContext ec) {
+        super("filter2", mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.8-otel/app/filters/Filter3.java b/dd-smoke-tests/play-2.8-otel/app/filters/Filter3.java
index 55b9f6f7c4e..c66e4395e42 100644
--- a/dd-smoke-tests/play-2.8-otel/app/filters/Filter3.java
+++ b/dd-smoke-tests/play-2.8-otel/app/filters/Filter3.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter3 extends AbstractFilter {
-  @Inject
-  public Filter3(Materializer mat, HttpExecutionContext ec) {
-    super("filter3", mat, ec);
-  }
+    @Inject
+    public Filter3(Materializer mat, HttpExecutionContext ec) {
+        super("filter3", mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.8-otel/app/filters/Filter4.java b/dd-smoke-tests/play-2.8-otel/app/filters/Filter4.java
index 63a85d6c543..7181ad9daa8 100644
--- a/dd-smoke-tests/play-2.8-otel/app/filters/Filter4.java
+++ b/dd-smoke-tests/play-2.8-otel/app/filters/Filter4.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter4 extends AbstractFilter {
-  @Inject
-  public Filter4(Materializer mat, HttpExecutionContext ec) {
-    super("filter4", mat, ec);
-  }
+    @Inject
+    public Filter4(Materializer mat, HttpExecutionContext ec) {
+        super("filter4", mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.8-split-routes/app/controllers/HomeController.java b/dd-smoke-tests/play-2.8-split-routes/app/controllers/HomeController.java
index 01151401bba..a878e88e152 100644
--- a/dd-smoke-tests/play-2.8-split-routes/app/controllers/HomeController.java
+++ b/dd-smoke-tests/play-2.8-split-routes/app/controllers/HomeController.java
@@ -6,11 +6,11 @@
 
 public class HomeController extends Controller {
 
-  public Result all(Http.Request request) {
-    return ok("all");
-  }
+    public Result all(Http.Request request) {
+        return ok("all");
+    }
 
-  public Result post(Http.Request request, String id) {
-    return ok("Post #" + id);
-  }
+    public Result post(Http.Request request, String id) {
+        return ok("Post #" + id);
+    }
 }
diff --git a/dd-smoke-tests/play-2.8-split-routes/app/v1/post/PostController.java b/dd-smoke-tests/play-2.8-split-routes/app/v1/post/PostController.java
index 2845d85d4b8..e68c7a35f33 100644
--- a/dd-smoke-tests/play-2.8-split-routes/app/v1/post/PostController.java
+++ b/dd-smoke-tests/play-2.8-split-routes/app/v1/post/PostController.java
@@ -6,11 +6,11 @@
 
 public class PostController extends Controller {
 
-  public Result all(Http.Request request) {
-    return ok("all");
-  }
+    public Result all(Http.Request request) {
+        return ok("all");
+    }
 
-  public Result post(Http.Request request, String id) {
-    return ok("Post #" + id);
-  }
+    public Result post(Http.Request request, String id) {
+        return ok("Post #" + id);
+    }
 }
diff --git a/dd-smoke-tests/play-2.8/app/Filters.java b/dd-smoke-tests/play-2.8/app/Filters.java
index 4922462c052..d05b8053404 100644
--- a/dd-smoke-tests/play-2.8/app/Filters.java
+++ b/dd-smoke-tests/play-2.8/app/Filters.java
@@ -6,8 +6,8 @@
 import play.http.DefaultHttpFilters;
 
 public class Filters extends DefaultHttpFilters {
-  @Inject
-  public Filters(Filter1 f1, Filter2 f2, Filter3 f3, Filter4 f4) {
-    super(f1, f2, f3, f4);
-  }
+    @Inject
+    public Filters(Filter1 f1, Filter2 f2, Filter3 f3, Filter4 f4) {
+        super(f1, f2, f3, f4);
+    }
 }
diff --git a/dd-smoke-tests/play-2.8/app/actions/AbstractAction.java b/dd-smoke-tests/play-2.8/app/actions/AbstractAction.java
index e61082ee4e7..2dadf8e6d19 100644
--- a/dd-smoke-tests/play-2.8/app/actions/AbstractAction.java
+++ b/dd-smoke-tests/play-2.8/app/actions/AbstractAction.java
@@ -11,22 +11,22 @@
 
 public abstract class AbstractAction extends Action.Simple {
 
-  private final String operationName;
+    private final String operationName;
 
-  protected AbstractAction(String operationName) {
-    this.operationName = operationName;
-  }
+    protected AbstractAction(String operationName) {
+        this.operationName = operationName;
+    }
 
-  @Override
-  public CompletionStage<Result> call(Http.Request req) {
-    Tracer tracer = GlobalTracer.get();
-    Span span = tracer.buildSpan(operationName).start();
-    Scope scope = tracer.scopeManager().activate(span);
-    try {
-      return delegate.call(req);
-    } finally {
-      scope.close();
-      span.finish();
+    @Override
+    public CompletionStage<Result> call(Http.Request req) {
+        Tracer tracer = GlobalTracer.get();
+        Span span = tracer.buildSpan(operationName).start();
+        Scope scope = tracer.scopeManager().activate(span);
+        try {
+            return delegate.call(req);
+        } finally {
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.8/app/actions/Action1.java b/dd-smoke-tests/play-2.8/app/actions/Action1.java
index 2d024353b49..ae23f1f5a8e 100644
--- a/dd-smoke-tests/play-2.8/app/actions/Action1.java
+++ b/dd-smoke-tests/play-2.8/app/actions/Action1.java
@@ -1,7 +1,7 @@
 package actions;
 
 public class Action1 extends AbstractAction {
-  public Action1() {
-    super("action1");
-  }
+    public Action1() {
+        super("action1");
+    }
 }
diff --git a/dd-smoke-tests/play-2.8/app/actions/Action2.java b/dd-smoke-tests/play-2.8/app/actions/Action2.java
index 0416048be64..ff9686617d0 100644
--- a/dd-smoke-tests/play-2.8/app/actions/Action2.java
+++ b/dd-smoke-tests/play-2.8/app/actions/Action2.java
@@ -1,7 +1,7 @@
 package actions;
 
 public class Action2 extends AbstractAction {
-  public Action2() {
-    super("action2");
-  }
+    public Action2() {
+        super("action2");
+    }
 }
diff --git a/dd-smoke-tests/play-2.8/app/controllers/JController.java b/dd-smoke-tests/play-2.8/app/controllers/JController.java
index 7bfbae6af64..00773c75aaa 100644
--- a/dd-smoke-tests/play-2.8/app/controllers/JController.java
+++ b/dd-smoke-tests/play-2.8/app/controllers/JController.java
@@ -19,35 +19,33 @@
 
 public class JController extends Controller {
 
-  private final WSClient ws;
-  private final String clientRequestBase;
+    private final WSClient ws;
+    private final String clientRequestBase;
 
-  @Inject
-  public JController(WSClient ws, Configuration configuration, ControllerComponents c) {
-    this.ws = ws;
-    this.clientRequestBase =
-        configuration
-            .getOptional("client.request.base", ConfigLoader.stringLoader())
-            .getOrElse(() -> "http://localhost:0/broken/");
-  }
+    @Inject
+    public JController(WSClient ws, Configuration configuration, ControllerComponents c) {
+        this.ws = ws;
+        this.clientRequestBase = configuration
+                .getOptional("client.request.base", ConfigLoader.stringLoader())
+                .getOrElse(() -> "http://localhost:0/broken/");
+    }
 
-  @With({Action1.class, Action2.class})
-  public CompletionStage<Result> doGet(final Integer id) {
-    Tracer tracer = GlobalTracer.get();
-    Span span = tracer.buildSpan("do-get").start();
-    Scope scope = tracer.scopeManager().activate(span);
-    try {
-      if (id > 0) {
-        return ws.url(clientRequestBase + id)
-            .get()
-            .thenApply(
-                response -> status(response.getStatus(), "J Got '" + response.getBody() + "'"));
-      } else {
-        return CompletableFuture.supplyAsync(() -> badRequest("No ID."));
-      }
-    } finally {
-      scope.close();
-      span.finish();
+    @With({Action1.class, Action2.class})
+    public CompletionStage<Result> doGet(final Integer id) {
+        Tracer tracer = GlobalTracer.get();
+        Span span = tracer.buildSpan("do-get").start();
+        Scope scope = tracer.scopeManager().activate(span);
+        try {
+            if (id > 0) {
+                return ws.url(clientRequestBase + id)
+                        .get()
+                        .thenApply(response -> status(response.getStatus(), "J Got '" + response.getBody() + "'"));
+            } else {
+                return CompletableFuture.supplyAsync(() -> badRequest("No ID."));
+            }
+        } finally {
+            scope.close();
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.8/app/filters/AbstractFilter.java b/dd-smoke-tests/play-2.8/app/filters/AbstractFilter.java
index e21c8ae2a3d..42ec9080d5a 100644
--- a/dd-smoke-tests/play-2.8/app/filters/AbstractFilter.java
+++ b/dd-smoke-tests/play-2.8/app/filters/AbstractFilter.java
@@ -13,47 +13,47 @@
 import play.mvc.Result;
 
 public abstract class AbstractFilter extends Filter {
-  private final HttpExecutionContext ec;
-  private final String operationName;
-  private final boolean wrap;
+    private final HttpExecutionContext ec;
+    private final String operationName;
+    private final boolean wrap;
 
-  public AbstractFilter(String operationName, Materializer mat, HttpExecutionContext ec) {
-    this(operationName, false, mat, ec);
-  }
+    public AbstractFilter(String operationName, Materializer mat, HttpExecutionContext ec) {
+        this(operationName, false, mat, ec);
+    }
 
-  public AbstractFilter(
-      String operationName, boolean wrap, Materializer mat, HttpExecutionContext ec) {
-    super(mat);
-    this.operationName = operationName;
-    this.wrap = wrap;
-    this.ec = ec;
-  }
+    public AbstractFilter(String operationName, boolean wrap, Materializer mat, HttpExecutionContext ec) {
+        super(mat);
+        this.operationName = operationName;
+        this.wrap = wrap;
+        this.ec = ec;
+    }
 
-  @Override
-  public CompletionStage<Result> apply(
-      Function<Http.RequestHeader, CompletionStage<Result>> nextFilter,
-      Http.RequestHeader requestHeader) {
-    final Tracer tracer = GlobalTracer.get();
-    final Span startedSpan = wrap ? tracer.buildSpan(operationName).start() : null;
-    Scope outerScope = wrap ? tracer.scopeManager().activate(startedSpan) : null;
-    try {
-      return nextFilter
-          .apply(requestHeader)
-          .thenApplyAsync(
-              result -> {
-                Span span = wrap ? startedSpan : tracer.buildSpan(operationName).start();
-                try (Scope innerScope = tracer.scopeManager().activate(span)) {
-                  // Yes this does no real work
-                  return result;
-                } finally {
-                  span.finish();
-                }
-              },
-              ec.current());
-    } finally {
-      if (wrap) {
-        outerScope.close();
-      }
+    @Override
+    public CompletionStage<Result> apply(
+            Function<Http.RequestHeader, CompletionStage<Result>> nextFilter, Http.RequestHeader requestHeader) {
+        final Tracer tracer = GlobalTracer.get();
+        final Span startedSpan = wrap ? tracer.buildSpan(operationName).start() : null;
+        Scope outerScope = wrap ? tracer.scopeManager().activate(startedSpan) : null;
+        try {
+            return nextFilter
+                    .apply(requestHeader)
+                    .thenApplyAsync(
+                            result -> {
+                                Span span = wrap
+                                        ? startedSpan
+                                        : tracer.buildSpan(operationName).start();
+                                try (Scope innerScope = tracer.scopeManager().activate(span)) {
+                                    // Yes this does no real work
+                                    return result;
+                                } finally {
+                                    span.finish();
+                                }
+                            },
+                            ec.current());
+        } finally {
+            if (wrap) {
+                outerScope.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/play-2.8/app/filters/Filter1.java b/dd-smoke-tests/play-2.8/app/filters/Filter1.java
index 50246522a4f..167f2e45865 100644
--- a/dd-smoke-tests/play-2.8/app/filters/Filter1.java
+++ b/dd-smoke-tests/play-2.8/app/filters/Filter1.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter1 extends AbstractFilter {
-  @Inject
-  public Filter1(Materializer mat, HttpExecutionContext ec) {
-    super("filter1", true, mat, ec);
-  }
+    @Inject
+    public Filter1(Materializer mat, HttpExecutionContext ec) {
+        super("filter1", true, mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.8/app/filters/Filter2.java b/dd-smoke-tests/play-2.8/app/filters/Filter2.java
index 00047f36a59..ffc1774ea6a 100644
--- a/dd-smoke-tests/play-2.8/app/filters/Filter2.java
+++ b/dd-smoke-tests/play-2.8/app/filters/Filter2.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter2 extends AbstractFilter {
-  @Inject
-  public Filter2(Materializer mat, HttpExecutionContext ec) {
-    super("filter2", mat, ec);
-  }
+    @Inject
+    public Filter2(Materializer mat, HttpExecutionContext ec) {
+        super("filter2", mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.8/app/filters/Filter3.java b/dd-smoke-tests/play-2.8/app/filters/Filter3.java
index 55b9f6f7c4e..c66e4395e42 100644
--- a/dd-smoke-tests/play-2.8/app/filters/Filter3.java
+++ b/dd-smoke-tests/play-2.8/app/filters/Filter3.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter3 extends AbstractFilter {
-  @Inject
-  public Filter3(Materializer mat, HttpExecutionContext ec) {
-    super("filter3", mat, ec);
-  }
+    @Inject
+    public Filter3(Materializer mat, HttpExecutionContext ec) {
+        super("filter3", mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/play-2.8/app/filters/Filter4.java b/dd-smoke-tests/play-2.8/app/filters/Filter4.java
index 63a85d6c543..7181ad9daa8 100644
--- a/dd-smoke-tests/play-2.8/app/filters/Filter4.java
+++ b/dd-smoke-tests/play-2.8/app/filters/Filter4.java
@@ -7,8 +7,8 @@
 
 @Singleton
 public class Filter4 extends AbstractFilter {
-  @Inject
-  public Filter4(Materializer mat, HttpExecutionContext ec) {
-    super("filter4", mat, ec);
-  }
+    @Inject
+    public Filter4(Materializer mat, HttpExecutionContext ec) {
+        super("filter4", mat, ec);
+    }
 }
diff --git a/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/CodeHotspotsApplication.java b/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/CodeHotspotsApplication.java
index 79045eadbad..95ee0697c79 100644
--- a/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/CodeHotspotsApplication.java
+++ b/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/CodeHotspotsApplication.java
@@ -9,94 +9,92 @@
 import org.apache.commons.math3.distribution.ExponentialDistribution;
 
 public final class CodeHotspotsApplication {
-  public static void main(String[] args) {
-    CodeHotspotsApplication application = new CodeHotspotsApplication(GlobalTracer.get());
-    String kind = args[0];
+    public static void main(String[] args) {
+        CodeHotspotsApplication application = new CodeHotspotsApplication(GlobalTracer.get());
+        String kind = args[0];
 
-    switch (kind) {
-      case "reactive":
-        application.queueing(
-            Integer.parseInt(args[1]),
-            Long.parseLong(args[2]),
-            Long.parseLong(args[3]),
-            Integer.parseInt(args[4]));
-        break;
-      case "batch":
-        application.batch(Long.parseLong(args[1]), Integer.parseInt(args[2]));
-        break;
-      case "fanout":
-        application.fanout(
-            Integer.parseInt(args[1]), Long.parseLong(args[2]), Integer.parseInt(args[3]));
-        break;
-      default:
-        throw new RuntimeException("Invalid application kind: " + kind);
+        switch (kind) {
+            case "reactive":
+                application.queueing(
+                        Integer.parseInt(args[1]),
+                        Long.parseLong(args[2]),
+                        Long.parseLong(args[3]),
+                        Integer.parseInt(args[4]));
+                break;
+            case "batch":
+                application.batch(Long.parseLong(args[1]), Integer.parseInt(args[2]));
+                break;
+            case "fanout":
+                application.fanout(Integer.parseInt(args[1]), Long.parseLong(args[2]), Integer.parseInt(args[3]));
+                break;
+            default:
+                throw new RuntimeException("Invalid application kind: " + kind);
+        }
     }
-  }
 
-  private final Tracer tracer;
+    private final Tracer tracer;
 
-  private CodeHotspotsApplication(Tracer tracer) {
-    this.tracer = tracer;
-  }
+    private CodeHotspotsApplication(Tracer tracer) {
+        this.tracer = tracer;
+    }
 
-  private void batch(long meanServiceTimeNs, int runtimeSecs) {
-    ParallelProcessing processor = new ParallelProcessing();
-    Span topSpan = tracer.buildSpan("top").start();
+    private void batch(long meanServiceTimeNs, int runtimeSecs) {
+        ParallelProcessing processor = new ParallelProcessing();
+        Span topSpan = tracer.buildSpan("top").start();
 
-    try (Scope scope = tracer.activateSpan(topSpan)) {
-      processor.run(1, meanServiceTimeNs, runtimeSecs, this::process);
+        try (Scope scope = tracer.activateSpan(topSpan)) {
+            processor.run(1, meanServiceTimeNs, runtimeSecs, this::process);
+        }
     }
-  }
 
-  private void fanout(int workers, long meanServiceTimeNs, int runtimeSecs) {
-    ParallelProcessing processor = new ParallelProcessing();
-    Span topSpan = tracer.buildSpan("top").start();
+    private void fanout(int workers, long meanServiceTimeNs, int runtimeSecs) {
+        ParallelProcessing processor = new ParallelProcessing();
+        Span topSpan = tracer.buildSpan("top").start();
 
-    try (Scope scope = tracer.activateSpan(topSpan)) {
-      processor.run(workers, meanServiceTimeNs, runtimeSecs, this::process);
+        try (Scope scope = tracer.activateSpan(topSpan)) {
+            processor.run(workers, meanServiceTimeNs, runtimeSecs, this::process);
+        }
     }
-  }
 
-  private void queueing(int workers, long meanServiceTimeNs, long arrivalRate, int runtimeSecs) {
-    long finalTs = System.nanoTime() + TimeUnit.SECONDS.toNanos(runtimeSecs);
+    private void queueing(int workers, long meanServiceTimeNs, long arrivalRate, int runtimeSecs) {
+        long finalTs = System.nanoTime() + TimeUnit.SECONDS.toNanos(runtimeSecs);
 
-    ExponentialDistribution arrivalDistribution =
-        new ExponentialDistribution(1_000_000_000d / arrivalRate);
-    QueueProcessing processing = new QueueProcessing(workers, workers, meanServiceTimeNs);
+        ExponentialDistribution arrivalDistribution = new ExponentialDistribution(1_000_000_000d / arrivalRate);
+        QueueProcessing processing = new QueueProcessing(workers, workers, meanServiceTimeNs);
 
-    Span topSpan = tracer.buildSpan("top").start();
+        Span topSpan = tracer.buildSpan("top").start();
 
-    try {
-      while (!Thread.currentThread().isInterrupted() && System.nanoTime() < finalTs) {
-        long sample = (long) arrivalDistribution.sample();
-        long nextArrivalTs = System.nanoTime() + sample;
-        while (System.nanoTime() < nextArrivalTs) {
-          LockSupport.parkNanos(nextArrivalTs - System.nanoTime());
-          if (Thread.currentThread().isInterrupted()) {
-            return;
-          }
-        }
-        try (Scope scope = tracer.activateSpan(topSpan)) {
-          processing.enqueue(this::process);
+        try {
+            while (!Thread.currentThread().isInterrupted() && System.nanoTime() < finalTs) {
+                long sample = (long) arrivalDistribution.sample();
+                long nextArrivalTs = System.nanoTime() + sample;
+                while (System.nanoTime() < nextArrivalTs) {
+                    LockSupport.parkNanos(nextArrivalTs - System.nanoTime());
+                    if (Thread.currentThread().isInterrupted()) {
+                        return;
+                    }
+                }
+                try (Scope scope = tracer.activateSpan(topSpan)) {
+                    processing.enqueue(this::process);
+                }
+            }
+        } finally {
+            processing.shutdown();
+            topSpan.finish();
         }
-      }
-    } finally {
-      processing.shutdown();
-      topSpan.finish();
     }
-  }
 
-  private long process(long serviceTime) {
-    long cntr = 0;
-    long endTs = System.nanoTime() + serviceTime;
-    Span span = tracer.buildSpan("work_item").start();
-    try (Scope scope = tracer.activateSpan(span)) {
-      while (!Thread.currentThread().isInterrupted() && System.nanoTime() < endTs) {
-        cntr++;
-      }
-    } finally {
-      span.finish();
+    private long process(long serviceTime) {
+        long cntr = 0;
+        long endTs = System.nanoTime() + serviceTime;
+        Span span = tracer.buildSpan("work_item").start();
+        try (Scope scope = tracer.activateSpan(span)) {
+            while (!Thread.currentThread().isInterrupted() && System.nanoTime() < endTs) {
+                cntr++;
+            }
+        } finally {
+            span.finish();
+        }
+        return cntr;
     }
-    return cntr;
-  }
 }
diff --git a/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/GenerativeStackTraces.java b/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/GenerativeStackTraces.java
index 087332f011c..b2502f9b762 100644
--- a/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/GenerativeStackTraces.java
+++ b/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/GenerativeStackTraces.java
@@ -11,141 +11,141 @@
 
 public class GenerativeStackTraces {
 
-  private final Tracer tracer;
-  private final boolean useMethodHandles;
-  private final boolean useCapturingLambdas;
-
-  private static final MethodHandle METHOD1 = getMethodHandle(1);
-  private static final MethodHandle METHOD2 = getMethodHandle(2);
-  private static final MethodHandle METHOD3 = getMethodHandle(3);
-  private static final MethodHandle METHOD4 = getMethodHandle(4);
-
-  public GenerativeStackTraces(String mode) {
-    this(GlobalTracer.get(), mode);
-  }
-
-  public GenerativeStackTraces(Tracer tracer, String mode) {
-    this.tracer = tracer;
-    this.useMethodHandles = "MethodHandles".equalsIgnoreCase(mode);
-    this.useCapturingLambdas = "CapturingLambdas".equalsIgnoreCase(mode);
-  }
-
-  public static void main(String... args) throws Throwable {
-    int depth = args.length >= 1 ? Integer.parseInt(args[0]) : 30;
-    int iterations = args.length >= 2 ? Integer.parseInt(args[1]) : 1000;
-    String mode = args.length >= 3 ? args[2] : "Raw";
-    GenerativeStackTraces app = new GenerativeStackTraces(mode);
-    for (int i = 0; i < iterations; i++) {
-      app.selectRandom(0, depth);
+    private final Tracer tracer;
+    private final boolean useMethodHandles;
+    private final boolean useCapturingLambdas;
+
+    private static final MethodHandle METHOD1 = getMethodHandle(1);
+    private static final MethodHandle METHOD2 = getMethodHandle(2);
+    private static final MethodHandle METHOD3 = getMethodHandle(3);
+    private static final MethodHandle METHOD4 = getMethodHandle(4);
+
+    public GenerativeStackTraces(String mode) {
+        this(GlobalTracer.get(), mode);
     }
-  }
 
-  private void selectRandom(int depth, int maxDepth) throws Throwable {
-    if (depth == maxDepth) {
-      return;
+    public GenerativeStackTraces(Tracer tracer, String mode) {
+        this.tracer = tracer;
+        this.useMethodHandles = "MethodHandles".equalsIgnoreCase(mode);
+        this.useCapturingLambdas = "CapturingLambdas".equalsIgnoreCase(mode);
     }
-    switch (ThreadLocalRandom.current().nextInt(5)) {
-      case 0:
-        if (useMethodHandles) {
-          METHOD1.invokeExact(this, depth + 1, maxDepth);
-        } else if (useCapturingLambdas) {
-          invoke(() -> method1(depth + 1, maxDepth));
-        } else {
-          method1(depth + 1, maxDepth);
+
+    public static void main(String... args) throws Throwable {
+        int depth = args.length >= 1 ? Integer.parseInt(args[0]) : 30;
+        int iterations = args.length >= 2 ? Integer.parseInt(args[1]) : 1000;
+        String mode = args.length >= 3 ? args[2] : "Raw";
+        GenerativeStackTraces app = new GenerativeStackTraces(mode);
+        for (int i = 0; i < iterations; i++) {
+            app.selectRandom(0, depth);
         }
-        break;
-      case 1:
-        if (useMethodHandles) {
-          METHOD2.invokeExact(this, depth + 1, maxDepth);
-        } else if (useCapturingLambdas) {
-          invoke(() -> method2(depth + 1, maxDepth));
-        } else {
-          method2(depth + 1, maxDepth);
+    }
+
+    private void selectRandom(int depth, int maxDepth) throws Throwable {
+        if (depth == maxDepth) {
+            return;
         }
-        break;
-      case 2:
-        if (useMethodHandles) {
-          METHOD3.invokeExact(this, depth + 1, maxDepth);
-        } else if (useCapturingLambdas) {
-          invoke(() -> method3(depth + 1, maxDepth));
-        } else {
-          method3(depth + 1, maxDepth);
+        switch (ThreadLocalRandom.current().nextInt(5)) {
+            case 0:
+                if (useMethodHandles) {
+                    METHOD1.invokeExact(this, depth + 1, maxDepth);
+                } else if (useCapturingLambdas) {
+                    invoke(() -> method1(depth + 1, maxDepth));
+                } else {
+                    method1(depth + 1, maxDepth);
+                }
+                break;
+            case 1:
+                if (useMethodHandles) {
+                    METHOD2.invokeExact(this, depth + 1, maxDepth);
+                } else if (useCapturingLambdas) {
+                    invoke(() -> method2(depth + 1, maxDepth));
+                } else {
+                    method2(depth + 1, maxDepth);
+                }
+                break;
+            case 2:
+                if (useMethodHandles) {
+                    METHOD3.invokeExact(this, depth + 1, maxDepth);
+                } else if (useCapturingLambdas) {
+                    invoke(() -> method3(depth + 1, maxDepth));
+                } else {
+                    method3(depth + 1, maxDepth);
+                }
+                break;
+            case 3:
+                if (useMethodHandles) {
+                    METHOD4.invokeExact(this, depth + 1, maxDepth);
+                } else if (useCapturingLambdas) {
+                    invoke(() -> method4(depth + 1, maxDepth));
+                } else {
+                    method4(depth + 1, maxDepth);
+                }
+                break;
+            default:
+                work();
         }
-        break;
-      case 3:
-        if (useMethodHandles) {
-          METHOD4.invokeExact(this, depth + 1, maxDepth);
-        } else if (useCapturingLambdas) {
-          invoke(() -> method4(depth + 1, maxDepth));
-        } else {
-          method4(depth + 1, maxDepth);
+    }
+
+    public void method1(int depth, int maxDepth) throws Throwable {
+        Span span = tracer.buildSpan("method1").start();
+        try (Scope scope = tracer.activateSpan(span)) {
+            selectRandom(depth, maxDepth);
         }
-        break;
-      default:
-        work();
+        span.finish();
     }
-  }
 
-  public void method1(int depth, int maxDepth) throws Throwable {
-    Span span = tracer.buildSpan("method1").start();
-    try (Scope scope = tracer.activateSpan(span)) {
-      selectRandom(depth, maxDepth);
+    public void method2(int depth, int maxDepth) throws Throwable {
+        Span span = tracer.buildSpan("method2").start();
+        try (Scope scope = tracer.activateSpan(span)) {
+            selectRandom(depth, maxDepth);
+        }
+        span.finish();
     }
-    span.finish();
-  }
 
-  public void method2(int depth, int maxDepth) throws Throwable {
-    Span span = tracer.buildSpan("method2").start();
-    try (Scope scope = tracer.activateSpan(span)) {
-      selectRandom(depth, maxDepth);
+    public void method3(int depth, int maxDepth) throws Throwable {
+        Span span = tracer.buildSpan("method3").start();
+        try (Scope scope = tracer.activateSpan(span)) {
+            selectRandom(depth, maxDepth);
+        }
+        span.finish();
     }
-    span.finish();
-  }
 
-  public void method3(int depth, int maxDepth) throws Throwable {
-    Span span = tracer.buildSpan("method3").start();
-    try (Scope scope = tracer.activateSpan(span)) {
-      selectRandom(depth, maxDepth);
+    public void method4(int depth, int maxDepth) throws Throwable {
+        Span span = tracer.buildSpan("method4").start();
+        try (Scope scope = tracer.activateSpan(span)) {
+            selectRandom(depth, maxDepth);
+        }
+        span.finish();
     }
-    span.finish();
-  }
 
-  public void method4(int depth, int maxDepth) throws Throwable {
-    Span span = tracer.buildSpan("method4").start();
-    try (Scope scope = tracer.activateSpan(span)) {
-      selectRandom(depth, maxDepth);
+    public void work() {
+        long blackhole = 0;
+        for (int i = 0; i < 1000; i++) {
+            blackhole ^= Long.reverse((long) (Math.log(1L << i)));
+        }
+        if (blackhole == ThreadLocalRandom.current().nextLong()) {
+            System.err.println(blackhole);
+        }
     }
-    span.finish();
-  }
 
-  public void work() {
-    long blackhole = 0;
-    for (int i = 0; i < 1000; i++) {
-      blackhole ^= Long.reverse((long) (Math.log(1L << i)));
+    @FunctionalInterface
+    interface ThrowingRunnable {
+        void run() throws Throwable;
     }
-    if (blackhole == ThreadLocalRandom.current().nextLong()) {
-      System.err.println(blackhole);
+
+    private static void invoke(ThrowingRunnable runnable) throws Throwable {
+        runnable.run();
     }
-  }
-
-  @FunctionalInterface
-  interface ThrowingRunnable {
-    void run() throws Throwable;
-  }
-
-  private static void invoke(ThrowingRunnable runnable) throws Throwable {
-    runnable.run();
-  }
-
-  private static MethodHandle getMethodHandle(int methodNumber) {
-    try {
-      return MethodHandles.publicLookup()
-          .findVirtual(
-              GenerativeStackTraces.class,
-              "method" + methodNumber,
-              MethodType.methodType(void.class, int.class, int.class));
-    } catch (Throwable t) {
-      return null;
+
+    private static MethodHandle getMethodHandle(int methodNumber) {
+        try {
+            return MethodHandles.publicLookup()
+                    .findVirtual(
+                            GenerativeStackTraces.class,
+                            "method" + methodNumber,
+                            MethodType.methodType(void.class, int.class, int.class));
+        } catch (Throwable t) {
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/NativeLibrariesApplication.java b/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/NativeLibrariesApplication.java
index 067c3b9a270..4941fadb4c9 100644
--- a/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/NativeLibrariesApplication.java
+++ b/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/NativeLibrariesApplication.java
@@ -12,97 +12,99 @@
 
 public class NativeLibrariesApplication {
 
-  private static final String TEXT =
-      "It was a bright cold day in April, and the clocks were striking thirteen. Winston Smith, his chin nuzzled into his breast in an effort to escape the vile wind, slipped quickly through the glass doors of Victory Mansions, though not quickly enough to prevent a swirl of gritty dust from entering along with him.";
+    private static final String TEXT =
+            "It was a bright cold day in April, and the clocks were striking thirteen. Winston Smith, his chin nuzzled into his breast in an effort to escape the vile wind, slipped quickly through the glass doors of Victory Mansions, though not quickly enough to prevent a swirl of gritty dust from entering along with him.";
 
-  public static void main(String... args) throws Throwable {
-    NativeLibrariesApplication application = new NativeLibrariesApplication();
-    switch (args[0]) {
-      case "lz4":
-        application.lz4();
-        break;
-      case "snappy":
-        application.snappy();
-        break;
-      default:
+    public static void main(String... args) throws Throwable {
+        NativeLibrariesApplication application = new NativeLibrariesApplication();
+        switch (args[0]) {
+            case "lz4":
+                application.lz4();
+                break;
+            case "snappy":
+                application.snappy();
+                break;
+            default:
+        }
     }
-  }
 
-  private final Tracer tracer;
+    private final Tracer tracer;
 
-  public NativeLibrariesApplication() {
-    this(GlobalTracer.get());
-  }
+    public NativeLibrariesApplication() {
+        this(GlobalTracer.get());
+    }
 
-  public NativeLibrariesApplication(Tracer tracer) {
-    this.tracer = tracer;
-  }
+    public NativeLibrariesApplication(Tracer tracer) {
+        this.tracer = tracer;
+    }
 
-  public void lz4() {
-    byte[] bytes = TEXT.getBytes(StandardCharsets.UTF_8);
-    Span lz4 = tracer.buildSpan("lz4").start();
-    try (Scope outer = tracer.activateSpan(lz4)) {
-      for (int i = 0; i < 200; i++) {
-        {
-          Span compress = tracer.buildSpan("lz4.compress.fast").start();
-          byte[] compressed;
-          try (Scope inner = tracer.activateSpan(compress)) {
-            compressed = LZ4Factory.nativeInstance().fastCompressor().compress(bytes);
-          }
-          compress.finish();
-          Span decompress = tracer.buildSpan("lz4.decompress.fast").start();
-          try (Scope inner = tracer.activateSpan(decompress)) {
-            LZ4Factory.nativeInstance().safeDecompressor().decompress(compressed, bytes.length);
-          }
-          decompress.finish();
+    public void lz4() {
+        byte[] bytes = TEXT.getBytes(StandardCharsets.UTF_8);
+        Span lz4 = tracer.buildSpan("lz4").start();
+        try (Scope outer = tracer.activateSpan(lz4)) {
+            for (int i = 0; i < 200; i++) {
+                {
+                    Span compress = tracer.buildSpan("lz4.compress.fast").start();
+                    byte[] compressed;
+                    try (Scope inner = tracer.activateSpan(compress)) {
+                        compressed =
+                                LZ4Factory.nativeInstance().fastCompressor().compress(bytes);
+                    }
+                    compress.finish();
+                    Span decompress = tracer.buildSpan("lz4.decompress.fast").start();
+                    try (Scope inner = tracer.activateSpan(decompress)) {
+                        LZ4Factory.nativeInstance().safeDecompressor().decompress(compressed, bytes.length);
+                    }
+                    decompress.finish();
+                }
+                {
+                    Span compress = tracer.buildSpan("lz4.compress.high").start();
+                    byte[] compressed;
+                    try (Scope inner = tracer.activateSpan(compress)) {
+                        compressed =
+                                LZ4Factory.nativeInstance().highCompressor().compress(bytes);
+                    }
+                    compress.finish();
+                    Span decompress = tracer.buildSpan("lz4.decompress.high").start();
+                    try (Scope inner = tracer.activateSpan(decompress)) {
+                        LZ4Factory.nativeInstance().safeDecompressor().decompress(compressed, bytes.length);
+                    }
+                    decompress.finish();
+                }
+                {
+                    Span xxhash64 = tracer.buildSpan("xxhash64").start();
+                    try (Scope inner = tracer.activateSpan(xxhash64)) {
+                        long hash64 = XXHashFactory.nativeInstance().hash64().hash(bytes, 0, bytes.length, 0L);
+                    }
+                    xxhash64.finish();
+                    Span xxhash32 = tracer.buildSpan("xxhash32").start();
+                    try (Scope inner = tracer.activateSpan(xxhash32)) {
+                        int hash32 = XXHashFactory.nativeInstance().hash32().hash(bytes, 0, bytes.length, 0);
+                    }
+                    xxhash32.finish();
+                }
+            }
+            lz4.finish();
         }
-        {
-          Span compress = tracer.buildSpan("lz4.compress.high").start();
-          byte[] compressed;
-          try (Scope inner = tracer.activateSpan(compress)) {
-            compressed = LZ4Factory.nativeInstance().highCompressor().compress(bytes);
-          }
-          compress.finish();
-          Span decompress = tracer.buildSpan("lz4.decompress.high").start();
-          try (Scope inner = tracer.activateSpan(decompress)) {
-            LZ4Factory.nativeInstance().safeDecompressor().decompress(compressed, bytes.length);
-          }
-          decompress.finish();
-        }
-        {
-          Span xxhash64 = tracer.buildSpan("xxhash64").start();
-          try (Scope inner = tracer.activateSpan(xxhash64)) {
-            long hash64 = XXHashFactory.nativeInstance().hash64().hash(bytes, 0, bytes.length, 0L);
-          }
-          xxhash64.finish();
-          Span xxhash32 = tracer.buildSpan("xxhash32").start();
-          try (Scope inner = tracer.activateSpan(xxhash32)) {
-            int hash32 = XXHashFactory.nativeInstance().hash32().hash(bytes, 0, bytes.length, 0);
-          }
-          xxhash32.finish();
-        }
-      }
-      lz4.finish();
     }
-  }
 
-  public void snappy() throws IOException {
-    Span snappy = tracer.buildSpan("snappy").start();
-    try (Scope outer = tracer.activateSpan(snappy)) {
-      for (int i = 0; i < 100; i++) {
-        Span compress = tracer.buildSpan("snappy.compress").start();
-        byte[] compressed;
-        try (Scope inner = tracer.activateSpan(compress)) {
-          compressed = Snappy.compress(TEXT);
-        }
-        compress.finish();
-        Span decompress = tracer.buildSpan("snappy.decompress").start();
-        try (Scope inner = tracer.activateSpan(decompress)) {
-          Snappy.uncompress(compressed);
+    public void snappy() throws IOException {
+        Span snappy = tracer.buildSpan("snappy").start();
+        try (Scope outer = tracer.activateSpan(snappy)) {
+            for (int i = 0; i < 100; i++) {
+                Span compress = tracer.buildSpan("snappy.compress").start();
+                byte[] compressed;
+                try (Scope inner = tracer.activateSpan(compress)) {
+                    compressed = Snappy.compress(TEXT);
+                }
+                compress.finish();
+                Span decompress = tracer.buildSpan("snappy.decompress").start();
+                try (Scope inner = tracer.activateSpan(decompress)) {
+                    Snappy.uncompress(compressed);
+                }
+                decompress.finish();
+            }
         }
-        decompress.finish();
-      }
+        snappy.finish();
     }
-    snappy.finish();
-  }
 }
diff --git a/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/ParallelProcessing.java b/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/ParallelProcessing.java
index ec696b8d4d1..d4c988614a0 100644
--- a/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/ParallelProcessing.java
+++ b/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/ParallelProcessing.java
@@ -5,29 +5,28 @@
 import org.apache.commons.math3.distribution.NormalDistribution;
 
 final class ParallelProcessing {
-  void run(int workers, long meanServiceTimeNs, int runTimeSecs, Consumer<Long> workTask) {
-    Thread[] threads = new Thread[workers];
-    for (int i = 0; i < workers; i++) {
-      threads[i] =
-          new Thread(
-              () -> {
-                long endTs = System.nanoTime() + TimeUnit.SECONDS.toNanos(runTimeSecs);
+    void run(int workers, long meanServiceTimeNs, int runTimeSecs, Consumer<Long> workTask) {
+        Thread[] threads = new Thread[workers];
+        for (int i = 0; i < workers; i++) {
+            threads[i] = new Thread(
+                    () -> {
+                        long endTs = System.nanoTime() + TimeUnit.SECONDS.toNanos(runTimeSecs);
 
-                NormalDistribution distribution =
-                    new NormalDistribution(meanServiceTimeNs, meanServiceTimeNs / 1000d);
-                while (!Thread.currentThread().isInterrupted() && System.nanoTime() < endTs) {
-                  workTask.accept((long) distribution.sample());
-                }
-              },
-              "Worker " + i);
-      threads[i].setDaemon(true);
-      threads[i].start();
+                        NormalDistribution distribution =
+                                new NormalDistribution(meanServiceTimeNs, meanServiceTimeNs / 1000d);
+                        while (!Thread.currentThread().isInterrupted() && System.nanoTime() < endTs) {
+                            workTask.accept((long) distribution.sample());
+                        }
+                    },
+                    "Worker " + i);
+            threads[i].setDaemon(true);
+            threads[i].start();
+        }
+        for (Thread thread : threads) {
+            try {
+                thread.join();
+            } catch (InterruptedException ignored) {
+            }
+        }
     }
-    for (Thread thread : threads) {
-      try {
-        thread.join();
-      } catch (InterruptedException ignored) {
-      }
-    }
-  }
 }
diff --git a/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/ProfilingTestApplication.java b/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/ProfilingTestApplication.java
index 5db03d485a2..17352337691 100644
--- a/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/ProfilingTestApplication.java
+++ b/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/ProfilingTestApplication.java
@@ -22,151 +22,143 @@
 import java.util.stream.IntStream;
 
 public class ProfilingTestApplication {
-  private static final ThreadMXBean THREAD_MX_BEAN = ManagementFactory.getThreadMXBean();
+    private static final ThreadMXBean THREAD_MX_BEAN = ManagementFactory.getThreadMXBean();
 
-  private static final ExecutorService EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
-  private static final ExecutorService FJP = new ForkJoinPool(4);
+    private static final ExecutorService EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
+    private static final ExecutorService FJP = new ForkJoinPool(4);
 
-  @SuppressWarnings("try")
-  public static void main(final String[] args) throws Exception {
-    ProfilingContextAttribute foo = Profiling.get().createContextAttribute("foo");
-    long duration = -1;
-    if (args.length > 0) {
-      duration = TimeUnit.SECONDS.toMillis(Long.parseLong(args[0]));
-    }
-    setupDeadlock();
-    submitWorkToTPE();
-    submitWorkToFJP();
-    final long startTime = System.currentTimeMillis();
-    int counter = 0;
-    while (true) {
-      try (ProfilingScope scope = Profiling.get().newScope()) {
-        scope.setContextValue(foo, "context" + counter % 10);
-        tracedMethod();
-        if (duration > 0 && duration + startTime < System.currentTimeMillis()) {
-          break;
+    @SuppressWarnings("try")
+    public static void main(final String[] args) throws Exception {
+        ProfilingContextAttribute foo = Profiling.get().createContextAttribute("foo");
+        long duration = -1;
+        if (args.length > 0) {
+            duration = TimeUnit.SECONDS.toMillis(Long.parseLong(args[0]));
+        }
+        setupDeadlock();
+        submitWorkToTPE();
+        submitWorkToFJP();
+        final long startTime = System.currentTimeMillis();
+        int counter = 0;
+        while (true) {
+            try (ProfilingScope scope = Profiling.get().newScope()) {
+                scope.setContextValue(foo, "context" + counter % 10);
+                tracedMethod();
+                if (duration > 0 && duration + startTime < System.currentTimeMillis()) {
+                    break;
+                }
+                counter++;
+            }
         }
-        counter++;
-      }
+        System.out.println("Exiting (" + duration + ")");
     }
-    System.out.println("Exiting (" + duration + ")");
-  }
 
-  @Trace
-  private static void tracedMethod() throws InterruptedException {
-    System.out.println("Tracing");
-    tracedBusyMethod();
-    // request GC which will in turn trigger OldObjectSample events
-    System.gc();
-    try {
-      throw new IllegalStateException("test");
-    } catch (final IllegalStateException ignored) {
+    @Trace
+    private static void tracedMethod() throws InterruptedException {
+        System.out.println("Tracing");
+        tracedBusyMethod();
+        // request GC which will in turn trigger OldObjectSample events
+        System.gc();
+        try {
+            throw new IllegalStateException("test");
+        } catch (final IllegalStateException ignored) {
+        }
+        Thread.sleep(50);
     }
-    Thread.sleep(50);
-  }
 
-  @Trace
-  private static void tracedBusyMethod() {
-    long startTime = THREAD_MX_BEAN.getCurrentThreadCpuTime();
-    Random random = new Random();
-    long accumulator = 0L;
-    while (true) {
-      accumulator += random.nextInt(113);
-      if (THREAD_MX_BEAN.getCurrentThreadCpuTime() - startTime > 10_000_000L) {
-        // looking for at least 10ms CPU time
-        break;
-      }
+    @Trace
+    private static void tracedBusyMethod() {
+        long startTime = THREAD_MX_BEAN.getCurrentThreadCpuTime();
+        Random random = new Random();
+        long accumulator = 0L;
+        while (true) {
+            accumulator += random.nextInt(113);
+            if (THREAD_MX_BEAN.getCurrentThreadCpuTime() - startTime > 10_000_000L) {
+                // looking for at least 10ms CPU time
+                break;
+            }
+        }
+        System.out.println("accumulated: " + accumulator);
     }
-    System.out.println("accumulated: " + accumulator);
-  }
-
-  @Trace
-  private static void submitWorkToTPE() throws Exception {
-    submitWorkToExecutor(EXECUTOR_SERVICE);
-  }
 
-  @Trace
-  private static void submitWorkToFJP() throws Exception {
-    submitWorkToExecutor(FJP);
-  }
+    @Trace
+    private static void submitWorkToTPE() throws Exception {
+        submitWorkToExecutor(EXECUTOR_SERVICE);
+    }
 
-  private static void submitWorkToExecutor(ExecutorService executorService)
-      throws ExecutionException, InterruptedException {
-    AtomicInteger it = new AtomicInteger();
-    for (int i = 0; i < 100; i++) {
-      executorService
-          .submit(
-              () -> {
-                try {
-                  Thread.sleep(10);
-                  it.incrementAndGet();
-                } catch (InterruptedException e) {
-                }
-              })
-          .get();
+    @Trace
+    private static void submitWorkToFJP() throws Exception {
+        submitWorkToExecutor(FJP);
     }
-    List<Callable<Integer>> runnables =
-        IntStream.range(0, 100)
-            .mapToObj(
-                i ->
-                    (Callable<Integer>)
-                        () -> {
-                          try {
+
+    private static void submitWorkToExecutor(ExecutorService executorService)
+            throws ExecutionException, InterruptedException {
+        AtomicInteger it = new AtomicInteger();
+        for (int i = 0; i < 100; i++) {
+            executorService
+                    .submit(() -> {
+                        try {
                             Thread.sleep(10);
-                          } catch (InterruptedException e) {
-                          }
-                          return it.getAndIncrement();
-                        })
-            .collect(Collectors.toList());
-    for (Future f : executorService.invokeAll(runnables)) {
-      f.get();
+                            it.incrementAndGet();
+                        } catch (InterruptedException e) {
+                        }
+                    })
+                    .get();
+        }
+        List<Callable<Integer>> runnables = IntStream.range(0, 100)
+                .mapToObj(i -> (Callable<Integer>) () -> {
+                    try {
+                        Thread.sleep(10);
+                    } catch (InterruptedException e) {
+                    }
+                    return it.getAndIncrement();
+                })
+                .collect(Collectors.toList());
+        for (Future f : executorService.invokeAll(runnables)) {
+            f.get();
+        }
+        System.out.println(executorService.getClass() + " incremented: " + it.get());
     }
-    System.out.println(executorService.getClass() + " incremented: " + it.get());
-  }
 
-  private static void setupDeadlock() {
-    final Phaser phaser = new Phaser(3);
-    final Object lockA = new Object();
-    final Object lockB = new Object();
+    private static void setupDeadlock() {
+        final Phaser phaser = new Phaser(3);
+        final Object lockA = new Object();
+        final Object lockB = new Object();
 
-    final Thread threadA =
-        new Thread(
-            () -> {
-              synchronized (lockA) {
-                phaser.arriveAndAwaitAdvance(); // sync such as cross-order locking is provoked
-                synchronized (lockB) {
-                  phaser.arriveAndDeregister(); // virtually unreachable
-                }
-              }
-            },
-            "monitor-thread-A");
-    final Thread threadB =
-        new Thread(
-            () -> {
-              synchronized (lockB) {
-                phaser.arriveAndAwaitAdvance(); // sync such as cross-order locking is provoked
-                synchronized (lockA) {
-                  phaser.arriveAndDeregister(); // virtually unreachable
-                }
-              }
-            },
-            "monitor-thread-B");
-    threadA.setDaemon(true);
-    threadB.setDaemon(true);
+        final Thread threadA = new Thread(
+                () -> {
+                    synchronized (lockA) {
+                        phaser.arriveAndAwaitAdvance(); // sync such as cross-order locking is provoked
+                        synchronized (lockB) {
+                            phaser.arriveAndDeregister(); // virtually unreachable
+                        }
+                    }
+                },
+                "monitor-thread-A");
+        final Thread threadB = new Thread(
+                () -> {
+                    synchronized (lockB) {
+                        phaser.arriveAndAwaitAdvance(); // sync such as cross-order locking is provoked
+                        synchronized (lockA) {
+                            phaser.arriveAndDeregister(); // virtually unreachable
+                        }
+                    }
+                },
+                "monitor-thread-B");
+        threadA.setDaemon(true);
+        threadB.setDaemon(true);
 
-    final CountDownLatch latch = new CountDownLatch(1);
-    Thread main =
-        new Thread(
-            () -> {
-              threadA.start();
-              threadB.start();
-              phaser.arriveAndAwaitAdvance(); // enter deadlock
-              phaser.arriveAndAwaitAdvance(); // unreachable if deadlock is present
-              latch.countDown();
-            },
-            "main-monitor-thread");
-    main.setDaemon(true);
+        final CountDownLatch latch = new CountDownLatch(1);
+        Thread main = new Thread(
+                () -> {
+                    threadA.start();
+                    threadB.start();
+                    phaser.arriveAndAwaitAdvance(); // enter deadlock
+                    phaser.arriveAndAwaitAdvance(); // unreachable if deadlock is present
+                    latch.countDown();
+                },
+                "main-monitor-thread");
+        main.setDaemon(true);
 
-    main.start();
-  }
+        main.start();
+    }
 }
diff --git a/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/QueueProcessing.java b/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/QueueProcessing.java
index 4efc4ffd29e..6ada05beb77 100644
--- a/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/QueueProcessing.java
+++ b/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/QueueProcessing.java
@@ -8,43 +8,39 @@
 import org.apache.commons.math3.distribution.ExponentialDistribution;
 
 final class QueueProcessing {
-  private final BlockingQueue<Consumer<Long>> workQueue;
-  private final ExecutorService executor;
+    private final BlockingQueue<Consumer<Long>> workQueue;
+    private final ExecutorService executor;
 
-  QueueProcessing(int queueCapacity, int workers, long meanServiceTimeNs) {
-    workQueue = new ArrayBlockingQueue<>(queueCapacity);
-    executor =
-        Executors.newFixedThreadPool(
-            workers,
-            r -> {
-              Thread t = new Thread(r, "Worker");
-              t.setDaemon(true);
-              return t;
+    QueueProcessing(int queueCapacity, int workers, long meanServiceTimeNs) {
+        workQueue = new ArrayBlockingQueue<>(queueCapacity);
+        executor = Executors.newFixedThreadPool(workers, r -> {
+            Thread t = new Thread(r, "Worker");
+            t.setDaemon(true);
+            return t;
+        });
+        for (int i = 0; i < workers; i++) {
+            executor.submit(() -> {
+                ExponentialDistribution distribution = new ExponentialDistribution(meanServiceTimeNs);
+                while (!Thread.currentThread().isInterrupted()) {
+                    try {
+                        Consumer<Long> item = workQueue.take();
+                        long sample = (long) distribution.sample();
+                        System.out.println("=== service time: " + sample + "ns");
+                        item.accept(sample);
+                        System.out.println("=== submitted");
+                    } catch (InterruptedException ignored) {
+                        Thread.currentThread().interrupt();
+                    }
+                }
             });
-    for (int i = 0; i < workers; i++) {
-      executor.submit(
-          () -> {
-            ExponentialDistribution distribution = new ExponentialDistribution(meanServiceTimeNs);
-            while (!Thread.currentThread().isInterrupted()) {
-              try {
-                Consumer<Long> item = workQueue.take();
-                long sample = (long) distribution.sample();
-                System.out.println("=== service time: " + sample + "ns");
-                item.accept(sample);
-                System.out.println("=== submitted");
-              } catch (InterruptedException ignored) {
-                Thread.currentThread().interrupt();
-              }
-            }
-          });
+        }
     }
-  }
 
-  boolean enqueue(Consumer<Long> workItem) {
-    return workQueue.offer(workItem);
-  }
+    boolean enqueue(Consumer<Long> workItem) {
+        return workQueue.offer(workItem);
+    }
 
-  void shutdown() {
-    executor.shutdownNow();
-  }
+    void shutdown() {
+        executor.shutdownNow();
+    }
 }
diff --git a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/CodeHotspotsTest.java b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/CodeHotspotsTest.java
index e74c92847ad..24d13a5538d 100644
--- a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/CodeHotspotsTest.java
+++ b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/CodeHotspotsTest.java
@@ -54,339 +54,315 @@
 
 @DisabledOnJ9
 public final class CodeHotspotsTest {
-  private static final int TEST_CASE_TIMEOUT = 5; // seconds
-  private static final IAttribute<IQuantity> SPAN_ID = attr("spanId", "spanId", "spanId", NUMBER);
-  private static final IAttribute<String> OPERATION =
-      attr("_dd.trace.operation", "operation", "operation", PLAIN_TEXT);
-
-  private static final Path LOG_FILE_BASE =
-      Paths.get(buildDirectory(), "reports", "testProcess." + CodeHotspotsTest.class.getName());
-
-  @BeforeAll
-  static void setupAll() throws Exception {
-    assumeFalse(
-        OperatingSystem.isMacOs() || System.getenv("TEST_LIBDDPROF") == null,
-        "Test skipped. Set TEST_LIBDDPROF env variable to point to MacOS version of libjavaProfiler.so, and rerun.");
-    Files.createDirectories(LOG_FILE_BASE);
-  }
-
-  private Path logFilePath = null;
-  private Path dumpDir = null;
-
-  private int timeout;
-
-  @BeforeEach
-  void setup(final TestInfo testInfo) throws Exception {
-    logFilePath = LOG_FILE_BASE.resolve(testInfo.getTestMethod().orElse(null).getName() + ".log");
-    dumpDir = Files.createTempDirectory("dd-profiler-");
-
-    double load = ManagementFactory.getOperatingSystemMXBean().getSystemLoadAverage();
-    int cores = Runtime.getRuntime().availableProcessors();
-    // if the system is busy the timeout needs to be extended in order for the profiler to run
-    double timeoutQuotient = Math.ceil(Math.max(1d, load / cores));
-
-    timeout = (int) (TEST_CASE_TIMEOUT * timeoutQuotient);
-    if (timeoutQuotient > 1) {
-      System.out.println(
-          "===> Timeout scaled by "
-              + timeoutQuotient
-              + " to "
-              + timeout
-              + "s (load = "
-              + load
-              + ", cores = "
-              + cores
-              + ")");
+    private static final int TEST_CASE_TIMEOUT = 5; // seconds
+    private static final IAttribute<IQuantity> SPAN_ID = attr("spanId", "spanId", "spanId", NUMBER);
+    private static final IAttribute<String> OPERATION =
+            attr("_dd.trace.operation", "operation", "operation", PLAIN_TEXT);
+
+    private static final Path LOG_FILE_BASE =
+            Paths.get(buildDirectory(), "reports", "testProcess." + CodeHotspotsTest.class.getName());
+
+    @BeforeAll
+    static void setupAll() throws Exception {
+        assumeFalse(
+                OperatingSystem.isMacOs() || System.getenv("TEST_LIBDDPROF") == null,
+                "Test skipped. Set TEST_LIBDDPROF env variable to point to MacOS version of libjavaProfiler.so, and rerun.");
+        Files.createDirectories(LOG_FILE_BASE);
     }
-  }
-
-  @AfterEach
-  void tearDown() throws Exception {
-    Files.walk(dumpDir).sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete);
-    Files.deleteIfExists(dumpDir);
-    System.out.println("===\n");
-  }
-
-  @ParameterizedTest(
-      name = "Test reactive app (mean service time = {0}, arrival rate = {1} tasks/s)")
-  @MethodSource("reactiveTestParams")
-  @Disabled
-  void testReactive(Duration meanServiceTime, int arrivalRate, double minCoverage)
-      throws Exception {
-    System.out.println(
-        "=== Test reactive app (mean service time = "
-            + meanServiceTime
-            + ", arrival rate = "
-            + arrivalRate
-            + " tasks/s)");
-    int interval = 10; // milliseconds
-    int workers = 2;
-    Process targetProcess =
-        createProcessBuilder(
-                CodeHotspotsApplication.class.getName(),
-                0,
-                timeout * 2,
-                interval,
-                interval,
-                dumpDir,
-                logFilePath,
-                "reactive",
-                Integer.toString(workers),
-                Long.toString(meanServiceTime.toNanos()),
-                Long.toString(arrivalRate),
-                Integer.toString(timeout))
-            .start();
-    checkProcessSuccessfullyEnd(targetProcess, logFilePath);
-
-    long serviceRate = (long) (workers * 1_000_000_000d) / meanServiceTime.toNanos();
-    double idleness = Math.max(0d, (serviceRate - arrivalRate) / (double) serviceRate);
-
-    Files.walk(dumpDir)
-        .filter(Files::isRegularFile)
-        .map(Path::toFile)
-        .forEach(f -> validateJfr(f, idleness, minCoverage));
-  }
-
-  private static Stream<Arguments> reactiveTestParams() {
-    return Stream.of(
-        Arguments.of(Duration.ofMillis(100), 5000, 0.9d),
-        Arguments.of(Duration.ofMillis(1), 5000, 0.5d),
-        Arguments.of(Duration.of(100, ChronoUnit.MICROS), 5000, 0.2d),
-        Arguments.of(Duration.ofMillis(100), 50, 0.8d),
-        Arguments.of(Duration.ofMillis(1), 50, 0.3d),
-        Arguments.of(Duration.of(100, ChronoUnit.MICROS), 50, 0.15d));
-  }
-
-  @Test
-  @DisplayName("Test batch app")
-  @Flaky
-  void testBatch() throws Exception {
-    System.out.println("Test batch app");
-    int meanServiceTimeSecs = 1; // seconds
-    long meanServiceTimeNs = TimeUnit.SECONDS.toNanos(meanServiceTimeSecs);
-    int interval = 10; // milliseconds
-    Process targetProcess =
-        createProcessBuilder(
-                CodeHotspotsApplication.class.getName(),
-                0,
-                timeout * 2,
-                interval,
-                interval,
-                dumpDir,
-                logFilePath,
-                "batch",
-                Long.toString(meanServiceTimeNs),
-                Integer.toString(timeout))
-            .start();
-    checkProcessSuccessfullyEnd(targetProcess, logFilePath);
-
-    Files.walk(dumpDir)
-        .filter(Files::isRegularFile)
-        .map(Path::toFile)
-        .forEach(f -> validateJfr(f, 0, 0.9));
-  }
-
-  @Test
-  @DisplayName("Test saturated parallel processing")
-  @Flaky
-  void testSaturatedFanout() throws Exception {
-    System.out.println("Test saturated parallel processing");
-    int meanServiceTimeSecs = 1; // seconds
-    long meanServiceTimeNs = TimeUnit.SECONDS.toNanos(meanServiceTimeSecs);
-    int interval = 10; // milliseconds
-    int workers =
-        Runtime.getRuntime().availableProcessors() * 2; // more workers than available cores
-    Process targetProcess =
-        createProcessBuilder(
-                CodeHotspotsApplication.class.getName(),
-                0,
-                timeout * 2,
-                interval,
-                interval,
-                dumpDir,
-                logFilePath,
-                "fanout",
-                Integer.toString(workers),
-                Long.toString(meanServiceTimeNs),
-                Integer.toString(timeout))
-            .start();
-    checkProcessSuccessfullyEnd(targetProcess, logFilePath);
-
-    Files.walk(dumpDir)
-        .filter(Files::isRegularFile)
-        .map(Path::toFile)
-        .forEach(f -> validateJfr(f, 0, 0.8));
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"lz4", "snappy"})
-  @Flaky
-  void testNativeLibrary(String libraryName) throws Exception {
-    System.out.println("Test " + libraryName);
-    int interval = 10; // milliseconds
-    Process targetProcess =
-        createProcessBuilder(
-                NativeLibrariesApplication.class.getName(),
-                0,
-                timeout * 2,
-                interval,
-                interval,
-                dumpDir,
-                logFilePath,
-                libraryName)
-            .start();
-    checkProcessSuccessfullyEnd(targetProcess, logFilePath);
-
-    Files.walk(dumpDir)
-        .filter(Files::isRegularFile)
-        .map(Path::toFile)
-        .forEach(CodeHotspotsTest::hasCpuEvents);
-  }
-
-  @Flaky
-  @ParameterizedTest
-  @ValueSource(ints = {128})
-  void testGenerativeStackTraces(int depth) throws Exception {
-    runTestGenerativeStackTraces("Raw", depth);
-  }
-
-  @Flaky
-  @ParameterizedTest
-  @ValueSource(ints = {128})
-  void testGenerativeStackTracesWithMethodHandles(int depth) throws Exception {
-    runTestGenerativeStackTraces("MethodHandles", depth);
-  }
-
-  @Flaky("hasCpuEvents assertions fails sometimes")
-  @ParameterizedTest
-  @ValueSource(ints = {128})
-  void testGenerativeStackTracesWithCapturingLambdas(int depth) throws Exception {
-    runTestGenerativeStackTraces("CapturingLambdas", depth);
-  }
-
-  private void runTestGenerativeStackTraces(String mode, int depth) throws Exception {
-    System.out.println("Test depth=" + depth + " with mode: " + mode);
-    int interval = 10; // milliseconds
-    Process targetProcess =
-        createProcessBuilder(
-                GenerativeStackTraces.class.getName(),
-                0,
-                timeout * 2,
-                interval,
-                interval,
-                dumpDir,
-                logFilePath,
-                String.valueOf(depth),
-                "1000",
-                mode)
-            .start();
-    checkProcessSuccessfullyEnd(targetProcess, logFilePath);
-
-    Files.walk(dumpDir)
-        .filter(Files::isRegularFile)
-        .map(Path::toFile)
-        .forEach(CodeHotspotsTest::hasCpuEvents);
-  }
-
-  private static void hasCpuEvents(File f) {
-    try {
-      IItemCollection events = JfrLoaderToolkit.loadEvents(f);
-      IItemCollection cpu = events.apply(ItemFilters.type("datadog.ExecutionSample"));
-      assertTrue(cpu.hasItems(), "no cpu events");
-      int labelCount = 0;
-      for (IItemIterable items : cpu) {
-        IMemberAccessor<IQuantity, IItem> spanIdAccessor = SPAN_ID.getAccessor(items.getType());
-        for (IItem item : items) {
-          long spanId = spanIdAccessor.getMember(item).longValue();
-          labelCount += (spanId != 0) ? 1 : 0;
+
+    private Path logFilePath = null;
+    private Path dumpDir = null;
+
+    private int timeout;
+
+    @BeforeEach
+    void setup(final TestInfo testInfo) throws Exception {
+        logFilePath =
+                LOG_FILE_BASE.resolve(testInfo.getTestMethod().orElse(null).getName() + ".log");
+        dumpDir = Files.createTempDirectory("dd-profiler-");
+
+        double load = ManagementFactory.getOperatingSystemMXBean().getSystemLoadAverage();
+        int cores = Runtime.getRuntime().availableProcessors();
+        // if the system is busy the timeout needs to be extended in order for the profiler to run
+        double timeoutQuotient = Math.ceil(Math.max(1d, load / cores));
+
+        timeout = (int) (TEST_CASE_TIMEOUT * timeoutQuotient);
+        if (timeoutQuotient > 1) {
+            System.out.println("===> Timeout scaled by "
+                    + timeoutQuotient
+                    + " to "
+                    + timeout
+                    + "s (load = "
+                    + load
+                    + ", cores = "
+                    + cores
+                    + ")");
         }
-      }
-      assertTrue(labelCount > 0, "no cpu labels");
-    } catch (Exception e) {
-      fail(e);
     }
-  }
-
-  private static void validateJfr(File f, double idleness, double minCoverage) {
-    try {
-      IItemCollection events = JfrLoaderToolkit.loadEvents(f);
-      IItemCollection wallclock = events.apply(ItemFilters.type("datadog.MethodSample"));
-      //      IItemCollection cpu = events.apply(ItemFilters.type("datadog.ExecutionSample"));
-      assertTrue(wallclock.hasItems(), "No datadog.MethodSample events found from " + f.getName());
-      //      assertTrue(cpu.hasItems());
-
-      validateStats(wallclock, idleness, minCoverage);
-    } catch (Exception e) {
-      fail(e);
+
+    @AfterEach
+    void tearDown() throws Exception {
+        Files.walk(dumpDir).sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete);
+        Files.deleteIfExists(dumpDir);
+        System.out.println("===\n");
+    }
+
+    @ParameterizedTest(name = "Test reactive app (mean service time = {0}, arrival rate = {1} tasks/s)")
+    @MethodSource("reactiveTestParams")
+    @Disabled
+    void testReactive(Duration meanServiceTime, int arrivalRate, double minCoverage) throws Exception {
+        System.out.println("=== Test reactive app (mean service time = "
+                + meanServiceTime
+                + ", arrival rate = "
+                + arrivalRate
+                + " tasks/s)");
+        int interval = 10; // milliseconds
+        int workers = 2;
+        Process targetProcess = createProcessBuilder(
+                        CodeHotspotsApplication.class.getName(),
+                        0,
+                        timeout * 2,
+                        interval,
+                        interval,
+                        dumpDir,
+                        logFilePath,
+                        "reactive",
+                        Integer.toString(workers),
+                        Long.toString(meanServiceTime.toNanos()),
+                        Long.toString(arrivalRate),
+                        Integer.toString(timeout))
+                .start();
+        checkProcessSuccessfullyEnd(targetProcess, logFilePath);
+
+        long serviceRate = (long) (workers * 1_000_000_000d) / meanServiceTime.toNanos();
+        double idleness = Math.max(0d, (serviceRate - arrivalRate) / (double) serviceRate);
+
+        Files.walk(dumpDir)
+                .filter(Files::isRegularFile)
+                .map(Path::toFile)
+                .forEach(f -> validateJfr(f, idleness, minCoverage));
+    }
+
+    private static Stream<Arguments> reactiveTestParams() {
+        return Stream.of(
+                Arguments.of(Duration.ofMillis(100), 5000, 0.9d),
+                Arguments.of(Duration.ofMillis(1), 5000, 0.5d),
+                Arguments.of(Duration.of(100, ChronoUnit.MICROS), 5000, 0.2d),
+                Arguments.of(Duration.ofMillis(100), 50, 0.8d),
+                Arguments.of(Duration.ofMillis(1), 50, 0.3d),
+                Arguments.of(Duration.of(100, ChronoUnit.MICROS), 50, 0.15d));
+    }
+
+    @Test
+    @DisplayName("Test batch app")
+    @Flaky
+    void testBatch() throws Exception {
+        System.out.println("Test batch app");
+        int meanServiceTimeSecs = 1; // seconds
+        long meanServiceTimeNs = TimeUnit.SECONDS.toNanos(meanServiceTimeSecs);
+        int interval = 10; // milliseconds
+        Process targetProcess = createProcessBuilder(
+                        CodeHotspotsApplication.class.getName(),
+                        0,
+                        timeout * 2,
+                        interval,
+                        interval,
+                        dumpDir,
+                        logFilePath,
+                        "batch",
+                        Long.toString(meanServiceTimeNs),
+                        Integer.toString(timeout))
+                .start();
+        checkProcessSuccessfullyEnd(targetProcess, logFilePath);
+
+        Files.walk(dumpDir).filter(Files::isRegularFile).map(Path::toFile).forEach(f -> validateJfr(f, 0, 0.9));
+    }
+
+    @Test
+    @DisplayName("Test saturated parallel processing")
+    @Flaky
+    void testSaturatedFanout() throws Exception {
+        System.out.println("Test saturated parallel processing");
+        int meanServiceTimeSecs = 1; // seconds
+        long meanServiceTimeNs = TimeUnit.SECONDS.toNanos(meanServiceTimeSecs);
+        int interval = 10; // milliseconds
+        int workers = Runtime.getRuntime().availableProcessors() * 2; // more workers than available cores
+        Process targetProcess = createProcessBuilder(
+                        CodeHotspotsApplication.class.getName(),
+                        0,
+                        timeout * 2,
+                        interval,
+                        interval,
+                        dumpDir,
+                        logFilePath,
+                        "fanout",
+                        Integer.toString(workers),
+                        Long.toString(meanServiceTimeNs),
+                        Integer.toString(timeout))
+                .start();
+        checkProcessSuccessfullyEnd(targetProcess, logFilePath);
+
+        Files.walk(dumpDir).filter(Files::isRegularFile).map(Path::toFile).forEach(f -> validateJfr(f, 0, 0.8));
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"lz4", "snappy"})
+    @Flaky
+    void testNativeLibrary(String libraryName) throws Exception {
+        System.out.println("Test " + libraryName);
+        int interval = 10; // milliseconds
+        Process targetProcess = createProcessBuilder(
+                        NativeLibrariesApplication.class.getName(),
+                        0,
+                        timeout * 2,
+                        interval,
+                        interval,
+                        dumpDir,
+                        logFilePath,
+                        libraryName)
+                .start();
+        checkProcessSuccessfullyEnd(targetProcess, logFilePath);
+
+        Files.walk(dumpDir).filter(Files::isRegularFile).map(Path::toFile).forEach(CodeHotspotsTest::hasCpuEvents);
+    }
+
+    @Flaky
+    @ParameterizedTest
+    @ValueSource(ints = {128})
+    void testGenerativeStackTraces(int depth) throws Exception {
+        runTestGenerativeStackTraces("Raw", depth);
+    }
+
+    @Flaky
+    @ParameterizedTest
+    @ValueSource(ints = {128})
+    void testGenerativeStackTracesWithMethodHandles(int depth) throws Exception {
+        runTestGenerativeStackTraces("MethodHandles", depth);
+    }
+
+    @Flaky("hasCpuEvents assertions fails sometimes")
+    @ParameterizedTest
+    @ValueSource(ints = {128})
+    void testGenerativeStackTracesWithCapturingLambdas(int depth) throws Exception {
+        runTestGenerativeStackTraces("CapturingLambdas", depth);
+    }
+
+    private void runTestGenerativeStackTraces(String mode, int depth) throws Exception {
+        System.out.println("Test depth=" + depth + " with mode: " + mode);
+        int interval = 10; // milliseconds
+        Process targetProcess = createProcessBuilder(
+                        GenerativeStackTraces.class.getName(),
+                        0,
+                        timeout * 2,
+                        interval,
+                        interval,
+                        dumpDir,
+                        logFilePath,
+                        String.valueOf(depth),
+                        "1000",
+                        mode)
+                .start();
+        checkProcessSuccessfullyEnd(targetProcess, logFilePath);
+
+        Files.walk(dumpDir).filter(Files::isRegularFile).map(Path::toFile).forEach(CodeHotspotsTest::hasCpuEvents);
     }
-  }
-
-  private static void validateStats(IItemCollection events, double idleness, double minCoverage) {
-    SummaryStatistics summaryStats = new SummaryStatistics();
-    PSquarePercentile p50 = new PSquarePercentile(50d);
-    PSquarePercentile p99 = new PSquarePercentile(1d);
-    long qualifiedSamples = 0;
-    long nonQualifiedSamples = 0;
-
-    Map<String, AtomicLong> spanSampleCnt = new HashMap<>();
-    Map<String, AtomicLong> operationSampleCnt = new HashMap<>();
-    for (IItemIterable items : events) {
-      IMemberAccessor<IQuantity, IItem> spanIdAccessor = SPAN_ID.getAccessor(items.getType());
-      IMemberAccessor<String, IItem> operationNameAccessor = OPERATION.getAccessor(items.getType());
-      IMemberAccessor<String, IItem> threadNameAccessor =
-          JdkAttributes.EVENT_THREAD_NAME.getAccessor(items.getType());
-      for (IItem item : items) {
-        String threadName = threadNameAccessor.getMember(item);
-        if (!threadName.contains("Worker")) {
-          continue;
+
+    private static void hasCpuEvents(File f) {
+        try {
+            IItemCollection events = JfrLoaderToolkit.loadEvents(f);
+            IItemCollection cpu = events.apply(ItemFilters.type("datadog.ExecutionSample"));
+            assertTrue(cpu.hasItems(), "no cpu events");
+            int labelCount = 0;
+            for (IItemIterable items : cpu) {
+                IMemberAccessor<IQuantity, IItem> spanIdAccessor = SPAN_ID.getAccessor(items.getType());
+                for (IItem item : items) {
+                    long spanId = spanIdAccessor.getMember(item).longValue();
+                    labelCount += (spanId != 0) ? 1 : 0;
+                }
+            }
+            assertTrue(labelCount > 0, "no cpu labels");
+        } catch (Exception e) {
+            fail(e);
+        }
+    }
+
+    private static void validateJfr(File f, double idleness, double minCoverage) {
+        try {
+            IItemCollection events = JfrLoaderToolkit.loadEvents(f);
+            IItemCollection wallclock = events.apply(ItemFilters.type("datadog.MethodSample"));
+            //      IItemCollection cpu = events.apply(ItemFilters.type("datadog.ExecutionSample"));
+            assertTrue(wallclock.hasItems(), "No datadog.MethodSample events found from " + f.getName());
+            //      assertTrue(cpu.hasItems());
+
+            validateStats(wallclock, idleness, minCoverage);
+        } catch (Exception e) {
+            fail(e);
         }
-        String operationName = operationNameAccessor.getMember(item);
-        long spanId = spanIdAccessor.getMember(item).longValue();
-        if (spanId == 0) {
-          nonQualifiedSamples++;
-        } else {
-          qualifiedSamples++;
-          spanSampleCnt
-              .computeIfAbsent(Long.toString(spanId), k -> new AtomicLong(0))
-              .incrementAndGet();
-          operationSampleCnt
-              .computeIfAbsent(operationName, k -> new AtomicLong(0))
-              .incrementAndGet();
+    }
+
+    private static void validateStats(IItemCollection events, double idleness, double minCoverage) {
+        SummaryStatistics summaryStats = new SummaryStatistics();
+        PSquarePercentile p50 = new PSquarePercentile(50d);
+        PSquarePercentile p99 = new PSquarePercentile(1d);
+        long qualifiedSamples = 0;
+        long nonQualifiedSamples = 0;
+
+        Map<String, AtomicLong> spanSampleCnt = new HashMap<>();
+        Map<String, AtomicLong> operationSampleCnt = new HashMap<>();
+        for (IItemIterable items : events) {
+            IMemberAccessor<IQuantity, IItem> spanIdAccessor = SPAN_ID.getAccessor(items.getType());
+            IMemberAccessor<String, IItem> operationNameAccessor = OPERATION.getAccessor(items.getType());
+            IMemberAccessor<String, IItem> threadNameAccessor =
+                    JdkAttributes.EVENT_THREAD_NAME.getAccessor(items.getType());
+            for (IItem item : items) {
+                String threadName = threadNameAccessor.getMember(item);
+                if (!threadName.contains("Worker")) {
+                    continue;
+                }
+                String operationName = operationNameAccessor.getMember(item);
+                long spanId = spanIdAccessor.getMember(item).longValue();
+                if (spanId == 0) {
+                    nonQualifiedSamples++;
+                } else {
+                    qualifiedSamples++;
+                    spanSampleCnt
+                            .computeIfAbsent(Long.toString(spanId), k -> new AtomicLong(0))
+                            .incrementAndGet();
+                    operationSampleCnt
+                            .computeIfAbsent(operationName, k -> new AtomicLong(0))
+                            .incrementAndGet();
+                }
+            }
         }
-      }
+        spanSampleCnt.values().stream().map(AtomicLong::get).forEach(v -> {
+            summaryStats.addValue(v);
+            p99.increment(v);
+            p50.increment(v);
+        });
+
+        /*
+         Qualified samples are scaled according to 'idleness' -
+         If the system is idle the workers will be waiting for input (preferably, outside any context) and as such
+         the ratio of samples without context will be inflated.
+         Re-scaling using the idleness metric brings the coverage back to the level as if the system is fully
+         utilized.
+        */
+        double scaledQualifiedSamples = (qualifiedSamples / (1 - idleness));
+        double coverage = (scaledQualifiedSamples / (scaledQualifiedSamples + nonQualifiedSamples));
+        System.out.println("Spans     : " + summaryStats.getN());
+        System.out.println("  Coverage: " + coverage);
+        System.out.println("Samples   :");
+        System.out.println("  Mean    : " + summaryStats.getMean());
+        System.out.println("  Median  : " + p50.getResult());
+        System.out.println("  P99     : " + p99.getResult());
+
+        assertTrue(coverage >= minCoverage, "Expected coverage: " + coverage + " >= " + minCoverage);
+
+        // span names defined in CodeHotspotsApplication
+        assertFalse(operationSampleCnt.isEmpty(), "no operation names");
+        assertTrue(operationSampleCnt.size() <= 2, "too many operation names");
+        assertTrue(
+                operationSampleCnt.get("top") != null || operationSampleCnt.get("work_item") != null,
+                "wrong operation names: " + operationSampleCnt.keySet());
     }
-    spanSampleCnt.values().stream()
-        .map(AtomicLong::get)
-        .forEach(
-            v -> {
-              summaryStats.addValue(v);
-              p99.increment(v);
-              p50.increment(v);
-            });
-
-    /*
-     Qualified samples are scaled according to 'idleness' -
-     If the system is idle the workers will be waiting for input (preferably, outside any context) and as such
-     the ratio of samples without context will be inflated.
-     Re-scaling using the idleness metric brings the coverage back to the level as if the system is fully
-     utilized.
-    */
-    double scaledQualifiedSamples = (qualifiedSamples / (1 - idleness));
-    double coverage = (scaledQualifiedSamples / (scaledQualifiedSamples + nonQualifiedSamples));
-    System.out.println("Spans     : " + summaryStats.getN());
-    System.out.println("  Coverage: " + coverage);
-    System.out.println("Samples   :");
-    System.out.println("  Mean    : " + summaryStats.getMean());
-    System.out.println("  Median  : " + p50.getResult());
-    System.out.println("  P99     : " + p99.getResult());
-
-    assertTrue(coverage >= minCoverage, "Expected coverage: " + coverage + " >= " + minCoverage);
-
-    // span names defined in CodeHotspotsApplication
-    assertFalse(operationSampleCnt.isEmpty(), "no operation names");
-    assertTrue(operationSampleCnt.size() <= 2, "too many operation names");
-    assertTrue(
-        operationSampleCnt.get("top") != null || operationSampleCnt.get("work_item") != null,
-        "wrong operation names: " + operationSampleCnt.keySet());
-  }
 }
diff --git a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/DisableOnJ9Condition.java b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/DisableOnJ9Condition.java
index bfbba362667..e9a6fb24b52 100644
--- a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/DisableOnJ9Condition.java
+++ b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/DisableOnJ9Condition.java
@@ -9,17 +9,17 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 
 public final class DisableOnJ9Condition implements ExecutionCondition {
-  @Override
-  public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
-    return isDdprofSupported()
-        ? ConditionEvaluationResult.enabled("")
-        : ConditionEvaluationResult.disabled("Profiling context is not supported for J9");
-  }
+    @Override
+    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+        return isDdprofSupported()
+                ? ConditionEvaluationResult.enabled("")
+                : ConditionEvaluationResult.disabled("Profiling context is not supported for J9");
+    }
 
-  private static boolean isDdprofSupported() {
-    return !isJ9()
-        || (isJavaVersion(8) && isJavaVersion(8, 0, 361))
-        || isJavaVersionAtLeast(11, 0, 18)
-        || isJavaVersionAtLeast(17, 0, 6);
-  }
+    private static boolean isDdprofSupported() {
+        return !isJ9()
+                || (isJavaVersion(8) && isJavaVersion(8, 0, 361))
+                || isJavaVersionAtLeast(11, 0, 18)
+                || isJavaVersionAtLeast(17, 0, 6);
+    }
 }
diff --git a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java
index 452cea370d8..af178f2663d 100644
--- a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java
+++ b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java
@@ -77,1009 +77,947 @@
 
 @DisabledIfSystemProperty(named = "java.vm.name", matches = ".*J9.*")
 class JFRBasedProfilingIntegrationTest {
-  private static final Logger log = LoggerFactory.getLogger(JFRBasedProfilingIntegrationTest.class);
-  private static final Duration ONE_NANO = Duration.ofNanos(1);
-  private static final int STACK_DEPTH_LIMIT = 8;
-
-  @FunctionalInterface
-  private interface TestBody {
-    void run() throws Exception;
-  }
-
-  private static final String VALID_API_KEY = "01234567890abcdef123456789ABCDEF";
-  private static final String BOGUS_API_KEY = "bogus";
-  private static final int PROFILING_START_DELAY_SECONDS = 1;
-  private static final int PROFILING_UPLOAD_PERIOD_SECONDS = 5;
-
-  private static final int PROFILING_UPLOAD_TIMEOUT_SECONDS = 1;
-  private static final boolean ENDPOINT_COLLECTION_ENABLED = true; // default
-  // Set the request timeout value to the sum of the initial delay and the upload period
-  // multiplied by a safety margin
-  private static final int SAFETY_MARGIN = 3;
-  private static final int REQUEST_WAIT_TIMEOUT =
-      (PROFILING_START_DELAY_SECONDS + PROFILING_UPLOAD_PERIOD_SECONDS) * SAFETY_MARGIN;
-
-  private static final Path LOG_FILE_BASE =
-      Paths.get(
-          buildDirectory(),
-          "reports",
-          "testProcess." + JFRBasedProfilingIntegrationTest.class.getName());
-
-  public static final IAttribute<IQuantity> LOCAL_ROOT_SPAN_ID =
-      attr("localRootSpanId", "localRootSpanId", "localRootSpanId", NUMBER);
-  public static final IAttribute<IQuantity> SPAN_ID = attr("spanId", "spanId", "spanId", NUMBER);
-
-  public static final IAttribute<String> FOO = attr("foo", "", "", PLAIN_TEXT);
-  public static final IAttribute<String> BAR = attr("bar", "", "", PLAIN_TEXT);
-
-  public static final IAttribute<String> OPERATION =
-      attr("_dd.trace.operation", "", "", PLAIN_TEXT);
-
-  private MockWebServer profilingServer;
-  private MockWebServer tracingServer;
-
-  private Process targetProcess = null;
-  private Path logFilePath = null;
-
-  @BeforeAll
-  static void setupAll() throws Exception {
-    Files.createDirectories(LOG_FILE_BASE);
-  }
-
-  @BeforeEach
-  void setup(final TestInfo testInfo) throws Exception {
-    tracingServer = new MockWebServer();
-    profilingServer = new MockWebServer();
-    tracingServer.setDispatcher(
-        new Dispatcher() {
-          @Override
-          public MockResponse dispatch(final RecordedRequest request) throws InterruptedException {
-            return new MockResponse().setResponseCode(200);
-          }
-        });
-    tracingServer.start();
-    profilingServer.start();
+    private static final Logger log = LoggerFactory.getLogger(JFRBasedProfilingIntegrationTest.class);
+    private static final Duration ONE_NANO = Duration.ofNanos(1);
+    private static final int STACK_DEPTH_LIMIT = 8;
 
-    profilingServer.enqueue(new MockResponse().setResponseCode(200));
+    @FunctionalInterface
+    private interface TestBody {
+        void run() throws Exception;
+    }
 
-    logFilePath = LOG_FILE_BASE.resolve(testInfo.getDisplayName() + ".log");
-  }
+    private static final String VALID_API_KEY = "01234567890abcdef123456789ABCDEF";
+    private static final String BOGUS_API_KEY = "bogus";
+    private static final int PROFILING_START_DELAY_SECONDS = 1;
+    private static final int PROFILING_UPLOAD_PERIOD_SECONDS = 5;
 
-  @AfterEach
-  void teardown() throws Exception {
-    if (targetProcess != null) {
-      targetProcess.destroyForcibly();
-    }
-    try {
-      profilingServer.shutdown();
-    } finally {
-      tracingServer.shutdown();
-    }
-  }
-
-  private static Stream<Arguments> testArguments() {
-    return Stream.of(
-        Arguments.of(0, "on", "jfr"),
-        Arguments.of(0, "on", "ddprof"),
-        Arguments.of(0, "lz4", "jfr"),
-        Arguments.of(0, "lz4", "ddprof"),
-        Arguments.of(1, "on", "jfr"),
-        Arguments.of(1, "on", "ddprof"),
-        Arguments.of(1, "lz4", "jfr"),
-        Arguments.of(1, "lz4", "ddprof"));
-  }
-
-  @ParameterizedTest(name = "Continuous recording [jmx delay: {0}, compression: {1}, mode: {2}]")
-  @MethodSource("testArguments")
-  public void testContinuousRecording_with_params(
-      int jmxDelay, String compression, String mode, final TestInfo testInfo) throws Exception {
-    Assumptions.assumeTrue("jfr".equals(mode) || OperatingSystem.isLinux());
-    // Do not test compressions for Oracle JDK 8 - it will always be GZIP
-    Assumptions.assumeTrue(!JavaVirtualMachine.isOracleJDK8() || "on".equals(mode));
-    testWithRetry(
-        () ->
-            testContinuousRecording(
-                jmxDelay, ENDPOINT_COLLECTION_ENABLED, "ddprof".equals(mode), compression),
-        testInfo,
-        5);
-  }
-
-  private void testContinuousRecording(
-      final int jmxFetchDelay,
-      final boolean endpointCollectionEnabled,
-      final boolean asyncProfilerEnabled,
-      final String withCompression)
-      throws Exception {
-    final ObjectMapper mapper = new ObjectMapper();
-    try {
-      targetProcess =
-          createDefaultProcessBuilder(
-                  jmxFetchDelay,
-                  endpointCollectionEnabled,
-                  asyncProfilerEnabled,
-                  withCompression,
-                  logFilePath)
-              .start();
-
-      Assumptions.assumeFalse(JavaVirtualMachine.isJ9());
-
-      final RecordedRequest firstRequest = retrieveRequest();
-
-      assertNotNull(firstRequest);
-      assertEquals(profilingServer.getPort(), firstRequest.getRequestUrl().url().getPort());
-
-      final List<FileItem> firstRequestMultiPartItems =
-          FileUpload.parse(
-              firstRequest.getBody().readByteArray(), firstRequest.getHeader("Content-Type"));
-
-      FileItem rawEvent = firstRequestMultiPartItems.get(0);
-      assertEquals("event", rawEvent.getFieldName());
-      assertEquals("event.json", rawEvent.getName());
-      assertEquals("application/json", rawEvent.getContentType());
-
-      FileItem rawJfr = firstRequestMultiPartItems.get(1);
-      assertEquals("main", rawJfr.getFieldName());
-      assertEquals("main.jfr", rawJfr.getName());
-      assertEquals("application/octet-stream", rawJfr.getContentType());
-
-      // Event checks
-      JsonNode event = mapper.readTree(rawEvent.getString());
-
-      assertEquals("main.jfr", event.get("attachments").get(0).asText());
-      assertEquals("java", event.get("family").asText());
-      assertEquals("4", event.get("version").asText());
-      final Instant firstStartTime = Instant.parse(event.get("start").asText());
-      final Instant firstEndTime = Instant.parse(event.get("end").asText());
-      assertNotNull(firstStartTime);
-      assertNotNull(firstEndTime);
-
-      final long duration = firstEndTime.toEpochMilli() - firstStartTime.toEpochMilli();
-      long delta = duration - TimeUnit.SECONDS.toMillis(PROFILING_UPLOAD_PERIOD_SECONDS);
-      assertTrue(
-          duration > TimeUnit.SECONDS.toMillis(PROFILING_UPLOAD_PERIOD_SECONDS - 4),
-          delta + "ms outside tolerance of upload period");
-      assertTrue(
-          duration < TimeUnit.SECONDS.toMillis(PROFILING_UPLOAD_PERIOD_SECONDS + 4),
-          delta + "ms outside tolerance of upload period");
-
-      final Map<String, String> requestTags =
-          ProfilingTestUtils.parseTags(
-              Arrays.asList(event.get("tags_profiler").asText().split(",")));
-      assertEquals("smoke-test-java-app", requestTags.get("service"));
-      assertEquals("jvm", requestTags.get("language"));
-      assertNotNull(requestTags.get("runtime-id"));
-      assertEquals(InetAddress.getLocalHost().getHostName(), requestTags.get("host"));
-
-      assertFalse(logHasErrors(logFilePath));
-      InputStream eventStream = new ByteArrayInputStream(rawJfr.get());
-      eventStream = decompressStream(withCompression, eventStream);
-      IItemCollection events = JfrLoaderToolkit.loadEvents(eventStream);
-      assertTrue(events.hasItems());
-      Pair<Instant, Instant> rangeStartAndEnd = getRangeStartAndEnd(events);
-      // This nano-second compensates for the added nano second in
-      // ProfilingSystem.SnapshotRecording.snapshot()
-      final Instant firstRangeStart = rangeStartAndEnd.getLeft().plus(ONE_NANO);
-      final Instant firstRangeEnd = rangeStartAndEnd.getRight();
-      assertTrue(
-          firstStartTime.compareTo(firstRangeStart) <= 0,
-          () ->
-              "First range start "
-                  + firstRangeStart
-                  + " is before first start time "
-                  + firstStartTime);
-
-      final RecordedRequest nextRequest = retrieveRequest();
-      assertNotNull(nextRequest);
-
-      final List<FileItem> secondRequestMultiPartItems =
-          FileUpload.parse(
-              nextRequest.getBody().readByteArray(), nextRequest.getHeader("Content-Type"));
-
-      rawEvent = secondRequestMultiPartItems.get(0);
-      assertEquals("event", rawEvent.getFieldName());
-      assertEquals("event.json", rawEvent.getName());
-      assertEquals("application/json", rawEvent.getContentType());
-
-      rawJfr = secondRequestMultiPartItems.get(1);
-      assertEquals("main", rawJfr.getFieldName());
-      assertEquals("main.jfr", rawJfr.getName());
-      assertEquals("application/octet-stream", rawJfr.getContentType());
-
-      // Event checks
-      event = mapper.readTree(rawEvent.getString());
-
-      assertEquals("main.jfr", event.get("attachments").get(0).asText());
-      assertEquals("java", event.get("family").asText());
-      assertEquals("4", event.get("version").asText());
-      final Instant secondStartTime = Instant.parse(event.get("start").asText());
-      final Instant secondEndTime = Instant.parse(event.get("end").asText());
-      final long period = secondStartTime.toEpochMilli() - firstStartTime.toEpochMilli();
-      final long upperLimit = TimeUnit.SECONDS.toMillis(PROFILING_UPLOAD_PERIOD_SECONDS) * 2;
-
-      assertTrue(
-          period > 0 && period <= upperLimit,
-          () -> "Upload period = " + period + "ms, expected (0, " + upperLimit + "]ms");
-
-      eventStream = new ByteArrayInputStream(rawJfr.get());
-      eventStream = decompressStream(withCompression, eventStream);
-      events = JfrLoaderToolkit.loadEvents(eventStream);
-      assertTrue(events.hasItems());
-      verifyDatadogEventsNotCorrupt(events);
-      rangeStartAndEnd = getRangeStartAndEnd(events);
-      // This nano-second compensates for the added nano second in
-      // ProfilingSystem.SnapshotRecording.snapshot()
-      final Instant secondRangeStart = rangeStartAndEnd.getLeft().plus(ONE_NANO);
-      final Instant secondRangeEnd = rangeStartAndEnd.getRight();
-      // So the OracleJdkOngoingRecording and underlying recording seems to
-      // either lose precision in the reported times, or filter a bit differently
-      // so we can't check these invariants =(
-      if (!System.getProperty("java.vendor").contains("Oracle")
-          || !System.getProperty("java.version").contains("1.8")) {
-        assertTrue(
-            secondStartTime.compareTo(secondRangeStart) <= 0,
-            () ->
-                "Second range start "
-                    + secondRangeStart
-                    + " is before second start time "
-                    + secondStartTime);
-        assertTrue(
-            firstEndTime.isBefore(secondRangeStart),
-            () ->
-                "Second range start "
-                    + secondRangeStart
-                    + " is before or equal to first end time "
-                    + firstEndTime);
-      }
-      // Only non-Oracle JDK 8+ JVMs support custom DD events
-      if (!System.getProperty("java.vendor").contains("Oracle")
-          || !System.getProperty("java.version").contains("1.8")) {
-        assertRecordingEvents(events, endpointCollectionEnabled, asyncProfilerEnabled);
-      }
-    } finally {
-      if (targetProcess != null) {
-        targetProcess.destroyForcibly();
-      }
-      targetProcess = null;
-    }
-  }
-
-  private static InputStream decompressStream(String withCompression, InputStream eventStream) {
-    if (!JavaVirtualMachine.isOracleJDK8()) {
-      if ("zstd".equals(withCompression) || "on".equals(withCompression)) {
-        eventStream = new ZstdInputStream(eventStream);
-      } else {
-        // nothing; jmc already handles lz4 and gzip
-      }
-    } else {
-      // Oracle JDK 8 JFR writes files in GZIP format; jmc already can handle that
+    private static final int PROFILING_UPLOAD_TIMEOUT_SECONDS = 1;
+    private static final boolean ENDPOINT_COLLECTION_ENABLED = true; // default
+    // Set the request timeout value to the sum of the initial delay and the upload period
+    // multiplied by a safety margin
+    private static final int SAFETY_MARGIN = 3;
+    private static final int REQUEST_WAIT_TIMEOUT =
+            (PROFILING_START_DELAY_SECONDS + PROFILING_UPLOAD_PERIOD_SECONDS) * SAFETY_MARGIN;
+
+    private static final Path LOG_FILE_BASE =
+            Paths.get(buildDirectory(), "reports", "testProcess." + JFRBasedProfilingIntegrationTest.class.getName());
+
+    public static final IAttribute<IQuantity> LOCAL_ROOT_SPAN_ID =
+            attr("localRootSpanId", "localRootSpanId", "localRootSpanId", NUMBER);
+    public static final IAttribute<IQuantity> SPAN_ID = attr("spanId", "spanId", "spanId", NUMBER);
+
+    public static final IAttribute<String> FOO = attr("foo", "", "", PLAIN_TEXT);
+    public static final IAttribute<String> BAR = attr("bar", "", "", PLAIN_TEXT);
+
+    public static final IAttribute<String> OPERATION = attr("_dd.trace.operation", "", "", PLAIN_TEXT);
+
+    private MockWebServer profilingServer;
+    private MockWebServer tracingServer;
+
+    private Process targetProcess = null;
+    private Path logFilePath = null;
+
+    @BeforeAll
+    static void setupAll() throws Exception {
+        Files.createDirectories(LOG_FILE_BASE);
     }
 
-    return eventStream;
-  }
+    @BeforeEach
+    void setup(final TestInfo testInfo) throws Exception {
+        tracingServer = new MockWebServer();
+        profilingServer = new MockWebServer();
+        tracingServer.setDispatcher(new Dispatcher() {
+            @Override
+            public MockResponse dispatch(final RecordedRequest request) throws InterruptedException {
+                return new MockResponse().setResponseCode(200);
+            }
+        });
+        tracingServer.start();
+        profilingServer.start();
 
-  private static void verifyJdkEventsDisabled(IItemCollection events) {
-    assertFalse(events.apply(ItemFilters.type("jdk.ExecutionSample")).hasItems());
-    assertFalse(events.apply(ItemFilters.type("jdk.ThreadPark")).hasItems());
-  }
+        profilingServer.enqueue(new MockResponse().setResponseCode(200));
 
-  private static void verifyJdkEvents(IItemCollection events) {
-    String cpuSampleType = "jdk.ExecutionSample";
-    if (JavaVirtualMachine.isJavaVersionAtLeast(25) && OperatingSystem.isLinux()) {
-      // for Java 25+ we are defaulting to 'jdk.CPUTimeSample' on Linux
-      cpuSampleType = "jdk.CPUTimeSample";
+        logFilePath = LOG_FILE_BASE.resolve(testInfo.getDisplayName() + ".log");
     }
-    assertTrue(events.apply(ItemFilters.type(cpuSampleType)).hasItems());
-  }
-
-  private static void verifyDatadogEventsNotCorrupt(IItemCollection events) {
-    // if we emit any of these events during the test they mustn't have corrupted context
-    for (String eventName :
-        new String[] {
-          "datadog.ExecutionSample",
-          "datadog.MethodSample",
-          "datadog.ObjectAllocationInNewTLAB",
-          "datadog.ObjectAllocationOutsideTLAB",
-          "datadog.HeapLiveObject",
-          "datadog.JavaMonitorEnter"
-        }) {
-      for (IItemIterable event : events.apply(ItemFilters.type(eventName))) {
-        IMemberAccessor<IQuantity, IItem> rootSpanIdAccessor =
-            LOCAL_ROOT_SPAN_ID.getAccessor(event.getType());
-        IMemberAccessor<IQuantity, IItem> spanIdAccessor = SPAN_ID.getAccessor(event.getType());
-        for (IItem sample : event) {
-          long rootSpanId = rootSpanIdAccessor.getMember(sample).longValue();
-          assertTrue(rootSpanId >= 0, "rootSpanId must not be negative");
-          long spanId = spanIdAccessor.getMember(sample).longValue();
-          assertTrue(spanId >= 0, "spanId must not be negative");
+
+    @AfterEach
+    void teardown() throws Exception {
+        if (targetProcess != null) {
+            targetProcess.destroyForcibly();
+        }
+        try {
+            profilingServer.shutdown();
+        } finally {
+            tracingServer.shutdown();
         }
-      }
     }
-  }
-
-  private Instant convertFromQuantity(final IQuantity instant) {
-    Instant converted = null;
-    try {
-      final IQuantity rangeS = instant.in(UnitLookup.EPOCH_S);
-      final long es = rangeS.longValue();
-      final long ns =
-          instant.longValueIn(UnitLookup.EPOCH_NS) - rangeS.longValueIn(UnitLookup.EPOCH_NS);
-      converted = Instant.ofEpochSecond(es, ns);
-    } catch (final QuantityConversionException ignore) {
+
+    private static Stream<Arguments> testArguments() {
+        return Stream.of(
+                Arguments.of(0, "on", "jfr"),
+                Arguments.of(0, "on", "ddprof"),
+                Arguments.of(0, "lz4", "jfr"),
+                Arguments.of(0, "lz4", "ddprof"),
+                Arguments.of(1, "on", "jfr"),
+                Arguments.of(1, "on", "ddprof"),
+                Arguments.of(1, "lz4", "jfr"),
+                Arguments.of(1, "lz4", "ddprof"));
     }
-    return converted;
-  }
-
-  private Pair<Instant, Instant> getRangeStartAndEnd(final IItemCollection events) {
-    return events.getUnfilteredTimeRanges().stream()
-        .map(
-            range -> {
-              final Instant convertedStart = convertFromQuantity(range.getStart());
-              final Instant convertedEnd = convertFromQuantity(range.getEnd());
-              return Pair.of(convertedStart, convertedEnd);
-            })
-        .reduce(
-            Pair.of(null, null),
-            (send, newSend) -> {
-              Instant start = send.getLeft();
-              Instant end = send.getRight();
-              final Instant newStart = newSend.getLeft();
-              final Instant newEnd = newSend.getRight();
-              start =
-                  null == start
-                      ? newStart
-                      : null == newStart ? start : newStart.isBefore(start) ? newStart : start;
-              end =
-                  null == end ? newEnd : null == newEnd ? end : newEnd.isAfter(end) ? newEnd : end;
-              return Pair.of(start, end);
-            });
-  }
-
-  @Test
-  @DisplayName("Test bogus API key")
-  void testBogusApiKey(final TestInfo testInfo) throws Exception {
-    testWithRetry(
-        () -> {
-          final int exitDelay =
-              PROFILING_START_DELAY_SECONDS + PROFILING_UPLOAD_PERIOD_SECONDS * 2 + 1;
-
-          try {
-            targetProcess =
-                createProcessBuilder(
-                        BOGUS_API_KEY,
-                        0,
-                        PROFILING_START_DELAY_SECONDS,
-                        PROFILING_UPLOAD_PERIOD_SECONDS,
-                        ENDPOINT_COLLECTION_ENABLED,
-                        true,
-                        "off",
-                        exitDelay,
-                        logFilePath)
-                    .start();
 
-            /* API key of an incorrect format will cause profiling to get disabled.
-              This means no upload requests will be made. We are going to check the log file for
-              the presence of a specific message. For this we need to wait for a particular message indicating
-              that the profiling system is initializing and then assert for the presence of the expected message
-              caused by the API key format error.
-            */
-            final long ts = System.nanoTime();
-            while (!checkLogLines(
-                logFilePath, line -> line.contains("Initializing profiler context integration"))) {
-              Thread.sleep(500);
-              // Wait at most 30 seconds
-              if (System.nanoTime() - ts > 30_000_000_000L) {
-                throw new TimeoutException();
-              }
-            }
+    @ParameterizedTest(name = "Continuous recording [jmx delay: {0}, compression: {1}, mode: {2}]")
+    @MethodSource("testArguments")
+    public void testContinuousRecording_with_params(
+            int jmxDelay, String compression, String mode, final TestInfo testInfo) throws Exception {
+        Assumptions.assumeTrue("jfr".equals(mode) || OperatingSystem.isLinux());
+        // Do not test compressions for Oracle JDK 8 - it will always be GZIP
+        Assumptions.assumeTrue(!JavaVirtualMachine.isOracleJDK8() || "on".equals(mode));
+        testWithRetry(
+                () -> testContinuousRecording(
+                        jmxDelay, ENDPOINT_COLLECTION_ENABLED, "ddprof".equals(mode), compression),
+                testInfo,
+                5);
+    }
 
-            /* An API key with incorrect format will cause profiling to get disabled and the
-              following message would be logged.
-              The test asserts for the presence of the message.
-            */
-            assertTrue(
-                checkLogLines(
-                    logFilePath,
-                    it -> it.contains("Profiling: API key doesn't match expected format")));
-            assertFalse(logHasErrors(logFilePath));
-          } finally {
-            if (targetProcess != null) {
-              targetProcess.destroyForcibly();
-              targetProcess = null;
-            }
-          }
-        },
-        testInfo,
-        3);
-  }
-
-  @Test
-  @DisplayName("Test wallclock profiling without tracing")
-  public void testWallclockProfilingWithoutTracing(final TestInfo testInfo) throws Exception {
-    Assumptions.assumeTrue(OperatingSystem.isLinux());
-    // TODO: Exclude the test on Oracle JDK 8 - the JMC parser in the test runner
-    //       is having troubles reading the generated JFR file; however, when downloaded
-    //       and opened locally, JMC will read it just fine.
-    //       We will need to investigate the root cause, but now we need to unblock the master
-    // builds
-    Assumptions.assumeFalse(JavaVirtualMachine.isOracleJDK8());
-    testWithRetry(
-        () -> {
-          try {
-            targetProcess =
-                createProcessBuilder(
-                        profilingServer.getPort(),
-                        tracingServer.getPort(),
-                        VALID_API_KEY,
-                        0,
-                        PROFILING_START_DELAY_SECONDS,
-                        PROFILING_UPLOAD_PERIOD_SECONDS,
-                        false,
-                        true,
-                        "on",
-                        0,
-                        logFilePath,
-                        false)
+    private void testContinuousRecording(
+            final int jmxFetchDelay,
+            final boolean endpointCollectionEnabled,
+            final boolean asyncProfilerEnabled,
+            final String withCompression)
+            throws Exception {
+        final ObjectMapper mapper = new ObjectMapper();
+        try {
+            targetProcess = createDefaultProcessBuilder(
+                            jmxFetchDelay,
+                            endpointCollectionEnabled,
+                            asyncProfilerEnabled,
+                            withCompression,
+                            logFilePath)
                     .start();
 
             Assumptions.assumeFalse(JavaVirtualMachine.isJ9());
 
-            final RecordedRequest request = retrieveRequest();
-            assertNotNull(request);
+            final RecordedRequest firstRequest = retrieveRequest();
+
+            assertNotNull(firstRequest);
+            assertEquals(
+                    profilingServer.getPort(),
+                    firstRequest.getRequestUrl().url().getPort());
 
-            final List<FileItem> items =
-                FileUpload.parse(
-                    request.getBody().readByteArray(), request.getHeader("Content-Type"));
+            final List<FileItem> firstRequestMultiPartItems =
+                    FileUpload.parse(firstRequest.getBody().readByteArray(), firstRequest.getHeader("Content-Type"));
 
-            FileItem rawJfr = items.get(1);
+            FileItem rawEvent = firstRequestMultiPartItems.get(0);
+            assertEquals("event", rawEvent.getFieldName());
+            assertEquals("event.json", rawEvent.getName());
+            assertEquals("application/json", rawEvent.getContentType());
+
+            FileItem rawJfr = firstRequestMultiPartItems.get(1);
+            assertEquals("main", rawJfr.getFieldName());
             assertEquals("main.jfr", rawJfr.getName());
+            assertEquals("application/octet-stream", rawJfr.getContentType());
+
+            // Event checks
+            JsonNode event = mapper.readTree(rawEvent.getString());
+
+            assertEquals("main.jfr", event.get("attachments").get(0).asText());
+            assertEquals("java", event.get("family").asText());
+            assertEquals("4", event.get("version").asText());
+            final Instant firstStartTime = Instant.parse(event.get("start").asText());
+            final Instant firstEndTime = Instant.parse(event.get("end").asText());
+            assertNotNull(firstStartTime);
+            assertNotNull(firstEndTime);
+
+            final long duration = firstEndTime.toEpochMilli() - firstStartTime.toEpochMilli();
+            long delta = duration - TimeUnit.SECONDS.toMillis(PROFILING_UPLOAD_PERIOD_SECONDS);
+            assertTrue(
+                    duration > TimeUnit.SECONDS.toMillis(PROFILING_UPLOAD_PERIOD_SECONDS - 4),
+                    delta + "ms outside tolerance of upload period");
+            assertTrue(
+                    duration < TimeUnit.SECONDS.toMillis(PROFILING_UPLOAD_PERIOD_SECONDS + 4),
+                    delta + "ms outside tolerance of upload period");
+
+            final Map<String, String> requestTags = ProfilingTestUtils.parseTags(
+                    Arrays.asList(event.get("tags_profiler").asText().split(",")));
+            assertEquals("smoke-test-java-app", requestTags.get("service"));
+            assertEquals("jvm", requestTags.get("language"));
+            assertNotNull(requestTags.get("runtime-id"));
+            assertEquals(InetAddress.getLocalHost().getHostName(), requestTags.get("host"));
 
             assertFalse(logHasErrors(logFilePath));
             InputStream eventStream = new ByteArrayInputStream(rawJfr.get());
-            eventStream = decompressStream("on", eventStream);
+            eventStream = decompressStream(withCompression, eventStream);
             IItemCollection events = JfrLoaderToolkit.loadEvents(eventStream);
             assertTrue(events.hasItems());
+            Pair<Instant, Instant> rangeStartAndEnd = getRangeStartAndEnd(events);
+            // This nano-second compensates for the added nano second in
+            // ProfilingSystem.SnapshotRecording.snapshot()
+            final Instant firstRangeStart = rangeStartAndEnd.getLeft().plus(ONE_NANO);
+            final Instant firstRangeEnd = rangeStartAndEnd.getRight();
+            assertTrue(
+                    firstStartTime.compareTo(firstRangeStart) <= 0,
+                    () -> "First range start " + firstRangeStart + " is before first start time " + firstStartTime);
+
+            final RecordedRequest nextRequest = retrieveRequest();
+            assertNotNull(nextRequest);
+
+            final List<FileItem> secondRequestMultiPartItems =
+                    FileUpload.parse(nextRequest.getBody().readByteArray(), nextRequest.getHeader("Content-Type"));
+
+            rawEvent = secondRequestMultiPartItems.get(0);
+            assertEquals("event", rawEvent.getFieldName());
+            assertEquals("event.json", rawEvent.getName());
+            assertEquals("application/json", rawEvent.getContentType());
+
+            rawJfr = secondRequestMultiPartItems.get(1);
+            assertEquals("main", rawJfr.getFieldName());
+            assertEquals("main.jfr", rawJfr.getName());
+            assertEquals("application/octet-stream", rawJfr.getContentType());
+
+            // Event checks
+            event = mapper.readTree(rawEvent.getString());
+
+            assertEquals("main.jfr", event.get("attachments").get(0).asText());
+            assertEquals("java", event.get("family").asText());
+            assertEquals("4", event.get("version").asText());
+            final Instant secondStartTime = Instant.parse(event.get("start").asText());
+            final Instant secondEndTime = Instant.parse(event.get("end").asText());
+            final long period = secondStartTime.toEpochMilli() - firstStartTime.toEpochMilli();
+            final long upperLimit = TimeUnit.SECONDS.toMillis(PROFILING_UPLOAD_PERIOD_SECONDS) * 2;
 
-            IItemCollection wallclockSamples =
-                events.apply(ItemFilters.type("datadog.MethodSample"));
             assertTrue(
-                wallclockSamples.hasItems(), "Expected wallclock samples when tracing is disabled");
-
-            // Verify span context is not present
-            for (IItemIterable event : wallclockSamples) {
-              IMemberAccessor<IQuantity, IItem> rootSpanIdAccessor =
-                  LOCAL_ROOT_SPAN_ID.getAccessor(event.getType());
-              IMemberAccessor<IQuantity, IItem> spanIdAccessor =
-                  SPAN_ID.getAccessor(event.getType());
-              for (IItem sample : event) {
-                assertEquals(
-                    0,
-                    rootSpanIdAccessor.getMember(sample).longValue(),
-                    "rootSpanId should be 0 when tracing is disabled");
-                assertEquals(
-                    0,
-                    spanIdAccessor.getMember(sample).longValue(),
-                    "spanId should be 0 when tracing is disabled");
-              }
+                    period > 0 && period <= upperLimit,
+                    () -> "Upload period = " + period + "ms, expected (0, " + upperLimit + "]ms");
+
+            eventStream = new ByteArrayInputStream(rawJfr.get());
+            eventStream = decompressStream(withCompression, eventStream);
+            events = JfrLoaderToolkit.loadEvents(eventStream);
+            assertTrue(events.hasItems());
+            verifyDatadogEventsNotCorrupt(events);
+            rangeStartAndEnd = getRangeStartAndEnd(events);
+            // This nano-second compensates for the added nano second in
+            // ProfilingSystem.SnapshotRecording.snapshot()
+            final Instant secondRangeStart = rangeStartAndEnd.getLeft().plus(ONE_NANO);
+            final Instant secondRangeEnd = rangeStartAndEnd.getRight();
+            // So the OracleJdkOngoingRecording and underlying recording seems to
+            // either lose precision in the reported times, or filter a bit differently
+            // so we can't check these invariants =(
+            if (!System.getProperty("java.vendor").contains("Oracle")
+                    || !System.getProperty("java.version").contains("1.8")) {
+                assertTrue(
+                        secondStartTime.compareTo(secondRangeStart) <= 0,
+                        () -> "Second range start "
+                                + secondRangeStart
+                                + " is before second start time "
+                                + secondStartTime);
+                assertTrue(
+                        firstEndTime.isBefore(secondRangeStart),
+                        () -> "Second range start "
+                                + secondRangeStart
+                                + " is before or equal to first end time "
+                                + firstEndTime);
             }
-          } finally {
+            // Only non-Oracle JDK 8+ JVMs support custom DD events
+            if (!System.getProperty("java.vendor").contains("Oracle")
+                    || !System.getProperty("java.version").contains("1.8")) {
+                assertRecordingEvents(events, endpointCollectionEnabled, asyncProfilerEnabled);
+            }
+        } finally {
             if (targetProcess != null) {
-              targetProcess.destroyForcibly();
+                targetProcess.destroyForcibly();
             }
             targetProcess = null;
-          }
-        },
-        testInfo,
-        3);
-  }
-
-  @Test
-  @DisplayName("Test shutdown")
-  @Disabled("https://github.com/DataDog/dd-trace-java/pull/5213")
-  void testShutdown(final TestInfo testInfo) throws Exception {
-    testWithRetry(
-        () -> {
-          final int duration =
-              PROFILING_START_DELAY_SECONDS + PROFILING_UPLOAD_PERIOD_SECONDS * 4 + 1;
-          try {
-            targetProcess =
-                createProcessBuilder(
-                        VALID_API_KEY,
-                        0,
-                        PROFILING_START_DELAY_SECONDS,
-                        PROFILING_UPLOAD_PERIOD_SECONDS,
-                        ENDPOINT_COLLECTION_ENABLED,
-                        true,
-                        "off",
-                        duration,
-                        logFilePath)
-                    .start();
+        }
+    }
 
-            final RecordedRequest request = retrieveRequest();
-            assertNotNull(request);
-            assertFalse(logHasErrors(logFilePath));
-            assertTrue(request.getBodySize() > 0);
+    private static InputStream decompressStream(String withCompression, InputStream eventStream) {
+        if (!JavaVirtualMachine.isOracleJDK8()) {
+            if ("zstd".equals(withCompression) || "on".equals(withCompression)) {
+                eventStream = new ZstdInputStream(eventStream);
+            } else {
+                // nothing; jmc already handles lz4 and gzip
+            }
+        } else {
+            // Oracle JDK 8 JFR writes files in GZIP format; jmc already can handle that
+        }
 
-            // Wait for the app exit with some extra time to accommodate profile upload on shutdown.
-            // The expectation is that agent doesn't prevent app from exiting.
-            assertTrue(
-                targetProcess.waitFor(
-                    duration + PROFILING_UPLOAD_TIMEOUT_SECONDS + 1, TimeUnit.SECONDS));
-          } finally {
-            if (targetProcess != null) {
-              targetProcess.destroyForcibly();
+        return eventStream;
+    }
+
+    private static void verifyJdkEventsDisabled(IItemCollection events) {
+        assertFalse(events.apply(ItemFilters.type("jdk.ExecutionSample")).hasItems());
+        assertFalse(events.apply(ItemFilters.type("jdk.ThreadPark")).hasItems());
+    }
+
+    private static void verifyJdkEvents(IItemCollection events) {
+        String cpuSampleType = "jdk.ExecutionSample";
+        if (JavaVirtualMachine.isJavaVersionAtLeast(25) && OperatingSystem.isLinux()) {
+            // for Java 25+ we are defaulting to 'jdk.CPUTimeSample' on Linux
+            cpuSampleType = "jdk.CPUTimeSample";
+        }
+        assertTrue(events.apply(ItemFilters.type(cpuSampleType)).hasItems());
+    }
+
+    private static void verifyDatadogEventsNotCorrupt(IItemCollection events) {
+        // if we emit any of these events during the test they mustn't have corrupted context
+        for (String eventName : new String[] {
+            "datadog.ExecutionSample",
+            "datadog.MethodSample",
+            "datadog.ObjectAllocationInNewTLAB",
+            "datadog.ObjectAllocationOutsideTLAB",
+            "datadog.HeapLiveObject",
+            "datadog.JavaMonitorEnter"
+        }) {
+            for (IItemIterable event : events.apply(ItemFilters.type(eventName))) {
+                IMemberAccessor<IQuantity, IItem> rootSpanIdAccessor = LOCAL_ROOT_SPAN_ID.getAccessor(event.getType());
+                IMemberAccessor<IQuantity, IItem> spanIdAccessor = SPAN_ID.getAccessor(event.getType());
+                for (IItem sample : event) {
+                    long rootSpanId = rootSpanIdAccessor.getMember(sample).longValue();
+                    assertTrue(rootSpanId >= 0, "rootSpanId must not be negative");
+                    long spanId = spanIdAccessor.getMember(sample).longValue();
+                    assertTrue(spanId >= 0, "spanId must not be negative");
+                }
             }
-            targetProcess = null;
-          }
-        },
-        testInfo,
-        3);
-  }
-
-  private void testWithRetry(final TestBody test, final TestInfo testInfo, final int retries)
-      throws Exception {
-    int cnt = retries;
-    Throwable lastThrowable = null;
-    while (cnt >= 0) {
-      // clean the lastThrowable first
-      lastThrowable = null;
-      // clean the log file so the previous errors do not throw off the assertions
-      Files.deleteIfExists(logFilePath);
-      try {
-        test.run();
-        break;
-      } catch (final Throwable t) {
-        lastThrowable = t;
-        if (cnt > 0) {
-          log.error("Test '{}' failed. Retrying.", testInfo.getDisplayName(), t);
         }
-        // retry
-      }
-      cnt--;
     }
-    if (lastThrowable != null) {
-      throw new RuntimeException(
-          "Failed '" + testInfo.getDisplayName() + "' after " + retries + " retries.",
-          lastThrowable);
+
+    private Instant convertFromQuantity(final IQuantity instant) {
+        Instant converted = null;
+        try {
+            final IQuantity rangeS = instant.in(UnitLookup.EPOCH_S);
+            final long es = rangeS.longValue();
+            final long ns = instant.longValueIn(UnitLookup.EPOCH_NS) - rangeS.longValueIn(UnitLookup.EPOCH_NS);
+            converted = Instant.ofEpochSecond(es, ns);
+        } catch (final QuantityConversionException ignore) {
+        }
+        return converted;
+    }
+
+    private Pair<Instant, Instant> getRangeStartAndEnd(final IItemCollection events) {
+        return events.getUnfilteredTimeRanges().stream()
+                .map(range -> {
+                    final Instant convertedStart = convertFromQuantity(range.getStart());
+                    final Instant convertedEnd = convertFromQuantity(range.getEnd());
+                    return Pair.of(convertedStart, convertedEnd);
+                })
+                .reduce(Pair.of(null, null), (send, newSend) -> {
+                    Instant start = send.getLeft();
+                    Instant end = send.getRight();
+                    final Instant newStart = newSend.getLeft();
+                    final Instant newEnd = newSend.getRight();
+                    start = null == start
+                            ? newStart
+                            : null == newStart ? start : newStart.isBefore(start) ? newStart : start;
+                    end = null == end ? newEnd : null == newEnd ? end : newEnd.isAfter(end) ? newEnd : end;
+                    return Pair.of(start, end);
+                });
+    }
+
+    @Test
+    @DisplayName("Test bogus API key")
+    void testBogusApiKey(final TestInfo testInfo) throws Exception {
+        testWithRetry(
+                () -> {
+                    final int exitDelay = PROFILING_START_DELAY_SECONDS + PROFILING_UPLOAD_PERIOD_SECONDS * 2 + 1;
+
+                    try {
+                        targetProcess = createProcessBuilder(
+                                        BOGUS_API_KEY,
+                                        0,
+                                        PROFILING_START_DELAY_SECONDS,
+                                        PROFILING_UPLOAD_PERIOD_SECONDS,
+                                        ENDPOINT_COLLECTION_ENABLED,
+                                        true,
+                                        "off",
+                                        exitDelay,
+                                        logFilePath)
+                                .start();
+
+                        /* API key of an incorrect format will cause profiling to get disabled.
+                          This means no upload requests will be made. We are going to check the log file for
+                          the presence of a specific message. For this we need to wait for a particular message indicating
+                          that the profiling system is initializing and then assert for the presence of the expected message
+                          caused by the API key format error.
+                        */
+                        final long ts = System.nanoTime();
+                        while (!checkLogLines(
+                                logFilePath, line -> line.contains("Initializing profiler context integration"))) {
+                            Thread.sleep(500);
+                            // Wait at most 30 seconds
+                            if (System.nanoTime() - ts > 30_000_000_000L) {
+                                throw new TimeoutException();
+                            }
+                        }
+
+                        /* An API key with incorrect format will cause profiling to get disabled and the
+                          following message would be logged.
+                          The test asserts for the presence of the message.
+                        */
+                        assertTrue(checkLogLines(
+                                logFilePath, it -> it.contains("Profiling: API key doesn't match expected format")));
+                        assertFalse(logHasErrors(logFilePath));
+                    } finally {
+                        if (targetProcess != null) {
+                            targetProcess.destroyForcibly();
+                            targetProcess = null;
+                        }
+                    }
+                },
+                testInfo,
+                3);
+    }
+
+    @Test
+    @DisplayName("Test wallclock profiling without tracing")
+    public void testWallclockProfilingWithoutTracing(final TestInfo testInfo) throws Exception {
+        Assumptions.assumeTrue(OperatingSystem.isLinux());
+        // TODO: Exclude the test on Oracle JDK 8 - the JMC parser in the test runner
+        //       is having troubles reading the generated JFR file; however, when downloaded
+        //       and opened locally, JMC will read it just fine.
+        //       We will need to investigate the root cause, but now we need to unblock the master
+        // builds
+        Assumptions.assumeFalse(JavaVirtualMachine.isOracleJDK8());
+        testWithRetry(
+                () -> {
+                    try {
+                        targetProcess = createProcessBuilder(
+                                        profilingServer.getPort(),
+                                        tracingServer.getPort(),
+                                        VALID_API_KEY,
+                                        0,
+                                        PROFILING_START_DELAY_SECONDS,
+                                        PROFILING_UPLOAD_PERIOD_SECONDS,
+                                        false,
+                                        true,
+                                        "on",
+                                        0,
+                                        logFilePath,
+                                        false)
+                                .start();
+
+                        Assumptions.assumeFalse(JavaVirtualMachine.isJ9());
+
+                        final RecordedRequest request = retrieveRequest();
+                        assertNotNull(request);
+
+                        final List<FileItem> items =
+                                FileUpload.parse(request.getBody().readByteArray(), request.getHeader("Content-Type"));
+
+                        FileItem rawJfr = items.get(1);
+                        assertEquals("main.jfr", rawJfr.getName());
+
+                        assertFalse(logHasErrors(logFilePath));
+                        InputStream eventStream = new ByteArrayInputStream(rawJfr.get());
+                        eventStream = decompressStream("on", eventStream);
+                        IItemCollection events = JfrLoaderToolkit.loadEvents(eventStream);
+                        assertTrue(events.hasItems());
+
+                        IItemCollection wallclockSamples = events.apply(ItemFilters.type("datadog.MethodSample"));
+                        assertTrue(wallclockSamples.hasItems(), "Expected wallclock samples when tracing is disabled");
+
+                        // Verify span context is not present
+                        for (IItemIterable event : wallclockSamples) {
+                            IMemberAccessor<IQuantity, IItem> rootSpanIdAccessor =
+                                    LOCAL_ROOT_SPAN_ID.getAccessor(event.getType());
+                            IMemberAccessor<IQuantity, IItem> spanIdAccessor = SPAN_ID.getAccessor(event.getType());
+                            for (IItem sample : event) {
+                                assertEquals(
+                                        0,
+                                        rootSpanIdAccessor.getMember(sample).longValue(),
+                                        "rootSpanId should be 0 when tracing is disabled");
+                                assertEquals(
+                                        0,
+                                        spanIdAccessor.getMember(sample).longValue(),
+                                        "spanId should be 0 when tracing is disabled");
+                            }
+                        }
+                    } finally {
+                        if (targetProcess != null) {
+                            targetProcess.destroyForcibly();
+                        }
+                        targetProcess = null;
+                    }
+                },
+                testInfo,
+                3);
+    }
+
+    @Test
+    @DisplayName("Test shutdown")
+    @Disabled("https://github.com/DataDog/dd-trace-java/pull/5213")
+    void testShutdown(final TestInfo testInfo) throws Exception {
+        testWithRetry(
+                () -> {
+                    final int duration = PROFILING_START_DELAY_SECONDS + PROFILING_UPLOAD_PERIOD_SECONDS * 4 + 1;
+                    try {
+                        targetProcess = createProcessBuilder(
+                                        VALID_API_KEY,
+                                        0,
+                                        PROFILING_START_DELAY_SECONDS,
+                                        PROFILING_UPLOAD_PERIOD_SECONDS,
+                                        ENDPOINT_COLLECTION_ENABLED,
+                                        true,
+                                        "off",
+                                        duration,
+                                        logFilePath)
+                                .start();
+
+                        final RecordedRequest request = retrieveRequest();
+                        assertNotNull(request);
+                        assertFalse(logHasErrors(logFilePath));
+                        assertTrue(request.getBodySize() > 0);
+
+                        // Wait for the app exit with some extra time to accommodate profile upload on shutdown.
+                        // The expectation is that agent doesn't prevent app from exiting.
+                        assertTrue(targetProcess.waitFor(
+                                duration + PROFILING_UPLOAD_TIMEOUT_SECONDS + 1, TimeUnit.SECONDS));
+                    } finally {
+                        if (targetProcess != null) {
+                            targetProcess.destroyForcibly();
+                        }
+                        targetProcess = null;
+                    }
+                },
+                testInfo,
+                3);
     }
-  }
-
-  private RecordedRequest retrieveRequest() throws Exception {
-    return retrieveRequest(5 * REQUEST_WAIT_TIMEOUT, TimeUnit.SECONDS);
-  }
-
-  private RecordedRequest retrieveRequest(final long timeout, final TimeUnit timeUnit)
-      throws Exception {
-    final long ts = System.nanoTime();
-    final RecordedRequest request = profilingServer.takeRequest(timeout, timeUnit);
-    final long dur = System.nanoTime() - ts;
-    log.info(
-        "Profiling request retrieved in {} seconds",
-        TimeUnit.SECONDS.convert(dur, TimeUnit.NANOSECONDS));
-    return request;
-  }
-
-  private void assertRecordingEvents(
-      final IItemCollection events,
-      final boolean expectEndpointEvents,
-      final boolean asyncProfilerEnabled) {
-    // Process events should not be collected
-    assertFalse(
-        events.apply(ItemFilters.type("jdk.SystemProcess")).hasItems(),
-        "jdk.SystemProcess events should not be collected");
-
-    if (expectEndpointEvents) {
-      // Check endpoint events
-      final IItemCollection endpointEvents = events.apply(ItemFilters.type("datadog.Endpoint"));
-      assertEquals(expectEndpointEvents, endpointEvents.hasItems());
-      if (asyncProfilerEnabled) {
-        Set<Long> rootSpanIds = new HashSet<>();
-        Set<String> operations = new HashSet<>();
-        Set<String> values = new HashSet<>();
-        processExecutionSamples(events, rootSpanIds, operations, values);
-        int matches = 0;
-        for (IItemIterable event : endpointEvents) {
-          IMemberAccessor<IQuantity, IItem> rootSpanIdAccessor =
-              LOCAL_ROOT_SPAN_ID.getAccessor(event.getType());
-          for (IItem item : event) {
-            long rootSpanId = rootSpanIdAccessor.getMember(item).longValue();
-            matches += rootSpanIds.contains(rootSpanId) ? 1 : 0;
-          }
+
+    private void testWithRetry(final TestBody test, final TestInfo testInfo, final int retries) throws Exception {
+        int cnt = retries;
+        Throwable lastThrowable = null;
+        while (cnt >= 0) {
+            // clean the lastThrowable first
+            lastThrowable = null;
+            // clean the log file so the previous errors do not throw off the assertions
+            Files.deleteIfExists(logFilePath);
+            try {
+                test.run();
+                break;
+            } catch (final Throwable t) {
+                lastThrowable = t;
+                if (cnt > 0) {
+                    log.error("Test '{}' failed. Retrying.", testInfo.getDisplayName(), t);
+                }
+                // retry
+            }
+            cnt--;
         }
-        // we expect a rough correspondence between these events
-        assertTrue(matches > 0);
-        assertFalse(values.isEmpty());
-        for (String value : values) {
-          assertTrue(value.startsWith("context"));
+        if (lastThrowable != null) {
+            throw new RuntimeException(
+                    "Failed '" + testInfo.getDisplayName() + "' after " + retries + " retries.", lastThrowable);
         }
-      }
     }
-    assertEquals(asyncProfilerEnabled, hasAuxiliaryDdprof(events));
-    verifyStackDepthSetting(events, asyncProfilerEnabled);
-    if (asyncProfilerEnabled) {
-      verifyJdkEventsDisabled(events);
-      verifyDatadogEventsNotCorrupt(events);
-      assertEquals(
-          JavaVirtualMachine.isJavaVersionAtLeast(11),
-          events.apply(ItemFilters.type("datadog.ObjectSample")).hasItems());
-      // Check live heap events
-      // ddprof is active — jdk.OldObjectSample should NOT be present since ddprof takes over
-      // TODO ddprof (async) profiler seems to be having some issues with stack depth limit and
-      // native frames
-    } else {
-      verifyJdkEvents(events);
-      // make sure the stack depth limit is respected
-      for (IItemIterable lane : events.apply(ItemFilters.type(JdkTypeIDs.EXECUTION_SAMPLE))) {
-        IMemberAccessor<IMCStackTrace, IItem> stackTraceAccessor =
-            JfrAttributes.EVENT_STACKTRACE.getAccessor(lane.getType());
-        for (IItem item : lane) {
-          IMCStackTrace stackTrace = stackTraceAccessor.getMember(item);
-          assertNotNull(stackTrace);
-          assertTrue(stackTrace.getFrames().size() <= STACK_DEPTH_LIMIT);
+
+    private RecordedRequest retrieveRequest() throws Exception {
+        return retrieveRequest(5 * REQUEST_WAIT_TIMEOUT, TimeUnit.SECONDS);
+    }
+
+    private RecordedRequest retrieveRequest(final long timeout, final TimeUnit timeUnit) throws Exception {
+        final long ts = System.nanoTime();
+        final RecordedRequest request = profilingServer.takeRequest(timeout, timeUnit);
+        final long dur = System.nanoTime() - ts;
+        log.info("Profiling request retrieved in {} seconds", TimeUnit.SECONDS.convert(dur, TimeUnit.NANOSECONDS));
+        return request;
+    }
+
+    private void assertRecordingEvents(
+            final IItemCollection events, final boolean expectEndpointEvents, final boolean asyncProfilerEnabled) {
+        // Process events should not be collected
+        assertFalse(
+                events.apply(ItemFilters.type("jdk.SystemProcess")).hasItems(),
+                "jdk.SystemProcess events should not be collected");
+
+        if (expectEndpointEvents) {
+            // Check endpoint events
+            final IItemCollection endpointEvents = events.apply(ItemFilters.type("datadog.Endpoint"));
+            assertEquals(expectEndpointEvents, endpointEvents.hasItems());
+            if (asyncProfilerEnabled) {
+                Set<Long> rootSpanIds = new HashSet<>();
+                Set<String> operations = new HashSet<>();
+                Set<String> values = new HashSet<>();
+                processExecutionSamples(events, rootSpanIds, operations, values);
+                int matches = 0;
+                for (IItemIterable event : endpointEvents) {
+                    IMemberAccessor<IQuantity, IItem> rootSpanIdAccessor =
+                            LOCAL_ROOT_SPAN_ID.getAccessor(event.getType());
+                    for (IItem item : event) {
+                        long rootSpanId = rootSpanIdAccessor.getMember(item).longValue();
+                        matches += rootSpanIds.contains(rootSpanId) ? 1 : 0;
+                    }
+                }
+                // we expect a rough correspondence between these events
+                assertTrue(matches > 0);
+                assertFalse(values.isEmpty());
+                for (String value : values) {
+                    assertTrue(value.startsWith("context"));
+                }
+            }
+        }
+        assertEquals(asyncProfilerEnabled, hasAuxiliaryDdprof(events));
+        verifyStackDepthSetting(events, asyncProfilerEnabled);
+        if (asyncProfilerEnabled) {
+            verifyJdkEventsDisabled(events);
+            verifyDatadogEventsNotCorrupt(events);
+            assertEquals(
+                    JavaVirtualMachine.isJavaVersionAtLeast(11),
+                    events.apply(ItemFilters.type("datadog.ObjectSample")).hasItems());
+            // Check live heap events
+            // ddprof is active — jdk.OldObjectSample should NOT be present since ddprof takes over
+            // TODO ddprof (async) profiler seems to be having some issues with stack depth limit and
+            // native frames
+        } else {
+            verifyJdkEvents(events);
+            // make sure the stack depth limit is respected
+            for (IItemIterable lane : events.apply(ItemFilters.type(JdkTypeIDs.EXECUTION_SAMPLE))) {
+                IMemberAccessor<IMCStackTrace, IItem> stackTraceAccessor =
+                        JfrAttributes.EVENT_STACKTRACE.getAccessor(lane.getType());
+                for (IItem item : lane) {
+                    IMCStackTrace stackTrace = stackTraceAccessor.getMember(item);
+                    assertNotNull(stackTrace);
+                    assertTrue(stackTrace.getFrames().size() <= STACK_DEPTH_LIMIT);
+                }
+            }
+            // Check JFR live heap events
+            if (isOldObjectSampleAvailable()) {
+                assertTrue(
+                        events.apply(ItemFilters.type("jdk.OldObjectSample")).hasItems(),
+                        "Expected jdk.OldObjectSample events on JFR-only mode with supported JVM");
+            }
         }
-      }
-      // Check JFR live heap events
-      if (isOldObjectSampleAvailable()) {
-        assertTrue(
-            events.apply(ItemFilters.type("jdk.OldObjectSample")).hasItems(),
-            "Expected jdk.OldObjectSample events on JFR-only mode with supported JVM");
-      }
+
+        // check exception events
+        assertTrue(events.apply(ItemFilters.type("datadog.ExceptionSample")).hasItems());
+        assertTrue(events.apply(ItemFilters.type("datadog.ExceptionCount")).hasItems());
+
+        // check deadlock events
+        assertTrue(events.apply(ItemFilters.type("datadog.Deadlock")).hasItems());
+        assertTrue(events.apply(ItemFilters.type("datadog.DeadlockedThread")).hasItems());
+
+        // check available processor events
+        final IItemCollection availableProcessorsEvents =
+                events.apply(ItemFilters.type("datadog.AvailableProcessorCores"));
+        assertTrue(availableProcessorsEvents.hasItems());
+        final IAttribute<IQuantity> cpuCountAttr = attr("availableProcessorCores", "availableProcessorCores", NUMBER);
+        final long val = ((IQuantity) availableProcessorsEvents.getAggregate(
+                        Aggregators.min("datadog.AvailableProcessorCores", cpuCountAttr)))
+                .longValue();
+        assertEquals(Runtime.getRuntime().availableProcessors(), val);
+
+        assertTrue(events.apply(ItemFilters.type("datadog.ProfilerSetting")).hasItems());
+        //     FIXME - for some reason the events are disabled by JFR despite being explicitly enabled
+        //    assertTrue(events.apply(ItemFilters.type("datadog.QueueTime")).hasItems());
     }
 
-    // check exception events
-    assertTrue(events.apply(ItemFilters.type("datadog.ExceptionSample")).hasItems());
-    assertTrue(events.apply(ItemFilters.type("datadog.ExceptionCount")).hasItems());
-
-    // check deadlock events
-    assertTrue(events.apply(ItemFilters.type("datadog.Deadlock")).hasItems());
-    assertTrue(events.apply(ItemFilters.type("datadog.DeadlockedThread")).hasItems());
-
-    // check available processor events
-    final IItemCollection availableProcessorsEvents =
-        events.apply(ItemFilters.type("datadog.AvailableProcessorCores"));
-    assertTrue(availableProcessorsEvents.hasItems());
-    final IAttribute<IQuantity> cpuCountAttr =
-        attr("availableProcessorCores", "availableProcessorCores", NUMBER);
-    final long val =
-        ((IQuantity)
-                availableProcessorsEvents.getAggregate(
-                    Aggregators.min("datadog.AvailableProcessorCores", cpuCountAttr)))
-            .longValue();
-    assertEquals(Runtime.getRuntime().availableProcessors(), val);
-
-    assertTrue(events.apply(ItemFilters.type("datadog.ProfilerSetting")).hasItems());
-    //     FIXME - for some reason the events are disabled by JFR despite being explicitly enabled
-    //    assertTrue(events.apply(ItemFilters.type("datadog.QueueTime")).hasItems());
-  }
-
-  private static void verifyStackDepthSetting(
-      IItemCollection events, boolean asyncProfilerEnabled) {
-    assertTrue(
-        events
-            .apply(
-                ItemFilters.and(
-                    ItemFilters.type("datadog.ProfilerSetting"),
-                    ItemFilters.equals(
-                        JdkAttributes.REC_SETTING_NAME,
-                        (asyncProfilerEnabled ? "ddprof" : "JFR") + " Stack Depth"),
-                    ItemFilters.equals(
-                        JdkAttributes.REC_SETTING_VALUE, String.valueOf(STACK_DEPTH_LIMIT))))
-            .hasItems());
-  }
-
-  private static boolean hasAuxiliaryDdprof(IItemCollection events) {
-    events =
-        events.apply(
-            ItemFilters.and(
+    private static void verifyStackDepthSetting(IItemCollection events, boolean asyncProfilerEnabled) {
+        assertTrue(events.apply(ItemFilters.and(
+                        ItemFilters.type("datadog.ProfilerSetting"),
+                        ItemFilters.equals(
+                                JdkAttributes.REC_SETTING_NAME,
+                                (asyncProfilerEnabled ? "ddprof" : "JFR") + " Stack Depth"),
+                        ItemFilters.equals(JdkAttributes.REC_SETTING_VALUE, String.valueOf(STACK_DEPTH_LIMIT))))
+                .hasItems());
+    }
+
+    private static boolean hasAuxiliaryDdprof(IItemCollection events) {
+        events = events.apply(ItemFilters.and(
                 ItemFilters.type("datadog.ProfilerSetting"),
                 ItemFilters.equals(JdkAttributes.REC_SETTING_NAME, "Auxiliary Profiler")));
-    if (!events.hasItems()) {
-      return false;
-    }
-    for (IItemIterable event : events) {
-      IMemberAccessor<String, IItem> valueAccessor =
-          JdkAttributes.REC_SETTING_VALUE.getAccessor(event.getType());
-      for (IItem item : event) {
-        String value = valueAccessor.getMember(item);
-        if ("ddprof".equals(value)) {
-          return true;
+        if (!events.hasItems()) {
+            return false;
         }
-      }
-    }
-    return false;
-  }
-
-  private static void processExecutionSamples(
-      IItemCollection events, Set<Long> rootSpanIds, Set<String> operations, Set<String> values) {
-    IItemCollection executionSamples = events.apply(ItemFilters.type("datadog.ExecutionSample"));
-    for (IItemIterable executionSampleEvents : executionSamples) {
-      IMemberAccessor<IQuantity, IItem> rootSpanIdAccessor =
-          LOCAL_ROOT_SPAN_ID.getAccessor(executionSampleEvents.getType());
-      IMemberAccessor<String, IItem> fooAccessor = FOO.getAccessor(executionSampleEvents.getType());
-      IMemberAccessor<String, IItem> barAccessor = BAR.getAccessor(executionSampleEvents.getType());
-      IMemberAccessor<String, IItem> operationAccessor =
-          OPERATION.getAccessor(executionSampleEvents.getType());
-      for (IItem executionSample : executionSampleEvents) {
-        long rootSpanId = rootSpanIdAccessor.getMember(executionSample).longValue();
-        rootSpanIds.add(rootSpanId);
-        if (rootSpanId != 0) {
-          operations.add(operationAccessor.getMember(executionSample));
+        for (IItemIterable event : events) {
+            IMemberAccessor<String, IItem> valueAccessor = JdkAttributes.REC_SETTING_VALUE.getAccessor(event.getType());
+            for (IItem item : event) {
+                String value = valueAccessor.getMember(item);
+                if ("ddprof".equals(value)) {
+                    return true;
+                }
+            }
         }
-        String foo = fooAccessor.getMember(executionSample);
-        if (foo != null) {
-          values.add(foo);
+        return false;
+    }
+
+    private static void processExecutionSamples(
+            IItemCollection events, Set<Long> rootSpanIds, Set<String> operations, Set<String> values) {
+        IItemCollection executionSamples = events.apply(ItemFilters.type("datadog.ExecutionSample"));
+        for (IItemIterable executionSampleEvents : executionSamples) {
+            IMemberAccessor<IQuantity, IItem> rootSpanIdAccessor =
+                    LOCAL_ROOT_SPAN_ID.getAccessor(executionSampleEvents.getType());
+            IMemberAccessor<String, IItem> fooAccessor = FOO.getAccessor(executionSampleEvents.getType());
+            IMemberAccessor<String, IItem> barAccessor = BAR.getAccessor(executionSampleEvents.getType());
+            IMemberAccessor<String, IItem> operationAccessor = OPERATION.getAccessor(executionSampleEvents.getType());
+            for (IItem executionSample : executionSampleEvents) {
+                long rootSpanId = rootSpanIdAccessor.getMember(executionSample).longValue();
+                rootSpanIds.add(rootSpanId);
+                if (rootSpanId != 0) {
+                    operations.add(operationAccessor.getMember(executionSample));
+                }
+                String foo = fooAccessor.getMember(executionSample);
+                if (foo != null) {
+                    values.add(foo);
+                }
+                assertNull(barAccessor.getMember(executionSample));
+            }
         }
-        assertNull(barAccessor.getMember(executionSample));
-      }
+        assertEquals(1, operations.size(), "wrong number of operation names");
+        assertEquals("trace.annotation", operations.iterator().next(), "wrong operation names");
     }
-    assertEquals(1, operations.size(), "wrong number of operation names");
-    assertEquals("trace.annotation", operations.iterator().next(), "wrong operation names");
-  }
-
-  private static <T> T getParameter(
-      final String name, final Class<T> type, final Multimap<String, Object> parameters) {
-    final List<?> vals = (List<?>) parameters.get(name);
-    return (T) vals.get(0);
-  }
-
-  private ProcessBuilder createDefaultProcessBuilder(
-      final int jmxFetchDelay,
-      final boolean endpointCollectionEnabled,
-      final boolean asyncProfilerEnabled,
-      final String withCompression,
-      final Path logFilePath) {
-    return createProcessBuilder(
-        VALID_API_KEY,
-        jmxFetchDelay,
-        PROFILING_START_DELAY_SECONDS,
-        PROFILING_UPLOAD_PERIOD_SECONDS,
-        endpointCollectionEnabled,
-        asyncProfilerEnabled,
-        withCompression,
-        0,
-        logFilePath);
-  }
-
-  private ProcessBuilder createProcessBuilder(
-      final String apiKey,
-      final int jmxFetchDelaySecs,
-      final int profilingStartDelaySecs,
-      final int profilingUploadPeriodSecs,
-      final boolean endpointCollectionEnabled,
-      final boolean asyncProfilerEnabled,
-      final String withCompression,
-      final int exitDelay,
-      final Path logFilePath) {
-    return createProcessBuilder(
-        profilingServer.getPort(),
-        tracingServer.getPort(),
-        apiKey,
-        jmxFetchDelaySecs,
-        profilingStartDelaySecs,
-        profilingUploadPeriodSecs,
-        endpointCollectionEnabled,
-        asyncProfilerEnabled,
-        withCompression,
-        exitDelay,
-        logFilePath,
-        true);
-  }
-
-  private static ProcessBuilder createProcessBuilder(
-      final int profilerPort,
-      final int tracerPort,
-      final String apiKey,
-      final int jmxFetchDelaySecs,
-      final int profilingStartDelaySecs,
-      final int profilingUploadPeriodSecs,
-      final boolean endpointCollectionEnabled,
-      final boolean asyncProfilerEnabled,
-      final String withCompression,
-      final int exitDelay,
-      final Path logFilePath,
-      final boolean tracingEnabled,
-      final String... extraProperties) {
-    final String templateOverride =
-        JFRBasedProfilingIntegrationTest.class
-            .getClassLoader()
-            .getResource("overrides.jfp")
-            .getFile();
-
-    final List<String> command = new java.util.ArrayList<>();
-    command.add(javaPath());
-    command.add("-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "1024M"));
-    command.add("-Xms" + System.getProperty("datadog.forkedMinHeapSize", "64M"));
-    command.add("-javaagent:" + agentShadowJar());
-    command.add("-XX:ErrorFile=/tmp/hs_err_pid%p.log");
-    command.add("-Ddd.trace.agent.port=" + tracerPort);
-    command.add("-Ddd.service.name=smoke-test-java-app");
-    command.add("-Ddd.env=smoketest");
-    command.add("-Ddd.version=99");
-    command.add("-Ddd.trace.enabled=" + tracingEnabled);
-    command.add("-Ddd.profiling.enabled=true");
-    command.add("-Ddd.profiling.stackdepth=" + STACK_DEPTH_LIMIT);
-    command.add("-Ddd.profiling.ddprof.enabled=" + asyncProfilerEnabled);
-    command.add("-Ddd.profiling.ddprof.alloc.enabled=" + asyncProfilerEnabled);
-    if (!tracingEnabled && asyncProfilerEnabled) {
-      command.add("-Ddd.profiling.ddprof.wall.enabled=true");
+
+    private static <T> T getParameter(
+            final String name, final Class<T> type, final Multimap<String, Object> parameters) {
+        final List<?> vals = (List<?>) parameters.get(name);
+        return (T) vals.get(0);
     }
-    command.add("-Ddd.profiling.agentless=" + (apiKey != null));
-    command.add("-Ddd.profiling.start-delay=" + profilingStartDelaySecs);
-    command.add("-Ddd.profiling.upload.period=" + profilingUploadPeriodSecs);
-    command.add("-Ddd.profiling.url=http://localhost:" + profilerPort);
-    command.add("-Ddd.profiling.hotspots.enabled=true");
-    command.add("-Ddd.profiling.endpoint.collection.enabled=" + endpointCollectionEnabled);
-    command.add("-Ddd.profiling.upload.timeout=" + PROFILING_UPLOAD_TIMEOUT_SECONDS);
-    command.add("-Ddd.profiling.debug.dump_path=/tmp/dd-profiler");
-    if (tracingEnabled) {
-      command.add("-Ddd.profiling.queueing.time.enabled=true");
-      command.add("-Ddd.profiling.queueing.time.threshold.millis=0");
-      command.add("-Ddd.profiling.context.attributes=foo,bar");
+
+    private ProcessBuilder createDefaultProcessBuilder(
+            final int jmxFetchDelay,
+            final boolean endpointCollectionEnabled,
+            final boolean asyncProfilerEnabled,
+            final String withCompression,
+            final Path logFilePath) {
+        return createProcessBuilder(
+                VALID_API_KEY,
+                jmxFetchDelay,
+                PROFILING_START_DELAY_SECONDS,
+                PROFILING_UPLOAD_PERIOD_SECONDS,
+                endpointCollectionEnabled,
+                asyncProfilerEnabled,
+                withCompression,
+                0,
+                logFilePath);
     }
-    command.add("-Ddd.profiling.debug.upload.compression=" + withCompression);
-    for (String extra : extraProperties) {
-      command.add(extra);
+
+    private ProcessBuilder createProcessBuilder(
+            final String apiKey,
+            final int jmxFetchDelaySecs,
+            final int profilingStartDelaySecs,
+            final int profilingUploadPeriodSecs,
+            final boolean endpointCollectionEnabled,
+            final boolean asyncProfilerEnabled,
+            final String withCompression,
+            final int exitDelay,
+            final Path logFilePath) {
+        return createProcessBuilder(
+                profilingServer.getPort(),
+                tracingServer.getPort(),
+                apiKey,
+                jmxFetchDelaySecs,
+                profilingStartDelaySecs,
+                profilingUploadPeriodSecs,
+                endpointCollectionEnabled,
+                asyncProfilerEnabled,
+                withCompression,
+                exitDelay,
+                logFilePath,
+                true);
     }
-    command.add("-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug");
-    command.add("-Dorg.slf4j.simpleLogger.defaultLogLevel=debug");
-    command.add("-XX:+IgnoreUnrecognizedVMOptions");
-    command.add("-XX:+UnlockCommercialFeatures");
-    command.add("-XX:+FlightRecorder");
-    command.add(
-        "-Ddd." + ProfilingConfig.PROFILING_TEMPLATE_OVERRIDE_FILE + "=" + templateOverride);
-    command.add("-Ddd.jmxfetch.start-delay=" + jmxFetchDelaySecs);
-    command.add("-jar");
-    command.add(profilingShadowJar());
-    command.add(Integer.toString(exitDelay));
-    final ProcessBuilder processBuilder = new ProcessBuilder(command);
-    processBuilder.directory(new File(buildDirectory()));
-
-    processBuilder.environment().put("JAVA_HOME", System.getProperty("java.home"));
-    processBuilder.environment().put("DD_API_KEY", apiKey);
-
-    processBuilder.redirectErrorStream(true);
-    processBuilder.redirectOutput(ProcessBuilder.Redirect.to(logFilePath.toFile()));
-    return processBuilder;
-  }
-
-  private static String javaPath() {
-    return Paths.get(SystemProperties.getOrDefault("java.home", ""), "bin", "java").toString();
-  }
-
-  private static String buildDirectory() {
-    return System.getProperty("datadog.smoketest.builddir");
-  }
-
-  private static String agentShadowJar() {
-    return System.getProperty("datadog.smoketest.agent.shadowJar.path");
-  }
-
-  private static String profilingShadowJar() {
-    return System.getProperty("datadog.smoketest.profiling.shadowJar.path");
-  }
-
-  private static boolean checkLogLines(final Path logFilePath, final Predicate<String> checker)
-      throws IOException {
-    return Files.lines(logFilePath).anyMatch(checker);
-  }
-
-  private static boolean logHasErrors(final Path logFilePath) throws IOException {
-    final boolean[] logHasErrors = new boolean[] {false};
-    Files.lines(logFilePath)
-        .forEach(
-            it -> {
-              if (it.contains("ERROR") || it.contains("ASSERTION FAILED")) {
-                System.out.println(it);
-                logHasErrors[0] = true;
-              }
-            });
-    if (logHasErrors[0]) {
-      System.out.println(
-          "Test application log is containing errors. See full run logs in " + logFilePath);
+
+    private static ProcessBuilder createProcessBuilder(
+            final int profilerPort,
+            final int tracerPort,
+            final String apiKey,
+            final int jmxFetchDelaySecs,
+            final int profilingStartDelaySecs,
+            final int profilingUploadPeriodSecs,
+            final boolean endpointCollectionEnabled,
+            final boolean asyncProfilerEnabled,
+            final String withCompression,
+            final int exitDelay,
+            final Path logFilePath,
+            final boolean tracingEnabled,
+            final String... extraProperties) {
+        final String templateOverride = JFRBasedProfilingIntegrationTest.class
+                .getClassLoader()
+                .getResource("overrides.jfp")
+                .getFile();
+
+        final List<String> command = new java.util.ArrayList<>();
+        command.add(javaPath());
+        command.add("-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "1024M"));
+        command.add("-Xms" + System.getProperty("datadog.forkedMinHeapSize", "64M"));
+        command.add("-javaagent:" + agentShadowJar());
+        command.add("-XX:ErrorFile=/tmp/hs_err_pid%p.log");
+        command.add("-Ddd.trace.agent.port=" + tracerPort);
+        command.add("-Ddd.service.name=smoke-test-java-app");
+        command.add("-Ddd.env=smoketest");
+        command.add("-Ddd.version=99");
+        command.add("-Ddd.trace.enabled=" + tracingEnabled);
+        command.add("-Ddd.profiling.enabled=true");
+        command.add("-Ddd.profiling.stackdepth=" + STACK_DEPTH_LIMIT);
+        command.add("-Ddd.profiling.ddprof.enabled=" + asyncProfilerEnabled);
+        command.add("-Ddd.profiling.ddprof.alloc.enabled=" + asyncProfilerEnabled);
+        if (!tracingEnabled && asyncProfilerEnabled) {
+            command.add("-Ddd.profiling.ddprof.wall.enabled=true");
+        }
+        command.add("-Ddd.profiling.agentless=" + (apiKey != null));
+        command.add("-Ddd.profiling.start-delay=" + profilingStartDelaySecs);
+        command.add("-Ddd.profiling.upload.period=" + profilingUploadPeriodSecs);
+        command.add("-Ddd.profiling.url=http://localhost:" + profilerPort);
+        command.add("-Ddd.profiling.hotspots.enabled=true");
+        command.add("-Ddd.profiling.endpoint.collection.enabled=" + endpointCollectionEnabled);
+        command.add("-Ddd.profiling.upload.timeout=" + PROFILING_UPLOAD_TIMEOUT_SECONDS);
+        command.add("-Ddd.profiling.debug.dump_path=/tmp/dd-profiler");
+        if (tracingEnabled) {
+            command.add("-Ddd.profiling.queueing.time.enabled=true");
+            command.add("-Ddd.profiling.queueing.time.threshold.millis=0");
+            command.add("-Ddd.profiling.context.attributes=foo,bar");
+        }
+        command.add("-Ddd.profiling.debug.upload.compression=" + withCompression);
+        for (String extra : extraProperties) {
+            command.add(extra);
+        }
+        command.add("-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug");
+        command.add("-Dorg.slf4j.simpleLogger.defaultLogLevel=debug");
+        command.add("-XX:+IgnoreUnrecognizedVMOptions");
+        command.add("-XX:+UnlockCommercialFeatures");
+        command.add("-XX:+FlightRecorder");
+        command.add("-Ddd." + ProfilingConfig.PROFILING_TEMPLATE_OVERRIDE_FILE + "=" + templateOverride);
+        command.add("-Ddd.jmxfetch.start-delay=" + jmxFetchDelaySecs);
+        command.add("-jar");
+        command.add(profilingShadowJar());
+        command.add(Integer.toString(exitDelay));
+        final ProcessBuilder processBuilder = new ProcessBuilder(command);
+        processBuilder.directory(new File(buildDirectory()));
+
+        processBuilder.environment().put("JAVA_HOME", System.getProperty("java.home"));
+        processBuilder.environment().put("DD_API_KEY", apiKey);
+
+        processBuilder.redirectErrorStream(true);
+        processBuilder.redirectOutput(ProcessBuilder.Redirect.to(logFilePath.toFile()));
+        return processBuilder;
     }
-    return logHasErrors[0];
-  }
-
-  public static boolean isJavaVersionAtLeast24() {
-    return JavaVirtualMachine.isJavaVersionAtLeast(24);
-  }
-
-  @Test
-  @DisplayName("Test JFR scrubbing")
-  void testJfrScrubbing(final TestInfo testInfo) throws Exception {
-    Assumptions.assumeFalse(JavaVirtualMachine.isJ9());
-    // Oracle JDK 8 JFR format has quirks that make scrubbing unreliable
-    Assumptions.assumeFalse(JavaVirtualMachine.isOracleJDK8());
-
-    testWithRetry(
-        () -> {
-          try {
-            targetProcess =
-                createProcessBuilder(
-                        profilingServer.getPort(),
-                        tracingServer.getPort(),
-                        VALID_API_KEY,
-                        0,
-                        PROFILING_START_DELAY_SECONDS,
-                        PROFILING_UPLOAD_PERIOD_SECONDS,
-                        ENDPOINT_COLLECTION_ENABLED,
-                        true,
-                        "on",
-                        0,
-                        logFilePath,
-                        true,
-                        "-Ddd.profiling.scrub.enabled=true")
-                    .start();
 
-            final RecordedRequest request = retrieveRequest();
-            assertNotNull(request);
+    private static String javaPath() {
+        return Paths.get(SystemProperties.getOrDefault("java.home", ""), "bin", "java")
+                .toString();
+    }
 
-            final List<FileItem> items =
-                FileUpload.parse(
-                    request.getBody().readByteArray(), request.getHeader("Content-Type"));
+    private static String buildDirectory() {
+        return System.getProperty("datadog.smoketest.builddir");
+    }
 
-            FileItem rawJfr =
-                items.stream()
-                    .filter(i -> "main.jfr".equals(i.getName()))
-                    .findFirst()
-                    .orElseThrow(() -> new AssertionError("main.jfr not found in upload"));
+    private static String agentShadowJar() {
+        return System.getProperty("datadog.smoketest.agent.shadowJar.path");
+    }
 
-            assertFalse(logHasErrors(logFilePath));
-            InputStream eventStream = new ByteArrayInputStream(rawJfr.get());
-            eventStream = decompressStream("on", eventStream);
-            IItemCollection events = JfrLoaderToolkit.loadEvents(eventStream);
-            assertTrue(events.hasItems());
+    private static String profilingShadowJar() {
+        return System.getProperty("datadog.smoketest.profiling.shadowJar.path");
+    }
 
-            // Verify that system properties are scrubbed
-            IItemCollection systemPropertyEvents =
-                events.apply(ItemFilters.type(JdkTypeIDs.SYSTEM_PROPERTIES));
-            assertTrue(
-                systemPropertyEvents.hasItems(),
-                "Expected jdk.InitialSystemProperty events in recording");
-            {
-              IAttribute<String> valueAttr = attr("value", "value", "value", PLAIN_TEXT);
-              for (IItemIterable event : systemPropertyEvents) {
-                IMemberAccessor<String, IItem> valueAccessor =
-                    valueAttr.getAccessor(event.getType());
-                for (IItem item : event) {
-                  String value = valueAccessor.getMember(item);
-                  if (value != null && !value.isEmpty()) {
-                    // Scrubbed values should contain only 'x' characters
-                    assertTrue(
-                        value.chars().allMatch(c -> c == 'x'),
-                        "System property value should be scrubbed: " + value);
-                  }
-                }
-              }
-            }
+    private static boolean checkLogLines(final Path logFilePath, final Predicate<String> checker) throws IOException {
+        return Files.lines(logFilePath).anyMatch(checker);
+    }
 
-            // Verify that JVM arguments are scrubbed
-            IItemCollection jvmInfoEvents = events.apply(ItemFilters.type("jdk.JVMInformation"));
-            assertTrue(jvmInfoEvents.hasItems(), "Expected jdk.JVMInformation events in recording");
-            {
-              IAttribute<String> jvmArgsAttr =
-                  attr("jvmArguments", "jvmArguments", "jvmArguments", PLAIN_TEXT);
-              for (IItemIterable event : jvmInfoEvents) {
-                IMemberAccessor<String, IItem> jvmArgsAccessor =
-                    jvmArgsAttr.getAccessor(event.getType());
-                for (IItem item : event) {
-                  String jvmArgs = jvmArgsAccessor.getMember(item);
-                  if (jvmArgs != null && !jvmArgs.isEmpty()) {
-                    // Scrubbed values should contain only 'x' characters
-                    assertTrue(
-                        jvmArgs.chars().allMatch(c -> c == 'x'),
-                        "JVM arguments should be scrubbed: " + jvmArgs);
-                  }
-                }
-              }
-            }
-          } finally {
-            if (targetProcess != null) {
-              targetProcess.destroyForcibly();
+    private static boolean logHasErrors(final Path logFilePath) throws IOException {
+        final boolean[] logHasErrors = new boolean[] {false};
+        Files.lines(logFilePath).forEach(it -> {
+            if (it.contains("ERROR") || it.contains("ASSERTION FAILED")) {
+                System.out.println(it);
+                logHasErrors[0] = true;
             }
-            targetProcess = null;
-          }
-        },
-        testInfo,
-        3);
-  }
+        });
+        if (logHasErrors[0]) {
+            System.out.println("Test application log is containing errors. See full run logs in " + logFilePath);
+        }
+        return logHasErrors[0];
+    }
+
+    public static boolean isJavaVersionAtLeast24() {
+        return JavaVirtualMachine.isJavaVersionAtLeast(24);
+    }
+
+    @Test
+    @DisplayName("Test JFR scrubbing")
+    void testJfrScrubbing(final TestInfo testInfo) throws Exception {
+        Assumptions.assumeFalse(JavaVirtualMachine.isJ9());
+        // Oracle JDK 8 JFR format has quirks that make scrubbing unreliable
+        Assumptions.assumeFalse(JavaVirtualMachine.isOracleJDK8());
+
+        testWithRetry(
+                () -> {
+                    try {
+                        targetProcess = createProcessBuilder(
+                                        profilingServer.getPort(),
+                                        tracingServer.getPort(),
+                                        VALID_API_KEY,
+                                        0,
+                                        PROFILING_START_DELAY_SECONDS,
+                                        PROFILING_UPLOAD_PERIOD_SECONDS,
+                                        ENDPOINT_COLLECTION_ENABLED,
+                                        true,
+                                        "on",
+                                        0,
+                                        logFilePath,
+                                        true,
+                                        "-Ddd.profiling.scrub.enabled=true")
+                                .start();
+
+                        final RecordedRequest request = retrieveRequest();
+                        assertNotNull(request);
+
+                        final List<FileItem> items =
+                                FileUpload.parse(request.getBody().readByteArray(), request.getHeader("Content-Type"));
+
+                        FileItem rawJfr = items.stream()
+                                .filter(i -> "main.jfr".equals(i.getName()))
+                                .findFirst()
+                                .orElseThrow(() -> new AssertionError("main.jfr not found in upload"));
+
+                        assertFalse(logHasErrors(logFilePath));
+                        InputStream eventStream = new ByteArrayInputStream(rawJfr.get());
+                        eventStream = decompressStream("on", eventStream);
+                        IItemCollection events = JfrLoaderToolkit.loadEvents(eventStream);
+                        assertTrue(events.hasItems());
+
+                        // Verify that system properties are scrubbed
+                        IItemCollection systemPropertyEvents =
+                                events.apply(ItemFilters.type(JdkTypeIDs.SYSTEM_PROPERTIES));
+                        assertTrue(
+                                systemPropertyEvents.hasItems(),
+                                "Expected jdk.InitialSystemProperty events in recording");
+                        {
+                            IAttribute<String> valueAttr = attr("value", "value", "value", PLAIN_TEXT);
+                            for (IItemIterable event : systemPropertyEvents) {
+                                IMemberAccessor<String, IItem> valueAccessor = valueAttr.getAccessor(event.getType());
+                                for (IItem item : event) {
+                                    String value = valueAccessor.getMember(item);
+                                    if (value != null && !value.isEmpty()) {
+                                        // Scrubbed values should contain only 'x' characters
+                                        assertTrue(
+                                                value.chars().allMatch(c -> c == 'x'),
+                                                "System property value should be scrubbed: " + value);
+                                    }
+                                }
+                            }
+                        }
+
+                        // Verify that JVM arguments are scrubbed
+                        IItemCollection jvmInfoEvents = events.apply(ItemFilters.type("jdk.JVMInformation"));
+                        assertTrue(jvmInfoEvents.hasItems(), "Expected jdk.JVMInformation events in recording");
+                        {
+                            IAttribute<String> jvmArgsAttr =
+                                    attr("jvmArguments", "jvmArguments", "jvmArguments", PLAIN_TEXT);
+                            for (IItemIterable event : jvmInfoEvents) {
+                                IMemberAccessor<String, IItem> jvmArgsAccessor =
+                                        jvmArgsAttr.getAccessor(event.getType());
+                                for (IItem item : event) {
+                                    String jvmArgs = jvmArgsAccessor.getMember(item);
+                                    if (jvmArgs != null && !jvmArgs.isEmpty()) {
+                                        // Scrubbed values should contain only 'x' characters
+                                        assertTrue(
+                                                jvmArgs.chars().allMatch(c -> c == 'x'),
+                                                "JVM arguments should be scrubbed: " + jvmArgs);
+                                    }
+                                }
+                            }
+                        }
+                    } finally {
+                        if (targetProcess != null) {
+                            targetProcess.destroyForcibly();
+                        }
+                        targetProcess = null;
+                    }
+                },
+                testInfo,
+                3);
+    }
 }
diff --git a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/SmokeTestUtils.java b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/SmokeTestUtils.java
index d1a13d80fb5..1d3ea92dc9a 100644
--- a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/SmokeTestUtils.java
+++ b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/SmokeTestUtils.java
@@ -12,21 +12,21 @@
 import java.util.List;
 
 final class SmokeTestUtils {
-  static ProcessBuilder createProcessBuilder(
-      String targetClass,
-      final int profilingStartDelaySecs,
-      final int profilingUploadPeriodSecs,
-      int cpuSamplerIntervalMs,
-      int wallSamplerIntervalMs,
-      final Path dumpPath,
-      final Path logFilePath,
-      String... args) {
-    final String templateOverride =
-        SmokeTestUtils.class.getClassLoader().getResource("overrides.jfp").getFile();
+    static ProcessBuilder createProcessBuilder(
+            String targetClass,
+            final int profilingStartDelaySecs,
+            final int profilingUploadPeriodSecs,
+            int cpuSamplerIntervalMs,
+            int wallSamplerIntervalMs,
+            final Path dumpPath,
+            final Path logFilePath,
+            String... args) {
+        final String templateOverride = SmokeTestUtils.class
+                .getClassLoader()
+                .getResource("overrides.jfp")
+                .getFile();
 
-    final List<String> command =
-        new ArrayList<>(
-            Arrays.asList(
+        final List<String> command = new ArrayList<>(Arrays.asList(
                 javaPath(),
                 "-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "1024M"),
                 "-Xms" + System.getProperty("datadog.forkedMinHeapSize", "64M"),
@@ -38,17 +38,9 @@ static ProcessBuilder createProcessBuilder(
                 "-Ddd.profiling.enabled=true",
                 "-Ddd.profiling.ddprof.enabled=true",
                 "-Ddd." + ProfilingConfig.PROFILING_AUXILIARY_TYPE + "=async",
-                "-Ddd."
-                    + ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_INTERVAL
-                    + "="
-                    + cpuSamplerIntervalMs
-                    + "ms",
+                "-Ddd." + ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_INTERVAL + "=" + cpuSamplerIntervalMs + "ms",
                 "-Ddd." + ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED + "=true",
-                "-Ddd."
-                    + ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_INTERVAL
-                    + "="
-                    + wallSamplerIntervalMs
-                    + "ms",
+                "-Ddd." + ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_INTERVAL + "=" + wallSamplerIntervalMs + "ms",
                 "-Ddd.profiling.agentless=false",
                 "-Ddd.profiling.start-delay=" + profilingStartDelaySecs,
                 "-Ddd." + ProfilingConfig.PROFILING_START_FORCE_FIRST + "=true",
@@ -63,59 +55,53 @@ static ProcessBuilder createProcessBuilder(
                 "-XX:+IgnoreUnrecognizedVMOptions",
                 "-XX:+UnlockCommercialFeatures",
                 "-XX:+FlightRecorder",
-                "-Ddd."
-                    + ProfilingConfig.PROFILING_TEMPLATE_OVERRIDE_FILE
+                "-Ddd." + ProfilingConfig.PROFILING_TEMPLATE_OVERRIDE_FILE + "=" + templateOverride));
+        if (System.getenv("TEST_LIBASYNC") != null) {
+            command.add("-Ddd."
+                    + ProfilingConfig.PROFILING_DATADOG_PROFILER_LIBPATH
                     + "="
-                    + templateOverride));
-    if (System.getenv("TEST_LIBASYNC") != null) {
-      command.add(
-          "-Ddd."
-              + ProfilingConfig.PROFILING_DATADOG_PROFILER_LIBPATH
-              + "="
-              + System.getenv("TEST_LIBASYNC"));
-    }
-    command.addAll(Arrays.asList("-cp", profilingShadowJar(), targetClass));
-    command.addAll(Arrays.asList(args));
-    final ProcessBuilder processBuilder = new ProcessBuilder(command);
-    processBuilder.directory(new File(buildDirectory()));
+                    + System.getenv("TEST_LIBASYNC"));
+        }
+        command.addAll(Arrays.asList("-cp", profilingShadowJar(), targetClass));
+        command.addAll(Arrays.asList(args));
+        final ProcessBuilder processBuilder = new ProcessBuilder(command);
+        processBuilder.directory(new File(buildDirectory()));
 
-    processBuilder.environment().put("JAVA_HOME", System.getProperty("java.home"));
+        processBuilder.environment().put("JAVA_HOME", System.getProperty("java.home"));
 
-    processBuilder.redirectErrorStream(true);
-    processBuilder.redirectOutput(ProcessBuilder.Redirect.to(logFilePath.toFile()));
-    return processBuilder;
-  }
+        processBuilder.redirectErrorStream(true);
+        processBuilder.redirectOutput(ProcessBuilder.Redirect.to(logFilePath.toFile()));
+        return processBuilder;
+    }
 
-  static String javaPath() {
-    final String separator = System.getProperty("file.separator");
-    return System.getProperty("java.home") + separator + "bin" + separator + "java";
-  }
+    static String javaPath() {
+        final String separator = System.getProperty("file.separator");
+        return System.getProperty("java.home") + separator + "bin" + separator + "java";
+    }
 
-  static String profilingShadowJar() {
-    return System.getProperty("datadog.smoketest.profiling.shadowJar.path");
-  }
+    static String profilingShadowJar() {
+        return System.getProperty("datadog.smoketest.profiling.shadowJar.path");
+    }
 
-  static String agentShadowJar() {
-    return System.getProperty("datadog.smoketest.agent.shadowJar.path");
-  }
+    static String agentShadowJar() {
+        return System.getProperty("datadog.smoketest.agent.shadowJar.path");
+    }
 
-  static String buildDirectory() {
-    return System.getProperty("datadog.smoketest.builddir");
-  }
+    static String buildDirectory() {
+        return System.getProperty("datadog.smoketest.builddir");
+    }
 
-  static void checkProcessSuccessfullyEnd(final Process process, final Path log)
-      throws InterruptedException {
-    int exitCode = process.waitFor();
-    if (exitCode != 0) {
-      try {
-        System.out.println(
-            "=== Profiling application log start ==="
-                + String.join("\n", Files.readAllLines(log))
-                + "=== Profiling application log end ===");
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
+    static void checkProcessSuccessfullyEnd(final Process process, final Path log) throws InterruptedException {
+        int exitCode = process.waitFor();
+        if (exitCode != 0) {
+            try {
+                System.out.println("=== Profiling application log start ==="
+                        + String.join("\n", Files.readAllLines(log))
+                        + "=== Profiling application log end ===");
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        assertEquals(0, exitCode, "Failed to run profiling process, exited in error");
     }
-    assertEquals(0, exitCode, "Failed to run profiling process, exited in error");
-  }
 }
diff --git a/dd-smoke-tests/quarkus-native/application/src/main/java/datadog/smoketest/JBossLoggingResource.java b/dd-smoke-tests/quarkus-native/application/src/main/java/datadog/smoketest/JBossLoggingResource.java
index 89f0355ca15..1c93ee6f0a7 100644
--- a/dd-smoke-tests/quarkus-native/application/src/main/java/datadog/smoketest/JBossLoggingResource.java
+++ b/dd-smoke-tests/quarkus-native/application/src/main/java/datadog/smoketest/JBossLoggingResource.java
@@ -12,13 +12,13 @@
 
 @Path("/hello-jboss")
 public class JBossLoggingResource {
-  Logger log = Logger.getLogger(JBossLoggingResource.class);
+    Logger log = Logger.getLogger(JBossLoggingResource.class);
 
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String hello(@DefaultValue("0") @QueryParam("id") int id) {
-    Tracer tracer = GlobalTracer.get();
-    log.debug("TT|" + tracer.getTraceId() + "|TS|" + tracer.getSpanId());
-    return "Hello " + id + "!";
-  }
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello(@DefaultValue("0") @QueryParam("id") int id) {
+        Tracer tracer = GlobalTracer.get();
+        log.debug("TT|" + tracer.getTraceId() + "|TS|" + tracer.getSpanId());
+        return "Hello " + id + "!";
+    }
 }
diff --git a/dd-smoke-tests/quarkus-native/application/src/main/java/datadog/smoketest/Slf4JResource.java b/dd-smoke-tests/quarkus-native/application/src/main/java/datadog/smoketest/Slf4JResource.java
index 11faa2bb1de..f294200b1d8 100644
--- a/dd-smoke-tests/quarkus-native/application/src/main/java/datadog/smoketest/Slf4JResource.java
+++ b/dd-smoke-tests/quarkus-native/application/src/main/java/datadog/smoketest/Slf4JResource.java
@@ -13,13 +13,13 @@
 
 @Path("/hello-slf4j")
 public class Slf4JResource {
-  Logger log = LoggerFactory.getLogger(Slf4JResource.class);
+    Logger log = LoggerFactory.getLogger(Slf4JResource.class);
 
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String hello(@DefaultValue("0") @QueryParam("id") int id) {
-    Tracer tracer = GlobalTracer.get();
-    log.debug("TT|" + tracer.getTraceId() + "|TS|" + tracer.getSpanId());
-    return "Hello " + id + "!";
-  }
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello(@DefaultValue("0") @QueryParam("id") int id) {
+        Tracer tracer = GlobalTracer.get();
+        log.debug("TT|" + tracer.getTraceId() + "|TS|" + tracer.getSpanId());
+        return "Hello " + id + "!";
+    }
 }
diff --git a/dd-smoke-tests/quarkus/application/src/main/java/datadog/smoketest/JBossLoggingResource.java b/dd-smoke-tests/quarkus/application/src/main/java/datadog/smoketest/JBossLoggingResource.java
index 5073fa4931f..d6cbb391bda 100644
--- a/dd-smoke-tests/quarkus/application/src/main/java/datadog/smoketest/JBossLoggingResource.java
+++ b/dd-smoke-tests/quarkus/application/src/main/java/datadog/smoketest/JBossLoggingResource.java
@@ -12,13 +12,13 @@
 
 @Path("/hello-jboss")
 public class JBossLoggingResource {
-  Logger log = Logger.getLogger(JBossLoggingResource.class);
+    Logger log = Logger.getLogger(JBossLoggingResource.class);
 
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String hello(@DefaultValue("0") @QueryParam("id") int id) {
-    Tracer tracer = GlobalTracer.get();
-    log.debug("TT|" + tracer.getTraceId() + "|TS|" + tracer.getSpanId());
-    return "Hello " + id + "!";
-  }
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello(@DefaultValue("0") @QueryParam("id") int id) {
+        Tracer tracer = GlobalTracer.get();
+        log.debug("TT|" + tracer.getTraceId() + "|TS|" + tracer.getSpanId());
+        return "Hello " + id + "!";
+    }
 }
diff --git a/dd-smoke-tests/quarkus/application/src/main/java/datadog/smoketest/Slf4JResource.java b/dd-smoke-tests/quarkus/application/src/main/java/datadog/smoketest/Slf4JResource.java
index 9f33140d324..8903c808f3f 100644
--- a/dd-smoke-tests/quarkus/application/src/main/java/datadog/smoketest/Slf4JResource.java
+++ b/dd-smoke-tests/quarkus/application/src/main/java/datadog/smoketest/Slf4JResource.java
@@ -13,13 +13,13 @@
 
 @Path("/hello-slf4j")
 public class Slf4JResource {
-  Logger log = LoggerFactory.getLogger(Slf4JResource.class);
+    Logger log = LoggerFactory.getLogger(Slf4JResource.class);
 
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String hello(@DefaultValue("0") @QueryParam("id") int id) {
-    Tracer tracer = GlobalTracer.get();
-    log.debug("TT|" + tracer.getTraceId() + "|TS|" + tracer.getSpanId());
-    return "Hello " + id + "!";
-  }
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello(@DefaultValue("0") @QueryParam("id") int id) {
+        Tracer tracer = GlobalTracer.get();
+        log.debug("TT|" + tracer.getTraceId() + "|TS|" + tracer.getSpanId());
+        return "Hello " + id + "!";
+    }
 }
diff --git a/dd-smoke-tests/ratpack-1.5/src/main/java/datadog/smoketest/ratpack/RatpackApp.java b/dd-smoke-tests/ratpack-1.5/src/main/java/datadog/smoketest/ratpack/RatpackApp.java
index c9ca8527a75..8916355293f 100644
--- a/dd-smoke-tests/ratpack-1.5/src/main/java/datadog/smoketest/ratpack/RatpackApp.java
+++ b/dd-smoke-tests/ratpack-1.5/src/main/java/datadog/smoketest/ratpack/RatpackApp.java
@@ -7,35 +7,22 @@
 
 public class RatpackApp {
 
-  public static void main(String[] args) throws Exception {
-    int port = Integer.parseInt(System.getProperty("ratpack.http.port", "8080"));
-    RatpackServer.start(
-        server ->
-            server
-                .serverConfig(config -> config.port(port))
-                .handlers(
-                    chain ->
-                        chain
-                            .path(
-                                "api_security/sampling/:status_code",
-                                ctx -> {
-                                  ctx.getResponse()
-                                      .status(
-                                          Integer.parseInt(ctx.getPathTokens().get("status_code")))
-                                      .send("EXECUTED");
-                                })
-                            .path(
+    public static void main(String[] args) throws Exception {
+        int port = Integer.parseInt(System.getProperty("ratpack.http.port", "8080"));
+        RatpackServer.start(server -> server.serverConfig(config -> config.port(port))
+                .handlers(chain -> chain.path("api_security/sampling/:status_code", ctx -> {
+                            ctx.getResponse()
+                                    .status(Integer.parseInt(ctx.getPathTokens().get("status_code")))
+                                    .send("EXECUTED");
+                        })
+                        .path(
                                 "api_security/response",
-                                ctx ->
-                                    ctx.parse(JsonNode.class)
-                                        .then(
-                                            node -> {
-                                              ctx.getResponse().status(200);
-                                              ctx.render(json(node));
-                                            }))
-                            .all(
-                                ctx -> {
-                                  ctx.getResponse().status(404).send("Not Found");
-                                })));
-  }
+                                ctx -> ctx.parse(JsonNode.class).then(node -> {
+                                    ctx.getResponse().status(200);
+                                    ctx.render(json(node));
+                                }))
+                        .all(ctx -> {
+                            ctx.getResponse().status(404).send("Not Found");
+                        })));
+    }
 }
diff --git a/dd-smoke-tests/resteasy/src/main/java/smoketest/resteasy/App.java b/dd-smoke-tests/resteasy/src/main/java/smoketest/resteasy/App.java
index 2ef9aae4206..ed614ff3a60 100644
--- a/dd-smoke-tests/resteasy/src/main/java/smoketest/resteasy/App.java
+++ b/dd-smoke-tests/resteasy/src/main/java/smoketest/resteasy/App.java
@@ -8,16 +8,16 @@
 
 public class App extends Application {
 
-  private Set<Object> singletons = new HashSet<Object>();
+    private Set<Object> singletons = new HashSet<Object>();
 
-  public App() {
-    singletons.add(new Resource());
-    singletons.add(new StringTextStar()); // Writer for String
-    singletons.add(new JacksonJsonProvider()); // Writer for json
-  }
+    public App() {
+        singletons.add(new Resource());
+        singletons.add(new StringTextStar()); // Writer for String
+        singletons.add(new JacksonJsonProvider()); // Writer for json
+    }
 
-  @Override
-  public Set<Object> getSingletons() {
-    return singletons;
-  }
+    @Override
+    public Set<Object> getSingletons() {
+        return singletons;
+    }
 }
diff --git a/dd-smoke-tests/resteasy/src/main/java/smoketest/resteasy/Main.java b/dd-smoke-tests/resteasy/src/main/java/smoketest/resteasy/Main.java
index a0f3f20c5e7..783c377e48f 100644
--- a/dd-smoke-tests/resteasy/src/main/java/smoketest/resteasy/Main.java
+++ b/dd-smoke-tests/resteasy/src/main/java/smoketest/resteasy/Main.java
@@ -8,31 +8,30 @@
 
 public class Main {
 
-  public static void main(String[] args) {
-    int port = 8033;
-    if (args.length == 1) {
-      port = Integer.parseInt(args[0]);
-      System.out.println("Starting smoketest resteasy server at port: " + port);
-    }
+    public static void main(String[] args) {
+        int port = 8033;
+        if (args.length == 1) {
+            port = Integer.parseInt(args[0]);
+            System.out.println("Starting smoketest resteasy server at port: " + port);
+        }
 
-    UndertowJaxrsServer server = new UndertowJaxrsServer();
+        UndertowJaxrsServer server = new UndertowJaxrsServer();
 
-    ResteasyDeployment deployment = new ResteasyDeployment();
-    deployment.setApplicationClass(App.class.getName());
-    deployment.setInjectorFactoryClass("org.jboss.resteasy.cdi.CdiInjectorFactory");
+        ResteasyDeployment deployment = new ResteasyDeployment();
+        deployment.setApplicationClass(App.class.getName());
+        deployment.setInjectorFactoryClass("org.jboss.resteasy.cdi.CdiInjectorFactory");
 
-    DeploymentInfo deploymentInfo = server.undertowDeployment(deployment, "/");
-    deploymentInfo.setClassLoader(Main.class.getClassLoader());
-    deploymentInfo.setDeploymentName("Undertow + Resteasy example");
-    deploymentInfo.setContextPath("/");
+        DeploymentInfo deploymentInfo = server.undertowDeployment(deployment, "/");
+        deploymentInfo.setClassLoader(Main.class.getClassLoader());
+        deploymentInfo.setDeploymentName("Undertow + Resteasy example");
+        deploymentInfo.setContextPath("/");
 
-    deploymentInfo.addListener(
-        Servlets.listener(org.jboss.weld.environment.servlet.Listener.class));
+        deploymentInfo.addListener(Servlets.listener(org.jboss.weld.environment.servlet.Listener.class));
 
-    server.deploy(deploymentInfo);
+        server.deploy(deploymentInfo);
 
-    Undertow.Builder builder = Undertow.builder().addHttpListener(port, "localhost");
+        Undertow.Builder builder = Undertow.builder().addHttpListener(port, "localhost");
 
-    server.start(builder);
-  }
+        server.start(builder);
+    }
 }
diff --git a/dd-smoke-tests/resteasy/src/main/java/smoketest/resteasy/RequestBody.java b/dd-smoke-tests/resteasy/src/main/java/smoketest/resteasy/RequestBody.java
index a77d27c7100..ba094034c5f 100644
--- a/dd-smoke-tests/resteasy/src/main/java/smoketest/resteasy/RequestBody.java
+++ b/dd-smoke-tests/resteasy/src/main/java/smoketest/resteasy/RequestBody.java
@@ -3,43 +3,43 @@
 import java.util.List;
 
 public class RequestBody {
-  private List<KeyValue> main;
-  private Object nullable;
+    private List<KeyValue> main;
+    private Object nullable;
 
-  public List<KeyValue> getMain() {
-    return main;
-  }
+    public List<KeyValue> getMain() {
+        return main;
+    }
 
-  public void setMain(List<KeyValue> main) {
-    this.main = main;
-  }
+    public void setMain(List<KeyValue> main) {
+        this.main = main;
+    }
 
-  public Object getNullable() {
-    return nullable;
-  }
+    public Object getNullable() {
+        return nullable;
+    }
 
-  public void setNullable(Object nullable) {
-    this.nullable = nullable;
-  }
+    public void setNullable(Object nullable) {
+        this.nullable = nullable;
+    }
 
-  public static class KeyValue {
-    private String key;
-    private Double value;
+    public static class KeyValue {
+        private String key;
+        private Double value;
 
-    public String getKey() {
-      return key;
-    }
+        public String getKey() {
+            return key;
+        }
 
-    public void setKey(String key) {
-      this.key = key;
-    }
+        public void setKey(String key) {
+            this.key = key;
+        }
 
-    public Double getValue() {
-      return value;
-    }
+        public Double getValue() {
+            return value;
+        }
 
-    public void setValue(Double value) {
-      this.value = value;
+        public void setValue(Double value) {
+            this.value = value;
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/resteasy/src/main/java/smoketest/resteasy/Resource.java b/dd-smoke-tests/resteasy/src/main/java/smoketest/resteasy/Resource.java
index bc8ff6fcfc0..a5c65b4aad5 100644
--- a/dd-smoke-tests/resteasy/src/main/java/smoketest/resteasy/Resource.java
+++ b/dd-smoke-tests/resteasy/src/main/java/smoketest/resteasy/Resource.java
@@ -22,92 +22,99 @@
 @Path("/hello")
 public class Resource {
 
-  public Resource() {}
-
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String hello() {
-    return "RestEasy hello world example.";
-  }
-
-  @Path("/bypathparam/{name}")
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String byPathParam(@PathParam("name") String name) {
-    return "RestEasy: hello " + name;
-  }
-
-  @Path("/byqueryparam")
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String byQueryParam(@QueryParam("param") String param) {
-    return "RestEasy: hello " + param;
-  }
-
-  @Path("/byheader")
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String byHeader(@HeaderParam("X-Custom-header") String param) {
-    return "RestEasy: hello " + param;
-  }
-
-  @Path("/bycookie")
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String byCookie(@CookieParam("cookieName") String param) {
-    return "RestEasy: hello " + param;
-  }
-
-  @Path("/collection")
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String collectionByQueryParam(@QueryParam("param") List<String> param) {
-    return "RestEasy: hello " + param;
-  }
-
-  @Path("/set")
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String setByQueryParam(@QueryParam("param") Set<String> param) {
-    return "RestEasy: hello " + param;
-  }
-
-  @Path("/sortedset")
-  @GET
-  @Produces(MediaType.TEXT_PLAIN)
-  public String sortedSetByQueryParam(@QueryParam("param") SortedSet<String> param) {
-    return "RestEasy: hello " + param;
-  }
-
-  @Path("/setlocationheader")
-  @GET
-  public Response locationHeader(@QueryParam("param") String param) {
-    return Response.status(Response.Status.TEMPORARY_REDIRECT).header("Location", param).build();
-  }
-
-  @Path("/setresponselocation")
-  @GET
-  public Response responseLocation(@QueryParam("param") String param) throws URISyntaxException {
-    return Response.status(Response.Status.TEMPORARY_REDIRECT).location(new URI(param)).build();
-  }
-
-  @Path("/insecurecookie")
-  @GET
-  public Response getCookie() throws SQLException {
-    return Response.ok().cookie(new NewCookie("user-id", "7")).build();
-  }
-
-  @Path("/api_security/response")
-  @POST
-  @Produces(MediaType.APPLICATION_JSON)
-  @Consumes(MediaType.APPLICATION_JSON)
-  public Response apiSecurityResponse(RequestBody input) {
-    return Response.ok(input).build();
-  }
-
-  @GET
-  @Path("/api_security/sampling/{i}")
-  public Response apiSecuritySamplingWithStatus(@PathParam("i") int i) {
-    return Response.status(i).header("content-type", "text/plain").entity("Hello!\n").build();
-  }
+    public Resource() {}
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "RestEasy hello world example.";
+    }
+
+    @Path("/bypathparam/{name}")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String byPathParam(@PathParam("name") String name) {
+        return "RestEasy: hello " + name;
+    }
+
+    @Path("/byqueryparam")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String byQueryParam(@QueryParam("param") String param) {
+        return "RestEasy: hello " + param;
+    }
+
+    @Path("/byheader")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String byHeader(@HeaderParam("X-Custom-header") String param) {
+        return "RestEasy: hello " + param;
+    }
+
+    @Path("/bycookie")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String byCookie(@CookieParam("cookieName") String param) {
+        return "RestEasy: hello " + param;
+    }
+
+    @Path("/collection")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String collectionByQueryParam(@QueryParam("param") List<String> param) {
+        return "RestEasy: hello " + param;
+    }
+
+    @Path("/set")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String setByQueryParam(@QueryParam("param") Set<String> param) {
+        return "RestEasy: hello " + param;
+    }
+
+    @Path("/sortedset")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String sortedSetByQueryParam(@QueryParam("param") SortedSet<String> param) {
+        return "RestEasy: hello " + param;
+    }
+
+    @Path("/setlocationheader")
+    @GET
+    public Response locationHeader(@QueryParam("param") String param) {
+        return Response.status(Response.Status.TEMPORARY_REDIRECT)
+                .header("Location", param)
+                .build();
+    }
+
+    @Path("/setresponselocation")
+    @GET
+    public Response responseLocation(@QueryParam("param") String param) throws URISyntaxException {
+        return Response.status(Response.Status.TEMPORARY_REDIRECT)
+                .location(new URI(param))
+                .build();
+    }
+
+    @Path("/insecurecookie")
+    @GET
+    public Response getCookie() throws SQLException {
+        return Response.ok().cookie(new NewCookie("user-id", "7")).build();
+    }
+
+    @Path("/api_security/response")
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Response apiSecurityResponse(RequestBody input) {
+        return Response.ok(input).build();
+    }
+
+    @GET
+    @Path("/api_security/sampling/{i}")
+    public Response apiSecuritySamplingWithStatus(@PathParam("i") int i) {
+        return Response.status(i)
+                .header("content-type", "text/plain")
+                .entity("Hello!\n")
+                .build();
+    }
 }
diff --git a/dd-smoke-tests/rum/tomcat-10/src/main/java/com/example/HtmlAsyncServlet.java b/dd-smoke-tests/rum/tomcat-10/src/main/java/com/example/HtmlAsyncServlet.java
index dc568cfc5b9..6ed3468d7c4 100644
--- a/dd-smoke-tests/rum/tomcat-10/src/main/java/com/example/HtmlAsyncServlet.java
+++ b/dd-smoke-tests/rum/tomcat-10/src/main/java/com/example/HtmlAsyncServlet.java
@@ -10,37 +10,36 @@
 import java.util.TimerTask;
 
 public class HtmlAsyncServlet extends HttpServlet {
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-    final AsyncContext asyncContext = req.startAsync();
-    new Timer(false)
-        .schedule(
-            new TimerTask() {
-              @Override
-              public void run() {
-                try {
-                  asyncContext
-                      .getResponse()
-                      .getWriter()
-                      .write(
-                          "<!DOCTYPE html>"
-                              + "<html lang=\"en\">"
-                              + "<head>"
-                              + "    <meta charset=\"UTF-8\">"
-                              + "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">"
-                              + "    <title>Hello Servlet</title>"
-                              + "</head>"
-                              + "<body>"
-                              + "    <h1>Hello from Tomcat 9 Servlet!</h1>"
-                              + "    <p>This is a demo HTML page served by Java servlet.</p>"
-                              + "</body>"
-                              + "</html>");
-                  asyncContext.complete();
-                } catch (IOException e) {
-                  throw new UncheckedIOException(e);
-                }
-              }
-            },
-            2000);
-  }
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        final AsyncContext asyncContext = req.startAsync();
+        new Timer(false)
+                .schedule(
+                        new TimerTask() {
+                            @Override
+                            public void run() {
+                                try {
+                                    asyncContext
+                                            .getResponse()
+                                            .getWriter()
+                                            .write("<!DOCTYPE html>"
+                                                    + "<html lang=\"en\">"
+                                                    + "<head>"
+                                                    + "    <meta charset=\"UTF-8\">"
+                                                    + "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">"
+                                                    + "    <title>Hello Servlet</title>"
+                                                    + "</head>"
+                                                    + "<body>"
+                                                    + "    <h1>Hello from Tomcat 9 Servlet!</h1>"
+                                                    + "    <p>This is a demo HTML page served by Java servlet.</p>"
+                                                    + "</body>"
+                                                    + "</html>");
+                                    asyncContext.complete();
+                                } catch (IOException e) {
+                                    throw new UncheckedIOException(e);
+                                }
+                            }
+                        },
+                        2000);
+    }
 }
diff --git a/dd-smoke-tests/rum/tomcat-10/src/main/java/com/example/HtmlServlet.java b/dd-smoke-tests/rum/tomcat-10/src/main/java/com/example/HtmlServlet.java
index 0940634b377..84fd3913ba3 100644
--- a/dd-smoke-tests/rum/tomcat-10/src/main/java/com/example/HtmlServlet.java
+++ b/dd-smoke-tests/rum/tomcat-10/src/main/java/com/example/HtmlServlet.java
@@ -7,22 +7,21 @@
 import java.io.PrintWriter;
 
 public class HtmlServlet extends HttpServlet {
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-    final PrintWriter writer = resp.getWriter();
-    resp.setContentType("text/html;charset=UTF-8");
-    writer.write(
-        "<!DOCTYPE html>"
-            + "<html lang=\"en\">"
-            + "<head>"
-            + "    <meta charset=\"UTF-8\">"
-            + "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">"
-            + "    <title>Hello Servlet</title>"
-            + "</head>"
-            + "<body>"
-            + "    <h1>Hello from Tomcat 9 Servlet!</h1>"
-            + "    <p>This is a demo HTML page served by Java servlet.</p>"
-            + "</body>"
-            + "</html>");
-  }
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        final PrintWriter writer = resp.getWriter();
+        resp.setContentType("text/html;charset=UTF-8");
+        writer.write("<!DOCTYPE html>"
+                + "<html lang=\"en\">"
+                + "<head>"
+                + "    <meta charset=\"UTF-8\">"
+                + "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">"
+                + "    <title>Hello Servlet</title>"
+                + "</head>"
+                + "<body>"
+                + "    <h1>Hello from Tomcat 9 Servlet!</h1>"
+                + "    <p>This is a demo HTML page served by Java servlet.</p>"
+                + "</body>"
+                + "</html>");
+    }
 }
diff --git a/dd-smoke-tests/rum/tomcat-10/src/main/java/com/example/Main.java b/dd-smoke-tests/rum/tomcat-10/src/main/java/com/example/Main.java
index 524e62907c0..f549c21cd5e 100644
--- a/dd-smoke-tests/rum/tomcat-10/src/main/java/com/example/Main.java
+++ b/dd-smoke-tests/rum/tomcat-10/src/main/java/com/example/Main.java
@@ -7,35 +7,35 @@
 import org.apache.catalina.startup.Tomcat;
 
 public class Main {
-  public static void main(String[] args) throws LifecycleException {
-    int port = 8080;
-    if (args.length == 1) {
-      port = Integer.parseInt(args[0]);
-    }
+    public static void main(String[] args) throws LifecycleException {
+        int port = 8080;
+        if (args.length == 1) {
+            port = Integer.parseInt(args[0]);
+        }
 
-    Tomcat tomcat = new Tomcat();
-    tomcat.setPort(port);
-    tomcat.getConnector(); // This is required to make Tomcat start
-    tomcat.setBaseDir(".");
+        Tomcat tomcat = new Tomcat();
+        tomcat.setPort(port);
+        tomcat.getConnector(); // This is required to make Tomcat start
+        tomcat.setBaseDir(".");
 
-    // Add webapp context
-    String contextPath = "";
-    String docBase = new File(".").getAbsolutePath();
-    Context context = tomcat.addContext(contextPath, docBase);
+        // Add webapp context
+        String contextPath = "";
+        String docBase = new File(".").getAbsolutePath();
+        Context context = tomcat.addContext(contextPath, docBase);
 
-    // Add servlet programmatically
-    context.addServletContainerInitializer(
-        (c, ctx) -> {
-          ctx.addServlet("htmlServlet", new HtmlServlet()).addMapping("/html");
-          final ServletRegistration.Dynamic registration =
-              ctx.addServlet("htmlAsyncServlet", new HtmlAsyncServlet());
-          registration.addMapping("/html_async");
-          registration.setAsyncSupported(true);
-          ctx.addServlet("xmlServlet", new XmlServlet()).addMapping("/xml");
-        },
-        null);
+        // Add servlet programmatically
+        context.addServletContainerInitializer(
+                (c, ctx) -> {
+                    ctx.addServlet("htmlServlet", new HtmlServlet()).addMapping("/html");
+                    final ServletRegistration.Dynamic registration =
+                            ctx.addServlet("htmlAsyncServlet", new HtmlAsyncServlet());
+                    registration.addMapping("/html_async");
+                    registration.setAsyncSupported(true);
+                    ctx.addServlet("xmlServlet", new XmlServlet()).addMapping("/xml");
+                },
+                null);
 
-    tomcat.start();
-    tomcat.getServer().await();
-  }
+        tomcat.start();
+        tomcat.getServer().await();
+    }
 }
diff --git a/dd-smoke-tests/rum/tomcat-10/src/main/java/com/example/XmlServlet.java b/dd-smoke-tests/rum/tomcat-10/src/main/java/com/example/XmlServlet.java
index 43cf679cc09..3106fd9d6c3 100644
--- a/dd-smoke-tests/rum/tomcat-10/src/main/java/com/example/XmlServlet.java
+++ b/dd-smoke-tests/rum/tomcat-10/src/main/java/com/example/XmlServlet.java
@@ -7,18 +7,18 @@
 import java.io.PrintWriter;
 
 public class XmlServlet extends HttpServlet {
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-    final PrintWriter out = resp.getWriter();
-    resp.setContentType("application/xml;charset=UTF-8");
-    out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-    out.println("<response>");
-    out.println("    <status>success</status>");
-    out.println("    <message>RUM injection test</message>");
-    out.println("    <data>");
-    out.println("        <item id=\"1\">Test Item 1</item>");
-    out.println("        <item id=\"2\">Test Item 2</item>");
-    out.println("    </data>");
-    out.print("</response>");
-  }
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        final PrintWriter out = resp.getWriter();
+        resp.setContentType("application/xml;charset=UTF-8");
+        out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+        out.println("<response>");
+        out.println("    <status>success</status>");
+        out.println("    <message>RUM injection test</message>");
+        out.println("    <data>");
+        out.println("        <item id=\"1\">Test Item 1</item>");
+        out.println("        <item id=\"2\">Test Item 2</item>");
+        out.println("    </data>");
+        out.print("</response>");
+    }
 }
diff --git a/dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/HtmlAsyncServlet.java b/dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/HtmlAsyncServlet.java
index dc568cfc5b9..6ed3468d7c4 100644
--- a/dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/HtmlAsyncServlet.java
+++ b/dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/HtmlAsyncServlet.java
@@ -10,37 +10,36 @@
 import java.util.TimerTask;
 
 public class HtmlAsyncServlet extends HttpServlet {
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-    final AsyncContext asyncContext = req.startAsync();
-    new Timer(false)
-        .schedule(
-            new TimerTask() {
-              @Override
-              public void run() {
-                try {
-                  asyncContext
-                      .getResponse()
-                      .getWriter()
-                      .write(
-                          "<!DOCTYPE html>"
-                              + "<html lang=\"en\">"
-                              + "<head>"
-                              + "    <meta charset=\"UTF-8\">"
-                              + "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">"
-                              + "    <title>Hello Servlet</title>"
-                              + "</head>"
-                              + "<body>"
-                              + "    <h1>Hello from Tomcat 9 Servlet!</h1>"
-                              + "    <p>This is a demo HTML page served by Java servlet.</p>"
-                              + "</body>"
-                              + "</html>");
-                  asyncContext.complete();
-                } catch (IOException e) {
-                  throw new UncheckedIOException(e);
-                }
-              }
-            },
-            2000);
-  }
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        final AsyncContext asyncContext = req.startAsync();
+        new Timer(false)
+                .schedule(
+                        new TimerTask() {
+                            @Override
+                            public void run() {
+                                try {
+                                    asyncContext
+                                            .getResponse()
+                                            .getWriter()
+                                            .write("<!DOCTYPE html>"
+                                                    + "<html lang=\"en\">"
+                                                    + "<head>"
+                                                    + "    <meta charset=\"UTF-8\">"
+                                                    + "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">"
+                                                    + "    <title>Hello Servlet</title>"
+                                                    + "</head>"
+                                                    + "<body>"
+                                                    + "    <h1>Hello from Tomcat 9 Servlet!</h1>"
+                                                    + "    <p>This is a demo HTML page served by Java servlet.</p>"
+                                                    + "</body>"
+                                                    + "</html>");
+                                    asyncContext.complete();
+                                } catch (IOException e) {
+                                    throw new UncheckedIOException(e);
+                                }
+                            }
+                        },
+                        2000);
+    }
 }
diff --git a/dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/HtmlServlet.java b/dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/HtmlServlet.java
index 0940634b377..84fd3913ba3 100644
--- a/dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/HtmlServlet.java
+++ b/dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/HtmlServlet.java
@@ -7,22 +7,21 @@
 import java.io.PrintWriter;
 
 public class HtmlServlet extends HttpServlet {
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-    final PrintWriter writer = resp.getWriter();
-    resp.setContentType("text/html;charset=UTF-8");
-    writer.write(
-        "<!DOCTYPE html>"
-            + "<html lang=\"en\">"
-            + "<head>"
-            + "    <meta charset=\"UTF-8\">"
-            + "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">"
-            + "    <title>Hello Servlet</title>"
-            + "</head>"
-            + "<body>"
-            + "    <h1>Hello from Tomcat 9 Servlet!</h1>"
-            + "    <p>This is a demo HTML page served by Java servlet.</p>"
-            + "</body>"
-            + "</html>");
-  }
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        final PrintWriter writer = resp.getWriter();
+        resp.setContentType("text/html;charset=UTF-8");
+        writer.write("<!DOCTYPE html>"
+                + "<html lang=\"en\">"
+                + "<head>"
+                + "    <meta charset=\"UTF-8\">"
+                + "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">"
+                + "    <title>Hello Servlet</title>"
+                + "</head>"
+                + "<body>"
+                + "    <h1>Hello from Tomcat 9 Servlet!</h1>"
+                + "    <p>This is a demo HTML page served by Java servlet.</p>"
+                + "</body>"
+                + "</html>");
+    }
 }
diff --git a/dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/Main.java b/dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/Main.java
index 524e62907c0..f549c21cd5e 100644
--- a/dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/Main.java
+++ b/dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/Main.java
@@ -7,35 +7,35 @@
 import org.apache.catalina.startup.Tomcat;
 
 public class Main {
-  public static void main(String[] args) throws LifecycleException {
-    int port = 8080;
-    if (args.length == 1) {
-      port = Integer.parseInt(args[0]);
-    }
+    public static void main(String[] args) throws LifecycleException {
+        int port = 8080;
+        if (args.length == 1) {
+            port = Integer.parseInt(args[0]);
+        }
 
-    Tomcat tomcat = new Tomcat();
-    tomcat.setPort(port);
-    tomcat.getConnector(); // This is required to make Tomcat start
-    tomcat.setBaseDir(".");
+        Tomcat tomcat = new Tomcat();
+        tomcat.setPort(port);
+        tomcat.getConnector(); // This is required to make Tomcat start
+        tomcat.setBaseDir(".");
 
-    // Add webapp context
-    String contextPath = "";
-    String docBase = new File(".").getAbsolutePath();
-    Context context = tomcat.addContext(contextPath, docBase);
+        // Add webapp context
+        String contextPath = "";
+        String docBase = new File(".").getAbsolutePath();
+        Context context = tomcat.addContext(contextPath, docBase);
 
-    // Add servlet programmatically
-    context.addServletContainerInitializer(
-        (c, ctx) -> {
-          ctx.addServlet("htmlServlet", new HtmlServlet()).addMapping("/html");
-          final ServletRegistration.Dynamic registration =
-              ctx.addServlet("htmlAsyncServlet", new HtmlAsyncServlet());
-          registration.addMapping("/html_async");
-          registration.setAsyncSupported(true);
-          ctx.addServlet("xmlServlet", new XmlServlet()).addMapping("/xml");
-        },
-        null);
+        // Add servlet programmatically
+        context.addServletContainerInitializer(
+                (c, ctx) -> {
+                    ctx.addServlet("htmlServlet", new HtmlServlet()).addMapping("/html");
+                    final ServletRegistration.Dynamic registration =
+                            ctx.addServlet("htmlAsyncServlet", new HtmlAsyncServlet());
+                    registration.addMapping("/html_async");
+                    registration.setAsyncSupported(true);
+                    ctx.addServlet("xmlServlet", new XmlServlet()).addMapping("/xml");
+                },
+                null);
 
-    tomcat.start();
-    tomcat.getServer().await();
-  }
+        tomcat.start();
+        tomcat.getServer().await();
+    }
 }
diff --git a/dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/XmlServlet.java b/dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/XmlServlet.java
index 43cf679cc09..3106fd9d6c3 100644
--- a/dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/XmlServlet.java
+++ b/dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/XmlServlet.java
@@ -7,18 +7,18 @@
 import java.io.PrintWriter;
 
 public class XmlServlet extends HttpServlet {
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-    final PrintWriter out = resp.getWriter();
-    resp.setContentType("application/xml;charset=UTF-8");
-    out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-    out.println("<response>");
-    out.println("    <status>success</status>");
-    out.println("    <message>RUM injection test</message>");
-    out.println("    <data>");
-    out.println("        <item id=\"1\">Test Item 1</item>");
-    out.println("        <item id=\"2\">Test Item 2</item>");
-    out.println("    </data>");
-    out.print("</response>");
-  }
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        final PrintWriter out = resp.getWriter();
+        resp.setContentType("application/xml;charset=UTF-8");
+        out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+        out.println("<response>");
+        out.println("    <status>success</status>");
+        out.println("    <message>RUM injection test</message>");
+        out.println("    <data>");
+        out.println("        <item id=\"1\">Test Item 1</item>");
+        out.println("        <item id=\"2\">Test Item 2</item>");
+        out.println("    </data>");
+        out.print("</response>");
+    }
 }
diff --git a/dd-smoke-tests/rum/tomcat-9/src/main/java/com/example/HtmlAsyncServlet.java b/dd-smoke-tests/rum/tomcat-9/src/main/java/com/example/HtmlAsyncServlet.java
index 81406c68ba4..a4361d70f34 100644
--- a/dd-smoke-tests/rum/tomcat-9/src/main/java/com/example/HtmlAsyncServlet.java
+++ b/dd-smoke-tests/rum/tomcat-9/src/main/java/com/example/HtmlAsyncServlet.java
@@ -10,37 +10,36 @@
 import javax.servlet.http.HttpServletResponse;
 
 public class HtmlAsyncServlet extends HttpServlet {
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-    final AsyncContext asyncContext = req.startAsync();
-    new Timer(false)
-        .schedule(
-            new TimerTask() {
-              @Override
-              public void run() {
-                try {
-                  asyncContext
-                      .getResponse()
-                      .getWriter()
-                      .write(
-                          "<!DOCTYPE html>"
-                              + "<html lang=\"en\">"
-                              + "<head>"
-                              + "    <meta charset=\"UTF-8\">"
-                              + "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">"
-                              + "    <title>Hello Servlet</title>"
-                              + "</head>"
-                              + "<body>"
-                              + "    <h1>Hello from Tomcat 9 Servlet!</h1>"
-                              + "    <p>This is a demo HTML page served by Java servlet.</p>"
-                              + "</body>"
-                              + "</html>");
-                  asyncContext.complete();
-                } catch (IOException e) {
-                  throw new UncheckedIOException(e);
-                }
-              }
-            },
-            2000);
-  }
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        final AsyncContext asyncContext = req.startAsync();
+        new Timer(false)
+                .schedule(
+                        new TimerTask() {
+                            @Override
+                            public void run() {
+                                try {
+                                    asyncContext
+                                            .getResponse()
+                                            .getWriter()
+                                            .write("<!DOCTYPE html>"
+                                                    + "<html lang=\"en\">"
+                                                    + "<head>"
+                                                    + "    <meta charset=\"UTF-8\">"
+                                                    + "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">"
+                                                    + "    <title>Hello Servlet</title>"
+                                                    + "</head>"
+                                                    + "<body>"
+                                                    + "    <h1>Hello from Tomcat 9 Servlet!</h1>"
+                                                    + "    <p>This is a demo HTML page served by Java servlet.</p>"
+                                                    + "</body>"
+                                                    + "</html>");
+                                    asyncContext.complete();
+                                } catch (IOException e) {
+                                    throw new UncheckedIOException(e);
+                                }
+                            }
+                        },
+                        2000);
+    }
 }
diff --git a/dd-smoke-tests/rum/tomcat-9/src/main/java/com/example/HtmlServlet.java b/dd-smoke-tests/rum/tomcat-9/src/main/java/com/example/HtmlServlet.java
index 90f13e7317f..c90c49a8cd7 100644
--- a/dd-smoke-tests/rum/tomcat-9/src/main/java/com/example/HtmlServlet.java
+++ b/dd-smoke-tests/rum/tomcat-9/src/main/java/com/example/HtmlServlet.java
@@ -6,21 +6,20 @@
 import javax.servlet.http.HttpServletResponse;
 
 public class HtmlServlet extends HttpServlet {
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-    resp.getWriter()
-        .write(
-            "<!DOCTYPE html>"
-                + "<html lang=\"en\">"
-                + "<head>"
-                + "    <meta charset=\"UTF-8\">"
-                + "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">"
-                + "    <title>Hello Servlet</title>"
-                + "</head>"
-                + "<body>"
-                + "    <h1>Hello from Tomcat 9 Servlet!</h1>"
-                + "    <p>This is a demo HTML page served by Java servlet.</p>"
-                + "</body>"
-                + "</html>");
-  }
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        resp.getWriter()
+                .write("<!DOCTYPE html>"
+                        + "<html lang=\"en\">"
+                        + "<head>"
+                        + "    <meta charset=\"UTF-8\">"
+                        + "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">"
+                        + "    <title>Hello Servlet</title>"
+                        + "</head>"
+                        + "<body>"
+                        + "    <h1>Hello from Tomcat 9 Servlet!</h1>"
+                        + "    <p>This is a demo HTML page served by Java servlet.</p>"
+                        + "</body>"
+                        + "</html>");
+    }
 }
diff --git a/dd-smoke-tests/rum/tomcat-9/src/main/java/com/example/Main.java b/dd-smoke-tests/rum/tomcat-9/src/main/java/com/example/Main.java
index ad56bd12c28..be7f688a476 100644
--- a/dd-smoke-tests/rum/tomcat-9/src/main/java/com/example/Main.java
+++ b/dd-smoke-tests/rum/tomcat-9/src/main/java/com/example/Main.java
@@ -7,35 +7,35 @@
 import org.apache.catalina.startup.Tomcat;
 
 public class Main {
-  public static void main(String[] args) throws LifecycleException {
-    int port = 8080;
-    if (args.length == 1) {
-      port = Integer.parseInt(args[0]);
-    }
+    public static void main(String[] args) throws LifecycleException {
+        int port = 8080;
+        if (args.length == 1) {
+            port = Integer.parseInt(args[0]);
+        }
 
-    Tomcat tomcat = new Tomcat();
-    tomcat.setPort(port);
-    tomcat.getConnector(); // This is required to make Tomcat start
-    tomcat.setBaseDir(".");
+        Tomcat tomcat = new Tomcat();
+        tomcat.setPort(port);
+        tomcat.getConnector(); // This is required to make Tomcat start
+        tomcat.setBaseDir(".");
 
-    // Add webapp context
-    String contextPath = "";
-    String docBase = new File(".").getAbsolutePath();
-    Context context = tomcat.addContext(contextPath, docBase);
+        // Add webapp context
+        String contextPath = "";
+        String docBase = new File(".").getAbsolutePath();
+        Context context = tomcat.addContext(contextPath, docBase);
 
-    // Add servlet programmatically
-    context.addServletContainerInitializer(
-        (c, ctx) -> {
-          ctx.addServlet("htmlServlet", new HtmlServlet()).addMapping("/html");
-          final ServletRegistration.Dynamic registration =
-              ctx.addServlet("htmlAsyncServlet", new HtmlAsyncServlet());
-          registration.addMapping("/html_async");
-          registration.setAsyncSupported(true);
-          ctx.addServlet("xmlServlet", new XmlServlet()).addMapping("/xml");
-        },
-        null);
+        // Add servlet programmatically
+        context.addServletContainerInitializer(
+                (c, ctx) -> {
+                    ctx.addServlet("htmlServlet", new HtmlServlet()).addMapping("/html");
+                    final ServletRegistration.Dynamic registration =
+                            ctx.addServlet("htmlAsyncServlet", new HtmlAsyncServlet());
+                    registration.addMapping("/html_async");
+                    registration.setAsyncSupported(true);
+                    ctx.addServlet("xmlServlet", new XmlServlet()).addMapping("/xml");
+                },
+                null);
 
-    tomcat.start();
-    tomcat.getServer().await();
-  }
+        tomcat.start();
+        tomcat.getServer().await();
+    }
 }
diff --git a/dd-smoke-tests/rum/tomcat-9/src/main/java/com/example/XmlServlet.java b/dd-smoke-tests/rum/tomcat-9/src/main/java/com/example/XmlServlet.java
index 8f7a02b7a6f..6949ae364dc 100644
--- a/dd-smoke-tests/rum/tomcat-9/src/main/java/com/example/XmlServlet.java
+++ b/dd-smoke-tests/rum/tomcat-9/src/main/java/com/example/XmlServlet.java
@@ -7,18 +7,18 @@
 import javax.servlet.http.HttpServletResponse;
 
 public class XmlServlet extends HttpServlet {
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-    resp.setContentType("application/xml;charset=UTF-8");
-    final PrintWriter out = resp.getWriter();
-    out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-    out.println("<response>");
-    out.println("    <status>success</status>");
-    out.println("    <message>RUM injection test</message>");
-    out.println("    <data>");
-    out.println("        <item id=\"1\">Test Item 1</item>");
-    out.println("        <item id=\"2\">Test Item 2</item>");
-    out.println("    </data>");
-    out.print("</response>");
-  }
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        resp.setContentType("application/xml;charset=UTF-8");
+        final PrintWriter out = resp.getWriter();
+        out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+        out.println("<response>");
+        out.println("    <status>success</status>");
+        out.println("    <message>RUM injection test</message>");
+        out.println("    <data>");
+        out.println("        <item id=\"1\">Test Item 1</item>");
+        out.println("        <item id=\"2\">Test Item 2</item>");
+        out.println("    </data>");
+        out.print("</response>");
+    }
 }
diff --git a/dd-smoke-tests/rum/wildfly-15/rum-ear/war/src/main/java/com/example/HtmlJspFilter.java b/dd-smoke-tests/rum/wildfly-15/rum-ear/war/src/main/java/com/example/HtmlJspFilter.java
index 84045a3f1c7..6adb9324d07 100644
--- a/dd-smoke-tests/rum/wildfly-15/rum-ear/war/src/main/java/com/example/HtmlJspFilter.java
+++ b/dd-smoke-tests/rum/wildfly-15/rum-ear/war/src/main/java/com/example/HtmlJspFilter.java
@@ -11,16 +11,15 @@
 
 @WebFilter(filterName = "test", value = "/*", asyncSupported = true)
 public class HtmlJspFilter implements Filter {
-  @Override
-  public void doFilter(
-      ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
-      throws IOException, ServletException {
-    final String uri = ((HttpServletRequest) servletRequest).getRequestURI();
-    if (uri.contains("/xml")) {
-      filterChain.doFilter(servletRequest, servletResponse);
-    } else {
-      // FIXME: async injection looks not working on wildfly
-      servletRequest.getRequestDispatcher("/jsp/html.jsp").forward(servletRequest, servletResponse);
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
+            throws IOException, ServletException {
+        final String uri = ((HttpServletRequest) servletRequest).getRequestURI();
+        if (uri.contains("/xml")) {
+            filterChain.doFilter(servletRequest, servletResponse);
+        } else {
+            // FIXME: async injection looks not working on wildfly
+            servletRequest.getRequestDispatcher("/jsp/html.jsp").forward(servletRequest, servletResponse);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/rum/wildfly-15/rum-ear/war/src/main/java/com/example/HtmlServlet.java b/dd-smoke-tests/rum/wildfly-15/rum-ear/war/src/main/java/com/example/HtmlServlet.java
index fd9846e4424..c32d5c73a82 100644
--- a/dd-smoke-tests/rum/wildfly-15/rum-ear/war/src/main/java/com/example/HtmlServlet.java
+++ b/dd-smoke-tests/rum/wildfly-15/rum-ear/war/src/main/java/com/example/HtmlServlet.java
@@ -9,7 +9,6 @@
 
 @WebServlet(value = "/html")
 public class HtmlServlet extends HttpServlet {
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-      throws ServletException, IOException {}
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {}
 }
diff --git a/dd-smoke-tests/rum/wildfly-15/rum-ear/war/src/main/java/com/example/XmlServlet.java b/dd-smoke-tests/rum/wildfly-15/rum-ear/war/src/main/java/com/example/XmlServlet.java
index ab0b2291744..b6597d8b4ae 100644
--- a/dd-smoke-tests/rum/wildfly-15/rum-ear/war/src/main/java/com/example/XmlServlet.java
+++ b/dd-smoke-tests/rum/wildfly-15/rum-ear/war/src/main/java/com/example/XmlServlet.java
@@ -9,10 +9,9 @@
 
 @WebServlet(value = "/xml")
 public class XmlServlet extends HttpServlet {
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-      throws ServletException, IOException {
-    resp.setContentType("text/xml");
-    resp.getWriter().print("<response><head></head></response>");
-  }
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        resp.setContentType("text/xml");
+        resp.getWriter().print("<response><head></head></response>");
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index 18fd1c962a1..50bdc554696 100644
--- a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -8,12 +8,12 @@
 
 @SpringBootApplication
 public class SpringbootApplication {
-  @Bean
-  public ConfigurableServletWebServerFactory webServerFactory() {
-    return new JettyServletWebServerFactory();
-  }
+    @Bean
+    public ConfigurableServletWebServerFactory webServerFactory() {
+        return new JettyServletWebServerFactory();
+    }
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/src/main/java/datadog/smoketest/springboot/controller/ServerController.java b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/src/main/java/datadog/smoketest/springboot/controller/ServerController.java
index 9d4fd23d5a2..78174518308 100644
--- a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/src/main/java/datadog/smoketest/springboot/controller/ServerController.java
+++ b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/src/main/java/datadog/smoketest/springboot/controller/ServerController.java
@@ -11,13 +11,13 @@
 @RequestMapping("hello")
 @Validated
 public class ServerController {
-  @RequestMapping("/not-found")
-  public String notFound() {
-    throw new ResponseStatusException(HttpStatus.NOT_FOUND, "entity not found");
-  }
+    @RequestMapping("/not-found")
+    public String notFound() {
+        throw new ResponseStatusException(HttpStatus.NOT_FOUND, "entity not found");
+    }
 
-  @RequestMapping("/not-here")
-  public ResponseEntity notHere() {
-    return new ResponseEntity("not here", HttpStatus.NOT_FOUND);
-  }
+    @RequestMapping("/not-here")
+    public ResponseEntity notHere() {
+        return new ResponseEntity("not here", HttpStatus.NOT_FOUND);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.4-webflux/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/spring-boot-2.4-webflux/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index c80e4cc2aa5..606974761ca 100644
--- a/dd-smoke-tests/spring-boot-2.4-webflux/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/spring-boot-2.4-webflux/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -6,7 +6,7 @@
 @SpringBootApplication
 public class SpringbootApplication {
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.4-webflux/src/main/java/datadog/smoketest/springboot/controller/WebController.java b/dd-smoke-tests/spring-boot-2.4-webflux/src/main/java/datadog/smoketest/springboot/controller/WebController.java
index 0eece392a91..6f8b72d4745 100644
--- a/dd-smoke-tests/spring-boot-2.4-webflux/src/main/java/datadog/smoketest/springboot/controller/WebController.java
+++ b/dd-smoke-tests/spring-boot-2.4-webflux/src/main/java/datadog/smoketest/springboot/controller/WebController.java
@@ -6,8 +6,8 @@
 @RestController
 public class WebController {
 
-  @RequestMapping("/hello")
-  public String hello() {
-    return "Hello world";
-  }
+    @RequestMapping("/hello")
+    public String hello() {
+        return "Hello world";
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.5-webflux/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/spring-boot-2.5-webflux/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index c80e4cc2aa5..606974761ca 100644
--- a/dd-smoke-tests/spring-boot-2.5-webflux/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/spring-boot-2.5-webflux/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -6,7 +6,7 @@
 @SpringBootApplication
 public class SpringbootApplication {
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.5-webflux/src/main/java/datadog/smoketest/springboot/controller/WebController.java b/dd-smoke-tests/spring-boot-2.5-webflux/src/main/java/datadog/smoketest/springboot/controller/WebController.java
index 0eece392a91..6f8b72d4745 100644
--- a/dd-smoke-tests/spring-boot-2.5-webflux/src/main/java/datadog/smoketest/springboot/controller/WebController.java
+++ b/dd-smoke-tests/spring-boot-2.5-webflux/src/main/java/datadog/smoketest/springboot/controller/WebController.java
@@ -6,8 +6,8 @@
 @RestController
 public class WebController {
 
-  @RequestMapping("/hello")
-  public String hello() {
-    return "Hello world";
-  }
+    @RequestMapping("/hello")
+    public String hello() {
+        return "Hello world";
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/AppInitializer.java b/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/AppInitializer.java
index a734f5bcd19..6a24fd5733c 100644
--- a/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/AppInitializer.java
+++ b/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/AppInitializer.java
@@ -7,16 +7,16 @@
 
 @Service
 public class AppInitializer implements InitializingBean {
-  private final FruitRepository fruitRepository;
+    private final FruitRepository fruitRepository;
 
-  public AppInitializer(FruitRepository fruitRepository) {
-    this.fruitRepository = fruitRepository;
-  }
+    public AppInitializer(FruitRepository fruitRepository) {
+        this.fruitRepository = fruitRepository;
+    }
 
-  @Override
-  public void afterPropertiesSet() throws Exception {
-    fruitRepository.save(new Fruit("apple"));
-    fruitRepository.save(new Fruit("banana"));
-    fruitRepository.save(new Fruit("orange"));
-  }
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        fruitRepository.save(new Fruit("apple"));
+        fruitRepository.save(new Fruit("banana"));
+        fruitRepository.save(new Fruit("orange"));
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index e26a5350e0e..a1d74d5f299 100644
--- a/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -8,7 +8,7 @@
 @EnableJpaRepositories
 public class SpringbootApplication {
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/controller/FruitRouter.java b/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/controller/FruitRouter.java
index 11db36448ec..2c82ddc344e 100644
--- a/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/controller/FruitRouter.java
+++ b/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/controller/FruitRouter.java
@@ -13,21 +13,16 @@
 
 @Configuration
 public class FruitRouter {
-  @Bean
-  RouterFunction<ServerResponse> routes(final FruitRepository repository) {
-    return route(
-            RequestPredicates.GET("/fruits"),
-            request ->
-                ServerResponse.ok()
-                    .body(Mono.fromSupplier(() -> repository.findAll()), Fruit.class))
-        .and(
-            route(
-                RequestPredicates.GET("/fruits/{name}"),
-                request ->
-                    ServerResponse.ok()
-                        .body(
-                            Mono.fromSupplier(
-                                () -> repository.findByName(request.pathVariable("name"))),
-                            Fruit.class)));
-  }
+    @Bean
+    RouterFunction<ServerResponse> routes(final FruitRepository repository) {
+        return route(
+                        RequestPredicates.GET("/fruits"),
+                        request -> ServerResponse.ok().body(Mono.fromSupplier(() -> repository.findAll()), Fruit.class))
+                .and(route(
+                        RequestPredicates.GET("/fruits/{name}"),
+                        request -> ServerResponse.ok()
+                                .body(
+                                        Mono.fromSupplier(() -> repository.findByName(request.pathVariable("name"))),
+                                        Fruit.class)));
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/controller/WebController.java b/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/controller/WebController.java
index 0eece392a91..6f8b72d4745 100644
--- a/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/controller/WebController.java
+++ b/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/controller/WebController.java
@@ -6,8 +6,8 @@
 @RestController
 public class WebController {
 
-  @RequestMapping("/hello")
-  public String hello() {
-    return "Hello world";
-  }
+    @RequestMapping("/hello")
+    public String hello() {
+        return "Hello world";
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/model/Fruit.java b/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/model/Fruit.java
index dd812103286..f04b6d88f5a 100644
--- a/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/model/Fruit.java
+++ b/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/model/Fruit.java
@@ -12,43 +12,45 @@
 @Table
 public class Fruit {
 
-  public Fruit() {}
-
-  public Fruit(@Nonnull String name) {
-    this.name = name;
-  }
-
-  @Id @GeneratedValue private Long id;
-
-  @Column(nullable = false)
-  private String name;
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    Fruit fruit = (Fruit) o;
-    return Objects.equals(id, fruit.id);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id);
-  }
+    public Fruit() {}
+
+    public Fruit(@Nonnull String name) {
+        this.name = name;
+    }
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @Column(nullable = false)
+    private String name;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Fruit fruit = (Fruit) o;
+        return Objects.equals(id, fruit.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java b/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
index 7d0a72e1c5d..d6928251386 100644
--- a/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
+++ b/dd-smoke-tests/spring-boot-2.6-webflux/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
@@ -8,5 +8,5 @@
 
 @Repository
 public interface FruitRepository extends PagingAndSortingRepository<Fruit, Long> {
-  Optional<Fruit> findByName(@Nonnull final String name);
+    Optional<Fruit> findByName(@Nonnull final String name);
 }
diff --git a/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/AppInitializer.java b/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/AppInitializer.java
index a734f5bcd19..6a24fd5733c 100644
--- a/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/AppInitializer.java
+++ b/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/AppInitializer.java
@@ -7,16 +7,16 @@
 
 @Service
 public class AppInitializer implements InitializingBean {
-  private final FruitRepository fruitRepository;
+    private final FruitRepository fruitRepository;
 
-  public AppInitializer(FruitRepository fruitRepository) {
-    this.fruitRepository = fruitRepository;
-  }
+    public AppInitializer(FruitRepository fruitRepository) {
+        this.fruitRepository = fruitRepository;
+    }
 
-  @Override
-  public void afterPropertiesSet() throws Exception {
-    fruitRepository.save(new Fruit("apple"));
-    fruitRepository.save(new Fruit("banana"));
-    fruitRepository.save(new Fruit("orange"));
-  }
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        fruitRepository.save(new Fruit("apple"));
+        fruitRepository.save(new Fruit("banana"));
+        fruitRepository.save(new Fruit("orange"));
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index 07e925357fb..384ce91aa48 100644
--- a/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -18,32 +18,32 @@
 @EnableJpaRepositories
 public class SpringbootApplication {
 
-  @Configuration
-  @ComponentScan(basePackages = {"datadog.smoketest.springboot.controller"})
-  public static class WebConfig extends WebMvcConfigurerAdapter {
+    @Configuration
+    @ComponentScan(basePackages = {"datadog.smoketest.springboot.controller"})
+    public static class WebConfig extends WebMvcConfigurerAdapter {
 
-    @Override
-    public void configurePathMatch(PathMatchConfigurer configurer) {
-      UrlPathHelper urlPathHelper = new UrlPathHelper();
-      urlPathHelper.setRemoveSemicolonContent(false);
-      configurer.setUrlPathHelper(urlPathHelper);
-    }
+        @Override
+        public void configurePathMatch(PathMatchConfigurer configurer) {
+            UrlPathHelper urlPathHelper = new UrlPathHelper();
+            urlPathHelper.setRemoveSemicolonContent(false);
+            configurer.setUrlPathHelper(urlPathHelper);
+        }
 
-    @Bean
-    public Controller simpleIastController() {
-      return new SimpleIastController();
-    }
+        @Bean
+        public Controller simpleIastController() {
+            return new SimpleIastController();
+        }
 
-    @Bean
-    public SimpleUrlHandlerMapping simpleMapping(Controller simpleIastController) {
-      SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
-      mapping.setUrlMap(Collections.singletonMap("/simple/{var1}", simpleIastController));
-      mapping.setOrder(0);
-      return mapping;
+        @Bean
+        public SimpleUrlHandlerMapping simpleMapping(Controller simpleIastController) {
+            SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
+            mapping.setUrlMap(Collections.singletonMap("/simple/{var1}", simpleIastController));
+            mapping.setOrder(0);
+            return mapping;
+        }
     }
-  }
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/controller/FruitController.java b/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/controller/FruitController.java
index 9818e3ef87d..1c57bb6dea0 100644
--- a/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/controller/FruitController.java
+++ b/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/controller/FruitController.java
@@ -12,22 +12,22 @@
 @RequestMapping("/fruits")
 public class FruitController {
 
-  private final FruitRepository fruitRepository;
+    private final FruitRepository fruitRepository;
 
-  public FruitController(FruitRepository fruitRepository) {
-    this.fruitRepository = fruitRepository;
-  }
+    public FruitController(FruitRepository fruitRepository) {
+        this.fruitRepository = fruitRepository;
+    }
 
-  @GetMapping
-  public Iterable<Fruit> listFruits() {
-    return fruitRepository.findAll();
-  }
+    @GetMapping
+    public Iterable<Fruit> listFruits() {
+        return fruitRepository.findAll();
+    }
 
-  @GetMapping("/{name}")
-  public ResponseEntity<Fruit> findOneFruit(@PathVariable("name") final String name) {
-    return fruitRepository
-        .findByName(name)
-        .map(ResponseEntity::ok)
-        .orElseGet(() -> ResponseEntity.notFound().build());
-  }
+    @GetMapping("/{name}")
+    public ResponseEntity<Fruit> findOneFruit(@PathVariable("name") final String name) {
+        return fruitRepository
+                .findByName(name)
+                .map(ResponseEntity::ok)
+                .orElseGet(() -> ResponseEntity.notFound().build());
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/model/Fruit.java b/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/model/Fruit.java
index dd812103286..f04b6d88f5a 100644
--- a/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/model/Fruit.java
+++ b/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/model/Fruit.java
@@ -12,43 +12,45 @@
 @Table
 public class Fruit {
 
-  public Fruit() {}
-
-  public Fruit(@Nonnull String name) {
-    this.name = name;
-  }
-
-  @Id @GeneratedValue private Long id;
-
-  @Column(nullable = false)
-  private String name;
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    Fruit fruit = (Fruit) o;
-    return Objects.equals(id, fruit.id);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id);
-  }
+    public Fruit() {}
+
+    public Fruit(@Nonnull String name) {
+        this.name = name;
+    }
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @Column(nullable = false)
+    private String name;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Fruit fruit = (Fruit) o;
+        return Objects.equals(id, fruit.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java b/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
index 7d0a72e1c5d..d6928251386 100644
--- a/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
+++ b/dd-smoke-tests/spring-boot-2.6-webmvc/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
@@ -8,5 +8,5 @@
 
 @Repository
 public interface FruitRepository extends PagingAndSortingRepository<Fruit, Long> {
-  Optional<Fruit> findByName(@Nonnull final String name);
+    Optional<Fruit> findByName(@Nonnull final String name);
 }
diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/AppInitializer.java b/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/AppInitializer.java
index a734f5bcd19..6a24fd5733c 100644
--- a/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/AppInitializer.java
+++ b/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/AppInitializer.java
@@ -7,16 +7,16 @@
 
 @Service
 public class AppInitializer implements InitializingBean {
-  private final FruitRepository fruitRepository;
+    private final FruitRepository fruitRepository;
 
-  public AppInitializer(FruitRepository fruitRepository) {
-    this.fruitRepository = fruitRepository;
-  }
+    public AppInitializer(FruitRepository fruitRepository) {
+        this.fruitRepository = fruitRepository;
+    }
 
-  @Override
-  public void afterPropertiesSet() throws Exception {
-    fruitRepository.save(new Fruit("apple"));
-    fruitRepository.save(new Fruit("banana"));
-    fruitRepository.save(new Fruit("orange"));
-  }
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        fruitRepository.save(new Fruit("apple"));
+        fruitRepository.save(new Fruit("banana"));
+        fruitRepository.save(new Fruit("orange"));
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index e26a5350e0e..a1d74d5f299 100644
--- a/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -8,7 +8,7 @@
 @EnableJpaRepositories
 public class SpringbootApplication {
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/controller/FruitRouter.java b/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/controller/FruitRouter.java
index 11db36448ec..2c82ddc344e 100644
--- a/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/controller/FruitRouter.java
+++ b/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/controller/FruitRouter.java
@@ -13,21 +13,16 @@
 
 @Configuration
 public class FruitRouter {
-  @Bean
-  RouterFunction<ServerResponse> routes(final FruitRepository repository) {
-    return route(
-            RequestPredicates.GET("/fruits"),
-            request ->
-                ServerResponse.ok()
-                    .body(Mono.fromSupplier(() -> repository.findAll()), Fruit.class))
-        .and(
-            route(
-                RequestPredicates.GET("/fruits/{name}"),
-                request ->
-                    ServerResponse.ok()
-                        .body(
-                            Mono.fromSupplier(
-                                () -> repository.findByName(request.pathVariable("name"))),
-                            Fruit.class)));
-  }
+    @Bean
+    RouterFunction<ServerResponse> routes(final FruitRepository repository) {
+        return route(
+                        RequestPredicates.GET("/fruits"),
+                        request -> ServerResponse.ok().body(Mono.fromSupplier(() -> repository.findAll()), Fruit.class))
+                .and(route(
+                        RequestPredicates.GET("/fruits/{name}"),
+                        request -> ServerResponse.ok()
+                                .body(
+                                        Mono.fromSupplier(() -> repository.findByName(request.pathVariable("name"))),
+                                        Fruit.class)));
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/controller/WebController.java b/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/controller/WebController.java
index 0eece392a91..6f8b72d4745 100644
--- a/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/controller/WebController.java
+++ b/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/controller/WebController.java
@@ -6,8 +6,8 @@
 @RestController
 public class WebController {
 
-  @RequestMapping("/hello")
-  public String hello() {
-    return "Hello world";
-  }
+    @RequestMapping("/hello")
+    public String hello() {
+        return "Hello world";
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/model/Fruit.java b/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/model/Fruit.java
index dd812103286..f04b6d88f5a 100644
--- a/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/model/Fruit.java
+++ b/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/model/Fruit.java
@@ -12,43 +12,45 @@
 @Table
 public class Fruit {
 
-  public Fruit() {}
-
-  public Fruit(@Nonnull String name) {
-    this.name = name;
-  }
-
-  @Id @GeneratedValue private Long id;
-
-  @Column(nullable = false)
-  private String name;
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    Fruit fruit = (Fruit) o;
-    return Objects.equals(id, fruit.id);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id);
-  }
+    public Fruit() {}
+
+    public Fruit(@Nonnull String name) {
+        this.name = name;
+    }
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @Column(nullable = false)
+    private String name;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Fruit fruit = (Fruit) o;
+        return Objects.equals(id, fruit.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java b/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
index 7d0a72e1c5d..d6928251386 100644
--- a/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
+++ b/dd-smoke-tests/spring-boot-2.7-webflux/application/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
@@ -8,5 +8,5 @@
 
 @Repository
 public interface FruitRepository extends PagingAndSortingRepository<Fruit, Long> {
-  Optional<Fruit> findByName(@Nonnull final String name);
+    Optional<Fruit> findByName(@Nonnull final String name);
 }
diff --git a/dd-smoke-tests/spring-boot-3.0-native/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/spring-boot-3.0-native/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index c80e4cc2aa5..606974761ca 100644
--- a/dd-smoke-tests/spring-boot-3.0-native/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/spring-boot-3.0-native/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -6,7 +6,7 @@
 @SpringBootApplication
 public class SpringbootApplication {
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-3.0-native/application/src/main/java/datadog/smoketest/springboot/controller/WebController.java b/dd-smoke-tests/spring-boot-3.0-native/application/src/main/java/datadog/smoketest/springboot/controller/WebController.java
index aeb28893799..8c2c1455041 100644
--- a/dd-smoke-tests/spring-boot-3.0-native/application/src/main/java/datadog/smoketest/springboot/controller/WebController.java
+++ b/dd-smoke-tests/spring-boot-3.0-native/application/src/main/java/datadog/smoketest/springboot/controller/WebController.java
@@ -6,18 +6,18 @@
 
 @RestController
 public class WebController {
-  @RequestMapping("/hello")
-  public String hello() {
-    return doHello();
-  }
+    @RequestMapping("/hello")
+    public String hello() {
+        return doHello();
+    }
 
-  @Trace
-  private String doHello() {
-    return sayHello();
-  }
+    @Trace
+    private String doHello() {
+        return sayHello();
+    }
 
-  /** DD_TRACE_METHOD="datadog.smoketest.springboot.controller.WebController[sayHello]" */
-  private String sayHello() {
-    return "Hello world";
-  }
+    /** DD_TRACE_METHOD="datadog.smoketest.springboot.controller.WebController[sayHello]" */
+    private String sayHello() {
+        return "Hello world";
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/AppInitializer.java b/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/AppInitializer.java
index a734f5bcd19..6a24fd5733c 100644
--- a/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/AppInitializer.java
+++ b/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/AppInitializer.java
@@ -7,16 +7,16 @@
 
 @Service
 public class AppInitializer implements InitializingBean {
-  private final FruitRepository fruitRepository;
+    private final FruitRepository fruitRepository;
 
-  public AppInitializer(FruitRepository fruitRepository) {
-    this.fruitRepository = fruitRepository;
-  }
+    public AppInitializer(FruitRepository fruitRepository) {
+        this.fruitRepository = fruitRepository;
+    }
 
-  @Override
-  public void afterPropertiesSet() throws Exception {
-    fruitRepository.save(new Fruit("apple"));
-    fruitRepository.save(new Fruit("banana"));
-    fruitRepository.save(new Fruit("orange"));
-  }
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        fruitRepository.save(new Fruit("apple"));
+        fruitRepository.save(new Fruit("banana"));
+        fruitRepository.save(new Fruit("orange"));
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index e26a5350e0e..a1d74d5f299 100644
--- a/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -8,7 +8,7 @@
 @EnableJpaRepositories
 public class SpringbootApplication {
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/controller/FruitRouter.java b/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/controller/FruitRouter.java
index 11db36448ec..2c82ddc344e 100644
--- a/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/controller/FruitRouter.java
+++ b/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/controller/FruitRouter.java
@@ -13,21 +13,16 @@
 
 @Configuration
 public class FruitRouter {
-  @Bean
-  RouterFunction<ServerResponse> routes(final FruitRepository repository) {
-    return route(
-            RequestPredicates.GET("/fruits"),
-            request ->
-                ServerResponse.ok()
-                    .body(Mono.fromSupplier(() -> repository.findAll()), Fruit.class))
-        .and(
-            route(
-                RequestPredicates.GET("/fruits/{name}"),
-                request ->
-                    ServerResponse.ok()
-                        .body(
-                            Mono.fromSupplier(
-                                () -> repository.findByName(request.pathVariable("name"))),
-                            Fruit.class)));
-  }
+    @Bean
+    RouterFunction<ServerResponse> routes(final FruitRepository repository) {
+        return route(
+                        RequestPredicates.GET("/fruits"),
+                        request -> ServerResponse.ok().body(Mono.fromSupplier(() -> repository.findAll()), Fruit.class))
+                .and(route(
+                        RequestPredicates.GET("/fruits/{name}"),
+                        request -> ServerResponse.ok()
+                                .body(
+                                        Mono.fromSupplier(() -> repository.findByName(request.pathVariable("name"))),
+                                        Fruit.class)));
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/controller/WebController.java b/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/controller/WebController.java
index 0eece392a91..6f8b72d4745 100644
--- a/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/controller/WebController.java
+++ b/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/controller/WebController.java
@@ -6,8 +6,8 @@
 @RestController
 public class WebController {
 
-  @RequestMapping("/hello")
-  public String hello() {
-    return "Hello world";
-  }
+    @RequestMapping("/hello")
+    public String hello() {
+        return "Hello world";
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/model/Fruit.java b/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/model/Fruit.java
index 32cae6ce653..cb6f27a853e 100644
--- a/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/model/Fruit.java
+++ b/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/model/Fruit.java
@@ -12,47 +12,49 @@
 @Table
 public class Fruit {
 
-  public Fruit() {}
+    public Fruit() {}
 
-  public Fruit(@Nonnull String name) {
-    this.name = name;
-  }
+    public Fruit(@Nonnull String name) {
+        this.name = name;
+    }
 
-  @Id @GeneratedValue private Long id;
+    @Id
+    @GeneratedValue
+    private Long id;
 
-  @Column(nullable = false)
-  private String name;
+    @Column(nullable = false)
+    private String name;
 
-  public Long getId() {
-    return id;
-  }
+    public Long getId() {
+        return id;
+    }
 
-  public void setId(Long id) {
-    this.id = id;
-  }
+    public void setId(Long id) {
+        this.id = id;
+    }
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 
-  public void setName(String name) {
-    this.name = name;
-  }
+    public void setName(String name) {
+        this.name = name;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Fruit fruit = (Fruit) o;
+        return Objects.equals(id, fruit.id);
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
     }
-    Fruit fruit = (Fruit) o;
-    return Objects.equals(id, fruit.id);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id);
-  }
 }
diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java b/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
index 0ae8142a77b..bc1f0cc2df7 100644
--- a/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
+++ b/dd-smoke-tests/spring-boot-3.0-webflux/application/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
@@ -8,5 +8,5 @@
 
 @Repository
 public interface FruitRepository extends CrudRepository<Fruit, Long> {
-  Optional<Fruit> findByName(@Nonnull final String name);
+    Optional<Fruit> findByName(@Nonnull final String name);
 }
diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/AppInitializer.java b/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/AppInitializer.java
index a734f5bcd19..6a24fd5733c 100644
--- a/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/AppInitializer.java
+++ b/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/AppInitializer.java
@@ -7,16 +7,16 @@
 
 @Service
 public class AppInitializer implements InitializingBean {
-  private final FruitRepository fruitRepository;
+    private final FruitRepository fruitRepository;
 
-  public AppInitializer(FruitRepository fruitRepository) {
-    this.fruitRepository = fruitRepository;
-  }
+    public AppInitializer(FruitRepository fruitRepository) {
+        this.fruitRepository = fruitRepository;
+    }
 
-  @Override
-  public void afterPropertiesSet() throws Exception {
-    fruitRepository.save(new Fruit("apple"));
-    fruitRepository.save(new Fruit("banana"));
-    fruitRepository.save(new Fruit("orange"));
-  }
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        fruitRepository.save(new Fruit("apple"));
+        fruitRepository.save(new Fruit("banana"));
+        fruitRepository.save(new Fruit("orange"));
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index e26a5350e0e..a1d74d5f299 100644
--- a/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -8,7 +8,7 @@
 @EnableJpaRepositories
 public class SpringbootApplication {
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/controller/FruitController.java b/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/controller/FruitController.java
index 9818e3ef87d..1c57bb6dea0 100644
--- a/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/controller/FruitController.java
+++ b/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/controller/FruitController.java
@@ -12,22 +12,22 @@
 @RequestMapping("/fruits")
 public class FruitController {
 
-  private final FruitRepository fruitRepository;
+    private final FruitRepository fruitRepository;
 
-  public FruitController(FruitRepository fruitRepository) {
-    this.fruitRepository = fruitRepository;
-  }
+    public FruitController(FruitRepository fruitRepository) {
+        this.fruitRepository = fruitRepository;
+    }
 
-  @GetMapping
-  public Iterable<Fruit> listFruits() {
-    return fruitRepository.findAll();
-  }
+    @GetMapping
+    public Iterable<Fruit> listFruits() {
+        return fruitRepository.findAll();
+    }
 
-  @GetMapping("/{name}")
-  public ResponseEntity<Fruit> findOneFruit(@PathVariable("name") final String name) {
-    return fruitRepository
-        .findByName(name)
-        .map(ResponseEntity::ok)
-        .orElseGet(() -> ResponseEntity.notFound().build());
-  }
+    @GetMapping("/{name}")
+    public ResponseEntity<Fruit> findOneFruit(@PathVariable("name") final String name) {
+        return fruitRepository
+                .findByName(name)
+                .map(ResponseEntity::ok)
+                .orElseGet(() -> ResponseEntity.notFound().build());
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/model/Fruit.java b/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/model/Fruit.java
index 32cae6ce653..cb6f27a853e 100644
--- a/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/model/Fruit.java
+++ b/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/model/Fruit.java
@@ -12,47 +12,49 @@
 @Table
 public class Fruit {
 
-  public Fruit() {}
+    public Fruit() {}
 
-  public Fruit(@Nonnull String name) {
-    this.name = name;
-  }
+    public Fruit(@Nonnull String name) {
+        this.name = name;
+    }
 
-  @Id @GeneratedValue private Long id;
+    @Id
+    @GeneratedValue
+    private Long id;
 
-  @Column(nullable = false)
-  private String name;
+    @Column(nullable = false)
+    private String name;
 
-  public Long getId() {
-    return id;
-  }
+    public Long getId() {
+        return id;
+    }
 
-  public void setId(Long id) {
-    this.id = id;
-  }
+    public void setId(Long id) {
+        this.id = id;
+    }
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 
-  public void setName(String name) {
-    this.name = name;
-  }
+    public void setName(String name) {
+        this.name = name;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Fruit fruit = (Fruit) o;
+        return Objects.equals(id, fruit.id);
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
     }
-    Fruit fruit = (Fruit) o;
-    return Objects.equals(id, fruit.id);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id);
-  }
 }
diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java b/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
index 0ae8142a77b..bc1f0cc2df7 100644
--- a/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
+++ b/dd-smoke-tests/spring-boot-3.0-webmvc/application/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
@@ -8,5 +8,5 @@
 
 @Repository
 public interface FruitRepository extends CrudRepository<Fruit, Long> {
-  Optional<Fruit> findByName(@Nonnull final String name);
+    Optional<Fruit> findByName(@Nonnull final String name);
 }
diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/AppInitializer.java b/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/AppInitializer.java
index a734f5bcd19..6a24fd5733c 100644
--- a/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/AppInitializer.java
+++ b/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/AppInitializer.java
@@ -7,16 +7,16 @@
 
 @Service
 public class AppInitializer implements InitializingBean {
-  private final FruitRepository fruitRepository;
+    private final FruitRepository fruitRepository;
 
-  public AppInitializer(FruitRepository fruitRepository) {
-    this.fruitRepository = fruitRepository;
-  }
+    public AppInitializer(FruitRepository fruitRepository) {
+        this.fruitRepository = fruitRepository;
+    }
 
-  @Override
-  public void afterPropertiesSet() throws Exception {
-    fruitRepository.save(new Fruit("apple"));
-    fruitRepository.save(new Fruit("banana"));
-    fruitRepository.save(new Fruit("orange"));
-  }
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        fruitRepository.save(new Fruit("apple"));
+        fruitRepository.save(new Fruit("banana"));
+        fruitRepository.save(new Fruit("orange"));
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index e26a5350e0e..a1d74d5f299 100644
--- a/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -8,7 +8,7 @@
 @EnableJpaRepositories
 public class SpringbootApplication {
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/controller/FormResponseController.java b/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/controller/FormResponseController.java
index 7dc045b0aac..792a2431be6 100644
--- a/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/controller/FormResponseController.java
+++ b/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/controller/FormResponseController.java
@@ -10,27 +10,27 @@
 
 @Controller
 public class FormResponseController {
-  private static final int RESPONSE_OFFSET = 6;
+    private static final int RESPONSE_OFFSET = 6;
 
-  private final SpringTemplateEngine templateEngine;
+    private final SpringTemplateEngine templateEngine;
 
-  public FormResponseController(SpringTemplateEngine templateEngine) {
-    this.templateEngine = templateEngine;
-  }
+    public FormResponseController(SpringTemplateEngine templateEngine) {
+        this.templateEngine = templateEngine;
+    }
 
-  @GetMapping("/form-response")
-  public void formResponse(HttpServletResponse response) throws IOException {
-    Context context = new Context(Locale.ROOT);
-    context.setVariable("returnUrl", "https://app.example.test/flows/complete?request=request-123");
-    context.setVariable("formAction", "https://provider.example.test/flows/continue");
-    context.setVariable("requestId", "request-123");
+    @GetMapping("/form-response")
+    public void formResponse(HttpServletResponse response) throws IOException {
+        Context context = new Context(Locale.ROOT);
+        context.setVariable("returnUrl", "https://app.example.test/flows/complete?request=request-123");
+        context.setVariable("formAction", "https://provider.example.test/flows/continue");
+        context.setVariable("requestId", "request-123");
 
-    String content = templateEngine.process("form-response", context);
-    // Exercise response writers that receive a slice of a reusable buffer.
-    char[] responseBuffer = new char[RESPONSE_OFFSET + content.length()];
-    content.getChars(0, content.length(), responseBuffer, RESPONSE_OFFSET);
+        String content = templateEngine.process("form-response", context);
+        // Exercise response writers that receive a slice of a reusable buffer.
+        char[] responseBuffer = new char[RESPONSE_OFFSET + content.length()];
+        content.getChars(0, content.length(), responseBuffer, RESPONSE_OFFSET);
 
-    response.setContentType("text/html");
-    response.getWriter().write(responseBuffer, RESPONSE_OFFSET, content.length());
-  }
+        response.setContentType("text/html");
+        response.getWriter().write(responseBuffer, RESPONSE_OFFSET, content.length());
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/controller/FruitController.java b/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/controller/FruitController.java
index 9818e3ef87d..1c57bb6dea0 100644
--- a/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/controller/FruitController.java
+++ b/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/controller/FruitController.java
@@ -12,22 +12,22 @@
 @RequestMapping("/fruits")
 public class FruitController {
 
-  private final FruitRepository fruitRepository;
+    private final FruitRepository fruitRepository;
 
-  public FruitController(FruitRepository fruitRepository) {
-    this.fruitRepository = fruitRepository;
-  }
+    public FruitController(FruitRepository fruitRepository) {
+        this.fruitRepository = fruitRepository;
+    }
 
-  @GetMapping
-  public Iterable<Fruit> listFruits() {
-    return fruitRepository.findAll();
-  }
+    @GetMapping
+    public Iterable<Fruit> listFruits() {
+        return fruitRepository.findAll();
+    }
 
-  @GetMapping("/{name}")
-  public ResponseEntity<Fruit> findOneFruit(@PathVariable("name") final String name) {
-    return fruitRepository
-        .findByName(name)
-        .map(ResponseEntity::ok)
-        .orElseGet(() -> ResponseEntity.notFound().build());
-  }
+    @GetMapping("/{name}")
+    public ResponseEntity<Fruit> findOneFruit(@PathVariable("name") final String name) {
+        return fruitRepository
+                .findByName(name)
+                .map(ResponseEntity::ok)
+                .orElseGet(() -> ResponseEntity.notFound().build());
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/model/Fruit.java b/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/model/Fruit.java
index 32cae6ce653..cb6f27a853e 100644
--- a/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/model/Fruit.java
+++ b/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/model/Fruit.java
@@ -12,47 +12,49 @@
 @Table
 public class Fruit {
 
-  public Fruit() {}
+    public Fruit() {}
 
-  public Fruit(@Nonnull String name) {
-    this.name = name;
-  }
+    public Fruit(@Nonnull String name) {
+        this.name = name;
+    }
 
-  @Id @GeneratedValue private Long id;
+    @Id
+    @GeneratedValue
+    private Long id;
 
-  @Column(nullable = false)
-  private String name;
+    @Column(nullable = false)
+    private String name;
 
-  public Long getId() {
-    return id;
-  }
+    public Long getId() {
+        return id;
+    }
 
-  public void setId(Long id) {
-    this.id = id;
-  }
+    public void setId(Long id) {
+        this.id = id;
+    }
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 
-  public void setName(String name) {
-    this.name = name;
-  }
+    public void setName(String name) {
+        this.name = name;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Fruit fruit = (Fruit) o;
+        return Objects.equals(id, fruit.id);
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
     }
-    Fruit fruit = (Fruit) o;
-    return Objects.equals(id, fruit.id);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id);
-  }
 }
diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java b/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
index 0ae8142a77b..bc1f0cc2df7 100644
--- a/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
+++ b/dd-smoke-tests/spring-boot-3.3-webmvc/application/src/main/java/datadog/smoketest/springboot/repository/FruitRepository.java
@@ -8,5 +8,5 @@
 
 @Repository
 public interface FruitRepository extends CrudRepository<Fruit, Long> {
-  Optional<Fruit> findByName(@Nonnull final String name);
+    Optional<Fruit> findByName(@Nonnull final String name);
 }
diff --git a/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index cc171aa557a..edacc382982 100644
--- a/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -5,7 +5,7 @@
 
 @SpringBootApplication
 public class SpringbootApplication {
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/controller/WebController.java b/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/controller/WebController.java
index 26231b9e3d4..71769387744 100644
--- a/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/controller/WebController.java
+++ b/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/controller/WebController.java
@@ -8,17 +8,17 @@
 
 @RestController
 public class WebController {
-  private final Sender sender;
-  private final Receiver receiver;
+    private final Sender sender;
+    private final Receiver receiver;
 
-  public WebController(Sender sender, Receiver receiver) {
-    this.sender = sender;
-    this.receiver = receiver;
-  }
+    public WebController(Sender sender, Receiver receiver) {
+        this.sender = sender;
+        this.receiver = receiver;
+    }
 
-  @RequestMapping("/roundtrip/{message}")
-  public String roundtrip(@PathVariable String message) throws InterruptedException {
-    sender.send(message);
-    return "Got: " + receiver.poll(5000);
-  }
+    @RequestMapping("/roundtrip/{message}")
+    public String roundtrip(@PathVariable String message) throws InterruptedException {
+        sender.send(message);
+        return "Got: " + receiver.poll(5000);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/rabbit/AppConfig.java b/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/rabbit/AppConfig.java
index 35707fa920c..01a245f364d 100644
--- a/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/rabbit/AppConfig.java
+++ b/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/rabbit/AppConfig.java
@@ -9,30 +9,30 @@
 @Configuration
 @PropertySource("application.properties")
 public class AppConfig {
-  @Value("${rabbit.sender.queue}")
-  private String senderQueueName;
+    @Value("${rabbit.sender.queue}")
+    private String senderQueueName;
 
-  public String getSenderQueueName() {
-    return senderQueueName;
-  }
+    public String getSenderQueueName() {
+        return senderQueueName;
+    }
 
-  @Value("${rabbit.receiver.queue}")
-  private String receiverQueueName;
+    @Value("${rabbit.receiver.queue}")
+    private String receiverQueueName;
 
-  @Value("${rabbit.receiver.forward}")
-  private boolean receiverForwardEnabled;
+    @Value("${rabbit.receiver.forward}")
+    private boolean receiverForwardEnabled;
 
-  public boolean isReceiverForwardEnabled() {
-    return receiverForwardEnabled;
-  }
+    public boolean isReceiverForwardEnabled() {
+        return receiverForwardEnabled;
+    }
 
-  @Bean
-  Queue senderQueue() {
-    return new Queue(senderQueueName);
-  }
+    @Bean
+    Queue senderQueue() {
+        return new Queue(senderQueueName);
+    }
 
-  @Bean
-  Queue receiverQueue() {
-    return new Queue(receiverQueueName);
-  }
+    @Bean
+    Queue receiverQueue() {
+        return new Queue(receiverQueueName);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/rabbit/Receiver.java b/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/rabbit/Receiver.java
index 64b8e889a97..e69a0174dbc 100644
--- a/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/rabbit/Receiver.java
+++ b/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/rabbit/Receiver.java
@@ -9,32 +9,32 @@
 @Component
 public class Receiver {
 
-  private final boolean forwardMessage;
-  private final String senderQueueName;
-  private final RabbitTemplate template;
-  private final LinkedBlockingQueue<String> queue;
+    private final boolean forwardMessage;
+    private final String senderQueueName;
+    private final RabbitTemplate template;
+    private final LinkedBlockingQueue<String> queue;
 
-  public Receiver(AppConfig config, RabbitTemplate template) {
-    this.forwardMessage = config.isReceiverForwardEnabled();
-    this.senderQueueName = config.getSenderQueueName();
-    this.template = template;
-    if (forwardMessage) {
-      this.queue = null;
-    } else {
-      this.queue = new LinkedBlockingQueue<>();
+    public Receiver(AppConfig config, RabbitTemplate template) {
+        this.forwardMessage = config.isReceiverForwardEnabled();
+        this.senderQueueName = config.getSenderQueueName();
+        this.template = template;
+        if (forwardMessage) {
+            this.queue = null;
+        } else {
+            this.queue = new LinkedBlockingQueue<>();
+        }
     }
-  }
 
-  @RabbitListener(queues = "${rabbit.receiver.queue}")
-  public void receiveMessage(String msg) {
-    if (forwardMessage) {
-      template.convertAndSend(senderQueueName, ">" + msg);
-    } else {
-      queue.add(msg);
+    @RabbitListener(queues = "${rabbit.receiver.queue}")
+    public void receiveMessage(String msg) {
+        if (forwardMessage) {
+            template.convertAndSend(senderQueueName, ">" + msg);
+        } else {
+            queue.add(msg);
+        }
     }
-  }
 
-  public String poll(long timeoutMillis) throws InterruptedException {
-    return queue.poll(timeoutMillis, TimeUnit.MILLISECONDS);
-  }
+    public String poll(long timeoutMillis) throws InterruptedException {
+        return queue.poll(timeoutMillis, TimeUnit.MILLISECONDS);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/rabbit/Sender.java b/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/rabbit/Sender.java
index bfbba81b3cc..6401d721958 100644
--- a/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/rabbit/Sender.java
+++ b/dd-smoke-tests/spring-boot-rabbit/src/main/java/datadog/smoketest/springboot/rabbit/Sender.java
@@ -5,15 +5,15 @@
 
 @Component
 public class Sender {
-  private final String queueName;
-  private final RabbitTemplate template;
+    private final String queueName;
+    private final RabbitTemplate template;
 
-  public Sender(AppConfig config, RabbitTemplate template) {
-    this.queueName = config.getSenderQueueName();
-    this.template = template;
-  }
+    public Sender(AppConfig config, RabbitTemplate template) {
+        this.queueName = config.getSenderQueueName();
+        this.template = template;
+    }
 
-  public void send(String message) {
-    template.convertAndSend(queueName, message);
-  }
+    public void send(String message) {
+        template.convertAndSend(queueName, message);
+    }
 }
diff --git a/dd-smoke-tests/spring-boot-rabbit/src/test/java/datadog/smoketest/SpringBootRabbitSmokeTest.java b/dd-smoke-tests/spring-boot-rabbit/src/test/java/datadog/smoketest/SpringBootRabbitSmokeTest.java
index b1213e7469d..4935ad76b39 100644
--- a/dd-smoke-tests/spring-boot-rabbit/src/test/java/datadog/smoketest/SpringBootRabbitSmokeTest.java
+++ b/dd-smoke-tests/spring-boot-rabbit/src/test/java/datadog/smoketest/SpringBootRabbitSmokeTest.java
@@ -73,138 +73,139 @@
  */
 @Testcontainers
 class SpringBootRabbitSmokeTest {
-  private static final String APPLICATION_JAR =
-      System.getProperty("datadog.smoketest.springboot.shadowJar.path");
-  private static final int TIMEOUT_SECONDS = 60;
-  private static final int RABBIT_AMQP_PORT = 5672;
-  private static final OkHttpClient CLIENT = new OkHttpClient();
-  // AMQP connection-setup / ack commands each app emits as its own (single-span) trace.
-  private static final String[] ADMIN_COMMANDS = {
-    "basic.qos", "basic.consume", "basic.ack", "queue.declare"
-  };
+    private static final String APPLICATION_JAR = System.getProperty("datadog.smoketest.springboot.shadowJar.path");
+    private static final int TIMEOUT_SECONDS = 60;
+    private static final int RABBIT_AMQP_PORT = 5672;
+    private static final OkHttpClient CLIENT = new OkHttpClient();
+    // AMQP connection-setup / ack commands each app emits as its own (single-span) trace.
+    private static final String[] ADMIN_COMMANDS = {"basic.qos", "basic.consume", "basic.ack", "queue.declare"};
 
-  @Container
-  private static final RabbitMQContainer RABBIT =
-      new RabbitMQContainer(
-          DockerImageName.parse(System.getProperty("test.rabbitmq.image"))
-              .asCompatibleSubstituteFor("rabbitmq"));
+    @Container
+    private static final RabbitMQContainer RABBIT = new RabbitMQContainer(
+            DockerImageName.parse(System.getProperty("test.rabbitmq.image")).asCompatibleSubstituteFor("rabbitmq"));
 
-  @Order(1)
-  @RegisterExtension
-  static final TestAgentBackend agent = AgentBackend.testAgentBuilder().retainAcrossTests().build();
+    @Order(1)
+    @RegisterExtension
+    static final TestAgentBackend agent =
+            AgentBackend.testAgentBuilder().retainAcrossTests().build();
 
-  @Order(2)
-  @RegisterExtension
-  static final SmokeServerApp sender =
-      rabbitApp(0).args("--rabbit.sender.queue=otherqueue").build();
+    @Order(2)
+    @RegisterExtension
+    static final SmokeServerApp sender =
+            rabbitApp(0).args("--rabbit.sender.queue=otherqueue").build();
 
-  @Order(3)
-  @RegisterExtension
-  static final SmokeServerApp receiver =
-      rabbitApp(1)
-          .args("--rabbit.receiver.queue=otherqueue", "--rabbit.receiver.forward=true")
-          .build();
+    @Order(3)
+    @RegisterExtension
+    static final SmokeServerApp receiver = rabbitApp(1)
+            .args("--rabbit.receiver.queue=otherqueue", "--rabbit.receiver.forward=true")
+            .build();
 
-  @Test
-  void roundTripsProduceFullAmqpTraceStructure() throws IOException {
-    // Drive 3 round-trips through the sender; each travels
-    // sender -> otherqueue -> receiver -> queue -> sender.
-    String[] messages = {"foo", "bar", "baz"};
-    for (String message : messages) {
-      Request request =
-          new Request.Builder().url(sender.url() + "/roundtrip/" + message).get().build();
-      try (Response response = CLIENT.newCall(request).execute()) {
-        assertEquals(200, response.code(), "round-trip " + message);
-        ResponseBody body = response.body();
-        assertNotNull(body, "round-trip " + message + " response body is null");
-        assertEquals("Got: >" + message, body.string(), "round-trip " + message);
-      }
-    }
+    @Test
+    void roundTripsProduceFullAmqpTraceStructure() throws IOException {
+        // Drive 3 round-trips through the sender; each travels
+        // sender -> otherqueue -> receiver -> queue -> sender.
+        String[] messages = {"foo", "bar", "baz"};
+        for (String message : messages) {
+            Request request = new Request.Builder()
+                    .url(sender.url() + "/roundtrip/" + message)
+                    .get()
+                    .build();
+            try (Response response = CLIENT.newCall(request).execute()) {
+                assertEquals(200, response.code(), "round-trip " + message);
+                ResponseBody body = response.body();
+                assertNotNull(body, "round-trip " + message + " response body is null");
+                assertEquals("Got: >" + message, body.string(), "round-trip " + message);
+            }
+        }
 
-    // One full round-trip trace per message, plus each service's connection-setup/ack commands.
-    List<TraceMatcher> expected = new ArrayList<>();
-    for (int i = 0; i < messages.length; i++) {
-      expected.add(roundTrip());
-    }
-    for (String service : new String[] {"spring-rabbit-0", "spring-rabbit-1"}) {
-      for (String command : ADMIN_COMMANDS) {
-        expected.add(admin(service, command));
-      }
+        // One full round-trip trace per message, plus each service's connection-setup/ack commands.
+        List<TraceMatcher> expected = new ArrayList<>();
+        for (int i = 0; i < messages.length; i++) {
+            expected.add(roundTrip());
+        }
+        for (String service : new String[] {"spring-rabbit-0", "spring-rabbit-1"}) {
+            for (String command : ADMIN_COMMANDS) {
+                expected.add(admin(service, command));
+            }
+        }
+        agent.traces()
+                .waitForTraces(
+                        TIMEOUT_SECONDS,
+                        o -> o.unorder().ignoreAdditionalTraces(),
+                        expected.toArray(new TraceMatcher[0]));
     }
-    agent
-        .traces()
-        .waitForTraces(
-            TIMEOUT_SECONDS,
-            o -> o.unorder().ignoreAdditionalTraces(),
-            expected.toArray(new TraceMatcher[0]));
-  }
 
-  // The full distributed round-trip: HTTP entrypoint -> publish -> receiver consumes and forwards
-  // -> sender consumes the reply. Each matcher after the root pins its parent to the preceding span
-  // with childOfPrevious(), so the chain asserts the cross-service linkage, not just the shape.
-  private static TraceMatcher roundTrip() {
-    return trace(
-        SORT_BY_ANCESTRY,
-        sp("spring-rabbit-0", "servlet.request", "GET /roundtrip/{message}").root(),
-        sp("spring-rabbit-0", "spring.handler", "WebController.roundtrip").childOfPrevious(),
-        sp("spring-rabbit-0", "amqp.command", "basic.publish <default> -> otherqueue")
-            .childOfPrevious(),
-        sp("rabbitmq", "amqp.deliver", "amqp.deliver otherqueue").childOfPrevious(),
-        sp("spring-rabbit-1", "amqp.command", "basic.deliver otherqueue").childOfPrevious(),
-        sp("spring-rabbit-1", "amqp.consume", "amqp.consume otherqueue").childOfPrevious(),
-        sp("spring-rabbit-1", "spring.consume", "Receiver.receiveMessage").childOfPrevious(),
-        sp("spring-rabbit-1", "amqp.command", "basic.publish <default> -> queue").childOfPrevious(),
-        sp("rabbitmq", "amqp.deliver", "amqp.deliver queue").childOfPrevious(),
-        sp("spring-rabbit-0", "amqp.command", "basic.deliver queue").childOfPrevious(),
-        sp("spring-rabbit-0", "amqp.consume", "amqp.consume queue").childOfPrevious(),
-        sp("spring-rabbit-0", "spring.consume", "Receiver.receiveMessage").childOfPrevious());
-  }
+    // The full distributed round-trip: HTTP entrypoint -> publish -> receiver consumes and forwards
+    // -> sender consumes the reply. Each matcher after the root pins its parent to the preceding span
+    // with childOfPrevious(), so the chain asserts the cross-service linkage, not just the shape.
+    private static TraceMatcher roundTrip() {
+        return trace(
+                SORT_BY_ANCESTRY,
+                sp("spring-rabbit-0", "servlet.request", "GET /roundtrip/{message}")
+                        .root(),
+                sp("spring-rabbit-0", "spring.handler", "WebController.roundtrip")
+                        .childOfPrevious(),
+                sp("spring-rabbit-0", "amqp.command", "basic.publish <default> -> otherqueue")
+                        .childOfPrevious(),
+                sp("rabbitmq", "amqp.deliver", "amqp.deliver otherqueue").childOfPrevious(),
+                sp("spring-rabbit-1", "amqp.command", "basic.deliver otherqueue")
+                        .childOfPrevious(),
+                sp("spring-rabbit-1", "amqp.consume", "amqp.consume otherqueue").childOfPrevious(),
+                sp("spring-rabbit-1", "spring.consume", "Receiver.receiveMessage")
+                        .childOfPrevious(),
+                sp("spring-rabbit-1", "amqp.command", "basic.publish <default> -> queue")
+                        .childOfPrevious(),
+                sp("rabbitmq", "amqp.deliver", "amqp.deliver queue").childOfPrevious(),
+                sp("spring-rabbit-0", "amqp.command", "basic.deliver queue").childOfPrevious(),
+                sp("spring-rabbit-0", "amqp.consume", "amqp.consume queue").childOfPrevious(),
+                sp("spring-rabbit-0", "spring.consume", "Receiver.receiveMessage")
+                        .childOfPrevious());
+    }
 
-  // A connection-setup / ack command emitted as its own single-span (root) trace.
-  private static TraceMatcher admin(String service, String command) {
-    return trace(sp(service, "amqp.command", command).root());
-  }
+    // A connection-setup / ack command emitted as its own single-span (root) trace.
+    private static TraceMatcher admin(String service, String command) {
+        return trace(sp(service, "amqp.command", command).root());
+    }
 
-  private static SpanMatcher sp(String service, String operation, String resource) {
-    SpanMatcher matcher = span().service(service).operationName(operation).resourceName(resource);
-    String type = spanType(operation);
-    if (type != null) {
-      matcher.type(type);
+    private static SpanMatcher sp(String service, String operation, String resource) {
+        SpanMatcher matcher = span().service(service).operationName(operation).resourceName(resource);
+        String type = spanType(operation);
+        if (type != null) {
+            matcher.type(type);
+        }
+        return matcher;
     }
-    return matcher;
-  }
 
-  private static String spanType(String operation) {
-    switch (operation) {
-      case "servlet.request":
-      case "spring.handler":
-        return "web";
-      case "amqp.command":
-      case "amqp.deliver":
-      case "spring.consume":
-        return "queue";
-      case "amqp.consume":
-      default:
-        return null;
+    private static String spanType(String operation) {
+        switch (operation) {
+            case "servlet.request":
+            case "spring.handler":
+                return "web";
+            case "amqp.command":
+            case "amqp.deliver":
+            case "spring.consume":
+                return "queue";
+            case "amqp.consume":
+            default:
+                return null;
+        }
     }
-  }
 
-  private static SmokeServerApp.Builder rabbitApp(int index) {
-    return SmokeServerApp.named("spring-rabbit-" + index)
-        .jar(APPLICATION_JAR)
-        .backend(agent)
-        .jvmArgs(
-            "-Ddd.service.name=spring-rabbit-" + index, "-Ddd.rabbit.legacy.tracing.enabled=false")
-        // Resolved at launch, after @Testcontainers has started RABBIT — not at build time.
-        .placeholder("rabbit.host", RABBIT::getHost)
-        .placeholder("rabbit.port", () -> String.valueOf(RABBIT.getMappedPort(RABBIT_AMQP_PORT)))
-        .args(
-            "--server.port=${app.httpPort}",
-            "--spring.rabbitmq.host=${rabbit.host}",
-            "--spring.rabbitmq.port=${rabbit.port}")
-        // The broker connection is torn down noisily when the app is killed at teardown.
-        .allowedErrorLogs(
-            "Failed to check/redeclare auto-delete queue(s)",
-            "An unexpected connection driver error occured");
-  }
+    private static SmokeServerApp.Builder rabbitApp(int index) {
+        return SmokeServerApp.named("spring-rabbit-" + index)
+                .jar(APPLICATION_JAR)
+                .backend(agent)
+                .jvmArgs("-Ddd.service.name=spring-rabbit-" + index, "-Ddd.rabbit.legacy.tracing.enabled=false")
+                // Resolved at launch, after @Testcontainers has started RABBIT — not at build time.
+                .placeholder("rabbit.host", RABBIT::getHost)
+                .placeholder("rabbit.port", () -> String.valueOf(RABBIT.getMappedPort(RABBIT_AMQP_PORT)))
+                .args(
+                        "--server.port=${app.httpPort}",
+                        "--spring.rabbitmq.host=${rabbit.host}",
+                        "--spring.rabbitmq.port=${rabbit.port}")
+                // The broker connection is torn down noisily when the app is killed at teardown.
+                .allowedErrorLogs(
+                        "Failed to check/redeclare auto-delete queue(s)",
+                        "An unexpected connection driver error occured");
+    }
 }
diff --git a/dd-smoke-tests/spring-security/src/main/java/com/example/jwt/MainController.java b/dd-smoke-tests/spring-security/src/main/java/com/example/jwt/MainController.java
index 38a7b157935..26b9be6035b 100644
--- a/dd-smoke-tests/spring-security/src/main/java/com/example/jwt/MainController.java
+++ b/dd-smoke-tests/spring-security/src/main/java/com/example/jwt/MainController.java
@@ -8,9 +8,9 @@
 @RestController
 public class MainController {
 
-  @GetMapping("/read")
-  public String read(Principal userPrincipal, JwtAuthenticationToken jwtToken) {
-    System.out.println("Token attributes: " + jwtToken.getTokenAttributes());
-    return "SuccesfulRead for " + userPrincipal.getName();
-  }
+    @GetMapping("/read")
+    public String read(Principal userPrincipal, JwtAuthenticationToken jwtToken) {
+        System.out.println("Token attributes: " + jwtToken.getTokenAttributes());
+        return "SuccesfulRead for " + userPrincipal.getName();
+    }
 }
diff --git a/dd-smoke-tests/spring-security/src/main/java/com/example/jwt/SecurityConfig.java b/dd-smoke-tests/spring-security/src/main/java/com/example/jwt/SecurityConfig.java
index 240daddf529..447c7bb69c3 100644
--- a/dd-smoke-tests/spring-security/src/main/java/com/example/jwt/SecurityConfig.java
+++ b/dd-smoke-tests/spring-security/src/main/java/com/example/jwt/SecurityConfig.java
@@ -29,63 +29,61 @@
 @Configuration
 public class SecurityConfig {
 
-  @Bean
-  public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
-    return httpSecurity
-        .authorizeHttpRequests(
-            authorize ->
-                authorize
-                    .mvcMatchers("/read/**")
-                    .hasAuthority("SCOPE_read")
-                    .anyRequest()
-                    .authenticated())
-        .oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt)
-        .build();
-  }
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
+        return httpSecurity
+                .authorizeHttpRequests(authorize -> authorize
+                        .mvcMatchers("/read/**")
+                        .hasAuthority("SCOPE_read")
+                        .anyRequest()
+                        .authenticated())
+                .oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt)
+                .build();
+    }
 
-  RSAPublicKey buildKey() {
-    try {
-      String publicKeyStr = System.getProperty("publickey");
-      System.out.println("Reading Public key: " + publicKeyStr);
-      byte[] publicKeyBytes = Base64.getDecoder().decode(publicKeyStr);
-      KeyFactory publicKeyFactory = KeyFactory.getInstance("RSA");
-      EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(publicKeyBytes);
-      return (RSAPublicKey) publicKeyFactory.generatePublic(publicKeySpec);
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+    RSAPublicKey buildKey() {
+        try {
+            String publicKeyStr = System.getProperty("publickey");
+            System.out.println("Reading Public key: " + publicKeyStr);
+            byte[] publicKeyBytes = Base64.getDecoder().decode(publicKeyStr);
+            KeyFactory publicKeyFactory = KeyFactory.getInstance("RSA");
+            EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(publicKeyBytes);
+            return (RSAPublicKey) publicKeyFactory.generatePublic(publicKeySpec);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  @Bean
-  public JwtDecoder jwtDecoder() {
+    @Bean
+    public JwtDecoder jwtDecoder() {
 
-    final NimbusJwtDecoder decoder = NimbusJwtDecoder.withPublicKey(buildKey()).build();
-    decoder.setJwtValidator(tokenValidator());
-    return decoder;
-  }
+        final NimbusJwtDecoder decoder =
+                NimbusJwtDecoder.withPublicKey(buildKey()).build();
+        decoder.setJwtValidator(tokenValidator());
+        return decoder;
+    }
 
-  public OAuth2TokenValidator<Jwt> tokenValidator() {
-    final List<OAuth2TokenValidator<Jwt>> validators = new Vector<>();
-    validators.add(new JwtTimestampValidator());
-    validators.add(new JwtIssuerValidator("http://foobar.com"));
-    validators.add(audienceValidator());
-    return new DelegatingOAuth2TokenValidator<>(validators);
-  }
+    public OAuth2TokenValidator<Jwt> tokenValidator() {
+        final List<OAuth2TokenValidator<Jwt>> validators = new Vector<>();
+        validators.add(new JwtTimestampValidator());
+        validators.add(new JwtIssuerValidator("http://foobar.com"));
+        validators.add(audienceValidator());
+        return new DelegatingOAuth2TokenValidator<>(validators);
+    }
 
-  public OAuth2TokenValidator<Jwt> audienceValidator() {
-    return new JwtClaimValidator<List<String>>(AUD, aud -> aud.contains("foobar"));
-  }
+    public OAuth2TokenValidator<Jwt> audienceValidator() {
+        return new JwtClaimValidator<List<String>>(AUD, aud -> aud.contains("foobar"));
+    }
 
-  @Bean
-  @Profile("roles")
-  public JwtAuthenticationConverter jwtAuthenticationConverter() {
-    final JwtGrantedAuthoritiesConverter grantedAuthoritiesConverter =
-        new JwtGrantedAuthoritiesConverter();
-    grantedAuthoritiesConverter.setAuthoritiesClaimName("authorities");
-    grantedAuthoritiesConverter.setAuthorityPrefix("ROLE_");
+    @Bean
+    @Profile("roles")
+    public JwtAuthenticationConverter jwtAuthenticationConverter() {
+        final JwtGrantedAuthoritiesConverter grantedAuthoritiesConverter = new JwtGrantedAuthoritiesConverter();
+        grantedAuthoritiesConverter.setAuthoritiesClaimName("authorities");
+        grantedAuthoritiesConverter.setAuthorityPrefix("ROLE_");
 
-    final JwtAuthenticationConverter jwtAuthenticationConverter = new JwtAuthenticationConverter();
-    jwtAuthenticationConverter.setJwtGrantedAuthoritiesConverter(grantedAuthoritiesConverter);
-    return jwtAuthenticationConverter;
-  }
+        final JwtAuthenticationConverter jwtAuthenticationConverter = new JwtAuthenticationConverter();
+        jwtAuthenticationConverter.setJwtGrantedAuthoritiesConverter(grantedAuthoritiesConverter);
+        return jwtAuthenticationConverter;
+    }
 }
diff --git a/dd-smoke-tests/spring-security/src/main/java/com/example/jwt/SecurityJwtDemoApplication.java b/dd-smoke-tests/spring-security/src/main/java/com/example/jwt/SecurityJwtDemoApplication.java
index 3be05069af8..d97b0e6ccc4 100644
--- a/dd-smoke-tests/spring-security/src/main/java/com/example/jwt/SecurityJwtDemoApplication.java
+++ b/dd-smoke-tests/spring-security/src/main/java/com/example/jwt/SecurityJwtDemoApplication.java
@@ -6,7 +6,7 @@
 @SpringBootApplication
 public class SecurityJwtDemoApplication {
 
-  public static void main(String[] args) {
-    SpringApplication.run(SecurityJwtDemoApplication.class, args);
-  }
+    public static void main(String[] args) {
+        SpringApplication.run(SecurityJwtDemoApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/spring-security/src/main/java/com/example/jwt/Token.java b/dd-smoke-tests/spring-security/src/main/java/com/example/jwt/Token.java
index 74c304bbcd5..8cf7fbc81a6 100644
--- a/dd-smoke-tests/spring-security/src/main/java/com/example/jwt/Token.java
+++ b/dd-smoke-tests/spring-security/src/main/java/com/example/jwt/Token.java
@@ -5,19 +5,19 @@
 import org.springframework.security.oauth2.jwt.Jwt;
 
 public class Token {
-  Jwt token;
-  Collection<GrantedAuthority> authorities;
+    Jwt token;
+    Collection<GrantedAuthority> authorities;
 
-  public Token(Jwt token, Collection<GrantedAuthority> authorities) {
-    this.token = token;
-    this.authorities = authorities;
-  }
+    public Token(Jwt token, Collection<GrantedAuthority> authorities) {
+        this.token = token;
+        this.authorities = authorities;
+    }
 
-  public Jwt token() {
-    return token;
-  }
+    public Jwt token() {
+        return token;
+    }
 
-  public Collection<GrantedAuthority> authorities() {
-    return authorities;
-  }
+    public Collection<GrantedAuthority> authorities() {
+        return authorities;
+    }
 }
diff --git a/dd-smoke-tests/springboot-freemarker/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-freemarker/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index 2b4e4de452a..196aa2cc240 100644
--- a/dd-smoke-tests/springboot-freemarker/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/springboot-freemarker/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -5,7 +5,7 @@
 
 @SpringBootApplication
 public class SpringbootApplication {
-  public static void main(String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/springboot-freemarker/application/src/main/java/datadog/smoketest/springboot/XssController.java b/dd-smoke-tests/springboot-freemarker/application/src/main/java/datadog/smoketest/springboot/XssController.java
index 4ddb2ae7915..7db33848dd0 100644
--- a/dd-smoke-tests/springboot-freemarker/application/src/main/java/datadog/smoketest/springboot/XssController.java
+++ b/dd-smoke-tests/springboot-freemarker/application/src/main/java/datadog/smoketest/springboot/XssController.java
@@ -17,21 +17,21 @@
 @RequestMapping("/xss")
 public class XssController {
 
-  private static final String DIRECTORY_TEMPLATES_TEST = "resources/main/templates";
-  private static final String DIRECTORY_TEMPLATES_RUN =
-      "dd-smoke-tests/springboot-freemarker/src/main/resources/templates";
+    private static final String DIRECTORY_TEMPLATES_TEST = "resources/main/templates";
+    private static final String DIRECTORY_TEMPLATES_RUN =
+            "dd-smoke-tests/springboot-freemarker/src/main/resources/templates";
 
-  @GetMapping(value = "/freemarker")
-  public void freemarker(
-      @RequestParam(name = "name") String name,
-      @RequestParam(name = "templateName") String templateName,
-      final HttpServletResponse response)
-      throws IOException, TemplateException {
-    Configuration cfg = new Configuration();
-    cfg.setDirectoryForTemplateLoading(new File(DIRECTORY_TEMPLATES_TEST));
-    Template template = cfg.getTemplate(templateName);
-    Map<String, String> root = new HashMap<>();
-    root.put("name", name);
-    template.process(root, response.getWriter());
-  }
+    @GetMapping(value = "/freemarker")
+    public void freemarker(
+            @RequestParam(name = "name") String name,
+            @RequestParam(name = "templateName") String templateName,
+            final HttpServletResponse response)
+            throws IOException, TemplateException {
+        Configuration cfg = new Configuration();
+        cfg.setDirectoryForTemplateLoading(new File(DIRECTORY_TEMPLATES_TEST));
+        Template template = cfg.getTemplate(templateName);
+        Map<String, String> root = new HashMap<>();
+        root.put("name", name);
+        template.process(root, response.getWriter());
+    }
 }
diff --git a/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/AsyncTask.java b/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/AsyncTask.java
index 6d086d5d874..2d954f41cc3 100644
--- a/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/AsyncTask.java
+++ b/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/AsyncTask.java
@@ -6,14 +6,14 @@
 
 public class AsyncTask {
 
-  private final AsynchronousGreeter greeter;
+    private final AsynchronousGreeter greeter;
 
-  public AsyncTask(AsynchronousGreeter greeter) {
-    this.greeter = greeter;
-  }
+    public AsyncTask(AsynchronousGreeter greeter) {
+        this.greeter = greeter;
+    }
 
-  @Async
-  public CompletableFuture<String> greet(String message) {
-    return CompletableFuture.completedFuture(greeter.greet(message));
-  }
+    @Async
+    public CompletableFuture<String> greet(String message) {
+        return CompletableFuture.completedFuture(greeter.greet(message));
+    }
 }
diff --git a/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/SpringbootGrpcApplication.java b/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/SpringbootGrpcApplication.java
index 8b463bd234f..349d9a62b2f 100644
--- a/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/SpringbootGrpcApplication.java
+++ b/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/SpringbootGrpcApplication.java
@@ -17,31 +17,30 @@
 @EnableScheduling
 public class SpringbootGrpcApplication {
 
-  @Bean
-  SpannerTask spannerTask() {
-    return new SpannerTask();
-  }
+    @Bean
+    SpannerTask spannerTask() {
+        return new SpannerTask();
+    }
 
-  @Bean
-  AsyncTask asyncTask(AsynchronousGreeter greeter) {
-    return new AsyncTask(greeter);
-  }
+    @Bean
+    AsyncTask asyncTask(AsynchronousGreeter greeter) {
+        return new AsyncTask(greeter);
+    }
 
-  @Bean
-  AsynchronousGreeter asynchronousGreeter(LocalInterface localInterface) {
-    return new AsynchronousGreeter(localInterface.getPort());
-  }
+    @Bean
+    AsynchronousGreeter asynchronousGreeter(LocalInterface localInterface) {
+        return new AsynchronousGreeter(localInterface.getPort());
+    }
 
-  @Bean
-  LocalInterface localInterface() throws IOException {
-    return new LocalInterface();
-  }
+    @Bean
+    LocalInterface localInterface() throws IOException {
+        return new LocalInterface();
+    }
 
-  public static void main(final String[] args) {
-    ConfigurableApplicationContext app =
-        SpringApplication.run(SpringbootGrpcApplication.class, args);
-    Integer port = app.getBean("local.server.port", Integer.class);
-    System.out.println(
-        "Bound to " + port + " in " + ManagementFactory.getRuntimeMXBean().getUptime() + "ms");
-  }
+    public static void main(final String[] args) {
+        ConfigurableApplicationContext app = SpringApplication.run(SpringbootGrpcApplication.class, args);
+        Integer port = app.getBean("local.server.port", Integer.class);
+        System.out.println("Bound to " + port + " in "
+                + ManagementFactory.getRuntimeMXBean().getUptime() + "ms");
+    }
 }
diff --git a/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/controller/WebController.java b/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/controller/WebController.java
index 242f61d2892..a85e18bb873 100644
--- a/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/controller/WebController.java
+++ b/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/controller/WebController.java
@@ -17,63 +17,60 @@
 @RestController
 public class WebController {
 
-  private final ExecutorService pool = Executors.newFixedThreadPool(5);
+    private final ExecutorService pool = Executors.newFixedThreadPool(5);
 
-  private final AsynchronousGreeter asyncGreeter;
-  private final AsyncTask asyncTask;
-  private final SpannerTask spannerTask;
+    private final AsynchronousGreeter asyncGreeter;
+    private final AsyncTask asyncTask;
+    private final SpannerTask spannerTask;
 
-  public WebController(
-      AsynchronousGreeter asyncGreeter, AsyncTask asyncTask, SpannerTask spannerTask) {
-    this.asyncGreeter = asyncGreeter;
-    this.asyncTask = asyncTask;
-    this.spannerTask = spannerTask;
-  }
-
-  @RequestMapping("/spanner")
-  public String spanner() {
-    spannerTask.spannerResultSet().thenAccept(results -> {}).join();
-    return "bye";
-  }
+    public WebController(AsynchronousGreeter asyncGreeter, AsyncTask asyncTask, SpannerTask spannerTask) {
+        this.asyncGreeter = asyncGreeter;
+        this.asyncTask = asyncTask;
+        this.spannerTask = spannerTask;
+    }
 
-  @RequestMapping("/async_cf_greeting")
-  public String asyncCompleteableFutureGreeting(
-      @RequestParam(value = "message", defaultValue = "aGVsbG8=" /*hello*/) final String message) {
-    final String decodedMsg = decodeBase64(message);
-    CompletableFuture<String>[] cfs = new CompletableFuture[20];
-    for (int i = 0; i < cfs.length; ++i) {
-      cfs[i] =
-          CompletableFuture.supplyAsync(() -> "something", pool)
-              .thenApplyAsync(x -> asyncGreeter.greet(decodedMsg), pool);
+    @RequestMapping("/spanner")
+    public String spanner() {
+        spannerTask.spannerResultSet().thenAccept(results -> {}).join();
+        return "bye";
     }
-    return CompletableFuture.allOf(cfs).thenApply(x -> "bye").join();
-  }
 
-  @RequestMapping("/async_concurrent_greeting")
-  @SuppressWarnings("unchecked")
-  public String asyncConcurrentGreeting(
-      @RequestParam(value = "message", defaultValue = "aGVsbG8=") final String message)
-      throws Exception {
-    // more tasks than threads to force some parallel activity
-    // onto the same threads
-    Future[] futures = new Future[20];
-    for (int i = 0; i < futures.length; ++i) {
-      futures[i] = pool.submit(() -> asyncGreeter.greet(decodeBase64(message)));
+    @RequestMapping("/async_cf_greeting")
+    public String asyncCompleteableFutureGreeting(
+            @RequestParam(value = "message", defaultValue = "aGVsbG8=" /*hello*/) final String message) {
+        final String decodedMsg = decodeBase64(message);
+        CompletableFuture<String>[] cfs = new CompletableFuture[20];
+        for (int i = 0; i < cfs.length; ++i) {
+            cfs[i] = CompletableFuture.supplyAsync(() -> "something", pool)
+                    .thenApplyAsync(x -> asyncGreeter.greet(decodedMsg), pool);
+        }
+        return CompletableFuture.allOf(cfs).thenApply(x -> "bye").join();
     }
-    String response = "";
-    for (Future<String> f : futures) {
-      response = f.get(30, TimeUnit.SECONDS);
+
+    @RequestMapping("/async_concurrent_greeting")
+    @SuppressWarnings("unchecked")
+    public String asyncConcurrentGreeting(
+            @RequestParam(value = "message", defaultValue = "aGVsbG8=") final String message) throws Exception {
+        // more tasks than threads to force some parallel activity
+        // onto the same threads
+        Future[] futures = new Future[20];
+        for (int i = 0; i < futures.length; ++i) {
+            futures[i] = pool.submit(() -> asyncGreeter.greet(decodeBase64(message)));
+        }
+        String response = "";
+        for (Future<String> f : futures) {
+            response = f.get(30, TimeUnit.SECONDS);
+        }
+        return response;
     }
-    return response;
-  }
 
-  @RequestMapping("async_annotation_greeting")
-  public String asyncAnnotationGreeting(
-      @RequestParam(value = "message", defaultValue = "aGVsbG8=") final String message) {
-    return asyncTask.greet(decodeBase64(message)).join();
-  }
+    @RequestMapping("async_annotation_greeting")
+    public String asyncAnnotationGreeting(
+            @RequestParam(value = "message", defaultValue = "aGVsbG8=") final String message) {
+        return asyncTask.greet(decodeBase64(message)).join();
+    }
 
-  private static String decodeBase64(String str) {
-    return new String(Base64.getDecoder().decode(str), StandardCharsets.US_ASCII);
-  }
+    private static String decodeBase64(String str) {
+        return new String(Base64.getDecoder().decode(str), StandardCharsets.US_ASCII);
+    }
 }
diff --git a/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/grpc/AsynchronousGreeter.java b/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/grpc/AsynchronousGreeter.java
index bc6471f1005..01ba2d1e087 100644
--- a/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/grpc/AsynchronousGreeter.java
+++ b/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/grpc/AsynchronousGreeter.java
@@ -9,45 +9,46 @@
 
 public class AsynchronousGreeter implements AutoCloseable {
 
-  private final ManagedChannel channel;
-  private final GreeterGrpc.GreeterStub impl;
-
-  public AsynchronousGreeter(int port) {
-    this.channel = ManagedChannelBuilder.forAddress("localhost", port).usePlaintext().build();
-    this.impl = GreeterGrpc.newStub(channel);
-  }
-
-  public String greet(String message) {
-    final AtomicReference<String> response = new AtomicReference<>();
-    final CountDownLatch latch = new CountDownLatch(1);
-    StreamObserver<Response> observer =
-        new StreamObserver<Response>() {
-          @Override
-          public void onNext(Response value) {
-            response.set(value.getMessage());
-          }
-
-          @Override
-          public void onError(Throwable t) {
-            throw new AssertionError(t);
-          }
-
-          @Override
-          public void onCompleted() {
-            latch.countDown();
-          }
+    private final ManagedChannel channel;
+    private final GreeterGrpc.GreeterStub impl;
+
+    public AsynchronousGreeter(int port) {
+        this.channel = ManagedChannelBuilder.forAddress("localhost", port)
+                .usePlaintext()
+                .build();
+        this.impl = GreeterGrpc.newStub(channel);
+    }
+
+    public String greet(String message) {
+        final AtomicReference<String> response = new AtomicReference<>();
+        final CountDownLatch latch = new CountDownLatch(1);
+        StreamObserver<Response> observer = new StreamObserver<Response>() {
+            @Override
+            public void onNext(Response value) {
+                response.set(value.getMessage());
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                throw new AssertionError(t);
+            }
+
+            @Override
+            public void onCompleted() {
+                latch.countDown();
+            }
         };
-    impl.hello(Request.newBuilder().setMessage(message).build(), observer);
-    try {
-      latch.await(30, TimeUnit.SECONDS);
-      return response.get();
-    } catch (InterruptedException e) {
-      return "timed out";
+        impl.hello(Request.newBuilder().setMessage(message).build(), observer);
+        try {
+            latch.await(30, TimeUnit.SECONDS);
+            return response.get();
+        } catch (InterruptedException e) {
+            return "timed out";
+        }
     }
-  }
 
-  @Override
-  public void close() {
-    channel.shutdown();
-  }
+    @Override
+    public void close() {
+        channel.shutdown();
+    }
 }
diff --git a/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/grpc/LocalInterface.java b/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/grpc/LocalInterface.java
index 29c83f67761..ae044af6cf3 100644
--- a/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/grpc/LocalInterface.java
+++ b/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/grpc/LocalInterface.java
@@ -9,27 +9,26 @@
 
 public class LocalInterface implements AutoCloseable {
 
-  private final Server server;
+    private final Server server;
 
-  public LocalInterface() throws IOException {
-    this.server = serverBuilder().addService(new Responder()).build().start();
-  }
+    public LocalInterface() throws IOException {
+        this.server = serverBuilder().addService(new Responder()).build().start();
+    }
 
-  public int getPort() {
-    return server.getPort();
-  }
+    public int getPort() {
+        return server.getPort();
+    }
 
-  private static NettyServerBuilder serverBuilder() {
-    try {
-      return NettyServerBuilder.forAddress(
-          new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 0));
-    } catch (UnknownHostException e) {
-      throw new AssertionError(e);
+    private static NettyServerBuilder serverBuilder() {
+        try {
+            return NettyServerBuilder.forAddress(new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 0));
+        } catch (UnknownHostException e) {
+            throw new AssertionError(e);
+        }
     }
-  }
 
-  @Override
-  public void close() {
-    server.shutdownNow();
-  }
+    @Override
+    public void close() {
+        server.shutdownNow();
+    }
 }
diff --git a/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/grpc/Responder.java b/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/grpc/Responder.java
index 5538fa493b2..ba2bb6a0e84 100644
--- a/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/grpc/Responder.java
+++ b/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/grpc/Responder.java
@@ -4,9 +4,9 @@
 
 public class Responder extends GreeterGrpc.GreeterImplBase {
 
-  @Override
-  public void hello(Request request, StreamObserver<Response> responseObserver) {
-    responseObserver.onNext(Response.newBuilder().setMessage("bye").build());
-    responseObserver.onCompleted();
-  }
+    @Override
+    public void hello(Request request, StreamObserver<Response> responseObserver) {
+        responseObserver.onNext(Response.newBuilder().setMessage("bye").build());
+        responseObserver.onCompleted();
+    }
 }
diff --git a/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/spanner/SpannerTask.java b/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/spanner/SpannerTask.java
index c7a57464888..057c4afa5dc 100644
--- a/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/spanner/SpannerTask.java
+++ b/dd-smoke-tests/springboot-grpc/src/main/java/datadog/smoketest/springboot/spanner/SpannerTask.java
@@ -11,22 +11,21 @@
 
 public class SpannerTask {
 
-  @Async
-  public CompletableFuture<ResultSet> spannerResultSet() {
-    return getSpannerResultSet();
-  }
+    @Async
+    public CompletableFuture<ResultSet> spannerResultSet() {
+        return getSpannerResultSet();
+    }
 
-  public CompletableFuture<ResultSet> getSpannerResultSet() {
-    SpannerOptions options = SpannerOptions.newBuilder().setProjectId("foo").build();
-    Spanner spanner = options.getService();
-    DatabaseId db = DatabaseId.of(options.getProjectId(), "", "");
-    DatabaseClient dbClient = spanner.getDatabaseClient(db);
+    public CompletableFuture<ResultSet> getSpannerResultSet() {
+        SpannerOptions options = SpannerOptions.newBuilder().setProjectId("foo").build();
+        Spanner spanner = options.getService();
+        DatabaseId db = DatabaseId.of(options.getProjectId(), "", "");
+        DatabaseClient dbClient = spanner.getDatabaseClient(db);
 
-    Statement sql =
-        Statement.newBuilder(
-                "SELECT table_name FROM information_schema.tables WHERE table_catalog = '' and table_schema = ''")
-            .build();
+        Statement sql = Statement.newBuilder(
+                        "SELECT table_name FROM information_schema.tables WHERE table_catalog = '' and table_schema = ''")
+                .build();
 
-    return CompletableFuture.completedFuture(dbClient.singleUse().executeQuery(sql));
-  }
+        return CompletableFuture.completedFuture(dbClient.singleUse().executeQuery(sql));
+    }
 }
diff --git a/dd-smoke-tests/springboot-java-11/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-java-11/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index 03cc9791085..dd73c9bb35e 100644
--- a/dd-smoke-tests/springboot-java-11/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/springboot-java-11/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -7,8 +7,8 @@
 @SpringBootApplication
 public class SpringbootApplication {
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-    System.out.println("Started in " + ManagementFactory.getRuntimeMXBean().getUptime() + "ms");
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+        System.out.println("Started in " + ManagementFactory.getRuntimeMXBean().getUptime() + "ms");
+    }
 }
diff --git a/dd-smoke-tests/springboot-java-17/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-java-17/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index 03cc9791085..dd73c9bb35e 100644
--- a/dd-smoke-tests/springboot-java-17/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/springboot-java-17/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -7,8 +7,8 @@
 @SpringBootApplication
 public class SpringbootApplication {
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-    System.out.println("Started in " + ManagementFactory.getRuntimeMXBean().getUptime() + "ms");
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+        System.out.println("Started in " + ManagementFactory.getRuntimeMXBean().getUptime() + "ms");
+    }
 }
diff --git a/dd-smoke-tests/springboot-jetty-jsp/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-jetty-jsp/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index 2b4e4de452a..196aa2cc240 100644
--- a/dd-smoke-tests/springboot-jetty-jsp/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/springboot-jetty-jsp/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -5,7 +5,7 @@
 
 @SpringBootApplication
 public class SpringbootApplication {
-  public static void main(String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/springboot-jetty-jsp/application/src/main/java/datadog/smoketest/springboot/ViewController.java b/dd-smoke-tests/springboot-jetty-jsp/application/src/main/java/datadog/smoketest/springboot/ViewController.java
index 2094d2e3dbe..bca539c7ed9 100644
--- a/dd-smoke-tests/springboot-jetty-jsp/application/src/main/java/datadog/smoketest/springboot/ViewController.java
+++ b/dd-smoke-tests/springboot-jetty-jsp/application/src/main/java/datadog/smoketest/springboot/ViewController.java
@@ -6,8 +6,8 @@
 @Controller
 public class ViewController {
 
-  @GetMapping("/test_xss_in_jsp")
-  public String test() {
-    return "test_xss";
-  }
+    @GetMapping("/test_xss_in_jsp")
+    public String test() {
+        return "test_xss";
+    }
 }
diff --git a/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index 7c858384413..8ca9d42b506 100644
--- a/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -9,12 +9,12 @@
 @SpringBootApplication
 public class SpringbootApplication {
 
-  @Bean
-  public Filter badBehaviorFilter() {
-    return new SessionVisitorFilter();
-  }
+    @Bean
+    public Filter badBehaviorFilter() {
+        return new SessionVisitorFilter();
+    }
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/controller/LibraryController.java b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/controller/LibraryController.java
index e8a6891ff32..cd6ac1b04b2 100644
--- a/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/controller/LibraryController.java
+++ b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/controller/LibraryController.java
@@ -29,86 +29,79 @@
 @RequiredArgsConstructor
 public class LibraryController {
 
-  public static final String COMMAND_NAME = "library";
+    public static final String COMMAND_NAME = "library";
 
-  private final LibraryService libraryService;
+    private final LibraryService libraryService;
 
-  @GetMapping("/{id}")
-  public ResponseEntity<Boolean> hasIssue(@PathVariable final int id) {
-    return ResponseEntity.ok(libraryService.findLibraryById(id).isIssueExists());
-  }
+    @GetMapping("/{id}")
+    public ResponseEntity<Boolean> hasIssue(@PathVariable final int id) {
+        return ResponseEntity.ok(libraryService.findLibraryById(id).isIssueExists());
+    }
 
-  @GetMapping
-  public ResponseEntity<Integer> create() {
-    final Library library =
-        Library.builder()
-            .books(
-                asList(
-                    Book.builder()
-                        .title("The Lord of the Rings")
-                        .owner(Owner.builder().name("Peter Jackson").build())
-                        .authors(
-                            asList(
-                                Author.builder().name("J.R.R Tolkien").build(),
-                                Author.builder().name("Peter Jackson").build()))
-                        .build(),
-                    Book.builder()
-                        .title("The Hobbit")
-                        .owner(Owner.builder().name("Edith Tolkien").build())
-                        .authors(
-                            asList(
-                                Author.builder().name("J.R.R Tolkien").build(),
-                                Author.builder().name("Edith Tolkien").build()))
-                        .build()))
-            .build();
-    libraryService.save(library);
-    return ResponseEntity.ok(library.getId());
-  }
+    @GetMapping
+    public ResponseEntity<Integer> create() {
+        final Library library = Library.builder()
+                .books(asList(
+                        Book.builder()
+                                .title("The Lord of the Rings")
+                                .owner(Owner.builder().name("Peter Jackson").build())
+                                .authors(asList(
+                                        Author.builder().name("J.R.R Tolkien").build(),
+                                        Author.builder().name("Peter Jackson").build()))
+                                .build(),
+                        Book.builder()
+                                .title("The Hobbit")
+                                .owner(Owner.builder().name("Edith Tolkien").build())
+                                .authors(asList(
+                                        Author.builder().name("J.R.R Tolkien").build(),
+                                        Author.builder().name("Edith Tolkien").build()))
+                                .build()))
+                .build();
+        libraryService.save(library);
+        return ResponseEntity.ok(library.getId());
+    }
 
-  @GetMapping("/update/{id}")
-  public String update(@PathVariable final int id, final ModelMap model) {
-    final Library library = libraryService.findLibraryById(id);
-    model.put(COMMAND_NAME, library);
-    return "update";
-  }
+    @GetMapping("/update/{id}")
+    public String update(@PathVariable final int id, final ModelMap model) {
+        final Library library = libraryService.findLibraryById(id);
+        model.put(COMMAND_NAME, library);
+        return "update";
+    }
 
-  @GetMapping("/update")
-  public String update(
-      @ModelAttribute(COMMAND_NAME) final Library library, final SessionStatus sessionStatus) {
-    libraryService.update(library);
-    sessionStatus.setComplete();
-    return "redirect:/library/" + library.getId();
-  }
+    @GetMapping("/update")
+    public String update(@ModelAttribute(COMMAND_NAME) final Library library, final SessionStatus sessionStatus) {
+        libraryService.update(library);
+        sessionStatus.setComplete();
+        return "redirect:/library/" + library.getId();
+    }
 
-  @GetMapping("/session/add/{id}")
-  public ResponseEntity<String> addToSession(
-      @RequestParam("mode") final String mode,
-      @PathVariable final int id,
-      final HttpServletRequest request) {
-    final Library library = libraryService.findLibraryById(id);
-    final Book book = library.getBooks().get(0);
-    final HttpSession session = request.getSession();
-    if (mode.equals("one-to-one")) {
-      session.setAttribute(mode, book.getOwner());
-    } else {
-      session.setAttribute(mode, book.getAuthors());
+    @GetMapping("/session/add/{id}")
+    public ResponseEntity<String> addToSession(
+            @RequestParam("mode") final String mode, @PathVariable final int id, final HttpServletRequest request) {
+        final Library library = libraryService.findLibraryById(id);
+        final Book book = library.getBooks().get(0);
+        final HttpSession session = request.getSession();
+        if (mode.equals("one-to-one")) {
+            session.setAttribute(mode, book.getOwner());
+        } else {
+            session.setAttribute(mode, book.getAuthors());
+        }
+        return ResponseEntity.ok("OK");
     }
-    return ResponseEntity.ok("OK");
-  }
 
-  @GetMapping("/session/validate")
-  public ResponseEntity<Boolean> validateSession(
-      @RequestParam("mode") final String mode, final HttpServletRequest request) {
-    final HttpSession session = request.getSession();
-    final Object sessionItem = session.getAttribute(mode);
-    final boolean loaded;
-    if (sessionItem instanceof Owner) {
-      final HibernateProxy proxy = (HibernateProxy) sessionItem;
-      loaded = !proxy.getHibernateLazyInitializer().isUninitialized();
-    } else {
-      final PersistentBag bag = (PersistentBag) sessionItem;
-      loaded = bag.wasInitialized();
+    @GetMapping("/session/validate")
+    public ResponseEntity<Boolean> validateSession(
+            @RequestParam("mode") final String mode, final HttpServletRequest request) {
+        final HttpSession session = request.getSession();
+        final Object sessionItem = session.getAttribute(mode);
+        final boolean loaded;
+        if (sessionItem instanceof Owner) {
+            final HibernateProxy proxy = (HibernateProxy) sessionItem;
+            loaded = !proxy.getHibernateLazyInitializer().isUninitialized();
+        } else {
+            final PersistentBag bag = (PersistentBag) sessionItem;
+            loaded = bag.wasInitialized();
+        }
+        return ResponseEntity.ok(loaded);
     }
-    return ResponseEntity.ok(loaded);
-  }
 }
diff --git a/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Author.java b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Author.java
index b6ea140035d..b0bbd7d3e2b 100644
--- a/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Author.java
+++ b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Author.java
@@ -20,15 +20,15 @@
 @EqualsAndHashCode(of = "id")
 public class Author {
 
-  @Id
-  @GeneratedValue(strategy = GenerationType.SEQUENCE)
-  private int id;
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    private int id;
 
-  private String name;
+    private String name;
 
-  private int updateCount;
+    private int updateCount;
 
-  public void increaseUpdateCount() {
-    this.updateCount++;
-  }
+    public void increaseUpdateCount() {
+        this.updateCount++;
+    }
 }
diff --git a/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Book.java b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Book.java
index 71e6f372df5..4aeb2fc71f7 100644
--- a/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Book.java
+++ b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Book.java
@@ -26,23 +26,23 @@
 @EqualsAndHashCode(of = "id")
 public class Book {
 
-  @Id
-  @GeneratedValue(strategy = GenerationType.SEQUENCE)
-  private int id;
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    private int id;
 
-  private String title;
+    private String title;
 
-  @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-  @JoinColumn(name = "book_id")
-  private List<Author> authors;
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @JoinColumn(name = "book_id")
+    private List<Author> authors;
 
-  @OneToOne(cascade = CascadeType.ALL, optional = false, fetch = FetchType.LAZY)
-  @JoinColumn(name = "owner_id")
-  private Owner owner;
+    @OneToOne(cascade = CascadeType.ALL, optional = false, fetch = FetchType.LAZY)
+    @JoinColumn(name = "owner_id")
+    private Owner owner;
 
-  private int updateCount;
+    private int updateCount;
 
-  public void increaseUpdateCount() {
-    this.updateCount++;
-  }
+    public void increaseUpdateCount() {
+        this.updateCount++;
+    }
 }
diff --git a/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Library.java b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Library.java
index 75393946476..36a46a8f25d 100644
--- a/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Library.java
+++ b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Library.java
@@ -24,33 +24,33 @@
 @EqualsAndHashCode(of = "id")
 public class Library {
 
-  @Id
-  @GeneratedValue(strategy = GenerationType.SEQUENCE)
-  private int id;
-
-  private String name;
-
-  @OneToMany(cascade = CascadeType.ALL)
-  @JoinColumn(name = "library_id")
-  private List<Book> books;
-
-  private int updateCount;
-
-  public void increaseUpdateCount() {
-    this.updateCount++;
-  }
-
-  public boolean isIssueExists() {
-    for (Book book : this.getBooks()) {
-      if (book.getUpdateCount() != book.getOwner().getUpdateCount()) {
-        return true;
-      }
-      for (Author author : book.getAuthors()) {
-        if (book.getUpdateCount() != author.getUpdateCount()) {
-          return true;
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    private int id;
+
+    private String name;
+
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "library_id")
+    private List<Book> books;
+
+    private int updateCount;
+
+    public void increaseUpdateCount() {
+        this.updateCount++;
+    }
+
+    public boolean isIssueExists() {
+        for (Book book : this.getBooks()) {
+            if (book.getUpdateCount() != book.getOwner().getUpdateCount()) {
+                return true;
+            }
+            for (Author author : book.getAuthors()) {
+                if (book.getUpdateCount() != author.getUpdateCount()) {
+                    return true;
+                }
+            }
         }
-      }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Owner.java b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Owner.java
index 5273fe7c76d..7813a7ee780 100644
--- a/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Owner.java
+++ b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Owner.java
@@ -20,15 +20,15 @@
 @EqualsAndHashCode(of = "id")
 public class Owner {
 
-  @Id
-  @GeneratedValue(strategy = GenerationType.SEQUENCE)
-  private int id;
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    private int id;
 
-  private String name;
+    private String name;
 
-  private int updateCount;
+    private int updateCount;
 
-  public void increaseUpdateCount() {
-    this.updateCount++;
-  }
+    public void increaseUpdateCount() {
+        this.updateCount++;
+    }
 }
diff --git a/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/filter/SessionVisitorFilter.java b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/filter/SessionVisitorFilter.java
index 421d5ff041b..41f68eb65a6 100644
--- a/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/filter/SessionVisitorFilter.java
+++ b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/filter/SessionVisitorFilter.java
@@ -20,102 +20,103 @@
  */
 public class SessionVisitorFilter extends OncePerRequestFilter {
 
-  @Override
-  protected void doFilterInternal(
-      HttpServletRequest request, final HttpServletResponse response, final FilterChain filterChain)
-      throws ServletException, IOException {
-    request = hasSessionHeader(request) ? new RequestWrapper(request) : request;
-    filterChain.doFilter(request, response);
-  }
-
-  private static boolean hasSessionHeader(final HttpServletRequest request) {
-    return request.getHeader("X-Session-Visitor") != null;
-  }
-
-  private static class RequestWrapper extends HttpServletRequestWrapper {
-    public RequestWrapper(HttpServletRequest request) {
-      super(request);
-    }
-
     @Override
-    public HttpSession getSession(boolean create) {
-      return wrapSession(super.getSession(create));
+    protected void doFilterInternal(
+            HttpServletRequest request, final HttpServletResponse response, final FilterChain filterChain)
+            throws ServletException, IOException {
+        request = hasSessionHeader(request) ? new RequestWrapper(request) : request;
+        filterChain.doFilter(request, response);
     }
 
-    @Override
-    public HttpSession getSession() {
-      return wrapSession(super.getSession());
+    private static boolean hasSessionHeader(final HttpServletRequest request) {
+        return request.getHeader("X-Session-Visitor") != null;
     }
 
-    private HttpSession wrapSession(final HttpSession session) {
-      if (session == null || session instanceof SessionWrapper) {
-        return session;
-      }
-      return new SessionWrapper(session);
-    }
-  }
+    private static class RequestWrapper extends HttpServletRequestWrapper {
+        public RequestWrapper(HttpServletRequest request) {
+            super(request);
+        }
 
-  private static class SessionWrapper implements HttpSession {
+        @Override
+        public HttpSession getSession(boolean create) {
+            return wrapSession(super.getSession(create));
+        }
 
-    @Delegate private final HttpSession delegate;
+        @Override
+        public HttpSession getSession() {
+            return wrapSession(super.getSession());
+        }
 
-    private SessionWrapper(final HttpSession delegate) {
-      this.delegate = delegate;
+        private HttpSession wrapSession(final HttpSession session) {
+            if (session == null || session instanceof SessionWrapper) {
+                return session;
+            }
+            return new SessionWrapper(session);
+        }
     }
 
-    public void setAttribute(final String name, final Object value) {
-      new DumbVisitor().visit(value);
-      delegate.setAttribute(name, value);
-    }
-  }
+    private static class SessionWrapper implements HttpSession {
 
-  /**
-   * Extremely unsafe visitor class used to trigger some bad behaviour with Hibernate and lazy
-   * properties
-   */
-  private static class DumbVisitor {
-    private final Set<Object> visited = new HashSet<>();
+        @Delegate
+        private final HttpSession delegate;
 
-    public void visit(final Object value) {
-      if (value == null || visited.contains(value)) {
-        return;
-      }
-      visited.add(value);
-      if (value.getClass().isArray()) {
-        for (Object item : (Object[]) value) {
-          visitObject(item);
-        }
-      } else if (value instanceof Iterable) {
-        for (Object item : (Iterable<?>) value) {
-          visitObject(item);
+        private SessionWrapper(final HttpSession delegate) {
+            this.delegate = delegate;
         }
-      } else if (value instanceof Map) {
-        for (Object item : ((Map<?, ?>) value).values()) {
-          visitObject(item);
+
+        public void setAttribute(final String name, final Object value) {
+            new DumbVisitor().visit(value);
+            delegate.setAttribute(name, value);
         }
-      } else {
-        visitObject(value);
-      }
     }
 
-    private void visitObject(final Object object) {
-      // ignore java types
-      if (object.getClass().getName().startsWith("java.")) {
-        return;
-      }
-      Class<?> klass = object.getClass();
-      while (klass != Object.class) {
-        for (final Field field : klass.getDeclaredFields()) {
-          try {
-            field.setAccessible(true);
-            final Object value = field.get(object);
-            visit(value);
-          } catch (final Throwable e) {
-            // ignore it
-          }
+    /**
+     * Extremely unsafe visitor class used to trigger some bad behaviour with Hibernate and lazy
+     * properties
+     */
+    private static class DumbVisitor {
+        private final Set<Object> visited = new HashSet<>();
+
+        public void visit(final Object value) {
+            if (value == null || visited.contains(value)) {
+                return;
+            }
+            visited.add(value);
+            if (value.getClass().isArray()) {
+                for (Object item : (Object[]) value) {
+                    visitObject(item);
+                }
+            } else if (value instanceof Iterable) {
+                for (Object item : (Iterable<?>) value) {
+                    visitObject(item);
+                }
+            } else if (value instanceof Map) {
+                for (Object item : ((Map<?, ?>) value).values()) {
+                    visitObject(item);
+                }
+            } else {
+                visitObject(value);
+            }
+        }
+
+        private void visitObject(final Object object) {
+            // ignore java types
+            if (object.getClass().getName().startsWith("java.")) {
+                return;
+            }
+            Class<?> klass = object.getClass();
+            while (klass != Object.class) {
+                for (final Field field : klass.getDeclaredFields()) {
+                    try {
+                        field.setAccessible(true);
+                        final Object value = field.get(object);
+                        visit(value);
+                    } catch (final Throwable e) {
+                        // ignore it
+                    }
+                }
+                klass = klass.getSuperclass();
+            }
         }
-        klass = klass.getSuperclass();
-      }
     }
-  }
 }
diff --git a/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/service/LibraryService.java b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/service/LibraryService.java
index 1f211db1753..69e4757545e 100644
--- a/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/service/LibraryService.java
+++ b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/service/LibraryService.java
@@ -11,33 +11,30 @@
 @Service
 public class LibraryService {
 
-  @PersistenceContext private EntityManager em;
+    @PersistenceContext
+    private EntityManager em;
 
-  @Transactional
-  public void save(final Library library) {
-    em.persist(library);
-  }
+    @Transactional
+    public void save(final Library library) {
+        em.persist(library);
+    }
 
-  @Transactional
-  public Library update(Library library) {
-    library.increaseUpdateCount();
-    library.getBooks().forEach(Book::increaseUpdateCount);
-    library.getBooks().stream()
-        .map(Book::getId)
-        .map(this::findBookById)
-        .forEach(
-            book -> {
-              book.getAuthors().forEach(Author::increaseUpdateCount);
-              book.getOwner().increaseUpdateCount();
-            });
-    return em.merge(library);
-  }
+    @Transactional
+    public Library update(Library library) {
+        library.increaseUpdateCount();
+        library.getBooks().forEach(Book::increaseUpdateCount);
+        library.getBooks().stream().map(Book::getId).map(this::findBookById).forEach(book -> {
+            book.getAuthors().forEach(Author::increaseUpdateCount);
+            book.getOwner().increaseUpdateCount();
+        });
+        return em.merge(library);
+    }
 
-  public Library findLibraryById(int id) {
-    return em.find(Library.class, id);
-  }
+    public Library findLibraryById(int id) {
+        return em.find(Library.class, id);
+    }
 
-  public Book findBookById(int id) {
-    return em.find(Book.class, id);
-  }
+    public Book findBookById(int id) {
+        return em.find(Book.class, id);
+    }
 }
diff --git a/dd-smoke-tests/springboot-mongo/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-mongo/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index c80e4cc2aa5..606974761ca 100644
--- a/dd-smoke-tests/springboot-mongo/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/springboot-mongo/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -6,7 +6,7 @@
 @SpringBootApplication
 public class SpringbootApplication {
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/springboot-mongo/src/main/java/datadog/smoketest/springboot/controller/WebController.java b/dd-smoke-tests/springboot-mongo/src/main/java/datadog/smoketest/springboot/controller/WebController.java
index 25400410e47..37feee97377 100644
--- a/dd-smoke-tests/springboot-mongo/src/main/java/datadog/smoketest/springboot/controller/WebController.java
+++ b/dd-smoke-tests/springboot-mongo/src/main/java/datadog/smoketest/springboot/controller/WebController.java
@@ -13,20 +13,21 @@
 @RestController
 public class WebController {
 
-  @Autowired DocRepository docRepository;
+    @Autowired
+    DocRepository docRepository;
 
-  @RequestMapping("/docs")
-  public List<Doc> getDocs() {
-    return docRepository.findAll();
-  }
+    @RequestMapping("/docs")
+    public List<Doc> getDocs() {
+        return docRepository.findAll();
+    }
 
-  @RequestMapping("/docs/{id}")
-  public Doc getDoc(@PathVariable String id) {
-    return docRepository.findById(id).orElse(null);
-  }
+    @RequestMapping("/docs/{id}")
+    public Doc getDoc(@PathVariable String id) {
+        return docRepository.findById(id).orElse(null);
+    }
 
-  @PostMapping("/docs")
-  public Doc putDoc(@RequestBody String name) {
-    return docRepository.save(new Doc(name));
-  }
+    @PostMapping("/docs")
+    public Doc putDoc(@RequestBody String name) {
+        return docRepository.save(new Doc(name));
+    }
 }
diff --git a/dd-smoke-tests/springboot-mongo/src/main/java/datadog/smoketest/springboot/mongo/Doc.java b/dd-smoke-tests/springboot-mongo/src/main/java/datadog/smoketest/springboot/mongo/Doc.java
index cdfc501e6e0..38c7d5f62b3 100644
--- a/dd-smoke-tests/springboot-mongo/src/main/java/datadog/smoketest/springboot/mongo/Doc.java
+++ b/dd-smoke-tests/springboot-mongo/src/main/java/datadog/smoketest/springboot/mongo/Doc.java
@@ -4,15 +4,16 @@
 
 public class Doc {
 
-  @Id public String id;
+    @Id
+    public String id;
 
-  public String name;
+    public String name;
 
-  public void setName(String name) {
-    this.name = name;
-  }
+    public void setName(String name) {
+        this.name = name;
+    }
 
-  public Doc(String name) {
-    this.name = name;
-  }
+    public Doc(String name) {
+        this.name = name;
+    }
 }
diff --git a/dd-smoke-tests/springboot-openliberty-20/application/src/main/java/com/openliberty/demo/Application.java b/dd-smoke-tests/springboot-openliberty-20/application/src/main/java/com/openliberty/demo/Application.java
index b43b6a99076..163b39e1d24 100644
--- a/dd-smoke-tests/springboot-openliberty-20/application/src/main/java/com/openliberty/demo/Application.java
+++ b/dd-smoke-tests/springboot-openliberty-20/application/src/main/java/com/openliberty/demo/Application.java
@@ -7,7 +7,7 @@
 @SpringBootApplication
 @Slf4j
 public class Application {
-  public static void main(String[] args) {
-    SpringApplication.run(Application.class, args);
-  }
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
 }
diff --git a/dd-smoke-tests/springboot-openliberty-20/application/src/main/java/com/openliberty/demo/DemoController.java b/dd-smoke-tests/springboot-openliberty-20/application/src/main/java/com/openliberty/demo/DemoController.java
index c35dc1cbe04..e928702a34b 100644
--- a/dd-smoke-tests/springboot-openliberty-20/application/src/main/java/com/openliberty/demo/DemoController.java
+++ b/dd-smoke-tests/springboot-openliberty-20/application/src/main/java/com/openliberty/demo/DemoController.java
@@ -12,43 +12,43 @@
 @RestController
 @Slf4j
 public class DemoController {
-  private int[] users;
-  private final int MAX_REQUESTS = 100000000;
-
-  @Value("${server.port}")
-  private String httpPort;
-
-  public DemoController() {
-    this.users = new int[100];
-  }
-
-  @RequestMapping("/connect")
-  public String connect() {
-    int userId = new Random().nextInt(users.length);
-    log.info(String.format("Length:%d", this.users.length));
-    log.info(String.format("Visiting user with userid:%d", userId));
-    RestTemplate restTemplate = new RestTemplate();
-    String uri = String.format("http://localhost:%s/connect/%d", this.httpPort, userId);
-
-    log.info(String.format("uri:%s", uri));
-    String result = restTemplate.getForObject(uri, String.class);
-    return result;
-  }
-
-  @RequestMapping("/connect/{user}")
-  public String connectFinal(@PathVariable("user") final int user) {
-    int visitID = this.users[user]++ % MAX_REQUESTS;
-    log.info("User {} visited {} times", user, visitID);
-    return String.format("%d:%d", user, visitID);
-  }
-
-  @RequestMapping("/vulnerability")
-  public String vulnerability() {
-    try {
-      MessageDigest.getInstance("MD5");
-    } catch (Exception e) {
-      return e.toString();
+    private int[] users;
+    private final int MAX_REQUESTS = 100000000;
+
+    @Value("${server.port}")
+    private String httpPort;
+
+    public DemoController() {
+        this.users = new int[100];
+    }
+
+    @RequestMapping("/connect")
+    public String connect() {
+        int userId = new Random().nextInt(users.length);
+        log.info(String.format("Length:%d", this.users.length));
+        log.info(String.format("Visiting user with userid:%d", userId));
+        RestTemplate restTemplate = new RestTemplate();
+        String uri = String.format("http://localhost:%s/connect/%d", this.httpPort, userId);
+
+        log.info(String.format("uri:%s", uri));
+        String result = restTemplate.getForObject(uri, String.class);
+        return result;
+    }
+
+    @RequestMapping("/connect/{user}")
+    public String connectFinal(@PathVariable("user") final int user) {
+        int visitID = this.users[user]++ % MAX_REQUESTS;
+        log.info("User {} visited {} times", user, visitID);
+        return String.format("%d:%d", user, visitID);
+    }
+
+    @RequestMapping("/vulnerability")
+    public String vulnerability() {
+        try {
+            MessageDigest.getInstance("MD5");
+        } catch (Exception e) {
+            return e.toString();
+        }
+        return "OK";
     }
-    return "OK";
-  }
 }
diff --git a/dd-smoke-tests/springboot-openliberty-23/application/src/main/java/com/openliberty/demo/Application.java b/dd-smoke-tests/springboot-openliberty-23/application/src/main/java/com/openliberty/demo/Application.java
index b43b6a99076..163b39e1d24 100644
--- a/dd-smoke-tests/springboot-openliberty-23/application/src/main/java/com/openliberty/demo/Application.java
+++ b/dd-smoke-tests/springboot-openliberty-23/application/src/main/java/com/openliberty/demo/Application.java
@@ -7,7 +7,7 @@
 @SpringBootApplication
 @Slf4j
 public class Application {
-  public static void main(String[] args) {
-    SpringApplication.run(Application.class, args);
-  }
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
 }
diff --git a/dd-smoke-tests/springboot-openliberty-23/application/src/main/java/com/openliberty/demo/DemoController.java b/dd-smoke-tests/springboot-openliberty-23/application/src/main/java/com/openliberty/demo/DemoController.java
index c35dc1cbe04..e928702a34b 100644
--- a/dd-smoke-tests/springboot-openliberty-23/application/src/main/java/com/openliberty/demo/DemoController.java
+++ b/dd-smoke-tests/springboot-openliberty-23/application/src/main/java/com/openliberty/demo/DemoController.java
@@ -12,43 +12,43 @@
 @RestController
 @Slf4j
 public class DemoController {
-  private int[] users;
-  private final int MAX_REQUESTS = 100000000;
-
-  @Value("${server.port}")
-  private String httpPort;
-
-  public DemoController() {
-    this.users = new int[100];
-  }
-
-  @RequestMapping("/connect")
-  public String connect() {
-    int userId = new Random().nextInt(users.length);
-    log.info(String.format("Length:%d", this.users.length));
-    log.info(String.format("Visiting user with userid:%d", userId));
-    RestTemplate restTemplate = new RestTemplate();
-    String uri = String.format("http://localhost:%s/connect/%d", this.httpPort, userId);
-
-    log.info(String.format("uri:%s", uri));
-    String result = restTemplate.getForObject(uri, String.class);
-    return result;
-  }
-
-  @RequestMapping("/connect/{user}")
-  public String connectFinal(@PathVariable("user") final int user) {
-    int visitID = this.users[user]++ % MAX_REQUESTS;
-    log.info("User {} visited {} times", user, visitID);
-    return String.format("%d:%d", user, visitID);
-  }
-
-  @RequestMapping("/vulnerability")
-  public String vulnerability() {
-    try {
-      MessageDigest.getInstance("MD5");
-    } catch (Exception e) {
-      return e.toString();
+    private int[] users;
+    private final int MAX_REQUESTS = 100000000;
+
+    @Value("${server.port}")
+    private String httpPort;
+
+    public DemoController() {
+        this.users = new int[100];
+    }
+
+    @RequestMapping("/connect")
+    public String connect() {
+        int userId = new Random().nextInt(users.length);
+        log.info(String.format("Length:%d", this.users.length));
+        log.info(String.format("Visiting user with userid:%d", userId));
+        RestTemplate restTemplate = new RestTemplate();
+        String uri = String.format("http://localhost:%s/connect/%d", this.httpPort, userId);
+
+        log.info(String.format("uri:%s", uri));
+        String result = restTemplate.getForObject(uri, String.class);
+        return result;
+    }
+
+    @RequestMapping("/connect/{user}")
+    public String connectFinal(@PathVariable("user") final int user) {
+        int visitID = this.users[user]++ % MAX_REQUESTS;
+        log.info("User {} visited {} times", user, visitID);
+        return String.format("%d:%d", user, visitID);
+    }
+
+    @RequestMapping("/vulnerability")
+    public String vulnerability() {
+        try {
+            MessageDigest.getInstance("MD5");
+        } catch (Exception e) {
+            return e.toString();
+        }
+        return "OK";
     }
-    return "OK";
-  }
 }
diff --git a/dd-smoke-tests/springboot-thymeleaf/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-thymeleaf/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index 2b4e4de452a..196aa2cc240 100644
--- a/dd-smoke-tests/springboot-thymeleaf/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/springboot-thymeleaf/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -5,7 +5,7 @@
 
 @SpringBootApplication
 public class SpringbootApplication {
-  public static void main(String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/springboot-thymeleaf/application/src/main/java/datadog/smoketest/springboot/XssController.java b/dd-smoke-tests/springboot-thymeleaf/application/src/main/java/datadog/smoketest/springboot/XssController.java
index fa8b534c1b6..a16b2367aad 100644
--- a/dd-smoke-tests/springboot-thymeleaf/application/src/main/java/datadog/smoketest/springboot/XssController.java
+++ b/dd-smoke-tests/springboot-thymeleaf/application/src/main/java/datadog/smoketest/springboot/XssController.java
@@ -14,34 +14,34 @@
 @RequestMapping("/xss")
 public class XssController {
 
-  private static final String TEMPLATE = "<p th:utext=\"${xss}\">Test!</p>";
+    private static final String TEMPLATE = "<p th:utext=\"${xss}\">Test!</p>";
 
-  private static final String BIG_TEMPLATE =
-      new String(new char[500]).replace('\0', 'A') + "<p th:utext=\"${xss}\">Test!</p>";
+    private static final String BIG_TEMPLATE =
+            new String(new char[500]).replace('\0', 'A') + "<p th:utext=\"${xss}\">Test!</p>";
 
-  @GetMapping("/utext")
-  public String utext(@RequestParam(name = "string") String name, Model model) {
-    model.addAttribute("xss", name);
-    return "utext";
-  }
+    @GetMapping("/utext")
+    public String utext(@RequestParam(name = "string") String name, Model model) {
+        model.addAttribute("xss", name);
+        return "utext";
+    }
 
-  @GetMapping(value = "/string-template", produces = "text/html")
-  @ResponseBody
-  public String stringTemplate(@RequestParam(name = "string") String name) {
-    SpringTemplateEngine engine = new SpringTemplateEngine();
-    engine.setTemplateResolver(new StringTemplateResolver());
-    Context context = new Context();
-    context.setVariable("xss", name);
-    return engine.process(TEMPLATE, context);
-  }
+    @GetMapping(value = "/string-template", produces = "text/html")
+    @ResponseBody
+    public String stringTemplate(@RequestParam(name = "string") String name) {
+        SpringTemplateEngine engine = new SpringTemplateEngine();
+        engine.setTemplateResolver(new StringTemplateResolver());
+        Context context = new Context();
+        context.setVariable("xss", name);
+        return engine.process(TEMPLATE, context);
+    }
 
-  @GetMapping(value = "/big-string-template", produces = "text/html")
-  @ResponseBody
-  public String bigStringTemplate(@RequestParam(name = "string") String name) {
-    SpringTemplateEngine engine = new SpringTemplateEngine();
-    engine.setTemplateResolver(new StringTemplateResolver());
-    Context context = new Context();
-    context.setVariable("xss", name);
-    return engine.process(BIG_TEMPLATE, context);
-  }
+    @GetMapping(value = "/big-string-template", produces = "text/html")
+    @ResponseBody
+    public String bigStringTemplate(@RequestParam(name = "string") String name) {
+        SpringTemplateEngine engine = new SpringTemplateEngine();
+        engine.setTemplateResolver(new StringTemplateResolver());
+        Context context = new Context();
+        context.setVariable("xss", name);
+        return engine.process(BIG_TEMPLATE, context);
+    }
 }
diff --git a/dd-smoke-tests/springboot-tomcat-jsp/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-tomcat-jsp/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index 2b4e4de452a..196aa2cc240 100644
--- a/dd-smoke-tests/springboot-tomcat-jsp/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/springboot-tomcat-jsp/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -5,7 +5,7 @@
 
 @SpringBootApplication
 public class SpringbootApplication {
-  public static void main(String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/springboot-tomcat-jsp/application/src/main/java/datadog/smoketest/springboot/ViewController.java b/dd-smoke-tests/springboot-tomcat-jsp/application/src/main/java/datadog/smoketest/springboot/ViewController.java
index 2094d2e3dbe..bca539c7ed9 100644
--- a/dd-smoke-tests/springboot-tomcat-jsp/application/src/main/java/datadog/smoketest/springboot/ViewController.java
+++ b/dd-smoke-tests/springboot-tomcat-jsp/application/src/main/java/datadog/smoketest/springboot/ViewController.java
@@ -6,8 +6,8 @@
 @Controller
 public class ViewController {
 
-  @GetMapping("/test_xss_in_jsp")
-  public String test() {
-    return "test_xss";
-  }
+    @GetMapping("/test_xss_in_jsp")
+    public String test() {
+        return "test_xss";
+    }
 }
diff --git a/dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/SpringbootTomcatApplication.java b/dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/SpringbootTomcatApplication.java
index 01a29b13b5d..66dd3496c4a 100644
--- a/dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/SpringbootTomcatApplication.java
+++ b/dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/SpringbootTomcatApplication.java
@@ -8,8 +8,8 @@
 @SpringBootApplication
 public class SpringbootTomcatApplication extends SpringBootServletInitializer {
 
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootTomcatApplication.class, args);
-    System.out.println("Started in " + ManagementFactory.getRuntimeMXBean().getUptime() + "ms");
-  }
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootTomcatApplication.class, args);
+        System.out.println("Started in " + ManagementFactory.getRuntimeMXBean().getUptime() + "ms");
+    }
 }
diff --git a/dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/controller/TestSuite.java b/dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/controller/TestSuite.java
index 8b9a03c8253..0ae80e797e9 100644
--- a/dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/controller/TestSuite.java
+++ b/dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/controller/TestSuite.java
@@ -6,8 +6,8 @@
 @RestController
 public class TestSuite {
 
-  @GetMapping("/hello")
-  public String hello() {
-    return "world";
-  }
+    @GetMapping("/hello")
+    public String hello() {
+        return "world";
+    }
 }
diff --git a/dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/controller/ViewController.java b/dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/controller/ViewController.java
index ca76401f875..9662a3fbe88 100644
--- a/dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/controller/ViewController.java
+++ b/dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/controller/ViewController.java
@@ -6,8 +6,8 @@
 @Controller
 public class ViewController {
 
-  @GetMapping("/test_xss_in_jsp")
-  public String test() {
-    return "test_xss";
-  }
+    @GetMapping("/test_xss_in_jsp")
+    public String test() {
+        return "test_xss";
+    }
 }
diff --git a/dd-smoke-tests/springboot-velocity/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-velocity/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index 2b4e4de452a..196aa2cc240 100644
--- a/dd-smoke-tests/springboot-velocity/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/springboot-velocity/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -5,7 +5,7 @@
 
 @SpringBootApplication
 public class SpringbootApplication {
-  public static void main(String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-  }
+    public static void main(String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+    }
 }
diff --git a/dd-smoke-tests/springboot-velocity/application/src/main/java/datadog/smoketest/springboot/XssController.java b/dd-smoke-tests/springboot-velocity/application/src/main/java/datadog/smoketest/springboot/XssController.java
index f1f9ca860bd..03858d93ea2 100644
--- a/dd-smoke-tests/springboot-velocity/application/src/main/java/datadog/smoketest/springboot/XssController.java
+++ b/dd-smoke-tests/springboot-velocity/application/src/main/java/datadog/smoketest/springboot/XssController.java
@@ -15,28 +15,27 @@
 @RequestMapping("/xss")
 public class XssController {
 
-  private static final String DIRECTORY_TEMPLATES_TEST = "resources/main/templates/";
-  private static final String DIRECTORY_TEMPLATES_RUN =
-      "dd-smoke-tests/springboot-velocity/src/main/resources/templates/";
+    private static final String DIRECTORY_TEMPLATES_TEST = "resources/main/templates/";
+    private static final String DIRECTORY_TEMPLATES_RUN =
+            "dd-smoke-tests/springboot-velocity/src/main/resources/templates/";
 
-  @GetMapping("/velocity")
-  public void xssVelocity(
-      @RequestParam("velocity") String param,
-      @RequestParam("templateName") String templateName,
-      HttpServletResponse response)
-      throws Exception {
-    VelocityEngine velocity = new VelocityEngine();
-    // To avoid the creation of a Velocity log file
-    velocity.setProperty(
-        RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
-        "org.apache.velocity.runtime.log.NullLogChute");
-    velocity.init();
-    Template template = velocity.getTemplate(DIRECTORY_TEMPLATES_TEST + templateName);
+    @GetMapping("/velocity")
+    public void xssVelocity(
+            @RequestParam("velocity") String param,
+            @RequestParam("templateName") String templateName,
+            HttpServletResponse response)
+            throws Exception {
+        VelocityEngine velocity = new VelocityEngine();
+        // To avoid the creation of a Velocity log file
+        velocity.setProperty(
+                RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, "org.apache.velocity.runtime.log.NullLogChute");
+        velocity.init();
+        Template template = velocity.getTemplate(DIRECTORY_TEMPLATES_TEST + templateName);
 
-    VelocityContext context = new VelocityContext();
-    context.put("esc", new EscapeTool());
-    context.put("param", param);
+        VelocityContext context = new VelocityContext();
+        context.put("esc", new EscapeTool());
+        context.put("param", param);
 
-    template.merge(context, response.getWriter());
-  }
+        template.merge(context, response.getWriter());
+    }
 }
diff --git a/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
index b8f214ec4a1..244f134c07f 100644
--- a/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
+++ b/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
@@ -19,40 +19,40 @@
 @SpringBootApplication
 public class SpringbootApplication {
 
-  @Configuration
-  @ComponentScan(basePackages = {"datadog.smoketest.springboot.controller"})
-  public static class WebConfig extends WebMvcConfigurerAdapter {
-
-    @Override
-    public void configurePathMatch(PathMatchConfigurer configurer) {
-      UrlPathHelper urlPathHelper = new UrlPathHelper();
-      urlPathHelper.setRemoveSemicolonContent(false);
-      configurer.setUrlPathHelper(urlPathHelper);
+    @Configuration
+    @ComponentScan(basePackages = {"datadog.smoketest.springboot.controller"})
+    public static class WebConfig extends WebMvcConfigurerAdapter {
+
+        @Override
+        public void configurePathMatch(PathMatchConfigurer configurer) {
+            UrlPathHelper urlPathHelper = new UrlPathHelper();
+            urlPathHelper.setRemoveSemicolonContent(false);
+            configurer.setUrlPathHelper(urlPathHelper);
+        }
+
+        @Bean
+        public Controller simpleIastController() {
+            return new SimpleIastController();
+        }
+
+        @Bean
+        public SimpleUrlHandlerMapping simpleMapping(Controller simpleIastController) {
+            SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
+            mapping.setUrlMap(Collections.singletonMap("/simple/{var1}", simpleIastController));
+            mapping.setOrder(0);
+            return mapping;
+        }
     }
 
     @Bean
-    public Controller simpleIastController() {
-      return new SimpleIastController();
+    public HttpFirewall getHttpFirewall() {
+        StrictHttpFirewall strictHttpFirewall = new StrictHttpFirewall();
+        strictHttpFirewall.setAllowSemicolon(true);
+        return strictHttpFirewall;
     }
 
-    @Bean
-    public SimpleUrlHandlerMapping simpleMapping(Controller simpleIastController) {
-      SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
-      mapping.setUrlMap(Collections.singletonMap("/simple/{var1}", simpleIastController));
-      mapping.setOrder(0);
-      return mapping;
+    public static void main(final String[] args) {
+        SpringApplication.run(SpringbootApplication.class, args);
+        System.out.println("Started in " + ManagementFactory.getRuntimeMXBean().getUptime() + "ms");
     }
-  }
-
-  @Bean
-  public HttpFirewall getHttpFirewall() {
-    StrictHttpFirewall strictHttpFirewall = new StrictHttpFirewall();
-    strictHttpFirewall.setAllowSemicolon(true);
-    return strictHttpFirewall;
-  }
-
-  public static void main(final String[] args) {
-    SpringApplication.run(SpringbootApplication.class, args);
-    System.out.println("Started in " + ManagementFactory.getRuntimeMXBean().getUptime() + "ms");
-  }
 }
diff --git a/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtAuthentication.java b/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtAuthentication.java
index 378543c0d50..7744737f68d 100644
--- a/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtAuthentication.java
+++ b/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtAuthentication.java
@@ -7,55 +7,55 @@
 import org.springframework.security.core.userdetails.UserDetails;
 
 public class JwtAuthentication implements Authentication {
-  private String token;
-  private boolean isAuthenticated = false;
-  private UserDetails user;
-  private Payload payload;
-
-  JwtAuthentication(String jwtToken) {
-    this.token = jwtToken;
-  }
-
-  @Override
-  public Collection<? extends GrantedAuthority> getAuthorities() {
-    return user.getAuthorities();
-  }
-
-  @Override
-  public Object getCredentials() {
-    return token;
-  }
-
-  @Override
-  public Object getDetails() {
-    return this.user;
-  }
-
-  @Override
-  public String getName() {
-    return payload.getSubject();
-  }
-
-  @Override
-  public Object getPrincipal() {
-    return this.getName();
-  }
-
-  @Override
-  public boolean isAuthenticated() {
-    return this.isAuthenticated;
-  }
-
-  @Override
-  public void setAuthenticated(boolean isAuthenticated) throws IllegalArgumentException {
-    this.isAuthenticated = isAuthenticated;
-  }
-
-  public void setUserDetails(UserDetails userDetails) {
-    this.user = userDetails;
-  }
-
-  public void setPayload(Payload payload) {
-    this.payload = payload;
-  }
+    private String token;
+    private boolean isAuthenticated = false;
+    private UserDetails user;
+    private Payload payload;
+
+    JwtAuthentication(String jwtToken) {
+        this.token = jwtToken;
+    }
+
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return user.getAuthorities();
+    }
+
+    @Override
+    public Object getCredentials() {
+        return token;
+    }
+
+    @Override
+    public Object getDetails() {
+        return this.user;
+    }
+
+    @Override
+    public String getName() {
+        return payload.getSubject();
+    }
+
+    @Override
+    public Object getPrincipal() {
+        return this.getName();
+    }
+
+    @Override
+    public boolean isAuthenticated() {
+        return this.isAuthenticated;
+    }
+
+    @Override
+    public void setAuthenticated(boolean isAuthenticated) throws IllegalArgumentException {
+        this.isAuthenticated = isAuthenticated;
+    }
+
+    public void setUserDetails(UserDetails userDetails) {
+        this.user = userDetails;
+    }
+
+    public void setPayload(Payload payload) {
+        this.payload = payload;
+    }
 }
diff --git a/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtAuthenticationFilter.java b/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtAuthenticationFilter.java
index 93b300fd261..7d54a751531 100644
--- a/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtAuthenticationFilter.java
+++ b/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtAuthenticationFilter.java
@@ -11,17 +11,17 @@
 
 public class JwtAuthenticationFilter extends GenericFilterBean {
 
-  @Override
-  public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain)
-      throws IOException, ServletException {
-    String authorization = ((HttpServletRequest) request).getHeader("Authorization");
-    if (authorization != null && !authorization.startsWith("Basic ")) {
-      if (authorization.contains("Bearer ")) {
-        authorization = authorization.replace("Bearer ", "").trim();
-      }
-      JwtAuthentication authentication = new JwtAuthentication(authorization);
-      SecurityContextHolder.getContext().setAuthentication(authentication);
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain)
+            throws IOException, ServletException {
+        String authorization = ((HttpServletRequest) request).getHeader("Authorization");
+        if (authorization != null && !authorization.startsWith("Basic ")) {
+            if (authorization.contains("Bearer ")) {
+                authorization = authorization.replace("Bearer ", "").trim();
+            }
+            JwtAuthentication authentication = new JwtAuthentication(authorization);
+            SecurityContextHolder.getContext().setAuthentication(authentication);
+        }
+        filterChain.doFilter(request, response);
     }
-    filterChain.doFilter(request, response);
-  }
 }
diff --git a/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtAuthenticationProvider.java b/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtAuthenticationProvider.java
index dbf9c008ae3..93efcb76932 100644
--- a/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtAuthenticationProvider.java
+++ b/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtAuthenticationProvider.java
@@ -12,33 +12,33 @@
 import org.springframework.security.core.userdetails.UserDetailsService;
 
 public class JwtAuthenticationProvider implements AuthenticationProvider {
-  private UserDetailsService userDetailsService;
-  private JWTVerifier jwtVerifier;
-  private String secret = "secret";
+    private UserDetailsService userDetailsService;
+    private JWTVerifier jwtVerifier;
+    private String secret = "secret";
 
-  public JwtAuthenticationProvider(UserDetailsService userDetailsService) throws Exception {
-    this.userDetailsService = userDetailsService;
-    Algorithm algorithmHS = Algorithm.HMAC256(secret);
-    jwtVerifier = JWT.require(algorithmHS).withIssuer("mvnsearch").build();
-  }
+    public JwtAuthenticationProvider(UserDetailsService userDetailsService) throws Exception {
+        this.userDetailsService = userDetailsService;
+        Algorithm algorithmHS = Algorithm.HMAC256(secret);
+        jwtVerifier = JWT.require(algorithmHS).withIssuer("mvnsearch").build();
+    }
 
-  @Override
-  public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-    JwtAuthentication jwtAuthentication = (JwtAuthentication) authentication;
-    try {
-      DecodedJWT jwt = jwtVerifier.verify((String) jwtAuthentication.getCredentials());
-      jwtAuthentication.setAuthenticated(true);
-      jwtAuthentication.setPayload(jwt);
-      jwtAuthentication.setUserDetails(userDetailsService.loadUserByUsername(jwt.getSubject()));
-    } catch (JWTVerificationException e) {
-      jwtAuthentication.setAuthenticated(false);
-      throw new BadCredentialsException("Bad token.");
+    @Override
+    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+        JwtAuthentication jwtAuthentication = (JwtAuthentication) authentication;
+        try {
+            DecodedJWT jwt = jwtVerifier.verify((String) jwtAuthentication.getCredentials());
+            jwtAuthentication.setAuthenticated(true);
+            jwtAuthentication.setPayload(jwt);
+            jwtAuthentication.setUserDetails(userDetailsService.loadUserByUsername(jwt.getSubject()));
+        } catch (JWTVerificationException e) {
+            jwtAuthentication.setAuthenticated(false);
+            throw new BadCredentialsException("Bad token.");
+        }
+        return jwtAuthentication;
     }
-    return jwtAuthentication;
-  }
 
-  @Override
-  public boolean supports(Class<?> authentication) {
-    return JwtAuthentication.class.isAssignableFrom(authentication);
-  }
+    @Override
+    public boolean supports(Class<?> authentication) {
+        return JwtAuthentication.class.isAssignableFrom(authentication);
+    }
 }
diff --git a/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtSecurityConfigurerAdapter.java b/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtSecurityConfigurerAdapter.java
index 4e442b1507e..9c794896213 100644
--- a/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtSecurityConfigurerAdapter.java
+++ b/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtSecurityConfigurerAdapter.java
@@ -17,55 +17,52 @@
 @EnableWebSecurity
 public class JwtSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter {
 
-  protected void configure(HttpSecurity http) throws Exception {
-    http.addFilterAfter(new JwtAuthenticationFilter(), SecurityContextPersistenceFilter.class)
-        .sessionManagement()
-        .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-        .and()
-        .authorizeRequests()
-        .mvcMatchers("/jwt")
-        .authenticated()
-        .and()
-        .csrf()
-        .disable()
-        .httpBasic()
-        .disable()
-        .exceptionHandling()
-        .authenticationEntryPoint(
-            (request, response, authException) -> {
-              response.sendError(401, authException.getMessage());
-            })
-        .accessDeniedHandler(
-            (request, response, accessDeniedException) -> {
-              response.sendError(403, "Access Denied.");
-            })
-        .and()
-        .headers()
-        .disable();
-  }
+    protected void configure(HttpSecurity http) throws Exception {
+        http.addFilterAfter(new JwtAuthenticationFilter(), SecurityContextPersistenceFilter.class)
+                .sessionManagement()
+                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
+                .and()
+                .authorizeRequests()
+                .mvcMatchers("/jwt")
+                .authenticated()
+                .and()
+                .csrf()
+                .disable()
+                .httpBasic()
+                .disable()
+                .exceptionHandling()
+                .authenticationEntryPoint((request, response, authException) -> {
+                    response.sendError(401, authException.getMessage());
+                })
+                .accessDeniedHandler((request, response, accessDeniedException) -> {
+                    response.sendError(403, "Access Denied.");
+                })
+                .and()
+                .headers()
+                .disable();
+    }
 
-  @Autowired
-  public void configureGlobal(
-      AuthenticationManagerBuilder auth,
-      AuthenticationProvider authenticationProvider,
-      UserDetailsService userDetailsService)
-      throws Exception {
-    auth.authenticationProvider(authenticationProvider).userDetailsService(userDetailsService);
-  }
+    @Autowired
+    public void configureGlobal(
+            AuthenticationManagerBuilder auth,
+            AuthenticationProvider authenticationProvider,
+            UserDetailsService userDetailsService)
+            throws Exception {
+        auth.authenticationProvider(authenticationProvider).userDetailsService(userDetailsService);
+    }
 
-  @Bean
-  public AuthenticationProvider jwtAuthenticationProvider(UserDetailsService userDetailsService)
-      throws Exception {
-    return new JwtAuthenticationProvider(userDetailsService);
-  }
+    @Bean
+    public AuthenticationProvider jwtAuthenticationProvider(UserDetailsService userDetailsService) throws Exception {
+        return new JwtAuthenticationProvider(userDetailsService);
+    }
 
-  @Bean
-  public UserDetailsService jwtUserDetailsService() {
-    return new JwtUserService();
-  }
+    @Bean
+    public UserDetailsService jwtUserDetailsService() {
+        return new JwtUserService();
+    }
 
-  @Override
-  public AuthenticationManager authenticationManagerBean() throws Exception {
-    return super.authenticationManagerBean();
-  }
+    @Override
+    public AuthenticationManager authenticationManagerBean() throws Exception {
+        return super.authenticationManagerBean();
+    }
 }
diff --git a/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtUserService.java b/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtUserService.java
index d7a0d4fc8da..ca6967b60e3 100644
--- a/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtUserService.java
+++ b/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/JwtUserService.java
@@ -8,14 +8,12 @@
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
 public class JwtUserService implements UserDetailsService {
-  public static final String USER = "USER";
-  public static final String ROLE = "ROLE_USER";
+    public static final String USER = "USER";
+    public static final String ROLE = "ROLE_USER";
 
-  @Override
-  public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-    return new User(
-        username,
-        "",
-        Arrays.asList(new SimpleGrantedAuthority(USER), new SimpleGrantedAuthority(ROLE)));
-  }
+    @Override
+    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+        return new User(
+                username, "", Arrays.asList(new SimpleGrantedAuthority(USER), new SimpleGrantedAuthority(ROLE)));
+    }
 }
diff --git a/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/RSAKeyService.java b/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/RSAKeyService.java
index 8cc3b5a9cc0..f1af515bc77 100644
--- a/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/RSAKeyService.java
+++ b/dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/jwt/RSAKeyService.java
@@ -8,13 +8,13 @@
 
 public class RSAKeyService {
 
-  public static RSAPrivateKey readPrivateKey(byte[] privateKey) throws Exception {
-    PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(privateKey);
-    return (RSAPrivateKey) KeyFactory.getInstance("RSA").generatePrivate(spec);
-  }
+    public static RSAPrivateKey readPrivateKey(byte[] privateKey) throws Exception {
+        PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(privateKey);
+        return (RSAPrivateKey) KeyFactory.getInstance("RSA").generatePrivate(spec);
+    }
 
-  public static RSAPublicKey readPublicKey(byte[] publicKey) throws Exception {
-    X509EncodedKeySpec spec = new X509EncodedKeySpec(publicKey);
-    return (RSAPublicKey) KeyFactory.getInstance("RSA").generatePublic(spec);
-  }
+    public static RSAPublicKey readPublicKey(byte[] publicKey) throws Exception {
+        X509EncodedKeySpec spec = new X509EncodedKeySpec(publicKey);
+        return (RSAPublicKey) KeyFactory.getInstance("RSA").generatePublic(spec);
+    }
 }
diff --git a/dd-smoke-tests/src/main/java/datadog/smoketest/AbstractSmokeApp.java b/dd-smoke-tests/src/main/java/datadog/smoketest/AbstractSmokeApp.java
index 508d8d7e8b3..21a5a0cd638 100644
--- a/dd-smoke-tests/src/main/java/datadog/smoketest/AbstractSmokeApp.java
+++ b/dd-smoke-tests/src/main/java/datadog/smoketest/AbstractSmokeApp.java
@@ -65,759 +65,746 @@
  * </ul>
  */
 public abstract class AbstractSmokeApp
-    implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback {
-
-  // Defaults mirroring the Groovy ProcessManager base so ported tests behave the same.
-  private static final String SERVICE_NAME = "smoke-test-java-app";
-  private static final String ENV = "smoketest";
-  private static final String VERSION = "99";
-  private static final String API_KEY = "01234567890abcdef123456789ABCDEF";
-  private static final long DEFAULT_STARTUP_TIMEOUT_SECONDS = 240;
-  private static final String DEFAULT_LOG_LEVEL = "info";
-  private static final String DEBUG_LOG_LEVEL = "debug";
-  private static final Set<String> NOISY_ENVIRONMENT_VARIABLES =
-      new HashSet<>(asList("CI_COMMIT_TITLE", "CI_COMMIT_MESSAGE", "CI_COMMIT_DESCRIPTION"));
-  private static final String AGENT_JAR_PROPERTY = "datadog.smoketest.agent.shadowJar.path";
-  private static final String BUILD_DIR_PROPERTY = "datadog.smoketest.builddir";
-  private static final DateTimeFormatter LOG_FILE_TIMESTAMP =
-      DateTimeFormatter.ofPattern("yyyy-MM-dd-HHmmss.SSS", ROOT).withZone(UTC);
-
-  private final String name;
-  private final String jar;
-  private final String mainClass;
-  private final String classpath;
-  private final List<String> jvmArgs;
-  private final List<String> programArgs;
-  private final Map<String, Supplier<String>> placeholders;
-  private final Map<String, String> extraEnv;
-  private final File workingDirectory;
-  private final AgentBackend backend;
-  private final String agentJar; // null => launch without -javaagent
-  private final long startupTimeoutSeconds;
-  private final Predicate<String> errorLogFilter;
-  private final boolean checkErrorLogs;
-  private final boolean checkTelemetry;
-  private final boolean applyMemoryTuning;
-  private final boolean debugLogs;
-
-  private final OutputThreads outputThreads = new OutputThreads();
-  private Process process;
-  private File logFile;
-  private boolean telemetryChecked;
-
-  protected AbstractSmokeApp(Builder<?, ?> builder) {
-    this.name = builder.name;
-    this.jar = builder.jar;
-    this.mainClass = builder.mainClass;
-    this.classpath =
-        builder.classpath != null ? builder.classpath : System.getProperty("java.class.path");
-    this.jvmArgs = new ArrayList<>(builder.jvmArgs);
-    this.programArgs = new ArrayList<>(builder.programArgs);
-    this.placeholders = new LinkedHashMap<>(builder.placeholders);
-    this.extraEnv = new HashMap<>(builder.extraEnv);
-    this.workingDirectory = builder.workingDirectory;
-    this.backend = builder.backend;
-    this.agentJar = builder.resolveAgentJar();
-    this.startupTimeoutSeconds = builder.startupTimeoutSeconds;
-    this.checkErrorLogs = builder.checkErrorLogs;
-    this.checkTelemetry = builder.checkTelemetry;
-    this.applyMemoryTuning = builder.applyMemoryTuning;
-    this.debugLogs = builder.debugLogs;
-    this.errorLogFilter =
-        builder.errorLogFilter != null
-            ? builder.errorLogFilter
-            : defaultErrorLogFilter(builder.allowedErrorLogs);
-  }
-
-  // --- Handle API (field access) ---
-
-  /**
-   * Returns the trace query/assert facade of this app's backend.
-   *
-   * @return The {@link Traces} facade of this app's backend.
-   */
-  public Traces traces() {
-    return this.backend.traces();
-  }
-
-  /**
-   * Returns the backend this app sends traces to.
-   *
-   * @return The {@link AgentBackend} this app sends traces to.
-   */
-  public AgentBackend backend() {
-    return this.backend;
-  }
-
-  /**
-   * Waits (up to the log helper's timeout) for a captured stdout/stderr line matching the given
-   * predicate. Captured lines are reset per test method.
-   *
-   * @param predicate The predicate a captured log line must satisfy.
-   * @return {@code true} if a matching line was seen before the timeout, {@code false} otherwise.
-   */
-  public boolean waitForLogLine(Predicate<String> predicate) {
-    try {
-      return this.outputThreads.processTestLogLines(predicate);
-    } catch (TimeoutException e) {
-      return false;
-    }
-  }
-
-  /**
-   * Waits up to #timeout for a captured stdout/stderr line matching the given predicate. Captured
-   * lines are reset per test method.
-   *
-   * @param predicate The predicate a captured log line must satisfy.
-   * @param timeout The during to wait for a matching line.
-   * @return {@code true} if a matching line was seen before the timeout, {@code false} otherwise.
-   */
-  public boolean waitForLogLine(Predicate<String> predicate, Duration timeout) {
-    try {
-      return this.outputThreads.processTestLogLines(predicate, timeout.toMillis());
-    } catch (TimeoutException e) {
-      return false;
-    }
-  }
-
-  /**
-   * Clears captured stdout/stderr so a subsequent {@link #waitForLogLine} sees only output produced
-   * afterward.
-   */
-  protected final void clearCapturedLogs() {
-    this.outputThreads.clearMessages();
-  }
-
-  // --- Shared state exposed to subclasses (start-up / per-method hooks) ---
-
-  /**
-   * Returns the app's (log/diagnostic) name.
-   *
-   * @return The app's (log/diagnostic) name.
-   */
-  protected final String name() {
-    return this.name;
-  }
-
-  /**
-   * Returns the launched process.
-   *
-   * @return The launched process, or {@code null} before {@link #beforeAll}.
-   */
-  protected final Process process() {
-    return this.process;
-  }
-
-  /**
-   * Returns how long start-up may wait for the app to become ready.
-   *
-   * @return The start-up timeout, in seconds.
-   */
-  protected final long startupTimeoutSeconds() {
-    return this.startupTimeoutSeconds;
-  }
-
-  /**
-   * Registers a launch-time placeholder.
-   *
-   * @param token The literal placeholder token to replace.
-   * @param valueSupplier The value provider, resolved at app launches.
-   */
-  protected final void registerPlaceholder(String token, Supplier<String> valueSupplier) {
-    this.placeholders.put(token, valueSupplier);
-  }
-
-  // --- Lifecycle (per-class start, per-method reset, teardown) ---
-
-  @Override
-  public final void beforeAll(ExtensionContext context) throws Exception {
-    this.backend.start();
-    launch();
-    onStarted();
-  }
-
-  @Override
-  public final void beforeEach(ExtensionContext context) {
-    onBeforeEach();
-  }
-
-  @Override
-  public final void afterEach(ExtensionContext context) {
-    onAfterEach();
-    // Check telemetry once, here, while the app and backend are still up as afterAll is too late
-    // (the app is killed, and the per-method session clear may have wiped a once-only app-started).
-    // Only for an agent-instrumented app on an owned backend (a shared session mixes apps).
-    if (this.checkTelemetry
-        && this.agentJar != null
-        && !this.backend.isShared()
-        && !this.telemetryChecked) {
-      this.telemetryChecked = true;
-      assertTelemetryReceived();
-    }
-  }
-
-  @Override
-  public final void afterAll(ExtensionContext context) {
-    try {
-      stopProcess();
-    } finally {
-      // Join the output threads first so the log file is fully flushed before we scan it.
-      this.outputThreads.close();
-      try {
-        if (!this.backend.isShared()) {
-          this.backend.close();
-        }
-      } finally {
-        if (this.checkErrorLogs) {
-          assertNoErrorLogs();
-        }
-      }
-    }
-  }
-
-  /**
-   * Invoked once right after the app process is launched (in {@link #beforeAll}) for subclasses to
-   * assert their notion of application readiness.
-   */
-  protected void onStarted() {}
-
-  /** Invoked before each test method (in {@link #beforeEach}) for the app's per-test reset. */
-  protected void onBeforeEach() {}
-
-  /**
-   * Invoked after each test method (in {@link #afterEach}) for subclasses to assert their notion of
-   * application health once the test body has run.
-   */
-  protected void onAfterEach() {}
-
-  private void launch() throws IOException {
-    List<String> command = javaCommand();
-    appendMemoryTuningArguments(command);
-    appendLogsArguments(command);
-    appendAgentArguments(command);
-    appendApplicationArguments(command);
-
-    ProcessBuilder processBuilder = new ProcessBuilder(command);
-    if (this.workingDirectory != null) {
-      processBuilder.directory(this.workingDirectory);
-    }
-    Map<String, String> env = processBuilder.environment();
-    env.put("JAVA_HOME", System.getProperty("java.home"));
-    env.put("DD_API_KEY", API_KEY);
-    env.keySet().removeAll(NOISY_ENVIRONMENT_VARIABLES);
-    env.putAll(this.extraEnv);
-    processBuilder.redirectErrorStream(true);
-
-    this.logFile = resolveLogFile();
-    this.process = processBuilder.start();
-    this.outputThreads.captureOutput(this.process, this.logFile);
-  }
-
-  private List<String> javaCommand() {
-    List<String> command = new ArrayList<>();
-    command.add(javaExecutable());
-    // Disable CDS to avoid SIGSEGVs on Linux arm64.
-    if (OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64()) {
-      command.add("-Xshare:off");
-    }
-    // Property to prevent FileSystemPreference file lock issue on forked processes,
-    // in particular in CI which runs on Linux and have competing processes trying
-    // to write to it, including the Gradle daemon:
-    // Couldn't flush user prefs: java.util.prefs.BackingStoreException: Couldn't get file lock.
-    String tmpDir = System.getProperty("java.io.tmpdir");
-    String uniqueLock = this.name + "_" + System.nanoTime();
-    command.add("-Djava.util.prefs.userRoot=" + tmpDir + "/userPrefs/" + uniqueLock);
-    return command;
-  }
-
-  private void appendMemoryTuningArguments(List<String> command) {
-    if (this.applyMemoryTuning) {
-      command.add(getMaxMemoryArgumentForFork());
-      command.add(getMinMemoryArgumentForFork());
-    }
-  }
-
-  private void appendLogsArguments(List<String> command) {
-    String logLevel = this.debugLogs ? DEBUG_LOG_LEVEL : DEFAULT_LOG_LEVEL;
-    command.add("-Ddatadog.slf4j.simpleLogger.defaultLogLevel=" + logLevel);
-    command.add("-Dorg.slf4j.simpleLogger.defaultLogLevel=" + logLevel);
-  }
-
-  private void appendAgentArguments(List<String> command) {
-    if (this.agentJar != null) {
-      command.add("-javaagent:" + this.agentJar);
-      command.add("-Ddd.agent.host=" + this.backend.url().getHost());
-      command.add("-Ddd.trace.agent.port=" + this.backend.port());
-      command.add("-Ddd.service.name=" + SERVICE_NAME);
-      command.add("-Ddd.env=" + ENV);
-      command.add("-Ddd.version=" + VERSION);
-      String sessionToken = this.backend.sessionToken();
-      if (sessionToken != null) {
-        command.add("-Ddd.test.agent.session.token=" + sessionToken);
-      }
-      if (this.checkTelemetry) {
-        // Emit telemetry promptly so app-started is captured before a (long-running server) app is
-        // killed at teardown — mirrors the Groovy base's telemetry tests.
-        command.add("-Ddd.telemetry.heartbeat.interval=1");
-      }
-    }
-  }
+        implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback {
+
+    // Defaults mirroring the Groovy ProcessManager base so ported tests behave the same.
+    private static final String SERVICE_NAME = "smoke-test-java-app";
+    private static final String ENV = "smoketest";
+    private static final String VERSION = "99";
+    private static final String API_KEY = "01234567890abcdef123456789ABCDEF";
+    private static final long DEFAULT_STARTUP_TIMEOUT_SECONDS = 240;
+    private static final String DEFAULT_LOG_LEVEL = "info";
+    private static final String DEBUG_LOG_LEVEL = "debug";
+    private static final Set<String> NOISY_ENVIRONMENT_VARIABLES =
+            new HashSet<>(asList("CI_COMMIT_TITLE", "CI_COMMIT_MESSAGE", "CI_COMMIT_DESCRIPTION"));
+    private static final String AGENT_JAR_PROPERTY = "datadog.smoketest.agent.shadowJar.path";
+    private static final String BUILD_DIR_PROPERTY = "datadog.smoketest.builddir";
+    private static final DateTimeFormatter LOG_FILE_TIMESTAMP =
+            DateTimeFormatter.ofPattern("yyyy-MM-dd-HHmmss.SSS", ROOT).withZone(UTC);
 
-  private void appendApplicationArguments(List<String> command) {
-    for (String jvmArg : this.jvmArgs) {
-      command.add(substitute(jvmArg));
-    }
-    if (this.jar != null) {
-      command.add("-jar");
-      command.add(this.jar);
-    } else {
-      command.add("-cp");
-      command.add(this.classpath);
-      command.add(this.mainClass);
-    }
-    for (String programArg : this.programArgs) {
-      command.add(substitute(programArg));
-    }
-  }
-
-  private void stopProcess() {
-    if (this.process == null) {
-      return;
-    }
-    if (!this.process.isAlive()) {
-      return;
-    }
-    this.process.destroy();
-    try {
-      if (!this.process.waitFor(5, SECONDS)) {
-        this.process.destroyForcibly();
-        if (!this.process.waitFor(10, SECONDS)) {
-          throw new IllegalStateException(
-              "App '"
-                  + name()
-                  + "' did not terminate after destroy. A lingering process may retain"
-                  + " its port and files and interfere with later tests.");
-        }
-      }
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      this.process.destroyForcibly();
-    }
-  }
-
-  private String substitute(String value) {
-    String result = value;
-    for (Entry<String, Supplier<String>> entry : this.placeholders.entrySet()) {
-      String placeholder = entry.getKey();
-      if (result.contains(placeholder)) {
-        result = result.replace(placeholder, entry.getValue().get());
-      }
-    }
-    return result;
-  }
-
-  private File resolveLogFile() {
-    String buildDir = System.getProperty(BUILD_DIR_PROPERTY);
-    File dir =
-        buildDir != null
-            ? new File(buildDir, "reports")
-            : new File(System.getProperty("java.io.tmpdir"));
-    dir.mkdirs();
-    return new File(dir, logFileName(this.name, Instant.now()));
-  }
-
-  /**
-   * Builds the per-app log file name, timestamped (UTC) so a retry doesn't clobber the prior run's
-   * log.
-   *
-   * @param name The app's (log/diagnostic) name.
-   * @param when The instant to stamp into the file name.
-   * @return The timestamped log file name.
-   */
-  @VisibleForTesting
-  static String logFileName(String name, Instant when) {
-    return "smoke-app." + name + "." + LOG_FILE_TIMESTAMP.format(when) + ".log";
-  }
-
-  /**
-   * Asserts the app logged no error lines, per the configured filter. Reads the whole captured log
-   * (everything since launch). Auto-invoked at teardown unless {@link Builder#skipErrorLogCheck()}
-   * was set; may also be called explicitly mid-run.
-   *
-   * @throws AssertionError If the captured log contains one or more error lines.
-   */
-  public void assertNoErrorLogs() {
-    if (this.logFile == null) {
-      return; // never launched / nothing captured
-    }
-    try (Stream<String> errorLines =
-        Files.lines(this.logFile.toPath(), UTF_8).filter(this.errorLogFilter)) {
-      String errors = errorLines.map(s -> "\n  " + s).collect(joining());
-      if (!errors.isEmpty()) {
-        throw new AssertionError("App '" + this.name + "' logged error line(s):" + errors);
-      }
-    } catch (NoSuchFileException ignored) {
-      // no output file was produced
-    } catch (IOException e) {
-      throw new IllegalStateException("Failed to read app log " + this.logFile, e);
-    }
-  }
-
-  /**
-   * Asserts the app's telemetry pipeline is active — at least one telemetry message reached the
-   * backend. Auto-invoked once at the first {@link #afterEach} (while the app + backend are still
-   * up) for an agent-instrumented app on an owned backend, unless {@link
-   * Builder#skipTelemetryCheck()}. It intentionally asserts "telemetry is flowing" rather than a
-   * specific event: the once-only {@code app-started} is fragile under the per-method session
-   * clear, whereas heartbeats keep arriving; a test wanting a specific event (or per-app scoping on
-   * a shared backend) can assert it with {@code backend().telemetry().waitForFlat(...)}.
-   *
-   * @throws AssertionError If no telemetry message is received.
-   */
-  public void assertTelemetryReceived() {
-    this.backend.telemetry().waitForCount(1);
-  }
-
-  @VisibleForTesting
-  static Predicate<String> defaultErrorLogFilter(List<String> allowed) {
-    List<String> allowlist = new ArrayList<>(allowed);
-    return line -> {
-      for (String allowedSubstring : allowlist) {
-        if (line.contains(allowedSubstring)) {
-          return false;
-        }
-      }
-      // Skip known log entries from flaky tests
-      if (isKnownFlakyTestLogEntry(line)) {
-        return false;
-      }
-      // See ProcessManager.isErrorLog()
-      return line.contains("ERROR")
-          || line.contains("ASSERTION FAILED")
-          || line.contains("Failed to handle exception in instrumentation");
-    };
-  }
-
-  private static String javaExecutable() {
-    return System.getProperty("java.home") + File.separator + "bin" + File.separator + "java";
-  }
-
-  /**
-   * Fluent builder shared by the concrete apps. Self-typed so every setter returns the concrete
-   * builder for chaining and {@code build()} returns the concrete app. Obtain one via {@link
-   * SmokeServerApp#named(String)} or {@link SmokeCliApp#named(String)}.
-   *
-   * @param <A> The concrete app type this builder builds.
-   * @param <B> The concrete builder type, returned from every setter for fluent chaining.
-   */
-  public abstract static class Builder<A extends AbstractSmokeApp, B extends Builder<A, B>> {
     private final String name;
-    private String jar;
-    private String mainClass;
-    private String classpath;
-    private final List<String> jvmArgs = new ArrayList<>();
-    private final List<String> programArgs = new ArrayList<>();
-    private final Map<String, Supplier<String>> placeholders = new LinkedHashMap<>();
-    private final Map<String, String> extraEnv = new HashMap<>();
-    private File workingDirectory;
-    private AgentBackend backend;
-    private String explicitAgentJar;
-    private boolean noAgent;
-    private long startupTimeoutSeconds = DEFAULT_STARTUP_TIMEOUT_SECONDS;
-    private Predicate<String> errorLogFilter;
-    private final List<String> allowedErrorLogs = new ArrayList<>();
-    private boolean checkErrorLogs = true;
-    private boolean checkTelemetry = true;
-    private boolean applyMemoryTuning = true;
-    private boolean debugLogs;
-
-    protected Builder(String name) {
-      this.name = name;
-    }
+    private final String jar;
+    private final String mainClass;
+    private final String classpath;
+    private final List<String> jvmArgs;
+    private final List<String> programArgs;
+    private final Map<String, Supplier<String>> placeholders;
+    private final Map<String, String> extraEnv;
+    private final File workingDirectory;
+    private final AgentBackend backend;
+    private final String agentJar; // null => launch without -javaagent
+    private final long startupTimeoutSeconds;
+    private final Predicate<String> errorLogFilter;
+    private final boolean checkErrorLogs;
+    private final boolean checkTelemetry;
+    private final boolean applyMemoryTuning;
+    private final boolean debugLogs;
+
+    private final OutputThreads outputThreads = new OutputThreads();
+    private Process process;
+    private File logFile;
+    private boolean telemetryChecked;
+
+    protected AbstractSmokeApp(Builder<?, ?> builder) {
+        this.name = builder.name;
+        this.jar = builder.jar;
+        this.mainClass = builder.mainClass;
+        this.classpath = builder.classpath != null ? builder.classpath : System.getProperty("java.class.path");
+        this.jvmArgs = new ArrayList<>(builder.jvmArgs);
+        this.programArgs = new ArrayList<>(builder.programArgs);
+        this.placeholders = new LinkedHashMap<>(builder.placeholders);
+        this.extraEnv = new HashMap<>(builder.extraEnv);
+        this.workingDirectory = builder.workingDirectory;
+        this.backend = builder.backend;
+        this.agentJar = builder.resolveAgentJar();
+        this.startupTimeoutSeconds = builder.startupTimeoutSeconds;
+        this.checkErrorLogs = builder.checkErrorLogs;
+        this.checkTelemetry = builder.checkTelemetry;
+        this.applyMemoryTuning = builder.applyMemoryTuning;
+        this.debugLogs = builder.debugLogs;
+        this.errorLogFilter = builder.errorLogFilter != null
+                ? builder.errorLogFilter
+                : defaultErrorLogFilter(builder.allowedErrorLogs);
+    }
+
+    // --- Handle API (field access) ---
 
     /**
-     * Returns {@code this} as the concrete builder type, for fluent chaining.
+     * Returns the trace query/assert facade of this app's backend.
      *
-     * @return {@code this} as the concrete builder type.
+     * @return The {@link Traces} facade of this app's backend.
      */
-    protected abstract B self();
+    public Traces traces() {
+        return this.backend.traces();
+    }
 
     /**
-     * Builds the concrete app. Implementations must call {@link #validate()} first.
+     * Returns the backend this app sends traces to.
      *
-     * @return The built app.
+     * @return The {@link AgentBackend} this app sends traces to.
      */
-    public abstract A build();
+    public AgentBackend backend() {
+        return this.backend;
+    }
 
     /**
-     * Runs {@code java -jar <jarPath>}. Mutually exclusive with {@code mainClass()}.
+     * Waits (up to the log helper's timeout) for a captured stdout/stderr line matching the given
+     * predicate. Captured lines are reset per test method.
      *
-     * @param jarPath The path to the runnable jar.
-     * @return This builder, for chaining.
+     * @param predicate The predicate a captured log line must satisfy.
+     * @return {@code true} if a matching line was seen before the timeout, {@code false} otherwise.
      */
-    public B jar(String jarPath) {
-      this.jar = jarPath;
-      this.mainClass = null;
-      this.classpath = null;
-      return self();
+    public boolean waitForLogLine(Predicate<String> predicate) {
+        try {
+            return this.outputThreads.processTestLogLines(predicate);
+        } catch (TimeoutException e) {
+            return false;
+        }
     }
 
     /**
-     * Runs {@code java -cp <classpath> <mainClass>} (classpath defaults to the current one).
-     * Mutually exclusive with {@link #jar}}.
+     * Waits up to #timeout for a captured stdout/stderr line matching the given predicate. Captured
+     * lines are reset per test method.
      *
-     * @param mainClass The main class to run.
-     * @return This builder, for chaining.
+     * @param predicate The predicate a captured log line must satisfy.
+     * @param timeout The during to wait for a matching line.
+     * @return {@code true} if a matching line was seen before the timeout, {@code false} otherwise.
      */
-    public B mainClass(Class<?> mainClass) {
-      return mainClass(mainClass.getName());
+    public boolean waitForLogLine(Predicate<String> predicate, Duration timeout) {
+        try {
+            return this.outputThreads.processTestLogLines(predicate, timeout.toMillis());
+        } catch (TimeoutException e) {
+            return false;
+        }
     }
 
     /**
-     * Runs {@code java -cp <classpath> <mainClass>} (classpath defaults to the current one).
-     * Mutually exclusive with {@link #jar}}.
-     *
-     * @param mainClass The fully-qualified main class to run.
-     * @return This builder, for chaining.
+     * Clears captured stdout/stderr so a subsequent {@link #waitForLogLine} sees only output produced
+     * afterward.
      */
-    public B mainClass(String mainClass) {
-      this.jar = null;
-      this.mainClass = mainClass;
-      this.classpath = null;
-      return self();
+    protected final void clearCapturedLogs() {
+        this.outputThreads.clearMessages();
     }
 
+    // --- Shared state exposed to subclasses (start-up / per-method hooks) ---
+
     /**
-     * Runs {@code java -cp <classpath> <mainClass>}. Mutually exclusive with {@link #jar}}.
+     * Returns the app's (log/diagnostic) name.
      *
-     * @param mainClass The main class to run.
-     * @param classpath The classpath for the launched JVM.
-     * @return This builder, for chaining.
+     * @return The app's (log/diagnostic) name.
      */
-    public B mainClass(Class<?> mainClass, String classpath) {
-      return mainClass(mainClass.getName(), classpath);
+    protected final String name() {
+        return this.name;
     }
 
     /**
-     * Runs {@code java -cp <classpath> <mainClass>}. Mutually exclusive with {@link #jar}}.
+     * Returns the launched process.
      *
-     * @param mainClass The fully-qualified main class to run.
-     * @param classpath The classpath for the launched JVM.
-     * @return This builder, for chaining.
+     * @return The launched process, or {@code null} before {@link #beforeAll}.
      */
-    public B mainClass(String mainClass, String classpath) {
-      this.jar = null;
-      this.mainClass = mainClass;
-      this.classpath = classpath;
-      return self();
+    protected final Process process() {
+        return this.process;
     }
 
     /**
-     * Adds program arguments (after the jar/main class). Supports launch-time {@code ${...}}
-     * placeholders (see {@link #placeholder(String, Supplier)}); {@link SmokeServerApp} also
-     * provides {@code ${app.httpPort}}.
+     * Returns how long start-up may wait for the app to become ready.
      *
-     * @param args The program arguments to append.
-     * @return This builder, for chaining.
+     * @return The start-up timeout, in seconds.
      */
-    public B args(String... args) {
-      this.programArgs.addAll(asList(args));
-      return self();
+    protected final long startupTimeoutSeconds() {
+        return this.startupTimeoutSeconds;
     }
 
     /**
-     * Adds extra JVM arguments (before the jar/main class). Supports the same launch-time {@code
-     * ${...}} placeholders as {@link #args(String...)}.
+     * Registers a launch-time placeholder.
      *
-     * @param jvmArgs The JVM arguments to append.
-     * @return This builder, for chaining.
+     * @param token The literal placeholder token to replace.
+     * @param valueSupplier The value provider, resolved at app launches.
      */
-    public B jvmArgs(String... jvmArgs) {
-      this.jvmArgs.addAll(asList(jvmArgs));
-      return self();
+    protected final void registerPlaceholder(String token, Supplier<String> valueSupplier) {
+        this.placeholders.put(token, valueSupplier);
     }
 
-    /**
-     * Registers a launch-time placeholder: occurrences of <code>${name}</code> in {@link
-     * #jvmArgs(String...) jvmArgs} and {@link #args(String...) args} are replaced with {@code
-     * value.get()} when the app <em>launches</em> (in {@code beforeAll}), not when the builder
-     * runs. Use for values only known once test infrastructure has started — e.g. a Testcontainers
-     * mapped port, which is unavailable when the {@code static @RegisterExtension} fields
-     * initialize:
-     *
-     * <pre>{@code
-     * .placeholder("rabbit.port", () -> String.valueOf(RABBIT.getMappedPort(5672)))
-     * .args("--spring.rabbitmq.port=${rabbit.port}")
-     * }</pre>
-     *
-     * @param name The placeholder name; matched as <code>${name}</code> in args and jvmArgs.
-     * @param value Supplies the replacement value, resolved when the app launches.
-     * @return This builder, for chaining.
-     */
-    public B placeholder(String name, Supplier<String> value) {
-      this.placeholders.put("${" + name + "}", value);
-      return self();
+    // --- Lifecycle (per-class start, per-method reset, teardown) ---
+
+    @Override
+    public final void beforeAll(ExtensionContext context) throws Exception {
+        this.backend.start();
+        launch();
+        onStarted();
     }
 
-    /**
-     * Sets an environment variable for the launched process (applied after the defaults).
-     *
-     * @param key The environment variable name.
-     * @param value The environment variable value.
-     * @return This builder, for chaining.
-     */
-    public B env(String key, String value) {
-      this.extraEnv.put(key, value);
-      return self();
+    @Override
+    public final void beforeEach(ExtensionContext context) {
+        onBeforeEach();
     }
 
-    /**
-     * Sets the working directory for the launched process.
-     *
-     * @param workingDirectory The working directory.
-     * @return This builder, for chaining.
-     */
-    public B workingDirectory(File workingDirectory) {
-      this.workingDirectory = workingDirectory;
-      return self();
+    @Override
+    public final void afterEach(ExtensionContext context) {
+        onAfterEach();
+        // Check telemetry once, here, while the app and backend are still up as afterAll is too late
+        // (the app is killed, and the per-method session clear may have wiped a once-only app-started).
+        // Only for an agent-instrumented app on an owned backend (a shared session mixes apps).
+        if (this.checkTelemetry && this.agentJar != null && !this.backend.isShared() && !this.telemetryChecked) {
+            this.telemetryChecked = true;
+            assertTelemetryReceived();
+        }
     }
 
-    /**
-     * Sets the backend the app sends traces to.
-     *
-     * @param backend The trace backend.
-     * @return This builder, for chaining.
-     */
-    public B backend(AgentBackend backend) {
-      this.backend = backend;
-      return self();
+    @Override
+    public final void afterAll(ExtensionContext context) {
+        try {
+            stopProcess();
+        } finally {
+            // Join the output threads first so the log file is fully flushed before we scan it.
+            this.outputThreads.close();
+            try {
+                if (!this.backend.isShared()) {
+                    this.backend.close();
+                }
+            } finally {
+                if (this.checkErrorLogs) {
+                    assertNoErrorLogs();
+                }
+            }
+        }
     }
 
     /**
-     * Overrides the agent jar (default: the {@code datadog.smoketest.agent.shadowJar.path}
-     * property).
-     *
-     * @param agentJarPath The path to the agent jar.
-     * @return This builder, for chaining.
+     * Invoked once right after the app process is launched (in {@link #beforeAll}) for subclasses to
+     * assert their notion of application readiness.
      */
-    public B javaAgent(String agentJarPath) {
-      this.explicitAgentJar = agentJarPath;
-      return self();
-    }
+    protected void onStarted() {}
+
+    /** Invoked before each test method (in {@link #beforeEach}) for the app's per-test reset. */
+    protected void onBeforeEach() {}
 
     /**
-     * Launches the app without {@code -javaagent} (e.g. for launch-mechanics tests).
-     *
-     * @return This builder, for chaining.
+     * Invoked after each test method (in {@link #afterEach}) for subclasses to assert their notion of
+     * application health once the test body has run.
      */
-    public B noAgent() {
-      this.noAgent = true;
-      return self();
+    protected void onAfterEach() {}
+
+    private void launch() throws IOException {
+        List<String> command = javaCommand();
+        appendMemoryTuningArguments(command);
+        appendLogsArguments(command);
+        appendAgentArguments(command);
+        appendApplicationArguments(command);
+
+        ProcessBuilder processBuilder = new ProcessBuilder(command);
+        if (this.workingDirectory != null) {
+            processBuilder.directory(this.workingDirectory);
+        }
+        Map<String, String> env = processBuilder.environment();
+        env.put("JAVA_HOME", System.getProperty("java.home"));
+        env.put("DD_API_KEY", API_KEY);
+        env.keySet().removeAll(NOISY_ENVIRONMENT_VARIABLES);
+        env.putAll(this.extraEnv);
+        processBuilder.redirectErrorStream(true);
+
+        this.logFile = resolveLogFile();
+        this.process = processBuilder.start();
+        this.outputThreads.captureOutput(this.process, this.logFile);
+    }
+
+    private List<String> javaCommand() {
+        List<String> command = new ArrayList<>();
+        command.add(javaExecutable());
+        // Disable CDS to avoid SIGSEGVs on Linux arm64.
+        if (OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64()) {
+            command.add("-Xshare:off");
+        }
+        // Property to prevent FileSystemPreference file lock issue on forked processes,
+        // in particular in CI which runs on Linux and have competing processes trying
+        // to write to it, including the Gradle daemon:
+        // Couldn't flush user prefs: java.util.prefs.BackingStoreException: Couldn't get file lock.
+        String tmpDir = System.getProperty("java.io.tmpdir");
+        String uniqueLock = this.name + "_" + System.nanoTime();
+        command.add("-Djava.util.prefs.userRoot=" + tmpDir + "/userPrefs/" + uniqueLock);
+        return command;
+    }
+
+    private void appendMemoryTuningArguments(List<String> command) {
+        if (this.applyMemoryTuning) {
+            command.add(getMaxMemoryArgumentForFork());
+            command.add(getMinMemoryArgumentForFork());
+        }
     }
 
-    /**
-     * Sets how long start-up waits for the app to become ready (default {@value
-     * AbstractSmokeApp#DEFAULT_STARTUP_TIMEOUT_SECONDS}s).
-     *
-     * @param seconds The start-up timeout, in seconds.
-     * @return This builder, for chaining.
-     */
-    public B startupTimeoutSeconds(long seconds) {
-      this.startupTimeoutSeconds = seconds;
-      return self();
+    private void appendLogsArguments(List<String> command) {
+        String logLevel = this.debugLogs ? DEBUG_LOG_LEVEL : DEFAULT_LOG_LEVEL;
+        command.add("-Ddatadog.slf4j.simpleLogger.defaultLogLevel=" + logLevel);
+        command.add("-Dorg.slf4j.simpleLogger.defaultLogLevel=" + logLevel);
+    }
+
+    private void appendAgentArguments(List<String> command) {
+        if (this.agentJar != null) {
+            command.add("-javaagent:" + this.agentJar);
+            command.add("-Ddd.agent.host=" + this.backend.url().getHost());
+            command.add("-Ddd.trace.agent.port=" + this.backend.port());
+            command.add("-Ddd.service.name=" + SERVICE_NAME);
+            command.add("-Ddd.env=" + ENV);
+            command.add("-Ddd.version=" + VERSION);
+            String sessionToken = this.backend.sessionToken();
+            if (sessionToken != null) {
+                command.add("-Ddd.test.agent.session.token=" + sessionToken);
+            }
+            if (this.checkTelemetry) {
+                // Emit telemetry promptly so app-started is captured before a (long-running server) app is
+                // killed at teardown — mirrors the Groovy base's telemetry tests.
+                command.add("-Ddd.telemetry.heartbeat.interval=1");
+            }
+        }
     }
 
-    /**
-     * Overrides how a captured log line is judged an error. Replaces the allowlist.
-     *
-     * @param isError The predicate reporting whether a captured log line is an error.
-     * @return This builder, for chaining.
-     */
-    public B errorLogFilter(Predicate<String> isError) {
-      this.errorLogFilter = isError;
-      return self();
+    private void appendApplicationArguments(List<String> command) {
+        for (String jvmArg : this.jvmArgs) {
+            command.add(substitute(jvmArg));
+        }
+        if (this.jar != null) {
+            command.add("-jar");
+            command.add(this.jar);
+        } else {
+            command.add("-cp");
+            command.add(this.classpath);
+            command.add(this.mainClass);
+        }
+        for (String programArg : this.programArgs) {
+            command.add(substitute(programArg));
+        }
     }
 
-    /**
-     * Allowlists log lines containing any of these substrings from the default error-log check.
-     *
-     * @param substrings The substrings whose presence exempts a line from the error check.
-     * @return This builder, for chaining.
-     */
-    public B allowedErrorLogs(String... substrings) {
-      this.allowedErrorLogs.addAll(asList(substrings));
-      return self();
+    private void stopProcess() {
+        if (this.process == null) {
+            return;
+        }
+        if (!this.process.isAlive()) {
+            return;
+        }
+        this.process.destroy();
+        try {
+            if (!this.process.waitFor(5, SECONDS)) {
+                this.process.destroyForcibly();
+                if (!this.process.waitFor(10, SECONDS)) {
+                    throw new IllegalStateException("App '"
+                            + name()
+                            + "' did not terminate after destroy. A lingering process may retain"
+                            + " its port and files and interfere with later tests.");
+                }
+            }
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            this.process.destroyForcibly();
+        }
+    }
+
+    private String substitute(String value) {
+        String result = value;
+        for (Entry<String, Supplier<String>> entry : this.placeholders.entrySet()) {
+            String placeholder = entry.getKey();
+            if (result.contains(placeholder)) {
+                result = result.replace(placeholder, entry.getValue().get());
+            }
+        }
+        return result;
+    }
+
+    private File resolveLogFile() {
+        String buildDir = System.getProperty(BUILD_DIR_PROPERTY);
+        File dir = buildDir != null ? new File(buildDir, "reports") : new File(System.getProperty("java.io.tmpdir"));
+        dir.mkdirs();
+        return new File(dir, logFileName(this.name, Instant.now()));
     }
 
     /**
-     * Disables the automatic no-error-logs check at teardown (e.g. for error-case tests).
+     * Builds the per-app log file name, timestamped (UTC) so a retry doesn't clobber the prior run's
+     * log.
      *
-     * @return This builder, for chaining.
+     * @param name The app's (log/diagnostic) name.
+     * @param when The instant to stamp into the file name.
+     * @return The timestamped log file name.
      */
-    public B skipErrorLogCheck() {
-      this.checkErrorLogs = false;
-      return self();
+    @VisibleForTesting
+    static String logFileName(String name, Instant when) {
+        return "smoke-app." + name + "." + LOG_FILE_TIMESTAMP.format(when) + ".log";
     }
 
     /**
-     * Disables the automatic app-started telemetry check at teardown (for agent apps that run with
-     * telemetry disabled, e.g. {@code dd.instrumentation.telemetry.enabled=false}).
+     * Asserts the app logged no error lines, per the configured filter. Reads the whole captured log
+     * (everything since launch). Auto-invoked at teardown unless {@link Builder#skipErrorLogCheck()}
+     * was set; may also be called explicitly mid-run.
      *
-     * @return This builder, for chaining.
+     * @throws AssertionError If the captured log contains one or more error lines.
      */
-    public B skipTelemetryCheck() {
-      this.checkTelemetry = false;
-      return self();
+    public void assertNoErrorLogs() {
+        if (this.logFile == null) {
+            return; // never launched / nothing captured
+        }
+        try (Stream<String> errorLines =
+                Files.lines(this.logFile.toPath(), UTF_8).filter(this.errorLogFilter)) {
+            String errors = errorLines.map(s -> "\n  " + s).collect(joining());
+            if (!errors.isEmpty()) {
+                throw new AssertionError("App '" + this.name + "' logged error line(s):" + errors);
+            }
+        } catch (NoSuchFileException ignored) {
+            // no output file was produced
+        } catch (IOException e) {
+            throw new IllegalStateException("Failed to read app log " + this.logFile, e);
+        }
     }
 
     /**
-     * Disables the default child-JVM heap bounds ({@code -Xmx}/{@code -Xms} from {@link
-     * ForkedTestUtils}). You can instead override the values by passing {@code -Xmx}/{@code -Xms}
-     * to {@link #jvmArgs(String...)} (those take precedence).
+     * Asserts the app's telemetry pipeline is active — at least one telemetry message reached the
+     * backend. Auto-invoked once at the first {@link #afterEach} (while the app + backend are still
+     * up) for an agent-instrumented app on an owned backend, unless {@link
+     * Builder#skipTelemetryCheck()}. It intentionally asserts "telemetry is flowing" rather than a
+     * specific event: the once-only {@code app-started} is fragile under the per-method session
+     * clear, whereas heartbeats keep arriving; a test wanting a specific event (or per-app scoping on
+     * a shared backend) can assert it with {@code backend().telemetry().waitForFlat(...)}.
      *
-     * @return This builder, for chaining.
+     * @throws AssertionError If no telemetry message is received.
      */
-    public B skipMemoryTuning() {
-      this.applyMemoryTuning = false;
-      return self();
+    public void assertTelemetryReceived() {
+        this.backend.telemetry().waitForCount(1);
+    }
+
+    @VisibleForTesting
+    static Predicate<String> defaultErrorLogFilter(List<String> allowed) {
+        List<String> allowlist = new ArrayList<>(allowed);
+        return line -> {
+            for (String allowedSubstring : allowlist) {
+                if (line.contains(allowedSubstring)) {
+                    return false;
+                }
+            }
+            // Skip known log entries from flaky tests
+            if (isKnownFlakyTestLogEntry(line)) {
+                return false;
+            }
+            // See ProcessManager.isErrorLog()
+            return line.contains("ERROR")
+                    || line.contains("ASSERTION FAILED")
+                    || line.contains("Failed to handle exception in instrumentation");
+        };
+    }
+
+    private static String javaExecutable() {
+        return System.getProperty("java.home") + File.separator + "bin" + File.separator + "java";
     }
 
     /**
-     * Runs the app with {@code debug} tracer and application log levels instead of the default
-     * {@code info}, for tests asserting on debug output or diagnosing a failure.
+     * Fluent builder shared by the concrete apps. Self-typed so every setter returns the concrete
+     * builder for chaining and {@code build()} returns the concrete app. Obtain one via {@link
+     * SmokeServerApp#named(String)} or {@link SmokeCliApp#named(String)}.
      *
-     * @return This builder, for chaining.
+     * @param <A> The concrete app type this builder builds.
+     * @param <B> The concrete builder type, returned from every setter for fluent chaining.
      */
-    public B debugLogs() {
-      this.debugLogs = true;
-      return self();
-    }
+    public abstract static class Builder<A extends AbstractSmokeApp, B extends Builder<A, B>> {
+        private final String name;
+        private String jar;
+        private String mainClass;
+        private String classpath;
+        private final List<String> jvmArgs = new ArrayList<>();
+        private final List<String> programArgs = new ArrayList<>();
+        private final Map<String, Supplier<String>> placeholders = new LinkedHashMap<>();
+        private final Map<String, String> extraEnv = new HashMap<>();
+        private File workingDirectory;
+        private AgentBackend backend;
+        private String explicitAgentJar;
+        private boolean noAgent;
+        private long startupTimeoutSeconds = DEFAULT_STARTUP_TIMEOUT_SECONDS;
+        private Predicate<String> errorLogFilter;
+        private final List<String> allowedErrorLogs = new ArrayList<>();
+        private boolean checkErrorLogs = true;
+        private boolean checkTelemetry = true;
+        private boolean applyMemoryTuning = true;
+        private boolean debugLogs;
+
+        protected Builder(String name) {
+            this.name = name;
+        }
 
-    private String resolveAgentJar() {
-      if (this.noAgent) {
-        return null;
-      }
-      return this.explicitAgentJar != null
-          ? this.explicitAgentJar
-          : System.getProperty(AGENT_JAR_PROPERTY);
-    }
+        /**
+         * Returns {@code this} as the concrete builder type, for fluent chaining.
+         *
+         * @return {@code this} as the concrete builder type.
+         */
+        protected abstract B self();
+
+        /**
+         * Builds the concrete app. Implementations must call {@link #validate()} first.
+         *
+         * @return The built app.
+         */
+        public abstract A build();
+
+        /**
+         * Runs {@code java -jar <jarPath>}. Mutually exclusive with {@code mainClass()}.
+         *
+         * @param jarPath The path to the runnable jar.
+         * @return This builder, for chaining.
+         */
+        public B jar(String jarPath) {
+            this.jar = jarPath;
+            this.mainClass = null;
+            this.classpath = null;
+            return self();
+        }
+
+        /**
+         * Runs {@code java -cp <classpath> <mainClass>} (classpath defaults to the current one).
+         * Mutually exclusive with {@link #jar}}.
+         *
+         * @param mainClass The main class to run.
+         * @return This builder, for chaining.
+         */
+        public B mainClass(Class<?> mainClass) {
+            return mainClass(mainClass.getName());
+        }
+
+        /**
+         * Runs {@code java -cp <classpath> <mainClass>} (classpath defaults to the current one).
+         * Mutually exclusive with {@link #jar}}.
+         *
+         * @param mainClass The fully-qualified main class to run.
+         * @return This builder, for chaining.
+         */
+        public B mainClass(String mainClass) {
+            this.jar = null;
+            this.mainClass = mainClass;
+            this.classpath = null;
+            return self();
+        }
+
+        /**
+         * Runs {@code java -cp <classpath> <mainClass>}. Mutually exclusive with {@link #jar}}.
+         *
+         * @param mainClass The main class to run.
+         * @param classpath The classpath for the launched JVM.
+         * @return This builder, for chaining.
+         */
+        public B mainClass(Class<?> mainClass, String classpath) {
+            return mainClass(mainClass.getName(), classpath);
+        }
+
+        /**
+         * Runs {@code java -cp <classpath> <mainClass>}. Mutually exclusive with {@link #jar}}.
+         *
+         * @param mainClass The fully-qualified main class to run.
+         * @param classpath The classpath for the launched JVM.
+         * @return This builder, for chaining.
+         */
+        public B mainClass(String mainClass, String classpath) {
+            this.jar = null;
+            this.mainClass = mainClass;
+            this.classpath = classpath;
+            return self();
+        }
+
+        /**
+         * Adds program arguments (after the jar/main class). Supports launch-time {@code ${...}}
+         * placeholders (see {@link #placeholder(String, Supplier)}); {@link SmokeServerApp} also
+         * provides {@code ${app.httpPort}}.
+         *
+         * @param args The program arguments to append.
+         * @return This builder, for chaining.
+         */
+        public B args(String... args) {
+            this.programArgs.addAll(asList(args));
+            return self();
+        }
+
+        /**
+         * Adds extra JVM arguments (before the jar/main class). Supports the same launch-time {@code
+         * ${...}} placeholders as {@link #args(String...)}.
+         *
+         * @param jvmArgs The JVM arguments to append.
+         * @return This builder, for chaining.
+         */
+        public B jvmArgs(String... jvmArgs) {
+            this.jvmArgs.addAll(asList(jvmArgs));
+            return self();
+        }
 
-    /** Validates common invariants; concrete {@link #build()} implementations must call this. */
-    protected void validate() {
-      if (this.backend == null) {
-        throw new IllegalStateException(
-            "A AgentBackend is required. Use backend(...) to build your app");
-      }
-      if ((this.jar == null) == (this.mainClass == null)) {
-        throw new IllegalStateException("Exactly one of jar(...) or mainClass(...) must be set");
-      }
-      if (!this.noAgent && resolveAgentJar() == null) {
-        throw new IllegalStateException(
-            "Agent jar not found: system property '"
-                + AGENT_JAR_PROPERTY
-                + "' is not set. Gradle sets it automatically; on other runners call javaAgent(path)"
-                + " to point at an agent jar, or noAgent() to run without the tracer.");
-      }
+        /**
+         * Registers a launch-time placeholder: occurrences of <code>${name}</code> in {@link
+         * #jvmArgs(String...) jvmArgs} and {@link #args(String...) args} are replaced with {@code
+         * value.get()} when the app <em>launches</em> (in {@code beforeAll}), not when the builder
+         * runs. Use for values only known once test infrastructure has started — e.g. a Testcontainers
+         * mapped port, which is unavailable when the {@code static @RegisterExtension} fields
+         * initialize:
+         *
+         * <pre>{@code
+         * .placeholder("rabbit.port", () -> String.valueOf(RABBIT.getMappedPort(5672)))
+         * .args("--spring.rabbitmq.port=${rabbit.port}")
+         * }</pre>
+         *
+         * @param name The placeholder name; matched as <code>${name}</code> in args and jvmArgs.
+         * @param value Supplies the replacement value, resolved when the app launches.
+         * @return This builder, for chaining.
+         */
+        public B placeholder(String name, Supplier<String> value) {
+            this.placeholders.put("${" + name + "}", value);
+            return self();
+        }
+
+        /**
+         * Sets an environment variable for the launched process (applied after the defaults).
+         *
+         * @param key The environment variable name.
+         * @param value The environment variable value.
+         * @return This builder, for chaining.
+         */
+        public B env(String key, String value) {
+            this.extraEnv.put(key, value);
+            return self();
+        }
+
+        /**
+         * Sets the working directory for the launched process.
+         *
+         * @param workingDirectory The working directory.
+         * @return This builder, for chaining.
+         */
+        public B workingDirectory(File workingDirectory) {
+            this.workingDirectory = workingDirectory;
+            return self();
+        }
+
+        /**
+         * Sets the backend the app sends traces to.
+         *
+         * @param backend The trace backend.
+         * @return This builder, for chaining.
+         */
+        public B backend(AgentBackend backend) {
+            this.backend = backend;
+            return self();
+        }
+
+        /**
+         * Overrides the agent jar (default: the {@code datadog.smoketest.agent.shadowJar.path}
+         * property).
+         *
+         * @param agentJarPath The path to the agent jar.
+         * @return This builder, for chaining.
+         */
+        public B javaAgent(String agentJarPath) {
+            this.explicitAgentJar = agentJarPath;
+            return self();
+        }
+
+        /**
+         * Launches the app without {@code -javaagent} (e.g. for launch-mechanics tests).
+         *
+         * @return This builder, for chaining.
+         */
+        public B noAgent() {
+            this.noAgent = true;
+            return self();
+        }
+
+        /**
+         * Sets how long start-up waits for the app to become ready (default {@value
+         * AbstractSmokeApp#DEFAULT_STARTUP_TIMEOUT_SECONDS}s).
+         *
+         * @param seconds The start-up timeout, in seconds.
+         * @return This builder, for chaining.
+         */
+        public B startupTimeoutSeconds(long seconds) {
+            this.startupTimeoutSeconds = seconds;
+            return self();
+        }
+
+        /**
+         * Overrides how a captured log line is judged an error. Replaces the allowlist.
+         *
+         * @param isError The predicate reporting whether a captured log line is an error.
+         * @return This builder, for chaining.
+         */
+        public B errorLogFilter(Predicate<String> isError) {
+            this.errorLogFilter = isError;
+            return self();
+        }
+
+        /**
+         * Allowlists log lines containing any of these substrings from the default error-log check.
+         *
+         * @param substrings The substrings whose presence exempts a line from the error check.
+         * @return This builder, for chaining.
+         */
+        public B allowedErrorLogs(String... substrings) {
+            this.allowedErrorLogs.addAll(asList(substrings));
+            return self();
+        }
+
+        /**
+         * Disables the automatic no-error-logs check at teardown (e.g. for error-case tests).
+         *
+         * @return This builder, for chaining.
+         */
+        public B skipErrorLogCheck() {
+            this.checkErrorLogs = false;
+            return self();
+        }
+
+        /**
+         * Disables the automatic app-started telemetry check at teardown (for agent apps that run with
+         * telemetry disabled, e.g. {@code dd.instrumentation.telemetry.enabled=false}).
+         *
+         * @return This builder, for chaining.
+         */
+        public B skipTelemetryCheck() {
+            this.checkTelemetry = false;
+            return self();
+        }
+
+        /**
+         * Disables the default child-JVM heap bounds ({@code -Xmx}/{@code -Xms} from {@link
+         * ForkedTestUtils}). You can instead override the values by passing {@code -Xmx}/{@code -Xms}
+         * to {@link #jvmArgs(String...)} (those take precedence).
+         *
+         * @return This builder, for chaining.
+         */
+        public B skipMemoryTuning() {
+            this.applyMemoryTuning = false;
+            return self();
+        }
+
+        /**
+         * Runs the app with {@code debug} tracer and application log levels instead of the default
+         * {@code info}, for tests asserting on debug output or diagnosing a failure.
+         *
+         * @return This builder, for chaining.
+         */
+        public B debugLogs() {
+            this.debugLogs = true;
+            return self();
+        }
+
+        private String resolveAgentJar() {
+            if (this.noAgent) {
+                return null;
+            }
+            return this.explicitAgentJar != null ? this.explicitAgentJar : System.getProperty(AGENT_JAR_PROPERTY);
+        }
+
+        /** Validates common invariants; concrete {@link #build()} implementations must call this. */
+        protected void validate() {
+            if (this.backend == null) {
+                throw new IllegalStateException("A AgentBackend is required. Use backend(...) to build your app");
+            }
+            if ((this.jar == null) == (this.mainClass == null)) {
+                throw new IllegalStateException("Exactly one of jar(...) or mainClass(...) must be set");
+            }
+            if (!this.noAgent && resolveAgentJar() == null) {
+                throw new IllegalStateException("Agent jar not found: system property '"
+                        + AGENT_JAR_PROPERTY
+                        + "' is not set. Gradle sets it automatically; on other runners call javaAgent(path)"
+                        + " to point at an agent jar, or noAgent() to run without the tracer.");
+            }
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/src/main/java/datadog/smoketest/KnownLogExclusion.java b/dd-smoke-tests/src/main/java/datadog/smoketest/KnownLogExclusion.java
index 597f0d8be97..4f072bacef3 100644
--- a/dd-smoke-tests/src/main/java/datadog/smoketest/KnownLogExclusion.java
+++ b/dd-smoke-tests/src/main/java/datadog/smoketest/KnownLogExclusion.java
@@ -9,29 +9,27 @@
  * due to ongoing issues like flaky tests.
  */
 final class KnownLogExclusion {
-  // Repository-wide known-flaky log lines excluded from the default error-log check.
-  private static final List<String> FLAKY_TEST_LOG_EXCLUSION =
-      asList(
-          // FIXME: Flaky profiler exception. See PROF-11068.
-          "ERROR com.datadog.profiling.controller.ProfilingSystem - Fatal exception in profiling"
-              + " thread, trying to continue",
-          // FIXME: Flaky profiler exception. See PROF-11072.
-          "ERROR com.datadog.profiling.controller.ProfilingSystem - Fatal exception during"
-              + " profiling startup",
-          // FIXME: Flaky on Spring Boot (e.g. IastSpringBootSmokeTest) and other HTTP-client
-          // suites.
-          "I/O reactor terminated abnormally",
-          // FIXME: Observed in WildflySmokeTest (semeru8): a successful JMX collector exit.
-          "ERROR datadog.trace.agent.jmxfetch.JMXFetch - jmx collector exited with result: 0");
+    // Repository-wide known-flaky log lines excluded from the default error-log check.
+    private static final List<String> FLAKY_TEST_LOG_EXCLUSION = asList(
+            // FIXME: Flaky profiler exception. See PROF-11068.
+            "ERROR com.datadog.profiling.controller.ProfilingSystem - Fatal exception in profiling"
+                    + " thread, trying to continue",
+            // FIXME: Flaky profiler exception. See PROF-11072.
+            "ERROR com.datadog.profiling.controller.ProfilingSystem - Fatal exception during" + " profiling startup",
+            // FIXME: Flaky on Spring Boot (e.g. IastSpringBootSmokeTest) and other HTTP-client
+            // suites.
+            "I/O reactor terminated abnormally",
+            // FIXME: Observed in WildflySmokeTest (semeru8): a successful JMX collector exit.
+            "ERROR datadog.trace.agent.jmxfetch.JMXFetch - jmx collector exited with result: 0");
 
-  private KnownLogExclusion() {}
+    private KnownLogExclusion() {}
 
-  public static boolean isKnownFlakyTestLogEntry(String line) {
-    for (String excluded : FLAKY_TEST_LOG_EXCLUSION) {
-      if (line.contains(excluded)) {
-        return true;
-      }
+    public static boolean isKnownFlakyTestLogEntry(String line) {
+        for (String excluded : FLAKY_TEST_LOG_EXCLUSION) {
+            if (line.contains(excluded)) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/dd-smoke-tests/src/main/java/datadog/smoketest/OutputThreads.java b/dd-smoke-tests/src/main/java/datadog/smoketest/OutputThreads.java
index 515a38567ea..32340458253 100644
--- a/dd-smoke-tests/src/main/java/datadog/smoketest/OutputThreads.java
+++ b/dd-smoke-tests/src/main/java/datadog/smoketest/OutputThreads.java
@@ -20,184 +20,185 @@
 import java.util.function.Predicate;
 
 public class OutputThreads implements Closeable {
-  private static final long THREAD_JOIN_TIMEOUT_MILLIS = 10 * 1000;
-  private static final int MAX_LINE_SIZE = 1024 * 1024;
-  private static final int DEFAULT_TIMEOUT_MILLIS = 10_000;
-
-  final ThreadGroup tg;
-  final List<String> testLogMessages = new ArrayList<>();
-
-  public OutputThreads() {
-    this(new ThreadGroup("smoke-output"));
-  }
-
-  @VisibleForTesting
-  OutputThreads(ThreadGroup tg) {
-    this.tg = tg;
-  }
-
-  public void close() {
-    tg.interrupt();
-    Thread[] threads = new Thread[tg.activeCount()];
-    int threadCount = tg.enumerate(threads);
-
-    for (int i = 0; i < threadCount; i++) {
-      try {
-        threads[i].join(THREAD_JOIN_TIMEOUT_MILLIS);
-      } catch (InterruptedException e) {
-        // ignore
-      }
-    }
-  }
+    private static final long THREAD_JOIN_TIMEOUT_MILLIS = 10 * 1000;
+    private static final int MAX_LINE_SIZE = 1024 * 1024;
+    private static final int DEFAULT_TIMEOUT_MILLIS = 10_000;
+
+    final ThreadGroup tg;
+    final List<String> testLogMessages = new ArrayList<>();
 
-  class ProcessOutputRunnable implements Runnable {
-    final ReadableByteChannel rc;
-    ByteBuffer buffer = ByteBuffer.allocate(MAX_LINE_SIZE);
-    final WritableByteChannel wc;
-    CharsetDecoder decoder = StandardCharsets.UTF_8.newDecoder();
+    public OutputThreads() {
+        this(new ThreadGroup("smoke-output"));
+    }
 
-    ProcessOutputRunnable(InputStream is, File output) throws FileNotFoundException {
-      rc = Channels.newChannel(is);
-      wc = Channels.newChannel(new FileOutputStream(output));
+    @VisibleForTesting
+    OutputThreads(ThreadGroup tg) {
+        this.tg = tg;
     }
 
-    @Override
-    public void run() {
-      boolean online = true;
-      while (online) {
-        // we may have data in the buffer we did not consume for line splitting purposes
-        int skip = buffer.position();
-
-        try {
-          if (rc.read(buffer) == -1) {
-            online = false;
-          }
-        } catch (IOException ioe) {
-          online = false;
+    public void close() {
+        tg.interrupt();
+        Thread[] threads = new Thread[tg.activeCount()];
+        int threadCount = tg.enumerate(threads);
+
+        for (int i = 0; i < threadCount; i++) {
+            try {
+                threads[i].join(THREAD_JOIN_TIMEOUT_MILLIS);
+            } catch (InterruptedException e) {
+                // ignore
+            }
         }
+    }
 
-        buffer.flip();
-        // write to log file
-        try {
-          wc.write((ByteBuffer) buffer.duplicate().position(skip));
-        } catch (IOException e) {
-          System.out.println("ERROR WRITING TO LOG FILE: " + e.getMessage());
-          e.printStackTrace();
-          return;
+    class ProcessOutputRunnable implements Runnable {
+        final ReadableByteChannel rc;
+        ByteBuffer buffer = ByteBuffer.allocate(MAX_LINE_SIZE);
+        final WritableByteChannel wc;
+        CharsetDecoder decoder = StandardCharsets.UTF_8.newDecoder();
+
+        ProcessOutputRunnable(InputStream is, File output) throws FileNotFoundException {
+            rc = Channels.newChannel(is);
+            wc = Channels.newChannel(new FileOutputStream(output));
         }
 
-        // subBuff will always start at the beginning of the next (potential) line
-        ByteBuffer subBuff = buffer.duplicate();
-        int consumed = 0;
-        while (true) {
-          boolean hasRemaining = subBuff.hasRemaining();
-          if (hasRemaining) {
-            int c = subBuff.get();
-            if (c != '\n' && c != '\r') {
-              continue;
+        @Override
+        public void run() {
+            boolean online = true;
+            while (online) {
+                // we may have data in the buffer we did not consume for line splitting purposes
+                int skip = buffer.position();
+
+                try {
+                    if (rc.read(buffer) == -1) {
+                        online = false;
+                    }
+                } catch (IOException ioe) {
+                    online = false;
+                }
+
+                buffer.flip();
+                // write to log file
+                try {
+                    wc.write((ByteBuffer) buffer.duplicate().position(skip));
+                } catch (IOException e) {
+                    System.out.println("ERROR WRITING TO LOG FILE: " + e.getMessage());
+                    e.printStackTrace();
+                    return;
+                }
+
+                // subBuff will always start at the beginning of the next (potential) line
+                ByteBuffer subBuff = buffer.duplicate();
+                int consumed = 0;
+                while (true) {
+                    boolean hasRemaining = subBuff.hasRemaining();
+                    if (hasRemaining) {
+                        int c = subBuff.get();
+                        if (c != '\n' && c != '\r') {
+                            continue;
+                        }
+                        // found line end
+                    } else if (online && consumed > 0) {
+                        break;
+                        // did not find line end, but we already consumed a line
+                        // save the data for the next read iteration
+                    } // else we did not consume any line, or there will be no further reads.
+                    // Treat the buffer as single line despite lack of terminator
+
+                    consumed += subBuff.position();
+                    String line = null;
+                    try {
+                        line = decoder.decode((ByteBuffer) subBuff.duplicate().flip())
+                                .toString()
+                                .trim();
+                    } catch (CharacterCodingException e) {
+                        throw new RuntimeException(e);
+                    }
+
+                    if (!line.isEmpty()) {
+                        synchronized (testLogMessages) {
+                            testLogMessages.add(line);
+                            testLogMessages.notifyAll();
+                        }
+                    }
+
+                    if (hasRemaining) {
+                        subBuff = subBuff.slice();
+                    } else {
+                        break;
+                    }
+                }
+
+                buffer.position(consumed);
+                buffer.compact();
             }
-            // found line end
-          } else if (online && consumed > 0) {
-            break;
-            // did not find line end, but we already consumed a line
-            // save the data for the next read iteration
-          } // else we did not consume any line, or there will be no further reads.
-          // Treat the buffer as single line despite lack of terminator
-
-          consumed += subBuff.position();
-          String line = null;
-          try {
-            line = decoder.decode((ByteBuffer) subBuff.duplicate().flip()).toString().trim();
-          } catch (CharacterCodingException e) {
-            throw new RuntimeException(e);
-          }
-
-          if (!line.isEmpty()) {
-            synchronized (testLogMessages) {
-              testLogMessages.add(line);
-              testLogMessages.notifyAll();
-            }
-          }
-
-          if (hasRemaining) {
-            subBuff = subBuff.slice();
-          } else {
-            break;
-          }
         }
+    }
+
+    public void captureOutput(Process p, File outputFile) throws FileNotFoundException {
+        new Thread(tg, new ProcessOutputRunnable(p.getInputStream(), outputFile)).start();
+    }
 
-        buffer.position(consumed);
-        buffer.compact();
-      }
+    /**
+     * Tries to find a log line that matches the given predicate. After reading all the log lines
+     * already collected, it will wait up to 10 seconds for a new line matching the predicate.
+     *
+     * @param predicate should return {@code true} if a match is found, {@code false} otherwise.
+     */
+    public boolean processTestLogLines(Predicate<String> predicate) throws TimeoutException {
+        return processTestLogLines(predicate, DEFAULT_TIMEOUT_MILLIS);
     }
-  }
-
-  public void captureOutput(Process p, File outputFile) throws FileNotFoundException {
-    new Thread(tg, new ProcessOutputRunnable(p.getInputStream(), outputFile)).start();
-  }
-
-  /**
-   * Tries to find a log line that matches the given predicate. After reading all the log lines
-   * already collected, it will wait up to 10 seconds for a new line matching the predicate.
-   *
-   * @param predicate should return {@code true} if a match is found, {@code false} otherwise.
-   */
-  public boolean processTestLogLines(Predicate<String> predicate) throws TimeoutException {
-    return processTestLogLines(predicate, DEFAULT_TIMEOUT_MILLIS);
-  }
-
-  /**
-   * Tries to find a log line that matches the given predicate. After reading all the log lines
-   * already collected, it will wait up to #timeoutMillis milliseconds for a new line matching the
-   * predicate.
-   *
-   * @param predicate should return {@code true} if a match is found, {@code false} otherwise.
-   * @param timeoutMillis The timeout to wait for the log line, in milliseconds.
-   */
-  public boolean processTestLogLines(Predicate<String> predicate, long timeoutMillis)
-      throws TimeoutException {
-    int l = 0;
-    long waitStart = 0;
-
-    while (true) {
-      String msg;
-      synchronized (testLogMessages) {
-        if (l >= testLogMessages.size()) {
-          long waitTime;
-          if (waitStart != 0) {
-            waitTime = timeoutMillis - (System.currentTimeMillis() - waitStart);
-            if (waitTime <= 0) {
-              throw new TimeoutException();
+
+    /**
+     * Tries to find a log line that matches the given predicate. After reading all the log lines
+     * already collected, it will wait up to #timeoutMillis milliseconds for a new line matching the
+     * predicate.
+     *
+     * @param predicate should return {@code true} if a match is found, {@code false} otherwise.
+     * @param timeoutMillis The timeout to wait for the log line, in milliseconds.
+     */
+    public boolean processTestLogLines(Predicate<String> predicate, long timeoutMillis) throws TimeoutException {
+        int l = 0;
+        long waitStart = 0;
+
+        while (true) {
+            String msg;
+            synchronized (testLogMessages) {
+                if (l >= testLogMessages.size()) {
+                    long waitTime;
+                    if (waitStart != 0) {
+                        waitTime = timeoutMillis - (System.currentTimeMillis() - waitStart);
+                        if (waitTime <= 0) {
+                            throw new TimeoutException();
+                        }
+                    } else {
+                        waitStart = System.currentTimeMillis();
+                        if (timeoutMillis <= 0) {
+                            throw new TimeoutException();
+                        }
+                        waitTime = timeoutMillis;
+                    }
+                    try {
+                        testLogMessages.wait(waitTime);
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+                if (l >= testLogMessages.size()) {
+                    throw new TimeoutException();
+                }
+                // the array is only cleared at the end of the test, so index l exists
+                msg = testLogMessages.get(l++);
             }
-          } else {
-            waitStart = System.currentTimeMillis();
-            if (timeoutMillis <= 0) {
-              throw new TimeoutException();
+
+            if (predicate.test(msg)) {
+                return true;
             }
-            waitTime = timeoutMillis;
-          }
-          try {
-            testLogMessages.wait(waitTime);
-          } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-          }
-        }
-        if (l >= testLogMessages.size()) {
-          throw new TimeoutException();
         }
-        // the array is only cleared at the end of the test, so index l exists
-        msg = testLogMessages.get(l++);
-      }
-
-      if (predicate.test(msg)) {
-        return true;
-      }
     }
-  }
 
-  public void clearMessages() {
-    synchronized (testLogMessages) {
-      testLogMessages.clear();
+    public void clearMessages() {
+        synchronized (testLogMessages) {
+            testLogMessages.clear();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/src/main/java/datadog/smoketest/SmokeCliApp.java b/dd-smoke-tests/src/main/java/datadog/smoketest/SmokeCliApp.java
index 6c2ac7509f3..c0d1a34fdc6 100644
--- a/dd-smoke-tests/src/main/java/datadog/smoketest/SmokeCliApp.java
+++ b/dd-smoke-tests/src/main/java/datadog/smoketest/SmokeCliApp.java
@@ -24,63 +24,62 @@
  */
 public final class SmokeCliApp extends AbstractSmokeApp {
 
-  private SmokeCliApp(Builder builder) {
-    super(builder);
-  }
-
-  /**
-   * Starts a fluent builder for a batch/CLI app.
-   *
-   * @param name The application (log/diagnostic) name.
-   * @return A new builder for a {@link SmokeCliApp}.
-   */
-  public static Builder named(String name) {
-    return new Builder(name);
-  }
-
-  /**
-   * Asserts the app runs to completion within the timeout and exits with the expected value. Pass a
-   * non-zero expected value for apps expected to fail (e.g. a tool the agent aborts).
-   *
-   * @param timeout The maximum time to wait for the app to complete.
-   * @param unit The time unit of {@code timeout}.
-   * @param expectedExitValue The exit code the app is expected to return.
-   * @throws AssertionError If the app does not terminate in time or exits with a different code.
-   */
-  public void assertCompletesWithValue(long timeout, TimeUnit unit, int expectedExitValue) {
-    boolean exited;
-    try {
-      exited = process().waitFor(timeout, unit);
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      throw new AssertionError("Interrupted while waiting for app '" + name() + "' to complete", e);
-    }
-    if (!exited) {
-      throw new AssertionError(
-          "App '" + name() + "' did not complete within " + timeout + " " + unit);
+    private SmokeCliApp(Builder builder) {
+        super(builder);
     }
-    int actual = process().exitValue();
-    if (actual != expectedExitValue) {
-      throw new AssertionError(
-          "App '" + name() + "' exited with " + actual + " but expected " + expectedExitValue);
-    }
-  }
 
-  /** Fluent builder for a {@link SmokeCliApp}; obtain via {@link SmokeCliApp#named(String)}. */
-  public static final class Builder extends AbstractSmokeApp.Builder<SmokeCliApp, Builder> {
-    private Builder(String name) {
-      super(name);
+    /**
+     * Starts a fluent builder for a batch/CLI app.
+     *
+     * @param name The application (log/diagnostic) name.
+     * @return A new builder for a {@link SmokeCliApp}.
+     */
+    public static Builder named(String name) {
+        return new Builder(name);
     }
 
-    @Override
-    protected Builder self() {
-      return this;
+    /**
+     * Asserts the app runs to completion within the timeout and exits with the expected value. Pass a
+     * non-zero expected value for apps expected to fail (e.g. a tool the agent aborts).
+     *
+     * @param timeout The maximum time to wait for the app to complete.
+     * @param unit The time unit of {@code timeout}.
+     * @param expectedExitValue The exit code the app is expected to return.
+     * @throws AssertionError If the app does not terminate in time or exits with a different code.
+     */
+    public void assertCompletesWithValue(long timeout, TimeUnit unit, int expectedExitValue) {
+        boolean exited;
+        try {
+            exited = process().waitFor(timeout, unit);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new AssertionError("Interrupted while waiting for app '" + name() + "' to complete", e);
+        }
+        if (!exited) {
+            throw new AssertionError("App '" + name() + "' did not complete within " + timeout + " " + unit);
+        }
+        int actual = process().exitValue();
+        if (actual != expectedExitValue) {
+            throw new AssertionError(
+                    "App '" + name() + "' exited with " + actual + " but expected " + expectedExitValue);
+        }
     }
 
-    @Override
-    public SmokeCliApp build() {
-      validate();
-      return new SmokeCliApp(this);
+    /** Fluent builder for a {@link SmokeCliApp}; obtain via {@link SmokeCliApp#named(String)}. */
+    public static final class Builder extends AbstractSmokeApp.Builder<SmokeCliApp, Builder> {
+        private Builder(String name) {
+            super(name);
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        @Override
+        public SmokeCliApp build() {
+            validate();
+            return new SmokeCliApp(this);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/src/main/java/datadog/smoketest/SmokeServerApp.java b/dd-smoke-tests/src/main/java/datadog/smoketest/SmokeServerApp.java
index def28a90848..4f2bda0ab82 100644
--- a/dd-smoke-tests/src/main/java/datadog/smoketest/SmokeServerApp.java
+++ b/dd-smoke-tests/src/main/java/datadog/smoketest/SmokeServerApp.java
@@ -31,115 +31,115 @@
  * }</pre>
  */
 public final class SmokeServerApp extends AbstractSmokeApp {
-  private static final String HTTP_PORT_PLACEHOLDER = "${app.httpPort}";
-
-  private final int httpPort;
-  private final OkHttpClient httpClient = new OkHttpClient();
-
-  private SmokeServerApp(Builder builder) {
-    super(builder);
-    this.httpPort = PortUtils.randomOpenPort();
-    registerPlaceholder(HTTP_PORT_PLACEHOLDER, () -> Integer.toString(this.httpPort));
-  }
-
-  /**
-   * Starts a fluent builder for a server app.
-   *
-   * @param name The application (log/diagnostic) name.
-   * @return A new builder for a {@link SmokeServerApp}.
-   */
-  public static Builder named(String name) {
-    return new Builder(name);
-  }
-
-  /**
-   * Returns the randomly-allocated port the app should bind, substituted for {@value
-   * #HTTP_PORT_PLACEHOLDER} in launch args.
-   *
-   * @return The HTTP port the app binds.
-   */
-  public int httpPort() {
-    return this.httpPort;
-  }
-
-  /**
-   * Returns the base URL of the app's HTTP server.
-   *
-   * @return The base URL of the app's HTTP server.
-   */
-  public URI url() {
-    return URI.create("http://localhost:" + this.httpPort);
-  }
-
-  /**
-   * Issues a GET to the app (the response is drained and closed).
-   *
-   * @param path The request path (a leading {@code /} is added if missing).
-   * @return The HTTP status code of the response.
-   * @throws IllegalStateException If the request fails.
-   */
-  @VisibleForTesting
-  int get(String path) {
-    String full = url() + (path.startsWith("/") ? path : "/" + path);
-    Request request = new Request.Builder().url(full).get().build();
-    try (Response response = this.httpClient.newCall(request).execute()) {
-      return response.code();
-    } catch (IOException e) {
-      throw new IllegalStateException("GET " + full + " failed", e);
+    private static final String HTTP_PORT_PLACEHOLDER = "${app.httpPort}";
+
+    private final int httpPort;
+    private final OkHttpClient httpClient = new OkHttpClient();
+
+    private SmokeServerApp(Builder builder) {
+        super(builder);
+        this.httpPort = PortUtils.randomOpenPort();
+        registerPlaceholder(HTTP_PORT_PLACEHOLDER, () -> Integer.toString(this.httpPort));
     }
-  }
-
-  @Override
-  protected void onStarted() {
-    waitForPortToOpen(this.httpPort, startupTimeoutSeconds(), SECONDS, process());
-  }
-
-  @Override
-  protected void onBeforeEach() {
-    // Ensure the server is still running
-    assertAlive("at the start of a test");
-    // Clear backend session of owned backend
-    AgentBackend backend = backend();
-    if (!backend.isShared() && backend.clearsBetweenTests()) {
-      backend.clear();
+
+    /**
+     * Starts a fluent builder for a server app.
+     *
+     * @param name The application (log/diagnostic) name.
+     * @return A new builder for a {@link SmokeServerApp}.
+     */
+    public static Builder named(String name) {
+        return new Builder(name);
     }
-    // Clear logs
-    clearCapturedLogs();
-  }
-
-  @Override
-  protected void onAfterEach() {
-    assertAlive("at the end of a test");
-  }
-
-  private void assertAlive(String when) {
-    Process process = process();
-    if (process == null) {
-      throw new IllegalStateException("App '" + name() + "' was never launched");
+
+    /**
+     * Returns the randomly-allocated port the app should bind, substituted for {@value
+     * #HTTP_PORT_PLACEHOLDER} in launch args.
+     *
+     * @return The HTTP port the app binds.
+     */
+    public int httpPort() {
+        return this.httpPort;
     }
-    if (!process.isAlive()) {
-      throw new IllegalStateException(
-          "App '" + name() + "' exited with value " + process.exitValue() + " " + when);
+
+    /**
+     * Returns the base URL of the app's HTTP server.
+     *
+     * @return The base URL of the app's HTTP server.
+     */
+    public URI url() {
+        return URI.create("http://localhost:" + this.httpPort);
     }
-  }
-
-  /**
-   * Fluent builder for a {@link SmokeServerApp}; obtain via {@link SmokeServerApp#named(String)}.
-   */
-  public static final class Builder extends AbstractSmokeApp.Builder<SmokeServerApp, Builder> {
-    private Builder(String name) {
-      super(name);
+
+    /**
+     * Issues a GET to the app (the response is drained and closed).
+     *
+     * @param path The request path (a leading {@code /} is added if missing).
+     * @return The HTTP status code of the response.
+     * @throws IllegalStateException If the request fails.
+     */
+    @VisibleForTesting
+    int get(String path) {
+        String full = url() + (path.startsWith("/") ? path : "/" + path);
+        Request request = new Request.Builder().url(full).get().build();
+        try (Response response = this.httpClient.newCall(request).execute()) {
+            return response.code();
+        } catch (IOException e) {
+            throw new IllegalStateException("GET " + full + " failed", e);
+        }
     }
 
     @Override
-    protected Builder self() {
-      return this;
+    protected void onStarted() {
+        waitForPortToOpen(this.httpPort, startupTimeoutSeconds(), SECONDS, process());
     }
 
     @Override
-    public SmokeServerApp build() {
-      validate();
-      return new SmokeServerApp(this);
+    protected void onBeforeEach() {
+        // Ensure the server is still running
+        assertAlive("at the start of a test");
+        // Clear backend session of owned backend
+        AgentBackend backend = backend();
+        if (!backend.isShared() && backend.clearsBetweenTests()) {
+            backend.clear();
+        }
+        // Clear logs
+        clearCapturedLogs();
+    }
+
+    @Override
+    protected void onAfterEach() {
+        assertAlive("at the end of a test");
+    }
+
+    private void assertAlive(String when) {
+        Process process = process();
+        if (process == null) {
+            throw new IllegalStateException("App '" + name() + "' was never launched");
+        }
+        if (!process.isAlive()) {
+            throw new IllegalStateException(
+                    "App '" + name() + "' exited with value " + process.exitValue() + " " + when);
+        }
+    }
+
+    /**
+     * Fluent builder for a {@link SmokeServerApp}; obtain via {@link SmokeServerApp#named(String)}.
+     */
+    public static final class Builder extends AbstractSmokeApp.Builder<SmokeServerApp, Builder> {
+        private Builder(String name) {
+            super(name);
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        @Override
+        public SmokeServerApp build() {
+            validate();
+            return new SmokeServerApp(this);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/src/main/java/datadog/smoketest/backend/AgentBackend.java b/dd-smoke-tests/src/main/java/datadog/smoketest/backend/AgentBackend.java
index b8172794eb1..f11e93363d8 100644
--- a/dd-smoke-tests/src/main/java/datadog/smoketest/backend/AgentBackend.java
+++ b/dd-smoke-tests/src/main/java/datadog/smoketest/backend/AgentBackend.java
@@ -34,142 +34,141 @@
  *     .build();
  * }</pre>
  */
-public abstract class AgentBackend
-    implements AutoCloseable, BeforeAllCallback, BeforeEachCallback, AfterAllCallback {
-  private volatile boolean registered;
-
-  /** Starts the backend and binds it to a port. Must be idempotent. */
-  public abstract void start();
-
-  /**
-   * Returns the agent port the app should send traces to (e.g. {@code -Ddd.trace.agent.port}).
-   *
-   * @return The bound agent port.
-   */
-  public abstract int port();
-
-  /**
-   * Returns the base URL of the backend.
-   *
-   * @return The backend base URL.
-   */
-  public abstract URI url();
-
-  /**
-   * Returns the query/assert facade over the traces this backend has received.
-   *
-   * @return The {@link Traces} facade for this backend.
-   */
-  public abstract Traces traces();
-
-  /**
-   * Returns the query facade over the app-telemetry messages this backend has received.
-   *
-   * @return The {@link Telemetry} facade for this backend.
-   */
-  public abstract Telemetry telemetry();
-
-  /**
-   * Returns the Remote Configuration facade of this backend: push a config the app's tracer will
-   * receive on its next {@code /v0.7/config} poll, and read back the tracer's poll requests.
-   *
-   * @return The {@link RemoteConfig} facade for this backend.
-   */
-  public abstract RemoteConfig remoteConfig();
-
-  /**
-   * Discards everything received so far (traces, telemetry and any pushed remote config). To be
-   * called between test methods to isolate them.
-   */
-  public abstract void clear();
-
-  @Override
-  public abstract void close();
-
-  /**
-   * Returns the session token the launched app must emit (via {@code dd.test.agent.session.token})
-   * for its data to be attributed to this backend. The in-process mock owns its own server and does
-   * not scope by session, so it returns {@code null}; the test agent overrides this.
-   *
-   * @return The session token, or {@code null} if the backend does not scope by session.
-   */
-  public String sessionToken() {
-    return null;
-  }
-
-  /**
-   * Returns whether this backend manages its own lifecycle as a separate {@code @RegisterExtension}
-   * shared across apps. This is inferred from JUnit registration — an inline backend is not a
-   * registered extension, so it returns {@code false} — and is therefore only accurate once the
-   * extension lifecycle has begun (from {@link #beforeAll} onward). When {@code false}, the owning
-   * app starts and stops the backend.
-   *
-   * @return {@code true} if the backend is shared and drives its own lifecycle.
-   */
-  public final boolean isShared() {
-    return this.registered;
-  }
-
-  /**
-   * Returns whether {@link #beforeEach} clears what the backend received so each test method sees
-   * only its own (the default). Return {@code false} to <em>accumulate</em> across methods — needed
-   * when the assertions cover data emitted at app startup (before the first test method), which a
-   * per-method clear would discard.
-   *
-   * @return {@code true} to clear between methods, {@code false} to accumulate across them.
-   */
-  public boolean clearsBetweenTests() {
-    return true;
-  }
-
-  @Override
-  public final void beforeAll(ExtensionContext context) {
-    this.registered = true;
-    start();
-  }
-
-  @Override
-  public void beforeEach(ExtensionContext context) {
-    if (clearsBetweenTests()) {
-      clear();
+public abstract class AgentBackend implements AutoCloseable, BeforeAllCallback, BeforeEachCallback, AfterAllCallback {
+    private volatile boolean registered;
+
+    /** Starts the backend and binds it to a port. Must be idempotent. */
+    public abstract void start();
+
+    /**
+     * Returns the agent port the app should send traces to (e.g. {@code -Ddd.trace.agent.port}).
+     *
+     * @return The bound agent port.
+     */
+    public abstract int port();
+
+    /**
+     * Returns the base URL of the backend.
+     *
+     * @return The backend base URL.
+     */
+    public abstract URI url();
+
+    /**
+     * Returns the query/assert facade over the traces this backend has received.
+     *
+     * @return The {@link Traces} facade for this backend.
+     */
+    public abstract Traces traces();
+
+    /**
+     * Returns the query facade over the app-telemetry messages this backend has received.
+     *
+     * @return The {@link Telemetry} facade for this backend.
+     */
+    public abstract Telemetry telemetry();
+
+    /**
+     * Returns the Remote Configuration facade of this backend: push a config the app's tracer will
+     * receive on its next {@code /v0.7/config} poll, and read back the tracer's poll requests.
+     *
+     * @return The {@link RemoteConfig} facade for this backend.
+     */
+    public abstract RemoteConfig remoteConfig();
+
+    /**
+     * Discards everything received so far (traces, telemetry and any pushed remote config). To be
+     * called between test methods to isolate them.
+     */
+    public abstract void clear();
+
+    @Override
+    public abstract void close();
+
+    /**
+     * Returns the session token the launched app must emit (via {@code dd.test.agent.session.token})
+     * for its data to be attributed to this backend. The in-process mock owns its own server and does
+     * not scope by session, so it returns {@code null}; the test agent overrides this.
+     *
+     * @return The session token, or {@code null} if the backend does not scope by session.
+     */
+    public String sessionToken() {
+        return null;
+    }
+
+    /**
+     * Returns whether this backend manages its own lifecycle as a separate {@code @RegisterExtension}
+     * shared across apps. This is inferred from JUnit registration — an inline backend is not a
+     * registered extension, so it returns {@code false} — and is therefore only accurate once the
+     * extension lifecycle has begun (from {@link #beforeAll} onward). When {@code false}, the owning
+     * app starts and stops the backend.
+     *
+     * @return {@code true} if the backend is shared and drives its own lifecycle.
+     */
+    public final boolean isShared() {
+        return this.registered;
+    }
+
+    /**
+     * Returns whether {@link #beforeEach} clears what the backend received so each test method sees
+     * only its own (the default). Return {@code false} to <em>accumulate</em> across methods — needed
+     * when the assertions cover data emitted at app startup (before the first test method), which a
+     * per-method clear would discard.
+     *
+     * @return {@code true} to clear between methods, {@code false} to accumulate across them.
+     */
+    public boolean clearsBetweenTests() {
+        return true;
+    }
+
+    @Override
+    public final void beforeAll(ExtensionContext context) {
+        this.registered = true;
+        start();
+    }
+
+    @Override
+    public void beforeEach(ExtensionContext context) {
+        if (clearsBetweenTests()) {
+            clear();
+        }
+    }
+
+    @Override
+    public void afterAll(ExtensionContext context) {
+        close();
+    }
+
+    /**
+     * Creates an in-process mock-agent backend, wrapping a {@code JavaTestHttpServer}, for local
+     * development and rapid prototyping.
+     *
+     * @return A new in-process mock-agent backend.
+     * @deprecated Prefer {@link #testAgent()}, which speaks the real agent protocol.
+     */
+    @Deprecated
+    public static AgentBackend mockAgent() {
+        return new MockAgentBackend();
+    }
+
+    /**
+     * Starts a fluent builder for a {@link TestAgentBackend} (dd-apm-test-agent container or
+     * external).
+     *
+     * @return A new test-agent backend builder.
+     */
+    public static TestAgentBackend.Builder testAgentBuilder() {
+        return TestAgentBackend.builder();
+    }
+
+    /**
+     * Resolves the environment's default test-agent backend: the external CI sidecar when {@code
+     * CI_AGENT_HOST} is set, otherwise a Testcontainers-managed container (which requires a running
+     * Docker daemon).
+     *
+     * @return An external or containerized test-agent backend.
+     */
+    public static AgentBackend testAgent() {
+        return testAgentBuilder().build();
     }
-  }
-
-  @Override
-  public void afterAll(ExtensionContext context) {
-    close();
-  }
-
-  /**
-   * Creates an in-process mock-agent backend, wrapping a {@code JavaTestHttpServer}, for local
-   * development and rapid prototyping.
-   *
-   * @return A new in-process mock-agent backend.
-   * @deprecated Prefer {@link #testAgent()}, which speaks the real agent protocol.
-   */
-  @Deprecated
-  public static AgentBackend mockAgent() {
-    return new MockAgentBackend();
-  }
-
-  /**
-   * Starts a fluent builder for a {@link TestAgentBackend} (dd-apm-test-agent container or
-   * external).
-   *
-   * @return A new test-agent backend builder.
-   */
-  public static TestAgentBackend.Builder testAgentBuilder() {
-    return TestAgentBackend.builder();
-  }
-
-  /**
-   * Resolves the environment's default test-agent backend: the external CI sidecar when {@code
-   * CI_AGENT_HOST} is set, otherwise a Testcontainers-managed container (which requires a running
-   * Docker daemon).
-   *
-   * @return An external or containerized test-agent backend.
-   */
-  public static AgentBackend testAgent() {
-    return testAgentBuilder().build();
-  }
 }
diff --git a/dd-smoke-tests/src/main/java/datadog/smoketest/backend/AgentBackendMessages.java b/dd-smoke-tests/src/main/java/datadog/smoketest/backend/AgentBackendMessages.java
index 546b96a413c..d2b4799c3d6 100644
--- a/dd-smoke-tests/src/main/java/datadog/smoketest/backend/AgentBackendMessages.java
+++ b/dd-smoke-tests/src/main/java/datadog/smoketest/backend/AgentBackendMessages.java
@@ -23,85 +23,82 @@
  * fine for the presence/string assertions these tests do.
  */
 final class AgentBackendMessages {
-  private static final Type MESSAGE =
-      Types.newParameterizedType(Map.class, String.class, Object.class);
-  private static final Moshi MOSHI = new Moshi.Builder().build();
-  private static final JsonAdapter<Map<String, Object>> MESSAGE_ADAPTER = MOSHI.adapter(MESSAGE);
-  private static final JsonAdapter<List<Map<String, Object>>> MESSAGE_LIST_ADAPTER =
-      MOSHI.adapter(Types.newParameterizedType(List.class, MESSAGE));
+    private static final Type MESSAGE = Types.newParameterizedType(Map.class, String.class, Object.class);
+    private static final Moshi MOSHI = new Moshi.Builder().build();
+    private static final JsonAdapter<Map<String, Object>> MESSAGE_ADAPTER = MOSHI.adapter(MESSAGE);
+    private static final JsonAdapter<List<Map<String, Object>>> MESSAGE_LIST_ADAPTER =
+            MOSHI.adapter(Types.newParameterizedType(List.class, MESSAGE));
 
-  private AgentBackendMessages() {}
+    private AgentBackendMessages() {}
 
-  /**
-   * Decodes one captured JSON object (a telemetry intake body, a remote-config poll, ...).
-   *
-   * @param json The captured request body.
-   * @return The decoded map, or an empty map if the body is a JSON {@code null}.
-   */
-  static Map<String, Object> decodeMessage(byte[] json) {
-    try {
-      Map<String, Object> message = MESSAGE_ADAPTER.fromJson(new String(json, UTF_8));
-      return message == null ? emptyMap() : message;
-    } catch (IOException | JsonDataException e) {
-      throw new IllegalStateException("Failed to parse JSON object", e);
+    /**
+     * Decodes one captured JSON object (a telemetry intake body, a remote-config poll, ...).
+     *
+     * @param json The captured request body.
+     * @return The decoded map, or an empty map if the body is a JSON {@code null}.
+     */
+    static Map<String, Object> decodeMessage(byte[] json) {
+        try {
+            Map<String, Object> message = MESSAGE_ADAPTER.fromJson(new String(json, UTF_8));
+            return message == null ? emptyMap() : message;
+        } catch (IOException | JsonDataException e) {
+            throw new IllegalStateException("Failed to parse JSON object", e);
+        }
     }
-  }
 
-  /**
-   * Decodes the test agent's {@code /test/session/apmtelemetry} response (a JSON array of
-   * messages).
-   *
-   * @param json The response body.
-   * @return The decoded message maps, or an empty list if the body is a JSON {@code null}.
-   */
-  static List<Map<String, Object>> decodeMessages(String json) {
-    try {
-      List<Map<String, Object>> messages = MESSAGE_LIST_ADAPTER.fromJson(json);
-      return messages == null ? emptyList() : messages;
-    } catch (IOException | JsonDataException e) {
-      throw new IllegalStateException(
-          "Failed to parse /test/session/apmtelemetry response: " + json, e);
+    /**
+     * Decodes the test agent's {@code /test/session/apmtelemetry} response (a JSON array of
+     * messages).
+     *
+     * @param json The response body.
+     * @return The decoded message maps, or an empty list if the body is a JSON {@code null}.
+     */
+    static List<Map<String, Object>> decodeMessages(String json) {
+        try {
+            List<Map<String, Object>> messages = MESSAGE_LIST_ADAPTER.fromJson(json);
+            return messages == null ? emptyList() : messages;
+        } catch (IOException | JsonDataException e) {
+            throw new IllegalStateException("Failed to parse /test/session/apmtelemetry response: " + json, e);
+        }
     }
-  }
 
-  /**
-   * Builds a {@code /v0.7/config} response serving a single config, as the Groovy smoke base did.
-   * The TUF envelope is unsigned — the tracer only verifies signatures when {@code
-   * remote_config.integrity_check.enabled} is on — but it always checks each target file against
-   * the sha256 and byte length declared in {@code targets}.
-   *
-   * @param path The RC target path (e.g. {@code datadog/2/APM_TRACING/config_overrides/config}).
-   * @param config The config content as a JSON object literal.
-   * @return The remote-config response body.
-   */
-  static String remoteConfigResponse(String path, String config) {
-    byte[] raw = config.getBytes(UTF_8);
-    String quotedPath = '"' + path.replace("\\", "\\\\").replace("\"", "\\\"") + '"';
-    String targets =
-        "{\"signed\":{\"expires\":\"9999-12-31T23:59:59Z\",\"spec_version\":\"1.0.0\",\"targets\":{"
-            + quotedPath
-            + ":{\"custom\":{\"v\":1},\"hashes\":{\"sha256\":\""
-            + sha256(config)
-            + "\"},\"length\":"
-            + raw.length
-            + "}}}}";
-    Base64.Encoder base64 = Base64.getEncoder();
-    return "{\"client_configs\":["
-        + quotedPath
-        + "],\"roots\":[],\"target_files\":[{\"path\":"
-        + quotedPath
-        + ",\"raw\":\""
-        + base64.encodeToString(raw)
-        + "\"}],\"targets\":\""
-        + base64.encodeToString(targets.getBytes(UTF_8))
-        + "\"}";
-  }
+    /**
+     * Builds a {@code /v0.7/config} response serving a single config, as the Groovy smoke base did.
+     * The TUF envelope is unsigned — the tracer only verifies signatures when {@code
+     * remote_config.integrity_check.enabled} is on — but it always checks each target file against
+     * the sha256 and byte length declared in {@code targets}.
+     *
+     * @param path The RC target path (e.g. {@code datadog/2/APM_TRACING/config_overrides/config}).
+     * @param config The config content as a JSON object literal.
+     * @return The remote-config response body.
+     */
+    static String remoteConfigResponse(String path, String config) {
+        byte[] raw = config.getBytes(UTF_8);
+        String quotedPath = '"' + path.replace("\\", "\\\\").replace("\"", "\\\"") + '"';
+        String targets = "{\"signed\":{\"expires\":\"9999-12-31T23:59:59Z\",\"spec_version\":\"1.0.0\",\"targets\":{"
+                + quotedPath
+                + ":{\"custom\":{\"v\":1},\"hashes\":{\"sha256\":\""
+                + sha256(config)
+                + "\"},\"length\":"
+                + raw.length
+                + "}}}}";
+        Base64.Encoder base64 = Base64.getEncoder();
+        return "{\"client_configs\":["
+                + quotedPath
+                + "],\"roots\":[],\"target_files\":[{\"path\":"
+                + quotedPath
+                + ",\"raw\":\""
+                + base64.encodeToString(raw)
+                + "\"}],\"targets\":\""
+                + base64.encodeToString(targets.getBytes(UTF_8))
+                + "\"}";
+    }
 
-  private static String sha256(String input) {
-    try {
-      return Strings.sha256(input);
-    } catch (NoSuchAlgorithmException e) {
-      throw new IllegalStateException("SHA-256 unavailable", e);
+    private static String sha256(String input) {
+        try {
+            return Strings.sha256(input);
+        } catch (NoSuchAlgorithmException e) {
+            throw new IllegalStateException("SHA-256 unavailable", e);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/src/main/java/datadog/smoketest/backend/MockAgentBackend.java b/dd-smoke-tests/src/main/java/datadog/smoketest/backend/MockAgentBackend.java
index 72b415ad789..cf3bdb5460b 100644
--- a/dd-smoke-tests/src/main/java/datadog/smoketest/backend/MockAgentBackend.java
+++ b/dd-smoke-tests/src/main/java/datadog/smoketest/backend/MockAgentBackend.java
@@ -21,198 +21,194 @@
  * type rather than the common {@link AgentBackend} facade.
  */
 public final class MockAgentBackend extends AgentBackend {
-  /**
-   * Agent-info payload advertising the endpoints and capabilities the tracer negotiates from,
-   * mirroring the real agent.
-   */
-  private static final String INFO_BODY =
-      "{\"version\":\"7.77.0\","
-          + "\"endpoints\":[\"/v0.4/traces\",\"/v0.5/traces\",\"/v1.0/traces\",\"/telemetry/proxy/\"],"
-          + "\"client_drop_p0s\":true,"
-          + "\"span_meta_structs\":true,"
-          + "\"long_running_spans\":true}";
-
-  /** JSON mime type. */
-  private static final String JSON = "application/json";
-
-  /** The "no configs" remote-config response, as served until a test pushes one. */
-  private static final String NO_REMOTE_CONFIG = "{}";
-
-  private final List<DecodedTrace> traces = new CopyOnWriteArrayList<>();
-  private final List<Map<String, Object>> telemetry = new CopyOnWriteArrayList<>();
-  private final List<Map<String, Object>> remoteConfigPolls = new CopyOnWriteArrayList<>();
-  private volatile String remoteConfigResponse = NO_REMOTE_CONFIG;
-  private volatile JavaTestHttpServer server;
-  // Decoding runs on the server thread, where JavaTestHttpServer swallows the failure into a 500.
-  private volatile Throwable traceFailure;
-  private volatile Throwable telemetryFailure;
-  private volatile Throwable remoteConfigFailure;
-
-  MockAgentBackend() {}
-
-  @Override
-  public void start() {
-    if (this.server != null) {
-      return;
-    }
-    this.server = JavaTestHttpServer.httpServer(this::serverSpecs);
-  }
-
-  private void serverSpecs(JavaTestHttpServer server) {
-    server.handlers(
-        h -> {
-          // Trace endpoints are method-agnostic prefix handlers: the tracer submits
-          // traces with PUT (DDAgentApi), not POST.
-          h.prefix("/info", this::sendInfo);
-          h.prefix("/v1.0/traces", api -> collectTraces(api, TraceFormat.V1));
-          h.prefix("/v0.5/traces", api -> collectTraces(api, TraceFormat.V05));
-          h.prefix("/v0.4/traces", api -> collectTraces(api, TraceFormat.V04));
-          h.prefix("/v0.7/config", this::serveRemoteConfig);
-          h.prefix("/telemetry/proxy", this::collectTelemetry);
-          // Everything else just succeeds.
-          h.all(api -> api.getResponse().status(200).send());
+    /**
+     * Agent-info payload advertising the endpoints and capabilities the tracer negotiates from,
+     * mirroring the real agent.
+     */
+    private static final String INFO_BODY = "{\"version\":\"7.77.0\","
+            + "\"endpoints\":[\"/v0.4/traces\",\"/v0.5/traces\",\"/v1.0/traces\",\"/telemetry/proxy/\"],"
+            + "\"client_drop_p0s\":true,"
+            + "\"span_meta_structs\":true,"
+            + "\"long_running_spans\":true}";
+
+    /** JSON mime type. */
+    private static final String JSON = "application/json";
+
+    /** The "no configs" remote-config response, as served until a test pushes one. */
+    private static final String NO_REMOTE_CONFIG = "{}";
+
+    private final List<DecodedTrace> traces = new CopyOnWriteArrayList<>();
+    private final List<Map<String, Object>> telemetry = new CopyOnWriteArrayList<>();
+    private final List<Map<String, Object>> remoteConfigPolls = new CopyOnWriteArrayList<>();
+    private volatile String remoteConfigResponse = NO_REMOTE_CONFIG;
+    private volatile JavaTestHttpServer server;
+    // Decoding runs on the server thread, where JavaTestHttpServer swallows the failure into a 500.
+    private volatile Throwable traceFailure;
+    private volatile Throwable telemetryFailure;
+    private volatile Throwable remoteConfigFailure;
+
+    MockAgentBackend() {}
+
+    @Override
+    public void start() {
+        if (this.server != null) {
+            return;
+        }
+        this.server = JavaTestHttpServer.httpServer(this::serverSpecs);
+    }
+
+    private void serverSpecs(JavaTestHttpServer server) {
+        server.handlers(h -> {
+            // Trace endpoints are method-agnostic prefix handlers: the tracer submits
+            // traces with PUT (DDAgentApi), not POST.
+            h.prefix("/info", this::sendInfo);
+            h.prefix("/v1.0/traces", api -> collectTraces(api, TraceFormat.V1));
+            h.prefix("/v0.5/traces", api -> collectTraces(api, TraceFormat.V05));
+            h.prefix("/v0.4/traces", api -> collectTraces(api, TraceFormat.V04));
+            h.prefix("/v0.7/config", this::serveRemoteConfig);
+            h.prefix("/telemetry/proxy", this::collectTelemetry);
+            // Everything else just succeeds.
+            h.all(api -> api.getResponse().status(200).send());
         });
-  }
-
-  private void sendInfo(HandlerApi api) {
-    api.getResponse().status(200).sendWithType(JSON, INFO_BODY);
-  }
-
-  private void collectTraces(HandlerApi api, TraceFormat format) {
-    try {
-      DecodedMessage message = format.decode(api.getRequest().getBody());
-      this.traces.addAll(message.getTraces());
-    } catch (Throwable t) {
-      this.traceFailure = t;
-      throw t;
-    }
-    api.getResponse().status(200).sendWithType(JSON, "{}");
-  }
-
-  private List<DecodedTrace> collectedTraces() {
-    if (this.traceFailure != null) {
-      throw new IllegalStateException(
-          "Mock agent failed to decode received traces", this.traceFailure);
-    }
-    return new ArrayList<>(this.traces);
-  }
-
-  private void serveRemoteConfig(HandlerApi api) {
-    byte[] body = api.getRequest().getBody();
-    if (body != null && body.length > 0) {
-      try {
-        this.remoteConfigPolls.add(AgentBackendMessages.decodeMessage(body));
-      } catch (Throwable t) {
-        this.remoteConfigFailure = t;
-        throw t;
-      }
-    }
-    api.getResponse().status(200).sendWithType(JSON, this.remoteConfigResponse);
-  }
-
-  private List<Map<String, Object>> collectedRemoteConfigPolls() {
-    if (this.remoteConfigFailure != null) {
-      throw new IllegalStateException(
-          "Mock agent failed to decode received remote-config polls", this.remoteConfigFailure);
-    }
-    return new ArrayList<>(this.remoteConfigPolls);
-  }
-
-  private void pushRemoteConfig(String path, String config) {
-    this.remoteConfigResponse = AgentBackendMessages.remoteConfigResponse(path, config);
-  }
-
-  private void collectTelemetry(HandlerApi api) {
-    byte[] body = api.getRequest().getBody();
-    if (body != null && body.length > 0) {
-      try {
-        this.telemetry.add(AgentBackendMessages.decodeMessage(body));
-      } catch (Throwable t) {
-        this.telemetryFailure = t;
-        throw t;
-      }
-    }
-    api.getResponse().status(202).send();
-  }
-
-  private List<Map<String, Object>> collectedTelemetry() {
-    if (this.telemetryFailure != null) {
-      throw new IllegalStateException(
-          "Mock agent failed to decode received telemetry", this.telemetryFailure);
-    }
-    return new ArrayList<>(this.telemetry);
-  }
-
-  @Override
-  public int port() {
-    return url().getPort();
-  }
-
-  @Override
-  public URI url() {
-    JavaTestHttpServer running = this.server;
-    if (running == null) {
-      throw new IllegalStateException("MockAgentBackend not started — call start() first");
-    }
-    return running.getAddress();
-  }
-
-  @Override
-  public Traces traces() {
-    return new Traces(this::collectedTraces);
-  }
-
-  @Override
-  public Telemetry telemetry() {
-    return new Telemetry(this::collectedTelemetry);
-  }
-
-  @Override
-  public RemoteConfig remoteConfig() {
-    return new RemoteConfig(this::pushRemoteConfig, this::collectedRemoteConfigPolls);
-  }
-
-  @Override
-  public void clear() {
-    this.traces.clear();
-    this.telemetry.clear();
-    this.remoteConfigPolls.clear();
-    this.remoteConfigResponse = NO_REMOTE_CONFIG;
-    this.traceFailure = null;
-    this.telemetryFailure = null;
-    this.remoteConfigFailure = null;
-  }
-
-  @Override
-  public void close() {
-    JavaTestHttpServer running = this.server;
-    if (running != null) {
-      this.server = null;
-      running.close();
-    }
-  }
-
-  /** The msgpack trace-payload formats the mock agent accepts, each decoded by {@link Decoder}. */
-  private enum TraceFormat {
-    V04 {
-      @Override
-      DecodedMessage decode(byte[] body) {
-        return Decoder.decodeV04(body);
-      }
-    },
-    V05 {
-      @Override
-      DecodedMessage decode(byte[] body) {
-        return Decoder.decodeV05(body);
-      }
-    },
-    V1 {
-      @Override
-      DecodedMessage decode(byte[] body) {
-        return Decoder.decodeV1(body);
-      }
-    };
-
-    abstract DecodedMessage decode(byte[] body);
-  }
+    }
+
+    private void sendInfo(HandlerApi api) {
+        api.getResponse().status(200).sendWithType(JSON, INFO_BODY);
+    }
+
+    private void collectTraces(HandlerApi api, TraceFormat format) {
+        try {
+            DecodedMessage message = format.decode(api.getRequest().getBody());
+            this.traces.addAll(message.getTraces());
+        } catch (Throwable t) {
+            this.traceFailure = t;
+            throw t;
+        }
+        api.getResponse().status(200).sendWithType(JSON, "{}");
+    }
+
+    private List<DecodedTrace> collectedTraces() {
+        if (this.traceFailure != null) {
+            throw new IllegalStateException("Mock agent failed to decode received traces", this.traceFailure);
+        }
+        return new ArrayList<>(this.traces);
+    }
+
+    private void serveRemoteConfig(HandlerApi api) {
+        byte[] body = api.getRequest().getBody();
+        if (body != null && body.length > 0) {
+            try {
+                this.remoteConfigPolls.add(AgentBackendMessages.decodeMessage(body));
+            } catch (Throwable t) {
+                this.remoteConfigFailure = t;
+                throw t;
+            }
+        }
+        api.getResponse().status(200).sendWithType(JSON, this.remoteConfigResponse);
+    }
+
+    private List<Map<String, Object>> collectedRemoteConfigPolls() {
+        if (this.remoteConfigFailure != null) {
+            throw new IllegalStateException(
+                    "Mock agent failed to decode received remote-config polls", this.remoteConfigFailure);
+        }
+        return new ArrayList<>(this.remoteConfigPolls);
+    }
+
+    private void pushRemoteConfig(String path, String config) {
+        this.remoteConfigResponse = AgentBackendMessages.remoteConfigResponse(path, config);
+    }
+
+    private void collectTelemetry(HandlerApi api) {
+        byte[] body = api.getRequest().getBody();
+        if (body != null && body.length > 0) {
+            try {
+                this.telemetry.add(AgentBackendMessages.decodeMessage(body));
+            } catch (Throwable t) {
+                this.telemetryFailure = t;
+                throw t;
+            }
+        }
+        api.getResponse().status(202).send();
+    }
+
+    private List<Map<String, Object>> collectedTelemetry() {
+        if (this.telemetryFailure != null) {
+            throw new IllegalStateException("Mock agent failed to decode received telemetry", this.telemetryFailure);
+        }
+        return new ArrayList<>(this.telemetry);
+    }
+
+    @Override
+    public int port() {
+        return url().getPort();
+    }
+
+    @Override
+    public URI url() {
+        JavaTestHttpServer running = this.server;
+        if (running == null) {
+            throw new IllegalStateException("MockAgentBackend not started — call start() first");
+        }
+        return running.getAddress();
+    }
+
+    @Override
+    public Traces traces() {
+        return new Traces(this::collectedTraces);
+    }
+
+    @Override
+    public Telemetry telemetry() {
+        return new Telemetry(this::collectedTelemetry);
+    }
+
+    @Override
+    public RemoteConfig remoteConfig() {
+        return new RemoteConfig(this::pushRemoteConfig, this::collectedRemoteConfigPolls);
+    }
+
+    @Override
+    public void clear() {
+        this.traces.clear();
+        this.telemetry.clear();
+        this.remoteConfigPolls.clear();
+        this.remoteConfigResponse = NO_REMOTE_CONFIG;
+        this.traceFailure = null;
+        this.telemetryFailure = null;
+        this.remoteConfigFailure = null;
+    }
+
+    @Override
+    public void close() {
+        JavaTestHttpServer running = this.server;
+        if (running != null) {
+            this.server = null;
+            running.close();
+        }
+    }
+
+    /** The msgpack trace-payload formats the mock agent accepts, each decoded by {@link Decoder}. */
+    private enum TraceFormat {
+        V04 {
+            @Override
+            DecodedMessage decode(byte[] body) {
+                return Decoder.decodeV04(body);
+            }
+        },
+        V05 {
+            @Override
+            DecodedMessage decode(byte[] body) {
+                return Decoder.decodeV05(body);
+            }
+        },
+        V1 {
+            @Override
+            DecodedMessage decode(byte[] body) {
+                return Decoder.decodeV1(body);
+            }
+        };
+
+        abstract DecodedMessage decode(byte[] body);
+    }
 }
diff --git a/dd-smoke-tests/src/main/java/datadog/smoketest/backend/RemoteConfig.java b/dd-smoke-tests/src/main/java/datadog/smoketest/backend/RemoteConfig.java
index 55a54fb516b..e5118ccfff1 100644
--- a/dd-smoke-tests/src/main/java/datadog/smoketest/backend/RemoteConfig.java
+++ b/dd-smoke-tests/src/main/java/datadog/smoketest/backend/RemoteConfig.java
@@ -16,113 +16,110 @@
  * /v0.7/config} poll, and read back the tracer's poll requests.
  */
 public final class RemoteConfig {
-  private static final double DEFAULT_TIMEOUT_SECONDS = 30;
+    private static final double DEFAULT_TIMEOUT_SECONDS = 30;
 
-  private final BiConsumer<String, String> setter;
-  private final Supplier<List<Map<String, Object>>> requests;
+    private final BiConsumer<String, String> setter;
+    private final Supplier<List<Map<String, Object>>> requests;
 
-  RemoteConfig(BiConsumer<String, String> setter, Supplier<List<Map<String, Object>>> requests) {
-    this.setter = setter;
-    this.requests = requests;
-  }
+    RemoteConfig(BiConsumer<String, String> setter, Supplier<List<Map<String, Object>>> requests) {
+        this.setter = setter;
+        this.requests = requests;
+    }
 
-  /**
-   * Set a Remote Configuration response payload to the app's tracer on its next {@code
-   * /v0.7/config} poll.
-   *
-   * @param path The RC target path (e.g. {@code datadog/2/APM_TRACING/config_overrides/config}).
-   * @param config The config content as a JSON object literal (e.g. {@code
-   *     {"asm":{"enabled":true}}}).
-   */
-  public void setConfig(String path, String config) {
-    this.setter.accept(path, config);
-  }
+    /**
+     * Set a Remote Configuration response payload to the app's tracer on its next {@code
+     * /v0.7/config} poll.
+     *
+     * @param path The RC target path (e.g. {@code datadog/2/APM_TRACING/config_overrides/config}).
+     * @param config The config content as a JSON object literal (e.g. {@code
+     *     {"asm":{"enabled":true}}}).
+     */
+    public void setConfig(String path, String config) {
+        this.setter.accept(path, config);
+    }
 
-  /**
-   * Returns the tracer's captured Remote Config poll requests (most recent first), each a decoded
-   * JSON map of the poll body.
-   *
-   * @return The captured poll request bodies.
-   */
-  public List<Map<String, Object>> requests() {
-    return this.requests.get();
-  }
+    /**
+     * Returns the tracer's captured Remote Config poll requests (most recent first), each a decoded
+     * JSON map of the poll body.
+     *
+     * @return The captured poll request bodies.
+     */
+    public List<Map<String, Object>> requests() {
+        return this.requests.get();
+    }
 
-  /**
-   * Waits up to {@value #DEFAULT_TIMEOUT_SECONDS}s for a captured Remote Config poll request
-   * satisfying the given predicate, and returns it.
-   *
-   * @param predicate The predicate a poll request must satisfy.
-   * @return The first matching poll request.
-   * @throws AssertionError If no matching request arrives before the timeout.
-   */
-  public Map<String, Object> waitForRequest(Predicate<Map<String, Object>> predicate) {
-    return waitForRequest(predicate, DEFAULT_TIMEOUT_SECONDS);
-  }
+    /**
+     * Waits up to {@value #DEFAULT_TIMEOUT_SECONDS}s for a captured Remote Config poll request
+     * satisfying the given predicate, and returns it.
+     *
+     * @param predicate The predicate a poll request must satisfy.
+     * @return The first matching poll request.
+     * @throws AssertionError If no matching request arrives before the timeout.
+     */
+    public Map<String, Object> waitForRequest(Predicate<Map<String, Object>> predicate) {
+        return waitForRequest(predicate, DEFAULT_TIMEOUT_SECONDS);
+    }
 
-  /**
-   * Waits for a captured Remote Config poll request satisfying the given predicate, and returns it.
-   *
-   * @param predicate The predicate a poll request must satisfy.
-   * @return The first matching poll request.
-   * @throws AssertionError If no matching request arrives before the timeout.
-   */
-  public Map<String, Object> waitForRequest(
-      Predicate<Map<String, Object>> predicate, double timeoutSeconds) {
-    AtomicReference<Map<String, Object>> match = new AtomicReference<>();
-    new PollingConditions(timeoutSeconds)
-        .eventually(
-            () -> {
-              for (Map<String, Object> request : requests()) {
+    /**
+     * Waits for a captured Remote Config poll request satisfying the given predicate, and returns it.
+     *
+     * @param predicate The predicate a poll request must satisfy.
+     * @return The first matching poll request.
+     * @throws AssertionError If no matching request arrives before the timeout.
+     */
+    public Map<String, Object> waitForRequest(Predicate<Map<String, Object>> predicate, double timeoutSeconds) {
+        AtomicReference<Map<String, Object>> match = new AtomicReference<>();
+        new PollingConditions(timeoutSeconds).eventually(() -> {
+            for (Map<String, Object> request : requests()) {
                 if (predicate.test(request)) {
-                  match.set(request);
-                  return;
+                    match.set(request);
+                    return;
                 }
-              }
-              throw new AssertionError("No remote-config poll request matched yet");
-            });
-    return match.get();
-  }
-
-  /**
-   * Decodes the products a Remote Config poll request subscribes to.
-   *
-   * @param request A poll request body (from {@link #requests()} or {@link #waitForRequest}).
-   * @return The subscribed product names.
-   */
-  @SuppressWarnings("unchecked")
-  public static Set<String> products(Map<String, Object> request) {
-    Map<String, Object> client = (Map<String, Object>) request.get("client");
-    Set<String> products = new HashSet<>();
-    if (client != null && client.get("products") instanceof List) {
-      for (Object product : (List<?>) client.get("products")) {
-        products.add(String.valueOf(product));
-      }
+            }
+            throw new AssertionError("No remote-config poll request matched yet");
+        });
+        return match.get();
     }
-    return products;
-  }
 
-  /**
-   * Decodes the capability flags a Remote Config poll request advertises. The tracer sends them as
-   * the big-endian bytes of a {@code long} (trailing zero bytes stripped); this reconstructs that
-   * {@code long} so callers can test individual {@code Capabilities.CAPABILITY_*} bits.
-   *
-   * @param request A poll request body (from {@link #requests()} or {@link #waitForRequest}).
-   * @return The advertised capabilities, as a bit set packed into a {@code long}.
-   */
-  @SuppressWarnings("unchecked")
-  public static long capabilities(Map<String, Object> request) {
-    Map<String, Object> client = (Map<String, Object>) request.get("client");
-    if (client == null || !(client.get("capabilities") instanceof List)) {
-      return 0L;
+    /**
+     * Decodes the products a Remote Config poll request subscribes to.
+     *
+     * @param request A poll request body (from {@link #requests()} or {@link #waitForRequest}).
+     * @return The subscribed product names.
+     */
+    @SuppressWarnings("unchecked")
+    public static Set<String> products(Map<String, Object> request) {
+        Map<String, Object> client = (Map<String, Object>) request.get("client");
+        Set<String> products = new HashSet<>();
+        if (client != null && client.get("products") instanceof List) {
+            for (Object product : (List<?>) client.get("products")) {
+                products.add(String.valueOf(product));
+            }
+        }
+        return products;
     }
-    List<?> bytes = (List<?>) client.get("capabilities");
-    long capabilities = 0L;
-    int size = bytes.size();
-    for (int i = 0; i < size; i++) {
-      long value = ((Number) bytes.get(i)).longValue() & 0xFF;
-      capabilities |= value << ((size - i - 1) * 8);
+
+    /**
+     * Decodes the capability flags a Remote Config poll request advertises. The tracer sends them as
+     * the big-endian bytes of a {@code long} (trailing zero bytes stripped); this reconstructs that
+     * {@code long} so callers can test individual {@code Capabilities.CAPABILITY_*} bits.
+     *
+     * @param request A poll request body (from {@link #requests()} or {@link #waitForRequest}).
+     * @return The advertised capabilities, as a bit set packed into a {@code long}.
+     */
+    @SuppressWarnings("unchecked")
+    public static long capabilities(Map<String, Object> request) {
+        Map<String, Object> client = (Map<String, Object>) request.get("client");
+        if (client == null || !(client.get("capabilities") instanceof List)) {
+            return 0L;
+        }
+        List<?> bytes = (List<?>) client.get("capabilities");
+        long capabilities = 0L;
+        int size = bytes.size();
+        for (int i = 0; i < size; i++) {
+            long value = ((Number) bytes.get(i)).longValue() & 0xFF;
+            capabilities |= value << ((size - i - 1) * 8);
+        }
+        return capabilities;
     }
-    return capabilities;
-  }
 }
diff --git a/dd-smoke-tests/src/main/java/datadog/smoketest/backend/Telemetry.java b/dd-smoke-tests/src/main/java/datadog/smoketest/backend/Telemetry.java
index 6d9c9529f57..7992424c4dd 100644
--- a/dd-smoke-tests/src/main/java/datadog/smoketest/backend/Telemetry.java
+++ b/dd-smoke-tests/src/main/java/datadog/smoketest/backend/Telemetry.java
@@ -11,102 +11,97 @@
  * This class is query facade over the app-telemetry messages a {@link AgentBackend} has received.
  */
 public final class Telemetry {
-  private static final double DEFAULT_TIMEOUT_SECONDS = 30;
+    private static final double DEFAULT_TIMEOUT_SECONDS = 30;
 
-  private final Supplier<List<Map<String, Object>>> source;
+    private final Supplier<List<Map<String, Object>>> source;
 
-  Telemetry(Supplier<List<Map<String, Object>>> source) {
-    this.source = source;
-  }
+    Telemetry(Supplier<List<Map<String, Object>>> source) {
+        this.source = source;
+    }
 
-  /**
-   * Returns the raw telemetry messages received, one map per intake request.
-   *
-   * @return The raw telemetry messages.
-   */
-  public List<Map<String, Object>> getMessages() {
-    return this.source.get();
-  }
+    /**
+     * Returns the raw telemetry messages received, one map per intake request.
+     *
+     * @return The raw telemetry messages.
+     */
+    public List<Map<String, Object>> getMessages() {
+        return this.source.get();
+    }
 
-  /**
-   * Returns individual telemetry events, expanding each {@code message-batch} into its {@code
-   * payload} entries.
-   *
-   * @return The flattened telemetry events.
-   */
-  @SuppressWarnings("unchecked")
-  public List<Map<String, Object>> getFlatMessages() {
-    List<Map<String, Object>> flat = new ArrayList<>();
-    for (Map<String, Object> message : getMessages()) {
-      Object payload = message.get("payload");
-      if ("message-batch".equals(message.get("request_type")) && payload instanceof List) {
-        for (Object entry : (List<?>) payload) {
-          if (entry instanceof Map) {
-            flat.add((Map<String, Object>) entry);
-          }
+    /**
+     * Returns individual telemetry events, expanding each {@code message-batch} into its {@code
+     * payload} entries.
+     *
+     * @return The flattened telemetry events.
+     */
+    @SuppressWarnings("unchecked")
+    public List<Map<String, Object>> getFlatMessages() {
+        List<Map<String, Object>> flat = new ArrayList<>();
+        for (Map<String, Object> message : getMessages()) {
+            Object payload = message.get("payload");
+            if ("message-batch".equals(message.get("request_type")) && payload instanceof List) {
+                for (Object entry : (List<?>) payload) {
+                    if (entry instanceof Map) {
+                        flat.add((Map<String, Object>) entry);
+                    }
+                }
+            } else {
+                flat.add(message);
+            }
         }
-      } else {
-        flat.add(message);
-      }
+        return flat;
     }
-    return flat;
-  }
 
-  /**
-   * Waits up to {@value DEFAULT_TIMEOUT_SECONDS}s until at least {@code count} messages have been
-   * received.
-   *
-   * @param count The minimum number of messages to wait for.
-   * @throws AssertionError If no {@code count} message have been received.
-   */
-  public void waitForCount(int count) {
-    waitForCount(count, DEFAULT_TIMEOUT_SECONDS);
-  }
+    /**
+     * Waits up to {@value DEFAULT_TIMEOUT_SECONDS}s until at least {@code count} messages have been
+     * received.
+     *
+     * @param count The minimum number of messages to wait for.
+     * @throws AssertionError If no {@code count} message have been received.
+     */
+    public void waitForCount(int count) {
+        waitForCount(count, DEFAULT_TIMEOUT_SECONDS);
+    }
 
-  /**
-   * Waits until at least {@code count} messages have been received.
-   *
-   * @param count The minimum number of messages to wait for.
-   * @param timeoutSeconds How long to wait, in seconds.
-   * @throws AssertionError If no flattened telemetry event could not match the predicate.
-   */
-  public void waitForCount(int count, double timeoutSeconds) {
-    new PollingConditions(timeoutSeconds)
-        .eventually(
-            () -> {
-              int actual = getMessages().size();
-              if (actual < count) {
-                throw new AssertionError(
-                    "Expected at least " + count + " telemetry message(s) but got " + actual);
-              }
-            });
-  }
+    /**
+     * Waits until at least {@code count} messages have been received.
+     *
+     * @param count The minimum number of messages to wait for.
+     * @param timeoutSeconds How long to wait, in seconds.
+     * @throws AssertionError If no flattened telemetry event could not match the predicate.
+     */
+    public void waitForCount(int count, double timeoutSeconds) {
+        new PollingConditions(timeoutSeconds).eventually(() -> {
+            int actual = getMessages().size();
+            if (actual < count) {
+                throw new AssertionError("Expected at least " + count + " telemetry message(s) but got " + actual);
+            }
+        });
+    }
 
-  /**
-   * Waits up to {@value #DEFAULT_TIMEOUT_SECONDS}s until a flattened telemetry event matches the
-   * given predicate.
-   *
-   * @param predicate The predicate a flattened telemetry event must satisfy.
-   * @throws AssertionError If no flattened telemetry event could not match the predicate.
-   */
-  public void waitForFlat(Predicate<Map<String, Object>> predicate) {
-    waitForFlat(predicate, DEFAULT_TIMEOUT_SECONDS);
-  }
+    /**
+     * Waits up to {@value #DEFAULT_TIMEOUT_SECONDS}s until a flattened telemetry event matches the
+     * given predicate.
+     *
+     * @param predicate The predicate a flattened telemetry event must satisfy.
+     * @throws AssertionError If no flattened telemetry event could not match the predicate.
+     */
+    public void waitForFlat(Predicate<Map<String, Object>> predicate) {
+        waitForFlat(predicate, DEFAULT_TIMEOUT_SECONDS);
+    }
 
-  /**
-   * Waits until a flattened telemetry event matches the given predicate.
-   *
-   * @param predicate The predicate a flattened telemetry event must satisfy.
-   * @param timeoutSeconds The timeout delay, in seconds.
-   * @throws AssertionError If no flattened telemetry event could not match the predicate.
-   */
-  public void waitForFlat(Predicate<Map<String, Object>> predicate, double timeoutSeconds) {
-    new PollingConditions(timeoutSeconds)
-        .eventually(
-            () -> {
-              if (getFlatMessages().stream().noneMatch(predicate)) {
+    /**
+     * Waits until a flattened telemetry event matches the given predicate.
+     *
+     * @param predicate The predicate a flattened telemetry event must satisfy.
+     * @param timeoutSeconds The timeout delay, in seconds.
+     * @throws AssertionError If no flattened telemetry event could not match the predicate.
+     */
+    public void waitForFlat(Predicate<Map<String, Object>> predicate, double timeoutSeconds) {
+        new PollingConditions(timeoutSeconds).eventually(() -> {
+            if (getFlatMessages().stream().noneMatch(predicate)) {
                 throw new AssertionError("No telemetry event matched; received: " + getMessages());
-              }
-            });
-  }
+            }
+        });
+    }
 }
diff --git a/dd-smoke-tests/src/main/java/datadog/smoketest/backend/TestAgentBackend.java b/dd-smoke-tests/src/main/java/datadog/smoketest/backend/TestAgentBackend.java
index c694095dc8c..0c0af5786ae 100644
--- a/dd-smoke-tests/src/main/java/datadog/smoketest/backend/TestAgentBackend.java
+++ b/dd-smoke-tests/src/main/java/datadog/smoketest/backend/TestAgentBackend.java
@@ -46,421 +46,408 @@
  * when a test actually selects a test-agent backend (mock-only tests stay Testcontainers-free).
  */
 public final class TestAgentBackend extends AgentBackend {
-  private static final String DEFAULT_CI_IMAGE =
-      "registry.ddbuild.io/images/mirror/dd-apm-test-agent/ddapm-test-agent";
-  private static final String DEFAULT_PUBLIC_IMAGE =
-      "ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent";
-  private static final String DEFAULT_VERSION = "v1.64.1";
-  private static final String CUSTOM_IMAGE_REF_PROPERTY = "DATADOG_SMOKETEST_TESTAGENT_IMAGE";
-
-  /** Set by the CI jobs providing a dd-apm-test-agent sidecar (see {@code .gitlab-ci.yml}). */
-  private static final String CI_AGENT_HOST_ENV = "CI_AGENT_HOST";
-
-  /** The dd-apm-test-agent trace port inside the container. */
-  private static final int AGENT_PORT = 8126;
-
-  /**
-   * Trace-invariant checks enabled by default, mirroring the CI sidecar in {@code .gitlab-ci.yml}.
-   */
-  private static final String ENABLED_CHECKS =
-      "trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service";
-
-  private static final MediaType JSON = MediaType.parse("application/json");
-
-  private static final Moshi MOSHI = new Moshi.Builder().build();
-  private static final JsonAdapter<Map<String, Object>> MAP_ADAPTER =
-      MOSHI.adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
-  private static final JsonAdapter<List<Map<String, Object>>> REQUEST_LIST_ADAPTER =
-      MOSHI.adapter(
-          Types.newParameterizedType(
-              List.class, Types.newParameterizedType(Map.class, String.class, Object.class)));
-
-  private final String image;
-  private final String externalHost; // null => Testcontainers-managed container
-  private final int externalPort;
-  private final boolean retainAcrossTests;
-  private final String sessionToken;
-
-  private final OkHttpClient client = new OkHttpClient();
-  private volatile GenericContainer<?> container;
-  private volatile HttpUrl baseUrl;
-  // Clean external base URI derived from baseUrl once at start() (see cleanBaseUri).
-  private volatile URI baseUri;
-
-  private TestAgentBackend(Builder builder) {
-    this.image = builder.image;
-    this.externalHost = builder.externalHost;
-    this.externalPort = builder.externalPort;
-    this.retainAcrossTests = builder.retainAcrossTests;
-    this.sessionToken =
-        builder.sessionToken != null ? builder.sessionToken : "smoke-" + UUID.randomUUID();
-  }
-
-  static Builder builder() {
-    return new Builder();
-  }
-
-  /**
-   * Returns the default dd-apm-test-agent image.
-   *
-   * @return The default image reference.
-   */
-  static String defaultImage() {
-    String image = System.getenv("CI") != null ? DEFAULT_CI_IMAGE : DEFAULT_PUBLIC_IMAGE;
-    return image + ":" + DEFAULT_VERSION;
-  }
-
-  @Override
-  public String sessionToken() {
-    return this.sessionToken;
-  }
-
-  @Override
-  public boolean clearsBetweenTests() {
-    return !this.retainAcrossTests;
-  }
-
-  @Override
-  public void start() {
-    if (this.baseUrl != null) {
-      return;
+    private static final String DEFAULT_CI_IMAGE =
+            "registry.ddbuild.io/images/mirror/dd-apm-test-agent/ddapm-test-agent";
+    private static final String DEFAULT_PUBLIC_IMAGE = "ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent";
+    private static final String DEFAULT_VERSION = "v1.64.1";
+    private static final String CUSTOM_IMAGE_REF_PROPERTY = "DATADOG_SMOKETEST_TESTAGENT_IMAGE";
+
+    /** Set by the CI jobs providing a dd-apm-test-agent sidecar (see {@code .gitlab-ci.yml}). */
+    private static final String CI_AGENT_HOST_ENV = "CI_AGENT_HOST";
+
+    /** The dd-apm-test-agent trace port inside the container. */
+    private static final int AGENT_PORT = 8126;
+
+    /**
+     * Trace-invariant checks enabled by default, mirroring the CI sidecar in {@code .gitlab-ci.yml}.
+     */
+    private static final String ENABLED_CHECKS =
+            "trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service";
+
+    private static final MediaType JSON = MediaType.parse("application/json");
+
+    private static final Moshi MOSHI = new Moshi.Builder().build();
+    private static final JsonAdapter<Map<String, Object>> MAP_ADAPTER =
+            MOSHI.adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
+    private static final JsonAdapter<List<Map<String, Object>>> REQUEST_LIST_ADAPTER = MOSHI.adapter(
+            Types.newParameterizedType(List.class, Types.newParameterizedType(Map.class, String.class, Object.class)));
+
+    private final String image;
+    private final String externalHost; // null => Testcontainers-managed container
+    private final int externalPort;
+    private final boolean retainAcrossTests;
+    private final String sessionToken;
+
+    private final OkHttpClient client = new OkHttpClient();
+    private volatile GenericContainer<?> container;
+    private volatile HttpUrl baseUrl;
+    // Clean external base URI derived from baseUrl once at start() (see cleanBaseUri).
+    private volatile URI baseUri;
+
+    private TestAgentBackend(Builder builder) {
+        this.image = builder.image;
+        this.externalHost = builder.externalHost;
+        this.externalPort = builder.externalPort;
+        this.retainAcrossTests = builder.retainAcrossTests;
+        this.sessionToken = builder.sessionToken != null ? builder.sessionToken : "smoke-" + UUID.randomUUID();
     }
-    if (this.externalHost != null && this.externalPort > 0) {
-      this.baseUrl =
-          new HttpUrl.Builder()
-              .scheme("http")
-              .host(this.externalHost)
-              .port(this.externalPort)
-              .build();
-    } else {
-      GenericContainer<?> started = new GenericContainer<>(DockerImageName.parse(this.image));
-      started.withExposedPorts(AGENT_PORT);
-      started.withEnv("ENABLED_CHECKS", ENABLED_CHECKS);
-      started.withEnv("TRACE_LANGUAGE", "java");
-      started.withEnv("DD_POOL_TRACE_CHECK_FAILURES", "true");
-      started.withEnv("DD_DISABLE_ERROR_RESPONSES", "true");
-      started.setWaitStrategy(Wait.forHttp("/test/traces"));
-      started.start();
-      this.container = started;
-      this.baseUrl =
-          new HttpUrl.Builder()
-              .scheme("http")
-              .host(started.getHost())
-              .port(started.getMappedPort(AGENT_PORT))
-              .build();
+
+    static Builder builder() {
+        return new Builder();
     }
-    // Normalize the external URI
-    this.baseUri = cleanBaseUri(this.baseUrl);
-    // Open a fresh session so the very first test method starts clean.
-    clear();
-  }
-
-  @Override
-  public int port() {
-    return requireStarted().port();
-  }
-
-  @Override
-  public URI url() {
-    requireStarted();
-    return this.baseUri;
-  }
-
-  @Override
-  public Traces traces() {
-    return new Traces(this::fetchTraces);
-  }
-
-  @Override
-  public Telemetry telemetry() {
-    return new Telemetry(this::fetchTelemetry);
-  }
-
-  @Override
-  public RemoteConfig remoteConfig() {
-    return new RemoteConfig(this::pushRemoteConfig, this::fetchRemoteConfigRequests);
-  }
-
-  @Override
-  public void clear() {
-    // Reset before opening the session
-    resetRemoteConfig();
-    // GET /test/session/start begins (and clears) a session identified by the token. The
-    // dd-apm-test-agent session endpoints are GET (verified against v1.44.0: POST returns 405).
-    HttpUrl url =
-        requireStarted()
-            .newBuilder()
-            .addPathSegments("test/session/start")
-            .addQueryParameter("test_session_token", this.sessionToken)
-            .build();
-    Request request = new Request.Builder().url(url).get().build();
-    execute(request, "start test-agent session");
-  }
-
-  @Override
-  public void close() {
-    GenericContainer<?> running = this.container;
-    try {
-      // Container backends auto-validate their trace-invariant checks at teardown. External CI
-      // agents are validated by the job-final .gitlab/check_test_agent_results.sh instead, so we
-      // don't check them here. Run before stopping so the agent is still reachable.
-      if (running != null) {
-        assertNoInvariantFailures();
-      }
-    } finally {
-      if (running != null) {
-        this.container = null;
-        running.stop();
-      }
-      this.baseUrl = null;
-      this.baseUri = null;
-      // Release the HTTP client's dispatcher threads and pooled connections.
-      this.client.dispatcher().executorService().shutdown();
-      this.client.connectionPool().evictAll();
+
+    /**
+     * Returns the default dd-apm-test-agent image.
+     *
+     * @return The default image reference.
+     */
+    static String defaultImage() {
+        String image = System.getenv("CI") != null ? DEFAULT_CI_IMAGE : DEFAULT_PUBLIC_IMAGE;
+        return image + ":" + DEFAULT_VERSION;
     }
-  }
-
-  /**
-   * Asserts the test agent recorded no trace-invariant check failure ({@code ENABLED_CHECKS}) for
-   * this backend's session. Auto-invoked at container teardown; may also be called explicitly
-   * against an external agent mid-test.
-   *
-   * @throws AssertionError If the agent recorded one or more trace-invariant check failures.
-   */
-  public void assertNoInvariantFailures() {
-    HttpUrl url =
-        requireStarted()
-            .newBuilder()
-            .addPathSegments("test/trace_check/failures")
-            .addQueryParameter("test_session_token", this.sessionToken)
-            .build();
-    Request request = new Request.Builder().url(url).get().build();
-    try (Response response = this.client.newCall(request).execute()) {
-      int code = response.code();
-      // 200 => all checks passed; 404 => a real agent is running (no checks). Anything else is a
-      // recorded failure, whose body describes the failing check(s) (see check_test_agent_results).
-      if (code == 200 || code == 404) {
-        return;
-      }
-      String body = response.body() == null ? "" : response.body().string();
-      throw new AssertionError(
-          "Test-agent trace-invariant checks failed (HTTP " + code + "):\n" + body);
-    } catch (IOException e) {
-      throw new IllegalStateException("Failed to query trace-invariant checks at " + url, e);
+
+    @Override
+    public String sessionToken() {
+        return this.sessionToken;
     }
-  }
-
-  private List<DecodedTrace> fetchTraces() {
-    HttpUrl url =
-        requireStarted()
-            .newBuilder()
-            .addPathSegments("test/session/traces")
-            .addQueryParameter("test_session_token", this.sessionToken)
-            .build();
-    Request request = new Request.Builder().url(url).get().build();
-    return Decoder.decodeJson(execute(request, "read test-agent session traces")).getTraces();
-  }
-
-  private List<Map<String, Object>> fetchTelemetry() {
-    HttpUrl url =
-        requireStarted()
-            .newBuilder()
-            .addPathSegments("test/session/apmtelemetry")
-            .addQueryParameter("test_session_token", this.sessionToken)
-            .build();
-    Request request = new Request.Builder().url(url).get().build();
-    return decodeMessages(execute(request, "read test-agent session telemetry"));
-  }
-
-  private void pushRemoteConfig(String path, String config) {
-    // POST {"path": ..., "msg": <config>} to /test/session/responses/config/path; the agent builds
-    // the signed RC envelope from it, so callers don't hand-build it (mirrors the Groovy base's
-    // setRemoteConfig).
-    HttpUrl url =
-        requireStarted()
-            .newBuilder()
-            .addPathSegments("test/session/responses/config/path")
-            .addQueryParameter("test_session_token", this.sessionToken)
-            .build();
-    String body =
-        "{\"path\":\""
-            + path.replace("\\", "\\\\").replace("\"", "\\\"")
-            + "\",\"msg\":"
-            + config
-            + "}";
-    Request request = new Request.Builder().url(url).post(RequestBody.create(JSON, body)).build();
-    execute(request, "set remote-config response");
-  }
-
-  private List<Map<String, Object>> fetchRemoteConfigRequests() {
-    // The test agent records every request the tracer made in this session; select the /v0.7/config
-    // polls and decode their base64-encoded bodies into JSON maps.
-    HttpUrl url =
-        requireStarted()
-            .newBuilder()
-            .addPathSegments("test/session/requests")
-            .addQueryParameter("test_session_token", this.sessionToken)
-            .build();
-    Request request = new Request.Builder().url(url).get().build();
-    String json = execute(request, "read test-agent session requests");
-    List<Map<String, Object>> requests;
-    try {
-      requests = REQUEST_LIST_ADAPTER.fromJson(json);
-    } catch (IOException | JsonDataException e) {
-      throw new IllegalStateException("Failed to parse /test/session/requests: " + json, e);
+
+    @Override
+    public boolean clearsBetweenTests() {
+        return !this.retainAcrossTests;
     }
-    List<Map<String, Object>> polls = new ArrayList<>();
-    if (requests != null) {
-      for (Map<String, Object> req : requests) {
-        Object rawUrl = req.get("url");
-        Object rawBody = req.get("body");
-        if (rawUrl instanceof String
-            && ((String) rawUrl).contains("/v0.7/config")
-            && rawBody instanceof String
-            && !((String) rawBody).isEmpty()) {
-          String decoded = new String(Base64.getDecoder().decode((String) rawBody), UTF_8);
-          try {
-            Map<String, Object> poll = MAP_ADAPTER.fromJson(decoded);
-            if (poll != null) {
-              polls.add(poll);
-            }
-          } catch (IOException | JsonDataException e) {
-            throw new IllegalStateException(
-                "Failed to parse remote-config poll body: " + decoded, e);
-          }
+
+    @Override
+    public void start() {
+        if (this.baseUrl != null) {
+            return;
+        }
+        if (this.externalHost != null && this.externalPort > 0) {
+            this.baseUrl = new HttpUrl.Builder()
+                    .scheme("http")
+                    .host(this.externalHost)
+                    .port(this.externalPort)
+                    .build();
+        } else {
+            GenericContainer<?> started = new GenericContainer<>(DockerImageName.parse(this.image));
+            started.withExposedPorts(AGENT_PORT);
+            started.withEnv("ENABLED_CHECKS", ENABLED_CHECKS);
+            started.withEnv("TRACE_LANGUAGE", "java");
+            started.withEnv("DD_POOL_TRACE_CHECK_FAILURES", "true");
+            started.withEnv("DD_DISABLE_ERROR_RESPONSES", "true");
+            started.setWaitStrategy(Wait.forHttp("/test/traces"));
+            started.start();
+            this.container = started;
+            this.baseUrl = new HttpUrl.Builder()
+                    .scheme("http")
+                    .host(started.getHost())
+                    .port(started.getMappedPort(AGENT_PORT))
+                    .build();
         }
-      }
+        // Normalize the external URI
+        this.baseUri = cleanBaseUri(this.baseUrl);
+        // Open a fresh session so the very first test method starts clean.
+        clear();
+    }
+
+    @Override
+    public int port() {
+        return requireStarted().port();
     }
-    return polls;
-  }
-
-  private void resetRemoteConfig() {
-    // A fresh session does not clear a previously-pushed Remote Config response: it is
-    // stored under the (stable) session token. Replace it with an empty payload — the
-    // tracer's "no configs" default — so each test method starts with a clean RC slate,
-    // matching the per-test trace and telemetry isolation.
-    HttpUrl url =
-        requireStarted()
-            .newBuilder()
-            .addPathSegments("test/session/responses/config")
-            .addQueryParameter("test_session_token", this.sessionToken)
-            .build();
-    Request request = new Request.Builder().url(url).post(RequestBody.create(JSON, "{}")).build();
-    execute(request, "reset remote-config response");
-  }
-
-  private String execute(Request request, String action) {
-    try (Response response = this.client.newCall(request).execute()) {
-      if (!response.isSuccessful()) {
-        throw new IllegalStateException(
-            "Failed to " + action + ": HTTP " + response.code() + " from " + request.url());
-      }
-      return response.body() == null ? "" : response.body().string();
-    } catch (IOException e) {
-      throw new IllegalStateException("Failed to " + action + " at " + request.url(), e);
+
+    @Override
+    public URI url() {
+        requireStarted();
+        return this.baseUri;
     }
-  }
-
-  /**
-   * Removes leading bracket and supports IPv6 address.
-   *
-   * @param url The OkHttp URL to convert to URI.
-   * @return The converted URI.
-   */
-  private static URI cleanBaseUri(HttpUrl url) {
-    String host = url.host();
-    if (host.indexOf(':') >= 0 && host.charAt(0) != '[') {
-      host = "[" + host + "]";
+
+    @Override
+    public Traces traces() {
+        return new Traces(this::fetchTraces);
     }
-    return URI.create(url.scheme() + "://" + host + ":" + url.port());
-  }
 
-  private HttpUrl requireStarted() {
-    HttpUrl url = this.baseUrl;
-    if (url == null) {
-      throw new IllegalStateException("TestAgentBackend not started — call start() first");
+    @Override
+    public Telemetry telemetry() {
+        return new Telemetry(this::fetchTelemetry);
     }
-    return url;
-  }
-
-  /** Fluent builder; obtain via {@link AgentBackend#testAgentBuilder()}. */
-  public static final class Builder {
-    private String image;
-    private String externalHost;
-    private int externalPort;
-    private boolean retainAcrossTests;
-    private String sessionToken;
-
-    private Builder() {
-      String customImageRef = System.getenv(CUSTOM_IMAGE_REF_PROPERTY);
-      String ciAgentHost = System.getenv(CI_AGENT_HOST_ENV);
-      if (customImageRef != null) {
-        this.image = customImageRef;
-      } else if (ciAgentHost != null) {
-        this.externalHost = ciAgentHost;
-      } else {
-        this.image = defaultImage();
-      }
-      this.externalPort = AGENT_PORT;
+
+    @Override
+    public RemoteConfig remoteConfig() {
+        return new RemoteConfig(this::pushRemoteConfig, this::fetchRemoteConfigRequests);
     }
 
-    /**
-     * Uses a Testcontainers-managed container of the given image.
-     *
-     * @param image The dd-apm-test-agent image reference.
-     * @return This builder, for chaining.
-     */
-    public Builder image(String image) {
-      this.image = image;
-      this.externalHost = null;
-      this.externalPort = 0;
-      return this;
+    @Override
+    public void clear() {
+        // Reset before opening the session
+        resetRemoteConfig();
+        // GET /test/session/start begins (and clears) a session identified by the token. The
+        // dd-apm-test-agent session endpoints are GET (verified against v1.44.0: POST returns 405).
+        HttpUrl url = requireStarted()
+                .newBuilder()
+                .addPathSegments("test/session/start")
+                .addQueryParameter("test_session_token", this.sessionToken)
+                .build();
+        Request request = new Request.Builder().url(url).get().build();
+        execute(request, "start test-agent session");
     }
 
-    /**
-     * Talks to an already-running external agent (e.g. the CI sidecar) instead of a container.
-     *
-     * @param host The external agent host.
-     * @param port The external agent port.
-     * @return This builder, for chaining.
-     */
-    public Builder external(String host, int port) {
-      this.image = null;
-      this.externalHost = host;
-      this.externalPort = port;
-      return this;
+    @Override
+    public void close() {
+        GenericContainer<?> running = this.container;
+        try {
+            // Container backends auto-validate their trace-invariant checks at teardown. External CI
+            // agents are validated by the job-final .gitlab/check_test_agent_results.sh instead, so we
+            // don't check them here. Run before stopping so the agent is still reachable.
+            if (running != null) {
+                assertNoInvariantFailures();
+            }
+        } finally {
+            if (running != null) {
+                this.container = null;
+                running.stop();
+            }
+            this.baseUrl = null;
+            this.baseUri = null;
+            // Release the HTTP client's dispatcher threads and pooled connections.
+            this.client.dispatcher().executorService().shutdown();
+            this.client.connectionPool().evictAll();
+        }
     }
 
     /**
-     * Keeps received traces across test methods instead of clearing them before each (see {@link
-     * AgentBackend#clearsBetweenTests()}). Use when assertions cover app-startup traces, which a
-     * per-method clear would discard.
+     * Asserts the test agent recorded no trace-invariant check failure ({@code ENABLED_CHECKS}) for
+     * this backend's session. Auto-invoked at container teardown; may also be called explicitly
+     * against an external agent mid-test.
      *
-     * @return This builder, for chaining.
+     * @throws AssertionError If the agent recorded one or more trace-invariant check failures.
      */
-    public Builder retainAcrossTests() {
-      this.retainAcrossTests = true;
-      return this;
+    public void assertNoInvariantFailures() {
+        HttpUrl url = requireStarted()
+                .newBuilder()
+                .addPathSegments("test/trace_check/failures")
+                .addQueryParameter("test_session_token", this.sessionToken)
+                .build();
+        Request request = new Request.Builder().url(url).get().build();
+        try (Response response = this.client.newCall(request).execute()) {
+            int code = response.code();
+            // 200 => all checks passed; 404 => a real agent is running (no checks). Anything else is a
+            // recorded failure, whose body describes the failing check(s) (see check_test_agent_results).
+            if (code == 200 || code == 404) {
+                return;
+            }
+            String body = response.body() == null ? "" : response.body().string();
+            throw new AssertionError("Test-agent trace-invariant checks failed (HTTP " + code + "):\n" + body);
+        } catch (IOException e) {
+            throw new IllegalStateException("Failed to query trace-invariant checks at " + url, e);
+        }
     }
 
-    /**
-     * Overrides the auto-generated session token (mainly for deterministic tests).
-     *
-     * @param token The session token to use.
-     * @return This builder, for chaining.
-     */
-    public Builder sessionToken(String token) {
-      this.sessionToken = token;
-      return this;
+    private List<DecodedTrace> fetchTraces() {
+        HttpUrl url = requireStarted()
+                .newBuilder()
+                .addPathSegments("test/session/traces")
+                .addQueryParameter("test_session_token", this.sessionToken)
+                .build();
+        Request request = new Request.Builder().url(url).get().build();
+        return Decoder.decodeJson(execute(request, "read test-agent session traces"))
+                .getTraces();
+    }
+
+    private List<Map<String, Object>> fetchTelemetry() {
+        HttpUrl url = requireStarted()
+                .newBuilder()
+                .addPathSegments("test/session/apmtelemetry")
+                .addQueryParameter("test_session_token", this.sessionToken)
+                .build();
+        Request request = new Request.Builder().url(url).get().build();
+        return decodeMessages(execute(request, "read test-agent session telemetry"));
+    }
+
+    private void pushRemoteConfig(String path, String config) {
+        // POST {"path": ..., "msg": <config>} to /test/session/responses/config/path; the agent builds
+        // the signed RC envelope from it, so callers don't hand-build it (mirrors the Groovy base's
+        // setRemoteConfig).
+        HttpUrl url = requireStarted()
+                .newBuilder()
+                .addPathSegments("test/session/responses/config/path")
+                .addQueryParameter("test_session_token", this.sessionToken)
+                .build();
+        String body = "{\"path\":\"" + path.replace("\\", "\\\\").replace("\"", "\\\"") + "\",\"msg\":" + config + "}";
+        Request request = new Request.Builder()
+                .url(url)
+                .post(RequestBody.create(JSON, body))
+                .build();
+        execute(request, "set remote-config response");
+    }
+
+    private List<Map<String, Object>> fetchRemoteConfigRequests() {
+        // The test agent records every request the tracer made in this session; select the /v0.7/config
+        // polls and decode their base64-encoded bodies into JSON maps.
+        HttpUrl url = requireStarted()
+                .newBuilder()
+                .addPathSegments("test/session/requests")
+                .addQueryParameter("test_session_token", this.sessionToken)
+                .build();
+        Request request = new Request.Builder().url(url).get().build();
+        String json = execute(request, "read test-agent session requests");
+        List<Map<String, Object>> requests;
+        try {
+            requests = REQUEST_LIST_ADAPTER.fromJson(json);
+        } catch (IOException | JsonDataException e) {
+            throw new IllegalStateException("Failed to parse /test/session/requests: " + json, e);
+        }
+        List<Map<String, Object>> polls = new ArrayList<>();
+        if (requests != null) {
+            for (Map<String, Object> req : requests) {
+                Object rawUrl = req.get("url");
+                Object rawBody = req.get("body");
+                if (rawUrl instanceof String
+                        && ((String) rawUrl).contains("/v0.7/config")
+                        && rawBody instanceof String
+                        && !((String) rawBody).isEmpty()) {
+                    String decoded = new String(Base64.getDecoder().decode((String) rawBody), UTF_8);
+                    try {
+                        Map<String, Object> poll = MAP_ADAPTER.fromJson(decoded);
+                        if (poll != null) {
+                            polls.add(poll);
+                        }
+                    } catch (IOException | JsonDataException e) {
+                        throw new IllegalStateException("Failed to parse remote-config poll body: " + decoded, e);
+                    }
+                }
+            }
+        }
+        return polls;
+    }
+
+    private void resetRemoteConfig() {
+        // A fresh session does not clear a previously-pushed Remote Config response: it is
+        // stored under the (stable) session token. Replace it with an empty payload — the
+        // tracer's "no configs" default — so each test method starts with a clean RC slate,
+        // matching the per-test trace and telemetry isolation.
+        HttpUrl url = requireStarted()
+                .newBuilder()
+                .addPathSegments("test/session/responses/config")
+                .addQueryParameter("test_session_token", this.sessionToken)
+                .build();
+        Request request = new Request.Builder()
+                .url(url)
+                .post(RequestBody.create(JSON, "{}"))
+                .build();
+        execute(request, "reset remote-config response");
+    }
+
+    private String execute(Request request, String action) {
+        try (Response response = this.client.newCall(request).execute()) {
+            if (!response.isSuccessful()) {
+                throw new IllegalStateException(
+                        "Failed to " + action + ": HTTP " + response.code() + " from " + request.url());
+            }
+            return response.body() == null ? "" : response.body().string();
+        } catch (IOException e) {
+            throw new IllegalStateException("Failed to " + action + " at " + request.url(), e);
+        }
     }
 
     /**
-     * Builds the configured test-agent backend.
+     * Removes leading bracket and supports IPv6 address.
      *
-     * @return The built backend.
+     * @param url The OkHttp URL to convert to URI.
+     * @return The converted URI.
      */
-    public TestAgentBackend build() {
-      return new TestAgentBackend(this);
+    private static URI cleanBaseUri(HttpUrl url) {
+        String host = url.host();
+        if (host.indexOf(':') >= 0 && host.charAt(0) != '[') {
+            host = "[" + host + "]";
+        }
+        return URI.create(url.scheme() + "://" + host + ":" + url.port());
+    }
+
+    private HttpUrl requireStarted() {
+        HttpUrl url = this.baseUrl;
+        if (url == null) {
+            throw new IllegalStateException("TestAgentBackend not started — call start() first");
+        }
+        return url;
+    }
+
+    /** Fluent builder; obtain via {@link AgentBackend#testAgentBuilder()}. */
+    public static final class Builder {
+        private String image;
+        private String externalHost;
+        private int externalPort;
+        private boolean retainAcrossTests;
+        private String sessionToken;
+
+        private Builder() {
+            String customImageRef = System.getenv(CUSTOM_IMAGE_REF_PROPERTY);
+            String ciAgentHost = System.getenv(CI_AGENT_HOST_ENV);
+            if (customImageRef != null) {
+                this.image = customImageRef;
+            } else if (ciAgentHost != null) {
+                this.externalHost = ciAgentHost;
+            } else {
+                this.image = defaultImage();
+            }
+            this.externalPort = AGENT_PORT;
+        }
+
+        /**
+         * Uses a Testcontainers-managed container of the given image.
+         *
+         * @param image The dd-apm-test-agent image reference.
+         * @return This builder, for chaining.
+         */
+        public Builder image(String image) {
+            this.image = image;
+            this.externalHost = null;
+            this.externalPort = 0;
+            return this;
+        }
+
+        /**
+         * Talks to an already-running external agent (e.g. the CI sidecar) instead of a container.
+         *
+         * @param host The external agent host.
+         * @param port The external agent port.
+         * @return This builder, for chaining.
+         */
+        public Builder external(String host, int port) {
+            this.image = null;
+            this.externalHost = host;
+            this.externalPort = port;
+            return this;
+        }
+
+        /**
+         * Keeps received traces across test methods instead of clearing them before each (see {@link
+         * AgentBackend#clearsBetweenTests()}). Use when assertions cover app-startup traces, which a
+         * per-method clear would discard.
+         *
+         * @return This builder, for chaining.
+         */
+        public Builder retainAcrossTests() {
+            this.retainAcrossTests = true;
+            return this;
+        }
+
+        /**
+         * Overrides the auto-generated session token (mainly for deterministic tests).
+         *
+         * @param token The session token to use.
+         * @return This builder, for chaining.
+         */
+        public Builder sessionToken(String token) {
+            this.sessionToken = token;
+            return this;
+        }
+
+        /**
+         * Builds the configured test-agent backend.
+         *
+         * @return The built backend.
+         */
+        public TestAgentBackend build() {
+            return new TestAgentBackend(this);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/src/main/java/datadog/smoketest/backend/Traces.java b/dd-smoke-tests/src/main/java/datadog/smoketest/backend/Traces.java
index 57ebcdabdfe..f4040c70e3d 100644
--- a/dd-smoke-tests/src/main/java/datadog/smoketest/backend/Traces.java
+++ b/dd-smoke-tests/src/main/java/datadog/smoketest/backend/Traces.java
@@ -12,97 +12,91 @@
 
 /** This class is a query facade over the traces a {@link AgentBackend} has received. */
 public final class Traces {
-  /** Default time to wait for traces to arrive from a separately-launched app before giving up. */
-  private static final double DEFAULT_TIMEOUT_SECONDS = 30;
+    /** Default time to wait for traces to arrive from a separately-launched app before giving up. */
+    private static final double DEFAULT_TIMEOUT_SECONDS = 30;
 
-  private final Supplier<List<DecodedTrace>> source;
+    private final Supplier<List<DecodedTrace>> source;
 
-  Traces(Supplier<List<DecodedTrace>> source) {
-    this.source = source;
-  }
+    Traces(Supplier<List<DecodedTrace>> source) {
+        this.source = source;
+    }
 
-  /**
-   * Returns a snapshot of the traces received so far.
-   *
-   * @return The traces received so far.
-   */
-  public List<DecodedTrace> getTraces() {
-    return this.source.get();
-  }
+    /**
+     * Returns a snapshot of the traces received so far.
+     *
+     * @return The traces received so far.
+     */
+    public List<DecodedTrace> getTraces() {
+        return this.source.get();
+    }
 
-  /**
-   * Waits up to {@value DEFAULT_TIMEOUT_SECONDS}s until <em>at least</em> {@code count} traces have
-   * been received.
-   *
-   * @param count The minimum number of traces to wait for.
-   * @throws AssertionError If less than {@code count} traces have been received.
-   */
-  public void waitForTraceCount(int count) {
-    waitForTraceCount(count, DEFAULT_TIMEOUT_SECONDS);
-  }
+    /**
+     * Waits up to {@value DEFAULT_TIMEOUT_SECONDS}s until <em>at least</em> {@code count} traces have
+     * been received.
+     *
+     * @param count The minimum number of traces to wait for.
+     * @throws AssertionError If less than {@code count} traces have been received.
+     */
+    public void waitForTraceCount(int count) {
+        waitForTraceCount(count, DEFAULT_TIMEOUT_SECONDS);
+    }
 
-  /**
-   * Waits until <em>at least</em> {@code count} traces have been received.
-   *
-   * @param count The minimum number of traces to wait for.
-   * @param timeoutSeconds How long to wait, in seconds.
-   * @throws AssertionError If less than {@code count} traces have been received.
-   */
-  public void waitForTraceCount(int count, double timeoutSeconds) {
-    new PollingConditions(timeoutSeconds)
-        .eventually(
-            () -> {
-              int actual = getTraces().size();
-              if (actual < count) {
-                throw new AssertionError(
-                    "Expected at least " + count + " trace(s) but got " + actual);
-              }
-            });
-  }
+    /**
+     * Waits until <em>at least</em> {@code count} traces have been received.
+     *
+     * @param count The minimum number of traces to wait for.
+     * @param timeoutSeconds How long to wait, in seconds.
+     * @throws AssertionError If less than {@code count} traces have been received.
+     */
+    public void waitForTraceCount(int count, double timeoutSeconds) {
+        new PollingConditions(timeoutSeconds).eventually(() -> {
+            int actual = getTraces().size();
+            if (actual < count) {
+                throw new AssertionError("Expected at least " + count + " trace(s) but got " + actual);
+            }
+        });
+    }
 
-  /**
-   * Wait up to the {@value #DEFAULT_TIMEOUT_SECONDS}s until the received traces satisfy the given
-   * trace matchers, one {@link TraceMatcher} per expected trace (matched positionally,
-   * count-exact).
-   *
-   * @param matchers The matchers to verify the received traces, one per expected trace.
-   * @throws AssertionError If no traces satisfying the given matchers are found.
-   */
-  public void waitForTraces(TraceMatcher... matchers) {
-    waitForTraces(identity(), matchers);
-  }
+    /**
+     * Wait up to the {@value #DEFAULT_TIMEOUT_SECONDS}s until the received traces satisfy the given
+     * trace matchers, one {@link TraceMatcher} per expected trace (matched positionally,
+     * count-exact).
+     *
+     * @param matchers The matchers to verify the received traces, one per expected trace.
+     * @throws AssertionError If no traces satisfying the given matchers are found.
+     */
+    public void waitForTraces(TraceMatcher... matchers) {
+        waitForTraces(identity(), matchers);
+    }
 
-  /**
-   * Wait up to the {@value #DEFAULT_TIMEOUT_SECONDS}s until the received traces satisfy the given
-   * trace matchers, one {@link TraceMatcher} per expected tracer, matched according the given
-   * options as {@link SmokeTraceAssertions#UNORDERED}, {@link
-   * SmokeTraceAssertions#IGNORE_ADDITIONAL_TRACES}, or {@link
-   * SmokeTraceAssertions#SORT_BY_START_TIME}).
-   *
-   * @param options The options to configure the trace-collection matching.
-   * @param matchers The matchers to verify the received traces, one per expected trace.
-   * @throws AssertionError If no traces satisfying the given matchers are found.
-   */
-  public void waitForTraces(
-      UnaryOperator<SmokeTraceAssertions.Options> options, TraceMatcher... matchers) {
-    waitForTraces(DEFAULT_TIMEOUT_SECONDS, options, matchers);
-  }
+    /**
+     * Wait up to the {@value #DEFAULT_TIMEOUT_SECONDS}s until the received traces satisfy the given
+     * trace matchers, one {@link TraceMatcher} per expected tracer, matched according the given
+     * options as {@link SmokeTraceAssertions#UNORDERED}, {@link
+     * SmokeTraceAssertions#IGNORE_ADDITIONAL_TRACES}, or {@link
+     * SmokeTraceAssertions#SORT_BY_START_TIME}).
+     *
+     * @param options The options to configure the trace-collection matching.
+     * @param matchers The matchers to verify the received traces, one per expected trace.
+     * @throws AssertionError If no traces satisfying the given matchers are found.
+     */
+    public void waitForTraces(UnaryOperator<SmokeTraceAssertions.Options> options, TraceMatcher... matchers) {
+        waitForTraces(DEFAULT_TIMEOUT_SECONDS, options, matchers);
+    }
 
-  /**
-   * Wait up to {@code timeoutSeconds} until the received traces satisfy the given trace matchers,
-   * one {@link TraceMatcher} per expected tracer, matched according the given options as {@link
-   * SmokeTraceAssertions#UNORDERED}, {@link SmokeTraceAssertions#IGNORE_ADDITIONAL_TRACES}, or
-   * {@link SmokeTraceAssertions#SORT_BY_START_TIME}).
-   *
-   * @param options The options to configure the trace-collection matching.
-   * @param matchers The matchers to verify the received traces, one per expected trace.
-   * @throws AssertionError If no traces satisfying the given matchers are found.
-   */
-  public void waitForTraces(
-      double timeoutSeconds,
-      UnaryOperator<SmokeTraceAssertions.Options> options,
-      TraceMatcher... matchers) {
-    new PollingConditions(timeoutSeconds)
-        .eventually(() -> SmokeTraceAssertions.assertTraces(getTraces(), options, matchers));
-  }
+    /**
+     * Wait up to {@code timeoutSeconds} until the received traces satisfy the given trace matchers,
+     * one {@link TraceMatcher} per expected tracer, matched according the given options as {@link
+     * SmokeTraceAssertions#UNORDERED}, {@link SmokeTraceAssertions#IGNORE_ADDITIONAL_TRACES}, or
+     * {@link SmokeTraceAssertions#SORT_BY_START_TIME}).
+     *
+     * @param options The options to configure the trace-collection matching.
+     * @param matchers The matchers to verify the received traces, one per expected trace.
+     * @throws AssertionError If no traces satisfying the given matchers are found.
+     */
+    public void waitForTraces(
+            double timeoutSeconds, UnaryOperator<SmokeTraceAssertions.Options> options, TraceMatcher... matchers) {
+        new PollingConditions(timeoutSeconds)
+                .eventually(() -> SmokeTraceAssertions.assertTraces(getTraces(), options, matchers));
+    }
 }
diff --git a/dd-smoke-tests/src/main/java/datadog/smoketest/trace/SmokeTraceAssertions.java b/dd-smoke-tests/src/main/java/datadog/smoketest/trace/SmokeTraceAssertions.java
index cad7724337a..d4928bc4969 100644
--- a/dd-smoke-tests/src/main/java/datadog/smoketest/trace/SmokeTraceAssertions.java
+++ b/dd-smoke-tests/src/main/java/datadog/smoketest/trace/SmokeTraceAssertions.java
@@ -32,145 +32,146 @@
  * </ul>
  */
 public final class SmokeTraceAssertions {
-  /*
-   * Trace comparators.
-   */
-  /** Trace comparator to sort by start time. */
-  public static final Comparator<DecodedTrace> TRACE_START_TIME_COMPARATOR =
-      Comparator.comparingLong(SmokeTraceAssertions::earliestStart);
-
-  /*
-   * Trace assertion options.
-   */
-  /** Default trace assert options. */
-  public static final UnaryOperator<Options> DEFAULT_OPTIONS = identity();
+    /*
+     * Trace comparators.
+     */
+    /** Trace comparator to sort by start time. */
+    public static final Comparator<DecodedTrace> TRACE_START_TIME_COMPARATOR =
+            Comparator.comparingLong(SmokeTraceAssertions::earliestStart);
 
-  /** Ignores additional traces. If there are more traces than expected, do not fail. */
-  public static final UnaryOperator<Options> IGNORE_ADDITIONAL_TRACES =
-      Options::ignoreAdditionalTraces;
+    /*
+     * Trace assertion options.
+     */
+    /** Default trace assert options. */
+    public static final UnaryOperator<Options> DEFAULT_OPTIONS = identity();
 
-  /** Allows matchers to match any distinct trace rather than the one at its position. */
-  public static final UnaryOperator<Options> UNORDERED = Options::unorder;
+    /** Ignores additional traces. If there are more traces than expected, do not fail. */
+    public static final UnaryOperator<Options> IGNORE_ADDITIONAL_TRACES = Options::ignoreAdditionalTraces;
 
-  /** Sorts traces by start time. */
-  public static final UnaryOperator<Options> SORT_BY_START_TIME =
-      options -> options.sort(TRACE_START_TIME_COMPARATOR);
+    /** Allows matchers to match any distinct trace rather than the one at its position. */
+    public static final UnaryOperator<Options> UNORDERED = Options::unorder;
 
-  private SmokeTraceAssertions() {}
+    /** Sorts traces by start time. */
+    public static final UnaryOperator<Options> SORT_BY_START_TIME =
+            options -> options.sort(TRACE_START_TIME_COMPARATOR);
 
-  /**
-   * Checks the structure of a trace collection.
-   *
-   * @param traces The trace collection to check.
-   * @param matchers The matchers to verify the trace collection, one matcher by expected trace.
-   */
-  public static void assertTraces(List<DecodedTrace> traces, TraceMatcher... matchers) {
-    assertTraces(traces, identity(), matchers);
-  }
+    private SmokeTraceAssertions() {}
 
-  /**
-   * Checks the structure of a trace collection.
-   *
-   * @param traces The trace collection to check.
-   * @param options The {@link Options} to configure the checks.
-   * @param matchers The matchers to verify the trace collection, one matcher by expected trace.
-   */
-  public static void assertTraces(
-      List<DecodedTrace> traces, UnaryOperator<Options> options, TraceMatcher... matchers) {
-    Options opts = options.apply(new Options());
-    // Check trace count first
-    int traceCount = traces.size();
-    if (opts.ignoreAdditionalTraces) {
-      if (traceCount < matchers.length) {
-        assertionFailure()
-            .message("Not enough of traces")
-            .expected(matchers.length)
-            .actual(traceCount)
-            .buildAndThrow();
-      }
-    } else {
-      if (traceCount != matchers.length) {
-        assertionFailure()
-            .message("Invalid number of traces")
-            .expected(matchers.length)
-            .actual(traceCount)
-            .buildAndThrow();
-      }
-    }
-    // Apply sorter
-    if (opts.sorter != null) {
-      traces = new ArrayList<>(traces);
-      traces.sort(opts.sorter);
+    /**
+     * Checks the structure of a trace collection.
+     *
+     * @param traces The trace collection to check.
+     * @param matchers The matchers to verify the trace collection, one matcher by expected trace.
+     */
+    public static void assertTraces(List<DecodedTrace> traces, TraceMatcher... matchers) {
+        assertTraces(traces, identity(), matchers);
     }
-    // Assert traces
-    boolean strictPositional = !opts.unordered && !opts.ignoreAdditionalTraces;
-    BitSet skippedTraces = new BitSet(traceCount);
-    for (int matcherIndex = 0; matcherIndex < matchers.length; matcherIndex++) {
-      TraceMatcher matcher = matchers[matcherIndex];
-      if (strictPositional) {
-        matcher.assertTrace(traces.get(matcherIndex).getSpans(), matcherIndex);
-        continue;
-      }
-      boolean matched = false;
-      for (int traceIndex = skippedTraces.nextClearBit(0); traceIndex < traceCount; traceIndex++) {
-        if (skippedTraces.get(traceIndex)) {
-          continue;
+
+    /**
+     * Checks the structure of a trace collection.
+     *
+     * @param traces The trace collection to check.
+     * @param options The {@link Options} to configure the checks.
+     * @param matchers The matchers to verify the trace collection, one matcher by expected trace.
+     */
+    public static void assertTraces(
+            List<DecodedTrace> traces, UnaryOperator<Options> options, TraceMatcher... matchers) {
+        Options opts = options.apply(new Options());
+        // Check trace count first
+        int traceCount = traces.size();
+        if (opts.ignoreAdditionalTraces) {
+            if (traceCount < matchers.length) {
+                assertionFailure()
+                        .message("Not enough of traces")
+                        .expected(matchers.length)
+                        .actual(traceCount)
+                        .buildAndThrow();
+            }
+        } else {
+            if (traceCount != matchers.length) {
+                assertionFailure()
+                        .message("Invalid number of traces")
+                        .expected(matchers.length)
+                        .actual(traceCount)
+                        .buildAndThrow();
+            }
         }
-        try {
-          matcher.assertTrace(traces.get(traceIndex).getSpans(), matcherIndex);
-          matched = true;
-          if (opts.unordered) {
-            skippedTraces.set(traceIndex);
-          } else {
-            skippedTraces.set(0, traceIndex + 1);
-          }
-          break;
-        } catch (AssertionError ignored) {
-          // Swallow assertion errors, keep looking for a match
+        // Apply sorter
+        if (opts.sorter != null) {
+            traces = new ArrayList<>(traces);
+            traces.sort(opts.sorter);
+        }
+        // Assert traces
+        boolean strictPositional = !opts.unordered && !opts.ignoreAdditionalTraces;
+        BitSet skippedTraces = new BitSet(traceCount);
+        for (int matcherIndex = 0; matcherIndex < matchers.length; matcherIndex++) {
+            TraceMatcher matcher = matchers[matcherIndex];
+            if (strictPositional) {
+                matcher.assertTrace(traces.get(matcherIndex).getSpans(), matcherIndex);
+                continue;
+            }
+            boolean matched = false;
+            for (int traceIndex = skippedTraces.nextClearBit(0); traceIndex < traceCount; traceIndex++) {
+                if (skippedTraces.get(traceIndex)) {
+                    continue;
+                }
+                try {
+                    matcher.assertTrace(traces.get(traceIndex).getSpans(), matcherIndex);
+                    matched = true;
+                    if (opts.unordered) {
+                        skippedTraces.set(traceIndex);
+                    } else {
+                        skippedTraces.set(0, traceIndex + 1);
+                    }
+                    break;
+                } catch (AssertionError ignored) {
+                    // Swallow assertion errors, keep looking for a match
+                }
+            }
+            if (!matched) {
+                assertionFailure()
+                        .message("No trace matches matcher # " + matcherIndex)
+                        .buildAndThrow();
+            }
         }
-      }
-      if (!matched) {
-        assertionFailure().message("No trace matches matcher # " + matcherIndex).buildAndThrow();
-      }
     }
-  }
 
-  private static long earliestStart(DecodedTrace trace) {
-    long start = MAX_VALUE;
-    for (DecodedSpan span : trace.getSpans()) {
-      start = min(start, span.getStart());
+    private static long earliestStart(DecodedTrace trace) {
+        long start = MAX_VALUE;
+        for (DecodedSpan span : trace.getSpans()) {
+            start = min(start, span.getStart());
+        }
+        return start == MAX_VALUE ? 0L : start;
     }
-    return start == MAX_VALUE ? 0L : start;
-  }
 
-  public static final class Options {
-    boolean ignoreAdditionalTraces = false;
-    boolean unordered = false;
-    Comparator<DecodedTrace> sorter = null;
+    public static final class Options {
+        boolean ignoreAdditionalTraces = false;
+        boolean unordered = false;
+        Comparator<DecodedTrace> sorter = null;
 
-    public Options ignoreAdditionalTraces() {
-      this.ignoreAdditionalTraces = true;
-      return this;
-    }
+        public Options ignoreAdditionalTraces() {
+            this.ignoreAdditionalTraces = true;
+            return this;
+        }
 
-    /**
-     * Matches each matcher against any distinct trace rather than the one at its position.
-     *
-     * <p>Assignment is greedy: each matcher takes the first still-unmatched trace it accepts. This
-     * can spuriously fail when matchers accept overlapping sets of traces and a valid distinct
-     * assignment exists only under a different pairing. Keep matchers specific enough to be
-     * unambiguous.
-     */
-    public Options unorder() {
-      this.unordered = true;
-      this.sorter = null;
-      return this;
-    }
+        /**
+         * Matches each matcher against any distinct trace rather than the one at its position.
+         *
+         * <p>Assignment is greedy: each matcher takes the first still-unmatched trace it accepts. This
+         * can spuriously fail when matchers accept overlapping sets of traces and a valid distinct
+         * assignment exists only under a different pairing. Keep matchers specific enough to be
+         * unambiguous.
+         */
+        public Options unorder() {
+            this.unordered = true;
+            this.sorter = null;
+            return this;
+        }
 
-    public Options sort(Comparator<DecodedTrace> sorter) {
-      this.unordered = false;
-      this.sorter = sorter;
-      return this;
+        public Options sort(Comparator<DecodedTrace> sorter) {
+            this.unordered = false;
+            this.sorter = sorter;
+            return this;
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/src/main/java/datadog/smoketest/trace/SpanLinkMatcher.java b/dd-smoke-tests/src/main/java/datadog/smoketest/trace/SpanLinkMatcher.java
index cbf5f14ab8a..d5db5362ad0 100644
--- a/dd-smoke-tests/src/main/java/datadog/smoketest/trace/SpanLinkMatcher.java
+++ b/dd-smoke-tests/src/main/java/datadog/smoketest/trace/SpanLinkMatcher.java
@@ -23,172 +23,167 @@
  * @see SpanMatcher#links(SpanLinkMatcher...)
  */
 public final class SpanLinkMatcher {
-  private static final int NO_SPAN_INDEX = -1;
-
-  private final Matcher<Long> traceIdMatcher;
-  private final Matcher<Long> spanIdMatcher;
-  private final int targetSpanIndex;
-  private Matcher<Byte> traceFlagsMatcher;
-  private Matcher<String> traceStateMatcher;
-  private Matcher<Map<String, String>> attributesMatcher;
-
-  private SpanLinkMatcher(
-      Matcher<Long> traceIdMatcher, Matcher<Long> spanIdMatcher, int targetSpanIndex) {
-    this.targetSpanIndex = targetSpanIndex;
-    this.traceIdMatcher = traceIdMatcher;
-    this.spanIdMatcher = spanIdMatcher;
-    this.traceFlagsMatcher = is((byte) 0);
-    this.traceStateMatcher = is("");
-    this.attributesMatcher = is(emptyMap());
-  }
-
-  /**
-   * Checks the link refers to the given trace / span identifiers, for a link to a span outside the
-   * asserted trace.
-   *
-   * @param traceId The trace identifier the link should refer to.
-   * @param spanId The span identifier the link should refer to.
-   * @return A new {@link SpanLinkMatcher} instance matching a link to those identifiers.
-   */
-  public static SpanLinkMatcher to(DDTraceId traceId, long spanId) {
-    return new SpanLinkMatcher(is(traceId.toLong()), is(spanId), NO_SPAN_INDEX);
-  }
-
-  /**
-   * Checks the link refers to the given trace / span identifiers, for a link to a span outside the
-   * asserted trace.
-   *
-   * @param traceId The trace identifier the link should refer to.
-   * @param spanId The span identifier the link should refer to.
-   * @return A new {@link SpanLinkMatcher} instance matching a link to those identifiers.
-   */
-  public static SpanLinkMatcher to(long traceId, long spanId) {
-    return new SpanLinkMatcher(is(traceId), is(spanId), NO_SPAN_INDEX);
-  }
-
-  /**
-   * Checks the link refers to the span at the specified index in the trace, resolved once the
-   * trace's spans have been sorted.
-   *
-   * @param spanIndex The index of the linked span in the trace.
-   * @return A new {@link SpanLinkMatcher} instance matching a link to that span.
-   */
-  public static SpanLinkMatcher toIndex(int spanIndex) {
-    if (spanIndex < 0) {
-      throw new IllegalArgumentException("index must be >= 0");
+    private static final int NO_SPAN_INDEX = -1;
+
+    private final Matcher<Long> traceIdMatcher;
+    private final Matcher<Long> spanIdMatcher;
+    private final int targetSpanIndex;
+    private Matcher<Byte> traceFlagsMatcher;
+    private Matcher<String> traceStateMatcher;
+    private Matcher<Map<String, String>> attributesMatcher;
+
+    private SpanLinkMatcher(Matcher<Long> traceIdMatcher, Matcher<Long> spanIdMatcher, int targetSpanIndex) {
+        this.targetSpanIndex = targetSpanIndex;
+        this.traceIdMatcher = traceIdMatcher;
+        this.spanIdMatcher = spanIdMatcher;
+        this.traceFlagsMatcher = is((byte) 0);
+        this.traceStateMatcher = is("");
+        this.attributesMatcher = is(emptyMap());
     }
-    return new SpanLinkMatcher(null, null, spanIndex);
-  }
-
-  /**
-   * Checks a link is present, whichever span it refers to and whichever flags, trace state and
-   * attributes it carries. Useful to assert a link count, or to skip over a link whose content does
-   * not matter.
-   *
-   * @return A new {@link SpanLinkMatcher} instance matching any link.
-   */
-  public static SpanLinkMatcher any() {
-    return new SpanLinkMatcher(Matchers.any(), Matchers.any(), NO_SPAN_INDEX)
-        .traceFlags(Matchers.any())
-        .traceState(Matchers.any())
-        .attributes(Matchers.any());
-  }
-
-  /**
-   * Checks the link trace flags match the given value.
-   *
-   * @param traceFlags The W3C trace flags to match against.
-   * @return The current {@link SpanLinkMatcher} instance with the trace flags constraint applied.
-   */
-  public SpanLinkMatcher traceFlags(byte traceFlags) {
-    this.traceFlagsMatcher = is(traceFlags);
-    return this;
-  }
-
-  /**
-   * Checks the link trace flags match the given matcher.
-   *
-   * @param matcher The matcher to check the W3C trace flags.
-   * @return The current {@link SpanLinkMatcher} instance with the trace flags constraint applied.
-   */
-  public SpanLinkMatcher traceFlags(Matcher<Byte> matcher) {
-    this.traceFlagsMatcher = matcher;
-    return this;
-  }
-
-  /**
-   * Checks the link trace state matches the given value.
-   *
-   * @param traceState The W3C trace state to match against.
-   * @return The current {@link SpanLinkMatcher} instance with the trace state constraint applied.
-   */
-  public SpanLinkMatcher traceState(String traceState) {
-    this.traceStateMatcher = is(traceState);
-    return this;
-  }
-
-  /**
-   * Checks the link trace state matches the given matcher.
-   *
-   * @param matcher The matcher to check the W3C trace state.
-   * @return The current {@link SpanLinkMatcher} instance with the trace state constraint applied.
-   */
-  public SpanLinkMatcher traceState(Matcher<String> matcher) {
-    this.traceStateMatcher = matcher;
-    return this;
-  }
-
-  /**
-   * Checks the link attributes match the given values.
-   *
-   * @param attributes The link attributes to match against.
-   * @return The current {@link SpanLinkMatcher} instance with the attributes constraint applied.
-   */
-  public SpanLinkMatcher attributes(Map<String, String> attributes) {
-    this.attributesMatcher = is(attributes);
-    return this;
-  }
-
-  /**
-   * Checks the link attributes match the given matcher.
-   *
-   * @param matcher The matcher to check the link attributes.
-   * @return The current {@link SpanLinkMatcher} instance with the attributes constraint applied.
-   */
-  public SpanLinkMatcher attributes(Matcher<Map<String, String>> matcher) {
-    this.attributesMatcher = matcher;
-    return this;
-  }
-
-  void assertLink(List<DecodedSpan> trace, DecodedSpanLink link, int linkIndex) {
-    String at = " (link #" + linkIndex + ")";
-    assertValue(
-        traceIdMatcher(trace), link.getTraceId(), "Unexpected span link trace identifier" + at);
-    assertValue(spanIdMatcher(trace), link.getSpanId(), "Unexpected span link identifier" + at);
-    assertValue(this.traceFlagsMatcher, link.getTraceFlags(), "Unexpected span link flags" + at);
-    assertValue(
-        this.traceStateMatcher, link.getTraceState(), "Unexpected span link trace state" + at);
-    assertValue(
-        this.attributesMatcher, link.getAttributes(), "Unexpected span link attributes" + at);
-  }
-
-  private Matcher<Long> traceIdMatcher(List<DecodedSpan> trace) {
-    return this.targetSpanIndex >= 0 ? is(targetSpan(trace).getTraceId()) : this.traceIdMatcher;
-  }
-
-  private Matcher<Long> spanIdMatcher(List<DecodedSpan> trace) {
-    return this.targetSpanIndex >= 0 ? is(targetSpan(trace).getSpanId()) : this.spanIdMatcher;
-  }
-
-  private DecodedSpan targetSpan(List<DecodedSpan> trace) {
-    if (this.targetSpanIndex >= trace.size()) {
-      throw new IllegalStateException(
-          "Cannot link to span #"
-              + this.targetSpanIndex
-              + ": the trace holds only "
-              + trace.size()
-              + " span(s)");
+
+    /**
+     * Checks the link refers to the given trace / span identifiers, for a link to a span outside the
+     * asserted trace.
+     *
+     * @param traceId The trace identifier the link should refer to.
+     * @param spanId The span identifier the link should refer to.
+     * @return A new {@link SpanLinkMatcher} instance matching a link to those identifiers.
+     */
+    public static SpanLinkMatcher to(DDTraceId traceId, long spanId) {
+        return new SpanLinkMatcher(is(traceId.toLong()), is(spanId), NO_SPAN_INDEX);
+    }
+
+    /**
+     * Checks the link refers to the given trace / span identifiers, for a link to a span outside the
+     * asserted trace.
+     *
+     * @param traceId The trace identifier the link should refer to.
+     * @param spanId The span identifier the link should refer to.
+     * @return A new {@link SpanLinkMatcher} instance matching a link to those identifiers.
+     */
+    public static SpanLinkMatcher to(long traceId, long spanId) {
+        return new SpanLinkMatcher(is(traceId), is(spanId), NO_SPAN_INDEX);
+    }
+
+    /**
+     * Checks the link refers to the span at the specified index in the trace, resolved once the
+     * trace's spans have been sorted.
+     *
+     * @param spanIndex The index of the linked span in the trace.
+     * @return A new {@link SpanLinkMatcher} instance matching a link to that span.
+     */
+    public static SpanLinkMatcher toIndex(int spanIndex) {
+        if (spanIndex < 0) {
+            throw new IllegalArgumentException("index must be >= 0");
+        }
+        return new SpanLinkMatcher(null, null, spanIndex);
+    }
+
+    /**
+     * Checks a link is present, whichever span it refers to and whichever flags, trace state and
+     * attributes it carries. Useful to assert a link count, or to skip over a link whose content does
+     * not matter.
+     *
+     * @return A new {@link SpanLinkMatcher} instance matching any link.
+     */
+    public static SpanLinkMatcher any() {
+        return new SpanLinkMatcher(Matchers.any(), Matchers.any(), NO_SPAN_INDEX)
+                .traceFlags(Matchers.any())
+                .traceState(Matchers.any())
+                .attributes(Matchers.any());
+    }
+
+    /**
+     * Checks the link trace flags match the given value.
+     *
+     * @param traceFlags The W3C trace flags to match against.
+     * @return The current {@link SpanLinkMatcher} instance with the trace flags constraint applied.
+     */
+    public SpanLinkMatcher traceFlags(byte traceFlags) {
+        this.traceFlagsMatcher = is(traceFlags);
+        return this;
+    }
+
+    /**
+     * Checks the link trace flags match the given matcher.
+     *
+     * @param matcher The matcher to check the W3C trace flags.
+     * @return The current {@link SpanLinkMatcher} instance with the trace flags constraint applied.
+     */
+    public SpanLinkMatcher traceFlags(Matcher<Byte> matcher) {
+        this.traceFlagsMatcher = matcher;
+        return this;
+    }
+
+    /**
+     * Checks the link trace state matches the given value.
+     *
+     * @param traceState The W3C trace state to match against.
+     * @return The current {@link SpanLinkMatcher} instance with the trace state constraint applied.
+     */
+    public SpanLinkMatcher traceState(String traceState) {
+        this.traceStateMatcher = is(traceState);
+        return this;
+    }
+
+    /**
+     * Checks the link trace state matches the given matcher.
+     *
+     * @param matcher The matcher to check the W3C trace state.
+     * @return The current {@link SpanLinkMatcher} instance with the trace state constraint applied.
+     */
+    public SpanLinkMatcher traceState(Matcher<String> matcher) {
+        this.traceStateMatcher = matcher;
+        return this;
+    }
+
+    /**
+     * Checks the link attributes match the given values.
+     *
+     * @param attributes The link attributes to match against.
+     * @return The current {@link SpanLinkMatcher} instance with the attributes constraint applied.
+     */
+    public SpanLinkMatcher attributes(Map<String, String> attributes) {
+        this.attributesMatcher = is(attributes);
+        return this;
+    }
+
+    /**
+     * Checks the link attributes match the given matcher.
+     *
+     * @param matcher The matcher to check the link attributes.
+     * @return The current {@link SpanLinkMatcher} instance with the attributes constraint applied.
+     */
+    public SpanLinkMatcher attributes(Matcher<Map<String, String>> matcher) {
+        this.attributesMatcher = matcher;
+        return this;
+    }
+
+    void assertLink(List<DecodedSpan> trace, DecodedSpanLink link, int linkIndex) {
+        String at = " (link #" + linkIndex + ")";
+        assertValue(traceIdMatcher(trace), link.getTraceId(), "Unexpected span link trace identifier" + at);
+        assertValue(spanIdMatcher(trace), link.getSpanId(), "Unexpected span link identifier" + at);
+        assertValue(this.traceFlagsMatcher, link.getTraceFlags(), "Unexpected span link flags" + at);
+        assertValue(this.traceStateMatcher, link.getTraceState(), "Unexpected span link trace state" + at);
+        assertValue(this.attributesMatcher, link.getAttributes(), "Unexpected span link attributes" + at);
+    }
+
+    private Matcher<Long> traceIdMatcher(List<DecodedSpan> trace) {
+        return this.targetSpanIndex >= 0 ? is(targetSpan(trace).getTraceId()) : this.traceIdMatcher;
+    }
+
+    private Matcher<Long> spanIdMatcher(List<DecodedSpan> trace) {
+        return this.targetSpanIndex >= 0 ? is(targetSpan(trace).getSpanId()) : this.spanIdMatcher;
+    }
+
+    private DecodedSpan targetSpan(List<DecodedSpan> trace) {
+        if (this.targetSpanIndex >= trace.size()) {
+            throw new IllegalStateException("Cannot link to span #"
+                    + this.targetSpanIndex
+                    + ": the trace holds only "
+                    + trace.size()
+                    + " span(s)");
+        }
+        return trace.get(this.targetSpanIndex);
     }
-    return trace.get(this.targetSpanIndex);
-  }
 }
diff --git a/dd-smoke-tests/src/main/java/datadog/smoketest/trace/SpanMatcher.java b/dd-smoke-tests/src/main/java/datadog/smoketest/trace/SpanMatcher.java
index 42bb20dc115..dd3482bc795 100644
--- a/dd-smoke-tests/src/main/java/datadog/smoketest/trace/SpanMatcher.java
+++ b/dd-smoke-tests/src/main/java/datadog/smoketest/trace/SpanMatcher.java
@@ -43,317 +43,312 @@
  * </ul>
  */
 public final class SpanMatcher {
-  private Matcher<String> serviceMatcher;
-  private Matcher<CharSequence> operationNameMatcher;
-  private Matcher<CharSequence> resourceNameMatcher;
-  private Matcher<String> typeMatcher;
-  private Matcher<Boolean> errorMatcher;
-  private Matcher<Long> parentIdMatcher;
-  private int parentSpanIndex;
-  private SpanLinkMatcher[] linkMatchers;
-  private final Map<String, Matcher<String>> metaMatchers;
-  private final Map<String, Matcher<Number>> metricMatchers;
-  private final Map<String, Matcher<?>> metaStructMatchers;
+    private Matcher<String> serviceMatcher;
+    private Matcher<CharSequence> operationNameMatcher;
+    private Matcher<CharSequence> resourceNameMatcher;
+    private Matcher<String> typeMatcher;
+    private Matcher<Boolean> errorMatcher;
+    private Matcher<Long> parentIdMatcher;
+    private int parentSpanIndex;
+    private SpanLinkMatcher[] linkMatchers;
+    private final Map<String, Matcher<String>> metaMatchers;
+    private final Map<String, Matcher<Number>> metricMatchers;
+    private final Map<String, Matcher<?>> metaStructMatchers;
 
-  private static final Matcher<Long> CHILD_OF_PREVIOUS_MATCHER = is(0L);
+    private static final Matcher<Long> CHILD_OF_PREVIOUS_MATCHER = is(0L);
 
-  private SpanMatcher() {
-    this.serviceMatcher = validates(s -> s != null && !s.isEmpty());
-    this.typeMatcher = validates(s -> s == null || s.isEmpty());
-    this.errorMatcher = isFalse();
-    this.parentSpanIndex = -1;
-    this.metaMatchers = new HashMap<>();
-    this.metricMatchers = new HashMap<>();
-    this.metaStructMatchers = new HashMap<>();
-  }
-
-  /**
-   * Checks a span and its attributes.
-   *
-   * @return A new {@link SpanMatcher} instance to configure span matching constraints.
-   */
-  public static SpanMatcher span() {
-    return new SpanMatcher();
-  }
-
-  /**
-   * Checks the span service name matches the given value.
-   *
-   * @param service The service name to match against.
-   * @return The current {@link SpanMatcher} instance updated with the specified service name
-   *     constraint.
-   */
-  public SpanMatcher service(String service) {
-    this.serviceMatcher = is(service);
-    return this;
-  }
+    private SpanMatcher() {
+        this.serviceMatcher = validates(s -> s != null && !s.isEmpty());
+        this.typeMatcher = validates(s -> s == null || s.isEmpty());
+        this.errorMatcher = isFalse();
+        this.parentSpanIndex = -1;
+        this.metaMatchers = new HashMap<>();
+        this.metricMatchers = new HashMap<>();
+        this.metaStructMatchers = new HashMap<>();
+    }
 
-  /**
-   * Checks the span operation name matches the given value.
-   *
-   * @param operationName The operation name to match against.
-   * @return The current {@link SpanMatcher} instance updated with the specified operation name
-   *     constraint.
-   */
-  public SpanMatcher operationName(String operationName) {
-    this.operationNameMatcher = is(operationName);
-    return this;
-  }
+    /**
+     * Checks a span and its attributes.
+     *
+     * @return A new {@link SpanMatcher} instance to configure span matching constraints.
+     */
+    public static SpanMatcher span() {
+        return new SpanMatcher();
+    }
 
-  /**
-   * Checks the span operation name matches the provided regular expression pattern.
-   *
-   * @param pattern The {@link Pattern} to match the operation name against.
-   * @return The current {@link SpanMatcher} instance updated with the specified operation name
-   *     constraint.
-   */
-  public SpanMatcher operationName(Pattern pattern) {
-    this.operationNameMatcher = matches(pattern);
-    return this;
-  }
+    /**
+     * Checks the span service name matches the given value.
+     *
+     * @param service The service name to match against.
+     * @return The current {@link SpanMatcher} instance updated with the specified service name
+     *     constraint.
+     */
+    public SpanMatcher service(String service) {
+        this.serviceMatcher = is(service);
+        return this;
+    }
 
-  /**
-   * Checks the span resource name matches the given value.
-   *
-   * @param resourceName The resource name to match against.
-   * @return The current {@link SpanMatcher} instance updated with the specified resource name
-   *     constraint.
-   */
-  public SpanMatcher resourceName(String resourceName) {
-    this.resourceNameMatcher = is(resourceName);
-    return this;
-  }
+    /**
+     * Checks the span operation name matches the given value.
+     *
+     * @param operationName The operation name to match against.
+     * @return The current {@link SpanMatcher} instance updated with the specified operation name
+     *     constraint.
+     */
+    public SpanMatcher operationName(String operationName) {
+        this.operationNameMatcher = is(operationName);
+        return this;
+    }
 
-  /**
-   * Checks the span resource name matches the provided regular expression pattern.
-   *
-   * @param pattern The {@link Pattern} used to match the resource name against.
-   * @return The current {@link SpanMatcher} instance updated with the specified resource name
-   *     constraint.
-   */
-  public SpanMatcher resourceName(Pattern pattern) {
-    this.resourceNameMatcher = matches(pattern);
-    return this;
-  }
+    /**
+     * Checks the span operation name matches the provided regular expression pattern.
+     *
+     * @param pattern The {@link Pattern} to match the operation name against.
+     * @return The current {@link SpanMatcher} instance updated with the specified operation name
+     *     constraint.
+     */
+    public SpanMatcher operationName(Pattern pattern) {
+        this.operationNameMatcher = matches(pattern);
+        return this;
+    }
 
-  /**
-   * Checks the span resource name matches the provided validator.
-   *
-   * @param validator The {@link Predicate} used to validate the resource name.
-   * @return The current {@link SpanMatcher} instance updated with the specified resource name
-   *     constraint.
-   */
-  public SpanMatcher resourceName(Predicate<CharSequence> validator) {
-    this.resourceNameMatcher = validates(validator);
-    return this;
-  }
+    /**
+     * Checks the span resource name matches the given value.
+     *
+     * @param resourceName The resource name to match against.
+     * @return The current {@link SpanMatcher} instance updated with the specified resource name
+     *     constraint.
+     */
+    public SpanMatcher resourceName(String resourceName) {
+        this.resourceNameMatcher = is(resourceName);
+        return this;
+    }
 
-  /**
-   * Checks the span type matches the given value.
-   *
-   * @param type The span type to match against.
-   * @return The current {@link SpanMatcher} instance updated with the specified span type
-   *     constraint.
-   */
-  public SpanMatcher type(String type) {
-    this.typeMatcher = is(type);
-    return this;
-  }
+    /**
+     * Checks the span resource name matches the provided regular expression pattern.
+     *
+     * @param pattern The {@link Pattern} used to match the resource name against.
+     * @return The current {@link SpanMatcher} instance updated with the specified resource name
+     *     constraint.
+     */
+    public SpanMatcher resourceName(Pattern pattern) {
+        this.resourceNameMatcher = matches(pattern);
+        return this;
+    }
 
-  /**
-   * Checks the span error status matches the given value.
-   *
-   * @param errored The expected error status.
-   * @return The current {@link SpanMatcher} instance updated with the specified error constraint.
-   */
-  public SpanMatcher error(boolean errored) {
-    this.errorMatcher = errored ? isTrue() : isFalse();
-    return this;
-  }
+    /**
+     * Checks the span resource name matches the provided validator.
+     *
+     * @param validator The {@link Predicate} used to validate the resource name.
+     * @return The current {@link SpanMatcher} instance updated with the specified resource name
+     *     constraint.
+     */
+    public SpanMatcher resourceName(Predicate<CharSequence> validator) {
+        this.resourceNameMatcher = validates(validator);
+        return this;
+    }
 
-  /**
-   * Checks the span is a root span (i.e., a span with no parent).
-   *
-   * @return The current {@link SpanMatcher} instance with the root constraint applied.
-   */
-  public SpanMatcher root() {
-    this.parentIdMatcher = is(0L);
-    this.parentSpanIndex = -1;
-    return this;
-  }
+    /**
+     * Checks the span type matches the given value.
+     *
+     * @param type The span type to match against.
+     * @return The current {@link SpanMatcher} instance updated with the specified span type
+     *     constraint.
+     */
+    public SpanMatcher type(String type) {
+        this.typeMatcher = is(type);
+        return this;
+    }
 
-  /**
-   * Checks the span is a direct child of the specified parent span.
-   *
-   * @param parentSpanId The identifier of the parent span to match against.
-   * @return The current {@link SpanMatcher} instance with the child-of constraint applied.
-   */
-  public SpanMatcher childOf(long parentSpanId) {
-    this.parentIdMatcher = is(parentSpanId);
-    this.parentSpanIndex = -1;
-    return this;
-  }
+    /**
+     * Checks the span error status matches the given value.
+     *
+     * @param errored The expected error status.
+     * @return The current {@link SpanMatcher} instance updated with the specified error constraint.
+     */
+    public SpanMatcher error(boolean errored) {
+        this.errorMatcher = errored ? isTrue() : isFalse();
+        return this;
+    }
 
-  /**
-   * Checks the span is a direct child of the span at the specified index in the trace.
-   *
-   * @param parentSpanIndex The index of the parent span in the trace.
-   * @return The current {@link SpanMatcher} instance with the child-of constraint applied.
-   */
-  public SpanMatcher childOfIndex(int parentSpanIndex) {
-    if (parentSpanIndex < 0) {
-      throw new IllegalArgumentException("index must be >= 0");
+    /**
+     * Checks the span is a root span (i.e., a span with no parent).
+     *
+     * @return The current {@link SpanMatcher} instance with the root constraint applied.
+     */
+    public SpanMatcher root() {
+        this.parentIdMatcher = is(0L);
+        this.parentSpanIndex = -1;
+        return this;
     }
-    this.parentIdMatcher = null;
-    this.parentSpanIndex = parentSpanIndex;
-    return this;
-  }
 
-  /**
-   * Checks the span is a direct child of the immediately preceding span in the trace.
-   *
-   * @return The current {@link SpanMatcher} instance with the child-of constraint applied.
-   */
-  public SpanMatcher childOfPrevious() {
-    this.parentIdMatcher = CHILD_OF_PREVIOUS_MATCHER;
-    this.parentSpanIndex = -1;
-    return this;
-  }
+    /**
+     * Checks the span is a direct child of the specified parent span.
+     *
+     * @param parentSpanId The identifier of the parent span to match against.
+     * @return The current {@link SpanMatcher} instance with the child-of constraint applied.
+     */
+    public SpanMatcher childOf(long parentSpanId) {
+        this.parentIdMatcher = is(parentSpanId);
+        this.parentSpanIndex = -1;
+        return this;
+    }
 
-  /**
-   * Checks the span links, one {@link SpanLinkMatcher} per expected link, matched positionally and
-   * count-exact. Call it with no argument to assert the span carries no link at all; not calling it
-   * asserts nothing about links.
-   *
-   * @param matchers The matchers to verify the span links, one per expected link.
-   * @return The current {@link SpanMatcher} instance updated with the specified span link
-   *     constraints.
-   */
-  public SpanMatcher links(SpanLinkMatcher... matchers) {
-    this.linkMatchers = matchers;
-    return this;
-  }
+    /**
+     * Checks the span is a direct child of the span at the specified index in the trace.
+     *
+     * @param parentSpanIndex The index of the parent span in the trace.
+     * @return The current {@link SpanMatcher} instance with the child-of constraint applied.
+     */
+    public SpanMatcher childOfIndex(int parentSpanIndex) {
+        if (parentSpanIndex < 0) {
+            throw new IllegalArgumentException("index must be >= 0");
+        }
+        this.parentIdMatcher = null;
+        this.parentSpanIndex = parentSpanIndex;
+        return this;
+    }
 
-  /**
-   * Checks the span meta (string) tag matches the given matcher.
-   *
-   * @param name The name of the meta tag to match against.
-   * @param matcher The matcher to check the meta tag value.
-   * @return The current {@link SpanMatcher} instance updated with the specified meta tag
-   *     constraint.
-   */
-  public SpanMatcher tag(String name, Matcher<String> matcher) {
-    this.metaMatchers.put(name, matcher);
-    return this;
-  }
+    /**
+     * Checks the span is a direct child of the immediately preceding span in the trace.
+     *
+     * @return The current {@link SpanMatcher} instance with the child-of constraint applied.
+     */
+    public SpanMatcher childOfPrevious() {
+        this.parentIdMatcher = CHILD_OF_PREVIOUS_MATCHER;
+        this.parentSpanIndex = -1;
+        return this;
+    }
 
-  /**
-   * Checks the span meta (string) tag matches the given value.
-   *
-   * @param name The name of the meta tag to match against.
-   * @param value The expected meta tag value.
-   * @return The current {@link SpanMatcher} instance updated with the specified meta tag
-   *     constraint.
-   */
-  public SpanMatcher tag(String name, String value) {
-    this.metaMatchers.put(name, is(value));
-    return this;
-  }
+    /**
+     * Checks the span links, one {@link SpanLinkMatcher} per expected link, matched positionally and
+     * count-exact. Call it with no argument to assert the span carries no link at all; not calling it
+     * asserts nothing about links.
+     *
+     * @param matchers The matchers to verify the span links, one per expected link.
+     * @return The current {@link SpanMatcher} instance updated with the specified span link
+     *     constraints.
+     */
+    public SpanMatcher links(SpanLinkMatcher... matchers) {
+        this.linkMatchers = matchers;
+        return this;
+    }
 
-  /**
-   * Checks the span metric (numeric) tag matches the given matcher.
-   *
-   * @param name The name of the metric tag to match against.
-   * @param matcher The matcher to check the metric tag value.
-   * @return The current {@link SpanMatcher} instance updated with the specified metric tag
-   *     constraint.
-   */
-  public SpanMatcher metric(String name, Matcher<Number> matcher) {
-    this.metricMatchers.put(name, matcher);
-    return this;
-  }
+    /**
+     * Checks the span meta (string) tag matches the given matcher.
+     *
+     * @param name The name of the meta tag to match against.
+     * @param matcher The matcher to check the meta tag value.
+     * @return The current {@link SpanMatcher} instance updated with the specified meta tag
+     *     constraint.
+     */
+    public SpanMatcher tag(String name, Matcher<String> matcher) {
+        this.metaMatchers.put(name, matcher);
+        return this;
+    }
 
-  /**
-   * Checks the span meta_struct entry matches the given matcher.
-   *
-   * @param name The name of the meta_struct entry to match against.
-   * @param matcher The matcher to check the meta_struct entry value.
-   * @return The current {@link SpanMatcher} instance updated with the specified meta_struct
-   *     constraint.
-   */
-  public SpanMatcher metaStruct(String name, Matcher<?> matcher) {
-    this.metaStructMatchers.put(name, matcher);
-    return this;
-  }
+    /**
+     * Checks the span meta (string) tag matches the given value.
+     *
+     * @param name The name of the meta tag to match against.
+     * @param value The expected meta tag value.
+     * @return The current {@link SpanMatcher} instance updated with the specified meta tag
+     *     constraint.
+     */
+    public SpanMatcher tag(String name, String value) {
+        this.metaMatchers.put(name, is(value));
+        return this;
+    }
 
-  void assertSpan(List<DecodedSpan> trace, int spanIndex) {
-    DecodedSpan span = trace.get(spanIndex);
-    assertValue(this.serviceMatcher, span.getService(), "Unexpected service name");
-    assertValue(this.operationNameMatcher, span.getName(), "Unexpected operation name");
-    assertValue(this.resourceNameMatcher, span.getResource(), "Unexpected resource name");
-    assertValue(this.typeMatcher, span.getType(), "Unexpected span type");
-    assertValue(this.errorMatcher, span.getError() != 0, "Unexpected error status");
-    assertValue(parentIdMatcher(trace, spanIndex), span.getParentId(), "Unexpected parent id");
-    assertSpanTags(span.getMeta());
-    assertSpanMetrics(span.getMetrics());
-    assertSpanMetaStruct(span.getMetaStruct());
-    assertSpanLinks(trace, span);
-  }
+    /**
+     * Checks the span metric (numeric) tag matches the given matcher.
+     *
+     * @param name The name of the metric tag to match against.
+     * @param matcher The matcher to check the metric tag value.
+     * @return The current {@link SpanMatcher} instance updated with the specified metric tag
+     *     constraint.
+     */
+    public SpanMatcher metric(String name, Matcher<Number> matcher) {
+        this.metricMatchers.put(name, matcher);
+        return this;
+    }
 
-  private Matcher<Long> parentIdMatcher(List<DecodedSpan> trace, int spanIndex) {
-    if (this.parentSpanIndex >= 0) {
-      return is(trace.get(this.parentSpanIndex).getSpanId());
-    } else if (this.parentIdMatcher == CHILD_OF_PREVIOUS_MATCHER) {
-      if (spanIndex == 0) {
-        throw new IllegalStateException("Cannot use childOfPrevious() matcher on the first span");
-      }
-      return is(trace.get(spanIndex - 1).getSpanId());
-    } else {
-      return this.parentIdMatcher;
+    /**
+     * Checks the span meta_struct entry matches the given matcher.
+     *
+     * @param name The name of the meta_struct entry to match against.
+     * @param matcher The matcher to check the meta_struct entry value.
+     * @return The current {@link SpanMatcher} instance updated with the specified meta_struct
+     *     constraint.
+     */
+    public SpanMatcher metaStruct(String name, Matcher<?> matcher) {
+        this.metaStructMatchers.put(name, matcher);
+        return this;
     }
-  }
 
-  private void assertSpanLinks(List<DecodedSpan> trace, DecodedSpan span) {
-    if (this.linkMatchers == null) {
-      return;
+    void assertSpan(List<DecodedSpan> trace, int spanIndex) {
+        DecodedSpan span = trace.get(spanIndex);
+        assertValue(this.serviceMatcher, span.getService(), "Unexpected service name");
+        assertValue(this.operationNameMatcher, span.getName(), "Unexpected operation name");
+        assertValue(this.resourceNameMatcher, span.getResource(), "Unexpected resource name");
+        assertValue(this.typeMatcher, span.getType(), "Unexpected span type");
+        assertValue(this.errorMatcher, span.getError() != 0, "Unexpected error status");
+        assertValue(parentIdMatcher(trace, spanIndex), span.getParentId(), "Unexpected parent id");
+        assertSpanTags(span.getMeta());
+        assertSpanMetrics(span.getMetrics());
+        assertSpanMetaStruct(span.getMetaStruct());
+        assertSpanLinks(trace, span);
     }
-    List<DecodedSpanLink> links = span.getLinks();
-    if (links.size() != this.linkMatchers.length) {
-      assertionFailure()
-          .message("Unexpected span link count")
-          .expected(this.linkMatchers.length)
-          .actual(links.size())
-          .buildAndThrow();
+
+    private Matcher<Long> parentIdMatcher(List<DecodedSpan> trace, int spanIndex) {
+        if (this.parentSpanIndex >= 0) {
+            return is(trace.get(this.parentSpanIndex).getSpanId());
+        } else if (this.parentIdMatcher == CHILD_OF_PREVIOUS_MATCHER) {
+            if (spanIndex == 0) {
+                throw new IllegalStateException("Cannot use childOfPrevious() matcher on the first span");
+            }
+            return is(trace.get(spanIndex - 1).getSpanId());
+        } else {
+            return this.parentIdMatcher;
+        }
     }
-    for (int i = 0; i < this.linkMatchers.length; i++) {
-      this.linkMatchers[i].assertLink(trace, links.get(i), i);
+
+    private void assertSpanLinks(List<DecodedSpan> trace, DecodedSpan span) {
+        if (this.linkMatchers == null) {
+            return;
+        }
+        List<DecodedSpanLink> links = span.getLinks();
+        if (links.size() != this.linkMatchers.length) {
+            assertionFailure()
+                    .message("Unexpected span link count")
+                    .expected(this.linkMatchers.length)
+                    .actual(links.size())
+                    .buildAndThrow();
+        }
+        for (int i = 0; i < this.linkMatchers.length; i++) {
+            this.linkMatchers[i].assertLink(trace, links.get(i), i);
+        }
     }
-  }
 
-  private void assertSpanTags(Map<String, String> meta) {
-    for (Entry<String, Matcher<String>> entry : this.metaMatchers.entrySet()) {
-      String key = entry.getKey();
-      assertValue(entry.getValue(), meta.get(key), "Unexpected meta tag '" + key + "'");
+    private void assertSpanTags(Map<String, String> meta) {
+        for (Entry<String, Matcher<String>> entry : this.metaMatchers.entrySet()) {
+            String key = entry.getKey();
+            assertValue(entry.getValue(), meta.get(key), "Unexpected meta tag '" + key + "'");
+        }
     }
-  }
 
-  private void assertSpanMetrics(Map<String, Number> metrics) {
-    for (Entry<String, Matcher<Number>> entry : this.metricMatchers.entrySet()) {
-      assertValue(
-          entry.getValue(),
-          metrics.get(entry.getKey()),
-          "Unexpected metric '" + entry.getKey() + "'");
+    private void assertSpanMetrics(Map<String, Number> metrics) {
+        for (Entry<String, Matcher<Number>> entry : this.metricMatchers.entrySet()) {
+            assertValue(entry.getValue(), metrics.get(entry.getKey()), "Unexpected metric '" + entry.getKey() + "'");
+        }
     }
-  }
 
-  @SuppressWarnings("unchecked")
-  private void assertSpanMetaStruct(Map<String, Object> metaStruct) {
-    for (Entry<String, Matcher<?>> entry : this.metaStructMatchers.entrySet()) {
-      String key = entry.getKey();
-      assertValue(
-          (Matcher<Object>) entry.getValue(),
-          metaStruct.get(key),
-          "Unexpected meta_struct '" + key + "'");
+    @SuppressWarnings("unchecked")
+    private void assertSpanMetaStruct(Map<String, Object> metaStruct) {
+        for (Entry<String, Matcher<?>> entry : this.metaStructMatchers.entrySet()) {
+            String key = entry.getKey();
+            assertValue(
+                    (Matcher<Object>) entry.getValue(), metaStruct.get(key), "Unexpected meta_struct '" + key + "'");
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/src/main/java/datadog/smoketest/trace/TraceMatcher.java b/dd-smoke-tests/src/main/java/datadog/smoketest/trace/TraceMatcher.java
index 0ad9fb86bed..8e6b5840f25 100644
--- a/dd-smoke-tests/src/main/java/datadog/smoketest/trace/TraceMatcher.java
+++ b/dd-smoke-tests/src/main/java/datadog/smoketest/trace/TraceMatcher.java
@@ -32,118 +32,115 @@
  * @see SpanMatcher
  */
 public final class TraceMatcher {
-  /*
-   * Span comparators.
-   */
-  /** Span comparator to sort by start time. */
-  public static final Comparator<DecodedSpan> START_TIME_COMPARATOR =
-      comparingLong(DecodedSpan::getStart).thenComparingLong(DecodedSpan::getSpanId);
-
-  /*
-   * Span assertion options.
-   */
-  /** Sorts spans by start time. */
-  public static final UnaryOperator<Options> SORT_BY_START_TIME =
-      options -> options.sort(START_TIME_COMPARATOR);
-
-  /**
-   * Sorts spans by ancestry, root spans (or which parents are absent from the trace chunk) first,
-   * followed by their children by start time, depth-first.
-   */
-  public static final UnaryOperator<Options> SORT_BY_ANCESTRY = Options::sortByAncestry;
-
-  private final Options options;
-  private final SpanMatcher[] matchers;
-
-  private TraceMatcher(Options options, SpanMatcher[] spanMatchers) {
-    if (spanMatchers.length == 0) {
-      throw new IllegalArgumentException("No span matchers provided");
+    /*
+     * Span comparators.
+     */
+    /** Span comparator to sort by start time. */
+    public static final Comparator<DecodedSpan> START_TIME_COMPARATOR =
+            comparingLong(DecodedSpan::getStart).thenComparingLong(DecodedSpan::getSpanId);
+
+    /*
+     * Span assertion options.
+     */
+    /** Sorts spans by start time. */
+    public static final UnaryOperator<Options> SORT_BY_START_TIME = options -> options.sort(START_TIME_COMPARATOR);
+
+    /**
+     * Sorts spans by ancestry, root spans (or which parents are absent from the trace chunk) first,
+     * followed by their children by start time, depth-first.
+     */
+    public static final UnaryOperator<Options> SORT_BY_ANCESTRY = Options::sortByAncestry;
+
+    private final Options options;
+    private final SpanMatcher[] matchers;
+
+    private TraceMatcher(Options options, SpanMatcher[] spanMatchers) {
+        if (spanMatchers.length == 0) {
+            throw new IllegalArgumentException("No span matchers provided");
+        }
+        this.options = options;
+        this.matchers = spanMatchers;
     }
-    this.options = options;
-    this.matchers = spanMatchers;
-  }
-
-  /**
-   * Checks a trace structure.
-   *
-   * @param matchers The matchers to verify the trace structure.
-   */
-  public static TraceMatcher trace(SpanMatcher... matchers) {
-    return new TraceMatcher(new Options(), matchers);
-  }
-
-  /**
-   * Checks a trace structure.
-   *
-   * @param options The {@link TraceMatcher.Options} to configure the checks.
-   * @param matchers The matchers to verify the trace structure.
-   */
-  public static TraceMatcher trace(UnaryOperator<Options> options, SpanMatcher... matchers) {
-    return new TraceMatcher(options.apply(new Options()), matchers);
-  }
-
-  void assertTrace(List<DecodedSpan> spans, int traceIndex) {
-    if (spans.size() != this.matchers.length) {
-      throw new AssertionFailedError(
-          "Invalid number of spans for trace " + traceIndex + " : " + spans,
-          this.matchers.length,
-          spans.size());
-    }
-    if (this.options.sortByAncestry) {
-      spans = sortByAncestry(spans);
-    } else if (this.options.comparator != null) {
-      spans = new ArrayList<>(spans);
-      spans.sort(this.options.comparator);
-    }
-    for (int i = 0; i < this.matchers.length; i++) {
-      this.matchers[i].assertSpan(spans, i);
+
+    /**
+     * Checks a trace structure.
+     *
+     * @param matchers The matchers to verify the trace structure.
+     */
+    public static TraceMatcher trace(SpanMatcher... matchers) {
+        return new TraceMatcher(new Options(), matchers);
     }
-  }
-
-  private static List<DecodedSpan> sortByAncestry(List<DecodedSpan> spans) {
-    Set<Long> spanIds = spans.stream().map(DecodedSpan::getSpanId).collect(toSet());
-    Map<Long, List<DecodedSpan>> spansByParentId = new HashMap<>();
-    for (DecodedSpan span : spans) {
-      long parentId = span.getParentId();
-      if (parentId != 0 && !spanIds.contains(parentId)) {
-        parentId = 0;
-      }
-      spansByParentId.computeIfAbsent(parentId, k -> new ArrayList<>()).add(span);
+
+    /**
+     * Checks a trace structure.
+     *
+     * @param options The {@link TraceMatcher.Options} to configure the checks.
+     * @param matchers The matchers to verify the trace structure.
+     */
+    public static TraceMatcher trace(UnaryOperator<Options> options, SpanMatcher... matchers) {
+        return new TraceMatcher(options.apply(new Options()), matchers);
     }
-    spansByParentId.forEach((k, v) -> v.sort(START_TIME_COMPARATOR));
-
-    List<DecodedSpan> ordered = new ArrayList<>(spans.size());
-    appendChildren(ordered, spansByParentId.get(0L), spansByParentId);
-    return ordered;
-  }
-
-  private static void appendChildren(
-      List<DecodedSpan> orderedSpan,
-      List<DecodedSpan> children,
-      Map<Long, List<DecodedSpan>> spansByParentId) {
-    for (DecodedSpan child : children) {
-      orderedSpan.add(child);
-      List<DecodedSpan> grandChildren = spansByParentId.get(child.getSpanId());
-      if (grandChildren != null) {
-        appendChildren(orderedSpan, grandChildren, spansByParentId);
-      }
+
+    void assertTrace(List<DecodedSpan> spans, int traceIndex) {
+        if (spans.size() != this.matchers.length) {
+            throw new AssertionFailedError(
+                    "Invalid number of spans for trace " + traceIndex + " : " + spans,
+                    this.matchers.length,
+                    spans.size());
+        }
+        if (this.options.sortByAncestry) {
+            spans = sortByAncestry(spans);
+        } else if (this.options.comparator != null) {
+            spans = new ArrayList<>(spans);
+            spans.sort(this.options.comparator);
+        }
+        for (int i = 0; i < this.matchers.length; i++) {
+            this.matchers[i].assertSpan(spans, i);
+        }
     }
-  }
 
-  public static final class Options {
-    private Comparator<DecodedSpan> comparator = null;
-    private boolean sortByAncestry = false;
+    private static List<DecodedSpan> sortByAncestry(List<DecodedSpan> spans) {
+        Set<Long> spanIds = spans.stream().map(DecodedSpan::getSpanId).collect(toSet());
+        Map<Long, List<DecodedSpan>> spansByParentId = new HashMap<>();
+        for (DecodedSpan span : spans) {
+            long parentId = span.getParentId();
+            if (parentId != 0 && !spanIds.contains(parentId)) {
+                parentId = 0;
+            }
+            spansByParentId.computeIfAbsent(parentId, k -> new ArrayList<>()).add(span);
+        }
+        spansByParentId.forEach((k, v) -> v.sort(START_TIME_COMPARATOR));
+
+        List<DecodedSpan> ordered = new ArrayList<>(spans.size());
+        appendChildren(ordered, spansByParentId.get(0L), spansByParentId);
+        return ordered;
+    }
 
-    public Options sort(Comparator<DecodedSpan> comparator) {
-      this.comparator = comparator;
-      this.sortByAncestry = false;
-      return this;
+    private static void appendChildren(
+            List<DecodedSpan> orderedSpan, List<DecodedSpan> children, Map<Long, List<DecodedSpan>> spansByParentId) {
+        for (DecodedSpan child : children) {
+            orderedSpan.add(child);
+            List<DecodedSpan> grandChildren = spansByParentId.get(child.getSpanId());
+            if (grandChildren != null) {
+                appendChildren(orderedSpan, grandChildren, spansByParentId);
+            }
+        }
     }
 
-    Options sortByAncestry() {
-      this.comparator = null;
-      this.sortByAncestry = true;
-      return this;
+    public static final class Options {
+        private Comparator<DecodedSpan> comparator = null;
+        private boolean sortByAncestry = false;
+
+        public Options sort(Comparator<DecodedSpan> comparator) {
+            this.comparator = comparator;
+            this.sortByAncestry = false;
+            return this;
+        }
+
+        Options sortByAncestry() {
+            this.comparator = null;
+            this.sortByAncestry = true;
+            return this;
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/ErrorLogSmokeTest.java b/dd-smoke-tests/src/test/java/datadog/smoketest/ErrorLogSmokeTest.java
index b68116bf37c..e11bb96dbbe 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/ErrorLogSmokeTest.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/ErrorLogSmokeTest.java
@@ -15,25 +15,24 @@
  */
 class ErrorLogSmokeTest {
 
-  @RegisterExtension
-  static final SmokeServerApp app =
-      SmokeServerApp.named("error-logger")
-          .mainClass("datadog.smoketest.TestServerApp")
-          .args("--server.port=${app.httpPort}")
-          .backend(AgentBackend.mockAgent())
-          .noAgent()
-          .skipErrorLogCheck()
-          .build();
+    @RegisterExtension
+    static final SmokeServerApp app = SmokeServerApp.named("error-logger")
+            .mainClass("datadog.smoketest.TestServerApp")
+            .args("--server.port=${app.httpPort}")
+            .backend(AgentBackend.mockAgent())
+            .noAgent()
+            .skipErrorLogCheck()
+            .build();
 
-  @Test
-  void detectsErrorLinesInTheLog() {
-    app.get("/hello");
-    app.assertNoErrorLogs(); // no error logged yet
+    @Test
+    void detectsErrorLinesInTheLog() {
+        app.get("/hello");
+        app.assertNoErrorLogs(); // no error logged yet
 
-    app.get("/error"); // the app logs "ERROR simulated application error"
-    app.waitForLogLine(line -> line.contains("ERROR simulated")); // ensure it reached the log file
+        app.get("/error"); // the app logs "ERROR simulated application error"
+        app.waitForLogLine(line -> line.contains("ERROR simulated")); // ensure it reached the log file
 
-    AssertionError failure = assertThrows(AssertionError.class, app::assertNoErrorLogs);
-    assertTrue(failure.getMessage().contains("ERROR simulated"), failure.getMessage());
-  }
+        AssertionError failure = assertThrows(AssertionError.class, app::assertNoErrorLogs);
+        assertTrue(failure.getMessage().contains("ERROR simulated"), failure.getMessage());
+    }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/OutputThreadsTest.java b/dd-smoke-tests/src/test/java/datadog/smoketest/OutputThreadsTest.java
index d41d549f830..32abc2e6206 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/OutputThreadsTest.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/OutputThreadsTest.java
@@ -6,21 +6,20 @@
 
 class OutputThreadsTest {
 
-  @Test
-  void closeOnlyJoinsEnumeratedThreads() {
-    ThreadGroup shrinkingThreadGroup =
-        new ThreadGroup("shrinking-smoke-output") {
-          @Override
-          public int activeCount() {
-            return 1;
-          }
+    @Test
+    void closeOnlyJoinsEnumeratedThreads() {
+        ThreadGroup shrinkingThreadGroup = new ThreadGroup("shrinking-smoke-output") {
+            @Override
+            public int activeCount() {
+                return 1;
+            }
 
-          @Override
-          public int enumerate(Thread[] threads) {
-            return 0;
-          }
+            @Override
+            public int enumerate(Thread[] threads) {
+                return 0;
+            }
         };
 
-    assertDoesNotThrow(() -> new OutputThreads(shrinkingThreadGroup).close());
-  }
+        assertDoesNotThrow(() -> new OutputThreads(shrinkingThreadGroup).close());
+    }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/SharedBackendMultiAppTest.java b/dd-smoke-tests/src/test/java/datadog/smoketest/SharedBackendMultiAppTest.java
index 58fd7b96c80..8d1a5dee23d 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/SharedBackendMultiAppTest.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/SharedBackendMultiAppTest.java
@@ -26,51 +26,49 @@
  */
 class SharedBackendMultiAppTest {
 
-  @Order(1)
-  @RegisterExtension
-  static final AgentBackend agent = AgentBackend.mockAgent();
+    @Order(1)
+    @RegisterExtension
+    static final AgentBackend agent = AgentBackend.mockAgent();
 
-  @Order(2)
-  @RegisterExtension
-  static final SmokeServerApp producer =
-      SmokeServerApp.named("producer")
-          .mainClass("datadog.smoketest.TestServerApp")
-          .args("--server.port=${app.httpPort}")
-          .backend(agent)
-          .noAgent()
-          .build();
+    @Order(2)
+    @RegisterExtension
+    static final SmokeServerApp producer = SmokeServerApp.named("producer")
+            .mainClass("datadog.smoketest.TestServerApp")
+            .args("--server.port=${app.httpPort}")
+            .backend(agent)
+            .noAgent()
+            .build();
 
-  @Order(3)
-  @RegisterExtension
-  static final SmokeServerApp consumer =
-      SmokeServerApp.named("consumer")
-          .mainClass("datadog.smoketest.TestServerApp")
-          .args("--server.port=${app.httpPort}")
-          .backend(agent)
-          .noAgent()
-          .build();
+    @Order(3)
+    @RegisterExtension
+    static final SmokeServerApp consumer = SmokeServerApp.named("consumer")
+            .mainClass("datadog.smoketest.TestServerApp")
+            .args("--server.port=${app.httpPort}")
+            .backend(agent)
+            .noAgent()
+            .build();
 
-  @Test
-  void bothAppsRunOnDistinctPorts() {
-    assertNotEquals(producer.httpPort(), consumer.httpPort(), "each app gets its own port");
-    assertEquals(200, producer.get("/"), "producer serves HTTP");
-    assertEquals(200, consumer.get("/"), "consumer serves HTTP");
-  }
+    @Test
+    void bothAppsRunOnDistinctPorts() {
+        assertNotEquals(producer.httpPort(), consumer.httpPort(), "each app gets its own port");
+        assertEquals(200, producer.get("/"), "producer serves HTTP");
+        assertEquals(200, consumer.get("/"), "consumer serves HTTP");
+    }
 
-  @Test
-  void appsShareTheSameBackend() {
-    assertTrue(agent.isShared(), "backend is inferred shared from its extension registration");
-    assertSame(agent, producer.backend(), "producer uses the shared backend");
-    assertSame(agent, consumer.backend(), "consumer uses the shared backend");
-    assertEquals(
-        producer.backend().port(),
-        consumer.backend().port(),
-        "one shared backend => one agent port for both apps");
-  }
+    @Test
+    void appsShareTheSameBackend() {
+        assertTrue(agent.isShared(), "backend is inferred shared from its extension registration");
+        assertSame(agent, producer.backend(), "producer uses the shared backend");
+        assertSame(agent, consumer.backend(), "consumer uses the shared backend");
+        assertEquals(
+                producer.backend().port(),
+                consumer.backend().port(),
+                "one shared backend => one agent port for both apps");
+    }
 
-  @Test
-  void sharedBackendIsStartedByItsOwnExtension() {
-    assertNotNull(agent.url(), "shared backend was started");
-    assertTrue(agent.traces().getTraces().isEmpty(), "no traces arrive without an agent");
-  }
+    @Test
+    void sharedBackendIsStartedByItsOwnExtension() {
+        assertNotNull(agent.url(), "shared backend was started");
+        assertTrue(agent.traces().getTraces().isEmpty(), "no traces arrive without an agent");
+    }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeAppBuilderValidationTest.java b/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeAppBuilderValidationTest.java
index 8baa76a9ad5..4f8dd81ee75 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeAppBuilderValidationTest.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeAppBuilderValidationTest.java
@@ -9,49 +9,45 @@
 
 /** Docker-free unit tests for {@link AbstractSmokeApp}'s builder validation. */
 class SmokeAppBuilderValidationTest {
-  private static final String AGENT_JAR_PROPERTY = "datadog.smoketest.agent.shadowJar.path";
+    private static final String AGENT_JAR_PROPERTY = "datadog.smoketest.agent.shadowJar.path";
 
-  @Test
-  void buildRequiresAnAgentJarUnlessNoAgentOrExplicitAgent() {
-    String saved = System.getProperty(AGENT_JAR_PROPERTY);
-    System.clearProperty(AGENT_JAR_PROPERTY);
-    try {
-      // No noAgent()/javaAgent() and no agent-jar property: fail loudly rather than silently launch
-      // without the tracer (which would also skip the telemetry check and pass app-only
-      // assertions).
-      IllegalStateException error =
-          assertThrows(
-              IllegalStateException.class,
-              () ->
-                  SmokeServerApp.named("no-agent-jar")
-                      .mainClass("datadog.smoketest.TestServerApp")
-                      .backend(AgentBackend.mockAgent())
-                      .build());
-      assertTrue(error.getMessage().contains("Agent jar not found"), error.getMessage());
+    @Test
+    void buildRequiresAnAgentJarUnlessNoAgentOrExplicitAgent() {
+        String saved = System.getProperty(AGENT_JAR_PROPERTY);
+        System.clearProperty(AGENT_JAR_PROPERTY);
+        try {
+            // No noAgent()/javaAgent() and no agent-jar property: fail loudly rather than silently launch
+            // without the tracer (which would also skip the telemetry check and pass app-only
+            // assertions).
+            IllegalStateException error = assertThrows(
+                    IllegalStateException.class,
+                    () -> SmokeServerApp.named("no-agent-jar")
+                            .mainClass("datadog.smoketest.TestServerApp")
+                            .backend(AgentBackend.mockAgent())
+                            .build());
+            assertTrue(error.getMessage().contains("Agent jar not found"), error.getMessage());
 
-      // noAgent() is a valid way to build without an agent jar.
-      assertDoesNotThrow(
-          () ->
-              SmokeServerApp.named("no-agent")
-                  .mainClass("datadog.smoketest.TestServerApp")
-                  .backend(AgentBackend.mockAgent())
-                  .noAgent()
-                  .build(),
-          "noAgent() should build without an agent jar");
+            // noAgent() is a valid way to build without an agent jar.
+            assertDoesNotThrow(
+                    () -> SmokeServerApp.named("no-agent")
+                            .mainClass("datadog.smoketest.TestServerApp")
+                            .backend(AgentBackend.mockAgent())
+                            .noAgent()
+                            .build(),
+                    "noAgent() should build without an agent jar");
 
-      // An explicit javaAgent(path) is also valid without the property.
-      assertDoesNotThrow(
-          () ->
-              SmokeServerApp.named("explicit-agent")
-                  .mainClass("datadog.smoketest.TestServerApp")
-                  .backend(AgentBackend.mockAgent())
-                  .javaAgent("/tmp/some-agent.jar")
-                  .build(),
-          "an explicit agent jar should build without the property");
-    } finally {
-      if (saved != null) {
-        System.setProperty(AGENT_JAR_PROPERTY, saved);
-      }
+            // An explicit javaAgent(path) is also valid without the property.
+            assertDoesNotThrow(
+                    () -> SmokeServerApp.named("explicit-agent")
+                            .mainClass("datadog.smoketest.TestServerApp")
+                            .backend(AgentBackend.mockAgent())
+                            .javaAgent("/tmp/some-agent.jar")
+                            .build(),
+                    "an explicit agent jar should build without the property");
+        } finally {
+            if (saved != null) {
+                System.setProperty(AGENT_JAR_PROPERTY, saved);
+            }
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeAppErrorLogFilterTest.java b/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeAppErrorLogFilterTest.java
index 6c78d32b804..947e6e5dda3 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeAppErrorLogFilterTest.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeAppErrorLogFilterTest.java
@@ -11,56 +11,49 @@
 /** Docker-free unit tests for {@link AbstractSmokeApp}'s default error-log predicate. */
 class SmokeAppErrorLogFilterTest {
 
-  @Test
-  void flagsErrorAndAssertionLines() {
-    Predicate<String> isError = AbstractSmokeApp.defaultErrorLogFilter(emptyList());
-
-    assertTrue(isError.test("2026-07-14 12:00:00 ERROR o.e.SomeClass - boom"), "ERROR line");
-    assertTrue(isError.test("junit ASSERTION FAILED: expected X"), "assertion line");
-    assertTrue(
-        isError.test("Failed to handle exception in instrumentation"), "instrumentation failure");
-    assertFalse(isError.test("INFO all good"), "info line is not an error");
-    assertFalse(isError.test("WARN heads up"), "warn line is not an error");
-  }
-
-  @Test
-  void respectsAllowlist() {
-    Predicate<String> isError =
-        AbstractSmokeApp.defaultErrorLogFilter(singletonList("known flaky ERROR"));
-
-    assertFalse(isError.test("this is a known flaky ERROR we tolerate"), "allowlisted line");
-    assertTrue(isError.test("a real ERROR here"), "non-allowlisted error still flagged");
-  }
-
-  @Test
-  void excludesRepositoryWideKnownFlakyLines() {
-    // The default predicate carries the same known-flaky exclusions as ProcessManager.isErrorLog(),
-    // so migrated profiling/Spring/WildFly suites don't have to re-add them (and don't flake).
-    Predicate<String> isError = AbstractSmokeApp.defaultErrorLogFilter(emptyList());
-
-    assertFalse(
-        isError.test(
-            "[dd-profiler] ERROR com.datadog.profiling.controller.ProfilingSystem - Fatal exception"
-                + " in profiling thread, trying to continue"),
-        "PROF-11068 profiling-thread exception");
-    assertFalse(
-        isError.test(
-            "ERROR com.datadog.profiling.controller.ProfilingSystem - Fatal exception during"
-                + " profiling startup"),
-        "PROF-11072 profiling-startup exception");
-    assertFalse(
-        isError.test("org.apache.http ... I/O reactor terminated abnormally"),
-        "recoverable I/O reactor termination");
-    assertFalse(
-        isError.test(
-            "ERROR datadog.trace.agent.jmxfetch.JMXFetch - jmx collector exited with result: 0"),
-        "successful JMX collector exit");
-
-    // A genuine profiling/agent ERROR that is NOT in the exclusion list is still flagged.
-    assertTrue(
-        isError.test(
-            "ERROR datadog.trace.agent.jmxfetch.JMXFetch - jmx collector exited with"
-                + " result: 1"),
-        "a real (non-zero) JMX collector failure is still an error");
-  }
+    @Test
+    void flagsErrorAndAssertionLines() {
+        Predicate<String> isError = AbstractSmokeApp.defaultErrorLogFilter(emptyList());
+
+        assertTrue(isError.test("2026-07-14 12:00:00 ERROR o.e.SomeClass - boom"), "ERROR line");
+        assertTrue(isError.test("junit ASSERTION FAILED: expected X"), "assertion line");
+        assertTrue(isError.test("Failed to handle exception in instrumentation"), "instrumentation failure");
+        assertFalse(isError.test("INFO all good"), "info line is not an error");
+        assertFalse(isError.test("WARN heads up"), "warn line is not an error");
+    }
+
+    @Test
+    void respectsAllowlist() {
+        Predicate<String> isError = AbstractSmokeApp.defaultErrorLogFilter(singletonList("known flaky ERROR"));
+
+        assertFalse(isError.test("this is a known flaky ERROR we tolerate"), "allowlisted line");
+        assertTrue(isError.test("a real ERROR here"), "non-allowlisted error still flagged");
+    }
+
+    @Test
+    void excludesRepositoryWideKnownFlakyLines() {
+        // The default predicate carries the same known-flaky exclusions as ProcessManager.isErrorLog(),
+        // so migrated profiling/Spring/WildFly suites don't have to re-add them (and don't flake).
+        Predicate<String> isError = AbstractSmokeApp.defaultErrorLogFilter(emptyList());
+
+        assertFalse(
+                isError.test("[dd-profiler] ERROR com.datadog.profiling.controller.ProfilingSystem - Fatal exception"
+                        + " in profiling thread, trying to continue"),
+                "PROF-11068 profiling-thread exception");
+        assertFalse(
+                isError.test("ERROR com.datadog.profiling.controller.ProfilingSystem - Fatal exception during"
+                        + " profiling startup"),
+                "PROF-11072 profiling-startup exception");
+        assertFalse(
+                isError.test("org.apache.http ... I/O reactor terminated abnormally"),
+                "recoverable I/O reactor termination");
+        assertFalse(
+                isError.test("ERROR datadog.trace.agent.jmxfetch.JMXFetch - jmx collector exited with result: 0"),
+                "successful JMX collector exit");
+
+        // A genuine profiling/agent ERROR that is NOT in the exclusion list is still flagged.
+        assertTrue(
+                isError.test("ERROR datadog.trace.agent.jmxfetch.JMXFetch - jmx collector exited with" + " result: 1"),
+                "a real (non-zero) JMX collector failure is still an error");
+    }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeAppLogFileNameTest.java b/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeAppLogFileNameTest.java
index 99939fcc43e..6f9b35e034c 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeAppLogFileNameTest.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeAppLogFileNameTest.java
@@ -13,19 +13,18 @@
  */
 class SmokeAppLogFileNameTest {
 
-  @Test
-  void logFileNameIsTimestampedInUtc() {
-    Instant when = Instant.parse("2026-07-30T12:34:56.789Z");
-    assertEquals(
-        "smoke-app.my-app.2026-07-30-123456.789.log", AbstractSmokeApp.logFileName("my-app", when));
-  }
+    @Test
+    void logFileNameIsTimestampedInUtc() {
+        Instant when = Instant.parse("2026-07-30T12:34:56.789Z");
+        assertEquals("smoke-app.my-app.2026-07-30-123456.789.log", AbstractSmokeApp.logFileName("my-app", when));
+    }
 
-  @Test
-  void distinctInstantsYieldDistinctNames() {
-    // Two runs (retries) at different instants must not resolve to the same file.
-    Instant when = Instant.parse("2026-07-30T12:34:56.789Z");
-    assertNotEquals(
-        AbstractSmokeApp.logFileName("my-app", when),
-        AbstractSmokeApp.logFileName("my-app", when.plusMillis(1)));
-  }
+    @Test
+    void distinctInstantsYieldDistinctNames() {
+        // Two runs (retries) at different instants must not resolve to the same file.
+        Instant when = Instant.parse("2026-07-30T12:34:56.789Z");
+        assertNotEquals(
+                AbstractSmokeApp.logFileName("my-app", when),
+                AbstractSmokeApp.logFileName("my-app", when.plusMillis(1)));
+    }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeAppLogLevelTest.java b/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeAppLogLevelTest.java
index c8099588f65..1e88b62d38a 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeAppLogLevelTest.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeAppLogLevelTest.java
@@ -13,34 +13,32 @@
  */
 class SmokeAppLogLevelTest {
 
-  @RegisterExtension
-  static final SmokeCliApp defaultLevel =
-      SmokeCliApp.named("log-level-default")
-          .mainClass("datadog.smoketest.TestCliApp")
-          .backend(AgentBackend.mockAgent())
-          .noAgent()
-          .build();
+    @RegisterExtension
+    static final SmokeCliApp defaultLevel = SmokeCliApp.named("log-level-default")
+            .mainClass("datadog.smoketest.TestCliApp")
+            .backend(AgentBackend.mockAgent())
+            .noAgent()
+            .build();
 
-  @RegisterExtension
-  static final SmokeCliApp debugLevel =
-      SmokeCliApp.named("log-level-debug")
-          .mainClass("datadog.smoketest.TestCliApp")
-          .backend(AgentBackend.mockAgent())
-          .noAgent()
-          .debugLogs()
-          .build();
+    @RegisterExtension
+    static final SmokeCliApp debugLevel = SmokeCliApp.named("log-level-debug")
+            .mainClass("datadog.smoketest.TestCliApp")
+            .backend(AgentBackend.mockAgent())
+            .noAgent()
+            .debugLogs()
+            .build();
 
-  @Test
-  void launchesWithInfoLevelByDefault() {
-    assertTrue(
-        defaultLevel.waitForLogLine(line -> line.contains("LOG-LEVEL=info")),
-        "app launched with the default info log level");
-  }
+    @Test
+    void launchesWithInfoLevelByDefault() {
+        assertTrue(
+                defaultLevel.waitForLogLine(line -> line.contains("LOG-LEVEL=info")),
+                "app launched with the default info log level");
+    }
 
-  @Test
-  void debugLogsRaisesTheChildLogLevel() {
-    assertTrue(
-        debugLevel.waitForLogLine(line -> line.contains("LOG-LEVEL=debug")),
-        "debugLogs() launched the app with the debug log level");
-  }
+    @Test
+    void debugLogsRaisesTheChildLogLevel() {
+        assertTrue(
+                debugLevel.waitForLogLine(line -> line.contains("LOG-LEVEL=debug")),
+                "debugLogs() launched the app with the debug log level");
+    }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeCliAppTest.java b/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeCliAppTest.java
index 1454ffd2bb5..929dc223a52 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeCliAppTest.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeCliAppTest.java
@@ -14,20 +14,19 @@
  */
 class SmokeCliAppTest {
 
-  @RegisterExtension
-  static final SmokeCliApp app =
-      SmokeCliApp.named("test-cli")
-          .mainClass("datadog.smoketest.TestCliApp")
-          .backend(AgentBackend.mockAgent())
-          .noAgent()
-          .build();
+    @RegisterExtension
+    static final SmokeCliApp app = SmokeCliApp.named("test-cli")
+            .mainClass("datadog.smoketest.TestCliApp")
+            .backend(AgentBackend.mockAgent())
+            .noAgent()
+            .build();
 
-  @Test
-  void retainsStartupLogsForAssertion() {
-    // The marker was printed during beforeAll; per-test log clearing (which a server does) must not
-    // apply to a one-shot CLI app, so waitForLogLine still finds it here.
-    assertTrue(
-        app.waitForLogLine(line -> line.contains("CLI-STARTUP-MARKER")),
-        "one-shot start-up output is retained for the test to assert on");
-  }
+    @Test
+    void retainsStartupLogsForAssertion() {
+        // The marker was printed during beforeAll; per-test log clearing (which a server does) must not
+        // apply to a one-shot CLI app, so waitForLogLine still finds it here.
+        assertTrue(
+                app.waitForLogLine(line -> line.contains("CLI-STARTUP-MARKER")),
+                "one-shot start-up output is retained for the test to assert on");
+    }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeServerAppLivenessTest.java b/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeServerAppLivenessTest.java
index 19e4bd2bae9..4441fa57768 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeServerAppLivenessTest.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeServerAppLivenessTest.java
@@ -14,27 +14,25 @@
  */
 class SmokeServerAppLivenessTest {
 
-  @Test
-  void failsWhenTheServerDiesDuringATest() throws Exception {
-    SmokeServerApp app =
-        SmokeServerApp.named("dying-server")
-            .mainClass("datadog.smoketest.TestServerApp")
-            .args("--server.port=${app.httpPort}")
-            .backend(AgentBackend.mockAgent())
-            .noAgent()
-            .build();
+    @Test
+    void failsWhenTheServerDiesDuringATest() throws Exception {
+        SmokeServerApp app = SmokeServerApp.named("dying-server")
+                .mainClass("datadog.smoketest.TestServerApp")
+                .args("--server.port=${app.httpPort}")
+                .backend(AgentBackend.mockAgent())
+                .noAgent()
+                .build();
 
-    app.beforeAll(null);
-    try {
-      Process process = app.process();
-      process.destroy();
-      process.waitFor();
+        app.beforeAll(null);
+        try {
+            Process process = app.process();
+            process.destroy();
+            process.waitFor();
 
-      IllegalStateException failure =
-          assertThrows(IllegalStateException.class, () -> app.afterEach(null));
-      assertTrue(failure.getMessage().contains("at the end of a test"), failure.getMessage());
-    } finally {
-      app.afterAll(null);
+            IllegalStateException failure = assertThrows(IllegalStateException.class, () -> app.afterEach(null));
+            assertTrue(failure.getMessage().contains("at the end of a test"), failure.getMessage());
+        } finally {
+            app.afterAll(null);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeServerAppTest.java b/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeServerAppTest.java
index b4db8092048..ef126bbb983 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeServerAppTest.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/SmokeServerAppTest.java
@@ -16,44 +16,43 @@
  */
 class SmokeServerAppTest {
 
-  @RegisterExtension
-  static final SmokeServerApp app =
-      SmokeServerApp.named("test-server")
-          .mainClass("datadog.smoketest.TestServerApp")
-          .placeholder("marker", () -> "resolved-at-launch")
-          .args("--server.port=${app.httpPort}", "--marker=${marker}")
-          .backend(AgentBackend.mockAgent())
-          .noAgent()
-          .build();
-
-  @Test
-  void respondsOnTheAllocatedPort() {
-    assertTrue(app.httpPort() > 0, "a port was allocated");
-    // Reaching the app proves ${app.httpPort} was substituted into the launch args.
-    assertEquals(200, app.get("/hello"), "app serves HTTP on the substituted port");
-  }
-
-  @Test
-  void capturesApplicationLogOutput() {
-    app.get("/ping");
-    assertTrue(
-        app.waitForLogLine(line -> line.contains("REQUEST GET /ping")),
-        "app stdout is captured during the test");
-  }
-
-  @Test
-  void substitutesCustomPlaceholderAtLaunch() {
-    app.get("/ping");
-    // The app echoes its --marker launch arg; seeing the resolved value proves the custom ${marker}
-    // placeholder was substituted from its Supplier when the app launched.
-    assertTrue(
-        app.waitForLogLine(line -> line.contains("marker=resolved-at-launch")),
-        "custom placeholder was substituted into the launch args");
-  }
-
-  @Test
-  void ownsAndStartsItsBackend() {
-    assertNotNull(app.backend().url(), "the owned backend was started before the app");
-    assertTrue(app.traces().getTraces().isEmpty(), "no traces arrive without an agent");
-  }
+    @RegisterExtension
+    static final SmokeServerApp app = SmokeServerApp.named("test-server")
+            .mainClass("datadog.smoketest.TestServerApp")
+            .placeholder("marker", () -> "resolved-at-launch")
+            .args("--server.port=${app.httpPort}", "--marker=${marker}")
+            .backend(AgentBackend.mockAgent())
+            .noAgent()
+            .build();
+
+    @Test
+    void respondsOnTheAllocatedPort() {
+        assertTrue(app.httpPort() > 0, "a port was allocated");
+        // Reaching the app proves ${app.httpPort} was substituted into the launch args.
+        assertEquals(200, app.get("/hello"), "app serves HTTP on the substituted port");
+    }
+
+    @Test
+    void capturesApplicationLogOutput() {
+        app.get("/ping");
+        assertTrue(
+                app.waitForLogLine(line -> line.contains("REQUEST GET /ping")),
+                "app stdout is captured during the test");
+    }
+
+    @Test
+    void substitutesCustomPlaceholderAtLaunch() {
+        app.get("/ping");
+        // The app echoes its --marker launch arg; seeing the resolved value proves the custom ${marker}
+        // placeholder was substituted from its Supplier when the app launched.
+        assertTrue(
+                app.waitForLogLine(line -> line.contains("marker=resolved-at-launch")),
+                "custom placeholder was substituted into the launch args");
+    }
+
+    @Test
+    void ownsAndStartsItsBackend() {
+        assertNotNull(app.backend().url(), "the owned backend was started before the app");
+        assertTrue(app.traces().getTraces().isEmpty(), "no traces arrive without an agent");
+    }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/TestCliApp.java b/dd-smoke-tests/src/test/java/datadog/smoketest/TestCliApp.java
index 25b14f3e601..e2b3ed370e5 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/TestCliApp.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/TestCliApp.java
@@ -6,11 +6,11 @@
  * SmokeCliApp}'s launch/log-capture without the agent.
  */
 public final class TestCliApp {
-  private TestCliApp() {}
+    private TestCliApp() {}
 
-  public static void main(String[] args) {
-    System.out.println("CLI-STARTUP-MARKER");
-    System.out.println("LOG-LEVEL=" + System.getProperty("org.slf4j.simpleLogger.defaultLogLevel"));
-    System.out.flush();
-  }
+    public static void main(String[] args) {
+        System.out.println("CLI-STARTUP-MARKER");
+        System.out.println("LOG-LEVEL=" + System.getProperty("org.slf4j.simpleLogger.defaultLogLevel"));
+        System.out.flush();
+    }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/TestServerApp.java b/dd-smoke-tests/src/test/java/datadog/smoketest/TestServerApp.java
index 5d58d280d09..f9573ea589d 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/TestServerApp.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/TestServerApp.java
@@ -14,41 +14,39 @@
  * the process is destroyed.
  */
 public final class TestServerApp {
-  private TestServerApp() {}
+    private TestServerApp() {}
 
-  public static void main(String[] args) throws Exception {
-    int port = 0;
-    String marker = "";
-    for (String arg : args) {
-      if (arg.startsWith("--server.port=")) {
-        port = Integer.parseInt(arg.substring("--server.port=".length()));
-      } else if (arg.startsWith("--marker=")) {
-        // Echoed on each request so tests can assert launch-arg (placeholder) substitution.
-        marker = arg.substring("--marker=".length());
-      }
-    }
-    final String markerSuffix = marker.isEmpty() ? "" : " marker=" + marker;
+    public static void main(String[] args) throws Exception {
+        int port = 0;
+        String marker = "";
+        for (String arg : args) {
+            if (arg.startsWith("--server.port=")) {
+                port = Integer.parseInt(arg.substring("--server.port=".length()));
+            } else if (arg.startsWith("--marker=")) {
+                // Echoed on each request so tests can assert launch-arg (placeholder) substitution.
+                marker = arg.substring("--marker=".length());
+            }
+        }
+        final String markerSuffix = marker.isEmpty() ? "" : " marker=" + marker;
 
-    HttpServer server = HttpServer.create(new InetSocketAddress("localhost", port), 0);
-    server.createContext(
-        "/",
-        exchange -> {
-          String path = exchange.getRequestURI().getPath();
-          System.out.println("REQUEST " + exchange.getRequestMethod() + " " + path + markerSuffix);
-          if ("/error".equals(path)) {
-            // Emit an error line so tests can exercise the no-error-logs check.
-            System.out.println("ERROR simulated application error");
-          }
-          byte[] body = "ok".getBytes(StandardCharsets.UTF_8);
-          exchange.sendResponseHeaders(200, body.length);
-          try (OutputStream os = exchange.getResponseBody()) {
-            os.write(body);
-          }
+        HttpServer server = HttpServer.create(new InetSocketAddress("localhost", port), 0);
+        server.createContext("/", exchange -> {
+            String path = exchange.getRequestURI().getPath();
+            System.out.println("REQUEST " + exchange.getRequestMethod() + " " + path + markerSuffix);
+            if ("/error".equals(path)) {
+                // Emit an error line so tests can exercise the no-error-logs check.
+                System.out.println("ERROR simulated application error");
+            }
+            byte[] body = "ok".getBytes(StandardCharsets.UTF_8);
+            exchange.sendResponseHeaders(200, body.length);
+            try (OutputStream os = exchange.getResponseBody()) {
+                os.write(body);
+            }
         });
-    server.start();
-    System.out.println("TestServerApp listening on " + port);
+        server.start();
+        System.out.println("TestServerApp listening on " + port);
 
-    // Block forever; SmokeServerApp destroys the process at teardown.
-    new CountDownLatch(1).await();
-  }
+        // Block forever; SmokeServerApp destroys the process at teardown.
+        new CountDownLatch(1).await();
+    }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/backend/MockAgentBackendTest.java b/dd-smoke-tests/src/test/java/datadog/smoketest/backend/MockAgentBackendTest.java
index 0b9d06e9c33..d357ef28ca7 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/backend/MockAgentBackendTest.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/backend/MockAgentBackendTest.java
@@ -43,268 +43,254 @@
  * backend started once per class, reset between methods).
  */
 class MockAgentBackendTest {
-  private static final MediaType MSGPACK = MediaType.parse("application/msgpack");
-  private static final MediaType JSON = MediaType.parse("application/json");
-  private static final OkHttpClient CLIENT = new OkHttpClient();
-
-  // Recorded /v0.4/traces payload: 1 trace, 2 spans (netty.request -> WebController.hello),
-  // service "smoke-test-java-app". Same fixture the decoder module's DecoderTest uses.
-  private static byte[] v04Payload;
-
-  private static MockAgentBackend backend;
-
-  @BeforeAll
-  static void setUp() throws IOException {
-    v04Payload = readResource("/datadog/smoketest/backend/webflux.04.msgpack");
-    backend = new MockAgentBackend();
-    backend.start();
-  }
-
-  @AfterAll
-  static void tearDown() {
-    if (backend != null) {
-      backend.close();
+    private static final MediaType MSGPACK = MediaType.parse("application/msgpack");
+    private static final MediaType JSON = MediaType.parse("application/json");
+    private static final OkHttpClient CLIENT = new OkHttpClient();
+
+    // Recorded /v0.4/traces payload: 1 trace, 2 spans (netty.request -> WebController.hello),
+    // service "smoke-test-java-app". Same fixture the decoder module's DecoderTest uses.
+    private static byte[] v04Payload;
+
+    private static MockAgentBackend backend;
+
+    @BeforeAll
+    static void setUp() throws IOException {
+        v04Payload = readResource("/datadog/smoketest/backend/webflux.04.msgpack");
+        backend = new MockAgentBackend();
+        backend.start();
+    }
+
+    @AfterAll
+    static void tearDown() {
+        if (backend != null) {
+            backend.close();
+        }
+    }
+
+    @BeforeEach
+    void resetTraces() {
+        backend.clear();
+    }
+
+    @Test
+    void receivesAndDecodesSubmittedTraces() throws IOException {
+        putTraces("/v0.4/traces", v04Payload);
+
+        Traces traces = backend.traces();
+        traces.waitForTraceCount(1);
+
+        List<DecodedTrace> decoded = traces.getTraces();
+        assertEquals(1, decoded.size(), "trace count");
+
+        // sortByStart makes the assertion independent of the received span order (thin matcher is
+        // positional — see TraceMatcher's TODO).
+        List<DecodedSpan> spans = Decoder.sortByStart(decoded.get(0).getSpans());
+        assertEquals(2, spans.size(), "span count");
+
+        DecodedSpan root = spans.get(0);
+        assertEquals("smoke-test-java-app", root.getService());
+        assertEquals("netty.request", root.getName());
+        assertEquals("GET /hello", root.getResource());
+        assertEquals(0L, root.getParentId(), "root has no parent");
+        assertEquals("netty", root.getMeta().get("component"));
+
+        DecodedSpan child = spans.get(1);
+        assertEquals("WebController.hello", child.getName());
+        assertEquals(root.getSpanId(), child.getParentId(), "child parents the root span");
     }
-  }
-
-  @BeforeEach
-  void resetTraces() {
-    backend.clear();
-  }
-
-  @Test
-  void receivesAndDecodesSubmittedTraces() throws IOException {
-    putTraces("/v0.4/traces", v04Payload);
-
-    Traces traces = backend.traces();
-    traces.waitForTraceCount(1);
-
-    List<DecodedTrace> decoded = traces.getTraces();
-    assertEquals(1, decoded.size(), "trace count");
-
-    // sortByStart makes the assertion independent of the received span order (thin matcher is
-    // positional — see TraceMatcher's TODO).
-    List<DecodedSpan> spans = Decoder.sortByStart(decoded.get(0).getSpans());
-    assertEquals(2, spans.size(), "span count");
-
-    DecodedSpan root = spans.get(0);
-    assertEquals("smoke-test-java-app", root.getService());
-    assertEquals("netty.request", root.getName());
-    assertEquals("GET /hello", root.getResource());
-    assertEquals(0L, root.getParentId(), "root has no parent");
-    assertEquals("netty", root.getMeta().get("component"));
-
-    DecodedSpan child = spans.get(1);
-    assertEquals("WebController.hello", child.getName());
-    assertEquals(root.getSpanId(), child.getParentId(), "child parents the root span");
-  }
-
-  @Test
-  void assertTracesFacadeMatchesDecodedTraces() throws IOException {
-    putTraces("/v0.4/traces", v04Payload);
-
-    // The fluent facade (S5) chains count-polling into the thin smoke matcher (S1). Both fixture
-    // spans share the service and web type, so this holds regardless of the received span order.
-    backend
-        .traces()
-        .waitForTraces(
-            trace(
-                span().service("smoke-test-java-app").type("web"),
-                span().service("smoke-test-java-app").type("web")));
-  }
-
-  @Test
-  void accumulatesTracesAcrossSubmissions() throws IOException {
-    putTraces("/v0.4/traces", v04Payload);
-    putTraces("/v0.4/traces", v04Payload);
-
-    backend.traces().waitForTraceCount(2);
-    assertEquals(2, backend.traces().getTraces().size());
-  }
-
-  @Test
-  void clearDiscardsReceivedTraces() throws IOException {
-    putTraces("/v0.4/traces", v04Payload);
-    backend.traces().waitForTraceCount(1);
-
-    backend.clear();
-
-    assertTrue(backend.traces().getTraces().isEmpty(), "clear() drops collected traces");
-  }
-
-  @Test
-  void capturesTelemetry() throws IOException {
-    postTelemetry("{\"request_type\":\"app-started\",\"api_version\":\"v2\"}");
-    postTelemetry(
-        "{\"request_type\":\"message-batch\",\"payload\":["
-            + "{\"request_type\":\"app-dependencies-loaded\"},"
-            + "{\"request_type\":\"generate-metrics\"}]}");
-
-    Telemetry telemetry = backend.telemetry();
-    telemetry.waitForCount(2);
-    assertEquals(2, telemetry.getMessages().size(), "raw messages: app-started + message-batch");
-
-    // getFlatMessages expands the batch into its two entries: 1 + 2 = 3.
-    List<Map<String, Object>> flat = telemetry.getFlatMessages();
-    assertEquals(3, flat.size(), "message-batch expanded into its entries");
-    assertTrue(
-        flat.stream().anyMatch(m -> "app-started".equals(m.get("request_type"))),
-        "app-started present");
-    assertTrue(
-        flat.stream().anyMatch(m -> "app-dependencies-loaded".equals(m.get("request_type"))),
-        "batch entry present");
-
-    backend.clear();
-    assertTrue(backend.telemetry().getMessages().isEmpty(), "clear() drops telemetry too");
-  }
-
-  @Test
-  void waitForFlatMatchesTelemetryEvents() throws IOException {
-    postTelemetry("{\"request_type\":\"app-started\",\"api_version\":\"v2\"}");
-
-    // Matches a received event…
-    backend.telemetry().waitForFlat(message -> "app-started".equals(message.get("request_type")));
-    // …and times out (short timeout) when nothing matches.
-    assertThrows(
-        AssertionError.class,
-        () ->
-            backend
-                .telemetry()
-                .waitForFlat(message -> "never-sent".equals(message.get("request_type")), 0.2));
-  }
-
-  @Test
-  void infoAdvertisesTraceEndpointsAndCapabilities() throws IOException {
-    Request request = new Request.Builder().url(backend.url() + "/info").get().build();
-    try (Response response = CLIENT.newCall(request).execute()) {
-      assertEquals(200, response.code());
-      String body = response.body().string();
-      assertTrue(body.contains("/v0.4/traces"), body);
-      assertTrue(body.contains("\"client_drop_p0s\":true"), body);
+
+    @Test
+    void assertTracesFacadeMatchesDecodedTraces() throws IOException {
+        putTraces("/v0.4/traces", v04Payload);
+
+        // The fluent facade (S5) chains count-polling into the thin smoke matcher (S1). Both fixture
+        // spans share the service and web type, so this holds regardless of the received span order.
+        backend.traces()
+                .waitForTraces(trace(
+                        span().service("smoke-test-java-app").type("web"),
+                        span().service("smoke-test-java-app").type("web")));
     }
-  }
-
-  @Test
-  void waitForTraceCountTimesOutWhenTooFew() {
-    // Nothing submitted, so polling for a trace with a short timeout must fail rather than hang.
-    assertThrows(
-        AssertionError.class, () -> backend.traces().waitForTraceCount(1, 0.2 /* seconds */));
-  }
-
-  @Test
-  void exposesBoundPort() {
-    assertTrue(backend.port() > 0, "port is bound");
-    assertEquals(backend.url().getPort(), backend.port(), "port matches url");
-  }
-
-  @Test
-  void servesPushedRemoteConfigAndCapturesPolls() throws IOException {
-    String path = "datadog/2/APM_TRACING/config_overrides/config";
-    String config = "{\"lib_config\":{\"tracing_sampling_rate\":0.5}}";
-    backend.remoteConfig().setConfig(path, config);
-
-    String served =
-        pollRemoteConfig("{\"client\":{\"products\":[\"APM_TRACING\"],\"capabilities\":[2]}}");
-
-    // The served payload must satisfy the tracer's own parser, which checks each target file
-    // against the sha256 and byte length declared in "targets".
-    RemoteConfigResponse parsed =
-        new RemoteConfigResponse.Factory(
-                new Moshi.Builder()
-                    .add(Instant.class, new InstantJsonAdapter())
-                    .add(ByteString.class, new RawJsonAdapter())
-                    .build())
-            .fromInputStream(new ByteArrayInputStream(served.getBytes(UTF_8)))
-            .orElseThrow(() -> new AssertionError("remote-config payload not parsed: " + served));
-    assertEquals(config, new String(parsed.getFileContents(path), UTF_8), "config content");
-
-    List<Map<String, Object>> polls = backend.remoteConfig().requests();
-    assertEquals(1, polls.size(), "the poll was captured");
-    assertTrue(RemoteConfig.products(polls.get(0)).contains("APM_TRACING"), "products decoded");
-    assertEquals(2L, RemoteConfig.capabilities(polls.get(0)), "capabilities decoded");
-  }
-
-  @Test
-  void clearResetsRemoteConfig() throws IOException {
-    backend.remoteConfig().setConfig("datadog/2/APM_TRACING/config_overrides/config", "{\"a\":1}");
-    assertTrue(pollRemoteConfig("{}").contains("client_configs"), "config served before clear");
-
-    backend.clear();
-
-    assertTrue(backend.remoteConfig().requests().isEmpty(), "captured polls dropped");
-    assertEquals("{}", pollRemoteConfig("{}"), "back to the no-configs response");
-  }
-
-  private static String pollRemoteConfig(String clientBody) throws IOException {
-    Request request =
-        new Request.Builder()
-            .url(backend.url() + "/v0.7/config")
-            .post(RequestBody.create(JSON, clientBody))
-            .build();
-    try (Response response = CLIENT.newCall(request).execute()) {
-      assertEquals(200, response.code(), "mock agent should serve remote config");
-      return response.body().string();
+
+    @Test
+    void accumulatesTracesAcrossSubmissions() throws IOException {
+        putTraces("/v0.4/traces", v04Payload);
+        putTraces("/v0.4/traces", v04Payload);
+
+        backend.traces().waitForTraceCount(2);
+        assertEquals(2, backend.traces().getTraces().size());
     }
-  }
-
-  private static void postTelemetry(String json) throws IOException {
-    Request request =
-        new Request.Builder()
-            .url(backend.url() + "/telemetry/proxy/api/v2/apmtelemetry")
-            .post(RequestBody.create(JSON, json))
-            .build();
-    try (Response response = CLIENT.newCall(request).execute()) {
-      assertTrue(response.isSuccessful(), "mock agent should accept telemetry: " + response.code());
+
+    @Test
+    void clearDiscardsReceivedTraces() throws IOException {
+        putTraces("/v0.4/traces", v04Payload);
+        backend.traces().waitForTraceCount(1);
+
+        backend.clear();
+
+        assertTrue(backend.traces().getTraces().isEmpty(), "clear() drops collected traces");
     }
-  }
-
-  @Test
-  void surfacesDecodingFailures() throws IOException {
-    // Decoding runs on the server thread, where JavaTestHttpServer turns the exception into a 500;
-    // without capture the test would only see an empty trace collection and time out.
-    Request request =
-        new Request.Builder()
-            .url(backend.url() + "/v0.4/traces")
-            .put(RequestBody.create(MSGPACK, "not msgpack".getBytes(UTF_8)))
-            .build();
-    try (Response response = CLIENT.newCall(request).execute()) {
-      assertEquals(500, response.code(), "malformed payload is rejected");
+
+    @Test
+    void capturesTelemetry() throws IOException {
+        postTelemetry("{\"request_type\":\"app-started\",\"api_version\":\"v2\"}");
+        postTelemetry("{\"request_type\":\"message-batch\",\"payload\":["
+                + "{\"request_type\":\"app-dependencies-loaded\"},"
+                + "{\"request_type\":\"generate-metrics\"}]}");
+
+        Telemetry telemetry = backend.telemetry();
+        telemetry.waitForCount(2);
+        assertEquals(2, telemetry.getMessages().size(), "raw messages: app-started + message-batch");
+
+        // getFlatMessages expands the batch into its two entries: 1 + 2 = 3.
+        List<Map<String, Object>> flat = telemetry.getFlatMessages();
+        assertEquals(3, flat.size(), "message-batch expanded into its entries");
+        assertTrue(flat.stream().anyMatch(m -> "app-started".equals(m.get("request_type"))), "app-started present");
+        assertTrue(
+                flat.stream().anyMatch(m -> "app-dependencies-loaded".equals(m.get("request_type"))),
+                "batch entry present");
+
+        backend.clear();
+        assertTrue(backend.telemetry().getMessages().isEmpty(), "clear() drops telemetry too");
     }
 
-    IllegalStateException error =
-        assertThrows(IllegalStateException.class, () -> backend.traces().getTraces());
-    assertTrue(error.getMessage().contains("decode received traces"), error.getMessage());
-    assertNotNull(error.getCause(), "keeps the decoder failure as the cause");
-
-    // The other surfaces stay usable — the failures are tracked per surface.
-    assertTrue(backend.telemetry().getMessages().isEmpty(), "telemetry unaffected");
-    assertTrue(backend.remoteConfig().requests().isEmpty(), "remote config unaffected");
-
-    backend.clear();
-    assertTrue(backend.traces().getTraces().isEmpty(), "clear() drops the failure too");
-  }
-
-  private static void putTraces(String path, byte[] payload) throws IOException {
-    Request request =
-        new Request.Builder()
-            .url(backend.url() + path)
-            .put(RequestBody.create(MSGPACK, payload))
-            .build();
-    try (Response response = CLIENT.newCall(request).execute()) {
-      assertEquals(200, response.code(), "mock agent should accept trace submissions");
+    @Test
+    void waitForFlatMatchesTelemetryEvents() throws IOException {
+        postTelemetry("{\"request_type\":\"app-started\",\"api_version\":\"v2\"}");
+
+        // Matches a received event…
+        backend.telemetry().waitForFlat(message -> "app-started".equals(message.get("request_type")));
+        // …and times out (short timeout) when nothing matches.
+        assertThrows(
+                AssertionError.class,
+                () -> backend.telemetry()
+                        .waitForFlat(message -> "never-sent".equals(message.get("request_type")), 0.2));
     }
-  }
-
-  private static byte[] readResource(String name) throws IOException {
-    try (InputStream in = MockAgentBackendTest.class.getResourceAsStream(name)) {
-      assertNotNull(in, "missing test resource " + name);
-      ByteArrayOutputStream out = new ByteArrayOutputStream();
-      byte[] buffer = new byte[1024];
-      int read;
-      while ((read = in.read(buffer)) != -1) {
-        out.write(buffer, 0, read);
-      }
-      return out.toByteArray();
+
+    @Test
+    void infoAdvertisesTraceEndpointsAndCapabilities() throws IOException {
+        Request request =
+                new Request.Builder().url(backend.url() + "/info").get().build();
+        try (Response response = CLIENT.newCall(request).execute()) {
+            assertEquals(200, response.code());
+            String body = response.body().string();
+            assertTrue(body.contains("/v0.4/traces"), body);
+            assertTrue(body.contains("\"client_drop_p0s\":true"), body);
+        }
+    }
+
+    @Test
+    void waitForTraceCountTimesOutWhenTooFew() {
+        // Nothing submitted, so polling for a trace with a short timeout must fail rather than hang.
+        assertThrows(AssertionError.class, () -> backend.traces().waitForTraceCount(1, 0.2 /* seconds */));
+    }
+
+    @Test
+    void exposesBoundPort() {
+        assertTrue(backend.port() > 0, "port is bound");
+        assertEquals(backend.url().getPort(), backend.port(), "port matches url");
+    }
+
+    @Test
+    void servesPushedRemoteConfigAndCapturesPolls() throws IOException {
+        String path = "datadog/2/APM_TRACING/config_overrides/config";
+        String config = "{\"lib_config\":{\"tracing_sampling_rate\":0.5}}";
+        backend.remoteConfig().setConfig(path, config);
+
+        String served = pollRemoteConfig("{\"client\":{\"products\":[\"APM_TRACING\"],\"capabilities\":[2]}}");
+
+        // The served payload must satisfy the tracer's own parser, which checks each target file
+        // against the sha256 and byte length declared in "targets".
+        RemoteConfigResponse parsed = new RemoteConfigResponse.Factory(new Moshi.Builder()
+                        .add(Instant.class, new InstantJsonAdapter())
+                        .add(ByteString.class, new RawJsonAdapter())
+                        .build())
+                .fromInputStream(new ByteArrayInputStream(served.getBytes(UTF_8)))
+                .orElseThrow(() -> new AssertionError("remote-config payload not parsed: " + served));
+        assertEquals(config, new String(parsed.getFileContents(path), UTF_8), "config content");
+
+        List<Map<String, Object>> polls = backend.remoteConfig().requests();
+        assertEquals(1, polls.size(), "the poll was captured");
+        assertTrue(RemoteConfig.products(polls.get(0)).contains("APM_TRACING"), "products decoded");
+        assertEquals(2L, RemoteConfig.capabilities(polls.get(0)), "capabilities decoded");
+    }
+
+    @Test
+    void clearResetsRemoteConfig() throws IOException {
+        backend.remoteConfig().setConfig("datadog/2/APM_TRACING/config_overrides/config", "{\"a\":1}");
+        assertTrue(pollRemoteConfig("{}").contains("client_configs"), "config served before clear");
+
+        backend.clear();
+
+        assertTrue(backend.remoteConfig().requests().isEmpty(), "captured polls dropped");
+        assertEquals("{}", pollRemoteConfig("{}"), "back to the no-configs response");
+    }
+
+    private static String pollRemoteConfig(String clientBody) throws IOException {
+        Request request = new Request.Builder()
+                .url(backend.url() + "/v0.7/config")
+                .post(RequestBody.create(JSON, clientBody))
+                .build();
+        try (Response response = CLIENT.newCall(request).execute()) {
+            assertEquals(200, response.code(), "mock agent should serve remote config");
+            return response.body().string();
+        }
+    }
+
+    private static void postTelemetry(String json) throws IOException {
+        Request request = new Request.Builder()
+                .url(backend.url() + "/telemetry/proxy/api/v2/apmtelemetry")
+                .post(RequestBody.create(JSON, json))
+                .build();
+        try (Response response = CLIENT.newCall(request).execute()) {
+            assertTrue(response.isSuccessful(), "mock agent should accept telemetry: " + response.code());
+        }
+    }
+
+    @Test
+    void surfacesDecodingFailures() throws IOException {
+        // Decoding runs on the server thread, where JavaTestHttpServer turns the exception into a 500;
+        // without capture the test would only see an empty trace collection and time out.
+        Request request = new Request.Builder()
+                .url(backend.url() + "/v0.4/traces")
+                .put(RequestBody.create(MSGPACK, "not msgpack".getBytes(UTF_8)))
+                .build();
+        try (Response response = CLIENT.newCall(request).execute()) {
+            assertEquals(500, response.code(), "malformed payload is rejected");
+        }
+
+        IllegalStateException error =
+                assertThrows(IllegalStateException.class, () -> backend.traces().getTraces());
+        assertTrue(error.getMessage().contains("decode received traces"), error.getMessage());
+        assertNotNull(error.getCause(), "keeps the decoder failure as the cause");
+
+        // The other surfaces stay usable — the failures are tracked per surface.
+        assertTrue(backend.telemetry().getMessages().isEmpty(), "telemetry unaffected");
+        assertTrue(backend.remoteConfig().requests().isEmpty(), "remote config unaffected");
+
+        backend.clear();
+        assertTrue(backend.traces().getTraces().isEmpty(), "clear() drops the failure too");
+    }
+
+    private static void putTraces(String path, byte[] payload) throws IOException {
+        Request request = new Request.Builder()
+                .url(backend.url() + path)
+                .put(RequestBody.create(MSGPACK, payload))
+                .build();
+        try (Response response = CLIENT.newCall(request).execute()) {
+            assertEquals(200, response.code(), "mock agent should accept trace submissions");
+        }
+    }
+
+    private static byte[] readResource(String name) throws IOException {
+        try (InputStream in = MockAgentBackendTest.class.getResourceAsStream(name)) {
+            assertNotNull(in, "missing test resource " + name);
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024];
+            int read;
+            while ((read = in.read(buffer)) != -1) {
+                out.write(buffer, 0, read);
+            }
+            return out.toByteArray();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/backend/SmokeServerAppRetainBackendTest.java b/dd-smoke-tests/src/test/java/datadog/smoketest/backend/SmokeServerAppRetainBackendTest.java
index de63aabb219..a0e572be94c 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/backend/SmokeServerAppRetainBackendTest.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/backend/SmokeServerAppRetainBackendTest.java
@@ -18,69 +18,68 @@
  */
 class SmokeServerAppRetainBackendTest {
 
-  // Non-shared (never registered as an extension) backend that retains across tests and counts
-  // clear() calls; declared before the app so it is initialized when the app builder captures it.
-  private static final CountingBackend BACKEND = new CountingBackend();
-
-  @RegisterExtension
-  static final SmokeServerApp app =
-      SmokeServerApp.named("retain-server")
-          .mainClass("datadog.smoketest.TestServerApp")
-          .args("--server.port=${app.httpPort}")
-          .backend(BACKEND)
-          .noAgent()
-          .build();
-
-  @Test
-  void ownedRetainingBackendIsNotClearedBeforeTests() {
-    // onBeforeEach ran before this test method; because the owned backend retains
-    // (clearsBetweenTests() == false), the app must not have cleared it.
-    assertEquals(0, BACKEND.clears.get(), "a retaining owned backend must not be cleared per-test");
-  }
-
-  /** An owned (non-shared) backend that retains across tests and counts {@link #clear()} calls. */
-  private static final class CountingBackend extends AgentBackend {
-    final AtomicInteger clears = new AtomicInteger();
-
-    @Override
-    public void start() {}
-
-    @Override
-    public int port() {
-      return 0;
+    // Non-shared (never registered as an extension) backend that retains across tests and counts
+    // clear() calls; declared before the app so it is initialized when the app builder captures it.
+    private static final CountingBackend BACKEND = new CountingBackend();
+
+    @RegisterExtension
+    static final SmokeServerApp app = SmokeServerApp.named("retain-server")
+            .mainClass("datadog.smoketest.TestServerApp")
+            .args("--server.port=${app.httpPort}")
+            .backend(BACKEND)
+            .noAgent()
+            .build();
+
+    @Test
+    void ownedRetainingBackendIsNotClearedBeforeTests() {
+        // onBeforeEach ran before this test method; because the owned backend retains
+        // (clearsBetweenTests() == false), the app must not have cleared it.
+        assertEquals(0, BACKEND.clears.get(), "a retaining owned backend must not be cleared per-test");
     }
 
-    @Override
-    public URI url() {
-      return URI.create("http://localhost:0");
+    /** An owned (non-shared) backend that retains across tests and counts {@link #clear()} calls. */
+    private static final class CountingBackend extends AgentBackend {
+        final AtomicInteger clears = new AtomicInteger();
+
+        @Override
+        public void start() {}
+
+        @Override
+        public int port() {
+            return 0;
+        }
+
+        @Override
+        public URI url() {
+            return URI.create("http://localhost:0");
+        }
+
+        @Override
+        public Traces traces() {
+            return new Traces(Collections::emptyList);
+        }
+
+        @Override
+        public Telemetry telemetry() {
+            return new Telemetry(Collections::emptyList);
+        }
+
+        @Override
+        public RemoteConfig remoteConfig() {
+            return new RemoteConfig((path, config) -> {}, Collections::emptyList);
+        }
+
+        @Override
+        public void clear() {
+            this.clears.incrementAndGet();
+        }
+
+        @Override
+        public void close() {}
+
+        @Override
+        public boolean clearsBetweenTests() {
+            return false; // retain across tests
+        }
     }
-
-    @Override
-    public Traces traces() {
-      return new Traces(Collections::emptyList);
-    }
-
-    @Override
-    public Telemetry telemetry() {
-      return new Telemetry(Collections::emptyList);
-    }
-
-    @Override
-    public RemoteConfig remoteConfig() {
-      return new RemoteConfig((path, config) -> {}, Collections::emptyList);
-    }
-
-    @Override
-    public void clear() {
-      this.clears.incrementAndGet();
-    }
-
-    @Override
-    public void close() {}
-
-    @Override
-    public boolean clearsBetweenTests() {
-      return false; // retain across tests
-    }
-  }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/backend/TestAgentBackendContainerTest.java b/dd-smoke-tests/src/test/java/datadog/smoketest/backend/TestAgentBackendContainerTest.java
index 2a437bafb71..25957ae9015 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/backend/TestAgentBackendContainerTest.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/backend/TestAgentBackendContainerTest.java
@@ -33,202 +33,203 @@
  * session's traces via {@code /test/session/*} (S3a / Q4a).
  */
 class TestAgentBackendContainerTest {
-  private static final MediaType MSGPACK = MediaType.parse("application/msgpack");
-  private static final MediaType JSON = MediaType.parse("application/json");
-  private static final OkHttpClient CLIENT = new OkHttpClient();
-
-  private static byte[] v04Payload;
-  private static TestAgentBackend backend;
-
-  @BeforeAll
-  static void setUp() throws IOException {
-    v04Payload = readResource("/datadog/smoketest/backend/webflux.04.msgpack");
-    backend = AgentBackend.testAgentBuilder().image(defaultImage()).build();
-    backend.start();
-  }
-
-  @AfterAll
-  static void tearDown() {
-    if (backend != null) {
-      backend.close();
+    private static final MediaType MSGPACK = MediaType.parse("application/msgpack");
+    private static final MediaType JSON = MediaType.parse("application/json");
+    private static final OkHttpClient CLIENT = new OkHttpClient();
+
+    private static byte[] v04Payload;
+    private static TestAgentBackend backend;
+
+    @BeforeAll
+    static void setUp() throws IOException {
+        v04Payload = readResource("/datadog/smoketest/backend/webflux.04.msgpack");
+        backend = AgentBackend.testAgentBuilder().image(defaultImage()).build();
+        backend.start();
     }
-  }
 
-  @BeforeEach
-  void freshSession() {
-    if (backend != null) {
-      backend.clear();
+    @AfterAll
+    static void tearDown() {
+        if (backend != null) {
+            backend.close();
+        }
     }
-  }
-
-  @Test
-  void capturesSessionScopedTraces() throws IOException {
-    submitAppTraces(backend.url(), backend.sessionToken(), v04Payload);
-
-    Traces traces = backend.traces();
-    traces.waitForTraceCount(1);
-
-    List<DecodedTrace> decoded = traces.getTraces();
-    assertEquals(1, decoded.size(), "trace count");
-
-    List<DecodedSpan> spans = Decoder.sortByStart(decoded.get(0).getSpans());
-    assertEquals(2, spans.size(), "span count");
-    DecodedSpan root = spans.get(0);
-    assertEquals("smoke-test-java-app", root.getService());
-    assertEquals("netty.request", root.getName());
-    assertEquals("GET /hello", root.getResource());
-    assertEquals(0L, root.getParentId(), "root has no parent");
-    assertEquals(root.getSpanId(), spans.get(1).getParentId(), "child parents the root");
-  }
-
-  @Test
-  void clearStartsAFreshSession() throws IOException {
-    submitAppTraces(backend.url(), backend.sessionToken(), v04Payload);
-    backend.traces().waitForTraceCount(1);
-
-    backend.clear();
-
-    assertTrue(backend.traces().getTraces().isEmpty(), "clear() opens an empty session");
-  }
-
-  @Test
-  void clearResetsRemoteConfig() throws IOException {
-    // Push an RC config, confirm the agent serves it on /v0.7/config, then clear() and confirm the
-    // session's RC response is reset to the tracer's empty "no configs" default.
-    String path = "datadog/2/APM_TRACING/config_overrides/config";
-    backend.remoteConfig().setConfig(path, "{\"lib_config\":{\"x\":1}}");
-
-    String served = pollRemoteConfig(backend.url(), backend.sessionToken());
-    assertTrue(served.contains(path), "config is served before clear: " + served);
-
-    backend.clear();
-
-    String afterClear = pollRemoteConfig(backend.url(), backend.sessionToken());
-    assertFalse(
-        afterClear.contains(path), "clear() reset the remote-config response: " + afterClear);
-  }
-
-  @Test
-  void externalBackendReadsFromRunningAgent() throws IOException {
-    // Point an .external() backend at the same running container: exercises the external code path
-    // (no container of its own) and, via its own fresh token, that sessions are isolated.
-    TestAgentBackend external =
-        AgentBackend.testAgentBuilder().external(backend.url().getHost(), backend.port()).build();
-    external.start();
-    try {
-      submitAppTraces(external.url(), external.sessionToken(), v04Payload);
-
-      external.traces().waitForTraceCount(1);
-      assertEquals(1, external.traces().getTraces().size(), "external reads only its own session");
-    } finally {
-      external.close();
+
+    @BeforeEach
+    void freshSession() {
+        if (backend != null) {
+            backend.clear();
+        }
     }
-  }
-
-  @Test
-  void reportsTraceInvariantFailures() throws IOException {
-    // Its own session token keeps the failure out of the class backend's session, whose teardown
-    // asserts there are none (the agent only drops pooled failures on an explicit clear).
-    TestAgentBackend external =
-        AgentBackend.testAgentBuilder().external(backend.url().getHost(), backend.port()).build();
-    external.start();
-    try {
-      // A trace-count header that disagrees with the payload violates trace_count_header.
-      HttpUrl url = HttpUrl.get(external.url()).newBuilder().addPathSegments("v0.4/traces").build();
-      Request request =
-          new Request.Builder()
-              .url(url)
-              .header("X-Datadog-Trace-Count", "5")
-              .header("Datadog-Meta-Tracer-Version", "0.0.0-smoke-test")
-              .header("X-Datadog-Test-Session-Token", external.sessionToken())
-              .put(RequestBody.create(MSGPACK, v04Payload))
-              .build();
-      try (Response response = CLIENT.newCall(request).execute()) {
-        assertTrue(response.isSuccessful(), "submission still succeeds: HTTP " + response.code());
-      }
-
-      AssertionError error =
-          assertThrows(AssertionError.class, external::assertNoInvariantFailures);
-      assertTrue(error.getMessage().contains("trace_count_header"), error.getMessage());
-    } finally {
-      external.close();
+
+    @Test
+    void capturesSessionScopedTraces() throws IOException {
+        submitAppTraces(backend.url(), backend.sessionToken(), v04Payload);
+
+        Traces traces = backend.traces();
+        traces.waitForTraceCount(1);
+
+        List<DecodedTrace> decoded = traces.getTraces();
+        assertEquals(1, decoded.size(), "trace count");
+
+        List<DecodedSpan> spans = Decoder.sortByStart(decoded.get(0).getSpans());
+        assertEquals(2, spans.size(), "span count");
+        DecodedSpan root = spans.get(0);
+        assertEquals("smoke-test-java-app", root.getService());
+        assertEquals("netty.request", root.getName());
+        assertEquals("GET /hello", root.getResource());
+        assertEquals(0L, root.getParentId(), "root has no parent");
+        assertEquals(root.getSpanId(), spans.get(1).getParentId(), "child parents the root");
     }
-  }
-
-  @Test
-  void capturesTelemetry() throws IOException {
-    // Post a telemetry app-started message; the backend reads it back from /test/apmtelemetry.
-    HttpUrl url =
-        HttpUrl.get(backend.url())
-            .newBuilder()
-            .addPathSegments("telemetry/proxy/api/v2/apmtelemetry")
-            .build();
-    Request request =
-        new Request.Builder()
-            .url(url)
-            .header("DD-Telemetry-API-Version", "v2")
-            .header("DD-Telemetry-Request-Type", "app-started")
-            .header("X-Datadog-Test-Session-Token", backend.sessionToken())
-            .post(
-                RequestBody.create(
-                    MediaType.parse("application/json"),
-                    "{\"request_type\":\"app-started\",\"api_version\":\"v2\","
-                        + "\"runtime_id\":\"r1\",\"seq_id\":1,\"payload\":{}}"))
-            .build();
-    try (Response response = CLIENT.newCall(request).execute()) {
-      assertTrue(response.isSuccessful(), "telemetry accepted: HTTP " + response.code());
+
+    @Test
+    void clearStartsAFreshSession() throws IOException {
+        submitAppTraces(backend.url(), backend.sessionToken(), v04Payload);
+        backend.traces().waitForTraceCount(1);
+
+        backend.clear();
+
+        assertTrue(backend.traces().getTraces().isEmpty(), "clear() opens an empty session");
     }
 
-    Telemetry telemetry = backend.telemetry();
-    telemetry.waitForCount(1);
-    assertTrue(
-        telemetry.getFlatMessages().stream()
-            .anyMatch(message -> "app-started".equals(message.get("request_type"))),
-        "app-started telemetry captured");
-  }
-
-  private static String pollRemoteConfig(URI agentUrl, String token) throws IOException {
-    // Poll /v0.7/config the way a tracer does; the agent returns the session's stored RC response.
-    HttpUrl url = HttpUrl.get(agentUrl).newBuilder().addPathSegments("v0.7/config").build();
-    Request request =
-        new Request.Builder()
-            .url(url)
-            .header("X-Datadog-Test-Session-Token", token)
-            .post(RequestBody.create(JSON, "{}"))
-            .build();
-    try (Response response = CLIENT.newCall(request).execute()) {
-      assertTrue(response.isSuccessful(), "poll /v0.7/config: HTTP " + response.code());
-      return response.body().string();
+    @Test
+    void clearResetsRemoteConfig() throws IOException {
+        // Push an RC config, confirm the agent serves it on /v0.7/config, then clear() and confirm the
+        // session's RC response is reset to the tracer's empty "no configs" default.
+        String path = "datadog/2/APM_TRACING/config_overrides/config";
+        backend.remoteConfig().setConfig(path, "{\"lib_config\":{\"x\":1}}");
+
+        String served = pollRemoteConfig(backend.url(), backend.sessionToken());
+        assertTrue(served.contains(path), "config is served before clear: " + served);
+
+        backend.clear();
+
+        String afterClear = pollRemoteConfig(backend.url(), backend.sessionToken());
+        assertFalse(afterClear.contains(path), "clear() reset the remote-config response: " + afterClear);
     }
-  }
-
-  private static void submitAppTraces(URI agentUrl, String token, byte[] payload)
-      throws IOException {
-    HttpUrl url = HttpUrl.get(agentUrl).newBuilder().addPathSegments("v0.4/traces").build();
-    Request request =
-        new Request.Builder()
-            .url(url)
-            .header("X-Datadog-Trace-Count", "1")
-            .header("Datadog-Meta-Tracer-Version", "0.0.0-smoke-test")
-            .header("X-Datadog-Test-Session-Token", token)
-            .put(RequestBody.create(MSGPACK, payload))
-            .build();
-    try (Response response = CLIENT.newCall(request).execute()) {
-      assertTrue(
-          response.isSuccessful(), "test agent accepts trace submission: HTTP " + response.code());
+
+    @Test
+    void externalBackendReadsFromRunningAgent() throws IOException {
+        // Point an .external() backend at the same running container: exercises the external code path
+        // (no container of its own) and, via its own fresh token, that sessions are isolated.
+        TestAgentBackend external = AgentBackend.testAgentBuilder()
+                .external(backend.url().getHost(), backend.port())
+                .build();
+        external.start();
+        try {
+            submitAppTraces(external.url(), external.sessionToken(), v04Payload);
+
+            external.traces().waitForTraceCount(1);
+            assertEquals(1, external.traces().getTraces().size(), "external reads only its own session");
+        } finally {
+            external.close();
+        }
+    }
+
+    @Test
+    void reportsTraceInvariantFailures() throws IOException {
+        // Its own session token keeps the failure out of the class backend's session, whose teardown
+        // asserts there are none (the agent only drops pooled failures on an explicit clear).
+        TestAgentBackend external = AgentBackend.testAgentBuilder()
+                .external(backend.url().getHost(), backend.port())
+                .build();
+        external.start();
+        try {
+            // A trace-count header that disagrees with the payload violates trace_count_header.
+            HttpUrl url = HttpUrl.get(external.url())
+                    .newBuilder()
+                    .addPathSegments("v0.4/traces")
+                    .build();
+            Request request = new Request.Builder()
+                    .url(url)
+                    .header("X-Datadog-Trace-Count", "5")
+                    .header("Datadog-Meta-Tracer-Version", "0.0.0-smoke-test")
+                    .header("X-Datadog-Test-Session-Token", external.sessionToken())
+                    .put(RequestBody.create(MSGPACK, v04Payload))
+                    .build();
+            try (Response response = CLIENT.newCall(request).execute()) {
+                assertTrue(response.isSuccessful(), "submission still succeeds: HTTP " + response.code());
+            }
+
+            AssertionError error = assertThrows(AssertionError.class, external::assertNoInvariantFailures);
+            assertTrue(error.getMessage().contains("trace_count_header"), error.getMessage());
+        } finally {
+            external.close();
+        }
+    }
+
+    @Test
+    void capturesTelemetry() throws IOException {
+        // Post a telemetry app-started message; the backend reads it back from /test/apmtelemetry.
+        HttpUrl url = HttpUrl.get(backend.url())
+                .newBuilder()
+                .addPathSegments("telemetry/proxy/api/v2/apmtelemetry")
+                .build();
+        Request request = new Request.Builder()
+                .url(url)
+                .header("DD-Telemetry-API-Version", "v2")
+                .header("DD-Telemetry-Request-Type", "app-started")
+                .header("X-Datadog-Test-Session-Token", backend.sessionToken())
+                .post(RequestBody.create(
+                        MediaType.parse("application/json"),
+                        "{\"request_type\":\"app-started\",\"api_version\":\"v2\","
+                                + "\"runtime_id\":\"r1\",\"seq_id\":1,\"payload\":{}}"))
+                .build();
+        try (Response response = CLIENT.newCall(request).execute()) {
+            assertTrue(response.isSuccessful(), "telemetry accepted: HTTP " + response.code());
+        }
+
+        Telemetry telemetry = backend.telemetry();
+        telemetry.waitForCount(1);
+        assertTrue(
+                telemetry.getFlatMessages().stream()
+                        .anyMatch(message -> "app-started".equals(message.get("request_type"))),
+                "app-started telemetry captured");
     }
-  }
-
-  private static byte[] readResource(String name) throws IOException {
-    try (InputStream in = TestAgentBackendContainerTest.class.getResourceAsStream(name)) {
-      assertNotNull(in, "missing test resource " + name);
-      ByteArrayOutputStream out = new ByteArrayOutputStream();
-      byte[] buffer = new byte[1024];
-      int read;
-      while ((read = in.read(buffer)) != -1) {
-        out.write(buffer, 0, read);
-      }
-      return out.toByteArray();
+
+    private static String pollRemoteConfig(URI agentUrl, String token) throws IOException {
+        // Poll /v0.7/config the way a tracer does; the agent returns the session's stored RC response.
+        HttpUrl url = HttpUrl.get(agentUrl)
+                .newBuilder()
+                .addPathSegments("v0.7/config")
+                .build();
+        Request request = new Request.Builder()
+                .url(url)
+                .header("X-Datadog-Test-Session-Token", token)
+                .post(RequestBody.create(JSON, "{}"))
+                .build();
+        try (Response response = CLIENT.newCall(request).execute()) {
+            assertTrue(response.isSuccessful(), "poll /v0.7/config: HTTP " + response.code());
+            return response.body().string();
+        }
+    }
+
+    private static void submitAppTraces(URI agentUrl, String token, byte[] payload) throws IOException {
+        HttpUrl url = HttpUrl.get(agentUrl)
+                .newBuilder()
+                .addPathSegments("v0.4/traces")
+                .build();
+        Request request = new Request.Builder()
+                .url(url)
+                .header("X-Datadog-Trace-Count", "1")
+                .header("Datadog-Meta-Tracer-Version", "0.0.0-smoke-test")
+                .header("X-Datadog-Test-Session-Token", token)
+                .put(RequestBody.create(MSGPACK, payload))
+                .build();
+        try (Response response = CLIENT.newCall(request).execute()) {
+            assertTrue(response.isSuccessful(), "test agent accepts trace submission: HTTP " + response.code());
+        }
+    }
+
+    private static byte[] readResource(String name) throws IOException {
+        try (InputStream in = TestAgentBackendContainerTest.class.getResourceAsStream(name)) {
+            assertNotNull(in, "missing test resource " + name);
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024];
+            int read;
+            while ((read = in.read(buffer)) != -1) {
+                out.write(buffer, 0, read);
+            }
+            return out.toByteArray();
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/backend/TestAgentBackendTest.java b/dd-smoke-tests/src/test/java/datadog/smoketest/backend/TestAgentBackendTest.java
index d3b52e4ba76..68a648dd66b 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/backend/TestAgentBackendTest.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/backend/TestAgentBackendTest.java
@@ -23,225 +23,193 @@
  */
 class TestAgentBackendTest {
 
-  @Test
-  void sessionTokenIsStableAndNonEmpty() {
-    TestAgentBackend backend = AgentBackend.testAgentBuilder().build();
-    String token = backend.sessionToken();
-    assertNotNull(token);
-    assertFalse(token.isEmpty());
-    assertEquals(token, backend.sessionToken(), "token is stable across calls");
-  }
+    @Test
+    void sessionTokenIsStableAndNonEmpty() {
+        TestAgentBackend backend = AgentBackend.testAgentBuilder().build();
+        String token = backend.sessionToken();
+        assertNotNull(token);
+        assertFalse(token.isEmpty());
+        assertEquals(token, backend.sessionToken(), "token is stable across calls");
+    }
 
-  @Test
-  void sessionTokenCanBeOverridden() {
-    assertEquals(
-        "fixed-token",
-        AgentBackend.testAgentBuilder().sessionToken("fixed-token").build().sessionToken(),
-        "explicit token wins over the auto-generated one");
-  }
+    @Test
+    void sessionTokenCanBeOverridden() {
+        assertEquals(
+                "fixed-token",
+                AgentBackend.testAgentBuilder()
+                        .sessionToken("fixed-token")
+                        .build()
+                        .sessionToken(),
+                "explicit token wins over the auto-generated one");
+    }
 
-  @Test
-  void isSharedInferredFromExtensionRegistration() {
-    // isShared() is inferred from JUnit invoking the extension's beforeAll callback (i.e. the
-    // backend was declared as a @RegisterExtension field), not a manual flag. A stub agent lets us
-    // drive the external lifecycle without Docker; beforeAll(...) is what JUnit calls for a
-    // registered extension.
-    try (JavaTestHttpServer agent = stubAgent(200, "")) {
-      TestAgentBackend backend =
-          AgentBackend.testAgentBuilder()
-              .external(agent.getAddress().getHost(), agent.getAddress().getPort())
-              .build();
-      assertFalse(backend.isShared(), "not shared until registered as an extension");
-      backend.beforeAll(null);
-      try {
-        assertTrue(backend.isShared(), "inferred shared once its beforeAll callback runs");
-      } finally {
-        backend.close();
-      }
+    @Test
+    void isSharedInferredFromExtensionRegistration() {
+        // isShared() is inferred from JUnit invoking the extension's beforeAll callback (i.e. the
+        // backend was declared as a @RegisterExtension field), not a manual flag. A stub agent lets us
+        // drive the external lifecycle without Docker; beforeAll(...) is what JUnit calls for a
+        // registered extension.
+        try (JavaTestHttpServer agent = stubAgent(200, "")) {
+            TestAgentBackend backend = AgentBackend.testAgentBuilder()
+                    .external(agent.getAddress().getHost(), agent.getAddress().getPort())
+                    .build();
+            assertFalse(backend.isShared(), "not shared until registered as an extension");
+            backend.beforeAll(null);
+            try {
+                assertTrue(backend.isShared(), "inferred shared once its beforeAll callback runs");
+            } finally {
+                backend.close();
+            }
+        }
     }
-  }
 
-  @Test
-  void accessBeforeStartFails() {
-    TestAgentBackend backend = AgentBackend.testAgentBuilder().build();
-    assertThrows(IllegalStateException.class, backend::url, "url() before start()");
-    assertThrows(IllegalStateException.class, backend::port, "port() before start()");
-  }
+    @Test
+    void accessBeforeStartFails() {
+        TestAgentBackend backend = AgentBackend.testAgentBuilder().build();
+        assertThrows(IllegalStateException.class, backend::url, "url() before start()");
+        assertThrows(IllegalStateException.class, backend::port, "port() before start()");
+    }
 
-  @Test
-  void assertNoInvariantFailuresPassesWhenAgentReportsNoFailures() {
-    // A stub agent for /test/session/* and /test/trace_check/failures verifies the check logic
-    // without Docker; HTTP 200 from the failures endpoint means all checks passed.
-    try (JavaTestHttpServer agent = stubAgent(200, "")) {
-      TestAgentBackend backend =
-          AgentBackend.testAgentBuilder()
-              .external(agent.getAddress().getHost(), agent.getAddress().getPort())
-              .build();
-      backend.start();
-      try {
-        backend.assertNoInvariantFailures(); // HTTP 200 => no failures => no throw
-      } finally {
-        backend.close();
-      }
+    @Test
+    void assertNoInvariantFailuresPassesWhenAgentReportsNoFailures() {
+        // A stub agent for /test/session/* and /test/trace_check/failures verifies the check logic
+        // without Docker; HTTP 200 from the failures endpoint means all checks passed.
+        try (JavaTestHttpServer agent = stubAgent(200, "")) {
+            TestAgentBackend backend = AgentBackend.testAgentBuilder()
+                    .external(agent.getAddress().getHost(), agent.getAddress().getPort())
+                    .build();
+            backend.start();
+            try {
+                backend.assertNoInvariantFailures(); // HTTP 200 => no failures => no throw
+            } finally {
+                backend.close();
+            }
+        }
     }
-  }
 
-  @Test
-  void assertNoInvariantFailuresThrowsWhenAgentReportsFailures() {
-    try (JavaTestHttpServer agent = stubAgent(400, "span_count check failed")) {
-      TestAgentBackend backend =
-          AgentBackend.testAgentBuilder()
-              .external(agent.getAddress().getHost(), agent.getAddress().getPort())
-              .build();
-      backend.start();
-      try {
-        AssertionError error =
-            assertThrows(AssertionError.class, backend::assertNoInvariantFailures);
-        assertTrue(error.getMessage().contains("span_count check failed"), error.getMessage());
-      } finally {
-        backend.close();
-      }
+    @Test
+    void assertNoInvariantFailuresThrowsWhenAgentReportsFailures() {
+        try (JavaTestHttpServer agent = stubAgent(400, "span_count check failed")) {
+            TestAgentBackend backend = AgentBackend.testAgentBuilder()
+                    .external(agent.getAddress().getHost(), agent.getAddress().getPort())
+                    .build();
+            backend.start();
+            try {
+                AssertionError error = assertThrows(AssertionError.class, backend::assertNoInvariantFailures);
+                assertTrue(error.getMessage().contains("span_count check failed"), error.getMessage());
+            } finally {
+                backend.close();
+            }
+        }
     }
-  }
 
-  @Test
-  void setRemoteConfigPostsPathAndConfigToTheSession() {
-    // The backend POSTs {"path": ..., "msg": <config>} to /test/session/responses/config/path so
-    // the agent builds the signed RC envelope; capture that request against a stub agent.
-    AtomicReference<String> captured = new AtomicReference<>();
-    try (JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            server ->
-                server.handlers(
-                    handlers -> {
-                      handlers.prefix(
-                          "/test/session/responses/config/path",
-                          api -> {
-                            captured.set(new String(api.getRequest().getBody(), UTF_8));
-                            api.getResponse().status(202).send();
-                          });
-                      handlers.all(api -> api.getResponse().status(200).send());
-                    }))) {
-      TestAgentBackend backend =
-          AgentBackend.testAgentBuilder()
-              .external(agent.getAddress().getHost(), agent.getAddress().getPort())
-              .build();
-      backend.start();
-      try {
-        backend
-            .remoteConfig()
-            .setConfig(
-                "datadog/2/APM_TRACING/config_overrides/config", "{\"lib_config\":{\"x\":1}}");
-      } finally {
-        backend.close();
-      }
-      String body = captured.get();
-      assertNotNull(body, "agent received a config-path POST");
-      assertTrue(body.contains("\"path\":\"datadog/2/APM_TRACING/config_overrides/config\""), body);
-      assertTrue(body.contains("\"msg\":{\"lib_config\":{\"x\":1}}"), body);
+    @Test
+    void setRemoteConfigPostsPathAndConfigToTheSession() {
+        // The backend POSTs {"path": ..., "msg": <config>} to /test/session/responses/config/path so
+        // the agent builds the signed RC envelope; capture that request against a stub agent.
+        AtomicReference<String> captured = new AtomicReference<>();
+        try (JavaTestHttpServer agent = JavaTestHttpServer.httpServer(server -> server.handlers(handlers -> {
+            handlers.prefix("/test/session/responses/config/path", api -> {
+                captured.set(new String(api.getRequest().getBody(), UTF_8));
+                api.getResponse().status(202).send();
+            });
+            handlers.all(api -> api.getResponse().status(200).send());
+        }))) {
+            TestAgentBackend backend = AgentBackend.testAgentBuilder()
+                    .external(agent.getAddress().getHost(), agent.getAddress().getPort())
+                    .build();
+            backend.start();
+            try {
+                backend.remoteConfig()
+                        .setConfig("datadog/2/APM_TRACING/config_overrides/config", "{\"lib_config\":{\"x\":1}}");
+            } finally {
+                backend.close();
+            }
+            String body = captured.get();
+            assertNotNull(body, "agent received a config-path POST");
+            assertTrue(body.contains("\"path\":\"datadog/2/APM_TRACING/config_overrides/config\""), body);
+            assertTrue(body.contains("\"msg\":{\"lib_config\":{\"x\":1}}"), body);
+        }
     }
-  }
 
-  @Test
-  void readsAndDecodesRemoteConfigPollRequests() {
-    // /test/session/requests returns every request the tracer made, each with a base64-encoded
-    // body. Serve one /v0.7/config poll (and a non-RC request that must be filtered out) and assert
-    // the backend selects, decodes, and exposes the poll's products and capabilities.
-    String pollBody =
-        "{\"client\":{\"products\":[\"APM_TRACING\",\"ASM_FEATURES\"],\"capabilities\":[2]}}";
-    String encoded = Base64.getEncoder().encodeToString(pollBody.getBytes(UTF_8));
-    String requestsJson =
-        "[{\"url\":\"http://agent/v0.7/config\",\"method\":\"POST\",\"body\":\""
-            + encoded
-            + "\"},{\"url\":\"http://agent/v0.6/stats\",\"method\":\"POST\",\"body\":\"\"}]";
-    try (JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            server ->
-                server.handlers(
-                    handlers -> {
-                      handlers.prefix(
-                          "/test/session/requests",
-                          api -> api.getResponse().status(200).send(requestsJson));
-                      handlers.all(api -> api.getResponse().status(200).send());
-                    }))) {
-      TestAgentBackend backend =
-          AgentBackend.testAgentBuilder()
-              .external(agent.getAddress().getHost(), agent.getAddress().getPort())
-              .build();
-      backend.start();
-      try {
-        List<Map<String, Object>> polls = backend.remoteConfig().requests();
-        assertEquals(1, polls.size(), "only /v0.7/config polls are returned");
-        assertTrue(
-            RemoteConfig.products(polls.get(0)).contains("ASM_FEATURES"),
-            "products decoded from the poll body");
-        assertEquals(
-            2L, RemoteConfig.capabilities(polls.get(0)), "capabilities decoded big-endian");
-      } finally {
-        backend.close();
-      }
+    @Test
+    void readsAndDecodesRemoteConfigPollRequests() {
+        // /test/session/requests returns every request the tracer made, each with a base64-encoded
+        // body. Serve one /v0.7/config poll (and a non-RC request that must be filtered out) and assert
+        // the backend selects, decodes, and exposes the poll's products and capabilities.
+        String pollBody = "{\"client\":{\"products\":[\"APM_TRACING\",\"ASM_FEATURES\"],\"capabilities\":[2]}}";
+        String encoded = Base64.getEncoder().encodeToString(pollBody.getBytes(UTF_8));
+        String requestsJson = "[{\"url\":\"http://agent/v0.7/config\",\"method\":\"POST\",\"body\":\""
+                + encoded
+                + "\"},{\"url\":\"http://agent/v0.6/stats\",\"method\":\"POST\",\"body\":\"\"}]";
+        try (JavaTestHttpServer agent = JavaTestHttpServer.httpServer(server -> server.handlers(handlers -> {
+            handlers.prefix(
+                    "/test/session/requests",
+                    api -> api.getResponse().status(200).send(requestsJson));
+            handlers.all(api -> api.getResponse().status(200).send());
+        }))) {
+            TestAgentBackend backend = AgentBackend.testAgentBuilder()
+                    .external(agent.getAddress().getHost(), agent.getAddress().getPort())
+                    .build();
+            backend.start();
+            try {
+                List<Map<String, Object>> polls = backend.remoteConfig().requests();
+                assertEquals(1, polls.size(), "only /v0.7/config polls are returned");
+                assertTrue(
+                        RemoteConfig.products(polls.get(0)).contains("ASM_FEATURES"),
+                        "products decoded from the poll body");
+                assertEquals(2L, RemoteConfig.capabilities(polls.get(0)), "capabilities decoded big-endian");
+            } finally {
+                backend.close();
+            }
+        }
     }
-  }
 
-  @Test
-  void clearResetsRemoteConfigBeforeOpeningTheSession() {
-    // clear() resets the session's RC response to empty ({}) AND opens a fresh session, so a config
-    // pushed by one test does not leak into the next. The reset must come first: a tracer poll
-    // between the two calls would otherwise record the stale config in the new session.
-    AtomicReference<String> captured = new AtomicReference<>();
-    List<String> calls = new CopyOnWriteArrayList<>();
-    try (JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            server ->
-                server.handlers(
-                    handlers -> {
-                      handlers.prefix(
-                          "/test/session/responses/config",
-                          api -> {
-                            captured.set(new String(api.getRequest().getBody(), UTF_8));
-                            calls.add("reset");
-                            api.getResponse().status(202).send();
-                          });
-                      handlers.prefix(
-                          "/test/session/start",
-                          api -> {
-                            calls.add("start");
-                            api.getResponse().status(200).send();
-                          });
-                      handlers.all(api -> api.getResponse().status(200).send());
-                    }))) {
-      TestAgentBackend backend =
-          AgentBackend.testAgentBuilder()
-              .external(agent.getAddress().getHost(), agent.getAddress().getPort())
-              .build();
-      backend.start(); // start() opens the first session via clear()
-      try {
-        assertEquals("{}", captured.get(), "clear() resets the RC response to the empty default");
-        assertEquals(asList("reset", "start"), calls, "RC reset precedes the session start");
-      } finally {
-        backend.close();
-      }
+    @Test
+    void clearResetsRemoteConfigBeforeOpeningTheSession() {
+        // clear() resets the session's RC response to empty ({}) AND opens a fresh session, so a config
+        // pushed by one test does not leak into the next. The reset must come first: a tracer poll
+        // between the two calls would otherwise record the stale config in the new session.
+        AtomicReference<String> captured = new AtomicReference<>();
+        List<String> calls = new CopyOnWriteArrayList<>();
+        try (JavaTestHttpServer agent = JavaTestHttpServer.httpServer(server -> server.handlers(handlers -> {
+            handlers.prefix("/test/session/responses/config", api -> {
+                captured.set(new String(api.getRequest().getBody(), UTF_8));
+                calls.add("reset");
+                api.getResponse().status(202).send();
+            });
+            handlers.prefix("/test/session/start", api -> {
+                calls.add("start");
+                api.getResponse().status(200).send();
+            });
+            handlers.all(api -> api.getResponse().status(200).send());
+        }))) {
+            TestAgentBackend backend = AgentBackend.testAgentBuilder()
+                    .external(agent.getAddress().getHost(), agent.getAddress().getPort())
+                    .build();
+            backend.start(); // start() opens the first session via clear()
+            try {
+                assertEquals("{}", captured.get(), "clear() resets the RC response to the empty default");
+                assertEquals(asList("reset", "start"), calls, "RC reset precedes the session start");
+            } finally {
+                backend.close();
+            }
+        }
     }
-  }
 
-  /** A stub test agent: 200 on {@code /test/session/start}, {@code failuresStatus} on failures. */
-  private static JavaTestHttpServer stubAgent(int failuresStatus, String failuresBody) {
-    return JavaTestHttpServer.httpServer(
-        server ->
-            server.handlers(
-                handlers -> {
-                  handlers.prefix(
-                      "/test/session/start", api -> api.getResponse().status(200).send());
-                  handlers.prefix(
-                      "/test/trace_check/failures",
-                      api -> {
-                        if (failuresBody.isEmpty()) {
-                          api.getResponse().status(failuresStatus).send();
-                        } else {
-                          api.getResponse().status(failuresStatus).send(failuresBody);
-                        }
-                      });
-                  handlers.all(api -> api.getResponse().status(200).send());
-                }));
-  }
+    /** A stub test agent: 200 on {@code /test/session/start}, {@code failuresStatus} on failures. */
+    private static JavaTestHttpServer stubAgent(int failuresStatus, String failuresBody) {
+        return JavaTestHttpServer.httpServer(server -> server.handlers(handlers -> {
+            handlers.prefix(
+                    "/test/session/start", api -> api.getResponse().status(200).send());
+            handlers.prefix("/test/trace_check/failures", api -> {
+                if (failuresBody.isEmpty()) {
+                    api.getResponse().status(failuresStatus).send();
+                } else {
+                    api.getResponse().status(failuresStatus).send(failuresBody);
+                }
+            });
+            handlers.all(api -> api.getResponse().status(200).send());
+        }));
+    }
 }
diff --git a/dd-smoke-tests/src/test/java/datadog/smoketest/trace/SmokeMatcherTest.java b/dd-smoke-tests/src/test/java/datadog/smoketest/trace/SmokeMatcherTest.java
index d02a5dd7fb0..0ac9ea81770 100644
--- a/dd-smoke-tests/src/test/java/datadog/smoketest/trace/SmokeMatcherTest.java
+++ b/dd-smoke-tests/src/test/java/datadog/smoketest/trace/SmokeMatcherTest.java
@@ -27,456 +27,444 @@
  */
 class SmokeMatcherTest {
 
-  // One trace, three spans forming root -> child -> grandchild, but delivered out of start order.
-  private static final String CHAIN_TRACE =
-      "[["
-          + spanJson("grandchild", 300, 200, 30)
-          + ","
-          + spanJson("root", 100, 0, 10)
-          + ","
-          + spanJson("child", 200, 100, 20)
-          + "]]";
-
-  // Two single-span traces; root-b (id 400) has a smaller root span id than root-a (id 500).
-  private static final String TWO_TRACES =
-      "[[" + spanJson("root-a", 500, 0, 10) + "],[" + spanJson("root-b", 400, 0, 20) + "]]";
-
-  // One trace whose root has two children (not a linear chain).
-  private static final String BRANCHING_TRACE =
-      "[["
-          + spanJson("root", 100, 0, 10)
-          + ","
-          + spanJson("a", 200, 100, 20)
-          + ","
-          + spanJson("b", 300, 100, 30)
-          + "]]";
-
-  // One span carrying meta_struct: an IAST-style nested "_dd.stack" plus a request-body entry.
-  private static final String META_STRUCT_TRACE =
-      "[[{"
-          + "\"service\":\"s\",\"name\":\"servlet.request\",\"resource\":\"r\","
-          + "\"trace_id\":1,\"span_id\":1,\"parent_id\":0,\"start\":0,\"duration\":1,\"error\":0,"
-          + "\"meta\":{},\"metrics\":{},"
-          + "\"meta_struct\":{"
-          + "\"_dd.stack\":{\"vulnerability\":[{\"type\":\"SQL_INJECTION\"},{\"type\":\"XSS\"}]},"
-          + "\"http.request.body\":{\"foo\":\"bar\"}"
-          + "}}]]";
-
-  @Test
-  void sortsSpansByStartTimeThenMatchesParentByPrevious() {
-    List<DecodedTrace> traces = Decoder.decodeJson(CHAIN_TRACE).getTraces();
-    assertTraces(
-        traces,
-        trace(
-            SORT_BY_START_TIME,
-            span().operationName("root").root(),
-            span().operationName("child").childOfPrevious(),
-            span().operationName("grandchild").childOfPrevious()));
-  }
-
-  @Test
-  void matchesParentByIndex() {
-    List<DecodedTrace> traces = Decoder.decodeJson(CHAIN_TRACE).getTraces();
-    assertTraces(
-        traces,
-        trace(
-            SORT_BY_START_TIME,
-            span().operationName("root").root(),
-            span().operationName("child").childOfIndex(0),
-            span().operationName("grandchild").childOfIndex(1)));
-  }
-
-  @Test
-  void wrongParentLinkFails() {
-    List<DecodedTrace> traces = Decoder.decodeJson(CHAIN_TRACE).getTraces();
-    // grandchild's parent is child (index 1), not root (index 0).
-    assertThrows(
-        AssertionError.class,
-        () ->
-            assertTraces(
+    // One trace, three spans forming root -> child -> grandchild, but delivered out of start order.
+    private static final String CHAIN_TRACE = "[["
+            + spanJson("grandchild", 300, 200, 30)
+            + ","
+            + spanJson("root", 100, 0, 10)
+            + ","
+            + spanJson("child", 200, 100, 20)
+            + "]]";
+
+    // Two single-span traces; root-b (id 400) has a smaller root span id than root-a (id 500).
+    private static final String TWO_TRACES =
+            "[[" + spanJson("root-a", 500, 0, 10) + "],[" + spanJson("root-b", 400, 0, 20) + "]]";
+
+    // One trace whose root has two children (not a linear chain).
+    private static final String BRANCHING_TRACE = "[["
+            + spanJson("root", 100, 0, 10)
+            + ","
+            + spanJson("a", 200, 100, 20)
+            + ","
+            + spanJson("b", 300, 100, 30)
+            + "]]";
+
+    // One span carrying meta_struct: an IAST-style nested "_dd.stack" plus a request-body entry.
+    private static final String META_STRUCT_TRACE = "[[{"
+            + "\"service\":\"s\",\"name\":\"servlet.request\",\"resource\":\"r\","
+            + "\"trace_id\":1,\"span_id\":1,\"parent_id\":0,\"start\":0,\"duration\":1,\"error\":0,"
+            + "\"meta\":{},\"metrics\":{},"
+            + "\"meta_struct\":{"
+            + "\"_dd.stack\":{\"vulnerability\":[{\"type\":\"SQL_INJECTION\"},{\"type\":\"XSS\"}]},"
+            + "\"http.request.body\":{\"foo\":\"bar\"}"
+            + "}}]]";
+
+    @Test
+    void sortsSpansByStartTimeThenMatchesParentByPrevious() {
+        List<DecodedTrace> traces = Decoder.decodeJson(CHAIN_TRACE).getTraces();
+        assertTraces(
                 traces,
                 trace(
-                    SORT_BY_START_TIME,
-                    span().operationName("root").root(),
-                    span().operationName("child").childOfIndex(0),
-                    span().operationName("grandchild").childOfIndex(0))));
-  }
-
-  @Test
-  void ignoresAdditionalTraces() {
-    List<DecodedTrace> traces = Decoder.decodeJson(TWO_TRACES).getTraces();
-    // Assert just the first received trace, ignoring the other.
-    assertTraces(traces, IGNORE_ADDITIONAL_TRACES, trace(span().operationName("root-a").root()));
-  }
-
-  @Test
-  void sortsByAncestryRegardlessOfStartTime() {
-    List<DecodedTrace> traces = Decoder.decodeJson(CHAIN_TRACE).getTraces();
-    // Spans arrive out of start order; ancestry order recovers root -> child -> grandchild.
-    assertTraces(
-        traces,
-        trace(
-            SORT_BY_ANCESTRY,
-            span().operationName("root").root(),
-            span().operationName("child").childOfPrevious(),
-            span().operationName("grandchild").childOfPrevious()));
-  }
-
-  @Test
-  void ancestryOrdersBranchingTraceParentBeforeChildrenByStart() {
-    List<DecodedTrace> traces = Decoder.decodeJson(BRANCHING_TRACE).getTraces();
-    // root, then its two children in start order (a@20 before b@30); both are children of root.
-    assertTraces(
-        traces,
-        trace(
-            SORT_BY_ANCESTRY,
-            span().operationName("root").root(),
-            span().operationName("a").childOfIndex(0),
-            span().operationName("b").childOfIndex(0)));
-  }
-
-  @Test
-  void unorderedMatchesAnyOrder() {
-    List<DecodedTrace> traces = Decoder.decodeJson(TWO_TRACES).getTraces();
-    // Matchers in the opposite order of receipt still each find their trace (no sorter => any
-    // order).
-    assertTraces(
-        traces,
-        options -> options.unorder().ignoreAdditionalTraces(),
-        trace(span().operationName("root-b").root()),
-        trace(span().operationName("root-a").root()));
-  }
-
-  @Test
-  void unorderedRequiresDistinctTraces() {
-    List<DecodedTrace> traces = Decoder.decodeJson(TWO_TRACES).getTraces();
-    // Two matchers for the same trace can't both match: only one root-a trace exists.
-    assertThrows(
-        AssertionError.class,
-        () ->
-            assertTraces(
+                        SORT_BY_START_TIME,
+                        span().operationName("root").root(),
+                        span().operationName("child").childOfPrevious(),
+                        span().operationName("grandchild").childOfPrevious()));
+    }
+
+    @Test
+    void matchesParentByIndex() {
+        List<DecodedTrace> traces = Decoder.decodeJson(CHAIN_TRACE).getTraces();
+        assertTraces(
                 traces,
-                options -> options.unorder().ignoreAdditionalTraces(),
-                trace(span().operationName("root-a").root()),
-                trace(span().operationName("root-a").root())));
-  }
-
-  @Test
-  void matchesMetaStructByMatcherAndPredicate() {
-    List<DecodedTrace> traces = Decoder.decodeJson(META_STRUCT_TRACE).getTraces();
-    assertTraces(
-        traces,
-        trace(
-            span()
-                .operationName("servlet.request")
-                .root()
-                // plain matcher: the entry is present (any nested value)
-                .metaStruct("http.request.body", isNonNull())
-                // predicate via validates(): navigate the nested structure
-                .metaStruct(
-                    "_dd.stack",
-                    validates(v -> ((List<?>) ((Map<?, ?>) v).get("vulnerability")).size() == 2))));
-  }
-
-  @Test
-  void metaStructMismatchFails() {
-    List<DecodedTrace> traces = Decoder.decodeJson(META_STRUCT_TRACE).getTraces();
-    // Absent entry -> null value -> matcher fails.
-    assertThrows(
-        AssertionError.class,
-        () -> assertTraces(traces, trace(span().root().metaStruct("does.not.exist", isNonNull()))));
-    // Present entry but the predicate over its nested value is not satisfied.
-    assertThrows(
-        AssertionError.class,
-        () ->
-            assertTraces(
+                trace(
+                        SORT_BY_START_TIME,
+                        span().operationName("root").root(),
+                        span().operationName("child").childOfIndex(0),
+                        span().operationName("grandchild").childOfIndex(1)));
+    }
+
+    @Test
+    void wrongParentLinkFails() {
+        List<DecodedTrace> traces = Decoder.decodeJson(CHAIN_TRACE).getTraces();
+        // grandchild's parent is child (index 1), not root (index 0).
+        assertThrows(
+                AssertionError.class,
+                () -> assertTraces(
+                        traces,
+                        trace(
+                                SORT_BY_START_TIME,
+                                span().operationName("root").root(),
+                                span().operationName("child").childOfIndex(0),
+                                span().operationName("grandchild").childOfIndex(0))));
+    }
+
+    @Test
+    void ignoresAdditionalTraces() {
+        List<DecodedTrace> traces = Decoder.decodeJson(TWO_TRACES).getTraces();
+        // Assert just the first received trace, ignoring the other.
+        assertTraces(
+                traces,
+                IGNORE_ADDITIONAL_TRACES,
+                trace(span().operationName("root-a").root()));
+    }
+
+    @Test
+    void sortsByAncestryRegardlessOfStartTime() {
+        List<DecodedTrace> traces = Decoder.decodeJson(CHAIN_TRACE).getTraces();
+        // Spans arrive out of start order; ancestry order recovers root -> child -> grandchild.
+        assertTraces(
                 traces,
                 trace(
-                    span()
+                        SORT_BY_ANCESTRY,
+                        span().operationName("root").root(),
+                        span().operationName("child").childOfPrevious(),
+                        span().operationName("grandchild").childOfPrevious()));
+    }
+
+    @Test
+    void ancestryOrdersBranchingTraceParentBeforeChildrenByStart() {
+        List<DecodedTrace> traces = Decoder.decodeJson(BRANCHING_TRACE).getTraces();
+        // root, then its two children in start order (a@20 before b@30); both are children of root.
+        assertTraces(
+                traces,
+                trace(
+                        SORT_BY_ANCESTRY,
+                        span().operationName("root").root(),
+                        span().operationName("a").childOfIndex(0),
+                        span().operationName("b").childOfIndex(0)));
+    }
+
+    @Test
+    void unorderedMatchesAnyOrder() {
+        List<DecodedTrace> traces = Decoder.decodeJson(TWO_TRACES).getTraces();
+        // Matchers in the opposite order of receipt still each find their trace (no sorter => any
+        // order).
+        assertTraces(
+                traces,
+                options -> options.unorder().ignoreAdditionalTraces(),
+                trace(span().operationName("root-b").root()),
+                trace(span().operationName("root-a").root()));
+    }
+
+    @Test
+    void unorderedRequiresDistinctTraces() {
+        List<DecodedTrace> traces = Decoder.decodeJson(TWO_TRACES).getTraces();
+        // Two matchers for the same trace can't both match: only one root-a trace exists.
+        assertThrows(
+                AssertionError.class,
+                () -> assertTraces(
+                        traces,
+                        options -> options.unorder().ignoreAdditionalTraces(),
+                        trace(span().operationName("root-a").root()),
+                        trace(span().operationName("root-a").root())));
+    }
+
+    @Test
+    void matchesMetaStructByMatcherAndPredicate() {
+        List<DecodedTrace> traces = Decoder.decodeJson(META_STRUCT_TRACE).getTraces();
+        assertTraces(
+                traces,
+                trace(span().operationName("servlet.request")
                         .root()
+                        // plain matcher: the entry is present (any nested value)
+                        .metaStruct("http.request.body", isNonNull())
+                        // predicate via validates(): navigate the nested structure
                         .metaStruct(
-                            "_dd.stack",
-                            validates(
-                                v ->
-                                    ((List<?>) ((Map<?, ?>) v).get("vulnerability")).size()
-                                        == 99)))));
-  }
-
-  @Test
-  void ignoreAdditionalConsumesMatchedTrace() {
-    // Two matchers demanding the same trace must not both be satisfied by a single matching trace:
-    // the extra (root-b) is ignored, so once root-a is consumed the second matcher has nothing
-    // left.
-    List<DecodedTrace> traces = Decoder.decodeJson(TWO_TRACES).getTraces();
-    assertThrows(
-        AssertionError.class,
-        () ->
-            assertTraces(
+                                "_dd.stack",
+                                validates(v -> ((List<?>) ((Map<?, ?>) v).get("vulnerability")).size() == 2))));
+    }
+
+    @Test
+    void metaStructMismatchFails() {
+        List<DecodedTrace> traces = Decoder.decodeJson(META_STRUCT_TRACE).getTraces();
+        // Absent entry -> null value -> matcher fails.
+        assertThrows(
+                AssertionError.class,
+                () -> assertTraces(traces, trace(span().root().metaStruct("does.not.exist", isNonNull()))));
+        // Present entry but the predicate over its nested value is not satisfied.
+        assertThrows(
+                AssertionError.class,
+                () -> assertTraces(
+                        traces,
+                        trace(span().root()
+                                .metaStruct(
+                                        "_dd.stack",
+                                        validates(v ->
+                                                ((List<?>) ((Map<?, ?>) v).get("vulnerability")).size() == 99)))));
+    }
+
+    @Test
+    void ignoreAdditionalConsumesMatchedTrace() {
+        // Two matchers demanding the same trace must not both be satisfied by a single matching trace:
+        // the extra (root-b) is ignored, so once root-a is consumed the second matcher has nothing
+        // left.
+        List<DecodedTrace> traces = Decoder.decodeJson(TWO_TRACES).getTraces();
+        assertThrows(
+                AssertionError.class,
+                () -> assertTraces(
+                        traces,
+                        IGNORE_ADDITIONAL_TRACES,
+                        trace(span().operationName("root-a").root()),
+                        trace(span().operationName("root-a").root())));
+    }
+
+    @Test
+    void childOfPreviousDoesNotLeakAcrossCandidates() {
+        // A broken chain (2 spans) is tried first: its childOfPrevious span resolves a concrete parent
+        // id and then fails. The valid chain that follows uses different span ids and must still match
+        // —
+        // the matcher must not carry the first candidate's ids over to the next.
+        String broken = "[" + spanJson("root", 10, 0, 10) + "," + spanJson("child", 11, 999, 20) + "]";
+        String valid = "[" + spanJson("root", 20, 0, 10) + "," + spanJson("child", 21, 20, 20) + "]";
+        List<DecodedTrace> traces =
+                Decoder.decodeJson("[" + broken + "," + valid + "]").getTraces();
+        assertTraces(
                 traces,
-                IGNORE_ADDITIONAL_TRACES,
-                trace(span().operationName("root-a").root()),
-                trace(span().operationName("root-a").root())));
-  }
-
-  @Test
-  void childOfPreviousDoesNotLeakAcrossCandidates() {
-    // A broken chain (2 spans) is tried first: its childOfPrevious span resolves a concrete parent
-    // id and then fails. The valid chain that follows uses different span ids and must still match
-    // —
-    // the matcher must not carry the first candidate's ids over to the next.
-    String broken = "[" + spanJson("root", 10, 0, 10) + "," + spanJson("child", 11, 999, 20) + "]";
-    String valid = "[" + spanJson("root", 20, 0, 10) + "," + spanJson("child", 21, 20, 20) + "]";
-    List<DecodedTrace> traces = Decoder.decodeJson("[" + broken + "," + valid + "]").getTraces();
-    assertTraces(
-        traces,
-        options -> options.unorder().ignoreAdditionalTraces(),
-        trace(
-            span().operationName("root").root(), span().operationName("child").childOfPrevious()));
-  }
-
-  @Test
-  void defaultConstraintsRequireDefinedServiceNoTypeAndNoError() {
-    // A bare span() enforces the default conditions: service defined, no span type, not errored.
-    assertTraces(
-        Decoder.decodeJson("[[" + spanJson("op", 1, 0, 0) + "]]").getTraces(),
-        trace(span().root()));
-
-    // A non-null span type fails the default unless acknowledged with type(...).
-    List<DecodedTrace> typed = Decoder.decodeJson(spanTraceJson("s", "web", 0)).getTraces();
-    assertThrows(AssertionError.class, () -> assertTraces(typed, trace(span().root())));
-    assertTraces(typed, trace(span().root().type("web")));
-
-    // An errored span fails the default unless acknowledged with error(true).
-    List<DecodedTrace> errored = Decoder.decodeJson(spanTraceJson("s", null, 1)).getTraces();
-    assertThrows(AssertionError.class, () -> assertTraces(errored, trace(span().root())));
-    assertTraces(errored, trace(span().root().error(true)));
-
-    // An undefined (empty) service fails the default.
-    List<DecodedTrace> noService = Decoder.decodeJson(spanTraceJson("", null, 0)).getTraces();
-    assertThrows(AssertionError.class, () -> assertTraces(noService, trace(span().root())));
-  }
-
-  /** A single-span trace with a configurable service, span type (nullable), and error flag. */
-  private static String spanTraceJson(String service, String type, int error) {
-    return "[[{\"service\":\""
-        + service
-        + "\",\"name\":\"op\",\"resource\":\"op\","
-        + (type == null ? "" : "\"type\":\"" + type + "\",")
-        + "\"trace_id\":1,\"span_id\":1,\"parent_id\":0,\"start\":0,\"duration\":1,\"error\":"
-        + error
-        + ",\"meta\":{},\"metrics\":{}}]]";
-  }
-
-  // --- Span links ---
-
-  @Test
-  void matchesLinksByTargetSpanIndexPositionally() {
-    List<DecodedTrace> traces = Decoder.decodeJson(linkedTraceJson(20, 30)).getTraces();
-    assertTraces(
-        traces,
-        trace(
-            span().operationName("root").root(),
-            span().operationName("shard-a").childOfIndex(0),
-            span().operationName("shard-b").childOfIndex(0),
-            span().operationName("merge").childOfIndex(0).links(toIndex(1), toIndex(2))));
-  }
-
-  @Test
-  void matchesLinksByRawIdentifiersAndWildcard() {
-    List<DecodedTrace> traces = Decoder.decodeJson(linkedTraceJson(20, 30)).getTraces();
-    assertTraces(
-        traces,
-        trace(
-            span().operationName("root").root(),
-            span().operationName("shard-a").childOfIndex(0),
-            span().operationName("shard-b").childOfIndex(0),
-            span().operationName("merge").childOfIndex(0).links(to(1L, 20L), any())));
-  }
-
-  @Test
-  void wrongLinkOrderFails() {
-    List<DecodedTrace> traces = Decoder.decodeJson(linkedTraceJson(20, 30)).getTraces();
-    assertThrows(
-        AssertionError.class,
-        () ->
-            assertTraces(
+                options -> options.unorder().ignoreAdditionalTraces(),
+                trace(
+                        span().operationName("root").root(),
+                        span().operationName("child").childOfPrevious()));
+    }
+
+    @Test
+    void defaultConstraintsRequireDefinedServiceNoTypeAndNoError() {
+        // A bare span() enforces the default conditions: service defined, no span type, not errored.
+        assertTraces(Decoder.decodeJson("[[" + spanJson("op", 1, 0, 0) + "]]").getTraces(), trace(span().root()));
+
+        // A non-null span type fails the default unless acknowledged with type(...).
+        List<DecodedTrace> typed =
+                Decoder.decodeJson(spanTraceJson("s", "web", 0)).getTraces();
+        assertThrows(AssertionError.class, () -> assertTraces(typed, trace(span().root())));
+        assertTraces(typed, trace(span().root().type("web")));
+
+        // An errored span fails the default unless acknowledged with error(true).
+        List<DecodedTrace> errored =
+                Decoder.decodeJson(spanTraceJson("s", null, 1)).getTraces();
+        assertThrows(AssertionError.class, () -> assertTraces(errored, trace(span().root())));
+        assertTraces(errored, trace(span().root().error(true)));
+
+        // An undefined (empty) service fails the default.
+        List<DecodedTrace> noService =
+                Decoder.decodeJson(spanTraceJson("", null, 0)).getTraces();
+        assertThrows(AssertionError.class, () -> assertTraces(noService, trace(span().root())));
+    }
+
+    /** A single-span trace with a configurable service, span type (nullable), and error flag. */
+    private static String spanTraceJson(String service, String type, int error) {
+        return "[[{\"service\":\""
+                + service
+                + "\",\"name\":\"op\",\"resource\":\"op\","
+                + (type == null ? "" : "\"type\":\"" + type + "\",")
+                + "\"trace_id\":1,\"span_id\":1,\"parent_id\":0,\"start\":0,\"duration\":1,\"error\":"
+                + error
+                + ",\"meta\":{},\"metrics\":{}}]]";
+    }
+
+    // --- Span links ---
+
+    @Test
+    void matchesLinksByTargetSpanIndexPositionally() {
+        List<DecodedTrace> traces = Decoder.decodeJson(linkedTraceJson(20, 30)).getTraces();
+        assertTraces(
                 traces,
                 trace(
-                    span().operationName("root").root(),
-                    span().operationName("shard-a").childOfIndex(0),
-                    span().operationName("shard-b").childOfIndex(0),
-                    span().operationName("merge").childOfIndex(0).links(toIndex(2), toIndex(1)))),
-        "links are matched positionally");
-  }
-
-  @Test
-  void wrongLinkCountFails() {
-    // A single-span trace, so a link-count mismatch is the only thing that can fail.
-    List<DecodedTrace> traces = Decoder.decodeJson(mergeOnlyTraceJson(20, 30)).getTraces();
-    assertTraces(traces, trace(span().operationName("merge").root().links(any(), any())));
-    assertThrows(
-        AssertionError.class,
-        () -> assertTraces(traces, trace(span().operationName("merge").root().links(any()))),
-        "too few matchers");
-    assertThrows(
-        AssertionError.class,
-        () ->
-            assertTraces(
-                traces, trace(span().operationName("merge").root().links(any(), any(), any()))),
-        "too many matchers");
-  }
-
-  @Test
-  void emptyLinksAssertsNoLinkAndAbsentLinksAssertNothing() {
-    List<DecodedTrace> withLinks = Decoder.decodeJson(mergeOnlyTraceJson(20)).getTraces();
-    assertThrows(
-        AssertionError.class,
-        () -> assertTraces(withLinks, trace(span().operationName("merge").root().links())),
-        "links() requires zero links");
-    // Not calling links(...) asserts nothing, even though the span does carry links.
-    assertTraces(withLinks, trace(span().operationName("merge").root()));
-    // A span with no link satisfies links().
-    List<DecodedTrace> withoutLinks =
-        Decoder.decodeJson("[[" + spanJson("plain", 10, 0, 10) + "]]").getTraces();
-    assertTraces(withoutLinks, trace(span().operationName("plain").root().links()));
-  }
-
-  @Test
-  void matchesLinkFlagsStateAndAttributes() {
-    List<DecodedTrace> traces = Decoder.decodeJson(refinedLinkTraceJson()).getTraces();
-    assertTraces(
-        traces,
-        trace(
-            span()
-                .operationName("merge")
-                .root()
-                .links(
-                    to(99L, 99L)
-                        .traceFlags((byte) 1)
-                        .traceState("dd=s:1")
-                        .attributes(singletonMap("link.kind", "span-pointer")))));
-    assertThrows(
-        AssertionError.class,
-        () ->
-            assertTraces(
+                        span().operationName("root").root(),
+                        span().operationName("shard-a").childOfIndex(0),
+                        span().operationName("shard-b").childOfIndex(0),
+                        span().operationName("merge").childOfIndex(0).links(toIndex(1), toIndex(2))));
+    }
+
+    @Test
+    void matchesLinksByRawIdentifiersAndWildcard() {
+        List<DecodedTrace> traces = Decoder.decodeJson(linkedTraceJson(20, 30)).getTraces();
+        assertTraces(
                 traces,
                 trace(
-                    span().operationName("merge").root().links(to(99L, 99L).traceFlags((byte) 0)))),
-        "wrong trace flags");
-    // The matcher form covers a value that depends on whether the target had been sampled.
-    assertTraces(
-        traces,
-        trace(
-            span()
-                .operationName("merge")
-                .root()
-                .links(
-                    to(99L, 99L)
-                        .traceFlags(isNonNull())
-                        .traceState(isNonNull())
-                        .attributes(isNonNull()))));
-  }
-
-  @Test
-  void anyLinkIgnoresFlagsStateAndAttributes() {
-    List<DecodedTrace> traces = Decoder.decodeJson(refinedLinkTraceJson()).getTraces();
-    assertTraces(traces, trace(span().operationName("merge").root().links(any())));
-    // A constraint applied on top of any() is still asserted.
-    assertThrows(
-        AssertionError.class,
-        () ->
-            assertTraces(
+                        span().operationName("root").root(),
+                        span().operationName("shard-a").childOfIndex(0),
+                        span().operationName("shard-b").childOfIndex(0),
+                        span().operationName("merge").childOfIndex(0).links(to(1L, 20L), any())));
+    }
+
+    @Test
+    void wrongLinkOrderFails() {
+        List<DecodedTrace> traces = Decoder.decodeJson(linkedTraceJson(20, 30)).getTraces();
+        assertThrows(
+                AssertionError.class,
+                () -> assertTraces(
+                        traces,
+                        trace(
+                                span().operationName("root").root(),
+                                span().operationName("shard-a").childOfIndex(0),
+                                span().operationName("shard-b").childOfIndex(0),
+                                span().operationName("merge").childOfIndex(0).links(toIndex(2), toIndex(1)))),
+                "links are matched positionally");
+    }
+
+    @Test
+    void wrongLinkCountFails() {
+        // A single-span trace, so a link-count mismatch is the only thing that can fail.
+        List<DecodedTrace> traces =
+                Decoder.decodeJson(mergeOnlyTraceJson(20, 30)).getTraces();
+        assertTraces(traces, trace(span().operationName("merge").root().links(any(), any())));
+        assertThrows(
+                AssertionError.class,
+                () -> assertTraces(
+                        traces, trace(span().operationName("merge").root().links(any()))),
+                "too few matchers");
+        assertThrows(
+                AssertionError.class,
+                () -> assertTraces(
+                        traces, trace(span().operationName("merge").root().links(any(), any(), any()))),
+                "too many matchers");
+    }
+
+    @Test
+    void emptyLinksAssertsNoLinkAndAbsentLinksAssertNothing() {
+        List<DecodedTrace> withLinks =
+                Decoder.decodeJson(mergeOnlyTraceJson(20)).getTraces();
+        assertThrows(
+                AssertionError.class,
+                () -> assertTraces(
+                        withLinks, trace(span().operationName("merge").root().links())),
+                "links() requires zero links");
+        // Not calling links(...) asserts nothing, even though the span does carry links.
+        assertTraces(withLinks, trace(span().operationName("merge").root()));
+        // A span with no link satisfies links().
+        List<DecodedTrace> withoutLinks =
+                Decoder.decodeJson("[[" + spanJson("plain", 10, 0, 10) + "]]").getTraces();
+        assertTraces(withoutLinks, trace(span().operationName("plain").root().links()));
+    }
+
+    @Test
+    void matchesLinkFlagsStateAndAttributes() {
+        List<DecodedTrace> traces = Decoder.decodeJson(refinedLinkTraceJson()).getTraces();
+        assertTraces(
+                traces,
+                trace(span().operationName("merge")
+                        .root()
+                        .links(to(99L, 99L)
+                                .traceFlags((byte) 1)
+                                .traceState("dd=s:1")
+                                .attributes(singletonMap("link.kind", "span-pointer")))));
+        assertThrows(
+                AssertionError.class,
+                () -> assertTraces(
+                        traces,
+                        trace(span().operationName("merge")
+                                .root()
+                                .links(to(99L, 99L).traceFlags((byte) 0)))),
+                "wrong trace flags");
+        // The matcher form covers a value that depends on whether the target had been sampled.
+        assertTraces(
+                traces,
+                trace(span().operationName("merge")
+                        .root()
+                        .links(to(99L, 99L)
+                                .traceFlags(isNonNull())
+                                .traceState(isNonNull())
+                                .attributes(isNonNull()))));
+    }
+
+    @Test
+    void anyLinkIgnoresFlagsStateAndAttributes() {
+        List<DecodedTrace> traces = Decoder.decodeJson(refinedLinkTraceJson()).getTraces();
+        assertTraces(traces, trace(span().operationName("merge").root().links(any())));
+        // A constraint applied on top of any() is still asserted.
+        assertThrows(
+                AssertionError.class,
+                () -> assertTraces(
+                        traces, trace(span().operationName("merge").root().links(any().traceFlags((byte) 0)))),
+                "wrong trace flags");
+    }
+
+    @Test
+    void negativeLinkTargetIndexIsRejected() {
+        assertThrows(IllegalArgumentException.class, () -> toIndex(-1));
+    }
+
+    @Test
+    void linkTargetsDoNotLeakAcrossCandidates() {
+        // The first candidate resolves toIndex(0) against its own spans and then fails on the link
+        // ids. The valid trace that follows uses different ids and must still match.
+        String broken = "[" + spanJson("root", 10, 0, 10) + "," + linkingSpanJson(11, 10, 777) + "]";
+        String valid = "[" + spanJson("root", 40, 0, 10) + "," + linkingSpanJson(41, 40, 40) + "]";
+        List<DecodedTrace> traces =
+                Decoder.decodeJson("[" + broken + "," + valid + "]").getTraces();
+        assertTraces(
                 traces,
-                trace(span().operationName("merge").root().links(any().traceFlags((byte) 0)))),
-        "wrong trace flags");
-  }
-
-  @Test
-  void negativeLinkTargetIndexIsRejected() {
-    assertThrows(IllegalArgumentException.class, () -> toIndex(-1));
-  }
-
-  @Test
-  void linkTargetsDoNotLeakAcrossCandidates() {
-    // The first candidate resolves toIndex(0) against its own spans and then fails on the link
-    // ids. The valid trace that follows uses different ids and must still match.
-    String broken = "[" + spanJson("root", 10, 0, 10) + "," + linkingSpanJson(11, 10, 777) + "]";
-    String valid = "[" + spanJson("root", 40, 0, 10) + "," + linkingSpanJson(41, 40, 40) + "]";
-    List<DecodedTrace> traces = Decoder.decodeJson("[" + broken + "," + valid + "]").getTraces();
-    assertTraces(
-        traces,
-        options -> options.unorder().ignoreAdditionalTraces(),
-        trace(
-            span().operationName("root").root(), span().operationName("merge").links(toIndex(0))));
-  }
-
-  /** A single-span trace whose root {@code merge} span links to the given span ids. */
-  private static String mergeOnlyTraceJson(long... linkedSpanIds) {
-    return "[[" + linkingSpanJson(40, 0, linkedSpanIds) + "]]";
-  }
-
-  /** One trace: a root, two shards, and a merge span linking to both shards. */
-  private static String linkedTraceJson(long shardA, long shardB) {
-    return "[["
-        + spanJson("root", 10, 0, 10)
-        + ","
-        + spanJson("shard-a", shardA, 10, 20)
-        + ","
-        + spanJson("shard-b", shardB, 10, 30)
-        + ","
-        + linkingSpanJson(40, 10, shardA, shardB)
-        + "]]";
-  }
-
-  /** A single-span trace whose link carries flags, a trace state and attributes. */
-  private static String refinedLinkTraceJson() {
-    return "[[{\"service\":\"s\",\"name\":\"merge\",\"resource\":\"merge\","
-        + "\"trace_id\":1,\"span_id\":40,\"parent_id\":0,\"start\":40,\"duration\":1,"
-        + "\"error\":0,\"metrics\":{},\"meta\":{\"_dd.span_links\":\""
-        + "[{\\\"trace_id\\\":\\\"00000000000000000000000000000063\\\","
-        + "\\\"span_id\\\":\\\"63\\\",\\\"flags\\\":1,"
-        + "\\\"tracestate\\\":\\\"dd=s:1\\\","
-        + "\\\"attributes\\\":{\\\"link.kind\\\":\\\"span-pointer\\\"}}]"
-        + "\"}}]]";
-  }
-
-  /** A {@code merge} span linking to the given span ids, all within trace 1. */
-  private static String linkingSpanJson(long id, long parent, long... linkedSpanIds) {
-    StringBuilder links = new StringBuilder("[");
-    for (int i = 0; i < linkedSpanIds.length; i++) {
-      if (i > 0) {
-        links.append(',');
-      }
-      links
-          .append("{\\\"trace_id\\\":\\\"")
-          .append(String.format("%032x", 1))
-          .append("\\\",\\\"span_id\\\":\\\"")
-          .append(Long.toHexString(linkedSpanIds[i]))
-          .append("\\\"}");
+                options -> options.unorder().ignoreAdditionalTraces(),
+                trace(
+                        span().operationName("root").root(),
+                        span().operationName("merge").links(toIndex(0))));
+    }
+
+    /** A single-span trace whose root {@code merge} span links to the given span ids. */
+    private static String mergeOnlyTraceJson(long... linkedSpanIds) {
+        return "[[" + linkingSpanJson(40, 0, linkedSpanIds) + "]]";
+    }
+
+    /** One trace: a root, two shards, and a merge span linking to both shards. */
+    private static String linkedTraceJson(long shardA, long shardB) {
+        return "[["
+                + spanJson("root", 10, 0, 10)
+                + ","
+                + spanJson("shard-a", shardA, 10, 20)
+                + ","
+                + spanJson("shard-b", shardB, 10, 30)
+                + ","
+                + linkingSpanJson(40, 10, shardA, shardB)
+                + "]]";
+    }
+
+    /** A single-span trace whose link carries flags, a trace state and attributes. */
+    private static String refinedLinkTraceJson() {
+        return "[[{\"service\":\"s\",\"name\":\"merge\",\"resource\":\"merge\","
+                + "\"trace_id\":1,\"span_id\":40,\"parent_id\":0,\"start\":40,\"duration\":1,"
+                + "\"error\":0,\"metrics\":{},\"meta\":{\"_dd.span_links\":\""
+                + "[{\\\"trace_id\\\":\\\"00000000000000000000000000000063\\\","
+                + "\\\"span_id\\\":\\\"63\\\",\\\"flags\\\":1,"
+                + "\\\"tracestate\\\":\\\"dd=s:1\\\","
+                + "\\\"attributes\\\":{\\\"link.kind\\\":\\\"span-pointer\\\"}}]"
+                + "\"}}]]";
+    }
+
+    /** A {@code merge} span linking to the given span ids, all within trace 1. */
+    private static String linkingSpanJson(long id, long parent, long... linkedSpanIds) {
+        StringBuilder links = new StringBuilder("[");
+        for (int i = 0; i < linkedSpanIds.length; i++) {
+            if (i > 0) {
+                links.append(',');
+            }
+            links.append("{\\\"trace_id\\\":\\\"")
+                    .append(String.format("%032x", 1))
+                    .append("\\\",\\\"span_id\\\":\\\"")
+                    .append(Long.toHexString(linkedSpanIds[i]))
+                    .append("\\\"}");
+        }
+        links.append(']');
+        return "{\"service\":\"s\",\"name\":\"merge\",\"resource\":\"merge\","
+                + "\"trace_id\":1,\"span_id\":"
+                + id
+                + ",\"parent_id\":"
+                + parent
+                + ",\"start\":40,\"duration\":1,\"error\":0,\"metrics\":{},"
+                + "\"meta\":{\"_dd.span_links\":\""
+                + links
+                + "\"}}";
+    }
+
+    private static String spanJson(String name, long id, long parent, long start) {
+        return "{\"service\":\"s\",\"name\":\""
+                + name
+                + "\",\"resource\":\""
+                + name
+                + "\",\"trace_id\":1,\"span_id\":"
+                + id
+                + ",\"parent_id\":"
+                + parent
+                + ",\"start\":"
+                + start
+                + ",\"duration\":1,\"error\":0,\"meta\":{},\"metrics\":{}}";
     }
-    links.append(']');
-    return "{\"service\":\"s\",\"name\":\"merge\",\"resource\":\"merge\","
-        + "\"trace_id\":1,\"span_id\":"
-        + id
-        + ",\"parent_id\":"
-        + parent
-        + ",\"start\":40,\"duration\":1,\"error\":0,\"metrics\":{},"
-        + "\"meta\":{\"_dd.span_links\":\""
-        + links
-        + "\"}}";
-  }
-
-  private static String spanJson(String name, long id, long parent, long start) {
-    return "{\"service\":\"s\",\"name\":\""
-        + name
-        + "\",\"resource\":\""
-        + name
-        + "\",\"trace_id\":1,\"span_id\":"
-        + id
-        + ",\"parent_id\":"
-        + parent
-        + ",\"start\":"
-        + start
-        + ",\"duration\":1,\"error\":0,\"meta\":{},\"metrics\":{}}";
-  }
 }
diff --git a/dd-smoke-tests/tracer-flare/src/main/java/datadog/smoketest/flare/SimpleApp.java b/dd-smoke-tests/tracer-flare/src/main/java/datadog/smoketest/flare/SimpleApp.java
index d96431ed51a..fc91cc1f2d2 100644
--- a/dd-smoke-tests/tracer-flare/src/main/java/datadog/smoketest/flare/SimpleApp.java
+++ b/dd-smoke-tests/tracer-flare/src/main/java/datadog/smoketest/flare/SimpleApp.java
@@ -1,15 +1,15 @@
 package datadog.smoketest.flare;
 
 public class SimpleApp {
-  public static void main(String[] args) throws InterruptedException {
-    System.out.println("SimpleApp starting - waiting for flare generation");
+    public static void main(String[] args) throws InterruptedException {
+        System.out.println("SimpleApp starting - waiting for flare generation");
 
-    // Keep the app running indefinitely
-    // The flare will be triggered after 10 seconds (configured in test)
-    // The test will wait for the flare and then terminate the process
-    while (true) {
-      System.out.println("SimpleApp running...");
-      Thread.sleep(5000);
+        // Keep the app running indefinitely
+        // The flare will be triggered after 10 seconds (configured in test)
+        // The test will wait for the flare and then terminate the process
+        while (true) {
+            System.out.println("SimpleApp running...");
+            Thread.sleep(5000);
+        }
     }
-  }
 }
diff --git a/dd-smoke-tests/vertx-3.4/application/src/main/java/datadog/smoketest/vertx_3_4/IastHandler.java b/dd-smoke-tests/vertx-3.4/application/src/main/java/datadog/smoketest/vertx_3_4/IastHandler.java
index 51f7696bae0..301bf09b659 100644
--- a/dd-smoke-tests/vertx-3.4/application/src/main/java/datadog/smoketest/vertx_3_4/IastHandler.java
+++ b/dd-smoke-tests/vertx-3.4/application/src/main/java/datadog/smoketest/vertx_3_4/IastHandler.java
@@ -13,174 +13,165 @@
 import java.util.Vector;
 
 public enum IastHandler implements Handler<RoutingContext> {
-  HEADER("/header") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String value = rc.request().getHeader("header");
-      rc.response().end("Received " + value);
-    }
-  },
-  HEADERS("/headers") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final MultiMap value = rc.request().headers();
-      rc.response().end("Received " + value.get("header"));
-    }
-  },
-  HEADER_NAMES("/headernames") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final Collection<String> names = rc.request().headers().names();
-      rc.response().end("Received " + String.join(",", names));
-    }
-  },
-  PARAM("/param") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String value = rc.request().getParam("param");
-      rc.response().end("Received " + value);
-    }
-  },
-  PARAMS("/params") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final MultiMap value = rc.request().params();
-      rc.response().end("Received " + value.get("param"));
-    }
-  },
-  PARAM_NAMES("/paramnames") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final Collection<String> names = rc.request().params().names();
-      rc.response().end("Received " + String.join(",", names));
-    }
-  },
-  FORM_ATTRIBUTE("/form_attribute") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String value = rc.request().getFormAttribute("formAttribute");
-      rc.response().end("Received " + value);
-    }
-  },
-  PATH_PARAM("/path/:name") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String value = rc.pathParam("name");
-      rc.response().end("Received " + value);
-    }
-  },
-  COOKIE("/cookie") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final Cookie cookie = rc.getCookie("name");
-      rc.response().end("Received " + cookie.getName() + " " + cookie.getValue());
-    }
-  },
-  BODY_STRING("/body/string") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String encoding = rc.request().getParam("encoding");
-      if (encoding != null) {
-        rc.response().end("Received " + rc.getBodyAsString(encoding));
-      } else {
-        rc.response().end("Received " + rc.getBodyAsString());
-      }
-    }
-  },
-  BODY_JSON("/body/json") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      rc.response().end("Received " + rc.getBodyAsJson());
-    }
-  },
-  BODY_JSON_ARRAY("/body/jsonArray") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      rc.response().end("Received " + rc.getBodyAsJsonArray());
-    }
-  },
-  INSECURE_COOKIE_HEADER("/insecurecookieheader") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      rc.response().putHeader("Set-Cookie", "user-id=7").end("Received ");
-    }
-  },
-  INSECURE_COOKIE_HEADER2("/insecurecookieheader2") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      Vector<String> values = new Vector<>();
-      values.add("firstcookie=b");
-      values.add("user-id=7");
-      rc.response().putHeader("Set-cookie", values).end("Received ");
-    }
-  },
-  UNVALIDATED_REDIRECT_REROUTE1("/unvaidatedredirectreroute1") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String path = rc.request().getParam("path");
-      rc.reroute(path);
-    }
-  },
-  UNVALIDATED_REDIRECT_REROUTE2("/unvaidatedredirectreroute2") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String path = rc.request().getParam("path");
-      rc.reroute(HttpMethod.GET, path);
-    }
-  },
-  UNVALIDATED_REDIRECT_HEADER("/unvaidatedredirectheader") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String name = rc.request().getParam("name");
-      final String value = rc.request().getParam("value");
-      rc.response().putHeader(name, value).end("Redirected ");
-    }
-  },
-  EVENT_BUS("/eventBus") {
+    HEADER("/header") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String value = rc.request().getHeader("header");
+            rc.response().end("Received " + value);
+        }
+    },
+    HEADERS("/headers") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final MultiMap value = rc.request().headers();
+            rc.response().end("Received " + value.get("header"));
+        }
+    },
+    HEADER_NAMES("/headernames") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final Collection<String> names = rc.request().headers().names();
+            rc.response().end("Received " + String.join(",", names));
+        }
+    },
+    PARAM("/param") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String value = rc.request().getParam("param");
+            rc.response().end("Received " + value);
+        }
+    },
+    PARAMS("/params") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final MultiMap value = rc.request().params();
+            rc.response().end("Received " + value.get("param"));
+        }
+    },
+    PARAM_NAMES("/paramnames") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final Collection<String> names = rc.request().params().names();
+            rc.response().end("Received " + String.join(",", names));
+        }
+    },
+    FORM_ATTRIBUTE("/form_attribute") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String value = rc.request().getFormAttribute("formAttribute");
+            rc.response().end("Received " + value);
+        }
+    },
+    PATH_PARAM("/path/:name") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String value = rc.pathParam("name");
+            rc.response().end("Received " + value);
+        }
+    },
+    COOKIE("/cookie") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final Cookie cookie = rc.getCookie("name");
+            rc.response().end("Received " + cookie.getName() + " " + cookie.getValue());
+        }
+    },
+    BODY_STRING("/body/string") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String encoding = rc.request().getParam("encoding");
+            if (encoding != null) {
+                rc.response().end("Received " + rc.getBodyAsString(encoding));
+            } else {
+                rc.response().end("Received " + rc.getBodyAsString());
+            }
+        }
+    },
+    BODY_JSON("/body/json") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            rc.response().end("Received " + rc.getBodyAsJson());
+        }
+    },
+    BODY_JSON_ARRAY("/body/jsonArray") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            rc.response().end("Received " + rc.getBodyAsJsonArray());
+        }
+    },
+    INSECURE_COOKIE_HEADER("/insecurecookieheader") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            rc.response().putHeader("Set-Cookie", "user-id=7").end("Received ");
+        }
+    },
+    INSECURE_COOKIE_HEADER2("/insecurecookieheader2") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            Vector<String> values = new Vector<>();
+            values.add("firstcookie=b");
+            values.add("user-id=7");
+            rc.response().putHeader("Set-cookie", values).end("Received ");
+        }
+    },
+    UNVALIDATED_REDIRECT_REROUTE1("/unvaidatedredirectreroute1") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String path = rc.request().getParam("path");
+            rc.reroute(path);
+        }
+    },
+    UNVALIDATED_REDIRECT_REROUTE2("/unvaidatedredirectreroute2") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String path = rc.request().getParam("path");
+            rc.reroute(HttpMethod.GET, path);
+        }
+    },
+    UNVALIDATED_REDIRECT_HEADER("/unvaidatedredirectheader") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String name = rc.request().getParam("name");
+            final String value = rc.request().getParam("value");
+            rc.response().putHeader(name, value).end("Redirected ");
+        }
+    },
+    EVENT_BUS("/eventBus") {
 
-    @Override
-    public void init(final Vertx vertx) {
-      vertx
-          .eventBus()
-          .consumer(
-              name(),
-              message -> {
+        @Override
+        public void init(final Vertx vertx) {
+            vertx.eventBus().consumer(name(), message -> {
                 final JsonObject payload = (JsonObject) message.body();
                 final String response = payload.getString("name").toUpperCase();
                 message.reply(response);
-              });
-    }
+            });
+        }
 
-    @Override
-    public void handle(final RoutingContext rc) {
-      final JsonObject target = rc.getBodyAsJson();
-      rc.vertx()
-          .eventBus()
-          .send(
-              name(),
-              target,
-              reply -> {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final JsonObject target = rc.getBodyAsJson();
+            rc.vertx().eventBus().send(name(), target, reply -> {
                 if (reply.succeeded()) {
-                  rc.response().end("Received " + reply.result().body());
+                    rc.response().end("Received " + reply.result().body());
                 } else {
-                  rc.fail(reply.cause());
+                    rc.fail(reply.cause());
                 }
-              });
-    }
-  };
+            });
+        }
+    };
 
-  public final String path;
+    public final String path;
 
-  IastHandler(final String path) {
-    this.path = path;
-  }
+    IastHandler(final String path) {
+        this.path = path;
+    }
 
-  public void init(final Vertx vertx) {}
+    public void init(final Vertx vertx) {}
 
-  public static Optional<Handler<RoutingContext>> handlerFor(final String path) {
-    return Arrays.stream(IastHandler.values())
-        .filter(handler -> path.startsWith(handler.path))
-        .map(handler -> (Handler<RoutingContext>) handler)
-        .findFirst();
-  }
+    public static Optional<Handler<RoutingContext>> handlerFor(final String path) {
+        return Arrays.stream(IastHandler.values())
+                .filter(handler -> path.startsWith(handler.path))
+                .map(handler -> (Handler<RoutingContext>) handler)
+                .findFirst();
+    }
 }
diff --git a/dd-smoke-tests/vertx-3.4/application/src/main/java/datadog/vertx_3_4/IastVerticle.java b/dd-smoke-tests/vertx-3.4/application/src/main/java/datadog/vertx_3_4/IastVerticle.java
index 4edfa41a5d0..609ab3af26e 100644
--- a/dd-smoke-tests/vertx-3.4/application/src/main/java/datadog/vertx_3_4/IastVerticle.java
+++ b/dd-smoke-tests/vertx-3.4/application/src/main/java/datadog/vertx_3_4/IastVerticle.java
@@ -13,39 +13,31 @@
 
 public class IastVerticle extends AbstractVerticle {
 
-  public static void main(String[] args) {
-    final VertxOptions options =
-        new VertxOptions()
-            .setEventLoopPoolSize(1)
-            .setWorkerPoolSize(2)
-            .setInternalBlockingPoolSize(1);
-    final Vertx vertx = Vertx.vertx(options);
-    vertx.deployVerticle(new IastVerticle());
-  }
+    public static void main(String[] args) {
+        final VertxOptions options =
+                new VertxOptions().setEventLoopPoolSize(1).setWorkerPoolSize(2).setInternalBlockingPoolSize(1);
+        final Vertx vertx = Vertx.vertx(options);
+        vertx.deployVerticle(new IastVerticle());
+    }
 
-  @Override
-  public void start(final Future<Void> startPromise) {
-    final Router router = Router.router(vertx);
-    router.route().handler(BodyHandler.create());
-    router.route().handler(CookieHandler.create());
-    Arrays.stream(IastHandler.values())
-        .forEach(
-            handler -> {
-              handler.init(vertx);
-              router.route(handler.path).handler(handler);
-            });
-    vertx
-        .createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
-        .requestHandler(router::accept)
-        .listen(
-            Integer.getInteger("vertx.http.port", 8080),
-            http -> {
-              if (http.succeeded()) {
-                startPromise.complete();
-                System.out.println("HTTP server started");
-              } else {
-                startPromise.fail(http.cause());
-              }
-            });
-  }
+    @Override
+    public void start(final Future<Void> startPromise) {
+        final Router router = Router.router(vertx);
+        router.route().handler(BodyHandler.create());
+        router.route().handler(CookieHandler.create());
+        Arrays.stream(IastHandler.values()).forEach(handler -> {
+            handler.init(vertx);
+            router.route(handler.path).handler(handler);
+        });
+        vertx.createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
+                .requestHandler(router::accept)
+                .listen(Integer.getInteger("vertx.http.port", 8080), http -> {
+                    if (http.succeeded()) {
+                        startPromise.complete();
+                        System.out.println("HTTP server started");
+                    } else {
+                        startPromise.fail(http.cause());
+                    }
+                });
+    }
 }
diff --git a/dd-smoke-tests/vertx-3.4/application/src/main/java/datadog/vertx_3_4/MainVerticle.java b/dd-smoke-tests/vertx-3.4/application/src/main/java/datadog/vertx_3_4/MainVerticle.java
index 3b0b4d04761..e9ec0da4ffe 100644
--- a/dd-smoke-tests/vertx-3.4/application/src/main/java/datadog/vertx_3_4/MainVerticle.java
+++ b/dd-smoke-tests/vertx-3.4/application/src/main/java/datadog/vertx_3_4/MainVerticle.java
@@ -11,66 +11,56 @@
 
 public class MainVerticle extends AbstractVerticle {
 
-  public static void main(String[] args) throws Exception {
-    VertxOptions options = new VertxOptions();
-    options.setEventLoopPoolSize(1);
-    options.setWorkerPoolSize(2);
-    options.setInternalBlockingPoolSize(1);
+    public static void main(String[] args) throws Exception {
+        VertxOptions options = new VertxOptions();
+        options.setEventLoopPoolSize(1);
+        options.setWorkerPoolSize(2);
+        options.setInternalBlockingPoolSize(1);
 
-    Vertx vertx = Vertx.vertx(options);
-    MainVerticle verticle = new MainVerticle();
-    vertx.deployVerticle(verticle);
-  }
+        Vertx vertx = Vertx.vertx(options);
+        MainVerticle verticle = new MainVerticle();
+        vertx.deployVerticle(verticle);
+    }
 
-  static BigInteger randomFactorial() {
-    int n = ThreadLocalRandom.current().nextInt(5, 100);
-    BigInteger factorial = BigInteger.ONE;
-    for (int i = 1; i <= n; i++) {
-      factorial = factorial.multiply(BigInteger.valueOf(i));
+    static BigInteger randomFactorial() {
+        int n = ThreadLocalRandom.current().nextInt(5, 100);
+        BigInteger factorial = BigInteger.ONE;
+        for (int i = 1; i <= n; i++) {
+            factorial = factorial.multiply(BigInteger.valueOf(i));
+        }
+        return factorial;
     }
-    return factorial;
-  }
 
-  @Override
-  public void start(Future<Void> startPromise) throws Exception {
-    Router router = Router.router(vertx);
-    router
-        .route("/routes")
-        .handler(
-            ctx ->
-                ctx.response()
-                    .setStatusCode(200)
-                    .putHeader("content-type", "text/plain")
-                    .end(randomFactorial().toString()));
-    router
-        .route("/api_security/sampling/:status_code")
-        .handler(
-            ctx ->
-                ctx.response()
-                    .setStatusCode(Integer.parseInt(ctx.request().getParam("status_code")))
-                    .end("EXECUTED"));
+    @Override
+    public void start(Future<Void> startPromise) throws Exception {
+        Router router = Router.router(vertx);
+        router.route("/routes")
+                .handler(ctx -> ctx.response()
+                        .setStatusCode(200)
+                        .putHeader("content-type", "text/plain")
+                        .end(randomFactorial().toString()));
+        router.route("/api_security/sampling/:status_code")
+                .handler(ctx -> ctx.response()
+                        .setStatusCode(Integer.parseInt(ctx.request().getParam("status_code")))
+                        .end("EXECUTED"));
 
-    vertx
-        .createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
-        .requestHandler(
-            req -> {
-              if (req.path().startsWith("/routes") || req.path().startsWith("/api_security")) {
-                router.accept(req);
-              } else {
-                req.response()
-                    .putHeader("content-type", "text/plain")
-                    .end(randomFactorial().toString());
-              }
-            })
-        .listen(
-            Integer.getInteger("vertx.http.port", 8080),
-            http -> {
-              if (http.succeeded()) {
-                startPromise.complete();
-                System.out.println("HTTP server started");
-              } else {
-                startPromise.fail(http.cause());
-              }
-            });
-  }
+        vertx.createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
+                .requestHandler(req -> {
+                    if (req.path().startsWith("/routes") || req.path().startsWith("/api_security")) {
+                        router.accept(req);
+                    } else {
+                        req.response()
+                                .putHeader("content-type", "text/plain")
+                                .end(randomFactorial().toString());
+                    }
+                })
+                .listen(Integer.getInteger("vertx.http.port", 8080), http -> {
+                    if (http.succeeded()) {
+                        startPromise.complete();
+                        System.out.println("HTTP server started");
+                    } else {
+                        startPromise.fail(http.cause());
+                    }
+                });
+    }
 }
diff --git a/dd-smoke-tests/vertx-3.9-resteasy/application/src/main/java/datadog/vertx_3_9/MainVerticle.java b/dd-smoke-tests/vertx-3.9-resteasy/application/src/main/java/datadog/vertx_3_9/MainVerticle.java
index 352b4d98959..1a6793862b8 100644
--- a/dd-smoke-tests/vertx-3.9-resteasy/application/src/main/java/datadog/vertx_3_9/MainVerticle.java
+++ b/dd-smoke-tests/vertx-3.9-resteasy/application/src/main/java/datadog/vertx_3_9/MainVerticle.java
@@ -8,31 +8,31 @@
 
 public class MainVerticle {
 
-  public static void main(String[] args) {
-    VertxOptions options = new VertxOptions();
-    options.setEventLoopPoolSize(1);
-    options.setWorkerPoolSize(2);
-    options.setInternalBlockingPoolSize(1);
+    public static void main(String[] args) {
+        VertxOptions options = new VertxOptions();
+        options.setEventLoopPoolSize(1);
+        options.setWorkerPoolSize(2);
+        options.setInternalBlockingPoolSize(1);
 
-    VertxResteasyDeployment deployment = new VertxResteasyDeployment();
-    deployment.start();
-    deployment.getRegistry().addPerInstanceResource(ResteasyResource.class);
+        VertxResteasyDeployment deployment = new VertxResteasyDeployment();
+        deployment.start();
+        deployment.getRegistry().addPerInstanceResource(ResteasyResource.class);
 
-    VertxJaxrsServer server = new VertxJaxrsServer();
-    server.setVertxOptions(options);
-    server.setDeployment(deployment);
-    server.setPort(Integer.getInteger("vertx.http.port", 8080));
-    server.setRootResourcePath("");
-    server.setSecurityDomain(null);
-    server.start();
-  }
+        VertxJaxrsServer server = new VertxJaxrsServer();
+        server.setVertxOptions(options);
+        server.setDeployment(deployment);
+        server.setPort(Integer.getInteger("vertx.http.port", 8080));
+        server.setRootResourcePath("");
+        server.setSecurityDomain(null);
+        server.start();
+    }
 
-  static BigInteger randomFactorial() {
-    int n = ThreadLocalRandom.current().nextInt(5, 100);
-    BigInteger factorial = BigInteger.ONE;
-    for (int i = 1; i <= n; i++) {
-      factorial = factorial.multiply(BigInteger.valueOf(i));
+    static BigInteger randomFactorial() {
+        int n = ThreadLocalRandom.current().nextInt(5, 100);
+        BigInteger factorial = BigInteger.ONE;
+        for (int i = 1; i <= n; i++) {
+            factorial = factorial.multiply(BigInteger.valueOf(i));
+        }
+        return factorial;
     }
-    return factorial;
-  }
 }
diff --git a/dd-smoke-tests/vertx-3.9-resteasy/application/src/main/java/datadog/vertx_3_9/ResteasyResource.java b/dd-smoke-tests/vertx-3.9-resteasy/application/src/main/java/datadog/vertx_3_9/ResteasyResource.java
index 3a2a2d20e1d..72f38ac88e7 100644
--- a/dd-smoke-tests/vertx-3.9-resteasy/application/src/main/java/datadog/vertx_3_9/ResteasyResource.java
+++ b/dd-smoke-tests/vertx-3.9-resteasy/application/src/main/java/datadog/vertx_3_9/ResteasyResource.java
@@ -8,9 +8,9 @@
 
 @Path("/factorial")
 public class ResteasyResource {
-  @GET
-  @Produces("text/plain")
-  public String factorial() {
-    return randomFactorial().toString();
-  }
+    @GET
+    @Produces("text/plain")
+    public String factorial() {
+        return randomFactorial().toString();
+    }
 }
diff --git a/dd-smoke-tests/vertx-3.9/application/src/main/java/datadog/smoketest/vertx_3_9/IastHandler.java b/dd-smoke-tests/vertx-3.9/application/src/main/java/datadog/smoketest/vertx_3_9/IastHandler.java
index afd0bca7075..1bf81d6f81b 100644
--- a/dd-smoke-tests/vertx-3.9/application/src/main/java/datadog/smoketest/vertx_3_9/IastHandler.java
+++ b/dd-smoke-tests/vertx-3.9/application/src/main/java/datadog/smoketest/vertx_3_9/IastHandler.java
@@ -14,179 +14,170 @@
 
 /** The datadog.smoketest package is needed so the class is instrumented */
 public enum IastHandler implements Handler<RoutingContext> {
-  HEADER("/header") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String value = rc.request().getHeader("header");
-      rc.response().end("Received " + value);
-    }
-  },
-  HEADERS("/headers") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final MultiMap value = rc.request().headers();
-      rc.response().end("Received " + value.get("header"));
-    }
-  },
-  HEADER_NAMES("/headernames") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final Collection<String> names = rc.request().headers().names();
-      rc.response().end("Received " + String.join(",", names));
-    }
-  },
-  PARAM("/param") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String value = rc.request().getParam("param");
-      rc.response().end("Received " + value);
-    }
-  },
-  PARAMS("/params") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final MultiMap value = rc.request().params();
-      rc.response().end("Received " + value.get("param"));
-    }
-  },
-  PARAM_NAMES("/paramnames") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final Collection<String> names = rc.request().params().names();
-      rc.response().end("Received " + String.join(",", names));
-    }
-  },
-  FORM_ATTRIBUTE("/form_attribute") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String value = rc.request().getFormAttribute("formAttribute");
-      rc.response().end("Received " + value);
-    }
-  },
-  PATH_PARAM("/path/:name") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String value = rc.pathParam("name");
-      rc.response().end("Received " + value);
-    }
-  },
-  COOKIE("/cookie") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final Cookie cookie = rc.getCookie("name");
-      rc.response().end("Received " + cookie.getName() + " " + cookie.getValue());
-    }
-  },
-  BODY_STRING("/body/string") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String encoding = rc.request().getParam("encoding");
-      if (encoding != null) {
-        rc.response().end("Received " + rc.getBodyAsString(encoding));
-      } else {
-        rc.response().end("Received " + rc.getBodyAsString());
-      }
-    }
-  },
-  BODY_JSON("/body/json") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      rc.response().end("Received " + rc.getBodyAsJson());
-    }
-  },
-  BODY_JSON_ARRAY("/body/jsonArray") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      rc.response().end("Received " + rc.getBodyAsJsonArray());
-    }
-  },
-  INSECURE_COOKIE("/insecurecookie") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      rc.response().addCookie(Cookie.cookie("userA-id", "7")).end("Received ");
-    }
-  },
-  INSECURE_COOKIE_HEADER("/insecurecookieheader") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      rc.response().putHeader("Set-Cookie", "user-id=7").end("Received ");
-    }
-  },
-  INSECURE_COOKIE_HEADER2("/insecurecookieheader2") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      Vector<String> values = new Vector<>();
-      values.add("firstcookie=b");
-      values.add("user-id=7");
-      rc.response().putHeader("Set-cookie", values).end("Received ");
-    }
-  },
-  UNVALIDATED_REDIRECT_REROUTE1("/unvaidatedredirectreroute1") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String path = rc.request().getParam("path");
-      rc.reroute(path);
-    }
-  },
-  UNVALIDATED_REDIRECT_REROUTE2("/unvaidatedredirectreroute2") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String path = rc.request().getParam("path");
-      rc.reroute(HttpMethod.GET, path);
-    }
-  },
-  UNVALIDATED_REDIRECT_HEADER("/unvaidatedredirectheader") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String name = rc.request().getParam("name");
-      final String value = rc.request().getParam("value");
-      rc.response().putHeader(name, value).end("Redirected ");
-    }
-  },
-  EVENT_BUS("/eventBus") {
-    @Override
-    public void init(final Vertx vertx) {
-      vertx
-          .eventBus()
-          .consumer(
-              name(),
-              message -> {
+    HEADER("/header") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String value = rc.request().getHeader("header");
+            rc.response().end("Received " + value);
+        }
+    },
+    HEADERS("/headers") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final MultiMap value = rc.request().headers();
+            rc.response().end("Received " + value.get("header"));
+        }
+    },
+    HEADER_NAMES("/headernames") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final Collection<String> names = rc.request().headers().names();
+            rc.response().end("Received " + String.join(",", names));
+        }
+    },
+    PARAM("/param") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String value = rc.request().getParam("param");
+            rc.response().end("Received " + value);
+        }
+    },
+    PARAMS("/params") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final MultiMap value = rc.request().params();
+            rc.response().end("Received " + value.get("param"));
+        }
+    },
+    PARAM_NAMES("/paramnames") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final Collection<String> names = rc.request().params().names();
+            rc.response().end("Received " + String.join(",", names));
+        }
+    },
+    FORM_ATTRIBUTE("/form_attribute") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String value = rc.request().getFormAttribute("formAttribute");
+            rc.response().end("Received " + value);
+        }
+    },
+    PATH_PARAM("/path/:name") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String value = rc.pathParam("name");
+            rc.response().end("Received " + value);
+        }
+    },
+    COOKIE("/cookie") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final Cookie cookie = rc.getCookie("name");
+            rc.response().end("Received " + cookie.getName() + " " + cookie.getValue());
+        }
+    },
+    BODY_STRING("/body/string") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String encoding = rc.request().getParam("encoding");
+            if (encoding != null) {
+                rc.response().end("Received " + rc.getBodyAsString(encoding));
+            } else {
+                rc.response().end("Received " + rc.getBodyAsString());
+            }
+        }
+    },
+    BODY_JSON("/body/json") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            rc.response().end("Received " + rc.getBodyAsJson());
+        }
+    },
+    BODY_JSON_ARRAY("/body/jsonArray") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            rc.response().end("Received " + rc.getBodyAsJsonArray());
+        }
+    },
+    INSECURE_COOKIE("/insecurecookie") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            rc.response().addCookie(Cookie.cookie("userA-id", "7")).end("Received ");
+        }
+    },
+    INSECURE_COOKIE_HEADER("/insecurecookieheader") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            rc.response().putHeader("Set-Cookie", "user-id=7").end("Received ");
+        }
+    },
+    INSECURE_COOKIE_HEADER2("/insecurecookieheader2") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            Vector<String> values = new Vector<>();
+            values.add("firstcookie=b");
+            values.add("user-id=7");
+            rc.response().putHeader("Set-cookie", values).end("Received ");
+        }
+    },
+    UNVALIDATED_REDIRECT_REROUTE1("/unvaidatedredirectreroute1") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String path = rc.request().getParam("path");
+            rc.reroute(path);
+        }
+    },
+    UNVALIDATED_REDIRECT_REROUTE2("/unvaidatedredirectreroute2") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String path = rc.request().getParam("path");
+            rc.reroute(HttpMethod.GET, path);
+        }
+    },
+    UNVALIDATED_REDIRECT_HEADER("/unvaidatedredirectheader") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String name = rc.request().getParam("name");
+            final String value = rc.request().getParam("value");
+            rc.response().putHeader(name, value).end("Redirected ");
+        }
+    },
+    EVENT_BUS("/eventBus") {
+        @Override
+        public void init(final Vertx vertx) {
+            vertx.eventBus().consumer(name(), message -> {
                 final JsonObject payload = (JsonObject) message.body();
                 final String response = payload.getString("name").toUpperCase();
                 message.reply(response);
-              });
-    }
+            });
+        }
 
-    @Override
-    public void handle(final RoutingContext rc) {
-      final JsonObject target = rc.getBodyAsJson();
-      rc.vertx()
-          .eventBus()
-          .request(
-              name(),
-              target,
-              reply -> {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final JsonObject target = rc.getBodyAsJson();
+            rc.vertx().eventBus().request(name(), target, reply -> {
                 if (reply.succeeded()) {
-                  rc.response().end("Received " + reply.result().body());
+                    rc.response().end("Received " + reply.result().body());
                 } else {
-                  rc.fail(reply.cause());
+                    rc.fail(reply.cause());
                 }
-              });
-    }
-  };
+            });
+        }
+    };
 
-  public final String path;
+    public final String path;
 
-  IastHandler(final String path) {
-    this.path = path;
-  }
+    IastHandler(final String path) {
+        this.path = path;
+    }
 
-  public void init(final Vertx vertx) {}
+    public void init(final Vertx vertx) {}
 
-  public static Optional<Handler<RoutingContext>> handlerFor(final String path) {
-    return Arrays.stream(IastHandler.values())
-        .filter(handler -> path.startsWith(handler.path))
-        .map(handler -> (Handler<RoutingContext>) handler)
-        .findFirst();
-  }
+    public static Optional<Handler<RoutingContext>> handlerFor(final String path) {
+        return Arrays.stream(IastHandler.values())
+                .filter(handler -> path.startsWith(handler.path))
+                .map(handler -> (Handler<RoutingContext>) handler)
+                .findFirst();
+    }
 }
diff --git a/dd-smoke-tests/vertx-3.9/application/src/main/java/datadog/vertx_3_9/IastVerticle.java b/dd-smoke-tests/vertx-3.9/application/src/main/java/datadog/vertx_3_9/IastVerticle.java
index 2942c43e07d..d22e78cbe43 100644
--- a/dd-smoke-tests/vertx-3.9/application/src/main/java/datadog/vertx_3_9/IastVerticle.java
+++ b/dd-smoke-tests/vertx-3.9/application/src/main/java/datadog/vertx_3_9/IastVerticle.java
@@ -12,38 +12,30 @@
 
 public class IastVerticle extends AbstractVerticle {
 
-  public static void main(String[] args) {
-    final VertxOptions options =
-        new VertxOptions()
-            .setEventLoopPoolSize(1)
-            .setWorkerPoolSize(2)
-            .setInternalBlockingPoolSize(1);
-    final Vertx vertx = Vertx.vertx(options);
-    vertx.deployVerticle(new IastVerticle());
-  }
+    public static void main(String[] args) {
+        final VertxOptions options =
+                new VertxOptions().setEventLoopPoolSize(1).setWorkerPoolSize(2).setInternalBlockingPoolSize(1);
+        final Vertx vertx = Vertx.vertx(options);
+        vertx.deployVerticle(new IastVerticle());
+    }
 
-  @Override
-  public void start(final Promise<Void> startPromise) {
-    final Router router = Router.router(vertx);
-    router.route().handler(BodyHandler.create());
-    Arrays.stream(IastHandler.values())
-        .forEach(
-            handler -> {
-              handler.init(vertx);
-              router.route(handler.path).handler(handler);
-            });
-    vertx
-        .createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
-        .requestHandler(router)
-        .listen(
-            Integer.getInteger("vertx.http.port", 8080),
-            http -> {
-              if (http.succeeded()) {
-                startPromise.complete();
-                System.out.println("HTTP server started");
-              } else {
-                startPromise.fail(http.cause());
-              }
-            });
-  }
+    @Override
+    public void start(final Promise<Void> startPromise) {
+        final Router router = Router.router(vertx);
+        router.route().handler(BodyHandler.create());
+        Arrays.stream(IastHandler.values()).forEach(handler -> {
+            handler.init(vertx);
+            router.route(handler.path).handler(handler);
+        });
+        vertx.createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
+                .requestHandler(router)
+                .listen(Integer.getInteger("vertx.http.port", 8080), http -> {
+                    if (http.succeeded()) {
+                        startPromise.complete();
+                        System.out.println("HTTP server started");
+                    } else {
+                        startPromise.fail(http.cause());
+                    }
+                });
+    }
 }
diff --git a/dd-smoke-tests/vertx-3.9/application/src/main/java/datadog/vertx_3_9/MainVerticle.java b/dd-smoke-tests/vertx-3.9/application/src/main/java/datadog/vertx_3_9/MainVerticle.java
index fcc3ca02653..3b22025092e 100644
--- a/dd-smoke-tests/vertx-3.9/application/src/main/java/datadog/vertx_3_9/MainVerticle.java
+++ b/dd-smoke-tests/vertx-3.9/application/src/main/java/datadog/vertx_3_9/MainVerticle.java
@@ -11,59 +11,52 @@
 
 public class MainVerticle extends AbstractVerticle {
 
-  public static void main(String[] args) throws Exception {
-    VertxOptions options = new VertxOptions();
-    options.setEventLoopPoolSize(1);
-    options.setWorkerPoolSize(2);
-    options.setInternalBlockingPoolSize(1);
+    public static void main(String[] args) throws Exception {
+        VertxOptions options = new VertxOptions();
+        options.setEventLoopPoolSize(1);
+        options.setWorkerPoolSize(2);
+        options.setInternalBlockingPoolSize(1);
 
-    Vertx vertx = Vertx.vertx(options);
-    MainVerticle verticle = new MainVerticle();
-    vertx.deployVerticle(verticle);
-  }
+        Vertx vertx = Vertx.vertx(options);
+        MainVerticle verticle = new MainVerticle();
+        vertx.deployVerticle(verticle);
+    }
 
-  static BigInteger randomFactorial() {
-    int n = ThreadLocalRandom.current().nextInt(5, 100);
-    BigInteger factorial = BigInteger.ONE;
-    for (int i = 1; i <= n; i++) {
-      factorial = factorial.multiply(BigInteger.valueOf(i));
+    static BigInteger randomFactorial() {
+        int n = ThreadLocalRandom.current().nextInt(5, 100);
+        BigInteger factorial = BigInteger.ONE;
+        for (int i = 1; i <= n; i++) {
+            factorial = factorial.multiply(BigInteger.valueOf(i));
+        }
+        return factorial;
     }
-    return factorial;
-  }
 
-  @Override
-  public void start(Promise<Void> startPromise) throws Exception {
-    Router router = Router.router(vertx);
-    router
-        .route("/routes")
-        .handler(
-            ctx ->
-                ctx.response()
-                    .setStatusCode(200)
-                    .putHeader("content-type", "text/plain")
-                    .end(randomFactorial().toString()));
+    @Override
+    public void start(Promise<Void> startPromise) throws Exception {
+        Router router = Router.router(vertx);
+        router.route("/routes")
+                .handler(ctx -> ctx.response()
+                        .setStatusCode(200)
+                        .putHeader("content-type", "text/plain")
+                        .end(randomFactorial().toString()));
 
-    vertx
-        .createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
-        .requestHandler(
-            req -> {
-              if (req.path().startsWith("/routes")) {
-                router.handle(req);
-              } else {
-                req.response()
-                    .putHeader("content-type", "text/plain")
-                    .end(randomFactorial().toString());
-              }
-            })
-        .listen(
-            Integer.getInteger("vertx.http.port", 8080),
-            http -> {
-              if (http.succeeded()) {
-                startPromise.complete();
-                System.out.println("HTTP server started");
-              } else {
-                startPromise.fail(http.cause());
-              }
-            });
-  }
+        vertx.createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
+                .requestHandler(req -> {
+                    if (req.path().startsWith("/routes")) {
+                        router.handle(req);
+                    } else {
+                        req.response()
+                                .putHeader("content-type", "text/plain")
+                                .end(randomFactorial().toString());
+                    }
+                })
+                .listen(Integer.getInteger("vertx.http.port", 8080), http -> {
+                    if (http.succeeded()) {
+                        startPromise.complete();
+                        System.out.println("HTTP server started");
+                    } else {
+                        startPromise.fail(http.cause());
+                    }
+                });
+    }
 }
diff --git a/dd-smoke-tests/vertx-4.2/application/src/main/java/datadog/smoketest/vertx_4_2/IastHandler.java b/dd-smoke-tests/vertx-4.2/application/src/main/java/datadog/smoketest/vertx_4_2/IastHandler.java
index 13ef2a064ea..cfa3fbba821 100644
--- a/dd-smoke-tests/vertx-4.2/application/src/main/java/datadog/smoketest/vertx_4_2/IastHandler.java
+++ b/dd-smoke-tests/vertx-4.2/application/src/main/java/datadog/smoketest/vertx_4_2/IastHandler.java
@@ -15,199 +15,188 @@
 
 /** The datadog.smoketest package is needed so the class is instrumented */
 public enum IastHandler implements Handler<RoutingContext> {
-  HEADER("/header") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String value = rc.request().getHeader("header");
-      rc.response().end("Received " + value);
-    }
-  },
-  HEADERS("/headers") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final MultiMap value = rc.request().headers();
-      rc.response().end("Received " + value.get("header"));
-    }
-  },
-  HEADER_NAMES("/headernames") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final Collection<String> names = rc.request().headers().names();
-      rc.response().end("Received " + String.join(",", names));
-    }
-  },
-  PARAM("/param") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String value = rc.request().getParam("param");
-      rc.response().end("Received " + value);
-    }
-  },
-  PARAMS("/params") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final MultiMap value = rc.request().params();
-      rc.response().end("Received " + value.get("param"));
-    }
-  },
-  PARAM_NAMES("/paramnames") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final Collection<String> names = rc.request().params().names();
-      rc.response().end("Received " + String.join(",", names));
-    }
-  },
-  FORM_ATTRIBUTE("/form_attribute") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String value = rc.request().getFormAttribute("formAttribute");
-      rc.response().end("Received " + value);
-    }
-  },
-  PATH_PARAM("/path/:name") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String value = rc.pathParam("name");
-      rc.response().end("Received " + value);
-    }
-  },
-  COOKIE("/cookie") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final Cookie cookie = rc.getCookie("name");
-      rc.response().end("Received " + cookie.getName() + " " + cookie.getValue());
-    }
-  },
-  BODY_STRING("/body/string") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String encoding = rc.request().getParam("encoding");
-      if (encoding != null) {
-        rc.response().end("Received " + rc.getBodyAsString(encoding));
-      } else {
-        rc.response().end("Received " + rc.getBodyAsString());
-      }
-    }
-  },
-  BODY_JSON("/body/json") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      rc.response().end("Received " + rc.getBodyAsJson());
-    }
-  },
-  BODY_JSON_ARRAY("/body/jsonArray") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      rc.response().end("Received " + rc.getBodyAsJsonArray());
-    }
-  },
-  INSECURE_COOKIE("/insecurecookie") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      rc.response().addCookie(Cookie.cookie("userA-id", "7")).end("Received ");
-    }
-  },
-  INSECURE_COOKIE_HEADER("/insecurecookieheader") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      rc.response().putHeader("Set-Cookie", "user-id=7").end("Received ");
-    }
-  },
-  INSECURE_COOKIE_HEADER2("/insecurecookieheader2") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      Vector<String> values = new Vector<>();
-      values.add("firstcookie=b");
-      values.add("user-id=7");
-      rc.response().putHeader("Set-cookie", values).end("Received ");
-    }
-  },
-  UNVALIDATED_REDIRECT_REROUTE1("/unvaidatedredirectreroute1") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String path = rc.request().getParam("path");
-      rc.reroute(path);
-    }
-  },
-  UNVALIDATED_REDIRECT_REROUTE2("/unvaidatedredirectreroute2") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String path = rc.request().getParam("path");
-      rc.reroute(HttpMethod.GET, path);
-    }
-  },
-  UNVALIDATED_REDIRECT_HEADER("/unvaidatedredirectheader") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String name = rc.request().getParam("name");
-      final String value = rc.request().getParam("value");
-      rc.response().putHeader(name, value).end("Redirected ");
-    }
-  },
-  UNVALIDATED_REDIRECT1("/unvalidatedredirect1") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String path = rc.request().getParam("path");
-      rc.redirect(path);
-    }
-  },
-  UNVALIDATED_REDIRECT2("/unvalidatedredirect2") {
-    @Override
-    public void handle(final RoutingContext rc) {
-      final String path = rc.request().getParam("path");
-      rc.redirect(
-          path,
-          new Handler<AsyncResult<Void>>() {
-            public void handle(AsyncResult<Void> ar) {
-              // Nothing to do
+    HEADER("/header") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String value = rc.request().getHeader("header");
+            rc.response().end("Received " + value);
+        }
+    },
+    HEADERS("/headers") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final MultiMap value = rc.request().headers();
+            rc.response().end("Received " + value.get("header"));
+        }
+    },
+    HEADER_NAMES("/headernames") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final Collection<String> names = rc.request().headers().names();
+            rc.response().end("Received " + String.join(",", names));
+        }
+    },
+    PARAM("/param") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String value = rc.request().getParam("param");
+            rc.response().end("Received " + value);
+        }
+    },
+    PARAMS("/params") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final MultiMap value = rc.request().params();
+            rc.response().end("Received " + value.get("param"));
+        }
+    },
+    PARAM_NAMES("/paramnames") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final Collection<String> names = rc.request().params().names();
+            rc.response().end("Received " + String.join(",", names));
+        }
+    },
+    FORM_ATTRIBUTE("/form_attribute") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String value = rc.request().getFormAttribute("formAttribute");
+            rc.response().end("Received " + value);
+        }
+    },
+    PATH_PARAM("/path/:name") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String value = rc.pathParam("name");
+            rc.response().end("Received " + value);
+        }
+    },
+    COOKIE("/cookie") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final Cookie cookie = rc.getCookie("name");
+            rc.response().end("Received " + cookie.getName() + " " + cookie.getValue());
+        }
+    },
+    BODY_STRING("/body/string") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String encoding = rc.request().getParam("encoding");
+            if (encoding != null) {
+                rc.response().end("Received " + rc.getBodyAsString(encoding));
+            } else {
+                rc.response().end("Received " + rc.getBodyAsString());
             }
-          });
-    }
-  },
-  EVENT_BUS("/eventBus") {
-    @Override
-    public void init(final Vertx vertx) {
-      vertx
-          .eventBus()
-          .consumer(
-              name(),
-              message -> {
+        }
+    },
+    BODY_JSON("/body/json") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            rc.response().end("Received " + rc.getBodyAsJson());
+        }
+    },
+    BODY_JSON_ARRAY("/body/jsonArray") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            rc.response().end("Received " + rc.getBodyAsJsonArray());
+        }
+    },
+    INSECURE_COOKIE("/insecurecookie") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            rc.response().addCookie(Cookie.cookie("userA-id", "7")).end("Received ");
+        }
+    },
+    INSECURE_COOKIE_HEADER("/insecurecookieheader") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            rc.response().putHeader("Set-Cookie", "user-id=7").end("Received ");
+        }
+    },
+    INSECURE_COOKIE_HEADER2("/insecurecookieheader2") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            Vector<String> values = new Vector<>();
+            values.add("firstcookie=b");
+            values.add("user-id=7");
+            rc.response().putHeader("Set-cookie", values).end("Received ");
+        }
+    },
+    UNVALIDATED_REDIRECT_REROUTE1("/unvaidatedredirectreroute1") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String path = rc.request().getParam("path");
+            rc.reroute(path);
+        }
+    },
+    UNVALIDATED_REDIRECT_REROUTE2("/unvaidatedredirectreroute2") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String path = rc.request().getParam("path");
+            rc.reroute(HttpMethod.GET, path);
+        }
+    },
+    UNVALIDATED_REDIRECT_HEADER("/unvaidatedredirectheader") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String name = rc.request().getParam("name");
+            final String value = rc.request().getParam("value");
+            rc.response().putHeader(name, value).end("Redirected ");
+        }
+    },
+    UNVALIDATED_REDIRECT1("/unvalidatedredirect1") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String path = rc.request().getParam("path");
+            rc.redirect(path);
+        }
+    },
+    UNVALIDATED_REDIRECT2("/unvalidatedredirect2") {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final String path = rc.request().getParam("path");
+            rc.redirect(path, new Handler<AsyncResult<Void>>() {
+                public void handle(AsyncResult<Void> ar) {
+                    // Nothing to do
+                }
+            });
+        }
+    },
+    EVENT_BUS("/eventBus") {
+        @Override
+        public void init(final Vertx vertx) {
+            vertx.eventBus().consumer(name(), message -> {
                 final JsonObject payload = (JsonObject) message.body();
                 final String response = payload.getString("name").toUpperCase();
                 message.reply(response);
-              });
-    }
+            });
+        }
 
-    @Override
-    public void handle(final RoutingContext rc) {
-      final JsonObject target = rc.getBodyAsJson();
-      rc.vertx()
-          .eventBus()
-          .request(
-              name(),
-              target,
-              reply -> {
+        @Override
+        public void handle(final RoutingContext rc) {
+            final JsonObject target = rc.getBodyAsJson();
+            rc.vertx().eventBus().request(name(), target, reply -> {
                 if (reply.succeeded()) {
-                  rc.response().end("Received " + reply.result().body());
+                    rc.response().end("Received " + reply.result().body());
                 } else {
-                  rc.fail(reply.cause());
+                    rc.fail(reply.cause());
                 }
-              });
-    }
-  };
+            });
+        }
+    };
 
-  public final String path;
+    public final String path;
 
-  IastHandler(final String path) {
-    this.path = path;
-  }
+    IastHandler(final String path) {
+        this.path = path;
+    }
 
-  public void init(final Vertx vertx) {}
+    public void init(final Vertx vertx) {}
 
-  public static Optional<Handler<RoutingContext>> handlerFor(final String path) {
-    return Arrays.stream(IastHandler.values())
-        .filter(handler -> path.startsWith(handler.path))
-        .map(handler -> (Handler<RoutingContext>) handler)
-        .findFirst();
-  }
+    public static Optional<Handler<RoutingContext>> handlerFor(final String path) {
+        return Arrays.stream(IastHandler.values())
+                .filter(handler -> path.startsWith(handler.path))
+                .map(handler -> (Handler<RoutingContext>) handler)
+                .findFirst();
+    }
 }
diff --git a/dd-smoke-tests/vertx-4.2/application/src/main/java/datadog/vertx_4_2/IastVerticle.java b/dd-smoke-tests/vertx-4.2/application/src/main/java/datadog/vertx_4_2/IastVerticle.java
index 1527bd08f67..ff507f52824 100644
--- a/dd-smoke-tests/vertx-4.2/application/src/main/java/datadog/vertx_4_2/IastVerticle.java
+++ b/dd-smoke-tests/vertx-4.2/application/src/main/java/datadog/vertx_4_2/IastVerticle.java
@@ -12,38 +12,30 @@
 
 public class IastVerticle extends AbstractVerticle {
 
-  public static void main(String[] args) {
-    final VertxOptions options =
-        new VertxOptions()
-            .setEventLoopPoolSize(1)
-            .setWorkerPoolSize(2)
-            .setInternalBlockingPoolSize(1);
-    final Vertx vertx = Vertx.vertx(options);
-    vertx.deployVerticle(new IastVerticle());
-  }
+    public static void main(String[] args) {
+        final VertxOptions options =
+                new VertxOptions().setEventLoopPoolSize(1).setWorkerPoolSize(2).setInternalBlockingPoolSize(1);
+        final Vertx vertx = Vertx.vertx(options);
+        vertx.deployVerticle(new IastVerticle());
+    }
 
-  @Override
-  public void start(final Promise<Void> startPromise) {
-    final Router router = Router.router(vertx);
-    router.route().handler(BodyHandler.create());
-    Arrays.stream(IastHandler.values())
-        .forEach(
-            handler -> {
-              handler.init(vertx);
-              router.route(handler.path).handler(handler);
-            });
-    vertx
-        .createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
-        .requestHandler(router)
-        .listen(
-            Integer.getInteger("vertx.http.port", 8080),
-            http -> {
-              if (http.succeeded()) {
-                startPromise.complete();
-                System.out.println("HTTP server started");
-              } else {
-                startPromise.fail(http.cause());
-              }
-            });
-  }
+    @Override
+    public void start(final Promise<Void> startPromise) {
+        final Router router = Router.router(vertx);
+        router.route().handler(BodyHandler.create());
+        Arrays.stream(IastHandler.values()).forEach(handler -> {
+            handler.init(vertx);
+            router.route(handler.path).handler(handler);
+        });
+        vertx.createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
+                .requestHandler(router)
+                .listen(Integer.getInteger("vertx.http.port", 8080), http -> {
+                    if (http.succeeded()) {
+                        startPromise.complete();
+                        System.out.println("HTTP server started");
+                    } else {
+                        startPromise.fail(http.cause());
+                    }
+                });
+    }
 }
diff --git a/dd-smoke-tests/vertx-4.2/application/src/main/java/datadog/vertx_4_2/MainVerticle.java b/dd-smoke-tests/vertx-4.2/application/src/main/java/datadog/vertx_4_2/MainVerticle.java
index 391a743f08f..f1c70b59019 100644
--- a/dd-smoke-tests/vertx-4.2/application/src/main/java/datadog/vertx_4_2/MainVerticle.java
+++ b/dd-smoke-tests/vertx-4.2/application/src/main/java/datadog/vertx_4_2/MainVerticle.java
@@ -12,76 +12,63 @@
 
 public class MainVerticle extends AbstractVerticle {
 
-  public static void main(String[] args) throws Exception {
-    VertxOptions options = new VertxOptions();
-    options.setEventLoopPoolSize(1);
-    options.setWorkerPoolSize(2);
-    options.setInternalBlockingPoolSize(1);
+    public static void main(String[] args) throws Exception {
+        VertxOptions options = new VertxOptions();
+        options.setEventLoopPoolSize(1);
+        options.setWorkerPoolSize(2);
+        options.setInternalBlockingPoolSize(1);
 
-    Vertx vertx = Vertx.vertx(options);
-    MainVerticle verticle = new MainVerticle();
-    vertx.deployVerticle(verticle);
-  }
+        Vertx vertx = Vertx.vertx(options);
+        MainVerticle verticle = new MainVerticle();
+        vertx.deployVerticle(verticle);
+    }
 
-  static BigInteger randomFactorial() {
-    int n = ThreadLocalRandom.current().nextInt(5, 100);
-    BigInteger factorial = BigInteger.ONE;
-    for (int i = 1; i <= n; i++) {
-      factorial = factorial.multiply(BigInteger.valueOf(i));
+    static BigInteger randomFactorial() {
+        int n = ThreadLocalRandom.current().nextInt(5, 100);
+        BigInteger factorial = BigInteger.ONE;
+        for (int i = 1; i <= n; i++) {
+            factorial = factorial.multiply(BigInteger.valueOf(i));
+        }
+        return factorial;
     }
-    return factorial;
-  }
 
-  @Override
-  public void start(Promise<Void> startPromise) throws Exception {
-    Router router = Router.router(vertx);
-    router
-        .route("/routes")
-        .handler(
-            ctx ->
-                ctx.response()
-                    .setStatusCode(200)
-                    .putHeader("content-type", "text/plain")
-                    .end(randomFactorial().toString()));
+    @Override
+    public void start(Promise<Void> startPromise) throws Exception {
+        Router router = Router.router(vertx);
+        router.route("/routes")
+                .handler(ctx -> ctx.response()
+                        .setStatusCode(200)
+                        .putHeader("content-type", "text/plain")
+                        .end(randomFactorial().toString()));
 
-    router
-        .route("/api_security/sampling/:status_code")
-        .handler(
-            ctx ->
-                ctx.response()
-                    .setStatusCode(Integer.parseInt(ctx.request().getParam("status_code")))
-                    .end("EXECUTED"));
+        router.route("/api_security/sampling/:status_code")
+                .handler(ctx -> ctx.response()
+                        .setStatusCode(Integer.parseInt(ctx.request().getParam("status_code")))
+                        .end("EXECUTED"));
 
-    router.route("/api_security/response").handler(BodyHandler.create());
-    router
-        .route("/api_security/response")
-        .handler(
-            ctx -> {
-              ctx.response().setStatusCode(200);
-              ctx.json(ctx.getBodyAsJson());
-            });
+        router.route("/api_security/response").handler(BodyHandler.create());
+        router.route("/api_security/response").handler(ctx -> {
+            ctx.response().setStatusCode(200);
+            ctx.json(ctx.getBodyAsJson());
+        });
 
-    vertx
-        .createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
-        .requestHandler(
-            req -> {
-              if (req.path().startsWith("/routes") || req.path().startsWith("/api_security")) {
-                router.handle(req);
-              } else {
-                req.response()
-                    .putHeader("content-type", "text/plain")
-                    .end(randomFactorial().toString());
-              }
-            })
-        .listen(
-            Integer.getInteger("vertx.http.port", 8080),
-            http -> {
-              if (http.succeeded()) {
-                startPromise.complete();
-                System.out.println("HTTP server started");
-              } else {
-                startPromise.fail(http.cause());
-              }
-            });
-  }
+        vertx.createHttpServer(new HttpServerOptions().setHandle100ContinueAutomatically(true))
+                .requestHandler(req -> {
+                    if (req.path().startsWith("/routes") || req.path().startsWith("/api_security")) {
+                        router.handle(req);
+                    } else {
+                        req.response()
+                                .putHeader("content-type", "text/plain")
+                                .end(randomFactorial().toString());
+                    }
+                })
+                .listen(Integer.getInteger("vertx.http.port", 8080), http -> {
+                    if (http.succeeded()) {
+                        startPromise.complete();
+                        System.out.println("HTTP server started");
+                    } else {
+                        startPromise.fail(http.cause());
+                    }
+                });
+    }
 }
diff --git a/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/Common.java b/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/Common.java
index d51fcf5a5d0..f1b841c49c3 100644
--- a/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/Common.java
+++ b/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/Common.java
@@ -3,6 +3,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class Common {
-  // for the sake of this example it avoids boilerplate ton inject an ejb into a spring context
-  public static final AtomicBoolean TRACE_REQUEST_PENDING = new AtomicBoolean(false);
+    // for the sake of this example it avoids boilerplate ton inject an ejb into a spring context
+    public static final AtomicBoolean TRACE_REQUEST_PENDING = new AtomicBoolean(false);
 }
diff --git a/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/ejb/ScheduledEjb.java b/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/ejb/ScheduledEjb.java
index 323e6adde40..e84932d36db 100644
--- a/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/ejb/ScheduledEjb.java
+++ b/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/ejb/ScheduledEjb.java
@@ -9,15 +9,15 @@
 @Stateless
 public class ScheduledEjb {
 
-  @Schedule(second = "*/1", minute = "*", hour = "*")
-  public void runIt() {
-    if (TRACE_REQUEST_PENDING.getAndSet(false)) {
-      generateSomeTrace();
+    @Schedule(second = "*/1", minute = "*", hour = "*")
+    public void runIt() {
+        if (TRACE_REQUEST_PENDING.getAndSet(false)) {
+            generateSomeTrace();
+        }
     }
-  }
 
-  @Trace
-  private void generateSomeTrace() {
-    // empty
-  }
+    @Trace
+    private void generateSomeTrace() {
+        // empty
+    }
 }
diff --git a/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/hello/HelloController.java b/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/hello/HelloController.java
index e10f9a39982..ee0d45af5ee 100644
--- a/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/hello/HelloController.java
+++ b/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/hello/HelloController.java
@@ -10,26 +10,25 @@
 @RestController
 public class HelloController {
 
-  @RequestMapping("/hello")
-  public String hello() {
-    return "hello world";
-  }
+    @RequestMapping("/hello")
+    public String hello() {
+        return "hello world";
+    }
 
-  @RequestMapping("/enableScheduling")
-  public CompletableFuture<ResponseEntity<Void>> enableScheduling() {
-    TRACE_REQUEST_PENDING.set(true);
-    return CompletableFuture.supplyAsync(
-        () -> {
-          // Wait until the scheduled task picks up the request.
-          while (TRACE_REQUEST_PENDING.get()) {
-            try {
-              Thread.sleep(200);
-            } catch (InterruptedException e) {
-              Thread.currentThread().interrupt();
-              break;
+    @RequestMapping("/enableScheduling")
+    public CompletableFuture<ResponseEntity<Void>> enableScheduling() {
+        TRACE_REQUEST_PENDING.set(true);
+        return CompletableFuture.supplyAsync(() -> {
+            // Wait until the scheduled task picks up the request.
+            while (TRACE_REQUEST_PENDING.get()) {
+                try {
+                    Thread.sleep(200);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    break;
+                }
             }
-          }
-          return ResponseEntity.ok().build();
+            return ResponseEntity.ok().build();
         });
-  }
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/appsec/api/blocking/Blocking.java b/dd-trace-api/src/main/java/datadog/appsec/api/blocking/Blocking.java
index c902ce83582..6ece7fd493c 100644
--- a/dd-trace-api/src/main/java/datadog/appsec/api/blocking/Blocking.java
+++ b/dd-trace-api/src/main/java/datadog/appsec/api/blocking/Blocking.java
@@ -8,124 +8,121 @@
  * AppSec subsystem is enabled.
  */
 public class Blocking {
-  private static volatile BlockingService SERVICE = BlockingService.NOOP;
+    private static volatile BlockingService SERVICE = BlockingService.NOOP;
 
-  private Blocking() {}
+    private Blocking() {}
 
-  /**
-   * Starts a user-blocking action.
-   *
-   * @param userId a non-null unique identifier for the currently identified user
-   * @return an object through which the action in case of a match can be controlled
-   */
-  public static UserBlockingSpec forUser(String userId) {
-    if (userId == null) {
-      throw new NullPointerException("userId cannot be null");
-    }
-    if (SERVICE == null) {
-      throw new IllegalStateException("Blocking service is not available. Is AppSec disabled?");
-    }
-    return new UserBlockingSpec(userId);
-  }
-
-  /**
-   * Tries to commit an HTTP response with the specified status code and content type. No exception
-   * should escape if this fails.
-   *
-   * <p>This method returns <code>false</code> if blocking cannot be attempted because of the
-   * following conditions:
-   *
-   * <ul>
-   *   <li>there is no span available,
-   *   <li>blocking is not supported for the server being used, or
-   *   <li>the blocking service is otherwise incapable, in principle, of blocking (e.g. it's a no-op
-   *       implementation).
-   * </ul>
-   *
-   * <p>This method does not return false if a blocking response has already been committed, or if
-   * there is an error when trying to write the response. This is because the writing may happen
-   * asynchronously, after the caller has returned.
-   *
-   * @param statusCode the status code of the response
-   * @param contentType the content-type of the response.
-   * @param extraHeaders map of headers to set in the response
-   * @return whether blocking was/will be attempted
-   */
-  public static boolean tryCommitBlockingResponse(
-      int statusCode, BlockingContentType contentType, Map<String, String> extraHeaders) {
-    try {
-      return SERVICE.tryCommitBlockingResponse(statusCode, contentType, extraHeaders);
-    } catch (Exception e) {
-      return false;
-    }
-  }
-
-  /**
-   * Equivalent to calling {@link #tryCommitBlockingResponse(int, BlockingContentType, Map)} with
-   * the last parameter being an empty map.
-   *
-   * @param statusCode the status code of the response
-   * @param contentType the content-type of the response.
-   * @return whether blocking was/will be attempted
-   */
-  public static boolean tryCommitBlockingResponse(int statusCode, BlockingContentType contentType) {
-    try {
-      boolean committedBlockingResponse =
-          SERVICE.tryCommitBlockingResponse(
-              statusCode, BlockingContentType.NONE, Collections.emptyMap());
-      return committedBlockingResponse;
-    } catch (Exception e) {
-      return false;
+    /**
+     * Starts a user-blocking action.
+     *
+     * @param userId a non-null unique identifier for the currently identified user
+     * @return an object through which the action in case of a match can be controlled
+     */
+    public static UserBlockingSpec forUser(String userId) {
+        if (userId == null) {
+            throw new NullPointerException("userId cannot be null");
+        }
+        if (SERVICE == null) {
+            throw new IllegalStateException("Blocking service is not available. Is AppSec disabled?");
+        }
+        return new UserBlockingSpec(userId);
     }
-  }
-
-  /**
-   * Controls the implementation for blocking. The AppSec subsystem calls this method on startup.
-   * This can be called explicitly for e.g. testing purposes.
-   *
-   * @param service the implementation for blocking.
-   */
-  public static void setBlockingService(BlockingService service) {
-    Blocking.SERVICE = service;
-  }
-
-  public static class UserBlockingSpec {
-    private final String userId;
 
-    private UserBlockingSpec(String userId) {
-      this.userId = userId;
+    /**
+     * Tries to commit an HTTP response with the specified status code and content type. No exception
+     * should escape if this fails.
+     *
+     * <p>This method returns <code>false</code> if blocking cannot be attempted because of the
+     * following conditions:
+     *
+     * <ul>
+     *   <li>there is no span available,
+     *   <li>blocking is not supported for the server being used, or
+     *   <li>the blocking service is otherwise incapable, in principle, of blocking (e.g. it's a no-op
+     *       implementation).
+     * </ul>
+     *
+     * <p>This method does not return false if a blocking response has already been committed, or if
+     * there is an error when trying to write the response. This is because the writing may happen
+     * asynchronously, after the caller has returned.
+     *
+     * @param statusCode the status code of the response
+     * @param contentType the content-type of the response.
+     * @param extraHeaders map of headers to set in the response
+     * @return whether blocking was/will be attempted
+     */
+    public static boolean tryCommitBlockingResponse(
+            int statusCode, BlockingContentType contentType, Map<String, String> extraHeaders) {
+        try {
+            return SERVICE.tryCommitBlockingResponse(statusCode, contentType, extraHeaders);
+        } catch (Exception e) {
+            return false;
+        }
     }
 
     /**
-     * Whether the user in question should be blocked, and, if so, the details of the blocking
-     * response
+     * Equivalent to calling {@link #tryCommitBlockingResponse(int, BlockingContentType, Map)} with
+     * the last parameter being an empty map.
      *
-     * @return the details of the blocking response, or null if the user is not to be blocked
+     * @param statusCode the status code of the response
+     * @param contentType the content-type of the response.
+     * @return whether blocking was/will be attempted
      */
-    public BlockingDetails shouldBlock() {
-      return SERVICE.shouldBlockUser(userId);
+    public static boolean tryCommitBlockingResponse(int statusCode, BlockingContentType contentType) {
+        try {
+            boolean committedBlockingResponse =
+                    SERVICE.tryCommitBlockingResponse(statusCode, BlockingContentType.NONE, Collections.emptyMap());
+            return committedBlockingResponse;
+        } catch (Exception e) {
+            return false;
+        }
     }
 
     /**
-     * Convenience method that:
+     * Controls the implementation for blocking. The AppSec subsystem calls this method on startup.
+     * This can be called explicitly for e.g. testing purposes.
      *
-     * <ul>
-     *   <li>calls {@link #shouldBlock()}, and, if the result is non-null
-     *   <li>calls {@link #tryCommitBlockingResponse(int, BlockingContentType)}, and
-     *   <li>throws an exception of the type {@link BlockingException}
-     * </ul>
+     * @param service the implementation for blocking.
      */
-    public void blockIfMatch() {
-      BlockingDetails blockingDetails = shouldBlock();
-      if (blockingDetails == null) {
-        return;
-      }
+    public static void setBlockingService(BlockingService service) {
+        Blocking.SERVICE = service;
+    }
+
+    public static class UserBlockingSpec {
+        private final String userId;
+
+        private UserBlockingSpec(String userId) {
+            this.userId = userId;
+        }
+
+        /**
+         * Whether the user in question should be blocked, and, if so, the details of the blocking
+         * response
+         *
+         * @return the details of the blocking response, or null if the user is not to be blocked
+         */
+        public BlockingDetails shouldBlock() {
+            return SERVICE.shouldBlockUser(userId);
+        }
+
+        /**
+         * Convenience method that:
+         *
+         * <ul>
+         *   <li>calls {@link #shouldBlock()}, and, if the result is non-null
+         *   <li>calls {@link #tryCommitBlockingResponse(int, BlockingContentType)}, and
+         *   <li>throws an exception of the type {@link BlockingException}
+         * </ul>
+         */
+        public void blockIfMatch() {
+            BlockingDetails blockingDetails = shouldBlock();
+            if (blockingDetails == null) {
+                return;
+            }
 
-      SERVICE.tryCommitBlockingResponse(
-          blockingDetails.statusCode,
-          blockingDetails.blockingContentType,
-          blockingDetails.extraHeaders);
-      throw new BlockingException("Blocking user with id '" + userId + "'");
+            SERVICE.tryCommitBlockingResponse(
+                    blockingDetails.statusCode, blockingDetails.blockingContentType, blockingDetails.extraHeaders);
+            throw new BlockingException("Blocking user with id '" + userId + "'");
+        }
     }
-  }
 }
diff --git a/dd-trace-api/src/main/java/datadog/appsec/api/blocking/BlockingContentType.java b/dd-trace-api/src/main/java/datadog/appsec/api/blocking/BlockingContentType.java
index cf626fbdf05..353b28808cf 100644
--- a/dd-trace-api/src/main/java/datadog/appsec/api/blocking/BlockingContentType.java
+++ b/dd-trace-api/src/main/java/datadog/appsec/api/blocking/BlockingContentType.java
@@ -1,15 +1,15 @@
 package datadog.appsec.api.blocking;
 
 public enum BlockingContentType {
-  /**
-   * Automatically choose between HTML and JSON, depending on the value of the <code>Accept</code>
-   * header. If the preference value is the same, {@link #JSON} will be preferred.
-   */
-  AUTO,
-  /** An HTTP response. */
-  HTML,
-  /** A JSON response. */
-  JSON,
-  /** No body in the response */
-  NONE,
+    /**
+     * Automatically choose between HTML and JSON, depending on the value of the <code>Accept</code>
+     * header. If the preference value is the same, {@link #JSON} will be preferred.
+     */
+    AUTO,
+    /** An HTTP response. */
+    HTML,
+    /** A JSON response. */
+    JSON,
+    /** No body in the response */
+    NONE,
 }
diff --git a/dd-trace-api/src/main/java/datadog/appsec/api/blocking/BlockingDetails.java b/dd-trace-api/src/main/java/datadog/appsec/api/blocking/BlockingDetails.java
index dc36d55f819..342c2e457ba 100644
--- a/dd-trace-api/src/main/java/datadog/appsec/api/blocking/BlockingDetails.java
+++ b/dd-trace-api/src/main/java/datadog/appsec/api/blocking/BlockingDetails.java
@@ -3,14 +3,13 @@
 import java.util.Map;
 
 public class BlockingDetails {
-  public final int statusCode;
-  public final BlockingContentType blockingContentType;
-  public final Map<String, String> extraHeaders;
+    public final int statusCode;
+    public final BlockingContentType blockingContentType;
+    public final Map<String, String> extraHeaders;
 
-  public BlockingDetails(
-      int statusCode, BlockingContentType blockingContentType, Map<String, String> extraHeaders) {
-    this.statusCode = statusCode;
-    this.blockingContentType = blockingContentType;
-    this.extraHeaders = extraHeaders;
-  }
+    public BlockingDetails(int statusCode, BlockingContentType blockingContentType, Map<String, String> extraHeaders) {
+        this.statusCode = statusCode;
+        this.blockingContentType = blockingContentType;
+        this.extraHeaders = extraHeaders;
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/appsec/api/blocking/BlockingException.java b/dd-trace-api/src/main/java/datadog/appsec/api/blocking/BlockingException.java
index 67f8cb26032..e4a12f118aa 100644
--- a/dd-trace-api/src/main/java/datadog/appsec/api/blocking/BlockingException.java
+++ b/dd-trace-api/src/main/java/datadog/appsec/api/blocking/BlockingException.java
@@ -1,17 +1,17 @@
 package datadog.appsec.api.blocking;
 
 public class BlockingException extends RuntimeException {
-  public BlockingException() {}
+    public BlockingException() {}
 
-  public BlockingException(String message) {
-    super(message);
-  }
+    public BlockingException(String message) {
+        super(message);
+    }
 
-  public BlockingException(String message, Throwable cause) {
-    super(message, cause);
-  }
+    public BlockingException(String message, Throwable cause) {
+        super(message, cause);
+    }
 
-  public BlockingException(Throwable cause) {
-    super(cause);
-  }
+    public BlockingException(Throwable cause) {
+        super(cause);
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/appsec/api/blocking/BlockingService.java b/dd-trace-api/src/main/java/datadog/appsec/api/blocking/BlockingService.java
index b4647397119..416b93b3ece 100644
--- a/dd-trace-api/src/main/java/datadog/appsec/api/blocking/BlockingService.java
+++ b/dd-trace-api/src/main/java/datadog/appsec/api/blocking/BlockingService.java
@@ -4,27 +4,25 @@
 import javax.annotation.Nonnull;
 
 public interface BlockingService {
-  BlockingService NOOP = new BlockingServiceNoop();
+    BlockingService NOOP = new BlockingServiceNoop();
 
-  BlockingDetails shouldBlockUser(@Nonnull String userId);
+    BlockingDetails shouldBlockUser(@Nonnull String userId);
 
-  boolean tryCommitBlockingResponse(
-      int statusCode, @Nonnull BlockingContentType type, @Nonnull Map<String, String> extraHeaders);
+    boolean tryCommitBlockingResponse(
+            int statusCode, @Nonnull BlockingContentType type, @Nonnull Map<String, String> extraHeaders);
 
-  class BlockingServiceNoop implements BlockingService {
-    private BlockingServiceNoop() {}
+    class BlockingServiceNoop implements BlockingService {
+        private BlockingServiceNoop() {}
 
-    @Override
-    public BlockingDetails shouldBlockUser(@Nonnull String userId) {
-      return null;
-    }
+        @Override
+        public BlockingDetails shouldBlockUser(@Nonnull String userId) {
+            return null;
+        }
 
-    @Override
-    public boolean tryCommitBlockingResponse(
-        int statusCode,
-        @Nonnull BlockingContentType type,
-        @Nonnull Map<String, String> extraHeaders) {
-      return false;
+        @Override
+        public boolean tryCommitBlockingResponse(
+                int statusCode, @Nonnull BlockingContentType type, @Nonnull Map<String, String> extraHeaders) {
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-trace-api/src/main/java/datadog/appsec/api/login/EventTrackerService.java b/dd-trace-api/src/main/java/datadog/appsec/api/login/EventTrackerService.java
index 25a2f376bd4..514b7f7a188 100644
--- a/dd-trace-api/src/main/java/datadog/appsec/api/login/EventTrackerService.java
+++ b/dd-trace-api/src/main/java/datadog/appsec/api/login/EventTrackerService.java
@@ -4,23 +4,22 @@
 
 public interface EventTrackerService {
 
-  EventTrackerService NO_OP =
-      new EventTrackerService() {
+    EventTrackerService NO_OP = new EventTrackerService() {
         @Override
         public void trackUserLoginSuccess(
-            final String login, final String userId, final Map<String, String> metadata) {}
+                final String login, final String userId, final Map<String, String> metadata) {}
 
         @Override
         public void trackUserLoginFailure(
-            final String login, final boolean exists, final Map<String, String> metadata) {}
+                final String login, final boolean exists, final Map<String, String> metadata) {}
 
         @Override
         public void trackCustomEvent(final String eventName, final Map<String, String> metadata) {}
-      };
+    };
 
-  void trackUserLoginSuccess(String login, String userId, Map<String, String> metadata);
+    void trackUserLoginSuccess(String login, String userId, Map<String, String> metadata);
 
-  void trackUserLoginFailure(String login, boolean exists, Map<String, String> metadata);
+    void trackUserLoginFailure(String login, boolean exists, Map<String, String> metadata);
 
-  void trackCustomEvent(String eventName, Map<String, String> metadata);
+    void trackCustomEvent(String eventName, Map<String, String> metadata);
 }
diff --git a/dd-trace-api/src/main/java/datadog/appsec/api/login/EventTrackerV2.java b/dd-trace-api/src/main/java/datadog/appsec/api/login/EventTrackerV2.java
index 2bc31a14159..0d95f8b8263 100644
--- a/dd-trace-api/src/main/java/datadog/appsec/api/login/EventTrackerV2.java
+++ b/dd-trace-api/src/main/java/datadog/appsec/api/login/EventTrackerV2.java
@@ -4,49 +4,47 @@
 
 public class EventTrackerV2 {
 
-  private static volatile EventTrackerService SERVICE = EventTrackerService.NO_OP;
+    private static volatile EventTrackerService SERVICE = EventTrackerService.NO_OP;
 
-  /**
-   * Controls the implementation for service. The AppSec subsystem calls this method on startup.
-   * This can be called explicitly for e.g. testing purposes.
-   *
-   * @param service the implementation for the user service.
-   */
-  public static void setEventTrackerService(final EventTrackerService service) {
-    SERVICE = service;
-  }
+    /**
+     * Controls the implementation for service. The AppSec subsystem calls this method on startup.
+     * This can be called explicitly for e.g. testing purposes.
+     *
+     * @param service the implementation for the user service.
+     */
+    public static void setEventTrackerService(final EventTrackerService service) {
+        SERVICE = service;
+    }
 
-  /**
-   * Tracks a successful user login event.
-   *
-   * @param login the non-null login data (e.g., username or email) used for authentication.
-   * @param userId an optional user ID string; can be null.
-   * @param metadata optional metadata for the login event; can be null.
-   */
-  public static void trackUserLoginSuccess(
-      final String login, final String userId, Map<String, String> metadata) {
-    SERVICE.trackUserLoginSuccess(login, userId, metadata);
-  }
+    /**
+     * Tracks a successful user login event.
+     *
+     * @param login the non-null login data (e.g., username or email) used for authentication.
+     * @param userId an optional user ID string; can be null.
+     * @param metadata optional metadata for the login event; can be null.
+     */
+    public static void trackUserLoginSuccess(final String login, final String userId, Map<String, String> metadata) {
+        SERVICE.trackUserLoginSuccess(login, userId, metadata);
+    }
 
-  /**
-   * Tracks a failed user login event.
-   *
-   * @param login the non-null login data (e.g., username or email) used for authentication.
-   * @param exists indicates whether the provided login identifier corresponds to an existing user.
-   * @param metadata optional metadata for the login event; can be null.
-   */
-  public static void trackUserLoginFailure(
-      String login, boolean exists, Map<String, String> metadata) {
-    SERVICE.trackUserLoginFailure(login, exists, metadata);
-  }
+    /**
+     * Tracks a failed user login event.
+     *
+     * @param login the non-null login data (e.g., username or email) used for authentication.
+     * @param exists indicates whether the provided login identifier corresponds to an existing user.
+     * @param metadata optional metadata for the login event; can be null.
+     */
+    public static void trackUserLoginFailure(String login, boolean exists, Map<String, String> metadata) {
+        SERVICE.trackUserLoginFailure(login, exists, metadata);
+    }
 
-  /**
-   * Method for tracking custom events.
-   *
-   * @param eventName name of the custom event
-   * @param metadata custom metadata data represented as key/value map
-   */
-  public static void trackCustomEvent(String eventName, Map<String, String> metadata) {
-    SERVICE.trackCustomEvent(eventName, metadata);
-  }
+    /**
+     * Method for tracking custom events.
+     *
+     * @param eventName name of the custom event
+     * @param metadata custom metadata data represented as key/value map
+     */
+    public static void trackCustomEvent(String eventName, Map<String, String> metadata) {
+        SERVICE.trackCustomEvent(eventName, metadata);
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/appsec/api/user/User.java b/dd-trace-api/src/main/java/datadog/appsec/api/user/User.java
index 269d2e45d97..af45888c9f5 100644
--- a/dd-trace-api/src/main/java/datadog/appsec/api/user/User.java
+++ b/dd-trace-api/src/main/java/datadog/appsec/api/user/User.java
@@ -4,25 +4,25 @@
 
 public class User {
 
-  private static volatile UserService SERVICE = UserService.NO_OP;
+    private static volatile UserService SERVICE = UserService.NO_OP;
 
-  /**
-   * Controls the implementation for user service. The AppSec subsystem calls this method on
-   * startup. This can be called explicitly for e.g. testing purposes.
-   *
-   * @param service the implementation for the user service.
-   */
-  public static void setUserService(final UserService service) {
-    SERVICE = service;
-  }
+    /**
+     * Controls the implementation for user service. The AppSec subsystem calls this method on
+     * startup. This can be called explicitly for e.g. testing purposes.
+     *
+     * @param service the implementation for the user service.
+     */
+    public static void setUserService(final UserService service) {
+        SERVICE = service;
+    }
 
-  /**
-   * Sets the user monitoring tags on the root span using the prefix {@code usr}
-   *
-   * @param id identifier of the user
-   * @param metadata custom metadata data represented as key/value map
-   */
-  public static void setUser(final String id, final Map<String, String> metadata) {
-    SERVICE.trackUserEvent(id, metadata);
-  }
+    /**
+     * Sets the user monitoring tags on the root span using the prefix {@code usr}
+     *
+     * @param id identifier of the user
+     * @param metadata custom metadata data represented as key/value map
+     */
+    public static void setUser(final String id, final Map<String, String> metadata) {
+        SERVICE.trackUserEvent(id, metadata);
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/appsec/api/user/UserService.java b/dd-trace-api/src/main/java/datadog/appsec/api/user/UserService.java
index da95a76bc34..e38e12064d3 100644
--- a/dd-trace-api/src/main/java/datadog/appsec/api/user/UserService.java
+++ b/dd-trace-api/src/main/java/datadog/appsec/api/user/UserService.java
@@ -4,11 +4,10 @@
 
 public interface UserService {
 
-  UserService NO_OP =
-      new UserService() {
+    UserService NO_OP = new UserService() {
         @Override
         public void trackUserEvent(final String userId, final Map<String, String> metadata) {}
-      };
+    };
 
-  void trackUserEvent(String userId, Map<String, String> metadata);
+    void trackUserEvent(String userId, Map<String, String> metadata);
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
index bf5bab30d05..5324d578784 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
@@ -14,405 +14,389 @@
 
 public final class ConfigDefaults {
 
-  static final BitSet DEFAULT_HTTP_SERVER_ERROR_STATUSES;
-  static final BitSet DEFAULT_HTTP_CLIENT_ERROR_STATUSES;
-  static final BitSet DEFAULT_GRPC_SERVER_ERROR_STATUSES;
-  static final BitSet DEFAULT_GRPC_CLIENT_ERROR_STATUSES;
-
-  static final BitSet DEFAULT_ATTRIBUTE_SCHEMA_VERSIONS;
-
-  static {
-    DEFAULT_HTTP_SERVER_ERROR_STATUSES = new BitSet();
-    DEFAULT_HTTP_SERVER_ERROR_STATUSES.set(500, 600);
-    DEFAULT_HTTP_CLIENT_ERROR_STATUSES = new BitSet();
-    DEFAULT_HTTP_CLIENT_ERROR_STATUSES.set(400, 500);
-    DEFAULT_GRPC_SERVER_ERROR_STATUSES = new BitSet();
-    DEFAULT_GRPC_SERVER_ERROR_STATUSES.set(2, 17);
-    DEFAULT_GRPC_CLIENT_ERROR_STATUSES = new BitSet();
-    DEFAULT_GRPC_CLIENT_ERROR_STATUSES.set(1, 17);
-    DEFAULT_ATTRIBUTE_SCHEMA_VERSIONS = new BitSet();
-    DEFAULT_ATTRIBUTE_SCHEMA_VERSIONS.set(0, 1);
-  }
-
-  /* These fields are made public because they're referenced elsewhere internally.  They're not intended as public API. */
-  public static final String DEFAULT_AGENT_HOST = "localhost";
-  public static final int DEFAULT_TRACE_AGENT_PORT = 8126;
-  public static final int DEFAULT_DOGSTATSD_PORT = 8125;
-  public static final String DEFAULT_TRACE_AGENT_SOCKET_PATH = "/var/run/datadog/apm.socket";
-  public static final String DEFAULT_DOGSTATSD_SOCKET_PATH = "/var/run/datadog/dsd.socket";
-  public static final int DEFAULT_AGENT_TIMEOUT = 10; // timeout in seconds
-  public static final String DEFAULT_SERVICE_NAME = "unnamed-java-app";
-  public static final String DEFAULT_SERVLET_ROOT_CONTEXT_SERVICE_NAME = "root-servlet";
-  public static final String DEFAULT_AGENT_WRITER_TYPE = "DDAgentWriter";
-  public static final boolean DEFAULT_STARTUP_LOGS_ENABLED = true;
-
-  static final boolean DEFAULT_INJECT_DATADOG_ATTRIBUTE = true;
-  static final String DEFAULT_SITE = "datadoghq.com";
-  static final String DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE = "agentless";
-  static final int DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_POLL_INTERVAL_SECONDS = 30;
-  static final int DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_REQUEST_TIMEOUT_SECONDS = 5;
-
-  static final boolean DEFAULT_CODE_ORIGIN_FOR_SPANS_INTERFACE_SUPPORT = false;
-  static final int DEFAULT_CODE_ORIGIN_MAX_USER_FRAMES = 8;
-  static final boolean DEFAULT_TRACE_ENABLED = true;
-  public static final boolean DEFAULT_TRACE_OTEL_ENABLED = false;
-  static final boolean DEFAULT_INTEGRATIONS_ENABLED = true;
-
-  static final boolean DEFAULT_RUNTIME_CONTEXT_FIELD_INJECTION = true;
-  static final boolean DEFAULT_SERIALVERSIONUID_FIELD_INJECTION = true;
-  static final boolean DEFAULT_RUNTIME_CONTEXT_MAP_PER_STORE = true;
-
-  static final boolean DEFAULT_EXPERIMENTATAL_JEE_SPLIT_BY_DEPLOYMENT = false;
-  static final boolean DEFAULT_PRIORITY_SAMPLING_ENABLED = true;
-  static final String DEFAULT_PRIORITY_SAMPLING_FORCE = null;
-  static final boolean DEFAULT_TRACE_RESOLVER_ENABLED = true;
-  static final boolean DEFAULT_HTTP_SERVER_TAG_QUERY_STRING = true;
-  static final boolean DEFAULT_HTTP_SERVER_ROUTE_BASED_NAMING = true;
-  static final boolean DEFAULT_HTTP_CLIENT_TAG_QUERY_STRING = true;
-  static final boolean DEFAULT_HTTP_CLIENT_SPLIT_BY_DOMAIN = false;
-  static final boolean DEFAULT_DB_CLIENT_HOST_SPLIT_BY_INSTANCE = false;
-  static final boolean DEFAULT_DB_CLIENT_HOST_SPLIT_BY_INSTANCE_TYPE_SUFFIX = false;
-  static final boolean DEFAULT_DB_CLIENT_HOST_SPLIT_BY_HOST = false;
-  static final String DEFAULT_DB_DBM_PROPAGATION_MODE_MODE = "disabled";
-  static final boolean DEFAULT_DB_DBM_PROPAGATION_ORACLE_ACTION_ONLY_ENABLED = false;
-  static final boolean DEFAULT_DB_DBM_TRACE_PREPARED_STATEMENTS = false;
-  static final boolean DEFAULT_DB_DBM_ALWAYS_APPEND_SQL_COMMENT = false;
-  // Default value is set to 0, it disables the latency trace interceptor
-  static final int DEFAULT_TRACE_KEEP_LATENCY_THRESHOLD_MS = 0;
-  static final int DEFAULT_SCOPE_DEPTH_LIMIT = 100;
-  static final int DEFAULT_SCOPE_ITERATION_KEEP_ALIVE = 30; // in seconds
-  static final int DEFAULT_PARTIAL_FLUSH_MIN_SPANS = 1000;
-  static final boolean DEFAULT_PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED = false;
-  static final Set<TracePropagationStyle> DEFAULT_TRACE_PROPAGATION_STYLE =
-      new LinkedHashSet<>(asList(DATADOG, TRACECONTEXT, BAGGAGE));
-  static final Set<PropagationStyle> DEFAULT_PROPAGATION_STYLE =
-      new LinkedHashSet<>(asList(PropagationStyle.DATADOG));
-  public static final boolean DEFAULT_PROPAGATION_B3_PADDING_ENABLED = true;
-  static final int DEFAULT_TRACE_BAGGAGE_MAX_ITEMS = 64;
-  static final int DEFAULT_TRACE_BAGGAGE_MAX_BYTES = 8192;
-  static final List<String> DEFAULT_TRACE_BAGGAGE_TAG_KEYS =
-      Arrays.asList("user.id", "session.id", "account.id");
-  static final boolean DEFAULT_JMX_FETCH_ENABLED = true;
-
-  static final String DEFAULT_TRACE_AGENT_PROTOCOL_VERSION = ProtocolVersion.V0_4.asConfigValue();
-
-  static final boolean DEFAULT_CLIENT_IP_ENABLED = false;
-
-  static final int DEFAULT_CLOCK_SYNC_PERIOD = 30; // seconds
-
-  static final boolean DEFAULT_TRACE_LAMBDA_SNAPSTART_CLOCK_RESYNC_ENABLED = false;
-
-  static final TracePropagationBehaviorExtract DEFAULT_TRACE_PROPAGATION_BEHAVIOR_EXTRACT =
-      TracePropagationBehaviorExtract.CONTINUE;
-  static final boolean DEFAULT_TRACE_PROPAGATION_EXTRACT_FIRST = false;
-
-  static final boolean DEFAULT_JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_ENABLED = false;
-  static final int DEFAULT_JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_LIMIT = 10;
-
-  public static final boolean DEFAULT_LOGS_OTEL_ENABLED = false;
-  static final int DEFAULT_LOGS_OTEL_INTERVAL = 1_000; // ms
-  static final int DEFAULT_LOGS_OTEL_TIMEOUT = 30_000; // ms
-  static final int DEFAULT_LOGS_OTEL_QUEUE_SIZE = 2048;
-  static final int DEFAULT_LOGS_OTEL_BATCH_SIZE = 512;
-
-  public static final boolean DEFAULT_METRICS_OTEL_ENABLED = false;
-  // Default recommended by Datadog; it differs from Otel’s default of 60000 (60s)
-  static final int DEFAULT_METRICS_OTEL_INTERVAL = 10_000; // ms
-  // Default recommended by Datadog; it differs from Otel’s  default of 30000 (30s)
-  static final int DEFAULT_METRICS_OTEL_TIMEOUT = 7_500; // ms
-  static final int DEFAULT_METRICS_OTEL_CARDINALITY_LIMIT = 2_000;
-
-  static final int DEFAULT_TRACE_STATS_INTERVAL = 10_000; // ms
-
-  public static final boolean DEFAULT_METRICS_OTEL_EXPERIMENTAL_ENABLED = true;
-
-  public static final int DEFAULT_OTLP_TRACES_TIMEOUT = 10_000; // ms
-
-  static final String DEFAULT_OTLP_HTTP_LOGS_ENDPOINT = "v1/logs";
-  static final String DEFAULT_OTLP_HTTP_METRICS_ENDPOINT = "v1/metrics";
-  public static final String DEFAULT_OTLP_HTTP_TRACES_ENDPOINT = "v1/traces";
-  public static final String DEFAULT_OTLP_GRPC_TRACES_ENDPOINT =
-      "opentelemetry.proto.collector.trace.v1.TraceService/Export";
-  public static final String DEFAULT_OTLP_HTTP_PORT = "4318";
-  public static final String DEFAULT_OTLP_GRPC_PORT = "4317";
-
-  static final int DEFAULT_DOGSTATSD_START_DELAY = 15; // seconds
-
-  static final boolean DEFAULT_HEALTH_METRICS_ENABLED = true;
-  static final boolean DEFAULT_PERF_METRICS_ENABLED = false;
-  // No default constants for metrics statsd support -- falls back to jmxfetch values
-
-  // Change value to be false in new release. Until then, manually set logs_injection default
-  // value to false if config is under breaking changes flag
-  static final boolean DEFAULT_LOGS_INJECTION_ENABLED = true;
-
-  static final boolean DEFAULT_APP_LOGS_COLLECTION_ENABLED = false;
-
-  static final String DEFAULT_APPSEC_ENABLED = "inactive";
-  static final String DEFAULT_APPSEC_AGENTIC_ONBOARDING = "";
-  static final int DEFAULT_APPSEC_TRACE_RATE_LIMIT = 100;
-  static final boolean DEFAULT_APPSEC_WAF_METRICS = true;
-  static final int DEFAULT_APPSEC_WAF_TIMEOUT = 100000; // 0.1 s
-  static final boolean DEFAULT_API_SECURITY_ENABLED = true;
-  static final float DEFAULT_API_SECURITY_SAMPLE_DELAY = 30.0f;
-  static final boolean DEFAULT_API_SECURITY_ENDPOINT_COLLECTION_ENABLED = true;
-  static final int DEFAULT_API_SECURITY_ENDPOINT_COLLECTION_MESSAGE_LIMIT = 300;
-  static final double DEFAULT_API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE = 0.5D;
-  static final int DEFAULT_API_SECURITY_MAX_DOWNSTREAM_REQUEST_BODY_ANALYSIS = 1;
-  static final boolean DEFAULT_APPSEC_RASP_ENABLED = true;
-  static final boolean DEFAULT_APPSEC_STACK_TRACE_ENABLED = true;
-  static final int DEFAULT_APPSEC_MAX_STACK_TRACES = 2;
-  static final int DEFAULT_APPSEC_MAX_STACK_TRACE_DEPTH = 32;
-  static final int DEFAULT_APPSEC_MAX_COLLECTED_HEADERS = 50;
-  static final int DEFAULT_APPSEC_BODY_PARSING_SIZE_LIMIT = 10_000_000;
-  static final int DEFAULT_APPSEC_MAX_FILE_CONTENT_BYTES = 4096;
-  static final int DEFAULT_APPSEC_MAX_FILE_CONTENT_COUNT = 25;
-  static final int DEFAULT_APPSEC_SCA_MAX_TRACKED_DEPENDENCIES = 1_000;
-  static final String DEFAULT_IAST_ENABLED = "false";
-  static final boolean DEFAULT_IAST_DEBUG_ENABLED = false;
-  public static final int DEFAULT_IAST_MAX_CONCURRENT_REQUESTS = 4;
-  public static final int DEFAULT_IAST_VULNERABILITIES_PER_REQUEST = 2;
-  public static final int DEFAULT_IAST_REQUEST_SAMPLING = 33;
-  static final Set<String> DEFAULT_IAST_WEAK_HASH_ALGORITHMS =
-      new HashSet<>(asList("SHA1", "SHA-1", "MD2", "MD5", "RIPEMD128", "MD4"));
-  static final String DEFAULT_IAST_WEAK_CIPHER_ALGORITHMS =
-      "^(?:PBEWITH(?:HMACSHA(?:2(?:24ANDAES_(?:128|256)|56ANDAES_(?:128|256))|384ANDAES_(?:128|256)|512ANDAES_(?:128|256)|1ANDAES_(?:128|256))|SHA1AND(?:RC(?:2_(?:128|40)|4_(?:128|40))|DESEDE)|MD5AND(?:TRIPLEDES|DES))|DES(?:EDE(?:WRAP)?)?|BLOWFISH|ARCFOUR|RC2).*$";
-  static final boolean DEFAULT_IAST_REDACTION_ENABLED = true;
-  public static final String DEFAULT_IAST_REDACTION_NAME_PATTERN =
-      "(?:p(?:ass)?w(?:or)?d|pass(?:_?phrase)?|secret|(?:api_?|private_?|public_?|access_?|secret_?)key(?:_?id)?|token|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)";
-  public static final String DEFAULT_IAST_REDACTION_VALUE_PATTERN =
-      "(?:bearer\\s+[a-z0-9\\._\\-]+|glpat-[\\w\\-]{20}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L][\\w=\\-]+\\.ey[I-L][\\w=\\-]+(?:\\.[\\w.+/=\\-]+)?|(?:[\\-]{5}BEGIN[a-z\\s]+PRIVATE\\sKEY[\\-]{5}[^\\-]+[\\-]{5}END[a-z\\s]+PRIVATE\\sKEY[\\-]{5}|ssh-rsa\\s*[a-z0-9/\\.+]{100,}))";
-  public static final int DEFAULT_IAST_MAX_RANGE_COUNT = 10;
-  static final boolean DEFAULT_IAST_STACKTRACE_LEAK_SUPPRESS = false;
-
-  static final boolean DEFAULT_IAST_HARDCODED_SECRET_ENABLED = true;
-
-  static final int DEFAULT_IAST_TRUNCATION_MAX_VALUE_LENGTH = 250;
-  public static final boolean DEFAULT_IAST_DEDUPLICATION_ENABLED = true;
-  static final boolean DEFAULT_IAST_ANONYMOUS_CLASSES_ENABLED = true;
-
-  static final boolean DEFAULT_IAST_STACK_TRACE_ENABLED = true;
-  static final int DEFAULT_IAST_DB_ROWS_TO_TAINT = 1;
-
-  static final boolean DEFAULT_LLM_OBS_ENABLED = false;
-  static final boolean DEFAULT_LLM_OBS_AGENTLESS_ENABLED = false;
-  static final double DEFAULT_LLM_OBS_SAMPLE_RATE = 1.0;
-
-  static final boolean DEFAULT_USM_ENABLED = false;
-
-  static final boolean DEFAULT_CIVISIBILITY_ENABLED = false;
-  static final boolean DEFAULT_CIVISIBILITY_AGENTLESS_ENABLED = false;
-  static final boolean DEFAULT_CIVISIBILITY_SOURCE_DATA_ENABLED = true;
-  static final boolean DEFAULT_CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED = true;
-  static final boolean DEFAULT_CIVISIBILITY_AUTO_CONFIGURATION_ENABLED = true;
-  static final boolean DEFAULT_CIVISIBILITY_COMPILER_PLUGIN_AUTO_CONFIGURATION_ENABLED = true;
-  static final boolean DEFAULT_CIVISIBILITY_GRADLE_DEPENDENCY_VERIFICATION_ENABLED = false;
-  static final String DEFAULT_CIVISIBILITY_COMPILER_PLUGIN_VERSION = "0.2.4";
-  static final String DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_VERSION = "0.8.15";
-  static final String DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_EXCLUDES =
-      "datadog.trace.*:org.apache.commons.*:org.mockito.*";
-  static final boolean DEFAULT_CIVISIBILITY_GIT_UPLOAD_ENABLED = true;
-  static final boolean DEFAULT_CIVISIBILITY_GIT_UNSHALLOW_ENABLED = true;
-  static final long DEFAULT_CIVISIBILITY_GIT_COMMAND_TIMEOUT_MILLIS = 30_000;
-  static final long DEFAULT_CIVISIBILITY_BACKEND_API_TIMEOUT_MILLIS = 30_000;
-  static final long DEFAULT_CIVISIBILITY_GIT_UPLOAD_TIMEOUT_MILLIS = 60_000;
-  static final String DEFAULT_CIVISIBILITY_GIT_REMOTE_NAME = "origin";
-  static final String DEFAULT_CIVISIBILITY_SIGNAL_SERVER_HOST = "127.0.0.1";
-  static final int DEFAULT_CIVISIBILITY_SIGNAL_SERVER_PORT = 0;
-  static final List<String> DEFAULT_CIVISIBILITY_RESOURCE_FOLDER_NAMES =
-      asList("/resources/", "/java/", "/groovy/", "/kotlin/", "/scala/");
-
-  static final boolean DEFAULT_REMOTE_CONFIG_ENABLED = true;
-  static final boolean DEFAULT_REMOTE_CONFIG_INTEGRITY_CHECK_ENABLED = false;
-  static final int DEFAULT_REMOTE_CONFIG_MAX_PAYLOAD_SIZE = 5120; // KiB
-  static final int DEFAULT_REMOTE_CONFIG_POLL_INTERVAL_SECONDS = 5;
-  static final String DEFAULT_REMOTE_CONFIG_TARGETS_KEY_ID =
-      "5c4ece41241a1bb513f6e3e5df74ab7d5183dfffbd71bfd43127920d880569fd";
-  static final String DEFAULT_REMOTE_CONFIG_TARGETS_KEY =
-      "e3f1f98c9da02a93bb547f448b472d727e14b22455235796fe49863856252508";
-  static final int DEFAULT_REMOTE_CONFIG_MAX_EXTRA_SERVICES = 64;
-  static final boolean DEFAULT_DYNAMIC_INSTRUMENTATION_ENABLED = false;
-  static final int DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_TIMEOUT = 30; // seconds
-  static final int DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL = 0; // ms, 0 = dynamic
-  static final boolean DEFAULT_DYNAMIC_INSTRUMENTATION_CLASSFILE_DUMP_ENABLED = false;
-  static final int DEFAULT_DYNAMIC_INSTRUMENTATION_POLL_INTERVAL = 1; // seconds
-  static final int DEFAULT_DYNAMIC_INSTRUMENTATION_DIAGNOSTICS_INTERVAL = 60 * 60; // seconds
-  static final boolean DEFAULT_DYNAMIC_INSTRUMENTATION_METRICS_ENABLED = false;
-  static final int DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_BATCH_SIZE = 100;
-  static final int DEFAULT_DYNAMIC_INSTRUMENTATION_MAX_PAYLOAD_SIZE = 1024; // KiB
-  static final boolean DEFAULT_DYNAMIC_INSTRUMENTATION_VERIFY_BYTECODE = true;
-  static final String DEFAULT_DYNAMIC_INSTRUMENTATION_TIMEOUT_CHECKER_MODE = "WALL";
-  static final int DEFAULT_DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT = 100; // milliseconds
-  static final int DEFAULT_DYNAMIC_INSTRUMENTATION_EVAL_TIMEOUT = 50; // milliseconds
-  static final int DEFAULT_DYNAMIC_INSTRUMENTATION_LOCALVAR_HOISTING_LEVEL = 1;
-  static final boolean DEFAULT_SYMBOL_DATABASE_ENABLED = true;
-  static final boolean DEFAULT_SYMBOL_DATABASE_FORCE_UPLOAD = false;
-  static final int DEFAULT_SYMBOL_DATABASE_FLUSH_THRESHOLD = 100; // nb of classes
-  static final boolean DEFAULT_SYMBOL_DATABASE_COMPRESSED = true;
-  static final boolean DEFAULT_DEBUGGER_EXCEPTION_ENABLED = false;
-  static final int DEFAULT_DEBUGGER_MAX_EXCEPTION_PER_SECOND = 100;
-  static final boolean DEFAULT_DEBUGGER_EXCEPTION_ONLY_LOCAL_ROOT = false;
-  static final boolean DEFAULT_DEBUGGER_EXCEPTION_CAPTURE_INTERMEDIATE_SPANS_ENABLED = true;
-  static final int DEFAULT_DEBUGGER_EXCEPTION_MAX_CAPTURED_FRAMES = 3;
-  static final int DEFAULT_DEBUGGER_EXCEPTION_CAPTURE_INTERVAL_SECONDS = 60 * 60;
-  static final boolean DEFAULT_DISTRIBUTED_DEBUGGER_ENABLED = false;
-  static final boolean DEFAULT_DEBUGGER_SOURCE_FILE_TRACKING_ENABLED = true;
-
-  static final boolean DEFAULT_TRACE_REPORT_HOSTNAME = false;
-  static final String DEFAULT_TRACE_ANNOTATIONS = null;
-  static final boolean DEFAULT_TRACE_ANNOTATION_ASYNC = false;
-  static final boolean DEFAULT_TRACE_EXECUTORS_ALL = false;
-  static final String DEFAULT_TRACE_METHODS = null;
-  static final String DEFAULT_TRACE_NATIVE_METHODS = null;
-  static final String DEFAULT_MEASURE_METHODS = "";
-  static final String DEFAULT_MEASURE_NATIVE_METHODS = "";
-  static final boolean DEFAULT_TRACE_ANALYTICS_ENABLED = false;
-  static final float DEFAULT_ANALYTICS_SAMPLE_RATE = 1.0f;
-  static final int DEFAULT_TRACE_RATE_LIMIT = 100;
-
-  public static final boolean DEFAULT_ASYNC_PROPAGATING = true;
-
-  static final boolean DEFAULT_CWS_ENABLED = false;
-  static final int DEFAULT_CWS_TLS_REFRESH = 5000;
-
-  static final boolean DEFAULT_DATA_JOBS_ENABLED = false;
-  static final boolean DEFAULT_DATA_JOBS_OPENLINEAGE_ENABLED = false;
-  static final boolean DEFAULT_DATA_JOBS_OPENLINEAGE_TIMEOUT_ENABLED = true;
-  static final boolean DEFAULT_DATA_JOBS_PARSE_SPARK_PLAN_ENABLED = true;
-  static final boolean DEFAULT_DATA_JOBS_EXPERIMENTAL_FEATURES_ENABLED = false;
-
-  static final boolean DEFAULT_DATA_STREAMS_ENABLED = false;
-  static final int DEFAULT_DATA_STREAMS_BUCKET_DURATION = 10; // seconds
-
-  static final int DEFAULT_RESOLVER_RESET_INTERVAL = 300; // seconds
-
-  static final boolean DEFAULT_TELEMETRY_ENABLED = true;
-  static final int DEFAULT_TELEMETRY_HEARTBEAT_INTERVAL = 60; // in seconds
-  static final int DEFAULT_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL =
-      24 * 60 * 60; // 24 hours in seconds
-  static final int DEFAULT_TELEMETRY_METRICS_INTERVAL = 10; // in seconds
-  static final boolean DEFAULT_TELEMETRY_DEPENDENCY_COLLECTION_ENABLED = true;
-  static final boolean DEFAULT_TELEMETRY_LOG_COLLECTION_ENABLED = true;
-  static final int DEFAULT_TELEMETRY_DEPENDENCY_RESOLUTION_QUEUE_SIZE = 100000;
-
-  static final boolean DEFAULT_SERVICE_DISCOVERY_ENABLED = true;
-
-  static final boolean DEFAULT_RUM_ENABLED = false;
-  public static final String DEFAULT_RUM_SITE = DEFAULT_SITE;
-  public static final int DEFAULT_RUM_MAJOR_VERSION = 6;
-
-  static final boolean DEFAULT_SSI_INJECTION_FORCE = false;
-  static final String DEFAULT_INSTRUMENTATION_SOURCE = "manual";
-
-  static final Set<String> DEFAULT_TRACE_EXPERIMENTAL_FEATURES_ENABLED =
-      new HashSet<>(
-          asList(
-              "DD_TAGS",
-              "DD_LOGS_INJECTION",
-              "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED",
-              "DD_TRACE_STATS_ADDITIONAL_TAGS"));
-
-  static final boolean DEFAULT_TRACE_128_BIT_TRACEID_GENERATION_ENABLED = true;
-  static final boolean DEFAULT_TRACE_128_BIT_TRACEID_LOGGING_ENABLED = true;
-  static final boolean DEFAULT_SECURE_RANDOM = false;
-
-  public static final int DEFAULT_TRACE_X_DATADOG_TAGS_MAX_LENGTH = 512;
-
-  static final boolean DEFAULT_TRACE_HTTP_RESOURCE_REMOVE_TRAILING_SLASH = false;
-  static final boolean DEFAULT_TRACE_LONG_RUNNING_ENABLED = false;
-  static final long DEFAULT_TRACE_LONG_RUNNING_INITIAL_FLUSH_INTERVAL = 20; // seconds
-  static final long DEFAULT_TRACE_LONG_RUNNING_FLUSH_INTERVAL = 120; // seconds -> 2 minutes
-
-  static final float DEFAULT_TRACE_FLUSH_INTERVAL = 1;
-
-  static final long DEFAULT_TRACE_POST_PROCESSING_TIMEOUT = 1000; // 1 second
-
-  static final boolean DEFAULT_CASSANDRA_KEYSPACE_STATEMENT_EXTRACTION_ENABLED = false;
-  static final boolean DEFAULT_COUCHBASE_INTERNAL_SPANS_ENABLED = true;
-  static final boolean DEFAULT_ELASTICSEARCH_BODY_ENABLED = false;
-  static final boolean DEFAULT_ELASTICSEARCH_PARAMS_ENABLED = true;
-  static final boolean DEFAULT_ELASTICSEARCH_BODY_AND_PARAMS_ENABLED = false;
-
-  static final boolean DEFAULT_SPARK_TASK_HISTOGRAM_ENABLED = true;
-  static final boolean DEFAULT_SPARK_APP_NAME_AS_SERVICE = false;
-  static final boolean DEFAULT_JAX_RS_EXCEPTION_AS_ERROR_ENABLED = true;
-  static final boolean DEFAULT_TELEMETRY_DEBUG_REQUESTS_ENABLED = false;
-  static final boolean DEFAULT_WEBSOCKET_MESSAGES_ENABLED = true;
-  static final boolean DEFAULT_WEBSOCKET_MESSAGES_INHERIT_SAMPLING = true;
-  static final boolean DEFAULT_WEBSOCKET_MESSAGES_SEPARATE_TRACES = true;
-  static final boolean DEFAULT_WEBSOCKET_TAG_SESSION_ID = false;
-
-  static final Set<String> DEFAULT_TRACE_CLOUD_PAYLOAD_TAGGING_SERVICES =
-      new HashSet<>(
-          Arrays.asList(
-              "ApiGateway",
-              "ApiGatewayV2",
-              "EventBridge",
-              "Sqs",
-              "Sns",
-              "S3",
-              "Kinesis",
-              "DynamoDB"));
-
-  public static final String DEFAULT_TRACE_CLOUD_PAYLOAD_REQUEST_TAG = "aws.request.body";
-  public static final String DEFAULT_TRACE_CLOUD_PAYLOAD_RESPONSE_TAG = "aws.response.body";
-
-  public static final List<String> DEFAULT_CLOUD_COMMON_PAYLOAD_TAGGING =
-      asList(
-          // Sns
-          "$.Attributes.KmsMasterKeyId",
-          "$.Attributes.Token",
-          // EventBridge (RedactionRulesExtractor.java for eventbridge-2015-10-07)
-          "$.AuthParameters.OAuthParameters.OAuthHttpParameters.HeaderParameters[*].Value",
-          "$.AuthParameters.OAuthParameters.OAuthHttpParameters.QueryStringParameters[*].Value",
-          "$.AuthParameters.OAuthParameters.OAuthHttpParameters.BodyParameters[*].Value",
-          "$.AuthParameters.InvocationHttpParameters.HeaderParameters[*].Value",
-          "$.AuthParameters.InvocationHttpParameters.QueryStringParameters[*].Value",
-          "$.AuthParameters.InvocationHttpParameters.BodyParameters[*].Value",
-          "$.Targets[*].RedshiftDataParameters.Sql",
-          "$.Targets[*].RedshiftDataParameters.Sqls",
-          "$.Targets[*].AppSyncParameters.GraphQLOperation",
-          // S3 (RedactionRulesExtractor.java for s3-2006-03-01)
-          "$.SSEKMSKeyId",
-          "$.SSEKMSEncryptionContext",
-          "$.ServerSideEncryptionConfiguration.Rules[*].ApplyServerSideEncryptionByDefault.KMSMasterKeyID",
-          "$.InventoryConfiguration.Destination.S3BucketDestination.Encryption.SSEKMS.KeyId");
-
-  public static final List<String> DEFAULT_CLOUD_REQUEST_PAYLOAD_TAGGING =
-      asList(
-          // Sns
-          "$.Attributes.PlatformCredential",
-          "$.Attributes.PlatformPrincipal",
-          "$.AWSAccountId",
-          "$.Endpoint",
-          "$.Token",
-          "$.OneTimePassword",
-          // Sns (RedactionRulesExtractor.java for sns-2010-03-31)
-          "$.phoneNumber",
-          "$.PhoneNumber",
-          // EventBridge (RedactionRulesExtractor.java for eventbridge-2015-10-07)
-          "$.AuthParameters.BasicAuthParameters.Password",
-          "$.AuthParameters.OAuthParameters.ClientParameters.ClientSecret",
-          "$.AuthParameters.ApiKeyAuthParameters.ApiKeyValue",
-          // S3 (RedactionRulesExtractor.java for s3-2006-03-01)
-          "$.SSECustomerKey",
-          "$.CopySourceSSECustomerKey",
-          "$.RestoreRequest.OutputLocation.S3.Encryption.KMSKeyId");
-
-  public static final List<String> DEFAULT_CLOUD_RESPONSE_PAYLOAD_TAGGING =
-      asList(
-          // Sns
-          "$.Endpoints.*.Token",
-          "$.PlatformApplication.*.PlatformCredential",
-          "$.PlatformApplication.*.PlatformPrincipal",
-          "$.Subscriptions.*.Endpoint",
-          // Sns (Generated by RedactionRulesExtractor.java for sns-2010-03-31)
-          "$.PhoneNumbers[*].PhoneNumber",
-          "$.phoneNumbers[*]",
-          // S3 (RedactionRulesExtractor.java for s3-2006-03-01)
-          "$.Credentials.SecretAccessKey",
-          "$.Credentials.SessionToken",
-          "$.InventoryConfigurationList[*].Destination.S3BucketDestination.Encryption.SSEKMS.KeyId");
-
-  private ConfigDefaults() {}
+    static final BitSet DEFAULT_HTTP_SERVER_ERROR_STATUSES;
+    static final BitSet DEFAULT_HTTP_CLIENT_ERROR_STATUSES;
+    static final BitSet DEFAULT_GRPC_SERVER_ERROR_STATUSES;
+    static final BitSet DEFAULT_GRPC_CLIENT_ERROR_STATUSES;
+
+    static final BitSet DEFAULT_ATTRIBUTE_SCHEMA_VERSIONS;
+
+    static {
+        DEFAULT_HTTP_SERVER_ERROR_STATUSES = new BitSet();
+        DEFAULT_HTTP_SERVER_ERROR_STATUSES.set(500, 600);
+        DEFAULT_HTTP_CLIENT_ERROR_STATUSES = new BitSet();
+        DEFAULT_HTTP_CLIENT_ERROR_STATUSES.set(400, 500);
+        DEFAULT_GRPC_SERVER_ERROR_STATUSES = new BitSet();
+        DEFAULT_GRPC_SERVER_ERROR_STATUSES.set(2, 17);
+        DEFAULT_GRPC_CLIENT_ERROR_STATUSES = new BitSet();
+        DEFAULT_GRPC_CLIENT_ERROR_STATUSES.set(1, 17);
+        DEFAULT_ATTRIBUTE_SCHEMA_VERSIONS = new BitSet();
+        DEFAULT_ATTRIBUTE_SCHEMA_VERSIONS.set(0, 1);
+    }
+
+    /* These fields are made public because they're referenced elsewhere internally.  They're not intended as public API. */
+    public static final String DEFAULT_AGENT_HOST = "localhost";
+    public static final int DEFAULT_TRACE_AGENT_PORT = 8126;
+    public static final int DEFAULT_DOGSTATSD_PORT = 8125;
+    public static final String DEFAULT_TRACE_AGENT_SOCKET_PATH = "/var/run/datadog/apm.socket";
+    public static final String DEFAULT_DOGSTATSD_SOCKET_PATH = "/var/run/datadog/dsd.socket";
+    public static final int DEFAULT_AGENT_TIMEOUT = 10; // timeout in seconds
+    public static final String DEFAULT_SERVICE_NAME = "unnamed-java-app";
+    public static final String DEFAULT_SERVLET_ROOT_CONTEXT_SERVICE_NAME = "root-servlet";
+    public static final String DEFAULT_AGENT_WRITER_TYPE = "DDAgentWriter";
+    public static final boolean DEFAULT_STARTUP_LOGS_ENABLED = true;
+
+    static final boolean DEFAULT_INJECT_DATADOG_ATTRIBUTE = true;
+    static final String DEFAULT_SITE = "datadoghq.com";
+    static final String DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE = "agentless";
+    static final int DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_POLL_INTERVAL_SECONDS = 30;
+    static final int DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_REQUEST_TIMEOUT_SECONDS = 5;
+
+    static final boolean DEFAULT_CODE_ORIGIN_FOR_SPANS_INTERFACE_SUPPORT = false;
+    static final int DEFAULT_CODE_ORIGIN_MAX_USER_FRAMES = 8;
+    static final boolean DEFAULT_TRACE_ENABLED = true;
+    public static final boolean DEFAULT_TRACE_OTEL_ENABLED = false;
+    static final boolean DEFAULT_INTEGRATIONS_ENABLED = true;
+
+    static final boolean DEFAULT_RUNTIME_CONTEXT_FIELD_INJECTION = true;
+    static final boolean DEFAULT_SERIALVERSIONUID_FIELD_INJECTION = true;
+    static final boolean DEFAULT_RUNTIME_CONTEXT_MAP_PER_STORE = true;
+
+    static final boolean DEFAULT_EXPERIMENTATAL_JEE_SPLIT_BY_DEPLOYMENT = false;
+    static final boolean DEFAULT_PRIORITY_SAMPLING_ENABLED = true;
+    static final String DEFAULT_PRIORITY_SAMPLING_FORCE = null;
+    static final boolean DEFAULT_TRACE_RESOLVER_ENABLED = true;
+    static final boolean DEFAULT_HTTP_SERVER_TAG_QUERY_STRING = true;
+    static final boolean DEFAULT_HTTP_SERVER_ROUTE_BASED_NAMING = true;
+    static final boolean DEFAULT_HTTP_CLIENT_TAG_QUERY_STRING = true;
+    static final boolean DEFAULT_HTTP_CLIENT_SPLIT_BY_DOMAIN = false;
+    static final boolean DEFAULT_DB_CLIENT_HOST_SPLIT_BY_INSTANCE = false;
+    static final boolean DEFAULT_DB_CLIENT_HOST_SPLIT_BY_INSTANCE_TYPE_SUFFIX = false;
+    static final boolean DEFAULT_DB_CLIENT_HOST_SPLIT_BY_HOST = false;
+    static final String DEFAULT_DB_DBM_PROPAGATION_MODE_MODE = "disabled";
+    static final boolean DEFAULT_DB_DBM_PROPAGATION_ORACLE_ACTION_ONLY_ENABLED = false;
+    static final boolean DEFAULT_DB_DBM_TRACE_PREPARED_STATEMENTS = false;
+    static final boolean DEFAULT_DB_DBM_ALWAYS_APPEND_SQL_COMMENT = false;
+    // Default value is set to 0, it disables the latency trace interceptor
+    static final int DEFAULT_TRACE_KEEP_LATENCY_THRESHOLD_MS = 0;
+    static final int DEFAULT_SCOPE_DEPTH_LIMIT = 100;
+    static final int DEFAULT_SCOPE_ITERATION_KEEP_ALIVE = 30; // in seconds
+    static final int DEFAULT_PARTIAL_FLUSH_MIN_SPANS = 1000;
+    static final boolean DEFAULT_PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED = false;
+    static final Set<TracePropagationStyle> DEFAULT_TRACE_PROPAGATION_STYLE =
+            new LinkedHashSet<>(asList(DATADOG, TRACECONTEXT, BAGGAGE));
+    static final Set<PropagationStyle> DEFAULT_PROPAGATION_STYLE =
+            new LinkedHashSet<>(asList(PropagationStyle.DATADOG));
+    public static final boolean DEFAULT_PROPAGATION_B3_PADDING_ENABLED = true;
+    static final int DEFAULT_TRACE_BAGGAGE_MAX_ITEMS = 64;
+    static final int DEFAULT_TRACE_BAGGAGE_MAX_BYTES = 8192;
+    static final List<String> DEFAULT_TRACE_BAGGAGE_TAG_KEYS = Arrays.asList("user.id", "session.id", "account.id");
+    static final boolean DEFAULT_JMX_FETCH_ENABLED = true;
+
+    static final String DEFAULT_TRACE_AGENT_PROTOCOL_VERSION = ProtocolVersion.V0_4.asConfigValue();
+
+    static final boolean DEFAULT_CLIENT_IP_ENABLED = false;
+
+    static final int DEFAULT_CLOCK_SYNC_PERIOD = 30; // seconds
+
+    static final boolean DEFAULT_TRACE_LAMBDA_SNAPSTART_CLOCK_RESYNC_ENABLED = false;
+
+    static final TracePropagationBehaviorExtract DEFAULT_TRACE_PROPAGATION_BEHAVIOR_EXTRACT =
+            TracePropagationBehaviorExtract.CONTINUE;
+    static final boolean DEFAULT_TRACE_PROPAGATION_EXTRACT_FIRST = false;
+
+    static final boolean DEFAULT_JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_ENABLED = false;
+    static final int DEFAULT_JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_LIMIT = 10;
+
+    public static final boolean DEFAULT_LOGS_OTEL_ENABLED = false;
+    static final int DEFAULT_LOGS_OTEL_INTERVAL = 1_000; // ms
+    static final int DEFAULT_LOGS_OTEL_TIMEOUT = 30_000; // ms
+    static final int DEFAULT_LOGS_OTEL_QUEUE_SIZE = 2048;
+    static final int DEFAULT_LOGS_OTEL_BATCH_SIZE = 512;
+
+    public static final boolean DEFAULT_METRICS_OTEL_ENABLED = false;
+    // Default recommended by Datadog; it differs from Otel’s default of 60000 (60s)
+    static final int DEFAULT_METRICS_OTEL_INTERVAL = 10_000; // ms
+    // Default recommended by Datadog; it differs from Otel’s  default of 30000 (30s)
+    static final int DEFAULT_METRICS_OTEL_TIMEOUT = 7_500; // ms
+    static final int DEFAULT_METRICS_OTEL_CARDINALITY_LIMIT = 2_000;
+
+    static final int DEFAULT_TRACE_STATS_INTERVAL = 10_000; // ms
+
+    public static final boolean DEFAULT_METRICS_OTEL_EXPERIMENTAL_ENABLED = true;
+
+    public static final int DEFAULT_OTLP_TRACES_TIMEOUT = 10_000; // ms
+
+    static final String DEFAULT_OTLP_HTTP_LOGS_ENDPOINT = "v1/logs";
+    static final String DEFAULT_OTLP_HTTP_METRICS_ENDPOINT = "v1/metrics";
+    public static final String DEFAULT_OTLP_HTTP_TRACES_ENDPOINT = "v1/traces";
+    public static final String DEFAULT_OTLP_GRPC_TRACES_ENDPOINT =
+            "opentelemetry.proto.collector.trace.v1.TraceService/Export";
+    public static final String DEFAULT_OTLP_HTTP_PORT = "4318";
+    public static final String DEFAULT_OTLP_GRPC_PORT = "4317";
+
+    static final int DEFAULT_DOGSTATSD_START_DELAY = 15; // seconds
+
+    static final boolean DEFAULT_HEALTH_METRICS_ENABLED = true;
+    static final boolean DEFAULT_PERF_METRICS_ENABLED = false;
+    // No default constants for metrics statsd support -- falls back to jmxfetch values
+
+    // Change value to be false in new release. Until then, manually set logs_injection default
+    // value to false if config is under breaking changes flag
+    static final boolean DEFAULT_LOGS_INJECTION_ENABLED = true;
+
+    static final boolean DEFAULT_APP_LOGS_COLLECTION_ENABLED = false;
+
+    static final String DEFAULT_APPSEC_ENABLED = "inactive";
+    static final String DEFAULT_APPSEC_AGENTIC_ONBOARDING = "";
+    static final int DEFAULT_APPSEC_TRACE_RATE_LIMIT = 100;
+    static final boolean DEFAULT_APPSEC_WAF_METRICS = true;
+    static final int DEFAULT_APPSEC_WAF_TIMEOUT = 100000; // 0.1 s
+    static final boolean DEFAULT_API_SECURITY_ENABLED = true;
+    static final float DEFAULT_API_SECURITY_SAMPLE_DELAY = 30.0f;
+    static final boolean DEFAULT_API_SECURITY_ENDPOINT_COLLECTION_ENABLED = true;
+    static final int DEFAULT_API_SECURITY_ENDPOINT_COLLECTION_MESSAGE_LIMIT = 300;
+    static final double DEFAULT_API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE = 0.5D;
+    static final int DEFAULT_API_SECURITY_MAX_DOWNSTREAM_REQUEST_BODY_ANALYSIS = 1;
+    static final boolean DEFAULT_APPSEC_RASP_ENABLED = true;
+    static final boolean DEFAULT_APPSEC_STACK_TRACE_ENABLED = true;
+    static final int DEFAULT_APPSEC_MAX_STACK_TRACES = 2;
+    static final int DEFAULT_APPSEC_MAX_STACK_TRACE_DEPTH = 32;
+    static final int DEFAULT_APPSEC_MAX_COLLECTED_HEADERS = 50;
+    static final int DEFAULT_APPSEC_BODY_PARSING_SIZE_LIMIT = 10_000_000;
+    static final int DEFAULT_APPSEC_MAX_FILE_CONTENT_BYTES = 4096;
+    static final int DEFAULT_APPSEC_MAX_FILE_CONTENT_COUNT = 25;
+    static final int DEFAULT_APPSEC_SCA_MAX_TRACKED_DEPENDENCIES = 1_000;
+    static final String DEFAULT_IAST_ENABLED = "false";
+    static final boolean DEFAULT_IAST_DEBUG_ENABLED = false;
+    public static final int DEFAULT_IAST_MAX_CONCURRENT_REQUESTS = 4;
+    public static final int DEFAULT_IAST_VULNERABILITIES_PER_REQUEST = 2;
+    public static final int DEFAULT_IAST_REQUEST_SAMPLING = 33;
+    static final Set<String> DEFAULT_IAST_WEAK_HASH_ALGORITHMS =
+            new HashSet<>(asList("SHA1", "SHA-1", "MD2", "MD5", "RIPEMD128", "MD4"));
+    static final String DEFAULT_IAST_WEAK_CIPHER_ALGORITHMS =
+            "^(?:PBEWITH(?:HMACSHA(?:2(?:24ANDAES_(?:128|256)|56ANDAES_(?:128|256))|384ANDAES_(?:128|256)|512ANDAES_(?:128|256)|1ANDAES_(?:128|256))|SHA1AND(?:RC(?:2_(?:128|40)|4_(?:128|40))|DESEDE)|MD5AND(?:TRIPLEDES|DES))|DES(?:EDE(?:WRAP)?)?|BLOWFISH|ARCFOUR|RC2).*$";
+    static final boolean DEFAULT_IAST_REDACTION_ENABLED = true;
+    public static final String DEFAULT_IAST_REDACTION_NAME_PATTERN =
+            "(?:p(?:ass)?w(?:or)?d|pass(?:_?phrase)?|secret|(?:api_?|private_?|public_?|access_?|secret_?)key(?:_?id)?|token|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)";
+    public static final String DEFAULT_IAST_REDACTION_VALUE_PATTERN =
+            "(?:bearer\\s+[a-z0-9\\._\\-]+|glpat-[\\w\\-]{20}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L][\\w=\\-]+\\.ey[I-L][\\w=\\-]+(?:\\.[\\w.+/=\\-]+)?|(?:[\\-]{5}BEGIN[a-z\\s]+PRIVATE\\sKEY[\\-]{5}[^\\-]+[\\-]{5}END[a-z\\s]+PRIVATE\\sKEY[\\-]{5}|ssh-rsa\\s*[a-z0-9/\\.+]{100,}))";
+    public static final int DEFAULT_IAST_MAX_RANGE_COUNT = 10;
+    static final boolean DEFAULT_IAST_STACKTRACE_LEAK_SUPPRESS = false;
+
+    static final boolean DEFAULT_IAST_HARDCODED_SECRET_ENABLED = true;
+
+    static final int DEFAULT_IAST_TRUNCATION_MAX_VALUE_LENGTH = 250;
+    public static final boolean DEFAULT_IAST_DEDUPLICATION_ENABLED = true;
+    static final boolean DEFAULT_IAST_ANONYMOUS_CLASSES_ENABLED = true;
+
+    static final boolean DEFAULT_IAST_STACK_TRACE_ENABLED = true;
+    static final int DEFAULT_IAST_DB_ROWS_TO_TAINT = 1;
+
+    static final boolean DEFAULT_LLM_OBS_ENABLED = false;
+    static final boolean DEFAULT_LLM_OBS_AGENTLESS_ENABLED = false;
+    static final double DEFAULT_LLM_OBS_SAMPLE_RATE = 1.0;
+
+    static final boolean DEFAULT_USM_ENABLED = false;
+
+    static final boolean DEFAULT_CIVISIBILITY_ENABLED = false;
+    static final boolean DEFAULT_CIVISIBILITY_AGENTLESS_ENABLED = false;
+    static final boolean DEFAULT_CIVISIBILITY_SOURCE_DATA_ENABLED = true;
+    static final boolean DEFAULT_CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED = true;
+    static final boolean DEFAULT_CIVISIBILITY_AUTO_CONFIGURATION_ENABLED = true;
+    static final boolean DEFAULT_CIVISIBILITY_COMPILER_PLUGIN_AUTO_CONFIGURATION_ENABLED = true;
+    static final boolean DEFAULT_CIVISIBILITY_GRADLE_DEPENDENCY_VERIFICATION_ENABLED = false;
+    static final String DEFAULT_CIVISIBILITY_COMPILER_PLUGIN_VERSION = "0.2.4";
+    static final String DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_VERSION = "0.8.15";
+    static final String DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_EXCLUDES =
+            "datadog.trace.*:org.apache.commons.*:org.mockito.*";
+    static final boolean DEFAULT_CIVISIBILITY_GIT_UPLOAD_ENABLED = true;
+    static final boolean DEFAULT_CIVISIBILITY_GIT_UNSHALLOW_ENABLED = true;
+    static final long DEFAULT_CIVISIBILITY_GIT_COMMAND_TIMEOUT_MILLIS = 30_000;
+    static final long DEFAULT_CIVISIBILITY_BACKEND_API_TIMEOUT_MILLIS = 30_000;
+    static final long DEFAULT_CIVISIBILITY_GIT_UPLOAD_TIMEOUT_MILLIS = 60_000;
+    static final String DEFAULT_CIVISIBILITY_GIT_REMOTE_NAME = "origin";
+    static final String DEFAULT_CIVISIBILITY_SIGNAL_SERVER_HOST = "127.0.0.1";
+    static final int DEFAULT_CIVISIBILITY_SIGNAL_SERVER_PORT = 0;
+    static final List<String> DEFAULT_CIVISIBILITY_RESOURCE_FOLDER_NAMES =
+            asList("/resources/", "/java/", "/groovy/", "/kotlin/", "/scala/");
+
+    static final boolean DEFAULT_REMOTE_CONFIG_ENABLED = true;
+    static final boolean DEFAULT_REMOTE_CONFIG_INTEGRITY_CHECK_ENABLED = false;
+    static final int DEFAULT_REMOTE_CONFIG_MAX_PAYLOAD_SIZE = 5120; // KiB
+    static final int DEFAULT_REMOTE_CONFIG_POLL_INTERVAL_SECONDS = 5;
+    static final String DEFAULT_REMOTE_CONFIG_TARGETS_KEY_ID =
+            "5c4ece41241a1bb513f6e3e5df74ab7d5183dfffbd71bfd43127920d880569fd";
+    static final String DEFAULT_REMOTE_CONFIG_TARGETS_KEY =
+            "e3f1f98c9da02a93bb547f448b472d727e14b22455235796fe49863856252508";
+    static final int DEFAULT_REMOTE_CONFIG_MAX_EXTRA_SERVICES = 64;
+    static final boolean DEFAULT_DYNAMIC_INSTRUMENTATION_ENABLED = false;
+    static final int DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_TIMEOUT = 30; // seconds
+    static final int DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL = 0; // ms, 0 = dynamic
+    static final boolean DEFAULT_DYNAMIC_INSTRUMENTATION_CLASSFILE_DUMP_ENABLED = false;
+    static final int DEFAULT_DYNAMIC_INSTRUMENTATION_POLL_INTERVAL = 1; // seconds
+    static final int DEFAULT_DYNAMIC_INSTRUMENTATION_DIAGNOSTICS_INTERVAL = 60 * 60; // seconds
+    static final boolean DEFAULT_DYNAMIC_INSTRUMENTATION_METRICS_ENABLED = false;
+    static final int DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_BATCH_SIZE = 100;
+    static final int DEFAULT_DYNAMIC_INSTRUMENTATION_MAX_PAYLOAD_SIZE = 1024; // KiB
+    static final boolean DEFAULT_DYNAMIC_INSTRUMENTATION_VERIFY_BYTECODE = true;
+    static final String DEFAULT_DYNAMIC_INSTRUMENTATION_TIMEOUT_CHECKER_MODE = "WALL";
+    static final int DEFAULT_DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT = 100; // milliseconds
+    static final int DEFAULT_DYNAMIC_INSTRUMENTATION_EVAL_TIMEOUT = 50; // milliseconds
+    static final int DEFAULT_DYNAMIC_INSTRUMENTATION_LOCALVAR_HOISTING_LEVEL = 1;
+    static final boolean DEFAULT_SYMBOL_DATABASE_ENABLED = true;
+    static final boolean DEFAULT_SYMBOL_DATABASE_FORCE_UPLOAD = false;
+    static final int DEFAULT_SYMBOL_DATABASE_FLUSH_THRESHOLD = 100; // nb of classes
+    static final boolean DEFAULT_SYMBOL_DATABASE_COMPRESSED = true;
+    static final boolean DEFAULT_DEBUGGER_EXCEPTION_ENABLED = false;
+    static final int DEFAULT_DEBUGGER_MAX_EXCEPTION_PER_SECOND = 100;
+    static final boolean DEFAULT_DEBUGGER_EXCEPTION_ONLY_LOCAL_ROOT = false;
+    static final boolean DEFAULT_DEBUGGER_EXCEPTION_CAPTURE_INTERMEDIATE_SPANS_ENABLED = true;
+    static final int DEFAULT_DEBUGGER_EXCEPTION_MAX_CAPTURED_FRAMES = 3;
+    static final int DEFAULT_DEBUGGER_EXCEPTION_CAPTURE_INTERVAL_SECONDS = 60 * 60;
+    static final boolean DEFAULT_DISTRIBUTED_DEBUGGER_ENABLED = false;
+    static final boolean DEFAULT_DEBUGGER_SOURCE_FILE_TRACKING_ENABLED = true;
+
+    static final boolean DEFAULT_TRACE_REPORT_HOSTNAME = false;
+    static final String DEFAULT_TRACE_ANNOTATIONS = null;
+    static final boolean DEFAULT_TRACE_ANNOTATION_ASYNC = false;
+    static final boolean DEFAULT_TRACE_EXECUTORS_ALL = false;
+    static final String DEFAULT_TRACE_METHODS = null;
+    static final String DEFAULT_TRACE_NATIVE_METHODS = null;
+    static final String DEFAULT_MEASURE_METHODS = "";
+    static final String DEFAULT_MEASURE_NATIVE_METHODS = "";
+    static final boolean DEFAULT_TRACE_ANALYTICS_ENABLED = false;
+    static final float DEFAULT_ANALYTICS_SAMPLE_RATE = 1.0f;
+    static final int DEFAULT_TRACE_RATE_LIMIT = 100;
+
+    public static final boolean DEFAULT_ASYNC_PROPAGATING = true;
+
+    static final boolean DEFAULT_CWS_ENABLED = false;
+    static final int DEFAULT_CWS_TLS_REFRESH = 5000;
+
+    static final boolean DEFAULT_DATA_JOBS_ENABLED = false;
+    static final boolean DEFAULT_DATA_JOBS_OPENLINEAGE_ENABLED = false;
+    static final boolean DEFAULT_DATA_JOBS_OPENLINEAGE_TIMEOUT_ENABLED = true;
+    static final boolean DEFAULT_DATA_JOBS_PARSE_SPARK_PLAN_ENABLED = true;
+    static final boolean DEFAULT_DATA_JOBS_EXPERIMENTAL_FEATURES_ENABLED = false;
+
+    static final boolean DEFAULT_DATA_STREAMS_ENABLED = false;
+    static final int DEFAULT_DATA_STREAMS_BUCKET_DURATION = 10; // seconds
+
+    static final int DEFAULT_RESOLVER_RESET_INTERVAL = 300; // seconds
+
+    static final boolean DEFAULT_TELEMETRY_ENABLED = true;
+    static final int DEFAULT_TELEMETRY_HEARTBEAT_INTERVAL = 60; // in seconds
+    static final int DEFAULT_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL = 24 * 60 * 60; // 24 hours in seconds
+    static final int DEFAULT_TELEMETRY_METRICS_INTERVAL = 10; // in seconds
+    static final boolean DEFAULT_TELEMETRY_DEPENDENCY_COLLECTION_ENABLED = true;
+    static final boolean DEFAULT_TELEMETRY_LOG_COLLECTION_ENABLED = true;
+    static final int DEFAULT_TELEMETRY_DEPENDENCY_RESOLUTION_QUEUE_SIZE = 100000;
+
+    static final boolean DEFAULT_SERVICE_DISCOVERY_ENABLED = true;
+
+    static final boolean DEFAULT_RUM_ENABLED = false;
+    public static final String DEFAULT_RUM_SITE = DEFAULT_SITE;
+    public static final int DEFAULT_RUM_MAJOR_VERSION = 6;
+
+    static final boolean DEFAULT_SSI_INJECTION_FORCE = false;
+    static final String DEFAULT_INSTRUMENTATION_SOURCE = "manual";
+
+    static final Set<String> DEFAULT_TRACE_EXPERIMENTAL_FEATURES_ENABLED = new HashSet<>(asList(
+            "DD_TAGS",
+            "DD_LOGS_INJECTION",
+            "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED",
+            "DD_TRACE_STATS_ADDITIONAL_TAGS"));
+
+    static final boolean DEFAULT_TRACE_128_BIT_TRACEID_GENERATION_ENABLED = true;
+    static final boolean DEFAULT_TRACE_128_BIT_TRACEID_LOGGING_ENABLED = true;
+    static final boolean DEFAULT_SECURE_RANDOM = false;
+
+    public static final int DEFAULT_TRACE_X_DATADOG_TAGS_MAX_LENGTH = 512;
+
+    static final boolean DEFAULT_TRACE_HTTP_RESOURCE_REMOVE_TRAILING_SLASH = false;
+    static final boolean DEFAULT_TRACE_LONG_RUNNING_ENABLED = false;
+    static final long DEFAULT_TRACE_LONG_RUNNING_INITIAL_FLUSH_INTERVAL = 20; // seconds
+    static final long DEFAULT_TRACE_LONG_RUNNING_FLUSH_INTERVAL = 120; // seconds -> 2 minutes
+
+    static final float DEFAULT_TRACE_FLUSH_INTERVAL = 1;
+
+    static final long DEFAULT_TRACE_POST_PROCESSING_TIMEOUT = 1000; // 1 second
+
+    static final boolean DEFAULT_CASSANDRA_KEYSPACE_STATEMENT_EXTRACTION_ENABLED = false;
+    static final boolean DEFAULT_COUCHBASE_INTERNAL_SPANS_ENABLED = true;
+    static final boolean DEFAULT_ELASTICSEARCH_BODY_ENABLED = false;
+    static final boolean DEFAULT_ELASTICSEARCH_PARAMS_ENABLED = true;
+    static final boolean DEFAULT_ELASTICSEARCH_BODY_AND_PARAMS_ENABLED = false;
+
+    static final boolean DEFAULT_SPARK_TASK_HISTOGRAM_ENABLED = true;
+    static final boolean DEFAULT_SPARK_APP_NAME_AS_SERVICE = false;
+    static final boolean DEFAULT_JAX_RS_EXCEPTION_AS_ERROR_ENABLED = true;
+    static final boolean DEFAULT_TELEMETRY_DEBUG_REQUESTS_ENABLED = false;
+    static final boolean DEFAULT_WEBSOCKET_MESSAGES_ENABLED = true;
+    static final boolean DEFAULT_WEBSOCKET_MESSAGES_INHERIT_SAMPLING = true;
+    static final boolean DEFAULT_WEBSOCKET_MESSAGES_SEPARATE_TRACES = true;
+    static final boolean DEFAULT_WEBSOCKET_TAG_SESSION_ID = false;
+
+    static final Set<String> DEFAULT_TRACE_CLOUD_PAYLOAD_TAGGING_SERVICES = new HashSet<>(
+            Arrays.asList("ApiGateway", "ApiGatewayV2", "EventBridge", "Sqs", "Sns", "S3", "Kinesis", "DynamoDB"));
+
+    public static final String DEFAULT_TRACE_CLOUD_PAYLOAD_REQUEST_TAG = "aws.request.body";
+    public static final String DEFAULT_TRACE_CLOUD_PAYLOAD_RESPONSE_TAG = "aws.response.body";
+
+    public static final List<String> DEFAULT_CLOUD_COMMON_PAYLOAD_TAGGING = asList(
+            // Sns
+            "$.Attributes.KmsMasterKeyId",
+            "$.Attributes.Token",
+            // EventBridge (RedactionRulesExtractor.java for eventbridge-2015-10-07)
+            "$.AuthParameters.OAuthParameters.OAuthHttpParameters.HeaderParameters[*].Value",
+            "$.AuthParameters.OAuthParameters.OAuthHttpParameters.QueryStringParameters[*].Value",
+            "$.AuthParameters.OAuthParameters.OAuthHttpParameters.BodyParameters[*].Value",
+            "$.AuthParameters.InvocationHttpParameters.HeaderParameters[*].Value",
+            "$.AuthParameters.InvocationHttpParameters.QueryStringParameters[*].Value",
+            "$.AuthParameters.InvocationHttpParameters.BodyParameters[*].Value",
+            "$.Targets[*].RedshiftDataParameters.Sql",
+            "$.Targets[*].RedshiftDataParameters.Sqls",
+            "$.Targets[*].AppSyncParameters.GraphQLOperation",
+            // S3 (RedactionRulesExtractor.java for s3-2006-03-01)
+            "$.SSEKMSKeyId",
+            "$.SSEKMSEncryptionContext",
+            "$.ServerSideEncryptionConfiguration.Rules[*].ApplyServerSideEncryptionByDefault.KMSMasterKeyID",
+            "$.InventoryConfiguration.Destination.S3BucketDestination.Encryption.SSEKMS.KeyId");
+
+    public static final List<String> DEFAULT_CLOUD_REQUEST_PAYLOAD_TAGGING = asList(
+            // Sns
+            "$.Attributes.PlatformCredential",
+            "$.Attributes.PlatformPrincipal",
+            "$.AWSAccountId",
+            "$.Endpoint",
+            "$.Token",
+            "$.OneTimePassword",
+            // Sns (RedactionRulesExtractor.java for sns-2010-03-31)
+            "$.phoneNumber",
+            "$.PhoneNumber",
+            // EventBridge (RedactionRulesExtractor.java for eventbridge-2015-10-07)
+            "$.AuthParameters.BasicAuthParameters.Password",
+            "$.AuthParameters.OAuthParameters.ClientParameters.ClientSecret",
+            "$.AuthParameters.ApiKeyAuthParameters.ApiKeyValue",
+            // S3 (RedactionRulesExtractor.java for s3-2006-03-01)
+            "$.SSECustomerKey",
+            "$.CopySourceSSECustomerKey",
+            "$.RestoreRequest.OutputLocation.S3.Encryption.KMSKeyId");
+
+    public static final List<String> DEFAULT_CLOUD_RESPONSE_PAYLOAD_TAGGING = asList(
+            // Sns
+            "$.Endpoints.*.Token",
+            "$.PlatformApplication.*.PlatformCredential",
+            "$.PlatformApplication.*.PlatformPrincipal",
+            "$.Subscriptions.*.Endpoint",
+            // Sns (Generated by RedactionRulesExtractor.java for sns-2010-03-31)
+            "$.PhoneNumbers[*].PhoneNumber",
+            "$.phoneNumbers[*]",
+            // S3 (RedactionRulesExtractor.java for s3-2006-03-01)
+            "$.Credentials.SecretAccessKey",
+            "$.Credentials.SessionToken",
+            "$.InventoryConfigurationList[*].Destination.S3BucketDestination.Encryption.SSEKMS.KeyId");
+
+    private ConfigDefaults() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/CorrelationIdentifier.java b/dd-trace-api/src/main/java/datadog/trace/api/CorrelationIdentifier.java
index 7e416ad4618..0f19d7b190c 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/CorrelationIdentifier.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/CorrelationIdentifier.java
@@ -6,28 +6,28 @@
  * <p>Intended for use with MDC frameworks.
  */
 public class CorrelationIdentifier {
-  private static final String TRACE_ID_KEY = "dd.trace_id";
-  private static final String SPAN_ID_KEY = "dd.span_id";
+    private static final String TRACE_ID_KEY = "dd.trace_id";
+    private static final String SPAN_ID_KEY = "dd.span_id";
 
-  /**
-   * @return The trace-id key to use with datadog logs integration
-   */
-  public static String getTraceIdKey() {
-    return TRACE_ID_KEY;
-  }
+    /**
+     * @return The trace-id key to use with datadog logs integration
+     */
+    public static String getTraceIdKey() {
+        return TRACE_ID_KEY;
+    }
 
-  /**
-   * @return The span-id key to use with datadog logs integration
-   */
-  public static String getSpanIdKey() {
-    return SPAN_ID_KEY;
-  }
+    /**
+     * @return The span-id key to use with datadog logs integration
+     */
+    public static String getSpanIdKey() {
+        return SPAN_ID_KEY;
+    }
 
-  public static String getTraceId() {
-    return GlobalTracer.get().getTraceId();
-  }
+    public static String getTraceId() {
+        return GlobalTracer.get().getTraceId();
+    }
 
-  public static String getSpanId() {
-    return GlobalTracer.get().getSpanId();
-  }
+    public static String getSpanId() {
+        return GlobalTracer.get().getSpanId();
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/DD128bTraceId.java b/dd-trace-api/src/main/java/datadog/trace/api/DD128bTraceId.java
index a08073659c0..24abd69359d 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/DD128bTraceId.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/DD128bTraceId.java
@@ -16,166 +16,159 @@
  * 63-bit id.
  */
 public class DD128bTraceId extends DDTraceId {
-  public static final DD128bTraceId ZERO =
-      new DD128bTraceId(0, 0, "00000000000000000000000000000000");
-
-  /** Represents the high-order 64 bits of the 128-bit trace id. */
-  private final long highOrderBits;
-
-  /** Represents the low-order 64 bits of the 128-bit trace id. */
-  private final long lowOrderBits;
-
-  /**
-   * The lower-case, zero-padded, 32 hexadecimal characters {@link String} representation of the
-   * {@link DDTraceId} instance.
-   */
-  private String hexStr;
-
-  /** The 64-bit only decimal {@link String} representation of the {@link DDTraceId} instance. */
-  private String str;
-
-  private DD128bTraceId(long highOrderBits, long leastSigBits, String hexStr) {
-    this.highOrderBits = highOrderBits;
-    this.lowOrderBits = leastSigBits;
-    this.hexStr = hexStr;
-  }
-
-  /**
-   * Create a new 128-bit {@link DD128bTraceId} from the given {@code long}s interpreted as high
-   * order and low order bits of the 128-bit id.
-   *
-   * @param highOrderBits A {@code long} representing the high-order bits of the {@link
-   *     DD128bTraceId}.
-   * @param lowOrderBits A {@code long} representing the random id low-order bits.
-   * @return The created TraceId instance.
-   */
-  public static DD128bTraceId from(long highOrderBits, long lowOrderBits) {
-    return new DD128bTraceId(highOrderBits, lowOrderBits, null);
-  }
-
-  /**
-   * Create a new 128-bit {@link DD128bTraceId} from the given hexadecimal {@link String}
-   * representation.
-   *
-   * @param s The hexadecimal {@link String} representation to parse (a 32 lower-case hexadecimal
-   *     characters maximum).
-   * @return The created TraceId instance.
-   * @throws NumberFormatException If the hexadecimal {@link String} representation is not valid.
-   */
-  public static DD128bTraceId fromHex(String s) throws NumberFormatException {
-    return fromHex(s, 0, s == null ? 0 : s.length(), true);
-  }
-
-  /**
-   * Create a new 128-bit {@link DD128bTraceId} from the given hexadecimal {@link String}
-   * representation.
-   *
-   * @param s The string containing the hexadecimal {@link String} representation to parse (32 lower
-   *     or higher-case hexadecimal characters maximum).
-   * @param start The start index of the hexadecimal {@link String} representation to parse.
-   * @param length The length of the hexadecimal {@link String} representation to parse.
-   * @param lowerCaseOnly Whether the hexadecimal characters to parse are lower-case only or not.
-   * @return The created TraceId instance.
-   * @throws NumberFormatException If the hexadecimal {@link String} representation is not valid.
-   */
-  public static DD128bTraceId fromHex(String s, int start, int length, boolean lowerCaseOnly)
-      throws NumberFormatException {
-    if (s == null) {
-      throw new NumberFormatException("s can't be null");
+    public static final DD128bTraceId ZERO = new DD128bTraceId(0, 0, "00000000000000000000000000000000");
+
+    /** Represents the high-order 64 bits of the 128-bit trace id. */
+    private final long highOrderBits;
+
+    /** Represents the low-order 64 bits of the 128-bit trace id. */
+    private final long lowOrderBits;
+
+    /**
+     * The lower-case, zero-padded, 32 hexadecimal characters {@link String} representation of the
+     * {@link DDTraceId} instance.
+     */
+    private String hexStr;
+
+    /** The 64-bit only decimal {@link String} representation of the {@link DDTraceId} instance. */
+    private String str;
+
+    private DD128bTraceId(long highOrderBits, long leastSigBits, String hexStr) {
+        this.highOrderBits = highOrderBits;
+        this.lowOrderBits = leastSigBits;
+        this.hexStr = hexStr;
+    }
+
+    /**
+     * Create a new 128-bit {@link DD128bTraceId} from the given {@code long}s interpreted as high
+     * order and low order bits of the 128-bit id.
+     *
+     * @param highOrderBits A {@code long} representing the high-order bits of the {@link
+     *     DD128bTraceId}.
+     * @param lowOrderBits A {@code long} representing the random id low-order bits.
+     * @return The created TraceId instance.
+     */
+    public static DD128bTraceId from(long highOrderBits, long lowOrderBits) {
+        return new DD128bTraceId(highOrderBits, lowOrderBits, null);
+    }
+
+    /**
+     * Create a new 128-bit {@link DD128bTraceId} from the given hexadecimal {@link String}
+     * representation.
+     *
+     * @param s The hexadecimal {@link String} representation to parse (a 32 lower-case hexadecimal
+     *     characters maximum).
+     * @return The created TraceId instance.
+     * @throws NumberFormatException If the hexadecimal {@link String} representation is not valid.
+     */
+    public static DD128bTraceId fromHex(String s) throws NumberFormatException {
+        return fromHex(s, 0, s == null ? 0 : s.length(), true);
     }
-    int stringLength = s.length();
-    if (start < 0 || length <= 0 || length > 32 || start + length > stringLength) {
-      throw new NumberFormatException("Illegal start or length");
+
+    /**
+     * Create a new 128-bit {@link DD128bTraceId} from the given hexadecimal {@link String}
+     * representation.
+     *
+     * @param s The string containing the hexadecimal {@link String} representation to parse (32 lower
+     *     or higher-case hexadecimal characters maximum).
+     * @param start The start index of the hexadecimal {@link String} representation to parse.
+     * @param length The length of the hexadecimal {@link String} representation to parse.
+     * @param lowerCaseOnly Whether the hexadecimal characters to parse are lower-case only or not.
+     * @return The created TraceId instance.
+     * @throws NumberFormatException If the hexadecimal {@link String} representation is not valid.
+     */
+    public static DD128bTraceId fromHex(String s, int start, int length, boolean lowerCaseOnly)
+            throws NumberFormatException {
+        if (s == null) {
+            throw new NumberFormatException("s can't be null");
+        }
+        int stringLength = s.length();
+        if (start < 0 || length <= 0 || length > 32 || start + length > stringLength) {
+            throw new NumberFormatException("Illegal start or length");
+        }
+        // Parse high and low order bits
+        long highOrderBits, lowOrderBits;
+        if (length > 16) {
+            int highOrderLength = length - 16;
+            highOrderBits = LongStringUtils.parseUnsignedLongHex(s, start, highOrderLength, lowerCaseOnly);
+            lowOrderBits = LongStringUtils.parseUnsignedLongHex(s, start + highOrderLength, 16, lowerCaseOnly);
+        } else {
+            highOrderBits = 0;
+            lowOrderBits = LongStringUtils.parseUnsignedLongHex(s, start, length, lowerCaseOnly);
+        }
+        // Extract hexadecimal string representation to cache
+        String hexStr = null;
+        if (length == 32) {
+            if (start == 0) {
+                hexStr = s;
+            } else {
+                hexStr = s.substring(start, start + 32);
+            }
+            if (!lowerCaseOnly) {
+                hexStr = hexStr.toLowerCase(Locale.ROOT);
+            }
+        }
+        return new DD128bTraceId(highOrderBits, lowOrderBits, hexStr);
     }
-    // Parse high and low order bits
-    long highOrderBits, lowOrderBits;
-    if (length > 16) {
-      int highOrderLength = length - 16;
-      highOrderBits =
-          LongStringUtils.parseUnsignedLongHex(s, start, highOrderLength, lowerCaseOnly);
-      lowOrderBits =
-          LongStringUtils.parseUnsignedLongHex(s, start + highOrderLength, 16, lowerCaseOnly);
-    } else {
-      highOrderBits = 0;
-      lowOrderBits = LongStringUtils.parseUnsignedLongHex(s, start, length, lowerCaseOnly);
+
+    /**
+     * Returns the lower-case zero-padded 32 hexadecimal characters {@link String} representation of
+     * the {@link DD128bTraceId}.
+     *
+     * @return A lower-case zero-padded 32 hexadecimal characters {@link String} representation of the
+     *     {@link DD128bTraceId} instance.
+     */
+    @Override
+    public String toHexString() {
+        String hexString = this.hexStr;
+        // This race condition is intentional and benign.
+        // The worst that can happen is that an identical value is produced and written into the field.
+        if (hexString == null) {
+            this.hexStr = hexString = LongStringUtils.toHexStringPadded(this.highOrderBits, this.lowOrderBits, 32);
+        }
+        return hexString;
     }
-    // Extract hexadecimal string representation to cache
-    String hexStr = null;
-    if (length == 32) {
-      if (start == 0) {
-        hexStr = s;
-      } else {
-        hexStr = s.substring(start, start + 32);
-      }
-      if (!lowerCaseOnly) {
-        hexStr = hexStr.toLowerCase(Locale.ROOT);
-      }
+
+    @Override
+    public String toHexStringPadded(int size) {
+        if (size <= 16) {
+            return LongStringUtils.toHexStringPadded(this.lowOrderBits, 16);
+        }
+        return toHexString();
     }
-    return new DD128bTraceId(highOrderBits, lowOrderBits, hexStr);
-  }
-
-  /**
-   * Returns the lower-case zero-padded 32 hexadecimal characters {@link String} representation of
-   * the {@link DD128bTraceId}.
-   *
-   * @return A lower-case zero-padded 32 hexadecimal characters {@link String} representation of the
-   *     {@link DD128bTraceId} instance.
-   */
-  @Override
-  public String toHexString() {
-    String hexString = this.hexStr;
-    // This race condition is intentional and benign.
-    // The worst that can happen is that an identical value is produced and written into the field.
-    if (hexString == null) {
-      this.hexStr =
-          hexString = LongStringUtils.toHexStringPadded(this.highOrderBits, this.lowOrderBits, 32);
+
+    @Override
+    public long toLong() {
+        return this.lowOrderBits;
     }
-    return hexString;
-  }
 
-  @Override
-  public String toHexStringPadded(int size) {
-    if (size <= 16) {
-      return LongStringUtils.toHexStringPadded(this.lowOrderBits, 16);
+    @Override
+    public long toHighOrderLong() {
+        return this.highOrderBits;
     }
-    return toHexString();
-  }
-
-  @Override
-  public long toLong() {
-    return this.lowOrderBits;
-  }
-
-  @Override
-  public long toHighOrderLong() {
-    return this.highOrderBits;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (!(o instanceof DD128bTraceId)) return false;
-    DD128bTraceId ddId = (DD128bTraceId) o;
-    return this.highOrderBits == ddId.highOrderBits && this.lowOrderBits == ddId.lowOrderBits;
-  }
-
-  @Override
-  public int hashCode() {
-    return (int)
-        (this.highOrderBits
-            ^ (this.highOrderBits >>> 32)
-            ^ this.lowOrderBits
-            ^ (this.lowOrderBits >>> 32));
-  }
-
-  @Override
-  public String toString() {
-    String s = this.str;
-    // This race condition is intentional and benign.
-    // The worst that can happen is that an identical value is produced and written into the field.
-    if (s == null) {
-      this.str = s = Long.toUnsignedString(this.lowOrderBits);
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof DD128bTraceId)) return false;
+        DD128bTraceId ddId = (DD128bTraceId) o;
+        return this.highOrderBits == ddId.highOrderBits && this.lowOrderBits == ddId.lowOrderBits;
+    }
+
+    @Override
+    public int hashCode() {
+        return (int)
+                (this.highOrderBits ^ (this.highOrderBits >>> 32) ^ this.lowOrderBits ^ (this.lowOrderBits >>> 32));
+    }
+
+    @Override
+    public String toString() {
+        String s = this.str;
+        // This race condition is intentional and benign.
+        // The worst that can happen is that an identical value is produced and written into the field.
+        if (s == null) {
+            this.str = s = Long.toUnsignedString(this.lowOrderBits);
+        }
+        return s;
     }
-    return s;
-  }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/DD64bTraceId.java b/dd-trace-api/src/main/java/datadog/trace/api/DD64bTraceId.java
index f40b47a89d4..95510408772 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/DD64bTraceId.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/DD64bTraceId.java
@@ -10,117 +10,116 @@
  * demand and cached.
  */
 public class DD64bTraceId extends DDTraceId {
-  public static final DD64bTraceId MAX =
-      new DD64bTraceId(-1, "18446744073709551615"); // All bits set
+    public static final DD64bTraceId MAX = new DD64bTraceId(-1, "18446744073709551615"); // All bits set
 
-  private final long id;
-  private String str; // cache for string representation
-  private String hexStr; // cache for hex string representation
+    private final long id;
+    private String str; // cache for string representation
+    private String hexStr; // cache for hex string representation
 
-  DD64bTraceId(long id, String str) {
-    this.id = id;
-    this.str = str;
-  }
+    DD64bTraceId(long id, String str) {
+        this.id = id;
+        this.str = str;
+    }
 
-  /**
-   * Create a new {@link DD64bTraceId} from the given {@code long} interpreted as the bits of the
-   * unsigned 64-bit id. This means that values larger than Long.MAX_VALUE will be represented as
-   * negative numbers.
-   *
-   * @param id The {@code long} representing the bits of the unsigned 64-bit id.
-   * @return A new {@link DD64bTraceId} instance.
-   */
-  public static DD64bTraceId from(long id) {
-    return DD64bTraceId.create(id, null);
-  }
+    /**
+     * Create a new {@link DD64bTraceId} from the given {@code long} interpreted as the bits of the
+     * unsigned 64-bit id. This means that values larger than Long.MAX_VALUE will be represented as
+     * negative numbers.
+     *
+     * @param id The {@code long} representing the bits of the unsigned 64-bit id.
+     * @return A new {@link DD64bTraceId} instance.
+     */
+    public static DD64bTraceId from(long id) {
+        return DD64bTraceId.create(id, null);
+    }
 
-  /**
-   * Create a new {@code DDTraceId} from the given {@code String} representation of the unsigned 64
-   * bit id.
-   *
-   * @param s String of unsigned 64 bit id
-   * @return DDTraceId
-   * @throws NumberFormatException
-   */
-  public static DD64bTraceId from(String s) throws NumberFormatException {
-    return DD64bTraceId.create(LongStringUtils.parseUnsignedLong(s), s);
-  }
+    /**
+     * Create a new {@code DDTraceId} from the given {@code String} representation of the unsigned 64
+     * bit id.
+     *
+     * @param s String of unsigned 64 bit id
+     * @return DDTraceId
+     * @throws NumberFormatException
+     */
+    public static DD64bTraceId from(String s) throws NumberFormatException {
+        return DD64bTraceId.create(LongStringUtils.parseUnsignedLong(s), s);
+    }
 
-  /**
-   * Create a new {@code DDTraceId} from the given {@code String} hex representation of the unsigned
-   * 64 bit id.
-   *
-   * @param s String in hex of unsigned 64 bit id
-   * @return DDTraceId
-   * @throws NumberFormatException
-   */
-  public static DD64bTraceId fromHex(String s) throws NumberFormatException {
-    return DD64bTraceId.create(LongStringUtils.parseUnsignedLongHex(s), null);
-  }
+    /**
+     * Create a new {@code DDTraceId} from the given {@code String} hex representation of the unsigned
+     * 64 bit id.
+     *
+     * @param s String in hex of unsigned 64 bit id
+     * @return DDTraceId
+     * @throws NumberFormatException
+     */
+    public static DD64bTraceId fromHex(String s) throws NumberFormatException {
+        return DD64bTraceId.create(LongStringUtils.parseUnsignedLongHex(s), null);
+    }
 
-  static DD64bTraceId create(long id, String str) {
-    // ZERO constant is created and stored by the parent class as part of its API contract
-    // But initialized by this 64-bit child class. Ensures uniqueness of ZERO once created.
-    if (id == 0 && ZERO != null) {
-      return (DD64bTraceId) ZERO;
-    } else if (id == -1) {
-      return MAX;
-    } else {
-      return new DD64bTraceId(id, str);
+    static DD64bTraceId create(long id, String str) {
+        // ZERO constant is created and stored by the parent class as part of its API contract
+        // But initialized by this 64-bit child class. Ensures uniqueness of ZERO once created.
+        if (id == 0 && ZERO != null) {
+            return (DD64bTraceId) ZERO;
+        } else if (id == -1) {
+            return MAX;
+        } else {
+            return new DD64bTraceId(id, str);
+        }
     }
-  }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (!(o instanceof DD64bTraceId)) return false;
-    DD64bTraceId ddId = (DD64bTraceId) o;
-    return this.id == ddId.id;
-  }
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof DD64bTraceId)) return false;
+        DD64bTraceId ddId = (DD64bTraceId) o;
+        return this.id == ddId.id;
+    }
 
-  @Override
-  public int hashCode() {
-    long id = this.id;
-    return (int) (id ^ (id >>> 32));
-  }
+    @Override
+    public int hashCode() {
+        long id = this.id;
+        return (int) (id ^ (id >>> 32));
+    }
 
-  @Override
-  public String toString() {
-    String s = this.str;
-    // This race condition is intentional and benign.
-    // The worst that can happen is that an identical value is produced and written into the field.
-    if (s == null) {
-      this.str = s = Long.toUnsignedString(this.id);
+    @Override
+    public String toString() {
+        String s = this.str;
+        // This race condition is intentional and benign.
+        // The worst that can happen is that an identical value is produced and written into the field.
+        if (s == null) {
+            this.str = s = Long.toUnsignedString(this.id);
+        }
+        return s;
     }
-    return s;
-  }
 
-  @Override
-  public String toHexString() {
-    String hexStr = this.hexStr;
-    // This race condition is intentional and benign.
-    // The worst that can happen is that an identical value is produced and written into the field.
-    if (hexStr == null) {
-      this.hexStr = hexStr = LongStringUtils.toHexStringPadded(this.id, 32);
+    @Override
+    public String toHexString() {
+        String hexStr = this.hexStr;
+        // This race condition is intentional and benign.
+        // The worst that can happen is that an identical value is produced and written into the field.
+        if (hexStr == null) {
+            this.hexStr = hexStr = LongStringUtils.toHexStringPadded(this.id, 32);
+        }
+        return hexStr;
     }
-    return hexStr;
-  }
 
-  @Override
-  public String toHexStringPadded(int size) {
-    if (size > 16) {
-      return toHexString();
+    @Override
+    public String toHexStringPadded(int size) {
+        if (size > 16) {
+            return toHexString();
+        }
+        return LongStringUtils.toHexStringPadded(this.id, size);
     }
-    return LongStringUtils.toHexStringPadded(this.id, size);
-  }
 
-  @Override
-  public long toLong() {
-    return this.id;
-  }
+    @Override
+    public long toLong() {
+        return this.id;
+    }
 
-  @Override
-  public long toHighOrderLong() {
-    return 0;
-  }
+    @Override
+    public long toHighOrderLong() {
+        return 0;
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/DDSpanId.java b/dd-trace-api/src/main/java/datadog/trace/api/DDSpanId.java
index 4925370f439..184aaf05fdc 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/DDSpanId.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/DDSpanId.java
@@ -5,83 +5,82 @@
 /** Class with methods for working with the unsigned 64 bit id used for Span ids. */
 public final class DDSpanId {
 
-  // Don't allow instances
-  private DDSpanId() {}
+    // Don't allow instances
+    private DDSpanId() {}
 
-  /** The ZERO span id is not allowed and means no span. */
-  public static final long ZERO = 0;
+    /** The ZERO span id is not allowed and means no span. */
+    public static final long ZERO = 0;
 
-  // All bits set, only used from tests
-  public static final long MAX = -1;
+    // All bits set, only used from tests
+    public static final long MAX = -1;
 
-  /**
-   * Parse the span id from the given {@code String} representation of the unsigned 64 bit id.
-   *
-   * @param s String of unsigned 64 bit id
-   * @return long
-   * @throws NumberFormatException
-   */
-  public static long from(String s) throws NumberFormatException {
-    return LongStringUtils.parseUnsignedLong(s);
-  }
+    /**
+     * Parse the span id from the given {@code String} representation of the unsigned 64 bit id.
+     *
+     * @param s String of unsigned 64 bit id
+     * @return long
+     * @throws NumberFormatException
+     */
+    public static long from(String s) throws NumberFormatException {
+        return LongStringUtils.parseUnsignedLong(s);
+    }
 
-  /**
-   * Parse the span id from the given {@code String} hex representation of the unsigned 64 bit id.
-   *
-   * @param s String in hex of unsigned 64 bit id
-   * @return long
-   * @throws NumberFormatException
-   */
-  public static long fromHex(String s) throws NumberFormatException {
-    return LongStringUtils.parseUnsignedLongHex(s);
-  }
+    /**
+     * Parse the span id from the given {@code String} hex representation of the unsigned 64 bit id.
+     *
+     * @param s String in hex of unsigned 64 bit id
+     * @return long
+     * @throws NumberFormatException
+     */
+    public static long fromHex(String s) throws NumberFormatException {
+        return LongStringUtils.parseUnsignedLongHex(s);
+    }
 
-  /**
-   * Parse the span id from the given {@code String} hex representation of the unsigned 64 bit id.
-   *
-   * @param s String in hex of unsigned 64 bit id
-   * @param start the start index of the hex value
-   * @param len the len of the hex value
-   * @param lowerCaseOnly if the allowed hex characters are lower case only
-   * @return long
-   * @throws NumberFormatException
-   */
-  public static long fromHex(String s, int start, int len, boolean lowerCaseOnly)
-      throws NumberFormatException {
-    return LongStringUtils.parseUnsignedLongHex(s, start, len, lowerCaseOnly);
-  }
+    /**
+     * Parse the span id from the given {@code String} hex representation of the unsigned 64 bit id.
+     *
+     * @param s String in hex of unsigned 64 bit id
+     * @param start the start index of the hex value
+     * @param len the len of the hex value
+     * @param lowerCaseOnly if the allowed hex characters are lower case only
+     * @return long
+     * @throws NumberFormatException
+     */
+    public static long fromHex(String s, int start, int len, boolean lowerCaseOnly) throws NumberFormatException {
+        return LongStringUtils.parseUnsignedLongHex(s, start, len, lowerCaseOnly);
+    }
 
-  /**
-   * Returns the decimal string representation of the unsigned 64 bit id. The {@code String} will
-   * NOT be cached.
-   *
-   * @param id the long 64 bit id to generate a String for
-   * @return decimal string
-   */
-  public static String toString(long id) {
-    // TODO Cache here? https://github.com/DataDog/dd-trace-java/issues/4236
-    return Long.toUnsignedString(id);
-  }
+    /**
+     * Returns the decimal string representation of the unsigned 64 bit id. The {@code String} will
+     * NOT be cached.
+     *
+     * @param id the long 64 bit id to generate a String for
+     * @return decimal string
+     */
+    public static String toString(long id) {
+        // TODO Cache here? https://github.com/DataDog/dd-trace-java/issues/4236
+        return Long.toUnsignedString(id);
+    }
 
-  /**
-   * Returns the no zero padded hex representation, in lower case, of the unsigned 64 bit id. The
-   * hex {@code String} will NOT be cached.
-   *
-   * @return non zero padded hex String
-   */
-  public static String toHexString(long id) {
-    // TODO Cache here? https://github.com/DataDog/dd-trace-java/issues/4236
-    return Long.toHexString(id);
-  }
+    /**
+     * Returns the no zero padded hex representation, in lower case, of the unsigned 64 bit id. The
+     * hex {@code String} will NOT be cached.
+     *
+     * @return non zero padded hex String
+     */
+    public static String toHexString(long id) {
+        // TODO Cache here? https://github.com/DataDog/dd-trace-java/issues/4236
+        return Long.toHexString(id);
+    }
 
-  /**
-   * Returns the zero padded hex representation, in lower case, of the unsigned 64 bit id. The size
-   * will be rounded up to 16 characters. The hex {@code String} will NOT be cached.
-   *
-   * @return zero padded hex String
-   */
-  public static String toHexStringPadded(long id) {
-    // TODO Cache here? https://github.com/DataDog/dd-trace-java/issues/4236
-    return LongStringUtils.toHexStringPadded(id, 16);
-  }
+    /**
+     * Returns the zero padded hex representation, in lower case, of the unsigned 64 bit id. The size
+     * will be rounded up to 16 characters. The hex {@code String} will NOT be cached.
+     *
+     * @return zero padded hex String
+     */
+    public static String toHexStringPadded(long id) {
+        // TODO Cache here? https://github.com/DataDog/dd-trace-java/issues/4236
+        return LongStringUtils.toHexStringPadded(id, 16);
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/DDSpanTypes.java b/dd-trace-api/src/main/java/datadog/trace/api/DDSpanTypes.java
index 4e41df93738..1e783f62a84 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/DDSpanTypes.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/DDSpanTypes.java
@@ -1,46 +1,49 @@
 package datadog.trace.api;
 
 public class DDSpanTypes {
-  public static final String HTTP_CLIENT = "http";
-  public static final String HTTP_SERVER = "web";
-  @Deprecated public static final String WEB_SERVLET = HTTP_SERVER;
-  public static final String RPC = "rpc";
-  public static final String CACHE = "cache";
-  public static final String SOAP = "soap";
-
-  public static final String SQL = "sql";
-  public static final String MONGO = "mongodb";
-  public static final String CASSANDRA = "cassandra";
-  public static final String COUCHBASE = "db"; // Using generic for now.
-  public static final String REDIS = "redis";
-  public static final String MEMCACHED = "memcached";
-  public static final String ELASTICSEARCH = "elasticsearch";
-  public static final String OPENSEARCH = "opensearch";
-  public static final String HIBERNATE = "hibernate";
-  public static final String AEROSPIKE = "aerospike";
-  public static final String DATANUCLEUS = "datanucleus";
-
-  public static final String MESSAGE_CLIENT = "queue";
-  public static final String MESSAGE_CONSUMER = "queue";
-  public static final String MESSAGE_PRODUCER = "queue";
-  public static final String MESSAGE_BROKER = "queue";
-
-  public static final String GRAPHQL = "graphql";
-
-  public static final String TEST = "test";
-  public static final String TEST_SUITE_END = "test_suite_end";
-  public static final String TEST_MODULE_END = "test_module_end";
-  public static final String TEST_SESSION_END = "test_session_end";
-
-  public static final String VULNERABILITY = "vulnerability";
-  public static final String PROTOBUF = "protobuf";
-
-  public static final String MULE = "mule";
-
-  public static final String VALKEY = "valkey";
-  public static final String WEBSOCKET = "websocket";
-
-  public static final String SERVERLESS = "serverless";
-
-  public static final String LLMOBS = "llm";
+    public static final String HTTP_CLIENT = "http";
+    public static final String HTTP_SERVER = "web";
+
+    @Deprecated
+    public static final String WEB_SERVLET = HTTP_SERVER;
+
+    public static final String RPC = "rpc";
+    public static final String CACHE = "cache";
+    public static final String SOAP = "soap";
+
+    public static final String SQL = "sql";
+    public static final String MONGO = "mongodb";
+    public static final String CASSANDRA = "cassandra";
+    public static final String COUCHBASE = "db"; // Using generic for now.
+    public static final String REDIS = "redis";
+    public static final String MEMCACHED = "memcached";
+    public static final String ELASTICSEARCH = "elasticsearch";
+    public static final String OPENSEARCH = "opensearch";
+    public static final String HIBERNATE = "hibernate";
+    public static final String AEROSPIKE = "aerospike";
+    public static final String DATANUCLEUS = "datanucleus";
+
+    public static final String MESSAGE_CLIENT = "queue";
+    public static final String MESSAGE_CONSUMER = "queue";
+    public static final String MESSAGE_PRODUCER = "queue";
+    public static final String MESSAGE_BROKER = "queue";
+
+    public static final String GRAPHQL = "graphql";
+
+    public static final String TEST = "test";
+    public static final String TEST_SUITE_END = "test_suite_end";
+    public static final String TEST_MODULE_END = "test_module_end";
+    public static final String TEST_SESSION_END = "test_session_end";
+
+    public static final String VULNERABILITY = "vulnerability";
+    public static final String PROTOBUF = "protobuf";
+
+    public static final String MULE = "mule";
+
+    public static final String VALKEY = "valkey";
+    public static final String WEBSOCKET = "websocket";
+
+    public static final String SERVERLESS = "serverless";
+
+    public static final String LLMOBS = "llm";
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java b/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java
index 756048551c9..b7f428786e6 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java
@@ -2,108 +2,105 @@
 
 public class DDTags {
 
-  public static final String DD_CODE_ORIGIN_PREFIX = "_dd.code_origin.";
-
-  public static final String DD_CODE_ORIGIN_TYPE = DD_CODE_ORIGIN_PREFIX + "type";
-  // _dd.code_origin.frames.%d.file|line|method|type|snapshot_id
-  public static final String DD_CODE_ORIGIN_FRAME_FILE = DD_CODE_ORIGIN_PREFIX + "frames.0.file";
-  public static final String DD_CODE_ORIGIN_FRAME_TYPE = DD_CODE_ORIGIN_PREFIX + "frames.0.type";
-  public static final String DD_CODE_ORIGIN_FRAME_METHOD =
-      DD_CODE_ORIGIN_PREFIX + "frames.0.method";
-  public static final String DD_CODE_ORIGIN_FRAME_SIGNATURE =
-      DD_CODE_ORIGIN_PREFIX + "frames.0.signature";
-  public static final String DD_CODE_ORIGIN_FRAME_LINE = DD_CODE_ORIGIN_PREFIX + "frames.0.line";
-  public static final String DD_CODE_ORIGIN_FRAME_SNAPSHOT_ID =
-      DD_CODE_ORIGIN_PREFIX + "frames.0.snapshot_id";
-
-  public static final String[] REQUIRED_CODE_ORIGIN_TAGS =
-      new String[] {
+    public static final String DD_CODE_ORIGIN_PREFIX = "_dd.code_origin.";
+
+    public static final String DD_CODE_ORIGIN_TYPE = DD_CODE_ORIGIN_PREFIX + "type";
+    // _dd.code_origin.frames.%d.file|line|method|type|snapshot_id
+    public static final String DD_CODE_ORIGIN_FRAME_FILE = DD_CODE_ORIGIN_PREFIX + "frames.0.file";
+    public static final String DD_CODE_ORIGIN_FRAME_TYPE = DD_CODE_ORIGIN_PREFIX + "frames.0.type";
+    public static final String DD_CODE_ORIGIN_FRAME_METHOD = DD_CODE_ORIGIN_PREFIX + "frames.0.method";
+    public static final String DD_CODE_ORIGIN_FRAME_SIGNATURE = DD_CODE_ORIGIN_PREFIX + "frames.0.signature";
+    public static final String DD_CODE_ORIGIN_FRAME_LINE = DD_CODE_ORIGIN_PREFIX + "frames.0.line";
+    public static final String DD_CODE_ORIGIN_FRAME_SNAPSHOT_ID = DD_CODE_ORIGIN_PREFIX + "frames.0.snapshot_id";
+
+    public static final String[] REQUIRED_CODE_ORIGIN_TAGS = new String[] {
         DD_CODE_ORIGIN_TYPE,
         DD_CODE_ORIGIN_FRAME_FILE,
         DD_CODE_ORIGIN_FRAME_METHOD,
         DD_CODE_ORIGIN_FRAME_LINE,
         DD_CODE_ORIGIN_FRAME_TYPE,
         DD_CODE_ORIGIN_FRAME_SIGNATURE,
-      };
-
-  public static final String SPAN_TYPE = "span.type";
-  public static final String SERVICE_NAME = "service.name";
-  public static final String RESOURCE_NAME = "resource.name";
-  public static final String THREAD_NAME = "thread.name";
-  public static final String THREAD_ID = "thread.id";
-  public static final String DB_STATEMENT = "sql.query";
-  public static final String PATHWAY_HASH = "pathway.hash";
-
-  public static final String HTTP_QUERY = "http.query.string";
-  public static final String HTTP_FRAGMENT = "http.fragment.string";
-
-  public static final String USER_NAME = "user.principal";
-
-  public static final String ERROR_MSG = "error.message"; // string representing the error message
-  public static final String ERROR_TYPE = "error.type"; // string representing the type of the error
-  public static final String ERROR_STACK = "error.stack"; // human-readable version of the stack
-
-  public static final String ANALYTICS_SAMPLE_RATE = "_dd1.sr.eausr";
-  @Deprecated public static final String EVENT_SAMPLE_RATE = ANALYTICS_SAMPLE_RATE;
-
-  /** Manually force tracer to keep the trace */
-  public static final String MANUAL_KEEP = "manual.keep";
-
-  /** Manually force tracer to drop the trace */
-  public static final String MANUAL_DROP = "manual.drop";
-
-  public static final String TRACE_START_TIME = "t0";
-
-  /* Tags below are for internal use only. */
-  static final String INTERNAL_HOST_NAME = "_dd.hostname";
-  public static final String TRACER_HOST = "_dd.tracer_host";
-  public static final String RUNTIME_ID_TAG = "runtime-id";
-  public static final String RUNTIME_VERSION_TAG = "runtime_version";
-  static final String SERVICE = "service";
-  static final String SERVICE_TAG = SERVICE;
-  static final String HOST_TAG = "host";
-  public static final String LANGUAGE_TAG_KEY = "language";
-  public static final String LANGUAGE_TAG_VALUE = "jvm";
-  public static final String ORIGIN_KEY = "_dd.origin";
-  public static final String SPAN_LINKS = "_dd.span_links";
-  public static final String SPAN_EVENTS = "events";
-  public static final String LIBRARY_VERSION_TAG_KEY = "library_version";
-  public static final String CI_ENV_VARS = "_dd.ci.env_vars";
-  public static final String CI_ITR_TESTS_SKIPPED = "_dd.ci.itr.tests_skipped";
-  public static final String CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS =
-      "_dd.ci.library_configuration_error.settings";
-  public static final String CI_LIBRARY_CONFIGURATION_ERROR_SKIPPABLE_TESTS =
-      "_dd.ci.library_configuration_error.skippable_tests";
-  public static final String CI_LIBRARY_CONFIGURATION_ERROR_FLAKY_TESTS =
-      "_dd.ci.library_configuration_error.flaky_tests";
-  public static final String CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS =
-      "_dd.ci.library_configuration_error.known_tests";
-  public static final String CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS =
-      "_dd.ci.library_configuration_error.test_management_tests";
-  public static final String TEST_IS_USER_PROVIDED_SERVICE = "_dd.test.is_user_provided_service";
-  public static final String TEST_HAS_FAILED_TEST_REPLAY = "_dd.test.has_failed_test_replay";
-  public static final String MEASURED = "_dd.measured";
-  public static final String PID_TAG = "process_id";
-  public static final String SCHEMA_VERSION_TAG_KEY = "_dd.trace_span_attribute_schema";
-  public static final String PEER_SERVICE_SOURCE = "_dd.peer.service.source";
-  public static final String PEER_SERVICE_REMAPPED_FROM = "_dd.peer.service.remapped_from";
-  public static final String INTERNAL_GIT_REPOSITORY_URL = "_dd.git.repository_url";
-  public static final String INTERNAL_GIT_COMMIT_SHA = "_dd.git.commit.sha";
-  public static final String HOST_VCPU_COUNT = "_dd.host.vcpu_count";
-
-  public static final String PROFILING_ENABLED = "_dd.profiling.enabled";
-  public static final String DSM_ENABLED = "_dd.dsm.enabled";
-  public static final String DJM_ENABLED = "_dd.djm.enabled";
-
-  public static final String PROFILING_CONTEXT_ENGINE = "_dd.profiling.ctx";
-  public static final String BASE_SERVICE = "_dd.base_service";
-  public static final String PARENT_ID = "_dd.parent_id";
-  public static final String APM_ENABLED = "_dd.apm.enabled";
-  public static final String DECISION_MAKER_INHERITED = "_dd.dm.inherited";
-  public static final String DECISION_MAKER_SERVICE = "_dd.dm.service";
-  public static final String DECISION_MAKER_RESOURCE = "_dd.dm.resource";
-  public static final String PROCESS_TAGS = "_dd.tags.process";
-  public static final String DD_INTEGRATION = "_dd.integration";
-  public static final String DD_SVC_SRC = "_dd.svc_src";
-  public static final String SDK_OTLP_EXPORT = "_dd.sdk.otlp_export";
+    };
+
+    public static final String SPAN_TYPE = "span.type";
+    public static final String SERVICE_NAME = "service.name";
+    public static final String RESOURCE_NAME = "resource.name";
+    public static final String THREAD_NAME = "thread.name";
+    public static final String THREAD_ID = "thread.id";
+    public static final String DB_STATEMENT = "sql.query";
+    public static final String PATHWAY_HASH = "pathway.hash";
+
+    public static final String HTTP_QUERY = "http.query.string";
+    public static final String HTTP_FRAGMENT = "http.fragment.string";
+
+    public static final String USER_NAME = "user.principal";
+
+    public static final String ERROR_MSG = "error.message"; // string representing the error message
+    public static final String ERROR_TYPE = "error.type"; // string representing the type of the error
+    public static final String ERROR_STACK = "error.stack"; // human-readable version of the stack
+
+    public static final String ANALYTICS_SAMPLE_RATE = "_dd1.sr.eausr";
+
+    @Deprecated
+    public static final String EVENT_SAMPLE_RATE = ANALYTICS_SAMPLE_RATE;
+
+    /** Manually force tracer to keep the trace */
+    public static final String MANUAL_KEEP = "manual.keep";
+
+    /** Manually force tracer to drop the trace */
+    public static final String MANUAL_DROP = "manual.drop";
+
+    public static final String TRACE_START_TIME = "t0";
+
+    /* Tags below are for internal use only. */
+    static final String INTERNAL_HOST_NAME = "_dd.hostname";
+    public static final String TRACER_HOST = "_dd.tracer_host";
+    public static final String RUNTIME_ID_TAG = "runtime-id";
+    public static final String RUNTIME_VERSION_TAG = "runtime_version";
+    static final String SERVICE = "service";
+    static final String SERVICE_TAG = SERVICE;
+    static final String HOST_TAG = "host";
+    public static final String LANGUAGE_TAG_KEY = "language";
+    public static final String LANGUAGE_TAG_VALUE = "jvm";
+    public static final String ORIGIN_KEY = "_dd.origin";
+    public static final String SPAN_LINKS = "_dd.span_links";
+    public static final String SPAN_EVENTS = "events";
+    public static final String LIBRARY_VERSION_TAG_KEY = "library_version";
+    public static final String CI_ENV_VARS = "_dd.ci.env_vars";
+    public static final String CI_ITR_TESTS_SKIPPED = "_dd.ci.itr.tests_skipped";
+    public static final String CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS = "_dd.ci.library_configuration_error.settings";
+    public static final String CI_LIBRARY_CONFIGURATION_ERROR_SKIPPABLE_TESTS =
+            "_dd.ci.library_configuration_error.skippable_tests";
+    public static final String CI_LIBRARY_CONFIGURATION_ERROR_FLAKY_TESTS =
+            "_dd.ci.library_configuration_error.flaky_tests";
+    public static final String CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS =
+            "_dd.ci.library_configuration_error.known_tests";
+    public static final String CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS =
+            "_dd.ci.library_configuration_error.test_management_tests";
+    public static final String TEST_IS_USER_PROVIDED_SERVICE = "_dd.test.is_user_provided_service";
+    public static final String TEST_HAS_FAILED_TEST_REPLAY = "_dd.test.has_failed_test_replay";
+    public static final String MEASURED = "_dd.measured";
+    public static final String PID_TAG = "process_id";
+    public static final String SCHEMA_VERSION_TAG_KEY = "_dd.trace_span_attribute_schema";
+    public static final String PEER_SERVICE_SOURCE = "_dd.peer.service.source";
+    public static final String PEER_SERVICE_REMAPPED_FROM = "_dd.peer.service.remapped_from";
+    public static final String INTERNAL_GIT_REPOSITORY_URL = "_dd.git.repository_url";
+    public static final String INTERNAL_GIT_COMMIT_SHA = "_dd.git.commit.sha";
+    public static final String HOST_VCPU_COUNT = "_dd.host.vcpu_count";
+
+    public static final String PROFILING_ENABLED = "_dd.profiling.enabled";
+    public static final String DSM_ENABLED = "_dd.dsm.enabled";
+    public static final String DJM_ENABLED = "_dd.djm.enabled";
+
+    public static final String PROFILING_CONTEXT_ENGINE = "_dd.profiling.ctx";
+    public static final String BASE_SERVICE = "_dd.base_service";
+    public static final String PARENT_ID = "_dd.parent_id";
+    public static final String APM_ENABLED = "_dd.apm.enabled";
+    public static final String DECISION_MAKER_INHERITED = "_dd.dm.inherited";
+    public static final String DECISION_MAKER_SERVICE = "_dd.dm.service";
+    public static final String DECISION_MAKER_RESOURCE = "_dd.dm.resource";
+    public static final String PROCESS_TAGS = "_dd.tags.process";
+    public static final String DD_INTEGRATION = "_dd.integration";
+    public static final String DD_SVC_SRC = "_dd.svc_src";
+    public static final String SDK_OTLP_EXPORT = "_dd.sdk.otlp_export";
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/DDTraceApiInfo.java b/dd-trace-api/src/main/java/datadog/trace/api/DDTraceApiInfo.java
index 6aaeb6416ee..cfeddf8966f 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/DDTraceApiInfo.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/DDTraceApiInfo.java
@@ -6,24 +6,22 @@
 import java.io.InputStreamReader;
 
 public class DDTraceApiInfo {
-  public static final String VERSION;
+    public static final String VERSION;
 
-  static {
-    String v;
-    try (final BufferedReader br =
-        new BufferedReader(
-            new InputStreamReader(
-                DDTraceApiInfo.class.getResourceAsStream("/dd-trace-api.version"), UTF_8))) {
-      final StringBuilder sb = new StringBuilder();
+    static {
+        String v;
+        try (final BufferedReader br = new BufferedReader(
+                new InputStreamReader(DDTraceApiInfo.class.getResourceAsStream("/dd-trace-api.version"), UTF_8))) {
+            final StringBuilder sb = new StringBuilder();
 
-      for (int c = br.read(); c != -1; c = br.read()) {
-        sb.append((char) c);
-      }
+            for (int c = br.read(); c != -1; c = br.read()) {
+                sb.append((char) c);
+            }
 
-      v = sb.toString().trim();
-    } catch (final Exception e) {
-      v = "unknown";
+            v = sb.toString().trim();
+        } catch (final Exception e) {
+            v = "unknown";
+        }
+        VERSION = v;
     }
-    VERSION = v;
-  }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/DDTraceId.java b/dd-trace-api/src/main/java/datadog/trace/api/DDTraceId.java
index 7ed5be915cc..14775bfe703 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/DDTraceId.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/DDTraceId.java
@@ -9,97 +9,97 @@
  * The string representations are either kept from parsing, or generated on demand and cached.
  */
 public abstract class DDTraceId {
-  /** Invalid TraceId value used to denote no TraceId. */
-  public static final DDTraceId ZERO = from(0);
+    /** Invalid TraceId value used to denote no TraceId. */
+    public static final DDTraceId ZERO = from(0);
 
-  /** Convenience constant used from tests */
-  public static final DDTraceId ONE = from(1);
+    /** Convenience constant used from tests */
+    public static final DDTraceId ONE = from(1);
 
-  /**
-   * Creates a new {@link DD64bTraceId 64-bit TraceId} from the given {@code long} interpreted as
-   * the bits of the unsigned 64-bit id. This means that values larger than {@link Long#MAX_VALUE}
-   * will be represented as negative numbers.
-   *
-   * @param id The {@code long} representing the bits of the unsigned 64-bit id.
-   * @return A new {@link DDTraceId} instance.
-   */
-  public static DDTraceId from(long id) {
-    return DD64bTraceId.from(id);
-  }
+    /**
+     * Creates a new {@link DD64bTraceId 64-bit TraceId} from the given {@code long} interpreted as
+     * the bits of the unsigned 64-bit id. This means that values larger than {@link Long#MAX_VALUE}
+     * will be represented as negative numbers.
+     *
+     * @param id The {@code long} representing the bits of the unsigned 64-bit id.
+     * @return A new {@link DDTraceId} instance.
+     */
+    public static DDTraceId from(long id) {
+        return DD64bTraceId.from(id);
+    }
 
-  /**
-   * Creates a new {@link DD64bTraceId 64-bit TraceId} from the given {@link #toString() String
-   * representation}.
-   *
-   * @param s The {@link #toString() String representation} of a {@link DDTraceId}.
-   * @return A new {@link DDTraceId} instance.
-   * @throws NumberFormatException If the given {@link String} does not represent a valid number.
-   */
-  public static DDTraceId from(String s) throws NumberFormatException {
-    return DD64bTraceId.create(LongStringUtils.parseUnsignedLong(s), s);
-  }
+    /**
+     * Creates a new {@link DD64bTraceId 64-bit TraceId} from the given {@link #toString() String
+     * representation}.
+     *
+     * @param s The {@link #toString() String representation} of a {@link DDTraceId}.
+     * @return A new {@link DDTraceId} instance.
+     * @throws NumberFormatException If the given {@link String} does not represent a valid number.
+     */
+    public static DDTraceId from(String s) throws NumberFormatException {
+        return DD64bTraceId.create(LongStringUtils.parseUnsignedLong(s), s);
+    }
 
-  /**
-   * Creates a new {@link DDTraceId} from the given {@link #toHexString() hexadecimal
-   * representation}.
-   *
-   * @param s The hexadecimal {@link String} representation of a {@link DD128bTraceId} to parse.
-   * @return A new {@link DDTraceId} instance.
-   * @throws NumberFormatException If the given {@link #toHexString() hexadecimal String} does not
-   *     represent a valid number.
-   */
-  public static DDTraceId fromHex(String s) throws NumberFormatException {
-    if (s == null) {
-      throw new NumberFormatException("s cannot be null");
+    /**
+     * Creates a new {@link DDTraceId} from the given {@link #toHexString() hexadecimal
+     * representation}.
+     *
+     * @param s The hexadecimal {@link String} representation of a {@link DD128bTraceId} to parse.
+     * @return A new {@link DDTraceId} instance.
+     * @throws NumberFormatException If the given {@link #toHexString() hexadecimal String} does not
+     *     represent a valid number.
+     */
+    public static DDTraceId fromHex(String s) throws NumberFormatException {
+        if (s == null) {
+            throw new NumberFormatException("s cannot be null");
+        }
+        return s.length() > 16 ? DD128bTraceId.fromHex(s) : DD64bTraceId.fromHex(s);
     }
-    return s.length() > 16 ? DD128bTraceId.fromHex(s) : DD64bTraceId.fromHex(s);
-  }
 
-  /**
-   * Returns a 64-bit only decimal {@link String} representation of the {@link DDTraceId}. The
-   * {@link String} will be cached.
-   *
-   * @return A cached 64-bit only decimal {@link String} representation of the {@link DDTraceId}
-   *     instance.
-   */
-  @Override
-  public abstract String toString();
+    /**
+     * Returns a 64-bit only decimal {@link String} representation of the {@link DDTraceId}. The
+     * {@link String} will be cached.
+     *
+     * @return A cached 64-bit only decimal {@link String} representation of the {@link DDTraceId}
+     *     instance.
+     */
+    @Override
+    public abstract String toString();
 
-  /**
-   * Returns the lower-case zero-padded 32 hexadecimal characters {@link String} representation of
-   * the {@link DDTraceId}. The * {@link String} will be cached.
-   *
-   * @return A cached lower-case zero-padded 32 hexadecimal characters {@link String} representation
-   *     of the {@link DDTraceId} instance.
-   */
-  public abstract String toHexString();
+    /**
+     * Returns the lower-case zero-padded 32 hexadecimal characters {@link String} representation of
+     * the {@link DDTraceId}. The * {@link String} will be cached.
+     *
+     * @return A cached lower-case zero-padded 32 hexadecimal characters {@link String} representation
+     *     of the {@link DDTraceId} instance.
+     */
+    public abstract String toHexString();
 
-  /**
-   * Returns the lower-case zero-padded {@link #toHexString() hexadecimal String} representation of
-   * the {@link DDTraceId}. The size will be rounded up to <code>16</code> or <code>32</code>
-   * characters. This hexadecimal {@link String} <strong>will not be cached</strong>.
-   *
-   * @param size The size in characters of the zero-padded {@link String} (rounded up to <code>16
-   *     </code> or <code>32</code>).
-   * @return A lower-case zero-padded {@link #toHexString() String representation} representation of
-   *     the {@link DDTraceId} instance.
-   */
-  public abstract String toHexStringPadded(int size);
+    /**
+     * Returns the lower-case zero-padded {@link #toHexString() hexadecimal String} representation of
+     * the {@link DDTraceId}. The size will be rounded up to <code>16</code> or <code>32</code>
+     * characters. This hexadecimal {@link String} <strong>will not be cached</strong>.
+     *
+     * @param size The size in characters of the zero-padded {@link String} (rounded up to <code>16
+     *     </code> or <code>32</code>).
+     * @return A lower-case zero-padded {@link #toHexString() String representation} representation of
+     *     the {@link DDTraceId} instance.
+     */
+    public abstract String toHexStringPadded(int size);
 
-  /**
-   * Returns the low-order 64 bits of the {@link DDTraceId} as an unsigned {@code long}. This means
-   * that values larger than {@link Long#MAX_VALUE} will be represented as negative numbers.
-   *
-   * @return The low-order 64 bits of the {@link DDTraceId} as an unsigned {@code long}.
-   */
-  public abstract long toLong();
+    /**
+     * Returns the low-order 64 bits of the {@link DDTraceId} as an unsigned {@code long}. This means
+     * that values larger than {@link Long#MAX_VALUE} will be represented as negative numbers.
+     *
+     * @return The low-order 64 bits of the {@link DDTraceId} as an unsigned {@code long}.
+     */
+    public abstract long toLong();
 
-  /**
-   * Returns the high-order 64 bits of 128-bit {@link DDTraceId} as un unsigned {@code long}. This
-   * means that values larger than {@link Long#MAX_VALUE} will be represented as negative numbers.
-   *
-   * @return The high-order 64 bits of the 128-bit {@link DDTraceId} as an unsigned {@code long},
-   *     <code>0</code> for 64-bit {@link DDTraceId} only.
-   */
-  public abstract long toHighOrderLong();
+    /**
+     * Returns the high-order 64 bits of 128-bit {@link DDTraceId} as un unsigned {@code long}. This
+     * means that values larger than {@link Long#MAX_VALUE} will be represented as negative numbers.
+     *
+     * @return The high-order 64 bits of the 128-bit {@link DDTraceId} as an unsigned {@code long},
+     *     <code>0</code> for 64-bit {@link DDTraceId} only.
+     */
+    public abstract long toHighOrderLong();
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/DisableTestTrace.java b/dd-trace-api/src/main/java/datadog/trace/api/DisableTestTrace.java
index 6e472573c94..141147b732e 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/DisableTestTrace.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/DisableTestTrace.java
@@ -16,6 +16,6 @@
 @Target({TYPE, METHOD})
 public @interface DisableTestTrace {
 
-  /** The reason of why test trace has been disable for that test. */
-  String reason() default "";
+    /** The reason of why test trace has been disable for that test. */
+    String reason() default "";
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/EventTracker.java b/dd-trace-api/src/main/java/datadog/trace/api/EventTracker.java
index b52632e5482..ebd56e4a2bb 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/EventTracker.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/EventTracker.java
@@ -7,37 +7,37 @@
 @Deprecated
 public class EventTracker {
 
-  public static final EventTracker NO_EVENT_TRACKER = new EventTracker();
+    public static final EventTracker NO_EVENT_TRACKER = new EventTracker();
 
-  /**
-   * Method for tracking successful login event. A user login event is made of a user id, and an
-   * optional key-value map of metadata of string types only.
-   *
-   * @param userId user id used for login
-   * @param metadata custom metadata data represented as key/value map
-   * @deprecated use {@link EventTrackerV2#trackUserLoginSuccess(String, String, Map)}
-   */
-  @Deprecated
-  public void trackLoginSuccessEvent(String userId, Map<String, String> metadata) {}
+    /**
+     * Method for tracking successful login event. A user login event is made of a user id, and an
+     * optional key-value map of metadata of string types only.
+     *
+     * @param userId user id used for login
+     * @param metadata custom metadata data represented as key/value map
+     * @deprecated use {@link EventTrackerV2#trackUserLoginSuccess(String, String, Map)}
+     */
+    @Deprecated
+    public void trackLoginSuccessEvent(String userId, Map<String, String> metadata) {}
 
-  /**
-   * Method for tracking login failure event. A user login event is made of a user id, along user id
-   * existing flag and an optional key-value map of metadata of string types only.
-   *
-   * @param userId user id used for login
-   * @param exists flag indicates if provided userId exists
-   * @param metadata custom metadata data represented as key/value map
-   * @deprecated use {@link EventTrackerV2#trackUserLoginFailure(String, boolean, Map)}
-   */
-  public void trackLoginFailureEvent(String userId, boolean exists, Map<String, String> metadata) {}
+    /**
+     * Method for tracking login failure event. A user login event is made of a user id, along user id
+     * existing flag and an optional key-value map of metadata of string types only.
+     *
+     * @param userId user id used for login
+     * @param exists flag indicates if provided userId exists
+     * @param metadata custom metadata data represented as key/value map
+     * @deprecated use {@link EventTrackerV2#trackUserLoginFailure(String, boolean, Map)}
+     */
+    public void trackLoginFailureEvent(String userId, boolean exists, Map<String, String> metadata) {}
 
-  /**
-   * Method for tracking custom events. A custom event is made of an event name along with an
-   * optional key-value map of metadata of string types only
-   *
-   * @param eventName name of the custom event
-   * @param metadata custom metadata data represented as key/value map
-   * @deprecated use {@link EventTrackerV2#trackCustomEvent(String, Map)}
-   */
-  public void trackCustomEvent(String eventName, Map<String, String> metadata) {}
+    /**
+     * Method for tracking custom events. A custom event is made of an event name along with an
+     * optional key-value map of metadata of string types only
+     *
+     * @param eventName name of the custom event
+     * @param metadata custom metadata data represented as key/value map
+     * @deprecated use {@link EventTrackerV2#trackCustomEvent(String, Map)}
+     */
+    public void trackCustomEvent(String eventName, Map<String, String> metadata) {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/GlobalTracer.java b/dd-trace-api/src/main/java/datadog/trace/api/GlobalTracer.java
index b3f73c18fba..b70c38f9203 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/GlobalTracer.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/GlobalTracer.java
@@ -13,110 +13,109 @@
  * to provide a global window to datadog-specific features.
  */
 public class GlobalTracer {
-  private static final Tracer NO_OP =
-      new Tracer() {
+    private static final Tracer NO_OP = new Tracer() {
         @Override
         public String getTraceId() {
-          return "0";
+            return "0";
         }
 
         @Override
         public String getSpanId() {
-          return "0";
+            return "0";
         }
 
         @Override
         public boolean addTraceInterceptor(TraceInterceptor traceInterceptor) {
-          return false;
+            return false;
         }
 
         @Override
         public TraceScope muteTracing() {
-          return NoopTraceScope.INSTANCE;
+            return NoopTraceScope.INSTANCE;
         }
 
         @Override
         public TraceScope.Continuation captureActiveSpan() {
-          return NoopTraceScope.NoopContinuation.INSTANCE;
+            return NoopTraceScope.NoopContinuation.INSTANCE;
         }
 
         @Override
         public boolean isAsyncPropagationEnabled() {
-          return false;
+            return false;
         }
 
         @Override
         public void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) {}
-      };
+    };
 
-  private static final Collection<Callback> installationCallbacks = new ArrayList<>();
-  private static Tracer provider = NO_OP;
-  private static EventTracker eventTracker = EventTracker.NO_EVENT_TRACKER;
+    private static final Collection<Callback> installationCallbacks = new ArrayList<>();
+    private static Tracer provider = NO_OP;
+    private static EventTracker eventTracker = EventTracker.NO_EVENT_TRACKER;
 
-  public static void registerIfAbsent(Tracer p) {
-    if (p == null || p == NO_OP) {
-      throw new IllegalArgumentException();
+    public static void registerIfAbsent(Tracer p) {
+        if (p == null || p == NO_OP) {
+            throw new IllegalArgumentException();
+        }
+
+        synchronized (installationCallbacks) {
+            if (provider == NO_OP) {
+                provider = p;
+                for (Callback callback : installationCallbacks) {
+                    callback.installed(p);
+                }
+            }
+        }
     }
 
-    synchronized (installationCallbacks) {
-      if (provider == NO_OP) {
-        provider = p;
-        for (Callback callback : installationCallbacks) {
-          callback.installed(p);
+    public static void forceRegister(Tracer tracer) {
+        if (tracer == null || tracer == NO_OP) {
+            throw new IllegalArgumentException();
+        }
+
+        synchronized (installationCallbacks) {
+            provider = tracer;
+            for (Callback callback : installationCallbacks) {
+                callback.installed(tracer);
+            }
         }
-      }
     }
-  }
 
-  public static void forceRegister(Tracer tracer) {
-    if (tracer == null || tracer == NO_OP) {
-      throw new IllegalArgumentException();
+    public static Tracer get() {
+        return provider;
     }
 
-    synchronized (installationCallbacks) {
-      provider = tracer;
-      for (Callback callback : installationCallbacks) {
-        callback.installed(tracer);
-      }
+    /**
+     * @deprecated use static methods in {@link datadog.appsec.api.login.EventTrackerV2} directly
+     */
+    @Deprecated
+    public static EventTracker getEventTracker() {
+        return eventTracker;
     }
-  }
-
-  public static Tracer get() {
-    return provider;
-  }
-
-  /**
-   * @deprecated use static methods in {@link datadog.appsec.api.login.EventTrackerV2} directly
-   */
-  @Deprecated
-  public static EventTracker getEventTracker() {
-    return eventTracker;
-  }
-
-  /**
-   * Controls the implementation for the event tracker. The AppSec subsystem calls this method on
-   * startup. This can be called explicitly for e.g. testing purposes.
-   *
-   * @param tracker the implementation for the event tracker.
-   */
-  public static void setEventTracker(final EventTracker tracker) {
-    eventTracker = tracker;
-  }
-
-  // --------------------------------------------------------------------------------
-  // All code below is to support the callback registration in WithGlobalTracer
-  // --------------------------------------------------------------------------------
-  static void registerInstallationCallback(Callback callback) {
-    synchronized (installationCallbacks) {
-      installationCallbacks.add(callback);
-
-      if (provider != NO_OP) {
-        callback.installed(provider);
-      }
+
+    /**
+     * Controls the implementation for the event tracker. The AppSec subsystem calls this method on
+     * startup. This can be called explicitly for e.g. testing purposes.
+     *
+     * @param tracker the implementation for the event tracker.
+     */
+    public static void setEventTracker(final EventTracker tracker) {
+        eventTracker = tracker;
     }
-  }
 
-  interface Callback {
-    void installed(Tracer tracer);
-  }
+    // --------------------------------------------------------------------------------
+    // All code below is to support the callback registration in WithGlobalTracer
+    // --------------------------------------------------------------------------------
+    static void registerInstallationCallback(Callback callback) {
+        synchronized (installationCallbacks) {
+            installationCallbacks.add(callback);
+
+            if (provider != NO_OP) {
+                callback.installed(provider);
+            }
+        }
+    }
+
+    interface Callback {
+        void installed(Tracer tracer);
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/IdGenerationStrategy.java b/dd-trace-api/src/main/java/datadog/trace/api/IdGenerationStrategy.java
index 34956222e3d..36fcb6b4650 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/IdGenerationStrategy.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/IdGenerationStrategy.java
@@ -13,114 +13,114 @@
  * configuration based, for example 128 bit trace ids et.c., without changing the public API.
  */
 public abstract class IdGenerationStrategy {
-  static {
-    // Eagerly load DDTraceId.ZERO _before_ calling any public DD64bTraceId methods below.
-    // This avoids a potential 'clinit' deadlock between DDTraceId and DD64bTraceId caused
-    // by one thread touching DD64bTraceId before the static initializer in DDTraceId has
-    // finished setting up the ZERO constant (which in turn uses DD64bTraceId)
-    @SuppressWarnings("unused")
-    DDTraceId init = DDTraceId.ZERO;
-  }
-
-  protected final boolean traceId128BitGenerationEnabled;
-
-  private IdGenerationStrategy(boolean traceId128BitGenerationEnabled) {
-    this.traceId128BitGenerationEnabled = traceId128BitGenerationEnabled;
-  }
-
-  public static IdGenerationStrategy fromName(String name) {
-    return fromName(name, false);
-  }
-
-  public static IdGenerationStrategy fromName(String name, boolean traceId128BitGenerationEnabled) {
-    switch (name.toUpperCase()) {
-      case "RANDOM":
-        return new Random(traceId128BitGenerationEnabled);
-      case "SEQUENTIAL":
-        return new Sequential(traceId128BitGenerationEnabled);
-      case "SECURE_RANDOM":
-        return new SRandom(traceId128BitGenerationEnabled);
-      default:
-        return null;
+    static {
+        // Eagerly load DDTraceId.ZERO _before_ calling any public DD64bTraceId methods below.
+        // This avoids a potential 'clinit' deadlock between DDTraceId and DD64bTraceId caused
+        // by one thread touching DD64bTraceId before the static initializer in DDTraceId has
+        // finished setting up the ZERO constant (which in turn uses DD64bTraceId)
+        @SuppressWarnings("unused")
+        DDTraceId init = DDTraceId.ZERO;
     }
-  }
 
-  public DDTraceId generateTraceId() {
-    return this.traceId128BitGenerationEnabled
-        ? DD128bTraceId.from(generateHighOrderBits(), getNonZeroPositiveLong())
-        : DD64bTraceId.from(getNonZeroPositiveLong());
-  }
+    protected final boolean traceId128BitGenerationEnabled;
 
-  public long generateSpanId() {
-    return getNonZeroPositiveLong();
-  }
+    private IdGenerationStrategy(boolean traceId128BitGenerationEnabled) {
+        this.traceId128BitGenerationEnabled = traceId128BitGenerationEnabled;
+    }
 
-  protected abstract long getNonZeroPositiveLong();
+    public static IdGenerationStrategy fromName(String name) {
+        return fromName(name, false);
+    }
 
-  protected long generateHighOrderBits() {
-    long timestamp = System.currentTimeMillis() / 1000;
-    return timestamp << 32;
-  }
+    public static IdGenerationStrategy fromName(String name, boolean traceId128BitGenerationEnabled) {
+        switch (name.toUpperCase()) {
+            case "RANDOM":
+                return new Random(traceId128BitGenerationEnabled);
+            case "SEQUENTIAL":
+                return new Sequential(traceId128BitGenerationEnabled);
+            case "SECURE_RANDOM":
+                return new SRandom(traceId128BitGenerationEnabled);
+            default:
+                return null;
+        }
+    }
 
-  static final class Random extends IdGenerationStrategy {
-    private Random(boolean traceId128BitGenerationEnabled) {
-      super(traceId128BitGenerationEnabled);
+    public DDTraceId generateTraceId() {
+        return this.traceId128BitGenerationEnabled
+                ? DD128bTraceId.from(generateHighOrderBits(), getNonZeroPositiveLong())
+                : DD64bTraceId.from(getNonZeroPositiveLong());
     }
 
-    @Override
-    protected long getNonZeroPositiveLong() {
-      return ThreadLocalRandom.current().nextLong(0, MAX_VALUE) + 1;
+    public long generateSpanId() {
+        return getNonZeroPositiveLong();
     }
-  }
 
-  static final class Sequential extends IdGenerationStrategy {
-    private final AtomicLong id;
+    protected abstract long getNonZeroPositiveLong();
 
-    private Sequential(boolean traceId128BitGenerationEnabled) {
-      super(traceId128BitGenerationEnabled);
-      this.id = new AtomicLong(0);
+    protected long generateHighOrderBits() {
+        long timestamp = System.currentTimeMillis() / 1000;
+        return timestamp << 32;
     }
 
-    @Override
-    public DDTraceId generateTraceId() {
-      // Only use 64-bit TraceId to use incremental values only
-      return DD64bTraceId.from(getNonZeroPositiveLong());
-    }
+    static final class Random extends IdGenerationStrategy {
+        private Random(boolean traceId128BitGenerationEnabled) {
+            super(traceId128BitGenerationEnabled);
+        }
 
-    @Override
-    protected long getNonZeroPositiveLong() {
-      return this.id.incrementAndGet();
+        @Override
+        protected long getNonZeroPositiveLong() {
+            return ThreadLocalRandom.current().nextLong(0, MAX_VALUE) + 1;
+        }
     }
-  }
 
-  @FunctionalInterface
-  interface ThrowingSupplier<T> {
-    T get() throws Throwable;
-  }
+    static final class Sequential extends IdGenerationStrategy {
+        private final AtomicLong id;
+
+        private Sequential(boolean traceId128BitGenerationEnabled) {
+            super(traceId128BitGenerationEnabled);
+            this.id = new AtomicLong(0);
+        }
 
-  static final class SRandom extends IdGenerationStrategy {
-    private final SecureRandom secureRandom;
+        @Override
+        public DDTraceId generateTraceId() {
+            // Only use 64-bit TraceId to use incremental values only
+            return DD64bTraceId.from(getNonZeroPositiveLong());
+        }
 
-    SRandom(boolean traceId128BitGenerationEnabled) {
-      this(traceId128BitGenerationEnabled, SecureRandom::getInstanceStrong);
+        @Override
+        protected long getNonZeroPositiveLong() {
+            return this.id.incrementAndGet();
+        }
     }
 
-    SRandom(boolean traceId128BitGenerationEnabled, ThrowingSupplier<SecureRandom> supplier) {
-      super(traceId128BitGenerationEnabled);
-      try {
-        secureRandom = supplier.get();
-      } catch (Throwable e) {
-        throw new ExceptionInInitializerError(e);
-      }
+    @FunctionalInterface
+    interface ThrowingSupplier<T> {
+        T get() throws Throwable;
     }
 
-    @Override
-    protected long getNonZeroPositiveLong() {
-      long value = secureRandom.nextLong() & MAX_VALUE;
-      while (value == 0) {
-        value = secureRandom.nextLong() & MAX_VALUE;
-      }
-      return value;
+    static final class SRandom extends IdGenerationStrategy {
+        private final SecureRandom secureRandom;
+
+        SRandom(boolean traceId128BitGenerationEnabled) {
+            this(traceId128BitGenerationEnabled, SecureRandom::getInstanceStrong);
+        }
+
+        SRandom(boolean traceId128BitGenerationEnabled, ThrowingSupplier<SecureRandom> supplier) {
+            super(traceId128BitGenerationEnabled);
+            try {
+                secureRandom = supplier.get();
+            } catch (Throwable e) {
+                throw new ExceptionInInitializerError(e);
+            }
+        }
+
+        @Override
+        protected long getNonZeroPositiveLong() {
+            long value = secureRandom.nextLong() & MAX_VALUE;
+            while (value == 0) {
+                value = secureRandom.nextLong() & MAX_VALUE;
+            }
+            return value;
+        }
     }
-  }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/PropagationStyle.java b/dd-trace-api/src/main/java/datadog/trace/api/PropagationStyle.java
index 89bdb67d1e5..802f3b7bb08 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/PropagationStyle.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/PropagationStyle.java
@@ -10,22 +10,22 @@
  */
 @Deprecated
 public enum PropagationStyle {
-  DATADOG(TracePropagationStyle.DATADOG),
-  B3(TracePropagationStyle.B3SINGLE, TracePropagationStyle.B3MULTI),
-  HAYSTACK(TracePropagationStyle.HAYSTACK),
-  XRAY(TracePropagationStyle.XRAY);
+    DATADOG(TracePropagationStyle.DATADOG),
+    B3(TracePropagationStyle.B3SINGLE, TracePropagationStyle.B3MULTI),
+    HAYSTACK(TracePropagationStyle.HAYSTACK),
+    XRAY(TracePropagationStyle.XRAY);
 
-  private final List<TracePropagationStyle> newStyles;
+    private final List<TracePropagationStyle> newStyles;
 
-  PropagationStyle(TracePropagationStyle... newStyles) {
-    this.newStyles = Collections.unmodifiableList(Arrays.asList(newStyles));
-  }
+    PropagationStyle(TracePropagationStyle... newStyles) {
+        this.newStyles = Collections.unmodifiableList(Arrays.asList(newStyles));
+    }
 
-  public List<TracePropagationStyle> getNewStyles() {
-    return newStyles;
-  }
+    public List<TracePropagationStyle> getNewStyles() {
+        return newStyles;
+    }
 
-  public static PropagationStyle valueOfConfigName(String configName) {
-    return valueOf(configName.toUpperCase().trim());
-  }
+    public static PropagationStyle valueOfConfigName(String configName) {
+        return valueOf(configName.toUpperCase().trim());
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/ProtocolVersion.java b/dd-trace-api/src/main/java/datadog/trace/api/ProtocolVersion.java
index 0f3c21db8c0..8fac66d5a5d 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/ProtocolVersion.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/ProtocolVersion.java
@@ -8,73 +8,73 @@
 import java.util.Locale;
 
 public enum ProtocolVersion {
-  V0_4("0.4", "v0.4/traces", "v0.3/traces"),
-  V0_5("0.5", "v0.5/traces", "v0.4/traces", "v0.3/traces"),
-  V1_0("1.0", "v1.0/traces", "v0.4/traces", "v0.3/traces");
-
-  private final String configValue;
-  private final String endpoint;
-  private final List<String> fallback;
-  private final List<String> endpointsToProbe;
-
-  ProtocolVersion(String configValue, String endpoint, String... fallback) {
-    this.configValue = configValue;
-    this.endpoint = endpoint;
-    this.fallback = unmodifiableList(asList(fallback));
-
-    List<String> endpoints = new ArrayList<>();
-    endpoints.add(endpoint);
-    endpoints.addAll(asList(fallback));
-    this.endpointsToProbe = unmodifiableList(endpoints);
-  }
-
-  public String asConfigValue() {
-    return configValue;
-  }
-
-  public String endpoint() {
-    return endpoint;
-  }
-
-  public List<String> fallback() {
-    return fallback;
-  }
-
-  public List<String> endpointsToProbe() {
-    return endpointsToProbe;
-  }
-
-  public static ProtocolVersion fromConfigValue(String value) {
-    if (value == null) {
-      return V0_4;
+    V0_4("0.4", "v0.4/traces", "v0.3/traces"),
+    V0_5("0.5", "v0.5/traces", "v0.4/traces", "v0.3/traces"),
+    V1_0("1.0", "v1.0/traces", "v0.4/traces", "v0.3/traces");
+
+    private final String configValue;
+    private final String endpoint;
+    private final List<String> fallback;
+    private final List<String> endpointsToProbe;
+
+    ProtocolVersion(String configValue, String endpoint, String... fallback) {
+        this.configValue = configValue;
+        this.endpoint = endpoint;
+        this.fallback = unmodifiableList(asList(fallback));
+
+        List<String> endpoints = new ArrayList<>();
+        endpoints.add(endpoint);
+        endpoints.addAll(asList(fallback));
+        this.endpointsToProbe = unmodifiableList(endpoints);
     }
 
-    String normalized = value.toLowerCase(Locale.ROOT);
-    if (V1_0.configValue.equals(normalized)) {
-      return V1_0;
+    public String asConfigValue() {
+        return configValue;
     }
 
-    if (V0_5.configValue.equals(normalized)) {
-      return V0_5;
+    public String endpoint() {
+        return endpoint;
     }
 
-    return V0_4;
-  }
-
-  public static ProtocolVersion fromTraceEndpoint(String endpoint) {
-    if (endpoint == null) {
-      return V0_4;
+    public List<String> fallback() {
+        return fallback;
     }
 
-    String normalized = endpoint.toLowerCase(Locale.ROOT);
-    if (normalized.endsWith(V1_0.endpoint)) {
-      return V1_0;
+    public List<String> endpointsToProbe() {
+        return endpointsToProbe;
     }
 
-    if (normalized.endsWith(V0_5.endpoint)) {
-      return V0_5;
+    public static ProtocolVersion fromConfigValue(String value) {
+        if (value == null) {
+            return V0_4;
+        }
+
+        String normalized = value.toLowerCase(Locale.ROOT);
+        if (V1_0.configValue.equals(normalized)) {
+            return V1_0;
+        }
+
+        if (V0_5.configValue.equals(normalized)) {
+            return V0_5;
+        }
+
+        return V0_4;
     }
 
-    return V0_4;
-  }
+    public static ProtocolVersion fromTraceEndpoint(String endpoint) {
+        if (endpoint == null) {
+            return V0_4;
+        }
+
+        String normalized = endpoint.toLowerCase(Locale.ROOT);
+        if (normalized.endsWith(V1_0.endpoint)) {
+            return V1_0;
+        }
+
+        if (normalized.endsWith(V0_5.endpoint)) {
+            return V0_5;
+        }
+
+        return V0_4;
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/Trace.java b/dd-trace-api/src/main/java/datadog/trace/api/Trace.java
index d558e459e90..f5e4440d25e 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/Trace.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/Trace.java
@@ -11,15 +11,15 @@
 @Target(METHOD)
 public @interface Trace {
 
-  /** The operation name to set. By default it takes the method's name */
-  String operationName() default "";
+    /** The operation name to set. By default it takes the method's name */
+    String operationName() default "";
 
-  /** The resource name. By default it uses the same value as the operation name */
-  String resourceName() default "";
+    /** The resource name. By default it uses the same value as the operation name */
+    String resourceName() default "";
 
-  /** Set whether to measure a trace. By default traces are not measured. */
-  boolean measured() default false;
+    /** Set whether to measure a trace. By default traces are not measured. */
+    boolean measured() default false;
 
-  /** Set whether to start a new trace. By default it continues the current trace. */
-  boolean noParent() default false;
+    /** Set whether to start a new trace. By default it continues the current trace. */
+    boolean noParent() default false;
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/TracePropagationBehaviorExtract.java b/dd-trace-api/src/main/java/datadog/trace/api/TracePropagationBehaviorExtract.java
index daa03b580af..0d2e318953f 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/TracePropagationBehaviorExtract.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/TracePropagationBehaviorExtract.java
@@ -4,21 +4,21 @@
 
 /** Trace propagation styles for injecting and extracting trace propagation headers. */
 public enum TracePropagationBehaviorExtract {
-  CONTINUE,
-  RESTART,
-  IGNORE;
+    CONTINUE,
+    RESTART,
+    IGNORE;
 
-  private String displayName;
+    private String displayName;
 
-  TracePropagationBehaviorExtract() {
-    this.displayName = name().toLowerCase(Locale.ROOT);
-  }
+    TracePropagationBehaviorExtract() {
+        this.displayName = name().toLowerCase(Locale.ROOT);
+    }
 
-  @Override
-  public String toString() {
-    if (displayName == null) {
-      displayName = name().toLowerCase(Locale.ROOT);
+    @Override
+    public String toString() {
+        if (displayName == null) {
+            displayName = name().toLowerCase(Locale.ROOT);
+        }
+        return displayName;
     }
-    return displayName;
-  }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/TracePropagationStyle.java b/dd-trace-api/src/main/java/datadog/trace/api/TracePropagationStyle.java
index af850871650..6deb836ed7d 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/TracePropagationStyle.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/TracePropagationStyle.java
@@ -4,50 +4,50 @@
 
 /** Trace propagation styles for injecting and extracting trace propagation headers. */
 public enum TracePropagationStyle {
-  // Datadog context propagation style
-  DATADOG,
-  // B3 single header context propagation style
-  // https://github.com/openzipkin/b3-propagation/tree/master#single-header
-  B3SINGLE,
-  // B3 multi header context propagation style
-  // https://github.com/openzipkin/b3-propagation/tree/master#multiple-headers
-  B3MULTI,
-  // Haystack context propagation style
-  // https://github.com/ExpediaDotCom/haystack
-  HAYSTACK,
-  // Amazon X-Ray context propagation style
-  // https://docs.aws.amazon.com/xray/latest/devguide/xray-concepts.html#xray-concepts-tracingheader
-  XRAY,
-  // W3C trace context propagation style
-  // https://www.w3.org/TR/trace-context-1/
-  TRACECONTEXT,
-  // W3C baggage support
-  // https://www.w3.org/TR/baggage/
-  BAGGAGE,
-  // None does not extract or inject
-  NONE;
+    // Datadog context propagation style
+    DATADOG,
+    // B3 single header context propagation style
+    // https://github.com/openzipkin/b3-propagation/tree/master#single-header
+    B3SINGLE,
+    // B3 multi header context propagation style
+    // https://github.com/openzipkin/b3-propagation/tree/master#multiple-headers
+    B3MULTI,
+    // Haystack context propagation style
+    // https://github.com/ExpediaDotCom/haystack
+    HAYSTACK,
+    // Amazon X-Ray context propagation style
+    // https://docs.aws.amazon.com/xray/latest/devguide/xray-concepts.html#xray-concepts-tracingheader
+    XRAY,
+    // W3C trace context propagation style
+    // https://www.w3.org/TR/trace-context-1/
+    TRACECONTEXT,
+    // W3C baggage support
+    // https://www.w3.org/TR/baggage/
+    BAGGAGE,
+    // None does not extract or inject
+    NONE;
 
-  public static TracePropagationStyle valueOfDisplayName(String displayName) {
-    String convertedName = displayName.toUpperCase().replace(' ', '_');
-    // Another name for B3 for cross tracer compatibility
-    switch (convertedName) {
-      case "B3_SINGLE_HEADER":
-        return B3SINGLE;
-      case "B3":
-        return B3MULTI;
-      default:
-        return TracePropagationStyle.valueOf(convertedName);
+    public static TracePropagationStyle valueOfDisplayName(String displayName) {
+        String convertedName = displayName.toUpperCase().replace(' ', '_');
+        // Another name for B3 for cross tracer compatibility
+        switch (convertedName) {
+            case "B3_SINGLE_HEADER":
+                return B3SINGLE;
+            case "B3":
+                return B3MULTI;
+            default:
+                return TracePropagationStyle.valueOf(convertedName);
+        }
     }
-  }
 
-  private String displayName;
+    private String displayName;
 
-  @Override
-  public String toString() {
-    String string = displayName;
-    if (displayName == null) {
-      string = displayName = name().toLowerCase(Locale.ROOT).replace('_', ' ');
+    @Override
+    public String toString() {
+        String string = displayName;
+        if (displayName == null) {
+            string = displayName = name().toLowerCase(Locale.ROOT).replace('_', ' ');
+        }
+        return string;
     }
-    return string;
-  }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/Tracer.java b/dd-trace-api/src/main/java/datadog/trace/api/Tracer.java
index 84709a4b508..fa35fe8051c 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/Tracer.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/Tracer.java
@@ -6,59 +6,59 @@
 /** A class with Datadog tracer features. */
 public interface Tracer {
 
-  /** Get the trace id of the active trace. Returns 0 if there is no active trace. */
-  String getTraceId();
+    /** Get the trace id of the active trace. Returns 0 if there is no active trace. */
+    String getTraceId();
 
-  /**
-   * Get the span id of the active span of the active trace. Returns 0 if there is no active trace.
-   */
-  String getSpanId();
+    /**
+     * Get the span id of the active span of the active trace. Returns 0 if there is no active trace.
+     */
+    String getSpanId();
 
-  /**
-   * Add a new interceptor to the tracer. Interceptors with duplicate priority to existing ones are
-   * ignored.
-   *
-   * @param traceInterceptor
-   * @return false if an interceptor with same priority exists.
-   */
-  boolean addTraceInterceptor(TraceInterceptor traceInterceptor);
+    /**
+     * Add a new interceptor to the tracer. Interceptors with duplicate priority to existing ones are
+     * ignored.
+     *
+     * @param traceInterceptor
+     * @return false if an interceptor with same priority exists.
+     */
+    boolean addTraceInterceptor(TraceInterceptor traceInterceptor);
 
-  TraceScope muteTracing();
+    TraceScope muteTracing();
 
-  /**
-   * When asynchronous propagation is enabled, prevent the currently active trace from reporting
-   * until the returned Continuation is either activated (and the returned scope is closed) or the
-   * continuation is canceled.
-   *
-   * <p>Should be called on the parent thread.
-   *
-   * @deprecated Unstable API. Might be removed at any time.
-   * @return Continuation of the active span, no-op continuation if there's no active span or
-   *     asynchronous propagation is disabled.
-   */
-  @Deprecated
-  TraceScope.Continuation captureActiveSpan();
+    /**
+     * When asynchronous propagation is enabled, prevent the currently active trace from reporting
+     * until the returned Continuation is either activated (and the returned scope is closed) or the
+     * continuation is canceled.
+     *
+     * <p>Should be called on the parent thread.
+     *
+     * @deprecated Unstable API. Might be removed at any time.
+     * @return Continuation of the active span, no-op continuation if there's no active span or
+     *     asynchronous propagation is disabled.
+     */
+    @Deprecated
+    TraceScope.Continuation captureActiveSpan();
 
-  /**
-   * Checks whether asynchronous propagation is enabled, meaning this context will propagate across
-   * asynchronous boundaries.
-   *
-   * @deprecated Unstable API. Might be removed at any time.
-   * @return {@code true} if asynchronous propagation is enabled, {@code false} otherwise.
-   */
-  @Deprecated
-  boolean isAsyncPropagationEnabled();
+    /**
+     * Checks whether asynchronous propagation is enabled, meaning this context will propagate across
+     * asynchronous boundaries.
+     *
+     * @deprecated Unstable API. Might be removed at any time.
+     * @return {@code true} if asynchronous propagation is enabled, {@code false} otherwise.
+     */
+    @Deprecated
+    boolean isAsyncPropagationEnabled();
 
-  /**
-   * Enables or disables asynchronous propagation for the active span.
-   *
-   * <p>Asynchronous propagation is enabled by default from {@link
-   * ConfigDefaults#DEFAULT_ASYNC_PROPAGATING}.
-   *
-   * @deprecated Unstable API. Might be removed at any time.
-   * @param asyncPropagationEnabled {@code true} to enable asynchronous propagation, {@code false}
-   *     to disable it.
-   */
-  @Deprecated
-  void setAsyncPropagationEnabled(boolean asyncPropagationEnabled);
+    /**
+     * Enables or disables asynchronous propagation for the active span.
+     *
+     * <p>Asynchronous propagation is enabled by default from {@link
+     * ConfigDefaults#DEFAULT_ASYNC_PROPAGATING}.
+     *
+     * @deprecated Unstable API. Might be removed at any time.
+     * @param asyncPropagationEnabled {@code true} to enable asynchronous propagation, {@code false}
+     *     to disable it.
+     */
+    @Deprecated
+    void setAsyncPropagationEnabled(boolean asyncPropagationEnabled);
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/aiguard/AIGuard.java b/dd-trace-api/src/main/java/datadog/trace/api/aiguard/AIGuard.java
index 0054655b6f7..c182d131a5c 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/aiguard/AIGuard.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/aiguard/AIGuard.java
@@ -29,778 +29,785 @@
  */
 public abstract class AIGuard {
 
-  protected static Evaluator EVALUATOR = new NoOpEvaluator();
-
-  protected AIGuard() {}
-
-  /**
-   * Evaluates a collection of messages using default options to determine if they are safe to
-   * execute.
-   *
-   * @see #evaluate(List, Options)
-   */
-  public static Evaluation evaluate(final List<Message> messages) {
-    return evaluate(messages, Options.DEFAULT);
-  }
-
-  /**
-   * Evaluates a collection of messages with custom options to determine if they are safe to
-   * execute.
-   *
-   * @param messages the collection of messages to evaluate (prompts, responses, tool calls, etc.)
-   * @param options configuration options for the evaluation process
-   * @return an {@link Evaluation} containing the security decision, the reasoning, and the
-   *     evaluated messages (redacted when redaction was applied, see {@link
-   *     Evaluation#getMessages()})
-   * @throws AIGuardAbortError if the evaluation action is not ALLOW (DENY or ABORT) and blocking is
-   *     enabled
-   * @throws AIGuardClientError if there are client-side errors communicating with the AIGuard REST
-   *     API
-   */
-  public static Evaluation evaluate(final List<Message> messages, final Options options) {
-    return EVALUATOR.evaluate(messages, options);
-  }
-
-  /**
-   * Exception thrown when AIGuard evaluation results in blocking the execution due to security
-   * concerns.
-   *
-   * <p><strong>Important:</strong> This exception is thrown when the evaluation action is not
-   * {@code ALLOW} (i.e., {@code DENY} or {@code ABORT}) and blocking mode is enabled.
-   */
-  public static class AIGuardAbortError extends RuntimeException {
-    private final Action action;
-    private final String reason;
-    private final List<String> tags;
-    private final Map<String, Number> tagProbs;
-    private final List<?> sds;
-
-    public AIGuardAbortError(
-        final Action action,
-        final String reason,
-        final List<String> tags,
-        final Map<String, Number> tagProbs,
-        final List<?> sds) {
-      super(reason);
-      this.action = action;
-      this.reason = reason;
-      this.tags = tags;
-      this.tagProbs = tagProbs != null ? tagProbs : Collections.emptyMap();
-      this.sds = sds != null ? sds : Collections.emptyList();
-    }
-
-    public Action getAction() {
-      return action;
-    }
-
-    public String getReason() {
-      return reason;
-    }
-
-    public List<String> getTags() {
-      return tags;
-    }
+    protected static Evaluator EVALUATOR = new NoOpEvaluator();
 
-    public Map<String, Number> getTagProbabilities() {
-      return tagProbs;
-    }
-
-    public List<?> getSds() {
-      return sds;
-    }
-  }
-
-  /**
-   * Exception thrown when there are client-side errors communicating with the AIGuard REST API.
-   *
-   * <p>This exception indicates problems with the AIGuard client implementation such as:
-   *
-   * <ul>
-   *   <li>Network connectivity issues when calling the AIGuard REST API
-   *   <li>Authentication failures with the AIGuard service
-   *   <li>Invalid configuration or missing API credentials
-   *   <li>Request timeout or service unavailability
-   *   <li>Malformed requests or unsupported API versions
-   * </ul>
-   */
-  public static class AIGuardClientError extends RuntimeException {
-
-    private final Object errors;
-
-    public AIGuardClientError(final String message, final Throwable cause) {
-      super(message, cause);
-      errors = null;
-    }
-
-    public AIGuardClientError(final String message, final Object errors) {
-      super(message, null);
-      this.errors = errors;
-    }
-
-    public Object getErrors() {
-      return errors;
-    }
-  }
-
-  /** Actions that can be recommended by an AIGuard evaluation. */
-  public enum Action {
-    /** Content is safe to proceed with execution */
-    ALLOW,
-    /** Current action should be blocked from execution */
-    DENY,
-    /** Workflow should be immediately terminated due to severe risk */
-    ABORT
-  }
-
-  /**
-   * Represents the result of an AIGuard security evaluation, containing both the recommended action
-   * and the reasoning behind the decision.
-   *
-   * <p>The evaluation provides three possible actions:
-   *
-   * <ul>
-   *   <li>{@link Action#ALLOW} - Content is safe to proceed
-   *   <li>{@link Action#DENY} - Content should be blocked
-   *   <li>{@link Action#ABORT} - Execution should be immediately terminated
-   * </ul>
-   */
-  public static class Evaluation {
-
-    final Action action;
-    final String reason;
-    final List<String> tags;
-    final Map<String, Number> tagProbs;
-    final List<?> sds;
-    final List<Message> messages;
-    final List<?> redactionReplacements;
+    protected AIGuard() {}
 
     /**
-     * Creates a new evaluation result carrying no messages.
+     * Evaluates a collection of messages using default options to determine if they are safe to
+     * execute.
      *
-     * @param action the recommended action for the evaluated content
-     * @param reason human-readable explanation for the decision
-     * @param tags list of tags associated with the evaluation (e.g. indirect-prompt-injection)
-     * @param tagProbs map of tags associated to their probability
-     * @param sds list of Sensitive Data Scanner findings
-     * @deprecated use {@link #Evaluation(Action, String, List, Map, List, List)} instead, so the
-     *     evaluated messages are available to the caller.
+     * @see #evaluate(List, Options)
      */
-    @Deprecated
-    public Evaluation(
-        final Action action,
-        final String reason,
-        final List<String> tags,
-        final Map<String, Number> tagProbs,
-        final List<?> sds) {
-      this(action, reason, tags, tagProbs, sds, Collections.emptyList());
+    public static Evaluation evaluate(final List<Message> messages) {
+        return evaluate(messages, Options.DEFAULT);
     }
 
     /**
-     * Creates a new evaluation result carrying no redaction replacements.
+     * Evaluates a collection of messages with custom options to determine if they are safe to
+     * execute.
      *
-     * @param action the recommended action for the evaluated content
-     * @param reason human-readable explanation for the decision
-     * @param tags list of tags associated with the evaluation (e.g. indirect-prompt-injection)
-     * @param tagProbs map of tags associated to their probability
-     * @param sds list of Sensitive Data Scanner findings
-     * @param messages the evaluated messages, redacted when redaction was applied
-     * @deprecated use {@link #Evaluation(Action, String, List, Map, List, List, List)} instead, so
-     *     the applied redaction replacements are available to the caller.
+     * @param messages the collection of messages to evaluate (prompts, responses, tool calls, etc.)
+     * @param options configuration options for the evaluation process
+     * @return an {@link Evaluation} containing the security decision, the reasoning, and the
+     *     evaluated messages (redacted when redaction was applied, see {@link
+     *     Evaluation#getMessages()})
+     * @throws AIGuardAbortError if the evaluation action is not ALLOW (DENY or ABORT) and blocking is
+     *     enabled
+     * @throws AIGuardClientError if there are client-side errors communicating with the AIGuard REST
+     *     API
      */
-    @Deprecated
-    public Evaluation(
-        final Action action,
-        final String reason,
-        final List<String> tags,
-        final Map<String, Number> tagProbs,
-        final List<?> sds,
-        final List<Message> messages) {
-      this(action, reason, tags, tagProbs, sds, messages, Collections.emptyList());
+    public static Evaluation evaluate(final List<Message> messages, final Options options) {
+        return EVALUATOR.evaluate(messages, options);
     }
 
     /**
-     * Creates a new evaluation result.
+     * Exception thrown when AIGuard evaluation results in blocking the execution due to security
+     * concerns.
      *
-     * @param action the recommended action for the evaluated content
-     * @param reason human-readable explanation for the decision
-     * @param tags list of tags associated with the evaluation (e.g. indirect-prompt-injection)
-     * @param tagProbs map of tags associated to their probability
-     * @param sds list of Sensitive Data Scanner findings
-     * @param messages the evaluated messages, redacted when redaction was applied
-     * @param redactionReplacements the {@code redaction_replacements} array as returned by the
-     *     AIGuard service
+     * <p><strong>Important:</strong> This exception is thrown when the evaluation action is not
+     * {@code ALLOW} (i.e., {@code DENY} or {@code ABORT}) and blocking mode is enabled.
      */
-    public Evaluation(
-        final Action action,
-        final String reason,
-        final List<String> tags,
-        final Map<String, Number> tagProbs,
-        final List<?> sds,
-        final List<Message> messages,
-        final List<?> redactionReplacements) {
-      this.action = action;
-      this.reason = reason;
-      this.tags = tags;
-      this.tagProbs = tagProbs;
-      this.sds = sds != null ? sds : Collections.emptyList();
-      this.messages = messages != null ? messages : Collections.<Message>emptyList();
-      this.redactionReplacements =
-          redactionReplacements != null ? redactionReplacements : Collections.emptyList();
-    }
+    public static class AIGuardAbortError extends RuntimeException {
+        private final Action action;
+        private final String reason;
+        private final List<String> tags;
+        private final Map<String, Number> tagProbs;
+        private final List<?> sds;
 
-    /**
-     * Returns the recommended action for the evaluated content.
-     *
-     * @return the action (ALLOW, DENY, or ABORT)
-     */
-    public Action getAction() {
-      return action;
-    }
+        public AIGuardAbortError(
+                final Action action,
+                final String reason,
+                final List<String> tags,
+                final Map<String, Number> tagProbs,
+                final List<?> sds) {
+            super(reason);
+            this.action = action;
+            this.reason = reason;
+            this.tags = tags;
+            this.tagProbs = tagProbs != null ? tagProbs : Collections.emptyMap();
+            this.sds = sds != null ? sds : Collections.emptyList();
+        }
 
-    /**
-     * Returns the human-readable reasoning for the evaluation decision.
-     *
-     * @return explanation of why this action was recommended
-     */
-    public String getReason() {
-      return reason;
-    }
+        public Action getAction() {
+            return action;
+        }
 
-    /**
-     * Returns the list of tags associated with the evaluation (e.g. indirect-prompt-injection)
-     *
-     * @return list of tags.
-     */
-    public List<String> getTags() {
-      return tags;
+        public String getReason() {
+            return reason;
+        }
+
+        public List<String> getTags() {
+            return tags;
+        }
+
+        public Map<String, Number> getTagProbabilities() {
+            return tagProbs;
+        }
+
+        public List<?> getSds() {
+            return sds;
+        }
     }
 
     /**
-     * Returns a map from tag to their probability (e.g. [indirect-prompt-injection: 0.25])
+     * Exception thrown when there are client-side errors communicating with the AIGuard REST API.
+     *
+     * <p>This exception indicates problems with the AIGuard client implementation such as:
      *
-     * @return map of tag probabilities.
+     * <ul>
+     *   <li>Network connectivity issues when calling the AIGuard REST API
+     *   <li>Authentication failures with the AIGuard service
+     *   <li>Invalid configuration or missing API credentials
+     *   <li>Request timeout or service unavailability
+     *   <li>Malformed requests or unsupported API versions
+     * </ul>
      */
-    public Map<String, Number> getTagProbabilities() {
-      return tagProbs;
+    public static class AIGuardClientError extends RuntimeException {
+
+        private final Object errors;
+
+        public AIGuardClientError(final String message, final Throwable cause) {
+            super(message, cause);
+            errors = null;
+        }
+
+        public AIGuardClientError(final String message, final Object errors) {
+            super(message, null);
+            this.errors = errors;
+        }
+
+        public Object getErrors() {
+            return errors;
+        }
     }
 
-    /**
-     * Returns the list of Sensitive Data Scanner findings.
-     *
-     * @return list of SDS findings.
-     */
-    public List<?> getSds() {
-      return sds;
+    /** Actions that can be recommended by an AIGuard evaluation. */
+    public enum Action {
+        /** Content is safe to proceed with execution */
+        ALLOW,
+        /** Current action should be blocked from execution */
+        DENY,
+        /** Workflow should be immediately terminated due to severe risk */
+        ABORT
+    }
+
+    /**
+     * Represents the result of an AIGuard security evaluation, containing both the recommended action
+     * and the reasoning behind the decision.
+     *
+     * <p>The evaluation provides three possible actions:
+     *
+     * <ul>
+     *   <li>{@link Action#ALLOW} - Content is safe to proceed
+     *   <li>{@link Action#DENY} - Content should be blocked
+     *   <li>{@link Action#ABORT} - Execution should be immediately terminated
+     * </ul>
+     */
+    public static class Evaluation {
+
+        final Action action;
+        final String reason;
+        final List<String> tags;
+        final Map<String, Number> tagProbs;
+        final List<?> sds;
+        final List<Message> messages;
+        final List<?> redactionReplacements;
+
+        /**
+         * Creates a new evaluation result carrying no messages.
+         *
+         * @param action the recommended action for the evaluated content
+         * @param reason human-readable explanation for the decision
+         * @param tags list of tags associated with the evaluation (e.g. indirect-prompt-injection)
+         * @param tagProbs map of tags associated to their probability
+         * @param sds list of Sensitive Data Scanner findings
+         * @deprecated use {@link #Evaluation(Action, String, List, Map, List, List)} instead, so the
+         *     evaluated messages are available to the caller.
+         */
+        @Deprecated
+        public Evaluation(
+                final Action action,
+                final String reason,
+                final List<String> tags,
+                final Map<String, Number> tagProbs,
+                final List<?> sds) {
+            this(action, reason, tags, tagProbs, sds, Collections.emptyList());
+        }
+
+        /**
+         * Creates a new evaluation result carrying no redaction replacements.
+         *
+         * @param action the recommended action for the evaluated content
+         * @param reason human-readable explanation for the decision
+         * @param tags list of tags associated with the evaluation (e.g. indirect-prompt-injection)
+         * @param tagProbs map of tags associated to their probability
+         * @param sds list of Sensitive Data Scanner findings
+         * @param messages the evaluated messages, redacted when redaction was applied
+         * @deprecated use {@link #Evaluation(Action, String, List, Map, List, List, List)} instead, so
+         *     the applied redaction replacements are available to the caller.
+         */
+        @Deprecated
+        public Evaluation(
+                final Action action,
+                final String reason,
+                final List<String> tags,
+                final Map<String, Number> tagProbs,
+                final List<?> sds,
+                final List<Message> messages) {
+            this(action, reason, tags, tagProbs, sds, messages, Collections.emptyList());
+        }
+
+        /**
+         * Creates a new evaluation result.
+         *
+         * @param action the recommended action for the evaluated content
+         * @param reason human-readable explanation for the decision
+         * @param tags list of tags associated with the evaluation (e.g. indirect-prompt-injection)
+         * @param tagProbs map of tags associated to their probability
+         * @param sds list of Sensitive Data Scanner findings
+         * @param messages the evaluated messages, redacted when redaction was applied
+         * @param redactionReplacements the {@code redaction_replacements} array as returned by the
+         *     AIGuard service
+         */
+        public Evaluation(
+                final Action action,
+                final String reason,
+                final List<String> tags,
+                final Map<String, Number> tagProbs,
+                final List<?> sds,
+                final List<Message> messages,
+                final List<?> redactionReplacements) {
+            this.action = action;
+            this.reason = reason;
+            this.tags = tags;
+            this.tagProbs = tagProbs;
+            this.sds = sds != null ? sds : Collections.emptyList();
+            this.messages = messages != null ? messages : Collections.<Message>emptyList();
+            this.redactionReplacements =
+                    redactionReplacements != null ? redactionReplacements : Collections.emptyList();
+        }
+
+        /**
+         * Returns the recommended action for the evaluated content.
+         *
+         * @return the action (ALLOW, DENY, or ABORT)
+         */
+        public Action getAction() {
+            return action;
+        }
+
+        /**
+         * Returns the human-readable reasoning for the evaluation decision.
+         *
+         * @return explanation of why this action was recommended
+         */
+        public String getReason() {
+            return reason;
+        }
+
+        /**
+         * Returns the list of tags associated with the evaluation (e.g. indirect-prompt-injection)
+         *
+         * @return list of tags.
+         */
+        public List<String> getTags() {
+            return tags;
+        }
+
+        /**
+         * Returns a map from tag to their probability (e.g. [indirect-prompt-injection: 0.25])
+         *
+         * @return map of tag probabilities.
+         */
+        public Map<String, Number> getTagProbabilities() {
+            return tagProbs;
+        }
+
+        /**
+         * Returns the list of Sensitive Data Scanner findings.
+         *
+         * @return list of SDS findings.
+         */
+        public List<?> getSds() {
+            return sds;
+        }
+
+        /**
+         * Returns the evaluated messages, with sensitive data redacted whenever the AIGuard service
+         * requested redaction and redaction is enabled locally.
+         *
+         * <p>When nothing was redacted, this is the very same list that was passed to {@link
+         * AIGuard#evaluate(List, Options)}. The caller's list is never mutated.
+         *
+         * @return the evaluated messages, redacted when redaction was applied
+         */
+        public List<Message> getMessages() {
+            return messages;
+        }
+
+        /**
+         * Returns the redaction replacements the AIGuard service asked for, exactly as it returned
+         * them.
+         *
+         * <p>Each entry is a {@code {path, replacement}} pair addressing one string in the evaluated
+         * conversation, e.g. {@code messages[1].content} or {@code
+         * messages[2].tool_calls[0].function.arguments}.
+         *
+         * <p>This is detection metadata, not a record of what the tracer did: entries the tracer could
+         * not resolve are skipped fail-safe but still reported here, and the whole array is reported
+         * even when redaction is disabled locally, in which case none of it was applied. Use {@link
+         * #getMessages()} for the conversation as it actually stands.
+         *
+         * @return the service's redaction replacements, empty when it asked for none
+         */
+        public List<?> getRedactionReplacements() {
+            return redactionReplacements;
+        }
     }
 
     /**
-     * Returns the evaluated messages, with sensitive data redacted whenever the AIGuard service
-     * requested redaction and redaction is enabled locally.
+     * Represents an image URL in a content part. Images can be provided as URLs or data URIs.
      *
-     * <p>When nothing was redacted, this is the very same list that was passed to {@link
-     * AIGuard#evaluate(List, Options)}. The caller's list is never mutated.
+     * <p>Example usage:
      *
-     * @return the evaluated messages, redacted when redaction was applied
+     * <pre>{@code
+     * // Image from URL
+     * var imageUrl = new AIGuard.ImageURL("https://example.com/image.jpg");
+     *
+     * // Image from data URI
+     * var dataUri = new AIGuard.ImageURL("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUA...");
+     * }</pre>
      */
-    public List<Message> getMessages() {
-      return messages;
+    public static class ImageURL {
+
+        private final String url;
+
+        /**
+         * Creates a new ImageURL with the specified URL.
+         *
+         * @param url the image URL or data URI
+         * @throws NullPointerException if url is null
+         */
+        public ImageURL(@Nonnull final String url) {
+            this.url = Objects.requireNonNull(url, "url cannot be null");
+        }
+
+        /**
+         * Returns the image URL.
+         *
+         * @return the image URL or data URI
+         */
+        @Nonnull
+        public String getUrl() {
+            return url;
+        }
     }
 
     /**
-     * Returns the redaction replacements the AIGuard service asked for, exactly as it returned
-     * them.
+     * Represents a content part within a message. Content parts can be text or images, enabling
+     * multimodal AI prompts.
      *
-     * <p>Each entry is a {@code {path, replacement}} pair addressing one string in the evaluated
-     * conversation, e.g. {@code messages[1].content} or {@code
-     * messages[2].tool_calls[0].function.arguments}.
+     * <p>Example usage:
      *
-     * <p>This is detection metadata, not a record of what the tracer did: entries the tracer could
-     * not resolve are skipped fail-safe but still reported here, and the whole array is reported
-     * even when redaction is disabled locally, in which case none of it was applied. Use {@link
-     * #getMessages()} for the conversation as it actually stands.
+     * <pre>{@code
+     * // Text content
+     * var textPart = AIGuard.ContentPart.text("Describe this image:");
      *
-     * @return the service's redaction replacements, empty when it asked for none
-     */
-    public List<?> getRedactionReplacements() {
-      return redactionReplacements;
-    }
-  }
-
-  /**
-   * Represents an image URL in a content part. Images can be provided as URLs or data URIs.
-   *
-   * <p>Example usage:
-   *
-   * <pre>{@code
-   * // Image from URL
-   * var imageUrl = new AIGuard.ImageURL("https://example.com/image.jpg");
-   *
-   * // Image from data URI
-   * var dataUri = new AIGuard.ImageURL("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUA...");
-   * }</pre>
-   */
-  public static class ImageURL {
-
-    private final String url;
-
-    /**
-     * Creates a new ImageURL with the specified URL.
+     * // Image content from URL
+     * var imagePart = AIGuard.ContentPart.imageUrl("https://example.com/image.jpg");
      *
-     * @param url the image URL or data URI
-     * @throws NullPointerException if url is null
+     * // Multimodal message with text and image
+     * var message = AIGuard.Message.message("user", List.of(textPart, imagePart));
+     * }</pre>
      */
-    public ImageURL(@Nonnull final String url) {
-      this.url = Objects.requireNonNull(url, "url cannot be null");
-    }
+    public static class ContentPart {
 
-    /**
-     * Returns the image URL.
-     *
-     * @return the image URL or data URI
-     */
-    @Nonnull
-    public String getUrl() {
-      return url;
-    }
-  }
-
-  /**
-   * Represents a content part within a message. Content parts can be text or images, enabling
-   * multimodal AI prompts.
-   *
-   * <p>Example usage:
-   *
-   * <pre>{@code
-   * // Text content
-   * var textPart = AIGuard.ContentPart.text("Describe this image:");
-   *
-   * // Image content from URL
-   * var imagePart = AIGuard.ContentPart.imageUrl("https://example.com/image.jpg");
-   *
-   * // Multimodal message with text and image
-   * var message = AIGuard.Message.message("user", List.of(textPart, imagePart));
-   * }</pre>
-   */
-  public static class ContentPart {
-
-    /** Type of content part. */
-    public enum Type {
-      /** Text content */
-      TEXT,
-      /** Image URL content */
-      IMAGE_URL;
-
-      @Override
-      public String toString() {
-        return name().toLowerCase(Locale.ROOT);
-      }
-    }
+        /** Type of content part. */
+        public enum Type {
+            /** Text content */
+            TEXT,
+            /** Image URL content */
+            IMAGE_URL;
 
-    private final Type type;
-    @Nullable private final String text;
-    @Nullable private final ImageURL imageUrl;
+            @Override
+            public String toString() {
+                return name().toLowerCase(Locale.ROOT);
+            }
+        }
 
-    /**
-     * Private constructor to enforce use of factory methods.
-     *
-     * @param type the content part type
-     * @param text the text content (required for TEXT type)
-     * @param imageUrl the image URL (required for IMAGE_URL type)
-     */
-    private ContentPart(
-        @Nonnull final Type type, @Nullable final String text, @Nullable final ImageURL imageUrl) {
-      this.type = type;
-      this.text = text;
-      this.imageUrl = imageUrl;
-
-      if (type == Type.TEXT && text == null) {
-        throw new IllegalArgumentException("text content part requires text field");
-      }
-      if (type == Type.IMAGE_URL && imageUrl == null) {
-        throw new IllegalArgumentException("image_url content part requires imageUrl field");
-      }
-    }
+        private final Type type;
+
+        @Nullable
+        private final String text;
+
+        @Nullable
+        private final ImageURL imageUrl;
+
+        /**
+         * Private constructor to enforce use of factory methods.
+         *
+         * @param type the content part type
+         * @param text the text content (required for TEXT type)
+         * @param imageUrl the image URL (required for IMAGE_URL type)
+         */
+        private ContentPart(@Nonnull final Type type, @Nullable final String text, @Nullable final ImageURL imageUrl) {
+            this.type = type;
+            this.text = text;
+            this.imageUrl = imageUrl;
+
+            if (type == Type.TEXT && text == null) {
+                throw new IllegalArgumentException("text content part requires text field");
+            }
+            if (type == Type.IMAGE_URL && imageUrl == null) {
+                throw new IllegalArgumentException("image_url content part requires imageUrl field");
+            }
+        }
 
-    /**
-     * Returns the type of this content part.
-     *
-     * @return the content part type (TEXT or IMAGE_URL)
-     */
-    @Nonnull
-    public Type getType() {
-      return type;
-    }
+        /**
+         * Returns the type of this content part.
+         *
+         * @return the content part type (TEXT or IMAGE_URL)
+         */
+        @Nonnull
+        public Type getType() {
+            return type;
+        }
 
-    /**
-     * Returns the text content of this part.
-     *
-     * @return the text content, or null if this is an IMAGE_URL part
-     */
-    @Nullable
-    public String getText() {
-      return text;
-    }
+        /**
+         * Returns the text content of this part.
+         *
+         * @return the text content, or null if this is an IMAGE_URL part
+         */
+        @Nullable
+        public String getText() {
+            return text;
+        }
 
-    /**
-     * Returns the image URL of this part.
-     *
-     * @return the image URL, or null if this is a TEXT part
-     */
-    @Nullable
-    public ImageURL getImageUrl() {
-      return imageUrl;
-    }
+        /**
+         * Returns the image URL of this part.
+         *
+         * @return the image URL, or null if this is a TEXT part
+         */
+        @Nullable
+        public ImageURL getImageUrl() {
+            return imageUrl;
+        }
 
-    /**
-     * Creates a text content part.
-     *
-     * @param text the text content
-     * @return a new ContentPart with TEXT type
-     * @throws NullPointerException if text is null
-     */
-    @Nonnull
-    public static ContentPart text(@Nonnull final String text) {
-      Objects.requireNonNull(text, "text cannot be null");
-      return new ContentPart(Type.TEXT, text, null);
-    }
+        /**
+         * Creates a text content part.
+         *
+         * @param text the text content
+         * @return a new ContentPart with TEXT type
+         * @throws NullPointerException if text is null
+         */
+        @Nonnull
+        public static ContentPart text(@Nonnull final String text) {
+            Objects.requireNonNull(text, "text cannot be null");
+            return new ContentPart(Type.TEXT, text, null);
+        }
 
-    /**
-     * Creates an image content part from a URL string.
-     *
-     * @param url the image URL or data URI
-     * @return a new ContentPart with IMAGE_URL type
-     * @throws NullPointerException if url is null
-     */
-    @Nonnull
-    public static ContentPart imageUrl(@Nonnull final String url) {
-      return new ContentPart(Type.IMAGE_URL, null, new ImageURL(url));
+        /**
+         * Creates an image content part from a URL string.
+         *
+         * @param url the image URL or data URI
+         * @return a new ContentPart with IMAGE_URL type
+         * @throws NullPointerException if url is null
+         */
+        @Nonnull
+        public static ContentPart imageUrl(@Nonnull final String url) {
+            return new ContentPart(Type.IMAGE_URL, null, new ImageURL(url));
+        }
     }
-  }
-
-  /**
-   * Represents a message in an AI conversation. Messages can represent user prompts, assistant
-   * responses, system messages, or tool outputs.
-   *
-   * <p>Messages can contain either plain text content or structured content parts (text and
-   * images):
-   *
-   * <p>Example usage:
-   *
-   * <pre>{@code
-   * // User prompt with text
-   * var userPrompt = AIGuard.Message.message("user", "What's the weather like?");
-   *
-   * // User prompt with text and image
-   * var multimodalPrompt = AIGuard.Message.message("user", List.of(
-   *     AIGuard.ContentPart.text("Describe this image:"),
-   *     AIGuard.ContentPart.imageUrl("https://example.com/image.jpg")
-   * ));
-   *
-   * // Assistant response with tool calls
-   * var assistantWithTools = AIGuard.Message.assistant(
-   *     AIGuard.ToolCall.toolCall("call_123", "get_weather", "{\"location\": \"New York\"}")
-   * );
-   *
-   * // Tool response
-   * var toolResponse = AIGuard.Message.tool("call_123", "Sunny, 75°F");
-   * }</pre>
-   */
-  public static class Message {
-
-    private final String role;
-    @Nullable private final String content;
-    @Nullable private final List<ContentPart> contentParts;
-    private final List<ToolCall> toolCalls;
-    private final String toolCallId;
 
     /**
-     * Creates a new message with the specified parameters.
+     * Represents a message in an AI conversation. Messages can represent user prompts, assistant
+     * responses, system messages, or tool outputs.
      *
-     * @param role the role of the message sender (e.g., "user", "assistant", "system", "tool")
-     * @param content the text content of the message, or null for assistant messages with only tool
-     *     calls
-     * @param toolCalls list of tool calls associated with this message, or null if no tool calls
-     * @param toolCallId the tool call ID this message is responding to, or null if not a tool
-     *     response
-     */
-    public Message(
-        @Nonnull final String role,
-        @Nullable final String content,
-        @Nullable final List<ToolCall> toolCalls,
-        @Nullable final String toolCallId) {
-      this.role = role;
-      this.content = content;
-      this.contentParts = null;
-      this.toolCalls = toolCalls;
-      this.toolCallId = toolCallId;
-    }
-
-    /**
-     * Creates a new message with content parts (text and/or images).
+     * <p>Messages can contain either plain text content or structured content parts (text and
+     * images):
      *
-     * @param role the role of the message sender
-     * @param contentParts list of content parts
-     * @param toolCalls list of tool calls, or null
-     * @param toolCallId the tool call ID this message responds to, or null
-     * @throws IllegalArgumentException if contentParts contains null elements
-     */
-    public Message(
-        @Nonnull final String role,
-        @Nonnull final List<ContentPart> contentParts,
-        @Nullable final List<ToolCall> toolCalls,
-        @Nullable final String toolCallId) {
-      this.role = role;
-      this.content = null;
-
-      for (final ContentPart part : contentParts) {
-        if (part == null) {
-          throw new IllegalArgumentException("contentParts must not contain null elements");
-        }
-      }
-
-      this.contentParts = Collections.unmodifiableList(contentParts);
-      this.toolCalls = toolCalls;
-      this.toolCallId = toolCallId;
-    }
-
-    /**
-     * Returns the role of the message sender.
+     * <p>Example usage:
      *
-     * @return the role (e.g., "user", "assistant", "system", "tool")
-     */
-    public String getRole() {
-      return role;
-    }
-
-    /**
-     * Returns the text content of the message.
+     * <pre>{@code
+     * // User prompt with text
+     * var userPrompt = AIGuard.Message.message("user", "What's the weather like?");
      *
-     * @return the message content, or null if using content parts or for assistant messages with
-     *     only tool calls
-     */
-    @Nullable
-    public String getContent() {
-      return content;
-    }
-
-    /**
-     * Returns the content parts of the message.
+     * // User prompt with text and image
+     * var multimodalPrompt = AIGuard.Message.message("user", List.of(
+     *     AIGuard.ContentPart.text("Describe this image:"),
+     *     AIGuard.ContentPart.imageUrl("https://example.com/image.jpg")
+     * ));
      *
-     * @return the content parts (text and images), or null if using plain text content
-     */
-    @Nullable
-    public List<ContentPart> getContentParts() {
-      return contentParts;
-    }
-
-    /**
-     * Returns the list of tool calls associated with this message.
+     * // Assistant response with tool calls
+     * var assistantWithTools = AIGuard.Message.assistant(
+     *     AIGuard.ToolCall.toolCall("call_123", "get_weather", "{\"location\": \"New York\"}")
+     * );
      *
-     * @return list of tool calls, or null if this message has no tool calls
+     * // Tool response
+     * var toolResponse = AIGuard.Message.tool("call_123", "Sunny, 75°F");
+     * }</pre>
      */
-    public List<ToolCall> getToolCalls() {
-      return toolCalls;
-    }
+    public static class Message {
 
-    /**
-     * Returns the tool call ID that this message is responding to.
-     *
-     * @return the tool call ID, or null if this is not a tool response message
-     */
-    public String getToolCallId() {
-      return toolCallId;
-    }
+        private final String role;
 
-    /**
-     * Creates a message with specified role and text content.
-     *
-     * @param role the role of the message sender (e.g., "user", "system")
-     * @param content the text content of the message
-     * @return a new Message instance
-     */
-    @Nonnull
-    public static Message message(@Nonnull final String role, @Nonnull final String content) {
-      return new Message(role, content, null, null);
-    }
+        @Nullable
+        private final String content;
 
-    /**
-     * Creates a message with specified role and content parts (text and/or images).
-     *
-     * @param role the role of the message sender (e.g., "user", "system")
-     * @param contentParts list of content parts (text and/or images)
-     * @return a new Message instance
-     */
-    @Nonnull
-    public static Message message(
-        @Nonnull final String role, @Nonnull final List<ContentPart> contentParts) {
-      return new Message(role, contentParts, null, null);
-    }
+        @Nullable
+        private final List<ContentPart> contentParts;
 
-    /**
-     * Creates a tool response message.
-     *
-     * @param toolCallId the ID of the tool call this message is responding to
-     * @param content the result or output from the tool execution
-     * @return a new Message instance with role "tool"
-     */
-    public static Message tool(final String toolCallId, final String content) {
-      return new Message("tool", content, null, toolCallId);
-    }
+        private final List<ToolCall> toolCalls;
+        private final String toolCallId;
 
-    /**
-     * Creates an assistant message with tool calls but no text content.
-     *
-     * @param toolCalls the tool calls the assistant wants to make
-     * @return a new Message instance with role "assistant" and no text content
-     */
-    @Nonnull
-    public static Message assistant(@Nonnull final ToolCall... toolCalls) {
-      return new Message("assistant", (String) null, Arrays.asList(toolCalls), null);
-    }
-  }
-
-  /**
-   * Configuration options for AIGuard evaluation behavior.
-   *
-   * <p>Options control how the evaluation process behaves, including whether to block execution
-   * when unsafe content is detected.
-   *
-   * <p>Example usage:
-   *
-   * <pre>{@code
-   * // Use default options (follows remote is_blocking_enabled setting)
-   * var result = AIGuard.evaluate(messages);
-   *
-   * // Disable blocking mode
-   * var options = new AIGuard.Options()
-   *     .block(false);
-   * var result = AIGuard.evaluate(messages, options);
-   * }</pre>
-   */
-  public static final class Options {
-
-    /** Default options that follow the remote is_blocking_enabled setting. */
-    public static final Options DEFAULT = new Options().block(true);
-
-    private boolean block = true;
+        /**
+         * Creates a new message with the specified parameters.
+         *
+         * @param role the role of the message sender (e.g., "user", "assistant", "system", "tool")
+         * @param content the text content of the message, or null for assistant messages with only tool
+         *     calls
+         * @param toolCalls list of tool calls associated with this message, or null if no tool calls
+         * @param toolCallId the tool call ID this message is responding to, or null if not a tool
+         *     response
+         */
+        public Message(
+                @Nonnull final String role,
+                @Nullable final String content,
+                @Nullable final List<ToolCall> toolCalls,
+                @Nullable final String toolCallId) {
+            this.role = role;
+            this.content = content;
+            this.contentParts = null;
+            this.toolCalls = toolCalls;
+            this.toolCallId = toolCallId;
+        }
 
-    /**
-     * Returns whether blocking mode is enabled.
-     *
-     * @return true if execution should be blocked on DENY/ABORT actions
-     */
-    public boolean block() {
-      return block;
-    }
+        /**
+         * Creates a new message with content parts (text and/or images).
+         *
+         * @param role the role of the message sender
+         * @param contentParts list of content parts
+         * @param toolCalls list of tool calls, or null
+         * @param toolCallId the tool call ID this message responds to, or null
+         * @throws IllegalArgumentException if contentParts contains null elements
+         */
+        public Message(
+                @Nonnull final String role,
+                @Nonnull final List<ContentPart> contentParts,
+                @Nullable final List<ToolCall> toolCalls,
+                @Nullable final String toolCallId) {
+            this.role = role;
+            this.content = null;
+
+            for (final ContentPart part : contentParts) {
+                if (part == null) {
+                    throw new IllegalArgumentException("contentParts must not contain null elements");
+                }
+            }
+
+            this.contentParts = Collections.unmodifiableList(contentParts);
+            this.toolCalls = toolCalls;
+            this.toolCallId = toolCallId;
+        }
 
-    /**
-     * Enable/disable blocking mode
-     *
-     * @param block true if execution should be blocked on DENY/ABORT actions
-     */
-    public Options block(final boolean block) {
-      this.block = block;
-      return this;
-    }
-  }
-
-  /**
-   * Represents a function call made by an AI assistant. Tool calls contain an identifier and
-   * function details (name and arguments).
-   *
-   * <p>Example usage:
-   *
-   * <pre>{@code
-   * // Create a tool call
-   * var toolCall = AIGuard.ToolCall.toolCall("call_123", "get_weather", "{\"location\": \"NYC\"}");
-   *
-   * // Use in an assistant message
-   * var assistantMessage = AIGuard.Message.assistant(toolCall);
-   * }</pre>
-   */
-  public static class ToolCall {
-
-    private final String id;
-    private final Function function;
+        /**
+         * Returns the role of the message sender.
+         *
+         * @return the role (e.g., "user", "assistant", "system", "tool")
+         */
+        public String getRole() {
+            return role;
+        }
 
-    /**
-     * Creates a new tool call with the specified ID and function.
-     *
-     * @param id unique identifier for this tool call
-     * @param function the function details (name and arguments)
-     */
-    public ToolCall(final String id, final Function function) {
-      this.id = id;
-      this.function = function;
-    }
+        /**
+         * Returns the text content of the message.
+         *
+         * @return the message content, or null if using content parts or for assistant messages with
+         *     only tool calls
+         */
+        @Nullable
+        public String getContent() {
+            return content;
+        }
 
-    /**
-     * Returns the unique identifier for this tool call.
-     *
-     * @return the tool call ID
-     */
-    public String getId() {
-      return id;
+        /**
+         * Returns the content parts of the message.
+         *
+         * @return the content parts (text and images), or null if using plain text content
+         */
+        @Nullable
+        public List<ContentPart> getContentParts() {
+            return contentParts;
+        }
+
+        /**
+         * Returns the list of tool calls associated with this message.
+         *
+         * @return list of tool calls, or null if this message has no tool calls
+         */
+        public List<ToolCall> getToolCalls() {
+            return toolCalls;
+        }
+
+        /**
+         * Returns the tool call ID that this message is responding to.
+         *
+         * @return the tool call ID, or null if this is not a tool response message
+         */
+        public String getToolCallId() {
+            return toolCallId;
+        }
+
+        /**
+         * Creates a message with specified role and text content.
+         *
+         * @param role the role of the message sender (e.g., "user", "system")
+         * @param content the text content of the message
+         * @return a new Message instance
+         */
+        @Nonnull
+        public static Message message(@Nonnull final String role, @Nonnull final String content) {
+            return new Message(role, content, null, null);
+        }
+
+        /**
+         * Creates a message with specified role and content parts (text and/or images).
+         *
+         * @param role the role of the message sender (e.g., "user", "system")
+         * @param contentParts list of content parts (text and/or images)
+         * @return a new Message instance
+         */
+        @Nonnull
+        public static Message message(@Nonnull final String role, @Nonnull final List<ContentPart> contentParts) {
+            return new Message(role, contentParts, null, null);
+        }
+
+        /**
+         * Creates a tool response message.
+         *
+         * @param toolCallId the ID of the tool call this message is responding to
+         * @param content the result or output from the tool execution
+         * @return a new Message instance with role "tool"
+         */
+        public static Message tool(final String toolCallId, final String content) {
+            return new Message("tool", content, null, toolCallId);
+        }
+
+        /**
+         * Creates an assistant message with tool calls but no text content.
+         *
+         * @param toolCalls the tool calls the assistant wants to make
+         * @return a new Message instance with role "assistant" and no text content
+         */
+        @Nonnull
+        public static Message assistant(@Nonnull final ToolCall... toolCalls) {
+            return new Message("assistant", (String) null, Arrays.asList(toolCalls), null);
+        }
     }
 
     /**
-     * Returns the function details for this tool call.
+     * Configuration options for AIGuard evaluation behavior.
+     *
+     * <p>Options control how the evaluation process behaves, including whether to block execution
+     * when unsafe content is detected.
+     *
+     * <p>Example usage:
      *
-     * @return the Function object containing name and arguments
+     * <pre>{@code
+     * // Use default options (follows remote is_blocking_enabled setting)
+     * var result = AIGuard.evaluate(messages);
+     *
+     * // Disable blocking mode
+     * var options = new AIGuard.Options()
+     *     .block(false);
+     * var result = AIGuard.evaluate(messages, options);
+     * }</pre>
      */
-    public Function getFunction() {
-      return function;
-    }
+    public static final class Options {
 
-    /**
-     * Represents the function details within a tool call, including the function name and its
-     * arguments.
-     */
-    public static class Function {
-
-      private final String name;
-      private final String arguments;
-
-      /**
-       * Creates a new function with the specified name and arguments.
-       *
-       * @param name the name of the function to call
-       * @param arguments the function arguments as a JSON string
-       */
-      public Function(String name, String arguments) {
-        this.name = name;
-        this.arguments = arguments;
-      }
-
-      /**
-       * Returns the name of the function to call.
-       *
-       * @return the function name
-       */
-      public String getName() {
-        return name;
-      }
-
-      /**
-       * Returns the function arguments as a JSON string.
-       *
-       * @return the arguments in JSON format
-       */
-      public String getArguments() {
-        return arguments;
-      }
+        /** Default options that follow the remote is_blocking_enabled setting. */
+        public static final Options DEFAULT = new Options().block(true);
+
+        private boolean block = true;
+
+        /**
+         * Returns whether blocking mode is enabled.
+         *
+         * @return true if execution should be blocked on DENY/ABORT actions
+         */
+        public boolean block() {
+            return block;
+        }
+
+        /**
+         * Enable/disable blocking mode
+         *
+         * @param block true if execution should be blocked on DENY/ABORT actions
+         */
+        public Options block(final boolean block) {
+            this.block = block;
+            return this;
+        }
     }
 
     /**
-     * Factory method to create a new tool call with the specified parameters.
+     * Represents a function call made by an AI assistant. Tool calls contain an identifier and
+     * function details (name and arguments).
      *
-     * @param id unique identifier for the tool call
-     * @param name the name of the function to call
-     * @param arguments the function arguments as a JSON string
-     * @return a new ToolCall instance
+     * <p>Example usage:
+     *
+     * <pre>{@code
+     * // Create a tool call
+     * var toolCall = AIGuard.ToolCall.toolCall("call_123", "get_weather", "{\"location\": \"NYC\"}");
+     *
+     * // Use in an assistant message
+     * var assistantMessage = AIGuard.Message.assistant(toolCall);
+     * }</pre>
      */
-    public static ToolCall toolCall(final String id, final String name, final String arguments) {
-      return new ToolCall(id, new ToolCall.Function(name, arguments));
+    public static class ToolCall {
+
+        private final String id;
+        private final Function function;
+
+        /**
+         * Creates a new tool call with the specified ID and function.
+         *
+         * @param id unique identifier for this tool call
+         * @param function the function details (name and arguments)
+         */
+        public ToolCall(final String id, final Function function) {
+            this.id = id;
+            this.function = function;
+        }
+
+        /**
+         * Returns the unique identifier for this tool call.
+         *
+         * @return the tool call ID
+         */
+        public String getId() {
+            return id;
+        }
+
+        /**
+         * Returns the function details for this tool call.
+         *
+         * @return the Function object containing name and arguments
+         */
+        public Function getFunction() {
+            return function;
+        }
+
+        /**
+         * Represents the function details within a tool call, including the function name and its
+         * arguments.
+         */
+        public static class Function {
+
+            private final String name;
+            private final String arguments;
+
+            /**
+             * Creates a new function with the specified name and arguments.
+             *
+             * @param name the name of the function to call
+             * @param arguments the function arguments as a JSON string
+             */
+            public Function(String name, String arguments) {
+                this.name = name;
+                this.arguments = arguments;
+            }
+
+            /**
+             * Returns the name of the function to call.
+             *
+             * @return the function name
+             */
+            public String getName() {
+                return name;
+            }
+
+            /**
+             * Returns the function arguments as a JSON string.
+             *
+             * @return the arguments in JSON format
+             */
+            public String getArguments() {
+                return arguments;
+            }
+        }
+
+        /**
+         * Factory method to create a new tool call with the specified parameters.
+         *
+         * @param id unique identifier for the tool call
+         * @param name the name of the function to call
+         * @param arguments the function arguments as a JSON string
+         * @return a new ToolCall instance
+         */
+        public static ToolCall toolCall(final String id, final String name, final String arguments) {
+            return new ToolCall(id, new ToolCall.Function(name, arguments));
+        }
     }
-  }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/aiguard/Evaluator.java b/dd-trace-api/src/main/java/datadog/trace/api/aiguard/Evaluator.java
index fe69c813909..3961df84310 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/aiguard/Evaluator.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/aiguard/Evaluator.java
@@ -3,5 +3,5 @@
 import java.util.List;
 
 public interface Evaluator {
-  AIGuard.Evaluation evaluate(List<AIGuard.Message> messages, AIGuard.Options options);
+    AIGuard.Evaluation evaluate(List<AIGuard.Message> messages, AIGuard.Options options);
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/aiguard/noop/NoOpEvaluator.java b/dd-trace-api/src/main/java/datadog/trace/api/aiguard/noop/NoOpEvaluator.java
index 95dce0803c7..3ab5f0fd0bd 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/aiguard/noop/NoOpEvaluator.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/aiguard/noop/NoOpEvaluator.java
@@ -12,15 +12,9 @@
 
 public final class NoOpEvaluator implements Evaluator {
 
-  @Override
-  public Evaluation evaluate(final List<Message> messages, final Options options) {
-    return new Evaluation(
-        ALLOW,
-        "AI Guard is not enabled",
-        emptyList(),
-        emptyMap(),
-        emptyList(),
-        messages,
-        emptyList());
-  }
+    @Override
+    public Evaluation evaluate(final List<Message> messages, final Options options) {
+        return new Evaluation(
+                ALLOW, "AI Guard is not enabled", emptyList(), emptyMap(), emptyList(), messages, emptyList());
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/CIVisibility.java b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/CIVisibility.java
index 688036b4566..36bbe072e99 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/CIVisibility.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/CIVisibility.java
@@ -7,42 +7,40 @@
 
 public class CIVisibility {
 
-  private static volatile SessionFactory SESSION_FACTORY =
-      (projectName, projectRoot, component, startTime) -> NoOpDDTestSession.INSTANCE;
+    private static volatile SessionFactory SESSION_FACTORY =
+            (projectName, projectRoot, component, startTime) -> NoOpDDTestSession.INSTANCE;
 
-  /**
-   * This a hook for injecting SessionFactory implementation. It should only be used internally by
-   * the tracer logic
-   *
-   * @param sessionFactory Session factory instance
-   */
-  public static void registerSessionFactory(SessionFactory sessionFactory) {
-    SESSION_FACTORY = sessionFactory;
-  }
+    /**
+     * This a hook for injecting SessionFactory implementation. It should only be used internally by
+     * the tracer logic
+     *
+     * @param sessionFactory Session factory instance
+     */
+    public static void registerSessionFactory(SessionFactory sessionFactory) {
+        SESSION_FACTORY = sessionFactory;
+    }
 
-  /**
-   * Marks the start of a new test session.
-   *
-   * @param projectName The name of the tested project
-   * @param component The name of the test component (typically corresponds to the name of the
-   *     testing framework used). This will be added as prefix to reported span names
-   * @param startTime Optional start time in microseconds. If {@code null} is supplied, current time
-   *     will be assumed
-   * @return Handle to the test session instance
-   */
-  public static DDTestSession startSession(
-      String projectName, String component, @Nullable Long startTime) {
-    Path projectRoot = Paths.get("").toAbsolutePath();
-    return SESSION_FACTORY.startSession(projectName, projectRoot, component, startTime);
-  }
+    /**
+     * Marks the start of a new test session.
+     *
+     * @param projectName The name of the tested project
+     * @param component The name of the test component (typically corresponds to the name of the
+     *     testing framework used). This will be added as prefix to reported span names
+     * @param startTime Optional start time in microseconds. If {@code null} is supplied, current time
+     *     will be assumed
+     * @return Handle to the test session instance
+     */
+    public static DDTestSession startSession(String projectName, String component, @Nullable Long startTime) {
+        Path projectRoot = Paths.get("").toAbsolutePath();
+        return SESSION_FACTORY.startSession(projectName, projectRoot, component, startTime);
+    }
 
-  public static DDTestSession startSession(
-      String projectName, Path projectRoot, String component, @Nullable Long startTime) {
-    return SESSION_FACTORY.startSession(projectName, projectRoot, component, startTime);
-  }
+    public static DDTestSession startSession(
+            String projectName, Path projectRoot, String component, @Nullable Long startTime) {
+        return SESSION_FACTORY.startSession(projectName, projectRoot, component, startTime);
+    }
 
-  public interface SessionFactory {
-    DDTestSession startSession(
-        String projectName, Path projectRoot, String component, Long startTime);
-  }
+    public interface SessionFactory {
+        DDTestSession startSession(String projectName, Path projectRoot, String component, Long startTime);
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/DDTest.java b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/DDTest.java
index 6da2a6337ed..c100abd3fb9 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/DDTest.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/DDTest.java
@@ -8,46 +8,46 @@
  */
 public interface DDTest {
 
-  /**
-   * Adds an arbitrary tag to the test
-   *
-   * @param key The name of the tag
-   * @param value The value of the tag
-   */
-  void setTag(String key, Object value);
+    /**
+     * Adds an arbitrary tag to the test
+     *
+     * @param key The name of the tag
+     * @param value The value of the tag
+     */
+    void setTag(String key, Object value);
 
-  /**
-   * Marks the test as failed.
-   *
-   * <p>This does not imply the end of test execution, so {@link #end(Long)} method has to be
-   * invoked at some point after this one.
-   *
-   * @param error Optional exception that caused the test to fail
-   */
-  void setErrorInfo(@Nullable Throwable error);
+    /**
+     * Marks the test as failed.
+     *
+     * <p>This does not imply the end of test execution, so {@link #end(Long)} method has to be
+     * invoked at some point after this one.
+     *
+     * @param error Optional exception that caused the test to fail
+     */
+    void setErrorInfo(@Nullable Throwable error);
 
-  /**
-   * Marks the test as skipped.
-   *
-   * <p>This does not imply the end of test execution, so {@link #end(Long)} method has to be
-   * invoked at some point after this one.
-   *
-   * @param skipReason Optional reason for skipping the test
-   */
-  void setSkipReason(@Nullable String skipReason);
+    /**
+     * Marks the test as skipped.
+     *
+     * <p>This does not imply the end of test execution, so {@link #end(Long)} method has to be
+     * invoked at some point after this one.
+     *
+     * @param skipReason Optional reason for skipping the test
+     */
+    void setSkipReason(@Nullable String skipReason);
 
-  /**
-   * Marks the end of test execution.
-   *
-   * <p>Unless either {@link #setErrorInfo(Throwable)} or {@link #setSkipReason(String)} were
-   * invoked prior to calling this method, the test is assumed to have finished successfully.
-   *
-   * <p>The method must be called once for each test instance.
-   *
-   * <p>The call has to be made in the same thread where the test was started.
-   *
-   * @param endTime Optional finish time in microseconds. If {@code null} is supplied, current time
-   *     will be assumed
-   */
-  void end(@Nullable Long endTime);
+    /**
+     * Marks the end of test execution.
+     *
+     * <p>Unless either {@link #setErrorInfo(Throwable)} or {@link #setSkipReason(String)} were
+     * invoked prior to calling this method, the test is assumed to have finished successfully.
+     *
+     * <p>The method must be called once for each test instance.
+     *
+     * <p>The call has to be made in the same thread where the test was started.
+     *
+     * @param endTime Optional finish time in microseconds. If {@code null} is supplied, current time
+     *     will be assumed
+     */
+    void end(@Nullable Long endTime);
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/DDTestModule.java b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/DDTestModule.java
index 1ad005bbf5c..d5f9b7262d0 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/DDTestModule.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/DDTestModule.java
@@ -8,84 +8,80 @@
  */
 public interface DDTestModule {
 
-  /**
-   * Adds an arbitrary tag to the module
-   *
-   * @param key The name of the tag
-   * @param value The value of the tag
-   */
-  void setTag(String key, Object value);
+    /**
+     * Adds an arbitrary tag to the module
+     *
+     * @param key The name of the tag
+     * @param value The value of the tag
+     */
+    void setTag(String key, Object value);
 
-  /**
-   * Marks the module as failed.
-   *
-   * <p>This method should be used to signal a failure that is not related to a specific suite or a
-   * test case, but rather to the module as a whole (e.g. a failure in a setup/teardown logic that
-   * is executed once per module). If an individual test suite the module fails, there is no need to
-   * explicitly signal it to the module object: the status of the module will reflect individual
-   * suite failures automatically.
-   *
-   * <p>This does not imply the end of module execution, so {@link #end(Long)} method has to be
-   * invoked at some point after this one.
-   *
-   * @param error Optional exception that caused the module to fail
-   */
-  void setErrorInfo(Throwable error);
+    /**
+     * Marks the module as failed.
+     *
+     * <p>This method should be used to signal a failure that is not related to a specific suite or a
+     * test case, but rather to the module as a whole (e.g. a failure in a setup/teardown logic that
+     * is executed once per module). If an individual test suite the module fails, there is no need to
+     * explicitly signal it to the module object: the status of the module will reflect individual
+     * suite failures automatically.
+     *
+     * <p>This does not imply the end of module execution, so {@link #end(Long)} method has to be
+     * invoked at some point after this one.
+     *
+     * @param error Optional exception that caused the module to fail
+     */
+    void setErrorInfo(Throwable error);
 
-  /**
-   * Marks the module as skipped.
-   *
-   * <p>This does not imply the end of module execution, so {@link #end(Long)} method has to be
-   * invoked at some point after this one.
-   *
-   * @param skipReason Optional reason for skipping the module
-   */
-  void setSkipReason(String skipReason);
+    /**
+     * Marks the module as skipped.
+     *
+     * <p>This does not imply the end of module execution, so {@link #end(Long)} method has to be
+     * invoked at some point after this one.
+     *
+     * @param skipReason Optional reason for skipping the module
+     */
+    void setSkipReason(String skipReason);
 
-  /**
-   * Marks the end of module execution.
-   *
-   * <p>Unless either {@link #setErrorInfo(Throwable)} or {@link #setSkipReason(String)} were
-   * invoked prior to calling this method, the status of the module will be calculated based on the
-   * statuses of individual test suites that were executed in scope of the module.
-   *
-   * <p>The method must be called once for each module instance.
-   *
-   * <p>The call does not have to be made in the same thread where the module was started.
-   *
-   * @param endTime Optional finish time in microseconds. If {@code null} is supplied, current time
-   *     will be assumed
-   */
-  void end(@Nullable Long endTime);
+    /**
+     * Marks the end of module execution.
+     *
+     * <p>Unless either {@link #setErrorInfo(Throwable)} or {@link #setSkipReason(String)} were
+     * invoked prior to calling this method, the status of the module will be calculated based on the
+     * statuses of individual test suites that were executed in scope of the module.
+     *
+     * <p>The method must be called once for each module instance.
+     *
+     * <p>The call does not have to be made in the same thread where the module was started.
+     *
+     * @param endTime Optional finish time in microseconds. If {@code null} is supplied, current time
+     *     will be assumed
+     */
+    void end(@Nullable Long endTime);
 
-  /**
-   * Marks the start of a new test suite in the module.
-   *
-   * @param testSuiteName The name of the suite
-   * @param testClass Optional class that corresponds to the test suite.
-   * @param startTime Optional start time in microseconds. If {@code null} is supplied, current time
-   *     will be assumed
-   * @return Handle to the test suite instance
-   */
-  default DDTestSuite testSuiteStart(
-      String testSuiteName, @Nullable Class<?> testClass, @Nullable Long startTime) {
-    return testSuiteStart(testSuiteName, testClass, startTime, false);
-  }
+    /**
+     * Marks the start of a new test suite in the module.
+     *
+     * @param testSuiteName The name of the suite
+     * @param testClass Optional class that corresponds to the test suite.
+     * @param startTime Optional start time in microseconds. If {@code null} is supplied, current time
+     *     will be assumed
+     * @return Handle to the test suite instance
+     */
+    default DDTestSuite testSuiteStart(String testSuiteName, @Nullable Class<?> testClass, @Nullable Long startTime) {
+        return testSuiteStart(testSuiteName, testClass, startTime, false);
+    }
 
-  /**
-   * Marks the start of a new test suite in the module.
-   *
-   * @param testSuiteName The name of the suite
-   * @param testClass Optional class that corresponds to the test suite.
-   * @param startTime Optional start time in microseconds. If {@code null} is supplied, current time
-   *     will be assumed
-   * @param parallelized Whether test cases from this suite will be executed concurrently in
-   *     multiple threads
-   * @return Handle to the test suite instance
-   */
-  DDTestSuite testSuiteStart(
-      String testSuiteName,
-      @Nullable Class<?> testClass,
-      @Nullable Long startTime,
-      boolean parallelized);
+    /**
+     * Marks the start of a new test suite in the module.
+     *
+     * @param testSuiteName The name of the suite
+     * @param testClass Optional class that corresponds to the test suite.
+     * @param startTime Optional start time in microseconds. If {@code null} is supplied, current time
+     *     will be assumed
+     * @param parallelized Whether test cases from this suite will be executed concurrently in
+     *     multiple threads
+     * @return Handle to the test suite instance
+     */
+    DDTestSuite testSuiteStart(
+            String testSuiteName, @Nullable Class<?> testClass, @Nullable Long startTime, boolean parallelized);
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/DDTestSession.java b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/DDTestSession.java
index 5cabf96b9f7..f9a494848dd 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/DDTestSession.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/DDTestSession.java
@@ -8,63 +8,63 @@
  */
 public interface DDTestSession {
 
-  /**
-   * Adds an arbitrary tag to the session
-   *
-   * @param key The name of the tag
-   * @param value The value of the tag
-   */
-  void setTag(String key, Object value);
+    /**
+     * Adds an arbitrary tag to the session
+     *
+     * @param key The name of the tag
+     * @param value The value of the tag
+     */
+    void setTag(String key, Object value);
 
-  /**
-   * Marks the session as failed.
-   *
-   * <p>This method should be used to signal a failure that is not related to a specific module or a
-   * test suite, but rather to the tests execution as a whole (e.g. a failure in a setup/teardown
-   * logic that is executed once for the entire project). If an individual module in the project
-   * fails, there is no need to explicitly signal it to the session object: the status of the
-   * session will reflect individual module failures automatically.
-   *
-   * <p>This does not imply the end of tests execution, so {@link #end(Long)} method has to be
-   * invoked at some point after this one.
-   *
-   * @param error Optional exception that caused the execution to fail
-   */
-  void setErrorInfo(Throwable error);
+    /**
+     * Marks the session as failed.
+     *
+     * <p>This method should be used to signal a failure that is not related to a specific module or a
+     * test suite, but rather to the tests execution as a whole (e.g. a failure in a setup/teardown
+     * logic that is executed once for the entire project). If an individual module in the project
+     * fails, there is no need to explicitly signal it to the session object: the status of the
+     * session will reflect individual module failures automatically.
+     *
+     * <p>This does not imply the end of tests execution, so {@link #end(Long)} method has to be
+     * invoked at some point after this one.
+     *
+     * @param error Optional exception that caused the execution to fail
+     */
+    void setErrorInfo(Throwable error);
 
-  /**
-   * Marks the entire execution as skipped.
-   *
-   * <p>This does not imply the end of tests execution, so {@link #end(Long)} method has to be
-   * invoked at some point after this one.
-   *
-   * @param skipReason Optional reason for skipping execution
-   */
-  void setSkipReason(String skipReason);
+    /**
+     * Marks the entire execution as skipped.
+     *
+     * <p>This does not imply the end of tests execution, so {@link #end(Long)} method has to be
+     * invoked at some point after this one.
+     *
+     * @param skipReason Optional reason for skipping execution
+     */
+    void setSkipReason(String skipReason);
 
-  /**
-   * Marks the end of tests execution.
-   *
-   * <p>Unless either {@link #setErrorInfo(Throwable)} or {@link #setSkipReason(String)} were
-   * invoked prior to calling this method, the status of the execution will be calculated based on
-   * the statuses of individual modules that were run in scope of the session.
-   *
-   * <p>The method must be called once for each session instance.
-   *
-   * <p>The call does not have to be made in the same thread where the session was started.
-   *
-   * @param endTime Optional finish time in microseconds. If {@code null} is supplied, current time
-   *     will be assumed
-   */
-  void end(@Nullable Long endTime);
+    /**
+     * Marks the end of tests execution.
+     *
+     * <p>Unless either {@link #setErrorInfo(Throwable)} or {@link #setSkipReason(String)} were
+     * invoked prior to calling this method, the status of the execution will be calculated based on
+     * the statuses of individual modules that were run in scope of the session.
+     *
+     * <p>The method must be called once for each session instance.
+     *
+     * <p>The call does not have to be made in the same thread where the session was started.
+     *
+     * @param endTime Optional finish time in microseconds. If {@code null} is supplied, current time
+     *     will be assumed
+     */
+    void end(@Nullable Long endTime);
 
-  /**
-   * Marks the start of a new module.
-   *
-   * @param moduleName The name of the module
-   * @param startTime Optional start time in microseconds. If {@code null} is supplied, current time
-   *     will be assumed
-   * @return Handle to the module instance
-   */
-  DDTestModule testModuleStart(String moduleName, @Nullable Long startTime);
+    /**
+     * Marks the start of a new module.
+     *
+     * @param moduleName The name of the module
+     * @param startTime Optional start time in microseconds. If {@code null} is supplied, current time
+     *     will be assumed
+     * @return Handle to the module instance
+     */
+    DDTestModule testModuleStart(String moduleName, @Nullable Long startTime);
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/DDTestSuite.java b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/DDTestSuite.java
index 274ede1bac3..00421e7d27f 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/DDTestSuite.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/DDTestSuite.java
@@ -9,64 +9,64 @@
  */
 public interface DDTestSuite {
 
-  /**
-   * Adds an arbitrary tag to the suite
-   *
-   * @param key The name of the tag
-   * @param value The value of the tag
-   */
-  void setTag(String key, Object value);
+    /**
+     * Adds an arbitrary tag to the suite
+     *
+     * @param key The name of the tag
+     * @param value The value of the tag
+     */
+    void setTag(String key, Object value);
 
-  /**
-   * Marks the suite as failed.
-   *
-   * <p>This method should be used to signal a failure that is not related to a specific test case,
-   * but rather to the suite as a whole (e.g. a failure in a setup/teardown method whose scope is
-   * entire suite). If an individual test case in the suite fails, there is no need to explicitly
-   * signal it to the suite object: the status of the suite will reflect individual test case
-   * failures automatically.
-   *
-   * <p>This does not imply the end of suite execution, so {@link #end(Long)} method has to be
-   * invoked at some point after this one.
-   *
-   * @param error Optional exception that caused the suite to fail
-   */
-  void setErrorInfo(Throwable error);
+    /**
+     * Marks the suite as failed.
+     *
+     * <p>This method should be used to signal a failure that is not related to a specific test case,
+     * but rather to the suite as a whole (e.g. a failure in a setup/teardown method whose scope is
+     * entire suite). If an individual test case in the suite fails, there is no need to explicitly
+     * signal it to the suite object: the status of the suite will reflect individual test case
+     * failures automatically.
+     *
+     * <p>This does not imply the end of suite execution, so {@link #end(Long)} method has to be
+     * invoked at some point after this one.
+     *
+     * @param error Optional exception that caused the suite to fail
+     */
+    void setErrorInfo(Throwable error);
 
-  /**
-   * Marks the suite as skipped.
-   *
-   * <p>This does not imply the end of suite execution, so {@link #end(Long)} method has to be
-   * invoked at some point after this one.
-   *
-   * @param skipReason Optional reason for skipping the suite
-   */
-  void setSkipReason(String skipReason);
+    /**
+     * Marks the suite as skipped.
+     *
+     * <p>This does not imply the end of suite execution, so {@link #end(Long)} method has to be
+     * invoked at some point after this one.
+     *
+     * @param skipReason Optional reason for skipping the suite
+     */
+    void setSkipReason(String skipReason);
 
-  /**
-   * Marks the end of suite execution.
-   *
-   * <p>Unless either {@link #setErrorInfo(Throwable)} or {@link #setSkipReason(String)} were
-   * invoked prior to calling this method, the status of the suite will be calculated based on the
-   * statuses of individual test cases that were executed in scope of the suite.
-   *
-   * <p>The method must be called once for each suite instance.
-   *
-   * <p>The call has to be made in the same thread where the suite was started.
-   *
-   * @param endTime Optional finish time in microseconds. If {@code null} is supplied, current time
-   *     will be assumed
-   */
-  void end(@Nullable Long endTime);
+    /**
+     * Marks the end of suite execution.
+     *
+     * <p>Unless either {@link #setErrorInfo(Throwable)} or {@link #setSkipReason(String)} were
+     * invoked prior to calling this method, the status of the suite will be calculated based on the
+     * statuses of individual test cases that were executed in scope of the suite.
+     *
+     * <p>The method must be called once for each suite instance.
+     *
+     * <p>The call has to be made in the same thread where the suite was started.
+     *
+     * @param endTime Optional finish time in microseconds. If {@code null} is supplied, current time
+     *     will be assumed
+     */
+    void end(@Nullable Long endTime);
 
-  /**
-   * Marks the start of a new test case in the suite.
-   *
-   * @param testName The name of the test case
-   * @param testMethod Optional method that corresponds to the test case
-   * @param startTime Optional start time in microseconds. If {@code null} is supplied, current time
-   *     will be assumed
-   * @return Handle to the test case instance
-   */
-  DDTest testStart(String testName, @Nullable Method testMethod, @Nullable Long startTime);
+    /**
+     * Marks the start of a new test case in the suite.
+     *
+     * @param testName The name of the test case
+     * @param testMethod Optional method that corresponds to the test case
+     * @param startTime Optional start time in microseconds. If {@code null} is supplied, current time
+     *     will be assumed
+     * @return Handle to the test case instance
+     */
+    DDTest testStart(String testName, @Nullable Method testMethod, @Nullable Long startTime);
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTest.java b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTest.java
index 00162a78860..8584ab00511 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTest.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTest.java
@@ -4,17 +4,17 @@
 import javax.annotation.Nullable;
 
 public class NoOpDDTest implements DDTest {
-  static final DDTest INSTANCE = new NoOpDDTest();
+    static final DDTest INSTANCE = new NoOpDDTest();
 
-  @Override
-  public void setTag(String key, Object value) {}
+    @Override
+    public void setTag(String key, Object value) {}
 
-  @Override
-  public void setErrorInfo(@Nullable Throwable error) {}
+    @Override
+    public void setErrorInfo(@Nullable Throwable error) {}
 
-  @Override
-  public void setSkipReason(@Nullable String skipReason) {}
+    @Override
+    public void setSkipReason(@Nullable String skipReason) {}
 
-  @Override
-  public void end(@Nullable Long endTime) {}
+    @Override
+    public void end(@Nullable Long endTime) {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestModule.java b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestModule.java
index eb67b09514b..707f39e0e93 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestModule.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestModule.java
@@ -5,26 +5,23 @@
 import javax.annotation.Nullable;
 
 public class NoOpDDTestModule implements DDTestModule {
-  static final DDTestModule INSTANCE = new NoOpDDTestModule();
+    static final DDTestModule INSTANCE = new NoOpDDTestModule();
 
-  @Override
-  public void setTag(String key, Object value) {}
+    @Override
+    public void setTag(String key, Object value) {}
 
-  @Override
-  public void setErrorInfo(Throwable error) {}
+    @Override
+    public void setErrorInfo(Throwable error) {}
 
-  @Override
-  public void setSkipReason(String skipReason) {}
+    @Override
+    public void setSkipReason(String skipReason) {}
 
-  @Override
-  public void end(@Nullable Long endTime) {}
+    @Override
+    public void end(@Nullable Long endTime) {}
 
-  @Override
-  public DDTestSuite testSuiteStart(
-      String testSuiteName,
-      @Nullable Class<?> testClass,
-      @Nullable Long startTime,
-      boolean parallelized) {
-    return NoOpDDTestSuite.INSTANCE;
-  }
+    @Override
+    public DDTestSuite testSuiteStart(
+            String testSuiteName, @Nullable Class<?> testClass, @Nullable Long startTime, boolean parallelized) {
+        return NoOpDDTestSuite.INSTANCE;
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestSession.java b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestSession.java
index 48f768cee93..f1e1f5e031b 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestSession.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestSession.java
@@ -5,22 +5,22 @@
 import javax.annotation.Nullable;
 
 public class NoOpDDTestSession implements DDTestSession {
-  public static final DDTestSession INSTANCE = new NoOpDDTestSession();
+    public static final DDTestSession INSTANCE = new NoOpDDTestSession();
 
-  @Override
-  public void setTag(String key, Object value) {}
+    @Override
+    public void setTag(String key, Object value) {}
 
-  @Override
-  public void setErrorInfo(Throwable error) {}
+    @Override
+    public void setErrorInfo(Throwable error) {}
 
-  @Override
-  public void setSkipReason(String skipReason) {}
+    @Override
+    public void setSkipReason(String skipReason) {}
 
-  @Override
-  public void end(@Nullable Long endTime) {}
+    @Override
+    public void end(@Nullable Long endTime) {}
 
-  @Override
-  public DDTestModule testModuleStart(String moduleName, @Nullable Long startTime) {
-    return NoOpDDTestModule.INSTANCE;
-  }
+    @Override
+    public DDTestModule testModuleStart(String moduleName, @Nullable Long startTime) {
+        return NoOpDDTestModule.INSTANCE;
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestSuite.java b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestSuite.java
index 4fb420de390..80ef0bf88d5 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestSuite.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/civisibility/noop/NoOpDDTestSuite.java
@@ -6,22 +6,22 @@
 import javax.annotation.Nullable;
 
 public class NoOpDDTestSuite implements DDTestSuite {
-  static final DDTestSuite INSTANCE = new NoOpDDTestSuite();
+    static final DDTestSuite INSTANCE = new NoOpDDTestSuite();
 
-  @Override
-  public void setTag(String key, Object value) {}
+    @Override
+    public void setTag(String key, Object value) {}
 
-  @Override
-  public void setErrorInfo(Throwable error) {}
+    @Override
+    public void setErrorInfo(Throwable error) {}
 
-  @Override
-  public void setSkipReason(String skipReason) {}
+    @Override
+    public void setSkipReason(String skipReason) {}
 
-  @Override
-  public void end(@Nullable Long endTime) {}
+    @Override
+    public void end(@Nullable Long endTime) {}
 
-  @Override
-  public DDTest testStart(String testName, @Nullable Method testMethod, @Nullable Long startTime) {
-    return NoOpDDTest.INSTANCE;
-  }
+    @Override
+    public DDTest testStart(String testName, @Nullable Method testMethod, @Nullable Long startTime) {
+        return NoOpDDTest.INSTANCE;
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/AIGuardConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/AIGuardConfig.java
index 57d5714a5f3..dcc7d46cfcf 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/AIGuardConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/AIGuardConfig.java
@@ -2,16 +2,16 @@
 
 public final class AIGuardConfig {
 
-  public static final String AI_GUARD_ENABLED = "ai_guard.enabled";
-  public static final String AI_GUARD_ENDPOINT = "ai_guard.endpoint";
-  public static final String AI_GUARD_TIMEOUT = "ai_guard.timeout";
-  public static final String AI_GUARD_MAX_CONTENT_SIZE = "ai_guard.max-content-size";
-  public static final String AI_GUARD_MAX_MESSAGES_LENGTH = "ai_guard.max-messages-length";
-  public static final String AI_GUARD_REDACTION_ENABLED = "ai_guard.redaction.enabled";
+    public static final String AI_GUARD_ENABLED = "ai_guard.enabled";
+    public static final String AI_GUARD_ENDPOINT = "ai_guard.endpoint";
+    public static final String AI_GUARD_TIMEOUT = "ai_guard.timeout";
+    public static final String AI_GUARD_MAX_CONTENT_SIZE = "ai_guard.max-content-size";
+    public static final String AI_GUARD_MAX_MESSAGES_LENGTH = "ai_guard.max-messages-length";
+    public static final String AI_GUARD_REDACTION_ENABLED = "ai_guard.redaction.enabled";
 
-  public static final boolean DEFAULT_AI_GUARD_ENABLED = false;
-  public static final boolean DEFAULT_AI_GUARD_REDACTION_ENABLED = true;
-  public static final int DEFAULT_AI_GUARD_TIMEOUT = 10_000;
-  public static final int DEFAULT_AI_GUARD_MAX_CONTENT_SIZE = 512 * 1024;
-  public static final int DEFAULT_AI_GUARD_MAX_MESSAGES_LENGTH = 16;
+    public static final boolean DEFAULT_AI_GUARD_ENABLED = false;
+    public static final boolean DEFAULT_AI_GUARD_REDACTION_ENABLED = true;
+    public static final int DEFAULT_AI_GUARD_TIMEOUT = 10_000;
+    public static final int DEFAULT_AI_GUARD_MAX_CONTENT_SIZE = 512 * 1024;
+    public static final int DEFAULT_AI_GUARD_MAX_MESSAGES_LENGTH = 16;
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java
index 67a2705e984..12d294642dd 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java
@@ -3,58 +3,49 @@
 /** Constant with names of configuration options for appsec. */
 public final class AppSecConfig {
 
-  public static final String APPSEC_ENABLED = "appsec.enabled";
-  public static final String APPSEC_AGENTIC_ONBOARDING = "appsec.agentic_onboarding";
-  public static final String APPSEC_RULES_FILE = "appsec.rules";
-  public static final String APPSEC_IP_ADDR_HEADER = "appsec.ipheader";
-  public static final String APPSEC_TRACE_RATE_LIMIT = "appsec.trace.rate.limit";
-  public static final String APPSEC_WAF_METRICS = "appsec.waf.metrics";
-  public static final String APPSEC_WAF_TIMEOUT = "appsec.waf.timeout";
-  public static final String APPSEC_OBFUSCATION_PARAMETER_KEY_REGEXP =
-      "appsec.obfuscation.parameter_key_regexp";
-  public static final String APPSEC_OBFUSCATION_PARAMETER_VALUE_REGEXP =
-      "appsec.obfuscation.parameter_value_regexp";
-  public static final String APPSEC_HTTP_BLOCKED_TEMPLATE_HTML =
-      "appsec.http.blocked.template.html";
-  public static final String APPSEC_HTTP_BLOCKED_TEMPLATE_JSON =
-      "appsec.http.blocked.template.json";
-  public static final String APPSEC_AUTOMATED_USER_EVENTS_TRACKING =
-      "appsec.automated-user-events-tracking";
-  public static final String APPSEC_AUTO_USER_INSTRUMENTATION_MODE =
-      "appsec.auto-user-instrumentation-mode";
-  public static final String APPSEC_BODY_PARSING_SIZE_LIMIT = "appsec.body-parsing-size-limit";
-  public static final String API_SECURITY_ENABLED = "api-security.enabled";
-  public static final String API_SECURITY_ENABLED_EXPERIMENTAL =
-      "experimental.api-security.enabled";
-  public static final String API_SECURITY_SAMPLE_DELAY = "api-security.sample.delay";
-  public static final String API_SECURITY_ENDPOINT_COLLECTION_ENABLED =
-      "api-security.endpoint.collection.enabled";
-  public static final String API_SECURITY_ENDPOINT_COLLECTION_MESSAGE_LIMIT =
-      "api-security.endpoint.collection.message.limit";
-  public static final String API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE =
-      "api-security.downstream.body.analysis.sample_rate";
-  public static final String API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE =
-      "api-security.downstream.request.analysis.sample_rate";
-  public static final String API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE =
-      "api-security.downstream.request.body.analysis.sample_rate";
-  public static final String API_SECURITY_MAX_DOWNSTREAM_REQUEST_BODY_ANALYSIS =
-      "api-security.max.downstream.request.body.analysis";
+    public static final String APPSEC_ENABLED = "appsec.enabled";
+    public static final String APPSEC_AGENTIC_ONBOARDING = "appsec.agentic_onboarding";
+    public static final String APPSEC_RULES_FILE = "appsec.rules";
+    public static final String APPSEC_IP_ADDR_HEADER = "appsec.ipheader";
+    public static final String APPSEC_TRACE_RATE_LIMIT = "appsec.trace.rate.limit";
+    public static final String APPSEC_WAF_METRICS = "appsec.waf.metrics";
+    public static final String APPSEC_WAF_TIMEOUT = "appsec.waf.timeout";
+    public static final String APPSEC_OBFUSCATION_PARAMETER_KEY_REGEXP = "appsec.obfuscation.parameter_key_regexp";
+    public static final String APPSEC_OBFUSCATION_PARAMETER_VALUE_REGEXP = "appsec.obfuscation.parameter_value_regexp";
+    public static final String APPSEC_HTTP_BLOCKED_TEMPLATE_HTML = "appsec.http.blocked.template.html";
+    public static final String APPSEC_HTTP_BLOCKED_TEMPLATE_JSON = "appsec.http.blocked.template.json";
+    public static final String APPSEC_AUTOMATED_USER_EVENTS_TRACKING = "appsec.automated-user-events-tracking";
+    public static final String APPSEC_AUTO_USER_INSTRUMENTATION_MODE = "appsec.auto-user-instrumentation-mode";
+    public static final String APPSEC_BODY_PARSING_SIZE_LIMIT = "appsec.body-parsing-size-limit";
+    public static final String API_SECURITY_ENABLED = "api-security.enabled";
+    public static final String API_SECURITY_ENABLED_EXPERIMENTAL = "experimental.api-security.enabled";
+    public static final String API_SECURITY_SAMPLE_DELAY = "api-security.sample.delay";
+    public static final String API_SECURITY_ENDPOINT_COLLECTION_ENABLED = "api-security.endpoint.collection.enabled";
+    public static final String API_SECURITY_ENDPOINT_COLLECTION_MESSAGE_LIMIT =
+            "api-security.endpoint.collection.message.limit";
+    public static final String API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE =
+            "api-security.downstream.body.analysis.sample_rate";
+    public static final String API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE =
+            "api-security.downstream.request.analysis.sample_rate";
+    public static final String API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE =
+            "api-security.downstream.request.body.analysis.sample_rate";
+    public static final String API_SECURITY_MAX_DOWNSTREAM_REQUEST_BODY_ANALYSIS =
+            "api-security.max.downstream.request.body.analysis";
 
-  public static final String APPSEC_SCA_ENABLED = "appsec.sca.enabled";
-  public static final String APPSEC_RASP_ENABLED = "appsec.rasp.enabled";
-  public static final String APPSEC_STACK_TRACE_ENABLED = "appsec.stack-trace.enabled";
-  public static final String APPSEC_STACKTRACE_ENABLED_DEPRECATED =
-      "appsec.stacktrace.enabled"; // old non-standard as a fallback alias
-  public static final String APPSEC_MAX_STACK_TRACES = "appsec.max.stack-traces";
-  public static final String APPSEC_MAX_STACKTRACES_DEPRECATED =
-      "appsec.max.stacktraces"; // old non-standard as a fallback alias
-  public static final String APPSEC_MAX_STACK_TRACE_DEPTH = "appsec.max.stack-trace.depth";
-  public static final String APPSEC_MAX_STACKTRACE_DEPTH_DEPRECATED =
-      "appsec.max.stacktrace.depth"; // old non-standard as a fallback alias
-  public static final String APPSEC_MAX_FILE_CONTENT_BYTES = "appsec.max.file-content.bytes";
-  public static final String APPSEC_MAX_FILE_CONTENT_COUNT = "appsec.max.file-content.count";
-  public static final String APPSEC_SCA_MAX_TRACKED_DEPENDENCIES =
-      "appsec.sca.max-tracked-dependencies";
+    public static final String APPSEC_SCA_ENABLED = "appsec.sca.enabled";
+    public static final String APPSEC_RASP_ENABLED = "appsec.rasp.enabled";
+    public static final String APPSEC_STACK_TRACE_ENABLED = "appsec.stack-trace.enabled";
+    public static final String APPSEC_STACKTRACE_ENABLED_DEPRECATED =
+            "appsec.stacktrace.enabled"; // old non-standard as a fallback alias
+    public static final String APPSEC_MAX_STACK_TRACES = "appsec.max.stack-traces";
+    public static final String APPSEC_MAX_STACKTRACES_DEPRECATED =
+            "appsec.max.stacktraces"; // old non-standard as a fallback alias
+    public static final String APPSEC_MAX_STACK_TRACE_DEPTH = "appsec.max.stack-trace.depth";
+    public static final String APPSEC_MAX_STACKTRACE_DEPTH_DEPRECATED =
+            "appsec.max.stacktrace.depth"; // old non-standard as a fallback alias
+    public static final String APPSEC_MAX_FILE_CONTENT_BYTES = "appsec.max.file-content.bytes";
+    public static final String APPSEC_MAX_FILE_CONTENT_COUNT = "appsec.max.file-content.count";
+    public static final String APPSEC_SCA_MAX_TRACKED_DEPENDENCIES = "appsec.sca.max-tracked-dependencies";
 
-  private AppSecConfig() {}
+    private AppSecConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java
index 86ebf18b5fb..3f7c1245fd3 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java
@@ -3,125 +3,102 @@
 /** Constant with names of configuration options for CI visibility. */
 public final class CiVisibilityConfig {
 
-  public static final String CIVISIBILITY_ENABLED = "civisibility.enabled";
-  public static final String CIVISIBILITY_TRACE_SANITATION_ENABLED =
-      "civisibility.trace.sanitation.enabled";
-  public static final String CIVISIBILITY_AGENTLESS_ENABLED = "civisibility.agentless.enabled";
-  public static final String CIVISIBILITY_AGENTLESS_URL = "civisibility.agentless.url";
-  public static final String CIVISIBILITY_INTAKE_AGENTLESS_URL =
-      "civisibility.intake.agentless.url";
-  public static final String CIVISIBILITY_SOURCE_DATA_ENABLED = "civisibility.source.data.enabled";
-  public static final String CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED =
-      "civisibility.build.instrumentation.enabled";
-  public static final String CIVISIBILITY_AGENT_JAR_URI = "civisibility.agent.jar.uri";
-  public static final String CIVISIBILITY_AUTO_CONFIGURATION_ENABLED =
-      "civisibility.auto.configuration.enabled";
-  public static final String CIVISIBILITY_ADDITIONAL_CHILD_PROCESS_JVM_ARGS =
-      "civisibility.additional.child.process.jvm.args";
-  public static final String CIVISIBILITY_COMPILER_PLUGIN_AUTO_CONFIGURATION_ENABLED =
-      "civisibility.compiler.plugin.auto.configuration.enabled";
-  public static final String CIVISIBILITY_COMPILER_PLUGIN_VERSION =
-      "civisibility.compiler.plugin.version";
-  public static final String CIVISIBILITY_DEBUG_PORT = "civisibility.debug.port";
-  public static final String CIVISIBILITY_GIT_CLIENT_ENABLED = "civisibility.git.client.enabled";
-  public static final String CIVISIBILITY_GIT_UPLOAD_ENABLED = "civisibility.git.upload.enabled";
-  public static final String CIVISIBILITY_GIT_UNSHALLOW_ENABLED =
-      "civisibility.git.unshallow.enabled";
-  public static final String CIVISIBILITY_GIT_UNSHALLOW_DEFER = "civisibility.git.unshallow.defer";
-  public static final String CIVISIBILITY_GIT_UPLOAD_TIMEOUT_MILLIS =
-      "civisibility.git.upload.timeout.millis";
-  public static final String CIVISIBILITY_GIT_COMMAND_TIMEOUT_MILLIS =
-      "civisibility.git.command.timeout.millis";
-  public static final String CIVISIBILITY_BACKEND_API_TIMEOUT_MILLIS =
-      "civisibility.backend.api.timeout.millis";
-  public static final String CIVISIBILITY_GIT_REMOTE_NAME = "civisibility.git.remote.name";
-  public static final String CIVISIBILITY_SIGNAL_SERVER_HOST = "civisibility.signal.server.host";
-  public static final String CIVISIBILITY_SIGNAL_SERVER_PORT = "civisibility.signal.server.port";
-  public static final String CIVISIBILITY_SIGNAL_CLIENT_TIMEOUT_MILLIS =
-      "civisibility.signal.client.timeout.millis";
-  public static final String CIVISIBILITY_ITR_ENABLED = "civisibility.itr.enabled";
-  public static final String CIVISIBILITY_TEST_SKIPPING_ENABLED =
-      "civisibility.test.skipping.enabled";
-  public static final String CIVISIBILITY_CIPROVIDER_INTEGRATION_ENABLED =
-      "civisibility.ciprovider.integration.enabled";
-  public static final String CIVISIBILITY_REPO_INDEX_DUPLICATE_KEY_CHECK_ENABLED =
-      "civisibility.repo.index.duplicate.key.check.enabled";
-  public static final String CIVISIBILITY_REPO_INDEX_FOLLOW_SYMLINKS =
-      "civisibility.repo.index.follow.symlinks";
-  public static final String CIVISIBILITY_EXECUTION_SETTINGS_CACHE_SIZE =
-      "civisibility.execution.settings.cache.size";
-  public static final String CIVISIBILITY_JVM_INFO_CACHE_SIZE = "civisibility.jvm.info.cache.size";
-  public static final String CIVISIBILITY_INJECTED_TRACER_VERSION =
-      "civisibility.injected.tracer.version";
-  public static final String CIVISIBILITY_RESOURCE_FOLDER_NAMES =
-      "civisibility.resource.folder.names";
-  public static final String CIVISIBILITY_FLAKY_RETRY_ENABLED = "civisibility.flaky.retry.enabled";
-  public static final String CIVISIBILITY_IMPACTED_TESTS_DETECTION_ENABLED =
-      "civisibility.impacted.tests.detection.enabled";
-  public static final String CIVISIBILITY_KNOWN_TESTS_REQUEST_ENABLED =
-      "civisibility.known.tests.request.enabled";
-  public static final String CIVISIBILITY_FLAKY_RETRY_ONLY_KNOWN_FLAKES =
-      "civisibility.flaky.retry.only.known.flakes";
-  public static final String CIVISIBILITY_EARLY_FLAKE_DETECTION_ENABLED =
-      "civisibility.early.flake.detection.enabled";
-  public static final String CIVISIBILITY_EARLY_FLAKE_DETECTION_LOWER_LIMIT =
-      "civisibility.early.flake.detection.lower.limit";
-  public static final String CIVISIBILITY_FLAKY_RETRY_COUNT = "civisibility.flaky.retry.count";
-  public static final String CIVISIBILITY_TOTAL_FLAKY_RETRY_COUNT =
-      "civisibility.total.flaky.retry.count";
-  public static final String CIVISIBILITY_DYNAMIC_ATR_ENABLED = "civisibility.dynamic.atr.enabled";
-  public static final String CIVISIBILITY_DYNAMIC_ATR_BUCKETS = "civisibility.dynamic.atr.buckets";
-  public static final String CIVISIBILITY_MODULE_NAME = "civisibility.module.name";
-  public static final String CIVISIBILITY_TEST_COMMAND = "civisibility.test.command";
-  public static final String CIVISIBILITY_TELEMETRY_ENABLED = "civisibility.telemetry.enabled";
-  public static final String CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS =
-      "civisibility.rum.flush.wait.millis";
-  public static final String CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER =
-      "civisibility.auto.instrumentation.provider";
-  public static final String CIVISIBILITY_TEST_ORDER = "civisibility.test.order";
-  public static final String CIVISIBILITY_SCALATEST_FORK_MONITOR_ENABLED =
-      "civisibility.scalatest.fork.monitor.enabled";
-  public static final String TEST_MANAGEMENT_ENABLED = "test.management.enabled";
-  public static final String TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES =
-      "test.management.attempt.to.fix.retries";
-  public static final String TEST_FAILED_TEST_REPLAY_ENABLED = "test.failed.test.replay.enabled";
-  public static final String CIVISIBILITY_GRADLE_DEPENDENCY_VERIFICATION_ENABLED =
-      "civisibility.gradle.dependency.verification.enabled";
+    public static final String CIVISIBILITY_ENABLED = "civisibility.enabled";
+    public static final String CIVISIBILITY_TRACE_SANITATION_ENABLED = "civisibility.trace.sanitation.enabled";
+    public static final String CIVISIBILITY_AGENTLESS_ENABLED = "civisibility.agentless.enabled";
+    public static final String CIVISIBILITY_AGENTLESS_URL = "civisibility.agentless.url";
+    public static final String CIVISIBILITY_INTAKE_AGENTLESS_URL = "civisibility.intake.agentless.url";
+    public static final String CIVISIBILITY_SOURCE_DATA_ENABLED = "civisibility.source.data.enabled";
+    public static final String CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED =
+            "civisibility.build.instrumentation.enabled";
+    public static final String CIVISIBILITY_AGENT_JAR_URI = "civisibility.agent.jar.uri";
+    public static final String CIVISIBILITY_AUTO_CONFIGURATION_ENABLED = "civisibility.auto.configuration.enabled";
+    public static final String CIVISIBILITY_ADDITIONAL_CHILD_PROCESS_JVM_ARGS =
+            "civisibility.additional.child.process.jvm.args";
+    public static final String CIVISIBILITY_COMPILER_PLUGIN_AUTO_CONFIGURATION_ENABLED =
+            "civisibility.compiler.plugin.auto.configuration.enabled";
+    public static final String CIVISIBILITY_COMPILER_PLUGIN_VERSION = "civisibility.compiler.plugin.version";
+    public static final String CIVISIBILITY_DEBUG_PORT = "civisibility.debug.port";
+    public static final String CIVISIBILITY_GIT_CLIENT_ENABLED = "civisibility.git.client.enabled";
+    public static final String CIVISIBILITY_GIT_UPLOAD_ENABLED = "civisibility.git.upload.enabled";
+    public static final String CIVISIBILITY_GIT_UNSHALLOW_ENABLED = "civisibility.git.unshallow.enabled";
+    public static final String CIVISIBILITY_GIT_UNSHALLOW_DEFER = "civisibility.git.unshallow.defer";
+    public static final String CIVISIBILITY_GIT_UPLOAD_TIMEOUT_MILLIS = "civisibility.git.upload.timeout.millis";
+    public static final String CIVISIBILITY_GIT_COMMAND_TIMEOUT_MILLIS = "civisibility.git.command.timeout.millis";
+    public static final String CIVISIBILITY_BACKEND_API_TIMEOUT_MILLIS = "civisibility.backend.api.timeout.millis";
+    public static final String CIVISIBILITY_GIT_REMOTE_NAME = "civisibility.git.remote.name";
+    public static final String CIVISIBILITY_SIGNAL_SERVER_HOST = "civisibility.signal.server.host";
+    public static final String CIVISIBILITY_SIGNAL_SERVER_PORT = "civisibility.signal.server.port";
+    public static final String CIVISIBILITY_SIGNAL_CLIENT_TIMEOUT_MILLIS = "civisibility.signal.client.timeout.millis";
+    public static final String CIVISIBILITY_ITR_ENABLED = "civisibility.itr.enabled";
+    public static final String CIVISIBILITY_TEST_SKIPPING_ENABLED = "civisibility.test.skipping.enabled";
+    public static final String CIVISIBILITY_CIPROVIDER_INTEGRATION_ENABLED =
+            "civisibility.ciprovider.integration.enabled";
+    public static final String CIVISIBILITY_REPO_INDEX_DUPLICATE_KEY_CHECK_ENABLED =
+            "civisibility.repo.index.duplicate.key.check.enabled";
+    public static final String CIVISIBILITY_REPO_INDEX_FOLLOW_SYMLINKS = "civisibility.repo.index.follow.symlinks";
+    public static final String CIVISIBILITY_EXECUTION_SETTINGS_CACHE_SIZE =
+            "civisibility.execution.settings.cache.size";
+    public static final String CIVISIBILITY_JVM_INFO_CACHE_SIZE = "civisibility.jvm.info.cache.size";
+    public static final String CIVISIBILITY_INJECTED_TRACER_VERSION = "civisibility.injected.tracer.version";
+    public static final String CIVISIBILITY_RESOURCE_FOLDER_NAMES = "civisibility.resource.folder.names";
+    public static final String CIVISIBILITY_FLAKY_RETRY_ENABLED = "civisibility.flaky.retry.enabled";
+    public static final String CIVISIBILITY_IMPACTED_TESTS_DETECTION_ENABLED =
+            "civisibility.impacted.tests.detection.enabled";
+    public static final String CIVISIBILITY_KNOWN_TESTS_REQUEST_ENABLED = "civisibility.known.tests.request.enabled";
+    public static final String CIVISIBILITY_FLAKY_RETRY_ONLY_KNOWN_FLAKES =
+            "civisibility.flaky.retry.only.known.flakes";
+    public static final String CIVISIBILITY_EARLY_FLAKE_DETECTION_ENABLED =
+            "civisibility.early.flake.detection.enabled";
+    public static final String CIVISIBILITY_EARLY_FLAKE_DETECTION_LOWER_LIMIT =
+            "civisibility.early.flake.detection.lower.limit";
+    public static final String CIVISIBILITY_FLAKY_RETRY_COUNT = "civisibility.flaky.retry.count";
+    public static final String CIVISIBILITY_TOTAL_FLAKY_RETRY_COUNT = "civisibility.total.flaky.retry.count";
+    public static final String CIVISIBILITY_DYNAMIC_ATR_ENABLED = "civisibility.dynamic.atr.enabled";
+    public static final String CIVISIBILITY_DYNAMIC_ATR_BUCKETS = "civisibility.dynamic.atr.buckets";
+    public static final String CIVISIBILITY_MODULE_NAME = "civisibility.module.name";
+    public static final String CIVISIBILITY_TEST_COMMAND = "civisibility.test.command";
+    public static final String CIVISIBILITY_TELEMETRY_ENABLED = "civisibility.telemetry.enabled";
+    public static final String CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS = "civisibility.rum.flush.wait.millis";
+    public static final String CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER =
+            "civisibility.auto.instrumentation.provider";
+    public static final String CIVISIBILITY_TEST_ORDER = "civisibility.test.order";
+    public static final String CIVISIBILITY_SCALATEST_FORK_MONITOR_ENABLED =
+            "civisibility.scalatest.fork.monitor.enabled";
+    public static final String TEST_MANAGEMENT_ENABLED = "test.management.enabled";
+    public static final String TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES = "test.management.attempt.to.fix.retries";
+    public static final String TEST_FAILED_TEST_REPLAY_ENABLED = "test.failed.test.replay.enabled";
+    public static final String CIVISIBILITY_GRADLE_DEPENDENCY_VERIFICATION_ENABLED =
+            "civisibility.gradle.dependency.verification.enabled";
 
-  /* Git PR info */
-  public static final String GIT_PULL_REQUEST_BASE_BRANCH = "git.pull.request.base.branch";
-  public static final String GIT_PULL_REQUEST_BASE_BRANCH_SHA = "git.pull.request.base.branch.sha";
-  public static final String GIT_COMMIT_HEAD_SHA = "git.commit.head.sha";
+    /* Git PR info */
+    public static final String GIT_PULL_REQUEST_BASE_BRANCH = "git.pull.request.base.branch";
+    public static final String GIT_PULL_REQUEST_BASE_BRANCH_SHA = "git.pull.request.base.branch.sha";
+    public static final String GIT_COMMIT_HEAD_SHA = "git.commit.head.sha";
 
-  /* COVERAGE SETTINGS */
-  public static final String CODE_COVERAGE_FLAGS = "code.coverage.flags";
-  public static final String CIVISIBILITY_CODE_COVERAGE_ENABLED =
-      "civisibility.code.coverage.enabled";
-  public static final String CIVISIBILITY_CODE_COVERAGE_LINES_ENABLED =
-      "civisibility.code.coverage.lines.enabled";
-  public static final String CIVISIBILITY_CODE_COVERAGE_INCLUDES =
-      "civisibility.code.coverage.includes";
-  public static final String CIVISIBILITY_CODE_COVERAGE_EXCLUDES =
-      "civisibility.code.coverage.excludes";
-  public static final String CIVISIBILITY_CODE_COVERAGE_ROOT_PACKAGES_LIMIT =
-      "civisibility.code.coverage.root.packages.limit";
-  public static final String CIVISIBILITY_CODE_COVERAGE_REPORT_DUMP_DIR =
-      "civisibility.code.coverage.report.dump.dir";
-  public static final String CIVISIBILITY_JACOCO_PLUGIN_VERSION =
-      "civisibility.jacoco.plugin.version";
-  public static final String CIVISIBILITY_GRADLE_SOURCE_SETS = "civisibility.gradle.sourcesets";
-  public static final String CIVISIBILITY_CODE_COVERAGE_REPORT_UPLOAD_ENABLED =
-      "civisibility.code.coverage.report.upload.enabled";
+    /* COVERAGE SETTINGS */
+    public static final String CODE_COVERAGE_FLAGS = "code.coverage.flags";
+    public static final String CIVISIBILITY_CODE_COVERAGE_ENABLED = "civisibility.code.coverage.enabled";
+    public static final String CIVISIBILITY_CODE_COVERAGE_LINES_ENABLED = "civisibility.code.coverage.lines.enabled";
+    public static final String CIVISIBILITY_CODE_COVERAGE_INCLUDES = "civisibility.code.coverage.includes";
+    public static final String CIVISIBILITY_CODE_COVERAGE_EXCLUDES = "civisibility.code.coverage.excludes";
+    public static final String CIVISIBILITY_CODE_COVERAGE_ROOT_PACKAGES_LIMIT =
+            "civisibility.code.coverage.root.packages.limit";
+    public static final String CIVISIBILITY_CODE_COVERAGE_REPORT_DUMP_DIR =
+            "civisibility.code.coverage.report.dump.dir";
+    public static final String CIVISIBILITY_JACOCO_PLUGIN_VERSION = "civisibility.jacoco.plugin.version";
+    public static final String CIVISIBILITY_GRADLE_SOURCE_SETS = "civisibility.gradle.sourcesets";
+    public static final String CIVISIBILITY_CODE_COVERAGE_REPORT_UPLOAD_ENABLED =
+            "civisibility.code.coverage.report.upload.enabled";
 
-  public static final String TEST_SESSION_NAME = "test.session.name";
+    public static final String TEST_SESSION_NAME = "test.session.name";
 
-  /* Bazel support */
-  /** Path to the manifest file that enables reading configuration from local JSON files. */
-  public static final String TEST_OPTIMIZATION_MANIFEST_FILE = "test.optimization.manifest.file";
+    /* Bazel support */
+    /** Path to the manifest file that enables reading configuration from local JSON files. */
+    public static final String TEST_OPTIMIZATION_MANIFEST_FILE = "test.optimization.manifest.file";
 
-  /** When true, spans are serialized to JSON files on disk instead of sent over the network. */
-  public static final String TEST_OPTIMIZATION_PAYLOADS_IN_FILES =
-      "test.optimization.payloads.in.files";
+    /** When true, spans are serialized to JSON files on disk instead of sent over the network. */
+    public static final String TEST_OPTIMIZATION_PAYLOADS_IN_FILES = "test.optimization.payloads.in.files";
 
-  private CiVisibilityConfig() {}
+    private CiVisibilityConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/CrashTrackingConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/CrashTrackingConfig.java
index 2a43eaa0be3..bcddfa518d1 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/CrashTrackingConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/CrashTrackingConfig.java
@@ -7,37 +7,34 @@
  * documentation for details.
  */
 public final class CrashTrackingConfig {
-  public static final String CRASH_TRACKING_ENABLED = "crashtracking.enabled";
-  public static final boolean CRASH_TRACKING_ENABLED_DEFAULT = true;
+    public static final String CRASH_TRACKING_ENABLED = "crashtracking.enabled";
+    public static final boolean CRASH_TRACKING_ENABLED_DEFAULT = true;
 
-  public static final String CRASH_TRACKING_TAGS = "crashtracking.tags";
+    public static final String CRASH_TRACKING_TAGS = "crashtracking.tags";
 
-  public static final String CRASH_TRACKING_UPLOAD_TIMEOUT = "crashtracking.upload.timeout";
-  public static final int CRASH_TRACKING_UPLOAD_TIMEOUT_DEFAULT = 2;
+    public static final String CRASH_TRACKING_UPLOAD_TIMEOUT = "crashtracking.upload.timeout";
+    public static final int CRASH_TRACKING_UPLOAD_TIMEOUT_DEFAULT = 2;
 
-  public static final String CRASH_TRACKING_PROXY_HOST = "crashtracking.proxy.host";
-  public static final String CRASH_TRACKING_PROXY_PORT = "crashtracking.proxy.port";
-  public static final String CRASH_TRACKING_PROXY_USERNAME = "crashtracking.proxy.username";
-  public static final String CRASH_TRACKING_PROXY_PASSWORD = "crashtracking.proxy.password";
+    public static final String CRASH_TRACKING_PROXY_HOST = "crashtracking.proxy.host";
+    public static final String CRASH_TRACKING_PROXY_PORT = "crashtracking.proxy.port";
+    public static final String CRASH_TRACKING_PROXY_USERNAME = "crashtracking.proxy.username";
+    public static final String CRASH_TRACKING_PROXY_PASSWORD = "crashtracking.proxy.password";
 
-  // Not intended for production use
-  public static final String CRASH_TRACKING_AGENTLESS = "crashtracking.agentless";
-  public static final boolean CRASH_TRACKING_AGENTLESS_DEFAULT = false;
+    // Not intended for production use
+    public static final String CRASH_TRACKING_AGENTLESS = "crashtracking.agentless";
+    public static final boolean CRASH_TRACKING_AGENTLESS_DEFAULT = false;
 
-  public static final String CRASH_TRACKING_ERRORS_INTAKE_ENABLED =
-      "crashtracking.errors-intake.enabled";
-  public static final boolean CRASH_TRACKING_ERRORS_INTAKE_ENABLED_DEFAULT = true;
+    public static final String CRASH_TRACKING_ERRORS_INTAKE_ENABLED = "crashtracking.errors-intake.enabled";
+    public static final boolean CRASH_TRACKING_ERRORS_INTAKE_ENABLED_DEFAULT = true;
 
-  public static final String CRASH_TRACKING_EXTENDED_INFO_ENABLED =
-      "crashtracking.extended-info.enabled";
-  public static final boolean CRASH_TRACKING_EXTENDED_INFO_ENABLED_DEFAULT = false;
+    public static final String CRASH_TRACKING_EXTENDED_INFO_ENABLED = "crashtracking.extended-info.enabled";
+    public static final boolean CRASH_TRACKING_EXTENDED_INFO_ENABLED_DEFAULT = false;
 
-  public static final String CRASH_TRACKING_START_EARLY = "crashtracking.debug.start-force-first";
-  public static final boolean CRASH_TRACKING_START_EARLY_DEFAULT = false;
+    public static final String CRASH_TRACKING_START_EARLY = "crashtracking.debug.start-force-first";
+    public static final boolean CRASH_TRACKING_START_EARLY_DEFAULT = false;
 
-  public static final String CRASH_TRACKING_ENABLE_AUTOCONFIG =
-      "crashtracking.debug.autoconfig.enable";
-  public static final boolean CRASH_TRACKING_ENABLE_AUTOCONFIG_DEFAULT = false;
+    public static final String CRASH_TRACKING_ENABLE_AUTOCONFIG = "crashtracking.debug.autoconfig.enable";
+    public static final boolean CRASH_TRACKING_ENABLE_AUTOCONFIG_DEFAULT = false;
 
-  private CrashTrackingConfig() {}
+    private CrashTrackingConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/CwsConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/CwsConfig.java
index d65db692521..ffd16724854 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/CwsConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/CwsConfig.java
@@ -2,9 +2,9 @@
 
 public final class CwsConfig {
 
-  public static final String CWS_ENABLED = "cws.enabled";
+    public static final String CWS_ENABLED = "cws.enabled";
 
-  public static final String CWS_TLS_REFRESH = "cws.tls.refresh";
+    public static final String CWS_TLS_REFRESH = "cws.tls.refresh";
 
-  private CwsConfig() {}
+    private CwsConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java
index 4c0a3dd8802..11a81093005 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java
@@ -1,81 +1,65 @@
 package datadog.trace.api.config;
 
 public final class DebuggerConfig {
-  public static final String DYNAMIC_INSTRUMENTATION_ENABLED = "dynamic.instrumentation.enabled";
-  public static final String DYNAMIC_INSTRUMENTATION_SNAPSHOT_URL =
-      "dynamic.instrumentation.snapshot.url";
-  public static final String DYNAMIC_INSTRUMENTATION_PROBE_FILE =
-      "dynamic.instrumentation.probe.file";
-  public static final String DYNAMIC_INSTRUMENTATION_UPLOAD_TIMEOUT =
-      "dynamic.instrumentation.upload.timeout";
-  public static final String DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL =
-      "dynamic.instrumentation.upload.flush.interval";
-  public static final String DYNAMIC_INSTRUMENTATION_UPLOAD_INTERVAL_SECONDS =
-      "dynamic.instrumentation.upload.interval.seconds";
-  public static final String DYNAMIC_INSTRUMENTATION_UPLOAD_BATCH_SIZE =
-      "dynamic.instrumentation.upload.batch.size";
-  public static final String DYNAMIC_INSTRUMENTATION_MAX_PAYLOAD_SIZE =
-      "dynamic.instrumentation.max.payload.size";
-  public static final String DYNAMIC_INSTRUMENTATION_METRICS_ENABLED =
-      "dynamic.instrumentation.metrics.enabled";
-  public static final String DYNAMIC_INSTRUMENTATION_CLASSFILE_DUMP_ENABLED =
-      "dynamic.instrumentation.classfile.dump.enabled";
-  public static final String DYNAMIC_INSTRUMENTATION_POLL_INTERVAL =
-      "dynamic.instrumentation.poll.interval";
-  public static final String DYNAMIC_INSTRUMENTATION_DIAGNOSTICS_INTERVAL =
-      "dynamic.instrumentation.diagnostics.interval";
-  public static final String DYNAMIC_INSTRUMENTATION_VERIFY_BYTECODE =
-      "dynamic.instrumentation.verify.bytecode";
-  public static final String DYNAMIC_INSTRUMENTATION_INSTRUMENT_THE_WORLD =
-      "dynamic.instrumentation.instrument.the.world";
-  public static final String DYNAMIC_INSTRUMENTATION_EXCLUDE_FILES =
-      "dynamic.instrumentation.exclude.files";
-  public static final String DYNAMIC_INSTRUMENTATION_INCLUDE_FILES =
-      "dynamic.instrumentation.include.files";
-  public static final String DYNAMIC_INSTRUMENTATION_TIMEOUT_CHECKER_MODE =
-      "internal.dynamic.instrumentation.timeout.checker.mode";
-  public static final String DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT =
-      "dynamic.instrumentation.capture.timeout";
-  public static final String DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT_MS =
-      "dynamic.instrumentation.capture.timeout.ms";
-  public static final String DYNAMIC_INSTRUMENTATION_EVAL_TIMEOUT_MS =
-      "dynamic.instrumentation.evaluation.timeout.ms";
-  public static final String DYNAMIC_INSTRUMENTATION_REDACTED_IDENTIFIERS =
-      "dynamic.instrumentation.redacted.identifiers";
-  public static final String DYNAMIC_INSTRUMENTATION_REDACTION_EXCLUDED_IDENTIFIERS =
-      "dynamic.instrumentation.redaction.excluded.identifiers";
-  public static final String DYNAMIC_INSTRUMENTATION_REDACTED_TYPES =
-      "dynamic.instrumentation.redacted.types";
-  public static final String DYNAMIC_INSTRUMENTATION_LOCALVAR_HOISTING_LEVEL =
-      "dynamic.instrumentation.localvar.hoisting.level";
-  public static final String SYMBOL_DATABASE_ENABLED = "symbol.database.upload.enabled";
-  public static final String SYMBOL_DATABASE_FORCE_UPLOAD = "internal.force.symbol.database.upload";
-  public static final String SYMBOL_DATABASE_FLUSH_THRESHOLD = "symbol.database.flush.threshold";
-  public static final String SYMBOL_DATABASE_COMPRESSED = "symbol.database.compressed";
-  public static final String DEBUGGER_EXCEPTION_ENABLED = "exception.debugging.enabled";
-  public static final String EXCEPTION_REPLAY_ENABLED = "exception.replay.enabled";
-  public static final String DEBUGGER_MAX_EXCEPTION_PER_SECOND =
-      "exception.replay.max.exception.analysis.limit";
-  public static final String DEBUGGER_EXCEPTION_ONLY_LOCAL_ROOT =
-      "internal.exception.replay.only.local.root";
-  public static final String DEBUGGER_EXCEPTION_MAX_CAPTURED_FRAMES =
-      "exception.replay.max.frames.to.capture";
-  public static final String DEBUGGER_EXCEPTION_CAPTURE_MAX_FRAMES =
-      "exception.replay.capture.max.frames";
-  public static final String DEBUGGER_EXCEPTION_CAPTURE_INTERVAL_SECONDS =
-      "exception.replay.capture.interval.seconds";
-  public static final String DEBUGGER_EXCEPTION_CAPTURE_INTERMEDIATE_SPANS_ENABLED =
-      "exception.replay.capture.intermediate.spans.enabled";
-  public static final String DISTRIBUTED_DEBUGGER_ENABLED = "distributed.debugger.enabled";
-  public static final String DEBUGGER_SOURCE_FILE_TRACKING_ENABLED =
-      "dynamic.instrumentation.source.file.tracking.enabled";
-  public static final String DEBUGGER_SYNCHRONOUS_SOURCE_FILE_TRACKING_ENABLED =
-      "internal.dynamic.instrumentation.synchronous.source.file.tracking.enabled";
-  public static final String THIRD_PARTY_INCLUDES = "third.party.includes";
-  public static final String THIRD_PARTY_EXCLUDES = "third.party.excludes";
-  public static final String THIRD_PARTY_DETECTION_INCLUDES = "third.party.detection.includes";
-  public static final String THIRD_PARTY_DETECTION_EXCLUDES = "third.party.detection.excludes";
-  public static final String THIRD_PARTY_SHADING_IDENTIFIERS = "third.party.shading.identifiers";
+    public static final String DYNAMIC_INSTRUMENTATION_ENABLED = "dynamic.instrumentation.enabled";
+    public static final String DYNAMIC_INSTRUMENTATION_SNAPSHOT_URL = "dynamic.instrumentation.snapshot.url";
+    public static final String DYNAMIC_INSTRUMENTATION_PROBE_FILE = "dynamic.instrumentation.probe.file";
+    public static final String DYNAMIC_INSTRUMENTATION_UPLOAD_TIMEOUT = "dynamic.instrumentation.upload.timeout";
+    public static final String DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL =
+            "dynamic.instrumentation.upload.flush.interval";
+    public static final String DYNAMIC_INSTRUMENTATION_UPLOAD_INTERVAL_SECONDS =
+            "dynamic.instrumentation.upload.interval.seconds";
+    public static final String DYNAMIC_INSTRUMENTATION_UPLOAD_BATCH_SIZE = "dynamic.instrumentation.upload.batch.size";
+    public static final String DYNAMIC_INSTRUMENTATION_MAX_PAYLOAD_SIZE = "dynamic.instrumentation.max.payload.size";
+    public static final String DYNAMIC_INSTRUMENTATION_METRICS_ENABLED = "dynamic.instrumentation.metrics.enabled";
+    public static final String DYNAMIC_INSTRUMENTATION_CLASSFILE_DUMP_ENABLED =
+            "dynamic.instrumentation.classfile.dump.enabled";
+    public static final String DYNAMIC_INSTRUMENTATION_POLL_INTERVAL = "dynamic.instrumentation.poll.interval";
+    public static final String DYNAMIC_INSTRUMENTATION_DIAGNOSTICS_INTERVAL =
+            "dynamic.instrumentation.diagnostics.interval";
+    public static final String DYNAMIC_INSTRUMENTATION_VERIFY_BYTECODE = "dynamic.instrumentation.verify.bytecode";
+    public static final String DYNAMIC_INSTRUMENTATION_INSTRUMENT_THE_WORLD =
+            "dynamic.instrumentation.instrument.the.world";
+    public static final String DYNAMIC_INSTRUMENTATION_EXCLUDE_FILES = "dynamic.instrumentation.exclude.files";
+    public static final String DYNAMIC_INSTRUMENTATION_INCLUDE_FILES = "dynamic.instrumentation.include.files";
+    public static final String DYNAMIC_INSTRUMENTATION_TIMEOUT_CHECKER_MODE =
+            "internal.dynamic.instrumentation.timeout.checker.mode";
+    public static final String DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT = "dynamic.instrumentation.capture.timeout";
+    public static final String DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT_MS =
+            "dynamic.instrumentation.capture.timeout.ms";
+    public static final String DYNAMIC_INSTRUMENTATION_EVAL_TIMEOUT_MS =
+            "dynamic.instrumentation.evaluation.timeout.ms";
+    public static final String DYNAMIC_INSTRUMENTATION_REDACTED_IDENTIFIERS =
+            "dynamic.instrumentation.redacted.identifiers";
+    public static final String DYNAMIC_INSTRUMENTATION_REDACTION_EXCLUDED_IDENTIFIERS =
+            "dynamic.instrumentation.redaction.excluded.identifiers";
+    public static final String DYNAMIC_INSTRUMENTATION_REDACTED_TYPES = "dynamic.instrumentation.redacted.types";
+    public static final String DYNAMIC_INSTRUMENTATION_LOCALVAR_HOISTING_LEVEL =
+            "dynamic.instrumentation.localvar.hoisting.level";
+    public static final String SYMBOL_DATABASE_ENABLED = "symbol.database.upload.enabled";
+    public static final String SYMBOL_DATABASE_FORCE_UPLOAD = "internal.force.symbol.database.upload";
+    public static final String SYMBOL_DATABASE_FLUSH_THRESHOLD = "symbol.database.flush.threshold";
+    public static final String SYMBOL_DATABASE_COMPRESSED = "symbol.database.compressed";
+    public static final String DEBUGGER_EXCEPTION_ENABLED = "exception.debugging.enabled";
+    public static final String EXCEPTION_REPLAY_ENABLED = "exception.replay.enabled";
+    public static final String DEBUGGER_MAX_EXCEPTION_PER_SECOND = "exception.replay.max.exception.analysis.limit";
+    public static final String DEBUGGER_EXCEPTION_ONLY_LOCAL_ROOT = "internal.exception.replay.only.local.root";
+    public static final String DEBUGGER_EXCEPTION_MAX_CAPTURED_FRAMES = "exception.replay.max.frames.to.capture";
+    public static final String DEBUGGER_EXCEPTION_CAPTURE_MAX_FRAMES = "exception.replay.capture.max.frames";
+    public static final String DEBUGGER_EXCEPTION_CAPTURE_INTERVAL_SECONDS =
+            "exception.replay.capture.interval.seconds";
+    public static final String DEBUGGER_EXCEPTION_CAPTURE_INTERMEDIATE_SPANS_ENABLED =
+            "exception.replay.capture.intermediate.spans.enabled";
+    public static final String DISTRIBUTED_DEBUGGER_ENABLED = "distributed.debugger.enabled";
+    public static final String DEBUGGER_SOURCE_FILE_TRACKING_ENABLED =
+            "dynamic.instrumentation.source.file.tracking.enabled";
+    public static final String DEBUGGER_SYNCHRONOUS_SOURCE_FILE_TRACKING_ENABLED =
+            "internal.dynamic.instrumentation.synchronous.source.file.tracking.enabled";
+    public static final String THIRD_PARTY_INCLUDES = "third.party.includes";
+    public static final String THIRD_PARTY_EXCLUDES = "third.party.excludes";
+    public static final String THIRD_PARTY_DETECTION_INCLUDES = "third.party.detection.includes";
+    public static final String THIRD_PARTY_DETECTION_EXCLUDES = "third.party.detection.excludes";
+    public static final String THIRD_PARTY_SHADING_IDENTIFIERS = "third.party.shading.identifiers";
 
-  private DebuggerConfig() {}
+    private DebuggerConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java
index a32f997cebe..af2edfa0867 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java
@@ -13,132 +13,120 @@
  */
 public final class GeneralConfig {
 
-  public static final String CONFIGURATION_FILE = "trace.config";
-  public static final String API_KEY = "api-key";
-  public static final String APPLICATION_KEY = "application-key";
-  public static final String APP_KEY = "app-key"; // alias for application key
-  public static final String API_KEY_FILE = "api-key-file";
-  public static final String APPLICATION_KEY_FILE = "application-key-file";
-  public static final String SITE = "site";
-
-  public static final String SERVICE_NAME = "service.name";
-  public static final String SERVICE_NAME_SET_BY_USER = "service.name.set.by.user";
-  public static final String ENV = "env";
-  public static final String VERSION = "version";
-  public static final String PRIMARY_TAG = "primary.tag";
-  public static final String TRACE_TAGS = "trace.tags";
-  public static final String TAGS = "tags";
-  @Deprecated // Use dd.tags instead
-  public static final String GLOBAL_TAGS = "trace.global.tags";
-
-  public static final String EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED =
-      "experimental.propagate.process.tags.enabled";
-
-  public static final String PROCESS_TAGS_MAPPING = "process.tags.mapping";
-
-  public static final String LOG_LEVEL = "log.level";
-  public static final String TRACE_LOG_LEVEL = "trace.log.level";
-  public static final String TRACE_DEBUG = "trace.debug";
-  public static final String TRACE_TRIAGE = "trace.triage";
-  public static final String TRIAGE_REPORT_TRIGGER = "triage.report.trigger";
-  public static final String TRIAGE_REPORT_DIR = "triage.report.dir";
-
-  public static final String STARTUP_LOGS_ENABLED = "trace.startup.logs";
-
-  public static final String DOGSTATSD_START_DELAY = "dogstatsd.start-delay";
-  public static final String DOGSTATSD_HOST = "dogstatsd.host";
-  public static final String DOGSTATSD_PORT = "dogstatsd.port";
-  public static final String DOGSTATSD_PATH = "dogstatsd.path";
-  public static final String DOGSTATSD_ARGS = "dogstatsd.args";
-  public static final String DOGSTATSD_NAMED_PIPE = "dogstatsd.pipe.name";
-
-  public static final String STATSD_CLIENT_QUEUE_SIZE = "statsd.client.queue.size";
-  public static final String STATSD_CLIENT_SOCKET_BUFFER = "statsd.client.socket.buffer";
-  public static final String STATSD_CLIENT_SOCKET_TIMEOUT = "statsd.client.socket.timeout";
-
-  public static final String RUNTIME_METRICS_ENABLED = "runtime.metrics.enabled";
-  public static final String RUNTIME_ID_ENABLED = "runtime-id.enabled";
-  public static final String RUNTIME_METRICS_RUNTIME_ID_ENABLED =
-      "runtime.metrics.runtime-id.enabled";
-
-  public static final String HEALTH_METRICS_ENABLED = "trace.health.metrics.enabled";
-  public static final String HEALTH_METRICS_STATSD_HOST = "trace.health.metrics.statsd.host";
-  public static final String HEALTH_METRICS_STATSD_PORT = "trace.health.metrics.statsd.port";
-  public static final String PERF_METRICS_ENABLED = "trace.perf.metrics.enabled";
-
-  public static final String TRACE_STATS_COMPUTATION_ENABLED = "trace.stats.computation.enabled";
-  public static final String TRACE_STATS_COMPUTATION_IGNORE_AGENT_VERSION =
-      "trace.stats.computation.ignore.agent.version";
-
-  public static final String TRACE_STATS_CARDINALITY_LIMIT = "trace.stats.cardinality.limit";
-  public static final String TRACE_STATS_RESOURCE_CARDINALITY_LIMIT =
-      "trace.stats.resource.cardinality.limit";
-  public static final String TRACE_STATS_HTTP_ENDPOINT_CARDINALITY_LIMIT =
-      "trace.stats.http_endpoint.cardinality.limit";
-  public static final String TRACE_STATS_PEER_TAGS_CARDINALITY_LIMIT =
-      "trace.stats.peer_tags.cardinality.limit";
-
-  public static final String TRACE_OTEL_SEMANTICS_ENABLED = "trace.otel.semantics.enabled";
-
-  public static final String TRACER_METRICS_ENABLED = "trace.tracer.metrics.enabled";
-  public static final String TRACER_METRICS_BUFFERING_ENABLED =
-      "trace.tracer.metrics.buffering.enabled";
-  public static final String TRACER_METRICS_MAX_AGGREGATES = "trace.tracer.metrics.max.aggregates";
-  public static final String TRACER_METRICS_MAX_PENDING = "trace.tracer.metrics.max.pending";
-  public static final String TRACER_METRICS_IGNORED_RESOURCES =
-      "trace.tracer.metrics.ignored.resources";
-  public static final String TRACE_STATS_ADDITIONAL_TAGS = "trace.stats.additional.tags";
-
-  public static final String AZURE_APP_SERVICES = "azure.app.services";
-  public static final String INTERNAL_EXIT_ON_FAILURE = "trace.internal.exit.on.failure";
-
-  public static final String DATA_JOBS_ENABLED = "data.jobs.enabled";
-  public static final String DATA_JOBS_COMMAND_PATTERN = "data.jobs.command.pattern";
-  public static final String DATA_JOBS_OPENLINEAGE_ENABLED = "data.jobs.openlineage.enabled";
-  public static final String DATA_JOBS_OPENLINEAGE_TIMEOUT_ENABLED =
-      "data.jobs.openlineage.timeout.enabled";
-  public static final String DATA_JOBS_PARSE_SPARK_PLAN_ENABLED =
-      "data.jobs.parse_spark_plan.enabled";
-  public static final String DATA_JOBS_EXPERIMENTAL_FEATURES_ENABLED =
-      "data.jobs.experimental_features.enabled";
-
-  public static final String DATA_STREAMS_ENABLED = "data.streams.enabled";
-  public static final String DATA_STREAMS_BUCKET_DURATION_SECONDS =
-      "data.streams.bucket_duration.seconds";
-  public static final String DATA_STREAMS_TRANSACTION_EXTRACTORS =
-      "data.streams.transaction_extractors";
-
-  public static final String TELEMETRY_ENABLED = "instrumentation.telemetry.enabled";
-  public static final String TELEMETRY_HEARTBEAT_INTERVAL = "telemetry.heartbeat.interval";
-  public static final String TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL =
-      "telemetry.extended.heartbeat.interval";
-  public static final String TELEMETRY_METRICS_INTERVAL = "telemetry.metrics.interval";
-  public static final String TELEMETRY_METRICS_ENABLED = "telemetry.metrics.enabled";
-  public static final String TELEMETRY_DEPENDENCY_COLLECTION_ENABLED =
-      "telemetry.dependency-collection.enabled";
-  public static final String TELEMETRY_LOG_COLLECTION_ENABLED = "telemetry.log-collection.enabled";
-  public static final String TELEMETRY_DEPENDENCY_RESOLUTION_QUEUE_SIZE =
-      "telemetry.dependency-resolution.queue.size";
-  public static final String TELEMETRY_DEBUG_REQUESTS_ENABLED = "telemetry.debug.requests.enabled";
-  public static final String AGENTLESS_LOG_SUBMISSION_ENABLED = "agentless.log.submission.enabled";
-  public static final String AGENTLESS_LOG_SUBMISSION_QUEUE_SIZE =
-      "agentless.log.submission.queue.size";
-  public static final String TELEMETRY_DEPENDENCY_RESOLUTION_PERIOD_MILLIS =
-      "telemetry.dependency.resolution.period.millis";
-  public static final String AGENTLESS_LOG_SUBMISSION_LEVEL = "agentless.log.submission.level";
-  public static final String AGENTLESS_LOG_SUBMISSION_URL = "agentless.log.submission.url";
-  public static final String APM_TRACING_ENABLED = "apm.tracing.enabled";
-  public static final String JDK_SOCKET_ENABLED = "jdk.socket.enabled";
-
-  public static final String TAG_NAME_UTF8_CACHE_SIZE = "tag.name.utf8.cache.size";
-  public static final String TAG_VALUE_UTF8_CACHE_SIZE = "tag.value.utf8.cache.size";
-  public static final String SPAN_BUILDER_REUSE_ENABLED = "span.builder.reuse.enabled";
-  public static final String STACK_TRACE_LENGTH_LIMIT = "stack.trace.length.limit";
-
-  public static final String SSI_INJECTION_ENABLED = "injection.enabled";
-  public static final String SSI_INJECTION_FORCE = "inject.force";
-  public static final String INSTRUMENTATION_SOURCE = "instrumentation.source";
-  public static final String APP_LOGS_COLLECTION_ENABLED = "app.logs.collection.enabled";
-
-  private GeneralConfig() {}
+    public static final String CONFIGURATION_FILE = "trace.config";
+    public static final String API_KEY = "api-key";
+    public static final String APPLICATION_KEY = "application-key";
+    public static final String APP_KEY = "app-key"; // alias for application key
+    public static final String API_KEY_FILE = "api-key-file";
+    public static final String APPLICATION_KEY_FILE = "application-key-file";
+    public static final String SITE = "site";
+
+    public static final String SERVICE_NAME = "service.name";
+    public static final String SERVICE_NAME_SET_BY_USER = "service.name.set.by.user";
+    public static final String ENV = "env";
+    public static final String VERSION = "version";
+    public static final String PRIMARY_TAG = "primary.tag";
+    public static final String TRACE_TAGS = "trace.tags";
+    public static final String TAGS = "tags";
+
+    @Deprecated // Use dd.tags instead
+    public static final String GLOBAL_TAGS = "trace.global.tags";
+
+    public static final String EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED =
+            "experimental.propagate.process.tags.enabled";
+
+    public static final String PROCESS_TAGS_MAPPING = "process.tags.mapping";
+
+    public static final String LOG_LEVEL = "log.level";
+    public static final String TRACE_LOG_LEVEL = "trace.log.level";
+    public static final String TRACE_DEBUG = "trace.debug";
+    public static final String TRACE_TRIAGE = "trace.triage";
+    public static final String TRIAGE_REPORT_TRIGGER = "triage.report.trigger";
+    public static final String TRIAGE_REPORT_DIR = "triage.report.dir";
+
+    public static final String STARTUP_LOGS_ENABLED = "trace.startup.logs";
+
+    public static final String DOGSTATSD_START_DELAY = "dogstatsd.start-delay";
+    public static final String DOGSTATSD_HOST = "dogstatsd.host";
+    public static final String DOGSTATSD_PORT = "dogstatsd.port";
+    public static final String DOGSTATSD_PATH = "dogstatsd.path";
+    public static final String DOGSTATSD_ARGS = "dogstatsd.args";
+    public static final String DOGSTATSD_NAMED_PIPE = "dogstatsd.pipe.name";
+
+    public static final String STATSD_CLIENT_QUEUE_SIZE = "statsd.client.queue.size";
+    public static final String STATSD_CLIENT_SOCKET_BUFFER = "statsd.client.socket.buffer";
+    public static final String STATSD_CLIENT_SOCKET_TIMEOUT = "statsd.client.socket.timeout";
+
+    public static final String RUNTIME_METRICS_ENABLED = "runtime.metrics.enabled";
+    public static final String RUNTIME_ID_ENABLED = "runtime-id.enabled";
+    public static final String RUNTIME_METRICS_RUNTIME_ID_ENABLED = "runtime.metrics.runtime-id.enabled";
+
+    public static final String HEALTH_METRICS_ENABLED = "trace.health.metrics.enabled";
+    public static final String HEALTH_METRICS_STATSD_HOST = "trace.health.metrics.statsd.host";
+    public static final String HEALTH_METRICS_STATSD_PORT = "trace.health.metrics.statsd.port";
+    public static final String PERF_METRICS_ENABLED = "trace.perf.metrics.enabled";
+
+    public static final String TRACE_STATS_COMPUTATION_ENABLED = "trace.stats.computation.enabled";
+    public static final String TRACE_STATS_COMPUTATION_IGNORE_AGENT_VERSION =
+            "trace.stats.computation.ignore.agent.version";
+
+    public static final String TRACE_STATS_CARDINALITY_LIMIT = "trace.stats.cardinality.limit";
+    public static final String TRACE_STATS_RESOURCE_CARDINALITY_LIMIT = "trace.stats.resource.cardinality.limit";
+    public static final String TRACE_STATS_HTTP_ENDPOINT_CARDINALITY_LIMIT =
+            "trace.stats.http_endpoint.cardinality.limit";
+    public static final String TRACE_STATS_PEER_TAGS_CARDINALITY_LIMIT = "trace.stats.peer_tags.cardinality.limit";
+
+    public static final String TRACE_OTEL_SEMANTICS_ENABLED = "trace.otel.semantics.enabled";
+
+    public static final String TRACER_METRICS_ENABLED = "trace.tracer.metrics.enabled";
+    public static final String TRACER_METRICS_BUFFERING_ENABLED = "trace.tracer.metrics.buffering.enabled";
+    public static final String TRACER_METRICS_MAX_AGGREGATES = "trace.tracer.metrics.max.aggregates";
+    public static final String TRACER_METRICS_MAX_PENDING = "trace.tracer.metrics.max.pending";
+    public static final String TRACER_METRICS_IGNORED_RESOURCES = "trace.tracer.metrics.ignored.resources";
+    public static final String TRACE_STATS_ADDITIONAL_TAGS = "trace.stats.additional.tags";
+
+    public static final String AZURE_APP_SERVICES = "azure.app.services";
+    public static final String INTERNAL_EXIT_ON_FAILURE = "trace.internal.exit.on.failure";
+
+    public static final String DATA_JOBS_ENABLED = "data.jobs.enabled";
+    public static final String DATA_JOBS_COMMAND_PATTERN = "data.jobs.command.pattern";
+    public static final String DATA_JOBS_OPENLINEAGE_ENABLED = "data.jobs.openlineage.enabled";
+    public static final String DATA_JOBS_OPENLINEAGE_TIMEOUT_ENABLED = "data.jobs.openlineage.timeout.enabled";
+    public static final String DATA_JOBS_PARSE_SPARK_PLAN_ENABLED = "data.jobs.parse_spark_plan.enabled";
+    public static final String DATA_JOBS_EXPERIMENTAL_FEATURES_ENABLED = "data.jobs.experimental_features.enabled";
+
+    public static final String DATA_STREAMS_ENABLED = "data.streams.enabled";
+    public static final String DATA_STREAMS_BUCKET_DURATION_SECONDS = "data.streams.bucket_duration.seconds";
+    public static final String DATA_STREAMS_TRANSACTION_EXTRACTORS = "data.streams.transaction_extractors";
+
+    public static final String TELEMETRY_ENABLED = "instrumentation.telemetry.enabled";
+    public static final String TELEMETRY_HEARTBEAT_INTERVAL = "telemetry.heartbeat.interval";
+    public static final String TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL = "telemetry.extended.heartbeat.interval";
+    public static final String TELEMETRY_METRICS_INTERVAL = "telemetry.metrics.interval";
+    public static final String TELEMETRY_METRICS_ENABLED = "telemetry.metrics.enabled";
+    public static final String TELEMETRY_DEPENDENCY_COLLECTION_ENABLED = "telemetry.dependency-collection.enabled";
+    public static final String TELEMETRY_LOG_COLLECTION_ENABLED = "telemetry.log-collection.enabled";
+    public static final String TELEMETRY_DEPENDENCY_RESOLUTION_QUEUE_SIZE =
+            "telemetry.dependency-resolution.queue.size";
+    public static final String TELEMETRY_DEBUG_REQUESTS_ENABLED = "telemetry.debug.requests.enabled";
+    public static final String AGENTLESS_LOG_SUBMISSION_ENABLED = "agentless.log.submission.enabled";
+    public static final String AGENTLESS_LOG_SUBMISSION_QUEUE_SIZE = "agentless.log.submission.queue.size";
+    public static final String TELEMETRY_DEPENDENCY_RESOLUTION_PERIOD_MILLIS =
+            "telemetry.dependency.resolution.period.millis";
+    public static final String AGENTLESS_LOG_SUBMISSION_LEVEL = "agentless.log.submission.level";
+    public static final String AGENTLESS_LOG_SUBMISSION_URL = "agentless.log.submission.url";
+    public static final String APM_TRACING_ENABLED = "apm.tracing.enabled";
+    public static final String JDK_SOCKET_ENABLED = "jdk.socket.enabled";
+
+    public static final String TAG_NAME_UTF8_CACHE_SIZE = "tag.name.utf8.cache.size";
+    public static final String TAG_VALUE_UTF8_CACHE_SIZE = "tag.value.utf8.cache.size";
+    public static final String SPAN_BUILDER_REUSE_ENABLED = "span.builder.reuse.enabled";
+    public static final String STACK_TRACE_LENGTH_LIMIT = "stack.trace.length.limit";
+
+    public static final String SSI_INJECTION_ENABLED = "injection.enabled";
+    public static final String SSI_INJECTION_FORCE = "inject.force";
+    public static final String INSTRUMENTATION_SOURCE = "instrumentation.source";
+    public static final String APP_LOGS_COLLECTION_ENABLED = "app.logs.collection.enabled";
+
+    private GeneralConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java
index fe75256c425..a2f5b94e22d 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java
@@ -3,37 +3,35 @@
 /** Constant with names of configuration options for IAST. */
 public final class IastConfig {
 
-  public static final String IAST_ENABLED = "iast.enabled";
-  public static final String IAST_WEAK_HASH_ALGORITHMS = "iast.weak-hash.algorithms";
-  public static final String IAST_WEAK_CIPHER_ALGORITHMS = "iast.weak-cipher.algorithms";
-  public static final String IAST_DEBUG_ENABLED = "iast.debug.enabled";
-  public static final String IAST_MAX_CONCURRENT_REQUESTS = "iast.max-concurrent-requests";
-  public static final String IAST_VULNERABILITIES_PER_REQUEST = "iast.vulnerabilities-per-request";
-  public static final String IAST_REQUEST_SAMPLING = "iast.request-sampling";
-  public static final String IAST_DEDUPLICATION_ENABLED = "iast.deduplication.enabled";
-  public static final String IAST_TELEMETRY_VERBOSITY = "iast.telemetry.verbosity";
-  public static final String IAST_DETECTION_MODE = "iast.detection.mode";
-  public static final String IAST_REDACTION_ENABLED = "iast.redaction.enabled";
-  public static final String IAST_REDACTION_NAME_PATTERN = "iast.redaction.name.pattern";
-  public static final String IAST_REDACTION_VALUE_PATTERN = "iast.redaction.value.pattern";
-  public static final String IAST_STACK_TRACE_LEAK_SUPPRESS = "iast.stack-trace-leak.suppress";
-  public static final String IAST_STACKTRACE_LEAK_SUPPRESS_DEPRECATED =
-      "iast.stacktrace-leak.suppress"; // old non-standard as a fallback alias
-  public static final String IAST_HARDCODED_SECRET_ENABLED = "iast.hardcoded-secret.enabled";
-  public static final String IAST_MAX_RANGE_COUNT = "iast.max-range-count";
-  public static final String IAST_TRUNCATION_MAX_VALUE_LENGTH = "iast.truncation.max.value.length";
-  public static final String IAST_CONTEXT_MODE = "iast.context.mode";
-  public static final String IAST_ANONYMOUS_CLASSES_ENABLED = "iast.anonymous-classes.enabled";
-  public static final String IAST_SOURCE_MAPPING_ENABLED = "iast.source-mapping.enabled";
-  public static final String IAST_SOURCE_MAPPING_MAX_SIZE = "iast.source-mapping.max-size";
-  public static final String IAST_EXPERIMENTAL_PROPAGATION_ENABLED =
-      "iast.experimental.propagation.enabled";
-  public static final String IAST_STACK_TRACE_ENABLED = "iast.stack-trace.enabled";
-  public static final String IAST_STACKTRACE_ENABLED_DEPRECATED =
-      "iast.stacktrace.enabled"; // old non-standard as a fallback alias
-  public static final String IAST_SECURITY_CONTROLS_CONFIGURATION =
-      "iast.security-controls.configuration";
-  public static final String IAST_DB_ROWS_TO_TAINT = "iast.db.rows-to-taint";
+    public static final String IAST_ENABLED = "iast.enabled";
+    public static final String IAST_WEAK_HASH_ALGORITHMS = "iast.weak-hash.algorithms";
+    public static final String IAST_WEAK_CIPHER_ALGORITHMS = "iast.weak-cipher.algorithms";
+    public static final String IAST_DEBUG_ENABLED = "iast.debug.enabled";
+    public static final String IAST_MAX_CONCURRENT_REQUESTS = "iast.max-concurrent-requests";
+    public static final String IAST_VULNERABILITIES_PER_REQUEST = "iast.vulnerabilities-per-request";
+    public static final String IAST_REQUEST_SAMPLING = "iast.request-sampling";
+    public static final String IAST_DEDUPLICATION_ENABLED = "iast.deduplication.enabled";
+    public static final String IAST_TELEMETRY_VERBOSITY = "iast.telemetry.verbosity";
+    public static final String IAST_DETECTION_MODE = "iast.detection.mode";
+    public static final String IAST_REDACTION_ENABLED = "iast.redaction.enabled";
+    public static final String IAST_REDACTION_NAME_PATTERN = "iast.redaction.name.pattern";
+    public static final String IAST_REDACTION_VALUE_PATTERN = "iast.redaction.value.pattern";
+    public static final String IAST_STACK_TRACE_LEAK_SUPPRESS = "iast.stack-trace-leak.suppress";
+    public static final String IAST_STACKTRACE_LEAK_SUPPRESS_DEPRECATED =
+            "iast.stacktrace-leak.suppress"; // old non-standard as a fallback alias
+    public static final String IAST_HARDCODED_SECRET_ENABLED = "iast.hardcoded-secret.enabled";
+    public static final String IAST_MAX_RANGE_COUNT = "iast.max-range-count";
+    public static final String IAST_TRUNCATION_MAX_VALUE_LENGTH = "iast.truncation.max.value.length";
+    public static final String IAST_CONTEXT_MODE = "iast.context.mode";
+    public static final String IAST_ANONYMOUS_CLASSES_ENABLED = "iast.anonymous-classes.enabled";
+    public static final String IAST_SOURCE_MAPPING_ENABLED = "iast.source-mapping.enabled";
+    public static final String IAST_SOURCE_MAPPING_MAX_SIZE = "iast.source-mapping.max-size";
+    public static final String IAST_EXPERIMENTAL_PROPAGATION_ENABLED = "iast.experimental.propagation.enabled";
+    public static final String IAST_STACK_TRACE_ENABLED = "iast.stack-trace.enabled";
+    public static final String IAST_STACKTRACE_ENABLED_DEPRECATED =
+            "iast.stacktrace.enabled"; // old non-standard as a fallback alias
+    public static final String IAST_SECURITY_CONTROLS_CONFIGURATION = "iast.security-controls.configuration";
+    public static final String IAST_DB_ROWS_TO_TAINT = "iast.db.rows-to-taint";
 
-  private IastConfig() {}
+    private IastConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/JmxFetchConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/JmxFetchConfig.java
index 6d2642f6db5..97c63ed6904 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/JmxFetchConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/JmxFetchConfig.java
@@ -7,22 +7,23 @@
  * documentation for details.
  */
 public final class JmxFetchConfig {
-  public static final String JMX_TAGS = "trace.jmx.tags";
-  public static final String JMX_FETCH_ENABLED = "jmxfetch.enabled";
-  public static final String JMX_FETCH_START_DELAY = "jmxfetch.start-delay";
-  public static final String JMX_FETCH_CONFIG_DIR = "jmxfetch.config.dir";
-  public static final String JMX_FETCH_CONFIG = "jmxfetch.config";
-  @Deprecated public static final String JMX_FETCH_METRICS_CONFIGS = "jmxfetch.metrics-configs";
-  public static final String JMX_FETCH_CHECK_PERIOD = "jmxfetch.check-period";
-  public static final String JMX_FETCH_INITIAL_REFRESH_BEANS_PERIOD =
-      "jmxfetch.initial-refresh-beans-period";
-  public static final String JMX_FETCH_REFRESH_BEANS_PERIOD = "jmxfetch.refresh-beans-period";
-  public static final String JMX_FETCH_STATSD_HOST = "jmxfetch.statsd.host";
-  public static final String JMX_FETCH_STATSD_PORT = "jmxfetch.statsd.port";
-  public static final String JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_ENABLED =
-      "jmxfetch.multiple-runtime-services.enabled";
-  public static final String JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_LIMIT =
-      "jmxfetch.multiple-runtime-services.limit";
+    public static final String JMX_TAGS = "trace.jmx.tags";
+    public static final String JMX_FETCH_ENABLED = "jmxfetch.enabled";
+    public static final String JMX_FETCH_START_DELAY = "jmxfetch.start-delay";
+    public static final String JMX_FETCH_CONFIG_DIR = "jmxfetch.config.dir";
+    public static final String JMX_FETCH_CONFIG = "jmxfetch.config";
 
-  private JmxFetchConfig() {}
+    @Deprecated
+    public static final String JMX_FETCH_METRICS_CONFIGS = "jmxfetch.metrics-configs";
+
+    public static final String JMX_FETCH_CHECK_PERIOD = "jmxfetch.check-period";
+    public static final String JMX_FETCH_INITIAL_REFRESH_BEANS_PERIOD = "jmxfetch.initial-refresh-beans-period";
+    public static final String JMX_FETCH_REFRESH_BEANS_PERIOD = "jmxfetch.refresh-beans-period";
+    public static final String JMX_FETCH_STATSD_HOST = "jmxfetch.statsd.host";
+    public static final String JMX_FETCH_STATSD_PORT = "jmxfetch.statsd.port";
+    public static final String JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_ENABLED =
+            "jmxfetch.multiple-runtime-services.enabled";
+    public static final String JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_LIMIT = "jmxfetch.multiple-runtime-services.limit";
+
+    private JmxFetchConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/LlmObsConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/LlmObsConfig.java
index 0b2c6c2928c..4e69aaf7896 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/LlmObsConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/LlmObsConfig.java
@@ -6,13 +6,13 @@
  */
 public final class LlmObsConfig {
 
-  public static final String LLMOBS_ENABLED = "llmobs.enabled";
+    public static final String LLMOBS_ENABLED = "llmobs.enabled";
 
-  public static final String LLMOBS_ML_APP = "llmobs.ml.app";
+    public static final String LLMOBS_ML_APP = "llmobs.ml.app";
 
-  public static final String LLMOBS_AGENTLESS_ENABLED = "llmobs.agentless.enabled";
+    public static final String LLMOBS_AGENTLESS_ENABLED = "llmobs.agentless.enabled";
 
-  public static final String LLMOBS_SAMPLE_RATE = "llmobs.sample.rate";
+    public static final String LLMOBS_SAMPLE_RATE = "llmobs.sample.rate";
 
-  private LlmObsConfig() {}
+    private LlmObsConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/OtlpConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/OtlpConfig.java
index 90fd9fd046f..f102d68cb52 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/OtlpConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/OtlpConfig.java
@@ -2,62 +2,60 @@
 
 public final class OtlpConfig {
 
-  public static final String LOGS_OTEL_ENABLED = "logs.otel.enabled";
-  public static final String LOGS_OTEL_EXPORTER = "logs.otel.exporter";
-  public static final String LOGS_OTEL_INTERVAL = "logs.otel.interval";
-  public static final String LOGS_OTEL_TIMEOUT = "logs.otel.timeout";
-  public static final String LOGS_OTEL_QUEUE_SIZE = "logs.otel.queue.size";
-  public static final String LOGS_OTEL_BATCH_SIZE = "logs.otel.batch.size";
-
-  public static final String OTLP_LOGS_ENDPOINT = "otlp.logs.endpoint";
-  public static final String OTLP_LOGS_HEADERS = "otlp.logs.headers";
-  public static final String OTLP_LOGS_PROTOCOL = "otlp.logs.protocol";
-  public static final String OTLP_LOGS_COMPRESSION = "otlp.logs.compression";
-  public static final String OTLP_LOGS_TIMEOUT = "otlp.logs.timeout";
-
-  public static final String METRICS_OTEL_ENABLED = "metrics.otel.enabled";
-  public static final String METRICS_OTEL_EXPORTER = "metrics.otel.exporter";
-  public static final String METRICS_OTEL_INTERVAL = "metrics.otel.interval";
-  public static final String METRICS_OTEL_TIMEOUT = "metrics.otel.timeout";
-  public static final String METRICS_OTEL_CARDINALITY_LIMIT = "metrics.otel.cardinality.limit";
-  public static final String METRICS_OTEL_EXPERIMENTAL_ENABLED =
-      "metrics.otel.experimental.enabled";
-
-  public static final String OTLP_METRICS_ENDPOINT = "otlp.metrics.endpoint";
-  public static final String OTLP_METRICS_HEADERS = "otlp.metrics.headers";
-  public static final String OTLP_METRICS_PROTOCOL = "otlp.metrics.protocol";
-  public static final String OTLP_METRICS_COMPRESSION = "otlp.metrics.compression";
-  public static final String OTLP_METRICS_TIMEOUT = "otlp.metrics.timeout";
-  public static final String OTLP_METRICS_TEMPORALITY_PREFERENCE =
-      "otlp.metrics.temporality.preference";
-
-  public static final String OTEL_TRACES_SPAN_METRICS_ENABLED = "otel.traces.span.metrics.enabled";
-
-  public static final String TRACE_OTEL_ENABLED = "trace.otel.enabled";
-  public static final String TRACE_OTEL_EXPORTER = "trace.otel.exporter";
-
-  public static final String OTLP_TRACES_ENDPOINT = "otlp.traces.endpoint";
-  public static final String OTLP_TRACES_HEADERS = "otlp.traces.headers";
-  public static final String OTLP_TRACES_PROTOCOL = "otlp.traces.protocol";
-  public static final String OTLP_TRACES_COMPRESSION = "otlp.traces.compression";
-  public static final String OTLP_TRACES_TIMEOUT = "otlp.traces.timeout";
-
-  public enum Protocol {
-    GRPC,
-    HTTP_PROTOBUF,
-    HTTP_JSON
-  }
-
-  public enum Compression {
-    NONE,
-    GZIP
-  }
-
-  public enum Temporality {
-    CUMULATIVE,
-    DELTA,
-    LOWMEMORY
-  }
-
-  private OtlpConfig() {}
+    public static final String LOGS_OTEL_ENABLED = "logs.otel.enabled";
+    public static final String LOGS_OTEL_EXPORTER = "logs.otel.exporter";
+    public static final String LOGS_OTEL_INTERVAL = "logs.otel.interval";
+    public static final String LOGS_OTEL_TIMEOUT = "logs.otel.timeout";
+    public static final String LOGS_OTEL_QUEUE_SIZE = "logs.otel.queue.size";
+    public static final String LOGS_OTEL_BATCH_SIZE = "logs.otel.batch.size";
+
+    public static final String OTLP_LOGS_ENDPOINT = "otlp.logs.endpoint";
+    public static final String OTLP_LOGS_HEADERS = "otlp.logs.headers";
+    public static final String OTLP_LOGS_PROTOCOL = "otlp.logs.protocol";
+    public static final String OTLP_LOGS_COMPRESSION = "otlp.logs.compression";
+    public static final String OTLP_LOGS_TIMEOUT = "otlp.logs.timeout";
+
+    public static final String METRICS_OTEL_ENABLED = "metrics.otel.enabled";
+    public static final String METRICS_OTEL_EXPORTER = "metrics.otel.exporter";
+    public static final String METRICS_OTEL_INTERVAL = "metrics.otel.interval";
+    public static final String METRICS_OTEL_TIMEOUT = "metrics.otel.timeout";
+    public static final String METRICS_OTEL_CARDINALITY_LIMIT = "metrics.otel.cardinality.limit";
+    public static final String METRICS_OTEL_EXPERIMENTAL_ENABLED = "metrics.otel.experimental.enabled";
+
+    public static final String OTLP_METRICS_ENDPOINT = "otlp.metrics.endpoint";
+    public static final String OTLP_METRICS_HEADERS = "otlp.metrics.headers";
+    public static final String OTLP_METRICS_PROTOCOL = "otlp.metrics.protocol";
+    public static final String OTLP_METRICS_COMPRESSION = "otlp.metrics.compression";
+    public static final String OTLP_METRICS_TIMEOUT = "otlp.metrics.timeout";
+    public static final String OTLP_METRICS_TEMPORALITY_PREFERENCE = "otlp.metrics.temporality.preference";
+
+    public static final String OTEL_TRACES_SPAN_METRICS_ENABLED = "otel.traces.span.metrics.enabled";
+
+    public static final String TRACE_OTEL_ENABLED = "trace.otel.enabled";
+    public static final String TRACE_OTEL_EXPORTER = "trace.otel.exporter";
+
+    public static final String OTLP_TRACES_ENDPOINT = "otlp.traces.endpoint";
+    public static final String OTLP_TRACES_HEADERS = "otlp.traces.headers";
+    public static final String OTLP_TRACES_PROTOCOL = "otlp.traces.protocol";
+    public static final String OTLP_TRACES_COMPRESSION = "otlp.traces.compression";
+    public static final String OTLP_TRACES_TIMEOUT = "otlp.traces.timeout";
+
+    public enum Protocol {
+        GRPC,
+        HTTP_PROTOBUF,
+        HTTP_JSON
+    }
+
+    public enum Compression {
+        NONE,
+        GZIP
+    }
+
+    public enum Temporality {
+        CUMULATIVE,
+        DELTA,
+        LOWMEMORY
+    }
+
+    private OtlpConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java
index 37dc6c3c500..4746cbf3c1e 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java
@@ -7,217 +7,198 @@
  * documentation for details.
  */
 public final class ProfilingConfig {
-  public static final String PROFILING_ENABLED = "profiling.enabled";
-  public static final boolean PROFILING_ENABLED_DEFAULT = false;
-  public static final String PROFILING_ALLOCATION_ENABLED = "profiling.allocation.enabled";
-  public static final String PROFILING_HEAP_ENABLED = "profiling.heap.enabled";
-  public static final boolean PROFILING_HEAP_ENABLED_DEFAULT = false;
-  @Deprecated // Use dd.site instead
-  public static final String PROFILING_URL = "profiling.url";
-  @Deprecated // Use dd.api-key instead
-  public static final String PROFILING_API_KEY_OLD = "profiling.api-key";
-  @Deprecated // Use dd.api-key-file instead
-  public static final String PROFILING_API_KEY_FILE_OLD = "profiling.api-key-file";
-  @Deprecated // Use dd.api-key instead
-  public static final String PROFILING_API_KEY_VERY_OLD = "profiling.apikey";
-  @Deprecated // Use dd.api-key-file instead
-  public static final String PROFILING_API_KEY_FILE_VERY_OLD = "profiling.apikey.file";
-  public static final String PROFILING_TAGS = "profiling.tags";
-  public static final String PROFILING_START_DELAY = "profiling.start-delay";
-  public static final int PROFILING_START_DELAY_DEFAULT = 10;
-  public static final String PROFILING_START_FORCE_FIRST = "profiling.start-force-first";
-  public static final boolean PROFILING_START_FORCE_FIRST_DEFAULT = false;
-  public static final String PROFILING_UPLOAD_PERIOD = "profiling.upload.period";
-  public static final int PROFILING_UPLOAD_PERIOD_DEFAULT = 60;
-  public static final String PROFILING_TEMPLATE_OVERRIDE_FILE =
-      "profiling.jfr-template-override-file";
-  public static final String PROFILING_UPLOAD_TIMEOUT = "profiling.upload.timeout";
-  public static final int PROFILING_UPLOAD_TIMEOUT_DEFAULT = 30;
-
-  // When set to false, ddprof skips preloading jmethodIDs for eligible system classes to reduce
-  // native memory usage. Default is true to preserve current behavior (force preloading).
-  public static final String PROFILING_DATADOG_PROFILER_JMETHODID_OPTIM_ENABLED =
-      "profiling.experimental.ddprof.jmethodid_optim.enabled";
-  public static final boolean PROFILING_DATADOG_PROFILER_JMETHODID_OPTIM_ENABLED_DEFAULT = false;
+    public static final String PROFILING_ENABLED = "profiling.enabled";
+    public static final boolean PROFILING_ENABLED_DEFAULT = false;
+    public static final String PROFILING_ALLOCATION_ENABLED = "profiling.allocation.enabled";
+    public static final String PROFILING_HEAP_ENABLED = "profiling.heap.enabled";
+    public static final boolean PROFILING_HEAP_ENABLED_DEFAULT = false;
+
+    @Deprecated // Use dd.site instead
+    public static final String PROFILING_URL = "profiling.url";
+
+    @Deprecated // Use dd.api-key instead
+    public static final String PROFILING_API_KEY_OLD = "profiling.api-key";
+
+    @Deprecated // Use dd.api-key-file instead
+    public static final String PROFILING_API_KEY_FILE_OLD = "profiling.api-key-file";
+
+    @Deprecated // Use dd.api-key instead
+    public static final String PROFILING_API_KEY_VERY_OLD = "profiling.apikey";
+
+    @Deprecated // Use dd.api-key-file instead
+    public static final String PROFILING_API_KEY_FILE_VERY_OLD = "profiling.apikey.file";
+
+    public static final String PROFILING_TAGS = "profiling.tags";
+    public static final String PROFILING_START_DELAY = "profiling.start-delay";
+    public static final int PROFILING_START_DELAY_DEFAULT = 10;
+    public static final String PROFILING_START_FORCE_FIRST = "profiling.start-force-first";
+    public static final boolean PROFILING_START_FORCE_FIRST_DEFAULT = false;
+    public static final String PROFILING_UPLOAD_PERIOD = "profiling.upload.period";
+    public static final int PROFILING_UPLOAD_PERIOD_DEFAULT = 60;
+    public static final String PROFILING_TEMPLATE_OVERRIDE_FILE = "profiling.jfr-template-override-file";
+    public static final String PROFILING_UPLOAD_TIMEOUT = "profiling.upload.timeout";
+    public static final int PROFILING_UPLOAD_TIMEOUT_DEFAULT = 30;
+
+    // When set to false, ddprof skips preloading jmethodIDs for eligible system classes to reduce
+    // native memory usage. Default is true to preserve current behavior (force preloading).
+    public static final String PROFILING_DATADOG_PROFILER_JMETHODID_OPTIM_ENABLED =
+            "profiling.experimental.ddprof.jmethodid_optim.enabled";
+    public static final boolean PROFILING_DATADOG_PROFILER_JMETHODID_OPTIM_ENABLED_DEFAULT = false;
+
+    /**
+     * @deprecated Use {@link #PROFILING_DEBUG_UPLOAD_COMPRESSION} instead. This will be removed in a
+     *     future release.
+     */
+    @Deprecated
+    public static final String PROFILING_UPLOAD_COMPRESSION = "profiling.upload.compression";
+
+    public static final String PROFILING_PROXY_HOST = "profiling.proxy.host";
+    public static final String PROFILING_PROXY_PORT = "profiling.proxy.port";
+    public static final int PROFILING_PROXY_PORT_DEFAULT = 8080;
+    public static final String PROFILING_PROXY_USERNAME = "profiling.proxy.username";
+    public static final String PROFILING_PROXY_PASSWORD = "profiling.proxy.password";
+    public static final String PROFILING_EXCEPTION_SAMPLE_LIMIT = "profiling.exception.sample.limit";
+    public static final int PROFILING_EXCEPTION_SAMPLE_LIMIT_DEFAULT = 10_000;
+    public static final String PROFILING_EXCEPTION_RECORD_MESSAGE = "profiling.exception.record.message";
+    public static final boolean PROFILING_EXCEPTION_RECORD_MESSAGE_DEFAULT = true;
+
+    public static final String PROFILING_BACKPRESSURE_SAMPLING_ENABLED = "profiling.backpressure.sampling.enabled";
+    public static final boolean PROFILING_BACKPRESSURE_SAMPLING_ENABLED_DEFAULT = false;
+
+    public static final int PROFILING_BACKPRESSURE_SAMPLE_LIMIT_DEFAULT = 10_000;
+
+    public static final String PROFILING_DIRECT_ALLOCATION_SAMPLE_LIMIT = "profiling.direct.allocation.sample.limit";
+    public static final int PROFILING_DIRECT_ALLOCATION_SAMPLE_LIMIT_DEFAULT = 2_000;
+    public static final String PROFILING_EXCEPTION_HISTOGRAM_TOP_ITEMS = "profiling.exception.histogram.top-items";
+    public static final int PROFILING_EXCEPTION_HISTOGRAM_TOP_ITEMS_DEFAULT = 50;
+    public static final String PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE =
+            "profiling.exception.histogram.max-collection-size";
+    public static final int PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE_DEFAULT = 10_000;
+    public static final String PROFILING_EXCLUDE_AGENT_THREADS = "profiling.exclude.agent-threads";
+    public static final String PROFILING_HOTSPOTS_ENABLED = "profiling.hotspots.enabled";
+
+    public static final String PROFILING_AUXILIARY_TYPE = "profiling.auxiliary";
+    public static final String PROFILING_AUXILIARY_TYPE_DEFAULT = "none";
+
+    public static final String PROFILING_JFR_REPOSITORY_BASE = "profiling.jfr.repository.base";
+    public static final String PROFILING_JFR_REPOSITORY_BASE_DEFAULT = System.getProperty("java.io.tmpdir") + "/dd/jfr";
+
+    public static final String PROFILING_DATADOG_PROFILER_ENABLED = "profiling.ddprof.enabled";
+
+    public static final String PROFILING_DIRECT_ALLOCATION_ENABLED = "profiling.directallocation.enabled";
+    public static final boolean PROFILING_DIRECT_ALLOCATION_ENABLED_DEFAULT = false;
+
+    public static final String PROFILING_STACKDEPTH = "profiling.stackdepth";
+    public static final int PROFILING_STACKDEPTH_DEFAULT = 512;
+
+    // Java profiler lib needs to be extracted from JAR and placed into the scratch location
+    // By default the scratch is the os temp directory but can be overridden by user
+    public static final String PROFILING_DATADOG_PROFILER_SCRATCH = "profiling.ddprof.scratch";
+
+    public static final String PROFILING_DATADOG_PROFILER_LIBPATH = "profiling.ddprof.debug.lib";
+    public static final String PROFILING_DATADOG_PROFILER_ALLOC_ENABLED = "profiling.ddprof.alloc.enabled";
+    public static final String PROFILING_DATADOG_PROFILER_ALLOC_INTERVAL = "profiling.ddprof.alloc.interval";
+    public static final int PROFILING_DATADOG_PROFILER_ALLOC_INTERVAL_DEFAULT = 256 * 1024;
+    public static final String PROFILING_DATADOG_PROFILER_CPU_ENABLED = "profiling.ddprof.cpu.enabled";
+    public static final boolean PROFILING_DATADOG_PROFILER_CPU_ENABLED_DEFAULT = true;
+    public static final String PROFILING_DATADOG_PROFILER_CPU_INTERVAL = "profiling.ddprof.cpu.interval.ms";
+    public static final int PROFILING_DATADOG_PROFILER_CPU_INTERVAL_DEFAULT = 10;
+    public static final String PROFILING_DATADOG_PROFILER_WALL_ENABLED = "profiling.ddprof.wall.enabled";
+    public static final boolean PROFILING_DATADOG_PROFILER_WALL_ENABLED_DEFAULT = true;
+    public static final String PROFILING_DATADOG_PROFILER_WALL_INTERVAL = "profiling.ddprof.wall.interval.ms";
+    public static final int PROFILING_DATADOG_PROFILER_WALL_INTERVAL_DEFAULT = 50;
+
+    public static final int PROFILING_DATADOG_PROFILER_J9_CPU_INTERVAL_DEFAULT = 50;
+
+    public static final String PROFILING_DATADOG_PROFILER_WALL_COLLAPSING = "profiling.ddprof.wall.collapsing";
+    public static final boolean PROFILING_DATADOG_PROFILER_WALL_COLLAPSING_DEFAULT = true;
+
+    public static final String PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER = "profiling.ddprof.wall.context.filter";
+    public static final boolean PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER_DEFAULT = true;
+
+    public static final String PROFILING_DATADOG_PROFILER_SCHEDULING_EVENT =
+            "profiling.experimental.ddprof.scheduling.event";
+
+    public static final String PROFILING_DATADOG_PROFILER_SCHEDULING_EVENT_INTERVAL =
+            "profiling.experimental.ddprof.scheduling.event.interval";
+
+    public static final String PROFILING_PROCESS_CONTEXT_ENABLED = "profiling.experimental.process_context.enabled";
+    public static final boolean PROFILING_PROCESS_CONTEXT_ENABLED_DEFAULT = true;
+
+    public static final String PROFILING_DATADOG_PROFILER_LOG_LEVEL = "profiling.ddprof.loglevel";
+
+    public static final String PROFILING_DATADOG_PROFILER_LOG_LEVEL_DEFAULT = "NONE";
+    public static final String PROFILING_DATADOG_PROFILER_STACKDEPTH = "profiling.ddprof.stackdepth";
+    public static final String PROFILING_DATADOG_PROFILER_CSTACK = "profiling.ddprof.cstack";
+    public static final String PROFILING_DATADOG_PROFILER_CSTACK_DEFAULT = "vm";
+    public static final String PROFILING_DATADOG_PROFILER_SAFEMODE = "profiling.ddprof.safemode";
+
+    private static final int POP_METHOD = 4;
+    private static final int LAST_JAVA_PC = 16;
+    public static final int PROFILING_DATADOG_PROFILER_SAFEMODE_DEFAULT = POP_METHOD | LAST_JAVA_PC;
+
+    public static final String PROFILING_DATADOG_PROFILER_LINE_NUMBERS = "profiling.ddprof.linenumbers";
+
+    public static final boolean PROFILING_DATADOG_PROFILER_LINE_NUMBERS_DEFAULT = true;
+
+    @Deprecated
+    public static final String PROFILING_DATADOG_PROFILER_MEMLEAK_ENABLED = "profiling.ddprof.memleak.enabled";
+
+    @Deprecated
+    public static final String PROFILING_DATADOG_PROFILER_MEMLEAK_INTERVAL = "profiling.ddprof.memleak.interval";
+
+    @Deprecated
+    public static final String PROFILING_DATADOG_PROFILER_MEMLEAK_CAPACITY = "profiling.ddprof.memleak.capacity";
+
+    public static final String PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED = "profiling.ddprof.liveheap.enabled";
+    public static final boolean PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED_DEFAULT = false;
+    public static final String PROFILING_DATADOG_PROFILER_LIVEHEAP_INTERVAL = "profiling.ddprof.liveheap.interval";
+    public static final String PROFILING_DATADOG_PROFILER_LIVEHEAP_CAPACITY = "profiling.ddprof.liveheap.capacity";
+    public static final int PROFILING_DATADOG_PROFILER_LIVEHEAP_CAPACITY_DEFAULT = 1024;
+    public static final String PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE =
+            "profiling.ddprof.liveheap.track_size.enabled";
+    public static final boolean PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE_DEFAFULT = true;
+    public static final String PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT =
+            "profiling.ddprof.liveheap.sample_percent";
+    public static final int PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT_DEFAULT =
+            50; // default to 10% of allocation samples
 
-  /**
-   * @deprecated Use {@link #PROFILING_DEBUG_UPLOAD_COMPRESSION} instead. This will be removed in a
-   *     future release.
-   */
-  @Deprecated
-  public static final String PROFILING_UPLOAD_COMPRESSION = "profiling.upload.compression";
-
-  public static final String PROFILING_PROXY_HOST = "profiling.proxy.host";
-  public static final String PROFILING_PROXY_PORT = "profiling.proxy.port";
-  public static final int PROFILING_PROXY_PORT_DEFAULT = 8080;
-  public static final String PROFILING_PROXY_USERNAME = "profiling.proxy.username";
-  public static final String PROFILING_PROXY_PASSWORD = "profiling.proxy.password";
-  public static final String PROFILING_EXCEPTION_SAMPLE_LIMIT = "profiling.exception.sample.limit";
-  public static final int PROFILING_EXCEPTION_SAMPLE_LIMIT_DEFAULT = 10_000;
-  public static final String PROFILING_EXCEPTION_RECORD_MESSAGE =
-      "profiling.exception.record.message";
-  public static final boolean PROFILING_EXCEPTION_RECORD_MESSAGE_DEFAULT = true;
-
-  public static final String PROFILING_BACKPRESSURE_SAMPLING_ENABLED =
-      "profiling.backpressure.sampling.enabled";
-  public static final boolean PROFILING_BACKPRESSURE_SAMPLING_ENABLED_DEFAULT = false;
-
-  public static final int PROFILING_BACKPRESSURE_SAMPLE_LIMIT_DEFAULT = 10_000;
-
-  public static final String PROFILING_DIRECT_ALLOCATION_SAMPLE_LIMIT =
-      "profiling.direct.allocation.sample.limit";
-  public static final int PROFILING_DIRECT_ALLOCATION_SAMPLE_LIMIT_DEFAULT = 2_000;
-  public static final String PROFILING_EXCEPTION_HISTOGRAM_TOP_ITEMS =
-      "profiling.exception.histogram.top-items";
-  public static final int PROFILING_EXCEPTION_HISTOGRAM_TOP_ITEMS_DEFAULT = 50;
-  public static final String PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE =
-      "profiling.exception.histogram.max-collection-size";
-  public static final int PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE_DEFAULT = 10_000;
-  public static final String PROFILING_EXCLUDE_AGENT_THREADS = "profiling.exclude.agent-threads";
-  public static final String PROFILING_HOTSPOTS_ENABLED = "profiling.hotspots.enabled";
-
-  public static final String PROFILING_AUXILIARY_TYPE = "profiling.auxiliary";
-  public static final String PROFILING_AUXILIARY_TYPE_DEFAULT = "none";
-
-  public static final String PROFILING_JFR_REPOSITORY_BASE = "profiling.jfr.repository.base";
-  public static final String PROFILING_JFR_REPOSITORY_BASE_DEFAULT =
-      System.getProperty("java.io.tmpdir") + "/dd/jfr";
-
-  public static final String PROFILING_DATADOG_PROFILER_ENABLED = "profiling.ddprof.enabled";
-
-  public static final String PROFILING_DIRECT_ALLOCATION_ENABLED =
-      "profiling.directallocation.enabled";
-  public static final boolean PROFILING_DIRECT_ALLOCATION_ENABLED_DEFAULT = false;
-
-  public static final String PROFILING_STACKDEPTH = "profiling.stackdepth";
-  public static final int PROFILING_STACKDEPTH_DEFAULT = 512;
-
-  // Java profiler lib needs to be extracted from JAR and placed into the scratch location
-  // By default the scratch is the os temp directory but can be overridden by user
-  public static final String PROFILING_DATADOG_PROFILER_SCRATCH = "profiling.ddprof.scratch";
-
-  public static final String PROFILING_DATADOG_PROFILER_LIBPATH = "profiling.ddprof.debug.lib";
-  public static final String PROFILING_DATADOG_PROFILER_ALLOC_ENABLED =
-      "profiling.ddprof.alloc.enabled";
-  public static final String PROFILING_DATADOG_PROFILER_ALLOC_INTERVAL =
-      "profiling.ddprof.alloc.interval";
-  public static final int PROFILING_DATADOG_PROFILER_ALLOC_INTERVAL_DEFAULT = 256 * 1024;
-  public static final String PROFILING_DATADOG_PROFILER_CPU_ENABLED =
-      "profiling.ddprof.cpu.enabled";
-  public static final boolean PROFILING_DATADOG_PROFILER_CPU_ENABLED_DEFAULT = true;
-  public static final String PROFILING_DATADOG_PROFILER_CPU_INTERVAL =
-      "profiling.ddprof.cpu.interval.ms";
-  public static final int PROFILING_DATADOG_PROFILER_CPU_INTERVAL_DEFAULT = 10;
-  public static final String PROFILING_DATADOG_PROFILER_WALL_ENABLED =
-      "profiling.ddprof.wall.enabled";
-  public static final boolean PROFILING_DATADOG_PROFILER_WALL_ENABLED_DEFAULT = true;
-  public static final String PROFILING_DATADOG_PROFILER_WALL_INTERVAL =
-      "profiling.ddprof.wall.interval.ms";
-  public static final int PROFILING_DATADOG_PROFILER_WALL_INTERVAL_DEFAULT = 50;
-
-  public static final int PROFILING_DATADOG_PROFILER_J9_CPU_INTERVAL_DEFAULT = 50;
-
-  public static final String PROFILING_DATADOG_PROFILER_WALL_COLLAPSING =
-      "profiling.ddprof.wall.collapsing";
-  public static final boolean PROFILING_DATADOG_PROFILER_WALL_COLLAPSING_DEFAULT = true;
-
-  public static final String PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER =
-      "profiling.ddprof.wall.context.filter";
-  public static final boolean PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER_DEFAULT = true;
-
-  public static final String PROFILING_DATADOG_PROFILER_SCHEDULING_EVENT =
-      "profiling.experimental.ddprof.scheduling.event";
-
-  public static final String PROFILING_DATADOG_PROFILER_SCHEDULING_EVENT_INTERVAL =
-      "profiling.experimental.ddprof.scheduling.event.interval";
-
-  public static final String PROFILING_PROCESS_CONTEXT_ENABLED =
-      "profiling.experimental.process_context.enabled";
-  public static final boolean PROFILING_PROCESS_CONTEXT_ENABLED_DEFAULT = true;
-
-  public static final String PROFILING_DATADOG_PROFILER_LOG_LEVEL = "profiling.ddprof.loglevel";
-
-  public static final String PROFILING_DATADOG_PROFILER_LOG_LEVEL_DEFAULT = "NONE";
-  public static final String PROFILING_DATADOG_PROFILER_STACKDEPTH = "profiling.ddprof.stackdepth";
-  public static final String PROFILING_DATADOG_PROFILER_CSTACK = "profiling.ddprof.cstack";
-  public static final String PROFILING_DATADOG_PROFILER_CSTACK_DEFAULT = "vm";
-  public static final String PROFILING_DATADOG_PROFILER_SAFEMODE = "profiling.ddprof.safemode";
-
-  private static final int POP_METHOD = 4;
-  private static final int LAST_JAVA_PC = 16;
-  public static final int PROFILING_DATADOG_PROFILER_SAFEMODE_DEFAULT = POP_METHOD | LAST_JAVA_PC;
-
-  public static final String PROFILING_DATADOG_PROFILER_LINE_NUMBERS =
-      "profiling.ddprof.linenumbers";
-
-  public static final boolean PROFILING_DATADOG_PROFILER_LINE_NUMBERS_DEFAULT = true;
-
-  @Deprecated
-  public static final String PROFILING_DATADOG_PROFILER_MEMLEAK_ENABLED =
-      "profiling.ddprof.memleak.enabled";
-
-  @Deprecated
-  public static final String PROFILING_DATADOG_PROFILER_MEMLEAK_INTERVAL =
-      "profiling.ddprof.memleak.interval";
-
-  @Deprecated
-  public static final String PROFILING_DATADOG_PROFILER_MEMLEAK_CAPACITY =
-      "profiling.ddprof.memleak.capacity";
-
-  public static final String PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED =
-      "profiling.ddprof.liveheap.enabled";
-  public static final boolean PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED_DEFAULT = false;
-  public static final String PROFILING_DATADOG_PROFILER_LIVEHEAP_INTERVAL =
-      "profiling.ddprof.liveheap.interval";
-  public static final String PROFILING_DATADOG_PROFILER_LIVEHEAP_CAPACITY =
-      "profiling.ddprof.liveheap.capacity";
-  public static final int PROFILING_DATADOG_PROFILER_LIVEHEAP_CAPACITY_DEFAULT = 1024;
-  public static final String PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE =
-      "profiling.ddprof.liveheap.track_size.enabled";
-  public static final boolean PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE_DEFAFULT = true;
-  public static final String PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT =
-      "profiling.ddprof.liveheap.sample_percent";
-  public static final int PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT_DEFAULT =
-      50; // default to 10% of allocation samples
-
-  public static final String PROFILING_DATADOG_PROFILER_NATIVEMEM_ENABLED =
-      "profiling.experimental.ddprof.nativemem.enabled";
-  public static final boolean PROFILING_DATADOG_PROFILER_NATIVEMEM_ENABLED_DEFAULT = false;
-  public static final String PROFILING_DATADOG_PROFILER_NATIVEMEM_INTERVAL =
-      "profiling.experimental.ddprof.nativemem.interval";
-  public static final int PROFILING_DATADOG_PROFILER_NATIVEMEM_INTERVAL_DEFAULT = 512 * 1024;
-
-  public static final String PROFILING_DATADOG_PROFILER_NATIVESOCKET_ENABLED =
-      "profiling.experimental.ddprof.nativesocket.enabled";
-  public static final boolean PROFILING_DATADOG_PROFILER_NATIVESOCKET_ENABLED_DEFAULT = false;
-  public static final String PROFILING_DATADOG_PROFILER_NATIVESOCKET_INTERVAL =
-      "profiling.experimental.ddprof.nativesocket.interval";
-
-  public static final String PROFILING_ENDPOINT_COLLECTION_ENABLED =
-      "profiling.endpoint.collection.enabled";
-  public static final boolean PROFILING_ENDPOINT_COLLECTION_ENABLED_DEFAULT = true;
-
-  public static final String PROFILING_JFR_REPOSITORY_MAXSIZE = "profiling.jfr.repository.maxsize";
-  public static final int PROFILING_JFR_REPOSITORY_MAXSIZE_DEFAULT =
-      64 * 1024 * 1024; // 64MB default
-
-  public static final String PROFILING_UPLOAD_SUMMARY_ON_413 = "profiling.upload.summary-on-413";
-  public static final boolean PROFILING_UPLOAD_SUMMARY_ON_413_DEFAULT = false;
-
-  public static final String PROFILING_TEMP_DIR = "profiling.tempdir";
-  public static final String PROFILING_TEMP_DIR_DEFAULT = System.getProperty("java.io.tmpdir");
-
-  // Not intended for production use
-  public static final String PROFILING_AGENTLESS = "profiling.agentless";
-  public static final boolean PROFILING_AGENTLESS_DEFAULT = false;
-
-  public static final String PROFILING_DISABLED_EVENTS = "profiling.disabled.events";
-  public static final String PROFILING_ENABLED_EVENTS = "profiling.enabled.events";
-
-  public static final String PROFILING_DEBUG_DUMP_PATH = "profiling.debug.dump_path";
-  public static final String PROFILING_DEBUG_JFR_DISABLED = "profiling.debug.jfr.disabled";
-
-  // spotless:off
+    public static final String PROFILING_DATADOG_PROFILER_NATIVEMEM_ENABLED =
+            "profiling.experimental.ddprof.nativemem.enabled";
+    public static final boolean PROFILING_DATADOG_PROFILER_NATIVEMEM_ENABLED_DEFAULT = false;
+    public static final String PROFILING_DATADOG_PROFILER_NATIVEMEM_INTERVAL =
+            "profiling.experimental.ddprof.nativemem.interval";
+    public static final int PROFILING_DATADOG_PROFILER_NATIVEMEM_INTERVAL_DEFAULT = 512 * 1024;
+
+    public static final String PROFILING_DATADOG_PROFILER_NATIVESOCKET_ENABLED =
+            "profiling.experimental.ddprof.nativesocket.enabled";
+    public static final boolean PROFILING_DATADOG_PROFILER_NATIVESOCKET_ENABLED_DEFAULT = false;
+    public static final String PROFILING_DATADOG_PROFILER_NATIVESOCKET_INTERVAL =
+            "profiling.experimental.ddprof.nativesocket.interval";
+
+    public static final String PROFILING_ENDPOINT_COLLECTION_ENABLED = "profiling.endpoint.collection.enabled";
+    public static final boolean PROFILING_ENDPOINT_COLLECTION_ENABLED_DEFAULT = true;
+
+    public static final String PROFILING_JFR_REPOSITORY_MAXSIZE = "profiling.jfr.repository.maxsize";
+    public static final int PROFILING_JFR_REPOSITORY_MAXSIZE_DEFAULT = 64 * 1024 * 1024; // 64MB default
+
+    public static final String PROFILING_UPLOAD_SUMMARY_ON_413 = "profiling.upload.summary-on-413";
+    public static final boolean PROFILING_UPLOAD_SUMMARY_ON_413_DEFAULT = false;
+
+    public static final String PROFILING_TEMP_DIR = "profiling.tempdir";
+    public static final String PROFILING_TEMP_DIR_DEFAULT = System.getProperty("java.io.tmpdir");
+
+    // Not intended for production use
+    public static final String PROFILING_AGENTLESS = "profiling.agentless";
+    public static final boolean PROFILING_AGENTLESS_DEFAULT = false;
+
+    public static final String PROFILING_DISABLED_EVENTS = "profiling.disabled.events";
+    public static final String PROFILING_ENABLED_EVENTS = "profiling.enabled.events";
+
+    public static final String PROFILING_DEBUG_DUMP_PATH = "profiling.debug.dump_path";
+    public static final String PROFILING_DEBUG_JFR_DISABLED = "profiling.debug.jfr.disabled";
+
+    // spotless:off
   /**
    * Configuration for profile upload compression.<br><br> Supported values are:
    * <ul>
@@ -229,63 +210,58 @@ public final class ProfilingConfig {
    * </ul>
    */
   // spotless:on
-  public static final String PROFILING_DEBUG_UPLOAD_COMPRESSION =
-      "profiling.debug.upload.compression";
+    public static final String PROFILING_DEBUG_UPLOAD_COMPRESSION = "profiling.debug.upload.compression";
 
-  public static final String PROFILING_DEBUG_UPLOAD_COMPRESSION_DEFAULT = "zstd";
+    public static final String PROFILING_DEBUG_UPLOAD_COMPRESSION_DEFAULT = "zstd";
 
-  public static final String PROFILING_CONTEXT_ATTRIBUTES = "profiling.context.attributes";
+    public static final String PROFILING_CONTEXT_ATTRIBUTES = "profiling.context.attributes";
 
-  public static final String PROFILING_CONTEXT_ATTRIBUTES_SPAN_NAME_ENABLED =
-      "profiling.context.attributes.span.name.enabled";
+    public static final String PROFILING_CONTEXT_ATTRIBUTES_SPAN_NAME_ENABLED =
+            "profiling.context.attributes.span.name.enabled";
 
-  public static final String PROFILING_CONTEXT_ATTRIBUTES_RESOURCE_NAME_ENABLED =
-      "profiling.context.attributes.resource.name.enabled";
+    public static final String PROFILING_CONTEXT_ATTRIBUTES_RESOURCE_NAME_ENABLED =
+            "profiling.context.attributes.resource.name.enabled";
 
-  public static final String PROFILING_QUEUEING_TIME_ENABLED = "profiling.queueing.time.enabled";
+    public static final String PROFILING_QUEUEING_TIME_ENABLED = "profiling.queueing.time.enabled";
 
-  public static final boolean PROFILING_QUEUEING_TIME_ENABLED_DEFAULT = true;
+    public static final boolean PROFILING_QUEUEING_TIME_ENABLED_DEFAULT = true;
 
-  public static final String PROFILING_SMAP_COLLECTION_ENABLED =
-      "profiling.smap.collection.enabled";
+    public static final String PROFILING_SMAP_COLLECTION_ENABLED = "profiling.smap.collection.enabled";
 
-  public static final boolean PROFILING_SMAP_COLLECTION_ENABLED_DEFAULT = false;
+    public static final boolean PROFILING_SMAP_COLLECTION_ENABLED_DEFAULT = false;
 
-  public static final String PROFILING_SMAP_AGGREGATION_ENABLED =
-      "profiling.smap.aggregation.enabled";
+    public static final String PROFILING_SMAP_AGGREGATION_ENABLED = "profiling.smap.aggregation.enabled";
 
-  public static final boolean PROFILING_SMAP_AGGREGATION_ENABLED_DEFAULT = false;
+    public static final boolean PROFILING_SMAP_AGGREGATION_ENABLED_DEFAULT = false;
 
-  public static final String PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS =
-      "profiling.queueing.time.threshold.millis";
+    public static final String PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS = "profiling.queueing.time.threshold.millis";
 
-  public static final long PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS_DEFAULT = 50;
+    public static final long PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS_DEFAULT = 50;
 
-  public static final String PROFILING_ULTRA_MINIMAL = "profiling.ultra.minimal";
+    public static final String PROFILING_ULTRA_MINIMAL = "profiling.ultra.minimal";
 
-  public static final String PROFILING_HEAP_HISTOGRAM_ENABLED = "profiling.heap.histogram.enabled";
-  public static final boolean PROFILING_HEAP_HISTOGRAM_ENABLED_DEFAULT = false;
+    public static final String PROFILING_HEAP_HISTOGRAM_ENABLED = "profiling.heap.histogram.enabled";
+    public static final boolean PROFILING_HEAP_HISTOGRAM_ENABLED_DEFAULT = false;
 
-  public static final String PROFILING_HEAP_HISTOGRAM_MODE = "profiling.heap.histogram.mode";
-  public static final String PROFILING_HEAP_HISTOGRAM_MODE_DEFAULT = "aftergc";
+    public static final String PROFILING_HEAP_HISTOGRAM_MODE = "profiling.heap.histogram.mode";
+    public static final String PROFILING_HEAP_HISTOGRAM_MODE_DEFAULT = "aftergc";
 
-  public static final String PROFILING_HEAP_TRACK_GENERATIONS = "profiling.heap.track.generations";
-  public static final boolean PROFILING_HEAP_TRACK_GENERATIONS_DEFAULT = false;
+    public static final String PROFILING_HEAP_TRACK_GENERATIONS = "profiling.heap.track.generations";
+    public static final boolean PROFILING_HEAP_TRACK_GENERATIONS_DEFAULT = false;
 
-  public static final String PROFILING_TIMELINE_EVENTS_ENABLED =
-      "profiling.timeline.events.enabled";
-  public static final boolean PROFILING_TIMELINE_EVENTS_ENABLED_DEFAULT = true;
+    public static final String PROFILING_TIMELINE_EVENTS_ENABLED = "profiling.timeline.events.enabled";
+    public static final boolean PROFILING_TIMELINE_EVENTS_ENABLED_DEFAULT = true;
 
-  public static final String PROFILING_DETAILED_DEBUG_LOGGING = "profiling.detailed.debug.logging";
-  public static final boolean PROFILING_DETAILED_DEBUG_LOGGING_DEFAULT = false;
+    public static final String PROFILING_DETAILED_DEBUG_LOGGING = "profiling.detailed.debug.logging";
+    public static final boolean PROFILING_DETAILED_DEBUG_LOGGING_DEFAULT = false;
 
-  public static final String PROFILING_SCRUB_ENABLED = "profiling.scrub.enabled";
-  public static final boolean PROFILING_SCRUB_ENABLED_DEFAULT = false;
+    public static final String PROFILING_SCRUB_ENABLED = "profiling.scrub.enabled";
+    public static final boolean PROFILING_SCRUB_ENABLED_DEFAULT = false;
 
-  public static final String PROFILING_SCRUB_FAIL_OPEN = "profiling.scrub.fail-open";
-  public static final boolean PROFILING_SCRUB_FAIL_OPEN_DEFAULT = false;
+    public static final String PROFILING_SCRUB_FAIL_OPEN = "profiling.scrub.fail-open";
+    public static final boolean PROFILING_SCRUB_FAIL_OPEN_DEFAULT = false;
 
-  public static final String PROFILING_SCRUB_EXCLUDE_EVENTS = "profiling.scrub.exclude-events";
+    public static final String PROFILING_SCRUB_EXCLUDE_EVENTS = "profiling.scrub.exclude-events";
 
-  private ProfilingConfig() {}
+    private ProfilingConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/RemoteConfigConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/RemoteConfigConfig.java
index 578a556bf9e..fd21abf7058 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/RemoteConfigConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/RemoteConfigConfig.java
@@ -1,22 +1,20 @@
 package datadog.trace.api.config;
 
 public class RemoteConfigConfig {
-  /** Replaced by {@link #REMOTE_CONFIGURATION_ENABLED} according the RFC. */
-  @Deprecated public static final String REMOTE_CONFIG_ENABLED = "remote_config.enabled";
+    /** Replaced by {@link #REMOTE_CONFIGURATION_ENABLED} according the RFC. */
+    @Deprecated
+    public static final String REMOTE_CONFIG_ENABLED = "remote_config.enabled";
 
-  public static final String REMOTE_CONFIGURATION_ENABLED = "remote_configuration.enabled";
-  public static final String REMOTE_CONFIG_INTEGRITY_CHECK_ENABLED =
-      "remote_config.integrity_check.enabled";
-  public static final String REMOTE_CONFIG_URL = "remote_config.url";
-  public static final String REMOTE_CONFIG_POLL_INTERVAL_SECONDS =
-      "remote_config.poll_interval.seconds";
-  public static final String REMOTE_CONFIG_MAX_PAYLOAD_SIZE =
-      "remote_config.max.payload.size"; // kb
-  // these two are specified in RCTE1
-  public static final String REMOTE_CONFIG_TARGETS_KEY_ID = "rc.targets.key.id";
-  public static final String REMOTE_CONFIG_TARGETS_KEY = "rc.targets.key";
+    public static final String REMOTE_CONFIGURATION_ENABLED = "remote_configuration.enabled";
+    public static final String REMOTE_CONFIG_INTEGRITY_CHECK_ENABLED = "remote_config.integrity_check.enabled";
+    public static final String REMOTE_CONFIG_URL = "remote_config.url";
+    public static final String REMOTE_CONFIG_POLL_INTERVAL_SECONDS = "remote_config.poll_interval.seconds";
+    public static final String REMOTE_CONFIG_MAX_PAYLOAD_SIZE = "remote_config.max.payload.size"; // kb
+    // these two are specified in RCTE1
+    public static final String REMOTE_CONFIG_TARGETS_KEY_ID = "rc.targets.key.id";
+    public static final String REMOTE_CONFIG_TARGETS_KEY = "rc.targets.key";
 
-  public static final String REMOTE_CONFIG_MAX_EXTRA_SERVICES = "remote_config.max_extra_services";
+    public static final String REMOTE_CONFIG_MAX_EXTRA_SERVICES = "remote_config.max_extra_services";
 
-  private RemoteConfigConfig() {}
+    private RemoteConfigConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/RumConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/RumConfig.java
index b8cf85e017c..ce7d7df06ce 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/RumConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/RumConfig.java
@@ -1,21 +1,21 @@
 package datadog.trace.api.config;
 
 public final class RumConfig {
-  public static final String RUM_ENABLED = "rum.enabled";
-  public static final String RUM_APPLICATION_ID = "rum.application.id";
-  public static final String RUM_CLIENT_TOKEN = "rum.client.token";
-  public static final String RUM_SITE = "rum.site";
-  public static final String RUM_SERVICE = "rum.service";
-  public static final String RUM_ENVIRONMENT = "rum.environment";
-  public static final String RUM_MAJOR_VERSION = "rum.major.version";
-  public static final String RUM_VERSION = "rum.version";
-  public static final String RUM_TRACK_USER_INTERACTION = "rum.track.user.interaction";
-  public static final String RUM_TRACK_RESOURCES = "rum.track.resources";
-  public static final String RUM_TRACK_LONG_TASKS = "rum.track.long.tasks";
-  public static final String RUM_DEFAULT_PRIVACY_LEVEL = "rum.default.privacy.level";
-  public static final String RUM_SESSION_SAMPLE_RATE = "rum.session.sample.rate";
-  public static final String RUM_SESSION_REPLAY_SAMPLE_RATE = "rum.session.replay.sample.rate";
-  public static final String RUM_REMOTE_CONFIGURATION_ID = "rum.remote.configuration.id";
+    public static final String RUM_ENABLED = "rum.enabled";
+    public static final String RUM_APPLICATION_ID = "rum.application.id";
+    public static final String RUM_CLIENT_TOKEN = "rum.client.token";
+    public static final String RUM_SITE = "rum.site";
+    public static final String RUM_SERVICE = "rum.service";
+    public static final String RUM_ENVIRONMENT = "rum.environment";
+    public static final String RUM_MAJOR_VERSION = "rum.major.version";
+    public static final String RUM_VERSION = "rum.version";
+    public static final String RUM_TRACK_USER_INTERACTION = "rum.track.user.interaction";
+    public static final String RUM_TRACK_RESOURCES = "rum.track.resources";
+    public static final String RUM_TRACK_LONG_TASKS = "rum.track.long.tasks";
+    public static final String RUM_DEFAULT_PRIVACY_LEVEL = "rum.default.privacy.level";
+    public static final String RUM_SESSION_SAMPLE_RATE = "rum.session.sample.rate";
+    public static final String RUM_SESSION_REPLAY_SAMPLE_RATE = "rum.session.replay.sample.rate";
+    public static final String RUM_REMOTE_CONFIGURATION_ID = "rum.remote.configuration.id";
 
-  private RumConfig() {}
+    private RumConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java
index 137e9805519..c10eb0b2f01 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java
@@ -9,209 +9,179 @@
  * @see TracerConfig for more tracer config options
  */
 public final class TraceInstrumentationConfig {
-  public static final String CODE_ORIGIN_FOR_SPANS_ENABLED = "code.origin.for.spans.enabled";
-  public static final String CODE_ORIGIN_FOR_SPANS_INTERFACE_SUPPORT =
-      "code.origin.for.spans.interface.support";
-  public static final String CODE_ORIGIN_MAX_USER_FRAMES = "code.origin.max.user.frames";
-  public static final String TRACE_ENABLED = "trace.enabled";
-  public static final String INTEGRATIONS_ENABLED = "integrations.enabled";
-  public static final String DETAILED_INSTRUMENTATION_ERRORS = "detailed.instrumentation.errors";
-
-  public static final String TRACE_EXTENSIONS_PATH = "trace.extensions.path";
-
-  public static final String INTEGRATION_SYNAPSE_LEGACY_OPERATION_NAME =
-      "integration.synapse.legacy-operation-name";
-  public static final String TRACE_ANNOTATIONS = "trace.annotations";
-  public static final String TRACE_ANNOTATION_ASYNC = "trace.annotation.async";
-  public static final String TRACE_EXECUTORS_ALL = "trace.executors.all";
-  public static final String TRACE_EXECUTORS = "trace.executors";
-  public static final String TRACE_METHODS = "trace.methods";
-  public static final String TRACE_NATIVE_METHODS = "trace.native.methods";
-  /*
-  format for measure.methods is the same as for trace.methods:
-  https://docs.datadoghq.com/tracing/trace_collection/custom_instrumentation/java/
-   */
-  public static final String MEASURE_METHODS = "measure.methods";
-  public static final String MEASURE_NATIVE_METHODS = "measure.native.methods";
-  public static final String TRACE_CLASSES_EXCLUDE = "trace.classes.exclude";
-  public static final String TRACE_CLASSES_EXCLUDE_FILE = "trace.classes.exclude.file";
-  public static final String TRACE_CLASSLOADERS_EXCLUDE = "trace.classloaders.exclude";
-  public static final String TRACE_CODESOURCES_EXCLUDE = "trace.codesources.exclude";
-  public static final String TRACE_CLASSLOADERS_DEFER = "trace.classloaders.defer";
-
-  public static final String EXPERIMENTAL_DEFER_INTEGRATIONS_UNTIL =
-      "experimental.defer.integrations.until";
-
-  public static final String TRACE_THREAD_POOL_EXECUTORS_EXCLUDE =
-      "trace.thread-pool-executors.exclude";
-
-  public static final String HTTP_SERVER_TAG_QUERY_STRING = "http.server.tag.query-string";
-  public static final String HTTP_SERVER_RAW_QUERY_STRING = "http.server.raw.query-string";
-  public static final String HTTP_SERVER_RAW_RESOURCE = "http.server.raw.resource";
-  public static final String HTTP_SERVER_DECODED_RESOURCE_PRESERVE_SPACES =
-      "http.server.decoded.resource.preserve-spaces";
-  public static final String HTTP_SERVER_ROUTE_BASED_NAMING = "http.server.route-based-naming";
-
-  // Use TRACE_HTTP_CLIENT_TAG_QUERY_STRING instead
-  @Deprecated
-  public static final String HTTP_CLIENT_TAG_QUERY_STRING = "http.client.tag.query-string";
-
-  public static final String TRACE_HTTP_CLIENT_TAG_QUERY_STRING =
-      "trace.http.client.tag.query-string";
-  public static final String HTTP_CLIENT_TAG_HEADERS = "http.client.tag.headers";
-  public static final String HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN = "trace.http.client.split-by-domain";
-  public static final String DB_CLIENT_HOST_SPLIT_BY_INSTANCE = "trace.db.client.split-by-instance";
-  public static final String DB_CLIENT_HOST_SPLIT_BY_INSTANCE_TYPE_SUFFIX =
-      "trace.db.client.split-by-instance.type.suffix";
-  public static final String DB_CLIENT_HOST_SPLIT_BY_HOST = "trace.db.client.split-by-host";
-
-  public static final String DB_METADATA_FETCHING_ON_QUERY = "trace.db.metadata.fetching.on.query";
-  public static final String DB_METADATA_FETCHING_ON_CONNECT =
-      "trace.db.metadata.fetching.on.connect";
-
-  public static final String JDBC_PREPARED_STATEMENT_CLASS_NAME =
-      "trace.jdbc.prepared.statement.class.name";
-
-  public static final String DB_DBM_INJECT_SQL_BASEHASH = "dbm.inject.sql.basehash";
-  public static final String DB_DBM_PROPAGATION_MODE_MODE = "dbm.propagation.mode";
-  public static final String DB_DBM_PROPAGATION_ORACLE_ACTION_ONLY_ENABLED =
-      "dbm.propagation.oracle.action-only.enabled";
-  public static final String DB_DBM_TRACE_PREPARED_STATEMENTS = "dbm.trace_prepared_statements";
-  public static final String DB_DBM_ALWAYS_APPEND_SQL_COMMENT = "dbm.always_append_sql_comment";
-
-  public static final String JDBC_CONNECTION_CLASS_NAME = "trace.jdbc.connection.class.name";
-
-  public static final String JDBC_POOL_WAITING_ENABLED =
-      "trace.experimental.jdbc.pool.waiting.enabled";
-
-  public static final String AKKA_FORK_JOIN_TASK_NAME = "trace.akka.fork.join.task.name";
-  public static final String AKKA_FORK_JOIN_EXECUTOR_TASK_NAME =
-      "trace.akka.fork.join.executor.task.name";
-  public static final String AKKA_FORK_JOIN_POOL_NAME = "trace.akka.fork.join.pool.name";
-
-  public static final String EXPERIMENTATAL_JEE_SPLIT_BY_DEPLOYMENT =
-      "trace.experimental.jee.split-by-deployment";
-
-  public static final String HTTP_URL_CONNECTION_CLASS_NAME =
-      "trace.http.url.connection.class.name";
-
-  public static final String AXIS_TRANSPORT_CLASS_NAME = "trace.axis.transport.class.name";
-
-  public static final String RUNTIME_CONTEXT_FIELD_INJECTION =
-      "trace.runtime.context.field.injection";
-  public static final String SERIALVERSIONUID_FIELD_INJECTION =
-      "trace.serialversionuid.field.injection";
-  public static final String RUNTIME_CONTEXT_MAP_PER_STORE = "trace.runtime.context.map-per-store";
-
-  public static final String LOGS_INJECTION_ENABLED = "logs.injection.enabled";
-  public static final String LOGS_INJECTION = "logs.injection";
-
-  public static final String TRACE_128_BIT_TRACEID_LOGGING_ENABLED =
-      "trace.128.bit.traceid.logging.enabled";
-
-  public static final String KAFKA_CLIENT_PROPAGATION_DISABLED_TOPICS =
-      "kafka.client.propagation.disabled.topics";
-  public static final String KAFKA_CLIENT_BASE64_DECODING_ENABLED =
-      "kafka.client.base64.decoding.enabled";
-
-  public static final String JMS_PROPAGATION_DISABLED_TOPICS = "jms.propagation.disabled.topics";
-  public static final String JMS_PROPAGATION_DISABLED_QUEUES = "jms.propagation.disabled.queues";
-  public static final String JMS_UNACKNOWLEDGED_MAX_AGE = "jms.unacknowledged.max.age";
-
-  public static final String RABBIT_PROPAGATION_DISABLED_QUEUES =
-      "rabbit.propagation.disabled.queues";
-  public static final String RABBIT_PROPAGATION_DISABLED_EXCHANGES =
-      "rabbit.propagation.disabled.exchanges";
-
-  public static final String RABBIT_INCLUDE_ROUTINGKEY_IN_RESOURCE =
-      "rabbit.include.routingkey.in.resource";
-
-  public static final String MESSAGE_BROKER_SPLIT_BY_DESTINATION =
-      "message.broker.split-by-destination";
+    public static final String CODE_ORIGIN_FOR_SPANS_ENABLED = "code.origin.for.spans.enabled";
+    public static final String CODE_ORIGIN_FOR_SPANS_INTERFACE_SUPPORT = "code.origin.for.spans.interface.support";
+    public static final String CODE_ORIGIN_MAX_USER_FRAMES = "code.origin.max.user.frames";
+    public static final String TRACE_ENABLED = "trace.enabled";
+    public static final String INTEGRATIONS_ENABLED = "integrations.enabled";
+    public static final String DETAILED_INSTRUMENTATION_ERRORS = "detailed.instrumentation.errors";
 
-  public static final String GRPC_IGNORED_INBOUND_METHODS = "trace.grpc.ignored.inbound.methods";
-  public static final String GRPC_IGNORED_OUTBOUND_METHODS = "trace.grpc.ignored.outbound.methods";
+    public static final String TRACE_EXTENSIONS_PATH = "trace.extensions.path";
+
+    public static final String INTEGRATION_SYNAPSE_LEGACY_OPERATION_NAME = "integration.synapse.legacy-operation-name";
+    public static final String TRACE_ANNOTATIONS = "trace.annotations";
+    public static final String TRACE_ANNOTATION_ASYNC = "trace.annotation.async";
+    public static final String TRACE_EXECUTORS_ALL = "trace.executors.all";
+    public static final String TRACE_EXECUTORS = "trace.executors";
+    public static final String TRACE_METHODS = "trace.methods";
+    public static final String TRACE_NATIVE_METHODS = "trace.native.methods";
+    /*
+    format for measure.methods is the same as for trace.methods:
+    https://docs.datadoghq.com/tracing/trace_collection/custom_instrumentation/java/
+     */
+    public static final String MEASURE_METHODS = "measure.methods";
+    public static final String MEASURE_NATIVE_METHODS = "measure.native.methods";
+    public static final String TRACE_CLASSES_EXCLUDE = "trace.classes.exclude";
+    public static final String TRACE_CLASSES_EXCLUDE_FILE = "trace.classes.exclude.file";
+    public static final String TRACE_CLASSLOADERS_EXCLUDE = "trace.classloaders.exclude";
+    public static final String TRACE_CODESOURCES_EXCLUDE = "trace.codesources.exclude";
+    public static final String TRACE_CLASSLOADERS_DEFER = "trace.classloaders.defer";
 
-  public static final String GOOGLE_PUBSUB_IGNORED_GRPC_METHODS =
-      "trace.google-pubsub.ignored.grpc.methods";
-  public static final String GRPC_SERVER_TRIM_PACKAGE_RESOURCE =
-      "trace.grpc.server.trim-package-resource";
-  public static final String GRPC_SERVER_ERROR_STATUSES = "grpc.server.error.statuses";
-  public static final String GRPC_CLIENT_ERROR_STATUSES = "grpc.client.error.statuses";
-  public static final String HYSTRIX_TAGS_ENABLED = "hystrix.tags.enabled";
-  public static final String HYSTRIX_MEASURED_ENABLED = "hystrix.measured.enabled";
+    public static final String EXPERIMENTAL_DEFER_INTEGRATIONS_UNTIL = "experimental.defer.integrations.until";
 
-  public static final String RESILIENCE4J_MEASURED_ENABLED = "resilience4j.measured.enabled";
-  public static final String RESILIENCE4J_TAG_METRICS_ENABLED = "resilience4j.tag-metrics.enabled";
+    public static final String TRACE_THREAD_POOL_EXECUTORS_EXCLUDE = "trace.thread-pool-executors.exclude";
 
-  public static final String IGNITE_CACHE_INCLUDE_KEYS = "ignite.cache.include_keys";
+    public static final String HTTP_SERVER_TAG_QUERY_STRING = "http.server.tag.query-string";
+    public static final String HTTP_SERVER_RAW_QUERY_STRING = "http.server.raw.query-string";
+    public static final String HTTP_SERVER_RAW_RESOURCE = "http.server.raw.resource";
+    public static final String HTTP_SERVER_DECODED_RESOURCE_PRESERVE_SPACES =
+            "http.server.decoded.resource.preserve-spaces";
+    public static final String HTTP_SERVER_ROUTE_BASED_NAMING = "http.server.route-based-naming";
 
-  public static final String OBFUSCATION_QUERY_STRING_REGEXP =
-      "trace.obfuscation.query.string.regexp";
+    // Use TRACE_HTTP_CLIENT_TAG_QUERY_STRING instead
+    @Deprecated
+    public static final String HTTP_CLIENT_TAG_QUERY_STRING = "http.client.tag.query-string";
 
-  public static final String PLAY_REPORT_HTTP_STATUS = "trace.play.report-http-status";
+    public static final String TRACE_HTTP_CLIENT_TAG_QUERY_STRING = "trace.http.client.tag.query-string";
+    public static final String HTTP_CLIENT_TAG_HEADERS = "http.client.tag.headers";
+    public static final String HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN = "trace.http.client.split-by-domain";
+    public static final String DB_CLIENT_HOST_SPLIT_BY_INSTANCE = "trace.db.client.split-by-instance";
+    public static final String DB_CLIENT_HOST_SPLIT_BY_INSTANCE_TYPE_SUFFIX =
+            "trace.db.client.split-by-instance.type.suffix";
+    public static final String DB_CLIENT_HOST_SPLIT_BY_HOST = "trace.db.client.split-by-host";
 
-  public static final String SERVLET_PRINCIPAL_ENABLED = "trace.servlet.principal.enabled";
-  public static final String SERVLET_ASYNC_TIMEOUT_ERROR = "trace.servlet.async-timeout.error";
+    public static final String DB_METADATA_FETCHING_ON_QUERY = "trace.db.metadata.fetching.on.query";
+    public static final String DB_METADATA_FETCHING_ON_CONNECT = "trace.db.metadata.fetching.on.connect";
 
-  public static final String SERVLET_ROOT_CONTEXT_SERVICE_NAME =
-      "trace.servlet.root-context.service.name";
+    public static final String JDBC_PREPARED_STATEMENT_CLASS_NAME = "trace.jdbc.prepared.statement.class.name";
 
-  public static final String SPRING_DATA_REPOSITORY_INTERFACE_RESOURCE_NAME =
-      "spring-data.repository.interface.resource-name";
+    public static final String DB_DBM_INJECT_SQL_BASEHASH = "dbm.inject.sql.basehash";
+    public static final String DB_DBM_PROPAGATION_MODE_MODE = "dbm.propagation.mode";
+    public static final String DB_DBM_PROPAGATION_ORACLE_ACTION_ONLY_ENABLED =
+            "dbm.propagation.oracle.action-only.enabled";
+    public static final String DB_DBM_TRACE_PREPARED_STATEMENTS = "dbm.trace_prepared_statements";
+    public static final String DB_DBM_ALWAYS_APPEND_SQL_COMMENT = "dbm.always_append_sql_comment";
 
-  public static final String SPRING_SCHEDULING_MEASURED_ENABLED =
-      "spring-scheduling.measured.enabled";
+    public static final String JDBC_CONNECTION_CLASS_NAME = "trace.jdbc.connection.class.name";
 
-  public static final String INSTRUMENTATION_CONFIG_ID = "instrumentation_config_id";
+    public static final String JDBC_POOL_WAITING_ENABLED = "trace.experimental.jdbc.pool.waiting.enabled";
 
-  public static final String RESOLVER_CACHE_CONFIG = "resolver.cache.config";
-  public static final String RESOLVER_CACHE_DIR = "resolver.cache.dir";
-  public static final String RESOLVER_SIMPLE_METHOD_GRAPH = "resolver.simple.method.graph";
-  public static final String RESOLVER_USE_LOADCLASS = "resolver.use.loadclass";
-  public static final String RESOLVER_USE_URL_CACHES = "resolver.use.url.caches";
-  public static final String RESOLVER_RESET_INTERVAL = "resolver.reset.interval";
-  public static final String RESOLVER_NAMES_ARE_UNIQUE = "resolver.names.are.unique";
+    public static final String AKKA_FORK_JOIN_TASK_NAME = "trace.akka.fork.join.task.name";
+    public static final String AKKA_FORK_JOIN_EXECUTOR_TASK_NAME = "trace.akka.fork.join.executor.task.name";
+    public static final String AKKA_FORK_JOIN_POOL_NAME = "trace.akka.fork.join.pool.name";
 
-  public static final String UNSAFE_CLASS_INJECTION = "unsafe.class.injection";
-  public static final String VISITOR_CLASS_PARSING = "visitor.class.parsing";
+    public static final String EXPERIMENTATAL_JEE_SPLIT_BY_DEPLOYMENT = "trace.experimental.jee.split-by-deployment";
 
-  public static final String CASSANDRA_KEYSPACE_STATEMENT_EXTRACTION_ENABLED =
-      "trace.cassandra.keyspace.statement.extraction.enabled";
-  public static final String COUCHBASE_INTERNAL_SPANS_ENABLED =
-      "trace.couchbase.internal-spans.enabled";
-  public static final String ELASTICSEARCH_BODY_ENABLED = "trace.elasticsearch.body.enabled";
-  public static final String ELASTICSEARCH_PARAMS_ENABLED = "trace.elasticsearch.params.enabled";
-  public static final String ELASTICSEARCH_BODY_AND_PARAMS_ENABLED =
-      "trace.elasticsearch.body-and-params.enabled";
+    public static final String HTTP_URL_CONNECTION_CLASS_NAME = "trace.http.url.connection.class.name";
 
-  public static final String SPARK_TASK_HISTOGRAM_ENABLED = "spark.task-histogram.enabled";
-  public static final String SPARK_APP_NAME_AS_SERVICE = "spark.app-name-as-service";
+    public static final String AXIS_TRANSPORT_CLASS_NAME = "trace.axis.transport.class.name";
 
-  public static final String TRACE_WEBSOCKET_MESSAGES_ENABLED = "trace.websocket.messages.enabled";
-  public static final String TRACE_WEBSOCKET_MESSAGES_INHERIT_SAMPLING =
-      "trace.websocket.messages.inherit.sampling";
-  public static final String TRACE_WEBSOCKET_MESSAGES_SEPARATE_TRACES =
-      "trace.websocket.messages.separate.traces";
-  public static final String TRACE_WEBSOCKET_TAG_SESSION_ID = "trace.websocket.tag.session-id";
+    public static final String RUNTIME_CONTEXT_FIELD_INJECTION = "trace.runtime.context.field.injection";
+    public static final String SERIALVERSIONUID_FIELD_INJECTION = "trace.serialversionuid.field.injection";
+    public static final String RUNTIME_CONTEXT_MAP_PER_STORE = "trace.runtime.context.map-per-store";
 
-  public static final String TRACE_PEKKO_SCHEDULER_ENABLED = "trace.pekko.scheduler.enabled";
+    public static final String LOGS_INJECTION_ENABLED = "logs.injection.enabled";
+    public static final String LOGS_INJECTION = "logs.injection";
 
-  public static final String JAX_RS_EXCEPTION_AS_ERROR_ENABLED =
-      "trace.jax-rs.exception-as-error.enabled";
-  public static final String JAX_RS_ADDITIONAL_ANNOTATIONS = "trace.jax-rs.additional.annotations";
+    public static final String TRACE_128_BIT_TRACEID_LOGGING_ENABLED = "trace.128.bit.traceid.logging.enabled";
 
-  /** If set, the instrumentation will set its resource name on the local root too. */
-  public static final String AXIS_PROMOTE_RESOURCE_NAME = "trace.axis.promote.resource-name";
+    public static final String KAFKA_CLIENT_PROPAGATION_DISABLED_TOPICS = "kafka.client.propagation.disabled.topics";
+    public static final String KAFKA_CLIENT_BASE64_DECODING_ENABLED = "kafka.client.base64.decoding.enabled";
 
-  public static final String SQS_BODY_PROPAGATION_ENABLED = "trace.sqs.body.propagation.enabled";
+    public static final String JMS_PROPAGATION_DISABLED_TOPICS = "jms.propagation.disabled.topics";
+    public static final String JMS_PROPAGATION_DISABLED_QUEUES = "jms.propagation.disabled.queues";
+    public static final String JMS_UNACKNOWLEDGED_MAX_AGE = "jms.unacknowledged.max.age";
 
-  public static final String TRACE_RESOURCE_RENAMING_ENABLED = "trace.resource.renaming.enabled";
+    public static final String RABBIT_PROPAGATION_DISABLED_QUEUES = "rabbit.propagation.disabled.queues";
+    public static final String RABBIT_PROPAGATION_DISABLED_EXCHANGES = "rabbit.propagation.disabled.exchanges";
 
-  public static final String TRACE_RESOURCE_RENAMING_ALWAYS_SIMPLIFIED_ENDPOINT =
-      "trace.resource.renaming.always.simplified.endpoint";
+    public static final String RABBIT_INCLUDE_ROUTINGKEY_IN_RESOURCE = "rabbit.include.routingkey.in.resource";
 
-  public static final String LEGACY_CONTEXT_MANAGER_ENABLED = "legacy.context-manager.enabled";
+    public static final String MESSAGE_BROKER_SPLIT_BY_DESTINATION = "message.broker.split-by-destination";
 
-  private TraceInstrumentationConfig() {}
+    public static final String GRPC_IGNORED_INBOUND_METHODS = "trace.grpc.ignored.inbound.methods";
+    public static final String GRPC_IGNORED_OUTBOUND_METHODS = "trace.grpc.ignored.outbound.methods";
+
+    public static final String GOOGLE_PUBSUB_IGNORED_GRPC_METHODS = "trace.google-pubsub.ignored.grpc.methods";
+    public static final String GRPC_SERVER_TRIM_PACKAGE_RESOURCE = "trace.grpc.server.trim-package-resource";
+    public static final String GRPC_SERVER_ERROR_STATUSES = "grpc.server.error.statuses";
+    public static final String GRPC_CLIENT_ERROR_STATUSES = "grpc.client.error.statuses";
+    public static final String HYSTRIX_TAGS_ENABLED = "hystrix.tags.enabled";
+    public static final String HYSTRIX_MEASURED_ENABLED = "hystrix.measured.enabled";
+
+    public static final String RESILIENCE4J_MEASURED_ENABLED = "resilience4j.measured.enabled";
+    public static final String RESILIENCE4J_TAG_METRICS_ENABLED = "resilience4j.tag-metrics.enabled";
+
+    public static final String IGNITE_CACHE_INCLUDE_KEYS = "ignite.cache.include_keys";
+
+    public static final String OBFUSCATION_QUERY_STRING_REGEXP = "trace.obfuscation.query.string.regexp";
+
+    public static final String PLAY_REPORT_HTTP_STATUS = "trace.play.report-http-status";
+
+    public static final String SERVLET_PRINCIPAL_ENABLED = "trace.servlet.principal.enabled";
+    public static final String SERVLET_ASYNC_TIMEOUT_ERROR = "trace.servlet.async-timeout.error";
+
+    public static final String SERVLET_ROOT_CONTEXT_SERVICE_NAME = "trace.servlet.root-context.service.name";
+
+    public static final String SPRING_DATA_REPOSITORY_INTERFACE_RESOURCE_NAME =
+            "spring-data.repository.interface.resource-name";
+
+    public static final String SPRING_SCHEDULING_MEASURED_ENABLED = "spring-scheduling.measured.enabled";
+
+    public static final String INSTRUMENTATION_CONFIG_ID = "instrumentation_config_id";
+
+    public static final String RESOLVER_CACHE_CONFIG = "resolver.cache.config";
+    public static final String RESOLVER_CACHE_DIR = "resolver.cache.dir";
+    public static final String RESOLVER_SIMPLE_METHOD_GRAPH = "resolver.simple.method.graph";
+    public static final String RESOLVER_USE_LOADCLASS = "resolver.use.loadclass";
+    public static final String RESOLVER_USE_URL_CACHES = "resolver.use.url.caches";
+    public static final String RESOLVER_RESET_INTERVAL = "resolver.reset.interval";
+    public static final String RESOLVER_NAMES_ARE_UNIQUE = "resolver.names.are.unique";
+
+    public static final String UNSAFE_CLASS_INJECTION = "unsafe.class.injection";
+    public static final String VISITOR_CLASS_PARSING = "visitor.class.parsing";
+
+    public static final String CASSANDRA_KEYSPACE_STATEMENT_EXTRACTION_ENABLED =
+            "trace.cassandra.keyspace.statement.extraction.enabled";
+    public static final String COUCHBASE_INTERNAL_SPANS_ENABLED = "trace.couchbase.internal-spans.enabled";
+    public static final String ELASTICSEARCH_BODY_ENABLED = "trace.elasticsearch.body.enabled";
+    public static final String ELASTICSEARCH_PARAMS_ENABLED = "trace.elasticsearch.params.enabled";
+    public static final String ELASTICSEARCH_BODY_AND_PARAMS_ENABLED = "trace.elasticsearch.body-and-params.enabled";
+
+    public static final String SPARK_TASK_HISTOGRAM_ENABLED = "spark.task-histogram.enabled";
+    public static final String SPARK_APP_NAME_AS_SERVICE = "spark.app-name-as-service";
+
+    public static final String TRACE_WEBSOCKET_MESSAGES_ENABLED = "trace.websocket.messages.enabled";
+    public static final String TRACE_WEBSOCKET_MESSAGES_INHERIT_SAMPLING = "trace.websocket.messages.inherit.sampling";
+    public static final String TRACE_WEBSOCKET_MESSAGES_SEPARATE_TRACES = "trace.websocket.messages.separate.traces";
+    public static final String TRACE_WEBSOCKET_TAG_SESSION_ID = "trace.websocket.tag.session-id";
+
+    public static final String TRACE_PEKKO_SCHEDULER_ENABLED = "trace.pekko.scheduler.enabled";
+
+    public static final String JAX_RS_EXCEPTION_AS_ERROR_ENABLED = "trace.jax-rs.exception-as-error.enabled";
+    public static final String JAX_RS_ADDITIONAL_ANNOTATIONS = "trace.jax-rs.additional.annotations";
+
+    /** If set, the instrumentation will set its resource name on the local root too. */
+    public static final String AXIS_PROMOTE_RESOURCE_NAME = "trace.axis.promote.resource-name";
+
+    public static final String SQS_BODY_PROPAGATION_ENABLED = "trace.sqs.body.propagation.enabled";
+
+    public static final String TRACE_RESOURCE_RENAMING_ENABLED = "trace.resource.renaming.enabled";
+
+    public static final String TRACE_RESOURCE_RENAMING_ALWAYS_SIMPLIFIED_ENDPOINT =
+            "trace.resource.renaming.always.simplified.endpoint";
+
+    public static final String LEGACY_CONTEXT_MANAGER_ENABLED = "legacy.context-manager.enabled";
+
+    private TraceInstrumentationConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java
index d31137c3aef..bb2cc317750 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java
@@ -14,181 +14,170 @@
  * @see TraceInstrumentationConfig for instrumentation specific configuration
  */
 public final class TracerConfig {
-  public static final String ID_GENERATION_STRATEGY = "id.generation.strategy";
-  public static final String WRITER_TYPE = "writer.type";
-  public static final String WRITER_BAGGAGE_INJECT = "writer.baggage.inject";
-  public static final String WRITER_LINKS_INJECT = "writer.links.inject";
-
-  public static final String PRIORITIZATION_TYPE = "prioritization.type";
-  public static final String TRACE_AGENT_URL = "trace.agent.url";
-  public static final String AGENT_HOST = "agent.host";
-  public static final String TRACE_AGENT_PORT = "trace.agent.port";
-  public static final String AGENT_PORT_LEGACY = "agent.port";
-  public static final String AGENT_UNIX_DOMAIN_SOCKET = "trace.agent.unix.domain.socket";
-  public static final String AGENT_NAMED_PIPE = "trace.pipe.name";
-  public static final String AGENT_TIMEOUT = "trace.agent.timeout";
-  public static final String FORCE_CLEAR_TEXT_HTTP_FOR_INTAKE_CLIENT =
-      "force.clear.text.http.for.intake.client";
-  public static final String PROXY_NO_PROXY = "proxy.no_proxy";
-  public static final String TRACE_AGENT_PATH = "trace.agent.path";
-  public static final String TRACE_AGENT_ARGS = "trace.agent.args";
-  public static final String TEST_AGENT_SESSION_TOKEN = "test.agent.session.token";
-  public static final String PRIORITY_SAMPLING = "priority.sampling";
-  public static final String PRIORITY_SAMPLING_FORCE = "priority.sampling.force";
-  @Deprecated public static final String TRACE_RESOLVER_ENABLED = "trace.resolver.enabled";
-  public static final String SERVICE_MAPPING = "service.mapping";
-
-  public static final String TRACE_EXPERIMENTAL_FEATURES_ENABLED =
-      "trace.experimental.features.enabled";
-
-  public static final String SPAN_TAGS = "trace.span.tags";
-  public static final String TRACE_ANALYTICS_ENABLED = "trace.analytics.enabled";
-
-  @Deprecated
-  public static final String TRACE_SAMPLING_SERVICE_RULES = "trace.sampling.service.rules";
-
-  @Deprecated
-  public static final String TRACE_SAMPLING_OPERATION_RULES = "trace.sampling.operation.rules";
-
-  // JSON rules
-  public static final String TRACE_SAMPLING_RULES = "trace.sampling.rules";
-  public static final String SPAN_SAMPLING_RULES = "span.sampling.rules";
-  public static final String SPAN_SAMPLING_RULES_FILE = "span.sampling.rules.file";
-  // a global rate used for all services (that don’t have a dedicated rule defined).
-  public static final String TRACE_SAMPLE_RATE = "trace.sample.rate";
-  public static final String TRACE_RATE_LIMIT = "trace.rate.limit";
-  public static final String TRACE_REPORT_HOSTNAME = "trace.report-hostname";
-  public static final String TRACE_CLIENT_IP_HEADER = "trace.client-ip-header";
-  public static final String TRACE_CLIENT_IP_RESOLVER_ENABLED = "trace.client-ip.resolver.enabled";
-  public static final String TRACE_GIT_METADATA_ENABLED = "trace.git.metadata.enabled";
-  public static final String HEADER_TAGS = "trace.header.tags";
-  public static final String REQUEST_HEADER_TAGS_COMMA_ALLOWED =
-      "trace.request_header.tags.comma.allowed";
-  public static final String REQUEST_HEADER_TAGS = "trace.request_header.tags";
-  public static final String RESPONSE_HEADER_TAGS = "trace.response_header.tags";
-  public static final String BAGGAGE_MAPPING = "trace.header.baggage";
-  public static final String TRACE_HTTP_RESOURCE_REMOVE_TRAILING_SLASH =
-      "trace.http.resource.remove-trailing-slash";
-  public static final String TRACE_HTTP_SERVER_PATH_RESOURCE_NAME_MAPPING =
-      "trace.http.server.path-resource-name-mapping";
-  public static final String TRACE_HTTP_CLIENT_PATH_RESOURCE_NAME_MAPPING =
-      "trace.http.client.path-resource-name-mapping";
-  // Use TRACE_HTTP_SERVER_ERROR_STATUSES instead
-  @Deprecated public static final String HTTP_SERVER_ERROR_STATUSES = "http.server.error.statuses";
-  public static final String TRACE_HTTP_SERVER_ERROR_STATUSES = "trace.http.server.error.statuses";
-  // Use TRACE_HTTP_CLIENT_ERROR_STATUSES instead
-  @Deprecated public static final String HTTP_CLIENT_ERROR_STATUSES = "http.client.error.statuses";
-  public static final String TRACE_HTTP_CLIENT_ERROR_STATUSES = "trace.http.client.error.statuses";
-
-  public static final String SPLIT_BY_TAGS = "trace.split-by-tags";
-  // trace latency interceptor value should be in ms
-  public static final String TRACE_KEEP_LATENCY_THRESHOLD_MS =
-      "trace.experimental.keep.latency.threshold.ms";
-  public static final String SCOPE_DEPTH_LIMIT = "trace.scope.depth.limit";
-  public static final String SCOPE_STRICT_MODE = "trace.scope.strict.mode";
-  public static final String SCOPE_ITERATION_KEEP_ALIVE = "trace.scope.iteration.keep.alive";
-  public static final String PARTIAL_FLUSH_ENABLED = "trace.partial.flush.enabled";
-  public static final String PARTIAL_FLUSH_MIN_SPANS = "trace.partial.flush.min.spans";
-  public static final String TRACE_STRICT_WRITES_ENABLED = "trace.strict.writes.enabled";
-  public static final String PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED =
-      "propagation.extract.log_header_names.enabled";
-  public static final String PROPAGATION_STYLE_EXTRACT = "propagation.style.extract";
-  public static final String PROPAGATION_STYLE_INJECT = "propagation.style.inject";
-
-  public static final String TRACE_PROPAGATION_STYLE = "trace.propagation.style";
-  public static final String TRACE_PROPAGATION_STYLE_EXTRACT = "trace.propagation.style.extract";
-  public static final String TRACE_PROPAGATION_STYLE_INJECT = "trace.propagation.style.inject";
-  public static final String TRACE_PROPAGATION_BEHAVIOR_EXTRACT =
-      "trace.propagation.behavior.extract";
-  public static final String TRACE_PROPAGATION_EXTRACT_FIRST = "trace.propagation.extract.first";
-  public static final String TRACE_BAGGAGE_MAX_ITEMS = "trace.baggage.max.items";
-  public static final String TRACE_BAGGAGE_MAX_BYTES = "trace.baggage.max.bytes";
-  public static final String TRACE_BAGGAGE_TAG_KEYS = "trace.baggage.tag.keys";
-
-  /**
-   * When enabled, explicit per-span tags set via the span builder take precedence over
-   * tracer-injected tags (inbound header tags, root-span tags, contextual tags) by being applied
-   * last. Default off, preserving the historical ordering where those could override builder tags.
-   */
-  public static final String TRACE_BUILDER_TAGS_PRECEDENCE_ENABLED =
-      "trace.builder.tags.precedence.enabled";
-
-  public static final String TRACE_INFERRED_PROXY_SERVICES_ENABLED =
-      "trace.inferred.proxy.services.enabled";
-
-  public static final String ENABLE_TRACE_AGENT_V05 = "trace.agent.v0.5.enabled";
-
-  public static final String TRACE_AGENT_PROTOCOL_VERSION = "trace.agent.protocol.version";
-
-  public static final String CLIENT_IP_ENABLED = "trace.client-ip.enabled";
-
-  public static final String TRACE_128_BIT_TRACEID_GENERATION_ENABLED =
-      "trace.128.bit.traceid.generation.enabled";
-
-  public static final String SECURE_RANDOM = "trace.secure-random";
-
-  /**
-   * Disables validation that prevents invalid combinations of sampling priority and sampling
-   * mechanism on the set sampling priority calls. This check is enabled by default.
-   */
-  public static final String SAMPLING_MECHANISM_VALIDATION_DISABLED =
-      "trace.sampling.mechanism.validation.disabled";
-
-  /**
-   * Limit for x-datadog-tags. When exceeded it will stop propagating Datadog tags and will log a
-   * warning.
-   */
-  public static final String TRACE_X_DATADOG_TAGS_MAX_LENGTH = "trace.x-datadog-tags.max.length";
-
-  public static final String CLOCK_SYNC_PERIOD = "trace.clock.sync.period";
-
-  /**
-   * Opt-in (defaults to disabled). Resyncs the tracer's clock on every AWS Lambda invocation to fix
-   * drift left by an AWS Lambda SnapStart restore, which the periodic {@link #CLOCK_SYNC_PERIOD}
-   * check can miss. No-op outside an instrumented Lambda invocation.
-   */
-  public static final String TRACE_LAMBDA_SNAPSTART_CLOCK_RESYNC_ENABLED =
-      "trace.lambda.snapstart.clock.resync.enabled";
-
-  public static final String TRACE_SPAN_ATTRIBUTE_SCHEMA = "trace.span.attribute.schema";
-
-  public static final String TRACE_LONG_RUNNING_ENABLED = "trace.experimental.long-running.enabled";
-
-  public static final String TRACE_LONG_RUNNING_INITIAL_FLUSH_INTERVAL =
-      "trace.experimental.long-running.initial.flush.interval";
-  public static final String TRACE_LONG_RUNNING_FLUSH_INTERVAL =
-      "trace.experimental.long-running.flush.interval";
-
-  public static final String TRACE_PEER_HOSTNAME_ENABLED = "trace.peer.hostname.enabled";
-
-  public static final String TRACE_PEER_SERVICE_DEFAULTS_ENABLED =
-      "trace.peer.service.defaults.enabled";
-  public static final String TRACE_PEER_SERVICE_COMPONENT_OVERRIDES =
-      "trace.peer.service.component.overrides";
-  public static final String TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED =
-      "trace.remove.integration-service-names.enabled";
-
-  public static final String TRACE_PEER_SERVICE_MAPPING = "trace.peer.service.mapping";
-
-  public static final String TRACE_FLUSH_INTERVAL = "trace.flush.interval";
-
-  public static final String TRACE_POST_PROCESSING_TIMEOUT = "trace.post-processing.timeout";
-
-  public static final String TRACE_CLOUD_PAYLOAD_TAGGING_SERVICES =
-      "trace.cloud.payload.tagging.services";
-  public static final String TRACE_CLOUD_REQUEST_PAYLOAD_TAGGING =
-      "trace.cloud.request.payload.tagging";
-  public static final String TRACE_CLOUD_RESPONSE_PAYLOAD_TAGGING =
-      "trace.cloud.response.payload.tagging";
-  public static final String TRACE_CLOUD_PAYLOAD_TAGGING_MAX_DEPTH =
-      "trace.cloud.payload.tagging.max-depth";
-  public static final String TRACE_CLOUD_PAYLOAD_TAGGING_MAX_TAGS =
-      "trace.cloud.payload.tagging.max-tags";
-  public static final String TRACE_SERVICE_DISCOVERY_ENABLED = "trace.service.discovery.enabled";
-
-  public static final String TRACE_ORG_GUARD_ENABLED = "trace.org.guard.enabled";
-  public static final String TRACE_ORG_GUARD_STRICT = "trace.org.guard.strict";
-  public static final String TRACE_ORG_GUARD_TRUSTED_OPMS = "trace.org.guard.trusted.opms";
-
-  private TracerConfig() {}
+    public static final String ID_GENERATION_STRATEGY = "id.generation.strategy";
+    public static final String WRITER_TYPE = "writer.type";
+    public static final String WRITER_BAGGAGE_INJECT = "writer.baggage.inject";
+    public static final String WRITER_LINKS_INJECT = "writer.links.inject";
+
+    public static final String PRIORITIZATION_TYPE = "prioritization.type";
+    public static final String TRACE_AGENT_URL = "trace.agent.url";
+    public static final String AGENT_HOST = "agent.host";
+    public static final String TRACE_AGENT_PORT = "trace.agent.port";
+    public static final String AGENT_PORT_LEGACY = "agent.port";
+    public static final String AGENT_UNIX_DOMAIN_SOCKET = "trace.agent.unix.domain.socket";
+    public static final String AGENT_NAMED_PIPE = "trace.pipe.name";
+    public static final String AGENT_TIMEOUT = "trace.agent.timeout";
+    public static final String FORCE_CLEAR_TEXT_HTTP_FOR_INTAKE_CLIENT = "force.clear.text.http.for.intake.client";
+    public static final String PROXY_NO_PROXY = "proxy.no_proxy";
+    public static final String TRACE_AGENT_PATH = "trace.agent.path";
+    public static final String TRACE_AGENT_ARGS = "trace.agent.args";
+    public static final String TEST_AGENT_SESSION_TOKEN = "test.agent.session.token";
+    public static final String PRIORITY_SAMPLING = "priority.sampling";
+    public static final String PRIORITY_SAMPLING_FORCE = "priority.sampling.force";
+
+    @Deprecated
+    public static final String TRACE_RESOLVER_ENABLED = "trace.resolver.enabled";
+
+    public static final String SERVICE_MAPPING = "service.mapping";
+
+    public static final String TRACE_EXPERIMENTAL_FEATURES_ENABLED = "trace.experimental.features.enabled";
+
+    public static final String SPAN_TAGS = "trace.span.tags";
+    public static final String TRACE_ANALYTICS_ENABLED = "trace.analytics.enabled";
+
+    @Deprecated
+    public static final String TRACE_SAMPLING_SERVICE_RULES = "trace.sampling.service.rules";
+
+    @Deprecated
+    public static final String TRACE_SAMPLING_OPERATION_RULES = "trace.sampling.operation.rules";
+
+    // JSON rules
+    public static final String TRACE_SAMPLING_RULES = "trace.sampling.rules";
+    public static final String SPAN_SAMPLING_RULES = "span.sampling.rules";
+    public static final String SPAN_SAMPLING_RULES_FILE = "span.sampling.rules.file";
+    // a global rate used for all services (that don’t have a dedicated rule defined).
+    public static final String TRACE_SAMPLE_RATE = "trace.sample.rate";
+    public static final String TRACE_RATE_LIMIT = "trace.rate.limit";
+    public static final String TRACE_REPORT_HOSTNAME = "trace.report-hostname";
+    public static final String TRACE_CLIENT_IP_HEADER = "trace.client-ip-header";
+    public static final String TRACE_CLIENT_IP_RESOLVER_ENABLED = "trace.client-ip.resolver.enabled";
+    public static final String TRACE_GIT_METADATA_ENABLED = "trace.git.metadata.enabled";
+    public static final String HEADER_TAGS = "trace.header.tags";
+    public static final String REQUEST_HEADER_TAGS_COMMA_ALLOWED = "trace.request_header.tags.comma.allowed";
+    public static final String REQUEST_HEADER_TAGS = "trace.request_header.tags";
+    public static final String RESPONSE_HEADER_TAGS = "trace.response_header.tags";
+    public static final String BAGGAGE_MAPPING = "trace.header.baggage";
+    public static final String TRACE_HTTP_RESOURCE_REMOVE_TRAILING_SLASH = "trace.http.resource.remove-trailing-slash";
+    public static final String TRACE_HTTP_SERVER_PATH_RESOURCE_NAME_MAPPING =
+            "trace.http.server.path-resource-name-mapping";
+    public static final String TRACE_HTTP_CLIENT_PATH_RESOURCE_NAME_MAPPING =
+            "trace.http.client.path-resource-name-mapping";
+    // Use TRACE_HTTP_SERVER_ERROR_STATUSES instead
+    @Deprecated
+    public static final String HTTP_SERVER_ERROR_STATUSES = "http.server.error.statuses";
+
+    public static final String TRACE_HTTP_SERVER_ERROR_STATUSES = "trace.http.server.error.statuses";
+    // Use TRACE_HTTP_CLIENT_ERROR_STATUSES instead
+    @Deprecated
+    public static final String HTTP_CLIENT_ERROR_STATUSES = "http.client.error.statuses";
+
+    public static final String TRACE_HTTP_CLIENT_ERROR_STATUSES = "trace.http.client.error.statuses";
+
+    public static final String SPLIT_BY_TAGS = "trace.split-by-tags";
+    // trace latency interceptor value should be in ms
+    public static final String TRACE_KEEP_LATENCY_THRESHOLD_MS = "trace.experimental.keep.latency.threshold.ms";
+    public static final String SCOPE_DEPTH_LIMIT = "trace.scope.depth.limit";
+    public static final String SCOPE_STRICT_MODE = "trace.scope.strict.mode";
+    public static final String SCOPE_ITERATION_KEEP_ALIVE = "trace.scope.iteration.keep.alive";
+    public static final String PARTIAL_FLUSH_ENABLED = "trace.partial.flush.enabled";
+    public static final String PARTIAL_FLUSH_MIN_SPANS = "trace.partial.flush.min.spans";
+    public static final String TRACE_STRICT_WRITES_ENABLED = "trace.strict.writes.enabled";
+    public static final String PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED =
+            "propagation.extract.log_header_names.enabled";
+    public static final String PROPAGATION_STYLE_EXTRACT = "propagation.style.extract";
+    public static final String PROPAGATION_STYLE_INJECT = "propagation.style.inject";
+
+    public static final String TRACE_PROPAGATION_STYLE = "trace.propagation.style";
+    public static final String TRACE_PROPAGATION_STYLE_EXTRACT = "trace.propagation.style.extract";
+    public static final String TRACE_PROPAGATION_STYLE_INJECT = "trace.propagation.style.inject";
+    public static final String TRACE_PROPAGATION_BEHAVIOR_EXTRACT = "trace.propagation.behavior.extract";
+    public static final String TRACE_PROPAGATION_EXTRACT_FIRST = "trace.propagation.extract.first";
+    public static final String TRACE_BAGGAGE_MAX_ITEMS = "trace.baggage.max.items";
+    public static final String TRACE_BAGGAGE_MAX_BYTES = "trace.baggage.max.bytes";
+    public static final String TRACE_BAGGAGE_TAG_KEYS = "trace.baggage.tag.keys";
+
+    /**
+     * When enabled, explicit per-span tags set via the span builder take precedence over
+     * tracer-injected tags (inbound header tags, root-span tags, contextual tags) by being applied
+     * last. Default off, preserving the historical ordering where those could override builder tags.
+     */
+    public static final String TRACE_BUILDER_TAGS_PRECEDENCE_ENABLED = "trace.builder.tags.precedence.enabled";
+
+    public static final String TRACE_INFERRED_PROXY_SERVICES_ENABLED = "trace.inferred.proxy.services.enabled";
+
+    public static final String ENABLE_TRACE_AGENT_V05 = "trace.agent.v0.5.enabled";
+
+    public static final String TRACE_AGENT_PROTOCOL_VERSION = "trace.agent.protocol.version";
+
+    public static final String CLIENT_IP_ENABLED = "trace.client-ip.enabled";
+
+    public static final String TRACE_128_BIT_TRACEID_GENERATION_ENABLED = "trace.128.bit.traceid.generation.enabled";
+
+    public static final String SECURE_RANDOM = "trace.secure-random";
+
+    /**
+     * Disables validation that prevents invalid combinations of sampling priority and sampling
+     * mechanism on the set sampling priority calls. This check is enabled by default.
+     */
+    public static final String SAMPLING_MECHANISM_VALIDATION_DISABLED = "trace.sampling.mechanism.validation.disabled";
+
+    /**
+     * Limit for x-datadog-tags. When exceeded it will stop propagating Datadog tags and will log a
+     * warning.
+     */
+    public static final String TRACE_X_DATADOG_TAGS_MAX_LENGTH = "trace.x-datadog-tags.max.length";
+
+    public static final String CLOCK_SYNC_PERIOD = "trace.clock.sync.period";
+
+    /**
+     * Opt-in (defaults to disabled). Resyncs the tracer's clock on every AWS Lambda invocation to fix
+     * drift left by an AWS Lambda SnapStart restore, which the periodic {@link #CLOCK_SYNC_PERIOD}
+     * check can miss. No-op outside an instrumented Lambda invocation.
+     */
+    public static final String TRACE_LAMBDA_SNAPSTART_CLOCK_RESYNC_ENABLED =
+            "trace.lambda.snapstart.clock.resync.enabled";
+
+    public static final String TRACE_SPAN_ATTRIBUTE_SCHEMA = "trace.span.attribute.schema";
+
+    public static final String TRACE_LONG_RUNNING_ENABLED = "trace.experimental.long-running.enabled";
+
+    public static final String TRACE_LONG_RUNNING_INITIAL_FLUSH_INTERVAL =
+            "trace.experimental.long-running.initial.flush.interval";
+    public static final String TRACE_LONG_RUNNING_FLUSH_INTERVAL = "trace.experimental.long-running.flush.interval";
+
+    public static final String TRACE_PEER_HOSTNAME_ENABLED = "trace.peer.hostname.enabled";
+
+    public static final String TRACE_PEER_SERVICE_DEFAULTS_ENABLED = "trace.peer.service.defaults.enabled";
+    public static final String TRACE_PEER_SERVICE_COMPONENT_OVERRIDES = "trace.peer.service.component.overrides";
+    public static final String TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED =
+            "trace.remove.integration-service-names.enabled";
+
+    public static final String TRACE_PEER_SERVICE_MAPPING = "trace.peer.service.mapping";
+
+    public static final String TRACE_FLUSH_INTERVAL = "trace.flush.interval";
+
+    public static final String TRACE_POST_PROCESSING_TIMEOUT = "trace.post-processing.timeout";
+
+    public static final String TRACE_CLOUD_PAYLOAD_TAGGING_SERVICES = "trace.cloud.payload.tagging.services";
+    public static final String TRACE_CLOUD_REQUEST_PAYLOAD_TAGGING = "trace.cloud.request.payload.tagging";
+    public static final String TRACE_CLOUD_RESPONSE_PAYLOAD_TAGGING = "trace.cloud.response.payload.tagging";
+    public static final String TRACE_CLOUD_PAYLOAD_TAGGING_MAX_DEPTH = "trace.cloud.payload.tagging.max-depth";
+    public static final String TRACE_CLOUD_PAYLOAD_TAGGING_MAX_TAGS = "trace.cloud.payload.tagging.max-tags";
+    public static final String TRACE_SERVICE_DISCOVERY_ENABLED = "trace.service.discovery.enabled";
+
+    public static final String TRACE_ORG_GUARD_ENABLED = "trace.org.guard.enabled";
+    public static final String TRACE_ORG_GUARD_STRICT = "trace.org.guard.strict";
+    public static final String TRACE_ORG_GUARD_TRUSTED_OPMS = "trace.org.guard.trusted.opms";
+
+    private TracerConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/UsmConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/UsmConfig.java
index c84b832a1f3..1f3ec3dcde9 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/UsmConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/UsmConfig.java
@@ -3,7 +3,7 @@
 /** Constant with names of configuration options for USM. */
 public final class UsmConfig {
 
-  public static final String USM_ENABLED = "usm.enabled";
+    public static final String USM_ENABLED = "usm.enabled";
 
-  private UsmConfig() {}
+    private UsmConfig() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/experimental/DataStreamsCheckpointer.java b/dd-trace-api/src/main/java/datadog/trace/api/experimental/DataStreamsCheckpointer.java
index 6ee9365f336..0d509b82c16 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/experimental/DataStreamsCheckpointer.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/experimental/DataStreamsCheckpointer.java
@@ -6,53 +6,51 @@
 
 /** An interface to Data Streams checkpointer, allowing passing the context manually. */
 public interface DataStreamsCheckpointer {
-  static DataStreamsCheckpointer get() {
-    Tracer tracer = GlobalTracer.get();
-    if (tracer instanceof InternalTracer) {
-      return ((InternalTracer) tracer).getDataStreamsCheckpointer();
+    static DataStreamsCheckpointer get() {
+        Tracer tracer = GlobalTracer.get();
+        if (tracer instanceof InternalTracer) {
+            return ((InternalTracer) tracer).getDataStreamsCheckpointer();
+        }
+
+        return NoOp.INSTANCE;
     }
 
-    return NoOp.INSTANCE;
-  }
-
-  /**
-   * @param type The type of the checkpoint, usually the streaming technology being used. Examples:
-   *     kafka, kinesis, sns etc.
-   * @param source The source of data. For instance: topic, exchange or stream name.
-   * @param carrier An interface to the context carrier, from which the context will be extracted.
-   *     I.e. wrapper around message headers.
-   */
-  void setConsumeCheckpoint(String type, String source, DataStreamsContextCarrier carrier);
-
-  /**
-   * @param transactionId Transaction ID to track.
-   * @param checkpointName Unique checkpoint name.
-   */
-  void trackTransaction(String transactionId, String checkpointName);
-
-  /**
-   * @param type The type of the checkpoint, usually the streaming technology being used. Examples:
-   *     kafka, kinesis, sns etc.
-   * @param target The destination to which the data is being sent. For instance: topic, exchange or
-   *     stream name.
-   * @param carrier An interface to the context carrier, to which the context will be injected. I.e.
-   *     wrapper around message headers.
-   */
-  void setProduceCheckpoint(String type, String target, DataStreamsContextCarrier carrier);
-
-  final class NoOp implements DataStreamsCheckpointer {
-
-    public static final DataStreamsCheckpointer INSTANCE = new NoOp();
-
-    @Override
-    public void setConsumeCheckpoint(
-        String type, String source, DataStreamsContextCarrier carrier) {}
-
-    @Override
-    public void setProduceCheckpoint(
-        String type, String target, DataStreamsContextCarrier carrier) {}
-
-    @Override
-    public void trackTransaction(String transactionId, String checkpointName) {}
-  }
+    /**
+     * @param type The type of the checkpoint, usually the streaming technology being used. Examples:
+     *     kafka, kinesis, sns etc.
+     * @param source The source of data. For instance: topic, exchange or stream name.
+     * @param carrier An interface to the context carrier, from which the context will be extracted.
+     *     I.e. wrapper around message headers.
+     */
+    void setConsumeCheckpoint(String type, String source, DataStreamsContextCarrier carrier);
+
+    /**
+     * @param transactionId Transaction ID to track.
+     * @param checkpointName Unique checkpoint name.
+     */
+    void trackTransaction(String transactionId, String checkpointName);
+
+    /**
+     * @param type The type of the checkpoint, usually the streaming technology being used. Examples:
+     *     kafka, kinesis, sns etc.
+     * @param target The destination to which the data is being sent. For instance: topic, exchange or
+     *     stream name.
+     * @param carrier An interface to the context carrier, to which the context will be injected. I.e.
+     *     wrapper around message headers.
+     */
+    void setProduceCheckpoint(String type, String target, DataStreamsContextCarrier carrier);
+
+    final class NoOp implements DataStreamsCheckpointer {
+
+        public static final DataStreamsCheckpointer INSTANCE = new NoOp();
+
+        @Override
+        public void setConsumeCheckpoint(String type, String source, DataStreamsContextCarrier carrier) {}
+
+        @Override
+        public void setProduceCheckpoint(String type, String target, DataStreamsContextCarrier carrier) {}
+
+        @Override
+        public void trackTransaction(String transactionId, String checkpointName) {}
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/experimental/DataStreamsContextCarrier.java b/dd-trace-api/src/main/java/datadog/trace/api/experimental/DataStreamsContextCarrier.java
index 6106461aaa2..b6dd6bd26b3 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/experimental/DataStreamsContextCarrier.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/experimental/DataStreamsContextCarrier.java
@@ -6,28 +6,28 @@
 
 /** An interface representing the context carrier. Typically, message headers. */
 public interface DataStreamsContextCarrier {
-  /**
-   * @return A set of key value pairs, such as message headers.
-   */
-  Set<Entry<String, Object>> entries();
+    /**
+     * @return A set of key value pairs, such as message headers.
+     */
+    Set<Entry<String, Object>> entries();
 
-  /**
-   * @param key parameter to be set
-   * @param value to be set
-   */
-  void set(String key, String value);
+    /**
+     * @param key parameter to be set
+     * @param value to be set
+     */
+    void set(String key, String value);
 
-  final class NoOp implements DataStreamsContextCarrier {
-    public static final DataStreamsContextCarrier INSTANCE = new NoOp();
+    final class NoOp implements DataStreamsContextCarrier {
+        public static final DataStreamsContextCarrier INSTANCE = new NoOp();
 
-    private NoOp() {}
+        private NoOp() {}
 
-    @Override
-    public Set<Entry<String, Object>> entries() {
-      return Collections.emptySet();
-    }
+        @Override
+        public Set<Entry<String, Object>> entries() {
+            return Collections.emptySet();
+        }
 
-    @Override
-    public void set(String key, String value) {}
-  }
+        @Override
+        public void set(String key, String value) {}
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/interceptor/AbstractTraceInterceptor.java b/dd-trace-api/src/main/java/datadog/trace/api/interceptor/AbstractTraceInterceptor.java
index b155e585a94..ca5f1631281 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/interceptor/AbstractTraceInterceptor.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/interceptor/AbstractTraceInterceptor.java
@@ -2,41 +2,41 @@
 
 public abstract class AbstractTraceInterceptor implements TraceInterceptor {
 
-  private final Priority priority;
+    private final Priority priority;
 
-  protected AbstractTraceInterceptor(Priority priority) {
-    this.priority = priority;
-  }
+    protected AbstractTraceInterceptor(Priority priority) {
+        this.priority = priority;
+    }
 
-  @Override
-  public int priority() {
-    return priority.idx;
-  }
+    @Override
+    public int priority() {
+        return priority.idx;
+    }
 
-  public enum Priority {
-    // trace filtering
-    CI_VISIBILITY_TRACE(0),
-    CI_VISIBILITY_APM(1),
+    public enum Priority {
+        // trace filtering
+        CI_VISIBILITY_TRACE(0),
+        CI_VISIBILITY_APM(1),
 
-    // trace data enrichment
-    DD_INTAKE(2),
-    GIT_METADATA(3),
+        // trace data enrichment
+        DD_INTAKE(2),
+        GIT_METADATA(3),
 
-    // trace custom sampling
-    ROOT_SPAN_LATENCY(Integer.MAX_VALUE - 2),
+        // trace custom sampling
+        ROOT_SPAN_LATENCY(Integer.MAX_VALUE - 2),
 
-    // trace data collection
-    CI_VISIBILITY_TELEMETRY(Integer.MAX_VALUE - 1),
-    SERVICE_NAME_COLLECTING(Integer.MAX_VALUE);
+        // trace data collection
+        CI_VISIBILITY_TELEMETRY(Integer.MAX_VALUE - 1),
+        SERVICE_NAME_COLLECTING(Integer.MAX_VALUE);
 
-    private final int idx;
+        private final int idx;
 
-    Priority(int idx) {
-      this.idx = idx;
-    }
+        Priority(int idx) {
+            this.idx = idx;
+        }
 
-    int getIdx() {
-      return idx;
+        int getIdx() {
+            return idx;
+        }
     }
-  }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/interceptor/MutableSpan.java b/dd-trace-api/src/main/java/datadog/trace/api/interceptor/MutableSpan.java
index 97f32852a80..68f51df21d9 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/interceptor/MutableSpan.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/interceptor/MutableSpan.java
@@ -4,81 +4,81 @@
 
 public interface MutableSpan {
 
-  /**
-   * @return Start time with nanosecond scale, but millisecond resolution.
-   */
-  long getStartTime();
+    /**
+     * @return Start time with nanosecond scale, but millisecond resolution.
+     */
+    long getStartTime();
 
-  /**
-   * @return Duration with nanosecond scale.
-   */
-  long getDurationNano();
+    /**
+     * @return Duration with nanosecond scale.
+     */
+    long getDurationNano();
 
-  CharSequence getOperationName();
+    CharSequence getOperationName();
 
-  MutableSpan setOperationName(final CharSequence serviceName);
+    MutableSpan setOperationName(final CharSequence serviceName);
 
-  String getServiceName();
+    String getServiceName();
 
-  MutableSpan setServiceName(final String serviceName);
+    MutableSpan setServiceName(final String serviceName);
 
-  CharSequence getResourceName();
+    CharSequence getResourceName();
 
-  MutableSpan setResourceName(final CharSequence resourceName);
+    MutableSpan setResourceName(final CharSequence resourceName);
 
-  Integer getSamplingPriority();
+    Integer getSamplingPriority();
 
-  /**
-   * @param newPriority the sampling priority to set
-   * @return this {@link MutableSpan} instance, for chaining
-   * @deprecated Use {@code io.opentracing.Span#setTag(String, boolean)} instead using either tag
-   *     names {@link datadog.trace.api.DDTags#MANUAL_KEEP} or {@link
-   *     datadog.trace.api.DDTags#MANUAL_DROP}.
-   */
-  @Deprecated
-  MutableSpan setSamplingPriority(final int newPriority);
+    /**
+     * @param newPriority the sampling priority to set
+     * @return this {@link MutableSpan} instance, for chaining
+     * @deprecated Use {@code io.opentracing.Span#setTag(String, boolean)} instead using either tag
+     *     names {@link datadog.trace.api.DDTags#MANUAL_KEEP} or {@link
+     *     datadog.trace.api.DDTags#MANUAL_DROP}.
+     */
+    @Deprecated
+    MutableSpan setSamplingPriority(final int newPriority);
 
-  String getSpanType();
+    String getSpanType();
 
-  MutableSpan setSpanType(final CharSequence type);
+    MutableSpan setSpanType(final CharSequence type);
 
-  Map<String, Object> getTags();
+    Map<String, Object> getTags();
 
-  default Object getTag(String key) {
-    Map<String, Object> tags = getTags();
-    return tags == null ? null : tags.get(key);
-  }
+    default Object getTag(String key) {
+        Map<String, Object> tags = getTags();
+        return tags == null ? null : tags.get(key);
+    }
 
-  MutableSpan setTag(final String tag, final String value);
+    MutableSpan setTag(final String tag, final String value);
 
-  MutableSpan setTag(final String tag, final boolean value);
+    MutableSpan setTag(final String tag, final boolean value);
 
-  MutableSpan setTag(final String tag, final Number value);
+    MutableSpan setTag(final String tag, final Number value);
 
-  MutableSpan setMetric(final CharSequence metric, final int value);
+    MutableSpan setMetric(final CharSequence metric, final int value);
 
-  MutableSpan setMetric(final CharSequence metric, final long value);
+    MutableSpan setMetric(final CharSequence metric, final long value);
 
-  MutableSpan setMetric(final CharSequence metric, final float value);
+    MutableSpan setMetric(final CharSequence metric, final float value);
 
-  MutableSpan setMetric(final CharSequence metric, final double value);
+    MutableSpan setMetric(final CharSequence metric, final double value);
 
-  boolean isError();
+    boolean isError();
 
-  MutableSpan setError(boolean value);
+    MutableSpan setError(boolean value);
 
-  /**
-   * @deprecated Use {@link #getLocalRootSpan()} instead.
-   */
-  @Deprecated
-  MutableSpan getRootSpan();
+    /**
+     * @deprecated Use {@link #getLocalRootSpan()} instead.
+     */
+    @Deprecated
+    MutableSpan getRootSpan();
 
-  /**
-   * Returns the root span for current the trace fragment. In the context of distributed tracing
-   * this method returns the root span only for the fragment generated by the currently traced
-   * application.
-   *
-   * @return The root span for the current trace fragment.
-   */
-  MutableSpan getLocalRootSpan();
+    /**
+     * Returns the root span for current the trace fragment. In the context of distributed tracing
+     * this method returns the root span only for the fragment generated by the currently traced
+     * application.
+     *
+     * @return The root span for the current trace fragment.
+     */
+    MutableSpan getLocalRootSpan();
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/interceptor/TraceInterceptor.java b/dd-trace-api/src/main/java/datadog/trace/api/interceptor/TraceInterceptor.java
index 822e0b9fd68..60cc4b84947 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/interceptor/TraceInterceptor.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/interceptor/TraceInterceptor.java
@@ -4,19 +4,19 @@
 
 public interface TraceInterceptor {
 
-  /**
-   * After a trace is "complete" but before it is written, it is provided to the interceptors to
-   * modify. The result following all interceptors is sampled then sent to the trace writer.
-   *
-   * @param trace - The collection of spans that represent a trace. Can be modified in place. Order
-   *     of spans should not be relied upon.
-   * @return A potentially modified or replaced collection of spans. Must not be null.
-   */
-  Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace);
+    /**
+     * After a trace is "complete" but before it is written, it is provided to the interceptors to
+     * modify. The result following all interceptors is sampled then sent to the trace writer.
+     *
+     * @param trace - The collection of spans that represent a trace. Can be modified in place. Order
+     *     of spans should not be relied upon.
+     * @return A potentially modified or replaced collection of spans. Must not be null.
+     */
+    Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace);
 
-  /**
-   * @return A unique priority for sorting relative to other TraceInterceptors. Unique because
-   *     interceptors are stored in a sorted set, so duplicates will not be added.
-   */
-  int priority();
+    /**
+     * @return A unique priority for sorting relative to other TraceInterceptors. Unique because
+     *     interceptors are stored in a sorted set, so duplicates will not be added.
+     */
+    int priority();
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/internal/InternalTracer.java b/dd-trace-api/src/main/java/datadog/trace/api/internal/InternalTracer.java
index 52b1adfc97e..9fe0860f068 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/internal/InternalTracer.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/internal/InternalTracer.java
@@ -8,28 +8,28 @@
  * at any time.
  */
 public interface InternalTracer {
-  /**
-   * Attach callbacks to the global scope manager.
-   *
-   * @param afterScopeActivatedCallback Callback on scope activation.
-   * @param afterScopeClosedCallback Callback on scope close.
-   */
-  void addScopeListener(Runnable afterScopeActivatedCallback, Runnable afterScopeClosedCallback);
+    /**
+     * Attach callbacks to the global scope manager.
+     *
+     * @param afterScopeActivatedCallback Callback on scope activation.
+     * @param afterScopeClosedCallback Callback on scope close.
+     */
+    void addScopeListener(Runnable afterScopeActivatedCallback, Runnable afterScopeClosedCallback);
 
-  void flush();
+    void flush();
 
-  void flushMetrics();
+    void flushMetrics();
 
-  void flushLogs();
+    void flushLogs();
 
-  Profiling getProfilingContext();
+    Profiling getProfilingContext();
 
-  TraceSegment getTraceSegment();
+    TraceSegment getTraceSegment();
 
-  /**
-   * Return the global instance of the DataStreams checkpointer.
-   *
-   * @return DataStreamsCheckpointer instance.
-   */
-  DataStreamsCheckpointer getDataStreamsCheckpointer();
+    /**
+     * Return the global instance of the DataStreams checkpointer.
+     *
+     * @return DataStreamsCheckpointer instance.
+     */
+    DataStreamsCheckpointer getDataStreamsCheckpointer();
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/internal/TraceSegment.java b/dd-trace-api/src/main/java/datadog/trace/api/internal/TraceSegment.java
index d6e262cfc78..f0c09f7a441 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/internal/TraceSegment.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/internal/TraceSegment.java
@@ -8,179 +8,179 @@
  */
 public interface TraceSegment {
 
-  /**
-   * Add a tag to the top of this {@code TraceSegment}.
-   *
-   * @param key key of the tag
-   * @param value value of the tag
-   */
-  default void setTagTop(String key, Object value) {
-    setTagTop(key, value, false);
-  }
-
-  /**
-   * Add a tag to the top of this {@code TraceSegment} with optional key sanitization.
-   *
-   * @param key key of the tag
-   * @param value value of the tag
-   * @param sanitize indicates is key need to be sanitized
-   */
-  void setTagTop(String key, Object value, boolean sanitize);
-
-  /**
-   * Get the tag value from the top of this {@code TraceSegment}.
-   *
-   * @param key key of the tag
-   */
-  default Object getTagTop(String key) {
-    return getTagTop(key, false);
-  }
-
-  /**
-   * Get the tag value from the top of this {@code TraceSegment} with optional key sanitization.
-   *
-   * @param key key of the tag
-   * @param sanitize indicates is key need to be sanitized
-   */
-  Object getTagTop(String key, boolean sanitize);
-
-  /**
-   * Add a tag to the current span in this {@code TraceSegment}.
-   *
-   * @param key key of the tag
-   * @param value value of the tag
-   */
-  default void setTagCurrent(String key, Object value) {
-    setTagCurrent(key, value, false);
-  }
-
-  /**
-   * Add a tag to the current span in this {@code TraceSegment}. with optional key sanitization.
-   *
-   * @param key key of the tag
-   * @param value value of the tag
-   * @param sanitize indicates is key need to be sanitized
-   */
-  void setTagCurrent(String key, Object value, boolean sanitize);
-
-  /**
-   * Get the tag value from the current span in this {@code TraceSegment}.
-   *
-   * @param key key of the tag
-   */
-  default Object getTagCurrent(String key) {
-    return getTagCurrent(key, false);
-  }
-
-  /**
-   * Get the tag value from the current span in this {@code TraceSegment}. with optional key
-   * sanitization.
-   *
-   * @param key key of the tag
-   * @param sanitize indicates is key need to be sanitized
-   */
-  Object getTagCurrent(String key, boolean sanitize);
-
-  /**
-   * Add data to the top of this {@code TraceSegment}. The {@code toString} representation of the
-   * {@code value} must be valid top level JSON, i.e. an {@code Object} or an {@code Array}.
-   *
-   * @param key key of the data
-   * @param value value of the data
-   */
-  void setDataTop(String key, Object value);
-
-  /**
-   * Gets the value of the tag from the top of this {@code TraceSegment}.
-   *
-   * @param key key of the data
-   * @return value of the data
-   */
-  Object getDataTop(String key);
-
-  /** Mark the request as effectively blocked, by setting the tag appsec.blocked */
-  void effectivelyBlocked();
-
-  /**
-   * Add data to the current span in this {@code TraceSegment}. The {@code toString} representation
-   * of the {@code value} must be valid top level JSON, i.e. an {@code Object} or an {@code Array}.
-   *
-   * @param key key of the data
-   * @param value value of the data
-   */
-  void setDataCurrent(String key, Object value);
-
-  /**
-   * Gets the value of the tag from the current span in this {@code TraceSegment}.
-   *
-   * @param key key of the data
-   * @return value of the data
-   */
-  Object getDataCurrent(String key);
-
-  /**
-   * Add a field to the meta_struct of the top of this {@code TraceSegment}.
-   *
-   * @param field field name
-   * @param value value of the data
-   * @see #setMetaStructCurrent(String, Object) (String, Object)
-   */
-  void setMetaStructTop(String field, Object value);
-
-  /**
-   * Add a field to the current span meta_struct in this {@code TraceSegment}.
-   *
-   * @param field field name
-   * @param value value of the data
-   * @see "datadog.trace.common.writer.ddagent.TraceMapperV0_4.MetaStructWriter"
-   * @see "datadog.trace.core.CoreSpan#setMetaStruct(String, Object)"
-   */
-  void setMetaStructCurrent(String field, Object value);
-
-  class NoOp implements TraceSegment {
-    public static final TraceSegment INSTANCE = new NoOp();
-
-    private NoOp() {}
-
-    @Override
-    public void setTagTop(String key, Object value, boolean sanitize) {}
-
-    @Override
-    public void setTagCurrent(String key, Object value, boolean sanitize) {}
-
-    @Override
-    public Object getTagTop(String key, boolean sanitize) {
-      return null;
+    /**
+     * Add a tag to the top of this {@code TraceSegment}.
+     *
+     * @param key key of the tag
+     * @param value value of the tag
+     */
+    default void setTagTop(String key, Object value) {
+        setTagTop(key, value, false);
     }
 
-    @Override
-    public Object getTagCurrent(String key, boolean sanitize) {
-      return null;
+    /**
+     * Add a tag to the top of this {@code TraceSegment} with optional key sanitization.
+     *
+     * @param key key of the tag
+     * @param value value of the tag
+     * @param sanitize indicates is key need to be sanitized
+     */
+    void setTagTop(String key, Object value, boolean sanitize);
+
+    /**
+     * Get the tag value from the top of this {@code TraceSegment}.
+     *
+     * @param key key of the tag
+     */
+    default Object getTagTop(String key) {
+        return getTagTop(key, false);
     }
 
-    @Override
-    public void setDataTop(String key, Object value) {}
-
-    @Override
-    public Object getDataTop(String key) {
-      return null;
+    /**
+     * Get the tag value from the top of this {@code TraceSegment} with optional key sanitization.
+     *
+     * @param key key of the tag
+     * @param sanitize indicates is key need to be sanitized
+     */
+    Object getTagTop(String key, boolean sanitize);
+
+    /**
+     * Add a tag to the current span in this {@code TraceSegment}.
+     *
+     * @param key key of the tag
+     * @param value value of the tag
+     */
+    default void setTagCurrent(String key, Object value) {
+        setTagCurrent(key, value, false);
     }
 
-    @Override
-    public void effectivelyBlocked() {}
-
-    @Override
-    public void setDataCurrent(String key, Object value) {}
-
-    @Override
-    public Object getDataCurrent(String key) {
-      return null;
+    /**
+     * Add a tag to the current span in this {@code TraceSegment}. with optional key sanitization.
+     *
+     * @param key key of the tag
+     * @param value value of the tag
+     * @param sanitize indicates is key need to be sanitized
+     */
+    void setTagCurrent(String key, Object value, boolean sanitize);
+
+    /**
+     * Get the tag value from the current span in this {@code TraceSegment}.
+     *
+     * @param key key of the tag
+     */
+    default Object getTagCurrent(String key) {
+        return getTagCurrent(key, false);
     }
 
-    @Override
-    public void setMetaStructTop(String key, Object value) {}
-
-    @Override
-    public void setMetaStructCurrent(String key, Object value) {}
-  }
+    /**
+     * Get the tag value from the current span in this {@code TraceSegment}. with optional key
+     * sanitization.
+     *
+     * @param key key of the tag
+     * @param sanitize indicates is key need to be sanitized
+     */
+    Object getTagCurrent(String key, boolean sanitize);
+
+    /**
+     * Add data to the top of this {@code TraceSegment}. The {@code toString} representation of the
+     * {@code value} must be valid top level JSON, i.e. an {@code Object} or an {@code Array}.
+     *
+     * @param key key of the data
+     * @param value value of the data
+     */
+    void setDataTop(String key, Object value);
+
+    /**
+     * Gets the value of the tag from the top of this {@code TraceSegment}.
+     *
+     * @param key key of the data
+     * @return value of the data
+     */
+    Object getDataTop(String key);
+
+    /** Mark the request as effectively blocked, by setting the tag appsec.blocked */
+    void effectivelyBlocked();
+
+    /**
+     * Add data to the current span in this {@code TraceSegment}. The {@code toString} representation
+     * of the {@code value} must be valid top level JSON, i.e. an {@code Object} or an {@code Array}.
+     *
+     * @param key key of the data
+     * @param value value of the data
+     */
+    void setDataCurrent(String key, Object value);
+
+    /**
+     * Gets the value of the tag from the current span in this {@code TraceSegment}.
+     *
+     * @param key key of the data
+     * @return value of the data
+     */
+    Object getDataCurrent(String key);
+
+    /**
+     * Add a field to the meta_struct of the top of this {@code TraceSegment}.
+     *
+     * @param field field name
+     * @param value value of the data
+     * @see #setMetaStructCurrent(String, Object) (String, Object)
+     */
+    void setMetaStructTop(String field, Object value);
+
+    /**
+     * Add a field to the current span meta_struct in this {@code TraceSegment}.
+     *
+     * @param field field name
+     * @param value value of the data
+     * @see "datadog.trace.common.writer.ddagent.TraceMapperV0_4.MetaStructWriter"
+     * @see "datadog.trace.core.CoreSpan#setMetaStruct(String, Object)"
+     */
+    void setMetaStructCurrent(String field, Object value);
+
+    class NoOp implements TraceSegment {
+        public static final TraceSegment INSTANCE = new NoOp();
+
+        private NoOp() {}
+
+        @Override
+        public void setTagTop(String key, Object value, boolean sanitize) {}
+
+        @Override
+        public void setTagCurrent(String key, Object value, boolean sanitize) {}
+
+        @Override
+        public Object getTagTop(String key, boolean sanitize) {
+            return null;
+        }
+
+        @Override
+        public Object getTagCurrent(String key, boolean sanitize) {
+            return null;
+        }
+
+        @Override
+        public void setDataTop(String key, Object value) {}
+
+        @Override
+        public Object getDataTop(String key) {
+            return null;
+        }
+
+        @Override
+        public void effectivelyBlocked() {}
+
+        @Override
+        public void setDataCurrent(String key, Object value) {}
+
+        @Override
+        public Object getDataCurrent(String key) {
+            return null;
+        }
+
+        @Override
+        public void setMetaStructTop(String key, Object value) {}
+
+        @Override
+        public void setMetaStructCurrent(String key, Object value) {}
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/internal/util/LongStringUtils.java b/dd-trace-api/src/main/java/datadog/trace/api/internal/util/LongStringUtils.java
index aa55b8943fb..d8207483b73 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/internal/util/LongStringUtils.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/internal/util/LongStringUtils.java
@@ -9,164 +9,162 @@
  * methods.
  */
 public class LongStringUtils {
-  private static final long MAX_FIRST_PART = 0x1999999999999999L; // Max unsigned 64 bits / 10
-
-  private LongStringUtils() {}
-
-  /**
-   * Parse the hex representation of the unsigned 64 bit long from the {@code String}.
-   *
-   * @param s String in hexadecimal of unsigned 64-bits long.
-   * @return long
-   * @throws NumberFormatException
-   */
-  public static long parseUnsignedLongHex(CharSequence s) throws NumberFormatException {
-    return LongStringUtils.parseUnsignedLongHex(s, 0, s == null ? 0 : s.length(), false);
-  }
-
-  /**
-   * Parse the hex representation of the unsigned 64 bit long from the {@code String}.
-   *
-   * @param s String in hex of unsigned 64 bits
-   * @param start the start index of the hex value
-   * @param len the len of the hex value
-   * @param lowerCaseOnly if the allowed hex characters are lower case only
-   * @return long
-   * @throws NumberFormatException
-   */
-  public static long parseUnsignedLongHex(CharSequence s, int start, int len, boolean lowerCaseOnly)
-      throws NumberFormatException {
-    if (s == null) {
-      throw new NumberFormatException("null");
+    private static final long MAX_FIRST_PART = 0x1999999999999999L; // Max unsigned 64 bits / 10
+
+    private LongStringUtils() {}
+
+    /**
+     * Parse the hex representation of the unsigned 64 bit long from the {@code String}.
+     *
+     * @param s String in hexadecimal of unsigned 64-bits long.
+     * @return long
+     * @throws NumberFormatException
+     */
+    public static long parseUnsignedLongHex(CharSequence s) throws NumberFormatException {
+        return LongStringUtils.parseUnsignedLongHex(s, 0, s == null ? 0 : s.length(), false);
     }
 
-    if (len > 0 && start >= 0 && start + len <= s.length()) {
-      if (len > 16 && (len - firstNonZeroCharacter(s, start)) > 16) {
-        // Unsigned 64 bits max is 16 digits, so this always overflows
-        throw numberFormatOutOfLongRange(s);
-      }
-      long result = 0;
-      int ok = 0;
-      for (int i = 0; i < len && ok >= 0; i++, start++) {
-        char c = s.charAt(start);
-        int d = Character.digit(c, 16);
-        if (lowerCaseOnly && Character.isUpperCase(c)) {
-          ok = -1;
+    /**
+     * Parse the hex representation of the unsigned 64 bit long from the {@code String}.
+     *
+     * @param s String in hex of unsigned 64 bits
+     * @param start the start index of the hex value
+     * @param len the len of the hex value
+     * @param lowerCaseOnly if the allowed hex characters are lower case only
+     * @return long
+     * @throws NumberFormatException
+     */
+    public static long parseUnsignedLongHex(CharSequence s, int start, int len, boolean lowerCaseOnly)
+            throws NumberFormatException {
+        if (s == null) {
+            throw new NumberFormatException("null");
         }
-        ok |= d;
-        result = result << 4 | d;
-      }
-      if (ok < 0) {
-        throw new NumberFormatException("Illegal character in " + s.subSequence(start, len));
-      }
-      return result;
-    } else {
-      throw new NumberFormatException("Empty input string");
-    }
-  }
 
-  private static int firstNonZeroCharacter(CharSequence s, int start) {
-    int firstNonZero = start;
-    for (; firstNonZero < s.length(); firstNonZero++) {
-      if (s.charAt(firstNonZero) != '0') break;
+        if (len > 0 && start >= 0 && start + len <= s.length()) {
+            if (len > 16 && (len - firstNonZeroCharacter(s, start)) > 16) {
+                // Unsigned 64 bits max is 16 digits, so this always overflows
+                throw numberFormatOutOfLongRange(s);
+            }
+            long result = 0;
+            int ok = 0;
+            for (int i = 0; i < len && ok >= 0; i++, start++) {
+                char c = s.charAt(start);
+                int d = Character.digit(c, 16);
+                if (lowerCaseOnly && Character.isUpperCase(c)) {
+                    ok = -1;
+                }
+                ok |= d;
+                result = result << 4 | d;
+            }
+            if (ok < 0) {
+                throw new NumberFormatException("Illegal character in " + s.subSequence(start, len));
+            }
+            return result;
+        } else {
+            throw new NumberFormatException("Empty input string");
+        }
     }
-    return firstNonZero;
-  }
 
-  public static long parseUnsignedLong(String s) throws NumberFormatException {
-    if (s == null) {
-      throw new NumberFormatException("s can't be null");
+    private static int firstNonZeroCharacter(CharSequence s, int start) {
+        int firstNonZero = start;
+        for (; firstNonZero < s.length(); firstNonZero++) {
+            if (s.charAt(firstNonZero) != '0') break;
+        }
+        return firstNonZero;
     }
 
-    int len = s.length();
-    if (len > 0) {
-      char firstChar = s.charAt(0);
-      if (firstChar == '-') {
-        throw new NumberFormatException(
-            String.format("Illegal leading minus sign on unsigned string %s.", s));
-      } else {
-        if (len <= 18) { // Signed 64 bits max is 19 digits, so this always fits
-          return Long.parseLong(s);
-        } else if (len > 20) { // Unsigned 64 bits max is 20 digits, so this always overflows
-          throw numberFormatOutOfLongRange(s);
-        }
-        // Now do the first part and the last character
-        long first = 0;
-        int ok = 0;
-        for (int i = 0; i < len - 1; i++) {
-          char c = s.charAt(i);
-          int d = Character.digit(c, 10);
-          ok |= d;
-          first = first * 10 + d;
-        }
-        int last = Character.digit(s.charAt(len - 1), 10);
-        ok |= last;
-        if (ok < 0) {
-          throw new NumberFormatException("Illegal character in " + s);
+    public static long parseUnsignedLong(String s) throws NumberFormatException {
+        if (s == null) {
+            throw new NumberFormatException("s can't be null");
         }
-        if (first > MAX_FIRST_PART) {
-          throw numberFormatOutOfLongRange(s);
-        }
-        long guard = first * 10;
-        long result = guard + last;
-        if (guard < 0 && result >= 0) {
-          throw numberFormatOutOfLongRange(s);
+
+        int len = s.length();
+        if (len > 0) {
+            char firstChar = s.charAt(0);
+            if (firstChar == '-') {
+                throw new NumberFormatException(String.format("Illegal leading minus sign on unsigned string %s.", s));
+            } else {
+                if (len <= 18) { // Signed 64 bits max is 19 digits, so this always fits
+                    return Long.parseLong(s);
+                } else if (len > 20) { // Unsigned 64 bits max is 20 digits, so this always overflows
+                    throw numberFormatOutOfLongRange(s);
+                }
+                // Now do the first part and the last character
+                long first = 0;
+                int ok = 0;
+                for (int i = 0; i < len - 1; i++) {
+                    char c = s.charAt(i);
+                    int d = Character.digit(c, 10);
+                    ok |= d;
+                    first = first * 10 + d;
+                }
+                int last = Character.digit(s.charAt(len - 1), 10);
+                ok |= last;
+                if (ok < 0) {
+                    throw new NumberFormatException("Illegal character in " + s);
+                }
+                if (first > MAX_FIRST_PART) {
+                    throw numberFormatOutOfLongRange(s);
+                }
+                long guard = first * 10;
+                long result = guard + last;
+                if (guard < 0 && result >= 0) {
+                    throw numberFormatOutOfLongRange(s);
+                }
+                return result;
+            }
+        } else {
+            throw new NumberFormatException("Empty input string");
         }
-        return result;
-      }
-    } else {
-      throw new NumberFormatException("Empty input string");
     }
-  }
-
-  /**
-   * Creates a {@code NumberFormatException} with a consistent error message.
-   *
-   * @param s the {@code String} that exceeds the range of a {@code Long}
-   * @return NumberFormatException
-   */
-  public static NumberFormatException numberFormatOutOfLongRange(CharSequence s) {
-    return new NumberFormatException(
-        String.format("String value %s exceeds range of unsigned long.", s));
-  }
-
-  private static final byte[] HEX_DIGITS = {
-    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
-  };
-
-  public static String toHexStringPadded(long id, int size) {
-    byte[] bytes = allocatePaddedHexStringBytes(size);
-    fillStringBytesWithPaddedHexId(id, 0, bytes.length, bytes);
-    return new String(bytes, US_ASCII);
-  }
-
-  public static String toHexStringPadded(long highOrderBits, long lowOrderBits, int size) {
-    if (size <= 16) {
-      // Fallback to only one id formatting
-      return toHexStringPadded(lowOrderBits, size);
+
+    /**
+     * Creates a {@code NumberFormatException} with a consistent error message.
+     *
+     * @param s the {@code String} that exceeds the range of a {@code Long}
+     * @return NumberFormatException
+     */
+    public static NumberFormatException numberFormatOutOfLongRange(CharSequence s) {
+        return new NumberFormatException(String.format("String value %s exceeds range of unsigned long.", s));
+    }
+
+    private static final byte[] HEX_DIGITS = {
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
+    };
+
+    public static String toHexStringPadded(long id, int size) {
+        byte[] bytes = allocatePaddedHexStringBytes(size);
+        fillStringBytesWithPaddedHexId(id, 0, bytes.length, bytes);
+        return new String(bytes, US_ASCII);
     }
-    byte[] bytes = allocatePaddedHexStringBytes(size);
-    fillStringBytesWithPaddedHexId(highOrderBits, 0, 16, bytes);
-    fillStringBytesWithPaddedHexId(lowOrderBits, 16, 16, bytes);
-    return new String(bytes, US_ASCII);
-  }
-
-  private static byte[] allocatePaddedHexStringBytes(int size) {
-    if (size > 16) {
-      size = 32;
-    } else if (size < 16) {
-      size = 16;
+
+    public static String toHexStringPadded(long highOrderBits, long lowOrderBits, int size) {
+        if (size <= 16) {
+            // Fallback to only one id formatting
+            return toHexStringPadded(lowOrderBits, size);
+        }
+        byte[] bytes = allocatePaddedHexStringBytes(size);
+        fillStringBytesWithPaddedHexId(highOrderBits, 0, 16, bytes);
+        fillStringBytesWithPaddedHexId(lowOrderBits, 16, 16, bytes);
+        return new String(bytes, US_ASCII);
     }
-    return new byte[size];
-  }
-
-  private static void fillStringBytesWithPaddedHexId(long id, int index, int size, byte[] bytes) {
-    int nibbleCount = Long.numberOfLeadingZeros(id) >>> 2;
-    Arrays.fill(bytes, index, index + (size - 16) + nibbleCount, (byte) '0');
-    for (int i = 0; i < 16 - nibbleCount; i++) {
-      int b = (int) (id & 0xF);
-      bytes[index + size - 1 - i] = HEX_DIGITS[b];
-      id >>>= 4;
+
+    private static byte[] allocatePaddedHexStringBytes(int size) {
+        if (size > 16) {
+            size = 32;
+        } else if (size < 16) {
+            size = 16;
+        }
+        return new byte[size];
+    }
+
+    private static void fillStringBytesWithPaddedHexId(long id, int index, int size, byte[] bytes) {
+        int nibbleCount = Long.numberOfLeadingZeros(id) >>> 2;
+        Arrays.fill(bytes, index, index + (size - 16) + nibbleCount, (byte) '0');
+        for (int i = 0; i < 16 - nibbleCount; i++) {
+            int b = (int) (id & 0xF);
+            bytes[index + size - 1 - i] = HEX_DIGITS[b];
+            id >>>= 4;
+        }
     }
-  }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObs.java b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObs.java
index 2f9cfbcb619..39b83cff3ec 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObs.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObs.java
@@ -15,1272 +15,1250 @@
 import javax.annotation.Nullable;
 
 public class LLMObs {
-  protected LLMObs() {}
-
-  protected static LLMObsSpanFactory SPAN_FACTORY = NoOpLLMObsSpanFactory.INSTANCE;
-  protected static LLMObsEvalProcessor EVAL_PROCESSOR = NoOpLLMObsEvalProcessor.INSTANCE;
-  private static final Object SPAN_PROCESSOR_LOCK = new Object();
-  @Nullable protected static volatile LLMObsSpanProcessor SPAN_PROCESSOR;
-  protected static LLMObsFeedbackProcessor FEEDBACK_PROCESSOR =
-      NoOpLLMObsFeedbackProcessor.INSTANCE;
-
-  public static LLMObsSpan startLLMSpan(
-      String spanName,
-      String modelName,
-      String modelProvider,
-      @Nullable String mlApp,
-      @Nullable String sessionId) {
-
-    return SPAN_FACTORY.startLLMSpan(spanName, modelName, modelProvider, mlApp, sessionId);
-  }
-
-  public static LLMObsSpan startAgentSpan(
-      String spanName, @Nullable String mlApp, @Nullable String sessionId) {
-
-    return SPAN_FACTORY.startAgentSpan(spanName, mlApp, sessionId);
-  }
-
-  /**
-   * Starts an agent span, optionally tagging it with a version.
-   *
-   * <p>The version is set as an {@code agent_version} tag on this span and propagated to every
-   * descendant LLMObs span started under it.
-   *
-   * <p>Propagation only happens via this {@code version} parameter, evaluated once when this span
-   * is created. Calling {@link LLMObsSpan#setTag} with {@code agent_version} afterwards — including
-   * on the span returned here — only sets that span's own tag and does not propagate to
-   * descendants.
-   *
-   * @param version the version of this agent, or {@code null}/empty to leave it untagged
-   */
-  public static LLMObsSpan startAgentSpan(
-      String spanName,
-      @Nullable String mlApp,
-      @Nullable String sessionId,
-      @Nullable String version) {
-
-    return SPAN_FACTORY.startAgentSpan(spanName, mlApp, sessionId, version);
-  }
-
-  public static LLMObsSpan startToolSpan(
-      String spanName, @Nullable String mlApp, @Nullable String sessionId) {
-
-    return SPAN_FACTORY.startToolSpan(spanName, mlApp, sessionId);
-  }
-
-  public static LLMObsSpan startTaskSpan(
-      String spanName, @Nullable String mlApp, @Nullable String sessionId) {
-
-    return SPAN_FACTORY.startTaskSpan(spanName, mlApp, sessionId);
-  }
-
-  public static LLMObsSpan startWorkflowSpan(
-      String spanName, @Nullable String mlApp, @Nullable String sessionId) {
-
-    return SPAN_FACTORY.startWorkflowSpan(spanName, mlApp, sessionId);
-  }
-
-  public static LLMObsSpan startEmbeddingSpan(
-      String spanName,
-      @Nullable String mlApp,
-      @Nullable String modelProvider,
-      @Nullable String modelName,
-      @Nullable String sessionId) {
-    return SPAN_FACTORY.startEmbeddingSpan(spanName, mlApp, modelProvider, modelName, sessionId);
-  }
-
-  public static LLMObsSpan startRetrievalSpan(
-      String spanName, @Nullable String mlApp, @Nullable String sessionId) {
-    return SPAN_FACTORY.startRetrievalSpan(spanName, mlApp, sessionId);
-  }
-
-  /**
-   * Registers a processor to be called for each LLM Observability span before it is sent.
-   *
-   * <p>The processor can modify the span input and output, or return {@code null} to omit the span
-   * from LLM Observability. Only one processor can be registered at a time.
-   *
-   * @param processor the processor to register
-   * @throws NullPointerException if {@code processor} is {@code null}
-   * @throws IllegalStateException if a processor is already registered
-   */
-  public static void registerProcessor(LLMObsSpanProcessor processor) {
-    Objects.requireNonNull(processor, "processor");
-    synchronized (SPAN_PROCESSOR_LOCK) {
-      if (SPAN_PROCESSOR != null) {
-        throw new IllegalStateException(
-            "An LLM Observability span processor is already registered. "
-                + "Deregister it before registering another.");
-      }
-      SPAN_PROCESSOR = processor;
-    }
-  }
+    protected LLMObs() {}
 
-  /** Deregisters the current LLM Observability span processor, if one is registered. */
-  public static void deregisterProcessor() {
-    synchronized (SPAN_PROCESSOR_LOCK) {
-      SPAN_PROCESSOR = null;
-    }
-  }
-
-  public static void SubmitEvaluation(
-      LLMObsSpan llmObsSpan, String label, String categoricalValue, Map<String, Object> tags) {
-    EVAL_PROCESSOR.SubmitEvaluation(llmObsSpan, label, categoricalValue, tags);
-  }
-
-  public static void SubmitEvaluation(
-      LLMObsSpan llmObsSpan,
-      String label,
-      String categoricalValue,
-      String mlApp,
-      Map<String, Object> tags) {
-    EVAL_PROCESSOR.SubmitEvaluation(llmObsSpan, label, categoricalValue, mlApp, tags);
-  }
-
-  public static void SubmitEvaluation(
-      LLMObsSpan llmObsSpan, String label, double scoreValue, Map<String, Object> tags) {
-    EVAL_PROCESSOR.SubmitEvaluation(llmObsSpan, label, scoreValue, tags);
-  }
-
-  public static void SubmitEvaluation(
-      LLMObsSpan llmObsSpan,
-      String label,
-      double scoreValue,
-      String mlApp,
-      Map<String, Object> tags) {
-    EVAL_PROCESSOR.SubmitEvaluation(llmObsSpan, label, scoreValue, mlApp, tags);
-  }
-
-  /**
-   * Submits end-user feedback on a span, trace, session or customer-defined join key.
-   *
-   * <p>Unlike an evaluation, which scores a span from an automated or offline judge, feedback
-   * carries the identity of whoever submitted it and can target an entity the submitting process
-   * has no Datadog context for.
-   *
-   * <pre>{@code
-   * LLMObs.submitFeedback(
-   *     LLMObs.Feedback.builder()
-   *         .span(span)
-   *         .label("thumbs")
-   *         .booleanValue(true)
-   *         .submitter("user-123", "end_user")
-   *         .assessment(LLMObs.Feedback.Assessment.PASS)
-   *         .reasoning("answered the question")
-   *         .build());
-   * }</pre>
-   *
-   * <p>This is where the feedback is validated. When LLM Observability is disabled, or the agent is
-   * not attached, the call is a no-op and an invalid feedback goes unnoticed rather than breaking
-   * the host application.
-   *
-   * @param feedback the feedback to submit, built with {@link Feedback#builder()}
-   * @throws IllegalArgumentException if LLM Observability is enabled and the feedback is invalid,
-   *     e.g. no target, no value, no submitter, or a label containing a {@code '.'}
-   */
-  public static void submitFeedback(Feedback feedback) {
-    FEEDBACK_PROCESSOR.submitFeedback(feedback);
-  }
-
-  public interface LLMObsSpanFactory {
-    LLMObsSpan startLLMSpan(
-        String spanName,
-        String modelName,
-        String modelProvider,
-        @Nullable String mlApp,
-        @Nullable String sessionId);
-
-    LLMObsSpan startAgentSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId);
-
-    default LLMObsSpan startAgentSpan(
-        String spanName,
-        @Nullable String mlApp,
-        @Nullable String sessionId,
-        @Nullable String version) {
-      return startAgentSpan(spanName, mlApp, sessionId);
+    protected static LLMObsSpanFactory SPAN_FACTORY = NoOpLLMObsSpanFactory.INSTANCE;
+    protected static LLMObsEvalProcessor EVAL_PROCESSOR = NoOpLLMObsEvalProcessor.INSTANCE;
+    private static final Object SPAN_PROCESSOR_LOCK = new Object();
+
+    @Nullable
+    protected static volatile LLMObsSpanProcessor SPAN_PROCESSOR;
+
+    protected static LLMObsFeedbackProcessor FEEDBACK_PROCESSOR = NoOpLLMObsFeedbackProcessor.INSTANCE;
+
+    public static LLMObsSpan startLLMSpan(
+            String spanName,
+            String modelName,
+            String modelProvider,
+            @Nullable String mlApp,
+            @Nullable String sessionId) {
+
+        return SPAN_FACTORY.startLLMSpan(spanName, modelName, modelProvider, mlApp, sessionId);
     }
 
-    LLMObsSpan startToolSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId);
-
-    LLMObsSpan startTaskSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId);
-
-    LLMObsSpan startWorkflowSpan(
-        String spanName, @Nullable String mlApp, @Nullable String sessionId);
-
-    LLMObsSpan startEmbeddingSpan(
-        String spanName,
-        @Nullable String mlApp,
-        @Nullable String modelProvider,
-        @Nullable String modelName,
-        @Nullable String sessionId);
-
-    LLMObsSpan startRetrievalSpan(
-        String spanName, @Nullable String mlApp, @Nullable String sessionId);
-  }
-
-  public interface LLMObsEvalProcessor {
-    void SubmitEvaluation(
-        LLMObsSpan llmObsSpan, String label, double scoreValue, Map<String, Object> tags);
-
-    void SubmitEvaluation(
-        LLMObsSpan llmObsSpan,
-        String label,
-        double scoreValue,
-        String mlApp,
-        Map<String, Object> tags);
-
-    void SubmitEvaluation(
-        LLMObsSpan llmObsSpan, String label, String categoricalValue, Map<String, Object> tags);
-
-    void SubmitEvaluation(
-        LLMObsSpan llmObsSpan,
-        String label,
-        String categoricalValue,
-        String mlApp,
-        Map<String, Object> tags);
-  }
-
-  public interface LLMObsFeedbackProcessor {
-    void submitFeedback(Feedback feedback);
-  }
-
-  /**
-   * End-user feedback on a span, trace, session or customer-defined join key.
-   *
-   * <p>Instances are immutable and built through {@link #builder()}. Neither the builder nor {@link
-   * Builder#build()} ever throws: the first problem found is recorded and surfaced by {@link
-   * #validate()}, which {@link LLMObs#submitFeedback(Feedback)} runs. Validation therefore only
-   * fires when LLM Observability is actually enabled, matching dd-trace-py — instrumented code that
-   * runs without the agent attached never sees an exception it would not see in production.
-   */
-  public static class Feedback {
-
-    /** The kind of value carried by a feedback metric. */
-    public enum MetricType {
-      /** A value from a set of names, e.g. {@code "satisfied"}. */
-      CATEGORICAL,
-      /** A numeric value. */
-      SCORE,
-      /** A true/false value, e.g. a thumbs up or down. */
-      BOOLEAN,
-      /** A structured value. */
-      JSON,
-      /** Free-form text, e.g. a written comment. Feedback-only; evaluations reject it. */
-      TEXT;
-
-      /**
-       * Returns the wire representation of this metric type.
-       *
-       * @return the lower case name, as expected by the intake
-       */
-      @Override
-      public String toString() {
-        return name().toLowerCase(Locale.ROOT);
-      }
+    public static LLMObsSpan startAgentSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId) {
+
+        return SPAN_FACTORY.startAgentSpan(spanName, mlApp, sessionId);
     }
 
-    /** Whether the submitter considered the targeted operation a success. */
-    public enum Assessment {
-      /** The operation was satisfactory. */
-      PASS,
-      /** The operation was not satisfactory. */
-      FAIL;
-
-      /**
-       * Returns the wire representation of this assessment.
-       *
-       * @return the lower case name, as expected by the intake
-       */
-      @Override
-      public String toString() {
-        return name().toLowerCase(Locale.ROOT);
-      }
+    /**
+     * Starts an agent span, optionally tagging it with a version.
+     *
+     * <p>The version is set as an {@code agent_version} tag on this span and propagated to every
+     * descendant LLMObs span started under it.
+     *
+     * <p>Propagation only happens via this {@code version} parameter, evaluated once when this span
+     * is created. Calling {@link LLMObsSpan#setTag} with {@code agent_version} afterwards — including
+     * on the span returned here — only sets that span's own tag and does not propagate to
+     * descendants.
+     *
+     * @param version the version of this agent, or {@code null}/empty to leave it untagged
+     */
+    public static LLMObsSpan startAgentSpan(
+            String spanName, @Nullable String mlApp, @Nullable String sessionId, @Nullable String version) {
+
+        return SPAN_FACTORY.startAgentSpan(spanName, mlApp, sessionId, version);
     }
 
-    /** The entity a feedback is attached to. Exactly one is set on a given feedback. */
-    public enum TargetType {
-      /** A single span. */
-      SPAN_ID("span_id"),
-      /** A whole trace. */
-      TRACE_ID("trace_id"),
-      /** A session, spanning several traces. */
-      SESSION_ID("session_id"),
-      /** A customer-defined business entity key, opaque to the tracer. */
-      FEEDBACK_JOIN_KEY("feedback_join_key");
-
-      private final String wireKey;
-
-      TargetType(String wireKey) {
-        this.wireKey = wireKey;
-      }
-
-      public String getWireKey() {
-        return wireKey;
-      }
+    public static LLMObsSpan startToolSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId) {
+
+        return SPAN_FACTORY.startToolSpan(spanName, mlApp, sessionId);
     }
 
-    /** Who submitted a feedback. */
-    public static class Submitter {
-      @Nullable private final String id;
-      @Nullable private final String type;
-
-      /**
-       * Creates a submitter. An invalid id is not rejected here but by {@link Feedback#validate()}.
-       *
-       * @param id the identifier of the submitter, must not be null or empty
-       * @param type an optional free-form qualifier, e.g. {@code "end_user"}
-       */
-      public Submitter(@Nonnull String id, @Nullable String type) {
-        this.id = id;
-        this.type = type;
-      }
-
-      @Nullable
-      public String getId() {
-        return id;
-      }
-
-      @Nullable
-      public String getType() {
-        return type;
-      }
+    public static LLMObsSpan startTaskSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId) {
+
+        return SPAN_FACTORY.startTaskSpan(spanName, mlApp, sessionId);
     }
 
-    /**
-     * Why a feedback cannot be submitted. The code is a stable, low cardinality identifier reported
-     * as telemetry; the message is meant for humans.
-     */
-    public static final class ValidationError {
-      private final String code;
-      private final String message;
-
-      private ValidationError(String code, String message) {
-        this.code = code;
-        this.message = message;
-      }
-
-      @Nonnull
-      public String getCode() {
-        return code;
-      }
-
-      @Nonnull
-      public String getMessage() {
-        return message;
-      }
+    public static LLMObsSpan startWorkflowSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId) {
+
+        return SPAN_FACTORY.startWorkflowSpan(spanName, mlApp, sessionId);
     }
 
-    @Nullable private final TargetType targetType;
-    @Nullable private final String targetValue;
-    @Nullable private final String label;
-    @Nullable private final MetricType metricType;
-    @Nullable private final Object value;
-    @Nullable private final Submitter submitter;
-    @Nullable private final String mlApp;
-    @Nullable private final Assessment assessment;
-    @Nullable private final String reasoning;
-    private final long timestampMs;
-    @Nullable private final Map<String, Object> tags;
-    @Nullable private final ValidationError validationError;
-
-    private Feedback(Builder builder, long timestampMs, @Nullable ValidationError validationError) {
-      this.validationError = validationError;
-      this.timestampMs = timestampMs;
-      this.targetType = builder.targetType;
-      this.targetValue = builder.targetValue;
-      this.label = builder.label;
-      this.metricType = builder.metricType;
-      this.value = builder.value;
-      this.submitter = builder.submitter;
-      this.mlApp = builder.mlApp;
-      this.assessment = builder.assessment;
-      this.reasoning = builder.reasoning;
-      this.tags =
-          builder.tags == null ? null : Collections.unmodifiableMap(new HashMap<>(builder.tags));
+    public static LLMObsSpan startEmbeddingSpan(
+            String spanName,
+            @Nullable String mlApp,
+            @Nullable String modelProvider,
+            @Nullable String modelName,
+            @Nullable String sessionId) {
+        return SPAN_FACTORY.startEmbeddingSpan(spanName, mlApp, modelProvider, modelName, sessionId);
     }
 
-    public static Builder builder() {
-      return new Builder();
+    public static LLMObsSpan startRetrievalSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId) {
+        return SPAN_FACTORY.startRetrievalSpan(spanName, mlApp, sessionId);
     }
 
     /**
-     * Checks whether this feedback can be submitted. Called by {@link
-     * LLMObs#submitFeedback(Feedback)}; the getters below are only guaranteed non-null once it
-     * returned null.
+     * Registers a processor to be called for each LLM Observability span before it is sent.
      *
-     * @return the first problem found while building this feedback, or null if it is valid
+     * <p>The processor can modify the span input and output, or return {@code null} to omit the span
+     * from LLM Observability. Only one processor can be registered at a time.
+     *
+     * @param processor the processor to register
+     * @throws NullPointerException if {@code processor} is {@code null}
+     * @throws IllegalStateException if a processor is already registered
      */
-    @Nullable
-    public ValidationError validate() {
-      return validationError;
+    public static void registerProcessor(LLMObsSpanProcessor processor) {
+        Objects.requireNonNull(processor, "processor");
+        synchronized (SPAN_PROCESSOR_LOCK) {
+            if (SPAN_PROCESSOR != null) {
+                throw new IllegalStateException("An LLM Observability span processor is already registered. "
+                        + "Deregister it before registering another.");
+            }
+            SPAN_PROCESSOR = processor;
+        }
     }
 
-    @Nullable
-    public TargetType getTargetType() {
-      return targetType;
+    /** Deregisters the current LLM Observability span processor, if one is registered. */
+    public static void deregisterProcessor() {
+        synchronized (SPAN_PROCESSOR_LOCK) {
+            SPAN_PROCESSOR = null;
+        }
     }
 
-    @Nullable
-    public String getTargetValue() {
-      return targetValue;
+    public static void SubmitEvaluation(
+            LLMObsSpan llmObsSpan, String label, String categoricalValue, Map<String, Object> tags) {
+        EVAL_PROCESSOR.SubmitEvaluation(llmObsSpan, label, categoricalValue, tags);
     }
 
-    @Nullable
-    public String getLabel() {
-      return label;
+    public static void SubmitEvaluation(
+            LLMObsSpan llmObsSpan, String label, String categoricalValue, String mlApp, Map<String, Object> tags) {
+        EVAL_PROCESSOR.SubmitEvaluation(llmObsSpan, label, categoricalValue, mlApp, tags);
     }
 
-    @Nullable
-    public MetricType getMetricType() {
-      return metricType;
+    public static void SubmitEvaluation(
+            LLMObsSpan llmObsSpan, String label, double scoreValue, Map<String, Object> tags) {
+        EVAL_PROCESSOR.SubmitEvaluation(llmObsSpan, label, scoreValue, tags);
     }
 
-    /** Returns the feedback value, whose runtime type matches {@link #getMetricType()}. */
-    @Nullable
-    public Object getValue() {
-      return value;
+    public static void SubmitEvaluation(
+            LLMObsSpan llmObsSpan, String label, double scoreValue, String mlApp, Map<String, Object> tags) {
+        EVAL_PROCESSOR.SubmitEvaluation(llmObsSpan, label, scoreValue, mlApp, tags);
     }
 
-    @Nullable
-    public Submitter getSubmitter() {
-      return submitter;
+    /**
+     * Submits end-user feedback on a span, trace, session or customer-defined join key.
+     *
+     * <p>Unlike an evaluation, which scores a span from an automated or offline judge, feedback
+     * carries the identity of whoever submitted it and can target an entity the submitting process
+     * has no Datadog context for.
+     *
+     * <pre>{@code
+     * LLMObs.submitFeedback(
+     *     LLMObs.Feedback.builder()
+     *         .span(span)
+     *         .label("thumbs")
+     *         .booleanValue(true)
+     *         .submitter("user-123", "end_user")
+     *         .assessment(LLMObs.Feedback.Assessment.PASS)
+     *         .reasoning("answered the question")
+     *         .build());
+     * }</pre>
+     *
+     * <p>This is where the feedback is validated. When LLM Observability is disabled, or the agent is
+     * not attached, the call is a no-op and an invalid feedback goes unnoticed rather than breaking
+     * the host application.
+     *
+     * @param feedback the feedback to submit, built with {@link Feedback#builder()}
+     * @throws IllegalArgumentException if LLM Observability is enabled and the feedback is invalid,
+     *     e.g. no target, no value, no submitter, or a label containing a {@code '.'}
+     */
+    public static void submitFeedback(Feedback feedback) {
+        FEEDBACK_PROCESSOR.submitFeedback(feedback);
     }
 
-    /** Returns the ML app, or null to fall back on the tracer configured one. */
-    @Nullable
-    public String getMlApp() {
-      return mlApp;
-    }
+    public interface LLMObsSpanFactory {
+        LLMObsSpan startLLMSpan(
+                String spanName,
+                String modelName,
+                String modelProvider,
+                @Nullable String mlApp,
+                @Nullable String sessionId);
 
-    @Nullable
-    public Assessment getAssessment() {
-      return assessment;
-    }
+        LLMObsSpan startAgentSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId);
 
-    @Nullable
-    public String getReasoning() {
-      return reasoning;
+        default LLMObsSpan startAgentSpan(
+                String spanName, @Nullable String mlApp, @Nullable String sessionId, @Nullable String version) {
+            return startAgentSpan(spanName, mlApp, sessionId);
+        }
+
+        LLMObsSpan startToolSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId);
+
+        LLMObsSpan startTaskSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId);
+
+        LLMObsSpan startWorkflowSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId);
+
+        LLMObsSpan startEmbeddingSpan(
+                String spanName,
+                @Nullable String mlApp,
+                @Nullable String modelProvider,
+                @Nullable String modelName,
+                @Nullable String sessionId);
+
+        LLMObsSpan startRetrievalSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId);
     }
 
-    /**
-     * Returns the submission time in milliseconds since the epoch. This is the only ordering signal
-     * available to the backend when the same feedback is re-submitted with a new value.
-     */
-    public long getTimestampMs() {
-      return timestampMs;
+    public interface LLMObsEvalProcessor {
+        void SubmitEvaluation(LLMObsSpan llmObsSpan, String label, double scoreValue, Map<String, Object> tags);
+
+        void SubmitEvaluation(
+                LLMObsSpan llmObsSpan, String label, double scoreValue, String mlApp, Map<String, Object> tags);
+
+        void SubmitEvaluation(LLMObsSpan llmObsSpan, String label, String categoricalValue, Map<String, Object> tags);
+
+        void SubmitEvaluation(
+                LLMObsSpan llmObsSpan, String label, String categoricalValue, String mlApp, Map<String, Object> tags);
     }
 
-    /** Returns an unmodifiable view of the tags, or null if none were provided. */
-    @Nullable
-    public Map<String, Object> getTags() {
-      return tags;
+    public interface LLMObsFeedbackProcessor {
+        void submitFeedback(Feedback feedback);
     }
 
     /**
-     * Builds a {@link Feedback}. Exactly one target and exactly one value must be set; setting
-     * either twice, even to the same kind, is rejected so that a silently overwritten target cannot
-     * ship.
+     * End-user feedback on a span, trace, session or customer-defined join key.
      *
-     * <p>No method on this builder throws. The first problem found is remembered and reported by
-     * {@link Feedback#validate()} at submission time.
+     * <p>Instances are immutable and built through {@link #builder()}. Neither the builder nor {@link
+     * Builder#build()} ever throws: the first problem found is recorded and surfaced by {@link
+     * #validate()}, which {@link LLMObs#submitFeedback(Feedback)} runs. Validation therefore only
+     * fires when LLM Observability is actually enabled, matching dd-trace-py — instrumented code that
+     * runs without the agent attached never sees an exception it would not see in production.
      */
-    public static class Builder {
-      private TargetType targetType;
-      private String targetValue;
-      private String label;
-      private MetricType metricType;
-      private Object value;
-      private Submitter submitter;
-      private String mlApp;
-      private Assessment assessment;
-      private String reasoning;
-      private long timestampMs;
-      private Map<String, Object> tags;
-      private ValidationError error;
-
-      private Builder() {}
-
-      /**
-       * Targets the given span. Wire-equivalent to {@link #spanId(String)} with the span's id.
-       *
-       * @param span the span to attach the feedback to
-       * @return this builder
-       */
-      public Builder span(@Nonnull LLMObsSpan span) {
-        if (span == null) {
-          return fail("invalid_span", "span must not be null");
-        }
-        return target(TargetType.SPAN_ID, String.valueOf(span.getSpanId()));
-      }
-
-      /**
-       * Targets the span with the given id.
-       *
-       * @param spanId the span identifier
-       * @return this builder
-       */
-      public Builder spanId(@Nonnull String spanId) {
-        return target(TargetType.SPAN_ID, spanId);
-      }
-
-      /**
-       * Targets the trace with the given id.
-       *
-       * @param traceId the trace identifier
-       * @return this builder
-       */
-      public Builder traceId(@Nonnull String traceId) {
-        return target(TargetType.TRACE_ID, traceId);
-      }
-
-      /**
-       * Targets the session with the given id.
-       *
-       * @param sessionId the session identifier
-       * @return this builder
-       */
-      public Builder sessionId(@Nonnull String sessionId) {
-        return target(TargetType.SESSION_ID, sessionId);
-      }
-
-      /**
-       * Targets a customer-defined business entity, e.g. {@code "incident-123"}. The key is opaque
-       * to the tracer: it is emitted as-is and never matched against any span.
-       *
-       * @param feedbackJoinKey the business entity key
-       * @return this builder
-       */
-      public Builder feedbackJoinKey(@Nonnull String feedbackJoinKey) {
-        return target(TargetType.FEEDBACK_JOIN_KEY, feedbackJoinKey);
-      }
-
-      /**
-       * Sets the name of the feedback metric, e.g. {@code "thumbs"}.
-       *
-       * @param label the metric name, must not contain a {@code '.'}
-       * @return this builder
-       */
-      public Builder label(@Nonnull String label) {
-        this.label = label;
-        return this;
-      }
-
-      /**
-       * Sets a categorical value, e.g. {@code "satisfied"}.
-       *
-       * @param value the value
-       * @return this builder
-       */
-      public Builder categoricalValue(@Nonnull String value) {
-        return value(MetricType.CATEGORICAL, value);
-      }
-
-      /**
-       * Sets a numeric value.
-       *
-       * @param value the value, must be finite as JSON has no representation for NaN nor infinity
-       * @return this builder
-       */
-      public Builder scoreValue(double value) {
-        if (!Double.isFinite(value)) {
-          return fail("invalid_metric_value", "score value must be finite");
-        }
-        return value(MetricType.SCORE, value);
-      }
-
-      /**
-       * Sets a true/false value, e.g. a thumbs up or down.
-       *
-       * @param value the value
-       * @return this builder
-       */
-      public Builder booleanValue(boolean value) {
-        return value(MetricType.BOOLEAN, value);
-      }
-
-      /**
-       * Sets a structured value.
-       *
-       * @param value the value, serialized as a JSON object
-       * @return this builder
-       */
-      public Builder jsonValue(@Nonnull Map<String, Object> value) {
-        // Serialization happens later, on the submission worker, so the caller-owned map is
-        // snapshotted here to keep the submitted value stable, the same way tags are.
-        return value(
-            MetricType.JSON,
-            value == null ? null : Collections.unmodifiableMap(new HashMap<>(value)));
-      }
-
-      /**
-       * Sets a free-form text value, e.g. a written comment.
-       *
-       * @param value the value
-       * @return this builder
-       */
-      public Builder textValue(@Nonnull String value) {
-        return value(MetricType.TEXT, value);
-      }
-
-      /**
-       * Sets who submitted this feedback.
-       *
-       * @param id the identifier of the submitter
-       * @param type an optional qualifier, e.g. {@code "end_user"}
-       * @return this builder
-       */
-      public Builder submitter(@Nonnull String id, @Nullable String type) {
-        this.submitter = new Submitter(id, type);
-        return this;
-      }
-
-      /**
-       * Sets who submitted this feedback.
-       *
-       * @param submitter the submitter
-       * @return this builder
-       */
-      public Builder submitter(@Nonnull Submitter submitter) {
-        this.submitter = submitter;
-        return this;
-      }
-
-      /**
-       * Overrides the ML application this feedback belongs to.
-       *
-       * @param mlApp the ML app; when null or empty the tracer configured one is used
-       * @return this builder
-       */
-      public Builder mlApp(@Nullable String mlApp) {
-        this.mlApp = mlApp;
-        return this;
-      }
-
-      /**
-       * Sets whether the submitter considered the targeted operation a success.
-       *
-       * @param assessment the assessment
-       * @return this builder
-       */
-      public Builder assessment(@Nullable Assessment assessment) {
-        this.assessment = assessment;
-        return this;
-      }
-
-      /**
-       * Sets a free-form justification of this feedback.
-       *
-       * @param reasoning the reasoning
-       * @return this builder
-       */
-      public Builder reasoning(@Nullable String reasoning) {
-        this.reasoning = reasoning;
-        return this;
-      }
-
-      /**
-       * Overrides the submission time. Defaults to the time {@link #build()} is called.
-       *
-       * @param timestampMs the submission time, in milliseconds since the epoch
-       * @return this builder
-       */
-      public Builder timestampMs(long timestampMs) {
-        this.timestampMs = timestampMs;
-        return this;
-      }
-
-      /**
-       * Sets the tags attached to this feedback.
-       *
-       * @param tags a map of JSON serializable key-value pairs
-       * @return this builder
-       */
-      public Builder tags(@Nullable Map<String, Object> tags) {
-        this.tags = tags == null ? null : new HashMap<>(tags);
-        return this;
-      }
-
-      /**
-       * Adds a single tag to this feedback.
-       *
-       * @param key the tag key
-       * @param value the tag value
-       * @return this builder
-       */
-      public Builder tag(@Nonnull String key, @Nonnull Object value) {
-        if (this.tags == null) {
-          this.tags = new HashMap<>();
-        }
-        this.tags.put(key, value);
-        return this;
-      }
-
-      /**
-       * Builds the feedback. Never throws: any problem is carried by the returned instance and
-       * reported by {@link Feedback#validate()} when it is submitted.
-       *
-       * @return the built feedback
-       */
-      public Feedback build() {
-        return new Feedback(
-            this, timestampMs == 0 ? System.currentTimeMillis() : timestampMs, validationError());
-      }
-
-      /**
-       * Returns the first problem preventing submission, earlier builder errors taking priority.
-       */
-      @Nullable
-      private ValidationError validationError() {
-        if (error != null) {
-          return error;
-        }
-        if (targetType == null) {
-          return new ValidationError(
-              "invalid_target_count",
-              "exactly one of span, spanId, traceId, sessionId or feedbackJoinKey must be specified"
-                  + " to submit feedback");
-        }
-        if (label == null || label.isEmpty()) {
-          return new ValidationError(
-              "invalid_metric_label", "label must be the specified name of the feedback metric");
-        }
-        if (label.indexOf('.') >= 0) {
-          return new ValidationError("invalid_label_value", "label value must not contain a '.'");
-        }
-        if (metricType == null) {
-          return new ValidationError(
-              "invalid_metric_type",
-              "exactly one of categoricalValue, scoreValue, booleanValue, jsonValue or textValue"
-                  + " must be specified to submit feedback");
-        }
-        if (submitter == null) {
-          return new ValidationError(
-              "invalid_submitter", "submitter must be specified to submit feedback");
-        }
-        if (submitter.getId() == null || submitter.getId().isEmpty()) {
-          return new ValidationError(
-              "invalid_submitter", "submitter id must be a non-empty string");
-        }
-        if (timestampMs < 0) {
-          return new ValidationError(
-              "invalid_timestamp", "timestampMs must be a non-negative long");
-        }
-        return null;
-      }
-
-      private Builder fail(String code, String message) {
-        if (this.error == null) {
-          this.error = new ValidationError(code, message);
-        }
-        return this;
-      }
-
-      private Builder target(TargetType type, String value) {
-        if (targetType != null) {
-          return fail(
-              "invalid_target_count",
-              "a feedback target was already set to "
-                  + targetType.getWireKey()
-                  + ", exactly one target must be specified");
-        }
-        if (value == null || value.isEmpty()) {
-          return fail(
-              "invalid_" + type.getWireKey(), type.getWireKey() + " must be a non-empty string");
-        }
-        this.targetType = type;
-        this.targetValue = value;
-        return this;
-      }
-
-      private Builder value(MetricType type, Object value) {
-        if (metricType != null) {
-          return fail(
-              "invalid_metric_type",
-              "a feedback value was already set as "
-                  + metricType
-                  + ", exactly one value must be specified");
-        }
-        if (value == null) {
-          return fail("invalid_metric_value", "value must not be null for a " + type + " metric");
-        }
-        this.metricType = type;
-        this.value = value;
-        return this;
-      }
-    }
-  }
-
-  /** A prompt template and its associated attributes for an LLM call. */
-  public static final class Prompt {
-    private final String id;
-    private final String version;
-    private final String template;
-    private final List<LLMMessage> chatTemplate;
-    private final Map<String, String> variables;
-    private final Map<String, String> tags;
-    private final List<String> contextVariables;
-    private final List<String> queryVariables;
-
-    public static Builder builder() {
-      return new Builder();
-    }
+    public static class Feedback {
+
+        /** The kind of value carried by a feedback metric. */
+        public enum MetricType {
+            /** A value from a set of names, e.g. {@code "satisfied"}. */
+            CATEGORICAL,
+            /** A numeric value. */
+            SCORE,
+            /** A true/false value, e.g. a thumbs up or down. */
+            BOOLEAN,
+            /** A structured value. */
+            JSON,
+            /** Free-form text, e.g. a written comment. Feedback-only; evaluations reject it. */
+            TEXT;
+
+            /**
+             * Returns the wire representation of this metric type.
+             *
+             * @return the lower case name, as expected by the intake
+             */
+            @Override
+            public String toString() {
+                return name().toLowerCase(Locale.ROOT);
+            }
+        }
 
-    private Prompt(Builder builder) {
-      this.id = builder.id;
-      this.version = builder.version;
-      this.template = builder.template;
-      this.chatTemplate = immutableList(builder.chatTemplate);
-      this.variables = immutableMap(builder.variables);
-      this.tags = immutableMap(builder.tags);
-      this.contextVariables = immutableList(builder.contextVariables);
-      this.queryVariables = immutableList(builder.queryVariables);
-    }
+        /** Whether the submitter considered the targeted operation a success. */
+        public enum Assessment {
+            /** The operation was satisfactory. */
+            PASS,
+            /** The operation was not satisfactory. */
+            FAIL;
+
+            /**
+             * Returns the wire representation of this assessment.
+             *
+             * @return the lower case name, as expected by the intake
+             */
+            @Override
+            public String toString() {
+                return name().toLowerCase(Locale.ROOT);
+            }
+        }
 
-    public String getId() {
-      return id;
-    }
+        /** The entity a feedback is attached to. Exactly one is set on a given feedback. */
+        public enum TargetType {
+            /** A single span. */
+            SPAN_ID("span_id"),
+            /** A whole trace. */
+            TRACE_ID("trace_id"),
+            /** A session, spanning several traces. */
+            SESSION_ID("session_id"),
+            /** A customer-defined business entity key, opaque to the tracer. */
+            FEEDBACK_JOIN_KEY("feedback_join_key");
+
+            private final String wireKey;
+
+            TargetType(String wireKey) {
+                this.wireKey = wireKey;
+            }
+
+            public String getWireKey() {
+                return wireKey;
+            }
+        }
 
-    public String getVersion() {
-      return version;
-    }
+        /** Who submitted a feedback. */
+        public static class Submitter {
+            @Nullable
+            private final String id;
+
+            @Nullable
+            private final String type;
+
+            /**
+             * Creates a submitter. An invalid id is not rejected here but by {@link Feedback#validate()}.
+             *
+             * @param id the identifier of the submitter, must not be null or empty
+             * @param type an optional free-form qualifier, e.g. {@code "end_user"}
+             */
+            public Submitter(@Nonnull String id, @Nullable String type) {
+                this.id = id;
+                this.type = type;
+            }
+
+            @Nullable
+            public String getId() {
+                return id;
+            }
+
+            @Nullable
+            public String getType() {
+                return type;
+            }
+        }
 
-    public String getTemplate() {
-      return template;
-    }
+        /**
+         * Why a feedback cannot be submitted. The code is a stable, low cardinality identifier reported
+         * as telemetry; the message is meant for humans.
+         */
+        public static final class ValidationError {
+            private final String code;
+            private final String message;
+
+            private ValidationError(String code, String message) {
+                this.code = code;
+                this.message = message;
+            }
+
+            @Nonnull
+            public String getCode() {
+                return code;
+            }
+
+            @Nonnull
+            public String getMessage() {
+                return message;
+            }
+        }
 
-    public List<LLMMessage> getChatTemplate() {
-      return chatTemplate;
-    }
+        @Nullable
+        private final TargetType targetType;
 
-    public Map<String, String> getVariables() {
-      return variables;
-    }
+        @Nullable
+        private final String targetValue;
 
-    public Map<String, String> getTags() {
-      return tags;
-    }
+        @Nullable
+        private final String label;
 
-    public List<String> getContextVariables() {
-      return contextVariables;
-    }
+        @Nullable
+        private final MetricType metricType;
 
-    public List<String> getQueryVariables() {
-      return queryVariables;
-    }
+        @Nullable
+        private final Object value;
 
-    private static <T> List<T> immutableList(List<T> values) {
-      return values == null ? null : Collections.unmodifiableList(new ArrayList<>(values));
-    }
+        @Nullable
+        private final Submitter submitter;
 
-    private static <K, V> Map<K, V> immutableMap(Map<K, V> values) {
-      return values == null ? null : Collections.unmodifiableMap(new LinkedHashMap<>(values));
-    }
+        @Nullable
+        private final String mlApp;
 
-    public static final class Builder {
-      private String id;
-      private String version;
-      private String template;
-      private List<LLMMessage> chatTemplate;
-      private Map<String, String> variables;
-      private Map<String, String> tags;
-      private List<String> contextVariables;
-      private List<String> queryVariables;
-
-      private Builder() {}
-
-      public Builder id(String id) {
-        this.id = id;
-        return this;
-      }
-
-      public Builder version(String version) {
-        this.version = version;
-        return this;
-      }
-
-      public Builder template(String template) {
-        this.template = template;
-        this.chatTemplate = null;
-        return this;
-      }
-
-      public Builder template(List<LLMMessage> chatTemplate) {
-        this.template = null;
-        this.chatTemplate = chatTemplate;
-        return this;
-      }
-
-      public Builder variables(Map<String, String> variables) {
-        this.variables = variables;
-        return this;
-      }
-
-      public Builder tags(Map<String, String> tags) {
-        this.tags = tags;
-        return this;
-      }
-
-      public Builder contextVariables(List<String> contextVariables) {
-        this.contextVariables = contextVariables;
-        return this;
-      }
-
-      public Builder queryVariables(List<String> queryVariables) {
-        this.queryVariables = queryVariables;
-        return this;
-      }
-
-      public Prompt build() {
-        return new Prompt(this);
-      }
-    }
-  }
+        @Nullable
+        private final Assessment assessment;
 
-  public static class ToolCall {
-    private String name;
-    private String type;
-    private String toolId;
-    private Map<String, Object> arguments;
+        @Nullable
+        private final String reasoning;
 
-    public static ToolCall from(
-        String name, String type, String toolId, Map<String, Object> arguments) {
-      return new ToolCall(name, type, toolId, arguments);
-    }
+        private final long timestampMs;
 
-    private ToolCall(String name, String type, String toolId, Map<String, Object> arguments) {
-      this.name = name;
-      this.type = type;
-      this.toolId = toolId;
-      this.arguments = arguments;
-    }
+        @Nullable
+        private final Map<String, Object> tags;
 
-    public String getName() {
-      return name;
-    }
+        @Nullable
+        private final ValidationError validationError;
 
-    public String getType() {
-      return type;
-    }
+        private Feedback(Builder builder, long timestampMs, @Nullable ValidationError validationError) {
+            this.validationError = validationError;
+            this.timestampMs = timestampMs;
+            this.targetType = builder.targetType;
+            this.targetValue = builder.targetValue;
+            this.label = builder.label;
+            this.metricType = builder.metricType;
+            this.value = builder.value;
+            this.submitter = builder.submitter;
+            this.mlApp = builder.mlApp;
+            this.assessment = builder.assessment;
+            this.reasoning = builder.reasoning;
+            this.tags = builder.tags == null ? null : Collections.unmodifiableMap(new HashMap<>(builder.tags));
+        }
 
-    public String getToolId() {
-      return toolId;
-    }
+        public static Builder builder() {
+            return new Builder();
+        }
 
-    public Map<String, Object> getArguments() {
-      return arguments;
-    }
-  }
+        /**
+         * Checks whether this feedback can be submitted. Called by {@link
+         * LLMObs#submitFeedback(Feedback)}; the getters below are only guaranteed non-null once it
+         * returned null.
+         *
+         * @return the first problem found while building this feedback, or null if it is valid
+         */
+        @Nullable
+        public ValidationError validate() {
+            return validationError;
+        }
 
-  public static class ToolDefinition {
-    private String name;
-    private String description;
-    private Map<String, Object> schema;
-    private String version;
+        @Nullable
+        public TargetType getTargetType() {
+            return targetType;
+        }
 
-    public static ToolDefinition from(String name) {
-      return new ToolDefinition(name, null, null, null);
-    }
+        @Nullable
+        public String getTargetValue() {
+            return targetValue;
+        }
 
-    public static ToolDefinition from(String name, String description) {
-      return new ToolDefinition(name, description, null, null);
-    }
+        @Nullable
+        public String getLabel() {
+            return label;
+        }
 
-    public static ToolDefinition from(String name, String description, Map<String, Object> schema) {
-      return new ToolDefinition(name, description, schema, null);
-    }
+        @Nullable
+        public MetricType getMetricType() {
+            return metricType;
+        }
 
-    public static ToolDefinition from(
-        String name, String description, Map<String, Object> schema, String version) {
-      return new ToolDefinition(name, description, schema, version);
-    }
+        /** Returns the feedback value, whose runtime type matches {@link #getMetricType()}. */
+        @Nullable
+        public Object getValue() {
+            return value;
+        }
 
-    private ToolDefinition(
-        String name, String description, Map<String, Object> schema, String version) {
-      this.name = name;
-      this.description = description;
-      this.schema = schema;
-      this.version = version;
-    }
+        @Nullable
+        public Submitter getSubmitter() {
+            return submitter;
+        }
 
-    public String getName() {
-      return name;
-    }
+        /** Returns the ML app, or null to fall back on the tracer configured one. */
+        @Nullable
+        public String getMlApp() {
+            return mlApp;
+        }
 
-    public String getDescription() {
-      return description;
-    }
+        @Nullable
+        public Assessment getAssessment() {
+            return assessment;
+        }
 
-    public Map<String, Object> getSchema() {
-      return schema;
-    }
+        @Nullable
+        public String getReasoning() {
+            return reasoning;
+        }
 
-    public String getVersion() {
-      return version;
-    }
-  }
+        /**
+         * Returns the submission time in milliseconds since the epoch. This is the only ordering signal
+         * available to the backend when the same feedback is re-submitted with a new value.
+         */
+        public long getTimestampMs() {
+            return timestampMs;
+        }
 
-  public static class ToolResult {
-    private String name;
-    private String type;
-    private String toolId;
-    private String result;
+        /** Returns an unmodifiable view of the tags, or null if none were provided. */
+        @Nullable
+        public Map<String, Object> getTags() {
+            return tags;
+        }
 
-    public static ToolResult from(String name, String type, String toolId, String result) {
-      return new ToolResult(name, type, toolId, result);
+        /**
+         * Builds a {@link Feedback}. Exactly one target and exactly one value must be set; setting
+         * either twice, even to the same kind, is rejected so that a silently overwritten target cannot
+         * ship.
+         *
+         * <p>No method on this builder throws. The first problem found is remembered and reported by
+         * {@link Feedback#validate()} at submission time.
+         */
+        public static class Builder {
+            private TargetType targetType;
+            private String targetValue;
+            private String label;
+            private MetricType metricType;
+            private Object value;
+            private Submitter submitter;
+            private String mlApp;
+            private Assessment assessment;
+            private String reasoning;
+            private long timestampMs;
+            private Map<String, Object> tags;
+            private ValidationError error;
+
+            private Builder() {}
+
+            /**
+             * Targets the given span. Wire-equivalent to {@link #spanId(String)} with the span's id.
+             *
+             * @param span the span to attach the feedback to
+             * @return this builder
+             */
+            public Builder span(@Nonnull LLMObsSpan span) {
+                if (span == null) {
+                    return fail("invalid_span", "span must not be null");
+                }
+                return target(TargetType.SPAN_ID, String.valueOf(span.getSpanId()));
+            }
+
+            /**
+             * Targets the span with the given id.
+             *
+             * @param spanId the span identifier
+             * @return this builder
+             */
+            public Builder spanId(@Nonnull String spanId) {
+                return target(TargetType.SPAN_ID, spanId);
+            }
+
+            /**
+             * Targets the trace with the given id.
+             *
+             * @param traceId the trace identifier
+             * @return this builder
+             */
+            public Builder traceId(@Nonnull String traceId) {
+                return target(TargetType.TRACE_ID, traceId);
+            }
+
+            /**
+             * Targets the session with the given id.
+             *
+             * @param sessionId the session identifier
+             * @return this builder
+             */
+            public Builder sessionId(@Nonnull String sessionId) {
+                return target(TargetType.SESSION_ID, sessionId);
+            }
+
+            /**
+             * Targets a customer-defined business entity, e.g. {@code "incident-123"}. The key is opaque
+             * to the tracer: it is emitted as-is and never matched against any span.
+             *
+             * @param feedbackJoinKey the business entity key
+             * @return this builder
+             */
+            public Builder feedbackJoinKey(@Nonnull String feedbackJoinKey) {
+                return target(TargetType.FEEDBACK_JOIN_KEY, feedbackJoinKey);
+            }
+
+            /**
+             * Sets the name of the feedback metric, e.g. {@code "thumbs"}.
+             *
+             * @param label the metric name, must not contain a {@code '.'}
+             * @return this builder
+             */
+            public Builder label(@Nonnull String label) {
+                this.label = label;
+                return this;
+            }
+
+            /**
+             * Sets a categorical value, e.g. {@code "satisfied"}.
+             *
+             * @param value the value
+             * @return this builder
+             */
+            public Builder categoricalValue(@Nonnull String value) {
+                return value(MetricType.CATEGORICAL, value);
+            }
+
+            /**
+             * Sets a numeric value.
+             *
+             * @param value the value, must be finite as JSON has no representation for NaN nor infinity
+             * @return this builder
+             */
+            public Builder scoreValue(double value) {
+                if (!Double.isFinite(value)) {
+                    return fail("invalid_metric_value", "score value must be finite");
+                }
+                return value(MetricType.SCORE, value);
+            }
+
+            /**
+             * Sets a true/false value, e.g. a thumbs up or down.
+             *
+             * @param value the value
+             * @return this builder
+             */
+            public Builder booleanValue(boolean value) {
+                return value(MetricType.BOOLEAN, value);
+            }
+
+            /**
+             * Sets a structured value.
+             *
+             * @param value the value, serialized as a JSON object
+             * @return this builder
+             */
+            public Builder jsonValue(@Nonnull Map<String, Object> value) {
+                // Serialization happens later, on the submission worker, so the caller-owned map is
+                // snapshotted here to keep the submitted value stable, the same way tags are.
+                return value(MetricType.JSON, value == null ? null : Collections.unmodifiableMap(new HashMap<>(value)));
+            }
+
+            /**
+             * Sets a free-form text value, e.g. a written comment.
+             *
+             * @param value the value
+             * @return this builder
+             */
+            public Builder textValue(@Nonnull String value) {
+                return value(MetricType.TEXT, value);
+            }
+
+            /**
+             * Sets who submitted this feedback.
+             *
+             * @param id the identifier of the submitter
+             * @param type an optional qualifier, e.g. {@code "end_user"}
+             * @return this builder
+             */
+            public Builder submitter(@Nonnull String id, @Nullable String type) {
+                this.submitter = new Submitter(id, type);
+                return this;
+            }
+
+            /**
+             * Sets who submitted this feedback.
+             *
+             * @param submitter the submitter
+             * @return this builder
+             */
+            public Builder submitter(@Nonnull Submitter submitter) {
+                this.submitter = submitter;
+                return this;
+            }
+
+            /**
+             * Overrides the ML application this feedback belongs to.
+             *
+             * @param mlApp the ML app; when null or empty the tracer configured one is used
+             * @return this builder
+             */
+            public Builder mlApp(@Nullable String mlApp) {
+                this.mlApp = mlApp;
+                return this;
+            }
+
+            /**
+             * Sets whether the submitter considered the targeted operation a success.
+             *
+             * @param assessment the assessment
+             * @return this builder
+             */
+            public Builder assessment(@Nullable Assessment assessment) {
+                this.assessment = assessment;
+                return this;
+            }
+
+            /**
+             * Sets a free-form justification of this feedback.
+             *
+             * @param reasoning the reasoning
+             * @return this builder
+             */
+            public Builder reasoning(@Nullable String reasoning) {
+                this.reasoning = reasoning;
+                return this;
+            }
+
+            /**
+             * Overrides the submission time. Defaults to the time {@link #build()} is called.
+             *
+             * @param timestampMs the submission time, in milliseconds since the epoch
+             * @return this builder
+             */
+            public Builder timestampMs(long timestampMs) {
+                this.timestampMs = timestampMs;
+                return this;
+            }
+
+            /**
+             * Sets the tags attached to this feedback.
+             *
+             * @param tags a map of JSON serializable key-value pairs
+             * @return this builder
+             */
+            public Builder tags(@Nullable Map<String, Object> tags) {
+                this.tags = tags == null ? null : new HashMap<>(tags);
+                return this;
+            }
+
+            /**
+             * Adds a single tag to this feedback.
+             *
+             * @param key the tag key
+             * @param value the tag value
+             * @return this builder
+             */
+            public Builder tag(@Nonnull String key, @Nonnull Object value) {
+                if (this.tags == null) {
+                    this.tags = new HashMap<>();
+                }
+                this.tags.put(key, value);
+                return this;
+            }
+
+            /**
+             * Builds the feedback. Never throws: any problem is carried by the returned instance and
+             * reported by {@link Feedback#validate()} when it is submitted.
+             *
+             * @return the built feedback
+             */
+            public Feedback build() {
+                return new Feedback(
+                        this, timestampMs == 0 ? System.currentTimeMillis() : timestampMs, validationError());
+            }
+
+            /**
+             * Returns the first problem preventing submission, earlier builder errors taking priority.
+             */
+            @Nullable
+            private ValidationError validationError() {
+                if (error != null) {
+                    return error;
+                }
+                if (targetType == null) {
+                    return new ValidationError(
+                            "invalid_target_count",
+                            "exactly one of span, spanId, traceId, sessionId or feedbackJoinKey must be specified"
+                                    + " to submit feedback");
+                }
+                if (label == null || label.isEmpty()) {
+                    return new ValidationError(
+                            "invalid_metric_label", "label must be the specified name of the feedback metric");
+                }
+                if (label.indexOf('.') >= 0) {
+                    return new ValidationError("invalid_label_value", "label value must not contain a '.'");
+                }
+                if (metricType == null) {
+                    return new ValidationError(
+                            "invalid_metric_type",
+                            "exactly one of categoricalValue, scoreValue, booleanValue, jsonValue or textValue"
+                                    + " must be specified to submit feedback");
+                }
+                if (submitter == null) {
+                    return new ValidationError("invalid_submitter", "submitter must be specified to submit feedback");
+                }
+                if (submitter.getId() == null || submitter.getId().isEmpty()) {
+                    return new ValidationError("invalid_submitter", "submitter id must be a non-empty string");
+                }
+                if (timestampMs < 0) {
+                    return new ValidationError("invalid_timestamp", "timestampMs must be a non-negative long");
+                }
+                return null;
+            }
+
+            private Builder fail(String code, String message) {
+                if (this.error == null) {
+                    this.error = new ValidationError(code, message);
+                }
+                return this;
+            }
+
+            private Builder target(TargetType type, String value) {
+                if (targetType != null) {
+                    return fail(
+                            "invalid_target_count",
+                            "a feedback target was already set to "
+                                    + targetType.getWireKey()
+                                    + ", exactly one target must be specified");
+                }
+                if (value == null || value.isEmpty()) {
+                    return fail("invalid_" + type.getWireKey(), type.getWireKey() + " must be a non-empty string");
+                }
+                this.targetType = type;
+                this.targetValue = value;
+                return this;
+            }
+
+            private Builder value(MetricType type, Object value) {
+                if (metricType != null) {
+                    return fail(
+                            "invalid_metric_type",
+                            "a feedback value was already set as "
+                                    + metricType
+                                    + ", exactly one value must be specified");
+                }
+                if (value == null) {
+                    return fail("invalid_metric_value", "value must not be null for a " + type + " metric");
+                }
+                this.metricType = type;
+                this.value = value;
+                return this;
+            }
+        }
     }
 
-    private ToolResult(String name, String type, String toolId, String result) {
-      this.name = name;
-      this.type = type;
-      this.toolId = toolId;
-      this.result = result;
-    }
+    /** A prompt template and its associated attributes for an LLM call. */
+    public static final class Prompt {
+        private final String id;
+        private final String version;
+        private final String template;
+        private final List<LLMMessage> chatTemplate;
+        private final Map<String, String> variables;
+        private final Map<String, String> tags;
+        private final List<String> contextVariables;
+        private final List<String> queryVariables;
 
-    public String getName() {
-      return name;
-    }
+        public static Builder builder() {
+            return new Builder();
+        }
 
-    public String getType() {
-      return type;
-    }
+        private Prompt(Builder builder) {
+            this.id = builder.id;
+            this.version = builder.version;
+            this.template = builder.template;
+            this.chatTemplate = immutableList(builder.chatTemplate);
+            this.variables = immutableMap(builder.variables);
+            this.tags = immutableMap(builder.tags);
+            this.contextVariables = immutableList(builder.contextVariables);
+            this.queryVariables = immutableList(builder.queryVariables);
+        }
 
-    public String getToolId() {
-      return toolId;
-    }
+        public String getId() {
+            return id;
+        }
 
-    public String getResult() {
-      return result;
-    }
-  }
+        public String getVersion() {
+            return version;
+        }
 
-  public static class LLMMessage {
-    private String role;
-    private String content;
-    private List<ToolCall> toolCalls;
-    private List<ToolResult> toolResults;
+        public String getTemplate() {
+            return template;
+        }
 
-    public static LLMMessage from(String role, String content, List<ToolCall> toolCalls) {
-      return new LLMMessage(role, content, toolCalls, null);
-    }
+        public List<LLMMessage> getChatTemplate() {
+            return chatTemplate;
+        }
 
-    public static LLMMessage from(
-        String role, String content, List<ToolCall> toolCalls, List<ToolResult> toolResults) {
-      return new LLMMessage(role, content, toolCalls, toolResults);
-    }
+        public Map<String, String> getVariables() {
+            return variables;
+        }
 
-    public static LLMMessage from(String role, String content) {
-      return new LLMMessage(role, content, null, null);
-    }
+        public Map<String, String> getTags() {
+            return tags;
+        }
 
-    public static LLMMessage fromToolResults(String role, List<ToolResult> toolResults) {
-      return new LLMMessage(role, null, null, toolResults);
-    }
+        public List<String> getContextVariables() {
+            return contextVariables;
+        }
 
-    private LLMMessage(
-        String role, String content, List<ToolCall> toolCalls, List<ToolResult> toolResults) {
-      this.role = role;
-      this.content = content;
-      this.toolCalls = toolCalls;
-      this.toolResults = toolResults;
-    }
+        public List<String> getQueryVariables() {
+            return queryVariables;
+        }
 
-    public String getRole() {
-      return role;
-    }
+        private static <T> List<T> immutableList(List<T> values) {
+            return values == null ? null : Collections.unmodifiableList(new ArrayList<>(values));
+        }
 
-    public String getContent() {
-      return content;
-    }
+        private static <K, V> Map<K, V> immutableMap(Map<K, V> values) {
+            return values == null ? null : Collections.unmodifiableMap(new LinkedHashMap<>(values));
+        }
 
-    public List<ToolCall> getToolCalls() {
-      return toolCalls;
+        public static final class Builder {
+            private String id;
+            private String version;
+            private String template;
+            private List<LLMMessage> chatTemplate;
+            private Map<String, String> variables;
+            private Map<String, String> tags;
+            private List<String> contextVariables;
+            private List<String> queryVariables;
+
+            private Builder() {}
+
+            public Builder id(String id) {
+                this.id = id;
+                return this;
+            }
+
+            public Builder version(String version) {
+                this.version = version;
+                return this;
+            }
+
+            public Builder template(String template) {
+                this.template = template;
+                this.chatTemplate = null;
+                return this;
+            }
+
+            public Builder template(List<LLMMessage> chatTemplate) {
+                this.template = null;
+                this.chatTemplate = chatTemplate;
+                return this;
+            }
+
+            public Builder variables(Map<String, String> variables) {
+                this.variables = variables;
+                return this;
+            }
+
+            public Builder tags(Map<String, String> tags) {
+                this.tags = tags;
+                return this;
+            }
+
+            public Builder contextVariables(List<String> contextVariables) {
+                this.contextVariables = contextVariables;
+                return this;
+            }
+
+            public Builder queryVariables(List<String> queryVariables) {
+                this.queryVariables = queryVariables;
+                return this;
+            }
+
+            public Prompt build() {
+                return new Prompt(this);
+            }
+        }
     }
 
-    public List<ToolResult> getToolResults() {
-      return toolResults;
-    }
-  }
+    public static class ToolCall {
+        private String name;
+        private String type;
+        private String toolId;
+        private Map<String, Object> arguments;
 
-  public static class Document {
-    private String text;
-    private String name;
-    private String id;
-    private Double score;
+        public static ToolCall from(String name, String type, String toolId, Map<String, Object> arguments) {
+            return new ToolCall(name, type, toolId, arguments);
+        }
 
-    public static Document from(String text) {
-      return new Document(text, null, null, null);
-    }
+        private ToolCall(String name, String type, String toolId, Map<String, Object> arguments) {
+            this.name = name;
+            this.type = type;
+            this.toolId = toolId;
+            this.arguments = arguments;
+        }
 
-    public static Document from(
-        String text, @Nullable String name, @Nullable String id, @Nullable Double score) {
-      return new Document(text, name, id, score);
-    }
+        public String getName() {
+            return name;
+        }
 
-    private Document(String text, String name, String id, Double score) {
-      this.text = text;
-      this.name = name;
-      this.id = id;
-      this.score = score;
-    }
+        public String getType() {
+            return type;
+        }
 
-    public String getText() {
-      return text;
-    }
+        public String getToolId() {
+            return toolId;
+        }
 
-    public String getName() {
-      return name;
+        public Map<String, Object> getArguments() {
+            return arguments;
+        }
     }
 
-    public String getId() {
-      return id;
-    }
+    public static class ToolDefinition {
+        private String name;
+        private String description;
+        private Map<String, Object> schema;
+        private String version;
 
-    public Double getScore() {
-      return score;
-    }
-  }
+        public static ToolDefinition from(String name) {
+            return new ToolDefinition(name, null, null, null);
+        }
 
-  /** A tool declared in an agent manifest. */
-  public static final class AgentTool {
-    private final String name;
-    private final String description;
-    private final Map<String, Object> parameters;
+        public static ToolDefinition from(String name, String description) {
+            return new ToolDefinition(name, description, null, null);
+        }
 
-    public static AgentTool from(String name) {
-      return new AgentTool(name, null, null);
-    }
+        public static ToolDefinition from(String name, String description, Map<String, Object> schema) {
+            return new ToolDefinition(name, description, schema, null);
+        }
 
-    /**
-     * Creates an agent tool with a name, description, and parameter schema.
-     *
-     * @param name the tool name
-     * @param description an optional description of what the tool does
-     * @param parameters optional parameter schema; the map is shallow-copied — callers must not
-     *     mutate nested values after construction
-     */
-    public static AgentTool from(
-        String name, @Nullable String description, @Nullable Map<String, Object> parameters) {
-      return new AgentTool(name, description, parameters);
-    }
+        public static ToolDefinition from(String name, String description, Map<String, Object> schema, String version) {
+            return new ToolDefinition(name, description, schema, version);
+        }
 
-    private AgentTool(String name, String description, Map<String, Object> parameters) {
-      this.name = name;
-      this.description = description;
-      this.parameters =
-          parameters == null ? null : Collections.unmodifiableMap(new LinkedHashMap<>(parameters));
-    }
+        private ToolDefinition(String name, String description, Map<String, Object> schema, String version) {
+            this.name = name;
+            this.description = description;
+            this.schema = schema;
+            this.version = version;
+        }
 
-    @Nullable
-    public String getName() {
-      return name;
-    }
+        public String getName() {
+            return name;
+        }
 
-    @Nullable
-    public String getDescription() {
-      return description;
-    }
+        public String getDescription() {
+            return description;
+        }
 
-    @Nullable
-    public Map<String, Object> getParameters() {
-      return parameters;
-    }
-  }
-
-  /**
-   * Declares the configuration of an agent span: what model it calls, what instructions it runs
-   * with, and which tools it has available.
-   *
-   * <p>Build via {@link AgentManifest#builder()} and pass to {@link
-   * LLMObsSpan#annotateAgentManifest(AgentManifest)}. Only applied on agent spans; ignored on other
-   * span kinds. A subsequent call on the same span merges with the previous manifest.
-   */
-  public static final class AgentManifest {
-    private final String name;
-    private final String instructions;
-    private final String model;
-    private final Map<String, Object> modelSettings;
-    private final List<AgentTool> tools;
-
-    public static Builder builder() {
-      return new Builder();
-    }
+        public Map<String, Object> getSchema() {
+            return schema;
+        }
 
-    private AgentManifest(Builder builder) {
-      this.name = builder.name;
-      this.instructions = builder.instructions;
-      this.model = builder.model;
-      this.modelSettings =
-          builder.modelSettings == null
-              ? null
-              : Collections.unmodifiableMap(new LinkedHashMap<>(builder.modelSettings));
-      this.tools =
-          builder.tools == null
-              ? null
-              : Collections.unmodifiableList(new ArrayList<>(builder.tools));
+        public String getVersion() {
+            return version;
+        }
     }
 
-    @Nullable
-    public String getName() {
-      return name;
-    }
+    public static class ToolResult {
+        private String name;
+        private String type;
+        private String toolId;
+        private String result;
 
-    @Nullable
-    public String getInstructions() {
-      return instructions;
+        public static ToolResult from(String name, String type, String toolId, String result) {
+            return new ToolResult(name, type, toolId, result);
+        }
+
+        private ToolResult(String name, String type, String toolId, String result) {
+            this.name = name;
+            this.type = type;
+            this.toolId = toolId;
+            this.result = result;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public String getToolId() {
+            return toolId;
+        }
+
+        public String getResult() {
+            return result;
+        }
     }
 
-    @Nullable
-    public String getModel() {
-      return model;
+    public static class LLMMessage {
+        private String role;
+        private String content;
+        private List<ToolCall> toolCalls;
+        private List<ToolResult> toolResults;
+
+        public static LLMMessage from(String role, String content, List<ToolCall> toolCalls) {
+            return new LLMMessage(role, content, toolCalls, null);
+        }
+
+        public static LLMMessage from(
+                String role, String content, List<ToolCall> toolCalls, List<ToolResult> toolResults) {
+            return new LLMMessage(role, content, toolCalls, toolResults);
+        }
+
+        public static LLMMessage from(String role, String content) {
+            return new LLMMessage(role, content, null, null);
+        }
+
+        public static LLMMessage fromToolResults(String role, List<ToolResult> toolResults) {
+            return new LLMMessage(role, null, null, toolResults);
+        }
+
+        private LLMMessage(String role, String content, List<ToolCall> toolCalls, List<ToolResult> toolResults) {
+            this.role = role;
+            this.content = content;
+            this.toolCalls = toolCalls;
+            this.toolResults = toolResults;
+        }
+
+        public String getRole() {
+            return role;
+        }
+
+        public String getContent() {
+            return content;
+        }
+
+        public List<ToolCall> getToolCalls() {
+            return toolCalls;
+        }
+
+        public List<ToolResult> getToolResults() {
+            return toolResults;
+        }
     }
 
-    @Nullable
-    public Map<String, Object> getModelSettings() {
-      return modelSettings;
+    public static class Document {
+        private String text;
+        private String name;
+        private String id;
+        private Double score;
+
+        public static Document from(String text) {
+            return new Document(text, null, null, null);
+        }
+
+        public static Document from(String text, @Nullable String name, @Nullable String id, @Nullable Double score) {
+            return new Document(text, name, id, score);
+        }
+
+        private Document(String text, String name, String id, Double score) {
+            this.text = text;
+            this.name = name;
+            this.id = id;
+            this.score = score;
+        }
+
+        public String getText() {
+            return text;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public Double getScore() {
+            return score;
+        }
     }
 
-    @Nullable
-    public List<AgentTool> getTools() {
-      return tools;
+    /** A tool declared in an agent manifest. */
+    public static final class AgentTool {
+        private final String name;
+        private final String description;
+        private final Map<String, Object> parameters;
+
+        public static AgentTool from(String name) {
+            return new AgentTool(name, null, null);
+        }
+
+        /**
+         * Creates an agent tool with a name, description, and parameter schema.
+         *
+         * @param name the tool name
+         * @param description an optional description of what the tool does
+         * @param parameters optional parameter schema; the map is shallow-copied — callers must not
+         *     mutate nested values after construction
+         */
+        public static AgentTool from(
+                String name, @Nullable String description, @Nullable Map<String, Object> parameters) {
+            return new AgentTool(name, description, parameters);
+        }
+
+        private AgentTool(String name, String description, Map<String, Object> parameters) {
+            this.name = name;
+            this.description = description;
+            this.parameters = parameters == null ? null : Collections.unmodifiableMap(new LinkedHashMap<>(parameters));
+        }
+
+        @Nullable
+        public String getName() {
+            return name;
+        }
+
+        @Nullable
+        public String getDescription() {
+            return description;
+        }
+
+        @Nullable
+        public Map<String, Object> getParameters() {
+            return parameters;
+        }
     }
 
-    public static final class Builder {
-      private String name;
-      private String instructions;
-      private String model;
-      private Map<String, Object> modelSettings;
-      private List<AgentTool> tools;
-
-      private Builder() {}
-
-      public Builder name(String name) {
-        this.name = name;
-        return this;
-      }
-
-      public Builder instructions(String instructions) {
-        this.instructions = instructions;
-        return this;
-      }
-
-      public Builder model(String model) {
-        this.model = model;
-        return this;
-      }
-
-      public Builder modelSettings(Map<String, Object> modelSettings) {
-        this.modelSettings = modelSettings;
-        return this;
-      }
-
-      public Builder tools(List<AgentTool> tools) {
-        this.tools = tools;
-        return this;
-      }
-
-      public AgentManifest build() {
-        return new AgentManifest(this);
-      }
+    /**
+     * Declares the configuration of an agent span: what model it calls, what instructions it runs
+     * with, and which tools it has available.
+     *
+     * <p>Build via {@link AgentManifest#builder()} and pass to {@link
+     * LLMObsSpan#annotateAgentManifest(AgentManifest)}. Only applied on agent spans; ignored on other
+     * span kinds. A subsequent call on the same span merges with the previous manifest.
+     */
+    public static final class AgentManifest {
+        private final String name;
+        private final String instructions;
+        private final String model;
+        private final Map<String, Object> modelSettings;
+        private final List<AgentTool> tools;
+
+        public static Builder builder() {
+            return new Builder();
+        }
+
+        private AgentManifest(Builder builder) {
+            this.name = builder.name;
+            this.instructions = builder.instructions;
+            this.model = builder.model;
+            this.modelSettings = builder.modelSettings == null
+                    ? null
+                    : Collections.unmodifiableMap(new LinkedHashMap<>(builder.modelSettings));
+            this.tools = builder.tools == null ? null : Collections.unmodifiableList(new ArrayList<>(builder.tools));
+        }
+
+        @Nullable
+        public String getName() {
+            return name;
+        }
+
+        @Nullable
+        public String getInstructions() {
+            return instructions;
+        }
+
+        @Nullable
+        public String getModel() {
+            return model;
+        }
+
+        @Nullable
+        public Map<String, Object> getModelSettings() {
+            return modelSettings;
+        }
+
+        @Nullable
+        public List<AgentTool> getTools() {
+            return tools;
+        }
+
+        public static final class Builder {
+            private String name;
+            private String instructions;
+            private String model;
+            private Map<String, Object> modelSettings;
+            private List<AgentTool> tools;
+
+            private Builder() {}
+
+            public Builder name(String name) {
+                this.name = name;
+                return this;
+            }
+
+            public Builder instructions(String instructions) {
+                this.instructions = instructions;
+                return this;
+            }
+
+            public Builder model(String model) {
+                this.model = model;
+                return this;
+            }
+
+            public Builder modelSettings(Map<String, Object> modelSettings) {
+                this.modelSettings = modelSettings;
+                return this;
+            }
+
+            public Builder tools(List<AgentTool> tools) {
+                this.tools = tools;
+                return this;
+            }
+
+            public AgentManifest build() {
+                return new AgentManifest(this);
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObsSpan.java b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObsSpan.java
index c5f447a0b4c..016231b444a 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObsSpan.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObsSpan.java
@@ -7,201 +7,201 @@
 /** This interface represent an individual LLM Obs span. */
 public interface LLMObsSpan {
 
-  /**
-   * Annotate the span with inputs and outputs for LLM spans
-   *
-   * @param inputMessages The input messages of the span in the form of a list
-   * @param outputMessages The output messages of the span in the form of a list
-   */
-  void annotateIO(List<LLMObs.LLMMessage> inputMessages, List<LLMObs.LLMMessage> outputMessages);
-
-  /**
-   * Annotate an embedding span with document inputs and a string output.
-   *
-   * @param inputDocuments The input documents of the span
-   * @param outputData The output data of the span in the form of a string
-   */
-  default void annotateEmbeddingIO(List<LLMObs.Document> inputDocuments, String outputData) {
-    annotateIO((String) null, outputData);
-  }
-
-  /**
-   * Annotate a retrieval span with a string input and document outputs.
-   *
-   * @param inputData The input data of the span in the form of a string
-   * @param outputDocuments The output documents of the span
-   */
-  default void annotateRetrievalIO(String inputData, List<LLMObs.Document> outputDocuments) {
-    annotateIO(inputData, (String) null);
-  }
-
-  /**
-   * Annotate the span with inputs and outputs
-   *
-   * @param inputData The input data of the span in the form of a string
-   * @param outputData The output data of the span in the form of a string
-   */
-  void annotateIO(String inputData, String outputData);
-
-  /**
-   * Annotate an LLM span with the prompt used for the LLM call.
-   *
-   * <p>This annotation is ignored for non-LLM spans.
-   *
-   * @param prompt The prompt used for the LLM call
-   */
-  default void annotatePrompt(LLMObs.Prompt prompt) {}
-
-  /**
-   * Annotate the span with the definitions of tools available to the LLM.
-   *
-   * @param toolDefinitions The tool definitions supplied to the LLM
-   */
-  default void setToolDefinitions(List<LLMObs.ToolDefinition> toolDefinitions) {}
-
-  /**
-   * Annotate an agent span with its manifest configuration.
-   *
-   * <p>This annotation is ignored for non-agent spans.
-   *
-   * <p>A fully-empty manifest (no fields set) still writes the {@code framework} key.
-   *
-   * @param agentManifest The agent manifest configuration
-   */
-  default void annotateAgentManifest(LLMObs.AgentManifest agentManifest) {}
-
-  /**
-   * Annotate the span with metadata
-   *
-   * @param metadata A map of JSON serializable key-value pairs that contains metadata information
-   *     relevant to the input or output operation described by the span
-   */
-  void setMetadata(Map<String, Object> metadata);
-
-  /**
-   * Annotate the span with metrics
-   *
-   * @param metrics A map of JSON serializable keys and numeric values that users can add as metrics
-   *     relevant to the operation described by the span (input_tokens, output_tokens, total_tokens,
-   *     etc.).
-   */
-  void setMetrics(Map<String, Number> metrics);
-
-  /**
-   * Annotate the span with a single metric key value pair for the span’s context (number of tokens
-   * document length, etc).
-   *
-   * @param key the name of the metric
-   * @param value the value of the metric
-   */
-  void setMetric(CharSequence key, int value);
-
-  /**
-   * Annotate the span with a single metric key value pair for the span’s context (number of tokens
-   * document length, etc).
-   *
-   * @param key the name of the metric
-   * @param value the value of the metric
-   */
-  void setMetric(CharSequence key, long value);
-
-  /**
-   * Annotate the span with a single metric key value pair for the span’s context (number of tokens
-   * document length, etc).
-   *
-   * @param key the name of the metric
-   * @param value the value of the metric
-   */
-  void setMetric(CharSequence key, double value);
-
-  /**
-   * Annotate the span with tags
-   *
-   * @param tags An map of JSON serializable key-value pairs that users can add as tags regarding
-   *     the span’s context (session, environment, system, versioning, etc.).
-   */
-  void setTags(Map<String, Object> tags);
-
-  /**
-   * Annotate the span with a single tag key value pair as a tag regarding the span’s context
-   * (session, environment, system, versioning, etc.).
-   *
-   * @param key the key of the tag
-   * @param value the value of the tag
-   */
-  void setTag(String key, String value);
-
-  /**
-   * Annotate the span with a single tag key value pair as a tag regarding the span’s context
-   * (session, environment, system, versioning, etc.).
-   *
-   * @param key the key of the tag
-   * @param value the value of the tag
-   */
-  void setTag(String key, boolean value);
-
-  /**
-   * Annotate the span with a single tag key value pair as a tag regarding the span’s context
-   * (session, environment, system, versioning, etc.).
-   *
-   * @param key the key of the tag
-   * @param value the value of the tag
-   */
-  void setTag(String key, int value);
-
-  /**
-   * Annotate the span with a single tag key value pair as a tag regarding the span’s context
-   * (session, environment, system, versioning, etc.).
-   *
-   * @param key the key of the tag
-   * @param value the value of the tag
-   */
-  void setTag(String key, long value);
-
-  /**
-   * Annotate the span with a single tag key value pair as a tag regarding the span’s context
-   * (session, environment, system, versioning, etc.).
-   *
-   * @param key the key of the tag
-   * @param value the value of the tag
-   */
-  void setTag(String key, double value);
-
-  /**
-   * Annotate the span to indicate that an error occurred
-   *
-   * @param error whether an error occurred
-   */
-  void setError(boolean error);
-
-  /**
-   * Annotate the span with an error message
-   *
-   * @param errorMessage the message of the error
-   */
-  void setErrorMessage(String errorMessage);
-
-  /**
-   * Annotate the span with a throwable
-   *
-   * @param throwable the errored throwable
-   */
-  void addThrowable(Throwable throwable);
-
-  /** Finishes (closes) a span */
-  void finish();
-
-  /**
-   * Gets the TraceId of the span's trace.
-   *
-   * @return The TraceId of the span's trace, or {@link DDTraceId#ZERO} if not set.
-   */
-  DDTraceId getTraceId();
-
-  /**
-   * Gets the SpanId.
-   *
-   * @return The span identifier.
-   */
-  long getSpanId();
+    /**
+     * Annotate the span with inputs and outputs for LLM spans
+     *
+     * @param inputMessages The input messages of the span in the form of a list
+     * @param outputMessages The output messages of the span in the form of a list
+     */
+    void annotateIO(List<LLMObs.LLMMessage> inputMessages, List<LLMObs.LLMMessage> outputMessages);
+
+    /**
+     * Annotate an embedding span with document inputs and a string output.
+     *
+     * @param inputDocuments The input documents of the span
+     * @param outputData The output data of the span in the form of a string
+     */
+    default void annotateEmbeddingIO(List<LLMObs.Document> inputDocuments, String outputData) {
+        annotateIO((String) null, outputData);
+    }
+
+    /**
+     * Annotate a retrieval span with a string input and document outputs.
+     *
+     * @param inputData The input data of the span in the form of a string
+     * @param outputDocuments The output documents of the span
+     */
+    default void annotateRetrievalIO(String inputData, List<LLMObs.Document> outputDocuments) {
+        annotateIO(inputData, (String) null);
+    }
+
+    /**
+     * Annotate the span with inputs and outputs
+     *
+     * @param inputData The input data of the span in the form of a string
+     * @param outputData The output data of the span in the form of a string
+     */
+    void annotateIO(String inputData, String outputData);
+
+    /**
+     * Annotate an LLM span with the prompt used for the LLM call.
+     *
+     * <p>This annotation is ignored for non-LLM spans.
+     *
+     * @param prompt The prompt used for the LLM call
+     */
+    default void annotatePrompt(LLMObs.Prompt prompt) {}
+
+    /**
+     * Annotate the span with the definitions of tools available to the LLM.
+     *
+     * @param toolDefinitions The tool definitions supplied to the LLM
+     */
+    default void setToolDefinitions(List<LLMObs.ToolDefinition> toolDefinitions) {}
+
+    /**
+     * Annotate an agent span with its manifest configuration.
+     *
+     * <p>This annotation is ignored for non-agent spans.
+     *
+     * <p>A fully-empty manifest (no fields set) still writes the {@code framework} key.
+     *
+     * @param agentManifest The agent manifest configuration
+     */
+    default void annotateAgentManifest(LLMObs.AgentManifest agentManifest) {}
+
+    /**
+     * Annotate the span with metadata
+     *
+     * @param metadata A map of JSON serializable key-value pairs that contains metadata information
+     *     relevant to the input or output operation described by the span
+     */
+    void setMetadata(Map<String, Object> metadata);
+
+    /**
+     * Annotate the span with metrics
+     *
+     * @param metrics A map of JSON serializable keys and numeric values that users can add as metrics
+     *     relevant to the operation described by the span (input_tokens, output_tokens, total_tokens,
+     *     etc.).
+     */
+    void setMetrics(Map<String, Number> metrics);
+
+    /**
+     * Annotate the span with a single metric key value pair for the span’s context (number of tokens
+     * document length, etc).
+     *
+     * @param key the name of the metric
+     * @param value the value of the metric
+     */
+    void setMetric(CharSequence key, int value);
+
+    /**
+     * Annotate the span with a single metric key value pair for the span’s context (number of tokens
+     * document length, etc).
+     *
+     * @param key the name of the metric
+     * @param value the value of the metric
+     */
+    void setMetric(CharSequence key, long value);
+
+    /**
+     * Annotate the span with a single metric key value pair for the span’s context (number of tokens
+     * document length, etc).
+     *
+     * @param key the name of the metric
+     * @param value the value of the metric
+     */
+    void setMetric(CharSequence key, double value);
+
+    /**
+     * Annotate the span with tags
+     *
+     * @param tags An map of JSON serializable key-value pairs that users can add as tags regarding
+     *     the span’s context (session, environment, system, versioning, etc.).
+     */
+    void setTags(Map<String, Object> tags);
+
+    /**
+     * Annotate the span with a single tag key value pair as a tag regarding the span’s context
+     * (session, environment, system, versioning, etc.).
+     *
+     * @param key the key of the tag
+     * @param value the value of the tag
+     */
+    void setTag(String key, String value);
+
+    /**
+     * Annotate the span with a single tag key value pair as a tag regarding the span’s context
+     * (session, environment, system, versioning, etc.).
+     *
+     * @param key the key of the tag
+     * @param value the value of the tag
+     */
+    void setTag(String key, boolean value);
+
+    /**
+     * Annotate the span with a single tag key value pair as a tag regarding the span’s context
+     * (session, environment, system, versioning, etc.).
+     *
+     * @param key the key of the tag
+     * @param value the value of the tag
+     */
+    void setTag(String key, int value);
+
+    /**
+     * Annotate the span with a single tag key value pair as a tag regarding the span’s context
+     * (session, environment, system, versioning, etc.).
+     *
+     * @param key the key of the tag
+     * @param value the value of the tag
+     */
+    void setTag(String key, long value);
+
+    /**
+     * Annotate the span with a single tag key value pair as a tag regarding the span’s context
+     * (session, environment, system, versioning, etc.).
+     *
+     * @param key the key of the tag
+     * @param value the value of the tag
+     */
+    void setTag(String key, double value);
+
+    /**
+     * Annotate the span to indicate that an error occurred
+     *
+     * @param error whether an error occurred
+     */
+    void setError(boolean error);
+
+    /**
+     * Annotate the span with an error message
+     *
+     * @param errorMessage the message of the error
+     */
+    void setErrorMessage(String errorMessage);
+
+    /**
+     * Annotate the span with a throwable
+     *
+     * @param throwable the errored throwable
+     */
+    void addThrowable(Throwable throwable);
+
+    /** Finishes (closes) a span */
+    void finish();
+
+    /**
+     * Gets the TraceId of the span's trace.
+     *
+     * @return The TraceId of the span's trace, or {@link DDTraceId#ZERO} if not set.
+     */
+    DDTraceId getTraceId();
+
+    /**
+     * Gets the SpanId.
+     *
+     * @return The span identifier.
+     */
+    long getSpanId();
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObsSpanData.java b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObsSpanData.java
index 5abfad20940..a5718dbab9a 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObsSpanData.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObsSpanData.java
@@ -11,51 +11,51 @@
  */
 public interface LLMObsSpanData {
 
-  /**
-   * Gets the LLM Observability span kind.
-   *
-   * @return the span kind
-   */
-  String getKind();
-
-  /**
-   * Gets the input content associated with the span.
-   *
-   * @return the input represented as messages
-   */
-  List<LLMObs.LLMMessage> getInput();
-
-  /**
-   * Replaces the input content associated with the span.
-   *
-   * <p>Other input metadata, including prompt tracking information, is preserved.
-   *
-   * @param input the new input represented as messages
-   * @throws NullPointerException if {@code input} is {@code null}
-   */
-  void setInput(List<LLMObs.LLMMessage> input);
-
-  /**
-   * Gets the output content associated with the span.
-   *
-   * @return the output represented as messages
-   */
-  List<LLMObs.LLMMessage> getOutput();
-
-  /**
-   * Replaces the output content associated with the span.
-   *
-   * @param output the new output represented as messages
-   * @throws NullPointerException if {@code output} is {@code null}
-   */
-  void setOutput(List<LLMObs.LLMMessage> output);
-
-  /**
-   * Gets an LLM Observability tag from the span.
-   *
-   * @param key the unprefixed tag name
-   * @return the tag value, or {@code null} when the tag is not present
-   */
-  @Nullable
-  String getTag(String key);
+    /**
+     * Gets the LLM Observability span kind.
+     *
+     * @return the span kind
+     */
+    String getKind();
+
+    /**
+     * Gets the input content associated with the span.
+     *
+     * @return the input represented as messages
+     */
+    List<LLMObs.LLMMessage> getInput();
+
+    /**
+     * Replaces the input content associated with the span.
+     *
+     * <p>Other input metadata, including prompt tracking information, is preserved.
+     *
+     * @param input the new input represented as messages
+     * @throws NullPointerException if {@code input} is {@code null}
+     */
+    void setInput(List<LLMObs.LLMMessage> input);
+
+    /**
+     * Gets the output content associated with the span.
+     *
+     * @return the output represented as messages
+     */
+    List<LLMObs.LLMMessage> getOutput();
+
+    /**
+     * Replaces the output content associated with the span.
+     *
+     * @param output the new output represented as messages
+     * @throws NullPointerException if {@code output} is {@code null}
+     */
+    void setOutput(List<LLMObs.LLMMessage> output);
+
+    /**
+     * Gets an LLM Observability tag from the span.
+     *
+     * @param key the unprefixed tag name
+     * @return the tag value, or {@code null} when the tag is not present
+     */
+    @Nullable
+    String getTag(String key);
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObsSpanProcessor.java b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObsSpanProcessor.java
index 2e035a3c9ac..25ac05936fc 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObsSpanProcessor.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObsSpanProcessor.java
@@ -6,15 +6,15 @@
 @FunctionalInterface
 public interface LLMObsSpanProcessor {
 
-  /**
-   * Processes an LLM Observability span.
-   *
-   * <p>The processor may mutate and return {@code span}, or return {@code null} to omit the span
-   * from LLM Observability.
-   *
-   * @param span the span being processed
-   * @return the span to send, or {@code null} to omit it
-   */
-  @Nullable
-  LLMObsSpanData process(LLMObsSpanData span);
+    /**
+     * Processes an LLM Observability span.
+     *
+     * <p>The processor may mutate and return {@code span}, or return {@code null} to omit the span
+     * from LLM Observability.
+     *
+     * @param span the span being processed
+     * @return the span to send, or {@code null} to omit it
+     */
+    @Nullable
+    LLMObsSpanData process(LLMObsSpanData span);
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObsTags.java b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObsTags.java
index 0a7931589b5..e3ef383e255 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObsTags.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObsTags.java
@@ -2,21 +2,21 @@
 
 // Well known tags for llm obs
 public class LLMObsTags {
-  public static final String ML_APP = "ml_app";
-  public static final String SESSION_ID = "session_id";
-  public static final String AGENT_VERSION = "agent_version";
+    public static final String ML_APP = "ml_app";
+    public static final String SESSION_ID = "session_id";
+    public static final String AGENT_VERSION = "agent_version";
 
-  // meta
-  public static final String METADATA = "metadata";
+    // meta
+    public static final String METADATA = "metadata";
 
-  // LLM spans related
-  public static final String MODEL_NAME = "model_name";
-  public static final String MODEL_VERSION = "model_version";
-  public static final String MODEL_PROVIDER = "model_provider";
-  public static final String TOOL_DEFINITIONS = "tool_definitions";
-  public static final String AGENT_MANIFEST = "agent_manifest";
+    // LLM spans related
+    public static final String MODEL_NAME = "model_name";
+    public static final String MODEL_VERSION = "model_version";
+    public static final String MODEL_PROVIDER = "model_provider";
+    public static final String TOOL_DEFINITIONS = "tool_definitions";
+    public static final String AGENT_MANIFEST = "agent_manifest";
 
-  // Agent attribution
-  public static final String PAGENT_SPAN_ID = "pagent_span_id";
-  public static final String PAGENT_NAME = "pagent_name";
+    // Agent attribution
+    public static final String PAGENT_SPAN_ID = "pagent_span_id";
+    public static final String PAGENT_NAME = "pagent_name";
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsEvalProcessor.java b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsEvalProcessor.java
index 403c0afce02..d93fc2d8398 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsEvalProcessor.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsEvalProcessor.java
@@ -5,29 +5,20 @@
 import java.util.Map;
 
 public class NoOpLLMObsEvalProcessor implements LLMObs.LLMObsEvalProcessor {
-  public static final NoOpLLMObsEvalProcessor INSTANCE = new NoOpLLMObsEvalProcessor();
+    public static final NoOpLLMObsEvalProcessor INSTANCE = new NoOpLLMObsEvalProcessor();
 
-  @Override
-  public void SubmitEvaluation(
-      LLMObsSpan llmObsSpan, String label, double scoreValue, Map<String, Object> tags) {}
+    @Override
+    public void SubmitEvaluation(LLMObsSpan llmObsSpan, String label, double scoreValue, Map<String, Object> tags) {}
 
-  @Override
-  public void SubmitEvaluation(
-      LLMObsSpan llmObsSpan,
-      String label,
-      double scoreValue,
-      String mlApp,
-      Map<String, Object> tags) {}
+    @Override
+    public void SubmitEvaluation(
+            LLMObsSpan llmObsSpan, String label, double scoreValue, String mlApp, Map<String, Object> tags) {}
 
-  @Override
-  public void SubmitEvaluation(
-      LLMObsSpan llmObsSpan, String label, String categoricalValue, Map<String, Object> tags) {}
+    @Override
+    public void SubmitEvaluation(
+            LLMObsSpan llmObsSpan, String label, String categoricalValue, Map<String, Object> tags) {}
 
-  @Override
-  public void SubmitEvaluation(
-      LLMObsSpan llmObsSpan,
-      String label,
-      String categoricalValue,
-      String mlApp,
-      Map<String, Object> tags) {}
+    @Override
+    public void SubmitEvaluation(
+            LLMObsSpan llmObsSpan, String label, String categoricalValue, String mlApp, Map<String, Object> tags) {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsFeedbackProcessor.java b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsFeedbackProcessor.java
index d751a94e628..1ce5c91deed 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsFeedbackProcessor.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsFeedbackProcessor.java
@@ -3,8 +3,8 @@
 import datadog.trace.api.llmobs.LLMObs;
 
 public class NoOpLLMObsFeedbackProcessor implements LLMObs.LLMObsFeedbackProcessor {
-  public static final NoOpLLMObsFeedbackProcessor INSTANCE = new NoOpLLMObsFeedbackProcessor();
+    public static final NoOpLLMObsFeedbackProcessor INSTANCE = new NoOpLLMObsFeedbackProcessor();
 
-  @Override
-  public void submitFeedback(LLMObs.Feedback feedback) {}
+    @Override
+    public void submitFeedback(LLMObs.Feedback feedback) {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsSpan.java b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsSpan.java
index ec393ab6844..6c8aebefd73 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsSpan.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsSpan.java
@@ -7,75 +7,75 @@
 import java.util.Map;
 
 public class NoOpLLMObsSpan implements LLMObsSpan {
-  public static final LLMObsSpan INSTANCE = new NoOpLLMObsSpan();
+    public static final LLMObsSpan INSTANCE = new NoOpLLMObsSpan();
 
-  @Override
-  public void annotateIO(List<LLMObs.LLMMessage> inputData, List<LLMObs.LLMMessage> outputData) {}
+    @Override
+    public void annotateIO(List<LLMObs.LLMMessage> inputData, List<LLMObs.LLMMessage> outputData) {}
 
-  @Override
-  public void annotateIO(String inputData, String outputData) {}
+    @Override
+    public void annotateIO(String inputData, String outputData) {}
 
-  @Override
-  public void annotatePrompt(LLMObs.Prompt prompt) {}
+    @Override
+    public void annotatePrompt(LLMObs.Prompt prompt) {}
 
-  @Override
-  public void annotateAgentManifest(LLMObs.AgentManifest manifest) {}
+    @Override
+    public void annotateAgentManifest(LLMObs.AgentManifest manifest) {}
 
-  @Override
-  public void setToolDefinitions(List<LLMObs.ToolDefinition> toolDefinitions) {}
+    @Override
+    public void setToolDefinitions(List<LLMObs.ToolDefinition> toolDefinitions) {}
 
-  @Override
-  public void setMetadata(Map<String, Object> metadata) {}
+    @Override
+    public void setMetadata(Map<String, Object> metadata) {}
 
-  @Override
-  public void setMetrics(Map<String, Number> metrics) {}
+    @Override
+    public void setMetrics(Map<String, Number> metrics) {}
 
-  @Override
-  public void setMetric(CharSequence key, int value) {}
+    @Override
+    public void setMetric(CharSequence key, int value) {}
 
-  @Override
-  public void setMetric(CharSequence key, long value) {}
+    @Override
+    public void setMetric(CharSequence key, long value) {}
 
-  @Override
-  public void setMetric(CharSequence key, double value) {}
+    @Override
+    public void setMetric(CharSequence key, double value) {}
 
-  @Override
-  public void setTags(Map<String, Object> tags) {}
+    @Override
+    public void setTags(Map<String, Object> tags) {}
 
-  @Override
-  public void setTag(String key, String value) {}
+    @Override
+    public void setTag(String key, String value) {}
 
-  @Override
-  public void setTag(String key, boolean value) {}
+    @Override
+    public void setTag(String key, boolean value) {}
 
-  @Override
-  public void setTag(String key, int value) {}
+    @Override
+    public void setTag(String key, int value) {}
 
-  @Override
-  public void setTag(String key, long value) {}
+    @Override
+    public void setTag(String key, long value) {}
 
-  @Override
-  public void setTag(String key, double value) {}
+    @Override
+    public void setTag(String key, double value) {}
 
-  @Override
-  public void setError(boolean error) {}
+    @Override
+    public void setError(boolean error) {}
 
-  @Override
-  public void setErrorMessage(String errorMessage) {}
+    @Override
+    public void setErrorMessage(String errorMessage) {}
 
-  @Override
-  public void addThrowable(Throwable throwable) {}
+    @Override
+    public void addThrowable(Throwable throwable) {}
 
-  @Override
-  public void finish() {}
+    @Override
+    public void finish() {}
 
-  @Override
-  public DDTraceId getTraceId() {
-    return DDTraceId.ZERO;
-  }
+    @Override
+    public DDTraceId getTraceId() {
+        return DDTraceId.ZERO;
+    }
 
-  @Override
-  public long getSpanId() {
-    return 0;
-  }
+    @Override
+    public long getSpanId() {
+        return 0;
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsSpanFactory.java b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsSpanFactory.java
index 4c3469b785c..90b17dd803d 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsSpanFactory.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsSpanFactory.java
@@ -5,56 +5,48 @@
 import javax.annotation.Nullable;
 
 public class NoOpLLMObsSpanFactory implements LLMObs.LLMObsSpanFactory {
-  public static final NoOpLLMObsSpanFactory INSTANCE = new NoOpLLMObsSpanFactory();
-
-  public LLMObsSpan startLLMSpan(
-      String spanName,
-      String modelName,
-      String modelProvider,
-      @Nullable String mlApp,
-      @Nullable String sessionId) {
-    return NoOpLLMObsSpan.INSTANCE;
-  }
-
-  public LLMObsSpan startAgentSpan(
-      String spanName, @Nullable String mlApp, @Nullable String sessionId) {
-    return NoOpLLMObsSpan.INSTANCE;
-  }
-
-  public LLMObsSpan startAgentSpan(
-      String spanName,
-      @Nullable String mlApp,
-      @Nullable String sessionId,
-      @Nullable String version) {
-    return NoOpLLMObsSpan.INSTANCE;
-  }
-
-  public LLMObsSpan startToolSpan(
-      String spanName, @Nullable String mlApp, @Nullable String sessionId) {
-    return NoOpLLMObsSpan.INSTANCE;
-  }
-
-  public LLMObsSpan startTaskSpan(
-      String spanName, @Nullable String mlApp, @Nullable String sessionId) {
-    return NoOpLLMObsSpan.INSTANCE;
-  }
-
-  public LLMObsSpan startWorkflowSpan(
-      String spanName, @Nullable String mlApp, @Nullable String sessionId) {
-    return NoOpLLMObsSpan.INSTANCE;
-  }
-
-  public LLMObsSpan startEmbeddingSpan(
-      String spanName,
-      @Nullable String mlApp,
-      @Nullable String modelProvider,
-      @Nullable String modelName,
-      @Nullable String sessionId) {
-    return NoOpLLMObsSpan.INSTANCE;
-  }
-
-  public LLMObsSpan startRetrievalSpan(
-      String spanName, @Nullable String mlApp, @Nullable String sessionId) {
-    return NoOpLLMObsSpan.INSTANCE;
-  }
+    public static final NoOpLLMObsSpanFactory INSTANCE = new NoOpLLMObsSpanFactory();
+
+    public LLMObsSpan startLLMSpan(
+            String spanName,
+            String modelName,
+            String modelProvider,
+            @Nullable String mlApp,
+            @Nullable String sessionId) {
+        return NoOpLLMObsSpan.INSTANCE;
+    }
+
+    public LLMObsSpan startAgentSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId) {
+        return NoOpLLMObsSpan.INSTANCE;
+    }
+
+    public LLMObsSpan startAgentSpan(
+            String spanName, @Nullable String mlApp, @Nullable String sessionId, @Nullable String version) {
+        return NoOpLLMObsSpan.INSTANCE;
+    }
+
+    public LLMObsSpan startToolSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId) {
+        return NoOpLLMObsSpan.INSTANCE;
+    }
+
+    public LLMObsSpan startTaskSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId) {
+        return NoOpLLMObsSpan.INSTANCE;
+    }
+
+    public LLMObsSpan startWorkflowSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId) {
+        return NoOpLLMObsSpan.INSTANCE;
+    }
+
+    public LLMObsSpan startEmbeddingSpan(
+            String spanName,
+            @Nullable String mlApp,
+            @Nullable String modelProvider,
+            @Nullable String modelName,
+            @Nullable String sessionId) {
+        return NoOpLLMObsSpan.INSTANCE;
+    }
+
+    public LLMObsSpan startRetrievalSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId) {
+        return NoOpLLMObsSpan.INSTANCE;
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/profiling/Profiling.java b/dd-trace-api/src/main/java/datadog/trace/api/profiling/Profiling.java
index f4ee47c4b22..c2674c80fae 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/profiling/Profiling.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/profiling/Profiling.java
@@ -6,36 +6,36 @@
 
 public interface Profiling {
 
-  static Profiling get() {
-    Tracer tracer = GlobalTracer.get();
-    if (tracer instanceof InternalTracer) {
-      return ((InternalTracer) tracer).getProfilingContext();
+    static Profiling get() {
+        Tracer tracer = GlobalTracer.get();
+        if (tracer instanceof InternalTracer) {
+            return ((InternalTracer) tracer).getProfilingContext();
+        }
+        return NoOp.INSTANCE;
     }
-    return NoOp.INSTANCE;
-  }
 
-  /**
-   * Stateful API which restores the previous context when closed. This requires more memory so has
-   * higher overhead than the stateless API.
-   *
-   * @return a profiling scope which can be closed to restore the current state.
-   */
-  default ProfilingScope newScope() {
-    return ProfilingScope.NO_OP;
-  }
+    /**
+     * Stateful API which restores the previous context when closed. This requires more memory so has
+     * higher overhead than the stateless API.
+     *
+     * @return a profiling scope which can be closed to restore the current state.
+     */
+    default ProfilingScope newScope() {
+        return ProfilingScope.NO_OP;
+    }
 
-  /**
-   * Creates a decorator for the attribute, which can be used to set and clear contexts slightly
-   * more efficiently than with string attributes.
-   *
-   * @param attribute the name of the attribute
-   * @return a setter which can be used to set and clear profiling context
-   */
-  default ProfilingContextAttribute createContextAttribute(String attribute) {
-    return ProfilingContextAttribute.NoOp.INSTANCE;
-  }
+    /**
+     * Creates a decorator for the attribute, which can be used to set and clear contexts slightly
+     * more efficiently than with string attributes.
+     *
+     * @param attribute the name of the attribute
+     * @return a setter which can be used to set and clear profiling context
+     */
+    default ProfilingContextAttribute createContextAttribute(String attribute) {
+        return ProfilingContextAttribute.NoOp.INSTANCE;
+    }
 
-  final class NoOp implements Profiling {
-    public static final NoOp INSTANCE = new NoOp();
-  }
+    final class NoOp implements Profiling {
+        public static final NoOp INSTANCE = new NoOp();
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/profiling/ProfilingContext.java b/dd-trace-api/src/main/java/datadog/trace/api/profiling/ProfilingContext.java
index 2d1f72b9a49..a72e5d6dbda 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/profiling/ProfilingContext.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/profiling/ProfilingContext.java
@@ -2,37 +2,37 @@
 
 public interface ProfilingContext {
 
-  /**
-   * Sets a context value to be appended to profiling data
-   *
-   * @param attribute the attribute (must have been registered at startup)
-   * @param value the value
-   */
-  default void setContextValue(String attribute, String value) {}
+    /**
+     * Sets a context value to be appended to profiling data
+     *
+     * @param attribute the attribute (must have been registered at startup)
+     * @param value the value
+     */
+    default void setContextValue(String attribute, String value) {}
 
-  /**
-   * Sets a context value to be appended to profiling data. This overload requires an attribute to
-   * have been obtained by calling {@link Profiling#createContextAttribute(String)
-   * createContextAttribute} first, but is more efficient.
-   *
-   * @param attribute the attribute (must have been registered at startup)
-   * @param value the value
-   */
-  default void setContextValue(ProfilingContextAttribute attribute, String value) {}
+    /**
+     * Sets a context value to be appended to profiling data. This overload requires an attribute to
+     * have been obtained by calling {@link Profiling#createContextAttribute(String)
+     * createContextAttribute} first, but is more efficient.
+     *
+     * @param attribute the attribute (must have been registered at startup)
+     * @param value the value
+     */
+    default void setContextValue(ProfilingContextAttribute attribute, String value) {}
 
-  /**
-   * Clears a context value.
-   *
-   * @param attribute the attribute (must have been registered at startup)
-   */
-  default void clearContextValue(String attribute) {}
+    /**
+     * Clears a context value.
+     *
+     * @param attribute the attribute (must have been registered at startup)
+     */
+    default void clearContextValue(String attribute) {}
 
-  /**
-   * Clears a context value. This overload requires an attribute to have been obtained by calling
-   * {@link Profiling#createContextAttribute(String) createContextAttribute} first, but is more
-   * efficient.
-   *
-   * @param attribute the attribute (must have been registered at startup)
-   */
-  default void clearContextValue(ProfilingContextAttribute attribute) {}
+    /**
+     * Clears a context value. This overload requires an attribute to have been obtained by calling
+     * {@link Profiling#createContextAttribute(String) createContextAttribute} first, but is more
+     * efficient.
+     *
+     * @param attribute the attribute (must have been registered at startup)
+     */
+    default void clearContextValue(ProfilingContextAttribute attribute) {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/profiling/ProfilingContextAttribute.java b/dd-trace-api/src/main/java/datadog/trace/api/profiling/ProfilingContextAttribute.java
index 9dcf909e48d..312df65404f 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/profiling/ProfilingContextAttribute.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/profiling/ProfilingContextAttribute.java
@@ -2,8 +2,8 @@
 
 public interface ProfilingContextAttribute {
 
-  final class NoOp implements ProfilingContextAttribute {
+    final class NoOp implements ProfilingContextAttribute {
 
-    public static final NoOp INSTANCE = new NoOp();
-  }
+        public static final NoOp INSTANCE = new NoOp();
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/profiling/ProfilingScope.java b/dd-trace-api/src/main/java/datadog/trace/api/profiling/ProfilingScope.java
index 182cbe09ece..afad44dee54 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/profiling/ProfilingScope.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/profiling/ProfilingScope.java
@@ -2,8 +2,8 @@
 
 public interface ProfilingScope extends AutoCloseable, ProfilingContext {
 
-  ProfilingScope NO_OP = () -> {};
+    ProfilingScope NO_OP = () -> {};
 
-  @Override
-  void close();
+    @Override
+    void close();
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/sampling/PrioritySampling.java b/dd-trace-api/src/main/java/datadog/trace/api/sampling/PrioritySampling.java
index c12af7aea1f..b47d2c3a485 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/sampling/PrioritySampling.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/sampling/PrioritySampling.java
@@ -1,24 +1,24 @@
 package datadog.trace.api.sampling;
 
 public class PrioritySampling {
-  /**
-   * Implementation detail of the client. will not be sent to the agent or propagated.
-   *
-   * <p>Internal value used when the priority sampling flag has not been set on the span context.
-   */
-  public static final byte UNSET = (byte) 0x80;
+    /**
+     * Implementation detail of the client. will not be sent to the agent or propagated.
+     *
+     * <p>Internal value used when the priority sampling flag has not been set on the span context.
+     */
+    public static final byte UNSET = (byte) 0x80;
 
-  /** The sampler has decided to drop the trace. */
-  public static final byte SAMPLER_DROP = 0;
+    /** The sampler has decided to drop the trace. */
+    public static final byte SAMPLER_DROP = 0;
 
-  /** The sampler has decided to keep the trace. */
-  public static final byte SAMPLER_KEEP = 1;
+    /** The sampler has decided to keep the trace. */
+    public static final byte SAMPLER_KEEP = 1;
 
-  /** The user has decided to drop the trace. */
-  public static final byte USER_DROP = -1;
+    /** The user has decided to drop the trace. */
+    public static final byte USER_DROP = -1;
 
-  /** The user has decided to keep the trace. */
-  public static final byte USER_KEEP = 2;
+    /** The user has decided to keep the trace. */
+    public static final byte USER_KEEP = 2;
 
-  private PrioritySampling() {}
+    private PrioritySampling() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/context/NoopTraceScope.java b/dd-trace-api/src/main/java/datadog/trace/context/NoopTraceScope.java
index 851290e32a3..0d4455c08e0 100644
--- a/dd-trace-api/src/main/java/datadog/trace/context/NoopTraceScope.java
+++ b/dd-trace-api/src/main/java/datadog/trace/context/NoopTraceScope.java
@@ -1,29 +1,29 @@
 package datadog.trace.context;
 
 public class NoopTraceScope implements TraceScope {
-  public static final NoopTraceScope INSTANCE = new NoopTraceScope();
+    public static final NoopTraceScope INSTANCE = new NoopTraceScope();
 
-  public static class NoopContinuation implements Continuation {
-    public static final NoopContinuation INSTANCE = new NoopContinuation();
+    public static class NoopContinuation implements Continuation {
+        public static final NoopContinuation INSTANCE = new NoopContinuation();
 
-    private NoopContinuation() {}
+        private NoopContinuation() {}
 
-    @Override
-    public Continuation hold() {
-      return this;
-    }
+        @Override
+        public Continuation hold() {
+            return this;
+        }
 
-    @Override
-    public TraceScope activate() {
-      return NoopTraceScope.INSTANCE;
-    }
+        @Override
+        public TraceScope activate() {
+            return NoopTraceScope.INSTANCE;
+        }
 
-    @Override
-    public void cancel() {}
-  }
+        @Override
+        public void cancel() {}
+    }
 
-  private NoopTraceScope() {}
+    private NoopTraceScope() {}
 
-  @Override
-  public void close() {}
+    @Override
+    public void close() {}
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/context/TraceScope.java b/dd-trace-api/src/main/java/datadog/trace/context/TraceScope.java
index df2bb2af7c7..98aff12f2fb 100644
--- a/dd-trace-api/src/main/java/datadog/trace/context/TraceScope.java
+++ b/dd-trace-api/src/main/java/datadog/trace/context/TraceScope.java
@@ -7,82 +7,82 @@
 /** An object which can propagate a datadog trace across multiple threads. */
 public interface TraceScope extends Closeable {
 
-  /** Close the activated context and allow any underlying spans to finish. */
-  @Override
-  void close();
-
-  /**
-   * Used to pass async context between workers. A trace will not be reported until all spans and
-   * continuations are resolved. You must call activate (and close on the returned scope) or cancel
-   * on each continuation to avoid discarding traces.
-   */
-  interface Continuation {
+    /** Close the activated context and allow any underlying spans to finish. */
+    @Override
+    void close();
 
     /**
-     * Prevent the trace attached to this scope from reporting until the continuation is explicitly
-     * cancelled. You must call {@link #cancel()} at some point to avoid discarding traces.
-     *
-     * <p>Use this when you want to let multiple threads activate the continuation concurrently and
-     * close their scopes without fear of prematurely closing the related span.
+     * Used to pass async context between workers. A trace will not be reported until all spans and
+     * continuations are resolved. You must call activate (and close on the returned scope) or cancel
+     * on each continuation to avoid discarding traces.
      */
-    Continuation hold();
+    interface Continuation {
 
-    /**
-     * Activate the continuation.
-     *
-     * <p>Should be called on the child thread.
-     *
-     * <p>Consider calling this in a try-with-resources initialization block to ensure the returned
-     * scope is closed properly.
-     */
-    TraceScope activate();
+        /**
+         * Prevent the trace attached to this scope from reporting until the continuation is explicitly
+         * cancelled. You must call {@link #cancel()} at some point to avoid discarding traces.
+         *
+         * <p>Use this when you want to let multiple threads activate the continuation concurrently and
+         * close their scopes without fear of prematurely closing the related span.
+         */
+        Continuation hold();
 
-    /** Allow trace to stop waiting on this continuation for reporting. */
-    void cancel();
-  }
+        /**
+         * Activate the continuation.
+         *
+         * <p>Should be called on the child thread.
+         *
+         * <p>Consider calling this in a try-with-resources initialization block to ensure the returned
+         * scope is closed properly.
+         */
+        TraceScope activate();
 
-  /**
-   * @deprecated Replaced by {@link Tracer#captureActiveSpan()}.
-   *     <p>When asynchronous propagation is enabled, prevent the <strong>currently active
-   *     trace</strong>, which may differ from this scope instance, from reporting until the
-   *     returned Continuation is either activated (and the returned scope is closed) or the
-   *     continuation is canceled. Should be called on the parent thread.
-   * @return Continuation of the active span, no-op continuation if there's no active span or
-   *     asynchronous propagation is disabled.
-   */
-  @Deprecated
-  default Continuation capture() {
-    return GlobalTracer.get().captureActiveSpan();
-  }
+        /** Allow trace to stop waiting on this continuation for reporting. */
+        void cancel();
+    }
+
+    /**
+     * @deprecated Replaced by {@link Tracer#captureActiveSpan()}.
+     *     <p>When asynchronous propagation is enabled, prevent the <strong>currently active
+     *     trace</strong>, which may differ from this scope instance, from reporting until the
+     *     returned Continuation is either activated (and the returned scope is closed) or the
+     *     continuation is canceled. Should be called on the parent thread.
+     * @return Continuation of the active span, no-op continuation if there's no active span or
+     *     asynchronous propagation is disabled.
+     */
+    @Deprecated
+    default Continuation capture() {
+        return GlobalTracer.get().captureActiveSpan();
+    }
 
-  /**
-   * @deprecated Replaced by {@code capture().hold()}.
-   */
-  @Deprecated
-  default Continuation captureConcurrent() {
-    return capture().hold();
-  }
+    /**
+     * @deprecated Replaced by {@code capture().hold()}.
+     */
+    @Deprecated
+    default Continuation captureConcurrent() {
+        return capture().hold();
+    }
 
-  /**
-   * @deprecated Replaced by {@link Tracer#isAsyncPropagationEnabled()}.
-   *     <p>Calling this method will check whether asynchronous propagation is enabled <strong>for
-   *     the active scope</strong>, not this scope instance.
-   * @return {@code true} if asynchronous propagation is enabled <strong>for the active
-   *     scope</strong>, {@code false} otherwise.
-   */
-  @Deprecated
-  default boolean isAsyncPropagating() {
-    return GlobalTracer.get().isAsyncPropagationEnabled();
-  }
+    /**
+     * @deprecated Replaced by {@link Tracer#isAsyncPropagationEnabled()}.
+     *     <p>Calling this method will check whether asynchronous propagation is enabled <strong>for
+     *     the active scope</strong>, not this scope instance.
+     * @return {@code true} if asynchronous propagation is enabled <strong>for the active
+     *     scope</strong>, {@code false} otherwise.
+     */
+    @Deprecated
+    default boolean isAsyncPropagating() {
+        return GlobalTracer.get().isAsyncPropagationEnabled();
+    }
 
-  /**
-   * @deprecated Replaced by {@link Tracer#setAsyncPropagationEnabled(boolean)}}.
-   *     <p>Calling this method will enable or disable asynchronous propagation <strong>for the
-   *     active scope</strong>, not this scope instance.
-   * @param value {@code true} to enable asynchronous propagation, {@code false} to disable it.
-   */
-  @Deprecated
-  default void setAsyncPropagation(boolean value) {
-    GlobalTracer.get().setAsyncPropagationEnabled(value);
-  }
+    /**
+     * @deprecated Replaced by {@link Tracer#setAsyncPropagationEnabled(boolean)}}.
+     *     <p>Calling this method will enable or disable asynchronous propagation <strong>for the
+     *     active scope</strong>, not this scope instance.
+     * @param value {@code true} to enable asynchronous propagation, {@code false} to disable it.
+     */
+    @Deprecated
+    default void setAsyncPropagation(boolean value) {
+        GlobalTracer.get().setAsyncPropagationEnabled(value);
+    }
 }
diff --git a/dd-trace-api/src/main/java/datadog/trace/payloadtags/PayloadTagsData.java b/dd-trace-api/src/main/java/datadog/trace/payloadtags/PayloadTagsData.java
index 1245ba99fef..91802bf0663 100644
--- a/dd-trace-api/src/main/java/datadog/trace/payloadtags/PayloadTagsData.java
+++ b/dd-trace-api/src/main/java/datadog/trace/payloadtags/PayloadTagsData.java
@@ -3,19 +3,19 @@
 /** Used to pass payload tags data from instrumentation to the PayloadTagsProcessor. */
 public class PayloadTagsData {
 
-  public static final class PathAndValue {
-    public final Object[] path;
-    public final Object value;
+    public static final class PathAndValue {
+        public final Object[] path;
+        public final Object value;
 
-    public PathAndValue(Object[] path, Object value) {
-      this.path = path;
-      this.value = value;
+        public PathAndValue(Object[] path, Object value) {
+            this.path = path;
+            this.value = value;
+        }
     }
-  }
 
-  public final PathAndValue[] pathAndValues;
+    public final PathAndValue[] pathAndValues;
 
-  public PayloadTagsData(PathAndValue[] pathAndValues) {
-    this.pathAndValues = pathAndValues;
-  }
+    public PayloadTagsData(PathAndValue[] pathAndValues) {
+        this.pathAndValues = pathAndValues;
+    }
 }
diff --git a/dd-trace-api/src/test/java/datadog/trace/api/DDSpanIdTest.java b/dd-trace-api/src/test/java/datadog/trace/api/DDSpanIdTest.java
index 2499173f29f..87f0b4adb70 100644
--- a/dd-trace-api/src/test/java/datadog/trace/api/DDSpanIdTest.java
+++ b/dd-trace-api/src/test/java/datadog/trace/api/DDSpanIdTest.java
@@ -18,127 +18,125 @@
 @TypeConverterSources(DDTraceApiTableTestConverters.class)
 class DDSpanIdTest {
 
-  @TableTest({
-    "scenario          | stringId               | expectedId    ",
-    "zero              | '0'                    | 0             ",
-    "one               | '1'                    | 1             ",
-    "max               | '18446744073709551615' | DDSpanId.MAX  ",
-    "long max          | '9223372036854775807'  | Long.MAX_VALUE",
-    "long max plus one | '9223372036854775808'  | Long.MIN_VALUE"
-  })
-  @ParameterizedTest(name = "convert ids from/to String [{index}]")
-  void convertIdsFromToString(String stringId, long expectedId) {
-    long ddid = DDSpanId.from(stringId);
+    @TableTest({
+      "scenario          | stringId               | expectedId    ",
+      "zero              | '0'                    | 0             ",
+      "one               | '1'                    | 1             ",
+      "max               | '18446744073709551615' | DDSpanId.MAX  ",
+      "long max          | '9223372036854775807'  | Long.MAX_VALUE",
+      "long max plus one | '9223372036854775808'  | Long.MIN_VALUE"
+    })
+    @ParameterizedTest(name = "convert ids from/to String [{index}]")
+    void convertIdsFromToString(String stringId, long expectedId) {
+        long ddid = DDSpanId.from(stringId);
 
-    assertEquals(expectedId, ddid);
-    assertEquals(stringId, DDSpanId.toString(ddid));
-  }
-
-  @ParameterizedTest(name = "fail on illegal String [{index}]")
-  @NullSource
-  @ValueSource(
-      strings = {
-        "",
-        "-1",
-        "18446744073709551616",
-        "18446744073709551625",
-        "184467440737095516150",
-        "18446744073709551a1",
-        "184467440737095511a"
-      })
-  void failOnIllegalString(String stringId) {
-    assertThrows(NumberFormatException.class, () -> DDSpanId.from(stringId));
-  }
+        assertEquals(expectedId, ddid);
+        assertEquals(stringId, DDSpanId.toString(ddid));
+    }
 
-  @TableTest({
-    "scenario                    | hexId                  | expectedId       ",
-    "zero                        | '0'                    | 0                ",
-    "one                         | '1'                    | 1                ",
-    "max                         | 'ffffffffffffffff'     | DDSpanId.MAX     ",
-    "long max                    | '7fffffffffffffff'     | Long.MAX_VALUE   ",
-    "long min                    | '8000000000000000'     | Long.MIN_VALUE   ",
-    "long min with leading zeros | '00008000000000000000' | Long.MIN_VALUE   ",
-    "hex sample                  | 'cafebabe'             | 3405691582       ",
-    "fifteen hex digits          | '123456789abcdef'      | 81985529216486895"
-  })
-  @ParameterizedTest(name = "convert ids from/to hex String [{index}]")
-  void convertIdsFromToHexString(String hexId, long expectedId) {
-    long ddid = DDSpanId.fromHex(hexId);
-    String padded16 =
-        hexId.length() <= 16 ? leftPadWithZeros(hexId, 16) : hexId.substring(hexId.length() - 16);
-    String normalizedHexId = hexId.length() > 1 ? hexId.replaceFirst("^0+", "") : hexId;
-    if (normalizedHexId.isEmpty()) {
-      normalizedHexId = "0";
+    @ParameterizedTest(name = "fail on illegal String [{index}]")
+    @NullSource
+    @ValueSource(
+            strings = {
+                "",
+                "-1",
+                "18446744073709551616",
+                "18446744073709551625",
+                "184467440737095516150",
+                "18446744073709551a1",
+                "184467440737095511a"
+            })
+    void failOnIllegalString(String stringId) {
+        assertThrows(NumberFormatException.class, () -> DDSpanId.from(stringId));
     }
 
-    assertEquals(expectedId, ddid);
-    assertEquals(normalizedHexId, DDSpanId.toHexString(ddid));
-    assertEquals(padded16, DDSpanId.toHexStringPadded(ddid));
-  }
+    @TableTest({
+      "scenario                    | hexId                  | expectedId       ",
+      "zero                        | '0'                    | 0                ",
+      "one                         | '1'                    | 1                ",
+      "max                         | 'ffffffffffffffff'     | DDSpanId.MAX     ",
+      "long max                    | '7fffffffffffffff'     | Long.MAX_VALUE   ",
+      "long min                    | '8000000000000000'     | Long.MIN_VALUE   ",
+      "long min with leading zeros | '00008000000000000000' | Long.MIN_VALUE   ",
+      "hex sample                  | 'cafebabe'             | 3405691582       ",
+      "fifteen hex digits          | '123456789abcdef'      | 81985529216486895"
+    })
+    @ParameterizedTest(name = "convert ids from/to hex String [{index}]")
+    void convertIdsFromToHexString(String hexId, long expectedId) {
+        long ddid = DDSpanId.fromHex(hexId);
+        String padded16 = hexId.length() <= 16 ? leftPadWithZeros(hexId, 16) : hexId.substring(hexId.length() - 16);
+        String normalizedHexId = hexId.length() > 1 ? hexId.replaceFirst("^0+", "") : hexId;
+        if (normalizedHexId.isEmpty()) {
+            normalizedHexId = "0";
+        }
 
-  @TableTest({
-    "scenario                                 | hexId              | start | length | lowerCaseOnly | expectedId   ",
-    "null input                               |                    | 1     | 1      | false         |              ",
-    "empty input                              | ''                 | 1     | 1      | false         |              ",
-    "negative start                           | '00'               | -1    | 1      | false         |              ",
-    "zero length                              | '00'               | 0     | 0      | false         |              ",
-    "single zero at index 0                   | '00'               | 0     | 1      | false         | DDSpanId.ZERO",
-    "single zero at index 1                   | '00'               | 1     | 1      | false         | DDSpanId.ZERO",
-    "single zero at index 1 duplicate         | '00'               | 1     | 1      | false         | DDSpanId.ZERO",
-    "max lower-case                           | 'ffffffffffffffff' | 0     | 16     | true          | DDSpanId.MAX ",
-    "upper-case rejected when lower-case only | 'ffffffffffffFfff' | 0     | 16     | true          |              ",
-    "upper-case accepted when lower disabled  | 'ffffffffffffFfff' | 0     | 16     | false         | DDSpanId.MAX "
-  })
-  @ParameterizedTest(name = "convert ids from part of hex String [{index}]")
-  void convertIdsFromPartOfHexString(
-      String hexId, int start, int length, boolean lowerCaseOnly, Long expectedId) {
-    Long parsedId = null;
-    try {
-      parsedId = DDSpanId.fromHex(hexId, start, length, lowerCaseOnly);
-    } catch (NumberFormatException ignored) {
+        assertEquals(expectedId, ddid);
+        assertEquals(normalizedHexId, DDSpanId.toHexString(ddid));
+        assertEquals(padded16, DDSpanId.toHexStringPadded(ddid));
     }
 
-    if (expectedId == null) {
-      assertNull(parsedId);
-    } else {
-      assertNotNull(parsedId);
-      assertEquals(expectedId.longValue(), parsedId.longValue());
+    @TableTest({
+      "scenario                                 | hexId              | start | length | lowerCaseOnly | expectedId   ",
+      "null input                               |                    | 1     | 1      | false         |              ",
+      "empty input                              | ''                 | 1     | 1      | false         |              ",
+      "negative start                           | '00'               | -1    | 1      | false         |              ",
+      "zero length                              | '00'               | 0     | 0      | false         |              ",
+      "single zero at index 0                   | '00'               | 0     | 1      | false         | DDSpanId.ZERO",
+      "single zero at index 1                   | '00'               | 1     | 1      | false         | DDSpanId.ZERO",
+      "single zero at index 1 duplicate         | '00'               | 1     | 1      | false         | DDSpanId.ZERO",
+      "max lower-case                           | 'ffffffffffffffff' | 0     | 16     | true          | DDSpanId.MAX ",
+      "upper-case rejected when lower-case only | 'ffffffffffffFfff' | 0     | 16     | true          |              ",
+      "upper-case accepted when lower disabled  | 'ffffffffffffFfff' | 0     | 16     | false         | DDSpanId.MAX "
+    })
+    @ParameterizedTest(name = "convert ids from part of hex String [{index}]")
+    void convertIdsFromPartOfHexString(String hexId, int start, int length, boolean lowerCaseOnly, Long expectedId) {
+        Long parsedId = null;
+        try {
+            parsedId = DDSpanId.fromHex(hexId, start, length, lowerCaseOnly);
+        } catch (NumberFormatException ignored) {
+        }
+
+        if (expectedId == null) {
+            assertNull(parsedId);
+        } else {
+            assertNotNull(parsedId);
+            assertEquals(expectedId.longValue(), parsedId.longValue());
+        }
     }
-  }
 
-  @ParameterizedTest(name = "fail on illegal hex String [{index}]")
-  @NullSource
-  @ValueSource(strings = {"", "-1", "10000000000000000", "ffffffffffffffzf", "fffffffffffffffz"})
-  void failOnIllegalHexString(String hexId) {
-    assertThrows(NumberFormatException.class, () -> DDSpanId.fromHex(hexId));
-  }
+    @ParameterizedTest(name = "fail on illegal hex String [{index}]")
+    @NullSource
+    @ValueSource(strings = {"", "-1", "10000000000000000", "ffffffffffffffzf", "fffffffffffffffz"})
+    void failOnIllegalHexString(String hexId) {
+        assertThrows(NumberFormatException.class, () -> DDSpanId.fromHex(hexId));
+    }
 
-  @ParameterizedTest(name = "generate id with {0}")
-  @ValueSource(strings = {"RANDOM", "SEQUENTIAL", "SECURE_RANDOM"})
-  void generateIdWithStrategy(String strategyName) {
-    IdGenerationStrategy strategy = IdGenerationStrategy.fromName(strategyName);
-    Set<Long> checked = new HashSet<Long>();
+    @ParameterizedTest(name = "generate id with {0}")
+    @ValueSource(strings = {"RANDOM", "SEQUENTIAL", "SECURE_RANDOM"})
+    void generateIdWithStrategy(String strategyName) {
+        IdGenerationStrategy strategy = IdGenerationStrategy.fromName(strategyName);
+        Set<Long> checked = new HashSet<Long>();
 
-    for (int index = 0; index <= 32768; index++) {
-      long spanId = strategy.generateSpanId();
-      assertNotEquals(0L, spanId);
-      assertFalse(checked.contains(spanId));
-      checked.add(spanId);
+        for (int index = 0; index <= 32768; index++) {
+            long spanId = strategy.generateSpanId();
+            assertNotEquals(0L, spanId);
+            assertFalse(checked.contains(spanId));
+            checked.add(spanId);
+        }
     }
-  }
 
-  private static String leftPadWithZeros(String value, int size) {
-    if (value.length() >= size) {
-      return value;
+    private static String leftPadWithZeros(String value, int size) {
+        if (value.length() >= size) {
+            return value;
+        }
+        return repeat("0", size - value.length()) + value;
     }
-    return repeat("0", size - value.length()) + value;
-  }
 
-  private static String repeat(String value, int count) {
-    StringBuilder builder = new StringBuilder(value.length() * count);
-    for (int index = 0; index < count; index++) {
-      builder.append(value);
+    private static String repeat(String value, int count) {
+        StringBuilder builder = new StringBuilder(value.length() * count);
+        for (int index = 0; index < count; index++) {
+            builder.append(value);
+        }
+        return builder.toString();
     }
-    return builder.toString();
-  }
 }
diff --git a/dd-trace-api/src/test/java/datadog/trace/api/DDTraceApiTableTestConverters.java b/dd-trace-api/src/test/java/datadog/trace/api/DDTraceApiTableTestConverters.java
index 28f5dfc480b..35904ff164a 100644
--- a/dd-trace-api/src/test/java/datadog/trace/api/DDTraceApiTableTestConverters.java
+++ b/dd-trace-api/src/test/java/datadog/trace/api/DDTraceApiTableTestConverters.java
@@ -6,46 +6,46 @@
 /** TableTest converters shared by dd-trace-api test classes for unparsable constants. */
 public final class DDTraceApiTableTestConverters {
 
-  private DDTraceApiTableTestConverters() {}
+    private DDTraceApiTableTestConverters() {}
 
-  @TypeConverter
-  public static long toLong(String value) {
-    if (value == null) {
-      throw new IllegalArgumentException("Value cannot be null");
+    @TypeConverter
+    public static long toLong(String value) {
+        if (value == null) {
+            throw new IllegalArgumentException("Value cannot be null");
+        }
+        String token = value.trim();
+        switch (token) {
+            case "DDSpanId.MAX":
+                return DDSpanId.MAX;
+            case "DDSpanId.ZERO":
+                return DDSpanId.ZERO;
+            default:
+                return TableTestTypeConverters.toLong(token);
+        }
     }
-    String token = value.trim();
-    switch (token) {
-      case "DDSpanId.MAX":
-        return DDSpanId.MAX;
-      case "DDSpanId.ZERO":
-        return DDSpanId.ZERO;
-      default:
-        return TableTestTypeConverters.toLong(token);
-    }
-  }
 
-  @TypeConverter
-  public static DD64bTraceId toDD64bTraceId(String value) {
-    if (value == null) {
-      throw new IllegalArgumentException("Value cannot be null");
-    }
-    switch (value.trim()) {
-      case "DD64bTraceId.ZERO":
-        return DD64bTraceId.from(0L);
-      case "DD64bTraceId.ONE":
-        return DD64bTraceId.from(1L);
-      case "DD64bTraceId.MAX":
-        return DD64bTraceId.MAX;
-      case "DD64bTraceId.LONG_MAX":
-        return DD64bTraceId.from(Long.MAX_VALUE);
-      case "DD64bTraceId.LONG_MIN":
-        return DD64bTraceId.from(Long.MIN_VALUE);
-      case "DD64bTraceId.CAFEBABE":
-        return DD64bTraceId.from(3405691582L);
-      case "DD64bTraceId.HEX":
-        return DD64bTraceId.from(81985529216486895L);
-      default:
-        throw new IllegalArgumentException("Unsupported DD64bTraceId token: " + value);
+    @TypeConverter
+    public static DD64bTraceId toDD64bTraceId(String value) {
+        if (value == null) {
+            throw new IllegalArgumentException("Value cannot be null");
+        }
+        switch (value.trim()) {
+            case "DD64bTraceId.ZERO":
+                return DD64bTraceId.from(0L);
+            case "DD64bTraceId.ONE":
+                return DD64bTraceId.from(1L);
+            case "DD64bTraceId.MAX":
+                return DD64bTraceId.MAX;
+            case "DD64bTraceId.LONG_MAX":
+                return DD64bTraceId.from(Long.MAX_VALUE);
+            case "DD64bTraceId.LONG_MIN":
+                return DD64bTraceId.from(Long.MIN_VALUE);
+            case "DD64bTraceId.CAFEBABE":
+                return DD64bTraceId.from(3405691582L);
+            case "DD64bTraceId.HEX":
+                return DD64bTraceId.from(81985529216486895L);
+            default:
+                throw new IllegalArgumentException("Unsupported DD64bTraceId token: " + value);
+        }
     }
-  }
 }
diff --git a/dd-trace-api/src/test/java/datadog/trace/api/DDTraceIdClinitDeadlockForkedTest.java b/dd-trace-api/src/test/java/datadog/trace/api/DDTraceIdClinitDeadlockForkedTest.java
index 6878a5fb1fd..8596735f072 100644
--- a/dd-trace-api/src/test/java/datadog/trace/api/DDTraceIdClinitDeadlockForkedTest.java
+++ b/dd-trace-api/src/test/java/datadog/trace/api/DDTraceIdClinitDeadlockForkedTest.java
@@ -37,60 +37,56 @@
  */
 class DDTraceIdClinitDeadlockForkedTest {
 
-  @Test
-  @Timeout(value = 60, unit = SECONDS) // backstop; the join below is the primary guard
-  void traceIdClassPairInitializesConcurrentlyWithoutDeadlock() throws Exception {
-    final ClassLoader cl = getClass().getClassLoader();
-    final CyclicBarrier barrier = new CyclicBarrier(2);
-    final AtomicReference<Throwable> error = new AtomicReference<>();
+    @Test
+    @Timeout(value = 60, unit = SECONDS) // backstop; the join below is the primary guard
+    void traceIdClassPairInitializesConcurrentlyWithoutDeadlock() throws Exception {
+        final ClassLoader cl = getClass().getClassLoader();
+        final CyclicBarrier barrier = new CyclicBarrier(2);
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
-    // One thread enters via the superclass (mirrors blackholeSpan() -> DDTraceId.ZERO), the other
-    // via the subclass (mirrors IdGenerationStrategy.generateTraceId() -> DD64bTraceId.from()).
+        // One thread enters via the superclass (mirrors blackholeSpan() -> DDTraceId.ZERO), the other
+        // via the subclass (mirrors IdGenerationStrategy.generateTraceId() -> DD64bTraceId.from()).
 
-    Thread viaSuper =
-        new Thread(
-            () -> {
-              try {
-                barrier.await();
-                Class.forName("datadog.trace.api.DDTraceId", true, cl);
-              } catch (Throwable t) {
-                error.compareAndSet(null, t);
-              }
-            },
-            "init-DDTraceId");
-    Thread viaSub =
-        new Thread(
-            () -> {
-              try {
-                barrier.await();
-                Class.forName("datadog.trace.api.IdGenerationStrategy", true, cl);
-                Class.forName("datadog.trace.api.DD64bTraceId", true, cl);
-              } catch (Throwable t) {
-                error.compareAndSet(null, t);
-              }
-            },
-            "init-DD64bTraceId");
-    // Daemon so a deadlock cannot block forked-JVM shutdown.
-    viaSuper.setDaemon(true);
-    viaSub.setDaemon(true);
+        Thread viaSuper = new Thread(
+                () -> {
+                    try {
+                        barrier.await();
+                        Class.forName("datadog.trace.api.DDTraceId", true, cl);
+                    } catch (Throwable t) {
+                        error.compareAndSet(null, t);
+                    }
+                },
+                "init-DDTraceId");
+        Thread viaSub = new Thread(
+                () -> {
+                    try {
+                        barrier.await();
+                        Class.forName("datadog.trace.api.IdGenerationStrategy", true, cl);
+                        Class.forName("datadog.trace.api.DD64bTraceId", true, cl);
+                    } catch (Throwable t) {
+                        error.compareAndSet(null, t);
+                    }
+                },
+                "init-DD64bTraceId");
+        // Daemon so a deadlock cannot block forked-JVM shutdown.
+        viaSuper.setDaemon(true);
+        viaSub.setDaemon(true);
 
-    viaSuper.start();
-    viaSub.start();
-    viaSuper.join(SECONDS.toMillis(15));
-    viaSub.join(SECONDS.toMillis(15));
+        viaSuper.start();
+        viaSub.start();
+        viaSuper.join(SECONDS.toMillis(15));
+        viaSub.join(SECONDS.toMillis(15));
 
-    if (viaSuper.isAlive() || viaSub.isAlive()) {
-      fail(
-          "DDTraceId/DD64bTraceId class-initialization deadlock: DDTraceId.<clinit> must not "
-              + "reference DD64bTraceId (init-DDTraceId.alive="
-              + viaSuper.isAlive()
-              + ", init-DD64bTraceId.alive="
-              + viaSub.isAlive()
-              + ").");
+        if (viaSuper.isAlive() || viaSub.isAlive()) {
+            fail("DDTraceId/DD64bTraceId class-initialization deadlock: DDTraceId.<clinit> must not "
+                    + "reference DD64bTraceId (init-DDTraceId.alive="
+                    + viaSuper.isAlive()
+                    + ", init-DD64bTraceId.alive="
+                    + viaSub.isAlive()
+                    + ").");
+        }
+        if (error.get() != null) {
+            throw new AssertionError("Unexpected error during concurrent class initialization", error.get());
+        }
     }
-    if (error.get() != null) {
-      throw new AssertionError(
-          "Unexpected error during concurrent class initialization", error.get());
-    }
-  }
 }
diff --git a/dd-trace-api/src/test/java/datadog/trace/api/DDTraceIdTest.java b/dd-trace-api/src/test/java/datadog/trace/api/DDTraceIdTest.java
index 98225bb9698..066cd49633d 100644
--- a/dd-trace-api/src/test/java/datadog/trace/api/DDTraceIdTest.java
+++ b/dd-trace-api/src/test/java/datadog/trace/api/DDTraceIdTest.java
@@ -15,209 +15,198 @@
 @TypeConverterSources(DDTraceApiTableTestConverters.class)
 class DDTraceIdTest {
 
-  @TableTest({
-    "scenario  | longId         | expectedString         | expectedHex                       ",
-    "zero      | 0              | '0'                    | '00000000000000000000000000000000'",
-    "one       | 1              | '1'                    | '00000000000000000000000000000001'",
-    "minus one | -1             | '18446744073709551615' | '0000000000000000ffffffffffffffff'",
-    "long max  | Long.MAX_VALUE | '9223372036854775807'  | '00000000000000007fffffffffffffff'",
-    "long min  | Long.MIN_VALUE | '9223372036854775808'  | '00000000000000008000000000000000'"
-  })
-  @ParameterizedTest(name = "convert 64-bit ids from/to long and check strings [{index}]")
-  void convert64BitIdsFromToLongAndCheckStrings(
-      long longId, String expectedString, String expectedHex) {
-    DD64bTraceId ddid = DD64bTraceId.from(longId);
-    DD64bTraceId expectedId = DD64bTraceId.from(expectedString);
-    DDTraceId defaultDdid = DDTraceId.from(longId);
-
-    assertEquals(expectedId, ddid);
-    assertEquals(defaultDdid, ddid);
-    assertEquals(longId, ddid.toLong());
-    assertEquals(0L, ddid.toHighOrderLong());
-    assertEquals(expectedString, ddid.toString());
-    assertEquals(expectedHex, ddid.toHexString());
-  }
-
-  @TableTest({
-    "scenario          | stringId               | expectedId           ",
-    "zero              | '0'                    | DD64bTraceId.ZERO    ",
-    "one               | '1'                    | DD64bTraceId.ONE     ",
-    "max               | '18446744073709551615' | DD64bTraceId.MAX     ",
-    "long max          | '9223372036854775807'  | DD64bTraceId.LONG_MAX",
-    "long max plus one | '9223372036854775808'  | DD64bTraceId.LONG_MIN"
-  })
-  @ParameterizedTest(name = "convert 64-bit ids from/to String representation [{index}]")
-  void convert64BitIdsFromToStringRepresentation(String stringId, DD64bTraceId expectedId) {
-    DD64bTraceId ddid = DD64bTraceId.from(stringId);
-
-    assertEquals(expectedId, ddid);
-    assertEquals(stringId, ddid.toString());
-  }
-
-  @ParameterizedTest(name = "fail parsing illegal 64-bit id String representation [{index}]")
-  @NullSource
-  @ValueSource(
-      strings = {
-        "",
-        "-1",
-        "18446744073709551616",
-        "18446744073709551625",
-        "184467440737095516150",
-        "18446744073709551a1",
-        "184467440737095511a"
-      })
-  void failParsingIllegal64BitIdStringRepresentation(String stringId) {
-    assertThrows(NumberFormatException.class, () -> DD64bTraceId.from(stringId));
-  }
-
-  @TableTest({
-    "scenario                    | hexId                  | expectedId           ",
-    "zero                        | '0'                    | DD64bTraceId.ZERO    ",
-    "one                         | '1'                    | DD64bTraceId.ONE     ",
-    "max                         | 'ffffffffffffffff'     | DD64bTraceId.MAX     ",
-    "long max                    | '7fffffffffffffff'     | DD64bTraceId.LONG_MAX",
-    "long min                    | '8000000000000000'     | DD64bTraceId.LONG_MIN",
-    "long min with leading zeros | '00008000000000000000' | DD64bTraceId.LONG_MIN",
-    "hex sample                  | 'cafebabe'             | DD64bTraceId.CAFEBABE",
-    "fifteen hex digits          | '123456789abcdef'      | DD64bTraceId.HEX     "
-  })
-  @ParameterizedTest(name = "convert 64-bit ids from/to hex String representation [{index}]")
-  void convert64BitIdsFromToHexStringRepresentation(String hexId, DD64bTraceId expectedId) {
-    DD64bTraceId ddid = DD64bTraceId.fromHex(hexId);
-    String padded16 =
-        hexId.length() <= 16 ? leftPadWithZeros(hexId, 16) : hexId.substring(hexId.length() - 16);
-    String padded32 = leftPadWithZeros(hexId, 32);
-
-    assertEquals(expectedId, ddid);
-    assertEquals(padded32, ddid.toHexString());
-    assertEquals(padded16, ddid.toHexStringPadded(16));
-    assertEquals(padded32, ddid.toHexStringPadded(32));
-  }
-
-  @ParameterizedTest(
-      name = "fail parsing illegal 64-bit hexadecimal String representation [{index}]")
-  @NullSource
-  @ValueSource(strings = {"", "-1", "10000000000000000", "ffffffffffffffzf", "fffffffffffffffz"})
-  void failParsingIllegal64BitHexadecimalStringRepresentation(String hexId) {
-    assertThrows(NumberFormatException.class, () -> DD64bTraceId.fromHex(hexId));
-  }
-
-  @TableTest({
-    "scenario                    | highOrderBits       | lowOrderBits        | hexId                             ",
-    "both long min               | Long.MIN_VALUE      | Long.MIN_VALUE      | '80000000000000008000000000000000'",
-    "high long min low one       | Long.MIN_VALUE      | 1                   | '80000000000000000000000000000001'",
-    "high long min low long max  | Long.MIN_VALUE      | Long.MAX_VALUE      | '80000000000000007fffffffffffffff'",
-    "high one low long min       | 1                   | Long.MIN_VALUE      | '00000000000000018000000000000000'",
-    "high one low one            | 1                   | 1                   | '00000000000000010000000000000001'",
-    "high one low long max       | 1                   | Long.MAX_VALUE      | '00000000000000017fffffffffffffff'",
-    "high long max low long min  | Long.MAX_VALUE      | Long.MIN_VALUE      | '7fffffffffffffff8000000000000000'",
-    "high long max low one       | Long.MAX_VALUE      | 1                   | '7fffffffffffffff0000000000000001'",
-    "high long max low long max  | Long.MAX_VALUE      | Long.MAX_VALUE      | '7fffffffffffffff7fffffffffffffff'",
-    "all zeros length one        | 0                   | 0                   | '0'                               ",
-    "all zeros length sixteen    | 0                   | 0                   | '0000000000000000'                ",
-    "all zeros length seventeen  | 0                   | 0                   | '00000000000000000'               ",
-    "all zeros length thirty-two | 0                   | 0                   | '00000000000000000000000000000000'",
-    "low fifteen                 | 0                   | 15                  | 'f'                               ",
-    "low minus one               | 0                   | -1                  | 'ffffffffffffffff'                ",
-    "high fifteen low minus one  | 15                  | -1                  | 'fffffffffffffffff'               ",
-    "all f                       | -1                  | -1                  | 'ffffffffffffffffffffffffffffffff'",
-    "hex literal                 | 1311768467463790320 | 1311768467463790320 | '123456789abcdef0123456789abcdef0'"
-  })
-  @ParameterizedTest(
-      name = "convert 128-bit ids from/to hexadecimal String representation [{index}]")
-  void convert128BitIdsFromToHexadecimalStringRepresentation(
-      long highOrderBits, long lowOrderBits, String hexId) {
-    DDTraceId parsedId = DD128bTraceId.fromHex(hexId);
-    DDTraceId id = DD128bTraceId.from(highOrderBits, lowOrderBits);
-    String paddedHexId = leftPadWithZeros(hexId, 32);
-
-    assertEquals(id, parsedId);
-    assertEquals(paddedHexId, parsedId.toHexString());
-    assertEquals(paddedHexId.substring(16, 32), parsedId.toHexStringPadded(16));
-    assertEquals(paddedHexId, parsedId.toHexStringPadded(32));
-    assertEquals(lowOrderBits, parsedId.toLong());
-    assertEquals(highOrderBits, parsedId.toHighOrderLong());
-    assertEquals(Long.toUnsignedString(lowOrderBits), parsedId.toString());
-  }
-
-  @TableTest({
-    "scenario             | hexId                                  | start | length | lowerCaseOnly | expectedHexId                   ",
-    "default bounds       | 0123456789abcdeffedcba9876543210       | 0     | 32     | true          | 0123456789abcdeffedcba9876543210",
-    "starting bounds      | 0123456789abcdeffedcba9876543210       | 0     | 16     | true          | 00000000000000000123456789abcdef",
-    "ending bounds        | 0123456789abcdeffedcba9876543210       | 16    | 16     | true          | 0000000000000000fedcba9876543210",
-    "middle bounds        | 0123456789abcdeffedcba9876543210       | 8     | 4      | true          | 000000000000000000000000000089ab",
-    "with padding         | ---0123456789abcdeffedcba9876543210--- | 3     | 32     | true          | 0123456789abcdeffedcba9876543210",
-    "upper case           | 0123456789ABCDEFFEDCBA9876543210       | 0     | 32     | false         | 0123456789abcdeffedcba9876543210",
-    "mixed case           | 0123456789ABCDEFfedcba9876543210       | 0     | 32     | false         | 0123456789abcdeffedcba9876543210",
-    "negative position    | 0123456789abcdeffedcba9876543210       | -1    | 32     | false         |                                 ",
-    "negative length      | 0123456789abcdeffedcba9876543210       | 0     | -1     | false         |                                 ",
-    "invalid length       | 0123456789abcdeffedcba9876543210       | 0     | 33     | false         |                                 ",
-    "invalid ending bound | 0123456789abcdeffedcba9876543210       | 1     | 32     | false         |                                 ",
-    "invalid case         | 0123456789ABCDEFFEDCBA9876543210       | 0     | 32     | true          |                                 "
-  })
-  void converting128BitIdsFromHexadecimalStringRepresentation(
-      String hexId, int start, int length, boolean lowerCaseOnly, String expectedHexId) {
-    if (expectedHexId == null) {
-      assertThrows(
-          NumberFormatException.class,
-          () -> DD128bTraceId.fromHex(hexId, start, length, lowerCaseOnly));
-      return;
+    @TableTest({
+      "scenario  | longId         | expectedString         | expectedHex                       ",
+      "zero      | 0              | '0'                    | '00000000000000000000000000000000'",
+      "one       | 1              | '1'                    | '00000000000000000000000000000001'",
+      "minus one | -1             | '18446744073709551615' | '0000000000000000ffffffffffffffff'",
+      "long max  | Long.MAX_VALUE | '9223372036854775807'  | '00000000000000007fffffffffffffff'",
+      "long min  | Long.MIN_VALUE | '9223372036854775808'  | '00000000000000008000000000000000'"
+    })
+    @ParameterizedTest(name = "convert 64-bit ids from/to long and check strings [{index}]")
+    void convert64BitIdsFromToLongAndCheckStrings(long longId, String expectedString, String expectedHex) {
+        DD64bTraceId ddid = DD64bTraceId.from(longId);
+        DD64bTraceId expectedId = DD64bTraceId.from(expectedString);
+        DDTraceId defaultDdid = DDTraceId.from(longId);
+
+        assertEquals(expectedId, ddid);
+        assertEquals(defaultDdid, ddid);
+        assertEquals(longId, ddid.toLong());
+        assertEquals(0L, ddid.toHighOrderLong());
+        assertEquals(expectedString, ddid.toString());
+        assertEquals(expectedHex, ddid.toHexString());
     }
-    DD128bTraceId parsedId = DD128bTraceId.fromHex(hexId, start, length, lowerCaseOnly);
-    assertEquals(expectedHexId, parsedId.toHexString());
-  }
-
-  @ParameterizedTest(
-      name = "fail parsing illegal 128-bit id hexadecimal String representation [{index}]")
-  @NullSource
-  @ValueSource(strings = {"", "-1", "-A", "111111111111111111111111111111111", "123ABC", "123abcg"})
-  void failParsingIllegal128BitIdHexadecimalStringRepresentation(String hexId) {
-    assertThrows(NumberFormatException.class, () -> DD128bTraceId.fromHex(hexId));
-  }
-
-  @TableTest({
-    "scenario             | hexId                               | start | length | lowerCaseOnly",
-    "null string          |                                     | 0     | 0      | true         ",
-    "empty string         | ''                                  | 0     | 0      | true         ",
-    "out of bound length  | '123456789abcdef0'                  | 0     | 17     | true         ",
-    "out of bound end     | '123456789abcdef0'                  | 7     | 10     | true         ",
-    "out of bound start   | '123456789abcdef0'                  | 17    | 0      | true         ",
-    "invalid minus one    | '-1'                                | 0     | 1      | true         ",
-    "invalid minus a      | '-a'                                | 0     | 1      | true         ",
-    "invalid character    | '123abcg'                           | 0     | 7      | true         ",
-    "invalid upper case A | 'A'                                 | 0     | 1      | true         ",
-    "invalid upper case   | '123ABC'                            | 0     | 6      | true         ",
-    "too long             | '111111111111111111111111111111111' | 0     | 33     | true         "
-  })
-  @ParameterizedTest(
-      name =
-          "fail parsing illegal 128-bit id hexadecimal String representation from partial String [{index}]")
-  void failParsingIllegal128BitIdHexadecimalStringRepresentationFromPartialString(
-      String hexId, int start, int length, boolean lowerCaseOnly) {
-    assertThrows(
-        NumberFormatException.class,
-        () -> DD128bTraceId.fromHex(hexId, start, length, lowerCaseOnly));
-  }
-
-  @Test
-  void checkZeroConstantInitialization() {
-    DDTraceId zero = DDTraceId.ZERO;
-    DDTraceId fromZero = DDTraceId.from(0);
-
-    assertNotNull(zero);
-    assertSame(fromZero, zero);
-  }
-
-  private static String leftPadWithZeros(String value, int size) {
-    if (value.length() >= size) {
-      return value;
+
+    @TableTest({
+      "scenario          | stringId               | expectedId           ",
+      "zero              | '0'                    | DD64bTraceId.ZERO    ",
+      "one               | '1'                    | DD64bTraceId.ONE     ",
+      "max               | '18446744073709551615' | DD64bTraceId.MAX     ",
+      "long max          | '9223372036854775807'  | DD64bTraceId.LONG_MAX",
+      "long max plus one | '9223372036854775808'  | DD64bTraceId.LONG_MIN"
+    })
+    @ParameterizedTest(name = "convert 64-bit ids from/to String representation [{index}]")
+    void convert64BitIdsFromToStringRepresentation(String stringId, DD64bTraceId expectedId) {
+        DD64bTraceId ddid = DD64bTraceId.from(stringId);
+
+        assertEquals(expectedId, ddid);
+        assertEquals(stringId, ddid.toString());
+    }
+
+    @ParameterizedTest(name = "fail parsing illegal 64-bit id String representation [{index}]")
+    @NullSource
+    @ValueSource(
+            strings = {
+                "",
+                "-1",
+                "18446744073709551616",
+                "18446744073709551625",
+                "184467440737095516150",
+                "18446744073709551a1",
+                "184467440737095511a"
+            })
+    void failParsingIllegal64BitIdStringRepresentation(String stringId) {
+        assertThrows(NumberFormatException.class, () -> DD64bTraceId.from(stringId));
+    }
+
+    @TableTest({
+      "scenario                    | hexId                  | expectedId           ",
+      "zero                        | '0'                    | DD64bTraceId.ZERO    ",
+      "one                         | '1'                    | DD64bTraceId.ONE     ",
+      "max                         | 'ffffffffffffffff'     | DD64bTraceId.MAX     ",
+      "long max                    | '7fffffffffffffff'     | DD64bTraceId.LONG_MAX",
+      "long min                    | '8000000000000000'     | DD64bTraceId.LONG_MIN",
+      "long min with leading zeros | '00008000000000000000' | DD64bTraceId.LONG_MIN",
+      "hex sample                  | 'cafebabe'             | DD64bTraceId.CAFEBABE",
+      "fifteen hex digits          | '123456789abcdef'      | DD64bTraceId.HEX     "
+    })
+    @ParameterizedTest(name = "convert 64-bit ids from/to hex String representation [{index}]")
+    void convert64BitIdsFromToHexStringRepresentation(String hexId, DD64bTraceId expectedId) {
+        DD64bTraceId ddid = DD64bTraceId.fromHex(hexId);
+        String padded16 = hexId.length() <= 16 ? leftPadWithZeros(hexId, 16) : hexId.substring(hexId.length() - 16);
+        String padded32 = leftPadWithZeros(hexId, 32);
+
+        assertEquals(expectedId, ddid);
+        assertEquals(padded32, ddid.toHexString());
+        assertEquals(padded16, ddid.toHexStringPadded(16));
+        assertEquals(padded32, ddid.toHexStringPadded(32));
     }
-    StringBuilder builder = new StringBuilder(size);
-    int count = size - value.length();
-    for (int index = 0; index < count; index++) {
-      builder.append('0');
+
+    @ParameterizedTest(name = "fail parsing illegal 64-bit hexadecimal String representation [{index}]")
+    @NullSource
+    @ValueSource(strings = {"", "-1", "10000000000000000", "ffffffffffffffzf", "fffffffffffffffz"})
+    void failParsingIllegal64BitHexadecimalStringRepresentation(String hexId) {
+        assertThrows(NumberFormatException.class, () -> DD64bTraceId.fromHex(hexId));
+    }
+
+    @TableTest({
+      "scenario                    | highOrderBits       | lowOrderBits        | hexId                             ",
+      "both long min               | Long.MIN_VALUE      | Long.MIN_VALUE      | '80000000000000008000000000000000'",
+      "high long min low one       | Long.MIN_VALUE      | 1                   | '80000000000000000000000000000001'",
+      "high long min low long max  | Long.MIN_VALUE      | Long.MAX_VALUE      | '80000000000000007fffffffffffffff'",
+      "high one low long min       | 1                   | Long.MIN_VALUE      | '00000000000000018000000000000000'",
+      "high one low one            | 1                   | 1                   | '00000000000000010000000000000001'",
+      "high one low long max       | 1                   | Long.MAX_VALUE      | '00000000000000017fffffffffffffff'",
+      "high long max low long min  | Long.MAX_VALUE      | Long.MIN_VALUE      | '7fffffffffffffff8000000000000000'",
+      "high long max low one       | Long.MAX_VALUE      | 1                   | '7fffffffffffffff0000000000000001'",
+      "high long max low long max  | Long.MAX_VALUE      | Long.MAX_VALUE      | '7fffffffffffffff7fffffffffffffff'",
+      "all zeros length one        | 0                   | 0                   | '0'                               ",
+      "all zeros length sixteen    | 0                   | 0                   | '0000000000000000'                ",
+      "all zeros length seventeen  | 0                   | 0                   | '00000000000000000'               ",
+      "all zeros length thirty-two | 0                   | 0                   | '00000000000000000000000000000000'",
+      "low fifteen                 | 0                   | 15                  | 'f'                               ",
+      "low minus one               | 0                   | -1                  | 'ffffffffffffffff'                ",
+      "high fifteen low minus one  | 15                  | -1                  | 'fffffffffffffffff'               ",
+      "all f                       | -1                  | -1                  | 'ffffffffffffffffffffffffffffffff'",
+      "hex literal                 | 1311768467463790320 | 1311768467463790320 | '123456789abcdef0123456789abcdef0'"
+    })
+    @ParameterizedTest(name = "convert 128-bit ids from/to hexadecimal String representation [{index}]")
+    void convert128BitIdsFromToHexadecimalStringRepresentation(long highOrderBits, long lowOrderBits, String hexId) {
+        DDTraceId parsedId = DD128bTraceId.fromHex(hexId);
+        DDTraceId id = DD128bTraceId.from(highOrderBits, lowOrderBits);
+        String paddedHexId = leftPadWithZeros(hexId, 32);
+
+        assertEquals(id, parsedId);
+        assertEquals(paddedHexId, parsedId.toHexString());
+        assertEquals(paddedHexId.substring(16, 32), parsedId.toHexStringPadded(16));
+        assertEquals(paddedHexId, parsedId.toHexStringPadded(32));
+        assertEquals(lowOrderBits, parsedId.toLong());
+        assertEquals(highOrderBits, parsedId.toHighOrderLong());
+        assertEquals(Long.toUnsignedString(lowOrderBits), parsedId.toString());
+    }
+
+    @TableTest({
+      "scenario             | hexId                                  | start | length | lowerCaseOnly | expectedHexId                   ",
+      "default bounds       | 0123456789abcdeffedcba9876543210       | 0     | 32     | true          | 0123456789abcdeffedcba9876543210",
+      "starting bounds      | 0123456789abcdeffedcba9876543210       | 0     | 16     | true          | 00000000000000000123456789abcdef",
+      "ending bounds        | 0123456789abcdeffedcba9876543210       | 16    | 16     | true          | 0000000000000000fedcba9876543210",
+      "middle bounds        | 0123456789abcdeffedcba9876543210       | 8     | 4      | true          | 000000000000000000000000000089ab",
+      "with padding         | ---0123456789abcdeffedcba9876543210--- | 3     | 32     | true          | 0123456789abcdeffedcba9876543210",
+      "upper case           | 0123456789ABCDEFFEDCBA9876543210       | 0     | 32     | false         | 0123456789abcdeffedcba9876543210",
+      "mixed case           | 0123456789ABCDEFfedcba9876543210       | 0     | 32     | false         | 0123456789abcdeffedcba9876543210",
+      "negative position    | 0123456789abcdeffedcba9876543210       | -1    | 32     | false         |                                 ",
+      "negative length      | 0123456789abcdeffedcba9876543210       | 0     | -1     | false         |                                 ",
+      "invalid length       | 0123456789abcdeffedcba9876543210       | 0     | 33     | false         |                                 ",
+      "invalid ending bound | 0123456789abcdeffedcba9876543210       | 1     | 32     | false         |                                 ",
+      "invalid case         | 0123456789ABCDEFFEDCBA9876543210       | 0     | 32     | true          |                                 "
+    })
+    void converting128BitIdsFromHexadecimalStringRepresentation(
+            String hexId, int start, int length, boolean lowerCaseOnly, String expectedHexId) {
+        if (expectedHexId == null) {
+            assertThrows(NumberFormatException.class, () -> DD128bTraceId.fromHex(hexId, start, length, lowerCaseOnly));
+            return;
+        }
+        DD128bTraceId parsedId = DD128bTraceId.fromHex(hexId, start, length, lowerCaseOnly);
+        assertEquals(expectedHexId, parsedId.toHexString());
+    }
+
+    @ParameterizedTest(name = "fail parsing illegal 128-bit id hexadecimal String representation [{index}]")
+    @NullSource
+    @ValueSource(strings = {"", "-1", "-A", "111111111111111111111111111111111", "123ABC", "123abcg"})
+    void failParsingIllegal128BitIdHexadecimalStringRepresentation(String hexId) {
+        assertThrows(NumberFormatException.class, () -> DD128bTraceId.fromHex(hexId));
+    }
+
+    @TableTest({
+      "scenario             | hexId                               | start | length | lowerCaseOnly",
+      "null string          |                                     | 0     | 0      | true         ",
+      "empty string         | ''                                  | 0     | 0      | true         ",
+      "out of bound length  | '123456789abcdef0'                  | 0     | 17     | true         ",
+      "out of bound end     | '123456789abcdef0'                  | 7     | 10     | true         ",
+      "out of bound start   | '123456789abcdef0'                  | 17    | 0      | true         ",
+      "invalid minus one    | '-1'                                | 0     | 1      | true         ",
+      "invalid minus a      | '-a'                                | 0     | 1      | true         ",
+      "invalid character    | '123abcg'                           | 0     | 7      | true         ",
+      "invalid upper case A | 'A'                                 | 0     | 1      | true         ",
+      "invalid upper case   | '123ABC'                            | 0     | 6      | true         ",
+      "too long             | '111111111111111111111111111111111' | 0     | 33     | true         "
+    })
+    @ParameterizedTest(
+            name = "fail parsing illegal 128-bit id hexadecimal String representation from partial String [{index}]")
+    void failParsingIllegal128BitIdHexadecimalStringRepresentationFromPartialString(
+            String hexId, int start, int length, boolean lowerCaseOnly) {
+        assertThrows(NumberFormatException.class, () -> DD128bTraceId.fromHex(hexId, start, length, lowerCaseOnly));
+    }
+
+    @Test
+    void checkZeroConstantInitialization() {
+        DDTraceId zero = DDTraceId.ZERO;
+        DDTraceId fromZero = DDTraceId.from(0);
+
+        assertNotNull(zero);
+        assertSame(fromZero, zero);
+    }
+
+    private static String leftPadWithZeros(String value, int size) {
+        if (value.length() >= size) {
+            return value;
+        }
+        StringBuilder builder = new StringBuilder(size);
+        int count = size - value.length();
+        for (int index = 0; index < count; index++) {
+            builder.append('0');
+        }
+        builder.append(value);
+        return builder.toString();
     }
-    builder.append(value);
-    return builder.toString();
-  }
 }
diff --git a/dd-trace-api/src/test/java/datadog/trace/api/IdGenerationStrategyTest.java b/dd-trace-api/src/test/java/datadog/trace/api/IdGenerationStrategyTest.java
index e5b5a8efcf9..c113412a5c9 100644
--- a/dd-trace-api/src/test/java/datadog/trace/api/IdGenerationStrategyTest.java
+++ b/dd-trace-api/src/test/java/datadog/trace/api/IdGenerationStrategyTest.java
@@ -17,104 +17,93 @@
 
 class IdGenerationStrategyTest {
 
-  @TableTest({
-    "scenario           | traceId128BitGenerationEnabled | strategyName                       ",
-    "strategies-64-bit  | false                          | {RANDOM, SEQUENTIAL, SECURE_RANDOM}",
-    "strategies-128-bit | true                           | {RANDOM, SEQUENTIAL, SECURE_RANDOM}"
-  })
-  @ParameterizedTest(name = "generate id with {1} and {0} bits")
-  void generateIdWithStrategyAndBitSize(
-      boolean traceId128BitGenerationEnabled, String strategyName) {
-    IdGenerationStrategy strategy =
-        IdGenerationStrategy.fromName(strategyName, traceId128BitGenerationEnabled);
-    Set<DDTraceId> checked = new HashSet<DDTraceId>();
-
-    for (int index = 0; index <= 32768; index++) {
-      DDTraceId traceId = strategy.generateTraceId();
-      assertNotNull(traceId);
-      assertNotEquals(null, traceId);
-      assertNotEquals("foo", traceId);
-      assertNotEquals(DDTraceId.ZERO, traceId);
-
-      int expectedHash =
-          (int)
-              (traceId.toHighOrderLong()
-                  ^ (traceId.toHighOrderLong() >>> 32)
-                  ^ traceId.toLong()
-                  ^ (traceId.toLong() >>> 32));
-      assertEquals(expectedHash, traceId.hashCode());
-
-      assertFalse(checked.contains(traceId));
-      checked.add(traceId);
+    @TableTest({
+      "scenario           | traceId128BitGenerationEnabled | strategyName                       ",
+      "strategies-64-bit  | false                          | {RANDOM, SEQUENTIAL, SECURE_RANDOM}",
+      "strategies-128-bit | true                           | {RANDOM, SEQUENTIAL, SECURE_RANDOM}"
+    })
+    @ParameterizedTest(name = "generate id with {1} and {0} bits")
+    void generateIdWithStrategyAndBitSize(boolean traceId128BitGenerationEnabled, String strategyName) {
+        IdGenerationStrategy strategy = IdGenerationStrategy.fromName(strategyName, traceId128BitGenerationEnabled);
+        Set<DDTraceId> checked = new HashSet<DDTraceId>();
+
+        for (int index = 0; index <= 32768; index++) {
+            DDTraceId traceId = strategy.generateTraceId();
+            assertNotNull(traceId);
+            assertNotEquals(null, traceId);
+            assertNotEquals("foo", traceId);
+            assertNotEquals(DDTraceId.ZERO, traceId);
+
+            int expectedHash = (int) (traceId.toHighOrderLong()
+                    ^ (traceId.toHighOrderLong() >>> 32)
+                    ^ traceId.toLong()
+                    ^ (traceId.toLong() >>> 32));
+            assertEquals(expectedHash, traceId.hashCode());
+
+            assertFalse(checked.contains(traceId));
+            checked.add(traceId);
+        }
     }
-  }
-
-  @ParameterizedTest(name = "return null for non existing strategy {0}")
-  @ValueSource(strings = {"SOME", "UNKNOWN", "STRATEGIES"})
-  void returnNullForNonExistingStrategy(String strategyName) {
-    assertNull(IdGenerationStrategy.fromName(strategyName));
-  }
-
-  @Test
-  void exceptionCreatedOnSecureRandomStrategy() {
-    ExceptionInInitializerError error =
-        assertThrows(
-            ExceptionInInitializerError.class,
-            () ->
-                new IdGenerationStrategy.SRandom(
-                    false,
-                    () -> {
-                      throw new IllegalArgumentException("SecureRandom init exception");
-                    }));
-
-    assertNotNull(error.getCause());
-    assertEquals("SecureRandom init exception", error.getCause().getMessage());
-  }
-
-  @Test
-  void secureRandomIdsWillAlwaysBeNonZero() {
-    ScriptedSecureRandom random = new ScriptedSecureRandom(new long[] {0L, 47L, 0L, 11L});
-    CallCounter providerCallCounter = new CallCounter();
-
-    IdGenerationStrategy strategy =
-        new IdGenerationStrategy.SRandom(
-            false,
-            () -> {
-              providerCallCounter.count++;
-              return random;
-            });
-
-    long traceId = strategy.generateTraceId().toLong();
-    long spanId = strategy.generateSpanId();
-
-    assertEquals(1, providerCallCounter.count);
-    assertEquals(47L, traceId);
-    assertEquals(11L, spanId);
-    assertEquals(4, random.calls);
-  }
-
-  private static class CallCounter {
-    private int count;
-  }
-
-  private static class ScriptedSecureRandom extends SecureRandom {
-    private final long[] values;
-    private int index;
-    private int calls;
-
-    private ScriptedSecureRandom(long[] values) {
-      this.values = values;
+
+    @ParameterizedTest(name = "return null for non existing strategy {0}")
+    @ValueSource(strings = {"SOME", "UNKNOWN", "STRATEGIES"})
+    void returnNullForNonExistingStrategy(String strategyName) {
+        assertNull(IdGenerationStrategy.fromName(strategyName));
+    }
+
+    @Test
+    void exceptionCreatedOnSecureRandomStrategy() {
+        ExceptionInInitializerError error = assertThrows(
+                ExceptionInInitializerError.class,
+                () -> new IdGenerationStrategy.SRandom(false, () -> {
+                    throw new IllegalArgumentException("SecureRandom init exception");
+                }));
+
+        assertNotNull(error.getCause());
+        assertEquals("SecureRandom init exception", error.getCause().getMessage());
+    }
+
+    @Test
+    void secureRandomIdsWillAlwaysBeNonZero() {
+        ScriptedSecureRandom random = new ScriptedSecureRandom(new long[] {0L, 47L, 0L, 11L});
+        CallCounter providerCallCounter = new CallCounter();
+
+        IdGenerationStrategy strategy = new IdGenerationStrategy.SRandom(false, () -> {
+            providerCallCounter.count++;
+            return random;
+        });
+
+        long traceId = strategy.generateTraceId().toLong();
+        long spanId = strategy.generateSpanId();
+
+        assertEquals(1, providerCallCounter.count);
+        assertEquals(47L, traceId);
+        assertEquals(11L, spanId);
+        assertEquals(4, random.calls);
+    }
+
+    private static class CallCounter {
+        private int count;
     }
 
-    @Override
-    public long nextLong() {
-      calls++;
-      if (index >= values.length) {
-        return 0L;
-      }
-      long value = values[index];
-      index++;
-      return value;
+    private static class ScriptedSecureRandom extends SecureRandom {
+        private final long[] values;
+        private int index;
+        private int calls;
+
+        private ScriptedSecureRandom(long[] values) {
+            this.values = values;
+        }
+
+        @Override
+        public long nextLong() {
+            calls++;
+            if (index >= values.length) {
+                return 0L;
+            }
+            long value = values[index];
+            index++;
+            return value;
+        }
     }
-  }
 }
diff --git a/dd-trace-api/src/test/java/datadog/trace/api/ProtocolVersionTest.java b/dd-trace-api/src/test/java/datadog/trace/api/ProtocolVersionTest.java
index 18d14322388..f10d2a45d49 100644
--- a/dd-trace-api/src/test/java/datadog/trace/api/ProtocolVersionTest.java
+++ b/dd-trace-api/src/test/java/datadog/trace/api/ProtocolVersionTest.java
@@ -15,52 +15,52 @@
 @DisplayName("trace agent protocol versions")
 class ProtocolVersionTest {
 
-  @Test
-  @DisplayName("expose configuration values")
-  void exposesConfigValues() {
-    assertEquals("0.4", V0_4.asConfigValue());
-    assertEquals("0.5", V0_5.asConfigValue());
-    assertEquals("1.0", V1_0.asConfigValue());
-  }
+    @Test
+    @DisplayName("expose configuration values")
+    void exposesConfigValues() {
+        assertEquals("0.4", V0_4.asConfigValue());
+        assertEquals("0.5", V0_5.asConfigValue());
+        assertEquals("1.0", V1_0.asConfigValue());
+    }
 
-  @Test
-  @DisplayName("expose primary endpoints and fallbacks")
-  void exposesPrimaryEndpointAndFallbacks() {
-    assertEquals("v0.4/traces", V0_4.endpoint());
-    assertEquals(singletonList("v0.3/traces"), V0_4.fallback());
+    @Test
+    @DisplayName("expose primary endpoints and fallbacks")
+    void exposesPrimaryEndpointAndFallbacks() {
+        assertEquals("v0.4/traces", V0_4.endpoint());
+        assertEquals(singletonList("v0.3/traces"), V0_4.fallback());
 
-    assertEquals("v0.5/traces", V0_5.endpoint());
-    assertEquals(asList("v0.4/traces", "v0.3/traces"), V0_5.fallback());
+        assertEquals("v0.5/traces", V0_5.endpoint());
+        assertEquals(asList("v0.4/traces", "v0.3/traces"), V0_5.fallback());
 
-    assertEquals("v1.0/traces", V1_0.endpoint());
-    assertEquals(asList("v0.4/traces", "v0.3/traces"), V1_0.fallback());
-  }
+        assertEquals("v1.0/traces", V1_0.endpoint());
+        assertEquals(asList("v0.4/traces", "v0.3/traces"), V1_0.fallback());
+    }
 
-  @Test
-  @DisplayName("preserve endpoint probe ordering")
-  void preservesProbeOrdering() {
-    assertEquals(asList("v0.4/traces", "v0.3/traces"), V0_4.endpointsToProbe());
-    assertEquals(asList("v0.5/traces", "v0.4/traces", "v0.3/traces"), V0_5.endpointsToProbe());
-    assertEquals(asList("v1.0/traces", "v0.4/traces", "v0.3/traces"), V1_0.endpointsToProbe());
-  }
+    @Test
+    @DisplayName("preserve endpoint probe ordering")
+    void preservesProbeOrdering() {
+        assertEquals(asList("v0.4/traces", "v0.3/traces"), V0_4.endpointsToProbe());
+        assertEquals(asList("v0.5/traces", "v0.4/traces", "v0.3/traces"), V0_5.endpointsToProbe());
+        assertEquals(asList("v1.0/traces", "v0.4/traces", "v0.3/traces"), V1_0.endpointsToProbe());
+    }
 
-  @Test
-  @DisplayName("map configuration values to protocol versions")
-  void mapsConfigValueToVersion() {
-    assertEquals(V0_4, fromConfigValue(null));
-    assertEquals(V0_4, fromConfigValue("0.4"));
-    assertEquals(V0_5, fromConfigValue("0.5"));
-    assertEquals(V1_0, fromConfigValue("1.0"));
-    assertEquals(V0_4, fromConfigValue("unsupported"));
-  }
+    @Test
+    @DisplayName("map configuration values to protocol versions")
+    void mapsConfigValueToVersion() {
+        assertEquals(V0_4, fromConfigValue(null));
+        assertEquals(V0_4, fromConfigValue("0.4"));
+        assertEquals(V0_5, fromConfigValue("0.5"));
+        assertEquals(V1_0, fromConfigValue("1.0"));
+        assertEquals(V0_4, fromConfigValue("unsupported"));
+    }
 
-  @Test
-  @DisplayName("map trace endpoints to protocol versions")
-  void mapsTraceEndpointToVersion() {
-    assertEquals(V0_4, fromTraceEndpoint(null));
-    assertEquals(V1_0, fromTraceEndpoint("http://localhost:8126/v1.0/traces"));
-    assertEquals(V0_5, fromTraceEndpoint("HTTP://LOCALHOST:8126/V0.5/TRACES"));
-    assertEquals(V0_4, fromTraceEndpoint("v0.4/traces"));
-    assertEquals(V0_4, fromTraceEndpoint("http://localhost:8126/unsupported"));
-  }
+    @Test
+    @DisplayName("map trace endpoints to protocol versions")
+    void mapsTraceEndpointToVersion() {
+        assertEquals(V0_4, fromTraceEndpoint(null));
+        assertEquals(V1_0, fromTraceEndpoint("http://localhost:8126/v1.0/traces"));
+        assertEquals(V0_5, fromTraceEndpoint("HTTP://LOCALHOST:8126/V0.5/TRACES"));
+        assertEquals(V0_4, fromTraceEndpoint("v0.4/traces"));
+        assertEquals(V0_4, fromTraceEndpoint("http://localhost:8126/unsupported"));
+    }
 }
diff --git a/dd-trace-api/src/test/java/datadog/trace/api/aiguard/AIGuardTest.java b/dd-trace-api/src/test/java/datadog/trace/api/aiguard/AIGuardTest.java
index 6676c698a4e..fe0b35a946e 100644
--- a/dd-trace-api/src/test/java/datadog/trace/api/aiguard/AIGuardTest.java
+++ b/dd-trace-api/src/test/java/datadog/trace/api/aiguard/AIGuardTest.java
@@ -15,233 +15,217 @@
 
 class AIGuardTest {
 
-  @Test
-  void testTextMessage() {
-    AIGuard.Message message = AIGuard.Message.message("user", "What day is today?");
-
-    assertEquals("user", message.getRole());
-    assertEquals("What day is today?", message.getContent());
-    assertNull(message.getToolCallId());
-    assertNull(message.getToolCalls());
-  }
-
-  @Test
-  void testAssistantToolCall() {
-    AIGuard.Message message =
-        AIGuard.Message.assistant(
-            AIGuard.ToolCall.toolCall(
-                "1", "execute_http_request", "{ \"url\": \"http://localhost\" }"),
-            AIGuard.ToolCall.toolCall("2", "random_number", "{ \"min\": 0, \"max\": 10 }"));
-
-    assertEquals("assistant", message.getRole());
-    assertNull(message.getContent());
-    assertNull(message.getToolCallId());
-    assertNotNull(message.getToolCalls());
-    assertEquals(2, message.getToolCalls().size());
-
-    AIGuard.ToolCall http = message.getToolCalls().get(0);
-    assertEquals("1", http.getId());
-    assertEquals("execute_http_request", http.getFunction().getName());
-    assertEquals("{ \"url\": \"http://localhost\" }", http.getFunction().getArguments());
-
-    AIGuard.ToolCall random = message.getToolCalls().get(1);
-    assertEquals("2", random.getId());
-    assertEquals("random_number", random.getFunction().getName());
-    assertEquals("{ \"min\": 0, \"max\": 10 }", random.getFunction().getArguments());
-  }
-
-  @Test
-  void testTool() {
-    AIGuard.Message message = AIGuard.Message.tool("2", "5");
-
-    assertEquals("tool", message.getRole());
-    assertEquals("5", message.getContent());
-    assertEquals("2", message.getToolCallId());
-    assertNull(message.getToolCalls());
-  }
-
-  @Test
-  void testNoopImplementation() {
-    List<AIGuard.Message> messages =
-        Arrays.asList(
-            AIGuard.Message.message("system", "You are a beautiful AI assistant"),
-            AIGuard.Message.message("user", "What day is today?"),
-            AIGuard.Message.message("assistant", "Today is monday"),
-            AIGuard.Message.message("user", "Give me a random number"),
-            AIGuard.Message.assistant(
-                AIGuard.ToolCall.toolCall(
-                    "1", "generate_random_number", "{ \"min\": 0, \"max\": 10 }")),
-            AIGuard.Message.tool("1", "5"),
-            AIGuard.Message.message("assistant", "Your number is 5"));
-
-    AIGuard.Evaluation evaluation = AIGuard.evaluate(messages);
-
-    assertEquals(ALLOW, evaluation.getAction());
-    assertEquals("AI Guard is not enabled", evaluation.getReason());
-    // nothing is redacted, so the very same list is handed back
-    assertSame(messages, evaluation.getMessages());
-  }
-
-  @Test
-  void testNoopImplementationWithoutMessages() {
-    // Evaluation normalises a null message list, so the no-op evaluator need not guard for it.
-    AIGuard.Evaluation evaluation = AIGuard.evaluate(null);
-
-    assertEquals(ALLOW, evaluation.getAction());
-    assertNotNull(evaluation.getMessages());
-    assertTrue(evaluation.getMessages().isEmpty());
-  }
-
-  @Test
-  @SuppressWarnings("deprecation")
-  void testEvaluationCarriesMessages() {
-    List<AIGuard.Message> messages =
-        Collections.singletonList(AIGuard.Message.message("user", "My SSN is <REDACTED>"));
-
-    AIGuard.Evaluation evaluation =
-        new AIGuard.Evaluation(
-            ALLOW, "No rule match.", Collections.<String>emptyList(), null, null, messages);
-
-    assertSame(messages, evaluation.getMessages());
-  }
-
-  @Test
-  @SuppressWarnings("deprecation")
-  void testEvaluationWithoutMessagesReturnsEmptyList() {
-    AIGuard.Evaluation evaluation =
-        new AIGuard.Evaluation(
-            ALLOW, "No rule match.", Collections.<String>emptyList(), null, null);
-
-    assertNotNull(evaluation.getMessages());
-    assertTrue(evaluation.getMessages().isEmpty());
-  }
-
-  @Test
-  @SuppressWarnings("deprecation")
-  void testEvaluationWithNullMessagesReturnsEmptyList() {
-    AIGuard.Evaluation evaluation =
-        new AIGuard.Evaluation(
-            ALLOW, "No rule match.", Collections.<String>emptyList(), null, null, null);
-
-    assertNotNull(evaluation.getMessages());
-    assertTrue(evaluation.getMessages().isEmpty());
-  }
-
-  @Test
-  void testEvaluationCarriesRedactionReplacements() {
-    List<AIGuard.Message> messages =
-        Collections.singletonList(AIGuard.Message.message("user", "My SSN is <REDACTED>"));
-    List<Map<String, String>> replacements =
-        Collections.singletonList(Collections.singletonMap("path", "messages[0].content"));
-
-    AIGuard.Evaluation evaluation =
-        new AIGuard.Evaluation(
-            ALLOW,
-            "No rule match.",
-            Collections.<String>emptyList(),
-            null,
-            null,
-            messages,
-            replacements);
-
-    assertSame(replacements, evaluation.getRedactionReplacements());
-  }
-
-  @Test
-  @SuppressWarnings("deprecation")
-  void testEvaluationWithoutReplacementsReturnsEmptyList() {
-    AIGuard.Evaluation evaluation =
-        new AIGuard.Evaluation(
-            ALLOW, "No rule match.", Collections.<String>emptyList(), null, null, null);
-
-    assertNotNull(evaluation.getRedactionReplacements());
-    assertTrue(evaluation.getRedactionReplacements().isEmpty());
-  }
-
-  @Test
-  void testEvaluationWithNullReplacementsReturnsEmptyList() {
-    AIGuard.Evaluation evaluation =
-        new AIGuard.Evaluation(
-            ALLOW, "No rule match.", Collections.<String>emptyList(), null, null, null, null);
-
-    assertNotNull(evaluation.getRedactionReplacements());
-    assertTrue(evaluation.getRedactionReplacements().isEmpty());
-  }
-
-  @Test
-  void testContentPartTextFactory() {
-    AIGuard.ContentPart part = AIGuard.ContentPart.text("Hello world");
-
-    assertEquals(AIGuard.ContentPart.Type.TEXT, part.getType());
-    assertEquals("Hello world", part.getText());
-    assertNull(part.getImageUrl());
-  }
-
-  @Test
-  void testContentPartImageUrlFromStringFactory() {
-    AIGuard.ContentPart part = AIGuard.ContentPart.imageUrl("https://example.com/image.jpg");
-
-    assertEquals(AIGuard.ContentPart.Type.IMAGE_URL, part.getType());
-    assertNull(part.getText());
-    assertNotNull(part.getImageUrl());
-    assertEquals("https://example.com/image.jpg", part.getImageUrl().getUrl());
-  }
-
-  @Test
-  void testMessageWithContentParts() {
-    AIGuard.Message message =
-        AIGuard.Message.message(
-            "user",
-            Arrays.asList(
-                AIGuard.ContentPart.text("Describe this image:"),
-                AIGuard.ContentPart.imageUrl("https://example.com/image.jpg")));
-
-    assertEquals("user", message.getRole());
-    assertNull(message.getContent());
-    assertNotNull(message.getContentParts());
-    assertEquals(2, message.getContentParts().size());
-    assertEquals(AIGuard.ContentPart.Type.TEXT, message.getContentParts().get(0).getType());
-    assertEquals("Describe this image:", message.getContentParts().get(0).getText());
-    assertEquals(AIGuard.ContentPart.Type.IMAGE_URL, message.getContentParts().get(1).getType());
-    assertEquals(
-        "https://example.com/image.jpg", message.getContentParts().get(1).getImageUrl().getUrl());
-  }
-
-  @Test
-  void testMessageWithPlainContentReturnsNullContentParts() {
-    AIGuard.Message message = AIGuard.Message.message("user", "Hello");
-
-    assertEquals("Hello", message.getContent());
-    assertNull(message.getContentParts());
-  }
-
-  @Test
-  void testMessageWithContentPartsReturnsNullContent() {
-    AIGuard.Message message =
-        AIGuard.Message.message(
-            "user", Collections.singletonList(AIGuard.ContentPart.text("Hello")));
-
-    assertNull(message.getContent());
-    assertNotNull(message.getContentParts());
-  }
-
-  @Test
-  void testMessageValidationAllowsNullContentForAssistantWithToolCalls() {
-    AIGuard.Message message =
-        AIGuard.Message.assistant(AIGuard.ToolCall.toolCall("1", "test", "{}"));
-
-    assertEquals("assistant", message.getRole());
-    assertNull(message.getContent());
-    assertNull(message.getContentParts());
-    assertNotNull(message.getToolCalls());
-  }
-
-  @Test
-  void testMessageAllowsEmptyContentPartsList() {
-    AIGuard.Message message =
-        new AIGuard.Message("user", Collections.<AIGuard.ContentPart>emptyList(), null, null);
-
-    assertNotNull(message.getContentParts());
-    assertTrue(message.getContentParts().isEmpty());
-  }
+    @Test
+    void testTextMessage() {
+        AIGuard.Message message = AIGuard.Message.message("user", "What day is today?");
+
+        assertEquals("user", message.getRole());
+        assertEquals("What day is today?", message.getContent());
+        assertNull(message.getToolCallId());
+        assertNull(message.getToolCalls());
+    }
+
+    @Test
+    void testAssistantToolCall() {
+        AIGuard.Message message = AIGuard.Message.assistant(
+                AIGuard.ToolCall.toolCall("1", "execute_http_request", "{ \"url\": \"http://localhost\" }"),
+                AIGuard.ToolCall.toolCall("2", "random_number", "{ \"min\": 0, \"max\": 10 }"));
+
+        assertEquals("assistant", message.getRole());
+        assertNull(message.getContent());
+        assertNull(message.getToolCallId());
+        assertNotNull(message.getToolCalls());
+        assertEquals(2, message.getToolCalls().size());
+
+        AIGuard.ToolCall http = message.getToolCalls().get(0);
+        assertEquals("1", http.getId());
+        assertEquals("execute_http_request", http.getFunction().getName());
+        assertEquals("{ \"url\": \"http://localhost\" }", http.getFunction().getArguments());
+
+        AIGuard.ToolCall random = message.getToolCalls().get(1);
+        assertEquals("2", random.getId());
+        assertEquals("random_number", random.getFunction().getName());
+        assertEquals("{ \"min\": 0, \"max\": 10 }", random.getFunction().getArguments());
+    }
+
+    @Test
+    void testTool() {
+        AIGuard.Message message = AIGuard.Message.tool("2", "5");
+
+        assertEquals("tool", message.getRole());
+        assertEquals("5", message.getContent());
+        assertEquals("2", message.getToolCallId());
+        assertNull(message.getToolCalls());
+    }
+
+    @Test
+    void testNoopImplementation() {
+        List<AIGuard.Message> messages = Arrays.asList(
+                AIGuard.Message.message("system", "You are a beautiful AI assistant"),
+                AIGuard.Message.message("user", "What day is today?"),
+                AIGuard.Message.message("assistant", "Today is monday"),
+                AIGuard.Message.message("user", "Give me a random number"),
+                AIGuard.Message.assistant(
+                        AIGuard.ToolCall.toolCall("1", "generate_random_number", "{ \"min\": 0, \"max\": 10 }")),
+                AIGuard.Message.tool("1", "5"),
+                AIGuard.Message.message("assistant", "Your number is 5"));
+
+        AIGuard.Evaluation evaluation = AIGuard.evaluate(messages);
+
+        assertEquals(ALLOW, evaluation.getAction());
+        assertEquals("AI Guard is not enabled", evaluation.getReason());
+        // nothing is redacted, so the very same list is handed back
+        assertSame(messages, evaluation.getMessages());
+    }
+
+    @Test
+    void testNoopImplementationWithoutMessages() {
+        // Evaluation normalises a null message list, so the no-op evaluator need not guard for it.
+        AIGuard.Evaluation evaluation = AIGuard.evaluate(null);
+
+        assertEquals(ALLOW, evaluation.getAction());
+        assertNotNull(evaluation.getMessages());
+        assertTrue(evaluation.getMessages().isEmpty());
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    void testEvaluationCarriesMessages() {
+        List<AIGuard.Message> messages =
+                Collections.singletonList(AIGuard.Message.message("user", "My SSN is <REDACTED>"));
+
+        AIGuard.Evaluation evaluation =
+                new AIGuard.Evaluation(ALLOW, "No rule match.", Collections.<String>emptyList(), null, null, messages);
+
+        assertSame(messages, evaluation.getMessages());
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    void testEvaluationWithoutMessagesReturnsEmptyList() {
+        AIGuard.Evaluation evaluation =
+                new AIGuard.Evaluation(ALLOW, "No rule match.", Collections.<String>emptyList(), null, null);
+
+        assertNotNull(evaluation.getMessages());
+        assertTrue(evaluation.getMessages().isEmpty());
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    void testEvaluationWithNullMessagesReturnsEmptyList() {
+        AIGuard.Evaluation evaluation =
+                new AIGuard.Evaluation(ALLOW, "No rule match.", Collections.<String>emptyList(), null, null, null);
+
+        assertNotNull(evaluation.getMessages());
+        assertTrue(evaluation.getMessages().isEmpty());
+    }
+
+    @Test
+    void testEvaluationCarriesRedactionReplacements() {
+        List<AIGuard.Message> messages =
+                Collections.singletonList(AIGuard.Message.message("user", "My SSN is <REDACTED>"));
+        List<Map<String, String>> replacements =
+                Collections.singletonList(Collections.singletonMap("path", "messages[0].content"));
+
+        AIGuard.Evaluation evaluation = new AIGuard.Evaluation(
+                ALLOW, "No rule match.", Collections.<String>emptyList(), null, null, messages, replacements);
+
+        assertSame(replacements, evaluation.getRedactionReplacements());
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    void testEvaluationWithoutReplacementsReturnsEmptyList() {
+        AIGuard.Evaluation evaluation =
+                new AIGuard.Evaluation(ALLOW, "No rule match.", Collections.<String>emptyList(), null, null, null);
+
+        assertNotNull(evaluation.getRedactionReplacements());
+        assertTrue(evaluation.getRedactionReplacements().isEmpty());
+    }
+
+    @Test
+    void testEvaluationWithNullReplacementsReturnsEmptyList() {
+        AIGuard.Evaluation evaluation = new AIGuard.Evaluation(
+                ALLOW, "No rule match.", Collections.<String>emptyList(), null, null, null, null);
+
+        assertNotNull(evaluation.getRedactionReplacements());
+        assertTrue(evaluation.getRedactionReplacements().isEmpty());
+    }
+
+    @Test
+    void testContentPartTextFactory() {
+        AIGuard.ContentPart part = AIGuard.ContentPart.text("Hello world");
+
+        assertEquals(AIGuard.ContentPart.Type.TEXT, part.getType());
+        assertEquals("Hello world", part.getText());
+        assertNull(part.getImageUrl());
+    }
+
+    @Test
+    void testContentPartImageUrlFromStringFactory() {
+        AIGuard.ContentPart part = AIGuard.ContentPart.imageUrl("https://example.com/image.jpg");
+
+        assertEquals(AIGuard.ContentPart.Type.IMAGE_URL, part.getType());
+        assertNull(part.getText());
+        assertNotNull(part.getImageUrl());
+        assertEquals("https://example.com/image.jpg", part.getImageUrl().getUrl());
+    }
+
+    @Test
+    void testMessageWithContentParts() {
+        AIGuard.Message message = AIGuard.Message.message(
+                "user",
+                Arrays.asList(
+                        AIGuard.ContentPart.text("Describe this image:"),
+                        AIGuard.ContentPart.imageUrl("https://example.com/image.jpg")));
+
+        assertEquals("user", message.getRole());
+        assertNull(message.getContent());
+        assertNotNull(message.getContentParts());
+        assertEquals(2, message.getContentParts().size());
+        assertEquals(
+                AIGuard.ContentPart.Type.TEXT, message.getContentParts().get(0).getType());
+        assertEquals("Describe this image:", message.getContentParts().get(0).getText());
+        assertEquals(
+                AIGuard.ContentPart.Type.IMAGE_URL,
+                message.getContentParts().get(1).getType());
+        assertEquals(
+                "https://example.com/image.jpg",
+                message.getContentParts().get(1).getImageUrl().getUrl());
+    }
+
+    @Test
+    void testMessageWithPlainContentReturnsNullContentParts() {
+        AIGuard.Message message = AIGuard.Message.message("user", "Hello");
+
+        assertEquals("Hello", message.getContent());
+        assertNull(message.getContentParts());
+    }
+
+    @Test
+    void testMessageWithContentPartsReturnsNullContent() {
+        AIGuard.Message message =
+                AIGuard.Message.message("user", Collections.singletonList(AIGuard.ContentPart.text("Hello")));
+
+        assertNull(message.getContent());
+        assertNotNull(message.getContentParts());
+    }
+
+    @Test
+    void testMessageValidationAllowsNullContentForAssistantWithToolCalls() {
+        AIGuard.Message message = AIGuard.Message.assistant(AIGuard.ToolCall.toolCall("1", "test", "{}"));
+
+        assertEquals("assistant", message.getRole());
+        assertNull(message.getContent());
+        assertNull(message.getContentParts());
+        assertNotNull(message.getToolCalls());
+    }
+
+    @Test
+    void testMessageAllowsEmptyContentPartsList() {
+        AIGuard.Message message = new AIGuard.Message("user", Collections.<AIGuard.ContentPart>emptyList(), null, null);
+
+        assertNotNull(message.getContentParts());
+        assertTrue(message.getContentParts().isEmpty());
+    }
 }
diff --git a/dd-trace-api/src/test/java/datadog/trace/api/interceptor/AbstractTraceInterceptorTest.java b/dd-trace-api/src/test/java/datadog/trace/api/interceptor/AbstractTraceInterceptorTest.java
index c3bdf503108..c5c93a3502f 100644
--- a/dd-trace-api/src/test/java/datadog/trace/api/interceptor/AbstractTraceInterceptorTest.java
+++ b/dd-trace-api/src/test/java/datadog/trace/api/interceptor/AbstractTraceInterceptorTest.java
@@ -7,18 +7,16 @@
 
 class AbstractTraceInterceptorTest {
 
-  @Test
-  void priorityIndexIsTakenFromEnum() {
-    AbstractTraceInterceptor.Priority priority = AbstractTraceInterceptor.Priority.values()[0];
-    AbstractTraceInterceptor interceptor =
-        new AbstractTraceInterceptor(priority) {
-          @Override
-          public Collection<? extends MutableSpan> onTraceComplete(
-              Collection<? extends MutableSpan> trace) {
-            return null;
-          }
+    @Test
+    void priorityIndexIsTakenFromEnum() {
+        AbstractTraceInterceptor.Priority priority = AbstractTraceInterceptor.Priority.values()[0];
+        AbstractTraceInterceptor interceptor = new AbstractTraceInterceptor(priority) {
+            @Override
+            public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
+                return null;
+            }
         };
 
-    assertEquals(priority.getIdx(), interceptor.priority());
-  }
+        assertEquals(priority.getIdx(), interceptor.priority());
+    }
 }
diff --git a/dd-trace-api/src/test/java/datadog/trace/api/internal/util/HexStringUtilsTest.java b/dd-trace-api/src/test/java/datadog/trace/api/internal/util/HexStringUtilsTest.java
index 14eb065607d..a36fcd461fe 100644
--- a/dd-trace-api/src/test/java/datadog/trace/api/internal/util/HexStringUtilsTest.java
+++ b/dd-trace-api/src/test/java/datadog/trace/api/internal/util/HexStringUtilsTest.java
@@ -7,24 +7,22 @@
 
 class HexStringUtilsTest {
 
-  @TableTest({
-    "scenario | highOrderBits       | lowOrderBits        | size                ",
-    "zero     | 0                   | 0                   | {10, 16, 20, 32, 40}",
-    "one-two  | 1                   | 2                   | {10, 16, 20, 32, 40}",
-    "large    | 6536977903480360123 | 3270264562721133536 | {10, 16, 20, 32, 40}"
-  })
-  @ParameterizedTest(name = "test hexadecimal String representations high={0} low={1} size={2}")
-  void testHexadecimalStringRepresentations(long highOrderBits, long lowOrderBits, int size) {
-    int highOrderSize = Math.min(16, Math.max(0, size - 16));
-    int lowOrderSize = Math.min(16, size);
+    @TableTest({
+      "scenario | highOrderBits       | lowOrderBits        | size                ",
+      "zero     | 0                   | 0                   | {10, 16, 20, 32, 40}",
+      "one-two  | 1                   | 2                   | {10, 16, 20, 32, 40}",
+      "large    | 6536977903480360123 | 3270264562721133536 | {10, 16, 20, 32, 40}"
+    })
+    @ParameterizedTest(name = "test hexadecimal String representations high={0} low={1} size={2}")
+    void testHexadecimalStringRepresentations(long highOrderBits, long lowOrderBits, int size) {
+        int highOrderSize = Math.min(16, Math.max(0, size - 16));
+        int lowOrderSize = Math.min(16, size);
 
-    String highOrder =
-        highOrderSize == 0 ? "" : LongStringUtils.toHexStringPadded(highOrderBits, highOrderSize);
-    String lowOrder = LongStringUtils.toHexStringPadded(lowOrderBits, lowOrderSize);
-    String lowOrderOnly = LongStringUtils.toHexStringPadded(lowOrderBits, size);
+        String highOrder = highOrderSize == 0 ? "" : LongStringUtils.toHexStringPadded(highOrderBits, highOrderSize);
+        String lowOrder = LongStringUtils.toHexStringPadded(lowOrderBits, lowOrderSize);
+        String lowOrderOnly = LongStringUtils.toHexStringPadded(lowOrderBits, size);
 
-    assertEquals(
-        highOrder + lowOrder, LongStringUtils.toHexStringPadded(highOrderBits, lowOrderBits, size));
-    assertEquals(lowOrderOnly, LongStringUtils.toHexStringPadded(0L, lowOrderBits, size));
-  }
+        assertEquals(highOrder + lowOrder, LongStringUtils.toHexStringPadded(highOrderBits, lowOrderBits, size));
+        assertEquals(lowOrderOnly, LongStringUtils.toHexStringPadded(0L, lowOrderBits, size));
+    }
 }
diff --git a/dd-trace-api/src/test/java/datadog/trace/api/llmobs/LLMObsFeedbackTest.java b/dd-trace-api/src/test/java/datadog/trace/api/llmobs/LLMObsFeedbackTest.java
index b55cf7abd5f..96945691d37 100644
--- a/dd-trace-api/src/test/java/datadog/trace/api/llmobs/LLMObsFeedbackTest.java
+++ b/dd-trace-api/src/test/java/datadog/trace/api/llmobs/LLMObsFeedbackTest.java
@@ -24,487 +24,465 @@
 
 class LLMObsFeedbackTest {
 
-  private static Object originalFeedbackProcessor;
-
-  @BeforeAll
-  static void setupSpec() throws Exception {
-    originalFeedbackProcessor = getStaticField("FEEDBACK_PROCESSOR");
-  }
-
-  @AfterAll
-  static void cleanupSpec() throws Exception {
-    setStaticField("FEEDBACK_PROCESSOR", originalFeedbackProcessor);
-  }
-
-  @AfterEach
-  void cleanup() throws Exception {
-    setStaticField("FEEDBACK_PROCESSOR", NoOpLLMObsFeedbackProcessor.INSTANCE);
-  }
-
-  private static LLMObs.Feedback.Builder validBuilder() {
-    return LLMObs.Feedback.builder()
-        .spanId("123")
-        .label("thumbs")
-        .booleanValue(true)
-        .submitter("user-123", "end_user");
-  }
-
-  /**
-   * Asserts that a builder produces an invalid feedback, without ever throwing. Validation is
-   * deferred to {@link LLMObs#submitFeedback} so that instrumented code stays safe when LLM
-   * Observability is disabled or the agent is not attached.
-   *
-   * @return the validation error, for further assertions on its message
-   */
-  private static LLMObs.Feedback.ValidationError assertRejected(
-      String expectedCode, LLMObs.Feedback.Builder builder) {
-    LLMObs.Feedback feedback = assertDoesNotThrow(builder::build);
-    LLMObs.Feedback.ValidationError error = feedback.validate();
-    assertNotNull(error, "expected the feedback to be rejected with " + expectedCode);
-    assertEquals(expectedCode, error.getCode(), error.getMessage());
-    return error;
-  }
-
-  // --- deferred validation ---
-
-  @Test
-  void testAValidFeedbackHasNoValidationError() {
-    assertNull(validBuilder().build().validate());
-  }
-
-  @Test
-  void testTheFirstProblemWinsOverLaterOnes() {
-    // The empty span id is reported even though the label and the value are missing too.
-    assertRejected("invalid_span_id", LLMObs.Feedback.builder().spanId("").label("thumbs.up"));
-  }
-
-  // --- targets ---
-
-  @Test
-  void testMissingTargetIsRejected() {
-    LLMObs.Feedback.ValidationError error =
-        assertRejected(
-            "invalid_target_count",
-            LLMObs.Feedback.builder()
+    private static Object originalFeedbackProcessor;
+
+    @BeforeAll
+    static void setupSpec() throws Exception {
+        originalFeedbackProcessor = getStaticField("FEEDBACK_PROCESSOR");
+    }
+
+    @AfterAll
+    static void cleanupSpec() throws Exception {
+        setStaticField("FEEDBACK_PROCESSOR", originalFeedbackProcessor);
+    }
+
+    @AfterEach
+    void cleanup() throws Exception {
+        setStaticField("FEEDBACK_PROCESSOR", NoOpLLMObsFeedbackProcessor.INSTANCE);
+    }
+
+    private static LLMObs.Feedback.Builder validBuilder() {
+        return LLMObs.Feedback.builder()
+                .spanId("123")
+                .label("thumbs")
+                .booleanValue(true)
+                .submitter("user-123", "end_user");
+    }
+
+    /**
+     * Asserts that a builder produces an invalid feedback, without ever throwing. Validation is
+     * deferred to {@link LLMObs#submitFeedback} so that instrumented code stays safe when LLM
+     * Observability is disabled or the agent is not attached.
+     *
+     * @return the validation error, for further assertions on its message
+     */
+    private static LLMObs.Feedback.ValidationError assertRejected(
+            String expectedCode, LLMObs.Feedback.Builder builder) {
+        LLMObs.Feedback feedback = assertDoesNotThrow(builder::build);
+        LLMObs.Feedback.ValidationError error = feedback.validate();
+        assertNotNull(error, "expected the feedback to be rejected with " + expectedCode);
+        assertEquals(expectedCode, error.getCode(), error.getMessage());
+        return error;
+    }
+
+    // --- deferred validation ---
+
+    @Test
+    void testAValidFeedbackHasNoValidationError() {
+        assertNull(validBuilder().build().validate());
+    }
+
+    @Test
+    void testTheFirstProblemWinsOverLaterOnes() {
+        // The empty span id is reported even though the label and the value are missing too.
+        assertRejected("invalid_span_id", LLMObs.Feedback.builder().spanId("").label("thumbs.up"));
+    }
+
+    // --- targets ---
+
+    @Test
+    void testMissingTargetIsRejected() {
+        LLMObs.Feedback.ValidationError error = assertRejected(
+                "invalid_target_count",
+                LLMObs.Feedback.builder().label("thumbs").booleanValue(true).submitter("user-123", null));
+        assertTrue(error.getMessage().contains("feedbackJoinKey"), error.getMessage());
+    }
+
+    @Test
+    void testEachTargetTypeIsCarriedWithItsWireKey() {
+        LLMObs.Feedback bySpanId = validBuilder().build();
+        assertEquals(LLMObs.Feedback.TargetType.SPAN_ID, bySpanId.getTargetType());
+        assertEquals("span_id", bySpanId.getTargetType().getWireKey());
+        assertEquals("123", bySpanId.getTargetValue());
+
+        LLMObs.Feedback byTraceId = LLMObs.Feedback.builder()
+                .traceId("abc")
+                .label("thumbs")
+                .booleanValue(true)
+                .submitter("user-123", null)
+                .build();
+        assertEquals(LLMObs.Feedback.TargetType.TRACE_ID, byTraceId.getTargetType());
+        assertEquals("trace_id", byTraceId.getTargetType().getWireKey());
+        assertEquals("abc", byTraceId.getTargetValue());
+
+        LLMObs.Feedback bySessionId = LLMObs.Feedback.builder()
+                .sessionId("session-2")
+                .label("thumbs")
+                .booleanValue(true)
+                .submitter("user-123", null)
+                .build();
+        assertEquals(LLMObs.Feedback.TargetType.SESSION_ID, bySessionId.getTargetType());
+        assertEquals("session_id", bySessionId.getTargetType().getWireKey());
+        assertEquals("session-2", bySessionId.getTargetValue());
+
+        LLMObs.Feedback byJoinKey = LLMObs.Feedback.builder()
+                .feedbackJoinKey("incident-123")
+                .label("user_comment")
+                .textValue("missed the customer impact")
+                .submitter("user-123", null)
+                .build();
+        assertEquals(LLMObs.Feedback.TargetType.FEEDBACK_JOIN_KEY, byJoinKey.getTargetType());
+        assertEquals("feedback_join_key", byJoinKey.getTargetType().getWireKey());
+        assertEquals("incident-123", byJoinKey.getTargetValue());
+    }
+
+    @Test
+    void testSpanTargetsItsSpanId() {
+        LLMObsSpan span = mock(LLMObsSpan.class);
+        when(span.getSpanId()).thenReturn(4242L);
+
+        LLMObs.Feedback feedback = LLMObs.Feedback.builder()
+                .span(span)
                 .label("thumbs")
                 .booleanValue(true)
-                .submitter("user-123", null));
-    assertTrue(error.getMessage().contains("feedbackJoinKey"), error.getMessage());
-  }
-
-  @Test
-  void testEachTargetTypeIsCarriedWithItsWireKey() {
-    LLMObs.Feedback bySpanId = validBuilder().build();
-    assertEquals(LLMObs.Feedback.TargetType.SPAN_ID, bySpanId.getTargetType());
-    assertEquals("span_id", bySpanId.getTargetType().getWireKey());
-    assertEquals("123", bySpanId.getTargetValue());
-
-    LLMObs.Feedback byTraceId =
-        LLMObs.Feedback.builder()
-            .traceId("abc")
-            .label("thumbs")
-            .booleanValue(true)
-            .submitter("user-123", null)
-            .build();
-    assertEquals(LLMObs.Feedback.TargetType.TRACE_ID, byTraceId.getTargetType());
-    assertEquals("trace_id", byTraceId.getTargetType().getWireKey());
-    assertEquals("abc", byTraceId.getTargetValue());
-
-    LLMObs.Feedback bySessionId =
-        LLMObs.Feedback.builder()
-            .sessionId("session-2")
-            .label("thumbs")
-            .booleanValue(true)
-            .submitter("user-123", null)
-            .build();
-    assertEquals(LLMObs.Feedback.TargetType.SESSION_ID, bySessionId.getTargetType());
-    assertEquals("session_id", bySessionId.getTargetType().getWireKey());
-    assertEquals("session-2", bySessionId.getTargetValue());
-
-    LLMObs.Feedback byJoinKey =
-        LLMObs.Feedback.builder()
-            .feedbackJoinKey("incident-123")
-            .label("user_comment")
-            .textValue("missed the customer impact")
-            .submitter("user-123", null)
-            .build();
-    assertEquals(LLMObs.Feedback.TargetType.FEEDBACK_JOIN_KEY, byJoinKey.getTargetType());
-    assertEquals("feedback_join_key", byJoinKey.getTargetType().getWireKey());
-    assertEquals("incident-123", byJoinKey.getTargetValue());
-  }
-
-  @Test
-  void testSpanTargetsItsSpanId() {
-    LLMObsSpan span = mock(LLMObsSpan.class);
-    when(span.getSpanId()).thenReturn(4242L);
-
-    LLMObs.Feedback feedback =
-        LLMObs.Feedback.builder()
-            .span(span)
-            .label("thumbs")
-            .booleanValue(true)
-            .submitter("user-123", null)
-            .build();
-
-    assertEquals(LLMObs.Feedback.TargetType.SPAN_ID, feedback.getTargetType());
-    assertEquals("4242", feedback.getTargetValue());
-  }
-
-  @Test
-  void testNullSpanIsRejected() {
-    assertRejected("invalid_span", LLMObs.Feedback.builder().span((LLMObsSpan) null));
-  }
-
-  @Test
-  void testTwoDifferentTargetsAreRejected() {
-    LLMObs.Feedback.ValidationError error =
+                .submitter("user-123", null)
+                .build();
+
+        assertEquals(LLMObs.Feedback.TargetType.SPAN_ID, feedback.getTargetType());
+        assertEquals("4242", feedback.getTargetValue());
+    }
+
+    @Test
+    void testNullSpanIsRejected() {
+        assertRejected("invalid_span", LLMObs.Feedback.builder().span((LLMObsSpan) null));
+    }
+
+    @Test
+    void testTwoDifferentTargetsAreRejected() {
+        LLMObs.Feedback.ValidationError error = assertRejected(
+                "invalid_target_count", LLMObs.Feedback.builder().spanId("123").sessionId("session-2"));
+        assertTrue(error.getMessage().contains("span_id"), error.getMessage());
+    }
+
+    @Test
+    void testSameTargetSetTwiceIsRejected() {
         assertRejected(
-            "invalid_target_count", LLMObs.Feedback.builder().spanId("123").sessionId("session-2"));
-    assertTrue(error.getMessage().contains("span_id"), error.getMessage());
-  }
-
-  @Test
-  void testSameTargetSetTwiceIsRejected() {
-    assertRejected("invalid_target_count", LLMObs.Feedback.builder().spanId("123").spanId("456"));
-  }
-
-  @Test
-  void testEmptyAndNullTargetValuesAreRejected() {
-    assertRejected("invalid_span_id", LLMObs.Feedback.builder().spanId(""));
-    assertRejected("invalid_span_id", LLMObs.Feedback.builder().spanId(null));
-    assertRejected("invalid_trace_id", LLMObs.Feedback.builder().traceId(""));
-    assertRejected("invalid_session_id", LLMObs.Feedback.builder().sessionId(""));
-    assertRejected("invalid_feedback_join_key", LLMObs.Feedback.builder().feedbackJoinKey(""));
-  }
-
-  // --- label ---
-
-  @Test
-  void testMissingAndEmptyLabelsAreRejected() {
-    assertRejected(
-        "invalid_metric_label",
-        LLMObs.Feedback.builder().spanId("123").booleanValue(true).submitter("user-123", null));
-
-    assertRejected(
-        "invalid_metric_label",
-        LLMObs.Feedback.builder()
-            .spanId("123")
-            .label("")
-            .booleanValue(true)
-            .submitter("user-123", null));
-  }
-
-  @Test
-  void testDottedLabelIsRejected() {
-    LLMObs.Feedback.ValidationError error =
-        assertRejected("invalid_label_value", validBuilder().label("thumbs.up"));
-    assertEquals("label value must not contain a '.'", error.getMessage());
-  }
-
-  // --- values ---
-
-  @Test
-  void testMissingValueIsRejected() {
-    LLMObs.Feedback.ValidationError error =
+                "invalid_target_count", LLMObs.Feedback.builder().spanId("123").spanId("456"));
+    }
+
+    @Test
+    void testEmptyAndNullTargetValuesAreRejected() {
+        assertRejected("invalid_span_id", LLMObs.Feedback.builder().spanId(""));
+        assertRejected("invalid_span_id", LLMObs.Feedback.builder().spanId(null));
+        assertRejected("invalid_trace_id", LLMObs.Feedback.builder().traceId(""));
+        assertRejected("invalid_session_id", LLMObs.Feedback.builder().sessionId(""));
+        assertRejected("invalid_feedback_join_key", LLMObs.Feedback.builder().feedbackJoinKey(""));
+    }
+
+    // --- label ---
+
+    @Test
+    void testMissingAndEmptyLabelsAreRejected() {
         assertRejected(
-            "invalid_metric_type",
-            LLMObs.Feedback.builder().spanId("123").label("thumbs").submitter("user-123", null));
-    assertTrue(error.getMessage().contains("booleanValue"), error.getMessage());
-  }
-
-  @Test
-  void testEachMetricTypeCarriesItsValue() {
-    LLMObs.Feedback categorical =
-        LLMObs.Feedback.builder()
-            .spanId("123")
-            .label("satisfaction")
-            .categoricalValue("satisfied")
-            .submitter("user-123", null)
-            .build();
-    assertEquals(LLMObs.Feedback.MetricType.CATEGORICAL, categorical.getMetricType());
-    assertEquals("categorical", categorical.getMetricType().toString());
-    assertEquals("satisfied", categorical.getValue());
-
-    LLMObs.Feedback score =
-        LLMObs.Feedback.builder()
-            .spanId("123")
-            .label("rating")
-            .scoreValue(0.75)
-            .submitter("user-123", null)
-            .build();
-    assertEquals(LLMObs.Feedback.MetricType.SCORE, score.getMetricType());
-    assertEquals("score", score.getMetricType().toString());
-    assertEquals(0.75, score.getValue());
-
-    LLMObs.Feedback bool = validBuilder().build();
-    assertEquals(LLMObs.Feedback.MetricType.BOOLEAN, bool.getMetricType());
-    assertEquals("boolean", bool.getMetricType().toString());
-    assertEquals(true, bool.getValue());
-
-    Map<String, Object> details = Collections.singletonMap("missing", "customer impact");
-    LLMObs.Feedback json =
-        LLMObs.Feedback.builder()
-            .spanId("123")
-            .label("details")
-            .jsonValue(details)
-            .submitter("user-123", null)
-            .build();
-    assertEquals(LLMObs.Feedback.MetricType.JSON, json.getMetricType());
-    assertEquals("json", json.getMetricType().toString());
-    assertEquals(details, json.getValue());
-
-    LLMObs.Feedback text =
-        LLMObs.Feedback.builder()
-            .spanId("123")
-            .label("user_comment")
-            .textValue("missed the customer impact")
-            .submitter("user-123", null)
-            .build();
-    assertEquals(LLMObs.Feedback.MetricType.TEXT, text.getMetricType());
-    assertEquals("text", text.getMetricType().toString());
-    assertEquals("missed the customer impact", text.getValue());
-  }
-
-  @Test
-  void testTwoValuesAreRejected() {
-    LLMObs.Feedback.ValidationError error =
+                "invalid_metric_label",
+                LLMObs.Feedback.builder().spanId("123").booleanValue(true).submitter("user-123", null));
+
         assertRejected(
-            "invalid_metric_type",
-            LLMObs.Feedback.builder().booleanValue(true).textValue("also this"));
-    assertTrue(error.getMessage().contains("boolean"), error.getMessage());
-  }
-
-  @Test
-  void testSameValueKindSetTwiceIsRejected() {
-    assertRejected(
-        "invalid_metric_type", LLMObs.Feedback.builder().scoreValue(0.1).scoreValue(0.2));
-  }
-
-  @Test
-  void testNonFiniteScoresAreRejected() {
-    assertRejected("invalid_metric_value", LLMObs.Feedback.builder().scoreValue(Double.NaN));
-    assertRejected(
-        "invalid_metric_value", LLMObs.Feedback.builder().scoreValue(Double.POSITIVE_INFINITY));
-    assertRejected(
-        "invalid_metric_value", LLMObs.Feedback.builder().scoreValue(Double.NEGATIVE_INFINITY));
-    LLMObs.Feedback largest =
-        LLMObs.Feedback.builder()
-            .spanId("123")
-            .label("thumbs")
-            .scoreValue(Double.MAX_VALUE)
-            .submitter("user-123", null)
-            .build();
-    assertNull(largest.validate());
-    assertEquals(Double.MAX_VALUE, largest.getValue());
-  }
-
-  @Test
-  void testNullValuesAreRejected() {
-    assertRejected("invalid_metric_value", LLMObs.Feedback.builder().categoricalValue(null));
-    assertRejected("invalid_metric_value", LLMObs.Feedback.builder().textValue(null));
-    assertRejected("invalid_metric_value", LLMObs.Feedback.builder().jsonValue(null));
-  }
-
-  // --- submitter ---
-
-  @Test
-  void testMissingSubmitterIsRejected() {
-    LLMObs.Feedback.ValidationError error =
+                "invalid_metric_label",
+                LLMObs.Feedback.builder()
+                        .spanId("123")
+                        .label("")
+                        .booleanValue(true)
+                        .submitter("user-123", null));
+    }
+
+    @Test
+    void testDottedLabelIsRejected() {
+        LLMObs.Feedback.ValidationError error =
+                assertRejected("invalid_label_value", validBuilder().label("thumbs.up"));
+        assertEquals("label value must not contain a '.'", error.getMessage());
+    }
+
+    // --- values ---
+
+    @Test
+    void testMissingValueIsRejected() {
+        LLMObs.Feedback.ValidationError error = assertRejected(
+                "invalid_metric_type",
+                LLMObs.Feedback.builder().spanId("123").label("thumbs").submitter("user-123", null));
+        assertTrue(error.getMessage().contains("booleanValue"), error.getMessage());
+    }
+
+    @Test
+    void testEachMetricTypeCarriesItsValue() {
+        LLMObs.Feedback categorical = LLMObs.Feedback.builder()
+                .spanId("123")
+                .label("satisfaction")
+                .categoricalValue("satisfied")
+                .submitter("user-123", null)
+                .build();
+        assertEquals(LLMObs.Feedback.MetricType.CATEGORICAL, categorical.getMetricType());
+        assertEquals("categorical", categorical.getMetricType().toString());
+        assertEquals("satisfied", categorical.getValue());
+
+        LLMObs.Feedback score = LLMObs.Feedback.builder()
+                .spanId("123")
+                .label("rating")
+                .scoreValue(0.75)
+                .submitter("user-123", null)
+                .build();
+        assertEquals(LLMObs.Feedback.MetricType.SCORE, score.getMetricType());
+        assertEquals("score", score.getMetricType().toString());
+        assertEquals(0.75, score.getValue());
+
+        LLMObs.Feedback bool = validBuilder().build();
+        assertEquals(LLMObs.Feedback.MetricType.BOOLEAN, bool.getMetricType());
+        assertEquals("boolean", bool.getMetricType().toString());
+        assertEquals(true, bool.getValue());
+
+        Map<String, Object> details = Collections.singletonMap("missing", "customer impact");
+        LLMObs.Feedback json = LLMObs.Feedback.builder()
+                .spanId("123")
+                .label("details")
+                .jsonValue(details)
+                .submitter("user-123", null)
+                .build();
+        assertEquals(LLMObs.Feedback.MetricType.JSON, json.getMetricType());
+        assertEquals("json", json.getMetricType().toString());
+        assertEquals(details, json.getValue());
+
+        LLMObs.Feedback text = LLMObs.Feedback.builder()
+                .spanId("123")
+                .label("user_comment")
+                .textValue("missed the customer impact")
+                .submitter("user-123", null)
+                .build();
+        assertEquals(LLMObs.Feedback.MetricType.TEXT, text.getMetricType());
+        assertEquals("text", text.getMetricType().toString());
+        assertEquals("missed the customer impact", text.getValue());
+    }
+
+    @Test
+    void testTwoValuesAreRejected() {
+        LLMObs.Feedback.ValidationError error = assertRejected(
+                "invalid_metric_type",
+                LLMObs.Feedback.builder().booleanValue(true).textValue("also this"));
+        assertTrue(error.getMessage().contains("boolean"), error.getMessage());
+    }
+
+    @Test
+    void testSameValueKindSetTwiceIsRejected() {
         assertRejected(
-            "invalid_submitter",
-            LLMObs.Feedback.builder().spanId("123").label("thumbs").booleanValue(true));
-    assertTrue(error.getMessage().contains("submitter"), error.getMessage());
-  }
-
-  @Test
-  void testSubmitterIdIsRequired() {
-    assertRejected("invalid_submitter", validBuilder().submitter("", "end_user"));
-    assertRejected("invalid_submitter", validBuilder().submitter(null, "end_user"));
-    assertRejected(
-        "invalid_submitter", validBuilder().submitter(new LLMObs.Feedback.Submitter("", null)));
-  }
-
-  @Test
-  void testSubmitterTypeIsOptional() {
-    LLMObs.Feedback withType = validBuilder().build();
-    assertEquals("user-123", withType.getSubmitter().getId());
-    assertEquals("end_user", withType.getSubmitter().getType());
-
-    LLMObs.Feedback withoutType =
-        LLMObs.Feedback.builder()
-            .spanId("123")
-            .label("thumbs")
-            .booleanValue(true)
-            .submitter("user-123", null)
-            .build();
-    assertEquals("user-123", withoutType.getSubmitter().getId());
-    assertNull(withoutType.getSubmitter().getType());
-  }
-
-  @Test
-  void testSubmitterCanBeSuppliedAsAnInstance() {
-    LLMObs.Feedback.Submitter submitter = new LLMObs.Feedback.Submitter("user-123", "end_user");
-
-    LLMObs.Feedback feedback =
-        LLMObs.Feedback.builder()
-            .spanId("123")
-            .label("thumbs")
-            .booleanValue(true)
-            .submitter(submitter)
-            .build();
-
-    assertEquals("user-123", feedback.getSubmitter().getId());
-    assertEquals("end_user", feedback.getSubmitter().getType());
-  }
-
-  // --- optional fields ---
-
-  @Test
-  void testAssessmentAndReasoningDefaultToAbsent() {
-    LLMObs.Feedback feedback = validBuilder().build();
-
-    assertNull(feedback.getAssessment());
-    assertNull(feedback.getReasoning());
-    assertNull(feedback.getMlApp());
-    assertNull(feedback.getTags());
-  }
-
-  @Test
-  void testAssessmentAndReasoningAreCarried() {
-    LLMObs.Feedback feedback =
-        validBuilder()
-            .assessment(LLMObs.Feedback.Assessment.FAIL)
-            .reasoning("missed the customer impact")
-            .mlApp("incident-agent")
-            .build();
-
-    assertEquals(LLMObs.Feedback.Assessment.FAIL, feedback.getAssessment());
-    assertEquals("fail", feedback.getAssessment().toString());
-    assertEquals("missed the customer impact", feedback.getReasoning());
-    assertEquals("incident-agent", feedback.getMlApp());
-    assertEquals("pass", LLMObs.Feedback.Assessment.PASS.toString());
-  }
-
-  // --- timestamp ---
-
-  @Test
-  void testTimestampDefaultsToNow() {
-    long before = System.currentTimeMillis();
-    LLMObs.Feedback feedback = validBuilder().build();
-    long after = System.currentTimeMillis();
-
-    assertTrue(
-        feedback.getTimestampMs() >= before && feedback.getTimestampMs() <= after,
-        "expected " + feedback.getTimestampMs() + " within [" + before + ", " + after + "]");
-  }
-
-  @Test
-  void testExplicitTimestampIsPreserved() {
-    assertEquals(1234L, validBuilder().timestampMs(1234L).build().getTimestampMs());
-  }
-
-  @Test
-  void testNegativeTimestampIsRejected() {
-    assertRejected("invalid_timestamp", validBuilder().timestampMs(-1L));
-  }
-
-  @Test
-  void testBuilderIsReusableAndDoesNotFreezeTheDefaultTimestamp() throws Exception {
-    LLMObs.Feedback.Builder builder = validBuilder();
-
-    LLMObs.Feedback first = builder.build();
-    Thread.sleep(2);
-    LLMObs.Feedback second = builder.build();
-
-    assertNotEquals(first.getTimestampMs(), second.getTimestampMs());
-  }
-
-  // --- tags ---
-
-  @Test
-  void testTagsAreCopiedAndExposedAsUnmodifiable() {
-    Map<String, Object> source = new HashMap<>();
-    source.put("source", "web-ui");
-
-    LLMObs.Feedback feedback = validBuilder().tags(source).build();
-    source.put("added-after", "should not appear");
-
-    assertEquals(Collections.singletonMap("source", "web-ui"), feedback.getTags());
-    assertThrows(UnsupportedOperationException.class, () -> feedback.getTags().put("nope", "nope"));
-  }
-
-  @Test
-  void testSingleTagsAccumulate() {
-    LLMObs.Feedback feedback = validBuilder().tag("source", "web-ui").tag("revision", "2").build();
-
-    Map<String, Object> expected = new HashMap<>();
-    expected.put("source", "web-ui");
-    expected.put("revision", "2");
-    assertEquals(expected, feedback.getTags());
-  }
-
-  @Test
-  void testTagsAddedAfterBuildDoNotLeakIntoTheBuiltFeedback() {
-    LLMObs.Feedback.Builder builder = validBuilder().tag("source", "web-ui");
-
-    LLMObs.Feedback feedback = builder.build();
-    builder.tag("revision", "2");
-
-    assertEquals(Collections.singletonMap("source", "web-ui"), feedback.getTags());
-  }
-
-  @Test
-  void testNullTagsAreAccepted() {
-    assertNull(validBuilder().tags(null).build().getTags());
-  }
-
-  // --- submission ---
-
-  @Test
-  void testDefaultNoOpFeedbackProcessorBehavior() {
-    assertDoesNotThrow(
-        () -> {
-          LLMObs.submitFeedback(validBuilder().build());
-          LLMObs.submitFeedback(null);
+                "invalid_metric_type", LLMObs.Feedback.builder().scoreValue(0.1).scoreValue(0.2));
+    }
+
+    @Test
+    void testNonFiniteScoresAreRejected() {
+        assertRejected("invalid_metric_value", LLMObs.Feedback.builder().scoreValue(Double.NaN));
+        assertRejected("invalid_metric_value", LLMObs.Feedback.builder().scoreValue(Double.POSITIVE_INFINITY));
+        assertRejected("invalid_metric_value", LLMObs.Feedback.builder().scoreValue(Double.NEGATIVE_INFINITY));
+        LLMObs.Feedback largest = LLMObs.Feedback.builder()
+                .spanId("123")
+                .label("thumbs")
+                .scoreValue(Double.MAX_VALUE)
+                .submitter("user-123", null)
+                .build();
+        assertNull(largest.validate());
+        assertEquals(Double.MAX_VALUE, largest.getValue());
+    }
+
+    @Test
+    void testNullValuesAreRejected() {
+        assertRejected("invalid_metric_value", LLMObs.Feedback.builder().categoricalValue(null));
+        assertRejected("invalid_metric_value", LLMObs.Feedback.builder().textValue(null));
+        assertRejected("invalid_metric_value", LLMObs.Feedback.builder().jsonValue(null));
+    }
+
+    // --- submitter ---
+
+    @Test
+    void testMissingSubmitterIsRejected() {
+        LLMObs.Feedback.ValidationError error = assertRejected(
+                "invalid_submitter",
+                LLMObs.Feedback.builder().spanId("123").label("thumbs").booleanValue(true));
+        assertTrue(error.getMessage().contains("submitter"), error.getMessage());
+    }
+
+    @Test
+    void testSubmitterIdIsRequired() {
+        assertRejected("invalid_submitter", validBuilder().submitter("", "end_user"));
+        assertRejected("invalid_submitter", validBuilder().submitter(null, "end_user"));
+        assertRejected("invalid_submitter", validBuilder().submitter(new LLMObs.Feedback.Submitter("", null)));
+    }
+
+    @Test
+    void testSubmitterTypeIsOptional() {
+        LLMObs.Feedback withType = validBuilder().build();
+        assertEquals("user-123", withType.getSubmitter().getId());
+        assertEquals("end_user", withType.getSubmitter().getType());
+
+        LLMObs.Feedback withoutType = LLMObs.Feedback.builder()
+                .spanId("123")
+                .label("thumbs")
+                .booleanValue(true)
+                .submitter("user-123", null)
+                .build();
+        assertEquals("user-123", withoutType.getSubmitter().getId());
+        assertNull(withoutType.getSubmitter().getType());
+    }
+
+    @Test
+    void testSubmitterCanBeSuppliedAsAnInstance() {
+        LLMObs.Feedback.Submitter submitter = new LLMObs.Feedback.Submitter("user-123", "end_user");
+
+        LLMObs.Feedback feedback = LLMObs.Feedback.builder()
+                .spanId("123")
+                .label("thumbs")
+                .booleanValue(true)
+                .submitter(submitter)
+                .build();
+
+        assertEquals("user-123", feedback.getSubmitter().getId());
+        assertEquals("end_user", feedback.getSubmitter().getType());
+    }
+
+    // --- optional fields ---
+
+    @Test
+    void testAssessmentAndReasoningDefaultToAbsent() {
+        LLMObs.Feedback feedback = validBuilder().build();
+
+        assertNull(feedback.getAssessment());
+        assertNull(feedback.getReasoning());
+        assertNull(feedback.getMlApp());
+        assertNull(feedback.getTags());
+    }
+
+    @Test
+    void testAssessmentAndReasoningAreCarried() {
+        LLMObs.Feedback feedback = validBuilder()
+                .assessment(LLMObs.Feedback.Assessment.FAIL)
+                .reasoning("missed the customer impact")
+                .mlApp("incident-agent")
+                .build();
+
+        assertEquals(LLMObs.Feedback.Assessment.FAIL, feedback.getAssessment());
+        assertEquals("fail", feedback.getAssessment().toString());
+        assertEquals("missed the customer impact", feedback.getReasoning());
+        assertEquals("incident-agent", feedback.getMlApp());
+        assertEquals("pass", LLMObs.Feedback.Assessment.PASS.toString());
+    }
+
+    // --- timestamp ---
+
+    @Test
+    void testTimestampDefaultsToNow() {
+        long before = System.currentTimeMillis();
+        LLMObs.Feedback feedback = validBuilder().build();
+        long after = System.currentTimeMillis();
+
+        assertTrue(
+                feedback.getTimestampMs() >= before && feedback.getTimestampMs() <= after,
+                "expected " + feedback.getTimestampMs() + " within [" + before + ", " + after + "]");
+    }
+
+    @Test
+    void testExplicitTimestampIsPreserved() {
+        assertEquals(1234L, validBuilder().timestampMs(1234L).build().getTimestampMs());
+    }
+
+    @Test
+    void testNegativeTimestampIsRejected() {
+        assertRejected("invalid_timestamp", validBuilder().timestampMs(-1L));
+    }
+
+    @Test
+    void testBuilderIsReusableAndDoesNotFreezeTheDefaultTimestamp() throws Exception {
+        LLMObs.Feedback.Builder builder = validBuilder();
+
+        LLMObs.Feedback first = builder.build();
+        Thread.sleep(2);
+        LLMObs.Feedback second = builder.build();
+
+        assertNotEquals(first.getTimestampMs(), second.getTimestampMs());
+    }
+
+    // --- tags ---
+
+    @Test
+    void testTagsAreCopiedAndExposedAsUnmodifiable() {
+        Map<String, Object> source = new HashMap<>();
+        source.put("source", "web-ui");
+
+        LLMObs.Feedback feedback = validBuilder().tags(source).build();
+        source.put("added-after", "should not appear");
+
+        assertEquals(Collections.singletonMap("source", "web-ui"), feedback.getTags());
+        assertThrows(
+                UnsupportedOperationException.class, () -> feedback.getTags().put("nope", "nope"));
+    }
+
+    @Test
+    void testSingleTagsAccumulate() {
+        LLMObs.Feedback feedback =
+                validBuilder().tag("source", "web-ui").tag("revision", "2").build();
+
+        Map<String, Object> expected = new HashMap<>();
+        expected.put("source", "web-ui");
+        expected.put("revision", "2");
+        assertEquals(expected, feedback.getTags());
+    }
+
+    @Test
+    void testTagsAddedAfterBuildDoNotLeakIntoTheBuiltFeedback() {
+        LLMObs.Feedback.Builder builder = validBuilder().tag("source", "web-ui");
+
+        LLMObs.Feedback feedback = builder.build();
+        builder.tag("revision", "2");
+
+        assertEquals(Collections.singletonMap("source", "web-ui"), feedback.getTags());
+    }
+
+    @Test
+    void testNullTagsAreAccepted() {
+        assertNull(validBuilder().tags(null).build().getTags());
+    }
+
+    // --- submission ---
+
+    @Test
+    void testDefaultNoOpFeedbackProcessorBehavior() {
+        assertDoesNotThrow(() -> {
+            LLMObs.submitFeedback(validBuilder().build());
+            LLMObs.submitFeedback(null);
         });
-  }
-
-  @Test
-  void testAnInvalidFeedbackIsSilentWhenNoProcessorIsInstalled() {
-    // Without the agent, or with LLM Observability disabled, submitting garbage must not break the
-    // host application. The real processor is the one that rejects it.
-    assertDoesNotThrow(
-        () -> LLMObs.submitFeedback(LLMObs.Feedback.builder().label("thumbs.up").build()));
-  }
-
-  @Test
-  void testSubmitFeedbackDelegatesToTheProcessor() throws Exception {
-    LLMObs.LLMObsFeedbackProcessor mockProcessor = mock(LLMObs.LLMObsFeedbackProcessor.class);
-    setStaticField("FEEDBACK_PROCESSOR", mockProcessor);
-
-    LLMObs.Feedback feedback =
-        LLMObs.Feedback.builder()
-            .span(NoOpLLMObsSpan.INSTANCE)
-            .label("thumbs")
-            .booleanValue(false)
-            .submitter("user-123", "end_user")
-            .assessment(LLMObs.Feedback.Assessment.FAIL)
-            .build();
-
-    LLMObs.submitFeedback(feedback);
-
-    verify(mockProcessor).submitFeedback(feedback);
-  }
-
-  private static void setStaticField(String fieldName, Object value) throws Exception {
-    Field field = LLMObs.class.getDeclaredField(fieldName);
-    field.setAccessible(true);
-    field.set(null, value);
-  }
-
-  private static Object getStaticField(String fieldName) throws Exception {
-    Field field = LLMObs.class.getDeclaredField(fieldName);
-    field.setAccessible(true);
-    return field.get(null);
-  }
+    }
+
+    @Test
+    void testAnInvalidFeedbackIsSilentWhenNoProcessorIsInstalled() {
+        // Without the agent, or with LLM Observability disabled, submitting garbage must not break the
+        // host application. The real processor is the one that rejects it.
+        assertDoesNotThrow(() -> LLMObs.submitFeedback(
+                LLMObs.Feedback.builder().label("thumbs.up").build()));
+    }
+
+    @Test
+    void testSubmitFeedbackDelegatesToTheProcessor() throws Exception {
+        LLMObs.LLMObsFeedbackProcessor mockProcessor = mock(LLMObs.LLMObsFeedbackProcessor.class);
+        setStaticField("FEEDBACK_PROCESSOR", mockProcessor);
+
+        LLMObs.Feedback feedback = LLMObs.Feedback.builder()
+                .span(NoOpLLMObsSpan.INSTANCE)
+                .label("thumbs")
+                .booleanValue(false)
+                .submitter("user-123", "end_user")
+                .assessment(LLMObs.Feedback.Assessment.FAIL)
+                .build();
+
+        LLMObs.submitFeedback(feedback);
+
+        verify(mockProcessor).submitFeedback(feedback);
+    }
+
+    private static void setStaticField(String fieldName, Object value) throws Exception {
+        Field field = LLMObs.class.getDeclaredField(fieldName);
+        field.setAccessible(true);
+        field.set(null, value);
+    }
+
+    private static Object getStaticField(String fieldName) throws Exception {
+        Field field = LLMObs.class.getDeclaredField(fieldName);
+        field.setAccessible(true);
+        return field.get(null);
+    }
 }
diff --git a/dd-trace-api/src/test/java/datadog/trace/api/llmobs/LLMObsTest.java b/dd-trace-api/src/test/java/datadog/trace/api/llmobs/LLMObsTest.java
index 286a5e5c071..914b265d319 100644
--- a/dd-trace-api/src/test/java/datadog/trace/api/llmobs/LLMObsTest.java
+++ b/dd-trace-api/src/test/java/datadog/trace/api/llmobs/LLMObsTest.java
@@ -27,501 +27,480 @@
 
 class LLMObsTest {
 
-  private static Object originalSpanFactory;
-  private static Object originalEvalProcessor;
-  private static Object originalSpanProcessor;
-
-  @BeforeAll
-  static void setupSpec() throws Exception {
-    originalSpanFactory = getStaticField("SPAN_FACTORY");
-    originalEvalProcessor = getStaticField("EVAL_PROCESSOR");
-    originalSpanProcessor = getStaticField("SPAN_PROCESSOR");
-  }
-
-  @AfterAll
-  static void cleanupSpec() throws Exception {
-    setStaticField("SPAN_FACTORY", originalSpanFactory);
-    setStaticField("EVAL_PROCESSOR", originalEvalProcessor);
-    setStaticField("SPAN_PROCESSOR", originalSpanProcessor);
-  }
-
-  @AfterEach
-  void cleanup() throws Exception {
-    setStaticField("SPAN_FACTORY", NoOpLLMObsSpanFactory.INSTANCE);
-    setStaticField("EVAL_PROCESSOR", NoOpLLMObsEvalProcessor.INSTANCE);
-    LLMObs.deregisterProcessor();
-  }
-
-  @Test
-  void testRegisterAndDeregisterProcessor() throws Exception {
-    LLMObsSpanData span = mock(LLMObsSpanData.class);
-    LLMObsSpanProcessor processor = registeredSpan -> registeredSpan;
-
-    LLMObs.registerProcessor(processor);
-
-    assertSame(processor, getStaticField("SPAN_PROCESSOR"));
-    assertSame(span, processor.process(span));
-    assertThrows(IllegalStateException.class, () -> LLMObs.registerProcessor(processor));
-
-    LLMObs.deregisterProcessor();
-
-    assertNull(getStaticField("SPAN_PROCESSOR"));
-  }
-
-  @Test
-  void testRegisterNullProcessor() {
-    assertThrows(NullPointerException.class, () -> LLMObs.registerProcessor(null));
-  }
-
-  @Test
-  void testToolCallCreationAndGetters() {
-    Map<String, Object> arguments = new HashMap<>();
-    arguments.put("location", "New York");
-    arguments.put("unit", "celsius");
-
-    LLMObs.ToolCall toolCall =
-        LLMObs.ToolCall.from("get_weather", "function", "tool-123", arguments);
-
-    assertEquals("get_weather", toolCall.getName());
-    assertEquals("function", toolCall.getType());
-    assertEquals("tool-123", toolCall.getToolId());
-    assertEquals(arguments, toolCall.getArguments());
-  }
-
-  @Test
-  void testToolCallWithNullArguments() {
-    LLMObs.ToolCall toolCall = LLMObs.ToolCall.from("get_weather", "function", "tool-123", null);
-
-    assertEquals("get_weather", toolCall.getName());
-    assertEquals("function", toolCall.getType());
-    assertEquals("tool-123", toolCall.getToolId());
-    assertNull(toolCall.getArguments());
-  }
-
-  @Test
-  void testToolDefinitionFromName() {
-    LLMObs.ToolDefinition toolDefinition = LLMObs.ToolDefinition.from("get_weather");
-
-    assertEquals("get_weather", toolDefinition.getName());
-    assertNull(toolDefinition.getDescription());
-    assertNull(toolDefinition.getSchema());
-    assertNull(toolDefinition.getVersion());
-  }
-
-  @Test
-  void testToolDefinitionFromNameAndDescription() {
-    LLMObs.ToolDefinition toolDefinition =
-        LLMObs.ToolDefinition.from("get_weather", "Get the weather by location");
-
-    assertEquals("get_weather", toolDefinition.getName());
-    assertEquals("Get the weather by location", toolDefinition.getDescription());
-    assertNull(toolDefinition.getSchema());
-    assertNull(toolDefinition.getVersion());
-  }
-
-  @Test
-  void testToolDefinitionFromNameDescriptionAndSchema() {
-    Map<String, Object> schema = new HashMap<>();
-    schema.put("type", "object");
-    schema.put(
-        "properties",
-        Collections.singletonMap("location", Collections.singletonMap("type", "string")));
-
-    LLMObs.ToolDefinition toolDefinition =
-        LLMObs.ToolDefinition.from("get_weather", "Get the weather by location", schema);
-
-    assertEquals("get_weather", toolDefinition.getName());
-    assertEquals("Get the weather by location", toolDefinition.getDescription());
-    assertEquals(schema, toolDefinition.getSchema());
-    assertNull(toolDefinition.getVersion());
-  }
-
-  @Test
-  void testToolDefinitionFromAllFields() {
-    Map<String, Object> schema = new HashMap<>();
-    schema.put("type", "object");
-
-    LLMObs.ToolDefinition toolDefinition =
-        LLMObs.ToolDefinition.from("get_weather", "Get the weather by location", schema, "1.2.3");
-
-    assertEquals("get_weather", toolDefinition.getName());
-    assertEquals("Get the weather by location", toolDefinition.getDescription());
-    assertEquals(schema, toolDefinition.getSchema());
-    assertEquals("1.2.3", toolDefinition.getVersion());
-  }
-
-  @Test
-  void testSetToolDefinitionsIsCompatibilityPreservingDefaultMethod() throws Exception {
-    assertTrue(LLMObsSpan.class.getMethod("setToolDefinitions", List.class).isDefault());
-  }
-
-  @Test
-  void testAnnotatePromptIsCompatibilityPreservingDefaultMethod() throws Exception {
-    assertTrue(LLMObsSpan.class.getMethod("annotatePrompt", LLMObs.Prompt.class).isDefault());
-  }
-
-  @Test
-  void testPromptBuilderWithTextTemplate() {
-    Map<String, String> variables = new HashMap<>();
-    variables.put("city", "Paris");
-    Map<String, String> tags = new HashMap<>();
-    tags.put("team", "weather");
-    List<String> contextVariables = Arrays.asList("forecast", "history");
-    List<String> queryVariables = Collections.singletonList("city");
-
-    LLMObs.Prompt prompt =
-        LLMObs.Prompt.builder()
-            .id("weather-prompt")
-            .version("1.0.0")
-            .template("What is the weather in {{city}}?")
-            .variables(variables)
-            .tags(tags)
-            .contextVariables(contextVariables)
-            .queryVariables(queryVariables)
-            .build();
-
-    assertEquals("weather-prompt", prompt.getId());
-    assertEquals("1.0.0", prompt.getVersion());
-    assertEquals("What is the weather in {{city}}?", prompt.getTemplate());
-    assertNull(prompt.getChatTemplate());
-    assertEquals(variables, prompt.getVariables());
-    assertEquals(tags, prompt.getTags());
-    assertEquals(contextVariables, prompt.getContextVariables());
-    assertEquals(queryVariables, prompt.getQueryVariables());
-    assertNotSame(variables, prompt.getVariables());
-    assertNotSame(tags, prompt.getTags());
-    assertNotSame(contextVariables, prompt.getContextVariables());
-    assertNotSame(queryVariables, prompt.getQueryVariables());
-  }
-
-  @Test
-  void testPromptBuilderWithChatTemplate() {
-    List<LLMObs.LLMMessage> chatTemplate =
-        Arrays.asList(
-            LLMObs.LLMMessage.from("system", "You are a weather assistant."),
-            LLMObs.LLMMessage.from("user", "What is the weather in {{city}}?"));
-
-    LLMObs.Prompt prompt = LLMObs.Prompt.builder().template(chatTemplate).build();
-
-    assertNull(prompt.getTemplate());
-    assertEquals(chatTemplate, prompt.getChatTemplate());
-    assertNotSame(chatTemplate, prompt.getChatTemplate());
-  }
-
-  @Test
-  void testAnnotateAgentManifestIsCompatibilityPreservingDefaultMethod() throws Exception {
-    assertTrue(
-        LLMObsSpan.class
-            .getMethod("annotateAgentManifest", LLMObs.AgentManifest.class)
-            .isDefault());
-  }
-
-  @Test
-  void testAgentManifestBuilderWithAllFields() {
-    Map<String, Object> modelSettings = new HashMap<>();
-    modelSettings.put("temperature", 0.7);
-    modelSettings.put("max_tokens", 1024);
-
-    List<LLMObs.AgentTool> tools =
-        Arrays.asList(
-            LLMObs.AgentTool.from(
+    private static Object originalSpanFactory;
+    private static Object originalEvalProcessor;
+    private static Object originalSpanProcessor;
+
+    @BeforeAll
+    static void setupSpec() throws Exception {
+        originalSpanFactory = getStaticField("SPAN_FACTORY");
+        originalEvalProcessor = getStaticField("EVAL_PROCESSOR");
+        originalSpanProcessor = getStaticField("SPAN_PROCESSOR");
+    }
+
+    @AfterAll
+    static void cleanupSpec() throws Exception {
+        setStaticField("SPAN_FACTORY", originalSpanFactory);
+        setStaticField("EVAL_PROCESSOR", originalEvalProcessor);
+        setStaticField("SPAN_PROCESSOR", originalSpanProcessor);
+    }
+
+    @AfterEach
+    void cleanup() throws Exception {
+        setStaticField("SPAN_FACTORY", NoOpLLMObsSpanFactory.INSTANCE);
+        setStaticField("EVAL_PROCESSOR", NoOpLLMObsEvalProcessor.INSTANCE);
+        LLMObs.deregisterProcessor();
+    }
+
+    @Test
+    void testRegisterAndDeregisterProcessor() throws Exception {
+        LLMObsSpanData span = mock(LLMObsSpanData.class);
+        LLMObsSpanProcessor processor = registeredSpan -> registeredSpan;
+
+        LLMObs.registerProcessor(processor);
+
+        assertSame(processor, getStaticField("SPAN_PROCESSOR"));
+        assertSame(span, processor.process(span));
+        assertThrows(IllegalStateException.class, () -> LLMObs.registerProcessor(processor));
+
+        LLMObs.deregisterProcessor();
+
+        assertNull(getStaticField("SPAN_PROCESSOR"));
+    }
+
+    @Test
+    void testRegisterNullProcessor() {
+        assertThrows(NullPointerException.class, () -> LLMObs.registerProcessor(null));
+    }
+
+    @Test
+    void testToolCallCreationAndGetters() {
+        Map<String, Object> arguments = new HashMap<>();
+        arguments.put("location", "New York");
+        arguments.put("unit", "celsius");
+
+        LLMObs.ToolCall toolCall = LLMObs.ToolCall.from("get_weather", "function", "tool-123", arguments);
+
+        assertEquals("get_weather", toolCall.getName());
+        assertEquals("function", toolCall.getType());
+        assertEquals("tool-123", toolCall.getToolId());
+        assertEquals(arguments, toolCall.getArguments());
+    }
+
+    @Test
+    void testToolCallWithNullArguments() {
+        LLMObs.ToolCall toolCall = LLMObs.ToolCall.from("get_weather", "function", "tool-123", null);
+
+        assertEquals("get_weather", toolCall.getName());
+        assertEquals("function", toolCall.getType());
+        assertEquals("tool-123", toolCall.getToolId());
+        assertNull(toolCall.getArguments());
+    }
+
+    @Test
+    void testToolDefinitionFromName() {
+        LLMObs.ToolDefinition toolDefinition = LLMObs.ToolDefinition.from("get_weather");
+
+        assertEquals("get_weather", toolDefinition.getName());
+        assertNull(toolDefinition.getDescription());
+        assertNull(toolDefinition.getSchema());
+        assertNull(toolDefinition.getVersion());
+    }
+
+    @Test
+    void testToolDefinitionFromNameAndDescription() {
+        LLMObs.ToolDefinition toolDefinition = LLMObs.ToolDefinition.from("get_weather", "Get the weather by location");
+
+        assertEquals("get_weather", toolDefinition.getName());
+        assertEquals("Get the weather by location", toolDefinition.getDescription());
+        assertNull(toolDefinition.getSchema());
+        assertNull(toolDefinition.getVersion());
+    }
+
+    @Test
+    void testToolDefinitionFromNameDescriptionAndSchema() {
+        Map<String, Object> schema = new HashMap<>();
+        schema.put("type", "object");
+        schema.put("properties", Collections.singletonMap("location", Collections.singletonMap("type", "string")));
+
+        LLMObs.ToolDefinition toolDefinition =
+                LLMObs.ToolDefinition.from("get_weather", "Get the weather by location", schema);
+
+        assertEquals("get_weather", toolDefinition.getName());
+        assertEquals("Get the weather by location", toolDefinition.getDescription());
+        assertEquals(schema, toolDefinition.getSchema());
+        assertNull(toolDefinition.getVersion());
+    }
+
+    @Test
+    void testToolDefinitionFromAllFields() {
+        Map<String, Object> schema = new HashMap<>();
+        schema.put("type", "object");
+
+        LLMObs.ToolDefinition toolDefinition =
+                LLMObs.ToolDefinition.from("get_weather", "Get the weather by location", schema, "1.2.3");
+
+        assertEquals("get_weather", toolDefinition.getName());
+        assertEquals("Get the weather by location", toolDefinition.getDescription());
+        assertEquals(schema, toolDefinition.getSchema());
+        assertEquals("1.2.3", toolDefinition.getVersion());
+    }
+
+    @Test
+    void testSetToolDefinitionsIsCompatibilityPreservingDefaultMethod() throws Exception {
+        assertTrue(LLMObsSpan.class.getMethod("setToolDefinitions", List.class).isDefault());
+    }
+
+    @Test
+    void testAnnotatePromptIsCompatibilityPreservingDefaultMethod() throws Exception {
+        assertTrue(LLMObsSpan.class
+                .getMethod("annotatePrompt", LLMObs.Prompt.class)
+                .isDefault());
+    }
+
+    @Test
+    void testPromptBuilderWithTextTemplate() {
+        Map<String, String> variables = new HashMap<>();
+        variables.put("city", "Paris");
+        Map<String, String> tags = new HashMap<>();
+        tags.put("team", "weather");
+        List<String> contextVariables = Arrays.asList("forecast", "history");
+        List<String> queryVariables = Collections.singletonList("city");
+
+        LLMObs.Prompt prompt = LLMObs.Prompt.builder()
+                .id("weather-prompt")
+                .version("1.0.0")
+                .template("What is the weather in {{city}}?")
+                .variables(variables)
+                .tags(tags)
+                .contextVariables(contextVariables)
+                .queryVariables(queryVariables)
+                .build();
+
+        assertEquals("weather-prompt", prompt.getId());
+        assertEquals("1.0.0", prompt.getVersion());
+        assertEquals("What is the weather in {{city}}?", prompt.getTemplate());
+        assertNull(prompt.getChatTemplate());
+        assertEquals(variables, prompt.getVariables());
+        assertEquals(tags, prompt.getTags());
+        assertEquals(contextVariables, prompt.getContextVariables());
+        assertEquals(queryVariables, prompt.getQueryVariables());
+        assertNotSame(variables, prompt.getVariables());
+        assertNotSame(tags, prompt.getTags());
+        assertNotSame(contextVariables, prompt.getContextVariables());
+        assertNotSame(queryVariables, prompt.getQueryVariables());
+    }
+
+    @Test
+    void testPromptBuilderWithChatTemplate() {
+        List<LLMObs.LLMMessage> chatTemplate = Arrays.asList(
+                LLMObs.LLMMessage.from("system", "You are a weather assistant."),
+                LLMObs.LLMMessage.from("user", "What is the weather in {{city}}?"));
+
+        LLMObs.Prompt prompt = LLMObs.Prompt.builder().template(chatTemplate).build();
+
+        assertNull(prompt.getTemplate());
+        assertEquals(chatTemplate, prompt.getChatTemplate());
+        assertNotSame(chatTemplate, prompt.getChatTemplate());
+    }
+
+    @Test
+    void testAnnotateAgentManifestIsCompatibilityPreservingDefaultMethod() throws Exception {
+        assertTrue(LLMObsSpan.class
+                .getMethod("annotateAgentManifest", LLMObs.AgentManifest.class)
+                .isDefault());
+    }
+
+    @Test
+    void testAgentManifestBuilderWithAllFields() {
+        Map<String, Object> modelSettings = new HashMap<>();
+        modelSettings.put("temperature", 0.7);
+        modelSettings.put("max_tokens", 1024);
+
+        List<LLMObs.AgentTool> tools = Arrays.asList(LLMObs.AgentTool.from(
                 "get_weather",
                 "Look up the weather",
                 Collections.singletonMap("city", Collections.singletonMap("type", "string"))));
 
-    LLMObs.AgentManifest manifest =
-        LLMObs.AgentManifest.builder()
-            .name("travel_desk")
-            .instructions("Book travel for the user.")
-            .model("gpt-4o")
-            .modelSettings(modelSettings)
-            .tools(tools)
-            .build();
-
-    assertEquals("travel_desk", manifest.getName());
-    assertEquals("Book travel for the user.", manifest.getInstructions());
-    assertEquals("gpt-4o", manifest.getModel());
-    assertEquals(modelSettings, manifest.getModelSettings());
-    assertNotSame(modelSettings, manifest.getModelSettings());
-    assertEquals(1, manifest.getTools().size());
-    assertNotSame(tools, manifest.getTools());
-    assertEquals("get_weather", manifest.getTools().get(0).getName());
-    assertEquals("Look up the weather", manifest.getTools().get(0).getDescription());
-  }
-
-  @Test
-  void testAgentManifestBuilderMinimal() {
-    LLMObs.AgentManifest manifest = LLMObs.AgentManifest.builder().build();
-    assertNull(manifest.getName());
-    assertNull(manifest.getInstructions());
-    assertNull(manifest.getModel());
-    assertNull(manifest.getModelSettings());
-    assertNull(manifest.getTools());
-  }
-
-  @Test
-  void testAgentToolCreation() {
-    LLMObs.AgentTool tool = LLMObs.AgentTool.from("search");
-    assertEquals("search", tool.getName());
-    assertNull(tool.getDescription());
-    assertNull(tool.getParameters());
-
-    Map<String, Object> params = new HashMap<>();
-    params.put("query", Collections.singletonMap("type", "string"));
-    LLMObs.AgentTool fullTool = LLMObs.AgentTool.from("search", "Web search", params);
-    assertEquals("search", fullTool.getName());
-    assertEquals("Web search", fullTool.getDescription());
-    assertEquals(params, fullTool.getParameters());
-    assertNotSame(params, fullTool.getParameters());
-  }
-
-  @Test
-  void testLLMMessageCreationWithToolCalls() {
-    Map<String, Object> args = new HashMap<>();
-    args.put("location", "Paris");
-    LLMObs.ToolCall toolCall = LLMObs.ToolCall.from("get_weather", "function", "tool-123", args);
-    List<LLMObs.ToolCall> toolCalls = Collections.singletonList(toolCall);
-
-    LLMObs.LLMMessage message =
-        LLMObs.LLMMessage.from("assistant", "Let me check the weather", toolCalls);
-
-    assertEquals("assistant", message.getRole());
-    assertEquals("Let me check the weather", message.getContent());
-    assertEquals(toolCalls, message.getToolCalls());
-    assertEquals(1, message.getToolCalls().size());
-    assertEquals("get_weather", message.getToolCalls().get(0).getName());
-    assertEquals("function", message.getToolCalls().get(0).getType());
-    assertEquals("tool-123", message.getToolCalls().get(0).getToolId());
-    assertEquals(args, message.getToolCalls().get(0).getArguments());
-  }
-
-  @Test
-  void testLLMMessageCreationWithoutToolCalls() {
-    LLMObs.LLMMessage message = LLMObs.LLMMessage.from("user", "What's the weather like?");
-
-    assertEquals("user", message.getRole());
-    assertEquals("What's the weather like?", message.getContent());
-    assertNull(message.getToolCalls());
-  }
-
-  @Test
-  void testLLMMessageWithMultipleToolCalls() {
-    Map<String, Object> weatherArgs = new HashMap<>();
-    weatherArgs.put("location", "New York");
-    LLMObs.ToolCall toolCall1 =
-        LLMObs.ToolCall.from("get_weather", "function", "tool-1", weatherArgs);
-
-    Map<String, Object> stockArgs = new HashMap<>();
-    stockArgs.put("symbol", "AAPL");
-    LLMObs.ToolCall toolCall2 =
-        LLMObs.ToolCall.from("get_stock_price", "function", "tool-2", stockArgs);
-
-    List<LLMObs.ToolCall> toolCalls = Arrays.asList(toolCall1, toolCall2);
-
-    LLMObs.LLMMessage message =
-        LLMObs.LLMMessage.from("assistant", "I'll help you with both requests", toolCalls);
-
-    assertEquals("assistant", message.getRole());
-    assertEquals("I'll help you with both requests", message.getContent());
-    assertEquals(toolCalls, message.getToolCalls());
-    assertEquals(2, message.getToolCalls().size());
-    assertEquals("get_weather", message.getToolCalls().get(0).getName());
-    assertEquals("get_stock_price", message.getToolCalls().get(1).getName());
-  }
-
-  @Test
-  void testDefaultNoOpSpanFactoryBehavior() {
-    LLMObsSpan llmSpan = LLMObs.startLLMSpan("test", "gpt-4", "openai", "app", "session");
-    LLMObsSpan agentSpan = LLMObs.startAgentSpan("test", "app", "session");
-    LLMObsSpan toolSpan = LLMObs.startToolSpan("test", "app", "session");
-    LLMObsSpan taskSpan = LLMObs.startTaskSpan("test", "app", "session");
-    LLMObsSpan workflowSpan = LLMObs.startWorkflowSpan("test", "app", "session");
-    LLMObsSpan embeddingSpan =
-        LLMObs.startEmbeddingSpan("test", "app", "openai", "model", "session");
-    LLMObsSpan retrievalSpan = LLMObs.startRetrievalSpan("test", "app", "session");
-
-    assertSame(NoOpLLMObsSpan.INSTANCE, llmSpan);
-    assertSame(NoOpLLMObsSpan.INSTANCE, agentSpan);
-    assertSame(NoOpLLMObsSpan.INSTANCE, toolSpan);
-    assertSame(NoOpLLMObsSpan.INSTANCE, taskSpan);
-    assertSame(NoOpLLMObsSpan.INSTANCE, workflowSpan);
-    assertSame(NoOpLLMObsSpan.INSTANCE, embeddingSpan);
-    assertSame(NoOpLLMObsSpan.INSTANCE, retrievalSpan);
-  }
-
-  @Test
-  void testSpanCreationWithNullOptionalParameters() {
-    LLMObsSpan llmSpan = LLMObs.startLLMSpan("test", "gpt-4", "openai", null, null);
-    LLMObsSpan agentSpan = LLMObs.startAgentSpan("test", null, null);
-    LLMObsSpan toolSpan = LLMObs.startToolSpan("test", null, null);
-    LLMObsSpan taskSpan = LLMObs.startTaskSpan("test", null, null);
-    LLMObsSpan workflowSpan = LLMObs.startWorkflowSpan("test", null, null);
-    LLMObsSpan embeddingSpan = LLMObs.startEmbeddingSpan("test", null, null, null, null);
-    LLMObsSpan retrievalSpan = LLMObs.startRetrievalSpan("test", null, null);
-
-    assertSame(NoOpLLMObsSpan.INSTANCE, llmSpan);
-    assertSame(NoOpLLMObsSpan.INSTANCE, agentSpan);
-    assertSame(NoOpLLMObsSpan.INSTANCE, toolSpan);
-    assertSame(NoOpLLMObsSpan.INSTANCE, taskSpan);
-    assertSame(NoOpLLMObsSpan.INSTANCE, workflowSpan);
-    assertSame(NoOpLLMObsSpan.INSTANCE, embeddingSpan);
-    assertSame(NoOpLLMObsSpan.INSTANCE, retrievalSpan);
-  }
-
-  @Test
-  void testDefaultNoOpEvaluationProcessorBehavior() {
-    assertDoesNotThrow(
-        () -> {
-          Map<String, Object> emptyTags = new HashMap<>();
-          LLMObs.SubmitEvaluation(NoOpLLMObsSpan.INSTANCE, "label", 0.5, emptyTags);
-          LLMObs.SubmitEvaluation(NoOpLLMObsSpan.INSTANCE, "label", 0.5, "app", emptyTags);
-          LLMObs.SubmitEvaluation(NoOpLLMObsSpan.INSTANCE, "label", "value", emptyTags);
-          LLMObs.SubmitEvaluation(NoOpLLMObsSpan.INSTANCE, "label", "value", "app", emptyTags);
+        LLMObs.AgentManifest manifest = LLMObs.AgentManifest.builder()
+                .name("travel_desk")
+                .instructions("Book travel for the user.")
+                .model("gpt-4o")
+                .modelSettings(modelSettings)
+                .tools(tools)
+                .build();
+
+        assertEquals("travel_desk", manifest.getName());
+        assertEquals("Book travel for the user.", manifest.getInstructions());
+        assertEquals("gpt-4o", manifest.getModel());
+        assertEquals(modelSettings, manifest.getModelSettings());
+        assertNotSame(modelSettings, manifest.getModelSettings());
+        assertEquals(1, manifest.getTools().size());
+        assertNotSame(tools, manifest.getTools());
+        assertEquals("get_weather", manifest.getTools().get(0).getName());
+        assertEquals("Look up the weather", manifest.getTools().get(0).getDescription());
+    }
+
+    @Test
+    void testAgentManifestBuilderMinimal() {
+        LLMObs.AgentManifest manifest = LLMObs.AgentManifest.builder().build();
+        assertNull(manifest.getName());
+        assertNull(manifest.getInstructions());
+        assertNull(manifest.getModel());
+        assertNull(manifest.getModelSettings());
+        assertNull(manifest.getTools());
+    }
+
+    @Test
+    void testAgentToolCreation() {
+        LLMObs.AgentTool tool = LLMObs.AgentTool.from("search");
+        assertEquals("search", tool.getName());
+        assertNull(tool.getDescription());
+        assertNull(tool.getParameters());
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("query", Collections.singletonMap("type", "string"));
+        LLMObs.AgentTool fullTool = LLMObs.AgentTool.from("search", "Web search", params);
+        assertEquals("search", fullTool.getName());
+        assertEquals("Web search", fullTool.getDescription());
+        assertEquals(params, fullTool.getParameters());
+        assertNotSame(params, fullTool.getParameters());
+    }
+
+    @Test
+    void testLLMMessageCreationWithToolCalls() {
+        Map<String, Object> args = new HashMap<>();
+        args.put("location", "Paris");
+        LLMObs.ToolCall toolCall = LLMObs.ToolCall.from("get_weather", "function", "tool-123", args);
+        List<LLMObs.ToolCall> toolCalls = Collections.singletonList(toolCall);
+
+        LLMObs.LLMMessage message = LLMObs.LLMMessage.from("assistant", "Let me check the weather", toolCalls);
+
+        assertEquals("assistant", message.getRole());
+        assertEquals("Let me check the weather", message.getContent());
+        assertEquals(toolCalls, message.getToolCalls());
+        assertEquals(1, message.getToolCalls().size());
+        assertEquals("get_weather", message.getToolCalls().get(0).getName());
+        assertEquals("function", message.getToolCalls().get(0).getType());
+        assertEquals("tool-123", message.getToolCalls().get(0).getToolId());
+        assertEquals(args, message.getToolCalls().get(0).getArguments());
+    }
+
+    @Test
+    void testLLMMessageCreationWithoutToolCalls() {
+        LLMObs.LLMMessage message = LLMObs.LLMMessage.from("user", "What's the weather like?");
+
+        assertEquals("user", message.getRole());
+        assertEquals("What's the weather like?", message.getContent());
+        assertNull(message.getToolCalls());
+    }
+
+    @Test
+    void testLLMMessageWithMultipleToolCalls() {
+        Map<String, Object> weatherArgs = new HashMap<>();
+        weatherArgs.put("location", "New York");
+        LLMObs.ToolCall toolCall1 = LLMObs.ToolCall.from("get_weather", "function", "tool-1", weatherArgs);
+
+        Map<String, Object> stockArgs = new HashMap<>();
+        stockArgs.put("symbol", "AAPL");
+        LLMObs.ToolCall toolCall2 = LLMObs.ToolCall.from("get_stock_price", "function", "tool-2", stockArgs);
+
+        List<LLMObs.ToolCall> toolCalls = Arrays.asList(toolCall1, toolCall2);
+
+        LLMObs.LLMMessage message = LLMObs.LLMMessage.from("assistant", "I'll help you with both requests", toolCalls);
+
+        assertEquals("assistant", message.getRole());
+        assertEquals("I'll help you with both requests", message.getContent());
+        assertEquals(toolCalls, message.getToolCalls());
+        assertEquals(2, message.getToolCalls().size());
+        assertEquals("get_weather", message.getToolCalls().get(0).getName());
+        assertEquals("get_stock_price", message.getToolCalls().get(1).getName());
+    }
+
+    @Test
+    void testDefaultNoOpSpanFactoryBehavior() {
+        LLMObsSpan llmSpan = LLMObs.startLLMSpan("test", "gpt-4", "openai", "app", "session");
+        LLMObsSpan agentSpan = LLMObs.startAgentSpan("test", "app", "session");
+        LLMObsSpan toolSpan = LLMObs.startToolSpan("test", "app", "session");
+        LLMObsSpan taskSpan = LLMObs.startTaskSpan("test", "app", "session");
+        LLMObsSpan workflowSpan = LLMObs.startWorkflowSpan("test", "app", "session");
+        LLMObsSpan embeddingSpan = LLMObs.startEmbeddingSpan("test", "app", "openai", "model", "session");
+        LLMObsSpan retrievalSpan = LLMObs.startRetrievalSpan("test", "app", "session");
+
+        assertSame(NoOpLLMObsSpan.INSTANCE, llmSpan);
+        assertSame(NoOpLLMObsSpan.INSTANCE, agentSpan);
+        assertSame(NoOpLLMObsSpan.INSTANCE, toolSpan);
+        assertSame(NoOpLLMObsSpan.INSTANCE, taskSpan);
+        assertSame(NoOpLLMObsSpan.INSTANCE, workflowSpan);
+        assertSame(NoOpLLMObsSpan.INSTANCE, embeddingSpan);
+        assertSame(NoOpLLMObsSpan.INSTANCE, retrievalSpan);
+    }
+
+    @Test
+    void testSpanCreationWithNullOptionalParameters() {
+        LLMObsSpan llmSpan = LLMObs.startLLMSpan("test", "gpt-4", "openai", null, null);
+        LLMObsSpan agentSpan = LLMObs.startAgentSpan("test", null, null);
+        LLMObsSpan toolSpan = LLMObs.startToolSpan("test", null, null);
+        LLMObsSpan taskSpan = LLMObs.startTaskSpan("test", null, null);
+        LLMObsSpan workflowSpan = LLMObs.startWorkflowSpan("test", null, null);
+        LLMObsSpan embeddingSpan = LLMObs.startEmbeddingSpan("test", null, null, null, null);
+        LLMObsSpan retrievalSpan = LLMObs.startRetrievalSpan("test", null, null);
+
+        assertSame(NoOpLLMObsSpan.INSTANCE, llmSpan);
+        assertSame(NoOpLLMObsSpan.INSTANCE, agentSpan);
+        assertSame(NoOpLLMObsSpan.INSTANCE, toolSpan);
+        assertSame(NoOpLLMObsSpan.INSTANCE, taskSpan);
+        assertSame(NoOpLLMObsSpan.INSTANCE, workflowSpan);
+        assertSame(NoOpLLMObsSpan.INSTANCE, embeddingSpan);
+        assertSame(NoOpLLMObsSpan.INSTANCE, retrievalSpan);
+    }
+
+    @Test
+    void testDefaultNoOpEvaluationProcessorBehavior() {
+        assertDoesNotThrow(() -> {
+            Map<String, Object> emptyTags = new HashMap<>();
+            LLMObs.SubmitEvaluation(NoOpLLMObsSpan.INSTANCE, "label", 0.5, emptyTags);
+            LLMObs.SubmitEvaluation(NoOpLLMObsSpan.INSTANCE, "label", 0.5, "app", emptyTags);
+            LLMObs.SubmitEvaluation(NoOpLLMObsSpan.INSTANCE, "label", "value", emptyTags);
+            LLMObs.SubmitEvaluation(NoOpLLMObsSpan.INSTANCE, "label", "value", "app", emptyTags);
         });
-  }
-
-  @Test
-  void testEvaluationSubmissionWithVariousScoreValues() {
-    LLMObsSpan span = NoOpLLMObsSpan.INSTANCE;
-    Map<String, Object> tags = new HashMap<>();
-    tags.put("category", "test");
-    tags.put("version", "1.0");
-
-    assertDoesNotThrow(
-        () -> {
-          LLMObs.SubmitEvaluation(span, "accuracy", 0.0, tags);
-          LLMObs.SubmitEvaluation(span, "precision", 1.0, tags);
-          LLMObs.SubmitEvaluation(span, "recall", 0.85, tags);
-          LLMObs.SubmitEvaluation(span, "f1_score", 0.92, "myapp", tags);
+    }
+
+    @Test
+    void testEvaluationSubmissionWithVariousScoreValues() {
+        LLMObsSpan span = NoOpLLMObsSpan.INSTANCE;
+        Map<String, Object> tags = new HashMap<>();
+        tags.put("category", "test");
+        tags.put("version", "1.0");
+
+        assertDoesNotThrow(() -> {
+            LLMObs.SubmitEvaluation(span, "accuracy", 0.0, tags);
+            LLMObs.SubmitEvaluation(span, "precision", 1.0, tags);
+            LLMObs.SubmitEvaluation(span, "recall", 0.85, tags);
+            LLMObs.SubmitEvaluation(span, "f1_score", 0.92, "myapp", tags);
         });
-  }
-
-  @Test
-  void testEvaluationSubmissionWithCategoricalValues() {
-    LLMObsSpan span = NoOpLLMObsSpan.INSTANCE;
-    Map<String, Object> tags = new HashMap<>();
-    tags.put("evaluator", "human");
-    tags.put("context", "production");
-
-    assertDoesNotThrow(
-        () -> {
-          LLMObs.SubmitEvaluation(span, "quality", "excellent", tags);
-          LLMObs.SubmitEvaluation(span, "relevance", "poor", tags);
-          LLMObs.SubmitEvaluation(span, "toxicity", "safe", "content-app", tags);
+    }
+
+    @Test
+    void testEvaluationSubmissionWithCategoricalValues() {
+        LLMObsSpan span = NoOpLLMObsSpan.INSTANCE;
+        Map<String, Object> tags = new HashMap<>();
+        tags.put("evaluator", "human");
+        tags.put("context", "production");
+
+        assertDoesNotThrow(() -> {
+            LLMObs.SubmitEvaluation(span, "quality", "excellent", tags);
+            LLMObs.SubmitEvaluation(span, "relevance", "poor", tags);
+            LLMObs.SubmitEvaluation(span, "toxicity", "safe", "content-app", tags);
         });
-  }
+    }
 
-  @Test
-  void testEvaluationSubmissionWithEmptyTags() {
-    LLMObsSpan span = NoOpLLMObsSpan.INSTANCE;
-    Map<String, Object> emptyTags = new HashMap<>();
+    @Test
+    void testEvaluationSubmissionWithEmptyTags() {
+        LLMObsSpan span = NoOpLLMObsSpan.INSTANCE;
+        Map<String, Object> emptyTags = new HashMap<>();
 
-    assertDoesNotThrow(
-        () -> {
-          LLMObs.SubmitEvaluation(span, "score", 0.75, emptyTags);
-          LLMObs.SubmitEvaluation(span, "category", "good", emptyTags);
+        assertDoesNotThrow(() -> {
+            LLMObs.SubmitEvaluation(span, "score", 0.75, emptyTags);
+            LLMObs.SubmitEvaluation(span, "category", "good", emptyTags);
         });
-  }
-
-  @Test
-  void testSpanCreationWithCustomFactoryReturnsActualSpans() throws Exception {
-    LLMObs.LLMObsSpanFactory mockFactory = mock(LLMObs.LLMObsSpanFactory.class);
-    LLMObs.LLMObsEvalProcessor mockEvalProcessor = mock(LLMObs.LLMObsEvalProcessor.class);
-    LLMObsSpan mockLLMSpan = mock(LLMObsSpan.class);
-    LLMObsSpan mockAgentSpan = mock(LLMObsSpan.class);
-    LLMObsSpan mockToolSpan = mock(LLMObsSpan.class);
-    LLMObsSpan mockTaskSpan = mock(LLMObsSpan.class);
-    LLMObsSpan mockWorkflowSpan = mock(LLMObsSpan.class);
-    LLMObsSpan mockEmbeddingSpan = mock(LLMObsSpan.class);
-    LLMObsSpan mockRetrievalSpan = mock(LLMObsSpan.class);
-
-    when(mockFactory.startLLMSpan("chat-completion", "gpt-4", "openai", "my-app", "session-1"))
-        .thenReturn(mockLLMSpan);
-    when(mockFactory.startAgentSpan("agent-task", "my-app", "session-1")).thenReturn(mockAgentSpan);
-    when(mockFactory.startToolSpan("weather-tool", "my-app", "session-1")).thenReturn(mockToolSpan);
-    when(mockFactory.startTaskSpan("summarize-task", "my-app", "session-1"))
-        .thenReturn(mockTaskSpan);
-    when(mockFactory.startWorkflowSpan("data-workflow", "my-app", "session-1"))
-        .thenReturn(mockWorkflowSpan);
-    when(mockFactory.startEmbeddingSpan(
-            "text-embed", "my-app", "openai", "text-embedding-ada-002", "session-1"))
-        .thenReturn(mockEmbeddingSpan);
-    when(mockFactory.startRetrievalSpan("document-retrieval", "my-app", "session-1"))
-        .thenReturn(mockRetrievalSpan);
-
-    setStaticField("SPAN_FACTORY", mockFactory);
-    setStaticField("EVAL_PROCESSOR", mockEvalProcessor);
-
-    LLMObsSpan llmSpan =
-        LLMObs.startLLMSpan("chat-completion", "gpt-4", "openai", "my-app", "session-1");
-    LLMObsSpan agentSpan = LLMObs.startAgentSpan("agent-task", "my-app", "session-1");
-    LLMObsSpan toolSpan = LLMObs.startToolSpan("weather-tool", "my-app", "session-1");
-    LLMObsSpan taskSpan = LLMObs.startTaskSpan("summarize-task", "my-app", "session-1");
-    LLMObsSpan workflowSpan = LLMObs.startWorkflowSpan("data-workflow", "my-app", "session-1");
-    LLMObsSpan embeddingSpan =
-        LLMObs.startEmbeddingSpan(
-            "text-embed", "my-app", "openai", "text-embedding-ada-002", "session-1");
-    LLMObsSpan retrievalSpan =
-        LLMObs.startRetrievalSpan("document-retrieval", "my-app", "session-1");
-
-    Map<String, Object> scoreTags = new HashMap<>();
-    scoreTags.put("test", "value");
-    LLMObs.SubmitEvaluation(llmSpan, "accuracy", 0.95, scoreTags);
-
-    Map<String, Object> categoricalTags = new HashMap<>();
-    categoricalTags.put("reviewer", "human");
-    LLMObs.SubmitEvaluation(agentSpan, "quality", "excellent", "eval-app", categoricalTags);
-
-    assertSame(mockLLMSpan, llmSpan);
-    assertSame(mockAgentSpan, agentSpan);
-    assertSame(mockToolSpan, toolSpan);
-    assertSame(mockTaskSpan, taskSpan);
-    assertSame(mockWorkflowSpan, workflowSpan);
-    assertSame(mockEmbeddingSpan, embeddingSpan);
-    assertSame(mockRetrievalSpan, retrievalSpan);
-
-    assertNotSame(NoOpLLMObsSpan.INSTANCE, llmSpan);
-    assertNotSame(NoOpLLMObsSpan.INSTANCE, agentSpan);
-    assertNotSame(NoOpLLMObsSpan.INSTANCE, toolSpan);
-    assertNotSame(NoOpLLMObsSpan.INSTANCE, taskSpan);
-    assertNotSame(NoOpLLMObsSpan.INSTANCE, workflowSpan);
-    assertNotSame(NoOpLLMObsSpan.INSTANCE, embeddingSpan);
-    assertNotSame(NoOpLLMObsSpan.INSTANCE, retrievalSpan);
-
-    verify(mockEvalProcessor).SubmitEvaluation(mockLLMSpan, "accuracy", 0.95, scoreTags);
-    verify(mockEvalProcessor)
-        .SubmitEvaluation(mockAgentSpan, "quality", "excellent", "eval-app", categoricalTags);
-  }
-
-  @Test
-  void testSpanCreationWithNullParametersUsingCustomFactory() throws Exception {
-    LLMObs.LLMObsSpanFactory mockFactory = mock(LLMObs.LLMObsSpanFactory.class);
-    LLMObsSpan mockSpan = mock(LLMObsSpan.class);
-
-    when(mockFactory.startLLMSpan("test-span", "gpt-4", "openai", null, null)).thenReturn(mockSpan);
-    when(mockFactory.startEmbeddingSpan("embed-span", null, null, null, null)).thenReturn(mockSpan);
-
-    setStaticField("SPAN_FACTORY", mockFactory);
-
-    LLMObsSpan llmSpan = LLMObs.startLLMSpan("test-span", "gpt-4", "openai", null, null);
-    LLMObsSpan embeddingSpan = LLMObs.startEmbeddingSpan("embed-span", null, null, null, null);
-
-    assertSame(mockSpan, llmSpan);
-    assertSame(mockSpan, embeddingSpan);
-
-    verify(mockFactory).startLLMSpan("test-span", "gpt-4", "openai", null, null);
-    verify(mockFactory).startEmbeddingSpan("embed-span", null, null, null, null);
-  }
-
-  private static void setStaticField(String fieldName, Object value) throws Exception {
-    Field field = LLMObs.class.getDeclaredField(fieldName);
-    field.setAccessible(true);
-    field.set(null, value);
-  }
-
-  private static Object getStaticField(String fieldName) throws Exception {
-    Field field = LLMObs.class.getDeclaredField(fieldName);
-    field.setAccessible(true);
-    return field.get(null);
-  }
+    }
+
+    @Test
+    void testSpanCreationWithCustomFactoryReturnsActualSpans() throws Exception {
+        LLMObs.LLMObsSpanFactory mockFactory = mock(LLMObs.LLMObsSpanFactory.class);
+        LLMObs.LLMObsEvalProcessor mockEvalProcessor = mock(LLMObs.LLMObsEvalProcessor.class);
+        LLMObsSpan mockLLMSpan = mock(LLMObsSpan.class);
+        LLMObsSpan mockAgentSpan = mock(LLMObsSpan.class);
+        LLMObsSpan mockToolSpan = mock(LLMObsSpan.class);
+        LLMObsSpan mockTaskSpan = mock(LLMObsSpan.class);
+        LLMObsSpan mockWorkflowSpan = mock(LLMObsSpan.class);
+        LLMObsSpan mockEmbeddingSpan = mock(LLMObsSpan.class);
+        LLMObsSpan mockRetrievalSpan = mock(LLMObsSpan.class);
+
+        when(mockFactory.startLLMSpan("chat-completion", "gpt-4", "openai", "my-app", "session-1"))
+                .thenReturn(mockLLMSpan);
+        when(mockFactory.startAgentSpan("agent-task", "my-app", "session-1")).thenReturn(mockAgentSpan);
+        when(mockFactory.startToolSpan("weather-tool", "my-app", "session-1")).thenReturn(mockToolSpan);
+        when(mockFactory.startTaskSpan("summarize-task", "my-app", "session-1")).thenReturn(mockTaskSpan);
+        when(mockFactory.startWorkflowSpan("data-workflow", "my-app", "session-1"))
+                .thenReturn(mockWorkflowSpan);
+        when(mockFactory.startEmbeddingSpan("text-embed", "my-app", "openai", "text-embedding-ada-002", "session-1"))
+                .thenReturn(mockEmbeddingSpan);
+        when(mockFactory.startRetrievalSpan("document-retrieval", "my-app", "session-1"))
+                .thenReturn(mockRetrievalSpan);
+
+        setStaticField("SPAN_FACTORY", mockFactory);
+        setStaticField("EVAL_PROCESSOR", mockEvalProcessor);
+
+        LLMObsSpan llmSpan = LLMObs.startLLMSpan("chat-completion", "gpt-4", "openai", "my-app", "session-1");
+        LLMObsSpan agentSpan = LLMObs.startAgentSpan("agent-task", "my-app", "session-1");
+        LLMObsSpan toolSpan = LLMObs.startToolSpan("weather-tool", "my-app", "session-1");
+        LLMObsSpan taskSpan = LLMObs.startTaskSpan("summarize-task", "my-app", "session-1");
+        LLMObsSpan workflowSpan = LLMObs.startWorkflowSpan("data-workflow", "my-app", "session-1");
+        LLMObsSpan embeddingSpan =
+                LLMObs.startEmbeddingSpan("text-embed", "my-app", "openai", "text-embedding-ada-002", "session-1");
+        LLMObsSpan retrievalSpan = LLMObs.startRetrievalSpan("document-retrieval", "my-app", "session-1");
+
+        Map<String, Object> scoreTags = new HashMap<>();
+        scoreTags.put("test", "value");
+        LLMObs.SubmitEvaluation(llmSpan, "accuracy", 0.95, scoreTags);
+
+        Map<String, Object> categoricalTags = new HashMap<>();
+        categoricalTags.put("reviewer", "human");
+        LLMObs.SubmitEvaluation(agentSpan, "quality", "excellent", "eval-app", categoricalTags);
+
+        assertSame(mockLLMSpan, llmSpan);
+        assertSame(mockAgentSpan, agentSpan);
+        assertSame(mockToolSpan, toolSpan);
+        assertSame(mockTaskSpan, taskSpan);
+        assertSame(mockWorkflowSpan, workflowSpan);
+        assertSame(mockEmbeddingSpan, embeddingSpan);
+        assertSame(mockRetrievalSpan, retrievalSpan);
+
+        assertNotSame(NoOpLLMObsSpan.INSTANCE, llmSpan);
+        assertNotSame(NoOpLLMObsSpan.INSTANCE, agentSpan);
+        assertNotSame(NoOpLLMObsSpan.INSTANCE, toolSpan);
+        assertNotSame(NoOpLLMObsSpan.INSTANCE, taskSpan);
+        assertNotSame(NoOpLLMObsSpan.INSTANCE, workflowSpan);
+        assertNotSame(NoOpLLMObsSpan.INSTANCE, embeddingSpan);
+        assertNotSame(NoOpLLMObsSpan.INSTANCE, retrievalSpan);
+
+        verify(mockEvalProcessor).SubmitEvaluation(mockLLMSpan, "accuracy", 0.95, scoreTags);
+        verify(mockEvalProcessor).SubmitEvaluation(mockAgentSpan, "quality", "excellent", "eval-app", categoricalTags);
+    }
+
+    @Test
+    void testSpanCreationWithNullParametersUsingCustomFactory() throws Exception {
+        LLMObs.LLMObsSpanFactory mockFactory = mock(LLMObs.LLMObsSpanFactory.class);
+        LLMObsSpan mockSpan = mock(LLMObsSpan.class);
+
+        when(mockFactory.startLLMSpan("test-span", "gpt-4", "openai", null, null))
+                .thenReturn(mockSpan);
+        when(mockFactory.startEmbeddingSpan("embed-span", null, null, null, null))
+                .thenReturn(mockSpan);
+
+        setStaticField("SPAN_FACTORY", mockFactory);
+
+        LLMObsSpan llmSpan = LLMObs.startLLMSpan("test-span", "gpt-4", "openai", null, null);
+        LLMObsSpan embeddingSpan = LLMObs.startEmbeddingSpan("embed-span", null, null, null, null);
+
+        assertSame(mockSpan, llmSpan);
+        assertSame(mockSpan, embeddingSpan);
+
+        verify(mockFactory).startLLMSpan("test-span", "gpt-4", "openai", null, null);
+        verify(mockFactory).startEmbeddingSpan("embed-span", null, null, null, null);
+    }
+
+    private static void setStaticField(String fieldName, Object value) throws Exception {
+        Field field = LLMObs.class.getDeclaredField(fieldName);
+        field.setAccessible(true);
+        field.set(null, value);
+    }
+
+    private static Object getStaticField(String fieldName) throws Exception {
+        Field field = LLMObs.class.getDeclaredField(fieldName);
+        field.setAccessible(true);
+        return field.get(null);
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/context/ContextManagerBenchmark.java b/dd-trace-core/src/jmh/java/datadog/context/ContextManagerBenchmark.java
index 0128535a9d0..fee4487d870 100644
--- a/dd-trace-core/src/jmh/java/datadog/context/ContextManagerBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/context/ContextManagerBenchmark.java
@@ -46,332 +46,330 @@
 @Fork(value = 1)
 public class ContextManagerBenchmark {
 
-  // ── Constants ──────────────────────────────────────────────────────────────
-
-  // Reflective access to Thread.ofVirtual().factory() (Java 21+).
-  // Used to create fixed-size pools of virtual threads so no new VT is spawned per task.
-  // Falls back to platform threads on older JVMs — the benchmark still runs, but
-  // captureAndResumeOnVirtualThread and captureAndFanOutToVirtualThreads will measure
-  // platform-thread overhead instead.
-  static final boolean VIRTUAL_THREADS_AVAILABLE;
-  static final ThreadFactory VIRTUAL_OR_PLATFORM_FACTORY;
-
-  static {
-    ThreadFactory factory = null;
-    try {
-      Object builder = Thread.class.getMethod("ofVirtual").invoke(null);
-      factory = (ThreadFactory) builder.getClass().getMethod("factory").invoke(builder);
-    } catch (Exception ignored) {
+    // ── Constants ──────────────────────────────────────────────────────────────
+
+    // Reflective access to Thread.ofVirtual().factory() (Java 21+).
+    // Used to create fixed-size pools of virtual threads so no new VT is spawned per task.
+    // Falls back to platform threads on older JVMs — the benchmark still runs, but
+    // captureAndResumeOnVirtualThread and captureAndFanOutToVirtualThreads will measure
+    // platform-thread overhead instead.
+    static final boolean VIRTUAL_THREADS_AVAILABLE;
+    static final ThreadFactory VIRTUAL_OR_PLATFORM_FACTORY;
+
+    static {
+        ThreadFactory factory = null;
+        try {
+            Object builder = Thread.class.getMethod("ofVirtual").invoke(null);
+            factory = (ThreadFactory) builder.getClass().getMethod("factory").invoke(builder);
+        } catch (Exception ignored) {
+        }
+        VIRTUAL_THREADS_AVAILABLE = factory != null;
+        VIRTUAL_OR_PLATFORM_FACTORY = factory != null ? factory : Thread::new;
+    }
+
+    // Creates a fixed pool whose threads are virtual (Java 21+) or platform (older JVMs).
+    // Using a fixed pool rather than newVirtualThreadPerTaskExecutor avoids spawning a
+    // fresh virtual thread on every task submission, keeping thread-creation cost out of
+    // the measured critical path.
+    static ExecutorService newFixedVirtualPool(int nThreads) {
+        return Executors.newFixedThreadPool(nThreads, VIRTUAL_OR_PLATFORM_FACTORY);
+    }
+
+    static final ContextKey<String> KEY = ContextKey.named("benchmark-key");
+    // power of 2 so cycling wraps cheaply with bit-mask
+    static final int CONTEXT_COUNT = 16;
+    // virtual threads spawned per continuation fan-out
+    static final int FAN_OUT = 8;
+
+    // ── Parameters ─────────────────────────────────────────────────────────────
+
+    /**
+     * Which {@link ContextManager} implementation to benchmark.
+     *
+     * <p>{@code ThreadLocal} — {@link ThreadLocalContextManager} (the lightweight default).
+     *
+     * <p>{@code Continuable} — {@link ContinuableScopeManager} (the full scope/span manager).
+     */
+    @Param({"ThreadLocal", "Continuable"})
+    public String managerType;
+
+    // ── Benchmark-scoped shared state ─────────────────────────────────────────
+
+    ContextManager manager;
+    // CONTEXT_COUNT distinct non-root contexts; threads cycle through them to
+    // avoid artificial same-context hits in benchmarks that don't want them
+    Context[] contexts;
+
+    @Setup
+    public void setup() {
+        manager = createManager(managerType);
+        contexts = createContexts();
     }
-    VIRTUAL_THREADS_AVAILABLE = factory != null;
-    VIRTUAL_OR_PLATFORM_FACTORY = factory != null ? factory : Thread::new;
-  }
-
-  // Creates a fixed pool whose threads are virtual (Java 21+) or platform (older JVMs).
-  // Using a fixed pool rather than newVirtualThreadPerTaskExecutor avoids spawning a
-  // fresh virtual thread on every task submission, keeping thread-creation cost out of
-  // the measured critical path.
-  static ExecutorService newFixedVirtualPool(int nThreads) {
-    return Executors.newFixedThreadPool(nThreads, VIRTUAL_OR_PLATFORM_FACTORY);
-  }
-
-  static final ContextKey<String> KEY = ContextKey.named("benchmark-key");
-  // power of 2 so cycling wraps cheaply with bit-mask
-  static final int CONTEXT_COUNT = 16;
-  // virtual threads spawned per continuation fan-out
-  static final int FAN_OUT = 8;
-
-  // ── Parameters ─────────────────────────────────────────────────────────────
-
-  /**
-   * Which {@link ContextManager} implementation to benchmark.
-   *
-   * <p>{@code ThreadLocal} — {@link ThreadLocalContextManager} (the lightweight default).
-   *
-   * <p>{@code Continuable} — {@link ContinuableScopeManager} (the full scope/span manager).
-   */
-  @Param({"ThreadLocal", "Continuable"})
-  public String managerType;
-
-  // ── Benchmark-scoped shared state ─────────────────────────────────────────
-
-  ContextManager manager;
-  // CONTEXT_COUNT distinct non-root contexts; threads cycle through them to
-  // avoid artificial same-context hits in benchmarks that don't want them
-  Context[] contexts;
-
-  @Setup
-  public void setup() {
-    manager = createManager(managerType);
-    contexts = createContexts();
-  }
-
-  static ContextManager createManager(String type) {
-    if ("Continuable".equals(type)) {
-      ContinuableScopeManager csm = new ContinuableScopeManager(0, false);
-      return new ContextManager() {
-        @Override
-        public Context current() {
-          return csm.currentContext();
+
+    static ContextManager createManager(String type) {
+        if ("Continuable".equals(type)) {
+            ContinuableScopeManager csm = new ContinuableScopeManager(0, false);
+            return new ContextManager() {
+                @Override
+                public Context current() {
+                    return csm.currentContext();
+                }
+
+                @Override
+                public ContextScope attach(Context ctx) {
+                    return csm.attach(ctx);
+                }
+
+                @Override
+                public Context swap(Context ctx) {
+                    return csm.swap(ctx);
+                }
+
+                @Override
+                public ContextContinuation capture(Context ctx) {
+                    return csm.capture(ctx);
+                }
+
+                @Override
+                public void addListener(ContextListener l) {}
+            };
         }
+        return ThreadLocalContextManager.INSTANCE;
+    }
 
-        @Override
-        public ContextScope attach(Context ctx) {
-          return csm.attach(ctx);
+    static Context[] createContexts() {
+        Context[] contexts = new Context[CONTEXT_COUNT];
+        for (int i = 0; i < CONTEXT_COUNT; i++) {
+            contexts[i] = Context.root().with(KEY, "value-" + i);
         }
+        return contexts;
+    }
 
-        @Override
-        public Context swap(Context ctx) {
-          return csm.swap(ctx);
+    // ── Per-thread state ───────────────────────────────────────────────────────
+
+    @State(Scope.Thread)
+    public static class ThreadState {
+        int index;
+        // Pre-allocated barrier reused across fan-out invocations.
+        // Avoids a new CountDownLatch allocation per invocation that would inflate gc.alloc.rate.norm.
+        final Semaphore fanOutBarrier = new Semaphore(0);
+        ExecutorService platformExecutor;
+        ExecutorService virtualExecutor;
+
+        @Setup(Level.Trial)
+        public void setup() {
+            // Both pools are fixed-size so no new thread is created per submitted task.
+            // The virtual pool uses virtual threads (Java 21+) or falls back to platform threads.
+            // Pool size is intentionally larger than the JMH thread count to avoid executor starvation
+            // when benchmark threads all submit tasks concurrently.
+            platformExecutor = Executors.newFixedThreadPool(16);
+            virtualExecutor = newFixedVirtualPool(16);
         }
 
-        @Override
-        public ContextContinuation capture(Context ctx) {
-          return csm.capture(ctx);
+        @TearDown(Level.Trial)
+        public void tearDown() throws InterruptedException {
+            platformExecutor.shutdown();
+            virtualExecutor.shutdown();
+            platformExecutor.awaitTermination(10, SECONDS);
+            virtualExecutor.awaitTermination(10, SECONDS);
         }
 
-        @Override
-        public void addListener(ContextListener l) {}
-      };
+        Context nextContext(Context[] contexts) {
+            return contexts[(index++) & (CONTEXT_COUNT - 1)];
+        }
     }
-    return ThreadLocalContextManager.INSTANCE;
-  }
 
-  static Context[] createContexts() {
-    Context[] contexts = new Context[CONTEXT_COUNT];
-    for (int i = 0; i < CONTEXT_COUNT; i++) {
-      contexts[i] = Context.root().with(KEY, "value-" + i);
-    }
-    return contexts;
-  }
+    // ── Thread state with a pre-attached context (for read benchmarks) ─────────
 
-  // ── Per-thread state ───────────────────────────────────────────────────────
+    /**
+     * Attaches a context once per trial so that {@link #current} and {@link #currentAndGet} measure
+     * only the read path, not the attach overhead.
+     */
+    @State(Scope.Thread)
+    public static class ActiveContextState {
+        ContextScope scope;
 
-  @State(Scope.Thread)
-  public static class ThreadState {
-    int index;
-    // Pre-allocated barrier reused across fan-out invocations.
-    // Avoids a new CountDownLatch allocation per invocation that would inflate gc.alloc.rate.norm.
-    final Semaphore fanOutBarrier = new Semaphore(0);
-    ExecutorService platformExecutor;
-    ExecutorService virtualExecutor;
+        @Setup(Level.Trial)
+        public void setup(ContextManagerBenchmark benchmark) {
+            scope = benchmark.manager.attach(benchmark.contexts[0]);
+        }
 
-    @Setup(Level.Trial)
-    public void setup() {
-      // Both pools are fixed-size so no new thread is created per submitted task.
-      // The virtual pool uses virtual threads (Java 21+) or falls back to platform threads.
-      // Pool size is intentionally larger than the JMH thread count to avoid executor starvation
-      // when benchmark threads all submit tasks concurrently.
-      platformExecutor = Executors.newFixedThreadPool(16);
-      virtualExecutor = newFixedVirtualPool(16);
+        @TearDown(Level.Trial)
+        public void tearDown() {
+            scope.close();
+        }
     }
 
-    @TearDown(Level.Trial)
-    public void tearDown() throws InterruptedException {
-      platformExecutor.shutdown();
-      virtualExecutor.shutdown();
-      platformExecutor.awaitTermination(10, SECONDS);
-      virtualExecutor.awaitTermination(10, SECONDS);
-    }
+    // ── Scenario 1: attach a different context, close scope ───────────────────
 
-    Context nextContext(Context[] contexts) {
-      return contexts[(index++) & (CONTEXT_COUNT - 1)];
+    /** Attach one distinct context then close its scope. The hot path for most instrumentations. */
+    @Benchmark
+    public void attachAndClose(ThreadState thread) {
+        Context ctx = thread.nextContext(contexts);
+        try (ContextScope scope = manager.attach(ctx)) {
+            // scope is active
+        }
     }
-  }
 
-  // ── Thread state with a pre-attached context (for read benchmarks) ─────────
-
-  /**
-   * Attaches a context once per trial so that {@link #current} and {@link #currentAndGet} measure
-   * only the read path, not the attach overhead.
-   */
-  @State(Scope.Thread)
-  public static class ActiveContextState {
-    ContextScope scope;
-
-    @Setup(Level.Trial)
-    public void setup(ContextManagerBenchmark benchmark) {
-      scope = benchmark.manager.attach(benchmark.contexts[0]);
+    // ── Scenario 2: nested attach of two different contexts ───────────────────
+
+    /**
+     * Attach two distinct contexts in sequence and close both. Exercises the stack push/pop cycle
+     * that occurs at every instrumented method boundary.
+     */
+    @Benchmark
+    public void nestedAttachAndClose(ThreadState thread) {
+        Context outer = thread.nextContext(contexts);
+        Context inner = thread.nextContext(contexts);
+        try (ContextScope outerScope = manager.attach(outer)) {
+            try (ContextScope innerScope = manager.attach(inner)) {
+                // inner is active
+            }
+        }
     }
 
-    @TearDown(Level.Trial)
-    public void tearDown() {
-      scope.close();
+    // ── Scenario 3: swap different contexts ───────────────────────────────────
+
+    /**
+     * Swap in a new context then swap back the previous one. {@link
+     * ContinuableScopeManager#swap(Context)} replaces the entire scope stack, making this a heavier
+     * operation than in {@link ThreadLocalContextManager}.
+     *
+     * <p>Note: GCProfiler will show allocation asymmetry here by design. {@link
+     * ContinuableScopeManager} swap allocates a {@code ScopeStack}, a {@code ContinuableScope}, and a
+     * {@code ScopeContext} per invocation; {@link ThreadLocalContextManager} swap is a plain field
+     * write. That asymmetry is the real cost of each manager's swap operation, not scaffolding.
+     */
+    @Benchmark
+    public void swapContexts(ThreadState thread) {
+        Context ctx = thread.nextContext(contexts);
+        Context previous = manager.swap(ctx);
+        manager.swap(previous);
     }
-  }
 
-  // ── Scenario 1: attach a different context, close scope ───────────────────
+    // ── Scenario 4: capture + same-thread resume (continuation baseline) ───────
+
+    /**
+     * Capture the current context as a continuation and immediately resume it on the same thread.
+     * Establishes the allocation and atomic-counter cost of the continuation mechanism without any
+     * cross-thread scheduling overhead.
+     */
+    @Benchmark
+    public void captureThenResumeSameThread(ThreadState thread) {
+        Context ctx = thread.nextContext(contexts);
+        try (ContextScope scope = manager.attach(ctx)) {
+            ContextContinuation cont = manager.capture(ctx);
+            try (ContextScope resumed = cont.resume()) {
+                // context restored on the same thread
+            }
+        }
+    }
 
-  /** Attach one distinct context then close its scope. The hot path for most instrumentations. */
-  @Benchmark
-  public void attachAndClose(ThreadState thread) {
-    Context ctx = thread.nextContext(contexts);
-    try (ContextScope scope = manager.attach(ctx)) {
-      // scope is active
+    // ── Scenario 5: capture, resume on a platform thread ─────────────────────
+
+    /**
+     * Capture the current context as a continuation and resume it on a pooled platform thread.
+     * Measures cross-thread handoff latency (submit + schedule + execute) for each manager.
+     *
+     * <p>Fewer JMH threads than the default so the platform executor is never saturated.
+     */
+    @Benchmark
+    @Threads(4)
+    public void captureAndResumeOnPlatformThread(ThreadState thread) throws Exception {
+        captureAndResumeOnExecutor(thread, thread.platformExecutor);
     }
-  }
-
-  // ── Scenario 2: nested attach of two different contexts ───────────────────
-
-  /**
-   * Attach two distinct contexts in sequence and close both. Exercises the stack push/pop cycle
-   * that occurs at every instrumented method boundary.
-   */
-  @Benchmark
-  public void nestedAttachAndClose(ThreadState thread) {
-    Context outer = thread.nextContext(contexts);
-    Context inner = thread.nextContext(contexts);
-    try (ContextScope outerScope = manager.attach(outer)) {
-      try (ContextScope innerScope = manager.attach(inner)) {
-        // inner is active
-      }
+
+    // ── Scenario 6: capture, resume on a virtual thread ──────────────────────
+
+    /**
+     * Capture the current context as a continuation and resume it on a fixed-pool virtual thread.
+     * Shows how well each manager scales when continuations are used for structured concurrency or
+     * reactive pipelines on virtual threads.
+     */
+    @Benchmark
+    @Threads(4)
+    public void captureAndResumeOnVirtualThread(ThreadState thread) throws Exception {
+        captureAndResumeOnExecutor(thread, thread.virtualExecutor);
     }
-  }
-
-  // ── Scenario 3: swap different contexts ───────────────────────────────────
-
-  /**
-   * Swap in a new context then swap back the previous one. {@link
-   * ContinuableScopeManager#swap(Context)} replaces the entire scope stack, making this a heavier
-   * operation than in {@link ThreadLocalContextManager}.
-   *
-   * <p>Note: GCProfiler will show allocation asymmetry here by design. {@link
-   * ContinuableScopeManager} swap allocates a {@code ScopeStack}, a {@code ContinuableScope}, and a
-   * {@code ScopeContext} per invocation; {@link ThreadLocalContextManager} swap is a plain field
-   * write. That asymmetry is the real cost of each manager's swap operation, not scaffolding.
-   */
-  @Benchmark
-  public void swapContexts(ThreadState thread) {
-    Context ctx = thread.nextContext(contexts);
-    Context previous = manager.swap(ctx);
-    manager.swap(previous);
-  }
-
-  // ── Scenario 4: capture + same-thread resume (continuation baseline) ───────
-
-  /**
-   * Capture the current context as a continuation and immediately resume it on the same thread.
-   * Establishes the allocation and atomic-counter cost of the continuation mechanism without any
-   * cross-thread scheduling overhead.
-   */
-  @Benchmark
-  public void captureThenResumeSameThread(ThreadState thread) {
-    Context ctx = thread.nextContext(contexts);
-    try (ContextScope scope = manager.attach(ctx)) {
-      ContextContinuation cont = manager.capture(ctx);
-      try (ContextScope resumed = cont.resume()) {
-        // context restored on the same thread
-      }
+
+    private void captureAndResumeOnExecutor(ThreadState thread, ExecutorService executor) throws Exception {
+        Context ctx = thread.nextContext(contexts);
+        try (ContextScope scope = manager.attach(ctx)) {
+            ContextContinuation cont = manager.capture(ctx);
+            CompletableFuture.runAsync(
+                            () -> {
+                                try (ContextScope resumed = cont.resume()) {
+                                    // context propagated to executor thread
+                                }
+                            },
+                            executor)
+                    .get(10, SECONDS);
+        }
     }
-  }
-
-  // ── Scenario 5: capture, resume on a platform thread ─────────────────────
-
-  /**
-   * Capture the current context as a continuation and resume it on a pooled platform thread.
-   * Measures cross-thread handoff latency (submit + schedule + execute) for each manager.
-   *
-   * <p>Fewer JMH threads than the default so the platform executor is never saturated.
-   */
-  @Benchmark
-  @Threads(4)
-  public void captureAndResumeOnPlatformThread(ThreadState thread) throws Exception {
-    captureAndResumeOnExecutor(thread, thread.platformExecutor);
-  }
-
-  // ── Scenario 6: capture, resume on a virtual thread ──────────────────────
-
-  /**
-   * Capture the current context as a continuation and resume it on a fixed-pool virtual thread.
-   * Shows how well each manager scales when continuations are used for structured concurrency or
-   * reactive pipelines on virtual threads.
-   */
-  @Benchmark
-  @Threads(4)
-  public void captureAndResumeOnVirtualThread(ThreadState thread) throws Exception {
-    captureAndResumeOnExecutor(thread, thread.virtualExecutor);
-  }
-
-  private void captureAndResumeOnExecutor(ThreadState thread, ExecutorService executor)
-      throws Exception {
-    Context ctx = thread.nextContext(contexts);
-    try (ContextScope scope = manager.attach(ctx)) {
-      ContextContinuation cont = manager.capture(ctx);
-      CompletableFuture.runAsync(
-              () -> {
-                try (ContextScope resumed = cont.resume()) {
-                  // context propagated to executor thread
+
+    // ── Scenario 7: fan-out — one held continuation resumed on N virtual threads
+
+    /**
+     * Capture one context, hold the continuation, then fan it out to {@value #FAN_OUT} virtual
+     * threads concurrently. Each virtual thread resumes the same continuation and closes its scope;
+     * only the explicit {@link ContextContinuation#release()} after the barrier completes the
+     * lifecycle.
+     *
+     * <p>This reflects async frameworks that dispatch a single request context to a pool of worker
+     * coroutines / virtual threads.
+     *
+     * <p>Uses {@link Mode#SampleTime} to capture percentile tail latency in addition to the mean.
+     * Warmup and measurement windows are extended because each invocation waits for {@value #FAN_OUT}
+     * round-trips before returning.
+     */
+    @Benchmark
+    @Threads(2)
+    @BenchmarkMode(Mode.SampleTime)
+    @Warmup(iterations = 3, time = 3)
+    @Measurement(iterations = 5, time = 5)
+    public void captureAndFanOutToVirtualThreads(ThreadState thread) throws Exception {
+        Context ctx = thread.nextContext(contexts);
+        try (ContextScope scope = manager.attach(ctx)) {
+            ContextContinuation cont = manager.capture(ctx).hold();
+            Semaphore barrier = thread.fanOutBarrier;
+            for (int i = 0; i < FAN_OUT; i++) {
+                thread.virtualExecutor.execute(() -> {
+                    try (ContextScope resumed = cont.resume()) {
+                        // each virtual thread sees the same captured context
+                    } finally {
+                        barrier.release();
+                    }
+                });
+            }
+            try {
+                if (!barrier.tryAcquire(FAN_OUT, 10, SECONDS)) {
+                    throw new IllegalStateException("fan-out timed out");
                 }
-              },
-              executor)
-          .get(10, SECONDS);
-    }
-  }
-
-  // ── Scenario 7: fan-out — one held continuation resumed on N virtual threads
-
-  /**
-   * Capture one context, hold the continuation, then fan it out to {@value #FAN_OUT} virtual
-   * threads concurrently. Each virtual thread resumes the same continuation and closes its scope;
-   * only the explicit {@link ContextContinuation#release()} after the barrier completes the
-   * lifecycle.
-   *
-   * <p>This reflects async frameworks that dispatch a single request context to a pool of worker
-   * coroutines / virtual threads.
-   *
-   * <p>Uses {@link Mode#SampleTime} to capture percentile tail latency in addition to the mean.
-   * Warmup and measurement windows are extended because each invocation waits for {@value #FAN_OUT}
-   * round-trips before returning.
-   */
-  @Benchmark
-  @Threads(2)
-  @BenchmarkMode(Mode.SampleTime)
-  @Warmup(iterations = 3, time = 3)
-  @Measurement(iterations = 5, time = 5)
-  public void captureAndFanOutToVirtualThreads(ThreadState thread) throws Exception {
-    Context ctx = thread.nextContext(contexts);
-    try (ContextScope scope = manager.attach(ctx)) {
-      ContextContinuation cont = manager.capture(ctx).hold();
-      Semaphore barrier = thread.fanOutBarrier;
-      for (int i = 0; i < FAN_OUT; i++) {
-        thread.virtualExecutor.execute(
-            () -> {
-              try (ContextScope resumed = cont.resume()) {
-                // each virtual thread sees the same captured context
-              } finally {
-                barrier.release();
-              }
-            });
-      }
-      try {
-        if (!barrier.tryAcquire(FAN_OUT, 10, SECONDS)) {
-          throw new IllegalStateException("fan-out timed out");
+            } finally {
+                cont.release();
+            }
         }
-      } finally {
-        cont.release();
-      }
     }
-  }
-
-  // ── Scenario 8: read the current context ─────────────────────────────────
-
-  /**
-   * Returns the currently active context. The most frequent operation in any traced application —
-   * called at every instrumented method boundary before reading a span or key.
-   */
-  @Benchmark
-  public Context current(ActiveContextState active) {
-    return manager.current();
-  }
-
-  // ── Scenario 9: read a value from the current context ────────────────────
-
-  /**
-   * Returns a value from the currently active context. The full "read active span" path that
-   * instrumentation executes at every traced method boundary.
-   */
-  @Benchmark
-  public Object currentAndGet(ActiveContextState active) {
-    return manager.current().get(KEY);
-  }
+
+    // ── Scenario 8: read the current context ─────────────────────────────────
+
+    /**
+     * Returns the currently active context. The most frequent operation in any traced application —
+     * called at every instrumented method boundary before reading a span or key.
+     */
+    @Benchmark
+    public Context current(ActiveContextState active) {
+        return manager.current();
+    }
+
+    // ── Scenario 9: read a value from the current context ────────────────────
+
+    /**
+     * Returns a value from the currently active context. The full "read active span" path that
+     * instrumentation executes at every traced method boundary.
+     */
+    @Benchmark
+    public Object currentAndGet(ActiveContextState active) {
+        return manager.current().get(KEY);
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/context/ContextManagerDepthBenchmark.java b/dd-trace-core/src/jmh/java/datadog/context/ContextManagerDepthBenchmark.java
index 04da28efc9c..8210689cfdd 100644
--- a/dd-trace-core/src/jmh/java/datadog/context/ContextManagerDepthBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/context/ContextManagerDepthBenchmark.java
@@ -40,49 +40,49 @@
 @Fork(value = 1)
 public class ContextManagerDepthBenchmark {
 
-  /**
-   * Which {@link ContextManager} implementation to benchmark.
-   *
-   * @see ContextManagerBenchmark#managerType
-   */
-  @Param({"ThreadLocal", "Continuable"})
-  public String managerType;
+    /**
+     * Which {@link ContextManager} implementation to benchmark.
+     *
+     * @see ContextManagerBenchmark#managerType
+     */
+    @Param({"ThreadLocal", "Continuable"})
+    public String managerType;
 
-  @Param({"1", "4", "8", "100"})
-  public int depth;
+    @Param({"1", "4", "8", "100"})
+    public int depth;
 
-  ContextManager manager;
-  Context[] contexts;
+    ContextManager manager;
+    Context[] contexts;
 
-  @Setup
-  public void setup() {
-    manager = ContextManagerBenchmark.createManager(managerType);
-    contexts = ContextManagerBenchmark.createContexts();
-  }
+    @Setup
+    public void setup() {
+        manager = ContextManagerBenchmark.createManager(managerType);
+        contexts = ContextManagerBenchmark.createContexts();
+    }
 
-  @State(Scope.Thread)
-  public static class ThreadState {
-    final ContextScope[] scopes = new ContextScope[100];
+    @State(Scope.Thread)
+    public static class ThreadState {
+        final ContextScope[] scopes = new ContextScope[100];
 
-    int nextContextIndex;
+        int nextContextIndex;
 
-    Context nextContext(Context[] contexts) {
-      return contexts[(nextContextIndex++) & (ContextManagerBenchmark.CONTEXT_COUNT - 1)];
+        Context nextContext(Context[] contexts) {
+            return contexts[(nextContextIndex++) & (ContextManagerBenchmark.CONTEXT_COUNT - 1)];
+        }
     }
-  }
 
-  // ── Benchmark ─────────────────────────────────────────────────────────────
+    // ── Benchmark ─────────────────────────────────────────────────────────────
 
-  /** Attach the same context {@code depth} times then close all scopes in LIFO order. */
-  @Benchmark
-  public void attachSameContextDepth(ThreadState thread) {
-    Context ctx = thread.nextContext(contexts);
-    ContextScope[] scopes = thread.scopes;
-    for (int i = 0; i < depth; i++) {
-      scopes[i] = manager.attach(ctx);
-    }
-    for (int i = depth - 1; i >= 0; i--) {
-      scopes[i].close();
+    /** Attach the same context {@code depth} times then close all scopes in LIFO order. */
+    @Benchmark
+    public void attachSameContextDepth(ThreadState thread) {
+        Context ctx = thread.nextContext(contexts);
+        ContextScope[] scopes = thread.scopes;
+        for (int i = 0; i < depth; i++) {
+            scopes[i] = manager.attach(ctx);
+        }
+        for (int i = depth - 1; i >= 0; i--) {
+            scopes[i].close();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/api/naming/MessagingNamingBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/api/naming/MessagingNamingBenchmark.java
index 36de260f215..d938515581f 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/api/naming/MessagingNamingBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/api/naming/MessagingNamingBenchmark.java
@@ -39,58 +39,56 @@
 @Fork(value = 1)
 public class MessagingNamingBenchmark {
 
-  CoreTracer tracer;
+    CoreTracer tracer;
 
-  WeakHashMap<ClassLoader, String> weakCache;
+    WeakHashMap<ClassLoader, String> weakCache;
 
-  private static final Supplier<String> constantSupplier = () -> "constant";
+    private static final Supplier<String> constantSupplier = () -> "constant";
 
-  private final Supplier<String> complexSupplier =
-      () -> {
+    private final Supplier<String> complexSupplier = () -> {
         String ret = weakCache.get(Thread.currentThread().getContextClassLoader());
         if (ret == null) {
-          ret = Config.get().getServiceName();
+            ret = Config.get().getServiceName();
         }
         return ret;
-      };
+    };
 
-  @Param({"false", "true"})
-  boolean pinThreadServiceName;
+    @Param({"false", "true"})
+    boolean pinThreadServiceName;
 
-  @Setup(Level.Iteration)
-  public void init(Blackhole blackhole) {
-    tracer =
-        CoreTracer.builder()
-            .writer(new BlackholeWriter(blackhole, new TraceCounters(), 0))
-            .strictTraceWrites(false)
-            .build();
-    weakCache = new WeakHashMap<>();
-    if (pinThreadServiceName) {
-      weakCache.put(Thread.currentThread().getContextClassLoader(), constantSupplier.get());
+    @Setup(Level.Iteration)
+    public void init(Blackhole blackhole) {
+        tracer = CoreTracer.builder()
+                .writer(new BlackholeWriter(blackhole, new TraceCounters(), 0))
+                .strictTraceWrites(false)
+                .build();
+        weakCache = new WeakHashMap<>();
+        if (pinThreadServiceName) {
+            weakCache.put(Thread.currentThread().getContextClassLoader(), constantSupplier.get());
+        }
     }
-  }
 
-  @Benchmark
-  public void constantServiceName(Blackhole blackhole) {
-    final AgentSpan span = tracer.startSpan("", "");
-    span.setServiceName("constant");
-    span.finish();
-    blackhole.consume(span);
-  }
+    @Benchmark
+    public void constantServiceName(Blackhole blackhole) {
+        final AgentSpan span = tracer.startSpan("", "");
+        span.setServiceName("constant");
+        span.finish();
+        blackhole.consume(span);
+    }
 
-  @Benchmark
-  public void constantSupplierServiceName(Blackhole blackhole) {
-    final AgentSpan span = tracer.startSpan("", "");
-    span.setServiceName(constantSupplier.get());
-    span.finish();
-    blackhole.consume(span);
-  }
+    @Benchmark
+    public void constantSupplierServiceName(Blackhole blackhole) {
+        final AgentSpan span = tracer.startSpan("", "");
+        span.setServiceName(constantSupplier.get());
+        span.finish();
+        blackhole.consume(span);
+    }
 
-  @Benchmark
-  public void complexSupplierServiceName(Blackhole blackhole) {
-    final AgentSpan span = tracer.startSpan("", "");
-    span.setServiceName(complexSupplier.get());
-    span.finish();
-    blackhole.consume(span);
-  }
+    @Benchmark
+    public void complexSupplierServiceName(Blackhole blackhole) {
+        final AgentSpan span = tracer.startSpan("", "");
+        span.setServiceName(complexSupplier.get());
+        span.finish();
+        blackhole.consume(span);
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/LongAdderBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/LongAdderBenchmark.java
index beb424740ca..d56a6dac56c 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/common/LongAdderBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/common/LongAdderBenchmark.java
@@ -34,33 +34,32 @@
 @Fork(value = 1)
 @SuppressForbidden
 public class LongAdderBenchmark {
-  public final LongAdder adder = new LongAdder();
-  public final FixedSizeStripedLongCounter counter =
-      CountersFactory.createFixedSizeStripedCounter(8);
+    public final LongAdder adder = new LongAdder();
+    public final FixedSizeStripedLongCounter counter = CountersFactory.createFixedSizeStripedCounter(8);
 
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void benchLongAdderIncrement(Blackhole blackhole) {
-    adder.increment();
-  }
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void benchLongAdderIncrement(Blackhole blackhole) {
+        adder.increment();
+    }
 
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void benchStripedCounterIncrement(Blackhole blackhole) {
-    counter.inc();
-  }
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void benchStripedCounterIncrement(Blackhole blackhole) {
+        counter.inc();
+    }
 
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void benchLongAdderSum(Blackhole blackhole) {
-    adder.increment();
-    blackhole.consume(adder.sum());
-  }
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void benchLongAdderSum(Blackhole blackhole) {
+        adder.increment();
+        blackhole.consume(adder.sum());
+    }
 
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void benchStripedCounterSum(Blackhole blackhole) {
-    counter.inc();
-    blackhole.consume(counter.get());
-  }
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void benchStripedCounterSum(Blackhole blackhole) {
+        counter.inc();
+        blackhole.consume(counter.get());
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/NonBlockingHashMapBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/NonBlockingHashMapBenchmark.java
index 91d39debef5..8b672532af7 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/common/NonBlockingHashMapBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/common/NonBlockingHashMapBenchmark.java
@@ -39,30 +39,30 @@
 @Fork(value = 1)
 @SuppressForbidden
 public class NonBlockingHashMapBenchmark {
-  private NonBlockingHashMap nonBlockingHashMap;
-  private ConcurrentHashMap concurrentHashMap;
+    private NonBlockingHashMap nonBlockingHashMap;
+    private ConcurrentHashMap concurrentHashMap;
 
-  @Setup(Level.Iteration)
-  public void setup() {
-    nonBlockingHashMap = new NonBlockingHashMap(512);
-    concurrentHashMap = new ConcurrentHashMap(512);
-    for (int i = 0; i < 256; i++) {
-      nonBlockingHashMap.put("test" + i, "test");
-      concurrentHashMap.put("test" + i, "test");
+    @Setup(Level.Iteration)
+    public void setup() {
+        nonBlockingHashMap = new NonBlockingHashMap(512);
+        concurrentHashMap = new ConcurrentHashMap(512);
+        for (int i = 0; i < 256; i++) {
+            nonBlockingHashMap.put("test" + i, "test");
+            concurrentHashMap.put("test" + i, "test");
+        }
     }
-  }
 
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void benchNonBlockingHashMap(Blackhole blackhole) {
-    nonBlockingHashMap.put("test", "test");
-    blackhole.consume(nonBlockingHashMap.remove("test"));
-  }
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void benchNonBlockingHashMap(Blackhole blackhole) {
+        nonBlockingHashMap.put("test", "test");
+        blackhole.consume(nonBlockingHashMap.remove("test"));
+    }
 
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void benchConcurrentHashMap(Blackhole blackhole) {
-    concurrentHashMap.put("test", "test");
-    blackhole.consume(concurrentHashMap.remove("test"));
-  }
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void benchConcurrentHashMap(Blackhole blackhole) {
+        concurrentHashMap.put("test", "test");
+        blackhole.consume(concurrentHashMap.remove("test"));
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/AdditionalTagsMetricsBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/AdditionalTagsMetricsBenchmark.java
index a360df0d7a6..b9757178946 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/AdditionalTagsMetricsBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/AdditionalTagsMetricsBenchmark.java
@@ -40,66 +40,63 @@
 @Fork(1)
 public class AdditionalTagsMetricsBenchmark {
 
-  private ClientStatsAggregator aggregator;
-  private AdversarialMetricsBenchmark.CountingHealthMetrics health;
+    private ClientStatsAggregator aggregator;
+    private AdversarialMetricsBenchmark.CountingHealthMetrics health;
 
-  @Param({"false", "true"})
-  public boolean limitsEnabled;
+    @Param({"false", "true"})
+    public boolean limitsEnabled;
 
-  @State(Scope.Thread)
-  public static class ThreadState {
-    int cursor;
-  }
+    @State(Scope.Thread)
+    public static class ThreadState {
+        int cursor;
+    }
 
-  @Setup
-  public void setup() {
-    this.health = new AdversarialMetricsBenchmark.CountingHealthMetrics();
-    AdditionalTagsSchema additionalTagsSchema =
-        AdditionalTagsSchema.from(
-            new LinkedHashSet<>(Arrays.asList("region", "tenant_id")),
-            MetricCardinalityLimits.ADDITIONAL_TAG_VALUE,
-            limitsEnabled);
-    this.aggregator =
-        new ClientStatsAggregator(
-            new WellKnownTags("", "", "", "", "", ""),
-            Collections.emptySet(),
-            additionalTagsSchema,
-            new ClientStatsAggregatorBenchmark.FixedAgentFeaturesDiscovery(
-                Collections.singleton("peer.hostname"), Collections.emptySet()),
-            this.health,
-            new ClientStatsAggregatorBenchmark.NullSink(),
-            2048,
-            2048,
-            false);
-    this.aggregator.start();
-  }
+    @Setup
+    public void setup() {
+        this.health = new AdversarialMetricsBenchmark.CountingHealthMetrics();
+        AdditionalTagsSchema additionalTagsSchema = AdditionalTagsSchema.from(
+                new LinkedHashSet<>(Arrays.asList("region", "tenant_id")),
+                MetricCardinalityLimits.ADDITIONAL_TAG_VALUE,
+                limitsEnabled);
+        this.aggregator = new ClientStatsAggregator(
+                new WellKnownTags("", "", "", "", "", ""),
+                Collections.emptySet(),
+                additionalTagsSchema,
+                new ClientStatsAggregatorBenchmark.FixedAgentFeaturesDiscovery(
+                        Collections.singleton("peer.hostname"), Collections.emptySet()),
+                this.health,
+                new ClientStatsAggregatorBenchmark.NullSink(),
+                2048,
+                2048,
+                false);
+        this.aggregator.start();
+    }
 
-  @TearDown
-  @SuppressForbidden
-  public void tearDown() {
-    aggregator.close();
-    System.err.println("[ADDITIONAL-TAGS] counters (across all threads, single fork):");
-    System.err.println("  onStatsInboxFull         = " + health.inboxFull.sum());
-    System.err.println("  onStatsAggregateDropped  = " + health.aggregateDropped.sum());
-  }
+    @TearDown
+    @SuppressForbidden
+    public void tearDown() {
+        aggregator.close();
+        System.err.println("[ADDITIONAL-TAGS] counters (across all threads, single fork):");
+        System.err.println("  onStatsInboxFull         = " + health.inboxFull.sum());
+        System.err.println("  onStatsAggregateDropped  = " + health.aggregateDropped.sum());
+    }
 
-  @Benchmark
-  public void publish(ThreadState ts, Blackhole blackhole) {
-    int idx = ts.cursor++;
-    ThreadLocalRandom rng = ThreadLocalRandom.current();
+    @Benchmark
+    public void publish(ThreadState ts, Blackhole blackhole) {
+        int idx = ts.cursor++;
+        ThreadLocalRandom rng = ThreadLocalRandom.current();
 
-    int scrambled = idx * 0x9E3779B1;
-    String region = "region-" + ((scrambled >>> 4) & 0xFFFF);
-    String tenant = "tenant-" + ((scrambled >>> 16) & 0xFFFF);
-    long durationNanos = 1L + (rng.nextLong() & 0x3FFFFFFFL);
+        int scrambled = idx * 0x9E3779B1;
+        String region = "region-" + ((scrambled >>> 4) & 0xFFFF);
+        String tenant = "tenant-" + ((scrambled >>> 16) & 0xFFFF);
+        long durationNanos = 1L + (rng.nextLong() & 0x3FFFFFFFL);
 
-    SimpleSpan span =
-        new SimpleSpan("svc", "op", "res", "web", true, true, false, 0, durationNanos, 200);
-    span.setTag(SPAN_KIND, SPAN_KIND_CLIENT);
-    span.setTag("region", region);
-    span.setTag("tenant_id", tenant);
+        SimpleSpan span = new SimpleSpan("svc", "op", "res", "web", true, true, false, 0, durationNanos, 200);
+        span.setTag(SPAN_KIND, SPAN_KIND_CLIENT);
+        span.setTag("region", region);
+        span.setTag("tenant_id", tenant);
 
-    List<CoreSpan<?>> trace = Collections.singletonList(span);
-    blackhole.consume(aggregator.publish(trace));
-  }
+        List<CoreSpan<?>> trace = Collections.singletonList(span);
+        blackhole.consume(aggregator.publish(trace));
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/AdversarialMetricsBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/AdversarialMetricsBenchmark.java
index ac677f20a97..cf8df9b2b30 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/AdversarialMetricsBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/AdversarialMetricsBenchmark.java
@@ -60,95 +60,90 @@
 @Fork(1)
 public class AdversarialMetricsBenchmark {
 
-  private ClientStatsAggregator aggregator;
-  private CountingHealthMetrics health;
+    private ClientStatsAggregator aggregator;
+    private CountingHealthMetrics health;
 
-  @State(Scope.Thread)
-  public static class ThreadState {
-    int cursor;
-  }
+    @State(Scope.Thread)
+    public static class ThreadState {
+        int cursor;
+    }
 
-  @Setup
-  public void setup() {
-    this.health = new CountingHealthMetrics();
-    this.aggregator =
-        new ClientStatsAggregator(
-            new WellKnownTags("", "", "", "", "", ""),
-            Collections.emptySet(),
-            AdditionalTagsSchema.EMPTY,
-            new ClientStatsAggregatorBenchmark.FixedAgentFeaturesDiscovery(
-                Collections.singleton("peer.hostname"), Collections.emptySet()),
-            this.health,
-            new ClientStatsAggregatorBenchmark.NullSink(),
-            2048,
-            2048,
-            false);
-    this.aggregator.start();
-  }
+    @Setup
+    public void setup() {
+        this.health = new CountingHealthMetrics();
+        this.aggregator = new ClientStatsAggregator(
+                new WellKnownTags("", "", "", "", "", ""),
+                Collections.emptySet(),
+                AdditionalTagsSchema.EMPTY,
+                new ClientStatsAggregatorBenchmark.FixedAgentFeaturesDiscovery(
+                        Collections.singleton("peer.hostname"), Collections.emptySet()),
+                this.health,
+                new ClientStatsAggregatorBenchmark.NullSink(),
+                2048,
+                2048,
+                false);
+        this.aggregator.start();
+    }
 
-  @TearDown
-  @SuppressForbidden
-  public void tearDown() {
-    aggregator.close();
-    // Counters accumulate across the trial (warmup + measurement iterations), since the
-    // CountingHealthMetrics instance is created once in @Setup and never reset.
-    System.err.println(
-        "[ADVERSARIAL] drops over the trial (8 threads, warmup + measurement combined):");
-    System.err.println(
-        "  onStatsInboxFull         = "
-            + health.inboxFull.sum()
-            + "   (snapshots dropped because the MPSC inbox was full)");
-    System.err.println(
-        "  onStatsAggregateDropped  = "
-            + health.aggregateDropped.sum()
-            + "   (snapshots dropped because the aggregate cache was full with no stale entry)");
-  }
+    @TearDown
+    @SuppressForbidden
+    public void tearDown() {
+        aggregator.close();
+        // Counters accumulate across the trial (warmup + measurement iterations), since the
+        // CountingHealthMetrics instance is created once in @Setup and never reset.
+        System.err.println("[ADVERSARIAL] drops over the trial (8 threads, warmup + measurement combined):");
+        System.err.println("  onStatsInboxFull         = "
+                + health.inboxFull.sum()
+                + "   (snapshots dropped because the MPSC inbox was full)");
+        System.err.println("  onStatsAggregateDropped  = "
+                + health.aggregateDropped.sum()
+                + "   (snapshots dropped because the aggregate cache was full with no stale entry)");
+    }
 
-  @Benchmark
-  public void publish(ThreadState ts, Blackhole blackhole) {
-    int idx = ts.cursor++;
-    ThreadLocalRandom rng = ThreadLocalRandom.current();
+    @Benchmark
+    public void publish(ThreadState ts, Blackhole blackhole) {
+        int idx = ts.cursor++;
+        ThreadLocalRandom rng = ThreadLocalRandom.current();
 
-    // Mix indices so labels don't fall into linear order. Distinct labels exceed every reasonable
-    // working-set bound, so the aggregate cache evicts continuously and most ops force a fresh
-    // MetricKey construction on the consumer thread.
-    int scrambled = idx * 0x9E3779B1; // golden ratio multiplier
-    String service = "svc-" + (scrambled & 0xFFFF);
-    String operation = "op-" + ((scrambled >>> 8) & 0x3FFFF);
-    String resource = "res-" + ((scrambled ^ 0x5A5A5A) & 0xFFFFF);
-    String hostname = "host-" + ((scrambled >>> 12) & 0x7FFF);
-    boolean error = (idx & 7) == 0;
-    boolean topLevel = (idx & 3) == 0;
-    // Wide duration spread forces histogram bins to populate broadly.
-    long durationNanos = 1L + (rng.nextLong() & 0x3FFFFFFFL); // 1 ns .. ~1.07 s
+        // Mix indices so labels don't fall into linear order. Distinct labels exceed every reasonable
+        // working-set bound, so the aggregate cache evicts continuously and most ops force a fresh
+        // MetricKey construction on the consumer thread.
+        int scrambled = idx * 0x9E3779B1; // golden ratio multiplier
+        String service = "svc-" + (scrambled & 0xFFFF);
+        String operation = "op-" + ((scrambled >>> 8) & 0x3FFFF);
+        String resource = "res-" + ((scrambled ^ 0x5A5A5A) & 0xFFFFF);
+        String hostname = "host-" + ((scrambled >>> 12) & 0x7FFF);
+        boolean error = (idx & 7) == 0;
+        boolean topLevel = (idx & 3) == 0;
+        // Wide duration spread forces histogram bins to populate broadly.
+        long durationNanos = 1L + (rng.nextLong() & 0x3FFFFFFFL); // 1 ns .. ~1.07 s
 
-    SimpleSpan span =
-        new SimpleSpan(
-            service, operation, resource, "web", true, topLevel, error, 0, durationNanos, 200);
-    span.setTag(SPAN_KIND, SPAN_KIND_CLIENT);
-    span.setTag("peer.hostname", hostname);
+        SimpleSpan span =
+                new SimpleSpan(service, operation, resource, "web", true, topLevel, error, 0, durationNanos, 200);
+        span.setTag(SPAN_KIND, SPAN_KIND_CLIENT);
+        span.setTag("peer.hostname", hostname);
 
-    List<CoreSpan<?>> trace = Collections.singletonList(span);
-    blackhole.consume(aggregator.publish(trace));
-  }
+        List<CoreSpan<?>> trace = Collections.singletonList(span);
+        blackhole.consume(aggregator.publish(trace));
+    }
 
-  /**
-   * Counts what gets dropped. Uses {@link LongAdder} so the printed totals hold up under 8-way
-   * contention -- {@code volatile long ++} loses ~20% of updates here, which would mask the
-   * order-of-magnitude shape the bench is trying to surface (inbox-full vs aggregate-dropped).
-   */
-  static final class CountingHealthMetrics extends HealthMetrics {
-    final LongAdder inboxFull = new LongAdder();
-    final LongAdder aggregateDropped = new LongAdder();
+    /**
+     * Counts what gets dropped. Uses {@link LongAdder} so the printed totals hold up under 8-way
+     * contention -- {@code volatile long ++} loses ~20% of updates here, which would mask the
+     * order-of-magnitude shape the bench is trying to surface (inbox-full vs aggregate-dropped).
+     */
+    static final class CountingHealthMetrics extends HealthMetrics {
+        final LongAdder inboxFull = new LongAdder();
+        final LongAdder aggregateDropped = new LongAdder();
 
-    @Override
-    public void onStatsInboxFull() {
-      inboxFull.increment();
-    }
+        @Override
+        public void onStatsInboxFull() {
+            inboxFull.increment();
+        }
 
-    @Override
-    public void onStatsAggregateDropped() {
-      aggregateDropped.increment();
+        @Override
+        public void onStatsAggregateDropped() {
+            aggregateDropped.increment();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ClientStatsAggregatorBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ClientStatsAggregatorBenchmark.java
index 08449d7a9ac..cbf400695df 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ClientStatsAggregatorBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ClientStatsAggregatorBenchmark.java
@@ -35,71 +35,69 @@
 @OutputTimeUnit(MICROSECONDS)
 @Fork(1)
 public class ClientStatsAggregatorBenchmark {
-  private final DDAgentFeaturesDiscovery featuresDiscovery =
-      new FixedAgentFeaturesDiscovery(
-          Collections.singleton("peer.hostname"), Collections.emptySet());
-  private final ClientStatsAggregator aggregator =
-      new ClientStatsAggregator(
-          new WellKnownTags("", "", "", "", "", ""),
-          Collections.emptySet(),
-          AdditionalTagsSchema.EMPTY,
-          featuresDiscovery,
-          HealthMetrics.NO_OP,
-          new NullSink(),
-          2048,
-          2048,
-          false);
-  private final List<CoreSpan<?>> spans = generateTrace(64);
+    private final DDAgentFeaturesDiscovery featuresDiscovery =
+            new FixedAgentFeaturesDiscovery(Collections.singleton("peer.hostname"), Collections.emptySet());
+    private final ClientStatsAggregator aggregator = new ClientStatsAggregator(
+            new WellKnownTags("", "", "", "", "", ""),
+            Collections.emptySet(),
+            AdditionalTagsSchema.EMPTY,
+            featuresDiscovery,
+            HealthMetrics.NO_OP,
+            new NullSink(),
+            2048,
+            2048,
+            false);
+    private final List<CoreSpan<?>> spans = generateTrace(64);
 
-  static List<CoreSpan<?>> generateTrace(int len) {
-    final List<CoreSpan<?>> trace = new ArrayList<>();
-    for (int i = 0; i < len; i++) {
-      SimpleSpan span = new SimpleSpan("", "", "", "", true, true, false, 0, 10, -1);
-      span.setTag(SPAN_KIND, SPAN_KIND_CLIENT);
-      span.setTag("peer.hostname", Strings.random(10));
-      trace.add(span);
+    static List<CoreSpan<?>> generateTrace(int len) {
+        final List<CoreSpan<?>> trace = new ArrayList<>();
+        for (int i = 0; i < len; i++) {
+            SimpleSpan span = new SimpleSpan("", "", "", "", true, true, false, 0, 10, -1);
+            span.setTag(SPAN_KIND, SPAN_KIND_CLIENT);
+            span.setTag("peer.hostname", Strings.random(10));
+            trace.add(span);
+        }
+        return trace;
     }
-    return trace;
-  }
 
-  static class NullSink implements Sink {
+    static class NullSink implements Sink {
 
-    @Override
-    public void register(EventListener listener) {}
+        @Override
+        public void register(EventListener listener) {}
 
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {}
-  }
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {}
+    }
 
-  static class FixedAgentFeaturesDiscovery extends DDAgentFeaturesDiscovery {
-    private final Set<String> peerTags;
-    private final Set<String> spanKinds;
+    static class FixedAgentFeaturesDiscovery extends DDAgentFeaturesDiscovery {
+        private final Set<String> peerTags;
+        private final Set<String> spanKinds;
 
-    public FixedAgentFeaturesDiscovery(Set<String> peerTags, Set<String> spanKinds) {
-      // create a fixed discovery with metrics enabled
-      super(null, Monitoring.DISABLED, null, V0_4, true, false);
-      this.peerTags = peerTags;
-      this.spanKinds = spanKinds;
-    }
+        public FixedAgentFeaturesDiscovery(Set<String> peerTags, Set<String> spanKinds) {
+            // create a fixed discovery with metrics enabled
+            super(null, Monitoring.DISABLED, null, V0_4, true, false);
+            this.peerTags = peerTags;
+            this.spanKinds = spanKinds;
+        }
 
-    @Override
-    public void discover() {
-      // do nothing
-    }
+        @Override
+        public void discover() {
+            // do nothing
+        }
 
-    @Override
-    public boolean supportsMetrics() {
-      return true;
-    }
+        @Override
+        public boolean supportsMetrics() {
+            return true;
+        }
 
-    @Override
-    public Set<String> peerTags() {
-      return peerTags;
+        @Override
+        public Set<String> peerTags() {
+            return peerTags;
+        }
     }
-  }
 
-  @Benchmark
-  public void benchmark(Blackhole blackhole) {
-    blackhole.consume(aggregator.publish(spans));
-  }
+    @Benchmark
+    public void benchmark(Blackhole blackhole) {
+        blackhole.consume(aggregator.publish(spans));
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ClientStatsAggregatorDDSpanBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ClientStatsAggregatorDDSpanBenchmark.java
index 7947ed20a0e..a0e2ebe6e1b 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ClientStatsAggregatorDDSpanBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ClientStatsAggregatorDDSpanBenchmark.java
@@ -52,59 +52,60 @@
 @Fork(1)
 public class ClientStatsAggregatorDDSpanBenchmark {
 
-  private static final CoreTracer TRACER =
-      CoreTracer.builder().writer(new NoopWriter()).strictTraceWrites(false).build();
+    private static final CoreTracer TRACER = CoreTracer.builder()
+            .writer(new NoopWriter())
+            .strictTraceWrites(false)
+            .build();
 
-  private final DDAgentFeaturesDiscovery featuresDiscovery =
-      new ClientStatsAggregatorBenchmark.FixedAgentFeaturesDiscovery(
-          Collections.singleton("peer.hostname"), Collections.emptySet());
-  private final ClientStatsAggregator aggregator =
-      new ClientStatsAggregator(
-          new WellKnownTags("", "", "", "", "", ""),
-          Collections.emptySet(),
-          AdditionalTagsSchema.EMPTY,
-          featuresDiscovery,
-          HealthMetrics.NO_OP,
-          new ClientStatsAggregatorBenchmark.NullSink(),
-          2048,
-          2048,
-          false);
-  private final List<CoreSpan<?>> spans = generateTrace(64);
+    private final DDAgentFeaturesDiscovery featuresDiscovery =
+            new ClientStatsAggregatorBenchmark.FixedAgentFeaturesDiscovery(
+                    Collections.singleton("peer.hostname"), Collections.emptySet());
+    private final ClientStatsAggregator aggregator = new ClientStatsAggregator(
+            new WellKnownTags("", "", "", "", "", ""),
+            Collections.emptySet(),
+            AdditionalTagsSchema.EMPTY,
+            featuresDiscovery,
+            HealthMetrics.NO_OP,
+            new ClientStatsAggregatorBenchmark.NullSink(),
+            2048,
+            2048,
+            false);
+    private final List<CoreSpan<?>> spans = generateTrace(64);
 
-  static List<CoreSpan<?>> generateTrace(int len) {
-    final List<CoreSpan<?>> trace = new ArrayList<>();
-    for (int i = 0; i < len; i++) {
-      DDSpan span = (DDSpan) TRACER.startSpan("benchmark", "op");
-      span.setTag(SPAN_KIND, SPAN_KIND_CLIENT);
-      span.setTag("peer.hostname", Strings.random(10));
-      // Fix duration; bypasses the wall clock and avoids per-fork drift.
-      span.finishWithDuration(10);
-      trace.add(span);
+    static List<CoreSpan<?>> generateTrace(int len) {
+        final List<CoreSpan<?>> trace = new ArrayList<>();
+        for (int i = 0; i < len; i++) {
+            DDSpan span = (DDSpan) TRACER.startSpan("benchmark", "op");
+            span.setTag(SPAN_KIND, SPAN_KIND_CLIENT);
+            span.setTag("peer.hostname", Strings.random(10));
+            // Fix duration; bypasses the wall clock and avoids per-fork drift.
+            span.finishWithDuration(10);
+            trace.add(span);
+        }
+        return trace;
     }
-    return trace;
-  }
 
-  static class NoopWriter implements Writer {
-    @Override
-    public void write(List<DDSpan> trace) {}
+    static class NoopWriter implements Writer {
+        @Override
+        public void write(List<DDSpan> trace) {}
 
-    @Override
-    public void start() {}
+        @Override
+        public void start() {}
 
-    @Override
-    public boolean flush() {
-      return true;
-    }
+        @Override
+        public boolean flush() {
+            return true;
+        }
 
-    @Override
-    public void close() {}
+        @Override
+        public void close() {}
 
-    @Override
-    public void incrementDropCounts(int spanCount) {}
-  }
+        @Override
+        public void incrementDropCounts(int spanCount) {}
+    }
 
-  @Benchmark
-  public void benchmark(Blackhole blackhole) {
-    blackhole.consume(aggregator.publish(spans));
-  }
+    @Benchmark
+    public void benchmark(Blackhole blackhole) {
+        blackhole.consume(aggregator.publish(spans));
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/HighCardinalityPeerMetricsBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/HighCardinalityPeerMetricsBenchmark.java
index 001a56aabeb..50e1759ac6a 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/HighCardinalityPeerMetricsBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/HighCardinalityPeerMetricsBenchmark.java
@@ -50,59 +50,56 @@
 @Fork(1)
 public class HighCardinalityPeerMetricsBenchmark {
 
-  private ClientStatsAggregator aggregator;
-  private CountingHealthMetrics health;
+    private ClientStatsAggregator aggregator;
+    private CountingHealthMetrics health;
 
-  @State(Scope.Thread)
-  public static class ThreadState {
-    int cursor;
-  }
+    @State(Scope.Thread)
+    public static class ThreadState {
+        int cursor;
+    }
 
-  @Setup
-  public void setup() {
-    this.health = new CountingHealthMetrics();
-    this.aggregator =
-        new ClientStatsAggregator(
-            new WellKnownTags("", "", "", "", "", ""),
-            Collections.emptySet(),
-            AdditionalTagsSchema.EMPTY,
-            new ClientStatsAggregatorBenchmark.FixedAgentFeaturesDiscovery(
-                Collections.singleton("peer.hostname"), Collections.emptySet()),
-            this.health,
-            new ClientStatsAggregatorBenchmark.NullSink(),
-            2048,
-            2048,
-            false);
-    this.aggregator.start();
-  }
+    @Setup
+    public void setup() {
+        this.health = new CountingHealthMetrics();
+        this.aggregator = new ClientStatsAggregator(
+                new WellKnownTags("", "", "", "", "", ""),
+                Collections.emptySet(),
+                AdditionalTagsSchema.EMPTY,
+                new ClientStatsAggregatorBenchmark.FixedAgentFeaturesDiscovery(
+                        Collections.singleton("peer.hostname"), Collections.emptySet()),
+                this.health,
+                new ClientStatsAggregatorBenchmark.NullSink(),
+                2048,
+                2048,
+                false);
+        this.aggregator.start();
+    }
 
-  @TearDown
-  @SuppressForbidden
-  public void tearDown() {
-    aggregator.close();
-    System.err.println(
-        "[HIGH_CARD_PEER] drops over the trial (8 threads, warmup + measurement combined):");
-    System.err.println("  onStatsInboxFull         = " + health.inboxFull.sum());
-    System.err.println("  onStatsAggregateDropped  = " + health.aggregateDropped.sum());
-  }
+    @TearDown
+    @SuppressForbidden
+    public void tearDown() {
+        aggregator.close();
+        System.err.println("[HIGH_CARD_PEER] drops over the trial (8 threads, warmup + measurement combined):");
+        System.err.println("  onStatsInboxFull         = " + health.inboxFull.sum());
+        System.err.println("  onStatsAggregateDropped  = " + health.aggregateDropped.sum());
+    }
 
-  @Benchmark
-  public void publish(ThreadState ts, Blackhole blackhole) {
-    int idx = ts.cursor++;
-    ThreadLocalRandom rng = ThreadLocalRandom.current();
+    @Benchmark
+    public void publish(ThreadState ts, Blackhole blackhole) {
+        int idx = ts.cursor++;
+        ThreadLocalRandom rng = ThreadLocalRandom.current();
 
-    int scrambled = idx * 0x9E3779B1;
-    String hostname = "host-" + ((scrambled >>> 12) & 0x7FFF);
-    boolean error = (idx & 7) == 0;
-    boolean topLevel = (idx & 3) == 0;
-    long durationNanos = 1L + (rng.nextLong() & 0x3FFFFFFFL);
+        int scrambled = idx * 0x9E3779B1;
+        String hostname = "host-" + ((scrambled >>> 12) & 0x7FFF);
+        boolean error = (idx & 7) == 0;
+        boolean topLevel = (idx & 3) == 0;
+        long durationNanos = 1L + (rng.nextLong() & 0x3FFFFFFFL);
 
-    SimpleSpan span =
-        new SimpleSpan("svc", "op", "res", "web", true, topLevel, error, 0, durationNanos, 200);
-    span.setTag(SPAN_KIND, SPAN_KIND_CLIENT);
-    span.setTag("peer.hostname", hostname);
+        SimpleSpan span = new SimpleSpan("svc", "op", "res", "web", true, topLevel, error, 0, durationNanos, 200);
+        span.setTag(SPAN_KIND, SPAN_KIND_CLIENT);
+        span.setTag("peer.hostname", hostname);
 
-    List<CoreSpan<?>> trace = Collections.singletonList(span);
-    blackhole.consume(aggregator.publish(trace));
-  }
+        List<CoreSpan<?>> trace = Collections.singletonList(span);
+        blackhole.consume(aggregator.publish(trace));
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/HighCardinalityResourceMetricsBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/HighCardinalityResourceMetricsBenchmark.java
index e9930eb69e7..c61f58d7171 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/HighCardinalityResourceMetricsBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/HighCardinalityResourceMetricsBenchmark.java
@@ -46,59 +46,56 @@
 @Fork(1)
 public class HighCardinalityResourceMetricsBenchmark {
 
-  private ClientStatsAggregator aggregator;
-  private CountingHealthMetrics health;
+    private ClientStatsAggregator aggregator;
+    private CountingHealthMetrics health;
 
-  @State(Scope.Thread)
-  public static class ThreadState {
-    int cursor;
-  }
+    @State(Scope.Thread)
+    public static class ThreadState {
+        int cursor;
+    }
 
-  @Setup
-  public void setup() {
-    this.health = new CountingHealthMetrics();
-    this.aggregator =
-        new ClientStatsAggregator(
-            new WellKnownTags("", "", "", "", "", ""),
-            Collections.emptySet(),
-            AdditionalTagsSchema.EMPTY,
-            new ClientStatsAggregatorBenchmark.FixedAgentFeaturesDiscovery(
-                Collections.singleton("peer.hostname"), Collections.emptySet()),
-            this.health,
-            new ClientStatsAggregatorBenchmark.NullSink(),
-            2048,
-            2048,
-            false);
-    this.aggregator.start();
-  }
+    @Setup
+    public void setup() {
+        this.health = new CountingHealthMetrics();
+        this.aggregator = new ClientStatsAggregator(
+                new WellKnownTags("", "", "", "", "", ""),
+                Collections.emptySet(),
+                AdditionalTagsSchema.EMPTY,
+                new ClientStatsAggregatorBenchmark.FixedAgentFeaturesDiscovery(
+                        Collections.singleton("peer.hostname"), Collections.emptySet()),
+                this.health,
+                new ClientStatsAggregatorBenchmark.NullSink(),
+                2048,
+                2048,
+                false);
+        this.aggregator.start();
+    }
 
-  @TearDown
-  @SuppressForbidden
-  public void tearDown() {
-    aggregator.close();
-    System.err.println(
-        "[HIGH_CARD_RESOURCE] drops over the trial (8 threads, warmup + measurement combined):");
-    System.err.println("  onStatsInboxFull         = " + health.inboxFull.sum());
-    System.err.println("  onStatsAggregateDropped  = " + health.aggregateDropped.sum());
-  }
+    @TearDown
+    @SuppressForbidden
+    public void tearDown() {
+        aggregator.close();
+        System.err.println("[HIGH_CARD_RESOURCE] drops over the trial (8 threads, warmup + measurement combined):");
+        System.err.println("  onStatsInboxFull         = " + health.inboxFull.sum());
+        System.err.println("  onStatsAggregateDropped  = " + health.aggregateDropped.sum());
+    }
 
-  @Benchmark
-  public void publish(ThreadState ts, Blackhole blackhole) {
-    int idx = ts.cursor++;
-    ThreadLocalRandom rng = ThreadLocalRandom.current();
+    @Benchmark
+    public void publish(ThreadState ts, Blackhole blackhole) {
+        int idx = ts.cursor++;
+        ThreadLocalRandom rng = ThreadLocalRandom.current();
 
-    int scrambled = idx * 0x9E3779B1;
-    String resource = "res-" + ((scrambled ^ 0x5A5A5A) & 0xFFFFF);
-    boolean error = (idx & 7) == 0;
-    boolean topLevel = (idx & 3) == 0;
-    long durationNanos = 1L + (rng.nextLong() & 0x3FFFFFFFL);
+        int scrambled = idx * 0x9E3779B1;
+        String resource = "res-" + ((scrambled ^ 0x5A5A5A) & 0xFFFFF);
+        boolean error = (idx & 7) == 0;
+        boolean topLevel = (idx & 3) == 0;
+        long durationNanos = 1L + (rng.nextLong() & 0x3FFFFFFFL);
 
-    SimpleSpan span =
-        new SimpleSpan("svc", "op", resource, "web", true, topLevel, error, 0, durationNanos, 200);
-    span.setTag(SPAN_KIND, SPAN_KIND_CLIENT);
-    span.setTag("peer.hostname", "localhost");
+        SimpleSpan span = new SimpleSpan("svc", "op", resource, "web", true, topLevel, error, 0, durationNanos, 200);
+        span.setTag(SPAN_KIND, SPAN_KIND_CLIENT);
+        span.setTag("peer.hostname", "localhost");
 
-    List<CoreSpan<?>> trace = Collections.singletonList(span);
-    blackhole.consume(aggregator.publish(trace));
-  }
+        List<CoreSpan<?>> trace = Collections.singletonList(span);
+        blackhole.consume(aggregator.publish(trace));
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/TraceMapperBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/TraceMapperBenchmark.java
index 54192804b05..471cb48a8b3 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/TraceMapperBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/TraceMapperBenchmark.java
@@ -50,166 +50,161 @@
 @SuppressForbidden
 public class TraceMapperBenchmark {
 
-  @Param({"v04", "v04:x-dth", "v05", "v05:x-dth"})
-  String mapperName;
-
-  private TraceMapper mapper;
-  private Writable writable;
-  private CoreTracer tracer;
-  private List<DDSpan> trace;
-
-  @Setup(Level.Trial)
-  public void init(Blackhole blackhole) {
-    PropagationTags propagationTags = null;
-    String[] mapperAndFeatures = mapperName.split(":");
-    switch (mapperAndFeatures[0]) {
-      case "v04":
-        mapper = new TraceMapperV0_4();
-        break;
-      case "v05":
-        mapper = new TraceMapperV0_5();
-        break;
-      default:
-        throw new IllegalArgumentException("Illegal mapper type " + mapperAndFeatures[0] + ".");
+    @Param({"v04", "v04:x-dth", "v05", "v05:x-dth"})
+    String mapperName;
+
+    private TraceMapper mapper;
+    private Writable writable;
+    private CoreTracer tracer;
+    private List<DDSpan> trace;
+
+    @Setup(Level.Trial)
+    public void init(Blackhole blackhole) {
+        PropagationTags propagationTags = null;
+        String[] mapperAndFeatures = mapperName.split(":");
+        switch (mapperAndFeatures[0]) {
+            case "v04":
+                mapper = new TraceMapperV0_4();
+                break;
+            case "v05":
+                mapper = new TraceMapperV0_5();
+                break;
+            default:
+                throw new IllegalArgumentException("Illegal mapper type " + mapperAndFeatures[0] + ".");
+        }
+        for (int i = 1; i < mapperAndFeatures.length; i++) {
+            String feature = mapperAndFeatures[i];
+            switch (feature) {
+                case "x-dth":
+                    propagationTags = PropagationTags.factory()
+                            .fromHeaderValue(
+                                    PropagationTags.HeaderType.DATADOG, "_dd.p.anytag=value,_dd.p.dm=934086a686-4");
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unknown benchmark feature " + feature + ".");
+            }
+        }
+
+        Map<String, Object> tags = new HashMap<>();
+        tags.put(RUNTIME_ID_TAG, "fdd790b3-4aeb-4517-9b84-cafcc0129c48");
+        tags.put(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE);
+        tags.put("env", "prod");
+
+        writable = new MsgPackWriter(new BlackholeBuffer(blackhole));
+
+        tracer = CoreTracer.builder()
+                .strictTraceWrites(true) // Avoid any extra bookkeeping for traces since we write directly
+                .build();
+
+        DDTraceId traceId = DDTraceId.ONE;
+        TraceCollector traceCollector = tracer.createTraceCollector(traceId);
+        DDSpanContext rootContext = new DDSpanContext(
+                traceId,
+                2,
+                DDSpanId.ZERO,
+                null,
+                "service",
+                UTF8BytesString.create("operation"),
+                UTF8BytesString.create("resource"),
+                PrioritySampling.SAMPLER_KEEP,
+                null,
+                Collections.<String, String>emptyMap(),
+                false,
+                UTF8BytesString.create("type"),
+                0,
+                traceCollector,
+                null,
+                null,
+                NoopPathwayContext.INSTANCE,
+                false,
+                propagationTags);
+        DDSpanHelper.setAllTags(rootContext, tags);
+        DDSpan root = DDSpanHelper.create("benchmark", System.currentTimeMillis() * 1000, rootContext);
+        root.setResourceName(UTF8BytesString.create("benchmark"));
+        trace = Lists.newArrayList(root);
+    }
+
+    @Benchmark
+    public void mapTrace() {
+        mapper.map(trace, writable);
+    }
+
+    public static final class BlackholeBuffer implements StreamingBuffer {
+        private final Blackhole blackhole;
+
+        public BlackholeBuffer(Blackhole blackhole) {
+            this.blackhole = blackhole;
+        }
+
+        @Override
+        public int capacity() {
+            return 0;
+        }
+
+        @Override
+        public boolean isDirty() {
+            return false;
+        }
+
+        @Override
+        public void mark() {}
+
+        @Override
+        public boolean flush() {
+            return true;
+        }
+
+        @Override
+        public void put(byte b) {
+            blackhole.consume(b);
+        }
+
+        @Override
+        public void putShort(short s) {
+            blackhole.consume(s);
+        }
+
+        @Override
+        public void putChar(char c) {
+            blackhole.consume(c);
+        }
+
+        @Override
+        public void putInt(int i) {
+            blackhole.consume(i);
+        }
+
+        @Override
+        public void putLong(long l) {
+            blackhole.consume(l);
+        }
+
+        @Override
+        public void putFloat(float f) {
+            blackhole.consume(f);
+        }
+
+        @Override
+        public void putDouble(double d) {
+            blackhole.consume(d);
+        }
+
+        @Override
+        public void put(byte[] bytes) {
+            blackhole.consume(bytes);
+        }
+
+        @Override
+        public void put(byte[] bytes, int offset, int length) {
+            blackhole.consume(bytes);
+        }
+
+        @Override
+        public void put(ByteBuffer buffer) {
+            blackhole.consume(buffer);
+        }
+
+        @Override
+        public void reset() {}
     }
-    for (int i = 1; i < mapperAndFeatures.length; i++) {
-      String feature = mapperAndFeatures[i];
-      switch (feature) {
-        case "x-dth":
-          propagationTags =
-              PropagationTags.factory()
-                  .fromHeaderValue(
-                      PropagationTags.HeaderType.DATADOG,
-                      "_dd.p.anytag=value,_dd.p.dm=934086a686-4");
-          break;
-        default:
-          throw new IllegalArgumentException("Unknown benchmark feature " + feature + ".");
-      }
-    }
-
-    Map<String, Object> tags = new HashMap<>();
-    tags.put(RUNTIME_ID_TAG, "fdd790b3-4aeb-4517-9b84-cafcc0129c48");
-    tags.put(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE);
-    tags.put("env", "prod");
-
-    writable = new MsgPackWriter(new BlackholeBuffer(blackhole));
-
-    tracer =
-        CoreTracer.builder()
-            .strictTraceWrites(
-                true) // Avoid any extra bookkeeping for traces since we write directly
-            .build();
-
-    DDTraceId traceId = DDTraceId.ONE;
-    TraceCollector traceCollector = tracer.createTraceCollector(traceId);
-    DDSpanContext rootContext =
-        new DDSpanContext(
-            traceId,
-            2,
-            DDSpanId.ZERO,
-            null,
-            "service",
-            UTF8BytesString.create("operation"),
-            UTF8BytesString.create("resource"),
-            PrioritySampling.SAMPLER_KEEP,
-            null,
-            Collections.<String, String>emptyMap(),
-            false,
-            UTF8BytesString.create("type"),
-            0,
-            traceCollector,
-            null,
-            null,
-            NoopPathwayContext.INSTANCE,
-            false,
-            propagationTags);
-    DDSpanHelper.setAllTags(rootContext, tags);
-    DDSpan root = DDSpanHelper.create("benchmark", System.currentTimeMillis() * 1000, rootContext);
-    root.setResourceName(UTF8BytesString.create("benchmark"));
-    trace = Lists.newArrayList(root);
-  }
-
-  @Benchmark
-  public void mapTrace() {
-    mapper.map(trace, writable);
-  }
-
-  public static final class BlackholeBuffer implements StreamingBuffer {
-    private final Blackhole blackhole;
-
-    public BlackholeBuffer(Blackhole blackhole) {
-      this.blackhole = blackhole;
-    }
-
-    @Override
-    public int capacity() {
-      return 0;
-    }
-
-    @Override
-    public boolean isDirty() {
-      return false;
-    }
-
-    @Override
-    public void mark() {}
-
-    @Override
-    public boolean flush() {
-      return true;
-    }
-
-    @Override
-    public void put(byte b) {
-      blackhole.consume(b);
-    }
-
-    @Override
-    public void putShort(short s) {
-      blackhole.consume(s);
-    }
-
-    @Override
-    public void putChar(char c) {
-      blackhole.consume(c);
-    }
-
-    @Override
-    public void putInt(int i) {
-      blackhole.consume(i);
-    }
-
-    @Override
-    public void putLong(long l) {
-      blackhole.consume(l);
-    }
-
-    @Override
-    public void putFloat(float f) {
-      blackhole.consume(f);
-    }
-
-    @Override
-    public void putDouble(double d) {
-      blackhole.consume(d);
-    }
-
-    @Override
-    public void put(byte[] bytes) {
-      blackhole.consume(bytes);
-    }
-
-    @Override
-    public void put(byte[] bytes, int offset, int length) {
-      blackhole.consume(bytes);
-    }
-
-    @Override
-    public void put(ByteBuffer buffer) {
-      blackhole.consume(buffer);
-    }
-
-    @Override
-    public void reset() {}
-  }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/Utf8Benchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/Utf8Benchmark.java
index 69631eba694..8e30ab06bea 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/Utf8Benchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/Utf8Benchmark.java
@@ -26,80 +26,80 @@
  */
 @BenchmarkMode(Mode.Throughput)
 public class Utf8Benchmark {
-  @Benchmark
-  public static final String tagUtf8_baseline() {
-    return nextTag();
-  }
+    @Benchmark
+    public static final String tagUtf8_baseline() {
+        return nextTag();
+    }
 
-  @Benchmark
-  public static final byte[] tagUtf8_nocache() {
-    String tag = nextTag();
-    return tag.getBytes(StandardCharsets.UTF_8);
-  }
+    @Benchmark
+    public static final byte[] tagUtf8_nocache() {
+        String tag = nextTag();
+        return tag.getBytes(StandardCharsets.UTF_8);
+    }
 
-  static final SimpleUtf8Cache TAG_CACHE = new SimpleUtf8Cache(128);
+    static final SimpleUtf8Cache TAG_CACHE = new SimpleUtf8Cache(128);
 
-  @Benchmark
-  public static final byte[] tagUtf8_w_cache() {
-    String tag = nextTag();
+    @Benchmark
+    public static final byte[] tagUtf8_w_cache() {
+        String tag = nextTag();
 
-    byte[] cache = TAG_CACHE.getUtf8(tag);
-    if (cache != null) return cache;
+        byte[] cache = TAG_CACHE.getUtf8(tag);
+        if (cache != null) return cache;
 
-    return tag.getBytes(StandardCharsets.UTF_8);
-  }
+        return tag.getBytes(StandardCharsets.UTF_8);
+    }
 
-  @Benchmark
-  public static final void valueUtf8_baseline(Blackhole bh) {
-    for (int i = 0; i < NUM_LOOKUPS; ++i) {
-      String tag = nextTag();
-      String value = nextValue(tag);
+    @Benchmark
+    public static final void valueUtf8_baseline(Blackhole bh) {
+        for (int i = 0; i < NUM_LOOKUPS; ++i) {
+            String tag = nextTag();
+            String value = nextValue(tag);
 
-      bh.consume(tag);
-      bh.consume(value);
+            bh.consume(tag);
+            bh.consume(value);
+        }
     }
-  }
 
-  static final GenerationalUtf8Cache VALUE_CACHE = new GenerationalUtf8Cache(64, 128);
+    static final GenerationalUtf8Cache VALUE_CACHE = new GenerationalUtf8Cache(64, 128);
 
-  @Benchmark
-  public static final void valueUtf8_cache_generational(Blackhole bh) {
-    GenerationalUtf8Cache valueCache = VALUE_CACHE;
-    valueCache.recalibrate(); // single thread drives recalibrate inline, at a transaction boundary
+    @Benchmark
+    public static final void valueUtf8_cache_generational(Blackhole bh) {
+        GenerationalUtf8Cache valueCache = VALUE_CACHE;
+        valueCache.recalibrate(); // single thread drives recalibrate inline, at a transaction boundary
 
-    for (int i = 0; i < NUM_LOOKUPS; ++i) {
-      String tag = nextTag();
-      String value = nextValue(tag);
+        for (int i = 0; i < NUM_LOOKUPS; ++i) {
+            String tag = nextTag();
+            String value = nextValue(tag);
 
-      byte[] lookup = valueCache.getUtf8(value);
-      bh.consume(lookup);
+            byte[] lookup = valueCache.getUtf8(value);
+            bh.consume(lookup);
+        }
     }
-  }
 
-  static final SimpleUtf8Cache SIMPLE_VALUE_CACHE = new SimpleUtf8Cache(128);
+    static final SimpleUtf8Cache SIMPLE_VALUE_CACHE = new SimpleUtf8Cache(128);
 
-  @Benchmark
-  public static final void valueUtf8_cache_simple(Blackhole bh) {
-    SimpleUtf8Cache valueCache = SIMPLE_VALUE_CACHE;
-    valueCache.recalibrate(); // single thread drives recalibrate inline, at a transaction boundary
+    @Benchmark
+    public static final void valueUtf8_cache_simple(Blackhole bh) {
+        SimpleUtf8Cache valueCache = SIMPLE_VALUE_CACHE;
+        valueCache.recalibrate(); // single thread drives recalibrate inline, at a transaction boundary
 
-    for (int i = 0; i < NUM_LOOKUPS; ++i) {
-      String tag = nextTag();
-      String value = nextValue(tag);
+        for (int i = 0; i < NUM_LOOKUPS; ++i) {
+            String tag = nextTag();
+            String value = nextValue(tag);
 
-      byte[] lookup = valueCache.getUtf8(value);
-      bh.consume(lookup);
+            byte[] lookup = valueCache.getUtf8(value);
+            bh.consume(lookup);
+        }
     }
-  }
 
-  @Benchmark
-  public static final void valueUtf8_nocache(Blackhole bh) {
-    for (int i = 0; i < NUM_LOOKUPS; ++i) {
-      String tag = nextTag();
-      String value = nextValue(tag);
+    @Benchmark
+    public static final void valueUtf8_nocache(Blackhole bh) {
+        for (int i = 0; i < NUM_LOOKUPS; ++i) {
+            String tag = nextTag();
+            String value = nextValue(tag);
 
-      bh.consume(tag);
-      bh.consume(value.getBytes(StandardCharsets.UTF_8));
+            bh.consume(tag);
+            bh.consume(value.getBytes(StandardCharsets.UTF_8));
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/Utf8ConcurrentBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/Utf8ConcurrentBenchmark.java
index 51080906bec..c2fc24f0862 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/Utf8ConcurrentBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/Utf8ConcurrentBenchmark.java
@@ -33,40 +33,40 @@
 @BenchmarkMode(Mode.Throughput)
 @State(Scope.Group)
 public class Utf8ConcurrentBenchmark {
-  static final GenerationalUtf8Cache VALUE_CACHE = new GenerationalUtf8Cache(64, 128);
-  static final SimpleUtf8Cache SIMPLE_VALUE_CACHE = new SimpleUtf8Cache(128);
+    static final GenerationalUtf8Cache VALUE_CACHE = new GenerationalUtf8Cache(64, 128);
+    static final SimpleUtf8Cache SIMPLE_VALUE_CACHE = new SimpleUtf8Cache(128);
 
-  @Benchmark
-  @Group("generational")
-  @GroupThreads(7)
-  public void generational_lookup(Blackhole bh) {
-    for (int i = 0; i < NUM_LOOKUPS; ++i) {
-      String tag = nextTag();
-      bh.consume(VALUE_CACHE.getUtf8(nextValue(tag)));
+    @Benchmark
+    @Group("generational")
+    @GroupThreads(7)
+    public void generational_lookup(Blackhole bh) {
+        for (int i = 0; i < NUM_LOOKUPS; ++i) {
+            String tag = nextTag();
+            bh.consume(VALUE_CACHE.getUtf8(nextValue(tag)));
+        }
     }
-  }
 
-  @Benchmark
-  @Group("generational")
-  @GroupThreads(1)
-  public void generational_recalibrate() {
-    VALUE_CACHE.recalibrate();
-  }
+    @Benchmark
+    @Group("generational")
+    @GroupThreads(1)
+    public void generational_recalibrate() {
+        VALUE_CACHE.recalibrate();
+    }
 
-  @Benchmark
-  @Group("simple")
-  @GroupThreads(7)
-  public void simple_lookup(Blackhole bh) {
-    for (int i = 0; i < NUM_LOOKUPS; ++i) {
-      String tag = nextTag();
-      bh.consume(SIMPLE_VALUE_CACHE.getUtf8(nextValue(tag)));
+    @Benchmark
+    @Group("simple")
+    @GroupThreads(7)
+    public void simple_lookup(Blackhole bh) {
+        for (int i = 0; i < NUM_LOOKUPS; ++i) {
+            String tag = nextTag();
+            bh.consume(SIMPLE_VALUE_CACHE.getUtf8(nextValue(tag)));
+        }
     }
-  }
 
-  @Benchmark
-  @Group("simple")
-  @GroupThreads(1)
-  public void simple_recalibrate() {
-    SIMPLE_VALUE_CACHE.recalibrate();
-  }
+    @Benchmark
+    @Group("simple")
+    @GroupThreads(1)
+    public void simple_recalibrate() {
+        SIMPLE_VALUE_CACHE.recalibrate();
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/Utf8Workload.java b/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/Utf8Workload.java
index 80d652c4942..3c3decfdb21 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/Utf8Workload.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/Utf8Workload.java
@@ -11,44 +11,44 @@
  * cardinality, but some ("custom") have effectively infinite cardinality.
  */
 final class Utf8Workload {
-  private Utf8Workload() {}
-
-  static final int NUM_LOOKUPS = 10_000;
-
-  static final String[] TAGS = {
-    "_dd.asm.keep",
-    "ci.provider",
-    "language",
-    "db.statement",
-    "ci.job.url",
-    "ci.pipeline.url",
-    "db.pool",
-    "http.forwarder",
-    "db.warehouse",
-    "custom"
-  };
-
-  // Randomized rather than a shared counter so the concurrent variant stays thread-safe (a shared
-  // ++ index races and can walk off the end of TAGS under multiple threads).
-  static String nextTag() {
-    return TAGS[ThreadLocalRandom.current().nextInt(TAGS.length)];
-  }
-
-  static String nextValue(String tag) {
-    if (tag.equals("custom")) {
-      return nextCustomValue(tag);
-    } else {
-      return nextStandardValue(tag);
+    private Utf8Workload() {}
+
+    static final int NUM_LOOKUPS = 10_000;
+
+    static final String[] TAGS = {
+        "_dd.asm.keep",
+        "ci.provider",
+        "language",
+        "db.statement",
+        "ci.job.url",
+        "ci.pipeline.url",
+        "db.pool",
+        "http.forwarder",
+        "db.warehouse",
+        "custom"
+    };
+
+    // Randomized rather than a shared counter so the concurrent variant stays thread-safe (a shared
+    // ++ index races and can walk off the end of TAGS under multiple threads).
+    static String nextTag() {
+        return TAGS[ThreadLocalRandom.current().nextInt(TAGS.length)];
     }
-  }
 
-  /** High cardinality - thousands of distinct values per tag, many one-time values. */
-  static String nextCustomValue(String tag) {
-    return tag + ThreadLocalRandom.current().nextInt();
-  }
+    static String nextValue(String tag) {
+        if (tag.equals("custom")) {
+            return nextCustomValue(tag);
+        } else {
+            return nextStandardValue(tag);
+        }
+    }
+
+    /** High cardinality - thousands of distinct values per tag, many one-time values. */
+    static String nextCustomValue(String tag) {
+        return tag + ThreadLocalRandom.current().nextInt();
+    }
 
-  /** Moderate cardinality - tens of distinct values per tag. */
-  static String nextStandardValue(String tag) {
-    return tag + ThreadLocalRandom.current().nextInt(20);
-  }
+    /** Moderate cardinality - tens of distinct values per tag. */
+    static String nextStandardValue(String tag) {
+        return tag + ThreadLocalRandom.current().nextInt(20);
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/BlackholeBuffer.java b/dd-trace-core/src/jmh/java/datadog/trace/core/BlackholeBuffer.java
index 1539c136129..3d7c195577e 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/BlackholeBuffer.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/BlackholeBuffer.java
@@ -6,80 +6,80 @@
 
 public class BlackholeBuffer implements StreamingBuffer {
 
-  private final Blackhole blackhole;
-
-  public BlackholeBuffer(Blackhole blackhole) {
-    this.blackhole = blackhole;
-  }
-
-  @Override
-  public int capacity() {
-    return 0;
-  }
-
-  @Override
-  public boolean isDirty() {
-    return false;
-  }
-
-  @Override
-  public void mark() {}
-
-  @Override
-  public boolean flush() {
-    return true;
-  }
-
-  @Override
-  public void put(byte b) {
-    this.blackhole.consume(b);
-  }
-
-  @Override
-  public void putShort(short s) {
-    this.blackhole.consume(s);
-  }
-
-  @Override
-  public void putChar(char c) {
-    this.blackhole.consume(c);
-  }
-
-  @Override
-  public void putInt(int i) {
-    this.blackhole.consume(i);
-  }
-
-  @Override
-  public void putLong(long l) {
-    this.blackhole.consume(l);
-  }
-
-  @Override
-  public void putFloat(float f) {
-    this.blackhole.consume(f);
-  }
-
-  @Override
-  public void putDouble(double d) {
-    this.blackhole.consume(d);
-  }
-
-  @Override
-  public void put(byte[] bytes) {
-    this.blackhole.consume(bytes);
-  }
-
-  @Override
-  public void put(byte[] bytes, int offset, int length) {
-    this.blackhole.consume(bytes);
-  }
-
-  @Override
-  public void put(ByteBuffer buffer) {
-    this.blackhole.consume(buffer);
-  }
-
-  @Override
-  public void reset() {}
+    private final Blackhole blackhole;
+
+    public BlackholeBuffer(Blackhole blackhole) {
+        this.blackhole = blackhole;
+    }
+
+    @Override
+    public int capacity() {
+        return 0;
+    }
+
+    @Override
+    public boolean isDirty() {
+        return false;
+    }
+
+    @Override
+    public void mark() {}
+
+    @Override
+    public boolean flush() {
+        return true;
+    }
+
+    @Override
+    public void put(byte b) {
+        this.blackhole.consume(b);
+    }
+
+    @Override
+    public void putShort(short s) {
+        this.blackhole.consume(s);
+    }
+
+    @Override
+    public void putChar(char c) {
+        this.blackhole.consume(c);
+    }
+
+    @Override
+    public void putInt(int i) {
+        this.blackhole.consume(i);
+    }
+
+    @Override
+    public void putLong(long l) {
+        this.blackhole.consume(l);
+    }
+
+    @Override
+    public void putFloat(float f) {
+        this.blackhole.consume(f);
+    }
+
+    @Override
+    public void putDouble(double d) {
+        this.blackhole.consume(d);
+    }
+
+    @Override
+    public void put(byte[] bytes) {
+        this.blackhole.consume(bytes);
+    }
+
+    @Override
+    public void put(byte[] bytes, int offset, int length) {
+        this.blackhole.consume(bytes);
+    }
+
+    @Override
+    public void put(ByteBuffer buffer) {
+        this.blackhole.consume(buffer);
+    }
+
+    @Override
+    public void reset() {}
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/BlackholeWriter.java b/dd-trace-core/src/jmh/java/datadog/trace/core/BlackholeWriter.java
index ead942ab0f3..3dab14a4dcb 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/BlackholeWriter.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/BlackholeWriter.java
@@ -6,37 +6,37 @@
 
 public class BlackholeWriter implements Writer {
 
-  private final Blackhole blackhole;
-  private final TraceCounters counters;
-  private final int tokens;
-
-  public BlackholeWriter(Blackhole blackhole, TraceCounters counters, int tokens) {
-    this.blackhole = blackhole;
-    this.counters = counters;
-    this.tokens = tokens;
-  }
-
-  @Override
-  public void write(List<DDSpan> trace) {
-    Blackhole.consumeCPU(tokens);
-    blackhole.consume(trace);
-    counters.traces++;
-    counters.spans += trace.size();
-  }
-
-  @Override
-  public void start() {}
-
-  @Override
-  public boolean flush() {
-    return true;
-  }
-
-  @Override
-  public void close() {}
-
-  @Override
-  public void incrementDropCounts(int spanCount) {
-    counters.drops++;
-  }
+    private final Blackhole blackhole;
+    private final TraceCounters counters;
+    private final int tokens;
+
+    public BlackholeWriter(Blackhole blackhole, TraceCounters counters, int tokens) {
+        this.blackhole = blackhole;
+        this.counters = counters;
+        this.tokens = tokens;
+    }
+
+    @Override
+    public void write(List<DDSpan> trace) {
+        Blackhole.consumeCPU(tokens);
+        blackhole.consume(trace);
+        counters.traces++;
+        counters.spans += trace.size();
+    }
+
+    @Override
+    public void start() {}
+
+    @Override
+    public boolean flush() {
+        return true;
+    }
+
+    @Override
+    public void close() {}
+
+    @Override
+    public void incrementDropCounts(int spanCount) {
+        counters.drops++;
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/CoreTracerBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/core/CoreTracerBenchmark.java
index d719264e2c3..909933b9a4d 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/CoreTracerBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/CoreTracerBenchmark.java
@@ -30,20 +30,20 @@
 @OutputTimeUnit(MICROSECONDS)
 @Fork(value = 1)
 public class CoreTracerBenchmark {
-  static final CoreTracer TRACER = CoreTracer.builder().build();
+    static final CoreTracer TRACER = CoreTracer.builder().build();
 
-  @Benchmark
-  public AgentSpan startSpan() {
-    return TRACER.startSpan("foo", "bar");
-  }
+    @Benchmark
+    public AgentSpan startSpan() {
+        return TRACER.startSpan("foo", "bar");
+    }
 
-  @Benchmark
-  public AgentSpan buildSpan() {
-    return TRACER.buildSpan("foo", "bar").start();
-  }
+    @Benchmark
+    public AgentSpan buildSpan() {
+        return TRACER.buildSpan("foo", "bar").start();
+    }
 
-  @Benchmark
-  public AgentSpan singleSpanBuilder() {
-    return TRACER.singleSpanBuilder("foo", "bar").start();
-  }
+    @Benchmark
+    public AgentSpan singleSpanBuilder() {
+        return TRACER.singleSpanBuilder("foo", "bar").start();
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/CoreTracerClassloaderNamingBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/core/CoreTracerClassloaderNamingBenchmark.java
index cc68ddf847f..250fc1f43e0 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/CoreTracerClassloaderNamingBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/CoreTracerClassloaderNamingBenchmark.java
@@ -31,32 +31,31 @@
  * CoreTracerClassloaderNamingBenchmark.benchSpanCreation true avgt 3 0.695 ± 0.106 us/op
  */
 public class CoreTracerClassloaderNamingBenchmark {
-  CoreTracer tracer;
+    CoreTracer tracer;
 
-  WeakHashMap<ClassLoader, String> weakCache;
+    WeakHashMap<ClassLoader, String> weakCache;
 
-  @Param({"false", "true"})
-  boolean simulateOverhead;
+    @Param({"false", "true"})
+    boolean simulateOverhead;
 
-  @Setup(Level.Iteration)
-  public void init(Blackhole blackhole) {
-    tracer =
-        CoreTracer.builder()
-            .writer(new BlackholeWriter(blackhole, new TraceCounters(), 0))
-            .strictTraceWrites(false)
-            .build();
-    weakCache = new WeakHashMap<>();
-    weakCache.put(Thread.currentThread().getContextClassLoader(), "test");
-  }
+    @Setup(Level.Iteration)
+    public void init(Blackhole blackhole) {
+        tracer = CoreTracer.builder()
+                .writer(new BlackholeWriter(blackhole, new TraceCounters(), 0))
+                .strictTraceWrites(false)
+                .build();
+        weakCache = new WeakHashMap<>();
+        weakCache.put(Thread.currentThread().getContextClassLoader(), "test");
+    }
 
-  @Benchmark
-  public void benchSpanCreation(Blackhole blackhole) {
-    final AgentSpan span = tracer.startSpan("", "");
-    if (simulateOverhead) {
-      // simulates an extra getContextClassLoader + a WeakHashMap.get
-      weakCache.get(Thread.currentThread().getContextClassLoader());
+    @Benchmark
+    public void benchSpanCreation(Blackhole blackhole) {
+        final AgentSpan span = tracer.startSpan("", "");
+        if (simulateOverhead) {
+            // simulates an extra getContextClassLoader + a WeakHashMap.get
+            weakCache.get(Thread.currentThread().getContextClassLoader());
+        }
+        span.finish();
+        blackhole.consume(span);
     }
-    span.finish();
-    blackhole.consume(span);
-  }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/DDSpanHelper.java b/dd-trace-core/src/jmh/java/datadog/trace/core/DDSpanHelper.java
index 6f8d612159a..a5a8da82c1d 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/DDSpanHelper.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/DDSpanHelper.java
@@ -4,14 +4,12 @@
 import javax.annotation.Nonnull;
 
 public interface DDSpanHelper {
-  static DDSpan create(
-      @Nonnull String instrumentationName,
-      final long timestampMicro,
-      @Nonnull DDSpanContext context) {
-    return DDSpan.create(instrumentationName, timestampMicro, context, null);
-  }
+    static DDSpan create(
+            @Nonnull String instrumentationName, final long timestampMicro, @Nonnull DDSpanContext context) {
+        return DDSpan.create(instrumentationName, timestampMicro, context, null);
+    }
 
-  static void setAllTags(@Nonnull DDSpanContext context, Map<String, ?> map) {
-    context.setAllTags(map);
-  }
+    static void setAllTags(@Nonnull DDSpanContext context, Map<String, ?> map) {
+        context.setAllTags(map);
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/DropWriter.java b/dd-trace-core/src/jmh/java/datadog/trace/core/DropWriter.java
index 6e375ee828b..b2d7b91e0ce 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/DropWriter.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/DropWriter.java
@@ -15,28 +15,28 @@
  * v1.53→master.
  */
 final class DropWriter implements Writer {
-  private final Blackhole blackhole;
+    private final Blackhole blackhole;
 
-  DropWriter(Blackhole blackhole) {
-    this.blackhole = blackhole;
-  }
+    DropWriter(Blackhole blackhole) {
+        this.blackhole = blackhole;
+    }
 
-  @Override
-  public void write(List<DDSpan> trace) {
-    blackhole.consume(trace);
-  }
+    @Override
+    public void write(List<DDSpan> trace) {
+        blackhole.consume(trace);
+    }
 
-  @Override
-  public void start() {}
+    @Override
+    public void start() {}
 
-  @Override
-  public boolean flush() {
-    return true;
-  }
+    @Override
+    public boolean flush() {
+        return true;
+    }
 
-  @Override
-  public void close() {}
+    @Override
+    public void close() {}
 
-  @Override
-  public void incrementDropCounts(int spanCount) {}
+    @Override
+    public void incrementDropCounts(int spanCount) {}
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/IsOutboundBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/core/IsOutboundBenchmark.java
index 1200dea6387..9209427bea9 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/IsOutboundBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/IsOutboundBenchmark.java
@@ -25,45 +25,45 @@
 @Fork(value = 1)
 public class IsOutboundBenchmark {
 
-  static final CoreTracer TRACER = CoreTracer.builder().build();
+    static final CoreTracer TRACER = CoreTracer.builder().build();
 
-  private DDSpan clientSpan;
-  private DDSpan serverSpan;
-  private DDSpan unsetSpan;
+    private DDSpan clientSpan;
+    private DDSpan serverSpan;
+    private DDSpan unsetSpan;
 
-  @Setup
-  public void setup() {
-    clientSpan = (DDSpan) TRACER.startSpan("benchmark", "client.op");
-    clientSpan.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_CLIENT);
+    @Setup
+    public void setup() {
+        clientSpan = (DDSpan) TRACER.startSpan("benchmark", "client.op");
+        clientSpan.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_CLIENT);
 
-    serverSpan = (DDSpan) TRACER.startSpan("benchmark", "server.op");
-    serverSpan.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER);
+        serverSpan = (DDSpan) TRACER.startSpan("benchmark", "server.op");
+        serverSpan.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER);
 
-    unsetSpan = (DDSpan) TRACER.startSpan("benchmark", "unset.op");
-  }
+        unsetSpan = (DDSpan) TRACER.startSpan("benchmark", "unset.op");
+    }
 
-  @Benchmark
-  public boolean isOutbound_client() {
-    return clientSpan.isOutbound();
-  }
+    @Benchmark
+    public boolean isOutbound_client() {
+        return clientSpan.isOutbound();
+    }
 
-  @Benchmark
-  public boolean isOutbound_server() {
-    return serverSpan.isOutbound();
-  }
+    @Benchmark
+    public boolean isOutbound_server() {
+        return serverSpan.isOutbound();
+    }
 
-  @Benchmark
-  public boolean isOutbound_unset() {
-    return unsetSpan.isOutbound();
-  }
+    @Benchmark
+    public boolean isOutbound_unset() {
+        return unsetSpan.isOutbound();
+    }
 
-  @Benchmark
-  public Object getTag_spanKind_client() {
-    return clientSpan.getTag(Tags.SPAN_KIND);
-  }
+    @Benchmark
+    public Object getTag_spanKind_client() {
+        return clientSpan.getTag(Tags.SPAN_KIND);
+    }
 
-  @Benchmark
-  public Object getTag_spanKind_unset() {
-    return unsetSpan.getTag(Tags.SPAN_KIND);
-  }
+    @Benchmark
+    public Object getTag_spanKind_unset() {
+        return unsetSpan.getTag(Tags.SPAN_KIND);
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/PendingTraceWrite.java b/dd-trace-core/src/jmh/java/datadog/trace/core/PendingTraceWrite.java
index b0a90c7bffb..1a38f9dc906 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/PendingTraceWrite.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/PendingTraceWrite.java
@@ -17,89 +17,86 @@
 @State(Scope.Benchmark)
 public class PendingTraceWrite {
 
-  CoreTracer tracer;
-  TraceCollector traceCollector;
+    CoreTracer tracer;
+    TraceCollector traceCollector;
 
-  @Param({"10", "100"})
-  int depthPerThread;
+    @Param({"10", "100"})
+    int depthPerThread;
 
-  @Param({"0", "5", "10"})
-  int tokens;
+    @Param({"0", "5", "10"})
+    int tokens;
 
-  private DDSpan root;
-  private DDSpan span;
+    private DDSpan root;
+    private DDSpan span;
 
-  @Setup(Level.Trial)
-  public void init(TraceCounters counters, Blackhole blackhole) {
-    tracer =
-        CoreTracer.builder()
-            .writer(new BlackholeWriter(blackhole, counters, tokens))
-            .strictTraceWrites(false)
-            .build();
-    DDTraceId traceId = DDTraceId.ONE;
-    traceCollector = tracer.createTraceCollector(traceId);
-    root =
-        DDSpan.create(
-            "benchmark",
-            System.currentTimeMillis() * 1000,
-            new DDSpanContext(
-                traceId,
-                2,
-                DDSpanId.ZERO,
-                null,
-                "service",
-                "operation",
-                "resource",
-                PrioritySampling.SAMPLER_KEEP,
-                null,
-                Collections.<String, String>emptyMap(),
-                false,
-                "type",
-                0,
-                traceCollector,
-                null,
-                null,
-                NoopPathwayContext.INSTANCE,
-                false,
-                null),
-            null);
-    span =
-        DDSpan.create(
-            "benchmark",
-            System.currentTimeMillis() * 1000,
-            new DDSpanContext(
-                traceId,
-                3,
-                2,
-                null,
-                "service",
-                "operation",
-                "resource",
-                PrioritySampling.SAMPLER_KEEP,
-                null,
-                Collections.<String, String>emptyMap(),
-                false,
-                "type",
-                0,
-                traceCollector,
-                null,
-                null,
-                NoopPathwayContext.INSTANCE,
-                false,
-                null),
-            null);
-  }
-
-  @Threads(4)
-  @Benchmark
-  public void writeTraces() {
-    traceCollector.registerSpan(root);
-    for (int i = 0; i < depthPerThread; ++i) {
-      traceCollector.registerSpan(span);
+    @Setup(Level.Trial)
+    public void init(TraceCounters counters, Blackhole blackhole) {
+        tracer = CoreTracer.builder()
+                .writer(new BlackholeWriter(blackhole, counters, tokens))
+                .strictTraceWrites(false)
+                .build();
+        DDTraceId traceId = DDTraceId.ONE;
+        traceCollector = tracer.createTraceCollector(traceId);
+        root = DDSpan.create(
+                "benchmark",
+                System.currentTimeMillis() * 1000,
+                new DDSpanContext(
+                        traceId,
+                        2,
+                        DDSpanId.ZERO,
+                        null,
+                        "service",
+                        "operation",
+                        "resource",
+                        PrioritySampling.SAMPLER_KEEP,
+                        null,
+                        Collections.<String, String>emptyMap(),
+                        false,
+                        "type",
+                        0,
+                        traceCollector,
+                        null,
+                        null,
+                        NoopPathwayContext.INSTANCE,
+                        false,
+                        null),
+                null);
+        span = DDSpan.create(
+                "benchmark",
+                System.currentTimeMillis() * 1000,
+                new DDSpanContext(
+                        traceId,
+                        3,
+                        2,
+                        null,
+                        "service",
+                        "operation",
+                        "resource",
+                        PrioritySampling.SAMPLER_KEEP,
+                        null,
+                        Collections.<String, String>emptyMap(),
+                        false,
+                        "type",
+                        0,
+                        traceCollector,
+                        null,
+                        null,
+                        NoopPathwayContext.INSTANCE,
+                        false,
+                        null),
+                null);
     }
-    for (int i = 0; i < depthPerThread; ++i) {
-      traceCollector.onPublish(span);
+
+    @Threads(4)
+    @Benchmark
+    public void writeTraces() {
+        traceCollector.registerSpan(root);
+        for (int i = 0; i < depthPerThread; ++i) {
+            traceCollector.registerSpan(span);
+        }
+        for (int i = 0; i < depthPerThread; ++i) {
+            traceCollector.onPublish(span);
+        }
+        traceCollector.onPublish(root);
     }
-    traceCollector.onPublish(root);
-  }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/ScopeLifecycleBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/core/ScopeLifecycleBenchmark.java
index 0c3186e71ac..d4e4122e2f5 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/ScopeLifecycleBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/ScopeLifecycleBenchmark.java
@@ -26,53 +26,53 @@
 @OutputTimeUnit(MICROSECONDS)
 @Fork(value = 1)
 public class ScopeLifecycleBenchmark {
-  static final CoreTracer TRACER = CoreTracer.builder().build();
+    static final CoreTracer TRACER = CoreTracer.builder().build();
 
-  @State(Scope.Thread)
-  public static class ThreadState {
-    AgentSpan span;
-    AgentSpan childSpan;
-    ContextScope activeScope;
+    @State(Scope.Thread)
+    public static class ThreadState {
+        AgentSpan span;
+        AgentSpan childSpan;
+        ContextScope activeScope;
 
-    @Setup(Level.Iteration)
-    public void setup() {
-      span = TRACER.startSpan("benchmark", "parent");
-      childSpan = TRACER.startSpan("benchmark", "child");
-      activeScope = TRACER.activateSpan(span);
-    }
+        @Setup(Level.Iteration)
+        public void setup() {
+            span = TRACER.startSpan("benchmark", "parent");
+            childSpan = TRACER.startSpan("benchmark", "child");
+            activeScope = TRACER.activateSpan(span);
+        }
 
-    @TearDown(Level.Iteration)
-    public void tearDown() {
-      activeScope.close();
-      childSpan.finish();
-      span.finish();
+        @TearDown(Level.Iteration)
+        public void tearDown() {
+            activeScope.close();
+            childSpan.finish();
+            span.finish();
+        }
     }
-  }
 
-  @Benchmark
-  public void activateAndClose(ThreadState state) {
-    ContextScope scope = TRACER.activateSpan(state.span);
-    scope.close();
-  }
+    @Benchmark
+    public void activateAndClose(ThreadState state) {
+        ContextScope scope = TRACER.activateSpan(state.span);
+        scope.close();
+    }
 
-  @Benchmark
-  public void activateSameSpan(ThreadState state) {
-    ContextScope outer = TRACER.activateSpan(state.span);
-    ContextScope inner = TRACER.activateSpan(state.span);
-    inner.close();
-    outer.close();
-  }
+    @Benchmark
+    public void activateSameSpan(ThreadState state) {
+        ContextScope outer = TRACER.activateSpan(state.span);
+        ContextScope inner = TRACER.activateSpan(state.span);
+        inner.close();
+        outer.close();
+    }
 
-  @Benchmark
-  public void nestedActivateAndClose(ThreadState state) {
-    ContextScope parentScope = TRACER.activateSpan(state.span);
-    ContextScope childScope = TRACER.activateSpan(state.childSpan);
-    childScope.close();
-    parentScope.close();
-  }
+    @Benchmark
+    public void nestedActivateAndClose(ThreadState state) {
+        ContextScope parentScope = TRACER.activateSpan(state.span);
+        ContextScope childScope = TRACER.activateSpan(state.childSpan);
+        childScope.close();
+        parentScope.close();
+    }
 
-  @Benchmark
-  public AgentSpan activeSpanLookup() {
-    return TRACER.activeSpan();
-  }
+    @Benchmark
+    public AgentSpan activeSpanLookup() {
+        return TRACER.activeSpan();
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/SpanCreationBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/core/SpanCreationBenchmark.java
index c2bcd4a1cfb..5d944610510 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/SpanCreationBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/SpanCreationBenchmark.java
@@ -104,202 +104,201 @@
 @OutputTimeUnit(MICROSECONDS)
 @Fork(value = 3, jvmArgsAppend = "-DTEST_LOG_LEVEL=warn")
 public class SpanCreationBenchmark {
-  private static final String INSTRUMENTATION_NAME = "bench";
-  private static final String SERVER_OPERATION_NAME = "servlet.request";
-  // The DB-shaped span gets its own operation name -- a real jdbc span is never "servlet.request",
-  // and keeping the two shapes distinct by operation avoids conflating them.
-  private static final String JDBC_OPERATION_NAME = "database.query";
+    private static final String INSTRUMENTATION_NAME = "bench";
+    private static final String SERVER_OPERATION_NAME = "servlet.request";
+    // The DB-shaped span gets its own operation name -- a real jdbc span is never "servlet.request",
+    // and keeping the two shapes distinct by operation avoids conflating them.
+    private static final String JDBC_OPERATION_NAME = "database.query";
 
-  // int tag values are deliberately kept inside Integer's built-in cache (-128..127) so valueOf
-  // returns a shared box and boxing does not allocate — the bench then measures tag storage / path
-  // cost, not incidental boxing (which differs between setTag(int) and the builder's
-  // withTag(Number)).
+    // int tag values are deliberately kept inside Integer's built-in cache (-128..127) so valueOf
+    // returns a shared box and boxing does not allocate — the bench then measures tag storage / path
+    // cost, not incidental boxing (which differs between setTag(int) and the builder's
+    // withTag(Number)).
 
-  // Web-server-shaped known tags — the profile the dense store / SpanPrototype target.
-  private static final String COMPONENT_VALUE = "tomcat-server";
-  private static final String HTTP_METHOD_VALUE = "GET";
-  private static final String HTTP_ROUTE_VALUE = "/owners/{ownerId}";
-  private static final String HTTP_URL_VALUE = "http://localhost:8080/owners/42";
-  private static final int HTTP_STATUS_VALUE = 100; // in-cache; value itself is immaterial here
-  private static final int PEER_PORT_VALUE = 80;
+    // Web-server-shaped known tags — the profile the dense store / SpanPrototype target.
+    private static final String COMPONENT_VALUE = "tomcat-server";
+    private static final String HTTP_METHOD_VALUE = "GET";
+    private static final String HTTP_ROUTE_VALUE = "/owners/{ownerId}";
+    private static final String HTTP_URL_VALUE = "http://localhost:8080/owners/42";
+    private static final int HTTP_STATUS_VALUE = 100; // in-cache; value itself is immaterial here
+    private static final int PEER_PORT_VALUE = 80;
 
-  // JDBC/DB-client-shaped known tags — a higher-tag-count shape (9 vs the web shape's 7), matching
-  // what DatabaseClientDecorator + JDBCDecorator set on a statement span.
-  private static final String DB_COMPONENT_VALUE = "java-jdbc-statement";
-  private static final String DB_TYPE_VALUE = "postgresql";
-  private static final String DB_INSTANCE_VALUE = "petclinic";
-  private static final String DB_USER_VALUE = "app";
-  private static final String DB_OPERATION_VALUE = "SELECT";
-  private static final String DB_STATEMENT_VALUE = "SELECT * FROM owners WHERE id = ?";
-  private static final String DB_PEER_HOSTNAME_VALUE = "db.internal";
-  private static final int DB_PEER_PORT_VALUE = 90; // in-cache; value itself is immaterial here
+    // JDBC/DB-client-shaped known tags — a higher-tag-count shape (9 vs the web shape's 7), matching
+    // what DatabaseClientDecorator + JDBCDecorator set on a statement span.
+    private static final String DB_COMPONENT_VALUE = "java-jdbc-statement";
+    private static final String DB_TYPE_VALUE = "postgresql";
+    private static final String DB_INSTANCE_VALUE = "petclinic";
+    private static final String DB_USER_VALUE = "app";
+    private static final String DB_OPERATION_VALUE = "SELECT";
+    private static final String DB_STATEMENT_VALUE = "SELECT * FROM owners WHERE id = ?";
+    private static final String DB_PEER_HOSTNAME_VALUE = "db.internal";
+    private static final int DB_PEER_PORT_VALUE = 90; // in-cache; value itself is immaterial here
 
-  CoreTracer tracer;
+    CoreTracer tracer;
 
-  // Baked-once prototypes carrying only the type-constant subset each baseline sets individually
-  // (component + span.kind; jdbc also db.type). The dynamic tags are set per-span in both arms, so
-  // the *ViaPrototype vs *Span delta isolates the construction-path seeding of just those
-  // constants.
-  SpanPrototype webProto;
-  SpanPrototype jdbcProto;
+    // Baked-once prototypes carrying only the type-constant subset each baseline sets individually
+    // (component + span.kind; jdbc also db.type). The dynamic tags are set per-span in both arms, so
+    // the *ViaPrototype vs *Span delta isolates the construction-path seeding of just those
+    // constants.
+    SpanPrototype webProto;
+    SpanPrototype jdbcProto;
 
-  @Setup
-  public void setup(Blackhole blackhole) {
-    // DropWriter keeps finish() from pulling in serialization / agent I/O, so -prof gc reflects
-    // span creation + tagging + PendingTrace completion only.
-    this.tracer = CoreTracer.builder().writer(new DropWriter(blackhole)).build();
-    this.webProto =
-        SpanPrototype.builder()
-            .initInstrumentationName(INSTRUMENTATION_NAME)
-            .initOperationName(SERVER_OPERATION_NAME)
-            .initComponentOnly(COMPONENT_VALUE)
-            .initKind(Tags.SPAN_KIND_SERVER)
-            .build();
-    this.jdbcProto =
-        SpanPrototype.builder()
-            .initInstrumentationName(INSTRUMENTATION_NAME)
-            .initOperationName(JDBC_OPERATION_NAME)
-            .initComponentOnly(DB_COMPONENT_VALUE)
-            .initKind(Tags.SPAN_KIND_CLIENT)
-            .initTag(Tags.DB_TYPE, DB_TYPE_VALUE)
-            .build();
-  }
+    @Setup
+    public void setup(Blackhole blackhole) {
+        // DropWriter keeps finish() from pulling in serialization / agent I/O, so -prof gc reflects
+        // span creation + tagging + PendingTrace completion only.
+        this.tracer = CoreTracer.builder().writer(new DropWriter(blackhole)).build();
+        this.webProto = SpanPrototype.builder()
+                .initInstrumentationName(INSTRUMENTATION_NAME)
+                .initOperationName(SERVER_OPERATION_NAME)
+                .initComponentOnly(COMPONENT_VALUE)
+                .initKind(Tags.SPAN_KIND_SERVER)
+                .build();
+        this.jdbcProto = SpanPrototype.builder()
+                .initInstrumentationName(INSTRUMENTATION_NAME)
+                .initOperationName(JDBC_OPERATION_NAME)
+                .initComponentOnly(DB_COMPONENT_VALUE)
+                .initKind(Tags.SPAN_KIND_CLIENT)
+                .initTag(Tags.DB_TYPE, DB_TYPE_VALUE)
+                .build();
+    }
 
-  @TearDown
-  public void tearDown() {
-    this.tracer.close();
-  }
+    @TearDown
+    public void tearDown() {
+        this.tracer.close();
+    }
 
-  /** Baseline: create + finish a bare span via startSpan, no tags. */
-  @Benchmark
-  public void bareStartSpan() {
-    AgentSpan span = tracer.startSpan(INSTRUMENTATION_NAME, SERVER_OPERATION_NAME);
-    span.finish();
-  }
+    /** Baseline: create + finish a bare span via startSpan, no tags. */
+    @Benchmark
+    public void bareStartSpan() {
+        AgentSpan span = tracer.startSpan(INSTRUMENTATION_NAME, SERVER_OPERATION_NAME);
+        span.finish();
+    }
 
-  /** Baseline: create + finish a bare span via the builder path, no tags. */
-  @Benchmark
-  public void bareBuildSpan() {
-    AgentSpan span = tracer.buildSpan(INSTRUMENTATION_NAME, SERVER_OPERATION_NAME).start();
-    span.finish();
-  }
+    /** Baseline: create + finish a bare span via the builder path, no tags. */
+    @Benchmark
+    public void bareBuildSpan() {
+        AgentSpan span =
+                tracer.buildSpan(INSTRUMENTATION_NAME, SERVER_OPERATION_NAME).start();
+        span.finish();
+    }
 
-  /** Web-server-shaped span: create -> set the typical known tags -> finish. */
-  @Benchmark
-  public void webServerSpan() {
-    AgentSpan span = tracer.buildSpan(INSTRUMENTATION_NAME, SERVER_OPERATION_NAME).start();
-    span.setTag(Tags.COMPONENT, COMPONENT_VALUE);
-    span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER);
-    span.setTag(Tags.HTTP_METHOD, HTTP_METHOD_VALUE);
-    span.setTag(Tags.HTTP_ROUTE, HTTP_ROUTE_VALUE);
-    span.setTag(Tags.HTTP_URL, HTTP_URL_VALUE);
-    span.setTag(Tags.HTTP_STATUS, HTTP_STATUS_VALUE);
-    span.setTag(Tags.PEER_PORT, PEER_PORT_VALUE);
-    span.finish();
-  }
+    /** Web-server-shaped span: create -> set the typical known tags -> finish. */
+    @Benchmark
+    public void webServerSpan() {
+        AgentSpan span =
+                tracer.buildSpan(INSTRUMENTATION_NAME, SERVER_OPERATION_NAME).start();
+        span.setTag(Tags.COMPONENT, COMPONENT_VALUE);
+        span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER);
+        span.setTag(Tags.HTTP_METHOD, HTTP_METHOD_VALUE);
+        span.setTag(Tags.HTTP_ROUTE, HTTP_ROUTE_VALUE);
+        span.setTag(Tags.HTTP_URL, HTTP_URL_VALUE);
+        span.setTag(Tags.HTTP_STATUS, HTTP_STATUS_VALUE);
+        span.setTag(Tags.PEER_PORT, PEER_PORT_VALUE);
+        span.finish();
+    }
 
-  /**
-   * Web-server-shaped span via the <b>builder tag path</b>: tags accumulated on the builder with
-   * {@code withTag} and applied at {@code start()}, rather than set on the span afterward. This is
-   * the shape the OTel bridge takes (OTel {@code SpanBuilder.setAttribute} → dd builder), still
-   * live today for manual OTel and OTel-bridge auto-instrumentation. Compare against {@link
-   * #webServerSpan} (same tags, set after start) to track how the startSpan/buildSpan paths diverge
-   * across releases.
-   */
-  @Benchmark
-  public void webServerSpanViaBuilder() {
-    AgentSpan span =
-        tracer
-            .buildSpan(INSTRUMENTATION_NAME, SERVER_OPERATION_NAME)
-            .withTag(Tags.COMPONENT, COMPONENT_VALUE)
-            .withTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER)
-            .withTag(Tags.HTTP_METHOD, HTTP_METHOD_VALUE)
-            .withTag(Tags.HTTP_ROUTE, HTTP_ROUTE_VALUE)
-            .withTag(Tags.HTTP_URL, HTTP_URL_VALUE)
-            .withTag(Tags.HTTP_STATUS, HTTP_STATUS_VALUE)
-            .withTag(Tags.PEER_PORT, PEER_PORT_VALUE)
-            .start();
-    span.finish();
-  }
+    /**
+     * Web-server-shaped span via the <b>builder tag path</b>: tags accumulated on the builder with
+     * {@code withTag} and applied at {@code start()}, rather than set on the span afterward. This is
+     * the shape the OTel bridge takes (OTel {@code SpanBuilder.setAttribute} → dd builder), still
+     * live today for manual OTel and OTel-bridge auto-instrumentation. Compare against {@link
+     * #webServerSpan} (same tags, set after start) to track how the startSpan/buildSpan paths diverge
+     * across releases.
+     */
+    @Benchmark
+    public void webServerSpanViaBuilder() {
+        AgentSpan span = tracer.buildSpan(INSTRUMENTATION_NAME, SERVER_OPERATION_NAME)
+                .withTag(Tags.COMPONENT, COMPONENT_VALUE)
+                .withTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER)
+                .withTag(Tags.HTTP_METHOD, HTTP_METHOD_VALUE)
+                .withTag(Tags.HTTP_ROUTE, HTTP_ROUTE_VALUE)
+                .withTag(Tags.HTTP_URL, HTTP_URL_VALUE)
+                .withTag(Tags.HTTP_STATUS, HTTP_STATUS_VALUE)
+                .withTag(Tags.PEER_PORT, PEER_PORT_VALUE)
+                .start();
+        span.finish();
+    }
 
-  /** JDBC/DB-client-shaped span: create -> set the typical DB known tags (9) -> finish. */
-  @Benchmark
-  public void jdbcClientSpan() {
-    AgentSpan span = tracer.buildSpan(INSTRUMENTATION_NAME, JDBC_OPERATION_NAME).start();
-    span.setTag(Tags.COMPONENT, DB_COMPONENT_VALUE);
-    span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_CLIENT);
-    span.setTag(Tags.DB_TYPE, DB_TYPE_VALUE);
-    span.setTag(Tags.DB_INSTANCE, DB_INSTANCE_VALUE);
-    span.setTag(Tags.DB_USER, DB_USER_VALUE);
-    span.setTag(Tags.DB_OPERATION, DB_OPERATION_VALUE);
-    span.setTag(Tags.DB_STATEMENT, DB_STATEMENT_VALUE);
-    span.setTag(Tags.PEER_HOSTNAME, DB_PEER_HOSTNAME_VALUE);
-    span.setTag(Tags.PEER_PORT, DB_PEER_PORT_VALUE);
-    span.finish();
-  }
+    /** JDBC/DB-client-shaped span: create -> set the typical DB known tags (9) -> finish. */
+    @Benchmark
+    public void jdbcClientSpan() {
+        AgentSpan span =
+                tracer.buildSpan(INSTRUMENTATION_NAME, JDBC_OPERATION_NAME).start();
+        span.setTag(Tags.COMPONENT, DB_COMPONENT_VALUE);
+        span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_CLIENT);
+        span.setTag(Tags.DB_TYPE, DB_TYPE_VALUE);
+        span.setTag(Tags.DB_INSTANCE, DB_INSTANCE_VALUE);
+        span.setTag(Tags.DB_USER, DB_USER_VALUE);
+        span.setTag(Tags.DB_OPERATION, DB_OPERATION_VALUE);
+        span.setTag(Tags.DB_STATEMENT, DB_STATEMENT_VALUE);
+        span.setTag(Tags.PEER_HOSTNAME, DB_PEER_HOSTNAME_VALUE);
+        span.setTag(Tags.PEER_PORT, DB_PEER_PORT_VALUE);
+        span.finish();
+    }
 
-  /**
-   * Web-server-shaped span via {@link SpanPrototype}: the type-constants (component, span.kind)
-   * ride a baked-once prototype seeded at construction; the dynamic http.* / peer.port tags are set
-   * per-span, as real instrumentation does. Compare against {@link #webServerSpan} (identical tags,
-   * all set individually) to read the prototype's construction-path win on a full span.
-   */
-  @Benchmark
-  public void webServerSpanViaPrototype() {
-    AgentSpan span = tracer.buildSpan(webProto, null).start(); // null -> prototype's operationName
-    span.setTag(Tags.HTTP_METHOD, HTTP_METHOD_VALUE);
-    span.setTag(Tags.HTTP_ROUTE, HTTP_ROUTE_VALUE);
-    span.setTag(Tags.HTTP_URL, HTTP_URL_VALUE);
-    span.setTag(Tags.HTTP_STATUS, HTTP_STATUS_VALUE);
-    span.setTag(Tags.PEER_PORT, PEER_PORT_VALUE);
-    span.finish();
-  }
+    /**
+     * Web-server-shaped span via {@link SpanPrototype}: the type-constants (component, span.kind)
+     * ride a baked-once prototype seeded at construction; the dynamic http.* / peer.port tags are set
+     * per-span, as real instrumentation does. Compare against {@link #webServerSpan} (identical tags,
+     * all set individually) to read the prototype's construction-path win on a full span.
+     */
+    @Benchmark
+    public void webServerSpanViaPrototype() {
+        AgentSpan span = tracer.buildSpan(webProto, null).start(); // null -> prototype's operationName
+        span.setTag(Tags.HTTP_METHOD, HTTP_METHOD_VALUE);
+        span.setTag(Tags.HTTP_ROUTE, HTTP_ROUTE_VALUE);
+        span.setTag(Tags.HTTP_URL, HTTP_URL_VALUE);
+        span.setTag(Tags.HTTP_STATUS, HTTP_STATUS_VALUE);
+        span.setTag(Tags.PEER_PORT, PEER_PORT_VALUE);
+        span.finish();
+    }
 
-  /**
-   * JDBC/DB-client-shaped span via {@link SpanPrototype}: component, span.kind, and db.type ride
-   * the prototype; the dynamic db.* / peer.* tags are set per-span. Compare against {@link
-   * #jdbcClientSpan}.
-   */
-  @Benchmark
-  public void jdbcClientSpanViaPrototype() {
-    AgentSpan span = tracer.buildSpan(jdbcProto, null).start();
-    span.setTag(Tags.DB_INSTANCE, DB_INSTANCE_VALUE);
-    span.setTag(Tags.DB_USER, DB_USER_VALUE);
-    span.setTag(Tags.DB_OPERATION, DB_OPERATION_VALUE);
-    span.setTag(Tags.DB_STATEMENT, DB_STATEMENT_VALUE);
-    span.setTag(Tags.PEER_HOSTNAME, DB_PEER_HOSTNAME_VALUE);
-    span.setTag(Tags.PEER_PORT, DB_PEER_PORT_VALUE);
-    span.finish();
-  }
+    /**
+     * JDBC/DB-client-shaped span via {@link SpanPrototype}: component, span.kind, and db.type ride
+     * the prototype; the dynamic db.* / peer.* tags are set per-span. Compare against {@link
+     * #jdbcClientSpan}.
+     */
+    @Benchmark
+    public void jdbcClientSpanViaPrototype() {
+        AgentSpan span = tracer.buildSpan(jdbcProto, null).start();
+        span.setTag(Tags.DB_INSTANCE, DB_INSTANCE_VALUE);
+        span.setTag(Tags.DB_USER, DB_USER_VALUE);
+        span.setTag(Tags.DB_OPERATION, DB_OPERATION_VALUE);
+        span.setTag(Tags.DB_STATEMENT, DB_STATEMENT_VALUE);
+        span.setTag(Tags.PEER_HOSTNAME, DB_PEER_HOSTNAME_VALUE);
+        span.setTag(Tags.PEER_PORT, DB_PEER_PORT_VALUE);
+        span.finish();
+    }
 
-  /**
-   * Web-server-shaped span via {@code startSpan(SpanPrototype, ...)} — the builder-free
-   * construction entry (no MultiSpanBuilder allocation), the auto-instrumentation path. Compare
-   * against {@link #webServerSpanViaPrototype} (same prototype, but {@code buildSpan(...).start()}
-   * allocates a builder) to read the builder-free saving, and against {@link #webServerSpan} for
-   * the full win.
-   */
-  @Benchmark
-  public void webServerSpanViaPrototypeStartSpan() {
-    AgentSpan span = tracer.startSpan(webProto, null); // null -> prototype's operationName
-    span.setTag(Tags.HTTP_METHOD, HTTP_METHOD_VALUE);
-    span.setTag(Tags.HTTP_ROUTE, HTTP_ROUTE_VALUE);
-    span.setTag(Tags.HTTP_URL, HTTP_URL_VALUE);
-    span.setTag(Tags.HTTP_STATUS, HTTP_STATUS_VALUE);
-    span.setTag(Tags.PEER_PORT, PEER_PORT_VALUE);
-    span.finish();
-  }
+    /**
+     * Web-server-shaped span via {@code startSpan(SpanPrototype, ...)} — the builder-free
+     * construction entry (no MultiSpanBuilder allocation), the auto-instrumentation path. Compare
+     * against {@link #webServerSpanViaPrototype} (same prototype, but {@code buildSpan(...).start()}
+     * allocates a builder) to read the builder-free saving, and against {@link #webServerSpan} for
+     * the full win.
+     */
+    @Benchmark
+    public void webServerSpanViaPrototypeStartSpan() {
+        AgentSpan span = tracer.startSpan(webProto, null); // null -> prototype's operationName
+        span.setTag(Tags.HTTP_METHOD, HTTP_METHOD_VALUE);
+        span.setTag(Tags.HTTP_ROUTE, HTTP_ROUTE_VALUE);
+        span.setTag(Tags.HTTP_URL, HTTP_URL_VALUE);
+        span.setTag(Tags.HTTP_STATUS, HTTP_STATUS_VALUE);
+        span.setTag(Tags.PEER_PORT, PEER_PORT_VALUE);
+        span.finish();
+    }
 
-  /** JDBC/DB-client-shaped span via the builder-free {@code startSpan(SpanPrototype, ...)}. */
-  @Benchmark
-  public void jdbcClientSpanViaPrototypeStartSpan() {
-    AgentSpan span = tracer.startSpan(jdbcProto, null);
-    span.setTag(Tags.DB_INSTANCE, DB_INSTANCE_VALUE);
-    span.setTag(Tags.DB_USER, DB_USER_VALUE);
-    span.setTag(Tags.DB_OPERATION, DB_OPERATION_VALUE);
-    span.setTag(Tags.DB_STATEMENT, DB_STATEMENT_VALUE);
-    span.setTag(Tags.PEER_HOSTNAME, DB_PEER_HOSTNAME_VALUE);
-    span.setTag(Tags.PEER_PORT, DB_PEER_PORT_VALUE);
-    span.finish();
-  }
+    /** JDBC/DB-client-shaped span via the builder-free {@code startSpan(SpanPrototype, ...)}. */
+    @Benchmark
+    public void jdbcClientSpanViaPrototypeStartSpan() {
+        AgentSpan span = tracer.startSpan(jdbcProto, null);
+        span.setTag(Tags.DB_INSTANCE, DB_INSTANCE_VALUE);
+        span.setTag(Tags.DB_USER, DB_USER_VALUE);
+        span.setTag(Tags.DB_OPERATION, DB_OPERATION_VALUE);
+        span.setTag(Tags.DB_STATEMENT, DB_STATEMENT_VALUE);
+        span.setTag(Tags.PEER_HOSTNAME, DB_PEER_HOSTNAME_VALUE);
+        span.setTag(Tags.PEER_PORT, DB_PEER_PORT_VALUE);
+        span.finish();
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/SpanCreationVirtualThreadBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/core/SpanCreationVirtualThreadBenchmark.java
index 9c7c43fc9d1..35c3cf96731 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/SpanCreationVirtualThreadBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/SpanCreationVirtualThreadBenchmark.java
@@ -46,40 +46,35 @@
 @OutputTimeUnit(MICROSECONDS)
 @Fork(value = 3, jvmArgsAppend = "-DTEST_LOG_LEVEL=warn")
 public class SpanCreationVirtualThreadBenchmark {
-  private static final String INSTRUMENTATION_NAME = "bench";
-  private static final String OPERATION_NAME = "servlet.request";
+    private static final String INSTRUMENTATION_NAME = "bench";
+    private static final String OPERATION_NAME = "servlet.request";
 
-  CoreTracer tracer;
-  // Thread.startVirtualThread(Runnable) -> Thread, resolved reflectively (JDK 21+).
-  private MethodHandle startVirtualThread;
-  // Reused so no per-op capturing-lambda allocation muddies the measurement.
-  private Runnable spanTask;
+    CoreTracer tracer;
+    // Thread.startVirtualThread(Runnable) -> Thread, resolved reflectively (JDK 21+).
+    private MethodHandle startVirtualThread;
+    // Reused so no per-op capturing-lambda allocation muddies the measurement.
+    private Runnable spanTask;
 
-  @Setup
-  public void setup(Blackhole blackhole) throws Throwable {
-    this.tracer = CoreTracer.builder().writer(new DropWriter(blackhole)).build();
-    this.startVirtualThread =
-        MethodHandles.publicLookup()
-            .findStatic(
-                Thread.class,
-                "startVirtualThread",
-                MethodType.methodType(Thread.class, Runnable.class));
-    this.spanTask =
-        () -> {
-          AgentSpan span = tracer.startSpan(INSTRUMENTATION_NAME, OPERATION_NAME);
-          span.finish();
+    @Setup
+    public void setup(Blackhole blackhole) throws Throwable {
+        this.tracer = CoreTracer.builder().writer(new DropWriter(blackhole)).build();
+        this.startVirtualThread = MethodHandles.publicLookup()
+                .findStatic(Thread.class, "startVirtualThread", MethodType.methodType(Thread.class, Runnable.class));
+        this.spanTask = () -> {
+            AgentSpan span = tracer.startSpan(INSTRUMENTATION_NAME, OPERATION_NAME);
+            span.finish();
         };
-  }
+    }
 
-  @TearDown
-  public void tearDown() {
-    this.tracer.close();
-  }
+    @TearDown
+    public void tearDown() {
+        this.tracer.close();
+    }
 
-  /** create + finish a bare span on a fresh virtual thread; join. */
-  @Benchmark
-  public void bareStartSpanOnVirtualThread() throws Throwable {
-    Thread vthread = (Thread) startVirtualThread.invokeExact(spanTask);
-    vthread.join();
-  }
+    /** create + finish a bare span on a fresh virtual thread; join. */
+    @Benchmark
+    public void bareStartSpanOnVirtualThread() throws Throwable {
+        Thread vthread = (Thread) startVirtualThread.invokeExact(spanTask);
+        vthread.join();
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/TimeSourceBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/core/TimeSourceBenchmark.java
index 0f7dd2769f8..a5aa09767c3 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/TimeSourceBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/TimeSourceBenchmark.java
@@ -26,74 +26,74 @@
 @Fork(value = 1)
 public class TimeSourceBenchmark {
 
-  static final CoreTracer TRACER = CoreTracer.builder().build();
-
-  private PendingTrace pendingTrace;
-
-  @Setup(Level.Trial)
-  public void setup() {
-    TraceCollector collector = TRACER.createTraceCollector(DDTraceId.ONE);
-    pendingTrace = (PendingTrace) collector;
-  }
-
-  @TearDown(Level.Trial)
-  public void teardown() {
-    pendingTrace = null;
-  }
-
-  @Benchmark
-  public long getCurrentTimeNano() {
-    return pendingTrace.getCurrentTimeNano();
-  }
-
-  @Benchmark
-  public long systemNanoTime() {
-    return System.nanoTime();
-  }
-
-  @Benchmark
-  public long systemCurrentTimeMillis() {
-    return System.currentTimeMillis();
-  }
-
-  @Benchmark
-  public long traceGetTimeWithNanoTicks() {
-    return TRACER.getTimeWithNanoTicks(System.nanoTime());
-  }
-
-  /**
-   * Measures a full span start + finish cycle, exercising both the {@code rootSpan} CAS guard in
-   * {@link PendingTrace#registerSpan} and the {@code lazySet} of {@code lastReferenced} in {@link
-   * PendingTrace#getCurrentTimeNano}.
-   */
-  @Benchmark
-  public void startAndFinishSpan() {
-    TRACER.startSpan("benchmark", "op").finish();
-  }
-
-  @State(Scope.Benchmark)
-  public static class SharedState {
-    PendingTrace sharedTrace;
+    static final CoreTracer TRACER = CoreTracer.builder().build();
+
+    private PendingTrace pendingTrace;
 
     @Setup(Level.Trial)
     public void setup() {
-      TraceCollector collector = TRACER.createTraceCollector(DDTraceId.ONE);
-      sharedTrace = (PendingTrace) collector;
+        TraceCollector collector = TRACER.createTraceCollector(DDTraceId.ONE);
+        pendingTrace = (PendingTrace) collector;
     }
 
     @TearDown(Level.Trial)
     public void teardown() {
-      sharedTrace = null;
+        pendingTrace = null;
+    }
+
+    @Benchmark
+    public long getCurrentTimeNano() {
+        return pendingTrace.getCurrentTimeNano();
+    }
+
+    @Benchmark
+    public long systemNanoTime() {
+        return System.nanoTime();
+    }
+
+    @Benchmark
+    public long systemCurrentTimeMillis() {
+        return System.currentTimeMillis();
+    }
+
+    @Benchmark
+    public long traceGetTimeWithNanoTicks() {
+        return TRACER.getTimeWithNanoTicks(System.nanoTime());
+    }
+
+    /**
+     * Measures a full span start + finish cycle, exercising both the {@code rootSpan} CAS guard in
+     * {@link PendingTrace#registerSpan} and the {@code lazySet} of {@code lastReferenced} in {@link
+     * PendingTrace#getCurrentTimeNano}.
+     */
+    @Benchmark
+    public void startAndFinishSpan() {
+        TRACER.startSpan("benchmark", "op").finish();
+    }
+
+    @State(Scope.Benchmark)
+    public static class SharedState {
+        PendingTrace sharedTrace;
+
+        @Setup(Level.Trial)
+        public void setup() {
+            TraceCollector collector = TRACER.createTraceCollector(DDTraceId.ONE);
+            sharedTrace = (PendingTrace) collector;
+        }
+
+        @TearDown(Level.Trial)
+        public void teardown() {
+            sharedTrace = null;
+        }
+    }
+
+    /**
+     * Measures {@link PendingTrace#getCurrentTimeNano()} under cross-thread contention on a single
+     * shared {@code PendingTrace}. All threads write to the same {@code lastReferenced} field,
+     * demonstrating the benefit of {@code lazySet} over a volatile store under contention.
+     */
+    @Benchmark
+    public long getCurrentTimeNano_contended(SharedState shared) {
+        return shared.sharedTrace.getCurrentTimeNano();
     }
-  }
-
-  /**
-   * Measures {@link PendingTrace#getCurrentTimeNano()} under cross-thread contention on a single
-   * shared {@code PendingTrace}. All threads write to the same {@code lastReferenced} field,
-   * demonstrating the benefit of {@code lazySet} over a volatile store under contention.
-   */
-  @Benchmark
-  public long getCurrentTimeNano_contended(SharedState shared) {
-    return shared.sharedTrace.getCurrentTimeNano();
-  }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/TraceAssemblyBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/core/TraceAssemblyBenchmark.java
index c49f234dda5..a40999b4072 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/TraceAssemblyBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/TraceAssemblyBenchmark.java
@@ -90,51 +90,52 @@
 @OutputTimeUnit(MICROSECONDS)
 @Fork(value = 3, jvmArgsAppend = "-DTEST_LOG_LEVEL=warn")
 public class TraceAssemblyBenchmark {
-  private static final String INSTRUMENTATION_NAME = "bench";
-  private static final String ROOT_OPERATION = "servlet.request";
-  private static final String CHILD_OPERATION = "servlet.handler";
+    private static final String INSTRUMENTATION_NAME = "bench";
+    private static final String ROOT_OPERATION = "servlet.request";
+    private static final String CHILD_OPERATION = "servlet.handler";
 
-  private static final String COMPONENT_VALUE = "tomcat-server";
-  private static final String HTTP_METHOD_VALUE = "GET";
-  private static final String HTTP_ROUTE_VALUE = "/owners/{ownerId}";
-  private static final String HTTP_URL_VALUE = "http://localhost:8080/owners/42";
-  private static final int HTTP_STATUS_VALUE = 200;
+    private static final String COMPONENT_VALUE = "tomcat-server";
+    private static final String HTTP_METHOD_VALUE = "GET";
+    private static final String HTTP_ROUTE_VALUE = "/owners/{ownerId}";
+    private static final String HTTP_URL_VALUE = "http://localhost:8080/owners/42";
+    private static final int HTTP_STATUS_VALUE = 200;
 
-  /** Number of child spans under the root — the axis that turns per-child cost into a slope. */
-  @Param({"1", "5", "20"})
-  int childCount;
+    /** Number of child spans under the root — the axis that turns per-child cost into a slope. */
+    @Param({"1", "5", "20"})
+    int childCount;
 
-  CoreTracer tracer;
+    CoreTracer tracer;
 
-  @Setup
-  public void setup(Blackhole blackhole) {
-    this.tracer = CoreTracer.builder().writer(new DropWriter(blackhole)).build();
-  }
+    @Setup
+    public void setup(Blackhole blackhole) {
+        this.tracer = CoreTracer.builder().writer(new DropWriter(blackhole)).build();
+    }
+
+    @TearDown
+    public void tearDown() {
+        this.tracer.close();
+    }
 
-  @TearDown
-  public void tearDown() {
-    this.tracer.close();
-  }
+    /** Web-server root + {@code childCount} children, each finished; whole trace dropped. */
+    @Benchmark
+    public void webServerTrace() {
+        AgentSpan root = tracer.buildSpan(INSTRUMENTATION_NAME, ROOT_OPERATION).start();
+        root.setTag(Tags.COMPONENT, COMPONENT_VALUE);
+        root.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER);
+        root.setTag(Tags.HTTP_METHOD, HTTP_METHOD_VALUE);
+        root.setTag(Tags.HTTP_ROUTE, HTTP_ROUTE_VALUE);
+        root.setTag(Tags.HTTP_URL, HTTP_URL_VALUE);
+        root.setTag(Tags.HTTP_STATUS, HTTP_STATUS_VALUE);
 
-  /** Web-server root + {@code childCount} children, each finished; whole trace dropped. */
-  @Benchmark
-  public void webServerTrace() {
-    AgentSpan root = tracer.buildSpan(INSTRUMENTATION_NAME, ROOT_OPERATION).start();
-    root.setTag(Tags.COMPONENT, COMPONENT_VALUE);
-    root.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER);
-    root.setTag(Tags.HTTP_METHOD, HTTP_METHOD_VALUE);
-    root.setTag(Tags.HTTP_ROUTE, HTTP_ROUTE_VALUE);
-    root.setTag(Tags.HTTP_URL, HTTP_URL_VALUE);
-    root.setTag(Tags.HTTP_STATUS, HTTP_STATUS_VALUE);
+        for (int i = 0; i < childCount; i++) {
+            AgentSpan child = tracer.buildSpan(INSTRUMENTATION_NAME, CHILD_OPERATION)
+                    .asChildOf(root)
+                    .start();
+            child.setTag(Tags.COMPONENT, COMPONENT_VALUE);
+            child.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_INTERNAL);
+            child.finish();
+        }
 
-    for (int i = 0; i < childCount; i++) {
-      AgentSpan child =
-          tracer.buildSpan(INSTRUMENTATION_NAME, CHILD_OPERATION).asChildOf(root).start();
-      child.setTag(Tags.COMPONENT, COMPONENT_VALUE);
-      child.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_INTERNAL);
-      child.finish();
+        root.finish();
     }
-
-    root.finish();
-  }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/TraceCounters.java b/dd-trace-core/src/jmh/java/datadog/trace/core/TraceCounters.java
index 797cf835618..fde85ff11f8 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/TraceCounters.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/TraceCounters.java
@@ -10,26 +10,26 @@
 @AuxCounters(AuxCounters.Type.EVENTS)
 public class TraceCounters {
 
-  long traces;
-  long spans;
-  long drops;
+    long traces;
+    long spans;
+    long drops;
 
-  public long traces() {
-    return traces;
-  }
+    public long traces() {
+        return traces;
+    }
 
-  public long spans() {
-    return spans;
-  }
+    public long spans() {
+        return spans;
+    }
 
-  public long drops() {
-    return drops;
-  }
+    public long drops() {
+        return drops;
+    }
 
-  @Setup(Level.Iteration)
-  public void reset() {
-    traces = 0;
-    spans = 0;
-    drops = 0;
-  }
+    @Setup(Level.Iteration)
+    public void reset() {
+        traces = 0;
+        spans = 0;
+        drops = 0;
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/TracerMapperMap.java b/dd-trace-core/src/jmh/java/datadog/trace/core/TracerMapperMap.java
index 4075274cca2..950e01e25ff 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/TracerMapperMap.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/TracerMapperMap.java
@@ -21,127 +21,129 @@
 
 @State(Scope.Benchmark)
 public class TracerMapperMap {
-  private static final int SPAN_COUNT = 1000;
+    private static final int SPAN_COUNT = 1000;
+
+    private static final TraceMapperV0_4 mapperV4 = new TraceMapperV0_4();
+    private static final TraceMapperV0_5 mapperV5 = new TraceMapperV0_5();
+    private static final TraceMapperV1 mapperV1 = new TraceMapperV1();
+
+    private static final CoreTracer tracer = CoreTracer.builder()
+            .writer(new LoggingWriter())
+            .strictTraceWrites(true)
+            .build();
+
+    private final List<DDSpan> spans = new ArrayList<>(SPAN_COUNT);
+    private final List<DDSpan> enrichedSpans = new ArrayList<>(SPAN_COUNT);
+    private final List<DDSpan> spansWithOrigin = new ArrayList<>(SPAN_COUNT);
+    private final List<DDSpan> enrichedSpansWithOrigin = new ArrayList<>(SPAN_COUNT);
+
+    private MsgPackWriter writer;
+
+    @Setup(Level.Trial)
+    public void init(Blackhole blackhole) throws Exception {
+        writer = new MsgPackWriter(new BlackholeBuffer(blackhole));
+
+        for (int i = 1; i <= SPAN_COUNT; i++) {
+            spans.add(createSpanWithOrigin(i, null));
+            enrichedSpans.add(createEnrichedSpanWithOrigin(i, null));
+            spansWithOrigin.add(createSpanWithOrigin(i, "some-origin"));
+            enrichedSpansWithOrigin.add(createEnrichedSpanWithOrigin(i, "some-origin"));
+        }
+    }
+
+    @Benchmark
+    public void mapTracesV4() {
+        mapperV4.map(spans, writer);
+    }
+
+    @Benchmark
+    public void mapEnrichedTracesV4() {
+        mapperV4.map(enrichedSpans, writer);
+    }
+
+    @Benchmark
+    public void mapTracesWithOriginV4() {
+        mapperV4.map(spansWithOrigin, writer);
+    }
+
+    @Benchmark
+    public void mapEnrichedTracesWithOriginV4() {
+        mapperV4.map(enrichedSpansWithOrigin, writer);
+    }
+
+    @Benchmark
+    public void mapTracesV5() {
+        mapperV5.map(spans, writer);
+    }
 
-  private static final TraceMapperV0_4 mapperV4 = new TraceMapperV0_4();
-  private static final TraceMapperV0_5 mapperV5 = new TraceMapperV0_5();
-  private static final TraceMapperV1 mapperV1 = new TraceMapperV1();
+    @Benchmark
+    public void mapEnrichedTracesV5() {
+        mapperV5.map(enrichedSpans, writer);
+    }
+
+    @Benchmark
+    public void mapTracesWithOriginV5() {
+        mapperV5.map(spansWithOrigin, writer);
+    }
 
-  private static final CoreTracer tracer =
-      CoreTracer.builder().writer(new LoggingWriter()).strictTraceWrites(true).build();
+    @Benchmark
+    public void mapEnrichedTracesWithOriginV5() {
+        mapperV5.map(enrichedSpansWithOrigin, writer);
+    }
 
-  private final List<DDSpan> spans = new ArrayList<>(SPAN_COUNT);
-  private final List<DDSpan> enrichedSpans = new ArrayList<>(SPAN_COUNT);
-  private final List<DDSpan> spansWithOrigin = new ArrayList<>(SPAN_COUNT);
-  private final List<DDSpan> enrichedSpansWithOrigin = new ArrayList<>(SPAN_COUNT);
+    @Benchmark
+    public void mapTracesV1() {
+        mapperV1.map(spans, writer);
+    }
 
-  private MsgPackWriter writer;
+    @Benchmark
+    public void mapEnrichedTracesV1() {
+        mapperV1.map(enrichedSpans, writer);
+    }
 
-  @Setup(Level.Trial)
-  public void init(Blackhole blackhole) throws Exception {
-    writer = new MsgPackWriter(new BlackholeBuffer(blackhole));
+    @Benchmark
+    public void mapTracesWithOriginV1() {
+        mapperV1.map(spansWithOrigin, writer);
+    }
+
+    @Benchmark
+    public void mapEnrichedTracesWithOriginV1() {
+        mapperV1.map(enrichedSpansWithOrigin, writer);
+    }
+
+    private DDSpan createEnrichedSpanWithOrigin(int iter, final String origin) {
+        final DDSpan span = createSpanWithOrigin(iter, origin);
+        span.setTag("some-tag-key", "some-tag-value");
+        span.setMetric("some-metric-key", 1.0);
+        return span;
+    }
 
-    for (int i = 1; i <= SPAN_COUNT; i++) {
-      spans.add(createSpanWithOrigin(i, null));
-      enrichedSpans.add(createEnrichedSpanWithOrigin(i, null));
-      spansWithOrigin.add(createSpanWithOrigin(i, "some-origin"));
-      enrichedSpansWithOrigin.add(createEnrichedSpanWithOrigin(i, "some-origin"));
+    private DDSpan createSpanWithOrigin(int iter, final String origin) {
+        final DDTraceId traceId = DDTraceId.from(iter);
+        final TraceCollector traceCollector = tracer.createTraceCollector(traceId);
+        return DDSpan.create(
+                "benchmark",
+                System.currentTimeMillis() * 1000,
+                new DDSpanContext(
+                        traceId,
+                        1000 + iter,
+                        DDSpanId.ZERO,
+                        null,
+                        "service",
+                        "operation",
+                        "resource",
+                        PrioritySampling.SAMPLER_KEEP,
+                        origin,
+                        Collections.<String, String>emptyMap(),
+                        false,
+                        "type",
+                        0,
+                        traceCollector,
+                        null,
+                        null,
+                        NoopPathwayContext.INSTANCE,
+                        false,
+                        null),
+                null);
     }
-  }
-
-  @Benchmark
-  public void mapTracesV4() {
-    mapperV4.map(spans, writer);
-  }
-
-  @Benchmark
-  public void mapEnrichedTracesV4() {
-    mapperV4.map(enrichedSpans, writer);
-  }
-
-  @Benchmark
-  public void mapTracesWithOriginV4() {
-    mapperV4.map(spansWithOrigin, writer);
-  }
-
-  @Benchmark
-  public void mapEnrichedTracesWithOriginV4() {
-    mapperV4.map(enrichedSpansWithOrigin, writer);
-  }
-
-  @Benchmark
-  public void mapTracesV5() {
-    mapperV5.map(spans, writer);
-  }
-
-  @Benchmark
-  public void mapEnrichedTracesV5() {
-    mapperV5.map(enrichedSpans, writer);
-  }
-
-  @Benchmark
-  public void mapTracesWithOriginV5() {
-    mapperV5.map(spansWithOrigin, writer);
-  }
-
-  @Benchmark
-  public void mapEnrichedTracesWithOriginV5() {
-    mapperV5.map(enrichedSpansWithOrigin, writer);
-  }
-
-  @Benchmark
-  public void mapTracesV1() {
-    mapperV1.map(spans, writer);
-  }
-
-  @Benchmark
-  public void mapEnrichedTracesV1() {
-    mapperV1.map(enrichedSpans, writer);
-  }
-
-  @Benchmark
-  public void mapTracesWithOriginV1() {
-    mapperV1.map(spansWithOrigin, writer);
-  }
-
-  @Benchmark
-  public void mapEnrichedTracesWithOriginV1() {
-    mapperV1.map(enrichedSpansWithOrigin, writer);
-  }
-
-  private DDSpan createEnrichedSpanWithOrigin(int iter, final String origin) {
-    final DDSpan span = createSpanWithOrigin(iter, origin);
-    span.setTag("some-tag-key", "some-tag-value");
-    span.setMetric("some-metric-key", 1.0);
-    return span;
-  }
-
-  private DDSpan createSpanWithOrigin(int iter, final String origin) {
-    final DDTraceId traceId = DDTraceId.from(iter);
-    final TraceCollector traceCollector = tracer.createTraceCollector(traceId);
-    return DDSpan.create(
-        "benchmark",
-        System.currentTimeMillis() * 1000,
-        new DDSpanContext(
-            traceId,
-            1000 + iter,
-            DDSpanId.ZERO,
-            null,
-            "service",
-            "operation",
-            "resource",
-            PrioritySampling.SAMPLER_KEEP,
-            origin,
-            Collections.<String, String>emptyMap(),
-            false,
-            "type",
-            0,
-            traceCollector,
-            null,
-            null,
-            NoopPathwayContext.INSTANCE,
-            false,
-            null),
-        null);
-  }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/VirtualThreadContextBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/core/VirtualThreadContextBenchmark.java
index 6c4098c3169..1acb5bc81e1 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/VirtualThreadContextBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/VirtualThreadContextBenchmark.java
@@ -55,173 +55,172 @@
 @Fork(value = 1)
 public class VirtualThreadContextBenchmark {
 
-  static final CoreTracer TRACER = CoreTracer.builder().build();
-
-  ContinuableScopeManager plainManager; // profiling off
-  ContinuableScopeManager profiledManager; // profiling on
-  StubProfiling stubProfiling;
-
-  @Setup
-  public void setup() {
-    plainManager = new ContinuableScopeManager(0, false);
-    stubProfiling = new StubProfiling();
-    profiledManager = new ContinuableScopeManager(0, false, stubProfiling, HealthMetrics.NO_OP);
-  }
-
-  @State(Scope.Thread)
-  public static class ThreadState {
-    AgentSpan span;
-    Context spanContext;
-    Context plainContext;
-    Context profiledContext;
-
-    @Setup(Level.Trial)
-    public void setup(VirtualThreadContextBenchmark bench) {
-      span = TRACER.startSpan("benchmark", "vt");
-      spanContext = span;
-      plainContext = spanContext;
-      profiledContext = spanContext;
-      bench.stubProfiling.initializeThread();
-    }
-
-    @TearDown(Level.Trial)
-    public void tearDown(VirtualThreadContextBenchmark bench) {
-      bench.stubProfiling.clearThread();
-      span.finish();
-    }
-  }
-
-  @Benchmark
-  public void currentCycle_profilingOff(ThreadState t) {
-    Context previous = plainManager.swap(t.plainContext);
-    t.plainContext = plainManager.swap(previous);
-  }
-
-  @Benchmark
-  public long currentCycle_profilingOn_javaStub(ThreadState t) {
-    Context previous = profiledManager.swap(t.profiledContext);
-    t.profiledContext = profiledManager.swap(previous);
-    return stubProfiling.currentValue();
-  }
-
-  // current() is the faithful upper bound for the seed-once steady state (a scope-stack read).
-  @Benchmark
-  public Context proposedSteady_profilingOff(ThreadState t) {
-    return plainManager.currentContext();
-  }
-
-  @Benchmark
-  public long proposedRebindUnbind_profilingOn_javaStub(ThreadState t) {
-    if (stubProfiling.isThreadContextBindingRequired()) {
-      stubProfiling.setContext(t.spanContext);
-      stubProfiling.setContext(Context.root());
-    }
-    return stubProfiling.currentValue();
-  }
-
-  static final class StubProfiling implements ProfilingContextIntegration {
-    private final ThreadLocal<StubState> threadState = ThreadLocal.withInitial(StubState::new);
-
-    private final Stateful contextManager =
-        new Stateful() {
-          @Override
-          public void activate(Object context) {
-            if (context instanceof ProfilerContext) {
-              threadState.get().activate((ProfilerContext) context);
+    static final CoreTracer TRACER = CoreTracer.builder().build();
+
+    ContinuableScopeManager plainManager; // profiling off
+    ContinuableScopeManager profiledManager; // profiling on
+    StubProfiling stubProfiling;
+
+    @Setup
+    public void setup() {
+        plainManager = new ContinuableScopeManager(0, false);
+        stubProfiling = new StubProfiling();
+        profiledManager = new ContinuableScopeManager(0, false, stubProfiling, HealthMetrics.NO_OP);
+    }
+
+    @State(Scope.Thread)
+    public static class ThreadState {
+        AgentSpan span;
+        Context spanContext;
+        Context plainContext;
+        Context profiledContext;
+
+        @Setup(Level.Trial)
+        public void setup(VirtualThreadContextBenchmark bench) {
+            span = TRACER.startSpan("benchmark", "vt");
+            spanContext = span;
+            plainContext = spanContext;
+            profiledContext = spanContext;
+            bench.stubProfiling.initializeThread();
+        }
+
+        @TearDown(Level.Trial)
+        public void tearDown(VirtualThreadContextBenchmark bench) {
+            bench.stubProfiling.clearThread();
+            span.finish();
+        }
+    }
+
+    @Benchmark
+    public void currentCycle_profilingOff(ThreadState t) {
+        Context previous = plainManager.swap(t.plainContext);
+        t.plainContext = plainManager.swap(previous);
+    }
+
+    @Benchmark
+    public long currentCycle_profilingOn_javaStub(ThreadState t) {
+        Context previous = profiledManager.swap(t.profiledContext);
+        t.profiledContext = profiledManager.swap(previous);
+        return stubProfiling.currentValue();
+    }
+
+    // current() is the faithful upper bound for the seed-once steady state (a scope-stack read).
+    @Benchmark
+    public Context proposedSteady_profilingOff(ThreadState t) {
+        return plainManager.currentContext();
+    }
+
+    @Benchmark
+    public long proposedRebindUnbind_profilingOn_javaStub(ThreadState t) {
+        if (stubProfiling.isThreadContextBindingRequired()) {
+            stubProfiling.setContext(t.spanContext);
+            stubProfiling.setContext(Context.root());
+        }
+        return stubProfiling.currentValue();
+    }
+
+    static final class StubProfiling implements ProfilingContextIntegration {
+        private final ThreadLocal<StubState> threadState = ThreadLocal.withInitial(StubState::new);
+
+        private final Stateful contextManager = new Stateful() {
+            @Override
+            public void activate(Object context) {
+                if (context instanceof ProfilerContext) {
+                    threadState.get().activate((ProfilerContext) context);
+                }
             }
-          }
 
-          @Override
-          public void close() {
-            threadState.get().close();
-          }
+            @Override
+            public void close() {
+                threadState.get().close();
+            }
         };
 
-    @Override
-    public Stateful newScopeState(ProfilerContext profilerContext) {
-      return contextManager;
-    }
-
-    @Override
-    public void setContext(Context context) {
-      AgentSpan span = AgentSpan.fromContext(context);
-      if (span != null) {
-        contextManager.activate(span.spanContext());
-      } else {
-        contextManager.close();
-      }
-    }
-
-    @Override
-    public boolean isThreadContextBindingRequired() {
-      return true;
-    }
-
-    void initializeThread() {
-      threadState.get();
-    }
-
-    void clearThread() {
-      threadState.remove();
-    }
-
-    long currentValue() {
-      return threadState.get().currentValue();
-    }
-
-    @Override
-    public String name() {
-      return "stub";
-    }
-
-    @Override
-    public ProfilingContextAttribute createContextAttribute(String attribute) {
-      return ProfilingContextAttribute.NoOp.INSTANCE;
-    }
-
-    @Override
-    public ProfilingScope newScope() {
-      return ProfilingScope.NO_OP;
-    }
-
-    @Override
-    public void onRootSpanFinished(AgentSpan rootSpan, EndpointTracker tracker) {}
-
-    @Override
-    public EndpointTracker onRootSpanStarted(AgentSpan rootSpan) {
-      return EndpointTracker.NO_OP;
-    }
-
-    @Override
-    public Timing start(TimerType type) {
-      return Timing.NoOp.INSTANCE;
-    }
-  }
-
-  static final class StubState {
-    long rootSpanId;
-    long spanId;
-    long traceHigh;
-    long traceLow;
-    long previousValue;
-
-    void activate(ProfilerContext context) {
-      rootSpanId = context.getRootSpanId();
-      spanId = context.getSpanId();
-      traceHigh = context.getTraceIdHigh();
-      traceLow = context.getTraceIdLow();
-    }
-
-    void close() {
-      previousValue = rootSpanId ^ spanId ^ traceHigh ^ traceLow;
-      rootSpanId = 0;
-      spanId = 0;
-      traceHigh = 0;
-      traceLow = 0;
-    }
-
-    long currentValue() {
-      return previousValue ^ rootSpanId ^ spanId ^ traceHigh ^ traceLow;
+        @Override
+        public Stateful newScopeState(ProfilerContext profilerContext) {
+            return contextManager;
+        }
+
+        @Override
+        public void setContext(Context context) {
+            AgentSpan span = AgentSpan.fromContext(context);
+            if (span != null) {
+                contextManager.activate(span.spanContext());
+            } else {
+                contextManager.close();
+            }
+        }
+
+        @Override
+        public boolean isThreadContextBindingRequired() {
+            return true;
+        }
+
+        void initializeThread() {
+            threadState.get();
+        }
+
+        void clearThread() {
+            threadState.remove();
+        }
+
+        long currentValue() {
+            return threadState.get().currentValue();
+        }
+
+        @Override
+        public String name() {
+            return "stub";
+        }
+
+        @Override
+        public ProfilingContextAttribute createContextAttribute(String attribute) {
+            return ProfilingContextAttribute.NoOp.INSTANCE;
+        }
+
+        @Override
+        public ProfilingScope newScope() {
+            return ProfilingScope.NO_OP;
+        }
+
+        @Override
+        public void onRootSpanFinished(AgentSpan rootSpan, EndpointTracker tracker) {}
+
+        @Override
+        public EndpointTracker onRootSpanStarted(AgentSpan rootSpan) {
+            return EndpointTracker.NO_OP;
+        }
+
+        @Override
+        public Timing start(TimerType type) {
+            return Timing.NoOp.INSTANCE;
+        }
+    }
+
+    static final class StubState {
+        long rootSpanId;
+        long spanId;
+        long traceHigh;
+        long traceLow;
+        long previousValue;
+
+        void activate(ProfilerContext context) {
+            rootSpanId = context.getRootSpanId();
+            spanId = context.getSpanId();
+            traceHigh = context.getTraceIdHigh();
+            traceLow = context.getTraceIdLow();
+        }
+
+        void close() {
+            previousValue = rootSpanId ^ spanId ^ traceHigh ^ traceLow;
+            rootSpanId = 0;
+            spanId = 0;
+            traceHigh = 0;
+            traceLow = 0;
+        }
+
+        long currentValue() {
+            return previousValue ^ rootSpanId ^ spanId ^ traceHigh ^ traceLow;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/propagation/ExtractorBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/core/propagation/ExtractorBenchmark.java
index a72be08a929..df14babf98d 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/propagation/ExtractorBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/propagation/ExtractorBenchmark.java
@@ -37,113 +37,111 @@
 @Fork(value = 1)
 @SuppressForbidden
 public class ExtractorBenchmark {
-  @Param({"datadog", "b3", "datadog,b3", "datadog:x-dth"})
-  String extractPropagationStyles;
+    @Param({"datadog", "b3", "datadog,b3", "datadog:x-dth"})
+    String extractPropagationStyles;
 
-  List<Pair<String, String>> headers;
-  HttpCodec.Extractor extractor;
-  DDTraceId traceId;
-  long spanId;
+    List<Pair<String, String>> headers;
+    HttpCodec.Extractor extractor;
+    DDTraceId traceId;
+    long spanId;
 
-  @Setup(Level.Trial)
-  public void setUp() {
-    headers = new ArrayList<>();
-    // The header strings will be fresh on every iteration, and we have a resetList
-    // benchmark as a baseline to compare against
-    headers.add(Pair.of(DatadogHttpCodec.TRACE_ID_KEY, "12345"));
-    headers.add(Pair.of(DatadogHttpCodec.SPAN_ID_KEY, "23456"));
-    headers.add(Pair.of(B3HttpCodec.TRACE_ID_KEY, "12345")); // HEX
-    headers.add(Pair.of(B3HttpCodec.SPAN_ID_KEY, "23456")); // HEX
-    headers.add(Pair.of("some-header-1", "ignored"));
-    headers.add(Pair.of("some-header-2", "ignored"));
-    headers.add(Pair.of("x-data-header-1", "ignored")); // starts like datadog headers
-    headers.add(Pair.of("x-bware-header-1", "ignored")); // starts like b3 headers
+    @Setup(Level.Trial)
+    public void setUp() {
+        headers = new ArrayList<>();
+        // The header strings will be fresh on every iteration, and we have a resetList
+        // benchmark as a baseline to compare against
+        headers.add(Pair.of(DatadogHttpCodec.TRACE_ID_KEY, "12345"));
+        headers.add(Pair.of(DatadogHttpCodec.SPAN_ID_KEY, "23456"));
+        headers.add(Pair.of(B3HttpCodec.TRACE_ID_KEY, "12345")); // HEX
+        headers.add(Pair.of(B3HttpCodec.SPAN_ID_KEY, "23456")); // HEX
+        headers.add(Pair.of("some-header-1", "ignored"));
+        headers.add(Pair.of("some-header-2", "ignored"));
+        headers.add(Pair.of("x-data-header-1", "ignored")); // starts like datadog headers
+        headers.add(Pair.of("x-bware-header-1", "ignored")); // starts like b3 headers
 
-    String[] propagationsAndFeatures = extractPropagationStyles.split(",");
-    StringBuilder propagations = new StringBuilder();
-    boolean addSeparator = false;
-    for (String pAndA : propagationsAndFeatures) {
-      if (addSeparator) {
-        propagations.append(',');
-      } else {
-        addSeparator = true;
-      }
-      String[] propagationAndFeatures = pAndA.split(":");
-      propagations.append(propagationAndFeatures[0]);
-      for (int i = 1; i < propagationAndFeatures.length; i++) {
-        String feature = propagationAndFeatures[i];
-        switch (feature) {
-          case "x-dth":
-            headers.add(
-                Pair.of(
-                    DatadogHttpCodec.DATADOG_TAGS_KEY, "_dd.p.anytag=value,_dd.p.dm=934086a686-4"));
-            break;
-          default:
-            System.out.println("Unknown benchmark feature " + feature + ". Will be ignored!");
+        String[] propagationsAndFeatures = extractPropagationStyles.split(",");
+        StringBuilder propagations = new StringBuilder();
+        boolean addSeparator = false;
+        for (String pAndA : propagationsAndFeatures) {
+            if (addSeparator) {
+                propagations.append(',');
+            } else {
+                addSeparator = true;
+            }
+            String[] propagationAndFeatures = pAndA.split(":");
+            propagations.append(propagationAndFeatures[0]);
+            for (int i = 1; i < propagationAndFeatures.length; i++) {
+                String feature = propagationAndFeatures[i];
+                switch (feature) {
+                    case "x-dth":
+                        headers.add(
+                                Pair.of(DatadogHttpCodec.DATADOG_TAGS_KEY, "_dd.p.anytag=value,_dd.p.dm=934086a686-4"));
+                        break;
+                    default:
+                        System.out.println("Unknown benchmark feature " + feature + ". Will be ignored!");
+                }
+            }
         }
-      }
-    }
 
-    System.setProperty("dd.propagation.style.extract", propagations.toString());
-    DynamicConfig dynamicConfig =
-        DynamicConfig.create()
-            .setHeaderTags(Collections.emptyMap())
-            .setBaggageMapping(Collections.emptyMap())
-            .apply();
-    extractor = HttpCodec.createExtractor(Config.get(), dynamicConfig::captureTraceConfig);
+        System.setProperty("dd.propagation.style.extract", propagations.toString());
+        DynamicConfig dynamicConfig = DynamicConfig.create()
+                .setHeaderTags(Collections.emptyMap())
+                .setBaggageMapping(Collections.emptyMap())
+                .apply();
+        extractor = HttpCodec.createExtractor(Config.get(), dynamicConfig::captureTraceConfig);
 
-    if (extractPropagationStyles.startsWith("datadog")) {
-      traceId = DDTraceId.from("12345");
-      spanId = DDSpanId.from("23456");
-    } else if (extractPropagationStyles.contains("b3")) {
-      traceId = DDTraceId.fromHex("12345");
-      spanId = DDSpanId.fromHex("23456");
+        if (extractPropagationStyles.startsWith("datadog")) {
+            traceId = DDTraceId.from("12345");
+            spanId = DDSpanId.from("23456");
+        } else if (extractPropagationStyles.contains("b3")) {
+            traceId = DDTraceId.fromHex("12345");
+            spanId = DDSpanId.fromHex("23456");
+        }
     }
-  }
 
-  @Benchmark
-  public void extractContext(Blackhole blackhole) {
-    List<Pair<String, String>> list = resetList(headers);
-    TagContext context = extractor.extract(list, LIST_VISITOR);
-    ExtractedContext extractedContext = (ExtractedContext) context;
-    blackhole.consume(context);
-    blackhole.consume(list);
-    assert extractedContext.getTraceId().equals(traceId);
-    assert extractedContext.getSpanId() == spanId;
-  }
+    @Benchmark
+    public void extractContext(Blackhole blackhole) {
+        List<Pair<String, String>> list = resetList(headers);
+        TagContext context = extractor.extract(list, LIST_VISITOR);
+        ExtractedContext extractedContext = (ExtractedContext) context;
+        blackhole.consume(context);
+        blackhole.consume(list);
+        assert extractedContext.getTraceId().equals(traceId);
+        assert extractedContext.getSpanId() == spanId;
+    }
 
-  @Benchmark
-  public void resetList(Blackhole blackhole) {
-    List<Pair<String, String>> list = resetList(headers);
-    blackhole.consume(list);
-  }
+    @Benchmark
+    public void resetList(Blackhole blackhole) {
+        List<Pair<String, String>> list = resetList(headers);
+        blackhole.consume(list);
+    }
 
-  private static String dup(String input) {
-    // Just calling new String(string) is not good enough since it will copy the hash code
-    // as well which will most likely need to be computed on a new header straight off the
-    // wire
-    return new String(input.toLowerCase().getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
-  }
+    private static String dup(String input) {
+        // Just calling new String(string) is not good enough since it will copy the hash code
+        // as well which will most likely need to be computed on a new header straight off the
+        // wire
+        return new String(input.toLowerCase().getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
+    }
 
-  private static List<Pair<String, String>> resetList(List<Pair<String, String>> list) {
-    list.replaceAll(p -> Pair.of(dup(p.getLeft()), dup(p.getRight())));
-    return list;
-  }
+    private static List<Pair<String, String>> resetList(List<Pair<String, String>> list) {
+        list.replaceAll(p -> Pair.of(dup(p.getLeft()), dup(p.getRight())));
+        return list;
+    }
 
-  private static final AgentPropagation.ContextVisitor<List<Pair<String, String>>> LIST_VISITOR =
-      new ListContextVisitor<>();
+    private static final AgentPropagation.ContextVisitor<List<Pair<String, String>>> LIST_VISITOR =
+            new ListContextVisitor<>();
 
-  private static final class ListContextVisitor<T extends List<Pair<String, String>>>
-      implements AgentPropagation.ContextVisitor<T> {
+    private static final class ListContextVisitor<T extends List<Pair<String, String>>>
+            implements AgentPropagation.ContextVisitor<T> {
 
-    @Override
-    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-      for (Pair<String, ?> entry : carrier) {
-        if (null != entry.getRight()
-            && !classifier.accept(entry.getLeft(), entry.getRight().toString())) {
-          return;
+        @Override
+        public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+            for (Pair<String, ?> entry : carrier) {
+                if (null != entry.getRight()
+                        && !classifier.accept(entry.getLeft(), entry.getRight().toString())) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/propagation/InjectorBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/core/propagation/InjectorBenchmark.java
index 1c070167377..dc06337769d 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/propagation/InjectorBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/propagation/InjectorBenchmark.java
@@ -40,134 +40,125 @@
 @Fork(value = 1)
 @SuppressForbidden
 public class InjectorBenchmark {
-  @Param({"datadog", "b3", "datadog,b3", "datadog:x-dth", "datadog:x-dth-mod"})
-  String injectPropagationStyles;
-
-  static String dup(String input) {
-    return new String(input.toLowerCase().getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
-  }
-
-  Map<String, String> headers;
-  HttpCodec.Injector injector;
-  DDTraceId traceId;
-  long spanId;
-  CoreTracer tracer;
-  DDSpanContext spanContext;
-  PropagationTags propagationTags;
-  boolean modifyPropagationTags = false;
-
-  @Setup(Level.Trial)
-  public void setUp(Blackhole blackhole) {
-    headers = new HashMap<>();
-    String[] propagationsAndFeatures = injectPropagationStyles.split(",");
-    StringBuilder propagations = new StringBuilder();
-    boolean addSeparator = false;
-    for (String pAndA : propagationsAndFeatures) {
-      if (addSeparator) {
-        propagations.append(',');
-      } else {
-        addSeparator = true;
-      }
-      String[] propagationAndFeatures = pAndA.split(":");
-      propagations.append(propagationAndFeatures[0]);
-      for (int i = 1; i < propagationAndFeatures.length; i++) {
-        String feature = propagationAndFeatures[i];
-        switch (feature) {
-          case "x-dth":
-            propagationTags =
-                PropagationTags.factory()
-                    .fromHeaderValue(
-                        PropagationTags.HeaderType.DATADOG,
-                        "_dd.p.anytag=value,_dd.p.dm=934086a686-4");
-            break;
-          case "x-dth-mod":
-            propagationTags =
-                PropagationTags.factory()
-                    .fromHeaderValue(
-                        PropagationTags.HeaderType.DATADOG,
-                        "_dd.p.anytag=value,_dd.p.dm=934086a686-4");
-            modifyPropagationTags = true;
-            break;
-          default:
-            System.out.println("Unknown benchmark feature " + feature + ". Will be ignored!");
+    @Param({"datadog", "b3", "datadog,b3", "datadog:x-dth", "datadog:x-dth-mod"})
+    String injectPropagationStyles;
+
+    static String dup(String input) {
+        return new String(input.toLowerCase().getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
+    }
+
+    Map<String, String> headers;
+    HttpCodec.Injector injector;
+    DDTraceId traceId;
+    long spanId;
+    CoreTracer tracer;
+    DDSpanContext spanContext;
+    PropagationTags propagationTags;
+    boolean modifyPropagationTags = false;
+
+    @Setup(Level.Trial)
+    public void setUp(Blackhole blackhole) {
+        headers = new HashMap<>();
+        String[] propagationsAndFeatures = injectPropagationStyles.split(",");
+        StringBuilder propagations = new StringBuilder();
+        boolean addSeparator = false;
+        for (String pAndA : propagationsAndFeatures) {
+            if (addSeparator) {
+                propagations.append(',');
+            } else {
+                addSeparator = true;
+            }
+            String[] propagationAndFeatures = pAndA.split(":");
+            propagations.append(propagationAndFeatures[0]);
+            for (int i = 1; i < propagationAndFeatures.length; i++) {
+                String feature = propagationAndFeatures[i];
+                switch (feature) {
+                    case "x-dth":
+                        propagationTags = PropagationTags.factory()
+                                .fromHeaderValue(
+                                        PropagationTags.HeaderType.DATADOG, "_dd.p.anytag=value,_dd.p.dm=934086a686-4");
+                        break;
+                    case "x-dth-mod":
+                        propagationTags = PropagationTags.factory()
+                                .fromHeaderValue(
+                                        PropagationTags.HeaderType.DATADOG, "_dd.p.anytag=value,_dd.p.dm=934086a686-4");
+                        modifyPropagationTags = true;
+                        break;
+                    default:
+                        System.out.println("Unknown benchmark feature " + feature + ". Will be ignored!");
+                }
+            }
         }
-      }
+
+        System.setProperty("dd.propagation.style.extract", propagations.toString());
+        injector = HttpCodec.createInjector(
+                Config.get(), Config.get().getTracePropagationStylesToInject(), Collections.emptyMap());
+
+        traceId = DDTraceId.from("12345");
+        spanId = DDSpanId.from("23456");
+
+        tracer = CoreTracer.builder()
+                .writer(new BlackholeWriter(blackhole, new TraceCounters(), 0))
+                .strictTraceWrites(false)
+                .build();
+
+        spanContext = new DDSpanContext(
+                traceId,
+                spanId,
+                DDSpanId.ZERO,
+                "",
+                "service",
+                "operation",
+                "resource",
+                0,
+                "origin",
+                Collections.<String, String>emptyMap(),
+                false,
+                "type",
+                0,
+                tracer.createTraceCollector(traceId),
+                null,
+                null,
+                null,
+                false,
+                propagationTags);
     }
 
-    System.setProperty("dd.propagation.style.extract", propagations.toString());
-    injector =
-        HttpCodec.createInjector(
-            Config.get(), Config.get().getTracePropagationStylesToInject(), Collections.emptyMap());
-
-    traceId = DDTraceId.from("12345");
-    spanId = DDSpanId.from("23456");
-
-    tracer =
-        CoreTracer.builder()
-            .writer(new BlackholeWriter(blackhole, new TraceCounters(), 0))
-            .strictTraceWrites(false)
-            .build();
-
-    spanContext =
-        new DDSpanContext(
-            traceId,
-            spanId,
-            DDSpanId.ZERO,
-            "",
-            "service",
-            "operation",
-            "resource",
-            0,
-            "origin",
-            Collections.<String, String>emptyMap(),
-            false,
-            "type",
-            0,
-            tracer.createTraceCollector(traceId),
-            null,
-            null,
-            null,
-            false,
-            propagationTags);
-  }
-
-  int mechanism = 0;
-
-  @Benchmark
-  public void injectContext(Blackhole blackhole) {
-    injector.inject(spanContext, headers, MAP_SETTER);
-    blackhole.consume(headers);
-    if (modifyPropagationTags) {
-      int sm = mechanism = (mechanism + 1) % 4;
-      propagationTags.updateTraceSamplingPriority(1, sm);
+    int mechanism = 0;
+
+    @Benchmark
+    public void injectContext(Blackhole blackhole) {
+        injector.inject(spanContext, headers, MAP_SETTER);
+        blackhole.consume(headers);
+        if (modifyPropagationTags) {
+            int sm = mechanism = (mechanism + 1) % 4;
+            propagationTags.updateTraceSamplingPriority(1, sm);
+        }
     }
-  }
 
-  private static final AgentPropagation.ContextVisitor<Map<String, String>> MAP_VISITOR =
-      new MapContextVisitor<>();
+    private static final AgentPropagation.ContextVisitor<Map<String, String>> MAP_VISITOR = new MapContextVisitor<>();
 
-  private static final class MapContextVisitor<T extends Map<String, String>>
-      implements AgentPropagation.ContextVisitor<T> {
+    private static final class MapContextVisitor<T extends Map<String, String>>
+            implements AgentPropagation.ContextVisitor<T> {
 
-    @Override
-    public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
-      for (Map.Entry<String, ?> entry : carrier.entrySet()) {
-        if (null != entry.getValue()
-            && !classifier.accept(entry.getKey(), entry.getValue().toString())) {
-          return;
+        @Override
+        public void forEachKey(T carrier, AgentPropagation.KeyClassifier classifier) {
+            for (Map.Entry<String, ?> entry : carrier.entrySet()) {
+                if (null != entry.getValue()
+                        && !classifier.accept(entry.getKey(), entry.getValue().toString())) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 
-  private static final CarrierSetter<Map<String, String>> MAP_SETTER = new MapContextSetter<>();
+    private static final CarrierSetter<Map<String, String>> MAP_SETTER = new MapContextSetter<>();
 
-  @ParametersAreNonnullByDefault
-  private static final class MapContextSetter<T extends Map<String, String>>
-      implements CarrierSetter<T> {
-    @Override
-    public void set(T carrier, String key, String value) {
-      carrier.put(key, value);
+    @ParametersAreNonnullByDefault
+    private static final class MapContextSetter<T extends Map<String, String>> implements CarrierSetter<T> {
+        @Override
+        public void set(T carrier, String key, String value) {
+            carrier.put(key, value);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/propagation/PropagationTagsBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/core/propagation/PropagationTagsBenchmark.java
index cd2dcfc09dd..4c715444e14 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/propagation/PropagationTagsBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/propagation/PropagationTagsBenchmark.java
@@ -28,45 +28,45 @@
 @SuppressForbidden
 public class PropagationTagsBenchmark {
 
-  /**
-   * In order to avoid JMH splitting up the strings, all ',' are replaced by '|' in the parameter.
-   * The parameter is split at '|' and the first element is the propagation tags header type. The
-   * rest of the elements are joined with ',' to form the header to be parsed.
-   */
-  @Param({
-    "datadog|_dd.p.anytag=value|_dd.p.dm=934086a686-4",
-    "w3c|dd=s:1;o:some;t.anytag:value;t.dm:934086a686-4",
-    "w3c|foo=bar|dd=s:1;o:some;t.anytag:value;t.dm:934086a686-4|bar=baz",
-    "w3c|foo=bar|dd=s:1;o:some;t.anytag:value;other:value;t.dm:934086a686-4|bar=baz"
-  })
-  String extractHeaderType;
+    /**
+     * In order to avoid JMH splitting up the strings, all ',' are replaced by '|' in the parameter.
+     * The parameter is split at '|' and the first element is the propagation tags header type. The
+     * rest of the elements are joined with ',' to form the header to be parsed.
+     */
+    @Param({
+        "datadog|_dd.p.anytag=value|_dd.p.dm=934086a686-4",
+        "w3c|dd=s:1;o:some;t.anytag:value;t.dm:934086a686-4",
+        "w3c|foo=bar|dd=s:1;o:some;t.anytag:value;t.dm:934086a686-4|bar=baz",
+        "w3c|foo=bar|dd=s:1;o:some;t.anytag:value;other:value;t.dm:934086a686-4|bar=baz"
+    })
+    String extractHeaderType;
 
-  @Param({"datadog", "w3c"})
-  String injectHeaderType;
+    @Param({"datadog", "w3c"})
+    String injectHeaderType;
 
-  PropagationTags.Factory factory;
-  PropagationTags.HeaderType extractHT;
-  PropagationTags.HeaderType injectHT;
-  String header;
+    PropagationTags.Factory factory;
+    PropagationTags.HeaderType extractHT;
+    PropagationTags.HeaderType injectHT;
+    String header;
 
-  @Setup(Level.Trial)
-  public void setUp() {
-    factory = PropagationTags.factory();
-    CharSequence[] parts = extractHeaderType.split("\\|");
-    extractHT = PropagationTags.HeaderType.valueOf(((String) parts[0]).toUpperCase());
-    header = String.join(",", Arrays.stream(parts, 1, parts.length)::iterator);
-    injectHT = PropagationTags.HeaderType.valueOf(injectHeaderType.toUpperCase());
-  }
+    @Setup(Level.Trial)
+    public void setUp() {
+        factory = PropagationTags.factory();
+        CharSequence[] parts = extractHeaderType.split("\\|");
+        extractHT = PropagationTags.HeaderType.valueOf(((String) parts[0]).toUpperCase());
+        header = String.join(",", Arrays.stream(parts, 1, parts.length)::iterator);
+        injectHT = PropagationTags.HeaderType.valueOf(injectHeaderType.toUpperCase());
+    }
 
-  @Benchmark
-  public void extractHeader(Blackhole blackhole) {
-    blackhole.consume(factory.fromHeaderValue(extractHT, header));
-  }
+    @Benchmark
+    public void extractHeader(Blackhole blackhole) {
+        blackhole.consume(factory.fromHeaderValue(extractHT, header));
+    }
 
-  @Benchmark
-  public void extractInjectHeader(Blackhole blackhole) {
-    PropagationTags pt = factory.fromHeaderValue(extractHT, header);
-    blackhole.consume(pt.headerValue(injectHT));
-    blackhole.consume(pt);
-  }
+    @Benchmark
+    public void extractInjectHeader(Blackhole blackhole) {
+        PropagationTags pt = factory.fromHeaderValue(extractHT, header);
+        blackhole.consume(pt.headerValue(injectHT));
+        blackhole.consume(pt);
+    }
 }
diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/propagation/ptags/KnuthSamplingRateFormatBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/core/propagation/ptags/KnuthSamplingRateFormatBenchmark.java
index 0a54ece3acf..a9310884f1e 100644
--- a/dd-trace-core/src/jmh/java/datadog/trace/core/propagation/ptags/KnuthSamplingRateFormatBenchmark.java
+++ b/dd-trace-core/src/jmh/java/datadog/trace/core/propagation/ptags/KnuthSamplingRateFormatBenchmark.java
@@ -48,70 +48,69 @@
 @Fork(value = 1)
 public class KnuthSamplingRateFormatBenchmark {
 
-  /**
-   * Representative sampling rates. Most real-world rates are in [0.001, 1.0]. The 0.0001 value
-   * exercises the edge of the fixed-notation range.
-   */
-  @Param({"0.5", "0.1", "0.01", "0.001", "0.0001", "0.123456789", "0.999999"})
-  double rate;
+    /**
+     * Representative sampling rates. Most real-world rates are in [0.001, 1.0]. The 0.0001 value
+     * exercises the edge of the fixed-notation range.
+     */
+    @Param({"0.5", "0.1", "0.01", "0.001", "0.0001", "0.123456789", "0.999999"})
+    double rate;
 
-  PropagationTags.Factory factory;
-  PTagsFactory.PTags ptags;
+    PropagationTags.Factory factory;
+    PTagsFactory.PTags ptags;
 
-  @Setup(Level.Trial)
-  public void setUp() {
-    factory = PropagationTags.factory();
-    ptags = (PTagsFactory.PTags) factory.empty();
-    ptags.tryUpdateProbabilitySamplingDecision(SAMPLER_DROP, AGENT_RATE, rate, false, 1L, false);
-  }
+    @Setup(Level.Trial)
+    public void setUp() {
+        factory = PropagationTags.factory();
+        ptags = (PTagsFactory.PTags) factory.empty();
+        ptags.tryUpdateProbabilitySamplingDecision(SAMPLER_DROP, AGENT_RATE, rate, false, 1L, false);
+    }
 
-  /** Baseline: old implementation using String.format + substring trimming. */
-  @Benchmark
-  public void stringFormat(Blackhole bh) {
-    bh.consume(stringFormatImpl(rate));
-  }
+    /** Baseline: old implementation using String.format + substring trimming. */
+    @Benchmark
+    public void stringFormat(Blackhole bh) {
+        bh.consume(stringFormatImpl(rate));
+    }
 
-  /** Custom formatter: char-array arithmetic, no Formatter allocation. */
-  @Benchmark
-  public void customFormat(Blackhole bh) {
-    bh.consume(PTagsFactory.PTags.formatKnuthSamplingRate(rate));
-  }
+    /** Custom formatter: char-array arithmetic, no Formatter allocation. */
+    @Benchmark
+    public void customFormat(Blackhole bh) {
+        bh.consume(PTagsFactory.PTags.formatKnuthSamplingRate(rate));
+    }
 
-  /**
-   * Cached TagValue: the full getKnuthSamplingRateTagValue() hot-path after caching. Should be
-   * near-zero allocation (volatile read only).
-   */
-  @Benchmark
-  public void cachedTagValue(Blackhole bh) {
-    bh.consume(ptags.getKnuthSamplingRateTagValue());
-  }
+    /**
+     * Cached TagValue: the full getKnuthSamplingRateTagValue() hot-path after caching. Should be
+     * near-zero allocation (volatile read only).
+     */
+    @Benchmark
+    public void cachedTagValue(Blackhole bh) {
+        bh.consume(ptags.getKnuthSamplingRateTagValue());
+    }
 
-  /** Models a fresh trace's probability decision, including its propagation tags allocation. */
-  @Benchmark
-  public void probabilityDecisionFreshTrace(Blackhole bh) {
-    PTagsFactory.PTags freshTags = (PTagsFactory.PTags) factory.empty();
-    freshTags.tryUpdateProbabilitySamplingDecision(
-        SAMPLER_DROP, AGENT_RATE, rate, false, 1L, false);
-    bh.consume(freshTags.getKnuthSamplingRateTagValue());
-  }
+    /** Models a fresh trace's probability decision, including its propagation tags allocation. */
+    @Benchmark
+    public void probabilityDecisionFreshTrace(Blackhole bh) {
+        PTagsFactory.PTags freshTags = (PTagsFactory.PTags) factory.empty();
+        freshTags.tryUpdateProbabilitySamplingDecision(SAMPLER_DROP, AGENT_RATE, rate, false, 1L, false);
+        bh.consume(freshTags.getKnuthSamplingRateTagValue());
+    }
 
-  // ---- old implementation for comparison (%.6f with trailing zero removal) ----
+    // ---- old implementation for comparison (%.6f with trailing zero removal) ----
 
-  static String stringFormatImpl(double rate) {
-    if (rate <= 0.0) return "0";
-    if (rate >= 1.0) return "1";
-    String formatted = String.format(Locale.ROOT, "%.6f", rate);
-    int dotIndex = formatted.indexOf('.');
-    if (dotIndex >= 0) {
-      int end = formatted.length();
-      while (end > dotIndex + 1 && formatted.charAt(end - 1) == '0') {
-        end--;
-      }
-      if (formatted.charAt(end - 1) == '.') {
-        end--;
-      }
-      formatted = formatted.substring(0, end);
+    static String stringFormatImpl(double rate) {
+        if (rate <= 0.0) return "0";
+        if (rate >= 1.0) return "1";
+        String formatted = String.format(Locale.ROOT, "%.6f", rate);
+        int dotIndex = formatted.indexOf('.');
+        if (dotIndex >= 0) {
+            int end = formatted.length();
+            while (end > dotIndex + 1 && formatted.charAt(end - 1) == '0') {
+                end--;
+            }
+            if (formatted.charAt(end - 1) == '.') {
+                end--;
+            }
+            formatted = formatted.substring(0, end);
+        }
+        return "0".equals(formatted) ? "0" : formatted;
     }
-    return "0".equals(formatted) ? "0" : formatted;
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityApmProtocolInterceptor.java b/dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityApmProtocolInterceptor.java
index 0481269895f..15d4d3799bf 100644
--- a/dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityApmProtocolInterceptor.java
+++ b/dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityApmProtocolInterceptor.java
@@ -19,47 +19,48 @@
  */
 public class CiVisibilityApmProtocolInterceptor extends AbstractTraceInterceptor {
 
-  public static final CiVisibilityApmProtocolInterceptor INSTANCE =
-      new CiVisibilityApmProtocolInterceptor(Priority.CI_VISIBILITY_APM, Config.get());
+    public static final CiVisibilityApmProtocolInterceptor INSTANCE =
+            new CiVisibilityApmProtocolInterceptor(Priority.CI_VISIBILITY_APM, Config.get());
 
-  private final CiVisibilityWellKnownTags wellKnownTags;
+    private final CiVisibilityWellKnownTags wellKnownTags;
 
-  protected CiVisibilityApmProtocolInterceptor(Priority priority, Config config) {
-    super(priority);
-    wellKnownTags = config.getCiVisibilityWellKnownTags();
-  }
+    protected CiVisibilityApmProtocolInterceptor(Priority priority, Config config) {
+        super(priority);
+        wellKnownTags = config.getCiVisibilityWellKnownTags();
+    }
 
-  @Override
-  public Collection<? extends MutableSpan> onTraceComplete(
-      Collection<? extends MutableSpan> trace) {
+    @Override
+    public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
 
-    List<? extends MutableSpan> filteredTrace =
-        trace.stream().filter(this::isSupportedByApmProtocol).collect(Collectors.toList());
-    for (MutableSpan span : filteredTrace) {
-      span.setTag(Tags.TEST_SESSION_ID, (Number) null);
-      span.setTag(Tags.TEST_MODULE_ID, (Number) null);
-      span.setTag(Tags.TEST_SUITE_ID, (Number) null);
+        List<? extends MutableSpan> filteredTrace =
+                trace.stream().filter(this::isSupportedByApmProtocol).collect(Collectors.toList());
+        for (MutableSpan span : filteredTrace) {
+            span.setTag(Tags.TEST_SESSION_ID, (Number) null);
+            span.setTag(Tags.TEST_MODULE_ID, (Number) null);
+            span.setTag(Tags.TEST_SUITE_ID, (Number) null);
 
-      String spanType = span.getSpanType();
-      if (DDSpanTypes.TEST.equals(spanType)) {
-        span.setTag(Tags.RUNTIME_NAME, wellKnownTags.getRuntimeName().toString());
-        span.setTag(Tags.RUNTIME_VENDOR, wellKnownTags.getRuntimeVendor().toString());
-        span.setTag(Tags.RUNTIME_VERSION, wellKnownTags.getRuntimeVersion().toString());
-        span.setTag(Tags.OS_ARCHITECTURE, wellKnownTags.getOsArch().toString());
-        span.setTag(Tags.OS_PLATFORM, wellKnownTags.getOsPlatform().toString());
-        span.setTag(Tags.OS_VERSION, wellKnownTags.getOsVersion().toString());
-        span.setTag(
-            DDTags.TEST_IS_USER_PROVIDED_SERVICE,
-            wellKnownTags.getIsUserProvidedService().toString());
-      }
+            String spanType = span.getSpanType();
+            if (DDSpanTypes.TEST.equals(spanType)) {
+                span.setTag(Tags.RUNTIME_NAME, wellKnownTags.getRuntimeName().toString());
+                span.setTag(
+                        Tags.RUNTIME_VENDOR, wellKnownTags.getRuntimeVendor().toString());
+                span.setTag(
+                        Tags.RUNTIME_VERSION, wellKnownTags.getRuntimeVersion().toString());
+                span.setTag(Tags.OS_ARCHITECTURE, wellKnownTags.getOsArch().toString());
+                span.setTag(Tags.OS_PLATFORM, wellKnownTags.getOsPlatform().toString());
+                span.setTag(Tags.OS_VERSION, wellKnownTags.getOsVersion().toString());
+                span.setTag(
+                        DDTags.TEST_IS_USER_PROVIDED_SERVICE,
+                        wellKnownTags.getIsUserProvidedService().toString());
+            }
+        }
+        return filteredTrace;
     }
-    return filteredTrace;
-  }
 
-  private boolean isSupportedByApmProtocol(MutableSpan span) {
-    String spanType = span.getSpanType();
-    return !DDSpanTypes.TEST_SESSION_END.equals(spanType)
-        && !DDSpanTypes.TEST_MODULE_END.equals(spanType)
-        && !DDSpanTypes.TEST_SUITE_END.equals(spanType);
-  }
+    private boolean isSupportedByApmProtocol(MutableSpan span) {
+        String spanType = span.getSpanType();
+        return !DDSpanTypes.TEST_SESSION_END.equals(spanType)
+                && !DDSpanTypes.TEST_MODULE_END.equals(spanType)
+                && !DDSpanTypes.TEST_SUITE_END.equals(spanType);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityTelemetryInterceptor.java b/dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityTelemetryInterceptor.java
index c8250d03540..6b54e23a7ca 100644
--- a/dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityTelemetryInterceptor.java
+++ b/dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityTelemetryInterceptor.java
@@ -8,15 +8,14 @@
 
 public class CiVisibilityTelemetryInterceptor extends AbstractTraceInterceptor {
 
-  public CiVisibilityTelemetryInterceptor() {
-    super(Priority.CI_VISIBILITY_TELEMETRY);
-  }
+    public CiVisibilityTelemetryInterceptor() {
+        super(Priority.CI_VISIBILITY_TELEMETRY);
+    }
 
-  @Override
-  public Collection<? extends MutableSpan> onTraceComplete(
-      Collection<? extends MutableSpan> trace) {
-    InstrumentationBridge.getMetricCollector()
-        .add(CiVisibilityCountMetric.EVENTS_ENQUEUED_FOR_SERIALIZATION, trace.size());
-    return trace;
-  }
+    @Override
+    public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
+        InstrumentationBridge.getMetricCollector()
+                .add(CiVisibilityCountMetric.EVENTS_ENQUEUED_FOR_SERIALIZATION, trace.size());
+        return trace;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptor.java b/dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptor.java
index 4d94d9dd8a7..4976b03dafc 100644
--- a/dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptor.java
+++ b/dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptor.java
@@ -12,36 +12,35 @@
 
 public class CiVisibilityTraceInterceptor extends AbstractTraceInterceptor {
 
-  public static final CiVisibilityTraceInterceptor INSTANCE =
-      new CiVisibilityTraceInterceptor(Priority.CI_VISIBILITY_TRACE);
-
-  protected CiVisibilityTraceInterceptor(Priority priority) {
-    super(priority);
-  }
-
-  @Override
-  public Collection<? extends MutableSpan> onTraceComplete(
-      Collection<? extends MutableSpan> trace) {
-    if (trace.isEmpty()) {
-      return trace;
+    public static final CiVisibilityTraceInterceptor INSTANCE =
+            new CiVisibilityTraceInterceptor(Priority.CI_VISIBILITY_TRACE);
+
+    protected CiVisibilityTraceInterceptor(Priority priority) {
+        super(priority);
     }
 
-    final DDSpan firstSpan = (DDSpan) trace.iterator().next();
-    final DDSpan localRootSpan = firstSpan.getLocalRootSpan();
+    @Override
+    public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
+        if (trace.isEmpty()) {
+            return trace;
+        }
 
-    final DDSpan spanToCheck = null == localRootSpan ? firstSpan : localRootSpan;
+        final DDSpan firstSpan = (DDSpan) trace.iterator().next();
+        final DDSpan localRootSpan = firstSpan.getLocalRootSpan();
 
-    // If root span does not originate from CI visibility, we drop the full trace.
-    CharSequence origin = spanToCheck.getOrigin();
-    if (origin == null || !CIAPP_TEST_ORIGIN.contentEquals(origin)) {
-      return Collections.emptyList();
-    }
+        final DDSpan spanToCheck = null == localRootSpan ? firstSpan : localRootSpan;
 
-    // If the trace belongs to a "test", we need to set the `library_version` tag for all spans.
-    for (MutableSpan span : trace) {
-      span.setTag(DDTags.LIBRARY_VERSION_TAG_KEY, DDTraceCoreInfo.VERSION);
-    }
+        // If root span does not originate from CI visibility, we drop the full trace.
+        CharSequence origin = spanToCheck.getOrigin();
+        if (origin == null || !CIAPP_TEST_ORIGIN.contentEquals(origin)) {
+            return Collections.emptyList();
+        }
 
-    return trace;
-  }
+        // If the trace belongs to a "test", we need to set the `library_version` tag for all spans.
+        for (MutableSpan span : trace) {
+            span.setTag(DDTags.LIBRARY_VERSION_TAG_KEY, DDTraceCoreInfo.VERSION);
+        }
+
+        return trace;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCovMapperV2.java b/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCovMapperV2.java
index cceca8cb784..73771a0f0d9 100644
--- a/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCovMapperV2.java
+++ b/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCovMapperV2.java
@@ -37,226 +37,222 @@
 
 public class CiTestCovMapperV2 implements RemoteMapper {
 
-  private static final byte[] VERSION = "version".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] COVERAGES = "coverages".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] TEST_SESSION_ID = "test_session_id".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] TEST_SUITE_ID = "test_suite_id".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] SPAN_ID = "span_id".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] FILES = "files".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] FILENAME = "filename".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] BITMAP = "bitmap".getBytes(StandardCharsets.UTF_8);
-
-  private final int size;
-  private final GrowableBuffer headerBuffer;
-  private final MsgPackWriter headerWriter;
-  private final boolean compressionEnabled;
-  private int eventCount = 0;
-  private int serializationTimeMillis = 0;
-
-  public CiTestCovMapperV2(boolean compressionEnabled) {
-    this(5 << 20, compressionEnabled);
-  }
-
-  private CiTestCovMapperV2(int size, boolean compressionEnabled) {
-    this.size = size;
-    this.compressionEnabled = compressionEnabled;
-    headerBuffer = new GrowableBuffer(16);
-    headerWriter = new MsgPackWriter(headerBuffer);
-  }
-
-  @Override
-  public void map(List<? extends CoreSpan<?>> trace, Writable writable) {
-    long serializationStartTimestamp = System.currentTimeMillis();
-
-    for (CoreSpan<?> span : trace) {
-      if (!isTestSpan(span)) {
-        continue;
-      }
-
-      TestReport testReport = getTestReport(span);
-      if (testReport == null || !testReport.isNotEmpty()) {
-        continue;
-      }
-
-      DDTraceId testSessionId = testReport.getTestSessionId();
-      Long testSuiteId = testReport.getTestSuiteId();
-
-      int fieldCount = 2 + (testSessionId != null ? 1 : 0) + (testSuiteId != null ? 1 : 0);
-
-      writable.startMap(fieldCount);
-
-      if (testSessionId != null) {
-        writable.writeUTF8(TEST_SESSION_ID);
-        writable.writeLong(testSessionId.toLong());
-      }
-
-      if (testSuiteId != null) {
-        writable.writeUTF8(TEST_SUITE_ID);
-        writable.writeLong(testSuiteId);
-      }
-
-      writable.writeUTF8(SPAN_ID);
-      writable.writeLong(testReport.getSpanId());
-
-      Collection<TestReportFileEntry> fileEntries = testReport.getTestReportFileEntries();
-
-      writable.writeUTF8(FILES);
-      writable.startArray(fileEntries.size());
-
-      for (TestReportFileEntry entry : fileEntries) {
-        BitSet coveredLines = entry.getCoveredLines();
-        boolean lineInfoPresent = coveredLines != null;
-
-        writable.startMap(1 + (lineInfoPresent ? 1 : 0));
-
-        writable.writeUTF8(FILENAME);
-        writable.writeString(entry.getSourceFileName(), null);
-
-        if (lineInfoPresent) {
-          writable.writeUTF8(BITMAP);
-          writable.writeBinary(coveredLines.toByteArray());
+    private static final byte[] VERSION = "version".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] COVERAGES = "coverages".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] TEST_SESSION_ID = "test_session_id".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] TEST_SUITE_ID = "test_suite_id".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] SPAN_ID = "span_id".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] FILES = "files".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] FILENAME = "filename".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] BITMAP = "bitmap".getBytes(StandardCharsets.UTF_8);
+
+    private final int size;
+    private final GrowableBuffer headerBuffer;
+    private final MsgPackWriter headerWriter;
+    private final boolean compressionEnabled;
+    private int eventCount = 0;
+    private int serializationTimeMillis = 0;
+
+    public CiTestCovMapperV2(boolean compressionEnabled) {
+        this(5 << 20, compressionEnabled);
+    }
+
+    private CiTestCovMapperV2(int size, boolean compressionEnabled) {
+        this.size = size;
+        this.compressionEnabled = compressionEnabled;
+        headerBuffer = new GrowableBuffer(16);
+        headerWriter = new MsgPackWriter(headerBuffer);
+    }
+
+    @Override
+    public void map(List<? extends CoreSpan<?>> trace, Writable writable) {
+        long serializationStartTimestamp = System.currentTimeMillis();
+
+        for (CoreSpan<?> span : trace) {
+            if (!isTestSpan(span)) {
+                continue;
+            }
+
+            TestReport testReport = getTestReport(span);
+            if (testReport == null || !testReport.isNotEmpty()) {
+                continue;
+            }
+
+            DDTraceId testSessionId = testReport.getTestSessionId();
+            Long testSuiteId = testReport.getTestSuiteId();
+
+            int fieldCount = 2 + (testSessionId != null ? 1 : 0) + (testSuiteId != null ? 1 : 0);
+
+            writable.startMap(fieldCount);
+
+            if (testSessionId != null) {
+                writable.writeUTF8(TEST_SESSION_ID);
+                writable.writeLong(testSessionId.toLong());
+            }
+
+            if (testSuiteId != null) {
+                writable.writeUTF8(TEST_SUITE_ID);
+                writable.writeLong(testSuiteId);
+            }
+
+            writable.writeUTF8(SPAN_ID);
+            writable.writeLong(testReport.getSpanId());
+
+            Collection<TestReportFileEntry> fileEntries = testReport.getTestReportFileEntries();
+
+            writable.writeUTF8(FILES);
+            writable.startArray(fileEntries.size());
+
+            for (TestReportFileEntry entry : fileEntries) {
+                BitSet coveredLines = entry.getCoveredLines();
+                boolean lineInfoPresent = coveredLines != null;
+
+                writable.startMap(1 + (lineInfoPresent ? 1 : 0));
+
+                writable.writeUTF8(FILENAME);
+                writable.writeString(entry.getSourceFileName(), null);
+
+                if (lineInfoPresent) {
+                    writable.writeUTF8(BITMAP);
+                    writable.writeBinary(coveredLines.toByteArray());
+                }
+            }
+
+            eventCount++;
         }
-      }
+        serializationTimeMillis += (int) (System.currentTimeMillis() - serializationStartTimestamp);
+    }
 
-      eventCount++;
+    private static boolean isTestSpan(CoreSpan<?> span) {
+        CharSequence type = span.getType();
+        return type != null && type.toString().contentEquals(InternalSpanTypes.TEST);
     }
-    serializationTimeMillis += (int) (System.currentTimeMillis() - serializationStartTimestamp);
-  }
-
-  private static boolean isTestSpan(CoreSpan<?> span) {
-    CharSequence type = span.getType();
-    return type != null && type.toString().contentEquals(InternalSpanTypes.TEST);
-  }
-
-  private static TestReport getTestReport(CoreSpan<?> span) {
-    if (span instanceof AgentSpan) {
-      TestContext test =
-          ((AgentSpan) span).getRequestContext().getData(RequestContextSlot.CI_VISIBILITY);
-      if (test != null) {
-        TestReportHolder probes = test.getCoverageStore();
-        if (probes != null) {
-          return probes.getReport();
+
+    private static TestReport getTestReport(CoreSpan<?> span) {
+        if (span instanceof AgentSpan) {
+            TestContext test = ((AgentSpan) span).getRequestContext().getData(RequestContextSlot.CI_VISIBILITY);
+            if (test != null) {
+                TestReportHolder probes = test.getCoverageStore();
+                if (probes != null) {
+                    return probes.getReport();
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
-
-  private void writeHeader() {
-    headerWriter.startMap(2);
-
-    headerWriter.writeUTF8(VERSION);
-    headerWriter.writeInt(2);
-
-    headerWriter.writeUTF8(COVERAGES);
-    headerWriter.startArray(eventCount);
-  }
-
-  @Override
-  public Payload newPayload() {
-    writeHeader();
-
-    CiVisibilityMetricCollector metricCollector = InstrumentationBridge.getMetricCollector();
-    metricCollector.add(
-        CiVisibilityDistributionMetric.ENDPOINT_PAYLOAD_EVENTS_COUNT,
-        eventCount,
-        Endpoint.CODE_COVERAGE);
-    metricCollector.add(
-        CiVisibilityDistributionMetric.ENDPOINT_PAYLOAD_EVENTS_SERIALIZATION_MS,
-        serializationTimeMillis,
-        Endpoint.CODE_COVERAGE);
-
-    return new PayloadV2(compressionEnabled).withHeader(headerBuffer.slice());
-  }
-
-  @Override
-  public int messageBufferSize() {
-    return size;
-  }
-
-  @Override
-  public void reset() {
-    eventCount = 0;
-    serializationTimeMillis = 0;
-  }
-
-  @Override
-  public String endpoint() {
-    return TrackType.CITESTCOV + "/v2";
-  }
-
-  private static class PayloadV2 extends Payload {
-
-    // backend requires _some_ JSON to be present
-    private static final RequestBody DUMMY_JSON_BODY =
-        jsonRequestBodyOf("{\"dummy\":true}".getBytes(StandardCharsets.UTF_8));
 
-    private final boolean compressionEnabled;
+    private void writeHeader() {
+        headerWriter.startMap(2);
 
-    ByteBuffer header = null;
+        headerWriter.writeUTF8(VERSION);
+        headerWriter.writeInt(2);
 
-    private PayloadV2(boolean compressionEnabled) {
-      this.compressionEnabled = compressionEnabled;
+        headerWriter.writeUTF8(COVERAGES);
+        headerWriter.startArray(eventCount);
     }
 
-    PayloadV2 withHeader(ByteBuffer header) {
-      this.header = header;
-      return this;
+    @Override
+    public Payload newPayload() {
+        writeHeader();
+
+        CiVisibilityMetricCollector metricCollector = InstrumentationBridge.getMetricCollector();
+        metricCollector.add(
+                CiVisibilityDistributionMetric.ENDPOINT_PAYLOAD_EVENTS_COUNT, eventCount, Endpoint.CODE_COVERAGE);
+        metricCollector.add(
+                CiVisibilityDistributionMetric.ENDPOINT_PAYLOAD_EVENTS_SERIALIZATION_MS,
+                serializationTimeMillis,
+                Endpoint.CODE_COVERAGE);
+
+        return new PayloadV2(compressionEnabled).withHeader(headerBuffer.slice());
     }
 
     @Override
-    public int sizeInBytes() {
-      if (traceCount() == 0) {
-        return msgpackMapHeaderSize(0);
-      }
-      int size = body.remaining();
-      if (header != null) {
-        size += header.remaining();
-      }
-      return size;
+    public int messageBufferSize() {
+        return size;
     }
 
     @Override
-    public void writeTo(WritableByteChannel channel) throws IOException {
-      // If traceCount is 0, we write a map with 0 elements in MsgPack format.
-      if (traceCount() == 0) {
-        ByteBuffer emptyDict = msgpackMapHeader(0);
-        while (emptyDict.hasRemaining()) {
-          channel.write(emptyDict);
+    public void reset() {
+        eventCount = 0;
+        serializationTimeMillis = 0;
+    }
+
+    @Override
+    public String endpoint() {
+        return TrackType.CITESTCOV + "/v2";
+    }
+
+    private static class PayloadV2 extends Payload {
+
+        // backend requires _some_ JSON to be present
+        private static final RequestBody DUMMY_JSON_BODY =
+                jsonRequestBodyOf("{\"dummy\":true}".getBytes(StandardCharsets.UTF_8));
+
+        private final boolean compressionEnabled;
+
+        ByteBuffer header = null;
+
+        private PayloadV2(boolean compressionEnabled) {
+            this.compressionEnabled = compressionEnabled;
+        }
+
+        PayloadV2 withHeader(ByteBuffer header) {
+            this.header = header;
+            return this;
         }
-      } else {
-        if (header != null) {
-          while (header.hasRemaining()) {
-            channel.write(header);
-          }
+
+        @Override
+        public int sizeInBytes() {
+            if (traceCount() == 0) {
+                return msgpackMapHeaderSize(0);
+            }
+            int size = body.remaining();
+            if (header != null) {
+                size += header.remaining();
+            }
+            return size;
         }
-        while (body.hasRemaining()) {
-          channel.write(body);
+
+        @Override
+        public void writeTo(WritableByteChannel channel) throws IOException {
+            // If traceCount is 0, we write a map with 0 elements in MsgPack format.
+            if (traceCount() == 0) {
+                ByteBuffer emptyDict = msgpackMapHeader(0);
+                while (emptyDict.hasRemaining()) {
+                    channel.write(emptyDict);
+                }
+            } else {
+                if (header != null) {
+                    while (header.hasRemaining()) {
+                        channel.write(header);
+                    }
+                }
+                while (body.hasRemaining()) {
+                    channel.write(body);
+                }
+            }
         }
-      }
-    }
 
-    @Override
-    public RequestBody toRequest() {
-      List<ByteBuffer> buffers;
-      if (traceCount() == 0) {
-        // If traceCount is 0, we write a map with 0 elements in MsgPack format.
-        buffers = Collections.singletonList(msgpackMapHeader(0));
-      } else if (header != null) {
-        buffers = Arrays.asList(header, body);
-      } else {
-        buffers = Collections.singletonList(body);
-      }
-      RequestBody coverageBody = msgpackRequestBodyOf(buffers);
-
-      MultipartBody multipartBody =
-          new MultipartBody.Builder()
-              .setType(MultipartBody.FORM)
-              .addFormDataPart("coverage1", "coverage1.msgpack", coverageBody)
-              .addFormDataPart("event", "event.json", DUMMY_JSON_BODY)
-              .build();
-
-      return compressionEnabled ? gzippedRequestBodyOf(multipartBody) : multipartBody;
+        @Override
+        public RequestBody toRequest() {
+            List<ByteBuffer> buffers;
+            if (traceCount() == 0) {
+                // If traceCount is 0, we write a map with 0 elements in MsgPack format.
+                buffers = Collections.singletonList(msgpackMapHeader(0));
+            } else if (header != null) {
+                buffers = Arrays.asList(header, body);
+            } else {
+                buffers = Collections.singletonList(body);
+            }
+            RequestBody coverageBody = msgpackRequestBodyOf(buffers);
+
+            MultipartBody multipartBody = new MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .addFormDataPart("coverage1", "coverage1.msgpack", coverageBody)
+                    .addFormDataPart("event", "event.json", DUMMY_JSON_BODY)
+                    .build();
+
+            return compressionEnabled ? gzippedRequestBodyOf(multipartBody) : multipartBody;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1.java b/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1.java
index 3de19f68088..332c30b53b4 100644
--- a/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1.java
+++ b/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1.java
@@ -40,408 +40,393 @@
 
 public class CiTestCycleMapperV1 implements RemoteMapper {
 
-  private static final byte[] VERSION = "version".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] METADATA = "metadata".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] METADATA_ASTERISK = "*".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] EVENTS = "events".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] ENV = "env".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] TYPE = "type".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] CONTENT = "content".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] TEST_SESSION_ID =
-      Tags.TEST_SESSION_ID.getBytes(StandardCharsets.UTF_8);
-  private static final byte[] TEST_MODULE_ID = Tags.TEST_MODULE_ID.getBytes(StandardCharsets.UTF_8);
-  private static final byte[] TEST_SUITE_ID = Tags.TEST_SUITE_ID.getBytes(StandardCharsets.UTF_8);
-  private static final byte[] TEST_IS_USER_PROVIDED_SERVICE =
-      DDTags.TEST_IS_USER_PROVIDED_SERVICE.getBytes(StandardCharsets.UTF_8);
-  private static final byte[] ITR_CORRELATION_ID =
-      Tags.ITR_CORRELATION_ID.getBytes(StandardCharsets.UTF_8);
-
-  private static final byte[] RUNTIME_NAME = Tags.RUNTIME_NAME.getBytes(StandardCharsets.UTF_8);
-  private static final byte[] RUNTIME_VENDOR = Tags.RUNTIME_VENDOR.getBytes(StandardCharsets.UTF_8);
-  private static final byte[] RUNTIME_VERSION =
-      Tags.RUNTIME_VERSION.getBytes(StandardCharsets.UTF_8);
-  private static final byte[] OS_ARCHITECTURE =
-      Tags.OS_ARCHITECTURE.getBytes(StandardCharsets.UTF_8);
-  private static final byte[] OS_PLATFORM = Tags.OS_PLATFORM.getBytes(StandardCharsets.UTF_8);
-  private static final byte[] OS_VERSION = Tags.OS_VERSION.getBytes(StandardCharsets.UTF_8);
-
-  private static final UTF8BytesString SPAN_TYPE = UTF8BytesString.create("span");
-
-  private static final Collection<String> DEFAULT_TOP_LEVEL_TAGS =
-      Arrays.asList(
-          Tags.TEST_SESSION_ID, Tags.TEST_MODULE_ID, Tags.TEST_SUITE_ID, Tags.ITR_CORRELATION_ID);
-
-  private final CiVisibilityWellKnownTags wellKnownTags;
-  private final int size;
-  private final GrowableBuffer headerBuffer;
-  private final MsgPackWriter headerWriter;
-  private final boolean compressionEnabled;
-  private int eventCount;
-  private int serializationTimeMillis;
-
-  public CiTestCycleMapperV1(CiVisibilityWellKnownTags wellKnownTags, boolean compressionEnabled) {
-    this.wellKnownTags = wellKnownTags;
-    this.size = 5 << 20;
-    this.compressionEnabled = compressionEnabled;
-    headerBuffer = new GrowableBuffer(16);
-    headerWriter = new MsgPackWriter(headerBuffer);
-  }
-
-  @Override
-  public void map(List<? extends CoreSpan<?>> trace, Writable writable) {
-    long serializationStartTimestamp = System.currentTimeMillis();
-
-    for (final CoreSpan<?> span : trace) {
-      DDTraceId testSessionId = span.getTag(Tags.TEST_SESSION_ID);
-      Number testModuleId = span.getTag(Tags.TEST_MODULE_ID);
-      Number testSuiteId = span.getTag(Tags.TEST_SUITE_ID);
-      String itrCorrelationId = span.getTag(Tags.ITR_CORRELATION_ID);
-
-      int topLevelTagsCount = 0;
-      if (testSessionId != null) {
-        topLevelTagsCount++;
-      }
-      if (testModuleId != null) {
-        topLevelTagsCount++;
-      }
-      if (testSuiteId != null) {
-        topLevelTagsCount++;
-      }
-      if (itrCorrelationId != null) {
-        topLevelTagsCount++;
-      }
-
-      UTF8BytesString type;
-      Long traceId;
-      Long spanId;
-      Long parentId;
-      int version;
-      CharSequence spanType = span.getType();
-      if (equals(InternalSpanTypes.TEST, spanType)) {
-        type = InternalSpanTypes.TEST;
-        traceId = span.getTraceId().toLong();
-        spanId = span.getSpanId();
-        parentId = span.getParentId();
-        // If there are no top-level tags,
-        // this is a test span that is not a part of a test suite,
-        // i.e. emitted by framework that does not support testing suites yet
-        version = topLevelTagsCount > 0 ? 2 : 1;
-
-      } else if (equals(InternalSpanTypes.TEST_SUITE_END, spanType)) {
-        type = InternalSpanTypes.TEST_SUITE_END;
-        traceId = null;
-        spanId = null;
-        parentId = null;
-        version = 1;
-
-      } else if (equals(InternalSpanTypes.TEST_MODULE_END, spanType)) {
-        type = InternalSpanTypes.TEST_MODULE_END;
-        traceId = null;
-        spanId = null;
-        parentId = null;
-        version = 1;
-
-      } else if (equals(InternalSpanTypes.TEST_SESSION_END, spanType)) {
-        type = InternalSpanTypes.TEST_SESSION_END;
-        traceId = null;
-        spanId = null;
-        parentId = null;
-        version = 1;
-
-      } else {
-        type = SPAN_TYPE;
-        traceId = span.getTraceId().toLong();
-        spanId = span.getSpanId();
-        parentId = span.getParentId();
-        version = 1;
-      }
-
-      int contentChildrenCount =
-          8
-              + (traceId != null ? 1 : 0)
-              + (spanId != null ? 1 : 0)
-              + (parentId != null ? 1 : 0)
-              + topLevelTagsCount;
-
-      writable.startMap(3);
-      /* 1 */
-      writable.writeUTF8(TYPE);
-      writable.writeUTF8(type);
-      /* 2 */
-      writable.writeUTF8(VERSION);
-      writable.writeInt(version);
-      /* 3 */
-      writable.writeUTF8(CONTENT);
-      writable.startMap(contentChildrenCount);
-
-      if (traceId != null) {
-        writable.writeUTF8(TRACE_ID);
-        writable.writeUnsignedLong(traceId);
-      }
-      if (spanId != null) {
-        writable.writeUTF8(SPAN_ID);
-        writable.writeUnsignedLong(spanId);
-      }
-      if (parentId != null) {
-        writable.writeUTF8(PARENT_ID);
-        writable.writeUnsignedLong(parentId);
-      }
-      if (testSessionId != null) {
-        writable.writeUTF8(TEST_SESSION_ID);
-        writable.writeObject(testSessionId.toLong(), null);
-      }
-      if (testModuleId != null) {
-        writable.writeUTF8(TEST_MODULE_ID);
-        writable.writeObject(testModuleId, null);
-      }
-      if (testSuiteId != null) {
-        writable.writeUTF8(TEST_SUITE_ID);
-        writable.writeObject(testSuiteId, null);
-      }
-      if (itrCorrelationId != null) {
-        writable.writeUTF8(ITR_CORRELATION_ID);
-        writable.writeObjectString(itrCorrelationId, null);
-      }
-
-      /* 1  */
-      writable.writeUTF8(SERVICE);
-      writable.writeString(span.getServiceName(), null);
-      /* 2  */
-      writable.writeUTF8(NAME);
-      writable.writeObject(span.getOperationName(), null);
-      /* 3  */
-      writable.writeUTF8(RESOURCE);
-      writable.writeObject(span.getResourceName(), null);
-      /* 4  */
-      writable.writeUTF8(START);
-      writable.writeLong(span.getStartTime());
-      /* 5  */
-      writable.writeUTF8(DURATION);
-      writable.writeLong(span.getDurationNano());
-      /* 6 */
-      writable.writeUTF8(ERROR);
-      writable.writeInt(span.getError());
-      /* 7 (meta), 8 (metrics) */
-      span.processTagsAndBaggage(metaWriter.withWritable(writable));
-    }
-    eventCount += trace.size();
-    serializationTimeMillis += (int) (System.currentTimeMillis() - serializationStartTimestamp);
-  }
-
-  private static boolean equals(CharSequence a, CharSequence b) {
-    return a == null && b == null
-        || a != null && b != null && Objects.equals(a.toString(), b.toString());
-  }
-
-  private final MetaWriter metaWriter = new MetaWriter();
-
-  private void writeHeader() {
-    headerWriter.startMap(3);
-    /* 1  */
-    headerWriter.writeUTF8(VERSION);
-    headerWriter.writeInt(1);
-    /* 2  */
-    headerWriter.writeUTF8(METADATA);
-    headerWriter.startMap(1);
-    /* 2,1 */
-    headerWriter.writeUTF8(METADATA_ASTERISK);
-    headerWriter.startMap(10);
-    /* 2,1,1 */
-    headerWriter.writeUTF8(ENV);
-    headerWriter.writeUTF8(wellKnownTags.getEnv());
-    /* 2,1,2 */
-    headerWriter.writeUTF8(RUNTIME_ID);
-    headerWriter.writeUTF8(wellKnownTags.getRuntimeId());
-    /* 2,1,3 */
-    headerWriter.writeUTF8(LANGUAGE);
-    headerWriter.writeUTF8(wellKnownTags.getLanguage());
-    /* 2,1,4 */
-    headerWriter.writeUTF8(RUNTIME_NAME);
-    headerWriter.writeUTF8(wellKnownTags.getRuntimeName());
-    /* 2,1,5 */
-    headerWriter.writeUTF8(RUNTIME_VENDOR);
-    headerWriter.writeUTF8(wellKnownTags.getRuntimeVendor());
-    /* 2,1,6 */
-    headerWriter.writeUTF8(RUNTIME_VERSION);
-    headerWriter.writeUTF8(wellKnownTags.getRuntimeVersion());
-    /* 2,1,7 */
-    headerWriter.writeUTF8(OS_ARCHITECTURE);
-    headerWriter.writeUTF8(wellKnownTags.getOsArch());
-    /* 2,1,8 */
-    headerWriter.writeUTF8(OS_PLATFORM);
-    headerWriter.writeUTF8(wellKnownTags.getOsPlatform());
-    /* 2,1,9 */
-    headerWriter.writeUTF8(OS_VERSION);
-    headerWriter.writeUTF8(wellKnownTags.getOsVersion());
-    /* 2,1,10 */
-    headerWriter.writeUTF8(TEST_IS_USER_PROVIDED_SERVICE);
-    headerWriter.writeUTF8(wellKnownTags.getIsUserProvidedService());
-    /* 3  */
-    headerWriter.writeUTF8(EVENTS);
-    headerWriter.startArray(eventCount);
-  }
-
-  @Override
-  public Payload newPayload() {
-    writeHeader();
-
-    CiVisibilityMetricCollector metricCollector = InstrumentationBridge.getMetricCollector();
-    metricCollector.add(
-        CiVisibilityDistributionMetric.ENDPOINT_PAYLOAD_EVENTS_COUNT,
-        eventCount,
-        Endpoint.TEST_CYCLE);
-    metricCollector.add(
-        CiVisibilityDistributionMetric.ENDPOINT_PAYLOAD_EVENTS_SERIALIZATION_MS,
-        serializationTimeMillis,
-        Endpoint.TEST_CYCLE);
-
-    return new PayloadV1(compressionEnabled).withHeader(headerBuffer.slice());
-  }
-
-  @Override
-  public int messageBufferSize() {
-    return size;
-  }
-
-  @Override
-  public void reset() {
-    eventCount = 0;
-    serializationTimeMillis = 0;
-  }
-
-  @Override
-  public String endpoint() {
-    return "citestcycle/v1";
-  }
-
-  private static final class MetaWriter implements MetadataConsumer {
-
-    private Writable writable;
-
-    MetaWriter withWritable(Writable writable) {
-      this.writable = writable;
-      return this;
+    private static final byte[] VERSION = "version".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] METADATA = "metadata".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] METADATA_ASTERISK = "*".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] EVENTS = "events".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] ENV = "env".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] TYPE = "type".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] CONTENT = "content".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] TEST_SESSION_ID = Tags.TEST_SESSION_ID.getBytes(StandardCharsets.UTF_8);
+    private static final byte[] TEST_MODULE_ID = Tags.TEST_MODULE_ID.getBytes(StandardCharsets.UTF_8);
+    private static final byte[] TEST_SUITE_ID = Tags.TEST_SUITE_ID.getBytes(StandardCharsets.UTF_8);
+    private static final byte[] TEST_IS_USER_PROVIDED_SERVICE =
+            DDTags.TEST_IS_USER_PROVIDED_SERVICE.getBytes(StandardCharsets.UTF_8);
+    private static final byte[] ITR_CORRELATION_ID = Tags.ITR_CORRELATION_ID.getBytes(StandardCharsets.UTF_8);
+
+    private static final byte[] RUNTIME_NAME = Tags.RUNTIME_NAME.getBytes(StandardCharsets.UTF_8);
+    private static final byte[] RUNTIME_VENDOR = Tags.RUNTIME_VENDOR.getBytes(StandardCharsets.UTF_8);
+    private static final byte[] RUNTIME_VERSION = Tags.RUNTIME_VERSION.getBytes(StandardCharsets.UTF_8);
+    private static final byte[] OS_ARCHITECTURE = Tags.OS_ARCHITECTURE.getBytes(StandardCharsets.UTF_8);
+    private static final byte[] OS_PLATFORM = Tags.OS_PLATFORM.getBytes(StandardCharsets.UTF_8);
+    private static final byte[] OS_VERSION = Tags.OS_VERSION.getBytes(StandardCharsets.UTF_8);
+
+    private static final UTF8BytesString SPAN_TYPE = UTF8BytesString.create("span");
+
+    private static final Collection<String> DEFAULT_TOP_LEVEL_TAGS =
+            Arrays.asList(Tags.TEST_SESSION_ID, Tags.TEST_MODULE_ID, Tags.TEST_SUITE_ID, Tags.ITR_CORRELATION_ID);
+
+    private final CiVisibilityWellKnownTags wellKnownTags;
+    private final int size;
+    private final GrowableBuffer headerBuffer;
+    private final MsgPackWriter headerWriter;
+    private final boolean compressionEnabled;
+    private int eventCount;
+    private int serializationTimeMillis;
+
+    public CiTestCycleMapperV1(CiVisibilityWellKnownTags wellKnownTags, boolean compressionEnabled) {
+        this.wellKnownTags = wellKnownTags;
+        this.size = 5 << 20;
+        this.compressionEnabled = compressionEnabled;
+        headerBuffer = new GrowableBuffer(16);
+        headerWriter = new MsgPackWriter(headerBuffer);
     }
 
     @Override
-    public void accept(Metadata metadata) {
-      TagMap tags = metadata.getTags().copy();
-
-      for (String ignoredTag : DEFAULT_TOP_LEVEL_TAGS) {
-        tags.remove(ignoredTag);
-      }
-
-      int metaSize =
-          metadata.getBaggage().size()
-              + tags.size()
-              + (UNSET_STATUS == metadata.getHttpStatusCode() ? 0 : 1);
-      int metricsSize = 0;
-      for (Map.Entry<String, Object> tag : tags.entrySet()) {
-        if (tag.getValue() instanceof Number) {
-          ++metricsSize;
-          --metaSize;
-        }
-      }
-      writable.writeUTF8(METRICS);
-      writable.startMap(metricsSize);
-      for (Map.Entry<String, Object> entry : tags.entrySet()) {
-        if (entry.getValue() instanceof Number) {
-          writable.writeString(entry.getKey(), null);
-          writable.writeObject(entry.getValue(), null);
-        }
-      }
-
-      writable.writeUTF8(META);
-      writable.startMap(metaSize);
-      // we don't need to deduplicate any overlap between tags and baggage here
-      // since they will be accumulated into maps in the same order downstream,
-      // we just need to be sure that the size is the same as the number of elements
-      for (Map.Entry<String, String> entry : metadata.getBaggage().entrySet()) {
-        writable.writeString(entry.getKey(), null);
-        writable.writeString(truncate(entry.getValue(), MAX_META_STRING_VALUE_LENGTH), null);
-      }
-      if (UNSET_STATUS != metadata.getHttpStatusCode()) {
-        writable.writeUTF8(HTTP_STATUS);
-        writable.writeUTF8(
-            truncate(metadata.getHttpStatusCodeString(), MAX_META_STRING_VALUE_LENGTH));
-      }
-      for (Map.Entry<String, Object> entry : tags.entrySet()) {
-        Object value = entry.getValue();
-        if (!(value instanceof Number)) {
-          writable.writeString(entry.getKey(), null);
-          if (!(value instanceof Iterable)) {
-            writable.writeString(
-                truncate(String.valueOf(value), MAX_META_STRING_VALUE_LENGTH), null);
-          } else {
-            String serializedValue = toJson((Collection<String>) value);
-            writable.writeString(truncate(serializedValue, MAX_META_STRING_VALUE_LENGTH), null);
-          }
+    public void map(List<? extends CoreSpan<?>> trace, Writable writable) {
+        long serializationStartTimestamp = System.currentTimeMillis();
+
+        for (final CoreSpan<?> span : trace) {
+            DDTraceId testSessionId = span.getTag(Tags.TEST_SESSION_ID);
+            Number testModuleId = span.getTag(Tags.TEST_MODULE_ID);
+            Number testSuiteId = span.getTag(Tags.TEST_SUITE_ID);
+            String itrCorrelationId = span.getTag(Tags.ITR_CORRELATION_ID);
+
+            int topLevelTagsCount = 0;
+            if (testSessionId != null) {
+                topLevelTagsCount++;
+            }
+            if (testModuleId != null) {
+                topLevelTagsCount++;
+            }
+            if (testSuiteId != null) {
+                topLevelTagsCount++;
+            }
+            if (itrCorrelationId != null) {
+                topLevelTagsCount++;
+            }
+
+            UTF8BytesString type;
+            Long traceId;
+            Long spanId;
+            Long parentId;
+            int version;
+            CharSequence spanType = span.getType();
+            if (equals(InternalSpanTypes.TEST, spanType)) {
+                type = InternalSpanTypes.TEST;
+                traceId = span.getTraceId().toLong();
+                spanId = span.getSpanId();
+                parentId = span.getParentId();
+                // If there are no top-level tags,
+                // this is a test span that is not a part of a test suite,
+                // i.e. emitted by framework that does not support testing suites yet
+                version = topLevelTagsCount > 0 ? 2 : 1;
+
+            } else if (equals(InternalSpanTypes.TEST_SUITE_END, spanType)) {
+                type = InternalSpanTypes.TEST_SUITE_END;
+                traceId = null;
+                spanId = null;
+                parentId = null;
+                version = 1;
+
+            } else if (equals(InternalSpanTypes.TEST_MODULE_END, spanType)) {
+                type = InternalSpanTypes.TEST_MODULE_END;
+                traceId = null;
+                spanId = null;
+                parentId = null;
+                version = 1;
+
+            } else if (equals(InternalSpanTypes.TEST_SESSION_END, spanType)) {
+                type = InternalSpanTypes.TEST_SESSION_END;
+                traceId = null;
+                spanId = null;
+                parentId = null;
+                version = 1;
+
+            } else {
+                type = SPAN_TYPE;
+                traceId = span.getTraceId().toLong();
+                spanId = span.getSpanId();
+                parentId = span.getParentId();
+                version = 1;
+            }
+
+            int contentChildrenCount = 8
+                    + (traceId != null ? 1 : 0)
+                    + (spanId != null ? 1 : 0)
+                    + (parentId != null ? 1 : 0)
+                    + topLevelTagsCount;
+
+            writable.startMap(3);
+            /* 1 */
+            writable.writeUTF8(TYPE);
+            writable.writeUTF8(type);
+            /* 2 */
+            writable.writeUTF8(VERSION);
+            writable.writeInt(version);
+            /* 3 */
+            writable.writeUTF8(CONTENT);
+            writable.startMap(contentChildrenCount);
+
+            if (traceId != null) {
+                writable.writeUTF8(TRACE_ID);
+                writable.writeUnsignedLong(traceId);
+            }
+            if (spanId != null) {
+                writable.writeUTF8(SPAN_ID);
+                writable.writeUnsignedLong(spanId);
+            }
+            if (parentId != null) {
+                writable.writeUTF8(PARENT_ID);
+                writable.writeUnsignedLong(parentId);
+            }
+            if (testSessionId != null) {
+                writable.writeUTF8(TEST_SESSION_ID);
+                writable.writeObject(testSessionId.toLong(), null);
+            }
+            if (testModuleId != null) {
+                writable.writeUTF8(TEST_MODULE_ID);
+                writable.writeObject(testModuleId, null);
+            }
+            if (testSuiteId != null) {
+                writable.writeUTF8(TEST_SUITE_ID);
+                writable.writeObject(testSuiteId, null);
+            }
+            if (itrCorrelationId != null) {
+                writable.writeUTF8(ITR_CORRELATION_ID);
+                writable.writeObjectString(itrCorrelationId, null);
+            }
+
+            /* 1  */
+            writable.writeUTF8(SERVICE);
+            writable.writeString(span.getServiceName(), null);
+            /* 2  */
+            writable.writeUTF8(NAME);
+            writable.writeObject(span.getOperationName(), null);
+            /* 3  */
+            writable.writeUTF8(RESOURCE);
+            writable.writeObject(span.getResourceName(), null);
+            /* 4  */
+            writable.writeUTF8(START);
+            writable.writeLong(span.getStartTime());
+            /* 5  */
+            writable.writeUTF8(DURATION);
+            writable.writeLong(span.getDurationNano());
+            /* 6 */
+            writable.writeUTF8(ERROR);
+            writable.writeInt(span.getError());
+            /* 7 (meta), 8 (metrics) */
+            span.processTagsAndBaggage(metaWriter.withWritable(writable));
         }
-      }
+        eventCount += trace.size();
+        serializationTimeMillis += (int) (System.currentTimeMillis() - serializationStartTimestamp);
     }
-  }
 
-  private static class PayloadV1 extends Payload {
-
-    private final boolean compressionEnabled;
+    private static boolean equals(CharSequence a, CharSequence b) {
+        return a == null && b == null || a != null && b != null && Objects.equals(a.toString(), b.toString());
+    }
 
-    ByteBuffer header = null;
+    private final MetaWriter metaWriter = new MetaWriter();
+
+    private void writeHeader() {
+        headerWriter.startMap(3);
+        /* 1  */
+        headerWriter.writeUTF8(VERSION);
+        headerWriter.writeInt(1);
+        /* 2  */
+        headerWriter.writeUTF8(METADATA);
+        headerWriter.startMap(1);
+        /* 2,1 */
+        headerWriter.writeUTF8(METADATA_ASTERISK);
+        headerWriter.startMap(10);
+        /* 2,1,1 */
+        headerWriter.writeUTF8(ENV);
+        headerWriter.writeUTF8(wellKnownTags.getEnv());
+        /* 2,1,2 */
+        headerWriter.writeUTF8(RUNTIME_ID);
+        headerWriter.writeUTF8(wellKnownTags.getRuntimeId());
+        /* 2,1,3 */
+        headerWriter.writeUTF8(LANGUAGE);
+        headerWriter.writeUTF8(wellKnownTags.getLanguage());
+        /* 2,1,4 */
+        headerWriter.writeUTF8(RUNTIME_NAME);
+        headerWriter.writeUTF8(wellKnownTags.getRuntimeName());
+        /* 2,1,5 */
+        headerWriter.writeUTF8(RUNTIME_VENDOR);
+        headerWriter.writeUTF8(wellKnownTags.getRuntimeVendor());
+        /* 2,1,6 */
+        headerWriter.writeUTF8(RUNTIME_VERSION);
+        headerWriter.writeUTF8(wellKnownTags.getRuntimeVersion());
+        /* 2,1,7 */
+        headerWriter.writeUTF8(OS_ARCHITECTURE);
+        headerWriter.writeUTF8(wellKnownTags.getOsArch());
+        /* 2,1,8 */
+        headerWriter.writeUTF8(OS_PLATFORM);
+        headerWriter.writeUTF8(wellKnownTags.getOsPlatform());
+        /* 2,1,9 */
+        headerWriter.writeUTF8(OS_VERSION);
+        headerWriter.writeUTF8(wellKnownTags.getOsVersion());
+        /* 2,1,10 */
+        headerWriter.writeUTF8(TEST_IS_USER_PROVIDED_SERVICE);
+        headerWriter.writeUTF8(wellKnownTags.getIsUserProvidedService());
+        /* 3  */
+        headerWriter.writeUTF8(EVENTS);
+        headerWriter.startArray(eventCount);
+    }
 
-    private PayloadV1(boolean compressionEnabled) {
-      this.compressionEnabled = compressionEnabled;
+    @Override
+    public Payload newPayload() {
+        writeHeader();
+
+        CiVisibilityMetricCollector metricCollector = InstrumentationBridge.getMetricCollector();
+        metricCollector.add(
+                CiVisibilityDistributionMetric.ENDPOINT_PAYLOAD_EVENTS_COUNT, eventCount, Endpoint.TEST_CYCLE);
+        metricCollector.add(
+                CiVisibilityDistributionMetric.ENDPOINT_PAYLOAD_EVENTS_SERIALIZATION_MS,
+                serializationTimeMillis,
+                Endpoint.TEST_CYCLE);
+
+        return new PayloadV1(compressionEnabled).withHeader(headerBuffer.slice());
     }
 
-    PayloadV1 withHeader(ByteBuffer header) {
-      this.header = header;
-      return this;
+    @Override
+    public int messageBufferSize() {
+        return size;
     }
 
     @Override
-    public int sizeInBytes() {
-      if (traceCount() == 0) {
-        return msgpackMapHeaderSize(0);
-      }
-      int size = body.remaining();
-      if (header != null) {
-        size += header.remaining();
-      }
-      return size;
+    public void reset() {
+        eventCount = 0;
+        serializationTimeMillis = 0;
     }
 
     @Override
-    public void writeTo(WritableByteChannel channel) throws IOException {
-      // If traceCount is 0, we write a map with 0 elements in MsgPack format.
-      if (traceCount() == 0) {
-        ByteBuffer emptyDict = msgpackMapHeader(0);
-        while (emptyDict.hasRemaining()) {
-          channel.write(emptyDict);
-        }
-      } else {
-        if (header != null) {
-          while (header.hasRemaining()) {
-            channel.write(header);
-          }
+    public String endpoint() {
+        return "citestcycle/v1";
+    }
+
+    private static final class MetaWriter implements MetadataConsumer {
+
+        private Writable writable;
+
+        MetaWriter withWritable(Writable writable) {
+            this.writable = writable;
+            return this;
         }
-        while (body.hasRemaining()) {
-          channel.write(body);
+
+        @Override
+        public void accept(Metadata metadata) {
+            TagMap tags = metadata.getTags().copy();
+
+            for (String ignoredTag : DEFAULT_TOP_LEVEL_TAGS) {
+                tags.remove(ignoredTag);
+            }
+
+            int metaSize =
+                    metadata.getBaggage().size() + tags.size() + (UNSET_STATUS == metadata.getHttpStatusCode() ? 0 : 1);
+            int metricsSize = 0;
+            for (Map.Entry<String, Object> tag : tags.entrySet()) {
+                if (tag.getValue() instanceof Number) {
+                    ++metricsSize;
+                    --metaSize;
+                }
+            }
+            writable.writeUTF8(METRICS);
+            writable.startMap(metricsSize);
+            for (Map.Entry<String, Object> entry : tags.entrySet()) {
+                if (entry.getValue() instanceof Number) {
+                    writable.writeString(entry.getKey(), null);
+                    writable.writeObject(entry.getValue(), null);
+                }
+            }
+
+            writable.writeUTF8(META);
+            writable.startMap(metaSize);
+            // we don't need to deduplicate any overlap between tags and baggage here
+            // since they will be accumulated into maps in the same order downstream,
+            // we just need to be sure that the size is the same as the number of elements
+            for (Map.Entry<String, String> entry : metadata.getBaggage().entrySet()) {
+                writable.writeString(entry.getKey(), null);
+                writable.writeString(truncate(entry.getValue(), MAX_META_STRING_VALUE_LENGTH), null);
+            }
+            if (UNSET_STATUS != metadata.getHttpStatusCode()) {
+                writable.writeUTF8(HTTP_STATUS);
+                writable.writeUTF8(truncate(metadata.getHttpStatusCodeString(), MAX_META_STRING_VALUE_LENGTH));
+            }
+            for (Map.Entry<String, Object> entry : tags.entrySet()) {
+                Object value = entry.getValue();
+                if (!(value instanceof Number)) {
+                    writable.writeString(entry.getKey(), null);
+                    if (!(value instanceof Iterable)) {
+                        writable.writeString(truncate(String.valueOf(value), MAX_META_STRING_VALUE_LENGTH), null);
+                    } else {
+                        String serializedValue = toJson((Collection<String>) value);
+                        writable.writeString(truncate(serializedValue, MAX_META_STRING_VALUE_LENGTH), null);
+                    }
+                }
+            }
         }
-      }
     }
 
-    @Override
-    public RequestBody toRequest() {
-      // If traceCount is 0, we write a map with 0 elements in MsgPack format.
-      List<ByteBuffer> buffers;
-      if (traceCount() == 0) {
-        buffers = Collections.singletonList(msgpackMapHeader(0));
-      } else if (header != null) {
-        buffers = Arrays.asList(header, body);
-      } else {
-        buffers = Collections.singletonList(body);
-      }
-      return compressionEnabled
-          ? gzippedMsgpackRequestBodyOf(buffers)
-          : msgpackRequestBodyOf(buffers);
+    private static class PayloadV1 extends Payload {
+
+        private final boolean compressionEnabled;
+
+        ByteBuffer header = null;
+
+        private PayloadV1(boolean compressionEnabled) {
+            this.compressionEnabled = compressionEnabled;
+        }
+
+        PayloadV1 withHeader(ByteBuffer header) {
+            this.header = header;
+            return this;
+        }
+
+        @Override
+        public int sizeInBytes() {
+            if (traceCount() == 0) {
+                return msgpackMapHeaderSize(0);
+            }
+            int size = body.remaining();
+            if (header != null) {
+                size += header.remaining();
+            }
+            return size;
+        }
+
+        @Override
+        public void writeTo(WritableByteChannel channel) throws IOException {
+            // If traceCount is 0, we write a map with 0 elements in MsgPack format.
+            if (traceCount() == 0) {
+                ByteBuffer emptyDict = msgpackMapHeader(0);
+                while (emptyDict.hasRemaining()) {
+                    channel.write(emptyDict);
+                }
+            } else {
+                if (header != null) {
+                    while (header.hasRemaining()) {
+                        channel.write(header);
+                    }
+                }
+                while (body.hasRemaining()) {
+                    channel.write(body);
+                }
+            }
+        }
+
+        @Override
+        public RequestBody toRequest() {
+            // If traceCount is 0, we write a map with 0 elements in MsgPack format.
+            List<ByteBuffer> buffers;
+            if (traceCount() == 0) {
+                buffers = Collections.singletonList(msgpackMapHeader(0));
+            } else if (header != null) {
+                buffers = Arrays.asList(header, body);
+            } else {
+                buffers = Collections.singletonList(body);
+            }
+            return compressionEnabled ? gzippedMsgpackRequestBodyOf(buffers) : msgpackRequestBodyOf(buffers);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/GitMetadataTraceInterceptor.java b/dd-trace-core/src/main/java/datadog/trace/common/GitMetadataTraceInterceptor.java
index df43b61d6d6..6e4bbcae8cd 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/GitMetadataTraceInterceptor.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/GitMetadataTraceInterceptor.java
@@ -11,26 +11,24 @@
 
 public class GitMetadataTraceInterceptor extends AbstractTraceInterceptor {
 
-  public static final TraceInterceptor INSTANCE =
-      new GitMetadataTraceInterceptor(Priority.GIT_METADATA);
-
-  protected GitMetadataTraceInterceptor(Priority priority) {
-    super(priority);
-  }
-
-  @Override
-  public Collection<? extends MutableSpan> onTraceComplete(
-      Collection<? extends MutableSpan> trace) {
-    if (trace.isEmpty()) {
-      return trace;
+    public static final TraceInterceptor INSTANCE = new GitMetadataTraceInterceptor(Priority.GIT_METADATA);
+
+    protected GitMetadataTraceInterceptor(Priority priority) {
+        super(priority);
     }
 
-    final DDSpan firstSpan = (DDSpan) trace.iterator().next();
-    String ciWorkspacePath = (String) firstSpan.getTag(Tags.CI_WORKSPACE_PATH);
+    @Override
+    public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
+        if (trace.isEmpty()) {
+            return trace;
+        }
+
+        final DDSpan firstSpan = (DDSpan) trace.iterator().next();
+        String ciWorkspacePath = (String) firstSpan.getTag(Tags.CI_WORKSPACE_PATH);
 
-    GitInfo gitInfo = GitInfoProvider.INSTANCE.getGitInfo(ciWorkspacePath);
-    gitInfo.addTags(firstSpan);
+        GitInfo gitInfo = GitInfoProvider.INSTANCE.getGitInfo(ciWorkspacePath);
+        gitInfo.addTags(firstSpan);
 
-    return trace;
-  }
+        return trace;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/AdditionalTagsSchema.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/AdditionalTagsSchema.java
index 1965f06d3ba..f22bd391967 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/AdditionalTagsSchema.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/AdditionalTagsSchema.java
@@ -16,120 +16,113 @@
  */
 final class AdditionalTagsSchema {
 
-  private static final Logger log = LoggerFactory.getLogger(AdditionalTagsSchema.class);
+    private static final Logger log = LoggerFactory.getLogger(AdditionalTagsSchema.class);
 
-  // Backend stats pipeline only supports a few primary tag dimensions; drop overflow at startup.
-  static final int MAX_ADDITIONAL_TAG_KEYS = 4;
+    // Backend stats pipeline only supports a few primary tag dimensions; drop overflow at startup.
+    static final int MAX_ADDITIONAL_TAG_KEYS = 4;
 
-  // Health-metric statsD tags per the approved Cardinality Limits RFC (section 5): collapses are
-  // reported under the lowercased protobuf field name additional_metric_tags, with cardinality-
-  // collapses (collapsed:) and per-value length-collapses (oversized:) tagged distinctly.
-  private static final String[] COLLAPSED_STATSD_TAG = {"collapsed:additional_metric_tags"};
-  private static final String[] OVERSIZED_STATSD_TAG = {"oversized:additional_metric_tags"};
+    // Health-metric statsD tags per the approved Cardinality Limits RFC (section 5): collapses are
+    // reported under the lowercased protobuf field name additional_metric_tags, with cardinality-
+    // collapses (collapsed:) and per-value length-collapses (oversized:) tagged distinctly.
+    private static final String[] COLLAPSED_STATSD_TAG = {"collapsed:additional_metric_tags"};
+    private static final String[] OVERSIZED_STATSD_TAG = {"oversized:additional_metric_tags"};
 
-  /** Singleton empty schema returned when no additional tags are configured. */
-  static final AdditionalTagsSchema EMPTY =
-      new AdditionalTagsSchema(new String[0], new TagCardinalityHandler[0]);
+    /** Singleton empty schema returned when no additional tags are configured. */
+    static final AdditionalTagsSchema EMPTY = new AdditionalTagsSchema(new String[0], new TagCardinalityHandler[0]);
 
-  final String[] names;
+    final String[] names;
 
-  /** Per-key handlers providing UTF8 caching and per-cycle cardinality limiting. */
-  private final TagCardinalityHandler[] handlers;
+    /** Per-key handlers providing UTF8 caching and per-cycle cardinality limiting. */
+    private final TagCardinalityHandler[] handlers;
 
-  private AdditionalTagsSchema(String[] names, TagCardinalityHandler[] handlers) {
-    this.names = names;
-    this.handlers = handlers;
-  }
-
-  /** Test convenience: limits enabled. */
-  static AdditionalTagsSchema from(Set<String> configured) {
-    return from(
-        configured,
-        MetricCardinalityLimits.ADDITIONAL_TAG_VALUE,
-        MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
-  }
-
-  static AdditionalTagsSchema from(Set<String> configured, int limit, boolean useBlockedSentinel) {
-    if (configured == null || configured.isEmpty()) {
-      return EMPTY;
-    }
-    List<String> valid = new ArrayList<>();
-    for (String key : configured) {
-      if (key == null || key.isEmpty()) {
-        log.warn("Ignoring empty additional metric tag key");
-        continue;
-      }
-      if (key.contains(":")) {
-        log.warn("Ignoring additional metric tag key '{}': keys must not contain ':'", key);
-        continue;
-      }
-      valid.add(key);
-    }
-    if (valid.isEmpty()) {
-      return EMPTY;
-    }
-    Collections.sort(valid);
-    // Keys arrive as a Set, so they are already distinct — no dedup needed.
-    if (valid.size() > MAX_ADDITIONAL_TAG_KEYS) {
-      log.warn(
-          "Configured additional metric tag keys ({}) exceeds the supported limit of {}; "
-              + "dropping extra keys: {}",
-          valid.size(),
-          MAX_ADDITIONAL_TAG_KEYS,
-          valid.subList(MAX_ADDITIONAL_TAG_KEYS, valid.size()));
-      valid = valid.subList(0, MAX_ADDITIONAL_TAG_KEYS);
-    }
-    String[] namesArr = valid.toArray(new String[0]);
-    TagCardinalityHandler[] handlersArr = new TagCardinalityHandler[namesArr.length];
-    for (int i = 0; i < namesArr.length; i++) {
-      handlersArr[i] =
-          new TagCardinalityHandler(
-              namesArr[i],
-              limit,
-              useBlockedSentinel,
-              MetricCardinalityLimits.ADDITIONAL_TAG_MAX_VALUE_LENGTH);
+    private AdditionalTagsSchema(String[] names, TagCardinalityHandler[] handlers) {
+        this.names = names;
+        this.handlers = handlers;
     }
-    return new AdditionalTagsSchema(namesArr, handlersArr);
-  }
 
-  int size() {
-    return names.length;
-  }
+    /** Test convenience: limits enabled. */
+    static AdditionalTagsSchema from(Set<String> configured) {
+        return from(
+                configured, MetricCardinalityLimits.ADDITIONAL_TAG_VALUE, MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
+    }
 
-  String name(int i) {
-    return names[i];
-  }
+    static AdditionalTagsSchema from(Set<String> configured, int limit, boolean useBlockedSentinel) {
+        if (configured == null || configured.isEmpty()) {
+            return EMPTY;
+        }
+        List<String> valid = new ArrayList<>();
+        for (String key : configured) {
+            if (key == null || key.isEmpty()) {
+                log.warn("Ignoring empty additional metric tag key");
+                continue;
+            }
+            if (key.contains(":")) {
+                log.warn("Ignoring additional metric tag key '{}': keys must not contain ':'", key);
+                continue;
+            }
+            valid.add(key);
+        }
+        if (valid.isEmpty()) {
+            return EMPTY;
+        }
+        Collections.sort(valid);
+        // Keys arrive as a Set, so they are already distinct — no dedup needed.
+        if (valid.size() > MAX_ADDITIONAL_TAG_KEYS) {
+            log.warn(
+                    "Configured additional metric tag keys ({}) exceeds the supported limit of {}; "
+                            + "dropping extra keys: {}",
+                    valid.size(),
+                    MAX_ADDITIONAL_TAG_KEYS,
+                    valid.subList(MAX_ADDITIONAL_TAG_KEYS, valid.size()));
+            valid = valid.subList(0, MAX_ADDITIONAL_TAG_KEYS);
+        }
+        String[] namesArr = valid.toArray(new String[0]);
+        TagCardinalityHandler[] handlersArr = new TagCardinalityHandler[namesArr.length];
+        for (int i = 0; i < namesArr.length; i++) {
+            handlersArr[i] = new TagCardinalityHandler(
+                    namesArr[i], limit, useBlockedSentinel, MetricCardinalityLimits.ADDITIONAL_TAG_MAX_VALUE_LENGTH);
+        }
+        return new AdditionalTagsSchema(namesArr, handlersArr);
+    }
 
-  UTF8BytesString register(int i, String value) {
-    return handlers[i].register(value);
-  }
+    int size() {
+        return names.length;
+    }
 
-  void resetHandlers(HealthMetrics healthMetrics, CardinalityLimitReporter reporter) {
-    long totalCollapsed = 0;
-    long totalOversized = 0;
-    for (int i = 0; i < handlers.length; i++) {
-      // oversizedCount() must be read before reset(), which zeroes both per-cycle counts.
-      long oversized = handlers[i].oversizedCount();
-      long collapsed = handlers[i].reset();
-      // The human-facing reporter names the specific tag that triggered the block, so it records
-      // both collapse kinds under the tag's own name.
-      long blocked = collapsed + oversized;
-      if (blocked > 0) {
-        reporter.record(names[i], blocked);
-      }
-      totalCollapsed += collapsed;
-      totalOversized += oversized;
+    String name(int i) {
+        return names[i];
     }
-    // The health metric is reported at the additional_metric_tags field granularity (not per tag
-    // name), with cardinality-collapses and length-collapses ("oversized") tagged distinctly per
-    // the approved Cardinality Limits RFC.
-    if (totalCollapsed > 0) {
-      healthMetrics.onTagCardinalityBlocked(COLLAPSED_STATSD_TAG, totalCollapsed);
-      StatsMetrics.getInstance().onCollapsedSpans(COLLAPSED_STATSD_TAG[0], totalCollapsed);
+
+    UTF8BytesString register(int i, String value) {
+        return handlers[i].register(value);
     }
-    if (totalOversized > 0) {
-      healthMetrics.onTagCardinalityBlocked(OVERSIZED_STATSD_TAG, totalOversized);
-      StatsMetrics.getInstance().onCollapsedSpans(OVERSIZED_STATSD_TAG[0], totalOversized);
+
+    void resetHandlers(HealthMetrics healthMetrics, CardinalityLimitReporter reporter) {
+        long totalCollapsed = 0;
+        long totalOversized = 0;
+        for (int i = 0; i < handlers.length; i++) {
+            // oversizedCount() must be read before reset(), which zeroes both per-cycle counts.
+            long oversized = handlers[i].oversizedCount();
+            long collapsed = handlers[i].reset();
+            // The human-facing reporter names the specific tag that triggered the block, so it records
+            // both collapse kinds under the tag's own name.
+            long blocked = collapsed + oversized;
+            if (blocked > 0) {
+                reporter.record(names[i], blocked);
+            }
+            totalCollapsed += collapsed;
+            totalOversized += oversized;
+        }
+        // The health metric is reported at the additional_metric_tags field granularity (not per tag
+        // name), with cardinality-collapses and length-collapses ("oversized") tagged distinctly per
+        // the approved Cardinality Limits RFC.
+        if (totalCollapsed > 0) {
+            healthMetrics.onTagCardinalityBlocked(COLLAPSED_STATSD_TAG, totalCollapsed);
+            StatsMetrics.getInstance().onCollapsedSpans(COLLAPSED_STATSD_TAG[0], totalCollapsed);
+        }
+        if (totalOversized > 0) {
+            healthMetrics.onTagCardinalityBlocked(OVERSIZED_STATSD_TAG, totalOversized);
+            StatsMetrics.getInstance().onCollapsedSpans(OVERSIZED_STATSD_TAG[0], totalOversized);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateEntry.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateEntry.java
index 1214b246470..f60ca8ceb0e 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateEntry.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateEntry.java
@@ -17,567 +17,565 @@
  */
 public final class AggregateEntry extends Hashtable.Entry {
 
-  static final long ERROR_TAG = 0x8000000000000000L;
-  static final long TOP_LEVEL_TAG = 0x4000000000000000L;
-
-  private static final UTF8BytesString[] EMPTY_TAGS = new UTF8BytesString[0];
-
-  final UTF8BytesString resource;
-  final UTF8BytesString service;
-  final UTF8BytesString operationName;
-  // Optional fields use UTF8BytesString.EMPTY as the "absent" sentinel rather than null. The
-  // cardinality handlers map null inputs to EMPTY, and createUtf8 does the same for the of(...)
-  // factory, so callers don't need to special-case absence.
-  final UTF8BytesString serviceSource;
-  final UTF8BytesString type;
-  final UTF8BytesString spanKind;
-  final UTF8BytesString httpMethod;
-  final UTF8BytesString httpEndpoint;
-  final UTF8BytesString grpcStatusCode;
-  final short httpStatusCode;
-  final boolean synthetic;
-  final boolean traceRoot;
-  final List<UTF8BytesString> peerTags;
-
-  // Schema-ordered "key:value" strings; "key:" prefix makes packing unambiguous without null slots.
-  final UTF8BytesString[] additionalTags;
-
-  // Recording state (this field through errorDuration below) is thread-confined: the entry is
-  // mutated only on the aggregator thread, so these fields are intentionally unsynchronized and not
-  // thread-safe. Producers hand off immutable SpanSnapshots; only the aggregator thread records
-  // into the entry.
-  private final Histogram okLatencies;
-
-  // Null until first error; SerializingMetricWriter writes empty histogram form when null. Not
-  // thread-safe as well.
-  @Nullable private Histogram errorLatencies;
-
-  private int errorCount;
-  private int hitCount;
-  private int topLevelCount;
-  // Tracked separately for per-outcome OTLP histogram sums; getDuration() returns the sum.
-  private long okDuration;
-  private long errorDuration;
-
-  /**
-   * Field-bearing constructor. Package-private so {@link AggregateEntryTestUtils} can build
-   * expected entries.
-   */
-  AggregateEntry(
-      long keyHash,
-      UTF8BytesString resource,
-      UTF8BytesString service,
-      UTF8BytesString operationName,
-      UTF8BytesString serviceSource,
-      UTF8BytesString type,
-      UTF8BytesString spanKind,
-      UTF8BytesString httpMethod,
-      UTF8BytesString httpEndpoint,
-      UTF8BytesString grpcStatusCode,
-      short httpStatusCode,
-      boolean synthetic,
-      boolean traceRoot,
-      List<UTF8BytesString> peerTags,
-      UTF8BytesString[] additionalTags) {
-    super(keyHash);
-    this.resource = resource;
-    this.service = service;
-    this.operationName = operationName;
-    this.serviceSource = serviceSource;
-    this.type = type;
-    this.spanKind = spanKind;
-    this.httpMethod = httpMethod;
-    this.httpEndpoint = httpEndpoint;
-    this.grpcStatusCode = grpcStatusCode;
-    this.httpStatusCode = httpStatusCode;
-    this.synthetic = synthetic;
-    this.traceRoot = traceRoot;
-    this.peerTags = peerTags;
-    this.additionalTags = additionalTags;
-    this.okLatencies = Histogram.newHistogram();
-  }
-
-  /**
-   * 64-bit lookup hash, computed over UTF8-encoded fields so that cardinality-blocked values (which
-   * all canonicalize to the same sentinel {@link UTF8BytesString}) collide in the same bucket.
-   * {@link UTF8BytesString#hashCode()} returns the underlying String hash, so entries built via
-   * {@link #of} produce the same hash as entries built from a snapshot with matching content.
-   *
-   * <p>Field order intentionally mirrors {@link Canonical#matches} -- UTF8 fields first (highest
-   * cardinality first for matches' short-circuit benefit), then the peer-tag list, then the
-   * primitives. The hash itself is order-stable across all callers; the lockstep ordering is purely
-   * for readability when reasoning about lookup and equality in tandem.
-   */
-  static long hashOf(
-      UTF8BytesString resource,
-      UTF8BytesString service,
-      UTF8BytesString operationName,
-      UTF8BytesString serviceSource,
-      UTF8BytesString type,
-      UTF8BytesString spanKind,
-      UTF8BytesString httpMethod,
-      UTF8BytesString httpEndpoint,
-      UTF8BytesString grpcStatusCode,
-      short httpStatusCode,
-      boolean synthetic,
-      boolean traceRoot,
-      UTF8BytesString[] peerTags,
-      int peerTagCount,
-      UTF8BytesString[] additionalTags,
-      int additionalTagCount) {
-    long h = 0;
-    h = LongHashingUtils.addToHash(h, resource);
-    h = LongHashingUtils.addToHash(h, service);
-    h = LongHashingUtils.addToHash(h, operationName);
-    h = LongHashingUtils.addToHash(h, serviceSource);
-    h = LongHashingUtils.addToHash(h, type);
-    h = LongHashingUtils.addToHash(h, spanKind);
-    h = LongHashingUtils.addToHash(h, httpMethod);
-    h = LongHashingUtils.addToHash(h, httpEndpoint);
-    h = LongHashingUtils.addToHash(h, grpcStatusCode);
-    h = LongHashingUtils.addToHash(h, peerTags, peerTagCount);
-    h = LongHashingUtils.addToHash(h, additionalTags, additionalTagCount);
-    h = LongHashingUtils.addToHash(h, httpStatusCode);
-    h = LongHashingUtils.addToHash(h, synthetic);
-    h = LongHashingUtils.addToHash(h, traceRoot);
-    return h;
-  }
-
-  // Accessors for SerializingMetricWriter and the cross-package OTLP writer.
-  public UTF8BytesString getResource() {
-    return resource;
-  }
-
-  public UTF8BytesString getService() {
-    return service;
-  }
-
-  public UTF8BytesString getOperationName() {
-    return operationName;
-  }
-
-  public UTF8BytesString getServiceSource() {
-    return serviceSource;
-  }
-
-  /**
-   * Whether the snapshot carried a service-source value. Encapsulates the EMPTY-as-absent
-   * convention: optional fields use {@link UTF8BytesString#EMPTY} as the sentinel for "no value
-   * captured" (see field comment) -- callers that need a presence check should go through this
-   * predicate rather than comparing against {@code EMPTY} directly.
-   */
-  public boolean hasServiceSource() {
-    return serviceSource.length() > 0;
-  }
-
-  public UTF8BytesString getType() {
-    return type;
-  }
-
-  public UTF8BytesString getSpanKind() {
-    return spanKind;
-  }
-
-  public UTF8BytesString getHttpMethod() {
-    return httpMethod;
-  }
-
-  /**
-   * Whether the snapshot carried an HTTP method. See {@link #hasServiceSource} for the contract.
-   */
-  public boolean hasHttpMethod() {
-    return httpMethod.length() > 0;
-  }
-
-  public UTF8BytesString getHttpEndpoint() {
-    return httpEndpoint;
-  }
-
-  /**
-   * Whether the snapshot carried an HTTP endpoint. See {@link #hasServiceSource} for the contract.
-   */
-  public boolean hasHttpEndpoint() {
-    return httpEndpoint.length() > 0;
-  }
-
-  public UTF8BytesString getGrpcStatusCode() {
-    return grpcStatusCode;
-  }
-
-  /**
-   * Whether the snapshot carried a gRPC status code. See {@link #hasServiceSource} for the
-   * contract.
-   */
-  public boolean hasGrpcStatusCode() {
-    return grpcStatusCode.length() > 0;
-  }
-
-  public int getHttpStatusCode() {
-    return httpStatusCode;
-  }
-
-  public boolean isSynthetics() {
-    return synthetic;
-  }
-
-  public boolean isTraceRoot() {
-    return traceRoot;
-  }
-
-  public List<UTF8BytesString> getPeerTags() {
-    return peerTags;
-  }
-
-  /**
-   * @return the packed additional-tag values this entry recorded, as canonical {@code "key:value"}
-   *     UTF8BytesStrings in schema (alphabetical-by-key) order. Only tags the span actually set are
-   *     present (no null slots), so the length is the count of present tags -- empty when the span
-   *     set none or no additional tags are configured.
-   */
-  public UTF8BytesString[] getAdditionalTags() {
-    return additionalTags;
-  }
-
-  // ----- recording state accessors -----
-
-  public int getHitCount() {
-    return hitCount;
-  }
-
-  public int getErrorCount() {
-    return errorCount;
-  }
-
-  public int getTopLevelCount() {
-    return topLevelCount;
-  }
-
-  /**
-   * Total recorded duration for the native msgpack path -- the sum of {@link #getOkDuration()} and
-   * {@link #getErrorDuration()}. OK and error durations are tracked separately so the OTLP writer
-   * can emit per-outcome histogram sums.
-   */
-  public long getDuration() {
-    return okDuration + errorDuration;
-  }
-
-  public long getOkDuration() {
-    return okDuration;
-  }
-
-  public long getErrorDuration() {
-    return errorDuration;
-  }
-
-  public Histogram getOkLatencies() {
-    return okLatencies;
-  }
-
-  /**
-   * Returns the entry's error latency histogram, or {@code null} if no error has been recorded yet.
-   * Callers should treat null as "serialize as an empty histogram" (see {@link
-   * SerializingMetricWriter}).
-   */
-  public Histogram getErrorLatencies() {
-    return errorLatencies;
-  }
-
-  /** Lazy-allocates {@link #errorLatencies} on the first error. */
-  private Histogram errorLatenciesForWrite() {
-    Histogram h = errorLatencies;
-    if (h == null) {
-      h = Histogram.newHistogram();
-      errorLatencies = h;
-    }
-    return h;
-  }
-
-  /**
-   * Records a single hit. {@code tagAndDuration} carries the duration nanos with optional {@link
-   * #ERROR_TAG} / {@link #TOP_LEVEL_TAG} bits OR-ed in.
-   */
-  AggregateEntry recordOneDuration(long tagAndDuration) {
-    hitCount++;
-    if ((tagAndDuration & TOP_LEVEL_TAG) == TOP_LEVEL_TAG) {
-      tagAndDuration ^= TOP_LEVEL_TAG;
-      topLevelCount++;
-    }
-    if ((tagAndDuration & ERROR_TAG) == ERROR_TAG) {
-      tagAndDuration ^= ERROR_TAG;
-      errorLatenciesForWrite().accept(tagAndDuration);
-      errorDuration += tagAndDuration;
-      errorCount++;
-    } else {
-      okLatencies.accept(tagAndDuration);
-      okDuration += tagAndDuration;
-    }
-    return this;
-  }
-
-  /**
-   * Clears the recording state. The OK histogram is reused; the error histogram (if allocated) is
-   * reused too, but entries that never saw an error keep their {@code errorLatencies} field null.
-   */
-  void clearAggregate() {
-    this.errorCount = 0;
-    this.hitCount = 0;
-    this.topLevelCount = 0;
-    this.okDuration = 0;
-    this.errorDuration = 0;
-    this.okLatencies.clear();
-    if (this.errorLatencies != null) {
-      this.errorLatencies.clear();
-    }
-  }
-
-  /**
-   * Reusable scratch buffer for canonicalizing a {@link SpanSnapshot} into UTF8 fields, computing
-   * its lookup hash, comparing against existing entries, and building a fresh entry on miss.
-   *
-   * <p>One instance is held by an {@link AggregateTable} and reused on every {@code findOrInsert}
-   * call. Single-threaded use only. Fields are deliberately mutable -- this is a hot-path scratch
-   * area, not a value class.
-   */
-  static final class Canonical {
-    UTF8BytesString resource;
-    UTF8BytesString service;
-    UTF8BytesString operationName;
-    UTF8BytesString serviceSource;
-    UTF8BytesString type;
-    UTF8BytesString spanKind;
-    UTF8BytesString httpMethod;
-    UTF8BytesString httpEndpoint;
-    UTF8BytesString grpcStatusCode;
-    short httpStatusCode;
-    boolean synthetic;
-    boolean traceRoot;
+    static final long ERROR_TAG = 0x8000000000000000L;
+    static final long TOP_LEVEL_TAG = 0x4000000000000000L;
+
+    private static final UTF8BytesString[] EMPTY_TAGS = new UTF8BytesString[0];
+
+    final UTF8BytesString resource;
+    final UTF8BytesString service;
+    final UTF8BytesString operationName;
+    // Optional fields use UTF8BytesString.EMPTY as the "absent" sentinel rather than null. The
+    // cardinality handlers map null inputs to EMPTY, and createUtf8 does the same for the of(...)
+    // factory, so callers don't need to special-case absence.
+    final UTF8BytesString serviceSource;
+    final UTF8BytesString type;
+    final UTF8BytesString spanKind;
+    final UTF8BytesString httpMethod;
+    final UTF8BytesString httpEndpoint;
+    final UTF8BytesString grpcStatusCode;
+    final short httpStatusCode;
+    final boolean synthetic;
+    final boolean traceRoot;
+    final List<UTF8BytesString> peerTags;
+
+    // Schema-ordered "key:value" strings; "key:" prefix makes packing unambiguous without null slots.
+    final UTF8BytesString[] additionalTags;
+
+    // Recording state (this field through errorDuration below) is thread-confined: the entry is
+    // mutated only on the aggregator thread, so these fields are intentionally unsynchronized and not
+    // thread-safe. Producers hand off immutable SpanSnapshots; only the aggregator thread records
+    // into the entry.
+    private final Histogram okLatencies;
+
+    // Null until first error; SerializingMetricWriter writes empty histogram form when null. Not
+    // thread-safe as well.
+    @Nullable
+    private Histogram errorLatencies;
+
+    private int errorCount;
+    private int hitCount;
+    private int topLevelCount;
+    // Tracked separately for per-outcome OTLP histogram sums; getDuration() returns the sum.
+    private long okDuration;
+    private long errorDuration;
 
     /**
-     * Reusable buffer of canonicalized peer-tag UTF8 forms. Cleared and refilled in {@link
-     * #populate}; on miss, {@link #createEntry} copies it into an immutable list for the entry to
-     * own. Zero allocation on the hit path. Sized lazily to the schema's tag count; resized if the
-     * schema grows.
+     * Field-bearing constructor. Package-private so {@link AggregateEntryTestUtils} can build
+     * expected entries.
      */
-    UTF8BytesString[] peerTagsBuffer = EMPTY_TAGS;
+    AggregateEntry(
+            long keyHash,
+            UTF8BytesString resource,
+            UTF8BytesString service,
+            UTF8BytesString operationName,
+            UTF8BytesString serviceSource,
+            UTF8BytesString type,
+            UTF8BytesString spanKind,
+            UTF8BytesString httpMethod,
+            UTF8BytesString httpEndpoint,
+            UTF8BytesString grpcStatusCode,
+            short httpStatusCode,
+            boolean synthetic,
+            boolean traceRoot,
+            List<UTF8BytesString> peerTags,
+            UTF8BytesString[] additionalTags) {
+        super(keyHash);
+        this.resource = resource;
+        this.service = service;
+        this.operationName = operationName;
+        this.serviceSource = serviceSource;
+        this.type = type;
+        this.spanKind = spanKind;
+        this.httpMethod = httpMethod;
+        this.httpEndpoint = httpEndpoint;
+        this.grpcStatusCode = grpcStatusCode;
+        this.httpStatusCode = httpStatusCode;
+        this.synthetic = synthetic;
+        this.traceRoot = traceRoot;
+        this.peerTags = peerTags;
+        this.additionalTags = additionalTags;
+        this.okLatencies = Histogram.newHistogram();
+    }
+
+    /**
+     * 64-bit lookup hash, computed over UTF8-encoded fields so that cardinality-blocked values (which
+     * all canonicalize to the same sentinel {@link UTF8BytesString}) collide in the same bucket.
+     * {@link UTF8BytesString#hashCode()} returns the underlying String hash, so entries built via
+     * {@link #of} produce the same hash as entries built from a snapshot with matching content.
+     *
+     * <p>Field order intentionally mirrors {@link Canonical#matches} -- UTF8 fields first (highest
+     * cardinality first for matches' short-circuit benefit), then the peer-tag list, then the
+     * primitives. The hash itself is order-stable across all callers; the lockstep ordering is purely
+     * for readability when reasoning about lookup and equality in tandem.
+     */
+    static long hashOf(
+            UTF8BytesString resource,
+            UTF8BytesString service,
+            UTF8BytesString operationName,
+            UTF8BytesString serviceSource,
+            UTF8BytesString type,
+            UTF8BytesString spanKind,
+            UTF8BytesString httpMethod,
+            UTF8BytesString httpEndpoint,
+            UTF8BytesString grpcStatusCode,
+            short httpStatusCode,
+            boolean synthetic,
+            boolean traceRoot,
+            UTF8BytesString[] peerTags,
+            int peerTagCount,
+            UTF8BytesString[] additionalTags,
+            int additionalTagCount) {
+        long h = 0;
+        h = LongHashingUtils.addToHash(h, resource);
+        h = LongHashingUtils.addToHash(h, service);
+        h = LongHashingUtils.addToHash(h, operationName);
+        h = LongHashingUtils.addToHash(h, serviceSource);
+        h = LongHashingUtils.addToHash(h, type);
+        h = LongHashingUtils.addToHash(h, spanKind);
+        h = LongHashingUtils.addToHash(h, httpMethod);
+        h = LongHashingUtils.addToHash(h, httpEndpoint);
+        h = LongHashingUtils.addToHash(h, grpcStatusCode);
+        h = LongHashingUtils.addToHash(h, peerTags, peerTagCount);
+        h = LongHashingUtils.addToHash(h, additionalTags, additionalTagCount);
+        h = LongHashingUtils.addToHash(h, httpStatusCode);
+        h = LongHashingUtils.addToHash(h, synthetic);
+        h = LongHashingUtils.addToHash(h, traceRoot);
+        return h;
+    }
 
-    int peerTagsSize = 0;
+    // Accessors for SerializingMetricWriter and the cross-package OTLP writer.
+    public UTF8BytesString getResource() {
+        return resource;
+    }
+
+    public UTF8BytesString getService() {
+        return service;
+    }
 
-    /** Core per-field cardinality handlers; owned by the enclosing {@link AggregateTable}. */
-    final CoreHandlers handlers;
+    public UTF8BytesString getOperationName() {
+        return operationName;
+    }
 
-    /** Schema + per-key blocked sentinels for additional metric tags. Immutable. */
-    final AdditionalTagsSchema additionalTagsSchema;
+    public UTF8BytesString getServiceSource() {
+        return serviceSource;
+    }
 
     /**
-     * Reusable scratch for canonicalized additional-tag values, sized to the schema. Present values
-     * are packed at the front in schema order (alphabetical by key); {@link #additionalTagsSize}
-     * gives the count. Each entry is a {@code "key:value"} UTF8BytesString, so packing loses no
-     * information -- the key prefix disambiguates which key a value belongs to. Mirrors the {@code
-     * peerTagsBuffer + peerTagsSize} pattern. {@link #createEntry} copies the populated prefix into
-     * the new entry.
+     * Whether the snapshot carried a service-source value. Encapsulates the EMPTY-as-absent
+     * convention: optional fields use {@link UTF8BytesString#EMPTY} as the sentinel for "no value
+     * captured" (see field comment) -- callers that need a presence check should go through this
+     * predicate rather than comparing against {@code EMPTY} directly.
      */
-    final UTF8BytesString[] additionalTagsBuffer;
-
-    int additionalTagsSize;
-
-    long keyHash;
-
-    Canonical(CoreHandlers handlers, AdditionalTagsSchema additionalTagsSchema) {
-      this.handlers = handlers;
-      this.additionalTagsSchema = additionalTagsSchema;
-      this.additionalTagsBuffer = new UTF8BytesString[additionalTagsSchema.size()];
-    }
-
-    /** Canonicalize all fields from {@code s} through the handlers into this buffer. */
-    void populateFrom(SpanSnapshot s) {
-      this.resource = handlers.resource.register(s.resourceName);
-      this.service = handlers.service.register(s.serviceName);
-      this.operationName = handlers.operation.register(s.operationName);
-      this.serviceSource = handlers.serviceSource.register(s.serviceNameSource);
-      this.type = handlers.type.register(s.spanType);
-      this.spanKind = handlers.spanKind.register(s.spanKind);
-      this.httpMethod = handlers.httpMethod.register(s.httpMethod);
-      this.httpEndpoint = handlers.httpEndpoint.register(s.httpEndpoint);
-      this.grpcStatusCode = handlers.grpcStatusCode.register(s.grpcStatusCode);
-      this.httpStatusCode = s.httpStatusCode;
-      this.synthetic = s.synthetic;
-      this.traceRoot = s.traceRoot;
-      populatePeerTags(s.peerTagSchema, s.peerTagValues);
-      populateAdditionalTags(s.additionalTagValues);
-      this.keyHash = computeKeyHash();
-    }
-
-    private long computeKeyHash() {
-      return hashOf(
-          resource,
-          service,
-          operationName,
-          serviceSource,
-          type,
-          spanKind,
-          httpMethod,
-          httpEndpoint,
-          grpcStatusCode,
-          httpStatusCode,
-          synthetic,
-          traceRoot,
-          peerTagsBuffer,
-          peerTagsSize,
-          additionalTagsBuffer,
-          additionalTagsSize);
+    public boolean hasServiceSource() {
+        return serviceSource.length() > 0;
+    }
+
+    public UTF8BytesString getType() {
+        return type;
+    }
+
+    public UTF8BytesString getSpanKind() {
+        return spanKind;
+    }
+
+    public UTF8BytesString getHttpMethod() {
+        return httpMethod;
     }
 
     /**
-     * Replaces the current peer-tag buffer contents with the canonical UTF8 forms for this
-     * snapshot.
-     *
-     * <p>Each non-null value is canonicalized with the handler at the same schema index. Null
-     * values are skipped because they would canonicalize to {@link UTF8BytesString#EMPTY} and be
-     * filtered out anyway. Producer-side {@code capturePeerTagValues} produces sparse-null arrays,
-     * so the skip pays off whenever a span carries only a subset of the configured peer tags.
+     * Whether the snapshot carried an HTTP method. See {@link #hasServiceSource} for the contract.
      */
-    private void populatePeerTags(@Nullable PeerTagSchema schema, @Nullable String[] values) {
-      peerTagsSize = 0;
-      if (schema == null || values == null) {
-        return;
-      }
-      int n = Math.min(schema.size(), values.length);
-      if (peerTagsBuffer.length < n) {
-        peerTagsBuffer = new UTF8BytesString[n];
-      }
-      for (int i = 0; i < n; i++) {
-        String value = values[i];
-        if (value == null) {
-          continue;
-        }
-        peerTagsBuffer[peerTagsSize++] = schema.register(i, value);
-      }
+    public boolean hasHttpMethod() {
+        return httpMethod.length() > 0;
+    }
+
+    public UTF8BytesString getHttpEndpoint() {
+        return httpEndpoint;
+    }
+
+    /**
+     * Whether the snapshot carried an HTTP endpoint. See {@link #hasServiceSource} for the contract.
+     */
+    public boolean hasHttpEndpoint() {
+        return httpEndpoint.length() > 0;
+    }
+
+    public UTF8BytesString getGrpcStatusCode() {
+        return grpcStatusCode;
+    }
+
+    /**
+     * Whether the snapshot carried a gRPC status code. See {@link #hasServiceSource} for the
+     * contract.
+     */
+    public boolean hasGrpcStatusCode() {
+        return grpcStatusCode.length() > 0;
+    }
+
+    public int getHttpStatusCode() {
+        return httpStatusCode;
+    }
+
+    public boolean isSynthetics() {
+        return synthetic;
+    }
+
+    public boolean isTraceRoot() {
+        return traceRoot;
+    }
+
+    public List<UTF8BytesString> getPeerTags() {
+        return peerTags;
+    }
+
+    /**
+     * @return the packed additional-tag values this entry recorded, as canonical {@code "key:value"}
+     *     UTF8BytesStrings in schema (alphabetical-by-key) order. Only tags the span actually set are
+     *     present (no null slots), so the length is the count of present tags -- empty when the span
+     *     set none or no additional tags are configured.
+     */
+    public UTF8BytesString[] getAdditionalTags() {
+        return additionalTags;
+    }
+
+    // ----- recording state accessors -----
+
+    public int getHitCount() {
+        return hitCount;
+    }
+
+    public int getErrorCount() {
+        return errorCount;
+    }
+
+    public int getTopLevelCount() {
+        return topLevelCount;
     }
 
     /**
-     * Packs canonical {@code "key:value"} UTF8BytesStrings for each present slot of {@code values}
-     * into the front of {@link #additionalTagsBuffer} (schema order), via {@link
-     * AdditionalTagsSchema#register}, and sets {@link #additionalTagsSize}. The handler returns the
-     * per-key blocked sentinel when the per-cycle value budget is exhausted.
+     * Total recorded duration for the native msgpack path -- the sum of {@link #getOkDuration()} and
+     * {@link #getErrorDuration()}. OK and error durations are tracked separately so the OTLP writer
+     * can emit per-outcome histogram sums.
      */
-    private void populateAdditionalTags(@Nullable String[] values) {
-      additionalTagsSize = 0;
-      // values is captured against the same additionalTagsSchema, so it is either null or exactly
-      // schema.size() long (== additionalTagsBuffer.length); guard the array we actually index.
-      if (values == null || values.length == 0) {
-        return;
-      }
-      int n = additionalTagsBuffer.length;
-      for (int i = 0; i < n; i++) {
-        String v = values[i];
-        if (v == null) {
-          continue;
+    public long getDuration() {
+        return okDuration + errorDuration;
+    }
+
+    public long getOkDuration() {
+        return okDuration;
+    }
+
+    public long getErrorDuration() {
+        return errorDuration;
+    }
+
+    public Histogram getOkLatencies() {
+        return okLatencies;
+    }
+
+    /**
+     * Returns the entry's error latency histogram, or {@code null} if no error has been recorded yet.
+     * Callers should treat null as "serialize as an empty histogram" (see {@link
+     * SerializingMetricWriter}).
+     */
+    public Histogram getErrorLatencies() {
+        return errorLatencies;
+    }
+
+    /** Lazy-allocates {@link #errorLatencies} on the first error. */
+    private Histogram errorLatenciesForWrite() {
+        Histogram h = errorLatencies;
+        if (h == null) {
+            h = Histogram.newHistogram();
+            errorLatencies = h;
         }
-        additionalTagsBuffer[additionalTagsSize++] = additionalTagsSchema.register(i, v);
-      }
+        return h;
     }
 
     /**
-     * Whether this canonicalized snapshot matches the given entry. Compares UTF8 fields via
-     * content-equality (so an entry surviving a handler reset still matches a freshly-canonicalized
-     * snapshot of the same content).
-     *
-     * <p>Field order is cardinality-tuned: resource / service / operationName first because they
-     * vary most across collisions, then the remaining UTF8 fields, then the peer-tag list
-     * comparison (slowest), then the primitives. All UTF8 fields are non-null by the EMPTY-
-     * sentinel invariant (see field comments above), so direct {@code a.equals(b)} is safe.
+     * Records a single hit. {@code tagAndDuration} carries the duration nanos with optional {@link
+     * #ERROR_TAG} / {@link #TOP_LEVEL_TAG} bits OR-ed in.
      */
-    boolean matches(AggregateEntry e) {
-      return resource.equals(e.resource)
-          && service.equals(e.service)
-          && operationName.equals(e.operationName)
-          && serviceSource.equals(e.serviceSource)
-          && type.equals(e.type)
-          && spanKind.equals(e.spanKind)
-          && httpMethod.equals(e.httpMethod)
-          && httpEndpoint.equals(e.httpEndpoint)
-          && grpcStatusCode.equals(e.grpcStatusCode)
-          && peerTagsEqual(peerTagsBuffer, peerTagsSize, e.peerTags)
-          && httpStatusCode == e.httpStatusCode
-          && synthetic == e.synthetic
-          && traceRoot == e.traceRoot
-          && additionalTagsEqual(additionalTagsBuffer, additionalTagsSize, e.additionalTags);
-    }
-
-    /** Compact compare: first {@code aSize} slots of {@code a} against the entry's packed array. */
-    private static boolean additionalTagsEqual(
-        UTF8BytesString[] a, int aSize, UTF8BytesString[] b) {
-      if (aSize != b.length) {
-        return false;
-      }
-      for (int i = 0; i < aSize; i++) {
-        if (!a[i].equals(b[i])) {
-          return false;
+    AggregateEntry recordOneDuration(long tagAndDuration) {
+        hitCount++;
+        if ((tagAndDuration & TOP_LEVEL_TAG) == TOP_LEVEL_TAG) {
+            tagAndDuration ^= TOP_LEVEL_TAG;
+            topLevelCount++;
         }
-      }
-      return true;
+        if ((tagAndDuration & ERROR_TAG) == ERROR_TAG) {
+            tagAndDuration ^= ERROR_TAG;
+            errorLatenciesForWrite().accept(tagAndDuration);
+            errorDuration += tagAndDuration;
+            errorCount++;
+        } else {
+            okLatencies.accept(tagAndDuration);
+            okDuration += tagAndDuration;
+        }
+        return this;
     }
 
-    private static boolean peerTagsEqual(UTF8BytesString[] a, int aSize, List<UTF8BytesString> b) {
-      if (aSize != b.size()) {
-        return false;
-      }
-      for (int i = 0; i < aSize; i++) {
-        if (!a[i].equals(b.get(i))) {
-          return false;
+    /**
+     * Clears the recording state. The OK histogram is reused; the error histogram (if allocated) is
+     * reused too, but entries that never saw an error keep their {@code errorLatencies} field null.
+     */
+    void clearAggregate() {
+        this.errorCount = 0;
+        this.hitCount = 0;
+        this.topLevelCount = 0;
+        this.okDuration = 0;
+        this.errorDuration = 0;
+        this.okLatencies.clear();
+        if (this.errorLatencies != null) {
+            this.errorLatencies.clear();
         }
-      }
-      return true;
     }
 
     /**
-     * Build a new entry from the currently-populated canonical fields. The peer-tag buffer is
-     * copied into an immutable list so the entry's reference stays stable across subsequent {@link
-     * #populate} calls.
+     * Reusable scratch buffer for canonicalizing a {@link SpanSnapshot} into UTF8 fields, computing
+     * its lookup hash, comparing against existing entries, and building a fresh entry on miss.
+     *
+     * <p>One instance is held by an {@link AggregateTable} and reused on every {@code findOrInsert}
+     * call. Single-threaded use only. Fields are deliberately mutable -- this is a hot-path scratch
+     * area, not a value class.
      */
-    AggregateEntry createEntry() {
-      List<UTF8BytesString> snapshottedPeerTags;
-      int n = peerTagsSize;
-      if (n == 0) {
-        snapshottedPeerTags = Collections.emptyList();
-      } else if (n == 1) {
-        snapshottedPeerTags = Collections.singletonList(peerTagsBuffer[0]);
-      } else {
-        snapshottedPeerTags = Arrays.asList(Arrays.copyOf(peerTagsBuffer, n));
-      }
-      UTF8BytesString[] snapshottedAdditionalTags =
-          additionalTagsSize == 0
-              ? EMPTY_TAGS
-              : Arrays.copyOf(additionalTagsBuffer, additionalTagsSize);
-      return new AggregateEntry(
-          keyHash,
-          resource,
-          service,
-          operationName,
-          serviceSource,
-          type,
-          spanKind,
-          httpMethod,
-          httpEndpoint,
-          grpcStatusCode,
-          httpStatusCode,
-          synthetic,
-          traceRoot,
-          snapshottedPeerTags,
-          snapshottedAdditionalTags);
-    }
-  }
-
-  // ----- helpers -----
-
-  /** Direct {@link UTF8BytesString} creation that bypasses the cardinality handlers. */
-  static UTF8BytesString createUtf8(CharSequence cs) {
-    if (cs == null) {
-      return UTF8BytesString.EMPTY;
-    }
-    if (cs instanceof UTF8BytesString) {
-      return (UTF8BytesString) cs;
-    }
-    return UTF8BytesString.create(cs.toString());
-  }
+    static final class Canonical {
+        UTF8BytesString resource;
+        UTF8BytesString service;
+        UTF8BytesString operationName;
+        UTF8BytesString serviceSource;
+        UTF8BytesString type;
+        UTF8BytesString spanKind;
+        UTF8BytesString httpMethod;
+        UTF8BytesString httpEndpoint;
+        UTF8BytesString grpcStatusCode;
+        short httpStatusCode;
+        boolean synthetic;
+        boolean traceRoot;
+
+        /**
+         * Reusable buffer of canonicalized peer-tag UTF8 forms. Cleared and refilled in {@link
+         * #populate}; on miss, {@link #createEntry} copies it into an immutable list for the entry to
+         * own. Zero allocation on the hit path. Sized lazily to the schema's tag count; resized if the
+         * schema grows.
+         */
+        UTF8BytesString[] peerTagsBuffer = EMPTY_TAGS;
+
+        int peerTagsSize = 0;
+
+        /** Core per-field cardinality handlers; owned by the enclosing {@link AggregateTable}. */
+        final CoreHandlers handlers;
+
+        /** Schema + per-key blocked sentinels for additional metric tags. Immutable. */
+        final AdditionalTagsSchema additionalTagsSchema;
+
+        /**
+         * Reusable scratch for canonicalized additional-tag values, sized to the schema. Present values
+         * are packed at the front in schema order (alphabetical by key); {@link #additionalTagsSize}
+         * gives the count. Each entry is a {@code "key:value"} UTF8BytesString, so packing loses no
+         * information -- the key prefix disambiguates which key a value belongs to. Mirrors the {@code
+         * peerTagsBuffer + peerTagsSize} pattern. {@link #createEntry} copies the populated prefix into
+         * the new entry.
+         */
+        final UTF8BytesString[] additionalTagsBuffer;
+
+        int additionalTagsSize;
+
+        long keyHash;
+
+        Canonical(CoreHandlers handlers, AdditionalTagsSchema additionalTagsSchema) {
+            this.handlers = handlers;
+            this.additionalTagsSchema = additionalTagsSchema;
+            this.additionalTagsBuffer = new UTF8BytesString[additionalTagsSchema.size()];
+        }
+
+        /** Canonicalize all fields from {@code s} through the handlers into this buffer. */
+        void populateFrom(SpanSnapshot s) {
+            this.resource = handlers.resource.register(s.resourceName);
+            this.service = handlers.service.register(s.serviceName);
+            this.operationName = handlers.operation.register(s.operationName);
+            this.serviceSource = handlers.serviceSource.register(s.serviceNameSource);
+            this.type = handlers.type.register(s.spanType);
+            this.spanKind = handlers.spanKind.register(s.spanKind);
+            this.httpMethod = handlers.httpMethod.register(s.httpMethod);
+            this.httpEndpoint = handlers.httpEndpoint.register(s.httpEndpoint);
+            this.grpcStatusCode = handlers.grpcStatusCode.register(s.grpcStatusCode);
+            this.httpStatusCode = s.httpStatusCode;
+            this.synthetic = s.synthetic;
+            this.traceRoot = s.traceRoot;
+            populatePeerTags(s.peerTagSchema, s.peerTagValues);
+            populateAdditionalTags(s.additionalTagValues);
+            this.keyHash = computeKeyHash();
+        }
+
+        private long computeKeyHash() {
+            return hashOf(
+                    resource,
+                    service,
+                    operationName,
+                    serviceSource,
+                    type,
+                    spanKind,
+                    httpMethod,
+                    httpEndpoint,
+                    grpcStatusCode,
+                    httpStatusCode,
+                    synthetic,
+                    traceRoot,
+                    peerTagsBuffer,
+                    peerTagsSize,
+                    additionalTagsBuffer,
+                    additionalTagsSize);
+        }
+
+        /**
+         * Replaces the current peer-tag buffer contents with the canonical UTF8 forms for this
+         * snapshot.
+         *
+         * <p>Each non-null value is canonicalized with the handler at the same schema index. Null
+         * values are skipped because they would canonicalize to {@link UTF8BytesString#EMPTY} and be
+         * filtered out anyway. Producer-side {@code capturePeerTagValues} produces sparse-null arrays,
+         * so the skip pays off whenever a span carries only a subset of the configured peer tags.
+         */
+        private void populatePeerTags(@Nullable PeerTagSchema schema, @Nullable String[] values) {
+            peerTagsSize = 0;
+            if (schema == null || values == null) {
+                return;
+            }
+            int n = Math.min(schema.size(), values.length);
+            if (peerTagsBuffer.length < n) {
+                peerTagsBuffer = new UTF8BytesString[n];
+            }
+            for (int i = 0; i < n; i++) {
+                String value = values[i];
+                if (value == null) {
+                    continue;
+                }
+                peerTagsBuffer[peerTagsSize++] = schema.register(i, value);
+            }
+        }
+
+        /**
+         * Packs canonical {@code "key:value"} UTF8BytesStrings for each present slot of {@code values}
+         * into the front of {@link #additionalTagsBuffer} (schema order), via {@link
+         * AdditionalTagsSchema#register}, and sets {@link #additionalTagsSize}. The handler returns the
+         * per-key blocked sentinel when the per-cycle value budget is exhausted.
+         */
+        private void populateAdditionalTags(@Nullable String[] values) {
+            additionalTagsSize = 0;
+            // values is captured against the same additionalTagsSchema, so it is either null or exactly
+            // schema.size() long (== additionalTagsBuffer.length); guard the array we actually index.
+            if (values == null || values.length == 0) {
+                return;
+            }
+            int n = additionalTagsBuffer.length;
+            for (int i = 0; i < n; i++) {
+                String v = values[i];
+                if (v == null) {
+                    continue;
+                }
+                additionalTagsBuffer[additionalTagsSize++] = additionalTagsSchema.register(i, v);
+            }
+        }
+
+        /**
+         * Whether this canonicalized snapshot matches the given entry. Compares UTF8 fields via
+         * content-equality (so an entry surviving a handler reset still matches a freshly-canonicalized
+         * snapshot of the same content).
+         *
+         * <p>Field order is cardinality-tuned: resource / service / operationName first because they
+         * vary most across collisions, then the remaining UTF8 fields, then the peer-tag list
+         * comparison (slowest), then the primitives. All UTF8 fields are non-null by the EMPTY-
+         * sentinel invariant (see field comments above), so direct {@code a.equals(b)} is safe.
+         */
+        boolean matches(AggregateEntry e) {
+            return resource.equals(e.resource)
+                    && service.equals(e.service)
+                    && operationName.equals(e.operationName)
+                    && serviceSource.equals(e.serviceSource)
+                    && type.equals(e.type)
+                    && spanKind.equals(e.spanKind)
+                    && httpMethod.equals(e.httpMethod)
+                    && httpEndpoint.equals(e.httpEndpoint)
+                    && grpcStatusCode.equals(e.grpcStatusCode)
+                    && peerTagsEqual(peerTagsBuffer, peerTagsSize, e.peerTags)
+                    && httpStatusCode == e.httpStatusCode
+                    && synthetic == e.synthetic
+                    && traceRoot == e.traceRoot
+                    && additionalTagsEqual(additionalTagsBuffer, additionalTagsSize, e.additionalTags);
+        }
+
+        /** Compact compare: first {@code aSize} slots of {@code a} against the entry's packed array. */
+        private static boolean additionalTagsEqual(UTF8BytesString[] a, int aSize, UTF8BytesString[] b) {
+            if (aSize != b.length) {
+                return false;
+            }
+            for (int i = 0; i < aSize; i++) {
+                if (!a[i].equals(b[i])) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private static boolean peerTagsEqual(UTF8BytesString[] a, int aSize, List<UTF8BytesString> b) {
+            if (aSize != b.size()) {
+                return false;
+            }
+            for (int i = 0; i < aSize; i++) {
+                if (!a[i].equals(b.get(i))) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        /**
+         * Build a new entry from the currently-populated canonical fields. The peer-tag buffer is
+         * copied into an immutable list so the entry's reference stays stable across subsequent {@link
+         * #populate} calls.
+         */
+        AggregateEntry createEntry() {
+            List<UTF8BytesString> snapshottedPeerTags;
+            int n = peerTagsSize;
+            if (n == 0) {
+                snapshottedPeerTags = Collections.emptyList();
+            } else if (n == 1) {
+                snapshottedPeerTags = Collections.singletonList(peerTagsBuffer[0]);
+            } else {
+                snapshottedPeerTags = Arrays.asList(Arrays.copyOf(peerTagsBuffer, n));
+            }
+            UTF8BytesString[] snapshottedAdditionalTags =
+                    additionalTagsSize == 0 ? EMPTY_TAGS : Arrays.copyOf(additionalTagsBuffer, additionalTagsSize);
+            return new AggregateEntry(
+                    keyHash,
+                    resource,
+                    service,
+                    operationName,
+                    serviceSource,
+                    type,
+                    spanKind,
+                    httpMethod,
+                    httpEndpoint,
+                    grpcStatusCode,
+                    httpStatusCode,
+                    synthetic,
+                    traceRoot,
+                    snapshottedPeerTags,
+                    snapshottedAdditionalTags);
+        }
+    }
+
+    // ----- helpers -----
+
+    /** Direct {@link UTF8BytesString} creation that bypasses the cardinality handlers. */
+    static UTF8BytesString createUtf8(CharSequence cs) {
+        if (cs == null) {
+            return UTF8BytesString.EMPTY;
+        }
+        if (cs instanceof UTF8BytesString) {
+            return (UTF8BytesString) cs;
+        }
+        return UTF8BytesString.create(cs.toString());
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateTable.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateTable.java
index b120cb8b915..ab0fba08ba7 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateTable.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateTable.java
@@ -25,140 +25,137 @@
  */
 final class AggregateTable {
 
-  private final Hashtable.Entry[] buckets;
-  private final int maxAggregates;
-  private final AggregateEntry.Canonical canonical;
-  private int size;
-
-  /**
-   * Bucket index where the last {@link #evictOneStale} successfully removed an entry. The next call
-   * resumes from this bucket so a fast-evicting workload doesn't repeatedly re-walk the same hot
-   * entries clustered near bucket 0. Reset to {@code 0} by {@link #clear}.
-   */
-  private int evictCursor;
-
-  AggregateTable(int maxAggregates) {
-    this(maxAggregates, AdditionalTagsSchema.EMPTY);
-  }
-
-  AggregateTable(int maxAggregates, AdditionalTagsSchema additionalTagsSchema) {
-    this(maxAggregates, new CoreHandlers(), additionalTagsSchema);
-  }
-
-  AggregateTable(
-      int maxAggregates, CoreHandlers handlers, AdditionalTagsSchema additionalTagsSchema) {
-    this.buckets = Hashtable.Support.create(maxAggregates, Hashtable.Support.MAX_RATIO);
-    this.maxAggregates = maxAggregates;
-    this.canonical = new AggregateEntry.Canonical(handlers, additionalTagsSchema);
-  }
-
-  void resetCoreHandlers(HealthMetrics healthMetrics, CardinalityLimitReporter reporter) {
-    canonical.handlers.reset(healthMetrics, reporter);
-  }
-
-  int size() {
-    return size;
-  }
-
-  boolean isEmpty() {
-    return size == 0;
-  }
-
-  /**
-   * Returns the {@link AggregateEntry} to update for {@code snapshot}, lazily creating one on miss.
-   * Returns {@code null} when the table is at capacity and no stale entry can be evicted -- the
-   * caller should drop the data point in that case.
-   */
-  AggregateEntry findOrInsert(SpanSnapshot snapshot) {
-    canonical.populateFrom(snapshot);
-    long keyHash = canonical.keyHash;
-    for (AggregateEntry candidate = Hashtable.Support.bucket(buckets, keyHash);
-        candidate != null;
-        candidate = candidate.next()) {
-      if (candidate.keyHash == keyHash && canonical.matches(candidate)) {
-        return candidate;
-      }
+    private final Hashtable.Entry[] buckets;
+    private final int maxAggregates;
+    private final AggregateEntry.Canonical canonical;
+    private int size;
+
+    /**
+     * Bucket index where the last {@link #evictOneStale} successfully removed an entry. The next call
+     * resumes from this bucket so a fast-evicting workload doesn't repeatedly re-walk the same hot
+     * entries clustered near bucket 0. Reset to {@code 0} by {@link #clear}.
+     */
+    private int evictCursor;
+
+    AggregateTable(int maxAggregates) {
+        this(maxAggregates, AdditionalTagsSchema.EMPTY);
     }
-    // Miss path.
-    if (size >= maxAggregates && !evictOneStale()) {
-      return null;
+
+    AggregateTable(int maxAggregates, AdditionalTagsSchema additionalTagsSchema) {
+        this(maxAggregates, new CoreHandlers(), additionalTagsSchema);
+    }
+
+    AggregateTable(int maxAggregates, CoreHandlers handlers, AdditionalTagsSchema additionalTagsSchema) {
+        this.buckets = Hashtable.Support.create(maxAggregates, Hashtable.Support.MAX_RATIO);
+        this.maxAggregates = maxAggregates;
+        this.canonical = new AggregateEntry.Canonical(handlers, additionalTagsSchema);
+    }
+
+    void resetCoreHandlers(HealthMetrics healthMetrics, CardinalityLimitReporter reporter) {
+        canonical.handlers.reset(healthMetrics, reporter);
+    }
+
+    int size() {
+        return size;
+    }
+
+    boolean isEmpty() {
+        return size == 0;
+    }
+
+    /**
+     * Returns the {@link AggregateEntry} to update for {@code snapshot}, lazily creating one on miss.
+     * Returns {@code null} when the table is at capacity and no stale entry can be evicted -- the
+     * caller should drop the data point in that case.
+     */
+    AggregateEntry findOrInsert(SpanSnapshot snapshot) {
+        canonical.populateFrom(snapshot);
+        long keyHash = canonical.keyHash;
+        for (AggregateEntry candidate = Hashtable.Support.bucket(buckets, keyHash);
+                candidate != null;
+                candidate = candidate.next()) {
+            if (candidate.keyHash == keyHash && canonical.matches(candidate)) {
+                return candidate;
+            }
+        }
+        // Miss path.
+        if (size >= maxAggregates && !evictOneStale()) {
+            return null;
+        }
+        AggregateEntry entry = canonical.createEntry();
+        Hashtable.Support.insertHeadEntry(buckets, keyHash, entry);
+        size++;
+        return entry;
+    }
+
+    /**
+     * Unlinks the first entry whose {@code getHitCount() == 0}, resuming the scan from {@link
+     * #evictCursor} so consecutive evictions amortize to O(1) per call. Worst case for a single call
+     * is still O(N) when nearly every entry is hot, but a sustained eviction stream never re-scans
+     * the hot prefix more than twice across N evictions.
+     *
+     * <p>If the table is full and every entry was used in this cycle, drop the new key (reported via
+     * {@code onStatsAggregateDropped}) rather than evicting an established one. Cap is sized to the
+     * steady-state working set, so eviction is rare in the common case.
+     *
+     * <p>Cardinality limiting (see {@link MetricCardinalityLimits#USE_BLOCKED_SENTINEL}) reduces how
+     * often this fires but doesn't eliminate it. Over-cap values for a single field collapse into the
+     * shared {@code tracer_blocked_value} sentinel, so no one field can fill the table on its own.
+     * But distinct in-budget combinations across fields (resource x service x operation x ...) can
+     * still drive the entry count to {@code maxAggregates}, so this cursor-resumed scan remains the
+     * backstop.
+     */
+    private boolean evictOneStale() {
+        // Two passes -- [cursor, length) then [0, cursor) -- using the half-open-range iterator. The
+        // second pass is naturally empty when cursor==0, so no extra check needed.
+        return evictOneStaleInRange(evictCursor, buckets.length) || evictOneStaleInRange(0, evictCursor);
+    }
+
+    /** Scans {@code [startBucket, endBucket)} for the first stale entry and unlinks it. */
+    private boolean evictOneStaleInRange(int startBucket, int endBucket) {
+        MutatingTableIterator<AggregateEntry> iter =
+                Hashtable.Support.mutatingTableIterator(buckets, startBucket, endBucket);
+        while (iter.hasNext()) {
+            AggregateEntry e = iter.next();
+            if (e.getHitCount() == 0) {
+                int bucket = iter.currentBucket();
+                iter.remove();
+                size--;
+                evictCursor = bucket;
+                return true;
+            }
+        }
+        return false;
     }
-    AggregateEntry entry = canonical.createEntry();
-    Hashtable.Support.insertHeadEntry(buckets, keyHash, entry);
-    size++;
-    return entry;
-  }
-
-  /**
-   * Unlinks the first entry whose {@code getHitCount() == 0}, resuming the scan from {@link
-   * #evictCursor} so consecutive evictions amortize to O(1) per call. Worst case for a single call
-   * is still O(N) when nearly every entry is hot, but a sustained eviction stream never re-scans
-   * the hot prefix more than twice across N evictions.
-   *
-   * <p>If the table is full and every entry was used in this cycle, drop the new key (reported via
-   * {@code onStatsAggregateDropped}) rather than evicting an established one. Cap is sized to the
-   * steady-state working set, so eviction is rare in the common case.
-   *
-   * <p>Cardinality limiting (see {@link MetricCardinalityLimits#USE_BLOCKED_SENTINEL}) reduces how
-   * often this fires but doesn't eliminate it. Over-cap values for a single field collapse into the
-   * shared {@code tracer_blocked_value} sentinel, so no one field can fill the table on its own.
-   * But distinct in-budget combinations across fields (resource x service x operation x ...) can
-   * still drive the entry count to {@code maxAggregates}, so this cursor-resumed scan remains the
-   * backstop.
-   */
-  private boolean evictOneStale() {
-    // Two passes -- [cursor, length) then [0, cursor) -- using the half-open-range iterator. The
-    // second pass is naturally empty when cursor==0, so no extra check needed.
-    return evictOneStaleInRange(evictCursor, buckets.length)
-        || evictOneStaleInRange(0, evictCursor);
-  }
-
-  /** Scans {@code [startBucket, endBucket)} for the first stale entry and unlinks it. */
-  private boolean evictOneStaleInRange(int startBucket, int endBucket) {
-    MutatingTableIterator<AggregateEntry> iter =
-        Hashtable.Support.mutatingTableIterator(buckets, startBucket, endBucket);
-    while (iter.hasNext()) {
-      AggregateEntry e = iter.next();
-      if (e.getHitCount() == 0) {
-        int bucket = iter.currentBucket();
-        iter.remove();
-        size--;
-        evictCursor = bucket;
-        return true;
-      }
+
+    void forEach(Consumer<AggregateEntry> consumer) {
+        Hashtable.Support.forEach(buckets, consumer);
     }
-    return false;
-  }
-
-  void forEach(Consumer<AggregateEntry> consumer) {
-    Hashtable.Support.forEach(buckets, consumer);
-  }
-
-  /**
-   * Context-passing forEach. Useful for callers that want to avoid a capturing-lambda allocation on
-   * each invocation -- pass a non-capturing {@link BiConsumer} (typically a {@code static final})
-   * plus whatever side-band state it needs as {@code context}.
-   */
-  <T> void forEach(T context, BiConsumer<T, AggregateEntry> consumer) {
-    Hashtable.Support.forEach(buckets, context, consumer);
-  }
-
-  /** Removes entries whose {@code getHitCount() == 0}. */
-  void expungeStaleAggregates() {
-    for (MutatingTableIterator<AggregateEntry> iter =
-            Hashtable.Support.mutatingTableIterator(buckets);
-        iter.hasNext(); ) {
-      AggregateEntry e = iter.next();
-      if (e.getHitCount() == 0) {
-        iter.remove();
-        size--;
-      }
+
+    /**
+     * Context-passing forEach. Useful for callers that want to avoid a capturing-lambda allocation on
+     * each invocation -- pass a non-capturing {@link BiConsumer} (typically a {@code static final})
+     * plus whatever side-band state it needs as {@code context}.
+     */
+    <T> void forEach(T context, BiConsumer<T, AggregateEntry> consumer) {
+        Hashtable.Support.forEach(buckets, context, consumer);
     }
-  }
 
-  void clear() {
-    Hashtable.Support.clear(buckets);
-    size = 0;
-    evictCursor = 0;
-  }
+    /** Removes entries whose {@code getHitCount() == 0}. */
+    void expungeStaleAggregates() {
+        for (MutatingTableIterator<AggregateEntry> iter = Hashtable.Support.mutatingTableIterator(buckets);
+                iter.hasNext(); ) {
+            AggregateEntry e = iter.next();
+            if (e.getHitCount() == 0) {
+                iter.remove();
+                size--;
+            }
+        }
+    }
+
+    void clear() {
+        Hashtable.Support.clear(buckets);
+        size = 0;
+        evictCursor = 0;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/Aggregator.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/Aggregator.java
index dde42bd333d..158ae1f7c37 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/Aggregator.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/Aggregator.java
@@ -15,198 +15,196 @@
 
 final class Aggregator implements Runnable {
 
-  private static final long DEFAULT_SLEEP_MILLIS = 10;
-
-  private static final Logger log = LoggerFactory.getLogger(Aggregator.class);
-
-  private final MessagePassingQueue<InboxItem> inbox;
-  private final AggregateTable aggregates;
-  private final MetricWriter writer;
-  private final HealthMetrics healthMetrics;
-  // the reporting interval controls how much history will be buffered
-  // when the agent is unresponsive (only 10 pending requests will be
-  // buffered by OkHttpSink)
-  private final long reportingIntervalNanos;
-
-  private final long sleepMillis;
-
-  /**
-   * Per-cycle hook run on the aggregator thread at the start of each report cycle, before the
-   * flush. Used by {@link ClientStatsAggregator} to reconcile its cached peer-tag schema against
-   * {@link datadog.communication.ddagent.DDAgentFeaturesDiscovery}; running before the flush
-   * guarantees that any test awaiting {@code writer.finishBucket()} observes the schema in its
-   * post-reconcile state. May be {@code null}.
-   */
-  private final Runnable onReportCycle;
-
-  @SuppressFBWarnings(
-      value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
-      justification = "the field is confined to the agent thread running the Aggregator")
-  private boolean dirty;
-
-  Aggregator(
-      MetricWriter writer,
-      MessagePassingQueue<InboxItem> inbox,
-      int maxAggregates,
-      long reportingInterval,
-      TimeUnit reportingIntervalTimeUnit,
-      HealthMetrics healthMetrics,
-      AdditionalTagsSchema additionalTagsSchema,
-      Runnable onReportCycle) {
-    this(
-        writer,
-        inbox,
-        maxAggregates,
-        reportingInterval,
-        reportingIntervalTimeUnit,
-        DEFAULT_SLEEP_MILLIS,
-        healthMetrics,
-        additionalTagsSchema,
-        onReportCycle);
-  }
-
-  Aggregator(
-      MetricWriter writer,
-      MessagePassingQueue<InboxItem> inbox,
-      int maxAggregates,
-      long reportingInterval,
-      TimeUnit reportingIntervalTimeUnit,
-      long sleepMillis,
-      HealthMetrics healthMetrics,
-      AdditionalTagsSchema additionalTagsSchema,
-      Runnable onReportCycle) {
-    this.writer = writer;
-    this.inbox = inbox;
-    this.aggregates = new AggregateTable(maxAggregates, additionalTagsSchema);
-    this.reportingIntervalNanos = reportingIntervalTimeUnit.toNanos(reportingInterval);
-    this.sleepMillis = sleepMillis;
-    this.healthMetrics = healthMetrics;
-    this.onReportCycle = onReportCycle;
-  }
-
-  void resetCoreHandlers(HealthMetrics healthMetrics, CardinalityLimitReporter reporter) {
-    aggregates.resetCoreHandlers(healthMetrics, reporter);
-  }
-
-  @VisibleForTesting
-  AggregateTable aggregates() {
-    return aggregates;
-  }
-
-  @Override
-  public void run() {
-    Thread currentThread = Thread.currentThread();
-    Drainer drainer = new Drainer();
-    while (!currentThread.isInterrupted() && !drainer.stopped) {
-      try {
-        if (!inbox.isEmpty()) {
-          inbox.drain(drainer);
-        } else {
-          Thread.sleep(sleepMillis);
-        }
-      } catch (InterruptedException e) {
-        currentThread.interrupt();
-      } catch (Throwable error) {
-        log.debug("error aggregating metrics", error);
-      }
+    private static final long DEFAULT_SLEEP_MILLIS = 10;
+
+    private static final Logger log = LoggerFactory.getLogger(Aggregator.class);
+
+    private final MessagePassingQueue<InboxItem> inbox;
+    private final AggregateTable aggregates;
+    private final MetricWriter writer;
+    private final HealthMetrics healthMetrics;
+    // the reporting interval controls how much history will be buffered
+    // when the agent is unresponsive (only 10 pending requests will be
+    // buffered by OkHttpSink)
+    private final long reportingIntervalNanos;
+
+    private final long sleepMillis;
+
+    /**
+     * Per-cycle hook run on the aggregator thread at the start of each report cycle, before the
+     * flush. Used by {@link ClientStatsAggregator} to reconcile its cached peer-tag schema against
+     * {@link datadog.communication.ddagent.DDAgentFeaturesDiscovery}; running before the flush
+     * guarantees that any test awaiting {@code writer.finishBucket()} observes the schema in its
+     * post-reconcile state. May be {@code null}.
+     */
+    private final Runnable onReportCycle;
+
+    @SuppressFBWarnings(
+            value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
+            justification = "the field is confined to the agent thread running the Aggregator")
+    private boolean dirty;
+
+    Aggregator(
+            MetricWriter writer,
+            MessagePassingQueue<InboxItem> inbox,
+            int maxAggregates,
+            long reportingInterval,
+            TimeUnit reportingIntervalTimeUnit,
+            HealthMetrics healthMetrics,
+            AdditionalTagsSchema additionalTagsSchema,
+            Runnable onReportCycle) {
+        this(
+                writer,
+                inbox,
+                maxAggregates,
+                reportingInterval,
+                reportingIntervalTimeUnit,
+                DEFAULT_SLEEP_MILLIS,
+                healthMetrics,
+                additionalTagsSchema,
+                onReportCycle);
     }
-    log.debug("metrics aggregator exited");
-  }
 
-  private final class Drainer implements MessagePassingQueue.Consumer<InboxItem> {
+    Aggregator(
+            MetricWriter writer,
+            MessagePassingQueue<InboxItem> inbox,
+            int maxAggregates,
+            long reportingInterval,
+            TimeUnit reportingIntervalTimeUnit,
+            long sleepMillis,
+            HealthMetrics healthMetrics,
+            AdditionalTagsSchema additionalTagsSchema,
+            Runnable onReportCycle) {
+        this.writer = writer;
+        this.inbox = inbox;
+        this.aggregates = new AggregateTable(maxAggregates, additionalTagsSchema);
+        this.reportingIntervalNanos = reportingIntervalTimeUnit.toNanos(reportingInterval);
+        this.sleepMillis = sleepMillis;
+        this.healthMetrics = healthMetrics;
+        this.onReportCycle = onReportCycle;
+    }
 
-    boolean stopped = false;
+    void resetCoreHandlers(HealthMetrics healthMetrics, CardinalityLimitReporter reporter) {
+        aggregates.resetCoreHandlers(healthMetrics, reporter);
+    }
+
+    @VisibleForTesting
+    AggregateTable aggregates() {
+        return aggregates;
+    }
 
     @Override
-    public void accept(InboxItem item) {
-      if (item == ClearSignal.CLEAR) {
-        // ClearSignal is routed through the inbox (rather than letting the caller mutate
-        // AggregateTable directly) so the aggregator thread stays the sole writer. AggregateTable
-        // is not thread-safe; a direct clear() from e.g. the OkHttpSink callback thread would
-        // race with Drainer.accept on this thread.
-        //
-        // We deliberately do NOT call inbox.clear() here. Doing so would erase any queued STOP
-        // (or REPORT) signals that happen to sit behind CLEAR -- a real concern when a
-        // downgrade is followed quickly by close(), where the trampled STOP leaves the
-        // aggregator thread spinning until thread.join times out. features.supportsMetrics() is
-        // already false by the time CLEAR was offered, so producers have stopped publishing;
-        // any in-flight snapshots will drain naturally into the just-cleared table, get
-        // re-aggregated, and flushed on the next report -- where the agent rejects them again,
-        // triggering another DOWNGRADED -> disable() -> CLEAR cycle. Worst case: one extra
-        // reporting cycle of wasted work, which we accept for the safety of preserving STOP.
-        if (!stopped) {
-          aggregates.clear();
-          // Clear dirty too -- without this, the next report() would see dirty=true, run
-          // expungeStaleAggregates against the (now-empty) table, find isEmpty()=true, and skip
-          // the flush anyway. Same observable outcome, but resetting here keeps the invariant
-          // "dirty implies there's data to flush" honest.
-          dirty = false;
-        }
-        ((SignalItem) item).complete();
-      } else if (item instanceof SignalItem) {
-        SignalItem signal = (SignalItem) item;
-        if (!stopped) {
-          report(wallClockTime(), signal);
-          stopped = item instanceof StopSignal;
-          if (stopped) {
-            signal.complete();
-          }
-        } else {
-          signal.ignore();
-        }
-      } else if (item instanceof SpanSnapshot && !stopped) {
-        SpanSnapshot snapshot = (SpanSnapshot) item;
-        AggregateEntry entry = aggregates.findOrInsert(snapshot);
-        if (entry != null) {
-          entry.recordOneDuration(snapshot.tagAndDuration);
-          dirty = true;
-        } else {
-          // table at cap with no stale entry available to evict
-          healthMetrics.onStatsAggregateDropped();
-          StatsMetrics.getInstance().onWholeKeyCollapse();
+    public void run() {
+        Thread currentThread = Thread.currentThread();
+        Drainer drainer = new Drainer();
+        while (!currentThread.isInterrupted() && !drainer.stopped) {
+            try {
+                if (!inbox.isEmpty()) {
+                    inbox.drain(drainer);
+                } else {
+                    Thread.sleep(sleepMillis);
+                }
+            } catch (InterruptedException e) {
+                currentThread.interrupt();
+            } catch (Throwable error) {
+                log.debug("error aggregating metrics", error);
+            }
         }
-      }
+        log.debug("metrics aggregator exited");
     }
-  }
-
-  private void report(long when, SignalItem signal) {
-    // Per-cycle hook on the aggregator thread -- used by ClientStatsAggregator to reconcile the
-    // cached peer-tag schema against feature discovery. Runs before the flush so any test that
-    // awaits writer.finishBucket() observes the schema in its post-reconcile state, and so
-    // subsequent producer publishes (which may happen as soon as the flush completes) see the new
-    // schema without an additional handoff.
-    if (onReportCycle != null) {
-      onReportCycle.run();
-    }
-    boolean skipped = true;
-    if (dirty) {
-      try {
-        aggregates.expungeStaleAggregates();
-        if (!aggregates.isEmpty()) {
-          skipped = false;
-          writer.startBucket(aggregates.size(), when, reportingIntervalNanos);
-          aggregates.forEach(
-              writer,
-              (w, entry) -> {
-                w.add(entry);
-                entry.clearAggregate();
-              });
-          // note that this may do IO and block
-          writer.finishBucket();
+
+    private final class Drainer implements MessagePassingQueue.Consumer<InboxItem> {
+
+        boolean stopped = false;
+
+        @Override
+        public void accept(InboxItem item) {
+            if (item == ClearSignal.CLEAR) {
+                // ClearSignal is routed through the inbox (rather than letting the caller mutate
+                // AggregateTable directly) so the aggregator thread stays the sole writer. AggregateTable
+                // is not thread-safe; a direct clear() from e.g. the OkHttpSink callback thread would
+                // race with Drainer.accept on this thread.
+                //
+                // We deliberately do NOT call inbox.clear() here. Doing so would erase any queued STOP
+                // (or REPORT) signals that happen to sit behind CLEAR -- a real concern when a
+                // downgrade is followed quickly by close(), where the trampled STOP leaves the
+                // aggregator thread spinning until thread.join times out. features.supportsMetrics() is
+                // already false by the time CLEAR was offered, so producers have stopped publishing;
+                // any in-flight snapshots will drain naturally into the just-cleared table, get
+                // re-aggregated, and flushed on the next report -- where the agent rejects them again,
+                // triggering another DOWNGRADED -> disable() -> CLEAR cycle. Worst case: one extra
+                // reporting cycle of wasted work, which we accept for the safety of preserving STOP.
+                if (!stopped) {
+                    aggregates.clear();
+                    // Clear dirty too -- without this, the next report() would see dirty=true, run
+                    // expungeStaleAggregates against the (now-empty) table, find isEmpty()=true, and skip
+                    // the flush anyway. Same observable outcome, but resetting here keeps the invariant
+                    // "dirty implies there's data to flush" honest.
+                    dirty = false;
+                }
+                ((SignalItem) item).complete();
+            } else if (item instanceof SignalItem) {
+                SignalItem signal = (SignalItem) item;
+                if (!stopped) {
+                    report(wallClockTime(), signal);
+                    stopped = item instanceof StopSignal;
+                    if (stopped) {
+                        signal.complete();
+                    }
+                } else {
+                    signal.ignore();
+                }
+            } else if (item instanceof SpanSnapshot && !stopped) {
+                SpanSnapshot snapshot = (SpanSnapshot) item;
+                AggregateEntry entry = aggregates.findOrInsert(snapshot);
+                if (entry != null) {
+                    entry.recordOneDuration(snapshot.tagAndDuration);
+                    dirty = true;
+                } else {
+                    // table at cap with no stale entry available to evict
+                    healthMetrics.onStatsAggregateDropped();
+                    StatsMetrics.getInstance().onWholeKeyCollapse();
+                }
+            }
         }
-      } catch (Throwable error) {
-        writer.reset();
-        log.debug("Error publishing metrics. Dropping payload", error);
-      }
-      dirty = false;
     }
-    signal.complete();
-    if (skipped) {
-      log.debug("skipped metrics reporting because no points have changed");
+
+    private void report(long when, SignalItem signal) {
+        // Per-cycle hook on the aggregator thread -- used by ClientStatsAggregator to reconcile the
+        // cached peer-tag schema against feature discovery. Runs before the flush so any test that
+        // awaits writer.finishBucket() observes the schema in its post-reconcile state, and so
+        // subsequent producer publishes (which may happen as soon as the flush completes) see the new
+        // schema without an additional handoff.
+        if (onReportCycle != null) {
+            onReportCycle.run();
+        }
+        boolean skipped = true;
+        if (dirty) {
+            try {
+                aggregates.expungeStaleAggregates();
+                if (!aggregates.isEmpty()) {
+                    skipped = false;
+                    writer.startBucket(aggregates.size(), when, reportingIntervalNanos);
+                    aggregates.forEach(writer, (w, entry) -> {
+                        w.add(entry);
+                        entry.clearAggregate();
+                    });
+                    // note that this may do IO and block
+                    writer.finishBucket();
+                }
+            } catch (Throwable error) {
+                writer.reset();
+                log.debug("Error publishing metrics. Dropping payload", error);
+            }
+            dirty = false;
+        }
+        signal.complete();
+        if (skipped) {
+            log.debug("skipped metrics reporting because no points have changed");
+        }
     }
-  }
 
-  private long wallClockTime() {
-    return MILLISECONDS.toNanos(System.currentTimeMillis());
-  }
+    private long wallClockTime() {
+        return MILLISECONDS.toNanos(System.currentTimeMillis());
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/CardinalityLimitReporter.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/CardinalityLimitReporter.java
index 215c278bef3..55b141c26df 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/CardinalityLimitReporter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/CardinalityLimitReporter.java
@@ -28,78 +28,76 @@
  */
 final class CardinalityLimitReporter {
 
-  private static final Logger log = LoggerFactory.getLogger(CardinalityLimitReporter.class);
+    private static final Logger log = LoggerFactory.getLogger(CardinalityLimitReporter.class);
 
-  // Distinct blocked tag names in a window: 9 property fields + the configured peer tags + up to
-  // AdditionalTagsSchema.MAX_ADDITIONAL_TAG_KEYS + base.service, with headroom for the brief
-  // overlap
-  // of old and new peer names across a schema rebuild. Fixed capacity; the table chains on overflow
-  // rather than dropping, so an underestimate only adds chain depth on this cold path.
-  private static final int TAG_CAPACITY = 64;
+    // Distinct blocked tag names in a window: 9 property fields + the configured peer tags + up to
+    // AdditionalTagsSchema.MAX_ADDITIONAL_TAG_KEYS + base.service, with headroom for the brief
+    // overlap
+    // of old and new peer names across a schema rebuild. Fixed capacity; the table chains on overflow
+    // rather than dropping, so an underestimate only adds chain depth on this cold path.
+    private static final int TAG_CAPACITY = 64;
 
-  // Rough width of one "<tag>=<count>, " entry, used to pre-size the summary builder. Cold path, so
-  // an over-estimate just avoids a resize rather than mattering for footprint.
-  private static final int APPROX_CHARS_PER_ENTRY = 32;
+    // Rough width of one "<tag>=<count>, " entry, used to pre-size the summary builder. Cold path, so
+    // an over-estimate just avoids a resize rather than mattering for footprint.
+    private static final int APPROX_CHARS_PER_ENTRY = 32;
 
-  private final RatelimitedLogger rlLog;
-  // Tag name -> blocked count accumulated since the last emitted summary.
-  private final Hashtable.D1<String, TagBlockEntry> blockedByTag = new Hashtable.D1<>(TAG_CAPACITY);
+    private final RatelimitedLogger rlLog;
+    // Tag name -> blocked count accumulated since the last emitted summary.
+    private final Hashtable.D1<String, TagBlockEntry> blockedByTag = new Hashtable.D1<>(TAG_CAPACITY);
 
-  CardinalityLimitReporter() {
-    this(new RatelimitedLogger(log, 5, MINUTES));
-  }
-
-  CardinalityLimitReporter(RatelimitedLogger rlLog) {
-    this.rlLog = rlLog;
-  }
+    CardinalityLimitReporter() {
+        this(new RatelimitedLogger(log, 5, MINUTES));
+    }
 
-  /** Records {@code count} values blocked for {@code tag} in the current reporting cycle. */
-  void record(String tag, long count) {
-    if (count > 0) {
-      blockedByTag.getOrCreate(tag, TagBlockEntry::new).count += count;
+    CardinalityLimitReporter(RatelimitedLogger rlLog) {
+        this.rlLog = rlLog;
     }
-  }
 
-  /**
-   * Emits one rate-limited summary of everything blocked since the last emitted line. While the
-   * rate limiter suppresses, counts keep accumulating; they are cleared only once a line is
-   * actually logged (keyed off {@link RatelimitedLogger#warn}'s return), so each summary reflects
-   * the whole period and nothing is dropped in between.
-   */
-  void reportIfDue() {
-    if (blockedByTag.size() == 0) {
-      return;
+    /** Records {@code count} values blocked for {@code tag} in the current reporting cycle. */
+    void record(String tag, long count) {
+        if (count > 0) {
+            blockedByTag.getOrCreate(tag, TagBlockEntry::new).count += count;
+        }
     }
-    if (rlLog.warn(
-        "Metric tag cardinality limits reached; excess values reported as tracer_blocked_value."
-            + " Blocked value counts by tag: {}",
-        summarize())) {
-      blockedByTag.clear();
+
+    /**
+     * Emits one rate-limited summary of everything blocked since the last emitted line. While the
+     * rate limiter suppresses, counts keep accumulating; they are cleared only once a line is
+     * actually logged (keyed off {@link RatelimitedLogger#warn}'s return), so each summary reflects
+     * the whole period and nothing is dropped in between.
+     */
+    void reportIfDue() {
+        if (blockedByTag.size() == 0) {
+            return;
+        }
+        if (rlLog.warn(
+                "Metric tag cardinality limits reached; excess values reported as tracer_blocked_value."
+                        + " Blocked value counts by tag: {}",
+                summarize())) {
+            blockedByTag.clear();
+        }
     }
-  }
 
-  private String summarize() {
-    StringBuilder builder = new StringBuilder(blockedByTag.size() * APPROX_CHARS_PER_ENTRY);
-    // Non-capturing: the builder is threaded through as forEach's context argument.
-    blockedByTag.forEach(
-        builder,
-        (into, entry) -> {
-          if (into.length() > 0) {
-            into.append(", ");
-          }
-          into.append(entry.key()).append('=').append(entry.count);
+    private String summarize() {
+        StringBuilder builder = new StringBuilder(blockedByTag.size() * APPROX_CHARS_PER_ENTRY);
+        // Non-capturing: the builder is threaded through as forEach's context argument.
+        blockedByTag.forEach(builder, (into, entry) -> {
+            if (into.length() > 0) {
+                into.append(", ");
+            }
+            into.append(entry.key()).append('=').append(entry.count);
         });
-    return builder.toString();
-  }
+        return builder.toString();
+    }
 
-  /**
-   * Single-key counter entry: the tag name (via {@link #key()}) plus its in-place-mutated count.
-   */
-  private static final class TagBlockEntry extends Hashtable.D1.Entry<String> {
-    long count;
+    /**
+     * Single-key counter entry: the tag name (via {@link #key()}) plus its in-place-mutated count.
+     */
+    private static final class TagBlockEntry extends Hashtable.D1.Entry<String> {
+        long count;
 
-    TagBlockEntry(String tag) {
-      super(tag);
+        TagBlockEntry(String tag) {
+            super(tag);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/ClientStatsAggregator.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/ClientStatsAggregator.java
index 88f6782e04c..12785d2c0b4 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/ClientStatsAggregator.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/ClientStatsAggregator.java
@@ -45,708 +45,697 @@
 
 public final class ClientStatsAggregator implements MetricsAggregator, EventListener {
 
-  private static final Logger log = LoggerFactory.getLogger(ClientStatsAggregator.class);
-
-  private static final Map<String, String> DEFAULT_HEADERS =
-      Collections.singletonMap(DDAgentApi.DATADOG_META_TRACER_VERSION, DDTraceCoreInfo.VERSION);
-
-  private static final String SYNTHETICS_ORIGIN = "synthetics";
-
-  private static final SpanKindFilter METRICS_ELIGIBLE_KINDS =
-      SpanKindFilter.builder()
-          .includeServer()
-          .includeClient()
-          .includeProducer()
-          .includeConsumer()
-          .build();
-
-  private static final SpanKindFilter PEER_AGGREGATION_KINDS =
-      SpanKindFilter.builder().includeClient().includeProducer().includeConsumer().build();
-
-  private static final SpanKindFilter INTERNAL_KIND =
-      SpanKindFilter.builder().includeInternal().build();
-
-  // gRPC status-code source tags, probed in priority order on the OTLP export path
-  private static final String[] GRPC_STATUS_CODE_KEYS = {
-    InstrumentationTags.GRPC_STATUS_CODE, // "rpc.grpc.status_code"
-    "grpc.code",
-    "rpc.grpc.status.code",
-    "grpc.status.code",
-    "rpc.response.status_code",
-  };
-
-  private final Set<String> ignoredResources;
-  private final Thread thread;
-  private final MessagePassingQueue<InboxItem> inbox;
-  private final Sink sink;
-  private final MetricWriter metricWriter;
-  private final Aggregator aggregator;
-  private final long reportingInterval;
-  private final TimeUnit reportingIntervalTimeUnit;
-  private final DDAgentFeaturesDiscovery features;
-  private final HealthMetrics healthMetrics;
-  // Aggregates per-cycle cardinality-block counts by tag name into a single rate-limited warn,
-  // instead of warning per field on every reporting cycle. Aggregator-thread confined.
-  private final CardinalityLimitReporter cardinalityLimitReporter = new CardinalityLimitReporter();
-  private final AdditionalTagsSchema additionalTagsSchema;
-  private final boolean includeEndpointInMetrics;
-  private final boolean otlpStatsExportEnabled;
-
-  /**
-   * Cached peer-aggregation schema read by producer threads.
-   *
-   * <p>Producers read this reference once per trace and store it on each {@link SpanSnapshot}. They
-   * do not inspect the schema's discovery state or rebuild it. The aggregator thread reconciles the
-   * schema once per reporting cycle in {@link #resetCardinalityHandlers()}: if feature discovery
-   * has a new state but the tag set is unchanged, it updates {@link PeerTagSchema#state} in-place
-   * to preserve the warm cardinality handlers; otherwise it swaps in a freshly-built schema.
-   *
-   * <p>An empty schema (size 0) represents the "peer tags unconfigured" state; {@code null} only on
-   * the bootstrap window before {@link #bootstrapPeerTagSchema()} runs on the first publish.
-   *
-   * <p>{@code volatile} so producer threads always see the latest replacement. The schema's own
-   * internal mutable state (handlers, block counters, {@link PeerTagSchema#state}) is exercised
-   * only on the aggregator thread.
-   */
-  private volatile PeerTagSchema cachedPeerTagSchema;
-
-  /**
-   * Previous peer-tag schema, kept until the next reporting cycle.
-   *
-   * <p>A producer may read the current schema just before the aggregator replaces it. If that
-   * producer queues its {@link SpanSnapshot} after the current {@code REPORT} signal, the snapshot
-   * will be processed during the next cycle and will still update the old schema's blocked-value
-   * counters.
-   *
-   * <p>Keeping the old schema here allows the next reset to report those late counter updates
-   * before the schema is discarded.
-   *
-   * <p>This field is accessed only by the aggregator thread, so it does not need to be volatile.
-   */
-  private PeerTagSchema previousPeerTagSchema;
-
-  private volatile AgentTaskScheduler.Scheduled<?> cancellation;
-
-  public ClientStatsAggregator(
-      Config config,
-      SharedCommunicationObjects sharedCommunicationObjects,
-      HealthMetrics healthMetrics) {
-    this(
-        config.getWellKnownTags(),
-        config.getMetricsIgnoredResources(),
-        additionalTagsSchemaFrom(config),
-        sharedCommunicationObjects.featuresDiscovery(config),
-        healthMetrics,
-        new OkHttpSink(
-            sharedCommunicationObjects.agentHttpClient,
-            sharedCommunicationObjects.agentUrl.toString(),
-            V06_METRICS_ENDPOINT,
-            config.isTracerMetricsBufferingEnabled(),
-            false,
-            DEFAULT_HEADERS),
-        config.getTracerMetricsMaxAggregates(),
-        config.getTracerMetricsMaxPending(),
-        config.isTraceResourceRenamingEnabled());
-  }
-
-  /**
-   * OTLP span-metrics export variant. Reuses the same span selection + DDSketch aggregation as the
-   * native path, but emits via the injected {@link OtlpStatsMetricWriter} instead of msgpack. No
-   * agent {@link Sink} is needed, so a {@link NoOpSink} satisfies the register()/backpressure
-   * contract, and the reporting interval comes from {@code trace.stats.interval} (milliseconds).
-   */
-  public ClientStatsAggregator(
-      Config config,
-      SharedCommunicationObjects sharedCommunicationObjects,
-      HealthMetrics healthMetrics,
-      OtlpStatsMetricWriter metricWriter) {
-    this(
-        config.getMetricsIgnoredResources(),
-        additionalTagsSchemaFrom(config),
-        sharedCommunicationObjects.featuresDiscovery(config),
-        healthMetrics,
-        NoOpSink.INSTANCE,
-        metricWriter,
-        config.getTracerMetricsMaxAggregates(),
-        config.getTracerMetricsMaxPending(),
-        config.getTraceStatsInterval(),
-        MILLISECONDS,
-        true);
-  }
-
-  private static AdditionalTagsSchema additionalTagsSchemaFrom(Config config) {
-    return AdditionalTagsSchema.from(
-        config.getTraceStatsAdditionalTags(),
-        config.getTraceStatsCardinalityLimit(
-            "additional_tags", MetricCardinalityLimits.ADDITIONAL_TAG_VALUE),
-        MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
-  }
-
-  ClientStatsAggregator(
-      WellKnownTags wellKnownTags,
-      Set<String> ignoredResources,
-      AdditionalTagsSchema additionalTagsSchema,
-      DDAgentFeaturesDiscovery features,
-      HealthMetrics healthMetric,
-      Sink sink,
-      int maxAggregates,
-      int queueSize,
-      boolean includeEndpointInMetrics) {
-    this(
-        wellKnownTags,
-        ignoredResources,
-        additionalTagsSchema,
-        features,
-        healthMetric,
-        sink,
-        maxAggregates,
-        queueSize,
-        10,
-        SECONDS,
-        includeEndpointInMetrics);
-  }
-
-  ClientStatsAggregator(
-      WellKnownTags wellKnownTags,
-      Set<String> ignoredResources,
-      AdditionalTagsSchema additionalTagsSchema,
-      DDAgentFeaturesDiscovery features,
-      HealthMetrics healthMetric,
-      Sink sink,
-      int maxAggregates,
-      int queueSize,
-      long reportingInterval,
-      TimeUnit timeUnit,
-      boolean includeEndpointInMetrics) {
-    this(
-        ignoredResources,
-        additionalTagsSchema,
-        features,
-        healthMetric,
-        sink,
-        new SerializingMetricWriter(wellKnownTags, sink, additionalTagsSchema.size() > 0),
-        maxAggregates,
-        queueSize,
-        reportingInterval,
-        timeUnit,
-        includeEndpointInMetrics);
-  }
-
-  /** Test-only: defaults to no additional tags schema. */
-  ClientStatsAggregator(
-      Set<String> ignoredResources,
-      DDAgentFeaturesDiscovery features,
-      HealthMetrics healthMetric,
-      Sink sink,
-      MetricWriter metricWriter,
-      int maxAggregates,
-      int queueSize,
-      long reportingInterval,
-      TimeUnit timeUnit,
-      boolean includeEndpointInMetrics) {
-    this(
-        ignoredResources,
-        AdditionalTagsSchema.EMPTY,
-        features,
-        healthMetric,
-        sink,
-        metricWriter,
-        maxAggregates,
-        queueSize,
-        reportingInterval,
-        timeUnit,
-        includeEndpointInMetrics);
-  }
-
-  ClientStatsAggregator(
-      Set<String> ignoredResources,
-      AdditionalTagsSchema additionalTagsSchema,
-      DDAgentFeaturesDiscovery features,
-      HealthMetrics healthMetric,
-      Sink sink,
-      MetricWriter metricWriter,
-      int maxAggregates,
-      int queueSize,
-      long reportingInterval,
-      TimeUnit timeUnit,
-      boolean includeEndpointInMetrics) {
-    this.ignoredResources = ignoredResources;
-    this.additionalTagsSchema = additionalTagsSchema;
-    this.includeEndpointInMetrics = includeEndpointInMetrics;
-    this.otlpStatsExportEnabled = metricWriter instanceof OtlpStatsMetricWriter;
-    this.inbox = Queues.mpscArrayQueue(queueSize);
-    this.features = features;
-    this.healthMetrics = healthMetric;
-    this.sink = sink;
-    this.metricWriter = metricWriter;
-    this.aggregator =
-        new Aggregator(
-            metricWriter,
-            inbox,
-            maxAggregates,
-            reportingInterval,
-            timeUnit,
-            healthMetric,
-            additionalTagsSchema,
-            this::resetCardinalityHandlers);
-    this.thread = newAgentThread(METRICS_AGGREGATOR, aggregator);
-    this.reportingInterval = reportingInterval;
-    this.reportingIntervalTimeUnit = timeUnit;
-  }
-
-  // ── visible for testing ─────────────────────────────────────────────────────
-  // Expose the writer-selection outcome and reporting cadence so tests can assert
-  // the native-vs-OTLP XOR choice without reflecting into private fields.
-
-  boolean isOtlpStatsExportEnabled() {
-    return otlpStatsExportEnabled;
-  }
-
-  long reportingInterval() {
-    return reportingInterval;
-  }
-
-  TimeUnit reportingIntervalTimeUnit() {
-    return reportingIntervalTimeUnit;
-  }
-
-  @VisibleForTesting
-  Aggregator aggregator() {
-    return aggregator;
-  }
-
-  @Override
-  public void start() {
-    sink.register(this);
-    thread.start();
-    cancellation =
-        AgentTaskScheduler.get()
-            .scheduleAtFixedRate(
-                new ReportTask(),
-                this,
+    private static final Logger log = LoggerFactory.getLogger(ClientStatsAggregator.class);
+
+    private static final Map<String, String> DEFAULT_HEADERS =
+            Collections.singletonMap(DDAgentApi.DATADOG_META_TRACER_VERSION, DDTraceCoreInfo.VERSION);
+
+    private static final String SYNTHETICS_ORIGIN = "synthetics";
+
+    private static final SpanKindFilter METRICS_ELIGIBLE_KINDS = SpanKindFilter.builder()
+            .includeServer()
+            .includeClient()
+            .includeProducer()
+            .includeConsumer()
+            .build();
+
+    private static final SpanKindFilter PEER_AGGREGATION_KINDS = SpanKindFilter.builder()
+            .includeClient()
+            .includeProducer()
+            .includeConsumer()
+            .build();
+
+    private static final SpanKindFilter INTERNAL_KIND =
+            SpanKindFilter.builder().includeInternal().build();
+
+    // gRPC status-code source tags, probed in priority order on the OTLP export path
+    private static final String[] GRPC_STATUS_CODE_KEYS = {
+        InstrumentationTags.GRPC_STATUS_CODE, // "rpc.grpc.status_code"
+        "grpc.code",
+        "rpc.grpc.status.code",
+        "grpc.status.code",
+        "rpc.response.status_code",
+    };
+
+    private final Set<String> ignoredResources;
+    private final Thread thread;
+    private final MessagePassingQueue<InboxItem> inbox;
+    private final Sink sink;
+    private final MetricWriter metricWriter;
+    private final Aggregator aggregator;
+    private final long reportingInterval;
+    private final TimeUnit reportingIntervalTimeUnit;
+    private final DDAgentFeaturesDiscovery features;
+    private final HealthMetrics healthMetrics;
+    // Aggregates per-cycle cardinality-block counts by tag name into a single rate-limited warn,
+    // instead of warning per field on every reporting cycle. Aggregator-thread confined.
+    private final CardinalityLimitReporter cardinalityLimitReporter = new CardinalityLimitReporter();
+    private final AdditionalTagsSchema additionalTagsSchema;
+    private final boolean includeEndpointInMetrics;
+    private final boolean otlpStatsExportEnabled;
+
+    /**
+     * Cached peer-aggregation schema read by producer threads.
+     *
+     * <p>Producers read this reference once per trace and store it on each {@link SpanSnapshot}. They
+     * do not inspect the schema's discovery state or rebuild it. The aggregator thread reconciles the
+     * schema once per reporting cycle in {@link #resetCardinalityHandlers()}: if feature discovery
+     * has a new state but the tag set is unchanged, it updates {@link PeerTagSchema#state} in-place
+     * to preserve the warm cardinality handlers; otherwise it swaps in a freshly-built schema.
+     *
+     * <p>An empty schema (size 0) represents the "peer tags unconfigured" state; {@code null} only on
+     * the bootstrap window before {@link #bootstrapPeerTagSchema()} runs on the first publish.
+     *
+     * <p>{@code volatile} so producer threads always see the latest replacement. The schema's own
+     * internal mutable state (handlers, block counters, {@link PeerTagSchema#state}) is exercised
+     * only on the aggregator thread.
+     */
+    private volatile PeerTagSchema cachedPeerTagSchema;
+
+    /**
+     * Previous peer-tag schema, kept until the next reporting cycle.
+     *
+     * <p>A producer may read the current schema just before the aggregator replaces it. If that
+     * producer queues its {@link SpanSnapshot} after the current {@code REPORT} signal, the snapshot
+     * will be processed during the next cycle and will still update the old schema's blocked-value
+     * counters.
+     *
+     * <p>Keeping the old schema here allows the next reset to report those late counter updates
+     * before the schema is discarded.
+     *
+     * <p>This field is accessed only by the aggregator thread, so it does not need to be volatile.
+     */
+    private PeerTagSchema previousPeerTagSchema;
+
+    private volatile AgentTaskScheduler.Scheduled<?> cancellation;
+
+    public ClientStatsAggregator(
+            Config config, SharedCommunicationObjects sharedCommunicationObjects, HealthMetrics healthMetrics) {
+        this(
+                config.getWellKnownTags(),
+                config.getMetricsIgnoredResources(),
+                additionalTagsSchemaFrom(config),
+                sharedCommunicationObjects.featuresDiscovery(config),
+                healthMetrics,
+                new OkHttpSink(
+                        sharedCommunicationObjects.agentHttpClient,
+                        sharedCommunicationObjects.agentUrl.toString(),
+                        V06_METRICS_ENDPOINT,
+                        config.isTracerMetricsBufferingEnabled(),
+                        false,
+                        DEFAULT_HEADERS),
+                config.getTracerMetricsMaxAggregates(),
+                config.getTracerMetricsMaxPending(),
+                config.isTraceResourceRenamingEnabled());
+    }
+
+    /**
+     * OTLP span-metrics export variant. Reuses the same span selection + DDSketch aggregation as the
+     * native path, but emits via the injected {@link OtlpStatsMetricWriter} instead of msgpack. No
+     * agent {@link Sink} is needed, so a {@link NoOpSink} satisfies the register()/backpressure
+     * contract, and the reporting interval comes from {@code trace.stats.interval} (milliseconds).
+     */
+    public ClientStatsAggregator(
+            Config config,
+            SharedCommunicationObjects sharedCommunicationObjects,
+            HealthMetrics healthMetrics,
+            OtlpStatsMetricWriter metricWriter) {
+        this(
+                config.getMetricsIgnoredResources(),
+                additionalTagsSchemaFrom(config),
+                sharedCommunicationObjects.featuresDiscovery(config),
+                healthMetrics,
+                NoOpSink.INSTANCE,
+                metricWriter,
+                config.getTracerMetricsMaxAggregates(),
+                config.getTracerMetricsMaxPending(),
+                config.getTraceStatsInterval(),
+                MILLISECONDS,
+                true);
+    }
+
+    private static AdditionalTagsSchema additionalTagsSchemaFrom(Config config) {
+        return AdditionalTagsSchema.from(
+                config.getTraceStatsAdditionalTags(),
+                config.getTraceStatsCardinalityLimit("additional_tags", MetricCardinalityLimits.ADDITIONAL_TAG_VALUE),
+                MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
+    }
+
+    ClientStatsAggregator(
+            WellKnownTags wellKnownTags,
+            Set<String> ignoredResources,
+            AdditionalTagsSchema additionalTagsSchema,
+            DDAgentFeaturesDiscovery features,
+            HealthMetrics healthMetric,
+            Sink sink,
+            int maxAggregates,
+            int queueSize,
+            boolean includeEndpointInMetrics) {
+        this(
+                wellKnownTags,
+                ignoredResources,
+                additionalTagsSchema,
+                features,
+                healthMetric,
+                sink,
+                maxAggregates,
+                queueSize,
+                10,
+                SECONDS,
+                includeEndpointInMetrics);
+    }
+
+    ClientStatsAggregator(
+            WellKnownTags wellKnownTags,
+            Set<String> ignoredResources,
+            AdditionalTagsSchema additionalTagsSchema,
+            DDAgentFeaturesDiscovery features,
+            HealthMetrics healthMetric,
+            Sink sink,
+            int maxAggregates,
+            int queueSize,
+            long reportingInterval,
+            TimeUnit timeUnit,
+            boolean includeEndpointInMetrics) {
+        this(
+                ignoredResources,
+                additionalTagsSchema,
+                features,
+                healthMetric,
+                sink,
+                new SerializingMetricWriter(wellKnownTags, sink, additionalTagsSchema.size() > 0),
+                maxAggregates,
+                queueSize,
                 reportingInterval,
+                timeUnit,
+                includeEndpointInMetrics);
+    }
+
+    /** Test-only: defaults to no additional tags schema. */
+    ClientStatsAggregator(
+            Set<String> ignoredResources,
+            DDAgentFeaturesDiscovery features,
+            HealthMetrics healthMetric,
+            Sink sink,
+            MetricWriter metricWriter,
+            int maxAggregates,
+            int queueSize,
+            long reportingInterval,
+            TimeUnit timeUnit,
+            boolean includeEndpointInMetrics) {
+        this(
+                ignoredResources,
+                AdditionalTagsSchema.EMPTY,
+                features,
+                healthMetric,
+                sink,
+                metricWriter,
+                maxAggregates,
+                queueSize,
                 reportingInterval,
-                reportingIntervalTimeUnit);
-    log.debug("started metrics aggregator");
-  }
-
-  private boolean statsExportEnabled() {
-    return otlpStatsExportEnabled || features.supportsMetrics();
-  }
-
-  private boolean isMetricsEnabled() {
-    // The discovery refresh only helps the native path.
-    if (!otlpStatsExportEnabled && features.getMetricsEndpoint() == null) {
-      features.discoverIfOutdated();
-    }
-    return statsExportEnabled();
-  }
-
-  @Override
-  public boolean report() {
-    boolean published;
-    int attempts = 0;
-    do {
-      published = inbox.offer(REPORT);
-      ++attempts;
-    } while (!published && attempts < 10);
-    if (!published) {
-      log.debug("Skipped metrics reporting because the queue is full");
-    }
-    return published;
-  }
-
-  @Override
-  public Future<Boolean> forceReport() {
-    // Ensure the feature is enabled
-    if (!isMetricsEnabled()) {
-      return CompletableFuture.completedFuture(false);
-    }
-    // Wait for the thread to start
-    while (cancellation == null || (cancellation.get() != null && !thread.isAlive())) {
-      try {
-        Thread.sleep(10);
-      } catch (InterruptedException e) {
-        return CompletableFuture.completedFuture(false);
-      }
-    }
-    // Try to send the report signal
-    ReportSignal reportSignal = new ReportSignal();
-    boolean published = false;
-    while (thread.isAlive() && !published) {
-      published = inbox.offer(reportSignal);
-      if (!published) {
-        try {
-          Thread.sleep(10);
-        } catch (InterruptedException e) {
-          log.debug("Failed to ask for report");
-          break;
+                timeUnit,
+                includeEndpointInMetrics);
+    }
+
+    ClientStatsAggregator(
+            Set<String> ignoredResources,
+            AdditionalTagsSchema additionalTagsSchema,
+            DDAgentFeaturesDiscovery features,
+            HealthMetrics healthMetric,
+            Sink sink,
+            MetricWriter metricWriter,
+            int maxAggregates,
+            int queueSize,
+            long reportingInterval,
+            TimeUnit timeUnit,
+            boolean includeEndpointInMetrics) {
+        this.ignoredResources = ignoredResources;
+        this.additionalTagsSchema = additionalTagsSchema;
+        this.includeEndpointInMetrics = includeEndpointInMetrics;
+        this.otlpStatsExportEnabled = metricWriter instanceof OtlpStatsMetricWriter;
+        this.inbox = Queues.mpscArrayQueue(queueSize);
+        this.features = features;
+        this.healthMetrics = healthMetric;
+        this.sink = sink;
+        this.metricWriter = metricWriter;
+        this.aggregator = new Aggregator(
+                metricWriter,
+                inbox,
+                maxAggregates,
+                reportingInterval,
+                timeUnit,
+                healthMetric,
+                additionalTagsSchema,
+                this::resetCardinalityHandlers);
+        this.thread = newAgentThread(METRICS_AGGREGATOR, aggregator);
+        this.reportingInterval = reportingInterval;
+        this.reportingIntervalTimeUnit = timeUnit;
+    }
+
+    // ── visible for testing ─────────────────────────────────────────────────────
+    // Expose the writer-selection outcome and reporting cadence so tests can assert
+    // the native-vs-OTLP XOR choice without reflecting into private fields.
+
+    boolean isOtlpStatsExportEnabled() {
+        return otlpStatsExportEnabled;
+    }
+
+    long reportingInterval() {
+        return reportingInterval;
+    }
+
+    TimeUnit reportingIntervalTimeUnit() {
+        return reportingIntervalTimeUnit;
+    }
+
+    @VisibleForTesting
+    Aggregator aggregator() {
+        return aggregator;
+    }
+
+    @Override
+    public void start() {
+        sink.register(this);
+        thread.start();
+        cancellation = AgentTaskScheduler.get()
+                .scheduleAtFixedRate(
+                        new ReportTask(), this, reportingInterval, reportingInterval, reportingIntervalTimeUnit);
+        log.debug("started metrics aggregator");
+    }
+
+    private boolean statsExportEnabled() {
+        return otlpStatsExportEnabled || features.supportsMetrics();
+    }
+
+    private boolean isMetricsEnabled() {
+        // The discovery refresh only helps the native path.
+        if (!otlpStatsExportEnabled && features.getMetricsEndpoint() == null) {
+            features.discoverIfOutdated();
+        }
+        return statsExportEnabled();
+    }
+
+    @Override
+    public boolean report() {
+        boolean published;
+        int attempts = 0;
+        do {
+            published = inbox.offer(REPORT);
+            ++attempts;
+        } while (!published && attempts < 10);
+        if (!published) {
+            log.debug("Skipped metrics reporting because the queue is full");
+        }
+        return published;
+    }
+
+    @Override
+    public Future<Boolean> forceReport() {
+        // Ensure the feature is enabled
+        if (!isMetricsEnabled()) {
+            return CompletableFuture.completedFuture(false);
+        }
+        // Wait for the thread to start
+        while (cancellation == null || (cancellation.get() != null && !thread.isAlive())) {
+            try {
+                Thread.sleep(10);
+            } catch (InterruptedException e) {
+                return CompletableFuture.completedFuture(false);
+            }
+        }
+        // Try to send the report signal
+        ReportSignal reportSignal = new ReportSignal();
+        boolean published = false;
+        while (thread.isAlive() && !published) {
+            published = inbox.offer(reportSignal);
+            if (!published) {
+                try {
+                    Thread.sleep(10);
+                } catch (InterruptedException e) {
+                    log.debug("Failed to ask for report");
+                    break;
+                }
+            }
+        }
+        if (published) {
+            return reportSignal.future;
+        } else {
+            return CompletableFuture.completedFuture(false);
+        }
+    }
+
+    @Override
+    public boolean publish(List<? extends CoreSpan<?>> trace) {
+        boolean forceKeep = false;
+        int counted = 0;
+        if (statsExportEnabled()) {
+            // Producer-side fast path: one volatile read and use whatever schema is currently cached.
+            // The aggregator thread keeps this schema in sync with feature discovery in
+            // resetCardinalityHandlers(). The only producer-side rebuild is the one-time bootstrap on
+            // the first publish.
+            PeerTagSchema peerTagSchema = cachedPeerTagSchema;
+            if (peerTagSchema == null) {
+                peerTagSchema = bootstrapPeerTagSchema();
+            }
+            // ignoredResources is fixed for the lifetime of the aggregator and typically empty; hoist the
+            // check so the common case skips both the lookup and the getResourceName() call per span.
+            final boolean hasIgnoredResources = !ignoredResources.isEmpty();
+            for (CoreSpan<?> span : trace) {
+                boolean isTopLevel = span.isTopLevel();
+                if (shouldComputeMetric(span, isTopLevel)) {
+                    if (hasIgnoredResources) {
+                        final CharSequence resourceName = span.getResourceName();
+                        if (resourceName != null && ignoredResources.contains(resourceName.toString())) {
+                            // skip publishing all children
+                            break;
+                        }
+                    }
+                    counted++;
+                    forceKeep |= publish(span, isTopLevel, peerTagSchema);
+                }
+            }
+            healthMetrics.onClientStatTraceComputed(counted, trace.size(), !forceKeep);
+        }
+        return forceKeep;
+    }
+
+    private boolean shouldComputeMetric(CoreSpan<?> span, boolean isTopLevel) {
+        return (span.isMeasured() || isTopLevel || span.isKind(METRICS_ELIGIBLE_KINDS))
+                && span.getLongRunningVersion() <= 0 // either not long-running or unpublished long-running span
+                && span.getDurationNano() > 0;
+    }
+
+    private boolean publish(CoreSpan<?> span, boolean isTopLevel, PeerTagSchema peerTagSchema) {
+        boolean error = span.getError() > 0;
+        // size() is approximate on jctools MPSC queues but good enough for a fast-path overflow check.
+        if (inbox.size() >= inbox.capacity()) {
+            healthMetrics.onStatsInboxFull();
+            return error;
+        }
+        // Extract HTTP method and endpoint only if the feature is enabled
+        String httpMethod = null;
+        String httpEndpoint = null;
+        if (includeEndpointInMetrics) {
+            Object httpMethodObj = span.unsafeGetTag(HTTP_METHOD);
+            httpMethod = httpMethodObj != null ? httpMethodObj.toString() : null;
+            Object httpEndpointObj = span.unsafeGetTag(HTTP_ENDPOINT);
+            // OTLP path falls back to http.route (mirrors libdatadog). The native v0.6 path keeps its
+            // http.endpoint-only lookup so this doesn't change its aggregation key / wire output.
+            if (otlpStatsExportEnabled && httpEndpointObj == null) {
+                httpEndpointObj = span.unsafeGetTag(HTTP_ROUTE);
+            }
+            httpEndpoint = httpEndpointObj != null ? httpEndpointObj.toString() : null;
         }
-      }
-    }
-    if (published) {
-      return reportSignal.future;
-    } else {
-      return CompletableFuture.completedFuture(false);
-    }
-  }
-
-  @Override
-  public boolean publish(List<? extends CoreSpan<?>> trace) {
-    boolean forceKeep = false;
-    int counted = 0;
-    if (statsExportEnabled()) {
-      // Producer-side fast path: one volatile read and use whatever schema is currently cached.
-      // The aggregator thread keeps this schema in sync with feature discovery in
-      // resetCardinalityHandlers(). The only producer-side rebuild is the one-time bootstrap on
-      // the first publish.
-      PeerTagSchema peerTagSchema = cachedPeerTagSchema;
-      if (peerTagSchema == null) {
-        peerTagSchema = bootstrapPeerTagSchema();
-      }
-      // ignoredResources is fixed for the lifetime of the aggregator and typically empty; hoist the
-      // check so the common case skips both the lookup and the getResourceName() call per span.
-      final boolean hasIgnoredResources = !ignoredResources.isEmpty();
-      for (CoreSpan<?> span : trace) {
-        boolean isTopLevel = span.isTopLevel();
-        if (shouldComputeMetric(span, isTopLevel)) {
-          if (hasIgnoredResources) {
-            final CharSequence resourceName = span.getResourceName();
-            if (resourceName != null && ignoredResources.contains(resourceName.toString())) {
-              // skip publishing all children
-              break;
+
+        CharSequence spanType = span.getType();
+        String grpcStatusCode = null;
+        if (otlpStatsExportEnabled) {
+            // OTLP path: probe every known gRPC status-code convention, no span-type gate, so a span
+            // typed "grpc" (or carrying an OTel-style key) still surfaces rpc.response.status_code.
+            grpcStatusCode = firstTag(span, GRPC_STATUS_CODE_KEYS);
+        } else if (spanType != null && RPC.contentEquals(spanType)) {
+            Object grpcStatusObj = span.unsafeGetTag(InstrumentationTags.GRPC_STATUS_CODE);
+            grpcStatusCode = grpcStatusObj != null ? grpcStatusObj.toString() : null;
+        }
+        // DDSpan resolves this from a cached span.kind ordinal via a small lookup array, skipping a
+        // tag-map lookup. Other CoreSpan impls fall back to the tag map by default.
+        String spanKind = span.getSpanKindString();
+        if (spanKind == null) {
+            spanKind = "";
+        }
+
+        long tagAndDuration = span.getDurationNano() | (error ? ERROR_TAG : 0L) | (isTopLevel ? TOP_LEVEL_TAG : 0L);
+
+        PeerTagSchema spanPeerTagSchema = peerTagSchemaFor(spanKind, peerTagSchema);
+        String[] peerTagValues = spanPeerTagSchema == null ? null : capturePeerTagValues(span, spanPeerTagSchema);
+        if (peerTagValues == null) {
+            // capture returned no non-null values -- drop the schema reference so the consumer doesn't
+            // bother iterating an all-null array.
+            spanPeerTagSchema = null;
+        }
+
+        String[] additionalTagValues = captureAdditionalTagValues(span);
+
+        SpanSnapshot snapshot = new SpanSnapshot(
+                span.getResourceName(),
+                span.getServiceName(),
+                span.getOperationName(),
+                span.getServiceNameSource(),
+                spanType,
+                span.getHttpStatusCode(),
+                isSynthetic(span),
+                span.getParentId() == 0,
+                spanKind,
+                spanPeerTagSchema,
+                peerTagValues,
+                httpMethod,
+                httpEndpoint,
+                grpcStatusCode,
+                additionalTagValues,
+                tagAndDuration);
+        if (!inbox.offer(snapshot)) {
+            healthMetrics.onStatsInboxFull();
+        }
+        // force keep keys if there are errors
+        return error;
+    }
+
+    /** Returns the first non-null span tag among {@code keys}, in order, or {@code null} if none. */
+    private static String firstTag(CoreSpan<?> span, String[] keys) {
+        for (String key : keys) {
+            Object value = span.unsafeGetTag(key);
+            if (value != null) {
+                return value.toString();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Captures the span's additional-metric-tag values into a {@code String[]} parallel to {@code
+     * additionalTagsSchema.names}. Returns {@code null} when no additional tags are configured or
+     * none of the configured keys are set on the span. Raw values only -- length cap and
+     * canonicalization run on the aggregator thread.
+     */
+    private String[] captureAdditionalTagValues(CoreSpan<?> span) {
+        return captureTagValues(span, additionalTagsSchema.names);
+    }
+
+    /**
+     * One-time producer-side bootstrap of {@link #cachedPeerTagSchema}. Synchronized double-check
+     * guards against two producers racing on the very first publish; after this returns, {@code
+     * cachedPeerTagSchema} is non-null forever and the aggregator thread is the sole subsequent
+     * mutator (see {@link #reconcilePeerTagSchema()}).
+     */
+    private synchronized PeerTagSchema bootstrapPeerTagSchema() {
+        PeerTagSchema cached = cachedPeerTagSchema;
+        if (cached != null) {
+            return cached;
+        }
+        PeerTagSchema schema = buildPeerTagSchema();
+        cachedPeerTagSchema = schema;
+        return schema;
+    }
+
+    /**
+     * Builds a fresh {@link PeerTagSchema} from the current state of feature discovery.
+     *
+     * <p>Read order matters: {@code DDAgentFeaturesDiscovery} exposes {@code peerTags()} and {@code
+     * state()} as two separate accessors, each reading its volatile {@code discoveryState}
+     * independently. If a discovery refresh interleaves between the two reads, we want to be left
+     * with a schema whose embedded state is *stale* relative to its tag set rather than the other way
+     * around -- that way the next reconcile sees a state mismatch and re-runs the deep compare to
+     * pick up the change, instead of short-circuiting on a too-fresh state and missing it.
+     *
+     * <p>So read {@code state()} first, then {@code peerTags()}.
+     */
+    private PeerTagSchema buildPeerTagSchema() {
+        String state = features.state();
+        Set<String> names = features.peerTags();
+        return PeerTagSchema.of(names == null ? Collections.<String>emptySet() : names, state);
+    }
+
+    /**
+     * Single reset hook invoked on the aggregator thread at the end of each report cycle. Reconciles
+     * the cached peer-tag schema against the latest feature discovery, then resets all cardinality
+     * state together: the property handlers, both peer-tag schemas, and the additional tags schema.
+     * New handlers added anywhere in this pipeline should be reset from here.
+     */
+    private void resetCardinalityHandlers() {
+        reconcilePeerTagSchema();
+        aggregator.resetCoreHandlers(healthMetrics, cardinalityLimitReporter);
+        PeerTagSchema.INTERNAL.resetHandlers(healthMetrics, cardinalityLimitReporter);
+        PeerTagSchema schema = cachedPeerTagSchema;
+        if (schema != null) {
+            schema.resetHandlers(healthMetrics, cardinalityLimitReporter);
+        }
+        additionalTagsSchema.resetHandlers(healthMetrics, cardinalityLimitReporter);
+        cardinalityLimitReporter.reportIfDue();
+    }
+
+    /**
+     * Reconciles {@link #cachedPeerTagSchema} with the latest feature discovery. Runs on the
+     * aggregator thread once per reporting cycle via the reset hook passed to {@link Aggregator}.
+     * Cheap fast path: an equality check against the cached schema's embedded {@link
+     * DDAgentFeaturesDiscovery#state()} hash short-circuits when discovery's response hasn't changed
+     * since the schema was built. On mismatch, a set compare distinguishes "discovery response
+     * changed but peer tags are the same" (just update the cached state in place to preserve the warm
+     * cardinality handlers) from "tags actually changed" (build a new schema and swap the volatile
+     * reference).
+     */
+    private void reconcilePeerTagSchema() {
+        // Report and discard the schema retired during the previous cycle. Snapshots queued after the
+        // previous REPORT may still reference that schema and may have updated its blocked-value
+        // counters during this cycle. Do this before the swap below, which may retire the current
+        // schema
+        // and keep it here until the next cycle.
+        if (previousPeerTagSchema != null) {
+            previousPeerTagSchema.resetHandlers(healthMetrics, cardinalityLimitReporter);
+            previousPeerTagSchema = null;
+        }
+        PeerTagSchema cached = cachedPeerTagSchema;
+        if (cached == null) {
+            // First reset before the first publish -- producer-side bootstrap hasn't run yet.
+            return;
+        }
+        String latestState = features.state();
+        if (Objects.equals(cached.state, latestState)) {
+            return;
+        }
+        Set<String> latestNames = features.peerTags();
+        Set<String> normalized = latestNames == null ? Collections.emptySet() : latestNames;
+        if (cached.hasSameTagsAs(normalized)) {
+            cached.state = latestState;
+        } else {
+            // Tags actually changed: flush the outgoing schema's accumulated block telemetry before
+            // discarding it, otherwise the partial-cycle blockedCounts would silently disappear. Flushing
+            // into the reporter by tag name is also what carries block counts across the rebuild -- a
+            // surviving tag's new handler resumes adding to the same reporter entry, so no per-tag
+            // transfer or handler reuse is needed.
+            cached.resetHandlers(healthMetrics, cardinalityLimitReporter);
+            // Retain the outgoing schema for one more reset cycle so snapshots that captured it just
+            // before this swap still have their post-swap block counts flushed (see the field doc).
+            previousPeerTagSchema = cached;
+            cachedPeerTagSchema = PeerTagSchema.of(normalized, latestState);
+        }
+    }
+
+    /**
+     * Picks the peer-tag schema for a span. The {@code peerTagSchema} argument is the per-trace
+     * cached schema (read once in {@link #publish(List)} via the volatile {@link
+     * #cachedPeerTagSchema}, with {@link #bootstrapPeerTagSchema()} taking care of the first-publish
+     * window) -- always non-null but possibly empty when peer tags are unconfigured. For
+     * internal-kind spans the static {@link PeerTagSchema#INTERNAL} schema is used regardless.
+     */
+    private static PeerTagSchema peerTagSchemaFor(String spanKind, PeerTagSchema peerTagSchema) {
+        if (peerTagSchema.size() > 0 && PEER_AGGREGATION_KINDS.matches(spanKind)) {
+            return peerTagSchema;
+        }
+        if (INTERNAL_KIND.matches(spanKind)) {
+            return PeerTagSchema.INTERNAL;
+        }
+        return null;
+    }
+
+    /**
+     * Captures the span's peer tag values into a {@code String[]} parallel to {@code schema.names}.
+     * Returns {@code null} when none of the configured peer tags are set on the span.
+     */
+    private static String[] capturePeerTagValues(CoreSpan<?> span, PeerTagSchema schema) {
+        return captureTagValues(span, schema.names);
+    }
+
+    private static String[] captureTagValues(CoreSpan<?> span, String[] names) {
+        int n = names.length;
+        String[] values = null;
+        for (int i = 0; i < n; i++) {
+            Object v = span.unsafeGetTag(names[i]);
+            if (v != null) {
+                if (values == null) {
+                    values = new String[n];
+                }
+                values[i] = v.toString();
             }
-          }
-          counted++;
-          forceKeep |= publish(span, isTopLevel, peerTagSchema);
         }
-      }
-      healthMetrics.onClientStatTraceComputed(counted, trace.size(), !forceKeep);
-    }
-    return forceKeep;
-  }
-
-  private boolean shouldComputeMetric(CoreSpan<?> span, boolean isTopLevel) {
-    return (span.isMeasured() || isTopLevel || span.isKind(METRICS_ELIGIBLE_KINDS))
-        && span.getLongRunningVersion()
-            <= 0 // either not long-running or unpublished long-running span
-        && span.getDurationNano() > 0;
-  }
-
-  private boolean publish(CoreSpan<?> span, boolean isTopLevel, PeerTagSchema peerTagSchema) {
-    boolean error = span.getError() > 0;
-    // size() is approximate on jctools MPSC queues but good enough for a fast-path overflow check.
-    if (inbox.size() >= inbox.capacity()) {
-      healthMetrics.onStatsInboxFull();
-      return error;
-    }
-    // Extract HTTP method and endpoint only if the feature is enabled
-    String httpMethod = null;
-    String httpEndpoint = null;
-    if (includeEndpointInMetrics) {
-      Object httpMethodObj = span.unsafeGetTag(HTTP_METHOD);
-      httpMethod = httpMethodObj != null ? httpMethodObj.toString() : null;
-      Object httpEndpointObj = span.unsafeGetTag(HTTP_ENDPOINT);
-      // OTLP path falls back to http.route (mirrors libdatadog). The native v0.6 path keeps its
-      // http.endpoint-only lookup so this doesn't change its aggregation key / wire output.
-      if (otlpStatsExportEnabled && httpEndpointObj == null) {
-        httpEndpointObj = span.unsafeGetTag(HTTP_ROUTE);
-      }
-      httpEndpoint = httpEndpointObj != null ? httpEndpointObj.toString() : null;
-    }
-
-    CharSequence spanType = span.getType();
-    String grpcStatusCode = null;
-    if (otlpStatsExportEnabled) {
-      // OTLP path: probe every known gRPC status-code convention, no span-type gate, so a span
-      // typed "grpc" (or carrying an OTel-style key) still surfaces rpc.response.status_code.
-      grpcStatusCode = firstTag(span, GRPC_STATUS_CODE_KEYS);
-    } else if (spanType != null && RPC.contentEquals(spanType)) {
-      Object grpcStatusObj = span.unsafeGetTag(InstrumentationTags.GRPC_STATUS_CODE);
-      grpcStatusCode = grpcStatusObj != null ? grpcStatusObj.toString() : null;
-    }
-    // DDSpan resolves this from a cached span.kind ordinal via a small lookup array, skipping a
-    // tag-map lookup. Other CoreSpan impls fall back to the tag map by default.
-    String spanKind = span.getSpanKindString();
-    if (spanKind == null) {
-      spanKind = "";
-    }
-
-    long tagAndDuration =
-        span.getDurationNano() | (error ? ERROR_TAG : 0L) | (isTopLevel ? TOP_LEVEL_TAG : 0L);
-
-    PeerTagSchema spanPeerTagSchema = peerTagSchemaFor(spanKind, peerTagSchema);
-    String[] peerTagValues =
-        spanPeerTagSchema == null ? null : capturePeerTagValues(span, spanPeerTagSchema);
-    if (peerTagValues == null) {
-      // capture returned no non-null values -- drop the schema reference so the consumer doesn't
-      // bother iterating an all-null array.
-      spanPeerTagSchema = null;
-    }
-
-    String[] additionalTagValues = captureAdditionalTagValues(span);
-
-    SpanSnapshot snapshot =
-        new SpanSnapshot(
-            span.getResourceName(),
-            span.getServiceName(),
-            span.getOperationName(),
-            span.getServiceNameSource(),
-            spanType,
-            span.getHttpStatusCode(),
-            isSynthetic(span),
-            span.getParentId() == 0,
-            spanKind,
-            spanPeerTagSchema,
-            peerTagValues,
-            httpMethod,
-            httpEndpoint,
-            grpcStatusCode,
-            additionalTagValues,
-            tagAndDuration);
-    if (!inbox.offer(snapshot)) {
-      healthMetrics.onStatsInboxFull();
-    }
-    // force keep keys if there are errors
-    return error;
-  }
-
-  /** Returns the first non-null span tag among {@code keys}, in order, or {@code null} if none. */
-  private static String firstTag(CoreSpan<?> span, String[] keys) {
-    for (String key : keys) {
-      Object value = span.unsafeGetTag(key);
-      if (value != null) {
-        return value.toString();
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Captures the span's additional-metric-tag values into a {@code String[]} parallel to {@code
-   * additionalTagsSchema.names}. Returns {@code null} when no additional tags are configured or
-   * none of the configured keys are set on the span. Raw values only -- length cap and
-   * canonicalization run on the aggregator thread.
-   */
-  private String[] captureAdditionalTagValues(CoreSpan<?> span) {
-    return captureTagValues(span, additionalTagsSchema.names);
-  }
-
-  /**
-   * One-time producer-side bootstrap of {@link #cachedPeerTagSchema}. Synchronized double-check
-   * guards against two producers racing on the very first publish; after this returns, {@code
-   * cachedPeerTagSchema} is non-null forever and the aggregator thread is the sole subsequent
-   * mutator (see {@link #reconcilePeerTagSchema()}).
-   */
-  private synchronized PeerTagSchema bootstrapPeerTagSchema() {
-    PeerTagSchema cached = cachedPeerTagSchema;
-    if (cached != null) {
-      return cached;
-    }
-    PeerTagSchema schema = buildPeerTagSchema();
-    cachedPeerTagSchema = schema;
-    return schema;
-  }
-
-  /**
-   * Builds a fresh {@link PeerTagSchema} from the current state of feature discovery.
-   *
-   * <p>Read order matters: {@code DDAgentFeaturesDiscovery} exposes {@code peerTags()} and {@code
-   * state()} as two separate accessors, each reading its volatile {@code discoveryState}
-   * independently. If a discovery refresh interleaves between the two reads, we want to be left
-   * with a schema whose embedded state is *stale* relative to its tag set rather than the other way
-   * around -- that way the next reconcile sees a state mismatch and re-runs the deep compare to
-   * pick up the change, instead of short-circuiting on a too-fresh state and missing it.
-   *
-   * <p>So read {@code state()} first, then {@code peerTags()}.
-   */
-  private PeerTagSchema buildPeerTagSchema() {
-    String state = features.state();
-    Set<String> names = features.peerTags();
-    return PeerTagSchema.of(names == null ? Collections.<String>emptySet() : names, state);
-  }
-
-  /**
-   * Single reset hook invoked on the aggregator thread at the end of each report cycle. Reconciles
-   * the cached peer-tag schema against the latest feature discovery, then resets all cardinality
-   * state together: the property handlers, both peer-tag schemas, and the additional tags schema.
-   * New handlers added anywhere in this pipeline should be reset from here.
-   */
-  private void resetCardinalityHandlers() {
-    reconcilePeerTagSchema();
-    aggregator.resetCoreHandlers(healthMetrics, cardinalityLimitReporter);
-    PeerTagSchema.INTERNAL.resetHandlers(healthMetrics, cardinalityLimitReporter);
-    PeerTagSchema schema = cachedPeerTagSchema;
-    if (schema != null) {
-      schema.resetHandlers(healthMetrics, cardinalityLimitReporter);
-    }
-    additionalTagsSchema.resetHandlers(healthMetrics, cardinalityLimitReporter);
-    cardinalityLimitReporter.reportIfDue();
-  }
-
-  /**
-   * Reconciles {@link #cachedPeerTagSchema} with the latest feature discovery. Runs on the
-   * aggregator thread once per reporting cycle via the reset hook passed to {@link Aggregator}.
-   * Cheap fast path: an equality check against the cached schema's embedded {@link
-   * DDAgentFeaturesDiscovery#state()} hash short-circuits when discovery's response hasn't changed
-   * since the schema was built. On mismatch, a set compare distinguishes "discovery response
-   * changed but peer tags are the same" (just update the cached state in place to preserve the warm
-   * cardinality handlers) from "tags actually changed" (build a new schema and swap the volatile
-   * reference).
-   */
-  private void reconcilePeerTagSchema() {
-    // Report and discard the schema retired during the previous cycle. Snapshots queued after the
-    // previous REPORT may still reference that schema and may have updated its blocked-value
-    // counters during this cycle. Do this before the swap below, which may retire the current
-    // schema
-    // and keep it here until the next cycle.
-    if (previousPeerTagSchema != null) {
-      previousPeerTagSchema.resetHandlers(healthMetrics, cardinalityLimitReporter);
-      previousPeerTagSchema = null;
-    }
-    PeerTagSchema cached = cachedPeerTagSchema;
-    if (cached == null) {
-      // First reset before the first publish -- producer-side bootstrap hasn't run yet.
-      return;
-    }
-    String latestState = features.state();
-    if (Objects.equals(cached.state, latestState)) {
-      return;
-    }
-    Set<String> latestNames = features.peerTags();
-    Set<String> normalized = latestNames == null ? Collections.emptySet() : latestNames;
-    if (cached.hasSameTagsAs(normalized)) {
-      cached.state = latestState;
-    } else {
-      // Tags actually changed: flush the outgoing schema's accumulated block telemetry before
-      // discarding it, otherwise the partial-cycle blockedCounts would silently disappear. Flushing
-      // into the reporter by tag name is also what carries block counts across the rebuild -- a
-      // surviving tag's new handler resumes adding to the same reporter entry, so no per-tag
-      // transfer or handler reuse is needed.
-      cached.resetHandlers(healthMetrics, cardinalityLimitReporter);
-      // Retain the outgoing schema for one more reset cycle so snapshots that captured it just
-      // before this swap still have their post-swap block counts flushed (see the field doc).
-      previousPeerTagSchema = cached;
-      cachedPeerTagSchema = PeerTagSchema.of(normalized, latestState);
-    }
-  }
-
-  /**
-   * Picks the peer-tag schema for a span. The {@code peerTagSchema} argument is the per-trace
-   * cached schema (read once in {@link #publish(List)} via the volatile {@link
-   * #cachedPeerTagSchema}, with {@link #bootstrapPeerTagSchema()} taking care of the first-publish
-   * window) -- always non-null but possibly empty when peer tags are unconfigured. For
-   * internal-kind spans the static {@link PeerTagSchema#INTERNAL} schema is used regardless.
-   */
-  private static PeerTagSchema peerTagSchemaFor(String spanKind, PeerTagSchema peerTagSchema) {
-    if (peerTagSchema.size() > 0 && PEER_AGGREGATION_KINDS.matches(spanKind)) {
-      return peerTagSchema;
-    }
-    if (INTERNAL_KIND.matches(spanKind)) {
-      return PeerTagSchema.INTERNAL;
-    }
-    return null;
-  }
-
-  /**
-   * Captures the span's peer tag values into a {@code String[]} parallel to {@code schema.names}.
-   * Returns {@code null} when none of the configured peer tags are set on the span.
-   */
-  private static String[] capturePeerTagValues(CoreSpan<?> span, PeerTagSchema schema) {
-    return captureTagValues(span, schema.names);
-  }
-
-  private static String[] captureTagValues(CoreSpan<?> span, String[] names) {
-    int n = names.length;
-    String[] values = null;
-    for (int i = 0; i < n; i++) {
-      Object v = span.unsafeGetTag(names[i]);
-      if (v != null) {
-        if (values == null) {
-          values = new String[n];
+        return values;
+    }
+
+    private static boolean isSynthetic(CoreSpan<?> span) {
+        CharSequence origin = span.getOrigin();
+        return origin != null && SYNTHETICS_ORIGIN.contentEquals(origin);
+    }
+
+    public void stop() {
+        if (null != cancellation) {
+            cancellation.cancel();
+        }
+        inbox.offer(STOP);
+    }
+
+    @Override
+    public void close() {
+        stop();
+        try {
+            thread.join(THREAD_JOIN_TIMOUT_MS);
+        } catch (InterruptedException ignored) {
+        }
+        // The OTLP stats writer owns a dedicated OTLP sender. Evict it now that the aggregator thread
+        // has stopped, so no in-flight finishBucket() flush is still using the sender.
+        if (metricWriter instanceof OtlpStatsMetricWriter) {
+            ((OtlpStatsMetricWriter) metricWriter).shutdown();
         }
-        values[i] = v.toString();
-      }
-    }
-    return values;
-  }
-
-  private static boolean isSynthetic(CoreSpan<?> span) {
-    CharSequence origin = span.getOrigin();
-    return origin != null && SYNTHETICS_ORIGIN.contentEquals(origin);
-  }
-
-  public void stop() {
-    if (null != cancellation) {
-      cancellation.cancel();
-    }
-    inbox.offer(STOP);
-  }
-
-  @Override
-  public void close() {
-    stop();
-    try {
-      thread.join(THREAD_JOIN_TIMOUT_MS);
-    } catch (InterruptedException ignored) {
-    }
-    // The OTLP stats writer owns a dedicated OTLP sender. Evict it now that the aggregator thread
-    // has stopped, so no in-flight finishBucket() flush is still using the sender.
-    if (metricWriter instanceof OtlpStatsMetricWriter) {
-      ((OtlpStatsMetricWriter) metricWriter).shutdown();
-    }
-  }
-
-  @Override
-  public void onEvent(EventType eventType, String message) {
-    healthMetrics.onClientStatPayloadSent();
-    switch (eventType) {
-      case DOWNGRADED:
-        log.debug("Agent downgrade was detected");
-        disable();
-        healthMetrics.onClientStatDowngraded();
-        break;
-      case BAD_PAYLOAD:
-        log.debug("bad metrics payload sent to trace agent: {}", message);
-        healthMetrics.onClientStatErrorReceived();
-        break;
-      case ERROR:
-        log.debug("trace agent errored receiving metrics payload: {}", message);
-        healthMetrics.onClientStatErrorReceived();
-        break;
-      default:
-        break;
-    }
-  }
-
-  private void disable() {
-    features.discover();
-    if (!features.supportsMetrics()) {
-      log.debug("Disabling metric reporting because an agent downgrade was detected");
-      // Route the clear through the inbox so the aggregator thread is the only writer.
-      // AggregateTable is not thread-safe; mutating it directly from this thread would race
-      // with Drainer.accept on the aggregator thread.
-      //
-      // Best-effort single offer rather than the retry-loop pattern in report(). If the inbox is
-      // full at downgrade time the clear is dropped, but the system self-heals: features.discover()
-      // already flipped supportsMetrics() false, so producer publish() calls now skip the inbox;
-      // the aggregator drains existing snapshots and ships them on the next report cycle; the
-      // sink rejects that payload and fires DOWNGRADED again, which retries disable() against a
-      // now-empty inbox. Worst case: one extra reporting cycle of stale data.
-      inbox.offer(CLEAR);
-    }
-  }
-
-  private static final class ReportTask implements AgentTaskScheduler.Task<ClientStatsAggregator> {
+    }
 
     @Override
-    public void run(ClientStatsAggregator target) {
-      target.report();
+    public void onEvent(EventType eventType, String message) {
+        healthMetrics.onClientStatPayloadSent();
+        switch (eventType) {
+            case DOWNGRADED:
+                log.debug("Agent downgrade was detected");
+                disable();
+                healthMetrics.onClientStatDowngraded();
+                break;
+            case BAD_PAYLOAD:
+                log.debug("bad metrics payload sent to trace agent: {}", message);
+                healthMetrics.onClientStatErrorReceived();
+                break;
+            case ERROR:
+                log.debug("trace agent errored receiving metrics payload: {}", message);
+                healthMetrics.onClientStatErrorReceived();
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void disable() {
+        features.discover();
+        if (!features.supportsMetrics()) {
+            log.debug("Disabling metric reporting because an agent downgrade was detected");
+            // Route the clear through the inbox so the aggregator thread is the only writer.
+            // AggregateTable is not thread-safe; mutating it directly from this thread would race
+            // with Drainer.accept on the aggregator thread.
+            //
+            // Best-effort single offer rather than the retry-loop pattern in report(). If the inbox is
+            // full at downgrade time the clear is dropped, but the system self-heals: features.discover()
+            // already flipped supportsMetrics() false, so producer publish() calls now skip the inbox;
+            // the aggregator drains existing snapshots and ships them on the next report cycle; the
+            // sink rejects that payload and fires DOWNGRADED again, which retries disable() against a
+            // now-empty inbox. Worst case: one extra reporting cycle of stale data.
+            inbox.offer(CLEAR);
+        }
     }
-  }
 
-  @VisibleForTesting
-  boolean isEmpty() {
-    return inbox.isEmpty();
-  }
+    private static final class ReportTask implements AgentTaskScheduler.Task<ClientStatsAggregator> {
+
+        @Override
+        public void run(ClientStatsAggregator target) {
+            target.report();
+        }
+    }
+
+    @VisibleForTesting
+    boolean isEmpty() {
+        return inbox.isEmpty();
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/CoreHandlers.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/CoreHandlers.java
index fc6223157ca..cdb8cd42656 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/CoreHandlers.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/CoreHandlers.java
@@ -12,92 +12,62 @@
  */
 final class CoreHandlers {
 
-  final PropertyCardinalityHandler resource;
-  final PropertyCardinalityHandler service;
-  final PropertyCardinalityHandler operation;
-  final PropertyCardinalityHandler serviceSource;
-  final PropertyCardinalityHandler type;
-  final PropertyCardinalityHandler spanKind;
-  final PropertyCardinalityHandler httpMethod;
-  final PropertyCardinalityHandler httpEndpoint;
-  final PropertyCardinalityHandler grpcStatusCode;
+    final PropertyCardinalityHandler resource;
+    final PropertyCardinalityHandler service;
+    final PropertyCardinalityHandler operation;
+    final PropertyCardinalityHandler serviceSource;
+    final PropertyCardinalityHandler type;
+    final PropertyCardinalityHandler spanKind;
+    final PropertyCardinalityHandler httpMethod;
+    final PropertyCardinalityHandler httpEndpoint;
+    final PropertyCardinalityHandler grpcStatusCode;
 
-  private final PropertyCardinalityHandler[] handlers;
+    private final PropertyCardinalityHandler[] handlers;
 
-  CoreHandlers() {
-    Config config = Config.get();
-    // Configurable limits — tunable via env var.
-    this.resource =
-        new PropertyCardinalityHandler(
-            "resource",
-            config.getTraceStatsCardinalityLimit("resource", MetricCardinalityLimits.RESOURCE),
-            MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
-    this.httpEndpoint =
-        new PropertyCardinalityHandler(
-            "http_endpoint",
-            config.getTraceStatsCardinalityLimit(
-                "http_endpoint", MetricCardinalityLimits.HTTP_ENDPOINT),
-            MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
-    // Fixed limits — hardcoded, not user-configurable.
-    this.service =
-        new PropertyCardinalityHandler(
-            "service",
-            MetricCardinalityLimits.SERVICE,
-            MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
-    // operation is carried on the stats wire as the protobuf field "name", so its telemetry tag is
-    // collapsed:name (RFC section 5) while the human-facing reporter keeps the clearer "operation".
-    this.operation =
-        new PropertyCardinalityHandler(
-            "operation",
-            "name",
-            MetricCardinalityLimits.OPERATION,
-            MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
-    this.serviceSource =
-        new PropertyCardinalityHandler(
-            "service_source",
-            MetricCardinalityLimits.SERVICE_SOURCE,
-            MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
-    this.type =
-        new PropertyCardinalityHandler(
-            "type", MetricCardinalityLimits.TYPE, MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
-    this.spanKind =
-        new PropertyCardinalityHandler(
-            "span_kind",
-            MetricCardinalityLimits.SPAN_KIND,
-            MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
-    this.httpMethod =
-        new PropertyCardinalityHandler(
-            "http_method",
-            MetricCardinalityLimits.HTTP_METHOD,
-            MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
-    this.grpcStatusCode =
-        new PropertyCardinalityHandler(
-            "grpc_status_code",
-            MetricCardinalityLimits.GRPC_STATUS_CODE,
-            MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
-    this.handlers =
-        new PropertyCardinalityHandler[] {
-          resource,
-          service,
-          operation,
-          serviceSource,
-          type,
-          spanKind,
-          httpMethod,
-          httpEndpoint,
-          grpcStatusCode
+    CoreHandlers() {
+        Config config = Config.get();
+        // Configurable limits — tunable via env var.
+        this.resource = new PropertyCardinalityHandler(
+                "resource",
+                config.getTraceStatsCardinalityLimit("resource", MetricCardinalityLimits.RESOURCE),
+                MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
+        this.httpEndpoint = new PropertyCardinalityHandler(
+                "http_endpoint",
+                config.getTraceStatsCardinalityLimit("http_endpoint", MetricCardinalityLimits.HTTP_ENDPOINT),
+                MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
+        // Fixed limits — hardcoded, not user-configurable.
+        this.service = new PropertyCardinalityHandler(
+                "service", MetricCardinalityLimits.SERVICE, MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
+        // operation is carried on the stats wire as the protobuf field "name", so its telemetry tag is
+        // collapsed:name (RFC section 5) while the human-facing reporter keeps the clearer "operation".
+        this.operation = new PropertyCardinalityHandler(
+                "operation", "name", MetricCardinalityLimits.OPERATION, MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
+        this.serviceSource = new PropertyCardinalityHandler(
+                "service_source", MetricCardinalityLimits.SERVICE_SOURCE, MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
+        this.type = new PropertyCardinalityHandler(
+                "type", MetricCardinalityLimits.TYPE, MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
+        this.spanKind = new PropertyCardinalityHandler(
+                "span_kind", MetricCardinalityLimits.SPAN_KIND, MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
+        this.httpMethod = new PropertyCardinalityHandler(
+                "http_method", MetricCardinalityLimits.HTTP_METHOD, MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
+        this.grpcStatusCode = new PropertyCardinalityHandler(
+                "grpc_status_code",
+                MetricCardinalityLimits.GRPC_STATUS_CODE,
+                MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
+        this.handlers = new PropertyCardinalityHandler[] {
+            resource, service, operation, serviceSource, type, spanKind, httpMethod, httpEndpoint, grpcStatusCode
         };
-  }
+    }
 
-  void reset(HealthMetrics healthMetrics, CardinalityLimitReporter reporter) {
-    for (PropertyCardinalityHandler h : handlers) {
-      long numBlocked = h.reset();
-      if (numBlocked > 0) {
-        String[] statsDTag = h.statsDTag();
-        healthMetrics.onTagCardinalityBlocked(statsDTag, numBlocked);
-        StatsMetrics.getInstance().onCollapsedSpans(statsDTag[0], numBlocked);
-        reporter.record(h.name, numBlocked);
-      }
+    void reset(HealthMetrics healthMetrics, CardinalityLimitReporter reporter) {
+        for (PropertyCardinalityHandler h : handlers) {
+            long numBlocked = h.reset();
+            if (numBlocked > 0) {
+                String[] statsDTag = h.statsDTag();
+                healthMetrics.onTagCardinalityBlocked(statsDTag, numBlocked);
+                StatsMetrics.getInstance().onCollapsedSpans(statsDTag[0], numBlocked);
+                reporter.record(h.name, numBlocked);
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/EventListener.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/EventListener.java
index ae5f910b0a7..c6de346517c 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/EventListener.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/EventListener.java
@@ -1,12 +1,12 @@
 package datadog.trace.common.metrics;
 
 public interface EventListener {
-  enum EventType {
-    BAD_PAYLOAD,
-    DOWNGRADED,
-    OK,
-    ERROR
-  }
+    enum EventType {
+        BAD_PAYLOAD,
+        DOWNGRADED,
+        OK,
+        ERROR
+    }
 
-  void onEvent(EventType eventType, String message);
+    void onEvent(EventType eventType, String message);
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/InboxItem.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/InboxItem.java
index e7c37f91768..eaa70cf40bc 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/InboxItem.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/InboxItem.java
@@ -16,41 +16,41 @@ interface InboxItem {}
  * new ReportSignal()}) rather than reusing the singleton.
  */
 abstract class SignalItem implements InboxItem {
-  final CompletableFuture<Boolean> future;
-
-  public SignalItem() {
-    this.future = new CompletableFuture<>();
-  }
-
-  void complete() {
-    this.future.complete(true);
-  }
-
-  void ignore() {
-    this.future.complete(false);
-  }
-
-  static final class StopSignal extends SignalItem {
-    /** Fire-and-forget singleton. See class-level note on {@link SignalItem}. */
-    static final StopSignal STOP = new StopSignal();
-
-    private StopSignal() {}
-  }
-
-  static final class ReportSignal extends SignalItem {
-    /** Fire-and-forget singleton; {@code forceReport()} allocates fresh instances. */
-    static final ReportSignal REPORT = new ReportSignal();
-  }
-
-  /**
-   * Posted from arbitrary threads (e.g. the Sink event thread during agent downgrade) so the
-   * aggregator thread is the one that actually performs the table reset. Keeps {@link
-   * AggregateTable} and {@code inbox.clear()} single-writer.
-   */
-  static final class ClearSignal extends SignalItem {
-    /** Fire-and-forget singleton. See class-level note on {@link SignalItem}. */
-    static final ClearSignal CLEAR = new ClearSignal();
-
-    private ClearSignal() {}
-  }
+    final CompletableFuture<Boolean> future;
+
+    public SignalItem() {
+        this.future = new CompletableFuture<>();
+    }
+
+    void complete() {
+        this.future.complete(true);
+    }
+
+    void ignore() {
+        this.future.complete(false);
+    }
+
+    static final class StopSignal extends SignalItem {
+        /** Fire-and-forget singleton. See class-level note on {@link SignalItem}. */
+        static final StopSignal STOP = new StopSignal();
+
+        private StopSignal() {}
+    }
+
+    static final class ReportSignal extends SignalItem {
+        /** Fire-and-forget singleton; {@code forceReport()} allocates fresh instances. */
+        static final ReportSignal REPORT = new ReportSignal();
+    }
+
+    /**
+     * Posted from arbitrary threads (e.g. the Sink event thread during agent downgrade) so the
+     * aggregator thread is the one that actually performs the table reset. Keeps {@link
+     * AggregateTable} and {@code inbox.clear()} single-writer.
+     */
+    static final class ClearSignal extends SignalItem {
+        /** Fire-and-forget singleton. See class-level note on {@link SignalItem}. */
+        static final ClearSignal CLEAR = new ClearSignal();
+
+        private ClearSignal() {}
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricCardinalityLimits.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricCardinalityLimits.java
index 0b6ef8cdbd8..c6d5b17f76f 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricCardinalityLimits.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricCardinalityLimits.java
@@ -10,97 +10,97 @@
  * savings but risks suppressing legitimate distinctions.
  */
 final class MetricCardinalityLimits {
-  private MetricCardinalityLimits() {}
+    private MetricCardinalityLimits() {}
 
-  /**
-   * Whether over-cap values collapse into the {@code tracer_blocked_value} sentinel (cardinality
-   * capping). Always {@code true} in shipped builds. Retained as a compile-time flip back to the
-   * pre-capping behavior -- handlers without a sentinel -- that shipped in an earlier release, in
-   * case capping needs to be disabled during the internal rollout. This is not a runtime config
-   * knob; flipping it requires a rebuild.
-   */
-  static final boolean USE_BLOCKED_SENTINEL = true;
+    /**
+     * Whether over-cap values collapse into the {@code tracer_blocked_value} sentinel (cardinality
+     * capping). Always {@code true} in shipped builds. Retained as a compile-time flip back to the
+     * pre-capping behavior -- handlers without a sentinel -- that shipped in an earlier release, in
+     * case capping needs to be disabled during the internal rollout. This is not a runtime config
+     * knob; flipping it requires a rebuild.
+     */
+    static final boolean USE_BLOCKED_SENTINEL = true;
 
-  /**
-   * Distinct {@code resource.name} values per cycle. Highest-cardinality field by far: DB-query
-   * obfuscations, HTTP route templates, custom resources. Typical service: 30-200 unique; 1024
-   * leaves headroom for high-cardinality SQL/HTTP workloads without risking premature collapse.
-   */
-  static final int RESOURCE = 1024;
+    /**
+     * Distinct {@code resource.name} values per cycle. Highest-cardinality field by far: DB-query
+     * obfuscations, HTTP route templates, custom resources. Typical service: 30-200 unique; 1024
+     * leaves headroom for high-cardinality SQL/HTTP workloads without risking premature collapse.
+     */
+    static final int RESOURCE = 1024;
 
-  /**
-   * Distinct {@code service.name} values per cycle. Local service plus downstream peer-service
-   * names. Microservice meshes typically reference 10-50 distinct services.
-   */
-  static final int SERVICE = 32;
+    /**
+     * Distinct {@code service.name} values per cycle. Local service plus downstream peer-service
+     * names. Microservice meshes typically reference 10-50 distinct services.
+     */
+    static final int SERVICE = 32;
 
-  /**
-   * Distinct {@code operation.name} values per cycle. Names like {@code http.request}, {@code
-   * db.query}, etc. Typical service: 10-30 across integrations.
-   */
-  static final int OPERATION = 64;
+    /**
+     * Distinct {@code operation.name} values per cycle. Names like {@code http.request}, {@code
+     * db.query}, etc. Typical service: 10-30 across integrations.
+     */
+    static final int OPERATION = 64;
 
-  /**
-   * Distinct {@code _dd.base_service} override values per cycle. Used rarely; usually empty or one
-   * of a handful per service.
-   */
-  static final int SERVICE_SOURCE = 16;
+    /**
+     * Distinct {@code _dd.base_service} override values per cycle. Used rarely; usually empty or one
+     * of a handful per service.
+     */
+    static final int SERVICE_SOURCE = 16;
 
-  /**
-   * Distinct {@code span.type} values per cycle. {@code DDSpanTypes} catalog is ~30; a single
-   * service usually spans 5-10 integration types.
-   */
-  static final int TYPE = 16;
+    /**
+     * Distinct {@code span.type} values per cycle. {@code DDSpanTypes} catalog is ~30; a single
+     * service usually spans 5-10 integration types.
+     */
+    static final int TYPE = 16;
 
-  /**
-   * Distinct {@code span.kind} values per cycle. OTel defines exactly 5 (server/client/producer/
-   * consumer/internal); 8 still leaves 60% headroom in case a producer invents new kinds.
-   */
-  static final int SPAN_KIND = 8;
+    /**
+     * Distinct {@code span.kind} values per cycle. OTel defines exactly 5 (server/client/producer/
+     * consumer/internal); 8 still leaves 60% headroom in case a producer invents new kinds.
+     */
+    static final int SPAN_KIND = 8;
 
-  /**
-   * Distinct HTTP method values per cycle. Standard verbs are 7-9; WebDAV/custom adds a few more.
-   */
-  static final int HTTP_METHOD = 16;
+    /**
+     * Distinct HTTP method values per cycle. Standard verbs are 7-9; WebDAV/custom adds a few more.
+     */
+    static final int HTTP_METHOD = 16;
 
-  /**
-   * Distinct {@code http.endpoint} values per cycle. Path templates -- same shape as {@code
-   * RESOURCE} for HTTP-heavy services. Only used when {@code includeEndpointInMetrics} is enabled.
-   */
-  static final int HTTP_ENDPOINT = 512;
+    /**
+     * Distinct {@code http.endpoint} values per cycle. Path templates -- same shape as {@code
+     * RESOURCE} for HTTP-heavy services. Only used when {@code includeEndpointInMetrics} is enabled.
+     */
+    static final int HTTP_ENDPOINT = 512;
 
-  /**
-   * Distinct gRPC status code values per cycle. gRPC spec defines exactly 17 codes (0-16); 24
-   * leaves headroom for unknown-code edge cases without wasting space.
-   */
-  static final int GRPC_STATUS_CODE = 24;
+    /**
+     * Distinct gRPC status code values per cycle. gRPC spec defines exactly 17 codes (0-16); 24
+     * leaves headroom for unknown-code edge cases without wasting space.
+     */
+    static final int GRPC_STATUS_CODE = 24;
 
-  /**
-   * Distinct values per peer-tag name (e.g. distinct {@code peer.hostname} values). Each configured
-   * peer tag gets its own handler at this limit.
-   */
-  static final int PEER_TAG_VALUE = 512;
+    /**
+     * Distinct values per peer-tag name (e.g. distinct {@code peer.hostname} values). Each configured
+     * peer tag gets its own handler at this limit.
+     */
+    static final int PEER_TAG_VALUE = 512;
 
-  /**
-   * Distinct values per additional-tag key (e.g. distinct values of a span-derived primary tag).
-   * Each configured additional tag gets its own {@link TagCardinalityHandler} at this limit.
-   *
-   * <p>{@code 100} is the default; the value is configurable via {@code
-   * DD_TRACE_STATS_ADDITIONAL_TAGS_CARDINALITY_LIMIT} (resolved in {@link ClientStatsAggregator}
-   * through {@code Config#getTraceStatsCardinalityLimit}), matching the default and env-var name
-   * the approved Cardinality Limits RFC specifies. The RFC leaves the limiting unit and eviction
-   * strategy to the SDK ("mechanism in the spec, policy in the SDK"); we apply the limit per key.
-   */
-  static final int ADDITIONAL_TAG_VALUE = 100;
+    /**
+     * Distinct values per additional-tag key (e.g. distinct values of a span-derived primary tag).
+     * Each configured additional tag gets its own {@link TagCardinalityHandler} at this limit.
+     *
+     * <p>{@code 100} is the default; the value is configurable via {@code
+     * DD_TRACE_STATS_ADDITIONAL_TAGS_CARDINALITY_LIMIT} (resolved in {@link ClientStatsAggregator}
+     * through {@code Config#getTraceStatsCardinalityLimit}), matching the default and env-var name
+     * the approved Cardinality Limits RFC specifies. The RFC leaves the limiting unit and eviction
+     * strategy to the SDK ("mechanism in the spec, policy in the SDK"); we apply the limit per key.
+     */
+    static final int ADDITIONAL_TAG_VALUE = 100;
 
-  /**
-   * Maximum character length for a single additional-tag value. Values longer than this are
-   * replaced with {@code tracer_blocked_value}; the application could accidentally populate a tag
-   * with a stack trace, SQL statement, or JSON blob, which would bloat every MetricKey and msgpack
-   * payload until the bucket flushes.
-   *
-   * <p>{@code 200} matches the RFC's "collapsed due to exceeding 200 chars". The cap is measured in
-   * characters (via {@code String.length()}).
-   */
-  static final int ADDITIONAL_TAG_MAX_VALUE_LENGTH = 200;
+    /**
+     * Maximum character length for a single additional-tag value. Values longer than this are
+     * replaced with {@code tracer_blocked_value}; the application could accidentally populate a tag
+     * with a stack trace, SQL statement, or JSON blob, which would bloat every MetricKey and msgpack
+     * payload until the bucket flushes.
+     *
+     * <p>{@code 200} matches the RFC's "collapsed due to exceeding 200 chars". The cap is measured in
+     * characters (via {@code String.length()}).
+     */
+    static final int ADDITIONAL_TAG_MAX_VALUE_LENGTH = 200;
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricWriter.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricWriter.java
index 905ba498760..7546d14980c 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricWriter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricWriter.java
@@ -1,15 +1,15 @@
 package datadog.trace.common.metrics;
 
 public interface MetricWriter {
-  void startBucket(int metricCount, long start, long duration);
+    void startBucket(int metricCount, long start, long duration);
 
-  /**
-   * Serialize one aggregate. The {@link AggregateEntry} carries both the label fields (resource,
-   * service, span.kind, peer tags, etc.) and the counters being reported.
-   */
-  void add(AggregateEntry entry);
+    /**
+     * Serialize one aggregate. The {@link AggregateEntry} carries both the label fields (resource,
+     * service, span.kind, peer tags, etc.) and the counters being reported.
+     */
+    void add(AggregateEntry entry);
 
-  void finishBucket();
+    void finishBucket();
 
-  void reset();
+    void reset();
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricsAggregator.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricsAggregator.java
index 3ea6df9c58a..0980ea86412 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricsAggregator.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricsAggregator.java
@@ -5,14 +5,14 @@
 import java.util.concurrent.Future;
 
 public interface MetricsAggregator extends AutoCloseable {
-  void start();
+    void start();
 
-  boolean report();
+    boolean report();
 
-  Future<Boolean> forceReport();
+    Future<Boolean> forceReport();
 
-  boolean publish(List<? extends CoreSpan<?>> trace);
+    boolean publish(List<? extends CoreSpan<?>> trace);
 
-  @Override
-  void close();
+    @Override
+    void close();
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricsAggregatorFactory.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricsAggregatorFactory.java
index afd25d9566a..1e83d13a036 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricsAggregatorFactory.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricsAggregatorFactory.java
@@ -11,44 +11,40 @@
 import org.slf4j.LoggerFactory;
 
 public class MetricsAggregatorFactory {
-  private static final Logger log = LoggerFactory.getLogger(MetricsAggregatorFactory.class);
+    private static final Logger log = LoggerFactory.getLogger(MetricsAggregatorFactory.class);
 
-  public static MetricsAggregator createMetricsAggregator(
-      Config config,
-      SharedCommunicationObjects sharedCommunicationObjects,
-      HealthMetrics healthMetrics) {
-    // OTLP span-metrics export and native msgpack stats are mutually exclusive (XOR): both hang off
-    // the same ClientStatsAggregator span selection + DDSketch aggregation, differing only in
-    // the injected MetricWriter.
-    if (config.isOtelTracesSpanMetricsEnabled()) {
-      if (config.isTracerMetricsEnabled()) {
-        log.warn(
-            "Both OTLP trace span metrics and native tracer metrics are enabled; "
-                + "using OTLP export and ignoring native tracer metrics (the two are mutually "
-                + "exclusive).");
-      }
-      if (!config.isMetricsOtlpExporterEnabled()) {
-        log.warn(
-            "OTLP trace span metrics are enabled but the OTLP metrics exporter is not enabled "
-                + "("
-                + METRICS_OTEL_EXPORTER
-                + " is not 'otlp'); span metrics will still be exported over "
-                + "OTLP using the otlp.metrics.* transport settings. Set "
-                + METRICS_OTEL_EXPORTER
-                + "=otlp "
-                + "to make this explicit, or disable "
-                + OTEL_TRACES_SPAN_METRICS_ENABLED
-                + " to suppress them.");
-      }
-      log.debug("OTLP trace span metrics enabled");
-      return new ClientStatsAggregator(
-          config, sharedCommunicationObjects, healthMetrics, new OtlpStatsMetricWriter(config));
+    public static MetricsAggregator createMetricsAggregator(
+            Config config, SharedCommunicationObjects sharedCommunicationObjects, HealthMetrics healthMetrics) {
+        // OTLP span-metrics export and native msgpack stats are mutually exclusive (XOR): both hang off
+        // the same ClientStatsAggregator span selection + DDSketch aggregation, differing only in
+        // the injected MetricWriter.
+        if (config.isOtelTracesSpanMetricsEnabled()) {
+            if (config.isTracerMetricsEnabled()) {
+                log.warn("Both OTLP trace span metrics and native tracer metrics are enabled; "
+                        + "using OTLP export and ignoring native tracer metrics (the two are mutually "
+                        + "exclusive).");
+            }
+            if (!config.isMetricsOtlpExporterEnabled()) {
+                log.warn("OTLP trace span metrics are enabled but the OTLP metrics exporter is not enabled "
+                        + "("
+                        + METRICS_OTEL_EXPORTER
+                        + " is not 'otlp'); span metrics will still be exported over "
+                        + "OTLP using the otlp.metrics.* transport settings. Set "
+                        + METRICS_OTEL_EXPORTER
+                        + "=otlp "
+                        + "to make this explicit, or disable "
+                        + OTEL_TRACES_SPAN_METRICS_ENABLED
+                        + " to suppress them.");
+            }
+            log.debug("OTLP trace span metrics enabled");
+            return new ClientStatsAggregator(
+                    config, sharedCommunicationObjects, healthMetrics, new OtlpStatsMetricWriter(config));
+        }
+        if (config.isTracerMetricsEnabled()) {
+            log.debug("tracer metrics enabled");
+            return new ClientStatsAggregator(config, sharedCommunicationObjects, healthMetrics);
+        }
+        log.debug("tracer metrics disabled");
+        return NoOpMetricsAggregator.INSTANCE;
     }
-    if (config.isTracerMetricsEnabled()) {
-      log.debug("tracer metrics enabled");
-      return new ClientStatsAggregator(config, sharedCommunicationObjects, healthMetrics);
-    }
-    log.debug("tracer metrics disabled");
-    return NoOpMetricsAggregator.INSTANCE;
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/NoOpMetricsAggregator.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/NoOpMetricsAggregator.java
index a15c008e109..c56c3852b33 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/NoOpMetricsAggregator.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/NoOpMetricsAggregator.java
@@ -9,26 +9,26 @@
 
 public final class NoOpMetricsAggregator implements MetricsAggregator {
 
-  public static final NoOpMetricsAggregator INSTANCE = new NoOpMetricsAggregator();
+    public static final NoOpMetricsAggregator INSTANCE = new NoOpMetricsAggregator();
 
-  @Override
-  public void start() {}
+    @Override
+    public void start() {}
 
-  @Override
-  public boolean report() {
-    return false;
-  }
+    @Override
+    public boolean report() {
+        return false;
+    }
 
-  @Override
-  public Future<Boolean> forceReport() {
-    return CompletableFuture.completedFuture(FALSE);
-  }
+    @Override
+    public Future<Boolean> forceReport() {
+        return CompletableFuture.completedFuture(FALSE);
+    }
 
-  @Override
-  public boolean publish(List<? extends CoreSpan<?>> trace) {
-    return false;
-  }
+    @Override
+    public boolean publish(List<? extends CoreSpan<?>> trace) {
+        return false;
+    }
 
-  @Override
-  public void close() {}
+    @Override
+    public void close() {}
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/NoOpSink.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/NoOpSink.java
index 75236791324..d136c099337 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/NoOpSink.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/NoOpSink.java
@@ -5,13 +5,13 @@
 /** A {@link Sink} that discards everything. */
 public final class NoOpSink implements Sink {
 
-  public static final NoOpSink INSTANCE = new NoOpSink();
+    public static final NoOpSink INSTANCE = new NoOpSink();
 
-  private NoOpSink() {}
+    private NoOpSink() {}
 
-  @Override
-  public void accept(int messageCount, ByteBuffer buffer) {}
+    @Override
+    public void accept(int messageCount, ByteBuffer buffer) {}
 
-  @Override
-  public void register(EventListener listener) {}
+    @Override
+    public void register(EventListener listener) {}
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/OkHttpSink.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/OkHttpSink.java
index 193a2fb0436..09c73d70245 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/OkHttpSink.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/OkHttpSink.java
@@ -30,146 +30,145 @@
 
 public final class OkHttpSink implements Sink, EventListener {
 
-  private static final Logger log = LoggerFactory.getLogger(OkHttpSink.class);
-
-  private static final long ASYNC_THRESHOLD_LATENCY = SECONDS.toNanos(1);
-
-  private final OkHttpClient client;
-  private final HttpUrl metricsUrl;
-  private final List<EventListener> listeners;
-  private final MessagePassingQueue<Request> enqueuedRequests = Queues.spscArrayQueue(16);
-  private final AtomicLong lastRequestTime = new AtomicLong();
-  private final AtomicLong asyncRequestCounter = new AtomicLong();
-  private final boolean bufferingEnabled;
-  private final boolean compressionEnabled;
-  private final Map<String, String> headers;
-
-  private final AtomicBoolean asyncTaskStarted = new AtomicBoolean(false);
-  private volatile AgentTaskScheduler.Scheduled<OkHttpSink> future;
-
-  public OkHttpSink(
-      OkHttpClient client,
-      String agentUrl,
-      String path,
-      boolean bufferingEnabled,
-      boolean compressionEnabled,
-      Map<String, String> headers) {
-    this.client = client;
-    this.metricsUrl = HttpUrl.get(agentUrl).resolve(path);
-    this.listeners = new CopyOnWriteArrayList<>();
-    this.bufferingEnabled = bufferingEnabled;
-    this.compressionEnabled = compressionEnabled;
-    this.headers = new HashMap<>(headers);
-
-    if (compressionEnabled) {
-      this.headers.put("Content-Encoding", "gzip");
+    private static final Logger log = LoggerFactory.getLogger(OkHttpSink.class);
+
+    private static final long ASYNC_THRESHOLD_LATENCY = SECONDS.toNanos(1);
+
+    private final OkHttpClient client;
+    private final HttpUrl metricsUrl;
+    private final List<EventListener> listeners;
+    private final MessagePassingQueue<Request> enqueuedRequests = Queues.spscArrayQueue(16);
+    private final AtomicLong lastRequestTime = new AtomicLong();
+    private final AtomicLong asyncRequestCounter = new AtomicLong();
+    private final boolean bufferingEnabled;
+    private final boolean compressionEnabled;
+    private final Map<String, String> headers;
+
+    private final AtomicBoolean asyncTaskStarted = new AtomicBoolean(false);
+    private volatile AgentTaskScheduler.Scheduled<OkHttpSink> future;
+
+    public OkHttpSink(
+            OkHttpClient client,
+            String agentUrl,
+            String path,
+            boolean bufferingEnabled,
+            boolean compressionEnabled,
+            Map<String, String> headers) {
+        this.client = client;
+        this.metricsUrl = HttpUrl.get(agentUrl).resolve(path);
+        this.listeners = new CopyOnWriteArrayList<>();
+        this.bufferingEnabled = bufferingEnabled;
+        this.compressionEnabled = compressionEnabled;
+        this.headers = new HashMap<>(headers);
+
+        if (compressionEnabled) {
+            this.headers.put("Content-Encoding", "gzip");
+        }
     }
-  }
-
-  @Override
-  public void accept(int messageCount, ByteBuffer buffer) {
-    // if the agent is healthy, then we can send on this thread,
-    // without copying the buffer, otherwise this needs to be async,
-    // so need to copy and buffer the request, and let it be executed
-    // on the main task scheduler as a last resort
-    if (!bufferingEnabled || lastRequestTime.get() < ASYNC_THRESHOLD_LATENCY) {
-      send(prepareRequest(metricsUrl, headers).post(makeRequestBody(buffer)).build());
-      AgentTaskScheduler.Scheduled<OkHttpSink> future = this.future;
-      if (future != null && enqueuedRequests.isEmpty()) {
-        // async mode has been started but request latency is normal,
-        // there is no pending work, so switch off async mode
-        future.cancel();
-        asyncTaskStarted.set(false);
-      }
-    } else {
-      if (asyncTaskStarted.compareAndSet(false, true)) {
-        this.future =
-            AgentTaskScheduler.get()
-                .scheduleAtFixedRate(new Sender(enqueuedRequests), this, 1, 1, SECONDS);
-      }
-      sendAsync(messageCount, buffer);
+
+    @Override
+    public void accept(int messageCount, ByteBuffer buffer) {
+        // if the agent is healthy, then we can send on this thread,
+        // without copying the buffer, otherwise this needs to be async,
+        // so need to copy and buffer the request, and let it be executed
+        // on the main task scheduler as a last resort
+        if (!bufferingEnabled || lastRequestTime.get() < ASYNC_THRESHOLD_LATENCY) {
+            send(prepareRequest(metricsUrl, headers)
+                    .post(makeRequestBody(buffer))
+                    .build());
+            AgentTaskScheduler.Scheduled<OkHttpSink> future = this.future;
+            if (future != null && enqueuedRequests.isEmpty()) {
+                // async mode has been started but request latency is normal,
+                // there is no pending work, so switch off async mode
+                future.cancel();
+                asyncTaskStarted.set(false);
+            }
+        } else {
+            if (asyncTaskStarted.compareAndSet(false, true)) {
+                this.future =
+                        AgentTaskScheduler.get().scheduleAtFixedRate(new Sender(enqueuedRequests), this, 1, 1, SECONDS);
+            }
+            sendAsync(messageCount, buffer);
+        }
     }
-  }
 
-  private RequestBody makeRequestBody(ByteBuffer buffer) {
-    if (compressionEnabled) {
-      return gzippedMsgpackRequestBodyOf(Collections.singletonList(buffer));
-    } else {
-      return msgpackRequestBodyOf(Collections.singletonList(buffer));
+    private RequestBody makeRequestBody(ByteBuffer buffer) {
+        if (compressionEnabled) {
+            return gzippedMsgpackRequestBodyOf(Collections.singletonList(buffer));
+        } else {
+            return msgpackRequestBodyOf(Collections.singletonList(buffer));
+        }
     }
-  }
-
-  private void sendAsync(int messageCount, ByteBuffer buffer) {
-    asyncRequestCounter.getAndIncrement();
-    if (!enqueuedRequests.offer(
-        prepareRequest(metricsUrl, headers).post(makeRequestBody(buffer.duplicate())).build())) {
-      log.debug(
-          "dropping payload of {} and {}B because sending queue was full",
-          messageCount,
-          buffer.limit());
+
+    private void sendAsync(int messageCount, ByteBuffer buffer) {
+        asyncRequestCounter.getAndIncrement();
+        if (!enqueuedRequests.offer(prepareRequest(metricsUrl, headers)
+                .post(makeRequestBody(buffer.duplicate()))
+                .build())) {
+            log.debug("dropping payload of {} and {}B because sending queue was full", messageCount, buffer.limit());
+        }
     }
-  }
-
-  public boolean isInDegradedMode() {
-    return asyncTaskStarted.get();
-  }
-
-  public long asyncRequestCount() {
-    return asyncRequestCounter.get();
-  }
-
-  private void send(Request request) {
-    long start = System.nanoTime();
-    try (final okhttp3.Response response = client.newCall(request).execute()) {
-      if (!response.isSuccessful()) {
-        handleFailure(response);
-      } else {
-        onEvent(OK, "");
-      }
-    } catch (IOException e) {
-      onEvent(ERROR, e.getMessage());
-    } finally {
-      lastRequestTime.set(System.nanoTime() - start);
+
+    public boolean isInDegradedMode() {
+        return asyncTaskStarted.get();
     }
-  }
 
-  @Override
-  public void onEvent(EventListener.EventType eventType, String message) {
-    for (EventListener listener : listeners) {
-      listener.onEvent(eventType, message);
+    public long asyncRequestCount() {
+        return asyncRequestCounter.get();
     }
-  }
-
-  @Override
-  public void register(EventListener listener) {
-    this.listeners.add(listener);
-  }
-
-  private void handleFailure(okhttp3.Response response) throws IOException {
-    final int code = response.code();
-    if (code == 404) {
-      onEvent(DOWNGRADED, "could not find endpoint");
-    } else if (code >= 400 && code < 500) {
-      onEvent(BAD_PAYLOAD, response.body().string());
-    } else if (code >= 500) {
-      onEvent(ERROR, response.body().string());
+
+    private void send(Request request) {
+        long start = System.nanoTime();
+        try (final okhttp3.Response response = client.newCall(request).execute()) {
+            if (!response.isSuccessful()) {
+                handleFailure(response);
+            } else {
+                onEvent(OK, "");
+            }
+        } catch (IOException e) {
+            onEvent(ERROR, e.getMessage());
+        } finally {
+            lastRequestTime.set(System.nanoTime() - start);
+        }
     }
-  }
 
-  private static final class Sender implements AgentTaskScheduler.Task<OkHttpSink> {
+    @Override
+    public void onEvent(EventListener.EventType eventType, String message) {
+        for (EventListener listener : listeners) {
+            listener.onEvent(eventType, message);
+        }
+    }
 
-    private final MessagePassingQueue<Request> inbox;
+    @Override
+    public void register(EventListener listener) {
+        this.listeners.add(listener);
+    }
 
-    private Sender(MessagePassingQueue<Request> inbox) {
-      this.inbox = inbox;
+    private void handleFailure(okhttp3.Response response) throws IOException {
+        final int code = response.code();
+        if (code == 404) {
+            onEvent(DOWNGRADED, "could not find endpoint");
+        } else if (code >= 400 && code < 500) {
+            onEvent(BAD_PAYLOAD, response.body().string());
+        } else if (code >= 500) {
+            onEvent(ERROR, response.body().string());
+        }
     }
 
-    @Override
-    public void run(OkHttpSink target) {
-      Request request;
-      while ((request = inbox.poll()) != null) {
-        target.send(request);
-      }
+    private static final class Sender implements AgentTaskScheduler.Task<OkHttpSink> {
+
+        private final MessagePassingQueue<Request> inbox;
+
+        private Sender(MessagePassingQueue<Request> inbox) {
+            this.inbox = inbox;
+        }
+
+        @Override
+        public void run(OkHttpSink target) {
+            Request request;
+            while ((request = inbox.poll()) != null) {
+                target.send(request);
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/PeerTagSchema.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/PeerTagSchema.java
index 28d317daf35..b5130686c52 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/PeerTagSchema.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/PeerTagSchema.java
@@ -44,115 +44,112 @@
  */
 final class PeerTagSchema {
 
-  /**
-   * Sentinel {@link #state} for schemas that are never reconciled against feature discovery: the
-   * {@link #INTERNAL} singleton and test-built schemas. A {@code null} state always mismatches a
-   * real discovery hash, so a schema built with it would rebuild on first reconcile -- but neither
-   * of these schemas takes that path.
-   */
-  static final String NO_STATE = null;
+    /**
+     * Sentinel {@link #state} for schemas that are never reconciled against feature discovery: the
+     * {@link #INTERNAL} singleton and test-built schemas. A {@code null} state always mismatches a
+     * real discovery hash, so a schema built with it would rebuild on first reconcile -- but neither
+     * of these schemas takes that path.
+     */
+    static final String NO_STATE = null;
 
-  /** Singleton schema for internal-kind spans -- only {@code base.service}. */
-  static final PeerTagSchema INTERNAL = new PeerTagSchema(new String[] {BASE_SERVICE}, NO_STATE);
+    /** Singleton schema for internal-kind spans -- only {@code base.service}. */
+    static final PeerTagSchema INTERNAL = new PeerTagSchema(new String[] {BASE_SERVICE}, NO_STATE);
 
-  // Health/telemetry statsD tag per the approved Cardinality Limits RFC (section 5): peer-tag
-  // collapses are reported under the lowercased protobuf field name peer_tags, aggregated across
-  // every configured peer tag rather than per individual tag name.
-  private static final String[] COLLAPSED_STATSD_TAG = {"collapsed:peer_tags"};
+    // Health/telemetry statsD tag per the approved Cardinality Limits RFC (section 5): peer-tag
+    // collapses are reported under the lowercased protobuf field name peer_tags, aggregated across
+    // every configured peer tag rather than per individual tag name.
+    private static final String[] COLLAPSED_STATSD_TAG = {"collapsed:peer_tags"};
 
-  final String[] names;
-  final TagCardinalityHandler[] handlers;
+    final String[] names;
+    final TagCardinalityHandler[] handlers;
 
-  /**
-   * The {@code DDAgentFeaturesDiscovery.state()} hash this schema was built from. The aggregator
-   * thread reads and updates this once per reporting cycle when reconciling against the latest
-   * discovery; producer threads never touch it. Plain (non-volatile, non-final) because the
-   * aggregator is the sole reader/writer. May be {@code null} before discovery has produced a
-   * response.
-   */
-  String state;
+    /**
+     * The {@code DDAgentFeaturesDiscovery.state()} hash this schema was built from. The aggregator
+     * thread reads and updates this once per reporting cycle when reconciling against the latest
+     * discovery; producer threads never touch it. Plain (non-volatile, non-final) because the
+     * aggregator is the sole reader/writer. May be {@code null} before discovery has produced a
+     * response.
+     */
+    String state;
 
-  /** Builds a schema for the given peer-tag names. Order is determined by the {@link Set}. */
-  static PeerTagSchema of(Set<String> names, String state) {
-    return new PeerTagSchema(names.toArray(new String[0]), state);
-  }
-
-  PeerTagSchema(String[] names, String state) {
-    this.names = names;
-    this.state = state;
-    this.handlers = new TagCardinalityHandler[names.length];
-    for (int i = 0; i < names.length; i++) {
-      this.handlers[i] =
-          new TagCardinalityHandler(
-              names[i],
-              Config.get()
-                  .getTraceStatsCardinalityLimit(
-                      "peer_tags", MetricCardinalityLimits.PEER_TAG_VALUE),
-              MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
+    /** Builds a schema for the given peer-tag names. Order is determined by the {@link Set}. */
+    static PeerTagSchema of(Set<String> names, String state) {
+        return new PeerTagSchema(names.toArray(new String[0]), state);
     }
-  }
 
-  /**
-   * Whether this schema contains exactly the same tag names as {@code other}. Used during
-   * reconciliation: if feature discovery has a new {@link DDAgentFeaturesDiscovery#state()} but the
-   * peer-tag set is unchanged, the aggregator can reuse this schema and update {@link #state}
-   * instead of rebuilding the handlers.
-   */
-  boolean hasSameTagsAs(Set<String> other) {
-    if (this.names.length != other.size()) {
-      return false;
-    }
-    for (String name : this.names) {
-      if (!other.contains(name)) {
-        return false;
-      }
+    PeerTagSchema(String[] names, String state) {
+        this.names = names;
+        this.state = state;
+        this.handlers = new TagCardinalityHandler[names.length];
+        for (int i = 0; i < names.length; i++) {
+            this.handlers[i] = new TagCardinalityHandler(
+                    names[i],
+                    Config.get().getTraceStatsCardinalityLimit("peer_tags", MetricCardinalityLimits.PEER_TAG_VALUE),
+                    MetricCardinalityLimits.USE_BLOCKED_SENTINEL);
+        }
     }
-    return true;
-  }
 
-  /**
-   * Canonicalizes the peer-tag value at slot {@code i}. Returns {@link UTF8BytesString#EMPTY} for
-   * null inputs and the handler's {@code "<tag>:tracer_blocked_value"} sentinel when the per-tag
-   * cardinality budget is exhausted.
-   */
-  UTF8BytesString register(int i, String value) {
-    return handlers[i].register(value);
-  }
+    /**
+     * Whether this schema contains exactly the same tag names as {@code other}. Used during
+     * reconciliation: if feature discovery has a new {@link DDAgentFeaturesDiscovery#state()} but the
+     * peer-tag set is unchanged, the aggregator can reuse this schema and update {@link #state}
+     * instead of rebuilding the handlers.
+     */
+    boolean hasSameTagsAs(Set<String> other) {
+        if (this.names.length != other.size()) {
+            return false;
+        }
+        for (String name : this.names) {
+            if (!other.contains(name)) {
+                return false;
+            }
+        }
+        return true;
+    }
 
-  /**
-   * Resets cardinality tracking for each peer tag and reports how many values were blocked since
-   * the previous reset.
-   *
-   * <p>The counts are sent to {@link HealthMetrics} for the current reporting cycle. They are also
-   * added to {@code reporter}, which groups them by tag name for a rate-limited warning. Grouping
-   * counts by name ensures they are not lost when a schema rebuild replaces the handlers.
-   *
-   * <p>This method must be called only from the aggregator thread because the handlers are not
-   * thread-safe.
-   */
-  void resetHandlers(HealthMetrics healthMetrics, CardinalityLimitReporter reporter) {
-    long totalCollapsed = 0;
-    for (int i = 0; i < handlers.length; i++) {
-      long numBlocked = handlers[i].reset();
-      if (numBlocked > 0) {
-        // The human-facing reporter names the specific peer tag that triggered the block.
-        reporter.record(names[i], numBlocked);
-      }
-      totalCollapsed += numBlocked;
+    /**
+     * Canonicalizes the peer-tag value at slot {@code i}. Returns {@link UTF8BytesString#EMPTY} for
+     * null inputs and the handler's {@code "<tag>:tracer_blocked_value"} sentinel when the per-tag
+     * cardinality budget is exhausted.
+     */
+    UTF8BytesString register(int i, String value) {
+        return handlers[i].register(value);
     }
-    // The health metric is reported at the peer_tags field granularity (not per tag name) per the
-    // approved Cardinality Limits RFC.
-    if (totalCollapsed > 0) {
-      healthMetrics.onTagCardinalityBlocked(COLLAPSED_STATSD_TAG, totalCollapsed);
-      StatsMetrics.getInstance().onCollapsedSpans(COLLAPSED_STATSD_TAG[0], totalCollapsed);
+
+    /**
+     * Resets cardinality tracking for each peer tag and reports how many values were blocked since
+     * the previous reset.
+     *
+     * <p>The counts are sent to {@link HealthMetrics} for the current reporting cycle. They are also
+     * added to {@code reporter}, which groups them by tag name for a rate-limited warning. Grouping
+     * counts by name ensures they are not lost when a schema rebuild replaces the handlers.
+     *
+     * <p>This method must be called only from the aggregator thread because the handlers are not
+     * thread-safe.
+     */
+    void resetHandlers(HealthMetrics healthMetrics, CardinalityLimitReporter reporter) {
+        long totalCollapsed = 0;
+        for (int i = 0; i < handlers.length; i++) {
+            long numBlocked = handlers[i].reset();
+            if (numBlocked > 0) {
+                // The human-facing reporter names the specific peer tag that triggered the block.
+                reporter.record(names[i], numBlocked);
+            }
+            totalCollapsed += numBlocked;
+        }
+        // The health metric is reported at the peer_tags field granularity (not per tag name) per the
+        // approved Cardinality Limits RFC.
+        if (totalCollapsed > 0) {
+            healthMetrics.onTagCardinalityBlocked(COLLAPSED_STATSD_TAG, totalCollapsed);
+            StatsMetrics.getInstance().onCollapsedSpans(COLLAPSED_STATSD_TAG[0], totalCollapsed);
+        }
     }
-  }
 
-  int size() {
-    return names.length;
-  }
+    int size() {
+        return names.length;
+    }
 
-  String name(int i) {
-    return names[i];
-  }
+    String name(int i) {
+        return names[i];
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/PropertyCardinalityHandler.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/PropertyCardinalityHandler.java
index a813ada53de..1934f6585e7 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/PropertyCardinalityHandler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/PropertyCardinalityHandler.java
@@ -26,173 +26,172 @@
  * and reuses any matching {@link UTF8BytesString} when a value first appears in the new cycle.
  */
 final class PropertyCardinalityHandler {
-  // Upper bound prevents int overflow in the (cardinalityLimit * 2 - 1) capacity calculation.
-  // Practical limits are 8..512; this cap is well beyond any realistic configuration.
-  private static final int MAX_CARDINALITY_LIMIT = 1 << 29;
-
-  final String name;
-
-  /**
-   * Protobuf field name this handler reports under in the {@code collapsed:} health/telemetry tag,
-   * per the approved Cardinality Limits RFC (section 5), which keys collapses by the lowercased
-   * protobuf field name. Usually equal to {@link #name}, but decoupled where the field's
-   * human-facing name differs from its wire name -- e.g. {@code operation} is carried on the wire
-   * as {@code name}, so its telemetry tag is {@code collapsed:name} while the human-facing {@link
-   * CardinalityLimitReporter} still says {@code operation}.
-   */
-  private final String statsDField;
-
-  private final int cardinalityLimit;
-  private final int capacityMask;
-
-  /**
-   * Whether to substitute the {@code tracer_blocked_value} sentinel when the per-cycle budget is
-   * exhausted. With limits enabled (sentinel mode), overflow values collapse to one bucket; with
-   * limits disabled, the cache size is still bounded by {@link #cardinalityLimit} but over-budget
-   * values get freshly-allocated {@link UTF8BytesString}s instead, so the wire format carries the
-   * real value and entries don't collapse. Prior-cycle reuse runs in either mode.
-   */
-  private final boolean useBlockedSentinel;
-
-  // Single open-addressed table per cycle. The stored UTF8BytesString IS the slot identity --
-  // equality is checked by comparing its underlying String against the incoming CharSequence.
-  private UTF8BytesString[] curValues;
-  // Values from the previous reporting cycle, kept so values that persist across cycles can reuse
-  // their UTF8BytesString instance without re-allocating.
-  private UTF8BytesString[] priorValues;
-  private int curSize;
-
-  private UTF8BytesString cacheBlocked = null;
-  private String[] statsDTag = null;
-
-  /** Accumulated block count for the current cycle. Returned and zeroed by {@link #reset()}. */
-  private long blockedCount;
-
-  /**
-   * Test convenience: limits-enabled mode (blocked sentinel substitution active). Production uses
-   * the three-argument constructor with the flag from {@code Config}.
-   */
-  @VisibleForTesting
-  PropertyCardinalityHandler(String name, int cardinalityLimit) {
-    this(name, cardinalityLimit, true);
-  }
-
-  PropertyCardinalityHandler(String name, int cardinalityLimit, boolean useBlockedSentinel) {
-    this(name, name, cardinalityLimit, useBlockedSentinel);
-  }
-
-  PropertyCardinalityHandler(
-      String name, String statsDField, int cardinalityLimit, boolean useBlockedSentinel) {
-    this.name = name;
-    this.statsDField = statsDField;
-    if (cardinalityLimit <= 0) {
-      throw new IllegalArgumentException("cardinalityLimit must be positive: " + cardinalityLimit);
+    // Upper bound prevents int overflow in the (cardinalityLimit * 2 - 1) capacity calculation.
+    // Practical limits are 8..512; this cap is well beyond any realistic configuration.
+    private static final int MAX_CARDINALITY_LIMIT = 1 << 29;
+
+    final String name;
+
+    /**
+     * Protobuf field name this handler reports under in the {@code collapsed:} health/telemetry tag,
+     * per the approved Cardinality Limits RFC (section 5), which keys collapses by the lowercased
+     * protobuf field name. Usually equal to {@link #name}, but decoupled where the field's
+     * human-facing name differs from its wire name -- e.g. {@code operation} is carried on the wire
+     * as {@code name}, so its telemetry tag is {@code collapsed:name} while the human-facing {@link
+     * CardinalityLimitReporter} still says {@code operation}.
+     */
+    private final String statsDField;
+
+    private final int cardinalityLimit;
+    private final int capacityMask;
+
+    /**
+     * Whether to substitute the {@code tracer_blocked_value} sentinel when the per-cycle budget is
+     * exhausted. With limits enabled (sentinel mode), overflow values collapse to one bucket; with
+     * limits disabled, the cache size is still bounded by {@link #cardinalityLimit} but over-budget
+     * values get freshly-allocated {@link UTF8BytesString}s instead, so the wire format carries the
+     * real value and entries don't collapse. Prior-cycle reuse runs in either mode.
+     */
+    private final boolean useBlockedSentinel;
+
+    // Single open-addressed table per cycle. The stored UTF8BytesString IS the slot identity --
+    // equality is checked by comparing its underlying String against the incoming CharSequence.
+    private UTF8BytesString[] curValues;
+    // Values from the previous reporting cycle, kept so values that persist across cycles can reuse
+    // their UTF8BytesString instance without re-allocating.
+    private UTF8BytesString[] priorValues;
+    private int curSize;
+
+    private UTF8BytesString cacheBlocked = null;
+    private String[] statsDTag = null;
+
+    /** Accumulated block count for the current cycle. Returned and zeroed by {@link #reset()}. */
+    private long blockedCount;
+
+    /**
+     * Test convenience: limits-enabled mode (blocked sentinel substitution active). Production uses
+     * the three-argument constructor with the flag from {@code Config}.
+     */
+    @VisibleForTesting
+    PropertyCardinalityHandler(String name, int cardinalityLimit) {
+        this(name, cardinalityLimit, true);
     }
-    if (cardinalityLimit > MAX_CARDINALITY_LIMIT) {
-      throw new IllegalArgumentException(
-          "cardinalityLimit must be at most " + MAX_CARDINALITY_LIMIT + ": " + cardinalityLimit);
-    }
-    this.cardinalityLimit = cardinalityLimit;
-    this.useBlockedSentinel = useBlockedSentinel;
-    // Capacity = next power of two >= 2 * cardinalityLimit. Linear-probing load factor stays
-    // <= 0.5 even when the budget is full, which keeps probe chains short.
-    final int capacity = Integer.highestOneBit(cardinalityLimit * 2 - 1) << 1;
-    this.capacityMask = capacity - 1;
-    this.curValues = new UTF8BytesString[capacity];
-    this.priorValues = new UTF8BytesString[capacity];
-  }
-
-  /**
-   * Canonicalizes {@code value} through the cardinality budget and per-cycle reuse cache. Null
-   * inputs map to {@link UTF8BytesString#EMPTY} -- {@link AggregateEntry} doesn't need to
-   * pre-check.
-   *
-   * <p>The value hash is computed once and used as the initial probe slot in both tables. {@code h
-   * ^ (h >>> 16)} folds high hash bits into the low bits to reduce collisions for inputs that share
-   * a common low-bit pattern. {@link UTF8BytesString#hashCode} is content-stable with the
-   * underlying String, so a String input and a UTF8BytesString of the same content map to the same
-   * slot.
-   */
-  UTF8BytesString register(CharSequence value) {
-    if (value == null) {
-      return UTF8BytesString.EMPTY;
-    }
-    // Initial table slot, used to probe current and prior tables.
-    int h = value.hashCode();
-    int start = (h ^ (h >>> 16)) & this.capacityMask;
-
-    // First, look in the current-cycle table.
-    // If found, this value already consumed cardinality budget in this cycle.
-    int slot = start;
-    UTF8BytesString existing;
-    while ((existing = this.curValues[slot]) != null
-        && existing != value
-        && !existing.toString().contentEquals(value)) {
-      slot = (slot + 1) & this.capacityMask;
+
+    PropertyCardinalityHandler(String name, int cardinalityLimit, boolean useBlockedSentinel) {
+        this(name, name, cardinalityLimit, useBlockedSentinel);
     }
-    if (existing != null) {
-      return existing;
+
+    PropertyCardinalityHandler(String name, String statsDField, int cardinalityLimit, boolean useBlockedSentinel) {
+        this.name = name;
+        this.statsDField = statsDField;
+        if (cardinalityLimit <= 0) {
+            throw new IllegalArgumentException("cardinalityLimit must be positive: " + cardinalityLimit);
+        }
+        if (cardinalityLimit > MAX_CARDINALITY_LIMIT) {
+            throw new IllegalArgumentException(
+                    "cardinalityLimit must be at most " + MAX_CARDINALITY_LIMIT + ": " + cardinalityLimit);
+        }
+        this.cardinalityLimit = cardinalityLimit;
+        this.useBlockedSentinel = useBlockedSentinel;
+        // Capacity = next power of two >= 2 * cardinalityLimit. Linear-probing load factor stays
+        // <= 0.5 even when the budget is full, which keeps probe chains short.
+        final int capacity = Integer.highestOneBit(cardinalityLimit * 2 - 1) << 1;
+        this.capacityMask = capacity - 1;
+        this.curValues = new UTF8BytesString[capacity];
+        this.priorValues = new UTF8BytesString[capacity];
     }
-    // This value is new for the current cycle.
-    boolean capExhausted = this.curSize >= this.cardinalityLimit;
-    // If sentinel mode is enabled and the field is over budget, collapse this
-    // value to tracer_blocked_value and count it as blocked.
-    if (capExhausted && this.useBlockedSentinel) {
-      this.blockedCount++;
-      return this.tracerBlockedValue();
+
+    /**
+     * Canonicalizes {@code value} through the cardinality budget and per-cycle reuse cache. Null
+     * inputs map to {@link UTF8BytesString#EMPTY} -- {@link AggregateEntry} doesn't need to
+     * pre-check.
+     *
+     * <p>The value hash is computed once and used as the initial probe slot in both tables. {@code h
+     * ^ (h >>> 16)} folds high hash bits into the low bits to reduce collisions for inputs that share
+     * a common low-bit pattern. {@link UTF8BytesString#hashCode} is content-stable with the
+     * underlying String, so a String input and a UTF8BytesString of the same content map to the same
+     * slot.
+     */
+    UTF8BytesString register(CharSequence value) {
+        if (value == null) {
+            return UTF8BytesString.EMPTY;
+        }
+        // Initial table slot, used to probe current and prior tables.
+        int h = value.hashCode();
+        int start = (h ^ (h >>> 16)) & this.capacityMask;
+
+        // First, look in the current-cycle table.
+        // If found, this value already consumed cardinality budget in this cycle.
+        int slot = start;
+        UTF8BytesString existing;
+        while ((existing = this.curValues[slot]) != null
+                && existing != value
+                && !existing.toString().contentEquals(value)) {
+            slot = (slot + 1) & this.capacityMask;
+        }
+        if (existing != null) {
+            return existing;
+        }
+        // This value is new for the current cycle.
+        boolean capExhausted = this.curSize >= this.cardinalityLimit;
+        // If sentinel mode is enabled and the field is over budget, collapse this
+        // value to tracer_blocked_value and count it as blocked.
+        if (capExhausted && this.useBlockedSentinel) {
+            this.blockedCount++;
+            return this.tracerBlockedValue();
+        }
+        // Otherwise, try to reuse from the prior cycle if possible to avoid re-allocation.
+        // Runs whether or not the current budget is exhausted, so persistent values keep their
+        // UTF8BytesString instance across cycles.
+        int priorSlot = start;
+        UTF8BytesString priorMatch;
+        while ((priorMatch = this.priorValues[priorSlot]) != null
+                && priorMatch != value
+                && !priorMatch.toString().contentEquals(value)) {
+            priorSlot = (priorSlot + 1) & this.capacityMask;
+        }
+        UTF8BytesString utf8 = priorMatch != null ? priorMatch : UTF8BytesString.create(value);
+        // If there is still budget, remember this value in the current-cycle table.
+        if (!capExhausted) {
+            this.curValues[slot] = utf8;
+            this.curSize += 1;
+        }
+        // If capExhausted && !useBlockedSentinel, this returns the real value but
+        // does not cache it in the current cycle.
+        return utf8;
     }
-    // Otherwise, try to reuse from the prior cycle if possible to avoid re-allocation.
-    // Runs whether or not the current budget is exhausted, so persistent values keep their
-    // UTF8BytesString instance across cycles.
-    int priorSlot = start;
-    UTF8BytesString priorMatch;
-    while ((priorMatch = this.priorValues[priorSlot]) != null
-        && priorMatch != value
-        && !priorMatch.toString().contentEquals(value)) {
-      priorSlot = (priorSlot + 1) & this.capacityMask;
+
+    private UTF8BytesString tracerBlockedValue() {
+        UTF8BytesString cacheBlocked = this.cacheBlocked;
+        if (cacheBlocked != null) return cacheBlocked;
+
+        this.cacheBlocked = cacheBlocked = UTF8BytesString.create("tracer_blocked_value");
+        return cacheBlocked;
     }
-    UTF8BytesString utf8 = priorMatch != null ? priorMatch : UTF8BytesString.create(value);
-    // If there is still budget, remember this value in the current-cycle table.
-    if (!capExhausted) {
-      this.curValues[slot] = utf8;
-      this.curSize += 1;
+
+    /**
+     * Resets the per-cycle working set and returns the accumulated block count for this cycle. The
+     * caller is responsible for reporting the count to health metrics if non-zero.
+     */
+    String[] statsDTag() {
+        if (statsDTag == null) {
+            statsDTag = new String[] {"collapsed:" + statsDField};
+        }
+        return statsDTag;
     }
-    // If capExhausted && !useBlockedSentinel, this returns the real value but
-    // does not cache it in the current cycle.
-    return utf8;
-  }
-
-  private UTF8BytesString tracerBlockedValue() {
-    UTF8BytesString cacheBlocked = this.cacheBlocked;
-    if (cacheBlocked != null) return cacheBlocked;
-
-    this.cacheBlocked = cacheBlocked = UTF8BytesString.create("tracer_blocked_value");
-    return cacheBlocked;
-  }
-
-  /**
-   * Resets the per-cycle working set and returns the accumulated block count for this cycle. The
-   * caller is responsible for reporting the count to health metrics if non-zero.
-   */
-  String[] statsDTag() {
-    if (statsDTag == null) {
-      statsDTag = new String[] {"collapsed:" + statsDField};
+
+    long reset() {
+        long count = this.blockedCount;
+        this.blockedCount = 0;
+        // Flip pointers: the just-completed cycle becomes prior; what was prior (2 cycles ago) is
+        // recycled into the new (empty) current.
+        final UTF8BytesString[] tmp = this.priorValues;
+        this.priorValues = this.curValues;
+        this.curValues = tmp;
+        // Null the new current. The values pulled out of prior are still reachable through any
+        // AggregateEntry rows they ended up populating; this just drops the handler's references.
+        Arrays.fill(this.curValues, null);
+        this.curSize = 0;
+        return count;
     }
-    return statsDTag;
-  }
-
-  long reset() {
-    long count = this.blockedCount;
-    this.blockedCount = 0;
-    // Flip pointers: the just-completed cycle becomes prior; what was prior (2 cycles ago) is
-    // recycled into the new (empty) current.
-    final UTF8BytesString[] tmp = this.priorValues;
-    this.priorValues = this.curValues;
-    this.curValues = tmp;
-    // Null the new current. The values pulled out of prior are still reachable through any
-    // AggregateEntry rows they ended up populating; this just drops the handler's references.
-    Arrays.fill(this.curValues, null);
-    this.curSize = 0;
-    return count;
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/SerializingMetricWriter.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/SerializingMetricWriter.java
index 3eacde8bd45..42016666f50 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/SerializingMetricWriter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/SerializingMetricWriter.java
@@ -20,299 +20,291 @@
 
 public final class SerializingMetricWriter implements MetricWriter {
 
-  private static final byte[] SEQUENCE = "Sequence".getBytes(ISO_8859_1);
-  private static final byte[] RUNTIME_ID = "RuntimeID".getBytes(ISO_8859_1);
-  private static final byte[] HOSTNAME = "Hostname".getBytes(ISO_8859_1);
-  private static final byte[] NAME = "Name".getBytes(ISO_8859_1);
-  private static final byte[] ENV = "Env".getBytes(ISO_8859_1);
-  private static final byte[] SERVICE = "Service".getBytes(ISO_8859_1);
-  private static final byte[] RESOURCE = "Resource".getBytes(ISO_8859_1);
-  private static final byte[] VERSION = "Version".getBytes(ISO_8859_1);
-  private static final byte[] HITS = "Hits".getBytes(ISO_8859_1);
-  private static final byte[] ERRORS = "Errors".getBytes(ISO_8859_1);
-  private static final byte[] TOP_LEVEL_HITS = "TopLevelHits".getBytes(ISO_8859_1);
-  private static final byte[] DURATION = "Duration".getBytes(ISO_8859_1);
-  private static final byte[] TYPE = "Type".getBytes(ISO_8859_1);
-  private static final byte[] HTTP_STATUS_CODE = "HTTPStatusCode".getBytes(ISO_8859_1);
-  private static final byte[] SYNTHETICS = "Synthetics".getBytes(ISO_8859_1);
-  private static final byte[] START = "Start".getBytes(ISO_8859_1);
-  private static final byte[] STATS = "Stats".getBytes(ISO_8859_1);
-  private static final byte[] OK_SUMMARY = "OkSummary".getBytes(ISO_8859_1);
-  private static final byte[] ERROR_SUMMARY = "ErrorSummary".getBytes(ISO_8859_1);
-  private static final byte[] PROCESS_TAGS = "ProcessTags".getBytes(ISO_8859_1);
-  private static final byte[] IS_TRACE_ROOT = "IsTraceRoot".getBytes(ISO_8859_1);
-  private static final byte[] SPAN_KIND = "SpanKind".getBytes(ISO_8859_1);
-  private static final byte[] PEER_TAGS = "PeerTags".getBytes(ISO_8859_1);
-  private static final byte[] ADDITIONAL_METRIC_TAGS = "AdditionalMetricTags".getBytes(ISO_8859_1);
-  private static final byte[] HTTP_METHOD = "HTTPMethod".getBytes(ISO_8859_1);
-  private static final byte[] HTTP_ENDPOINT = "HTTPEndpoint".getBytes(ISO_8859_1);
-  private static final byte[] GRPC_STATUS_CODE = "GRPCStatusCode".getBytes(ISO_8859_1);
-  private static final byte[] SERVICE_SOURCE = "srv_src".getBytes(ISO_8859_1);
-  private static final byte[] GIT_COMMIT_SHA = "GitCommitSha".getBytes(ISO_8859_1);
-
-  // Constant declared here for compile-time folding
-  public static final int TRISTATE_TRUE = TriState.TRUE.serialValue;
-  public static final int TRISTATE_FALSE = TriState.FALSE.serialValue;
-
-  private static final Function<GitInfo, UTF8BytesString> SHA_COMMIT_GETTER =
-      gitInfo ->
-          gitInfo.getCommit() != null && gitInfo.getCommit().getSha() != null
-              ? UTF8BytesString.create(gitInfo.getCommit().getSha())
-              : EMPTY;
-
-  private final WellKnownTags wellKnownTags;
-  private final WritableFormatter writer;
-  private final Sink sink;
-
-  /**
-   * Whether the span-derived additional-tags feature is configured (at least one key). When {@code
-   * true}, the {@code AdditionalMetricTags} field is always emitted -- as an empty array for
-   * entries that matched no configured key -- so the field is present whenever the feature is on,
-   * per the Span-Derived Primary Tags RFC. When {@code false} (the common case: feature off) the
-   * field is omitted entirely, so non-users pay zero payload overhead.
-   */
-  private final boolean additionalTagsConfigured;
-
-  private final GrowableBuffer buffer;
-  private final DDCache<GitInfo, UTF8BytesString> gitInfoCache =
-      DDCaches.newFixedSizeWeakKeyCache(4);
-  private long sequence = 0;
-  private final GitInfoProvider gitInfoProvider;
-  // Not final/eager: Histogram.newHistogram() requires the Histograms factory to be
-  // registered first. SerializingMetricWriter is constructed during tracer startup before that
-  // registration completes, so eager init would throw. Lazy init on first add() call is safe
-  // because add() only runs on the aggregator thread, which starts after factory registration.
-  // The single-writer invariant also means no synchronization is needed on this field.
-  private byte[] emptyHistogramBytesCache;
-
-  public SerializingMetricWriter(WellKnownTags wellKnownTags, Sink sink) {
-    this(wellKnownTags, sink, false);
-  }
-
-  public SerializingMetricWriter(
-      WellKnownTags wellKnownTags, Sink sink, boolean additionalTagsConfigured) {
-    this(wellKnownTags, sink, 512 * 1024, GitInfoProvider.INSTANCE, additionalTagsConfigured);
-  }
-
-  public SerializingMetricWriter(WellKnownTags wellKnownTags, Sink sink, int initialCapacity) {
-    this(wellKnownTags, sink, initialCapacity, GitInfoProvider.INSTANCE);
-  }
-
-  public SerializingMetricWriter(
-      WellKnownTags wellKnownTags,
-      Sink sink,
-      int initialCapacity,
-      final GitInfoProvider gitInfoProvider) {
-    this(wellKnownTags, sink, initialCapacity, gitInfoProvider, false);
-  }
-
-  public SerializingMetricWriter(
-      WellKnownTags wellKnownTags,
-      Sink sink,
-      int initialCapacity,
-      final GitInfoProvider gitInfoProvider,
-      boolean additionalTagsConfigured) {
-    this.wellKnownTags = wellKnownTags;
-    this.buffer = new GrowableBuffer(initialCapacity);
-    this.writer = new MsgPackWriter(buffer);
-    this.sink = sink;
-    this.gitInfoProvider = gitInfoProvider;
-    this.additionalTagsConfigured = additionalTagsConfigured;
-  }
-
-  @Override
-  public void startBucket(int metricCount, long start, long duration) {
-    final UTF8BytesString processTags = ProcessTags.getTagsForSerialization();
-    final boolean writeProcessTags = processTags != null;
-    // the gitinfo can be rebuild in time and initialized after this class is created. So that a
-    // cacheable is needed
-    final UTF8BytesString gitSha =
-        gitInfoCache.computeIfAbsent(gitInfoProvider.getGitInfo(), SHA_COMMIT_GETTER);
-    final boolean writeGitCommitSha = gitSha != EMPTY;
-    writer.startMap(7 + (writeProcessTags ? 1 : 0) + (writeGitCommitSha ? 1 : 0));
-
-    writer.writeUTF8(RUNTIME_ID);
-    writer.writeUTF8(wellKnownTags.getRuntimeId());
-
-    writer.writeUTF8(SEQUENCE);
-    writer.writeLong(sequence++);
-
-    writer.writeUTF8(HOSTNAME);
-    writer.writeUTF8(wellKnownTags.getHostname());
-
-    writer.writeUTF8(SERVICE);
-    writer.writeUTF8(wellKnownTags.getService());
-
-    writer.writeUTF8(ENV);
-    writer.writeUTF8(wellKnownTags.getEnv());
-
-    writer.writeUTF8(VERSION);
-    writer.writeUTF8(wellKnownTags.getVersion());
-
-    if (writeProcessTags) {
-      writer.writeUTF8(PROCESS_TAGS);
-      writer.writeUTF8(processTags);
+    private static final byte[] SEQUENCE = "Sequence".getBytes(ISO_8859_1);
+    private static final byte[] RUNTIME_ID = "RuntimeID".getBytes(ISO_8859_1);
+    private static final byte[] HOSTNAME = "Hostname".getBytes(ISO_8859_1);
+    private static final byte[] NAME = "Name".getBytes(ISO_8859_1);
+    private static final byte[] ENV = "Env".getBytes(ISO_8859_1);
+    private static final byte[] SERVICE = "Service".getBytes(ISO_8859_1);
+    private static final byte[] RESOURCE = "Resource".getBytes(ISO_8859_1);
+    private static final byte[] VERSION = "Version".getBytes(ISO_8859_1);
+    private static final byte[] HITS = "Hits".getBytes(ISO_8859_1);
+    private static final byte[] ERRORS = "Errors".getBytes(ISO_8859_1);
+    private static final byte[] TOP_LEVEL_HITS = "TopLevelHits".getBytes(ISO_8859_1);
+    private static final byte[] DURATION = "Duration".getBytes(ISO_8859_1);
+    private static final byte[] TYPE = "Type".getBytes(ISO_8859_1);
+    private static final byte[] HTTP_STATUS_CODE = "HTTPStatusCode".getBytes(ISO_8859_1);
+    private static final byte[] SYNTHETICS = "Synthetics".getBytes(ISO_8859_1);
+    private static final byte[] START = "Start".getBytes(ISO_8859_1);
+    private static final byte[] STATS = "Stats".getBytes(ISO_8859_1);
+    private static final byte[] OK_SUMMARY = "OkSummary".getBytes(ISO_8859_1);
+    private static final byte[] ERROR_SUMMARY = "ErrorSummary".getBytes(ISO_8859_1);
+    private static final byte[] PROCESS_TAGS = "ProcessTags".getBytes(ISO_8859_1);
+    private static final byte[] IS_TRACE_ROOT = "IsTraceRoot".getBytes(ISO_8859_1);
+    private static final byte[] SPAN_KIND = "SpanKind".getBytes(ISO_8859_1);
+    private static final byte[] PEER_TAGS = "PeerTags".getBytes(ISO_8859_1);
+    private static final byte[] ADDITIONAL_METRIC_TAGS = "AdditionalMetricTags".getBytes(ISO_8859_1);
+    private static final byte[] HTTP_METHOD = "HTTPMethod".getBytes(ISO_8859_1);
+    private static final byte[] HTTP_ENDPOINT = "HTTPEndpoint".getBytes(ISO_8859_1);
+    private static final byte[] GRPC_STATUS_CODE = "GRPCStatusCode".getBytes(ISO_8859_1);
+    private static final byte[] SERVICE_SOURCE = "srv_src".getBytes(ISO_8859_1);
+    private static final byte[] GIT_COMMIT_SHA = "GitCommitSha".getBytes(ISO_8859_1);
+
+    // Constant declared here for compile-time folding
+    public static final int TRISTATE_TRUE = TriState.TRUE.serialValue;
+    public static final int TRISTATE_FALSE = TriState.FALSE.serialValue;
+
+    private static final Function<GitInfo, UTF8BytesString> SHA_COMMIT_GETTER =
+            gitInfo -> gitInfo.getCommit() != null && gitInfo.getCommit().getSha() != null
+                    ? UTF8BytesString.create(gitInfo.getCommit().getSha())
+                    : EMPTY;
+
+    private final WellKnownTags wellKnownTags;
+    private final WritableFormatter writer;
+    private final Sink sink;
+
+    /**
+     * Whether the span-derived additional-tags feature is configured (at least one key). When {@code
+     * true}, the {@code AdditionalMetricTags} field is always emitted -- as an empty array for
+     * entries that matched no configured key -- so the field is present whenever the feature is on,
+     * per the Span-Derived Primary Tags RFC. When {@code false} (the common case: feature off) the
+     * field is omitted entirely, so non-users pay zero payload overhead.
+     */
+    private final boolean additionalTagsConfigured;
+
+    private final GrowableBuffer buffer;
+    private final DDCache<GitInfo, UTF8BytesString> gitInfoCache = DDCaches.newFixedSizeWeakKeyCache(4);
+    private long sequence = 0;
+    private final GitInfoProvider gitInfoProvider;
+    // Not final/eager: Histogram.newHistogram() requires the Histograms factory to be
+    // registered first. SerializingMetricWriter is constructed during tracer startup before that
+    // registration completes, so eager init would throw. Lazy init on first add() call is safe
+    // because add() only runs on the aggregator thread, which starts after factory registration.
+    // The single-writer invariant also means no synchronization is needed on this field.
+    private byte[] emptyHistogramBytesCache;
+
+    public SerializingMetricWriter(WellKnownTags wellKnownTags, Sink sink) {
+        this(wellKnownTags, sink, false);
     }
 
-    if (writeGitCommitSha) {
-      writer.writeUTF8(GIT_COMMIT_SHA);
-      writer.writeUTF8(gitSha);
+    public SerializingMetricWriter(WellKnownTags wellKnownTags, Sink sink, boolean additionalTagsConfigured) {
+        this(wellKnownTags, sink, 512 * 1024, GitInfoProvider.INSTANCE, additionalTagsConfigured);
     }
 
-    writer.writeUTF8(STATS);
-
-    writer.startArray(1);
+    public SerializingMetricWriter(WellKnownTags wellKnownTags, Sink sink, int initialCapacity) {
+        this(wellKnownTags, sink, initialCapacity, GitInfoProvider.INSTANCE);
+    }
 
-    writer.startMap(3);
+    public SerializingMetricWriter(
+            WellKnownTags wellKnownTags, Sink sink, int initialCapacity, final GitInfoProvider gitInfoProvider) {
+        this(wellKnownTags, sink, initialCapacity, gitInfoProvider, false);
+    }
 
-    writer.writeUTF8(START);
-    writer.writeLong(start);
+    public SerializingMetricWriter(
+            WellKnownTags wellKnownTags,
+            Sink sink,
+            int initialCapacity,
+            final GitInfoProvider gitInfoProvider,
+            boolean additionalTagsConfigured) {
+        this.wellKnownTags = wellKnownTags;
+        this.buffer = new GrowableBuffer(initialCapacity);
+        this.writer = new MsgPackWriter(buffer);
+        this.sink = sink;
+        this.gitInfoProvider = gitInfoProvider;
+        this.additionalTagsConfigured = additionalTagsConfigured;
+    }
 
-    writer.writeUTF8(DURATION);
-    writer.writeLong(duration);
+    @Override
+    public void startBucket(int metricCount, long start, long duration) {
+        final UTF8BytesString processTags = ProcessTags.getTagsForSerialization();
+        final boolean writeProcessTags = processTags != null;
+        // the gitinfo can be rebuild in time and initialized after this class is created. So that a
+        // cacheable is needed
+        final UTF8BytesString gitSha = gitInfoCache.computeIfAbsent(gitInfoProvider.getGitInfo(), SHA_COMMIT_GETTER);
+        final boolean writeGitCommitSha = gitSha != EMPTY;
+        writer.startMap(7 + (writeProcessTags ? 1 : 0) + (writeGitCommitSha ? 1 : 0));
 
-    writer.writeUTF8(STATS);
-    writer.startArray(metricCount);
-  }
+        writer.writeUTF8(RUNTIME_ID);
+        writer.writeUTF8(wellKnownTags.getRuntimeId());
 
-  @Override
-  public void add(AggregateEntry entry) {
-    // Dynamic map size based on optional fields; AggregateEntry encapsulates the EMPTY-as-absent
-    // sentinel via its hasFoo() predicates so the serializer doesn't depend on the storage choice.
-    final boolean hasHttpMethod = entry.hasHttpMethod();
-    final boolean hasHttpEndpoint = entry.hasHttpEndpoint();
-    final boolean hasServiceSource = entry.hasServiceSource();
-    final boolean hasGrpcStatusCode = entry.hasGrpcStatusCode();
-    final UTF8BytesString[] additionalTags = entry.getAdditionalTags();
-    // When the feature is configured the field is always emitted (empty array for entries that
-    // matched no key); when it is off the field is omitted entirely so non-users pay nothing.
-    final int mapSize =
-        15
-            + (hasServiceSource ? 1 : 0)
-            + (hasHttpMethod ? 1 : 0)
-            + (hasHttpEndpoint ? 1 : 0)
-            + (hasGrpcStatusCode ? 1 : 0)
-            + (additionalTagsConfigured ? 1 : 0);
+        writer.writeUTF8(SEQUENCE);
+        writer.writeLong(sequence++);
 
-    writer.startMap(mapSize);
+        writer.writeUTF8(HOSTNAME);
+        writer.writeUTF8(wellKnownTags.getHostname());
 
-    writer.writeUTF8(NAME);
-    writer.writeUTF8(entry.getOperationName());
+        writer.writeUTF8(SERVICE);
+        writer.writeUTF8(wellKnownTags.getService());
 
-    writer.writeUTF8(SERVICE);
-    writer.writeUTF8(entry.getService());
+        writer.writeUTF8(ENV);
+        writer.writeUTF8(wellKnownTags.getEnv());
 
-    writer.writeUTF8(RESOURCE);
-    writer.writeUTF8(entry.getResource());
+        writer.writeUTF8(VERSION);
+        writer.writeUTF8(wellKnownTags.getVersion());
 
-    writer.writeUTF8(TYPE);
-    writer.writeUTF8(entry.getType());
+        if (writeProcessTags) {
+            writer.writeUTF8(PROCESS_TAGS);
+            writer.writeUTF8(processTags);
+        }
 
-    writer.writeUTF8(HTTP_STATUS_CODE);
-    writer.writeInt(entry.getHttpStatusCode());
+        if (writeGitCommitSha) {
+            writer.writeUTF8(GIT_COMMIT_SHA);
+            writer.writeUTF8(gitSha);
+        }
 
-    writer.writeUTF8(SYNTHETICS);
-    writer.writeBoolean(entry.isSynthetics());
+        writer.writeUTF8(STATS);
 
-    writer.writeUTF8(IS_TRACE_ROOT);
-    writer.writeInt(entry.isTraceRoot() ? TRISTATE_TRUE : TRISTATE_FALSE);
+        writer.startArray(1);
 
-    writer.writeUTF8(SPAN_KIND);
-    writer.writeUTF8(entry.getSpanKind());
+        writer.startMap(3);
 
-    writer.writeUTF8(PEER_TAGS);
-    final List<UTF8BytesString> peerTags = entry.getPeerTags();
-    writer.startArray(peerTags.size());
+        writer.writeUTF8(START);
+        writer.writeLong(start);
 
-    for (UTF8BytesString peerTag : peerTags) {
-      writer.writeUTF8(peerTag);
-    }
+        writer.writeUTF8(DURATION);
+        writer.writeLong(duration);
 
-    // Emit AdditionalMetricTags as a packed array of pre-built "key:value" UTF8BytesStrings, in
-    // schema (alphabetical-by-key) order. Present whenever the feature is configured -- an empty
-    // array for entries that matched no key -- and omitted entirely when the feature is off, so
-    // spans in non-using deployments pay zero payload overhead.
-    if (additionalTagsConfigured) {
-      writer.writeUTF8(ADDITIONAL_METRIC_TAGS);
-      writer.startArray(additionalTags.length);
-      for (UTF8BytesString slot : additionalTags) {
-        writer.writeUTF8(slot);
-      }
+        writer.writeUTF8(STATS);
+        writer.startArray(metricCount);
     }
 
-    if (hasServiceSource) {
-      writer.writeUTF8(SERVICE_SOURCE);
-      writer.writeUTF8(entry.getServiceSource());
-    }
-    // Only include HTTPMethod if present
-    if (hasHttpMethod) {
-      writer.writeUTF8(HTTP_METHOD);
-      writer.writeUTF8(entry.getHttpMethod());
+    @Override
+    public void add(AggregateEntry entry) {
+        // Dynamic map size based on optional fields; AggregateEntry encapsulates the EMPTY-as-absent
+        // sentinel via its hasFoo() predicates so the serializer doesn't depend on the storage choice.
+        final boolean hasHttpMethod = entry.hasHttpMethod();
+        final boolean hasHttpEndpoint = entry.hasHttpEndpoint();
+        final boolean hasServiceSource = entry.hasServiceSource();
+        final boolean hasGrpcStatusCode = entry.hasGrpcStatusCode();
+        final UTF8BytesString[] additionalTags = entry.getAdditionalTags();
+        // When the feature is configured the field is always emitted (empty array for entries that
+        // matched no key); when it is off the field is omitted entirely so non-users pay nothing.
+        final int mapSize = 15
+                + (hasServiceSource ? 1 : 0)
+                + (hasHttpMethod ? 1 : 0)
+                + (hasHttpEndpoint ? 1 : 0)
+                + (hasGrpcStatusCode ? 1 : 0)
+                + (additionalTagsConfigured ? 1 : 0);
+
+        writer.startMap(mapSize);
+
+        writer.writeUTF8(NAME);
+        writer.writeUTF8(entry.getOperationName());
+
+        writer.writeUTF8(SERVICE);
+        writer.writeUTF8(entry.getService());
+
+        writer.writeUTF8(RESOURCE);
+        writer.writeUTF8(entry.getResource());
+
+        writer.writeUTF8(TYPE);
+        writer.writeUTF8(entry.getType());
+
+        writer.writeUTF8(HTTP_STATUS_CODE);
+        writer.writeInt(entry.getHttpStatusCode());
+
+        writer.writeUTF8(SYNTHETICS);
+        writer.writeBoolean(entry.isSynthetics());
+
+        writer.writeUTF8(IS_TRACE_ROOT);
+        writer.writeInt(entry.isTraceRoot() ? TRISTATE_TRUE : TRISTATE_FALSE);
+
+        writer.writeUTF8(SPAN_KIND);
+        writer.writeUTF8(entry.getSpanKind());
+
+        writer.writeUTF8(PEER_TAGS);
+        final List<UTF8BytesString> peerTags = entry.getPeerTags();
+        writer.startArray(peerTags.size());
+
+        for (UTF8BytesString peerTag : peerTags) {
+            writer.writeUTF8(peerTag);
+        }
+
+        // Emit AdditionalMetricTags as a packed array of pre-built "key:value" UTF8BytesStrings, in
+        // schema (alphabetical-by-key) order. Present whenever the feature is configured -- an empty
+        // array for entries that matched no key -- and omitted entirely when the feature is off, so
+        // spans in non-using deployments pay zero payload overhead.
+        if (additionalTagsConfigured) {
+            writer.writeUTF8(ADDITIONAL_METRIC_TAGS);
+            writer.startArray(additionalTags.length);
+            for (UTF8BytesString slot : additionalTags) {
+                writer.writeUTF8(slot);
+            }
+        }
+
+        if (hasServiceSource) {
+            writer.writeUTF8(SERVICE_SOURCE);
+            writer.writeUTF8(entry.getServiceSource());
+        }
+        // Only include HTTPMethod if present
+        if (hasHttpMethod) {
+            writer.writeUTF8(HTTP_METHOD);
+            writer.writeUTF8(entry.getHttpMethod());
+        }
+
+        // Only include HTTPEndpoint if present
+        if (hasHttpEndpoint) {
+            writer.writeUTF8(HTTP_ENDPOINT);
+            writer.writeUTF8(entry.getHttpEndpoint());
+        }
+
+        // Only include GRPCStatusCode if present (rpc-type spans)
+        if (hasGrpcStatusCode) {
+            writer.writeUTF8(GRPC_STATUS_CODE);
+            writer.writeUTF8(entry.getGrpcStatusCode());
+        }
+
+        writer.writeUTF8(HITS);
+        writer.writeInt(entry.getHitCount());
+
+        writer.writeUTF8(ERRORS);
+        writer.writeInt(entry.getErrorCount());
+
+        writer.writeUTF8(TOP_LEVEL_HITS);
+        writer.writeInt(entry.getTopLevelCount());
+
+        writer.writeUTF8(DURATION);
+        writer.writeLong(entry.getDuration());
+
+        writer.writeUTF8(OK_SUMMARY);
+        writer.writeBinary(entry.getOkLatencies().serialize());
+
+        writer.writeUTF8(ERROR_SUMMARY);
+        final datadog.metrics.api.Histogram errorLatencies = entry.getErrorLatencies();
+        if (errorLatencies != null) {
+            writer.writeBinary(errorLatencies.serialize());
+        } else {
+            // Entry never saw an error; emit a cached empty-histogram payload so the wire format is
+            // unchanged without allocating a histogram per entry.
+            writer.writeBinary(emptyErrorHistogramBytes());
+        }
     }
 
-    // Only include HTTPEndpoint if present
-    if (hasHttpEndpoint) {
-      writer.writeUTF8(HTTP_ENDPOINT);
-      writer.writeUTF8(entry.getHttpEndpoint());
+    /**
+     * Returns the cached serialized form of an empty histogram. Computed lazily on first call so the
+     * {@link datadog.metrics.api.Histograms} factory has been registered (by the producer-side tracer
+     * startup or test setup) before we sample its output.
+     */
+    private byte[] emptyErrorHistogramBytes() {
+        byte[] cached = emptyHistogramBytesCache;
+        if (cached == null) {
+            ByteBuffer buf = Histogram.newHistogram().serialize();
+            cached = new byte[buf.remaining()];
+            buf.get(cached);
+            emptyHistogramBytesCache = cached;
+        }
+        return cached;
     }
 
-    // Only include GRPCStatusCode if present (rpc-type spans)
-    if (hasGrpcStatusCode) {
-      writer.writeUTF8(GRPC_STATUS_CODE);
-      writer.writeUTF8(entry.getGrpcStatusCode());
+    @Override
+    public void finishBucket() {
+        buffer.mark();
+        sink.accept(buffer.messageCount(), buffer.slice());
+        buffer.reset();
     }
 
-    writer.writeUTF8(HITS);
-    writer.writeInt(entry.getHitCount());
-
-    writer.writeUTF8(ERRORS);
-    writer.writeInt(entry.getErrorCount());
-
-    writer.writeUTF8(TOP_LEVEL_HITS);
-    writer.writeInt(entry.getTopLevelCount());
-
-    writer.writeUTF8(DURATION);
-    writer.writeLong(entry.getDuration());
-
-    writer.writeUTF8(OK_SUMMARY);
-    writer.writeBinary(entry.getOkLatencies().serialize());
-
-    writer.writeUTF8(ERROR_SUMMARY);
-    final datadog.metrics.api.Histogram errorLatencies = entry.getErrorLatencies();
-    if (errorLatencies != null) {
-      writer.writeBinary(errorLatencies.serialize());
-    } else {
-      // Entry never saw an error; emit a cached empty-histogram payload so the wire format is
-      // unchanged without allocating a histogram per entry.
-      writer.writeBinary(emptyErrorHistogramBytes());
-    }
-  }
-
-  /**
-   * Returns the cached serialized form of an empty histogram. Computed lazily on first call so the
-   * {@link datadog.metrics.api.Histograms} factory has been registered (by the producer-side tracer
-   * startup or test setup) before we sample its output.
-   */
-  private byte[] emptyErrorHistogramBytes() {
-    byte[] cached = emptyHistogramBytesCache;
-    if (cached == null) {
-      ByteBuffer buf = Histogram.newHistogram().serialize();
-      cached = new byte[buf.remaining()];
-      buf.get(cached);
-      emptyHistogramBytesCache = cached;
+    @Override
+    public void reset() {
+        buffer.reset();
     }
-    return cached;
-  }
-
-  @Override
-  public void finishBucket() {
-    buffer.mark();
-    sink.accept(buffer.messageCount(), buffer.slice());
-    buffer.reset();
-  }
-
-  @Override
-  public void reset() {
-    buffer.reset();
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/Sink.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/Sink.java
index 7a812f341f4..f4718446eb8 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/Sink.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/Sink.java
@@ -4,5 +4,5 @@
 
 public interface Sink extends ByteBufferConsumer {
 
-  void register(EventListener listener);
+    void register(EventListener listener);
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/SpanSnapshot.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/SpanSnapshot.java
index 392fb690fe6..5abeb8d83fe 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/SpanSnapshot.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/SpanSnapshot.java
@@ -12,77 +12,77 @@
  */
 final class SpanSnapshot implements InboxItem {
 
-  final CharSequence resourceName;
-  final String serviceName;
-  final CharSequence operationName;
-  final CharSequence serviceNameSource;
-  final CharSequence spanType;
-  final short httpStatusCode;
-  final boolean synthetic;
-  final boolean traceRoot;
-  final String spanKind;
+    final CharSequence resourceName;
+    final String serviceName;
+    final CharSequence operationName;
+    final CharSequence serviceNameSource;
+    final CharSequence spanType;
+    final short httpStatusCode;
+    final boolean synthetic;
+    final boolean traceRoot;
+    final String spanKind;
 
-  /**
-   * Schema for {@link #peerTagValues}. {@code null} when the span has no peer tags. The schema
-   * carries the names + {@link TagCardinalityHandler}s in parallel array form; {@code
-   * peerTagValues} holds the per-span tag values at the same indices.
-   */
-  final @Nullable PeerTagSchema peerTagSchema;
+    /**
+     * Schema for {@link #peerTagValues}. {@code null} when the span has no peer tags. The schema
+     * carries the names + {@link TagCardinalityHandler}s in parallel array form; {@code
+     * peerTagValues} holds the per-span tag values at the same indices.
+     */
+    final @Nullable PeerTagSchema peerTagSchema;
 
-  /**
-   * Peer tag values captured from the span, parallel to {@code peerTagSchema.names}. A {@code null}
-   * entry means the span didn't have that peer tag set. {@code null} (the whole array) when {@link
-   * #peerTagSchema} is {@code null}.
-   */
-  final @Nullable String[] peerTagValues;
+    /**
+     * Peer tag values captured from the span, parallel to {@code peerTagSchema.names}. A {@code null}
+     * entry means the span didn't have that peer tag set. {@code null} (the whole array) when {@link
+     * #peerTagSchema} is {@code null}.
+     */
+    final @Nullable String[] peerTagValues;
 
-  final @Nullable String httpMethod;
-  final @Nullable String httpEndpoint;
-  final @Nullable String grpcStatusCode;
+    final @Nullable String httpMethod;
+    final @Nullable String httpEndpoint;
+    final @Nullable String grpcStatusCode;
 
-  /**
-   * Additional metric tag values captured from the span, parallel to {@code
-   * additionalTagsSchema.names}. A {@code null} entry means the span didn't have that tag set.
-   * {@code null} (the whole array) when no additional tags are configured or none were set on the
-   * span. Length cap is applied on the aggregator thread; the producer carries raw values only.
-   */
-  final @Nullable String[] additionalTagValues;
+    /**
+     * Additional metric tag values captured from the span, parallel to {@code
+     * additionalTagsSchema.names}. A {@code null} entry means the span didn't have that tag set.
+     * {@code null} (the whole array) when no additional tags are configured or none were set on the
+     * span. Length cap is applied on the aggregator thread; the producer carries raw values only.
+     */
+    final @Nullable String[] additionalTagValues;
 
-  /** Duration in nanoseconds, OR-ed with {@code ERROR_TAG} / {@code TOP_LEVEL_TAG} as needed. */
-  final long tagAndDuration;
+    /** Duration in nanoseconds, OR-ed with {@code ERROR_TAG} / {@code TOP_LEVEL_TAG} as needed. */
+    final long tagAndDuration;
 
-  SpanSnapshot(
-      CharSequence resourceName,
-      String serviceName,
-      CharSequence operationName,
-      CharSequence serviceNameSource,
-      CharSequence spanType,
-      short httpStatusCode,
-      boolean synthetic,
-      boolean traceRoot,
-      String spanKind,
-      @Nullable PeerTagSchema peerTagSchema,
-      @Nullable String[] peerTagValues,
-      @Nullable String httpMethod,
-      @Nullable String httpEndpoint,
-      @Nullable String grpcStatusCode,
-      @Nullable String[] additionalTagValues,
-      long tagAndDuration) {
-    this.resourceName = resourceName;
-    this.serviceName = serviceName;
-    this.operationName = operationName;
-    this.serviceNameSource = serviceNameSource;
-    this.spanType = spanType;
-    this.httpStatusCode = httpStatusCode;
-    this.synthetic = synthetic;
-    this.traceRoot = traceRoot;
-    this.spanKind = spanKind;
-    this.peerTagSchema = peerTagSchema;
-    this.peerTagValues = peerTagValues;
-    this.httpMethod = httpMethod;
-    this.httpEndpoint = httpEndpoint;
-    this.grpcStatusCode = grpcStatusCode;
-    this.additionalTagValues = additionalTagValues;
-    this.tagAndDuration = tagAndDuration;
-  }
+    SpanSnapshot(
+            CharSequence resourceName,
+            String serviceName,
+            CharSequence operationName,
+            CharSequence serviceNameSource,
+            CharSequence spanType,
+            short httpStatusCode,
+            boolean synthetic,
+            boolean traceRoot,
+            String spanKind,
+            @Nullable PeerTagSchema peerTagSchema,
+            @Nullable String[] peerTagValues,
+            @Nullable String httpMethod,
+            @Nullable String httpEndpoint,
+            @Nullable String grpcStatusCode,
+            @Nullable String[] additionalTagValues,
+            long tagAndDuration) {
+        this.resourceName = resourceName;
+        this.serviceName = serviceName;
+        this.operationName = operationName;
+        this.serviceNameSource = serviceNameSource;
+        this.spanType = spanType;
+        this.httpStatusCode = httpStatusCode;
+        this.synthetic = synthetic;
+        this.traceRoot = traceRoot;
+        this.spanKind = spanKind;
+        this.peerTagSchema = peerTagSchema;
+        this.peerTagValues = peerTagValues;
+        this.httpMethod = httpMethod;
+        this.httpEndpoint = httpEndpoint;
+        this.grpcStatusCode = grpcStatusCode;
+        this.additionalTagValues = additionalTagValues;
+        this.tagAndDuration = tagAndDuration;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/TagCardinalityHandler.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/TagCardinalityHandler.java
index bf116a8fdaa..dabafdb4157 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/TagCardinalityHandler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/TagCardinalityHandler.java
@@ -14,185 +14,177 @@
  * raw-value keys table is needed alongside the UTF8 values table.
  */
 final class TagCardinalityHandler {
-  // Upper bound prevents int overflow in the (cardinalityLimit * 2 - 1) capacity calculation.
-  // Practical limits are 8..512; this cap is well beyond any realistic configuration.
-  private static final int MAX_CARDINALITY_LIMIT = 1 << 29;
-
-  private final String tag;
-  private final int cardinalityLimit;
-  private final int maxValueLength;
-  private final int capacityMask;
-
-  /** See {@link PropertyCardinalityHandler}'s field of the same name. */
-  private final boolean useBlockedSentinel;
-
-  private String[] curKeys;
-  private UTF8BytesString[] curValues;
-  private String[] priorKeys;
-  private UTF8BytesString[] priorValues;
-  private int curSize;
-
-  private UTF8BytesString cacheBlocked = null;
-
-  /**
-   * Values collapsed by the per-cycle cardinality (distinct-value) budget in the current cycle.
-   * Returned and zeroed by {@link #reset()}. Surfaces as the {@code collapsed:} health-metric tag.
-   */
-  private long collapsedCount;
-
-  /**
-   * Values collapsed by the per-value length cap in the current cycle. Always 0 when {@code
-   * maxValueLength} is unbounded (e.g. peer tags). Read via {@link #oversizedCount()} before {@link
-   * #reset()} and surfaces as the {@code oversized:} health-metric tag. Kept separate from {@link
-   * #collapsedCount} because the approved Cardinality Limits RFC tags length-collapses ({@code
-   * oversized:}) distinctly from cardinality-collapses ({@code collapsed:}).
-   */
-  private long oversizedCount;
-
-  /**
-   * Test convenience: limits-enabled mode, no per-value length cap. Production uses the
-   * four-argument constructor.
-   */
-  @VisibleForTesting
-  TagCardinalityHandler(String tag, int cardinalityLimit) {
-    this(tag, cardinalityLimit, true, Integer.MAX_VALUE);
-  }
-
-  TagCardinalityHandler(String tag, int cardinalityLimit, boolean useBlockedSentinel) {
-    this(tag, cardinalityLimit, useBlockedSentinel, Integer.MAX_VALUE);
-  }
-
-  TagCardinalityHandler(
-      String tag, int cardinalityLimit, boolean useBlockedSentinel, int maxValueLength) {
-    if (cardinalityLimit <= 0) {
-      throw new IllegalArgumentException("cardinalityLimit must be positive: " + cardinalityLimit);
+    // Upper bound prevents int overflow in the (cardinalityLimit * 2 - 1) capacity calculation.
+    // Practical limits are 8..512; this cap is well beyond any realistic configuration.
+    private static final int MAX_CARDINALITY_LIMIT = 1 << 29;
+
+    private final String tag;
+    private final int cardinalityLimit;
+    private final int maxValueLength;
+    private final int capacityMask;
+
+    /** See {@link PropertyCardinalityHandler}'s field of the same name. */
+    private final boolean useBlockedSentinel;
+
+    private String[] curKeys;
+    private UTF8BytesString[] curValues;
+    private String[] priorKeys;
+    private UTF8BytesString[] priorValues;
+    private int curSize;
+
+    private UTF8BytesString cacheBlocked = null;
+
+    /**
+     * Values collapsed by the per-cycle cardinality (distinct-value) budget in the current cycle.
+     * Returned and zeroed by {@link #reset()}. Surfaces as the {@code collapsed:} health-metric tag.
+     */
+    private long collapsedCount;
+
+    /**
+     * Values collapsed by the per-value length cap in the current cycle. Always 0 when {@code
+     * maxValueLength} is unbounded (e.g. peer tags). Read via {@link #oversizedCount()} before {@link
+     * #reset()} and surfaces as the {@code oversized:} health-metric tag. Kept separate from {@link
+     * #collapsedCount} because the approved Cardinality Limits RFC tags length-collapses ({@code
+     * oversized:}) distinctly from cardinality-collapses ({@code collapsed:}).
+     */
+    private long oversizedCount;
+
+    /**
+     * Test convenience: limits-enabled mode, no per-value length cap. Production uses the
+     * four-argument constructor.
+     */
+    @VisibleForTesting
+    TagCardinalityHandler(String tag, int cardinalityLimit) {
+        this(tag, cardinalityLimit, true, Integer.MAX_VALUE);
     }
-    if (cardinalityLimit > MAX_CARDINALITY_LIMIT) {
-      throw new IllegalArgumentException(
-          "cardinalityLimit must be at most " + MAX_CARDINALITY_LIMIT + ": " + cardinalityLimit);
-    }
-    this.tag = tag;
-    this.cardinalityLimit = cardinalityLimit;
-    this.useBlockedSentinel = useBlockedSentinel;
-    this.maxValueLength = maxValueLength;
-    final int capacity = Integer.highestOneBit(cardinalityLimit * 2 - 1) << 1;
-    this.capacityMask = capacity - 1;
-    this.curKeys = new String[capacity];
-    this.curValues = new UTF8BytesString[capacity];
-    this.priorKeys = new String[capacity];
-    this.priorValues = new UTF8BytesString[capacity];
-  }
-
-  /**
-   * Returns the UTF8 value to use for {@code value} in the current reporting cycle. Null inputs are
-   * returned as {@link UTF8BytesString#EMPTY}.
-   *
-   * <p>The value hash is computed once and used as the initial probe slot in both tables. The
-   * {@code h ^ (h >>> 16)} calculation folds high hash bits into the low bits, which reduces
-   * clustering when values share similar low-bit hash patterns.
-   */
-  @SuppressFBWarnings(
-      value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
-      justification =
-          "Intentional identity fast-path: the reference check short-circuits the .equals() call"
-              + " when the stored key and probe value are the same instance.")
-  UTF8BytesString register(String value) {
-    if (value == null) {
-      return UTF8BytesString.EMPTY;
-    }
-    // Values exceeding the length cap are blocked regardless of cardinality budget: application
-    // code can accidentally populate a tag with a stack trace, SQL statement, or JSON blob.
-    if (value.length() > this.maxValueLength && this.useBlockedSentinel) {
-      this.oversizedCount++;
-      return this.tracerBlockedValue();
+
+    TagCardinalityHandler(String tag, int cardinalityLimit, boolean useBlockedSentinel) {
+        this(tag, cardinalityLimit, useBlockedSentinel, Integer.MAX_VALUE);
     }
-    // Compute the initial probe slot once. The same start slot is used for the
-    // current-cycle table and, on miss, for the prior-cycle table.
-    int h = value.hashCode();
-    int start = (h ^ (h >>> 16)) & this.capacityMask;
-
-    // Look for the raw value in the current-cycle table.
-    int slot = start;
-    String existing;
-    while ((existing = this.curKeys[slot]) != null
-        && existing != value
-        && !existing.equals(value)) {
-      slot = (slot + 1) & this.capacityMask;
+
+    TagCardinalityHandler(String tag, int cardinalityLimit, boolean useBlockedSentinel, int maxValueLength) {
+        if (cardinalityLimit <= 0) {
+            throw new IllegalArgumentException("cardinalityLimit must be positive: " + cardinalityLimit);
+        }
+        if (cardinalityLimit > MAX_CARDINALITY_LIMIT) {
+            throw new IllegalArgumentException(
+                    "cardinalityLimit must be at most " + MAX_CARDINALITY_LIMIT + ": " + cardinalityLimit);
+        }
+        this.tag = tag;
+        this.cardinalityLimit = cardinalityLimit;
+        this.useBlockedSentinel = useBlockedSentinel;
+        this.maxValueLength = maxValueLength;
+        final int capacity = Integer.highestOneBit(cardinalityLimit * 2 - 1) << 1;
+        this.capacityMask = capacity - 1;
+        this.curKeys = new String[capacity];
+        this.curValues = new UTF8BytesString[capacity];
+        this.priorKeys = new String[capacity];
+        this.priorValues = new UTF8BytesString[capacity];
     }
-    // If found, return the already encoded "tag:value" UTF8 value.
-    if (existing != null) {
-      return this.curValues[slot];
+
+    /**
+     * Returns the UTF8 value to use for {@code value} in the current reporting cycle. Null inputs are
+     * returned as {@link UTF8BytesString#EMPTY}.
+     *
+     * <p>The value hash is computed once and used as the initial probe slot in both tables. The
+     * {@code h ^ (h >>> 16)} calculation folds high hash bits into the low bits, which reduces
+     * clustering when values share similar low-bit hash patterns.
+     */
+    @SuppressFBWarnings(
+            value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
+            justification = "Intentional identity fast-path: the reference check short-circuits the .equals() call"
+                    + " when the stored key and probe value are the same instance.")
+    UTF8BytesString register(String value) {
+        if (value == null) {
+            return UTF8BytesString.EMPTY;
+        }
+        // Values exceeding the length cap are blocked regardless of cardinality budget: application
+        // code can accidentally populate a tag with a stack trace, SQL statement, or JSON blob.
+        if (value.length() > this.maxValueLength && this.useBlockedSentinel) {
+            this.oversizedCount++;
+            return this.tracerBlockedValue();
+        }
+        // Compute the initial probe slot once. The same start slot is used for the
+        // current-cycle table and, on miss, for the prior-cycle table.
+        int h = value.hashCode();
+        int start = (h ^ (h >>> 16)) & this.capacityMask;
+
+        // Look for the raw value in the current-cycle table.
+        int slot = start;
+        String existing;
+        while ((existing = this.curKeys[slot]) != null && existing != value && !existing.equals(value)) {
+            slot = (slot + 1) & this.capacityMask;
+        }
+        // If found, return the already encoded "tag:value" UTF8 value.
+        if (existing != null) {
+            return this.curValues[slot];
+        }
+        // This value is new for the current cycle.
+        boolean capExhausted = this.curSize >= this.cardinalityLimit;
+        // If sentinel mode is enabled and the tag has reached its value budget,
+        // collapse this value to "tag:tracer_blocked_value" and record the block.
+        if (capExhausted && this.useBlockedSentinel) {
+            this.collapsedCount++;
+            return this.tracerBlockedValue();
+        }
+        // Try to find the same raw value in the previous-cycle table so the encoded
+        // UTF8 object can be reused after a reset.
+        int priorSlot = start;
+        String priorKey;
+        while ((priorKey = this.priorKeys[priorSlot]) != null && priorKey != value && !priorKey.equals(value)) {
+            priorSlot = (priorSlot + 1) & this.capacityMask;
+        }
+        // Reuse the previous encoded "tag:value" UTF8 value if present; otherwise
+        // create it from the fixed tag name and the raw value.
+        UTF8BytesString utf8 =
+                priorKey != null ? this.priorValues[priorSlot] : UTF8BytesString.create(this.tag + ":" + value);
+        // If still within budget, remember the raw value and its encoded UTF8
+        // output in the current-cycle table.
+        if (!capExhausted) {
+            this.curKeys[slot] = value;
+            this.curValues[slot] = utf8;
+            this.curSize += 1;
+        }
+        // If capExhausted && !useBlockedSentinel, return the real "tag:value" value
+        // without caching it in the current cycle.
+        return utf8;
     }
-    // This value is new for the current cycle.
-    boolean capExhausted = this.curSize >= this.cardinalityLimit;
-    // If sentinel mode is enabled and the tag has reached its value budget,
-    // collapse this value to "tag:tracer_blocked_value" and record the block.
-    if (capExhausted && this.useBlockedSentinel) {
-      this.collapsedCount++;
-      return this.tracerBlockedValue();
+
+    private UTF8BytesString tracerBlockedValue() {
+        UTF8BytesString cacheBlocked = this.cacheBlocked;
+        if (cacheBlocked != null) return cacheBlocked;
+
+        this.cacheBlocked = cacheBlocked = UTF8BytesString.create(this.tag + ":tracer_blocked_value");
+        return cacheBlocked;
     }
-    // Try to find the same raw value in the previous-cycle table so the encoded
-    // UTF8 object can be reused after a reset.
-    int priorSlot = start;
-    String priorKey;
-    while ((priorKey = this.priorKeys[priorSlot]) != null
-        && priorKey != value
-        && !priorKey.equals(value)) {
-      priorSlot = (priorSlot + 1) & this.capacityMask;
+
+    /**
+     * Number of values collapsed by the per-value length cap in the current cycle. Must be read
+     * before {@link #reset()}, which zeroes it along with the cardinality count.
+     */
+    long oversizedCount() {
+        return this.oversizedCount;
     }
-    // Reuse the previous encoded "tag:value" UTF8 value if present; otherwise
-    // create it from the fixed tag name and the raw value.
-    UTF8BytesString utf8 =
-        priorKey != null
-            ? this.priorValues[priorSlot]
-            : UTF8BytesString.create(this.tag + ":" + value);
-    // If still within budget, remember the raw value and its encoded UTF8
-    // output in the current-cycle table.
-    if (!capExhausted) {
-      this.curKeys[slot] = value;
-      this.curValues[slot] = utf8;
-      this.curSize += 1;
+
+    /**
+     * Resets the per-cycle working set and returns the cardinality-collapse count for this cycle (the
+     * {@code collapsed:} count). Also zeroes the length-collapse count, so callers that report it
+     * must read {@link #oversizedCount()} first. The caller reports both counts to health metrics if
+     * non-zero.
+     */
+    long reset() {
+        long count = this.collapsedCount;
+        this.collapsedCount = 0;
+        this.oversizedCount = 0;
+        final String[] tmpKeys = this.priorKeys;
+        final UTF8BytesString[] tmpValues = this.priorValues;
+        this.priorKeys = this.curKeys;
+        this.priorValues = this.curValues;
+        this.curKeys = tmpKeys;
+        this.curValues = tmpValues;
+        Arrays.fill(this.curKeys, null);
+        Arrays.fill(this.curValues, null);
+        this.curSize = 0;
+        return count;
     }
-    // If capExhausted && !useBlockedSentinel, return the real "tag:value" value
-    // without caching it in the current cycle.
-    return utf8;
-  }
-
-  private UTF8BytesString tracerBlockedValue() {
-    UTF8BytesString cacheBlocked = this.cacheBlocked;
-    if (cacheBlocked != null) return cacheBlocked;
-
-    this.cacheBlocked = cacheBlocked = UTF8BytesString.create(this.tag + ":tracer_blocked_value");
-    return cacheBlocked;
-  }
-
-  /**
-   * Number of values collapsed by the per-value length cap in the current cycle. Must be read
-   * before {@link #reset()}, which zeroes it along with the cardinality count.
-   */
-  long oversizedCount() {
-    return this.oversizedCount;
-  }
-
-  /**
-   * Resets the per-cycle working set and returns the cardinality-collapse count for this cycle (the
-   * {@code collapsed:} count). Also zeroes the length-collapse count, so callers that report it
-   * must read {@link #oversizedCount()} first. The caller reports both counts to health metrics if
-   * non-zero.
-   */
-  long reset() {
-    long count = this.collapsedCount;
-    this.collapsedCount = 0;
-    this.oversizedCount = 0;
-    final String[] tmpKeys = this.priorKeys;
-    final UTF8BytesString[] tmpValues = this.priorValues;
-    this.priorKeys = this.curKeys;
-    this.priorValues = this.curValues;
-    this.curKeys = tmpKeys;
-    this.curValues = tmpValues;
-    Arrays.fill(this.curKeys, null);
-    Arrays.fill(this.curValues, null);
-    this.curSize = 0;
-    return count;
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/TriState.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/TriState.java
index 037f5919f78..407ff6fe439 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/TriState.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/TriState.java
@@ -5,12 +5,12 @@
  * values are used for metrics serialization.
  */
 public enum TriState {
-  UNKNOWN(0),
-  TRUE(1),
-  FALSE(2);
-  public final int serialValue;
+    UNKNOWN(0),
+    TRUE(1),
+    FALSE(2);
+    public final int serialValue;
 
-  TriState(int serialValue) {
-    this.serialValue = serialValue;
-  }
+    TriState(int serialValue) {
+        this.serialValue = serialValue;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/AllSampler.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/AllSampler.java
index 1e381a9d942..e32ed5f1808 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/AllSampler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/AllSampler.java
@@ -5,13 +5,13 @@
 /** Sampler that always says yes... */
 public class AllSampler implements Sampler {
 
-  @Override
-  public String toString() {
-    return "AllSampler { sample=true }";
-  }
+    @Override
+    public String toString() {
+        return "AllSampler { sample=true }";
+    }
 
-  @Override
-  public <T extends CoreSpan<T>> boolean sample(T span) {
-    return true;
-  }
+    @Override
+    public <T extends CoreSpan<T>> boolean sample(T span) {
+        return true;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/AsmStandaloneSampler.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/AsmStandaloneSampler.java
index 54a2d750700..6fc600be2ab 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/AsmStandaloneSampler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/AsmStandaloneSampler.java
@@ -19,40 +19,38 @@
  */
 public class AsmStandaloneSampler implements Sampler, PrioritySampler {
 
-  private static final Logger log = LoggerFactory.getLogger(AsmStandaloneSampler.class);
-  private static final int RATE_IN_MILLISECONDS = 60000; // 1 minute
-
-  private final AtomicLong lastSampleTime;
-  private final Clock clock;
-
-  public AsmStandaloneSampler(final Clock clock) {
-    this.clock = clock;
-    this.lastSampleTime = new AtomicLong(clock.millis() - RATE_IN_MILLISECONDS);
-  }
-
-  @Override
-  public <T extends CoreSpan<T>> boolean sample(final T span) {
-    // Priority sampling sends all traces to the core agent, including traces marked dropped.
-    // This allows the core agent to collect stats on all traces.
-    return true;
-  }
-
-  @Override
-  public <T extends CoreSpan<T>> void setSamplingPriority(final T span) {
-
-    if (shouldSample()) {
-      log.debug("Set SAMPLER_KEEP for span {}", span.getSpanId());
-      span.setSamplingPriority(SAMPLER_KEEP, SamplingMechanism.APPSEC);
-    } else {
-      log.debug("Set SAMPLER_DROP for span {}", span.getSpanId());
-      span.setSamplingPriority(SAMPLER_DROP, SamplingMechanism.APPSEC);
+    private static final Logger log = LoggerFactory.getLogger(AsmStandaloneSampler.class);
+    private static final int RATE_IN_MILLISECONDS = 60000; // 1 minute
+
+    private final AtomicLong lastSampleTime;
+    private final Clock clock;
+
+    public AsmStandaloneSampler(final Clock clock) {
+        this.clock = clock;
+        this.lastSampleTime = new AtomicLong(clock.millis() - RATE_IN_MILLISECONDS);
+    }
+
+    @Override
+    public <T extends CoreSpan<T>> boolean sample(final T span) {
+        // Priority sampling sends all traces to the core agent, including traces marked dropped.
+        // This allows the core agent to collect stats on all traces.
+        return true;
+    }
+
+    @Override
+    public <T extends CoreSpan<T>> void setSamplingPriority(final T span) {
+
+        if (shouldSample()) {
+            log.debug("Set SAMPLER_KEEP for span {}", span.getSpanId());
+            span.setSamplingPriority(SAMPLER_KEEP, SamplingMechanism.APPSEC);
+        } else {
+            log.debug("Set SAMPLER_DROP for span {}", span.getSpanId());
+            span.setSamplingPriority(SAMPLER_DROP, SamplingMechanism.APPSEC);
+        }
+    }
+
+    private boolean shouldSample() {
+        long now = clock.millis();
+        return lastSampleTime.updateAndGet(lastTime -> now - lastTime >= RATE_IN_MILLISECONDS ? now : lastTime) == now;
     }
-  }
-
-  private boolean shouldSample() {
-    long now = clock.millis();
-    return lastSampleTime.updateAndGet(
-            lastTime -> now - lastTime >= RATE_IN_MILLISECONDS ? now : lastTime)
-        == now;
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/DeterministicSampler.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/DeterministicSampler.java
index 97bec1607ff..89a859f2abe 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/DeterministicSampler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/DeterministicSampler.java
@@ -8,64 +8,64 @@
  */
 public abstract class DeterministicSampler implements RateSampler {
 
-  /** Uses trace-id as a sampling id */
-  public static final class TraceSampler extends DeterministicSampler {
+    /** Uses trace-id as a sampling id */
+    public static final class TraceSampler extends DeterministicSampler {
 
-    public TraceSampler(double rate) {
-      super(rate);
-    }
+        public TraceSampler(double rate) {
+            super(rate);
+        }
 
-    @Override
-    protected <T extends CoreSpan<T>> long getSamplingId(T span) {
-      return span.getTraceId().toLong();
+        @Override
+        protected <T extends CoreSpan<T>> long getSamplingId(T span) {
+            return span.getTraceId().toLong();
+        }
     }
-  }
 
-  /** Uses span-id as a sampling id */
-  public static final class SpanSampler extends DeterministicSampler {
+    /** Uses span-id as a sampling id */
+    public static final class SpanSampler extends DeterministicSampler {
 
-    public SpanSampler(double rate) {
-      super(rate);
-    }
+        public SpanSampler(double rate) {
+            super(rate);
+        }
 
-    @Override
-    protected <T extends CoreSpan<T>> long getSamplingId(T span) {
-      return span.getSpanId();
+        @Override
+        protected <T extends CoreSpan<T>> long getSamplingId(T span) {
+            return span.getSpanId();
+        }
     }
-  }
-
-  private static final long KNUTH_FACTOR = 1111111111111111111L;
 
-  private static final double MAX = Math.pow(2, 64) - 1;
+    private static final long KNUTH_FACTOR = 1111111111111111111L;
 
-  private final double rate;
-  private final long threshold;
+    private static final double MAX = Math.pow(2, 64) - 1;
 
-  public DeterministicSampler(final double rate) {
-    this.rate = rate;
-    this.threshold = cutoff(rate);
-  }
+    private final double rate;
+    private final long threshold;
 
-  @Override
-  public <T extends CoreSpan<T>> boolean sample(final T span) {
-    // unsigned 64 bit comparison with cutoff/threshold
-    return getSamplingId(span) * KNUTH_FACTOR + Long.MIN_VALUE <= threshold;
-  }
+    public DeterministicSampler(final double rate) {
+        this.rate = rate;
+        this.threshold = cutoff(rate);
+    }
 
-  protected abstract <T extends CoreSpan<T>> long getSamplingId(T span);
+    @Override
+    public <T extends CoreSpan<T>> boolean sample(final T span) {
+        // unsigned 64 bit comparison with cutoff/threshold
+        return getSamplingId(span) * KNUTH_FACTOR + Long.MIN_VALUE <= threshold;
+    }
 
-  @Override
-  public double getSampleRate() {
-    return rate;
-  }
+    protected abstract <T extends CoreSpan<T>> long getSamplingId(T span);
 
-  public static long cutoff(double rate) {
-    if (rate < 0.5) {
-      return (long) (rate * MAX) + Long.MIN_VALUE;
+    @Override
+    public double getSampleRate() {
+        return rate;
     }
-    if (rate < 1.0) {
-      return (long) ((rate * MAX) + Long.MIN_VALUE);
+
+    public static long cutoff(double rate) {
+        if (rate < 0.5) {
+            return (long) (rate * MAX) + Long.MIN_VALUE;
+        }
+        if (rate < 1.0) {
+            return (long) ((rate * MAX) + Long.MIN_VALUE);
+        }
+        return Long.MAX_VALUE;
     }
-    return Long.MAX_VALUE;
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/ForcePrioritySampler.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/ForcePrioritySampler.java
index 69aa8bf36d3..5676c4af67f 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/ForcePrioritySampler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/ForcePrioritySampler.java
@@ -5,21 +5,21 @@
 /** A sampler which forces the sampling priority */
 public class ForcePrioritySampler implements Sampler, PrioritySampler {
 
-  private final int prioritySampling;
-  private final int samplingMechanism;
+    private final int prioritySampling;
+    private final int samplingMechanism;
 
-  public ForcePrioritySampler(final int prioritySampling, final int samplingMechanism) {
-    this.prioritySampling = prioritySampling;
-    this.samplingMechanism = samplingMechanism;
-  }
+    public ForcePrioritySampler(final int prioritySampling, final int samplingMechanism) {
+        this.prioritySampling = prioritySampling;
+        this.samplingMechanism = samplingMechanism;
+    }
 
-  @Override
-  public <T extends CoreSpan<T>> boolean sample(final T span) {
-    return true;
-  }
+    @Override
+    public <T extends CoreSpan<T>> boolean sample(final T span) {
+        return true;
+    }
 
-  @Override
-  public <T extends CoreSpan<T>> void setSamplingPriority(final T span) {
-    span.setSamplingPriority(prioritySampling, samplingMechanism);
-  }
+    @Override
+    public <T extends CoreSpan<T>> void setSamplingPriority(final T span) {
+        span.setSamplingPriority(prioritySampling, samplingMechanism);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/ParentBasedAlwaysOnSampler.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/ParentBasedAlwaysOnSampler.java
index 6e8e42dc2d8..41b493e57e9 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/ParentBasedAlwaysOnSampler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/ParentBasedAlwaysOnSampler.java
@@ -12,13 +12,13 @@
  */
 public class ParentBasedAlwaysOnSampler implements Sampler, PrioritySampler {
 
-  @Override
-  public <T extends CoreSpan<T>> boolean sample(final T span) {
-    return true;
-  }
+    @Override
+    public <T extends CoreSpan<T>> boolean sample(final T span) {
+        return true;
+    }
 
-  @Override
-  public <T extends CoreSpan<T>> void setSamplingPriority(final T span) {
-    span.setSamplingPriority(PrioritySampling.SAMPLER_KEEP, SamplingMechanism.DEFAULT);
-  }
+    @Override
+    public <T extends CoreSpan<T>> void setSamplingPriority(final T span) {
+        span.setSamplingPriority(PrioritySampling.SAMPLER_KEEP, SamplingMechanism.DEFAULT);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/PrioritySampler.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/PrioritySampler.java
index 474617de1b5..8c73f800e47 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/PrioritySampler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/PrioritySampler.java
@@ -3,5 +3,5 @@
 import datadog.trace.core.CoreSpan;
 
 public interface PrioritySampler {
-  <T extends CoreSpan<T>> void setSamplingPriority(T span);
+    <T extends CoreSpan<T>> void setSamplingPriority(T span);
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/PrioritySampling.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/PrioritySampling.java
index b56abbc7c2d..f95726b5fb2 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/PrioritySampling.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/PrioritySampling.java
@@ -5,24 +5,24 @@
  */
 @Deprecated
 public class PrioritySampling {
-  /**
-   * Implementation detail of the client. will not be sent to the agent or propagated.
-   *
-   * <p>Internal value used when the priority sampling flag has not been set on the span context.
-   */
-  public static final int UNSET = Integer.MIN_VALUE;
+    /**
+     * Implementation detail of the client. will not be sent to the agent or propagated.
+     *
+     * <p>Internal value used when the priority sampling flag has not been set on the span context.
+     */
+    public static final int UNSET = Integer.MIN_VALUE;
 
-  /** The sampler has decided to drop the trace. */
-  public static final int SAMPLER_DROP = 0;
+    /** The sampler has decided to drop the trace. */
+    public static final int SAMPLER_DROP = 0;
 
-  /** The sampler has decided to keep the trace. */
-  public static final int SAMPLER_KEEP = 1;
+    /** The sampler has decided to keep the trace. */
+    public static final int SAMPLER_KEEP = 1;
 
-  /** The user has decided to drop the trace. */
-  public static final int USER_DROP = -1;
+    /** The user has decided to drop the trace. */
+    public static final int USER_DROP = -1;
 
-  /** The user has decided to keep the trace. */
-  public static final int USER_KEEP = 2;
+    /** The user has decided to keep the trace. */
+    public static final int USER_KEEP = 2;
 
-  private PrioritySampling() {}
+    private PrioritySampling() {}
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/RateByServiceTraceSampler.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/RateByServiceTraceSampler.java
index c5601ebc5b4..dff999fa9bc 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/RateByServiceTraceSampler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/RateByServiceTraceSampler.java
@@ -23,247 +23,238 @@
  */
 public class RateByServiceTraceSampler implements Sampler, PrioritySampler, RemoteResponseListener {
 
-  private static final Logger log = LoggerFactory.getLogger(RateByServiceTraceSampler.class);
-  public static final String SAMPLING_AGENT_RATE = "_dd.agent_psr";
-
-  private static final double DEFAULT_RATE = 1.0;
-  private static final double MAX_RATE_INCREASE_FACTOR = 2.0;
-  static final long RAMP_UP_INTERVAL_NANOS = 1_000_000_000L;
-
-  private final TimeSource timeSource;
-
-  private volatile RateSamplersByEnvAndService serviceRates = new RateSamplersByEnvAndService();
-  private long lastCappedNanos;
-
-  public RateByServiceTraceSampler() {
-    this(SystemTimeSource.INSTANCE);
-  }
-
-  RateByServiceTraceSampler(TimeSource timeSource) {
-    this.timeSource = timeSource;
-  }
-
-  @Override
-  public <T extends CoreSpan<T>> boolean sample(final T span) {
-    // Priority sampling sends all traces to the core agent, including traces marked dropped.
-    // This allows the core agent to collect stats on all traces.
-    return true;
-  }
-
-  @Override
-  public RateByServiceTraceSampler agentSampler() {
-    return this;
-  }
-
-  /** If span is a root span, set the span context samplingPriority to keep or drop */
-  @Override
-  public <T extends CoreSpan<T>> void setSamplingPriority(final T span) {
-    final String serviceName = span.getServiceName();
-    final String env = getSpanEnv(span);
-
-    final RateSamplersByEnvAndService rates = serviceRates;
-    RateSampler sampler = rates.getSampler(env, serviceName);
-
-    boolean sampled = sampler.sample(span);
-    int samplingPriority = sampled ? PrioritySampling.SAMPLER_KEEP : PrioritySampling.SAMPLER_DROP;
-    span.setSamplingPriority(
-        samplingPriority,
-        SAMPLING_AGENT_RATE,
-        sampler.getSampleRate(),
-        SamplingMechanism.AGENT_RATE);
-  }
-
-  private <T extends CoreSpan<T>> String getSpanEnv(final T span) {
-    return span.getTag("env", "");
-  }
-
-  @VisibleForTesting
-  double sampleRateFor(String env, String service) {
-    return serviceRates.getSampler(env, service).getSampleRate();
-  }
-
-  @VisibleForTesting
-  double fallbackSampleRate() {
-    return serviceRates.getFallbackSampler().getSampleRate();
-  }
-
-  static boolean shouldCap(double oldRate, double newRate) {
-    return oldRate != 0 && newRate > oldRate * MAX_RATE_INCREASE_FACTOR;
-  }
-
-  static double cappedRate(double oldRate) {
-    return oldRate * MAX_RATE_INCREASE_FACTOR;
-  }
-
-  @Override
-  public void onResponse(
-      final String endpoint, final Map<String, Map<String, Number>> responseJson) {
-    final Map<String, Number> newServiceRates = responseJson.get("rate_by_service");
-
-    if (null == newServiceRates) {
-      return;
+    private static final Logger log = LoggerFactory.getLogger(RateByServiceTraceSampler.class);
+    public static final String SAMPLING_AGENT_RATE = "_dd.agent_psr";
+
+    private static final double DEFAULT_RATE = 1.0;
+    private static final double MAX_RATE_INCREASE_FACTOR = 2.0;
+    static final long RAMP_UP_INTERVAL_NANOS = 1_000_000_000L;
+
+    private final TimeSource timeSource;
+
+    private volatile RateSamplersByEnvAndService serviceRates = new RateSamplersByEnvAndService();
+    private long lastCappedNanos;
+
+    public RateByServiceTraceSampler() {
+        this(SystemTimeSource.INSTANCE);
     }
 
-    log.debug("Update service sampler rates: {} -> {}", endpoint, responseJson);
-
-    final RateSamplersByEnvAndService currentSnapshot = serviceRates;
-    final long now = timeSource.getNanoTicks();
-    final boolean canIncrease =
-        lastCappedNanos == 0 || (now - lastCappedNanos) >= RAMP_UP_INTERVAL_NANOS;
-    boolean anyCapped = false;
-
-    final TreeMap<String, TreeMap<String, RateSampler>> updatedEnvServiceRates =
-        new TreeMap<>(String::compareToIgnoreCase);
-
-    RateSampler fallbackSampler = RateSamplersByEnvAndService.DEFAULT_SAMPLER;
-    for (final Map.Entry<String, Number> entry : newServiceRates.entrySet()) {
-      if (entry.getValue() == null) {
-        continue;
-      }
-      double rate = entry.getValue().doubleValue();
-
-      EnvAndService envAndService = EnvAndService.fromString(entry.getKey());
-      if (envAndService.isFallback()) {
-        double oldRate = currentSnapshot.getFallbackSampler().getSampleRate();
-        if (shouldCap(oldRate, rate)) {
-          if (canIncrease) {
-            rate = cappedRate(oldRate);
-            anyCapped = true;
-          } else {
-            rate = oldRate;
-          }
-        }
-        fallbackSampler = RateByServiceTraceSampler.createRateSampler(rate);
-      } else {
-        double oldRate =
-            currentSnapshot
-                .getSampler(envAndService.lowerEnv, envAndService.lowerService)
-                .getSampleRate();
-        if (shouldCap(oldRate, rate)) {
-          if (canIncrease) {
-            rate = cappedRate(oldRate);
-            anyCapped = true;
-          } else {
-            rate = oldRate;
-          }
-        }
-        final double effectiveRate = rate;
-        Map<String, RateSampler> serviceRates =
-            updatedEnvServiceRates.computeIfAbsent(
-                envAndService.lowerEnv, env -> new TreeMap<>(String::compareToIgnoreCase));
-
-        serviceRates.computeIfAbsent(
-            envAndService.lowerService,
-            service -> RateByServiceTraceSampler.createRateSampler(effectiveRate));
-      }
+    RateByServiceTraceSampler(TimeSource timeSource) {
+        this.timeSource = timeSource;
     }
-    if (canIncrease && anyCapped) {
-      lastCappedNanos = now;
+
+    @Override
+    public <T extends CoreSpan<T>> boolean sample(final T span) {
+        // Priority sampling sends all traces to the core agent, including traces marked dropped.
+        // This allows the core agent to collect stats on all traces.
+        return true;
     }
-    serviceRates = new RateSamplersByEnvAndService(updatedEnvServiceRates, fallbackSampler);
-  }
-
-  private static RateSampler createRateSampler(final double sampleRate) {
-    final double sanitizedRate;
-    if (sampleRate < 0) {
-      log.error("SampleRate is negative or null, disabling the sampler");
-      sanitizedRate = 1;
-    } else if (sampleRate > 1) {
-      sanitizedRate = 1;
-    } else {
-      sanitizedRate = sampleRate;
+
+    @Override
+    public RateByServiceTraceSampler agentSampler() {
+        return this;
     }
 
-    return new DeterministicSampler.TraceSampler(sanitizedRate);
-  }
+    /** If span is a root span, set the span context samplingPriority to keep or drop */
+    @Override
+    public <T extends CoreSpan<T>> void setSamplingPriority(final T span) {
+        final String serviceName = span.getServiceName();
+        final String env = getSpanEnv(span);
 
-  private static final class RateSamplersByEnvAndService {
-    private static final RateSampler DEFAULT_SAMPLER = createRateSampler(DEFAULT_RATE);
+        final RateSamplersByEnvAndService rates = serviceRates;
+        RateSampler sampler = rates.getSampler(env, serviceName);
 
-    private final Map<String, TreeMap<String, RateSampler>> envServiceRates;
-    private final RateSampler fallbackSampler;
+        boolean sampled = sampler.sample(span);
+        int samplingPriority = sampled ? PrioritySampling.SAMPLER_KEEP : PrioritySampling.SAMPLER_DROP;
+        span.setSamplingPriority(
+                samplingPriority, SAMPLING_AGENT_RATE, sampler.getSampleRate(), SamplingMechanism.AGENT_RATE);
+    }
 
-    RateSamplersByEnvAndService() {
-      this(Collections.emptyMap(), DEFAULT_SAMPLER);
+    private <T extends CoreSpan<T>> String getSpanEnv(final T span) {
+        return span.getTag("env", "");
     }
 
-    RateSamplersByEnvAndService(
-        Map<String, TreeMap<String, RateSampler>> envServiceRates, RateSampler fallbackSampler) {
-      this.envServiceRates = envServiceRates;
-      this.fallbackSampler = fallbackSampler;
+    @VisibleForTesting
+    double sampleRateFor(String env, String service) {
+        return serviceRates.getSampler(env, service).getSampleRate();
     }
 
-    RateSampler getFallbackSampler() {
-      return fallbackSampler;
+    @VisibleForTesting
+    double fallbackSampleRate() {
+        return serviceRates.getFallbackSampler().getSampleRate();
     }
 
-    // used in tests only
-    RateSampler getSampler(EnvAndService envAndService) {
-      return getSampler(envAndService.lowerEnv, envAndService.lowerService);
+    static boolean shouldCap(double oldRate, double newRate) {
+        return oldRate != 0 && newRate > oldRate * MAX_RATE_INCREASE_FACTOR;
     }
 
-    public RateSampler getSampler(String env, String service) {
-      if (EnvAndService.isFallback(env, service)) {
-        return fallbackSampler;
-      }
-
-      Map<String, RateSampler> serviceRates = envServiceRates.get(env);
-      if (serviceRates == null) {
-        return fallbackSampler;
-      }
-      RateSampler sampler = serviceRates.get(service);
-      return null == sampler ? fallbackSampler : sampler;
+    static double cappedRate(double oldRate) {
+        return oldRate * MAX_RATE_INCREASE_FACTOR;
     }
-  }
-
-  private static final class EnvAndService {
-    private static final DDCache<String, EnvAndService> CACHE = DDCaches.newFixedSizeCache(32);
-
-    private static final Function<String, EnvAndService> PARSE =
-        new Function<String, EnvAndService>() {
-
-          @Override
-          public EnvAndService apply(String key) {
-            // "service:,env:"
-            int serviceStart = key.indexOf(':') + 1;
-            int serviceEnd = key.indexOf(',', serviceStart);
-            int envStart = key.indexOf(':', serviceEnd) + 1;
-            int envEnd = key.length();
-
-            // both empty or at least one invalid
-            if ((serviceStart == serviceEnd && envStart == envEnd)
-                || (serviceStart | serviceEnd | envStart) < 0) {
-              return FALLBACK;
-            }
 
-            String service = key.substring(serviceStart, serviceEnd);
-            String env = key.substring(envStart);
+    @Override
+    public void onResponse(final String endpoint, final Map<String, Map<String, Number>> responseJson) {
+        final Map<String, Number> newServiceRates = responseJson.get("rate_by_service");
 
-            // EnvAndService will toLower the values
-            return new EnvAndService(env, service);
-          }
-        };
+        if (null == newServiceRates) {
+            return;
+        }
+
+        log.debug("Update service sampler rates: {} -> {}", endpoint, responseJson);
 
-    static final EnvAndService FALLBACK = new EnvAndService("", "");
+        final RateSamplersByEnvAndService currentSnapshot = serviceRates;
+        final long now = timeSource.getNanoTicks();
+        final boolean canIncrease = lastCappedNanos == 0 || (now - lastCappedNanos) >= RAMP_UP_INTERVAL_NANOS;
+        boolean anyCapped = false;
 
-    public static EnvAndService fromString(String key) {
-      return CACHE.computeIfAbsent(key, PARSE);
+        final TreeMap<String, TreeMap<String, RateSampler>> updatedEnvServiceRates =
+                new TreeMap<>(String::compareToIgnoreCase);
+
+        RateSampler fallbackSampler = RateSamplersByEnvAndService.DEFAULT_SAMPLER;
+        for (final Map.Entry<String, Number> entry : newServiceRates.entrySet()) {
+            if (entry.getValue() == null) {
+                continue;
+            }
+            double rate = entry.getValue().doubleValue();
+
+            EnvAndService envAndService = EnvAndService.fromString(entry.getKey());
+            if (envAndService.isFallback()) {
+                double oldRate = currentSnapshot.getFallbackSampler().getSampleRate();
+                if (shouldCap(oldRate, rate)) {
+                    if (canIncrease) {
+                        rate = cappedRate(oldRate);
+                        anyCapped = true;
+                    } else {
+                        rate = oldRate;
+                    }
+                }
+                fallbackSampler = RateByServiceTraceSampler.createRateSampler(rate);
+            } else {
+                double oldRate = currentSnapshot
+                        .getSampler(envAndService.lowerEnv, envAndService.lowerService)
+                        .getSampleRate();
+                if (shouldCap(oldRate, rate)) {
+                    if (canIncrease) {
+                        rate = cappedRate(oldRate);
+                        anyCapped = true;
+                    } else {
+                        rate = oldRate;
+                    }
+                }
+                final double effectiveRate = rate;
+                Map<String, RateSampler> serviceRates = updatedEnvServiceRates.computeIfAbsent(
+                        envAndService.lowerEnv, env -> new TreeMap<>(String::compareToIgnoreCase));
+
+                serviceRates.computeIfAbsent(
+                        envAndService.lowerService,
+                        service -> RateByServiceTraceSampler.createRateSampler(effectiveRate));
+            }
+        }
+        if (canIncrease && anyCapped) {
+            lastCappedNanos = now;
+        }
+        serviceRates = new RateSamplersByEnvAndService(updatedEnvServiceRates, fallbackSampler);
     }
 
-    private final String lowerEnv;
-    private final String lowerService;
+    private static RateSampler createRateSampler(final double sampleRate) {
+        final double sanitizedRate;
+        if (sampleRate < 0) {
+            log.error("SampleRate is negative or null, disabling the sampler");
+            sanitizedRate = 1;
+        } else if (sampleRate > 1) {
+            sanitizedRate = 1;
+        } else {
+            sanitizedRate = sampleRate;
+        }
 
-    private EnvAndService(String env, String service) {
-      lowerEnv = env.toLowerCase();
-      lowerService = service.toLowerCase();
+        return new DeterministicSampler.TraceSampler(sanitizedRate);
     }
 
-    boolean isFallback() {
-      return isFallback(lowerEnv, lowerService);
+    private static final class RateSamplersByEnvAndService {
+        private static final RateSampler DEFAULT_SAMPLER = createRateSampler(DEFAULT_RATE);
+
+        private final Map<String, TreeMap<String, RateSampler>> envServiceRates;
+        private final RateSampler fallbackSampler;
+
+        RateSamplersByEnvAndService() {
+            this(Collections.emptyMap(), DEFAULT_SAMPLER);
+        }
+
+        RateSamplersByEnvAndService(
+                Map<String, TreeMap<String, RateSampler>> envServiceRates, RateSampler fallbackSampler) {
+            this.envServiceRates = envServiceRates;
+            this.fallbackSampler = fallbackSampler;
+        }
+
+        RateSampler getFallbackSampler() {
+            return fallbackSampler;
+        }
+
+        // used in tests only
+        RateSampler getSampler(EnvAndService envAndService) {
+            return getSampler(envAndService.lowerEnv, envAndService.lowerService);
+        }
+
+        public RateSampler getSampler(String env, String service) {
+            if (EnvAndService.isFallback(env, service)) {
+                return fallbackSampler;
+            }
+
+            Map<String, RateSampler> serviceRates = envServiceRates.get(env);
+            if (serviceRates == null) {
+                return fallbackSampler;
+            }
+            RateSampler sampler = serviceRates.get(service);
+            return null == sampler ? fallbackSampler : sampler;
+        }
     }
 
-    private static final boolean isFallback(String env, String service) {
-      return env.isEmpty() && service.isEmpty();
+    private static final class EnvAndService {
+        private static final DDCache<String, EnvAndService> CACHE = DDCaches.newFixedSizeCache(32);
+
+        private static final Function<String, EnvAndService> PARSE = new Function<String, EnvAndService>() {
+
+            @Override
+            public EnvAndService apply(String key) {
+                // "service:,env:"
+                int serviceStart = key.indexOf(':') + 1;
+                int serviceEnd = key.indexOf(',', serviceStart);
+                int envStart = key.indexOf(':', serviceEnd) + 1;
+                int envEnd = key.length();
+
+                // both empty or at least one invalid
+                if ((serviceStart == serviceEnd && envStart == envEnd) || (serviceStart | serviceEnd | envStart) < 0) {
+                    return FALLBACK;
+                }
+
+                String service = key.substring(serviceStart, serviceEnd);
+                String env = key.substring(envStart);
+
+                // EnvAndService will toLower the values
+                return new EnvAndService(env, service);
+            }
+        };
+
+        static final EnvAndService FALLBACK = new EnvAndService("", "");
+
+        public static EnvAndService fromString(String key) {
+            return CACHE.computeIfAbsent(key, PARSE);
+        }
+
+        private final String lowerEnv;
+        private final String lowerService;
+
+        private EnvAndService(String env, String service) {
+            lowerEnv = env.toLowerCase();
+            lowerService = service.toLowerCase();
+        }
+
+        boolean isFallback() {
+            return isFallback(lowerEnv, lowerService);
+        }
+
+        private static final boolean isFallback(String env, String service) {
+            return env.isEmpty() && service.isEmpty();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/RateSampler.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/RateSampler.java
index d8691a66426..1a3b2c1628d 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/RateSampler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/RateSampler.java
@@ -1,5 +1,5 @@
 package datadog.trace.common.sampling;
 
 public interface RateSampler extends Sampler {
-  double getSampleRate();
+    double getSampleRate();
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/RateSamplingRule.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/RateSamplingRule.java
index 825e5705337..0ca778fc841 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/RateSamplingRule.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/RateSamplingRule.java
@@ -10,144 +10,144 @@
 import java.util.regex.Pattern;
 
 public abstract class RateSamplingRule {
-  private final RateSampler sampler;
-  private final byte mechanism;
+    private final RateSampler sampler;
+    private final byte mechanism;
 
-  public RateSamplingRule(final RateSampler sampler, byte mechanism) {
-    this.sampler = sampler;
-    this.mechanism = mechanism;
-  }
-
-  @Deprecated
-  public RateSamplingRule(final RateSampler sampler) {
-    this(sampler, SamplingMechanism.LOCAL_USER_RULE);
-  }
-
-  public abstract <T extends CoreSpan<T>> boolean matches(T span);
-
-  public <T extends CoreSpan<T>> boolean sample(final T span) {
-    return sampler.sample(span);
-  }
-
-  public RateSampler getSampler() {
-    return sampler;
-  }
-
-  public final byte getMechanism() {
-    return mechanism;
-  }
-
-  public static class AlwaysMatchesSamplingRule extends RateSamplingRule {
-    public AlwaysMatchesSamplingRule(final RateSampler sampler, byte samplingMechanism) {
-      super(sampler, samplingMechanism);
+    public RateSamplingRule(final RateSampler sampler, byte mechanism) {
+        this.sampler = sampler;
+        this.mechanism = mechanism;
     }
 
-    @Override
-    public <T extends CoreSpan<T>> boolean matches(final T span) {
-      return true;
+    @Deprecated
+    public RateSamplingRule(final RateSampler sampler) {
+        this(sampler, SamplingMechanism.LOCAL_USER_RULE);
     }
-  }
 
-  public abstract static class PatternMatchSamplingRule extends RateSamplingRule {
-    private final Pattern pattern;
+    public abstract <T extends CoreSpan<T>> boolean matches(T span);
 
-    public PatternMatchSamplingRule(final String regex, final RateSampler sampler) {
-      super(sampler);
-      this.pattern = Pattern.compile(regex);
+    public <T extends CoreSpan<T>> boolean sample(final T span) {
+        return sampler.sample(span);
     }
 
-    @Override
-    public <T extends CoreSpan<T>> boolean matches(final T span) {
-      final CharSequence relevantString = getRelevantString(span);
-      return relevantString != null && pattern.matcher(relevantString).matches();
+    public RateSampler getSampler() {
+        return sampler;
     }
 
-    protected abstract <T extends CoreSpan<T>> CharSequence getRelevantString(T span);
-  }
-
-  public static class ServiceSamplingRule extends PatternMatchSamplingRule {
-    public ServiceSamplingRule(final String regex, final RateSampler sampler) {
-      super(regex, sampler);
+    public final byte getMechanism() {
+        return mechanism;
     }
 
-    @Override
-    protected <T extends CoreSpan<T>> String getRelevantString(final T span) {
-      return span.getServiceName();
-    }
-  }
+    public static class AlwaysMatchesSamplingRule extends RateSamplingRule {
+        public AlwaysMatchesSamplingRule(final RateSampler sampler, byte samplingMechanism) {
+            super(sampler, samplingMechanism);
+        }
 
-  public static class OperationSamplingRule extends PatternMatchSamplingRule {
-    public OperationSamplingRule(final String regex, final RateSampler sampler) {
-      super(regex, sampler);
+        @Override
+        public <T extends CoreSpan<T>> boolean matches(final T span) {
+            return true;
+        }
     }
 
-    @Override
-    protected <T extends CoreSpan<T>> CharSequence getRelevantString(final T span) {
-      return span.getOperationName();
-    }
-  }
-
-  public static final class TraceSamplingRule extends RateSamplingRule {
-    private final Matcher serviceMatcher;
-    private final Matcher operationMatcher;
-    private final Matcher resourceMatcher;
-    private final TagsMatcher tagsMatcher;
-
-    public TraceSamplingRule(
-        final String serviceGlob,
-        final String operationGlob,
-        final String resourceGlob,
-        final Map<String, String> tags,
-        final RateSampler sampler,
-        final byte samplingMechanism) {
-      super(sampler, samplingMechanism);
-
-      serviceMatcher = Matchers.compileGlob(serviceGlob);
-      operationMatcher = Matchers.compileGlob(operationGlob);
-      resourceMatcher = Matchers.compileGlob(resourceGlob);
-      tagsMatcher = TagsMatcher.create(tags);
-    }
+    public abstract static class PatternMatchSamplingRule extends RateSamplingRule {
+        private final Pattern pattern;
 
-    @Override
-    public <T extends CoreSpan<T>> boolean matches(T span) {
-      return Matchers.matches(serviceMatcher, span.getServiceName())
-          && Matchers.matches(operationMatcher, span.getOperationName())
-          && Matchers.matches(resourceMatcher, span.getResourceName())
-          && tagsMatcher.matches(span);
-    }
-  }
+        public PatternMatchSamplingRule(final String regex, final RateSampler sampler) {
+            super(sampler);
+            this.pattern = Pattern.compile(regex);
+        }
 
-  public static final class SpanSamplingRule extends RateSamplingRule {
-    private final Matcher serviceMatcher;
-    private final Matcher operationMatcher;
-    private final SimpleRateLimiter rateLimiter;
+        @Override
+        public <T extends CoreSpan<T>> boolean matches(final T span) {
+            final CharSequence relevantString = getRelevantString(span);
+            return relevantString != null && pattern.matcher(relevantString).matches();
+        }
 
-    public SpanSamplingRule(
-        final String serviceName,
-        final String operationName,
-        final RateSampler sampler,
-        final SimpleRateLimiter rateLimiter) {
-      super(sampler);
+        protected abstract <T extends CoreSpan<T>> CharSequence getRelevantString(T span);
+    }
 
-      serviceMatcher = Matchers.compileGlob(serviceName);
-      operationMatcher = Matchers.compileGlob(operationName);
+    public static class ServiceSamplingRule extends PatternMatchSamplingRule {
+        public ServiceSamplingRule(final String regex, final RateSampler sampler) {
+            super(regex, sampler);
+        }
 
-      this.rateLimiter = rateLimiter;
+        @Override
+        protected <T extends CoreSpan<T>> String getRelevantString(final T span) {
+            return span.getServiceName();
+        }
     }
 
-    @Override
-    public <T extends CoreSpan<T>> boolean matches(T span) {
-      return Matchers.matches(serviceMatcher, span.getServiceName())
-          && Matchers.matches(operationMatcher, span.getOperationName());
+    public static class OperationSamplingRule extends PatternMatchSamplingRule {
+        public OperationSamplingRule(final String regex, final RateSampler sampler) {
+            super(regex, sampler);
+        }
+
+        @Override
+        protected <T extends CoreSpan<T>> CharSequence getRelevantString(final T span) {
+            return span.getOperationName();
+        }
     }
 
-    @Override
-    public <T extends CoreSpan<T>> boolean sample(T span) {
-      return super.sample(span) && (rateLimiter == null || rateLimiter.tryAcquire());
+    public static final class TraceSamplingRule extends RateSamplingRule {
+        private final Matcher serviceMatcher;
+        private final Matcher operationMatcher;
+        private final Matcher resourceMatcher;
+        private final TagsMatcher tagsMatcher;
+
+        public TraceSamplingRule(
+                final String serviceGlob,
+                final String operationGlob,
+                final String resourceGlob,
+                final Map<String, String> tags,
+                final RateSampler sampler,
+                final byte samplingMechanism) {
+            super(sampler, samplingMechanism);
+
+            serviceMatcher = Matchers.compileGlob(serviceGlob);
+            operationMatcher = Matchers.compileGlob(operationGlob);
+            resourceMatcher = Matchers.compileGlob(resourceGlob);
+            tagsMatcher = TagsMatcher.create(tags);
+        }
+
+        @Override
+        public <T extends CoreSpan<T>> boolean matches(T span) {
+            return Matchers.matches(serviceMatcher, span.getServiceName())
+                    && Matchers.matches(operationMatcher, span.getOperationName())
+                    && Matchers.matches(resourceMatcher, span.getResourceName())
+                    && tagsMatcher.matches(span);
+        }
     }
 
-    public SimpleRateLimiter getRateLimiter() {
-      return rateLimiter;
+    public static final class SpanSamplingRule extends RateSamplingRule {
+        private final Matcher serviceMatcher;
+        private final Matcher operationMatcher;
+        private final SimpleRateLimiter rateLimiter;
+
+        public SpanSamplingRule(
+                final String serviceName,
+                final String operationName,
+                final RateSampler sampler,
+                final SimpleRateLimiter rateLimiter) {
+            super(sampler);
+
+            serviceMatcher = Matchers.compileGlob(serviceName);
+            operationMatcher = Matchers.compileGlob(operationName);
+
+            this.rateLimiter = rateLimiter;
+        }
+
+        @Override
+        public <T extends CoreSpan<T>> boolean matches(T span) {
+            return Matchers.matches(serviceMatcher, span.getServiceName())
+                    && Matchers.matches(operationMatcher, span.getOperationName());
+        }
+
+        @Override
+        public <T extends CoreSpan<T>> boolean sample(T span) {
+            return super.sample(span) && (rateLimiter == null || rateLimiter.tryAcquire());
+        }
+
+        public SimpleRateLimiter getRateLimiter() {
+            return rateLimiter;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/RuleBasedTraceSampler.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/RuleBasedTraceSampler.java
index 8a3fb60ed5c..14d2f9accd4 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/RuleBasedTraceSampler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/RuleBasedTraceSampler.java
@@ -15,188 +15,179 @@
 
 public class RuleBasedTraceSampler<T extends CoreSpan<T>> implements Sampler, PrioritySampler {
 
-  private static final Logger log = LoggerFactory.getLogger(RuleBasedTraceSampler.class);
-  private final List<RateSamplingRule> samplingRules;
-  private final PrioritySampler fallbackSampler;
-  private final SimpleRateLimiter rateLimiter;
-  private final long rateLimit;
-
-  public static final String SAMPLING_RULE_RATE = "_dd.rule_psr";
-  public static final String SAMPLING_LIMIT_RATE = "_dd.limit_psr";
-
-  public RuleBasedTraceSampler(
-      final List<RateSamplingRule> samplingRules,
-      final int rateLimit,
-      final PrioritySampler fallbackSampler) {
-    this.samplingRules = samplingRules;
-    this.fallbackSampler = fallbackSampler;
-    rateLimiter = new SimpleRateLimiter(rateLimit);
-
-    this.rateLimit = rateLimit;
-  }
-
-  public static RuleBasedTraceSampler build(
-      final List<? extends SamplingRule.TraceSamplingRule> traceSamplingRules,
-      final Double defaultRate,
-      final int rateLimit) {
-    return build(null, null, traceSamplingRules, defaultRate, rateLimit);
-  }
-
-  public static RuleBasedTraceSampler build(
-      @Deprecated final Map<String, String> serviceRules,
-      @Deprecated final Map<String, String> operationRules,
-      final List<? extends SamplingRule.TraceSamplingRule> traceSamplingRules,
-      final Double defaultRate,
-      final int rateLimit) {
-    return build(serviceRules, operationRules, traceSamplingRules, defaultRate, rateLimit, null);
-  }
-
-  /**
-   * Builds a rule based sampler delegating to {@code fallbackSampler} for unmatched spans
-   * (defaulting to a new {@link RateByServiceTraceSampler} when there's no fallback.)
-   *
-   * <p>Callers rebuilding the sampler must reuse the same {@code fallbackSampler} value: it's
-   * registered once for agent rates, and a fresh one would reset its learned rates to 1.0.
-   */
-  public static RuleBasedTraceSampler build(
-      @Deprecated final Map<String, String> serviceRules,
-      @Deprecated final Map<String, String> operationRules,
-      final List<? extends SamplingRule.TraceSamplingRule> traceSamplingRules,
-      final Double defaultRate,
-      final int rateLimit,
-      @Nullable final PrioritySampler fallbackSampler) {
-
-    final List<RateSamplingRule> samplingRules = new ArrayList<>();
-
-    if (traceSamplingRules != null && !traceSamplingRules.isEmpty()) {
-      if ((!serviceRules.isEmpty() || !operationRules.isEmpty())) {
-        log.warn(
-            "Both {} and/or {} as well as {} are defined. Only {} will be used for rule-based sampling",
-            TracerConfig.TRACE_SAMPLING_SERVICE_RULES,
-            TracerConfig.TRACE_SAMPLING_OPERATION_RULES,
-            TracerConfig.TRACE_SAMPLING_RULES,
-            TracerConfig.TRACE_SAMPLING_RULES);
-      }
-      // Ignore serviceRules & operationRules if traceSamplingRules are defined
-      for (SamplingRule.TraceSamplingRule rule : traceSamplingRules) {
-        RateSamplingRule.TraceSamplingRule samplingRule =
-            new RateSamplingRule.TraceSamplingRule(
-                rule.getService(),
-                rule.getName(),
-                rule.getResource(),
-                rule.getTags(),
-                new DeterministicSampler.TraceSampler(rule.getSampleRate()),
-                samplingMechanism(rule.getProvenance()));
-        samplingRules.add(samplingRule);
-      }
-    } else {
-      // Take into account serviceRules & operationRules only if traceSamplingRules are NOT defined
-      if (serviceRules != null) {
-        for (final Entry<String, String> entry : serviceRules.entrySet()) {
-          try {
-            final double rateForEntry = Double.parseDouble(entry.getValue());
-            final RateSamplingRule samplingRule =
-                new RateSamplingRule.ServiceSamplingRule(
-                    entry.getKey(), new DeterministicSampler.TraceSampler(rateForEntry));
-            samplingRules.add(samplingRule);
-          } catch (final NumberFormatException e) {
-            log.error("Unable to parse rate for service: {}", entry, e);
-          }
+    private static final Logger log = LoggerFactory.getLogger(RuleBasedTraceSampler.class);
+    private final List<RateSamplingRule> samplingRules;
+    private final PrioritySampler fallbackSampler;
+    private final SimpleRateLimiter rateLimiter;
+    private final long rateLimit;
+
+    public static final String SAMPLING_RULE_RATE = "_dd.rule_psr";
+    public static final String SAMPLING_LIMIT_RATE = "_dd.limit_psr";
+
+    public RuleBasedTraceSampler(
+            final List<RateSamplingRule> samplingRules, final int rateLimit, final PrioritySampler fallbackSampler) {
+        this.samplingRules = samplingRules;
+        this.fallbackSampler = fallbackSampler;
+        rateLimiter = new SimpleRateLimiter(rateLimit);
+
+        this.rateLimit = rateLimit;
+    }
+
+    public static RuleBasedTraceSampler build(
+            final List<? extends SamplingRule.TraceSamplingRule> traceSamplingRules,
+            final Double defaultRate,
+            final int rateLimit) {
+        return build(null, null, traceSamplingRules, defaultRate, rateLimit);
+    }
+
+    public static RuleBasedTraceSampler build(
+            @Deprecated final Map<String, String> serviceRules,
+            @Deprecated final Map<String, String> operationRules,
+            final List<? extends SamplingRule.TraceSamplingRule> traceSamplingRules,
+            final Double defaultRate,
+            final int rateLimit) {
+        return build(serviceRules, operationRules, traceSamplingRules, defaultRate, rateLimit, null);
+    }
+
+    /**
+     * Builds a rule based sampler delegating to {@code fallbackSampler} for unmatched spans
+     * (defaulting to a new {@link RateByServiceTraceSampler} when there's no fallback.)
+     *
+     * <p>Callers rebuilding the sampler must reuse the same {@code fallbackSampler} value: it's
+     * registered once for agent rates, and a fresh one would reset its learned rates to 1.0.
+     */
+    public static RuleBasedTraceSampler build(
+            @Deprecated final Map<String, String> serviceRules,
+            @Deprecated final Map<String, String> operationRules,
+            final List<? extends SamplingRule.TraceSamplingRule> traceSamplingRules,
+            final Double defaultRate,
+            final int rateLimit,
+            @Nullable final PrioritySampler fallbackSampler) {
+
+        final List<RateSamplingRule> samplingRules = new ArrayList<>();
+
+        if (traceSamplingRules != null && !traceSamplingRules.isEmpty()) {
+            if ((!serviceRules.isEmpty() || !operationRules.isEmpty())) {
+                log.warn(
+                        "Both {} and/or {} as well as {} are defined. Only {} will be used for rule-based sampling",
+                        TracerConfig.TRACE_SAMPLING_SERVICE_RULES,
+                        TracerConfig.TRACE_SAMPLING_OPERATION_RULES,
+                        TracerConfig.TRACE_SAMPLING_RULES,
+                        TracerConfig.TRACE_SAMPLING_RULES);
+            }
+            // Ignore serviceRules & operationRules if traceSamplingRules are defined
+            for (SamplingRule.TraceSamplingRule rule : traceSamplingRules) {
+                RateSamplingRule.TraceSamplingRule samplingRule = new RateSamplingRule.TraceSamplingRule(
+                        rule.getService(),
+                        rule.getName(),
+                        rule.getResource(),
+                        rule.getTags(),
+                        new DeterministicSampler.TraceSampler(rule.getSampleRate()),
+                        samplingMechanism(rule.getProvenance()));
+                samplingRules.add(samplingRule);
+            }
+        } else {
+            // Take into account serviceRules & operationRules only if traceSamplingRules are NOT defined
+            if (serviceRules != null) {
+                for (final Entry<String, String> entry : serviceRules.entrySet()) {
+                    try {
+                        final double rateForEntry = Double.parseDouble(entry.getValue());
+                        final RateSamplingRule samplingRule = new RateSamplingRule.ServiceSamplingRule(
+                                entry.getKey(), new DeterministicSampler.TraceSampler(rateForEntry));
+                        samplingRules.add(samplingRule);
+                    } catch (final NumberFormatException e) {
+                        log.error("Unable to parse rate for service: {}", entry, e);
+                    }
+                }
+            }
+
+            if (operationRules != null) {
+                for (final Entry<String, String> entry : operationRules.entrySet()) {
+                    try {
+                        final double rateForEntry = Double.parseDouble(entry.getValue());
+                        final RateSamplingRule samplingRule = new RateSamplingRule.OperationSamplingRule(
+                                entry.getKey(), new DeterministicSampler.TraceSampler(rateForEntry));
+                        samplingRules.add(samplingRule);
+                    } catch (final NumberFormatException e) {
+                        log.error("Unable to parse rate for operation: {}", entry, e);
+                    }
+                }
+            }
         }
-      }
-
-      if (operationRules != null) {
-        for (final Entry<String, String> entry : operationRules.entrySet()) {
-          try {
-            final double rateForEntry = Double.parseDouble(entry.getValue());
-            final RateSamplingRule samplingRule =
-                new RateSamplingRule.OperationSamplingRule(
-                    entry.getKey(), new DeterministicSampler.TraceSampler(rateForEntry));
+
+        // Per spec, defaultRate is treated as "rule".  Arguably a defaultRate set via RC should be
+        // remote rule,
+        // but that's not currenlty part of the spec.
+        if (defaultRate != null) {
+            final RateSamplingRule samplingRule = new RateSamplingRule.AlwaysMatchesSamplingRule(
+                    new DeterministicSampler.TraceSampler(defaultRate), SamplingMechanism.LOCAL_USER_RULE);
             samplingRules.add(samplingRule);
-          } catch (final NumberFormatException e) {
-            log.error("Unable to parse rate for operation: {}", entry, e);
-          }
         }
-      }
+
+        return new RuleBasedTraceSampler(
+                samplingRules, rateLimit, fallbackSampler != null ? fallbackSampler : new RateByServiceTraceSampler());
     }
 
-    // Per spec, defaultRate is treated as "rule".  Arguably a defaultRate set via RC should be
-    // remote rule,
-    // but that's not currenlty part of the spec.
-    if (defaultRate != null) {
-      final RateSamplingRule samplingRule =
-          new RateSamplingRule.AlwaysMatchesSamplingRule(
-              new DeterministicSampler.TraceSampler(defaultRate),
-              SamplingMechanism.LOCAL_USER_RULE);
-      samplingRules.add(samplingRule);
+    /** Returns the fallback's agent rate sampler, if it uses agent rates. */
+    @Override
+    @Nullable
+    public RateByServiceTraceSampler agentSampler() {
+        return fallbackSampler instanceof Sampler ? ((Sampler) fallbackSampler).agentSampler() : null;
     }
 
-    return new RuleBasedTraceSampler(
-        samplingRules,
-        rateLimit,
-        fallbackSampler != null ? fallbackSampler : new RateByServiceTraceSampler());
-  }
-
-  /** Returns the fallback's agent rate sampler, if it uses agent rates. */
-  @Override
-  @Nullable
-  public RateByServiceTraceSampler agentSampler() {
-    return fallbackSampler instanceof Sampler ? ((Sampler) fallbackSampler).agentSampler() : null;
-  }
-
-  private static byte samplingMechanism(SamplingRule.Provenance provenance) {
-    switch (provenance) {
-      case DYNAMIC:
-        return SamplingMechanism.REMOTE_ADAPTIVE_RULE;
-      case CUSTOMER:
-        return SamplingMechanism.REMOTE_USER_RULE;
-      default:
-        return SamplingMechanism.LOCAL_USER_RULE;
+    private static byte samplingMechanism(SamplingRule.Provenance provenance) {
+        switch (provenance) {
+            case DYNAMIC:
+                return SamplingMechanism.REMOTE_ADAPTIVE_RULE;
+            case CUSTOMER:
+                return SamplingMechanism.REMOTE_USER_RULE;
+            default:
+                return SamplingMechanism.LOCAL_USER_RULE;
+        }
     }
-  }
-
-  @Override
-  public <T extends CoreSpan<T>> boolean sample(final T span) {
-    return true;
-  }
-
-  @Override
-  public <T extends CoreSpan<T>> void setSamplingPriority(final T span) {
-    RateSamplingRule matchedRule = null;
-
-    for (final RateSamplingRule samplingRule : samplingRules) {
-      if (samplingRule.matches(span)) {
-        matchedRule = samplingRule;
-        break;
-      }
+
+    @Override
+    public <T extends CoreSpan<T>> boolean sample(final T span) {
+        return true;
     }
 
-    if (matchedRule == null) {
-      fallbackSampler.setSamplingPriority(span);
-    } else {
-      if (matchedRule.sample(span)) {
-        if (rateLimiter.tryAcquire()) {
-          span.setSamplingPriority(
-              PrioritySampling.USER_KEEP,
-              SAMPLING_RULE_RATE,
-              matchedRule.getSampler().getSampleRate(),
-              matchedRule.getMechanism());
+    @Override
+    public <T extends CoreSpan<T>> void setSamplingPriority(final T span) {
+        RateSamplingRule matchedRule = null;
+
+        for (final RateSamplingRule samplingRule : samplingRules) {
+            if (samplingRule.matches(span)) {
+                matchedRule = samplingRule;
+                break;
+            }
+        }
+
+        if (matchedRule == null) {
+            fallbackSampler.setSamplingPriority(span);
         } else {
-          span.setSamplingPriority(
-              PrioritySampling.USER_DROP,
-              SAMPLING_RULE_RATE,
-              matchedRule.getSampler().getSampleRate(),
-              matchedRule.getMechanism(),
-              true);
+            if (matchedRule.sample(span)) {
+                if (rateLimiter.tryAcquire()) {
+                    span.setSamplingPriority(
+                            PrioritySampling.USER_KEEP,
+                            SAMPLING_RULE_RATE,
+                            matchedRule.getSampler().getSampleRate(),
+                            matchedRule.getMechanism());
+                } else {
+                    span.setSamplingPriority(
+                            PrioritySampling.USER_DROP,
+                            SAMPLING_RULE_RATE,
+                            matchedRule.getSampler().getSampleRate(),
+                            matchedRule.getMechanism(),
+                            true);
+                }
+                span.setMetric(SAMPLING_LIMIT_RATE, rateLimit);
+            } else {
+                span.setSamplingPriority(
+                        PrioritySampling.USER_DROP,
+                        SAMPLING_RULE_RATE,
+                        matchedRule.getSampler().getSampleRate(),
+                        matchedRule.getMechanism());
+            }
         }
-        span.setMetric(SAMPLING_LIMIT_RATE, rateLimit);
-      } else {
-        span.setSamplingPriority(
-            PrioritySampling.USER_DROP,
-            SAMPLING_RULE_RATE,
-            matchedRule.getSampler().getSampleRate(),
-            matchedRule.getMechanism());
-      }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/Sampler.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/Sampler.java
index 070f5f5cad3..9ec803f9b3b 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/Sampler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/Sampler.java
@@ -23,126 +23,122 @@
 /** Main interface to sample a collection of traces. */
 public interface Sampler {
 
-  /**
-   * Sample a collection of traces based on the parent span
-   *
-   * @param span the parent span with its context
-   * @return true when the trace/spans has to be reported/written
-   */
-  <T extends CoreSpan<T>> boolean sample(T span);
-
-  /** Returns the sampler applying agent published rates. */
-  @Nullable
-  default RateByServiceTraceSampler agentSampler() {
-    return null;
-  }
-
-  final class Builder {
-    private static final Logger log = LoggerFactory.getLogger(Builder.class);
-
-    public static Sampler forConfig(final Config config, final TraceConfig traceConfig) {
-      return forConfig(config, traceConfig, null);
-    }
-
     /**
-     * Builds the sampler for {@code config}/{@code traceConfig}, using {@code agentSampler} for
-     * agent published rates (defaulting to a new {@link RateByServiceTraceSampler} if null.)
+     * Sample a collection of traces based on the parent span
      *
-     * <p>Callers rebuilding the sampler must reuse the same {@code agentSampler} value: it's
-     * registered once for agent rates, and a fresh one would reset its learned rates to 1.0.
+     * @param span the parent span with its context
+     * @return true when the trace/spans has to be reported/written
      */
-    public static Sampler forConfig(
-        final Config config,
-        final TraceConfig traceConfig,
-        @Nullable final RateByServiceTraceSampler agentSampler) {
-      Sampler sampler;
-      if (config != null) {
-        if (!config.isApmTracingEnabled() && isAsmEnabled(config)) {
-          log.debug("APM is disabled. Only 1 trace per minute will be sent.");
-          return new AsmStandaloneSampler(Clock.systemUTC());
-        }
-        final Map<String, String> serviceRules = config.getTraceSamplingServiceRules();
-        final Map<String, String> operationRules = config.getTraceSamplingOperationRules();
-        List<? extends SamplingRule.TraceSamplingRule> traceSamplingRules;
-        if (null != traceConfig) {
-          traceSamplingRules = traceConfig.getTraceSamplingRules();
-        } else if (null != config.getTraceSamplingRules()) {
-          traceSamplingRules =
-              TraceSamplingRules.deserialize(config.getTraceSamplingRules()).getRules();
-        } else {
-          traceSamplingRules = Collections.emptyList();
+    <T extends CoreSpan<T>> boolean sample(T span);
+
+    /** Returns the sampler applying agent published rates. */
+    @Nullable
+    default RateByServiceTraceSampler agentSampler() {
+        return null;
+    }
+
+    final class Builder {
+        private static final Logger log = LoggerFactory.getLogger(Builder.class);
+
+        public static Sampler forConfig(final Config config, final TraceConfig traceConfig) {
+            return forConfig(config, traceConfig, null);
         }
-        boolean serviceRulesDefined = serviceRules != null && !serviceRules.isEmpty();
-        boolean operationRulesDefined = operationRules != null && !operationRules.isEmpty();
-        boolean traceSamplingRulesDefined = !traceSamplingRules.isEmpty();
-        if ((serviceRulesDefined || operationRulesDefined) && traceSamplingRulesDefined) {
-          log.warn(
-              "Both {} and/or {} as well as {} are defined. Only {} will be used for rule-based sampling",
-              TracerConfig.TRACE_SAMPLING_SERVICE_RULES,
-              TracerConfig.TRACE_SAMPLING_OPERATION_RULES,
-              TracerConfig.TRACE_SAMPLING_RULES,
-              TracerConfig.TRACE_SAMPLING_RULES);
+
+        /**
+         * Builds the sampler for {@code config}/{@code traceConfig}, using {@code agentSampler} for
+         * agent published rates (defaulting to a new {@link RateByServiceTraceSampler} if null.)
+         *
+         * <p>Callers rebuilding the sampler must reuse the same {@code agentSampler} value: it's
+         * registered once for agent rates, and a fresh one would reset its learned rates to 1.0.
+         */
+        public static Sampler forConfig(
+                final Config config,
+                final TraceConfig traceConfig,
+                @Nullable final RateByServiceTraceSampler agentSampler) {
+            Sampler sampler;
+            if (config != null) {
+                if (!config.isApmTracingEnabled() && isAsmEnabled(config)) {
+                    log.debug("APM is disabled. Only 1 trace per minute will be sent.");
+                    return new AsmStandaloneSampler(Clock.systemUTC());
+                }
+                final Map<String, String> serviceRules = config.getTraceSamplingServiceRules();
+                final Map<String, String> operationRules = config.getTraceSamplingOperationRules();
+                List<? extends SamplingRule.TraceSamplingRule> traceSamplingRules;
+                if (null != traceConfig) {
+                    traceSamplingRules = traceConfig.getTraceSamplingRules();
+                } else if (null != config.getTraceSamplingRules()) {
+                    traceSamplingRules = TraceSamplingRules.deserialize(config.getTraceSamplingRules())
+                            .getRules();
+                } else {
+                    traceSamplingRules = Collections.emptyList();
+                }
+                boolean serviceRulesDefined = serviceRules != null && !serviceRules.isEmpty();
+                boolean operationRulesDefined = operationRules != null && !operationRules.isEmpty();
+                boolean traceSamplingRulesDefined = !traceSamplingRules.isEmpty();
+                if ((serviceRulesDefined || operationRulesDefined) && traceSamplingRulesDefined) {
+                    log.warn(
+                            "Both {} and/or {} as well as {} are defined. Only {} will be used for rule-based sampling",
+                            TracerConfig.TRACE_SAMPLING_SERVICE_RULES,
+                            TracerConfig.TRACE_SAMPLING_OPERATION_RULES,
+                            TracerConfig.TRACE_SAMPLING_RULES,
+                            TracerConfig.TRACE_SAMPLING_RULES);
+                }
+                Double traceSampleRate =
+                        null != traceConfig ? traceConfig.getTraceSampleRate() : config.getTraceSampleRate();
+                if (serviceRulesDefined
+                        || operationRulesDefined
+                        || traceSamplingRulesDefined
+                        || traceSampleRate != null) {
+                    try {
+                        sampler = RuleBasedTraceSampler.build(
+                                serviceRules,
+                                operationRules,
+                                traceSamplingRules,
+                                traceSampleRate,
+                                config.getTraceRateLimit(),
+                                agentSampler);
+                    } catch (final IllegalArgumentException e) {
+                        log.error("Invalid sampler configuration. Using AllSampler", e);
+                        sampler = new AllSampler();
+                    }
+                } else if (config.isPrioritySamplingEnabled()) {
+                    if (KEEP.equalsIgnoreCase(config.getPrioritySamplingForce())) {
+                        log.debug("Force Sampling Priority to: SAMPLER_KEEP.");
+                        sampler = new ForcePrioritySampler(PrioritySampling.SAMPLER_KEEP, SamplingMechanism.DEFAULT);
+                    } else if (DROP.equalsIgnoreCase(config.getPrioritySamplingForce())) {
+                        log.debug("Force Sampling Priority to: SAMPLER_DROP.");
+                        sampler = new ForcePrioritySampler(PrioritySampling.SAMPLER_DROP, SamplingMechanism.DEFAULT);
+                    } else if (config.isTraceOtlpExporterEnabled()) {
+                        // RateByServiceTraceSampler relies on the Datadog Agent for rate updates.
+                        log.debug(
+                                "OTLP traces export enabled. Using ParentBasedAlwaysOnSampler instead of RateByServiceTraceSampler.");
+                        sampler = new ParentBasedAlwaysOnSampler();
+                    } else {
+                        sampler = agentSampler != null ? agentSampler : new RateByServiceTraceSampler();
+                    }
+                } else if (config.isTraceOtlpExporterEnabled()) {
+                    // AllSampler does not emit a sampling priority; OTLP export requires one.
+                    log.debug("OTLP traces export enabled. Using ParentBasedAlwaysOnSampler instead of AllSampler.");
+                    sampler = new ParentBasedAlwaysOnSampler();
+                } else {
+                    sampler = new AllSampler();
+                }
+            } else {
+                sampler = new AllSampler();
+            }
+            return sampler;
         }
-        Double traceSampleRate =
-            null != traceConfig ? traceConfig.getTraceSampleRate() : config.getTraceSampleRate();
-        if (serviceRulesDefined
-            || operationRulesDefined
-            || traceSamplingRulesDefined
-            || traceSampleRate != null) {
-          try {
-            sampler =
-                RuleBasedTraceSampler.build(
-                    serviceRules,
-                    operationRules,
-                    traceSamplingRules,
-                    traceSampleRate,
-                    config.getTraceRateLimit(),
-                    agentSampler);
-          } catch (final IllegalArgumentException e) {
-            log.error("Invalid sampler configuration. Using AllSampler", e);
-            sampler = new AllSampler();
-          }
-        } else if (config.isPrioritySamplingEnabled()) {
-          if (KEEP.equalsIgnoreCase(config.getPrioritySamplingForce())) {
-            log.debug("Force Sampling Priority to: SAMPLER_KEEP.");
-            sampler =
-                new ForcePrioritySampler(PrioritySampling.SAMPLER_KEEP, SamplingMechanism.DEFAULT);
-          } else if (DROP.equalsIgnoreCase(config.getPrioritySamplingForce())) {
-            log.debug("Force Sampling Priority to: SAMPLER_DROP.");
-            sampler =
-                new ForcePrioritySampler(PrioritySampling.SAMPLER_DROP, SamplingMechanism.DEFAULT);
-          } else if (config.isTraceOtlpExporterEnabled()) {
-            // RateByServiceTraceSampler relies on the Datadog Agent for rate updates.
-            log.debug(
-                "OTLP traces export enabled. Using ParentBasedAlwaysOnSampler instead of RateByServiceTraceSampler.");
-            sampler = new ParentBasedAlwaysOnSampler();
-          } else {
-            sampler = agentSampler != null ? agentSampler : new RateByServiceTraceSampler();
-          }
-        } else if (config.isTraceOtlpExporterEnabled()) {
-          // AllSampler does not emit a sampling priority; OTLP export requires one.
-          log.debug(
-              "OTLP traces export enabled. Using ParentBasedAlwaysOnSampler instead of AllSampler.");
-          sampler = new ParentBasedAlwaysOnSampler();
-        } else {
-          sampler = new AllSampler();
+
+        private static boolean isAsmEnabled(Config config) {
+            return config.getAppSecActivation() == ProductActivation.FULLY_ENABLED
+                    || config.getIastActivation() == ProductActivation.FULLY_ENABLED
+                    || config.isAppSecScaEnabled();
         }
-      } else {
-        sampler = new AllSampler();
-      }
-      return sampler;
-    }
 
-    private static boolean isAsmEnabled(Config config) {
-      return config.getAppSecActivation() == ProductActivation.FULLY_ENABLED
-          || config.getIastActivation() == ProductActivation.FULLY_ENABLED
-          || config.isAppSecScaEnabled();
-    }
+        public static Sampler forConfig(final Properties config) {
+            return forConfig(Config.get(config), null);
+        }
 
-    public static Sampler forConfig(final Properties config) {
-      return forConfig(Config.get(config), null);
+        private Builder() {}
     }
-
-    private Builder() {}
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/SingleSpanSampler.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/SingleSpanSampler.java
index e8fdd7eb2fb..a3b5dd0db8f 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/SingleSpanSampler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/SingleSpanSampler.java
@@ -13,81 +13,78 @@
 
 public interface SingleSpanSampler {
 
-  <T extends CoreSpan<T>> boolean setSamplingPriority(T span);
+    <T extends CoreSpan<T>> boolean setSamplingPriority(T span);
 
-  final class Builder {
-    private static final Logger log = LoggerFactory.getLogger(Builder.class);
+    final class Builder {
+        private static final Logger log = LoggerFactory.getLogger(Builder.class);
 
-    public static SingleSpanSampler forConfig(Config config) {
-      String spanSamplingRules = config.getSpanSamplingRules();
-      String spanSamplingRulesFile = config.getSpanSamplingRulesFile();
+        public static SingleSpanSampler forConfig(Config config) {
+            String spanSamplingRules = config.getSpanSamplingRules();
+            String spanSamplingRulesFile = config.getSpanSamplingRulesFile();
 
-      boolean spanSamplingRulesDefined = spanSamplingRules != null && !spanSamplingRules.isEmpty();
-      boolean spanSamplingRulesFileDefined =
-          spanSamplingRulesFile != null && !spanSamplingRulesFile.isEmpty();
+            boolean spanSamplingRulesDefined = spanSamplingRules != null && !spanSamplingRules.isEmpty();
+            boolean spanSamplingRulesFileDefined = spanSamplingRulesFile != null && !spanSamplingRulesFile.isEmpty();
 
-      if (spanSamplingRulesDefined && spanSamplingRulesFileDefined) {
-        log.warn(
-            "Both {} and {} defined. {} will be ignored.",
-            SPAN_SAMPLING_RULES,
-            SPAN_SAMPLING_RULES_FILE,
-            SPAN_SAMPLING_RULES_FILE);
-      }
+            if (spanSamplingRulesDefined && spanSamplingRulesFileDefined) {
+                log.warn(
+                        "Both {} and {} defined. {} will be ignored.",
+                        SPAN_SAMPLING_RULES,
+                        SPAN_SAMPLING_RULES_FILE,
+                        SPAN_SAMPLING_RULES_FILE);
+            }
 
-      if (spanSamplingRulesDefined) {
-        SpanSamplingRules rules = SpanSamplingRules.deserialize(spanSamplingRules);
-        if (!rules.isEmpty()) {
-          return new RuleBasedSingleSpanSampler(rules);
-        }
-      } else if (spanSamplingRulesFileDefined) {
-        SpanSamplingRules rules = SpanSamplingRules.deserializeFile(spanSamplingRulesFile);
-        if (!rules.isEmpty()) {
-          return new RuleBasedSingleSpanSampler(rules);
+            if (spanSamplingRulesDefined) {
+                SpanSamplingRules rules = SpanSamplingRules.deserialize(spanSamplingRules);
+                if (!rules.isEmpty()) {
+                    return new RuleBasedSingleSpanSampler(rules);
+                }
+            } else if (spanSamplingRulesFileDefined) {
+                SpanSamplingRules rules = SpanSamplingRules.deserializeFile(spanSamplingRulesFile);
+                if (!rules.isEmpty()) {
+                    return new RuleBasedSingleSpanSampler(rules);
+                }
+            }
+
+            return null;
         }
-      }
 
-      return null;
+        private Builder() {}
     }
 
-    private Builder() {}
-  }
-
-  final class RuleBasedSingleSpanSampler implements SingleSpanSampler {
-    private final List<RateSamplingRule.SpanSamplingRule> spanSamplingRules;
+    final class RuleBasedSingleSpanSampler implements SingleSpanSampler {
+        private final List<RateSamplingRule.SpanSamplingRule> spanSamplingRules;
 
-    public RuleBasedSingleSpanSampler(SpanSamplingRules rules) {
-      if (rules == null) {
-        throw new NullPointerException("SpanSamplingRules can't be null.");
-      }
-      this.spanSamplingRules = new ArrayList<>();
-      for (SpanSamplingRules.Rule rule : rules.getRules()) {
-        RateSampler sampler = new DeterministicSampler.SpanSampler(rule.getSampleRate());
-        SimpleRateLimiter simpleRateLimiter =
-            rule.getMaxPerSecond() == Integer.MAX_VALUE
-                ? null
-                : new SimpleRateLimiter(rule.getMaxPerSecond());
-        RateSamplingRule.SpanSamplingRule spanSamplingRule =
-            new RateSamplingRule.SpanSamplingRule(
-                rule.getService(), rule.getName(), sampler, simpleRateLimiter);
-        spanSamplingRules.add(spanSamplingRule);
-      }
-    }
+        public RuleBasedSingleSpanSampler(SpanSamplingRules rules) {
+            if (rules == null) {
+                throw new NullPointerException("SpanSamplingRules can't be null.");
+            }
+            this.spanSamplingRules = new ArrayList<>();
+            for (SpanSamplingRules.Rule rule : rules.getRules()) {
+                RateSampler sampler = new DeterministicSampler.SpanSampler(rule.getSampleRate());
+                SimpleRateLimiter simpleRateLimiter = rule.getMaxPerSecond() == Integer.MAX_VALUE
+                        ? null
+                        : new SimpleRateLimiter(rule.getMaxPerSecond());
+                RateSamplingRule.SpanSamplingRule spanSamplingRule = new RateSamplingRule.SpanSamplingRule(
+                        rule.getService(), rule.getName(), sampler, simpleRateLimiter);
+                spanSamplingRules.add(spanSamplingRule);
+            }
+        }
 
-    @Override
-    public <T extends CoreSpan<T>> boolean setSamplingPriority(T span) {
-      for (RateSamplingRule.SpanSamplingRule rule : spanSamplingRules) {
-        if (rule.matches(span)) {
-          if (rule.sample(span)) {
-            double rate = rule.getSampler().getSampleRate();
-            SimpleRateLimiter rateLimiter = rule.getRateLimiter();
-            int limit = rateLimiter == null ? Integer.MAX_VALUE : rateLimiter.getCapacity();
-            span.setSpanSamplingPriority(rate, limit);
-            return true;
-          }
-          break;
+        @Override
+        public <T extends CoreSpan<T>> boolean setSamplingPriority(T span) {
+            for (RateSamplingRule.SpanSamplingRule rule : spanSamplingRules) {
+                if (rule.matches(span)) {
+                    if (rule.sample(span)) {
+                        double rate = rule.getSampler().getSampleRate();
+                        SimpleRateLimiter rateLimiter = rule.getRateLimiter();
+                        int limit = rateLimiter == null ? Integer.MAX_VALUE : rateLimiter.getCapacity();
+                        span.setSpanSamplingPriority(rate, limit);
+                        return true;
+                    }
+                    break;
+                }
+            }
+            return false;
         }
-      }
-      return false;
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/SpanSamplingRules.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/SpanSamplingRules.java
index d4950c5e8f1..569c51d31cb 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/SpanSamplingRules.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/SpanSamplingRules.java
@@ -21,202 +21,202 @@
 
 /** Represents list of Span Sampling Rules read from JSON. See SPAN_SAMPLING_RULES */
 public class SpanSamplingRules {
-  public static final SpanSamplingRules EMPTY = new SpanSamplingRules(Collections.emptyList());
-  private static final Logger log = LoggerFactory.getLogger(SpanSamplingRules.class);
-  private static final Moshi MOSHI = new Moshi.Builder().add(new RuleAdapter()).build();
-  private static final ParameterizedType LIST_OF_RULES =
-      Types.newParameterizedType(List.class, Rule.class);
-  private static final JsonAdapter<List<Rule>> LIST_OF_RULES_ADAPTER = MOSHI.adapter(LIST_OF_RULES);
-  private final List<Rule> rules;
-
-  public SpanSamplingRules(List<Rule> rules) {
-    this.rules = Collections.unmodifiableList(rules);
-  }
-
-  public static SpanSamplingRules deserialize(String json) {
-    SpanSamplingRules result = EMPTY;
-    try {
-      result = filterOutNullRules(LIST_OF_RULES_ADAPTER.fromJson(json));
-    } catch (Throwable ex) {
-      log.error("Couldn't parse Span Sampling Rules from JSON: {}", json, ex);
-    }
-    return result;
-  }
-
-  public static SpanSamplingRules deserializeFile(String jsonFile) {
-    SpanSamplingRules result = EMPTY;
-    try (JsonReader reader = JsonReader.of(Okio.buffer(Okio.source(new File(jsonFile))))) {
-      result = filterOutNullRules(LIST_OF_RULES_ADAPTER.fromJson(reader));
-    } catch (FileNotFoundException e) {
-      log.warn("Span Sampling Rules file {} doesn't exist", jsonFile);
-    } catch (IOException e) {
-      log.error("Couldn't read Span Sampling Rules file {}.", jsonFile, e);
-    } catch (Throwable ex) {
-      log.error("Couldn't parse Span Sampling Rules from JSON file {}.", jsonFile, ex);
-    }
-    return result;
-  }
+    public static final SpanSamplingRules EMPTY = new SpanSamplingRules(Collections.emptyList());
+    private static final Logger log = LoggerFactory.getLogger(SpanSamplingRules.class);
+    private static final Moshi MOSHI =
+            new Moshi.Builder().add(new RuleAdapter()).build();
+    private static final ParameterizedType LIST_OF_RULES = Types.newParameterizedType(List.class, Rule.class);
+    private static final JsonAdapter<List<Rule>> LIST_OF_RULES_ADAPTER = MOSHI.adapter(LIST_OF_RULES);
+    private final List<Rule> rules;
 
-  private static SpanSamplingRules filterOutNullRules(List<Rule> rules) {
-    if (rules == null || rules.isEmpty()) {
-      return EMPTY;
-    }
-    List<Rule> notNullRules = new ArrayList<>(rules.size());
-    for (Rule rule : rules) {
-      if (rule != null) {
-        notNullRules.add(rule);
-      }
-    }
-    if (notNullRules.isEmpty()) {
-      return EMPTY;
-    }
-    return new SpanSamplingRules(notNullRules);
-  }
-
-  public List<Rule> getRules() {
-    return rules;
-  }
-
-  public boolean isEmpty() {
-    return rules.isEmpty();
-  }
-
-  public static final class Rule implements SamplingRule.SpanSamplingRule {
-    private final String service;
-    private final String name;
-    private final String resource;
-    private final Map<String, String> tags;
-    private final double sampleRate;
-    private final int maxPerSecond;
-    private final Provenance provenance;
-
-    private Rule(
-        String service,
-        String name,
-        String resource,
-        Map<String, String> tags,
-        double sampleRate,
-        int maxPerSecond,
-        Provenance provenance) {
-      this.service = service;
-      this.name = name;
-      this.resource = resource;
-      this.tags = tags;
-      this.sampleRate = sampleRate;
-      this.maxPerSecond = maxPerSecond;
-      this.provenance = provenance;
+    public SpanSamplingRules(List<Rule> rules) {
+        this.rules = Collections.unmodifiableList(rules);
     }
 
-    /**
-     * Validate and create a {@link Rule} from its {@code JsonRule} representation.
-     *
-     * @param jsonRule The {@code JsonRule} to validate.
-     * @return A {@link Rule} if the {@code JsonRule} is valid, {@code null} otherwise.
-     */
-    public static Rule create(JsonRule jsonRule) {
-      String service = SamplingRule.normalizeGlob(jsonRule.service);
-      String name = SamplingRule.normalizeGlob(jsonRule.name);
-      String resource = SamplingRule.normalizeGlob(jsonRule.resource);
-      Map<String, String> tags = jsonRule.tags;
-      if (tags == null) {
-        tags = Collections.emptyMap();
-      }
-      double sampleRate = 1D;
-      if (jsonRule.sample_rate != null) {
+    public static SpanSamplingRules deserialize(String json) {
+        SpanSamplingRules result = EMPTY;
         try {
-          sampleRate = Double.parseDouble(jsonRule.sample_rate);
-        } catch (NumberFormatException ex) {
-          logRuleError(jsonRule, "sample_rate must be a number between 0.0 and 1.0");
-          return null;
-        }
-        if (sampleRate < 0D || sampleRate > 1D) {
-          logRuleError(jsonRule, "sample_rate must be between 0.0 and 1.0");
-          return null;
-        }
-      }
-      int maxPerSecond = Integer.MAX_VALUE;
-      if (jsonRule.max_per_second != null) {
-        try {
-          double parsedMaxPerSeconds = Double.parseDouble(jsonRule.max_per_second);
-          if (parsedMaxPerSeconds <= 0) {
-            logRuleError(jsonRule, "max_per_second must be greater than 0.0");
-            return null;
-          }
-          maxPerSecond = Math.max((int) parsedMaxPerSeconds, 1);
-        } catch (NumberFormatException ex) {
-          logRuleError(jsonRule, "max_per_second must be a number greater than 0.0");
-          return null;
-        }
-      }
-      return new Rule(service, name, resource, tags, sampleRate, maxPerSecond, Provenance.LOCAL);
+            result = filterOutNullRules(LIST_OF_RULES_ADAPTER.fromJson(json));
+        } catch (Throwable ex) {
+            log.error("Couldn't parse Span Sampling Rules from JSON: {}", json, ex);
+        }
+        return result;
+    }
+
+    public static SpanSamplingRules deserializeFile(String jsonFile) {
+        SpanSamplingRules result = EMPTY;
+        try (JsonReader reader = JsonReader.of(Okio.buffer(Okio.source(new File(jsonFile))))) {
+            result = filterOutNullRules(LIST_OF_RULES_ADAPTER.fromJson(reader));
+        } catch (FileNotFoundException e) {
+            log.warn("Span Sampling Rules file {} doesn't exist", jsonFile);
+        } catch (IOException e) {
+            log.error("Couldn't read Span Sampling Rules file {}.", jsonFile, e);
+        } catch (Throwable ex) {
+            log.error("Couldn't parse Span Sampling Rules from JSON file {}.", jsonFile, ex);
+        }
+        return result;
     }
 
-    private static void logRuleError(JsonRule rule, String error) {
-      log.error("Skipping invalid Span Sampling Rule: {} - {}", rule, error);
-    }
+    private static SpanSamplingRules filterOutNullRules(List<Rule> rules) {
+        if (rules == null || rules.isEmpty()) {
+            return EMPTY;
+        }
+        List<Rule> notNullRules = new ArrayList<>(rules.size());
+        for (Rule rule : rules) {
+            if (rule != null) {
+                notNullRules.add(rule);
+            }
+        }
+        if (notNullRules.isEmpty()) {
+            return EMPTY;
+        }
+        return new SpanSamplingRules(notNullRules);
+    }
+
+    public List<Rule> getRules() {
+        return rules;
+    }
+
+    public boolean isEmpty() {
+        return rules.isEmpty();
+    }
+
+    public static final class Rule implements SamplingRule.SpanSamplingRule {
+        private final String service;
+        private final String name;
+        private final String resource;
+        private final Map<String, String> tags;
+        private final double sampleRate;
+        private final int maxPerSecond;
+        private final Provenance provenance;
+
+        private Rule(
+                String service,
+                String name,
+                String resource,
+                Map<String, String> tags,
+                double sampleRate,
+                int maxPerSecond,
+                Provenance provenance) {
+            this.service = service;
+            this.name = name;
+            this.resource = resource;
+            this.tags = tags;
+            this.sampleRate = sampleRate;
+            this.maxPerSecond = maxPerSecond;
+            this.provenance = provenance;
+        }
 
-    @Override
-    public String getService() {
-      return service;
-    }
+        /**
+         * Validate and create a {@link Rule} from its {@code JsonRule} representation.
+         *
+         * @param jsonRule The {@code JsonRule} to validate.
+         * @return A {@link Rule} if the {@code JsonRule} is valid, {@code null} otherwise.
+         */
+        public static Rule create(JsonRule jsonRule) {
+            String service = SamplingRule.normalizeGlob(jsonRule.service);
+            String name = SamplingRule.normalizeGlob(jsonRule.name);
+            String resource = SamplingRule.normalizeGlob(jsonRule.resource);
+            Map<String, String> tags = jsonRule.tags;
+            if (tags == null) {
+                tags = Collections.emptyMap();
+            }
+            double sampleRate = 1D;
+            if (jsonRule.sample_rate != null) {
+                try {
+                    sampleRate = Double.parseDouble(jsonRule.sample_rate);
+                } catch (NumberFormatException ex) {
+                    logRuleError(jsonRule, "sample_rate must be a number between 0.0 and 1.0");
+                    return null;
+                }
+                if (sampleRate < 0D || sampleRate > 1D) {
+                    logRuleError(jsonRule, "sample_rate must be between 0.0 and 1.0");
+                    return null;
+                }
+            }
+            int maxPerSecond = Integer.MAX_VALUE;
+            if (jsonRule.max_per_second != null) {
+                try {
+                    double parsedMaxPerSeconds = Double.parseDouble(jsonRule.max_per_second);
+                    if (parsedMaxPerSeconds <= 0) {
+                        logRuleError(jsonRule, "max_per_second must be greater than 0.0");
+                        return null;
+                    }
+                    maxPerSecond = Math.max((int) parsedMaxPerSeconds, 1);
+                } catch (NumberFormatException ex) {
+                    logRuleError(jsonRule, "max_per_second must be a number greater than 0.0");
+                    return null;
+                }
+            }
+            return new Rule(service, name, resource, tags, sampleRate, maxPerSecond, Provenance.LOCAL);
+        }
 
-    @Override
-    public String getName() {
-      return name;
-    }
+        private static void logRuleError(JsonRule rule, String error) {
+            log.error("Skipping invalid Span Sampling Rule: {} - {}", rule, error);
+        }
 
-    @Override
-    public String getResource() {
-      return resource;
-    }
+        @Override
+        public String getService() {
+            return service;
+        }
 
-    @Override
-    public Map<String, String> getTags() {
-      return tags;
-    }
+        @Override
+        public String getName() {
+            return name;
+        }
 
-    @Override
-    public double getSampleRate() {
-      return sampleRate;
-    }
+        @Override
+        public String getResource() {
+            return resource;
+        }
 
-    @Override
-    public int getMaxPerSecond() {
-      return maxPerSecond;
-    }
+        @Override
+        public Map<String, String> getTags() {
+            return tags;
+        }
 
-    @Override
-    public Provenance getProvenance() {
-      return provenance;
+        @Override
+        public double getSampleRate() {
+            return sampleRate;
+        }
+
+        @Override
+        public int getMaxPerSecond() {
+            return maxPerSecond;
+        }
+
+        @Override
+        public Provenance getProvenance() {
+            return provenance;
+        }
     }
-  }
 
-  private static final class JsonRule {
-    private static final JsonAdapter<JsonRule> jsonAdapter = MOSHI.adapter(JsonRule.class);
+    private static final class JsonRule {
+        private static final JsonAdapter<JsonRule> jsonAdapter = MOSHI.adapter(JsonRule.class);
 
-    String service;
-    String name;
-    String resource;
-    Map<String, String> tags;
-    String sample_rate; // Use String to be able to map int as double
-    String max_per_second; // Use String to be able to map int as double
+        String service;
+        String name;
+        String resource;
+        Map<String, String> tags;
+        String sample_rate; // Use String to be able to map int as double
+        String max_per_second; // Use String to be able to map int as double
 
-    @Override
-    public String toString() {
-      return jsonAdapter.toJson(this);
+        @Override
+        public String toString() {
+            return jsonAdapter.toJson(this);
+        }
     }
-  }
 
-  private static final class RuleAdapter {
-    @FromJson
-    Rule fromJson(JsonRule jsonRule) {
-      return Rule.create(jsonRule);
-    }
+    private static final class RuleAdapter {
+        @FromJson
+        Rule fromJson(JsonRule jsonRule) {
+            return Rule.create(jsonRule);
+        }
 
-    @ToJson
-    JsonRule toJson(TraceSamplingRules.Rule rule) {
-      // This method only purpose is to prevent a "No @ToJson adapter for class" exception.
-      throw new UnsupportedOperationException();
+        @ToJson
+        JsonRule toJson(TraceSamplingRules.Rule rule) {
+            // This method only purpose is to prevent a "No @ToJson adapter for class" exception.
+            throw new UnsupportedOperationException();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/TraceSamplingRules.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/TraceSamplingRules.java
index 455b66443fe..f663e05727f 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/TraceSamplingRules.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/TraceSamplingRules.java
@@ -17,165 +17,165 @@
 /** Represents list of Trace Sampling Rules read from JSON. See TRACE_SAMPLING_RULES */
 public class TraceSamplingRules {
 
-  public static final TraceSamplingRules EMPTY = new TraceSamplingRules(Collections.emptyList());
-  private static final Logger log = LoggerFactory.getLogger(TraceSamplingRules.class);
-  private static final Moshi MOSHI = new Moshi.Builder().add(new RuleAdapter()).build();
-  private static final ParameterizedType LIST_OF_RULES =
-      Types.newParameterizedType(List.class, Rule.class);
-  private static final JsonAdapter<List<Rule>> LIST_OF_RULES_ADAPTER = MOSHI.adapter(LIST_OF_RULES);
-  private final List<Rule> rules;
-
-  public TraceSamplingRules(List<Rule> rules) {
-    this.rules = Collections.unmodifiableList(rules);
-  }
-
-  public static TraceSamplingRules deserialize(String json) {
-    TraceSamplingRules result = EMPTY;
-    try {
-      result = filterOutNullRules(LIST_OF_RULES_ADAPTER.fromJson(json));
-    } catch (Throwable ex) {
-      log.error("Couldn't parse Trace Sampling Rules from JSON: {}", json, ex);
-    }
-    return result;
-  }
+    public static final TraceSamplingRules EMPTY = new TraceSamplingRules(Collections.emptyList());
+    private static final Logger log = LoggerFactory.getLogger(TraceSamplingRules.class);
+    private static final Moshi MOSHI =
+            new Moshi.Builder().add(new RuleAdapter()).build();
+    private static final ParameterizedType LIST_OF_RULES = Types.newParameterizedType(List.class, Rule.class);
+    private static final JsonAdapter<List<Rule>> LIST_OF_RULES_ADAPTER = MOSHI.adapter(LIST_OF_RULES);
+    private final List<Rule> rules;
 
-  private static TraceSamplingRules filterOutNullRules(List<Rule> rules) {
-    if (rules == null || rules.isEmpty()) {
-      return EMPTY;
-    }
-    List<Rule> notNullRules = new ArrayList<>(rules.size());
-    for (Rule rule : rules) {
-      if (rule != null) {
-        notNullRules.add(rule);
-      }
-    }
-    if (notNullRules.isEmpty()) {
-      return EMPTY;
-    }
-    return new TraceSamplingRules(notNullRules);
-  }
-
-  public List<Rule> getRules() {
-    return rules;
-  }
-
-  public boolean isEmpty() {
-    return this.rules.isEmpty();
-  }
-
-  public static final class Rule implements SamplingRule.TraceSamplingRule {
-    private final String service;
-    private final String name;
-    private final String resource;
-    private final Map<String, String> tags;
-    private final double sampleRate;
-    private final Provenance provenance;
-
-    private Rule(
-        String service,
-        String name,
-        String resource,
-        Map<String, String> tags,
-        double sampleRate,
-        Provenance provenance) {
-      this.service = service;
-      this.name = name;
-      this.resource = resource;
-      this.tags = tags;
-      this.sampleRate = sampleRate;
-      this.provenance = provenance;
+    public TraceSamplingRules(List<Rule> rules) {
+        this.rules = Collections.unmodifiableList(rules);
     }
 
-    /**
-     * Validate and create a {@link Rule} from its {@code JsonRule} representation.
-     *
-     * @param jsonRule The {@code JsonRule} to validate.
-     * @return A {@link Rule} if the {@code JsonRule} is valid, {@code null} otherwise.
-     */
-    public static Rule create(JsonRule jsonRule) {
-      String service = SamplingRule.normalizeGlob(jsonRule.service);
-      String name = SamplingRule.normalizeGlob(jsonRule.name);
-      String resource = SamplingRule.normalizeGlob(jsonRule.resource);
-      Map<String, String> tags = jsonRule.tags;
-      if (tags == null) {
-        tags = Collections.emptyMap();
-      }
-      double sampleRate = 1D;
-      if (jsonRule.sample_rate != null) {
+    public static TraceSamplingRules deserialize(String json) {
+        TraceSamplingRules result = EMPTY;
         try {
-          sampleRate = Double.parseDouble(jsonRule.sample_rate);
-        } catch (NumberFormatException ex) {
-          logRuleError(jsonRule, "sample_rate must be a number between 0.0 and 1.0");
-          return null;
+            result = filterOutNullRules(LIST_OF_RULES_ADAPTER.fromJson(json));
+        } catch (Throwable ex) {
+            log.error("Couldn't parse Trace Sampling Rules from JSON: {}", json, ex);
         }
-        if (sampleRate < 0D || sampleRate > 1D) {
-          logRuleError(jsonRule, "sample_rate must be between 0.0 and 1.0");
-          return null;
-        }
-      }
-      return new Rule(service, name, resource, tags, sampleRate, Provenance.LOCAL);
+        return result;
     }
 
-    private static void logRuleError(JsonRule rule, String error) {
-      log.error("Skipping invalid Trace Sampling Rule: {} - {}", rule, error);
-    }
+    private static TraceSamplingRules filterOutNullRules(List<Rule> rules) {
+        if (rules == null || rules.isEmpty()) {
+            return EMPTY;
+        }
+        List<Rule> notNullRules = new ArrayList<>(rules.size());
+        for (Rule rule : rules) {
+            if (rule != null) {
+                notNullRules.add(rule);
+            }
+        }
+        if (notNullRules.isEmpty()) {
+            return EMPTY;
+        }
+        return new TraceSamplingRules(notNullRules);
+    }
+
+    public List<Rule> getRules() {
+        return rules;
+    }
+
+    public boolean isEmpty() {
+        return this.rules.isEmpty();
+    }
+
+    public static final class Rule implements SamplingRule.TraceSamplingRule {
+        private final String service;
+        private final String name;
+        private final String resource;
+        private final Map<String, String> tags;
+        private final double sampleRate;
+        private final Provenance provenance;
+
+        private Rule(
+                String service,
+                String name,
+                String resource,
+                Map<String, String> tags,
+                double sampleRate,
+                Provenance provenance) {
+            this.service = service;
+            this.name = name;
+            this.resource = resource;
+            this.tags = tags;
+            this.sampleRate = sampleRate;
+            this.provenance = provenance;
+        }
 
-    @Override
-    public String getService() {
-      return service;
-    }
+        /**
+         * Validate and create a {@link Rule} from its {@code JsonRule} representation.
+         *
+         * @param jsonRule The {@code JsonRule} to validate.
+         * @return A {@link Rule} if the {@code JsonRule} is valid, {@code null} otherwise.
+         */
+        public static Rule create(JsonRule jsonRule) {
+            String service = SamplingRule.normalizeGlob(jsonRule.service);
+            String name = SamplingRule.normalizeGlob(jsonRule.name);
+            String resource = SamplingRule.normalizeGlob(jsonRule.resource);
+            Map<String, String> tags = jsonRule.tags;
+            if (tags == null) {
+                tags = Collections.emptyMap();
+            }
+            double sampleRate = 1D;
+            if (jsonRule.sample_rate != null) {
+                try {
+                    sampleRate = Double.parseDouble(jsonRule.sample_rate);
+                } catch (NumberFormatException ex) {
+                    logRuleError(jsonRule, "sample_rate must be a number between 0.0 and 1.0");
+                    return null;
+                }
+                if (sampleRate < 0D || sampleRate > 1D) {
+                    logRuleError(jsonRule, "sample_rate must be between 0.0 and 1.0");
+                    return null;
+                }
+            }
+            return new Rule(service, name, resource, tags, sampleRate, Provenance.LOCAL);
+        }
 
-    @Override
-    public String getName() {
-      return name;
-    }
+        private static void logRuleError(JsonRule rule, String error) {
+            log.error("Skipping invalid Trace Sampling Rule: {} - {}", rule, error);
+        }
 
-    @Override
-    public String getResource() {
-      return resource;
-    }
+        @Override
+        public String getService() {
+            return service;
+        }
 
-    @Override
-    public Map<String, String> getTags() {
-      return tags;
-    }
+        @Override
+        public String getName() {
+            return name;
+        }
 
-    @Override
-    public double getSampleRate() {
-      return sampleRate;
-    }
+        @Override
+        public String getResource() {
+            return resource;
+        }
+
+        @Override
+        public Map<String, String> getTags() {
+            return tags;
+        }
 
-    @Override
-    public Provenance getProvenance() {
-      return provenance;
+        @Override
+        public double getSampleRate() {
+            return sampleRate;
+        }
+
+        @Override
+        public Provenance getProvenance() {
+            return provenance;
+        }
     }
-  }
 
-  private static final class JsonRule {
-    private static final JsonAdapter<JsonRule> jsonAdapter = MOSHI.adapter(JsonRule.class);
+    private static final class JsonRule {
+        private static final JsonAdapter<JsonRule> jsonAdapter = MOSHI.adapter(JsonRule.class);
 
-    String service;
-    String name;
-    String resource;
-    Map<String, String> tags;
-    String sample_rate;
+        String service;
+        String name;
+        String resource;
+        Map<String, String> tags;
+        String sample_rate;
 
-    @Override
-    public String toString() {
-      return jsonAdapter.toJson(this);
+        @Override
+        public String toString() {
+            return jsonAdapter.toJson(this);
+        }
     }
-  }
 
-  private static final class RuleAdapter {
-    @FromJson
-    Rule fromJson(JsonRule jsonRule) {
-      return Rule.create(jsonRule);
-    }
+    private static final class RuleAdapter {
+        @FromJson
+        Rule fromJson(JsonRule jsonRule) {
+            return Rule.create(jsonRule);
+        }
 
-    @ToJson
-    JsonRule toJson(Rule rule) {
-      // This method only purpose is to prevent a "No @ToJson adapter for class" exception.
-      throw new UnsupportedOperationException();
+        @ToJson
+        JsonRule toJson(Rule rule) {
+            // This method only purpose is to prevent a "No @ToJson adapter for class" exception.
+            throw new UnsupportedOperationException();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/CompositePayloadDispatcher.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/CompositePayloadDispatcher.java
index 54f50358c56..d27df01bebe 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/CompositePayloadDispatcher.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/CompositePayloadDispatcher.java
@@ -7,39 +7,39 @@
 
 public class CompositePayloadDispatcher implements PayloadDispatcher {
 
-  private final PayloadDispatcher[] delegates;
+    private final PayloadDispatcher[] delegates;
 
-  public CompositePayloadDispatcher(PayloadDispatcher... delegates) {
-    this.delegates = delegates;
-  }
+    public CompositePayloadDispatcher(PayloadDispatcher... delegates) {
+        this.delegates = delegates;
+    }
 
-  @Override
-  public void onDroppedTrace(int spanCount) {
-    for (PayloadDispatcher delegate : delegates) {
-      delegate.onDroppedTrace(spanCount);
+    @Override
+    public void onDroppedTrace(int spanCount) {
+        for (PayloadDispatcher delegate : delegates) {
+            delegate.onDroppedTrace(spanCount);
+        }
     }
-  }
 
-  @Override
-  public void addTrace(List<? extends CoreSpan<?>> trace) {
-    for (PayloadDispatcher delegate : delegates) {
-      delegate.addTrace(trace);
+    @Override
+    public void addTrace(List<? extends CoreSpan<?>> trace) {
+        for (PayloadDispatcher delegate : delegates) {
+            delegate.addTrace(trace);
+        }
     }
-  }
 
-  @Override
-  public void flush() {
-    for (PayloadDispatcher delegate : delegates) {
-      delegate.flush();
+    @Override
+    public void flush() {
+        for (PayloadDispatcher delegate : delegates) {
+            delegate.flush();
+        }
     }
-  }
 
-  @Override
-  public Collection<RemoteApi> getApis() {
-    Collection<RemoteApi> apis = new ArrayList<>(delegates.length);
-    for (PayloadDispatcher delegate : delegates) {
-      apis.addAll(delegate.getApis());
+    @Override
+    public Collection<RemoteApi> getApis() {
+        Collection<RemoteApi> apis = new ArrayList<>(delegates.length);
+        for (PayloadDispatcher delegate : delegates) {
+            apis.addAll(delegate.getApis());
+        }
+        return apis;
     }
-    return apis;
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/DDAgentWriter.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/DDAgentWriter.java
index d0fbc11cda8..90afc77e918 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/DDAgentWriter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/DDAgentWriter.java
@@ -22,187 +22,177 @@
 
 public class DDAgentWriter extends RemoteWriter {
 
-  public static DDAgentWriterBuilder builder() {
-    return new DDAgentWriterBuilder();
-  }
-
-  private static final int BUFFER_SIZE = 1024;
-
-  public static class DDAgentWriterBuilder {
-
-    String agentHost = DEFAULT_AGENT_HOST;
-    int traceAgentPort = DEFAULT_TRACE_AGENT_PORT;
-    String unixDomainSocket = null;
-    String namedPipe = null;
-    long timeoutMillis = TimeUnit.SECONDS.toMillis(DEFAULT_AGENT_TIMEOUT);
-    int traceBufferSize = BUFFER_SIZE;
-    HealthMetrics healthMetrics = HealthMetrics.NO_OP;
-    int flushIntervalMilliseconds = 1000;
-    Monitoring monitoring = Monitoring.DISABLED;
-    ProtocolVersion protocolVersion = Config.get().getProtocolVersion();
-    boolean nativeMetricsReportingEnabled = Config.get().isTracerMetricsEnabled();
-    boolean metricsIgnoreAgentVersion = Config.get().isTracerMetricsIgnoreAgentVersion();
-    private int flushTimeout = 1;
-    private TimeUnit flushTimeoutUnit = TimeUnit.SECONDS;
-    boolean alwaysFlush = false;
-
-    private DDAgentApi agentApi;
-    private Prioritization prioritization;
-    private DDAgentFeaturesDiscovery featureDiscovery;
-    private DroppingPolicy droppingPolicy;
-    private SingleSpanSampler singleSpanSampler;
-
-    public DDAgentWriterBuilder agentApi(DDAgentApi agentApi) {
-      this.agentApi = agentApi;
-      return this;
+    public static DDAgentWriterBuilder builder() {
+        return new DDAgentWriterBuilder();
+    }
+
+    private static final int BUFFER_SIZE = 1024;
+
+    public static class DDAgentWriterBuilder {
+
+        String agentHost = DEFAULT_AGENT_HOST;
+        int traceAgentPort = DEFAULT_TRACE_AGENT_PORT;
+        String unixDomainSocket = null;
+        String namedPipe = null;
+        long timeoutMillis = TimeUnit.SECONDS.toMillis(DEFAULT_AGENT_TIMEOUT);
+        int traceBufferSize = BUFFER_SIZE;
+        HealthMetrics healthMetrics = HealthMetrics.NO_OP;
+        int flushIntervalMilliseconds = 1000;
+        Monitoring monitoring = Monitoring.DISABLED;
+        ProtocolVersion protocolVersion = Config.get().getProtocolVersion();
+        boolean nativeMetricsReportingEnabled = Config.get().isTracerMetricsEnabled();
+        boolean metricsIgnoreAgentVersion = Config.get().isTracerMetricsIgnoreAgentVersion();
+        private int flushTimeout = 1;
+        private TimeUnit flushTimeoutUnit = TimeUnit.SECONDS;
+        boolean alwaysFlush = false;
+
+        private DDAgentApi agentApi;
+        private Prioritization prioritization;
+        private DDAgentFeaturesDiscovery featureDiscovery;
+        private DroppingPolicy droppingPolicy;
+        private SingleSpanSampler singleSpanSampler;
+
+        public DDAgentWriterBuilder agentApi(DDAgentApi agentApi) {
+            this.agentApi = agentApi;
+            return this;
+        }
+
+        public DDAgentWriterBuilder agentHost(String agentHost) {
+            this.agentHost = agentHost;
+            return this;
+        }
+
+        public DDAgentWriterBuilder traceAgentPort(int traceAgentPort) {
+            this.traceAgentPort = traceAgentPort;
+            return this;
+        }
+
+        public DDAgentWriterBuilder unixDomainSocket(String unixDomainSocket) {
+            this.unixDomainSocket = unixDomainSocket;
+            return this;
+        }
+
+        public DDAgentWriterBuilder namedPipe(String namedPipe) {
+            this.namedPipe = namedPipe;
+            return this;
+        }
+
+        public DDAgentWriterBuilder timeoutMillis(long timeoutMillis) {
+            this.timeoutMillis = timeoutMillis;
+            return this;
+        }
+
+        public DDAgentWriterBuilder traceBufferSize(int traceBufferSize) {
+            this.traceBufferSize = traceBufferSize;
+            return this;
+        }
+
+        public DDAgentWriterBuilder healthMetrics(HealthMetrics healthMetrics) {
+            this.healthMetrics = healthMetrics;
+            return this;
+        }
+
+        public DDAgentWriterBuilder flushIntervalMilliseconds(int flushIntervalMilliseconds) {
+            this.flushIntervalMilliseconds = flushIntervalMilliseconds;
+            return this;
+        }
+
+        public DDAgentWriterBuilder prioritization(Prioritization prioritization) {
+            this.prioritization = prioritization;
+            return this;
+        }
+
+        public DDAgentWriterBuilder monitoring(Monitoring monitoring) {
+            this.monitoring = monitoring;
+            return this;
+        }
+
+        public DDAgentWriterBuilder traceAgentProtocolVersion(ProtocolVersion protocolVersion) {
+            this.protocolVersion = protocolVersion;
+            return this;
+        }
+
+        public DDAgentWriterBuilder nativeMetricsReportingEnabled(boolean nativeMetricsReportingEnabled) {
+            this.nativeMetricsReportingEnabled = nativeMetricsReportingEnabled;
+            return this;
+        }
+
+        public DDAgentWriterBuilder metricsIgnoreAgentVersion(boolean metricsIgnoreAgentVersion) {
+            this.metricsIgnoreAgentVersion = metricsIgnoreAgentVersion;
+            return this;
+        }
+
+        public DDAgentWriterBuilder featureDiscovery(DDAgentFeaturesDiscovery featureDiscovery) {
+            this.featureDiscovery = featureDiscovery;
+            return this;
+        }
+
+        public DDAgentWriterBuilder droppingPolicy(DroppingPolicy droppingPolicy) {
+            this.droppingPolicy = droppingPolicy;
+            return this;
+        }
+
+        public DDAgentWriterBuilder flushTimeout(int flushTimeout, TimeUnit flushTimeoutUnit) {
+            this.flushTimeout = flushTimeout;
+            this.flushTimeoutUnit = flushTimeoutUnit;
+            return this;
+        }
+
+        public DDAgentWriterBuilder alwaysFlush(boolean alwaysFlush) {
+            this.alwaysFlush = alwaysFlush;
+            return this;
+        }
+
+        public DDAgentWriterBuilder spanSamplingRules(SingleSpanSampler singleSpanSampler) {
+            this.singleSpanSampler = singleSpanSampler;
+            return this;
+        }
+
+        public DDAgentWriter build() {
+            final HttpUrl agentUrl = HttpUrl.get("http://" + agentHost + ":" + traceAgentPort);
+            final OkHttpClient client = null == featureDiscovery || null == agentApi
+                    ? buildHttpClient(true, unixDomainSocket, namedPipe, timeoutMillis)
+                    : null;
+            if (null == featureDiscovery) {
+                featureDiscovery = new DDAgentFeaturesDiscovery(
+                        client,
+                        monitoring,
+                        agentUrl,
+                        protocolVersion,
+                        nativeMetricsReportingEnabled,
+                        metricsIgnoreAgentVersion);
+            }
+            if (null == agentApi) {
+                agentApi =
+                        new DDAgentApi(client, agentUrl, featureDiscovery, monitoring, nativeMetricsReportingEnabled);
+            }
+
+            final DDAgentMapperDiscovery mapperDiscovery = new DDAgentMapperDiscovery(featureDiscovery);
+            final PayloadDispatcher dispatcher =
+                    new PayloadDispatcherImpl(mapperDiscovery, agentApi, healthMetrics, monitoring);
+            final TraceProcessingWorker traceProcessingWorker = new TraceProcessingWorker(
+                    traceBufferSize,
+                    healthMetrics,
+                    dispatcher,
+                    // allow custom dropping policy for OTLP; otherwise fall back to feature discovery
+                    droppingPolicy != null ? droppingPolicy : featureDiscovery,
+                    null == prioritization ? FAST_LANE : prioritization,
+                    flushIntervalMilliseconds,
+                    TimeUnit.MILLISECONDS,
+                    singleSpanSampler);
+
+            return new DDAgentWriter(
+                    traceProcessingWorker, dispatcher, healthMetrics, flushTimeout, flushTimeoutUnit, alwaysFlush);
+        }
+    }
+
+    DDAgentWriter(
+            TraceProcessingWorker worker,
+            PayloadDispatcher dispatcher,
+            HealthMetrics healthMetrics,
+            int flushTimeout,
+            TimeUnit flushTimeoutUnit,
+            boolean alwaysFlush) {
+        super(worker, dispatcher, healthMetrics, flushTimeout, flushTimeoutUnit, alwaysFlush);
     }
-
-    public DDAgentWriterBuilder agentHost(String agentHost) {
-      this.agentHost = agentHost;
-      return this;
-    }
-
-    public DDAgentWriterBuilder traceAgentPort(int traceAgentPort) {
-      this.traceAgentPort = traceAgentPort;
-      return this;
-    }
-
-    public DDAgentWriterBuilder unixDomainSocket(String unixDomainSocket) {
-      this.unixDomainSocket = unixDomainSocket;
-      return this;
-    }
-
-    public DDAgentWriterBuilder namedPipe(String namedPipe) {
-      this.namedPipe = namedPipe;
-      return this;
-    }
-
-    public DDAgentWriterBuilder timeoutMillis(long timeoutMillis) {
-      this.timeoutMillis = timeoutMillis;
-      return this;
-    }
-
-    public DDAgentWriterBuilder traceBufferSize(int traceBufferSize) {
-      this.traceBufferSize = traceBufferSize;
-      return this;
-    }
-
-    public DDAgentWriterBuilder healthMetrics(HealthMetrics healthMetrics) {
-      this.healthMetrics = healthMetrics;
-      return this;
-    }
-
-    public DDAgentWriterBuilder flushIntervalMilliseconds(int flushIntervalMilliseconds) {
-      this.flushIntervalMilliseconds = flushIntervalMilliseconds;
-      return this;
-    }
-
-    public DDAgentWriterBuilder prioritization(Prioritization prioritization) {
-      this.prioritization = prioritization;
-      return this;
-    }
-
-    public DDAgentWriterBuilder monitoring(Monitoring monitoring) {
-      this.monitoring = monitoring;
-      return this;
-    }
-
-    public DDAgentWriterBuilder traceAgentProtocolVersion(ProtocolVersion protocolVersion) {
-      this.protocolVersion = protocolVersion;
-      return this;
-    }
-
-    public DDAgentWriterBuilder nativeMetricsReportingEnabled(
-        boolean nativeMetricsReportingEnabled) {
-      this.nativeMetricsReportingEnabled = nativeMetricsReportingEnabled;
-      return this;
-    }
-
-    public DDAgentWriterBuilder metricsIgnoreAgentVersion(boolean metricsIgnoreAgentVersion) {
-      this.metricsIgnoreAgentVersion = metricsIgnoreAgentVersion;
-      return this;
-    }
-
-    public DDAgentWriterBuilder featureDiscovery(DDAgentFeaturesDiscovery featureDiscovery) {
-      this.featureDiscovery = featureDiscovery;
-      return this;
-    }
-
-    public DDAgentWriterBuilder droppingPolicy(DroppingPolicy droppingPolicy) {
-      this.droppingPolicy = droppingPolicy;
-      return this;
-    }
-
-    public DDAgentWriterBuilder flushTimeout(int flushTimeout, TimeUnit flushTimeoutUnit) {
-      this.flushTimeout = flushTimeout;
-      this.flushTimeoutUnit = flushTimeoutUnit;
-      return this;
-    }
-
-    public DDAgentWriterBuilder alwaysFlush(boolean alwaysFlush) {
-      this.alwaysFlush = alwaysFlush;
-      return this;
-    }
-
-    public DDAgentWriterBuilder spanSamplingRules(SingleSpanSampler singleSpanSampler) {
-      this.singleSpanSampler = singleSpanSampler;
-      return this;
-    }
-
-    public DDAgentWriter build() {
-      final HttpUrl agentUrl = HttpUrl.get("http://" + agentHost + ":" + traceAgentPort);
-      final OkHttpClient client =
-          null == featureDiscovery || null == agentApi
-              ? buildHttpClient(true, unixDomainSocket, namedPipe, timeoutMillis)
-              : null;
-      if (null == featureDiscovery) {
-        featureDiscovery =
-            new DDAgentFeaturesDiscovery(
-                client,
-                monitoring,
-                agentUrl,
-                protocolVersion,
-                nativeMetricsReportingEnabled,
-                metricsIgnoreAgentVersion);
-      }
-      if (null == agentApi) {
-        agentApi =
-            new DDAgentApi(
-                client, agentUrl, featureDiscovery, monitoring, nativeMetricsReportingEnabled);
-      }
-
-      final DDAgentMapperDiscovery mapperDiscovery = new DDAgentMapperDiscovery(featureDiscovery);
-      final PayloadDispatcher dispatcher =
-          new PayloadDispatcherImpl(mapperDiscovery, agentApi, healthMetrics, monitoring);
-      final TraceProcessingWorker traceProcessingWorker =
-          new TraceProcessingWorker(
-              traceBufferSize,
-              healthMetrics,
-              dispatcher,
-              // allow custom dropping policy for OTLP; otherwise fall back to feature discovery
-              droppingPolicy != null ? droppingPolicy : featureDiscovery,
-              null == prioritization ? FAST_LANE : prioritization,
-              flushIntervalMilliseconds,
-              TimeUnit.MILLISECONDS,
-              singleSpanSampler);
-
-      return new DDAgentWriter(
-          traceProcessingWorker,
-          dispatcher,
-          healthMetrics,
-          flushTimeout,
-          flushTimeoutUnit,
-          alwaysFlush);
-    }
-  }
-
-  DDAgentWriter(
-      TraceProcessingWorker worker,
-      PayloadDispatcher dispatcher,
-      HealthMetrics healthMetrics,
-      int flushTimeout,
-      TimeUnit flushTimeoutUnit,
-      boolean alwaysFlush) {
-    super(worker, dispatcher, healthMetrics, flushTimeout, flushTimeoutUnit, alwaysFlush);
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/DDIntakeWriter.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/DDIntakeWriter.java
index c75ef712ae2..14e20292b0e 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/DDIntakeWriter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/DDIntakeWriter.java
@@ -15,148 +15,139 @@
 
 public class DDIntakeWriter extends RemoteWriter {
 
-  public static final String DEFAULT_INTAKE_VERSION = "v2";
-  public static final long DEFAULT_INTAKE_TIMEOUT = 10; // timeout in seconds
-
-  private static final int BUFFER_SIZE = 1024;
-
-  public static DDIntakeWriterBuilder builder() {
-    return new DDIntakeWriterBuilder();
-  }
-
-  public static class DDIntakeWriterBuilder {
-    CiVisibilityWellKnownTags wellKnownTags = Config.get().getCiVisibilityWellKnownTags();
-    int traceBufferSize = BUFFER_SIZE;
-    HealthMetrics healthMetrics = HealthMetrics.NO_OP;
-    int flushIntervalMilliseconds = 1000;
-    Monitoring monitoring = Monitoring.DISABLED;
-    DroppingPolicy droppingPolicy = DroppingPolicy.DISABLED;
-    Prioritization prioritization = Prioritization.FAST_LANE;
-    private int flushTimeout = 5;
-    private TimeUnit flushTimeoutUnit = TimeUnit.SECONDS;
-    private boolean alwaysFlush = false;
-
-    private final Map<TrackType, RemoteApi> tracks = new EnumMap<>(TrackType.class);
-
-    private SingleSpanSampler singleSpanSampler;
-
-    public DDIntakeWriterBuilder addTrack(final TrackType trackType, final RemoteApi intakeApi) {
-      tracks.put(trackType, intakeApi);
-      return this;
-    }
-
-    public DDIntakeWriterBuilder monitoring(final Monitoring monitoring) {
-      this.monitoring = monitoring;
-      return this;
-    }
-
-    public DDIntakeWriterBuilder traceBufferSize(int traceBufferSize) {
-      this.traceBufferSize = traceBufferSize;
-      return this;
-    }
-
-    public DDIntakeWriterBuilder healthMetrics(final HealthMetrics healthMetrics) {
-      this.healthMetrics = healthMetrics;
-      return this;
-    }
-
-    public DDIntakeWriterBuilder flushIntervalMilliseconds(int flushIntervalMilliseconds) {
-      this.flushIntervalMilliseconds = flushIntervalMilliseconds;
-      return this;
-    }
-
-    public DDIntakeWriterBuilder prioritization(final Prioritization prioritization) {
-      this.prioritization = prioritization;
-      return this;
-    }
-
-    public DDIntakeWriterBuilder droppingPolicy(final DroppingPolicy droppingPolicy) {
-      this.droppingPolicy = droppingPolicy;
-      return this;
-    }
-
-    public DDIntakeWriterBuilder wellKnownTags(final CiVisibilityWellKnownTags wellKnownTags) {
-      this.wellKnownTags = wellKnownTags;
-      return this;
-    }
+    public static final String DEFAULT_INTAKE_VERSION = "v2";
+    public static final long DEFAULT_INTAKE_TIMEOUT = 10; // timeout in seconds
 
-    public DDIntakeWriterBuilder alwaysFlush(final boolean alwaysFlush) {
-      this.alwaysFlush = alwaysFlush;
-      return this;
-    }
+    private static final int BUFFER_SIZE = 1024;
 
-    public DDIntakeWriterBuilder flushTimeout(
-        final int flushTimeout, final TimeUnit flushTimeoutUnit) {
-      this.flushTimeout = flushTimeout;
-      this.flushTimeoutUnit = flushTimeoutUnit;
-      return this;
+    public static DDIntakeWriterBuilder builder() {
+        return new DDIntakeWriterBuilder();
     }
 
-    public DDIntakeWriterBuilder singleSpanSampler(SingleSpanSampler singleSpanSampler) {
-      this.singleSpanSampler = singleSpanSampler;
-      return this;
+    public static class DDIntakeWriterBuilder {
+        CiVisibilityWellKnownTags wellKnownTags = Config.get().getCiVisibilityWellKnownTags();
+        int traceBufferSize = BUFFER_SIZE;
+        HealthMetrics healthMetrics = HealthMetrics.NO_OP;
+        int flushIntervalMilliseconds = 1000;
+        Monitoring monitoring = Monitoring.DISABLED;
+        DroppingPolicy droppingPolicy = DroppingPolicy.DISABLED;
+        Prioritization prioritization = Prioritization.FAST_LANE;
+        private int flushTimeout = 5;
+        private TimeUnit flushTimeoutUnit = TimeUnit.SECONDS;
+        private boolean alwaysFlush = false;
+
+        private final Map<TrackType, RemoteApi> tracks = new EnumMap<>(TrackType.class);
+
+        private SingleSpanSampler singleSpanSampler;
+
+        public DDIntakeWriterBuilder addTrack(final TrackType trackType, final RemoteApi intakeApi) {
+            tracks.put(trackType, intakeApi);
+            return this;
+        }
+
+        public DDIntakeWriterBuilder monitoring(final Monitoring monitoring) {
+            this.monitoring = monitoring;
+            return this;
+        }
+
+        public DDIntakeWriterBuilder traceBufferSize(int traceBufferSize) {
+            this.traceBufferSize = traceBufferSize;
+            return this;
+        }
+
+        public DDIntakeWriterBuilder healthMetrics(final HealthMetrics healthMetrics) {
+            this.healthMetrics = healthMetrics;
+            return this;
+        }
+
+        public DDIntakeWriterBuilder flushIntervalMilliseconds(int flushIntervalMilliseconds) {
+            this.flushIntervalMilliseconds = flushIntervalMilliseconds;
+            return this;
+        }
+
+        public DDIntakeWriterBuilder prioritization(final Prioritization prioritization) {
+            this.prioritization = prioritization;
+            return this;
+        }
+
+        public DDIntakeWriterBuilder droppingPolicy(final DroppingPolicy droppingPolicy) {
+            this.droppingPolicy = droppingPolicy;
+            return this;
+        }
+
+        public DDIntakeWriterBuilder wellKnownTags(final CiVisibilityWellKnownTags wellKnownTags) {
+            this.wellKnownTags = wellKnownTags;
+            return this;
+        }
+
+        public DDIntakeWriterBuilder alwaysFlush(final boolean alwaysFlush) {
+            this.alwaysFlush = alwaysFlush;
+            return this;
+        }
+
+        public DDIntakeWriterBuilder flushTimeout(final int flushTimeout, final TimeUnit flushTimeoutUnit) {
+            this.flushTimeout = flushTimeout;
+            this.flushTimeoutUnit = flushTimeoutUnit;
+            return this;
+        }
+
+        public DDIntakeWriterBuilder singleSpanSampler(SingleSpanSampler singleSpanSampler) {
+            this.singleSpanSampler = singleSpanSampler;
+            return this;
+        }
+
+        public DDIntakeWriter build() {
+            if (tracks.isEmpty()) {
+                throw new IllegalArgumentException("At least one track needs to be configured");
+            }
+
+            PayloadDispatcher dispatcher;
+            if (tracks.size() == 1) {
+                dispatcher = createDispatcher(tracks.entrySet().iterator().next());
+            } else {
+                PayloadDispatcher[] dispatchers =
+                        tracks.entrySet().stream().map(this::createDispatcher).toArray(PayloadDispatcher[]::new);
+                dispatcher = new CompositePayloadDispatcher(dispatchers);
+            }
+
+            final TraceProcessingWorker traceProcessingWorker = new TraceProcessingWorker(
+                    traceBufferSize,
+                    healthMetrics,
+                    dispatcher,
+                    droppingPolicy,
+                    prioritization,
+                    flushIntervalMilliseconds,
+                    TimeUnit.MILLISECONDS,
+                    singleSpanSampler);
+
+            return new DDIntakeWriter(
+                    traceProcessingWorker, dispatcher, healthMetrics, flushTimeout, flushTimeoutUnit, alwaysFlush);
+        }
+
+        private PayloadDispatcher createDispatcher(Map.Entry<TrackType, RemoteApi> e) {
+            TrackType trackType = e.getKey();
+            RemoteApi intakeApi = e.getValue();
+            DDIntakeMapperDiscovery mapperDiscovery =
+                    new DDIntakeMapperDiscovery(trackType, wellKnownTags, intakeApi.isCompressionEnabled());
+            return new PayloadDispatcherImpl(mapperDiscovery, intakeApi, healthMetrics, monitoring);
+        }
     }
 
-    public DDIntakeWriter build() {
-      if (tracks.isEmpty()) {
-        throw new IllegalArgumentException("At least one track needs to be configured");
-      }
-
-      PayloadDispatcher dispatcher;
-      if (tracks.size() == 1) {
-        dispatcher = createDispatcher(tracks.entrySet().iterator().next());
-      } else {
-        PayloadDispatcher[] dispatchers =
-            tracks.entrySet().stream()
-                .map(this::createDispatcher)
-                .toArray(PayloadDispatcher[]::new);
-        dispatcher = new CompositePayloadDispatcher(dispatchers);
-      }
-
-      final TraceProcessingWorker traceProcessingWorker =
-          new TraceProcessingWorker(
-              traceBufferSize,
-              healthMetrics,
-              dispatcher,
-              droppingPolicy,
-              prioritization,
-              flushIntervalMilliseconds,
-              TimeUnit.MILLISECONDS,
-              singleSpanSampler);
-
-      return new DDIntakeWriter(
-          traceProcessingWorker,
-          dispatcher,
-          healthMetrics,
-          flushTimeout,
-          flushTimeoutUnit,
-          alwaysFlush);
+    DDIntakeWriter(
+            TraceProcessingWorker worker,
+            PayloadDispatcher dispatcher,
+            HealthMetrics healthMetrics,
+            int flushTimeout,
+            TimeUnit flushTimeoutUnit,
+            boolean alwaysFlush) {
+        super(worker, dispatcher, healthMetrics, flushTimeout, flushTimeoutUnit, alwaysFlush);
     }
 
-    private PayloadDispatcher createDispatcher(Map.Entry<TrackType, RemoteApi> e) {
-      TrackType trackType = e.getKey();
-      RemoteApi intakeApi = e.getValue();
-      DDIntakeMapperDiscovery mapperDiscovery =
-          new DDIntakeMapperDiscovery(trackType, wellKnownTags, intakeApi.isCompressionEnabled());
-      return new PayloadDispatcherImpl(mapperDiscovery, intakeApi, healthMetrics, monitoring);
+    DDIntakeWriter(
+            TraceProcessingWorker worker,
+            PayloadDispatcher dispatcher,
+            HealthMetrics healthMetrics,
+            boolean alwaysFlush) {
+        super(worker, dispatcher, healthMetrics, alwaysFlush);
     }
-  }
-
-  DDIntakeWriter(
-      TraceProcessingWorker worker,
-      PayloadDispatcher dispatcher,
-      HealthMetrics healthMetrics,
-      int flushTimeout,
-      TimeUnit flushTimeoutUnit,
-      boolean alwaysFlush) {
-    super(worker, dispatcher, healthMetrics, flushTimeout, flushTimeoutUnit, alwaysFlush);
-  }
-
-  DDIntakeWriter(
-      TraceProcessingWorker worker,
-      PayloadDispatcher dispatcher,
-      HealthMetrics healthMetrics,
-      boolean alwaysFlush) {
-    super(worker, dispatcher, healthMetrics, alwaysFlush);
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/DDSpanJsonAdapter.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/DDSpanJsonAdapter.java
index c1e5cb4db1c..f35fca7b7ff 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/DDSpanJsonAdapter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/DDSpanJsonAdapter.java
@@ -14,98 +14,96 @@
 import java.util.Set;
 
 class DDSpanJsonAdapter extends JsonAdapter<DDSpan> {
-  private final boolean hexIds;
+    private final boolean hexIds;
 
-  DDSpanJsonAdapter(final boolean hexIds) {
-    this.hexIds = hexIds;
-  }
-
-  public static Factory buildFactory(final boolean hexIds) {
-    return new Factory() {
-      @Override
-      public JsonAdapter<?> create(
-          final Type type, final Set<? extends Annotation> annotations, final Moshi moshi) {
-        final Class<?> rawType = Types.getRawType(type);
-        if (rawType.isAssignableFrom(DDSpan.class)) {
-          return new DDSpanJsonAdapter(hexIds);
-        }
-        return null;
-      }
-    };
-  }
-
-  @Override
-  public DDSpan fromJson(final JsonReader reader) {
-    throw new UnsupportedOperationException();
-  }
+    DDSpanJsonAdapter(final boolean hexIds) {
+        this.hexIds = hexIds;
+    }
 
-  @Override
-  public void toJson(final com.squareup.moshi.JsonWriter writer, final DDSpan span)
-      throws IOException {
-    writer.beginObject();
-    writer.name("service");
-    writer.value(span.getServiceName());
-    writer.name("name");
-    writer.value(span.getOperationName().toString());
-    writer.name("resource");
-    writer.value(span.getResourceName().toString());
-    writer.name("trace_id");
-    writeTraceId(writer, span.getTraceId());
-    writer.name("span_id");
-    writeSpanId(writer, span.getSpanId());
-    writer.name("parent_id");
-    writeSpanId(writer, span.getParentId());
-    writer.name("start");
-    writer.value(span.getStartTime());
-    writer.name("duration");
-    writer.value(span.getDurationNano());
-    writer.name("type");
-    writer.value(span.getSpanType());
-    writer.name("error");
-    writer.value(span.getError());
-    writer.name("metrics");
-    writer.beginObject();
-    for (final Map.Entry<String, Object> entry : span.getTags().entrySet()) {
-      if (entry.getValue() instanceof Number) {
-        writer.name(entry.getKey());
-        writer.value((Number) entry.getValue());
-      }
+    public static Factory buildFactory(final boolean hexIds) {
+        return new Factory() {
+            @Override
+            public JsonAdapter<?> create(
+                    final Type type, final Set<? extends Annotation> annotations, final Moshi moshi) {
+                final Class<?> rawType = Types.getRawType(type);
+                if (rawType.isAssignableFrom(DDSpan.class)) {
+                    return new DDSpanJsonAdapter(hexIds);
+                }
+                return null;
+            }
+        };
     }
-    writer.endObject();
-    writer.name("meta");
-    writer.beginObject();
-    final Map<String, Object> tags = span.getTags();
-    for (final Map.Entry<String, String> entry : span.spanContext().getBaggageItems().entrySet()) {
-      if (!tags.containsKey(entry.getKey())) {
-        writer.name(entry.getKey());
-        writer.value(entry.getValue());
-      }
+
+    @Override
+    public DDSpan fromJson(final JsonReader reader) {
+        throw new UnsupportedOperationException();
     }
-    for (final Map.Entry<String, Object> entry : tags.entrySet()) {
-      if (!(entry.getValue() instanceof Number)) {
-        writer.name(entry.getKey());
-        writer.value(String.valueOf(entry.getValue()));
-      }
+
+    @Override
+    public void toJson(final com.squareup.moshi.JsonWriter writer, final DDSpan span) throws IOException {
+        writer.beginObject();
+        writer.name("service");
+        writer.value(span.getServiceName());
+        writer.name("name");
+        writer.value(span.getOperationName().toString());
+        writer.name("resource");
+        writer.value(span.getResourceName().toString());
+        writer.name("trace_id");
+        writeTraceId(writer, span.getTraceId());
+        writer.name("span_id");
+        writeSpanId(writer, span.getSpanId());
+        writer.name("parent_id");
+        writeSpanId(writer, span.getParentId());
+        writer.name("start");
+        writer.value(span.getStartTime());
+        writer.name("duration");
+        writer.value(span.getDurationNano());
+        writer.name("type");
+        writer.value(span.getSpanType());
+        writer.name("error");
+        writer.value(span.getError());
+        writer.name("metrics");
+        writer.beginObject();
+        for (final Map.Entry<String, Object> entry : span.getTags().entrySet()) {
+            if (entry.getValue() instanceof Number) {
+                writer.name(entry.getKey());
+                writer.value((Number) entry.getValue());
+            }
+        }
+        writer.endObject();
+        writer.name("meta");
+        writer.beginObject();
+        final Map<String, Object> tags = span.getTags();
+        for (final Map.Entry<String, String> entry :
+                span.spanContext().getBaggageItems().entrySet()) {
+            if (!tags.containsKey(entry.getKey())) {
+                writer.name(entry.getKey());
+                writer.value(entry.getValue());
+            }
+        }
+        for (final Map.Entry<String, Object> entry : tags.entrySet()) {
+            if (!(entry.getValue() instanceof Number)) {
+                writer.name(entry.getKey());
+                writer.value(String.valueOf(entry.getValue()));
+            }
+        }
+        writer.endObject();
+        writer.endObject();
     }
-    writer.endObject();
-    writer.endObject();
-  }
 
-  private void writeTraceId(final com.squareup.moshi.JsonWriter writer, final DDTraceId id)
-      throws IOException {
-    if (hexIds) {
-      writer.value(id.toHexString());
-    } else {
-      writer.value(id.toLong());
+    private void writeTraceId(final com.squareup.moshi.JsonWriter writer, final DDTraceId id) throws IOException {
+        if (hexIds) {
+            writer.value(id.toHexString());
+        } else {
+            writer.value(id.toLong());
+        }
     }
-  }
 
-  private void writeSpanId(final com.squareup.moshi.JsonWriter writer, final long id)
-      throws IOException {
-    if (hexIds) {
-      writer.value(DDSpanId.toHexString(id));
-    } else {
-      writer.value(id);
+    private void writeSpanId(final com.squareup.moshi.JsonWriter writer, final long id) throws IOException {
+        if (hexIds) {
+            writer.value(DDSpanId.toHexString(id));
+        } else {
+            writer.value(id);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/FileBasedPayloadDispatcher.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/FileBasedPayloadDispatcher.java
index 0733d9a9a04..4e6b06bd458 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/FileBasedPayloadDispatcher.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/FileBasedPayloadDispatcher.java
@@ -53,360 +53,353 @@
  */
 public class FileBasedPayloadDispatcher implements PayloadDispatcher {
 
-  private static final Logger log = LoggerFactory.getLogger(FileBasedPayloadDispatcher.class);
-
-  private static final Collection<String> TOP_LEVEL_TAGS =
-      Arrays.asList(
-          Tags.TEST_SESSION_ID, Tags.TEST_MODULE_ID, Tags.TEST_SUITE_ID, Tags.ITR_CORRELATION_ID);
-
-  /** Tag prefixes excluded from file-based payloads to avoid Bazel cache invalidation. */
-  private static final String[] EXCLUDED_TAG_PREFIXES = {"ci.", "git.", "runtime.", "os."};
-
-  private static final Set<String> EXCLUDED_TAGS =
-      new HashSet<>(Arrays.asList("runtime-id", "pr.number"));
-
-  private final File outputDir;
-  private final String filePrefix;
-  private final TrackType trackType;
-  private final CiVisibilityWellKnownTags wellKnownTags =
-      Config.get().getCiVisibilityWellKnownTags();
-  private final List<String> serializedEvents = new ArrayList<>();
-  private final AtomicLong sequence = new AtomicLong(0);
-
-  public FileBasedPayloadDispatcher(String outputDirPath, String filePrefix, TrackType trackType) {
-    this.outputDir = new File(outputDirPath);
-    this.filePrefix = filePrefix;
-    this.trackType = trackType;
-  }
-
-  private static TestReport getTestReport(CoreSpan<?> span) {
-    if (span instanceof AgentSpan) {
-      TestContext test =
-          ((AgentSpan) span).getRequestContext().getData(RequestContextSlot.CI_VISIBILITY);
-      if (test != null) {
-        TestReportHolder probes = test.getCoverageStore();
-        if (probes != null) {
-          return probes.getReport();
-        }
-      }
-    }
-    return null;
-  }
+    private static final Logger log = LoggerFactory.getLogger(FileBasedPayloadDispatcher.class);
 
-  private static boolean isExcludedTag(String key) {
-    if (EXCLUDED_TAGS.contains(key)) {
-      return true;
-    }
-    for (String prefix : EXCLUDED_TAG_PREFIXES) {
-      if (key.startsWith(prefix)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  private static boolean charSeqEquals(CharSequence a, CharSequence b) {
-    return a == null && b == null
-        || a != null && b != null && Objects.equals(a.toString(), b.toString());
-  }
-
-  @Override
-  public void onDroppedTrace(int spanCount) {
-    // no-op
-  }
-
-  @Override
-  public void addTrace(List<? extends CoreSpan<?>> trace) {
-    if (trace.isEmpty()) {
-      return;
+    private static final Collection<String> TOP_LEVEL_TAGS =
+            Arrays.asList(Tags.TEST_SESSION_ID, Tags.TEST_MODULE_ID, Tags.TEST_SUITE_ID, Tags.ITR_CORRELATION_ID);
+
+    /** Tag prefixes excluded from file-based payloads to avoid Bazel cache invalidation. */
+    private static final String[] EXCLUDED_TAG_PREFIXES = {"ci.", "git.", "runtime.", "os."};
+
+    private static final Set<String> EXCLUDED_TAGS = new HashSet<>(Arrays.asList("runtime-id", "pr.number"));
+
+    private final File outputDir;
+    private final String filePrefix;
+    private final TrackType trackType;
+    private final CiVisibilityWellKnownTags wellKnownTags = Config.get().getCiVisibilityWellKnownTags();
+    private final List<String> serializedEvents = new ArrayList<>();
+    private final AtomicLong sequence = new AtomicLong(0);
+
+    public FileBasedPayloadDispatcher(String outputDirPath, String filePrefix, TrackType trackType) {
+        this.outputDir = new File(outputDirPath);
+        this.filePrefix = filePrefix;
+        this.trackType = trackType;
     }
 
-    if (trackType == TrackType.CITESTCYCLE) {
-      for (CoreSpan<?> span : trace) {
-        String json = serializeTestEvent(span);
-        if (json != null) {
-          serializedEvents.add(json);
+    private static TestReport getTestReport(CoreSpan<?> span) {
+        if (span instanceof AgentSpan) {
+            TestContext test = ((AgentSpan) span).getRequestContext().getData(RequestContextSlot.CI_VISIBILITY);
+            if (test != null) {
+                TestReportHolder probes = test.getCoverageStore();
+                if (probes != null) {
+                    return probes.getReport();
+                }
+            }
         }
-      }
-    } else if (trackType == TrackType.CITESTCOV) {
-      for (CoreSpan<?> span : trace) {
-        String json = serializeCoverageEvent(span);
-        if (json != null) {
-          serializedEvents.add(json);
-        }
-      }
+        return null;
     }
-  }
 
-  @Override
-  public void flush() {
-    if (serializedEvents.isEmpty()) {
-      return;
+    private static boolean isExcludedTag(String key) {
+        if (EXCLUDED_TAGS.contains(key)) {
+            return true;
+        }
+        for (String prefix : EXCLUDED_TAG_PREFIXES) {
+            if (key.startsWith(prefix)) {
+                return true;
+            }
+        }
+        return false;
     }
 
-    try {
-      ensureOutputDir();
-
-      JsonWriter doc = new JsonWriter(false);
-      doc.beginObject();
-
-      if (trackType == TrackType.CITESTCYCLE) {
-        doc.name("version").value(1);
-        doc.name("metadata");
-        doc.beginObject();
-        doc.name("*");
-        doc.beginObject();
-        doc.name("env").value(wellKnownTags.getEnv().toString());
-        doc.name("language").value(wellKnownTags.getLanguage().toString());
-        doc.name("test_is_user_provided_service")
-            .value(wellKnownTags.getIsUserProvidedService().toString());
-        doc.endObject();
-        doc.endObject();
-        doc.name("events");
-      } else {
-        doc.name("version").value(2);
-        doc.name("coverages");
-      }
-
-      doc.beginArray();
-      for (String event : serializedEvents) {
-        doc.jsonValue(event);
-      }
-      doc.endArray();
-      doc.endObject();
-
-      writeFileAtomically(doc.toByteArray());
-    } catch (IOException e) {
-      log.error("[bazel mode] Failed to write payload file to {}", outputDir, e);
-    } finally {
-      serializedEvents.clear();
-    }
-  }
-
-  @Override
-  public Collection<RemoteApi> getApis() {
-    return Collections.emptyList();
-  }
-
-  private String serializeTestEvent(CoreSpan<?> span) {
-    DDTraceId testSessionId = span.getTag(Tags.TEST_SESSION_ID);
-    Number testModuleId = span.getTag(Tags.TEST_MODULE_ID);
-    Number testSuiteId = span.getTag(Tags.TEST_SUITE_ID);
-    String itrCorrelationId = span.getTag(Tags.ITR_CORRELATION_ID);
-
-    CharSequence type;
-    Long traceId;
-    Long spanId;
-    Long parentId;
-    int version;
-    CharSequence spanType = span.getType();
-    if (charSeqEquals(InternalSpanTypes.TEST, spanType)) {
-      type = InternalSpanTypes.TEST;
-      traceId = span.getTraceId().toLong();
-      spanId = span.getSpanId();
-      parentId = span.getParentId();
-      version = (testSessionId != null || testModuleId != null || testSuiteId != null) ? 2 : 1;
-    } else if (charSeqEquals(InternalSpanTypes.TEST_SUITE_END, spanType)) {
-      type = InternalSpanTypes.TEST_SUITE_END;
-      traceId = null;
-      spanId = null;
-      parentId = null;
-      version = 1;
-    } else if (charSeqEquals(InternalSpanTypes.TEST_MODULE_END, spanType)) {
-      type = InternalSpanTypes.TEST_MODULE_END;
-      traceId = null;
-      spanId = null;
-      parentId = null;
-      version = 1;
-    } else if (charSeqEquals(InternalSpanTypes.TEST_SESSION_END, spanType)) {
-      type = InternalSpanTypes.TEST_SESSION_END;
-      traceId = null;
-      spanId = null;
-      parentId = null;
-      version = 1;
-    } else {
-      type = "span";
-      traceId = span.getTraceId().toLong();
-      spanId = span.getSpanId();
-      parentId = span.getParentId();
-      version = 1;
+    private static boolean charSeqEquals(CharSequence a, CharSequence b) {
+        return a == null && b == null || a != null && b != null && Objects.equals(a.toString(), b.toString());
     }
 
-    JsonWriter w = new JsonWriter(false);
-    w.beginObject();
-    w.name("type").value(type.toString());
-    w.name("version").value(version);
-    w.name("content");
-    w.beginObject();
-
-    // trace/span/parent ids are unsigned 64-bit integers; emit as raw JSON numbers
-    // (value(long) would reinterpret ids >= 2^63 as negative signed longs).
-    if (traceId != null) {
-      w.name("trace_id").jsonValue(Long.toUnsignedString(traceId));
-    }
-    if (spanId != null) {
-      w.name("span_id").jsonValue(Long.toUnsignedString(spanId));
-    }
-    if (parentId != null) {
-      w.name("parent_id").jsonValue(Long.toUnsignedString(parentId));
-    }
-    if (testSessionId != null) {
-      w.name(Tags.TEST_SESSION_ID).value(testSessionId.toLong());
-    }
-    if (testModuleId != null) {
-      w.name(Tags.TEST_MODULE_ID).value(testModuleId.longValue());
-    }
-    if (testSuiteId != null) {
-      w.name(Tags.TEST_SUITE_ID).value(testSuiteId.longValue());
-    }
-    if (itrCorrelationId != null) {
-      w.name(Tags.ITR_CORRELATION_ID).value(itrCorrelationId);
+    @Override
+    public void onDroppedTrace(int spanCount) {
+        // no-op
     }
 
-    w.name("service").value(span.getServiceName());
-    w.name("name").value(String.valueOf(span.getOperationName()));
-    w.name("resource").value(String.valueOf(span.getResourceName()));
-    w.name("start").value(span.getStartTime());
-    w.name("duration").value(span.getDurationNano());
-    w.name("error").value(span.getError());
+    @Override
+    public void addTrace(List<? extends CoreSpan<?>> trace) {
+        if (trace.isEmpty()) {
+            return;
+        }
 
-    span.processTagsAndBaggage(new JsonMetaWriter(w));
+        if (trackType == TrackType.CITESTCYCLE) {
+            for (CoreSpan<?> span : trace) {
+                String json = serializeTestEvent(span);
+                if (json != null) {
+                    serializedEvents.add(json);
+                }
+            }
+        } else if (trackType == TrackType.CITESTCOV) {
+            for (CoreSpan<?> span : trace) {
+                String json = serializeCoverageEvent(span);
+                if (json != null) {
+                    serializedEvents.add(json);
+                }
+            }
+        }
+    }
 
-    w.endObject(); // content
-    w.endObject(); // event
-    return w.toString();
-  }
+    @Override
+    public void flush() {
+        if (serializedEvents.isEmpty()) {
+            return;
+        }
 
-  private String serializeCoverageEvent(CoreSpan<?> span) {
-    CharSequence type = span.getType();
-    if (type == null || !type.toString().contentEquals(InternalSpanTypes.TEST)) {
-      return null;
+        try {
+            ensureOutputDir();
+
+            JsonWriter doc = new JsonWriter(false);
+            doc.beginObject();
+
+            if (trackType == TrackType.CITESTCYCLE) {
+                doc.name("version").value(1);
+                doc.name("metadata");
+                doc.beginObject();
+                doc.name("*");
+                doc.beginObject();
+                doc.name("env").value(wellKnownTags.getEnv().toString());
+                doc.name("language").value(wellKnownTags.getLanguage().toString());
+                doc.name("test_is_user_provided_service")
+                        .value(wellKnownTags.getIsUserProvidedService().toString());
+                doc.endObject();
+                doc.endObject();
+                doc.name("events");
+            } else {
+                doc.name("version").value(2);
+                doc.name("coverages");
+            }
+
+            doc.beginArray();
+            for (String event : serializedEvents) {
+                doc.jsonValue(event);
+            }
+            doc.endArray();
+            doc.endObject();
+
+            writeFileAtomically(doc.toByteArray());
+        } catch (IOException e) {
+            log.error("[bazel mode] Failed to write payload file to {}", outputDir, e);
+        } finally {
+            serializedEvents.clear();
+        }
     }
 
-    TestReport testReport = getTestReport(span);
-    if (testReport == null || !testReport.isNotEmpty()) {
-      return null;
+    @Override
+    public Collection<RemoteApi> getApis() {
+        return Collections.emptyList();
     }
 
-    JsonWriter w = new JsonWriter(false);
-    w.beginObject();
+    private String serializeTestEvent(CoreSpan<?> span) {
+        DDTraceId testSessionId = span.getTag(Tags.TEST_SESSION_ID);
+        Number testModuleId = span.getTag(Tags.TEST_MODULE_ID);
+        Number testSuiteId = span.getTag(Tags.TEST_SUITE_ID);
+        String itrCorrelationId = span.getTag(Tags.ITR_CORRELATION_ID);
+
+        CharSequence type;
+        Long traceId;
+        Long spanId;
+        Long parentId;
+        int version;
+        CharSequence spanType = span.getType();
+        if (charSeqEquals(InternalSpanTypes.TEST, spanType)) {
+            type = InternalSpanTypes.TEST;
+            traceId = span.getTraceId().toLong();
+            spanId = span.getSpanId();
+            parentId = span.getParentId();
+            version = (testSessionId != null || testModuleId != null || testSuiteId != null) ? 2 : 1;
+        } else if (charSeqEquals(InternalSpanTypes.TEST_SUITE_END, spanType)) {
+            type = InternalSpanTypes.TEST_SUITE_END;
+            traceId = null;
+            spanId = null;
+            parentId = null;
+            version = 1;
+        } else if (charSeqEquals(InternalSpanTypes.TEST_MODULE_END, spanType)) {
+            type = InternalSpanTypes.TEST_MODULE_END;
+            traceId = null;
+            spanId = null;
+            parentId = null;
+            version = 1;
+        } else if (charSeqEquals(InternalSpanTypes.TEST_SESSION_END, spanType)) {
+            type = InternalSpanTypes.TEST_SESSION_END;
+            traceId = null;
+            spanId = null;
+            parentId = null;
+            version = 1;
+        } else {
+            type = "span";
+            traceId = span.getTraceId().toLong();
+            spanId = span.getSpanId();
+            parentId = span.getParentId();
+            version = 1;
+        }
 
-    DDTraceId testSessionId = testReport.getTestSessionId();
-    if (testSessionId != null) {
-      w.name("test_session_id").value(testSessionId.toLong());
-    }
-    Long testSuiteId = testReport.getTestSuiteId();
-    if (testSuiteId != null) {
-      w.name("test_suite_id").value(testSuiteId);
-    }
-    w.name("span_id").value(testReport.getSpanId());
-
-    w.name("files");
-    w.beginArray();
-    for (TestReportFileEntry entry : testReport.getTestReportFileEntries()) {
-      w.beginObject();
-      w.name("filename").value(entry.getSourceFileName());
-      BitSet coveredLines = entry.getCoveredLines();
-      if (coveredLines != null) {
-        w.name("bitmap").value(Base64.getEncoder().encodeToString(coveredLines.toByteArray()));
-      }
-      w.endObject();
-    }
-    w.endArray();
+        JsonWriter w = new JsonWriter(false);
+        w.beginObject();
+        w.name("type").value(type.toString());
+        w.name("version").value(version);
+        w.name("content");
+        w.beginObject();
+
+        // trace/span/parent ids are unsigned 64-bit integers; emit as raw JSON numbers
+        // (value(long) would reinterpret ids >= 2^63 as negative signed longs).
+        if (traceId != null) {
+            w.name("trace_id").jsonValue(Long.toUnsignedString(traceId));
+        }
+        if (spanId != null) {
+            w.name("span_id").jsonValue(Long.toUnsignedString(spanId));
+        }
+        if (parentId != null) {
+            w.name("parent_id").jsonValue(Long.toUnsignedString(parentId));
+        }
+        if (testSessionId != null) {
+            w.name(Tags.TEST_SESSION_ID).value(testSessionId.toLong());
+        }
+        if (testModuleId != null) {
+            w.name(Tags.TEST_MODULE_ID).value(testModuleId.longValue());
+        }
+        if (testSuiteId != null) {
+            w.name(Tags.TEST_SUITE_ID).value(testSuiteId.longValue());
+        }
+        if (itrCorrelationId != null) {
+            w.name(Tags.ITR_CORRELATION_ID).value(itrCorrelationId);
+        }
 
-    w.endObject();
-    return w.toString();
-  }
+        w.name("service").value(span.getServiceName());
+        w.name("name").value(String.valueOf(span.getOperationName()));
+        w.name("resource").value(String.valueOf(span.getResourceName()));
+        w.name("start").value(span.getStartTime());
+        w.name("duration").value(span.getDurationNano());
+        w.name("error").value(span.getError());
 
-  private void ensureOutputDir() throws IOException {
-    if (!outputDir.exists() && !outputDir.mkdirs() && !outputDir.exists()) {
-      throw new IOException("Failed to create output directory: " + outputDir);
+        span.processTagsAndBaggage(new JsonMetaWriter(w));
+
+        w.endObject(); // content
+        w.endObject(); // event
+        return w.toString();
     }
-  }
 
-  private void writeFileAtomically(byte[] data) throws IOException {
-    long timestampNs = System.nanoTime();
-    long pid = PidHelper.getPidAsLong();
-    long seq = sequence.getAndIncrement();
+    private String serializeCoverageEvent(CoreSpan<?> span) {
+        CharSequence type = span.getType();
+        if (type == null || !type.toString().contentEquals(InternalSpanTypes.TEST)) {
+            return null;
+        }
 
-    String filename = String.format("%s-%d-%d-%d.json", filePrefix, timestampNs, pid, seq);
-    File target = new File(outputDir, filename);
-    File tmp = new File(outputDir, filename + ".tmp");
+        TestReport testReport = getTestReport(span);
+        if (testReport == null || !testReport.isNotEmpty()) {
+            return null;
+        }
 
-    try (FileOutputStream out = new FileOutputStream(tmp)) {
-      out.write(data);
-    }
-    if (!tmp.renameTo(target)) {
-      tmp.delete();
-      throw new IOException("Failed to rename " + tmp + " to " + target);
+        JsonWriter w = new JsonWriter(false);
+        w.beginObject();
+
+        DDTraceId testSessionId = testReport.getTestSessionId();
+        if (testSessionId != null) {
+            w.name("test_session_id").value(testSessionId.toLong());
+        }
+        Long testSuiteId = testReport.getTestSuiteId();
+        if (testSuiteId != null) {
+            w.name("test_suite_id").value(testSuiteId);
+        }
+        w.name("span_id").value(testReport.getSpanId());
+
+        w.name("files");
+        w.beginArray();
+        for (TestReportFileEntry entry : testReport.getTestReportFileEntries()) {
+            w.beginObject();
+            w.name("filename").value(entry.getSourceFileName());
+            BitSet coveredLines = entry.getCoveredLines();
+            if (coveredLines != null) {
+                w.name("bitmap").value(Base64.getEncoder().encodeToString(coveredLines.toByteArray()));
+            }
+            w.endObject();
+        }
+        w.endArray();
+
+        w.endObject();
+        return w.toString();
     }
 
-    if (log.isDebugEnabled()) {
-      log.debug("[bazel mode] Wrote payload file: {} ({} bytes)", target, data.length);
+    private void ensureOutputDir() throws IOException {
+        if (!outputDir.exists() && !outputDir.mkdirs() && !outputDir.exists()) {
+            throw new IOException("Failed to create output directory: " + outputDir);
+        }
     }
-  }
 
-  /** Writes span meta/metrics as JSON, filtering out CI/Git/OS/Runtime tags. */
-  private static final class JsonMetaWriter implements MetadataConsumer {
-    private final JsonWriter w;
+    private void writeFileAtomically(byte[] data) throws IOException {
+        long timestampNs = System.nanoTime();
+        long pid = PidHelper.getPidAsLong();
+        long seq = sequence.getAndIncrement();
 
-    JsonMetaWriter(JsonWriter w) {
-      this.w = w;
-    }
+        String filename = String.format("%s-%d-%d-%d.json", filePrefix, timestampNs, pid, seq);
+        File target = new File(outputDir, filename);
+        File tmp = new File(outputDir, filename + ".tmp");
+
+        try (FileOutputStream out = new FileOutputStream(tmp)) {
+            out.write(data);
+        }
+        if (!tmp.renameTo(target)) {
+            tmp.delete();
+            throw new IOException("Failed to rename " + tmp + " to " + target);
+        }
 
-    private static void writeNumber(JsonWriter w, Number n) {
-      if (n instanceof Double) {
-        w.value(n.doubleValue());
-      } else if (n instanceof Float) {
-        w.value(n.floatValue());
-      } else {
-        w.value(n.longValue());
-      }
+        if (log.isDebugEnabled()) {
+            log.debug("[bazel mode] Wrote payload file: {} ({} bytes)", target, data.length);
+        }
     }
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public void accept(Metadata metadata) {
-      TagMap tags = metadata.getTags().copy();
-      for (String topLevel : TOP_LEVEL_TAGS) {
-        tags.remove(topLevel);
-      }
-
-      w.name("metrics");
-      w.beginObject();
-      for (Map.Entry<String, Object> entry : tags.entrySet()) {
-        if (entry.getValue() instanceof Number && !isExcludedTag(entry.getKey())) {
-          w.name(entry.getKey());
-          writeNumber(w, (Number) entry.getValue());
+    /** Writes span meta/metrics as JSON, filtering out CI/Git/OS/Runtime tags. */
+    private static final class JsonMetaWriter implements MetadataConsumer {
+        private final JsonWriter w;
+
+        JsonMetaWriter(JsonWriter w) {
+            this.w = w;
         }
-      }
-      w.endObject();
-
-      w.name("meta");
-      w.beginObject();
-      for (Map.Entry<String, String> entry : metadata.getBaggage().entrySet()) {
-        if (!isExcludedTag(entry.getKey())) {
-          w.name(entry.getKey()).value(truncate(entry.getValue(), MAX_META_STRING_VALUE_LENGTH));
+
+        private static void writeNumber(JsonWriter w, Number n) {
+            if (n instanceof Double) {
+                w.value(n.doubleValue());
+            } else if (n instanceof Float) {
+                w.value(n.floatValue());
+            } else {
+                w.value(n.longValue());
+            }
         }
-      }
-      if (metadata.getHttpStatusCode() != UNSET_STATUS) {
-        w.name(Tags.HTTP_STATUS)
-            .value(
-                truncate(
-                    metadata.getHttpStatusCodeString().toString(), MAX_META_STRING_VALUE_LENGTH));
-      }
-      for (Map.Entry<String, Object> entry : tags.entrySet()) {
-        Object value = entry.getValue();
-        if (!(value instanceof Number) && !isExcludedTag(entry.getKey())) {
-          w.name(entry.getKey());
-          if (value instanceof Iterable) {
-            w.value(truncate(toJson((Collection<String>) value), MAX_META_STRING_VALUE_LENGTH));
-          } else {
-            w.value(truncate(String.valueOf(value), MAX_META_STRING_VALUE_LENGTH));
-          }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public void accept(Metadata metadata) {
+            TagMap tags = metadata.getTags().copy();
+            for (String topLevel : TOP_LEVEL_TAGS) {
+                tags.remove(topLevel);
+            }
+
+            w.name("metrics");
+            w.beginObject();
+            for (Map.Entry<String, Object> entry : tags.entrySet()) {
+                if (entry.getValue() instanceof Number && !isExcludedTag(entry.getKey())) {
+                    w.name(entry.getKey());
+                    writeNumber(w, (Number) entry.getValue());
+                }
+            }
+            w.endObject();
+
+            w.name("meta");
+            w.beginObject();
+            for (Map.Entry<String, String> entry : metadata.getBaggage().entrySet()) {
+                if (!isExcludedTag(entry.getKey())) {
+                    w.name(entry.getKey()).value(truncate(entry.getValue(), MAX_META_STRING_VALUE_LENGTH));
+                }
+            }
+            if (metadata.getHttpStatusCode() != UNSET_STATUS) {
+                w.name(Tags.HTTP_STATUS)
+                        .value(truncate(metadata.getHttpStatusCodeString().toString(), MAX_META_STRING_VALUE_LENGTH));
+            }
+            for (Map.Entry<String, Object> entry : tags.entrySet()) {
+                Object value = entry.getValue();
+                if (!(value instanceof Number) && !isExcludedTag(entry.getKey())) {
+                    w.name(entry.getKey());
+                    if (value instanceof Iterable) {
+                        w.value(truncate(toJson((Collection<String>) value), MAX_META_STRING_VALUE_LENGTH));
+                    } else {
+                        w.value(truncate(String.valueOf(value), MAX_META_STRING_VALUE_LENGTH));
+                    }
+                }
+            }
+            w.endObject();
         }
-      }
-      w.endObject();
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ListWriter.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ListWriter.java
index 7c151dab5c4..9efdcee1a6d 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ListWriter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ListWriter.java
@@ -18,162 +18,161 @@
 
 /** List writer used by tests mostly */
 public class ListWriter extends CopyOnWriteArrayList<List<DDSpan>> implements Writer {
-  private static final Logger log = LoggerFactory.getLogger(ListWriter.class);
-  private static final Filter ACCEPT_ALL = trace -> true;
+    private static final Logger log = LoggerFactory.getLogger(ListWriter.class);
+    private static final Filter ACCEPT_ALL = trace -> true;
 
-  private final AtomicInteger traceCount = new AtomicInteger();
-  private final TraceStructureWriter structureWriter = new TraceStructureWriter(true);
-  private final Object monitor = new Object();
+    private final AtomicInteger traceCount = new AtomicInteger();
+    private final TraceStructureWriter structureWriter = new TraceStructureWriter(true);
+    private final Object monitor = new Object();
 
-  private Filter filter = ACCEPT_ALL;
+    private Filter filter = ACCEPT_ALL;
 
-  private MetadataConsumer metadataConsumer = MetadataConsumer.NO_OP;
+    private MetadataConsumer metadataConsumer = MetadataConsumer.NO_OP;
 
-  public List<DDSpan> firstTrace() {
-    return get(0);
-  }
+    public List<DDSpan> firstTrace() {
+        return get(0);
+    }
+
+    public int getTraceCount() {
+        return traceCount.get();
+    }
+
+    @SuppressFBWarnings("NN_NAKED_NOTIFY")
+    @Override
+    public void write(List<DDSpan> trace) {
+        if (!filter.accept(trace)) {
+            return;
+        }
+        for (DDSpan span : trace) {
+            // This is needed to properly do all delayed processing to make this writer even
+            // remotely realistic so the test actually test something
+            span.processTagsAndBaggage(metadataConsumer);
+        }
 
-  public int getTraceCount() {
-    return traceCount.get();
-  }
+        add(trace);
+        structureWriter.write(trace);
 
-  @SuppressFBWarnings("NN_NAKED_NOTIFY")
-  @Override
-  public void write(List<DDSpan> trace) {
-    if (!filter.accept(trace)) {
-      return;
+        traceCount.incrementAndGet();
+        synchronized (monitor) {
+            monitor.notifyAll();
+        }
     }
-    for (DDSpan span : trace) {
-      // This is needed to properly do all delayed processing to make this writer even
-      // remotely realistic so the test actually test something
-      span.processTagsAndBaggage(metadataConsumer);
+
+    private boolean awaitUntilDeadline(long timeout, TimeUnit unit, BooleanSupplier predicate)
+            throws InterruptedException {
+        final long deadline = System.nanoTime() + unit.toNanos(timeout);
+
+        while (true) {
+            if (predicate.getAsBoolean()) {
+                return true;
+            }
+
+            long now = System.nanoTime();
+            long remaining = deadline - now;
+            if (remaining <= 0) {
+                break;
+            }
+
+            long millis = NANOSECONDS.toMillis(remaining);
+            long nanos = remaining - MILLISECONDS.toNanos(millis);
+
+            synchronized (monitor) {
+                monitor.wait(millis, (int) nanos);
+            }
+        }
+
+        return false;
+    }
+
+    public boolean waitForTracesMax(final int number, int seconds) throws InterruptedException {
+        return awaitUntilDeadline(seconds, SECONDS, () -> traceCount.get() >= number);
     }
 
-    add(trace);
-    structureWriter.write(trace);
+    public void waitForTraces(final int number) throws InterruptedException, TimeoutException {
+        if (!waitForTracesMax(number, 20)) {
+            String msg = "Timeout waiting for "
+                    + number
+                    + " trace(s). ListWriter.size() == "
+                    + size()
+                    + " : "
+                    + super.toString();
+            log.warn(msg);
+            throw new TimeoutException(msg);
+        }
+    }
 
-    traceCount.incrementAndGet();
-    synchronized (monitor) {
-      monitor.notifyAll();
+    public void waitUntilReported(final DDSpan span) throws InterruptedException, TimeoutException {
+        waitUntilReported(span, 20, SECONDS);
     }
-  }
 
-  private boolean awaitUntilDeadline(long timeout, TimeUnit unit, BooleanSupplier predicate)
-      throws InterruptedException {
-    final long deadline = System.nanoTime() + unit.toNanos(timeout);
+    public void waitUntilReported(final DDSpan span, int timeout, TimeUnit unit)
+            throws InterruptedException, TimeoutException {
+        boolean reported = awaitUntilDeadline(timeout, unit, () -> isReported(span));
 
-    while (true) {
-      if (predicate.getAsBoolean()) {
-        return true;
-      }
-
-      long now = System.nanoTime();
-      long remaining = deadline - now;
-      if (remaining <= 0) {
-        break;
-      }
-
-      long millis = NANOSECONDS.toMillis(remaining);
-      long nanos = remaining - MILLISECONDS.toNanos(millis);
-
-      synchronized (monitor) {
-        monitor.wait(millis, (int) nanos);
-      }
-    }
-
-    return false;
-  }
-
-  public boolean waitForTracesMax(final int number, int seconds) throws InterruptedException {
-    return awaitUntilDeadline(seconds, SECONDS, () -> traceCount.get() >= number);
-  }
-
-  public void waitForTraces(final int number) throws InterruptedException, TimeoutException {
-    if (!waitForTracesMax(number, 20)) {
-      String msg =
-          "Timeout waiting for "
-              + number
-              + " trace(s). ListWriter.size() == "
-              + size()
-              + " : "
-              + super.toString();
-      log.warn(msg);
-      throw new TimeoutException(msg);
-    }
-  }
-
-  public void waitUntilReported(final DDSpan span) throws InterruptedException, TimeoutException {
-    waitUntilReported(span, 20, SECONDS);
-  }
-
-  public void waitUntilReported(final DDSpan span, int timeout, TimeUnit unit)
-      throws InterruptedException, TimeoutException {
-    boolean reported = awaitUntilDeadline(timeout, unit, () -> isReported(span));
-
-    if (!reported) {
-      String msg = "Timeout waiting for span to be reported: " + span;
-      log.warn(msg);
-      throw new TimeoutException(msg);
-    }
-  }
-
-  /**
-   * Set a filter to be applied to all incoming traces to determine whether they should be written
-   * or not.
-   */
-  public void setFilter(Filter filter) {
-    this.filter = filter;
-  }
-
-  /** Set a {@link MetadataConsumer} to capture what trace metadata would be sent to the agent. */
-  public void setMetadataConsumer(MetadataConsumer metadataConsumer) {
-    this.metadataConsumer = metadataConsumer;
-  }
-
-  private boolean isReported(DDSpan span) {
-    for (List<DDSpan> trace : this) {
-      for (DDSpan aSpan : trace) {
-        if (aSpan == span) {
-          return true;
+        if (!reported) {
+            String msg = "Timeout waiting for span to be reported: " + span;
+            log.warn(msg);
+            throw new TimeoutException(msg);
+        }
+    }
+
+    /**
+     * Set a filter to be applied to all incoming traces to determine whether they should be written
+     * or not.
+     */
+    public void setFilter(Filter filter) {
+        this.filter = filter;
+    }
+
+    /** Set a {@link MetadataConsumer} to capture what trace metadata would be sent to the agent. */
+    public void setMetadataConsumer(MetadataConsumer metadataConsumer) {
+        this.metadataConsumer = metadataConsumer;
+    }
+
+    private boolean isReported(DDSpan span) {
+        for (List<DDSpan> trace : this) {
+            for (DDSpan aSpan : trace) {
+                if (aSpan == span) {
+                    return true;
+                }
+            }
         }
-      }
-    }
-    return false;
-  }
-
-  @Override
-  public void incrementDropCounts(int spanCount) {}
-
-  @Override
-  public void start() {
-    close();
-  }
-
-  @Override
-  public boolean flush() {
-    filter = ACCEPT_ALL;
-    return true;
-  }
-
-  @Override
-  public void clear() {
-    super.clear();
-
-    traceCount.set(0);
-  }
-
-  @Override
-  public void close() {
-    clear();
-  }
-
-  @Override
-  public String toString() {
-    return "ListWriter { size=" + size() + " }";
-  }
-
-  /** Interface for filtering out select traces from being written. */
-  public interface Filter {
-    boolean accept(List<DDSpan> trace);
-  }
+        return false;
+    }
+
+    @Override
+    public void incrementDropCounts(int spanCount) {}
+
+    @Override
+    public void start() {
+        close();
+    }
+
+    @Override
+    public boolean flush() {
+        filter = ACCEPT_ALL;
+        return true;
+    }
+
+    @Override
+    public void clear() {
+        super.clear();
+
+        traceCount.set(0);
+    }
+
+    @Override
+    public void close() {
+        clear();
+    }
+
+    @Override
+    public String toString() {
+        return "ListWriter { size=" + size() + " }";
+    }
+
+    /** Interface for filtering out select traces from being written. */
+    public interface Filter {
+        boolean accept(List<DDSpan> trace);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/LoggingWriter.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/LoggingWriter.java
index 24a6361db37..7ffdfb5df51 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/LoggingWriter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/LoggingWriter.java
@@ -10,43 +10,42 @@
 
 public class LoggingWriter implements Writer {
 
-  private static final Logger log = LoggerFactory.getLogger(LoggingWriter.class);
-  private static final JsonAdapter<List<DDSpan>> TRACE_ADAPTER =
-      new Moshi.Builder()
-          .add(DDSpanJsonAdapter.buildFactory(false))
-          .build()
-          .adapter(Types.newParameterizedType(List.class, DDSpan.class));
-
-  @Override
-  public void write(final List<DDSpan> trace) {
-    try {
-      log.info("write(trace): {}", TRACE_ADAPTER.toJson(trace));
-    } catch (final Exception e) {
-      log.error("error writing(trace): {}", trace, e);
+    private static final Logger log = LoggerFactory.getLogger(LoggingWriter.class);
+    private static final JsonAdapter<List<DDSpan>> TRACE_ADAPTER = new Moshi.Builder()
+            .add(DDSpanJsonAdapter.buildFactory(false))
+            .build()
+            .adapter(Types.newParameterizedType(List.class, DDSpan.class));
+
+    @Override
+    public void write(final List<DDSpan> trace) {
+        try {
+            log.info("write(trace): {}", TRACE_ADAPTER.toJson(trace));
+        } catch (final Exception e) {
+            log.error("error writing(trace): {}", trace, e);
+        }
+    }
+
+    @Override
+    public void start() {
+        log.info("start()");
+    }
+
+    @Override
+    public boolean flush() {
+        log.info("flush()");
+        return true;
+    }
+
+    @Override
+    public void close() {
+        log.info("close()");
+    }
+
+    @Override
+    public void incrementDropCounts(int spanCount) {}
+
+    @Override
+    public String toString() {
+        return "LoggingWriter { }";
     }
-  }
-
-  @Override
-  public void start() {
-    log.info("start()");
-  }
-
-  @Override
-  public boolean flush() {
-    log.info("flush()");
-    return true;
-  }
-
-  @Override
-  public void close() {
-    log.info("close()");
-  }
-
-  @Override
-  public void incrementDropCounts(int spanCount) {}
-
-  @Override
-  public String toString() {
-    return "LoggingWriter { }";
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/MultiWriter.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/MultiWriter.java
index 3e3a10c4833..66327e7784b 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/MultiWriter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/MultiWriter.java
@@ -12,81 +12,79 @@
 import java.util.regex.Pattern;
 
 public class MultiWriter implements Writer {
-  private static final Pattern MW_PATTERN =
-      Pattern.compile(MULTI_WRITER_TYPE + ":", Pattern.LITERAL);
-  private static final Pattern COMMA_PATTERN = Pattern.compile(",", Pattern.LITERAL);
+    private static final Pattern MW_PATTERN = Pattern.compile(MULTI_WRITER_TYPE + ":", Pattern.LITERAL);
+    private static final Pattern COMMA_PATTERN = Pattern.compile(",", Pattern.LITERAL);
 
-  private final Writer[] writers;
+    private final Writer[] writers;
 
-  public MultiWriter(
-      Config config,
-      SharedCommunicationObjects commObjects,
-      Sampler sampler,
-      SingleSpanSampler singleSpanSampler,
-      HealthMetrics healthMetrics,
-      String type) {
-    String mwConfig = MW_PATTERN.matcher(type).replaceAll("");
-    String[] writerConfigs = COMMA_PATTERN.split(mwConfig);
-    this.writers = new Writer[writerConfigs.length];
-    int i = 0;
+    public MultiWriter(
+            Config config,
+            SharedCommunicationObjects commObjects,
+            Sampler sampler,
+            SingleSpanSampler singleSpanSampler,
+            HealthMetrics healthMetrics,
+            String type) {
+        String mwConfig = MW_PATTERN.matcher(type).replaceAll("");
+        String[] writerConfigs = COMMA_PATTERN.split(mwConfig);
+        this.writers = new Writer[writerConfigs.length];
+        int i = 0;
 
-    for (String writerConfig : writerConfigs) {
-      writers[i] =
-          WriterFactory.createWriter(
-              config, commObjects, sampler, singleSpanSampler, healthMetrics, writerConfig);
-      i++;
+        for (String writerConfig : writerConfigs) {
+            writers[i] = WriterFactory.createWriter(
+                    config, commObjects, sampler, singleSpanSampler, healthMetrics, writerConfig);
+            i++;
+        }
     }
-  }
 
-  public MultiWriter(Writer[] writers) {
-    this.writers = writers.clone();
-  }
-
-  @Override
-  public void start() {
-    for (Writer writer : writers) {
-      if (writer != null) {
-        writer.start();
-      }
+    public MultiWriter(Writer[] writers) {
+        this.writers = writers.clone();
     }
-  }
 
-  @Override
-  public void write(List<DDSpan> trace) {
-    for (Writer writer : writers) {
-      if (writer != null) {
-        writer.write(trace);
-      }
+    @Override
+    public void start() {
+        for (Writer writer : writers) {
+            if (writer != null) {
+                writer.start();
+            }
+        }
     }
-  }
 
-  @Override
-  public boolean flush() {
-    boolean flush = true;
-    for (Writer writer : writers) {
-      if (writer != null) {
-        flush &= writer.flush();
-      }
+    @Override
+    public void write(List<DDSpan> trace) {
+        for (Writer writer : writers) {
+            if (writer != null) {
+                writer.write(trace);
+            }
+        }
     }
 
-    return flush;
-  }
+    @Override
+    public boolean flush() {
+        boolean flush = true;
+        for (Writer writer : writers) {
+            if (writer != null) {
+                flush &= writer.flush();
+            }
+        }
+
+        return flush;
+    }
 
-  @Override
-  public void close() {
-    for (Writer writer : writers) {
-      if (writer != null) {
-        writer.close();
-      }
+    @Override
+    public void close() {
+        for (Writer writer : writers) {
+            if (writer != null) {
+                writer.close();
+            }
+        }
     }
-  }
 
-  @Override
-  public void incrementDropCounts(int spanCount) {
-    for (Writer writer : writers) {
-      if (writer != null) {
-        writer.incrementDropCounts(spanCount);
-      }
+    @Override
+    public void incrementDropCounts(int spanCount) {
+        for (Writer writer : writers) {
+            if (writer != null) {
+                writer.incrementDropCounts(spanCount);
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/OtlpPayloadDispatcher.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/OtlpPayloadDispatcher.java
index ed69f08c37e..7becea23cdb 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/OtlpPayloadDispatcher.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/OtlpPayloadDispatcher.java
@@ -12,48 +12,48 @@
 import org.slf4j.LoggerFactory;
 
 final class OtlpPayloadDispatcher implements PayloadDispatcher {
-  private static final Logger log = LoggerFactory.getLogger(OtlpPayloadDispatcher.class);
+    private static final Logger log = LoggerFactory.getLogger(OtlpPayloadDispatcher.class);
 
-  private static final int FLUSH_THRESHOLD_BYTES = 5 << 20; // 5 MiB
+    private static final int FLUSH_THRESHOLD_BYTES = 5 << 20; // 5 MiB
 
-  private final OtlpTraceCollector collector;
-  private final OtlpSender sender;
+    private final OtlpTraceCollector collector;
+    private final OtlpSender sender;
 
-  OtlpPayloadDispatcher(OtlpSender sender, OtlpTraceCollector collector) {
-    this.sender = sender;
-    this.collector = collector;
-  }
+    OtlpPayloadDispatcher(OtlpSender sender, OtlpTraceCollector collector) {
+        this.sender = sender;
+        this.collector = collector;
+    }
 
-  @Override
-  public void addTrace(List<? extends CoreSpan<?>> trace) {
-    collector.addTrace(trace);
-    // flush proactively to keep payload size bounded
-    if (collector.sizeInBytes() >= FLUSH_THRESHOLD_BYTES) {
-      flush();
+    @Override
+    public void addTrace(List<? extends CoreSpan<?>> trace) {
+        collector.addTrace(trace);
+        // flush proactively to keep payload size bounded
+        if (collector.sizeInBytes() >= FLUSH_THRESHOLD_BYTES) {
+            flush();
+        }
     }
-  }
-
-  @Override
-  public void flush() {
-    try {
-      OtlpPayload payload = collector.collectTraces();
-      if (payload != OtlpPayload.EMPTY) {
-        OtlpTelemetry.getInstance().onTracesExportAttempt();
-        RemoteApi.Response response = sender.send(payload);
-        OtlpTelemetry.getInstance().onTracesExportComplete(response.success());
-      }
-    } catch (RuntimeException e) { // don't catch severe Errors
-      log.debug("Failed to send OTLP payload", e);
+
+    @Override
+    public void flush() {
+        try {
+            OtlpPayload payload = collector.collectTraces();
+            if (payload != OtlpPayload.EMPTY) {
+                OtlpTelemetry.getInstance().onTracesExportAttempt();
+                RemoteApi.Response response = sender.send(payload);
+                OtlpTelemetry.getInstance().onTracesExportComplete(response.success());
+            }
+        } catch (RuntimeException e) { // don't catch severe Errors
+            log.debug("Failed to send OTLP payload", e);
+        }
     }
-  }
 
-  @Override
-  public void onDroppedTrace(int spanCount) {
-    // no telemetry currently tracked for dropped traces
-  }
+    @Override
+    public void onDroppedTrace(int spanCount) {
+        // no telemetry currently tracked for dropped traces
+    }
 
-  @Override
-  public Collection<RemoteApi> getApis() {
-    return Collections.emptyList();
-  }
+    @Override
+    public Collection<RemoteApi> getApis() {
+        return Collections.emptyList();
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/OtlpWriter.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/OtlpWriter.java
index 1650a77b52a..fb88a2d1709 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/OtlpWriter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/OtlpWriter.java
@@ -22,138 +22,132 @@
 
 public class OtlpWriter extends RemoteWriter {
 
-  private static final int BUFFER_SIZE = 1024;
-  private static final String HTTP_TRACES_SIGNAL_PATH = "/" + DEFAULT_OTLP_HTTP_TRACES_ENDPOINT;
-  private static final String GRPC_TRACES_SIGNAL_PATH = "/" + DEFAULT_OTLP_GRPC_TRACES_ENDPOINT;
-  private static final String DEFAULT_OTLP_HTTP_ENDPOINT =
-      "http://localhost:" + DEFAULT_OTLP_HTTP_PORT + HTTP_TRACES_SIGNAL_PATH;
-
-  public static OtlpWriterBuilder builder() {
-    return new OtlpWriterBuilder();
-  }
-
-  private final OtlpSender sender;
-
-  OtlpWriter(
-      TraceProcessingWorker worker,
-      PayloadDispatcher dispatcher,
-      OtlpSender sender,
-      int flushTimeout,
-      TimeUnit flushTimeoutUnit,
-      boolean alwaysFlush) {
-    super(worker, dispatcher, HealthMetrics.NO_OP, flushTimeout, flushTimeoutUnit, alwaysFlush);
-    this.sender = sender;
-  }
-
-  @Override
-  public void close() {
-    super.close();
-    sender.shutdown();
-  }
-
-  // only used by tests
-  OtlpSender getSender() {
-    return sender;
-  }
-
-  public static class OtlpWriterBuilder {
-    private String endpoint = DEFAULT_OTLP_HTTP_ENDPOINT;
-    private Map<String, String> headers = Collections.emptyMap();
-    private int timeoutMillis = DEFAULT_OTLP_TRACES_TIMEOUT;
-    private OtlpConfig.Protocol protocol = OtlpConfig.Protocol.HTTP_PROTOBUF;
-    private OtlpConfig.Compression compression = OtlpConfig.Compression.NONE;
-    private int traceBufferSize = BUFFER_SIZE;
-    private int flushIntervalMilliseconds = 1000;
-    private int flushTimeout = 1;
-    private TimeUnit flushTimeoutUnit = TimeUnit.SECONDS;
-    private boolean alwaysFlush = false;
-    private SingleSpanSampler singleSpanSampler;
-    private OtlpSender sender;
-
-    public OtlpWriterBuilder endpoint(String endpoint) {
-      this.endpoint = endpoint;
-      return this;
+    private static final int BUFFER_SIZE = 1024;
+    private static final String HTTP_TRACES_SIGNAL_PATH = "/" + DEFAULT_OTLP_HTTP_TRACES_ENDPOINT;
+    private static final String GRPC_TRACES_SIGNAL_PATH = "/" + DEFAULT_OTLP_GRPC_TRACES_ENDPOINT;
+    private static final String DEFAULT_OTLP_HTTP_ENDPOINT =
+            "http://localhost:" + DEFAULT_OTLP_HTTP_PORT + HTTP_TRACES_SIGNAL_PATH;
+
+    public static OtlpWriterBuilder builder() {
+        return new OtlpWriterBuilder();
     }
 
-    public OtlpWriterBuilder headers(Map<String, String> headers) {
-      this.headers = headers;
-      return this;
+    private final OtlpSender sender;
+
+    OtlpWriter(
+            TraceProcessingWorker worker,
+            PayloadDispatcher dispatcher,
+            OtlpSender sender,
+            int flushTimeout,
+            TimeUnit flushTimeoutUnit,
+            boolean alwaysFlush) {
+        super(worker, dispatcher, HealthMetrics.NO_OP, flushTimeout, flushTimeoutUnit, alwaysFlush);
+        this.sender = sender;
     }
 
-    public OtlpWriterBuilder timeoutMillis(int timeoutMillis) {
-      this.timeoutMillis = timeoutMillis;
-      return this;
+    @Override
+    public void close() {
+        super.close();
+        sender.shutdown();
     }
 
-    public OtlpWriterBuilder protocol(OtlpConfig.Protocol protocol) {
-      this.protocol = protocol;
-      return this;
+    // only used by tests
+    OtlpSender getSender() {
+        return sender;
     }
 
-    public OtlpWriterBuilder compression(OtlpConfig.Compression compression) {
-      this.compression = compression;
-      return this;
+    public static class OtlpWriterBuilder {
+        private String endpoint = DEFAULT_OTLP_HTTP_ENDPOINT;
+        private Map<String, String> headers = Collections.emptyMap();
+        private int timeoutMillis = DEFAULT_OTLP_TRACES_TIMEOUT;
+        private OtlpConfig.Protocol protocol = OtlpConfig.Protocol.HTTP_PROTOBUF;
+        private OtlpConfig.Compression compression = OtlpConfig.Compression.NONE;
+        private int traceBufferSize = BUFFER_SIZE;
+        private int flushIntervalMilliseconds = 1000;
+        private int flushTimeout = 1;
+        private TimeUnit flushTimeoutUnit = TimeUnit.SECONDS;
+        private boolean alwaysFlush = false;
+        private SingleSpanSampler singleSpanSampler;
+        private OtlpSender sender;
+
+        public OtlpWriterBuilder endpoint(String endpoint) {
+            this.endpoint = endpoint;
+            return this;
+        }
+
+        public OtlpWriterBuilder headers(Map<String, String> headers) {
+            this.headers = headers;
+            return this;
+        }
+
+        public OtlpWriterBuilder timeoutMillis(int timeoutMillis) {
+            this.timeoutMillis = timeoutMillis;
+            return this;
+        }
+
+        public OtlpWriterBuilder protocol(OtlpConfig.Protocol protocol) {
+            this.protocol = protocol;
+            return this;
+        }
+
+        public OtlpWriterBuilder compression(OtlpConfig.Compression compression) {
+            this.compression = compression;
+            return this;
+        }
+
+        public OtlpWriterBuilder traceBufferSize(int traceBufferSize) {
+            this.traceBufferSize = traceBufferSize;
+            return this;
+        }
+
+        public OtlpWriterBuilder flushIntervalMilliseconds(int flushIntervalMilliseconds) {
+            this.flushIntervalMilliseconds = flushIntervalMilliseconds;
+            return this;
+        }
+
+        public OtlpWriterBuilder flushTimeout(int flushTimeout, TimeUnit flushTimeoutUnit) {
+            this.flushTimeout = flushTimeout;
+            this.flushTimeoutUnit = flushTimeoutUnit;
+            return this;
+        }
+
+        public OtlpWriterBuilder alwaysFlush(boolean alwaysFlush) {
+            this.alwaysFlush = alwaysFlush;
+            return this;
+        }
+
+        public OtlpWriterBuilder spanSamplingRules(SingleSpanSampler singleSpanSampler) {
+            this.singleSpanSampler = singleSpanSampler;
+            return this;
+        }
+
+        OtlpWriterBuilder sender(OtlpSender sender) {
+            this.sender = sender;
+            return this;
+        }
+
+        public OtlpWriter build() {
+            if (sender == null) {
+                sender = protocol == OtlpConfig.Protocol.GRPC
+                        ? new OtlpGrpcSender(endpoint, GRPC_TRACES_SIGNAL_PATH, headers, timeoutMillis, compression)
+                        : new OtlpHttpSender(endpoint, HTTP_TRACES_SIGNAL_PATH, headers, timeoutMillis, compression);
+            }
+
+            final OtlpTraceCollector collector = protocol == OtlpConfig.Protocol.HTTP_JSON
+                    ? new OtlpTraceJsonCollector()
+                    : new OtlpTraceProtoCollector();
+            final OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
+            final TraceProcessingWorker worker = new TraceProcessingWorker(
+                    traceBufferSize,
+                    HealthMetrics.NO_OP,
+                    dispatcher,
+                    DroppingPolicy.DISABLED,
+                    Prioritization.FAST_LANE,
+                    flushIntervalMilliseconds,
+                    TimeUnit.MILLISECONDS,
+                    singleSpanSampler);
+
+            return new OtlpWriter(worker, dispatcher, sender, flushTimeout, flushTimeoutUnit, alwaysFlush);
+        }
     }
-
-    public OtlpWriterBuilder traceBufferSize(int traceBufferSize) {
-      this.traceBufferSize = traceBufferSize;
-      return this;
-    }
-
-    public OtlpWriterBuilder flushIntervalMilliseconds(int flushIntervalMilliseconds) {
-      this.flushIntervalMilliseconds = flushIntervalMilliseconds;
-      return this;
-    }
-
-    public OtlpWriterBuilder flushTimeout(int flushTimeout, TimeUnit flushTimeoutUnit) {
-      this.flushTimeout = flushTimeout;
-      this.flushTimeoutUnit = flushTimeoutUnit;
-      return this;
-    }
-
-    public OtlpWriterBuilder alwaysFlush(boolean alwaysFlush) {
-      this.alwaysFlush = alwaysFlush;
-      return this;
-    }
-
-    public OtlpWriterBuilder spanSamplingRules(SingleSpanSampler singleSpanSampler) {
-      this.singleSpanSampler = singleSpanSampler;
-      return this;
-    }
-
-    OtlpWriterBuilder sender(OtlpSender sender) {
-      this.sender = sender;
-      return this;
-    }
-
-    public OtlpWriter build() {
-      if (sender == null) {
-        sender =
-            protocol == OtlpConfig.Protocol.GRPC
-                ? new OtlpGrpcSender(
-                    endpoint, GRPC_TRACES_SIGNAL_PATH, headers, timeoutMillis, compression)
-                : new OtlpHttpSender(
-                    endpoint, HTTP_TRACES_SIGNAL_PATH, headers, timeoutMillis, compression);
-      }
-
-      final OtlpTraceCollector collector =
-          protocol == OtlpConfig.Protocol.HTTP_JSON
-              ? new OtlpTraceJsonCollector()
-              : new OtlpTraceProtoCollector();
-      final OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
-      final TraceProcessingWorker worker =
-          new TraceProcessingWorker(
-              traceBufferSize,
-              HealthMetrics.NO_OP,
-              dispatcher,
-              DroppingPolicy.DISABLED,
-              Prioritization.FAST_LANE,
-              flushIntervalMilliseconds,
-              TimeUnit.MILLISECONDS,
-              singleSpanSampler);
-
-      return new OtlpWriter(
-          worker, dispatcher, sender, flushTimeout, flushTimeoutUnit, alwaysFlush);
-    }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/Payload.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/Payload.java
index 3e046829051..b252003b285 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/Payload.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/Payload.java
@@ -14,86 +14,86 @@
 
 public abstract class Payload {
 
-  private static final ByteBuffer EMPTY_ARRAY = ByteBuffer.allocate(1).put(0, (byte) 0x90);
-
-  private int traceCount = 0;
-  private long droppedTraces = 0;
-  private long droppedSpans = 0;
-  protected ByteBuffer body = EMPTY_ARRAY.duplicate();
-
-  public Payload withBody(int traceCount, ByteBuffer body) {
-    this.traceCount = traceCount;
-    if (null != body) {
-      this.body = body;
+    private static final ByteBuffer EMPTY_ARRAY = ByteBuffer.allocate(1).put(0, (byte) 0x90);
+
+    private int traceCount = 0;
+    private long droppedTraces = 0;
+    private long droppedSpans = 0;
+    protected ByteBuffer body = EMPTY_ARRAY.duplicate();
+
+    public Payload withBody(int traceCount, ByteBuffer body) {
+        this.traceCount = traceCount;
+        if (null != body) {
+            this.body = body;
+        }
+        return this;
     }
-    return this;
-  }
 
-  public Payload withDroppedTraces(long droppedTraceCount) {
-    this.droppedTraces += droppedTraceCount;
-    return this;
-  }
+    public Payload withDroppedTraces(long droppedTraceCount) {
+        this.droppedTraces += droppedTraceCount;
+        return this;
+    }
 
-  public Payload withDroppedSpans(long droppedSpanCount) {
-    this.droppedSpans += droppedSpanCount;
-    return this;
-  }
+    public Payload withDroppedSpans(long droppedSpanCount) {
+        this.droppedSpans += droppedSpanCount;
+        return this;
+    }
 
-  public int traceCount() {
-    return traceCount;
-  }
+    public int traceCount() {
+        return traceCount;
+    }
 
-  public long droppedTraces() {
-    return droppedTraces;
-  }
+    public long droppedTraces() {
+        return droppedTraces;
+    }
 
-  public long droppedSpans() {
-    return droppedSpans;
-  }
+    public long droppedSpans() {
+        return droppedSpans;
+    }
 
-  public abstract int sizeInBytes();
+    public abstract int sizeInBytes();
 
-  public abstract void writeTo(WritableByteChannel channel) throws IOException;
+    public abstract void writeTo(WritableByteChannel channel) throws IOException;
 
-  public abstract RequestBody toRequest();
+    public abstract RequestBody toRequest();
 
-  protected int msgpackArrayHeaderSize(int count) {
-    if (count < 0x10) {
-      return 1;
-    } else if (count < 0x10000) {
-      return 3;
-    } else {
-      return 5;
+    protected int msgpackArrayHeaderSize(int count) {
+        if (count < 0x10) {
+            return 1;
+        } else if (count < 0x10000) {
+            return 3;
+        } else {
+            return 5;
+        }
     }
-  }
-
-  protected int msgpackMapHeaderSize(int count) {
-    if (count < 0x10) {
-      return 1;
-    } else if (count < 0x10000) {
-      return 3;
-    } else {
-      return 5;
+
+    protected int msgpackMapHeaderSize(int count) {
+        if (count < 0x10) {
+            return 1;
+        } else if (count < 0x10000) {
+            return 3;
+        } else {
+            return 5;
+        }
     }
-  }
-
-  protected ByteBuffer msgpackArrayHeader(int count) {
-    if (count < 0x10) {
-      return ByteBuffer.allocate(1).put(0, (byte) (FIXARRAY | count));
-    } else if (count < 0x10000) {
-      return ByteBuffer.allocate(3).put(0, ARRAY16).putShort(1, (short) count);
-    } else {
-      return ByteBuffer.allocate(5).put(0, ARRAY32).putInt(1, count);
+
+    protected ByteBuffer msgpackArrayHeader(int count) {
+        if (count < 0x10) {
+            return ByteBuffer.allocate(1).put(0, (byte) (FIXARRAY | count));
+        } else if (count < 0x10000) {
+            return ByteBuffer.allocate(3).put(0, ARRAY16).putShort(1, (short) count);
+        } else {
+            return ByteBuffer.allocate(5).put(0, ARRAY32).putInt(1, count);
+        }
     }
-  }
-
-  protected ByteBuffer msgpackMapHeader(int count) {
-    if (count < 0x10) {
-      return ByteBuffer.allocate(1).put(0, (byte) (FIXMAP | count));
-    } else if (count < 0x10000) {
-      return ByteBuffer.allocate(3).put(0, MAP16).putShort((short) count);
-    } else {
-      return ByteBuffer.allocate(5).put(0, MAP32).putInt(1, count);
+
+    protected ByteBuffer msgpackMapHeader(int count) {
+        if (count < 0x10) {
+            return ByteBuffer.allocate(1).put(0, (byte) (FIXMAP | count));
+        } else if (count < 0x10000) {
+            return ByteBuffer.allocate(3).put(0, MAP16).putShort((short) count);
+        } else {
+            return ByteBuffer.allocate(5).put(0, MAP32).putInt(1, count);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/PayloadDispatcher.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/PayloadDispatcher.java
index fa3483df52e..da9c690ddb6 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/PayloadDispatcher.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/PayloadDispatcher.java
@@ -5,12 +5,12 @@
 import java.util.List;
 
 interface PayloadDispatcher {
-  void onDroppedTrace(int spanCount);
+    void onDroppedTrace(int spanCount);
 
-  void addTrace(List<? extends CoreSpan<?>> trace);
+    void addTrace(List<? extends CoreSpan<?>> trace);
 
-  void flush();
+    void flush();
 
-  // used by tests
-  Collection<RemoteApi> getApis();
+    // used by tests
+    Collection<RemoteApi> getApis();
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/PayloadDispatcherImpl.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/PayloadDispatcherImpl.java
index 89895d385a9..2c0695cf756 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/PayloadDispatcherImpl.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/PayloadDispatcherImpl.java
@@ -18,117 +18,111 @@
 
 public class PayloadDispatcherImpl implements ByteBufferConsumer, PayloadDispatcher {
 
-  private static final Logger log = LoggerFactory.getLogger(PayloadDispatcherImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(PayloadDispatcherImpl.class);
 
-  private final RemoteApi api;
-  private final RemoteMapperDiscovery mapperDiscovery;
-  private final HealthMetrics healthMetrics;
-  private final Monitoring monitoring;
+    private final RemoteApi api;
+    private final RemoteMapperDiscovery mapperDiscovery;
+    private final HealthMetrics healthMetrics;
+    private final Monitoring monitoring;
 
-  private Recording batchTimer;
-  private RemoteMapper mapper;
-  private WritableFormatter packer;
+    private Recording batchTimer;
+    private RemoteMapper mapper;
+    private WritableFormatter packer;
 
-  private final LongAdder droppedSpanCount = new LongAdder();
-  private final LongAdder droppedTraceCount = new LongAdder();
+    private final LongAdder droppedSpanCount = new LongAdder();
+    private final LongAdder droppedTraceCount = new LongAdder();
 
-  public PayloadDispatcherImpl(
-      RemoteMapperDiscovery mapperDiscovery,
-      RemoteApi api,
-      HealthMetrics healthMetrics,
-      Monitoring monitoring) {
-    this.mapperDiscovery = mapperDiscovery;
-    this.api = api;
-    this.healthMetrics = healthMetrics;
-    this.monitoring = monitoring;
-  }
-
-  @Override
-  public void flush() {
-    if (null != packer) {
-      packer.flush();
+    public PayloadDispatcherImpl(
+            RemoteMapperDiscovery mapperDiscovery, RemoteApi api, HealthMetrics healthMetrics, Monitoring monitoring) {
+        this.mapperDiscovery = mapperDiscovery;
+        this.api = api;
+        this.healthMetrics = healthMetrics;
+        this.monitoring = monitoring;
     }
-  }
 
-  @Override
-  public Collection<RemoteApi> getApis() {
-    return Collections.singleton(api);
-  }
+    @Override
+    public void flush() {
+        if (null != packer) {
+            packer.flush();
+        }
+    }
 
-  @Override
-  public void onDroppedTrace(int spanCount) {
-    droppedSpanCount.add(spanCount);
-    droppedTraceCount.increment();
-  }
+    @Override
+    public Collection<RemoteApi> getApis() {
+        return Collections.singleton(api);
+    }
 
-  @Override
-  public void addTrace(List<? extends CoreSpan<?>> trace) {
-    selectMapper();
-    // the call below is blocking and will trigger IO if a flush is necessary
-    // there are alternative approaches to avoid blocking here, such as
-    // introducing an unbound queue and another thread to do the IO
-    // however, we can't block the application threads from here.
-    if (null == mapper || !packer.format(trace, mapper)) {
-      healthMetrics.onFailedPublish(
-          trace.isEmpty() ? 0 : trace.get(0).samplingPriority(), trace.size());
+    @Override
+    public void onDroppedTrace(int spanCount) {
+        droppedSpanCount.add(spanCount);
+        droppedTraceCount.increment();
     }
-  }
 
-  private void selectMapper() {
-    if (null == mapper) {
-      if (mapperDiscovery.getMapper() == null) {
-        mapperDiscovery.discover();
-      }
-      mapper = mapperDiscovery.getMapper();
+    @Override
+    public void addTrace(List<? extends CoreSpan<?>> trace) {
+        selectMapper();
+        // the call below is blocking and will trigger IO if a flush is necessary
+        // there are alternative approaches to avoid blocking here, such as
+        // introducing an unbound queue and another thread to do the IO
+        // however, we can't block the application threads from here.
+        if (null == mapper || !packer.format(trace, mapper)) {
+            healthMetrics.onFailedPublish(trace.isEmpty() ? 0 : trace.get(0).samplingPriority(), trace.size());
+        }
     }
-    if (null == packer && null != mapper) {
-      batchTimer =
-          monitoring.newTimer("tracer.trace.buffer.fill.time", "endpoint:" + mapper.endpoint());
-      packer = new MsgPackWriter(new FlushingBuffer(mapper.messageBufferSize(), this));
-      batchTimer.start();
+
+    private void selectMapper() {
+        if (null == mapper) {
+            if (mapperDiscovery.getMapper() == null) {
+                mapperDiscovery.discover();
+            }
+            mapper = mapperDiscovery.getMapper();
+        }
+        if (null == packer && null != mapper) {
+            batchTimer = monitoring.newTimer("tracer.trace.buffer.fill.time", "endpoint:" + mapper.endpoint());
+            packer = new MsgPackWriter(new FlushingBuffer(mapper.messageBufferSize(), this));
+            batchTimer.start();
+        }
     }
-  }
 
-  Payload newPayload(int messageCount, ByteBuffer buffer) {
-    return mapper
-        .newPayload()
-        .withBody(messageCount, buffer)
-        .withDroppedSpans(droppedSpanCount.sumThenReset())
-        .withDroppedTraces(droppedTraceCount.sumThenReset());
-  }
+    Payload newPayload(int messageCount, ByteBuffer buffer) {
+        return mapper.newPayload()
+                .withBody(messageCount, buffer)
+                .withDroppedSpans(droppedSpanCount.sumThenReset())
+                .withDroppedTraces(droppedTraceCount.sumThenReset());
+    }
 
-  @Override
-  public void accept(int messageCount, ByteBuffer buffer) {
-    // the packer calls this when the buffer is full,
-    // or when the packer is flushed at a heartbeat
-    if (messageCount > 0) {
-      batchTimer.reset();
-      Payload payload = newPayload(messageCount, buffer);
-      final int sizeInBytes = payload.sizeInBytes();
-      healthMetrics.onSerialize(sizeInBytes);
-      RemoteApi.Response response = api.sendSerializedTraces(payload);
-      mapper.reset();
-      if (response.success()) {
-        if (log.isDebugEnabled()) {
-          log.debug(
-              "Successfully sent {} traces of size {} bytes to the API {}",
-              messageCount,
-              sizeInBytes,
-              mapper.endpoint());
-        }
-        healthMetrics.onSend(messageCount, sizeInBytes, response);
-      } else {
-        if (log.isDebugEnabled()) {
-          log.debug(
-              "Failed to send {} traces of size {} bytes to the API {} status {} response {}",
-              messageCount,
-              sizeInBytes,
-              mapper.endpoint(),
-              response.status(),
-              response.response());
+    @Override
+    public void accept(int messageCount, ByteBuffer buffer) {
+        // the packer calls this when the buffer is full,
+        // or when the packer is flushed at a heartbeat
+        if (messageCount > 0) {
+            batchTimer.reset();
+            Payload payload = newPayload(messageCount, buffer);
+            final int sizeInBytes = payload.sizeInBytes();
+            healthMetrics.onSerialize(sizeInBytes);
+            RemoteApi.Response response = api.sendSerializedTraces(payload);
+            mapper.reset();
+            if (response.success()) {
+                if (log.isDebugEnabled()) {
+                    log.debug(
+                            "Successfully sent {} traces of size {} bytes to the API {}",
+                            messageCount,
+                            sizeInBytes,
+                            mapper.endpoint());
+                }
+                healthMetrics.onSend(messageCount, sizeInBytes, response);
+            } else {
+                if (log.isDebugEnabled()) {
+                    log.debug(
+                            "Failed to send {} traces of size {} bytes to the API {} status {} response {}",
+                            messageCount,
+                            sizeInBytes,
+                            mapper.endpoint(),
+                            response.status(),
+                            response.response());
+                }
+                healthMetrics.onFailedSend(messageCount, sizeInBytes, response);
+            }
         }
-        healthMetrics.onFailedSend(messageCount, sizeInBytes, response);
-      }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/PrintingWriter.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/PrintingWriter.java
index e882abcd5e8..b74279dd697 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/PrintingWriter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/PrintingWriter.java
@@ -14,53 +14,50 @@
 import okio.Okio;
 
 public class PrintingWriter implements Writer {
-  private final BufferedSink sink;
-  private final JsonAdapter<Map<String, List<List<DDSpan>>>> jsonAdapter;
-
-  public PrintingWriter(final OutputStream outputStream, final boolean hexIds) {
-    sink = Okio.buffer(Okio.sink(outputStream));
-
-    this.jsonAdapter =
-        new Moshi.Builder()
-            .add(DDSpanJsonAdapter.buildFactory(hexIds))
-            .build()
-            .adapter(
-                Types.newParameterizedType(
-                    Map.class,
-                    String.class,
-                    Types.newParameterizedType(
-                        List.class, Types.newParameterizedType(List.class, DDSpan.class))));
-  }
+    private final BufferedSink sink;
+    private final JsonAdapter<Map<String, List<List<DDSpan>>>> jsonAdapter;
+
+    public PrintingWriter(final OutputStream outputStream, final boolean hexIds) {
+        sink = Okio.buffer(Okio.sink(outputStream));
+
+        this.jsonAdapter = new Moshi.Builder()
+                .add(DDSpanJsonAdapter.buildFactory(hexIds))
+                .build()
+                .adapter(Types.newParameterizedType(
+                        Map.class,
+                        String.class,
+                        Types.newParameterizedType(List.class, Types.newParameterizedType(List.class, DDSpan.class))));
+    }
 
-  @Override
-  public void write(final List<DDSpan> trace) {
-    final List<List<DDSpan>> tracesList = Collections.singletonList(trace);
-    try {
-      synchronized (sink) {
-        jsonAdapter.toJson(sink, Collections.singletonMap("traces", tracesList));
-        sink.writeString("\n", StandardCharsets.UTF_8);
-        sink.flush();
-      }
-    } catch (final IOException e) {
-      // do nothing
+    @Override
+    public void write(final List<DDSpan> trace) {
+        final List<List<DDSpan>> tracesList = Collections.singletonList(trace);
+        try {
+            synchronized (sink) {
+                jsonAdapter.toJson(sink, Collections.singletonMap("traces", tracesList));
+                sink.writeString("\n", StandardCharsets.UTF_8);
+                sink.flush();
+            }
+        } catch (final IOException e) {
+            // do nothing
+        }
     }
-  }
 
-  @Override
-  public void start() {
-    // do nothing
-  }
+    @Override
+    public void start() {
+        // do nothing
+    }
 
-  @Override
-  public boolean flush() {
-    return true;
-  }
+    @Override
+    public boolean flush() {
+        return true;
+    }
 
-  @Override
-  public void close() {
-    // do nothing
-  }
+    @Override
+    public void close() {
+        // do nothing
+    }
 
-  @Override
-  public void incrementDropCounts(int spanCount) {}
+    @Override
+    public void incrementDropCounts(int spanCount) {}
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteApi.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteApi.java
index 72d4562d7f1..66a61b74634 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteApi.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteApi.java
@@ -8,158 +8,152 @@
 
 public abstract class RemoteApi {
 
-  protected final IOLogger ioLogger = new IOLogger(getLogger());
-
-  protected long totalTraces = 0;
-  protected long receivedTraces = 0;
-  protected long sentTraces = 0;
-  protected long failedTraces = 0;
-
-  private final boolean compressionEnabled;
-
-  protected RemoteApi(boolean compressionEnabled) {
-    this.compressionEnabled = compressionEnabled;
-  }
-
-  public boolean isCompressionEnabled() {
-    return compressionEnabled;
-  }
-
-  protected void countAndLogSuccessfulSend(final int traceCount, final int sizeInBytes) {
-    // count the successful traces
-    sentTraces += traceCount;
-
-    ioLogger.success(createSendLogMessage(traceCount, sizeInBytes, "Success"));
-  }
-
-  protected void countAndLogFailedSend(
-      final int traceCount,
-      final int sizeInBytes,
-      final okhttp3.Response response,
-      final IOException outer) {
-    // count the failed traces
-    failedTraces += traceCount;
-    // these are used to catch and log if there is a failure in debug logging the response body
-    String responseBody = getResponseBody(response);
-    String sendErrorString =
-        createSendLogMessage(
-            traceCount, sizeInBytes, responseBody.isEmpty() ? "Error" : responseBody);
-
-    ioLogger.error(sendErrorString, toLoggerResponse(response, responseBody), outer);
-  }
-
-  protected static IOLogger.Response toLoggerResponse(okhttp3.Response response, String body) {
-    if (response == null) {
-      return null;
-    }
-    return new IOLogger.Response(response.code(), response.message(), body);
-  }
-
-  protected String createSendLogMessage(
-      final int traceCount, final int sizeInBytes, final String prefix) {
-    String sizeString = sizeInBytes > 1024 ? (sizeInBytes / 1024) + "KB" : sizeInBytes + "B";
-    return prefix
-        + " while sending "
-        + traceCount
-        + " (size="
-        + sizeString
-        + ")"
-        + " traces."
-        + " Total: "
-        + totalTraces
-        + ", Received: "
-        + receivedTraces
-        + ", Sent: "
-        + sentTraces
-        + ", Failed: "
-        + failedTraces
-        + ".";
-  }
-
-  protected static String getResponseBody(okhttp3.Response response) {
-    if (response != null) {
-      try {
-        return response.body().string().trim();
-      } catch (Exception ignored) {
-      }
-    }
-    return "";
-  }
-
-  protected abstract Response sendSerializedTraces(final Payload payload);
-
-  protected abstract Logger getLogger();
-
-  /**
-   * Encapsulates an attempted response from the remote location.
-   *
-   * <p>If communication fails or times out, the Response will NOT be successful and will lack
-   * status code, but will have an exception.
-   *
-   * <p>If an communication occurs, the Response will have a status code and will be marked as
-   * success or fail in accordance with the code.
-   *
-   * <p>NOTE: A successful communication may still contain an exception if there was a problem
-   * parsing the response from the Datadog agent.
-   */
-  public static final class Response {
-    /** Factory method for a successful request with a trivial response body */
-    public static Response success(final int status) {
-      return new Response(true, status, null, null);
-    }
+    protected final IOLogger ioLogger = new IOLogger(getLogger());
 
-    /** Factory method for a successful request with a trivial response body */
-    public static Response success(final int status, String response) {
-      return new Response(true, status, null, response);
-    }
+    protected long totalTraces = 0;
+    protected long receivedTraces = 0;
+    protected long sentTraces = 0;
+    protected long failedTraces = 0;
 
-    /** Factory method for a successful request will a malformed response body */
-    public static Response success(final int status, final Throwable exception) {
-      return new Response(true, status, exception, null);
-    }
+    private final boolean compressionEnabled;
 
-    /** Factory method for a request that receive an error status in response */
-    public static Response failed(final int status) {
-      return new Response(false, status, null, null);
+    protected RemoteApi(boolean compressionEnabled) {
+        this.compressionEnabled = compressionEnabled;
     }
 
-    /** Factory method for a request that receive an error status and a trivial response body */
-    public static Response failed(final int status, String response) {
-      return new Response(false, status, null, response);
+    public boolean isCompressionEnabled() {
+        return compressionEnabled;
     }
 
-    /** Factory method for a failed communication attempt */
-    public static Response failed(final Throwable exception) {
-      return new Response(false, null, exception, null);
+    protected void countAndLogSuccessfulSend(final int traceCount, final int sizeInBytes) {
+        // count the successful traces
+        sentTraces += traceCount;
+
+        ioLogger.success(createSendLogMessage(traceCount, sizeInBytes, "Success"));
     }
 
-    private final boolean success;
-    private final Integer status;
-    private final Throwable exception;
-    private final String response;
-
-    private Response(
-        final boolean success, final Integer status, final Throwable exception, String response) {
-      this.success = success;
-      this.status = status;
-      this.exception = exception;
-      this.response = response;
+    protected void countAndLogFailedSend(
+            final int traceCount, final int sizeInBytes, final okhttp3.Response response, final IOException outer) {
+        // count the failed traces
+        failedTraces += traceCount;
+        // these are used to catch and log if there is a failure in debug logging the response body
+        String responseBody = getResponseBody(response);
+        String sendErrorString =
+                createSendLogMessage(traceCount, sizeInBytes, responseBody.isEmpty() ? "Error" : responseBody);
+
+        ioLogger.error(sendErrorString, toLoggerResponse(response, responseBody), outer);
     }
 
-    public boolean success() {
-      return success;
+    protected static IOLogger.Response toLoggerResponse(okhttp3.Response response, String body) {
+        if (response == null) {
+            return null;
+        }
+        return new IOLogger.Response(response.code(), response.message(), body);
     }
 
-    public OptionalInt status() {
-      return status == null ? OptionalInt.empty() : OptionalInt.of(status);
+    protected String createSendLogMessage(final int traceCount, final int sizeInBytes, final String prefix) {
+        String sizeString = sizeInBytes > 1024 ? (sizeInBytes / 1024) + "KB" : sizeInBytes + "B";
+        return prefix
+                + " while sending "
+                + traceCount
+                + " (size="
+                + sizeString
+                + ")"
+                + " traces."
+                + " Total: "
+                + totalTraces
+                + ", Received: "
+                + receivedTraces
+                + ", Sent: "
+                + sentTraces
+                + ", Failed: "
+                + failedTraces
+                + ".";
     }
 
-    public Optional<Throwable> exception() {
-      return Optional.ofNullable(exception);
+    protected static String getResponseBody(okhttp3.Response response) {
+        if (response != null) {
+            try {
+                return response.body().string().trim();
+            } catch (Exception ignored) {
+            }
+        }
+        return "";
     }
 
-    public String response() {
-      return response;
+    protected abstract Response sendSerializedTraces(final Payload payload);
+
+    protected abstract Logger getLogger();
+
+    /**
+     * Encapsulates an attempted response from the remote location.
+     *
+     * <p>If communication fails or times out, the Response will NOT be successful and will lack
+     * status code, but will have an exception.
+     *
+     * <p>If an communication occurs, the Response will have a status code and will be marked as
+     * success or fail in accordance with the code.
+     *
+     * <p>NOTE: A successful communication may still contain an exception if there was a problem
+     * parsing the response from the Datadog agent.
+     */
+    public static final class Response {
+        /** Factory method for a successful request with a trivial response body */
+        public static Response success(final int status) {
+            return new Response(true, status, null, null);
+        }
+
+        /** Factory method for a successful request with a trivial response body */
+        public static Response success(final int status, String response) {
+            return new Response(true, status, null, response);
+        }
+
+        /** Factory method for a successful request will a malformed response body */
+        public static Response success(final int status, final Throwable exception) {
+            return new Response(true, status, exception, null);
+        }
+
+        /** Factory method for a request that receive an error status in response */
+        public static Response failed(final int status) {
+            return new Response(false, status, null, null);
+        }
+
+        /** Factory method for a request that receive an error status and a trivial response body */
+        public static Response failed(final int status, String response) {
+            return new Response(false, status, null, response);
+        }
+
+        /** Factory method for a failed communication attempt */
+        public static Response failed(final Throwable exception) {
+            return new Response(false, null, exception, null);
+        }
+
+        private final boolean success;
+        private final Integer status;
+        private final Throwable exception;
+        private final String response;
+
+        private Response(final boolean success, final Integer status, final Throwable exception, String response) {
+            this.success = success;
+            this.status = status;
+            this.exception = exception;
+            this.response = response;
+        }
+
+        public boolean success() {
+            return success;
+        }
+
+        public OptionalInt status() {
+            return status == null ? OptionalInt.empty() : OptionalInt.of(status);
+        }
+
+        public Optional<Throwable> exception() {
+            return Optional.ofNullable(exception);
+        }
+
+        public String response() {
+            return response;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteMapper.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteMapper.java
index 0db05e55f3a..51987f44ce3 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteMapper.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteMapper.java
@@ -12,50 +12,50 @@
 
 public interface RemoteMapper extends Mapper<List<? extends CoreSpan<?>>> {
 
-  RemoteMapper NO_OP = new NoopRemoteMapper();
+    RemoteMapper NO_OP = new NoopRemoteMapper();
 
-  static final byte[] RUNTIME_ID = DDTags.RUNTIME_ID_TAG.getBytes(UTF_8);
-  static final byte[] LANGUAGE = DDTags.LANGUAGE_TAG_KEY.getBytes(UTF_8);
+    static final byte[] RUNTIME_ID = DDTags.RUNTIME_ID_TAG.getBytes(UTF_8);
+    static final byte[] LANGUAGE = DDTags.LANGUAGE_TAG_KEY.getBytes(UTF_8);
 
-  static final byte[] SERVICE = "service".getBytes(UTF_8);
-  static final byte[] NAME = "name".getBytes(UTF_8);
-  static final byte[] RESOURCE = "resource".getBytes(UTF_8);
-  static final byte[] TRACE_ID = "trace_id".getBytes(UTF_8);
-  static final byte[] SPAN_ID = "span_id".getBytes(UTF_8);
-  static final byte[] PARENT_ID = "parent_id".getBytes(UTF_8);
-  static final byte[] START = "start".getBytes(UTF_8);
-  static final byte[] DURATION = "duration".getBytes(UTF_8);
-  static final byte[] TYPE = "type".getBytes(UTF_8);
-  static final byte[] ERROR = "error".getBytes(UTF_8);
-  static final byte[] METRICS = "metrics".getBytes(UTF_8);
-  static final byte[] META = "meta".getBytes(UTF_8);
+    static final byte[] SERVICE = "service".getBytes(UTF_8);
+    static final byte[] NAME = "name".getBytes(UTF_8);
+    static final byte[] RESOURCE = "resource".getBytes(UTF_8);
+    static final byte[] TRACE_ID = "trace_id".getBytes(UTF_8);
+    static final byte[] SPAN_ID = "span_id".getBytes(UTF_8);
+    static final byte[] PARENT_ID = "parent_id".getBytes(UTF_8);
+    static final byte[] START = "start".getBytes(UTF_8);
+    static final byte[] DURATION = "duration".getBytes(UTF_8);
+    static final byte[] TYPE = "type".getBytes(UTF_8);
+    static final byte[] ERROR = "error".getBytes(UTF_8);
+    static final byte[] METRICS = "metrics".getBytes(UTF_8);
+    static final byte[] META = "meta".getBytes(UTF_8);
 
-  UTF8BytesString HTTP_STATUS = UTF8BytesString.create(Tags.HTTP_STATUS);
+    UTF8BytesString HTTP_STATUS = UTF8BytesString.create(Tags.HTTP_STATUS);
 
-  Payload newPayload();
+    Payload newPayload();
 
-  int messageBufferSize();
+    int messageBufferSize();
 
-  String endpoint();
+    String endpoint();
 
-  class NoopRemoteMapper implements RemoteMapper {
+    class NoopRemoteMapper implements RemoteMapper {
 
-    @Override
-    public void map(List<? extends CoreSpan<?>> data, Writable packer) {}
+        @Override
+        public void map(List<? extends CoreSpan<?>> data, Writable packer) {}
 
-    @Override
-    public Payload newPayload() {
-      return null;
-    }
+        @Override
+        public Payload newPayload() {
+            return null;
+        }
 
-    @Override
-    public int messageBufferSize() {
-      return 0;
-    }
+        @Override
+        public int messageBufferSize() {
+            return 0;
+        }
 
-    @Override
-    public String endpoint() {
-      return null;
+        @Override
+        public String endpoint() {
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteMapperDiscovery.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteMapperDiscovery.java
index a09674282f9..2d9caf4ab9a 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteMapperDiscovery.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteMapperDiscovery.java
@@ -1,7 +1,7 @@
 package datadog.trace.common.writer;
 
 public interface RemoteMapperDiscovery {
-  void discover();
+    void discover();
 
-  RemoteMapper getMapper();
+    RemoteMapper getMapper();
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteResponseListener.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteResponseListener.java
index d51440a0873..ed5d20bc5a9 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteResponseListener.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteResponseListener.java
@@ -3,6 +3,6 @@
 import java.util.Map;
 
 public interface RemoteResponseListener {
-  /** Invoked after the api receives a response from the remote service. */
-  void onResponse(String endpoint, Map<String, Map<String, Number>> responseJson);
+    /** Invoked after the api receives a response from the remote service. */
+    void onResponse(String endpoint, Map<String, Map<String, Number>> responseJson);
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteWriter.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteWriter.java
index c4c6801bd05..23682657946 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteWriter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteWriter.java
@@ -28,151 +28,150 @@
  */
 public abstract class RemoteWriter implements Writer {
 
-  private static final Logger log = LoggerFactory.getLogger(RemoteWriter.class);
-
-  private final RatelimitedLogger rlLog = new RatelimitedLogger(log, 1, MINUTES);
-
-  protected final TraceProcessingWorker traceProcessingWorker;
-  private final PayloadDispatcher dispatcher;
-  private final boolean alwaysFlush;
-  private final int flushTimeout;
-  private final TimeUnit flushTimeoutUnit;
-
-  private volatile boolean closed;
-  public final HealthMetrics healthMetrics;
-
-  protected RemoteWriter(
-      final TraceProcessingWorker traceProcessingWorker,
-      final PayloadDispatcher dispatcher,
-      final HealthMetrics healthMetrics,
-      final int flushTimeout,
-      final TimeUnit flushTimeoutUnit,
-      final boolean alwaysFlush) {
-    this.traceProcessingWorker = traceProcessingWorker;
-    this.dispatcher = dispatcher;
-    this.healthMetrics = healthMetrics;
-    this.flushTimeout = flushTimeout;
-    this.flushTimeoutUnit = flushTimeoutUnit;
-    this.alwaysFlush = alwaysFlush;
-  }
-
-  protected RemoteWriter(
-      final TraceProcessingWorker traceProcessingWorker,
-      final PayloadDispatcher dispatcher,
-      final HealthMetrics healthMetrics,
-      final boolean alwaysFlush) {
-    // Default constructor with 1 second of flush timeout. Used by the DDAgentWriter.
-    this(traceProcessingWorker, dispatcher, healthMetrics, 1, TimeUnit.SECONDS, alwaysFlush);
-  }
-
-  @Override
-  public void write(final List<DDSpan> trace) {
-    if (closed) {
-      // We can't add events after shutdown otherwise it will never complete shutting down.
-      log.debug("Dropped due to shutdown: {}", trace);
-      handleDroppedTrace(trace);
-    } else {
-      if (trace.isEmpty()) {
-        log.debug("Dropped an empty trace.");
-        handleDroppedTrace(trace);
-      } else {
-        final DDSpan root = trace.get(0);
-        final int samplingPriority = root.samplingPriority();
-        switch (traceProcessingWorker.publish(root, samplingPriority, trace)) {
-          case ENQUEUED_FOR_SERIALIZATION:
-            log.debug("Enqueued for serialization: {}", trace);
-            healthMetrics.onPublish(trace, samplingPriority);
-            break;
-          case ENQUEUED_FOR_SINGLE_SPAN_SAMPLING:
-            log.debug("Enqueued for single span sampling: {}", trace);
-            break;
-          case DROPPED_BY_POLICY:
-            log.debug("Dropped by the policy: {}", trace);
+    private static final Logger log = LoggerFactory.getLogger(RemoteWriter.class);
+
+    private final RatelimitedLogger rlLog = new RatelimitedLogger(log, 1, MINUTES);
+
+    protected final TraceProcessingWorker traceProcessingWorker;
+    private final PayloadDispatcher dispatcher;
+    private final boolean alwaysFlush;
+    private final int flushTimeout;
+    private final TimeUnit flushTimeoutUnit;
+
+    private volatile boolean closed;
+    public final HealthMetrics healthMetrics;
+
+    protected RemoteWriter(
+            final TraceProcessingWorker traceProcessingWorker,
+            final PayloadDispatcher dispatcher,
+            final HealthMetrics healthMetrics,
+            final int flushTimeout,
+            final TimeUnit flushTimeoutUnit,
+            final boolean alwaysFlush) {
+        this.traceProcessingWorker = traceProcessingWorker;
+        this.dispatcher = dispatcher;
+        this.healthMetrics = healthMetrics;
+        this.flushTimeout = flushTimeout;
+        this.flushTimeoutUnit = flushTimeoutUnit;
+        this.alwaysFlush = alwaysFlush;
+    }
+
+    protected RemoteWriter(
+            final TraceProcessingWorker traceProcessingWorker,
+            final PayloadDispatcher dispatcher,
+            final HealthMetrics healthMetrics,
+            final boolean alwaysFlush) {
+        // Default constructor with 1 second of flush timeout. Used by the DDAgentWriter.
+        this(traceProcessingWorker, dispatcher, healthMetrics, 1, TimeUnit.SECONDS, alwaysFlush);
+    }
+
+    @Override
+    public void write(final List<DDSpan> trace) {
+        if (closed) {
+            // We can't add events after shutdown otherwise it will never complete shutting down.
+            log.debug("Dropped due to shutdown: {}", trace);
             handleDroppedTrace(trace);
-            break;
-          case DROPPED_BUFFER_OVERFLOW:
-            if (log.isDebugEnabled()) {
-              log.debug("Dropped due to a buffer overflow: {}", trace);
+        } else {
+            if (trace.isEmpty()) {
+                log.debug("Dropped an empty trace.");
+                handleDroppedTrace(trace);
             } else {
-              rlLog.warn(
-                  "Dropped a kept trace due to a buffer overflow: [{} spans]."
-                      + " Traces are being produced faster than they can be sent to the agent.",
-                  trace.size());
+                final DDSpan root = trace.get(0);
+                final int samplingPriority = root.samplingPriority();
+                switch (traceProcessingWorker.publish(root, samplingPriority, trace)) {
+                    case ENQUEUED_FOR_SERIALIZATION:
+                        log.debug("Enqueued for serialization: {}", trace);
+                        healthMetrics.onPublish(trace, samplingPriority);
+                        break;
+                    case ENQUEUED_FOR_SINGLE_SPAN_SAMPLING:
+                        log.debug("Enqueued for single span sampling: {}", trace);
+                        break;
+                    case DROPPED_BY_POLICY:
+                        log.debug("Dropped by the policy: {}", trace);
+                        handleDroppedTrace(trace);
+                        break;
+                    case DROPPED_BUFFER_OVERFLOW:
+                        if (log.isDebugEnabled()) {
+                            log.debug("Dropped due to a buffer overflow: {}", trace);
+                        } else {
+                            rlLog.warn(
+                                    "Dropped a kept trace due to a buffer overflow: [{} spans]."
+                                            + " Traces are being produced faster than they can be sent to the agent.",
+                                    trace.size());
+                        }
+                        handleDroppedTrace(trace);
+                        break;
+                    case DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT:
+                        // Only sampled-out traces were lost, so this is not worth alarming the user over.
+                        log.debug("Dropped a sampled-out trace due to a buffer overflow: {}", trace);
+                        handleDroppedTrace(trace);
+                        break;
+                    case DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN:
+                        if (log.isDebugEnabled()) {
+                            log.debug("Dropped a single span sampling candidate due to a buffer overflow: {}", trace);
+                        } else {
+                            rlLog.warn(
+                                    "Dropped a single span sampling candidate due to a buffer overflow: [{} spans]."
+                                            + " Traces are being produced faster than they can be sent to the agent.",
+                                    trace.size());
+                        }
+                        handleDroppedTrace(trace);
+                        break;
+                }
             }
-            handleDroppedTrace(trace);
-            break;
-          case DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT:
-            // Only sampled-out traces were lost, so this is not worth alarming the user over.
-            log.debug("Dropped a sampled-out trace due to a buffer overflow: {}", trace);
-            handleDroppedTrace(trace);
-            break;
-          case DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN:
-            if (log.isDebugEnabled()) {
-              log.debug(
-                  "Dropped a single span sampling candidate due to a buffer overflow: {}", trace);
-            } else {
-              rlLog.warn(
-                  "Dropped a single span sampling candidate due to a buffer overflow: [{} spans]."
-                      + " Traces are being produced faster than they can be sent to the agent.",
-                  trace.size());
+        }
+        if (alwaysFlush) {
+            flush();
+        }
+    }
+
+    private void handleDroppedTrace(final List<DDSpan> trace) {
+        int samplingPriority = trace.isEmpty() ? UNSET : trace.get(0).samplingPriority();
+        healthMetrics.onFailedPublish(samplingPriority, trace.size());
+        incrementDropCounts(trace.size());
+    }
+
+    // Exposing some statistics for consumption by monitors
+    public final long getCapacity() {
+        return traceProcessingWorker.getCapacity();
+    }
+
+    @Override
+    public boolean flush() {
+        if (!closed) {
+            if (traceProcessingWorker.flush(flushTimeout, flushTimeoutUnit)) {
+                healthMetrics.onFlush(false);
+                return true;
             }
-            handleDroppedTrace(trace);
-            break;
         }
-      }
+        return false;
     }
-    if (alwaysFlush) {
-      flush();
+
+    @Override
+    public void start() {
+        if (!closed) {
+            traceProcessingWorker.start();
+            healthMetrics.start();
+            healthMetrics.onStart((int) getCapacity());
+        }
     }
-  }
-
-  private void handleDroppedTrace(final List<DDSpan> trace) {
-    int samplingPriority = trace.isEmpty() ? UNSET : trace.get(0).samplingPriority();
-    healthMetrics.onFailedPublish(samplingPriority, trace.size());
-    incrementDropCounts(trace.size());
-  }
-
-  // Exposing some statistics for consumption by monitors
-  public final long getCapacity() {
-    return traceProcessingWorker.getCapacity();
-  }
-
-  @Override
-  public boolean flush() {
-    if (!closed) {
-      if (traceProcessingWorker.flush(flushTimeout, flushTimeoutUnit)) {
-        healthMetrics.onFlush(false);
-        return true;
-      }
+
+    @Override
+    public void close() {
+        final boolean flushed = flush();
+        closed = true;
+        traceProcessingWorker.close();
+        healthMetrics.onShutdown(flushed);
+        healthMetrics.close();
     }
-    return false;
-  }
-
-  @Override
-  public void start() {
-    if (!closed) {
-      traceProcessingWorker.start();
-      healthMetrics.start();
-      healthMetrics.onStart((int) getCapacity());
+
+    @Override
+    public void incrementDropCounts(int spanCount) {
+        dispatcher.onDroppedTrace(spanCount);
+    }
+
+    // used by tests
+    public Collection<RemoteApi> getApis() {
+        return dispatcher.getApis();
     }
-  }
-
-  @Override
-  public void close() {
-    final boolean flushed = flush();
-    closed = true;
-    traceProcessingWorker.close();
-    healthMetrics.onShutdown(flushed);
-    healthMetrics.close();
-  }
-
-  @Override
-  public void incrementDropCounts(int spanCount) {
-    dispatcher.onDroppedTrace(spanCount);
-  }
-
-  // used by tests
-  public Collection<RemoteApi> getApis() {
-    return dispatcher.getApis();
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/SpanSamplingWorker.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/SpanSamplingWorker.java
index f33fb5e10e1..bd2e96b628f 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/SpanSamplingWorker.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/SpanSamplingWorker.java
@@ -19,176 +19,176 @@
 import org.slf4j.LoggerFactory;
 
 public interface SpanSamplingWorker extends AutoCloseable {
-  static SpanSamplingWorker build(
-      int capacity,
-      Queue<Object> primaryQueue,
-      Queue<Object> secondaryQueue,
-      SingleSpanSampler singleSpanSampler,
-      HealthMetrics healthMetrics,
-      DroppingPolicy droppingPolicy) {
-    if (singleSpanSampler == null) {
-      return new NoopSpanSamplingWorker();
-    }
-    return new DefaultSpanSamplingWorker(
-        capacity, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, droppingPolicy);
-  }
-
-  void start();
-
-  Queue<Object> getSpanSamplingQueue();
-
-  @Override
-  void close();
-
-  class DefaultSpanSamplingWorker implements SpanSamplingWorker {
-
-    private static final Logger log = LoggerFactory.getLogger(SpanSamplingWorker.class);
-
-    private final Thread spanSamplingThread;
-    private final SamplingHandler samplingHandler;
-    private final MessagePassingBlockingQueue<Object> spanSamplingQueue;
-    private final Queue<Object> primaryQueue;
-    private final Queue<Object> secondaryQueue;
-    private final SingleSpanSampler singleSpanSampler;
-    private final HealthMetrics healthMetrics;
-
-    private final DroppingPolicy droppingPolicy;
-
-    protected DefaultSpanSamplingWorker(
-        int capacity,
-        Queue<Object> primaryQueue,
-        Queue<Object> secondaryQueue,
-        SingleSpanSampler singleSpanSampler,
-        HealthMetrics healthMetrics,
-        DroppingPolicy droppingPolicy) {
-      this.samplingHandler = new SamplingHandler();
-      this.spanSamplingThread = newAgentThread(SPAN_SAMPLING_PROCESSOR, samplingHandler);
-      this.spanSamplingQueue = Queues.mpscBlockingConsumerArrayQueue(capacity);
-      this.primaryQueue = primaryQueue;
-      this.secondaryQueue = secondaryQueue;
-      this.singleSpanSampler = singleSpanSampler;
-      this.healthMetrics = healthMetrics;
-      this.droppingPolicy = droppingPolicy;
+    static SpanSamplingWorker build(
+            int capacity,
+            Queue<Object> primaryQueue,
+            Queue<Object> secondaryQueue,
+            SingleSpanSampler singleSpanSampler,
+            HealthMetrics healthMetrics,
+            DroppingPolicy droppingPolicy) {
+        if (singleSpanSampler == null) {
+            return new NoopSpanSamplingWorker();
+        }
+        return new DefaultSpanSamplingWorker(
+                capacity, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, droppingPolicy);
     }
 
-    @Override
-    public void start() {
-      this.spanSamplingThread.start();
-    }
+    void start();
 
-    @Override
-    public void close() {
-      spanSamplingThread.interrupt();
-      try {
-        spanSamplingThread.join(THREAD_JOIN_TIMOUT_MS);
-      } catch (InterruptedException ignored) {
-      }
-    }
+    Queue<Object> getSpanSamplingQueue();
 
     @Override
-    public Queue<Object> getSpanSamplingQueue() {
-      return spanSamplingQueue;
-    }
-
-    protected void afterOnEvent() {
-      // this method is used in tests only
-    }
+    void close();
+
+    class DefaultSpanSamplingWorker implements SpanSamplingWorker {
+
+        private static final Logger log = LoggerFactory.getLogger(SpanSamplingWorker.class);
+
+        private final Thread spanSamplingThread;
+        private final SamplingHandler samplingHandler;
+        private final MessagePassingBlockingQueue<Object> spanSamplingQueue;
+        private final Queue<Object> primaryQueue;
+        private final Queue<Object> secondaryQueue;
+        private final SingleSpanSampler singleSpanSampler;
+        private final HealthMetrics healthMetrics;
+
+        private final DroppingPolicy droppingPolicy;
+
+        protected DefaultSpanSamplingWorker(
+                int capacity,
+                Queue<Object> primaryQueue,
+                Queue<Object> secondaryQueue,
+                SingleSpanSampler singleSpanSampler,
+                HealthMetrics healthMetrics,
+                DroppingPolicy droppingPolicy) {
+            this.samplingHandler = new SamplingHandler();
+            this.spanSamplingThread = newAgentThread(SPAN_SAMPLING_PROCESSOR, samplingHandler);
+            this.spanSamplingQueue = Queues.mpscBlockingConsumerArrayQueue(capacity);
+            this.primaryQueue = primaryQueue;
+            this.secondaryQueue = secondaryQueue;
+            this.singleSpanSampler = singleSpanSampler;
+            this.healthMetrics = healthMetrics;
+            this.droppingPolicy = droppingPolicy;
+        }
 
-    private final class SamplingHandler implements Runnable {
+        @Override
+        public void start() {
+            this.spanSamplingThread.start();
+        }
 
-      @Override
-      public void run() {
-        try {
-          runDutyCycle();
-        } catch (InterruptedException e) {
-          Thread.currentThread().interrupt();
+        @Override
+        public void close() {
+            spanSamplingThread.interrupt();
+            try {
+                spanSamplingThread.join(THREAD_JOIN_TIMOUT_MS);
+            } catch (InterruptedException ignored) {
+            }
         }
-      }
 
-      private void runDutyCycle() throws InterruptedException {
-        Thread thread = Thread.currentThread();
-        while (!thread.isInterrupted()) {
-          consumeFromInputQueue();
+        @Override
+        public Queue<Object> getSpanSamplingQueue() {
+            return spanSamplingQueue;
         }
-      }
 
-      private void consumeFromInputQueue() throws InterruptedException {
-        Object event = spanSamplingQueue.poll(100, MILLISECONDS);
-        if (null != event) {
-          onEvent(event);
-          consumeBatch(spanSamplingQueue);
+        protected void afterOnEvent() {
+            // this method is used in tests only
         }
-      }
-
-      @SuppressWarnings("unchecked")
-      public void onEvent(Object event) {
-        if (event instanceof List) {
-          List<DDSpan> trace = (List<DDSpan>) event;
-
-          if (trace.isEmpty()) {
-            // protect against empty traces
-            log.warn("SingleSamplingWorker has received an empty trace.");
-            return;
-          }
-
-          ArrayList<DDSpan> sampledSpans = new ArrayList<>(trace.size());
-          ArrayList<DDSpan> unsampledSpans = new ArrayList<>(trace.size());
-          for (DDSpan span : trace) {
-            if (singleSpanSampler.setSamplingPriority(span)) {
-              sampledSpans.add(span);
-              healthMetrics.onSingleSpanSample();
-            } else {
-              unsampledSpans.add(span);
-              healthMetrics.onSingleSpanUnsampled();
+
+        private final class SamplingHandler implements Runnable {
+
+            @Override
+            public void run() {
+                try {
+                    runDutyCycle();
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
             }
-          }
-
-          int samplingPriority = trace.get(0).samplingPriority();
-          if (sampledSpans.size() > 0 && !primaryQueue.offer(sampledSpans)) {
-            // couldn't send sampled spans because the queue is full, count entire trace as dropped
-            healthMetrics.onFailedPublish(samplingPriority, trace.size());
-            log.debug(
-                "Sampled spans written to overfilled buffer after single span sampling. Counted but dropping trace: {}",
-                trace);
-          } else if (unsampledSpans.size() > 0
-              && (droppingPolicy.active() || !secondaryQueue.offer(unsampledSpans))) {
-            if (sampledSpans.isEmpty()) {
-              // dropped all spans because none of the spans sampled
-              healthMetrics.onFailedPublish(samplingPriority, unsampledSpans.size());
-              log.debug(
-                  "Trace is empty. None of the spans have been sampled by single span sampling. Counted but dropping trace: {}",
-                  trace);
-            } else {
-              healthMetrics.onPartialPublish(unsampledSpans.size());
-              log.debug(
-                  "Unsampled spans dropped after single span sampling because Dropping Policy is active (droppingPolicy.active()={}) or the queue is full. Counted partial trace: {}",
-                  droppingPolicy.active(),
-                  sampledSpans);
+
+            private void runDutyCycle() throws InterruptedException {
+                Thread thread = Thread.currentThread();
+                while (!thread.isInterrupted()) {
+                    consumeFromInputQueue();
+                }
             }
-          } else {
-            log.debug("Entire trace has been published: {}", trace);
-            healthMetrics.onPublish(trace, samplingPriority);
-          }
-          afterOnEvent();
-        }
-      }
 
-      private void consumeBatch(MessagePassingQueue<Object> queue) {
-        queue.drain(this::onEvent, queue.size());
-      }
-    }
-  }
+            private void consumeFromInputQueue() throws InterruptedException {
+                Object event = spanSamplingQueue.poll(100, MILLISECONDS);
+                if (null != event) {
+                    onEvent(event);
+                    consumeBatch(spanSamplingQueue);
+                }
+            }
 
-  class NoopSpanSamplingWorker implements SpanSamplingWorker {
-    @Override
-    public void start() {}
+            @SuppressWarnings("unchecked")
+            public void onEvent(Object event) {
+                if (event instanceof List) {
+                    List<DDSpan> trace = (List<DDSpan>) event;
+
+                    if (trace.isEmpty()) {
+                        // protect against empty traces
+                        log.warn("SingleSamplingWorker has received an empty trace.");
+                        return;
+                    }
+
+                    ArrayList<DDSpan> sampledSpans = new ArrayList<>(trace.size());
+                    ArrayList<DDSpan> unsampledSpans = new ArrayList<>(trace.size());
+                    for (DDSpan span : trace) {
+                        if (singleSpanSampler.setSamplingPriority(span)) {
+                            sampledSpans.add(span);
+                            healthMetrics.onSingleSpanSample();
+                        } else {
+                            unsampledSpans.add(span);
+                            healthMetrics.onSingleSpanUnsampled();
+                        }
+                    }
+
+                    int samplingPriority = trace.get(0).samplingPriority();
+                    if (sampledSpans.size() > 0 && !primaryQueue.offer(sampledSpans)) {
+                        // couldn't send sampled spans because the queue is full, count entire trace as dropped
+                        healthMetrics.onFailedPublish(samplingPriority, trace.size());
+                        log.debug(
+                                "Sampled spans written to overfilled buffer after single span sampling. Counted but dropping trace: {}",
+                                trace);
+                    } else if (unsampledSpans.size() > 0
+                            && (droppingPolicy.active() || !secondaryQueue.offer(unsampledSpans))) {
+                        if (sampledSpans.isEmpty()) {
+                            // dropped all spans because none of the spans sampled
+                            healthMetrics.onFailedPublish(samplingPriority, unsampledSpans.size());
+                            log.debug(
+                                    "Trace is empty. None of the spans have been sampled by single span sampling. Counted but dropping trace: {}",
+                                    trace);
+                        } else {
+                            healthMetrics.onPartialPublish(unsampledSpans.size());
+                            log.debug(
+                                    "Unsampled spans dropped after single span sampling because Dropping Policy is active (droppingPolicy.active()={}) or the queue is full. Counted partial trace: {}",
+                                    droppingPolicy.active(),
+                                    sampledSpans);
+                        }
+                    } else {
+                        log.debug("Entire trace has been published: {}", trace);
+                        healthMetrics.onPublish(trace, samplingPriority);
+                    }
+                    afterOnEvent();
+                }
+            }
 
-    @Override
-    public Queue<Object> getSpanSamplingQueue() {
-      return null;
+            private void consumeBatch(MessagePassingQueue<Object> queue) {
+                queue.drain(this::onEvent, queue.size());
+            }
+        }
     }
 
-    @Override
-    public void close() {}
-  }
+    class NoopSpanSamplingWorker implements SpanSamplingWorker {
+        @Override
+        public void start() {}
+
+        @Override
+        public Queue<Object> getSpanSamplingQueue() {
+            return null;
+        }
+
+        @Override
+        public void close() {}
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceDumpJsonExporter.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceDumpJsonExporter.java
index e2b3c0fc976..d29584d33c2 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceDumpJsonExporter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceDumpJsonExporter.java
@@ -12,49 +12,48 @@
 
 public class TraceDumpJsonExporter implements Writer {
 
-  private static final JsonAdapter<Collection<DDSpan>> TRACE_ADAPTER =
-      new Moshi.Builder()
-          .add(DDSpanJsonAdapter.buildFactory(false))
-          .build()
-          .adapter(Types.newParameterizedType(Collection.class, DDSpan.class));
-  private StringBuilder dumpText;
-  private ZipOutputStream zip;
-
-  public TraceDumpJsonExporter(ZipOutputStream zip) {
-    this.zip = zip;
-    dumpText = new StringBuilder();
-  }
-
-  public void write(final Collection<DDSpan> trace) {
-    dumpText.append(TRACE_ADAPTER.toJson(trace));
-    dumpText.append('\n');
-  }
-
-  @Override
-  public void write(List<DDSpan> trace) {
-    // Do nothing
-  }
-
-  @Override
-  public void start() {
-    // do nothing
-  }
-
-  @Override
-  public boolean flush() {
-    try {
-      TracerFlare.addText(zip, "pending_traces.txt", dumpText.toString());
-    } catch (IOException e) {
-      // do nothing
+    private static final JsonAdapter<Collection<DDSpan>> TRACE_ADAPTER = new Moshi.Builder()
+            .add(DDSpanJsonAdapter.buildFactory(false))
+            .build()
+            .adapter(Types.newParameterizedType(Collection.class, DDSpan.class));
+    private StringBuilder dumpText;
+    private ZipOutputStream zip;
+
+    public TraceDumpJsonExporter(ZipOutputStream zip) {
+        this.zip = zip;
+        dumpText = new StringBuilder();
     }
-    return true;
-  }
 
-  @Override
-  public void close() {
-    // do nothing
-  }
+    public void write(final Collection<DDSpan> trace) {
+        dumpText.append(TRACE_ADAPTER.toJson(trace));
+        dumpText.append('\n');
+    }
+
+    @Override
+    public void write(List<DDSpan> trace) {
+        // Do nothing
+    }
+
+    @Override
+    public void start() {
+        // do nothing
+    }
+
+    @Override
+    public boolean flush() {
+        try {
+            TracerFlare.addText(zip, "pending_traces.txt", dumpText.toString());
+        } catch (IOException e) {
+            // do nothing
+        }
+        return true;
+    }
+
+    @Override
+    public void close() {
+        // do nothing
+    }
 
-  @Override
-  public void incrementDropCounts(int spanCount) {}
+    @Override
+    public void incrementDropCounts(int spanCount) {}
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceProcessingWorker.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceProcessingWorker.java
index 9b70b09bc9e..8d5e045b6d2 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceProcessingWorker.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceProcessingWorker.java
@@ -35,250 +35,238 @@
  */
 public class TraceProcessingWorker implements AutoCloseable {
 
-  private static final Logger log = LoggerFactory.getLogger(TraceProcessingWorker.class);
+    private static final Logger log = LoggerFactory.getLogger(TraceProcessingWorker.class);
 
-  private final PrioritizationStrategy prioritizationStrategy;
-  private final MessagePassingBlockingQueue<Object> primaryQueue;
-  private final MessagePassingBlockingQueue<Object> secondaryQueue;
-  private final TraceSerializingHandler serializingHandler;
-  private final Thread serializerThread;
-  private final int capacity;
-
-  private final SpanSamplingWorker spanSamplingWorker;
+    private final PrioritizationStrategy prioritizationStrategy;
+    private final MessagePassingBlockingQueue<Object> primaryQueue;
+    private final MessagePassingBlockingQueue<Object> secondaryQueue;
+    private final TraceSerializingHandler serializingHandler;
+    private final Thread serializerThread;
+    private final int capacity;
 
-  public TraceProcessingWorker(
-      final int capacity,
-      final HealthMetrics healthMetrics,
-      final PayloadDispatcher dispatcher,
-      final DroppingPolicy droppingPolicy,
-      final Prioritization prioritization,
-      final long flushInterval,
-      final TimeUnit timeUnit,
-      final SingleSpanSampler singleSpanSampler) {
-    this.capacity = capacity;
-    this.primaryQueue = createQueue(capacity);
-    this.secondaryQueue = createQueue(capacity);
-    this.spanSamplingWorker =
-        SpanSamplingWorker.build(
-            capacity,
-            primaryQueue,
-            secondaryQueue,
-            singleSpanSampler,
-            healthMetrics,
-            droppingPolicy);
-    this.prioritizationStrategy =
-        prioritization.create(
-            primaryQueue,
-            secondaryQueue,
-            spanSamplingWorker.getSpanSamplingQueue(),
-            droppingPolicy);
+    private final SpanSamplingWorker spanSamplingWorker;
 
-    this.serializingHandler =
-        new TraceSerializingHandler(
-            primaryQueue, secondaryQueue, healthMetrics, dispatcher, flushInterval, timeUnit);
-    this.serializerThread = newAgentThread(TRACE_PROCESSOR, serializingHandler);
-  }
+    public TraceProcessingWorker(
+            final int capacity,
+            final HealthMetrics healthMetrics,
+            final PayloadDispatcher dispatcher,
+            final DroppingPolicy droppingPolicy,
+            final Prioritization prioritization,
+            final long flushInterval,
+            final TimeUnit timeUnit,
+            final SingleSpanSampler singleSpanSampler) {
+        this.capacity = capacity;
+        this.primaryQueue = createQueue(capacity);
+        this.secondaryQueue = createQueue(capacity);
+        this.spanSamplingWorker = SpanSamplingWorker.build(
+                capacity, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, droppingPolicy);
+        this.prioritizationStrategy = prioritization.create(
+                primaryQueue, secondaryQueue, spanSamplingWorker.getSpanSamplingQueue(), droppingPolicy);
 
-  public void start() {
-    this.serializerThread.start();
-    this.spanSamplingWorker.start();
-  }
+        this.serializingHandler = new TraceSerializingHandler(
+                primaryQueue, secondaryQueue, healthMetrics, dispatcher, flushInterval, timeUnit);
+        this.serializerThread = newAgentThread(TRACE_PROCESSOR, serializingHandler);
+    }
 
-  public boolean flush(long timeout, TimeUnit timeUnit) {
-    CountDownLatch latch = new CountDownLatch(1);
-    FlushEvent flush = new FlushEvent(latch);
-    boolean offered;
-    do {
-      offered = primaryQueue.offer(flush);
-    } while (!offered && serializerThread.isAlive());
-    try {
-      return latch.await(timeout, timeUnit);
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      return false;
+    public void start() {
+        this.serializerThread.start();
+        this.spanSamplingWorker.start();
     }
-  }
 
-  @Override
-  public void close() {
-    spanSamplingWorker.close();
-    serializerThread.interrupt();
-    try {
-      serializerThread.join(THREAD_JOIN_TIMOUT_MS);
-    } catch (InterruptedException ignored) {
+    public boolean flush(long timeout, TimeUnit timeUnit) {
+        CountDownLatch latch = new CountDownLatch(1);
+        FlushEvent flush = new FlushEvent(latch);
+        boolean offered;
+        do {
+            offered = primaryQueue.offer(flush);
+        } while (!offered && serializerThread.isAlive());
+        try {
+            return latch.await(timeout, timeUnit);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            return false;
+        }
     }
-  }
 
-  public <T extends CoreSpan<T>> PrioritizationStrategy.PublishResult publish(
-      T root, int samplingPriority, final List<T> trace) {
-    return prioritizationStrategy.publish(root, samplingPriority, trace);
-  }
+    @Override
+    public void close() {
+        spanSamplingWorker.close();
+        serializerThread.interrupt();
+        try {
+            serializerThread.join(THREAD_JOIN_TIMOUT_MS);
+        } catch (InterruptedException ignored) {
+        }
+    }
 
-  public int getCapacity() {
-    return capacity;
-  }
+    public <T extends CoreSpan<T>> PrioritizationStrategy.PublishResult publish(
+            T root, int samplingPriority, final List<T> trace) {
+        return prioritizationStrategy.publish(root, samplingPriority, trace);
+    }
 
-  public long getRemainingCapacity() {
-    // only advertise primary capacity (partly to keep test which aims to saturate the queue happy)
-    return primaryQueue.remainingCapacity();
-  }
+    public int getCapacity() {
+        return capacity;
+    }
 
-  @VisibleForTesting
-  MessagePassingBlockingQueue<Object> getPrimaryQueue() {
-    return primaryQueue;
-  }
+    public long getRemainingCapacity() {
+        // only advertise primary capacity (partly to keep test which aims to saturate the queue happy)
+        return primaryQueue.remainingCapacity();
+    }
 
-  private static MessagePassingBlockingQueue<Object> createQueue(int capacity) {
-    return Queues.mpscBlockingConsumerArrayQueue(capacity);
-  }
+    @VisibleForTesting
+    MessagePassingBlockingQueue<Object> getPrimaryQueue() {
+        return primaryQueue;
+    }
 
-  public static class TraceSerializingHandler implements Runnable {
+    private static MessagePassingBlockingQueue<Object> createQueue(int capacity) {
+        return Queues.mpscBlockingConsumerArrayQueue(capacity);
+    }
 
-    private final MessagePassingBlockingQueue<Object> primaryQueue;
-    private final MessagePassingBlockingQueue<Object> secondaryQueue;
-    private final HealthMetrics healthMetrics;
-    private final long ticksRequiredToFlush;
-    private final boolean doTimeFlush;
-    private final PayloadDispatcher payloadDispatcher;
-    private long lastTicks;
+    public static class TraceSerializingHandler implements Runnable {
 
-    public TraceSerializingHandler(
-        final MessagePassingBlockingQueue<Object> primaryQueue,
-        final MessagePassingBlockingQueue<Object> secondaryQueue,
-        final HealthMetrics healthMetrics,
-        final PayloadDispatcher payloadDispatcher,
-        final long flushInterval,
-        final TimeUnit timeUnit) {
-      this.primaryQueue = primaryQueue;
-      this.secondaryQueue = secondaryQueue;
-      this.healthMetrics = healthMetrics;
-      this.doTimeFlush = flushInterval > 0;
-      this.payloadDispatcher = payloadDispatcher;
-      if (doTimeFlush) {
-        this.lastTicks = System.nanoTime();
-        this.ticksRequiredToFlush = timeUnit.toNanos(flushInterval);
-      } else {
-        this.ticksRequiredToFlush = Long.MAX_VALUE;
-      }
-    }
+        private final MessagePassingBlockingQueue<Object> primaryQueue;
+        private final MessagePassingBlockingQueue<Object> secondaryQueue;
+        private final HealthMetrics healthMetrics;
+        private final long ticksRequiredToFlush;
+        private final boolean doTimeFlush;
+        private final PayloadDispatcher payloadDispatcher;
+        private long lastTicks;
 
-    @Override
-    public void run() {
-      try {
-        runDutyCycle();
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      }
-      log.debug(
-          "Datadog trace processor exited. Publishing traces stopped. Unpublished traces left: {}",
-          !queuesAreEmpty());
-    }
+        public TraceSerializingHandler(
+                final MessagePassingBlockingQueue<Object> primaryQueue,
+                final MessagePassingBlockingQueue<Object> secondaryQueue,
+                final HealthMetrics healthMetrics,
+                final PayloadDispatcher payloadDispatcher,
+                final long flushInterval,
+                final TimeUnit timeUnit) {
+            this.primaryQueue = primaryQueue;
+            this.secondaryQueue = secondaryQueue;
+            this.healthMetrics = healthMetrics;
+            this.doTimeFlush = flushInterval > 0;
+            this.payloadDispatcher = payloadDispatcher;
+            if (doTimeFlush) {
+                this.lastTicks = System.nanoTime();
+                this.ticksRequiredToFlush = timeUnit.toNanos(flushInterval);
+            } else {
+                this.ticksRequiredToFlush = Long.MAX_VALUE;
+            }
+        }
 
-    private void runDutyCycle() throws InterruptedException {
-      Thread thread = Thread.currentThread();
-      while (!thread.isInterrupted()) {
-        consumeFromPrimaryQueue();
-        consumeFromSecondaryQueue();
-        flushIfNecessary();
-      }
-    }
+        @Override
+        public void run() {
+            try {
+                runDutyCycle();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+            log.debug(
+                    "Datadog trace processor exited. Publishing traces stopped. Unpublished traces left: {}",
+                    !queuesAreEmpty());
+        }
 
-    @SuppressWarnings("unchecked")
-    public void onEvent(Object event) {
-      // publish an incomplete batch if
-      // 1. we get a heartbeat, and it's time to send (early heartbeats will be ignored)
-      // 2. a synchronous flush command is received (at shutdown)
-      try {
-        if (event instanceof List) {
-          List<DDSpan> trace = (List<DDSpan>) event;
-          maybeTracePostProcessing(trace);
-          // TODO populate `_sample_rate` metric in a way that accounts for lost/dropped traces
-          payloadDispatcher.addTrace(trace);
-        } else if (event instanceof FlushEvent) {
-          payloadDispatcher.flush();
-          ((FlushEvent) event).sync();
+        private void runDutyCycle() throws InterruptedException {
+            Thread thread = Thread.currentThread();
+            while (!thread.isInterrupted()) {
+                consumeFromPrimaryQueue();
+                consumeFromSecondaryQueue();
+                flushIfNecessary();
+            }
         }
-      } catch (final Throwable e) {
-        if (log.isDebugEnabled()) {
-          log.debug("Error while serializing trace", e);
+
+        @SuppressWarnings("unchecked")
+        public void onEvent(Object event) {
+            // publish an incomplete batch if
+            // 1. we get a heartbeat, and it's time to send (early heartbeats will be ignored)
+            // 2. a synchronous flush command is received (at shutdown)
+            try {
+                if (event instanceof List) {
+                    List<DDSpan> trace = (List<DDSpan>) event;
+                    maybeTracePostProcessing(trace);
+                    // TODO populate `_sample_rate` metric in a way that accounts for lost/dropped traces
+                    payloadDispatcher.addTrace(trace);
+                } else if (event instanceof FlushEvent) {
+                    payloadDispatcher.flush();
+                    ((FlushEvent) event).sync();
+                }
+            } catch (final Throwable e) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Error while serializing trace", e);
+                }
+                List<DDSpan> data = event instanceof List ? (List<DDSpan>) event : null;
+                healthMetrics.onFailedSerialize(data, e);
+            }
         }
-        List<DDSpan> data = event instanceof List ? (List<DDSpan>) event : null;
-        healthMetrics.onFailedSerialize(data, e);
-      }
-    }
 
-    protected void consumeFromPrimaryQueue() throws InterruptedException {
-      Object event = primaryQueue.poll(100, MILLISECONDS);
-      if (null != event) {
-        // there's a high priority trace, consume it,
-        // and then drain whatever's in the queue
-        onEvent(event);
-        consumeBatch(primaryQueue);
-      }
-    }
+        protected void consumeFromPrimaryQueue() throws InterruptedException {
+            Object event = primaryQueue.poll(100, MILLISECONDS);
+            if (null != event) {
+                // there's a high priority trace, consume it,
+                // and then drain whatever's in the queue
+                onEvent(event);
+                consumeBatch(primaryQueue);
+            }
+        }
 
-    protected void consumeFromSecondaryQueue() {
-      // if there's something there now, take it and try to fill a batch,
-      // if not, it's the secondary queue so get back to polling the primary ASAP
-      Object event = secondaryQueue.poll();
-      if (null != event) {
-        onEvent(event);
-        consumeBatch(secondaryQueue);
-      }
-    }
+        protected void consumeFromSecondaryQueue() {
+            // if there's something there now, take it and try to fill a batch,
+            // if not, it's the secondary queue so get back to polling the primary ASAP
+            Object event = secondaryQueue.poll();
+            if (null != event) {
+                onEvent(event);
+                consumeBatch(secondaryQueue);
+            }
+        }
 
-    protected void flushIfNecessary() {
-      if (shouldFlush()) {
-        payloadDispatcher.flush();
-      }
-    }
+        protected void flushIfNecessary() {
+            if (shouldFlush()) {
+                payloadDispatcher.flush();
+            }
+        }
 
-    private boolean shouldFlush() {
-      if (doTimeFlush) {
-        long nanoTime = System.nanoTime();
-        long ticks = nanoTime - lastTicks;
-        if (ticks > ticksRequiredToFlush) {
-          lastTicks = nanoTime;
-          return true;
+        private boolean shouldFlush() {
+            if (doTimeFlush) {
+                long nanoTime = System.nanoTime();
+                long ticks = nanoTime - lastTicks;
+                if (ticks > ticksRequiredToFlush) {
+                    lastTicks = nanoTime;
+                    return true;
+                }
+            }
+            return false;
         }
-      }
-      return false;
-    }
 
-    private void consumeBatch(MessagePassingQueue<Object> queue) {
-      queue.drain(this::onEvent, queue.size());
-    }
+        private void consumeBatch(MessagePassingQueue<Object> queue) {
+            queue.drain(this::onEvent, queue.size());
+        }
 
-    protected boolean queuesAreEmpty() {
-      return primaryQueue.isEmpty() && secondaryQueue.isEmpty();
-    }
+        protected boolean queuesAreEmpty() {
+            return primaryQueue.isEmpty() && secondaryQueue.isEmpty();
+        }
 
-    private void maybeTracePostProcessing(List<DDSpan> trace) {
-      if (trace == null || trace.isEmpty()) {
-        return;
-      }
+        private void maybeTracePostProcessing(List<DDSpan> trace) {
+            if (trace == null || trace.isEmpty()) {
+                return;
+            }
 
-      final SpanPostProcessor postProcessor = SpanPostProcessor.Holder.INSTANCE;
-      try {
-        final long timeout = Config.get().getTracePostProcessingTimeout();
-        final long deadline = System.nanoTime() + timeout * 1000 * 1000;
-        final boolean[] timedOut = {false};
-        final BooleanSupplier timeoutCheck =
-            () -> {
-              if (timedOut[0]) {
-                return true;
-              }
-              if (System.nanoTime() > deadline) {
-                timedOut[0] = true;
-              }
-              return timedOut[0];
-            };
-        for (DDSpan span : trace) {
-          postProcessor.process(span, timeoutCheck);
+            final SpanPostProcessor postProcessor = SpanPostProcessor.Holder.INSTANCE;
+            try {
+                final long timeout = Config.get().getTracePostProcessingTimeout();
+                final long deadline = System.nanoTime() + timeout * 1000 * 1000;
+                final boolean[] timedOut = {false};
+                final BooleanSupplier timeoutCheck = () -> {
+                    if (timedOut[0]) {
+                        return true;
+                    }
+                    if (System.nanoTime() > deadline) {
+                        timedOut[0] = true;
+                    }
+                    return timedOut[0];
+                };
+                for (DDSpan span : trace) {
+                    postProcessor.process(span, timeoutCheck);
+                }
+            } catch (Throwable e) {
+                log.debug("Error while trace post-processing", e);
+            }
         }
-      } catch (Throwable e) {
-        log.debug("Error while trace post-processing", e);
-      }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceStructureWriter.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceStructureWriter.java
index f5cb0d2a978..5e7344970a2 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceStructureWriter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceStructureWriter.java
@@ -20,217 +20,215 @@
 
 public class TraceStructureWriter implements Writer {
 
-  private static final Logger log = LoggerFactory.getLogger(TraceStructureWriter.class);
-  private static final Pattern ARGS_DELIMITER = Pattern.compile(":", Pattern.LITERAL);
-
-  private final PrintStream out;
-  private final boolean debugLog;
-  private final boolean includeResource;
-  private final boolean includeService;
-
-  public TraceStructureWriter() {
-    this("", false);
-  }
-
-  public TraceStructureWriter(boolean debugLog) {
-    this("", debugLog);
-  }
-
-  public TraceStructureWriter(String outputFile) {
-    this(outputFile, false);
-  }
-
-  @SuppressForbidden
-  public TraceStructureWriter(String outputFile, boolean debugLog) {
-    boolean argsDebugLog = debugLog;
-    boolean argsIncludeResource = false;
-    boolean argsIncludeService = false;
-    if (null == outputFile) {
-      outputFile = "";
-    }
-    if (!outputFile.isEmpty() && outputFile.charAt(0) == ':') {
-      outputFile = outputFile.substring(1);
+    private static final Logger log = LoggerFactory.getLogger(TraceStructureWriter.class);
+    private static final Pattern ARGS_DELIMITER = Pattern.compile(":", Pattern.LITERAL);
+
+    private final PrintStream out;
+    private final boolean debugLog;
+    private final boolean includeResource;
+    private final boolean includeService;
+
+    public TraceStructureWriter() {
+        this("", false);
     }
-    try {
-      String[] args = parseArgs(outputFile);
-      String fileName = args[0];
-      this.out = fileName.isEmpty() ? System.err : new PrintStream(new FileOutputStream(fileName));
-      for (int i = 1; i < args.length; i++) {
-        switch (args[i].toLowerCase(Locale.ROOT)) {
-          case "includeresource":
-            argsIncludeResource = true;
-            break;
-          case "includeservice":
-            argsIncludeService = true;
-            break;
-          case "debuglog":
-            argsDebugLog = true;
-            break;
-          default:
-            log.warn("Illegal TraceStructureWriter argument '{}'", args[i]);
-            break;
-        }
-      }
-    } catch (IOException e) {
-      throw new RuntimeException("Failed to create trace structure writer from " + outputFile, e);
+
+    public TraceStructureWriter(boolean debugLog) {
+        this("", debugLog);
     }
-    this.debugLog = argsDebugLog;
-    this.includeResource = argsIncludeResource;
-    this.includeService = argsIncludeService;
-  }
-
-  private static String[] parseArgs(String outputFile) {
-    return parseArgs(outputFile, OperatingSystem.isWindows());
-  }
-
-  @VisibleForTesting
-  static String[] parseArgs(String outputFile, boolean windows) {
-    String[] args = ARGS_DELIMITER.split(outputFile);
-    // Check Windows absolute paths (<drive>:<path>) as column is used as arg delimiter
-    if (windows
-        && args.length > 1
-        && args[0].length() == 1
-        && (args[1].startsWith("\\") || args[1].startsWith("/"))) {
-      String[] windowsArgs = new String[args.length - 1];
-      windowsArgs[0] = args[0] + ":" + args[1];
-      System.arraycopy(args, 2, windowsArgs, 1, args.length - 2);
-      args = windowsArgs;
+
+    public TraceStructureWriter(String outputFile) {
+        this(outputFile, false);
     }
-    return args;
-  }
-
-  @Override
-  public void write(List<DDSpan> trace) {
-    if (trace.isEmpty()) {
-      output("[]", null, DDSpanId.ZERO);
-    } else {
-      DDTraceId traceId = trace.get(0).getTraceId();
-      long rootSpanId = trace.get(0).getSpanId();
-      Map<Long, Node> nodesById = new HashMap<>();
-      // index the tree
-      for (DDSpan span : trace) {
-        if (span.getLocalRootSpan() == span) {
-          rootSpanId = span.getSpanId();
+
+    @SuppressForbidden
+    public TraceStructureWriter(String outputFile, boolean debugLog) {
+        boolean argsDebugLog = debugLog;
+        boolean argsIncludeResource = false;
+        boolean argsIncludeService = false;
+        if (null == outputFile) {
+            outputFile = "";
         }
-        nodesById.put(span.getSpanId(), new Node(span, includeService, includeResource));
-      }
-      // build the tree
-      for (DDSpan span : trace) {
-        if (!traceId.equals(span.getTraceId())) {
-          String message =
-              "Trace "
-                  + traceId
-                  + " has broken trace link at "
-                  + span.getSpanId()
-                  + "("
-                  + span.getOperationName()
-                  + ")"
-                  + "->"
-                  + span.getTraceId();
-          out.println("ERROR: " + message);
-          if (debugLog) {
-            log.error(message);
-          }
-          return;
+        if (!outputFile.isEmpty() && outputFile.charAt(0) == ':') {
+            outputFile = outputFile.substring(1);
         }
-        if (rootSpanId != span.getSpanId()) {
-          Node parent = nodesById.get(span.getParentId());
-          if (null == parent) {
-            String message =
-                "Trace "
-                    + traceId
-                    + " has broken parent link at "
-                    + span.getSpanId()
-                    + "("
-                    + span.getOperationName()
-                    + ")"
-                    + "->"
-                    + span.getParentId();
-            out.println("ERROR: " + message);
-            if (debugLog) {
-              log.error(message);
+        try {
+            String[] args = parseArgs(outputFile);
+            String fileName = args[0];
+            this.out = fileName.isEmpty() ? System.err : new PrintStream(new FileOutputStream(fileName));
+            for (int i = 1; i < args.length; i++) {
+                switch (args[i].toLowerCase(Locale.ROOT)) {
+                    case "includeresource":
+                        argsIncludeResource = true;
+                        break;
+                    case "includeservice":
+                        argsIncludeService = true;
+                        break;
+                    case "debuglog":
+                        argsDebugLog = true;
+                        break;
+                    default:
+                        log.warn("Illegal TraceStructureWriter argument '{}'", args[i]);
+                        break;
+                }
             }
-            // Add this to the rootSpanId and continue so we can see the broken trace
-            parent = nodesById.get(rootSpanId);
-          }
-          parent.addChild(nodesById.get(span.getSpanId()));
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to create trace structure writer from " + outputFile, e);
         }
-      }
-      output(String.valueOf(nodesById.get(rootSpanId)), traceId, rootSpanId);
+        this.debugLog = argsDebugLog;
+        this.includeResource = argsIncludeResource;
+        this.includeService = argsIncludeService;
+    }
+
+    private static String[] parseArgs(String outputFile) {
+        return parseArgs(outputFile, OperatingSystem.isWindows());
     }
-  }
-
-  private void output(String trace, DDTraceId traceId, long rootSpanId) {
-    out.println(trace);
-    if (debugLog && log.isDebugEnabled()) {
-      StringBuilder start = new StringBuilder();
-      if (traceId != null) {
-        start.append("t_id=").append(traceId);
-      }
-      if (rootSpanId != DDSpanId.ZERO) {
-        if (start.length() > 0) {
-          start.append(", ");
+
+    @VisibleForTesting
+    static String[] parseArgs(String outputFile, boolean windows) {
+        String[] args = ARGS_DELIMITER.split(outputFile);
+        // Check Windows absolute paths (<drive>:<path>) as column is used as arg delimiter
+        if (windows
+                && args.length > 1
+                && args[0].length() == 1
+                && (args[1].startsWith("\\") || args[1].startsWith("/"))) {
+            String[] windowsArgs = new String[args.length - 1];
+            windowsArgs[0] = args[0] + ":" + args[1];
+            System.arraycopy(args, 2, windowsArgs, 1, args.length - 2);
+            args = windowsArgs;
         }
-        start.append("s_id=").append(DDSpanId.toString(rootSpanId));
-      }
-      if (start.length() > 0) {
-        start.append(" -> ");
-      }
-      log.debug("{}wrote {}", start, trace);
+        return args;
     }
-  }
-
-  @Override
-  public void start() {}
-
-  @Override
-  public boolean flush() {
-    out.flush();
-    return true;
-  }
-
-  @SuppressForbidden
-  @Override
-  public void close() {
-    if (out != System.err) {
-      out.close();
+
+    @Override
+    public void write(List<DDSpan> trace) {
+        if (trace.isEmpty()) {
+            output("[]", null, DDSpanId.ZERO);
+        } else {
+            DDTraceId traceId = trace.get(0).getTraceId();
+            long rootSpanId = trace.get(0).getSpanId();
+            Map<Long, Node> nodesById = new HashMap<>();
+            // index the tree
+            for (DDSpan span : trace) {
+                if (span.getLocalRootSpan() == span) {
+                    rootSpanId = span.getSpanId();
+                }
+                nodesById.put(span.getSpanId(), new Node(span, includeService, includeResource));
+            }
+            // build the tree
+            for (DDSpan span : trace) {
+                if (!traceId.equals(span.getTraceId())) {
+                    String message = "Trace "
+                            + traceId
+                            + " has broken trace link at "
+                            + span.getSpanId()
+                            + "("
+                            + span.getOperationName()
+                            + ")"
+                            + "->"
+                            + span.getTraceId();
+                    out.println("ERROR: " + message);
+                    if (debugLog) {
+                        log.error(message);
+                    }
+                    return;
+                }
+                if (rootSpanId != span.getSpanId()) {
+                    Node parent = nodesById.get(span.getParentId());
+                    if (null == parent) {
+                        String message = "Trace "
+                                + traceId
+                                + " has broken parent link at "
+                                + span.getSpanId()
+                                + "("
+                                + span.getOperationName()
+                                + ")"
+                                + "->"
+                                + span.getParentId();
+                        out.println("ERROR: " + message);
+                        if (debugLog) {
+                            log.error(message);
+                        }
+                        // Add this to the rootSpanId and continue so we can see the broken trace
+                        parent = nodesById.get(rootSpanId);
+                    }
+                    parent.addChild(nodesById.get(span.getSpanId()));
+                }
+            }
+            output(String.valueOf(nodesById.get(rootSpanId)), traceId, rootSpanId);
+        }
     }
-  }
 
-  @Override
-  public void incrementDropCounts(int spanCount) {}
+    private void output(String trace, DDTraceId traceId, long rootSpanId) {
+        out.println(trace);
+        if (debugLog && log.isDebugEnabled()) {
+            StringBuilder start = new StringBuilder();
+            if (traceId != null) {
+                start.append("t_id=").append(traceId);
+            }
+            if (rootSpanId != DDSpanId.ZERO) {
+                if (start.length() > 0) {
+                    start.append(", ");
+                }
+                start.append("s_id=").append(DDSpanId.toString(rootSpanId));
+            }
+            if (start.length() > 0) {
+                start.append(" -> ");
+            }
+            log.debug("{}wrote {}", start, trace);
+        }
+    }
 
-  private static final class Node {
-    private final CharSequence operationName;
-    private final CharSequence resourceName;
-    private final CharSequence serviceName;
-    private final List<Node> children = new ArrayList<>();
+    @Override
+    public void start() {}
 
-    private Node(DDSpan span, boolean includeService, boolean includeResource) {
-      this.operationName = span.getOperationName();
-      this.resourceName = includeResource ? span.getResourceName() : null;
-      this.serviceName = includeService ? span.getServiceName() : null;
+    @Override
+    public boolean flush() {
+        out.flush();
+        return true;
     }
 
-    public void addChild(Node child) {
-      children.add(child);
+    @SuppressForbidden
+    @Override
+    public void close() {
+        if (out != System.err) {
+            out.close();
+        }
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder();
-      sb.append('[');
-      if (null != serviceName) {
-        sb.append(serviceName).append(':');
-      }
-      sb.append(operationName);
-      if (null != resourceName) {
-        sb.append(':').append(resourceName);
-      }
-      for (Node node : children) {
-        sb.append(node);
-      }
-      return sb.append(']').toString();
+    public void incrementDropCounts(int spanCount) {}
+
+    private static final class Node {
+        private final CharSequence operationName;
+        private final CharSequence resourceName;
+        private final CharSequence serviceName;
+        private final List<Node> children = new ArrayList<>();
+
+        private Node(DDSpan span, boolean includeService, boolean includeResource) {
+            this.operationName = span.getOperationName();
+            this.resourceName = includeResource ? span.getResourceName() : null;
+            this.serviceName = includeService ? span.getServiceName() : null;
+        }
+
+        public void addChild(Node child) {
+            children.add(child);
+        }
+
+        @Override
+        public String toString() {
+            StringBuilder sb = new StringBuilder();
+            sb.append('[');
+            if (null != serviceName) {
+                sb.append(serviceName).append(':');
+            }
+            sb.append(operationName);
+            if (null != resourceName) {
+                sb.append(':').append(resourceName);
+            }
+            for (Node node : children) {
+                sb.append(node);
+            }
+            return sb.append(']').toString();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/Writer.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/Writer.java
index cd4ccf70bfd..4aaffe63bed 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/Writer.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/Writer.java
@@ -7,30 +7,30 @@
 /** A writer is responsible to send collected spans to some place */
 public interface Writer extends Closeable {
 
-  /**
-   * Write a trace represented by the entire list of all the finished spans
-   *
-   * @param trace the list of spans to write
-   */
-  void write(List<DDSpan> trace);
+    /**
+     * Write a trace represented by the entire list of all the finished spans
+     *
+     * @param trace the list of spans to write
+     */
+    void write(List<DDSpan> trace);
 
-  /** Start the writer */
-  void start();
+    /** Start the writer */
+    void start();
 
-  /**
-   * Requests the writer to send all finished traces and block until complete.
-   *
-   * @return true if completed normally
-   */
-  boolean flush();
+    /**
+     * Requests the writer to send all finished traces and block until complete.
+     *
+     * @return true if completed normally
+     */
+    boolean flush();
 
-  /**
-   * Indicates to the writer that no future writing will come and it should terminates all
-   * connections and tasks
-   */
-  @Override
-  void close();
+    /**
+     * Indicates to the writer that no future writing will come and it should terminates all
+     * connections and tasks
+     */
+    @Override
+    void close();
 
-  /** Count that a trace was captured for stats, but without reporting it. */
-  void incrementDropCounts(int spanCount);
+    /** Count that a trace was captured for stats, but without reporting it. */
+    void incrementDropCounts(int spanCount);
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/WriterFactory.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/WriterFactory.java
index a32c096c2b0..ab33e578ecf 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/WriterFactory.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/WriterFactory.java
@@ -37,269 +37,253 @@
 
 public class WriterFactory {
 
-  private static final Logger log = LoggerFactory.getLogger(WriterFactory.class);
-
-  public static Writer createWriter(
-      final Config config,
-      final SharedCommunicationObjects commObjects,
-      final Sampler sampler,
-      final SingleSpanSampler singleSpanSampler,
-      final HealthMetrics healthMetrics) {
-    return createWriter(
-        config, commObjects, sampler, singleSpanSampler, healthMetrics, config.getWriterType());
-  }
-
-  @SuppressForbidden
-  public static Writer createWriter(
-      final Config config,
-      final SharedCommunicationObjects commObjects,
-      final Sampler sampler,
-      final SingleSpanSampler singleSpanSampler,
-      final HealthMetrics healthMetrics,
-      String configuredType) {
-
-    int flushIntervalMilliseconds = Math.round(config.getTraceFlushIntervalSeconds() * 1000);
-
-    if (LOGGING_WRITER_TYPE.equals(configuredType)) {
-      return new LoggingWriter();
-    } else if (PRINTING_WRITER_TYPE.equals(configuredType)) {
-      return new PrintingWriter(System.out, true);
-    } else if (configuredType.startsWith(TRACE_STRUCTURE_WRITER_TYPE)) {
-      return new TraceStructureWriter(
-          Strings.replace(configuredType, TRACE_STRUCTURE_WRITER_TYPE, ""));
-    } else if (configuredType.startsWith(MULTI_WRITER_TYPE)) {
-      return new MultiWriter(
-          config, commObjects, sampler, singleSpanSampler, healthMetrics, configuredType);
-    } else if (OTLP_WRITER_TYPE.equals(configuredType)) {
-      return OtlpWriter.builder()
-          .endpoint(config.getOtlpTracesEndpoint())
-          .headers(config.getOtlpTracesHeaders())
-          .protocol(config.getOtlpTracesProtocol())
-          .compression(config.getOtlpTracesCompression())
-          .timeoutMillis(config.getOtlpTracesTimeout())
-          .spanSamplingRules(singleSpanSampler)
-          .flushIntervalMilliseconds(flushIntervalMilliseconds)
-          .build();
+    private static final Logger log = LoggerFactory.getLogger(WriterFactory.class);
+
+    public static Writer createWriter(
+            final Config config,
+            final SharedCommunicationObjects commObjects,
+            final Sampler sampler,
+            final SingleSpanSampler singleSpanSampler,
+            final HealthMetrics healthMetrics) {
+        return createWriter(config, commObjects, sampler, singleSpanSampler, healthMetrics, config.getWriterType());
     }
 
-    if (!DD_AGENT_WRITER_TYPE.equals(configuredType)
-        && !DD_INTAKE_WRITER_TYPE.equals(configuredType)) {
-      log.warn(
-          "Writer type not configured correctly: Type {} not recognized. Ignoring ",
-          configuredType);
-      configuredType = datadog.trace.api.ConfigDefaults.DEFAULT_AGENT_WRITER_TYPE;
-    }
+    @SuppressForbidden
+    public static Writer createWriter(
+            final Config config,
+            final SharedCommunicationObjects commObjects,
+            final Sampler sampler,
+            final SingleSpanSampler singleSpanSampler,
+            final HealthMetrics healthMetrics,
+            String configuredType) {
+
+        int flushIntervalMilliseconds = Math.round(config.getTraceFlushIntervalSeconds() * 1000);
+
+        if (LOGGING_WRITER_TYPE.equals(configuredType)) {
+            return new LoggingWriter();
+        } else if (PRINTING_WRITER_TYPE.equals(configuredType)) {
+            return new PrintingWriter(System.out, true);
+        } else if (configuredType.startsWith(TRACE_STRUCTURE_WRITER_TYPE)) {
+            return new TraceStructureWriter(Strings.replace(configuredType, TRACE_STRUCTURE_WRITER_TYPE, ""));
+        } else if (configuredType.startsWith(MULTI_WRITER_TYPE)) {
+            return new MultiWriter(config, commObjects, sampler, singleSpanSampler, healthMetrics, configuredType);
+        } else if (OTLP_WRITER_TYPE.equals(configuredType)) {
+            return OtlpWriter.builder()
+                    .endpoint(config.getOtlpTracesEndpoint())
+                    .headers(config.getOtlpTracesHeaders())
+                    .protocol(config.getOtlpTracesProtocol())
+                    .compression(config.getOtlpTracesCompression())
+                    .timeoutMillis(config.getOtlpTracesTimeout())
+                    .spanSamplingRules(singleSpanSampler)
+                    .flushIntervalMilliseconds(flushIntervalMilliseconds)
+                    .build();
+        }
 
-    Prioritization prioritization =
-        config.getEnumValue(PRIORITIZATION_TYPE, Prioritization.class, FAST_LANE);
-    if (ENSURE_TRACE == prioritization) {
-      log.info(
-          "Using 'EnsureTrace' prioritization type. (Do not use this type if your application is running in production mode)");
-    }
+        if (!DD_AGENT_WRITER_TYPE.equals(configuredType) && !DD_INTAKE_WRITER_TYPE.equals(configuredType)) {
+            log.warn("Writer type not configured correctly: Type {} not recognized. Ignoring ", configuredType);
+            configuredType = datadog.trace.api.ConfigDefaults.DEFAULT_AGENT_WRITER_TYPE;
+        }
 
-    DDAgentFeaturesDiscovery featuresDiscovery = commObjects.featuresDiscovery(config);
-
-    // CI Visibility payload-files mode writes traces to local files instead of the agent.
-    if (config.isCiVisibilityEnabled() && BazelMode.get().isPayloadFilesEnabled()) {
-      BazelMode bazelMode = BazelMode.get();
-      String testsDir = bazelMode.getTestPayloadsDir();
-      String coverageDir =
-          config.isCiVisibilityCodeCoverageEnabled() ? bazelMode.getCoveragePayloadsDir() : null;
-      log.info("[bazel mode] Payloads-in-files enabled, writing to {}", bazelMode.getPayloadsDir());
-
-      PayloadDispatcher dispatcher = createCiVisBazelPayloadDispatcher(testsDir, coverageDir);
-
-      TraceProcessingWorker worker =
-          new TraceProcessingWorker(
-              1024,
-              healthMetrics,
-              dispatcher,
-              DroppingPolicy.DISABLED,
-              prioritization,
-              flushIntervalMilliseconds,
-              TimeUnit.MILLISECONDS,
-              singleSpanSampler);
-
-      return new DDIntakeWriter(worker, dispatcher, healthMetrics, 5, TimeUnit.SECONDS, false);
-    }
+        Prioritization prioritization = config.getEnumValue(PRIORITIZATION_TYPE, Prioritization.class, FAST_LANE);
+        if (ENSURE_TRACE == prioritization) {
+            log.info(
+                    "Using 'EnsureTrace' prioritization type. (Do not use this type if your application is running in production mode)");
+        }
 
-    // The AgentWriter doesn't support the CI Visibility protocol. If CI Visibility is
-    // enabled, check if we can use the IntakeWriter instead.
-    if (DD_AGENT_WRITER_TYPE.equals(configuredType) && (config.isCiVisibilityEnabled())) {
-      featuresDiscovery.discoverIfOutdated();
-      if (featuresDiscovery.supportsEvpProxy() || config.isCiVisibilityAgentlessEnabled()) {
-        configuredType = DD_INTAKE_WRITER_TYPE;
-      } else {
-        log.info(
-            "CI Visibility functionality is limited. Please upgrade to Agent v6.40+ or v7.40+ or enable Agentless mode.");
-      }
-    }
+        DDAgentFeaturesDiscovery featuresDiscovery = commObjects.featuresDiscovery(config);
 
-    RemoteWriter remoteWriter;
-    if (DD_INTAKE_WRITER_TYPE.equals(configuredType)) {
-      final TrackType trackType = DDIntakeTrackTypeResolver.resolve(config);
-      final RemoteApi remoteApi =
-          createDDIntakeRemoteApi(config, commObjects, featuresDiscovery, trackType);
-
-      DDIntakeWriter.DDIntakeWriterBuilder builder =
-          DDIntakeWriter.builder()
-              .addTrack(trackType, remoteApi)
-              .prioritization(prioritization)
-              .healthMetrics(healthMetrics)
-              .monitoring(commObjects.monitoring)
-              .singleSpanSampler(singleSpanSampler)
-              .flushIntervalMilliseconds(flushIntervalMilliseconds);
-
-      if (config.isCiVisibilityEnabled()) {
-        builder.flushTimeout(5, TimeUnit.SECONDS);
-      }
-
-      if (config.isCiVisibilityCodeCoverageEnabled()) {
-        final RemoteApi coverageApi =
-            createDDIntakeRemoteApi(config, commObjects, featuresDiscovery, TrackType.CITESTCOV);
-        builder.addTrack(TrackType.CITESTCOV, coverageApi);
-      }
-      if (config.isLlmObsEnabled()) {
-        final RemoteApi llmobsApi =
-            createDDIntakeRemoteApi(config, commObjects, featuresDiscovery, TrackType.LLMOBS);
-        builder.addTrack(TrackType.LLMOBS, llmobsApi);
-      }
-      remoteWriter = builder.build();
-
-    } else { // configuredType == DDAgentWriter
-      boolean alwaysFlush = false;
-      if (config.isAgentConfiguredUsingDefault()
-          && ServerlessInfo.get().isRunningInServerlessEnvironment()) {
-        if (!ServerlessInfo.get().hasExtension()) {
-          log.info(
-              "Detected serverless environment. Serverless extension has not been detected, using PrintingWriter");
-          return new PrintingWriter(System.out, true);
-        } else {
-          log.info(
-              "Detected serverless environment. Serverless extension has been detected, using DDAgentWriter");
-          alwaysFlush = true;
+        // CI Visibility payload-files mode writes traces to local files instead of the agent.
+        if (config.isCiVisibilityEnabled() && BazelMode.get().isPayloadFilesEnabled()) {
+            BazelMode bazelMode = BazelMode.get();
+            String testsDir = bazelMode.getTestPayloadsDir();
+            String coverageDir = config.isCiVisibilityCodeCoverageEnabled() ? bazelMode.getCoveragePayloadsDir() : null;
+            log.info("[bazel mode] Payloads-in-files enabled, writing to {}", bazelMode.getPayloadsDir());
+
+            PayloadDispatcher dispatcher = createCiVisBazelPayloadDispatcher(testsDir, coverageDir);
+
+            TraceProcessingWorker worker = new TraceProcessingWorker(
+                    1024,
+                    healthMetrics,
+                    dispatcher,
+                    DroppingPolicy.DISABLED,
+                    prioritization,
+                    flushIntervalMilliseconds,
+                    TimeUnit.MILLISECONDS,
+                    singleSpanSampler);
+
+            return new DDIntakeWriter(worker, dispatcher, healthMetrics, 5, TimeUnit.SECONDS, false);
         }
-      }
-
-      DDAgentApi ddAgentApi =
-          new DDAgentApi(
-              commObjects.agentHttpClient,
-              commObjects.agentUrl,
-              featuresDiscovery,
-              commObjects.monitoring,
-              config.isTracerMetricsEnabled());
-
-      // Register whichever sampler applies agent published rates, regardless of what wraps it.
-      final RateByServiceTraceSampler agentRateSampler = sampler.agentSampler();
-      if (agentRateSampler != null) {
-        ddAgentApi.addResponseListener(agentRateSampler);
-      } else if (sampler instanceof RemoteResponseListener) {
-        ddAgentApi.addResponseListener((RemoteResponseListener) sampler);
-      }
-
-      // Drop p0 (sampled-out) traces when client-side stats are being computed -- either via the
-      // native agent-stats path (featuresDiscovery) or the OTLP trace metrics path
-      final boolean otlpSpanMetricsEnabled = config.isOtelTracesSpanMetricsEnabled();
-      final DroppingPolicy droppingPolicy =
-          () -> otlpSpanMetricsEnabled || featuresDiscovery.active();
-
-      DDAgentWriter.DDAgentWriterBuilder builder =
-          DDAgentWriter.builder()
-              .agentApi(ddAgentApi)
-              .featureDiscovery(featuresDiscovery)
-              .droppingPolicy(droppingPolicy)
-              .prioritization(prioritization)
-              .healthMetrics(healthMetrics)
-              .monitoring(commObjects.monitoring)
-              .alwaysFlush(alwaysFlush)
-              .spanSamplingRules(singleSpanSampler)
-              .flushIntervalMilliseconds(flushIntervalMilliseconds);
-
-      if (config.isCiVisibilityEnabled()) {
-        builder.flushTimeout(5, TimeUnit.SECONDS);
-      }
-
-      remoteWriter = builder.build();
-    }
 
-    return remoteWriter;
-  }
-
-  @Nonnull
-  private static PayloadDispatcher createCiVisBazelPayloadDispatcher(
-      String testsDir, String coverageDir) {
-    FileBasedPayloadDispatcher testDispatcher =
-        new FileBasedPayloadDispatcher(testsDir, "tests", TrackType.CITESTCYCLE);
-
-    PayloadDispatcher dispatcher;
-    if (coverageDir != null) {
-      FileBasedPayloadDispatcher covDispatcher =
-          new FileBasedPayloadDispatcher(coverageDir, "coverage", TrackType.CITESTCOV);
-      dispatcher = new CompositePayloadDispatcher(testDispatcher, covDispatcher);
-    } else {
-      dispatcher = testDispatcher;
+        // The AgentWriter doesn't support the CI Visibility protocol. If CI Visibility is
+        // enabled, check if we can use the IntakeWriter instead.
+        if (DD_AGENT_WRITER_TYPE.equals(configuredType) && (config.isCiVisibilityEnabled())) {
+            featuresDiscovery.discoverIfOutdated();
+            if (featuresDiscovery.supportsEvpProxy() || config.isCiVisibilityAgentlessEnabled()) {
+                configuredType = DD_INTAKE_WRITER_TYPE;
+            } else {
+                log.info(
+                        "CI Visibility functionality is limited. Please upgrade to Agent v6.40+ or v7.40+ or enable Agentless mode.");
+            }
+        }
+
+        RemoteWriter remoteWriter;
+        if (DD_INTAKE_WRITER_TYPE.equals(configuredType)) {
+            final TrackType trackType = DDIntakeTrackTypeResolver.resolve(config);
+            final RemoteApi remoteApi = createDDIntakeRemoteApi(config, commObjects, featuresDiscovery, trackType);
+
+            DDIntakeWriter.DDIntakeWriterBuilder builder = DDIntakeWriter.builder()
+                    .addTrack(trackType, remoteApi)
+                    .prioritization(prioritization)
+                    .healthMetrics(healthMetrics)
+                    .monitoring(commObjects.monitoring)
+                    .singleSpanSampler(singleSpanSampler)
+                    .flushIntervalMilliseconds(flushIntervalMilliseconds);
+
+            if (config.isCiVisibilityEnabled()) {
+                builder.flushTimeout(5, TimeUnit.SECONDS);
+            }
+
+            if (config.isCiVisibilityCodeCoverageEnabled()) {
+                final RemoteApi coverageApi =
+                        createDDIntakeRemoteApi(config, commObjects, featuresDiscovery, TrackType.CITESTCOV);
+                builder.addTrack(TrackType.CITESTCOV, coverageApi);
+            }
+            if (config.isLlmObsEnabled()) {
+                final RemoteApi llmobsApi =
+                        createDDIntakeRemoteApi(config, commObjects, featuresDiscovery, TrackType.LLMOBS);
+                builder.addTrack(TrackType.LLMOBS, llmobsApi);
+            }
+            remoteWriter = builder.build();
+
+        } else { // configuredType == DDAgentWriter
+            boolean alwaysFlush = false;
+            if (config.isAgentConfiguredUsingDefault() && ServerlessInfo.get().isRunningInServerlessEnvironment()) {
+                if (!ServerlessInfo.get().hasExtension()) {
+                    log.info(
+                            "Detected serverless environment. Serverless extension has not been detected, using PrintingWriter");
+                    return new PrintingWriter(System.out, true);
+                } else {
+                    log.info(
+                            "Detected serverless environment. Serverless extension has been detected, using DDAgentWriter");
+                    alwaysFlush = true;
+                }
+            }
+
+            DDAgentApi ddAgentApi = new DDAgentApi(
+                    commObjects.agentHttpClient,
+                    commObjects.agentUrl,
+                    featuresDiscovery,
+                    commObjects.monitoring,
+                    config.isTracerMetricsEnabled());
+
+            // Register whichever sampler applies agent published rates, regardless of what wraps it.
+            final RateByServiceTraceSampler agentRateSampler = sampler.agentSampler();
+            if (agentRateSampler != null) {
+                ddAgentApi.addResponseListener(agentRateSampler);
+            } else if (sampler instanceof RemoteResponseListener) {
+                ddAgentApi.addResponseListener((RemoteResponseListener) sampler);
+            }
+
+            // Drop p0 (sampled-out) traces when client-side stats are being computed -- either via the
+            // native agent-stats path (featuresDiscovery) or the OTLP trace metrics path
+            final boolean otlpSpanMetricsEnabled = config.isOtelTracesSpanMetricsEnabled();
+            final DroppingPolicy droppingPolicy = () -> otlpSpanMetricsEnabled || featuresDiscovery.active();
+
+            DDAgentWriter.DDAgentWriterBuilder builder = DDAgentWriter.builder()
+                    .agentApi(ddAgentApi)
+                    .featureDiscovery(featuresDiscovery)
+                    .droppingPolicy(droppingPolicy)
+                    .prioritization(prioritization)
+                    .healthMetrics(healthMetrics)
+                    .monitoring(commObjects.monitoring)
+                    .alwaysFlush(alwaysFlush)
+                    .spanSamplingRules(singleSpanSampler)
+                    .flushIntervalMilliseconds(flushIntervalMilliseconds);
+
+            if (config.isCiVisibilityEnabled()) {
+                builder.flushTimeout(5, TimeUnit.SECONDS);
+            }
+
+            remoteWriter = builder.build();
+        }
+
+        return remoteWriter;
     }
-    return dispatcher;
-  }
-
-  private static RemoteApi createDDIntakeRemoteApi(
-      Config config,
-      SharedCommunicationObjects commObjects,
-      DDAgentFeaturesDiscovery featuresDiscovery,
-      TrackType trackType) {
-    featuresDiscovery.discoverIfOutdated();
-    boolean evpProxySupported = featuresDiscovery.supportsEvpProxy();
-    boolean useProxyApi = false;
-
-    if (TrackType.LLMOBS == trackType) {
-      useProxyApi = evpProxySupported && !config.isLlmObsAgentlessEnabled();
-      if (!evpProxySupported && !config.isLlmObsAgentlessEnabled()) {
-        // Agentless is forced due to lack of evp proxy support
-        boolean agentRunning = null != featuresDiscovery.getTraceEndpoint();
-        if (agentRunning) {
-          log.info(
-              "LLM Observability configured to use agent proxy, but not compatible with agent version {}. Please upgrade to v7.55+.",
-              featuresDiscovery.getVersion());
+
+    @Nonnull
+    private static PayloadDispatcher createCiVisBazelPayloadDispatcher(String testsDir, String coverageDir) {
+        FileBasedPayloadDispatcher testDispatcher =
+                new FileBasedPayloadDispatcher(testsDir, "tests", TrackType.CITESTCYCLE);
+
+        PayloadDispatcher dispatcher;
+        if (coverageDir != null) {
+            FileBasedPayloadDispatcher covDispatcher =
+                    new FileBasedPayloadDispatcher(coverageDir, "coverage", TrackType.CITESTCOV);
+            dispatcher = new CompositePayloadDispatcher(testDispatcher, covDispatcher);
         } else {
-          log.info("LLM Observability configured to use agent proxy, but agent is not running.");
+            dispatcher = testDispatcher;
         }
-        log.info("LLM Observability will use agentless data submission instead.");
-      }
-
-    } else if (TrackType.CITESTCOV == trackType || TrackType.CITESTCYCLE == trackType) {
-      useProxyApi = evpProxySupported && !config.isCiVisibilityAgentlessEnabled();
+        return dispatcher;
     }
 
-    if (useProxyApi) {
-      return DDEvpProxyApi.builder()
-          .httpClient(commObjects.agentHttpClient)
-          .agentUrl(commObjects.agentUrl)
-          .evpProxyEndpoint(featuresDiscovery.getEvpProxyEndpoint())
-          .trackType(trackType)
-          .compressionEnabled(featuresDiscovery.supportsContentEncodingHeadersWithEvpProxy())
-          .build();
-    } else {
-      HttpUrl hostUrl = null;
-      String llmObsAgentlessUrl = config.getLlMObsAgentlessUrl();
-
-      if (config.getCiVisibilityAgentlessUrl() != null) {
-        hostUrl = HttpUrl.get(config.getCiVisibilityAgentlessUrl());
-        log.info("Using host URL '{}' to report CI Visibility traces in Agentless mode.", hostUrl);
-      } else if (config.isLlmObsEnabled()
-          && config.isLlmObsAgentlessEnabled()
-          && llmObsAgentlessUrl != null
-          && !llmObsAgentlessUrl.isEmpty()) {
-        hostUrl = HttpUrl.get(llmObsAgentlessUrl);
-        log.info("Using host URL '{}' to report LLM Obs traces in Agentless mode.", hostUrl);
-      }
-      return DDIntakeApi.builder()
-          .hostUrl(hostUrl)
-          .httpClient(commObjects.getIntakeHttpClient())
-          .apiKey(config.getApiKey())
-          .trackType(trackType)
-          .build();
+    private static RemoteApi createDDIntakeRemoteApi(
+            Config config,
+            SharedCommunicationObjects commObjects,
+            DDAgentFeaturesDiscovery featuresDiscovery,
+            TrackType trackType) {
+        featuresDiscovery.discoverIfOutdated();
+        boolean evpProxySupported = featuresDiscovery.supportsEvpProxy();
+        boolean useProxyApi = false;
+
+        if (TrackType.LLMOBS == trackType) {
+            useProxyApi = evpProxySupported && !config.isLlmObsAgentlessEnabled();
+            if (!evpProxySupported && !config.isLlmObsAgentlessEnabled()) {
+                // Agentless is forced due to lack of evp proxy support
+                boolean agentRunning = null != featuresDiscovery.getTraceEndpoint();
+                if (agentRunning) {
+                    log.info(
+                            "LLM Observability configured to use agent proxy, but not compatible with agent version {}. Please upgrade to v7.55+.",
+                            featuresDiscovery.getVersion());
+                } else {
+                    log.info("LLM Observability configured to use agent proxy, but agent is not running.");
+                }
+                log.info("LLM Observability will use agentless data submission instead.");
+            }
+
+        } else if (TrackType.CITESTCOV == trackType || TrackType.CITESTCYCLE == trackType) {
+            useProxyApi = evpProxySupported && !config.isCiVisibilityAgentlessEnabled();
+        }
+
+        if (useProxyApi) {
+            return DDEvpProxyApi.builder()
+                    .httpClient(commObjects.agentHttpClient)
+                    .agentUrl(commObjects.agentUrl)
+                    .evpProxyEndpoint(featuresDiscovery.getEvpProxyEndpoint())
+                    .trackType(trackType)
+                    .compressionEnabled(featuresDiscovery.supportsContentEncodingHeadersWithEvpProxy())
+                    .build();
+        } else {
+            HttpUrl hostUrl = null;
+            String llmObsAgentlessUrl = config.getLlMObsAgentlessUrl();
+
+            if (config.getCiVisibilityAgentlessUrl() != null) {
+                hostUrl = HttpUrl.get(config.getCiVisibilityAgentlessUrl());
+                log.info("Using host URL '{}' to report CI Visibility traces in Agentless mode.", hostUrl);
+            } else if (config.isLlmObsEnabled()
+                    && config.isLlmObsAgentlessEnabled()
+                    && llmObsAgentlessUrl != null
+                    && !llmObsAgentlessUrl.isEmpty()) {
+                hostUrl = HttpUrl.get(llmObsAgentlessUrl);
+                log.info("Using host URL '{}' to report LLM Obs traces in Agentless mode.", hostUrl);
+            }
+            return DDIntakeApi.builder()
+                    .hostUrl(hostUrl)
+                    .httpClient(commObjects.getIntakeHttpClient())
+                    .apiKey(config.getApiKey())
+                    .trackType(trackType)
+                    .build();
+        }
     }
-  }
 
-  private WriterFactory() {}
+    private WriterFactory() {}
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/DDAgentApi.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/DDAgentApi.java
index 8907e634cfc..78a4a52a80b 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/DDAgentApi.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/DDAgentApi.java
@@ -29,145 +29,140 @@
 /** The API pointing to a DD agent */
 public class DDAgentApi extends RemoteApi {
 
-  public static final String DATADOG_META_TRACER_VERSION = "Datadog-Meta-Tracer-Version";
-  private static final Logger log = LoggerFactory.getLogger(DDAgentApi.class);
-
-  private static final String DATADOG_CLIENT_COMPUTED_STATS = "Datadog-Client-Computed-Stats";
-  // this is not intended to be a toggled feature,
-  // rather it identifies this tracer as one which has computed top level status
-  private static final String DATADOG_CLIENT_COMPUTED_TOP_LEVEL =
-      "Datadog-Client-Computed-Top-Level";
-  private static final String X_DATADOG_TRACE_COUNT = "X-Datadog-Trace-Count";
-  private static final String DATADOG_DROPPED_TRACE_COUNT = "Datadog-Client-Dropped-P0-Traces";
-  private static final String DATADOG_DROPPED_SPAN_COUNT = "Datadog-Client-Dropped-P0-Spans";
-  private static final String DATADOG_AGENT_STATE = "Datadog-Agent-State";
-
-  private final List<RemoteResponseListener> responseListeners = new ArrayList<>();
-  private final boolean nativeMetricsEnabled;
-
-  private final Recording sendPayloadTimer;
-  private final Counter agentErrorCounter;
-
-  private static final JsonAdapter<Map<String, Map<String, Number>>> RESPONSE_ADAPTER =
-      new Moshi.Builder()
-          .build()
-          .adapter(
-              Types.newParameterizedType(
-                  Map.class,
-                  String.class,
-                  Types.newParameterizedType(Map.class, String.class, Double.class)));
-
-  private final DDAgentFeaturesDiscovery featuresDiscovery;
-  private final OkHttpClient httpClient;
-  private final HttpUrl agentUrl;
-  private final Map<String, String> headers;
-
-  public DDAgentApi(
-      OkHttpClient client,
-      HttpUrl agentUrl,
-      DDAgentFeaturesDiscovery featuresDiscovery,
-      Monitoring monitoring,
-      boolean nativeMetricsEnabled) {
-    super(false);
-    this.featuresDiscovery = featuresDiscovery;
-    this.agentUrl = agentUrl;
-    this.httpClient = client;
-    this.sendPayloadTimer = monitoring.newTimer("trace.agent.send.time");
-    this.agentErrorCounter = monitoring.newCounter("trace.agent.error.counter");
-    this.nativeMetricsEnabled = nativeMetricsEnabled;
-
-    this.headers = new HashMap<>();
-    this.headers.put(DATADOG_CLIENT_COMPUTED_TOP_LEVEL, "true");
-    this.headers.put(DATADOG_META_TRACER_VERSION, DDTraceCoreInfo.VERSION);
-  }
-
-  public void addResponseListener(final RemoteResponseListener listener) {
-    if (!responseListeners.contains(listener)) {
-      responseListeners.add(listener);
-    }
-  }
-
-  public Response sendSerializedTraces(final Payload payload) {
-    final int sizeInBytes = payload.sizeInBytes();
-    String tracesEndpoint = featuresDiscovery.getTraceEndpoint();
-    if (null == tracesEndpoint) {
-      featuresDiscovery.discoverIfOutdated();
-      tracesEndpoint = featuresDiscovery.getTraceEndpoint();
-      if (null == tracesEndpoint) {
-        log.error("No datadog agent detected");
-        countAndLogFailedSend(payload.traceCount(), sizeInBytes, null, null);
-        return Response.failed(404);
-      }
+    public static final String DATADOG_META_TRACER_VERSION = "Datadog-Meta-Tracer-Version";
+    private static final Logger log = LoggerFactory.getLogger(DDAgentApi.class);
+
+    private static final String DATADOG_CLIENT_COMPUTED_STATS = "Datadog-Client-Computed-Stats";
+    // this is not intended to be a toggled feature,
+    // rather it identifies this tracer as one which has computed top level status
+    private static final String DATADOG_CLIENT_COMPUTED_TOP_LEVEL = "Datadog-Client-Computed-Top-Level";
+    private static final String X_DATADOG_TRACE_COUNT = "X-Datadog-Trace-Count";
+    private static final String DATADOG_DROPPED_TRACE_COUNT = "Datadog-Client-Dropped-P0-Traces";
+    private static final String DATADOG_DROPPED_SPAN_COUNT = "Datadog-Client-Dropped-P0-Spans";
+    private static final String DATADOG_AGENT_STATE = "Datadog-Agent-State";
+
+    private final List<RemoteResponseListener> responseListeners = new ArrayList<>();
+    private final boolean nativeMetricsEnabled;
+
+    private final Recording sendPayloadTimer;
+    private final Counter agentErrorCounter;
+
+    private static final JsonAdapter<Map<String, Map<String, Number>>> RESPONSE_ADAPTER = new Moshi.Builder()
+            .build()
+            .adapter(Types.newParameterizedType(
+                    Map.class, String.class, Types.newParameterizedType(Map.class, String.class, Double.class)));
+
+    private final DDAgentFeaturesDiscovery featuresDiscovery;
+    private final OkHttpClient httpClient;
+    private final HttpUrl agentUrl;
+    private final Map<String, String> headers;
+
+    public DDAgentApi(
+            OkHttpClient client,
+            HttpUrl agentUrl,
+            DDAgentFeaturesDiscovery featuresDiscovery,
+            Monitoring monitoring,
+            boolean nativeMetricsEnabled) {
+        super(false);
+        this.featuresDiscovery = featuresDiscovery;
+        this.agentUrl = agentUrl;
+        this.httpClient = client;
+        this.sendPayloadTimer = monitoring.newTimer("trace.agent.send.time");
+        this.agentErrorCounter = monitoring.newCounter("trace.agent.error.counter");
+        this.nativeMetricsEnabled = nativeMetricsEnabled;
+
+        this.headers = new HashMap<>();
+        this.headers.put(DATADOG_CLIENT_COMPUTED_TOP_LEVEL, "true");
+        this.headers.put(DATADOG_META_TRACER_VERSION, DDTraceCoreInfo.VERSION);
     }
 
-    HttpUrl tracesUrl = agentUrl.resolve(tracesEndpoint);
-    try {
-      final Request request =
-          prepareRequest(tracesUrl, headers)
-              .addHeader(X_DATADOG_TRACE_COUNT, Integer.toString(payload.traceCount()))
-              .addHeader(DATADOG_DROPPED_TRACE_COUNT, Long.toString(payload.droppedTraces()))
-              .addHeader(DATADOG_DROPPED_SPAN_COUNT, Long.toString(payload.droppedSpans()))
-              .addHeader(
-                  DATADOG_CLIENT_COMPUTED_STATS,
-                  Config.get().isOtelTracesSpanMetricsEnabled()
-                          || (nativeMetricsEnabled && featuresDiscovery.supportsMetrics())
-                          // Disabling the computation agent-side of the APM trace metrics by
-                          // pretending it was already done by the library
-                          || !Config.get().isApmTracingEnabled()
-                      ? "true"
-                      : "")
-              .put(payload.toRequest())
-              .build();
-      this.totalTraces += payload.traceCount();
-      this.receivedTraces += payload.traceCount();
-      try (final Recording recording = sendPayloadTimer.start();
-          final okhttp3.Response response = httpClient.newCall(request).execute()) {
-        handleAgentChange(response.header(DATADOG_AGENT_STATE));
-
-        String responseString = getResponseBody(response);
-
-        if (response.code() != 200) {
-          agentErrorCounter.incrementErrorCount(response.message(), payload.traceCount());
-          countAndLogFailedSend(payload.traceCount(), sizeInBytes, response, null);
-          return Response.failed(response.code(), responseString);
+    public void addResponseListener(final RemoteResponseListener listener) {
+        if (!responseListeners.contains(listener)) {
+            responseListeners.add(listener);
         }
+    }
 
-        countAndLogSuccessfulSend(payload.traceCount(), sizeInBytes);
+    public Response sendSerializedTraces(final Payload payload) {
+        final int sizeInBytes = payload.sizeInBytes();
+        String tracesEndpoint = featuresDiscovery.getTraceEndpoint();
+        if (null == tracesEndpoint) {
+            featuresDiscovery.discoverIfOutdated();
+            tracesEndpoint = featuresDiscovery.getTraceEndpoint();
+            if (null == tracesEndpoint) {
+                log.error("No datadog agent detected");
+                countAndLogFailedSend(payload.traceCount(), sizeInBytes, null, null);
+                return Response.failed(404);
+            }
+        }
 
+        HttpUrl tracesUrl = agentUrl.resolve(tracesEndpoint);
         try {
-          if (!"".equals(responseString) && !"OK".equalsIgnoreCase(responseString)) {
-            final Map<String, Map<String, Number>> parsedResponse =
-                RESPONSE_ADAPTER.fromJson(responseString);
-            final String endpoint = tracesUrl.toString();
-            for (final RemoteResponseListener listener : responseListeners) {
-              listener.onResponse(endpoint, parsedResponse);
+            final Request request = prepareRequest(tracesUrl, headers)
+                    .addHeader(X_DATADOG_TRACE_COUNT, Integer.toString(payload.traceCount()))
+                    .addHeader(DATADOG_DROPPED_TRACE_COUNT, Long.toString(payload.droppedTraces()))
+                    .addHeader(DATADOG_DROPPED_SPAN_COUNT, Long.toString(payload.droppedSpans()))
+                    .addHeader(
+                            DATADOG_CLIENT_COMPUTED_STATS,
+                            Config.get().isOtelTracesSpanMetricsEnabled()
+                                            || (nativeMetricsEnabled && featuresDiscovery.supportsMetrics())
+                                            // Disabling the computation agent-side of the APM trace metrics by
+                                            // pretending it was already done by the library
+                                            || !Config.get().isApmTracingEnabled()
+                                    ? "true"
+                                    : "")
+                    .put(payload.toRequest())
+                    .build();
+            this.totalTraces += payload.traceCount();
+            this.receivedTraces += payload.traceCount();
+            try (final Recording recording = sendPayloadTimer.start();
+                    final okhttp3.Response response =
+                            httpClient.newCall(request).execute()) {
+                handleAgentChange(response.header(DATADOG_AGENT_STATE));
+
+                String responseString = getResponseBody(response);
+
+                if (response.code() != 200) {
+                    agentErrorCounter.incrementErrorCount(response.message(), payload.traceCount());
+                    countAndLogFailedSend(payload.traceCount(), sizeInBytes, response, null);
+                    return Response.failed(response.code(), responseString);
+                }
+
+                countAndLogSuccessfulSend(payload.traceCount(), sizeInBytes);
+
+                try {
+                    if (!"".equals(responseString) && !"OK".equalsIgnoreCase(responseString)) {
+                        final Map<String, Map<String, Number>> parsedResponse =
+                                RESPONSE_ADAPTER.fromJson(responseString);
+                        final String endpoint = tracesUrl.toString();
+                        for (final RemoteResponseListener listener : responseListeners) {
+                            listener.onResponse(endpoint, parsedResponse);
+                        }
+                    }
+                    return Response.success(response.code(), responseString);
+                } catch (final IOException e) {
+                    log.debug("Failed to parse DD agent response: {}", responseString, e);
+                    return Response.success(response.code(), e);
+                }
             }
-          }
-          return Response.success(response.code(), responseString);
         } catch (final IOException e) {
-          log.debug("Failed to parse DD agent response: {}", responseString, e);
-          return Response.success(response.code(), e);
+            countAndLogFailedSend(payload.traceCount(), sizeInBytes, null, e);
+            return Response.failed(e);
         }
-      }
-    } catch (final IOException e) {
-      countAndLogFailedSend(payload.traceCount(), sizeInBytes, null, e);
-      return Response.failed(e);
     }
-  }
 
-  private void handleAgentChange(String state) {
-    String previous = featuresDiscovery.state();
-    if (!Objects.equals(state, previous)) {
-      featuresDiscovery.discover();
+    private void handleAgentChange(String state) {
+        String previous = featuresDiscovery.state();
+        if (!Objects.equals(state, previous)) {
+            featuresDiscovery.discover();
+        }
     }
-  }
 
-  @Override
-  protected Logger getLogger() {
-    return log;
-  }
+    @Override
+    protected Logger getLogger() {
+        return log;
+    }
 
-  public void setHeader(String k, String v) {
-    this.headers.put(k, v);
-  }
+    public void setHeader(String k, String v) {
+        this.headers.put(k, v);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/DDAgentMapperDiscovery.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/DDAgentMapperDiscovery.java
index 848b51040e1..29ef521bf64 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/DDAgentMapperDiscovery.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/DDAgentMapperDiscovery.java
@@ -12,47 +12,47 @@
  */
 public class DDAgentMapperDiscovery implements RemoteMapperDiscovery {
 
-  private final DDAgentFeaturesDiscovery featuresDiscovery;
-  private TraceMapper traceMapper;
+    private final DDAgentFeaturesDiscovery featuresDiscovery;
+    private TraceMapper traceMapper;
 
-  public DDAgentMapperDiscovery(final DDAgentFeaturesDiscovery featuresDiscovery) {
-    this.featuresDiscovery = featuresDiscovery;
-  }
+    public DDAgentMapperDiscovery(final DDAgentFeaturesDiscovery featuresDiscovery) {
+        this.featuresDiscovery = featuresDiscovery;
+    }
 
-  private void reset() {
-    this.traceMapper = null;
-  }
+    private void reset() {
+        this.traceMapper = null;
+    }
 
-  @Override
-  public void discover() {
-    reset();
+    @Override
+    public void discover() {
+        reset();
 
-    if (featuresDiscovery.getTraceEndpoint() == null) {
-      featuresDiscovery.discover();
-    }
+        if (featuresDiscovery.getTraceEndpoint() == null) {
+            featuresDiscovery.discover();
+        }
 
-    String tracesEndpoint = featuresDiscovery.getTraceEndpoint();
-    if (tracesEndpoint == null) {
-      return;
-    }
+        String tracesEndpoint = featuresDiscovery.getTraceEndpoint();
+        if (tracesEndpoint == null) {
+            return;
+        }
 
-    switch (ProtocolVersion.fromTraceEndpoint(tracesEndpoint)) {
-      case V1_0:
-        traceMapper = new TraceMapperV1();
-        break;
+        switch (ProtocolVersion.fromTraceEndpoint(tracesEndpoint)) {
+            case V1_0:
+                traceMapper = new TraceMapperV1();
+                break;
 
-      case V0_5:
-        traceMapper = new TraceMapperV0_5();
-        break;
+            case V0_5:
+                traceMapper = new TraceMapperV0_5();
+                break;
 
-      default:
-        traceMapper = new TraceMapperV0_4();
-        break;
+            default:
+                traceMapper = new TraceMapperV0_4();
+                break;
+        }
     }
-  }
 
-  @Override
-  public RemoteMapper getMapper() {
-    return traceMapper;
-  }
+    @Override
+    public RemoteMapper getMapper() {
+        return traceMapper;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/FlushEvent.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/FlushEvent.java
index edb2aa15289..f56153bafbc 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/FlushEvent.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/FlushEvent.java
@@ -3,13 +3,13 @@
 import java.util.concurrent.CountDownLatch;
 
 public final class FlushEvent {
-  private final CountDownLatch latch;
+    private final CountDownLatch latch;
 
-  public FlushEvent(CountDownLatch latch) {
-    this.latch = latch;
-  }
+    public FlushEvent(CountDownLatch latch) {
+        this.latch = latch;
+    }
 
-  public void sync() {
-    latch.countDown();
-  }
+    public void sync() {
+        latch.countDown();
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/Prioritization.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/Prioritization.java
index 1475dddbdb9..94cdb4543f1 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/Prioritization.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/Prioritization.java
@@ -11,147 +11,141 @@
 import java.util.concurrent.TimeUnit;
 
 public enum Prioritization {
-  ENSURE_TRACE {
-    @Override
-    public PrioritizationStrategy create(
-        final Queue<Object> primary,
-        final Queue<Object> secondary,
-        final Queue<Object> spanSampling,
-        DroppingPolicy neverUsed) {
-      return new EnsureTraceStrategy(primary, secondary, spanSampling);
-    }
-  },
-  FAST_LANE {
-    @Override
-    public PrioritizationStrategy create(
-        final Queue<Object> primary,
-        final Queue<Object> secondary,
-        final Queue<Object> spanSampling,
-        DroppingPolicy droppingPolicy) {
-      return new FastLaneStrategy(primary, secondary, spanSampling, droppingPolicy);
-    }
-  };
-
-  public abstract PrioritizationStrategy create(
-      Queue<Object> primary,
-      Queue<Object> secondary,
-      Queue<Object> spanSampling,
-      DroppingPolicy droppingPolicy);
-
-  private abstract static class PrioritizationStrategyWithFlush implements PrioritizationStrategy {
-
-    protected final Queue<Object> primary;
-
-    protected PrioritizationStrategyWithFlush(Queue<Object> primary) {
-      this.primary = primary;
-    }
-
-    @Override
-    public boolean flush(final long timeout, final TimeUnit timeUnit) {
-      // ok not to flush the secondary
-      final CountDownLatch latch = new CountDownLatch(1);
-      final FlushEvent event = new FlushEvent(latch);
-      blockingOffer(primary, event);
-      try {
-        return latch.await(timeout, timeUnit);
-      } catch (final InterruptedException e) {
-        Thread.currentThread().interrupt();
-        return false;
-      }
+    ENSURE_TRACE {
+        @Override
+        public PrioritizationStrategy create(
+                final Queue<Object> primary,
+                final Queue<Object> secondary,
+                final Queue<Object> spanSampling,
+                DroppingPolicy neverUsed) {
+            return new EnsureTraceStrategy(primary, secondary, spanSampling);
+        }
+    },
+    FAST_LANE {
+        @Override
+        public PrioritizationStrategy create(
+                final Queue<Object> primary,
+                final Queue<Object> secondary,
+                final Queue<Object> spanSampling,
+                DroppingPolicy droppingPolicy) {
+            return new FastLaneStrategy(primary, secondary, spanSampling, droppingPolicy);
+        }
+    };
+
+    public abstract PrioritizationStrategy create(
+            Queue<Object> primary, Queue<Object> secondary, Queue<Object> spanSampling, DroppingPolicy droppingPolicy);
+
+    private abstract static class PrioritizationStrategyWithFlush implements PrioritizationStrategy {
+
+        protected final Queue<Object> primary;
+
+        protected PrioritizationStrategyWithFlush(Queue<Object> primary) {
+            this.primary = primary;
+        }
+
+        @Override
+        public boolean flush(final long timeout, final TimeUnit timeUnit) {
+            // ok not to flush the secondary
+            final CountDownLatch latch = new CountDownLatch(1);
+            final FlushEvent event = new FlushEvent(latch);
+            blockingOffer(primary, event);
+            try {
+                return latch.await(timeout, timeUnit);
+            } catch (final InterruptedException e) {
+                Thread.currentThread().interrupt();
+                return false;
+            }
+        }
+
+        protected void blockingOffer(final Queue<Object> queue, final Object event) {
+            boolean offered;
+            do {
+                offered = queue.offer(event);
+            } while (!offered);
+        }
     }
 
-    protected void blockingOffer(final Queue<Object> queue, final Object event) {
-      boolean offered;
-      do {
-        offered = queue.offer(event);
-      } while (!offered);
-    }
-  }
-
-  private static final class EnsureTraceStrategy extends PrioritizationStrategyWithFlush {
-
-    private final Queue<Object> secondary;
-    private final Queue<Object> spanSampling;
-
-    private EnsureTraceStrategy(
-        final Queue<Object> primary,
-        final Queue<Object> secondary,
-        final Queue<Object> spanSampling) {
-      super(primary);
-      this.secondary = secondary;
-      this.spanSampling = spanSampling;
-    }
-
-    @Override
-    public <T extends CoreSpan<T>> PublishResult publish(
-        T root, int priority, final List<T> trace) {
-      if (root.isForceKeep()) {
-        blockingOffer(primary, trace);
-        return PublishResult.ENQUEUED_FOR_SERIALIZATION;
-      }
-      switch (priority) {
-        case SAMPLER_DROP:
-        case USER_DROP:
-          if (spanSampling != null) {
-            // send dropped traces for single span sampling
-            return spanSampling.offer(trace)
-                ? PublishResult.ENQUEUED_FOR_SINGLE_SPAN_SAMPLING
-                : PublishResult.DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN;
-          }
-          return secondary.offer(trace)
-              ? PublishResult.ENQUEUED_FOR_SERIALIZATION
-              : PublishResult.DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT;
-        default:
-          blockingOffer(primary, trace);
-          return PublishResult.ENQUEUED_FOR_SERIALIZATION;
-      }
-    }
-  }
-
-  private static final class FastLaneStrategy extends PrioritizationStrategyWithFlush {
-
-    private final Queue<Object> secondary;
-    private final Queue<Object> spanSampling;
-    private final DroppingPolicy droppingPolicy;
-
-    private FastLaneStrategy(
-        final Queue<Object> primary,
-        final Queue<Object> secondary,
-        final Queue<Object> spanSampling,
-        DroppingPolicy droppingPolicy) {
-      super(primary);
-      this.secondary = secondary;
-      this.spanSampling = spanSampling;
-      this.droppingPolicy = droppingPolicy;
+    private static final class EnsureTraceStrategy extends PrioritizationStrategyWithFlush {
+
+        private final Queue<Object> secondary;
+        private final Queue<Object> spanSampling;
+
+        private EnsureTraceStrategy(
+                final Queue<Object> primary, final Queue<Object> secondary, final Queue<Object> spanSampling) {
+            super(primary);
+            this.secondary = secondary;
+            this.spanSampling = spanSampling;
+        }
+
+        @Override
+        public <T extends CoreSpan<T>> PublishResult publish(T root, int priority, final List<T> trace) {
+            if (root.isForceKeep()) {
+                blockingOffer(primary, trace);
+                return PublishResult.ENQUEUED_FOR_SERIALIZATION;
+            }
+            switch (priority) {
+                case SAMPLER_DROP:
+                case USER_DROP:
+                    if (spanSampling != null) {
+                        // send dropped traces for single span sampling
+                        return spanSampling.offer(trace)
+                                ? PublishResult.ENQUEUED_FOR_SINGLE_SPAN_SAMPLING
+                                : PublishResult.DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN;
+                    }
+                    return secondary.offer(trace)
+                            ? PublishResult.ENQUEUED_FOR_SERIALIZATION
+                            : PublishResult.DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT;
+                default:
+                    blockingOffer(primary, trace);
+                    return PublishResult.ENQUEUED_FOR_SERIALIZATION;
+            }
+        }
     }
 
-    @Override
-    public <T extends CoreSpan<T>> PublishResult publish(T root, int priority, List<T> trace) {
-      if (root.isForceKeep()) {
-        return primary.offer(trace)
-            ? PublishResult.ENQUEUED_FOR_SERIALIZATION
-            : PublishResult.DROPPED_BUFFER_OVERFLOW;
-      }
-      switch (priority) {
-        case SAMPLER_DROP:
-        case USER_DROP:
-          if (spanSampling != null) {
-            // send dropped traces for single span sampling
-            return spanSampling.offer(trace)
-                ? PublishResult.ENQUEUED_FOR_SINGLE_SPAN_SAMPLING
-                : PublishResult.DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN;
-          }
-          if (droppingPolicy.active()) {
-            return PublishResult.DROPPED_BY_POLICY;
-          }
-          return secondary.offer(trace)
-              ? PublishResult.ENQUEUED_FOR_SERIALIZATION
-              : PublishResult.DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT;
-        default:
-          return primary.offer(trace)
-              ? PublishResult.ENQUEUED_FOR_SERIALIZATION
-              : PublishResult.DROPPED_BUFFER_OVERFLOW;
-      }
+    private static final class FastLaneStrategy extends PrioritizationStrategyWithFlush {
+
+        private final Queue<Object> secondary;
+        private final Queue<Object> spanSampling;
+        private final DroppingPolicy droppingPolicy;
+
+        private FastLaneStrategy(
+                final Queue<Object> primary,
+                final Queue<Object> secondary,
+                final Queue<Object> spanSampling,
+                DroppingPolicy droppingPolicy) {
+            super(primary);
+            this.secondary = secondary;
+            this.spanSampling = spanSampling;
+            this.droppingPolicy = droppingPolicy;
+        }
+
+        @Override
+        public <T extends CoreSpan<T>> PublishResult publish(T root, int priority, List<T> trace) {
+            if (root.isForceKeep()) {
+                return primary.offer(trace)
+                        ? PublishResult.ENQUEUED_FOR_SERIALIZATION
+                        : PublishResult.DROPPED_BUFFER_OVERFLOW;
+            }
+            switch (priority) {
+                case SAMPLER_DROP:
+                case USER_DROP:
+                    if (spanSampling != null) {
+                        // send dropped traces for single span sampling
+                        return spanSampling.offer(trace)
+                                ? PublishResult.ENQUEUED_FOR_SINGLE_SPAN_SAMPLING
+                                : PublishResult.DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN;
+                    }
+                    if (droppingPolicy.active()) {
+                        return PublishResult.DROPPED_BY_POLICY;
+                    }
+                    return secondary.offer(trace)
+                            ? PublishResult.ENQUEUED_FOR_SERIALIZATION
+                            : PublishResult.DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT;
+                default:
+                    return primary.offer(trace)
+                            ? PublishResult.ENQUEUED_FOR_SERIALIZATION
+                            : PublishResult.DROPPED_BUFFER_OVERFLOW;
+            }
+        }
     }
-  }
 }
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 aabfad9d9d8..caf0489351d 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
@@ -6,32 +6,32 @@
 
 public interface PrioritizationStrategy {
 
-  enum PublishResult {
-    ENQUEUED_FOR_SERIALIZATION,
-    ENQUEUED_FOR_SINGLE_SPAN_SAMPLING,
-    DROPPED_BY_POLICY,
-    /**
-     * A trace that sampling decided to keep could not be enqueued because the queue was full. The
-     * trace is lost and will be missing from the UI.
-     */
-    DROPPED_BUFFER_OVERFLOW,
-    /**
-     * A trace that sampling already decided to drop could not be enqueued because the queue was
-     * full. No kept trace is lost. Such traces are only enqueued at all when the agent computes
-     * trace stats itself, so the sole consequence is a small loss of accuracy in agent-computed
-     * stats; with client-side stats enabled they are discarded before reaching a queue.
-     */
-    DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT,
-    /**
-     * A trace that sampling decided to drop could not be offered to the single span sampling queue
-     * because that queue was full. Unlike {@link #DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT}, this is not
-     * a stats-only loss: the trace's spans were candidates to be individually kept by single span
-     * sampling, so losing them can mean losing spans that would otherwise have reached the UI.
-     */
-    DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN
-  }
+    enum PublishResult {
+        ENQUEUED_FOR_SERIALIZATION,
+        ENQUEUED_FOR_SINGLE_SPAN_SAMPLING,
+        DROPPED_BY_POLICY,
+        /**
+         * A trace that sampling decided to keep could not be enqueued because the queue was full. The
+         * trace is lost and will be missing from the UI.
+         */
+        DROPPED_BUFFER_OVERFLOW,
+        /**
+         * A trace that sampling already decided to drop could not be enqueued because the queue was
+         * full. No kept trace is lost. Such traces are only enqueued at all when the agent computes
+         * trace stats itself, so the sole consequence is a small loss of accuracy in agent-computed
+         * stats; with client-side stats enabled they are discarded before reaching a queue.
+         */
+        DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT,
+        /**
+         * A trace that sampling decided to drop could not be offered to the single span sampling queue
+         * because that queue was full. Unlike {@link #DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT}, this is not
+         * a stats-only loss: the trace's spans were candidates to be individually kept by single span
+         * sampling, so losing them can mean losing spans that would otherwise have reached the UI.
+         */
+        DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN
+    }
 
-  <T extends CoreSpan<T>> PublishResult publish(T root, int priority, List<T> trace);
+    <T extends CoreSpan<T>> PublishResult publish(T root, int priority, List<T> trace);
 
-  boolean flush(long timeout, TimeUnit timeUnit);
+    boolean flush(long timeout, TimeUnit timeUnit);
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapper.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapper.java
index e6abb09bb3c..a99635b1ea8 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapper.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapper.java
@@ -6,11 +6,10 @@
 import datadog.trace.core.DDSpanContext;
 
 public interface TraceMapper extends RemoteMapper {
-  static final UTF8BytesString THREAD_NAME = UTF8BytesString.create(DDTags.THREAD_NAME);
-  static final UTF8BytesString THREAD_ID = UTF8BytesString.create(DDTags.THREAD_ID);
-  static final UTF8BytesString SAMPLING_PRIORITY_KEY =
-      UTF8BytesString.create(DDSpanContext.PRIORITY_SAMPLING_KEY);
-  static final UTF8BytesString ORIGIN_KEY = UTF8BytesString.create(DDTags.ORIGIN_KEY);
-  static final UTF8BytesString PROCESS_TAGS_KEY = UTF8BytesString.create(DDTags.PROCESS_TAGS);
-  static final UTF8BytesString SDK_OTLP_EXPORT_KEY = UTF8BytesString.create(DDTags.SDK_OTLP_EXPORT);
+    static final UTF8BytesString THREAD_NAME = UTF8BytesString.create(DDTags.THREAD_NAME);
+    static final UTF8BytesString THREAD_ID = UTF8BytesString.create(DDTags.THREAD_ID);
+    static final UTF8BytesString SAMPLING_PRIORITY_KEY = UTF8BytesString.create(DDSpanContext.PRIORITY_SAMPLING_KEY);
+    static final UTF8BytesString ORIGIN_KEY = UTF8BytesString.create(DDTags.ORIGIN_KEY);
+    static final UTF8BytesString PROCESS_TAGS_KEY = UTF8BytesString.create(DDTags.PROCESS_TAGS);
+    static final UTF8BytesString SDK_OTLP_EXPORT_KEY = UTF8BytesString.create(DDTags.SDK_OTLP_EXPORT);
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_4.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_4.java
index cbdcbd41433..df7cc61fdd0 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_4.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_4.java
@@ -27,396 +27,382 @@
 import okhttp3.RequestBody;
 
 public final class TraceMapperV0_4 implements TraceMapper {
-  static final SimpleUtf8Cache TAG_CACHE =
-      Config.get().getTagNameUtf8CacheSize() > 0
-          ? new SimpleUtf8Cache(Config.get().getTagNameUtf8CacheSize())
-          : null;
-
-  static final GenerationalUtf8Cache VALUE_CACHE =
-      Config.get().getTagValueUtf8CacheSize() > 0
-          ? new GenerationalUtf8Cache(Config.get().getTagValueUtf8CacheSize())
-          : null;
-
-  // Controls how often the UTF8 caches are recalibrated. The caches adapt to shifts in tag-value
-  // cardinality over a timescale much longer than a single span, so recalibrating periodically
-  // rather than per-span preserves their effectiveness without paying recalibrate()'s O(cacheSize)
-  // cost on every span. Must be a power of two (see the mask in shouldRecalibrate).
-  static final long RECALIBRATE_SPAN_INTERVAL = 512;
-
-  // True when at least one cache exists. static-final so the JIT can fold the whole recalibrate
-  // block away when both caches are off.
-  private static final boolean RECALIBRATE = (TAG_CACHE != null || VALUE_CACHE != null);
-
-  // Advanced by the single serializer thread. The value is a recalibration cadence, not an exact
-  // count, so a plain counter suffices -- no atomic/volatile needed; a benign race would at most
-  // nudge when recalibrate fires.
-  private static long spanCounter;
-
-  /** True once every {@link #RECALIBRATE_SPAN_INTERVAL} spans; advances the span counter. */
-  static boolean shouldRecalibrate() {
-    return RECALIBRATE && (++spanCounter & (RECALIBRATE_SPAN_INTERVAL - 1)) == 0;
-  }
-
-  private final int size;
-  private boolean firstSpanWritten;
-
-  public TraceMapperV0_4(int size) {
-    this.size = size;
-  }
-
-  public TraceMapperV0_4() {
-    this(5 << 20);
-  }
-
-  private static final class MetaWriter implements MetadataConsumer {
-
-    private Writable writable;
-    private boolean firstSpanInTrace;
-    private boolean lastSpanInTrace;
-    private boolean firstSpanInPayload;
-
-    MetaWriter withWritable(Writable writable) {
-      this.writable = writable;
-      return this;
+    static final SimpleUtf8Cache TAG_CACHE = Config.get().getTagNameUtf8CacheSize() > 0
+            ? new SimpleUtf8Cache(Config.get().getTagNameUtf8CacheSize())
+            : null;
+
+    static final GenerationalUtf8Cache VALUE_CACHE = Config.get().getTagValueUtf8CacheSize() > 0
+            ? new GenerationalUtf8Cache(Config.get().getTagValueUtf8CacheSize())
+            : null;
+
+    // Controls how often the UTF8 caches are recalibrated. The caches adapt to shifts in tag-value
+    // cardinality over a timescale much longer than a single span, so recalibrating periodically
+    // rather than per-span preserves their effectiveness without paying recalibrate()'s O(cacheSize)
+    // cost on every span. Must be a power of two (see the mask in shouldRecalibrate).
+    static final long RECALIBRATE_SPAN_INTERVAL = 512;
+
+    // True when at least one cache exists. static-final so the JIT can fold the whole recalibrate
+    // block away when both caches are off.
+    private static final boolean RECALIBRATE = (TAG_CACHE != null || VALUE_CACHE != null);
+
+    // Advanced by the single serializer thread. The value is a recalibration cadence, not an exact
+    // count, so a plain counter suffices -- no atomic/volatile needed; a benign race would at most
+    // nudge when recalibrate fires.
+    private static long spanCounter;
+
+    /** True once every {@link #RECALIBRATE_SPAN_INTERVAL} spans; advances the span counter. */
+    static boolean shouldRecalibrate() {
+        return RECALIBRATE && (++spanCounter & (RECALIBRATE_SPAN_INTERVAL - 1)) == 0;
     }
 
-    MetaWriter forSpan(boolean firstInTrace, boolean lastInTrace, boolean firstInPayload) {
-      this.firstSpanInTrace = firstInTrace;
-      this.lastSpanInTrace = lastInTrace;
-      this.firstSpanInPayload = firstInPayload;
-      return this;
-    }
+    private final int size;
+    private boolean firstSpanWritten;
 
-    @Override
-    public void accept(Metadata metadata) {
-      if (shouldRecalibrate()) {
-        if (TAG_CACHE != null) TAG_CACHE.recalibrate();
-        if (VALUE_CACHE != null) VALUE_CACHE.recalibrate();
-      }
-
-      TagMap tags = metadata.getTags();
-
-      // Also write on top-level spans so that inferred proxy spans (which may be in the middle
-      // of the serialized list due to phased-finish ordering) always carry the sampling decision.
-      final boolean writeSamplingPriority =
-          firstSpanInTrace || lastSpanInTrace || metadata.topLevel();
-      final UTF8BytesString processTags = firstSpanInPayload ? metadata.processTags() : null;
-      final UTF8BytesString otlpExport = firstSpanInPayload ? metadata.otlpExportMarker() : null;
-      int metaSize =
-          metadata.getBaggage().size()
-              + tags.size()
-              + (UNSET_STATUS == metadata.getHttpStatusCode() ? 0 : 1)
-              + (null == metadata.getOrigin() ? 0 : 1)
-              + (null == processTags ? 0 : 1)
-              + (null == otlpExport ? 0 : 1)
-              + 1;
-      int metricsSize =
-          (writeSamplingPriority && metadata.hasSamplingPriority() ? 1 : 0)
-              + (metadata.measured() ? 1 : 0)
-              + (metadata.topLevel() ? 1 : 0)
-              + (metadata.longRunningVersion() != 0 ? 1 : 0)
-              + 1;
-
-      for (TagMap.EntryReader entryReader : tags) {
-        if (entryReader.isNumber()) {
-          ++metricsSize;
-          --metaSize;
-        } else {
-          Object value = entryReader.objectValue();
-          if (value instanceof Map) {
-            --metaSize;
-            metaSize += getFlatMapSize((Map) value);
-          }
-        }
-      }
-      writable.writeUTF8(METRICS);
-      writable.startMap(metricsSize);
-      if (writeSamplingPriority && metadata.hasSamplingPriority()) {
-        writable.writeUTF8(SAMPLING_PRIORITY_KEY);
-        writable.writeInt(metadata.samplingPriority());
-      }
-      if (metadata.measured()) {
-        writable.writeUTF8(InstrumentationTags.DD_MEASURED);
-        writable.writeInt(1);
-      }
-      if (metadata.topLevel()) {
-        writable.writeUTF8(InstrumentationTags.DD_TOP_LEVEL);
-        writable.writeInt(1);
-      }
-      if (metadata.longRunningVersion() != 0) {
-        if (metadata.longRunningVersion() > 0) {
-          writable.writeUTF8(InstrumentationTags.DD_PARTIAL_VERSION);
-          writable.writeInt(metadata.longRunningVersion());
-        } else {
-          writable.writeUTF8(InstrumentationTags.DD_WAS_LONG_RUNNING);
-          writable.writeInt(1);
-        }
-      }
-      writable.writeUTF8(THREAD_ID);
-      writable.writeLong(metadata.getThreadId());
+    public TraceMapperV0_4(int size) {
+        this.size = size;
+    }
 
-      tags.forEach(
-          writable,
-          (w, entry) -> {
-            if (!entry.isNumber()) return;
+    public TraceMapperV0_4() {
+        this(5 << 20);
+    }
 
-            w.writeString(entry.tag(), TAG_CACHE);
+    private static final class MetaWriter implements MetadataConsumer {
 
-            switch (entry.type()) {
-              case TagMap.EntryReader.INT:
-                w.writeInt(entry.intValue());
-                break;
+        private Writable writable;
+        private boolean firstSpanInTrace;
+        private boolean lastSpanInTrace;
+        private boolean firstSpanInPayload;
 
-              case TagMap.EntryReader.LONG:
-                w.writeLong(entry.longValue());
-                break;
+        MetaWriter withWritable(Writable writable) {
+            this.writable = writable;
+            return this;
+        }
 
-              case TagMap.EntryReader.FLOAT:
-                w.writeFloat(entry.floatValue());
-                break;
+        MetaWriter forSpan(boolean firstInTrace, boolean lastInTrace, boolean firstInPayload) {
+            this.firstSpanInTrace = firstInTrace;
+            this.lastSpanInTrace = lastInTrace;
+            this.firstSpanInPayload = firstInPayload;
+            return this;
+        }
 
-              case TagMap.EntryReader.DOUBLE:
-                w.writeDouble(entry.doubleValue());
-                break;
+        @Override
+        public void accept(Metadata metadata) {
+            if (shouldRecalibrate()) {
+                if (TAG_CACHE != null) TAG_CACHE.recalibrate();
+                if (VALUE_CACHE != null) VALUE_CACHE.recalibrate();
+            }
 
-              default:
-                w.writeObject(entry.objectValue(), VALUE_CACHE);
-                break;
+            TagMap tags = metadata.getTags();
+
+            // Also write on top-level spans so that inferred proxy spans (which may be in the middle
+            // of the serialized list due to phased-finish ordering) always carry the sampling decision.
+            final boolean writeSamplingPriority = firstSpanInTrace || lastSpanInTrace || metadata.topLevel();
+            final UTF8BytesString processTags = firstSpanInPayload ? metadata.processTags() : null;
+            final UTF8BytesString otlpExport = firstSpanInPayload ? metadata.otlpExportMarker() : null;
+            int metaSize = metadata.getBaggage().size()
+                    + tags.size()
+                    + (UNSET_STATUS == metadata.getHttpStatusCode() ? 0 : 1)
+                    + (null == metadata.getOrigin() ? 0 : 1)
+                    + (null == processTags ? 0 : 1)
+                    + (null == otlpExport ? 0 : 1)
+                    + 1;
+            int metricsSize = (writeSamplingPriority && metadata.hasSamplingPriority() ? 1 : 0)
+                    + (metadata.measured() ? 1 : 0)
+                    + (metadata.topLevel() ? 1 : 0)
+                    + (metadata.longRunningVersion() != 0 ? 1 : 0)
+                    + 1;
+
+            for (TagMap.EntryReader entryReader : tags) {
+                if (entryReader.isNumber()) {
+                    ++metricsSize;
+                    --metaSize;
+                } else {
+                    Object value = entryReader.objectValue();
+                    if (value instanceof Map) {
+                        --metaSize;
+                        metaSize += getFlatMapSize((Map) value);
+                    }
+                }
             }
-          });
-
-      writable.writeUTF8(META);
-      writable.startMap(metaSize);
-      // we don't need to deduplicate any overlap between tags and baggage here
-      // since they will be accumulated into maps in the same order downstream,
-      // we just need to be sure that the size is the same as the number of elements
-      for (Map.Entry<String, String> entry : metadata.getBaggage().entrySet()) {
-        writable.writeString(entry.getKey(), TAG_CACHE);
-        writable.writeString(entry.getValue(), VALUE_CACHE);
-      }
-      writable.writeUTF8(THREAD_NAME);
-      writable.writeUTF8(metadata.getThreadName());
-      if (UNSET_STATUS != metadata.getHttpStatusCode()) {
-        writable.writeUTF8(HTTP_STATUS);
-        writable.writeUTF8(metadata.getHttpStatusCodeString());
-      }
-      if (null != metadata.getOrigin()) {
-        writable.writeUTF8(ORIGIN_KEY);
-        writable.writeString(metadata.getOrigin(), VALUE_CACHE);
-      }
-      if (processTags != null) {
-        writable.writeUTF8(PROCESS_TAGS_KEY);
-        writable.writeUTF8(processTags);
-      }
-      if (otlpExport != null) {
-        writable.writeUTF8(SDK_OTLP_EXPORT_KEY);
-        writable.writeUTF8(otlpExport);
-      }
-
-      tags.forEach(
-          writable,
-          (w, entryReader) -> {
-            if (entryReader.isNumber()) return;
-
-            String tag = entryReader.tag();
-            Object value = entryReader.objectValue();
-            if (value instanceof Map) {
-              // Write map as flat map
-              writeFlatMap(w, tag, (Map) value);
-            } else {
-              w.writeString(tag, TAG_CACHE);
-              w.writeObjectString(value, VALUE_CACHE);
+            writable.writeUTF8(METRICS);
+            writable.startMap(metricsSize);
+            if (writeSamplingPriority && metadata.hasSamplingPriority()) {
+                writable.writeUTF8(SAMPLING_PRIORITY_KEY);
+                writable.writeInt(metadata.samplingPriority());
+            }
+            if (metadata.measured()) {
+                writable.writeUTF8(InstrumentationTags.DD_MEASURED);
+                writable.writeInt(1);
+            }
+            if (metadata.topLevel()) {
+                writable.writeUTF8(InstrumentationTags.DD_TOP_LEVEL);
+                writable.writeInt(1);
+            }
+            if (metadata.longRunningVersion() != 0) {
+                if (metadata.longRunningVersion() > 0) {
+                    writable.writeUTF8(InstrumentationTags.DD_PARTIAL_VERSION);
+                    writable.writeInt(metadata.longRunningVersion());
+                } else {
+                    writable.writeUTF8(InstrumentationTags.DD_WAS_LONG_RUNNING);
+                    writable.writeInt(1);
+                }
+            }
+            writable.writeUTF8(THREAD_ID);
+            writable.writeLong(metadata.getThreadId());
+
+            tags.forEach(writable, (w, entry) -> {
+                if (!entry.isNumber()) return;
+
+                w.writeString(entry.tag(), TAG_CACHE);
+
+                switch (entry.type()) {
+                    case TagMap.EntryReader.INT:
+                        w.writeInt(entry.intValue());
+                        break;
+
+                    case TagMap.EntryReader.LONG:
+                        w.writeLong(entry.longValue());
+                        break;
+
+                    case TagMap.EntryReader.FLOAT:
+                        w.writeFloat(entry.floatValue());
+                        break;
+
+                    case TagMap.EntryReader.DOUBLE:
+                        w.writeDouble(entry.doubleValue());
+                        break;
+
+                    default:
+                        w.writeObject(entry.objectValue(), VALUE_CACHE);
+                        break;
+                }
+            });
+
+            writable.writeUTF8(META);
+            writable.startMap(metaSize);
+            // we don't need to deduplicate any overlap between tags and baggage here
+            // since they will be accumulated into maps in the same order downstream,
+            // we just need to be sure that the size is the same as the number of elements
+            for (Map.Entry<String, String> entry : metadata.getBaggage().entrySet()) {
+                writable.writeString(entry.getKey(), TAG_CACHE);
+                writable.writeString(entry.getValue(), VALUE_CACHE);
+            }
+            writable.writeUTF8(THREAD_NAME);
+            writable.writeUTF8(metadata.getThreadName());
+            if (UNSET_STATUS != metadata.getHttpStatusCode()) {
+                writable.writeUTF8(HTTP_STATUS);
+                writable.writeUTF8(metadata.getHttpStatusCodeString());
+            }
+            if (null != metadata.getOrigin()) {
+                writable.writeUTF8(ORIGIN_KEY);
+                writable.writeString(metadata.getOrigin(), VALUE_CACHE);
+            }
+            if (processTags != null) {
+                writable.writeUTF8(PROCESS_TAGS_KEY);
+                writable.writeUTF8(processTags);
+            }
+            if (otlpExport != null) {
+                writable.writeUTF8(SDK_OTLP_EXPORT_KEY);
+                writable.writeUTF8(otlpExport);
             }
-          });
-    }
 
-    /**
-     * Calculate number of all values from map and all sub-maps Assuming map could be a binary tree
-     *
-     * @param map map to traverse
-     * @return number of all elements in the tree
-     */
-    static int getFlatMapSize(Map<String, Object> map) {
-      int size = 0;
-      for (Object value : map.values()) {
-        if (value instanceof Map) {
-          size += getFlatMapSize((Map) value);
-        } else {
-          size++;
+            tags.forEach(writable, (w, entryReader) -> {
+                if (entryReader.isNumber()) return;
+
+                String tag = entryReader.tag();
+                Object value = entryReader.objectValue();
+                if (value instanceof Map) {
+                    // Write map as flat map
+                    writeFlatMap(w, tag, (Map) value);
+                } else {
+                    w.writeString(tag, TAG_CACHE);
+                    w.writeObjectString(value, VALUE_CACHE);
+                }
+            });
+        }
+
+        /**
+         * Calculate number of all values from map and all sub-maps Assuming map could be a binary tree
+         *
+         * @param map map to traverse
+         * @return number of all elements in the tree
+         */
+        static int getFlatMapSize(Map<String, Object> map) {
+            int size = 0;
+            for (Object value : map.values()) {
+                if (value instanceof Map) {
+                    size += getFlatMapSize((Map) value);
+                } else {
+                    size++;
+                }
+            }
+            return size;
+        }
+
+        /**
+         * Method write map of maps into writeable as FlatMap
+         *
+         * <p>Example: "root": { "key1": "val1" "key2": { "sub1": "val2", "sub2": "val3" } } "plain":
+         * "123"
+         *
+         * <p>Result: "root.key1" -> "val1" "root.key2.sub1" -> "val2" "root.key2.sub2" -> "val3"
+         * "plain" -> "123"
+         *
+         * @param key key name used as base
+         * @param mapValue map of tags that can contain sub-maps as values
+         */
+        static void writeFlatMap(Writable writable, String key, Map<String, Object> mapValue) {
+            for (Map.Entry<String, Object> entry : mapValue.entrySet()) {
+                String newKey = key + '.' + entry.getKey();
+                Object newValue = entry.getValue();
+                if (newValue instanceof Map) {
+                    writeFlatMap(writable, newKey, (Map) newValue);
+                } else {
+                    writable.writeString(newKey, TAG_CACHE);
+                    writable.writeObjectString(newValue, VALUE_CACHE);
+                }
+            }
         }
-      }
-      return size;
     }
 
     /**
-     * Method write map of maps into writeable as FlatMap
-     *
-     * <p>Example: "root": { "key1": "val1" "key2": { "sub1": "val2", "sub2": "val3" } } "plain":
-     * "123"
-     *
-     * <p>Result: "root.key1" -> "val1" "root.key2.sub1" -> "val2" "root.key2.sub2" -> "val3"
-     * "plain" -> "123"
+     * The MetaStruct field can safely be used with v4 agents and will be discarded for other
+     * versions.
      *
-     * @param key key name used as base
-     * @param mapValue map of tags that can contain sub-maps as values
+     * <p>Any type that needs to be serialized as part of the meta_struct field has to either be a JDK
+     * known type (primitives, wrappers, collections ...) or registered with {@link
+     * datadog.communication.serialization.Codec#Codec(Map)}, in the rest of the cases the {@code
+     * toString} representation of the object will be used instead
      */
-    static void writeFlatMap(Writable writable, String key, Map<String, Object> mapValue) {
-      for (Map.Entry<String, Object> entry : mapValue.entrySet()) {
-        String newKey = key + '.' + entry.getKey();
-        Object newValue = entry.getValue();
-        if (newValue instanceof Map) {
-          writeFlatMap(writable, newKey, (Map) newValue);
-        } else {
-          writable.writeString(newKey, TAG_CACHE);
-          writable.writeObjectString(newValue, VALUE_CACHE);
-        }
-      }
-    }
-  }
-
-  /**
-   * The MetaStruct field can safely be used with v4 agents and will be discarded for other
-   * versions.
-   *
-   * <p>Any type that needs to be serialized as part of the meta_struct field has to either be a JDK
-   * known type (primitives, wrappers, collections ...) or registered with {@link
-   * datadog.communication.serialization.Codec#Codec(Map)}, in the rest of the cases the {@code
-   * toString} representation of the object will be used instead
-   */
-  public static class MetaStructWriter {
-
-    private static final UTF8BytesString META_STRUCT = UTF8BytesString.create("meta_struct");
-    private static final int BUFFER_SIZE = 1 << 10;
-
-    private Writable writable;
-
-    MetaStructWriter withWritable(final Writable writable) {
-      this.writable = writable;
-      return this;
-    }
+    public static class MetaStructWriter {
 
-    public void write(final Map<String, Object> metaStruct) {
-      writable.writeUTF8(META_STRUCT);
-      writable.startMap(metaStruct.size());
-      final GrowableBuffer buffer = new GrowableBuffer(BUFFER_SIZE);
-      final MsgPackWriter metaStructWriter = new MsgPackWriter(Codec.INSTANCE, buffer);
-      for (Map.Entry<String, Object> entry : metaStruct.entrySet()) {
-        writeMetaStructEntry(metaStructWriter, buffer, entry.getKey(), entry.getValue());
-      }
-    }
+        private static final UTF8BytesString META_STRUCT = UTF8BytesString.create("meta_struct");
+        private static final int BUFFER_SIZE = 1 << 10;
 
-    private void writeMetaStructEntry(
-        final MsgPackWriter writer,
-        final GrowableBuffer buffer,
-        final String key,
-        final Object value) {
-      buffer.mark();
-      try {
-        writer.writeObject(value, null);
-        writer.flush();
-        writable.writeString(key, TAG_CACHE);
-        writable.writeBinary(buffer.slice());
-      } finally {
-        buffer.reset();
-      }
-    }
-  }
-
-  private final MetaWriter metaWriter = new MetaWriter();
-  private final MetaStructWriter metaStructWriter = new MetaStructWriter();
-
-  @Override
-  public void map(List<? extends CoreSpan<?>> trace, final Writable writable) {
-    writable.startArray(trace.size());
-    for (int i = 0; i < trace.size(); i++) {
-      final CoreSpan<?> span = trace.get(i);
-      final Map<String, Object> metaStruct = span.getMetaStruct();
-      writable.startMap(metaStruct.isEmpty() ? 12 : 13);
-      /* 1  */
-      writable.writeUTF8(SERVICE);
-      writable.writeString(span.getServiceName(), VALUE_CACHE);
-      /* 2  */
-      writable.writeUTF8(NAME);
-      writable.writeObject(span.getOperationName(), VALUE_CACHE);
-      /* 3  */
-      writable.writeUTF8(RESOURCE);
-      writable.writeObject(span.getResourceName(), VALUE_CACHE);
-      /* 4  */
-      writable.writeUTF8(TRACE_ID);
-      writable.writeUnsignedLong(span.getTraceId().toLong());
-      /* 5  */
-      writable.writeUTF8(SPAN_ID);
-      writable.writeUnsignedLong(span.getSpanId());
-      /* 6  */
-      writable.writeUTF8(PARENT_ID);
-      writable.writeUnsignedLong(span.getParentId());
-      /* 7  */
-      writable.writeUTF8(START);
-      writable.writeLong(span.getStartTime());
-      /* 8  */
-      writable.writeUTF8(DURATION);
-      writable.writeLong(PendingTrace.getDurationNano(span));
-      /* 9  */
-      writable.writeUTF8(TYPE);
-      writable.writeString(span.getType(), VALUE_CACHE);
-      /* 10 */
-      writable.writeUTF8(ERROR);
-      writable.writeInt(span.getError());
-      /* 11, 12 */
-      span.processTagsAndBaggage(
-          metaWriter
-              .withWritable(writable)
-              .forSpan(i == 0, i == trace.size() - 1, !firstSpanWritten),
-          i == 0);
-      if (!metaStruct.isEmpty()) {
-        /* 13 */
-        metaStructWriter.withWritable(writable).write(metaStruct);
-      }
-      firstSpanWritten = true;
-    }
-  }
+        private Writable writable;
 
-  @Override
-  public Payload newPayload() {
-    return new PayloadV0_4();
-  }
+        MetaStructWriter withWritable(final Writable writable) {
+            this.writable = writable;
+            return this;
+        }
 
-  @Override
-  public int messageBufferSize() {
-    return size; // 5MB
-  }
+        public void write(final Map<String, Object> metaStruct) {
+            writable.writeUTF8(META_STRUCT);
+            writable.startMap(metaStruct.size());
+            final GrowableBuffer buffer = new GrowableBuffer(BUFFER_SIZE);
+            final MsgPackWriter metaStructWriter = new MsgPackWriter(Codec.INSTANCE, buffer);
+            for (Map.Entry<String, Object> entry : metaStruct.entrySet()) {
+                writeMetaStructEntry(metaStructWriter, buffer, entry.getKey(), entry.getValue());
+            }
+        }
 
-  @Override
-  public void reset() {
-    firstSpanWritten = false;
-  }
+        private void writeMetaStructEntry(
+                final MsgPackWriter writer, final GrowableBuffer buffer, final String key, final Object value) {
+            buffer.mark();
+            try {
+                writer.writeObject(value, null);
+                writer.flush();
+                writable.writeString(key, TAG_CACHE);
+                writable.writeBinary(buffer.slice());
+            } finally {
+                buffer.reset();
+            }
+        }
+    }
 
-  @Override
-  public String endpoint() {
-    return "v0.4";
-  }
+    private final MetaWriter metaWriter = new MetaWriter();
+    private final MetaStructWriter metaStructWriter = new MetaStructWriter();
 
-  private static class PayloadV0_4 extends Payload {
+    @Override
+    public void map(List<? extends CoreSpan<?>> trace, final Writable writable) {
+        writable.startArray(trace.size());
+        for (int i = 0; i < trace.size(); i++) {
+            final CoreSpan<?> span = trace.get(i);
+            final Map<String, Object> metaStruct = span.getMetaStruct();
+            writable.startMap(metaStruct.isEmpty() ? 12 : 13);
+            /* 1  */
+            writable.writeUTF8(SERVICE);
+            writable.writeString(span.getServiceName(), VALUE_CACHE);
+            /* 2  */
+            writable.writeUTF8(NAME);
+            writable.writeObject(span.getOperationName(), VALUE_CACHE);
+            /* 3  */
+            writable.writeUTF8(RESOURCE);
+            writable.writeObject(span.getResourceName(), VALUE_CACHE);
+            /* 4  */
+            writable.writeUTF8(TRACE_ID);
+            writable.writeUnsignedLong(span.getTraceId().toLong());
+            /* 5  */
+            writable.writeUTF8(SPAN_ID);
+            writable.writeUnsignedLong(span.getSpanId());
+            /* 6  */
+            writable.writeUTF8(PARENT_ID);
+            writable.writeUnsignedLong(span.getParentId());
+            /* 7  */
+            writable.writeUTF8(START);
+            writable.writeLong(span.getStartTime());
+            /* 8  */
+            writable.writeUTF8(DURATION);
+            writable.writeLong(PendingTrace.getDurationNano(span));
+            /* 9  */
+            writable.writeUTF8(TYPE);
+            writable.writeString(span.getType(), VALUE_CACHE);
+            /* 10 */
+            writable.writeUTF8(ERROR);
+            writable.writeInt(span.getError());
+            /* 11, 12 */
+            span.processTagsAndBaggage(
+                    metaWriter.withWritable(writable).forSpan(i == 0, i == trace.size() - 1, !firstSpanWritten),
+                    i == 0);
+            if (!metaStruct.isEmpty()) {
+                /* 13 */
+                metaStructWriter.withWritable(writable).write(metaStruct);
+            }
+            firstSpanWritten = true;
+        }
+    }
+
+    @Override
+    public Payload newPayload() {
+        return new PayloadV0_4();
+    }
 
     @Override
-    public int sizeInBytes() {
-      return msgpackArrayHeaderSize(traceCount()) + body.remaining();
+    public int messageBufferSize() {
+        return size; // 5MB
     }
 
     @Override
-    public void writeTo(WritableByteChannel channel) throws IOException {
-      ByteBuffer header = msgpackArrayHeader(traceCount());
-      while (header.hasRemaining()) {
-        channel.write(header);
-      }
-      while (body.hasRemaining()) {
-        channel.write(body);
-      }
+    public void reset() {
+        firstSpanWritten = false;
     }
 
     @Override
-    public RequestBody toRequest() {
-      return msgpackRequestBodyOf(Arrays.asList(msgpackArrayHeader(traceCount()), body));
+    public String endpoint() {
+        return "v0.4";
+    }
+
+    private static class PayloadV0_4 extends Payload {
+
+        @Override
+        public int sizeInBytes() {
+            return msgpackArrayHeaderSize(traceCount()) + body.remaining();
+        }
+
+        @Override
+        public void writeTo(WritableByteChannel channel) throws IOException {
+            ByteBuffer header = msgpackArrayHeader(traceCount());
+            while (header.hasRemaining()) {
+                channel.write(header);
+            }
+            while (body.hasRemaining()) {
+                channel.write(body);
+            }
+        }
+
+        @Override
+        public RequestBody toRequest() {
+            return msgpackRequestBodyOf(Arrays.asList(msgpackArrayHeader(traceCount()), body));
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_5.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_5.java
index 51a7f1bdb8c..5747582a39f 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_5.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_5.java
@@ -29,365 +29,360 @@
 
 public final class TraceMapperV0_5 implements TraceMapper {
 
-  private final WritableFormatter dictionaryWriter;
-  private final DictionaryMapper dictionaryMapper = new DictionaryMapper();
-  private final Map<Object, Integer> encoding = new HashMap<>();
-  private final GrowableBuffer dictionary;
-
-  private final MetaWriter metaWriter = new MetaWriter();
-
-  private final int size;
-  private boolean firstSpanWritten;
-
-  public TraceMapperV0_5() {
-    this(2 << 20);
-  }
-
-  public TraceMapperV0_5(int dictionarySize, int bufferSize) {
-    // growable buffer is implicitly bounded by the fixed size buffer
-    // the messages themselves are written into
-    this.dictionary = new GrowableBuffer(bufferSize);
-    this.dictionaryWriter = new MsgPackWriter(dictionary);
-    this.size = bufferSize;
-    reset();
-  }
-
-  public TraceMapperV0_5(final int dictionarySize) {
-    this(dictionarySize, 2 << 20);
-  }
-
-  @Override
-  public void map(final List<? extends CoreSpan<?>> trace, final Writable writable) {
-    writable.startArray(trace.size());
-    for (int i = 0; i < trace.size(); i++) {
-      final CoreSpan<?> span = trace.get(i);
-      writable.startArray(12);
-      /* 1  */
-      writeDictionaryEncoded(writable, span.getServiceName());
-      /* 2  */
-      writeDictionaryEncoded(writable, span.getOperationName());
-      /* 3  */
-      writeDictionaryEncoded(writable, span.getResourceName());
-      /* 4  */
-      writable.writeUnsignedLong(span.getTraceId().toLong());
-      /* 5  */
-      writable.writeUnsignedLong(span.getSpanId());
-      /* 6  */
-      writable.writeUnsignedLong(span.getParentId());
-      /* 7  */
-      writable.writeLong(span.getStartTime());
-      /* 8  */
-      writable.writeLong(PendingTrace.getDurationNano(span));
-      /* 9  */
-      writable.writeInt(span.getError());
-      /* 10, 11  */
-      span.processTagsAndBaggage(
-          metaWriter
-              .withWritable(writable)
-              .forSpan(i == 0, i == trace.size() - 1, !firstSpanWritten),
-          i == 0);
-      /* 12 */
-      writeDictionaryEncoded(writable, span.getType());
-      firstSpanWritten = true;
+    private final WritableFormatter dictionaryWriter;
+    private final DictionaryMapper dictionaryMapper = new DictionaryMapper();
+    private final Map<Object, Integer> encoding = new HashMap<>();
+    private final GrowableBuffer dictionary;
+
+    private final MetaWriter metaWriter = new MetaWriter();
+
+    private final int size;
+    private boolean firstSpanWritten;
+
+    public TraceMapperV0_5() {
+        this(2 << 20);
     }
-  }
-
-  private void writeDictionaryEncoded(final Writable writable, final Object value) {
-    final Object target = null == value ? "" : value;
-    final Integer encoded = encoding.get(target);
-    if (null == encoded) {
-      dictionaryWriter.format(target, dictionaryMapper);
-      final int dictionaryCode = dictionary.messageCount() - 1;
-      encoding.put(target, dictionaryCode);
-      // this call can fail, but the dictionary has been written to now
-      // so should make sure dictionary state is consistent first
-      writable.writeInt(dictionaryCode);
-    } else {
-      writable.writeInt(encoded);
+
+    public TraceMapperV0_5(int dictionarySize, int bufferSize) {
+        // growable buffer is implicitly bounded by the fixed size buffer
+        // the messages themselves are written into
+        this.dictionary = new GrowableBuffer(bufferSize);
+        this.dictionaryWriter = new MsgPackWriter(dictionary);
+        this.size = bufferSize;
+        reset();
     }
-  }
-
-  @Override
-  public Payload newPayload() {
-    return new PayloadV0_5(dictionary.slice(), dictionary.messageCount());
-  }
-
-  @Override
-  public int messageBufferSize() {
-    return size; // 2MB
-  }
-
-  @Override
-  public void reset() {
-    dictionary.reset();
-    encoding.clear();
-    firstSpanWritten = false;
-  }
-
-  @Override
-  public String endpoint() {
-    return "v0.5";
-  }
-
-  @VisibleForTesting
-  Map<Object, Integer> getEncoding() {
-    return encoding;
-  }
-
-  @VisibleForTesting
-  GrowableBuffer getDictionary() {
-    return dictionary;
-  }
-
-  private static class DictionaryMapper implements Mapper<Object> {
 
-    @Override
-    public void map(final Object data, final Writable packer) {
-      if (data instanceof UTF8BytesString) {
-        packer.writeObject(data, null);
-      } else {
-        packer.writeString(String.valueOf(data), null);
-      }
+    public TraceMapperV0_5(final int dictionarySize) {
+        this(dictionarySize, 2 << 20);
     }
-  }
 
-  private static class PayloadV0_5 extends Payload {
+    @Override
+    public void map(final List<? extends CoreSpan<?>> trace, final Writable writable) {
+        writable.startArray(trace.size());
+        for (int i = 0; i < trace.size(); i++) {
+            final CoreSpan<?> span = trace.get(i);
+            writable.startArray(12);
+            /* 1  */
+            writeDictionaryEncoded(writable, span.getServiceName());
+            /* 2  */
+            writeDictionaryEncoded(writable, span.getOperationName());
+            /* 3  */
+            writeDictionaryEncoded(writable, span.getResourceName());
+            /* 4  */
+            writable.writeUnsignedLong(span.getTraceId().toLong());
+            /* 5  */
+            writable.writeUnsignedLong(span.getSpanId());
+            /* 6  */
+            writable.writeUnsignedLong(span.getParentId());
+            /* 7  */
+            writable.writeLong(span.getStartTime());
+            /* 8  */
+            writable.writeLong(PendingTrace.getDurationNano(span));
+            /* 9  */
+            writable.writeInt(span.getError());
+            /* 10, 11  */
+            span.processTagsAndBaggage(
+                    metaWriter.withWritable(writable).forSpan(i == 0, i == trace.size() - 1, !firstSpanWritten),
+                    i == 0);
+            /* 12 */
+            writeDictionaryEncoded(writable, span.getType());
+            firstSpanWritten = true;
+        }
+    }
 
-    private final ByteBuffer dictionary;
-    private final int stringCount;
+    private void writeDictionaryEncoded(final Writable writable, final Object value) {
+        final Object target = null == value ? "" : value;
+        final Integer encoded = encoding.get(target);
+        if (null == encoded) {
+            dictionaryWriter.format(target, dictionaryMapper);
+            final int dictionaryCode = dictionary.messageCount() - 1;
+            encoding.put(target, dictionaryCode);
+            // this call can fail, but the dictionary has been written to now
+            // so should make sure dictionary state is consistent first
+            writable.writeInt(dictionaryCode);
+        } else {
+            writable.writeInt(encoded);
+        }
+    }
 
-    private PayloadV0_5(ByteBuffer dictionary, int stringCount) {
-      this.dictionary = dictionary;
-      this.stringCount = stringCount;
+    @Override
+    public Payload newPayload() {
+        return new PayloadV0_5(dictionary.slice(), dictionary.messageCount());
     }
 
     @Override
-    public int sizeInBytes() {
-      return 1
-          + msgpackArrayHeaderSize(stringCount)
-          + dictionary.remaining()
-          + msgpackArrayHeaderSize(traceCount())
-          + body.remaining();
+    public int messageBufferSize() {
+        return size; // 2MB
     }
 
     @Override
-    public void writeTo(WritableByteChannel channel) throws IOException {
-      for (ByteBuffer buffer : toList()) {
-        while (buffer.hasRemaining()) {
-          channel.write(buffer);
-        }
-      }
+    public void reset() {
+        dictionary.reset();
+        encoding.clear();
+        firstSpanWritten = false;
     }
 
     @Override
-    public RequestBody toRequest() {
-      return msgpackRequestBodyOf(toList());
+    public String endpoint() {
+        return "v0.5";
     }
 
-    private List<ByteBuffer> toList() {
-      return Arrays.asList(
-          // msgpack array header with 2 elements (FIXARRAY | 2)
-          ByteBuffer.allocate(1).put(0, (byte) 0x92),
-          msgpackArrayHeader(stringCount),
-          dictionary,
-          msgpackArrayHeader(traceCount()),
-          body);
+    @VisibleForTesting
+    Map<Object, Integer> getEncoding() {
+        return encoding;
     }
-  }
 
-  private final class MetaWriter implements MetadataConsumer {
+    @VisibleForTesting
+    GrowableBuffer getDictionary() {
+        return dictionary;
+    }
 
-    private Writable writable;
-    private boolean firstSpanInTrace;
-    private boolean lastSpanInTrace;
-    private boolean firstSpanInPayload;
+    private static class DictionaryMapper implements Mapper<Object> {
 
-    MetaWriter withWritable(final Writable writable) {
-      this.writable = writable;
-      return this;
+        @Override
+        public void map(final Object data, final Writable packer) {
+            if (data instanceof UTF8BytesString) {
+                packer.writeObject(data, null);
+            } else {
+                packer.writeString(String.valueOf(data), null);
+            }
+        }
     }
 
-    MetaWriter forSpan(boolean firstInTrace, boolean lastInTrace, boolean firstInPayload) {
-      this.firstSpanInTrace = firstInTrace;
-      this.lastSpanInTrace = lastInTrace;
-      this.firstSpanInPayload = firstInPayload;
-      return this;
-    }
+    private static class PayloadV0_5 extends Payload {
 
-    @Override
-    public void accept(Metadata metadata) {
-      // Also write on top-level spans so that inferred proxy spans (which may be in the middle
-      // of the serialized list due to phased-finish ordering) always carry the sampling decision.
-      final boolean writeSamplingPriority =
-          firstSpanInTrace || lastSpanInTrace || metadata.topLevel();
-      final UTF8BytesString processTags = firstSpanInPayload ? metadata.processTags() : null;
-      final UTF8BytesString otlpExport = firstSpanInPayload ? metadata.otlpExportMarker() : null;
-
-      TagMap tags = metadata.getTags();
-
-      int metaSize =
-          metadata.getBaggage().size()
-              + tags.size()
-              + (UNSET_STATUS == metadata.getHttpStatusCode() ? 0 : 1)
-              + (null == metadata.getOrigin() ? 0 : 1)
-              + (null == processTags ? 0 : 1)
-              + (null == otlpExport ? 0 : 1)
-              + 1;
-      int metricsSize =
-          (writeSamplingPriority && metadata.hasSamplingPriority() ? 1 : 0)
-              + (metadata.measured() ? 1 : 0)
-              + (metadata.topLevel() ? 1 : 0)
-              + (metadata.longRunningVersion() != 0 ? 1 : 0)
-              + 1;
-
-      for (TagMap.EntryReader entry : tags) {
-        if (entry.isNumber()) {
-          ++metricsSize;
-          --metaSize;
-        } else {
-          Object value = entry.objectValue();
-          if (value instanceof Map) {
-            --metaSize;
-            metaSize += getFlatMapSize((Map) value);
-          }
+        private final ByteBuffer dictionary;
+        private final int stringCount;
+
+        private PayloadV0_5(ByteBuffer dictionary, int stringCount) {
+            this.dictionary = dictionary;
+            this.stringCount = stringCount;
         }
-      }
-
-      writable.startMap(metaSize);
-      // we don't need to deduplicate any overlap between tags and baggage here
-      // since they will be accumulated into maps in the same order downstream,
-      // we just need to be sure that the size is the same as the number of elements
-      for (Map.Entry<String, String> entry : metadata.getBaggage().entrySet()) {
-        writeDictionaryEncoded(writable, entry.getKey());
-        writeDictionaryEncoded(writable, entry.getValue());
-      }
-      writeDictionaryEncoded(writable, THREAD_NAME);
-      writeDictionaryEncoded(writable, metadata.getThreadName());
-      if (UNSET_STATUS != metadata.getHttpStatusCode()) {
-        writeDictionaryEncoded(writable, HTTP_STATUS);
-        writeDictionaryEncoded(writable, metadata.getHttpStatusCodeString());
-      }
-      if (null != metadata.getOrigin()) {
-        writeDictionaryEncoded(writable, ORIGIN_KEY);
-        writeDictionaryEncoded(writable, metadata.getOrigin());
-      }
-      if (null != processTags) {
-        writeDictionaryEncoded(writable, PROCESS_TAGS_KEY);
-        writeDictionaryEncoded(writable, processTags);
-      }
-      if (null != otlpExport) {
-        writeDictionaryEncoded(writable, SDK_OTLP_EXPORT_KEY);
-        writeDictionaryEncoded(writable, otlpExport);
-      }
-
-      for (TagMap.EntryReader entry : tags) {
-        if (entry.isNumber()) continue;
-
-        String key = entry.tag();
-        Object value = entry.objectValue();
-
-        if (value instanceof Map) {
-          // Write map as flat map
-          writeFlatMap(key, (Map) value);
-        } else {
-          writeDictionaryEncoded(writable, key);
-          writeDictionaryEncoded(writable, value);
+
+        @Override
+        public int sizeInBytes() {
+            return 1
+                    + msgpackArrayHeaderSize(stringCount)
+                    + dictionary.remaining()
+                    + msgpackArrayHeaderSize(traceCount())
+                    + body.remaining();
         }
-      }
-      writable.startMap(metricsSize);
-      if (writeSamplingPriority && metadata.hasSamplingPriority()) {
-        writeDictionaryEncoded(writable, SAMPLING_PRIORITY_KEY);
-        writable.writeInt(metadata.samplingPriority());
-      }
-      if (metadata.measured()) {
-        writeDictionaryEncoded(writable, InstrumentationTags.DD_MEASURED);
-        writable.writeInt(1);
-      }
-      if (metadata.topLevel()) {
-        writeDictionaryEncoded(writable, InstrumentationTags.DD_TOP_LEVEL);
-        writable.writeInt(1);
-      }
-      if (metadata.longRunningVersion() != 0) {
-        if (metadata.longRunningVersion() > 0) {
-          writable.writeUTF8(InstrumentationTags.DD_PARTIAL_VERSION);
-          writable.writeInt(metadata.longRunningVersion());
-        } else {
-          writable.writeUTF8(InstrumentationTags.DD_WAS_LONG_RUNNING);
-          writable.writeInt(1);
+
+        @Override
+        public void writeTo(WritableByteChannel channel) throws IOException {
+            for (ByteBuffer buffer : toList()) {
+                while (buffer.hasRemaining()) {
+                    channel.write(buffer);
+                }
+            }
         }
-      }
-      writeDictionaryEncoded(writable, THREAD_ID);
-      writable.writeLong(metadata.getThreadId());
-
-      for (EntryReader entry : metadata.getTags()) {
-        if (!entry.isNumber()) continue;
-
-        writeDictionaryEncoded(writable, entry.tag());
-        switch (entry.type()) {
-          case TagMap.EntryReader.INT:
-            writable.writeInt(entry.intValue());
-            break;
-
-          case TagMap.EntryReader.LONG:
-            writable.writeLong(entry.longValue());
-            break;
-
-          case TagMap.EntryReader.FLOAT:
-            writable.writeFloat(entry.floatValue());
-            break;
-
-          case TagMap.EntryReader.DOUBLE:
-            writable.writeDouble(entry.doubleValue());
-            break;
-
-          default:
-            writable.writeObject(entry.objectValue(), null);
-            break;
+
+        @Override
+        public RequestBody toRequest() {
+            return msgpackRequestBodyOf(toList());
         }
-      }
-    }
 
-    /**
-     * Calculate number of all values from map and all sub-maps Assuming map could be a binary tree
-     *
-     * @param map map to traverse
-     * @return number of all elements in the tree
-     */
-    int getFlatMapSize(Map<String, Object> map) {
-      int size = 0;
-      for (Object value : map.values()) {
-        if (value instanceof Map) {
-          size += getFlatMapSize((Map) value);
-        } else {
-          size++;
+        private List<ByteBuffer> toList() {
+            return Arrays.asList(
+                    // msgpack array header with 2 elements (FIXARRAY | 2)
+                    ByteBuffer.allocate(1).put(0, (byte) 0x92),
+                    msgpackArrayHeader(stringCount),
+                    dictionary,
+                    msgpackArrayHeader(traceCount()),
+                    body);
         }
-      }
-      return size;
     }
 
-    /**
-     * Method write map of maps into writeable as FlatMap
-     *
-     * <p>Example: "root": { "key1": "val1" "key2": { "sub1": "val2", "sub2": "val3" } } "plain":
-     * "123"
-     *
-     * <p>Result: "root.key1" -> "val1" "root.key2.sub1" -> "val2" "root.key2.sub2" -> "val3"
-     * "plain" -> "123"
-     *
-     * @param key key name used as base
-     * @param mapValue map of tags that can contain sub-maps as values
-     */
-    private void writeFlatMap(String key, Map<String, Object> mapValue) {
-      for (Map.Entry<String, Object> entry : mapValue.entrySet()) {
-        String newKey = key + '.' + entry.getKey();
-        Object newValue = entry.getValue();
-        if (newValue instanceof Map) {
-          writeFlatMap(newKey, (Map) newValue);
-        } else {
-          writeDictionaryEncoded(writable, newKey);
-          writeDictionaryEncoded(writable, newValue);
+    private final class MetaWriter implements MetadataConsumer {
+
+        private Writable writable;
+        private boolean firstSpanInTrace;
+        private boolean lastSpanInTrace;
+        private boolean firstSpanInPayload;
+
+        MetaWriter withWritable(final Writable writable) {
+            this.writable = writable;
+            return this;
+        }
+
+        MetaWriter forSpan(boolean firstInTrace, boolean lastInTrace, boolean firstInPayload) {
+            this.firstSpanInTrace = firstInTrace;
+            this.lastSpanInTrace = lastInTrace;
+            this.firstSpanInPayload = firstInPayload;
+            return this;
+        }
+
+        @Override
+        public void accept(Metadata metadata) {
+            // Also write on top-level spans so that inferred proxy spans (which may be in the middle
+            // of the serialized list due to phased-finish ordering) always carry the sampling decision.
+            final boolean writeSamplingPriority = firstSpanInTrace || lastSpanInTrace || metadata.topLevel();
+            final UTF8BytesString processTags = firstSpanInPayload ? metadata.processTags() : null;
+            final UTF8BytesString otlpExport = firstSpanInPayload ? metadata.otlpExportMarker() : null;
+
+            TagMap tags = metadata.getTags();
+
+            int metaSize = metadata.getBaggage().size()
+                    + tags.size()
+                    + (UNSET_STATUS == metadata.getHttpStatusCode() ? 0 : 1)
+                    + (null == metadata.getOrigin() ? 0 : 1)
+                    + (null == processTags ? 0 : 1)
+                    + (null == otlpExport ? 0 : 1)
+                    + 1;
+            int metricsSize = (writeSamplingPriority && metadata.hasSamplingPriority() ? 1 : 0)
+                    + (metadata.measured() ? 1 : 0)
+                    + (metadata.topLevel() ? 1 : 0)
+                    + (metadata.longRunningVersion() != 0 ? 1 : 0)
+                    + 1;
+
+            for (TagMap.EntryReader entry : tags) {
+                if (entry.isNumber()) {
+                    ++metricsSize;
+                    --metaSize;
+                } else {
+                    Object value = entry.objectValue();
+                    if (value instanceof Map) {
+                        --metaSize;
+                        metaSize += getFlatMapSize((Map) value);
+                    }
+                }
+            }
+
+            writable.startMap(metaSize);
+            // we don't need to deduplicate any overlap between tags and baggage here
+            // since they will be accumulated into maps in the same order downstream,
+            // we just need to be sure that the size is the same as the number of elements
+            for (Map.Entry<String, String> entry : metadata.getBaggage().entrySet()) {
+                writeDictionaryEncoded(writable, entry.getKey());
+                writeDictionaryEncoded(writable, entry.getValue());
+            }
+            writeDictionaryEncoded(writable, THREAD_NAME);
+            writeDictionaryEncoded(writable, metadata.getThreadName());
+            if (UNSET_STATUS != metadata.getHttpStatusCode()) {
+                writeDictionaryEncoded(writable, HTTP_STATUS);
+                writeDictionaryEncoded(writable, metadata.getHttpStatusCodeString());
+            }
+            if (null != metadata.getOrigin()) {
+                writeDictionaryEncoded(writable, ORIGIN_KEY);
+                writeDictionaryEncoded(writable, metadata.getOrigin());
+            }
+            if (null != processTags) {
+                writeDictionaryEncoded(writable, PROCESS_TAGS_KEY);
+                writeDictionaryEncoded(writable, processTags);
+            }
+            if (null != otlpExport) {
+                writeDictionaryEncoded(writable, SDK_OTLP_EXPORT_KEY);
+                writeDictionaryEncoded(writable, otlpExport);
+            }
+
+            for (TagMap.EntryReader entry : tags) {
+                if (entry.isNumber()) continue;
+
+                String key = entry.tag();
+                Object value = entry.objectValue();
+
+                if (value instanceof Map) {
+                    // Write map as flat map
+                    writeFlatMap(key, (Map) value);
+                } else {
+                    writeDictionaryEncoded(writable, key);
+                    writeDictionaryEncoded(writable, value);
+                }
+            }
+            writable.startMap(metricsSize);
+            if (writeSamplingPriority && metadata.hasSamplingPriority()) {
+                writeDictionaryEncoded(writable, SAMPLING_PRIORITY_KEY);
+                writable.writeInt(metadata.samplingPriority());
+            }
+            if (metadata.measured()) {
+                writeDictionaryEncoded(writable, InstrumentationTags.DD_MEASURED);
+                writable.writeInt(1);
+            }
+            if (metadata.topLevel()) {
+                writeDictionaryEncoded(writable, InstrumentationTags.DD_TOP_LEVEL);
+                writable.writeInt(1);
+            }
+            if (metadata.longRunningVersion() != 0) {
+                if (metadata.longRunningVersion() > 0) {
+                    writable.writeUTF8(InstrumentationTags.DD_PARTIAL_VERSION);
+                    writable.writeInt(metadata.longRunningVersion());
+                } else {
+                    writable.writeUTF8(InstrumentationTags.DD_WAS_LONG_RUNNING);
+                    writable.writeInt(1);
+                }
+            }
+            writeDictionaryEncoded(writable, THREAD_ID);
+            writable.writeLong(metadata.getThreadId());
+
+            for (EntryReader entry : metadata.getTags()) {
+                if (!entry.isNumber()) continue;
+
+                writeDictionaryEncoded(writable, entry.tag());
+                switch (entry.type()) {
+                    case TagMap.EntryReader.INT:
+                        writable.writeInt(entry.intValue());
+                        break;
+
+                    case TagMap.EntryReader.LONG:
+                        writable.writeLong(entry.longValue());
+                        break;
+
+                    case TagMap.EntryReader.FLOAT:
+                        writable.writeFloat(entry.floatValue());
+                        break;
+
+                    case TagMap.EntryReader.DOUBLE:
+                        writable.writeDouble(entry.doubleValue());
+                        break;
+
+                    default:
+                        writable.writeObject(entry.objectValue(), null);
+                        break;
+                }
+            }
+        }
+
+        /**
+         * Calculate number of all values from map and all sub-maps Assuming map could be a binary tree
+         *
+         * @param map map to traverse
+         * @return number of all elements in the tree
+         */
+        int getFlatMapSize(Map<String, Object> map) {
+            int size = 0;
+            for (Object value : map.values()) {
+                if (value instanceof Map) {
+                    size += getFlatMapSize((Map) value);
+                } else {
+                    size++;
+                }
+            }
+            return size;
+        }
+
+        /**
+         * Method write map of maps into writeable as FlatMap
+         *
+         * <p>Example: "root": { "key1": "val1" "key2": { "sub1": "val2", "sub2": "val3" } } "plain":
+         * "123"
+         *
+         * <p>Result: "root.key1" -> "val1" "root.key2.sub1" -> "val2" "root.key2.sub2" -> "val3"
+         * "plain" -> "123"
+         *
+         * @param key key name used as base
+         * @param mapValue map of tags that can contain sub-maps as values
+         */
+        private void writeFlatMap(String key, Map<String, Object> mapValue) {
+            for (Map.Entry<String, Object> entry : mapValue.entrySet()) {
+                String newKey = key + '.' + entry.getKey();
+                Object newValue = entry.getValue();
+                if (newValue instanceof Map) {
+                    writeFlatMap(newKey, (Map) newValue);
+                } else {
+                    writeDictionaryEncoded(writable, newKey);
+                    writeDictionaryEncoded(writable, newValue);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV1.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV1.java
index bf80e29637b..54616679b86 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV1.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV1.java
@@ -42,740 +42,737 @@
 /** Efficient Trace Payload Protocol V1. */
 @SuppressWarnings("SameParameterValue")
 public final class TraceMapperV1 implements TraceMapper {
-  private static final Logger log = LoggerFactory.getLogger(TraceMapperV1.class);
-
-  // Attribute value types (from V1 spec)
-  static final int VALUE_TYPE_STRING = 1;
-  static final int VALUE_TYPE_BOOLEAN = 2;
-  static final int VALUE_TYPE_FLOAT = 3;
-  static final int VALUE_TYPE_INT = 4;
-  static final int VALUE_TYPE_BYTES = 5;
-  static final int VALUE_TYPE_ARRAY = 6;
-
-  // Span kind OTEL values
-  static final int SPAN_KIND_UNSPECIFIED = 0;
-  static final int SPAN_KIND_INTERNAL = 1;
-  static final int SPAN_KIND_SERVER = 2;
-  static final int SPAN_KIND_CLIENT = 3;
-  static final int SPAN_KIND_PRODUCER = 4;
-  static final int SPAN_KIND_CONSUMER = 5;
-
-  // Decision maker tag key
-  private static final String KEY_DECISION_MAKER = "_dd.p.dm";
-  private static final String HTTP_STATUS = "http.status_code";
-
-  private final int bufferSize;
-  private final StringTable stringTable;
-  private final SpanMetadata spanMetadata;
-  private final GrowableBuffer metaStructBuffer;
-  private final MsgPackWriter metaStructWriter;
-  private final ByteBuffer header;
-
-  public TraceMapperV1(int bufferSize) {
-    this.bufferSize = bufferSize;
-    this.stringTable = new StringTable();
-    this.spanMetadata = new SpanMetadata();
-    this.metaStructBuffer = new GrowableBuffer(1 << 10);
-    this.metaStructWriter = new MsgPackWriter(Codec.INSTANCE, metaStructBuffer);
-    this.header = buildHeader();
-  }
-
-  public TraceMapperV1() {
-    this(5 << 20);
-  }
-
-  @Override
-  public void map(List<? extends CoreSpan<?>> trace, Writable writable) {
-    if (trace.isEmpty()) {
-      // Do nothing if no spans in the trace
-      return;
-    }
-
-    CoreSpan<?> firstSpan = trace.get(0);
-    firstSpan.processTagsAndBaggageWithStructuredLinks(spanMetadata, true);
-    Metadata firstSpanMeta = spanMetadata.metadata;
-
-    // encoded fields: 1..7, but skipping #5, as not required by tracers and set by the agent.
-    writable.startMap(6);
-
-    // priority = 1, the sampling priority of the trace, int32
-    encodeInt(writable, 1, firstSpanMeta.samplingPriority());
-    // origin = 2, the optional string origin ("lambda", "rum", etc.) of the trace chunk
-    encodeString(writable, 2, firstSpan.getOrigin());
-    // attributes = 3, a collection of key to value pairs common in all `spans`
-    encodeAttributes(writable, 3, buildChunkAttributes(trace));
-    // spans = 4, a list of spans in this chunk
-    encodeSpans(writable, 4, trace);
-    // traceID = 6, the ID of the trace to which all spans in this chunk belong
-    encodeTraceId(writable, 6, firstSpan.getTraceId());
-    // samplingMechanism = 7, uint32
-    encodeInt(writable, 7, parseSamplingMechanism(firstSpanMeta.getBaggage()));
-  }
-
-  private Map<String, Object> buildChunkAttributes(List<? extends CoreSpan<?>> trace) {
-    CoreSpan<?> localRoot = trace.get(0).getLocalRootSpan();
-    CharSequence service = localRoot == null ? null : localRoot.getServiceName();
-    if (service == null) {
-      return emptyMap();
-    }
-    return singletonMap("service", service);
-  }
-
-  private void encodeSpans(Writable writable, int fieldId, List<? extends CoreSpan<?>> spans) {
-    int spansCount = spans.size();
-
-    writable.writeInt(fieldId);
-    writable.startArray(spansCount);
-
-    // spanMetadata will already have data from first span.
-    Metadata meta = spanMetadata.metadata;
-    for (int i = 0; i < spans.size(); i++) {
-      CoreSpan<?> span = spans.get(i);
-      if (meta == null) {
-        span.processTagsAndBaggageWithStructuredLinks(spanMetadata, i == 0);
-        meta = spanMetadata.metadata;
-      }
-      TagMap tags = meta.getTags();
-      Map<String, Object> metaStruct = span.getMetaStruct();
-
-      // Span has 16 fields
-      writable.startMap(16);
-
-      // service = 1, the string name of the service that this span is associated with
-      encodeString(writable, 1, span.getServiceName());
-      // name = 2, the string operation name of this span
-      encodeString(writable, 2, span.getOperationName());
-      // resource = 3, the string resource name of this span,
-      // sometimes called endpoint for web spans
-      encodeString(writable, 3, span.getResourceName());
-      // spanID = 4, the ID of this span
-      encodeLongUnsigned(writable, 4, span.getSpanId());
-      // parentID = 5, the ID of this span's parent, or zero if there is no parent
-      encodeLongUnsigned(writable, 5, span.getParentId());
-      // start = 6, the number of nanoseconds from the Unix epoch to the start of this span
-      encodeLong(writable, 6, span.getStartTime());
-      // duration = 7, the time length of this span in nanoseconds
-      encodeLong(writable, 7, PendingTrace.getDurationNano(span));
-      // error = 8, if there is an error associated with this span
-      encodeBoolean(writable, 8, span.getError() != 0);
-      // attributes = 9, a collection of string key to value pairs on the span
-      encodeSpanAttributes(writable, 9, meta, metaStruct);
-      // type = 10, the string type of the service with which this span is associated
-      // (example values: web, db, lambda)
-      encodeString(writable, 10, span.getType());
-      // links = 11, a collection of links to other spans
-      encodeSpanLinks(writable, 11, meta.getSpanLinks());
-      // events = 12, a collection of events that occurred during this span
-      encodeSpanEvents(writable, 12, tags.getObject(DDTags.SPAN_EVENTS));
-      // env = 13, the optional string environment of this span
-      encodeString(writable, 13, tags.getString(Tags.ENV));
-      // version = 14, the optional string version of this span
-      encodeString(writable, 14, tags.getString(Tags.VERSION));
-      // component = 15, the string component name of this span
-      encodeString(writable, 15, tags.getString(Tags.COMPONENT));
-      // kind = 16, the SpanKind of this span as defined in the OTEL Specification, uint32
-      encodeInt(writable, 16, getSpanKindValue(tags.getString(Tags.SPAN_KIND)));
-
-      meta = null; // Proceed to next span metadata.
-    }
-  }
-
-  private void encodeSpanLinks(
-      Writable writable, int fieldId, List<? extends AgentSpanLink> links) {
-    writable.writeInt(fieldId);
-    if (links == null || links.isEmpty()) {
-      writable.startArray(0);
-      return;
-    }
-
-    writable.startArray(links.size());
-    for (AgentSpanLink link : links) {
-      writable.startMap(5);
-      // 1: the ID of the trace that this link targets
-      encodeTraceId(writable, 1, link.traceId());
-      // 2: the ID of the span that this link targets, fixed64
-      encodeLongUnsigned(writable, 2, link.spanId());
-      // 3: a collection of attribute string key to value pairs on the link, map<uint32, AnyValue>
-      encodeAttributes(writable, 3, link.attributes().asMap());
-      // 4: optional W3C trace state string
-      encodeString(writable, 4, link.traceState());
-      // 5: optional W3C trace flags (if set, the high bit, bit 31, must be set), uint32
-      encodeInt(writable, 5, link.traceFlags() & 0xFF);
-    }
-  }
-
-  private void encodeSpanEvents(Writable writable, int fieldId, Object eventsObject) {
-    writable.writeInt(fieldId);
-    List<?> events = parseSpanEvents(eventsObject);
-    if (events.isEmpty()) {
-      writable.startArray(0);
-      return;
-    }
-
-    int encodableCount = 0;
-    for (Object event : events) {
-      if (isEncodableSpanEvent(event)) {
-        encodableCount++;
-      }
-    }
-    writable.startArray(encodableCount);
-    for (Object event : events) {
-      if (!(event instanceof Map)) {
-        continue;
-      }
-      Map<?, ?> eventMap = (Map<?, ?>) event;
-      Long timeUnixNano = asLong(eventMap.get("time_unix_nano"));
-      Object nameObject = eventMap.get("name");
-      if (timeUnixNano == null || nameObject == null) {
-        continue;
-      }
-
-      Map<?, ?> attributes =
-          eventMap.get("attributes") instanceof Map ? (Map<?, ?>) eventMap.get("attributes") : null;
-
-      writable.startMap(3);
-      encodeLong(writable, 1, timeUnixNano);
-      encodeString(writable, 2, String.valueOf(nameObject));
-      encodeEventAttributes(writable, 3, attributes);
-    }
-  }
-
-  private List<?> parseSpanEvents(Object eventsObject) {
-    if (eventsObject instanceof List) {
-      return (List<?>) eventsObject;
-    }
-    if (eventsObject instanceof CharSequence) {
-      try (JsonReader reader = new JsonReader(eventsObject.toString())) {
-        Object events = reader.nextValue();
-        if (events instanceof List) {
-          return (List<?>) events;
-        }
-      } catch (IOException e) {
-        log.debug("Failed to parse span events from JSON", e);
-      }
-    }
-    return emptyList();
-  }
-
-  private boolean isEncodableSpanEvent(Object event) {
-    if (!(event instanceof Map)) {
-      return false;
-    }
-    Map<?, ?> eventMap = (Map<?, ?>) event;
-    return eventMap.get("name") != null && asLong(eventMap.get("time_unix_nano")) != null;
-  }
-
-  private void encodeEventAttributes(Writable writable, int fieldId, Map<?, ?> attrs) {
-    writable.writeInt(fieldId);
-    if (attrs == null || attrs.isEmpty()) {
-      writable.startArray(0);
-      return;
-    }
-
-    int attributeCount = 0;
-    for (Map.Entry<?, ?> entry : attrs.entrySet()) {
-      if (isEncodableEventAttribute(entry.getValue())) {
-        attributeCount++;
-      }
-    }
-    writable.startArray(attributeCount * 3);
-
-    for (Map.Entry<?, ?> entry : attrs.entrySet()) {
-      Object value = entry.getValue();
-      if (!isEncodableEventAttribute(value)) {
-        continue;
-      }
-      writeStreamingString(writable, String.valueOf(entry.getKey()));
-      writeEventAttributeValue(writable, value);
-    }
-  }
-
-  private boolean isEncodableEventAttribute(Object value) {
-    return value instanceof CharSequence
-        || value instanceof Boolean
-        || value instanceof Number
-        || value instanceof List;
-  }
-
-  private void writeEventAttributeValue(Writable writable, Object value) {
-    if (value instanceof Boolean) {
-      writable.writeInt(VALUE_TYPE_BOOLEAN);
-      writable.writeBoolean((Boolean) value);
-      return;
-    }
-    if (value instanceof Number) {
-      writeEventNumberValue(writable, (Number) value);
-      return;
-    }
-    if (value instanceof List) {
-      List<?> values = (List<?>) value;
-      int itemCount = 0;
-      for (Object item : values) {
-        if (isEncodableEventArrayItem(item)) {
-          itemCount++;
-        }
-      }
-      writable.writeInt(VALUE_TYPE_ARRAY);
-      writable.startArray(itemCount * 2);
-      for (Object item : values) {
-        if (!isEncodableEventArrayItem(item)) {
-          continue;
-        }
-        writeEventArrayItemValue(writable, item);
-      }
-      return;
-    }
-    writable.writeInt(VALUE_TYPE_STRING);
-    writeStreamingString(writable, String.valueOf(value));
-  }
-
-  private boolean isEncodableEventArrayItem(Object item) {
-    return item instanceof CharSequence || item instanceof Boolean || item instanceof Number;
-  }
-
-  private void writeEventArrayItemValue(Writable writable, Object item) {
-    if (item instanceof Boolean) {
-      writable.writeInt(VALUE_TYPE_BOOLEAN);
-      writable.writeBoolean((Boolean) item);
-      return;
-    }
-    if (item instanceof Number) {
-      writeEventNumberValue(writable, (Number) item);
-      return;
-    }
-    writable.writeInt(VALUE_TYPE_STRING);
-    writeStreamingString(writable, String.valueOf(item));
-  }
-
-  private void writeEventNumberValue(Writable writable, Number number) {
-    if (isIntegralNumber(number)) {
-      writable.writeInt(VALUE_TYPE_INT);
-      writable.writeLong(number.longValue());
-      return;
-    }
-    writable.writeInt(VALUE_TYPE_FLOAT);
-    writable.writeDouble(number.doubleValue());
-  }
-
-  private boolean isIntegralNumber(Number number) {
-    return !(number instanceof Float || number instanceof Double);
-  }
-
-  private Long asLong(Object value) {
-    if (value instanceof Number) {
-      return ((Number) value).longValue();
-    }
-    if (value instanceof CharSequence) {
-      try {
-        return Long.parseLong(value.toString());
-      } catch (NumberFormatException ignored) {
-        return null;
-      }
-    }
-    return null;
-  }
-
-  private void encodeSpanAttributes(
-      Writable writable, int fieldId, Metadata meta, Map<String, Object> metaStruct) {
-    TagMap tags = meta.getTags();
-    Map<String, String> baggage = meta.getBaggage();
-    // Kept as a String: writeAttribute below logs a debug line for any non-String value.
-    String httpStatusCode =
-        meta.getHttpStatusCode() == UNSET_STATUS ? null : meta.getHttpStatusCodeString().toString();
-    boolean writeHttpStatus = httpStatusCode != null && tags.getString(HTTP_STATUS) == null;
-    boolean writeTopLevel = meta.topLevel();
-    int tagCount = 0;
-    for (TagMap.EntryReader entry : tags) {
-      if (!DDTags.SPAN_EVENTS.equals(entry.tag())) {
-        tagCount += getFlatAttributeCount(entry);
-      }
-    }
-
-    writable.writeInt(fieldId);
-    writable.startArray(
-        (tagCount
-                + baggage.size()
-                + metaStruct.size()
-                + 2
-                + (writeHttpStatus ? 1 : 0)
-                + (writeTopLevel ? 1 : 0))
-            * 3);
-
-    writeAttribute(writable, DDTags.THREAD_ID, meta.getThreadId());
-    writeAttribute(writable, DDTags.THREAD_NAME, meta.getThreadName());
-
-    for (Map.Entry<String, String> entry : baggage.entrySet()) {
-      writeAttribute(writable, entry.getKey(), entry.getValue());
-    }
-
-    for (TagMap.EntryReader entry : tags) {
-      if (DDTags.SPAN_EVENTS.equals(entry.tag())) {
-        continue;
-      }
-      writeFlattenedTagAttribute(writable, entry);
-    }
-    if (writeHttpStatus) {
-      writeAttribute(writable, HTTP_STATUS, httpStatusCode);
-    }
-    if (writeTopLevel) {
-      writeAttribute(writable, InstrumentationTags.DD_TOP_LEVEL.toString(), 1);
-    }
-    for (Map.Entry<String, Object> metaStructField : metaStruct.entrySet()) {
-      writeStreamingString(writable, metaStructField.getKey());
-      writable.writeInt(VALUE_TYPE_BYTES);
-      writable.writeBinary(serializeMetaStructValue(metaStructField.getValue()));
-    }
-  }
-
-  private int getFlatAttributeCount(TagMap.EntryReader entry) {
-    return entry.isObject() ? getFlatAttributeCount(entry.objectValue()) : 1;
-  }
-
-  private int getFlatAttributeCount(Object value) {
-    if (!(value instanceof Map)) {
-      return 1;
-    }
-
-    int count = 0;
-    for (Object nestedValue : ((Map<?, ?>) value).values()) {
-      count += getFlatAttributeCount(nestedValue);
-    }
-    return count;
-  }
-
-  private void writeFlattenedTagAttribute(Writable writable, TagMap.EntryReader entry) {
-    switch (entry.type()) {
-      case TagMap.EntryReader.BOOLEAN:
-        writeStreamingString(writable, entry.tag());
-        writable.writeInt(VALUE_TYPE_BOOLEAN);
-        writable.writeBoolean(entry.booleanValue());
-        return;
-
-      case TagMap.EntryReader.INT:
-      case TagMap.EntryReader.LONG:
-      case TagMap.EntryReader.FLOAT:
-      case TagMap.EntryReader.DOUBLE:
-        writeStreamingString(writable, entry.tag());
-        writable.writeInt(VALUE_TYPE_FLOAT);
-        writable.writeDouble(entry.doubleValue());
-        return;
+    private static final Logger log = LoggerFactory.getLogger(TraceMapperV1.class);
+
+    // Attribute value types (from V1 spec)
+    static final int VALUE_TYPE_STRING = 1;
+    static final int VALUE_TYPE_BOOLEAN = 2;
+    static final int VALUE_TYPE_FLOAT = 3;
+    static final int VALUE_TYPE_INT = 4;
+    static final int VALUE_TYPE_BYTES = 5;
+    static final int VALUE_TYPE_ARRAY = 6;
+
+    // Span kind OTEL values
+    static final int SPAN_KIND_UNSPECIFIED = 0;
+    static final int SPAN_KIND_INTERNAL = 1;
+    static final int SPAN_KIND_SERVER = 2;
+    static final int SPAN_KIND_CLIENT = 3;
+    static final int SPAN_KIND_PRODUCER = 4;
+    static final int SPAN_KIND_CONSUMER = 5;
+
+    // Decision maker tag key
+    private static final String KEY_DECISION_MAKER = "_dd.p.dm";
+    private static final String HTTP_STATUS = "http.status_code";
+
+    private final int bufferSize;
+    private final StringTable stringTable;
+    private final SpanMetadata spanMetadata;
+    private final GrowableBuffer metaStructBuffer;
+    private final MsgPackWriter metaStructWriter;
+    private final ByteBuffer header;
 
-      default:
-        writeFlattenedTagAttribute(writable, entry.tag(), entry.objectValue());
+    public TraceMapperV1(int bufferSize) {
+        this.bufferSize = bufferSize;
+        this.stringTable = new StringTable();
+        this.spanMetadata = new SpanMetadata();
+        this.metaStructBuffer = new GrowableBuffer(1 << 10);
+        this.metaStructWriter = new MsgPackWriter(Codec.INSTANCE, metaStructBuffer);
+        this.header = buildHeader();
     }
-  }
 
-  private void writeFlattenedTagAttribute(Writable writable, String key, Object value) {
-    if (!(value instanceof Map)) {
-      writeAttribute(writable, key, value);
-      return;
+    public TraceMapperV1() {
+        this(5 << 20);
     }
-    writeFlatMapAttributes(writable, key, (Map<?, ?>) value);
-  }
 
-  private void writeFlatMapAttributes(Writable writable, String keyPrefix, Map<?, ?> mapValue) {
-    for (Map.Entry<?, ?> entry : mapValue.entrySet()) {
-      String key = keyPrefix + "." + entry.getKey();
-      Object value = entry.getValue();
-      if (value instanceof Map) {
-        writeFlatMapAttributes(writable, key, (Map<?, ?>) value);
-      } else {
-        writeAttribute(writable, key, value);
-      }
-    }
-  }
-
-  private void encodeAttributes(Writable writable, int fieldId, Map<String, ?> attrs) {
-    writable.writeInt(fieldId);
-    writable.startArray(attrs.size() * 3); // Triplets: (key, type, value).
-
-    for (Map.Entry<String, ?> attr : attrs.entrySet()) {
-      writeAttribute(writable, attr.getKey(), attr.getValue());
-    }
-  }
-
-  private void writeAttribute(Writable writable, String key, Object value) {
-    writeStreamingString(writable, key);
-
-    if (value instanceof Number) {
-      writable.writeInt(VALUE_TYPE_FLOAT);
-      writable.writeDouble(((Number) value).doubleValue());
-      return;
-    }
-
-    if (value instanceof Boolean) {
-      writable.writeInt(VALUE_TYPE_BOOLEAN);
-      writable.writeBoolean((Boolean) value);
-      return;
-    }
-
-    if (!(value instanceof String) && value != null) {
-      log.debug("Not a string value for key: {}, value: {}", key, value);
-    }
-    writable.writeInt(VALUE_TYPE_STRING);
-    writeStreamingString(writable, value == null ? "" : value.toString());
-  }
-
-  private byte[] serializeMetaStructValue(Object value) {
-    metaStructBuffer.mark();
-    try {
-      metaStructWriter.writeObject(value, null);
-      metaStructWriter.flush();
-      ByteBuffer encoded = metaStructBuffer.slice();
-      byte[] bytes = new byte[encoded.remaining()];
-      encoded.get(bytes);
-      return bytes;
-    } finally {
-      metaStructBuffer.reset();
-    }
-  }
-
-  private void encodeBoolean(Writable writable, int fieldId, boolean value) {
-    writable.writeInt(fieldId);
-    writable.writeBoolean(value);
-  }
-
-  private void encodeInt(Writable writable, int fieldId, int value) {
-    writable.writeInt(fieldId);
-    writable.writeInt(value);
-  }
-
-  private void encodeLong(Writable writable, int fieldId, long value) {
-    writable.writeInt(fieldId);
-    writable.writeLong(value);
-  }
-
-  private void encodeLongUnsigned(Writable writable, int fieldId, long value) {
-    writable.writeInt(fieldId);
-    writable.writeUnsignedLong(value);
-  }
-
-  private void encodeString(Writable writable, int fieldId, CharSequence value) {
-    writable.writeInt(fieldId);
-    writeStreamingString(writable, value);
-  }
-
-  private void encodeTraceId(Writable writable, int fieldId, DDTraceId traceId) {
-    writable.writeInt(fieldId);
-    writable.writeBinary(traceId.toHighOrderLong(), traceId.toLong());
-  }
-
-  /** Writes a string using the streaming string table encoding. */
-  private void writeStreamingString(Writable writable, CharSequence value) {
-    String str = value == null ? "" : value.toString();
-    Integer index = stringTable.get(str);
-    if (index != null) {
-      // String already in table, write index
-      writable.writeInt(index);
-    } else {
-      // New string, write it directly and add to table
-      writable.writeString(str, null);
-      stringTable.add(str);
-    }
-  }
-
-  /** Converts a span kind string to its OTEL uint32 value. */
-  static int getSpanKindValue(CharSequence spanKind) {
-    if (spanKind == null) {
-      return SPAN_KIND_UNSPECIFIED;
-    }
-
-    switch (spanKind.toString()) {
-      case Tags.SPAN_KIND_SERVER:
-        return SPAN_KIND_SERVER;
-      case Tags.SPAN_KIND_CLIENT:
-        return SPAN_KIND_CLIENT;
-      case Tags.SPAN_KIND_PRODUCER:
-        return SPAN_KIND_PRODUCER;
-      case Tags.SPAN_KIND_CONSUMER:
-        return SPAN_KIND_CONSUMER;
-      default:
-        return SPAN_KIND_INTERNAL;
-    }
-  }
-
-  /**
-   * Extracts the numeric sampling mechanism used by the V1 payload field {@code samplingMechanism}
-   * from propagation tag {@code _dd.p.dm}.
-   *
-   * <p>The decision-maker propagation format can be:
-   *
-   * <ul>
-   *   <li>{@code -<mechanism>} (most common, for example {@code -3})
-   *   <li>{@code <service-hash>-<mechanism>} (for example {@code 934086a686-3})
-   * </ul>
-   *
-   * <p>V1 payload expects only the numeric mechanism, so we normalize both forms to a positive
-   * integer and fall back to {@link SamplingMechanism#DEFAULT} when absent or malformed.
-   */
-  private int parseSamplingMechanism(Map<String, String> propagationMetadata) {
-    String decisionMaker = propagationMetadata.get(KEY_DECISION_MAKER);
-    if (decisionMaker == null || decisionMaker.isEmpty()) {
-      return SamplingMechanism.DEFAULT;
-    }
-
-    // Common format is negative integer ("-3"), but be defensive for "<hash>-3" too.
-    try {
-      int value = Integer.parseInt(decisionMaker);
-      return value < 0 ? -value : value;
-    } catch (NumberFormatException ignored) {
-      int separator = decisionMaker.lastIndexOf('-');
-      if (separator >= 0) {
-        try {
-          int value = Integer.parseInt(decisionMaker.substring(separator + 1));
-          return value < 0 ? -value : value;
-        } catch (NumberFormatException ignoredAgain) {
-          // Fallback to default.
+    @Override
+    public void map(List<? extends CoreSpan<?>> trace, Writable writable) {
+        if (trace.isEmpty()) {
+            // Do nothing if no spans in the trace
+            return;
+        }
+
+        CoreSpan<?> firstSpan = trace.get(0);
+        firstSpan.processTagsAndBaggageWithStructuredLinks(spanMetadata, true);
+        Metadata firstSpanMeta = spanMetadata.metadata;
+
+        // encoded fields: 1..7, but skipping #5, as not required by tracers and set by the agent.
+        writable.startMap(6);
+
+        // priority = 1, the sampling priority of the trace, int32
+        encodeInt(writable, 1, firstSpanMeta.samplingPriority());
+        // origin = 2, the optional string origin ("lambda", "rum", etc.) of the trace chunk
+        encodeString(writable, 2, firstSpan.getOrigin());
+        // attributes = 3, a collection of key to value pairs common in all `spans`
+        encodeAttributes(writable, 3, buildChunkAttributes(trace));
+        // spans = 4, a list of spans in this chunk
+        encodeSpans(writable, 4, trace);
+        // traceID = 6, the ID of the trace to which all spans in this chunk belong
+        encodeTraceId(writable, 6, firstSpan.getTraceId());
+        // samplingMechanism = 7, uint32
+        encodeInt(writable, 7, parseSamplingMechanism(firstSpanMeta.getBaggage()));
+    }
+
+    private Map<String, Object> buildChunkAttributes(List<? extends CoreSpan<?>> trace) {
+        CoreSpan<?> localRoot = trace.get(0).getLocalRootSpan();
+        CharSequence service = localRoot == null ? null : localRoot.getServiceName();
+        if (service == null) {
+            return emptyMap();
+        }
+        return singletonMap("service", service);
+    }
+
+    private void encodeSpans(Writable writable, int fieldId, List<? extends CoreSpan<?>> spans) {
+        int spansCount = spans.size();
+
+        writable.writeInt(fieldId);
+        writable.startArray(spansCount);
+
+        // spanMetadata will already have data from first span.
+        Metadata meta = spanMetadata.metadata;
+        for (int i = 0; i < spans.size(); i++) {
+            CoreSpan<?> span = spans.get(i);
+            if (meta == null) {
+                span.processTagsAndBaggageWithStructuredLinks(spanMetadata, i == 0);
+                meta = spanMetadata.metadata;
+            }
+            TagMap tags = meta.getTags();
+            Map<String, Object> metaStruct = span.getMetaStruct();
+
+            // Span has 16 fields
+            writable.startMap(16);
+
+            // service = 1, the string name of the service that this span is associated with
+            encodeString(writable, 1, span.getServiceName());
+            // name = 2, the string operation name of this span
+            encodeString(writable, 2, span.getOperationName());
+            // resource = 3, the string resource name of this span,
+            // sometimes called endpoint for web spans
+            encodeString(writable, 3, span.getResourceName());
+            // spanID = 4, the ID of this span
+            encodeLongUnsigned(writable, 4, span.getSpanId());
+            // parentID = 5, the ID of this span's parent, or zero if there is no parent
+            encodeLongUnsigned(writable, 5, span.getParentId());
+            // start = 6, the number of nanoseconds from the Unix epoch to the start of this span
+            encodeLong(writable, 6, span.getStartTime());
+            // duration = 7, the time length of this span in nanoseconds
+            encodeLong(writable, 7, PendingTrace.getDurationNano(span));
+            // error = 8, if there is an error associated with this span
+            encodeBoolean(writable, 8, span.getError() != 0);
+            // attributes = 9, a collection of string key to value pairs on the span
+            encodeSpanAttributes(writable, 9, meta, metaStruct);
+            // type = 10, the string type of the service with which this span is associated
+            // (example values: web, db, lambda)
+            encodeString(writable, 10, span.getType());
+            // links = 11, a collection of links to other spans
+            encodeSpanLinks(writable, 11, meta.getSpanLinks());
+            // events = 12, a collection of events that occurred during this span
+            encodeSpanEvents(writable, 12, tags.getObject(DDTags.SPAN_EVENTS));
+            // env = 13, the optional string environment of this span
+            encodeString(writable, 13, tags.getString(Tags.ENV));
+            // version = 14, the optional string version of this span
+            encodeString(writable, 14, tags.getString(Tags.VERSION));
+            // component = 15, the string component name of this span
+            encodeString(writable, 15, tags.getString(Tags.COMPONENT));
+            // kind = 16, the SpanKind of this span as defined in the OTEL Specification, uint32
+            encodeInt(writable, 16, getSpanKindValue(tags.getString(Tags.SPAN_KIND)));
+
+            meta = null; // Proceed to next span metadata.
         }
-      }
-      return SamplingMechanism.DEFAULT;
     }
-  }
 
-  private ByteBuffer buildHeader() {
-    GrowableBuffer headerBuffer = new GrowableBuffer(1024);
-    Writable headerWriter = new MsgPackWriter(headerBuffer);
-    headerWriter.startMap(10);
+    private void encodeSpanLinks(Writable writable, int fieldId, List<? extends AgentSpanLink> links) {
+        writable.writeInt(fieldId);
+        if (links == null || links.isEmpty()) {
+            writable.startArray(0);
+            return;
+        }
 
-    Config cfg = Config.get();
+        writable.startArray(links.size());
+        for (AgentSpanLink link : links) {
+            writable.startMap(5);
+            // 1: the ID of the trace that this link targets
+            encodeTraceId(writable, 1, link.traceId());
+            // 2: the ID of the span that this link targets, fixed64
+            encodeLongUnsigned(writable, 2, link.spanId());
+            // 3: a collection of attribute string key to value pairs on the link, map<uint32, AnyValue>
+            encodeAttributes(writable, 3, link.attributes().asMap());
+            // 4: optional W3C trace state string
+            encodeString(writable, 4, link.traceState());
+            // 5: optional W3C trace flags (if set, the high bit, bit 31, must be set), uint32
+            encodeInt(writable, 5, link.traceFlags() & 0xFF);
+        }
+    }
 
-    // containerID = 2, the string ID of the container where the tracer is running
-    encodeString(headerWriter, 2, ContainerInfo.get().getContainerId());
+    private void encodeSpanEvents(Writable writable, int fieldId, Object eventsObject) {
+        writable.writeInt(fieldId);
+        List<?> events = parseSpanEvents(eventsObject);
+        if (events.isEmpty()) {
+            writable.startArray(0);
+            return;
+        }
 
-    // languageName = 3, the string language name of the tracer
-    encodeString(headerWriter, 3, "java");
+        int encodableCount = 0;
+        for (Object event : events) {
+            if (isEncodableSpanEvent(event)) {
+                encodableCount++;
+            }
+        }
+        writable.startArray(encodableCount);
+        for (Object event : events) {
+            if (!(event instanceof Map)) {
+                continue;
+            }
+            Map<?, ?> eventMap = (Map<?, ?>) event;
+            Long timeUnixNano = asLong(eventMap.get("time_unix_nano"));
+            Object nameObject = eventMap.get("name");
+            if (timeUnixNano == null || nameObject == null) {
+                continue;
+            }
+
+            Map<?, ?> attributes =
+                    eventMap.get("attributes") instanceof Map ? (Map<?, ?>) eventMap.get("attributes") : null;
+
+            writable.startMap(3);
+            encodeLong(writable, 1, timeUnixNano);
+            encodeString(writable, 2, String.valueOf(nameObject));
+            encodeEventAttributes(writable, 3, attributes);
+        }
+    }
 
-    // languageVersion = 4, the string language version of the tracer
-    encodeString(headerWriter, 4, JavaVirtualMachine.getLangVersion());
+    private List<?> parseSpanEvents(Object eventsObject) {
+        if (eventsObject instanceof List) {
+            return (List<?>) eventsObject;
+        }
+        if (eventsObject instanceof CharSequence) {
+            try (JsonReader reader = new JsonReader(eventsObject.toString())) {
+                Object events = reader.nextValue();
+                if (events instanceof List) {
+                    return (List<?>) events;
+                }
+            } catch (IOException e) {
+                log.debug("Failed to parse span events from JSON", e);
+            }
+        }
+        return emptyList();
+    }
 
-    // tracerVersion = 5, the string version of the tracer
-    encodeString(headerWriter, 5, TracerVersion.TRACER_VERSION);
+    private boolean isEncodableSpanEvent(Object event) {
+        if (!(event instanceof Map)) {
+            return false;
+        }
+        Map<?, ?> eventMap = (Map<?, ?>) event;
+        return eventMap.get("name") != null && asLong(eventMap.get("time_unix_nano")) != null;
+    }
 
-    // runtimeID = 6, the V4 string UUID representation of a tracer session
-    encodeString(headerWriter, 6, cfg.getRuntimeId());
+    private void encodeEventAttributes(Writable writable, int fieldId, Map<?, ?> attrs) {
+        writable.writeInt(fieldId);
+        if (attrs == null || attrs.isEmpty()) {
+            writable.startArray(0);
+            return;
+        }
 
-    // env=7, the optional `env` string tag that set with the tracer
-    encodeString(headerWriter, 7, cfg.getEnv());
+        int attributeCount = 0;
+        for (Map.Entry<?, ?> entry : attrs.entrySet()) {
+            if (isEncodableEventAttribute(entry.getValue())) {
+                attributeCount++;
+            }
+        }
+        writable.startArray(attributeCount * 3);
+
+        for (Map.Entry<?, ?> entry : attrs.entrySet()) {
+            Object value = entry.getValue();
+            if (!isEncodableEventAttribute(value)) {
+                continue;
+            }
+            writeStreamingString(writable, String.valueOf(entry.getKey()));
+            writeEventAttributeValue(writable, value);
+        }
+    }
 
-    // hostname = 8, the optional string hostname of where the tracer is running
-    encodeString(headerWriter, 8, cfg.getHostName());
+    private boolean isEncodableEventAttribute(Object value) {
+        return value instanceof CharSequence
+                || value instanceof Boolean
+                || value instanceof Number
+                || value instanceof List;
+    }
 
-    // appVersion = 9, the optional string `version` tag for the application set in the tracer
-    encodeString(headerWriter, 9, cfg.getVersion());
+    private void writeEventAttributeValue(Writable writable, Object value) {
+        if (value instanceof Boolean) {
+            writable.writeInt(VALUE_TYPE_BOOLEAN);
+            writable.writeBoolean((Boolean) value);
+            return;
+        }
+        if (value instanceof Number) {
+            writeEventNumberValue(writable, (Number) value);
+            return;
+        }
+        if (value instanceof List) {
+            List<?> values = (List<?>) value;
+            int itemCount = 0;
+            for (Object item : values) {
+                if (isEncodableEventArrayItem(item)) {
+                    itemCount++;
+                }
+            }
+            writable.writeInt(VALUE_TYPE_ARRAY);
+            writable.startArray(itemCount * 2);
+            for (Object item : values) {
+                if (!isEncodableEventArrayItem(item)) {
+                    continue;
+                }
+                writeEventArrayItemValue(writable, item);
+            }
+            return;
+        }
+        writable.writeInt(VALUE_TYPE_STRING);
+        writeStreamingString(writable, String.valueOf(value));
+    }
 
-    // attributes = 10, a collection of key to value pairs common in all `chunks`
-    CharSequence processTags = ProcessTags.getTagsForSerialization();
-    Map<String, Object> tags = new HashMap<>(4);
-    tags.put(DDTags.SDK_OTLP_EXPORT, String.valueOf(cfg.isOtlpTracesExportEnabled()));
-    if (processTags != null) {
-      tags.put(DDTags.PROCESS_TAGS, processTags);
+    private boolean isEncodableEventArrayItem(Object item) {
+        return item instanceof CharSequence || item instanceof Boolean || item instanceof Number;
     }
-    encodeAttributes(headerWriter, 10, tags);
 
-    // chunks = 11, a list of trace `chunks`, value is written by PayloadV1
-    headerWriter.writeInt(11);
+    private void writeEventArrayItemValue(Writable writable, Object item) {
+        if (item instanceof Boolean) {
+            writable.writeInt(VALUE_TYPE_BOOLEAN);
+            writable.writeBoolean((Boolean) item);
+            return;
+        }
+        if (item instanceof Number) {
+            writeEventNumberValue(writable, (Number) item);
+            return;
+        }
+        writable.writeInt(VALUE_TYPE_STRING);
+        writeStreamingString(writable, String.valueOf(item));
+    }
 
-    stringTable.seal();
+    private void writeEventNumberValue(Writable writable, Number number) {
+        if (isIntegralNumber(number)) {
+            writable.writeInt(VALUE_TYPE_INT);
+            writable.writeLong(number.longValue());
+            return;
+        }
+        writable.writeInt(VALUE_TYPE_FLOAT);
+        writable.writeDouble(number.doubleValue());
+    }
 
-    return headerBuffer.slice();
-  }
+    private boolean isIntegralNumber(Number number) {
+        return !(number instanceof Float || number instanceof Double);
+    }
 
-  @Override
-  public Payload newPayload() {
-    return new PayloadV1(header);
-  }
+    private Long asLong(Object value) {
+        if (value instanceof Number) {
+            return ((Number) value).longValue();
+        }
+        if (value instanceof CharSequence) {
+            try {
+                return Long.parseLong(value.toString());
+            } catch (NumberFormatException ignored) {
+                return null;
+            }
+        }
+        return null;
+    }
 
-  @Override
-  public int messageBufferSize() {
-    return bufferSize;
-  }
+    private void encodeSpanAttributes(Writable writable, int fieldId, Metadata meta, Map<String, Object> metaStruct) {
+        TagMap tags = meta.getTags();
+        Map<String, String> baggage = meta.getBaggage();
+        // Kept as a String: writeAttribute below logs a debug line for any non-String value.
+        String httpStatusCode = meta.getHttpStatusCode() == UNSET_STATUS
+                ? null
+                : meta.getHttpStatusCodeString().toString();
+        boolean writeHttpStatus = httpStatusCode != null && tags.getString(HTTP_STATUS) == null;
+        boolean writeTopLevel = meta.topLevel();
+        int tagCount = 0;
+        for (TagMap.EntryReader entry : tags) {
+            if (!DDTags.SPAN_EVENTS.equals(entry.tag())) {
+                tagCount += getFlatAttributeCount(entry);
+            }
+        }
 
-  @Override
-  public void reset() {
-    stringTable.clear();
-  }
+        writable.writeInt(fieldId);
+        writable.startArray((tagCount
+                        + baggage.size()
+                        + metaStruct.size()
+                        + 2
+                        + (writeHttpStatus ? 1 : 0)
+                        + (writeTopLevel ? 1 : 0))
+                * 3);
 
-  @Override
-  public String endpoint() {
-    return "v1.0";
-  }
+        writeAttribute(writable, DDTags.THREAD_ID, meta.getThreadId());
+        writeAttribute(writable, DDTags.THREAD_NAME, meta.getThreadName());
 
-  /** String table for streaming string encoding. Index `0` is reserved for empty string. */
-  static class StringTable {
-    private final Map<String, Integer> header = new HashMap<>();
-    private final Map<String, Integer> traces = new HashMap<>();
+        for (Map.Entry<String, String> entry : baggage.entrySet()) {
+            writeAttribute(writable, entry.getKey(), entry.getValue());
+        }
 
-    private boolean sealed;
-    private int nextIndex = 1;
+        for (TagMap.EntryReader entry : tags) {
+            if (DDTags.SPAN_EVENTS.equals(entry.tag())) {
+                continue;
+            }
+            writeFlattenedTagAttribute(writable, entry);
+        }
+        if (writeHttpStatus) {
+            writeAttribute(writable, HTTP_STATUS, httpStatusCode);
+        }
+        if (writeTopLevel) {
+            writeAttribute(writable, InstrumentationTags.DD_TOP_LEVEL.toString(), 1);
+        }
+        for (Map.Entry<String, Object> metaStructField : metaStruct.entrySet()) {
+            writeStreamingString(writable, metaStructField.getKey());
+            writable.writeInt(VALUE_TYPE_BYTES);
+            writable.writeBinary(serializeMetaStructValue(metaStructField.getValue()));
+        }
+    }
 
-    StringTable() {
-      header.put("", 0);
+    private int getFlatAttributeCount(TagMap.EntryReader entry) {
+        return entry.isObject() ? getFlatAttributeCount(entry.objectValue()) : 1;
     }
 
-    void seal() {
-      sealed = true;
+    private int getFlatAttributeCount(Object value) {
+        if (!(value instanceof Map)) {
+            return 1;
+        }
+
+        int count = 0;
+        for (Object nestedValue : ((Map<?, ?>) value).values()) {
+            count += getFlatAttributeCount(nestedValue);
+        }
+        return count;
+    }
+
+    private void writeFlattenedTagAttribute(Writable writable, TagMap.EntryReader entry) {
+        switch (entry.type()) {
+            case TagMap.EntryReader.BOOLEAN:
+                writeStreamingString(writable, entry.tag());
+                writable.writeInt(VALUE_TYPE_BOOLEAN);
+                writable.writeBoolean(entry.booleanValue());
+                return;
+
+            case TagMap.EntryReader.INT:
+            case TagMap.EntryReader.LONG:
+            case TagMap.EntryReader.FLOAT:
+            case TagMap.EntryReader.DOUBLE:
+                writeStreamingString(writable, entry.tag());
+                writable.writeInt(VALUE_TYPE_FLOAT);
+                writable.writeDouble(entry.doubleValue());
+                return;
+
+            default:
+                writeFlattenedTagAttribute(writable, entry.tag(), entry.objectValue());
+        }
     }
 
-    Integer get(String str) {
-      Integer dynamic = traces.get(str);
-      return dynamic != null ? dynamic : header.get(str);
+    private void writeFlattenedTagAttribute(Writable writable, String key, Object value) {
+        if (!(value instanceof Map)) {
+            writeAttribute(writable, key, value);
+            return;
+        }
+        writeFlatMapAttributes(writable, key, (Map<?, ?>) value);
     }
 
-    void add(String str) {
-      Map<String, Integer> map = sealed ? traces : header;
+    private void writeFlatMapAttributes(Writable writable, String keyPrefix, Map<?, ?> mapValue) {
+        for (Map.Entry<?, ?> entry : mapValue.entrySet()) {
+            String key = keyPrefix + "." + entry.getKey();
+            Object value = entry.getValue();
+            if (value instanceof Map) {
+                writeFlatMapAttributes(writable, key, (Map<?, ?>) value);
+            } else {
+                writeAttribute(writable, key, value);
+            }
+        }
+    }
 
-      Integer idx = map.get(str);
+    private void encodeAttributes(Writable writable, int fieldId, Map<String, ?> attrs) {
+        writable.writeInt(fieldId);
+        writable.startArray(attrs.size() * 3); // Triplets: (key, type, value).
 
-      if (idx == null) {
-        map.put(str, nextIndex++);
-      }
+        for (Map.Entry<String, ?> attr : attrs.entrySet()) {
+            writeAttribute(writable, attr.getKey(), attr.getValue());
+        }
     }
 
-    void clear() {
-      traces.clear();
-      nextIndex = header.size();
+    private void writeAttribute(Writable writable, String key, Object value) {
+        writeStreamingString(writable, key);
+
+        if (value instanceof Number) {
+            writable.writeInt(VALUE_TYPE_FLOAT);
+            writable.writeDouble(((Number) value).doubleValue());
+            return;
+        }
+
+        if (value instanceof Boolean) {
+            writable.writeInt(VALUE_TYPE_BOOLEAN);
+            writable.writeBoolean((Boolean) value);
+            return;
+        }
+
+        if (!(value instanceof String) && value != null) {
+            log.debug("Not a string value for key: {}, value: {}", key, value);
+        }
+        writable.writeInt(VALUE_TYPE_STRING);
+        writeStreamingString(writable, value == null ? "" : value.toString());
     }
-  }
 
-  private static class SpanMetadata implements MetadataConsumer {
-    private Metadata metadata;
+    private byte[] serializeMetaStructValue(Object value) {
+        metaStructBuffer.mark();
+        try {
+            metaStructWriter.writeObject(value, null);
+            metaStructWriter.flush();
+            ByteBuffer encoded = metaStructBuffer.slice();
+            byte[] bytes = new byte[encoded.remaining()];
+            encoded.get(bytes);
+            return bytes;
+        } finally {
+            metaStructBuffer.reset();
+        }
+    }
 
-    @Override
-    public void accept(Metadata metadata) {
-      this.metadata = metadata;
+    private void encodeBoolean(Writable writable, int fieldId, boolean value) {
+        writable.writeInt(fieldId);
+        writable.writeBoolean(value);
     }
-  }
 
-  /** Payload implementation for V1.0 format. */
-  private static class PayloadV1 extends Payload {
-    private final ByteBuffer header;
+    private void encodeInt(Writable writable, int fieldId, int value) {
+        writable.writeInt(fieldId);
+        writable.writeInt(value);
+    }
 
-    private PayloadV1(ByteBuffer header) {
-      this.header = header;
+    private void encodeLong(Writable writable, int fieldId, long value) {
+        writable.writeInt(fieldId);
+        writable.writeLong(value);
+    }
+
+    private void encodeLongUnsigned(Writable writable, int fieldId, long value) {
+        writable.writeInt(fieldId);
+        writable.writeUnsignedLong(value);
+    }
+
+    private void encodeString(Writable writable, int fieldId, CharSequence value) {
+        writable.writeInt(fieldId);
+        writeStreamingString(writable, value);
+    }
+
+    private void encodeTraceId(Writable writable, int fieldId, DDTraceId traceId) {
+        writable.writeInt(fieldId);
+        writable.writeBinary(traceId.toHighOrderLong(), traceId.toLong());
+    }
+
+    /** Writes a string using the streaming string table encoding. */
+    private void writeStreamingString(Writable writable, CharSequence value) {
+        String str = value == null ? "" : value.toString();
+        Integer index = stringTable.get(str);
+        if (index != null) {
+            // String already in table, write index
+            writable.writeInt(index);
+        } else {
+            // New string, write it directly and add to table
+            writable.writeString(str, null);
+            stringTable.add(str);
+        }
+    }
+
+    /** Converts a span kind string to its OTEL uint32 value. */
+    static int getSpanKindValue(CharSequence spanKind) {
+        if (spanKind == null) {
+            return SPAN_KIND_UNSPECIFIED;
+        }
+
+        switch (spanKind.toString()) {
+            case Tags.SPAN_KIND_SERVER:
+                return SPAN_KIND_SERVER;
+            case Tags.SPAN_KIND_CLIENT:
+                return SPAN_KIND_CLIENT;
+            case Tags.SPAN_KIND_PRODUCER:
+                return SPAN_KIND_PRODUCER;
+            case Tags.SPAN_KIND_CONSUMER:
+                return SPAN_KIND_CONSUMER;
+            default:
+                return SPAN_KIND_INTERNAL;
+        }
+    }
+
+    /**
+     * Extracts the numeric sampling mechanism used by the V1 payload field {@code samplingMechanism}
+     * from propagation tag {@code _dd.p.dm}.
+     *
+     * <p>The decision-maker propagation format can be:
+     *
+     * <ul>
+     *   <li>{@code -<mechanism>} (most common, for example {@code -3})
+     *   <li>{@code <service-hash>-<mechanism>} (for example {@code 934086a686-3})
+     * </ul>
+     *
+     * <p>V1 payload expects only the numeric mechanism, so we normalize both forms to a positive
+     * integer and fall back to {@link SamplingMechanism#DEFAULT} when absent or malformed.
+     */
+    private int parseSamplingMechanism(Map<String, String> propagationMetadata) {
+        String decisionMaker = propagationMetadata.get(KEY_DECISION_MAKER);
+        if (decisionMaker == null || decisionMaker.isEmpty()) {
+            return SamplingMechanism.DEFAULT;
+        }
+
+        // Common format is negative integer ("-3"), but be defensive for "<hash>-3" too.
+        try {
+            int value = Integer.parseInt(decisionMaker);
+            return value < 0 ? -value : value;
+        } catch (NumberFormatException ignored) {
+            int separator = decisionMaker.lastIndexOf('-');
+            if (separator >= 0) {
+                try {
+                    int value = Integer.parseInt(decisionMaker.substring(separator + 1));
+                    return value < 0 ? -value : value;
+                } catch (NumberFormatException ignoredAgain) {
+                    // Fallback to default.
+                }
+            }
+            return SamplingMechanism.DEFAULT;
+        }
+    }
+
+    private ByteBuffer buildHeader() {
+        GrowableBuffer headerBuffer = new GrowableBuffer(1024);
+        Writable headerWriter = new MsgPackWriter(headerBuffer);
+        headerWriter.startMap(10);
+
+        Config cfg = Config.get();
+
+        // containerID = 2, the string ID of the container where the tracer is running
+        encodeString(headerWriter, 2, ContainerInfo.get().getContainerId());
+
+        // languageName = 3, the string language name of the tracer
+        encodeString(headerWriter, 3, "java");
+
+        // languageVersion = 4, the string language version of the tracer
+        encodeString(headerWriter, 4, JavaVirtualMachine.getLangVersion());
+
+        // tracerVersion = 5, the string version of the tracer
+        encodeString(headerWriter, 5, TracerVersion.TRACER_VERSION);
+
+        // runtimeID = 6, the V4 string UUID representation of a tracer session
+        encodeString(headerWriter, 6, cfg.getRuntimeId());
+
+        // env=7, the optional `env` string tag that set with the tracer
+        encodeString(headerWriter, 7, cfg.getEnv());
+
+        // hostname = 8, the optional string hostname of where the tracer is running
+        encodeString(headerWriter, 8, cfg.getHostName());
+
+        // appVersion = 9, the optional string `version` tag for the application set in the tracer
+        encodeString(headerWriter, 9, cfg.getVersion());
+
+        // attributes = 10, a collection of key to value pairs common in all `chunks`
+        CharSequence processTags = ProcessTags.getTagsForSerialization();
+        Map<String, Object> tags = new HashMap<>(4);
+        tags.put(DDTags.SDK_OTLP_EXPORT, String.valueOf(cfg.isOtlpTracesExportEnabled()));
+        if (processTags != null) {
+            tags.put(DDTags.PROCESS_TAGS, processTags);
+        }
+        encodeAttributes(headerWriter, 10, tags);
+
+        // chunks = 11, a list of trace `chunks`, value is written by PayloadV1
+        headerWriter.writeInt(11);
+
+        stringTable.seal();
+
+        return headerBuffer.slice();
     }
 
     @Override
-    public int sizeInBytes() {
-      return header.remaining() + msgpackArrayHeaderSize(traceCount()) + body.remaining();
+    public Payload newPayload() {
+        return new PayloadV1(header);
     }
 
-    private void writeBuffer(ByteBuffer buffer, WritableByteChannel channel) throws IOException {
-      while (buffer.hasRemaining()) {
-        channel.write(buffer);
-      }
+    @Override
+    public int messageBufferSize() {
+        return bufferSize;
     }
 
     @Override
-    public void writeTo(WritableByteChannel channel) throws IOException {
-      writeBuffer(header.slice(), channel);
-      writeBuffer(msgpackArrayHeader(traceCount()), channel);
-      writeBuffer(body, channel);
+    public void reset() {
+        stringTable.clear();
     }
 
     @Override
-    public RequestBody toRequest() {
-      return msgpackRequestBodyOf(
-          Arrays.asList(header.slice(), msgpackArrayHeader(traceCount()), body));
+    public String endpoint() {
+        return "v1.0";
+    }
+
+    /** String table for streaming string encoding. Index `0` is reserved for empty string. */
+    static class StringTable {
+        private final Map<String, Integer> header = new HashMap<>();
+        private final Map<String, Integer> traces = new HashMap<>();
+
+        private boolean sealed;
+        private int nextIndex = 1;
+
+        StringTable() {
+            header.put("", 0);
+        }
+
+        void seal() {
+            sealed = true;
+        }
+
+        Integer get(String str) {
+            Integer dynamic = traces.get(str);
+            return dynamic != null ? dynamic : header.get(str);
+        }
+
+        void add(String str) {
+            Map<String, Integer> map = sealed ? traces : header;
+
+            Integer idx = map.get(str);
+
+            if (idx == null) {
+                map.put(str, nextIndex++);
+            }
+        }
+
+        void clear() {
+            traces.clear();
+            nextIndex = header.size();
+        }
+    }
+
+    private static class SpanMetadata implements MetadataConsumer {
+        private Metadata metadata;
+
+        @Override
+        public void accept(Metadata metadata) {
+            this.metadata = metadata;
+        }
+    }
+
+    /** Payload implementation for V1.0 format. */
+    private static class PayloadV1 extends Payload {
+        private final ByteBuffer header;
+
+        private PayloadV1(ByteBuffer header) {
+            this.header = header;
+        }
+
+        @Override
+        public int sizeInBytes() {
+            return header.remaining() + msgpackArrayHeaderSize(traceCount()) + body.remaining();
+        }
+
+        private void writeBuffer(ByteBuffer buffer, WritableByteChannel channel) throws IOException {
+            while (buffer.hasRemaining()) {
+                channel.write(buffer);
+            }
+        }
+
+        @Override
+        public void writeTo(WritableByteChannel channel) throws IOException {
+            writeBuffer(header.slice(), channel);
+            writeBuffer(msgpackArrayHeader(traceCount()), channel);
+            writeBuffer(body, channel);
+        }
+
+        @Override
+        public RequestBody toRequest() {
+            return msgpackRequestBodyOf(Arrays.asList(header.slice(), msgpackArrayHeader(traceCount()), body));
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDEvpProxyApi.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDEvpProxyApi.java
index 9ec4eca5f4e..0a726c9a176 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDEvpProxyApi.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDEvpProxyApi.java
@@ -25,151 +25,148 @@
 /** The API pointing to a DD Intake endpoint */
 public class DDEvpProxyApi extends RemoteApi {
 
-  private static final Logger log = LoggerFactory.getLogger(DDEvpProxyApi.class);
+    private static final Logger log = LoggerFactory.getLogger(DDEvpProxyApi.class);
 
-  private static final String CONTENT_ENCODING_HEADER = "Content-Encoding";
-  private static final String GZIP_CONTENT_TYPE = "gzip";
+    private static final String CONTENT_ENCODING_HEADER = "Content-Encoding";
+    private static final String GZIP_CONTENT_TYPE = "gzip";
 
-  public static DDEvpProxyApiBuilder builder() {
-    return new DDEvpProxyApiBuilder();
-  }
+    public static DDEvpProxyApiBuilder builder() {
+        return new DDEvpProxyApiBuilder();
+    }
 
-  public static class DDEvpProxyApiBuilder {
-    private String apiVersion = DEFAULT_INTAKE_VERSION;
-    @Nonnull private TrackType trackType = TrackType.NOOP;
-    private long timeoutMillis = TimeUnit.SECONDS.toMillis(DEFAULT_INTAKE_TIMEOUT);
+    public static class DDEvpProxyApiBuilder {
+        private String apiVersion = DEFAULT_INTAKE_VERSION;
 
-    HttpUrl agentUrl = null;
-    OkHttpClient httpClient = null;
-    String evpProxyEndpoint;
-    boolean compressionEnabled;
+        @Nonnull
+        private TrackType trackType = TrackType.NOOP;
 
-    public DDEvpProxyApiBuilder trackType(@Nonnull final TrackType trackType) {
-      this.trackType = trackType;
-      return this;
-    }
+        private long timeoutMillis = TimeUnit.SECONDS.toMillis(DEFAULT_INTAKE_TIMEOUT);
 
-    public DDEvpProxyApiBuilder apiVersion(final String apiVersion) {
-      this.apiVersion = apiVersion;
-      return this;
-    }
+        HttpUrl agentUrl = null;
+        OkHttpClient httpClient = null;
+        String evpProxyEndpoint;
+        boolean compressionEnabled;
 
-    public DDEvpProxyApiBuilder evpProxyEndpoint(final String evpProxyEndpoint) {
-      this.evpProxyEndpoint = evpProxyEndpoint;
-      return this;
-    }
+        public DDEvpProxyApiBuilder trackType(@Nonnull final TrackType trackType) {
+            this.trackType = trackType;
+            return this;
+        }
 
-    public DDEvpProxyApiBuilder timeoutMillis(final long timeoutMillis) {
-      this.timeoutMillis = timeoutMillis;
-      return this;
-    }
+        public DDEvpProxyApiBuilder apiVersion(final String apiVersion) {
+            this.apiVersion = apiVersion;
+            return this;
+        }
 
-    public DDEvpProxyApiBuilder agentUrl(final HttpUrl agentUrl) {
-      this.agentUrl = agentUrl;
-      return this;
-    }
+        public DDEvpProxyApiBuilder evpProxyEndpoint(final String evpProxyEndpoint) {
+            this.evpProxyEndpoint = evpProxyEndpoint;
+            return this;
+        }
 
-    public DDEvpProxyApiBuilder httpClient(final OkHttpClient httpClient) {
-      this.httpClient = httpClient;
-      return this;
-    }
+        public DDEvpProxyApiBuilder timeoutMillis(final long timeoutMillis) {
+            this.timeoutMillis = timeoutMillis;
+            return this;
+        }
 
-    public DDEvpProxyApiBuilder compressionEnabled(boolean compressionEnabled) {
-      this.compressionEnabled = compressionEnabled;
-      return this;
-    }
+        public DDEvpProxyApiBuilder agentUrl(final HttpUrl agentUrl) {
+            this.agentUrl = agentUrl;
+            return this;
+        }
+
+        public DDEvpProxyApiBuilder httpClient(final OkHttpClient httpClient) {
+            this.httpClient = httpClient;
+            return this;
+        }
 
-    public DDEvpProxyApi build() {
-      final String trackName = trackType.name().toLowerCase(Locale.ROOT);
-      final String subdomain = String.format("%s-intake", trackName);
+        public DDEvpProxyApiBuilder compressionEnabled(boolean compressionEnabled) {
+            this.compressionEnabled = compressionEnabled;
+            return this;
+        }
 
-      final HttpUrl evpProxyUrl = agentUrl.resolve(evpProxyEndpoint);
-      final HttpUrl proxiedApiUrl =
-          evpProxyUrl.resolve(String.format("api/%s/%s", apiVersion, trackName));
+        public DDEvpProxyApi build() {
+            final String trackName = trackType.name().toLowerCase(Locale.ROOT);
+            final String subdomain = String.format("%s-intake", trackName);
 
-      final OkHttpClient client =
-          (httpClient != null)
-              ? httpClient
-              : OkHttpUtils.buildHttpClient(proxiedApiUrl, timeoutMillis);
+            final HttpUrl evpProxyUrl = agentUrl.resolve(evpProxyEndpoint);
+            final HttpUrl proxiedApiUrl = evpProxyUrl.resolve(String.format("api/%s/%s", apiVersion, trackName));
 
-      final HttpRetryPolicy.Factory retryPolicyFactory =
-          new HttpRetryPolicy.Factory(5, 100, 2.0, true);
+            final OkHttpClient client =
+                    (httpClient != null) ? httpClient : OkHttpUtils.buildHttpClient(proxiedApiUrl, timeoutMillis);
 
-      log.debug("proxiedApiUrl: {}", proxiedApiUrl);
-      return new DDEvpProxyApi(
-          trackType, client, proxiedApiUrl, subdomain, retryPolicyFactory, compressionEnabled);
+            final HttpRetryPolicy.Factory retryPolicyFactory = new HttpRetryPolicy.Factory(5, 100, 2.0, true);
+
+            log.debug("proxiedApiUrl: {}", proxiedApiUrl);
+            return new DDEvpProxyApi(
+                    trackType, client, proxiedApiUrl, subdomain, retryPolicyFactory, compressionEnabled);
+        }
     }
-  }
-
-  private final TelemetryListener telemetryListener;
-  private final TrackType trackType;
-  private final OkHttpClient httpClient;
-  private final HttpUrl proxiedApiUrl;
-  private final String subdomain;
-  private final HttpRetryPolicy.Factory retryPolicyFactory;
-
-  private DDEvpProxyApi(
-      TrackType trackType,
-      OkHttpClient httpClient,
-      HttpUrl proxiedApiUrl,
-      String subdomain,
-      HttpRetryPolicy.Factory retryPolicyFactory,
-      boolean compressionEnabled) {
-    super(compressionEnabled);
-    this.telemetryListener = new TelemetryListener(trackType.endpoint);
-    this.trackType = trackType;
-    this.httpClient = httpClient;
-    this.proxiedApiUrl = proxiedApiUrl;
-    this.subdomain = subdomain;
-    this.retryPolicyFactory = retryPolicyFactory;
-  }
-
-  @Override
-  public Response sendSerializedTraces(Payload payload) {
-    final int sizeInBytes = payload.sizeInBytes();
-
-    Request.Builder builder =
-        new Request.Builder()
-            .url(proxiedApiUrl)
-            .addHeader(EvpProxy.SUBDOMAIN_HEADER, subdomain)
-            .tag(OkHttpUtils.CustomListener.class, telemetryListener);
-
-    if (isCompressionEnabled()) {
-      builder.addHeader(CONTENT_ENCODING_HEADER, GZIP_CONTENT_TYPE);
+
+    private final TelemetryListener telemetryListener;
+    private final TrackType trackType;
+    private final OkHttpClient httpClient;
+    private final HttpUrl proxiedApiUrl;
+    private final String subdomain;
+    private final HttpRetryPolicy.Factory retryPolicyFactory;
+
+    private DDEvpProxyApi(
+            TrackType trackType,
+            OkHttpClient httpClient,
+            HttpUrl proxiedApiUrl,
+            String subdomain,
+            HttpRetryPolicy.Factory retryPolicyFactory,
+            boolean compressionEnabled) {
+        super(compressionEnabled);
+        this.telemetryListener = new TelemetryListener(trackType.endpoint);
+        this.trackType = trackType;
+        this.httpClient = httpClient;
+        this.proxiedApiUrl = proxiedApiUrl;
+        this.subdomain = subdomain;
+        this.retryPolicyFactory = retryPolicyFactory;
     }
 
-    final Request request = builder.post(payload.toRequest()).build();
-    totalTraces += payload.traceCount();
-    receivedTraces += payload.traceCount();
-
-    try (okhttp3.Response response =
-        OkHttpUtils.sendWithRetries(httpClient, retryPolicyFactory, request)) {
-      if (response.isSuccessful()) {
-        countAndLogSuccessfulSend(payload.traceCount(), sizeInBytes);
-        return Response.success(response.code());
-      } else {
-        InstrumentationBridge.getMetricCollector()
-            .add(CiVisibilityCountMetric.ENDPOINT_PAYLOAD_DROPPED, 1, trackType.endpoint);
-        countAndLogFailedSend(payload.traceCount(), sizeInBytes, response, null);
-        return Response.failed(response.code());
-      }
-
-    } catch (ConnectException e) {
-      InstrumentationBridge.getMetricCollector()
-          .add(CiVisibilityCountMetric.ENDPOINT_PAYLOAD_DROPPED, 1, trackType.endpoint);
-      countAndLogFailedSend(payload.traceCount(), sizeInBytes, null, null);
-      return Response.failed(e);
-
-    } catch (IOException e) {
-      InstrumentationBridge.getMetricCollector()
-          .add(CiVisibilityCountMetric.ENDPOINT_PAYLOAD_DROPPED, 1, trackType.endpoint);
-      countAndLogFailedSend(payload.traceCount(), sizeInBytes, null, e);
-      return Response.failed(e);
+    @Override
+    public Response sendSerializedTraces(Payload payload) {
+        final int sizeInBytes = payload.sizeInBytes();
+
+        Request.Builder builder = new Request.Builder()
+                .url(proxiedApiUrl)
+                .addHeader(EvpProxy.SUBDOMAIN_HEADER, subdomain)
+                .tag(OkHttpUtils.CustomListener.class, telemetryListener);
+
+        if (isCompressionEnabled()) {
+            builder.addHeader(CONTENT_ENCODING_HEADER, GZIP_CONTENT_TYPE);
+        }
+
+        final Request request = builder.post(payload.toRequest()).build();
+        totalTraces += payload.traceCount();
+        receivedTraces += payload.traceCount();
+
+        try (okhttp3.Response response = OkHttpUtils.sendWithRetries(httpClient, retryPolicyFactory, request)) {
+            if (response.isSuccessful()) {
+                countAndLogSuccessfulSend(payload.traceCount(), sizeInBytes);
+                return Response.success(response.code());
+            } else {
+                InstrumentationBridge.getMetricCollector()
+                        .add(CiVisibilityCountMetric.ENDPOINT_PAYLOAD_DROPPED, 1, trackType.endpoint);
+                countAndLogFailedSend(payload.traceCount(), sizeInBytes, response, null);
+                return Response.failed(response.code());
+            }
+
+        } catch (ConnectException e) {
+            InstrumentationBridge.getMetricCollector()
+                    .add(CiVisibilityCountMetric.ENDPOINT_PAYLOAD_DROPPED, 1, trackType.endpoint);
+            countAndLogFailedSend(payload.traceCount(), sizeInBytes, null, null);
+            return Response.failed(e);
+
+        } catch (IOException e) {
+            InstrumentationBridge.getMetricCollector()
+                    .add(CiVisibilityCountMetric.ENDPOINT_PAYLOAD_DROPPED, 1, trackType.endpoint);
+            countAndLogFailedSend(payload.traceCount(), sizeInBytes, null, e);
+            return Response.failed(e);
+        }
     }
-  }
 
-  @Override
-  protected Logger getLogger() {
-    return log;
-  }
+    @Override
+    protected Logger getLogger() {
+        return log;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeApi.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeApi.java
index 7abad42d2f1..855d4dfd271 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeApi.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeApi.java
@@ -25,143 +25,140 @@
 /** The API pointing to a DD Intake endpoint */
 public class DDIntakeApi extends RemoteApi {
 
-  private static final Logger log = LoggerFactory.getLogger(DDIntakeApi.class);
+    private static final Logger log = LoggerFactory.getLogger(DDIntakeApi.class);
 
-  private static final String DD_API_KEY_HEADER = "dd-api-key";
-  private static final String CONTENT_ENCODING_HEADER = "Content-Encoding";
-  private static final String GZIP_CONTENT_TYPE = "gzip";
+    private static final String DD_API_KEY_HEADER = "dd-api-key";
+    private static final String CONTENT_ENCODING_HEADER = "Content-Encoding";
+    private static final String GZIP_CONTENT_TYPE = "gzip";
 
-  public static DDIntakeApiBuilder builder() {
-    return new DDIntakeApiBuilder();
-  }
-
-  public static class DDIntakeApiBuilder {
-    private String site = Config.get().getSite();
-    private String apiVersion = DEFAULT_INTAKE_VERSION;
-    private TrackType trackType = TrackType.NOOP;
-    private long timeoutMillis = TimeUnit.SECONDS.toMillis(DEFAULT_INTAKE_TIMEOUT);
-
-    HttpUrl hostUrl = null;
-    OkHttpClient httpClient = null;
-    HttpRetryPolicy.Factory retryPolicyFactory = new HttpRetryPolicy.Factory(5, 100, 2.0, true);
-
-    private String apiKey;
-
-    public DDIntakeApiBuilder trackType(final TrackType trackType) {
-      this.trackType = trackType;
-      return this;
-    }
-
-    public DDIntakeApiBuilder site(final String site) {
-      this.site = site;
-      return this;
+    public static DDIntakeApiBuilder builder() {
+        return new DDIntakeApiBuilder();
     }
 
-    public DDIntakeApiBuilder apiVersion(final String apiVersion) {
-      this.apiVersion = apiVersion;
-      return this;
+    public static class DDIntakeApiBuilder {
+        private String site = Config.get().getSite();
+        private String apiVersion = DEFAULT_INTAKE_VERSION;
+        private TrackType trackType = TrackType.NOOP;
+        private long timeoutMillis = TimeUnit.SECONDS.toMillis(DEFAULT_INTAKE_TIMEOUT);
+
+        HttpUrl hostUrl = null;
+        OkHttpClient httpClient = null;
+        HttpRetryPolicy.Factory retryPolicyFactory = new HttpRetryPolicy.Factory(5, 100, 2.0, true);
+
+        private String apiKey;
+
+        public DDIntakeApiBuilder trackType(final TrackType trackType) {
+            this.trackType = trackType;
+            return this;
+        }
+
+        public DDIntakeApiBuilder site(final String site) {
+            this.site = site;
+            return this;
+        }
+
+        public DDIntakeApiBuilder apiVersion(final String apiVersion) {
+            this.apiVersion = apiVersion;
+            return this;
+        }
+
+        public DDIntakeApiBuilder apiKey(final String apiKey) {
+            this.apiKey = apiKey;
+            return this;
+        }
+
+        public DDIntakeApiBuilder timeoutMillis(final long timeoutMillis) {
+            this.timeoutMillis = timeoutMillis;
+            return this;
+        }
+
+        public DDIntakeApiBuilder hostUrl(final HttpUrl hostUrl) {
+            this.hostUrl = hostUrl;
+            return this;
+        }
+
+        public DDIntakeApiBuilder httpClient(final OkHttpClient httpClient) {
+            this.httpClient = httpClient;
+            return this;
+        }
+
+        public DDIntakeApi build() {
+            assert apiKey != null;
+            final String trackName = (trackType != null ? trackType.name() : NOOP.name()).toLowerCase(Locale.ROOT);
+            if (null == hostUrl) {
+                hostUrl = HttpUrl.get(String.format("https://%s-intake.%s", trackName, site));
+            }
+            final HttpUrl intakeUrl = hostUrl.resolve(String.format("/api/%s/%s", apiVersion, trackName));
+            final OkHttpClient client =
+                    (httpClient != null) ? httpClient : OkHttpUtils.buildHttpClient(intakeUrl, timeoutMillis);
+
+            return new DDIntakeApi(trackType, client, intakeUrl, apiKey, retryPolicyFactory);
+        }
     }
 
-    public DDIntakeApiBuilder apiKey(final String apiKey) {
-      this.apiKey = apiKey;
-      return this;
+    private final TelemetryListener telemetryListener;
+    private final TrackType trackType;
+    private final OkHttpClient httpClient;
+    private final HttpUrl intakeUrl;
+    private final String apiKey;
+    private final HttpRetryPolicy.Factory retryPolicyFactory;
+
+    private DDIntakeApi(
+            TrackType trackType,
+            OkHttpClient httpClient,
+            HttpUrl intakeUrl,
+            String apiKey,
+            HttpRetryPolicy.Factory retryPolicyFactory) {
+        super(true);
+        this.telemetryListener = new TelemetryListener(trackType.endpoint);
+        this.trackType = trackType;
+        this.httpClient = httpClient;
+        this.intakeUrl = intakeUrl;
+        this.apiKey = apiKey;
+        this.retryPolicyFactory = retryPolicyFactory;
     }
 
-    public DDIntakeApiBuilder timeoutMillis(final long timeoutMillis) {
-      this.timeoutMillis = timeoutMillis;
-      return this;
+    @Override
+    public Response sendSerializedTraces(Payload payload) {
+        final int sizeInBytes = payload.sizeInBytes();
+
+        final Request request = new Request.Builder()
+                .url(intakeUrl)
+                .addHeader(DD_API_KEY_HEADER, apiKey)
+                .addHeader(CONTENT_ENCODING_HEADER, GZIP_CONTENT_TYPE)
+                .post(payload.toRequest())
+                .tag(OkHttpUtils.CustomListener.class, telemetryListener)
+                .build();
+        totalTraces += payload.traceCount();
+        receivedTraces += payload.traceCount();
+
+        try (okhttp3.Response response = OkHttpUtils.sendWithRetries(httpClient, retryPolicyFactory, request)) {
+            if (response.isSuccessful()) {
+                countAndLogSuccessfulSend(payload.traceCount(), sizeInBytes);
+                return Response.success(response.code());
+            } else {
+                InstrumentationBridge.getMetricCollector()
+                        .add(CiVisibilityCountMetric.ENDPOINT_PAYLOAD_DROPPED, 1, trackType.endpoint);
+                countAndLogFailedSend(payload.traceCount(), sizeInBytes, response, null);
+                return Response.failed(response.code());
+            }
+
+        } catch (ConnectException e) {
+            InstrumentationBridge.getMetricCollector()
+                    .add(CiVisibilityCountMetric.ENDPOINT_PAYLOAD_DROPPED, 1, trackType.endpoint);
+            countAndLogFailedSend(payload.traceCount(), sizeInBytes, null, null);
+            return Response.failed(e);
+
+        } catch (IOException e) {
+            InstrumentationBridge.getMetricCollector()
+                    .add(CiVisibilityCountMetric.ENDPOINT_PAYLOAD_DROPPED, 1, trackType.endpoint);
+            countAndLogFailedSend(payload.traceCount(), sizeInBytes, null, e);
+            return Response.failed(e);
+        }
     }
 
-    public DDIntakeApiBuilder hostUrl(final HttpUrl hostUrl) {
-      this.hostUrl = hostUrl;
-      return this;
+    @Override
+    protected Logger getLogger() {
+        return log;
     }
-
-    public DDIntakeApiBuilder httpClient(final OkHttpClient httpClient) {
-      this.httpClient = httpClient;
-      return this;
-    }
-
-    public DDIntakeApi build() {
-      assert apiKey != null;
-      final String trackName =
-          (trackType != null ? trackType.name() : NOOP.name()).toLowerCase(Locale.ROOT);
-      if (null == hostUrl) {
-        hostUrl = HttpUrl.get(String.format("https://%s-intake.%s", trackName, site));
-      }
-      final HttpUrl intakeUrl = hostUrl.resolve(String.format("/api/%s/%s", apiVersion, trackName));
-      final OkHttpClient client =
-          (httpClient != null) ? httpClient : OkHttpUtils.buildHttpClient(intakeUrl, timeoutMillis);
-
-      return new DDIntakeApi(trackType, client, intakeUrl, apiKey, retryPolicyFactory);
-    }
-  }
-
-  private final TelemetryListener telemetryListener;
-  private final TrackType trackType;
-  private final OkHttpClient httpClient;
-  private final HttpUrl intakeUrl;
-  private final String apiKey;
-  private final HttpRetryPolicy.Factory retryPolicyFactory;
-
-  private DDIntakeApi(
-      TrackType trackType,
-      OkHttpClient httpClient,
-      HttpUrl intakeUrl,
-      String apiKey,
-      HttpRetryPolicy.Factory retryPolicyFactory) {
-    super(true);
-    this.telemetryListener = new TelemetryListener(trackType.endpoint);
-    this.trackType = trackType;
-    this.httpClient = httpClient;
-    this.intakeUrl = intakeUrl;
-    this.apiKey = apiKey;
-    this.retryPolicyFactory = retryPolicyFactory;
-  }
-
-  @Override
-  public Response sendSerializedTraces(Payload payload) {
-    final int sizeInBytes = payload.sizeInBytes();
-
-    final Request request =
-        new Request.Builder()
-            .url(intakeUrl)
-            .addHeader(DD_API_KEY_HEADER, apiKey)
-            .addHeader(CONTENT_ENCODING_HEADER, GZIP_CONTENT_TYPE)
-            .post(payload.toRequest())
-            .tag(OkHttpUtils.CustomListener.class, telemetryListener)
-            .build();
-    totalTraces += payload.traceCount();
-    receivedTraces += payload.traceCount();
-
-    try (okhttp3.Response response =
-        OkHttpUtils.sendWithRetries(httpClient, retryPolicyFactory, request)) {
-      if (response.isSuccessful()) {
-        countAndLogSuccessfulSend(payload.traceCount(), sizeInBytes);
-        return Response.success(response.code());
-      } else {
-        InstrumentationBridge.getMetricCollector()
-            .add(CiVisibilityCountMetric.ENDPOINT_PAYLOAD_DROPPED, 1, trackType.endpoint);
-        countAndLogFailedSend(payload.traceCount(), sizeInBytes, response, null);
-        return Response.failed(response.code());
-      }
-
-    } catch (ConnectException e) {
-      InstrumentationBridge.getMetricCollector()
-          .add(CiVisibilityCountMetric.ENDPOINT_PAYLOAD_DROPPED, 1, trackType.endpoint);
-      countAndLogFailedSend(payload.traceCount(), sizeInBytes, null, null);
-      return Response.failed(e);
-
-    } catch (IOException e) {
-      InstrumentationBridge.getMetricCollector()
-          .add(CiVisibilityCountMetric.ENDPOINT_PAYLOAD_DROPPED, 1, trackType.endpoint);
-      countAndLogFailedSend(payload.traceCount(), sizeInBytes, null, e);
-      return Response.failed(e);
-    }
-  }
-
-  @Override
-  protected Logger getLogger() {
-    return log;
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeMapperDiscovery.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeMapperDiscovery.java
index 5123e6fe06e..eac8b4aa604 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeMapperDiscovery.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeMapperDiscovery.java
@@ -15,41 +15,39 @@
  */
 public class DDIntakeMapperDiscovery implements RemoteMapperDiscovery {
 
-  private final TrackType trackType;
-  private final CiVisibilityWellKnownTags wellKnownTags;
-  private final boolean compressionEnabled;
-
-  private RemoteMapper mapper;
-
-  public DDIntakeMapperDiscovery(
-      final TrackType trackType,
-      final CiVisibilityWellKnownTags wellKnownTags,
-      boolean compressionEnabled) {
-    this.trackType = trackType;
-    this.wellKnownTags = wellKnownTags;
-    this.compressionEnabled = compressionEnabled;
-  }
-
-  private void reset() {
-    mapper = null;
-  }
-
-  @Override
-  public void discover() {
-    reset();
-    if (TrackType.CITESTCYCLE.equals(trackType)) {
-      mapper = new CiTestCycleMapperV1(wellKnownTags, compressionEnabled);
-    } else if (TrackType.CITESTCOV.equals(trackType)) {
-      mapper = new CiTestCovMapperV2(compressionEnabled);
-    } else if (TrackType.LLMOBS.equals(trackType)) {
-      mapper = new LLMObsSpanMapper();
-    } else {
-      mapper = RemoteMapper.NO_OP;
+    private final TrackType trackType;
+    private final CiVisibilityWellKnownTags wellKnownTags;
+    private final boolean compressionEnabled;
+
+    private RemoteMapper mapper;
+
+    public DDIntakeMapperDiscovery(
+            final TrackType trackType, final CiVisibilityWellKnownTags wellKnownTags, boolean compressionEnabled) {
+        this.trackType = trackType;
+        this.wellKnownTags = wellKnownTags;
+        this.compressionEnabled = compressionEnabled;
+    }
+
+    private void reset() {
+        mapper = null;
     }
-  }
 
-  @Override
-  public RemoteMapper getMapper() {
-    return mapper;
-  }
+    @Override
+    public void discover() {
+        reset();
+        if (TrackType.CITESTCYCLE.equals(trackType)) {
+            mapper = new CiTestCycleMapperV1(wellKnownTags, compressionEnabled);
+        } else if (TrackType.CITESTCOV.equals(trackType)) {
+            mapper = new CiTestCovMapperV2(compressionEnabled);
+        } else if (TrackType.LLMOBS.equals(trackType)) {
+            mapper = new LLMObsSpanMapper();
+        } else {
+            mapper = RemoteMapper.NO_OP;
+        }
+    }
+
+    @Override
+    public RemoteMapper getMapper() {
+        return mapper;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeTraceInterceptor.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeTraceInterceptor.java
index 5c2cfae9d40..875055e3552 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeTraceInterceptor.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeTraceInterceptor.java
@@ -16,52 +16,50 @@
 
 public class DDIntakeTraceInterceptor extends AbstractTraceInterceptor {
 
-  public static final DDIntakeTraceInterceptor INSTANCE =
-      new DDIntakeTraceInterceptor(Priority.DD_INTAKE);
+    public static final DDIntakeTraceInterceptor INSTANCE = new DDIntakeTraceInterceptor(Priority.DD_INTAKE);
 
-  private static final Logger log = LoggerFactory.getLogger(DDIntakeTraceInterceptor.class);
+    private static final Logger log = LoggerFactory.getLogger(DDIntakeTraceInterceptor.class);
 
-  protected DDIntakeTraceInterceptor(Priority priority) {
-    super(priority);
-  }
-
-  @Override
-  public Collection<? extends MutableSpan> onTraceComplete(
-      Collection<? extends MutableSpan> trace) {
-    if (trace.isEmpty()) {
-      return trace;
+    protected DDIntakeTraceInterceptor(Priority priority) {
+        super(priority);
     }
 
-    for (MutableSpan span : trace) {
-      if (span instanceof DDSpan) {
-        process((DDSpan) span);
-      }
+    @Override
+    public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
+        if (trace.isEmpty()) {
+            return trace;
+        }
+
+        for (MutableSpan span : trace) {
+            if (span instanceof DDSpan) {
+                process((DDSpan) span);
+            }
+        }
+        return trace;
     }
-    return trace;
-  }
 
-  private void process(DDSpan span) {
-    span.setServiceName(normalizeServiceName(span.getServiceName()));
-    span.setOperationName(normalizeOperationName(span.getOperationName()));
-    span.setSpanType(normalizeSpanType(span.getType()));
+    private void process(DDSpan span) {
+        span.setServiceName(normalizeServiceName(span.getServiceName()));
+        span.setOperationName(normalizeOperationName(span.getOperationName()));
+        span.setSpanType(normalizeSpanType(span.getType()));
 
-    if (span.getResourceName() == null || span.getResourceName().length() == 0) {
-      log.debug(
-          "Fixing malformed trace. Resource is empty (reason:resource_empty), setting span.resource={}: {}",
-          span.getOperationName(),
-          span);
-      span.setResourceName(span.getOperationName());
-    }
+        if (span.getResourceName() == null || span.getResourceName().length() == 0) {
+            log.debug(
+                    "Fixing malformed trace. Resource is empty (reason:resource_empty), setting span.resource={}: {}",
+                    span.getOperationName(),
+                    span);
+            span.setResourceName(span.getOperationName());
+        }
 
-    span.setTag(Tags.ENV, TraceUtils.normalizeEnv((String) span.getTag(Tags.ENV)));
+        span.setTag(Tags.ENV, TraceUtils.normalizeEnv((String) span.getTag(Tags.ENV)));
 
-    final short httpStatusCode = span.getHttpStatusCode();
-    if (httpStatusCode != 0 && !isValidStatusCode(httpStatusCode)) {
-      log.debug(
-          "Fixing malformed trace. HTTP status code is invalid (reason:invalid_http_status_code), dropping invalid http.status_code={}: {}",
-          httpStatusCode,
-          span);
-      span.setHttpStatusCode(0);
+        final short httpStatusCode = span.getHttpStatusCode();
+        if (httpStatusCode != 0 && !isValidStatusCode(httpStatusCode)) {
+            log.debug(
+                    "Fixing malformed trace. HTTP status code is invalid (reason:invalid_http_status_code), dropping invalid http.status_code={}: {}",
+                    httpStatusCode,
+                    span);
+            span.setHttpStatusCode(0);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeTrackTypeResolver.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeTrackTypeResolver.java
index 845081e8e2d..884ee9dc749 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeTrackTypeResolver.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeTrackTypeResolver.java
@@ -5,11 +5,11 @@
 
 public final class DDIntakeTrackTypeResolver {
 
-  public static TrackType resolve(final Config config) {
-    if (config.isCiVisibilityEnabled()) {
-      return TrackType.CITESTCYCLE;
-    } else {
-      return TrackType.NOOP;
+    public static TrackType resolve(final Config config) {
+        if (config.isCiVisibilityEnabled()) {
+            return TrackType.CITESTCYCLE;
+        } else {
+            return TrackType.NOOP;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/TelemetryListener.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/TelemetryListener.java
index b23ab1c43df..46586f2a698 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/TelemetryListener.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/TelemetryListener.java
@@ -14,61 +14,57 @@
 
 public class TelemetryListener extends OkHttpUtils.CustomListener {
 
-  private static final String CONTENT_ENCODING_HEADER = "Content-Encoding";
-  private static final String GZIP_ENCODING = "gzip";
+    private static final String CONTENT_ENCODING_HEADER = "Content-Encoding";
+    private static final String GZIP_ENCODING = "gzip";
 
-  private final Endpoint endpoint;
-  private long callStartTimestamp;
+    private final Endpoint endpoint;
+    private long callStartTimestamp;
 
-  public TelemetryListener(Endpoint endpoint) {
-    this.endpoint = endpoint;
-  }
+    public TelemetryListener(Endpoint endpoint) {
+        this.endpoint = endpoint;
+    }
 
-  public void callStart(Call call) {
-    callStartTimestamp = System.currentTimeMillis();
-    InstrumentationBridge.getMetricCollector()
-        .add(
-            CiVisibilityCountMetric.ENDPOINT_PAYLOAD_REQUESTS,
-            1,
-            endpoint,
-            GZIP_ENCODING.equalsIgnoreCase(call.request().header(CONTENT_ENCODING_HEADER))
-                ? RequestCompressed.TRUE
-                : null);
-  }
+    public void callStart(Call call) {
+        callStartTimestamp = System.currentTimeMillis();
+        InstrumentationBridge.getMetricCollector()
+                .add(
+                        CiVisibilityCountMetric.ENDPOINT_PAYLOAD_REQUESTS,
+                        1,
+                        endpoint,
+                        GZIP_ENCODING.equalsIgnoreCase(call.request().header(CONTENT_ENCODING_HEADER))
+                                ? RequestCompressed.TRUE
+                                : null);
+    }
 
-  public void requestBodyEnd(Call call, long byteCount) {
-    InstrumentationBridge.getMetricCollector()
-        .add(CiVisibilityDistributionMetric.ENDPOINT_PAYLOAD_BYTES, (int) byteCount, endpoint);
-  }
+    public void requestBodyEnd(Call call, long byteCount) {
+        InstrumentationBridge.getMetricCollector()
+                .add(CiVisibilityDistributionMetric.ENDPOINT_PAYLOAD_BYTES, (int) byteCount, endpoint);
+    }
 
-  public void responseHeadersEnd(Call call, Response response) {
-    if (!response.isSuccessful()) {
-      int responseCode = response.code();
-      InstrumentationBridge.getMetricCollector()
-          .add(
-              CiVisibilityCountMetric.ENDPOINT_PAYLOAD_REQUESTS_ERRORS,
-              1,
-              endpoint,
-              ErrorType.from(responseCode),
-              StatusCode.from(responseCode));
+    public void responseHeadersEnd(Call call, Response response) {
+        if (!response.isSuccessful()) {
+            int responseCode = response.code();
+            InstrumentationBridge.getMetricCollector()
+                    .add(
+                            CiVisibilityCountMetric.ENDPOINT_PAYLOAD_REQUESTS_ERRORS,
+                            1,
+                            endpoint,
+                            ErrorType.from(responseCode),
+                            StatusCode.from(responseCode));
+        }
     }
-  }
 
-  public void callEnd(Call call) {
-    int durationMillis = (int) (System.currentTimeMillis() - callStartTimestamp);
-    InstrumentationBridge.getMetricCollector()
-        .add(CiVisibilityDistributionMetric.ENDPOINT_PAYLOAD_REQUESTS_MS, durationMillis, endpoint);
-  }
+    public void callEnd(Call call) {
+        int durationMillis = (int) (System.currentTimeMillis() - callStartTimestamp);
+        InstrumentationBridge.getMetricCollector()
+                .add(CiVisibilityDistributionMetric.ENDPOINT_PAYLOAD_REQUESTS_MS, durationMillis, endpoint);
+    }
 
-  public void callFailed(Call call, IOException ioe) {
-    int durationMillis = (int) (System.currentTimeMillis() - callStartTimestamp);
-    InstrumentationBridge.getMetricCollector()
-        .add(CiVisibilityDistributionMetric.ENDPOINT_PAYLOAD_REQUESTS_MS, durationMillis, endpoint);
-    InstrumentationBridge.getMetricCollector()
-        .add(
-            CiVisibilityCountMetric.ENDPOINT_PAYLOAD_REQUESTS_ERRORS,
-            1,
-            endpoint,
-            ErrorType.NETWORK);
-  }
+    public void callFailed(Call call, IOException ioe) {
+        int durationMillis = (int) (System.currentTimeMillis() - callStartTimestamp);
+        InstrumentationBridge.getMetricCollector()
+                .add(CiVisibilityDistributionMetric.ENDPOINT_PAYLOAD_REQUESTS_MS, durationMillis, endpoint);
+        InstrumentationBridge.getMetricCollector()
+                .add(CiVisibilityCountMetric.ENDPOINT_PAYLOAD_REQUESTS_ERRORS, 1, endpoint, ErrorType.NETWORK);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java
index 51365a1fed2..129f0c90097 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java
@@ -6,173 +6,171 @@
 
 public interface CoreSpan<T extends CoreSpan<T>> {
 
-  T getLocalRootSpan();
+    T getLocalRootSpan();
 
-  String getServiceName();
+    String getServiceName();
 
-  CharSequence getServiceNameSource();
+    CharSequence getServiceNameSource();
 
-  CharSequence getOperationName();
+    CharSequence getOperationName();
 
-  CharSequence getResourceName();
+    CharSequence getResourceName();
 
-  DDTraceId getTraceId();
+    DDTraceId getTraceId();
 
-  long getSpanId();
+    long getSpanId();
 
-  long getParentId();
+    long getParentId();
 
-  long getStartTime();
+    long getStartTime();
 
-  long getDurationNano();
+    long getDurationNano();
 
-  int getError();
+    int getError();
 
-  short getHttpStatusCode();
+    short getHttpStatusCode();
 
-  CharSequence getOrigin();
+    CharSequence getOrigin();
 
-  T setMeasured(boolean measured);
+    T setMeasured(boolean measured);
 
-  T setErrorMessage(final String errorMessage);
+    T setErrorMessage(final String errorMessage);
 
-  T addThrowable(final Throwable error);
+    T addThrowable(final Throwable error);
 
-  T setTag(final String tag, final String value);
+    T setTag(final String tag, final String value);
 
-  T setTag(final String tag, final boolean value);
+    T setTag(final String tag, final boolean value);
 
-  T setTag(final String tag, final int value);
+    T setTag(final String tag, final int value);
 
-  T setTag(final String tag, final long value);
+    T setTag(final String tag, final long value);
 
-  T setTag(final String tag, final double value);
+    T setTag(final String tag, final double value);
 
-  T setTag(final String tag, final Number value);
+    T setTag(final String tag, final Number value);
 
-  T setTag(final String tag, final CharSequence value);
+    T setTag(final String tag, final CharSequence value);
 
-  T setTag(final String tag, final Object value);
+    T setTag(final String tag, final Object value);
 
-  T removeTag(final String tag);
+    T removeTag(final String tag);
 
-  <U> U getTag(CharSequence name, U defaultValue);
+    <U> U getTag(CharSequence name, U defaultValue);
 
-  <U> U getTag(CharSequence name);
+    <U> U getTag(CharSequence name);
 
-  <U> U unsafeGetTag(CharSequence name, U defaultValue);
+    <U> U unsafeGetTag(CharSequence name, U defaultValue);
 
-  <U> U unsafeGetTag(CharSequence name);
+    <U> U unsafeGetTag(CharSequence name);
 
-  boolean hasSamplingPriority();
+    boolean hasSamplingPriority();
 
-  boolean isMeasured();
+    boolean isMeasured();
 
-  /**
-   * @return whether this span has a different service name from its parent, or is a local root.
-   */
-  boolean isTopLevel();
+    /**
+     * @return whether this span has a different service name from its parent, or is a local root.
+     */
+    boolean isTopLevel();
 
-  boolean isForceKeep();
+    boolean isForceKeep();
 
-  boolean isKind(SpanKindFilter filter);
+    boolean isKind(SpanKindFilter filter);
 
-  /**
-   * Returns the {@code span.kind} tag value as a String, or {@code null} if not set. Default
-   * implementation reads the tag map; {@link DDSpan} overrides to use a cached ordinal that
-   * resolves via a small lookup array, skipping the tag-map lookup on the hot path.
-   */
-  default String getSpanKindString() {
-    Object v = unsafeGetTag(Tags.SPAN_KIND);
-    return v == null ? null : v.toString();
-  }
+    /**
+     * Returns the {@code span.kind} tag value as a String, or {@code null} if not set. Default
+     * implementation reads the tag map; {@link DDSpan} overrides to use a cached ordinal that
+     * resolves via a small lookup array, skipping the tag-map lookup on the hot path.
+     */
+    default String getSpanKindString() {
+        Object v = unsafeGetTag(Tags.SPAN_KIND);
+        return v == null ? null : v.toString();
+    }
 
-  CharSequence getType();
+    CharSequence getType();
 
-  /**
-   * Runs early {@link datadog.trace.core.tagprocessor.TagsPostProcessor} like base service and peer
-   * service computation. Such tags are needed before span serialization so they can’t be processed
-   * lazily as part of the {@link #processTagsAndBaggage(MetadataConsumer)} API.
-   */
-  void processServiceTags();
+    /**
+     * Runs early {@link datadog.trace.core.tagprocessor.TagsPostProcessor} like base service and peer
+     * service computation. Such tags are needed before span serialization so they can’t be processed
+     * lazily as part of the {@link #processTagsAndBaggage(MetadataConsumer)} API.
+     */
+    void processServiceTags();
 
-  void processTagsAndBaggage(MetadataConsumer consumer);
+    void processTagsAndBaggage(MetadataConsumer consumer);
 
-  default void processTagsAndBaggage(MetadataConsumer consumer, boolean firstInChunk) {
-    processTagsAndBaggage(consumer);
-  }
+    default void processTagsAndBaggage(MetadataConsumer consumer, boolean firstInChunk) {
+        processTagsAndBaggage(consumer);
+    }
 
-  /**
-   * Variant of {@link #processTagsAndBaggage(MetadataConsumer)} for protocols that serialize span
-   * links as first-class structured data rather than tags. Baggage tag injection still follows the
-   * tracer configuration.
-   *
-   * <p>To simplify tests, by default delegating to {@link
-   * #processTagsAndBaggage(MetadataConsumer)}.
-   */
-  default void processTagsAndBaggageWithStructuredLinks(MetadataConsumer consumer) {
-    processTagsAndBaggage(consumer);
-  }
+    /**
+     * Variant of {@link #processTagsAndBaggage(MetadataConsumer)} for protocols that serialize span
+     * links as first-class structured data rather than tags. Baggage tag injection still follows the
+     * tracer configuration.
+     *
+     * <p>To simplify tests, by default delegating to {@link
+     * #processTagsAndBaggage(MetadataConsumer)}.
+     */
+    default void processTagsAndBaggageWithStructuredLinks(MetadataConsumer consumer) {
+        processTagsAndBaggage(consumer);
+    }
 
-  default void processTagsAndBaggageWithStructuredLinks(
-      MetadataConsumer consumer, boolean firstInChunk) {
-    processTagsAndBaggageWithStructuredLinks(consumer);
-  }
+    default void processTagsAndBaggageWithStructuredLinks(MetadataConsumer consumer, boolean firstInChunk) {
+        processTagsAndBaggageWithStructuredLinks(consumer);
+    }
 
-  T setSamplingPriority(int samplingPriority, int samplingMechanism);
+    T setSamplingPriority(int samplingPriority, int samplingMechanism);
 
-  T setSamplingPriority(
-      int samplingPriority, CharSequence rate, double sampleRate, int samplingMechanism);
+    T setSamplingPriority(int samplingPriority, CharSequence rate, double sampleRate, int samplingMechanism);
 
-  default T setSamplingPriority(
-      int samplingPriority,
-      CharSequence rate,
-      double sampleRate,
-      int samplingMechanism,
-      boolean rateLimiterRejected) {
-    return setSamplingPriority(samplingPriority, rate, sampleRate, samplingMechanism);
-  }
+    default T setSamplingPriority(
+            int samplingPriority,
+            CharSequence rate,
+            double sampleRate,
+            int samplingMechanism,
+            boolean rateLimiterRejected) {
+        return setSamplingPriority(samplingPriority, rate, sampleRate, samplingMechanism);
+    }
 
-  T setSpanSamplingPriority(double rate, int limit);
+    T setSpanSamplingPriority(double rate, int limit);
 
-  T setMetric(CharSequence name, int value);
+    T setMetric(CharSequence name, int value);
 
-  T setMetric(CharSequence name, long value);
+    T setMetric(CharSequence name, long value);
 
-  T setMetric(CharSequence name, float value);
+    T setMetric(CharSequence name, float value);
 
-  T setMetric(CharSequence name, double value);
+    T setMetric(CharSequence name, double value);
 
-  T setFlag(CharSequence name, boolean value);
+    T setFlag(CharSequence name, boolean value);
 
-  int samplingPriority();
+    int samplingPriority();
 
-  /**
-   * Returns a readonly view of the current meta_struct data stored in the span
-   *
-   * @return readonly map with all the fields
-   */
-  Map<String, Object> getMetaStruct();
+    /**
+     * Returns a readonly view of the current meta_struct data stored in the span
+     *
+     * @return readonly map with all the fields
+     */
+    Map<String, Object> getMetaStruct();
 
-  /**
-   * Adds a new field to the meta_struct stored in the span
-   *
-   * <p>Existing field value with the same value will be replaced. Setting a field with a {@code
-   * null} value will remove the field from the metaStruct.
-   *
-   * @param field name of the field
-   * @param value value of the field
-   * @return this
-   */
-  T setMetaStruct(final String field, final Object value);
-
-  /**
-   * Version of a span that can be set by the long running spans feature:
-   * <li>eq 0 -> span is not long running.
-   * <li>lt 0 -> finished span that had running versions previously written.
-   * <li>gt 0 -> long running span and its write version.
-   *
-   * @return the version.
-   */
-  int getLongRunningVersion();
+    /**
+     * Adds a new field to the meta_struct stored in the span
+     *
+     * <p>Existing field value with the same value will be replaced. Setting a field with a {@code
+     * null} value will remove the field from the metaStruct.
+     *
+     * @param field name of the field
+     * @param value value of the field
+     * @return this
+     */
+    T setMetaStruct(final String field, final Object value);
+
+    /**
+     * Version of a span that can be set by the long running spans feature:
+     * <li>eq 0 -> span is not long running.
+     * <li>lt 0 -> finished span that had running versions previously written.
+     * <li>gt 0 -> long running span and its write version.
+     *
+     * @return the version.
+     */
+    int getLongRunningVersion();
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
index 8f52b49052c..ea23c6febf7 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
@@ -145,2546 +145,2489 @@
  * reporting, and propagating traces
  */
 public class CoreTracer implements AgentTracer.TracerAPI, TracerFlare.Reporter {
-  private static final Logger log = LoggerFactory.getLogger(CoreTracer.class);
+    private static final Logger log = LoggerFactory.getLogger(CoreTracer.class);
 
-  public static CoreTracerBuilder builder() {
-    return new CoreTracerBuilder();
-  }
+    public static CoreTracerBuilder builder() {
+        return new CoreTracerBuilder();
+    }
 
-  /** Tracer start time in nanoseconds measured up to a millisecond accuracy */
-  private final long startTimeNano;
+    /** Tracer start time in nanoseconds measured up to a millisecond accuracy */
+    private final long startTimeNano;
 
-  /** Nanosecond ticks value at tracer start */
-  private final long startNanoTicks;
+    /** Nanosecond ticks value at tracer start */
+    private final long startNanoTicks;
 
-  /** How often should traced threads check clock ticks against the wall clock */
-  private final long clockSyncPeriod;
+    /** How often should traced threads check clock ticks against the wall clock */
+    private final long clockSyncPeriod;
 
-  /** If the tracer can create inferred services */
-  private final boolean allowInferredServices;
+    /** If the tracer can create inferred services */
+    private final boolean allowInferredServices;
 
-  /** Last time (in nanosecond ticks) the clock was checked for drift */
-  private volatile long lastSyncTicks;
+    /** Last time (in nanosecond ticks) the clock was checked for drift */
+    private volatile long lastSyncTicks;
 
-  /** Nanosecond offset to counter clock drift */
-  private volatile long counterDrift;
+    /** Nanosecond offset to counter clock drift */
+    private volatile long counterDrift;
 
-  private final TracingConfigPoller tracingConfigPoller;
+    private final TracingConfigPoller tracingConfigPoller;
 
-  private final PendingTraceBuffer pendingTraceBuffer;
+    private final PendingTraceBuffer pendingTraceBuffer;
 
-  /** Default service name if none provided on the trace or span */
-  final String serviceName;
+    /** Default service name if none provided on the trace or span */
+    final String serviceName;
 
-  /** Writer is in charge of reporting traces and spans to the desired endpoint */
-  final Writer writer;
+    /** Writer is in charge of reporting traces and spans to the desired endpoint */
+    final Writer writer;
 
-  /** Sampler defines the sampling policy in order to reduce the number of traces for instance */
-  final Sampler initialSampler;
+    /** Sampler defines the sampling policy in order to reduce the number of traces for instance */
+    final Sampler initialSampler;
 
-  /**
-   * The sampler registered to receive agent published rates, reused across sampler rebuilds so
-   * learned rates survive.
-   */
-  @Nullable final RateByServiceTraceSampler agentSampler;
+    /**
+     * The sampler registered to receive agent published rates, reused across sampler rebuilds so
+     * learned rates survive.
+     */
+    @Nullable
+    final RateByServiceTraceSampler agentSampler;
 
-  /** Scope manager is in charge of managing the scopes from which spans are created */
-  final ContinuableScopeManager scopeManager;
+    /** Scope manager is in charge of managing the scopes from which spans are created */
+    final ContinuableScopeManager scopeManager;
 
-  volatile MetricsAggregator metricsAggregator;
+    volatile MetricsAggregator metricsAggregator;
 
-  /** Initial static configuration associated with the tracer. */
-  final Config initialConfig;
+    /** Initial static configuration associated with the tracer. */
+    final Config initialConfig;
 
-  /** Maintains dynamic configuration associated with the tracer */
-  private final DynamicConfig<ConfigSnapshot> dynamicConfig;
+    /** Maintains dynamic configuration associated with the tracer */
+    private final DynamicConfig<ConfigSnapshot> dynamicConfig;
 
-  /**
-   * Tags added only to the application's root span, paired with whether they need interception;
-   * replaced as one immutable holder so a concurrent root span creation never sees a torn read.
-   */
-  private static final class LocalRootSpanTags {
-    final TagMap tags;
-    final boolean needsIntercept;
+    /**
+     * Tags added only to the application's root span, paired with whether they need interception;
+     * replaced as one immutable holder so a concurrent root span creation never sees a torn read.
+     */
+    private static final class LocalRootSpanTags {
+        final TagMap tags;
+        final boolean needsIntercept;
 
-    LocalRootSpanTags(final TagMap tags, final boolean needsIntercept) {
-      this.tags = tags;
-      this.needsIntercept = needsIntercept;
+        LocalRootSpanTags(final TagMap tags, final boolean needsIntercept) {
+            this.tags = tags;
+            this.needsIntercept = needsIntercept;
+        }
     }
-  }
 
-  private volatile LocalRootSpanTags localRootSpanTags;
+    private volatile LocalRootSpanTags localRootSpanTags;
 
-  /**
-   * When {@code false}, every exported span is stamped with the {@code _dd.apm.enabled:0} billing
-   * marker — see {@link #write(SpanList)}.
-   */
-  private final boolean apmTracingEnabled;
-
-  /** A set of tags that are added to every span */
-  private final TagMap defaultSpanTags;
-
-  private final boolean defaultSpanTagsNeedsIntercept;
-
-  /** number of spans in a pending trace before they get flushed */
-  private final int partialFlushMinSpans;
-
-  private final Monitoring performanceMonitoring;
-
-  private final HealthMetrics healthMetrics;
-  private final Recording traceWriteTimer;
-  private final IdGenerationStrategy idGenerationStrategy;
-  private final TraceCollector.Factory traceCollectorFactory;
-  private final DataStreamsMonitoring dataStreamsMonitoring;
-  private final ExternalAgentLauncher externalAgentLauncher;
-  private final boolean disableSamplingMechanismValidation;
-  private final TimeSource timeSource;
-  private final ProfilingContextIntegration profilingContextIntegration;
-  private final boolean injectBaggageAsTags;
-  private final boolean injectLinksAsTags;
-  private final boolean flushOnClose;
-  private final Collection<Runnable> shutdownListeners = new CopyOnWriteArrayList<>();
-
-  /**
-   * JVM shutdown callback, keeping a reference to it to remove this if DDTracer gets destroyed
-   * earlier
-   */
-  private final Thread shutdownCallback;
-
-  /**
-   * Span tag interceptors. This Map is only ever added to during initialization, so it doesn't need
-   * to be concurrent.
-   */
-  private final TagInterceptor tagInterceptor;
-
-  private final TraceInterceptors interceptors = new TraceInterceptors();
-
-  private final boolean logs128bTraceIdEnabled;
-
-  private final InstrumentationGateway instrumentationGateway;
-  private final CallbackProvider callbackProviderAppSec;
-  private final CallbackProvider callbackProviderIast;
-  private final CallbackProvider universalCallbackProvider;
-
-  private final PropagationTags.Factory propagationTagsFactory;
-
-  // DQH - storing into a static constant, so value will constant propagate and dead code eliminate
-  // the other branch in singleSpanBuilder
-  private static final boolean SPAN_BUILDER_REUSE_ENABLED =
-      Config.get().isSpanBuilderReuseEnabled();
-
-  // Instance field (not static final) so it honors per-tracer config, e.g. an embedded tracer
-  // built via CoreTracerBuilder#withProperties/#config rather than the global Config.get()
-  // singleton. See the tag-ordering block in buildSpanContext.
-  private final boolean builderTagsPrecedence;
-
-  // Cache used by buildSpan - instance so it can capture the CoreTracer
-  private final ReusableSingleSpanBuilderThreadLocalCache spanBuilderThreadLocalCache =
-      SPAN_BUILDER_REUSE_ENABLED ? new ReusableSingleSpanBuilderThreadLocalCache(this) : null;
-
-  @Override
-  public ConfigSnapshot captureTraceConfig() {
-    return dynamicConfig.captureTraceConfig();
-  }
-
-  @Override
-  public void updatePreferredServiceName(String serviceName, CharSequence source) {
-    dynamicConfig.current().setPreferredServiceNameAndSource(serviceName, source).apply();
-    ServiceNameCollector.get().addService(serviceName);
-  }
-
-  PropagationTags.Factory getPropagationTagsFactory() {
-    return propagationTagsFactory;
-  }
-
-  /**
-   * Called when a root span is finished before it is serialized. This is might be called multiple
-   * times per root span. If a child span is part of a partial flush, this method will be called for
-   * its root even if not finished.
-   */
-  @Override
-  public void onRootSpanFinished(AgentSpan root, EndpointTracker tracker) {
-    if (!root.isOutbound()) {
-      profilingContextIntegration.onRootSpanFinished(root, tracker);
-    }
-  }
-
-  /**
-   * Called when a root span is finished before it is serialized. This is guaranteed to be called
-   * exactly once per root span.
-   */
-  void onRootSpanPublished(final AgentSpan root) {
-    // Request context is propagated to contexts in child spans.
-    // Assume here that if present it will be so starting in the top span.
-    RequestContext requestContext = root.getRequestContext();
-    if (requestContext != null) {
-      try {
-        requestContext.close();
-      } catch (IOException e) {
-        log.warn("Error closing request context data", e);
-      }
-    }
-  }
-
-  @Override
-  public EndpointTracker onRootSpanStarted(AgentSpan root) {
-    if (!root.isOutbound()) {
-      return profilingContextIntegration.onRootSpanStarted(root);
-    }
-    return null;
-  }
-
-  public static class CoreTracerBuilder {
-
-    private Config config;
-    private String serviceName;
-    private SharedCommunicationObjects sharedCommunicationObjects;
-    private Writer writer;
-    private IdGenerationStrategy idGenerationStrategy;
-    private Sampler sampler;
-    private SingleSpanSampler singleSpanSampler;
-    private HttpCodec.Injector injector;
-    private HttpCodec.Extractor extractor;
-    private TagMap localRootSpanTags;
-    private TagMap defaultSpanTags;
-    private Map<String, String> serviceNameMappings;
-    private Map<String, String> taggedHeaders;
-    private Map<String, String> baggageMapping;
-    private int partialFlushMinSpans;
-    private StatsDClient statsDClient;
-    private HealthMetrics healthMetrics;
-    private TagInterceptor tagInterceptor;
-    private boolean strictTraceWrites;
-    private InstrumentationGateway instrumentationGateway;
-    private ServiceDiscoveryFactory serviceDiscoveryFactory;
-    private TimeSource timeSource;
-    private DataStreamsMonitoring dataStreamsMonitoring;
-    private ProfilingContextIntegration profilingContextIntegration =
-        ProfilingContextIntegration.NoOp.INSTANCE;
-    private boolean reportInTracerFlare;
-    private boolean pollForTracingConfiguration;
-    private boolean injectBaggageAsTags;
-    private boolean injectLinksAsTags;
-    private boolean flushOnClose;
+    /**
+     * When {@code false}, every exported span is stamped with the {@code _dd.apm.enabled:0} billing
+     * marker — see {@link #write(SpanList)}.
+     */
+    private final boolean apmTracingEnabled;
 
-    public CoreTracerBuilder serviceName(String serviceName) {
-      this.serviceName = serviceName;
-      return this;
-    }
+    /** A set of tags that are added to every span */
+    private final TagMap defaultSpanTags;
 
-    public CoreTracerBuilder sharedCommunicationObjects(
-        SharedCommunicationObjects sharedCommunicationObjects) {
-      this.sharedCommunicationObjects = sharedCommunicationObjects;
-      return this;
-    }
+    private final boolean defaultSpanTagsNeedsIntercept;
+
+    /** number of spans in a pending trace before they get flushed */
+    private final int partialFlushMinSpans;
+
+    private final Monitoring performanceMonitoring;
+
+    private final HealthMetrics healthMetrics;
+    private final Recording traceWriteTimer;
+    private final IdGenerationStrategy idGenerationStrategy;
+    private final TraceCollector.Factory traceCollectorFactory;
+    private final DataStreamsMonitoring dataStreamsMonitoring;
+    private final ExternalAgentLauncher externalAgentLauncher;
+    private final boolean disableSamplingMechanismValidation;
+    private final TimeSource timeSource;
+    private final ProfilingContextIntegration profilingContextIntegration;
+    private final boolean injectBaggageAsTags;
+    private final boolean injectLinksAsTags;
+    private final boolean flushOnClose;
+    private final Collection<Runnable> shutdownListeners = new CopyOnWriteArrayList<>();
+
+    /**
+     * JVM shutdown callback, keeping a reference to it to remove this if DDTracer gets destroyed
+     * earlier
+     */
+    private final Thread shutdownCallback;
+
+    /**
+     * Span tag interceptors. This Map is only ever added to during initialization, so it doesn't need
+     * to be concurrent.
+     */
+    private final TagInterceptor tagInterceptor;
+
+    private final TraceInterceptors interceptors = new TraceInterceptors();
+
+    private final boolean logs128bTraceIdEnabled;
+
+    private final InstrumentationGateway instrumentationGateway;
+    private final CallbackProvider callbackProviderAppSec;
+    private final CallbackProvider callbackProviderIast;
+    private final CallbackProvider universalCallbackProvider;
+
+    private final PropagationTags.Factory propagationTagsFactory;
 
-    public CoreTracerBuilder writer(Writer writer) {
-      this.writer = writer;
-      return this;
+    // DQH - storing into a static constant, so value will constant propagate and dead code eliminate
+    // the other branch in singleSpanBuilder
+    private static final boolean SPAN_BUILDER_REUSE_ENABLED = Config.get().isSpanBuilderReuseEnabled();
+
+    // Instance field (not static final) so it honors per-tracer config, e.g. an embedded tracer
+    // built via CoreTracerBuilder#withProperties/#config rather than the global Config.get()
+    // singleton. See the tag-ordering block in buildSpanContext.
+    private final boolean builderTagsPrecedence;
+
+    // Cache used by buildSpan - instance so it can capture the CoreTracer
+    private final ReusableSingleSpanBuilderThreadLocalCache spanBuilderThreadLocalCache =
+            SPAN_BUILDER_REUSE_ENABLED ? new ReusableSingleSpanBuilderThreadLocalCache(this) : null;
+
+    @Override
+    public ConfigSnapshot captureTraceConfig() {
+        return dynamicConfig.captureTraceConfig();
     }
 
-    public CoreTracerBuilder idGenerationStrategy(IdGenerationStrategy idGenerationStrategy) {
-      this.idGenerationStrategy = idGenerationStrategy;
-      return this;
+    @Override
+    public void updatePreferredServiceName(String serviceName, CharSequence source) {
+        dynamicConfig
+                .current()
+                .setPreferredServiceNameAndSource(serviceName, source)
+                .apply();
+        ServiceNameCollector.get().addService(serviceName);
     }
 
-    public CoreTracerBuilder sampler(Sampler sampler) {
-      this.sampler = sampler;
-      return this;
+    PropagationTags.Factory getPropagationTagsFactory() {
+        return propagationTagsFactory;
     }
 
-    public CoreTracerBuilder singleSpanSampler(SingleSpanSampler singleSpanSampler) {
-      this.singleSpanSampler = singleSpanSampler;
-      return this;
+    /**
+     * Called when a root span is finished before it is serialized. This is might be called multiple
+     * times per root span. If a child span is part of a partial flush, this method will be called for
+     * its root even if not finished.
+     */
+    @Override
+    public void onRootSpanFinished(AgentSpan root, EndpointTracker tracker) {
+        if (!root.isOutbound()) {
+            profilingContextIntegration.onRootSpanFinished(root, tracker);
+        }
     }
 
-    public CoreTracerBuilder injector(HttpCodec.Injector injector) {
-      this.injector = injector;
-      return this;
+    /**
+     * Called when a root span is finished before it is serialized. This is guaranteed to be called
+     * exactly once per root span.
+     */
+    void onRootSpanPublished(final AgentSpan root) {
+        // Request context is propagated to contexts in child spans.
+        // Assume here that if present it will be so starting in the top span.
+        RequestContext requestContext = root.getRequestContext();
+        if (requestContext != null) {
+            try {
+                requestContext.close();
+            } catch (IOException e) {
+                log.warn("Error closing request context data", e);
+            }
+        }
     }
 
-    public CoreTracerBuilder extractor(HttpCodec.Extractor extractor) {
-      this.extractor = extractor;
-      return this;
+    @Override
+    public EndpointTracker onRootSpanStarted(AgentSpan root) {
+        if (!root.isOutbound()) {
+            return profilingContextIntegration.onRootSpanStarted(root);
+        }
+        return null;
+    }
+
+    public static class CoreTracerBuilder {
+
+        private Config config;
+        private String serviceName;
+        private SharedCommunicationObjects sharedCommunicationObjects;
+        private Writer writer;
+        private IdGenerationStrategy idGenerationStrategy;
+        private Sampler sampler;
+        private SingleSpanSampler singleSpanSampler;
+        private HttpCodec.Injector injector;
+        private HttpCodec.Extractor extractor;
+        private TagMap localRootSpanTags;
+        private TagMap defaultSpanTags;
+        private Map<String, String> serviceNameMappings;
+        private Map<String, String> taggedHeaders;
+        private Map<String, String> baggageMapping;
+        private int partialFlushMinSpans;
+        private StatsDClient statsDClient;
+        private HealthMetrics healthMetrics;
+        private TagInterceptor tagInterceptor;
+        private boolean strictTraceWrites;
+        private InstrumentationGateway instrumentationGateway;
+        private ServiceDiscoveryFactory serviceDiscoveryFactory;
+        private TimeSource timeSource;
+        private DataStreamsMonitoring dataStreamsMonitoring;
+        private ProfilingContextIntegration profilingContextIntegration = ProfilingContextIntegration.NoOp.INSTANCE;
+        private boolean reportInTracerFlare;
+        private boolean pollForTracingConfiguration;
+        private boolean injectBaggageAsTags;
+        private boolean injectLinksAsTags;
+        private boolean flushOnClose;
+
+        public CoreTracerBuilder serviceName(String serviceName) {
+            this.serviceName = serviceName;
+            return this;
+        }
+
+        public CoreTracerBuilder sharedCommunicationObjects(SharedCommunicationObjects sharedCommunicationObjects) {
+            this.sharedCommunicationObjects = sharedCommunicationObjects;
+            return this;
+        }
+
+        public CoreTracerBuilder writer(Writer writer) {
+            this.writer = writer;
+            return this;
+        }
+
+        public CoreTracerBuilder idGenerationStrategy(IdGenerationStrategy idGenerationStrategy) {
+            this.idGenerationStrategy = idGenerationStrategy;
+            return this;
+        }
+
+        public CoreTracerBuilder sampler(Sampler sampler) {
+            this.sampler = sampler;
+            return this;
+        }
+
+        public CoreTracerBuilder singleSpanSampler(SingleSpanSampler singleSpanSampler) {
+            this.singleSpanSampler = singleSpanSampler;
+            return this;
+        }
+
+        public CoreTracerBuilder injector(HttpCodec.Injector injector) {
+            this.injector = injector;
+            return this;
+        }
+
+        public CoreTracerBuilder extractor(HttpCodec.Extractor extractor) {
+            this.extractor = extractor;
+            return this;
+        }
+
+        public CoreTracerBuilder localRootSpanTags(Map<String, ?> localRootSpanTags) {
+            this.localRootSpanTags = TagMap.fromMapImmutable(localRootSpanTags);
+            return this;
+        }
+
+        public CoreTracerBuilder localRootSpanTags(TagMap tagMap) {
+            this.localRootSpanTags = tagMap.immutableCopy();
+            return this;
+        }
+
+        public CoreTracerBuilder defaultSpanTags(Map<String, ?> defaultSpanTags) {
+            this.defaultSpanTags = TagMap.fromMapImmutable(defaultSpanTags);
+            return this;
+        }
+
+        public CoreTracerBuilder defaultSpanTags(TagMap defaultSpanTags) {
+            this.defaultSpanTags = defaultSpanTags.immutableCopy();
+            return this;
+        }
+
+        public CoreTracerBuilder serviceNameMappings(Map<String, String> serviceNameMappings) {
+            this.serviceNameMappings = tryMakeImmutableMap(serviceNameMappings);
+            return this;
+        }
+
+        public CoreTracerBuilder taggedHeaders(Map<String, String> taggedHeaders) {
+            this.taggedHeaders = tryMakeImmutableMap(taggedHeaders);
+            return this;
+        }
+
+        public CoreTracerBuilder baggageMapping(Map<String, String> baggageMapping) {
+            this.baggageMapping = tryMakeImmutableMap(baggageMapping);
+            return this;
+        }
+
+        public CoreTracerBuilder partialFlushMinSpans(int partialFlushMinSpans) {
+            this.partialFlushMinSpans = partialFlushMinSpans;
+            return this;
+        }
+
+        public CoreTracerBuilder statsDClient(StatsDClient statsDClient) {
+            this.statsDClient = statsDClient;
+            return this;
+        }
+
+        public CoreTracerBuilder tagInterceptor(TagInterceptor tagInterceptor) {
+            this.tagInterceptor = tagInterceptor;
+            return this;
+        }
+
+        public CoreTracerBuilder healthMetrics(HealthMetrics healthMetrics) {
+            this.healthMetrics = healthMetrics;
+            return this;
+        }
+
+        public CoreTracerBuilder strictTraceWrites(boolean strictTraceWrites) {
+            this.strictTraceWrites = strictTraceWrites;
+            return this;
+        }
+
+        public CoreTracerBuilder instrumentationGateway(InstrumentationGateway instrumentationGateway) {
+            this.instrumentationGateway = instrumentationGateway;
+            return this;
+        }
+
+        public CoreTracerBuilder serviceDiscoveryFactory(ServiceDiscoveryFactory serviceDiscoveryFactory) {
+            this.serviceDiscoveryFactory = serviceDiscoveryFactory;
+            return this;
+        }
+
+        public CoreTracerBuilder timeSource(TimeSource timeSource) {
+            this.timeSource = timeSource;
+            return this;
+        }
+
+        public CoreTracerBuilder dataStreamsMonitoring(DataStreamsMonitoring dataStreamsMonitoring) {
+            this.dataStreamsMonitoring = dataStreamsMonitoring;
+            return this;
+        }
+
+        public CoreTracerBuilder profilingContextIntegration(ProfilingContextIntegration profilingContextIntegration) {
+            this.profilingContextIntegration = profilingContextIntegration;
+            return this;
+        }
+
+        public CoreTracerBuilder reportInTracerFlare() {
+            this.reportInTracerFlare = true;
+            return this;
+        }
+
+        public CoreTracerBuilder pollForTracingConfiguration() {
+            this.pollForTracingConfiguration = true;
+            return this;
+        }
+
+        public CoreTracerBuilder injectBaggageAsTags(boolean injectBaggageAsTags) {
+            this.injectBaggageAsTags = injectBaggageAsTags;
+            return this;
+        }
+
+        public CoreTracerBuilder injectLinksAsTags(boolean injectLinksAsTags) {
+            this.injectLinksAsTags = injectLinksAsTags;
+            return this;
+        }
+
+        public CoreTracerBuilder flushOnClose(boolean flushOnClose) {
+            this.flushOnClose = flushOnClose;
+            return this;
+        }
+
+        public CoreTracerBuilder() {
+            // Apply the default values from config.
+            config(Config.get());
+        }
+
+        public CoreTracerBuilder withProperties(final Properties properties) {
+            return config(Config.get(properties));
+        }
+
+        public CoreTracerBuilder config(final Config config) {
+            this.config = config;
+            serviceName(config.getServiceName());
+            // Explicitly skip setting writer to avoid allocating resources prematurely.
+            sampler(Sampler.Builder.forConfig(config, null));
+            singleSpanSampler(SingleSpanSampler.Builder.forConfig(config));
+            instrumentationGateway(new InstrumentationGateway());
+            injector(HttpCodec.createInjector(
+                    config, config.getTracePropagationStylesToInject(), invertMap(config.getBaggageMapping())));
+            // Explicitly skip setting scope manager because it depends on statsDClient
+            localRootSpanTags(config.getLocalRootSpanTags());
+            defaultSpanTags(withTracerTags(config.getMergedSpanTags(), config, null));
+            serviceNameMappings(config.getServiceMapping());
+            taggedHeaders(config.getRequestHeaderTags());
+            baggageMapping(config.getBaggageMapping());
+            partialFlushMinSpans(config.getPartialFlushMinSpans());
+            strictTraceWrites(config.isTraceStrictWritesEnabled());
+            injectBaggageAsTags(config.isInjectBaggageAsTagsEnabled());
+            injectLinksAsTags(config.isInjectLinksAsTagsEnabled());
+            flushOnClose(config.isCiVisibilityEnabled());
+            return this;
+        }
+
+        public CoreTracer build() {
+            return new CoreTracer(
+                    config,
+                    serviceName,
+                    sharedCommunicationObjects,
+                    writer,
+                    idGenerationStrategy,
+                    sampler,
+                    singleSpanSampler,
+                    injector,
+                    extractor,
+                    localRootSpanTags,
+                    defaultSpanTags,
+                    serviceNameMappings,
+                    taggedHeaders,
+                    baggageMapping,
+                    partialFlushMinSpans,
+                    healthMetrics,
+                    tagInterceptor,
+                    strictTraceWrites,
+                    instrumentationGateway,
+                    serviceDiscoveryFactory,
+                    timeSource,
+                    dataStreamsMonitoring,
+                    profilingContextIntegration,
+                    reportInTracerFlare,
+                    pollForTracingConfiguration,
+                    injectBaggageAsTags,
+                    injectLinksAsTags,
+                    flushOnClose);
+        }
     }
 
-    public CoreTracerBuilder localRootSpanTags(Map<String, ?> localRootSpanTags) {
-      this.localRootSpanTags = TagMap.fromMapImmutable(localRootSpanTags);
-      return this;
+    @Deprecated
+    private CoreTracer(
+            final Config config,
+            final String serviceName,
+            SharedCommunicationObjects sharedCommunicationObjects,
+            final Writer writer,
+            final IdGenerationStrategy idGenerationStrategy,
+            final Sampler sampler,
+            final SingleSpanSampler singleSpanSampler,
+            final HttpCodec.Injector injector,
+            final HttpCodec.Extractor extractor,
+            final Map<String, Object> localRootSpanTags,
+            final TagMap defaultSpanTags,
+            final Map<String, String> serviceNameMappings,
+            final Map<String, String> taggedHeaders,
+            final Map<String, String> baggageMapping,
+            final int partialFlushMinSpans,
+            final HealthMetrics healthMetrics,
+            final TagInterceptor tagInterceptor,
+            final boolean strictTraceWrites,
+            final InstrumentationGateway instrumentationGateway,
+            final TimeSource timeSource,
+            final DataStreamsMonitoring dataStreamsMonitoring,
+            final ProfilingContextIntegration profilingContextIntegration,
+            final boolean reportInTracerFlare,
+            final boolean pollForTracingConfiguration,
+            final boolean injectBaggageAsTags,
+            final boolean injectLinksAsTags,
+            final boolean flushOnClose) {
+        this(
+                config,
+                serviceName,
+                sharedCommunicationObjects,
+                writer,
+                idGenerationStrategy,
+                sampler,
+                singleSpanSampler,
+                injector,
+                extractor,
+                TagMap.fromMap(localRootSpanTags),
+                defaultSpanTags,
+                serviceNameMappings,
+                taggedHeaders,
+                baggageMapping,
+                partialFlushMinSpans,
+                healthMetrics,
+                tagInterceptor,
+                strictTraceWrites,
+                instrumentationGateway,
+                null,
+                timeSource,
+                dataStreamsMonitoring,
+                profilingContextIntegration,
+                reportInTracerFlare,
+                pollForTracingConfiguration,
+                injectBaggageAsTags,
+                injectLinksAsTags,
+                flushOnClose);
+    }
+
+    // These field names must be stable to ensure the builder api is stable.
+    private CoreTracer(
+            final Config config,
+            final String serviceName,
+            SharedCommunicationObjects sharedCommunicationObjects,
+            final Writer writer,
+            final IdGenerationStrategy idGenerationStrategy,
+            final Sampler sampler,
+            final SingleSpanSampler singleSpanSampler,
+            final HttpCodec.Injector injector,
+            final HttpCodec.Extractor extractor,
+            final TagMap localRootSpanTags,
+            final TagMap defaultSpanTags,
+            final Map<String, String> serviceNameMappings,
+            final Map<String, String> taggedHeaders,
+            final Map<String, String> baggageMapping,
+            final int partialFlushMinSpans,
+            final HealthMetrics healthMetrics,
+            final TagInterceptor tagInterceptor,
+            final boolean strictTraceWrites,
+            final InstrumentationGateway instrumentationGateway,
+            final ServiceDiscoveryFactory serviceDiscoveryFactory,
+            final TimeSource timeSource,
+            final DataStreamsMonitoring dataStreamsMonitoring,
+            final ProfilingContextIntegration profilingContextIntegration,
+            final boolean reportInTracerFlare,
+            final boolean pollForTracingConfiguration,
+            final boolean injectBaggageAsTags,
+            final boolean injectLinksAsTags,
+            final boolean flushOnClose) {
+
+        assert localRootSpanTags != null;
+        assert defaultSpanTags != null;
+        assert serviceNameMappings != null;
+        assert taggedHeaders != null;
+        assert baggageMapping != null;
+
+        // preload this enum to avoid triggering classloading on the hot path
+        TraceCollector.PublishState.values();
+
+        if (reportInTracerFlare) {
+            TracerFlare.addReporter(this);
+        }
+        this.timeSource = timeSource == null ? SystemTimeSource.INSTANCE : timeSource;
+        startTimeNano = this.timeSource.getCurrentTimeNanos();
+        startNanoTicks = this.timeSource.getNanoTicks();
+        clockSyncPeriod = Math.max(1_000_000L, SECONDS.toNanos(config.getClockSyncPeriod()));
+        lastSyncTicks = startNanoTicks;
+
+        this.serviceName = serviceName;
+
+        this.initialConfig = config;
+        this.apmTracingEnabled = config.isApmTracingEnabled();
+        this.initialSampler = sampler;
+        this.agentSampler = sampler.agentSampler();
+
+        // Get initial Trace Sampling Rules from config
+        String traceSamplingRulesJson = config.getTraceSamplingRules();
+        TraceSamplingRules traceSamplingRules;
+        if (traceSamplingRulesJson == null) {
+            traceSamplingRulesJson = "[]";
+            traceSamplingRules = TraceSamplingRules.EMPTY;
+        } else {
+            traceSamplingRules = TraceSamplingRules.deserialize(traceSamplingRulesJson);
+        }
+
+        DataStreamsTransactionExtractors dataStreamsTransactionExtractors;
+        String dataStreamsTransactionExtractorsJson = config.getDataStreamsTransactionExtractors();
+        if (dataStreamsTransactionExtractorsJson == null) {
+            dataStreamsTransactionExtractors = DataStreamsTransactionExtractors.EMPTY;
+        } else {
+            dataStreamsTransactionExtractors =
+                    DataStreamsTransactionExtractors.deserialize(dataStreamsTransactionExtractorsJson);
+        }
+
+        // Get initial Span Sampling Rules from config
+        String spanSamplingRulesJson = config.getSpanSamplingRules();
+        String spanSamplingRulesFile = config.getSpanSamplingRulesFile();
+        SpanSamplingRules spanSamplingRules = SpanSamplingRules.EMPTY;
+        if (spanSamplingRulesJson != null) {
+            spanSamplingRules = SpanSamplingRules.deserialize(spanSamplingRulesJson);
+        } else if (spanSamplingRulesFile != null) {
+            spanSamplingRules = SpanSamplingRules.deserializeFile(spanSamplingRulesFile);
+        }
+
+        this.tagInterceptor = null == tagInterceptor ? new TagInterceptor(new RuleFlags(config)) : tagInterceptor;
+
+        this.defaultSpanTags = defaultSpanTags;
+        this.defaultSpanTagsNeedsIntercept = this.tagInterceptor.needsIntercept(this.defaultSpanTags);
+
+        this.dynamicConfig = DynamicConfig.create(ConfigSnapshot::new)
+                .setTracingEnabled(true) // implied by installation of CoreTracer
+                .setRuntimeMetricsEnabled(config.isRuntimeMetricsEnabled())
+                .setLogsInjectionEnabled(config.isLogsInjectionEnabled())
+                .setDataStreamsEnabled(config.isDataStreamsEnabled())
+                .setServiceMapping(serviceNameMappings)
+                .setHeaderTags(taggedHeaders)
+                .setBaggageMapping(baggageMapping)
+                .setTraceSampleRate(config.getTraceSampleRate())
+                .setSpanSamplingRules(spanSamplingRules.getRules())
+                .setTraceSamplingRules(traceSamplingRules.getRules(), traceSamplingRulesJson)
+                .setTracingTags(config.getMergedSpanTags())
+                .setDataStreamsTransactionExtractors(dataStreamsTransactionExtractors.getExtractors())
+                .apply();
+
+        this.logs128bTraceIdEnabled = Config.get().isLogs128bitTraceIdEnabled();
+        this.partialFlushMinSpans = partialFlushMinSpans;
+        this.idGenerationStrategy =
+                null == idGenerationStrategy ? Config.get().getIdGenerationStrategy() : idGenerationStrategy;
+
+        this.healthMetrics = healthMetrics != null
+                ? healthMetrics
+                : (config.isHealthMetricsEnabled()
+                        ? new TracerHealthMetrics(AgentMeter.statsDClient())
+                        : HealthMetrics.NO_OP);
+        this.healthMetrics.start();
+
+        performanceMonitoring = config.isPerfMetricsEnabled() ? AgentMeter.monitoring() : Monitoring.DISABLED;
+
+        traceWriteTimer = performanceMonitoring.newThreadLocalTimer("trace.write");
+
+        scopeManager = new ContinuableScopeManager(
+                config.getScopeDepthLimit(),
+                config.isScopeStrictMode(),
+                profilingContextIntegration,
+                this.healthMetrics);
+
+        externalAgentLauncher = new ExternalAgentLauncher(config);
+
+        disableSamplingMechanismValidation = config.isSamplingMechanismValidationDisabled();
+
+        if (sharedCommunicationObjects == null) {
+            sharedCommunicationObjects = new SharedCommunicationObjects();
+        }
+        sharedCommunicationObjects.monitoring = AgentMeter.monitoring();
+        sharedCommunicationObjects.createRemaining(config);
+
+        tracingConfigPoller = new TracingConfigPoller(dynamicConfig);
+        if (pollForTracingConfiguration) {
+            tracingConfigPoller.start(config, sharedCommunicationObjects);
+        }
+
+        if (writer == null) {
+            this.writer = WriterFactory.createWriter(
+                    config, sharedCommunicationObjects, sampler, singleSpanSampler, this.healthMetrics);
+        } else {
+            this.writer = writer;
+        }
+
+        DDAgentFeaturesDiscovery featuresDiscovery = sharedCommunicationObjects.featuresDiscovery(config);
+        if (config.isCiVisibilityEnabled()) {
+            // ensure updated discovery and sync if the another discovery currently being done
+            featuresDiscovery.discoverIfOutdated();
+        }
+
+        boolean payloadFilesEnabled =
+                config.isCiVisibilityEnabled() && BazelMode.get().isPayloadFilesEnabled();
+        if (config.isCiVisibilityEnabled()
+                && (config.isCiVisibilityAgentlessEnabled()
+                        || payloadFilesEnabled
+                        || featuresDiscovery.supportsEvpProxy())) {
+            pendingTraceBuffer = PendingTraceBuffer.discarding();
+            traceCollectorFactory = new StreamingTraceCollector.Factory(this, this.timeSource, this.healthMetrics);
+        } else {
+            pendingTraceBuffer = strictTraceWrites
+                    ? PendingTraceBuffer.discarding()
+                    : PendingTraceBuffer.delaying(
+                            this.timeSource, config, sharedCommunicationObjects, this.healthMetrics);
+            traceCollectorFactory = new PendingTrace.Factory(
+                    this, pendingTraceBuffer, this.timeSource, strictTraceWrites, this.healthMetrics);
+        }
+        pendingTraceBuffer.start();
+
+        sharedCommunicationObjects.whenReady(this.writer::start);
+        // temporary assign a no-op instance. The final one will be resolved when the discovery will be
+        // allowed
+        metricsAggregator = NoOpMetricsAggregator.INSTANCE;
+        final SharedCommunicationObjects sco = sharedCommunicationObjects;
+        // asynchronously create these aggregator/export components to avoid triggering
+        // expensive classloading during the tracer initialisation.
+        sharedCommunicationObjects.whenReady(() -> AgentTaskScheduler.get().execute(() -> {
+            startMetricsAggregation(config, sco);
+            maybeStartLogsExport(config);
+        }));
+
+        if (dataStreamsMonitoring == null) {
+            // Avoid DSM in bazel hermetic mode
+            this.dataStreamsMonitoring = payloadFilesEnabled
+                    ? DisabledDataStreamsMonitoring.INSTANCE
+                    : new DefaultDataStreamsMonitoring(
+                            config, sharedCommunicationObjects, this.timeSource, this::captureTraceConfig);
+        } else {
+            this.dataStreamsMonitoring = dataStreamsMonitoring;
+        }
+
+        sharedCommunicationObjects.whenReady(this.dataStreamsMonitoring::start);
+
+        propagationTagsFactory = PropagationTags.factory(config);
+
+        builderTagsPrecedence = config.isTraceBuilderTagsPrecedenceEnabled();
+
+        // Register context propagators
+        HttpCodec.Extractor baseExtractor =
+                extractor == null ? HttpCodec.createExtractor(config, this::captureTraceConfig) : extractor;
+        OrgGuard orgGuard = OrgGuard.create(
+                config, featuresDiscovery::getOrgPropagationMarker, propagationTagsFactory, this.healthMetrics);
+        HttpCodec.Extractor tracingExtractor = orgGuard.decorateExtractor(baseExtractor);
+        HttpCodec.Injector tracingInjector = orgGuard.decorateInjector(injector);
+        TracingPropagator tracingPropagator =
+                new TracingPropagator(config.isApmTracingEnabled(), tracingInjector, tracingExtractor);
+        Propagators.register(TRACING_CONCERN, tracingPropagator);
+        Propagators.register(XRAY_TRACING_CONCERN, new XRayPropagator(config), false);
+        if (config.isDataStreamsEnabled()) {
+            Propagators.register(DSM_CONCERN, this.dataStreamsMonitoring.propagator());
+        }
+        if (config.isBaggagePropagationEnabled() && config.getTracePropagationBehaviorExtract() != IGNORE) {
+            Propagators.register(BAGGAGE_CONCERN, new BaggagePropagator(config));
+        }
+        if (config.isInferredProxyPropagationEnabled()) {
+            Propagators.register(INFERRED_PROXY_CONCERN, new InferredProxyPropagator());
+        }
+
+        if (config.isCiVisibilityEnabled()) {
+            if (config.isCiVisibilityTraceSanitationEnabled()) {
+                addTraceInterceptor(CiVisibilityTraceInterceptor.INSTANCE);
+            }
+
+            if (config.isCiVisibilityAgentlessEnabled() || BazelMode.get().isPayloadFilesEnabled()) {
+                addTraceInterceptor(DDIntakeTraceInterceptor.INSTANCE);
+            } else {
+                featuresDiscovery.discoverIfOutdated();
+                if (!featuresDiscovery.supportsEvpProxy()) {
+                    // CI Test Cycle protocol is not available
+                    addTraceInterceptor(CiVisibilityApmProtocolInterceptor.INSTANCE);
+                }
+            }
+
+            if (config.isCiVisibilityTelemetryEnabled()) {
+                addTraceInterceptor(new CiVisibilityTelemetryInterceptor());
+            }
+        }
+
+        if (config.isTraceGitMetadataEnabled()) {
+            addTraceInterceptor(GitMetadataTraceInterceptor.INSTANCE);
+        }
+
+        if (config.isTraceKeepLatencyThresholdEnabled()) {
+            addTraceInterceptor(LatencyTraceInterceptor.INSTANCE);
+        }
+
+        this.instrumentationGateway = instrumentationGateway;
+        callbackProviderAppSec = instrumentationGateway.getCallbackProvider(RequestContextSlot.APPSEC);
+        callbackProviderIast = instrumentationGateway.getCallbackProvider(RequestContextSlot.IAST);
+        universalCallbackProvider = instrumentationGateway.getUniversalCallbackProvider();
+
+        shutdownCallback = new ShutdownHook(this);
+        try {
+            Runtime.getRuntime().addShutdownHook(shutdownCallback);
+        } catch (final IllegalStateException ex) {
+            // The JVM is already shutting down.
+        }
+
+        registerClassLoader(ClassLoader.getSystemClassLoader());
+
+        StatusLogger.logStatus(config);
+
+        this.profilingContextIntegration = profilingContextIntegration;
+        this.injectBaggageAsTags = injectBaggageAsTags;
+        this.injectLinksAsTags = injectLinksAsTags;
+        this.flushOnClose = flushOnClose;
+        this.allowInferredServices = SpanNaming.instance().namingSchema().allowInferredServices();
+        final TagMap frozenLocalRootSpanTags = TagMap.fromMapImmutable(localRootSpanTags);
+        this.localRootSpanTags = new LocalRootSpanTags(
+                frozenLocalRootSpanTags, this.tagInterceptor.needsIntercept(frozenLocalRootSpanTags));
+        if (profilingContextIntegration != ProfilingContextIntegration.NoOp.INSTANCE) {
+            // Deferred integrations run this later (or never, if construction fails).
+            profilingContextIntegration.whenAvailable(this::stampProfilingContextEngine);
+        }
+        if (serviceDiscoveryFactory != null) {
+            AgentTaskScheduler.get()
+                    .schedule(
+                            () -> {
+                                final ServiceDiscovery serviceDiscovery = serviceDiscoveryFactory.get();
+                                if (serviceDiscovery != null) {
+                                    // JNA can do ldconfig and other commands. Those are hidden since internal.
+                                    try (final TraceScope blackhole = muteTracing()) {
+                                        serviceDiscovery.writeTracerMetadata(config);
+                                    }
+                                }
+                            },
+                            1,
+                            SECONDS);
+        }
     }
 
-    public CoreTracerBuilder localRootSpanTags(TagMap tagMap) {
-      this.localRootSpanTags = tagMap.immutableCopy();
-      return this;
+    /**
+     * Adds the profiling context engine tag to {@link #localRootSpanTags}; runs at most once per
+     * tracer.
+     */
+    private void stampProfilingContextEngine() {
+        TagMap tags = TagMap.fromMap(this.localRootSpanTags.tags);
+        tags.set(PROFILING_CONTEXT_ENGINE, this.profilingContextIntegration.name());
+        TagMap frozenTags = tags.freeze();
+        this.localRootSpanTags = new LocalRootSpanTags(frozenTags, this.tagInterceptor.needsIntercept(frozenTags));
+    }
+
+    private void startMetricsAggregation(Config config, SharedCommunicationObjects sco) {
+        metricsAggregator = createMetricsAggregator(config, sco, this.healthMetrics);
+        // Schedule the metrics aggregator to begin reporting after a random delay of
+        // 1 to 10 seconds (using milliseconds granularity.)
+        // This avoids a fleet of traced applications starting at the same time from
+        // sending metrics in sync.
+        AgentTaskScheduler.get().scheduleWithJitter(MetricsAggregator::start, metricsAggregator, 1, SECONDS);
+
+        if (config.isMetricsOtlpExporterEnabled()) {
+            OtlpMetricsService.INSTANCE.start();
+        }
     }
 
-    public CoreTracerBuilder defaultSpanTags(Map<String, ?> defaultSpanTags) {
-      this.defaultSpanTags = TagMap.fromMapImmutable(defaultSpanTags);
-      return this;
+    private void maybeStartLogsExport(Config config) {
+        if (config.isLogsOtlpExporterEnabled()) {
+            OtlpLogsService.INSTANCE.start();
+        }
     }
 
-    public CoreTracerBuilder defaultSpanTags(TagMap defaultSpanTags) {
-      this.defaultSpanTags = defaultSpanTags.immutableCopy();
-      return this;
+    /** Used by AgentTestRunner to inject configuration into the test tracer. */
+    public void rebuildTraceConfig(Config config) {
+        dynamicConfig
+                .initial()
+                .setTracingEnabled(true) // implied by installation of CoreTracer
+                .setRuntimeMetricsEnabled(config.isRuntimeMetricsEnabled())
+                .setLogsInjectionEnabled(config.isLogsInjectionEnabled())
+                .setDataStreamsEnabled(config.isDataStreamsEnabled())
+                .setServiceMapping(config.getServiceMapping())
+                .setHeaderTags(config.getRequestHeaderTags())
+                .setBaggageMapping(config.getBaggageMapping())
+                .setTraceSampleRate(config.getTraceSampleRate())
+                .setTracingTags(config.getGlobalTags())
+                .apply();
     }
 
-    public CoreTracerBuilder serviceNameMappings(Map<String, String> serviceNameMappings) {
-      this.serviceNameMappings = tryMakeImmutableMap(serviceNameMappings);
-      return this;
+    @Override
+    protected void finalize() {
+        if (null != shutdownCallback) {
+            try {
+                shutdownCallback.run();
+                Runtime.getRuntime().removeShutdownHook(shutdownCallback);
+            } catch (final IllegalStateException e) {
+                // Do nothing.  Already shutting down
+            } catch (final Exception e) {
+                log.error("Error while finalizing DDTracer.", e);
+            }
+        }
     }
 
-    public CoreTracerBuilder taggedHeaders(Map<String, String> taggedHeaders) {
-      this.taggedHeaders = tryMakeImmutableMap(taggedHeaders);
-      return this;
+    /**
+     * Only visible for benchmarking purposes
+     *
+     * @return a PendingTrace
+     */
+    public TraceCollector createTraceCollector(DDTraceId id) {
+        return traceCollectorFactory.create(id);
     }
 
-    public CoreTracerBuilder baggageMapping(Map<String, String> baggageMapping) {
-      this.baggageMapping = tryMakeImmutableMap(baggageMapping);
-      return this;
+    TraceCollector createTraceCollector(DDTraceId id, ConfigSnapshot traceConfig) {
+        return traceCollectorFactory.create(id, traceConfig);
     }
 
-    public CoreTracerBuilder partialFlushMinSpans(int partialFlushMinSpans) {
-      this.partialFlushMinSpans = partialFlushMinSpans;
-      return this;
+    /**
+     * If an application is using a non-system classloader, that classloader should be registered
+     * here. Due to the way Spring Boot structures its' executable jar, this might log some warnings.
+     *
+     * @param classLoader to register.
+     */
+    private void registerClassLoader(final ClassLoader classLoader) {
+        try {
+            for (final TraceInterceptor interceptor : ServiceLoader.load(TraceInterceptor.class, classLoader)) {
+                addTraceInterceptor(interceptor);
+            }
+        } catch (final ServiceConfigurationError e) {
+            log.warn("Problem loading TraceInterceptor for classLoader: {}", classLoader, e);
+        }
     }
 
-    public CoreTracerBuilder statsDClient(StatsDClient statsDClient) {
-      this.statsDClient = statsDClient;
-      return this;
+    /**
+     * Timestamp in nanoseconds for the current {@code nanoTicks}.
+     *
+     * <p>Note: it is not possible to get 'real' nanosecond time. This method uses tracer start time
+     * (with millisecond precision) as a reference and applies relative time with nanosecond precision
+     * after that. This means time measured with same Tracer in different Spans is relatively correct
+     * with nanosecond precision.
+     *
+     * @param nanoTicks as returned by {@link TimeSource#getNanoTicks()}
+     * @return timestamp in nanoseconds
+     */
+    long getTimeWithNanoTicks(long nanoTicks) {
+        long computedNanoTime = startTimeNano + Math.max(0, nanoTicks - startNanoTicks);
+        if (nanoTicks - lastSyncTicks >= clockSyncPeriod) {
+            correctCounterDrift(computedNanoTime);
+            lastSyncTicks = nanoTicks;
+        }
+        return computedNanoTime + counterDrift;
     }
 
-    public CoreTracerBuilder tagInterceptor(TagInterceptor tagInterceptor) {
-      this.tagInterceptor = tagInterceptor;
-      return this;
+    /**
+     * Computes {@link #counterDrift} corrected against {@code computedNanoTime}, gated by a 1ms
+     * threshold to avoid regressing the clock on {@link SystemTimeSource}'s millisecond precision.
+     */
+    private void correctCounterDrift(long computedNanoTime) {
+        long drift = computedNanoTime - timeSource.getCurrentTimeNanos();
+        if (Math.abs(drift + counterDrift) >= 1_000_000L) { // allow up to 1ms of drift
+            counterDrift = -MILLISECONDS.toNanos(NANOSECONDS.toMillis(drift));
+        }
     }
 
-    public CoreTracerBuilder healthMetrics(HealthMetrics healthMetrics) {
-      this.healthMetrics = healthMetrics;
-      return this;
+    /**
+     * AWS Lambda SnapStart restores a checkpointed JVM, potentially hours or days later, without
+     * {@link System#nanoTime()} accounting for the frozen duration. That can leave the computed time
+     * stale for longer than {@link #getTimeWithNanoTicks}'s periodic self-correction can catch, as
+     * that's gated on ticks elapsed rather than wall-clock time. Called once per Lambda invocation,
+     * before any span for it is created, so it's a cheap no-op outside SnapStart.
+     *
+     * <p>Gated on {@link Config#isLambdaSnapStartClockResyncEnabled()} as an escape hatch.
+     */
+    @VisibleForTesting
+    void maybeResyncClockForLambdaInvocation() {
+        if (!initialConfig.isLambdaSnapStartClockResyncEnabled()) {
+            return;
+        }
+        long nanoTicks = timeSource.getNanoTicks();
+        long computedNanoTime = startTimeNano + Math.max(0, nanoTicks - startNanoTicks);
+        correctCounterDrift(computedNanoTime);
+        lastSyncTicks = nanoTicks;
     }
 
-    public CoreTracerBuilder strictTraceWrites(boolean strictTraceWrites) {
-      this.strictTraceWrites = strictTraceWrites;
-      return this;
+    @Override
+    public CoreSpanBuilder buildSpan(final String instrumentationName, final CharSequence operationName) {
+        return createMultiSpanBuilder(instrumentationName, operationName);
     }
 
-    public CoreTracerBuilder instrumentationGateway(InstrumentationGateway instrumentationGateway) {
-      this.instrumentationGateway = instrumentationGateway;
-      return this;
+    /**
+     * Seeds identity (instrumentation name, operation, span type) and constant tags from a prototype.
+     * {@code operationName} overrides the prototype's when non-null — the explicit value wins, the
+     * prototype is the fallback. The prototype's tags are seeded during {@link CoreSpanBuilder}
+     * construction just before the builder's own tags, so explicit tags override prototype constants.
+     */
+    @Override
+    public CoreSpanBuilder buildSpan(@Nonnull final SpanPrototype prototype, CharSequence operationName) {
+        if (operationName == null) {
+            operationName = prototype.operationName();
+        }
+        CoreSpanBuilder builder = createMultiSpanBuilder(prototype.instrumentationName(), operationName);
+        builder.spanPrototype = prototype;
+        if (prototype.spanType() != null) {
+            builder.spanType = prototype.spanType();
+        }
+        return builder;
     }
 
-    public CoreTracerBuilder serviceDiscoveryFactory(
-        ServiceDiscoveryFactory serviceDiscoveryFactory) {
-      this.serviceDiscoveryFactory = serviceDiscoveryFactory;
-      return this;
+    MultiSpanBuilder createMultiSpanBuilder(final String instrumentationName, final CharSequence operationName) {
+        return new MultiSpanBuilder(this, instrumentationName, operationName);
     }
 
-    public CoreTracerBuilder timeSource(TimeSource timeSource) {
-      this.timeSource = timeSource;
-      return this;
+    @Override
+    public CoreSpanBuilder singleSpanBuilder(final String instrumentationName, final CharSequence operationName) {
+        return SPAN_BUILDER_REUSE_ENABLED
+                ? reuseSingleSpanBuilder(instrumentationName, operationName)
+                : createMultiSpanBuilder(instrumentationName, operationName);
     }
 
-    public CoreTracerBuilder dataStreamsMonitoring(DataStreamsMonitoring dataStreamsMonitoring) {
-      this.dataStreamsMonitoring = dataStreamsMonitoring;
-      return this;
+    ReusableSingleSpanBuilder createSingleSpanBuilder(
+            final String instrumentationName, final CharSequence oprationName) {
+        ReusableSingleSpanBuilder singleSpanBuilder = new ReusableSingleSpanBuilder(this);
+        singleSpanBuilder.init(instrumentationName, oprationName);
+        return singleSpanBuilder;
     }
 
-    public CoreTracerBuilder profilingContextIntegration(
-        ProfilingContextIntegration profilingContextIntegration) {
-      this.profilingContextIntegration = profilingContextIntegration;
-      return this;
+    CoreSpanBuilder reuseSingleSpanBuilder(final String instrumentationName, final CharSequence operationName) {
+        return reuseSingleSpanBuilder(this, spanBuilderThreadLocalCache, instrumentationName, operationName);
     }
 
-    public CoreTracerBuilder reportInTracerFlare() {
-      this.reportInTracerFlare = true;
-      return this;
+    static final ReusableSingleSpanBuilder reuseSingleSpanBuilder(
+            final CoreTracer tracer,
+            final ReusableSingleSpanBuilderThreadLocalCache tlCache,
+            final String instrumentationName,
+            final CharSequence operationName) {
+        if (ThreadSupport.isVirtual()) {
+            // Since virtual threads are created and destroyed often,
+            // cautiously decided not to create a thread local for the virtual threads.
+
+            // TODO: This could probably be improved by having a single thread local that
+            // holds the core things that we need for tracing.  e.g. context, etc
+            return tracer.createSingleSpanBuilder(instrumentationName, operationName);
+        }
+
+        // retrieve the thread's typical SpanBuilder and try to reset it
+        // reset will fail if the ReusableSingleSpanBuilder is still "in-use"
+        ReusableSingleSpanBuilder tlSpanBuilder = tlCache.get();
+        boolean wasReset = tlSpanBuilder.reset(instrumentationName, operationName);
+        if (wasReset) return tlSpanBuilder;
+
+        // TODO: counter for how often the fallback is used?
+        ReusableSingleSpanBuilder newSpanBuilder = tracer.createSingleSpanBuilder(instrumentationName, operationName);
+
+        // DQH - Debated how best to handle the case of someone requesting a SpanBuilder
+        // and then not using it.  Without the ability to replace the cached SpanBuilder,
+        // that case could result in permanently burning the cache for a given thread.
+
+        // That could be solved with additional logic during ReusableSingleSpanBuilder#start
+        // that checks to see if the cached Builder is in use and then replaces it
+        // with the freed Builder, but that would put extra logic in the common path.
+
+        // Instead of making the release process more complicated, I'm chosing to just
+        // override here when we know we're already in an uncommon path.
+        tlCache.set(newSpanBuilder);
+
+        return newSpanBuilder;
     }
 
-    public CoreTracerBuilder pollForTracingConfiguration() {
-      this.pollForTracingConfiguration = true;
-      return this;
+    @Override
+    public AgentSpan startSpan(final String instrumentationName, final CharSequence spanName) {
+        return CoreSpanBuilder.startSpan(
+                this,
+                instrumentationName,
+                spanName,
+                null,
+                CoreSpanBuilder.USE_SCOPE,
+                CoreSpanBuilder.AUTO_ASSIGN_TIMESTAMP);
     }
 
-    public CoreTracerBuilder injectBaggageAsTags(boolean injectBaggageAsTags) {
-      this.injectBaggageAsTags = injectBaggageAsTags;
-      return this;
+    @Override
+    public AgentSpan startSpan(
+            final String instrumentationName, final CharSequence spanName, final long startTimeMicros) {
+        return CoreSpanBuilder.startSpan(
+                this, instrumentationName, spanName, null, CoreSpanBuilder.USE_SCOPE, startTimeMicros);
     }
 
-    public CoreTracerBuilder injectLinksAsTags(boolean injectLinksAsTags) {
-      this.injectLinksAsTags = injectLinksAsTags;
-      return this;
+    @Override
+    public AgentSpan startSpan(String instrumentationName, final CharSequence spanName, final AgentSpanContext parent) {
+        return CoreSpanBuilder.startSpan(
+                this,
+                instrumentationName,
+                spanName,
+                parent,
+                CoreSpanBuilder.IGNORE_SCOPE,
+                CoreSpanBuilder.AUTO_ASSIGN_TIMESTAMP);
     }
 
-    public CoreTracerBuilder flushOnClose(boolean flushOnClose) {
-      this.flushOnClose = flushOnClose;
-      return this;
-    }
-
-    public CoreTracerBuilder() {
-      // Apply the default values from config.
-      config(Config.get());
-    }
-
-    public CoreTracerBuilder withProperties(final Properties properties) {
-      return config(Config.get(properties));
-    }
-
-    public CoreTracerBuilder config(final Config config) {
-      this.config = config;
-      serviceName(config.getServiceName());
-      // Explicitly skip setting writer to avoid allocating resources prematurely.
-      sampler(Sampler.Builder.forConfig(config, null));
-      singleSpanSampler(SingleSpanSampler.Builder.forConfig(config));
-      instrumentationGateway(new InstrumentationGateway());
-      injector(
-          HttpCodec.createInjector(
-              config,
-              config.getTracePropagationStylesToInject(),
-              invertMap(config.getBaggageMapping())));
-      // Explicitly skip setting scope manager because it depends on statsDClient
-      localRootSpanTags(config.getLocalRootSpanTags());
-      defaultSpanTags(withTracerTags(config.getMergedSpanTags(), config, null));
-      serviceNameMappings(config.getServiceMapping());
-      taggedHeaders(config.getRequestHeaderTags());
-      baggageMapping(config.getBaggageMapping());
-      partialFlushMinSpans(config.getPartialFlushMinSpans());
-      strictTraceWrites(config.isTraceStrictWritesEnabled());
-      injectBaggageAsTags(config.isInjectBaggageAsTagsEnabled());
-      injectLinksAsTags(config.isInjectLinksAsTagsEnabled());
-      flushOnClose(config.isCiVisibilityEnabled());
-      return this;
-    }
-
-    public CoreTracer build() {
-      return new CoreTracer(
-          config,
-          serviceName,
-          sharedCommunicationObjects,
-          writer,
-          idGenerationStrategy,
-          sampler,
-          singleSpanSampler,
-          injector,
-          extractor,
-          localRootSpanTags,
-          defaultSpanTags,
-          serviceNameMappings,
-          taggedHeaders,
-          baggageMapping,
-          partialFlushMinSpans,
-          healthMetrics,
-          tagInterceptor,
-          strictTraceWrites,
-          instrumentationGateway,
-          serviceDiscoveryFactory,
-          timeSource,
-          dataStreamsMonitoring,
-          profilingContextIntegration,
-          reportInTracerFlare,
-          pollForTracingConfiguration,
-          injectBaggageAsTags,
-          injectLinksAsTags,
-          flushOnClose);
-    }
-  }
-
-  @Deprecated
-  private CoreTracer(
-      final Config config,
-      final String serviceName,
-      SharedCommunicationObjects sharedCommunicationObjects,
-      final Writer writer,
-      final IdGenerationStrategy idGenerationStrategy,
-      final Sampler sampler,
-      final SingleSpanSampler singleSpanSampler,
-      final HttpCodec.Injector injector,
-      final HttpCodec.Extractor extractor,
-      final Map<String, Object> localRootSpanTags,
-      final TagMap defaultSpanTags,
-      final Map<String, String> serviceNameMappings,
-      final Map<String, String> taggedHeaders,
-      final Map<String, String> baggageMapping,
-      final int partialFlushMinSpans,
-      final HealthMetrics healthMetrics,
-      final TagInterceptor tagInterceptor,
-      final boolean strictTraceWrites,
-      final InstrumentationGateway instrumentationGateway,
-      final TimeSource timeSource,
-      final DataStreamsMonitoring dataStreamsMonitoring,
-      final ProfilingContextIntegration profilingContextIntegration,
-      final boolean reportInTracerFlare,
-      final boolean pollForTracingConfiguration,
-      final boolean injectBaggageAsTags,
-      final boolean injectLinksAsTags,
-      final boolean flushOnClose) {
-    this(
-        config,
-        serviceName,
-        sharedCommunicationObjects,
-        writer,
-        idGenerationStrategy,
-        sampler,
-        singleSpanSampler,
-        injector,
-        extractor,
-        TagMap.fromMap(localRootSpanTags),
-        defaultSpanTags,
-        serviceNameMappings,
-        taggedHeaders,
-        baggageMapping,
-        partialFlushMinSpans,
-        healthMetrics,
-        tagInterceptor,
-        strictTraceWrites,
-        instrumentationGateway,
-        null,
-        timeSource,
-        dataStreamsMonitoring,
-        profilingContextIntegration,
-        reportInTracerFlare,
-        pollForTracingConfiguration,
-        injectBaggageAsTags,
-        injectLinksAsTags,
-        flushOnClose);
-  }
-
-  // These field names must be stable to ensure the builder api is stable.
-  private CoreTracer(
-      final Config config,
-      final String serviceName,
-      SharedCommunicationObjects sharedCommunicationObjects,
-      final Writer writer,
-      final IdGenerationStrategy idGenerationStrategy,
-      final Sampler sampler,
-      final SingleSpanSampler singleSpanSampler,
-      final HttpCodec.Injector injector,
-      final HttpCodec.Extractor extractor,
-      final TagMap localRootSpanTags,
-      final TagMap defaultSpanTags,
-      final Map<String, String> serviceNameMappings,
-      final Map<String, String> taggedHeaders,
-      final Map<String, String> baggageMapping,
-      final int partialFlushMinSpans,
-      final HealthMetrics healthMetrics,
-      final TagInterceptor tagInterceptor,
-      final boolean strictTraceWrites,
-      final InstrumentationGateway instrumentationGateway,
-      final ServiceDiscoveryFactory serviceDiscoveryFactory,
-      final TimeSource timeSource,
-      final DataStreamsMonitoring dataStreamsMonitoring,
-      final ProfilingContextIntegration profilingContextIntegration,
-      final boolean reportInTracerFlare,
-      final boolean pollForTracingConfiguration,
-      final boolean injectBaggageAsTags,
-      final boolean injectLinksAsTags,
-      final boolean flushOnClose) {
-
-    assert localRootSpanTags != null;
-    assert defaultSpanTags != null;
-    assert serviceNameMappings != null;
-    assert taggedHeaders != null;
-    assert baggageMapping != null;
-
-    // preload this enum to avoid triggering classloading on the hot path
-    TraceCollector.PublishState.values();
-
-    if (reportInTracerFlare) {
-      TracerFlare.addReporter(this);
-    }
-    this.timeSource = timeSource == null ? SystemTimeSource.INSTANCE : timeSource;
-    startTimeNano = this.timeSource.getCurrentTimeNanos();
-    startNanoTicks = this.timeSource.getNanoTicks();
-    clockSyncPeriod = Math.max(1_000_000L, SECONDS.toNanos(config.getClockSyncPeriod()));
-    lastSyncTicks = startNanoTicks;
-
-    this.serviceName = serviceName;
-
-    this.initialConfig = config;
-    this.apmTracingEnabled = config.isApmTracingEnabled();
-    this.initialSampler = sampler;
-    this.agentSampler = sampler.agentSampler();
-
-    // Get initial Trace Sampling Rules from config
-    String traceSamplingRulesJson = config.getTraceSamplingRules();
-    TraceSamplingRules traceSamplingRules;
-    if (traceSamplingRulesJson == null) {
-      traceSamplingRulesJson = "[]";
-      traceSamplingRules = TraceSamplingRules.EMPTY;
-    } else {
-      traceSamplingRules = TraceSamplingRules.deserialize(traceSamplingRulesJson);
-    }
-
-    DataStreamsTransactionExtractors dataStreamsTransactionExtractors;
-    String dataStreamsTransactionExtractorsJson = config.getDataStreamsTransactionExtractors();
-    if (dataStreamsTransactionExtractorsJson == null) {
-      dataStreamsTransactionExtractors = DataStreamsTransactionExtractors.EMPTY;
-    } else {
-      dataStreamsTransactionExtractors =
-          DataStreamsTransactionExtractors.deserialize(dataStreamsTransactionExtractorsJson);
-    }
-
-    // Get initial Span Sampling Rules from config
-    String spanSamplingRulesJson = config.getSpanSamplingRules();
-    String spanSamplingRulesFile = config.getSpanSamplingRulesFile();
-    SpanSamplingRules spanSamplingRules = SpanSamplingRules.EMPTY;
-    if (spanSamplingRulesJson != null) {
-      spanSamplingRules = SpanSamplingRules.deserialize(spanSamplingRulesJson);
-    } else if (spanSamplingRulesFile != null) {
-      spanSamplingRules = SpanSamplingRules.deserializeFile(spanSamplingRulesFile);
-    }
-
-    this.tagInterceptor =
-        null == tagInterceptor ? new TagInterceptor(new RuleFlags(config)) : tagInterceptor;
-
-    this.defaultSpanTags = defaultSpanTags;
-    this.defaultSpanTagsNeedsIntercept = this.tagInterceptor.needsIntercept(this.defaultSpanTags);
-
-    this.dynamicConfig =
-        DynamicConfig.create(ConfigSnapshot::new)
-            .setTracingEnabled(true) // implied by installation of CoreTracer
-            .setRuntimeMetricsEnabled(config.isRuntimeMetricsEnabled())
-            .setLogsInjectionEnabled(config.isLogsInjectionEnabled())
-            .setDataStreamsEnabled(config.isDataStreamsEnabled())
-            .setServiceMapping(serviceNameMappings)
-            .setHeaderTags(taggedHeaders)
-            .setBaggageMapping(baggageMapping)
-            .setTraceSampleRate(config.getTraceSampleRate())
-            .setSpanSamplingRules(spanSamplingRules.getRules())
-            .setTraceSamplingRules(traceSamplingRules.getRules(), traceSamplingRulesJson)
-            .setTracingTags(config.getMergedSpanTags())
-            .setDataStreamsTransactionExtractors(dataStreamsTransactionExtractors.getExtractors())
-            .apply();
-
-    this.logs128bTraceIdEnabled = Config.get().isLogs128bitTraceIdEnabled();
-    this.partialFlushMinSpans = partialFlushMinSpans;
-    this.idGenerationStrategy =
-        null == idGenerationStrategy
-            ? Config.get().getIdGenerationStrategy()
-            : idGenerationStrategy;
-
-    this.healthMetrics =
-        healthMetrics != null
-            ? healthMetrics
-            : (config.isHealthMetricsEnabled()
-                ? new TracerHealthMetrics(AgentMeter.statsDClient())
-                : HealthMetrics.NO_OP);
-    this.healthMetrics.start();
-
-    performanceMonitoring =
-        config.isPerfMetricsEnabled() ? AgentMeter.monitoring() : Monitoring.DISABLED;
-
-    traceWriteTimer = performanceMonitoring.newThreadLocalTimer("trace.write");
-
-    scopeManager =
-        new ContinuableScopeManager(
-            config.getScopeDepthLimit(),
-            config.isScopeStrictMode(),
-            profilingContextIntegration,
-            this.healthMetrics);
-
-    externalAgentLauncher = new ExternalAgentLauncher(config);
-
-    disableSamplingMechanismValidation = config.isSamplingMechanismValidationDisabled();
-
-    if (sharedCommunicationObjects == null) {
-      sharedCommunicationObjects = new SharedCommunicationObjects();
-    }
-    sharedCommunicationObjects.monitoring = AgentMeter.monitoring();
-    sharedCommunicationObjects.createRemaining(config);
-
-    tracingConfigPoller = new TracingConfigPoller(dynamicConfig);
-    if (pollForTracingConfiguration) {
-      tracingConfigPoller.start(config, sharedCommunicationObjects);
-    }
-
-    if (writer == null) {
-      this.writer =
-          WriterFactory.createWriter(
-              config, sharedCommunicationObjects, sampler, singleSpanSampler, this.healthMetrics);
-    } else {
-      this.writer = writer;
-    }
-
-    DDAgentFeaturesDiscovery featuresDiscovery =
-        sharedCommunicationObjects.featuresDiscovery(config);
-    if (config.isCiVisibilityEnabled()) {
-      // ensure updated discovery and sync if the another discovery currently being done
-      featuresDiscovery.discoverIfOutdated();
-    }
-
-    boolean payloadFilesEnabled =
-        config.isCiVisibilityEnabled() && BazelMode.get().isPayloadFilesEnabled();
-    if (config.isCiVisibilityEnabled()
-        && (config.isCiVisibilityAgentlessEnabled()
-            || payloadFilesEnabled
-            || featuresDiscovery.supportsEvpProxy())) {
-      pendingTraceBuffer = PendingTraceBuffer.discarding();
-      traceCollectorFactory =
-          new StreamingTraceCollector.Factory(this, this.timeSource, this.healthMetrics);
-    } else {
-      pendingTraceBuffer =
-          strictTraceWrites
-              ? PendingTraceBuffer.discarding()
-              : PendingTraceBuffer.delaying(
-                  this.timeSource, config, sharedCommunicationObjects, this.healthMetrics);
-      traceCollectorFactory =
-          new PendingTrace.Factory(
-              this, pendingTraceBuffer, this.timeSource, strictTraceWrites, this.healthMetrics);
-    }
-    pendingTraceBuffer.start();
-
-    sharedCommunicationObjects.whenReady(this.writer::start);
-    // temporary assign a no-op instance. The final one will be resolved when the discovery will be
-    // allowed
-    metricsAggregator = NoOpMetricsAggregator.INSTANCE;
-    final SharedCommunicationObjects sco = sharedCommunicationObjects;
-    // asynchronously create these aggregator/export components to avoid triggering
-    // expensive classloading during the tracer initialisation.
-    sharedCommunicationObjects.whenReady(
-        () ->
-            AgentTaskScheduler.get()
-                .execute(
-                    () -> {
-                      startMetricsAggregation(config, sco);
-                      maybeStartLogsExport(config);
-                    }));
-
-    if (dataStreamsMonitoring == null) {
-      // Avoid DSM in bazel hermetic mode
-      this.dataStreamsMonitoring =
-          payloadFilesEnabled
-              ? DisabledDataStreamsMonitoring.INSTANCE
-              : new DefaultDataStreamsMonitoring(
-                  config, sharedCommunicationObjects, this.timeSource, this::captureTraceConfig);
-    } else {
-      this.dataStreamsMonitoring = dataStreamsMonitoring;
-    }
-
-    sharedCommunicationObjects.whenReady(this.dataStreamsMonitoring::start);
-
-    propagationTagsFactory = PropagationTags.factory(config);
-
-    builderTagsPrecedence = config.isTraceBuilderTagsPrecedenceEnabled();
-
-    // Register context propagators
-    HttpCodec.Extractor baseExtractor =
-        extractor == null ? HttpCodec.createExtractor(config, this::captureTraceConfig) : extractor;
-    OrgGuard orgGuard =
-        OrgGuard.create(
-            config,
-            featuresDiscovery::getOrgPropagationMarker,
-            propagationTagsFactory,
-            this.healthMetrics);
-    HttpCodec.Extractor tracingExtractor = orgGuard.decorateExtractor(baseExtractor);
-    HttpCodec.Injector tracingInjector = orgGuard.decorateInjector(injector);
-    TracingPropagator tracingPropagator =
-        new TracingPropagator(config.isApmTracingEnabled(), tracingInjector, tracingExtractor);
-    Propagators.register(TRACING_CONCERN, tracingPropagator);
-    Propagators.register(XRAY_TRACING_CONCERN, new XRayPropagator(config), false);
-    if (config.isDataStreamsEnabled()) {
-      Propagators.register(DSM_CONCERN, this.dataStreamsMonitoring.propagator());
-    }
-    if (config.isBaggagePropagationEnabled()
-        && config.getTracePropagationBehaviorExtract() != IGNORE) {
-      Propagators.register(BAGGAGE_CONCERN, new BaggagePropagator(config));
-    }
-    if (config.isInferredProxyPropagationEnabled()) {
-      Propagators.register(INFERRED_PROXY_CONCERN, new InferredProxyPropagator());
-    }
-
-    if (config.isCiVisibilityEnabled()) {
-      if (config.isCiVisibilityTraceSanitationEnabled()) {
-        addTraceInterceptor(CiVisibilityTraceInterceptor.INSTANCE);
-      }
-
-      if (config.isCiVisibilityAgentlessEnabled() || BazelMode.get().isPayloadFilesEnabled()) {
-        addTraceInterceptor(DDIntakeTraceInterceptor.INSTANCE);
-      } else {
-        featuresDiscovery.discoverIfOutdated();
-        if (!featuresDiscovery.supportsEvpProxy()) {
-          // CI Test Cycle protocol is not available
-          addTraceInterceptor(CiVisibilityApmProtocolInterceptor.INSTANCE);
-        }
-      }
-
-      if (config.isCiVisibilityTelemetryEnabled()) {
-        addTraceInterceptor(new CiVisibilityTelemetryInterceptor());
-      }
-    }
-
-    if (config.isTraceGitMetadataEnabled()) {
-      addTraceInterceptor(GitMetadataTraceInterceptor.INSTANCE);
-    }
-
-    if (config.isTraceKeepLatencyThresholdEnabled()) {
-      addTraceInterceptor(LatencyTraceInterceptor.INSTANCE);
-    }
-
-    this.instrumentationGateway = instrumentationGateway;
-    callbackProviderAppSec = instrumentationGateway.getCallbackProvider(RequestContextSlot.APPSEC);
-    callbackProviderIast = instrumentationGateway.getCallbackProvider(RequestContextSlot.IAST);
-    universalCallbackProvider = instrumentationGateway.getUniversalCallbackProvider();
-
-    shutdownCallback = new ShutdownHook(this);
-    try {
-      Runtime.getRuntime().addShutdownHook(shutdownCallback);
-    } catch (final IllegalStateException ex) {
-      // The JVM is already shutting down.
-    }
-
-    registerClassLoader(ClassLoader.getSystemClassLoader());
-
-    StatusLogger.logStatus(config);
-
-    this.profilingContextIntegration = profilingContextIntegration;
-    this.injectBaggageAsTags = injectBaggageAsTags;
-    this.injectLinksAsTags = injectLinksAsTags;
-    this.flushOnClose = flushOnClose;
-    this.allowInferredServices = SpanNaming.instance().namingSchema().allowInferredServices();
-    final TagMap frozenLocalRootSpanTags = TagMap.fromMapImmutable(localRootSpanTags);
-    this.localRootSpanTags =
-        new LocalRootSpanTags(
-            frozenLocalRootSpanTags, this.tagInterceptor.needsIntercept(frozenLocalRootSpanTags));
-    if (profilingContextIntegration != ProfilingContextIntegration.NoOp.INSTANCE) {
-      // Deferred integrations run this later (or never, if construction fails).
-      profilingContextIntegration.whenAvailable(this::stampProfilingContextEngine);
-    }
-    if (serviceDiscoveryFactory != null) {
-      AgentTaskScheduler.get()
-          .schedule(
-              () -> {
-                final ServiceDiscovery serviceDiscovery = serviceDiscoveryFactory.get();
-                if (serviceDiscovery != null) {
-                  // JNA can do ldconfig and other commands. Those are hidden since internal.
-                  try (final TraceScope blackhole = muteTracing()) {
-                    serviceDiscovery.writeTracerMetadata(config);
-                  }
-                }
-              },
-              1,
-              SECONDS);
-    }
-  }
-
-  /**
-   * Adds the profiling context engine tag to {@link #localRootSpanTags}; runs at most once per
-   * tracer.
-   */
-  private void stampProfilingContextEngine() {
-    TagMap tags = TagMap.fromMap(this.localRootSpanTags.tags);
-    tags.set(PROFILING_CONTEXT_ENGINE, this.profilingContextIntegration.name());
-    TagMap frozenTags = tags.freeze();
-    this.localRootSpanTags =
-        new LocalRootSpanTags(frozenTags, this.tagInterceptor.needsIntercept(frozenTags));
-  }
-
-  private void startMetricsAggregation(Config config, SharedCommunicationObjects sco) {
-    metricsAggregator = createMetricsAggregator(config, sco, this.healthMetrics);
-    // Schedule the metrics aggregator to begin reporting after a random delay of
-    // 1 to 10 seconds (using milliseconds granularity.)
-    // This avoids a fleet of traced applications starting at the same time from
-    // sending metrics in sync.
-    AgentTaskScheduler.get()
-        .scheduleWithJitter(MetricsAggregator::start, metricsAggregator, 1, SECONDS);
-
-    if (config.isMetricsOtlpExporterEnabled()) {
-      OtlpMetricsService.INSTANCE.start();
-    }
-  }
-
-  private void maybeStartLogsExport(Config config) {
-    if (config.isLogsOtlpExporterEnabled()) {
-      OtlpLogsService.INSTANCE.start();
-    }
-  }
-
-  /** Used by AgentTestRunner to inject configuration into the test tracer. */
-  public void rebuildTraceConfig(Config config) {
-    dynamicConfig
-        .initial()
-        .setTracingEnabled(true) // implied by installation of CoreTracer
-        .setRuntimeMetricsEnabled(config.isRuntimeMetricsEnabled())
-        .setLogsInjectionEnabled(config.isLogsInjectionEnabled())
-        .setDataStreamsEnabled(config.isDataStreamsEnabled())
-        .setServiceMapping(config.getServiceMapping())
-        .setHeaderTags(config.getRequestHeaderTags())
-        .setBaggageMapping(config.getBaggageMapping())
-        .setTraceSampleRate(config.getTraceSampleRate())
-        .setTracingTags(config.getGlobalTags())
-        .apply();
-  }
-
-  @Override
-  protected void finalize() {
-    if (null != shutdownCallback) {
-      try {
-        shutdownCallback.run();
-        Runtime.getRuntime().removeShutdownHook(shutdownCallback);
-      } catch (final IllegalStateException e) {
-        // Do nothing.  Already shutting down
-      } catch (final Exception e) {
-        log.error("Error while finalizing DDTracer.", e);
-      }
-    }
-  }
-
-  /**
-   * Only visible for benchmarking purposes
-   *
-   * @return a PendingTrace
-   */
-  public TraceCollector createTraceCollector(DDTraceId id) {
-    return traceCollectorFactory.create(id);
-  }
-
-  TraceCollector createTraceCollector(DDTraceId id, ConfigSnapshot traceConfig) {
-    return traceCollectorFactory.create(id, traceConfig);
-  }
-
-  /**
-   * If an application is using a non-system classloader, that classloader should be registered
-   * here. Due to the way Spring Boot structures its' executable jar, this might log some warnings.
-   *
-   * @param classLoader to register.
-   */
-  private void registerClassLoader(final ClassLoader classLoader) {
-    try {
-      for (final TraceInterceptor interceptor :
-          ServiceLoader.load(TraceInterceptor.class, classLoader)) {
-        addTraceInterceptor(interceptor);
-      }
-    } catch (final ServiceConfigurationError e) {
-      log.warn("Problem loading TraceInterceptor for classLoader: {}", classLoader, e);
-    }
-  }
-
-  /**
-   * Timestamp in nanoseconds for the current {@code nanoTicks}.
-   *
-   * <p>Note: it is not possible to get 'real' nanosecond time. This method uses tracer start time
-   * (with millisecond precision) as a reference and applies relative time with nanosecond precision
-   * after that. This means time measured with same Tracer in different Spans is relatively correct
-   * with nanosecond precision.
-   *
-   * @param nanoTicks as returned by {@link TimeSource#getNanoTicks()}
-   * @return timestamp in nanoseconds
-   */
-  long getTimeWithNanoTicks(long nanoTicks) {
-    long computedNanoTime = startTimeNano + Math.max(0, nanoTicks - startNanoTicks);
-    if (nanoTicks - lastSyncTicks >= clockSyncPeriod) {
-      correctCounterDrift(computedNanoTime);
-      lastSyncTicks = nanoTicks;
-    }
-    return computedNanoTime + counterDrift;
-  }
-
-  /**
-   * Computes {@link #counterDrift} corrected against {@code computedNanoTime}, gated by a 1ms
-   * threshold to avoid regressing the clock on {@link SystemTimeSource}'s millisecond precision.
-   */
-  private void correctCounterDrift(long computedNanoTime) {
-    long drift = computedNanoTime - timeSource.getCurrentTimeNanos();
-    if (Math.abs(drift + counterDrift) >= 1_000_000L) { // allow up to 1ms of drift
-      counterDrift = -MILLISECONDS.toNanos(NANOSECONDS.toMillis(drift));
-    }
-  }
-
-  /**
-   * AWS Lambda SnapStart restores a checkpointed JVM, potentially hours or days later, without
-   * {@link System#nanoTime()} accounting for the frozen duration. That can leave the computed time
-   * stale for longer than {@link #getTimeWithNanoTicks}'s periodic self-correction can catch, as
-   * that's gated on ticks elapsed rather than wall-clock time. Called once per Lambda invocation,
-   * before any span for it is created, so it's a cheap no-op outside SnapStart.
-   *
-   * <p>Gated on {@link Config#isLambdaSnapStartClockResyncEnabled()} as an escape hatch.
-   */
-  @VisibleForTesting
-  void maybeResyncClockForLambdaInvocation() {
-    if (!initialConfig.isLambdaSnapStartClockResyncEnabled()) {
-      return;
-    }
-    long nanoTicks = timeSource.getNanoTicks();
-    long computedNanoTime = startTimeNano + Math.max(0, nanoTicks - startNanoTicks);
-    correctCounterDrift(computedNanoTime);
-    lastSyncTicks = nanoTicks;
-  }
-
-  @Override
-  public CoreSpanBuilder buildSpan(
-      final String instrumentationName, final CharSequence operationName) {
-    return createMultiSpanBuilder(instrumentationName, operationName);
-  }
-
-  /**
-   * Seeds identity (instrumentation name, operation, span type) and constant tags from a prototype.
-   * {@code operationName} overrides the prototype's when non-null — the explicit value wins, the
-   * prototype is the fallback. The prototype's tags are seeded during {@link CoreSpanBuilder}
-   * construction just before the builder's own tags, so explicit tags override prototype constants.
-   */
-  @Override
-  public CoreSpanBuilder buildSpan(
-      @Nonnull final SpanPrototype prototype, CharSequence operationName) {
-    if (operationName == null) {
-      operationName = prototype.operationName();
-    }
-    CoreSpanBuilder builder =
-        createMultiSpanBuilder(prototype.instrumentationName(), operationName);
-    builder.spanPrototype = prototype;
-    if (prototype.spanType() != null) {
-      builder.spanType = prototype.spanType();
-    }
-    return builder;
-  }
-
-  MultiSpanBuilder createMultiSpanBuilder(
-      final String instrumentationName, final CharSequence operationName) {
-    return new MultiSpanBuilder(this, instrumentationName, operationName);
-  }
-
-  @Override
-  public CoreSpanBuilder singleSpanBuilder(
-      final String instrumentationName, final CharSequence operationName) {
-    return SPAN_BUILDER_REUSE_ENABLED
-        ? reuseSingleSpanBuilder(instrumentationName, operationName)
-        : createMultiSpanBuilder(instrumentationName, operationName);
-  }
-
-  ReusableSingleSpanBuilder createSingleSpanBuilder(
-      final String instrumentationName, final CharSequence oprationName) {
-    ReusableSingleSpanBuilder singleSpanBuilder = new ReusableSingleSpanBuilder(this);
-    singleSpanBuilder.init(instrumentationName, oprationName);
-    return singleSpanBuilder;
-  }
-
-  CoreSpanBuilder reuseSingleSpanBuilder(
-      final String instrumentationName, final CharSequence operationName) {
-    return reuseSingleSpanBuilder(
-        this, spanBuilderThreadLocalCache, instrumentationName, operationName);
-  }
-
-  static final ReusableSingleSpanBuilder reuseSingleSpanBuilder(
-      final CoreTracer tracer,
-      final ReusableSingleSpanBuilderThreadLocalCache tlCache,
-      final String instrumentationName,
-      final CharSequence operationName) {
-    if (ThreadSupport.isVirtual()) {
-      // Since virtual threads are created and destroyed often,
-      // cautiously decided not to create a thread local for the virtual threads.
-
-      // TODO: This could probably be improved by having a single thread local that
-      // holds the core things that we need for tracing.  e.g. context, etc
-      return tracer.createSingleSpanBuilder(instrumentationName, operationName);
-    }
-
-    // retrieve the thread's typical SpanBuilder and try to reset it
-    // reset will fail if the ReusableSingleSpanBuilder is still "in-use"
-    ReusableSingleSpanBuilder tlSpanBuilder = tlCache.get();
-    boolean wasReset = tlSpanBuilder.reset(instrumentationName, operationName);
-    if (wasReset) return tlSpanBuilder;
-
-    // TODO: counter for how often the fallback is used?
-    ReusableSingleSpanBuilder newSpanBuilder =
-        tracer.createSingleSpanBuilder(instrumentationName, operationName);
-
-    // DQH - Debated how best to handle the case of someone requesting a SpanBuilder
-    // and then not using it.  Without the ability to replace the cached SpanBuilder,
-    // that case could result in permanently burning the cache for a given thread.
-
-    // That could be solved with additional logic during ReusableSingleSpanBuilder#start
-    // that checks to see if the cached Builder is in use and then replaces it
-    // with the freed Builder, but that would put extra logic in the common path.
-
-    // Instead of making the release process more complicated, I'm chosing to just
-    // override here when we know we're already in an uncommon path.
-    tlCache.set(newSpanBuilder);
-
-    return newSpanBuilder;
-  }
-
-  @Override
-  public AgentSpan startSpan(final String instrumentationName, final CharSequence spanName) {
-    return CoreSpanBuilder.startSpan(
-        this,
-        instrumentationName,
-        spanName,
-        null,
-        CoreSpanBuilder.USE_SCOPE,
-        CoreSpanBuilder.AUTO_ASSIGN_TIMESTAMP);
-  }
-
-  @Override
-  public AgentSpan startSpan(
-      final String instrumentationName, final CharSequence spanName, final long startTimeMicros) {
-    return CoreSpanBuilder.startSpan(
-        this, instrumentationName, spanName, null, CoreSpanBuilder.USE_SCOPE, startTimeMicros);
-  }
-
-  @Override
-  public AgentSpan startSpan(
-      String instrumentationName, final CharSequence spanName, final AgentSpanContext parent) {
-    return CoreSpanBuilder.startSpan(
-        this,
-        instrumentationName,
-        spanName,
-        parent,
-        CoreSpanBuilder.IGNORE_SCOPE,
-        CoreSpanBuilder.AUTO_ASSIGN_TIMESTAMP);
-  }
-
-  @Override
-  public AgentSpan startSpan(
-      final String instrumentationName,
-      final CharSequence spanName,
-      final AgentSpanContext parent,
-      final long startTimeMicros) {
-    return CoreSpanBuilder.startSpan(
-        this, instrumentationName, spanName, parent, CoreSpanBuilder.IGNORE_SCOPE, startTimeMicros);
-  }
-
-  @Override
-  public AgentSpan startSpan(
-      @Nonnull final SpanPrototype prototype, final CharSequence operationName) {
-    return CoreSpanBuilder.startSpan(
-        this,
-        prototype,
-        operationName != null ? operationName : prototype.operationName(),
-        CoreSpanBuilder.USE_SCOPE,
-        CoreSpanBuilder.AUTO_ASSIGN_TIMESTAMP);
-  }
-
-  @Override
-  public ContextScope activateSpan(AgentSpan span) {
-    return scopeManager.activateSpan(span);
-  }
-
-  @Override
-  public ContextScope activateManualSpan(final AgentSpan span) {
-    return scopeManager.activateManualSpan(span);
-  }
-
-  @Override
-  @SuppressWarnings("resource")
-  public void activateSpanWithoutScope(AgentSpan span) {
-    scopeManager.activateSpan(span);
-  }
-
-  @Override
-  public boolean isAsyncPropagationEnabled() {
-    return scopeManager.isAsyncPropagationEnabled();
-  }
-
-  @Override
-  public void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) {
-    scopeManager.setAsyncPropagationEnabled(asyncPropagationEnabled);
-  }
-
-  @Override
-  public void closePrevious(boolean finishSpan) {
-    if (!InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-      throw new IllegalStateException(
-          "closePrevious must not be called when context swap based logic is enabled");
-    }
-    scopeManager.closePrevious(finishSpan);
-  }
-
-  @Override
-  public ContextScope activateNext(AgentSpan span) {
-    if (!InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-      throw new IllegalStateException(
-          "activateNext must not be called when context swap based logic is enabled");
-    }
-    return scopeManager.activateNext(span);
-  }
-
-  public TagInterceptor getTagInterceptor() {
-    return tagInterceptor;
-  }
-
-  public int getPartialFlushMinSpans() {
-    return partialFlushMinSpans;
-  }
-
-  @Override
-  public AgentSpan activeSpan() {
-    return scopeManager.activeSpan();
-  }
-
-  @Override
-  public void checkpointActiveForRollback() {
-    if (!InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-      throw new IllegalStateException(
-          "checkpointActiveForRollback must not be called when context swap based logic is enabled");
-    }
-    this.scopeManager.checkpointActiveForRollback();
-  }
-
-  @Override
-  public void rollbackActiveToCheckpoint() {
-    if (!InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
-      throw new IllegalStateException(
-          "rollbackActiveToCheckpoint must not be called when context swap based logic is enabled");
-    }
-    this.scopeManager.rollbackActiveToCheckpoint();
-  }
-
-  @Override
-  public void closeActive() {
-    ContextScope activeScope = this.scopeManager.active();
-    if (activeScope != null) {
-      activeScope.close();
-    }
-  }
-
-  @Override
-  public AgentSpanContext notifyLambdaStart(Object event, String lambdaRequestId) {
-    maybeResyncClockForLambdaInvocation();
-
-    // Get context from AppSec
-    AgentSpanContext appSecContext = LambdaAppSecHandler.processRequestStart(event);
-
-    // Get context from extension
-    AgentSpanContext extensionContext = LambdaHandler.notifyStartInvocation(event, lambdaRequestId);
-
-    // Merge contexts
-    return LambdaAppSecHandler.mergeContexts(extensionContext, appSecContext);
-  }
-
-  @Override
-  public void notifyExtensionEnd(
-      AgentSpan span, Object result, boolean isError, String lambdaRequestId) {
-    LambdaHandler.notifyEndInvocation(span, result, isError, lambdaRequestId);
-  }
-
-  @Override
-  public void notifyAppSecEnd(AgentSpan span, Object result) {
-    try {
-      LambdaAppSecHandler.processResponseData(span, result);
-    } finally {
-      LambdaAppSecHandler.processRequestEnd(span);
-    }
-  }
-
-  @Override
-  public AgentDataStreamsMonitoring getDataStreamsMonitoring() {
-    return dataStreamsMonitoring;
-  }
-
-  private static final RatelimitedLogger rlLog = new RatelimitedLogger(log, 1, MINUTES);
-
-  /**
-   * We use the sampler to know if the trace has to be reported/written. The sampler is called on
-   * the first span (root span) of the trace. If the trace is marked as a sample, we report it.
-   *
-   * @param trace a list of the spans related to the same trace
-   */
-  void write(final SpanList trace) {
-    if (trace.isEmpty() || !trace.get(0).traceConfig().isTraceEnabled()) {
-      return;
-    }
-    List<DDSpan> writtenTrace = interceptCompleteTrace(trace);
-    if (writtenTrace.isEmpty()) {
-      return;
-    }
-
-    // run early tag postprocessors before publishing to the metrics writer since peer / base
-    // service are needed
-
-    // DQH - Using forEach avoids ArrayList$Iter allocation
-    writtenTrace.forEach(DDSpan::processServiceTags);
-
-    boolean forceKeep = metricsAggregator.publish(writtenTrace);
-
-    TraceCollector traceCollector = writtenTrace.get(0).spanContext().getTraceCollector();
-    traceCollector.setSamplingPriorityIfNecessary();
-
-    DDSpan rootSpan = traceCollector.getRootSpan();
-    DDSpan spanToSample = rootSpan == null ? writtenTrace.get(0) : rootSpan;
-    spanToSample.forceKeep(forceKeep);
-    boolean published = forceKeep || traceCollector.sample(spanToSample);
-    if (published) {
-      if (!apmTracingEnabled) {
-        // Stamp the billing marker on every span of each exported chunk so the intake does not bill
-        // APM host usage.
-        for (int i = 0; i < writtenTrace.size(); i++) {
-          writtenTrace.get(i).setTag(APM_ENABLED, 0);
-        }
-      }
-      writer.write(writtenTrace);
-    } else {
-      // with span streaming this won't work - it needs to be changed
-      // to track an effective sampling rate instead, however, tests
-      // checking that a hard reference on a continuation prevents
-      // reporting fail without this, so will need to be fixed first.
-      writer.incrementDropCounts(writtenTrace.size());
-    }
-    if (null != rootSpan) {
-      onRootSpanFinished(rootSpan, rootSpan.getEndpointTracker());
-    }
-  }
-
-  private List<DDSpan> interceptCompleteTrace(SpanList originalTrace) {
-    return interceptCompleteTrace(interceptors, originalTrace);
-  }
-
-  static final List<DDSpan> interceptCompleteTrace(
-      TraceInterceptors interceptors, SpanList originalTrace) {
-    if (interceptors.isEmpty()) {
-      return originalTrace;
-    }
-    if (originalTrace.isEmpty()) {
-      return SpanList.EMPTY;
-    }
-
-    // Using TraceList to optimize the common case where the interceptors,
-    // don't alter the list.  If the interceptors just return the provided
-    // List, then no need to copy to another List.
-
-    // As an extra precaution, also check the modCount before and after on
-    // the TraceList, since TraceInterceptor could put some other type of
-    // object into the List.
-
-    // There is still a risk that a TraceInterceptor holds onto the provided
-    // List and modifies it later on, but we cannot safeguard against
-    // every possible misuse.
-    Collection<? extends MutableSpan> interceptedTrace = originalTrace;
-    int originalModCount = originalTrace.modCount();
-
-    for (final TraceInterceptor interceptor : interceptors.interceptors()) {
-      try {
-        // If one TraceInterceptor throws an exception, then continue with the next one
-        interceptedTrace = interceptor.onTraceComplete(interceptedTrace);
-      } catch (Throwable e) {
-        String interceptorName = interceptor.getClass().getName();
-        rlLog.warn("Throwable raised in TraceInterceptor {}", interceptorName, e);
-      }
-      if (interceptedTrace == null) {
-        interceptedTrace = emptyList();
-      }
-    }
-
-    if (interceptedTrace == null || interceptedTrace.isEmpty()) {
-      return SpanList.EMPTY;
-    } else if (interceptedTrace == originalTrace && originalTrace.modCount() == originalModCount) {
-      return originalTrace;
-    } else {
-      SpanList trace = new SpanList(interceptedTrace.size());
-      for (final MutableSpan span : interceptedTrace) {
-        if (span instanceof DDSpan) {
-          trace.add((DDSpan) span);
-        }
-      }
-      return trace;
-    }
-  }
-
-  @Override
-  public String getTraceId() {
-    return getTraceId(activeSpan());
-  }
-
-  @Override
-  public String getSpanId() {
-    return getSpanId(activeSpan());
-  }
-
-  @Override
-  public String getTraceId(AgentSpan span) {
-    if (span != null && span.getTraceId() != null) {
-      DDTraceId traceId = span.getTraceId();
-      // Return padded hexadecimal string representation if 128-bit TraceId logging is enabled and
-      // TraceId is a 128-bit ID, otherwise use the default numerical string representation.
-      if (this.logs128bTraceIdEnabled && traceId.toHighOrderLong() != 0) {
-        return traceId.toHexString();
-      } else {
-        return traceId.toString();
-      }
-    }
-    return "0";
-  }
-
-  @Override
-  public String getSpanId(AgentSpan span) {
-    if (span != null) {
-      return DDSpanId.toString(span.getSpanId());
-    }
-    return "0";
-  }
-
-  @VisibleForTesting
-  TraceInterceptors getInterceptors() {
-    return interceptors;
-  }
-
-  @Override
-  public boolean addTraceInterceptor(final TraceInterceptor interceptor) {
-    TraceInterceptor conflictingInterceptor = interceptors.add(interceptor);
-    if (conflictingInterceptor == null) {
-      return true;
-    } else {
-      log.warn(
-          "Interceptor {} will NOT be registered with the tracer, "
-              + "as already registered interceptor {} is considered its duplicate",
-          interceptor,
-          conflictingInterceptor);
-      return false;
-    }
-  }
-
-  @Override
-  public TraceScope muteTracing() {
-    return activateSpan(blackholeSpan())::close;
-  }
-
-  @Override
-  public DataStreamsCheckpointer getDataStreamsCheckpointer() {
-    return this.dataStreamsMonitoring;
-  }
-
-  @Override
-  public void addShutdownListener(Runnable listener) {
-    this.shutdownListeners.add(listener);
-  }
-
-  @Override
-  public void addScopeListener(final ScopeListener listener) {
-    this.scopeManager.addScopeListener(listener);
-  }
-
-  @Override
-  public SubscriptionService getSubscriptionService(RequestContextSlot slot) {
-    return (SubscriptionService) instrumentationGateway.getCallbackProvider(slot);
-  }
-
-  @Override
-  public CallbackProvider getCallbackProvider(RequestContextSlot slot) {
-    if (slot == RequestContextSlot.APPSEC) {
-      return callbackProviderAppSec;
-    } else if (slot == RequestContextSlot.IAST) {
-      return callbackProviderIast;
-    } else {
-      return CallbackProvider.CallbackProviderNoop.INSTANCE;
-    }
-  }
-
-  @Override
-  public CallbackProvider getUniversalCallbackProvider() {
-    return universalCallbackProvider;
-  }
-
-  @Override
-  public void close() {
-    for (Runnable shutdownListener : shutdownListeners) {
-      try {
-        shutdownListener.run();
-      } catch (Exception e) {
-        log.error("Error while running shutdown listener", e);
-      }
-    }
-    if (flushOnClose) {
-      flush();
-    }
-    tracingConfigPoller.stop();
-    pendingTraceBuffer.close();
-    writer.close();
-    RumInjector.shutdownTelemetry();
-    AgentMeter.statsDClient().close();
-    metricsAggregator.close();
-    if (initialConfig.isMetricsOtlpExporterEnabled()) {
-      OtlpMetricsService.INSTANCE.shutdown();
-    }
-    if (initialConfig.isLogsOtlpExporterEnabled()) {
-      OtlpLogsService.INSTANCE.shutdown();
-    }
-    dataStreamsMonitoring.close();
-    externalAgentLauncher.close();
-    healthMetrics.close();
-  }
-
-  @Override
-  public void addScopeListener(
-      Runnable afterScopeActivatedCallback, Runnable afterScopeClosedCallback) {
-    addScopeListener(
-        new ScopeListener() {
-          @Override
-          public void afterScopeActivated() {
-            afterScopeActivatedCallback.run();
-          }
-
-          @Override
-          public void afterScopeClosed() {
-            afterScopeClosedCallback.run();
-          }
-        });
-  }
-
-  @Override
-  public void flush() {
-    pendingTraceBuffer.flush();
-    writer.flush();
-  }
-
-  @Override
-  public void flushMetrics() {
-    try {
-      metricsAggregator.forceReport().get(2_500, MILLISECONDS);
-    } catch (InterruptedException | ExecutionException | TimeoutException e) {
-      log.debug("Failed to wait for metrics flush.", e);
-    }
-
-    if (initialConfig.isMetricsOtlpExporterEnabled()) {
-      OtlpMetricsService.INSTANCE.flush();
-    }
-  }
-
-  @Override
-  public void flushLogs() {
-    if (initialConfig.isLogsOtlpExporterEnabled()) {
-      OtlpLogsService.INSTANCE.flush();
-    }
-  }
-
-  @Override
-  public ProfilingContextIntegration getProfilingContext() {
-    return profilingContextIntegration;
-  }
-
-  @Override
-  public TraceSegment getTraceSegment() {
-    AgentSpan activeSpan = activeSpan();
-    if (activeSpan == null) {
-      return null;
-    }
-    AgentSpanContext spanContext = activeSpan.spanContext();
-    if (spanContext instanceof DDSpanContext) {
-      return ((DDSpanContext) spanContext).getTraceSegment();
-    }
-    return null;
-  }
-
-  @Override
-  public void addReportToFlare(ZipOutputStream zip) throws IOException {
-    TracerFlare.addText(zip, "dynamic_config.txt", dynamicConfig.toString());
-    TracerFlare.addText(zip, "tracer_health.txt", healthMetrics.summary());
-    TracerFlare.addText(zip, "span_metrics.txt", SpanMetricRegistry.getInstance().summary());
-  }
-
-  Recording writeTimer() {
-    return traceWriteTimer.start();
-  }
-
-  private static <K, V> Map<V, K> invertMap(Map<K, V> map) {
-    Map<V, K> inverted = new HashMap<>(map.size());
-    for (Map.Entry<K, V> entry : map.entrySet()) {
-      inverted.put(entry.getValue(), entry.getKey());
-    }
-    return Collections.unmodifiableMap(inverted);
-  }
-
-  /** Spans are built using this builder */
-  public abstract static class CoreSpanBuilder implements AgentTracer.SpanBuilder {
-    protected static final boolean USE_SCOPE = false;
-    protected static final boolean IGNORE_SCOPE = true;
-    protected static final int AUTO_ASSIGN_SPAN_ID = 0;
-    protected static final long AUTO_ASSIGN_TIMESTAMP = 0L;
-
-    protected final CoreTracer tracer;
-
-    protected String instrumentationName;
-    protected CharSequence operationName;
-
-    // Builder attributes
-    // Make sure any fields added here are also reset properly in ReusableSingleSpanBuilder.reset
-    protected TagMap.Ledger tagLedger;
-    protected SpanPrototype spanPrototype = SpanPrototype.NONE;
-    protected long timestampMicro;
-    protected AgentSpanContext parent;
-    protected String serviceName;
-    protected String resourceName;
-    protected boolean errorFlag;
-    protected CharSequence spanType;
-    protected boolean ignoreScope = USE_SCOPE;
-    protected Object builderRequestContextDataAppSec;
-    protected Object builderRequestContextDataIast;
-    protected Object builderCiVisibilityContextData;
-    protected List<AgentSpanLink> links;
-    protected long spanId = AUTO_ASSIGN_SPAN_ID;
-
-    // Make sure any fields added here are also reset properly in ReusableSingleSpanBuilder.reset
-
-    CoreSpanBuilder(CoreTracer tracer) {
-      this.tracer = tracer;
+    @Override
+    public AgentSpan startSpan(
+            final String instrumentationName,
+            final CharSequence spanName,
+            final AgentSpanContext parent,
+            final long startTimeMicros) {
+        return CoreSpanBuilder.startSpan(
+                this, instrumentationName, spanName, parent, CoreSpanBuilder.IGNORE_SCOPE, startTimeMicros);
     }
 
     @Override
-    public final CoreSpanBuilder ignoreActiveSpan() {
-      ignoreScope = true;
-      return this;
-    }
-
-    protected static final DDSpan buildSpan(
-        final CoreTracer tracer,
-        long spanId,
-        String instrumentationName,
-        long timestampMicro,
-        String serviceName,
-        CharSequence operationName,
-        String resourceName,
-        AgentSpanContext resolvedParentSpanContext,
-        boolean ignoreScope,
-        boolean errorFlag,
-        CharSequence spanType,
-        TagMap.Ledger tagLedger,
-        SpanPrototype spanPrototype,
-        List<AgentSpanLink> links,
-        Object builderRequestContextDataAppSec,
-        Object builderRequestContextDataIast,
-        Object builderCiVisibilityContextData) {
-      return buildSpanImpl(
-          tracer,
-          instrumentationName,
-          timestampMicro,
-          links,
-          buildSpanContext(
-              tracer,
-              spanId,
-              serviceName,
-              operationName,
-              resourceName,
-              resolvedParentSpanContext,
-              errorFlag,
-              spanType,
-              tagLedger,
-              spanPrototype,
-              links,
-              builderRequestContextDataAppSec,
-              builderRequestContextDataIast,
-              builderCiVisibilityContextData));
-    }
-
-    protected static final DDSpan buildSpanImpl(
-        CoreTracer tracer,
-        String instrumentationName,
-        long timestampMicro,
-        List<AgentSpanLink> links,
-        DDSpanContext spanContext) {
-      DDSpan span = DDSpan.create(instrumentationName, timestampMicro, spanContext, links);
-      if (span.isLocalRootSpan()) {
-        EndpointTracker tracker = tracer.onRootSpanStarted(span);
-        if (tracker != null) {
-          span.setEndpointTracker(tracker);
-        }
-      }
-      return span;
-    }
-
-    private static final List<AgentSpanLink> addParentSpanLink(
-        List<AgentSpanLink> links, AgentSpanContext parentSpanContext) {
-      SpanLink link;
-      if (parentSpanContext instanceof ExtractedContext) {
-        String headers = ((ExtractedContext) parentSpanContext).getPropagationStyle().toString();
-        SpanAttributes attributes =
-            SpanAttributes.builder()
-                .put("reason", "propagation_behavior_extract")
-                .put("context_headers", headers)
-                .build();
-        link = DDSpanLink.from((ExtractedContext) parentSpanContext, attributes);
-      } else {
-        link = SpanLink.from(parentSpanContext);
-      }
-      return addLink(links, link);
-    }
-
-    protected static final List<AgentSpanLink> addTerminatedSpanAsLinks(
-        List<AgentSpanLink> links, AgentSpanContext parentSpanContext) {
-      if (parentSpanContext instanceof TagContext) {
-        List<AgentSpanLink> terminatedSpanLinks =
-            ((TagContext) parentSpanContext).getTerminatedSpanLinks();
-        if (!terminatedSpanLinks.isEmpty()) {
-          return addLinks(links, terminatedSpanLinks);
-        }
-      }
-      return links;
-    }
-
-    protected static final List<AgentSpanLink> addLink(
-        List<AgentSpanLink> links, AgentSpanLink link) {
-      if (links == null) links = new ArrayList<>();
-      links.add(link);
-      return links;
-    }
-
-    protected static final List<AgentSpanLink> addLinks(
-        List<AgentSpanLink> links, List<AgentSpanLink> additionalLinks) {
-      if (links == null) {
-        links = new ArrayList<>(additionalLinks);
-      } else {
-        links.addAll(additionalLinks);
-      }
-      return links;
+    public AgentSpan startSpan(@Nonnull final SpanPrototype prototype, final CharSequence operationName) {
+        return CoreSpanBuilder.startSpan(
+                this,
+                prototype,
+                operationName != null ? operationName : prototype.operationName(),
+                CoreSpanBuilder.USE_SCOPE,
+                CoreSpanBuilder.AUTO_ASSIGN_TIMESTAMP);
     }
 
     @Override
-    public abstract AgentSpan start();
-
-    protected AgentSpan startImpl() {
-      return startSpan(
-          this.tracer,
-          this.spanId,
-          this.instrumentationName,
-          this.timestampMicro,
-          this.serviceName,
-          this.operationName,
-          this.resourceName,
-          this.parent,
-          this.ignoreScope,
-          this.errorFlag,
-          this.spanType,
-          this.tagLedger,
-          this.spanPrototype,
-          this.links,
-          this.builderRequestContextDataAppSec,
-          this.builderRequestContextDataIast,
-          this.builderCiVisibilityContextData);
-    }
-
-    protected static final AgentSpan startSpan(
-        final CoreTracer tracer,
-        String instrumentationName,
-        CharSequence operationName,
-        AgentSpanContext specifiedParentSpanContext,
-        boolean ignoreScope,
-        long timestampMicros) {
-      return startSpan(
-          tracer,
-          AUTO_ASSIGN_SPAN_ID,
-          instrumentationName,
-          timestampMicros,
-          null /* serviceName */,
-          operationName,
-          null /* resourceName */,
-          specifiedParentSpanContext,
-          ignoreScope,
-          false /* errorFlag */,
-          null /* spanType */,
-          null /* tagLedger */,
-          SpanPrototype.NONE /* spanPrototype */,
-          null /* links */,
-          null /* appSec */,
-          null /* iast */,
-          null /* ciViz */);
-    }
-
-    protected static final AgentSpan startSpan(
-        final CoreTracer tracer,
-        final SpanPrototype prototype,
-        final CharSequence operationName,
-        final boolean ignoreScope,
-        final long timestampMicros) {
-      return startSpan(
-          tracer,
-          AUTO_ASSIGN_SPAN_ID,
-          prototype.instrumentationName(),
-          timestampMicros,
-          null /* serviceName */,
-          operationName,
-          null /* resourceName */,
-          null /* specifiedParentSpanContext */,
-          ignoreScope,
-          false /* errorFlag */,
-          prototype.spanType(),
-          null /* tagLedger */,
-          prototype,
-          null /* links */,
-          null /* appSec */,
-          null /* iast */,
-          null /* ciViz */);
-    }
-
-    protected static final AgentSpan startSpan(
-        final CoreTracer tracer,
-        long spanId,
-        String instrumentationName,
-        long timestampMicro,
-        String serviceName,
-        CharSequence operationName,
-        String resourceName,
-        AgentSpanContext specifiedParentSpanContext,
-        boolean ignoreScope,
-        boolean errorFlag,
-        CharSequence spanType,
-        TagMap.Ledger tagLedger,
-        SpanPrototype spanPrototype,
-        List<AgentSpanLink> links,
-        Object builderRequestContextDataAppSec,
-        Object builderRequestContextDataIast,
-        Object builderCiVisibilityContextData) {
-      // Find the parent context
-      AgentSpanContext parentSpanContext = specifiedParentSpanContext;
-      if (parentSpanContext == null && !ignoreScope) {
-        // use the Scope as parent unless overridden or ignored.
-        final AgentSpan activeSpan = tracer.scopeManager.activeSpan();
-        if (activeSpan != null) {
-          parentSpanContext = activeSpan.spanContext();
-        }
-      }
-
-      if (parentSpanContext == BlackHoleSpan.Context.INSTANCE) {
-        return new BlackHoleSpan(parentSpanContext.getTraceId());
-      }
-
-      // Handle remote terminated span context as span links
-      if (parentSpanContext != null && parentSpanContext.isRemote()) {
-        // Preserve AppSec/IAST request context before dropping the remote parent: when
-        // extract=IGNORE or RESTART the TagContext parent is nulled before buildSpanContext
-        // can copy requestContextDataAppSec/Iast into DDSpanContext.
-        if (parentSpanContext instanceof TagContext) {
-          TagContext tc = (TagContext) parentSpanContext;
-          if (builderRequestContextDataAppSec == null) {
-            builderRequestContextDataAppSec = tc.getRequestContextDataAppSec();
-          }
-          if (builderRequestContextDataIast == null) {
-            builderRequestContextDataIast = tc.getRequestContextDataIast();
-          }
-        }
-        switch (Config.get().getTracePropagationBehaviorExtract()) {
-          case RESTART:
-            links = addParentSpanLink(links, parentSpanContext);
-            parentSpanContext = null;
-            break;
-
-          case IGNORE:
-            parentSpanContext = null;
-            break;
-
-          case CONTINUE:
-          default:
-            links = addTerminatedSpanAsLinks(links, specifiedParentSpanContext);
-            break;
-        }
-      }
-
-      return buildSpan(
-          tracer,
-          spanId,
-          instrumentationName,
-          timestampMicro,
-          serviceName,
-          operationName,
-          resourceName,
-          parentSpanContext,
-          ignoreScope,
-          errorFlag,
-          spanType,
-          tagLedger,
-          spanPrototype,
-          links,
-          builderRequestContextDataAppSec,
-          builderRequestContextDataIast,
-          builderCiVisibilityContextData);
+    public ContextScope activateSpan(AgentSpan span) {
+        return scopeManager.activateSpan(span);
     }
 
     @Override
-    public final CoreSpanBuilder withTag(final String tag, final Number number) {
-      return withTag(tag, (Object) number);
+    public ContextScope activateManualSpan(final AgentSpan span) {
+        return scopeManager.activateManualSpan(span);
     }
 
     @Override
-    public final CoreSpanBuilder withTag(final String tag, final String string) {
-      return withTag(tag, (Object) (string == null || string.isEmpty() ? null : string));
+    @SuppressWarnings("resource")
+    public void activateSpanWithoutScope(AgentSpan span) {
+        scopeManager.activateSpan(span);
     }
 
     @Override
-    public final CoreSpanBuilder withTag(final String tag, final boolean bool) {
-      return withTag(tag, (Object) bool);
+    public boolean isAsyncPropagationEnabled() {
+        return scopeManager.isAsyncPropagationEnabled();
     }
 
     @Override
-    public final CoreSpanBuilder withStartTimestamp(final long timestampMicroseconds) {
-      timestampMicro = timestampMicroseconds;
-      return this;
+    public void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) {
+        scopeManager.setAsyncPropagationEnabled(asyncPropagationEnabled);
     }
 
     @Override
-    public final CoreSpanBuilder withServiceName(final String serviceName) {
-      this.serviceName = serviceName;
-      return this;
+    public void closePrevious(boolean finishSpan) {
+        if (!InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+            throw new IllegalStateException(
+                    "closePrevious must not be called when context swap based logic is enabled");
+        }
+        scopeManager.closePrevious(finishSpan);
     }
 
     @Override
-    public final CoreSpanBuilder withResourceName(final String resourceName) {
-      this.resourceName = resourceName;
-      return this;
+    public ContextScope activateNext(AgentSpan span) {
+        if (!InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+            throw new IllegalStateException("activateNext must not be called when context swap based logic is enabled");
+        }
+        return scopeManager.activateNext(span);
+    }
+
+    public TagInterceptor getTagInterceptor() {
+        return tagInterceptor;
+    }
+
+    public int getPartialFlushMinSpans() {
+        return partialFlushMinSpans;
     }
 
     @Override
-    public final CoreSpanBuilder withErrorFlag() {
-      errorFlag = true;
-      return this;
+    public AgentSpan activeSpan() {
+        return scopeManager.activeSpan();
     }
 
     @Override
-    public final CoreSpanBuilder withSpanType(final CharSequence spanType) {
-      this.spanType = spanType;
-      return this;
+    public void checkpointActiveForRollback() {
+        if (!InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+            throw new IllegalStateException(
+                    "checkpointActiveForRollback must not be called when context swap based logic is enabled");
+        }
+        this.scopeManager.checkpointActiveForRollback();
     }
 
     @Override
-    public final CoreSpanBuilder asChildOf(final AgentSpanContext spanContext) {
-      // TODO we will start propagating stack trace hash and it will need to
-      //  be extracted here if available
-      parent = spanContext;
-      return this;
+    public void rollbackActiveToCheckpoint() {
+        if (!InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+            throw new IllegalStateException(
+                    "rollbackActiveToCheckpoint must not be called when context swap based logic is enabled");
+        }
+        this.scopeManager.rollbackActiveToCheckpoint();
     }
 
-    public final CoreSpanBuilder asChildOf(final AgentSpan agentSpan) {
-      parent = agentSpan.spanContext();
-      return this;
+    @Override
+    public void closeActive() {
+        ContextScope activeScope = this.scopeManager.active();
+        if (activeScope != null) {
+            activeScope.close();
+        }
     }
 
     @Override
-    public final CoreSpanBuilder withTag(final String tag, final Object value) {
-      if (tag == null) {
-        return this;
-      }
-      TagMap.Ledger tagLedger = this.tagLedger;
-      if (tagLedger == null) {
-        // Insertion order is important, so using TagLedger which builds up a set
-        // of Entry modifications in order
-        this.tagLedger = tagLedger = TagMap.ledger();
-      }
-      if (value == null) {
-        // DQH - Use of smartRemove is important to avoid clobbering entries added by another map
-        // smartRemove only records the removal if a prior matching put has already occurred in the
-        // ledger
-        // smartRemove is O(n) but since removes are rare, this is preferable to a more complicated
-        // implementation in setAll
-        tagLedger.smartRemove(tag);
-      } else {
-        tagLedger.set(tag, value);
-      }
-      return this;
+    public AgentSpanContext notifyLambdaStart(Object event, String lambdaRequestId) {
+        maybeResyncClockForLambdaInvocation();
+
+        // Get context from AppSec
+        AgentSpanContext appSecContext = LambdaAppSecHandler.processRequestStart(event);
+
+        // Get context from extension
+        AgentSpanContext extensionContext = LambdaHandler.notifyStartInvocation(event, lambdaRequestId);
+
+        // Merge contexts
+        return LambdaAppSecHandler.mergeContexts(extensionContext, appSecContext);
     }
 
     @Override
-    public final <T> AgentTracer.SpanBuilder withRequestContextData(
-        RequestContextSlot slot, T data) {
-      switch (slot) {
-        case APPSEC:
-          builderRequestContextDataAppSec = data;
-          break;
-        case CI_VISIBILITY:
-          builderCiVisibilityContextData = data;
-          break;
-        case IAST:
-          builderRequestContextDataIast = data;
-          break;
-      }
-      return this;
+    public void notifyExtensionEnd(AgentSpan span, Object result, boolean isError, String lambdaRequestId) {
+        LambdaHandler.notifyEndInvocation(span, result, isError, lambdaRequestId);
     }
 
     @Override
-    public final AgentTracer.SpanBuilder withLink(AgentSpanLink link) {
-      if (link != null) {
-        if (this.links == null) {
-          this.links = new ArrayList<>();
+    public void notifyAppSecEnd(AgentSpan span, Object result) {
+        try {
+            LambdaAppSecHandler.processResponseData(span, result);
+        } finally {
+            LambdaAppSecHandler.processRequestEnd(span);
         }
-        this.links.add(link);
-      }
-      return this;
     }
 
     @Override
-    public final CoreSpanBuilder withSpanId(final long spanId) {
-      this.spanId = spanId;
-      return this;
+    public AgentDataStreamsMonitoring getDataStreamsMonitoring() {
+        return dataStreamsMonitoring;
     }
 
+    private static final RatelimitedLogger rlLog = new RatelimitedLogger(log, 1, MINUTES);
+
     /**
-     * Build the SpanContext, if the actual span has a parent, the following attributes must be
-     * propagated: - ServiceName - Baggage - Trace (a list of all spans related) - SpanType
+     * We use the sampler to know if the trace has to be reported/written. The sampler is called on
+     * the first span (root span) of the trace. If the trace is marked as a sample, we report it.
      *
-     * @return the context
+     * @param trace a list of the spans related to the same trace
      */
-    protected static final DDSpanContext buildSpanContext(
-        final CoreTracer tracer,
-        long spanId,
-        String serviceName,
-        CharSequence operationName,
-        String resourceName,
-        AgentSpanContext resolvedParentSpanContext,
-        boolean errorFlag,
-        CharSequence spanType,
-        TagMap.Ledger tagLedger,
-        SpanPrototype spanPrototype,
-        List<AgentSpanLink> links,
-        Object builderRequestContextDataAppSec,
-        Object builderRequestContextDataIast,
-        Object builderCiVisibilityContextData) {
-      DDTraceId traceId;
-      long parentSpanId;
-      final Map<String, String> baggage;
-      final Baggage w3cBaggage;
-      final TraceCollector parentTraceCollector;
-      final int samplingPriority;
-      final CharSequence origin;
-      final TagMap coreTags;
-      final boolean coreTagsNeedsIntercept;
-      final TagMap rootSpanTags;
-      final boolean rootSpanTagsNeedsIntercept;
-      final DDSpanContext context;
-      Object requestContextDataAppSec;
-      Object requestContextDataIast;
-      Object ciVisibilityContextData;
-      final PathwayContext pathwayContext;
-      final PropagationTags propagationTags;
-
-      if (spanId == AUTO_ASSIGN_SPAN_ID) {
-        spanId = tracer.idGenerationStrategy.generateSpanId();
-      }
-
-      String parentServiceName = null;
-      CharSequence serviceNameSource = MANUAL;
-      // Propagate internal trace.
-      // Note: if we are not in the context of distributed tracing, and we are starting the first
-      // root span, parentSpanContext will be null at this point.
-      if (resolvedParentSpanContext instanceof DDSpanContext) {
-        final DDSpanContext ddsc = (DDSpanContext) resolvedParentSpanContext;
-        traceId = ddsc.getTraceId();
-        parentSpanId = ddsc.getSpanId();
-        baggage = ddsc.getBaggageItems();
-        w3cBaggage = null;
-        parentTraceCollector = ddsc.getTraceCollector();
-        samplingPriority = PrioritySampling.UNSET;
-        origin = null;
-        coreTags = null;
-        coreTagsNeedsIntercept = false;
-        rootSpanTags = null;
-        rootSpanTagsNeedsIntercept = false;
-        parentServiceName = ddsc.getServiceName();
-        serviceNameSource = ddsc.getServiceNameSource();
-        if (serviceName == null) {
-          serviceName = parentServiceName;
-        }
-        RequestContext requestContext =
-            ((DDSpanContext) resolvedParentSpanContext).getRequestContext();
-        if (requestContext != null) {
-          requestContextDataAppSec = requestContext.getData(RequestContextSlot.APPSEC);
-          requestContextDataIast = requestContext.getData(RequestContextSlot.IAST);
-          ciVisibilityContextData = requestContext.getData(RequestContextSlot.CI_VISIBILITY);
+    void write(final SpanList trace) {
+        if (trace.isEmpty() || !trace.get(0).traceConfig().isTraceEnabled()) {
+            return;
+        }
+        List<DDSpan> writtenTrace = interceptCompleteTrace(trace);
+        if (writtenTrace.isEmpty()) {
+            return;
+        }
+
+        // run early tag postprocessors before publishing to the metrics writer since peer / base
+        // service are needed
+
+        // DQH - Using forEach avoids ArrayList$Iter allocation
+        writtenTrace.forEach(DDSpan::processServiceTags);
+
+        boolean forceKeep = metricsAggregator.publish(writtenTrace);
+
+        TraceCollector traceCollector = writtenTrace.get(0).spanContext().getTraceCollector();
+        traceCollector.setSamplingPriorityIfNecessary();
+
+        DDSpan rootSpan = traceCollector.getRootSpan();
+        DDSpan spanToSample = rootSpan == null ? writtenTrace.get(0) : rootSpan;
+        spanToSample.forceKeep(forceKeep);
+        boolean published = forceKeep || traceCollector.sample(spanToSample);
+        if (published) {
+            if (!apmTracingEnabled) {
+                // Stamp the billing marker on every span of each exported chunk so the intake does not bill
+                // APM host usage.
+                for (int i = 0; i < writtenTrace.size(); i++) {
+                    writtenTrace.get(i).setTag(APM_ENABLED, 0);
+                }
+            }
+            writer.write(writtenTrace);
         } else {
-          requestContextDataAppSec = null;
-          requestContextDataIast = null;
-          ciVisibilityContextData = null;
-        }
-        propagationTags = tracer.propagationTagsFactory.empty();
-      } else {
-        long endToEndStartTime;
-
-        if (resolvedParentSpanContext instanceof ExtractedContext) {
-          // Propagate external trace
-          final ExtractedContext extractedContext = (ExtractedContext) resolvedParentSpanContext;
-          traceId = extractedContext.getTraceId();
-          parentSpanId = extractedContext.getSpanId();
-          samplingPriority = extractedContext.getSamplingPriority();
-          endToEndStartTime = extractedContext.getEndToEndStartTime();
-          propagationTags = extractedContext.getPropagationTags();
-        } else if (resolvedParentSpanContext != null) {
-          traceId =
-              resolvedParentSpanContext.getTraceId() == DDTraceId.ZERO
-                  ? tracer.idGenerationStrategy.generateTraceId()
-                  : resolvedParentSpanContext.getTraceId();
-          parentSpanId = resolvedParentSpanContext.getSpanId();
-          samplingPriority = resolvedParentSpanContext.getSamplingPriority();
-          endToEndStartTime = 0;
-          propagationTags = tracer.propagationTagsFactory.empty();
+            // with span streaming this won't work - it needs to be changed
+            // to track an effective sampling rate instead, however, tests
+            // checking that a hard reference on a continuation prevents
+            // reporting fail without this, so will need to be fixed first.
+            writer.incrementDropCounts(writtenTrace.size());
+        }
+        if (null != rootSpan) {
+            onRootSpanFinished(rootSpan, rootSpan.getEndpointTracker());
+        }
+    }
+
+    private List<DDSpan> interceptCompleteTrace(SpanList originalTrace) {
+        return interceptCompleteTrace(interceptors, originalTrace);
+    }
+
+    static final List<DDSpan> interceptCompleteTrace(TraceInterceptors interceptors, SpanList originalTrace) {
+        if (interceptors.isEmpty()) {
+            return originalTrace;
+        }
+        if (originalTrace.isEmpty()) {
+            return SpanList.EMPTY;
+        }
+
+        // Using TraceList to optimize the common case where the interceptors,
+        // don't alter the list.  If the interceptors just return the provided
+        // List, then no need to copy to another List.
+
+        // As an extra precaution, also check the modCount before and after on
+        // the TraceList, since TraceInterceptor could put some other type of
+        // object into the List.
+
+        // There is still a risk that a TraceInterceptor holds onto the provided
+        // List and modifies it later on, but we cannot safeguard against
+        // every possible misuse.
+        Collection<? extends MutableSpan> interceptedTrace = originalTrace;
+        int originalModCount = originalTrace.modCount();
+
+        for (final TraceInterceptor interceptor : interceptors.interceptors()) {
+            try {
+                // If one TraceInterceptor throws an exception, then continue with the next one
+                interceptedTrace = interceptor.onTraceComplete(interceptedTrace);
+            } catch (Throwable e) {
+                String interceptorName = interceptor.getClass().getName();
+                rlLog.warn("Throwable raised in TraceInterceptor {}", interceptorName, e);
+            }
+            if (interceptedTrace == null) {
+                interceptedTrace = emptyList();
+            }
+        }
+
+        if (interceptedTrace == null || interceptedTrace.isEmpty()) {
+            return SpanList.EMPTY;
+        } else if (interceptedTrace == originalTrace && originalTrace.modCount() == originalModCount) {
+            return originalTrace;
         } else {
-          // Start a new trace
-          traceId = tracer.idGenerationStrategy.generateTraceId();
-          parentSpanId = DDSpanId.ZERO;
-          samplingPriority = PrioritySampling.UNSET;
-          endToEndStartTime = 0;
-          propagationTags = tracer.propagationTagsFactory.empty();
-        }
-
-        ConfigSnapshot traceConfig;
-
-        // Get header tags and set origin whether propagating or not.
-        if (resolvedParentSpanContext instanceof TagContext) {
-          TagContext tc = (TagContext) resolvedParentSpanContext;
-          traceConfig = (ConfigSnapshot) tc.getTraceConfig();
-          coreTags = tc.getTags();
-          coreTagsNeedsIntercept = true; // maybe intercept isn't needed?
-          origin = tc.getOrigin();
-          baggage = tc.getBaggage();
-          w3cBaggage = tc.getW3CBaggage();
-          requestContextDataAppSec = tc.getRequestContextDataAppSec();
-          requestContextDataIast = tc.getRequestContextDataIast();
-          ciVisibilityContextData = tc.getCiVisibilityContextData();
+            SpanList trace = new SpanList(interceptedTrace.size());
+            for (final MutableSpan span : interceptedTrace) {
+                if (span instanceof DDSpan) {
+                    trace.add((DDSpan) span);
+                }
+            }
+            return trace;
+        }
+    }
+
+    @Override
+    public String getTraceId() {
+        return getTraceId(activeSpan());
+    }
+
+    @Override
+    public String getSpanId() {
+        return getSpanId(activeSpan());
+    }
+
+    @Override
+    public String getTraceId(AgentSpan span) {
+        if (span != null && span.getTraceId() != null) {
+            DDTraceId traceId = span.getTraceId();
+            // Return padded hexadecimal string representation if 128-bit TraceId logging is enabled and
+            // TraceId is a 128-bit ID, otherwise use the default numerical string representation.
+            if (this.logs128bTraceIdEnabled && traceId.toHighOrderLong() != 0) {
+                return traceId.toHexString();
+            } else {
+                return traceId.toString();
+            }
+        }
+        return "0";
+    }
+
+    @Override
+    public String getSpanId(AgentSpan span) {
+        if (span != null) {
+            return DDSpanId.toString(span.getSpanId());
+        }
+        return "0";
+    }
+
+    @VisibleForTesting
+    TraceInterceptors getInterceptors() {
+        return interceptors;
+    }
+
+    @Override
+    public boolean addTraceInterceptor(final TraceInterceptor interceptor) {
+        TraceInterceptor conflictingInterceptor = interceptors.add(interceptor);
+        if (conflictingInterceptor == null) {
+            return true;
         } else {
-          traceConfig = null;
-          coreTags = null;
-          coreTagsNeedsIntercept = false;
-          origin = null;
-          baggage = null;
-          w3cBaggage = null;
-          requestContextDataAppSec = null;
-          requestContextDataIast = null;
-          ciVisibilityContextData = null;
-        }
-
-        LocalRootSpanTags localRootSpanTags = tracer.localRootSpanTags;
-        rootSpanTags = localRootSpanTags.tags;
-        rootSpanTagsNeedsIntercept = localRootSpanTags.needsIntercept;
-
-        parentTraceCollector = tracer.createTraceCollector(traceId, traceConfig);
-
-        if (endToEndStartTime > 0) {
-          parentTraceCollector.beginEndToEnd(endToEndStartTime);
-        }
-      }
-
-      ConfigSnapshot traceConfig = parentTraceCollector.getTraceConfig();
-
-      // Use parent pathwayContext if present and started
-      pathwayContext =
-          resolvedParentSpanContext != null
-                  && resolvedParentSpanContext.getPathwayContext() != null
-                  && resolvedParentSpanContext.getPathwayContext().isStarted()
-              ? resolvedParentSpanContext.getPathwayContext()
-              : tracer.dataStreamsMonitoring.newPathwayContext();
-
-      // when removing fake services the best upward service name to pick is the local root one
-      // since a split by tag (i.e. servlet context) might have happened on it.
-      if (!tracer.allowInferredServices) {
-        final DDSpan rootSpan = parentTraceCollector.getRootSpan();
-        if (rootSpan != null) {
-          // An inferred proxy represents the gateway, not the application service.
-          // Preserve the service and source already resolved for spans beneath it.
-          // Avoid the synchronized tag lookup when inferred proxies are disabled.
-          if (!tracer.initialConfig.isInferredProxyPropagationEnabled()
-              || rootSpan.getTag("_dd.inferred_span") == null) {
-            serviceName = rootSpan.getServiceName();
-            serviceNameSource = rootSpan.getServiceNameSource();
-          }
+            log.warn(
+                    "Interceptor {} will NOT be registered with the tracer, "
+                            + "as already registered interceptor {} is considered its duplicate",
+                    interceptor,
+                    conflictingInterceptor);
+            return false;
+        }
+    }
+
+    @Override
+    public TraceScope muteTracing() {
+        return activateSpan(blackholeSpan())::close;
+    }
+
+    @Override
+    public DataStreamsCheckpointer getDataStreamsCheckpointer() {
+        return this.dataStreamsMonitoring;
+    }
+
+    @Override
+    public void addShutdownListener(Runnable listener) {
+        this.shutdownListeners.add(listener);
+    }
+
+    @Override
+    public void addScopeListener(final ScopeListener listener) {
+        this.scopeManager.addScopeListener(listener);
+    }
+
+    @Override
+    public SubscriptionService getSubscriptionService(RequestContextSlot slot) {
+        return (SubscriptionService) instrumentationGateway.getCallbackProvider(slot);
+    }
+
+    @Override
+    public CallbackProvider getCallbackProvider(RequestContextSlot slot) {
+        if (slot == RequestContextSlot.APPSEC) {
+            return callbackProviderAppSec;
+        } else if (slot == RequestContextSlot.IAST) {
+            return callbackProviderIast;
         } else {
-          serviceName = null;
-        }
-      }
-      if (serviceName == null) {
-        final Pair<String, CharSequence> serviceNameAndSource =
-            traceConfig.getPreferredServiceNameAndSource();
-        ;
-        if (serviceNameAndSource != null && serviceNameAndSource.hasLeft()) {
-          serviceName = serviceNameAndSource.getLeft();
-          serviceNameSource = serviceNameAndSource.getRight();
-        }
-      }
-      Map<String, Object> contextualTags = null;
-      if (parentServiceName == null) {
-        // only fetch this on local root spans
-        final ClassloaderConfigurationOverrides.ContextualInfo contextualInfo =
-            ClassloaderConfigurationOverrides.maybeGetContextualInfo();
-        if (contextualInfo != null) {
-          // in this case we have a local root without service name.
-          // We can try to see if we can find one from the thread context classloader
-          if (serviceName == null) {
-            serviceName = contextualInfo.getServiceName();
-            if (serviceName != null) {
-              serviceNameSource = contextualInfo.getServiceNameSource();
+            return CallbackProvider.CallbackProviderNoop.INSTANCE;
+        }
+    }
+
+    @Override
+    public CallbackProvider getUniversalCallbackProvider() {
+        return universalCallbackProvider;
+    }
+
+    @Override
+    public void close() {
+        for (Runnable shutdownListener : shutdownListeners) {
+            try {
+                shutdownListener.run();
+            } catch (Exception e) {
+                log.error("Error while running shutdown listener", e);
             }
-          }
-          contextualTags = contextualInfo.getTags();
-        }
-      }
-      if (serviceName == null) {
-        // it could be on the initial snapshot but may be overridden to null and service name
-        // cannot be null
-        serviceName = tracer.serviceName;
-        // do not mark as manual when the service name is coming from the tracer default
-        serviceNameSource = null;
-      }
-
-      if (operationName == null) {
-        operationName = resourceName;
-      }
-
-      final TagMap mergedTracerTags = traceConfig.mergedTracerTags;
-      boolean mergedTracerTagsNeedsIntercept = traceConfig.mergedTracerTagsNeedsIntercept;
-
-      final int tagsSize =
-          mergedTracerTags.size()
-              + (null == tagLedger ? 0 : tagLedger.estimateSize())
-              + (null == coreTags ? 0 : coreTags.size())
-              + (null == rootSpanTags ? 0 : rootSpanTags.size())
-              + (null == contextualTags ? 0 : contextualTags.size());
-
-      if (builderRequestContextDataAppSec != null) {
-        requestContextDataAppSec = builderRequestContextDataAppSec;
-      }
-      if (builderCiVisibilityContextData != null) {
-        ciVisibilityContextData = builderCiVisibilityContextData;
-      }
-      if (builderRequestContextDataIast != null) {
-        requestContextDataIast = builderRequestContextDataIast;
-      }
-
-      // some attributes are inherited from the parent
-      context =
-          new DDSpanContext(
-              traceId,
-              spanId,
-              parentSpanId,
-              parentServiceName,
-              serviceNameSource,
-              serviceName,
-              operationName,
-              resourceName,
-              samplingPriority,
-              origin,
-              baggage,
-              w3cBaggage,
-              errorFlag,
-              spanType,
-              tagsSize,
-              parentTraceCollector,
-              requestContextDataAppSec,
-              requestContextDataIast,
-              ciVisibilityContextData,
-              pathwayContext,
-              tracer.disableSamplingMechanismValidation,
-              propagationTags,
-              tracer.profilingContextIntegration,
-              tracer.injectBaggageAsTags,
-              tracer.injectLinksAsTags,
-              mergedTracerTagsNeedsIntercept ? null : mergedTracerTags);
-
-      // By setting the tags on the context we apply decorators to any tags that have been set via
-      // the builder. The `mergedTracerTags` are always applied first (the precedence floor:
-      // everything overrides them). The remaining contributors are applied last-wins; with
-      // `builderTagsPrecedence` enabled, `tagLedger` (the explicit builder tags) moves to last so
-      // it wins collisions instead of being overridden by `coreTags`/`rootSpanTags`/
-      // `contextualTags` -- see the PR description for the historical context on this ordering.
-      //
-      // mergedTracerTags is trace-level shared state and the precedence floor (everything below
-      // overrides it). When it carries no interceptable tags it is attached as a read-through
-      // PARENT at construction (shared by reference, no per-span copy). When it does need
-      // interception, copy its entries in (the interceptor's per-span side-effects can't be
-      // shared by reference).
-      if (mergedTracerTagsNeedsIntercept) {
-        context.setAllTags(mergedTracerTags, true);
-      }
-      if (spanPrototype != SpanPrototype.NONE) {
-        // Seed the prototype's constant tags + integration name as fallback defaults (span type was
-        // already seeded onto the builder). apply never clobbers, so tags set below still win, and
-        // this is the same seam decorator afterStart uses.
-        context.apply(spanPrototype);
-      }
-      if (tracer.builderTagsPrecedence) {
-        context.setAllTags(coreTags, coreTagsNeedsIntercept);
-        context.setAllTags(rootSpanTags, rootSpanTagsNeedsIntercept);
-        context.setAllTags(contextualTags);
-        context.setAllTags(tagLedger);
-      } else {
-        context.setAllTags(tagLedger);
-        context.setAllTags(coreTags, coreTagsNeedsIntercept);
-        context.setAllTags(rootSpanTags, rootSpanTagsNeedsIntercept);
-        context.setAllTags(contextualTags);
-      }
-      // Version is added later by the postProcessor (InternalTagsAdder), only if not already set
-      // during the request. Config version is kept out of the trace-level bundle (see
-      // withTracerTags), so this removal now only wipes a version set via the span builder —
-      // keeping the existing semantics where a builder-set version is replaced by the config
-      // version. Under read-through this is a cheap local removal (version isn't in the parent,
-      // so no tombstone).
-      context.removeTag(Tags.VERSION);
-      return context;
-    }
-  }
-
-  /** CoreSpanBuilder that can be used to produce multiple spans */
-  static final class MultiSpanBuilder extends CoreSpanBuilder {
-    MultiSpanBuilder(CoreTracer tracer, String instrumentationName, CharSequence operationName) {
-      super(tracer);
-      this.instrumentationName = instrumentationName;
-      this.operationName = operationName;
+        }
+        if (flushOnClose) {
+            flush();
+        }
+        tracingConfigPoller.stop();
+        pendingTraceBuffer.close();
+        writer.close();
+        RumInjector.shutdownTelemetry();
+        AgentMeter.statsDClient().close();
+        metricsAggregator.close();
+        if (initialConfig.isMetricsOtlpExporterEnabled()) {
+            OtlpMetricsService.INSTANCE.shutdown();
+        }
+        if (initialConfig.isLogsOtlpExporterEnabled()) {
+            OtlpLogsService.INSTANCE.shutdown();
+        }
+        dataStreamsMonitoring.close();
+        externalAgentLauncher.close();
+        healthMetrics.close();
+    }
+
+    @Override
+    public void addScopeListener(Runnable afterScopeActivatedCallback, Runnable afterScopeClosedCallback) {
+        addScopeListener(new ScopeListener() {
+            @Override
+            public void afterScopeActivated() {
+                afterScopeActivatedCallback.run();
+            }
+
+            @Override
+            public void afterScopeClosed() {
+                afterScopeClosedCallback.run();
+            }
+        });
+    }
+
+    @Override
+    public void flush() {
+        pendingTraceBuffer.flush();
+        writer.flush();
     }
 
     @Override
-    public AgentSpan start() {
-      return this.startImpl();
+    public void flushMetrics() {
+        try {
+            metricsAggregator.forceReport().get(2_500, MILLISECONDS);
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            log.debug("Failed to wait for metrics flush.", e);
+        }
+
+        if (initialConfig.isMetricsOtlpExporterEnabled()) {
+            OtlpMetricsService.INSTANCE.flush();
+        }
     }
-  }
 
-  static final class ReusableSingleSpanBuilderThreadLocalCache
-      extends ThreadLocal<ReusableSingleSpanBuilder> {
-    private final CoreTracer tracer;
+    @Override
+    public void flushLogs() {
+        if (initialConfig.isLogsOtlpExporterEnabled()) {
+            OtlpLogsService.INSTANCE.flush();
+        }
+    }
 
-    public ReusableSingleSpanBuilderThreadLocalCache(CoreTracer tracer) {
-      this.tracer = tracer;
+    @Override
+    public ProfilingContextIntegration getProfilingContext() {
+        return profilingContextIntegration;
     }
 
     @Override
-    protected ReusableSingleSpanBuilder initialValue() {
-      return new ReusableSingleSpanBuilder(this.tracer);
+    public TraceSegment getTraceSegment() {
+        AgentSpan activeSpan = activeSpan();
+        if (activeSpan == null) {
+            return null;
+        }
+        AgentSpanContext spanContext = activeSpan.spanContext();
+        if (spanContext instanceof DDSpanContext) {
+            return ((DDSpanContext) spanContext).getTraceSegment();
+        }
+        return null;
+    }
+
+    @Override
+    public void addReportToFlare(ZipOutputStream zip) throws IOException {
+        TracerFlare.addText(zip, "dynamic_config.txt", dynamicConfig.toString());
+        TracerFlare.addText(zip, "tracer_health.txt", healthMetrics.summary());
+        TracerFlare.addText(
+                zip, "span_metrics.txt", SpanMetricRegistry.getInstance().summary());
+    }
+
+    Recording writeTimer() {
+        return traceWriteTimer.start();
+    }
+
+    private static <K, V> Map<V, K> invertMap(Map<K, V> map) {
+        Map<V, K> inverted = new HashMap<>(map.size());
+        for (Map.Entry<K, V> entry : map.entrySet()) {
+            inverted.put(entry.getValue(), entry.getKey());
+        }
+        return Collections.unmodifiableMap(inverted);
+    }
+
+    /** Spans are built using this builder */
+    public abstract static class CoreSpanBuilder implements AgentTracer.SpanBuilder {
+        protected static final boolean USE_SCOPE = false;
+        protected static final boolean IGNORE_SCOPE = true;
+        protected static final int AUTO_ASSIGN_SPAN_ID = 0;
+        protected static final long AUTO_ASSIGN_TIMESTAMP = 0L;
+
+        protected final CoreTracer tracer;
+
+        protected String instrumentationName;
+        protected CharSequence operationName;
+
+        // Builder attributes
+        // Make sure any fields added here are also reset properly in ReusableSingleSpanBuilder.reset
+        protected TagMap.Ledger tagLedger;
+        protected SpanPrototype spanPrototype = SpanPrototype.NONE;
+        protected long timestampMicro;
+        protected AgentSpanContext parent;
+        protected String serviceName;
+        protected String resourceName;
+        protected boolean errorFlag;
+        protected CharSequence spanType;
+        protected boolean ignoreScope = USE_SCOPE;
+        protected Object builderRequestContextDataAppSec;
+        protected Object builderRequestContextDataIast;
+        protected Object builderCiVisibilityContextData;
+        protected List<AgentSpanLink> links;
+        protected long spanId = AUTO_ASSIGN_SPAN_ID;
+
+        // Make sure any fields added here are also reset properly in ReusableSingleSpanBuilder.reset
+
+        CoreSpanBuilder(CoreTracer tracer) {
+            this.tracer = tracer;
+        }
+
+        @Override
+        public final CoreSpanBuilder ignoreActiveSpan() {
+            ignoreScope = true;
+            return this;
+        }
+
+        protected static final DDSpan buildSpan(
+                final CoreTracer tracer,
+                long spanId,
+                String instrumentationName,
+                long timestampMicro,
+                String serviceName,
+                CharSequence operationName,
+                String resourceName,
+                AgentSpanContext resolvedParentSpanContext,
+                boolean ignoreScope,
+                boolean errorFlag,
+                CharSequence spanType,
+                TagMap.Ledger tagLedger,
+                SpanPrototype spanPrototype,
+                List<AgentSpanLink> links,
+                Object builderRequestContextDataAppSec,
+                Object builderRequestContextDataIast,
+                Object builderCiVisibilityContextData) {
+            return buildSpanImpl(
+                    tracer,
+                    instrumentationName,
+                    timestampMicro,
+                    links,
+                    buildSpanContext(
+                            tracer,
+                            spanId,
+                            serviceName,
+                            operationName,
+                            resourceName,
+                            resolvedParentSpanContext,
+                            errorFlag,
+                            spanType,
+                            tagLedger,
+                            spanPrototype,
+                            links,
+                            builderRequestContextDataAppSec,
+                            builderRequestContextDataIast,
+                            builderCiVisibilityContextData));
+        }
+
+        protected static final DDSpan buildSpanImpl(
+                CoreTracer tracer,
+                String instrumentationName,
+                long timestampMicro,
+                List<AgentSpanLink> links,
+                DDSpanContext spanContext) {
+            DDSpan span = DDSpan.create(instrumentationName, timestampMicro, spanContext, links);
+            if (span.isLocalRootSpan()) {
+                EndpointTracker tracker = tracer.onRootSpanStarted(span);
+                if (tracker != null) {
+                    span.setEndpointTracker(tracker);
+                }
+            }
+            return span;
+        }
+
+        private static final List<AgentSpanLink> addParentSpanLink(
+                List<AgentSpanLink> links, AgentSpanContext parentSpanContext) {
+            SpanLink link;
+            if (parentSpanContext instanceof ExtractedContext) {
+                String headers = ((ExtractedContext) parentSpanContext)
+                        .getPropagationStyle()
+                        .toString();
+                SpanAttributes attributes = SpanAttributes.builder()
+                        .put("reason", "propagation_behavior_extract")
+                        .put("context_headers", headers)
+                        .build();
+                link = DDSpanLink.from((ExtractedContext) parentSpanContext, attributes);
+            } else {
+                link = SpanLink.from(parentSpanContext);
+            }
+            return addLink(links, link);
+        }
+
+        protected static final List<AgentSpanLink> addTerminatedSpanAsLinks(
+                List<AgentSpanLink> links, AgentSpanContext parentSpanContext) {
+            if (parentSpanContext instanceof TagContext) {
+                List<AgentSpanLink> terminatedSpanLinks = ((TagContext) parentSpanContext).getTerminatedSpanLinks();
+                if (!terminatedSpanLinks.isEmpty()) {
+                    return addLinks(links, terminatedSpanLinks);
+                }
+            }
+            return links;
+        }
+
+        protected static final List<AgentSpanLink> addLink(List<AgentSpanLink> links, AgentSpanLink link) {
+            if (links == null) links = new ArrayList<>();
+            links.add(link);
+            return links;
+        }
+
+        protected static final List<AgentSpanLink> addLinks(
+                List<AgentSpanLink> links, List<AgentSpanLink> additionalLinks) {
+            if (links == null) {
+                links = new ArrayList<>(additionalLinks);
+            } else {
+                links.addAll(additionalLinks);
+            }
+            return links;
+        }
+
+        @Override
+        public abstract AgentSpan start();
+
+        protected AgentSpan startImpl() {
+            return startSpan(
+                    this.tracer,
+                    this.spanId,
+                    this.instrumentationName,
+                    this.timestampMicro,
+                    this.serviceName,
+                    this.operationName,
+                    this.resourceName,
+                    this.parent,
+                    this.ignoreScope,
+                    this.errorFlag,
+                    this.spanType,
+                    this.tagLedger,
+                    this.spanPrototype,
+                    this.links,
+                    this.builderRequestContextDataAppSec,
+                    this.builderRequestContextDataIast,
+                    this.builderCiVisibilityContextData);
+        }
+
+        protected static final AgentSpan startSpan(
+                final CoreTracer tracer,
+                String instrumentationName,
+                CharSequence operationName,
+                AgentSpanContext specifiedParentSpanContext,
+                boolean ignoreScope,
+                long timestampMicros) {
+            return startSpan(
+                    tracer,
+                    AUTO_ASSIGN_SPAN_ID,
+                    instrumentationName,
+                    timestampMicros,
+                    null /* serviceName */,
+                    operationName,
+                    null /* resourceName */,
+                    specifiedParentSpanContext,
+                    ignoreScope,
+                    false /* errorFlag */,
+                    null /* spanType */,
+                    null /* tagLedger */,
+                    SpanPrototype.NONE /* spanPrototype */,
+                    null /* links */,
+                    null /* appSec */,
+                    null /* iast */,
+                    null /* ciViz */);
+        }
+
+        protected static final AgentSpan startSpan(
+                final CoreTracer tracer,
+                final SpanPrototype prototype,
+                final CharSequence operationName,
+                final boolean ignoreScope,
+                final long timestampMicros) {
+            return startSpan(
+                    tracer,
+                    AUTO_ASSIGN_SPAN_ID,
+                    prototype.instrumentationName(),
+                    timestampMicros,
+                    null /* serviceName */,
+                    operationName,
+                    null /* resourceName */,
+                    null /* specifiedParentSpanContext */,
+                    ignoreScope,
+                    false /* errorFlag */,
+                    prototype.spanType(),
+                    null /* tagLedger */,
+                    prototype,
+                    null /* links */,
+                    null /* appSec */,
+                    null /* iast */,
+                    null /* ciViz */);
+        }
+
+        protected static final AgentSpan startSpan(
+                final CoreTracer tracer,
+                long spanId,
+                String instrumentationName,
+                long timestampMicro,
+                String serviceName,
+                CharSequence operationName,
+                String resourceName,
+                AgentSpanContext specifiedParentSpanContext,
+                boolean ignoreScope,
+                boolean errorFlag,
+                CharSequence spanType,
+                TagMap.Ledger tagLedger,
+                SpanPrototype spanPrototype,
+                List<AgentSpanLink> links,
+                Object builderRequestContextDataAppSec,
+                Object builderRequestContextDataIast,
+                Object builderCiVisibilityContextData) {
+            // Find the parent context
+            AgentSpanContext parentSpanContext = specifiedParentSpanContext;
+            if (parentSpanContext == null && !ignoreScope) {
+                // use the Scope as parent unless overridden or ignored.
+                final AgentSpan activeSpan = tracer.scopeManager.activeSpan();
+                if (activeSpan != null) {
+                    parentSpanContext = activeSpan.spanContext();
+                }
+            }
+
+            if (parentSpanContext == BlackHoleSpan.Context.INSTANCE) {
+                return new BlackHoleSpan(parentSpanContext.getTraceId());
+            }
+
+            // Handle remote terminated span context as span links
+            if (parentSpanContext != null && parentSpanContext.isRemote()) {
+                // Preserve AppSec/IAST request context before dropping the remote parent: when
+                // extract=IGNORE or RESTART the TagContext parent is nulled before buildSpanContext
+                // can copy requestContextDataAppSec/Iast into DDSpanContext.
+                if (parentSpanContext instanceof TagContext) {
+                    TagContext tc = (TagContext) parentSpanContext;
+                    if (builderRequestContextDataAppSec == null) {
+                        builderRequestContextDataAppSec = tc.getRequestContextDataAppSec();
+                    }
+                    if (builderRequestContextDataIast == null) {
+                        builderRequestContextDataIast = tc.getRequestContextDataIast();
+                    }
+                }
+                switch (Config.get().getTracePropagationBehaviorExtract()) {
+                    case RESTART:
+                        links = addParentSpanLink(links, parentSpanContext);
+                        parentSpanContext = null;
+                        break;
+
+                    case IGNORE:
+                        parentSpanContext = null;
+                        break;
+
+                    case CONTINUE:
+                    default:
+                        links = addTerminatedSpanAsLinks(links, specifiedParentSpanContext);
+                        break;
+                }
+            }
+
+            return buildSpan(
+                    tracer,
+                    spanId,
+                    instrumentationName,
+                    timestampMicro,
+                    serviceName,
+                    operationName,
+                    resourceName,
+                    parentSpanContext,
+                    ignoreScope,
+                    errorFlag,
+                    spanType,
+                    tagLedger,
+                    spanPrototype,
+                    links,
+                    builderRequestContextDataAppSec,
+                    builderRequestContextDataIast,
+                    builderCiVisibilityContextData);
+        }
+
+        @Override
+        public final CoreSpanBuilder withTag(final String tag, final Number number) {
+            return withTag(tag, (Object) number);
+        }
+
+        @Override
+        public final CoreSpanBuilder withTag(final String tag, final String string) {
+            return withTag(tag, (Object) (string == null || string.isEmpty() ? null : string));
+        }
+
+        @Override
+        public final CoreSpanBuilder withTag(final String tag, final boolean bool) {
+            return withTag(tag, (Object) bool);
+        }
+
+        @Override
+        public final CoreSpanBuilder withStartTimestamp(final long timestampMicroseconds) {
+            timestampMicro = timestampMicroseconds;
+            return this;
+        }
+
+        @Override
+        public final CoreSpanBuilder withServiceName(final String serviceName) {
+            this.serviceName = serviceName;
+            return this;
+        }
+
+        @Override
+        public final CoreSpanBuilder withResourceName(final String resourceName) {
+            this.resourceName = resourceName;
+            return this;
+        }
+
+        @Override
+        public final CoreSpanBuilder withErrorFlag() {
+            errorFlag = true;
+            return this;
+        }
+
+        @Override
+        public final CoreSpanBuilder withSpanType(final CharSequence spanType) {
+            this.spanType = spanType;
+            return this;
+        }
+
+        @Override
+        public final CoreSpanBuilder asChildOf(final AgentSpanContext spanContext) {
+            // TODO we will start propagating stack trace hash and it will need to
+            //  be extracted here if available
+            parent = spanContext;
+            return this;
+        }
+
+        public final CoreSpanBuilder asChildOf(final AgentSpan agentSpan) {
+            parent = agentSpan.spanContext();
+            return this;
+        }
+
+        @Override
+        public final CoreSpanBuilder withTag(final String tag, final Object value) {
+            if (tag == null) {
+                return this;
+            }
+            TagMap.Ledger tagLedger = this.tagLedger;
+            if (tagLedger == null) {
+                // Insertion order is important, so using TagLedger which builds up a set
+                // of Entry modifications in order
+                this.tagLedger = tagLedger = TagMap.ledger();
+            }
+            if (value == null) {
+                // DQH - Use of smartRemove is important to avoid clobbering entries added by another map
+                // smartRemove only records the removal if a prior matching put has already occurred in the
+                // ledger
+                // smartRemove is O(n) but since removes are rare, this is preferable to a more complicated
+                // implementation in setAll
+                tagLedger.smartRemove(tag);
+            } else {
+                tagLedger.set(tag, value);
+            }
+            return this;
+        }
+
+        @Override
+        public final <T> AgentTracer.SpanBuilder withRequestContextData(RequestContextSlot slot, T data) {
+            switch (slot) {
+                case APPSEC:
+                    builderRequestContextDataAppSec = data;
+                    break;
+                case CI_VISIBILITY:
+                    builderCiVisibilityContextData = data;
+                    break;
+                case IAST:
+                    builderRequestContextDataIast = data;
+                    break;
+            }
+            return this;
+        }
+
+        @Override
+        public final AgentTracer.SpanBuilder withLink(AgentSpanLink link) {
+            if (link != null) {
+                if (this.links == null) {
+                    this.links = new ArrayList<>();
+                }
+                this.links.add(link);
+            }
+            return this;
+        }
+
+        @Override
+        public final CoreSpanBuilder withSpanId(final long spanId) {
+            this.spanId = spanId;
+            return this;
+        }
+
+        /**
+         * Build the SpanContext, if the actual span has a parent, the following attributes must be
+         * propagated: - ServiceName - Baggage - Trace (a list of all spans related) - SpanType
+         *
+         * @return the context
+         */
+        protected static final DDSpanContext buildSpanContext(
+                final CoreTracer tracer,
+                long spanId,
+                String serviceName,
+                CharSequence operationName,
+                String resourceName,
+                AgentSpanContext resolvedParentSpanContext,
+                boolean errorFlag,
+                CharSequence spanType,
+                TagMap.Ledger tagLedger,
+                SpanPrototype spanPrototype,
+                List<AgentSpanLink> links,
+                Object builderRequestContextDataAppSec,
+                Object builderRequestContextDataIast,
+                Object builderCiVisibilityContextData) {
+            DDTraceId traceId;
+            long parentSpanId;
+            final Map<String, String> baggage;
+            final Baggage w3cBaggage;
+            final TraceCollector parentTraceCollector;
+            final int samplingPriority;
+            final CharSequence origin;
+            final TagMap coreTags;
+            final boolean coreTagsNeedsIntercept;
+            final TagMap rootSpanTags;
+            final boolean rootSpanTagsNeedsIntercept;
+            final DDSpanContext context;
+            Object requestContextDataAppSec;
+            Object requestContextDataIast;
+            Object ciVisibilityContextData;
+            final PathwayContext pathwayContext;
+            final PropagationTags propagationTags;
+
+            if (spanId == AUTO_ASSIGN_SPAN_ID) {
+                spanId = tracer.idGenerationStrategy.generateSpanId();
+            }
+
+            String parentServiceName = null;
+            CharSequence serviceNameSource = MANUAL;
+            // Propagate internal trace.
+            // Note: if we are not in the context of distributed tracing, and we are starting the first
+            // root span, parentSpanContext will be null at this point.
+            if (resolvedParentSpanContext instanceof DDSpanContext) {
+                final DDSpanContext ddsc = (DDSpanContext) resolvedParentSpanContext;
+                traceId = ddsc.getTraceId();
+                parentSpanId = ddsc.getSpanId();
+                baggage = ddsc.getBaggageItems();
+                w3cBaggage = null;
+                parentTraceCollector = ddsc.getTraceCollector();
+                samplingPriority = PrioritySampling.UNSET;
+                origin = null;
+                coreTags = null;
+                coreTagsNeedsIntercept = false;
+                rootSpanTags = null;
+                rootSpanTagsNeedsIntercept = false;
+                parentServiceName = ddsc.getServiceName();
+                serviceNameSource = ddsc.getServiceNameSource();
+                if (serviceName == null) {
+                    serviceName = parentServiceName;
+                }
+                RequestContext requestContext = ((DDSpanContext) resolvedParentSpanContext).getRequestContext();
+                if (requestContext != null) {
+                    requestContextDataAppSec = requestContext.getData(RequestContextSlot.APPSEC);
+                    requestContextDataIast = requestContext.getData(RequestContextSlot.IAST);
+                    ciVisibilityContextData = requestContext.getData(RequestContextSlot.CI_VISIBILITY);
+                } else {
+                    requestContextDataAppSec = null;
+                    requestContextDataIast = null;
+                    ciVisibilityContextData = null;
+                }
+                propagationTags = tracer.propagationTagsFactory.empty();
+            } else {
+                long endToEndStartTime;
+
+                if (resolvedParentSpanContext instanceof ExtractedContext) {
+                    // Propagate external trace
+                    final ExtractedContext extractedContext = (ExtractedContext) resolvedParentSpanContext;
+                    traceId = extractedContext.getTraceId();
+                    parentSpanId = extractedContext.getSpanId();
+                    samplingPriority = extractedContext.getSamplingPriority();
+                    endToEndStartTime = extractedContext.getEndToEndStartTime();
+                    propagationTags = extractedContext.getPropagationTags();
+                } else if (resolvedParentSpanContext != null) {
+                    traceId = resolvedParentSpanContext.getTraceId() == DDTraceId.ZERO
+                            ? tracer.idGenerationStrategy.generateTraceId()
+                            : resolvedParentSpanContext.getTraceId();
+                    parentSpanId = resolvedParentSpanContext.getSpanId();
+                    samplingPriority = resolvedParentSpanContext.getSamplingPriority();
+                    endToEndStartTime = 0;
+                    propagationTags = tracer.propagationTagsFactory.empty();
+                } else {
+                    // Start a new trace
+                    traceId = tracer.idGenerationStrategy.generateTraceId();
+                    parentSpanId = DDSpanId.ZERO;
+                    samplingPriority = PrioritySampling.UNSET;
+                    endToEndStartTime = 0;
+                    propagationTags = tracer.propagationTagsFactory.empty();
+                }
+
+                ConfigSnapshot traceConfig;
+
+                // Get header tags and set origin whether propagating or not.
+                if (resolvedParentSpanContext instanceof TagContext) {
+                    TagContext tc = (TagContext) resolvedParentSpanContext;
+                    traceConfig = (ConfigSnapshot) tc.getTraceConfig();
+                    coreTags = tc.getTags();
+                    coreTagsNeedsIntercept = true; // maybe intercept isn't needed?
+                    origin = tc.getOrigin();
+                    baggage = tc.getBaggage();
+                    w3cBaggage = tc.getW3CBaggage();
+                    requestContextDataAppSec = tc.getRequestContextDataAppSec();
+                    requestContextDataIast = tc.getRequestContextDataIast();
+                    ciVisibilityContextData = tc.getCiVisibilityContextData();
+                } else {
+                    traceConfig = null;
+                    coreTags = null;
+                    coreTagsNeedsIntercept = false;
+                    origin = null;
+                    baggage = null;
+                    w3cBaggage = null;
+                    requestContextDataAppSec = null;
+                    requestContextDataIast = null;
+                    ciVisibilityContextData = null;
+                }
+
+                LocalRootSpanTags localRootSpanTags = tracer.localRootSpanTags;
+                rootSpanTags = localRootSpanTags.tags;
+                rootSpanTagsNeedsIntercept = localRootSpanTags.needsIntercept;
+
+                parentTraceCollector = tracer.createTraceCollector(traceId, traceConfig);
+
+                if (endToEndStartTime > 0) {
+                    parentTraceCollector.beginEndToEnd(endToEndStartTime);
+                }
+            }
+
+            ConfigSnapshot traceConfig = parentTraceCollector.getTraceConfig();
+
+            // Use parent pathwayContext if present and started
+            pathwayContext = resolvedParentSpanContext != null
+                            && resolvedParentSpanContext.getPathwayContext() != null
+                            && resolvedParentSpanContext.getPathwayContext().isStarted()
+                    ? resolvedParentSpanContext.getPathwayContext()
+                    : tracer.dataStreamsMonitoring.newPathwayContext();
+
+            // when removing fake services the best upward service name to pick is the local root one
+            // since a split by tag (i.e. servlet context) might have happened on it.
+            if (!tracer.allowInferredServices) {
+                final DDSpan rootSpan = parentTraceCollector.getRootSpan();
+                if (rootSpan != null) {
+                    // An inferred proxy represents the gateway, not the application service.
+                    // Preserve the service and source already resolved for spans beneath it.
+                    // Avoid the synchronized tag lookup when inferred proxies are disabled.
+                    if (!tracer.initialConfig.isInferredProxyPropagationEnabled()
+                            || rootSpan.getTag("_dd.inferred_span") == null) {
+                        serviceName = rootSpan.getServiceName();
+                        serviceNameSource = rootSpan.getServiceNameSource();
+                    }
+                } else {
+                    serviceName = null;
+                }
+            }
+            if (serviceName == null) {
+                final Pair<String, CharSequence> serviceNameAndSource = traceConfig.getPreferredServiceNameAndSource();
+                ;
+                if (serviceNameAndSource != null && serviceNameAndSource.hasLeft()) {
+                    serviceName = serviceNameAndSource.getLeft();
+                    serviceNameSource = serviceNameAndSource.getRight();
+                }
+            }
+            Map<String, Object> contextualTags = null;
+            if (parentServiceName == null) {
+                // only fetch this on local root spans
+                final ClassloaderConfigurationOverrides.ContextualInfo contextualInfo =
+                        ClassloaderConfigurationOverrides.maybeGetContextualInfo();
+                if (contextualInfo != null) {
+                    // in this case we have a local root without service name.
+                    // We can try to see if we can find one from the thread context classloader
+                    if (serviceName == null) {
+                        serviceName = contextualInfo.getServiceName();
+                        if (serviceName != null) {
+                            serviceNameSource = contextualInfo.getServiceNameSource();
+                        }
+                    }
+                    contextualTags = contextualInfo.getTags();
+                }
+            }
+            if (serviceName == null) {
+                // it could be on the initial snapshot but may be overridden to null and service name
+                // cannot be null
+                serviceName = tracer.serviceName;
+                // do not mark as manual when the service name is coming from the tracer default
+                serviceNameSource = null;
+            }
+
+            if (operationName == null) {
+                operationName = resourceName;
+            }
+
+            final TagMap mergedTracerTags = traceConfig.mergedTracerTags;
+            boolean mergedTracerTagsNeedsIntercept = traceConfig.mergedTracerTagsNeedsIntercept;
+
+            final int tagsSize = mergedTracerTags.size()
+                    + (null == tagLedger ? 0 : tagLedger.estimateSize())
+                    + (null == coreTags ? 0 : coreTags.size())
+                    + (null == rootSpanTags ? 0 : rootSpanTags.size())
+                    + (null == contextualTags ? 0 : contextualTags.size());
+
+            if (builderRequestContextDataAppSec != null) {
+                requestContextDataAppSec = builderRequestContextDataAppSec;
+            }
+            if (builderCiVisibilityContextData != null) {
+                ciVisibilityContextData = builderCiVisibilityContextData;
+            }
+            if (builderRequestContextDataIast != null) {
+                requestContextDataIast = builderRequestContextDataIast;
+            }
+
+            // some attributes are inherited from the parent
+            context = new DDSpanContext(
+                    traceId,
+                    spanId,
+                    parentSpanId,
+                    parentServiceName,
+                    serviceNameSource,
+                    serviceName,
+                    operationName,
+                    resourceName,
+                    samplingPriority,
+                    origin,
+                    baggage,
+                    w3cBaggage,
+                    errorFlag,
+                    spanType,
+                    tagsSize,
+                    parentTraceCollector,
+                    requestContextDataAppSec,
+                    requestContextDataIast,
+                    ciVisibilityContextData,
+                    pathwayContext,
+                    tracer.disableSamplingMechanismValidation,
+                    propagationTags,
+                    tracer.profilingContextIntegration,
+                    tracer.injectBaggageAsTags,
+                    tracer.injectLinksAsTags,
+                    mergedTracerTagsNeedsIntercept ? null : mergedTracerTags);
+
+            // By setting the tags on the context we apply decorators to any tags that have been set via
+            // the builder. The `mergedTracerTags` are always applied first (the precedence floor:
+            // everything overrides them). The remaining contributors are applied last-wins; with
+            // `builderTagsPrecedence` enabled, `tagLedger` (the explicit builder tags) moves to last so
+            // it wins collisions instead of being overridden by `coreTags`/`rootSpanTags`/
+            // `contextualTags` -- see the PR description for the historical context on this ordering.
+            //
+            // mergedTracerTags is trace-level shared state and the precedence floor (everything below
+            // overrides it). When it carries no interceptable tags it is attached as a read-through
+            // PARENT at construction (shared by reference, no per-span copy). When it does need
+            // interception, copy its entries in (the interceptor's per-span side-effects can't be
+            // shared by reference).
+            if (mergedTracerTagsNeedsIntercept) {
+                context.setAllTags(mergedTracerTags, true);
+            }
+            if (spanPrototype != SpanPrototype.NONE) {
+                // Seed the prototype's constant tags + integration name as fallback defaults (span type was
+                // already seeded onto the builder). apply never clobbers, so tags set below still win, and
+                // this is the same seam decorator afterStart uses.
+                context.apply(spanPrototype);
+            }
+            if (tracer.builderTagsPrecedence) {
+                context.setAllTags(coreTags, coreTagsNeedsIntercept);
+                context.setAllTags(rootSpanTags, rootSpanTagsNeedsIntercept);
+                context.setAllTags(contextualTags);
+                context.setAllTags(tagLedger);
+            } else {
+                context.setAllTags(tagLedger);
+                context.setAllTags(coreTags, coreTagsNeedsIntercept);
+                context.setAllTags(rootSpanTags, rootSpanTagsNeedsIntercept);
+                context.setAllTags(contextualTags);
+            }
+            // Version is added later by the postProcessor (InternalTagsAdder), only if not already set
+            // during the request. Config version is kept out of the trace-level bundle (see
+            // withTracerTags), so this removal now only wipes a version set via the span builder —
+            // keeping the existing semantics where a builder-set version is replaced by the config
+            // version. Under read-through this is a cheap local removal (version isn't in the parent,
+            // so no tombstone).
+            context.removeTag(Tags.VERSION);
+            return context;
+        }
     }
-  }
 
-  /**
-   * Reusable CoreSpanBuilder that can be used to build one and only one span before being reset
-   *
-   * <p>{@link CoreTracer#singleSpanBuilder(String, CharSequence)} reuses instances of this object
-   * to reduce the overhead of span construction
-   */
-  static final class ReusableSingleSpanBuilder extends CoreSpanBuilder {
-    // Used to track whether the ReusableSingleSpanBuilder is actively being used
-    // ReusableSingleSpanBuilder becomes "inUse" after a succesful init/reset and remains "inUse"
-    // until "start" is called
-    boolean inUse;
+    /** CoreSpanBuilder that can be used to produce multiple spans */
+    static final class MultiSpanBuilder extends CoreSpanBuilder {
+        MultiSpanBuilder(CoreTracer tracer, String instrumentationName, CharSequence operationName) {
+            super(tracer);
+            this.instrumentationName = instrumentationName;
+            this.operationName = operationName;
+        }
 
-    ReusableSingleSpanBuilder(CoreTracer tracer) {
-      super(tracer);
-      this.inUse = false;
+        @Override
+        public AgentSpan start() {
+            return this.startImpl();
+        }
     }
 
-    /** Similar to reset, but only valid on first use */
-    void init(String instrumentationName, CharSequence operationName) {
-      assert !this.inUse;
+    static final class ReusableSingleSpanBuilderThreadLocalCache extends ThreadLocal<ReusableSingleSpanBuilder> {
+        private final CoreTracer tracer;
 
-      this.instrumentationName = instrumentationName;
-      this.operationName = operationName;
+        public ReusableSingleSpanBuilderThreadLocalCache(CoreTracer tracer) {
+            this.tracer = tracer;
+        }
 
-      this.inUse = true;
+        @Override
+        protected ReusableSingleSpanBuilder initialValue() {
+            return new ReusableSingleSpanBuilder(this.tracer);
+        }
     }
 
     /**
-     * Resets the {@link ReusableSingleSpanBuilder}, so it may be used to build another single span
+     * Reusable CoreSpanBuilder that can be used to build one and only one span before being reset
      *
-     * @returns <code>true</code> if the reset was successful, otherwise <code>false</code> if this
-     *     <code>ReusableSingleSpanBuilder</code> is still "in-use".
+     * <p>{@link CoreTracer#singleSpanBuilder(String, CharSequence)} reuses instances of this object
+     * to reduce the overhead of span construction
      */
-    final boolean reset(String instrumentationName, CharSequence operationName) {
-      if (this.inUse) return false;
-      this.inUse = true;
-
-      this.instrumentationName = instrumentationName;
-      this.operationName = operationName;
-
-      if (this.tagLedger != null) this.tagLedger.reset();
-      this.spanPrototype = SpanPrototype.NONE;
-      this.timestampMicro = 0L;
-      this.parent = null;
-      this.serviceName = null;
-      this.resourceName = null;
-      this.errorFlag = false;
-      this.spanType = null;
-      this.ignoreScope = false;
-      this.builderRequestContextDataAppSec = null;
-      this.builderRequestContextDataIast = null;
-      this.builderCiVisibilityContextData = null;
-      this.links = null;
-      this.spanId = 0L;
-
-      return true;
-    }
-
-    /*
-     * Clears the inUse boolean, so this ReusableSpanBuilder can be reset
+    static final class ReusableSingleSpanBuilder extends CoreSpanBuilder {
+        // Used to track whether the ReusableSingleSpanBuilder is actively being used
+        // ReusableSingleSpanBuilder becomes "inUse" after a succesful init/reset and remains "inUse"
+        // until "start" is called
+        boolean inUse;
+
+        ReusableSingleSpanBuilder(CoreTracer tracer) {
+            super(tracer);
+            this.inUse = false;
+        }
+
+        /** Similar to reset, but only valid on first use */
+        void init(String instrumentationName, CharSequence operationName) {
+            assert !this.inUse;
+
+            this.instrumentationName = instrumentationName;
+            this.operationName = operationName;
+
+            this.inUse = true;
+        }
+
+        /**
+         * Resets the {@link ReusableSingleSpanBuilder}, so it may be used to build another single span
+         *
+         * @returns <code>true</code> if the reset was successful, otherwise <code>false</code> if this
+         *     <code>ReusableSingleSpanBuilder</code> is still "in-use".
+         */
+        final boolean reset(String instrumentationName, CharSequence operationName) {
+            if (this.inUse) return false;
+            this.inUse = true;
+
+            this.instrumentationName = instrumentationName;
+            this.operationName = operationName;
+
+            if (this.tagLedger != null) this.tagLedger.reset();
+            this.spanPrototype = SpanPrototype.NONE;
+            this.timestampMicro = 0L;
+            this.parent = null;
+            this.serviceName = null;
+            this.resourceName = null;
+            this.errorFlag = false;
+            this.spanType = null;
+            this.ignoreScope = false;
+            this.builderRequestContextDataAppSec = null;
+            this.builderRequestContextDataIast = null;
+            this.builderCiVisibilityContextData = null;
+            this.links = null;
+            this.spanId = 0L;
+
+            return true;
+        }
+
+        /*
+         * Clears the inUse boolean, so this ReusableSpanBuilder can be reset
+         */
+        @Override
+        public AgentSpan start() {
+            assert this.inUse : "ReusableSingleSpanBuilder not reset properly -- multiple span construction?";
+
+            AgentSpan span = this.startImpl();
+            this.inUse = false;
+            return span;
+        }
+    }
+
+    /**
+     * Implements a copy on write array list where interceptors are added to the list ordered by
+     * TraceInterceptor priority
      */
-    @Override
-    public AgentSpan start() {
-      assert this.inUse
-          : "ReusableSingleSpanBuilder not reset properly -- multiple span construction?";
+    static final class TraceInterceptors {
+        private volatile TraceInterceptor[] interceptors = {};
+
+        public boolean isEmpty() {
+            return (this.interceptors.length == 0);
+        }
 
-      AgentSpan span = this.startImpl();
-      this.inUse = false;
-      return span;
+        public TraceInterceptor[] interceptors() {
+            return this.interceptors;
+        }
+
+        /**
+         * Adds the interceptor to the list; returns any colliding interceptor with the same priority
+         *
+         * <ul>
+         *   <li>returns null - if there is no collision and the interceptor was added
+         *   <li>returns the colliding interceptor - if not added
+         * </ul>
+         */
+        public synchronized TraceInterceptor add(TraceInterceptor newInterceptor) {
+            // Interceptors is always kept in sorted order
+
+            // This method performs an insertion sort by scanning interceptors
+            // and finding the correct insertion position
+
+            // Since interceptors isn't expected to be large, not using a binary search
+            // Simple search should provide better cache utilization
+            TraceInterceptor[] interceptors = this.interceptors;
+
+            int newPriority = newInterceptor.priority();
+
+            int insertionIndex = interceptors.length;
+            for (int i = 0; i < interceptors.length; ++i) {
+                TraceInterceptor curInterceptor = interceptors[i];
+                int curPriority = curInterceptor.priority();
+
+                if (curPriority > newPriority) {
+                    insertionIndex = i;
+                    break;
+                } else if (curPriority == newPriority) {
+                    return curInterceptor;
+                }
+            }
+
+            // While not immediately obvious, this code does handle when interceptors was previously empty
+            // In that case, the insertionIndex will be 0 and length will 0, so neither if / arraycopy
+            // blocks are run
+            TraceInterceptor[] newInterceptors = new TraceInterceptor[interceptors.length + 1];
+            if (insertionIndex != 0) {
+                System.arraycopy(interceptors, 0, newInterceptors, 0, insertionIndex);
+            }
+            newInterceptors[insertionIndex] = newInterceptor;
+            if (insertionIndex != interceptors.length) {
+                System.arraycopy(
+                        interceptors,
+                        insertionIndex,
+                        newInterceptors,
+                        insertionIndex + 1,
+                        interceptors.length - insertionIndex);
+            }
+            this.interceptors = newInterceptors;
+            return null;
+        }
     }
-  }
 
-  /**
-   * Implements a copy on write array list where interceptors are added to the list ordered by
-   * TraceInterceptor priority
-   */
-  static final class TraceInterceptors {
-    private volatile TraceInterceptor[] interceptors = {};
+    private static class ShutdownHook extends Thread {
+        private final WeakReference<CoreTracer> reference;
+
+        private ShutdownHook(final CoreTracer tracer) {
+            super(AGENT_THREAD_GROUP, "dd-tracer-shutdown-hook");
+            reference = new WeakReference<>(tracer);
+        }
 
-    public boolean isEmpty() {
-      return (this.interceptors.length == 0);
+        @Override
+        public void run() {
+            final CoreTracer tracer = reference.get();
+            if (tracer != null) {
+                tracer.close();
+            }
+        }
     }
 
-    public TraceInterceptor[] interceptors() {
-      return this.interceptors;
+    protected class ConfigSnapshot extends DynamicConfig.Snapshot {
+        final Sampler sampler;
+
+        final TagMap mergedTracerTags;
+        final boolean mergedTracerTagsNeedsIntercept;
+
+        protected ConfigSnapshot(DynamicConfig<ConfigSnapshot>.Builder builder, ConfigSnapshot oldSnapshot) {
+            super(builder, oldSnapshot);
+
+            if (null == oldSnapshot) {
+                sampler = CoreTracer.this.initialSampler;
+            } else if (Objects.equals(getTraceSampleRate(), oldSnapshot.getTraceSampleRate())
+                    && Objects.equals(getTraceSamplingRules(), oldSnapshot.getTraceSamplingRules())) {
+                sampler = oldSnapshot.sampler;
+            } else {
+                // Reuse the agent sampler: registration for agent rates happens once, at construction.
+                sampler = Sampler.Builder.forConfig(CoreTracer.this.initialConfig, this, agentSampler);
+            }
+
+            if (null == oldSnapshot) {
+                mergedTracerTags = CoreTracer.this.defaultSpanTags.immutableCopy();
+                this.mergedTracerTagsNeedsIntercept = CoreTracer.this.defaultSpanTagsNeedsIntercept;
+            } else if (getTracingTags().equals(oldSnapshot.getTracingTags())) {
+                mergedTracerTags = oldSnapshot.mergedTracerTags;
+                mergedTracerTagsNeedsIntercept = oldSnapshot.mergedTracerTagsNeedsIntercept;
+            } else {
+                mergedTracerTags = withTracerTags(getTracingTags(), CoreTracer.this.initialConfig, this);
+                mergedTracerTagsNeedsIntercept = CoreTracer.this.tagInterceptor.needsIntercept(mergedTracerTags);
+            }
+        }
     }
 
     /**
-     * Adds the interceptor to the list; returns any colliding interceptor with the same priority
-     *
-     * <ul>
-     *   <li>returns null - if there is no collision and the interceptor was added
-     *   <li>returns the colliding interceptor - if not added
-     * </ul>
+     * Tags added by the tracer to all spans; combines user-supplied tags with tracer-defined tags.
      */
-    public synchronized TraceInterceptor add(TraceInterceptor newInterceptor) {
-      // Interceptors is always kept in sorted order
-
-      // This method performs an insertion sort by scanning interceptors
-      // and finding the correct insertion position
-
-      // Since interceptors isn't expected to be large, not using a binary search
-      // Simple search should provide better cache utilization
-      TraceInterceptor[] interceptors = this.interceptors;
-
-      int newPriority = newInterceptor.priority();
-
-      int insertionIndex = interceptors.length;
-      for (int i = 0; i < interceptors.length; ++i) {
-        TraceInterceptor curInterceptor = interceptors[i];
-        int curPriority = curInterceptor.priority();
-
-        if (curPriority > newPriority) {
-          insertionIndex = i;
-          break;
-        } else if (curPriority == newPriority) {
-          return curInterceptor;
-        }
-      }
-
-      // While not immediately obvious, this code does handle when interceptors was previously empty
-      // In that case, the insertionIndex will be 0 and length will 0, so neither if / arraycopy
-      // blocks are run
-      TraceInterceptor[] newInterceptors = new TraceInterceptor[interceptors.length + 1];
-      if (insertionIndex != 0) {
-        System.arraycopy(interceptors, 0, newInterceptors, 0, insertionIndex);
-      }
-      newInterceptors[insertionIndex] = newInterceptor;
-      if (insertionIndex != interceptors.length) {
-        System.arraycopy(
-            interceptors,
-            insertionIndex,
-            newInterceptors,
-            insertionIndex + 1,
-            interceptors.length - insertionIndex);
-      }
-      this.interceptors = newInterceptors;
-      return null;
-    }
-  }
-
-  private static class ShutdownHook extends Thread {
-    private final WeakReference<CoreTracer> reference;
-
-    private ShutdownHook(final CoreTracer tracer) {
-      super(AGENT_THREAD_GROUP, "dd-tracer-shutdown-hook");
-      reference = new WeakReference<>(tracer);
+    static TagMap withTracerTags(Map<String, ?> userSpanTags, Config config, TraceConfig traceConfig) {
+        final TagMap result = TagMap.create(userSpanTags.size() + 5);
+        result.putAll(userSpanTags);
+        // Version is conditionally managed by InternalTagsAdder (added only when service == DD_SERVICE
+        // and not set during the request), so keep it OUT of the trace-level bundle. This matters under
+        // read-through: the bundle becomes a shared parent, and a per-span removeTag(VERSION) on a key
+        // that lived in the parent would mint a per-span tombstone. With version excluded here, the
+        // per-span removeTag (retained, to wipe a builder-set version) is a cheap local op, never a
+        // tombstone.
+        //
+        // EXCEPTION: when `version` is a split-service tag, the TagInterceptor derives the service name
+        // from it, so it must reach the interceptor. Keeping it in the bundle forces the intercepting
+        // seed path (a split tag makes the bundle needsIntercept=true -> copied, not a read-through
+        // parent), where the retained removeTag(VERSION) still deletes only a local copy -- so the
+        // split
+        // side-effect fires and no per-span tombstone is minted either way.
+        //
+        // Cold path: withTracerTags runs at setup / config-change, not per span (mergedTracerTags is
+        // cached on the config snapshot), so this getSplitByTags() lookup needn't be hoisted.
+        if (config == null || !config.getSplitByTags().contains(Tags.VERSION)) {
+            result.remove(Tags.VERSION);
+        }
+        if (null != config) { // static
+            if (!config.getEnv().isEmpty()) {
+                result.set("env", config.getEnv());
+            }
+            if (config.isDataJobsEnabled()) {
+                result.set(DJM_ENABLED, 1);
+            }
+            if (config.isDataStreamsEnabled()) {
+                result.set(DSM_ENABLED, 1);
+            }
+        }
+        if (null != traceConfig) { // dynamic
+            if (traceConfig.isDataStreamsEnabled()) {
+                result.set(DSM_ENABLED, 1);
+            } else {
+                result.remove(DSM_ENABLED);
+            }
+        }
+        return result.freeze();
+    }
+
+    @Override
+    public Context currentContext() {
+        return scopeManager.currentContext();
     }
 
     @Override
-    public void run() {
-      final CoreTracer tracer = reference.get();
-      if (tracer != null) {
-        tracer.close();
-      }
-    }
-  }
-
-  protected class ConfigSnapshot extends DynamicConfig.Snapshot {
-    final Sampler sampler;
-
-    final TagMap mergedTracerTags;
-    final boolean mergedTracerTagsNeedsIntercept;
-
-    protected ConfigSnapshot(
-        DynamicConfig<ConfigSnapshot>.Builder builder, ConfigSnapshot oldSnapshot) {
-      super(builder, oldSnapshot);
-
-      if (null == oldSnapshot) {
-        sampler = CoreTracer.this.initialSampler;
-      } else if (Objects.equals(getTraceSampleRate(), oldSnapshot.getTraceSampleRate())
-          && Objects.equals(getTraceSamplingRules(), oldSnapshot.getTraceSamplingRules())) {
-        sampler = oldSnapshot.sampler;
-      } else {
-        // Reuse the agent sampler: registration for agent rates happens once, at construction.
-        sampler = Sampler.Builder.forConfig(CoreTracer.this.initialConfig, this, agentSampler);
-      }
-
-      if (null == oldSnapshot) {
-        mergedTracerTags = CoreTracer.this.defaultSpanTags.immutableCopy();
-        this.mergedTracerTagsNeedsIntercept = CoreTracer.this.defaultSpanTagsNeedsIntercept;
-      } else if (getTracingTags().equals(oldSnapshot.getTracingTags())) {
-        mergedTracerTags = oldSnapshot.mergedTracerTags;
-        mergedTracerTagsNeedsIntercept = oldSnapshot.mergedTracerTagsNeedsIntercept;
-      } else {
-        mergedTracerTags = withTracerTags(getTracingTags(), CoreTracer.this.initialConfig, this);
-        mergedTracerTagsNeedsIntercept =
-            CoreTracer.this.tagInterceptor.needsIntercept(mergedTracerTags);
-      }
-    }
-  }
-
-  /**
-   * Tags added by the tracer to all spans; combines user-supplied tags with tracer-defined tags.
-   */
-  static TagMap withTracerTags(
-      Map<String, ?> userSpanTags, Config config, TraceConfig traceConfig) {
-    final TagMap result = TagMap.create(userSpanTags.size() + 5);
-    result.putAll(userSpanTags);
-    // Version is conditionally managed by InternalTagsAdder (added only when service == DD_SERVICE
-    // and not set during the request), so keep it OUT of the trace-level bundle. This matters under
-    // read-through: the bundle becomes a shared parent, and a per-span removeTag(VERSION) on a key
-    // that lived in the parent would mint a per-span tombstone. With version excluded here, the
-    // per-span removeTag (retained, to wipe a builder-set version) is a cheap local op, never a
-    // tombstone.
-    //
-    // EXCEPTION: when `version` is a split-service tag, the TagInterceptor derives the service name
-    // from it, so it must reach the interceptor. Keeping it in the bundle forces the intercepting
-    // seed path (a split tag makes the bundle needsIntercept=true -> copied, not a read-through
-    // parent), where the retained removeTag(VERSION) still deletes only a local copy -- so the
-    // split
-    // side-effect fires and no per-span tombstone is minted either way.
-    //
-    // Cold path: withTracerTags runs at setup / config-change, not per span (mergedTracerTags is
-    // cached on the config snapshot), so this getSplitByTags() lookup needn't be hoisted.
-    if (config == null || !config.getSplitByTags().contains(Tags.VERSION)) {
-      result.remove(Tags.VERSION);
-    }
-    if (null != config) { // static
-      if (!config.getEnv().isEmpty()) {
-        result.set("env", config.getEnv());
-      }
-      if (config.isDataJobsEnabled()) {
-        result.set(DJM_ENABLED, 1);
-      }
-      if (config.isDataStreamsEnabled()) {
-        result.set(DSM_ENABLED, 1);
-      }
-    }
-    if (null != traceConfig) { // dynamic
-      if (traceConfig.isDataStreamsEnabled()) {
-        result.set(DSM_ENABLED, 1);
-      } else {
-        result.remove(DSM_ENABLED);
-      }
-    }
-    return result.freeze();
-  }
-
-  @Override
-  public Context currentContext() {
-    return scopeManager.currentContext();
-  }
-
-  @Override
-  public ContextScope attach(Context context) {
-    return scopeManager.attach(context);
-  }
-
-  @Override
-  public Context swap(Context context) {
-    return scopeManager.swap(context);
-  }
-
-  @Override
-  public ContextContinuation capture(Context context) {
-    return scopeManager.capture(context);
-  }
+    public ContextScope attach(Context context) {
+        return scopeManager.attach(context);
+    }
+
+    @Override
+    public Context swap(Context context) {
+        return scopeManager.swap(context);
+    }
+
+    @Override
+    public ContextContinuation capture(Context context) {
+        return scopeManager.capture(context);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java
index b0cc812aadc..a7ff34277b8 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java
@@ -54,968 +54,952 @@
  */
 @SuppressWarnings("resource")
 public class DDSpan implements AgentSpan, CoreSpan<DDSpan>, AttachableWrapper, SelfScopedContext {
-  private static final Logger log = LoggerFactory.getLogger(DDSpan.class);
-
-  static DDSpan create(
-      final String instrumentationName,
-      final long timestampMicro,
-      @Nonnull DDSpanContext context,
-      final List<AgentSpanLink> links) {
-    final DDSpan span = new DDSpan(instrumentationName, timestampMicro, context, links);
-    log.debug("Started span: {}", span);
-    context.getTraceCollector().registerSpan(span);
-    return span;
-  }
-
-  /** The metrics for this span instance. */
-  private final SpanMetrics metrics;
-
-  /** The context attached to the span */
-  private final DDSpanContext context;
-
-  /** Is the source of time an external clock or our internal tick-adjusted clock? */
-  private final boolean externalClock;
-
-  /**
-   * Creation time of span in nanoseconds. Must be greater than zero. For our internal clock we use
-   * combination of millisecond-precision clock and nanosecond-precision offset from start of the
-   * trace. See {@link PendingTrace} for details.
-   */
-  private final long startTimeNano;
-
-  private static final AtomicLongFieldUpdater<DDSpan> DURATION_NANO_UPDATER =
-      AtomicLongFieldUpdater.newUpdater(DDSpan.class, "durationNano");
-
-  /**
-   * The duration in nanoseconds computed using the startTimeMicro or startTimeNano.<hr> The span's
-   * states are defined as follows:
-   * <li>eq 0 -> unfinished.
-   * <li>lt 0 -> finished but unpublished.
-   * <li>gt 0 -> finished and published.
-   */
-  private volatile long durationNano;
-
-  @SuppressFBWarnings(
-      value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
-      justification = "This field is never accessed concurrently")
-  private boolean forceKeep;
-
-  private volatile EndpointTracker endpointTracker;
-
-  // Cached OT/OTel wrapper to avoid multiple allocations, e.g. when span is activated
-  private volatile SpanWrapper wrapper;
-  private static final AtomicReferenceFieldUpdater<DDSpan, SpanWrapper> WRAPPER_FIELD_UPDATER =
-      AtomicReferenceFieldUpdater.newUpdater(DDSpan.class, SpanWrapper.class, "wrapper");
-
-  // the request is to be blocked (AppSec)
-  private volatile Flow.Action.RequestBlockingAction requestBlockingAction;
-
-  /**
-   * Version of a span that can be set by the long running spans feature:
-   * <li>eq 0 -> span is not long running.
-   * <li>lt 0 -> finished span that had running versions previously written.
-   * <li>gt 0 -> long running span and its write version.
-   */
-  private volatile int longRunningVersion = 0;
-
-  private static final List<AgentSpanLink> EMPTY = Collections.emptyList();
-  protected volatile List<AgentSpanLink> links;
-
-  /**
-   * Spans should be constructed using the builder, not by calling the constructor directly.
-   *
-   * @param instrumentationName instrumentation that creates the span
-   * @param timestampMicro if greater than zero, use this time instead of the current time
-   * @param context the context used for the span
-   */
-  @VisibleForTesting
-  DDSpan(
-      @Nonnull String instrumentationName,
-      final long timestampMicro,
-      @Nonnull DDSpanContext context,
-      final List<AgentSpanLink> links) {
-    this.context = context;
-    this.metrics = SpanMetricRegistry.getInstance().get(instrumentationName);
-    this.metrics.onSpanCreated();
-
-    if (timestampMicro <= 0L) {
-      // note: getting internal time from the trace implicitly 'touches' it
-      startTimeNano = context.getTraceCollector().getCurrentTimeNano();
-      externalClock = false;
-    } else {
-      startTimeNano = MICROSECONDS.toNanos(timestampMicro);
-      externalClock = true;
-      context.getTraceCollector().touch(); // external clock: explicitly update lastReferenced
-    }
-
-    this.links = links == null || links.isEmpty() ? EMPTY : new CopyOnWriteArrayList<>(links);
-  }
-
-  public boolean isFinished() {
-    return durationNano != 0;
-  }
-
-  private void finishAndAddToTrace(final long durationNano) {
-    // ensure a min duration of 1
-    if (DURATION_NANO_UPDATER.compareAndSet(this, 0, Math.max(1, durationNano))) {
-      setLongRunningVersion(-this.longRunningVersion);
-      SpanWrapper wrapper = getWrapper();
-      if (wrapper != null) {
-        wrapper.onSpanFinished();
-      }
-      this.metrics.onSpanFinished();
-      TraceCollector.PublishState publishState = context.getTraceCollector().onPublish(this);
-      log.debug("Finished span ({}): {}", publishState, this);
-    } else {
-      log.debug("Already finished: {}", this);
-    }
-  }
-
-  @Override
-  public void finish() {
-    if (!externalClock) {
-      // no external clock was used, so we can rely on nano time
-      finishAndAddToTrace(context.getTraceCollector().getCurrentTimeNano() - startTimeNano);
-    } else {
-      finish(context.getTraceCollector().getTimeSource().getCurrentTimeMicros());
-    }
-  }
-
-  @Override
-  public void finish(final long stopTimeMicros) {
-    long durationNano;
-    if (!externalClock) {
-      // first capture wall-clock offset from 'now' to external stop time
-      long externalOffsetMicros =
-          stopTimeMicros - context.getTraceCollector().getTimeSource().getCurrentTimeMicros();
-      // immediately afterwards calculate internal duration of span to 'now'
-      // note: getting internal time from the trace implicitly 'touches' it
-      durationNano = context.getTraceCollector().getCurrentTimeNano() - startTimeNano;
-      // drop nanosecond precision part of internal duration (expected behaviour)
-      durationNano = MILLISECONDS.toNanos(NANOSECONDS.toMillis(durationNano));
-      // add wall-clock offset to get total duration to external stop time
-      durationNano += MICROSECONDS.toNanos(externalOffsetMicros);
-    } else {
-      durationNano = MICROSECONDS.toNanos(stopTimeMicros) - startTimeNano;
-      context.getTraceCollector().touch(); // external clock: explicitly update lastReferenced
-    }
-    finishAndAddToTrace(durationNano);
-  }
-
-  @Override
-  public final void finishWithDuration(final long durationNano) {
-    finishAndAddToTrace(durationNano);
-  }
-
-  private static final boolean legacyEndToEndEnabled =
-      Config.get().isEndToEndDurationEnabled(false, "legacy");
-
-  @Override
-  public void beginEndToEnd() {
-    if (legacyEndToEndEnabled) {
-      if (null == getBaggageItem(TRACE_START_TIME)) {
-        setBaggageItem(TRACE_START_TIME, Long.toString(NANOSECONDS.toMillis(startTimeNano)));
-      }
-    } else {
-      context.beginEndToEnd();
-    }
-  }
-
-  @Override
-  public void finishWithEndToEnd() {
-    long e2eStart;
-    if (legacyEndToEndEnabled) {
-      String value = context.getBaggageItem(TRACE_START_TIME);
-      try {
-        e2eStart = null != value ? MILLISECONDS.toNanos(Long.parseLong(value)) : 0;
-      } catch (RuntimeException e) {
-        log.debug("Ignoring invalid end-to-end start time {}", value, e);
-        e2eStart = 0;
-      }
-    } else {
-      e2eStart = context.getEndToEndStartTime();
-    }
-    if (e2eStart > 0) {
-      phasedFinish();
-      // get end time from start+duration, ignoring negative bit set by phasedFinish
-      long e2eEnd = startTimeNano + (durationNano & Long.MAX_VALUE);
-      setTag(RECORD_END_TO_END_DURATION_MS, NANOSECONDS.toMillis(Math.max(0, e2eEnd - e2eStart)));
-      publish();
-    } else {
-      finish();
-    }
-  }
-
-  @Override
-  public final boolean phasedFinish() {
-    long durationNano;
-    if (!externalClock) {
-      // note: getting internal time from the trace implicitly 'touches' it
-      durationNano = context.getTraceCollector().getCurrentTimeNano() - startTimeNano;
-    } else {
-      durationNano =
-          context.getTraceCollector().getTimeSource().getCurrentTimeNanos() - startTimeNano;
-      context.getTraceCollector().touch(); // external clock: explicitly update lastReferenced
-    }
-    // Flip the negative bit of the result to allow verifying that publish() is only called once.
-    if (DURATION_NANO_UPDATER.compareAndSet(this, 0, Math.max(1, durationNano) | Long.MIN_VALUE)) {
-      log.debug("Finished span (PHASED): {}", this);
-      return true;
-    } else {
-      log.debug("Already finished: {}", this);
-      return false;
-    }
-  }
-
-  @Override
-  public final void publish() {
-    long durationNano = this.durationNano;
-    if (durationNano == 0) {
-      log.debug("Can't publish unfinished span: {}", this);
-    } else if (durationNano > 0) {
-      log.debug("Already published: {}", this);
-    } else if (DURATION_NANO_UPDATER.compareAndSet(
-        this, durationNano, durationNano & Long.MAX_VALUE)) {
-      TraceCollector.PublishState publishState = context.getTraceCollector().onPublish(this);
-      log.debug("Published span ({}): {}", publishState, this);
-    }
-  }
-
-  @Override
-  public DDSpan setError(final boolean error) {
-    return setError(error, ErrorPriorities.DEFAULT);
-  }
-
-  @Override
-  public DDSpan setError(final boolean error, final byte priority) {
-    context.setErrorFlag(error, priority);
-    return this;
-  }
-
-  @Override
-  public DDSpan setMeasured(boolean measured) {
-    context.setMeasured(measured);
-    return this;
-  }
-
-  public DDSpan forceKeep(boolean forceKeep) {
-    this.forceKeep = forceKeep;
-    return this;
-  }
-
-  @Override
-  public boolean isForceKeep() {
-    return forceKeep;
-  }
-
-  /**
-   * Check if the span is the root parent. It means that the traceId is the same as the spanId. In
-   * the context of distributed tracing this will return true if an only if this is the application
-   * initializing the trace.
-   *
-   * @return true if root, false otherwise
-   */
-  public final boolean isRootSpan() {
-    return context.getParentId() == DDSpanId.ZERO;
-  }
-
-  @Override
-  @Deprecated
-  public AgentSpan getRootSpan() {
-    return getLocalRootSpan();
-  }
-
-  @Override
-  public DDSpan getLocalRootSpan() {
-    return context.getTraceCollector().getRootSpan();
-  }
-
-  /**
-   * Checks whether the span is also the local root span
-   *
-   * @return {@literal true} if this span is the same as {@linkplain #getLocalRootSpan()}
-   */
-  public boolean isLocalRootSpan() {
-    return getLocalRootSpan().equals(this);
-  }
-
-  @Override
-  public boolean isSameTrace(final AgentSpan otherSpan) {
-    return null != otherSpan && getTraceId().equals(otherSpan.getTraceId());
-  }
-
-  @Override
-  public DDSpan setErrorMessage(final String errorMessage) {
-    return setTag(DDTags.ERROR_MSG, errorMessage);
-  }
-
-  @Override
-  public DDSpan addThrowable(final Throwable error) {
-    return addThrowable(error, ErrorPriorities.DEFAULT);
-  }
-
-  @Override
-  public DDSpan addThrowable(Throwable error, byte errorPriority) {
-    if (null != error) {
-      String message = StackTraces.safeGetMessage(error);
-      if (!"broken pipe".equalsIgnoreCase(message)
-          && (error.getCause() == null
-              || !"broken pipe".equalsIgnoreCase(StackTraces.safeGetMessage(error.getCause())))) {
-        // broken pipes happen when clients abort connections,
-        // which might happen because the application is overloaded
-        // or warming up - capturing the stack trace and keeping
-        // the trace may exacerbate existing problems.
-        setError(true, errorPriority);
-        setTag(
-            DDTags.ERROR_STACK,
-            StackTraces.getStackTrace(error, Config.get().getStackTraceLengthLimit()));
-      }
-
-      setTag(DDTags.ERROR_MSG, message);
-      setTag(DDTags.ERROR_TYPE, error.getClass().getName());
-      if (isExceptionReplayEnabled()) {
-        DebuggerContext.handleException(error, this);
-      }
-    }
-    return this;
-  }
-
-  private boolean isExceptionReplayEnabled() {
-    if (!DebuggerConfigBridge.isExceptionReplayEnabled()) {
-      return false;
-    }
-    boolean captureOnlyRootSpan =
-        (Config.get().isDebuggerExceptionOnlyLocalRoot()
-            || !Config.get().isDebuggerExceptionCaptureIntermediateSpansEnabled());
-    if (captureOnlyRootSpan && !isLocalRootSpan()) {
-      return false;
-    }
-    return true;
-  }
-
-  @Override
-  public final DDSpan setTag(final String tag, final String value) {
-    if (value == null || value.isEmpty()) {
-      // Remove the tag
-      context.removeTag(tag);
-    } else {
-      context.setTag(tag, value);
-    }
-    return this;
-  }
-
-  @Override
-  public final DDSpan setTag(final String tag, final boolean value) {
-    context.setTag(tag, value);
-    return this;
-  }
-
-  @Override
-  public final DDSpan setTag(TagMap.EntryReader entry) {
-    context.setTag(entry);
-    return this;
-  }
-
-  @Override
-  public void setRequestBlockingAction(Flow.Action.RequestBlockingAction rba) {
-    this.requestBlockingAction = rba;
-  }
-
-  @Override
-  public Flow.Action.RequestBlockingAction getRequestBlockingAction() {
-    return requestBlockingAction;
-  }
-
-  @Override
-  public DDSpan setTag(final String tag, final int value) {
-    // can't use tag interceptor because it might set a metric
-    // http.status is important because it is expected to be a string downstream
-    if (HTTP_STATUS.equals(tag)) {
-      context.setHttpStatusCode((short) value);
-    }
-    context.setTag(tag, value);
-    return this;
-  }
-
-  @Override
-  public DDSpan setTag(final String tag, final long value) {
-    context.setTag(tag, value);
-    return this;
-  }
-
-  @Override
-  public DDSpan setTag(final String tag, final float value) {
-    context.setTag(tag, value);
-    return this;
-  }
-
-  @Override
-  public DDSpan setTag(final String tag, final double value) {
-    context.setTag(tag, value);
-    return this;
-  }
-
-  @Override
-  public DDSpan setTag(final String tag, final Number value) {
-    context.setTag(tag, value);
-    return this;
-  }
-
-  @Override
-  public DDSpan setMetric(final CharSequence metric, final int value) {
-    context.setMetric(metric, value);
-    return this;
-  }
-
-  @Override
-  public DDSpan setMetric(CharSequence name, float value) {
-    context.setMetric(name, value);
-    return this;
-  }
-
-  @Override
-  public DDSpan setMetric(final CharSequence metric, final long value) {
-    context.setMetric(metric, value);
-    return this;
-  }
-
-  @Override
-  public DDSpan setMetric(final CharSequence metric, final double value) {
-    context.setMetric(metric, value);
-    return this;
-  }
-
-  @Override
-  public DDSpan setMetric(TagMap.EntryReader entry) {
-    context.setMetric(entry);
-    return this;
-  }
-
-  @Override
-  public DDSpan setFlag(CharSequence name, boolean value) {
-    context.setMetric(name, value ? 1 : 0);
-    return this;
-  }
-
-  @Override
-  public DDSpan setTag(final String tag, final CharSequence value) {
-    if (value == null || value.length() == 0) {
-      // Remove the tag
-      context.setTag(tag, null);
-    } else {
-      context.setTag(tag, value);
-    }
-    return this;
-  }
-
-  @Override
-  public DDSpan setTag(final String tag, final Object value) {
-    context.setTag(tag, value);
-    return this;
-  }
-
-  @Override
-  public AgentSpan setAllTags(Map<String, ?> map) {
-    context.setAllTags(map);
-    return this;
-  }
-
-  // FIXME [API] this is not on AgentSpan or MutableSpan
-  @Override
-  public DDSpan removeTag(final String tag) {
-    context.setTag(tag, null);
-    return this;
-  }
-
-  @Override
-  public Object getTag(final String tag) {
-    return context.getTag(tag);
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public <U> U unsafeGetTag(CharSequence name, U defaultValue) {
-    Object tag = unsafeGetTag(name);
-    return null == tag ? defaultValue : (U) tag;
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public <U> U unsafeGetTag(CharSequence name) {
-    return (U) context.unsafeGetTag(String.valueOf(name));
-  }
-
-  @Override
-  @Nonnull
-  public final DDSpanContext spanContext() {
-    return context;
-  }
-
-  @Override
-  public final String getBaggageItem(final String key) {
-    return context.getBaggageItem(key);
-  }
-
-  @Override
-  public final DDSpan setBaggageItem(final String key, final String value) {
-    context.setBaggageItem(key, value);
-    return this;
-  }
-
-  @Override
-  public AgentSpan setHttpStatusCode(int statusCode) {
-    context.setHttpStatusCode((short) statusCode);
-    return this;
-  }
-
-  @Override
-  public short getHttpStatusCode() {
-    return context.getHttpStatusCode();
-  }
-
-  @Override
-  public CharSequence getOrigin() {
-    return context.getOrigin();
-  }
-
-  @Override
-  public final DDSpan setOperationName(final CharSequence operationName) {
-    context.setOperationName(operationName);
-    return this;
-  }
-
-  @Override
-  public final DDSpan setServiceName(final String serviceName) {
-    setServiceName(serviceName, MANUAL);
-    return this;
-  }
-
-  @Override
-  public void setServiceName(@Nonnull String serviceName, @Nonnull CharSequence source) {
-    context.setServiceName(serviceName, source);
-  }
-
-  @Override
-  public CharSequence getServiceNameSource() {
-    return context.getServiceNameSource();
-  }
-
-  @Override
-  public final DDSpan setResourceName(final CharSequence resourceName) {
-    return setResourceName(resourceName, ResourceNamePriorities.DEFAULT);
-  }
-
-  @Override
-  public final DDSpan setResourceName(final CharSequence resourceName, byte priority) {
-    context.setResourceName(resourceName, priority);
-    return this;
-  }
-
-  @Override
-  public RequestContext getRequestContext() {
-    return context.getRequestContext();
-  }
-
-  @Override
-  public Integer forceSamplingDecision() {
-    TraceCollector traceCollector = this.context.getTraceCollector();
-    DDSpan rootSpan = traceCollector.getRootSpan();
-    traceCollector.setSamplingPriorityIfNecessary();
-    if (rootSpan == null) {
-      return null;
-    }
-    return rootSpan.getSamplingPriority();
-  }
-
-  @Deprecated
-  @Override
-  public final DDSpan setSamplingPriority(final int newPriority) {
-    // this method exist only to satisfy MutableSpan. It will be removed in 1.0
-    return setSamplingPriority(newPriority, SamplingMechanism.UNKNOWN);
-  }
-
-  /**
-   * Set the sampling priority of the root span of this span's trace
-   *
-   * <p>Has no effect if the span priority has been propagated (injected or extracted).
-   */
-  @Override
-  public final DDSpan setSamplingPriority(final int newPriority, int samplingMechanism) {
-    context.setSamplingPriority(newPriority, samplingMechanism);
-    return this;
-  }
-
-  @Override
-  public DDSpan setSamplingPriority(
-      int samplingPriority, CharSequence rate, double sampleRate, int samplingMechanism) {
-    return setSamplingPriority(samplingPriority, rate, sampleRate, samplingMechanism, false);
-  }
-
-  @Override
-  public DDSpan setSamplingPriority(
-      int samplingPriority,
-      CharSequence rate,
-      double sampleRate,
-      int samplingMechanism,
-      boolean rateLimiterRejected) {
-    if (context.setSamplingPriority(
-        samplingPriority,
-        samplingMechanism,
-        sampleRate,
-        getTraceId().toLong(),
-        rateLimiterRejected)) {
-      setMetric(rate, sampleRate);
-    }
-    return this;
-  }
-
-  @Override
-  public DDSpan setSpanSamplingPriority(double rate, int limit) {
-    context.setSpanSamplingPriority(rate, limit);
-    return this;
-  }
-
-  @Override
-  public final DDSpan setSpanType(final CharSequence type) {
-    context.setSpanType(type);
-    return this;
-  }
-
-  @Override
-  public void apply(@Nonnull final SpanPrototype prototype) {
-    // Route straight to the context (owner of the tag map + future fast path) rather than through
-    // the interface default's per-setter delegation.
-    context.apply(prototype);
-  }
-
-  // Getters
-
-  @Override
-  public long getStartTime() {
-    return startTimeNano;
-  }
-
-  @Override
-  public long getDurationNano() {
-    return durationNano;
-  }
-
-  @VisibleForTesting
-  void setDurationNano(long duration) {
-    DURATION_NANO_UPDATER.set(this, duration);
-  }
-
-  @Override
-  public String getServiceName() {
-    return context.getServiceName();
-  }
-
-  @Override
-  public DDTraceId getTraceId() {
-    return context.getTraceId();
-  }
-
-  @Override
-  public long getSpanId() {
-    return context.getSpanId();
-  }
-
-  @Override
-  public long getParentId() {
-    return context.getParentId();
-  }
-
-  @Override
-  public CharSequence getResourceName() {
-    return context.getResourceName();
-  }
-
-  @Override
-  public CharSequence getOperationName() {
-    return context.getOperationName();
-  }
-
-  @Override
-  public CharSequence getSpanName() {
-    return context.getOperationName();
-  }
-
-  @Override
-  public void setSpanName(final CharSequence spanName) {
-    context.setOperationName(spanName);
-  }
-
-  @Override // TODO remove for 1.0: No usages within dd-trace-java
-  public boolean hasResourceName() {
-    return context.hasResourceName();
-  }
-
-  @Override
-  public byte getResourceNamePriority() {
-    return context.getResourceNamePriority();
-  }
-
-  @Override
-  public Integer getSamplingPriority() {
-    final int samplingPriority = context.getSamplingPriority();
-    if (samplingPriority == PrioritySampling.UNSET) {
-      return null;
-    } else {
-      return samplingPriority;
-    }
-  }
-
-  @Override
-  public int samplingPriority() {
-    return context.getSamplingPriority();
-  }
-
-  @Override
-  public String getSpanType() {
-    final CharSequence spanType = context.getSpanType();
-    return null == spanType ? null : spanType.toString();
-  }
-
-  @Override
-  public TagMap getTags() {
-    // This is an immutable copy of the tags
-    return context.getTags();
-  }
-
-  @Override
-  public CharSequence getType() {
-    return context.getSpanType();
-  }
-
-  @Override
-  public void processServiceTags() {
-    context.earlyProcessTags(this);
-  }
-
-  @Override
-  public void processTagsAndBaggage(final MetadataConsumer consumer) {
-    context.processTagsAndBaggage(consumer, longRunningVersion, this);
-  }
-
-  @Override
-  public void processTagsAndBaggage(final MetadataConsumer consumer, final boolean firstInChunk) {
-    context.processTagsAndBaggage(consumer, longRunningVersion, this, firstInChunk);
-  }
-
-  @Override
-  public void processTagsAndBaggageWithStructuredLinks(final MetadataConsumer consumer) {
-    context.processTagsAndBaggageWithStructuredLinks(consumer, longRunningVersion, this);
-  }
-
-  @Override
-  public void processTagsAndBaggageWithStructuredLinks(
-      final MetadataConsumer consumer, final boolean firstInChunk) {
-    context.processTagsAndBaggageWithStructuredLinks(
-        consumer, longRunningVersion, this, firstInChunk);
-  }
-
-  @Override
-  public boolean isError() {
-    return context.getErrorFlag();
-  }
-
-  @Override
-  public int getError() {
-    return context.getErrorFlag() ? 1 : 0;
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public <U> U getTag(CharSequence name, U defaultValue) {
-    Object tag = getTag(String.valueOf(name));
-    return null == tag ? defaultValue : (U) tag;
-  }
-
-  @Override
-  public <U> U getTag(CharSequence name) {
-    return getTag(name, null);
-  }
-
-  @Override
-  public boolean hasSamplingPriority() {
-    return context.getTraceCollector().getRootSpan() == this;
-  }
-
-  @Override
-  public boolean isMeasured() {
-    return context.isMeasured();
-  }
-
-  @Override
-  public boolean isTopLevel() {
-    return context.isTopLevel();
-  }
-
-  /**
-   * Retrieve the {@linkplain EndpointTracker} instance associated with the corresponding local root
-   * span
-   *
-   * @return an {@linkplain EndpointTracker} instance or {@literal null}
-   */
-  @Nullable
-  public EndpointTracker getEndpointTracker() {
-    DDSpan localRootSpan = getLocalRootSpan();
-    if (localRootSpan == null) {
-      return null;
-    }
-    if (this.equals(localRootSpan)) {
-      return endpointTracker;
-    }
-    return localRootSpan.endpointTracker;
-  }
-
-  /**
-   * Attach an end-point tracker to the corresponding local root span. When this method is called
-   * multiple times the last invocation will 'win'
-   *
-   * @param endpointTracker the end-point tracker instance
-   */
-  public void setEndpointTracker(@Nonnull EndpointTracker endpointTracker) {
-    DDSpan localRootSpan = getLocalRootSpan();
-    if (localRootSpan == null) {
-      log.warn("Span {} has no associated local root span", this);
-      return;
-    }
-    if (this.equals(localRootSpan)) {
-      this.endpointTracker = endpointTracker;
-    } else {
-      localRootSpan.endpointTracker = endpointTracker;
-    }
-  }
-
-  public Map<String, String> getBaggage() {
-    return Collections.unmodifiableMap(context.getBaggageItems());
-  }
-
-  @Override
-  public String toString() {
-    return context.toString()
-        + ", duration_ns="
-        + durationNano
-        + ", forceKeep="
-        + forceKeep
-        + ", links="
-        + links;
-  }
-
-  @Override
-  public void attachWrapper(@Nonnull SpanWrapper wrapper) {
-    WRAPPER_FIELD_UPDATER.compareAndSet(this, null, wrapper);
-  }
-
-  @Override
-  public SpanWrapper getWrapper() {
-    return WRAPPER_FIELD_UPDATER.get(this);
-  }
-
-  public void setLongRunningVersion(int longRunningVersion) {
-    if (this.longRunningVersion < 0) {
-      return;
-    }
-    this.longRunningVersion = longRunningVersion;
-  }
-
-  @Override
-  public TraceConfig traceConfig() {
-    return context.getTraceCollector().getTraceConfig();
-  }
-
-  public List<? extends AgentSpanLink> getLinks() {
-    return this.links;
-  }
-
-  @Override
-  public void addLink(AgentSpanLink link) {
-    if (link == null) {
-      return;
-    }
-
-    // If links are initially null / empty, then the shared placeholder List EMPTY is used.
-    // Because EMPTY is shared, EMPTY is safe for reading, but not for writing.
-    // On write - if links is the EMPTY placeholder, then need to create a CopyOnWriteArrayList
-    // owned by this DDSpan
-
-    // Creation of the CopyOnWriteArrayList is done via double checking locking using volatile &
-    // synchronized
-
-    // If before or inside the synchronized block, links no longer points to EMPTY,
-    // then this thread or another thread has already handled the list construction,
-    // so just add to the list
-
-    // If links still points to EMPTY inside the synchronized block, then construct a new
-    // CopyOnWriteArrayList containing the newly added link
-
-    List<AgentSpanLink> links = this.links;
-    if (links != EMPTY) {
-      links.add(link);
-      return;
-    }
-
-    synchronized (this) {
-      links = this.links;
-      if (links != EMPTY) {
-        links.add(link);
-      } else {
-        this.links = new CopyOnWriteArrayList<>(Collections.singletonList(link));
-      }
-    }
-  }
-
-  // to be accessible in Spock spies, which the field wouldn't otherwise be
-  public long getStartTimeNano() {
-    return startTimeNano;
-  }
-
-  @Override
-  public Map<String, Object> getMetaStruct() {
-    return context.getMetaStruct();
-  }
-
-  @Override
-  public DDSpan setMetaStruct(final String field, final Object value) {
-    context.setMetaStruct(field, value);
-    return this;
-  }
-
-  @Override
-  public boolean isOutbound() {
-    byte ordinal = context.getSpanKindOrdinal();
-    return ordinal == DDSpanContext.SPAN_KIND_CLIENT || ordinal == DDSpanContext.SPAN_KIND_PRODUCER;
-  }
-
-  @Override
-  public boolean isKind(SpanKindFilter filter) {
-    return filter.matches(context.getSpanKindOrdinal());
-  }
-
-  @Override
-  public String getSpanKindString() {
-    return context.getSpanKindString();
-  }
-
-  @Override
-  public void copyPropagationAndBaggage(final AgentSpan source) {
-    if (source instanceof DDSpan) {
-      final DDSpanContext sourceSpanContext = ((DDSpan) source).spanContext();
-      // align the sampling priority for this span context
-      setSamplingPriority(sourceSpanContext.getSamplingPriority(), DEFAULT);
-      // the sampling mechanism determine the dm tag hence we need to override and lock the current
-      // ptags
-      context
-          .getPropagationTags()
-          .updateAndLockDecisionMaker(sourceSpanContext.getPropagationTags());
-      context.setOrigin(sourceSpanContext.getOrigin());
-      sourceSpanContext.getBaggageItems().forEach(context::setBaggageItem);
-    }
-  }
-
-  @Override
-  public int getLongRunningVersion() {
-    return longRunningVersion;
-  }
+    private static final Logger log = LoggerFactory.getLogger(DDSpan.class);
+
+    static DDSpan create(
+            final String instrumentationName,
+            final long timestampMicro,
+            @Nonnull DDSpanContext context,
+            final List<AgentSpanLink> links) {
+        final DDSpan span = new DDSpan(instrumentationName, timestampMicro, context, links);
+        log.debug("Started span: {}", span);
+        context.getTraceCollector().registerSpan(span);
+        return span;
+    }
+
+    /** The metrics for this span instance. */
+    private final SpanMetrics metrics;
+
+    /** The context attached to the span */
+    private final DDSpanContext context;
+
+    /** Is the source of time an external clock or our internal tick-adjusted clock? */
+    private final boolean externalClock;
+
+    /**
+     * Creation time of span in nanoseconds. Must be greater than zero. For our internal clock we use
+     * combination of millisecond-precision clock and nanosecond-precision offset from start of the
+     * trace. See {@link PendingTrace} for details.
+     */
+    private final long startTimeNano;
+
+    private static final AtomicLongFieldUpdater<DDSpan> DURATION_NANO_UPDATER =
+            AtomicLongFieldUpdater.newUpdater(DDSpan.class, "durationNano");
+
+    /**
+     * The duration in nanoseconds computed using the startTimeMicro or startTimeNano.<hr> The span's
+     * states are defined as follows:
+     * <li>eq 0 -> unfinished.
+     * <li>lt 0 -> finished but unpublished.
+     * <li>gt 0 -> finished and published.
+     */
+    private volatile long durationNano;
+
+    @SuppressFBWarnings(
+            value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
+            justification = "This field is never accessed concurrently")
+    private boolean forceKeep;
+
+    private volatile EndpointTracker endpointTracker;
+
+    // Cached OT/OTel wrapper to avoid multiple allocations, e.g. when span is activated
+    private volatile SpanWrapper wrapper;
+    private static final AtomicReferenceFieldUpdater<DDSpan, SpanWrapper> WRAPPER_FIELD_UPDATER =
+            AtomicReferenceFieldUpdater.newUpdater(DDSpan.class, SpanWrapper.class, "wrapper");
+
+    // the request is to be blocked (AppSec)
+    private volatile Flow.Action.RequestBlockingAction requestBlockingAction;
+
+    /**
+     * Version of a span that can be set by the long running spans feature:
+     * <li>eq 0 -> span is not long running.
+     * <li>lt 0 -> finished span that had running versions previously written.
+     * <li>gt 0 -> long running span and its write version.
+     */
+    private volatile int longRunningVersion = 0;
+
+    private static final List<AgentSpanLink> EMPTY = Collections.emptyList();
+    protected volatile List<AgentSpanLink> links;
+
+    /**
+     * Spans should be constructed using the builder, not by calling the constructor directly.
+     *
+     * @param instrumentationName instrumentation that creates the span
+     * @param timestampMicro if greater than zero, use this time instead of the current time
+     * @param context the context used for the span
+     */
+    @VisibleForTesting
+    DDSpan(
+            @Nonnull String instrumentationName,
+            final long timestampMicro,
+            @Nonnull DDSpanContext context,
+            final List<AgentSpanLink> links) {
+        this.context = context;
+        this.metrics = SpanMetricRegistry.getInstance().get(instrumentationName);
+        this.metrics.onSpanCreated();
+
+        if (timestampMicro <= 0L) {
+            // note: getting internal time from the trace implicitly 'touches' it
+            startTimeNano = context.getTraceCollector().getCurrentTimeNano();
+            externalClock = false;
+        } else {
+            startTimeNano = MICROSECONDS.toNanos(timestampMicro);
+            externalClock = true;
+            context.getTraceCollector().touch(); // external clock: explicitly update lastReferenced
+        }
+
+        this.links = links == null || links.isEmpty() ? EMPTY : new CopyOnWriteArrayList<>(links);
+    }
+
+    public boolean isFinished() {
+        return durationNano != 0;
+    }
+
+    private void finishAndAddToTrace(final long durationNano) {
+        // ensure a min duration of 1
+        if (DURATION_NANO_UPDATER.compareAndSet(this, 0, Math.max(1, durationNano))) {
+            setLongRunningVersion(-this.longRunningVersion);
+            SpanWrapper wrapper = getWrapper();
+            if (wrapper != null) {
+                wrapper.onSpanFinished();
+            }
+            this.metrics.onSpanFinished();
+            TraceCollector.PublishState publishState =
+                    context.getTraceCollector().onPublish(this);
+            log.debug("Finished span ({}): {}", publishState, this);
+        } else {
+            log.debug("Already finished: {}", this);
+        }
+    }
+
+    @Override
+    public void finish() {
+        if (!externalClock) {
+            // no external clock was used, so we can rely on nano time
+            finishAndAddToTrace(context.getTraceCollector().getCurrentTimeNano() - startTimeNano);
+        } else {
+            finish(context.getTraceCollector().getTimeSource().getCurrentTimeMicros());
+        }
+    }
+
+    @Override
+    public void finish(final long stopTimeMicros) {
+        long durationNano;
+        if (!externalClock) {
+            // first capture wall-clock offset from 'now' to external stop time
+            long externalOffsetMicros =
+                    stopTimeMicros - context.getTraceCollector().getTimeSource().getCurrentTimeMicros();
+            // immediately afterwards calculate internal duration of span to 'now'
+            // note: getting internal time from the trace implicitly 'touches' it
+            durationNano = context.getTraceCollector().getCurrentTimeNano() - startTimeNano;
+            // drop nanosecond precision part of internal duration (expected behaviour)
+            durationNano = MILLISECONDS.toNanos(NANOSECONDS.toMillis(durationNano));
+            // add wall-clock offset to get total duration to external stop time
+            durationNano += MICROSECONDS.toNanos(externalOffsetMicros);
+        } else {
+            durationNano = MICROSECONDS.toNanos(stopTimeMicros) - startTimeNano;
+            context.getTraceCollector().touch(); // external clock: explicitly update lastReferenced
+        }
+        finishAndAddToTrace(durationNano);
+    }
+
+    @Override
+    public final void finishWithDuration(final long durationNano) {
+        finishAndAddToTrace(durationNano);
+    }
+
+    private static final boolean legacyEndToEndEnabled = Config.get().isEndToEndDurationEnabled(false, "legacy");
+
+    @Override
+    public void beginEndToEnd() {
+        if (legacyEndToEndEnabled) {
+            if (null == getBaggageItem(TRACE_START_TIME)) {
+                setBaggageItem(TRACE_START_TIME, Long.toString(NANOSECONDS.toMillis(startTimeNano)));
+            }
+        } else {
+            context.beginEndToEnd();
+        }
+    }
+
+    @Override
+    public void finishWithEndToEnd() {
+        long e2eStart;
+        if (legacyEndToEndEnabled) {
+            String value = context.getBaggageItem(TRACE_START_TIME);
+            try {
+                e2eStart = null != value ? MILLISECONDS.toNanos(Long.parseLong(value)) : 0;
+            } catch (RuntimeException e) {
+                log.debug("Ignoring invalid end-to-end start time {}", value, e);
+                e2eStart = 0;
+            }
+        } else {
+            e2eStart = context.getEndToEndStartTime();
+        }
+        if (e2eStart > 0) {
+            phasedFinish();
+            // get end time from start+duration, ignoring negative bit set by phasedFinish
+            long e2eEnd = startTimeNano + (durationNano & Long.MAX_VALUE);
+            setTag(RECORD_END_TO_END_DURATION_MS, NANOSECONDS.toMillis(Math.max(0, e2eEnd - e2eStart)));
+            publish();
+        } else {
+            finish();
+        }
+    }
+
+    @Override
+    public final boolean phasedFinish() {
+        long durationNano;
+        if (!externalClock) {
+            // note: getting internal time from the trace implicitly 'touches' it
+            durationNano = context.getTraceCollector().getCurrentTimeNano() - startTimeNano;
+        } else {
+            durationNano = context.getTraceCollector().getTimeSource().getCurrentTimeNanos() - startTimeNano;
+            context.getTraceCollector().touch(); // external clock: explicitly update lastReferenced
+        }
+        // Flip the negative bit of the result to allow verifying that publish() is only called once.
+        if (DURATION_NANO_UPDATER.compareAndSet(this, 0, Math.max(1, durationNano) | Long.MIN_VALUE)) {
+            log.debug("Finished span (PHASED): {}", this);
+            return true;
+        } else {
+            log.debug("Already finished: {}", this);
+            return false;
+        }
+    }
+
+    @Override
+    public final void publish() {
+        long durationNano = this.durationNano;
+        if (durationNano == 0) {
+            log.debug("Can't publish unfinished span: {}", this);
+        } else if (durationNano > 0) {
+            log.debug("Already published: {}", this);
+        } else if (DURATION_NANO_UPDATER.compareAndSet(this, durationNano, durationNano & Long.MAX_VALUE)) {
+            TraceCollector.PublishState publishState =
+                    context.getTraceCollector().onPublish(this);
+            log.debug("Published span ({}): {}", publishState, this);
+        }
+    }
+
+    @Override
+    public DDSpan setError(final boolean error) {
+        return setError(error, ErrorPriorities.DEFAULT);
+    }
+
+    @Override
+    public DDSpan setError(final boolean error, final byte priority) {
+        context.setErrorFlag(error, priority);
+        return this;
+    }
+
+    @Override
+    public DDSpan setMeasured(boolean measured) {
+        context.setMeasured(measured);
+        return this;
+    }
+
+    public DDSpan forceKeep(boolean forceKeep) {
+        this.forceKeep = forceKeep;
+        return this;
+    }
+
+    @Override
+    public boolean isForceKeep() {
+        return forceKeep;
+    }
+
+    /**
+     * Check if the span is the root parent. It means that the traceId is the same as the spanId. In
+     * the context of distributed tracing this will return true if an only if this is the application
+     * initializing the trace.
+     *
+     * @return true if root, false otherwise
+     */
+    public final boolean isRootSpan() {
+        return context.getParentId() == DDSpanId.ZERO;
+    }
+
+    @Override
+    @Deprecated
+    public AgentSpan getRootSpan() {
+        return getLocalRootSpan();
+    }
+
+    @Override
+    public DDSpan getLocalRootSpan() {
+        return context.getTraceCollector().getRootSpan();
+    }
+
+    /**
+     * Checks whether the span is also the local root span
+     *
+     * @return {@literal true} if this span is the same as {@linkplain #getLocalRootSpan()}
+     */
+    public boolean isLocalRootSpan() {
+        return getLocalRootSpan().equals(this);
+    }
+
+    @Override
+    public boolean isSameTrace(final AgentSpan otherSpan) {
+        return null != otherSpan && getTraceId().equals(otherSpan.getTraceId());
+    }
+
+    @Override
+    public DDSpan setErrorMessage(final String errorMessage) {
+        return setTag(DDTags.ERROR_MSG, errorMessage);
+    }
+
+    @Override
+    public DDSpan addThrowable(final Throwable error) {
+        return addThrowable(error, ErrorPriorities.DEFAULT);
+    }
+
+    @Override
+    public DDSpan addThrowable(Throwable error, byte errorPriority) {
+        if (null != error) {
+            String message = StackTraces.safeGetMessage(error);
+            if (!"broken pipe".equalsIgnoreCase(message)
+                    && (error.getCause() == null
+                            || !"broken pipe".equalsIgnoreCase(StackTraces.safeGetMessage(error.getCause())))) {
+                // broken pipes happen when clients abort connections,
+                // which might happen because the application is overloaded
+                // or warming up - capturing the stack trace and keeping
+                // the trace may exacerbate existing problems.
+                setError(true, errorPriority);
+                setTag(
+                        DDTags.ERROR_STACK,
+                        StackTraces.getStackTrace(error, Config.get().getStackTraceLengthLimit()));
+            }
+
+            setTag(DDTags.ERROR_MSG, message);
+            setTag(DDTags.ERROR_TYPE, error.getClass().getName());
+            if (isExceptionReplayEnabled()) {
+                DebuggerContext.handleException(error, this);
+            }
+        }
+        return this;
+    }
+
+    private boolean isExceptionReplayEnabled() {
+        if (!DebuggerConfigBridge.isExceptionReplayEnabled()) {
+            return false;
+        }
+        boolean captureOnlyRootSpan = (Config.get().isDebuggerExceptionOnlyLocalRoot()
+                || !Config.get().isDebuggerExceptionCaptureIntermediateSpansEnabled());
+        if (captureOnlyRootSpan && !isLocalRootSpan()) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public final DDSpan setTag(final String tag, final String value) {
+        if (value == null || value.isEmpty()) {
+            // Remove the tag
+            context.removeTag(tag);
+        } else {
+            context.setTag(tag, value);
+        }
+        return this;
+    }
+
+    @Override
+    public final DDSpan setTag(final String tag, final boolean value) {
+        context.setTag(tag, value);
+        return this;
+    }
+
+    @Override
+    public final DDSpan setTag(TagMap.EntryReader entry) {
+        context.setTag(entry);
+        return this;
+    }
+
+    @Override
+    public void setRequestBlockingAction(Flow.Action.RequestBlockingAction rba) {
+        this.requestBlockingAction = rba;
+    }
+
+    @Override
+    public Flow.Action.RequestBlockingAction getRequestBlockingAction() {
+        return requestBlockingAction;
+    }
+
+    @Override
+    public DDSpan setTag(final String tag, final int value) {
+        // can't use tag interceptor because it might set a metric
+        // http.status is important because it is expected to be a string downstream
+        if (HTTP_STATUS.equals(tag)) {
+            context.setHttpStatusCode((short) value);
+        }
+        context.setTag(tag, value);
+        return this;
+    }
+
+    @Override
+    public DDSpan setTag(final String tag, final long value) {
+        context.setTag(tag, value);
+        return this;
+    }
+
+    @Override
+    public DDSpan setTag(final String tag, final float value) {
+        context.setTag(tag, value);
+        return this;
+    }
+
+    @Override
+    public DDSpan setTag(final String tag, final double value) {
+        context.setTag(tag, value);
+        return this;
+    }
+
+    @Override
+    public DDSpan setTag(final String tag, final Number value) {
+        context.setTag(tag, value);
+        return this;
+    }
+
+    @Override
+    public DDSpan setMetric(final CharSequence metric, final int value) {
+        context.setMetric(metric, value);
+        return this;
+    }
+
+    @Override
+    public DDSpan setMetric(CharSequence name, float value) {
+        context.setMetric(name, value);
+        return this;
+    }
+
+    @Override
+    public DDSpan setMetric(final CharSequence metric, final long value) {
+        context.setMetric(metric, value);
+        return this;
+    }
+
+    @Override
+    public DDSpan setMetric(final CharSequence metric, final double value) {
+        context.setMetric(metric, value);
+        return this;
+    }
+
+    @Override
+    public DDSpan setMetric(TagMap.EntryReader entry) {
+        context.setMetric(entry);
+        return this;
+    }
+
+    @Override
+    public DDSpan setFlag(CharSequence name, boolean value) {
+        context.setMetric(name, value ? 1 : 0);
+        return this;
+    }
+
+    @Override
+    public DDSpan setTag(final String tag, final CharSequence value) {
+        if (value == null || value.length() == 0) {
+            // Remove the tag
+            context.setTag(tag, null);
+        } else {
+            context.setTag(tag, value);
+        }
+        return this;
+    }
+
+    @Override
+    public DDSpan setTag(final String tag, final Object value) {
+        context.setTag(tag, value);
+        return this;
+    }
+
+    @Override
+    public AgentSpan setAllTags(Map<String, ?> map) {
+        context.setAllTags(map);
+        return this;
+    }
+
+    // FIXME [API] this is not on AgentSpan or MutableSpan
+    @Override
+    public DDSpan removeTag(final String tag) {
+        context.setTag(tag, null);
+        return this;
+    }
+
+    @Override
+    public Object getTag(final String tag) {
+        return context.getTag(tag);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <U> U unsafeGetTag(CharSequence name, U defaultValue) {
+        Object tag = unsafeGetTag(name);
+        return null == tag ? defaultValue : (U) tag;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <U> U unsafeGetTag(CharSequence name) {
+        return (U) context.unsafeGetTag(String.valueOf(name));
+    }
+
+    @Override
+    @Nonnull
+    public final DDSpanContext spanContext() {
+        return context;
+    }
+
+    @Override
+    public final String getBaggageItem(final String key) {
+        return context.getBaggageItem(key);
+    }
+
+    @Override
+    public final DDSpan setBaggageItem(final String key, final String value) {
+        context.setBaggageItem(key, value);
+        return this;
+    }
+
+    @Override
+    public AgentSpan setHttpStatusCode(int statusCode) {
+        context.setHttpStatusCode((short) statusCode);
+        return this;
+    }
+
+    @Override
+    public short getHttpStatusCode() {
+        return context.getHttpStatusCode();
+    }
+
+    @Override
+    public CharSequence getOrigin() {
+        return context.getOrigin();
+    }
+
+    @Override
+    public final DDSpan setOperationName(final CharSequence operationName) {
+        context.setOperationName(operationName);
+        return this;
+    }
+
+    @Override
+    public final DDSpan setServiceName(final String serviceName) {
+        setServiceName(serviceName, MANUAL);
+        return this;
+    }
+
+    @Override
+    public void setServiceName(@Nonnull String serviceName, @Nonnull CharSequence source) {
+        context.setServiceName(serviceName, source);
+    }
+
+    @Override
+    public CharSequence getServiceNameSource() {
+        return context.getServiceNameSource();
+    }
+
+    @Override
+    public final DDSpan setResourceName(final CharSequence resourceName) {
+        return setResourceName(resourceName, ResourceNamePriorities.DEFAULT);
+    }
+
+    @Override
+    public final DDSpan setResourceName(final CharSequence resourceName, byte priority) {
+        context.setResourceName(resourceName, priority);
+        return this;
+    }
+
+    @Override
+    public RequestContext getRequestContext() {
+        return context.getRequestContext();
+    }
+
+    @Override
+    public Integer forceSamplingDecision() {
+        TraceCollector traceCollector = this.context.getTraceCollector();
+        DDSpan rootSpan = traceCollector.getRootSpan();
+        traceCollector.setSamplingPriorityIfNecessary();
+        if (rootSpan == null) {
+            return null;
+        }
+        return rootSpan.getSamplingPriority();
+    }
+
+    @Deprecated
+    @Override
+    public final DDSpan setSamplingPriority(final int newPriority) {
+        // this method exist only to satisfy MutableSpan. It will be removed in 1.0
+        return setSamplingPriority(newPriority, SamplingMechanism.UNKNOWN);
+    }
+
+    /**
+     * Set the sampling priority of the root span of this span's trace
+     *
+     * <p>Has no effect if the span priority has been propagated (injected or extracted).
+     */
+    @Override
+    public final DDSpan setSamplingPriority(final int newPriority, int samplingMechanism) {
+        context.setSamplingPriority(newPriority, samplingMechanism);
+        return this;
+    }
+
+    @Override
+    public DDSpan setSamplingPriority(
+            int samplingPriority, CharSequence rate, double sampleRate, int samplingMechanism) {
+        return setSamplingPriority(samplingPriority, rate, sampleRate, samplingMechanism, false);
+    }
+
+    @Override
+    public DDSpan setSamplingPriority(
+            int samplingPriority,
+            CharSequence rate,
+            double sampleRate,
+            int samplingMechanism,
+            boolean rateLimiterRejected) {
+        if (context.setSamplingPriority(
+                samplingPriority, samplingMechanism, sampleRate, getTraceId().toLong(), rateLimiterRejected)) {
+            setMetric(rate, sampleRate);
+        }
+        return this;
+    }
+
+    @Override
+    public DDSpan setSpanSamplingPriority(double rate, int limit) {
+        context.setSpanSamplingPriority(rate, limit);
+        return this;
+    }
+
+    @Override
+    public final DDSpan setSpanType(final CharSequence type) {
+        context.setSpanType(type);
+        return this;
+    }
+
+    @Override
+    public void apply(@Nonnull final SpanPrototype prototype) {
+        // Route straight to the context (owner of the tag map + future fast path) rather than through
+        // the interface default's per-setter delegation.
+        context.apply(prototype);
+    }
+
+    // Getters
+
+    @Override
+    public long getStartTime() {
+        return startTimeNano;
+    }
+
+    @Override
+    public long getDurationNano() {
+        return durationNano;
+    }
+
+    @VisibleForTesting
+    void setDurationNano(long duration) {
+        DURATION_NANO_UPDATER.set(this, duration);
+    }
+
+    @Override
+    public String getServiceName() {
+        return context.getServiceName();
+    }
+
+    @Override
+    public DDTraceId getTraceId() {
+        return context.getTraceId();
+    }
+
+    @Override
+    public long getSpanId() {
+        return context.getSpanId();
+    }
+
+    @Override
+    public long getParentId() {
+        return context.getParentId();
+    }
+
+    @Override
+    public CharSequence getResourceName() {
+        return context.getResourceName();
+    }
+
+    @Override
+    public CharSequence getOperationName() {
+        return context.getOperationName();
+    }
+
+    @Override
+    public CharSequence getSpanName() {
+        return context.getOperationName();
+    }
+
+    @Override
+    public void setSpanName(final CharSequence spanName) {
+        context.setOperationName(spanName);
+    }
+
+    @Override // TODO remove for 1.0: No usages within dd-trace-java
+    public boolean hasResourceName() {
+        return context.hasResourceName();
+    }
+
+    @Override
+    public byte getResourceNamePriority() {
+        return context.getResourceNamePriority();
+    }
+
+    @Override
+    public Integer getSamplingPriority() {
+        final int samplingPriority = context.getSamplingPriority();
+        if (samplingPriority == PrioritySampling.UNSET) {
+            return null;
+        } else {
+            return samplingPriority;
+        }
+    }
+
+    @Override
+    public int samplingPriority() {
+        return context.getSamplingPriority();
+    }
+
+    @Override
+    public String getSpanType() {
+        final CharSequence spanType = context.getSpanType();
+        return null == spanType ? null : spanType.toString();
+    }
+
+    @Override
+    public TagMap getTags() {
+        // This is an immutable copy of the tags
+        return context.getTags();
+    }
+
+    @Override
+    public CharSequence getType() {
+        return context.getSpanType();
+    }
+
+    @Override
+    public void processServiceTags() {
+        context.earlyProcessTags(this);
+    }
+
+    @Override
+    public void processTagsAndBaggage(final MetadataConsumer consumer) {
+        context.processTagsAndBaggage(consumer, longRunningVersion, this);
+    }
+
+    @Override
+    public void processTagsAndBaggage(final MetadataConsumer consumer, final boolean firstInChunk) {
+        context.processTagsAndBaggage(consumer, longRunningVersion, this, firstInChunk);
+    }
+
+    @Override
+    public void processTagsAndBaggageWithStructuredLinks(final MetadataConsumer consumer) {
+        context.processTagsAndBaggageWithStructuredLinks(consumer, longRunningVersion, this);
+    }
+
+    @Override
+    public void processTagsAndBaggageWithStructuredLinks(final MetadataConsumer consumer, final boolean firstInChunk) {
+        context.processTagsAndBaggageWithStructuredLinks(consumer, longRunningVersion, this, firstInChunk);
+    }
+
+    @Override
+    public boolean isError() {
+        return context.getErrorFlag();
+    }
+
+    @Override
+    public int getError() {
+        return context.getErrorFlag() ? 1 : 0;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <U> U getTag(CharSequence name, U defaultValue) {
+        Object tag = getTag(String.valueOf(name));
+        return null == tag ? defaultValue : (U) tag;
+    }
+
+    @Override
+    public <U> U getTag(CharSequence name) {
+        return getTag(name, null);
+    }
+
+    @Override
+    public boolean hasSamplingPriority() {
+        return context.getTraceCollector().getRootSpan() == this;
+    }
+
+    @Override
+    public boolean isMeasured() {
+        return context.isMeasured();
+    }
+
+    @Override
+    public boolean isTopLevel() {
+        return context.isTopLevel();
+    }
+
+    /**
+     * Retrieve the {@linkplain EndpointTracker} instance associated with the corresponding local root
+     * span
+     *
+     * @return an {@linkplain EndpointTracker} instance or {@literal null}
+     */
+    @Nullable
+    public EndpointTracker getEndpointTracker() {
+        DDSpan localRootSpan = getLocalRootSpan();
+        if (localRootSpan == null) {
+            return null;
+        }
+        if (this.equals(localRootSpan)) {
+            return endpointTracker;
+        }
+        return localRootSpan.endpointTracker;
+    }
+
+    /**
+     * Attach an end-point tracker to the corresponding local root span. When this method is called
+     * multiple times the last invocation will 'win'
+     *
+     * @param endpointTracker the end-point tracker instance
+     */
+    public void setEndpointTracker(@Nonnull EndpointTracker endpointTracker) {
+        DDSpan localRootSpan = getLocalRootSpan();
+        if (localRootSpan == null) {
+            log.warn("Span {} has no associated local root span", this);
+            return;
+        }
+        if (this.equals(localRootSpan)) {
+            this.endpointTracker = endpointTracker;
+        } else {
+            localRootSpan.endpointTracker = endpointTracker;
+        }
+    }
+
+    public Map<String, String> getBaggage() {
+        return Collections.unmodifiableMap(context.getBaggageItems());
+    }
+
+    @Override
+    public String toString() {
+        return context.toString() + ", duration_ns=" + durationNano + ", forceKeep=" + forceKeep + ", links=" + links;
+    }
+
+    @Override
+    public void attachWrapper(@Nonnull SpanWrapper wrapper) {
+        WRAPPER_FIELD_UPDATER.compareAndSet(this, null, wrapper);
+    }
+
+    @Override
+    public SpanWrapper getWrapper() {
+        return WRAPPER_FIELD_UPDATER.get(this);
+    }
+
+    public void setLongRunningVersion(int longRunningVersion) {
+        if (this.longRunningVersion < 0) {
+            return;
+        }
+        this.longRunningVersion = longRunningVersion;
+    }
+
+    @Override
+    public TraceConfig traceConfig() {
+        return context.getTraceCollector().getTraceConfig();
+    }
+
+    public List<? extends AgentSpanLink> getLinks() {
+        return this.links;
+    }
+
+    @Override
+    public void addLink(AgentSpanLink link) {
+        if (link == null) {
+            return;
+        }
+
+        // If links are initially null / empty, then the shared placeholder List EMPTY is used.
+        // Because EMPTY is shared, EMPTY is safe for reading, but not for writing.
+        // On write - if links is the EMPTY placeholder, then need to create a CopyOnWriteArrayList
+        // owned by this DDSpan
+
+        // Creation of the CopyOnWriteArrayList is done via double checking locking using volatile &
+        // synchronized
+
+        // If before or inside the synchronized block, links no longer points to EMPTY,
+        // then this thread or another thread has already handled the list construction,
+        // so just add to the list
+
+        // If links still points to EMPTY inside the synchronized block, then construct a new
+        // CopyOnWriteArrayList containing the newly added link
+
+        List<AgentSpanLink> links = this.links;
+        if (links != EMPTY) {
+            links.add(link);
+            return;
+        }
+
+        synchronized (this) {
+            links = this.links;
+            if (links != EMPTY) {
+                links.add(link);
+            } else {
+                this.links = new CopyOnWriteArrayList<>(Collections.singletonList(link));
+            }
+        }
+    }
+
+    // to be accessible in Spock spies, which the field wouldn't otherwise be
+    public long getStartTimeNano() {
+        return startTimeNano;
+    }
+
+    @Override
+    public Map<String, Object> getMetaStruct() {
+        return context.getMetaStruct();
+    }
+
+    @Override
+    public DDSpan setMetaStruct(final String field, final Object value) {
+        context.setMetaStruct(field, value);
+        return this;
+    }
+
+    @Override
+    public boolean isOutbound() {
+        byte ordinal = context.getSpanKindOrdinal();
+        return ordinal == DDSpanContext.SPAN_KIND_CLIENT || ordinal == DDSpanContext.SPAN_KIND_PRODUCER;
+    }
+
+    @Override
+    public boolean isKind(SpanKindFilter filter) {
+        return filter.matches(context.getSpanKindOrdinal());
+    }
+
+    @Override
+    public String getSpanKindString() {
+        return context.getSpanKindString();
+    }
+
+    @Override
+    public void copyPropagationAndBaggage(final AgentSpan source) {
+        if (source instanceof DDSpan) {
+            final DDSpanContext sourceSpanContext = ((DDSpan) source).spanContext();
+            // align the sampling priority for this span context
+            setSamplingPriority(sourceSpanContext.getSamplingPriority(), DEFAULT);
+            // the sampling mechanism determine the dm tag hence we need to override and lock the current
+            // ptags
+            context.getPropagationTags().updateAndLockDecisionMaker(sourceSpanContext.getPropagationTags());
+            context.setOrigin(sourceSpanContext.getOrigin());
+            sourceSpanContext.getBaggageItems().forEach(context::setBaggageItem);
+        }
+    }
+
+    @Override
+    public int getLongRunningVersion() {
+        return longRunningVersion;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java
index 9de33bd4ccb..2874a5176d4 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java
@@ -59,1589 +59,1556 @@
  * across Span boundaries and (2) any Datadog fields that are needed to identify or contextualize
  * the associated Span instance
  */
-public class DDSpanContext
-    implements AgentSpanContext, RequestContext, TraceSegment, ProfilerContext {
-  private static final Logger log = LoggerFactory.getLogger(DDSpanContext.class);
+public class DDSpanContext implements AgentSpanContext, RequestContext, TraceSegment, ProfilerContext {
+    private static final Logger log = LoggerFactory.getLogger(DDSpanContext.class);
 
-  public static final String PRIORITY_SAMPLING_KEY = "_sampling_priority_v1";
-  public static final String SAMPLE_RATE_KEY = "_sample_rate";
+    public static final String PRIORITY_SAMPLING_KEY = "_sampling_priority_v1";
+    public static final String SAMPLE_RATE_KEY = "_sample_rate";
 
-  public static final String SPAN_SAMPLING_MECHANISM_TAG = "_dd.span_sampling.mechanism";
-  public static final String SPAN_SAMPLING_RULE_RATE_TAG = "_dd.span_sampling.rule_rate";
-  public static final String SPAN_SAMPLING_MAX_PER_SECOND_TAG = "_dd.span_sampling.max_per_second";
+    public static final String SPAN_SAMPLING_MECHANISM_TAG = "_dd.span_sampling.mechanism";
+    public static final String SPAN_SAMPLING_RULE_RATE_TAG = "_dd.span_sampling.rule_rate";
+    public static final String SPAN_SAMPLING_MAX_PER_SECOND_TAG = "_dd.span_sampling.max_per_second";
 
-  private static final UTF8BytesString OTLP_EXPORT_TRUE = UTF8BytesString.create("true");
-  private static final UTF8BytesString OTLP_EXPORT_FALSE = UTF8BytesString.create("false");
+    private static final UTF8BytesString OTLP_EXPORT_TRUE = UTF8BytesString.create("true");
+    private static final UTF8BytesString OTLP_EXPORT_FALSE = UTF8BytesString.create("false");
 
-  private static final DDCache<String, UTF8BytesString> THREAD_NAMES =
-      DDCaches.newFixedSizeCache(256);
+    private static final DDCache<String, UTF8BytesString> THREAD_NAMES = DDCaches.newFixedSizeCache(256);
 
-  private static final Map<String, String> EMPTY_BAGGAGE = Collections.emptyMap();
-  private static final Map<String, Object> EMPTY_META_STRUCT = Collections.emptyMap();
+    private static final Map<String, String> EMPTY_BAGGAGE = Collections.emptyMap();
+    private static final Map<String, Object> EMPTY_META_STRUCT = Collections.emptyMap();
 
-  /** The collection of all span related to this one */
-  private final TraceCollector traceCollector;
+    /** The collection of all span related to this one */
+    private final TraceCollector traceCollector;
 
-  private final TagInterceptor tagInterceptor;
+    private final TagInterceptor tagInterceptor;
 
-  /** Baggage is associated with the whole trace and shared with other spans */
-  private volatile Map<String, String> baggageItems;
+    /** Baggage is associated with the whole trace and shared with other spans */
+    private volatile Map<String, String> baggageItems;
 
-  private final Baggage w3cBaggage;
+    private final Baggage w3cBaggage;
 
-  // Not Shared with other span contexts
-  private final DDTraceId traceId;
-  private final long spanId;
-  private final long parentId;
+    // Not Shared with other span contexts
+    private final DDTraceId traceId;
+    private final long spanId;
+    private final long parentId;
 
-  private final String parentServiceName;
+    private final String parentServiceName;
 
-  private final long threadId;
-  private final UTF8BytesString threadName;
+    private final long threadId;
+    private final UTF8BytesString threadName;
 
-  private volatile short httpStatusCode;
+    private volatile short httpStatusCode;
 
-  // Cached span.kind ordinal for fast isOutbound() checks.
-  // Ordinal constants -- keep in sync with SPAN_KIND_VALUES array.
-  static final byte SPAN_KIND_UNSET = 0;
-  static final byte SPAN_KIND_SERVER = 1;
-  static final byte SPAN_KIND_CLIENT = 2;
-  static final byte SPAN_KIND_PRODUCER = 3;
-  static final byte SPAN_KIND_CONSUMER = 4;
-  static final byte SPAN_KIND_INTERNAL = 5;
-  static final byte SPAN_KIND_BROKER = 6;
-  static final byte SPAN_KIND_CUSTOM = 7;
+    // Cached span.kind ordinal for fast isOutbound() checks.
+    // Ordinal constants -- keep in sync with SPAN_KIND_VALUES array.
+    static final byte SPAN_KIND_UNSET = 0;
+    static final byte SPAN_KIND_SERVER = 1;
+    static final byte SPAN_KIND_CLIENT = 2;
+    static final byte SPAN_KIND_PRODUCER = 3;
+    static final byte SPAN_KIND_CONSUMER = 4;
+    static final byte SPAN_KIND_INTERNAL = 5;
+    static final byte SPAN_KIND_BROKER = 6;
+    static final byte SPAN_KIND_CUSTOM = 7;
 
-  /** Maps ordinal to canonical string constant. Index 0 (UNSET) and 7 (CUSTOM) are null. */
-  static final String[] SPAN_KIND_VALUES = {
-    null, // UNSET
-    Tags.SPAN_KIND_SERVER,
-    Tags.SPAN_KIND_CLIENT,
-    Tags.SPAN_KIND_PRODUCER,
-    Tags.SPAN_KIND_CONSUMER,
-    Tags.SPAN_KIND_INTERNAL,
-    Tags.SPAN_KIND_BROKER,
-    null // CUSTOM
-  };
-
-  private volatile byte spanKindOrdinal = SPAN_KIND_UNSET;
-
-  private CharSequence integrationName;
-  private CharSequence serviceNameSource;
-
-  /**
-   * Tags are associated to the current span, they will not propagate to the children span.
-   *
-   * <p>The underlying assumption for using a normal Map with synchronized access instead of a
-   * ConcurrentHashMap is that even though the tags can be accessed and modified from multiple
-   * threads, they will rarely, if ever, be read and modified concurrently by multiple threads but
-   * rather read and accessed in a serial fashion on thread after thread. The synchronization can
-   * then be wrapped around bulk operations to minimize the costly atomic operations.
-   */
-  private final TagMap unsafeTags;
-
-  /** The service name is required, otherwise the span are dropped by the agent */
-  private volatile String serviceName;
-
-  /** The resource associated to the service (server_web, database, etc.) */
-  private volatile CharSequence resourceName;
-
-  private volatile byte resourceNamePriority = ResourceNamePriorities.DEFAULT;
-
-  /** Each span have an operation name describing the current span */
-  private volatile CharSequence operationName;
-
-  /** The type of the span. If null, the Datadog Agent will report as a custom */
-  private volatile CharSequence spanType;
-
-  /** True indicates that the span reports an error */
-  private volatile boolean errorFlag;
-
-  private volatile byte errorFlagPriority = UNSET;
-
-  private volatile boolean measured;
-
-  private volatile boolean topLevel;
-
-  /** The origin of the trace. (eg. Synthetics, CI App) */
-  private volatile CharSequence origin;
-
-  /** RequestContext data for the InstrumentationGateway */
-  private final Object requestContextDataAppSec;
-
-  private final Object requestContextDataIast;
-  private final Object ciVisibilityContextData;
-
-  private final boolean disableSamplingMechanismValidation;
-
-  private final PropagationTags propagationTags;
-
-  private volatile PathwayContext pathwayContext;
-
-  private volatile BlockResponseFunction blockResponseFunction;
-
-  private volatile ClientIpAddressData clientIpAddressData;
-
-  private final ProfilingContextIntegration profilingContextIntegration;
-  private final boolean injectBaggageAsTags;
-  private final boolean injectLinksAsTags;
-  private volatile int encodedOperationName;
-  private volatile int encodedResourceName;
-
-  /**
-   * Metastruct keys are associated to the current span, they will not propagate to the children
-   * span. They are an efficient way to send binary data to the agent without relying on bulky json
-   * payloads inside tags.
-   */
-  private volatile Map<String, Object> metaStruct = EMPTY_META_STRUCT;
-
-  public DDSpanContext(
-      final DDTraceId traceId,
-      final long spanId,
-      final long parentId,
-      final CharSequence parentServiceName,
-      final String serviceName,
-      final CharSequence operationName,
-      final CharSequence resourceName,
-      final int samplingPriority,
-      final CharSequence origin,
-      final Map<String, String> baggageItems,
-      final boolean errorFlag,
-      final CharSequence spanType,
-      final int tagsSize,
-      final TraceCollector traceCollector,
-      final Object requestContextDataAppSec,
-      final Object requestContextDataIast,
-      final PathwayContext pathwayContext,
-      final boolean disableSamplingMechanismValidation,
-      final PropagationTags propagationTags) {
-    this(
-        traceId,
-        spanId,
-        parentId,
-        parentServiceName,
-        null,
-        serviceName,
-        operationName,
-        resourceName,
-        samplingPriority,
-        origin,
-        baggageItems,
-        null,
-        errorFlag,
-        spanType,
-        tagsSize,
-        traceCollector,
-        requestContextDataAppSec,
-        requestContextDataIast,
-        null,
-        pathwayContext,
-        disableSamplingMechanismValidation,
-        propagationTags,
-        ProfilingContextIntegration.NoOp.INSTANCE,
-        true,
-        true,
-        null);
-  }
-
-  public DDSpanContext(
-      final DDTraceId traceId,
-      final long spanId,
-      final long parentId,
-      final CharSequence parentServiceName,
-      final String serviceName,
-      final CharSequence operationName,
-      final CharSequence resourceName,
-      final int samplingPriority,
-      final CharSequence origin,
-      final Map<String, String> baggageItems,
-      final boolean errorFlag,
-      final CharSequence spanType,
-      final int tagsSize,
-      final TraceCollector traceCollector,
-      final Object requestContextDataAppSec,
-      final Object requestContextDataIast,
-      final PathwayContext pathwayContext,
-      final boolean disableSamplingMechanismValidation,
-      final PropagationTags propagationTags,
-      final boolean injectBaggageAsTags,
-      final boolean injectLinksAsTags) {
-    this(
-        traceId,
-        spanId,
-        parentId,
-        parentServiceName,
-        null,
-        serviceName,
-        operationName,
-        resourceName,
-        samplingPriority,
-        origin,
-        baggageItems,
-        null,
-        errorFlag,
-        spanType,
-        tagsSize,
-        traceCollector,
-        requestContextDataAppSec,
-        requestContextDataIast,
-        null,
-        pathwayContext,
-        disableSamplingMechanismValidation,
-        propagationTags,
-        ProfilingContextIntegration.NoOp.INSTANCE,
-        injectBaggageAsTags,
-        injectLinksAsTags,
-        null);
-  }
-
-  /** Back-compat ctor (no read-through parent); delegates with a null parent. */
-  public DDSpanContext(
-      final DDTraceId traceId,
-      final long spanId,
-      final long parentId,
-      final CharSequence parentServiceName,
-      final CharSequence serviceNameSource,
-      final String serviceName,
-      final CharSequence operationName,
-      final CharSequence resourceName,
-      final int samplingPriority,
-      final CharSequence origin,
-      final Map<String, String> baggageItems,
-      final Baggage w3cBaggage,
-      final boolean errorFlag,
-      final CharSequence spanType,
-      final int tagsSize,
-      final TraceCollector traceCollector,
-      final Object requestContextDataAppSec,
-      final Object requestContextDataIast,
-      final Object CiVisibilityContextData,
-      final PathwayContext pathwayContext,
-      final boolean disableSamplingMechanismValidation,
-      final PropagationTags propagationTags,
-      final ProfilingContextIntegration profilingContextIntegration,
-      final boolean injectBaggageAsTags,
-      final boolean injectLinksAsTags) {
-    this(
-        traceId,
-        spanId,
-        parentId,
-        parentServiceName,
-        serviceNameSource,
-        serviceName,
-        operationName,
-        resourceName,
-        samplingPriority,
-        origin,
-        baggageItems,
-        w3cBaggage,
-        errorFlag,
-        spanType,
-        tagsSize,
-        traceCollector,
-        requestContextDataAppSec,
-        requestContextDataIast,
-        CiVisibilityContextData,
-        pathwayContext,
-        disableSamplingMechanismValidation,
-        propagationTags,
-        profilingContextIntegration,
-        injectBaggageAsTags,
-        injectLinksAsTags,
-        null);
-  }
-
-  public DDSpanContext(
-      final DDTraceId traceId,
-      final long spanId,
-      final long parentId,
-      final CharSequence parentServiceName,
-      final CharSequence serviceNameSource,
-      final String serviceName,
-      final CharSequence operationName,
-      final CharSequence resourceName,
-      final int samplingPriority,
-      final CharSequence origin,
-      final Map<String, String> baggageItems,
-      final Baggage w3cBaggage,
-      final boolean errorFlag,
-      final CharSequence spanType,
-      final int tagsSize,
-      final TraceCollector traceCollector,
-      final Object requestContextDataAppSec,
-      final Object requestContextDataIast,
-      final Object CiVisibilityContextData,
-      final PathwayContext pathwayContext,
-      final boolean disableSamplingMechanismValidation,
-      final PropagationTags propagationTags,
-      final ProfilingContextIntegration profilingContextIntegration,
-      final boolean injectBaggageAsTags,
-      final boolean injectLinksAsTags,
-      final TagMap readThroughParent) {
-
-    assert traceCollector != null;
-    this.traceCollector = traceCollector;
-    this.tagInterceptor = this.traceCollector.getTracer().getTagInterceptor();
-
-    assert traceId != null;
-    this.traceId = traceId;
-    this.spanId = spanId;
-    this.parentId = parentId;
-    this.parentServiceName = String.valueOf(parentServiceName);
-
-    if (baggageItems == null || baggageItems.isEmpty()) {
-      this.baggageItems = EMPTY_BAGGAGE;
-    } else {
-      this.baggageItems = new ConcurrentHashMap<>(baggageItems);
-    }
-    this.w3cBaggage = w3cBaggage;
-
-    this.requestContextDataAppSec = requestContextDataAppSec;
-    this.requestContextDataIast = requestContextDataIast;
-    this.ciVisibilityContextData = CiVisibilityContextData;
-
-    assert pathwayContext != null;
-    this.pathwayContext = pathwayContext;
-
-    // The +1 is the magic number from the tags below that we set at the end,
-    // and "* 4 / 3" is to make sure that we don't resize immediately
-    final int capacity = Math.max((tagsSize <= 0 ? 3 : (tagsSize + 1)) * 4 / 3, 8);
-    this.unsafeTags =
-        readThroughParent != null
-            ? TagMap.createFromParent(readThroughParent)
-            : TagMap.create(capacity);
-
-    // must set this before setting the service and resource names below
-    this.profilingContextIntegration = profilingContextIntegration;
-    // as fast as we can try to make this operation, we still might need to activate/deactivate
-    // contexts at alarming rates in unpredictable async applications, so we'll try
-    // to get away with doing this just once per span
-    this.encodedOperationName = profilingContextIntegration.encodeOperationName(operationName);
-
-    internalSetServiceName(serviceName);
-    this.serviceNameSource = serviceNameSource;
-    this.operationName = operationName;
-    setResourceName(resourceName, ResourceNamePriorities.DEFAULT);
-    this.errorFlag = errorFlag;
-    this.spanType = spanType;
-
-    // Additional Metadata
-    final Thread current = Thread.currentThread();
-    this.threadId = current.getId();
-    this.threadName = THREAD_NAMES.computeIfAbsent(current.getName(), Functions.UTF8_ENCODE);
-
-    this.disableSamplingMechanismValidation = disableSamplingMechanismValidation;
-    this.propagationTags =
-        propagationTags != null
-            ? propagationTags
-            : traceCollector.getTracer().getPropagationTagsFactory().empty();
-    this.propagationTags.updateTraceIdHighOrderBits(this.traceId.toHighOrderLong());
-    this.injectBaggageAsTags = injectBaggageAsTags;
-    this.injectLinksAsTags = injectLinksAsTags;
-    if (origin != null) {
-      setOrigin(origin);
-    }
-    if (samplingPriority != PrioritySampling.UNSET) {
-      setSamplingPriority(samplingPriority, SamplingMechanism.UNKNOWN);
-    }
-    setTag(PARENT_ID, this.propagationTags.getLastParentId());
-  }
-
-  @Override
-  public DDTraceId getTraceId() {
-    return traceId;
-  }
-
-  public long getParentId() {
-    return parentId;
-  }
-
-  @Override
-  public long getSpanId() {
-    return spanId;
-  }
-
-  @Override
-  public long getRootSpanId() {
-    return getRootSpanContextOrThis().spanId;
-  }
-
-  @Override
-  public long getTraceIdHigh() {
-    return traceId.toHighOrderLong();
-  }
-
-  @Override
-  public long getTraceIdLow() {
-    return traceId.toLong();
-  }
-
-  @Override
-  public int getEncodedOperationName() {
-    return encodedOperationName;
-  }
-
-  @Override
-  public int getEncodedResourceName() {
-    return encodedResourceName;
-  }
-
-  public String getServiceName() {
-    return serviceName;
-  }
-
-  private void internalSetServiceName(String serviceName) {
-    this.serviceName = traceCollector.mapServiceName(serviceName);
-    this.topLevel = isTopLevel(parentServiceName, this.serviceName);
-  }
-
-  public void setServiceName(final String serviceName) {
-    setServiceName(serviceName, MANUAL);
-  }
-
-  public void setServiceName(String serviceName, @Nonnull CharSequence source) {
-    internalSetServiceName(serviceName);
-    setServiceNameSource(Objects.requireNonNull(source));
-  }
-
-  public CharSequence getServiceNameSource() {
-    return serviceNameSource;
-  }
-
-  public void setServiceNameSource(final CharSequence serviceNameSource) {
-    this.serviceNameSource = serviceNameSource;
-  }
-
-  // TODO this logic is inconsistent with hasResourceName
-  public CharSequence getResourceName() {
-    return isResourceNameSet() ? resourceName : operationName;
-  }
-
-  public boolean hasResourceName() {
-    return isResourceNameSet() || getTag(DDTags.RESOURCE_NAME) != null;
-  }
-
-  public byte getResourceNamePriority() {
-    return resourceNamePriority;
-  }
-
-  public void setResourceName(final CharSequence resourceName, byte priority) {
-    if (log.isDebugEnabled()) {
-      log.debug(
-          "setResourceName `{}`->`{}` with priority {}->{} for traceId={} spanId={}",
-          this.resourceName,
-          resourceName,
-          resourceNamePriority,
-          priority,
-          traceId,
-          spanId);
-    }
-    if (null == resourceName) {
-      return;
-    }
-    if (priority >= this.resourceNamePriority) {
-      this.resourceNamePriority = priority;
-      this.resourceName = resourceName;
-      this.encodedResourceName = profilingContextIntegration.encodeResourceName(resourceName);
-    }
-  }
-
-  private boolean isResourceNameSet() {
-    return resourceName != null && resourceName.length() != 0;
-  }
-
-  public CharSequence getOperationName() {
-    return operationName;
-  }
-
-  public void setOperationName(final CharSequence operationName) {
-    this.operationName = operationName;
-    this.encodedOperationName = profilingContextIntegration.encodeOperationName(operationName);
-  }
-
-  public boolean getErrorFlag() {
-    return errorFlag;
-  }
-
-  public void setErrorFlag(final boolean errorFlag, final byte priority) {
-    if (priority > UNSET && priority >= this.errorFlagPriority) {
-      this.errorFlag = errorFlag;
-      this.errorFlagPriority = priority;
-    }
-  }
-
-  public boolean isMeasured() {
-    return measured;
-  }
-
-  public void setMeasured(boolean measured) {
-    if (measured != this.measured) {
-      this.measured = measured;
-    }
-  }
-
-  public boolean isTopLevel() {
-    return topLevel;
-  }
-
-  private static boolean isTopLevel(String parentServiceName, String serviceName) {
-    return parentServiceName == null
-        || parentServiceName.length() == 0
-        || !parentServiceName.equals(serviceName);
-  }
-
-  public CharSequence getSpanType() {
-    return spanType;
-  }
-
-  public void setSpanType(final CharSequence spanType) {
-    this.spanType = spanType;
-  }
-
-  /**
-   * Applies a {@link SpanPrototype} as fallback defaults: stamps its span type, constant tags, and
-   * integration name only where the span has not already set them. Prototype values are the lowest
-   * precedence -- anything explicitly set (a builder {@code withSpanType}, explicit tags, an
-   * earlier decorator) wins. Because it never clobbers, {@code apply} is order-independent and
-   * self-neutralizes once construction has already seeded the same prototype.
-   *
-   * <p>This is the shared seam for both the construction path ({@code CoreSpanBuilder}) and
-   * decorator {@code afterStart} (via {@link DDSpan#apply}). The context owns the tag map, so the
-   * eventual cheaper bulk-share path (skipping interception for non-intercepted tags) and the
-   * identity short-circuit will land here -- deferred to the dense-store / tag-registry work, which
-   * exposes intercept status at the internal-api level. Until then the constant tags route through
-   * the interceptor, identical to the per-tag calls this replaces.
-   */
-  public void apply(@Nonnull final SpanPrototype prototype) {
-    if (this.spanType == null) {
-      final CharSequence spanType = prototype.spanType();
-      if (spanType != null) {
-        setSpanType(spanType);
-      }
-    }
-    seedAbsentTags(prototype.tags());
-    if (this.integrationName == null) {
-      final CharSequence integrationName = prototype.integrationName();
-      if (integrationName != null) {
-        setIntegrationName(integrationName);
-      }
-    }
-  }
-
-  /**
-   * Seeds tags that are not already present, routed through the interceptor. Mirrors {@link
-   * #setAllTags(TagMap, boolean)}'s intercepting path but skips any key already set, so explicit
-   * tags keep precedence over the prototype's constant defaults.
-   */
-  private void seedAbsentTags(final TagMap map) {
-    if (map == null) {
-      return;
-    }
-    synchronized (unsafeTags) {
-      map.forEach(
-          this,
-          (ctx, tagEntry) -> {
-            final String tag = tagEntry.tag();
-            if (ctx.unsafeTags.containsKey(tag)) {
-              return;
+    /** Maps ordinal to canonical string constant. Index 0 (UNSET) and 7 (CUSTOM) are null. */
+    static final String[] SPAN_KIND_VALUES = {
+        null, // UNSET
+        Tags.SPAN_KIND_SERVER,
+        Tags.SPAN_KIND_CLIENT,
+        Tags.SPAN_KIND_PRODUCER,
+        Tags.SPAN_KIND_CONSUMER,
+        Tags.SPAN_KIND_INTERNAL,
+        Tags.SPAN_KIND_BROKER,
+        null // CUSTOM
+    };
+
+    private volatile byte spanKindOrdinal = SPAN_KIND_UNSET;
+
+    private CharSequence integrationName;
+    private CharSequence serviceNameSource;
+
+    /**
+     * Tags are associated to the current span, they will not propagate to the children span.
+     *
+     * <p>The underlying assumption for using a normal Map with synchronized access instead of a
+     * ConcurrentHashMap is that even though the tags can be accessed and modified from multiple
+     * threads, they will rarely, if ever, be read and modified concurrently by multiple threads but
+     * rather read and accessed in a serial fashion on thread after thread. The synchronization can
+     * then be wrapped around bulk operations to minimize the costly atomic operations.
+     */
+    private final TagMap unsafeTags;
+
+    /** The service name is required, otherwise the span are dropped by the agent */
+    private volatile String serviceName;
+
+    /** The resource associated to the service (server_web, database, etc.) */
+    private volatile CharSequence resourceName;
+
+    private volatile byte resourceNamePriority = ResourceNamePriorities.DEFAULT;
+
+    /** Each span have an operation name describing the current span */
+    private volatile CharSequence operationName;
+
+    /** The type of the span. If null, the Datadog Agent will report as a custom */
+    private volatile CharSequence spanType;
+
+    /** True indicates that the span reports an error */
+    private volatile boolean errorFlag;
+
+    private volatile byte errorFlagPriority = UNSET;
+
+    private volatile boolean measured;
+
+    private volatile boolean topLevel;
+
+    /** The origin of the trace. (eg. Synthetics, CI App) */
+    private volatile CharSequence origin;
+
+    /** RequestContext data for the InstrumentationGateway */
+    private final Object requestContextDataAppSec;
+
+    private final Object requestContextDataIast;
+    private final Object ciVisibilityContextData;
+
+    private final boolean disableSamplingMechanismValidation;
+
+    private final PropagationTags propagationTags;
+
+    private volatile PathwayContext pathwayContext;
+
+    private volatile BlockResponseFunction blockResponseFunction;
+
+    private volatile ClientIpAddressData clientIpAddressData;
+
+    private final ProfilingContextIntegration profilingContextIntegration;
+    private final boolean injectBaggageAsTags;
+    private final boolean injectLinksAsTags;
+    private volatile int encodedOperationName;
+    private volatile int encodedResourceName;
+
+    /**
+     * Metastruct keys are associated to the current span, they will not propagate to the children
+     * span. They are an efficient way to send binary data to the agent without relying on bulky json
+     * payloads inside tags.
+     */
+    private volatile Map<String, Object> metaStruct = EMPTY_META_STRUCT;
+
+    public DDSpanContext(
+            final DDTraceId traceId,
+            final long spanId,
+            final long parentId,
+            final CharSequence parentServiceName,
+            final String serviceName,
+            final CharSequence operationName,
+            final CharSequence resourceName,
+            final int samplingPriority,
+            final CharSequence origin,
+            final Map<String, String> baggageItems,
+            final boolean errorFlag,
+            final CharSequence spanType,
+            final int tagsSize,
+            final TraceCollector traceCollector,
+            final Object requestContextDataAppSec,
+            final Object requestContextDataIast,
+            final PathwayContext pathwayContext,
+            final boolean disableSamplingMechanismValidation,
+            final PropagationTags propagationTags) {
+        this(
+                traceId,
+                spanId,
+                parentId,
+                parentServiceName,
+                null,
+                serviceName,
+                operationName,
+                resourceName,
+                samplingPriority,
+                origin,
+                baggageItems,
+                null,
+                errorFlag,
+                spanType,
+                tagsSize,
+                traceCollector,
+                requestContextDataAppSec,
+                requestContextDataIast,
+                null,
+                pathwayContext,
+                disableSamplingMechanismValidation,
+                propagationTags,
+                ProfilingContextIntegration.NoOp.INSTANCE,
+                true,
+                true,
+                null);
+    }
+
+    public DDSpanContext(
+            final DDTraceId traceId,
+            final long spanId,
+            final long parentId,
+            final CharSequence parentServiceName,
+            final String serviceName,
+            final CharSequence operationName,
+            final CharSequence resourceName,
+            final int samplingPriority,
+            final CharSequence origin,
+            final Map<String, String> baggageItems,
+            final boolean errorFlag,
+            final CharSequence spanType,
+            final int tagsSize,
+            final TraceCollector traceCollector,
+            final Object requestContextDataAppSec,
+            final Object requestContextDataIast,
+            final PathwayContext pathwayContext,
+            final boolean disableSamplingMechanismValidation,
+            final PropagationTags propagationTags,
+            final boolean injectBaggageAsTags,
+            final boolean injectLinksAsTags) {
+        this(
+                traceId,
+                spanId,
+                parentId,
+                parentServiceName,
+                null,
+                serviceName,
+                operationName,
+                resourceName,
+                samplingPriority,
+                origin,
+                baggageItems,
+                null,
+                errorFlag,
+                spanType,
+                tagsSize,
+                traceCollector,
+                requestContextDataAppSec,
+                requestContextDataIast,
+                null,
+                pathwayContext,
+                disableSamplingMechanismValidation,
+                propagationTags,
+                ProfilingContextIntegration.NoOp.INSTANCE,
+                injectBaggageAsTags,
+                injectLinksAsTags,
+                null);
+    }
+
+    /** Back-compat ctor (no read-through parent); delegates with a null parent. */
+    public DDSpanContext(
+            final DDTraceId traceId,
+            final long spanId,
+            final long parentId,
+            final CharSequence parentServiceName,
+            final CharSequence serviceNameSource,
+            final String serviceName,
+            final CharSequence operationName,
+            final CharSequence resourceName,
+            final int samplingPriority,
+            final CharSequence origin,
+            final Map<String, String> baggageItems,
+            final Baggage w3cBaggage,
+            final boolean errorFlag,
+            final CharSequence spanType,
+            final int tagsSize,
+            final TraceCollector traceCollector,
+            final Object requestContextDataAppSec,
+            final Object requestContextDataIast,
+            final Object CiVisibilityContextData,
+            final PathwayContext pathwayContext,
+            final boolean disableSamplingMechanismValidation,
+            final PropagationTags propagationTags,
+            final ProfilingContextIntegration profilingContextIntegration,
+            final boolean injectBaggageAsTags,
+            final boolean injectLinksAsTags) {
+        this(
+                traceId,
+                spanId,
+                parentId,
+                parentServiceName,
+                serviceNameSource,
+                serviceName,
+                operationName,
+                resourceName,
+                samplingPriority,
+                origin,
+                baggageItems,
+                w3cBaggage,
+                errorFlag,
+                spanType,
+                tagsSize,
+                traceCollector,
+                requestContextDataAppSec,
+                requestContextDataIast,
+                CiVisibilityContextData,
+                pathwayContext,
+                disableSamplingMechanismValidation,
+                propagationTags,
+                profilingContextIntegration,
+                injectBaggageAsTags,
+                injectLinksAsTags,
+                null);
+    }
+
+    public DDSpanContext(
+            final DDTraceId traceId,
+            final long spanId,
+            final long parentId,
+            final CharSequence parentServiceName,
+            final CharSequence serviceNameSource,
+            final String serviceName,
+            final CharSequence operationName,
+            final CharSequence resourceName,
+            final int samplingPriority,
+            final CharSequence origin,
+            final Map<String, String> baggageItems,
+            final Baggage w3cBaggage,
+            final boolean errorFlag,
+            final CharSequence spanType,
+            final int tagsSize,
+            final TraceCollector traceCollector,
+            final Object requestContextDataAppSec,
+            final Object requestContextDataIast,
+            final Object CiVisibilityContextData,
+            final PathwayContext pathwayContext,
+            final boolean disableSamplingMechanismValidation,
+            final PropagationTags propagationTags,
+            final ProfilingContextIntegration profilingContextIntegration,
+            final boolean injectBaggageAsTags,
+            final boolean injectLinksAsTags,
+            final TagMap readThroughParent) {
+
+        assert traceCollector != null;
+        this.traceCollector = traceCollector;
+        this.tagInterceptor = this.traceCollector.getTracer().getTagInterceptor();
+
+        assert traceId != null;
+        this.traceId = traceId;
+        this.spanId = spanId;
+        this.parentId = parentId;
+        this.parentServiceName = String.valueOf(parentServiceName);
+
+        if (baggageItems == null || baggageItems.isEmpty()) {
+            this.baggageItems = EMPTY_BAGGAGE;
+        } else {
+            this.baggageItems = new ConcurrentHashMap<>(baggageItems);
+        }
+        this.w3cBaggage = w3cBaggage;
+
+        this.requestContextDataAppSec = requestContextDataAppSec;
+        this.requestContextDataIast = requestContextDataIast;
+        this.ciVisibilityContextData = CiVisibilityContextData;
+
+        assert pathwayContext != null;
+        this.pathwayContext = pathwayContext;
+
+        // The +1 is the magic number from the tags below that we set at the end,
+        // and "* 4 / 3" is to make sure that we don't resize immediately
+        final int capacity = Math.max((tagsSize <= 0 ? 3 : (tagsSize + 1)) * 4 / 3, 8);
+        this.unsafeTags =
+                readThroughParent != null ? TagMap.createFromParent(readThroughParent) : TagMap.create(capacity);
+
+        // must set this before setting the service and resource names below
+        this.profilingContextIntegration = profilingContextIntegration;
+        // as fast as we can try to make this operation, we still might need to activate/deactivate
+        // contexts at alarming rates in unpredictable async applications, so we'll try
+        // to get away with doing this just once per span
+        this.encodedOperationName = profilingContextIntegration.encodeOperationName(operationName);
+
+        internalSetServiceName(serviceName);
+        this.serviceNameSource = serviceNameSource;
+        this.operationName = operationName;
+        setResourceName(resourceName, ResourceNamePriorities.DEFAULT);
+        this.errorFlag = errorFlag;
+        this.spanType = spanType;
+
+        // Additional Metadata
+        final Thread current = Thread.currentThread();
+        this.threadId = current.getId();
+        this.threadName = THREAD_NAMES.computeIfAbsent(current.getName(), Functions.UTF8_ENCODE);
+
+        this.disableSamplingMechanismValidation = disableSamplingMechanismValidation;
+        this.propagationTags = propagationTags != null
+                ? propagationTags
+                : traceCollector.getTracer().getPropagationTagsFactory().empty();
+        this.propagationTags.updateTraceIdHighOrderBits(this.traceId.toHighOrderLong());
+        this.injectBaggageAsTags = injectBaggageAsTags;
+        this.injectLinksAsTags = injectLinksAsTags;
+        if (origin != null) {
+            setOrigin(origin);
+        }
+        if (samplingPriority != PrioritySampling.UNSET) {
+            setSamplingPriority(samplingPriority, SamplingMechanism.UNKNOWN);
+        }
+        setTag(PARENT_ID, this.propagationTags.getLastParentId());
+    }
+
+    @Override
+    public DDTraceId getTraceId() {
+        return traceId;
+    }
+
+    public long getParentId() {
+        return parentId;
+    }
+
+    @Override
+    public long getSpanId() {
+        return spanId;
+    }
+
+    @Override
+    public long getRootSpanId() {
+        return getRootSpanContextOrThis().spanId;
+    }
+
+    @Override
+    public long getTraceIdHigh() {
+        return traceId.toHighOrderLong();
+    }
+
+    @Override
+    public long getTraceIdLow() {
+        return traceId.toLong();
+    }
+
+    @Override
+    public int getEncodedOperationName() {
+        return encodedOperationName;
+    }
+
+    @Override
+    public int getEncodedResourceName() {
+        return encodedResourceName;
+    }
+
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    private void internalSetServiceName(String serviceName) {
+        this.serviceName = traceCollector.mapServiceName(serviceName);
+        this.topLevel = isTopLevel(parentServiceName, this.serviceName);
+    }
+
+    public void setServiceName(final String serviceName) {
+        setServiceName(serviceName, MANUAL);
+    }
+
+    public void setServiceName(String serviceName, @Nonnull CharSequence source) {
+        internalSetServiceName(serviceName);
+        setServiceNameSource(Objects.requireNonNull(source));
+    }
+
+    public CharSequence getServiceNameSource() {
+        return serviceNameSource;
+    }
+
+    public void setServiceNameSource(final CharSequence serviceNameSource) {
+        this.serviceNameSource = serviceNameSource;
+    }
+
+    // TODO this logic is inconsistent with hasResourceName
+    public CharSequence getResourceName() {
+        return isResourceNameSet() ? resourceName : operationName;
+    }
+
+    public boolean hasResourceName() {
+        return isResourceNameSet() || getTag(DDTags.RESOURCE_NAME) != null;
+    }
+
+    public byte getResourceNamePriority() {
+        return resourceNamePriority;
+    }
+
+    public void setResourceName(final CharSequence resourceName, byte priority) {
+        if (log.isDebugEnabled()) {
+            log.debug(
+                    "setResourceName `{}`->`{}` with priority {}->{} for traceId={} spanId={}",
+                    this.resourceName,
+                    resourceName,
+                    resourceNamePriority,
+                    priority,
+                    traceId,
+                    spanId);
+        }
+        if (null == resourceName) {
+            return;
+        }
+        if (priority >= this.resourceNamePriority) {
+            this.resourceNamePriority = priority;
+            this.resourceName = resourceName;
+            this.encodedResourceName = profilingContextIntegration.encodeResourceName(resourceName);
+        }
+    }
+
+    private boolean isResourceNameSet() {
+        return resourceName != null && resourceName.length() != 0;
+    }
+
+    public CharSequence getOperationName() {
+        return operationName;
+    }
+
+    public void setOperationName(final CharSequence operationName) {
+        this.operationName = operationName;
+        this.encodedOperationName = profilingContextIntegration.encodeOperationName(operationName);
+    }
+
+    public boolean getErrorFlag() {
+        return errorFlag;
+    }
+
+    public void setErrorFlag(final boolean errorFlag, final byte priority) {
+        if (priority > UNSET && priority >= this.errorFlagPriority) {
+            this.errorFlag = errorFlag;
+            this.errorFlagPriority = priority;
+        }
+    }
+
+    public boolean isMeasured() {
+        return measured;
+    }
+
+    public void setMeasured(boolean measured) {
+        if (measured != this.measured) {
+            this.measured = measured;
+        }
+    }
+
+    public boolean isTopLevel() {
+        return topLevel;
+    }
+
+    private static boolean isTopLevel(String parentServiceName, String serviceName) {
+        return parentServiceName == null || parentServiceName.length() == 0 || !parentServiceName.equals(serviceName);
+    }
+
+    public CharSequence getSpanType() {
+        return spanType;
+    }
+
+    public void setSpanType(final CharSequence spanType) {
+        this.spanType = spanType;
+    }
+
+    /**
+     * Applies a {@link SpanPrototype} as fallback defaults: stamps its span type, constant tags, and
+     * integration name only where the span has not already set them. Prototype values are the lowest
+     * precedence -- anything explicitly set (a builder {@code withSpanType}, explicit tags, an
+     * earlier decorator) wins. Because it never clobbers, {@code apply} is order-independent and
+     * self-neutralizes once construction has already seeded the same prototype.
+     *
+     * <p>This is the shared seam for both the construction path ({@code CoreSpanBuilder}) and
+     * decorator {@code afterStart} (via {@link DDSpan#apply}). The context owns the tag map, so the
+     * eventual cheaper bulk-share path (skipping interception for non-intercepted tags) and the
+     * identity short-circuit will land here -- deferred to the dense-store / tag-registry work, which
+     * exposes intercept status at the internal-api level. Until then the constant tags route through
+     * the interceptor, identical to the per-tag calls this replaces.
+     */
+    public void apply(@Nonnull final SpanPrototype prototype) {
+        if (this.spanType == null) {
+            final CharSequence spanType = prototype.spanType();
+            if (spanType != null) {
+                setSpanType(spanType);
             }
-            final Object value = tagEntry.objectValue();
-            if (!ctx.tagInterceptor.interceptTag(ctx, tag, value)) {
-              ctx.unsafeTags.set(tagEntry);
+        }
+        seedAbsentTags(prototype.tags());
+        if (this.integrationName == null) {
+            final CharSequence integrationName = prototype.integrationName();
+            if (integrationName != null) {
+                setIntegrationName(integrationName);
             }
-          });
-    }
-  }
-
-  /** Forces the local root span sampling decision to keep according manual mechanism. */
-  public void forceKeep() {
-    forceKeep(SamplingMechanism.MANUAL);
-  }
-
-  public void forceKeep(byte samplingMechanism) {
-    // set trace level sampling priority
-    getRootSpanContextOrThis().forceKeepThisSpan(samplingMechanism);
-  }
-
-  private void forceKeepThisSpan(byte samplingMechanism) {
-    propagationTags.forceKeep(samplingMechanism);
-  }
-
-  public void addPropagatedTraceSource(final int value) {
-    propagationTags.addTraceSource(value);
-  }
-
-  public void updateDebugPropagation(String value) {
-    propagationTags.updateDebugPropagation(value);
-  }
-
-  /**
-   * @return if sampling priority was set by this method invocation
-   */
-  public boolean setSamplingPriority(final int newPriority, final int newMechanism) {
-    DDSpanContext spanContext = getRootSpanContextOrThis();
-    // set trace level sampling priority
-    return spanContext.setThisSpanSamplingPriority(newPriority, newMechanism);
-  }
-
-  private DDSpanContext getRootSpanContextOrThis() {
-    DDSpanContext rootSpanContext = getRootSpanContextIfDifferent();
-    return rootSpanContext != null ? rootSpanContext : this;
-  }
-
-  private DDSpanContext getRootSpanContextIfDifferent() {
-    if (traceCollector != null) {
-      final DDSpan rootSpan = traceCollector.getRootSpan();
-      if (null != rootSpan && rootSpan.spanContext() != this) {
-        return rootSpan.spanContext();
-      }
-    }
-    return null;
-  }
-
-  private boolean setThisSpanSamplingPriority(final int newPriority, final int newMechanism) {
-    if (!validateSamplingPriority(newPriority, newMechanism)) {
-      return false;
-    }
-    boolean updated =
-        propagationTags.tryUpdateTraceSamplingPriority(
-            newPriority,
-            newMechanism,
-            SamplingMechanism.canAvoidSamplingPriorityLock(newPriority, newMechanism));
-    if (!updated) {
-      if (log.isDebugEnabled()) {
-        log.debug(
-            "samplingPriority locked at priority: {}. Refusing to set to priority: {} mechanism: {}",
-            propagationTags.getSamplingPriority(),
-            newPriority,
-            newMechanism);
-      }
-      return false;
-    }
-    return true;
-  }
-
-  public boolean setSamplingPriority(
-      final int newPriority,
-      final int newMechanism,
-      final double sampleRate,
-      final long traceIdLowOrderBits,
-      final boolean rateLimiterRejected) {
-    DDSpanContext spanContext = getRootSpanContextOrThis();
-    if (!spanContext.validateSamplingPriority(newPriority, newMechanism)) {
-      return false;
-    }
-    return spanContext.propagationTags.tryUpdateProbabilitySamplingDecision(
-        newPriority,
-        newMechanism,
-        sampleRate,
-        rateLimiterRejected,
-        traceIdLowOrderBits,
-        SamplingMechanism.canAvoidSamplingPriorityLock(newPriority, newMechanism));
-  }
-
-  private boolean validateSamplingPriority(final int newPriority, final int newMechanism) {
-    if (newPriority == PrioritySampling.UNSET) {
-      log.debug("{}: Refusing to set samplingPriority to UNSET", this);
-      return false;
-    }
-    if (!SamplingMechanism.validateWithSamplingPriority(newMechanism, newPriority)) {
-      if (disableSamplingMechanismValidation) {
-        log.debug(
-            "{}: Bypassing setting setSamplingPriority check ("
-                + TracerConfig.SAMPLING_MECHANISM_VALIDATION_DISABLED
-                + ") for a non valid combination of samplingMechanism {} and samplingPriority {}.",
-            this,
-            newMechanism,
-            newPriority);
-      } else {
-        log.debug(
-            "{}: Refusing to set samplingMechanism to {}. Provided samplingPriority {} is not allowed.",
-            this,
-            newMechanism,
-            newPriority);
-        return false;
-      }
-    }
-    return true;
-  }
-
-  @Override
-  public int getSamplingPriority() {
-    return getRootSpanContextOrThis().propagationTags.getSamplingPriority();
-  }
-
-  public void setSpanSamplingPriority(double rate, int limit) {
-    synchronized (unsafeTags) {
-      unsafeSetTag(SPAN_SAMPLING_MECHANISM_TAG, SamplingMechanism.SPAN_SAMPLING_RATE);
-      unsafeSetTag(SPAN_SAMPLING_RULE_RATE_TAG, rate);
-      if (limit != Integer.MAX_VALUE) {
-        unsafeSetTag(SPAN_SAMPLING_MAX_PER_SECOND_TAG, limit);
-      }
-    }
-  }
-
-  /**
-   * Prevent future changes to the context's sampling priority.
-   *
-   * <p>Used when a span is extracted or injected for propagation.
-   *
-   * <p>Has no effect if the sampling priority is unset.
-   *
-   * @return true if the sampling priority was locked.
-   */
-  @Deprecated
-  public boolean lockSamplingPriority() {
-    // this is now effectively a no-op - there is no locking.
-    // the priority is just CAS'd against UNSET/UNKNOWN, unless it's forced to USER_KEEP/MANUAL
-    // but is maintained for backwards compatibility, and returns false when it used to
-    final DDSpan rootSpan = traceCollector.getRootSpan();
-    if (null != rootSpan && rootSpan.spanContext() != this) {
-      return rootSpan.spanContext().lockSamplingPriority();
-    }
-
-    return propagationTags.getSamplingPriority() != PrioritySampling.UNSET;
-  }
-
-  public CharSequence getOrigin() {
-    return getRootSpanContextOrThis().origin;
-  }
-
-  public void beginEndToEnd() {
-    traceCollector.beginEndToEnd();
-  }
-
-  public long getEndToEndStartTime() {
-    return traceCollector.getEndToEndStartTime();
-  }
-
-  public void setBaggageItem(final String key, final String value) {
-    if (key == null || value == null) {
-      log.debug("Try to set invalid baggage: key = {}, value = {}", key, value);
-      return;
-    }
-    if (baggageItems == EMPTY_BAGGAGE) {
-      synchronized (this) {
+        }
+    }
+
+    /**
+     * Seeds tags that are not already present, routed through the interceptor. Mirrors {@link
+     * #setAllTags(TagMap, boolean)}'s intercepting path but skips any key already set, so explicit
+     * tags keep precedence over the prototype's constant defaults.
+     */
+    private void seedAbsentTags(final TagMap map) {
+        if (map == null) {
+            return;
+        }
+        synchronized (unsafeTags) {
+            map.forEach(this, (ctx, tagEntry) -> {
+                final String tag = tagEntry.tag();
+                if (ctx.unsafeTags.containsKey(tag)) {
+                    return;
+                }
+                final Object value = tagEntry.objectValue();
+                if (!ctx.tagInterceptor.interceptTag(ctx, tag, value)) {
+                    ctx.unsafeTags.set(tagEntry);
+                }
+            });
+        }
+    }
+
+    /** Forces the local root span sampling decision to keep according manual mechanism. */
+    public void forceKeep() {
+        forceKeep(SamplingMechanism.MANUAL);
+    }
+
+    public void forceKeep(byte samplingMechanism) {
+        // set trace level sampling priority
+        getRootSpanContextOrThis().forceKeepThisSpan(samplingMechanism);
+    }
+
+    private void forceKeepThisSpan(byte samplingMechanism) {
+        propagationTags.forceKeep(samplingMechanism);
+    }
+
+    public void addPropagatedTraceSource(final int value) {
+        propagationTags.addTraceSource(value);
+    }
+
+    public void updateDebugPropagation(String value) {
+        propagationTags.updateDebugPropagation(value);
+    }
+
+    /**
+     * @return if sampling priority was set by this method invocation
+     */
+    public boolean setSamplingPriority(final int newPriority, final int newMechanism) {
+        DDSpanContext spanContext = getRootSpanContextOrThis();
+        // set trace level sampling priority
+        return spanContext.setThisSpanSamplingPriority(newPriority, newMechanism);
+    }
+
+    private DDSpanContext getRootSpanContextOrThis() {
+        DDSpanContext rootSpanContext = getRootSpanContextIfDifferent();
+        return rootSpanContext != null ? rootSpanContext : this;
+    }
+
+    private DDSpanContext getRootSpanContextIfDifferent() {
+        if (traceCollector != null) {
+            final DDSpan rootSpan = traceCollector.getRootSpan();
+            if (null != rootSpan && rootSpan.spanContext() != this) {
+                return rootSpan.spanContext();
+            }
+        }
+        return null;
+    }
+
+    private boolean setThisSpanSamplingPriority(final int newPriority, final int newMechanism) {
+        if (!validateSamplingPriority(newPriority, newMechanism)) {
+            return false;
+        }
+        boolean updated = propagationTags.tryUpdateTraceSamplingPriority(
+                newPriority, newMechanism, SamplingMechanism.canAvoidSamplingPriorityLock(newPriority, newMechanism));
+        if (!updated) {
+            if (log.isDebugEnabled()) {
+                log.debug(
+                        "samplingPriority locked at priority: {}. Refusing to set to priority: {} mechanism: {}",
+                        propagationTags.getSamplingPriority(),
+                        newPriority,
+                        newMechanism);
+            }
+            return false;
+        }
+        return true;
+    }
+
+    public boolean setSamplingPriority(
+            final int newPriority,
+            final int newMechanism,
+            final double sampleRate,
+            final long traceIdLowOrderBits,
+            final boolean rateLimiterRejected) {
+        DDSpanContext spanContext = getRootSpanContextOrThis();
+        if (!spanContext.validateSamplingPriority(newPriority, newMechanism)) {
+            return false;
+        }
+        return spanContext.propagationTags.tryUpdateProbabilitySamplingDecision(
+                newPriority,
+                newMechanism,
+                sampleRate,
+                rateLimiterRejected,
+                traceIdLowOrderBits,
+                SamplingMechanism.canAvoidSamplingPriorityLock(newPriority, newMechanism));
+    }
+
+    private boolean validateSamplingPriority(final int newPriority, final int newMechanism) {
+        if (newPriority == PrioritySampling.UNSET) {
+            log.debug("{}: Refusing to set samplingPriority to UNSET", this);
+            return false;
+        }
+        if (!SamplingMechanism.validateWithSamplingPriority(newMechanism, newPriority)) {
+            if (disableSamplingMechanismValidation) {
+                log.debug(
+                        "{}: Bypassing setting setSamplingPriority check ("
+                                + TracerConfig.SAMPLING_MECHANISM_VALIDATION_DISABLED
+                                + ") for a non valid combination of samplingMechanism {} and samplingPriority {}.",
+                        this,
+                        newMechanism,
+                        newPriority);
+            } else {
+                log.debug(
+                        "{}: Refusing to set samplingMechanism to {}. Provided samplingPriority {} is not allowed.",
+                        this,
+                        newMechanism,
+                        newPriority);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public int getSamplingPriority() {
+        return getRootSpanContextOrThis().propagationTags.getSamplingPriority();
+    }
+
+    public void setSpanSamplingPriority(double rate, int limit) {
+        synchronized (unsafeTags) {
+            unsafeSetTag(SPAN_SAMPLING_MECHANISM_TAG, SamplingMechanism.SPAN_SAMPLING_RATE);
+            unsafeSetTag(SPAN_SAMPLING_RULE_RATE_TAG, rate);
+            if (limit != Integer.MAX_VALUE) {
+                unsafeSetTag(SPAN_SAMPLING_MAX_PER_SECOND_TAG, limit);
+            }
+        }
+    }
+
+    /**
+     * Prevent future changes to the context's sampling priority.
+     *
+     * <p>Used when a span is extracted or injected for propagation.
+     *
+     * <p>Has no effect if the sampling priority is unset.
+     *
+     * @return true if the sampling priority was locked.
+     */
+    @Deprecated
+    public boolean lockSamplingPriority() {
+        // this is now effectively a no-op - there is no locking.
+        // the priority is just CAS'd against UNSET/UNKNOWN, unless it's forced to USER_KEEP/MANUAL
+        // but is maintained for backwards compatibility, and returns false when it used to
+        final DDSpan rootSpan = traceCollector.getRootSpan();
+        if (null != rootSpan && rootSpan.spanContext() != this) {
+            return rootSpan.spanContext().lockSamplingPriority();
+        }
+
+        return propagationTags.getSamplingPriority() != PrioritySampling.UNSET;
+    }
+
+    public CharSequence getOrigin() {
+        return getRootSpanContextOrThis().origin;
+    }
+
+    public void beginEndToEnd() {
+        traceCollector.beginEndToEnd();
+    }
+
+    public long getEndToEndStartTime() {
+        return traceCollector.getEndToEndStartTime();
+    }
+
+    public void setBaggageItem(final String key, final String value) {
+        if (key == null || value == null) {
+            log.debug("Try to set invalid baggage: key = {}, value = {}", key, value);
+            return;
+        }
         if (baggageItems == EMPTY_BAGGAGE) {
-          baggageItems = new ConcurrentHashMap<>(4);
+            synchronized (this) {
+                if (baggageItems == EMPTY_BAGGAGE) {
+                    baggageItems = new ConcurrentHashMap<>(4);
+                }
+            }
         }
-      }
+        baggageItems.put(key, value);
+    }
+
+    public String getBaggageItem(final String key) {
+        return baggageItems.get(key);
+    }
+
+    public Map<String, String> getBaggageItems() {
+        return baggageItems;
     }
-    baggageItems.put(key, value);
-  }
 
-  public String getBaggageItem(final String key) {
-    return baggageItems.get(key);
-  }
+    @Override
+    public Iterable<Map.Entry<String, String>> baggageItems() {
+        return baggageItems.entrySet();
+    }
 
-  public Map<String, String> getBaggageItems() {
-    return baggageItems;
-  }
+    @Override
+    public TraceCollector getTraceCollector() {
+        return traceCollector;
+    }
 
-  @Override
-  public Iterable<Map.Entry<String, String>> baggageItems() {
-    return baggageItems.entrySet();
-  }
+    public RequestContext getRequestContext() {
+        return this;
+    }
 
-  @Override
-  public TraceCollector getTraceCollector() {
-    return traceCollector;
-  }
+    @Override
+    public PathwayContext getPathwayContext() {
+        return pathwayContext;
+    }
 
-  public RequestContext getRequestContext() {
-    return this;
-  }
+    @Override
+    public void mergePathwayContext(PathwayContext pathwayContext) {
+        if (pathwayContext == null) {
+            return;
+        }
 
-  @Override
-  public PathwayContext getPathwayContext() {
-    return pathwayContext;
-  }
+        // This is purposely not thread safe
+        // The code randomly chooses between the two PathwayContexts.
+        // If there is a race, then that's okay
+        if (this.pathwayContext.isStarted()) {
+            // Randomly select between keeping the current context (0) or replacing (1)
+            if (ThreadLocalRandom.current().nextInt(2) == 1) {
+                this.pathwayContext = pathwayContext;
+            }
+        } else {
+            this.pathwayContext = pathwayContext;
+        }
+    }
 
-  @Override
-  public void mergePathwayContext(PathwayContext pathwayContext) {
-    if (pathwayContext == null) {
-      return;
+    public CoreTracer getTracer() {
+        return traceCollector.getTracer();
     }
 
-    // This is purposely not thread safe
-    // The code randomly chooses between the two PathwayContexts.
-    // If there is a race, then that's okay
-    if (this.pathwayContext.isStarted()) {
-      // Randomly select between keeping the current context (0) or replacing (1)
-      if (ThreadLocalRandom.current().nextInt(2) == 1) {
-        this.pathwayContext = pathwayContext;
-      }
-    } else {
-      this.pathwayContext = pathwayContext;
-    }
-  }
-
-  public CoreTracer getTracer() {
-    return traceCollector.getTracer();
-  }
-
-  public void setHttpStatusCode(short statusCode) {
-    this.httpStatusCode = statusCode;
-  }
+    public void setHttpStatusCode(short statusCode) {
+        this.httpStatusCode = statusCode;
+    }
 
-  public short getHttpStatusCode() {
-    return httpStatusCode;
-  }
+    public short getHttpStatusCode() {
+        return httpStatusCode;
+    }
 
-  /** Identity-first string comparison: checks reference equality, then falls back to equals. */
-  static boolean tagEquals(String tagValue, String tagLiteral) {
-    return (tagValue == tagLiteral) || tagLiteral.equals(tagValue);
-  }
+    /** Identity-first string comparison: checks reference equality, then falls back to equals. */
+    static boolean tagEquals(String tagValue, String tagLiteral) {
+        return (tagValue == tagLiteral) || tagLiteral.equals(tagValue);
+    }
 
-  /**
-   * Cache the span.kind ordinal for fast isOutbound() checks. Called from TagInterceptor when
-   * span.kind is set.
-   */
-  public void setSpanKindOrdinal(String kind) {
-    spanKindOrdinal = spanKindOrdinalOf(kind);
-  }
-
-  static byte spanKindOrdinalOf(String kind) {
-    if (kind == null) {
-      return SPAN_KIND_UNSET;
-    } else if (tagEquals(kind, Tags.SPAN_KIND_SERVER)) {
-      return SPAN_KIND_SERVER;
-    } else if (tagEquals(kind, Tags.SPAN_KIND_CLIENT)) {
-      return SPAN_KIND_CLIENT;
-    } else if (tagEquals(kind, Tags.SPAN_KIND_PRODUCER)) {
-      return SPAN_KIND_PRODUCER;
-    } else if (tagEquals(kind, Tags.SPAN_KIND_CONSUMER)) {
-      return SPAN_KIND_CONSUMER;
-    } else if (tagEquals(kind, Tags.SPAN_KIND_INTERNAL)) {
-      return SPAN_KIND_INTERNAL;
-    } else if (tagEquals(kind, Tags.SPAN_KIND_BROKER)) {
-      return SPAN_KIND_BROKER;
-    } else {
-      return SPAN_KIND_CUSTOM;
-    }
-  }
-
-  byte getSpanKindOrdinal() {
-    return spanKindOrdinal;
-  }
-
-  /** Returns the span.kind string from the cached ordinal, or falls back to the tag map. */
-  public String getSpanKindString() {
-    byte ordinal = spanKindOrdinal;
-    if (ordinal > SPAN_KIND_UNSET && ordinal < SPAN_KIND_CUSTOM) {
-      return SPAN_KIND_VALUES[ordinal];
-    }
-    // UNSET or CUSTOM -- fall through to tag map
-    synchronized (unsafeTags) {
-      return unsafeTags.getString(Tags.SPAN_KIND);
-    }
-  }
-
-  public void setOrigin(final CharSequence origin) {
-    DDSpanContext context = getRootSpanContextOrThis();
-    context.origin = origin;
-    context.propagationTags.updateTraceOrigin(origin);
-  }
-
-  public void setMetric(final CharSequence key, final Number value) {
-    synchronized (unsafeTags) {
-      unsafeSetTag(key.toString(), value);
-    }
-  }
-
-  public void setMetric(final CharSequence key, final int value) {
-    synchronized (unsafeTags) {
-      unsafeTags.set(key.toString(), value);
-    }
-  }
-
-  public void setMetric(final CharSequence key, final long value) {
-    synchronized (unsafeTags) {
-      unsafeTags.set(key.toString(), value);
-    }
-  }
-
-  public void setMetric(final CharSequence key, final float value) {
-    synchronized (unsafeTags) {
-      unsafeTags.set(key.toString(), value);
-    }
-  }
-
-  public void setMetric(final CharSequence key, final double value) {
-    synchronized (unsafeTags) {
-      unsafeTags.set(key.toString(), value);
-    }
-  }
-
-  public void setMetric(final TagMap.EntryReader entry) {
-    if (entry == null) {
-      return;
-    }
-
-    synchronized (unsafeTags) {
-      unsafeTags.set(entry);
-    }
-  }
-
-  public void removeTag(String tag) {
-    if (tagEquals(tag, Tags.SPAN_KIND)) {
-      // Clear the cached ordinal; unsafeTags still needs to be updated below.
-      spanKindOrdinal = SPAN_KIND_UNSET;
-    }
-    synchronized (unsafeTags) {
-      unsafeTags.remove(tag);
-    }
-  }
-
-  /**
-   * Sets a tag to the span. Tags are not propagated to the children.
-   *
-   * <p>Existing tag value with the same value will be replaced. Setting a tag with a {@code null}
-   * value will remove the tag from the span.
-   *
-   * @param tag The tag name.
-   * @param value The nullable tag value.
-   */
-  public void setTag(final String tag, final Object value) {
-    if (null == tag) {
-      return;
-    }
-    if (null == value) {
-      removeTag(tag);
-    } else if (!tagInterceptor.interceptTag(this, tag, value)) {
-      synchronized (unsafeTags) {
-        unsafeTags.set(tag, value);
-      }
+    /**
+     * Cache the span.kind ordinal for fast isOutbound() checks. Called from TagInterceptor when
+     * span.kind is set.
+     */
+    public void setSpanKindOrdinal(String kind) {
+        spanKindOrdinal = spanKindOrdinalOf(kind);
     }
-  }
 
-  public void setTag(final String tag, final String value) {
-    if (null == tag) {
-      return;
+    static byte spanKindOrdinalOf(String kind) {
+        if (kind == null) {
+            return SPAN_KIND_UNSET;
+        } else if (tagEquals(kind, Tags.SPAN_KIND_SERVER)) {
+            return SPAN_KIND_SERVER;
+        } else if (tagEquals(kind, Tags.SPAN_KIND_CLIENT)) {
+            return SPAN_KIND_CLIENT;
+        } else if (tagEquals(kind, Tags.SPAN_KIND_PRODUCER)) {
+            return SPAN_KIND_PRODUCER;
+        } else if (tagEquals(kind, Tags.SPAN_KIND_CONSUMER)) {
+            return SPAN_KIND_CONSUMER;
+        } else if (tagEquals(kind, Tags.SPAN_KIND_INTERNAL)) {
+            return SPAN_KIND_INTERNAL;
+        } else if (tagEquals(kind, Tags.SPAN_KIND_BROKER)) {
+            return SPAN_KIND_BROKER;
+        } else {
+            return SPAN_KIND_CUSTOM;
+        }
     }
-    if (null == value) {
-      removeTag(tag);
-    } else if (!tagInterceptor.interceptTag(this, tag, value)) {
-      synchronized (unsafeTags) {
-        unsafeTags.set(tag, value);
-      }
-    }
-  }
-
-  public void setTag(TagMap.EntryReader entry) {
-    if (entry == null) {
-      return;
-    }
-
-    // pre-check to avoid boxing
-    boolean intercepted =
-        precheckIntercept(entry.tag())
-            && tagInterceptor.interceptTag(this, entry.tag(), entry.objectValue());
-    if (!intercepted) {
-      synchronized (unsafeTags) {
-        unsafeTags.set(entry);
-      }
-    }
-  }
-
-  /*
-   * Uses to determine if there's an opportunity to avoid primitve boxing.
-   * If the underlying map doesn't support efficient primitives, then boxing is used.
-   * If the tag may be intercepted, then boxing is also used.
-   */
-  private boolean precheckIntercept(String tag) {
-    return tagInterceptor.needsIntercept(tag);
-  }
-
-  /*
-   * Used when precheckIntercept determines that boxing is unavoidable
-   *
-   * Either because the tagInterceptor needs to be fully checked (which requires boxing)
-   * In that case, a box has already been created so it makes sense to pass the box
-   * onto TagMap, since optimized TagMap will cache the box
-   *
-   * -- OR --
-   *
-   * The TagMap isn't optimized and will need to box the primitive regardless of
-   * tag interception
-   */
-  private void setBox(String tag, Object box) {
-    if (!tagInterceptor.interceptTag(this, tag, box)) {
-      synchronized (unsafeTags) {
-        unsafeTags.set(tag, box);
-      }
-    }
-  }
-
-  public void setTag(final String tag, final boolean value) {
-    if (null == tag) {
-      return;
-    }
-    if (precheckIntercept(tag)) {
-      this.setBox(tag, value);
-    } else {
-      synchronized (unsafeTags) {
-        unsafeTags.set(tag, value);
-      }
+
+    byte getSpanKindOrdinal() {
+        return spanKindOrdinal;
+    }
+
+    /** Returns the span.kind string from the cached ordinal, or falls back to the tag map. */
+    public String getSpanKindString() {
+        byte ordinal = spanKindOrdinal;
+        if (ordinal > SPAN_KIND_UNSET && ordinal < SPAN_KIND_CUSTOM) {
+            return SPAN_KIND_VALUES[ordinal];
+        }
+        // UNSET or CUSTOM -- fall through to tag map
+        synchronized (unsafeTags) {
+            return unsafeTags.getString(Tags.SPAN_KIND);
+        }
     }
-  }
 
-  public void setTag(final String tag, final int value) {
-    if (null == tag) {
-      return;
+    public void setOrigin(final CharSequence origin) {
+        DDSpanContext context = getRootSpanContextOrThis();
+        context.origin = origin;
+        context.propagationTags.updateTraceOrigin(origin);
     }
-    if (precheckIntercept(tag)) {
-      this.setBox(tag, value);
-    } else {
-      synchronized (unsafeTags) {
-        unsafeTags.set(tag, value);
-      }
+
+    public void setMetric(final CharSequence key, final Number value) {
+        synchronized (unsafeTags) {
+            unsafeSetTag(key.toString(), value);
+        }
     }
-  }
 
-  public void setTag(final String tag, final long value) {
-    if (null == tag) {
-      return;
+    public void setMetric(final CharSequence key, final int value) {
+        synchronized (unsafeTags) {
+            unsafeTags.set(key.toString(), value);
+        }
     }
-    // check needsIntercept first to avoid unnecessary boxing
-    boolean intercepted =
-        tagInterceptor.needsIntercept(tag) && tagInterceptor.interceptTag(this, tag, value);
-    if (!intercepted) {
-      synchronized (unsafeTags) {
-        unsafeTags.set(tag, value);
-      }
+
+    public void setMetric(final CharSequence key, final long value) {
+        synchronized (unsafeTags) {
+            unsafeTags.set(key.toString(), value);
+        }
     }
-  }
 
-  public void setTag(final String tag, final float value) {
-    if (null == tag) {
-      return;
+    public void setMetric(final CharSequence key, final float value) {
+        synchronized (unsafeTags) {
+            unsafeTags.set(key.toString(), value);
+        }
     }
-    if (precheckIntercept(tag)) {
-      this.setBox(tag, value);
-    } else {
-      synchronized (unsafeTags) {
+
+    public void setMetric(final CharSequence key, final double value) {
+        synchronized (unsafeTags) {
+            unsafeTags.set(key.toString(), value);
+        }
+    }
+
+    public void setMetric(final TagMap.EntryReader entry) {
+        if (entry == null) {
+            return;
+        }
+
+        synchronized (unsafeTags) {
+            unsafeTags.set(entry);
+        }
+    }
+
+    public void removeTag(String tag) {
+        if (tagEquals(tag, Tags.SPAN_KIND)) {
+            // Clear the cached ordinal; unsafeTags still needs to be updated below.
+            spanKindOrdinal = SPAN_KIND_UNSET;
+        }
+        synchronized (unsafeTags) {
+            unsafeTags.remove(tag);
+        }
+    }
+
+    /**
+     * Sets a tag to the span. Tags are not propagated to the children.
+     *
+     * <p>Existing tag value with the same value will be replaced. Setting a tag with a {@code null}
+     * value will remove the tag from the span.
+     *
+     * @param tag The tag name.
+     * @param value The nullable tag value.
+     */
+    public void setTag(final String tag, final Object value) {
+        if (null == tag) {
+            return;
+        }
+        if (null == value) {
+            removeTag(tag);
+        } else if (!tagInterceptor.interceptTag(this, tag, value)) {
+            synchronized (unsafeTags) {
+                unsafeTags.set(tag, value);
+            }
+        }
+    }
+
+    public void setTag(final String tag, final String value) {
+        if (null == tag) {
+            return;
+        }
+        if (null == value) {
+            removeTag(tag);
+        } else if (!tagInterceptor.interceptTag(this, tag, value)) {
+            synchronized (unsafeTags) {
+                unsafeTags.set(tag, value);
+            }
+        }
+    }
+
+    public void setTag(TagMap.EntryReader entry) {
+        if (entry == null) {
+            return;
+        }
+
+        // pre-check to avoid boxing
+        boolean intercepted =
+                precheckIntercept(entry.tag()) && tagInterceptor.interceptTag(this, entry.tag(), entry.objectValue());
+        if (!intercepted) {
+            synchronized (unsafeTags) {
+                unsafeTags.set(entry);
+            }
+        }
+    }
+
+    /*
+     * Uses to determine if there's an opportunity to avoid primitve boxing.
+     * If the underlying map doesn't support efficient primitives, then boxing is used.
+     * If the tag may be intercepted, then boxing is also used.
+     */
+    private boolean precheckIntercept(String tag) {
+        return tagInterceptor.needsIntercept(tag);
+    }
+
+    /*
+     * Used when precheckIntercept determines that boxing is unavoidable
+     *
+     * Either because the tagInterceptor needs to be fully checked (which requires boxing)
+     * In that case, a box has already been created so it makes sense to pass the box
+     * onto TagMap, since optimized TagMap will cache the box
+     *
+     * -- OR --
+     *
+     * The TagMap isn't optimized and will need to box the primitive regardless of
+     * tag interception
+     */
+    private void setBox(String tag, Object box) {
+        if (!tagInterceptor.interceptTag(this, tag, box)) {
+            synchronized (unsafeTags) {
+                unsafeTags.set(tag, box);
+            }
+        }
+    }
+
+    public void setTag(final String tag, final boolean value) {
+        if (null == tag) {
+            return;
+        }
+        if (precheckIntercept(tag)) {
+            this.setBox(tag, value);
+        } else {
+            synchronized (unsafeTags) {
+                unsafeTags.set(tag, value);
+            }
+        }
+    }
+
+    public void setTag(final String tag, final int value) {
+        if (null == tag) {
+            return;
+        }
+        if (precheckIntercept(tag)) {
+            this.setBox(tag, value);
+        } else {
+            synchronized (unsafeTags) {
+                unsafeTags.set(tag, value);
+            }
+        }
+    }
+
+    public void setTag(final String tag, final long value) {
+        if (null == tag) {
+            return;
+        }
+        // check needsIntercept first to avoid unnecessary boxing
+        boolean intercepted = tagInterceptor.needsIntercept(tag) && tagInterceptor.interceptTag(this, tag, value);
+        if (!intercepted) {
+            synchronized (unsafeTags) {
+                unsafeTags.set(tag, value);
+            }
+        }
+    }
+
+    public void setTag(final String tag, final float value) {
+        if (null == tag) {
+            return;
+        }
+        if (precheckIntercept(tag)) {
+            this.setBox(tag, value);
+        } else {
+            synchronized (unsafeTags) {
+                unsafeTags.set(tag, value);
+            }
+        }
+    }
+
+    public void setTag(final String tag, final double value) {
+        if (null == tag) {
+            return;
+        }
+        if (precheckIntercept(tag)) {
+            this.setBox(tag, value);
+        } else {
+            synchronized (unsafeTags) {
+                unsafeTags.set(tag, value);
+            }
+        }
+    }
+
+    void setAllTags(final TagMap map) {
+        setAllTags(map, true);
+    }
+
+    void setAllTags(final TagMap map, boolean needsIntercept) {
+        if (map == null) {
+            return;
+        }
+
+        synchronized (unsafeTags) {
+            if (needsIntercept) {
+                // forEach out-performs the iterator of TagMap
+                // Taking advantage of ability to pass through other context arguments
+                // to avoid using a capturing lambda
+                map.forEach(this, (ctx, tagEntry) -> {
+                    String tag = tagEntry.tag();
+                    Object value = tagEntry.objectValue();
+
+                    if (!ctx.tagInterceptor.interceptTag(ctx, tag, value)) {
+                        ctx.unsafeTags.set(tagEntry);
+                    }
+                });
+            } else {
+                unsafeTags.putAll(map);
+            }
+        }
+    }
+
+    void setAllTags(final TagMap.Ledger ledger) {
+        if (ledger == null) {
+            return;
+        }
+
+        synchronized (unsafeTags) {
+            for (final TagMap.EntryChange entryChange : ledger) {
+                String tag = entryChange.tag();
+                if (entryChange.isRemoval()) {
+                    if (tagEquals(tag, Tags.SPAN_KIND)) {
+                        // mirror removeTag(String): keep the cached ordinal in sync with unsafeTags
+                        spanKindOrdinal = SPAN_KIND_UNSET;
+                    }
+                    unsafeTags.remove(tag);
+                } else {
+                    TagMap.Entry entry = (TagMap.Entry) entryChange;
+
+                    Object value = entry.objectValue();
+
+                    if (!tagInterceptor.interceptTag(this, tag, value)) {
+                        unsafeTags.set(entry);
+                    }
+                }
+            }
+        }
+    }
+
+    void setAllTags(final Map<String, ?> map) {
+        if (map == null) {
+            return;
+        } else if (map instanceof TagMap) {
+            setAllTags((TagMap) map);
+        } else if (!map.isEmpty()) {
+            synchronized (unsafeTags) {
+                for (final Map.Entry<String, ?> tag : map.entrySet()) {
+                    if (!tagInterceptor.interceptTag(this, tag.getKey(), tag.getValue())) {
+                        unsafeSetTag(tag.getKey(), tag.getValue());
+                    }
+                }
+            }
+        }
+    }
+
+    void unsafeSetTag(final String tag, final Object value) {
         unsafeTags.set(tag, value);
-      }
     }
-  }
 
-  public void setTag(final String tag, final double value) {
-    if (null == tag) {
-      return;
+    void unsafeSetTag(final String tag, final CharSequence value) {
+        unsafeTags.set(tag, value);
     }
-    if (precheckIntercept(tag)) {
-      this.setBox(tag, value);
-    } else {
-      synchronized (unsafeTags) {
+
+    void unsafeSetTag(final String tag, final byte value) {
         unsafeTags.set(tag, value);
-      }
     }
-  }
 
-  void setAllTags(final TagMap map) {
-    setAllTags(map, true);
-  }
+    void unsafeSetTag(final String tag, final double value) {
+        unsafeTags.set(tag, value);
+    }
 
-  void setAllTags(final TagMap map, boolean needsIntercept) {
-    if (map == null) {
-      return;
+    Object getTag(final String key) {
+        switch (key) {
+            case DDTags.THREAD_ID:
+                return threadId;
+            case DDTags.THREAD_NAME:
+                // maintain previously observable type of the thread name :|
+                return threadName.toString();
+            case Tags.HTTP_STATUS:
+                return 0 == httpStatusCode ? null : (int) httpStatusCode;
+            case Tags.SPAN_KIND:
+                return getSpanKindString();
+            default:
+                Object value;
+                synchronized (unsafeTags) {
+                    value = unsafeGetTag(key);
+                }
+                // maintain previously observable type of http url :|
+                return value == null ? null : Tags.HTTP_URL.equals(key) ? value.toString() : value;
+        }
     }
 
-    synchronized (unsafeTags) {
-      if (needsIntercept) {
-        // forEach out-performs the iterator of TagMap
-        // Taking advantage of ability to pass through other context arguments
-        // to avoid using a capturing lambda
-        map.forEach(
-            this,
-            (ctx, tagEntry) -> {
-              String tag = tagEntry.tag();
-              Object value = tagEntry.objectValue();
+    /**
+     * This is not thread-safe and must only be used when it can be guaranteed that the context will
+     * not be mutated. This is internal API and must not be exposed to users.
+     *
+     * @param tag
+     * @return the value associated with the tag
+     */
+    public Object unsafeGetTag(final String tag) {
+        return unsafeTags.getObject(tag);
+    }
 
-              if (!ctx.tagInterceptor.interceptTag(ctx, tag, value)) {
-                ctx.unsafeTags.set(tagEntry);
-              }
-            });
-      } else {
-        unsafeTags.putAll(map);
-      }
+    @Deprecated
+    public TagMap getTags() {
+        synchronized (unsafeTags) {
+            TagMap tags = unsafeTags.copy();
+
+            tags.put(DDTags.THREAD_ID, threadId);
+            // maintain previously observable type of the thread name :|
+            tags.put(DDTags.THREAD_NAME, threadName.toString());
+            int currentSamplingPriority = getSamplingPriority();
+            // add _sample_rate tag only on the root/local span owning the decision
+            if (getRootSpanContextIfDifferent() == null && currentSamplingPriority != PrioritySampling.UNSET) {
+                tags.put(SAMPLE_RATE_KEY, currentSamplingPriority);
+            }
+            if (httpStatusCode != 0) {
+                tags.put(Tags.HTTP_STATUS, (int) httpStatusCode);
+            }
+            // maintain previously observable type of http url :|
+            Object value = tags.get(Tags.HTTP_URL);
+            if (value != null) {
+                tags.put(Tags.HTTP_URL, value.toString());
+            }
+            return tags.freeze();
+        }
     }
-  }
 
-  void setAllTags(final TagMap.Ledger ledger) {
-    if (ledger == null) {
-      return;
+    /**
+     * @see CoreSpan#getMetaStruct()
+     */
+    public Map<String, Object> getMetaStruct() {
+        return Collections.unmodifiableMap(metaStruct);
     }
 
-    synchronized (unsafeTags) {
-      for (final TagMap.EntryChange entryChange : ledger) {
-        String tag = entryChange.tag();
-        if (entryChange.isRemoval()) {
-          if (tagEquals(tag, Tags.SPAN_KIND)) {
-            // mirror removeTag(String): keep the cached ordinal in sync with unsafeTags
-            spanKindOrdinal = SPAN_KIND_UNSET;
-          }
-          unsafeTags.remove(tag);
+    /**
+     * @see CoreSpan#setMetaStruct(String, Object)
+     */
+    public <T> void setMetaStruct(final String field, final T value) {
+        if (null == field) {
+            return;
+        }
+        if (metaStruct == EMPTY_META_STRUCT) {
+            synchronized (this) {
+                if (metaStruct == EMPTY_META_STRUCT) {
+                    metaStruct = new ConcurrentHashMap<>(4);
+                }
+            }
+        }
+        if (null == value) {
+            metaStruct.remove(field);
         } else {
-          TagMap.Entry entry = (TagMap.Entry) entryChange;
+            metaStruct.put(field, value);
+        }
+    }
 
-          Object value = entry.objectValue();
+    void earlyProcessTags(AppendableSpanLinks links) {
+        synchronized (unsafeTags) {
+            TagsPostProcessorFactory.eagerProcessor().processTags(unsafeTags, this, links);
+        }
+    }
 
-          if (!tagInterceptor.interceptTag(this, tag, value)) {
-            unsafeTags.set(entry);
-          }
-        }
-      }
-    }
-  }
-
-  void setAllTags(final Map<String, ?> map) {
-    if (map == null) {
-      return;
-    } else if (map instanceof TagMap) {
-      setAllTags((TagMap) map);
-    } else if (!map.isEmpty()) {
-      synchronized (unsafeTags) {
-        for (final Map.Entry<String, ?> tag : map.entrySet()) {
-          if (!tagInterceptor.interceptTag(this, tag.getKey(), tag.getValue())) {
-            unsafeSetTag(tag.getKey(), tag.getValue());
-          }
-        }
-      }
-    }
-  }
-
-  void unsafeSetTag(final String tag, final Object value) {
-    unsafeTags.set(tag, value);
-  }
-
-  void unsafeSetTag(final String tag, final CharSequence value) {
-    unsafeTags.set(tag, value);
-  }
-
-  void unsafeSetTag(final String tag, final byte value) {
-    unsafeTags.set(tag, value);
-  }
-
-  void unsafeSetTag(final String tag, final double value) {
-    unsafeTags.set(tag, value);
-  }
-
-  Object getTag(final String key) {
-    switch (key) {
-      case DDTags.THREAD_ID:
-        return threadId;
-      case DDTags.THREAD_NAME:
-        // maintain previously observable type of the thread name :|
-        return threadName.toString();
-      case Tags.HTTP_STATUS:
-        return 0 == httpStatusCode ? null : (int) httpStatusCode;
-      case Tags.SPAN_KIND:
-        return getSpanKindString();
-      default:
-        Object value;
+    void processTagsAndBaggage(final MetadataConsumer consumer, int longRunningVersion, DDSpan restrictedSpan) {
+        processTagsAndBaggage(
+                consumer, longRunningVersion, restrictedSpan, injectLinksAsTags, injectBaggageAsTags, propagationTags);
+    }
+
+    void processTagsAndBaggage(
+            final MetadataConsumer consumer, int longRunningVersion, DDSpan restrictedSpan, boolean firstInChunk) {
+        processTagsAndBaggage(
+                consumer,
+                longRunningVersion,
+                restrictedSpan,
+                injectLinksAsTags,
+                injectBaggageAsTags,
+                firstInChunk ? getPropagationTags() : null);
+    }
+
+    /**
+     * Serialize span links as first-class structured data rather than tags. While baggage tag
+     * injection keeps following the tracer configuration.
+     */
+    void processTagsAndBaggageWithStructuredLinks(
+            final MetadataConsumer consumer, int longRunningVersion, DDSpan restrictedSpan) {
+        processTagsAndBaggage(
+                consumer,
+                longRunningVersion,
+                restrictedSpan,
+                false, // injectLinksAsTags
+                injectBaggageAsTags,
+                propagationTags);
+    }
+
+    void processTagsAndBaggageWithStructuredLinks(
+            final MetadataConsumer consumer, int longRunningVersion, DDSpan restrictedSpan, boolean firstInChunk) {
+        processTagsAndBaggage(
+                consumer,
+                longRunningVersion,
+                restrictedSpan,
+                false, // injectLinksAsTags
+                injectBaggageAsTags,
+                firstInChunk ? getPropagationTags() : null);
+    }
+
+    void processTagsAndBaggage(
+            final MetadataConsumer consumer,
+            int longRunningVersion,
+            DDSpan restrictedSpan,
+            boolean injectLinksAsTags,
+            boolean injectBaggageAsTags,
+            PropagationTags serializedPropagationTags) {
+        // NOTE: The span is passed for the sole purpose of allowing updating & reading of the span
+        // links
+        // This is a compromise to avoid...
+        // - creating an extra wrapper object that would create significant allocation
+        // - implementing an interface to read the spans that require making the read method public
         synchronized (unsafeTags) {
-          value = unsafeGetTag(key);
-        }
-        // maintain previously observable type of http url :|
-        return value == null ? null : Tags.HTTP_URL.equals(key) ? value.toString() : value;
-    }
-  }
-
-  /**
-   * This is not thread-safe and must only be used when it can be guaranteed that the context will
-   * not be mutated. This is internal API and must not be exposed to users.
-   *
-   * @param tag
-   * @return the value associated with the tag
-   */
-  public Object unsafeGetTag(final String tag) {
-    return unsafeTags.getObject(tag);
-  }
-
-  @Deprecated
-  public TagMap getTags() {
-    synchronized (unsafeTags) {
-      TagMap tags = unsafeTags.copy();
-
-      tags.put(DDTags.THREAD_ID, threadId);
-      // maintain previously observable type of the thread name :|
-      tags.put(DDTags.THREAD_NAME, threadName.toString());
-      int currentSamplingPriority = getSamplingPriority();
-      // add _sample_rate tag only on the root/local span owning the decision
-      if (getRootSpanContextIfDifferent() == null
-          && currentSamplingPriority != PrioritySampling.UNSET) {
-        tags.put(SAMPLE_RATE_KEY, currentSamplingPriority);
-      }
-      if (httpStatusCode != 0) {
-        tags.put(Tags.HTTP_STATUS, (int) httpStatusCode);
-      }
-      // maintain previously observable type of http url :|
-      Object value = tags.get(Tags.HTTP_URL);
-      if (value != null) {
-        tags.put(Tags.HTTP_URL, value.toString());
-      }
-      return tags.freeze();
-    }
-  }
-
-  /**
-   * @see CoreSpan#getMetaStruct()
-   */
-  public Map<String, Object> getMetaStruct() {
-    return Collections.unmodifiableMap(metaStruct);
-  }
-
-  /**
-   * @see CoreSpan#setMetaStruct(String, Object)
-   */
-  public <T> void setMetaStruct(final String field, final T value) {
-    if (null == field) {
-      return;
-    }
-    if (metaStruct == EMPTY_META_STRUCT) {
-      synchronized (this) {
-        if (metaStruct == EMPTY_META_STRUCT) {
-          metaStruct = new ConcurrentHashMap<>(4);
-        }
-      }
-    }
-    if (null == value) {
-      metaStruct.remove(field);
-    } else {
-      metaStruct.put(field, value);
-    }
-  }
-
-  void earlyProcessTags(AppendableSpanLinks links) {
-    synchronized (unsafeTags) {
-      TagsPostProcessorFactory.eagerProcessor().processTags(unsafeTags, this, links);
-    }
-  }
-
-  void processTagsAndBaggage(
-      final MetadataConsumer consumer, int longRunningVersion, DDSpan restrictedSpan) {
-    processTagsAndBaggage(
-        consumer,
-        longRunningVersion,
-        restrictedSpan,
-        injectLinksAsTags,
-        injectBaggageAsTags,
-        propagationTags);
-  }
-
-  void processTagsAndBaggage(
-      final MetadataConsumer consumer,
-      int longRunningVersion,
-      DDSpan restrictedSpan,
-      boolean firstInChunk) {
-    processTagsAndBaggage(
-        consumer,
-        longRunningVersion,
-        restrictedSpan,
-        injectLinksAsTags,
-        injectBaggageAsTags,
-        firstInChunk ? getPropagationTags() : null);
-  }
-
-  /**
-   * Serialize span links as first-class structured data rather than tags. While baggage tag
-   * injection keeps following the tracer configuration.
-   */
-  void processTagsAndBaggageWithStructuredLinks(
-      final MetadataConsumer consumer, int longRunningVersion, DDSpan restrictedSpan) {
-    processTagsAndBaggage(
-        consumer,
-        longRunningVersion,
-        restrictedSpan,
-        false, // injectLinksAsTags
-        injectBaggageAsTags,
-        propagationTags);
-  }
-
-  void processTagsAndBaggageWithStructuredLinks(
-      final MetadataConsumer consumer,
-      int longRunningVersion,
-      DDSpan restrictedSpan,
-      boolean firstInChunk) {
-    processTagsAndBaggage(
-        consumer,
-        longRunningVersion,
-        restrictedSpan,
-        false, // injectLinksAsTags
-        injectBaggageAsTags,
-        firstInChunk ? getPropagationTags() : null);
-  }
-
-  void processTagsAndBaggage(
-      final MetadataConsumer consumer,
-      int longRunningVersion,
-      DDSpan restrictedSpan,
-      boolean injectLinksAsTags,
-      boolean injectBaggageAsTags,
-      PropagationTags serializedPropagationTags) {
-    // NOTE: The span is passed for the sole purpose of allowing updating & reading of the span
-    // links
-    // This is a compromise to avoid...
-    // - creating an extra wrapper object that would create significant allocation
-    // - implementing an interface to read the spans that require making the read method public
-    synchronized (unsafeTags) {
-      // Tags
-      TagsPostProcessorFactory.lazyProcessor().processTags(unsafeTags, this, restrictedSpan);
-
-      // Links
-      if (injectLinksAsTags) {
-        String linksTag = DDSpanLink.toTag(restrictedSpan.getLinks());
-        if (linksTag != null) {
-          unsafeTags.set(SPAN_LINKS, linksTag);
-        }
-      }
-
-      // Baggage
-      Map<String, String> baggageItemsWithPropagationTags;
-      if (injectBaggageAsTags) {
-        baggageItemsWithPropagationTags = new HashMap<>(baggageItems);
-        if (w3cBaggage != null) {
-          injectW3CBaggageTags(baggageItemsWithPropagationTags);
-        }
-        if (serializedPropagationTags != null) {
-          serializedPropagationTags.fillTagMap(baggageItemsWithPropagationTags);
-        }
-      } else {
-        baggageItemsWithPropagationTags =
-            serializedPropagationTags == null
-                ? EMPTY_BAGGAGE
-                : serializedPropagationTags.createTagMap();
-      }
-
-      consumer.accept(
-          new Metadata(
-              threadId,
-              threadName,
-              unsafeTags,
-              baggageItemsWithPropagationTags,
-              getSamplingPriority(),
-              measured,
-              topLevel,
-              httpStatusCode,
-              // Get origin from rootSpan.context
-              getOrigin(),
-              longRunningVersion,
-              ProcessTags.getTagsForSerialization(),
-              Config.get().isOtlpTracesExportEnabled() ? OTLP_EXPORT_TRUE : OTLP_EXPORT_FALSE,
-              restrictedSpan.getLinks()));
-    }
-  }
-
-  void injectW3CBaggageTags(Map<String, String> baggageItemsWithPropagationTags) {
-    List<String> baggageTagKeys = Config.get().getTraceBaggageTagKeys();
-    if (baggageTagKeys.isEmpty()) {
-      return;
-    }
-    Map<String, String> w3cBaggageItems = w3cBaggage.asMap();
-    for (String key : baggageTagKeys) {
-      if ("*".equals(key)) {
-        // If the key is "*", we add all baggage items
-        for (Map.Entry<String, String> entry : w3cBaggageItems.entrySet()) {
-          baggageItemsWithPropagationTags.put("baggage." + entry.getKey(), entry.getValue());
-        }
-        break;
-      }
-      String value = w3cBaggageItems.get(key);
-      if (value != null) {
-        baggageItemsWithPropagationTags.put("baggage." + key, value);
-      }
-    }
-  }
-
-  @Override
-  public void setIntegrationName(CharSequence integrationName) {
-    this.integrationName = integrationName;
-  }
-
-  @Override
-  public CharSequence getIntegrationName() {
-    return integrationName;
-  }
-
-  @Override
-  public String toString() {
-    final StringBuilder s =
-        new StringBuilder()
-            .append("DDSpan [ t_id=")
-            .append(traceId)
-            .append(", s_id=")
-            .append(DDSpanId.toString(spanId))
-            .append(", p_id=")
-            .append(DDSpanId.toString(parentId))
-            .append(" ] trace=")
-            .append(getServiceName())
-            .append('/')
-            .append(getOperationName())
-            .append('/')
-            .append(getResourceName());
-    if (errorFlag) {
-      s.append(" *errored*");
-    }
-    if (measured) {
-      s.append(" *measured*");
-    }
-
-    synchronized (unsafeTags) {
-      s.append(" tags=").append(new TreeMap<>(getTags()));
-    }
-    return s.toString();
-  }
-
-  /** RequestContext Implementation */
-  @Override
-  public Object getData(RequestContextSlot slot) {
-    if (slot == RequestContextSlot.APPSEC) {
-      return this.requestContextDataAppSec;
-    } else if (slot == RequestContextSlot.CI_VISIBILITY) {
-      return this.ciVisibilityContextData;
-    } else if (slot == RequestContextSlot.IAST) {
-      return this.requestContextDataIast;
-    }
-    return null;
-  }
-
-  @Override
-  public void close() throws IOException {
-    Exception exc = null;
-    if (this.requestContextDataAppSec instanceof Closeable) {
-      try {
-        ((Closeable) this.requestContextDataAppSec).close();
-      } catch (IOException | RuntimeException e) {
-        exc = e;
-      }
-    }
-    if (this.requestContextDataIast instanceof Closeable) {
-      try {
-        ((Closeable) this.requestContextDataIast).close();
-      } catch (IOException | RuntimeException e) {
-        exc = e;
-      }
-    }
-    if (exc != null) {
-      if (exc instanceof RuntimeException) {
-        throw (RuntimeException) exc;
-      } else {
-        throw (IOException) exc;
-      }
-    }
-  }
-
-  @Override
-  public TraceSegment getTraceSegment() {
-    return this;
-  }
-
-  @Override
-  public void setBlockResponseFunction(BlockResponseFunction blockResponseFunction) {
-    getRootSpanContextOrThis().blockResponseFunction = blockResponseFunction;
-  }
-
-  @Override
-  public BlockResponseFunction getBlockResponseFunction() {
-    return getRootSpanContextOrThis().blockResponseFunction;
-  }
-
-  @Override
-  public void setClientIpAddressData(final ClientIpAddressData clientIpAddressData) {
-    getRootSpanContextOrThis().clientIpAddressData = clientIpAddressData;
-  }
-
-  @Override
-  public ClientIpAddressData getClientIpAddressData() {
-    return getRootSpanContextOrThis().clientIpAddressData;
-  }
-
-  public PropagationTags getPropagationTags() {
-    return getRootSpanContextOrThis().propagationTags;
-  }
-
-  /** TraceSegment Implementation */
-  @Override
-  public void setTagTop(String key, Object value, boolean sanitize) {
-    getRootSpanContextOrThis().setTagCurrent(key, value, sanitize);
-  }
-
-  @Override
-  public Object getTagTop(String key, boolean sanitize) {
-    return getRootSpanContextOrThis().getTagCurrent(key, sanitize);
-  }
-
-  @Override
-  public void setTagCurrent(String key, Object value, boolean sanitize) {
-    if (sanitize) {
-      key = TagsHelper.sanitize(key);
-    }
-    this.setTag(key, value);
-  }
-
-  @Override
-  public Object getTagCurrent(String key, boolean sanitize) {
-    if (sanitize) {
-      key = TagsHelper.sanitize(key);
-    }
-    return this.getTag(key);
-  }
-
-  @Override
-  public void setDataTop(String key, Object value) {
-    getRootSpanContextOrThis().setDataCurrent(key, value);
-  }
-
-  @Override
-  public Object getDataTop(String key) {
-    return getRootSpanContextOrThis().getDataCurrent(key);
-  }
-
-  @Override
-  public void effectivelyBlocked() {
-    setTagTop("appsec.blocked", "true");
-  }
-
-  @Override
-  public void setDataCurrent(String key, Object value) {
-    this.setTag(getTagName(key), value);
-  }
-
-  @Override
-  public Object getDataCurrent(String key) {
-    return this.getTag(getTagName(key));
-  }
-
-  private String getTagName(String key) {
-    // TODO is this decided?
-    return "_dd." + key + ".json";
-  }
-
-  @Override
-  public void setMetaStructTop(String field, Object value) {
-    getRootSpanContextOrThis().setMetaStructCurrent(field, value);
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public <T> T getOrCreateMetaStructTop(final String key, final Function<String, T> defaultValue) {
-    final DDSpanContext top = getRootSpanContextOrThis();
-    if (top.metaStruct == EMPTY_META_STRUCT) {
-      // this will safely create the metastruct if the field has not been initialized already
-      top.setMetaStruct(key, defaultValue.apply(key));
-    }
-    return (T) top.metaStruct.computeIfAbsent(key, defaultValue);
-  }
-
-  @Override
-  public void setMetaStructCurrent(String field, Object value) {
-    setMetaStruct(field, value);
-  }
-
-  @Override
-  public boolean isRemote() {
-    return false;
-  }
+            // Tags
+            TagsPostProcessorFactory.lazyProcessor().processTags(unsafeTags, this, restrictedSpan);
+
+            // Links
+            if (injectLinksAsTags) {
+                String linksTag = DDSpanLink.toTag(restrictedSpan.getLinks());
+                if (linksTag != null) {
+                    unsafeTags.set(SPAN_LINKS, linksTag);
+                }
+            }
+
+            // Baggage
+            Map<String, String> baggageItemsWithPropagationTags;
+            if (injectBaggageAsTags) {
+                baggageItemsWithPropagationTags = new HashMap<>(baggageItems);
+                if (w3cBaggage != null) {
+                    injectW3CBaggageTags(baggageItemsWithPropagationTags);
+                }
+                if (serializedPropagationTags != null) {
+                    serializedPropagationTags.fillTagMap(baggageItemsWithPropagationTags);
+                }
+            } else {
+                baggageItemsWithPropagationTags =
+                        serializedPropagationTags == null ? EMPTY_BAGGAGE : serializedPropagationTags.createTagMap();
+            }
+
+            consumer.accept(new Metadata(
+                    threadId,
+                    threadName,
+                    unsafeTags,
+                    baggageItemsWithPropagationTags,
+                    getSamplingPriority(),
+                    measured,
+                    topLevel,
+                    httpStatusCode,
+                    // Get origin from rootSpan.context
+                    getOrigin(),
+                    longRunningVersion,
+                    ProcessTags.getTagsForSerialization(),
+                    Config.get().isOtlpTracesExportEnabled() ? OTLP_EXPORT_TRUE : OTLP_EXPORT_FALSE,
+                    restrictedSpan.getLinks()));
+        }
+    }
+
+    void injectW3CBaggageTags(Map<String, String> baggageItemsWithPropagationTags) {
+        List<String> baggageTagKeys = Config.get().getTraceBaggageTagKeys();
+        if (baggageTagKeys.isEmpty()) {
+            return;
+        }
+        Map<String, String> w3cBaggageItems = w3cBaggage.asMap();
+        for (String key : baggageTagKeys) {
+            if ("*".equals(key)) {
+                // If the key is "*", we add all baggage items
+                for (Map.Entry<String, String> entry : w3cBaggageItems.entrySet()) {
+                    baggageItemsWithPropagationTags.put("baggage." + entry.getKey(), entry.getValue());
+                }
+                break;
+            }
+            String value = w3cBaggageItems.get(key);
+            if (value != null) {
+                baggageItemsWithPropagationTags.put("baggage." + key, value);
+            }
+        }
+    }
+
+    @Override
+    public void setIntegrationName(CharSequence integrationName) {
+        this.integrationName = integrationName;
+    }
+
+    @Override
+    public CharSequence getIntegrationName() {
+        return integrationName;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder s = new StringBuilder()
+                .append("DDSpan [ t_id=")
+                .append(traceId)
+                .append(", s_id=")
+                .append(DDSpanId.toString(spanId))
+                .append(", p_id=")
+                .append(DDSpanId.toString(parentId))
+                .append(" ] trace=")
+                .append(getServiceName())
+                .append('/')
+                .append(getOperationName())
+                .append('/')
+                .append(getResourceName());
+        if (errorFlag) {
+            s.append(" *errored*");
+        }
+        if (measured) {
+            s.append(" *measured*");
+        }
+
+        synchronized (unsafeTags) {
+            s.append(" tags=").append(new TreeMap<>(getTags()));
+        }
+        return s.toString();
+    }
+
+    /** RequestContext Implementation */
+    @Override
+    public Object getData(RequestContextSlot slot) {
+        if (slot == RequestContextSlot.APPSEC) {
+            return this.requestContextDataAppSec;
+        } else if (slot == RequestContextSlot.CI_VISIBILITY) {
+            return this.ciVisibilityContextData;
+        } else if (slot == RequestContextSlot.IAST) {
+            return this.requestContextDataIast;
+        }
+        return null;
+    }
+
+    @Override
+    public void close() throws IOException {
+        Exception exc = null;
+        if (this.requestContextDataAppSec instanceof Closeable) {
+            try {
+                ((Closeable) this.requestContextDataAppSec).close();
+            } catch (IOException | RuntimeException e) {
+                exc = e;
+            }
+        }
+        if (this.requestContextDataIast instanceof Closeable) {
+            try {
+                ((Closeable) this.requestContextDataIast).close();
+            } catch (IOException | RuntimeException e) {
+                exc = e;
+            }
+        }
+        if (exc != null) {
+            if (exc instanceof RuntimeException) {
+                throw (RuntimeException) exc;
+            } else {
+                throw (IOException) exc;
+            }
+        }
+    }
+
+    @Override
+    public TraceSegment getTraceSegment() {
+        return this;
+    }
+
+    @Override
+    public void setBlockResponseFunction(BlockResponseFunction blockResponseFunction) {
+        getRootSpanContextOrThis().blockResponseFunction = blockResponseFunction;
+    }
+
+    @Override
+    public BlockResponseFunction getBlockResponseFunction() {
+        return getRootSpanContextOrThis().blockResponseFunction;
+    }
+
+    @Override
+    public void setClientIpAddressData(final ClientIpAddressData clientIpAddressData) {
+        getRootSpanContextOrThis().clientIpAddressData = clientIpAddressData;
+    }
+
+    @Override
+    public ClientIpAddressData getClientIpAddressData() {
+        return getRootSpanContextOrThis().clientIpAddressData;
+    }
+
+    public PropagationTags getPropagationTags() {
+        return getRootSpanContextOrThis().propagationTags;
+    }
+
+    /** TraceSegment Implementation */
+    @Override
+    public void setTagTop(String key, Object value, boolean sanitize) {
+        getRootSpanContextOrThis().setTagCurrent(key, value, sanitize);
+    }
+
+    @Override
+    public Object getTagTop(String key, boolean sanitize) {
+        return getRootSpanContextOrThis().getTagCurrent(key, sanitize);
+    }
+
+    @Override
+    public void setTagCurrent(String key, Object value, boolean sanitize) {
+        if (sanitize) {
+            key = TagsHelper.sanitize(key);
+        }
+        this.setTag(key, value);
+    }
+
+    @Override
+    public Object getTagCurrent(String key, boolean sanitize) {
+        if (sanitize) {
+            key = TagsHelper.sanitize(key);
+        }
+        return this.getTag(key);
+    }
+
+    @Override
+    public void setDataTop(String key, Object value) {
+        getRootSpanContextOrThis().setDataCurrent(key, value);
+    }
+
+    @Override
+    public Object getDataTop(String key) {
+        return getRootSpanContextOrThis().getDataCurrent(key);
+    }
+
+    @Override
+    public void effectivelyBlocked() {
+        setTagTop("appsec.blocked", "true");
+    }
+
+    @Override
+    public void setDataCurrent(String key, Object value) {
+        this.setTag(getTagName(key), value);
+    }
+
+    @Override
+    public Object getDataCurrent(String key) {
+        return this.getTag(getTagName(key));
+    }
+
+    private String getTagName(String key) {
+        // TODO is this decided?
+        return "_dd." + key + ".json";
+    }
+
+    @Override
+    public void setMetaStructTop(String field, Object value) {
+        getRootSpanContextOrThis().setMetaStructCurrent(field, value);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> T getOrCreateMetaStructTop(final String key, final Function<String, T> defaultValue) {
+        final DDSpanContext top = getRootSpanContextOrThis();
+        if (top.metaStruct == EMPTY_META_STRUCT) {
+            // this will safely create the metastruct if the field has not been initialized already
+            top.setMetaStruct(key, defaultValue.apply(key));
+        }
+        return (T) top.metaStruct.computeIfAbsent(key, defaultValue);
+    }
+
+    @Override
+    public void setMetaStructCurrent(String field, Object value) {
+        setMetaStruct(field, value);
+    }
+
+    @Override
+    public boolean isRemote() {
+        return false;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanLink.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanLink.java
index 31554cbcdec..81c3f83cdf2 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanLink.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanLink.java
@@ -20,132 +20,126 @@
 
 /** This class holds helper methods to encode span links into span context. */
 public class DDSpanLink extends SpanLink {
-  private static final Logger LOGGER = LoggerFactory.getLogger(DDSpanLink.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DDSpanLink.class);
 
-  /** The maximum of characters a span tag value can hold. */
-  private static final int TAG_MAX_LENGTH = 25_000;
+    /** The maximum of characters a span tag value can hold. */
+    private static final int TAG_MAX_LENGTH = 25_000;
 
-  protected DDSpanLink(
-      DDTraceId traceId,
-      long spanId,
-      byte traceFlags,
-      String traceState,
-      SpanAttributes attributes) {
-    super(traceId, spanId, traceFlags, traceState, attributes);
-  }
-
-  /**
-   * Creates a span link from an {@link ExtractedContext}. Gathers the trace and span identifiers,
-   * and the W3C trace state from the given instance.
-   *
-   * @param context The context of the span to get the link to.
-   * @return A span link to the given context.
-   */
-  public static SpanLink from(ExtractedContext context) {
-    return from(context, EMPTY);
-  }
-
-  /**
-   * Creates a span link from an {@link ExtractedContext} with custom attributes. Gathers the trace
-   * and span identifiers, and the W3C trace state from the given instance.
-   *
-   * @param context The context of the span to get the link to.
-   * @param attributes The span link attributes.
-   * @return A span link to the given context with custom attributes.
-   */
-  public static SpanLink from(ExtractedContext context, SpanAttributes attributes) {
-    byte traceFlags = context.getSamplingPriority() > 0 ? SAMPLED_FLAG : DEFAULT_FLAGS;
-    String traceState =
-        context.getPropagationTags() == null
-            ? ""
-            : context.getPropagationTags().headerValue(PropagationTags.HeaderType.W3C);
-    return new DDSpanLink(
-        context.getTraceId(), context.getSpanId(), traceFlags, traceState, attributes);
-  }
+    protected DDSpanLink(
+            DDTraceId traceId, long spanId, byte traceFlags, String traceState, SpanAttributes attributes) {
+        super(traceId, spanId, traceFlags, traceState, attributes);
+    }
 
-  /**
-   * Encode a span link collection into a tag value.
-   *
-   * @param links The span link collection to encode.
-   * @return The encoded tag value, {@code null} if no links.
-   */
-  public static String toTag(List<? extends AgentSpanLink> links) {
-    if (links == null || links.isEmpty()) {
-      return null;
+    /**
+     * Creates a span link from an {@link ExtractedContext}. Gathers the trace and span identifiers,
+     * and the W3C trace state from the given instance.
+     *
+     * @param context The context of the span to get the link to.
+     * @return A span link to the given context.
+     */
+    public static SpanLink from(ExtractedContext context) {
+        return from(context, EMPTY);
     }
-    // Build the JSON array half-manually to keep encoded JSON length less than TAG_MAX_LENGTH.
-    StringBuilder builder = new StringBuilder("[");
-    int index = 0;
-    while (index < links.size()) {
-      String linkAsJson = getEncoder().toJson(links.get(index));
-      int arrayCharsNeeded = index == 0 ? 1 : 2; // Closing bracket and comma separator if needed
-      if (linkAsJson.length() + builder.length() + arrayCharsNeeded >= TAG_MAX_LENGTH) {
-        // No more links fit in the span tag; stop adding.
-        break;
-      }
-      if (index > 0) {
-        builder.append(',');
-      }
-      builder.append(linkAsJson);
-      index++;
+
+    /**
+     * Creates a span link from an {@link ExtractedContext} with custom attributes. Gathers the trace
+     * and span identifiers, and the W3C trace state from the given instance.
+     *
+     * @param context The context of the span to get the link to.
+     * @param attributes The span link attributes.
+     * @return A span link to the given context with custom attributes.
+     */
+    public static SpanLink from(ExtractedContext context, SpanAttributes attributes) {
+        byte traceFlags = context.getSamplingPriority() > 0 ? SAMPLED_FLAG : DEFAULT_FLAGS;
+        String traceState = context.getPropagationTags() == null
+                ? ""
+                : context.getPropagationTags().headerValue(PropagationTags.HeaderType.W3C);
+        return new DDSpanLink(context.getTraceId(), context.getSpanId(), traceFlags, traceState, attributes);
     }
-    // Notify of dropped links
-    while (index < links.size()) {
-      LOGGER.debug("Span tag full. Dropping span links {}", links.get(index));
-      index++;
+
+    /**
+     * Encode a span link collection into a tag value.
+     *
+     * @param links The span link collection to encode.
+     * @return The encoded tag value, {@code null} if no links.
+     */
+    public static String toTag(List<? extends AgentSpanLink> links) {
+        if (links == null || links.isEmpty()) {
+            return null;
+        }
+        // Build the JSON array half-manually to keep encoded JSON length less than TAG_MAX_LENGTH.
+        StringBuilder builder = new StringBuilder("[");
+        int index = 0;
+        while (index < links.size()) {
+            String linkAsJson = getEncoder().toJson(links.get(index));
+            int arrayCharsNeeded = index == 0 ? 1 : 2; // Closing bracket and comma separator if needed
+            if (linkAsJson.length() + builder.length() + arrayCharsNeeded >= TAG_MAX_LENGTH) {
+                // No more links fit in the span tag; stop adding.
+                break;
+            }
+            if (index > 0) {
+                builder.append(',');
+            }
+            builder.append(linkAsJson);
+            index++;
+        }
+        // Notify of dropped links
+        while (index < links.size()) {
+            LOGGER.debug("Span tag full. Dropping span links {}", links.get(index));
+            index++;
+        }
+        return builder.append(']').toString();
     }
-    return builder.append(']').toString();
-  }
 
-  private static JsonAdapter<AgentSpanLink> getEncoder() {
-    return EncoderHolder.ENCODER;
-  }
+    private static JsonAdapter<AgentSpanLink> getEncoder() {
+        return EncoderHolder.ENCODER;
+    }
 
-  /**
-   * JSON encoder (lazily initialized). This is not folded at native image build time, so it works
-   * as expected.
-   */
-  private static class EncoderHolder {
-    static final JsonAdapter<AgentSpanLink> ENCODER = createEncoder();
+    /**
+     * JSON encoder (lazily initialized). This is not folded at native image build time, so it works
+     * as expected.
+     */
+    private static class EncoderHolder {
+        static final JsonAdapter<AgentSpanLink> ENCODER = createEncoder();
 
-    private static JsonAdapter<AgentSpanLink> createEncoder() {
-      Moshi moshi = new Moshi.Builder().add(new SpanLinkAdapter()).build();
-      return moshi.adapter(AgentSpanLink.class);
+        private static JsonAdapter<AgentSpanLink> createEncoder() {
+            Moshi moshi = new Moshi.Builder().add(new SpanLinkAdapter()).build();
+            return moshi.adapter(AgentSpanLink.class);
+        }
     }
-  }
 
-  private static class SpanLinkAdapter {
-    @ToJson
-    SpanLinkJson toSpanLinkJson(AgentSpanLink link) {
-      SpanLinkJson json = new SpanLinkJson();
-      // must be zero-padded to 32 characters (trace-id's toHexString does this)
-      json.trace_id = link.traceId().toHexString();
-      // must be zero-padded to 16 characters (span-id's toHexString does not do this)
-      json.span_id = DDSpanId.toHexStringPadded(link.spanId());
-      json.flags = link.traceFlags() == 0 ? null : link.traceFlags();
-      json.tracestate = link.traceState().isEmpty() ? null : link.traceState();
-      if (!link.attributes().isEmpty()) {
-        json.attributes = link.attributes().asMap();
-      }
-      return json;
-    }
+    private static class SpanLinkAdapter {
+        @ToJson
+        SpanLinkJson toSpanLinkJson(AgentSpanLink link) {
+            SpanLinkJson json = new SpanLinkJson();
+            // must be zero-padded to 32 characters (trace-id's toHexString does this)
+            json.trace_id = link.traceId().toHexString();
+            // must be zero-padded to 16 characters (span-id's toHexString does not do this)
+            json.span_id = DDSpanId.toHexStringPadded(link.spanId());
+            json.flags = link.traceFlags() == 0 ? null : link.traceFlags();
+            json.tracestate = link.traceState().isEmpty() ? null : link.traceState();
+            if (!link.attributes().isEmpty()) {
+                json.attributes = link.attributes().asMap();
+            }
+            return json;
+        }
 
-    @FromJson
-    AgentSpanLink fromSpanLinkJson(SpanLinkJson json) {
-      return new DDSpanLink(
-          DDTraceId.fromHex(json.trace_id),
-          DDSpanId.fromHex(json.span_id),
-          json.flags,
-          json.tracestate,
-          SpanAttributes.fromMap(json.attributes));
+        @FromJson
+        AgentSpanLink fromSpanLinkJson(SpanLinkJson json) {
+            return new DDSpanLink(
+                    DDTraceId.fromHex(json.trace_id),
+                    DDSpanId.fromHex(json.span_id),
+                    json.flags,
+                    json.tracestate,
+                    SpanAttributes.fromMap(json.attributes));
+        }
     }
-  }
 
-  private static class SpanLinkJson {
-    String trace_id;
-    String span_id;
-    Byte flags;
-    String tracestate;
-    Map<String, String> attributes;
-  }
+    private static class SpanLinkJson {
+        String trace_id;
+        String span_id;
+        Byte flags;
+        String tracestate;
+        Map<String, String> attributes;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDTraceCoreInfo.java b/dd-trace-core/src/main/java/datadog/trace/core/DDTraceCoreInfo.java
index 70ab82047de..b6e82b4ddcc 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/DDTraceCoreInfo.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/DDTraceCoreInfo.java
@@ -8,33 +8,31 @@
 
 public class DDTraceCoreInfo {
 
-  public static final String JAVA_VERSION = System.getProperty("java.version", "unknown");
-  public static final String JAVA_VM_NAME = System.getProperty("java.vm.name", "unknown");
-  public static final String JAVA_VM_VENDOR = System.getProperty("java.vm.vendor", "unknown");
-
-  public static final String VERSION;
-
-  static {
-    String v;
-    try (final BufferedReader br =
-        new BufferedReader(
-            new InputStreamReader(
-                DDTraceCoreInfo.class.getResourceAsStream("/dd-trace-core.version"), UTF_8))) {
-      final StringBuilder sb = new StringBuilder();
-
-      for (int c = br.read(); c != -1; c = br.read()) {
-        sb.append((char) c);
-      }
-
-      v = sb.toString().trim();
-    } catch (final Exception e) {
-      v = "unknown";
+    public static final String JAVA_VERSION = System.getProperty("java.version", "unknown");
+    public static final String JAVA_VM_NAME = System.getProperty("java.vm.name", "unknown");
+    public static final String JAVA_VM_VENDOR = System.getProperty("java.vm.vendor", "unknown");
+
+    public static final String VERSION;
+
+    static {
+        String v;
+        try (final BufferedReader br = new BufferedReader(
+                new InputStreamReader(DDTraceCoreInfo.class.getResourceAsStream("/dd-trace-core.version"), UTF_8))) {
+            final StringBuilder sb = new StringBuilder();
+
+            for (int c = br.read(); c != -1; c = br.read()) {
+                sb.append((char) c);
+            }
+
+            v = sb.toString().trim();
+        } catch (final Exception e) {
+            v = "unknown";
+        }
+        VERSION = v;
     }
-    VERSION = v;
-  }
 
-  @SuppressForbidden
-  public static void main(final String... args) {
-    System.out.println(VERSION);
-  }
+    @SuppressForbidden
+    public static void main(final String... args) {
+        System.out.println(VERSION);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/LongRunningTracesTracker.java b/dd-trace-core/src/main/java/datadog/trace/core/LongRunningTracesTracker.java
index 6002fce5415..7cd83a5860b 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/LongRunningTracesTracker.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/LongRunningTracesTracker.java
@@ -10,144 +10,142 @@
 import java.util.concurrent.TimeUnit;
 
 public class LongRunningTracesTracker {
-  private final DDAgentFeaturesDiscovery features;
-  private final HealthMetrics healthMetrics;
-  private long lastFlushMilli = 0;
-
-  private final int maxTrackedTraces;
-  private final int initialFlushPeriodMilli;
-  private final int flushPeriodMilli;
-  private final long maxTrackedDurationMilli = TimeUnit.HOURS.toMillis(12);
-  private final List<PendingTrace> traceArray = new ArrayList<>(1 << 4);
-  private int dropped = 0;
-  private int write = 0;
-  private int expired = 0;
-
-  public static final int NOT_TRACKED = -1;
-  public static final int UNDEFINED = 0;
-  public static final int TO_TRACK = 1;
-  public static final int TRACKED = 2;
-  public static final int WRITE_RUNNING_SPANS = 3;
-  public static final int EXPIRED = 4;
-
-  public LongRunningTracesTracker(
-      Config config,
-      int maxTrackedTraces,
-      SharedCommunicationObjects sharedCommunicationObjects,
-      HealthMetrics healthMetrics) {
-    this.maxTrackedTraces = maxTrackedTraces;
-    this.initialFlushPeriodMilli =
-        (int) TimeUnit.SECONDS.toMillis(config.getLongRunningTraceInitialFlushInterval());
-    this.flushPeriodMilli =
-        (int) TimeUnit.SECONDS.toMillis(config.getLongRunningTraceFlushInterval());
-    this.features = sharedCommunicationObjects.featuresDiscovery(config);
-    this.healthMetrics = healthMetrics;
-  }
-
-  public boolean add(PendingTraceBuffer.Element element) {
-    if (!(element instanceof PendingTrace)) {
-      return false;
+    private final DDAgentFeaturesDiscovery features;
+    private final HealthMetrics healthMetrics;
+    private long lastFlushMilli = 0;
+
+    private final int maxTrackedTraces;
+    private final int initialFlushPeriodMilli;
+    private final int flushPeriodMilli;
+    private final long maxTrackedDurationMilli = TimeUnit.HOURS.toMillis(12);
+    private final List<PendingTrace> traceArray = new ArrayList<>(1 << 4);
+    private int dropped = 0;
+    private int write = 0;
+    private int expired = 0;
+
+    public static final int NOT_TRACKED = -1;
+    public static final int UNDEFINED = 0;
+    public static final int TO_TRACK = 1;
+    public static final int TRACKED = 2;
+    public static final int WRITE_RUNNING_SPANS = 3;
+    public static final int EXPIRED = 4;
+
+    public LongRunningTracesTracker(
+            Config config,
+            int maxTrackedTraces,
+            SharedCommunicationObjects sharedCommunicationObjects,
+            HealthMetrics healthMetrics) {
+        this.maxTrackedTraces = maxTrackedTraces;
+        this.initialFlushPeriodMilli =
+                (int) TimeUnit.SECONDS.toMillis(config.getLongRunningTraceInitialFlushInterval());
+        this.flushPeriodMilli = (int) TimeUnit.SECONDS.toMillis(config.getLongRunningTraceFlushInterval());
+        this.features = sharedCommunicationObjects.featuresDiscovery(config);
+        this.healthMetrics = healthMetrics;
     }
-    PendingTrace trace = (PendingTrace) element;
-    // PendingTraces are added only once
-    if (!trace.compareAndSetLongRunningState(TO_TRACK, TRACKED)) {
-      return false;
+
+    public boolean add(PendingTraceBuffer.Element element) {
+        if (!(element instanceof PendingTrace)) {
+            return false;
+        }
+        PendingTrace trace = (PendingTrace) element;
+        // PendingTraces are added only once
+        if (!trace.compareAndSetLongRunningState(TO_TRACK, TRACKED)) {
+            return false;
+        }
+        this.addTrace(trace);
+        return true;
     }
-    this.addTrace(trace);
-    return true;
-  }
 
-  private void addTrace(PendingTrace trace) {
-    if (trace.empty()) {
-      return;
+    private void addTrace(PendingTrace trace) {
+        if (trace.empty()) {
+            return;
+        }
+        if (traceArray.size() == maxTrackedTraces) {
+            dropped++;
+            return;
+        }
+        traceArray.add(trace);
     }
-    if (traceArray.size() == maxTrackedTraces) {
-      dropped++;
-      return;
+
+    public void flushAndCompact(long nowMilli) {
+        if (nowMilli < lastFlushMilli + TimeUnit.SECONDS.toMillis(1)) {
+            return;
+        }
+        int i = 0;
+        while (i < traceArray.size()) {
+            PendingTrace trace = traceArray.get(i);
+            if (trace == null) {
+                cleanSlot(i);
+                continue;
+            }
+            if (trace.empty() || !features.supportsLongRunning()) {
+                trace.compareAndSetLongRunningState(WRITE_RUNNING_SPANS, NOT_TRACKED);
+                cleanSlot(i);
+                continue;
+            }
+            if (hasExpired(nowMilli, trace)) {
+                trace.compareAndSetLongRunningState(WRITE_RUNNING_SPANS, EXPIRED);
+                expired++;
+                cleanSlot(i);
+                continue;
+            }
+            if (shouldFlush(nowMilli, trace)) {
+                if (negativeOrNullPriority(trace)) {
+                    trace.compareAndSetLongRunningState(TRACKED, NOT_TRACKED);
+                    cleanSlot(i);
+                    continue;
+                }
+                trace.compareAndSetLongRunningState(TRACKED, WRITE_RUNNING_SPANS);
+                write++;
+                trace.write();
+            }
+            i++;
+        }
+        lastFlushMilli = nowMilli;
+        flushStats();
     }
-    traceArray.add(trace);
-  }
 
-  public void flushAndCompact(long nowMilli) {
-    if (nowMilli < lastFlushMilli + TimeUnit.SECONDS.toMillis(1)) {
-      return;
+    private boolean hasExpired(long nowMilli, PendingTrace trace) {
+        return (nowMilli - TimeUnit.NANOSECONDS.toMillis(trace.getRunningTraceStartTime())) > maxTrackedDurationMilli;
     }
-    int i = 0;
-    while (i < traceArray.size()) {
-      PendingTrace trace = traceArray.get(i);
-      if (trace == null) {
-        cleanSlot(i);
-        continue;
-      }
-      if (trace.empty() || !features.supportsLongRunning()) {
-        trace.compareAndSetLongRunningState(WRITE_RUNNING_SPANS, NOT_TRACKED);
-        cleanSlot(i);
-        continue;
-      }
-      if (hasExpired(nowMilli, trace)) {
-        trace.compareAndSetLongRunningState(WRITE_RUNNING_SPANS, EXPIRED);
-        expired++;
-        cleanSlot(i);
-        continue;
-      }
-      if (shouldFlush(nowMilli, trace)) {
-        if (negativeOrNullPriority(trace)) {
-          trace.compareAndSetLongRunningState(TRACKED, NOT_TRACKED);
-          cleanSlot(i);
-          continue;
+
+    private boolean shouldFlush(long nowMilli, PendingTrace trace) {
+        long traceStartTimeNano = trace.getRunningTraceStartTime();
+        long lastWriteTimeNano = trace.getLastWriteTime();
+
+        // Initial flush
+        if (lastWriteTimeNano <= traceStartTimeNano) {
+            return nowMilli - TimeUnit.NANOSECONDS.toMillis(traceStartTimeNano) > initialFlushPeriodMilli;
         }
-        trace.compareAndSetLongRunningState(TRACKED, WRITE_RUNNING_SPANS);
-        write++;
-        trace.write();
-      }
-      i++;
+
+        return nowMilli - TimeUnit.NANOSECONDS.toMillis(lastWriteTimeNano) > flushPeriodMilli;
     }
-    lastFlushMilli = nowMilli;
-    flushStats();
-  }
-
-  private boolean hasExpired(long nowMilli, PendingTrace trace) {
-    return (nowMilli - TimeUnit.NANOSECONDS.toMillis(trace.getRunningTraceStartTime()))
-        > maxTrackedDurationMilli;
-  }
-
-  private boolean shouldFlush(long nowMilli, PendingTrace trace) {
-    long traceStartTimeNano = trace.getRunningTraceStartTime();
-    long lastWriteTimeNano = trace.getLastWriteTime();
-
-    // Initial flush
-    if (lastWriteTimeNano <= traceStartTimeNano) {
-      return nowMilli - TimeUnit.NANOSECONDS.toMillis(traceStartTimeNano) > initialFlushPeriodMilli;
+
+    private void cleanSlot(int index) {
+        int lastElementIndex = traceArray.size() - 1;
+        traceArray.set(index, traceArray.get(lastElementIndex));
+        traceArray.remove(lastElementIndex);
     }
 
-    return nowMilli - TimeUnit.NANOSECONDS.toMillis(lastWriteTimeNano) > flushPeriodMilli;
-  }
-
-  private void cleanSlot(int index) {
-    int lastElementIndex = traceArray.size() - 1;
-    traceArray.set(index, traceArray.get(lastElementIndex));
-    traceArray.remove(lastElementIndex);
-  }
-
-  private boolean negativeOrNullPriority(PendingTrace trace) {
-    Integer prio = trace.evaluateSamplingPriority();
-    return prio == null || prio <= 0;
-  }
-
-  private void flushStats() {
-    healthMetrics.onLongRunningUpdate(dropped, write, expired);
-    dropped = 0;
-    write = 0;
-    expired = 0;
-  }
-
-  @VisibleForTesting
-  int trackedCount() {
-    return traceArray.size();
-  }
-
-  @VisibleForTesting
-  int getDropped() {
-    return dropped;
-  }
+    private boolean negativeOrNullPriority(PendingTrace trace) {
+        Integer prio = trace.evaluateSamplingPriority();
+        return prio == null || prio <= 0;
+    }
+
+    private void flushStats() {
+        healthMetrics.onLongRunningUpdate(dropped, write, expired);
+        dropped = 0;
+        write = 0;
+        expired = 0;
+    }
+
+    @VisibleForTesting
+    int trackedCount() {
+        return traceArray.size();
+    }
+
+    @VisibleForTesting
+    int getDropped() {
+        return dropped;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/Metadata.java b/dd-trace-core/src/main/java/datadog/trace/core/Metadata.java
index 909e9d6dff2..4715b95619a 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/Metadata.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/Metadata.java
@@ -11,124 +11,122 @@
 import java.util.Map;
 
 public final class Metadata {
-  private final long threadId;
-  private final UTF8BytesString threadName;
-  private final int httpStatusCode;
-  private final TagMap tags;
-  private final Map<String, String> baggage;
-
-  private final int samplingPriority;
-  private final boolean measured;
-  private final boolean topLevel;
-  private final CharSequence origin;
-  private final int longRunningVersion;
-  private final UTF8BytesString processTags;
-  private final UTF8BytesString otlpExportMarker;
-  private final List<? extends AgentSpanLink> spanLinks;
-
-  public Metadata(
-      long threadId,
-      UTF8BytesString threadName,
-      TagMap tags,
-      Map<String, String> baggage,
-      int samplingPriority,
-      boolean measured,
-      boolean topLevel,
-      int httpStatusCode,
-      CharSequence origin,
-      int longRunningVersion,
-      UTF8BytesString processTags,
-      UTF8BytesString otlpExportMarker,
-      List<? extends AgentSpanLink> spanLinks) {
-    this.threadId = threadId;
-    this.threadName = threadName;
-    this.httpStatusCode = httpStatusCode;
-    this.tags = tags;
-    this.baggage = baggage;
-    this.samplingPriority = samplingPriority;
-    this.measured = measured;
-    this.topLevel = topLevel;
-    this.origin = origin;
-    this.longRunningVersion = longRunningVersion;
-    this.processTags = processTags;
-    this.otlpExportMarker = otlpExportMarker;
-    this.spanLinks = spanLinks == null ? emptyList() : spanLinks;
-  }
-
-  /**
-   * The intercepted HTTP status, or {@link RadixTreeCache#UNSET_STATUS} when the span carries none.
-   *
-   * <p>Held as an int rather than as its rendering, so a serializer that encodes the status
-   * numerically -- OTLP, whose semantic conventions type it as an integer -- never pays for a
-   * string it will not send, and a serializer that needs the string asks for it explicitly.
-   */
-  public int getHttpStatusCode() {
-    return httpStatusCode;
-  }
-
-  /**
-   * The intercepted HTTP status rendered for the string-typed protocols (the Datadog msgpack
-   * payloads and the CI Visibility intake), or null when the span carries none.
-   *
-   * <p>Backed by {@link RadixTreeCache#HTTP_STATUSES}, so a repeated status costs a lookup rather
-   * than an allocation. Call it once per span and hold the result: nothing memoizes it here, since
-   * a Metadata is consumed by exactly one serializer.
-   */
-  public UTF8BytesString getHttpStatusCodeString() {
-    return httpStatusCode == RadixTreeCache.UNSET_STATUS
-        ? null
-        : RadixTreeCache.HTTP_STATUSES.get(httpStatusCode);
-  }
-
-  public CharSequence getOrigin() {
-    return origin;
-  }
-
-  public long getThreadId() {
-    return threadId;
-  }
-
-  public UTF8BytesString getThreadName() {
-    return threadName;
-  }
-
-  public TagMap getTags() {
-    return this.tags;
-  }
-
-  public Map<String, String> getBaggage() {
-    return baggage;
-  }
-
-  public boolean measured() {
-    return measured;
-  }
-
-  public int longRunningVersion() {
-    return longRunningVersion;
-  }
-
-  public boolean topLevel() {
-    return topLevel;
-  }
-
-  public boolean hasSamplingPriority() {
-    return samplingPriority != UNSET;
-  }
-
-  public int samplingPriority() {
-    return samplingPriority;
-  }
-
-  public UTF8BytesString processTags() {
-    return processTags;
-  }
-
-  public UTF8BytesString otlpExportMarker() {
-    return otlpExportMarker;
-  }
-
-  public List<? extends AgentSpanLink> getSpanLinks() {
-    return spanLinks;
-  }
+    private final long threadId;
+    private final UTF8BytesString threadName;
+    private final int httpStatusCode;
+    private final TagMap tags;
+    private final Map<String, String> baggage;
+
+    private final int samplingPriority;
+    private final boolean measured;
+    private final boolean topLevel;
+    private final CharSequence origin;
+    private final int longRunningVersion;
+    private final UTF8BytesString processTags;
+    private final UTF8BytesString otlpExportMarker;
+    private final List<? extends AgentSpanLink> spanLinks;
+
+    public Metadata(
+            long threadId,
+            UTF8BytesString threadName,
+            TagMap tags,
+            Map<String, String> baggage,
+            int samplingPriority,
+            boolean measured,
+            boolean topLevel,
+            int httpStatusCode,
+            CharSequence origin,
+            int longRunningVersion,
+            UTF8BytesString processTags,
+            UTF8BytesString otlpExportMarker,
+            List<? extends AgentSpanLink> spanLinks) {
+        this.threadId = threadId;
+        this.threadName = threadName;
+        this.httpStatusCode = httpStatusCode;
+        this.tags = tags;
+        this.baggage = baggage;
+        this.samplingPriority = samplingPriority;
+        this.measured = measured;
+        this.topLevel = topLevel;
+        this.origin = origin;
+        this.longRunningVersion = longRunningVersion;
+        this.processTags = processTags;
+        this.otlpExportMarker = otlpExportMarker;
+        this.spanLinks = spanLinks == null ? emptyList() : spanLinks;
+    }
+
+    /**
+     * The intercepted HTTP status, or {@link RadixTreeCache#UNSET_STATUS} when the span carries none.
+     *
+     * <p>Held as an int rather than as its rendering, so a serializer that encodes the status
+     * numerically -- OTLP, whose semantic conventions type it as an integer -- never pays for a
+     * string it will not send, and a serializer that needs the string asks for it explicitly.
+     */
+    public int getHttpStatusCode() {
+        return httpStatusCode;
+    }
+
+    /**
+     * The intercepted HTTP status rendered for the string-typed protocols (the Datadog msgpack
+     * payloads and the CI Visibility intake), or null when the span carries none.
+     *
+     * <p>Backed by {@link RadixTreeCache#HTTP_STATUSES}, so a repeated status costs a lookup rather
+     * than an allocation. Call it once per span and hold the result: nothing memoizes it here, since
+     * a Metadata is consumed by exactly one serializer.
+     */
+    public UTF8BytesString getHttpStatusCodeString() {
+        return httpStatusCode == RadixTreeCache.UNSET_STATUS ? null : RadixTreeCache.HTTP_STATUSES.get(httpStatusCode);
+    }
+
+    public CharSequence getOrigin() {
+        return origin;
+    }
+
+    public long getThreadId() {
+        return threadId;
+    }
+
+    public UTF8BytesString getThreadName() {
+        return threadName;
+    }
+
+    public TagMap getTags() {
+        return this.tags;
+    }
+
+    public Map<String, String> getBaggage() {
+        return baggage;
+    }
+
+    public boolean measured() {
+        return measured;
+    }
+
+    public int longRunningVersion() {
+        return longRunningVersion;
+    }
+
+    public boolean topLevel() {
+        return topLevel;
+    }
+
+    public boolean hasSamplingPriority() {
+        return samplingPriority != UNSET;
+    }
+
+    public int samplingPriority() {
+        return samplingPriority;
+    }
+
+    public UTF8BytesString processTags() {
+        return processTags;
+    }
+
+    public UTF8BytesString otlpExportMarker() {
+        return otlpExportMarker;
+    }
+
+    public List<? extends AgentSpanLink> getSpanLinks() {
+        return spanLinks;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/MetadataConsumer.java b/dd-trace-core/src/main/java/datadog/trace/core/MetadataConsumer.java
index 0166348bc0b..0e3d9a661ef 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/MetadataConsumer.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/MetadataConsumer.java
@@ -5,7 +5,7 @@
 @FunctionalInterface
 public interface MetadataConsumer extends Consumer<Metadata> {
 
-  MetadataConsumer NO_OP = (md) -> {};
+    MetadataConsumer NO_OP = (md) -> {};
 
-  void accept(Metadata metadata);
+    void accept(Metadata metadata);
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java b/dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java
index d2f7a058ab5..0746303671b 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java
@@ -43,470 +43,460 @@
  */
 public class PendingTrace extends TraceCollector implements PendingTraceBuffer.Element {
 
-  private static final Logger log = LoggerFactory.getLogger(PendingTrace.class);
+    private static final Logger log = LoggerFactory.getLogger(PendingTrace.class);
+
+    static class Factory implements TraceCollector.Factory {
+        private final CoreTracer tracer;
+        private final PendingTraceBuffer pendingTraceBuffer;
+        private final TimeSource timeSource;
+        private final boolean strictTraceWrites;
+        private final HealthMetrics healthMetrics;
+
+        Factory(
+                CoreTracer tracer,
+                PendingTraceBuffer pendingTraceBuffer,
+                TimeSource timeSource,
+                boolean strictTraceWrites,
+                HealthMetrics healthMetrics) {
+            this.tracer = tracer;
+            this.pendingTraceBuffer = pendingTraceBuffer;
+            this.timeSource = timeSource;
+            this.strictTraceWrites = strictTraceWrites;
+            this.healthMetrics = healthMetrics;
+        }
+
+        @Override
+        public PendingTrace create(@Nonnull DDTraceId traceId) {
+            return create(traceId, null);
+        }
+
+        @Override
+        public PendingTrace create(@Nonnull DDTraceId traceId, ConfigSnapshot traceConfig) {
+            return new PendingTrace(
+                    tracer, traceId, pendingTraceBuffer, timeSource, traceConfig, strictTraceWrites, healthMetrics);
+        }
+    }
 
-  static class Factory implements TraceCollector.Factory {
-    private final CoreTracer tracer;
+    private static final List<DDSpan> EMPTY = new ArrayList<>(0);
+
+    private final DDTraceId traceId;
     private final PendingTraceBuffer pendingTraceBuffer;
-    private final TimeSource timeSource;
     private final boolean strictTraceWrites;
     private final HealthMetrics healthMetrics;
 
-    Factory(
-        CoreTracer tracer,
-        PendingTraceBuffer pendingTraceBuffer,
-        TimeSource timeSource,
-        boolean strictTraceWrites,
-        HealthMetrics healthMetrics) {
-      this.tracer = tracer;
-      this.pendingTraceBuffer = pendingTraceBuffer;
-      this.timeSource = timeSource;
-      this.strictTraceWrites = strictTraceWrites;
-      this.healthMetrics = healthMetrics;
+    /**
+     * Contains finished spans. If the long-running trace feature is enabled it also contains running
+     * spans that can be written.
+     */
+    private final ConcurrentLinkedDeque<DDSpan> spans;
+
+    private volatile int completedSpanCount = 0;
+    private static final AtomicIntegerFieldUpdater<PendingTrace> COMPLETED_SPAN_COUNT =
+            AtomicIntegerFieldUpdater.newUpdater(PendingTrace.class, "completedSpanCount");
+
+    private volatile int pendingReferenceCount = 0;
+    private static final AtomicIntegerFieldUpdater<PendingTrace> PENDING_REFERENCE_COUNT =
+            AtomicIntegerFieldUpdater.newUpdater(PendingTrace.class, "pendingReferenceCount");
+
+    private volatile int isEnqueued = 0;
+    private static final AtomicIntegerFieldUpdater<PendingTrace> IS_ENQUEUED =
+            AtomicIntegerFieldUpdater.newUpdater(PendingTrace.class, "isEnqueued");
+
+    private volatile int longRunningTrackedState = LongRunningTracesTracker.UNDEFINED;
+    private static final AtomicIntegerFieldUpdater<PendingTrace> LONG_RUNNING_STATE =
+            AtomicIntegerFieldUpdater.newUpdater(PendingTrace.class, "longRunningTrackedState");
+
+    private volatile long runningTraceStartTimeNano = 0;
+    private static final AtomicLongFieldUpdater<PendingTrace> RUNNING_TRACE_START_TIME_NANO =
+            AtomicLongFieldUpdater.newUpdater(PendingTrace.class, "runningTraceStartTimeNano");
+    private volatile long lastWriteTimeNano = 0;
+    private static final AtomicLongFieldUpdater<PendingTrace> LAST_WRITE_TIME_NANO =
+            AtomicLongFieldUpdater.newUpdater(PendingTrace.class, "lastWriteTimeNano");
+
+    /**
+     * During a trace there are cases where the root span must be accessed (e.g. priority sampling and
+     * trace-search tags). These use cases are an obstacle to span-streaming.
+     */
+    private volatile DDSpan rootSpan = null;
+
+    private static final AtomicReferenceFieldUpdater<PendingTrace, DDSpan> ROOT_SPAN =
+            AtomicReferenceFieldUpdater.newUpdater(PendingTrace.class, DDSpan.class, "rootSpan");
+
+    private volatile boolean rootSpanWritten = false;
+
+    /**
+     * Updated with the latest nanoTicks each time getCurrentTimeNano is called (at the start and
+     * finish of each span). Uses lazySet for writes (release-store semantics) since the value is only
+     * read for approximate timeout detection by the PendingTraceBuffer background thread.
+     */
+    private volatile long lastReferenced = 0;
+
+    private static final AtomicLongFieldUpdater<PendingTrace> LAST_REFERENCED =
+            AtomicLongFieldUpdater.newUpdater(PendingTrace.class, "lastReferenced");
+
+    @VisibleForTesting
+    PendingTrace(
+            @Nonnull CoreTracer tracer,
+            @Nonnull DDTraceId traceId,
+            @Nonnull PendingTraceBuffer pendingTraceBuffer,
+            @Nonnull TimeSource timeSource,
+            ConfigSnapshot traceConfig,
+            boolean strictTraceWrites,
+            HealthMetrics healthMetrics) {
+        super(tracer, traceConfig != null ? traceConfig : tracer.captureTraceConfig(), timeSource);
+        this.traceId = traceId;
+        this.pendingTraceBuffer = pendingTraceBuffer;
+        this.strictTraceWrites = strictTraceWrites;
+        this.healthMetrics = healthMetrics;
+        this.spans = new ConcurrentLinkedDeque<>();
     }
 
+    /**
+     * Current timestamp in nanoseconds; 'touches' the trace by updating {@link #lastReferenced}.
+     *
+     * <p>Note: This method uses trace start time as a reference and it gets time with nanosecond
+     * precision after that. This means time measured within same Trace in different Spans is
+     * relatively correct with nanosecond precision.
+     *
+     * @return timestamp in nanoseconds
+     */
     @Override
-    public PendingTrace create(@Nonnull DDTraceId traceId) {
-      return create(traceId, null);
+    public long getCurrentTimeNano() {
+        long nanoTicks = timeSource.getNanoTicks();
+        LAST_REFERENCED.lazySet(this, nanoTicks);
+        return tracer.getTimeWithNanoTicks(nanoTicks);
     }
 
     @Override
-    public PendingTrace create(@Nonnull DDTraceId traceId, ConfigSnapshot traceConfig) {
-      return new PendingTrace(
-          tracer,
-          traceId,
-          pendingTraceBuffer,
-          timeSource,
-          traceConfig,
-          strictTraceWrites,
-          healthMetrics);
-    }
-  }
-
-  private static final List<DDSpan> EMPTY = new ArrayList<>(0);
-
-  private final DDTraceId traceId;
-  private final PendingTraceBuffer pendingTraceBuffer;
-  private final boolean strictTraceWrites;
-  private final HealthMetrics healthMetrics;
-
-  /**
-   * Contains finished spans. If the long-running trace feature is enabled it also contains running
-   * spans that can be written.
-   */
-  private final ConcurrentLinkedDeque<DDSpan> spans;
-
-  private volatile int completedSpanCount = 0;
-  private static final AtomicIntegerFieldUpdater<PendingTrace> COMPLETED_SPAN_COUNT =
-      AtomicIntegerFieldUpdater.newUpdater(PendingTrace.class, "completedSpanCount");
-
-  private volatile int pendingReferenceCount = 0;
-  private static final AtomicIntegerFieldUpdater<PendingTrace> PENDING_REFERENCE_COUNT =
-      AtomicIntegerFieldUpdater.newUpdater(PendingTrace.class, "pendingReferenceCount");
-
-  private volatile int isEnqueued = 0;
-  private static final AtomicIntegerFieldUpdater<PendingTrace> IS_ENQUEUED =
-      AtomicIntegerFieldUpdater.newUpdater(PendingTrace.class, "isEnqueued");
-
-  private volatile int longRunningTrackedState = LongRunningTracesTracker.UNDEFINED;
-  private static final AtomicIntegerFieldUpdater<PendingTrace> LONG_RUNNING_STATE =
-      AtomicIntegerFieldUpdater.newUpdater(PendingTrace.class, "longRunningTrackedState");
-
-  private volatile long runningTraceStartTimeNano = 0;
-  private static final AtomicLongFieldUpdater<PendingTrace> RUNNING_TRACE_START_TIME_NANO =
-      AtomicLongFieldUpdater.newUpdater(PendingTrace.class, "runningTraceStartTimeNano");
-  private volatile long lastWriteTimeNano = 0;
-  private static final AtomicLongFieldUpdater<PendingTrace> LAST_WRITE_TIME_NANO =
-      AtomicLongFieldUpdater.newUpdater(PendingTrace.class, "lastWriteTimeNano");
-
-  /**
-   * During a trace there are cases where the root span must be accessed (e.g. priority sampling and
-   * trace-search tags). These use cases are an obstacle to span-streaming.
-   */
-  private volatile DDSpan rootSpan = null;
-
-  private static final AtomicReferenceFieldUpdater<PendingTrace, DDSpan> ROOT_SPAN =
-      AtomicReferenceFieldUpdater.newUpdater(PendingTrace.class, DDSpan.class, "rootSpan");
-
-  private volatile boolean rootSpanWritten = false;
-
-  /**
-   * Updated with the latest nanoTicks each time getCurrentTimeNano is called (at the start and
-   * finish of each span). Uses lazySet for writes (release-store semantics) since the value is only
-   * read for approximate timeout detection by the PendingTraceBuffer background thread.
-   */
-  private volatile long lastReferenced = 0;
-
-  private static final AtomicLongFieldUpdater<PendingTrace> LAST_REFERENCED =
-      AtomicLongFieldUpdater.newUpdater(PendingTrace.class, "lastReferenced");
-
-  @VisibleForTesting
-  PendingTrace(
-      @Nonnull CoreTracer tracer,
-      @Nonnull DDTraceId traceId,
-      @Nonnull PendingTraceBuffer pendingTraceBuffer,
-      @Nonnull TimeSource timeSource,
-      ConfigSnapshot traceConfig,
-      boolean strictTraceWrites,
-      HealthMetrics healthMetrics) {
-    super(tracer, traceConfig != null ? traceConfig : tracer.captureTraceConfig(), timeSource);
-    this.traceId = traceId;
-    this.pendingTraceBuffer = pendingTraceBuffer;
-    this.strictTraceWrites = strictTraceWrites;
-    this.healthMetrics = healthMetrics;
-    this.spans = new ConcurrentLinkedDeque<>();
-  }
-
-  /**
-   * Current timestamp in nanoseconds; 'touches' the trace by updating {@link #lastReferenced}.
-   *
-   * <p>Note: This method uses trace start time as a reference and it gets time with nanosecond
-   * precision after that. This means time measured within same Trace in different Spans is
-   * relatively correct with nanosecond precision.
-   *
-   * @return timestamp in nanoseconds
-   */
-  @Override
-  public long getCurrentTimeNano() {
-    long nanoTicks = timeSource.getNanoTicks();
-    LAST_REFERENCED.lazySet(this, nanoTicks);
-    return tracer.getTimeWithNanoTicks(nanoTicks);
-  }
-
-  @Override
-  void touch() {
-    LAST_REFERENCED.lazySet(this, timeSource.getNanoTicks());
-  }
-
-  @Override
-  public boolean lastReferencedNanosAgo(long nanos) {
-    long currentNanoTicks = timeSource.getNanoTicks();
-    long age = currentNanoTicks - LAST_REFERENCED.get(this);
-    return nanos < age;
-  }
-
-  @Override
-  void registerSpan(final DDSpan span) {
-    if (rootSpan == null) {
-      ROOT_SPAN.compareAndSet(this, null, span);
-    }
-    PENDING_REFERENCE_COUNT.incrementAndGet(this);
-    healthMetrics.onCreateSpan();
-    if (pendingTraceBuffer.longRunningSpansEnabled()) {
-      spans.addFirst(span);
-      trackRunningTrace(span);
-    }
-  }
-
-  private void trackRunningTrace(final DDSpan span) {
-    if (!compareAndSetLongRunningState(
-        LongRunningTracesTracker.UNDEFINED, LongRunningTracesTracker.TO_TRACK)) {
-      return;
-    }
-    RUNNING_TRACE_START_TIME_NANO.set(this, span.getStartTime());
-    // If the pendingTraceBuffer is full, this trace won't be tracked by the
-    // LongRunningTracesTracker.
-    pendingTraceBuffer.enqueue(this);
-  }
-
-  Integer evaluateSamplingPriority() {
-    @SuppressWarnings("resource")
-    DDSpan span = spans.peek();
-    if (span == null) {
-      return null;
-    }
-    Integer prio = span.getSamplingPriority();
-    if (prio == null) {
-      prio = span.forceSamplingDecision();
-    }
-    return prio;
-  }
-
-  boolean compareAndSetLongRunningState(int expected, int newState) {
-    return LONG_RUNNING_STATE.compareAndSet(this, expected, newState);
-  }
-
-  @VisibleForTesting
-  int getLongRunningTrackedState() {
-    return longRunningTrackedState;
-  }
-
-  @VisibleForTesting
-  void setLongRunningTrackedState(int state) {
-    LONG_RUNNING_STATE.set(this, state);
-  }
-
-  @VisibleForTesting
-  int getPendingReferenceCount() {
-    return pendingReferenceCount;
-  }
-
-  @VisibleForTesting
-  PendingTraceBuffer getPendingTraceBuffer() {
-    return pendingTraceBuffer;
-  }
-
-  @VisibleForTesting
-  DDTraceId getTraceId() {
-    return traceId;
-  }
-
-  @VisibleForTesting
-  boolean isRootSpanWritten() {
-    return rootSpanWritten;
-  }
-
-  @VisibleForTesting
-  int getIsEnqueued() {
-    return isEnqueued;
-  }
-
-  boolean empty() {
-    return 0 >= COMPLETED_SPAN_COUNT.get(this) + PENDING_REFERENCE_COUNT.get(this);
-  }
-
-  PublishState onPublish(final DDSpan span) {
-    if (!pendingTraceBuffer.longRunningSpansEnabled()) {
-      spans.addFirst(span);
-    }
-    // There is a benign race here where the span added above can get written out by a writer in
-    // progress before the count has been incremented. It's being taken care of in the internal
-    // write method.
-    healthMetrics.onFinishSpan();
-    COMPLETED_SPAN_COUNT.incrementAndGet(this);
-    final DDSpan rootSpan = getRootSpan();
-    if (span == rootSpan) {
-      tracer.onRootSpanPublished(rootSpan);
-    }
-    return decrementRefAndMaybeWrite(span == rootSpan, true);
-  }
-
-  @Override
-  public DDSpan getRootSpan() {
-    return rootSpan;
-  }
-
-  /**
-   * @return Long.MAX_VALUE if no spans finished.
-   */
-  @Override
-  public long oldestFinishedTime() {
-    long oldest = Long.MAX_VALUE;
-    for (DDSpan span : spans) {
-      if (span.isFinished()) {
-        oldest = Math.min(oldest, span.getStartTime() + span.getDurationNano());
-      }
-    }
-    return oldest;
-  }
-
-  /**
-   * When using continuations, it's possible one may be used after all existing spans are otherwise
-   * completed, so we need to wait till continuations are de-referenced before reporting.
-   */
-  @Override
-  public void registerContinuation(final ContextContinuation continuation) {
-    PENDING_REFERENCE_COUNT.incrementAndGet(this);
-  }
-
-  @Override
-  public void removeContinuation(final ContextContinuation continuation) {
-    decrementRefAndMaybeWrite(false, false);
-  }
-
-  private PublishState decrementRefAndMaybeWrite(boolean isRootSpan, boolean addedSpan) {
-    final int count = PENDING_REFERENCE_COUNT.decrementAndGet(this);
-    if (strictTraceWrites && count < 0) {
-      throw new IllegalStateException("Pending reference count " + count + " is negative");
-    }
-    int partialFlushMinSpans = tracer.getPartialFlushMinSpans();
-
-    if (count == 0 && (strictTraceWrites || !rootSpanWritten)) {
-      // Finished with no pending work ... write immediately
-      write();
-      return PublishState.WRITTEN;
-    } else if (isRootSpan) {
-      // Finished root with pending work ... delay write
-      pendingTraceBuffer.enqueue(this);
-      return PublishState.ROOT_BUFFERED;
-    } else if (addedSpan && partialFlushMinSpans > 0 && size() >= partialFlushMinSpans) {
-      // Trace is getting too big, write anything completed.
-
-      // DQH - We only trigger a partial flush, when a span has just been added
-      // This prevents a bunch of threads which are only performing scope/context operations
-      // from all fighting to perform the partialFlush after the threshold is crossed.
-
-      // This is an important optimization for virtual threads where a continuation might
-      // be created even though no span is created.  In that situation, virtual threads
-      // can end up fighting to perform the partialFlush.  And even trying to perform a
-      // partialFlush requires taking the PendingTrace lock which can lead to unmounting
-      // the virtual thread from its carrier thread.
-
-      partialFlush();
-      return PublishState.PARTIAL_FLUSH;
-    } else if (rootSpanWritten) {
-      // Late arrival span ... delay write
-      pendingTraceBuffer.enqueue(this);
-      return PublishState.BUFFERED;
-    }
-    return PublishState.PENDING;
-  }
-
-  /** Important to note: may be called multiple times. */
-  private void partialFlush() {
-    int size = write(true);
-    healthMetrics.onPartialFlush(size);
-    if (log.isDebugEnabled()) {
-      log.debug("t_id={} -> wrote partial trace of size {}", traceId, size);
-    }
-  }
-
-  /** Important to note: may be called multiple times. */
-  @Override
-  public void write() {
-    write(false);
-  }
-
-  private int write(boolean isPartial) {
-    if (!spans.isEmpty()) {
-      try (Recording recording = tracer.writeTimer()) {
-        // Only one writer at a time
-        final SpanList trace;
-        int completedSpans = 0;
-        synchronized (this) {
-          if (!isPartial) {
-            rootSpanWritten = true;
-          }
-          int size = size();
-          boolean writeRunningSpans =
-              LongRunningTracesTracker.WRITE_RUNNING_SPANS == LONG_RUNNING_STATE.get(this);
-          if (writeRunningSpans) {
-            size += pendingReferenceCount;
-          }
-          // If we get here and size is below 0, then the writer before us wrote out at least one
-          // more trace than the size it had when it started. Those span(s) had been added to
-          // finishedSpans by some other thread(s) while the existing spans were being written, but
-          // the completedSpanCount has not yet been incremented. This means that eventually the
-          // count(s) will be incremented, and any new spans added during the period that the count
-          // was negative will be written by someone even if we don't write them right now.
-          if (size > 0 && (!isPartial || size >= tracer.getPartialFlushMinSpans())) {
-            trace = new SpanList(size);
-            completedSpans = enqueueSpansToWrite(trace, writeRunningSpans);
-          } else {
-            trace = SpanList.EMPTY;
-          }
+    void touch() {
+        LAST_REFERENCED.lazySet(this, timeSource.getNanoTicks());
+    }
+
+    @Override
+    public boolean lastReferencedNanosAgo(long nanos) {
+        long currentNanoTicks = timeSource.getNanoTicks();
+        long age = currentNanoTicks - LAST_REFERENCED.get(this);
+        return nanos < age;
+    }
+
+    @Override
+    void registerSpan(final DDSpan span) {
+        if (rootSpan == null) {
+            ROOT_SPAN.compareAndSet(this, null, span);
+        }
+        PENDING_REFERENCE_COUNT.incrementAndGet(this);
+        healthMetrics.onCreateSpan();
+        if (pendingTraceBuffer.longRunningSpansEnabled()) {
+            spans.addFirst(span);
+            trackRunningTrace(span);
+        }
+    }
+
+    private void trackRunningTrace(final DDSpan span) {
+        if (!compareAndSetLongRunningState(LongRunningTracesTracker.UNDEFINED, LongRunningTracesTracker.TO_TRACK)) {
+            return;
         }
-        if (!trace.isEmpty()) {
-          COMPLETED_SPAN_COUNT.addAndGet(this, -completedSpans);
-          tracer.write(trace);
-          healthMetrics.onCreateTrace();
-          return completedSpans;
+        RUNNING_TRACE_START_TIME_NANO.set(this, span.getStartTime());
+        // If the pendingTraceBuffer is full, this trace won't be tracked by the
+        // LongRunningTracesTracker.
+        pendingTraceBuffer.enqueue(this);
+    }
+
+    Integer evaluateSamplingPriority() {
+        @SuppressWarnings("resource")
+        DDSpan span = spans.peek();
+        if (span == null) {
+            return null;
+        }
+        Integer prio = span.getSamplingPriority();
+        if (prio == null) {
+            prio = span.forceSamplingDecision();
+        }
+        return prio;
+    }
+
+    boolean compareAndSetLongRunningState(int expected, int newState) {
+        return LONG_RUNNING_STATE.compareAndSet(this, expected, newState);
+    }
+
+    @VisibleForTesting
+    int getLongRunningTrackedState() {
+        return longRunningTrackedState;
+    }
+
+    @VisibleForTesting
+    void setLongRunningTrackedState(int state) {
+        LONG_RUNNING_STATE.set(this, state);
+    }
+
+    @VisibleForTesting
+    int getPendingReferenceCount() {
+        return pendingReferenceCount;
+    }
+
+    @VisibleForTesting
+    PendingTraceBuffer getPendingTraceBuffer() {
+        return pendingTraceBuffer;
+    }
+
+    @VisibleForTesting
+    DDTraceId getTraceId() {
+        return traceId;
+    }
+
+    @VisibleForTesting
+    boolean isRootSpanWritten() {
+        return rootSpanWritten;
+    }
+
+    @VisibleForTesting
+    int getIsEnqueued() {
+        return isEnqueued;
+    }
+
+    boolean empty() {
+        return 0 >= COMPLETED_SPAN_COUNT.get(this) + PENDING_REFERENCE_COUNT.get(this);
+    }
+
+    PublishState onPublish(final DDSpan span) {
+        if (!pendingTraceBuffer.longRunningSpansEnabled()) {
+            spans.addFirst(span);
         }
-      }
-    }
-    return 0;
-  }
-
-  int enqueueSpansToWrite(List<DDSpan> trace, boolean writeRunningSpans) {
-    int completedSpans = 0;
-    boolean runningSpanSeen = false;
-    long firstRunningSpanID = 0;
-    long nowNano = 0;
-    if (writeRunningSpans) {
-      nowNano = getCurrentTimeNano();
-      setLastWriteTime(nowNano);
-    }
-
-    DDSpan span = spans.pollFirst();
-    while (null != span) {
-      if (runningSpanSeen && span.getSpanId() == firstRunningSpanID) {
-        // we iterated on all spans as we circled back to the first running span
-        spans.addFirst(span);
-        break;
-      }
-      if (span.isFinished()) {
-        trace.add(span);
-        completedSpans++;
-      } else {
-        // keep the running span in the list
-        spans.add(span);
-        if (!runningSpanSeen) {
-          runningSpanSeen = true;
-          firstRunningSpanID = span.getSpanId();
+        // There is a benign race here where the span added above can get written out by a writer in
+        // progress before the count has been incremented. It's being taken care of in the internal
+        // write method.
+        healthMetrics.onFinishSpan();
+        COMPLETED_SPAN_COUNT.incrementAndGet(this);
+        final DDSpan rootSpan = getRootSpan();
+        if (span == rootSpan) {
+            tracer.onRootSpanPublished(rootSpan);
         }
+        return decrementRefAndMaybeWrite(span == rootSpan, true);
+    }
+
+    @Override
+    public DDSpan getRootSpan() {
+        return rootSpan;
+    }
+
+    /**
+     * @return Long.MAX_VALUE if no spans finished.
+     */
+    @Override
+    public long oldestFinishedTime() {
+        long oldest = Long.MAX_VALUE;
+        for (DDSpan span : spans) {
+            if (span.isFinished()) {
+                oldest = Math.min(oldest, span.getStartTime() + span.getDurationNano());
+            }
+        }
+        return oldest;
+    }
+
+    /**
+     * When using continuations, it's possible one may be used after all existing spans are otherwise
+     * completed, so we need to wait till continuations are de-referenced before reporting.
+     */
+    @Override
+    public void registerContinuation(final ContextContinuation continuation) {
+        PENDING_REFERENCE_COUNT.incrementAndGet(this);
+    }
+
+    @Override
+    public void removeContinuation(final ContextContinuation continuation) {
+        decrementRefAndMaybeWrite(false, false);
+    }
+
+    private PublishState decrementRefAndMaybeWrite(boolean isRootSpan, boolean addedSpan) {
+        final int count = PENDING_REFERENCE_COUNT.decrementAndGet(this);
+        if (strictTraceWrites && count < 0) {
+            throw new IllegalStateException("Pending reference count " + count + " is negative");
+        }
+        int partialFlushMinSpans = tracer.getPartialFlushMinSpans();
+
+        if (count == 0 && (strictTraceWrites || !rootSpanWritten)) {
+            // Finished with no pending work ... write immediately
+            write();
+            return PublishState.WRITTEN;
+        } else if (isRootSpan) {
+            // Finished root with pending work ... delay write
+            pendingTraceBuffer.enqueue(this);
+            return PublishState.ROOT_BUFFERED;
+        } else if (addedSpan && partialFlushMinSpans > 0 && size() >= partialFlushMinSpans) {
+            // Trace is getting too big, write anything completed.
+
+            // DQH - We only trigger a partial flush, when a span has just been added
+            // This prevents a bunch of threads which are only performing scope/context operations
+            // from all fighting to perform the partialFlush after the threshold is crossed.
+
+            // This is an important optimization for virtual threads where a continuation might
+            // be created even though no span is created.  In that situation, virtual threads
+            // can end up fighting to perform the partialFlush.  And even trying to perform a
+            // partialFlush requires taking the PendingTrace lock which can lead to unmounting
+            // the virtual thread from its carrier thread.
+
+            partialFlush();
+            return PublishState.PARTIAL_FLUSH;
+        } else if (rootSpanWritten) {
+            // Late arrival span ... delay write
+            pendingTraceBuffer.enqueue(this);
+            return PublishState.BUFFERED;
+        }
+        return PublishState.PENDING;
+    }
+
+    /** Important to note: may be called multiple times. */
+    private void partialFlush() {
+        int size = write(true);
+        healthMetrics.onPartialFlush(size);
+        if (log.isDebugEnabled()) {
+            log.debug("t_id={} -> wrote partial trace of size {}", traceId, size);
+        }
+    }
+
+    /** Important to note: may be called multiple times. */
+    @Override
+    public void write() {
+        write(false);
+    }
+
+    private int write(boolean isPartial) {
+        if (!spans.isEmpty()) {
+            try (Recording recording = tracer.writeTimer()) {
+                // Only one writer at a time
+                final SpanList trace;
+                int completedSpans = 0;
+                synchronized (this) {
+                    if (!isPartial) {
+                        rootSpanWritten = true;
+                    }
+                    int size = size();
+                    boolean writeRunningSpans =
+                            LongRunningTracesTracker.WRITE_RUNNING_SPANS == LONG_RUNNING_STATE.get(this);
+                    if (writeRunningSpans) {
+                        size += pendingReferenceCount;
+                    }
+                    // If we get here and size is below 0, then the writer before us wrote out at least one
+                    // more trace than the size it had when it started. Those span(s) had been added to
+                    // finishedSpans by some other thread(s) while the existing spans were being written, but
+                    // the completedSpanCount has not yet been incremented. This means that eventually the
+                    // count(s) will be incremented, and any new spans added during the period that the count
+                    // was negative will be written by someone even if we don't write them right now.
+                    if (size > 0 && (!isPartial || size >= tracer.getPartialFlushMinSpans())) {
+                        trace = new SpanList(size);
+                        completedSpans = enqueueSpansToWrite(trace, writeRunningSpans);
+                    } else {
+                        trace = SpanList.EMPTY;
+                    }
+                }
+                if (!trace.isEmpty()) {
+                    COMPLETED_SPAN_COUNT.addAndGet(this, -completedSpans);
+                    tracer.write(trace);
+                    healthMetrics.onCreateTrace();
+                    return completedSpans;
+                }
+            }
+        }
+        return 0;
+    }
+
+    int enqueueSpansToWrite(List<DDSpan> trace, boolean writeRunningSpans) {
+        int completedSpans = 0;
+        boolean runningSpanSeen = false;
+        long firstRunningSpanID = 0;
+        long nowNano = 0;
         if (writeRunningSpans) {
-          span.setLongRunningVersion(
-              (int) TimeUnit.NANOSECONDS.toMillis(nowNano - span.getStartTime()));
-          trace.add(span);
+            nowNano = getCurrentTimeNano();
+            setLastWriteTime(nowNano);
         }
-      }
-      span = spans.pollFirst();
-    }
-    return completedSpans;
-  }
-
-  public int size() {
-    return completedSpanCount;
-  }
-
-  long getLastWriteTime() {
-    return LAST_WRITE_TIME_NANO.get(this);
-  }
-
-  long getRunningTraceStartTime() {
-    return RUNNING_TRACE_START_TIME_NANO.get(this);
-  }
-
-  private void setLastWriteTime(long now) {
-    LAST_WRITE_TIME_NANO.set(this, now);
-  }
-
-  @Override
-  public boolean setEnqueued(boolean enqueued) {
-    int expected = enqueued ? 0 : 1;
-    return IS_ENQUEUED.compareAndSet(this, expected, 1 - expected);
-  }
-
-  /**
-   * Called when the pendingTraceBuffer is full and a pendingTrace is offered.
-   *
-   * <p>If the pendingTrace is not sent to the LongRunningTracesTracker, it will be immediately
-   * written. Otherwise, the pendingTrace won't be tracked and no write is triggered.
-   */
-  @Override
-  public boolean writeOnBufferFull() {
-    return !compareAndSetLongRunningState(
-        LongRunningTracesTracker.TO_TRACK, LongRunningTracesTracker.NOT_TRACKED);
-  }
-
-  /**
-   * Calculates the duration of a span in nanoseconds for the transport layer
-   *
-   * <p>As the internal duration of a running span is 0, the duration is set to the difference
-   * between the span's start time and the time of the write trigger.
-   */
-  public static long getDurationNano(CoreSpan<?> span) {
-    long duration = span.getDurationNano();
-    if (duration > 0) {
-      return duration;
-    }
-    if (!(span instanceof DDSpan)) {
-      return duration;
-    }
-    DDSpan ddSpan = (DDSpan) span;
-    TraceCollector traceCollector = ddSpan.spanContext().getTraceCollector();
-    if (!(traceCollector instanceof PendingTrace)) {
-      throw new IllegalArgumentException(
-          "Expected "
-              + PendingTrace.class.getName()
-              + ", got "
-              + traceCollector.getClass().getName());
-    }
-    PendingTrace trace = (PendingTrace) traceCollector;
-    return trace.getLastWriteTime() - span.getStartTime();
-  }
-
-  Collection<DDSpan> getSpans() {
-    return spans;
-  }
+
+        DDSpan span = spans.pollFirst();
+        while (null != span) {
+            if (runningSpanSeen && span.getSpanId() == firstRunningSpanID) {
+                // we iterated on all spans as we circled back to the first running span
+                spans.addFirst(span);
+                break;
+            }
+            if (span.isFinished()) {
+                trace.add(span);
+                completedSpans++;
+            } else {
+                // keep the running span in the list
+                spans.add(span);
+                if (!runningSpanSeen) {
+                    runningSpanSeen = true;
+                    firstRunningSpanID = span.getSpanId();
+                }
+                if (writeRunningSpans) {
+                    span.setLongRunningVersion((int) TimeUnit.NANOSECONDS.toMillis(nowNano - span.getStartTime()));
+                    trace.add(span);
+                }
+            }
+            span = spans.pollFirst();
+        }
+        return completedSpans;
+    }
+
+    public int size() {
+        return completedSpanCount;
+    }
+
+    long getLastWriteTime() {
+        return LAST_WRITE_TIME_NANO.get(this);
+    }
+
+    long getRunningTraceStartTime() {
+        return RUNNING_TRACE_START_TIME_NANO.get(this);
+    }
+
+    private void setLastWriteTime(long now) {
+        LAST_WRITE_TIME_NANO.set(this, now);
+    }
+
+    @Override
+    public boolean setEnqueued(boolean enqueued) {
+        int expected = enqueued ? 0 : 1;
+        return IS_ENQUEUED.compareAndSet(this, expected, 1 - expected);
+    }
+
+    /**
+     * Called when the pendingTraceBuffer is full and a pendingTrace is offered.
+     *
+     * <p>If the pendingTrace is not sent to the LongRunningTracesTracker, it will be immediately
+     * written. Otherwise, the pendingTrace won't be tracked and no write is triggered.
+     */
+    @Override
+    public boolean writeOnBufferFull() {
+        return !compareAndSetLongRunningState(LongRunningTracesTracker.TO_TRACK, LongRunningTracesTracker.NOT_TRACKED);
+    }
+
+    /**
+     * Calculates the duration of a span in nanoseconds for the transport layer
+     *
+     * <p>As the internal duration of a running span is 0, the duration is set to the difference
+     * between the span's start time and the time of the write trigger.
+     */
+    public static long getDurationNano(CoreSpan<?> span) {
+        long duration = span.getDurationNano();
+        if (duration > 0) {
+            return duration;
+        }
+        if (!(span instanceof DDSpan)) {
+            return duration;
+        }
+        DDSpan ddSpan = (DDSpan) span;
+        TraceCollector traceCollector = ddSpan.spanContext().getTraceCollector();
+        if (!(traceCollector instanceof PendingTrace)) {
+            throw new IllegalArgumentException("Expected "
+                    + PendingTrace.class.getName()
+                    + ", got "
+                    + traceCollector.getClass().getName());
+        }
+        PendingTrace trace = (PendingTrace) traceCollector;
+        return trace.getLastWriteTime() - span.getStartTime();
+    }
+
+    Collection<DDSpan> getSpans() {
+        return spans;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/PendingTraceBuffer.java b/dd-trace-core/src/main/java/datadog/trace/core/PendingTraceBuffer.java
index c0e8de95a5c..e867a0453bf 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/PendingTraceBuffer.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/PendingTraceBuffer.java
@@ -28,375 +28,371 @@
 import org.slf4j.LoggerFactory;
 
 public abstract class PendingTraceBuffer implements AutoCloseable {
-  private static final int BUFFER_SIZE = 1 << 12; // 4096
+    private static final int BUFFER_SIZE = 1 << 12; // 4096
 
-  public boolean longRunningSpansEnabled() {
-    return false;
-  }
+    public boolean longRunningSpansEnabled() {
+        return false;
+    }
 
-  public interface Element {
-    long oldestFinishedTime();
+    public interface Element {
+        long oldestFinishedTime();
 
-    boolean lastReferencedNanosAgo(long nanos);
+        boolean lastReferencedNanosAgo(long nanos);
 
-    void write();
+        void write();
 
-    DDSpan getRootSpan();
+        DDSpan getRootSpan();
 
-    /**
-     * Set or clear if the {@code Element} is enqueued. Needs to be atomic.
-     *
-     * @param enqueued true if the enqueued state should be set or false if it should be cleared
-     * @return true iff the enqueued value was changed from another value to the new value, false
-     *     otherwise
-     */
-    boolean setEnqueued(boolean enqueued);
+        /**
+         * Set or clear if the {@code Element} is enqueued. Needs to be atomic.
+         *
+         * @param enqueued true if the enqueued state should be set or false if it should be cleared
+         * @return true iff the enqueued value was changed from another value to the new value, false
+         *     otherwise
+         */
+        boolean setEnqueued(boolean enqueued);
 
-    boolean writeOnBufferFull();
-  }
+        boolean writeOnBufferFull();
+    }
 
-  static class DelayingPendingTraceBuffer extends PendingTraceBuffer {
-    private static final long FORCE_SEND_DELAY_MS = TimeUnit.SECONDS.toMillis(5);
-    private static final long SEND_DELAY_NS = TimeUnit.MILLISECONDS.toNanos(500);
-    private static final long SLEEP_TIME_MS = 100;
-    private static final CommandElement FLUSH_ELEMENT = new CommandElement();
-    private static final CommandElement DUMP_ELEMENT = new CommandElement();
-    private static final CommandElement STAND_IN_ELEMENT = new CommandElement();
+    static class DelayingPendingTraceBuffer extends PendingTraceBuffer {
+        private static final long FORCE_SEND_DELAY_MS = TimeUnit.SECONDS.toMillis(5);
+        private static final long SEND_DELAY_NS = TimeUnit.MILLISECONDS.toNanos(500);
+        private static final long SLEEP_TIME_MS = 100;
+        private static final CommandElement FLUSH_ELEMENT = new CommandElement();
+        private static final CommandElement DUMP_ELEMENT = new CommandElement();
+        private static final CommandElement STAND_IN_ELEMENT = new CommandElement();
 
-    private final MessagePassingBlockingQueue<Element> queue;
-    private final Thread worker;
-    private final TimeSource timeSource;
+        private final MessagePassingBlockingQueue<Element> queue;
+        private final Thread worker;
+        private final TimeSource timeSource;
 
-    private volatile boolean closed = false;
-    private final AtomicInteger flushCounter = new AtomicInteger(0);
-    private final AtomicInteger dumpCounter = new AtomicInteger(0);
+        private volatile boolean closed = false;
+        private final AtomicInteger flushCounter = new AtomicInteger(0);
+        private final AtomicInteger dumpCounter = new AtomicInteger(0);
 
-    private final LongRunningTracesTracker runningTracesTracker;
+        private final LongRunningTracesTracker runningTracesTracker;
 
-    public boolean longRunningSpansEnabled() {
-      return runningTracesTracker != null;
-    }
-
-    @Override
-    public void enqueue(Element pendingTrace) {
-      if (pendingTrace.setEnqueued(true)) {
-        if (!queue.offer(pendingTrace)) {
-          // Mark it as not in the queue
-          pendingTrace.setEnqueued(false);
-
-          if (!pendingTrace.writeOnBufferFull()) {
-            return;
-          }
-          pendingTrace.write();
+        public boolean longRunningSpansEnabled() {
+            return runningTracesTracker != null;
         }
-      }
-    }
 
-    @Override
-    public void start() {
-      TracerFlare.addReporter(new TracerDump(this));
-      worker.start();
-    }
-
-    @Override
-    public void close() {
-      flush();
-      closed = true;
-      worker.interrupt();
-      try {
-        worker.join(THREAD_JOIN_TIMOUT_MS);
-      } catch (InterruptedException ignored) {
-      }
-    }
-
-    private void yieldOrSleep(final int loop) {
-      if (loop <= 3) {
-        Thread.yield();
-      } else {
-        try {
-          Thread.sleep(10);
-        } catch (Throwable ignored) {
+        @Override
+        public void enqueue(Element pendingTrace) {
+            if (pendingTrace.setEnqueued(true)) {
+                if (!queue.offer(pendingTrace)) {
+                    // Mark it as not in the queue
+                    pendingTrace.setEnqueued(false);
+
+                    if (!pendingTrace.writeOnBufferFull()) {
+                        return;
+                    }
+                    pendingTrace.write();
+                }
+            }
         }
-      }
-    }
 
-    @Override
-    public void flush() {
-      if (worker.isAlive()) {
-        int count = flushCounter.get();
-        int loop = 1;
-        boolean signaled = queue.offer(FLUSH_ELEMENT);
-        while (!closed && !signaled) {
-          yieldOrSleep(loop++);
-          signaled = queue.offer(FLUSH_ELEMENT);
-        }
-        int newCount = flushCounter.get();
-        while (!closed && count >= newCount) {
-          yieldOrSleep(loop++);
-          newCount = flushCounter.get();
+        @Override
+        public void start() {
+            TracerFlare.addReporter(new TracerDump(this));
+            worker.start();
         }
-      }
-    }
-
-    private static final class WriteDrain implements MessagePassingQueue.Consumer<Element> {
-      private static final WriteDrain WRITE_DRAIN = new WriteDrain();
 
-      @Override
-      public void accept(Element pendingTrace) {
-        pendingTrace.write();
-      }
-    }
+        @Override
+        public void close() {
+            flush();
+            closed = true;
+            worker.interrupt();
+            try {
+                worker.join(THREAD_JOIN_TIMOUT_MS);
+            } catch (InterruptedException ignored) {
+            }
+        }
 
-    private static final class DumpDrain
-        implements MessagePassingQueue.Consumer<Element>, MessagePassingQueue.Supplier<Element> {
-      private static final Logger LOGGER = LoggerFactory.getLogger(DumpDrain.class);
-      private static final DumpDrain DUMP_DRAIN = new DumpDrain();
-      private static final int MAX_DUMPED_TRACES = 50;
-
-      private static final Comparator<Element> TRACE_BY_START_TIME =
-          comparingLong(trace -> trace.getRootSpan().getStartTime());
-      private static final Predicate<Element> NOT_PENDING_TRACE =
-          element -> !(element instanceof PendingTrace);
-
-      private volatile List<Element> data = new ArrayList<>();
-      private volatile int index = 0;
-
-      @Override
-      public void accept(Element pendingTrace) {
-        data.add(pendingTrace);
-      }
-
-      @Override
-      public Element get() {
-        if (index < data.size()) {
-          return data.get(index++);
+        private void yieldOrSleep(final int loop) {
+            if (loop <= 3) {
+                Thread.yield();
+            } else {
+                try {
+                    Thread.sleep(10);
+                } catch (Throwable ignored) {
+                }
+            }
         }
-        // Should never reach here or else queue may break according to
-        // MessagePassingQueue docs if we return a null. Return a stand-in
-        // Element instead.
-        LOGGER.warn(
-            SEND_TELEMETRY,
-            "Index {} is out of bounds for data size {} in DumpDrain.get so returning filler CommandElement to prevent pending trace queue from breaking.",
-            index,
-            data.size());
-        return STAND_IN_ELEMENT;
-      }
-
-      public List<Element> collectTraces() {
-        List<Element> traces = data;
-        data = new ArrayList<>();
-        index = 0;
-        traces.removeIf(NOT_PENDING_TRACE);
-        // Storing oldest traces first
-        traces.sort(TRACE_BY_START_TIME);
-        return traces;
-      }
-    }
 
-    private static final class CommandElement implements Element {
-      @Override
-      public long oldestFinishedTime() {
-        return 0;
-      }
+        @Override
+        public void flush() {
+            if (worker.isAlive()) {
+                int count = flushCounter.get();
+                int loop = 1;
+                boolean signaled = queue.offer(FLUSH_ELEMENT);
+                while (!closed && !signaled) {
+                    yieldOrSleep(loop++);
+                    signaled = queue.offer(FLUSH_ELEMENT);
+                }
+                int newCount = flushCounter.get();
+                while (!closed && count >= newCount) {
+                    yieldOrSleep(loop++);
+                    newCount = flushCounter.get();
+                }
+            }
+        }
 
-      @Override
-      public boolean lastReferencedNanosAgo(long nanos) {
-        return false;
-      }
+        private static final class WriteDrain implements MessagePassingQueue.Consumer<Element> {
+            private static final WriteDrain WRITE_DRAIN = new WriteDrain();
 
-      @Override
-      public void write() {}
+            @Override
+            public void accept(Element pendingTrace) {
+                pendingTrace.write();
+            }
+        }
 
-      @Override
-      public DDSpan getRootSpan() {
-        return null;
-      }
+        private static final class DumpDrain
+                implements MessagePassingQueue.Consumer<Element>, MessagePassingQueue.Supplier<Element> {
+            private static final Logger LOGGER = LoggerFactory.getLogger(DumpDrain.class);
+            private static final DumpDrain DUMP_DRAIN = new DumpDrain();
+            private static final int MAX_DUMPED_TRACES = 50;
 
-      @Override
-      public boolean setEnqueued(boolean enqueued) {
-        return true;
-      }
+            private static final Comparator<Element> TRACE_BY_START_TIME =
+                    comparingLong(trace -> trace.getRootSpan().getStartTime());
+            private static final Predicate<Element> NOT_PENDING_TRACE = element -> !(element instanceof PendingTrace);
 
-      @Override
-      public boolean writeOnBufferFull() {
-        return true;
-      }
-    }
+            private volatile List<Element> data = new ArrayList<>();
+            private volatile int index = 0;
 
-    private final class Worker implements Runnable {
+            @Override
+            public void accept(Element pendingTrace) {
+                data.add(pendingTrace);
+            }
 
-      @Override
-      public void run() {
-        try {
-          while (!closed && !Thread.currentThread().isInterrupted()) {
+            @Override
+            public Element get() {
+                if (index < data.size()) {
+                    return data.get(index++);
+                }
+                // Should never reach here or else queue may break according to
+                // MessagePassingQueue docs if we return a null. Return a stand-in
+                // Element instead.
+                LOGGER.warn(
+                        SEND_TELEMETRY,
+                        "Index {} is out of bounds for data size {} in DumpDrain.get so returning filler CommandElement to prevent pending trace queue from breaking.",
+                        index,
+                        data.size());
+                return STAND_IN_ELEMENT;
+            }
 
-            Element pendingTrace = null;
-            if (longRunningSpansEnabled()) {
-              pendingTrace = queue.poll(1, TimeUnit.SECONDS);
-              runningTracesTracker.flushAndCompact(timeSource.getCurrentTimeMillis());
-              if (pendingTrace == null) {
-                continue;
-              }
-            } else {
-              pendingTrace = queue.take(); // block until available;
+            public List<Element> collectTraces() {
+                List<Element> traces = data;
+                data = new ArrayList<>();
+                index = 0;
+                traces.removeIf(NOT_PENDING_TRACE);
+                // Storing oldest traces first
+                traces.sort(TRACE_BY_START_TIME);
+                return traces;
             }
+        }
 
-            if (pendingTrace == FLUSH_ELEMENT) {
-              // Since this is an MPSC queue, the drain needs to be called on the consumer thread
-              queue.drain(WriteDrain.WRITE_DRAIN);
-              flushCounter.incrementAndGet();
-              continue;
+        private static final class CommandElement implements Element {
+            @Override
+            public long oldestFinishedTime() {
+                return 0;
             }
 
-            if (pendingTrace == DUMP_ELEMENT) {
-              queue.fill(
-                  DumpDrain.DUMP_DRAIN,
-                  queue.drain(DumpDrain.DUMP_DRAIN, DumpDrain.MAX_DUMPED_TRACES));
-              dumpCounter.incrementAndGet();
-              continue;
+            @Override
+            public boolean lastReferencedNanosAgo(long nanos) {
+                return false;
             }
 
-            // The element is no longer in the queue
-            pendingTrace.setEnqueued(false);
+            @Override
+            public void write() {}
 
-            if (longRunningSpansEnabled()) {
-              if (runningTracesTracker.add(pendingTrace)) {
-                continue;
-              }
+            @Override
+            public DDSpan getRootSpan() {
+                return null;
             }
 
-            long oldestFinishedTime = pendingTrace.oldestFinishedTime();
-            long finishTimestampMillis = TimeUnit.NANOSECONDS.toMillis(oldestFinishedTime);
-            if (finishTimestampMillis <= timeSource.getCurrentTimeMillis() - FORCE_SEND_DELAY_MS) {
-              // Root span is getting old. Send the trace to avoid being discarded by agent.
-              pendingTrace.write();
-              continue;
+            @Override
+            public boolean setEnqueued(boolean enqueued) {
+                return true;
             }
 
-            if (pendingTrace.lastReferencedNanosAgo(SEND_DELAY_NS)) {
-              // Trace has been unmodified long enough, go ahead and write whatever is finished.
-              pendingTrace.write();
-            } else {
-              // Trace is too new. Requeue it and sleep to avoid a hot loop.
-              enqueue(pendingTrace);
-              Thread.sleep(SLEEP_TIME_MS);
+            @Override
+            public boolean writeOnBufferFull() {
+                return true;
             }
-          }
-        } catch (InterruptedException e) {
-          Thread.currentThread().interrupt();
         }
-      }
-    }
 
-    public DelayingPendingTraceBuffer(
-        int bufferSize,
-        TimeSource timeSource,
-        Config config,
-        SharedCommunicationObjects sharedCommunicationObjects,
-        HealthMetrics healthMetrics) {
-      this.queue = Queues.mpscBlockingConsumerArrayQueue(bufferSize);
-      this.worker = newAgentThread(TRACE_MONITOR, new Worker());
-      this.timeSource = timeSource;
-      boolean runningSpansEnabled = config.isLongRunningTraceEnabled();
-      this.runningTracesTracker =
-          runningSpansEnabled
-              ? new LongRunningTracesTracker(
-                  config, bufferSize, sharedCommunicationObjects, healthMetrics)
-              : null;
-    }
+        private final class Worker implements Runnable {
+
+            @Override
+            public void run() {
+                try {
+                    while (!closed && !Thread.currentThread().isInterrupted()) {
+
+                        Element pendingTrace = null;
+                        if (longRunningSpansEnabled()) {
+                            pendingTrace = queue.poll(1, TimeUnit.SECONDS);
+                            runningTracesTracker.flushAndCompact(timeSource.getCurrentTimeMillis());
+                            if (pendingTrace == null) {
+                                continue;
+                            }
+                        } else {
+                            pendingTrace = queue.take(); // block until available;
+                        }
+
+                        if (pendingTrace == FLUSH_ELEMENT) {
+                            // Since this is an MPSC queue, the drain needs to be called on the consumer thread
+                            queue.drain(WriteDrain.WRITE_DRAIN);
+                            flushCounter.incrementAndGet();
+                            continue;
+                        }
+
+                        if (pendingTrace == DUMP_ELEMENT) {
+                            queue.fill(
+                                    DumpDrain.DUMP_DRAIN,
+                                    queue.drain(DumpDrain.DUMP_DRAIN, DumpDrain.MAX_DUMPED_TRACES));
+                            dumpCounter.incrementAndGet();
+                            continue;
+                        }
+
+                        // The element is no longer in the queue
+                        pendingTrace.setEnqueued(false);
+
+                        if (longRunningSpansEnabled()) {
+                            if (runningTracesTracker.add(pendingTrace)) {
+                                continue;
+                            }
+                        }
+
+                        long oldestFinishedTime = pendingTrace.oldestFinishedTime();
+                        long finishTimestampMillis = TimeUnit.NANOSECONDS.toMillis(oldestFinishedTime);
+                        if (finishTimestampMillis <= timeSource.getCurrentTimeMillis() - FORCE_SEND_DELAY_MS) {
+                            // Root span is getting old. Send the trace to avoid being discarded by agent.
+                            pendingTrace.write();
+                            continue;
+                        }
+
+                        if (pendingTrace.lastReferencedNanosAgo(SEND_DELAY_NS)) {
+                            // Trace has been unmodified long enough, go ahead and write whatever is finished.
+                            pendingTrace.write();
+                        } else {
+                            // Trace is too new. Requeue it and sleep to avoid a hot loop.
+                            enqueue(pendingTrace);
+                            Thread.sleep(SLEEP_TIME_MS);
+                        }
+                    }
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+            }
+        }
 
-    @VisibleForTesting
-    LongRunningTracesTracker getRunningTracesTracker() {
-      return runningTracesTracker;
-    }
+        public DelayingPendingTraceBuffer(
+                int bufferSize,
+                TimeSource timeSource,
+                Config config,
+                SharedCommunicationObjects sharedCommunicationObjects,
+                HealthMetrics healthMetrics) {
+            this.queue = Queues.mpscBlockingConsumerArrayQueue(bufferSize);
+            this.worker = newAgentThread(TRACE_MONITOR, new Worker());
+            this.timeSource = timeSource;
+            boolean runningSpansEnabled = config.isLongRunningTraceEnabled();
+            this.runningTracesTracker = runningSpansEnabled
+                    ? new LongRunningTracesTracker(config, bufferSize, sharedCommunicationObjects, healthMetrics)
+                    : null;
+        }
 
-    @VisibleForTesting
-    Thread getWorker() {
-      return worker;
-    }
+        @VisibleForTesting
+        LongRunningTracesTracker getRunningTracesTracker() {
+            return runningTracesTracker;
+        }
+
+        @VisibleForTesting
+        Thread getWorker() {
+            return worker;
+        }
 
-    @VisibleForTesting
-    MessagePassingBlockingQueue<Element> getQueue() {
-      return queue;
+        @VisibleForTesting
+        MessagePassingBlockingQueue<Element> getQueue() {
+            return queue;
+        }
     }
-  }
 
-  static class DiscardingPendingTraceBuffer extends PendingTraceBuffer {
-    private static final Logger log = LoggerFactory.getLogger(DiscardingPendingTraceBuffer.class);
+    static class DiscardingPendingTraceBuffer extends PendingTraceBuffer {
+        private static final Logger log = LoggerFactory.getLogger(DiscardingPendingTraceBuffer.class);
 
-    @Override
-    public void start() {}
+        @Override
+        public void start() {}
 
-    @Override
-    public void close() {}
+        @Override
+        public void close() {}
 
-    @Override
-    public void flush() {}
+        @Override
+        public void flush() {}
 
-    @Override
-    public void enqueue(Element pendingTrace) {
-      log.debug(
-          "PendingTrace enqueued but won't be reported. Root span: {}", pendingTrace.getRootSpan());
+        @Override
+        public void enqueue(Element pendingTrace) {
+            log.debug("PendingTrace enqueued but won't be reported. Root span: {}", pendingTrace.getRootSpan());
+        }
     }
-  }
-
-  public static PendingTraceBuffer delaying(
-      TimeSource timeSource,
-      Config config,
-      SharedCommunicationObjects sharedCommunicationObjects,
-      HealthMetrics healthMetrics) {
-    return new DelayingPendingTraceBuffer(
-        BUFFER_SIZE, timeSource, config, sharedCommunicationObjects, healthMetrics);
-  }
 
-  public static PendingTraceBuffer discarding() {
-    return new DiscardingPendingTraceBuffer();
-  }
+    public static PendingTraceBuffer delaying(
+            TimeSource timeSource,
+            Config config,
+            SharedCommunicationObjects sharedCommunicationObjects,
+            HealthMetrics healthMetrics) {
+        return new DelayingPendingTraceBuffer(
+                BUFFER_SIZE, timeSource, config, sharedCommunicationObjects, healthMetrics);
+    }
 
-  public abstract void start();
+    public static PendingTraceBuffer discarding() {
+        return new DiscardingPendingTraceBuffer();
+    }
 
-  @Override
-  public abstract void close();
+    public abstract void start();
 
-  public abstract void flush();
+    @Override
+    public abstract void close();
 
-  public abstract void enqueue(Element pendingTrace);
+    public abstract void flush();
 
-  private static class TracerDump implements TracerFlare.Reporter {
-    private final DelayingPendingTraceBuffer buffer;
+    public abstract void enqueue(Element pendingTrace);
 
-    private TracerDump(DelayingPendingTraceBuffer buffer) {
-      this.buffer = buffer;
-    }
+    private static class TracerDump implements TracerFlare.Reporter {
+        private final DelayingPendingTraceBuffer buffer;
 
-    @Override
-    public void prepareForFlare() {
-      if (buffer.worker.isAlive()) {
-        int count = buffer.dumpCounter.get();
-        int loop = 1;
-        boolean signaled = buffer.queue.offer(DelayingPendingTraceBuffer.DUMP_ELEMENT);
-        while (!buffer.closed && !signaled) {
-          buffer.yieldOrSleep(loop++);
-          signaled = buffer.queue.offer(DelayingPendingTraceBuffer.DUMP_ELEMENT);
+        private TracerDump(DelayingPendingTraceBuffer buffer) {
+            this.buffer = buffer;
         }
-        int newCount = buffer.dumpCounter.get();
-        while (!buffer.closed && count >= newCount) {
-          buffer.yieldOrSleep(loop++);
-          newCount = buffer.dumpCounter.get();
+
+        @Override
+        public void prepareForFlare() {
+            if (buffer.worker.isAlive()) {
+                int count = buffer.dumpCounter.get();
+                int loop = 1;
+                boolean signaled = buffer.queue.offer(DelayingPendingTraceBuffer.DUMP_ELEMENT);
+                while (!buffer.closed && !signaled) {
+                    buffer.yieldOrSleep(loop++);
+                    signaled = buffer.queue.offer(DelayingPendingTraceBuffer.DUMP_ELEMENT);
+                }
+                int newCount = buffer.dumpCounter.get();
+                while (!buffer.closed && count >= newCount) {
+                    buffer.yieldOrSleep(loop++);
+                    newCount = buffer.dumpCounter.get();
+                }
+            }
         }
-      }
-    }
 
-    @Override
-    public void addReportToFlare(ZipOutputStream zip) throws IOException {
-      TraceDumpJsonExporter writer = new TraceDumpJsonExporter(zip);
-      for (Element e : DelayingPendingTraceBuffer.DumpDrain.DUMP_DRAIN.collectTraces()) {
-        if (e instanceof PendingTrace) {
-          PendingTrace trace = (PendingTrace) e;
-          writer.write(trace.getSpans());
+        @Override
+        public void addReportToFlare(ZipOutputStream zip) throws IOException {
+            TraceDumpJsonExporter writer = new TraceDumpJsonExporter(zip);
+            for (Element e : DelayingPendingTraceBuffer.DumpDrain.DUMP_DRAIN.collectTraces()) {
+                if (e instanceof PendingTrace) {
+                    PendingTrace trace = (PendingTrace) e;
+                    writer.write(trace.getSpans());
+                }
+            }
+            writer.flush();
         }
-      }
-      writer.flush();
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/SpanKindFilter.java b/dd-trace-core/src/main/java/datadog/trace/core/SpanKindFilter.java
index bc236768c26..9ddcd56a404 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/SpanKindFilter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/SpanKindFilter.java
@@ -11,60 +11,60 @@
  * matching should read the tag directly via {@link CoreSpan#unsafeGetTag} instead.
  */
 public final class SpanKindFilter {
-  public static final class Builder {
-    private int kindMask;
+    public static final class Builder {
+        private int kindMask;
 
-    public Builder includeServer() {
-      return this.include(DDSpanContext.SPAN_KIND_SERVER);
-    }
+        public Builder includeServer() {
+            return this.include(DDSpanContext.SPAN_KIND_SERVER);
+        }
 
-    public Builder includeClient() {
-      return this.include(DDSpanContext.SPAN_KIND_CLIENT);
-    }
+        public Builder includeClient() {
+            return this.include(DDSpanContext.SPAN_KIND_CLIENT);
+        }
 
-    public Builder includeProducer() {
-      return this.include(DDSpanContext.SPAN_KIND_PRODUCER);
-    }
+        public Builder includeProducer() {
+            return this.include(DDSpanContext.SPAN_KIND_PRODUCER);
+        }
 
-    public Builder includeConsumer() {
-      return this.include(DDSpanContext.SPAN_KIND_CONSUMER);
-    }
+        public Builder includeConsumer() {
+            return this.include(DDSpanContext.SPAN_KIND_CONSUMER);
+        }
 
-    public Builder includeInternal() {
-      return this.include(DDSpanContext.SPAN_KIND_INTERNAL);
-    }
+        public Builder includeInternal() {
+            return this.include(DDSpanContext.SPAN_KIND_INTERNAL);
+        }
 
-    public Builder includeBroker() {
-      return this.include(DDSpanContext.SPAN_KIND_BROKER);
-    }
+        public Builder includeBroker() {
+            return this.include(DDSpanContext.SPAN_KIND_BROKER);
+        }
 
-    public final SpanKindFilter build() {
-      return new SpanKindFilter(this.kindMask);
-    }
+        public final SpanKindFilter build() {
+            return new SpanKindFilter(this.kindMask);
+        }
 
-    private Builder include(int spanKindConstant) {
-      this.kindMask |= (1 << spanKindConstant);
-      return this;
+        private Builder include(int spanKindConstant) {
+            this.kindMask |= (1 << spanKindConstant);
+            return this;
+        }
     }
-  }
 
-  public static final Builder builder() {
-    return new Builder();
-  }
+    public static final Builder builder() {
+        return new Builder();
+    }
 
-  private final int kindMask;
+    private final int kindMask;
 
-  private SpanKindFilter(int kindMask) {
-    this.kindMask = kindMask;
-  }
+    private SpanKindFilter(int kindMask) {
+        this.kindMask = kindMask;
+    }
 
-  /** Test whether a span with the given span.kind string passes this filter. */
-  public boolean matches(String spanKind) {
-    return matches(DDSpanContext.spanKindOrdinalOf(spanKind));
-  }
+    /** Test whether a span with the given span.kind string passes this filter. */
+    public boolean matches(String spanKind) {
+        return matches(DDSpanContext.spanKindOrdinalOf(spanKind));
+    }
 
-  /** Fast-path test for callers that already hold the span's cached kind ordinal. */
-  public boolean matches(byte spanKindOrdinal) {
-    return (kindMask & (1 << spanKindOrdinal)) != 0;
-  }
+    /** Fast-path test for callers that already hold the span's cached kind ordinal. */
+    public boolean matches(byte spanKindOrdinal) {
+        return (kindMask & (1 << spanKindOrdinal)) != 0;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/SpanList.java b/dd-trace-core/src/main/java/datadog/trace/core/SpanList.java
index 2ce199b1768..28310d57abc 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/SpanList.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/SpanList.java
@@ -4,32 +4,32 @@
 
 /** ArrayList that exposes modCount to allow for an optimization in TraceInterceptor handling */
 final class SpanList extends ArrayList<DDSpan> {
-  static final SpanList EMPTY = new SpanList(0);
+    static final SpanList EMPTY = new SpanList(0);
 
-  /**
-   * Convenience function for creating a SpanList containing a single DDSpan. Meant as replacement
-   * for Collections.singletonList when creating a SpanList.
-   *
-   * @param span != null
-   * @return a SpanList
-   */
-  static final SpanList of(DDSpan span) {
-    SpanList list = new SpanList(1);
-    list.add(span);
-    return list;
-  }
+    /**
+     * Convenience function for creating a SpanList containing a single DDSpan. Meant as replacement
+     * for Collections.singletonList when creating a SpanList.
+     *
+     * @param span != null
+     * @return a SpanList
+     */
+    static final SpanList of(DDSpan span) {
+        SpanList list = new SpanList(1);
+        list.add(span);
+        return list;
+    }
 
-  /**
-   * Constructs a SpanList with the specified capacity
-   *
-   * @param capacity
-   */
-  SpanList(int capacity) {
-    super(capacity);
-  }
+    /**
+     * Constructs a SpanList with the specified capacity
+     *
+     * @param capacity
+     */
+    SpanList(int capacity) {
+        super(capacity);
+    }
 
-  /** The modifcation count of the List - can be used to check if the List has been altered */
-  int modCount() {
-    return this.modCount;
-  }
+    /** The modifcation count of the List - can be used to check if the List has been altered */
+    int modCount() {
+        return this.modCount;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java b/dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java
index da324a07def..f3963a77539 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java
@@ -24,201 +24,200 @@
 import org.slf4j.LoggerFactory;
 
 public final class StatusLogger extends JsonAdapter<Config>
-    implements AgentTaskScheduler.Task<Config>, JsonAdapter.Factory {
+        implements AgentTaskScheduler.Task<Config>, JsonAdapter.Factory {
 
-  public static void logStatus(Config config) {
-    AgentTaskScheduler.get().schedule(new StatusLogger(), config, 500, MILLISECONDS);
-  }
+    public static void logStatus(Config config) {
+        AgentTaskScheduler.get().schedule(new StatusLogger(), config, 500, MILLISECONDS);
+    }
 
-  @Override
-  public void run(Config config) {
-    Logger log = LoggerFactory.getLogger(StatusLogger.class);
-    if (log.isInfoEnabled()) {
-      log.info(
-          "DATADOG TRACER CONFIGURATION {}",
-          new Moshi.Builder().add(this).build().adapter(Config.class).toJson(config));
+    @Override
+    public void run(Config config) {
+        Logger log = LoggerFactory.getLogger(StatusLogger.class);
+        if (log.isInfoEnabled()) {
+            log.info(
+                    "DATADOG TRACER CONFIGURATION {}",
+                    new Moshi.Builder().add(this).build().adapter(Config.class).toJson(config));
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("class path: {}", System.getProperty("java.class.path"));
+        }
     }
-    if (log.isDebugEnabled()) {
-      log.debug("class path: {}", System.getProperty("java.class.path"));
+
+    @Override
+    public Config fromJson(JsonReader reader) {
+        throw new UnsupportedOperationException();
     }
-  }
 
-  @Override
-  public Config fromJson(JsonReader reader) {
-    throw new UnsupportedOperationException();
-  }
+    @Override
+    public void toJson(JsonWriter writer, Config config) throws IOException {
+        if (null == config) {
+            return;
+        }
+        writer.beginObject();
+        writer.name("version");
+        writer.value(DDTraceCoreInfo.VERSION);
+        writer.name("os_name");
+        writer.value(System.getProperty("os.name"));
+        writer.name("os_version");
+        writer.value(System.getProperty("os.version"));
+        writer.name("architecture");
+        writer.value(System.getProperty("os.arch"));
+        writer.name("lang");
+        writer.value("jvm");
+        writer.name("lang_version");
+        writer.value(System.getProperty("java.version"));
+        writer.name("jvm_vendor");
+        writer.value(System.getProperty("java.vendor"));
+        writer.name("jvm_version");
+        writer.value(System.getProperty("java.vm.version"));
+        writer.name("java_class_version");
+        writer.value(System.getProperty("java.class.version"));
+        writer.name("http_nonProxyHosts");
+        writer.value(String.valueOf(System.getProperty("http.nonProxyHosts")));
+        writer.name("http_proxyHost");
+        writer.value(String.valueOf(System.getProperty("http.proxyHost")));
+        writer.name("enabled");
+        writer.value(config.isTraceEnabled());
+        writer.name("service");
+        writer.value(config.getServiceName());
+        writer.name("agent_url");
+        writer.value(config.getAgentUrl());
+        writer.name("agent_unix_domain_socket");
+        writer.value(config.getAgentUnixDomainSocket());
+        writer.name("agent_named_pipe");
+        writer.value(config.getAgentNamedPipe());
+        writer.name("agent_error");
+        writer.value(!agentServiceCheck(config));
+        writer.name("debug");
+        writer.value(config.isDebugEnabled());
+        writer.name("trace_propagation_style_extract");
+        writer.beginArray();
+        writeSet(writer, config.getTracePropagationStylesToExtract());
+        writer.endArray();
+        writer.name("trace_propagation_style_inject");
+        writer.beginArray();
+        writeSet(writer, config.getTracePropagationStylesToInject());
+        writer.endArray();
+        writer.name("analytics_enabled");
+        writer.value(config.isTraceAnalyticsEnabled());
+        writer.name("sample_rate");
+        writer.value(config.getTraceSampleRate());
+        writer.name("priority_sampling_enabled");
+        writer.value(config.isPrioritySamplingEnabled());
+        writer.name("logs_correlation_enabled");
+        writer.value(config.isLogsInjectionEnabled());
+        writer.name("profiling_enabled");
+        writer.value(config.isProfilingEnabled());
+        writer.name("remote_config_enabled");
+        writer.value(config.isRemoteConfigEnabled());
+        writer.name("debugger_enabled");
+        writer.value(config.isDynamicInstrumentationEnabled());
+        writer.name("debugger_exception_enabled");
+        writer.value(config.isDebuggerExceptionEnabled());
+        writer.name("debugger_span_origin_enabled");
+        writer.value(config.isDebuggerCodeOriginEnabled());
+        writer.name("debugger_distributed_debugger_enabled");
+        writer.value(config.isDistributedDebuggerEnabled());
+        writer.name("appsec_enabled");
+        writer.value(config.getAppSecActivation().toString());
+        writer.name("appsec_rules_file_path");
+        writer.value(config.getAppSecRulesFile());
+        writer.name("rasp_enabled");
+        writer.value(config.isAppSecRaspEnabled());
+        writer.name("telemetry_enabled");
+        writer.value(config.isTelemetryEnabled());
+        writer.name("telemetry_dependency_collection_enabled");
+        writer.value(config.isTelemetryDependencyServiceEnabled());
+        writer.name("telemetry_log_collection_enabled");
+        writer.value(config.isTelemetryLogCollectionEnabled());
+        writer.name("dd_version");
+        writer.value(config.getVersion());
+        writer.name("health_checks_enabled");
+        writer.value(config.isHealthMetricsEnabled());
+        writer.name("configuration_file");
+        writer.value(config.getConfigFileStatus());
+        writer.name("runtime_id");
+        writer.value(config.getRuntimeId());
+        writer.name("logging_settings");
+        writeObjectMap(writer, LoggingSettingsDescription.getDescription());
+        writer.name("cws_enabled");
+        writer.value(config.isCwsEnabled());
+        writer.name("cws_tls_refresh");
+        writer.value(config.getCwsTlsRefresh());
+        writer.name("datadog_profiler_enabled");
+        writer.value(config.isDatadogProfilerEnabled());
+        writer.name("datadog_profiler_safe");
+        writer.value(isDatadogProfilerSafeInCurrentEnvironment());
+        writer.name("datadog_profiler_enabled_overridden");
+        writer.value(isDatadogProfilerEnablementOverridden());
+        if (config.getIastActivation() != ProductActivation.FULLY_DISABLED) {
+            writer.name("iast_enabled");
+            writer.value(config.getIastActivation().toString());
+        }
+        writer.name("data_streams_enabled");
+        writer.value(config.isDataStreamsEnabled());
+        writer.name("data_streams_transaction_extractors");
+        writer.value(config.getDataStreamsTransactionExtractors());
+        writer.name("otlp_traces_export_enabled");
+        writer.value(config.isOtlpTracesExportEnabled());
+        writer.name("otlp_metrics_export_enabled");
+        writer.value(config.isOtlpMetricsExportEnabled());
+        writer.name("otlp_logs_export_enabled");
+        writer.value(config.isOtlpLogsExportEnabled());
 
-  @Override
-  public void toJson(JsonWriter writer, Config config) throws IOException {
-    if (null == config) {
-      return;
+        writer.name("app_logs_collection_enabled");
+        writer.value(config.isAppLogsCollectionEnabled());
+        writer.endObject();
     }
-    writer.beginObject();
-    writer.name("version");
-    writer.value(DDTraceCoreInfo.VERSION);
-    writer.name("os_name");
-    writer.value(System.getProperty("os.name"));
-    writer.name("os_version");
-    writer.value(System.getProperty("os.version"));
-    writer.name("architecture");
-    writer.value(System.getProperty("os.arch"));
-    writer.name("lang");
-    writer.value("jvm");
-    writer.name("lang_version");
-    writer.value(System.getProperty("java.version"));
-    writer.name("jvm_vendor");
-    writer.value(System.getProperty("java.vendor"));
-    writer.name("jvm_version");
-    writer.value(System.getProperty("java.vm.version"));
-    writer.name("java_class_version");
-    writer.value(System.getProperty("java.class.version"));
-    writer.name("http_nonProxyHosts");
-    writer.value(String.valueOf(System.getProperty("http.nonProxyHosts")));
-    writer.name("http_proxyHost");
-    writer.value(String.valueOf(System.getProperty("http.proxyHost")));
-    writer.name("enabled");
-    writer.value(config.isTraceEnabled());
-    writer.name("service");
-    writer.value(config.getServiceName());
-    writer.name("agent_url");
-    writer.value(config.getAgentUrl());
-    writer.name("agent_unix_domain_socket");
-    writer.value(config.getAgentUnixDomainSocket());
-    writer.name("agent_named_pipe");
-    writer.value(config.getAgentNamedPipe());
-    writer.name("agent_error");
-    writer.value(!agentServiceCheck(config));
-    writer.name("debug");
-    writer.value(config.isDebugEnabled());
-    writer.name("trace_propagation_style_extract");
-    writer.beginArray();
-    writeSet(writer, config.getTracePropagationStylesToExtract());
-    writer.endArray();
-    writer.name("trace_propagation_style_inject");
-    writer.beginArray();
-    writeSet(writer, config.getTracePropagationStylesToInject());
-    writer.endArray();
-    writer.name("analytics_enabled");
-    writer.value(config.isTraceAnalyticsEnabled());
-    writer.name("sample_rate");
-    writer.value(config.getTraceSampleRate());
-    writer.name("priority_sampling_enabled");
-    writer.value(config.isPrioritySamplingEnabled());
-    writer.name("logs_correlation_enabled");
-    writer.value(config.isLogsInjectionEnabled());
-    writer.name("profiling_enabled");
-    writer.value(config.isProfilingEnabled());
-    writer.name("remote_config_enabled");
-    writer.value(config.isRemoteConfigEnabled());
-    writer.name("debugger_enabled");
-    writer.value(config.isDynamicInstrumentationEnabled());
-    writer.name("debugger_exception_enabled");
-    writer.value(config.isDebuggerExceptionEnabled());
-    writer.name("debugger_span_origin_enabled");
-    writer.value(config.isDebuggerCodeOriginEnabled());
-    writer.name("debugger_distributed_debugger_enabled");
-    writer.value(config.isDistributedDebuggerEnabled());
-    writer.name("appsec_enabled");
-    writer.value(config.getAppSecActivation().toString());
-    writer.name("appsec_rules_file_path");
-    writer.value(config.getAppSecRulesFile());
-    writer.name("rasp_enabled");
-    writer.value(config.isAppSecRaspEnabled());
-    writer.name("telemetry_enabled");
-    writer.value(config.isTelemetryEnabled());
-    writer.name("telemetry_dependency_collection_enabled");
-    writer.value(config.isTelemetryDependencyServiceEnabled());
-    writer.name("telemetry_log_collection_enabled");
-    writer.value(config.isTelemetryLogCollectionEnabled());
-    writer.name("dd_version");
-    writer.value(config.getVersion());
-    writer.name("health_checks_enabled");
-    writer.value(config.isHealthMetricsEnabled());
-    writer.name("configuration_file");
-    writer.value(config.getConfigFileStatus());
-    writer.name("runtime_id");
-    writer.value(config.getRuntimeId());
-    writer.name("logging_settings");
-    writeObjectMap(writer, LoggingSettingsDescription.getDescription());
-    writer.name("cws_enabled");
-    writer.value(config.isCwsEnabled());
-    writer.name("cws_tls_refresh");
-    writer.value(config.getCwsTlsRefresh());
-    writer.name("datadog_profiler_enabled");
-    writer.value(config.isDatadogProfilerEnabled());
-    writer.name("datadog_profiler_safe");
-    writer.value(isDatadogProfilerSafeInCurrentEnvironment());
-    writer.name("datadog_profiler_enabled_overridden");
-    writer.value(isDatadogProfilerEnablementOverridden());
-    if (config.getIastActivation() != ProductActivation.FULLY_DISABLED) {
-      writer.name("iast_enabled");
-      writer.value(config.getIastActivation().toString());
-    }
-    writer.name("data_streams_enabled");
-    writer.value(config.isDataStreamsEnabled());
-    writer.name("data_streams_transaction_extractors");
-    writer.value(config.getDataStreamsTransactionExtractors());
-    writer.name("otlp_traces_export_enabled");
-    writer.value(config.isOtlpTracesExportEnabled());
-    writer.name("otlp_metrics_export_enabled");
-    writer.value(config.isOtlpMetricsExportEnabled());
-    writer.name("otlp_logs_export_enabled");
-    writer.value(config.isOtlpLogsExportEnabled());
-
-    writer.name("app_logs_collection_enabled");
-    writer.value(config.isAppLogsCollectionEnabled());
-    writer.endObject();
-  }
 
-  private static boolean agentServiceCheck(Config config) {
-    try {
-      if (config.getAgentUrl().startsWith("unix:")) {
-        return new File(config.getAgentUnixDomainSocket()).exists();
-      } else {
-        try (Socket s = new Socket()) {
-          s.connect(new InetSocketAddress(config.getAgentHost(), config.getAgentPort()), 500);
-          return true;
+    private static boolean agentServiceCheck(Config config) {
+        try {
+            if (config.getAgentUrl().startsWith("unix:")) {
+                return new File(config.getAgentUnixDomainSocket()).exists();
+            } else {
+                try (Socket s = new Socket()) {
+                    s.connect(new InetSocketAddress(config.getAgentHost(), config.getAgentPort()), 500);
+                    return true;
+                }
+            }
+        } catch (Throwable ex) {
+            return false;
         }
-      }
-    } catch (Throwable ex) {
-      return false;
     }
-  }
 
-  private static void writeMap(JsonWriter writer, Map<String, String> map) throws IOException {
-    writer.beginObject();
-    for (Map.Entry<String, String> entry : map.entrySet()) {
-      writer.name(entry.getKey());
-      writer.value(entry.getValue());
+    private static void writeMap(JsonWriter writer, Map<String, String> map) throws IOException {
+        writer.beginObject();
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            writer.name(entry.getKey());
+            writer.value(entry.getValue());
+        }
+        writer.endObject();
     }
-    writer.endObject();
-  }
 
-  private static void writeObjectMap(JsonWriter writer, Map<String, Object> map)
-      throws IOException {
-    writer.beginObject();
-    for (Map.Entry<String, Object> entry : map.entrySet()) {
-      writer.name(entry.getKey());
-      Object value = entry.getValue();
-      if (value instanceof Number) {
-        writer.value((Number) value);
-      } else if (value instanceof Boolean) {
-        writer.value((Boolean) value);
-      } else {
-        writer.value(String.valueOf(value));
-      }
+    private static void writeObjectMap(JsonWriter writer, Map<String, Object> map) throws IOException {
+        writer.beginObject();
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            writer.name(entry.getKey());
+            Object value = entry.getValue();
+            if (value instanceof Number) {
+                writer.value((Number) value);
+            } else if (value instanceof Boolean) {
+                writer.value((Boolean) value);
+            } else {
+                writer.value(String.valueOf(value));
+            }
+        }
+        writer.endObject();
     }
-    writer.endObject();
-  }
 
-  private static void writeSet(JsonWriter writer, Set<?> set) throws IOException {
-    for (Object o : set) {
-      writer.value(o.toString());
+    private static void writeSet(JsonWriter writer, Set<?> set) throws IOException {
+        for (Object o : set) {
+            writer.value(o.toString());
+        }
     }
-  }
 
-  @Override
-  public JsonAdapter<?> create(Type type, Set<? extends Annotation> annotations, Moshi moshi) {
-    return this;
-  }
+    @Override
+    public JsonAdapter<?> create(Type type, Set<? extends Annotation> annotations, Moshi moshi) {
+        return this;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/StreamingTraceCollector.java b/dd-trace-core/src/main/java/datadog/trace/core/StreamingTraceCollector.java
index 40392df7b2d..7c9317f0a59 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/StreamingTraceCollector.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/StreamingTraceCollector.java
@@ -9,79 +9,77 @@
 
 public class StreamingTraceCollector extends TraceCollector {
 
-  static class Factory implements TraceCollector.Factory {
-    private final CoreTracer tracer;
-    private final TimeSource timeSource;
-    private final HealthMetrics healthMetrics;
+    static class Factory implements TraceCollector.Factory {
+        private final CoreTracer tracer;
+        private final TimeSource timeSource;
+        private final HealthMetrics healthMetrics;
 
-    Factory(CoreTracer tracer, TimeSource timeSource, HealthMetrics healthMetrics) {
-      this.tracer = tracer;
-      this.timeSource = timeSource;
-      this.healthMetrics = healthMetrics;
-    }
+        Factory(CoreTracer tracer, TimeSource timeSource, HealthMetrics healthMetrics) {
+            this.tracer = tracer;
+            this.timeSource = timeSource;
+            this.healthMetrics = healthMetrics;
+        }
 
-    @Override
-    public StreamingTraceCollector create(@Nonnull DDTraceId traceId) {
-      return create(traceId, null);
-    }
+        @Override
+        public StreamingTraceCollector create(@Nonnull DDTraceId traceId) {
+            return create(traceId, null);
+        }
 
-    @Override
-    public StreamingTraceCollector create(
-        @Nonnull DDTraceId traceId, CoreTracer.ConfigSnapshot traceConfig) {
-      return new StreamingTraceCollector(tracer, traceConfig, timeSource, healthMetrics);
+        @Override
+        public StreamingTraceCollector create(@Nonnull DDTraceId traceId, CoreTracer.ConfigSnapshot traceConfig) {
+            return new StreamingTraceCollector(tracer, traceConfig, timeSource, healthMetrics);
+        }
     }
-  }
 
-  private final HealthMetrics healthMetrics;
-  private volatile DDSpan rootSpan;
+    private final HealthMetrics healthMetrics;
+    private volatile DDSpan rootSpan;
 
-  private static final AtomicReferenceFieldUpdater<StreamingTraceCollector, DDSpan> ROOT_SPAN =
-      AtomicReferenceFieldUpdater.newUpdater(
-          StreamingTraceCollector.class, DDSpan.class, "rootSpan");
+    private static final AtomicReferenceFieldUpdater<StreamingTraceCollector, DDSpan> ROOT_SPAN =
+            AtomicReferenceFieldUpdater.newUpdater(StreamingTraceCollector.class, DDSpan.class, "rootSpan");
 
-  private StreamingTraceCollector(
-      CoreTracer tracer,
-      CoreTracer.ConfigSnapshot traceConfig,
-      TimeSource timeSource,
-      HealthMetrics healthMetrics) {
-    super(tracer, traceConfig != null ? traceConfig : tracer.captureTraceConfig(), timeSource);
-    this.healthMetrics = healthMetrics;
-  }
+    private StreamingTraceCollector(
+            CoreTracer tracer,
+            CoreTracer.ConfigSnapshot traceConfig,
+            TimeSource timeSource,
+            HealthMetrics healthMetrics) {
+        super(tracer, traceConfig != null ? traceConfig : tracer.captureTraceConfig(), timeSource);
+        this.healthMetrics = healthMetrics;
+    }
 
-  @Override
-  void touch() {
-    // do nothing
-  }
+    @Override
+    void touch() {
+        // do nothing
+    }
 
-  @Override
-  void registerSpan(DDSpan span) {
-    ROOT_SPAN.compareAndSet(this, null, span);
-    healthMetrics.onCreateSpan();
-  }
+    @Override
+    void registerSpan(DDSpan span) {
+        ROOT_SPAN.compareAndSet(this, null, span);
+        healthMetrics.onCreateSpan();
+    }
 
-  @Override
-  DDSpan getRootSpan() {
-    return rootSpan;
-  }
+    @Override
+    DDSpan getRootSpan() {
+        return rootSpan;
+    }
 
-  @Override
-  PublishState onPublish(DDSpan span) {
-    final DDSpan rootSpan = getRootSpan();
-    if (span == rootSpan) {
-      tracer.onRootSpanPublished(rootSpan);
+    @Override
+    PublishState onPublish(DDSpan span) {
+        final DDSpan rootSpan = getRootSpan();
+        if (span == rootSpan) {
+            tracer.onRootSpanPublished(rootSpan);
+        }
+        healthMetrics.onFinishSpan();
+        tracer.write(SpanList.of(span));
+        return PublishState.WRITTEN;
     }
-    healthMetrics.onFinishSpan();
-    tracer.write(SpanList.of(span));
-    return PublishState.WRITTEN;
-  }
 
-  @Override
-  public void registerContinuation(ContextContinuation continuation) {
-    // do nothing
-  }
+    @Override
+    public void registerContinuation(ContextContinuation continuation) {
+        // do nothing
+    }
 
-  @Override
-  public void removeContinuation(ContextContinuation continuation) {
-    // do nothing
-  }
+    @Override
+    public void removeContinuation(ContextContinuation continuation) {
+        // do nothing
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/TraceCollector.java b/dd-trace-core/src/main/java/datadog/trace/core/TraceCollector.java
index 4cb9a3edb42..d9dc036c1ee 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/TraceCollector.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/TraceCollector.java
@@ -12,96 +12,95 @@
 
 public abstract class TraceCollector implements AgentTraceCollector {
 
-  interface Factory {
-    /** Used by tests and benchmarks. */
-    TraceCollector create(@Nonnull DDTraceId traceId);
-
-    TraceCollector create(@Nonnull DDTraceId traceId, CoreTracer.ConfigSnapshot traceConfig);
-  }
-
-  enum PublishState {
-    WRITTEN,
-    PARTIAL_FLUSH,
-    ROOT_BUFFERED,
-    BUFFERED,
-    PENDING
-  }
-
-  protected final CoreTracer tracer;
-  protected final CoreTracer.ConfigSnapshot traceConfig;
-  protected final TimeSource timeSource;
-
-  private volatile long endToEndStartTime;
-  private static final AtomicLongFieldUpdater<TraceCollector> END_TO_END_START_TIME =
-      AtomicLongFieldUpdater.newUpdater(TraceCollector.class, "endToEndStartTime");
-
-  protected TraceCollector(
-      CoreTracer tracer, CoreTracer.ConfigSnapshot traceConfig, TimeSource timeSource) {
-    this.tracer = tracer;
-    this.traceConfig = traceConfig;
-    this.timeSource = timeSource;
-  }
-
-  CoreTracer getTracer() {
-    return tracer;
-  }
-
-  CoreTracer.ConfigSnapshot getTraceConfig() {
-    return traceConfig;
-  }
-
-  String mapServiceName(String serviceName) {
-    return traceConfig.getServiceMapping().getOrDefault(serviceName, serviceName);
-  }
-
-  boolean sample(DDSpan spanToSample) {
-    return traceConfig.sampler.sample(spanToSample);
-  }
-
-  public void setSamplingPriorityIfNecessary() {
-    // There's a race where multiple threads can see PrioritySampling.UNSET here
-    // This check skips potential complex sampling priority logic when we know its redundant
-    // Locks inside DDSpanContext ensure the correct behavior in the race case
-    DDSpan rootSpan = getRootSpan();
-    if (traceConfig.sampler instanceof PrioritySampler && rootSpan != null) {
-      // Skip sampler override when _dd.p.ts is marked for ASM or AI Guard.
-      if ((!Config.get().isApmTracingEnabled()
-              && !ProductTraceSource.isProductMarked(
-                  rootSpan.spanContext().getPropagationTags().getTraceSource(),
-                  ProductTraceSource.ASM,
-                  ProductTraceSource.AI_GUARD))
-          || rootSpan.spanContext().getSamplingPriority() == PrioritySampling.UNSET) {
-        ((PrioritySampler) traceConfig.sampler).setSamplingPriority(rootSpan);
-      }
+    interface Factory {
+        /** Used by tests and benchmarks. */
+        TraceCollector create(@Nonnull DDTraceId traceId);
+
+        TraceCollector create(@Nonnull DDTraceId traceId, CoreTracer.ConfigSnapshot traceConfig);
+    }
+
+    enum PublishState {
+        WRITTEN,
+        PARTIAL_FLUSH,
+        ROOT_BUFFERED,
+        BUFFERED,
+        PENDING
+    }
+
+    protected final CoreTracer tracer;
+    protected final CoreTracer.ConfigSnapshot traceConfig;
+    protected final TimeSource timeSource;
+
+    private volatile long endToEndStartTime;
+    private static final AtomicLongFieldUpdater<TraceCollector> END_TO_END_START_TIME =
+            AtomicLongFieldUpdater.newUpdater(TraceCollector.class, "endToEndStartTime");
+
+    protected TraceCollector(CoreTracer tracer, CoreTracer.ConfigSnapshot traceConfig, TimeSource timeSource) {
+        this.tracer = tracer;
+        this.traceConfig = traceConfig;
+        this.timeSource = timeSource;
+    }
+
+    CoreTracer getTracer() {
+        return tracer;
+    }
+
+    CoreTracer.ConfigSnapshot getTraceConfig() {
+        return traceConfig;
     }
-  }
 
-  public TimeSource getTimeSource() {
-    return timeSource;
-  }
+    String mapServiceName(String serviceName) {
+        return traceConfig.getServiceMapping().getOrDefault(serviceName, serviceName);
+    }
+
+    boolean sample(DDSpan spanToSample) {
+        return traceConfig.sampler.sample(spanToSample);
+    }
 
-  public long getCurrentTimeNano() {
-    long nanoTicks = timeSource.getNanoTicks();
-    return tracer.getTimeWithNanoTicks(nanoTicks);
-  }
+    public void setSamplingPriorityIfNecessary() {
+        // There's a race where multiple threads can see PrioritySampling.UNSET here
+        // This check skips potential complex sampling priority logic when we know its redundant
+        // Locks inside DDSpanContext ensure the correct behavior in the race case
+        DDSpan rootSpan = getRootSpan();
+        if (traceConfig.sampler instanceof PrioritySampler && rootSpan != null) {
+            // Skip sampler override when _dd.p.ts is marked for ASM or AI Guard.
+            if ((!Config.get().isApmTracingEnabled()
+                            && !ProductTraceSource.isProductMarked(
+                                    rootSpan.spanContext().getPropagationTags().getTraceSource(),
+                                    ProductTraceSource.ASM,
+                                    ProductTraceSource.AI_GUARD))
+                    || rootSpan.spanContext().getSamplingPriority() == PrioritySampling.UNSET) {
+                ((PrioritySampler) traceConfig.sampler).setSamplingPriority(rootSpan);
+            }
+        }
+    }
 
-  void beginEndToEnd() {
-    beginEndToEnd(getCurrentTimeNano());
-  }
+    public TimeSource getTimeSource() {
+        return timeSource;
+    }
 
-  void beginEndToEnd(long endToEndStartTime) {
-    END_TO_END_START_TIME.compareAndSet(this, 0, endToEndStartTime);
-  }
+    public long getCurrentTimeNano() {
+        long nanoTicks = timeSource.getNanoTicks();
+        return tracer.getTimeWithNanoTicks(nanoTicks);
+    }
 
-  long getEndToEndStartTime() {
-    return endToEndStartTime;
-  }
+    void beginEndToEnd() {
+        beginEndToEnd(getCurrentTimeNano());
+    }
+
+    void beginEndToEnd(long endToEndStartTime) {
+        END_TO_END_START_TIME.compareAndSet(this, 0, endToEndStartTime);
+    }
+
+    long getEndToEndStartTime() {
+        return endToEndStartTime;
+    }
 
-  abstract void touch();
+    abstract void touch();
 
-  abstract void registerSpan(final DDSpan span);
+    abstract void registerSpan(final DDSpan span);
 
-  abstract DDSpan getRootSpan();
+    abstract DDSpan getRootSpan();
 
-  abstract PublishState onPublish(final DDSpan span);
+    abstract PublishState onPublish(final DDSpan span);
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java b/dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java
index 6bbc13151e3..0cd6e153230 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java
@@ -50,607 +50,592 @@
 import org.slf4j.LoggerFactory;
 
 final class TracingConfigPoller {
-  static final Logger log = LoggerFactory.getLogger(TracingConfigPoller.class);
-
-  private final DynamicConfig<?> dynamicConfig;
-
-  private boolean startupLogsEnabled;
-
-  private Runnable stopPolling;
-
-  public TracingConfigPoller(DynamicConfig<?> dynamicConfig) {
-    this.dynamicConfig = dynamicConfig;
-  }
-
-  public void start(Config config, SharedCommunicationObjects sco) {
-    this.startupLogsEnabled = config.isStartupLogsEnabled();
-    ConfigurationPoller configPoller = sco.configurationPoller(config);
-
-    if (configPoller != null) {
-      configPoller.addCapabilities(
-          CAPABILITY_APM_TRACING_TRACING_ENABLED
-              | CAPABILITY_APM_TRACING_SAMPLE_RATE
-              | CAPABILITY_APM_LOGS_INJECTION
-              | CAPABILITY_APM_HTTP_HEADER_TAGS
-              | CAPABILITY_APM_CUSTOM_TAGS
-              | CAPABILITY_APM_TRACING_DATA_STREAMS_ENABLED
-              | CAPABILITY_APM_TRACING_SAMPLE_RULES
-              | CAPABILITY_APM_TRACING_ENABLE_DYNAMIC_INSTRUMENTATION
-              | CAPABILITY_APM_TRACING_ENABLE_EXCEPTION_REPLAY
-              | CAPABILITY_APM_TRACING_ENABLE_CODE_ORIGIN
-              | CAPABILITY_APM_TRACING_ENABLE_LIVE_DEBUGGING
-              | CAPABILITY_APM_TRACING_MULTICONFIG);
-    }
-    stopPolling = new Updater().register(config, configPoller);
-  }
-
-  public void stop() {
-    if (null != stopPolling) {
-      stopPolling.run();
-    }
-  }
-
-  final class Updater implements ProductListener {
-    private final JsonAdapter<ConfigOverrides> CONFIG_OVERRIDES_ADAPTER;
-    private final JsonAdapter<LibConfig> LIB_CONFIG_ADAPTER;
-    private final JsonAdapter<TracingSamplingRule> TRACE_SAMPLING_RULE;
-
-    {
-      Moshi MOSHI =
-          new Moshi.Builder()
-              .add(new TracingSamplingRulesAdapter())
-              .add(new DataStreamsTransactionExtractors.DataStreamsTransactionExtractorsAdapter())
-              .add(new DataStreamsTransactionExtractors.DataStreamsTransactionExtractorAdapter())
-              .build();
-      CONFIG_OVERRIDES_ADAPTER = MOSHI.adapter(ConfigOverrides.class);
-      LIB_CONFIG_ADAPTER = MOSHI.adapter(LibConfig.class);
-      TRACE_SAMPLING_RULE = MOSHI.adapter(TracingSamplingRule.class);
-    }
-
-    private final Map<String, ConfigOverrides> configs = new HashMap<>();
-    private boolean receivedOverrides = false;
+    static final Logger log = LoggerFactory.getLogger(TracingConfigPoller.class);
 
-    public Runnable register(Config config, ConfigurationPoller poller) {
-      if (null != poller) {
-        poller.addListener(Product.APM_TRACING, this);
-        return poller::stop;
-      } else {
-        return null;
-      }
-    }
+    private final DynamicConfig<?> dynamicConfig;
 
-    @Override
-    public void accept(ConfigKey configKey, byte[] content, PollingRateHinter hinter)
-        throws IOException {
-
-      ConfigOverrides overrides =
-          CONFIG_OVERRIDES_ADAPTER.fromJson(
-              Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
-
-      if (null != overrides && null != overrides.libConfig) {
-        configs.put(configKey.getConfigId(), overrides);
-        if (log.isDebugEnabled()) {
-          log.debug(
-              "Applied APM_TRACING overrides: {} - priority: {}",
-              CONFIG_OVERRIDES_ADAPTER.toJson(overrides),
-              overrides.getOverridePriority());
-        }
-      } else {
-        log.debug("No APM_TRACING overrides");
-      }
-    }
+    private boolean startupLogsEnabled;
 
-    @Override
-    public void remove(ConfigKey configKey, PollingRateHinter hinter) {
-      configs.remove(configKey.getConfigId());
-    }
+    private Runnable stopPolling;
 
-    @Override
-    public void commit(PollingRateHinter hinter) {
-      // sort configs by override priority
-      List<LibConfig> sortedConfigs =
-          configs.values().stream()
-              .sorted(Comparator.comparingInt(ConfigOverrides::getOverridePriority).reversed())
-              .map(config -> config.libConfig)
-              .collect(Collectors.toList());
-
-      LibConfig mergedConfig = LibConfig.mergeLibConfigs(sortedConfigs);
-
-      if (mergedConfig != null) {
-        // apply merged config
-        if (log.isDebugEnabled()) {
-          log.debug(
-              "Applying merged APM_TRACING config: {}", LIB_CONFIG_ADAPTER.toJson(mergedConfig));
-        }
-        applyConfigOverrides(checkConfig(mergedConfig));
-      }
-
-      if (sortedConfigs.isEmpty()) {
-        removeConfigOverrides();
-        log.debug("Removed APM_TRACING overrides");
-      }
+    public TracingConfigPoller(DynamicConfig<?> dynamicConfig) {
+        this.dynamicConfig = dynamicConfig;
     }
 
-    private LibConfig checkConfig(LibConfig libConfig) {
-      libConfig.traceSampleRate = checkSampleRate(libConfig.traceSampleRate);
-      libConfig.tracingSamplingRules = checkSamplingRules(libConfig.tracingSamplingRules);
-      return libConfig;
-    }
+    public void start(Config config, SharedCommunicationObjects sco) {
+        this.startupLogsEnabled = config.isStartupLogsEnabled();
+        ConfigurationPoller configPoller = sco.configurationPoller(config);
 
-    private Double checkSampleRate(Double sampleRate) {
-      if (null != sampleRate) {
-        if (sampleRate > 1.0) {
-          log.debug("Unexpected sample rate {}, using 1.0", sampleRate);
-          return 1.0;
+        if (configPoller != null) {
+            configPoller.addCapabilities(CAPABILITY_APM_TRACING_TRACING_ENABLED
+                    | CAPABILITY_APM_TRACING_SAMPLE_RATE
+                    | CAPABILITY_APM_LOGS_INJECTION
+                    | CAPABILITY_APM_HTTP_HEADER_TAGS
+                    | CAPABILITY_APM_CUSTOM_TAGS
+                    | CAPABILITY_APM_TRACING_DATA_STREAMS_ENABLED
+                    | CAPABILITY_APM_TRACING_SAMPLE_RULES
+                    | CAPABILITY_APM_TRACING_ENABLE_DYNAMIC_INSTRUMENTATION
+                    | CAPABILITY_APM_TRACING_ENABLE_EXCEPTION_REPLAY
+                    | CAPABILITY_APM_TRACING_ENABLE_CODE_ORIGIN
+                    | CAPABILITY_APM_TRACING_ENABLE_LIVE_DEBUGGING
+                    | CAPABILITY_APM_TRACING_MULTICONFIG);
         }
-        if (sampleRate < 0.0) {
-          log.debug("Unexpected sample rate {}, using 0.0", sampleRate);
-          return 0.0;
-        }
-      }
-      return sampleRate;
+        stopPolling = new Updater().register(config, configPoller);
     }
 
-    private TracingSamplingRules checkSamplingRules(TracingSamplingRules rules) {
-      if (null == rules || null == rules.data) {
-        return null;
-      }
-      for (Iterator<TracingSamplingRule> itr = rules.data.iterator(); itr.hasNext(); ) {
-        TracingSamplingRule rule = itr.next();
-        // check for required fields
-        if ((null == rule.service
-                && null == rule.name
-                && null == rule.resource
-                && null == rule.tags)
-            || null == rule.sampleRate) {
-          log.debug(
-              "Invalid sampling rule from remote-config, rule will be removed: {}",
-              TRACE_SAMPLING_RULE.toJson(rule));
-          itr.remove();
-        }
-        rule.service = normalizeGlob(rule.service);
-        rule.name = normalizeGlob(rule.name);
-        rule.resource = normalizeGlob(rule.resource);
-        rule.sampleRate = checkSampleRate(rule.sampleRate);
-      }
-      return rules;
-    }
-  }
-
-  void applyConfigOverrides(LibConfig libConfig) {
-    DynamicConfig<?>.Builder builder = dynamicConfig.initial();
-
-    if (libConfig.debugEnabled != null) {
-      if (Boolean.TRUE.equals(libConfig.debugEnabled)) {
-        GlobalLogLevelSwitcher.get().switchLevel(LogLevel.DEBUG);
-      } else {
-        // Disable debugEnabled when it was set to true at startup
-        // The default log level when debugEnabled=false depends on the STARTUP_LOGS_ENABLED flag
-        // See datadog.trace.bootstrap.Agent.configureLogger()
-        if (startupLogsEnabled) {
-          GlobalLogLevelSwitcher.get().switchLevel(LogLevel.INFO);
-        } else {
-          GlobalLogLevelSwitcher.get().switchLevel(LogLevel.WARN);
+    public void stop() {
+        if (null != stopPolling) {
+            stopPolling.run();
         }
-      }
-    } else {
-      GlobalLogLevelSwitcher.get().restore();
     }
 
-    maybeOverride(builder::setTracingEnabled, libConfig.tracingEnabled);
-    maybeOverride(builder::setRuntimeMetricsEnabled, libConfig.runtimeMetricsEnabled);
-    maybeOverride(builder::setLogsInjectionEnabled, libConfig.logsInjectionEnabled);
-    maybeOverride(builder::setDataStreamsEnabled, libConfig.dataStreamsEnabled);
-
-    maybeOverride(builder::setServiceMapping, libConfig.serviceMapping);
-    maybeOverride(builder::setHeaderTags, libConfig.headerTags);
-    if (null != libConfig.dataStreamsTransactionExtractors) {
-      builder.setDataStreamsTransactionExtractors(
-          libConfig.dataStreamsTransactionExtractors.getExtractors());
-    }
-
-    if (null != libConfig.tracingSamplingRules) {
-      builder.setTraceSamplingRules(
-          libConfig.tracingSamplingRules.data, libConfig.tracingSamplingRules.json);
-    }
-    maybeOverride(builder::setTraceSampleRate, libConfig.traceSampleRate);
-
-    maybeOverride(builder::setTracingTags, parseTagListToMap(libConfig.tracingTags));
-    DebuggerConfigBridge.updateConfig(
-        new DebuggerConfigUpdate(
-            libConfig.dynamicInstrumentationEnabled,
-            libConfig.exceptionReplayEnabled,
-            libConfig.codeOriginEnabled,
-            libConfig.liveDebuggingEnabled));
-    builder.apply();
-  }
-
-  void removeConfigOverrides() {
-    dynamicConfig.resetTraceConfig();
-    GlobalLogLevelSwitcher.get().restore();
-  }
-
-  private <T> void maybeOverride(Consumer<T> setter, T override) {
-    if (null != override) {
-      setter.accept(override);
-    }
-  }
+    final class Updater implements ProductListener {
+        private final JsonAdapter<ConfigOverrides> CONFIG_OVERRIDES_ADAPTER;
+        private final JsonAdapter<LibConfig> LIB_CONFIG_ADAPTER;
+        private final JsonAdapter<TracingSamplingRule> TRACE_SAMPLING_RULE;
+
+        {
+            Moshi MOSHI = new Moshi.Builder()
+                    .add(new TracingSamplingRulesAdapter())
+                    .add(new DataStreamsTransactionExtractors.DataStreamsTransactionExtractorsAdapter())
+                    .add(new DataStreamsTransactionExtractors.DataStreamsTransactionExtractorAdapter())
+                    .build();
+            CONFIG_OVERRIDES_ADAPTER = MOSHI.adapter(ConfigOverrides.class);
+            LIB_CONFIG_ADAPTER = MOSHI.adapter(LibConfig.class);
+            TRACE_SAMPLING_RULE = MOSHI.adapter(TracingSamplingRule.class);
+        }
 
-  private Map<String, String> parseTagListToMap(List<String> input) {
-    if (null == input) {
-      return null;
-    }
+        private final Map<String, ConfigOverrides> configs = new HashMap<>();
+        private boolean receivedOverrides = false;
 
-    Map<String, String> resultMap = new HashMap<>(input.size());
-    for (String s : input) {
-      int colonIndex = s.indexOf(':');
-      if (colonIndex > -1
-          && colonIndex < s.length() - 1) { // ensure there's a colon that's not at the start or end
-        String key = s.substring(0, colonIndex);
-        String value = s.substring(colonIndex + 1);
-        if (!key.isEmpty() && !value.isEmpty()) {
-          resultMap.put(key, value);
-        }
-      }
-    }
+        public Runnable register(Config config, ConfigurationPoller poller) {
+            if (null != poller) {
+                poller.addListener(Product.APM_TRACING, this);
+                return poller::stop;
+            } else {
+                return null;
+            }
+        }
 
-    return resultMap;
-  }
+        @Override
+        public void accept(ConfigKey configKey, byte[] content, PollingRateHinter hinter) throws IOException {
+
+            ConfigOverrides overrides =
+                    CONFIG_OVERRIDES_ADAPTER.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
+
+            if (null != overrides && null != overrides.libConfig) {
+                configs.put(configKey.getConfigId(), overrides);
+                if (log.isDebugEnabled()) {
+                    log.debug(
+                            "Applied APM_TRACING overrides: {} - priority: {}",
+                            CONFIG_OVERRIDES_ADAPTER.toJson(overrides),
+                            overrides.getOverridePriority());
+                }
+            } else {
+                log.debug("No APM_TRACING overrides");
+            }
+        }
 
-  static final class ConfigOverrides {
-    @Json(name = "lib_config")
-    public LibConfig libConfig;
+        @Override
+        public void remove(ConfigKey configKey, PollingRateHinter hinter) {
+            configs.remove(configKey.getConfigId());
+        }
 
-    @Json(name = "service_target")
-    public ServiceTarget serviceTarget;
+        @Override
+        public void commit(PollingRateHinter hinter) {
+            // sort configs by override priority
+            List<LibConfig> sortedConfigs = configs.values().stream()
+                    .sorted(Comparator.comparingInt(ConfigOverrides::getOverridePriority)
+                            .reversed())
+                    .map(config -> config.libConfig)
+                    .collect(Collectors.toList());
+
+            LibConfig mergedConfig = LibConfig.mergeLibConfigs(sortedConfigs);
+
+            if (mergedConfig != null) {
+                // apply merged config
+                if (log.isDebugEnabled()) {
+                    log.debug("Applying merged APM_TRACING config: {}", LIB_CONFIG_ADAPTER.toJson(mergedConfig));
+                }
+                applyConfigOverrides(checkConfig(mergedConfig));
+            }
+
+            if (sortedConfigs.isEmpty()) {
+                removeConfigOverrides();
+                log.debug("Removed APM_TRACING overrides");
+            }
+        }
 
-    @Json(name = "k8s_target_v2")
-    public K8sTargetV2 k8sTargetV2;
+        private LibConfig checkConfig(LibConfig libConfig) {
+            libConfig.traceSampleRate = checkSampleRate(libConfig.traceSampleRate);
+            libConfig.tracingSamplingRules = checkSamplingRules(libConfig.tracingSamplingRules);
+            return libConfig;
+        }
 
-    public int getOverridePriority() {
-      boolean isSingleEnvironment = isSingleEnvironment();
-      boolean isSingleService = isSingleService();
-      boolean isClusterTarget = isClusterTarget();
+        private Double checkSampleRate(Double sampleRate) {
+            if (null != sampleRate) {
+                if (sampleRate > 1.0) {
+                    log.debug("Unexpected sample rate {}, using 1.0", sampleRate);
+                    return 1.0;
+                }
+                if (sampleRate < 0.0) {
+                    log.debug("Unexpected sample rate {}, using 0.0", sampleRate);
+                    return 0.0;
+                }
+            }
+            return sampleRate;
+        }
 
-      // Service+ Environment level override - highest priority
-      if (isSingleEnvironment && isSingleService) {
-        return 5;
-      }
+        private TracingSamplingRules checkSamplingRules(TracingSamplingRules rules) {
+            if (null == rules || null == rules.data) {
+                return null;
+            }
+            for (Iterator<TracingSamplingRule> itr = rules.data.iterator(); itr.hasNext(); ) {
+                TracingSamplingRule rule = itr.next();
+                // check for required fields
+                if ((null == rule.service && null == rule.name && null == rule.resource && null == rule.tags)
+                        || null == rule.sampleRate) {
+                    log.debug(
+                            "Invalid sampling rule from remote-config, rule will be removed: {}",
+                            TRACE_SAMPLING_RULE.toJson(rule));
+                    itr.remove();
+                }
+                rule.service = normalizeGlob(rule.service);
+                rule.name = normalizeGlob(rule.name);
+                rule.resource = normalizeGlob(rule.resource);
+                rule.sampleRate = checkSampleRate(rule.sampleRate);
+            }
+            return rules;
+        }
+    }
 
-      if (isSingleService) {
-        return 4;
-      }
+    void applyConfigOverrides(LibConfig libConfig) {
+        DynamicConfig<?>.Builder builder = dynamicConfig.initial();
+
+        if (libConfig.debugEnabled != null) {
+            if (Boolean.TRUE.equals(libConfig.debugEnabled)) {
+                GlobalLogLevelSwitcher.get().switchLevel(LogLevel.DEBUG);
+            } else {
+                // Disable debugEnabled when it was set to true at startup
+                // The default log level when debugEnabled=false depends on the STARTUP_LOGS_ENABLED flag
+                // See datadog.trace.bootstrap.Agent.configureLogger()
+                if (startupLogsEnabled) {
+                    GlobalLogLevelSwitcher.get().switchLevel(LogLevel.INFO);
+                } else {
+                    GlobalLogLevelSwitcher.get().switchLevel(LogLevel.WARN);
+                }
+            }
+        } else {
+            GlobalLogLevelSwitcher.get().restore();
+        }
 
-      if (isSingleEnvironment) {
-        return 3;
-      }
+        maybeOverride(builder::setTracingEnabled, libConfig.tracingEnabled);
+        maybeOverride(builder::setRuntimeMetricsEnabled, libConfig.runtimeMetricsEnabled);
+        maybeOverride(builder::setLogsInjectionEnabled, libConfig.logsInjectionEnabled);
+        maybeOverride(builder::setDataStreamsEnabled, libConfig.dataStreamsEnabled);
 
-      if (isClusterTarget) {
-        return 2;
-      }
+        maybeOverride(builder::setServiceMapping, libConfig.serviceMapping);
+        maybeOverride(builder::setHeaderTags, libConfig.headerTags);
+        if (null != libConfig.dataStreamsTransactionExtractors) {
+            builder.setDataStreamsTransactionExtractors(libConfig.dataStreamsTransactionExtractors.getExtractors());
+        }
 
-      // Org level override - lowest priority
-      return 1;
-    }
+        if (null != libConfig.tracingSamplingRules) {
+            builder.setTraceSamplingRules(libConfig.tracingSamplingRules.data, libConfig.tracingSamplingRules.json);
+        }
+        maybeOverride(builder::setTraceSampleRate, libConfig.traceSampleRate);
 
-    // allEnvironments = serviceTarget is null or serviceTarget.env is null or '*'
-    public boolean isSingleEnvironment() {
-      return serviceTarget != null && serviceTarget.env != null && !"*".equals(serviceTarget.env);
+        maybeOverride(builder::setTracingTags, parseTagListToMap(libConfig.tracingTags));
+        DebuggerConfigBridge.updateConfig(new DebuggerConfigUpdate(
+                libConfig.dynamicInstrumentationEnabled,
+                libConfig.exceptionReplayEnabled,
+                libConfig.codeOriginEnabled,
+                libConfig.liveDebuggingEnabled));
+        builder.apply();
     }
 
-    public boolean isSingleService() {
-      return serviceTarget != null
-          && serviceTarget.service != null
-          && !"*".equals(serviceTarget.service);
+    void removeConfigOverrides() {
+        dynamicConfig.resetTraceConfig();
+        GlobalLogLevelSwitcher.get().restore();
     }
 
-    public boolean isClusterTarget() {
-      return k8sTargetV2 != null;
+    private <T> void maybeOverride(Consumer<T> setter, T override) {
+        if (null != override) {
+            setter.accept(override);
+        }
     }
-  }
-
-  static final class ServiceTarget {
-    @Json(name = "service")
-    public String service;
-
-    @Json(name = "env")
-    public String env;
-  }
 
-  static final class K8sTargetV2 {
-    @Json(name = "cluster_targets")
-    public List<ClusterTarget> clusterTargets;
-  }
-
-  static final class ClusterTarget {
-    @Json(name = "cluster_name")
-    public String clusterName;
-
-    @Json(name = "enabled")
-    public Boolean enabled;
-
-    @Json(name = "enabled_namespaces")
-    public List<String> enabledNamespaces;
-  }
+    private Map<String, String> parseTagListToMap(List<String> input) {
+        if (null == input) {
+            return null;
+        }
 
-  static final class LibConfig {
-    @Json(name = "tracing_enabled")
-    public Boolean tracingEnabled;
+        Map<String, String> resultMap = new HashMap<>(input.size());
+        for (String s : input) {
+            int colonIndex = s.indexOf(':');
+            if (colonIndex > -1
+                    && colonIndex < s.length() - 1) { // ensure there's a colon that's not at the start or end
+                String key = s.substring(0, colonIndex);
+                String value = s.substring(colonIndex + 1);
+                if (!key.isEmpty() && !value.isEmpty()) {
+                    resultMap.put(key, value);
+                }
+            }
+        }
 
-    @Json(name = "tracing_debug")
-    public Boolean debugEnabled;
+        return resultMap;
+    }
 
-    @Json(name = "runtime_metrics_enabled")
-    public Boolean runtimeMetricsEnabled;
+    static final class ConfigOverrides {
+        @Json(name = "lib_config")
+        public LibConfig libConfig;
 
-    @Json(name = "log_injection_enabled")
-    public Boolean logsInjectionEnabled;
+        @Json(name = "service_target")
+        public ServiceTarget serviceTarget;
 
-    @Json(name = "data_streams_enabled")
-    public Boolean dataStreamsEnabled;
+        @Json(name = "k8s_target_v2")
+        public K8sTargetV2 k8sTargetV2;
 
-    @Json(name = "tracing_service_mapping")
-    public List<ServiceMappingEntry> serviceMapping;
+        public int getOverridePriority() {
+            boolean isSingleEnvironment = isSingleEnvironment();
+            boolean isSingleService = isSingleService();
+            boolean isClusterTarget = isClusterTarget();
 
-    @Json(name = "tracing_header_tags")
-    public List<HeaderTagEntry> headerTags;
+            // Service+ Environment level override - highest priority
+            if (isSingleEnvironment && isSingleService) {
+                return 5;
+            }
 
-    @Json(name = "tracing_sampling_rate")
-    public Double traceSampleRate;
+            if (isSingleService) {
+                return 4;
+            }
 
-    @Json(name = "tracing_tags")
-    public List<String> tracingTags;
+            if (isSingleEnvironment) {
+                return 3;
+            }
 
-    @Json(name = "tracing_sampling_rules")
-    public TracingSamplingRules tracingSamplingRules;
+            if (isClusterTarget) {
+                return 2;
+            }
 
-    @Json(name = "dynamic_instrumentation_enabled")
-    public Boolean dynamicInstrumentationEnabled;
+            // Org level override - lowest priority
+            return 1;
+        }
 
-    @Json(name = "exception_replay_enabled")
-    public Boolean exceptionReplayEnabled;
+        // allEnvironments = serviceTarget is null or serviceTarget.env is null or '*'
+        public boolean isSingleEnvironment() {
+            return serviceTarget != null && serviceTarget.env != null && !"*".equals(serviceTarget.env);
+        }
 
-    @Json(name = "code_origin_enabled")
-    public Boolean codeOriginEnabled;
+        public boolean isSingleService() {
+            return serviceTarget != null && serviceTarget.service != null && !"*".equals(serviceTarget.service);
+        }
 
-    @Json(name = "live_debugging_enabled")
-    public Boolean liveDebuggingEnabled;
+        public boolean isClusterTarget() {
+            return k8sTargetV2 != null;
+        }
+    }
 
-    @Json(name = "data_streams_transaction_extractors")
-    public DataStreamsTransactionExtractors dataStreamsTransactionExtractors;
+    static final class ServiceTarget {
+        @Json(name = "service")
+        public String service;
 
-    /**
-     * Merges a list of LibConfig objects by taking the first non-null value for each field.
-     *
-     * @param configs the list of LibConfig objects to merge
-     * @return a merged LibConfig object, or null if the input list is null or empty
-     */
-    public static LibConfig mergeLibConfigs(List<LibConfig> configs) {
-      if (configs == null || configs.isEmpty()) {
-        return null;
-      }
+        @Json(name = "env")
+        public String env;
+    }
 
-      LibConfig merged = new LibConfig();
+    static final class K8sTargetV2 {
+        @Json(name = "cluster_targets")
+        public List<ClusterTarget> clusterTargets;
+    }
 
-      for (LibConfig config : configs) {
-        if (config == null) {
-          continue;
-        }
+    static final class ClusterTarget {
+        @Json(name = "cluster_name")
+        public String clusterName;
 
-        if (merged.tracingEnabled == null) {
-          merged.tracingEnabled = config.tracingEnabled;
-        }
-        if (merged.debugEnabled == null) {
-          merged.debugEnabled = config.debugEnabled;
-        }
-        if (merged.runtimeMetricsEnabled == null) {
-          merged.runtimeMetricsEnabled = config.runtimeMetricsEnabled;
-        }
-        if (merged.logsInjectionEnabled == null) {
-          merged.logsInjectionEnabled = config.logsInjectionEnabled;
-        }
-        if (merged.dataStreamsEnabled == null) {
-          merged.dataStreamsEnabled = config.dataStreamsEnabled;
-        }
-        if (merged.serviceMapping == null) {
-          merged.serviceMapping = config.serviceMapping;
-        }
-        if (merged.headerTags == null) {
-          merged.headerTags = config.headerTags;
-        }
-        if (merged.traceSampleRate == null) {
-          merged.traceSampleRate = config.traceSampleRate;
-        }
-        if (merged.tracingTags == null) {
-          merged.tracingTags = config.tracingTags;
-        }
-        if (merged.tracingSamplingRules == null) {
-          merged.tracingSamplingRules = config.tracingSamplingRules;
-        }
-        if (merged.dataStreamsTransactionExtractors == null) {
-          merged.dataStreamsTransactionExtractors = config.dataStreamsTransactionExtractors;
+        @Json(name = "enabled")
+        public Boolean enabled;
+
+        @Json(name = "enabled_namespaces")
+        public List<String> enabledNamespaces;
+    }
+
+    static final class LibConfig {
+        @Json(name = "tracing_enabled")
+        public Boolean tracingEnabled;
+
+        @Json(name = "tracing_debug")
+        public Boolean debugEnabled;
+
+        @Json(name = "runtime_metrics_enabled")
+        public Boolean runtimeMetricsEnabled;
+
+        @Json(name = "log_injection_enabled")
+        public Boolean logsInjectionEnabled;
+
+        @Json(name = "data_streams_enabled")
+        public Boolean dataStreamsEnabled;
+
+        @Json(name = "tracing_service_mapping")
+        public List<ServiceMappingEntry> serviceMapping;
+
+        @Json(name = "tracing_header_tags")
+        public List<HeaderTagEntry> headerTags;
+
+        @Json(name = "tracing_sampling_rate")
+        public Double traceSampleRate;
+
+        @Json(name = "tracing_tags")
+        public List<String> tracingTags;
+
+        @Json(name = "tracing_sampling_rules")
+        public TracingSamplingRules tracingSamplingRules;
+
+        @Json(name = "dynamic_instrumentation_enabled")
+        public Boolean dynamicInstrumentationEnabled;
+
+        @Json(name = "exception_replay_enabled")
+        public Boolean exceptionReplayEnabled;
+
+        @Json(name = "code_origin_enabled")
+        public Boolean codeOriginEnabled;
+
+        @Json(name = "live_debugging_enabled")
+        public Boolean liveDebuggingEnabled;
+
+        @Json(name = "data_streams_transaction_extractors")
+        public DataStreamsTransactionExtractors dataStreamsTransactionExtractors;
+
+        /**
+         * Merges a list of LibConfig objects by taking the first non-null value for each field.
+         *
+         * @param configs the list of LibConfig objects to merge
+         * @return a merged LibConfig object, or null if the input list is null or empty
+         */
+        public static LibConfig mergeLibConfigs(List<LibConfig> configs) {
+            if (configs == null || configs.isEmpty()) {
+                return null;
+            }
+
+            LibConfig merged = new LibConfig();
+
+            for (LibConfig config : configs) {
+                if (config == null) {
+                    continue;
+                }
+
+                if (merged.tracingEnabled == null) {
+                    merged.tracingEnabled = config.tracingEnabled;
+                }
+                if (merged.debugEnabled == null) {
+                    merged.debugEnabled = config.debugEnabled;
+                }
+                if (merged.runtimeMetricsEnabled == null) {
+                    merged.runtimeMetricsEnabled = config.runtimeMetricsEnabled;
+                }
+                if (merged.logsInjectionEnabled == null) {
+                    merged.logsInjectionEnabled = config.logsInjectionEnabled;
+                }
+                if (merged.dataStreamsEnabled == null) {
+                    merged.dataStreamsEnabled = config.dataStreamsEnabled;
+                }
+                if (merged.serviceMapping == null) {
+                    merged.serviceMapping = config.serviceMapping;
+                }
+                if (merged.headerTags == null) {
+                    merged.headerTags = config.headerTags;
+                }
+                if (merged.traceSampleRate == null) {
+                    merged.traceSampleRate = config.traceSampleRate;
+                }
+                if (merged.tracingTags == null) {
+                    merged.tracingTags = config.tracingTags;
+                }
+                if (merged.tracingSamplingRules == null) {
+                    merged.tracingSamplingRules = config.tracingSamplingRules;
+                }
+                if (merged.dataStreamsTransactionExtractors == null) {
+                    merged.dataStreamsTransactionExtractors = config.dataStreamsTransactionExtractors;
+                }
+                if (merged.dynamicInstrumentationEnabled == null) {
+                    merged.dynamicInstrumentationEnabled = config.dynamicInstrumentationEnabled;
+                }
+                if (merged.exceptionReplayEnabled == null) {
+                    merged.exceptionReplayEnabled = config.exceptionReplayEnabled;
+                }
+                if (merged.codeOriginEnabled == null) {
+                    merged.codeOriginEnabled = config.codeOriginEnabled;
+                }
+                if (merged.liveDebuggingEnabled == null) {
+                    merged.liveDebuggingEnabled = config.liveDebuggingEnabled;
+                }
+            }
+
+            return merged;
         }
-        if (merged.dynamicInstrumentationEnabled == null) {
-          merged.dynamicInstrumentationEnabled = config.dynamicInstrumentationEnabled;
-        }
-        if (merged.exceptionReplayEnabled == null) {
-          merged.exceptionReplayEnabled = config.exceptionReplayEnabled;
-        }
-        if (merged.codeOriginEnabled == null) {
-          merged.codeOriginEnabled = config.codeOriginEnabled;
-        }
-        if (merged.liveDebuggingEnabled == null) {
-          merged.liveDebuggingEnabled = config.liveDebuggingEnabled;
-        }
-      }
-
-      return merged;
     }
-  }
 
-  /** Holds the raw JSON string and the parsed rule data. */
-  static final class TracingSamplingRules {
-    public final String json;
+    /** Holds the raw JSON string and the parsed rule data. */
+    static final class TracingSamplingRules {
+        public final String json;
 
-    public final List<TracingSamplingRule> data;
+        public final List<TracingSamplingRule> data;
 
-    TracingSamplingRules(String json, List<TracingSamplingRule> data) {
-      this.json = json;
-      this.data = data;
-    }
-  }
-
-  /** Extracts the raw JSON first, so it can be saved, then parses it into rules. */
-  static final class TracingSamplingRulesAdapter {
-    @FromJson
-    TracingSamplingRules fromJson(JsonReader reader, JsonAdapter<List<TracingSamplingRule>> parser)
-        throws IOException {
-      if (reader.peek() == JsonReader.Token.NULL) {
-        return reader.nextNull();
-      }
-      try (BufferedSource source = reader.nextSource()) {
-        String json = source.readUtf8();
-        return new TracingSamplingRules(json, parser.fromJson(json));
-      }
+        TracingSamplingRules(String json, List<TracingSamplingRule> data) {
+            this.json = json;
+            this.data = data;
+        }
     }
 
-    @ToJson
-    String toJson(TracingSamplingRules rules) {
-      return rules.json;
+    /** Extracts the raw JSON first, so it can be saved, then parses it into rules. */
+    static final class TracingSamplingRulesAdapter {
+        @FromJson
+        TracingSamplingRules fromJson(JsonReader reader, JsonAdapter<List<TracingSamplingRule>> parser)
+                throws IOException {
+            if (reader.peek() == JsonReader.Token.NULL) {
+                return reader.nextNull();
+            }
+            try (BufferedSource source = reader.nextSource()) {
+                String json = source.readUtf8();
+                return new TracingSamplingRules(json, parser.fromJson(json));
+            }
+        }
+
+        @ToJson
+        String toJson(TracingSamplingRules rules) {
+            return rules.json;
+        }
     }
-  }
 
-  static final class ServiceMappingEntry implements Map.Entry<String, String> {
-    @Json(name = "from_key")
-    public String fromKey;
+    static final class ServiceMappingEntry implements Map.Entry<String, String> {
+        @Json(name = "from_key")
+        public String fromKey;
 
-    @Json(name = "to_name")
-    public String toName;
+        @Json(name = "to_name")
+        public String toName;
 
-    @Override
-    public String getKey() {
-      return fromKey;
-    }
+        @Override
+        public String getKey() {
+            return fromKey;
+        }
 
-    @Override
-    public String getValue() {
-      return toName;
-    }
+        @Override
+        public String getValue() {
+            return toName;
+        }
 
-    @Override
-    public String setValue(String value) {
-      throw new UnsupportedOperationException();
+        @Override
+        public String setValue(String value) {
+            throw new UnsupportedOperationException();
+        }
     }
-  }
 
-  static final class HeaderTagEntry implements Map.Entry<String, String> {
-    @Json(name = "header")
-    public String header;
+    static final class HeaderTagEntry implements Map.Entry<String, String> {
+        @Json(name = "header")
+        public String header;
 
-    @Json(name = "tag_name")
-    public String tagName;
+        @Json(name = "tag_name")
+        public String tagName;
 
-    @Override
-    public String getKey() {
-      return header;
-    }
+        @Override
+        public String getKey() {
+            return header;
+        }
 
-    @Override
-    public String getValue() {
-      return tagName;
-    }
+        @Override
+        public String getValue() {
+            return tagName;
+        }
 
-    @Override
-    public String setValue(String value) {
-      throw new UnsupportedOperationException();
+        @Override
+        public String setValue(String value) {
+            throw new UnsupportedOperationException();
+        }
     }
-  }
 
-  static final class TracingSamplingRule implements SamplingRule.TraceSamplingRule {
-    @Json(name = "service")
-    public String service;
+    static final class TracingSamplingRule implements SamplingRule.TraceSamplingRule {
+        @Json(name = "service")
+        public String service;
 
-    @Json(name = "name")
-    public String name;
+        @Json(name = "name")
+        public String name;
 
-    @Json(name = "resource")
-    public String resource;
+        @Json(name = "resource")
+        public String resource;
 
-    @Json(name = "tags")
-    public List<SamplingRuleTagEntry> tags;
+        @Json(name = "tags")
+        public List<SamplingRuleTagEntry> tags;
 
-    @Json(name = "sample_rate")
-    public Double sampleRate;
+        @Json(name = "sample_rate")
+        public Double sampleRate;
 
-    @Json(name = "provenance")
-    public String provenance;
+        @Json(name = "provenance")
+        public String provenance;
 
-    private transient Map<String, String> tagMap;
+        private transient Map<String, String> tagMap;
 
-    @Override
-    public String getService() {
-      return service;
-    }
+        @Override
+        public String getService() {
+            return service;
+        }
 
-    @Override
-    public String getName() {
-      return name;
-    }
+        @Override
+        public String getName() {
+            return name;
+        }
 
-    @Override
-    public String getResource() {
-      return resource;
-    }
+        @Override
+        public String getResource() {
+            return resource;
+        }
 
-    @Override
-    public Map<String, String> getTags() {
-      if (null == tagMap) {
-        tagMap =
-            null == tags
-                ? Collections.emptyMap()
-                : tags.stream()
-                    .collect(
-                        Collectors.toMap(
-                            SamplingRuleTagEntry::getKey, e -> normalizeGlob(e.getValue())));
-      }
-      return tagMap;
-    }
+        @Override
+        public Map<String, String> getTags() {
+            if (null == tagMap) {
+                tagMap = null == tags
+                        ? Collections.emptyMap()
+                        : tags.stream()
+                                .collect(Collectors.toMap(
+                                        SamplingRuleTagEntry::getKey, e -> normalizeGlob(e.getValue())));
+            }
+            return tagMap;
+        }
 
-    @Override
-    public double getSampleRate() {
-      return sampleRate;
-    }
+        @Override
+        public double getSampleRate() {
+            return sampleRate;
+        }
 
-    @Override
-    public Provenance getProvenance() {
-      if ("dynamic".equals(provenance)) {
-        return Provenance.DYNAMIC;
-      } else {
-        return Provenance.CUSTOMER;
-      }
+        @Override
+        public Provenance getProvenance() {
+            if ("dynamic".equals(provenance)) {
+                return Provenance.DYNAMIC;
+            } else {
+                return Provenance.CUSTOMER;
+            }
+        }
     }
-  }
 
-  static final class SamplingRuleTagEntry implements Map.Entry<String, String> {
-    @Json(name = "key")
-    public String key;
+    static final class SamplingRuleTagEntry implements Map.Entry<String, String> {
+        @Json(name = "key")
+        public String key;
 
-    @Json(name = "value_glob")
-    public String value;
+        @Json(name = "value_glob")
+        public String value;
 
-    @Override
-    public String getKey() {
-      return key;
-    }
+        @Override
+        public String getKey() {
+            return key;
+        }
 
-    @Override
-    public String getValue() {
-      return value;
-    }
+        @Override
+        public String getValue() {
+            return value;
+        }
 
-    @Override
-    public String setValue(String value) {
-      throw new UnsupportedOperationException();
+        @Override
+        public String setValue(String value) {
+            throw new UnsupportedOperationException();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/baggage/BaggagePropagator.java b/dd-trace-core/src/main/java/datadog/trace/core/baggage/BaggagePropagator.java
index 114f2668790..2f5a8f7c2a4 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/baggage/BaggagePropagator.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/baggage/BaggagePropagator.java
@@ -24,202 +24,202 @@
 
 @ParametersAreNonnullByDefault
 public class BaggagePropagator implements Propagator {
-  private static final Logger LOG = LoggerFactory.getLogger(BaggagePropagator.class);
-  private static final PercentEscaper UTF_ESCAPER = PercentEscaper.create();
-  private static final BaggageMetrics BAGGAGE_METRICS = BaggageMetrics.getInstance();
-  static final String BAGGAGE_KEY = "baggage";
-  private final boolean injectBaggage;
-  private final boolean extractBaggage;
-  private final int maxItems;
-  private final int maxBytes;
-
-  public BaggagePropagator(Config config) {
-    this(
-        config.isBaggageInject(),
-        config.isBaggageExtract(),
-        config.getTraceBaggageMaxItems(),
-        config.getTraceBaggageMaxBytes());
-  }
-
-  // use primarily for testing purposes
-  BaggagePropagator(boolean injectBaggage, boolean extractBaggage, int maxItems, int maxBytes) {
-    this.injectBaggage = injectBaggage;
-    this.extractBaggage = extractBaggage;
-    this.maxItems = maxItems;
-    this.maxBytes = maxBytes;
-  }
-
-  @Override
-  public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {
-    Baggage baggage;
-    if (!this.injectBaggage
-        || this.maxItems == 0
-        || this.maxBytes == 0
-        || context == null
-        || carrier == null
-        || setter == null
-        || (baggage = Baggage.fromContext(context)) == null) {
-      return;
+    private static final Logger LOG = LoggerFactory.getLogger(BaggagePropagator.class);
+    private static final PercentEscaper UTF_ESCAPER = PercentEscaper.create();
+    private static final BaggageMetrics BAGGAGE_METRICS = BaggageMetrics.getInstance();
+    static final String BAGGAGE_KEY = "baggage";
+    private final boolean injectBaggage;
+    private final boolean extractBaggage;
+    private final int maxItems;
+    private final int maxBytes;
+
+    public BaggagePropagator(Config config) {
+        this(
+                config.isBaggageInject(),
+                config.isBaggageExtract(),
+                config.getTraceBaggageMaxItems(),
+                config.getTraceBaggageMaxBytes());
     }
 
-    // Inject cached header if any as optimized path
-    String headerValue = baggage.getW3cHeader();
-    if (headerValue != null) {
-      setter.set(carrier, BAGGAGE_KEY, headerValue);
-      return;
+    // use primarily for testing purposes
+    BaggagePropagator(boolean injectBaggage, boolean extractBaggage, int maxItems, int maxBytes) {
+        this.injectBaggage = injectBaggage;
+        this.extractBaggage = extractBaggage;
+        this.maxItems = maxItems;
+        this.maxBytes = maxBytes;
     }
 
-    int processedItems = 0;
-    int currentBytes = 0;
-    StringBuilder baggageText = new StringBuilder();
-    for (final Map.Entry<String, String> entry : baggage.asMap().entrySet()) {
-      // if there are already baggage items processed, add and allocate bytes for a comma
-      int extraBytes = 1;
-      if (processedItems != 0) {
-        baggageText.append(',');
-        extraBytes++;
-      }
-
-      Escaped escapedKey = UTF_ESCAPER.escapeKey(entry.getKey());
-      Escaped escapedVal = UTF_ESCAPER.escapeValue(entry.getValue());
-
-      baggageText.append(escapedKey.data);
-      baggageText.append('=');
-      baggageText.append(escapedVal.data);
-
-      processedItems++;
-      // reached the max number of baggage items allowed
-      if (processedItems == this.maxItems) {
-        BAGGAGE_METRICS.onBaggageTruncatedByInjectItemLimit();
-        break;
-      }
-      // Drop newest k/v pair if adding it leads to exceeding the limit
-      if (currentBytes + escapedKey.size + escapedVal.size + extraBytes > this.maxBytes) {
-        baggageText.setLength(currentBytes);
-        BAGGAGE_METRICS.onBaggageTruncatedByInjectByteLimit();
-        break;
-      }
-      currentBytes += escapedKey.size + escapedVal.size + extraBytes;
-    }
-
-    headerValue = baggageText.toString();
-    // Save header as cache to re-inject it later if baggage did not change
-    baggage.setW3cHeader(headerValue);
-    setter.set(carrier, BAGGAGE_KEY, headerValue);
-
-    // Record successful baggage injection for telemetry
-    BAGGAGE_METRICS.onBaggageInjected();
-  }
+    @Override
+    public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {
+        Baggage baggage;
+        if (!this.injectBaggage
+                || this.maxItems == 0
+                || this.maxBytes == 0
+                || context == null
+                || carrier == null
+                || setter == null
+                || (baggage = Baggage.fromContext(context)) == null) {
+            return;
+        }
 
-  @Override
-  public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
-    if (!this.extractBaggage || context == null || carrier == null || visitor == null) {
-      return context;
-    }
-    BaggageExtractor baggageExtractor = new BaggageExtractor();
-    visitor.forEachKeyValue(carrier, baggageExtractor);
-    Baggage baggage = baggageExtractor.extracted;
-    if (baggage == null) {
-      return context;
-    }
+        // Inject cached header if any as optimized path
+        String headerValue = baggage.getW3cHeader();
+        if (headerValue != null) {
+            setter.set(carrier, BAGGAGE_KEY, headerValue);
+            return;
+        }
 
-    // Record successful baggage extraction for telemetry
-    BAGGAGE_METRICS.onBaggageExtracted();
+        int processedItems = 0;
+        int currentBytes = 0;
+        StringBuilder baggageText = new StringBuilder();
+        for (final Map.Entry<String, String> entry : baggage.asMap().entrySet()) {
+            // if there are already baggage items processed, add and allocate bytes for a comma
+            int extraBytes = 1;
+            if (processedItems != 0) {
+                baggageText.append(',');
+                extraBytes++;
+            }
+
+            Escaped escapedKey = UTF_ESCAPER.escapeKey(entry.getKey());
+            Escaped escapedVal = UTF_ESCAPER.escapeValue(entry.getValue());
+
+            baggageText.append(escapedKey.data);
+            baggageText.append('=');
+            baggageText.append(escapedVal.data);
+
+            processedItems++;
+            // reached the max number of baggage items allowed
+            if (processedItems == this.maxItems) {
+                BAGGAGE_METRICS.onBaggageTruncatedByInjectItemLimit();
+                break;
+            }
+            // Drop newest k/v pair if adding it leads to exceeding the limit
+            if (currentBytes + escapedKey.size + escapedVal.size + extraBytes > this.maxBytes) {
+                baggageText.setLength(currentBytes);
+                BAGGAGE_METRICS.onBaggageTruncatedByInjectByteLimit();
+                break;
+            }
+            currentBytes += escapedKey.size + escapedVal.size + extraBytes;
+        }
 
-    // TODO: consider a better way to link baggage with the extracted (legacy) TagContext
-    AgentSpan extractedSpan = AgentSpan.fromContext(context);
-    if (extractedSpan != null) {
-      AgentSpanContext extractedSpanContext = extractedSpan.spanContext();
-      if (extractedSpanContext instanceof TagContext) {
-        ((TagContext) extractedSpanContext).setW3CBaggage(baggage);
-      }
-    }
+        headerValue = baggageText.toString();
+        // Save header as cache to re-inject it later if baggage did not change
+        baggage.setW3cHeader(headerValue);
+        setter.set(carrier, BAGGAGE_KEY, headerValue);
 
-    return context.with(baggage);
-  }
-
-  private class BaggageExtractor implements BiConsumer<String, String> {
-    private static final char KEY_VALUE_SEPARATOR = '=';
-    private static final char PAIR_SEPARATOR = ',';
-    @Nullable private Baggage extracted;
-
-    /** URL decode value */
-    private String decode(final String value) {
-      String decoded = value;
-      try {
-        decoded = URLDecoder.decode(value, "UTF-8");
-      } catch (final UnsupportedEncodingException | IllegalArgumentException e) {
-        LOG.debug("Failed to decode {}", value);
-      }
-      return decoded;
+        // Record successful baggage injection for telemetry
+        BAGGAGE_METRICS.onBaggageInjected();
     }
 
-    private Baggage parseBaggageHeaders(String input) {
-      Map<String, String> baggage = new HashMap<>();
-      int start = 0;
-      String w3cHeader = input;
-      int pairSeparatorInd = input.indexOf(PAIR_SEPARATOR);
-      pairSeparatorInd = pairSeparatorInd == -1 ? input.length() : pairSeparatorInd;
-      int kvSeparatorInd = input.indexOf(KEY_VALUE_SEPARATOR);
-      while (kvSeparatorInd != -1) {
-        int end = pairSeparatorInd;
-        boolean limitReached = false;
-        if (baggage.size() >= maxItems) {
-          limitReached = true;
-          BAGGAGE_METRICS.onBaggageTruncatedByExtractItemLimit();
-        } else if (end > maxBytes) {
-          limitReached = true;
-          BAGGAGE_METRICS.onBaggageTruncatedByExtractByteLimit();
-        }
-        if (limitReached) {
-          // if header was not invalidated already, and we go out of range:
-          // - fully invalidate if it's after the first k/v pair,
-          // - otherwise ignore from the current k/v separator
-          w3cHeader = (w3cHeader == null || start == 0) ? null : w3cHeader.substring(0, start - 1);
-          break;
-        }
-        if (kvSeparatorInd > end) {
-          LOG.debug(
-              "Dropping baggage headers due to key with no value {}", input.substring(start, end));
-          BAGGAGE_METRICS.onBaggageMalformed();
-          return null;
+    @Override
+    public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
+        if (!this.extractBaggage || context == null || carrier == null || visitor == null) {
+            return context;
         }
-        String key = decode(input.substring(start, kvSeparatorInd).trim());
-        String value = decode(input.substring(kvSeparatorInd + 1, end).trim());
-        if (key.isEmpty() || value.isEmpty()) {
-          LOG.debug("Dropping baggage headers due to empty k/v {}:{}", key, value);
-          BAGGAGE_METRICS.onBaggageMalformed();
-          return null;
+        BaggageExtractor baggageExtractor = new BaggageExtractor();
+        visitor.forEachKeyValue(carrier, baggageExtractor);
+        Baggage baggage = baggageExtractor.extracted;
+        if (baggage == null) {
+            return context;
         }
-        baggage.put(key, value);
 
-        // need to percent-encode non-ascii headers we pass down
-        if (w3cHeader != null
-            && (UTF_ESCAPER.keyNeedsEncoding(key) || UTF_ESCAPER.valNeedsEncoding(value))) {
-          w3cHeader = null;
-        }
+        // Record successful baggage extraction for telemetry
+        BAGGAGE_METRICS.onBaggageExtracted();
 
-        kvSeparatorInd = input.indexOf(KEY_VALUE_SEPARATOR, pairSeparatorInd + 1);
-        pairSeparatorInd = input.indexOf(PAIR_SEPARATOR, pairSeparatorInd + 1);
-        pairSeparatorInd = pairSeparatorInd == -1 ? input.length() : pairSeparatorInd;
-        start = end + 1;
-      }
+        // TODO: consider a better way to link baggage with the extracted (legacy) TagContext
+        AgentSpan extractedSpan = AgentSpan.fromContext(context);
+        if (extractedSpan != null) {
+            AgentSpanContext extractedSpanContext = extractedSpan.spanContext();
+            if (extractedSpanContext instanceof TagContext) {
+                ((TagContext) extractedSpanContext).setW3CBaggage(baggage);
+            }
+        }
 
-      return baggage.isEmpty() ? null : Baggage.create(baggage, w3cHeader);
+        return context.with(baggage);
     }
 
-    @Override
-    public void accept(String key, @Nullable String value) {
-      if (value == null) {
-        return;
-      }
-      // Only process tags that are relevant to baggage
-      if (BAGGAGE_KEY.equalsIgnoreCase(key)) {
-        Baggage parsed = parseBaggageHeaders(value);
-        if (parsed != null) {
-          this.extracted = parsed;
+    private class BaggageExtractor implements BiConsumer<String, String> {
+        private static final char KEY_VALUE_SEPARATOR = '=';
+        private static final char PAIR_SEPARATOR = ',';
+
+        @Nullable
+        private Baggage extracted;
+
+        /** URL decode value */
+        private String decode(final String value) {
+            String decoded = value;
+            try {
+                decoded = URLDecoder.decode(value, "UTF-8");
+            } catch (final UnsupportedEncodingException | IllegalArgumentException e) {
+                LOG.debug("Failed to decode {}", value);
+            }
+            return decoded;
+        }
+
+        private Baggage parseBaggageHeaders(String input) {
+            Map<String, String> baggage = new HashMap<>();
+            int start = 0;
+            String w3cHeader = input;
+            int pairSeparatorInd = input.indexOf(PAIR_SEPARATOR);
+            pairSeparatorInd = pairSeparatorInd == -1 ? input.length() : pairSeparatorInd;
+            int kvSeparatorInd = input.indexOf(KEY_VALUE_SEPARATOR);
+            while (kvSeparatorInd != -1) {
+                int end = pairSeparatorInd;
+                boolean limitReached = false;
+                if (baggage.size() >= maxItems) {
+                    limitReached = true;
+                    BAGGAGE_METRICS.onBaggageTruncatedByExtractItemLimit();
+                } else if (end > maxBytes) {
+                    limitReached = true;
+                    BAGGAGE_METRICS.onBaggageTruncatedByExtractByteLimit();
+                }
+                if (limitReached) {
+                    // if header was not invalidated already, and we go out of range:
+                    // - fully invalidate if it's after the first k/v pair,
+                    // - otherwise ignore from the current k/v separator
+                    w3cHeader = (w3cHeader == null || start == 0) ? null : w3cHeader.substring(0, start - 1);
+                    break;
+                }
+                if (kvSeparatorInd > end) {
+                    LOG.debug("Dropping baggage headers due to key with no value {}", input.substring(start, end));
+                    BAGGAGE_METRICS.onBaggageMalformed();
+                    return null;
+                }
+                String key = decode(input.substring(start, kvSeparatorInd).trim());
+                String value = decode(input.substring(kvSeparatorInd + 1, end).trim());
+                if (key.isEmpty() || value.isEmpty()) {
+                    LOG.debug("Dropping baggage headers due to empty k/v {}:{}", key, value);
+                    BAGGAGE_METRICS.onBaggageMalformed();
+                    return null;
+                }
+                baggage.put(key, value);
+
+                // need to percent-encode non-ascii headers we pass down
+                if (w3cHeader != null && (UTF_ESCAPER.keyNeedsEncoding(key) || UTF_ESCAPER.valNeedsEncoding(value))) {
+                    w3cHeader = null;
+                }
+
+                kvSeparatorInd = input.indexOf(KEY_VALUE_SEPARATOR, pairSeparatorInd + 1);
+                pairSeparatorInd = input.indexOf(PAIR_SEPARATOR, pairSeparatorInd + 1);
+                pairSeparatorInd = pairSeparatorInd == -1 ? input.length() : pairSeparatorInd;
+                start = end + 1;
+            }
+
+            return baggage.isEmpty() ? null : Baggage.create(baggage, w3cHeader);
+        }
+
+        @Override
+        public void accept(String key, @Nullable String value) {
+            if (value == null) {
+                return;
+            }
+            // Only process tags that are relevant to baggage
+            if (BAGGAGE_KEY.equalsIgnoreCase(key)) {
+                Baggage parsed = parseBaggageHeaders(value);
+                if (parsed != null) {
+                    this.extracted = parsed;
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsContextCarrierAdapter.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsContextCarrierAdapter.java
index 1a3b897a604..b9b4dece31d 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsContextCarrierAdapter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsContextCarrierAdapter.java
@@ -9,25 +9,23 @@
 
 @ParametersAreNonnullByDefault
 public class DataStreamsContextCarrierAdapter
-    implements CarrierSetter<DataStreamsContextCarrier>, CarrierVisitor<DataStreamsContextCarrier> {
+        implements CarrierSetter<DataStreamsContextCarrier>, CarrierVisitor<DataStreamsContextCarrier> {
 
-  public static final DataStreamsContextCarrierAdapter INSTANCE =
-      new DataStreamsContextCarrierAdapter();
+    public static final DataStreamsContextCarrierAdapter INSTANCE = new DataStreamsContextCarrierAdapter();
 
-  private DataStreamsContextCarrierAdapter() {}
+    private DataStreamsContextCarrierAdapter() {}
 
-  @Override
-  public void set(DataStreamsContextCarrier carrier, String key, String value) {
-    carrier.set(key, value);
-  }
+    @Override
+    public void set(DataStreamsContextCarrier carrier, String key, String value) {
+        carrier.set(key, value);
+    }
 
-  @Override
-  public void forEachKeyValue(
-      DataStreamsContextCarrier carrier, BiConsumer<String, String> visitor) {
-    for (Map.Entry<String, ?> entry : carrier.entries()) {
-      if (null != entry.getValue()) {
-        visitor.accept(entry.getKey(), entry.getValue().toString());
-      }
+    @Override
+    public void forEachKeyValue(DataStreamsContextCarrier carrier, BiConsumer<String, String> visitor) {
+        for (Map.Entry<String, ?> entry : carrier.entries()) {
+            if (null != entry.getValue()) {
+                visitor.accept(entry.getKey(), entry.getValue().toString());
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsMonitoring.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsMonitoring.java
index 82d5af02f04..57033a6a94d 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsMonitoring.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsMonitoring.java
@@ -8,25 +8,25 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
 
 public interface DataStreamsMonitoring extends AgentDataStreamsMonitoring, AutoCloseable {
-  void start();
+    void start();
 
-  /**
-   * Gets the propagator for DSM concern.
-   *
-   * @return The propagator for DSM concern.
-   */
-  Propagator propagator();
+    /**
+     * Gets the propagator for DSM concern.
+     *
+     * @return The propagator for DSM concern.
+     */
+    Propagator propagator();
 
-  /**
-   * Injects DSM {@link PathwayContext} into a span {@link AgentSpanContext}.
-   *
-   * @param span The span to update.
-   * @param carrier The carrier of the {@link PathwayContext} to extract and inject.
-   */
-  void mergePathwayContextIntoSpan(AgentSpan span, DataStreamsContextCarrier carrier);
+    /**
+     * Injects DSM {@link PathwayContext} into a span {@link AgentSpanContext}.
+     *
+     * @param span The span to update.
+     * @param carrier The carrier of the {@link PathwayContext} to extract and inject.
+     */
+    void mergePathwayContextIntoSpan(AgentSpan span, DataStreamsContextCarrier carrier);
 
-  void clear();
+    void clear();
 
-  @Override
-  void close();
+    @Override
+    void close();
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsPropagator.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsPropagator.java
index 4258adce274..e2920643560 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsPropagator.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsPropagator.java
@@ -23,88 +23,85 @@
 
 @ParametersAreNonnullByDefault
 public class DataStreamsPropagator implements Propagator {
-  private final DataStreamsMonitoring dataStreamsMonitoring;
-  private final TimeSource timeSource;
-  private final ThreadLocal<String> serviceNameOverride;
+    private final DataStreamsMonitoring dataStreamsMonitoring;
+    private final TimeSource timeSource;
+    private final ThreadLocal<String> serviceNameOverride;
 
-  public DataStreamsPropagator(
-      DataStreamsMonitoring dataStreamsMonitoring,
-      TimeSource timeSource,
-      ThreadLocal<String> serviceNameOverride) {
-    this.dataStreamsMonitoring = dataStreamsMonitoring;
-    this.timeSource = timeSource;
-    this.serviceNameOverride = serviceNameOverride;
-  }
-
-  @Override
-  public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {
-    // TODO Pathway context needs to be stored into its own context element instead of span context
-    AgentSpan span;
-    PathwayContext pathwayContext;
-    DataStreamsContext dsmContext;
-    if ((span = AgentSpan.fromContext(context)) == null
-        || (pathwayContext = span.spanContext().getPathwayContext()) == null
-        || (dsmContext = DataStreamsContext.fromContext(context)) == null
-        || !traceConfig().isDataStreamsEnabled()) {
-      return;
+    public DataStreamsPropagator(
+            DataStreamsMonitoring dataStreamsMonitoring,
+            TimeSource timeSource,
+            ThreadLocal<String> serviceNameOverride) {
+        this.dataStreamsMonitoring = dataStreamsMonitoring;
+        this.timeSource = timeSource;
+        this.serviceNameOverride = serviceNameOverride;
     }
 
-    Consumer<StatsPoint> pointConsumer =
-        dsmContext.sendCheckpoint() ? this.dataStreamsMonitoring::add : pathwayContext::saveStats;
-    pathwayContext.setCheckpoint(dsmContext, pointConsumer);
-    boolean injected = injectPathwayContext(pathwayContext, carrier, setter);
-    if (injected && pathwayContext.getHash() != 0) {
-      span.setTag(PATHWAY_HASH, Long.toUnsignedString(pathwayContext.getHash()));
+    @Override
+    public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {
+        // TODO Pathway context needs to be stored into its own context element instead of span context
+        AgentSpan span;
+        PathwayContext pathwayContext;
+        DataStreamsContext dsmContext;
+        if ((span = AgentSpan.fromContext(context)) == null
+                || (pathwayContext = span.spanContext().getPathwayContext()) == null
+                || (dsmContext = DataStreamsContext.fromContext(context)) == null
+                || !traceConfig().isDataStreamsEnabled()) {
+            return;
+        }
+
+        Consumer<StatsPoint> pointConsumer =
+                dsmContext.sendCheckpoint() ? this.dataStreamsMonitoring::add : pathwayContext::saveStats;
+        pathwayContext.setCheckpoint(dsmContext, pointConsumer);
+        boolean injected = injectPathwayContext(pathwayContext, carrier, setter);
+        if (injected && pathwayContext.getHash() != 0) {
+            span.setTag(PATHWAY_HASH, Long.toUnsignedString(pathwayContext.getHash()));
+        }
     }
-  }
 
-  private <C> boolean injectPathwayContext(
-      PathwayContext pathwayContext, C carrier, CarrierSetter<C> setter) {
-    try {
-      String encodedContext = pathwayContext.encode();
-      if (encodedContext != null) {
-        // LOGGER.debug("Injecting pathway context {}", pathwayContext);
-        setter.set(carrier, PROPAGATION_KEY_BASE64, encodedContext);
-        return true;
-      }
-    } catch (IOException e) {
-      // LOGGER.debug("Unable to set encode pathway context", e);
+    private <C> boolean injectPathwayContext(PathwayContext pathwayContext, C carrier, CarrierSetter<C> setter) {
+        try {
+            String encodedContext = pathwayContext.encode();
+            if (encodedContext != null) {
+                // LOGGER.debug("Injecting pathway context {}", pathwayContext);
+                setter.set(carrier, PROPAGATION_KEY_BASE64, encodedContext);
+                return true;
+            }
+        } catch (IOException e) {
+            // LOGGER.debug("Unable to set encode pathway context", e);
+        }
+        return false;
     }
-    return false;
-  }
 
-  @Override
-  public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
-    // TODO Pathway context needs to be stored into its own context element instead of span context
-    PathwayContext pathwayContext;
-    // Ensure if DSM is enabled and look for pathway context
-    if (traceConfig().isDataStreamsEnabled()
-        && (pathwayContext = extractDsmPathwayContext(carrier, visitor)) != null) {
-      // Get span context to store pathway context into
-      TagContext spanContext = getSpanContextOrNull(context);
-      if (spanContext == null) {
-        spanContext = new TagContext();
-        AgentSpan span = fromSpanContext(spanContext);
-        context = root().with(span);
-      }
-      // Store pathway context into span context
-      spanContext.withPathwayContext(pathwayContext);
+    @Override
+    public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
+        // TODO Pathway context needs to be stored into its own context element instead of span context
+        PathwayContext pathwayContext;
+        // Ensure if DSM is enabled and look for pathway context
+        if (traceConfig().isDataStreamsEnabled()
+                && (pathwayContext = extractDsmPathwayContext(carrier, visitor)) != null) {
+            // Get span context to store pathway context into
+            TagContext spanContext = getSpanContextOrNull(context);
+            if (spanContext == null) {
+                spanContext = new TagContext();
+                AgentSpan span = fromSpanContext(spanContext);
+                context = root().with(span);
+            }
+            // Store pathway context into span context
+            spanContext.withPathwayContext(pathwayContext);
+        }
+        return context;
     }
-    return context;
-  }
 
-  private TagContext getSpanContextOrNull(Context context) {
-    AgentSpan extractedSpan = AgentSpan.fromContext(context);
-    AgentSpanContext extractedSpanContext;
-    if (extractedSpan != null
-        && (extractedSpanContext = extractedSpan.spanContext()) instanceof TagContext) {
-      return (TagContext) extractedSpanContext;
+    private TagContext getSpanContextOrNull(Context context) {
+        AgentSpan extractedSpan = AgentSpan.fromContext(context);
+        AgentSpanContext extractedSpanContext;
+        if (extractedSpan != null && (extractedSpanContext = extractedSpan.spanContext()) instanceof TagContext) {
+            return (TagContext) extractedSpanContext;
+        }
+        return null;
     }
-    return null;
-  }
 
-  private <C> PathwayContext extractDsmPathwayContext(C carrier, CarrierVisitor<C> visitor) {
-    return DefaultPathwayContext.extract(
-        carrier, visitor, this.timeSource, serviceNameOverride.get());
-  }
+    private <C> PathwayContext extractDsmPathwayContext(C carrier, CarrierVisitor<C> visitor) {
+        return DefaultPathwayContext.extract(carrier, visitor, this.timeSource, serviceNameOverride.get());
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsTransactionExtractors.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsTransactionExtractors.java
index 52088e97888..e418b7860b0 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsTransactionExtractors.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsTransactionExtractors.java
@@ -16,134 +16,129 @@
 import org.slf4j.LoggerFactory;
 
 public class DataStreamsTransactionExtractors {
-  public static final DataStreamsTransactionExtractors EMPTY =
-      new DataStreamsTransactionExtractors("[]", Collections.emptyList());
-  private static final Logger LOG = LoggerFactory.getLogger(DataStreamsTransactionExtractors.class);
-  private static final Moshi MOSHI =
-      new Moshi.Builder()
-          .add(new DataStreamsTransactionExtractors.DataStreamsTransactionExtractorAdapter())
-          .build();
-  private static final ParameterizedType LIST_OF_RULES =
-      Types.newParameterizedType(List.class, DataStreamsTransactionExtractorImpl.class);
-  public static final JsonAdapter<List<DataStreamsTransactionExtractor>> LIST_OF_RULES_ADAPTER =
-      MOSHI.adapter(LIST_OF_RULES);
-
-  private final List<DataStreamsTransactionExtractor> extractors;
-  private final String json;
-
-  public DataStreamsTransactionExtractors(
-      String json, List<DataStreamsTransactionExtractor> extractors) {
-    this.extractors = Collections.unmodifiableList(extractors);
-    this.json = json;
-  }
-
-  public static DataStreamsTransactionExtractors deserialize(String json) {
-    try {
-      return new DataStreamsTransactionExtractors(json, LIST_OF_RULES_ADAPTER.fromJson(json));
-    } catch (Throwable ex) {
-      LOG.debug("Couldn't parse Data Streams Extractors from JSON: {}", json, ex);
+    public static final DataStreamsTransactionExtractors EMPTY =
+            new DataStreamsTransactionExtractors("[]", Collections.emptyList());
+    private static final Logger LOG = LoggerFactory.getLogger(DataStreamsTransactionExtractors.class);
+    private static final Moshi MOSHI = new Moshi.Builder()
+            .add(new DataStreamsTransactionExtractors.DataStreamsTransactionExtractorAdapter())
+            .build();
+    private static final ParameterizedType LIST_OF_RULES =
+            Types.newParameterizedType(List.class, DataStreamsTransactionExtractorImpl.class);
+    public static final JsonAdapter<List<DataStreamsTransactionExtractor>> LIST_OF_RULES_ADAPTER =
+            MOSHI.adapter(LIST_OF_RULES);
+
+    private final List<DataStreamsTransactionExtractor> extractors;
+    private final String json;
+
+    public DataStreamsTransactionExtractors(String json, List<DataStreamsTransactionExtractor> extractors) {
+        this.extractors = Collections.unmodifiableList(extractors);
+        this.json = json;
     }
 
-    return EMPTY;
-  }
+    public static DataStreamsTransactionExtractors deserialize(String json) {
+        try {
+            return new DataStreamsTransactionExtractors(json, LIST_OF_RULES_ADAPTER.fromJson(json));
+        } catch (Throwable ex) {
+            LOG.debug("Couldn't parse Data Streams Extractors from JSON: {}", json, ex);
+        }
 
-  public List<DataStreamsTransactionExtractor> getExtractors() {
-    return extractors;
-  }
-
-  private static final class JsonDataStreamsTransactionExtractor {
-    private static final JsonAdapter<JsonDataStreamsTransactionExtractor> jsonAdapter =
-        MOSHI.adapter(JsonDataStreamsTransactionExtractor.class);
-    String name;
-    String type;
-    String value;
-
-    @Override
-    public String toString() {
-      return jsonAdapter.toJson(this);
-    }
-  }
-
-  public static final class DataStreamsTransactionExtractorsAdapter {
-    @FromJson
-    DataStreamsTransactionExtractors fromJson(
-        JsonReader reader, JsonAdapter<List<DataStreamsTransactionExtractor>> parser)
-        throws IOException {
-      if (reader.peek() == JsonReader.Token.NULL) {
-        return reader.nextNull();
-      }
-      try (BufferedSource source = reader.nextSource()) {
-        String json = source.readUtf8();
-        return new DataStreamsTransactionExtractors(json, parser.fromJson(json));
-      }
+        return EMPTY;
     }
 
-    @ToJson
-    String toJson(DataStreamsTransactionExtractors extractors) {
-      return extractors.json;
+    public List<DataStreamsTransactionExtractor> getExtractors() {
+        return extractors;
     }
-  }
-
-  public static final class DataStreamsTransactionExtractorAdapter {
-    private static DataStreamsTransactionExtractor create(
-        JsonDataStreamsTransactionExtractor jsonExtractor) {
-
-      DataStreamsTransactionExtractor.Type type;
-      try {
-        type = DataStreamsTransactionExtractor.Type.valueOf(jsonExtractor.type);
-      } catch (Throwable ex) {
-        type = DataStreamsTransactionExtractor.Type.UNKNOWN;
-      }
 
-      return new DataStreamsTransactionExtractorImpl(jsonExtractor.name, type, jsonExtractor.value);
+    private static final class JsonDataStreamsTransactionExtractor {
+        private static final JsonAdapter<JsonDataStreamsTransactionExtractor> jsonAdapter =
+                MOSHI.adapter(JsonDataStreamsTransactionExtractor.class);
+        String name;
+        String type;
+        String value;
+
+        @Override
+        public String toString() {
+            return jsonAdapter.toJson(this);
+        }
     }
 
-    @FromJson
-    DataStreamsTransactionExtractor fromJson(JsonDataStreamsTransactionExtractor jsonExtractor) {
-      return create(jsonExtractor);
+    public static final class DataStreamsTransactionExtractorsAdapter {
+        @FromJson
+        DataStreamsTransactionExtractors fromJson(
+                JsonReader reader, JsonAdapter<List<DataStreamsTransactionExtractor>> parser) throws IOException {
+            if (reader.peek() == JsonReader.Token.NULL) {
+                return reader.nextNull();
+            }
+            try (BufferedSource source = reader.nextSource()) {
+                String json = source.readUtf8();
+                return new DataStreamsTransactionExtractors(json, parser.fromJson(json));
+            }
+        }
+
+        @ToJson
+        String toJson(DataStreamsTransactionExtractors extractors) {
+            return extractors.json;
+        }
     }
 
-    @ToJson
-    JsonDataStreamsTransactionExtractor toJson(DataStreamsTransactionExtractor extractor) {
-      throw new UnsupportedOperationException();
-    }
-  }
-
-  public static final class DataStreamsTransactionExtractorImpl
-      implements DataStreamsTransactionExtractor {
-    private final String name;
-    private final DataStreamsTransactionExtractor.Type type;
-    private final String value;
-
-    public DataStreamsTransactionExtractorImpl(
-        final String name, final DataStreamsTransactionExtractor.Type type, final String value) {
-      this.name = name;
-      this.type = type;
-      this.value = value;
-    }
+    public static final class DataStreamsTransactionExtractorAdapter {
+        private static DataStreamsTransactionExtractor create(JsonDataStreamsTransactionExtractor jsonExtractor) {
 
-    public String getName() {
-      return name;
-    }
+            DataStreamsTransactionExtractor.Type type;
+            try {
+                type = DataStreamsTransactionExtractor.Type.valueOf(jsonExtractor.type);
+            } catch (Throwable ex) {
+                type = DataStreamsTransactionExtractor.Type.UNKNOWN;
+            }
 
-    public DataStreamsTransactionExtractor.Type getType() {
-      return type;
-    }
+            return new DataStreamsTransactionExtractorImpl(jsonExtractor.name, type, jsonExtractor.value);
+        }
+
+        @FromJson
+        DataStreamsTransactionExtractor fromJson(JsonDataStreamsTransactionExtractor jsonExtractor) {
+            return create(jsonExtractor);
+        }
 
-    public String getValue() {
-      return value;
+        @ToJson
+        JsonDataStreamsTransactionExtractor toJson(DataStreamsTransactionExtractor extractor) {
+            throw new UnsupportedOperationException();
+        }
     }
 
-    @Override
-    public String toString() {
-      return "DataStreamsTransactionExtractorImpl{"
-          + "name='"
-          + name
-          + "', type='"
-          + type.name()
-          + "', value='"
-          + value
-          + "'}";
+    public static final class DataStreamsTransactionExtractorImpl implements DataStreamsTransactionExtractor {
+        private final String name;
+        private final DataStreamsTransactionExtractor.Type type;
+        private final String value;
+
+        public DataStreamsTransactionExtractorImpl(
+                final String name, final DataStreamsTransactionExtractor.Type type, final String value) {
+            this.name = name;
+            this.type = type;
+            this.value = value;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public DataStreamsTransactionExtractor.Type getType() {
+            return type;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return "DataStreamsTransactionExtractorImpl{"
+                    + "name='"
+                    + name
+                    + "', type='"
+                    + type.name()
+                    + "', value='"
+                    + value
+                    + "'}";
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DatastreamsPayloadWriter.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DatastreamsPayloadWriter.java
index b0ddf1f9870..40da04da3e8 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DatastreamsPayloadWriter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DatastreamsPayloadWriter.java
@@ -3,5 +3,5 @@
 import java.util.Collection;
 
 public interface DatastreamsPayloadWriter {
-  void writePayload(Collection<StatsBucket> data, String serviceNameOverride);
+    void writePayload(Collection<StatsBucket> data, String serviceNameOverride);
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java
index 61b403a22e4..affdc80126c 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java
@@ -56,552 +56,516 @@
 import org.slf4j.LoggerFactory;
 
 public class DefaultDataStreamsMonitoring implements DataStreamsMonitoring, EventListener {
-  private static final Logger log = LoggerFactory.getLogger(DefaultDataStreamsMonitoring.class);
-
-  static final long FEATURE_CHECK_INTERVAL_NANOS = TimeUnit.MINUTES.toNanos(5);
-  static final long MAX_TRANSACTION_CONTAINER_SIZE = 1024 * 512;
-
-  private static final StatsPoint REPORT =
-      new StatsPoint(DataStreamsTags.EMPTY, 0, 0, 0, 0, 0, 0, 0, null);
-  private static final StatsPoint POISON_PILL =
-      new StatsPoint(DataStreamsTags.EMPTY, 0, 0, 0, 0, 0, 0, 0, null);
-
-  private final Map<Long, Map<String, StatsBucket>> timeToBucket = new HashMap<>();
-  private final MessagePassingQueue<InboxItem> inbox = Queues.mpscArrayQueue(1024);
-  private final DatastreamsPayloadWriter payloadWriter;
-  private final DDAgentFeaturesDiscovery features;
-  private final TimeSource timeSource;
-  private final Supplier<TraceConfig> traceConfigSupplier;
-  private final long bucketDurationNanos;
-  private final Thread thread;
-  private final DataStreamsPropagator propagator;
-  private AgentTaskScheduler.Scheduled<DefaultDataStreamsMonitoring> cancellation;
-  private volatile long nextFeatureCheck;
-  private volatile boolean supportsDataStreams = false;
-  private volatile boolean agentSupportsDataStreams = false;
-  private volatile boolean configSupportsDataStreams = false;
-  private static final ThreadLocal<String> serviceNameOverride = new ThreadLocal<>();
-
-  // contains a list of active extractors by type. Thread-safe via volatile with immutable
-  // snapshots.
-  private volatile Map<DataStreamsTransactionExtractor.Type, List<DataStreamsTransactionExtractor>>
-      extractorsByType;
-
-  public DefaultDataStreamsMonitoring(
-      Config config,
-      SharedCommunicationObjects sharedCommunicationObjects,
-      TimeSource timeSource,
-      Supplier<TraceConfig> traceConfigSupplier) {
-    this(
-        new OkHttpSink(
-            sharedCommunicationObjects.agentHttpClient,
-            sharedCommunicationObjects.agentUrl.toString(),
-            V01_DATASTREAMS_ENDPOINT,
-            false,
-            true,
-            Collections.emptyMap()),
-        sharedCommunicationObjects.featuresDiscovery(config),
-        timeSource,
-        traceConfigSupplier,
-        config);
-  }
-
-  public DefaultDataStreamsMonitoring(
-      Sink sink,
-      DDAgentFeaturesDiscovery features,
-      TimeSource timeSource,
-      Supplier<TraceConfig> traceConfigSupplier,
-      Config config) {
-    this(
-        sink,
-        features,
-        timeSource,
-        traceConfigSupplier,
-        new MsgPackDatastreamsPayloadWriter(
-            sink, config.getWellKnownTags(), DDTraceCoreInfo.VERSION, config.getPrimaryTag()),
-        Config.get().getDataStreamsBucketDurationNanoseconds());
-  }
-
-  public DefaultDataStreamsMonitoring(
-      Sink sink,
-      DDAgentFeaturesDiscovery features,
-      TimeSource timeSource,
-      Supplier<TraceConfig> traceConfigSupplier,
-      DatastreamsPayloadWriter payloadWriter,
-      long bucketDurationNanos) {
-    this.features = features;
-    this.timeSource = timeSource;
-    this.traceConfigSupplier = traceConfigSupplier;
-    this.payloadWriter = payloadWriter;
-    this.bucketDurationNanos = bucketDurationNanos;
-
-    thread = newAgentThread(DATA_STREAMS_MONITORING, new InboxProcessor());
-    sink.register(this);
-
-    this.propagator = new DataStreamsPropagator(this, this.timeSource, serviceNameOverride);
-    DataStreamsTags.setServiceNameOverride(serviceNameOverride);
-  }
-
-  @Override
-  public void start() {
-    checkDynamicConfig();
-    cancellation =
-        AgentTaskScheduler.get()
-            .scheduleAtFixedRate(
-                new ReportTask(),
-                this,
-                bucketDurationNanos,
-                bucketDurationNanos,
-                TimeUnit.NANOSECONDS);
-    thread.start();
-  }
-
-  @Override
-  public void add(StatsPoint statsPoint) {
-    if (thread.isAlive()) {
-      inbox.offer(statsPoint);
-    }
-  }
-
-  @Override
-  public void setProduceCheckpoint(String type, String target) {
-    setProduceCheckpoint(type, target, DataStreamsContextCarrier.NoOp.INSTANCE, false);
-  }
-
-  @Override
-  public void setThreadServiceName(String serviceName) {
-    if (serviceName == null) {
-      clearThreadServiceName();
-      return;
-    }
-
-    serviceNameOverride.set(serviceName);
-  }
-
-  @Override
-  public void clearThreadServiceName() {
-    serviceNameOverride.remove();
-  }
-
-  @Override
-  public void trackTransaction(String transactionId, String checkpointName) {
-    inbox.offer(
-        new TransactionInfo(transactionId, timeSource.getCurrentTimeNanos(), checkpointName));
-  }
-
-  @Override
-  public void trackTransaction(
-      AgentSpan span,
-      DataStreamsTransactionExtractor.Type extractorType,
-      Object source,
-      TransactionSourceReader sourceReader) {
-    if (!supportsDataStreams || source == null || extractorsByType == null) {
-      return;
-    }
-
-    List<DataStreamsTransactionExtractor> extractorList = extractorsByType.get(extractorType);
-    if (extractorList == null) {
-      return;
-    }
-
-    for (DataStreamsTransactionExtractor extractor : extractorList) {
-      String transactionId = sourceReader.readHeader(source, extractor.getValue());
-      if (transactionId != null && !transactionId.isEmpty()) {
-        trackTransaction(transactionId, extractor.getName());
-
-        span.setTag(Tags.DSM_TRANSACTION_ID, transactionId);
-        span.setTag(Tags.DSM_TRANSACTION_CHECKPOINT, extractor.getName());
-      }
-    }
-  }
-
-  private static String getThreadServiceName() {
-    return serviceNameOverride.get();
-  }
-
-  @Override
-  public PathwayContext newPathwayContext() {
-    if (configSupportsDataStreams) {
-      return new DefaultPathwayContext(timeSource, getThreadServiceName());
-    } else {
-      return NoopPathwayContext.INSTANCE;
-    }
-  }
-
-  @Override
-  public Propagator propagator() {
-    return this.propagator;
-  }
-
-  @Override
-  public void mergePathwayContextIntoSpan(AgentSpan span, DataStreamsContextCarrier carrier) {
-    if (span instanceof DDSpan) {
-      DefaultPathwayContext pathwayContext =
-          DefaultPathwayContext.extract(
-              carrier,
-              DataStreamsContextCarrierAdapter.INSTANCE,
-              this.timeSource,
-              getThreadServiceName());
-      ((DDSpan) span).spanContext().mergePathwayContext(pathwayContext);
-    }
-  }
-
-  @Override
-  public void trackBacklog(DataStreamsTags tags, long value) {
-    inbox.offer(new Backlog(tags, value, timeSource.getCurrentTimeNanos(), getThreadServiceName()));
-  }
-
-  @Override
-  public void reportSchemaRegistryUsage(
-      String topic,
-      String clusterId,
-      int schemaId,
-      boolean isSuccess,
-      boolean isKey,
-      String operation) {
-    inbox.offer(
-        new SchemaRegistryUsage(
-            topic,
-            clusterId,
-            schemaId,
-            isSuccess,
-            isKey,
-            operation,
-            timeSource.getCurrentTimeNanos(),
-            getThreadServiceName()));
-  }
-
-  @Override
-  public void reportKafkaConfig(
-      String type, String kafkaClusterId, String consumerGroup, Map<String, String> config) {
-    inbox.offer(
-        new KafkaConfigReport(
-            type,
-            kafkaClusterId,
-            consumerGroup,
-            config,
-            timeSource.getCurrentTimeNanos(),
-            getThreadServiceName()));
-  }
-
-  @Override
-  public void reportKafkaConsumerGroupMember(
-      String kafkaClusterId,
-      String consumerGroup,
-      String memberId,
-      int generationId,
-      String memberProtocol) {
-    inbox.offer(
-        new KafkaConfigReport(
-            "kafka_consumer",
-            kafkaClusterId,
-            consumerGroup,
-            memberId,
-            generationId,
-            memberProtocol,
-            Collections.<String, String>emptyMap(),
-            timeSource.getCurrentTimeNanos(),
-            getThreadServiceName()));
-  }
-
-  @Override
-  public void setCheckpoint(AgentSpan span, DataStreamsContext context) {
-    PathwayContext pathwayContext = span.spanContext().getPathwayContext();
-    if (pathwayContext != null) {
-      pathwayContext.setCheckpoint(context, this::add);
-      long pathwayHash = pathwayContext.getHash();
-      if (pathwayHash != 0) {
-        span.setTag(PATHWAY_HASH, Long.toUnsignedString(pathwayHash));
-      }
-    }
-  }
-
-  @Override
-  public void setConsumeCheckpoint(String type, String source, DataStreamsContextCarrier carrier) {
-    setConsumeCheckpoint(type, source, carrier, true);
-  }
-
-  public void setConsumeCheckpoint(
-      String type, String source, DataStreamsContextCarrier carrier, Boolean isManual) {
-    if (type == null || type.isEmpty() || source == null || source.isEmpty()) {
-      log.warn("setConsumeCheckpoint should be called with non-empty type and source");
-      return;
-    }
-
-    AgentSpan span = activeSpan();
-    if (span == null) {
-      log.warn("SetConsumeCheckpoint is called with no active span");
-      return;
-    }
-    mergePathwayContextIntoSpan(span, carrier);
-
-    DataStreamsTags tags;
-    if (isManual) {
-      tags = createManual(type, INBOUND, source);
-    } else {
-      tags = create(type, INBOUND, source);
-    }
-
-    setCheckpoint(span, fromTags(tags));
-  }
-
-  public void setProduceCheckpoint(
-      String type, String target, DataStreamsContextCarrier carrier, boolean manualCheckpoint) {
-    if (type == null || type.isEmpty() || target == null || target.isEmpty()) {
-      log.warn("SetProduceCheckpoint should be called with non-empty type and target");
-      return;
-    }
-
-    AgentSpan span = activeSpan();
-    if (span == null) {
-      log.warn("SetProduceCheckpoint is called with no active span");
-      return;
-    }
-    DataStreamsTags tags;
-    if (manualCheckpoint) {
-      tags = createManual(type, OUTBOUND, target);
-    } else {
-      tags = create(type, OUTBOUND, target);
-    }
-
-    DataStreamsContext dsmContext = fromTags(tags);
-    this.propagator.inject(
-        span.with(dsmContext), carrier, DataStreamsContextCarrierAdapter.INSTANCE);
-  }
-
-  @Override
-  public void setProduceCheckpoint(String type, String target, DataStreamsContextCarrier carrier) {
-    setProduceCheckpoint(type, target, carrier, true);
-  }
-
-  @Override
-  public void close() {
-    if (null != cancellation) {
-      cancellation.cancel();
-    }
-
-    inbox.offer(POISON_PILL);
-    try {
-      thread.join(THREAD_JOIN_TIMOUT_MS);
-    } catch (InterruptedException ignored) {
-    }
-  }
-
-  private class InboxProcessor implements Runnable {
-
-    private StatsBucket getStatsBucket(final long timestamp, final String serviceNameOverride) {
-      long bucket = currentBucket(timestamp);
-      Map<String, StatsBucket> statsBucketMap =
-          timeToBucket.computeIfAbsent(bucket, startTime -> new HashMap<>(1));
-      return statsBucketMap.computeIfAbsent(
-          serviceNameOverride, s -> new StatsBucket(bucket, bucketDurationNanos));
+    private static final Logger log = LoggerFactory.getLogger(DefaultDataStreamsMonitoring.class);
+
+    static final long FEATURE_CHECK_INTERVAL_NANOS = TimeUnit.MINUTES.toNanos(5);
+    static final long MAX_TRANSACTION_CONTAINER_SIZE = 1024 * 512;
+
+    private static final StatsPoint REPORT = new StatsPoint(DataStreamsTags.EMPTY, 0, 0, 0, 0, 0, 0, 0, null);
+    private static final StatsPoint POISON_PILL = new StatsPoint(DataStreamsTags.EMPTY, 0, 0, 0, 0, 0, 0, 0, null);
+
+    private final Map<Long, Map<String, StatsBucket>> timeToBucket = new HashMap<>();
+    private final MessagePassingQueue<InboxItem> inbox = Queues.mpscArrayQueue(1024);
+    private final DatastreamsPayloadWriter payloadWriter;
+    private final DDAgentFeaturesDiscovery features;
+    private final TimeSource timeSource;
+    private final Supplier<TraceConfig> traceConfigSupplier;
+    private final long bucketDurationNanos;
+    private final Thread thread;
+    private final DataStreamsPropagator propagator;
+    private AgentTaskScheduler.Scheduled<DefaultDataStreamsMonitoring> cancellation;
+    private volatile long nextFeatureCheck;
+    private volatile boolean supportsDataStreams = false;
+    private volatile boolean agentSupportsDataStreams = false;
+    private volatile boolean configSupportsDataStreams = false;
+    private static final ThreadLocal<String> serviceNameOverride = new ThreadLocal<>();
+
+    // contains a list of active extractors by type. Thread-safe via volatile with immutable
+    // snapshots.
+    private volatile Map<DataStreamsTransactionExtractor.Type, List<DataStreamsTransactionExtractor>> extractorsByType;
+
+    public DefaultDataStreamsMonitoring(
+            Config config,
+            SharedCommunicationObjects sharedCommunicationObjects,
+            TimeSource timeSource,
+            Supplier<TraceConfig> traceConfigSupplier) {
+        this(
+                new OkHttpSink(
+                        sharedCommunicationObjects.agentHttpClient,
+                        sharedCommunicationObjects.agentUrl.toString(),
+                        V01_DATASTREAMS_ENDPOINT,
+                        false,
+                        true,
+                        Collections.emptyMap()),
+                sharedCommunicationObjects.featuresDiscovery(config),
+                timeSource,
+                traceConfigSupplier,
+                config);
+    }
+
+    public DefaultDataStreamsMonitoring(
+            Sink sink,
+            DDAgentFeaturesDiscovery features,
+            TimeSource timeSource,
+            Supplier<TraceConfig> traceConfigSupplier,
+            Config config) {
+        this(
+                sink,
+                features,
+                timeSource,
+                traceConfigSupplier,
+                new MsgPackDatastreamsPayloadWriter(
+                        sink, config.getWellKnownTags(), DDTraceCoreInfo.VERSION, config.getPrimaryTag()),
+                Config.get().getDataStreamsBucketDurationNanoseconds());
+    }
+
+    public DefaultDataStreamsMonitoring(
+            Sink sink,
+            DDAgentFeaturesDiscovery features,
+            TimeSource timeSource,
+            Supplier<TraceConfig> traceConfigSupplier,
+            DatastreamsPayloadWriter payloadWriter,
+            long bucketDurationNanos) {
+        this.features = features;
+        this.timeSource = timeSource;
+        this.traceConfigSupplier = traceConfigSupplier;
+        this.payloadWriter = payloadWriter;
+        this.bucketDurationNanos = bucketDurationNanos;
+
+        thread = newAgentThread(DATA_STREAMS_MONITORING, new InboxProcessor());
+        sink.register(this);
+
+        this.propagator = new DataStreamsPropagator(this, this.timeSource, serviceNameOverride);
+        DataStreamsTags.setServiceNameOverride(serviceNameOverride);
     }
 
     @Override
-    public void run() {
+    public void start() {
+        checkDynamicConfig();
+        cancellation = AgentTaskScheduler.get()
+                .scheduleAtFixedRate(
+                        new ReportTask(), this, bucketDurationNanos, bucketDurationNanos, TimeUnit.NANOSECONDS);
+        thread.start();
+    }
 
-      if (features.getDataStreamsEndpoint() == null) {
-        features.discoverIfOutdated();
-      }
+    @Override
+    public void add(StatsPoint statsPoint) {
+        if (thread.isAlive()) {
+            inbox.offer(statsPoint);
+        }
+    }
+
+    @Override
+    public void setProduceCheckpoint(String type, String target) {
+        setProduceCheckpoint(type, target, DataStreamsContextCarrier.NoOp.INSTANCE, false);
+    }
+
+    @Override
+    public void setThreadServiceName(String serviceName) {
+        if (serviceName == null) {
+            clearThreadServiceName();
+            return;
+        }
+
+        serviceNameOverride.set(serviceName);
+    }
+
+    @Override
+    public void clearThreadServiceName() {
+        serviceNameOverride.remove();
+    }
+
+    @Override
+    public void trackTransaction(String transactionId, String checkpointName) {
+        inbox.offer(new TransactionInfo(transactionId, timeSource.getCurrentTimeNanos(), checkpointName));
+    }
+
+    @Override
+    public void trackTransaction(
+            AgentSpan span,
+            DataStreamsTransactionExtractor.Type extractorType,
+            Object source,
+            TransactionSourceReader sourceReader) {
+        if (!supportsDataStreams || source == null || extractorsByType == null) {
+            return;
+        }
+
+        List<DataStreamsTransactionExtractor> extractorList = extractorsByType.get(extractorType);
+        if (extractorList == null) {
+            return;
+        }
+
+        for (DataStreamsTransactionExtractor extractor : extractorList) {
+            String transactionId = sourceReader.readHeader(source, extractor.getValue());
+            if (transactionId != null && !transactionId.isEmpty()) {
+                trackTransaction(transactionId, extractor.getName());
+
+                span.setTag(Tags.DSM_TRANSACTION_ID, transactionId);
+                span.setTag(Tags.DSM_TRANSACTION_CHECKPOINT, extractor.getName());
+            }
+        }
+    }
+
+    private static String getThreadServiceName() {
+        return serviceNameOverride.get();
+    }
+
+    @Override
+    public PathwayContext newPathwayContext() {
+        if (configSupportsDataStreams) {
+            return new DefaultPathwayContext(timeSource, getThreadServiceName());
+        } else {
+            return NoopPathwayContext.INSTANCE;
+        }
+    }
+
+    @Override
+    public Propagator propagator() {
+        return this.propagator;
+    }
+
+    @Override
+    public void mergePathwayContextIntoSpan(AgentSpan span, DataStreamsContextCarrier carrier) {
+        if (span instanceof DDSpan) {
+            DefaultPathwayContext pathwayContext = DefaultPathwayContext.extract(
+                    carrier, DataStreamsContextCarrierAdapter.INSTANCE, this.timeSource, getThreadServiceName());
+            ((DDSpan) span).spanContext().mergePathwayContext(pathwayContext);
+        }
+    }
+
+    @Override
+    public void trackBacklog(DataStreamsTags tags, long value) {
+        inbox.offer(new Backlog(tags, value, timeSource.getCurrentTimeNanos(), getThreadServiceName()));
+    }
+
+    @Override
+    public void reportSchemaRegistryUsage(
+            String topic, String clusterId, int schemaId, boolean isSuccess, boolean isKey, String operation) {
+        inbox.offer(new SchemaRegistryUsage(
+                topic,
+                clusterId,
+                schemaId,
+                isSuccess,
+                isKey,
+                operation,
+                timeSource.getCurrentTimeNanos(),
+                getThreadServiceName()));
+    }
+
+    @Override
+    public void reportKafkaConfig(
+            String type, String kafkaClusterId, String consumerGroup, Map<String, String> config) {
+        inbox.offer(new KafkaConfigReport(
+                type, kafkaClusterId, consumerGroup, config, timeSource.getCurrentTimeNanos(), getThreadServiceName()));
+    }
+
+    @Override
+    public void reportKafkaConsumerGroupMember(
+            String kafkaClusterId, String consumerGroup, String memberId, int generationId, String memberProtocol) {
+        inbox.offer(new KafkaConfigReport(
+                "kafka_consumer",
+                kafkaClusterId,
+                consumerGroup,
+                memberId,
+                generationId,
+                memberProtocol,
+                Collections.<String, String>emptyMap(),
+                timeSource.getCurrentTimeNanos(),
+                getThreadServiceName()));
+    }
+
+    @Override
+    public void setCheckpoint(AgentSpan span, DataStreamsContext context) {
+        PathwayContext pathwayContext = span.spanContext().getPathwayContext();
+        if (pathwayContext != null) {
+            pathwayContext.setCheckpoint(context, this::add);
+            long pathwayHash = pathwayContext.getHash();
+            if (pathwayHash != 0) {
+                span.setTag(PATHWAY_HASH, Long.toUnsignedString(pathwayHash));
+            }
+        }
+    }
+
+    @Override
+    public void setConsumeCheckpoint(String type, String source, DataStreamsContextCarrier carrier) {
+        setConsumeCheckpoint(type, source, carrier, true);
+    }
+
+    public void setConsumeCheckpoint(String type, String source, DataStreamsContextCarrier carrier, Boolean isManual) {
+        if (type == null || type.isEmpty() || source == null || source.isEmpty()) {
+            log.warn("setConsumeCheckpoint should be called with non-empty type and source");
+            return;
+        }
+
+        AgentSpan span = activeSpan();
+        if (span == null) {
+            log.warn("SetConsumeCheckpoint is called with no active span");
+            return;
+        }
+        mergePathwayContextIntoSpan(span, carrier);
+
+        DataStreamsTags tags;
+        if (isManual) {
+            tags = createManual(type, INBOUND, source);
+        } else {
+            tags = create(type, INBOUND, source);
+        }
 
-      agentSupportsDataStreams = features.supportsDataStreams();
-      checkDynamicConfig();
-      // only load extractors on startup
-      updateExtractorsFromConfig();
+        setCheckpoint(span, fromTags(tags));
+    }
 
-      if (!configSupportsDataStreams) {
-        log.debug("Data streams is disabled");
-      } else if (!agentSupportsDataStreams) {
-        log.debug("Data streams is disabled or not supported by agent");
-      }
+    public void setProduceCheckpoint(
+            String type, String target, DataStreamsContextCarrier carrier, boolean manualCheckpoint) {
+        if (type == null || type.isEmpty() || target == null || target.isEmpty()) {
+            log.warn("SetProduceCheckpoint should be called with non-empty type and target");
+            return;
+        }
 
-      nextFeatureCheck = timeSource.getCurrentTimeNanos() + FEATURE_CHECK_INTERVAL_NANOS;
+        AgentSpan span = activeSpan();
+        if (span == null) {
+            log.warn("SetProduceCheckpoint is called with no active span");
+            return;
+        }
+        DataStreamsTags tags;
+        if (manualCheckpoint) {
+            tags = createManual(type, OUTBOUND, target);
+        } else {
+            tags = create(type, OUTBOUND, target);
+        }
 
-      Thread currentThread = Thread.currentThread();
-      while (!currentThread.isInterrupted()) {
+        DataStreamsContext dsmContext = fromTags(tags);
+        this.propagator.inject(span.with(dsmContext), carrier, DataStreamsContextCarrierAdapter.INSTANCE);
+    }
+
+    @Override
+    public void setProduceCheckpoint(String type, String target, DataStreamsContextCarrier carrier) {
+        setProduceCheckpoint(type, target, carrier, true);
+    }
+
+    @Override
+    public void close() {
+        if (null != cancellation) {
+            cancellation.cancel();
+        }
+
+        inbox.offer(POISON_PILL);
         try {
-          InboxItem payload = inbox.poll();
-          if (payload == null) {
-            Thread.sleep(10);
-            continue;
-          }
+            thread.join(THREAD_JOIN_TIMOUT_MS);
+        } catch (InterruptedException ignored) {
+        }
+    }
+
+    private class InboxProcessor implements Runnable {
+
+        private StatsBucket getStatsBucket(final long timestamp, final String serviceNameOverride) {
+            long bucket = currentBucket(timestamp);
+            Map<String, StatsBucket> statsBucketMap =
+                    timeToBucket.computeIfAbsent(bucket, startTime -> new HashMap<>(1));
+            return statsBucketMap.computeIfAbsent(
+                    serviceNameOverride, s -> new StatsBucket(bucket, bucketDurationNanos));
+        }
+
+        @Override
+        public void run() {
+
+            if (features.getDataStreamsEndpoint() == null) {
+                features.discoverIfOutdated();
+            }
 
-          if (payload == REPORT) {
+            agentSupportsDataStreams = features.supportsDataStreams();
             checkDynamicConfig();
+            // only load extractors on startup
+            updateExtractorsFromConfig();
 
-            if (supportsDataStreams) {
-              flush(timeSource.getCurrentTimeNanos());
-            } else if (timeSource.getCurrentTimeNanos() >= nextFeatureCheck) {
-              checkFeatures();
+            if (!configSupportsDataStreams) {
+                log.debug("Data streams is disabled");
+            } else if (!agentSupportsDataStreams) {
+                log.debug("Data streams is disabled or not supported by agent");
             }
-          } else if (payload == POISON_PILL) {
-            if (supportsDataStreams) {
-              flush(Long.MAX_VALUE);
+
+            nextFeatureCheck = timeSource.getCurrentTimeNanos() + FEATURE_CHECK_INTERVAL_NANOS;
+
+            Thread currentThread = Thread.currentThread();
+            while (!currentThread.isInterrupted()) {
+                try {
+                    InboxItem payload = inbox.poll();
+                    if (payload == null) {
+                        Thread.sleep(10);
+                        continue;
+                    }
+
+                    if (payload == REPORT) {
+                        checkDynamicConfig();
+
+                        if (supportsDataStreams) {
+                            flush(timeSource.getCurrentTimeNanos());
+                        } else if (timeSource.getCurrentTimeNanos() >= nextFeatureCheck) {
+                            checkFeatures();
+                        }
+                    } else if (payload == POISON_PILL) {
+                        if (supportsDataStreams) {
+                            flush(Long.MAX_VALUE);
+                        }
+                        break;
+                    } else if (supportsDataStreams) {
+                        if (payload instanceof StatsPoint) {
+                            StatsPoint statsPoint = (StatsPoint) payload;
+                            StatsBucket statsBucket =
+                                    getStatsBucket(statsPoint.getTimestampNanos(), statsPoint.getServiceNameOverride());
+                            statsBucket.addPoint(statsPoint);
+                        } else if (payload instanceof Backlog) {
+                            Backlog backlog = (Backlog) payload;
+                            StatsBucket statsBucket =
+                                    getStatsBucket(backlog.getTimestampNanos(), backlog.getServiceNameOverride());
+                            statsBucket.addBacklog(backlog);
+                        } else if (payload instanceof TransactionInfo) {
+                            TransactionInfo transactionInfo = (TransactionInfo) payload;
+                            StatsBucket statsBucket = getStatsBucket(transactionInfo.getTimestamp(), "");
+                            statsBucket.addTransaction(transactionInfo);
+                            // we want to force flush when the transaction payload gets too big
+                            // with 512kb and approx 20 bytes per transaction we're looking at ~26k
+                            // transaction/sec
+                            // this should be enough for 99.9% of the users
+                            if (statsBucket.getTransactions().getSize() >= MAX_TRANSACTION_CONTAINER_SIZE) {
+                                inbox.offer(REPORT);
+                            }
+                        } else if (payload instanceof SchemaRegistryUsage) {
+                            SchemaRegistryUsage usage = (SchemaRegistryUsage) payload;
+                            StatsBucket statsBucket =
+                                    getStatsBucket(usage.getTimestampNanos(), usage.getServiceNameOverride());
+                            statsBucket.addSchemaRegistryUsage(usage);
+                        } else if (payload instanceof KafkaConfigReport) {
+                            KafkaConfigReport configReport = (KafkaConfigReport) payload;
+                            StatsBucket statsBucket = getStatsBucket(
+                                    configReport.getTimestampNanos(), configReport.getServiceNameOverride());
+                            statsBucket.addKafkaConfig(configReport);
+                        }
+                    }
+                } catch (Exception e) {
+                    log.debug("Error monitoring data streams", e);
+                }
             }
-            break;
-          } else if (supportsDataStreams) {
-            if (payload instanceof StatsPoint) {
-              StatsPoint statsPoint = (StatsPoint) payload;
-              StatsBucket statsBucket =
-                  getStatsBucket(
-                      statsPoint.getTimestampNanos(), statsPoint.getServiceNameOverride());
-              statsBucket.addPoint(statsPoint);
-            } else if (payload instanceof Backlog) {
-              Backlog backlog = (Backlog) payload;
-              StatsBucket statsBucket =
-                  getStatsBucket(backlog.getTimestampNanos(), backlog.getServiceNameOverride());
-              statsBucket.addBacklog(backlog);
-            } else if (payload instanceof TransactionInfo) {
-              TransactionInfo transactionInfo = (TransactionInfo) payload;
-              StatsBucket statsBucket = getStatsBucket(transactionInfo.getTimestamp(), "");
-              statsBucket.addTransaction(transactionInfo);
-              // we want to force flush when the transaction payload gets too big
-              // with 512kb and approx 20 bytes per transaction we're looking at ~26k
-              // transaction/sec
-              // this should be enough for 99.9% of the users
-              if (statsBucket.getTransactions().getSize() >= MAX_TRANSACTION_CONTAINER_SIZE) {
-                inbox.offer(REPORT);
-              }
-            } else if (payload instanceof SchemaRegistryUsage) {
-              SchemaRegistryUsage usage = (SchemaRegistryUsage) payload;
-              StatsBucket statsBucket =
-                  getStatsBucket(usage.getTimestampNanos(), usage.getServiceNameOverride());
-              statsBucket.addSchemaRegistryUsage(usage);
-            } else if (payload instanceof KafkaConfigReport) {
-              KafkaConfigReport configReport = (KafkaConfigReport) payload;
-              StatsBucket statsBucket =
-                  getStatsBucket(
-                      configReport.getTimestampNanos(), configReport.getServiceNameOverride());
-              statsBucket.addKafkaConfig(configReport);
+        }
+    }
+
+    private long currentBucket(long timestampNanos) {
+        return timestampNanos - (timestampNanos % bucketDurationNanos);
+    }
+
+    private void flush(long timestampNanos) {
+        long currentBucket = currentBucket(timestampNanos);
+
+        // stats are grouped by time buckets and service names
+        Map<String, List<StatsBucket>> includedBuckets = new HashMap<>();
+        Iterator<Map.Entry<Long, Map<String, StatsBucket>>> mapIterator =
+                timeToBucket.entrySet().iterator();
+
+        while (mapIterator.hasNext()) {
+            Map.Entry<Long, Map<String, StatsBucket>> entry = mapIterator.next();
+            if (entry.getKey() < currentBucket) {
+                mapIterator.remove();
+                for (Map.Entry<String, StatsBucket> buckets : entry.getValue().entrySet()) {
+                    if (!includedBuckets.containsKey(buckets.getKey())) {
+                        includedBuckets.put(buckets.getKey(), new LinkedList<>());
+                    }
+
+                    includedBuckets.get(buckets.getKey()).add(buckets.getValue());
+                }
             }
-          }
-        } catch (Exception e) {
-          log.debug("Error monitoring data streams", e);
         }
-      }
+
+        if (!includedBuckets.isEmpty()) {
+            for (Map.Entry<String, List<StatsBucket>> entry : includedBuckets.entrySet()) {
+                if (!entry.getValue().isEmpty()) {
+                    log.debug("Flushing {} buckets ({})", entry.getValue(), entry.getKey());
+                    payloadWriter.writePayload(entry.getValue(), entry.getKey());
+                }
+            }
+        }
+    }
+
+    @Override
+    public void clear() {
+        timeToBucket.clear();
+    }
+
+    @VisibleForTesting
+    public void report() {
+        inbox.offer(REPORT);
+    }
+
+    @Override
+    public void onEvent(EventType eventType, String message) {
+        switch (eventType) {
+            case DOWNGRADED:
+                log.debug("Agent downgrade was detected");
+                checkFeatures();
+                break;
+            case BAD_PAYLOAD:
+                log.debug("bad metrics payload sent to trace agent: {}", message);
+                break;
+            case ERROR:
+                log.debug("trace agent errored receiving metrics payload: {}", message);
+                break;
+            default:
+        }
     }
-  }
 
-  private long currentBucket(long timestampNanos) {
-    return timestampNanos - (timestampNanos % bucketDurationNanos);
-  }
+    /* updateExtractorsFromConfig can be called to update extractors at runtime */
+    private void updateExtractorsFromConfig() {
+        if (!supportsDataStreams) {
+            return;
+        }
+
+        List<DataStreamsTransactionExtractor> extractors =
+                traceConfigSupplier.get().getDataStreamsTransactionExtractors();
+        if (extractors == null) {
+            return;
+        }
 
-  private void flush(long timestampNanos) {
-    long currentBucket = currentBucket(timestampNanos);
+        // Build a new immutable snapshot
+        Map<DataStreamsTransactionExtractor.Type, List<DataStreamsTransactionExtractor>> newMap =
+                new EnumMap<>(DataStreamsTransactionExtractor.Type.class);
 
-    // stats are grouped by time buckets and service names
-    Map<String, List<StatsBucket>> includedBuckets = new HashMap<>();
-    Iterator<Map.Entry<Long, Map<String, StatsBucket>>> mapIterator =
-        timeToBucket.entrySet().iterator();
+        // we support up to MAX_NUM_EXTRACTORS
+        for (int i = 0; i < Math.min(extractors.size(), MAX_NUM_EXTRACTORS); i++) {
+            DataStreamsTransactionExtractor extractor = extractors.get(i);
+            List<DataStreamsTransactionExtractor> list =
+                    newMap.computeIfAbsent(extractor.getType(), k -> new ArrayList<>());
+            list.add(extractor);
+        }
 
-    while (mapIterator.hasNext()) {
-      Map.Entry<Long, Map<String, StatsBucket>> entry = mapIterator.next();
-      if (entry.getKey() < currentBucket) {
-        mapIterator.remove();
-        for (Map.Entry<String, StatsBucket> buckets : entry.getValue().entrySet()) {
-          if (!includedBuckets.containsKey(buckets.getKey())) {
-            includedBuckets.put(buckets.getKey(), new LinkedList<>());
-          }
+        extractorsByType = newMap;
+        log.debug("Added {} data streams transaction extractors", extractors.size());
+    }
 
-          includedBuckets.get(buckets.getKey()).add(buckets.getValue());
+    private void checkDynamicConfig() {
+        configSupportsDataStreams = traceConfigSupplier.get().isDataStreamsEnabled();
+        supportsDataStreams = agentSupportsDataStreams && configSupportsDataStreams;
+    }
+
+    private void checkFeatures() {
+        boolean oldValue = agentSupportsDataStreams;
+
+        features.discoverIfOutdated();
+        agentSupportsDataStreams = features.supportsDataStreams();
+        if (oldValue && !agentSupportsDataStreams && configSupportsDataStreams) {
+            log.info("Disabling data streams reporting because it is not supported by the agent");
+        } else if (!oldValue && agentSupportsDataStreams && configSupportsDataStreams) {
+            log.info("Agent upgrade detected. Enabling data streams because it is now supported");
+        } else if (!oldValue && agentSupportsDataStreams && !configSupportsDataStreams) {
+            log.info("Agent upgrade detected. Not enabling data streams because it is disabled by config");
         }
-      }
+
+        supportsDataStreams = agentSupportsDataStreams && configSupportsDataStreams;
+
+        nextFeatureCheck = timeSource.getCurrentTimeNanos() + FEATURE_CHECK_INTERVAL_NANOS;
     }
 
-    if (!includedBuckets.isEmpty()) {
-      for (Map.Entry<String, List<StatsBucket>> entry : includedBuckets.entrySet()) {
-        if (!entry.getValue().isEmpty()) {
-          log.debug("Flushing {} buckets ({})", entry.getValue(), entry.getKey());
-          payloadWriter.writePayload(entry.getValue(), entry.getKey());
+    private static final class ReportTask implements AgentTaskScheduler.Task<DefaultDataStreamsMonitoring> {
+        @Override
+        public void run(DefaultDataStreamsMonitoring target) {
+            target.report();
         }
-      }
-    }
-  }
-
-  @Override
-  public void clear() {
-    timeToBucket.clear();
-  }
-
-  @VisibleForTesting
-  public void report() {
-    inbox.offer(REPORT);
-  }
-
-  @Override
-  public void onEvent(EventType eventType, String message) {
-    switch (eventType) {
-      case DOWNGRADED:
-        log.debug("Agent downgrade was detected");
-        checkFeatures();
-        break;
-      case BAD_PAYLOAD:
-        log.debug("bad metrics payload sent to trace agent: {}", message);
-        break;
-      case ERROR:
-        log.debug("trace agent errored receiving metrics payload: {}", message);
-        break;
-      default:
-    }
-  }
-
-  /* updateExtractorsFromConfig can be called to update extractors at runtime */
-  private void updateExtractorsFromConfig() {
-    if (!supportsDataStreams) {
-      return;
-    }
-
-    List<DataStreamsTransactionExtractor> extractors =
-        traceConfigSupplier.get().getDataStreamsTransactionExtractors();
-    if (extractors == null) {
-      return;
-    }
-
-    // Build a new immutable snapshot
-    Map<DataStreamsTransactionExtractor.Type, List<DataStreamsTransactionExtractor>> newMap =
-        new EnumMap<>(DataStreamsTransactionExtractor.Type.class);
-
-    // we support up to MAX_NUM_EXTRACTORS
-    for (int i = 0; i < Math.min(extractors.size(), MAX_NUM_EXTRACTORS); i++) {
-      DataStreamsTransactionExtractor extractor = extractors.get(i);
-      List<DataStreamsTransactionExtractor> list =
-          newMap.computeIfAbsent(extractor.getType(), k -> new ArrayList<>());
-      list.add(extractor);
-    }
-
-    extractorsByType = newMap;
-    log.debug("Added {} data streams transaction extractors", extractors.size());
-  }
-
-  private void checkDynamicConfig() {
-    configSupportsDataStreams = traceConfigSupplier.get().isDataStreamsEnabled();
-    supportsDataStreams = agentSupportsDataStreams && configSupportsDataStreams;
-  }
-
-  private void checkFeatures() {
-    boolean oldValue = agentSupportsDataStreams;
-
-    features.discoverIfOutdated();
-    agentSupportsDataStreams = features.supportsDataStreams();
-    if (oldValue && !agentSupportsDataStreams && configSupportsDataStreams) {
-      log.info("Disabling data streams reporting because it is not supported by the agent");
-    } else if (!oldValue && agentSupportsDataStreams && configSupportsDataStreams) {
-      log.info("Agent upgrade detected. Enabling data streams because it is now supported");
-    } else if (!oldValue && agentSupportsDataStreams && !configSupportsDataStreams) {
-      log.info(
-          "Agent upgrade detected. Not enabling data streams because it is disabled by config");
-    }
-
-    supportsDataStreams = agentSupportsDataStreams && configSupportsDataStreams;
-
-    nextFeatureCheck = timeSource.getCurrentTimeNanos() + FEATURE_CHECK_INTERVAL_NANOS;
-  }
-
-  private static final class ReportTask
-      implements AgentTaskScheduler.Task<DefaultDataStreamsMonitoring> {
-    @Override
-    public void run(DefaultDataStreamsMonitoring target) {
-      target.report();
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java
index a6a11610d33..ef7d692f215 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java
@@ -24,251 +24,238 @@
 import org.slf4j.LoggerFactory;
 
 public class DefaultPathwayContext implements PathwayContext {
-  private static final Logger log = LoggerFactory.getLogger(DefaultPathwayContext.class);
-  private final TimeSource timeSource;
-  private final String serviceNameOverride;
-  private final GrowingByteArrayOutput outputBuffer =
-      GrowingByteArrayOutput.withInitialCapacity(20);
-
-  // pathwayStartNanos is nanoseconds since epoch
-  // Nano ticks is necessary because time differences should use a monotonically increasing clock
-  // ticks is not comparable across JVMs
-  private long pathwayStartNanos;
-  private long pathwayStartNanoTicks;
-  private long edgeStartNanoTicks;
-  private StatsPoint savedStats;
-  private long hash;
-  private boolean started;
-  // state variables used to memoize the pathway hash with
-  // direction != current direction
-  private long closestOppositeDirectionHash;
-  private DataStreamsTags.Direction previousDirection;
-
-  public DefaultPathwayContext(TimeSource timeSource, String serviceNameOverride) {
-    this.timeSource = timeSource;
-    this.serviceNameOverride = serviceNameOverride;
-  }
-
-  private DefaultPathwayContext(
-      TimeSource timeSource,
-      long pathwayStartNanos,
-      long pathwayStartNanoTicks,
-      long edgeStartNanoTicks,
-      long hash,
-      String serviceNameOverride) {
-    this(timeSource, serviceNameOverride);
-    this.pathwayStartNanos = pathwayStartNanos;
-    this.pathwayStartNanoTicks = pathwayStartNanoTicks;
-    this.edgeStartNanoTicks = edgeStartNanoTicks;
-    this.hash = hash;
-    this.closestOppositeDirectionHash = hash;
-    this.started = true;
-  }
-
-  @Override
-  public boolean isStarted() {
-    return started;
-  }
-
-  @Override
-  public long getHash() {
-    return hash;
-  }
-
-  @Override
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_METHOD_SYNCHRONIZATION",
-      justification =
-          "Agent-internal pathway object; instances do not escape to application code that could synchronize on the monitor.")
-  public synchronized void setCheckpoint(
-      DataStreamsContext context, Consumer<StatsPoint> pointConsumer) {
-    long startNanos = timeSource.getCurrentTimeNanos();
-    long nanoTicks = timeSource.getNanoTicks();
-
-    if (!started) {
-      long defaultTimestamp = context.defaultTimestamp();
-      if (defaultTimestamp == 0) {
-        pathwayStartNanos = startNanos;
-        pathwayStartNanoTicks = nanoTicks;
-        edgeStartNanoTicks = nanoTicks;
-      } else {
-        pathwayStartNanos = MILLISECONDS.toNanos(defaultTimestamp);
-        pathwayStartNanoTicks =
-            nanoTicks - MILLISECONDS.toNanos(timeSource.getCurrentTimeMillis() - defaultTimestamp);
-        edgeStartNanoTicks = pathwayStartNanoTicks;
-      }
-
-      hash = 0;
-      started = true;
-      log.debug("Started {}", this);
+    private static final Logger log = LoggerFactory.getLogger(DefaultPathwayContext.class);
+    private final TimeSource timeSource;
+    private final String serviceNameOverride;
+    private final GrowingByteArrayOutput outputBuffer = GrowingByteArrayOutput.withInitialCapacity(20);
+
+    // pathwayStartNanos is nanoseconds since epoch
+    // Nano ticks is necessary because time differences should use a monotonically increasing clock
+    // ticks is not comparable across JVMs
+    private long pathwayStartNanos;
+    private long pathwayStartNanoTicks;
+    private long edgeStartNanoTicks;
+    private StatsPoint savedStats;
+    private long hash;
+    private boolean started;
+    // state variables used to memoize the pathway hash with
+    // direction != current direction
+    private long closestOppositeDirectionHash;
+    private DataStreamsTags.Direction previousDirection;
+
+    public DefaultPathwayContext(TimeSource timeSource, String serviceNameOverride) {
+        this.timeSource = timeSource;
+        this.serviceNameOverride = serviceNameOverride;
     }
 
-    // generate node hash
-    long nodeHash = context.tags().getHash();
-    // loop protection - a node should not be chosen as parent
-    // for a sequential node with the same direction, as this
-    // will cause a `cardinality explosion` for hash / parentHash tag values
-    DataStreamsTags.Direction direction = context.tags().getDirectionValue();
-    if (direction == previousDirection && previousDirection != null) {
-      hash = closestOppositeDirectionHash;
-    } else {
-      previousDirection = direction;
-      closestOppositeDirectionHash = hash;
+    private DefaultPathwayContext(
+            TimeSource timeSource,
+            long pathwayStartNanos,
+            long pathwayStartNanoTicks,
+            long edgeStartNanoTicks,
+            long hash,
+            String serviceNameOverride) {
+        this(timeSource, serviceNameOverride);
+        this.pathwayStartNanos = pathwayStartNanos;
+        this.pathwayStartNanoTicks = pathwayStartNanoTicks;
+        this.edgeStartNanoTicks = edgeStartNanoTicks;
+        this.hash = hash;
+        this.closestOppositeDirectionHash = hash;
+        this.started = true;
     }
 
-    long newHash = generatePathwayHash(nodeHash, hash);
-    long aggregationHash =
-        FNV64Hash.continueHash(
-            context.tags().getAggregationHash(),
-            DataStreamsTags.longToBytes(newHash),
-            FNV64Hash.Version.v1);
-
-    long pathwayLatencyNano = nanoTicks - pathwayStartNanoTicks;
-    long edgeLatencyNano = nanoTicks - edgeStartNanoTicks;
-
-    StatsPoint point =
-        new StatsPoint(
-            context.tags(),
-            newHash,
-            hash,
-            aggregationHash,
-            startNanos,
-            pathwayLatencyNano,
-            edgeLatencyNano,
-            context.payloadSizeBytes(),
-            serviceNameOverride);
-    edgeStartNanoTicks = nanoTicks;
-    hash = newHash;
-
-    pointConsumer.accept(point);
-  }
-
-  @Override
-  public void saveStats(StatsPoint point) {
-    this.savedStats = point;
-  }
-
-  @Override
-  public StatsPoint getSavedStats() {
-    return this.savedStats;
-  }
-
-  @Override
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_METHOD_SYNCHRONIZATION",
-      justification =
-          "Agent-internal pathway object; instances do not escape to application code that could synchronize on the monitor.")
-  public synchronized String encode() throws IOException {
-    if (!started) {
-      throw new IllegalStateException("Context must be started to encode");
+    @Override
+    public boolean isStarted() {
+        return started;
     }
 
-    outputBuffer.clear();
-    outputBuffer.writeLongLE(hash);
-
-    long pathwayStartMillis = TimeUnit.NANOSECONDS.toMillis(pathwayStartNanos);
-    VarEncodingHelper.encodeSignedVarLong(outputBuffer, pathwayStartMillis);
-
-    long edgeStartMillis =
-        pathwayStartMillis
-            + TimeUnit.NANOSECONDS.toMillis(edgeStartNanoTicks - pathwayStartNanoTicks);
-
-    VarEncodingHelper.encodeSignedVarLong(outputBuffer, edgeStartMillis);
-    byte[] base64 = Base64.getEncoder().encode(outputBuffer.trimmedCopy());
-    return new String(base64, ISO_8859_1);
-  }
-
-  @Override
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_METHOD_SYNCHRONIZATION",
-      justification =
-          "Agent-internal pathway object; instances do not escape to application code that could synchronize on the monitor.")
-  public synchronized String toString() {
-    if (started) {
-      return "PathwayContext[ Hash "
-          + Long.toUnsignedString(hash)
-          + ", Start: "
-          + pathwayStartNanos
-          + ", StartTicks: "
-          + pathwayStartNanoTicks
-          + ", Edge Start Ticks: "
-          + edgeStartNanoTicks
-          + ", objectHashcode:"
-          + hashCode()
-          + "]";
-    } else {
-      return "PathwayContext [Not Started]";
+    @Override
+    public long getHash() {
+        return hash;
     }
-  }
 
-  private static class PathwayContextExtractor implements BiConsumer<String, String> {
-    private final TimeSource timeSource;
-    private final String serviceNameOverride;
-    private DefaultPathwayContext extractedContext;
+    @Override
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_METHOD_SYNCHRONIZATION",
+            justification =
+                    "Agent-internal pathway object; instances do not escape to application code that could synchronize on the monitor.")
+    public synchronized void setCheckpoint(DataStreamsContext context, Consumer<StatsPoint> pointConsumer) {
+        long startNanos = timeSource.getCurrentTimeNanos();
+        long nanoTicks = timeSource.getNanoTicks();
+
+        if (!started) {
+            long defaultTimestamp = context.defaultTimestamp();
+            if (defaultTimestamp == 0) {
+                pathwayStartNanos = startNanos;
+                pathwayStartNanoTicks = nanoTicks;
+                edgeStartNanoTicks = nanoTicks;
+            } else {
+                pathwayStartNanos = MILLISECONDS.toNanos(defaultTimestamp);
+                pathwayStartNanoTicks =
+                        nanoTicks - MILLISECONDS.toNanos(timeSource.getCurrentTimeMillis() - defaultTimestamp);
+                edgeStartNanoTicks = pathwayStartNanoTicks;
+            }
+
+            hash = 0;
+            started = true;
+            log.debug("Started {}", this);
+        }
+
+        // generate node hash
+        long nodeHash = context.tags().getHash();
+        // loop protection - a node should not be chosen as parent
+        // for a sequential node with the same direction, as this
+        // will cause a `cardinality explosion` for hash / parentHash tag values
+        DataStreamsTags.Direction direction = context.tags().getDirectionValue();
+        if (direction == previousDirection && previousDirection != null) {
+            hash = closestOppositeDirectionHash;
+        } else {
+            previousDirection = direction;
+            closestOppositeDirectionHash = hash;
+        }
+
+        long newHash = generatePathwayHash(nodeHash, hash);
+        long aggregationHash = FNV64Hash.continueHash(
+                context.tags().getAggregationHash(), DataStreamsTags.longToBytes(newHash), FNV64Hash.Version.v1);
+
+        long pathwayLatencyNano = nanoTicks - pathwayStartNanoTicks;
+        long edgeLatencyNano = nanoTicks - edgeStartNanoTicks;
+
+        StatsPoint point = new StatsPoint(
+                context.tags(),
+                newHash,
+                hash,
+                aggregationHash,
+                startNanos,
+                pathwayLatencyNano,
+                edgeLatencyNano,
+                context.payloadSizeBytes(),
+                serviceNameOverride);
+        edgeStartNanoTicks = nanoTicks;
+        hash = newHash;
+
+        pointConsumer.accept(point);
+    }
+
+    @Override
+    public void saveStats(StatsPoint point) {
+        this.savedStats = point;
+    }
+
+    @Override
+    public StatsPoint getSavedStats() {
+        return this.savedStats;
+    }
+
+    @Override
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_METHOD_SYNCHRONIZATION",
+            justification =
+                    "Agent-internal pathway object; instances do not escape to application code that could synchronize on the monitor.")
+    public synchronized String encode() throws IOException {
+        if (!started) {
+            throw new IllegalStateException("Context must be started to encode");
+        }
+
+        outputBuffer.clear();
+        outputBuffer.writeLongLE(hash);
 
-    PathwayContextExtractor(TimeSource timeSource, String serviceNameOverride) {
-      this.timeSource = timeSource;
-      this.serviceNameOverride = serviceNameOverride;
+        long pathwayStartMillis = TimeUnit.NANOSECONDS.toMillis(pathwayStartNanos);
+        VarEncodingHelper.encodeSignedVarLong(outputBuffer, pathwayStartMillis);
+
+        long edgeStartMillis =
+                pathwayStartMillis + TimeUnit.NANOSECONDS.toMillis(edgeStartNanoTicks - pathwayStartNanoTicks);
+
+        VarEncodingHelper.encodeSignedVarLong(outputBuffer, edgeStartMillis);
+        byte[] base64 = Base64.getEncoder().encode(outputBuffer.trimmedCopy());
+        return new String(base64, ISO_8859_1);
     }
 
     @Override
-    public void accept(String key, String value) {
-      if (value != null && PROPAGATION_KEY_BASE64.equalsIgnoreCase(key)) {
-        try {
-          extractedContext = decode(timeSource, serviceNameOverride, value);
-        } catch (Throwable ignored) {
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_METHOD_SYNCHRONIZATION",
+            justification =
+                    "Agent-internal pathway object; instances do not escape to application code that could synchronize on the monitor.")
+    public synchronized String toString() {
+        if (started) {
+            return "PathwayContext[ Hash "
+                    + Long.toUnsignedString(hash)
+                    + ", Start: "
+                    + pathwayStartNanos
+                    + ", StartTicks: "
+                    + pathwayStartNanoTicks
+                    + ", Edge Start Ticks: "
+                    + edgeStartNanoTicks
+                    + ", objectHashcode:"
+                    + hashCode()
+                    + "]";
+        } else {
+            return "PathwayContext [Not Started]";
+        }
+    }
+
+    private static class PathwayContextExtractor implements BiConsumer<String, String> {
+        private final TimeSource timeSource;
+        private final String serviceNameOverride;
+        private DefaultPathwayContext extractedContext;
+
+        PathwayContextExtractor(TimeSource timeSource, String serviceNameOverride) {
+            this.timeSource = timeSource;
+            this.serviceNameOverride = serviceNameOverride;
+        }
+
+        @Override
+        public void accept(String key, String value) {
+            if (value != null && PROPAGATION_KEY_BASE64.equalsIgnoreCase(key)) {
+                try {
+                    extractedContext = decode(timeSource, serviceNameOverride, value);
+                } catch (Throwable ignored) {
+                }
+            }
         }
-      }
     }
-  }
-
-  static <C> DefaultPathwayContext extract(
-      C carrier, CarrierVisitor<C> getter, TimeSource timeSource, String serviceNameOverride) {
-    PathwayContextExtractor extractor =
-        new PathwayContextExtractor(timeSource, serviceNameOverride);
-    getter.forEachKeyValue(carrier, extractor);
-    if (extractor.extractedContext == null) {
-      log.debug("No context extracted");
-    } else {
-      log.debug("Extracted context: {} ", extractor.extractedContext);
+
+    static <C> DefaultPathwayContext extract(
+            C carrier, CarrierVisitor<C> getter, TimeSource timeSource, String serviceNameOverride) {
+        PathwayContextExtractor extractor = new PathwayContextExtractor(timeSource, serviceNameOverride);
+        getter.forEachKeyValue(carrier, extractor);
+        if (extractor.extractedContext == null) {
+            log.debug("No context extracted");
+        } else {
+            log.debug("Extracted context: {} ", extractor.extractedContext);
+        }
+        return extractor.extractedContext;
+    }
+
+    protected static DefaultPathwayContext decode(TimeSource timeSource, String serviceNameOverride, String base64)
+            throws IOException {
+        byte[] base64Bytes = base64.getBytes(UTF_8);
+        byte[] bytes = Base64.getDecoder().decode(base64Bytes);
+        ByteArrayInput input = ByteArrayInput.wrap(bytes);
+
+        long hash = input.readLongLE();
+
+        long pathwayStartMillis = VarEncodingHelper.decodeSignedVarLong(input);
+        long pathwayStartNanos = TimeUnit.MILLISECONDS.toNanos(pathwayStartMillis);
+
+        // Convert the start time to the current JVM's nano clock
+        long nowNanos = timeSource.getCurrentTimeNanos();
+        long nanosSinceStart = nowNanos - pathwayStartNanos;
+        long nowNanoTicks = timeSource.getNanoTicks();
+        long pathwayStartNanoTicks = nowNanoTicks - nanosSinceStart;
+
+        long edgeStartMillis = VarEncodingHelper.decodeSignedVarLong(input);
+        long edgeStartNanoTicks =
+                pathwayStartNanoTicks + TimeUnit.MILLISECONDS.toNanos(edgeStartMillis - pathwayStartMillis);
+
+        return new DefaultPathwayContext(
+                timeSource, pathwayStartNanos, pathwayStartNanoTicks, edgeStartNanoTicks, hash, serviceNameOverride);
+    }
+
+    private long generatePathwayHash(long nodeHash, long parentHash) {
+        outputBuffer.clear();
+        outputBuffer.writeLongLE(nodeHash);
+        outputBuffer.writeLongLE(parentHash);
+        return FNV64Hash.generateHash(outputBuffer.backingArray(), 0, 16, FNV64Hash.Version.v1);
     }
-    return extractor.extractedContext;
-  }
-
-  protected static DefaultPathwayContext decode(
-      TimeSource timeSource, String serviceNameOverride, String base64) throws IOException {
-    byte[] base64Bytes = base64.getBytes(UTF_8);
-    byte[] bytes = Base64.getDecoder().decode(base64Bytes);
-    ByteArrayInput input = ByteArrayInput.wrap(bytes);
-
-    long hash = input.readLongLE();
-
-    long pathwayStartMillis = VarEncodingHelper.decodeSignedVarLong(input);
-    long pathwayStartNanos = TimeUnit.MILLISECONDS.toNanos(pathwayStartMillis);
-
-    // Convert the start time to the current JVM's nano clock
-    long nowNanos = timeSource.getCurrentTimeNanos();
-    long nanosSinceStart = nowNanos - pathwayStartNanos;
-    long nowNanoTicks = timeSource.getNanoTicks();
-    long pathwayStartNanoTicks = nowNanoTicks - nanosSinceStart;
-
-    long edgeStartMillis = VarEncodingHelper.decodeSignedVarLong(input);
-    long edgeStartNanoTicks =
-        pathwayStartNanoTicks + TimeUnit.MILLISECONDS.toNanos(edgeStartMillis - pathwayStartMillis);
-
-    return new DefaultPathwayContext(
-        timeSource,
-        pathwayStartNanos,
-        pathwayStartNanoTicks,
-        edgeStartNanoTicks,
-        hash,
-        serviceNameOverride);
-  }
-
-  private long generatePathwayHash(long nodeHash, long parentHash) {
-    outputBuffer.clear();
-    outputBuffer.writeLongLE(nodeHash);
-    outputBuffer.writeLongLE(parentHash);
-    return FNV64Hash.generateHash(outputBuffer.backingArray(), 0, 16, FNV64Hash.Version.v1);
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DisabledDataStreamsMonitoring.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DisabledDataStreamsMonitoring.java
index f06dd47d970..33c692e69d2 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DisabledDataStreamsMonitoring.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DisabledDataStreamsMonitoring.java
@@ -6,27 +6,26 @@
 import datadog.trace.api.experimental.DataStreamsContextCarrier;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 
-public final class DisabledDataStreamsMonitoring extends NoopDataStreamsMonitoring
-    implements DataStreamsMonitoring {
+public final class DisabledDataStreamsMonitoring extends NoopDataStreamsMonitoring implements DataStreamsMonitoring {
 
-  public static final DisabledDataStreamsMonitoring INSTANCE = new DisabledDataStreamsMonitoring();
+    public static final DisabledDataStreamsMonitoring INSTANCE = new DisabledDataStreamsMonitoring();
 
-  private DisabledDataStreamsMonitoring() {}
+    private DisabledDataStreamsMonitoring() {}
 
-  @Override
-  public void start() {}
+    @Override
+    public void start() {}
 
-  @Override
-  public Propagator propagator() {
-    return Propagators.noop();
-  }
+    @Override
+    public Propagator propagator() {
+        return Propagators.noop();
+    }
 
-  @Override
-  public void mergePathwayContextIntoSpan(AgentSpan span, DataStreamsContextCarrier carrier) {}
+    @Override
+    public void mergePathwayContextIntoSpan(AgentSpan span, DataStreamsContextCarrier carrier) {}
 
-  @Override
-  public void clear() {}
+    @Override
+    public void clear() {}
 
-  @Override
-  public void close() {}
+    @Override
+    public void close() {}
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/MsgPackDatastreamsPayloadWriter.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/MsgPackDatastreamsPayloadWriter.java
index f94210309d9..580a498869c 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/MsgPackDatastreamsPayloadWriter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/MsgPackDatastreamsPayloadWriter.java
@@ -21,317 +21,312 @@
 import org.slf4j.LoggerFactory;
 
 public class MsgPackDatastreamsPayloadWriter implements DatastreamsPayloadWriter {
-  private static final Logger log = LoggerFactory.getLogger(MsgPackDatastreamsPayloadWriter.class);
-  private static final byte[] ENV = "Env".getBytes(ISO_8859_1);
-  private static final byte[] VERSION = "Version".getBytes(ISO_8859_1);
-  private static final byte[] PRIMARY_TAG = "PrimaryTag".getBytes(ISO_8859_1);
-  private static final byte[] LANG = "Lang".getBytes(ISO_8859_1);
-  private static final byte[] TRACER_VERSION = "TracerVersion".getBytes(ISO_8859_1);
-  private static final byte[] STATS = "Stats".getBytes(ISO_8859_1);
-  private static final byte[] START = "Start".getBytes(ISO_8859_1);
-  private static final byte[] DURATION = "Duration".getBytes(ISO_8859_1);
-  private static final byte[] PATHWAY_LATENCY = "PathwayLatency".getBytes(ISO_8859_1);
-  private static final byte[] EDGE_LATENCY = "EdgeLatency".getBytes(ISO_8859_1);
-  private static final byte[] PAYLOAD_SIZE = "PayloadSize".getBytes(ISO_8859_1);
-  private static final byte[] SERVICE = "Service".getBytes(ISO_8859_1);
-  private static final byte[] EDGE_TAGS = "EdgeTags".getBytes(ISO_8859_1);
-  private static final byte[] BACKLOGS = "Backlogs".getBytes(ISO_8859_1);
-  private static final byte[] HASH = "Hash".getBytes(ISO_8859_1);
-  private static final byte[] PARENT_HASH = "ParentHash".getBytes(ISO_8859_1);
-  private static final byte[] BACKLOG_VALUE = "Value".getBytes(ISO_8859_1);
-  private static final byte[] BACKLOG_TAGS = "Tags".getBytes(ISO_8859_1);
-  private static final byte[] SCHEMA_REGISTRY_USAGES = "SchemaRegistryUsages".getBytes(ISO_8859_1);
-  private static final byte[] TOPIC = "Topic".getBytes(ISO_8859_1);
-  private static final byte[] KAFKA_CLUSTER_ID = "KafkaClusterId".getBytes(ISO_8859_1);
-  private static final byte[] SCHEMA_ID = "SchemaId".getBytes(ISO_8859_1);
-  private static final byte[] COUNT = "Count".getBytes(ISO_8859_1);
-  private static final byte[] IS_SUCCESS = "IsSuccess".getBytes(ISO_8859_1);
-  private static final byte[] IS_KEY = "IsKey".getBytes(ISO_8859_1);
-  private static final byte[] OPERATION = "Operation".getBytes(ISO_8859_1);
-  private static final byte[] PRODUCTS_MASK = "ProductMask".getBytes(ISO_8859_1);
-  private static final byte[] PROCESS_TAGS = "ProcessTags".getBytes(ISO_8859_1);
-  private static final byte[] TRANSACTIONS = "Transactions".getBytes(ISO_8859_1);
-  private static final byte[] TRANSACTION_CHECKPOINT_IDS =
-      "TransactionCheckpointIds".getBytes(ISO_8859_1);
-  private static final byte[] CONFIGS = "Configs".getBytes(ISO_8859_1);
-  private static final byte[] CONFIG_TYPE = "Type".getBytes(ISO_8859_1);
-  private static final byte[] CONFIG_KAFKA_CLUSTER_ID = "KafkaClusterId".getBytes(ISO_8859_1);
-  private static final byte[] CONFIG_CONSUMER_GROUP = "ConsumerGroup".getBytes(ISO_8859_1);
-  private static final byte[] CONFIG_MEMBER_ID = "MemberId".getBytes(ISO_8859_1);
-  private static final byte[] CONFIG_GENERATION_ID = "GenerationId".getBytes(ISO_8859_1);
-  private static final byte[] CONFIG_MEMBER_PROTOCOL = "MemberProtocol".getBytes(ISO_8859_1);
-  private static final byte[] CONFIG_ENTRIES = "Config".getBytes(ISO_8859_1);
-
-  private static final int INITIAL_CAPACITY = 512 * 1024;
-
-  private final WritableFormatter writer;
-  private final Sink sink;
-  private final GrowableBuffer buffer;
-  private final WellKnownTags wellKnownTags;
-  private final byte[] tracerVersionValue;
-  private final byte[] primaryTagValue;
-
-  public MsgPackDatastreamsPayloadWriter(
-      Sink sink, WellKnownTags wellKnownTags, String tracerVersion, String primaryTag) {
-    buffer = new GrowableBuffer(INITIAL_CAPACITY);
-    writer = new MsgPackWriter(buffer);
-    this.sink = sink;
-    this.wellKnownTags = wellKnownTags;
-    tracerVersionValue = tracerVersion.getBytes(ISO_8859_1);
-    primaryTagValue = primaryTag == null ? new byte[0] : primaryTag.getBytes(ISO_8859_1);
-  }
-
-  public void reset() {
-    buffer.reset();
-  }
-
-  // extend the list as needed
-  private static final int APM_PRODUCT = 1; // 00000001
-  private static final int DSM_PRODUCT = 2; // 00000010
-  private static final int DJM_PRODUCT = 4; // 00000100
-  private static final int PROFILING_PRODUCT = 8; // 00001000
-
-  public long getProductsMask() {
-    long productsMask = APM_PRODUCT;
-    if (Config.get().isDataStreamsEnabled()) {
-      productsMask |= DSM_PRODUCT;
+    private static final Logger log = LoggerFactory.getLogger(MsgPackDatastreamsPayloadWriter.class);
+    private static final byte[] ENV = "Env".getBytes(ISO_8859_1);
+    private static final byte[] VERSION = "Version".getBytes(ISO_8859_1);
+    private static final byte[] PRIMARY_TAG = "PrimaryTag".getBytes(ISO_8859_1);
+    private static final byte[] LANG = "Lang".getBytes(ISO_8859_1);
+    private static final byte[] TRACER_VERSION = "TracerVersion".getBytes(ISO_8859_1);
+    private static final byte[] STATS = "Stats".getBytes(ISO_8859_1);
+    private static final byte[] START = "Start".getBytes(ISO_8859_1);
+    private static final byte[] DURATION = "Duration".getBytes(ISO_8859_1);
+    private static final byte[] PATHWAY_LATENCY = "PathwayLatency".getBytes(ISO_8859_1);
+    private static final byte[] EDGE_LATENCY = "EdgeLatency".getBytes(ISO_8859_1);
+    private static final byte[] PAYLOAD_SIZE = "PayloadSize".getBytes(ISO_8859_1);
+    private static final byte[] SERVICE = "Service".getBytes(ISO_8859_1);
+    private static final byte[] EDGE_TAGS = "EdgeTags".getBytes(ISO_8859_1);
+    private static final byte[] BACKLOGS = "Backlogs".getBytes(ISO_8859_1);
+    private static final byte[] HASH = "Hash".getBytes(ISO_8859_1);
+    private static final byte[] PARENT_HASH = "ParentHash".getBytes(ISO_8859_1);
+    private static final byte[] BACKLOG_VALUE = "Value".getBytes(ISO_8859_1);
+    private static final byte[] BACKLOG_TAGS = "Tags".getBytes(ISO_8859_1);
+    private static final byte[] SCHEMA_REGISTRY_USAGES = "SchemaRegistryUsages".getBytes(ISO_8859_1);
+    private static final byte[] TOPIC = "Topic".getBytes(ISO_8859_1);
+    private static final byte[] KAFKA_CLUSTER_ID = "KafkaClusterId".getBytes(ISO_8859_1);
+    private static final byte[] SCHEMA_ID = "SchemaId".getBytes(ISO_8859_1);
+    private static final byte[] COUNT = "Count".getBytes(ISO_8859_1);
+    private static final byte[] IS_SUCCESS = "IsSuccess".getBytes(ISO_8859_1);
+    private static final byte[] IS_KEY = "IsKey".getBytes(ISO_8859_1);
+    private static final byte[] OPERATION = "Operation".getBytes(ISO_8859_1);
+    private static final byte[] PRODUCTS_MASK = "ProductMask".getBytes(ISO_8859_1);
+    private static final byte[] PROCESS_TAGS = "ProcessTags".getBytes(ISO_8859_1);
+    private static final byte[] TRANSACTIONS = "Transactions".getBytes(ISO_8859_1);
+    private static final byte[] TRANSACTION_CHECKPOINT_IDS = "TransactionCheckpointIds".getBytes(ISO_8859_1);
+    private static final byte[] CONFIGS = "Configs".getBytes(ISO_8859_1);
+    private static final byte[] CONFIG_TYPE = "Type".getBytes(ISO_8859_1);
+    private static final byte[] CONFIG_KAFKA_CLUSTER_ID = "KafkaClusterId".getBytes(ISO_8859_1);
+    private static final byte[] CONFIG_CONSUMER_GROUP = "ConsumerGroup".getBytes(ISO_8859_1);
+    private static final byte[] CONFIG_MEMBER_ID = "MemberId".getBytes(ISO_8859_1);
+    private static final byte[] CONFIG_GENERATION_ID = "GenerationId".getBytes(ISO_8859_1);
+    private static final byte[] CONFIG_MEMBER_PROTOCOL = "MemberProtocol".getBytes(ISO_8859_1);
+    private static final byte[] CONFIG_ENTRIES = "Config".getBytes(ISO_8859_1);
+
+    private static final int INITIAL_CAPACITY = 512 * 1024;
+
+    private final WritableFormatter writer;
+    private final Sink sink;
+    private final GrowableBuffer buffer;
+    private final WellKnownTags wellKnownTags;
+    private final byte[] tracerVersionValue;
+    private final byte[] primaryTagValue;
+
+    public MsgPackDatastreamsPayloadWriter(
+            Sink sink, WellKnownTags wellKnownTags, String tracerVersion, String primaryTag) {
+        buffer = new GrowableBuffer(INITIAL_CAPACITY);
+        writer = new MsgPackWriter(buffer);
+        this.sink = sink;
+        this.wellKnownTags = wellKnownTags;
+        tracerVersionValue = tracerVersion.getBytes(ISO_8859_1);
+        primaryTagValue = primaryTag == null ? new byte[0] : primaryTag.getBytes(ISO_8859_1);
     }
-    if (Config.get().isDataJobsEnabled()) {
-      productsMask |= DJM_PRODUCT;
-    }
-    if (Config.get().isProfilingEnabled()) {
-      productsMask |= PROFILING_PRODUCT;
+
+    public void reset() {
+        buffer.reset();
     }
 
-    return productsMask;
-  }
-
-  @Override
-  public void writePayload(Collection<StatsBucket> data, String serviceNameOverride) {
-    final List<UTF8BytesString> processTags = ProcessTags.getTagsAsUTF8ByteStringList();
-    final boolean hasProcessTags = processTags != null;
-    writer.startMap(8 + (hasProcessTags ? 1 : 0));
-    /* 1 */
-    writer.writeUTF8(ENV);
-    writer.writeUTF8(wellKnownTags.getEnv());
-
-    /* 2 */
-    writer.writeUTF8(SERVICE);
-    if (serviceNameOverride != null && !serviceNameOverride.isEmpty()) {
-      writer.writeUTF8(serviceNameOverride.getBytes(ISO_8859_1));
-    } else {
-      writer.writeUTF8(wellKnownTags.getService());
+    // extend the list as needed
+    private static final int APM_PRODUCT = 1; // 00000001
+    private static final int DSM_PRODUCT = 2; // 00000010
+    private static final int DJM_PRODUCT = 4; // 00000100
+    private static final int PROFILING_PRODUCT = 8; // 00001000
+
+    public long getProductsMask() {
+        long productsMask = APM_PRODUCT;
+        if (Config.get().isDataStreamsEnabled()) {
+            productsMask |= DSM_PRODUCT;
+        }
+        if (Config.get().isDataJobsEnabled()) {
+            productsMask |= DJM_PRODUCT;
+        }
+        if (Config.get().isProfilingEnabled()) {
+            productsMask |= PROFILING_PRODUCT;
+        }
+
+        return productsMask;
     }
 
-    /* 3 */
-    writer.writeUTF8(LANG);
-    writer.writeUTF8(wellKnownTags.getLanguage());
-
-    /* 4 */
-    writer.writeUTF8(PRIMARY_TAG);
-    writer.writeUTF8(primaryTagValue);
-
-    /* 5 */
-    writer.writeUTF8(TRACER_VERSION);
-    writer.writeUTF8(tracerVersionValue);
-
-    /* 6 */
-    writer.writeUTF8(VERSION);
-    writer.writeUTF8(wellKnownTags.getVersion());
-
-    /* 7 */
-    writer.writeUTF8(STATS);
-    writer.startArray(data.size());
-
-    for (StatsBucket bucket : data) {
-      boolean hasBacklogs = !bucket.getBacklogs().isEmpty();
-      boolean hasTransactions = !bucket.getTransactions().isEmpty();
-      boolean hasSchemaRegistryUsages = !bucket.getSchemaRegistryUsages().isEmpty();
-      boolean hasKafkaConfigs = !bucket.getKafkaConfigs().isEmpty();
-      writer.startMap(
-          3
-              + (hasBacklogs ? 1 : 0)
-              + (hasTransactions ? 2 : 0)
-              + (hasSchemaRegistryUsages ? 1 : 0)
-              + (hasKafkaConfigs ? 1 : 0));
-
-      /* 1 */
-      writer.writeUTF8(START);
-      writer.writeLong(bucket.getStartTimeNanos());
-
-      /* 2 */
-      writer.writeUTF8(DURATION);
-      writer.writeLong(bucket.getBucketDurationNanos());
-
-      /* 3 */
-      writer.writeUTF8(STATS);
-      writeBucket(bucket, writer);
-
-      if (hasBacklogs) {
+    @Override
+    public void writePayload(Collection<StatsBucket> data, String serviceNameOverride) {
+        final List<UTF8BytesString> processTags = ProcessTags.getTagsAsUTF8ByteStringList();
+        final boolean hasProcessTags = processTags != null;
+        writer.startMap(8 + (hasProcessTags ? 1 : 0));
+        /* 1 */
+        writer.writeUTF8(ENV);
+        writer.writeUTF8(wellKnownTags.getEnv());
+
+        /* 2 */
+        writer.writeUTF8(SERVICE);
+        if (serviceNameOverride != null && !serviceNameOverride.isEmpty()) {
+            writer.writeUTF8(serviceNameOverride.getBytes(ISO_8859_1));
+        } else {
+            writer.writeUTF8(wellKnownTags.getService());
+        }
+
+        /* 3 */
+        writer.writeUTF8(LANG);
+        writer.writeUTF8(wellKnownTags.getLanguage());
+
         /* 4 */
-        writeBacklogs(bucket.getBacklogs(), writer);
-      }
+        writer.writeUTF8(PRIMARY_TAG);
+        writer.writeUTF8(primaryTagValue);
 
-      if (hasSchemaRegistryUsages) {
         /* 5 */
-        writeSchemaRegistryUsages(bucket.getSchemaRegistryUsages(), writer);
-      }
-
-      if (hasKafkaConfigs) {
-        writeKafkaConfigs(bucket.getKafkaConfigs(), writer);
-      }
-
-      if (hasTransactions) {
-        writer.writeUTF8(TRANSACTIONS);
-        writer.writeBinary(bucket.getTransactions().getData());
-        writer.writeUTF8(TRANSACTION_CHECKPOINT_IDS);
-        writer.writeBinary(TransactionInfo.getCheckpointIdCacheBytes());
-      }
-    }
+        writer.writeUTF8(TRACER_VERSION);
+        writer.writeUTF8(tracerVersionValue);
 
-    /* 8 */
-    writer.writeUTF8(PRODUCTS_MASK);
-    writer.writeLong(getProductsMask());
-
-    /* 9 */
-    if (hasProcessTags) {
-      writer.writeUTF8(PROCESS_TAGS);
-      writer.startArray(processTags.size());
-      processTags.forEach(writer::writeUTF8);
+        /* 6 */
+        writer.writeUTF8(VERSION);
+        writer.writeUTF8(wellKnownTags.getVersion());
+
+        /* 7 */
+        writer.writeUTF8(STATS);
+        writer.startArray(data.size());
+
+        for (StatsBucket bucket : data) {
+            boolean hasBacklogs = !bucket.getBacklogs().isEmpty();
+            boolean hasTransactions = !bucket.getTransactions().isEmpty();
+            boolean hasSchemaRegistryUsages = !bucket.getSchemaRegistryUsages().isEmpty();
+            boolean hasKafkaConfigs = !bucket.getKafkaConfigs().isEmpty();
+            writer.startMap(3
+                    + (hasBacklogs ? 1 : 0)
+                    + (hasTransactions ? 2 : 0)
+                    + (hasSchemaRegistryUsages ? 1 : 0)
+                    + (hasKafkaConfigs ? 1 : 0));
+
+            /* 1 */
+            writer.writeUTF8(START);
+            writer.writeLong(bucket.getStartTimeNanos());
+
+            /* 2 */
+            writer.writeUTF8(DURATION);
+            writer.writeLong(bucket.getBucketDurationNanos());
+
+            /* 3 */
+            writer.writeUTF8(STATS);
+            writeBucket(bucket, writer);
+
+            if (hasBacklogs) {
+                /* 4 */
+                writeBacklogs(bucket.getBacklogs(), writer);
+            }
+
+            if (hasSchemaRegistryUsages) {
+                /* 5 */
+                writeSchemaRegistryUsages(bucket.getSchemaRegistryUsages(), writer);
+            }
+
+            if (hasKafkaConfigs) {
+                writeKafkaConfigs(bucket.getKafkaConfigs(), writer);
+            }
+
+            if (hasTransactions) {
+                writer.writeUTF8(TRANSACTIONS);
+                writer.writeBinary(bucket.getTransactions().getData());
+                writer.writeUTF8(TRANSACTION_CHECKPOINT_IDS);
+                writer.writeBinary(TransactionInfo.getCheckpointIdCacheBytes());
+            }
+        }
+
+        /* 8 */
+        writer.writeUTF8(PRODUCTS_MASK);
+        writer.writeLong(getProductsMask());
+
+        /* 9 */
+        if (hasProcessTags) {
+            writer.writeUTF8(PROCESS_TAGS);
+            writer.startArray(processTags.size());
+            processTags.forEach(writer::writeUTF8);
+        }
+
+        buffer.mark();
+        sink.accept(buffer.messageCount(), buffer.slice());
+        buffer.reset();
     }
 
-    buffer.mark();
-    sink.accept(buffer.messageCount(), buffer.slice());
-    buffer.reset();
-  }
-
-  private void writeBucket(StatsBucket bucket, Writable packer) {
-    Collection<StatsGroup> groups = bucket.getGroups();
-    packer.startArray(groups.size());
-    for (StatsGroup group : groups) {
-      boolean firstNode = group.getTags().nonNullSize() == 0;
-      packer.startMap(firstNode ? 5 : 6);
-
-      /* 1 */
-      packer.writeUTF8(PATHWAY_LATENCY);
-      packer.writeBinary(group.getPathwayLatency().serialize());
-
-      /* 2 */
-      packer.writeUTF8(EDGE_LATENCY);
-      packer.writeBinary(group.getEdgeLatency().serialize());
-
-      /* 3 */
-      packer.writeUTF8(PAYLOAD_SIZE);
-      packer.writeBinary(group.getPayloadSize().serialize());
-
-      /* 4 */
-      packer.writeUTF8(HASH);
-      packer.writeUnsignedLong(group.getHash());
-
-      /* 5 */
-      packer.writeUTF8(PARENT_HASH);
-      packer.writeUnsignedLong(group.getParentHash());
-
-      if (!firstNode) {
-        /* 6 */
-        packer.writeUTF8(EDGE_TAGS);
-        writeDataStreamsTags(group.getTags(), packer);
-      }
+    private void writeBucket(StatsBucket bucket, Writable packer) {
+        Collection<StatsGroup> groups = bucket.getGroups();
+        packer.startArray(groups.size());
+        for (StatsGroup group : groups) {
+            boolean firstNode = group.getTags().nonNullSize() == 0;
+            packer.startMap(firstNode ? 5 : 6);
+
+            /* 1 */
+            packer.writeUTF8(PATHWAY_LATENCY);
+            packer.writeBinary(group.getPathwayLatency().serialize());
+
+            /* 2 */
+            packer.writeUTF8(EDGE_LATENCY);
+            packer.writeBinary(group.getEdgeLatency().serialize());
+
+            /* 3 */
+            packer.writeUTF8(PAYLOAD_SIZE);
+            packer.writeBinary(group.getPayloadSize().serialize());
+
+            /* 4 */
+            packer.writeUTF8(HASH);
+            packer.writeUnsignedLong(group.getHash());
+
+            /* 5 */
+            packer.writeUTF8(PARENT_HASH);
+            packer.writeUnsignedLong(group.getParentHash());
+
+            if (!firstNode) {
+                /* 6 */
+                packer.writeUTF8(EDGE_TAGS);
+                writeDataStreamsTags(group.getTags(), packer);
+            }
+        }
     }
-  }
 
-  private void writeBacklogs(
-      Collection<Map.Entry<DataStreamsTags, Long>> backlogs, Writable packer) {
-    packer.writeUTF8(BACKLOGS);
-    packer.startArray(backlogs.size());
-    for (Map.Entry<DataStreamsTags, Long> entry : backlogs) {
-      packer.startMap(2);
+    private void writeBacklogs(Collection<Map.Entry<DataStreamsTags, Long>> backlogs, Writable packer) {
+        packer.writeUTF8(BACKLOGS);
+        packer.startArray(backlogs.size());
+        for (Map.Entry<DataStreamsTags, Long> entry : backlogs) {
+            packer.startMap(2);
 
-      packer.writeUTF8(BACKLOG_TAGS);
-      writeDataStreamsTags(entry.getKey(), packer);
+            packer.writeUTF8(BACKLOG_TAGS);
+            writeDataStreamsTags(entry.getKey(), packer);
 
-      packer.writeUTF8(BACKLOG_VALUE);
-      packer.writeLong(entry.getValue());
+            packer.writeUTF8(BACKLOG_VALUE);
+            packer.writeLong(entry.getValue());
+        }
     }
-  }
 
-  private void writeSchemaRegistryUsages(
-      Collection<Map.Entry<StatsBucket.SchemaKey, Long>> usages, Writable packer) {
-    packer.writeUTF8(SCHEMA_REGISTRY_USAGES);
-    packer.startArray(usages.size());
-    for (Map.Entry<StatsBucket.SchemaKey, Long> entry : usages) {
-      StatsBucket.SchemaKey key = entry.getKey();
-      long count = entry.getValue();
+    private void writeSchemaRegistryUsages(Collection<Map.Entry<StatsBucket.SchemaKey, Long>> usages, Writable packer) {
+        packer.writeUTF8(SCHEMA_REGISTRY_USAGES);
+        packer.startArray(usages.size());
+        for (Map.Entry<StatsBucket.SchemaKey, Long> entry : usages) {
+            StatsBucket.SchemaKey key = entry.getKey();
+            long count = entry.getValue();
 
-      packer.startMap(
-          7); // 7 fields: Topic, KafkaClusterId, SchemaId, IsSuccess, IsKey, Operation, Count
+            packer.startMap(7); // 7 fields: Topic, KafkaClusterId, SchemaId, IsSuccess, IsKey, Operation, Count
 
-      packer.writeUTF8(TOPIC);
-      packer.writeString(key.getTopic() != null ? key.getTopic() : "", null);
+            packer.writeUTF8(TOPIC);
+            packer.writeString(key.getTopic() != null ? key.getTopic() : "", null);
 
-      packer.writeUTF8(KAFKA_CLUSTER_ID);
-      packer.writeString(key.getClusterId() != null ? key.getClusterId() : "", null);
+            packer.writeUTF8(KAFKA_CLUSTER_ID);
+            packer.writeString(key.getClusterId() != null ? key.getClusterId() : "", null);
 
-      packer.writeUTF8(SCHEMA_ID);
-      packer.writeInt(key.getSchemaId());
+            packer.writeUTF8(SCHEMA_ID);
+            packer.writeInt(key.getSchemaId());
 
-      packer.writeUTF8(IS_SUCCESS);
-      packer.writeBoolean(key.isSuccess());
+            packer.writeUTF8(IS_SUCCESS);
+            packer.writeBoolean(key.isSuccess());
 
-      packer.writeUTF8(IS_KEY);
-      packer.writeBoolean(key.isKey());
+            packer.writeUTF8(IS_KEY);
+            packer.writeBoolean(key.isKey());
 
-      packer.writeUTF8(OPERATION);
-      packer.writeString(key.getOperation() != null ? key.getOperation() : "", null);
+            packer.writeUTF8(OPERATION);
+            packer.writeString(key.getOperation() != null ? key.getOperation() : "", null);
 
-      packer.writeUTF8(COUNT);
-      packer.writeLong(count);
+            packer.writeUTF8(COUNT);
+            packer.writeLong(count);
+        }
     }
-  }
 
-  private void writeKafkaConfigs(List<KafkaConfigReport> configs, Writable packer) {
-    packer.writeUTF8(CONFIGS);
-    packer.startArray(configs.size());
-    for (KafkaConfigReport config : configs) {
-      // Type, KafkaClusterId, ConsumerGroup, MemberId, GenerationId, MemberProtocol, Config
-      packer.startMap(7);
+    private void writeKafkaConfigs(List<KafkaConfigReport> configs, Writable packer) {
+        packer.writeUTF8(CONFIGS);
+        packer.startArray(configs.size());
+        for (KafkaConfigReport config : configs) {
+            // Type, KafkaClusterId, ConsumerGroup, MemberId, GenerationId, MemberProtocol, Config
+            packer.startMap(7);
 
-      packer.writeUTF8(CONFIG_TYPE);
-      packer.writeString(config.getType(), null);
+            packer.writeUTF8(CONFIG_TYPE);
+            packer.writeString(config.getType(), null);
 
-      packer.writeUTF8(CONFIG_KAFKA_CLUSTER_ID);
-      packer.writeString(config.getKafkaClusterId(), null);
+            packer.writeUTF8(CONFIG_KAFKA_CLUSTER_ID);
+            packer.writeString(config.getKafkaClusterId(), null);
 
-      packer.writeUTF8(CONFIG_CONSUMER_GROUP);
-      packer.writeString(config.getConsumerGroup(), null);
+            packer.writeUTF8(CONFIG_CONSUMER_GROUP);
+            packer.writeString(config.getConsumerGroup(), null);
 
-      packer.writeUTF8(CONFIG_MEMBER_ID);
-      packer.writeString(config.getMemberId(), null);
+            packer.writeUTF8(CONFIG_MEMBER_ID);
+            packer.writeString(config.getMemberId(), null);
 
-      packer.writeUTF8(CONFIG_GENERATION_ID);
-      packer.writeInt(config.getGenerationId());
+            packer.writeUTF8(CONFIG_GENERATION_ID);
+            packer.writeInt(config.getGenerationId());
 
-      packer.writeUTF8(CONFIG_MEMBER_PROTOCOL);
-      packer.writeString(config.getMemberProtocol(), null);
+            packer.writeUTF8(CONFIG_MEMBER_PROTOCOL);
+            packer.writeString(config.getMemberProtocol(), null);
 
-      packer.writeUTF8(CONFIG_ENTRIES);
-      Map<String, String> entries = config.getConfig();
-      packer.startMap(entries.size());
-      for (Map.Entry<String, String> entry : entries.entrySet()) {
-        packer.writeString(entry.getKey(), null);
-        packer.writeString(entry.getValue() != null ? entry.getValue() : "", null);
-      }
+            packer.writeUTF8(CONFIG_ENTRIES);
+            Map<String, String> entries = config.getConfig();
+            packer.startMap(entries.size());
+            for (Map.Entry<String, String> entry : entries.entrySet()) {
+                packer.writeString(entry.getKey(), null);
+                packer.writeString(entry.getValue() != null ? entry.getValue() : "", null);
+            }
+        }
     }
-  }
 
-  private void writeDataStreamsTags(DataStreamsTags tags, Writable packer) {
-    packer.startArray(tags.nonNullSize());
+    private void writeDataStreamsTags(DataStreamsTags tags, Writable packer) {
+        packer.startArray(tags.nonNullSize());
 
-    for (int i = 0; i < tags.size(); i++) {
-      String val = tags.tagByIndex(i);
-      if (val != null) {
-        packer.writeString(val, null);
-      }
+        for (int i = 0; i < tags.size(); i++) {
+            String val = tags.tagByIndex(i);
+            if (val != null) {
+                packer.writeString(val, null);
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsBucket.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsBucket.java
index b65300631d6..e80cbb404a1 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsBucket.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsBucket.java
@@ -13,162 +13,153 @@
 import java.util.Map;
 
 public class StatsBucket {
-  private final long startTimeNanos;
-  private final long bucketDurationNanos;
-  private final Map<Long, StatsGroup> hashToGroup = new HashMap<>();
-  private final Map<DataStreamsTags, Long> backlogs = new HashMap<>();
-  private final TransactionContainer transactions = new TransactionContainer(1024);
-  private final Map<SchemaKey, Long> schemaRegistryUsages = new HashMap<>();
-  private final List<KafkaConfigReport> kafkaConfigs = new ArrayList<>();
-
-  public StatsBucket(long startTimeNanos, long bucketDurationNanos) {
-    this.startTimeNanos = startTimeNanos;
-    this.bucketDurationNanos = bucketDurationNanos;
-  }
-
-  public void addPoint(StatsPoint statsPoint) {
-    // we want to perform aggregation per dataset, to allow
-    // lower-level granularity and unblock dataset name manipulations on the backend
-    // without affecting the precision.
-    hashToGroup
-        .computeIfAbsent(
-            statsPoint.getAggregationHash(),
-            hash ->
-                new StatsGroup(
-                    statsPoint.getTags(), statsPoint.getHash(), statsPoint.getParentHash()))
-        .add(
-            statsPoint.getPathwayLatencyNano(),
-            statsPoint.getEdgeLatencyNano(),
-            statsPoint.getPayloadSizeBytes());
-  }
-
-  public void addBacklog(Backlog backlog) {
-    backlogs.compute(
-        backlog.getTags(),
-        (k, v) -> (v == null) ? backlog.getValue() : Math.max(v, backlog.getValue()));
-  }
-
-  public void addSchemaRegistryUsage(SchemaRegistryUsage usage) {
-    SchemaKey key =
-        new SchemaKey(
-            usage.getTopic(),
-            usage.getClusterId(),
-            usage.getSchemaId(),
-            usage.isSuccess(),
-            usage.isKey(),
-            usage.getOperation());
-    schemaRegistryUsages.merge(key, 1L, Long::sum);
-  }
-
-  public void addKafkaConfig(KafkaConfigReport configReport) {
-    kafkaConfigs.add(configReport);
-  }
-
-  public void addTransaction(TransactionInfo transaction) {
-    transactions.add(transaction);
-  }
-
-  public long getStartTimeNanos() {
-    return startTimeNanos;
-  }
-
-  public long getBucketDurationNanos() {
-    return bucketDurationNanos;
-  }
-
-  public Collection<StatsGroup> getGroups() {
-    return hashToGroup.values();
-  }
-
-  public Collection<Map.Entry<DataStreamsTags, Long>> getBacklogs() {
-    return backlogs.entrySet();
-  }
-
-  public TransactionContainer getTransactions() {
-    return transactions;
-  }
-
-  public Collection<Map.Entry<SchemaKey, Long>> getSchemaRegistryUsages() {
-    return schemaRegistryUsages.entrySet();
-  }
-
-  public List<KafkaConfigReport> getKafkaConfigs() {
-    return kafkaConfigs;
-  }
-
-  /**
-   * Key for aggregating schema registry usage by topic, cluster, schema ID, success, key/value
-   * type, and operation.
-   */
-  public static class SchemaKey {
-    private final String topic;
-    private final String clusterId;
-    private final int schemaId;
-    private final boolean isSuccess;
-    private final boolean isKey;
-    private final String operation;
-
-    public SchemaKey(
-        String topic,
-        String clusterId,
-        int schemaId,
-        boolean isSuccess,
-        boolean isKey,
-        String operation) {
-      this.topic = topic;
-      this.clusterId = clusterId;
-      this.schemaId = schemaId;
-      this.isSuccess = isSuccess;
-      this.isKey = isKey;
-      this.operation = operation;
+    private final long startTimeNanos;
+    private final long bucketDurationNanos;
+    private final Map<Long, StatsGroup> hashToGroup = new HashMap<>();
+    private final Map<DataStreamsTags, Long> backlogs = new HashMap<>();
+    private final TransactionContainer transactions = new TransactionContainer(1024);
+    private final Map<SchemaKey, Long> schemaRegistryUsages = new HashMap<>();
+    private final List<KafkaConfigReport> kafkaConfigs = new ArrayList<>();
+
+    public StatsBucket(long startTimeNanos, long bucketDurationNanos) {
+        this.startTimeNanos = startTimeNanos;
+        this.bucketDurationNanos = bucketDurationNanos;
     }
 
-    public String getTopic() {
-      return topic;
+    public void addPoint(StatsPoint statsPoint) {
+        // we want to perform aggregation per dataset, to allow
+        // lower-level granularity and unblock dataset name manipulations on the backend
+        // without affecting the precision.
+        hashToGroup
+                .computeIfAbsent(
+                        statsPoint.getAggregationHash(),
+                        hash -> new StatsGroup(statsPoint.getTags(), statsPoint.getHash(), statsPoint.getParentHash()))
+                .add(
+                        statsPoint.getPathwayLatencyNano(),
+                        statsPoint.getEdgeLatencyNano(),
+                        statsPoint.getPayloadSizeBytes());
     }
 
-    public String getClusterId() {
-      return clusterId;
+    public void addBacklog(Backlog backlog) {
+        backlogs.compute(
+                backlog.getTags(), (k, v) -> (v == null) ? backlog.getValue() : Math.max(v, backlog.getValue()));
     }
 
-    public int getSchemaId() {
-      return schemaId;
+    public void addSchemaRegistryUsage(SchemaRegistryUsage usage) {
+        SchemaKey key = new SchemaKey(
+                usage.getTopic(),
+                usage.getClusterId(),
+                usage.getSchemaId(),
+                usage.isSuccess(),
+                usage.isKey(),
+                usage.getOperation());
+        schemaRegistryUsages.merge(key, 1L, Long::sum);
     }
 
-    public boolean isSuccess() {
-      return isSuccess;
+    public void addKafkaConfig(KafkaConfigReport configReport) {
+        kafkaConfigs.add(configReport);
     }
 
-    public boolean isKey() {
-      return isKey;
+    public void addTransaction(TransactionInfo transaction) {
+        transactions.add(transaction);
     }
 
-    public String getOperation() {
-      return operation;
+    public long getStartTimeNanos() {
+        return startTimeNanos;
     }
 
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      SchemaKey that = (SchemaKey) o;
-      return schemaId == that.schemaId
-          && isSuccess == that.isSuccess
-          && isKey == that.isKey
-          && java.util.Objects.equals(topic, that.topic)
-          && java.util.Objects.equals(clusterId, that.clusterId)
-          && java.util.Objects.equals(operation, that.operation);
+    public long getBucketDurationNanos() {
+        return bucketDurationNanos;
     }
 
-    @Override
-    public int hashCode() {
-      int result = topic != null ? topic.hashCode() : 0;
-      result = 31 * result + (clusterId != null ? clusterId.hashCode() : 0);
-      result = 31 * result + schemaId;
-      result = 31 * result + (isSuccess ? 1 : 0);
-      result = 31 * result + (isKey ? 1 : 0);
-      result = 31 * result + (operation != null ? operation.hashCode() : 0);
-      return result;
+    public Collection<StatsGroup> getGroups() {
+        return hashToGroup.values();
+    }
+
+    public Collection<Map.Entry<DataStreamsTags, Long>> getBacklogs() {
+        return backlogs.entrySet();
+    }
+
+    public TransactionContainer getTransactions() {
+        return transactions;
+    }
+
+    public Collection<Map.Entry<SchemaKey, Long>> getSchemaRegistryUsages() {
+        return schemaRegistryUsages.entrySet();
+    }
+
+    public List<KafkaConfigReport> getKafkaConfigs() {
+        return kafkaConfigs;
+    }
+
+    /**
+     * Key for aggregating schema registry usage by topic, cluster, schema ID, success, key/value
+     * type, and operation.
+     */
+    public static class SchemaKey {
+        private final String topic;
+        private final String clusterId;
+        private final int schemaId;
+        private final boolean isSuccess;
+        private final boolean isKey;
+        private final String operation;
+
+        public SchemaKey(
+                String topic, String clusterId, int schemaId, boolean isSuccess, boolean isKey, String operation) {
+            this.topic = topic;
+            this.clusterId = clusterId;
+            this.schemaId = schemaId;
+            this.isSuccess = isSuccess;
+            this.isKey = isKey;
+            this.operation = operation;
+        }
+
+        public String getTopic() {
+            return topic;
+        }
+
+        public String getClusterId() {
+            return clusterId;
+        }
+
+        public int getSchemaId() {
+            return schemaId;
+        }
+
+        public boolean isSuccess() {
+            return isSuccess;
+        }
+
+        public boolean isKey() {
+            return isKey;
+        }
+
+        public String getOperation() {
+            return operation;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            SchemaKey that = (SchemaKey) o;
+            return schemaId == that.schemaId
+                    && isSuccess == that.isSuccess
+                    && isKey == that.isKey
+                    && java.util.Objects.equals(topic, that.topic)
+                    && java.util.Objects.equals(clusterId, that.clusterId)
+                    && java.util.Objects.equals(operation, that.operation);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = topic != null ? topic.hashCode() : 0;
+            result = 31 * result + (clusterId != null ? clusterId.hashCode() : 0);
+            result = 31 * result + schemaId;
+            result = 31 * result + (isSuccess ? 1 : 0);
+            result = 31 * result + (isKey ? 1 : 0);
+            result = 31 * result + (operation != null ? operation.hashCode() : 0);
+            return result;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsGroup.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsGroup.java
index 670cd029c1b..99aca12297e 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsGroup.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsGroup.java
@@ -4,66 +4,58 @@
 import datadog.trace.api.datastreams.DataStreamsTags;
 
 public class StatsGroup {
-  private static final double NANOSECONDS_TO_SECOND = 1_000_000_000d;
-
-  private final DataStreamsTags tags;
-  private final long hash;
-  private final long parentHash;
-  private final Histogram pathwayLatency;
-  private final Histogram edgeLatency;
-  private final Histogram payloadSize;
-
-  public StatsGroup(DataStreamsTags tags, long hash, long parentHash) {
-    this.tags = tags;
-    this.hash = hash;
-    this.parentHash = parentHash;
-    this.pathwayLatency = Histogram.newLogHistogram();
-    this.edgeLatency = Histogram.newLogHistogram();
-    this.payloadSize = Histogram.newLogHistogram();
-  }
-
-  public void add(long pathwayLatencyNano, long edgeLatencyNano, long payloadSizeBytes) {
-    pathwayLatency.accept(((double) pathwayLatencyNano) / NANOSECONDS_TO_SECOND);
-    edgeLatency.accept(((double) edgeLatencyNano) / NANOSECONDS_TO_SECOND);
-    // payload size is set to zero when we cannot compute it
-    // in that case, it's probably better to have an empty histogram than filling it with zeros
-    if (payloadSizeBytes != 0) payloadSize.accept((double) payloadSizeBytes);
-  }
-
-  public DataStreamsTags getTags() {
-    return tags;
-  }
-
-  public long getHash() {
-    return hash;
-  }
-
-  public long getParentHash() {
-    return parentHash;
-  }
-
-  public Histogram getPathwayLatency() {
-    return pathwayLatency;
-  }
-
-  public Histogram getEdgeLatency() {
-    return edgeLatency;
-  }
-
-  public Histogram getPayloadSize() {
-    return payloadSize;
-  }
-
-  @Override
-  public String toString() {
-    return "StatsGroup{"
-        + "tags='"
-        + tags
-        + '\''
-        + ", hash="
-        + hash
-        + ", parentHash="
-        + parentHash
-        + '}';
-  }
+    private static final double NANOSECONDS_TO_SECOND = 1_000_000_000d;
+
+    private final DataStreamsTags tags;
+    private final long hash;
+    private final long parentHash;
+    private final Histogram pathwayLatency;
+    private final Histogram edgeLatency;
+    private final Histogram payloadSize;
+
+    public StatsGroup(DataStreamsTags tags, long hash, long parentHash) {
+        this.tags = tags;
+        this.hash = hash;
+        this.parentHash = parentHash;
+        this.pathwayLatency = Histogram.newLogHistogram();
+        this.edgeLatency = Histogram.newLogHistogram();
+        this.payloadSize = Histogram.newLogHistogram();
+    }
+
+    public void add(long pathwayLatencyNano, long edgeLatencyNano, long payloadSizeBytes) {
+        pathwayLatency.accept(((double) pathwayLatencyNano) / NANOSECONDS_TO_SECOND);
+        edgeLatency.accept(((double) edgeLatencyNano) / NANOSECONDS_TO_SECOND);
+        // payload size is set to zero when we cannot compute it
+        // in that case, it's probably better to have an empty histogram than filling it with zeros
+        if (payloadSizeBytes != 0) payloadSize.accept((double) payloadSizeBytes);
+    }
+
+    public DataStreamsTags getTags() {
+        return tags;
+    }
+
+    public long getHash() {
+        return hash;
+    }
+
+    public long getParentHash() {
+        return parentHash;
+    }
+
+    public Histogram getPathwayLatency() {
+        return pathwayLatency;
+    }
+
+    public Histogram getEdgeLatency() {
+        return edgeLatency;
+    }
+
+    public Histogram getPayloadSize() {
+        return payloadSize;
+    }
+
+    @Override
+    public String toString() {
+        return "StatsGroup{" + "tags='" + tags + '\'' + ", hash=" + hash + ", parentHash=" + parentHash + '}';
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/TransactionContainer.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/TransactionContainer.java
index 834064293cc..a6ef54ea8e7 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/TransactionContainer.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/TransactionContainer.java
@@ -4,41 +4,41 @@
 import java.util.Arrays;
 
 public class TransactionContainer {
-  // we store data as an array of bytes, since the number of object can be significant
-  private byte[] data;
-  private int size;
+    // we store data as an array of bytes, since the number of object can be significant
+    private byte[] data;
+    private int size;
 
-  public TransactionContainer(Integer initialSizeBytes) {
-    this.data = new byte[initialSizeBytes];
-  }
+    public TransactionContainer(Integer initialSizeBytes) {
+        this.data = new byte[initialSizeBytes];
+    }
 
-  public void add(TransactionInfo transactionInfo) {
-    // check if we need to resize
-    byte[] transactionBytes = transactionInfo.getBytes();
+    public void add(TransactionInfo transactionInfo) {
+        // check if we need to resize
+        byte[] transactionBytes = transactionInfo.getBytes();
 
-    // resize buffer if needed
-    if (data.length - size < transactionBytes.length) {
-      data = Arrays.copyOf(data, data.length << 1);
-    }
+        // resize buffer if needed
+        if (data.length - size < transactionBytes.length) {
+            data = Arrays.copyOf(data, data.length << 1);
+        }
 
-    // add data
-    System.arraycopy(transactionBytes, 0, data, size, transactionBytes.length);
-    size += transactionBytes.length;
-  }
+        // add data
+        System.arraycopy(transactionBytes, 0, data, size, transactionBytes.length);
+        size += transactionBytes.length;
+    }
 
-  public boolean isEmpty() {
-    return size == 0;
-  }
+    public boolean isEmpty() {
+        return size == 0;
+    }
 
-  public void clear() {
-    size = 0;
-  }
+    public void clear() {
+        size = 0;
+    }
 
-  public int getSize() {
-    return size;
-  }
+    public int getSize() {
+        return size;
+    }
 
-  public byte[] getData() {
-    return Arrays.copyOf(data, size);
-  }
+    public byte[] getData() {
+        return Arrays.copyOf(data, size);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/monitor/HealthMetrics.java b/dd-trace-core/src/main/java/datadog/trace/core/monitor/HealthMetrics.java
index e506732777f..68c48d3b3b7 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/monitor/HealthMetrics.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/monitor/HealthMetrics.java
@@ -18,109 +18,106 @@
  * </ul>
  */
 public abstract class HealthMetrics implements AutoCloseable {
-  public static HealthMetrics NO_OP = new HealthMetrics() {};
+    public static HealthMetrics NO_OP = new HealthMetrics() {};
 
-  public void start() {}
+    public void start() {}
 
-  public void onStart(final int queueCapacity) {}
+    public void onStart(final int queueCapacity) {}
 
-  public void onShutdown(final boolean flushSuccess) {}
+    public void onShutdown(final boolean flushSuccess) {}
 
-  public void onPublish(final List<DDSpan> trace, final int samplingPriority) {}
+    public void onPublish(final List<DDSpan> trace, final int samplingPriority) {}
 
-  public void onFailedPublish(final int samplingPriority, final int spanCount) {}
+    public void onFailedPublish(final int samplingPriority, final int spanCount) {}
 
-  public void onPartialPublish(final int numberOfDroppedSpans) {}
+    public void onPartialPublish(final int numberOfDroppedSpans) {}
 
-  public void onScheduleFlush(final boolean previousIncomplete) {}
+    public void onScheduleFlush(final boolean previousIncomplete) {}
 
-  public void onFlush(final boolean early) {}
+    public void onFlush(final boolean early) {}
 
-  public void onPartialFlush(final int sizeInBytes) {}
+    public void onPartialFlush(final int sizeInBytes) {}
 
-  public void onSingleSpanSample() {}
+    public void onSingleSpanSample() {}
 
-  public void onSingleSpanUnsampled() {}
+    public void onSingleSpanUnsampled() {}
 
-  public void onSerialize(final int serializedSizeInBytes) {}
+    public void onSerialize(final int serializedSizeInBytes) {}
 
-  public void onFailedSerialize(final List<DDSpan> trace, final Throwable optionalCause) {}
+    public void onFailedSerialize(final List<DDSpan> trace, final Throwable optionalCause) {}
 
-  public void onCreateSpan() {}
+    public void onCreateSpan() {}
 
-  public void onFinishSpan() {}
+    public void onFinishSpan() {}
 
-  public void onCreateTrace() {}
+    public void onCreateTrace() {}
 
-  public void onScopeCloseError(boolean manual) {}
+    public void onScopeCloseError(boolean manual) {}
 
-  public void onCaptureContinuation() {}
+    public void onCaptureContinuation() {}
 
-  public void onCancelContinuation() {}
+    public void onCancelContinuation() {}
 
-  public void onFinishContinuation() {}
+    public void onFinishContinuation() {}
 
-  public void onActivateScope() {}
+    public void onActivateScope() {}
 
-  public void onCloseScope() {}
+    public void onCloseScope() {}
 
-  public void onScopeStackOverflow() {}
+    public void onScopeStackOverflow() {}
 
-  /**
-   * Reports that the Org Propagation Guard dropped the inbound Datadog context for an extracted
-   * trace.
-   */
-  public void onOrgGuardEnforce(OrgGuard.Reason reason) {}
+    /**
+     * Reports that the Org Propagation Guard dropped the inbound Datadog context for an extracted
+     * trace.
+     */
+    public void onOrgGuardEnforce(OrgGuard.Reason reason) {}
 
-  public void onSend(
-      final int traceCount, final int sizeInBytes, final RemoteApi.Response response) {}
+    public void onSend(final int traceCount, final int sizeInBytes, final RemoteApi.Response response) {}
 
-  public void onFailedSend(
-      final int traceCount, final int sizeInBytes, final RemoteApi.Response response) {}
+    public void onFailedSend(final int traceCount, final int sizeInBytes, final RemoteApi.Response response) {}
 
-  public void onLongRunningUpdate(final int dropped, final int write, final int expired) {}
+    public void onLongRunningUpdate(final int dropped, final int write, final int expired) {}
 
-  /**
-   * Report that a trace has been used to compute client stats.
-   *
-   * @param countedSpan the number of spans used for the stat computation
-   * @param totalSpan the number of total spans in the trace
-   * @param dropped true if the trace can be dropped. Note: the PayloadDispatcher also count this.
-   *     However, this counter will report how many p0 dropped we could achieve before that the span
-   *     got sampled.
-   */
-  public void onClientStatTraceComputed(
-      final int countedSpan, final int totalSpan, boolean dropped) {}
+    /**
+     * Report that a trace has been used to compute client stats.
+     *
+     * @param countedSpan the number of spans used for the stat computation
+     * @param totalSpan the number of total spans in the trace
+     * @param dropped true if the trace can be dropped. Note: the PayloadDispatcher also count this.
+     *     However, this counter will report how many p0 dropped we could achieve before that the span
+     *     got sampled.
+     */
+    public void onClientStatTraceComputed(final int countedSpan, final int totalSpan, boolean dropped) {}
 
-  public void onClientStatPayloadSent() {}
+    public void onClientStatPayloadSent() {}
 
-  public void onClientStatErrorReceived() {}
+    public void onClientStatErrorReceived() {}
 
-  public void onClientStatDowngraded() {}
+    public void onClientStatDowngraded() {}
 
-  public void onStatsAggregateDropped() {}
+    public void onStatsAggregateDropped() {}
 
-  /**
-   * Reports a single span whose stats snapshot was dropped because the aggregator inbox was full.
-   */
-  public void onStatsInboxFull() {}
+    /**
+     * Reports a single span whose stats snapshot was dropped because the aggregator inbox was full.
+     */
+    public void onStatsInboxFull() {}
 
-  /**
-   * Reports a batch of {@code count} tag values collapsed into the {@code blocked_by_tracer}
-   * sentinel for {@code tag} during the just-completed reporting cycle (per-tag cardinality budget
-   * exhausted, or per-value length cap exceeded). Called from the aggregator thread once per
-   * affected tag at cycle reset, so the implementation can do a single counter update rather than
-   * one per blocked value.
-   */
-  public void onTagCardinalityBlocked(String[] statsDTag, long count) {}
+    /**
+     * Reports a batch of {@code count} tag values collapsed into the {@code blocked_by_tracer}
+     * sentinel for {@code tag} during the just-completed reporting cycle (per-tag cardinality budget
+     * exhausted, or per-value length cap exceeded). Called from the aggregator thread once per
+     * affected tag at cycle reset, so the implementation can do a single counter update rather than
+     * one per blocked value.
+     */
+    public void onTagCardinalityBlocked(String[] statsDTag, long count) {}
 
-  /**
-   * @return Human-readable summary of the current health metrics.
-   */
-  public String summary() {
-    return "";
-  }
+    /**
+     * @return Human-readable summary of the current health metrics.
+     */
+    public String summary() {
+        return "";
+    }
 
-  @Override
-  public void close() {}
+    @Override
+    public void close() {}
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/monitor/TracerHealthMetrics.java b/dd-trace-core/src/main/java/datadog/trace/core/monitor/TracerHealthMetrics.java
index f9c76ff0766..3494bd46f63 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/monitor/TracerHealthMetrics.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/monitor/TracerHealthMetrics.java
@@ -25,669 +25,607 @@
 import org.slf4j.LoggerFactory;
 
 public class TracerHealthMetrics extends HealthMetrics implements AutoCloseable {
-  private static final Logger log = LoggerFactory.getLogger(TracerHealthMetrics.class);
-
-  private static final IntFunction<String[]> STATUS_TAGS =
-      httpStatus -> new String[] {"status:" + httpStatus};
-
-  private static final String[] NO_TAGS = new String[0];
-  private static final String[] COLLAPSED_WHOLE_KEY_TAGS = new String[] {"collapsed:whole_key"};
-  private static final String[] STATUS_OK_TAGS = STATUS_TAGS.apply(200);
-  private final RadixTreeCache<String[]> statusTagsCache =
-      new RadixTreeCache<>(16, 32, STATUS_TAGS, 200, 400);
-
-  private final AtomicBoolean started = new AtomicBoolean(false);
-  private volatile AgentTaskScheduler.Scheduled<TracerHealthMetrics> cancellation;
-
-  private final LongAdder apiRequests = new LongAdder();
-  private final LongAdder apiErrors = new LongAdder();
-  private final LongAdder apiResponsesOK = new LongAdder();
-
-  private final LongAdder userDropEnqueuedTraces = new LongAdder();
-  private final LongAdder userKeepEnqueuedTraces = new LongAdder();
-  private final LongAdder samplerDropEnqueuedTraces = new LongAdder();
-  private final LongAdder samplerKeepEnqueuedTraces = new LongAdder();
-  private final LongAdder unsetPriorityEnqueuedTraces = new LongAdder();
-
-  private final LongAdder userDropDroppedTraces = new LongAdder();
-  private final LongAdder userKeepDroppedTraces = new LongAdder();
-  private final LongAdder samplerDropDroppedTraces = new LongAdder();
-  private final LongAdder samplerKeepDroppedTraces = new LongAdder();
-  private final LongAdder serialFailedDroppedTraces = new LongAdder();
-  private final LongAdder unsetPriorityDroppedTraces = new LongAdder();
-
-  private final LongAdder userDropDroppedSpans = new LongAdder();
-  private final LongAdder userKeepDroppedSpans = new LongAdder();
-  private final LongAdder samplerDropDroppedSpans = new LongAdder();
-  private final LongAdder samplerKeepDroppedSpans = new LongAdder();
-  private final LongAdder serialFailedDroppedSpans = new LongAdder();
-  private final LongAdder unsetPriorityDroppedSpans = new LongAdder();
-
-  private final LongAdder enqueuedSpans = new LongAdder();
-  private final LongAdder enqueuedBytes = new LongAdder();
-  private final LongAdder createdTraces = new LongAdder();
-  private final LongAdder createdSpans = new LongAdder();
-  private final LongAdder finishedSpans = new LongAdder();
-  private final LongAdder flushedTraces = new LongAdder();
-  private final LongAdder flushedBytes = new LongAdder();
-  private final LongAdder partialTraces = new LongAdder();
-  private final LongAdder partialBytes = new LongAdder();
-  private final LongAdder clientSpansWithoutContext = new LongAdder();
-
-  private final LongAdder singleSpanSampled = new LongAdder();
-  private final LongAdder singleSpanUnsampled = new LongAdder();
-
-  private final LongAdder capturedContinuations = new LongAdder();
-  private final LongAdder cancelledContinuations = new LongAdder();
-  private final LongAdder finishedContinuations = new LongAdder();
-
-  private final LongAdder activatedScopes = new LongAdder();
-  private final LongAdder closedScopes = new LongAdder();
-  private final LongAdder scopeStackOverflow = new LongAdder();
-  private final LongAdder scopeCloseErrors = new LongAdder();
-  private final LongAdder userScopeCloseErrors = new LongAdder();
-
-  private final LongAdder longRunningTracesWrite = new LongAdder();
-  private final LongAdder longRunningTracesDropped = new LongAdder();
-  private final LongAdder longRunningTracesExpired = new LongAdder();
-
-  private final LongAdder orgGuardEnforceMismatch = new LongAdder();
-  private final LongAdder orgGuardEnforceStrictMissing = new LongAdder();
-
-  private final LongAdder clientStatsProcessedSpans = new LongAdder();
-  private final LongAdder clientStatsProcessedTraces = new LongAdder();
-  private final LongAdder clientStatsP0DroppedSpans = new LongAdder();
-  private final LongAdder clientStatsP0DroppedTraces = new LongAdder();
-  private final LongAdder clientStatsRequests = new LongAdder();
-  private final LongAdder clientStatsErrors = new LongAdder();
-  private final LongAdder clientStatsDowngrades = new LongAdder();
-
-  private final LongAdder statsAggregateDropped = new LongAdder();
-  private final LongAdder statsInboxFull = new LongAdder();
-
-  private final StatsDClient statsd;
-  private final long interval;
-  private final TimeUnit units;
-
-  @Override
-  public void start() {
-    if (started.compareAndSet(false, true)) {
-      cancellation =
-          AgentTaskScheduler.get()
-              .scheduleAtFixedRate(new Flush(), this, interval, interval, units);
-    }
-  }
-
-  public TracerHealthMetrics(final StatsDClient statsd) {
-    this(statsd, 30, SECONDS);
-  }
-
-  public TracerHealthMetrics(final StatsDClient statsd, long interval, TimeUnit units) {
-    this.statsd = statsd;
-    this.interval = interval;
-    this.units = units;
-  }
-
-  @Override
-  public void onStart(final int queueCapacity) {
-    statsd.gauge("queue.max_length", queueCapacity, NO_TAGS);
-  }
-
-  @Override
-  public void onShutdown(final boolean flushSuccess) {}
-
-  @Override
-  public void onPublish(final List<DDSpan> trace, final int samplingPriority) {
-    switch (samplingPriority) {
-      case USER_DROP:
-        userDropEnqueuedTraces.increment();
-        break;
-      case USER_KEEP:
-        userKeepEnqueuedTraces.increment();
-        break;
-      case SAMPLER_DROP:
-        samplerDropEnqueuedTraces.increment();
-        break;
-      case SAMPLER_KEEP:
-        samplerKeepEnqueuedTraces.increment();
-        break;
-      default:
-        unsetPriorityEnqueuedTraces.increment();
-    }
-    enqueuedSpans.add(trace.size());
-    checkForClientSpansWithoutContext(trace);
-  }
-
-  private void checkForClientSpansWithoutContext(final List<DDSpan> trace) {
-    for (DDSpan span : trace) {
-      if (span != null && span.getParentId() == ZERO) {
-        String spanKind = span.getTag(SPAN_KIND, "undefined");
-        if (SPAN_KIND_CLIENT.equals(spanKind)) {
-          this.clientSpansWithoutContext.increment();
+    private static final Logger log = LoggerFactory.getLogger(TracerHealthMetrics.class);
+
+    private static final IntFunction<String[]> STATUS_TAGS = httpStatus -> new String[] {"status:" + httpStatus};
+
+    private static final String[] NO_TAGS = new String[0];
+    private static final String[] COLLAPSED_WHOLE_KEY_TAGS = new String[] {"collapsed:whole_key"};
+    private static final String[] STATUS_OK_TAGS = STATUS_TAGS.apply(200);
+    private final RadixTreeCache<String[]> statusTagsCache = new RadixTreeCache<>(16, 32, STATUS_TAGS, 200, 400);
+
+    private final AtomicBoolean started = new AtomicBoolean(false);
+    private volatile AgentTaskScheduler.Scheduled<TracerHealthMetrics> cancellation;
+
+    private final LongAdder apiRequests = new LongAdder();
+    private final LongAdder apiErrors = new LongAdder();
+    private final LongAdder apiResponsesOK = new LongAdder();
+
+    private final LongAdder userDropEnqueuedTraces = new LongAdder();
+    private final LongAdder userKeepEnqueuedTraces = new LongAdder();
+    private final LongAdder samplerDropEnqueuedTraces = new LongAdder();
+    private final LongAdder samplerKeepEnqueuedTraces = new LongAdder();
+    private final LongAdder unsetPriorityEnqueuedTraces = new LongAdder();
+
+    private final LongAdder userDropDroppedTraces = new LongAdder();
+    private final LongAdder userKeepDroppedTraces = new LongAdder();
+    private final LongAdder samplerDropDroppedTraces = new LongAdder();
+    private final LongAdder samplerKeepDroppedTraces = new LongAdder();
+    private final LongAdder serialFailedDroppedTraces = new LongAdder();
+    private final LongAdder unsetPriorityDroppedTraces = new LongAdder();
+
+    private final LongAdder userDropDroppedSpans = new LongAdder();
+    private final LongAdder userKeepDroppedSpans = new LongAdder();
+    private final LongAdder samplerDropDroppedSpans = new LongAdder();
+    private final LongAdder samplerKeepDroppedSpans = new LongAdder();
+    private final LongAdder serialFailedDroppedSpans = new LongAdder();
+    private final LongAdder unsetPriorityDroppedSpans = new LongAdder();
+
+    private final LongAdder enqueuedSpans = new LongAdder();
+    private final LongAdder enqueuedBytes = new LongAdder();
+    private final LongAdder createdTraces = new LongAdder();
+    private final LongAdder createdSpans = new LongAdder();
+    private final LongAdder finishedSpans = new LongAdder();
+    private final LongAdder flushedTraces = new LongAdder();
+    private final LongAdder flushedBytes = new LongAdder();
+    private final LongAdder partialTraces = new LongAdder();
+    private final LongAdder partialBytes = new LongAdder();
+    private final LongAdder clientSpansWithoutContext = new LongAdder();
+
+    private final LongAdder singleSpanSampled = new LongAdder();
+    private final LongAdder singleSpanUnsampled = new LongAdder();
+
+    private final LongAdder capturedContinuations = new LongAdder();
+    private final LongAdder cancelledContinuations = new LongAdder();
+    private final LongAdder finishedContinuations = new LongAdder();
+
+    private final LongAdder activatedScopes = new LongAdder();
+    private final LongAdder closedScopes = new LongAdder();
+    private final LongAdder scopeStackOverflow = new LongAdder();
+    private final LongAdder scopeCloseErrors = new LongAdder();
+    private final LongAdder userScopeCloseErrors = new LongAdder();
+
+    private final LongAdder longRunningTracesWrite = new LongAdder();
+    private final LongAdder longRunningTracesDropped = new LongAdder();
+    private final LongAdder longRunningTracesExpired = new LongAdder();
+
+    private final LongAdder orgGuardEnforceMismatch = new LongAdder();
+    private final LongAdder orgGuardEnforceStrictMissing = new LongAdder();
+
+    private final LongAdder clientStatsProcessedSpans = new LongAdder();
+    private final LongAdder clientStatsProcessedTraces = new LongAdder();
+    private final LongAdder clientStatsP0DroppedSpans = new LongAdder();
+    private final LongAdder clientStatsP0DroppedTraces = new LongAdder();
+    private final LongAdder clientStatsRequests = new LongAdder();
+    private final LongAdder clientStatsErrors = new LongAdder();
+    private final LongAdder clientStatsDowngrades = new LongAdder();
+
+    private final LongAdder statsAggregateDropped = new LongAdder();
+    private final LongAdder statsInboxFull = new LongAdder();
+
+    private final StatsDClient statsd;
+    private final long interval;
+    private final TimeUnit units;
+
+    @Override
+    public void start() {
+        if (started.compareAndSet(false, true)) {
+            cancellation = AgentTaskScheduler.get().scheduleAtFixedRate(new Flush(), this, interval, interval, units);
+        }
+    }
+
+    public TracerHealthMetrics(final StatsDClient statsd) {
+        this(statsd, 30, SECONDS);
+    }
+
+    public TracerHealthMetrics(final StatsDClient statsd, long interval, TimeUnit units) {
+        this.statsd = statsd;
+        this.interval = interval;
+        this.units = units;
+    }
+
+    @Override
+    public void onStart(final int queueCapacity) {
+        statsd.gauge("queue.max_length", queueCapacity, NO_TAGS);
+    }
+
+    @Override
+    public void onShutdown(final boolean flushSuccess) {}
+
+    @Override
+    public void onPublish(final List<DDSpan> trace, final int samplingPriority) {
+        switch (samplingPriority) {
+            case USER_DROP:
+                userDropEnqueuedTraces.increment();
+                break;
+            case USER_KEEP:
+                userKeepEnqueuedTraces.increment();
+                break;
+            case SAMPLER_DROP:
+                samplerDropEnqueuedTraces.increment();
+                break;
+            case SAMPLER_KEEP:
+                samplerKeepEnqueuedTraces.increment();
+                break;
+            default:
+                unsetPriorityEnqueuedTraces.increment();
+        }
+        enqueuedSpans.add(trace.size());
+        checkForClientSpansWithoutContext(trace);
+    }
+
+    private void checkForClientSpansWithoutContext(final List<DDSpan> trace) {
+        for (DDSpan span : trace) {
+            if (span != null && span.getParentId() == ZERO) {
+                String spanKind = span.getTag(SPAN_KIND, "undefined");
+                if (SPAN_KIND_CLIENT.equals(spanKind)) {
+                    this.clientSpansWithoutContext.increment();
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onFailedPublish(final int samplingPriority, final int spanCount) {
+        switch (samplingPriority) {
+            case USER_DROP:
+                userDropDroppedSpans.add(spanCount);
+                userDropDroppedTraces.increment();
+                break;
+            case USER_KEEP:
+                userKeepDroppedSpans.add(spanCount);
+                userKeepDroppedTraces.increment();
+                break;
+            case SAMPLER_DROP:
+                samplerDropDroppedSpans.add(spanCount);
+                samplerDropDroppedTraces.increment();
+                break;
+            case SAMPLER_KEEP:
+                samplerKeepDroppedSpans.add(spanCount);
+                samplerKeepDroppedTraces.increment();
+                break;
+            default:
+                unsetPriorityDroppedSpans.add(spanCount);
+                unsetPriorityDroppedTraces.increment();
+        }
+    }
+
+    @Override
+    public void onPartialPublish(final int numberOfDroppedSpans) {
+        partialTraces.increment();
+        samplerDropDroppedSpans.add(numberOfDroppedSpans);
+    }
+
+    @Override
+    public void onScheduleFlush(final boolean previousIncomplete) {
+        // not recorded
+    }
+
+    @Override
+    public void onFlush(final boolean early) {}
+
+    @Override
+    public void onPartialFlush(final int sizeInBytes) {
+        partialBytes.add(sizeInBytes);
+    }
+
+    @Override
+    public void onSingleSpanSample() {
+        singleSpanSampled.increment();
+    }
+
+    @Override
+    public void onSingleSpanUnsampled() {
+        singleSpanUnsampled.increment();
+    }
+
+    @Override
+    public void onSerialize(final int serializedSizeInBytes) {
+        // DQH - Because of Java tracer's 2 phase acceptance and serialization scheme, this doesn't
+        // map precisely
+        enqueuedBytes.add(serializedSizeInBytes);
+    }
+
+    @Override
+    public void onFailedSerialize(final List<DDSpan> trace, final Throwable optionalCause) {
+        if (trace != null) {
+            serialFailedDroppedTraces.increment();
+            serialFailedDroppedSpans.add(trace.size());
         }
-      }
-    }
-  }
-
-  @Override
-  public void onFailedPublish(final int samplingPriority, final int spanCount) {
-    switch (samplingPriority) {
-      case USER_DROP:
-        userDropDroppedSpans.add(spanCount);
-        userDropDroppedTraces.increment();
-        break;
-      case USER_KEEP:
-        userKeepDroppedSpans.add(spanCount);
-        userKeepDroppedTraces.increment();
-        break;
-      case SAMPLER_DROP:
-        samplerDropDroppedSpans.add(spanCount);
-        samplerDropDroppedTraces.increment();
-        break;
-      case SAMPLER_KEEP:
-        samplerKeepDroppedSpans.add(spanCount);
-        samplerKeepDroppedTraces.increment();
-        break;
-      default:
-        unsetPriorityDroppedSpans.add(spanCount);
-        unsetPriorityDroppedTraces.increment();
-    }
-  }
-
-  @Override
-  public void onPartialPublish(final int numberOfDroppedSpans) {
-    partialTraces.increment();
-    samplerDropDroppedSpans.add(numberOfDroppedSpans);
-  }
-
-  @Override
-  public void onScheduleFlush(final boolean previousIncomplete) {
-    // not recorded
-  }
-
-  @Override
-  public void onFlush(final boolean early) {}
-
-  @Override
-  public void onPartialFlush(final int sizeInBytes) {
-    partialBytes.add(sizeInBytes);
-  }
-
-  @Override
-  public void onSingleSpanSample() {
-    singleSpanSampled.increment();
-  }
-
-  @Override
-  public void onSingleSpanUnsampled() {
-    singleSpanUnsampled.increment();
-  }
-
-  @Override
-  public void onSerialize(final int serializedSizeInBytes) {
-    // DQH - Because of Java tracer's 2 phase acceptance and serialization scheme, this doesn't
-    // map precisely
-    enqueuedBytes.add(serializedSizeInBytes);
-  }
-
-  @Override
-  public void onFailedSerialize(final List<DDSpan> trace, final Throwable optionalCause) {
-    if (trace != null) {
-      serialFailedDroppedTraces.increment();
-      serialFailedDroppedSpans.add(trace.size());
-    }
-  }
-
-  @Override
-  public void onCreateSpan() {
-    createdSpans.increment();
-  }
-
-  @Override
-  public void onFinishSpan() {
-    finishedSpans.increment();
-  }
-
-  @Override
-  public void onCreateTrace() {
-    createdTraces.increment();
-  }
-
-  @Override
-  public void onScopeCloseError(boolean manual) {
-    scopeCloseErrors.increment();
-    if (manual) {
-      userScopeCloseErrors.increment();
-    }
-  }
-
-  @Override
-  public void onCaptureContinuation() {
-    capturedContinuations.increment();
-  }
-
-  @Override
-  public void onCancelContinuation() {
-    cancelledContinuations.increment();
-  }
-
-  @Override
-  public void onFinishContinuation() {
-    finishedContinuations.increment();
-  }
-
-  @Override
-  public void onActivateScope() {
-    activatedScopes.increment();
-  }
-
-  @Override
-  public void onCloseScope() {
-    closedScopes.increment();
-  }
-
-  @Override
-  public void onScopeStackOverflow() {
-    scopeStackOverflow.increment();
-  }
-
-  @Override
-  public void onOrgGuardEnforce(OrgGuard.Reason reason) {
-    switch (reason) {
-      case MISMATCH:
-        orgGuardEnforceMismatch.increment();
-        break;
-      case STRICT_MISSING:
-        orgGuardEnforceStrictMissing.increment();
-        break;
-    }
-  }
-
-  @Override
-  public void onSend(
-      final int traceCount, final int sizeInBytes, final RemoteApi.Response response) {
-    onSendAttempt(traceCount, sizeInBytes, response);
-  }
-
-  @Override
-  public void onFailedSend(
-      final int traceCount, final int sizeInBytes, final RemoteApi.Response response) {
-    onSendAttempt(traceCount, sizeInBytes, response);
-  }
-
-  @Override
-  public void onLongRunningUpdate(final int dropped, final int write, final int expired) {
-    longRunningTracesWrite.add(write);
-    longRunningTracesDropped.add(dropped);
-    longRunningTracesExpired.add(expired);
-  }
-
-  private void onSendAttempt(
-      final int traceCount, final int sizeInBytes, final RemoteApi.Response response) {
-    apiRequests.increment();
-    flushedTraces.add(traceCount);
-    // TODO: missing queue.spans (# of spans being sent)
-    flushedBytes.add(sizeInBytes);
-
-    if (response.exception().isPresent()) {
-      // covers communication errors -- both not receiving a response or
-      // receiving malformed response (even when otherwise successful)
-      apiErrors.increment();
-    }
-
-    int status = response.status().orElse(0);
-    if (status != 0) {
-      if (200 == status) {
-        apiResponsesOK.increment();
-      } else {
-        statsd.incrementCounter("api.responses.total", statusTagsCache.get(status));
-      }
-    }
-  }
-
-  @Override
-  public void onClientStatTraceComputed(int countedSpans, int totalSpans, boolean dropped) {
-    clientStatsProcessedTraces.increment();
-    clientStatsProcessedSpans.add(countedSpans);
-    if (dropped) {
-      clientStatsP0DroppedTraces.increment();
-      clientStatsP0DroppedSpans.add(totalSpans);
-    }
-  }
-
-  @Override
-  public void onClientStatPayloadSent() {
-    clientStatsRequests.increment();
-  }
-
-  @Override
-  public void onClientStatDowngraded() {
-    clientStatsDowngrades.increment();
-  }
-
-  @Override
-  public void onClientStatErrorReceived() {
-    clientStatsErrors.increment();
-  }
-
-  @Override
-  public void onStatsAggregateDropped() {
-    statsAggregateDropped.increment();
-    statsd.count("datadog.tracer.stats.collapsed_spans", 1, COLLAPSED_WHOLE_KEY_TAGS);
-  }
-
-  @Override
-  public void onStatsInboxFull() {
-    statsInboxFull.increment();
-  }
-
-  @Override
-  public void onTagCardinalityBlocked(String[] statsDTag, long count) {
-    statsd.count("datadog.tracer.stats.collapsed_spans", count, statsDTag);
-  }
-
-  @Override
-  public void close() {
-    if (null != cancellation) {
-      cancellation.cancel();
-    }
-  }
-
-  private static class Flush implements AgentTaskScheduler.Task<TracerHealthMetrics> {
-
-    private static final String[] USER_DROP_TAG = new String[] {"priority:user_drop"};
-    private static final String[] USER_KEEP_TAG = new String[] {"priority:user_keep"};
-    private static final String[] SAMPLER_DROP_TAG = new String[] {"priority:sampler_drop"};
-    private static final String[] SAMPLER_KEEP_TAG = new String[] {"priority:sampler_keep"};
-    private static final String[] SERIAL_FAILED_TAG = new String[] {"failure:serial"};
-    private static final String[] UNSET_TAG = new String[] {"priority:unset"};
-    private static final String[] SINGLE_SPAN_SAMPLER = new String[] {"sampler:single-span"};
-    private static final String[] REASON_LRU_EVICTION_TAG = new String[] {"reason:lru_eviction"};
-    private static final String[] REASON_INBOX_FULL_TAG = new String[] {"reason:inbox_full"};
-    private static final String[] ORG_GUARD_MISMATCH_TAGS = new String[] {"reason:mismatch"};
-    private static final String[] ORG_GUARD_STRICT_MISSING_TAGS =
-        new String[] {"reason:strict_missing"};
-
-    private final long[] previousCounts = new long[54];
-
-    @SuppressFBWarnings("AT_STALE_THREAD_WRITE_OF_PRIMITIVE")
-    private int countIndex;
-
-    @Override
-    public void run(TracerHealthMetrics target) {
-      countIndex = -1; // reposition so _next_ value is 0
-      try {
-
-        reportIfChanged(target.statsd, "api.requests.total", target.apiRequests, NO_TAGS);
-        reportIfChanged(target.statsd, "api.errors.total", target.apiErrors, NO_TAGS);
-        // non-OK responses are reported immediately in onSendAttempt with different status tags
-        reportIfChanged(
-            target.statsd, "api.responses.total", target.apiResponsesOK, STATUS_OK_TAGS);
-
-        reportIfChanged(
-            target.statsd, "queue.enqueued.traces", target.userDropEnqueuedTraces, USER_DROP_TAG);
-        reportIfChanged(
-            target.statsd, "queue.enqueued.traces", target.userKeepEnqueuedTraces, USER_KEEP_TAG);
-        reportIfChanged(
-            target.statsd,
-            "queue.enqueued.traces",
-            target.samplerDropEnqueuedTraces,
-            SAMPLER_DROP_TAG);
-        reportIfChanged(
-            target.statsd,
-            "queue.enqueued.traces",
-            target.samplerKeepEnqueuedTraces,
-            SAMPLER_KEEP_TAG);
-        reportIfChanged(
-            target.statsd, "queue.enqueued.traces", target.unsetPriorityEnqueuedTraces, UNSET_TAG);
-
-        reportIfChanged(
-            target.statsd, "queue.dropped.traces", target.userDropDroppedTraces, USER_DROP_TAG);
-        reportIfChanged(
-            target.statsd, "queue.dropped.traces", target.userKeepDroppedTraces, USER_KEEP_TAG);
-        reportIfChanged(
-            target.statsd,
-            "queue.dropped.traces",
-            target.samplerDropDroppedTraces,
-            SAMPLER_DROP_TAG);
-        reportIfChanged(
-            target.statsd,
-            "queue.dropped.traces",
-            target.samplerKeepDroppedTraces,
-            SAMPLER_KEEP_TAG);
-        reportIfChanged(
-            target.statsd,
-            "queue.dropped.traces",
-            target.serialFailedDroppedTraces,
-            SERIAL_FAILED_TAG);
-        reportIfChanged(
-            target.statsd, "queue.dropped.traces", target.unsetPriorityDroppedTraces, UNSET_TAG);
-
-        reportIfChanged(
-            target.statsd, "queue.dropped.spans", target.userDropDroppedSpans, USER_DROP_TAG);
-        reportIfChanged(
-            target.statsd, "queue.dropped.spans", target.userKeepDroppedSpans, USER_KEEP_TAG);
-        reportIfChanged(
-            target.statsd, "queue.dropped.spans", target.samplerDropDroppedSpans, SAMPLER_DROP_TAG);
-        reportIfChanged(
-            target.statsd, "queue.dropped.spans", target.samplerKeepDroppedSpans, SAMPLER_KEEP_TAG);
-        reportIfChanged(
-            target.statsd,
-            "queue.dropped.spans",
-            target.serialFailedDroppedSpans,
-            SERIAL_FAILED_TAG);
-        reportIfChanged(
-            target.statsd, "queue.dropped.spans", target.unsetPriorityDroppedSpans, UNSET_TAG);
-
-        reportIfChanged(target.statsd, "queue.enqueued.spans", target.enqueuedSpans, NO_TAGS);
-        reportIfChanged(target.statsd, "queue.enqueued.bytes", target.enqueuedBytes, NO_TAGS);
-        reportIfChanged(target.statsd, "trace.pending.created", target.createdTraces, NO_TAGS);
-        reportIfChanged(target.statsd, "span.pending.created", target.createdSpans, NO_TAGS);
-        reportIfChanged(target.statsd, "span.pending.finished", target.finishedSpans, NO_TAGS);
-        reportIfChanged(target.statsd, "flush.traces.total", target.flushedTraces, NO_TAGS);
-        reportIfChanged(target.statsd, "flush.bytes.total", target.flushedBytes, NO_TAGS);
-        reportIfChanged(target.statsd, "queue.partial.traces", target.partialTraces, NO_TAGS);
-        reportIfChanged(target.statsd, "span.flushed.partial", target.partialBytes, NO_TAGS);
-        reportIfChanged(
-            target.statsd, "span.client.no-context", target.clientSpansWithoutContext, NO_TAGS);
-
-        reportIfChanged(
-            target.statsd, "span.sampling.sampled", target.singleSpanSampled, SINGLE_SPAN_SAMPLER);
-        reportIfChanged(
-            target.statsd,
-            "span.sampling.unsampled",
-            target.singleSpanUnsampled,
-            SINGLE_SPAN_SAMPLER);
-
-        reportIfChanged(
-            target.statsd, "span.continuations.captured", target.capturedContinuations, NO_TAGS);
-        reportIfChanged(
-            target.statsd, "span.continuations.canceled", target.cancelledContinuations, NO_TAGS);
-        reportIfChanged(
-            target.statsd, "span.continuations.finished", target.finishedContinuations, NO_TAGS);
-
-        reportIfChanged(target.statsd, "scope.activate.count", target.activatedScopes, NO_TAGS);
-        reportIfChanged(target.statsd, "scope.close.count", target.closedScopes, NO_TAGS);
-        reportIfChanged(
-            target.statsd, "scope.error.stack-overflow", target.scopeStackOverflow, NO_TAGS);
-        reportIfChanged(target.statsd, "scope.close.error", target.scopeCloseErrors, NO_TAGS);
-        reportIfChanged(
-            target.statsd, "scope.user.close.error", target.userScopeCloseErrors, NO_TAGS);
-
-        reportIfChanged(
-            target.statsd, "long-running.write", target.longRunningTracesWrite, NO_TAGS);
-        reportIfChanged(
-            target.statsd, "long-running.dropped", target.longRunningTracesDropped, NO_TAGS);
-        reportIfChanged(
-            target.statsd, "long-running.expired", target.longRunningTracesExpired, NO_TAGS);
-
-        reportIfChanged(
-            target.statsd,
-            "org_guard.enforce",
-            target.orgGuardEnforceMismatch,
-            ORG_GUARD_MISMATCH_TAGS);
-        reportIfChanged(
-            target.statsd,
-            "org_guard.enforce",
-            target.orgGuardEnforceStrictMissing,
-            ORG_GUARD_STRICT_MISSING_TAGS);
-
-        reportIfChanged(
-            target.statsd, "stats.traces_in", target.clientStatsProcessedTraces, NO_TAGS);
-        reportIfChanged(target.statsd, "stats.spans_in", target.clientStatsProcessedSpans, NO_TAGS);
-        reportIfChanged(
-            target.statsd, "stats.dropped_p0_traces", target.clientStatsP0DroppedTraces, NO_TAGS);
-        reportIfChanged(
-            target.statsd, "stats.dropped_p0_spans", target.clientStatsP0DroppedSpans, NO_TAGS);
-        reportIfChanged(target.statsd, "stats.flush_payloads", target.clientStatsRequests, NO_TAGS);
-        reportIfChanged(target.statsd, "stats.flush_errors", target.clientStatsErrors, NO_TAGS);
-        reportIfChanged(
-            target.statsd, "stats.agent_downgrades", target.clientStatsDowngrades, NO_TAGS);
-        reportIfChanged(
-            target.statsd,
-            "stats.dropped_aggregates",
-            target.statsAggregateDropped,
-            REASON_LRU_EVICTION_TAG);
-        reportIfChanged(
-            target.statsd,
-            "stats.dropped_aggregates",
-            target.statsInboxFull,
-            REASON_INBOX_FULL_TAG);
-
-      } catch (ArrayIndexOutOfBoundsException e) {
-        log.warn(
-            "previousCounts array needs resizing to at least {}, was {}",
-            countIndex + 1,
-            previousCounts.length);
-      }
-    }
-
-    private void reportIfChanged(
-        StatsDClient statsDClient, String aspect, LongAdder counter, String[] tags) {
-      long count = counter.sum();
-      long delta = count - previousCounts[++countIndex];
-      if (delta > 0) {
-        statsDClient.count(aspect, delta, tags);
-        previousCounts[countIndex] = count;
-      }
-    }
-  }
-
-  @Override
-  public String summary() {
-    return "apiRequests="
-        + apiRequests.sum()
-        + "\napiErrors="
-        + apiErrors.sum()
-        + "\napiResponsesOK="
-        + apiResponsesOK.sum()
-        + "\n"
-        + "\nuserDropEnqueuedTraces="
-        + userDropEnqueuedTraces.sum()
-        + "\nuserKeepEnqueuedTraces="
-        + userKeepEnqueuedTraces.sum()
-        + "\nsamplerDropEnqueuedTraces="
-        + samplerDropEnqueuedTraces.sum()
-        + "\nsamplerKeepEnqueuedTraces="
-        + samplerKeepEnqueuedTraces.sum()
-        + "\nunsetPriorityEnqueuedTraces="
-        + unsetPriorityEnqueuedTraces.sum()
-        + "\n"
-        + "\nuserDropDroppedTraces="
-        + userDropDroppedTraces.sum()
-        + "\nuserKeepDroppedTraces="
-        + userKeepDroppedTraces.sum()
-        + "\nsamplerDropDroppedTraces="
-        + samplerDropDroppedTraces.sum()
-        + "\nsamplerKeepDroppedTraces="
-        + samplerKeepDroppedTraces.sum()
-        + "\nserialFailedDroppedTraces="
-        + serialFailedDroppedTraces.sum()
-        + "\nunsetPriorityDroppedTraces="
-        + unsetPriorityDroppedTraces.sum()
-        + "\n"
-        + "\nuserDropDroppedSpans="
-        + userDropDroppedSpans.sum()
-        + "\nuserKeepDroppedSpans="
-        + userKeepDroppedSpans.sum()
-        + "\nsamplerDropDroppedSpans="
-        + samplerDropDroppedSpans.sum()
-        + "\nsamplerKeepDroppedSpans="
-        + samplerKeepDroppedSpans.sum()
-        + "\nserialFailedDroppedSpans="
-        + serialFailedDroppedSpans.sum()
-        + "\nunsetPriorityDroppedSpans="
-        + unsetPriorityDroppedSpans.sum()
-        + "\n"
-        + "\nenqueuedSpans="
-        + enqueuedSpans.sum()
-        + "\nenqueuedBytes="
-        + enqueuedBytes.sum()
-        + "\ncreatedTraces="
-        + createdTraces.sum()
-        + "\ncreatedSpans="
-        + createdSpans.sum()
-        + "\nfinishedSpans="
-        + finishedSpans.sum()
-        + "\nflushedTraces="
-        + flushedTraces.sum()
-        + "\nflushedBytes="
-        + flushedBytes.sum()
-        + "\npartialTraces="
-        + partialTraces.sum()
-        + "\npartialBytes="
-        + partialBytes.sum()
-        + "\n"
-        + "\nclientSpansWithoutContext="
-        + clientSpansWithoutContext.sum()
-        + "\n"
-        + "\nsingleSpanSampled="
-        + singleSpanSampled.sum()
-        + "\nsingleSpanUnsampled="
-        + singleSpanUnsampled.sum()
-        + "\n"
-        + "\ncapturedContinuations="
-        + capturedContinuations.sum()
-        + "\ncancelledContinuations="
-        + cancelledContinuations.sum()
-        + "\nfinishedContinuations="
-        + finishedContinuations.sum()
-        + "\n"
-        + "\nactivatedScopes="
-        + activatedScopes.sum()
-        + "\nclosedScopes="
-        + closedScopes.sum()
-        + "\nscopeStackOverflow="
-        + scopeStackOverflow.sum()
-        + "\nscopeCloseErrors="
-        + scopeCloseErrors.sum()
-        + "\nuserScopeCloseErrors="
-        + userScopeCloseErrors.sum()
-        + "\n"
-        + "\nlongRunningTracesWrite="
-        + longRunningTracesWrite.sum()
-        + "\nlongRunningTracesDropped="
-        + longRunningTracesDropped.sum()
-        + "\nlongRunningTracesExpired="
-        + longRunningTracesExpired.sum()
-        + "\n"
-        + "\nclientStatsRequests="
-        + clientStatsRequests.sum()
-        + "\nclientStatsErrors="
-        + clientStatsErrors.sum()
-        + "\nclientStatsDowngrades="
-        + clientStatsDowngrades.sum()
-        + "\nclientStatsP0DroppedSpans="
-        + clientStatsP0DroppedSpans.sum()
-        + "\nclientStatsP0DroppedTraces="
-        + clientStatsP0DroppedTraces.sum()
-        + "\nclientStatsProcessedSpans="
-        + clientStatsProcessedSpans.sum()
-        + "\nclientStatsProcessedTraces="
-        + clientStatsProcessedTraces.sum()
-        + "\nstatsAggregateDropped="
-        + statsAggregateDropped.sum()
-        + "\nstatsInboxFull="
-        + statsInboxFull.sum();
-  }
+    }
+
+    @Override
+    public void onCreateSpan() {
+        createdSpans.increment();
+    }
+
+    @Override
+    public void onFinishSpan() {
+        finishedSpans.increment();
+    }
+
+    @Override
+    public void onCreateTrace() {
+        createdTraces.increment();
+    }
+
+    @Override
+    public void onScopeCloseError(boolean manual) {
+        scopeCloseErrors.increment();
+        if (manual) {
+            userScopeCloseErrors.increment();
+        }
+    }
+
+    @Override
+    public void onCaptureContinuation() {
+        capturedContinuations.increment();
+    }
+
+    @Override
+    public void onCancelContinuation() {
+        cancelledContinuations.increment();
+    }
+
+    @Override
+    public void onFinishContinuation() {
+        finishedContinuations.increment();
+    }
+
+    @Override
+    public void onActivateScope() {
+        activatedScopes.increment();
+    }
+
+    @Override
+    public void onCloseScope() {
+        closedScopes.increment();
+    }
+
+    @Override
+    public void onScopeStackOverflow() {
+        scopeStackOverflow.increment();
+    }
+
+    @Override
+    public void onOrgGuardEnforce(OrgGuard.Reason reason) {
+        switch (reason) {
+            case MISMATCH:
+                orgGuardEnforceMismatch.increment();
+                break;
+            case STRICT_MISSING:
+                orgGuardEnforceStrictMissing.increment();
+                break;
+        }
+    }
+
+    @Override
+    public void onSend(final int traceCount, final int sizeInBytes, final RemoteApi.Response response) {
+        onSendAttempt(traceCount, sizeInBytes, response);
+    }
+
+    @Override
+    public void onFailedSend(final int traceCount, final int sizeInBytes, final RemoteApi.Response response) {
+        onSendAttempt(traceCount, sizeInBytes, response);
+    }
+
+    @Override
+    public void onLongRunningUpdate(final int dropped, final int write, final int expired) {
+        longRunningTracesWrite.add(write);
+        longRunningTracesDropped.add(dropped);
+        longRunningTracesExpired.add(expired);
+    }
+
+    private void onSendAttempt(final int traceCount, final int sizeInBytes, final RemoteApi.Response response) {
+        apiRequests.increment();
+        flushedTraces.add(traceCount);
+        // TODO: missing queue.spans (# of spans being sent)
+        flushedBytes.add(sizeInBytes);
+
+        if (response.exception().isPresent()) {
+            // covers communication errors -- both not receiving a response or
+            // receiving malformed response (even when otherwise successful)
+            apiErrors.increment();
+        }
+
+        int status = response.status().orElse(0);
+        if (status != 0) {
+            if (200 == status) {
+                apiResponsesOK.increment();
+            } else {
+                statsd.incrementCounter("api.responses.total", statusTagsCache.get(status));
+            }
+        }
+    }
+
+    @Override
+    public void onClientStatTraceComputed(int countedSpans, int totalSpans, boolean dropped) {
+        clientStatsProcessedTraces.increment();
+        clientStatsProcessedSpans.add(countedSpans);
+        if (dropped) {
+            clientStatsP0DroppedTraces.increment();
+            clientStatsP0DroppedSpans.add(totalSpans);
+        }
+    }
+
+    @Override
+    public void onClientStatPayloadSent() {
+        clientStatsRequests.increment();
+    }
+
+    @Override
+    public void onClientStatDowngraded() {
+        clientStatsDowngrades.increment();
+    }
+
+    @Override
+    public void onClientStatErrorReceived() {
+        clientStatsErrors.increment();
+    }
+
+    @Override
+    public void onStatsAggregateDropped() {
+        statsAggregateDropped.increment();
+        statsd.count("datadog.tracer.stats.collapsed_spans", 1, COLLAPSED_WHOLE_KEY_TAGS);
+    }
+
+    @Override
+    public void onStatsInboxFull() {
+        statsInboxFull.increment();
+    }
+
+    @Override
+    public void onTagCardinalityBlocked(String[] statsDTag, long count) {
+        statsd.count("datadog.tracer.stats.collapsed_spans", count, statsDTag);
+    }
+
+    @Override
+    public void close() {
+        if (null != cancellation) {
+            cancellation.cancel();
+        }
+    }
+
+    private static class Flush implements AgentTaskScheduler.Task<TracerHealthMetrics> {
+
+        private static final String[] USER_DROP_TAG = new String[] {"priority:user_drop"};
+        private static final String[] USER_KEEP_TAG = new String[] {"priority:user_keep"};
+        private static final String[] SAMPLER_DROP_TAG = new String[] {"priority:sampler_drop"};
+        private static final String[] SAMPLER_KEEP_TAG = new String[] {"priority:sampler_keep"};
+        private static final String[] SERIAL_FAILED_TAG = new String[] {"failure:serial"};
+        private static final String[] UNSET_TAG = new String[] {"priority:unset"};
+        private static final String[] SINGLE_SPAN_SAMPLER = new String[] {"sampler:single-span"};
+        private static final String[] REASON_LRU_EVICTION_TAG = new String[] {"reason:lru_eviction"};
+        private static final String[] REASON_INBOX_FULL_TAG = new String[] {"reason:inbox_full"};
+        private static final String[] ORG_GUARD_MISMATCH_TAGS = new String[] {"reason:mismatch"};
+        private static final String[] ORG_GUARD_STRICT_MISSING_TAGS = new String[] {"reason:strict_missing"};
+
+        private final long[] previousCounts = new long[54];
+
+        @SuppressFBWarnings("AT_STALE_THREAD_WRITE_OF_PRIMITIVE")
+        private int countIndex;
+
+        @Override
+        public void run(TracerHealthMetrics target) {
+            countIndex = -1; // reposition so _next_ value is 0
+            try {
+
+                reportIfChanged(target.statsd, "api.requests.total", target.apiRequests, NO_TAGS);
+                reportIfChanged(target.statsd, "api.errors.total", target.apiErrors, NO_TAGS);
+                // non-OK responses are reported immediately in onSendAttempt with different status tags
+                reportIfChanged(target.statsd, "api.responses.total", target.apiResponsesOK, STATUS_OK_TAGS);
+
+                reportIfChanged(target.statsd, "queue.enqueued.traces", target.userDropEnqueuedTraces, USER_DROP_TAG);
+                reportIfChanged(target.statsd, "queue.enqueued.traces", target.userKeepEnqueuedTraces, USER_KEEP_TAG);
+                reportIfChanged(
+                        target.statsd, "queue.enqueued.traces", target.samplerDropEnqueuedTraces, SAMPLER_DROP_TAG);
+                reportIfChanged(
+                        target.statsd, "queue.enqueued.traces", target.samplerKeepEnqueuedTraces, SAMPLER_KEEP_TAG);
+                reportIfChanged(target.statsd, "queue.enqueued.traces", target.unsetPriorityEnqueuedTraces, UNSET_TAG);
+
+                reportIfChanged(target.statsd, "queue.dropped.traces", target.userDropDroppedTraces, USER_DROP_TAG);
+                reportIfChanged(target.statsd, "queue.dropped.traces", target.userKeepDroppedTraces, USER_KEEP_TAG);
+                reportIfChanged(
+                        target.statsd, "queue.dropped.traces", target.samplerDropDroppedTraces, SAMPLER_DROP_TAG);
+                reportIfChanged(
+                        target.statsd, "queue.dropped.traces", target.samplerKeepDroppedTraces, SAMPLER_KEEP_TAG);
+                reportIfChanged(
+                        target.statsd, "queue.dropped.traces", target.serialFailedDroppedTraces, SERIAL_FAILED_TAG);
+                reportIfChanged(target.statsd, "queue.dropped.traces", target.unsetPriorityDroppedTraces, UNSET_TAG);
+
+                reportIfChanged(target.statsd, "queue.dropped.spans", target.userDropDroppedSpans, USER_DROP_TAG);
+                reportIfChanged(target.statsd, "queue.dropped.spans", target.userKeepDroppedSpans, USER_KEEP_TAG);
+                reportIfChanged(target.statsd, "queue.dropped.spans", target.samplerDropDroppedSpans, SAMPLER_DROP_TAG);
+                reportIfChanged(target.statsd, "queue.dropped.spans", target.samplerKeepDroppedSpans, SAMPLER_KEEP_TAG);
+                reportIfChanged(
+                        target.statsd, "queue.dropped.spans", target.serialFailedDroppedSpans, SERIAL_FAILED_TAG);
+                reportIfChanged(target.statsd, "queue.dropped.spans", target.unsetPriorityDroppedSpans, UNSET_TAG);
+
+                reportIfChanged(target.statsd, "queue.enqueued.spans", target.enqueuedSpans, NO_TAGS);
+                reportIfChanged(target.statsd, "queue.enqueued.bytes", target.enqueuedBytes, NO_TAGS);
+                reportIfChanged(target.statsd, "trace.pending.created", target.createdTraces, NO_TAGS);
+                reportIfChanged(target.statsd, "span.pending.created", target.createdSpans, NO_TAGS);
+                reportIfChanged(target.statsd, "span.pending.finished", target.finishedSpans, NO_TAGS);
+                reportIfChanged(target.statsd, "flush.traces.total", target.flushedTraces, NO_TAGS);
+                reportIfChanged(target.statsd, "flush.bytes.total", target.flushedBytes, NO_TAGS);
+                reportIfChanged(target.statsd, "queue.partial.traces", target.partialTraces, NO_TAGS);
+                reportIfChanged(target.statsd, "span.flushed.partial", target.partialBytes, NO_TAGS);
+                reportIfChanged(target.statsd, "span.client.no-context", target.clientSpansWithoutContext, NO_TAGS);
+
+                reportIfChanged(target.statsd, "span.sampling.sampled", target.singleSpanSampled, SINGLE_SPAN_SAMPLER);
+                reportIfChanged(
+                        target.statsd, "span.sampling.unsampled", target.singleSpanUnsampled, SINGLE_SPAN_SAMPLER);
+
+                reportIfChanged(target.statsd, "span.continuations.captured", target.capturedContinuations, NO_TAGS);
+                reportIfChanged(target.statsd, "span.continuations.canceled", target.cancelledContinuations, NO_TAGS);
+                reportIfChanged(target.statsd, "span.continuations.finished", target.finishedContinuations, NO_TAGS);
+
+                reportIfChanged(target.statsd, "scope.activate.count", target.activatedScopes, NO_TAGS);
+                reportIfChanged(target.statsd, "scope.close.count", target.closedScopes, NO_TAGS);
+                reportIfChanged(target.statsd, "scope.error.stack-overflow", target.scopeStackOverflow, NO_TAGS);
+                reportIfChanged(target.statsd, "scope.close.error", target.scopeCloseErrors, NO_TAGS);
+                reportIfChanged(target.statsd, "scope.user.close.error", target.userScopeCloseErrors, NO_TAGS);
+
+                reportIfChanged(target.statsd, "long-running.write", target.longRunningTracesWrite, NO_TAGS);
+                reportIfChanged(target.statsd, "long-running.dropped", target.longRunningTracesDropped, NO_TAGS);
+                reportIfChanged(target.statsd, "long-running.expired", target.longRunningTracesExpired, NO_TAGS);
+
+                reportIfChanged(
+                        target.statsd, "org_guard.enforce", target.orgGuardEnforceMismatch, ORG_GUARD_MISMATCH_TAGS);
+                reportIfChanged(
+                        target.statsd,
+                        "org_guard.enforce",
+                        target.orgGuardEnforceStrictMissing,
+                        ORG_GUARD_STRICT_MISSING_TAGS);
+
+                reportIfChanged(target.statsd, "stats.traces_in", target.clientStatsProcessedTraces, NO_TAGS);
+                reportIfChanged(target.statsd, "stats.spans_in", target.clientStatsProcessedSpans, NO_TAGS);
+                reportIfChanged(target.statsd, "stats.dropped_p0_traces", target.clientStatsP0DroppedTraces, NO_TAGS);
+                reportIfChanged(target.statsd, "stats.dropped_p0_spans", target.clientStatsP0DroppedSpans, NO_TAGS);
+                reportIfChanged(target.statsd, "stats.flush_payloads", target.clientStatsRequests, NO_TAGS);
+                reportIfChanged(target.statsd, "stats.flush_errors", target.clientStatsErrors, NO_TAGS);
+                reportIfChanged(target.statsd, "stats.agent_downgrades", target.clientStatsDowngrades, NO_TAGS);
+                reportIfChanged(
+                        target.statsd,
+                        "stats.dropped_aggregates",
+                        target.statsAggregateDropped,
+                        REASON_LRU_EVICTION_TAG);
+                reportIfChanged(
+                        target.statsd, "stats.dropped_aggregates", target.statsInboxFull, REASON_INBOX_FULL_TAG);
+
+            } catch (ArrayIndexOutOfBoundsException e) {
+                log.warn(
+                        "previousCounts array needs resizing to at least {}, was {}",
+                        countIndex + 1,
+                        previousCounts.length);
+            }
+        }
+
+        private void reportIfChanged(StatsDClient statsDClient, String aspect, LongAdder counter, String[] tags) {
+            long count = counter.sum();
+            long delta = count - previousCounts[++countIndex];
+            if (delta > 0) {
+                statsDClient.count(aspect, delta, tags);
+                previousCounts[countIndex] = count;
+            }
+        }
+    }
+
+    @Override
+    public String summary() {
+        return "apiRequests="
+                + apiRequests.sum()
+                + "\napiErrors="
+                + apiErrors.sum()
+                + "\napiResponsesOK="
+                + apiResponsesOK.sum()
+                + "\n"
+                + "\nuserDropEnqueuedTraces="
+                + userDropEnqueuedTraces.sum()
+                + "\nuserKeepEnqueuedTraces="
+                + userKeepEnqueuedTraces.sum()
+                + "\nsamplerDropEnqueuedTraces="
+                + samplerDropEnqueuedTraces.sum()
+                + "\nsamplerKeepEnqueuedTraces="
+                + samplerKeepEnqueuedTraces.sum()
+                + "\nunsetPriorityEnqueuedTraces="
+                + unsetPriorityEnqueuedTraces.sum()
+                + "\n"
+                + "\nuserDropDroppedTraces="
+                + userDropDroppedTraces.sum()
+                + "\nuserKeepDroppedTraces="
+                + userKeepDroppedTraces.sum()
+                + "\nsamplerDropDroppedTraces="
+                + samplerDropDroppedTraces.sum()
+                + "\nsamplerKeepDroppedTraces="
+                + samplerKeepDroppedTraces.sum()
+                + "\nserialFailedDroppedTraces="
+                + serialFailedDroppedTraces.sum()
+                + "\nunsetPriorityDroppedTraces="
+                + unsetPriorityDroppedTraces.sum()
+                + "\n"
+                + "\nuserDropDroppedSpans="
+                + userDropDroppedSpans.sum()
+                + "\nuserKeepDroppedSpans="
+                + userKeepDroppedSpans.sum()
+                + "\nsamplerDropDroppedSpans="
+                + samplerDropDroppedSpans.sum()
+                + "\nsamplerKeepDroppedSpans="
+                + samplerKeepDroppedSpans.sum()
+                + "\nserialFailedDroppedSpans="
+                + serialFailedDroppedSpans.sum()
+                + "\nunsetPriorityDroppedSpans="
+                + unsetPriorityDroppedSpans.sum()
+                + "\n"
+                + "\nenqueuedSpans="
+                + enqueuedSpans.sum()
+                + "\nenqueuedBytes="
+                + enqueuedBytes.sum()
+                + "\ncreatedTraces="
+                + createdTraces.sum()
+                + "\ncreatedSpans="
+                + createdSpans.sum()
+                + "\nfinishedSpans="
+                + finishedSpans.sum()
+                + "\nflushedTraces="
+                + flushedTraces.sum()
+                + "\nflushedBytes="
+                + flushedBytes.sum()
+                + "\npartialTraces="
+                + partialTraces.sum()
+                + "\npartialBytes="
+                + partialBytes.sum()
+                + "\n"
+                + "\nclientSpansWithoutContext="
+                + clientSpansWithoutContext.sum()
+                + "\n"
+                + "\nsingleSpanSampled="
+                + singleSpanSampled.sum()
+                + "\nsingleSpanUnsampled="
+                + singleSpanUnsampled.sum()
+                + "\n"
+                + "\ncapturedContinuations="
+                + capturedContinuations.sum()
+                + "\ncancelledContinuations="
+                + cancelledContinuations.sum()
+                + "\nfinishedContinuations="
+                + finishedContinuations.sum()
+                + "\n"
+                + "\nactivatedScopes="
+                + activatedScopes.sum()
+                + "\nclosedScopes="
+                + closedScopes.sum()
+                + "\nscopeStackOverflow="
+                + scopeStackOverflow.sum()
+                + "\nscopeCloseErrors="
+                + scopeCloseErrors.sum()
+                + "\nuserScopeCloseErrors="
+                + userScopeCloseErrors.sum()
+                + "\n"
+                + "\nlongRunningTracesWrite="
+                + longRunningTracesWrite.sum()
+                + "\nlongRunningTracesDropped="
+                + longRunningTracesDropped.sum()
+                + "\nlongRunningTracesExpired="
+                + longRunningTracesExpired.sum()
+                + "\n"
+                + "\nclientStatsRequests="
+                + clientStatsRequests.sum()
+                + "\nclientStatsErrors="
+                + clientStatsErrors.sum()
+                + "\nclientStatsDowngrades="
+                + clientStatsDowngrades.sum()
+                + "\nclientStatsP0DroppedSpans="
+                + clientStatsP0DroppedSpans.sum()
+                + "\nclientStatsP0DroppedTraces="
+                + clientStatsP0DroppedTraces.sum()
+                + "\nclientStatsProcessedSpans="
+                + clientStatsProcessedSpans.sum()
+                + "\nclientStatsProcessedTraces="
+                + clientStatsProcessedTraces.sum()
+                + "\nstatsAggregateDropped="
+                + statsAggregateDropped.sum()
+                + "\nstatsInboxFull="
+                + statsInboxFull.sum();
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/LazyJsonArray.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/LazyJsonArray.java
index 1c61dbd88f0..efb0ea4cc79 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/LazyJsonArray.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/LazyJsonArray.java
@@ -4,26 +4,26 @@
 
 /** Tracks a JSON array that's opened lazily, on its first element, and closed once done. */
 public final class LazyJsonArray {
-  private boolean open;
+    private boolean open;
 
-  /** Opens the named array if it isn't already open. */
-  public void ensureOpen(JsonWriter writer, String name) {
-    if (!open) {
-      writer.name(name).beginArray();
-      open = true;
+    /** Opens the named array if it isn't already open. */
+    public void ensureOpen(JsonWriter writer, String name) {
+        if (!open) {
+            writer.name(name).beginArray();
+            open = true;
+        }
     }
-  }
 
-  /** Closes the array if it's currently open. */
-  public void closeIfOpen(JsonWriter writer) {
-    if (open) {
-      writer.endArray();
-      open = false;
+    /** Closes the array if it's currently open. */
+    public void closeIfOpen(JsonWriter writer) {
+        if (open) {
+            writer.endArray();
+            open = false;
+        }
     }
-  }
 
-  /** Resets the tracked state without touching the writer. */
-  public void reset() {
-    open = false;
-  }
+    /** Resets the tracked state without touching the writer. */
+    public void reset() {
+        open = false;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpCommonJson.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpCommonJson.java
index 070b6e420b1..f097c26b9c0 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpCommonJson.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpCommonJson.java
@@ -18,145 +18,145 @@
 
 /** Provides writers for OpenTelemetry's "common.proto" JSON encoding. */
 public final class OtlpCommonJson {
-  private OtlpCommonJson() {}
-
-  /** Hex-encodes a 128-bit trace id, per the OTLP JSON encoding spec. */
-  public static String hexTraceId(DDTraceId traceId) {
-    return traceId.toHexString();
-  }
-
-  /** Hex-encodes a 64-bit span/parent id, per the OTLP JSON encoding spec. */
-  public static String hexSpanId(long spanId) {
-    return DDSpanId.toHexStringPadded(spanId);
-  }
-
-  public static void writeInstrumentationScope(JsonWriter writer, OtelInstrumentationScope scope) {
-    writer.beginObject();
-    writer.name("name").value(scope.getName().toString());
-    if (scope.getVersion() != null) {
-      writer.name("version").value(scope.getVersion().toString());
+    private OtlpCommonJson() {}
+
+    /** Hex-encodes a 128-bit trace id, per the OTLP JSON encoding spec. */
+    public static String hexTraceId(DDTraceId traceId) {
+        return traceId.toHexString();
+    }
+
+    /** Hex-encodes a 64-bit span/parent id, per the OTLP JSON encoding spec. */
+    public static String hexSpanId(long spanId) {
+        return DDSpanId.toHexStringPadded(spanId);
+    }
+
+    public static void writeInstrumentationScope(JsonWriter writer, OtelInstrumentationScope scope) {
+        writer.beginObject();
+        writer.name("name").value(scope.getName().toString());
+        if (scope.getVersion() != null) {
+            writer.name("version").value(scope.getVersion().toString());
+        }
+        writer.endObject();
+    }
+
+    /** Writes a scope's {@code "scope"} and optional sibling {@code "schemaUrl"} fields. */
+    public static void writeScopeAndSchema(JsonWriter writer, OtelInstrumentationScope scope) {
+        writer.name("scope");
+        writeInstrumentationScope(writer, scope);
+        if (scope.getSchemaUrl() != null) {
+            writer.name("schemaUrl").value(scope.getSchemaUrl().toString());
+        }
+    }
+
+    /** Writes one {@code KeyValue} JSON object: {@code {"key":...,"value":{...}}}. */
+    @SuppressWarnings("unchecked")
+    public static void writeAttribute(JsonWriter writer, int type, CharSequence key, Object value) {
+        writeAttributeKey(writer, key);
+        switch (type) {
+            case STRING_ATTRIBUTE:
+                writeStringValue(writer, (String) value);
+                break;
+            case BOOLEAN_ATTRIBUTE:
+                writeBooleanValue(writer, (boolean) value);
+                break;
+            case LONG_ATTRIBUTE:
+                writeIntValue(writer, ((Number) value).longValue());
+                break;
+            case DOUBLE_ATTRIBUTE:
+                writeDoubleValue(writer, ((Number) value).doubleValue());
+                break;
+            case STRING_ARRAY_ATTRIBUTE:
+                writeArrayValue(writer, STRING_ATTRIBUTE, (List<String>) value);
+                break;
+            case BOOLEAN_ARRAY_ATTRIBUTE:
+                writeArrayValue(writer, BOOLEAN_ATTRIBUTE, (List<Boolean>) value);
+                break;
+            case LONG_ARRAY_ATTRIBUTE:
+                writeArrayValue(writer, LONG_ATTRIBUTE, (List<? extends Number>) value);
+                break;
+            case DOUBLE_ARRAY_ATTRIBUTE:
+                writeArrayValue(writer, DOUBLE_ATTRIBUTE, (List<? extends Number>) value);
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown attribute type: " + type);
+        }
+        writer.endObject();
+    }
+
+    public static void writeAttribute(JsonWriter writer, UTF8BytesString key, String value) {
+        writeAttribute(writer, STRING_ATTRIBUTE, key.toString(), value);
+    }
+
+    public static void writeAttribute(JsonWriter writer, UTF8BytesString key, long value) {
+        writeAttributeKey(writer, key);
+        writeIntValue(writer, value);
+        writer.endObject();
+    }
+
+    private static void writeAttributeKey(JsonWriter writer, CharSequence key) {
+        writer.beginObject();
+        writer.name("key").value(key.toString());
+        writer.name("value");
+    }
+
+    private static void writeArrayValue(JsonWriter writer, int elementType, List<?> values) {
+        writer.beginObject();
+        writer.name("arrayValue").beginObject();
+        writer.name("values").beginArray();
+        for (Object value : values) {
+            writeAnyValue(writer, elementType, value);
+        }
+        writer.endArray();
+        writer.endObject();
+        writer.endObject();
+    }
+
+    private static void writeAnyValue(JsonWriter writer, int type, Object value) {
+        switch (type) {
+            case STRING_ATTRIBUTE:
+                writeStringValue(writer, (String) value);
+                break;
+            case BOOLEAN_ATTRIBUTE:
+                writeBooleanValue(writer, (boolean) value);
+                break;
+            case LONG_ATTRIBUTE:
+                writeIntValue(writer, ((Number) value).longValue());
+                break;
+            case DOUBLE_ATTRIBUTE:
+                writeDoubleValue(writer, ((Number) value).doubleValue());
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown attribute type: " + type);
+        }
     }
-    writer.endObject();
-  }
-
-  /** Writes a scope's {@code "scope"} and optional sibling {@code "schemaUrl"} fields. */
-  public static void writeScopeAndSchema(JsonWriter writer, OtelInstrumentationScope scope) {
-    writer.name("scope");
-    writeInstrumentationScope(writer, scope);
-    if (scope.getSchemaUrl() != null) {
-      writer.name("schemaUrl").value(scope.getSchemaUrl().toString());
+
+    private static void writeStringValue(JsonWriter writer, String value) {
+        writer.beginObject().name("stringValue").value(value).endObject();
     }
-  }
-
-  /** Writes one {@code KeyValue} JSON object: {@code {"key":...,"value":{...}}}. */
-  @SuppressWarnings("unchecked")
-  public static void writeAttribute(JsonWriter writer, int type, CharSequence key, Object value) {
-    writeAttributeKey(writer, key);
-    switch (type) {
-      case STRING_ATTRIBUTE:
-        writeStringValue(writer, (String) value);
-        break;
-      case BOOLEAN_ATTRIBUTE:
-        writeBooleanValue(writer, (boolean) value);
-        break;
-      case LONG_ATTRIBUTE:
-        writeIntValue(writer, ((Number) value).longValue());
-        break;
-      case DOUBLE_ATTRIBUTE:
-        writeDoubleValue(writer, ((Number) value).doubleValue());
-        break;
-      case STRING_ARRAY_ATTRIBUTE:
-        writeArrayValue(writer, STRING_ATTRIBUTE, (List<String>) value);
-        break;
-      case BOOLEAN_ARRAY_ATTRIBUTE:
-        writeArrayValue(writer, BOOLEAN_ATTRIBUTE, (List<Boolean>) value);
-        break;
-      case LONG_ARRAY_ATTRIBUTE:
-        writeArrayValue(writer, LONG_ATTRIBUTE, (List<? extends Number>) value);
-        break;
-      case DOUBLE_ARRAY_ATTRIBUTE:
-        writeArrayValue(writer, DOUBLE_ATTRIBUTE, (List<? extends Number>) value);
-        break;
-      default:
-        throw new IllegalArgumentException("Unknown attribute type: " + type);
+
+    private static void writeBooleanValue(JsonWriter writer, boolean value) {
+        writer.beginObject().name("boolValue").value(value).endObject();
     }
-    writer.endObject();
-  }
-
-  public static void writeAttribute(JsonWriter writer, UTF8BytesString key, String value) {
-    writeAttribute(writer, STRING_ATTRIBUTE, key.toString(), value);
-  }
-
-  public static void writeAttribute(JsonWriter writer, UTF8BytesString key, long value) {
-    writeAttributeKey(writer, key);
-    writeIntValue(writer, value);
-    writer.endObject();
-  }
-
-  private static void writeAttributeKey(JsonWriter writer, CharSequence key) {
-    writer.beginObject();
-    writer.name("key").value(key.toString());
-    writer.name("value");
-  }
-
-  private static void writeArrayValue(JsonWriter writer, int elementType, List<?> values) {
-    writer.beginObject();
-    writer.name("arrayValue").beginObject();
-    writer.name("values").beginArray();
-    for (Object value : values) {
-      writeAnyValue(writer, elementType, value);
+
+    private static void writeIntValue(JsonWriter writer, long value) {
+        // int64 fields are encoded as decimal strings, per the OTLP JSON encoding spec
+        writer.beginObject().name("intValue").value(Long.toString(value)).endObject();
     }
-    writer.endArray();
-    writer.endObject();
-    writer.endObject();
-  }
-
-  private static void writeAnyValue(JsonWriter writer, int type, Object value) {
-    switch (type) {
-      case STRING_ATTRIBUTE:
-        writeStringValue(writer, (String) value);
-        break;
-      case BOOLEAN_ATTRIBUTE:
-        writeBooleanValue(writer, (boolean) value);
-        break;
-      case LONG_ATTRIBUTE:
-        writeIntValue(writer, ((Number) value).longValue());
-        break;
-      case DOUBLE_ATTRIBUTE:
-        writeDoubleValue(writer, ((Number) value).doubleValue());
-        break;
-      default:
-        throw new IllegalArgumentException("Unknown attribute type: " + type);
+
+    private static void writeDoubleValue(JsonWriter writer, double value) {
+        writer.beginObject().name("doubleValue");
+        writeDouble(writer, value);
+        writer.endObject();
     }
-  }
-
-  private static void writeStringValue(JsonWriter writer, String value) {
-    writer.beginObject().name("stringValue").value(value).endObject();
-  }
-
-  private static void writeBooleanValue(JsonWriter writer, boolean value) {
-    writer.beginObject().name("boolValue").value(value).endObject();
-  }
-
-  private static void writeIntValue(JsonWriter writer, long value) {
-    // int64 fields are encoded as decimal strings, per the OTLP JSON encoding spec
-    writer.beginObject().name("intValue").value(Long.toString(value)).endObject();
-  }
-
-  private static void writeDoubleValue(JsonWriter writer, double value) {
-    writer.beginObject().name("doubleValue");
-    writeDouble(writer, value);
-    writer.endObject();
-  }
-
-  /** Writes a double per the OTLP/ProtoJSON encoding spec: NaN/Infinity as JSON strings. */
-  public static void writeDouble(JsonWriter writer, double value) {
-    if (Double.isNaN(value)) {
-      writer.value("NaN");
-    } else if (Double.isInfinite(value)) {
-      writer.value(value > 0 ? "Infinity" : "-Infinity");
-    } else {
-      writer.value(value);
+
+    /** Writes a double per the OTLP/ProtoJSON encoding spec: NaN/Infinity as JSON strings. */
+    public static void writeDouble(JsonWriter writer, double value) {
+        if (Double.isNaN(value)) {
+            writer.value("NaN");
+        } else if (Double.isInfinite(value)) {
+            writer.value(value > 0 ? "Infinity" : "-Infinity");
+        } else {
+            writer.value(value);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpCommonProto.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpCommonProto.java
index 88fc102a335..3a4a76a4cb2 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpCommonProto.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpCommonProto.java
@@ -25,339 +25,325 @@
  * <p>Embedded message sizes are precomputed to avoid the need for temporary buffers.
  */
 public final class OtlpCommonProto {
-  private OtlpCommonProto() {}
-
-  // wire types supported in protobuf v3
-  public static final int VARINT_WIRE_TYPE = 0;
-  public static final int I64_WIRE_TYPE = 1;
-  public static final int LEN_WIRE_TYPE = 2;
-  public static final int I32_WIRE_TYPE = 5;
-
-  // use same cache approach for attribute keys as TraceMapperV0_4
-  private static final SimpleUtf8Cache KEY_CACHE =
-      Config.get().getTagNameUtf8CacheSize() > 0
-          ? new SimpleUtf8Cache(Config.get().getTagNameUtf8CacheSize())
-          : null;
-
-  // use same cache approach for attribute values as TraceMapperV0_4
-  private static final GenerationalUtf8Cache VALUE_CACHE =
-      Config.get().getTagValueUtf8CacheSize() > 0
-          ? new GenerationalUtf8Cache(Config.get().getTagValueUtf8CacheSize())
-          : null;
-
-  public static void recalibrateCaches() {
-    if (VALUE_CACHE != null) {
-      VALUE_CACHE.recalibrate();
+    private OtlpCommonProto() {}
+
+    // wire types supported in protobuf v3
+    public static final int VARINT_WIRE_TYPE = 0;
+    public static final int I64_WIRE_TYPE = 1;
+    public static final int LEN_WIRE_TYPE = 2;
+    public static final int I32_WIRE_TYPE = 5;
+
+    // use same cache approach for attribute keys as TraceMapperV0_4
+    private static final SimpleUtf8Cache KEY_CACHE = Config.get().getTagNameUtf8CacheSize() > 0
+            ? new SimpleUtf8Cache(Config.get().getTagNameUtf8CacheSize())
+            : null;
+
+    // use same cache approach for attribute values as TraceMapperV0_4
+    private static final GenerationalUtf8Cache VALUE_CACHE = Config.get().getTagValueUtf8CacheSize() > 0
+            ? new GenerationalUtf8Cache(Config.get().getTagValueUtf8CacheSize())
+            : null;
+
+    public static void recalibrateCaches() {
+        if (VALUE_CACHE != null) {
+            VALUE_CACHE.recalibrate();
+        }
     }
-  }
 
-  public static int sizeVarInt(int value) {
-    return 1 + (31 - Integer.numberOfLeadingZeros(value)) / 7;
-  }
+    public static int sizeVarInt(int value) {
+        return 1 + (31 - Integer.numberOfLeadingZeros(value)) / 7;
+    }
+
+    public static int sizeVarInt(long value) {
+        return 1 + (63 - Long.numberOfLeadingZeros(value)) / 7;
+    }
+
+    public static void writeVarInt(ByteBuffer buf, int value) {
+        for (int i = 1, len = sizeVarInt(value); i < len; i++) {
+            buf.put((byte) ((value & 0x7f) | 0x80));
+            value >>>= 7;
+        }
+        buf.put((byte) value);
+    }
 
-  public static int sizeVarInt(long value) {
-    return 1 + (63 - Long.numberOfLeadingZeros(value)) / 7;
-  }
+    public static void writeVarInt(StreamingBuffer buf, int value) {
+        for (int i = 1, len = sizeVarInt(value); i < len; i++) {
+            buf.put((byte) ((value & 0x7f) | 0x80));
+            value >>>= 7;
+        }
+        buf.put((byte) value);
+    }
+
+    public static void writeVarInt(StreamingBuffer buf, long value) {
+        for (int i = 1, len = sizeVarInt(value); i < len; i++) {
+            buf.put((byte) ((value & 0x7f) | 0x80));
+            value >>>= 7;
+        }
+        buf.put((byte) value);
+    }
+
+    public static void writeI32(StreamingBuffer buf, int value) {
+        buf.putInt(Integer.reverseBytes(value)); // convert to little-endian
+    }
 
-  public static void writeVarInt(ByteBuffer buf, int value) {
-    for (int i = 1, len = sizeVarInt(value); i < len; i++) {
-      buf.put((byte) ((value & 0x7f) | 0x80));
-      value >>>= 7;
+    public static void writeI32(StreamingBuffer buf, float value) {
+        writeI32(buf, Float.floatToRawIntBits(value));
     }
-    buf.put((byte) value);
-  }
 
-  public static void writeVarInt(StreamingBuffer buf, int value) {
-    for (int i = 1, len = sizeVarInt(value); i < len; i++) {
-      buf.put((byte) ((value & 0x7f) | 0x80));
-      value >>>= 7;
+    public static void writeI64(StreamingBuffer buf, long value) {
+        buf.putLong(Long.reverseBytes(value)); // convert to little-endian
     }
-    buf.put((byte) value);
-  }
 
-  public static void writeVarInt(StreamingBuffer buf, long value) {
-    for (int i = 1, len = sizeVarInt(value); i < len; i++) {
-      buf.put((byte) ((value & 0x7f) | 0x80));
-      value >>>= 7;
+    public static void writeI64(StreamingBuffer buf, double value) {
+        writeI64(buf, Double.doubleToRawLongBits(value));
     }
-    buf.put((byte) value);
-  }
-
-  public static void writeI32(StreamingBuffer buf, int value) {
-    buf.putInt(Integer.reverseBytes(value)); // convert to little-endian
-  }
-
-  public static void writeI32(StreamingBuffer buf, float value) {
-    writeI32(buf, Float.floatToRawIntBits(value));
-  }
-
-  public static void writeI64(StreamingBuffer buf, long value) {
-    buf.putLong(Long.reverseBytes(value)); // convert to little-endian
-  }
-
-  public static void writeI64(StreamingBuffer buf, double value) {
-    writeI64(buf, Double.doubleToRawLongBits(value));
-  }
-
-  public static void writeString(StreamingBuffer buf, byte[] utf8) {
-    writeVarInt(buf, utf8.length);
-    buf.put(utf8);
-  }
-
-  public static void writeString(StreamingBuffer buf, String value) {
-    writeString(buf, value.getBytes(UTF_8));
-  }
-
-  public static void writeStringCached(StreamingBuffer buf, String value) {
-    writeString(buf, valueUtf8(value));
-  }
-
-  public static int sizeTag(int fieldNum) {
-    return sizeVarInt(fieldNum << 3);
-  }
-
-  public static void writeTag(ByteBuffer buf, int fieldNum, int wireType) {
-    writeVarInt(buf, fieldNum << 3 | wireType);
-  }
-
-  public static void writeTag(StreamingBuffer buf, int fieldNum, int wireType) {
-    writeVarInt(buf, fieldNum << 3 | wireType);
-  }
-
-  public static void writeInstrumentationScope(
-      StreamingBuffer buf, OtelInstrumentationScope scope) {
-    byte[] nameUtf8 = scope.getName().getUtf8Bytes();
-    int scopeSize = 1 + sizeVarInt(nameUtf8.length) + nameUtf8.length;
-    byte[] versionUtf8 = null;
-    if (scope.getVersion() != null) {
-      versionUtf8 = scope.getVersion().getUtf8Bytes();
-      scopeSize += 1 + sizeVarInt(versionUtf8.length) + versionUtf8.length;
+
+    public static void writeString(StreamingBuffer buf, byte[] utf8) {
+        writeVarInt(buf, utf8.length);
+        buf.put(utf8);
     }
-    writeVarInt(buf, scopeSize);
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    writeString(buf, nameUtf8);
-    if (versionUtf8 != null) {
-      writeTag(buf, 2, LEN_WIRE_TYPE);
-      writeString(buf, versionUtf8);
+
+    public static void writeString(StreamingBuffer buf, String value) {
+        writeString(buf, value.getBytes(UTF_8));
     }
-  }
-
-  @SuppressWarnings("unchecked")
-  public static void writeAttribute(StreamingBuffer buf, int type, CharSequence key, Object value) {
-    byte[] keyUtf8;
-    if (key instanceof UTF8BytesString) {
-      keyUtf8 = ((UTF8BytesString) key).getUtf8Bytes();
-    } else {
-      keyUtf8 = keyUtf8(key.toString());
+
+    public static void writeStringCached(StreamingBuffer buf, String value) {
+        writeString(buf, valueUtf8(value));
     }
-    switch (type) {
-      case STRING_ATTRIBUTE:
-        writeStringAttribute(buf, keyUtf8, valueUtf8((String) value));
-        break;
-      case BOOLEAN_ATTRIBUTE:
-        writeBooleanAttribute(buf, keyUtf8, (boolean) value);
-        break;
-      case LONG_ATTRIBUTE:
-        writeLongAttribute(buf, keyUtf8, ((Number) value).longValue());
-        break;
-      case DOUBLE_ATTRIBUTE:
-        writeDoubleAttribute(buf, keyUtf8, ((Number) value).doubleValue());
-        break;
-      case STRING_ARRAY_ATTRIBUTE:
-        writeStringArrayAttribute(buf, keyUtf8, (List<String>) value);
-        break;
-      case BOOLEAN_ARRAY_ATTRIBUTE:
-        writeBooleanArrayAttribute(buf, keyUtf8, (List<Boolean>) value);
-        break;
-      case LONG_ARRAY_ATTRIBUTE:
-        writeLongArrayAttribute(buf, keyUtf8, (List<? extends Number>) value);
-        break;
-      case DOUBLE_ARRAY_ATTRIBUTE:
-        writeDoubleArrayAttribute(buf, keyUtf8, (List<? extends Number>) value);
-        break;
-      default:
-        throw new IllegalArgumentException("Unknown attribute type: " + type);
+
+    public static int sizeTag(int fieldNum) {
+        return sizeVarInt(fieldNum << 3);
     }
-  }
-
-  public static void writeAttribute(
-      StreamingBuffer buf, UTF8BytesString key, UTF8BytesString value) {
-    writeStringAttribute(buf, key.getUtf8Bytes(), value.getUtf8Bytes());
-  }
-
-  public static void writeAttribute(StreamingBuffer buf, UTF8BytesString key, String value) {
-    writeStringAttribute(buf, key.getUtf8Bytes(), valueUtf8(value));
-  }
-
-  public static void writeAttribute(StreamingBuffer buf, UTF8BytesString key, long value) {
-    writeLongAttribute(buf, key.getUtf8Bytes(), value);
-  }
-
-  private static byte[] keyUtf8(String key) {
-    return KEY_CACHE != null ? KEY_CACHE.getUtf8(key) : key.getBytes(UTF_8);
-  }
-
-  private static byte[] valueUtf8(String value) {
-    return VALUE_CACHE != null ? VALUE_CACHE.getUtf8(value) : value.getBytes(UTF_8);
-  }
-
-  private static void writeStringAttribute(StreamingBuffer buf, byte[] keyUtf8, byte[] valueUtf8) {
-    int valueSize = 1 + sizeVarInt(valueUtf8.length) + valueUtf8.length;
-    int keyValueSize =
-        1 + sizeVarInt(keyUtf8.length) + keyUtf8.length + 1 + sizeVarInt(valueSize) + valueSize;
-    writeVarInt(buf, keyValueSize);
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    writeVarInt(buf, keyUtf8.length);
-    buf.put(keyUtf8);
-    writeTag(buf, 2, LEN_WIRE_TYPE);
-    writeVarInt(buf, valueSize);
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    writeVarInt(buf, valueUtf8.length);
-    buf.put(valueUtf8);
-  }
-
-  private static void writeBooleanAttribute(StreamingBuffer buf, byte[] keyUtf8, boolean value) {
-    int keyValueSize = 1 + sizeVarInt(keyUtf8.length) + keyUtf8.length + 4;
-    writeVarInt(buf, keyValueSize);
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    writeVarInt(buf, keyUtf8.length);
-    buf.put(keyUtf8);
-    writeTag(buf, 2, LEN_WIRE_TYPE);
-    buf.put((byte) 2);
-    writeTag(buf, 2, VARINT_WIRE_TYPE);
-    buf.put((byte) (value ? 1 : 0));
-  }
-
-  private static void writeLongAttribute(StreamingBuffer buf, byte[] keyUtf8, long value) {
-    int valueSize = 1 + sizeVarInt(value);
-    int keyValueSize =
-        1 + sizeVarInt(keyUtf8.length) + keyUtf8.length + 1 + sizeVarInt(valueSize) + valueSize;
-    writeVarInt(buf, keyValueSize);
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    writeVarInt(buf, keyUtf8.length);
-    buf.put(keyUtf8);
-    writeTag(buf, 2, LEN_WIRE_TYPE);
-    writeVarInt(buf, valueSize);
-    writeTag(buf, 3, VARINT_WIRE_TYPE);
-    writeVarInt(buf, value);
-  }
-
-  private static void writeDoubleAttribute(StreamingBuffer buf, byte[] keyUtf8, double value) {
-    int keyValueSize = 1 + sizeVarInt(keyUtf8.length) + keyUtf8.length + 11;
-    writeVarInt(buf, keyValueSize);
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    writeVarInt(buf, keyUtf8.length);
-    buf.put(keyUtf8);
-    writeTag(buf, 2, LEN_WIRE_TYPE);
-    buf.put((byte) 9);
-    writeTag(buf, 4, I64_WIRE_TYPE);
-    writeI64(buf, value);
-  }
-
-  private static void writeStringArrayAttribute(
-      StreamingBuffer buf, byte[] keyUtf8, List<String> strings) {
-    byte[][] valueUtf8s = new byte[strings.size()][];
-    for (int i = 0; i < valueUtf8s.length; i++) {
-      valueUtf8s[i] = valueUtf8(strings.get(i));
+
+    public static void writeTag(ByteBuffer buf, int fieldNum, int wireType) {
+        writeVarInt(buf, fieldNum << 3 | wireType);
     }
-    int arraySize = 0;
-    for (byte[] valueUtf8 : valueUtf8s) {
-      int elementSize = 1 + sizeVarInt(valueUtf8.length) + valueUtf8.length;
-      arraySize += 1 + sizeVarInt(elementSize) + elementSize;
+
+    public static void writeTag(StreamingBuffer buf, int fieldNum, int wireType) {
+        writeVarInt(buf, fieldNum << 3 | wireType);
     }
-    int valueSize = 1 + sizeVarInt(arraySize) + arraySize;
-    int keyValueSize =
-        1 + sizeVarInt(keyUtf8.length) + keyUtf8.length + 1 + sizeVarInt(valueSize) + valueSize;
-    writeVarInt(buf, keyValueSize);
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    writeVarInt(buf, keyUtf8.length);
-    buf.put(keyUtf8);
-    writeTag(buf, 2, LEN_WIRE_TYPE);
-    writeVarInt(buf, valueSize);
-    writeTag(buf, 5, LEN_WIRE_TYPE);
-    writeVarInt(buf, arraySize);
-    for (byte[] valueUtf8 : valueUtf8s) {
-      int elementSize = 1 + sizeVarInt(valueUtf8.length) + valueUtf8.length;
-      writeTag(buf, 1, LEN_WIRE_TYPE);
-      writeVarInt(buf, elementSize);
-      writeTag(buf, 1, LEN_WIRE_TYPE);
-      writeVarInt(buf, valueUtf8.length);
-      buf.put(valueUtf8);
+
+    public static void writeInstrumentationScope(StreamingBuffer buf, OtelInstrumentationScope scope) {
+        byte[] nameUtf8 = scope.getName().getUtf8Bytes();
+        int scopeSize = 1 + sizeVarInt(nameUtf8.length) + nameUtf8.length;
+        byte[] versionUtf8 = null;
+        if (scope.getVersion() != null) {
+            versionUtf8 = scope.getVersion().getUtf8Bytes();
+            scopeSize += 1 + sizeVarInt(versionUtf8.length) + versionUtf8.length;
+        }
+        writeVarInt(buf, scopeSize);
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        writeString(buf, nameUtf8);
+        if (versionUtf8 != null) {
+            writeTag(buf, 2, LEN_WIRE_TYPE);
+            writeString(buf, versionUtf8);
+        }
     }
-  }
-
-  private static void writeBooleanArrayAttribute(
-      StreamingBuffer buf, byte[] keyUtf8, List<Boolean> values) {
-    int arraySize = 4 * values.size();
-    int valueSize = 1 + sizeVarInt(arraySize) + arraySize;
-    int keyValueSize =
-        1 + sizeVarInt(keyUtf8.length) + keyUtf8.length + 1 + sizeVarInt(valueSize) + valueSize;
-    writeVarInt(buf, keyValueSize);
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    writeVarInt(buf, keyUtf8.length);
-    buf.put(keyUtf8);
-    writeTag(buf, 2, LEN_WIRE_TYPE);
-    writeVarInt(buf, valueSize);
-    writeTag(buf, 5, LEN_WIRE_TYPE);
-    writeVarInt(buf, arraySize);
-    for (boolean value : values) {
-      writeTag(buf, 1, LEN_WIRE_TYPE);
-      buf.put((byte) 2);
-      writeTag(buf, 2, VARINT_WIRE_TYPE);
-      buf.put((byte) (value ? 1 : 0));
+
+    @SuppressWarnings("unchecked")
+    public static void writeAttribute(StreamingBuffer buf, int type, CharSequence key, Object value) {
+        byte[] keyUtf8;
+        if (key instanceof UTF8BytesString) {
+            keyUtf8 = ((UTF8BytesString) key).getUtf8Bytes();
+        } else {
+            keyUtf8 = keyUtf8(key.toString());
+        }
+        switch (type) {
+            case STRING_ATTRIBUTE:
+                writeStringAttribute(buf, keyUtf8, valueUtf8((String) value));
+                break;
+            case BOOLEAN_ATTRIBUTE:
+                writeBooleanAttribute(buf, keyUtf8, (boolean) value);
+                break;
+            case LONG_ATTRIBUTE:
+                writeLongAttribute(buf, keyUtf8, ((Number) value).longValue());
+                break;
+            case DOUBLE_ATTRIBUTE:
+                writeDoubleAttribute(buf, keyUtf8, ((Number) value).doubleValue());
+                break;
+            case STRING_ARRAY_ATTRIBUTE:
+                writeStringArrayAttribute(buf, keyUtf8, (List<String>) value);
+                break;
+            case BOOLEAN_ARRAY_ATTRIBUTE:
+                writeBooleanArrayAttribute(buf, keyUtf8, (List<Boolean>) value);
+                break;
+            case LONG_ARRAY_ATTRIBUTE:
+                writeLongArrayAttribute(buf, keyUtf8, (List<? extends Number>) value);
+                break;
+            case DOUBLE_ARRAY_ATTRIBUTE:
+                writeDoubleArrayAttribute(buf, keyUtf8, (List<? extends Number>) value);
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown attribute type: " + type);
+        }
     }
-  }
 
-  private static void writeLongArrayAttribute(
-      StreamingBuffer buf, byte[] keyUtf8, List<? extends Number> values) {
-    long[] longValues = new long[values.size()];
-    for (int i = 0; i < longValues.length; i++) {
-      longValues[i] = values.get(i).longValue(); // avoid repeated unboxing later
+    public static void writeAttribute(StreamingBuffer buf, UTF8BytesString key, UTF8BytesString value) {
+        writeStringAttribute(buf, key.getUtf8Bytes(), value.getUtf8Bytes());
     }
-    int arraySize = 0;
-    for (long longValue : longValues) {
-      int elementSize = 1 + sizeVarInt(longValue);
-      arraySize += 1 + sizeVarInt(elementSize) + elementSize;
+
+    public static void writeAttribute(StreamingBuffer buf, UTF8BytesString key, String value) {
+        writeStringAttribute(buf, key.getUtf8Bytes(), valueUtf8(value));
     }
-    int valueSize = 1 + sizeVarInt(arraySize) + arraySize;
-    int keyValueSize =
-        1 + sizeVarInt(keyUtf8.length) + keyUtf8.length + 1 + sizeVarInt(valueSize) + valueSize;
-    writeVarInt(buf, keyValueSize);
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    writeVarInt(buf, keyUtf8.length);
-    buf.put(keyUtf8);
-    writeTag(buf, 2, LEN_WIRE_TYPE);
-    writeVarInt(buf, valueSize);
-    writeTag(buf, 5, LEN_WIRE_TYPE);
-    writeVarInt(buf, arraySize);
-    for (long longValue : longValues) {
-      int elementSize = 1 + sizeVarInt(longValue);
-      writeTag(buf, 1, LEN_WIRE_TYPE);
-      writeVarInt(buf, elementSize);
-      writeTag(buf, 3, VARINT_WIRE_TYPE);
-      writeVarInt(buf, longValue);
+
+    public static void writeAttribute(StreamingBuffer buf, UTF8BytesString key, long value) {
+        writeLongAttribute(buf, key.getUtf8Bytes(), value);
     }
-  }
-
-  private static void writeDoubleArrayAttribute(
-      StreamingBuffer buf, byte[] keyUtf8, List<? extends Number> values) {
-    int arraySize = 11 * values.size();
-    int valueSize = 1 + sizeVarInt(arraySize) + arraySize;
-    int keyValueSize =
-        1 + sizeVarInt(keyUtf8.length) + keyUtf8.length + 1 + sizeVarInt(valueSize) + valueSize;
-    writeVarInt(buf, keyValueSize);
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    writeVarInt(buf, keyUtf8.length);
-    buf.put(keyUtf8);
-    writeTag(buf, 2, LEN_WIRE_TYPE);
-    writeVarInt(buf, valueSize);
-    writeTag(buf, 5, LEN_WIRE_TYPE);
-    writeVarInt(buf, arraySize);
-    for (Number value : values) {
-      writeTag(buf, 1, LEN_WIRE_TYPE);
-      buf.put((byte) 9);
-      writeTag(buf, 4, I64_WIRE_TYPE);
-      writeI64(buf, value.doubleValue());
+
+    private static byte[] keyUtf8(String key) {
+        return KEY_CACHE != null ? KEY_CACHE.getUtf8(key) : key.getBytes(UTF_8);
+    }
+
+    private static byte[] valueUtf8(String value) {
+        return VALUE_CACHE != null ? VALUE_CACHE.getUtf8(value) : value.getBytes(UTF_8);
+    }
+
+    private static void writeStringAttribute(StreamingBuffer buf, byte[] keyUtf8, byte[] valueUtf8) {
+        int valueSize = 1 + sizeVarInt(valueUtf8.length) + valueUtf8.length;
+        int keyValueSize = 1 + sizeVarInt(keyUtf8.length) + keyUtf8.length + 1 + sizeVarInt(valueSize) + valueSize;
+        writeVarInt(buf, keyValueSize);
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        writeVarInt(buf, keyUtf8.length);
+        buf.put(keyUtf8);
+        writeTag(buf, 2, LEN_WIRE_TYPE);
+        writeVarInt(buf, valueSize);
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        writeVarInt(buf, valueUtf8.length);
+        buf.put(valueUtf8);
+    }
+
+    private static void writeBooleanAttribute(StreamingBuffer buf, byte[] keyUtf8, boolean value) {
+        int keyValueSize = 1 + sizeVarInt(keyUtf8.length) + keyUtf8.length + 4;
+        writeVarInt(buf, keyValueSize);
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        writeVarInt(buf, keyUtf8.length);
+        buf.put(keyUtf8);
+        writeTag(buf, 2, LEN_WIRE_TYPE);
+        buf.put((byte) 2);
+        writeTag(buf, 2, VARINT_WIRE_TYPE);
+        buf.put((byte) (value ? 1 : 0));
+    }
+
+    private static void writeLongAttribute(StreamingBuffer buf, byte[] keyUtf8, long value) {
+        int valueSize = 1 + sizeVarInt(value);
+        int keyValueSize = 1 + sizeVarInt(keyUtf8.length) + keyUtf8.length + 1 + sizeVarInt(valueSize) + valueSize;
+        writeVarInt(buf, keyValueSize);
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        writeVarInt(buf, keyUtf8.length);
+        buf.put(keyUtf8);
+        writeTag(buf, 2, LEN_WIRE_TYPE);
+        writeVarInt(buf, valueSize);
+        writeTag(buf, 3, VARINT_WIRE_TYPE);
+        writeVarInt(buf, value);
+    }
+
+    private static void writeDoubleAttribute(StreamingBuffer buf, byte[] keyUtf8, double value) {
+        int keyValueSize = 1 + sizeVarInt(keyUtf8.length) + keyUtf8.length + 11;
+        writeVarInt(buf, keyValueSize);
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        writeVarInt(buf, keyUtf8.length);
+        buf.put(keyUtf8);
+        writeTag(buf, 2, LEN_WIRE_TYPE);
+        buf.put((byte) 9);
+        writeTag(buf, 4, I64_WIRE_TYPE);
+        writeI64(buf, value);
+    }
+
+    private static void writeStringArrayAttribute(StreamingBuffer buf, byte[] keyUtf8, List<String> strings) {
+        byte[][] valueUtf8s = new byte[strings.size()][];
+        for (int i = 0; i < valueUtf8s.length; i++) {
+            valueUtf8s[i] = valueUtf8(strings.get(i));
+        }
+        int arraySize = 0;
+        for (byte[] valueUtf8 : valueUtf8s) {
+            int elementSize = 1 + sizeVarInt(valueUtf8.length) + valueUtf8.length;
+            arraySize += 1 + sizeVarInt(elementSize) + elementSize;
+        }
+        int valueSize = 1 + sizeVarInt(arraySize) + arraySize;
+        int keyValueSize = 1 + sizeVarInt(keyUtf8.length) + keyUtf8.length + 1 + sizeVarInt(valueSize) + valueSize;
+        writeVarInt(buf, keyValueSize);
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        writeVarInt(buf, keyUtf8.length);
+        buf.put(keyUtf8);
+        writeTag(buf, 2, LEN_WIRE_TYPE);
+        writeVarInt(buf, valueSize);
+        writeTag(buf, 5, LEN_WIRE_TYPE);
+        writeVarInt(buf, arraySize);
+        for (byte[] valueUtf8 : valueUtf8s) {
+            int elementSize = 1 + sizeVarInt(valueUtf8.length) + valueUtf8.length;
+            writeTag(buf, 1, LEN_WIRE_TYPE);
+            writeVarInt(buf, elementSize);
+            writeTag(buf, 1, LEN_WIRE_TYPE);
+            writeVarInt(buf, valueUtf8.length);
+            buf.put(valueUtf8);
+        }
+    }
+
+    private static void writeBooleanArrayAttribute(StreamingBuffer buf, byte[] keyUtf8, List<Boolean> values) {
+        int arraySize = 4 * values.size();
+        int valueSize = 1 + sizeVarInt(arraySize) + arraySize;
+        int keyValueSize = 1 + sizeVarInt(keyUtf8.length) + keyUtf8.length + 1 + sizeVarInt(valueSize) + valueSize;
+        writeVarInt(buf, keyValueSize);
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        writeVarInt(buf, keyUtf8.length);
+        buf.put(keyUtf8);
+        writeTag(buf, 2, LEN_WIRE_TYPE);
+        writeVarInt(buf, valueSize);
+        writeTag(buf, 5, LEN_WIRE_TYPE);
+        writeVarInt(buf, arraySize);
+        for (boolean value : values) {
+            writeTag(buf, 1, LEN_WIRE_TYPE);
+            buf.put((byte) 2);
+            writeTag(buf, 2, VARINT_WIRE_TYPE);
+            buf.put((byte) (value ? 1 : 0));
+        }
+    }
+
+    private static void writeLongArrayAttribute(StreamingBuffer buf, byte[] keyUtf8, List<? extends Number> values) {
+        long[] longValues = new long[values.size()];
+        for (int i = 0; i < longValues.length; i++) {
+            longValues[i] = values.get(i).longValue(); // avoid repeated unboxing later
+        }
+        int arraySize = 0;
+        for (long longValue : longValues) {
+            int elementSize = 1 + sizeVarInt(longValue);
+            arraySize += 1 + sizeVarInt(elementSize) + elementSize;
+        }
+        int valueSize = 1 + sizeVarInt(arraySize) + arraySize;
+        int keyValueSize = 1 + sizeVarInt(keyUtf8.length) + keyUtf8.length + 1 + sizeVarInt(valueSize) + valueSize;
+        writeVarInt(buf, keyValueSize);
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        writeVarInt(buf, keyUtf8.length);
+        buf.put(keyUtf8);
+        writeTag(buf, 2, LEN_WIRE_TYPE);
+        writeVarInt(buf, valueSize);
+        writeTag(buf, 5, LEN_WIRE_TYPE);
+        writeVarInt(buf, arraySize);
+        for (long longValue : longValues) {
+            int elementSize = 1 + sizeVarInt(longValue);
+            writeTag(buf, 1, LEN_WIRE_TYPE);
+            writeVarInt(buf, elementSize);
+            writeTag(buf, 3, VARINT_WIRE_TYPE);
+            writeVarInt(buf, longValue);
+        }
+    }
+
+    private static void writeDoubleArrayAttribute(StreamingBuffer buf, byte[] keyUtf8, List<? extends Number> values) {
+        int arraySize = 11 * values.size();
+        int valueSize = 1 + sizeVarInt(arraySize) + arraySize;
+        int keyValueSize = 1 + sizeVarInt(keyUtf8.length) + keyUtf8.length + 1 + sizeVarInt(valueSize) + valueSize;
+        writeVarInt(buf, keyValueSize);
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        writeVarInt(buf, keyUtf8.length);
+        buf.put(keyUtf8);
+        writeTag(buf, 2, LEN_WIRE_TYPE);
+        writeVarInt(buf, valueSize);
+        writeTag(buf, 5, LEN_WIRE_TYPE);
+        writeVarInt(buf, arraySize);
+        for (Number value : values) {
+            writeTag(buf, 1, LEN_WIRE_TYPE);
+            buf.put((byte) 9);
+            writeTag(buf, 4, I64_WIRE_TYPE);
+            writeI64(buf, value.doubleValue());
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpGrpcRequestBody.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpGrpcRequestBody.java
index 24457780b1d..59352900eda 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpGrpcRequestBody.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpGrpcRequestBody.java
@@ -12,47 +12,47 @@
 /** Wraps an {@link OtlpPayload} as a GRPC {@link RequestBody}. */
 public final class OtlpGrpcRequestBody extends RequestBody {
 
-  private static final MediaType GRPC_MEDIA_TYPE = MediaType.parse("application/grpc");
+    private static final MediaType GRPC_MEDIA_TYPE = MediaType.parse("application/grpc");
 
-  private static final int HEADER_LENGTH = 5;
+    private static final int HEADER_LENGTH = 5;
 
-  private static final byte UNCOMPRESSED_FLAG = 0;
-  private static final byte COMPRESSED_FLAG = 1;
+    private static final byte UNCOMPRESSED_FLAG = 0;
+    private static final byte COMPRESSED_FLAG = 1;
 
-  private final OtlpPayload payload;
-  private final boolean gzip;
+    private final OtlpPayload payload;
+    private final boolean gzip;
 
-  public OtlpGrpcRequestBody(OtlpPayload payload, boolean gzip) {
-    this.payload = payload;
-    this.gzip = gzip;
-  }
+    public OtlpGrpcRequestBody(OtlpPayload payload, boolean gzip) {
+        this.payload = payload;
+        this.gzip = gzip;
+    }
 
-  @Override
-  public long contentLength() {
-    return gzip ? -1 : HEADER_LENGTH + payload.getContentLength();
-  }
+    @Override
+    public long contentLength() {
+        return gzip ? -1 : HEADER_LENGTH + payload.getContentLength();
+    }
 
-  @Override
-  public MediaType contentType() {
-    return GRPC_MEDIA_TYPE;
-  }
+    @Override
+    public MediaType contentType() {
+        return GRPC_MEDIA_TYPE;
+    }
 
-  @Override
-  public void writeTo(@Nonnull BufferedSink sink) throws IOException {
-    if (gzip) {
-      try (Buffer gzipBody = new Buffer()) {
-        try (BufferedSink gzipSink = Okio.buffer(new GzipSink(gzipBody))) {
-          gzipSink.write(payload.getContent());
+    @Override
+    public void writeTo(@Nonnull BufferedSink sink) throws IOException {
+        if (gzip) {
+            try (Buffer gzipBody = new Buffer()) {
+                try (BufferedSink gzipSink = Okio.buffer(new GzipSink(gzipBody))) {
+                    gzipSink.write(payload.getContent());
+                }
+                sink.writeByte(COMPRESSED_FLAG);
+                long gzipLength = gzipBody.size();
+                sink.writeInt((int) gzipLength);
+                sink.write(gzipBody, gzipLength);
+            }
+        } else {
+            sink.writeByte(UNCOMPRESSED_FLAG);
+            sink.writeInt(payload.getContentLength());
+            sink.write(payload.getContent());
         }
-        sink.writeByte(COMPRESSED_FLAG);
-        long gzipLength = gzipBody.size();
-        sink.writeInt((int) gzipLength);
-        sink.write(gzipBody, gzipLength);
-      }
-    } else {
-      sink.writeByte(UNCOMPRESSED_FLAG);
-      sink.writeInt(payload.getContentLength());
-      sink.write(payload.getContent());
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpGrpcSender.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpGrpcSender.java
index 73c73a7f626..d877c4933f2 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpGrpcSender.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpGrpcSender.java
@@ -17,65 +17,63 @@
 
 /** Sends chunks of OTLP data over GRPC. */
 public final class OtlpGrpcSender implements OtlpSender {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtlpGrpcSender.class);
-  private static final RatelimitedLogger RATELIMITED_LOGGER =
-      new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
-
-  private final HttpRetryPolicy.Factory retryPolicy =
-      new HttpRetryPolicy.Factory(5, 100, 2.0, true);
-
-  private final HttpUrl url;
-  private final Map<String, String> headers;
-  private final boolean gzip;
-
-  private final OkHttpClient client;
-
-  public OtlpGrpcSender(
-      String endpoint,
-      String signalPath,
-      Map<String, String> headers,
-      int timeoutMillis,
-      Compression compression) {
-
-    String unixDomainSocketPath;
-    if (endpoint.startsWith("unix://")) {
-      unixDomainSocketPath = endpoint.substring(7);
-      this.url = HttpUrl.get("http://localhost:4317" + signalPath);
-    } else {
-      unixDomainSocketPath = null;
-      this.url = HttpUrl.get(endpoint + signalPath); // GRPC endpoint does not include signal path
-    }
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtlpGrpcSender.class);
+    private static final RatelimitedLogger RATELIMITED_LOGGER = new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
+
+    private final HttpRetryPolicy.Factory retryPolicy = new HttpRetryPolicy.Factory(5, 100, 2.0, true);
+
+    private final HttpUrl url;
+    private final Map<String, String> headers;
+    private final boolean gzip;
+
+    private final OkHttpClient client;
+
+    public OtlpGrpcSender(
+            String endpoint,
+            String signalPath,
+            Map<String, String> headers,
+            int timeoutMillis,
+            Compression compression) {
 
-    this.headers = headers;
-    this.gzip = compression == Compression.GZIP;
+        String unixDomainSocketPath;
+        if (endpoint.startsWith("unix://")) {
+            unixDomainSocketPath = endpoint.substring(7);
+            this.url = HttpUrl.get("http://localhost:4317" + signalPath);
+        } else {
+            unixDomainSocketPath = null;
+            this.url = HttpUrl.get(endpoint + signalPath); // GRPC endpoint does not include signal path
+        }
 
-    this.client = buildHttp2Client(isPlainHttp(url), unixDomainSocketPath, null, timeoutMillis);
-  }
+        this.headers = headers;
+        this.gzip = compression == Compression.GZIP;
 
-  @Override
-  public RemoteApi.Response send(OtlpPayload payload) {
-    return OtlpSenderSupport.send(client, retryPolicy, makeRequest(payload), RATELIMITED_LOGGER);
-  }
+        this.client = buildHttp2Client(isPlainHttp(url), unixDomainSocketPath, null, timeoutMillis);
+    }
 
-  @Override
-  public void shutdown() {
-    client.connectionPool().evictAll();
-  }
+    @Override
+    public RemoteApi.Response send(OtlpPayload payload) {
+        return OtlpSenderSupport.send(client, retryPolicy, makeRequest(payload), RATELIMITED_LOGGER);
+    }
 
-  // only used by tests
-  public HttpUrl url() {
-    return url;
-  }
+    @Override
+    public void shutdown() {
+        client.connectionPool().evictAll();
+    }
 
-  private Request makeRequest(OtlpPayload payload) {
-    Request.Builder requestBuilder = new Request.Builder().url(url);
-    if (gzip) {
-      requestBuilder.header("grpc-encoding", "gzip");
+    // only used by tests
+    public HttpUrl url() {
+        return url;
     }
 
-    // add configured headers to the request
-    headers.forEach(requestBuilder::addHeader);
+    private Request makeRequest(OtlpPayload payload) {
+        Request.Builder requestBuilder = new Request.Builder().url(url);
+        if (gzip) {
+            requestBuilder.header("grpc-encoding", "gzip");
+        }
 
-    return requestBuilder.post(new OtlpGrpcRequestBody(payload, gzip)).build();
-  }
+        // add configured headers to the request
+        headers.forEach(requestBuilder::addHeader);
+
+        return requestBuilder.post(new OtlpGrpcRequestBody(payload, gzip)).build();
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpHttpRequestBody.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpHttpRequestBody.java
index a94d5c59f08..d671c05dda0 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpHttpRequestBody.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpHttpRequestBody.java
@@ -11,34 +11,34 @@
 /** Wraps an {@link OtlpPayload} as an OkHttp {@link RequestBody}. */
 public final class OtlpHttpRequestBody extends RequestBody {
 
-  private final OtlpPayload payload;
-  private final MediaType mediaType;
-  private final boolean gzip;
+    private final OtlpPayload payload;
+    private final MediaType mediaType;
+    private final boolean gzip;
 
-  public OtlpHttpRequestBody(OtlpPayload payload, boolean gzip) {
-    this.payload = payload;
-    this.mediaType = MediaType.get(payload.getContentType());
-    this.gzip = gzip;
-  }
+    public OtlpHttpRequestBody(OtlpPayload payload, boolean gzip) {
+        this.payload = payload;
+        this.mediaType = MediaType.get(payload.getContentType());
+        this.gzip = gzip;
+    }
 
-  @Override
-  public long contentLength() {
-    return gzip ? -1 : payload.getContentLength();
-  }
+    @Override
+    public long contentLength() {
+        return gzip ? -1 : payload.getContentLength();
+    }
 
-  @Override
-  public MediaType contentType() {
-    return mediaType;
-  }
+    @Override
+    public MediaType contentType() {
+        return mediaType;
+    }
 
-  @Override
-  public void writeTo(@Nonnull BufferedSink sink) throws IOException {
-    if (gzip) {
-      try (BufferedSink gzipSink = Okio.buffer(new GzipSink(sink))) {
-        gzipSink.write(payload.getContent());
-      }
-    } else {
-      sink.write(payload.getContent());
+    @Override
+    public void writeTo(@Nonnull BufferedSink sink) throws IOException {
+        if (gzip) {
+            try (BufferedSink gzipSink = Okio.buffer(new GzipSink(sink))) {
+                gzipSink.write(payload.getContent());
+            }
+        } else {
+            sink.write(payload.getContent());
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpHttpSender.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpHttpSender.java
index 8cac29e85d5..f959dd250f2 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpHttpSender.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpHttpSender.java
@@ -17,64 +17,62 @@
 
 /** Sends chunks of OTLP data over HTTP. */
 public final class OtlpHttpSender implements OtlpSender {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtlpHttpSender.class);
-  private static final RatelimitedLogger RATELIMITED_LOGGER =
-      new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
-
-  private final HttpRetryPolicy.Factory retryPolicy =
-      new HttpRetryPolicy.Factory(5, 100, 2.0, true);
-
-  private final HttpUrl url;
-  private final Map<String, String> headers;
-  private final boolean gzip;
-
-  private final OkHttpClient client;
-
-  public OtlpHttpSender(
-      String endpoint,
-      String signalPath,
-      Map<String, String> headers,
-      int timeoutMillis,
-      Compression compression) {
-
-    String unixDomainSocketPath;
-    if (endpoint.startsWith("unix://")) {
-      unixDomainSocketPath = endpoint.substring(7);
-      this.url = HttpUrl.get("http://localhost:4318" + signalPath);
-    } else {
-      unixDomainSocketPath = null;
-      this.url = HttpUrl.get(endpoint); // HTTP endpoint already includes signal path
-    }
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtlpHttpSender.class);
+    private static final RatelimitedLogger RATELIMITED_LOGGER = new RatelimitedLogger(LOGGER, 5, TimeUnit.MINUTES);
+
+    private final HttpRetryPolicy.Factory retryPolicy = new HttpRetryPolicy.Factory(5, 100, 2.0, true);
+
+    private final HttpUrl url;
+    private final Map<String, String> headers;
+    private final boolean gzip;
+
+    private final OkHttpClient client;
+
+    public OtlpHttpSender(
+            String endpoint,
+            String signalPath,
+            Map<String, String> headers,
+            int timeoutMillis,
+            Compression compression) {
 
-    this.headers = headers;
-    this.gzip = compression == Compression.GZIP;
+        String unixDomainSocketPath;
+        if (endpoint.startsWith("unix://")) {
+            unixDomainSocketPath = endpoint.substring(7);
+            this.url = HttpUrl.get("http://localhost:4318" + signalPath);
+        } else {
+            unixDomainSocketPath = null;
+            this.url = HttpUrl.get(endpoint); // HTTP endpoint already includes signal path
+        }
 
-    this.client = buildHttpClient(isPlainHttp(url), unixDomainSocketPath, null, timeoutMillis);
-  }
+        this.headers = headers;
+        this.gzip = compression == Compression.GZIP;
 
-  public HttpUrl url() {
-    return url;
-  }
+        this.client = buildHttpClient(isPlainHttp(url), unixDomainSocketPath, null, timeoutMillis);
+    }
 
-  @Override
-  public RemoteApi.Response send(OtlpPayload payload) {
-    return OtlpSenderSupport.send(client, retryPolicy, makeRequest(payload), RATELIMITED_LOGGER);
-  }
+    public HttpUrl url() {
+        return url;
+    }
 
-  @Override
-  public void shutdown() {
-    client.connectionPool().evictAll();
-  }
+    @Override
+    public RemoteApi.Response send(OtlpPayload payload) {
+        return OtlpSenderSupport.send(client, retryPolicy, makeRequest(payload), RATELIMITED_LOGGER);
+    }
 
-  private Request makeRequest(OtlpPayload payload) {
-    Request.Builder requestBuilder = new Request.Builder().url(url);
-    if (gzip) {
-      requestBuilder.header("Content-Encoding", "gzip").header("Transfer-Encoding", "chunked");
+    @Override
+    public void shutdown() {
+        client.connectionPool().evictAll();
     }
 
-    // add configured headers to the request
-    headers.forEach(requestBuilder::addHeader);
+    private Request makeRequest(OtlpPayload payload) {
+        Request.Builder requestBuilder = new Request.Builder().url(url);
+        if (gzip) {
+            requestBuilder.header("Content-Encoding", "gzip").header("Transfer-Encoding", "chunked");
+        }
 
-    return requestBuilder.post(new OtlpHttpRequestBody(payload, gzip)).build();
-  }
+        // add configured headers to the request
+        headers.forEach(requestBuilder::addHeader);
+
+        return requestBuilder.post(new OtlpHttpRequestBody(payload, gzip)).build();
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpPayload.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpPayload.java
index 87c2adf760d..26c7558da38 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpPayload.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpPayload.java
@@ -3,30 +3,30 @@
 import java.nio.ByteBuffer;
 
 public final class OtlpPayload {
-  public static final String PROTOBUF_CONTENT_TYPE = "application/x-protobuf";
-  public static final String JSON_CONTENT_TYPE = "application/json";
+    public static final String PROTOBUF_CONTENT_TYPE = "application/x-protobuf";
+    public static final String JSON_CONTENT_TYPE = "application/json";
 
-  public static final OtlpPayload EMPTY = new OtlpPayload(ByteBuffer.allocate(0), "");
+    public static final OtlpPayload EMPTY = new OtlpPayload(ByteBuffer.allocate(0), "");
 
-  private final ByteBuffer content;
-  private final int contentLength;
-  private final String contentType;
+    private final ByteBuffer content;
+    private final int contentLength;
+    private final String contentType;
 
-  public OtlpPayload(ByteBuffer content, String contentType) {
-    this.content = content;
-    this.contentLength = content.remaining();
-    this.contentType = contentType;
-  }
+    public OtlpPayload(ByteBuffer content, String contentType) {
+        this.content = content;
+        this.contentLength = content.remaining();
+        this.contentType = contentType;
+    }
 
-  public ByteBuffer getContent() {
-    return content.asReadOnlyBuffer();
-  }
+    public ByteBuffer getContent() {
+        return content.asReadOnlyBuffer();
+    }
 
-  public int getContentLength() {
-    return contentLength;
-  }
+    public int getContentLength() {
+        return contentLength;
+    }
 
-  public String getContentType() {
-    return contentType;
-  }
+    public String getContentType() {
+        return contentType;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpProtoBuffer.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpProtoBuffer.java
index 81196bfaa23..6acfdc20b34 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpProtoBuffer.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpProtoBuffer.java
@@ -18,145 +18,143 @@
  * @see GrowableBuffer
  */
 public final class OtlpProtoBuffer {
-  // hard limit to avoid unbounded buffering; matches OTLP spec's recommended default
-  public static final int MAX_CAPACITY_BYTES = 64 << 20; // 64 MiB
+    // hard limit to avoid unbounded buffering; matches OTLP spec's recommended default
+    public static final int MAX_CAPACITY_BYTES = 64 << 20; // 64 MiB
 
-  private final int initialCapacity;
-  private ByteBuffer buffer;
-  private int remaining;
+    private final int initialCapacity;
+    private ByteBuffer buffer;
+    private int remaining;
 
-  public OtlpProtoBuffer(int requiredCapacity) {
-    this.initialCapacity = nextPowerOfTwo(requiredCapacity);
-    if (this.initialCapacity > MAX_CAPACITY_BYTES) {
-      throw new IllegalArgumentException(
-          "OTLP payload initial capacity of "
-              + this.initialCapacity
-              + " bytes exceeds maximum buffer size of "
-              + MAX_CAPACITY_BYTES
-              + " bytes");
+    public OtlpProtoBuffer(int requiredCapacity) {
+        this.initialCapacity = nextPowerOfTwo(requiredCapacity);
+        if (this.initialCapacity > MAX_CAPACITY_BYTES) {
+            throw new IllegalArgumentException("OTLP payload initial capacity of "
+                    + this.initialCapacity
+                    + " bytes exceeds maximum buffer size of "
+                    + MAX_CAPACITY_BYTES
+                    + " bytes");
+        }
+        this.buffer = ByteBuffer.allocate(initialCapacity);
+        this.remaining = initialCapacity;
     }
-    this.buffer = ByteBuffer.allocate(initialCapacity);
-    this.remaining = initialCapacity;
-  }
 
-  /**
-   * Records a self-contained protobuf message.
-   *
-   * @param buf buffer containing the message body
-   * @param fieldNum field number of the message
-   * @return overall size of the message in bytes
-   */
-  public int recordMessage(GrowableBuffer buf, int fieldNum) {
-    return recordMessage(buf, fieldNum, 0);
-  }
+    /**
+     * Records a self-contained protobuf message.
+     *
+     * @param buf buffer containing the message body
+     * @param fieldNum field number of the message
+     * @return overall size of the message in bytes
+     */
+    public int recordMessage(GrowableBuffer buf, int fieldNum) {
+        return recordMessage(buf, fieldNum, 0);
+    }
 
-  /**
-   * Records a protobuf message that has zero or more nested elements already recorded.
-   *
-   * @param buf buffer containing the message header
-   * @param fieldNum field number of the message
-   * @param bytesSoFar nested element bytes recorded so far
-   * @return overall size of the message in bytes
-   */
-  public int recordMessage(GrowableBuffer buf, int fieldNum, int bytesSoFar) {
-    try {
-      ByteBuffer message = buf.flip();
-      // calculate space needed to encode message, its total length, and the tag
-      int messageSize = message.remaining();
-      int length = messageSize + bytesSoFar;
-      int tag = fieldNum << 3 | LEN_WIRE_TYPE;
-      int numBytes = sizeVarInt(tag) + sizeVarInt(length) + messageSize;
-      // grow the buffer to fit the incoming content
-      checkCapacity(numBytes);
-      remaining -= numBytes;
-      // reposition so we can write the encoded message
-      buffer.position(remaining);
-      // write the usual prelude
-      writeVarInt(buffer, tag);
-      writeVarInt(buffer, length);
-      // write the primary message
-      buffer.put(message);
-      // no need to reset position here; it's always reset before any write/read
-      return numBytes + bytesSoFar;
-    } finally {
-      buf.reset();
+    /**
+     * Records a protobuf message that has zero or more nested elements already recorded.
+     *
+     * @param buf buffer containing the message header
+     * @param fieldNum field number of the message
+     * @param bytesSoFar nested element bytes recorded so far
+     * @return overall size of the message in bytes
+     */
+    public int recordMessage(GrowableBuffer buf, int fieldNum, int bytesSoFar) {
+        try {
+            ByteBuffer message = buf.flip();
+            // calculate space needed to encode message, its total length, and the tag
+            int messageSize = message.remaining();
+            int length = messageSize + bytesSoFar;
+            int tag = fieldNum << 3 | LEN_WIRE_TYPE;
+            int numBytes = sizeVarInt(tag) + sizeVarInt(length) + messageSize;
+            // grow the buffer to fit the incoming content
+            checkCapacity(numBytes);
+            remaining -= numBytes;
+            // reposition so we can write the encoded message
+            buffer.position(remaining);
+            // write the usual prelude
+            writeVarInt(buffer, tag);
+            writeVarInt(buffer, length);
+            // write the primary message
+            buffer.put(message);
+            // no need to reset position here; it's always reset before any write/read
+            return numBytes + bytesSoFar;
+        } finally {
+            buf.reset();
+        }
     }
-  }
 
-  /**
-   * Records a previously cached protobuf message.
-   *
-   * @param bytes cached bytes containing the message header
-   * @return overall size of the message in bytes
-   */
-  public int recordMessage(byte[] bytes) {
-    // grow the buffer to fit the incoming content
-    int numBytes = bytes.length;
-    checkCapacity(numBytes);
-    remaining -= numBytes;
-    // reposition so we can write the cached message
-    buffer.position(remaining);
-    buffer.put(bytes);
-    // no need to reset position here; it's always reset before any write/read
-    return numBytes;
-  }
+    /**
+     * Records a previously cached protobuf message.
+     *
+     * @param bytes cached bytes containing the message header
+     * @return overall size of the message in bytes
+     */
+    public int recordMessage(byte[] bytes) {
+        // grow the buffer to fit the incoming content
+        int numBytes = bytes.length;
+        checkCapacity(numBytes);
+        remaining -= numBytes;
+        // reposition so we can write the cached message
+        buffer.position(remaining);
+        buffer.put(bytes);
+        // no need to reset position here; it's always reset before any write/read
+        return numBytes;
+    }
 
-  /** Flips the buffer, returning the protobuf encoded content for reading. */
-  public ByteBuffer flip() {
-    buffer.position(remaining);
-    return buffer;
-  }
+    /** Flips the buffer, returning the protobuf encoded content for reading. */
+    public ByteBuffer flip() {
+        buffer.position(remaining);
+        return buffer;
+    }
 
-  /** Returns the number of bytes currently recorded in the buffer. */
-  public int sizeInBytes() {
-    return buffer.capacity() - remaining;
-  }
+    /** Returns the number of bytes currently recorded in the buffer. */
+    public int sizeInBytes() {
+        return buffer.capacity() - remaining;
+    }
 
-  /**
-   * Returns an {@link OtlpPayload} containing the protobuf encoded content.
-   *
-   * <p>This payload is only valid for the calling thread until the next collection.
-   */
-  public OtlpPayload toPayload() {
-    return new OtlpPayload(flip(), PROTOBUF_CONTENT_TYPE);
-  }
+    /**
+     * Returns an {@link OtlpPayload} containing the protobuf encoded content.
+     *
+     * <p>This payload is only valid for the calling thread until the next collection.
+     */
+    public OtlpPayload toPayload() {
+        return new OtlpPayload(flip(), PROTOBUF_CONTENT_TYPE);
+    }
 
-  /**
-   * Resets the buffer in anticipation of the next collection cycle.
-   *
-   * <p>This does not affect the active payload, which remains valid until the next collection.
-   */
-  public void reset() {
-    if (buffer.capacity() > initialCapacity) {
-      buffer = ByteBuffer.allocate(initialCapacity);
+    /**
+     * Resets the buffer in anticipation of the next collection cycle.
+     *
+     * <p>This does not affect the active payload, which remains valid until the next collection.
+     */
+    public void reset() {
+        if (buffer.capacity() > initialCapacity) {
+            buffer = ByteBuffer.allocate(initialCapacity);
+        }
+        remaining = buffer.capacity();
     }
-    remaining = buffer.capacity();
-  }
 
-  /** Grows the buffer to ensure the required number of bytes can be prepended. */
-  private void checkCapacity(int required) {
-    if (remaining < required) {
-      ByteBuffer oldBuffer = flip();
-      int oldSize = oldBuffer.remaining();
-      // round up to next multiple of initialCapacity that can accommodate required
-      // (uses long arithmetic so overflow can be detected before allocating)
-      long newSize = ((long) oldSize + required + initialCapacity - 1) & -initialCapacity;
-      if (newSize > MAX_CAPACITY_BYTES) {
-        throw new IllegalStateException(
-            "OTLP payload exceeds maximum buffer size of "
-                + MAX_CAPACITY_BYTES
-                + " bytes: "
-                + oldSize
-                + " bytes buffered, "
-                + required
-                + " more requested");
-      }
-      ByteBuffer newBuffer = ByteBuffer.allocate((int) newSize);
-      // copy over old content so it stays at the far end
-      remaining = (int) newSize - oldSize;
-      newBuffer.position(remaining);
-      newBuffer.put(oldBuffer);
-      buffer = newBuffer;
+    /** Grows the buffer to ensure the required number of bytes can be prepended. */
+    private void checkCapacity(int required) {
+        if (remaining < required) {
+            ByteBuffer oldBuffer = flip();
+            int oldSize = oldBuffer.remaining();
+            // round up to next multiple of initialCapacity that can accommodate required
+            // (uses long arithmetic so overflow can be detected before allocating)
+            long newSize = ((long) oldSize + required + initialCapacity - 1) & -initialCapacity;
+            if (newSize > MAX_CAPACITY_BYTES) {
+                throw new IllegalStateException("OTLP payload exceeds maximum buffer size of "
+                        + MAX_CAPACITY_BYTES
+                        + " bytes: "
+                        + oldSize
+                        + " bytes buffered, "
+                        + required
+                        + " more requested");
+            }
+            ByteBuffer newBuffer = ByteBuffer.allocate((int) newSize);
+            // copy over old content so it stays at the far end
+            remaining = (int) newSize - oldSize;
+            newBuffer.position(remaining);
+            newBuffer.put(oldBuffer);
+            buffer = newBuffer;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpResourceAttributes.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpResourceAttributes.java
index 6489c7ae5bf..df4a3027763 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpResourceAttributes.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpResourceAttributes.java
@@ -16,102 +16,95 @@
 
 /** Enumerates the resource attributes shared by the proto and JSON "resource.proto" encoders. */
 final class OtlpResourceAttributes {
-  private OtlpResourceAttributes() {}
+    private OtlpResourceAttributes() {}
 
-  /** Prefix applied to {@code datadog.runtime_id} and process-tag resource attributes. */
-  private static final String DATADOG_PREFIX = "datadog.";
+    /** Prefix applied to {@code datadog.runtime_id} and process-tag resource attributes. */
+    private static final String DATADOG_PREFIX = "datadog.";
 
-  /** Marks that the Agent should not recompute trace metrics from the exported spans. */
-  private static final String STATS_COMPUTED_KEY = "_dd.stats_computed";
+    /** Marks that the Agent should not recompute trace metrics from the exported spans. */
+    private static final String STATS_COMPUTED_KEY = "_dd.stats_computed";
 
-  private static final String SDK_SEMANTICS_KEY = "datadog.sdk.semantics";
+    private static final String SDK_SEMANTICS_KEY = "datadog.sdk.semantics";
 
-  private static final Set<String> IGNORED_GLOBAL_TAGS =
-      new HashSet<>(
-          asList(
-              "service",
-              "env",
-              "version",
-              "service.name",
-              "deployment.environment.name",
-              "service.version",
-              "telemetry.sdk.name",
-              "telemetry.sdk.version",
-              "telemetry.sdk.language",
-              SDK_SEMANTICS_KEY,
-              SDK_OTLP_EXPORT));
+    private static final Set<String> IGNORED_GLOBAL_TAGS = new HashSet<>(asList(
+            "service",
+            "env",
+            "version",
+            "service.name",
+            "deployment.environment.name",
+            "service.version",
+            "telemetry.sdk.name",
+            "telemetry.sdk.version",
+            "telemetry.sdk.language",
+            SDK_SEMANTICS_KEY,
+            SDK_OTLP_EXPORT));
 
-  /**
-   * {@code value} is a {@link String}, except {@code datadog.process_tags}: a {@code List<String>}.
-   */
-  static void visitResourceAttributes(
-      Config config, Map<String, Object> extraAttributes, BiConsumer<String, Object> visitor) {
-    String serviceName = config.getServiceName();
-    String env = config.getEnv();
-    String version = config.getVersion();
+    /**
+     * {@code value} is a {@link String}, except {@code datadog.process_tags}: a {@code List<String>}.
+     */
+    static void visitResourceAttributes(
+            Config config, Map<String, Object> extraAttributes, BiConsumer<String, Object> visitor) {
+        String serviceName = config.getServiceName();
+        String env = config.getEnv();
+        String version = config.getVersion();
 
-    visitor.accept("service.name", serviceName);
-    if (!env.isEmpty()) {
-      visitor.accept("deployment.environment.name", env);
-    }
-    if (!version.isEmpty()) {
-      visitor.accept("service.version", version);
-    }
-    if (config.isReportHostName()) {
-      String hostName = config.getHostName();
-      if (hostName != null && !hostName.isEmpty()) {
-        visitor.accept("host.name", hostName);
-      }
-    }
-    visitor.accept("telemetry.sdk.name", "datadog");
-    visitor.accept("telemetry.sdk.version", TRACER_VERSION);
-    visitor.accept("telemetry.sdk.language", "java");
+        visitor.accept("service.name", serviceName);
+        if (!env.isEmpty()) {
+            visitor.accept("deployment.environment.name", env);
+        }
+        if (!version.isEmpty()) {
+            visitor.accept("service.version", version);
+        }
+        if (config.isReportHostName()) {
+            String hostName = config.getHostName();
+            if (hostName != null && !hostName.isEmpty()) {
+                visitor.accept("host.name", hostName);
+            }
+        }
+        visitor.accept("telemetry.sdk.name", "datadog");
+        visitor.accept("telemetry.sdk.version", TRACER_VERSION);
+        visitor.accept("telemetry.sdk.language", "java");
 
-    config
-        .getGlobalTags()
-        .forEach(
-            (key, value) -> {
-              // ignore global tags replaced by canonical or extra resource attributes
-              if (!IGNORED_GLOBAL_TAGS.contains(key.toLowerCase(Locale.ROOT))
-                  && !extraAttributes.containsKey(key)) {
+        config.getGlobalTags().forEach((key, value) -> {
+            // ignore global tags replaced by canonical or extra resource attributes
+            if (!IGNORED_GLOBAL_TAGS.contains(key.toLowerCase(Locale.ROOT)) && !extraAttributes.containsKey(key)) {
                 visitor.accept(key, value);
-              }
-            });
+            }
+        });
 
-    extraAttributes.forEach(visitor);
-  }
+        extraAttributes.forEach(visitor);
+    }
 
-  private static final String PROCESS_TAGS_KEY = DATADOG_PREFIX + "process_tags";
+    private static final String PROCESS_TAGS_KEY = DATADOG_PREFIX + "process_tags";
 
-  /**
-   * Builds the extra resource attributes for the OTLP trace export: the {@code _dd.stats_computed}
-   * marker when the SDK is computing OTLP span metrics, so a downstream Agent does not recompute
-   * them from the exported spans; {@code datadog.sdk.semantics}, recording whether the SDK applied
-   * Datadog or OTel semantics; and {@code _dd.sdk.otlp_export}, which is always {@code "true"} here
-   * because reaching this encoder means the payload is leaving over OTLP.
-   */
-  static Map<String, Object> traceResourceAttributes(Config config) {
-    Map<String, Object> attributes = new LinkedHashMap<>();
-    attributes.put(
-        "datadog.sdk.semantics", config.isTraceOtelSemanticsEnabled() ? "otel" : "datadog");
-    attributes.put(SDK_OTLP_EXPORT, "true");
-    if (config.isOtelTracesSpanMetricsEnabled()) {
-      attributes.put(STATS_COMPUTED_KEY, "true");
+    /**
+     * Builds the extra resource attributes for the OTLP trace export: the {@code _dd.stats_computed}
+     * marker when the SDK is computing OTLP span metrics, so a downstream Agent does not recompute
+     * them from the exported spans; {@code datadog.sdk.semantics}, recording whether the SDK applied
+     * Datadog or OTel semantics; and {@code _dd.sdk.otlp_export}, which is always {@code "true"} here
+     * because reaching this encoder means the payload is leaving over OTLP.
+     */
+    static Map<String, Object> traceResourceAttributes(Config config) {
+        Map<String, Object> attributes = new LinkedHashMap<>();
+        attributes.put("datadog.sdk.semantics", config.isTraceOtelSemanticsEnabled() ? "otel" : "datadog");
+        attributes.put(SDK_OTLP_EXPORT, "true");
+        if (config.isOtelTracesSpanMetricsEnabled()) {
+            attributes.put(STATS_COMPUTED_KEY, "true");
+        }
+        return attributes;
     }
-    return attributes;
-  }
 
-  static Map<String, Object> datadogResourceAttributes(Config config) {
-    Map<String, Object> attributes = new LinkedHashMap<>();
-    String runtimeId = config.getRuntimeId();
-    if (runtimeId != null && !runtimeId.isEmpty()) {
-      attributes.put(DATADOG_PREFIX + "runtime_id", runtimeId);
-    }
-    // Mirrors SerializingMetricWriter's v0.6 ProcessTags shape; keep both in sync if that changes.
-    List<String> processTags = ProcessTags.getTagsAsStringList();
-    if (processTags != null && !processTags.isEmpty()) {
-      attributes.put(PROCESS_TAGS_KEY, processTags);
+    static Map<String, Object> datadogResourceAttributes(Config config) {
+        Map<String, Object> attributes = new LinkedHashMap<>();
+        String runtimeId = config.getRuntimeId();
+        if (runtimeId != null && !runtimeId.isEmpty()) {
+            attributes.put(DATADOG_PREFIX + "runtime_id", runtimeId);
+        }
+        // Mirrors SerializingMetricWriter's v0.6 ProcessTags shape; keep both in sync if that changes.
+        List<String> processTags = ProcessTags.getTagsAsStringList();
+        if (processTags != null && !processTags.isEmpty()) {
+            attributes.put(PROCESS_TAGS_KEY, processTags);
+        }
+        return attributes;
     }
-    return attributes;
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpResourceJson.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpResourceJson.java
index f6b8cfc6227..eefe2ae0a80 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpResourceJson.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpResourceJson.java
@@ -15,49 +15,48 @@
 
 /** Provides a canned JSON fragment for OpenTelemetry's "resource.proto" JSON encoding. */
 public final class OtlpResourceJson {
-  private OtlpResourceJson() {}
-
-  /** Vendor-neutral resource (no {@code datadog.*}). Used by the OTLP metric export. */
-  public static final String RESOURCE_FRAGMENT =
-      buildResourceFragment(Config.get(), Collections.emptyMap());
-
-  /**
-   * Resource that additionally carries {@code datadog.runtime_id} and process tags (each prefixed
-   * {@code datadog.}). Used by the SDK trace-metrics export.
-   */
-  public static final String RESOURCE_FRAGMENT_WITH_DATADOG_ATTRS =
-      buildResourceFragment(Config.get(), datadogResourceAttributes(Config.get()));
-
-  /**
-   * Resource used by the OTLP trace export. Identical to {@link #RESOURCE_FRAGMENT} but adds the
-   * {@code _dd.stats_computed} marker when the SDK is computing OTLP span metrics, so a downstream
-   * Agent does not recompute them from the exported spans.
-   */
-  public static final String TRACE_RESOURCE_FRAGMENT =
-      buildResourceFragment(Config.get(), traceResourceAttributes(Config.get()));
-
-  static String buildResourceFragment(Config config, Map<String, Object> extraAttributes) {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer.beginObject();
-      writer.name("attributes").beginArray();
-
-      visitResourceAttributes(
-          config, extraAttributes, (key, value) -> writeResourceAttribute(writer, key, value));
-
-      writer.endArray();
-      writer.endObject();
-      return writer.toString();
+    private OtlpResourceJson() {}
+
+    /** Vendor-neutral resource (no {@code datadog.*}). Used by the OTLP metric export. */
+    public static final String RESOURCE_FRAGMENT = buildResourceFragment(Config.get(), Collections.emptyMap());
+
+    /**
+     * Resource that additionally carries {@code datadog.runtime_id} and process tags (each prefixed
+     * {@code datadog.}). Used by the SDK trace-metrics export.
+     */
+    public static final String RESOURCE_FRAGMENT_WITH_DATADOG_ATTRS =
+            buildResourceFragment(Config.get(), datadogResourceAttributes(Config.get()));
+
+    /**
+     * Resource used by the OTLP trace export. Identical to {@link #RESOURCE_FRAGMENT} but adds the
+     * {@code _dd.stats_computed} marker when the SDK is computing OTLP span metrics, so a downstream
+     * Agent does not recompute them from the exported spans.
+     */
+    public static final String TRACE_RESOURCE_FRAGMENT =
+            buildResourceFragment(Config.get(), traceResourceAttributes(Config.get()));
+
+    static String buildResourceFragment(Config config, Map<String, Object> extraAttributes) {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginObject();
+            writer.name("attributes").beginArray();
+
+            visitResourceAttributes(
+                    config, extraAttributes, (key, value) -> writeResourceAttribute(writer, key, value));
+
+            writer.endArray();
+            writer.endObject();
+            return writer.toString();
+        }
     }
-  }
-
-  /**
-   * {@code value} is a {@link String}, except {@code datadog.process_tags}: a {@code List<String>}.
-   */
-  private static void writeResourceAttribute(JsonWriter writer, String key, Object value) {
-    if (value instanceof List) {
-      writeAttribute(writer, STRING_ARRAY_ATTRIBUTE, key, value);
-    } else {
-      writeAttribute(writer, STRING_ATTRIBUTE, key, value);
+
+    /**
+     * {@code value} is a {@link String}, except {@code datadog.process_tags}: a {@code List<String>}.
+     */
+    private static void writeResourceAttribute(JsonWriter writer, String key, Object value) {
+        if (value instanceof List) {
+            writeAttribute(writer, STRING_ARRAY_ATTRIBUTE, key, value);
+        } else {
+            writeAttribute(writer, STRING_ATTRIBUTE, key, value);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpResourceProto.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpResourceProto.java
index 3a2d4c0c460..a1adfd094de 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpResourceProto.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpResourceProto.java
@@ -18,50 +18,48 @@
 
 /** Provides a canned message for OpenTelemetry's "resource.proto" wire protocol. */
 public final class OtlpResourceProto {
-  private OtlpResourceProto() {}
+    private OtlpResourceProto() {}
 
-  /** Vendor-neutral resource (no {@code datadog.*}). Used by the OTLP metric export. */
-  public static final byte[] RESOURCE_MESSAGE =
-      buildResourceMessage(Config.get(), Collections.emptyMap());
+    /** Vendor-neutral resource (no {@code datadog.*}). Used by the OTLP metric export. */
+    public static final byte[] RESOURCE_MESSAGE = buildResourceMessage(Config.get(), Collections.emptyMap());
 
-  /**
-   * Resource that additionally carries {@code datadog.runtime_id} and process tags (each prefixed
-   * {@code datadog.}). Used by the SDK trace-metrics export.
-   */
-  public static final byte[] RESOURCE_MESSAGE_WITH_DATADOG_ATTRS =
-      buildResourceMessage(Config.get(), datadogResourceAttributes(Config.get()));
+    /**
+     * Resource that additionally carries {@code datadog.runtime_id} and process tags (each prefixed
+     * {@code datadog.}). Used by the SDK trace-metrics export.
+     */
+    public static final byte[] RESOURCE_MESSAGE_WITH_DATADOG_ATTRS =
+            buildResourceMessage(Config.get(), datadogResourceAttributes(Config.get()));
 
-  /**
-   * Resource used by the OTLP trace export. Identical to {@link #RESOURCE_MESSAGE} but adds the
-   * {@code _dd.stats_computed} marker when the SDK is computing OTLP span metrics, so a downstream
-   * Agent does not recompute them from the exported spans.
-   */
-  public static final byte[] TRACE_RESOURCE_MESSAGE =
-      buildResourceMessage(Config.get(), traceResourceAttributes(Config.get()));
+    /**
+     * Resource used by the OTLP trace export. Identical to {@link #RESOURCE_MESSAGE} but adds the
+     * {@code _dd.stats_computed} marker when the SDK is computing OTLP span metrics, so a downstream
+     * Agent does not recompute them from the exported spans.
+     */
+    public static final byte[] TRACE_RESOURCE_MESSAGE =
+            buildResourceMessage(Config.get(), traceResourceAttributes(Config.get()));
 
-  static byte[] buildResourceMessage(Config config, Map<String, Object> extraAttributes) {
-    GrowableBuffer buf = new GrowableBuffer(512);
+    static byte[] buildResourceMessage(Config config, Map<String, Object> extraAttributes) {
+        GrowableBuffer buf = new GrowableBuffer(512);
 
-    visitResourceAttributes(
-        config, extraAttributes, (key, value) -> writeResourceAttribute(buf, key, value));
+        visitResourceAttributes(config, extraAttributes, (key, value) -> writeResourceAttribute(buf, key, value));
 
-    OtlpProtoBuffer protobuf = new OtlpProtoBuffer(buf.capacity());
-    int numBytes = protobuf.recordMessage(buf, 1);
-    byte[] resourceMessage = new byte[numBytes];
-    protobuf.flip().get(resourceMessage);
+        OtlpProtoBuffer protobuf = new OtlpProtoBuffer(buf.capacity());
+        int numBytes = protobuf.recordMessage(buf, 1);
+        byte[] resourceMessage = new byte[numBytes];
+        protobuf.flip().get(resourceMessage);
 
-    return resourceMessage;
-  }
+        return resourceMessage;
+    }
 
-  /**
-   * {@code value} is a {@link String}, except {@code datadog.process_tags}: a {@code List<String>}.
-   */
-  private static void writeResourceAttribute(StreamingBuffer buf, String key, Object value) {
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    if (value instanceof List) {
-      writeAttribute(buf, STRING_ARRAY_ATTRIBUTE, key, value);
-    } else {
-      writeAttribute(buf, STRING_ATTRIBUTE, key, value);
+    /**
+     * {@code value} is a {@link String}, except {@code datadog.process_tags}: a {@code List<String>}.
+     */
+    private static void writeResourceAttribute(StreamingBuffer buf, String key, Object value) {
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        if (value instanceof List) {
+            writeAttribute(buf, STRING_ARRAY_ATTRIBUTE, key, value);
+        } else {
+            writeAttribute(buf, STRING_ATTRIBUTE, key, value);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpSender.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpSender.java
index 81172279b85..67260643a87 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpSender.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpSender.java
@@ -4,7 +4,7 @@
 
 /** Sends chunks of OTLP data. */
 public interface OtlpSender {
-  RemoteApi.Response send(OtlpPayload payload);
+    RemoteApi.Response send(OtlpPayload payload);
 
-  void shutdown();
+    void shutdown();
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpSenderSupport.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpSenderSupport.java
index 3e27cc9e020..e201f9051ff 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpSenderSupport.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpSenderSupport.java
@@ -12,28 +12,24 @@
 
 /** Shared request execution and response handling for {@link OtlpSender} implementations. */
 final class OtlpSenderSupport {
-  private OtlpSenderSupport() {}
+    private OtlpSenderSupport() {}
 
-  /** Executes the given request with retries, logging failures via the rate-limited logger. */
-  static RemoteApi.Response send(
-      OkHttpClient client,
-      HttpRetryPolicy.Factory retryPolicy,
-      okhttp3.Request request,
-      RatelimitedLogger ratelimitedLogger) {
-    try (okhttp3.Response response = sendWithRetries(client, retryPolicy, request)) {
-      if (response.isSuccessful()) {
-        return success(response.code());
-      }
-      ratelimitedLogger.warn(
-          "OTLP export to {} failed with status {}: {}",
-          request.url(),
-          response.code(),
-          response.message());
-      return failed(response.code());
-    } catch (IOException e) {
-      ratelimitedLogger.warn(
-          "OTLP export to {} failed with exception: {}", request.url(), e.toString());
-      return failed(e);
+    /** Executes the given request with retries, logging failures via the rate-limited logger. */
+    static RemoteApi.Response send(
+            OkHttpClient client,
+            HttpRetryPolicy.Factory retryPolicy,
+            okhttp3.Request request,
+            RatelimitedLogger ratelimitedLogger) {
+        try (okhttp3.Response response = sendWithRetries(client, retryPolicy, request)) {
+            if (response.isSuccessful()) {
+                return success(response.code());
+            }
+            ratelimitedLogger.warn(
+                    "OTLP export to {} failed with status {}: {}", request.url(), response.code(), response.message());
+            return failed(response.code());
+        } catch (IOException e) {
+            ratelimitedLogger.warn("OTLP export to {} failed with exception: {}", request.url(), e.toString());
+            return failed(e);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpTraceFlags.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpTraceFlags.java
index eb9d4d5b389..3f06329ac32 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpTraceFlags.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/common/OtlpTraceFlags.java
@@ -2,9 +2,9 @@
 
 /** OTLP's {@code Span.flags} bit values, shared by the trace and logs proto/JSON encoders. */
 public final class OtlpTraceFlags {
-  private OtlpTraceFlags() {}
+    private OtlpTraceFlags() {}
 
-  public static final int NO_TRACE_FLAGS = 0x00000000;
-  public static final int SAMPLED_TRACE_FLAG = 0x00000001;
-  public static final int REMOTE_TRACE_FLAG = 0x00000300;
+    public static final int NO_TRACE_FLAGS = 0x00000000;
+    public static final int SAMPLED_TRACE_FLAG = 0x00000001;
+    public static final int REMOTE_TRACE_FLAG = 0x00000300;
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsCollector.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsCollector.java
index 0e699e22623..e1a86dbe0a9 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsCollector.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsCollector.java
@@ -5,9 +5,9 @@
 /** Collects logs ready for export. */
 public abstract class OtlpLogsCollector {
 
-  /** Waits for logs to be batched within the given interval. */
-  public abstract OtlpPayload waitForLogs(int intervalMillis);
+    /** Waits for logs to be batched within the given interval. */
+    public abstract OtlpPayload waitForLogs(int intervalMillis);
 
-  /** Number of log records collected. */
-  public abstract int getLogRecordCount();
+    /** Number of log records collected. */
+    public abstract int getLogRecordCount();
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsJson.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsJson.java
index d356a53ab46..bf73d8917d5 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsJson.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsJson.java
@@ -9,34 +9,38 @@
 
 /** Provides writers for OpenTelemetry's "logs.proto" JSON encoding. */
 public final class OtlpLogsJson {
-  private OtlpLogsJson() {}
-
-  /**
-   * Writes a log record's non-attribute fields into the currently open {@code LogRecord} object.
-   */
-  public static void writeLogRecordFields(JsonWriter writer, OtlpLogRecord logRecord) {
-    writer.name("timeUnixNano").value(Long.toString(logRecord.timestampNanos));
-    writer.name("observedTimeUnixNano").value(Long.toString(logRecord.observedNanos));
-    writer.name("severityNumber").value(logRecord.severityNumber);
-
-    if (logRecord.severityText != null) {
-      writer.name("severityText").value(logRecord.severityText);
+    private OtlpLogsJson() {}
+
+    /**
+     * Writes a log record's non-attribute fields into the currently open {@code LogRecord} object.
+     */
+    public static void writeLogRecordFields(JsonWriter writer, OtlpLogRecord logRecord) {
+        writer.name("timeUnixNano").value(Long.toString(logRecord.timestampNanos));
+        writer.name("observedTimeUnixNano").value(Long.toString(logRecord.observedNanos));
+        writer.name("severityNumber").value(logRecord.severityNumber);
+
+        if (logRecord.severityText != null) {
+            writer.name("severityText").value(logRecord.severityText);
+        }
+
+        if (logRecord.body != null) {
+            writer.name("body")
+                    .beginObject()
+                    .name("stringValue")
+                    .value(logRecord.body)
+                    .endObject();
+        }
+
+        if (logRecord.spanContext != null) {
+            writer.name("traceId").value(hexTraceId(logRecord.spanContext.getTraceId()));
+            writer.name("spanId").value(hexSpanId(logRecord.spanContext.getSpanId()));
+            if (logRecord.spanContext.getSamplingPriority() > 0) {
+                writer.name("flags").value(SAMPLED_TRACE_FLAG);
+            }
+        }
+
+        if (logRecord.eventName != null) {
+            writer.name("eventName").value(logRecord.eventName);
+        }
     }
-
-    if (logRecord.body != null) {
-      writer.name("body").beginObject().name("stringValue").value(logRecord.body).endObject();
-    }
-
-    if (logRecord.spanContext != null) {
-      writer.name("traceId").value(hexTraceId(logRecord.spanContext.getTraceId()));
-      writer.name("spanId").value(hexSpanId(logRecord.spanContext.getSpanId()));
-      if (logRecord.spanContext.getSamplingPriority() > 0) {
-        writer.name("flags").value(SAMPLED_TRACE_FLAG);
-      }
-    }
-
-    if (logRecord.eventName != null) {
-      writer.name("eventName").value(logRecord.eventName);
-    }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsJsonCollector.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsJsonCollector.java
index b81822b6705..76e1d40e7f4 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsJsonCollector.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsJsonCollector.java
@@ -28,141 +28,140 @@
  * {@code visitAttribute} is called, then {@code visitLogRecord} writes the rest of its fields and
  * closes it.
  */
-public final class OtlpLogsJsonCollector extends OtlpLogsCollector
-    implements OtlpLogsVisitor, OtlpScopedLogsVisitor {
-
-  public static final OtlpLogsJsonCollector INSTANCE = new OtlpLogsJsonCollector();
-
-  private JsonWriter writer;
-  private boolean anyLogRecordWritten;
-  private boolean logRecordStarted;
-  private int logRecordCount;
-
-  private final LazyJsonArray attributesArray = new LazyJsonArray();
-
-  private OtelInstrumentationScope currentScope;
-
-  private OtlpLogsJsonCollector() {}
-
-  /**
-   * Collects OpenTelemetry logs and marshals them into a JSON payload.
-   *
-   * <p>This payload is only valid for the calling thread until the next collection.
-   */
-  @Override
-  public OtlpPayload waitForLogs(int intervalMillis) {
-    return collectLogs(OtelLogRecordProcessor.INSTANCE::waitForLogs, intervalMillis);
-  }
-
-  OtlpPayload collectLogs(ObjIntConsumer<OtlpLogsVisitor> processor, int intervalMillis) {
-    start();
-    try {
-      processor.accept(this, intervalMillis);
-      return completePayload();
-    } finally {
-      stop();
+public final class OtlpLogsJsonCollector extends OtlpLogsCollector implements OtlpLogsVisitor, OtlpScopedLogsVisitor {
+
+    public static final OtlpLogsJsonCollector INSTANCE = new OtlpLogsJsonCollector();
+
+    private JsonWriter writer;
+    private boolean anyLogRecordWritten;
+    private boolean logRecordStarted;
+    private int logRecordCount;
+
+    private final LazyJsonArray attributesArray = new LazyJsonArray();
+
+    private OtelInstrumentationScope currentScope;
+
+    private OtlpLogsJsonCollector() {}
+
+    /**
+     * Collects OpenTelemetry logs and marshals them into a JSON payload.
+     *
+     * <p>This payload is only valid for the calling thread until the next collection.
+     */
+    @Override
+    public OtlpPayload waitForLogs(int intervalMillis) {
+        return collectLogs(OtelLogRecordProcessor.INSTANCE::waitForLogs, intervalMillis);
     }
-  }
 
-  /** Prepare temporary elements to collect logs data. */
-  private void start() {
-    logRecordCount = 0;
+    OtlpPayload collectLogs(ObjIntConsumer<OtlpLogsVisitor> processor, int intervalMillis) {
+        start();
+        try {
+            processor.accept(this, intervalMillis);
+            return completePayload();
+        } finally {
+            stop();
+        }
+    }
 
-    writer = new JsonWriter();
-    writer.beginObject();
-    writer.name("resourceLogs").beginArray();
-    writer.beginObject();
-    writer.name("resource").jsonValue(RESOURCE_FRAGMENT);
-    writer.name("scopeLogs").beginArray();
-  }
+    /** Prepare temporary elements to collect logs data. */
+    private void start() {
+        logRecordCount = 0;
 
-  /** Cleanup elements used to collect logs data. */
-  private void stop() {
-    attributesArray.reset();
+        writer = new JsonWriter();
+        writer.beginObject();
+        writer.name("resourceLogs").beginArray();
+        writer.beginObject();
+        writer.name("resource").jsonValue(RESOURCE_FRAGMENT);
+        writer.name("scopeLogs").beginArray();
+    }
 
-    anyLogRecordWritten = false;
+    /** Cleanup elements used to collect logs data. */
+    private void stop() {
+        attributesArray.reset();
 
-    writer = null;
+        anyLogRecordWritten = false;
 
-    logRecordStarted = false;
+        writer = null;
 
-    currentScope = null;
-  }
+        logRecordStarted = false;
 
-  @Override
-  public int getLogRecordCount() {
-    return logRecordCount;
-  }
+        currentScope = null;
+    }
 
-  @Override
-  public OtlpScopedLogsVisitor visitScopedLogs(OtelInstrumentationScope scope) {
-    if (currentScope != null) {
-      completeScope();
+    @Override
+    public int getLogRecordCount() {
+        return logRecordCount;
     }
-    currentScope = scope;
-
-    writer.beginObject();
-    writeScopeAndSchema(writer, scope);
-    writer.name("logRecords").beginArray();
-
-    return this;
-  }
-
-  @Override
-  public void visitAttribute(int type, String key, Object value) {
-    // add attribute to the log record currently being collected
-    ensureLogRecordStarted();
-    attributesArray.ensureOpen(writer, "attributes");
-    writeAttribute(writer, type, key, value);
-  }
-
-  @Override
-  public void visitLogRecord(OtlpLogRecord logRecord) {
-    ensureLogRecordStarted();
-    attributesArray.closeIfOpen(writer);
-
-    writeLogRecordFields(writer, logRecord);
-
-    writer.endObject(); // log record
-
-    logRecordStarted = false;
-    anyLogRecordWritten = true;
-    logRecordCount++;
-  }
-
-  // opens the log record object on first attribute or value written for it
-  private void ensureLogRecordStarted() {
-    if (!logRecordStarted) {
-      writer.beginObject();
-      logRecordStarted = true;
+
+    @Override
+    public OtlpScopedLogsVisitor visitScopedLogs(OtelInstrumentationScope scope) {
+        if (currentScope != null) {
+            completeScope();
+        }
+        currentScope = scope;
+
+        writer.beginObject();
+        writeScopeAndSchema(writer, scope);
+        writer.name("logRecords").beginArray();
+
+        return this;
     }
-  }
 
-  // called once we've processed all scopes and log record messages
-  private OtlpPayload completePayload() {
-    if (currentScope != null) {
-      completeScope();
+    @Override
+    public void visitAttribute(int type, String key, Object value) {
+        // add attribute to the log record currently being collected
+        ensureLogRecordStarted();
+        attributesArray.ensureOpen(writer, "attributes");
+        writeAttribute(writer, type, key, value);
     }
 
-    writer.endArray(); // scopeLogs
-    writer.endObject(); // resourceLogs[0]
-    writer.endArray(); // resourceLogs
-    writer.endObject(); // root
+    @Override
+    public void visitLogRecord(OtlpLogRecord logRecord) {
+        ensureLogRecordStarted();
+        attributesArray.closeIfOpen(writer);
+
+        writeLogRecordFields(writer, logRecord);
+
+        writer.endObject(); // log record
+
+        logRecordStarted = false;
+        anyLogRecordWritten = true;
+        logRecordCount++;
+    }
 
-    if (!anyLogRecordWritten) {
-      return OtlpPayload.EMPTY;
+    // opens the log record object on first attribute or value written for it
+    private void ensureLogRecordStarted() {
+        if (!logRecordStarted) {
+            writer.beginObject();
+            logRecordStarted = true;
+        }
     }
 
-    byte[] bytes = writer.toByteArray();
-    return new OtlpPayload(ByteBuffer.wrap(bytes), JSON_CONTENT_TYPE);
-  }
+    // called once we've processed all scopes and log record messages
+    private OtlpPayload completePayload() {
+        if (currentScope != null) {
+            completeScope();
+        }
 
-  // called once we've processed all log records in a specific scope
-  private void completeScope() {
-    writer.endArray(); // logRecords
-    writer.endObject(); // scopeLogs[0]
+        writer.endArray(); // scopeLogs
+        writer.endObject(); // resourceLogs[0]
+        writer.endArray(); // resourceLogs
+        writer.endObject(); // root
 
-    // reset temporary elements for next scope
-    currentScope = null;
-  }
+        if (!anyLogRecordWritten) {
+            return OtlpPayload.EMPTY;
+        }
+
+        byte[] bytes = writer.toByteArray();
+        return new OtlpPayload(ByteBuffer.wrap(bytes), JSON_CONTENT_TYPE);
+    }
+
+    // called once we've processed all log records in a specific scope
+    private void completeScope() {
+        writer.endArray(); // logRecords
+        writer.endObject(); // scopeLogs[0]
+
+        // reset temporary elements for next scope
+        currentScope = null;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsProto.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsProto.java
index ab74985c7b6..3fd71aaef1b 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsProto.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsProto.java
@@ -24,71 +24,67 @@
 
 /** Provides optimized writers for OpenTelemetry's "logs.proto" wire protocol. */
 public final class OtlpLogsProto {
-  private OtlpLogsProto() {}
-
-  /** Records a scoped logs message after its nested log messages have been recorded. */
-  public static int recordScopedLogsMessage(
-      GrowableBuffer buf,
-      OtelInstrumentationScope scope,
-      int nestedLogBytes,
-      OtlpProtoBuffer protobuf) {
-
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    writeInstrumentationScope(buf, scope);
-    if (scope.getSchemaUrl() != null) {
-      writeTag(buf, 3, LEN_WIRE_TYPE);
-      writeString(buf, scope.getSchemaUrl().getUtf8Bytes());
+    private OtlpLogsProto() {}
+
+    /** Records a scoped logs message after its nested log messages have been recorded. */
+    public static int recordScopedLogsMessage(
+            GrowableBuffer buf, OtelInstrumentationScope scope, int nestedLogBytes, OtlpProtoBuffer protobuf) {
+
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        writeInstrumentationScope(buf, scope);
+        if (scope.getSchemaUrl() != null) {
+            writeTag(buf, 3, LEN_WIRE_TYPE);
+            writeString(buf, scope.getSchemaUrl().getUtf8Bytes());
+        }
+
+        return protobuf.recordMessage(buf, 2, nestedLogBytes);
     }
 
-    return protobuf.recordMessage(buf, 2, nestedLogBytes);
-  }
+    /** Records a log message. */
+    public static int recordLogRecordMessage(GrowableBuffer buf, OtlpLogRecord logRecord, OtlpProtoBuffer protobuf) {
 
-  /** Records a log message. */
-  public static int recordLogRecordMessage(
-      GrowableBuffer buf, OtlpLogRecord logRecord, OtlpProtoBuffer protobuf) {
+        writeTag(buf, 1, I64_WIRE_TYPE);
+        writeI64(buf, logRecord.timestampNanos);
 
-    writeTag(buf, 1, I64_WIRE_TYPE);
-    writeI64(buf, logRecord.timestampNanos);
+        writeTag(buf, 11, I64_WIRE_TYPE);
+        writeI64(buf, logRecord.observedNanos);
 
-    writeTag(buf, 11, I64_WIRE_TYPE);
-    writeI64(buf, logRecord.observedNanos);
+        writeTag(buf, 2, VARINT_WIRE_TYPE);
+        writeVarInt(buf, logRecord.severityNumber);
 
-    writeTag(buf, 2, VARINT_WIRE_TYPE);
-    writeVarInt(buf, logRecord.severityNumber);
+        if (logRecord.severityText != null) {
+            writeTag(buf, 3, LEN_WIRE_TYPE);
+            writeStringCached(buf, logRecord.severityText);
+        }
 
-    if (logRecord.severityText != null) {
-      writeTag(buf, 3, LEN_WIRE_TYPE);
-      writeStringCached(buf, logRecord.severityText);
-    }
+        if (logRecord.body != null) {
+            writeTag(buf, 5, LEN_WIRE_TYPE);
+            byte[] bodyUtf8 = logRecord.body.getBytes(UTF_8);
+            int bodySize = 1 + sizeVarInt(bodyUtf8.length) + bodyUtf8.length;
+            writeVarInt(buf, bodySize);
+            writeTag(buf, 1, LEN_WIRE_TYPE);
+            writeVarInt(buf, bodyUtf8.length);
+            buf.put(bodyUtf8);
+        }
 
-    if (logRecord.body != null) {
-      writeTag(buf, 5, LEN_WIRE_TYPE);
-      byte[] bodyUtf8 = logRecord.body.getBytes(UTF_8);
-      int bodySize = 1 + sizeVarInt(bodyUtf8.length) + bodyUtf8.length;
-      writeVarInt(buf, bodySize);
-      writeTag(buf, 1, LEN_WIRE_TYPE);
-      writeVarInt(buf, bodyUtf8.length);
-      buf.put(bodyUtf8);
-    }
+        if (logRecord.spanContext != null) {
+            writeTag(buf, 9, LEN_WIRE_TYPE);
+            writeTraceId(buf, logRecord.spanContext.getTraceId());
 
-    if (logRecord.spanContext != null) {
-      writeTag(buf, 9, LEN_WIRE_TYPE);
-      writeTraceId(buf, logRecord.spanContext.getTraceId());
+            writeTag(buf, 10, LEN_WIRE_TYPE);
+            writeSpanId(buf, logRecord.spanContext.getSpanId());
 
-      writeTag(buf, 10, LEN_WIRE_TYPE);
-      writeSpanId(buf, logRecord.spanContext.getSpanId());
+            if (logRecord.spanContext.getSamplingPriority() > 0) {
+                writeTag(buf, 8, I32_WIRE_TYPE);
+                writeI32(buf, SAMPLED_TRACE_FLAG);
+            }
+        }
 
-      if (logRecord.spanContext.getSamplingPriority() > 0) {
-        writeTag(buf, 8, I32_WIRE_TYPE);
-        writeI32(buf, SAMPLED_TRACE_FLAG);
-      }
-    }
+        if (logRecord.eventName != null) {
+            writeTag(buf, 12, LEN_WIRE_TYPE);
+            writeStringCached(buf, logRecord.eventName);
+        }
 
-    if (logRecord.eventName != null) {
-      writeTag(buf, 12, LEN_WIRE_TYPE);
-      writeStringCached(buf, logRecord.eventName);
+        return protobuf.recordMessage(buf, 2);
     }
-
-    return protobuf.recordMessage(buf, 2);
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsProtoCollector.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsProtoCollector.java
index 94fb0c6d1fa..f06030340d9 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsProtoCollector.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsProtoCollector.java
@@ -30,117 +30,116 @@
  * the scoped logs message and all its chunked log records to the payload. Once all the logs data
  * has been chunked we add the enclosing resource logs message to the start of the payload.
  */
-public final class OtlpLogsProtoCollector extends OtlpLogsCollector
-    implements OtlpLogsVisitor, OtlpScopedLogsVisitor {
-
-  public static final OtlpLogsProtoCollector INSTANCE = new OtlpLogsProtoCollector();
-
-  private final GrowableBuffer buf = new GrowableBuffer(512);
-  private final OtlpProtoBuffer protobuf = new OtlpProtoBuffer(8192);
-
-  // total number of chunked bytes at different nesting levels
-  private int payloadBytes;
-  private int scopedBytes;
-  private int logRecordCount;
-
-  private OtelInstrumentationScope currentScope;
-
-  private OtlpLogsProtoCollector() {}
-
-  /**
-   * Collects OpenTelemetry logs and marshals them into a chunked payload.
-   *
-   * <p>This payload is only valid for the calling thread until the next collection.
-   */
-  @Override
-  public OtlpPayload waitForLogs(int intervalMillis) {
-    return collectLogs(OtelLogRecordProcessor.INSTANCE::waitForLogs, intervalMillis);
-  }
-
-  OtlpPayload collectLogs(ObjIntConsumer<OtlpLogsVisitor> processor, int intervalMillis) {
-    start();
-    try {
-      processor.accept(this, intervalMillis);
-      return completePayload();
-    } finally {
-      stop();
+public final class OtlpLogsProtoCollector extends OtlpLogsCollector implements OtlpLogsVisitor, OtlpScopedLogsVisitor {
+
+    public static final OtlpLogsProtoCollector INSTANCE = new OtlpLogsProtoCollector();
+
+    private final GrowableBuffer buf = new GrowableBuffer(512);
+    private final OtlpProtoBuffer protobuf = new OtlpProtoBuffer(8192);
+
+    // total number of chunked bytes at different nesting levels
+    private int payloadBytes;
+    private int scopedBytes;
+    private int logRecordCount;
+
+    private OtelInstrumentationScope currentScope;
+
+    private OtlpLogsProtoCollector() {}
+
+    /**
+     * Collects OpenTelemetry logs and marshals them into a chunked payload.
+     *
+     * <p>This payload is only valid for the calling thread until the next collection.
+     */
+    @Override
+    public OtlpPayload waitForLogs(int intervalMillis) {
+        return collectLogs(OtelLogRecordProcessor.INSTANCE::waitForLogs, intervalMillis);
     }
-  }
 
-  /** Prepare temporary elements to collect logs data. */
-  private void start() {
-    logRecordCount = 0;
+    OtlpPayload collectLogs(ObjIntConsumer<OtlpLogsVisitor> processor, int intervalMillis) {
+        start();
+        try {
+            processor.accept(this, intervalMillis);
+            return completePayload();
+        } finally {
+            stop();
+        }
+    }
 
-    // remove stale entries from caches
-    OtlpCommonProto.recalibrateCaches();
-  }
+    /** Prepare temporary elements to collect logs data. */
+    private void start() {
+        logRecordCount = 0;
 
-  /** Cleanup elements used to collect logs data. */
-  private void stop() {
-    buf.reset();
-    protobuf.reset();
+        // remove stale entries from caches
+        OtlpCommonProto.recalibrateCaches();
+    }
 
-    payloadBytes = 0;
-    scopedBytes = 0;
+    /** Cleanup elements used to collect logs data. */
+    private void stop() {
+        buf.reset();
+        protobuf.reset();
 
-    currentScope = null;
-  }
+        payloadBytes = 0;
+        scopedBytes = 0;
 
-  @Override
-  public int getLogRecordCount() {
-    return logRecordCount;
-  }
+        currentScope = null;
+    }
+
+    @Override
+    public int getLogRecordCount() {
+        return logRecordCount;
+    }
 
-  @Override
-  public OtlpScopedLogsVisitor visitScopedLogs(OtelInstrumentationScope scope) {
-    if (currentScope != null) {
-      completeScope();
+    @Override
+    public OtlpScopedLogsVisitor visitScopedLogs(OtelInstrumentationScope scope) {
+        if (currentScope != null) {
+            completeScope();
+        }
+        currentScope = scope;
+        return this;
     }
-    currentScope = scope;
-    return this;
-  }
-
-  @Override
-  public void visitLogRecord(OtlpLogRecord logRecord) {
-    scopedBytes += recordLogRecordMessage(buf, logRecord, protobuf);
-    logRecordCount++;
-  }
-
-  @Override
-  public void visitAttribute(int type, String key, Object value) {
-    // add attribute to the log record currently being collected
-    writeTag(buf, 6, LEN_WIRE_TYPE);
-    writeAttribute(buf, type, key, value);
-  }
-
-  // called once we've processed all scopes and log record messages
-  private OtlpPayload completePayload() {
-    if (currentScope != null) {
-      completeScope();
+
+    @Override
+    public void visitLogRecord(OtlpLogRecord logRecord) {
+        scopedBytes += recordLogRecordMessage(buf, logRecord, protobuf);
+        logRecordCount++;
     }
 
-    if (payloadBytes == 0) {
-      return OtlpPayload.EMPTY;
+    @Override
+    public void visitAttribute(int type, String key, Object value) {
+        // add attribute to the log record currently being collected
+        writeTag(buf, 6, LEN_WIRE_TYPE);
+        writeAttribute(buf, type, key, value);
     }
 
-    // prepend the canned resource chunk
-    payloadBytes += protobuf.recordMessage(RESOURCE_MESSAGE);
+    // called once we've processed all scopes and log record messages
+    private OtlpPayload completePayload() {
+        if (currentScope != null) {
+            completeScope();
+        }
 
-    // finally prepend the total length of all collected chunks
-    protobuf.recordMessage(buf, 1, payloadBytes);
-    return protobuf.toPayload();
-  }
+        if (payloadBytes == 0) {
+            return OtlpPayload.EMPTY;
+        }
 
-  // called once we've processed all logs in a specific scope
-  private void completeScope() {
+        // prepend the canned resource chunk
+        payloadBytes += protobuf.recordMessage(RESOURCE_MESSAGE);
 
-    // add scoped logs message prefix to its nested chunks and promote to payload
-    if (scopedBytes > 0) {
-      payloadBytes += recordScopedLogsMessage(buf, currentScope, scopedBytes, protobuf);
+        // finally prepend the total length of all collected chunks
+        protobuf.recordMessage(buf, 1, payloadBytes);
+        return protobuf.toPayload();
     }
 
-    // reset temporary elements for next scope
-    currentScope = null;
-    scopedBytes = 0;
-  }
+    // called once we've processed all logs in a specific scope
+    private void completeScope() {
+
+        // add scoped logs message prefix to its nested chunks and promote to payload
+        if (scopedBytes > 0) {
+            payloadBytes += recordScopedLogsMessage(buf, currentScope, scopedBytes, protobuf);
+        }
+
+        // reset temporary elements for next scope
+        currentScope = null;
+        scopedBytes = 0;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsService.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsService.java
index e65a3757782..c2ffe215694 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsService.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsService.java
@@ -15,110 +15,107 @@
 
 /** Periodic service to collect OpenTelemetry logs and export them over OTLP. */
 public final class OtlpLogsService {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtlpLogsService.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtlpLogsService.class);
 
-  public static final OtlpLogsService INSTANCE = new OtlpLogsService(Config.get());
+    public static final OtlpLogsService INSTANCE = new OtlpLogsService(Config.get());
 
-  private final int intervalMillis;
-  private final OtlpLogsCollector collector;
-  private final OtlpSender sender;
+    private final int intervalMillis;
+    private final OtlpLogsCollector collector;
+    private final OtlpSender sender;
 
-  private volatile Thread exporterThread;
+    private volatile Thread exporterThread;
 
-  OtlpLogsService(Config config) {
-    intervalMillis = config.getLogsOtelInterval();
-    switch (config.getOtlpLogsProtocol()) {
-      case GRPC:
-        this.collector = OtlpLogsProtoCollector.INSTANCE;
-        this.sender =
-            new OtlpGrpcSender(
-                config.getOtlpLogsEndpoint(),
-                "/opentelemetry.proto.collector.logs.v1.LogsService/Export",
-                config.getOtlpLogsHeaders(),
-                config.getOtlpLogsTimeout(),
-                config.getOtlpLogsCompression());
-        break;
-      case HTTP_PROTOBUF:
-        this.collector = OtlpLogsProtoCollector.INSTANCE;
-        this.sender =
-            new OtlpHttpSender(
-                config.getOtlpLogsEndpoint(),
-                "/v1/logs",
-                config.getOtlpLogsHeaders(),
-                config.getOtlpLogsTimeout(),
-                config.getOtlpLogsCompression());
-        break;
-      case HTTP_JSON:
-        this.collector = OtlpLogsJsonCollector.INSTANCE;
-        this.sender =
-            new OtlpHttpSender(
-                config.getOtlpLogsEndpoint(),
-                "/v1/logs",
-                config.getOtlpLogsHeaders(),
-                config.getOtlpLogsTimeout(),
-                config.getOtlpLogsCompression());
-        break;
-      default:
-        LOGGER.debug("Unsupported OTLP logs protocol: {}", config.getOtlpLogsProtocol());
-        this.collector = null;
-        this.sender = null;
+    OtlpLogsService(Config config) {
+        intervalMillis = config.getLogsOtelInterval();
+        switch (config.getOtlpLogsProtocol()) {
+            case GRPC:
+                this.collector = OtlpLogsProtoCollector.INSTANCE;
+                this.sender = new OtlpGrpcSender(
+                        config.getOtlpLogsEndpoint(),
+                        "/opentelemetry.proto.collector.logs.v1.LogsService/Export",
+                        config.getOtlpLogsHeaders(),
+                        config.getOtlpLogsTimeout(),
+                        config.getOtlpLogsCompression());
+                break;
+            case HTTP_PROTOBUF:
+                this.collector = OtlpLogsProtoCollector.INSTANCE;
+                this.sender = new OtlpHttpSender(
+                        config.getOtlpLogsEndpoint(),
+                        "/v1/logs",
+                        config.getOtlpLogsHeaders(),
+                        config.getOtlpLogsTimeout(),
+                        config.getOtlpLogsCompression());
+                break;
+            case HTTP_JSON:
+                this.collector = OtlpLogsJsonCollector.INSTANCE;
+                this.sender = new OtlpHttpSender(
+                        config.getOtlpLogsEndpoint(),
+                        "/v1/logs",
+                        config.getOtlpLogsHeaders(),
+                        config.getOtlpLogsTimeout(),
+                        config.getOtlpLogsCompression());
+                break;
+            default:
+                LOGGER.debug("Unsupported OTLP logs protocol: {}", config.getOtlpLogsProtocol());
+                this.collector = null;
+                this.sender = null;
+        }
     }
-  }
-
-  OtlpSender getSender() {
-    return sender;
-  }
 
-  OtlpLogsCollector getCollector() {
-    return collector;
-  }
+    OtlpSender getSender() {
+        return sender;
+    }
 
-  public void start() {
-    if (sender == null) {
-      return;
+    OtlpLogsCollector getCollector() {
+        return collector;
     }
 
-    exporterThread = newAgentThread(OTLP_LOGS_EXPORTER, this::export);
-    exporterThread.start();
-  }
+    public void start() {
+        if (sender == null) {
+            return;
+        }
 
-  public void flush() {
-    Thread thread = exporterThread;
-    if (thread != null) {
-      thread.interrupt();
+        exporterThread = newAgentThread(OTLP_LOGS_EXPORTER, this::export);
+        exporterThread.start();
     }
-  }
 
-  public void shutdown() {
-    Thread thread = exporterThread;
-    if (thread != null) {
-      exporterThread = null;
-      thread.interrupt();
-      try {
-        thread.join(1_000);
-      } catch (InterruptedException ignore) {
-        // don't set interrupt flag as we're mid-shutdown
-      }
+    public void flush() {
+        Thread thread = exporterThread;
+        if (thread != null) {
+            thread.interrupt();
+        }
     }
-    if (sender != null) {
-      sender.shutdown();
+
+    public void shutdown() {
+        Thread thread = exporterThread;
+        if (thread != null) {
+            exporterThread = null;
+            thread.interrupt();
+            try {
+                thread.join(1_000);
+            } catch (InterruptedException ignore) {
+                // don't set interrupt flag as we're mid-shutdown
+            }
+        }
+        if (sender != null) {
+            sender.shutdown();
+        }
     }
-  }
 
-  private void export() {
-    while (Thread.currentThread() == exporterThread) {
-      try {
-        OtlpPayload payload = collector.waitForLogs(intervalMillis);
-        if (payload != OtlpPayload.EMPTY) {
-          int logRecordCount = collector.getLogRecordCount();
-          RemoteApi.Response response = sender.send(payload);
-          if (response.success()) {
-            OtlpTelemetry.getInstance().onLogRecordsSubmitted(logRecordCount);
-          }
+    private void export() {
+        while (Thread.currentThread() == exporterThread) {
+            try {
+                OtlpPayload payload = collector.waitForLogs(intervalMillis);
+                if (payload != OtlpPayload.EMPTY) {
+                    int logRecordCount = collector.getLogRecordCount();
+                    RemoteApi.Response response = sender.send(payload);
+                    if (response.success()) {
+                        OtlpTelemetry.getInstance().onLogRecordsSubmitted(logRecordCount);
+                    }
+                }
+            } catch (RuntimeException e) {
+                LOGGER.debug("Uncaught exception exporting logs", e);
+            }
         }
-      } catch (RuntimeException e) {
-        LOGGER.debug("Uncaught exception exporting logs", e);
-      }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsCollector.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsCollector.java
index 3809160aadb..69ef55a55b5 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsCollector.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsCollector.java
@@ -7,10 +7,9 @@
 /** Collects metrics ready for export. */
 public abstract class OtlpMetricsCollector {
 
-  /** Collects all metrics recorded since the last collection. */
-  public abstract OtlpPayload collectMetrics();
+    /** Collects all metrics recorded since the last collection. */
+    public abstract OtlpPayload collectMetrics();
 
-  /** Collects metrics from {@code registry} over an explicit time window. */
-  abstract OtlpPayload collectMetrics(
-      Consumer<OtlpMetricsVisitor> registry, long startNanos, long endNanos);
+    /** Collects metrics from {@code registry} over an explicit time window. */
+    abstract OtlpPayload collectMetrics(Consumer<OtlpMetricsVisitor> registry, long startNanos, long endNanos);
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsJson.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsJson.java
index 1a8e0943aeb..6b0cb9b109e 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsJson.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsJson.java
@@ -18,111 +18,108 @@
 
 /** Provides writers for OpenTelemetry's "metrics.proto" JSON encoding. */
 public final class OtlpMetricsJson {
-  private OtlpMetricsJson() {}
+    private OtlpMetricsJson() {}
 
-  /** Opens a {@code Metric} JSON object, up to and including its {@code dataPoints} array. */
-  public static void openMetric(JsonWriter writer, OtelInstrumentDescriptor descriptor) {
-    openMetric(writer, descriptor, false);
-  }
-
-  /**
-   * Opens a {@code Metric} JSON object, up to and including its {@code dataPoints} array. When
-   * {@code forceDelta} is {@code true}, a histogram is encoded as DELTA regardless of the
-   * configured temporality preference (for sources whose data points are inherently per-interval
-   * deltas).
-   */
-  public static void openMetric(
-      JsonWriter writer, OtelInstrumentDescriptor descriptor, boolean forceDelta) {
-    writer.beginObject();
-    writer.name("name").value(descriptor.getName().toString());
-    if (descriptor.getDescription() != null) {
-      writer.name("description").value(descriptor.getDescription().toString());
-    }
-    if (descriptor.getUnit() != null) {
-      writer.name("unit").value(descriptor.getUnit().toString());
+    /** Opens a {@code Metric} JSON object, up to and including its {@code dataPoints} array. */
+    public static void openMetric(JsonWriter writer, OtelInstrumentDescriptor descriptor) {
+        openMetric(writer, descriptor, false);
     }
 
-    switch (descriptor.getType()) {
-      case GAUGE:
-      case OBSERVABLE_GAUGE:
-        writer.name("gauge").beginObject();
-        // gauges have no aggregation temporality
-        break;
-      case COUNTER:
-        writer.name("sum").beginObject();
-        writer.name("aggregationTemporality").value(COUNTER_TEMPORALITY);
-        writer.name("isMonotonic").value(true);
-        break;
-      case OBSERVABLE_COUNTER:
-        writer.name("sum").beginObject();
-        writer.name("aggregationTemporality").value(OBSERVABLE_COUNTER_TEMPORALITY);
-        writer.name("isMonotonic").value(true);
-        break;
-      case UP_DOWN_COUNTER:
-      case OBSERVABLE_UP_DOWN_COUNTER:
-        writer.name("sum").beginObject();
-        // up/down counters are always cumulative
-        writer.name("aggregationTemporality").value(TEMPORALITY_CUMULATIVE);
-        writer.name("isMonotonic").value(false);
-        break;
-      case HISTOGRAM:
-        writer.name("histogram").beginObject();
-        writer
-            .name("aggregationTemporality")
-            .value(forceDelta ? TEMPORALITY_DELTA : HISTOGRAM_TEMPORALITY);
-        break;
-      default:
-        throw new IllegalArgumentException("Unknown instrument type: " + descriptor.getType());
-    }
+    /**
+     * Opens a {@code Metric} JSON object, up to and including its {@code dataPoints} array. When
+     * {@code forceDelta} is {@code true}, a histogram is encoded as DELTA regardless of the
+     * configured temporality preference (for sources whose data points are inherently per-interval
+     * deltas).
+     */
+    public static void openMetric(JsonWriter writer, OtelInstrumentDescriptor descriptor, boolean forceDelta) {
+        writer.beginObject();
+        writer.name("name").value(descriptor.getName().toString());
+        if (descriptor.getDescription() != null) {
+            writer.name("description").value(descriptor.getDescription().toString());
+        }
+        if (descriptor.getUnit() != null) {
+            writer.name("unit").value(descriptor.getUnit().toString());
+        }
 
-    writer.name("dataPoints").beginArray();
-  }
+        switch (descriptor.getType()) {
+            case GAUGE:
+            case OBSERVABLE_GAUGE:
+                writer.name("gauge").beginObject();
+                // gauges have no aggregation temporality
+                break;
+            case COUNTER:
+                writer.name("sum").beginObject();
+                writer.name("aggregationTemporality").value(COUNTER_TEMPORALITY);
+                writer.name("isMonotonic").value(true);
+                break;
+            case OBSERVABLE_COUNTER:
+                writer.name("sum").beginObject();
+                writer.name("aggregationTemporality").value(OBSERVABLE_COUNTER_TEMPORALITY);
+                writer.name("isMonotonic").value(true);
+                break;
+            case UP_DOWN_COUNTER:
+            case OBSERVABLE_UP_DOWN_COUNTER:
+                writer.name("sum").beginObject();
+                // up/down counters are always cumulative
+                writer.name("aggregationTemporality").value(TEMPORALITY_CUMULATIVE);
+                writer.name("isMonotonic").value(false);
+                break;
+            case HISTOGRAM:
+                writer.name("histogram").beginObject();
+                writer.name("aggregationTemporality").value(forceDelta ? TEMPORALITY_DELTA : HISTOGRAM_TEMPORALITY);
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown instrument type: " + descriptor.getType());
+        }
 
-  /** Closes a {@code Metric} JSON object previously opened by {@link #openMetric}. */
-  public static void closeMetric(JsonWriter writer) {
-    writer.endArray(); // dataPoints
-    writer.endObject(); // gauge|sum|histogram
-    writer.endObject(); // metric
-  }
+        writer.name("dataPoints").beginArray();
+    }
 
-  /** Writes a data point's value fields into the currently open data point object. */
-  public static void writeDataPointValue(JsonWriter writer, OtlpDataPoint point) {
-    if (point instanceof OtlpDoublePoint) {
-      writer.name("asDouble");
-      writeDouble(writer, ((OtlpDoublePoint) point).value);
-    } else if (point instanceof OtlpLongPoint) {
-      // int64 fields are encoded as decimal strings, per the OTLP JSON encoding spec
-      writer.name("asInt").value(Long.toString(((OtlpLongPoint) point).value));
-    } else { // must be a histogram point
-      OtlpHistogramPoint histogram = (OtlpHistogramPoint) point;
-      writer.name("count").value(Long.toString((long) histogram.count));
-      writer.name("sum");
-      writeDouble(writer, histogram.sum);
-      writer.name("min");
-      writeDouble(writer, histogram.min);
-      writer.name("max");
-      writeDouble(writer, histogram.max);
-      if (!histogram.bucketCounts.isEmpty()) {
-        boolean hasOverflow = false;
-        writer.name("explicitBounds").beginArray();
-        for (double bucketBoundary : histogram.bucketBoundaries) {
-          if (!Double.isInfinite(bucketBoundary)) {
-            writer.value(bucketBoundary);
-          } else {
-            hasOverflow = true; // don't write the overflow boundary
-          }
-        }
-        writer.endArray();
+    /** Closes a {@code Metric} JSON object previously opened by {@link #openMetric}. */
+    public static void closeMetric(JsonWriter writer) {
+        writer.endArray(); // dataPoints
+        writer.endObject(); // gauge|sum|histogram
+        writer.endObject(); // metric
+    }
 
-        writer.name("bucketCounts").beginArray();
-        for (double bucketCount : histogram.bucketCounts) {
-          writer.value(Long.toString((long) bucketCount));
-        }
-        if (!hasOverflow) { // write one more count than boundaries
-          writer.value("0");
+    /** Writes a data point's value fields into the currently open data point object. */
+    public static void writeDataPointValue(JsonWriter writer, OtlpDataPoint point) {
+        if (point instanceof OtlpDoublePoint) {
+            writer.name("asDouble");
+            writeDouble(writer, ((OtlpDoublePoint) point).value);
+        } else if (point instanceof OtlpLongPoint) {
+            // int64 fields are encoded as decimal strings, per the OTLP JSON encoding spec
+            writer.name("asInt").value(Long.toString(((OtlpLongPoint) point).value));
+        } else { // must be a histogram point
+            OtlpHistogramPoint histogram = (OtlpHistogramPoint) point;
+            writer.name("count").value(Long.toString((long) histogram.count));
+            writer.name("sum");
+            writeDouble(writer, histogram.sum);
+            writer.name("min");
+            writeDouble(writer, histogram.min);
+            writer.name("max");
+            writeDouble(writer, histogram.max);
+            if (!histogram.bucketCounts.isEmpty()) {
+                boolean hasOverflow = false;
+                writer.name("explicitBounds").beginArray();
+                for (double bucketBoundary : histogram.bucketBoundaries) {
+                    if (!Double.isInfinite(bucketBoundary)) {
+                        writer.value(bucketBoundary);
+                    } else {
+                        hasOverflow = true; // don't write the overflow boundary
+                    }
+                }
+                writer.endArray();
+
+                writer.name("bucketCounts").beginArray();
+                for (double bucketCount : histogram.bucketCounts) {
+                    writer.value(Long.toString((long) bucketCount));
+                }
+                if (!hasOverflow) { // write one more count than boundaries
+                    writer.value("0");
+                }
+                writer.endArray();
+            }
         }
-        writer.endArray();
-      }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsJsonCollector.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsJsonCollector.java
index 46fe6ae0abe..2b33d7b8e94 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsJsonCollector.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsJsonCollector.java
@@ -40,238 +40,236 @@
  * collector's behavior.
  */
 public final class OtlpMetricsJsonCollector extends OtlpMetricsCollector
-    implements OtlpMetricsVisitor, OtlpScopedMetricsVisitor, OtlpMetricVisitor {
-
-  private final TimeSource timeSource;
-
-  private final boolean forceHistogramDelta;
-
-  // resource fragment prepended to every payload; lets callers pick the plain vendor-neutral
-  // resource or the datadog-attrs variant (datadog.runtime_id / process tags)
-  private final String resourceFragment;
-
-  private long startNanos;
-  private long endNanos;
-  private String startNanosStr;
-  private String endNanosStr;
-
-  private JsonWriter writer;
-  private boolean anyDataPointWritten;
-  private boolean scopeStarted;
-  private boolean metricStarted;
-  private boolean dataPointStarted;
-
-  private final LazyJsonArray attributesArray = new LazyJsonArray();
-
-  private OtelInstrumentationScope currentScope;
-  private OtelInstrumentDescriptor currentMetric;
-
-  public OtlpMetricsJsonCollector(TimeSource timeSource) {
-    this(timeSource, false);
-  }
-
-  OtlpMetricsJsonCollector(TimeSource timeSource, boolean forceHistogramDelta) {
-    this(timeSource, forceHistogramDelta, RESOURCE_FRAGMENT);
-  }
-
-  OtlpMetricsJsonCollector(
-      TimeSource timeSource, boolean forceHistogramDelta, String resourceFragment) {
-    this.timeSource = timeSource;
-    this.endNanos = timeSource.getCurrentTimeNanos();
-    this.forceHistogramDelta = forceHistogramDelta;
-    this.resourceFragment = resourceFragment;
-  }
-
-  /**
-   * Collects OpenTelemetry metrics and marshals them into a JSON payload.
-   *
-   * <p>This payload is only valid for the calling thread until the next collection.
-   */
-  @Override
-  public OtlpPayload collectMetrics() {
-    return collectMetrics(OtelMetricRegistry.INSTANCE::collectMetrics);
-  }
-
-  OtlpPayload collectMetrics(Consumer<OtlpMetricsVisitor> registry) {
-    start();
-    return run(registry);
-  }
-
-  @Override
-  OtlpPayload collectMetrics(
-      Consumer<OtlpMetricsVisitor> registry, long startNanos, long endNanos) {
-    startWithWindow(startNanos, endNanos);
-    return run(registry);
-  }
-
-  private OtlpPayload run(Consumer<OtlpMetricsVisitor> registry) {
-    try {
-      registry.accept(this);
-      return completePayload();
-    } finally {
-      stop();
+        implements OtlpMetricsVisitor, OtlpScopedMetricsVisitor, OtlpMetricVisitor {
+
+    private final TimeSource timeSource;
+
+    private final boolean forceHistogramDelta;
+
+    // resource fragment prepended to every payload; lets callers pick the plain vendor-neutral
+    // resource or the datadog-attrs variant (datadog.runtime_id / process tags)
+    private final String resourceFragment;
+
+    private long startNanos;
+    private long endNanos;
+    private String startNanosStr;
+    private String endNanosStr;
+
+    private JsonWriter writer;
+    private boolean anyDataPointWritten;
+    private boolean scopeStarted;
+    private boolean metricStarted;
+    private boolean dataPointStarted;
+
+    private final LazyJsonArray attributesArray = new LazyJsonArray();
+
+    private OtelInstrumentationScope currentScope;
+    private OtelInstrumentDescriptor currentMetric;
+
+    public OtlpMetricsJsonCollector(TimeSource timeSource) {
+        this(timeSource, false);
     }
-  }
-
-  /** Prepare temporary elements to collect metrics data. */
-  private void start() {
-    // shift interval to cover last collection to now
-    startNanos = endNanos;
-    endNanos = timeSource.getCurrentTimeNanos();
-    beginPayload();
-  }
-
-  private void startWithWindow(long startNanos, long endNanos) {
-    this.startNanos = startNanos;
-    this.endNanos = endNanos;
-    beginPayload();
-  }
-
-  private void beginPayload() {
-    startNanosStr = Long.toString(startNanos);
-    endNanosStr = Long.toString(endNanos);
-
-    writer = new JsonWriter();
-    writer.beginObject();
-    writer.name("resourceMetrics").beginArray();
-    writer.beginObject();
-    writer.name("resource").jsonValue(resourceFragment);
-    writer.name("scopeMetrics").beginArray();
-  }
-
-  /** Cleanup elements used to collect metrics data. */
-  private void stop() {
-    attributesArray.reset();
-
-    anyDataPointWritten = false;
-
-    writer = null;
-
-    scopeStarted = false;
-    metricStarted = false;
-    dataPointStarted = false;
-
-    currentScope = null;
-    currentMetric = null;
-  }
-
-  @Override
-  public OtlpScopedMetricsVisitor visitScopedMetrics(OtelInstrumentationScope scope) {
-    if (currentScope != null) {
-      completeScope();
+
+    OtlpMetricsJsonCollector(TimeSource timeSource, boolean forceHistogramDelta) {
+        this(timeSource, forceHistogramDelta, RESOURCE_FRAGMENT);
+    }
+
+    OtlpMetricsJsonCollector(TimeSource timeSource, boolean forceHistogramDelta, String resourceFragment) {
+        this.timeSource = timeSource;
+        this.endNanos = timeSource.getCurrentTimeNanos();
+        this.forceHistogramDelta = forceHistogramDelta;
+        this.resourceFragment = resourceFragment;
+    }
+
+    /**
+     * Collects OpenTelemetry metrics and marshals them into a JSON payload.
+     *
+     * <p>This payload is only valid for the calling thread until the next collection.
+     */
+    @Override
+    public OtlpPayload collectMetrics() {
+        return collectMetrics(OtelMetricRegistry.INSTANCE::collectMetrics);
+    }
+
+    OtlpPayload collectMetrics(Consumer<OtlpMetricsVisitor> registry) {
+        start();
+        return run(registry);
+    }
+
+    @Override
+    OtlpPayload collectMetrics(Consumer<OtlpMetricsVisitor> registry, long startNanos, long endNanos) {
+        startWithWindow(startNanos, endNanos);
+        return run(registry);
+    }
+
+    private OtlpPayload run(Consumer<OtlpMetricsVisitor> registry) {
+        try {
+            registry.accept(this);
+            return completePayload();
+        } finally {
+            stop();
+        }
+    }
+
+    /** Prepare temporary elements to collect metrics data. */
+    private void start() {
+        // shift interval to cover last collection to now
+        startNanos = endNanos;
+        endNanos = timeSource.getCurrentTimeNanos();
+        beginPayload();
     }
-    currentScope = scope;
-    return this;
-  }
-
-  @Override
-  public OtlpMetricVisitor visitMetric(OtelInstrumentDescriptor metric) {
-    if (currentMetric != null) {
-      completeMetric();
+
+    private void startWithWindow(long startNanos, long endNanos) {
+        this.startNanos = startNanos;
+        this.endNanos = endNanos;
+        beginPayload();
     }
-    currentMetric = metric;
-    return this;
-  }
-
-  @Override
-  public void visitAttribute(int type, String key, Object value) {
-    ensureMetricStarted();
-    ensureDataPointStarted();
-    attributesArray.ensureOpen(writer, "attributes");
-    writeAttribute(writer, type, key, value);
-  }
-
-  @Override
-  public void visitDataPoint(OtlpDataPoint point) {
-    ensureMetricStarted();
-    ensureDataPointStarted();
-    attributesArray.closeIfOpen(writer);
-
-    OtelInstrumentType metricType = currentMetric.getType();
-
-    // gauges don't have a start time (no aggregation temporality)
-    if (metricType != GAUGE && metricType != OBSERVABLE_GAUGE) {
-      writer.name("startTimeUnixNano").value(startNanosStr);
+
+    private void beginPayload() {
+        startNanosStr = Long.toString(startNanos);
+        endNanosStr = Long.toString(endNanos);
+
+        writer = new JsonWriter();
+        writer.beginObject();
+        writer.name("resourceMetrics").beginArray();
+        writer.beginObject();
+        writer.name("resource").jsonValue(resourceFragment);
+        writer.name("scopeMetrics").beginArray();
     }
-    writer.name("timeUnixNano").value(endNanosStr);
-    writeDataPointValue(writer, point);
-
-    writer.endObject(); // data point
-
-    dataPointStarted = false;
-    anyDataPointWritten = true;
-  }
-
-  // opens the scope header (and its metrics array) on first use
-  private void ensureScopeStarted() {
-    if (!scopeStarted) {
-      writer.beginObject();
-      writeScopeAndSchema(writer, currentScope);
-      writer.name("metrics").beginArray();
-      scopeStarted = true;
+
+    /** Cleanup elements used to collect metrics data. */
+    private void stop() {
+        attributesArray.reset();
+
+        anyDataPointWritten = false;
+
+        writer = null;
+
+        scopeStarted = false;
+        metricStarted = false;
+        dataPointStarted = false;
+
+        currentScope = null;
+        currentMetric = null;
     }
-  }
-
-  // opens the metric header (and its gauge/sum/histogram wrapper) on first use
-  private void ensureMetricStarted() {
-    if (!metricStarted) {
-      ensureScopeStarted();
-      openMetric(writer, currentMetric, forceHistogramDelta);
-      metricStarted = true;
+
+    @Override
+    public OtlpScopedMetricsVisitor visitScopedMetrics(OtelInstrumentationScope scope) {
+        if (currentScope != null) {
+            completeScope();
+        }
+        currentScope = scope;
+        return this;
     }
-  }
 
-  // opens the data point object on first attribute or value written for it
-  private void ensureDataPointStarted() {
-    if (!dataPointStarted) {
-      writer.beginObject();
-      dataPointStarted = true;
+    @Override
+    public OtlpMetricVisitor visitMetric(OtelInstrumentDescriptor metric) {
+        if (currentMetric != null) {
+            completeMetric();
+        }
+        currentMetric = metric;
+        return this;
     }
-  }
 
-  // called once we've processed all scopes and metric messages
-  private OtlpPayload completePayload() {
-    if (currentScope != null) {
-      completeScope();
+    @Override
+    public void visitAttribute(int type, String key, Object value) {
+        ensureMetricStarted();
+        ensureDataPointStarted();
+        attributesArray.ensureOpen(writer, "attributes");
+        writeAttribute(writer, type, key, value);
     }
 
-    writer.endArray(); // scopeMetrics
-    writer.endObject(); // resourceMetrics[0]
-    writer.endArray(); // resourceMetrics
-    writer.endObject(); // root
+    @Override
+    public void visitDataPoint(OtlpDataPoint point) {
+        ensureMetricStarted();
+        ensureDataPointStarted();
+        attributesArray.closeIfOpen(writer);
+
+        OtelInstrumentType metricType = currentMetric.getType();
+
+        // gauges don't have a start time (no aggregation temporality)
+        if (metricType != GAUGE && metricType != OBSERVABLE_GAUGE) {
+            writer.name("startTimeUnixNano").value(startNanosStr);
+        }
+        writer.name("timeUnixNano").value(endNanosStr);
+        writeDataPointValue(writer, point);
 
-    if (!anyDataPointWritten) {
-      return OtlpPayload.EMPTY;
+        writer.endObject(); // data point
+
+        dataPointStarted = false;
+        anyDataPointWritten = true;
     }
 
-    byte[] bytes = writer.toByteArray();
-    return new OtlpPayload(ByteBuffer.wrap(bytes), JSON_CONTENT_TYPE);
-  }
+    // opens the scope header (and its metrics array) on first use
+    private void ensureScopeStarted() {
+        if (!scopeStarted) {
+            writer.beginObject();
+            writeScopeAndSchema(writer, currentScope);
+            writer.name("metrics").beginArray();
+            scopeStarted = true;
+        }
+    }
 
-  // called once we've processed all metrics in a specific scope
-  private void completeScope() {
-    if (currentMetric != null) {
-      completeMetric();
+    // opens the metric header (and its gauge/sum/histogram wrapper) on first use
+    private void ensureMetricStarted() {
+        if (!metricStarted) {
+            ensureScopeStarted();
+            openMetric(writer, currentMetric, forceHistogramDelta);
+            metricStarted = true;
+        }
     }
 
-    if (scopeStarted) {
-      writer.endArray(); // metrics
-      writer.endObject(); // scopeMetrics[0]
-      scopeStarted = false;
+    // opens the data point object on first attribute or value written for it
+    private void ensureDataPointStarted() {
+        if (!dataPointStarted) {
+            writer.beginObject();
+            dataPointStarted = true;
+        }
+    }
+
+    // called once we've processed all scopes and metric messages
+    private OtlpPayload completePayload() {
+        if (currentScope != null) {
+            completeScope();
+        }
+
+        writer.endArray(); // scopeMetrics
+        writer.endObject(); // resourceMetrics[0]
+        writer.endArray(); // resourceMetrics
+        writer.endObject(); // root
+
+        if (!anyDataPointWritten) {
+            return OtlpPayload.EMPTY;
+        }
+
+        byte[] bytes = writer.toByteArray();
+        return new OtlpPayload(ByteBuffer.wrap(bytes), JSON_CONTENT_TYPE);
     }
 
-    // reset temporary elements for next scope
-    currentScope = null;
-  }
+    // called once we've processed all metrics in a specific scope
+    private void completeScope() {
+        if (currentMetric != null) {
+            completeMetric();
+        }
+
+        if (scopeStarted) {
+            writer.endArray(); // metrics
+            writer.endObject(); // scopeMetrics[0]
+            scopeStarted = false;
+        }
 
-  // called once we've processed all data points in a specific metric
-  private void completeMetric() {
-    if (metricStarted) {
-      closeMetric(writer);
-      metricStarted = false;
+        // reset temporary elements for next scope
+        currentScope = null;
     }
 
-    // reset temporary elements for next metric
-    currentMetric = null;
-  }
+    // called once we've processed all data points in a specific metric
+    private void completeMetric() {
+        if (metricStarted) {
+            closeMetric(writer);
+            metricStarted = false;
+        }
+
+        // reset temporary elements for next metric
+        currentMetric = null;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsProto.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsProto.java
index f151b79c8df..6402450d0a6 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsProto.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsProto.java
@@ -25,141 +25,137 @@
 
 /** Provides optimized writers for OpenTelemetry's "metrics.proto" wire protocol. */
 public final class OtlpMetricsProto {
-  private OtlpMetricsProto() {}
+    private OtlpMetricsProto() {}
 
-  /** Records a scoped metrics message after its nested metric messages have been recorded. */
-  public static int recordScopedMetricsMessage(
-      GrowableBuffer buf,
-      OtelInstrumentationScope scope,
-      int nestedMetricBytes,
-      OtlpProtoBuffer protobuf) {
+    /** Records a scoped metrics message after its nested metric messages have been recorded. */
+    public static int recordScopedMetricsMessage(
+            GrowableBuffer buf, OtelInstrumentationScope scope, int nestedMetricBytes, OtlpProtoBuffer protobuf) {
 
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    writeInstrumentationScope(buf, scope);
-    if (scope.getSchemaUrl() != null) {
-      writeTag(buf, 3, LEN_WIRE_TYPE);
-      writeString(buf, scope.getSchemaUrl().getUtf8Bytes());
-    }
-
-    return protobuf.recordMessage(buf, 2, nestedMetricBytes);
-  }
-
-  /** Records a metric message after its nested data point messages have been recorded. */
-  public static int recordMetricMessage(
-      GrowableBuffer buf,
-      OtelInstrumentDescriptor descriptor,
-      int nestedDataPointBytes,
-      OtlpProtoBuffer protobuf) {
-    return recordMetricMessage(buf, descriptor, nestedDataPointBytes, protobuf, false);
-  }
-
-  /**
-   * Records a metric message after its nested data point messages have been recorded. When {@code
-   * forceDelta} is {@code true}, a histogram is encoded as DELTA regardless of the configured
-   * temporality preference (for sources whose data points are inherently per-interval deltas).
-   */
-  public static int recordMetricMessage(
-      GrowableBuffer buf,
-      OtelInstrumentDescriptor descriptor,
-      int nestedDataPointBytes,
-      OtlpProtoBuffer protobuf,
-      boolean forceDelta) {
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        writeInstrumentationScope(buf, scope);
+        if (scope.getSchemaUrl() != null) {
+            writeTag(buf, 3, LEN_WIRE_TYPE);
+            writeString(buf, scope.getSchemaUrl().getUtf8Bytes());
+        }
 
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    writeString(buf, descriptor.getName().getUtf8Bytes());
-    if (descriptor.getDescription() != null) {
-      writeTag(buf, 2, LEN_WIRE_TYPE);
-      writeString(buf, descriptor.getDescription().getUtf8Bytes());
-    }
-    if (descriptor.getUnit() != null) {
-      writeTag(buf, 3, LEN_WIRE_TYPE);
-      writeString(buf, descriptor.getUnit().getUtf8Bytes());
+        return protobuf.recordMessage(buf, 2, nestedMetricBytes);
     }
 
-    switch (descriptor.getType()) {
-      case GAUGE:
-      case OBSERVABLE_GAUGE:
-        writeTag(buf, 5, LEN_WIRE_TYPE);
-        writeVarInt(buf, nestedDataPointBytes);
-        // gauges have no aggregation temporality
-        break;
-      case COUNTER:
-        writeTag(buf, 7, LEN_WIRE_TYPE);
-        writeVarInt(buf, nestedDataPointBytes + 4);
-        writeTag(buf, 2, VARINT_WIRE_TYPE);
-        writeVarInt(buf, COUNTER_TEMPORALITY);
-        writeTag(buf, 3, VARINT_WIRE_TYPE);
-        writeVarInt(buf, 1); // monotonic
-        break;
-      case OBSERVABLE_COUNTER:
-        writeTag(buf, 7, LEN_WIRE_TYPE);
-        writeVarInt(buf, nestedDataPointBytes + 4);
-        writeTag(buf, 2, VARINT_WIRE_TYPE);
-        writeVarInt(buf, OBSERVABLE_COUNTER_TEMPORALITY);
-        writeTag(buf, 3, VARINT_WIRE_TYPE);
-        writeVarInt(buf, 1); // monotonic
-        break;
-      case UP_DOWN_COUNTER:
-      case OBSERVABLE_UP_DOWN_COUNTER:
-        writeTag(buf, 7, LEN_WIRE_TYPE);
-        writeVarInt(buf, nestedDataPointBytes + 2);
-        writeTag(buf, 2, VARINT_WIRE_TYPE);
-        // up/down counters are always cumulative
-        writeVarInt(buf, TEMPORALITY_CUMULATIVE);
-        break;
-      case HISTOGRAM:
-        writeTag(buf, 9, LEN_WIRE_TYPE);
-        writeVarInt(buf, nestedDataPointBytes + 2);
-        writeTag(buf, 2, VARINT_WIRE_TYPE);
-        writeVarInt(buf, forceDelta ? TEMPORALITY_DELTA : HISTOGRAM_TEMPORALITY);
-        break;
-      default:
-        throw new IllegalArgumentException("Unknown instrument type: " + descriptor.getType());
+    /** Records a metric message after its nested data point messages have been recorded. */
+    public static int recordMetricMessage(
+            GrowableBuffer buf,
+            OtelInstrumentDescriptor descriptor,
+            int nestedDataPointBytes,
+            OtlpProtoBuffer protobuf) {
+        return recordMetricMessage(buf, descriptor, nestedDataPointBytes, protobuf, false);
     }
 
-    return protobuf.recordMessage(buf, 2, nestedDataPointBytes);
-  }
+    /**
+     * Records a metric message after its nested data point messages have been recorded. When {@code
+     * forceDelta} is {@code true}, a histogram is encoded as DELTA regardless of the configured
+     * temporality preference (for sources whose data points are inherently per-interval deltas).
+     */
+    public static int recordMetricMessage(
+            GrowableBuffer buf,
+            OtelInstrumentDescriptor descriptor,
+            int nestedDataPointBytes,
+            OtlpProtoBuffer protobuf,
+            boolean forceDelta) {
 
-  /** Records a data point message. */
-  public static int recordDataPointMessage(
-      GrowableBuffer buf, OtlpDataPoint point, OtlpProtoBuffer protobuf) {
-    if (point instanceof OtlpDoublePoint) {
-      writeTag(buf, 4, I64_WIRE_TYPE);
-      writeI64(buf, ((OtlpDoublePoint) point).value);
-    } else if (point instanceof OtlpLongPoint) {
-      writeTag(buf, 6, I64_WIRE_TYPE);
-      writeI64(buf, ((OtlpLongPoint) point).value);
-    } else { // must be a histogram point
-      OtlpHistogramPoint histogram = (OtlpHistogramPoint) point;
-      writeTag(buf, 4, I64_WIRE_TYPE);
-      writeI64(buf, (long) histogram.count);
-      writeTag(buf, 5, I64_WIRE_TYPE);
-      writeI64(buf, histogram.sum);
-      writeTag(buf, 11, I64_WIRE_TYPE);
-      writeI64(buf, histogram.min);
-      writeTag(buf, 12, I64_WIRE_TYPE);
-      writeI64(buf, histogram.max);
-      if (!histogram.bucketCounts.isEmpty()) {
-        boolean hasOverflow = false;
-        for (double bucketBoundary : histogram.bucketBoundaries) {
-          if (!Double.isInfinite(bucketBoundary)) {
-            writeTag(buf, 7, I64_WIRE_TYPE);
-            writeI64(buf, bucketBoundary);
-          } else {
-            hasOverflow = true; // don't write the overflow boundary
-          }
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        writeString(buf, descriptor.getName().getUtf8Bytes());
+        if (descriptor.getDescription() != null) {
+            writeTag(buf, 2, LEN_WIRE_TYPE);
+            writeString(buf, descriptor.getDescription().getUtf8Bytes());
         }
-        for (double bucketCount : histogram.bucketCounts) {
-          writeTag(buf, 6, I64_WIRE_TYPE);
-          writeI64(buf, (long) bucketCount);
+        if (descriptor.getUnit() != null) {
+            writeTag(buf, 3, LEN_WIRE_TYPE);
+            writeString(buf, descriptor.getUnit().getUtf8Bytes());
         }
-        if (!hasOverflow) { // write one more count than boundaries
-          writeTag(buf, 6, I64_WIRE_TYPE);
-          writeI64(buf, 0L);
+
+        switch (descriptor.getType()) {
+            case GAUGE:
+            case OBSERVABLE_GAUGE:
+                writeTag(buf, 5, LEN_WIRE_TYPE);
+                writeVarInt(buf, nestedDataPointBytes);
+                // gauges have no aggregation temporality
+                break;
+            case COUNTER:
+                writeTag(buf, 7, LEN_WIRE_TYPE);
+                writeVarInt(buf, nestedDataPointBytes + 4);
+                writeTag(buf, 2, VARINT_WIRE_TYPE);
+                writeVarInt(buf, COUNTER_TEMPORALITY);
+                writeTag(buf, 3, VARINT_WIRE_TYPE);
+                writeVarInt(buf, 1); // monotonic
+                break;
+            case OBSERVABLE_COUNTER:
+                writeTag(buf, 7, LEN_WIRE_TYPE);
+                writeVarInt(buf, nestedDataPointBytes + 4);
+                writeTag(buf, 2, VARINT_WIRE_TYPE);
+                writeVarInt(buf, OBSERVABLE_COUNTER_TEMPORALITY);
+                writeTag(buf, 3, VARINT_WIRE_TYPE);
+                writeVarInt(buf, 1); // monotonic
+                break;
+            case UP_DOWN_COUNTER:
+            case OBSERVABLE_UP_DOWN_COUNTER:
+                writeTag(buf, 7, LEN_WIRE_TYPE);
+                writeVarInt(buf, nestedDataPointBytes + 2);
+                writeTag(buf, 2, VARINT_WIRE_TYPE);
+                // up/down counters are always cumulative
+                writeVarInt(buf, TEMPORALITY_CUMULATIVE);
+                break;
+            case HISTOGRAM:
+                writeTag(buf, 9, LEN_WIRE_TYPE);
+                writeVarInt(buf, nestedDataPointBytes + 2);
+                writeTag(buf, 2, VARINT_WIRE_TYPE);
+                writeVarInt(buf, forceDelta ? TEMPORALITY_DELTA : HISTOGRAM_TEMPORALITY);
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown instrument type: " + descriptor.getType());
         }
-      }
+
+        return protobuf.recordMessage(buf, 2, nestedDataPointBytes);
     }
 
-    return protobuf.recordMessage(buf, 1);
-  }
+    /** Records a data point message. */
+    public static int recordDataPointMessage(GrowableBuffer buf, OtlpDataPoint point, OtlpProtoBuffer protobuf) {
+        if (point instanceof OtlpDoublePoint) {
+            writeTag(buf, 4, I64_WIRE_TYPE);
+            writeI64(buf, ((OtlpDoublePoint) point).value);
+        } else if (point instanceof OtlpLongPoint) {
+            writeTag(buf, 6, I64_WIRE_TYPE);
+            writeI64(buf, ((OtlpLongPoint) point).value);
+        } else { // must be a histogram point
+            OtlpHistogramPoint histogram = (OtlpHistogramPoint) point;
+            writeTag(buf, 4, I64_WIRE_TYPE);
+            writeI64(buf, (long) histogram.count);
+            writeTag(buf, 5, I64_WIRE_TYPE);
+            writeI64(buf, histogram.sum);
+            writeTag(buf, 11, I64_WIRE_TYPE);
+            writeI64(buf, histogram.min);
+            writeTag(buf, 12, I64_WIRE_TYPE);
+            writeI64(buf, histogram.max);
+            if (!histogram.bucketCounts.isEmpty()) {
+                boolean hasOverflow = false;
+                for (double bucketBoundary : histogram.bucketBoundaries) {
+                    if (!Double.isInfinite(bucketBoundary)) {
+                        writeTag(buf, 7, I64_WIRE_TYPE);
+                        writeI64(buf, bucketBoundary);
+                    } else {
+                        hasOverflow = true; // don't write the overflow boundary
+                    }
+                }
+                for (double bucketCount : histogram.bucketCounts) {
+                    writeTag(buf, 6, I64_WIRE_TYPE);
+                    writeI64(buf, (long) bucketCount);
+                }
+                if (!hasOverflow) { // write one more count than boundaries
+                    writeTag(buf, 6, I64_WIRE_TYPE);
+                    writeI64(buf, 0L);
+                }
+            }
+        }
+
+        return protobuf.recordMessage(buf, 1);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsProtoCollector.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsProtoCollector.java
index 82029367669..54c76e7806d 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsProtoCollector.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsProtoCollector.java
@@ -43,195 +43,192 @@
  * metrics message to the start of the payload.
  */
 public final class OtlpMetricsProtoCollector extends OtlpMetricsCollector
-    implements OtlpMetricsVisitor, OtlpScopedMetricsVisitor, OtlpMetricVisitor {
-
-  private final GrowableBuffer buf = new GrowableBuffer(512);
-  private final OtlpProtoBuffer protobuf = new OtlpProtoBuffer(8192);
-
-  private final TimeSource timeSource;
-
-  private final boolean forceHistogramDelta;
-
-  // resource chunk prepended to every payload; lets callers pick the plain vendor-neutral resource
-  // or the datadog-attrs variant (datadog.runtime_id / process tags)
-  private final byte[] resourceMessage;
-
-  private long startNanos;
-  private long endNanos;
-
-  // total number of chunked bytes at different nesting levels
-  private int payloadBytes;
-  private int scopedBytes;
-  private int metricBytes;
-
-  private OtelInstrumentationScope currentScope;
-  private OtelInstrumentDescriptor currentMetric;
-
-  public OtlpMetricsProtoCollector(TimeSource timeSource) {
-    this(timeSource, false);
-  }
-
-  OtlpMetricsProtoCollector(TimeSource timeSource, boolean forceHistogramDelta) {
-    this(timeSource, forceHistogramDelta, RESOURCE_MESSAGE);
-  }
-
-  OtlpMetricsProtoCollector(
-      TimeSource timeSource, boolean forceHistogramDelta, byte[] resourceMessage) {
-    this.timeSource = timeSource;
-    this.endNanos = timeSource.getCurrentTimeNanos();
-    this.forceHistogramDelta = forceHistogramDelta;
-    this.resourceMessage = resourceMessage;
-  }
-
-  /**
-   * Collects OpenTelemetry metrics and marshals them into a chunked payload.
-   *
-   * <p>This payload is only valid for the calling thread until the next collection.
-   */
-  @Override
-  public OtlpPayload collectMetrics() {
-    return collectMetrics(OtelMetricRegistry.INSTANCE::collectMetrics);
-  }
-
-  OtlpPayload collectMetrics(Consumer<OtlpMetricsVisitor> registry) {
-    start();
-    return run(registry);
-  }
-
-  @Override
-  OtlpPayload collectMetrics(
-      Consumer<OtlpMetricsVisitor> registry, long startNanos, long endNanos) {
-    startWithWindow(startNanos, endNanos);
-    return run(registry);
-  }
-
-  private OtlpPayload run(Consumer<OtlpMetricsVisitor> registry) {
-    try {
-      registry.accept(this);
-      return completePayload();
-    } finally {
-      stop();
-    }
-  }
-
-  /** Prepare temporary elements to collect metrics data. */
-  private void start() {
-    // shift interval to cover last collection to now
-    this.startNanos = endNanos;
-    this.endNanos = timeSource.getCurrentTimeNanos();
-
-    // remove stale entries from caches
-    OtlpCommonProto.recalibrateCaches();
-  }
-
-  /** Prepare temporary elements to collect metrics over an explicit window. */
-  private void startWithWindow(long startNanos, long endNanos) {
-    this.startNanos = startNanos;
-    this.endNanos = endNanos;
-
-    // remove stale entries from caches
-    OtlpCommonProto.recalibrateCaches();
-  }
-
-  /** Cleanup elements used to collect metrics data. */
-  private void stop() {
-    buf.reset();
-    protobuf.reset();
-
-    payloadBytes = 0;
-    scopedBytes = 0;
-    metricBytes = 0;
-
-    currentScope = null;
-    currentMetric = null;
-  }
-
-  @Override
-  public OtlpScopedMetricsVisitor visitScopedMetrics(OtelInstrumentationScope scope) {
-    if (currentScope != null) {
-      completeScope();
-    }
-    currentScope = scope;
-    return this;
-  }
-
-  @Override
-  public OtlpMetricVisitor visitMetric(OtelInstrumentDescriptor metric) {
-    if (currentMetric != null) {
-      completeMetric();
-    }
-    currentMetric = metric;
-    return this;
-  }
-
-  @Override
-  public void visitAttribute(int type, String key, Object value) {
-    // add attribute to the data point currently being collected
-    writeTag(buf, currentMetric.getType() == HISTOGRAM ? 9 : 7, LEN_WIRE_TYPE);
-    writeAttribute(buf, type, key, value);
-  }
-
-  @Override
-  public void visitDataPoint(OtlpDataPoint point) {
-    OtelInstrumentType metricType = currentMetric.getType();
-
-    // gauges don't have a start time (no aggregation temporality)
-    if (metricType != GAUGE && metricType != OBSERVABLE_GAUGE) {
-      writeTag(buf, 2, I64_WIRE_TYPE);
-      writeI64(buf, startNanos);
-    }
-    writeTag(buf, 3, I64_WIRE_TYPE);
-    writeI64(buf, endNanos);
-
-    // add complete data point message to the metric chunks
-    metricBytes += recordDataPointMessage(buf, point, protobuf);
-  }
-
-  // called once we've processed all scopes and metric messages
-  private OtlpPayload completePayload() {
-    if (currentScope != null) {
-      completeScope();
+        implements OtlpMetricsVisitor, OtlpScopedMetricsVisitor, OtlpMetricVisitor {
+
+    private final GrowableBuffer buf = new GrowableBuffer(512);
+    private final OtlpProtoBuffer protobuf = new OtlpProtoBuffer(8192);
+
+    private final TimeSource timeSource;
+
+    private final boolean forceHistogramDelta;
+
+    // resource chunk prepended to every payload; lets callers pick the plain vendor-neutral resource
+    // or the datadog-attrs variant (datadog.runtime_id / process tags)
+    private final byte[] resourceMessage;
+
+    private long startNanos;
+    private long endNanos;
+
+    // total number of chunked bytes at different nesting levels
+    private int payloadBytes;
+    private int scopedBytes;
+    private int metricBytes;
+
+    private OtelInstrumentationScope currentScope;
+    private OtelInstrumentDescriptor currentMetric;
+
+    public OtlpMetricsProtoCollector(TimeSource timeSource) {
+        this(timeSource, false);
+    }
+
+    OtlpMetricsProtoCollector(TimeSource timeSource, boolean forceHistogramDelta) {
+        this(timeSource, forceHistogramDelta, RESOURCE_MESSAGE);
+    }
+
+    OtlpMetricsProtoCollector(TimeSource timeSource, boolean forceHistogramDelta, byte[] resourceMessage) {
+        this.timeSource = timeSource;
+        this.endNanos = timeSource.getCurrentTimeNanos();
+        this.forceHistogramDelta = forceHistogramDelta;
+        this.resourceMessage = resourceMessage;
+    }
+
+    /**
+     * Collects OpenTelemetry metrics and marshals them into a chunked payload.
+     *
+     * <p>This payload is only valid for the calling thread until the next collection.
+     */
+    @Override
+    public OtlpPayload collectMetrics() {
+        return collectMetrics(OtelMetricRegistry.INSTANCE::collectMetrics);
+    }
+
+    OtlpPayload collectMetrics(Consumer<OtlpMetricsVisitor> registry) {
+        start();
+        return run(registry);
+    }
+
+    @Override
+    OtlpPayload collectMetrics(Consumer<OtlpMetricsVisitor> registry, long startNanos, long endNanos) {
+        startWithWindow(startNanos, endNanos);
+        return run(registry);
+    }
+
+    private OtlpPayload run(Consumer<OtlpMetricsVisitor> registry) {
+        try {
+            registry.accept(this);
+            return completePayload();
+        } finally {
+            stop();
+        }
     }
 
-    if (payloadBytes == 0) {
-      return OtlpPayload.EMPTY;
+    /** Prepare temporary elements to collect metrics data. */
+    private void start() {
+        // shift interval to cover last collection to now
+        this.startNanos = endNanos;
+        this.endNanos = timeSource.getCurrentTimeNanos();
+
+        // remove stale entries from caches
+        OtlpCommonProto.recalibrateCaches();
+    }
+
+    /** Prepare temporary elements to collect metrics over an explicit window. */
+    private void startWithWindow(long startNanos, long endNanos) {
+        this.startNanos = startNanos;
+        this.endNanos = endNanos;
+
+        // remove stale entries from caches
+        OtlpCommonProto.recalibrateCaches();
+    }
+
+    /** Cleanup elements used to collect metrics data. */
+    private void stop() {
+        buf.reset();
+        protobuf.reset();
+
+        payloadBytes = 0;
+        scopedBytes = 0;
+        metricBytes = 0;
+
+        currentScope = null;
+        currentMetric = null;
+    }
+
+    @Override
+    public OtlpScopedMetricsVisitor visitScopedMetrics(OtelInstrumentationScope scope) {
+        if (currentScope != null) {
+            completeScope();
+        }
+        currentScope = scope;
+        return this;
     }
 
-    // prepend the canned resource chunk
-    payloadBytes += protobuf.recordMessage(resourceMessage);
+    @Override
+    public OtlpMetricVisitor visitMetric(OtelInstrumentDescriptor metric) {
+        if (currentMetric != null) {
+            completeMetric();
+        }
+        currentMetric = metric;
+        return this;
+    }
+
+    @Override
+    public void visitAttribute(int type, String key, Object value) {
+        // add attribute to the data point currently being collected
+        writeTag(buf, currentMetric.getType() == HISTOGRAM ? 9 : 7, LEN_WIRE_TYPE);
+        writeAttribute(buf, type, key, value);
+    }
 
-    // finally prepend the total length of all collected chunks
-    protobuf.recordMessage(buf, 1, payloadBytes);
-    return protobuf.toPayload();
-  }
+    @Override
+    public void visitDataPoint(OtlpDataPoint point) {
+        OtelInstrumentType metricType = currentMetric.getType();
 
-  // called once we've processed all metrics in a specific scope
-  private void completeScope() {
-    if (currentMetric != null) {
-      completeMetric();
+        // gauges don't have a start time (no aggregation temporality)
+        if (metricType != GAUGE && metricType != OBSERVABLE_GAUGE) {
+            writeTag(buf, 2, I64_WIRE_TYPE);
+            writeI64(buf, startNanos);
+        }
+        writeTag(buf, 3, I64_WIRE_TYPE);
+        writeI64(buf, endNanos);
+
+        // add complete data point message to the metric chunks
+        metricBytes += recordDataPointMessage(buf, point, protobuf);
     }
 
-    // add scoped metrics message prefix to its nested chunks and promote to payload
-    if (scopedBytes > 0) {
-      payloadBytes += recordScopedMetricsMessage(buf, currentScope, scopedBytes, protobuf);
+    // called once we've processed all scopes and metric messages
+    private OtlpPayload completePayload() {
+        if (currentScope != null) {
+            completeScope();
+        }
+
+        if (payloadBytes == 0) {
+            return OtlpPayload.EMPTY;
+        }
+
+        // prepend the canned resource chunk
+        payloadBytes += protobuf.recordMessage(resourceMessage);
+
+        // finally prepend the total length of all collected chunks
+        protobuf.recordMessage(buf, 1, payloadBytes);
+        return protobuf.toPayload();
     }
 
-    // reset temporary elements for next scope
-    currentScope = null;
-    scopedBytes = 0;
-  }
+    // called once we've processed all metrics in a specific scope
+    private void completeScope() {
+        if (currentMetric != null) {
+            completeMetric();
+        }
 
-  // called once we've processed all data points in a specific metric
-  private void completeMetric() {
+        // add scoped metrics message prefix to its nested chunks and promote to payload
+        if (scopedBytes > 0) {
+            payloadBytes += recordScopedMetricsMessage(buf, currentScope, scopedBytes, protobuf);
+        }
 
-    // add metric message prefix to its nested chunks and promote to scoped
-    if (metricBytes > 0) {
-      scopedBytes +=
-          recordMetricMessage(buf, currentMetric, metricBytes, protobuf, forceHistogramDelta);
+        // reset temporary elements for next scope
+        currentScope = null;
+        scopedBytes = 0;
     }
 
-    // reset temporary elements for next metric
-    currentMetric = null;
-    metricBytes = 0;
-  }
+    // called once we've processed all data points in a specific metric
+    private void completeMetric() {
+
+        // add metric message prefix to its nested chunks and promote to scoped
+        if (metricBytes > 0) {
+            scopedBytes += recordMetricMessage(buf, currentMetric, metricBytes, protobuf, forceHistogramDelta);
+        }
+
+        // reset temporary elements for next metric
+        currentMetric = null;
+        metricBytes = 0;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsSenderFactory.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsSenderFactory.java
index 6ab62caeb8d..3188d179c7c 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsSenderFactory.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsSenderFactory.java
@@ -13,32 +13,32 @@
  * sync as protocols/endpoints evolve.
  */
 final class OtlpMetricsSenderFactory {
-  private OtlpMetricsSenderFactory() {}
+    private OtlpMetricsSenderFactory() {}
 
-  /**
-   * Builds the sender for {@code config}'s OTLP metrics protocol, or {@code null} if the protocol
-   * is unsupported.
-   */
-  @Nullable
-  static OtlpSender create(Config config) {
-    switch (config.getOtlpMetricsProtocol()) {
-      case GRPC:
-        return new OtlpGrpcSender(
-            config.getOtlpMetricsEndpoint(),
-            "/opentelemetry.proto.collector.metrics.v1.MetricsService/Export",
-            config.getOtlpMetricsHeaders(),
-            config.getOtlpMetricsTimeout(),
-            config.getOtlpMetricsCompression());
-      case HTTP_PROTOBUF:
-      case HTTP_JSON:
-        return new OtlpHttpSender(
-            config.getOtlpMetricsEndpoint(),
-            "/v1/metrics",
-            config.getOtlpMetricsHeaders(),
-            config.getOtlpMetricsTimeout(),
-            config.getOtlpMetricsCompression());
-      default:
-        return null;
+    /**
+     * Builds the sender for {@code config}'s OTLP metrics protocol, or {@code null} if the protocol
+     * is unsupported.
+     */
+    @Nullable
+    static OtlpSender create(Config config) {
+        switch (config.getOtlpMetricsProtocol()) {
+            case GRPC:
+                return new OtlpGrpcSender(
+                        config.getOtlpMetricsEndpoint(),
+                        "/opentelemetry.proto.collector.metrics.v1.MetricsService/Export",
+                        config.getOtlpMetricsHeaders(),
+                        config.getOtlpMetricsTimeout(),
+                        config.getOtlpMetricsCompression());
+            case HTTP_PROTOBUF:
+            case HTTP_JSON:
+                return new OtlpHttpSender(
+                        config.getOtlpMetricsEndpoint(),
+                        "/v1/metrics",
+                        config.getOtlpMetricsHeaders(),
+                        config.getOtlpMetricsTimeout(),
+                        config.getOtlpMetricsCompression());
+            default:
+                return null;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsService.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsService.java
index 4a7580aa061..6a9cf3321f3 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsService.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsService.java
@@ -17,84 +17,77 @@
 
 /** Periodic service to collect OpenTelemetry metrics and export them over OTLP. */
 public final class OtlpMetricsService {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OtlpMetricsService.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OtlpMetricsService.class);
 
-  public static final OtlpMetricsService INSTANCE = new OtlpMetricsService(Config.get());
+    public static final OtlpMetricsService INSTANCE = new OtlpMetricsService(Config.get());
 
-  private final AgentTaskScheduler scheduler;
-  private final OtlpMetricsCollector collector;
-  private final OtlpSender sender;
+    private final AgentTaskScheduler scheduler;
+    private final OtlpMetricsCollector collector;
+    private final OtlpSender sender;
 
-  private final int intervalMillis;
+    private final int intervalMillis;
 
-  private AgentTaskScheduler.Scheduled<?> scheduledTask = null;
+    private AgentTaskScheduler.Scheduled<?> scheduledTask = null;
 
-  OtlpMetricsService(Config config) {
-    this.scheduler = new AgentTaskScheduler(OTLP_METRICS_EXPORTER);
-    this.sender = OtlpMetricsSenderFactory.create(config);
-    if (this.sender == null) {
-      LOGGER.debug("Unsupported OTLP metrics protocol: {}", config.getOtlpMetricsProtocol());
-      this.collector = null;
-    } else {
-      this.collector =
-          config.getOtlpMetricsProtocol() == OtlpConfig.Protocol.HTTP_JSON
-              ? new OtlpMetricsJsonCollector(SystemTimeSource.INSTANCE)
-              : new OtlpMetricsProtoCollector(SystemTimeSource.INSTANCE);
+    OtlpMetricsService(Config config) {
+        this.scheduler = new AgentTaskScheduler(OTLP_METRICS_EXPORTER);
+        this.sender = OtlpMetricsSenderFactory.create(config);
+        if (this.sender == null) {
+            LOGGER.debug("Unsupported OTLP metrics protocol: {}", config.getOtlpMetricsProtocol());
+            this.collector = null;
+        } else {
+            this.collector = config.getOtlpMetricsProtocol() == OtlpConfig.Protocol.HTTP_JSON
+                    ? new OtlpMetricsJsonCollector(SystemTimeSource.INSTANCE)
+                    : new OtlpMetricsProtoCollector(SystemTimeSource.INSTANCE);
+        }
+
+        this.intervalMillis = config.getMetricsOtelInterval();
+    }
+
+    OtlpSender getSender() {
+        return sender;
     }
 
-    this.intervalMillis = config.getMetricsOtelInterval();
-  }
+    OtlpMetricsCollector getCollector() {
+        return collector;
+    }
 
-  OtlpSender getSender() {
-    return sender;
-  }
+    public void start() {
+        if (sender == null) {
+            return;
+        }
 
-  OtlpMetricsCollector getCollector() {
-    return collector;
-  }
+        // add random jitter of up to 5 seconds to initial delay; avoids a fleet
+        // of apps starting at the same time from exporting OTLP metrics in sync
+        long initialMillis = intervalMillis
+                + Math.min(
+                        (long) (500d * Math.log(ThreadLocalRandom.current().nextDouble()) / Math.log(1 - 0.25)), 5_000);
 
-  public void start() {
-    if (sender == null) {
-      return;
+        scheduledTask =
+                scheduler.scheduleAtFixedRate(this::export, initialMillis, intervalMillis, TimeUnit.MILLISECONDS);
     }
 
-    // add random jitter of up to 5 seconds to initial delay; avoids a fleet
-    // of apps starting at the same time from exporting OTLP metrics in sync
-    long initialMillis =
-        intervalMillis
-            + Math.min(
-                (long)
-                    (500d
-                        * Math.log(ThreadLocalRandom.current().nextDouble())
-                        / Math.log(1 - 0.25)),
-                5_000);
-
-    scheduledTask =
-        scheduler.scheduleAtFixedRate(
-            this::export, initialMillis, intervalMillis, TimeUnit.MILLISECONDS);
-  }
-
-  public void flush() {
-    if (sender != null) {
-      scheduler.execute(this::export);
+    public void flush() {
+        if (sender != null) {
+            scheduler.execute(this::export);
+        }
     }
-  }
 
-  public void shutdown() {
-    if (scheduledTask != null) {
-      scheduledTask.cancel();
-    }
-    if (sender != null) {
-      sender.shutdown();
+    public void shutdown() {
+        if (scheduledTask != null) {
+            scheduledTask.cancel();
+        }
+        if (sender != null) {
+            sender.shutdown();
+        }
     }
-  }
-
-  private void export() {
-    OtlpPayload payload = collector.collectMetrics();
-    if (payload != OtlpPayload.EMPTY) {
-      OtlpTelemetry.getInstance().onMetricsExportAttempt();
-      RemoteApi.Response response = sender.send(payload);
-      OtlpTelemetry.getInstance().onMetricsExportComplete(response.success());
+
+    private void export() {
+        OtlpPayload payload = collector.collectMetrics();
+        if (payload != OtlpPayload.EMPTY) {
+            OtlpTelemetry.getInstance().onMetricsExportAttempt();
+            RemoteApi.Response response = sender.send(payload);
+            OtlpTelemetry.getInstance().onMetricsExportComplete(response.success());
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsTemporality.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsTemporality.java
index 09fc243780e..60f59ba9e43 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsTemporality.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpMetricsTemporality.java
@@ -12,30 +12,29 @@
 
 /** Maps instrument types to OTLP's {@code AggregationTemporality} enum values. */
 final class OtlpMetricsTemporality {
-  private OtlpMetricsTemporality() {}
+    private OtlpMetricsTemporality() {}
 
-  static final int TEMPORALITY_DELTA = 1;
-  static final int TEMPORALITY_CUMULATIVE = 2;
+    static final int TEMPORALITY_DELTA = 1;
+    static final int TEMPORALITY_CUMULATIVE = 2;
 
-  private static final OtlpConfig.Temporality PREFERENCE =
-      Config.get().getOtlpMetricsTemporalityPreference();
+    private static final OtlpConfig.Temporality PREFERENCE = Config.get().getOtlpMetricsTemporalityPreference();
 
-  static final int COUNTER_TEMPORALITY = temporality(PREFERENCE, COUNTER);
-  static final int OBSERVABLE_COUNTER_TEMPORALITY = temporality(PREFERENCE, OBSERVABLE_COUNTER);
-  static final int HISTOGRAM_TEMPORALITY = temporality(PREFERENCE, HISTOGRAM);
+    static final int COUNTER_TEMPORALITY = temporality(PREFERENCE, COUNTER);
+    static final int OBSERVABLE_COUNTER_TEMPORALITY = temporality(PREFERENCE, OBSERVABLE_COUNTER);
+    static final int HISTOGRAM_TEMPORALITY = temporality(PREFERENCE, HISTOGRAM);
 
-  static int temporality(OtlpConfig.Temporality preference, OtelInstrumentType type) {
-    if (preference == DELTA) {
-      // gauges and up/down counters stay as cumulative
-      if (type == HISTOGRAM || type == COUNTER || type == OBSERVABLE_COUNTER) {
-        return TEMPORALITY_DELTA;
-      }
-    } else if (preference == LOWMEMORY) {
-      // observable counters, gauges, and up/down counters stay as cumulative
-      if (type == HISTOGRAM || type == COUNTER) {
-        return TEMPORALITY_DELTA;
-      }
+    static int temporality(OtlpConfig.Temporality preference, OtelInstrumentType type) {
+        if (preference == DELTA) {
+            // gauges and up/down counters stay as cumulative
+            if (type == HISTOGRAM || type == COUNTER || type == OBSERVABLE_COUNTER) {
+                return TEMPORALITY_DELTA;
+            }
+        } else if (preference == LOWMEMORY) {
+            // observable counters, gauges, and up/down counters stay as cumulative
+            if (type == HISTOGRAM || type == COUNTER) {
+                return TEMPORALITY_DELTA;
+            }
+        }
+        return TEMPORALITY_CUMULATIVE;
     }
-    return TEMPORALITY_CUMULATIVE;
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpStatsHistogramBuckets.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpStatsHistogramBuckets.java
index 87768705a1a..74d62353a60 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpStatsHistogramBuckets.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpStatsHistogramBuckets.java
@@ -12,59 +12,59 @@
  * Metrics Export RFC.
  */
 final class OtlpStatsHistogramBuckets {
-  private OtlpStatsHistogramBuckets() {}
+    private OtlpStatsHistogramBuckets() {}
 
-  private static final double NANOS_PER_SECOND = 1_000_000_000d;
+    private static final double NANOS_PER_SECOND = 1_000_000_000d;
 
-  static final double[] BOUNDS_SECONDS = {
-    0.002, 0.004, 0.006, 0.008, 0.01, 0.05, 0.1, 0.2, 0.4, 0.8, 1, 1.4, 2, 5, 10, 15
-  };
+    static final double[] BOUNDS_SECONDS = {
+        0.002, 0.004, 0.006, 0.008, 0.01, 0.05, 0.1, 0.2, 0.4, 0.8, 1, 1.4, 2, 5, 10, 15
+    };
 
-  static final List<Double> EXPLICIT_BOUNDS;
+    static final List<Double> EXPLICIT_BOUNDS;
 
-  static {
-    List<Double> bounds = new ArrayList<>(BOUNDS_SECONDS.length + 1);
-    for (double bound : BOUNDS_SECONDS) {
-      bounds.add(bound);
+    static {
+        List<Double> bounds = new ArrayList<>(BOUNDS_SECONDS.length + 1);
+        for (double bound : BOUNDS_SECONDS) {
+            bounds.add(bound);
+        }
+        bounds.add(Double.POSITIVE_INFINITY);
+        EXPLICIT_BOUNDS = Collections.unmodifiableList(bounds);
     }
-    bounds.add(Double.POSITIVE_INFINITY);
-    EXPLICIT_BOUNDS = Collections.unmodifiableList(bounds);
-  }
 
-  static int bucketIndex(double seconds) {
-    for (int i = 0; i < BOUNDS_SECONDS.length; i++) {
-      if (seconds <= BOUNDS_SECONDS[i]) {
-        return i;
-      }
+    static int bucketIndex(double seconds) {
+        for (int i = 0; i < BOUNDS_SECONDS.length; i++) {
+            if (seconds <= BOUNDS_SECONDS[i]) {
+                return i;
+            }
+        }
+        return BOUNDS_SECONDS.length; // overflow
     }
-    return BOUNDS_SECONDS.length; // overflow
-  }
 
-  /**
-   * Re-bins {@code histogram} (nanosecond-valued) into an {@link OtlpHistogramPoint} expressed in
-   * seconds with OTLP's fixed bucket layout.
-   */
-  static OtlpHistogramPoint toHistogramPoint(Histogram histogram, long sumNanos) {
-    long[] bucketCounts = new long[BOUNDS_SECONDS.length + 1];
+    /**
+     * Re-bins {@code histogram} (nanosecond-valued) into an {@link OtlpHistogramPoint} expressed in
+     * seconds with OTLP's fixed bucket layout.
+     */
+    static OtlpHistogramPoint toHistogramPoint(Histogram histogram, long sumNanos) {
+        long[] bucketCounts = new long[BOUNDS_SECONDS.length + 1];
 
-    List<Double> binBoundaries = histogram.getBinBoundaries();
-    List<Double> binCounts = histogram.getBinCounts();
-    for (int i = 0; i < binBoundaries.size(); i++) {
-      double upperSeconds = binBoundaries.get(i) / NANOS_PER_SECOND;
-      long count = (long) binCounts.get(i).doubleValue();
-      bucketCounts[bucketIndex(upperSeconds)] += count;
-    }
+        List<Double> binBoundaries = histogram.getBinBoundaries();
+        List<Double> binCounts = histogram.getBinCounts();
+        for (int i = 0; i < binBoundaries.size(); i++) {
+            double upperSeconds = binBoundaries.get(i) / NANOS_PER_SECOND;
+            long count = (long) binCounts.get(i).doubleValue();
+            bucketCounts[bucketIndex(upperSeconds)] += count;
+        }
 
-    List<Double> counts = new ArrayList<>(bucketCounts.length);
-    for (long count : bucketCounts) {
-      counts.add((double) count);
-    }
+        List<Double> counts = new ArrayList<>(bucketCounts.length);
+        for (long count : bucketCounts) {
+            counts.add((double) count);
+        }
 
-    double sumSeconds = sumNanos / NANOS_PER_SECOND;
-    double minSeconds = histogram.isEmpty() ? 0d : histogram.getMinValue() / NANOS_PER_SECOND;
-    double maxSeconds = histogram.isEmpty() ? 0d : histogram.getMaxValue() / NANOS_PER_SECOND;
+        double sumSeconds = sumNanos / NANOS_PER_SECOND;
+        double minSeconds = histogram.isEmpty() ? 0d : histogram.getMinValue() / NANOS_PER_SECOND;
+        double maxSeconds = histogram.isEmpty() ? 0d : histogram.getMaxValue() / NANOS_PER_SECOND;
 
-    return new OtlpHistogramPoint(
-        histogram.getCount(), EXPLICIT_BOUNDS, counts, sumSeconds, minSeconds, maxSeconds);
-  }
+        return new OtlpHistogramPoint(
+                histogram.getCount(), EXPLICIT_BOUNDS, counts, sumSeconds, minSeconds, maxSeconds);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpStatsMetricWriter.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpStatsMetricWriter.java
index 5e69d20e1f0..e0d4cb78bc7 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpStatsMetricWriter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/metrics/OtlpStatsMetricWriter.java
@@ -36,249 +36,242 @@
  * OTLP histogram data point and pushes it through the shared {@link OtlpMetricsProtoCollector}.
  */
 public final class OtlpStatsMetricWriter implements MetricWriter {
-  static final String METRIC_NAME = "traces.span.sdk.metrics.duration";
-  static final String METRIC_UNIT = "s";
+    static final String METRIC_NAME = "traces.span.sdk.metrics.duration";
+    static final String METRIC_UNIT = "s";
 
-  private static final OtelInstrumentDescriptor METRIC_DESCRIPTOR =
-      new OtelInstrumentDescriptor(METRIC_NAME, HISTOGRAM, false, null, METRIC_UNIT);
-  private static final OtelInstrumentationScope SCOPE =
-      new OtelInstrumentationScope("datadog.trace.metrics", null, null);
+    private static final OtelInstrumentDescriptor METRIC_DESCRIPTOR =
+            new OtelInstrumentDescriptor(METRIC_NAME, HISTOGRAM, false, null, METRIC_UNIT);
+    private static final OtelInstrumentationScope SCOPE =
+            new OtelInstrumentationScope("datadog.trace.metrics", null, null);
 
-  private static final String SERVICE_NAME = "service.name";
-  private static final String SPAN_NAME = "span.name";
-  private static final String SPAN_KIND = "span.kind";
-  private static final String HTTP_REQUEST_METHOD = "http.request.method";
-  private static final String HTTP_RESPONSE_STATUS_CODE = "http.response.status_code";
-  private static final String HTTP_ROUTE = "http.route";
-  private static final String RPC_RESPONSE_STATUS_CODE = "rpc.response.status_code";
-  private static final String STATUS_CODE = "status.code";
-  private static final String STATUS_CODE_OK = "STATUS_CODE_OK";
-  private static final String STATUS_CODE_ERROR = "STATUS_CODE_ERROR";
-  private static final String DATADOG_OPERATION_NAME = "datadog.operation.name";
-  private static final String DATADOG_SPAN_TYPE = "datadog.span.type";
-  private static final String DATADOG_SPAN_TOP_LEVEL = "datadog.span.top_level";
-  private static final String DATADOG_IS_TRACE_ROOT = "datadog.is_trace_root";
-  private static final String DATADOG_SERVICE_SOURCE = "datadog.svc_src";
-  private static final String DATADOG_ORIGIN = "datadog.origin";
-  private static final String DATADOG_PEER_TAGS = "datadog.peer_tags";
-  private static final String SYNTHETICS_ORIGIN = "synthetics";
+    private static final String SERVICE_NAME = "service.name";
+    private static final String SPAN_NAME = "span.name";
+    private static final String SPAN_KIND = "span.kind";
+    private static final String HTTP_REQUEST_METHOD = "http.request.method";
+    private static final String HTTP_RESPONSE_STATUS_CODE = "http.response.status_code";
+    private static final String HTTP_ROUTE = "http.route";
+    private static final String RPC_RESPONSE_STATUS_CODE = "rpc.response.status_code";
+    private static final String STATUS_CODE = "status.code";
+    private static final String STATUS_CODE_OK = "STATUS_CODE_OK";
+    private static final String STATUS_CODE_ERROR = "STATUS_CODE_ERROR";
+    private static final String DATADOG_OPERATION_NAME = "datadog.operation.name";
+    private static final String DATADOG_SPAN_TYPE = "datadog.span.type";
+    private static final String DATADOG_SPAN_TOP_LEVEL = "datadog.span.top_level";
+    private static final String DATADOG_IS_TRACE_ROOT = "datadog.is_trace_root";
+    private static final String DATADOG_SERVICE_SOURCE = "datadog.svc_src";
+    private static final String DATADOG_ORIGIN = "datadog.origin";
+    private static final String DATADOG_PEER_TAGS = "datadog.peer_tags";
+    private static final String SYNTHETICS_ORIGIN = "synthetics";
 
-  private static final String SPAN_KIND_SERVER = "SPAN_KIND_SERVER";
-  private static final String SPAN_KIND_CLIENT = "SPAN_KIND_CLIENT";
-  private static final String SPAN_KIND_PRODUCER = "SPAN_KIND_PRODUCER";
-  private static final String SPAN_KIND_CONSUMER = "SPAN_KIND_CONSUMER";
-  private static final String SPAN_KIND_INTERNAL = "SPAN_KIND_INTERNAL";
+    private static final String SPAN_KIND_SERVER = "SPAN_KIND_SERVER";
+    private static final String SPAN_KIND_CLIENT = "SPAN_KIND_CLIENT";
+    private static final String SPAN_KIND_PRODUCER = "SPAN_KIND_PRODUCER";
+    private static final String SPAN_KIND_CONSUMER = "SPAN_KIND_CONSUMER";
+    private static final String SPAN_KIND_INTERNAL = "SPAN_KIND_INTERNAL";
 
-  @Nullable private final OtlpSender sender;
+    @Nullable
+    private final OtlpSender sender;
 
-  // own single-thread collector; forced to DELTA since trace-stats buckets are per-interval deltas.
-  private final OtlpMetricsCollector collector;
+    // own single-thread collector; forced to DELTA since trace-stats buckets are per-interval deltas.
+    private final OtlpMetricsCollector collector;
 
-  // data points snapshotted during add(), replayed through the visitor in finishBucket()
-  private final List<PendingPoint> pending = new ArrayList<>();
+    // data points snapshotted during add(), replayed through the visitor in finishBucket()
+    private final List<PendingPoint> pending = new ArrayList<>();
 
-  private long startNanos;
-  private long endNanos;
+    private long startNanos;
+    private long endNanos;
 
-  // Represent a single datapoint from Aggregator.add
-  private static final class PendingPoint {
-    final AggregateEntry entry;
-    final OtlpDataPoint point;
-    final boolean error;
-    final boolean allTopLevel;
+    // Represent a single datapoint from Aggregator.add
+    private static final class PendingPoint {
+        final AggregateEntry entry;
+        final OtlpDataPoint point;
+        final boolean error;
+        final boolean allTopLevel;
 
-    PendingPoint(AggregateEntry entry, OtlpDataPoint point, boolean error, boolean allTopLevel) {
-      this.entry = entry;
-      this.point = point;
-      this.error = error;
-      this.allTopLevel = allTopLevel;
+        PendingPoint(AggregateEntry entry, OtlpDataPoint point, boolean error, boolean allTopLevel) {
+            this.entry = entry;
+            this.point = point;
+            this.error = error;
+            this.allTopLevel = allTopLevel;
+        }
     }
-  }
 
-  public OtlpStatsMetricWriter(Config config) {
-    // shared protocol-based sender selection so both OTLP metrics export paths agree
-    this(OtlpMetricsSenderFactory.create(config), config.getOtlpMetricsProtocol());
-  }
-
-  // visible for testing: lets tests inject a capturing sender to decode the emitted payload
-  OtlpStatsMetricWriter(@Nullable OtlpSender sender) {
-    this(sender, OtlpConfig.Protocol.HTTP_PROTOBUF);
-  }
-
-  private OtlpStatsMetricWriter(@Nullable OtlpSender sender, OtlpConfig.Protocol protocol) {
-    this.sender = sender;
-    this.collector =
-        protocol == OtlpConfig.Protocol.HTTP_JSON
-            ? new OtlpMetricsJsonCollector(
-                SystemTimeSource.INSTANCE,
-                true,
-                OtlpResourceJson.RESOURCE_FRAGMENT_WITH_DATADOG_ATTRS)
-            : new OtlpMetricsProtoCollector(
-                SystemTimeSource.INSTANCE,
-                true,
-                OtlpResourceProto.RESOURCE_MESSAGE_WITH_DATADOG_ATTRS);
-  }
-
-  @Override
-  public void startBucket(int metricCount, long start, long duration) {
-    // start/duration arrive as epoch nanos / interval nanos (see Aggregator#report)
-    this.startNanos = start;
-    this.endNanos = start + duration;
-    pending.clear();
-  }
-
-  @Override
-  public void add(AggregateEntry entry) {
-    // Value gets wiped when Aggregator clears the entry. Need to save it here
-    boolean allTopLevel = entry.getTopLevelCount() == entry.getHitCount();
+    public OtlpStatsMetricWriter(Config config) {
+        // shared protocol-based sender selection so both OTLP metrics export paths agree
+        this(OtlpMetricsSenderFactory.create(config), config.getOtlpMetricsProtocol());
+    }
 
-    Histogram okLatencies = entry.getOkLatencies();
-    if (!okLatencies.isEmpty()) {
-      pending.add(
-          new PendingPoint(
-              entry,
-              OtlpStatsHistogramBuckets.toHistogramPoint(okLatencies, entry.getOkDuration()),
-              false,
-              allTopLevel));
+    // visible for testing: lets tests inject a capturing sender to decode the emitted payload
+    OtlpStatsMetricWriter(@Nullable OtlpSender sender) {
+        this(sender, OtlpConfig.Protocol.HTTP_PROTOBUF);
     }
 
-    Histogram errorLatencies = entry.getErrorLatencies();
-    if (errorLatencies != null && !errorLatencies.isEmpty()) {
-      pending.add(
-          new PendingPoint(
-              entry,
-              OtlpStatsHistogramBuckets.toHistogramPoint(errorLatencies, entry.getErrorDuration()),
-              true,
-              allTopLevel));
+    private OtlpStatsMetricWriter(@Nullable OtlpSender sender, OtlpConfig.Protocol protocol) {
+        this.sender = sender;
+        this.collector = protocol == OtlpConfig.Protocol.HTTP_JSON
+                ? new OtlpMetricsJsonCollector(
+                        SystemTimeSource.INSTANCE, true, OtlpResourceJson.RESOURCE_FRAGMENT_WITH_DATADOG_ATTRS)
+                : new OtlpMetricsProtoCollector(
+                        SystemTimeSource.INSTANCE, true, OtlpResourceProto.RESOURCE_MESSAGE_WITH_DATADOG_ATTRS);
     }
-  }
 
-  @Override
-  public void finishBucket() {
-    try {
-      if (pending.isEmpty() || sender == null) {
-        return;
-      }
-      OtlpPayload payload = collector.collectMetrics(this::emit, startNanos, endNanos);
-      if (payload != OtlpPayload.EMPTY) {
-        OtlpTelemetry.getInstance().onMetricsExportAttempt();
-        RemoteApi.Response response = sender.send(payload);
-        OtlpTelemetry.getInstance().onMetricsExportComplete(response.success());
-      }
-    } finally {
-      pending.clear();
+    @Override
+    public void startBucket(int metricCount, long start, long duration) {
+        // start/duration arrive as epoch nanos / interval nanos (see Aggregator#report)
+        this.startNanos = start;
+        this.endNanos = start + duration;
+        pending.clear();
     }
-  }
 
-  @Override
-  public void reset() {
-    pending.clear();
-  }
+    @Override
+    public void add(AggregateEntry entry) {
+        // Value gets wiped when Aggregator clears the entry. Need to save it here
+        boolean allTopLevel = entry.getTopLevelCount() == entry.getHitCount();
 
-  public void shutdown() {
-    if (sender != null) {
-      sender.shutdown();
-    }
-  }
+        Histogram okLatencies = entry.getOkLatencies();
+        if (!okLatencies.isEmpty()) {
+            pending.add(new PendingPoint(
+                    entry,
+                    OtlpStatsHistogramBuckets.toHistogramPoint(okLatencies, entry.getOkDuration()),
+                    false,
+                    allTopLevel));
+        }
 
-  /**
-   * Pushes the buffered entries through the metric visitor: one OTLP histogram data point per
-   * non-empty ok/error latency series. Called by {@link OtlpMetricsProtoCollector#collectMetrics}
-   * with the collector itself as the visitor.
-   */
-  private void emit(OtlpMetricsVisitor visitor) {
-    OtlpMetricVisitor metric = visitor.visitScopedMetrics(SCOPE).visitMetric(METRIC_DESCRIPTOR);
-    for (PendingPoint p : pending) {
-      // attributes must precede the data point (OtlpMetricVisitor contract)
-      emitDataPointAttributes(metric, p.entry, p.error, p.allTopLevel);
-      metric.visitDataPoint(p.point);
+        Histogram errorLatencies = entry.getErrorLatencies();
+        if (errorLatencies != null && !errorLatencies.isEmpty()) {
+            pending.add(new PendingPoint(
+                    entry,
+                    OtlpStatsHistogramBuckets.toHistogramPoint(errorLatencies, entry.getErrorDuration()),
+                    true,
+                    allTopLevel));
+        }
     }
-  }
 
-  private void emitDataPointAttributes(
-      OtlpMetricVisitor metric, AggregateEntry entry, boolean error, boolean allTopLevel) {
-    emitStringAttribute(metric, STATUS_CODE, error ? STATUS_CODE_ERROR : STATUS_CODE_OK);
-    emitStringAttribute(metric, SPAN_NAME, entry.getResource());
-    emitStringAttribute(metric, SPAN_KIND, canonicalSpanKind(entry.getSpanKind()));
-    emitStringAttribute(metric, SERVICE_NAME, entry.getService());
-    if (entry.hasHttpMethod()) {
-      emitStringAttribute(metric, HTTP_REQUEST_METHOD, entry.getHttpMethod());
-    }
-    if (entry.getHttpStatusCode() != 0) {
-      emitLongAttribute(metric, HTTP_RESPONSE_STATUS_CODE, entry.getHttpStatusCode());
-    }
-    if (entry.hasHttpEndpoint()) {
-      emitStringAttribute(metric, HTTP_ROUTE, entry.getHttpEndpoint());
+    @Override
+    public void finishBucket() {
+        try {
+            if (pending.isEmpty() || sender == null) {
+                return;
+            }
+            OtlpPayload payload = collector.collectMetrics(this::emit, startNanos, endNanos);
+            if (payload != OtlpPayload.EMPTY) {
+                OtlpTelemetry.getInstance().onMetricsExportAttempt();
+                RemoteApi.Response response = sender.send(payload);
+                OtlpTelemetry.getInstance().onMetricsExportComplete(response.success());
+            }
+        } finally {
+            pending.clear();
+        }
     }
-    if (entry.hasGrpcStatusCode()) {
-      emitStringAttribute(metric, RPC_RESPONSE_STATUS_CODE, entry.getGrpcStatusCode());
-    }
-    // additional_metric_tags support is still evolving/TBD across most tracer SDKs.
-    for (UTF8BytesString additionalTag : entry.getAdditionalTags()) {
-      emitAdditionalTag(metric, additionalTag);
+
+    @Override
+    public void reset() {
+        pending.clear();
     }
-    emitStringAttribute(metric, DATADOG_OPERATION_NAME, entry.getOperationName());
-    emitStringAttribute(metric, DATADOG_SPAN_TYPE, entry.getType());
-    emitBooleanAttribute(metric, DATADOG_SPAN_TOP_LEVEL, allTopLevel);
-    emitBooleanAttribute(metric, DATADOG_IS_TRACE_ROOT, entry.isTraceRoot());
-    if (entry.hasServiceSource()) {
-      emitStringAttribute(metric, DATADOG_SERVICE_SOURCE, entry.getServiceSource());
+
+    public void shutdown() {
+        if (sender != null) {
+            sender.shutdown();
+        }
     }
-    if (entry.isSynthetics()) {
-      emitStringAttribute(metric, DATADOG_ORIGIN, SYNTHETICS_ORIGIN);
+
+    /**
+     * Pushes the buffered entries through the metric visitor: one OTLP histogram data point per
+     * non-empty ok/error latency series. Called by {@link OtlpMetricsProtoCollector#collectMetrics}
+     * with the collector itself as the visitor.
+     */
+    private void emit(OtlpMetricsVisitor visitor) {
+        OtlpMetricVisitor metric = visitor.visitScopedMetrics(SCOPE).visitMetric(METRIC_DESCRIPTOR);
+        for (PendingPoint p : pending) {
+            // attributes must precede the data point (OtlpMetricVisitor contract)
+            emitDataPointAttributes(metric, p.entry, p.error, p.allTopLevel);
+            metric.visitDataPoint(p.point);
+        }
     }
-    emitPeerTags(metric, entry.getPeerTags());
-  }
 
-  private static void emitPeerTags(OtlpMetricVisitor metric, List<UTF8BytesString> peerTags) {
-    if (peerTags.isEmpty()) {
-      return;
+    private void emitDataPointAttributes(
+            OtlpMetricVisitor metric, AggregateEntry entry, boolean error, boolean allTopLevel) {
+        emitStringAttribute(metric, STATUS_CODE, error ? STATUS_CODE_ERROR : STATUS_CODE_OK);
+        emitStringAttribute(metric, SPAN_NAME, entry.getResource());
+        emitStringAttribute(metric, SPAN_KIND, canonicalSpanKind(entry.getSpanKind()));
+        emitStringAttribute(metric, SERVICE_NAME, entry.getService());
+        if (entry.hasHttpMethod()) {
+            emitStringAttribute(metric, HTTP_REQUEST_METHOD, entry.getHttpMethod());
+        }
+        if (entry.getHttpStatusCode() != 0) {
+            emitLongAttribute(metric, HTTP_RESPONSE_STATUS_CODE, entry.getHttpStatusCode());
+        }
+        if (entry.hasHttpEndpoint()) {
+            emitStringAttribute(metric, HTTP_ROUTE, entry.getHttpEndpoint());
+        }
+        if (entry.hasGrpcStatusCode()) {
+            emitStringAttribute(metric, RPC_RESPONSE_STATUS_CODE, entry.getGrpcStatusCode());
+        }
+        // additional_metric_tags support is still evolving/TBD across most tracer SDKs.
+        for (UTF8BytesString additionalTag : entry.getAdditionalTags()) {
+            emitAdditionalTag(metric, additionalTag);
+        }
+        emitStringAttribute(metric, DATADOG_OPERATION_NAME, entry.getOperationName());
+        emitStringAttribute(metric, DATADOG_SPAN_TYPE, entry.getType());
+        emitBooleanAttribute(metric, DATADOG_SPAN_TOP_LEVEL, allTopLevel);
+        emitBooleanAttribute(metric, DATADOG_IS_TRACE_ROOT, entry.isTraceRoot());
+        if (entry.hasServiceSource()) {
+            emitStringAttribute(metric, DATADOG_SERVICE_SOURCE, entry.getServiceSource());
+        }
+        if (entry.isSynthetics()) {
+            emitStringAttribute(metric, DATADOG_ORIGIN, SYNTHETICS_ORIGIN);
+        }
+        emitPeerTags(metric, entry.getPeerTags());
     }
-    List<String> peerTagValues = new ArrayList<>(peerTags.size());
-    for (UTF8BytesString peerTag : peerTags) {
-      peerTagValues.add(peerTag.toString());
+
+    private static void emitPeerTags(OtlpMetricVisitor metric, List<UTF8BytesString> peerTags) {
+        if (peerTags.isEmpty()) {
+            return;
+        }
+        List<String> peerTagValues = new ArrayList<>(peerTags.size());
+        for (UTF8BytesString peerTag : peerTags) {
+            peerTagValues.add(peerTag.toString());
+        }
+        metric.visitAttribute(STRING_ARRAY_ATTRIBUTE, DATADOG_PEER_TAGS, peerTagValues);
     }
-    metric.visitAttribute(STRING_ARRAY_ATTRIBUTE, DATADOG_PEER_TAGS, peerTagValues);
-  }
 
-  private static String canonicalSpanKind(CharSequence spanKind) {
-    if (spanKind == null) {
-      return SPAN_KIND_INTERNAL;
-    } else if (Tags.SPAN_KIND_SERVER.contentEquals(spanKind)) {
-      return SPAN_KIND_SERVER;
-    } else if (Tags.SPAN_KIND_CLIENT.contentEquals(spanKind)) {
-      return SPAN_KIND_CLIENT;
-    } else if (Tags.SPAN_KIND_PRODUCER.contentEquals(spanKind)) {
-      return SPAN_KIND_PRODUCER;
-    } else if (Tags.SPAN_KIND_CONSUMER.contentEquals(spanKind)) {
-      return SPAN_KIND_CONSUMER;
-    } else {
-      return SPAN_KIND_INTERNAL;
+    private static String canonicalSpanKind(CharSequence spanKind) {
+        if (spanKind == null) {
+            return SPAN_KIND_INTERNAL;
+        } else if (Tags.SPAN_KIND_SERVER.contentEquals(spanKind)) {
+            return SPAN_KIND_SERVER;
+        } else if (Tags.SPAN_KIND_CLIENT.contentEquals(spanKind)) {
+            return SPAN_KIND_CLIENT;
+        } else if (Tags.SPAN_KIND_PRODUCER.contentEquals(spanKind)) {
+            return SPAN_KIND_PRODUCER;
+        } else if (Tags.SPAN_KIND_CONSUMER.contentEquals(spanKind)) {
+            return SPAN_KIND_CONSUMER;
+        } else {
+            return SPAN_KIND_INTERNAL;
+        }
     }
-  }
 
-  private static void emitAdditionalTag(OtlpMetricVisitor metric, UTF8BytesString additionalTag) {
-    String packed = additionalTag.toString();
-    int separator = packed.indexOf(':');
-    if (separator <= 0) {
-      return;
+    private static void emitAdditionalTag(OtlpMetricVisitor metric, UTF8BytesString additionalTag) {
+        String packed = additionalTag.toString();
+        int separator = packed.indexOf(':');
+        if (separator <= 0) {
+            return;
+        }
+        String key = packed.substring(0, separator);
+        metric.visitAttribute(STRING_ATTRIBUTE, key, packed.substring(separator + 1));
     }
-    String key = packed.substring(0, separator);
-    metric.visitAttribute(STRING_ATTRIBUTE, key, packed.substring(separator + 1));
-  }
 
-  private static void emitStringAttribute(
-      OtlpMetricVisitor metric, String key, @Nullable CharSequence value) {
-    if (value != null) {
-      metric.visitAttribute(STRING_ATTRIBUTE, key, value.toString());
+    private static void emitStringAttribute(OtlpMetricVisitor metric, String key, @Nullable CharSequence value) {
+        if (value != null) {
+            metric.visitAttribute(STRING_ATTRIBUTE, key, value.toString());
+        }
     }
-  }
 
-  private static void emitLongAttribute(OtlpMetricVisitor metric, String key, long value) {
-    metric.visitAttribute(LONG_ATTRIBUTE, key, value);
-  }
+    private static void emitLongAttribute(OtlpMetricVisitor metric, String key, long value) {
+        metric.visitAttribute(LONG_ATTRIBUTE, key, value);
+    }
 
-  private static void emitBooleanAttribute(OtlpMetricVisitor metric, String key, boolean value) {
-    metric.visitAttribute(BOOLEAN_ATTRIBUTE, key, value);
-  }
+    private static void emitBooleanAttribute(OtlpMetricVisitor metric, String key, boolean value) {
+        metric.visitAttribute(BOOLEAN_ATTRIBUTE, key, value);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpSpanKind.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpSpanKind.java
index c2d85c63e4c..d26e2b38868 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpSpanKind.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpSpanKind.java
@@ -7,21 +7,21 @@
 
 /** Maps Datadog span-kind tags to OTLP's {@code Span.SpanKind} enum values. */
 final class OtlpSpanKind {
-  private OtlpSpanKind() {}
+    private OtlpSpanKind() {}
 
-  static int spanKind(CharSequence spanKind) {
-    if (spanKind == null) {
-      return 0; // UNSPECIFIED
-    } else if (SPAN_KIND_SERVER.contentEquals(spanKind)) {
-      return 2; // SERVER
-    } else if (SPAN_KIND_CLIENT.contentEquals(spanKind)) {
-      return 3; // CLIENT
-    } else if (SPAN_KIND_PRODUCER.contentEquals(spanKind)) {
-      return 4; // PRODUCER
-    } else if (SPAN_KIND_CONSUMER.contentEquals(spanKind)) {
-      return 5; // CONSUMER
-    } else {
-      return 1; // INTERNAL
+    static int spanKind(CharSequence spanKind) {
+        if (spanKind == null) {
+            return 0; // UNSPECIFIED
+        } else if (SPAN_KIND_SERVER.contentEquals(spanKind)) {
+            return 2; // SERVER
+        } else if (SPAN_KIND_CLIENT.contentEquals(spanKind)) {
+            return 3; // CLIENT
+        } else if (SPAN_KIND_PRODUCER.contentEquals(spanKind)) {
+            return 4; // PRODUCER
+        } else if (SPAN_KIND_CONSUMER.contentEquals(spanKind)) {
+            return 5; // CONSUMER
+        } else {
+            return 1; // INTERNAL
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceCollector.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceCollector.java
index 127e27af467..ffc52091f13 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceCollector.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceCollector.java
@@ -9,17 +9,17 @@
 /** Collects traces ready for export. */
 public abstract class OtlpTraceCollector {
 
-  /** Adds spans from the given trace to the collector. */
-  public abstract void addTrace(List<? extends CoreSpan<?>> spans);
+    /** Adds spans from the given trace to the collector. */
+    public abstract void addTrace(List<? extends CoreSpan<?>> spans);
 
-  /** Collects all spans added since the last collection. */
-  public abstract OtlpPayload collectTraces();
+    /** Collects all spans added since the last collection. */
+    public abstract OtlpPayload collectTraces();
 
-  /** Returns the number of bytes buffered since the last collection. */
-  public abstract int sizeInBytes();
+    /** Returns the number of bytes buffered since the last collection. */
+    public abstract int sizeInBytes();
 
-  protected final boolean shouldExport(CoreSpan<?> span) {
-    return span.samplingPriority() > 0 // trace-level sampling priority
-        || span.getTag(SPAN_SAMPLING_MECHANISM_TAG) != null; // span-level sampling priority
-  }
+    protected final boolean shouldExport(CoreSpan<?> span) {
+        return span.samplingPriority() > 0 // trace-level sampling priority
+                || span.getTag(SPAN_SAMPLING_MECHANISM_TAG) != null; // span-level sampling priority
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceJson.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceJson.java
index 845f870b965..a3f2b14aea5 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceJson.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceJson.java
@@ -41,190 +41,187 @@
 /** Provides writers for OpenTelemetry's "trace.proto" JSON encoding. */
 public final class OtlpTraceJson {
 
-  private static final UTF8BytesString SERVICE_NAME = UTF8BytesString.create("service.name");
-  private static final UTF8BytesString RESOURCE_NAME = UTF8BytesString.create("resource.name");
-  private static final UTF8BytesString OPERATION_NAME = UTF8BytesString.create("operation.name");
-  private static final UTF8BytesString SPAN_TYPE = UTF8BytesString.create("span.type");
+    private static final UTF8BytesString SERVICE_NAME = UTF8BytesString.create("service.name");
+    private static final UTF8BytesString RESOURCE_NAME = UTF8BytesString.create("resource.name");
+    private static final UTF8BytesString OPERATION_NAME = UTF8BytesString.create("operation.name");
+    private static final UTF8BytesString SPAN_TYPE = UTF8BytesString.create("span.type");
 
-  private OtlpTraceJson() {}
+    private OtlpTraceJson() {}
 
-  /** Writes one complete {@code Span} JSON object. */
-  public static void writeSpan(
-      JsonWriter writer, DDSpan span, MetaWriter metaWriter, List<? extends AgentSpanLink> links) {
-    PropagationTags propagationTags = span.spanContext().getPropagationTags();
-    SamplingState samplingState = propagationTags.samplingState();
+    /** Writes one complete {@code Span} JSON object. */
+    public static void writeSpan(
+            JsonWriter writer, DDSpan span, MetaWriter metaWriter, List<? extends AgentSpanLink> links) {
+        PropagationTags propagationTags = span.spanContext().getPropagationTags();
+        SamplingState samplingState = propagationTags.samplingState();
 
-    writer.beginObject();
+        writer.beginObject();
 
-    writer.name("traceId").value(hexTraceId(span.getTraceId()));
-    writer.name("spanId").value(hexSpanId(span.getSpanId()));
+        writer.name("traceId").value(hexTraceId(span.getTraceId()));
+        writer.name("spanId").value(hexSpanId(span.getSpanId()));
 
-    String tracestate = propagationTags.getW3CTracestate(samplingState);
-    if (tracestate != null) {
-      writer.name("traceState").value(tracestate);
-    }
+        String tracestate = propagationTags.getW3CTracestate(samplingState);
+        if (tracestate != null) {
+            writer.name("traceState").value(tracestate);
+        }
 
-    if (span.getParentId() != 0) {
-      writer.name("parentSpanId").value(hexSpanId(span.getParentId()));
-    }
+        if (span.getParentId() != 0) {
+            writer.name("parentSpanId").value(hexSpanId(span.getParentId()));
+        }
 
-    int traceFlags = NO_TRACE_FLAGS;
-    if (samplingState.getSamplingPriority() > 0) {
-      traceFlags |= SAMPLED_TRACE_FLAG;
-    }
-    if (span.spanContext().isRemote()) {
-      traceFlags |= REMOTE_TRACE_FLAG;
-    }
-    if (traceFlags != NO_TRACE_FLAGS) {
-      writer.name("flags").value(traceFlags);
-    }
+        int traceFlags = NO_TRACE_FLAGS;
+        if (samplingState.getSamplingPriority() > 0) {
+            traceFlags |= SAMPLED_TRACE_FLAG;
+        }
+        if (span.spanContext().isRemote()) {
+            traceFlags |= REMOTE_TRACE_FLAG;
+        }
+        if (traceFlags != NO_TRACE_FLAGS) {
+            writer.name("flags").value(traceFlags);
+        }
 
-    writer.name("name").value(span.getResourceName().toString());
-    writer.name("kind").value(spanKind(span.spanContext().getSpanKindString()));
-    writer.name("startTimeUnixNano").value(Long.toString(span.getStartTime()));
-    writer
-        .name("endTimeUnixNano")
-        .value(Long.toString(span.getStartTime() + PendingTrace.getDurationNano(span)));
+        writer.name("name").value(span.getResourceName().toString());
+        writer.name("kind").value(spanKind(span.spanContext().getSpanKindString()));
+        writer.name("startTimeUnixNano").value(Long.toString(span.getStartTime()));
+        writer.name("endTimeUnixNano").value(Long.toString(span.getStartTime() + PendingTrace.getDurationNano(span)));
 
-    writer.name("attributes").beginArray();
-    if (!Config.get().getServiceName().equals(span.getServiceName())) {
-      writeSpanTag(writer, SERVICE_NAME, span.getServiceName());
-    }
-    writeSpanTag(writer, RESOURCE_NAME, span.getResourceName());
-    writeSpanTag(writer, OPERATION_NAME, span.getOperationName());
-    if (span.getSpanType() != null) {
-      writeSpanTag(writer, SPAN_TYPE, span.getSpanType());
-    }
-    span.processTagsAndBaggage(metaWriter);
-    writer.endArray();
-
-    if (!links.isEmpty()) {
-      writer.name("links").beginArray();
-      for (AgentSpanLink link : links) {
-        writeSpanLink(writer, link);
-      }
-      writer.endArray();
-    }
+        writer.name("attributes").beginArray();
+        if (!Config.get().getServiceName().equals(span.getServiceName())) {
+            writeSpanTag(writer, SERVICE_NAME, span.getServiceName());
+        }
+        writeSpanTag(writer, RESOURCE_NAME, span.getResourceName());
+        writeSpanTag(writer, OPERATION_NAME, span.getOperationName());
+        if (span.getSpanType() != null) {
+            writeSpanTag(writer, SPAN_TYPE, span.getSpanType());
+        }
+        span.processTagsAndBaggage(metaWriter);
+        writer.endArray();
+
+        if (!links.isEmpty()) {
+            writer.name("links").beginArray();
+            for (AgentSpanLink link : links) {
+                writeSpanLink(writer, link);
+            }
+            writer.endArray();
+        }
 
-    if (span.isError()) {
-      writer.name("status").beginObject();
-      Object errorMessage = span.getTag(DDTags.ERROR_MSG);
-      if (errorMessage instanceof String) {
-        writer.name("message").value((String) errorMessage);
-      }
-      writer.name("code").value(2); // STATUS_CODE_ERROR
-      writer.endObject();
+        if (span.isError()) {
+            writer.name("status").beginObject();
+            Object errorMessage = span.getTag(DDTags.ERROR_MSG);
+            if (errorMessage instanceof String) {
+                writer.name("message").value((String) errorMessage);
+            }
+            writer.name("code").value(2); // STATUS_CODE_ERROR
+            writer.endObject();
+        }
+
+        writer.endObject();
     }
 
-    writer.endObject();
-  }
+    /** Writes one complete {@code SpanLink} JSON object. */
+    public static void writeSpanLink(JsonWriter writer, AgentSpanLink spanLink) {
+        writer.beginObject();
 
-  /** Writes one complete {@code SpanLink} JSON object. */
-  public static void writeSpanLink(JsonWriter writer, AgentSpanLink spanLink) {
-    writer.beginObject();
+        writer.name("traceId").value(hexTraceId(spanLink.traceId()));
+        writer.name("spanId").value(hexSpanId(spanLink.spanId()));
+        if (!spanLink.traceState().isEmpty()) {
+            writer.name("traceState").value(spanLink.traceState());
+        }
 
-    writer.name("traceId").value(hexTraceId(spanLink.traceId()));
-    writer.name("spanId").value(hexSpanId(spanLink.spanId()));
-    if (!spanLink.traceState().isEmpty()) {
-      writer.name("traceState").value(spanLink.traceState());
-    }
+        Map<?, ?> attributes = spanLink.attributes().asMap();
+        if (!attributes.isEmpty()) {
+            writer.name("attributes").beginArray();
+            attributes.forEach((key, value) -> writeAttribute(writer, STRING_ATTRIBUTE, key.toString(), value));
+            writer.endArray();
+        }
 
-    Map<?, ?> attributes = spanLink.attributes().asMap();
-    if (!attributes.isEmpty()) {
-      writer.name("attributes").beginArray();
-      attributes.forEach(
-          (key, value) -> writeAttribute(writer, STRING_ATTRIBUTE, key.toString(), value));
-      writer.endArray();
+        writer.name("flags").value(spanLink.traceFlags() & 0xff);
+
+        writer.endObject();
+    }
+
+    private static void writeSpanTag(JsonWriter writer, TagMap.EntryReader tagEntry) {
+        switch (tagEntry.type()) {
+            case TagMap.EntryReader.BOOLEAN:
+                writeAttribute(writer, BOOLEAN_ATTRIBUTE, tagEntry.tag(), tagEntry.objectValue());
+                break;
+            case TagMap.EntryReader.INT:
+            case TagMap.EntryReader.LONG:
+                writeAttribute(writer, LONG_ATTRIBUTE, tagEntry.tag(), tagEntry.objectValue());
+                break;
+            case TagMap.EntryReader.FLOAT:
+            case TagMap.EntryReader.DOUBLE:
+                writeAttribute(writer, DOUBLE_ATTRIBUTE, tagEntry.tag(), tagEntry.objectValue());
+                break;
+            default:
+                writeAttribute(writer, STRING_ATTRIBUTE, tagEntry.tag(), tagEntry.stringValue());
+        }
     }
 
-    writer.name("flags").value(spanLink.traceFlags() & 0xff);
-
-    writer.endObject();
-  }
-
-  private static void writeSpanTag(JsonWriter writer, TagMap.EntryReader tagEntry) {
-    switch (tagEntry.type()) {
-      case TagMap.EntryReader.BOOLEAN:
-        writeAttribute(writer, BOOLEAN_ATTRIBUTE, tagEntry.tag(), tagEntry.objectValue());
-        break;
-      case TagMap.EntryReader.INT:
-      case TagMap.EntryReader.LONG:
-        writeAttribute(writer, LONG_ATTRIBUTE, tagEntry.tag(), tagEntry.objectValue());
-        break;
-      case TagMap.EntryReader.FLOAT:
-      case TagMap.EntryReader.DOUBLE:
-        writeAttribute(writer, DOUBLE_ATTRIBUTE, tagEntry.tag(), tagEntry.objectValue());
-        break;
-      default:
-        writeAttribute(writer, STRING_ATTRIBUTE, tagEntry.tag(), tagEntry.stringValue());
+    private static void writeSpanTag(JsonWriter writer, UTF8BytesString key, CharSequence value) {
+        writeAttribute(writer, key, value.toString());
     }
-  }
 
-  private static void writeSpanTag(JsonWriter writer, UTF8BytesString key, CharSequence value) {
-    writeAttribute(writer, key, value.toString());
-  }
-
-  private static void writeSpanTag(JsonWriter writer, UTF8BytesString key, long value) {
-    writeAttribute(writer, key, value);
-  }
+    private static void writeSpanTag(JsonWriter writer, UTF8BytesString key, long value) {
+        writeAttribute(writer, key, value);
+    }
 
-  public static class MetaWriter implements MetadataConsumer {
-    private final JsonWriter writer;
+    public static class MetaWriter implements MetadataConsumer {
+        private final JsonWriter writer;
 
-    private boolean includeProcessTags;
-    private boolean includeSamplingTags;
+        private boolean includeProcessTags;
+        private boolean includeSamplingTags;
 
-    public MetaWriter(JsonWriter writer) {
-      this.writer = writer;
-    }
+        public MetaWriter(JsonWriter writer) {
+            this.writer = writer;
+        }
 
-    /** Call this to ensure process tags are written out for the next span. */
-    public void includeProcessTags() {
-      includeProcessTags = true;
-    }
+        /** Call this to ensure process tags are written out for the next span. */
+        public void includeProcessTags() {
+            includeProcessTags = true;
+        }
 
-    /** Call this to ensure sampling tags are written out for the next span. */
-    public void includeSamplingTags() {
-      includeSamplingTags = true;
-    }
+        /** Call this to ensure sampling tags are written out for the next span. */
+        public void includeSamplingTags() {
+            includeSamplingTags = true;
+        }
 
-    @Override
-    public void accept(Metadata metadata) {
-      if ((includeSamplingTags || metadata.topLevel()) && metadata.hasSamplingPriority()) {
-        writeSpanTag(writer, SAMPLING_PRIORITY_KEY, metadata.samplingPriority());
-      }
-      if (metadata.measured()) {
-        writeSpanTag(writer, DD_MEASURED, 1);
-      }
-      if (metadata.topLevel()) {
-        writeSpanTag(writer, DD_TOP_LEVEL, 1);
-      }
-
-      if (metadata.longRunningVersion() != 0) {
-        if (metadata.longRunningVersion() > 0) {
-          writeSpanTag(writer, DD_PARTIAL_VERSION, metadata.longRunningVersion());
-        } else {
-          writeSpanTag(writer, DD_WAS_LONG_RUNNING, 1);
-        }
-      }
-
-      writeSpanTag(writer, THREAD_ID, metadata.getThreadId());
-      writeSpanTag(writer, THREAD_NAME, metadata.getThreadName());
-      if (metadata.getHttpStatusCode() != UNSET_STATUS) {
-        writeSpanTag(writer, HTTP_STATUS, metadata.getHttpStatusCodeString());
-      }
-      if (metadata.getOrigin() != null) {
-        writeSpanTag(writer, ORIGIN_KEY, metadata.getOrigin());
-      }
-      if (includeProcessTags && metadata.processTags() != null) {
-        writeSpanTag(writer, PROCESS_TAGS_KEY, metadata.processTags());
-      }
-
-      metadata.getTags().forEach(writer, OtlpTraceJson::writeSpanTag);
-
-      // reset for next span
-      includeProcessTags = false;
-      includeSamplingTags = false;
+        @Override
+        public void accept(Metadata metadata) {
+            if ((includeSamplingTags || metadata.topLevel()) && metadata.hasSamplingPriority()) {
+                writeSpanTag(writer, SAMPLING_PRIORITY_KEY, metadata.samplingPriority());
+            }
+            if (metadata.measured()) {
+                writeSpanTag(writer, DD_MEASURED, 1);
+            }
+            if (metadata.topLevel()) {
+                writeSpanTag(writer, DD_TOP_LEVEL, 1);
+            }
+
+            if (metadata.longRunningVersion() != 0) {
+                if (metadata.longRunningVersion() > 0) {
+                    writeSpanTag(writer, DD_PARTIAL_VERSION, metadata.longRunningVersion());
+                } else {
+                    writeSpanTag(writer, DD_WAS_LONG_RUNNING, 1);
+                }
+            }
+
+            writeSpanTag(writer, THREAD_ID, metadata.getThreadId());
+            writeSpanTag(writer, THREAD_NAME, metadata.getThreadName());
+            if (metadata.getHttpStatusCode() != UNSET_STATUS) {
+                writeSpanTag(writer, HTTP_STATUS, metadata.getHttpStatusCodeString());
+            }
+            if (metadata.getOrigin() != null) {
+                writeSpanTag(writer, ORIGIN_KEY, metadata.getOrigin());
+            }
+            if (includeProcessTags && metadata.processTags() != null) {
+                writeSpanTag(writer, PROCESS_TAGS_KEY, metadata.processTags());
+            }
+
+            metadata.getTags().forEach(writer, OtlpTraceJson::writeSpanTag);
+
+            // reset for next span
+            includeProcessTags = false;
+            includeSamplingTags = false;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceJsonCollector.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceJsonCollector.java
index cbb39ed615b..443de75b811 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceJsonCollector.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceJsonCollector.java
@@ -33,168 +33,167 @@
  */
 public final class OtlpTraceJsonCollector extends OtlpTraceCollector {
 
-  private static final OtelInstrumentationScope DEFAULT_TRACE_SCOPE =
-      new OtelInstrumentationScope("", null, null);
-
-  private JsonWriter writer;
-  private OtlpTraceJson.MetaWriter metaWriter;
-
-  private boolean payloadStarted;
-  private boolean anySpanWritten;
-  private boolean firstSpanInScope;
-
-  private OtelInstrumentationScope currentScope;
-  private DDSpan currentSpan;
-  private List<? extends AgentSpanLink> currentSpanLinks = Collections.emptyList();
-
-  /** Adds the given trace spans to the collector. */
-  @Override
-  public void addTrace(List<? extends CoreSpan<?>> spans) {
-    if (!payloadStarted) {
-      start();
-      payloadStarted = true;
+    private static final OtelInstrumentationScope DEFAULT_TRACE_SCOPE = new OtelInstrumentationScope("", null, null);
+
+    private JsonWriter writer;
+    private OtlpTraceJson.MetaWriter metaWriter;
+
+    private boolean payloadStarted;
+    private boolean anySpanWritten;
+    private boolean firstSpanInScope;
+
+    private OtelInstrumentationScope currentScope;
+    private DDSpan currentSpan;
+    private List<? extends AgentSpanLink> currentSpanLinks = Collections.emptyList();
+
+    /** Adds the given trace spans to the collector. */
+    @Override
+    public void addTrace(List<? extends CoreSpan<?>> spans) {
+        if (!payloadStarted) {
+            start();
+            payloadStarted = true;
+        }
+
+        try {
+            for (CoreSpan<?> span : spans) {
+                visitSpan(span);
+            }
+        } catch (Throwable e) {
+            // reset the buffer for subsequent traces
+            stop();
+            throw e;
+        }
     }
 
-    try {
-      for (CoreSpan<?> span : spans) {
-        visitSpan(span);
-      }
-    } catch (Throwable e) {
-      // reset the buffer for subsequent traces
-      stop();
-      throw e;
+    @Override
+    public int sizeInBytes() {
+        return writer == null ? 0 : writer.size();
     }
-  }
-
-  @Override
-  public int sizeInBytes() {
-    return writer == null ? 0 : writer.size();
-  }
-
-  /**
-   * Marshals the traces collected so far into a JSON payload.
-   *
-   * <p>This payload is only valid for the calling thread until the next collection.
-   */
-  @Override
-  public OtlpPayload collectTraces() {
-    if (!payloadStarted) {
-      return OtlpPayload.EMPTY;
-    }
-    try {
-      return completePayload();
-    } finally {
-      stop();
+
+    /**
+     * Marshals the traces collected so far into a JSON payload.
+     *
+     * <p>This payload is only valid for the calling thread until the next collection.
+     */
+    @Override
+    public OtlpPayload collectTraces() {
+        if (!payloadStarted) {
+            return OtlpPayload.EMPTY;
+        }
+        try {
+            return completePayload();
+        } finally {
+            stop();
+        }
     }
-  }
-
-  /** Prepare temporary elements to collect trace data. */
-  private void start() {
-    writer = new JsonWriter();
-    metaWriter = new OtlpTraceJson.MetaWriter(writer);
-
-    writer.beginObject();
-    writer.name("resourceSpans").beginArray();
-    writer.beginObject();
-    writer.name("resource").jsonValue(TRACE_RESOURCE_FRAGMENT);
-    writer.name("scopeSpans").beginArray();
-
-    // for now put all spans under the default scope
-    visitScopedSpans(DEFAULT_TRACE_SCOPE);
-  }
-
-  /** Cleanup elements used to collect trace data. */
-  private void stop() {
-    payloadStarted = false;
-    anySpanWritten = false;
-
-    writer = null;
-    metaWriter = null;
-
-    currentScope = null;
-    currentSpan = null;
-    currentSpanLinks = Collections.emptyList();
-  }
-
-  private void visitScopedSpans(OtelInstrumentationScope scope) {
-    if (currentScope != null) {
-      completeScope();
+
+    /** Prepare temporary elements to collect trace data. */
+    private void start() {
+        writer = new JsonWriter();
+        metaWriter = new OtlpTraceJson.MetaWriter(writer);
+
+        writer.beginObject();
+        writer.name("resourceSpans").beginArray();
+        writer.beginObject();
+        writer.name("resource").jsonValue(TRACE_RESOURCE_FRAGMENT);
+        writer.name("scopeSpans").beginArray();
+
+        // for now put all spans under the default scope
+        visitScopedSpans(DEFAULT_TRACE_SCOPE);
     }
-    currentScope = scope;
-    firstSpanInScope = true;
 
-    writer.beginObject();
-    writeScopeAndSchema(writer, scope);
-    writer.name("spans").beginArray();
-  }
+    /** Cleanup elements used to collect trace data. */
+    private void stop() {
+        payloadStarted = false;
+        anySpanWritten = false;
+
+        writer = null;
+        metaWriter = null;
 
-  private void visitSpan(CoreSpan<?> span) {
-    if (!shouldExport(span)) {
-      return;
+        currentScope = null;
+        currentSpan = null;
+        currentSpanLinks = Collections.emptyList();
     }
-    if (currentSpan != null) {
-      // ensure last span written at trace boundary includes sampling tags
-      if (!span.getTraceId().equals(currentSpan.getTraceId())) {
-        metaWriter.includeSamplingTags();
-      }
-      completeSpan();
+
+    private void visitScopedSpans(OtelInstrumentationScope scope) {
+        if (currentScope != null) {
+            completeScope();
+        }
+        currentScope = scope;
+        firstSpanInScope = true;
+
+        writer.beginObject();
+        writeScopeAndSchema(writer, scope);
+        writer.name("spans").beginArray();
     }
-    currentSpan = (DDSpan) span;
-    currentSpanLinks = currentSpan.getLinks();
-  }
-
-  // called once we've processed all scopes and span messages
-  private OtlpPayload completePayload() {
-    if (currentScope != null) {
-      completeScope();
+
+    private void visitSpan(CoreSpan<?> span) {
+        if (!shouldExport(span)) {
+            return;
+        }
+        if (currentSpan != null) {
+            // ensure last span written at trace boundary includes sampling tags
+            if (!span.getTraceId().equals(currentSpan.getTraceId())) {
+                metaWriter.includeSamplingTags();
+            }
+            completeSpan();
+        }
+        currentSpan = (DDSpan) span;
+        currentSpanLinks = currentSpan.getLinks();
     }
 
-    writer.endArray(); // scopeSpans
-    writer.endObject(); // resourceSpans[0]
-    writer.endArray(); // resourceSpans
-    writer.endObject(); // root
+    // called once we've processed all scopes and span messages
+    private OtlpPayload completePayload() {
+        if (currentScope != null) {
+            completeScope();
+        }
 
-    if (!anySpanWritten) {
-      return OtlpPayload.EMPTY;
-    }
+        writer.endArray(); // scopeSpans
+        writer.endObject(); // resourceSpans[0]
+        writer.endArray(); // resourceSpans
+        writer.endObject(); // root
 
-    byte[] bytes = writer.toByteArray();
-    return new OtlpPayload(ByteBuffer.wrap(bytes), JSON_CONTENT_TYPE);
-  }
+        if (!anySpanWritten) {
+            return OtlpPayload.EMPTY;
+        }
 
-  // called once we've processed all spans in a specific scope
-  private void completeScope() {
-    if (currentSpan != null) {
-      // ensure last span written at scope boundary includes sampling tags
-      metaWriter.includeSamplingTags();
-      completeSpan();
+        byte[] bytes = writer.toByteArray();
+        return new OtlpPayload(ByteBuffer.wrap(bytes), JSON_CONTENT_TYPE);
     }
 
-    writer.endArray(); // spans
-    writer.endObject(); // scopeSpans[0]
+    // called once we've processed all spans in a specific scope
+    private void completeScope() {
+        if (currentSpan != null) {
+            // ensure last span written at scope boundary includes sampling tags
+            metaWriter.includeSamplingTags();
+            completeSpan();
+        }
 
-    // reset temporary elements for next scope
-    currentScope = null;
-  }
+        writer.endArray(); // spans
+        writer.endObject(); // scopeSpans[0]
 
-  // called once we've processed all span-links in a specific span
-  private void completeSpan() {
-    if (firstSpanInScope) {
-      // ensure first span written in the scope includes process tags,
-      // matching the firstSpanInPayload convention used by the other trace mappers
-      metaWriter.includeProcessTags();
-      firstSpanInScope = false;
+        // reset temporary elements for next scope
+        currentScope = null;
     }
-    writeSpan(writer, currentSpan, metaWriter, currentSpanLinks);
-    anySpanWritten = true;
-
-    // reset temporary elements for next span
-    currentSpan = null;
-    currentSpanLinks = Collections.emptyList();
 
-    if (writer.size() > MAX_CAPACITY_BYTES) {
-      throw new IllegalStateException(
-          "OTLP payload exceeds maximum buffer size of " + MAX_CAPACITY_BYTES + " bytes");
+    // called once we've processed all span-links in a specific span
+    private void completeSpan() {
+        if (firstSpanInScope) {
+            // ensure first span written in the scope includes process tags,
+            // matching the firstSpanInPayload convention used by the other trace mappers
+            metaWriter.includeProcessTags();
+            firstSpanInScope = false;
+        }
+        writeSpan(writer, currentSpan, metaWriter, currentSpanLinks);
+        anySpanWritten = true;
+
+        // reset temporary elements for next span
+        currentSpan = null;
+        currentSpanLinks = Collections.emptyList();
+
+        if (writer.size() > MAX_CAPACITY_BYTES) {
+            throw new IllegalStateException(
+                    "OTLP payload exceeds maximum buffer size of " + MAX_CAPACITY_BYTES + " bytes");
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceProto.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceProto.java
index 707225cf5a6..bf121df2053 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceProto.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceProto.java
@@ -53,255 +53,242 @@
 /** Provides optimized writers for OpenTelemetry's "trace.proto" wire protocol. */
 public final class OtlpTraceProto {
 
-  private static final UTF8BytesString SERVICE_NAME = UTF8BytesString.create("service.name");
-  private static final UTF8BytesString RESOURCE_NAME = UTF8BytesString.create("resource.name");
-  private static final UTF8BytesString OPERATION_NAME = UTF8BytesString.create("operation.name");
-  private static final UTF8BytesString SPAN_TYPE = UTF8BytesString.create("span.type");
-
-  private OtlpTraceProto() {}
-
-  /** Records a scoped spans message after its nested span messages have been recorded. */
-  public static int recordScopedSpansMessage(
-      GrowableBuffer buf,
-      OtelInstrumentationScope scope,
-      int nestedSpanBytes,
-      OtlpProtoBuffer protobuf) {
-
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    writeInstrumentationScope(buf, scope);
-    if (scope.getSchemaUrl() != null) {
-      writeTag(buf, 3, LEN_WIRE_TYPE);
-      writeString(buf, scope.getSchemaUrl().getUtf8Bytes());
-    }
+    private static final UTF8BytesString SERVICE_NAME = UTF8BytesString.create("service.name");
+    private static final UTF8BytesString RESOURCE_NAME = UTF8BytesString.create("resource.name");
+    private static final UTF8BytesString OPERATION_NAME = UTF8BytesString.create("operation.name");
+    private static final UTF8BytesString SPAN_TYPE = UTF8BytesString.create("span.type");
+
+    private OtlpTraceProto() {}
+
+    /** Records a scoped spans message after its nested span messages have been recorded. */
+    public static int recordScopedSpansMessage(
+            GrowableBuffer buf, OtelInstrumentationScope scope, int nestedSpanBytes, OtlpProtoBuffer protobuf) {
+
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        writeInstrumentationScope(buf, scope);
+        if (scope.getSchemaUrl() != null) {
+            writeTag(buf, 3, LEN_WIRE_TYPE);
+            writeString(buf, scope.getSchemaUrl().getUtf8Bytes());
+        }
 
-    return protobuf.recordMessage(buf, 2, nestedSpanBytes);
-  }
-
-  /** Records a span message after its nested span-link messages have been recorded. */
-  public static int recordSpanMessage(
-      GrowableBuffer buf,
-      DDSpan span,
-      MetaWriter metaWriter,
-      int nestedSpanLinkBytes,
-      OtlpProtoBuffer protobuf) {
-    PropagationTags propagationTags = span.spanContext().getPropagationTags();
-    SamplingState samplingState = propagationTags.samplingState();
-
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    writeTraceId(buf, span.getTraceId());
-
-    writeTag(buf, 2, LEN_WIRE_TYPE);
-    writeSpanId(buf, span.getSpanId());
-
-    String tracestate = propagationTags.getW3CTracestate(samplingState);
-    if (tracestate != null) {
-      writeTag(buf, 3, LEN_WIRE_TYPE);
-      writeString(buf, tracestate);
+        return protobuf.recordMessage(buf, 2, nestedSpanBytes);
     }
 
-    if (span.getParentId() != 0) {
-      writeTag(buf, 4, LEN_WIRE_TYPE);
-      writeSpanId(buf, span.getParentId());
-    }
+    /** Records a span message after its nested span-link messages have been recorded. */
+    public static int recordSpanMessage(
+            GrowableBuffer buf, DDSpan span, MetaWriter metaWriter, int nestedSpanLinkBytes, OtlpProtoBuffer protobuf) {
+        PropagationTags propagationTags = span.spanContext().getPropagationTags();
+        SamplingState samplingState = propagationTags.samplingState();
 
-    int traceFlags = NO_TRACE_FLAGS;
-    if (samplingState.getSamplingPriority() > 0) {
-      traceFlags |= SAMPLED_TRACE_FLAG;
-    }
-    if (span.spanContext().isRemote()) {
-      traceFlags |= REMOTE_TRACE_FLAG;
-    }
-    if (traceFlags != NO_TRACE_FLAGS) {
-      writeTag(buf, 16, I32_WIRE_TYPE);
-      writeI32(buf, traceFlags);
-    }
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        writeTraceId(buf, span.getTraceId());
 
-    writeTag(buf, 5, LEN_WIRE_TYPE);
-    CharSequence spanName = span.getResourceName();
-    if (spanName instanceof UTF8BytesString) {
-      writeString(buf, ((UTF8BytesString) spanName).getUtf8Bytes());
-    } else {
-      writeString(buf, spanName.toString());
-    }
+        writeTag(buf, 2, LEN_WIRE_TYPE);
+        writeSpanId(buf, span.getSpanId());
 
-    writeTag(buf, 6, VARINT_WIRE_TYPE);
-    writeVarInt(buf, spanKind(span.spanContext().getSpanKindString()));
+        String tracestate = propagationTags.getW3CTracestate(samplingState);
+        if (tracestate != null) {
+            writeTag(buf, 3, LEN_WIRE_TYPE);
+            writeString(buf, tracestate);
+        }
 
-    writeTag(buf, 7, I64_WIRE_TYPE);
-    writeI64(buf, span.getStartTime());
+        if (span.getParentId() != 0) {
+            writeTag(buf, 4, LEN_WIRE_TYPE);
+            writeSpanId(buf, span.getParentId());
+        }
 
-    writeTag(buf, 8, I64_WIRE_TYPE);
-    writeI64(buf, span.getStartTime() + PendingTrace.getDurationNano(span));
+        int traceFlags = NO_TRACE_FLAGS;
+        if (samplingState.getSamplingPriority() > 0) {
+            traceFlags |= SAMPLED_TRACE_FLAG;
+        }
+        if (span.spanContext().isRemote()) {
+            traceFlags |= REMOTE_TRACE_FLAG;
+        }
+        if (traceFlags != NO_TRACE_FLAGS) {
+            writeTag(buf, 16, I32_WIRE_TYPE);
+            writeI32(buf, traceFlags);
+        }
 
-    if (!Config.get().getServiceName().equals(span.getServiceName())) {
-      writeSpanTag(buf, SERVICE_NAME, span.getServiceName());
-    }
-    writeSpanTag(buf, RESOURCE_NAME, span.getResourceName());
-    writeSpanTag(buf, OPERATION_NAME, span.getOperationName());
-    if (span.getSpanType() != null) {
-      writeSpanTag(buf, SPAN_TYPE, span.getSpanType());
-    }
+        writeTag(buf, 5, LEN_WIRE_TYPE);
+        CharSequence spanName = span.getResourceName();
+        if (spanName instanceof UTF8BytesString) {
+            writeString(buf, ((UTF8BytesString) spanName).getUtf8Bytes());
+        } else {
+            writeString(buf, spanName.toString());
+        }
 
-    span.processTagsAndBaggage(metaWriter);
-
-    if (span.isError()) {
-      int stateSize = 2;
-      byte[] errorUtf8 = null;
-      Object errorMessage = span.getTag(DDTags.ERROR_MSG);
-      if (errorMessage instanceof String) {
-        errorUtf8 = ((String) errorMessage).getBytes(UTF_8);
-        stateSize += 1 + sizeVarInt(errorUtf8.length) + errorUtf8.length;
-      }
-      writeTag(buf, 15, LEN_WIRE_TYPE);
-      writeVarInt(buf, stateSize);
-      if (errorUtf8 != null) {
-        writeTag(buf, 2, LEN_WIRE_TYPE);
-        writeString(buf, errorUtf8);
-      }
-      writeTag(buf, 3, VARINT_WIRE_TYPE);
-      writeVarInt(buf, 2);
-    }
+        writeTag(buf, 6, VARINT_WIRE_TYPE);
+        writeVarInt(buf, spanKind(span.spanContext().getSpanKindString()));
 
-    return protobuf.recordMessage(buf, 2, nestedSpanLinkBytes);
-  }
+        writeTag(buf, 7, I64_WIRE_TYPE);
+        writeI64(buf, span.getStartTime());
 
-  /** Records a span-link message. */
-  public static int recordSpanLinkMessage(
-      GrowableBuffer buf, AgentSpanLink spanLink, OtlpProtoBuffer protobuf) {
+        writeTag(buf, 8, I64_WIRE_TYPE);
+        writeI64(buf, span.getStartTime() + PendingTrace.getDurationNano(span));
 
-    writeTag(buf, 1, LEN_WIRE_TYPE);
-    writeTraceId(buf, spanLink.traceId());
+        if (!Config.get().getServiceName().equals(span.getServiceName())) {
+            writeSpanTag(buf, SERVICE_NAME, span.getServiceName());
+        }
+        writeSpanTag(buf, RESOURCE_NAME, span.getResourceName());
+        writeSpanTag(buf, OPERATION_NAME, span.getOperationName());
+        if (span.getSpanType() != null) {
+            writeSpanTag(buf, SPAN_TYPE, span.getSpanType());
+        }
 
-    writeTag(buf, 2, LEN_WIRE_TYPE);
-    writeSpanId(buf, spanLink.spanId());
+        span.processTagsAndBaggage(metaWriter);
+
+        if (span.isError()) {
+            int stateSize = 2;
+            byte[] errorUtf8 = null;
+            Object errorMessage = span.getTag(DDTags.ERROR_MSG);
+            if (errorMessage instanceof String) {
+                errorUtf8 = ((String) errorMessage).getBytes(UTF_8);
+                stateSize += 1 + sizeVarInt(errorUtf8.length) + errorUtf8.length;
+            }
+            writeTag(buf, 15, LEN_WIRE_TYPE);
+            writeVarInt(buf, stateSize);
+            if (errorUtf8 != null) {
+                writeTag(buf, 2, LEN_WIRE_TYPE);
+                writeString(buf, errorUtf8);
+            }
+            writeTag(buf, 3, VARINT_WIRE_TYPE);
+            writeVarInt(buf, 2);
+        }
 
-    if (!spanLink.traceState().isEmpty()) {
-      writeTag(buf, 3, LEN_WIRE_TYPE);
-      writeString(buf, spanLink.traceState());
+        return protobuf.recordMessage(buf, 2, nestedSpanLinkBytes);
     }
 
-    spanLink
-        .attributes()
-        .asMap()
-        .forEach(
-            (key, value) -> {
-              writeTag(buf, 4, LEN_WIRE_TYPE);
-              writeAttribute(buf, STRING_ATTRIBUTE, key, value);
-            });
-
-    writeTag(buf, 6, I32_WIRE_TYPE);
-    writeI32(buf, spanLink.traceFlags() & 0xff);
-
-    return protobuf.recordMessage(buf, 13);
-  }
-
-  public static void writeTraceId(StreamingBuffer buf, DDTraceId traceId) {
-    writeVarInt(buf, 16);
-    buf.putLong(traceId.toHighOrderLong());
-    buf.putLong(traceId.toLong());
-  }
-
-  public static void writeSpanId(StreamingBuffer buf, long spanId) {
-    writeVarInt(buf, 8);
-    buf.putLong(spanId);
-  }
-
-  private static void writeSpanTag(StreamingBuffer buf, TagMap.EntryReader tagEntry) {
-    writeTag(buf, 9, LEN_WIRE_TYPE);
-    switch (tagEntry.type()) {
-      case TagMap.EntryReader.BOOLEAN:
-        writeAttribute(buf, BOOLEAN_ATTRIBUTE, tagEntry.tag(), tagEntry.objectValue());
-        break;
-      case TagMap.EntryReader.INT:
-      case TagMap.EntryReader.LONG:
-        writeAttribute(buf, LONG_ATTRIBUTE, tagEntry.tag(), tagEntry.objectValue());
-        break;
-      case TagMap.EntryReader.FLOAT:
-      case TagMap.EntryReader.DOUBLE:
-        writeAttribute(buf, DOUBLE_ATTRIBUTE, tagEntry.tag(), tagEntry.objectValue());
-        break;
-      default:
-        writeAttribute(buf, STRING_ATTRIBUTE, tagEntry.tag(), tagEntry.stringValue());
-    }
-  }
-
-  private static void writeSpanTag(
-      StreamingBuffer buf, UTF8BytesString key, UTF8BytesString value) {
-    writeTag(buf, 9, LEN_WIRE_TYPE);
-    writeAttribute(buf, key, value);
-  }
-
-  private static void writeSpanTag(StreamingBuffer buf, UTF8BytesString key, CharSequence value) {
-    writeTag(buf, 9, LEN_WIRE_TYPE);
-    if (value instanceof UTF8BytesString) {
-      writeAttribute(buf, key, (UTF8BytesString) value);
-    } else {
-      writeAttribute(buf, key, value.toString());
-    }
-  }
+    /** Records a span-link message. */
+    public static int recordSpanLinkMessage(GrowableBuffer buf, AgentSpanLink spanLink, OtlpProtoBuffer protobuf) {
+
+        writeTag(buf, 1, LEN_WIRE_TYPE);
+        writeTraceId(buf, spanLink.traceId());
+
+        writeTag(buf, 2, LEN_WIRE_TYPE);
+        writeSpanId(buf, spanLink.spanId());
+
+        if (!spanLink.traceState().isEmpty()) {
+            writeTag(buf, 3, LEN_WIRE_TYPE);
+            writeString(buf, spanLink.traceState());
+        }
 
-  private static void writeSpanTag(StreamingBuffer buf, UTF8BytesString key, long value) {
-    writeTag(buf, 9, LEN_WIRE_TYPE);
-    writeAttribute(buf, key, value);
-  }
+        spanLink.attributes().asMap().forEach((key, value) -> {
+            writeTag(buf, 4, LEN_WIRE_TYPE);
+            writeAttribute(buf, STRING_ATTRIBUTE, key, value);
+        });
 
-  public static class MetaWriter implements MetadataConsumer {
-    private final StreamingBuffer buf;
+        writeTag(buf, 6, I32_WIRE_TYPE);
+        writeI32(buf, spanLink.traceFlags() & 0xff);
 
-    private boolean includeProcessTags;
-    private boolean includeSamplingTags;
+        return protobuf.recordMessage(buf, 13);
+    }
+
+    public static void writeTraceId(StreamingBuffer buf, DDTraceId traceId) {
+        writeVarInt(buf, 16);
+        buf.putLong(traceId.toHighOrderLong());
+        buf.putLong(traceId.toLong());
+    }
 
-    public MetaWriter(StreamingBuffer buf) {
-      this.buf = buf;
+    public static void writeSpanId(StreamingBuffer buf, long spanId) {
+        writeVarInt(buf, 8);
+        buf.putLong(spanId);
     }
 
-    /** Call this to ensure process tags are written out for the next span. */
-    public void includeProcessTags() {
-      includeProcessTags = true;
+    private static void writeSpanTag(StreamingBuffer buf, TagMap.EntryReader tagEntry) {
+        writeTag(buf, 9, LEN_WIRE_TYPE);
+        switch (tagEntry.type()) {
+            case TagMap.EntryReader.BOOLEAN:
+                writeAttribute(buf, BOOLEAN_ATTRIBUTE, tagEntry.tag(), tagEntry.objectValue());
+                break;
+            case TagMap.EntryReader.INT:
+            case TagMap.EntryReader.LONG:
+                writeAttribute(buf, LONG_ATTRIBUTE, tagEntry.tag(), tagEntry.objectValue());
+                break;
+            case TagMap.EntryReader.FLOAT:
+            case TagMap.EntryReader.DOUBLE:
+                writeAttribute(buf, DOUBLE_ATTRIBUTE, tagEntry.tag(), tagEntry.objectValue());
+                break;
+            default:
+                writeAttribute(buf, STRING_ATTRIBUTE, tagEntry.tag(), tagEntry.stringValue());
+        }
     }
 
-    /** Call this to ensure sampling tags are written out for the next span. */
-    public void includeSamplingTags() {
-      includeSamplingTags = true;
+    private static void writeSpanTag(StreamingBuffer buf, UTF8BytesString key, UTF8BytesString value) {
+        writeTag(buf, 9, LEN_WIRE_TYPE);
+        writeAttribute(buf, key, value);
     }
 
-    @Override
-    public void accept(Metadata metadata) {
-      if ((includeSamplingTags || metadata.topLevel()) && metadata.hasSamplingPriority()) {
-        writeSpanTag(buf, SAMPLING_PRIORITY_KEY, metadata.samplingPriority());
-      }
-      if (metadata.measured()) {
-        writeSpanTag(buf, DD_MEASURED, 1);
-      }
-      if (metadata.topLevel()) {
-        writeSpanTag(buf, DD_TOP_LEVEL, 1);
-      }
-
-      if (metadata.longRunningVersion() != 0) {
-        if (metadata.longRunningVersion() > 0) {
-          writeSpanTag(buf, DD_PARTIAL_VERSION, metadata.longRunningVersion());
+    private static void writeSpanTag(StreamingBuffer buf, UTF8BytesString key, CharSequence value) {
+        writeTag(buf, 9, LEN_WIRE_TYPE);
+        if (value instanceof UTF8BytesString) {
+            writeAttribute(buf, key, (UTF8BytesString) value);
         } else {
-          writeSpanTag(buf, DD_WAS_LONG_RUNNING, 1);
+            writeAttribute(buf, key, value.toString());
+        }
+    }
+
+    private static void writeSpanTag(StreamingBuffer buf, UTF8BytesString key, long value) {
+        writeTag(buf, 9, LEN_WIRE_TYPE);
+        writeAttribute(buf, key, value);
+    }
+
+    public static class MetaWriter implements MetadataConsumer {
+        private final StreamingBuffer buf;
+
+        private boolean includeProcessTags;
+        private boolean includeSamplingTags;
+
+        public MetaWriter(StreamingBuffer buf) {
+            this.buf = buf;
+        }
+
+        /** Call this to ensure process tags are written out for the next span. */
+        public void includeProcessTags() {
+            includeProcessTags = true;
+        }
+
+        /** Call this to ensure sampling tags are written out for the next span. */
+        public void includeSamplingTags() {
+            includeSamplingTags = true;
+        }
+
+        @Override
+        public void accept(Metadata metadata) {
+            if ((includeSamplingTags || metadata.topLevel()) && metadata.hasSamplingPriority()) {
+                writeSpanTag(buf, SAMPLING_PRIORITY_KEY, metadata.samplingPriority());
+            }
+            if (metadata.measured()) {
+                writeSpanTag(buf, DD_MEASURED, 1);
+            }
+            if (metadata.topLevel()) {
+                writeSpanTag(buf, DD_TOP_LEVEL, 1);
+            }
+
+            if (metadata.longRunningVersion() != 0) {
+                if (metadata.longRunningVersion() > 0) {
+                    writeSpanTag(buf, DD_PARTIAL_VERSION, metadata.longRunningVersion());
+                } else {
+                    writeSpanTag(buf, DD_WAS_LONG_RUNNING, 1);
+                }
+            }
+
+            writeSpanTag(buf, THREAD_ID, metadata.getThreadId());
+            writeSpanTag(buf, THREAD_NAME, metadata.getThreadName());
+            if (metadata.getHttpStatusCode() != UNSET_STATUS) {
+                writeSpanTag(buf, HTTP_STATUS, metadata.getHttpStatusCodeString());
+            }
+            if (metadata.getOrigin() != null) {
+                writeSpanTag(buf, ORIGIN_KEY, metadata.getOrigin());
+            }
+            if (includeProcessTags && metadata.processTags() != null) {
+                writeSpanTag(buf, PROCESS_TAGS_KEY, metadata.processTags());
+            }
+
+            metadata.getTags().forEach(buf, OtlpTraceProto::writeSpanTag);
+
+            // reset for next span
+            includeProcessTags = false;
+            includeSamplingTags = false;
         }
-      }
-
-      writeSpanTag(buf, THREAD_ID, metadata.getThreadId());
-      writeSpanTag(buf, THREAD_NAME, metadata.getThreadName());
-      if (metadata.getHttpStatusCode() != UNSET_STATUS) {
-        writeSpanTag(buf, HTTP_STATUS, metadata.getHttpStatusCodeString());
-      }
-      if (metadata.getOrigin() != null) {
-        writeSpanTag(buf, ORIGIN_KEY, metadata.getOrigin());
-      }
-      if (includeProcessTags && metadata.processTags() != null) {
-        writeSpanTag(buf, PROCESS_TAGS_KEY, metadata.processTags());
-      }
-
-      metadata.getTags().forEach(buf, OtlpTraceProto::writeSpanTag);
-
-      // reset for next span
-      includeProcessTags = false;
-      includeSamplingTags = false;
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceProtoCollector.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceProtoCollector.java
index ba51d9f9f3d..33dabd200d8 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceProtoCollector.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceProtoCollector.java
@@ -31,157 +31,156 @@
  */
 public final class OtlpTraceProtoCollector extends OtlpTraceCollector {
 
-  private static final OtelInstrumentationScope DEFAULT_TRACE_SCOPE =
-      new OtelInstrumentationScope("", null, null);
-
-  private final GrowableBuffer buf = new GrowableBuffer(512);
-  private final OtlpTraceProto.MetaWriter metaWriter = new OtlpTraceProto.MetaWriter(buf);
-  private final OtlpProtoBuffer protobuf = new OtlpProtoBuffer(8192);
-
-  private boolean payloadStarted;
-
-  // total number of chunked bytes at different nesting levels
-  private int payloadBytes;
-  private int scopedBytes;
-  private int spanBytes;
-
-  private OtelInstrumentationScope currentScope;
-  private DDSpan currentSpan;
-
-  /** Adds the given trace spans to the collector. */
-  @Override
-  public void addTrace(List<? extends CoreSpan<?>> spans) {
-    if (!payloadStarted) {
-      start();
-      payloadStarted = true;
+    private static final OtelInstrumentationScope DEFAULT_TRACE_SCOPE = new OtelInstrumentationScope("", null, null);
+
+    private final GrowableBuffer buf = new GrowableBuffer(512);
+    private final OtlpTraceProto.MetaWriter metaWriter = new OtlpTraceProto.MetaWriter(buf);
+    private final OtlpProtoBuffer protobuf = new OtlpProtoBuffer(8192);
+
+    private boolean payloadStarted;
+
+    // total number of chunked bytes at different nesting levels
+    private int payloadBytes;
+    private int scopedBytes;
+    private int spanBytes;
+
+    private OtelInstrumentationScope currentScope;
+    private DDSpan currentSpan;
+
+    /** Adds the given trace spans to the collector. */
+    @Override
+    public void addTrace(List<? extends CoreSpan<?>> spans) {
+        if (!payloadStarted) {
+            start();
+            payloadStarted = true;
+        }
+
+        try {
+            // OtlpProtoBuffer collects spans in reverse
+            for (int i = spans.size() - 1; i >= 0; i--) {
+                visitSpan(spans.get(i));
+            }
+        } catch (Throwable e) {
+            // reset the buffer for subsequent traces
+            stop();
+            throw e;
+        }
     }
 
-    try {
-      // OtlpProtoBuffer collects spans in reverse
-      for (int i = spans.size() - 1; i >= 0; i--) {
-        visitSpan(spans.get(i));
-      }
-    } catch (Throwable e) {
-      // reset the buffer for subsequent traces
-      stop();
-      throw e;
-    }
-  }
-
-  @Override
-  public int sizeInBytes() {
-    return protobuf.sizeInBytes();
-  }
-
-  /**
-   * Marshals the traces collected so far into a chunked payload.
-   *
-   * <p>This payload is only valid for the calling thread until the next collection.
-   */
-  @Override
-  public OtlpPayload collectTraces() {
-    try {
-      return completePayload();
-    } finally {
-      stop();
+    @Override
+    public int sizeInBytes() {
+        return protobuf.sizeInBytes();
     }
-  }
 
-  /** Prepare temporary elements to collect trace data. */
-  private void start() {
-    // remove stale entries from caches
-    OtlpCommonProto.recalibrateCaches();
+    /**
+     * Marshals the traces collected so far into a chunked payload.
+     *
+     * <p>This payload is only valid for the calling thread until the next collection.
+     */
+    @Override
+    public OtlpPayload collectTraces() {
+        try {
+            return completePayload();
+        } finally {
+            stop();
+        }
+    }
 
-    // for now put all spans under the default scope
-    visitScopedSpans(DEFAULT_TRACE_SCOPE);
-  }
+    /** Prepare temporary elements to collect trace data. */
+    private void start() {
+        // remove stale entries from caches
+        OtlpCommonProto.recalibrateCaches();
 
-  /** Cleanup elements used to collect trace data. */
-  private void stop() {
-    payloadStarted = false;
+        // for now put all spans under the default scope
+        visitScopedSpans(DEFAULT_TRACE_SCOPE);
+    }
 
-    buf.reset();
-    protobuf.reset();
+    /** Cleanup elements used to collect trace data. */
+    private void stop() {
+        payloadStarted = false;
 
-    payloadBytes = 0;
-    scopedBytes = 0;
-    spanBytes = 0;
+        buf.reset();
+        protobuf.reset();
 
-    currentScope = null;
-    currentSpan = null;
-  }
+        payloadBytes = 0;
+        scopedBytes = 0;
+        spanBytes = 0;
 
-  private void visitScopedSpans(OtelInstrumentationScope scope) {
-    if (currentScope != null) {
-      completeScope();
+        currentScope = null;
+        currentSpan = null;
     }
-    currentScope = scope;
-  }
 
-  private void visitSpan(CoreSpan<?> span) {
-    if (!shouldExport(span)) {
-      return;
-    }
-    if (currentSpan != null) {
-      // ensure last span written at trace boundary includes sampling tags
-      // payload buffer is prepending, so last span written appears first!
-      if (!span.getTraceId().equals(currentSpan.getTraceId())) {
-        metaWriter.includeSamplingTags();
-      }
-      completeSpan();
-    }
-    currentSpan = (DDSpan) span;
-    currentSpan.getLinks().forEach(this::visitSpanLink);
-  }
-
-  private void visitSpanLink(AgentSpanLink spanLink) {
-    spanBytes += recordSpanLinkMessage(buf, spanLink, protobuf);
-  }
-
-  // called once we've processed all scopes and span messages
-  private OtlpPayload completePayload() {
-    if (currentScope != null) {
-      completeScope();
+    private void visitScopedSpans(OtelInstrumentationScope scope) {
+        if (currentScope != null) {
+            completeScope();
+        }
+        currentScope = scope;
     }
 
-    if (payloadBytes == 0) {
-      return OtlpPayload.EMPTY;
+    private void visitSpan(CoreSpan<?> span) {
+        if (!shouldExport(span)) {
+            return;
+        }
+        if (currentSpan != null) {
+            // ensure last span written at trace boundary includes sampling tags
+            // payload buffer is prepending, so last span written appears first!
+            if (!span.getTraceId().equals(currentSpan.getTraceId())) {
+                metaWriter.includeSamplingTags();
+            }
+            completeSpan();
+        }
+        currentSpan = (DDSpan) span;
+        currentSpan.getLinks().forEach(this::visitSpanLink);
     }
 
-    // prepend the canned resource chunk
-    payloadBytes += protobuf.recordMessage(TRACE_RESOURCE_MESSAGE);
-
-    // finally prepend the total length of all collected chunks
-    protobuf.recordMessage(buf, 1, payloadBytes);
-    return protobuf.toPayload();
-  }
-
-  // called once we've processed all spans in a specific scope
-  private void completeScope() {
-    if (currentSpan != null) {
-      // ensure last span written at scope boundary includes process+sampling tags
-      // payload buffer is prepending, so last span written appears first!
-      metaWriter.includeProcessTags();
-      metaWriter.includeSamplingTags();
-      completeSpan();
+    private void visitSpanLink(AgentSpanLink spanLink) {
+        spanBytes += recordSpanLinkMessage(buf, spanLink, protobuf);
     }
 
-    if (scopedBytes > 0) {
-      payloadBytes += recordScopedSpansMessage(buf, currentScope, scopedBytes, protobuf);
+    // called once we've processed all scopes and span messages
+    private OtlpPayload completePayload() {
+        if (currentScope != null) {
+            completeScope();
+        }
+
+        if (payloadBytes == 0) {
+            return OtlpPayload.EMPTY;
+        }
+
+        // prepend the canned resource chunk
+        payloadBytes += protobuf.recordMessage(TRACE_RESOURCE_MESSAGE);
+
+        // finally prepend the total length of all collected chunks
+        protobuf.recordMessage(buf, 1, payloadBytes);
+        return protobuf.toPayload();
     }
 
-    // reset temporary elements for next scope
-    currentScope = null;
-    scopedBytes = 0;
-  }
+    // called once we've processed all spans in a specific scope
+    private void completeScope() {
+        if (currentSpan != null) {
+            // ensure last span written at scope boundary includes process+sampling tags
+            // payload buffer is prepending, so last span written appears first!
+            metaWriter.includeProcessTags();
+            metaWriter.includeSamplingTags();
+            completeSpan();
+        }
+
+        if (scopedBytes > 0) {
+            payloadBytes += recordScopedSpansMessage(buf, currentScope, scopedBytes, protobuf);
+        }
+
+        // reset temporary elements for next scope
+        currentScope = null;
+        scopedBytes = 0;
+    }
 
-  // called once we've processed all span-links in a specific span
-  private void completeSpan() {
+    // called once we've processed all span-links in a specific span
+    private void completeSpan() {
 
-    scopedBytes += recordSpanMessage(buf, currentSpan, metaWriter, spanBytes, protobuf);
+        scopedBytes += recordSpanMessage(buf, currentSpan, metaWriter, spanBytes, protobuf);
 
-    // reset temporary elements for next span
-    currentSpan = null;
-    spanBytes = 0;
-  }
+        // reset temporary elements for next span
+        currentSpan = null;
+        spanBytes = 0;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/B3HttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/B3HttpCodec.java
index 58d50982c7e..69772b594bd 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/B3HttpCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/B3HttpCodec.java
@@ -23,315 +23,300 @@
 /** A codec designed for HTTP transport via headers using B3 headers */
 class B3HttpCodec {
 
-  private static final Logger log = LoggerFactory.getLogger(B3HttpCodec.class);
-
-  static final String B3_TRACE_ID = "b3.traceid";
-  static final String B3_SPAN_ID = "b3.spanid";
-  static final String TRACE_ID_KEY = "X-B3-TraceId";
-  static final String SPAN_ID_KEY = "X-B3-SpanId";
-  static final String SAMPLING_PRIORITY_KEY = "X-B3-Sampled";
-  // See https://github.com/openzipkin/b3-propagation#single-header for b3 header documentation
-  static final String B3_KEY = "b3";
-  static final String SAMPLING_PRIORITY_ACCEPT = String.valueOf(1);
-  static final String SAMPLING_PRIORITY_DROP = String.valueOf(0);
-
-  private B3HttpCodec() {
-    // This class should not be created. This also makes code coverage checks happy.
-  }
-
-  public static HttpCodec.Injector newCombinedInjector(boolean paddingEnabled) {
-    return new HttpCodec.CompoundInjector(
-        Arrays.asList(newSingleInjector(paddingEnabled), newMultiInjector(paddingEnabled)));
-  }
-
-  public static HttpCodec.Injector newMultiInjector(boolean paddingEnalbed) {
-    return new B3MultiInjector(paddingEnalbed);
-  }
-
-  public static HttpCodec.Injector newSingleInjector(boolean paddingEnabled) {
-    return new B3SingleInjector(paddingEnabled);
-  }
-
-  private abstract static class B3Injector implements HttpCodec.Injector {
-    private final boolean paddingEnabled;
-
-    public B3Injector(boolean paddingEnabled) {
-      this.paddingEnabled = paddingEnabled;
+    private static final Logger log = LoggerFactory.getLogger(B3HttpCodec.class);
+
+    static final String B3_TRACE_ID = "b3.traceid";
+    static final String B3_SPAN_ID = "b3.spanid";
+    static final String TRACE_ID_KEY = "X-B3-TraceId";
+    static final String SPAN_ID_KEY = "X-B3-SpanId";
+    static final String SAMPLING_PRIORITY_KEY = "X-B3-Sampled";
+    // See https://github.com/openzipkin/b3-propagation#single-header for b3 header documentation
+    static final String B3_KEY = "b3";
+    static final String SAMPLING_PRIORITY_ACCEPT = String.valueOf(1);
+    static final String SAMPLING_PRIORITY_DROP = String.valueOf(0);
+
+    private B3HttpCodec() {
+        // This class should not be created. This also makes code coverage checks happy.
     }
 
-    /**
-     * Get the TraceId {@link String} representation to inject according the following logic:
-     *
-     * <ul>
-     *   <li>Returns a 32 lower-case hexadecimal character if padding is enabled or for 128-bit
-     *       TraceIds,
-     *   <li>Returns the original String representation if the trace was parsed from B3 extractor,
-     *   <li>Return a non-padded lower-case hexadecimal String for remaining 64-bit TraceIds.
-     * </ul>
-     *
-     * @param context The context to get the TraceId from.
-     * @return The TraceId {@link String} representation to inject.
-     */
-    protected final String getInjectedTraceId(DDSpanContext context) {
-      DDTraceId traceId = context.getTraceId();
-      if (this.paddingEnabled || traceId instanceof DD128bTraceId) {
-        return traceId.toHexString();
-      } else if (traceId instanceof B3TraceId) {
-        return ((B3TraceId) traceId).getOriginal();
-      } else {
-        return DDSpanId.toHexString(traceId.toLong());
-      }
+    public static HttpCodec.Injector newCombinedInjector(boolean paddingEnabled) {
+        return new HttpCodec.CompoundInjector(
+                Arrays.asList(newSingleInjector(paddingEnabled), newMultiInjector(paddingEnabled)));
     }
 
-    /**
-     * Get the SpanId {@link String} representation to inject according the following logic:
-     *
-     * <ul>
-     *   <li>Returns a 16 lower-case hexadecimal character if padding is enabled,
-     *   <li>Returns a non-padded lower-case hexadecimal character otherwise.
-     * </ul>
-     *
-     * @param context The context to get the SpanId from.
-     * @return The SpanId {@link String} representation to inject.
-     */
-    protected final String getInjectedSpanId(DDSpanContext context) {
-      long spanId = context.getSpanId();
-      if (this.paddingEnabled) {
-        return DDSpanId.toHexStringPadded(spanId);
-      } else {
-        return DDSpanId.toHexString(spanId);
-      }
+    public static HttpCodec.Injector newMultiInjector(boolean paddingEnalbed) {
+        return new B3MultiInjector(paddingEnalbed);
     }
-  }
 
-  private static final class B3MultiInjector extends B3Injector {
-    public B3MultiInjector(boolean paddingEnabled) {
-      super(paddingEnabled);
+    public static HttpCodec.Injector newSingleInjector(boolean paddingEnabled) {
+        return new B3SingleInjector(paddingEnabled);
     }
 
-    @Override
-    public <C> void inject(
-        final DDSpanContext context, final C carrier, final CarrierSetter<C> setter) {
-      final String injectedTraceId = getInjectedTraceId(context);
-      final String injectedSpanId = getInjectedSpanId(context);
-      setter.set(carrier, TRACE_ID_KEY, injectedTraceId);
-      setter.set(carrier, SPAN_ID_KEY, injectedSpanId);
-      if (context.lockSamplingPriority()) {
-        final String injectedSamplingPriority =
-            convertSamplingPriority(context.getSamplingPriority());
-        setter.set(carrier, SAMPLING_PRIORITY_KEY, injectedSamplingPriority);
-      }
-      log.debug(
-          "{} - B3 parent context injected - {} {}",
-          context.getTraceId(),
-          injectedTraceId,
-          injectedSpanId);
-    }
-  }
+    private abstract static class B3Injector implements HttpCodec.Injector {
+        private final boolean paddingEnabled;
+
+        public B3Injector(boolean paddingEnabled) {
+            this.paddingEnabled = paddingEnabled;
+        }
+
+        /**
+         * Get the TraceId {@link String} representation to inject according the following logic:
+         *
+         * <ul>
+         *   <li>Returns a 32 lower-case hexadecimal character if padding is enabled or for 128-bit
+         *       TraceIds,
+         *   <li>Returns the original String representation if the trace was parsed from B3 extractor,
+         *   <li>Return a non-padded lower-case hexadecimal String for remaining 64-bit TraceIds.
+         * </ul>
+         *
+         * @param context The context to get the TraceId from.
+         * @return The TraceId {@link String} representation to inject.
+         */
+        protected final String getInjectedTraceId(DDSpanContext context) {
+            DDTraceId traceId = context.getTraceId();
+            if (this.paddingEnabled || traceId instanceof DD128bTraceId) {
+                return traceId.toHexString();
+            } else if (traceId instanceof B3TraceId) {
+                return ((B3TraceId) traceId).getOriginal();
+            } else {
+                return DDSpanId.toHexString(traceId.toLong());
+            }
+        }
 
-  private static final class B3SingleInjector extends B3Injector {
-    public B3SingleInjector(boolean paddingEnabled) {
-      super(paddingEnabled);
+        /**
+         * Get the SpanId {@link String} representation to inject according the following logic:
+         *
+         * <ul>
+         *   <li>Returns a 16 lower-case hexadecimal character if padding is enabled,
+         *   <li>Returns a non-padded lower-case hexadecimal character otherwise.
+         * </ul>
+         *
+         * @param context The context to get the SpanId from.
+         * @return The SpanId {@link String} representation to inject.
+         */
+        protected final String getInjectedSpanId(DDSpanContext context) {
+            long spanId = context.getSpanId();
+            if (this.paddingEnabled) {
+                return DDSpanId.toHexStringPadded(spanId);
+            } else {
+                return DDSpanId.toHexString(spanId);
+            }
+        }
     }
 
-    @Override
-    public <C> void inject(
-        final DDSpanContext context, final C carrier, final CarrierSetter<C> setter) {
-      final String injectedTraceId = getInjectedTraceId(context);
-      final String injectedSpanId = getInjectedSpanId(context);
-      final StringBuilder injectedB3IdBuilder = new StringBuilder(100);
-      injectedB3IdBuilder.append(injectedTraceId).append('-').append(injectedSpanId);
-
-      if (context.lockSamplingPriority()) {
-        final String injectedSamplingPriority =
-            convertSamplingPriority(context.getSamplingPriority());
-        injectedB3IdBuilder.append('-').append(injectedSamplingPriority);
-      }
-      String injectedB3Id = injectedB3IdBuilder.toString();
-      setter.set(carrier, B3_KEY, injectedB3Id);
-      log.debug("{} - B3 parent context injected - {}", context.getTraceId(), injectedB3Id);
+    private static final class B3MultiInjector extends B3Injector {
+        public B3MultiInjector(boolean paddingEnabled) {
+            super(paddingEnabled);
+        }
+
+        @Override
+        public <C> void inject(final DDSpanContext context, final C carrier, final CarrierSetter<C> setter) {
+            final String injectedTraceId = getInjectedTraceId(context);
+            final String injectedSpanId = getInjectedSpanId(context);
+            setter.set(carrier, TRACE_ID_KEY, injectedTraceId);
+            setter.set(carrier, SPAN_ID_KEY, injectedSpanId);
+            if (context.lockSamplingPriority()) {
+                final String injectedSamplingPriority = convertSamplingPriority(context.getSamplingPriority());
+                setter.set(carrier, SAMPLING_PRIORITY_KEY, injectedSamplingPriority);
+            }
+            log.debug("{} - B3 parent context injected - {} {}", context.getTraceId(), injectedTraceId, injectedSpanId);
+        }
     }
-  }
-
-  private static String convertSamplingPriority(final int samplingPriority) {
-    return samplingPriority > 0 ? SAMPLING_PRIORITY_ACCEPT : SAMPLING_PRIORITY_DROP;
-  }
-
-  // Only used from tests
-  static HttpCodec.Extractor newExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier) {
-    final List<HttpCodec.Extractor> extractors = new ArrayList<>(2);
-    extractors.add(newSingleExtractor(config, traceConfigSupplier));
-    extractors.add(newMultiExtractor(config, traceConfigSupplier));
-    return new HttpCodec.CompoundExtractor(extractors, config.isTracePropagationExtractFirst());
-  }
-
-  public static HttpCodec.Extractor newMultiExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier) {
-    return new TagContextExtractor(
-        traceConfigSupplier, () -> new B3MultiContextInterpreter(config));
-  }
-
-  public static HttpCodec.Extractor newSingleExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier) {
-    return new TagContextExtractor(
-        traceConfigSupplier, () -> new B3SingleContextInterpreter(config));
-  }
-
-  private abstract static class B3BaseContextInterpreter extends ContextInterpreter {
-    public B3BaseContextInterpreter(Config config) {
-      super(config);
+
+    private static final class B3SingleInjector extends B3Injector {
+        public B3SingleInjector(boolean paddingEnabled) {
+            super(paddingEnabled);
+        }
+
+        @Override
+        public <C> void inject(final DDSpanContext context, final C carrier, final CarrierSetter<C> setter) {
+            final String injectedTraceId = getInjectedTraceId(context);
+            final String injectedSpanId = getInjectedSpanId(context);
+            final StringBuilder injectedB3IdBuilder = new StringBuilder(100);
+            injectedB3IdBuilder.append(injectedTraceId).append('-').append(injectedSpanId);
+
+            if (context.lockSamplingPriority()) {
+                final String injectedSamplingPriority = convertSamplingPriority(context.getSamplingPriority());
+                injectedB3IdBuilder.append('-').append(injectedSamplingPriority);
+            }
+            String injectedB3Id = injectedB3IdBuilder.toString();
+            setter.set(carrier, B3_KEY, injectedB3Id);
+            log.debug("{} - B3 parent context injected - {}", context.getTraceId(), injectedB3Id);
+        }
     }
 
-    protected void setSpanId(final String sId) {
-      spanId = DDSpanId.fromHex(sId);
-      tagLedger().set(B3_SPAN_ID, sId);
+    private static String convertSamplingPriority(final int samplingPriority) {
+        return samplingPriority > 0 ? SAMPLING_PRIORITY_ACCEPT : SAMPLING_PRIORITY_DROP;
     }
 
-    protected boolean setTraceId(final String tId) {
-      final int length = tId.length();
-      if (length > 32) {
-        log.debug("Header {} exceeded max length of 32: {}", TRACE_ID_KEY, tId);
-        traceId = DDTraceId.ZERO;
-        return false;
-      } else {
-        B3TraceId b3TraceId = B3TraceId.fromHex(tId);
-        traceId = b3TraceId.toLong() == 0 ? DDTraceId.ZERO : b3TraceId;
-      }
-      tagLedger().set(B3_TRACE_ID, tId);
-      return true;
+    // Only used from tests
+    static HttpCodec.Extractor newExtractor(Config config, Supplier<TraceConfig> traceConfigSupplier) {
+        final List<HttpCodec.Extractor> extractors = new ArrayList<>(2);
+        extractors.add(newSingleExtractor(config, traceConfigSupplier));
+        extractors.add(newMultiExtractor(config, traceConfigSupplier));
+        return new HttpCodec.CompoundExtractor(extractors, config.isTracePropagationExtractFirst());
     }
-  }
 
-  private static final class B3MultiContextInterpreter extends B3BaseContextInterpreter {
-    private B3MultiContextInterpreter(Config config) {
-      super(config);
+    public static HttpCodec.Extractor newMultiExtractor(Config config, Supplier<TraceConfig> traceConfigSupplier) {
+        return new TagContextExtractor(traceConfigSupplier, () -> new B3MultiContextInterpreter(config));
     }
 
-    @Override
-    public TracePropagationStyle style() {
-      return B3MULTI;
+    public static HttpCodec.Extractor newSingleExtractor(Config config, Supplier<TraceConfig> traceConfigSupplier) {
+        return new TagContextExtractor(traceConfigSupplier, () -> new B3SingleContextInterpreter(config));
     }
 
-    @Override
-    public boolean accept(final String key, final String value) {
-      if (null == key || key.isEmpty() || null == value || value.isEmpty()) {
-        return true;
-      }
-      if (LOG_EXTRACT_HEADER_NAMES) {
-        log.debug("Header: {}", key);
-      }
-      try {
-        char first = Character.toLowerCase(key.charAt(0));
-        switch (first) {
-          case 'x':
-            if (TRACE_ID_KEY.equalsIgnoreCase(key)) {
-              setTraceId(firstHeaderValue(value));
-              return true;
-            } else if (SPAN_ID_KEY.equalsIgnoreCase(key)) {
-              setSpanId(firstHeaderValue(value));
-              return true;
-            } else if (SAMPLING_PRIORITY_KEY.equalsIgnoreCase(key)) {
-              samplingPriority = convertSamplingPriority(firstHeaderValue(value));
-              return true;
+    private abstract static class B3BaseContextInterpreter extends ContextInterpreter {
+        public B3BaseContextInterpreter(Config config) {
+            super(config);
+        }
+
+        protected void setSpanId(final String sId) {
+            spanId = DDSpanId.fromHex(sId);
+            tagLedger().set(B3_SPAN_ID, sId);
+        }
+
+        protected boolean setTraceId(final String tId) {
+            final int length = tId.length();
+            if (length > 32) {
+                log.debug("Header {} exceeded max length of 32: {}", TRACE_ID_KEY, tId);
+                traceId = DDTraceId.ZERO;
+                return false;
             } else {
-              handledXForwarding(key, value);
+                B3TraceId b3TraceId = B3TraceId.fromHex(tId);
+                traceId = b3TraceId.toLong() == 0 ? DDTraceId.ZERO : b3TraceId;
             }
-            break;
-          case 'f':
-            handledForwarding(key, value);
-            break;
-          case 'u':
-            handledUserAgent(key, value);
-            break;
-          default:
+            tagLedger().set(B3_TRACE_ID, tId);
+            return true;
         }
-        handledIpHeaders(key, value);
-        handleTags(key, value);
-      } catch (RuntimeException e) {
-        invalidateContext();
-        log.debug("Exception when extracting context", e);
-        return false;
-      }
-      return true;
     }
-  }
 
-  private static final class B3SingleContextInterpreter extends B3BaseContextInterpreter {
-    public B3SingleContextInterpreter(Config config) {
-      super(config);
-    }
+    private static final class B3MultiContextInterpreter extends B3BaseContextInterpreter {
+        private B3MultiContextInterpreter(Config config) {
+            super(config);
+        }
 
-    @Override
-    public TracePropagationStyle style() {
-      return B3SINGLE;
-    }
+        @Override
+        public TracePropagationStyle style() {
+            return B3MULTI;
+        }
 
-    @Override
-    public boolean accept(String key, String value) {
-      try {
-        if (null == key || key.isEmpty() || null == value || value.isEmpty()) {
-          return true;
+        @Override
+        public boolean accept(final String key, final String value) {
+            if (null == key || key.isEmpty() || null == value || value.isEmpty()) {
+                return true;
+            }
+            if (LOG_EXTRACT_HEADER_NAMES) {
+                log.debug("Header: {}", key);
+            }
+            try {
+                char first = Character.toLowerCase(key.charAt(0));
+                switch (first) {
+                    case 'x':
+                        if (TRACE_ID_KEY.equalsIgnoreCase(key)) {
+                            setTraceId(firstHeaderValue(value));
+                            return true;
+                        } else if (SPAN_ID_KEY.equalsIgnoreCase(key)) {
+                            setSpanId(firstHeaderValue(value));
+                            return true;
+                        } else if (SAMPLING_PRIORITY_KEY.equalsIgnoreCase(key)) {
+                            samplingPriority = convertSamplingPriority(firstHeaderValue(value));
+                            return true;
+                        } else {
+                            handledXForwarding(key, value);
+                        }
+                        break;
+                    case 'f':
+                        handledForwarding(key, value);
+                        break;
+                    case 'u':
+                        handledUserAgent(key, value);
+                        break;
+                    default:
+                }
+                handledIpHeaders(key, value);
+                handleTags(key, value);
+            } catch (RuntimeException e) {
+                invalidateContext();
+                log.debug("Exception when extracting context", e);
+                return false;
+            }
+            return true;
         }
-        if (LOG_EXTRACT_HEADER_NAMES) {
-          log.debug("Header: {}", key);
+    }
+
+    private static final class B3SingleContextInterpreter extends B3BaseContextInterpreter {
+        public B3SingleContextInterpreter(Config config) {
+            super(config);
         }
-        if (B3_KEY.equalsIgnoreCase(key)) {
-          return extractB3(firstHeaderValue(value));
-        } else {
-          char first = Character.toLowerCase(key.charAt(0));
-          switch (first) {
-            case 'x':
-              handledXForwarding(key, value);
-              break;
-            case 'f':
-              handledForwarding(key, value);
-              break;
-            case 'u':
-              handledUserAgent(key, value);
-              break;
-            default:
-          }
+
+        @Override
+        public TracePropagationStyle style() {
+            return B3SINGLE;
         }
-        handledIpHeaders(key, value);
-        handleTags(key, value);
-      } catch (RuntimeException e) {
-        invalidateContext();
-        log.debug("Exception when extracting context", e);
-        return false;
-      }
-      return true;
-    }
 
-    private boolean extractB3(final String firstValue) {
-      if (firstValue.length() == 1) {
-        samplingPriority = convertSamplingPriority(firstValue);
-      } else {
-        final int firstIndex = firstValue.indexOf('-');
-        final int secondIndex = firstValue.indexOf('-', firstIndex + 1);
-        if (firstIndex != -1) {
-          final String b3TraceId = firstValue.substring(0, firstIndex);
-          if (!setTraceId(b3TraceId)) {
-            return false;
-          }
+        @Override
+        public boolean accept(String key, String value) {
+            try {
+                if (null == key || key.isEmpty() || null == value || value.isEmpty()) {
+                    return true;
+                }
+                if (LOG_EXTRACT_HEADER_NAMES) {
+                    log.debug("Header: {}", key);
+                }
+                if (B3_KEY.equalsIgnoreCase(key)) {
+                    return extractB3(firstHeaderValue(value));
+                } else {
+                    char first = Character.toLowerCase(key.charAt(0));
+                    switch (first) {
+                        case 'x':
+                            handledXForwarding(key, value);
+                            break;
+                        case 'f':
+                            handledForwarding(key, value);
+                            break;
+                        case 'u':
+                            handledUserAgent(key, value);
+                            break;
+                        default:
+                    }
+                }
+                handledIpHeaders(key, value);
+                handleTags(key, value);
+            } catch (RuntimeException e) {
+                invalidateContext();
+                log.debug("Exception when extracting context", e);
+                return false;
+            }
+            return true;
         }
-        if (secondIndex == -1) {
-          final String b3SpanId = firstValue.substring(firstIndex + 1);
-          setSpanId(b3SpanId);
-        } else {
-          final String b3SpanId = firstValue.substring(firstIndex + 1, secondIndex);
-          setSpanId(b3SpanId);
-          final String b3SamplingId = firstValue.substring(secondIndex + 1);
-          samplingPriority = convertSamplingPriority(b3SamplingId);
+
+        private boolean extractB3(final String firstValue) {
+            if (firstValue.length() == 1) {
+                samplingPriority = convertSamplingPriority(firstValue);
+            } else {
+                final int firstIndex = firstValue.indexOf('-');
+                final int secondIndex = firstValue.indexOf('-', firstIndex + 1);
+                if (firstIndex != -1) {
+                    final String b3TraceId = firstValue.substring(0, firstIndex);
+                    if (!setTraceId(b3TraceId)) {
+                        return false;
+                    }
+                }
+                if (secondIndex == -1) {
+                    final String b3SpanId = firstValue.substring(firstIndex + 1);
+                    setSpanId(b3SpanId);
+                } else {
+                    final String b3SpanId = firstValue.substring(firstIndex + 1, secondIndex);
+                    setSpanId(b3SpanId);
+                    final String b3SamplingId = firstValue.substring(secondIndex + 1);
+                    samplingPriority = convertSamplingPriority(b3SamplingId);
+                }
+            }
+            return true;
         }
-      }
-      return true;
     }
-  }
 
-  private static int convertSamplingPriority(final String samplingPriority) {
-    return "1".equals(samplingPriority)
-        ? PrioritySampling.SAMPLER_KEEP
-        : PrioritySampling.SAMPLER_DROP;
-  }
+    private static int convertSamplingPriority(final String samplingPriority) {
+        return "1".equals(samplingPriority) ? PrioritySampling.SAMPLER_KEEP : PrioritySampling.SAMPLER_DROP;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/B3TraceId.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/B3TraceId.java
index a9376cd6597..ab2dac70962 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/B3TraceId.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/B3TraceId.java
@@ -5,69 +5,69 @@
 
 /** A B3 {@link DDTraceId} along with its original {@link String} representation. */
 public class B3TraceId extends DDTraceId {
-  /** The original {@link String} representation. */
-  protected final String original;
+    /** The original {@link String} representation. */
+    protected final String original;
 
-  protected final DDTraceId delegate;
+    protected final DDTraceId delegate;
 
-  /**
-   * Create a {@link B3TraceId} from a B3 TraceId string.
-   *
-   * @param s The B3 TraceId string.
-   */
-  public static B3TraceId fromHex(String s) {
-    return new B3TraceId(s, DD128bTraceId.fromHex(s));
-  }
+    /**
+     * Create a {@link B3TraceId} from a B3 TraceId string.
+     *
+     * @param s The B3 TraceId string.
+     */
+    public static B3TraceId fromHex(String s) {
+        return new B3TraceId(s, DD128bTraceId.fromHex(s));
+    }
 
-  protected B3TraceId(String original, DDTraceId delegate) {
-    this.original = original;
-    this.delegate = delegate;
-  }
+    protected B3TraceId(String original, DDTraceId delegate) {
+        this.original = original;
+        this.delegate = delegate;
+    }
 
-  /**
-   * Gets the original B3 TraceId.
-   *
-   * @return The original B3 TraceId.
-   */
-  public String getOriginal() {
-    return this.original;
-  }
+    /**
+     * Gets the original B3 TraceId.
+     *
+     * @return The original B3 TraceId.
+     */
+    public String getOriginal() {
+        return this.original;
+    }
 
-  @Override
-  public String toHexString() {
-    return this.delegate.toHexString();
-  }
+    @Override
+    public String toHexString() {
+        return this.delegate.toHexString();
+    }
 
-  @Override
-  public String toHexStringPadded(int size) {
-    return this.delegate.toHexStringPadded(size);
-  }
+    @Override
+    public String toHexStringPadded(int size) {
+        return this.delegate.toHexStringPadded(size);
+    }
 
-  @Override
-  public long toLong() {
-    return this.delegate.toLong();
-  }
+    @Override
+    public long toLong() {
+        return this.delegate.toLong();
+    }
 
-  @Override
-  public long toHighOrderLong() {
-    return this.delegate.toHighOrderLong();
-  }
+    @Override
+    public long toHighOrderLong() {
+        return this.delegate.toHighOrderLong();
+    }
 
-  @Override
-  public String toString() {
-    return this.delegate.toString();
-  }
+    @Override
+    public String toString() {
+        return this.delegate.toString();
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    B3TraceId that = (B3TraceId) o;
-    return delegate.equals(that.delegate);
-  }
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        B3TraceId that = (B3TraceId) o;
+        return delegate.equals(that.delegate);
+    }
 
-  @Override
-  public int hashCode() {
-    return this.delegate.hashCode();
-  }
+    @Override
+    public int hashCode() {
+        return this.delegate.hashCode();
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java
index 14a6459ca0f..ea9e063cbcd 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java
@@ -39,318 +39,315 @@
  * reset() method.
  */
 public abstract class ContextInterpreter implements AgentPropagation.KeyClassifier {
-  private static final Logger LOG = LoggerFactory.getLogger(ContextInterpreter.class);
-
-  private TraceConfig traceConfig;
-
-  protected Map<String, String> headerTags;
-  protected Map<String, String> baggageMapping;
-
-  protected DDTraceId traceId;
-  protected long spanId;
-  protected int samplingPriority;
-  protected TagMap.Ledger tagLedger;
-  protected Map<String, String> baggage;
-
-  private int baggageItemCount;
-  private int baggageBytes;
-
-  protected CharSequence lastParentId;
-  protected CharSequence origin;
-  protected long endToEndStartTime;
-  protected boolean valid;
-  protected boolean fullContext;
-  protected final PropagationTags.Factory propagationTagsFactory;
-  protected PropagationTags propagationTags;
-
-  private TagContext.HttpHeaders httpHeaders;
-  private final String customIpHeaderName;
-  private final boolean clientIpResolutionEnabled;
-  private final boolean clientIpWithoutAppSec;
-  private final boolean aiGuardEnabled;
-  private boolean collectIpHeaders;
-  private final boolean requestHeaderTagsCommaAllowed;
-  private final int baggageMaxItems;
-  private final int baggageMaxBytes;
-
-  protected static final boolean LOG_EXTRACT_HEADER_NAMES = Config.get().isLogExtractHeaderNames();
-  private static final DDCache<String, String> CACHE = DDCaches.newFixedSizeCache(64);
-
-  protected static String toLowerCase(String key) {
-    return CACHE.computeIfAbsent(key, Functions.LowerCase.INSTANCE);
-  }
-
-  protected ContextInterpreter(Config config) {
-    this.customIpHeaderName = config.getTraceClientIpHeader();
-    this.clientIpResolutionEnabled = config.isTraceClientIpResolverEnabled();
-    this.clientIpWithoutAppSec = config.isClientIpEnabled();
-    this.aiGuardEnabled = config.isAiGuardEnabled();
-    this.propagationTagsFactory = PropagationTags.factory(config);
-    this.requestHeaderTagsCommaAllowed = config.isRequestHeaderTagsCommaAllowed();
-    this.baggageMaxItems = config.getTraceBaggageMaxItems();
-    this.baggageMaxBytes = config.getTraceBaggageMaxBytes();
-  }
-
-  final TagMap.Ledger tagLedger() {
-    if (tagLedger == null) {
-      tagLedger = TagMap.ledger();
+    private static final Logger LOG = LoggerFactory.getLogger(ContextInterpreter.class);
+
+    private TraceConfig traceConfig;
+
+    protected Map<String, String> headerTags;
+    protected Map<String, String> baggageMapping;
+
+    protected DDTraceId traceId;
+    protected long spanId;
+    protected int samplingPriority;
+    protected TagMap.Ledger tagLedger;
+    protected Map<String, String> baggage;
+
+    private int baggageItemCount;
+    private int baggageBytes;
+
+    protected CharSequence lastParentId;
+    protected CharSequence origin;
+    protected long endToEndStartTime;
+    protected boolean valid;
+    protected boolean fullContext;
+    protected final PropagationTags.Factory propagationTagsFactory;
+    protected PropagationTags propagationTags;
+
+    private TagContext.HttpHeaders httpHeaders;
+    private final String customIpHeaderName;
+    private final boolean clientIpResolutionEnabled;
+    private final boolean clientIpWithoutAppSec;
+    private final boolean aiGuardEnabled;
+    private boolean collectIpHeaders;
+    private final boolean requestHeaderTagsCommaAllowed;
+    private final int baggageMaxItems;
+    private final int baggageMaxBytes;
+
+    protected static final boolean LOG_EXTRACT_HEADER_NAMES = Config.get().isLogExtractHeaderNames();
+    private static final DDCache<String, String> CACHE = DDCaches.newFixedSizeCache(64);
+
+    protected static String toLowerCase(String key) {
+        return CACHE.computeIfAbsent(key, Functions.LowerCase.INSTANCE);
     }
-    return tagLedger;
-  }
-
-  /**
-   * Gets the propagation style handled by the context interpreter.
-   *
-   * @return The propagation style handled.
-   */
-  public abstract TracePropagationStyle style();
-
-  protected final boolean handledForwarding(String key, String value) {
-    if (value == null || !collectIpHeaders) {
-      return false;
-    }
-
-    if (FORWARDED_KEY.equalsIgnoreCase(key)) {
-      getHeaders().forwarded = value;
-      return true;
-    }
-    if (FORWARDED_FOR_KEY.equalsIgnoreCase(key)) {
-      getHeaders().forwardedFor = value;
-      return true;
-    }
-    return false;
-  }
 
-  protected final boolean handledXForwarding(String key, String value) {
-    if (value == null || !collectIpHeaders) {
-      return false;
+    protected ContextInterpreter(Config config) {
+        this.customIpHeaderName = config.getTraceClientIpHeader();
+        this.clientIpResolutionEnabled = config.isTraceClientIpResolverEnabled();
+        this.clientIpWithoutAppSec = config.isClientIpEnabled();
+        this.aiGuardEnabled = config.isAiGuardEnabled();
+        this.propagationTagsFactory = PropagationTags.factory(config);
+        this.requestHeaderTagsCommaAllowed = config.isRequestHeaderTagsCommaAllowed();
+        this.baggageMaxItems = config.getTraceBaggageMaxItems();
+        this.baggageMaxBytes = config.getTraceBaggageMaxBytes();
     }
 
-    if (X_FORWARDED_PROTO_KEY.equalsIgnoreCase(key)) {
-      getHeaders().xForwardedProto = value;
-      return true;
-    }
-    if (X_FORWARDED_HOST_KEY.equalsIgnoreCase(key)) {
-      getHeaders().xForwardedHost = value;
-      return true;
-    }
-    if (X_FORWARDED_FOR_KEY.equalsIgnoreCase(key)) {
-      getHeaders().xForwardedFor = value;
-      return true;
-    }
-    if (X_FORWARDED_PORT_KEY.equalsIgnoreCase(key)) {
-      getHeaders().xForwardedPort = value;
-      return true;
+    final TagMap.Ledger tagLedger() {
+        if (tagLedger == null) {
+            tagLedger = TagMap.ledger();
+        }
+        return tagLedger;
     }
-    return false;
-  }
 
-  protected final boolean handledUserAgent(String key, String value) {
-    if (value == null || !USER_AGENT_KEY.equalsIgnoreCase(key)) {
-      return false;
-    }
+    /**
+     * Gets the propagation style handled by the context interpreter.
+     *
+     * @return The propagation style handled.
+     */
+    public abstract TracePropagationStyle style();
 
-    getHeaders().userAgent = value;
-    return true;
-  }
+    protected final boolean handledForwarding(String key, String value) {
+        if (value == null || !collectIpHeaders) {
+            return false;
+        }
 
-  protected final boolean handledIpHeaders(String key, String value) {
-    if (key == null || key.isEmpty()) {
-      return false;
+        if (FORWARDED_KEY.equalsIgnoreCase(key)) {
+            getHeaders().forwarded = value;
+            return true;
+        }
+        if (FORWARDED_FOR_KEY.equalsIgnoreCase(key)) {
+            getHeaders().forwardedFor = value;
+            return true;
+        }
+        return false;
     }
 
-    if (null != value && customIpHeaderName != null && customIpHeaderName.equalsIgnoreCase(key)) {
-      getHeaders().customIpHeader = value;
-      return true;
-    }
+    protected final boolean handledXForwarding(String key, String value) {
+        if (value == null || !collectIpHeaders) {
+            return false;
+        }
 
-    if (value == null || !collectIpHeaders) {
-      return false;
+        if (X_FORWARDED_PROTO_KEY.equalsIgnoreCase(key)) {
+            getHeaders().xForwardedProto = value;
+            return true;
+        }
+        if (X_FORWARDED_HOST_KEY.equalsIgnoreCase(key)) {
+            getHeaders().xForwardedHost = value;
+            return true;
+        }
+        if (X_FORWARDED_FOR_KEY.equalsIgnoreCase(key)) {
+            getHeaders().xForwardedFor = value;
+            return true;
+        }
+        if (X_FORWARDED_PORT_KEY.equalsIgnoreCase(key)) {
+            getHeaders().xForwardedPort = value;
+            return true;
+        }
+        return false;
     }
 
-    // May be ends with 'ip' ?
-    char last = Character.toLowerCase(key.charAt(key.length() - 1));
-    if (last == 'p') {
-      if (X_CLUSTER_CLIENT_IP_KEY.equalsIgnoreCase(key)) {
-        getHeaders().xClusterClientIp = value;
-        return true;
-      }
-      if (X_REAL_IP_KEY.equalsIgnoreCase(key)) {
-        getHeaders().xRealIp = value;
-        return true;
-      }
-      if (X_CLIENT_IP_KEY.equalsIgnoreCase(key)) {
-        getHeaders().xClientIp = value;
-        return true;
-      }
-      if (TRUE_CLIENT_IP_KEY.equalsIgnoreCase(key)) {
-        getHeaders().trueClientIp = value;
-        return true;
-      }
-      if (FASTLY_CLIENT_IP_KEY.equalsIgnoreCase(key)) {
-        getHeaders().fastlyClientIp = value;
-        return true;
-      }
-      if (CF_CONNECTING_IP_KEY.equalsIgnoreCase(key)) {
-        getHeaders().cfConnectingIp = value;
+    protected final boolean handledUserAgent(String key, String value) {
+        if (value == null || !USER_AGENT_KEY.equalsIgnoreCase(key)) {
+            return false;
+        }
+
+        getHeaders().userAgent = value;
         return true;
-      }
-    } else if (CF_CONNECTING_IP_V6_KEY.equalsIgnoreCase(key)) {
-      getHeaders().cfConnectingIpv6 = value;
-      return true;
     }
 
-    return false;
-  }
+    protected final boolean handledIpHeaders(String key, String value) {
+        if (key == null || key.isEmpty()) {
+            return false;
+        }
 
-  protected final boolean handleTags(String key, String value) {
-    if (headerTags.isEmpty() || value == null) {
-      return false;
-    }
-    final String lowerCaseKey = toLowerCase(key);
-    final String mappedKey = headerTags.get(lowerCaseKey);
-    if (null != mappedKey) {
-      tagLedger()
-          .set(
-              mappedKey,
-              HttpCodec.decode(
-                  requestHeaderTagsCommaAllowed ? value : HttpCodec.firstHeaderValue(value)));
-      return true;
+        if (null != value && customIpHeaderName != null && customIpHeaderName.equalsIgnoreCase(key)) {
+            getHeaders().customIpHeader = value;
+            return true;
+        }
+
+        if (value == null || !collectIpHeaders) {
+            return false;
+        }
+
+        // May be ends with 'ip' ?
+        char last = Character.toLowerCase(key.charAt(key.length() - 1));
+        if (last == 'p') {
+            if (X_CLUSTER_CLIENT_IP_KEY.equalsIgnoreCase(key)) {
+                getHeaders().xClusterClientIp = value;
+                return true;
+            }
+            if (X_REAL_IP_KEY.equalsIgnoreCase(key)) {
+                getHeaders().xRealIp = value;
+                return true;
+            }
+            if (X_CLIENT_IP_KEY.equalsIgnoreCase(key)) {
+                getHeaders().xClientIp = value;
+                return true;
+            }
+            if (TRUE_CLIENT_IP_KEY.equalsIgnoreCase(key)) {
+                getHeaders().trueClientIp = value;
+                return true;
+            }
+            if (FASTLY_CLIENT_IP_KEY.equalsIgnoreCase(key)) {
+                getHeaders().fastlyClientIp = value;
+                return true;
+            }
+            if (CF_CONNECTING_IP_KEY.equalsIgnoreCase(key)) {
+                getHeaders().cfConnectingIp = value;
+                return true;
+            }
+        } else if (CF_CONNECTING_IP_V6_KEY.equalsIgnoreCase(key)) {
+            getHeaders().cfConnectingIpv6 = value;
+            return true;
+        }
+
+        return false;
     }
-    return false;
-  }
 
-  protected final boolean handleMappedBaggage(String key, String value) {
-    if (baggageMapping.isEmpty() || value == null) {
-      return false;
+    protected final boolean handleTags(String key, String value) {
+        if (headerTags.isEmpty() || value == null) {
+            return false;
+        }
+        final String lowerCaseKey = toLowerCase(key);
+        final String mappedKey = headerTags.get(lowerCaseKey);
+        if (null != mappedKey) {
+            tagLedger()
+                    .set(
+                            mappedKey,
+                            HttpCodec.decode(
+                                    requestHeaderTagsCommaAllowed ? value : HttpCodec.firstHeaderValue(value)));
+            return true;
+        }
+        return false;
     }
-    final String lowerCaseKey = toLowerCase(key);
-    final String mappedKey = baggageMapping.get(lowerCaseKey);
-    if (null != mappedKey) {
-      addBaggageItem(mappedKey, value);
-      return true;
+
+    protected final boolean handleMappedBaggage(String key, String value) {
+        if (baggageMapping.isEmpty() || value == null) {
+            return false;
+        }
+        final String lowerCaseKey = toLowerCase(key);
+        final String mappedKey = baggageMapping.get(lowerCaseKey);
+        if (null != mappedKey) {
+            addBaggageItem(mappedKey, value);
+            return true;
+        }
+        return false;
     }
-    return false;
-  }
 
-  protected final boolean addBaggageItem(String key, String value) {
-    if (key == null || value == null || baggageMaxItems == 0 || baggageMaxBytes == 0) {
-      return false;
+    protected final boolean addBaggageItem(String key, String value) {
+        if (key == null || value == null || baggageMaxItems == 0 || baggageMaxBytes == 0) {
+            return false;
+        }
+        final String oldValue = baggage.get(key);
+        if (oldValue == null && baggageItemCount >= baggageMaxItems) {
+            LOG.debug("Dropping baggage item {}: item limit {} reached", key, baggageMaxItems);
+            return false;
+        }
+
+        final long projectedBytes = oldValue == null
+                ? (long) baggageBytes + key.length() + value.length()
+                : (long) baggageBytes + value.length() - oldValue.length();
+
+        if (projectedBytes > baggageMaxBytes) {
+            LOG.debug("Dropping baggage item {}: byte limit {} reached", key, baggageMaxBytes);
+            return false;
+        }
+        if (baggage.isEmpty()) {
+            baggage = new TreeMap<>();
+        }
+        baggage.put(key, HttpCodec.decode(value));
+        if (oldValue == null) {
+            baggageItemCount++;
+        }
+        baggageBytes = (int) projectedBytes;
+        return true;
     }
-    final String oldValue = baggage.get(key);
-    if (oldValue == null && baggageItemCount >= baggageMaxItems) {
-      LOG.debug("Dropping baggage item {}: item limit {} reached", key, baggageMaxItems);
-      return false;
+
+    public ContextInterpreter reset(TraceConfig traceConfig) {
+        this.traceConfig = traceConfig;
+        traceId = DDTraceId.ZERO;
+        spanId = DDSpanId.ZERO;
+        samplingPriority = PrioritySampling.UNSET;
+        origin = null;
+        endToEndStartTime = 0;
+        if (tagLedger != null) tagLedger.reset();
+        baggage = Collections.emptyMap();
+        baggageItemCount = 0;
+        baggageBytes = 0;
+        valid = true;
+        fullContext = true;
+        httpHeaders = null;
+        collectIpHeaders = this.clientIpWithoutAppSec
+                || this.clientIpResolutionEnabled && (ActiveSubsystems.APPSEC_ACTIVE || this.aiGuardEnabled);
+        headerTags = traceConfig.getRequestHeaderTags();
+        baggageMapping = traceConfig.getBaggageMapping();
+        propagationTags = null;
+        lastParentId = null;
+        return this;
     }
 
-    final long projectedBytes =
-        oldValue == null
-            ? (long) baggageBytes + key.length() + value.length()
-            : (long) baggageBytes + value.length() - oldValue.length();
+    protected TagContext build() {
+        if (valid) {
+            if (fullContext && !DDTraceId.ZERO.equals(traceId)) {
+                if (propagationTags == null) {
+                    propagationTags = propagationTagsFactory.empty();
+                }
+                return new ExtractedContext(
+                        traceId,
+                        spanId,
+                        samplingPriorityOrDefault(traceId, samplingPriority),
+                        origin,
+                        endToEndStartTime,
+                        baggage,
+                        tagLedger == null ? null : tagLedger.build(),
+                        httpHeaders,
+                        propagationTags,
+                        traceConfig,
+                        style());
+            } else if (origin != null
+                    || (tagLedger != null && !tagLedger.isDefinitelyEmpty())
+                    || httpHeaders != null
+                    || !baggage.isEmpty()
+                    || samplingPriority != PrioritySampling.UNSET) {
+                return new TagContext(
+                        origin,
+                        tagLedger == null ? null : tagLedger.build(),
+                        httpHeaders,
+                        baggage,
+                        samplingPriorityOrDefault(traceId, samplingPriority),
+                        traceConfig,
+                        style(),
+                        DDTraceId.ZERO);
+            }
+        }
+        return null;
+    }
 
-    if (projectedBytes > baggageMaxBytes) {
-      LOG.debug("Dropping baggage item {}: byte limit {} reached", key, baggageMaxBytes);
-      return false;
+    protected void invalidateContext() {
+        this.valid = false;
     }
-    if (baggage.isEmpty()) {
-      baggage = new TreeMap<>();
+
+    protected void onlyTagContext() {
+        this.fullContext = false;
     }
-    baggage.put(key, HttpCodec.decode(value));
-    if (oldValue == null) {
-      baggageItemCount++;
+
+    protected int defaultSamplingPriority() {
+        return PrioritySampling.UNSET;
     }
-    baggageBytes = (int) projectedBytes;
-    return true;
-  }
-
-  public ContextInterpreter reset(TraceConfig traceConfig) {
-    this.traceConfig = traceConfig;
-    traceId = DDTraceId.ZERO;
-    spanId = DDSpanId.ZERO;
-    samplingPriority = PrioritySampling.UNSET;
-    origin = null;
-    endToEndStartTime = 0;
-    if (tagLedger != null) tagLedger.reset();
-    baggage = Collections.emptyMap();
-    baggageItemCount = 0;
-    baggageBytes = 0;
-    valid = true;
-    fullContext = true;
-    httpHeaders = null;
-    collectIpHeaders =
-        this.clientIpWithoutAppSec
-            || this.clientIpResolutionEnabled
-                && (ActiveSubsystems.APPSEC_ACTIVE || this.aiGuardEnabled);
-    headerTags = traceConfig.getRequestHeaderTags();
-    baggageMapping = traceConfig.getBaggageMapping();
-    propagationTags = null;
-    lastParentId = null;
-    return this;
-  }
-
-  protected TagContext build() {
-    if (valid) {
-      if (fullContext && !DDTraceId.ZERO.equals(traceId)) {
-        if (propagationTags == null) {
-          propagationTags = propagationTagsFactory.empty();
+
+    private TagContext.HttpHeaders getHeaders() {
+        if (httpHeaders == null) {
+            httpHeaders = new TagContext.HttpHeaders();
         }
-        return new ExtractedContext(
-            traceId,
-            spanId,
-            samplingPriorityOrDefault(traceId, samplingPriority),
-            origin,
-            endToEndStartTime,
-            baggage,
-            tagLedger == null ? null : tagLedger.build(),
-            httpHeaders,
-            propagationTags,
-            traceConfig,
-            style());
-      } else if (origin != null
-          || (tagLedger != null && !tagLedger.isDefinitelyEmpty())
-          || httpHeaders != null
-          || !baggage.isEmpty()
-          || samplingPriority != PrioritySampling.UNSET) {
-        return new TagContext(
-            origin,
-            tagLedger == null ? null : tagLedger.build(),
-            httpHeaders,
-            baggage,
-            samplingPriorityOrDefault(traceId, samplingPriority),
-            traceConfig,
-            style(),
-            DDTraceId.ZERO);
-      }
+        return httpHeaders;
     }
-    return null;
-  }
 
-  protected void invalidateContext() {
-    this.valid = false;
-  }
-
-  protected void onlyTagContext() {
-    this.fullContext = false;
-  }
-
-  protected int defaultSamplingPriority() {
-    return PrioritySampling.UNSET;
-  }
+    private int samplingPriorityOrDefault(DDTraceId traceId, int samplingPriority) {
+        return samplingPriority == PrioritySampling.UNSET || DDTraceId.ZERO.equals(traceId)
+                ? defaultSamplingPriority()
+                : samplingPriority;
+    }
 
-  private TagContext.HttpHeaders getHeaders() {
-    if (httpHeaders == null) {
-      httpHeaders = new TagContext.HttpHeaders();
+    public interface Factory {
+        ContextInterpreter create();
     }
-    return httpHeaders;
-  }
-
-  private int samplingPriorityOrDefault(DDTraceId traceId, int samplingPriority) {
-    return samplingPriority == PrioritySampling.UNSET || DDTraceId.ZERO.equals(traceId)
-        ? defaultSamplingPriority()
-        : samplingPriority;
-  }
-
-  public interface Factory {
-    ContextInterpreter create();
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/DatadogHttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/DatadogHttpCodec.java
index f66c8c5373d..616ae1bd612 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/DatadogHttpCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/DatadogHttpCodec.java
@@ -25,207 +25,204 @@
 
 /** A codec designed for HTTP transport via headers using Datadog headers */
 class DatadogHttpCodec {
-  private static final Logger log = LoggerFactory.getLogger(DatadogHttpCodec.class);
+    private static final Logger log = LoggerFactory.getLogger(DatadogHttpCodec.class);
+
+    static final String OT_BAGGAGE_PREFIX = "ot-baggage-";
+    static final String TRACE_ID_KEY = "x-datadog-trace-id";
+    static final String SPAN_ID_KEY = "x-datadog-parent-id";
+    static final String SAMPLING_PRIORITY_KEY = "x-datadog-sampling-priority";
+    static final String ORIGIN_KEY = "x-datadog-origin";
+    private static final String E2E_START_KEY = OT_BAGGAGE_PREFIX + DDTags.TRACE_START_TIME;
+    static final String DATADOG_TAGS_KEY = "x-datadog-tags";
+
+    private DatadogHttpCodec() {
+        // This class should not be created. This also makes code coverage checks happy.
+    }
 
-  static final String OT_BAGGAGE_PREFIX = "ot-baggage-";
-  static final String TRACE_ID_KEY = "x-datadog-trace-id";
-  static final String SPAN_ID_KEY = "x-datadog-parent-id";
-  static final String SAMPLING_PRIORITY_KEY = "x-datadog-sampling-priority";
-  static final String ORIGIN_KEY = "x-datadog-origin";
-  private static final String E2E_START_KEY = OT_BAGGAGE_PREFIX + DDTags.TRACE_START_TIME;
-  static final String DATADOG_TAGS_KEY = "x-datadog-tags";
+    public static HttpCodec.Injector newInjector(Map<String, String> invertedBaggageMapping) {
+        return new Injector(invertedBaggageMapping);
+    }
 
-  private DatadogHttpCodec() {
-    // This class should not be created. This also makes code coverage checks happy.
-  }
+    private static class Injector implements HttpCodec.Injector {
 
-  public static HttpCodec.Injector newInjector(Map<String, String> invertedBaggageMapping) {
-    return new Injector(invertedBaggageMapping);
-  }
+        private final Map<String, String> invertedBaggageMapping;
 
-  private static class Injector implements HttpCodec.Injector {
+        public Injector(Map<String, String> invertedBaggageMapping) {
+            assert invertedBaggageMapping != null;
+            this.invertedBaggageMapping = invertedBaggageMapping;
+        }
 
-    private final Map<String, String> invertedBaggageMapping;
+        @Override
+        public <C> void inject(final DDSpanContext context, final C carrier, final CarrierSetter<C> setter) {
 
-    public Injector(Map<String, String> invertedBaggageMapping) {
-      assert invertedBaggageMapping != null;
-      this.invertedBaggageMapping = invertedBaggageMapping;
-    }
+            setter.set(carrier, TRACE_ID_KEY, context.getTraceId().toString());
+            setter.set(carrier, SPAN_ID_KEY, DDSpanId.toString(context.getSpanId()));
+            if (context.lockSamplingPriority()) {
+                setter.set(carrier, SAMPLING_PRIORITY_KEY, String.valueOf(context.getSamplingPriority()));
+            }
+            final CharSequence origin = context.getOrigin();
+            if (origin != null) {
+                setter.set(carrier, ORIGIN_KEY, origin.toString());
+            }
+            long e2eStart = context.getEndToEndStartTime();
+            if (e2eStart > 0) {
+                setter.set(carrier, E2E_START_KEY, Long.toString(NANOSECONDS.toMillis(e2eStart)));
+            }
 
-    @Override
-    public <C> void inject(
-        final DDSpanContext context, final C carrier, final CarrierSetter<C> setter) {
-
-      setter.set(carrier, TRACE_ID_KEY, context.getTraceId().toString());
-      setter.set(carrier, SPAN_ID_KEY, DDSpanId.toString(context.getSpanId()));
-      if (context.lockSamplingPriority()) {
-        setter.set(carrier, SAMPLING_PRIORITY_KEY, String.valueOf(context.getSamplingPriority()));
-      }
-      final CharSequence origin = context.getOrigin();
-      if (origin != null) {
-        setter.set(carrier, ORIGIN_KEY, origin.toString());
-      }
-      long e2eStart = context.getEndToEndStartTime();
-      if (e2eStart > 0) {
-        setter.set(carrier, E2E_START_KEY, Long.toString(NANOSECONDS.toMillis(e2eStart)));
-      }
-
-      for (final Map.Entry<String, String> entry : context.baggageItems()) {
-        String header = invertedBaggageMapping.get(entry.getKey());
-        header = header != null ? header : OT_BAGGAGE_PREFIX + entry.getKey();
-        setter.set(carrier, header, HttpCodec.encodeBaggage(entry.getValue()));
-      }
-
-      // inject x-datadog-tags
-      String datadogTags = context.getPropagationTags().headerValue(HeaderType.DATADOG);
-      if (datadogTags != null) {
-        setter.set(carrier, DATADOG_TAGS_KEY, datadogTags);
-      }
-    }
-  }
-
-  public static HttpCodec.Extractor newExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier) {
-    return new TagContextExtractor(
-        traceConfigSupplier, () -> new DatadogContextInterpreter(config));
-  }
-
-  private static class DatadogContextInterpreter extends ContextInterpreter {
-
-    private static final int TRACE_ID = 0;
-    private static final int SPAN_ID = 1;
-    private static final int ORIGIN = 2;
-    private static final int SAMPLING_PRIORITY = 3;
-    private static final int OT_BAGGAGE = 4;
-    private static final int E2E_START = 5;
-    private static final int DD_TAGS = 6;
-    private static final int IGNORE = -1;
-
-    private final boolean isAwsPropagationEnabled;
-
-    private DatadogContextInterpreter(Config config) {
-      super(config);
-      isAwsPropagationEnabled = config.isAwsPropagationEnabled();
+            for (final Map.Entry<String, String> entry : context.baggageItems()) {
+                String header = invertedBaggageMapping.get(entry.getKey());
+                header = header != null ? header : OT_BAGGAGE_PREFIX + entry.getKey();
+                setter.set(carrier, header, HttpCodec.encodeBaggage(entry.getValue()));
+            }
+
+            // inject x-datadog-tags
+            String datadogTags = context.getPropagationTags().headerValue(HeaderType.DATADOG);
+            if (datadogTags != null) {
+                setter.set(carrier, DATADOG_TAGS_KEY, datadogTags);
+            }
+        }
     }
 
-    @Override
-    public TracePropagationStyle style() {
-      return DATADOG;
+    public static HttpCodec.Extractor newExtractor(Config config, Supplier<TraceConfig> traceConfigSupplier) {
+        return new TagContextExtractor(traceConfigSupplier, () -> new DatadogContextInterpreter(config));
     }
 
-    @Override
-    public boolean accept(String key, String value) {
-      if (null == key || key.isEmpty()) {
-        return true;
-      }
-      if (LOG_EXTRACT_HEADER_NAMES) {
-        log.debug("Header: {}", key);
-      }
-      String lowerCaseKey = null;
-      int classification = IGNORE;
-      char first = Character.toLowerCase(key.charAt(0));
-      switch (first) {
-        case 'x':
-          if (TRACE_ID_KEY.equalsIgnoreCase(key)) {
-            classification = TRACE_ID;
-          } else if (SPAN_ID_KEY.equalsIgnoreCase(key)) {
-            classification = SPAN_ID;
-          } else if (SAMPLING_PRIORITY_KEY.equalsIgnoreCase(key)) {
-            classification = SAMPLING_PRIORITY;
-          } else if (ORIGIN_KEY.equalsIgnoreCase(key)) {
-            classification = ORIGIN;
-          } else if (isAwsPropagationEnabled && X_AMZN_TRACE_ID.equalsIgnoreCase(key)) {
-            handleXRayTraceHeader(this, value);
-          } else if (DATADOG_TAGS_KEY.equalsIgnoreCase(key)) {
-            classification = DD_TAGS;
-          } else {
-            handledXForwarding(key, value);
-          }
-          break;
-        case 'f':
-          handledForwarding(key, value);
-          break;
-        case 'u':
-          handledUserAgent(key, value);
-          break;
-        case 'o':
-          lowerCaseKey = toLowerCase(key);
-          if (E2E_START_KEY.equals(lowerCaseKey)) {
-            classification = E2E_START;
-          } else if (lowerCaseKey.startsWith(OT_BAGGAGE_PREFIX)) {
-            classification = OT_BAGGAGE;
-          }
-          break;
-        default:
-      }
-
-      if (classification != IGNORE) {
-        try {
-          if (null != value) {
-            switch (classification) {
-              case TRACE_ID:
-                traceId = DDTraceId.from(firstHeaderValue(value));
-                break;
-              case SPAN_ID:
-                spanId = DDSpanId.from(firstHeaderValue(value));
-                break;
-              case ORIGIN:
-                origin = firstHeaderValue(value);
-                break;
-              case SAMPLING_PRIORITY:
-                samplingPriority = Integer.parseInt(firstHeaderValue(value));
-                break;
-              case E2E_START:
-                endToEndStartTime = extractEndToEndStartTime(firstHeaderValue(value));
-                break;
-              case DD_TAGS:
-                propagationTags = propagationTagsFactory.fromHeaderValue(HeaderType.DATADOG, value);
-                break;
-              case OT_BAGGAGE:
-                addBaggageItem(lowerCaseKey.substring(OT_BAGGAGE_PREFIX.length()), value);
-                break;
-              default:
-            }
-          }
-        } catch (RuntimeException e) {
-          invalidateContext();
-          log.debug("Exception when extracting context", e);
-          return false;
+    private static class DatadogContextInterpreter extends ContextInterpreter {
+
+        private static final int TRACE_ID = 0;
+        private static final int SPAN_ID = 1;
+        private static final int ORIGIN = 2;
+        private static final int SAMPLING_PRIORITY = 3;
+        private static final int OT_BAGGAGE = 4;
+        private static final int E2E_START = 5;
+        private static final int DD_TAGS = 6;
+        private static final int IGNORE = -1;
+
+        private final boolean isAwsPropagationEnabled;
+
+        private DatadogContextInterpreter(Config config) {
+            super(config);
+            isAwsPropagationEnabled = config.isAwsPropagationEnabled();
         }
-      } else {
-        handledIpHeaders(key, value);
-        if (handleTags(key, value)) {
-          return true;
+
+        @Override
+        public TracePropagationStyle style() {
+            return DATADOG;
         }
-        handleMappedBaggage(key, value);
-      }
-      return true;
-    }
 
-    @Override
-    protected TagContext build() {
-      restore128bTraceId();
-      return super.build();
-    }
+        @Override
+        public boolean accept(String key, String value) {
+            if (null == key || key.isEmpty()) {
+                return true;
+            }
+            if (LOG_EXTRACT_HEADER_NAMES) {
+                log.debug("Header: {}", key);
+            }
+            String lowerCaseKey = null;
+            int classification = IGNORE;
+            char first = Character.toLowerCase(key.charAt(0));
+            switch (first) {
+                case 'x':
+                    if (TRACE_ID_KEY.equalsIgnoreCase(key)) {
+                        classification = TRACE_ID;
+                    } else if (SPAN_ID_KEY.equalsIgnoreCase(key)) {
+                        classification = SPAN_ID;
+                    } else if (SAMPLING_PRIORITY_KEY.equalsIgnoreCase(key)) {
+                        classification = SAMPLING_PRIORITY;
+                    } else if (ORIGIN_KEY.equalsIgnoreCase(key)) {
+                        classification = ORIGIN;
+                    } else if (isAwsPropagationEnabled && X_AMZN_TRACE_ID.equalsIgnoreCase(key)) {
+                        handleXRayTraceHeader(this, value);
+                    } else if (DATADOG_TAGS_KEY.equalsIgnoreCase(key)) {
+                        classification = DD_TAGS;
+                    } else {
+                        handledXForwarding(key, value);
+                    }
+                    break;
+                case 'f':
+                    handledForwarding(key, value);
+                    break;
+                case 'u':
+                    handledUserAgent(key, value);
+                    break;
+                case 'o':
+                    lowerCaseKey = toLowerCase(key);
+                    if (E2E_START_KEY.equals(lowerCaseKey)) {
+                        classification = E2E_START;
+                    } else if (lowerCaseKey.startsWith(OT_BAGGAGE_PREFIX)) {
+                        classification = OT_BAGGAGE;
+                    }
+                    break;
+                default:
+            }
 
-    private long extractEndToEndStartTime(String value) {
-      try {
-        return MILLISECONDS.toNanos(Long.parseLong(value));
-      } catch (RuntimeException e) {
-        log.debug("Ignoring invalid end-to-end start time {}", value, e);
-        return 0;
-      }
-    }
+            if (classification != IGNORE) {
+                try {
+                    if (null != value) {
+                        switch (classification) {
+                            case TRACE_ID:
+                                traceId = DDTraceId.from(firstHeaderValue(value));
+                                break;
+                            case SPAN_ID:
+                                spanId = DDSpanId.from(firstHeaderValue(value));
+                                break;
+                            case ORIGIN:
+                                origin = firstHeaderValue(value);
+                                break;
+                            case SAMPLING_PRIORITY:
+                                samplingPriority = Integer.parseInt(firstHeaderValue(value));
+                                break;
+                            case E2E_START:
+                                endToEndStartTime = extractEndToEndStartTime(firstHeaderValue(value));
+                                break;
+                            case DD_TAGS:
+                                propagationTags = propagationTagsFactory.fromHeaderValue(HeaderType.DATADOG, value);
+                                break;
+                            case OT_BAGGAGE:
+                                addBaggageItem(lowerCaseKey.substring(OT_BAGGAGE_PREFIX.length()), value);
+                                break;
+                            default:
+                        }
+                    }
+                } catch (RuntimeException e) {
+                    invalidateContext();
+                    log.debug("Exception when extracting context", e);
+                    return false;
+                }
+            } else {
+                handledIpHeaders(key, value);
+                if (handleTags(key, value)) {
+                    return true;
+                }
+                handleMappedBaggage(key, value);
+            }
+            return true;
+        }
+
+        @Override
+        protected TagContext build() {
+            restore128bTraceId();
+            return super.build();
+        }
+
+        private long extractEndToEndStartTime(String value) {
+            try {
+                return MILLISECONDS.toNanos(Long.parseLong(value));
+            } catch (RuntimeException e) {
+                log.debug("Ignoring invalid end-to-end start time {}", value, e);
+                return 0;
+            }
+        }
 
-    private void restore128bTraceId() {
-      long highOrderBits;
-      // Check if the low-order 64 bits of the TraceId, and propagation tags were parsed
-      if (traceId != DDTraceId.ZERO
-          && propagationTags != null
-          && (highOrderBits = propagationTags.getTraceIdHighOrderBits()) != 0) {
-        // Restore the 128-bit TraceId
-        traceId = DD128bTraceId.from(highOrderBits, traceId.toLong());
-      }
+        private void restore128bTraceId() {
+            long highOrderBits;
+            // Check if the low-order 64 bits of the TraceId, and propagation tags were parsed
+            if (traceId != DDTraceId.ZERO
+                    && propagationTags != null
+                    && (highOrderBits = propagationTags.getTraceIdHighOrderBits()) != 0) {
+                // Restore the 128-bit TraceId
+                traceId = DD128bTraceId.from(highOrderBits, traceId.toLong());
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ExtractedContext.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ExtractedContext.java
index af503e6a6ed..b536cc8c4c3 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ExtractedContext.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ExtractedContext.java
@@ -12,135 +12,116 @@
  * Propagated data resulting from calling tracer.extract with header data from an incoming request.
  */
 public class ExtractedContext extends TagContext {
-  private final DDTraceId traceId;
-  private final long endToEndStartTime;
-  private final PropagationTags propagationTags;
-  private long spanId;
+    private final DDTraceId traceId;
+    private final long endToEndStartTime;
+    private final PropagationTags propagationTags;
+    private long spanId;
 
-  public ExtractedContext(
-      final DDTraceId traceId,
-      final long spanId,
-      final int samplingPriority,
-      final CharSequence origin,
-      final PropagationTags propagationTags,
-      final TracePropagationStyle propagationStyle) {
-    this(
-        traceId,
-        spanId,
-        samplingPriority,
-        origin,
-        0,
-        null,
-        null,
-        null,
-        propagationTags,
-        null,
-        propagationStyle);
-  }
-
-  public ExtractedContext(
-      final DDTraceId traceId,
-      final long spanId,
-      final int samplingPriority,
-      final CharSequence origin,
-      final long endToEndStartTime,
-      final Map<String, String> baggage,
-      final TagMap tags,
-      final HttpHeaders httpHeaders,
-      final PropagationTags propagationTags,
-      final TraceConfig traceConfig,
-      final TracePropagationStyle propagationStyle) {
-    super(
-        origin,
-        tags,
-        httpHeaders,
-        baggage,
-        samplingPriority,
-        traceConfig,
-        propagationStyle,
-        DDTraceId.ZERO);
-    this.traceId = traceId;
-    this.spanId = spanId;
-    this.endToEndStartTime = endToEndStartTime;
-    this.propagationTags = propagationTags;
-  }
-
-  /*
-   * DQH - kept for testing purposes only
-   */
-  @Deprecated
-  public ExtractedContext(
-      final DDTraceId traceId,
-      final long spanId,
-      final int samplingPriority,
-      final CharSequence origin,
-      final long endToEndStartTime,
-      final Map<String, String> baggage,
-      final Map<String, Object> tags,
-      final HttpHeaders httpHeaders,
-      final PropagationTags propagationTags,
-      final TraceConfig traceConfig,
-      final TracePropagationStyle propagationStyle) {
-    this(
-        traceId,
-        spanId,
-        samplingPriority,
-        origin,
-        endToEndStartTime,
-        baggage,
-        tags == null ? null : TagMap.fromMap(tags),
-        httpHeaders,
-        propagationTags,
-        traceConfig,
-        propagationStyle);
-  }
-
-  @Override
-  public final DDTraceId getTraceId() {
-    return traceId;
-  }
-
-  @Override
-  public final long getSpanId() {
-    return spanId;
-  }
-
-  public final void overrideSpanId(final long spanId) {
-    this.spanId = spanId;
-  }
-
-  public final long getEndToEndStartTime() {
-    return endToEndStartTime;
-  }
+    public ExtractedContext(
+            final DDTraceId traceId,
+            final long spanId,
+            final int samplingPriority,
+            final CharSequence origin,
+            final PropagationTags propagationTags,
+            final TracePropagationStyle propagationStyle) {
+        this(traceId, spanId, samplingPriority, origin, 0, null, null, null, propagationTags, null, propagationStyle);
+    }
 
-  public PropagationTags getPropagationTags() {
-    return propagationTags;
-  }
+    public ExtractedContext(
+            final DDTraceId traceId,
+            final long spanId,
+            final int samplingPriority,
+            final CharSequence origin,
+            final long endToEndStartTime,
+            final Map<String, String> baggage,
+            final TagMap tags,
+            final HttpHeaders httpHeaders,
+            final PropagationTags propagationTags,
+            final TraceConfig traceConfig,
+            final TracePropagationStyle propagationStyle) {
+        super(origin, tags, httpHeaders, baggage, samplingPriority, traceConfig, propagationStyle, DDTraceId.ZERO);
+        this.traceId = traceId;
+        this.spanId = spanId;
+        this.endToEndStartTime = endToEndStartTime;
+        this.propagationTags = propagationTags;
+    }
 
-  @Override
-  public String toString() {
-    StringBuilder builder = new StringBuilder("ExtractedContext{");
-    if (traceId != null) {
-      builder.append("traceId=").append(traceId).append(", ");
+    /*
+     * DQH - kept for testing purposes only
+     */
+    @Deprecated
+    public ExtractedContext(
+            final DDTraceId traceId,
+            final long spanId,
+            final int samplingPriority,
+            final CharSequence origin,
+            final long endToEndStartTime,
+            final Map<String, String> baggage,
+            final Map<String, Object> tags,
+            final HttpHeaders httpHeaders,
+            final PropagationTags propagationTags,
+            final TraceConfig traceConfig,
+            final TracePropagationStyle propagationStyle) {
+        this(
+                traceId,
+                spanId,
+                samplingPriority,
+                origin,
+                endToEndStartTime,
+                baggage,
+                tags == null ? null : TagMap.fromMap(tags),
+                httpHeaders,
+                propagationTags,
+                traceConfig,
+                propagationStyle);
     }
-    if (spanId != 0) {
-      builder.append("spanId=").append(spanId).append(", ");
+
+    @Override
+    public final DDTraceId getTraceId() {
+        return traceId;
     }
-    if (endToEndStartTime != 0) {
-      builder.append("endToEndStartTime=").append(endToEndStartTime).append(", ");
+
+    @Override
+    public final long getSpanId() {
+        return spanId;
     }
-    if (getOrigin() != null) {
-      builder.append("origin=").append(getOrigin()).append(", ");
+
+    public final void overrideSpanId(final long spanId) {
+        this.spanId = spanId;
     }
-    if (getTags() != null) {
-      builder.append("tags=").append(getTags()).append(", ");
+
+    public final long getEndToEndStartTime() {
+        return endToEndStartTime;
     }
-    if (getBaggage() != null) {
-      builder.append("baggage=").append(getBaggage()).append(", ");
+
+    public PropagationTags getPropagationTags() {
+        return propagationTags;
     }
-    if (getSamplingPriority() != PrioritySampling.UNSET) {
-      builder.append("samplingPriority=").append(getSamplingPriority()).append(", ");
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder("ExtractedContext{");
+        if (traceId != null) {
+            builder.append("traceId=").append(traceId).append(", ");
+        }
+        if (spanId != 0) {
+            builder.append("spanId=").append(spanId).append(", ");
+        }
+        if (endToEndStartTime != 0) {
+            builder.append("endToEndStartTime=").append(endToEndStartTime).append(", ");
+        }
+        if (getOrigin() != null) {
+            builder.append("origin=").append(getOrigin()).append(", ");
+        }
+        if (getTags() != null) {
+            builder.append("tags=").append(getTags()).append(", ");
+        }
+        if (getBaggage() != null) {
+            builder.append("baggage=").append(getBaggage()).append(", ");
+        }
+        if (getSamplingPriority() != PrioritySampling.UNSET) {
+            builder.append("samplingPriority=").append(getSamplingPriority()).append(", ");
+        }
+        return builder.append('}').toString();
     }
-    return builder.append('}').toString();
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/HaystackHttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/HaystackHttpCodec.java
index bc3b7bc14f0..9cc1eef5253 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/HaystackHttpCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/HaystackHttpCodec.java
@@ -26,271 +26,261 @@
  */
 class HaystackHttpCodec {
 
-  private static final Logger log = LoggerFactory.getLogger(HaystackHttpCodec.class);
+    private static final Logger log = LoggerFactory.getLogger(HaystackHttpCodec.class);
 
-  // https://github.com/ExpediaDotCom/haystack-client-java/blob/master/core/src/main/java/com/expedia/www/haystack/client/propagation/DefaultKeyConvention.java
-  static final String OT_BAGGAGE_PREFIX = "Baggage-";
-  static final String TRACE_ID_KEY = "Trace-ID";
-  static final String SPAN_ID_KEY = "Span-ID";
-  static final String PARENT_ID_KEY = "Parent-ID";
+    // https://github.com/ExpediaDotCom/haystack-client-java/blob/master/core/src/main/java/com/expedia/www/haystack/client/propagation/DefaultKeyConvention.java
+    static final String OT_BAGGAGE_PREFIX = "Baggage-";
+    static final String TRACE_ID_KEY = "Trace-ID";
+    static final String SPAN_ID_KEY = "Span-ID";
+    static final String PARENT_ID_KEY = "Parent-ID";
 
-  static final String DD_TRACE_ID_BAGGAGE_KEY = OT_BAGGAGE_PREFIX + "Datadog-Trace-Id";
-  static final String DD_SPAN_ID_BAGGAGE_KEY = OT_BAGGAGE_PREFIX + "Datadog-Span-Id";
-  static final String DD_PARENT_ID_BAGGAGE_KEY = OT_BAGGAGE_PREFIX + "Datadog-Parent-Id";
+    static final String DD_TRACE_ID_BAGGAGE_KEY = OT_BAGGAGE_PREFIX + "Datadog-Trace-Id";
+    static final String DD_SPAN_ID_BAGGAGE_KEY = OT_BAGGAGE_PREFIX + "Datadog-Span-Id";
+    static final String DD_PARENT_ID_BAGGAGE_KEY = OT_BAGGAGE_PREFIX + "Datadog-Parent-Id";
 
-  static final String HAYSTACK_TRACE_ID_BAGGAGE_KEY = "Haystack-Trace-ID";
-  static final String HAYSTACK_SPAN_ID_BAGGAGE_KEY = "Haystack-Span-ID";
-  static final String HAYSTACK_PARENT_ID_BAGGAGE_KEY = "Haystack-Parent-ID";
+    static final String HAYSTACK_TRACE_ID_BAGGAGE_KEY = "Haystack-Trace-ID";
+    static final String HAYSTACK_SPAN_ID_BAGGAGE_KEY = "Haystack-Span-ID";
+    static final String HAYSTACK_PARENT_ID_BAGGAGE_KEY = "Haystack-Parent-ID";
 
-  // public static final long DATADOG = new BigInteger("Datadog!".getBytes()).longValue();
-  public static final String DATADOG = "44617461-646f-6721";
+    // public static final long DATADOG = new BigInteger("Datadog!".getBytes()).longValue();
+    public static final String DATADOG = "44617461-646f-6721";
 
-  private HaystackHttpCodec() {
-    // This class should not be created. This also makes code coverage checks happy.
-  }
-
-  public static HttpCodec.Injector newInjector(Map<String, String> invertedBaggageMapping) {
-    return new Injector(invertedBaggageMapping);
-  }
+    private HaystackHttpCodec() {
+        // This class should not be created. This also makes code coverage checks happy.
+    }
 
-  private static class Injector implements HttpCodec.Injector {
+    public static HttpCodec.Injector newInjector(Map<String, String> invertedBaggageMapping) {
+        return new Injector(invertedBaggageMapping);
+    }
 
-    private final Map<String, String> invertedBaggageMapping;
+    private static class Injector implements HttpCodec.Injector {
 
-    public Injector(Map<String, String> invertedBaggageMapping) {
-      this.invertedBaggageMapping = invertedBaggageMapping;
-    }
+        private final Map<String, String> invertedBaggageMapping;
 
-    @Override
-    public <C> void inject(
-        final DDSpanContext context, final C carrier, final CarrierSetter<C> setter) {
-      try {
-        // Given that Haystack uses a 128-bit UUID/GUID for all ID representations, need to convert
-        // from 64-bit BigInteger
-        //  also record the original DataDog IDs into Baggage payload
-        //
-        // If the original trace has originated within Haystack system and we have it saved in
-        // Baggage, and it is equal
-        //  to the converted value in BigInteger, use that instead.
-        //  this will preserve the complete UUID/GUID without losing the most significant bit part
-        String originalHaystackTraceId =
-            getBaggageItemIgnoreCase(context.getBaggageItems(), HAYSTACK_TRACE_ID_BAGGAGE_KEY);
-        String injectedTraceId;
-        if (originalHaystackTraceId != null
-            && DDTraceId.fromHex(convertUUIDToHexString(originalHaystackTraceId))
-                .equals(context.getTraceId())) {
-          injectedTraceId = originalHaystackTraceId;
-        } else {
-          injectedTraceId = convertLongToUUID(context.getTraceId().toLong());
+        public Injector(Map<String, String> invertedBaggageMapping) {
+            this.invertedBaggageMapping = invertedBaggageMapping;
         }
-        setter.set(carrier, TRACE_ID_KEY, injectedTraceId);
-        context.setTag(HAYSTACK_TRACE_ID_BAGGAGE_KEY, injectedTraceId);
-        setter.set(
-            carrier, DD_TRACE_ID_BAGGAGE_KEY, HttpCodec.encode(context.getTraceId().toString()));
-        setter.set(carrier, SPAN_ID_KEY, convertLongToUUID(context.getSpanId()));
-        setter.set(
-            carrier,
-            DD_SPAN_ID_BAGGAGE_KEY,
-            HttpCodec.encode(DDSpanId.toString(context.getSpanId())));
-        setter.set(carrier, PARENT_ID_KEY, convertLongToUUID(context.getParentId()));
-        setter.set(
-            carrier,
-            DD_PARENT_ID_BAGGAGE_KEY,
-            HttpCodec.encode(DDSpanId.toString(context.getParentId())));
 
-        for (final Map.Entry<String, String> entry : context.baggageItems()) {
-          String header = invertedBaggageMapping.get(entry.getKey());
-          header = header != null ? header : OT_BAGGAGE_PREFIX + entry.getKey();
-          setter.set(carrier, header, HttpCodec.encodeBaggage(entry.getValue()));
+        @Override
+        public <C> void inject(final DDSpanContext context, final C carrier, final CarrierSetter<C> setter) {
+            try {
+                // Given that Haystack uses a 128-bit UUID/GUID for all ID representations, need to convert
+                // from 64-bit BigInteger
+                //  also record the original DataDog IDs into Baggage payload
+                //
+                // If the original trace has originated within Haystack system and we have it saved in
+                // Baggage, and it is equal
+                //  to the converted value in BigInteger, use that instead.
+                //  this will preserve the complete UUID/GUID without losing the most significant bit part
+                String originalHaystackTraceId =
+                        getBaggageItemIgnoreCase(context.getBaggageItems(), HAYSTACK_TRACE_ID_BAGGAGE_KEY);
+                String injectedTraceId;
+                if (originalHaystackTraceId != null
+                        && DDTraceId.fromHex(convertUUIDToHexString(originalHaystackTraceId))
+                                .equals(context.getTraceId())) {
+                    injectedTraceId = originalHaystackTraceId;
+                } else {
+                    injectedTraceId = convertLongToUUID(context.getTraceId().toLong());
+                }
+                setter.set(carrier, TRACE_ID_KEY, injectedTraceId);
+                context.setTag(HAYSTACK_TRACE_ID_BAGGAGE_KEY, injectedTraceId);
+                setter.set(
+                        carrier,
+                        DD_TRACE_ID_BAGGAGE_KEY,
+                        HttpCodec.encode(context.getTraceId().toString()));
+                setter.set(carrier, SPAN_ID_KEY, convertLongToUUID(context.getSpanId()));
+                setter.set(carrier, DD_SPAN_ID_BAGGAGE_KEY, HttpCodec.encode(DDSpanId.toString(context.getSpanId())));
+                setter.set(carrier, PARENT_ID_KEY, convertLongToUUID(context.getParentId()));
+                setter.set(
+                        carrier, DD_PARENT_ID_BAGGAGE_KEY, HttpCodec.encode(DDSpanId.toString(context.getParentId())));
+
+                for (final Map.Entry<String, String> entry : context.baggageItems()) {
+                    String header = invertedBaggageMapping.get(entry.getKey());
+                    header = header != null ? header : OT_BAGGAGE_PREFIX + entry.getKey();
+                    setter.set(carrier, header, HttpCodec.encodeBaggage(entry.getValue()));
+                }
+                log.debug("{} - Haystack parent context injected - {}", context.getTraceId(), injectedTraceId);
+            } catch (final NumberFormatException e) {
+                log.debug("Cannot parse context id(s): {} {}", context.getTraceId(), context.getSpanId(), e);
+            }
         }
-        log.debug(
-            "{} - Haystack parent context injected - {}", context.getTraceId(), injectedTraceId);
-      } catch (final NumberFormatException e) {
-        log.debug(
-            "Cannot parse context id(s): {} {}", context.getTraceId(), context.getSpanId(), e);
-      }
-    }
 
-    private String getBaggageItemIgnoreCase(Map<String, String> baggage, String key) {
-      for (final Map.Entry<String, String> mapping : baggage.entrySet()) {
-        if (key.equalsIgnoreCase(mapping.getKey())) {
-          return mapping.getValue();
+        private String getBaggageItemIgnoreCase(Map<String, String> baggage, String key) {
+            for (final Map.Entry<String, String> mapping : baggage.entrySet()) {
+                if (key.equalsIgnoreCase(mapping.getKey())) {
+                    return mapping.getValue();
+                }
+            }
+            return null;
         }
-      }
-      return null;
     }
-  }
 
-  public static HttpCodec.Extractor newExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier) {
-    return new TagContextExtractor(
-        traceConfigSupplier, () -> new HaystackContextInterpreter(config));
-  }
+    public static HttpCodec.Extractor newExtractor(Config config, Supplier<TraceConfig> traceConfigSupplier) {
+        return new TagContextExtractor(traceConfigSupplier, () -> new HaystackContextInterpreter(config));
+    }
 
-  private static class HaystackContextInterpreter extends ContextInterpreter {
+    private static class HaystackContextInterpreter extends ContextInterpreter {
 
-    private static final String BAGGAGE_PREFIX_LC = "baggage-";
+        private static final String BAGGAGE_PREFIX_LC = "baggage-";
 
-    // Largest reserved value we accept. Only relevant for traceID/spanID
-    private static final int MAX_RESERVED_ID_LENGTH = 64;
+        // Largest reserved value we accept. Only relevant for traceID/spanID
+        private static final int MAX_RESERVED_ID_LENGTH = 64;
 
-    private static final int TRACE_ID = 0;
-    private static final int SPAN_ID = 1;
-    private static final int PARENT_ID = 2;
-    private static final int BAGGAGE = 3;
-    private static final int IGNORE = -1;
+        private static final int TRACE_ID = 0;
+        private static final int SPAN_ID = 1;
+        private static final int PARENT_ID = 2;
+        private static final int BAGGAGE = 3;
+        private static final int IGNORE = -1;
 
-    private HaystackContextInterpreter(Config config) {
-      super(config);
-    }
+        private HaystackContextInterpreter(Config config) {
+            super(config);
+        }
 
-    @Override
-    public TracePropagationStyle style() {
-      return HAYSTACK;
-    }
+        @Override
+        public TracePropagationStyle style() {
+            return HAYSTACK;
+        }
 
-    @Override
-    public boolean accept(String key, String value) {
-      if (null == key || key.isEmpty()) {
-        return true;
-      }
-      if (LOG_EXTRACT_HEADER_NAMES) {
-        log.debug("Header: {}", key);
-      }
-      char first = Character.toLowerCase(key.charAt(0));
-      String lowerCaseKey = null;
-      int classification = IGNORE;
-      switch (first) {
-        case 't':
-          if (TRACE_ID_KEY.equalsIgnoreCase(key)) {
-            classification = TRACE_ID;
-          }
-          break;
-        case 's':
-          if (SPAN_ID_KEY.equalsIgnoreCase(key)) {
-            classification = SPAN_ID;
-          }
-          break;
-        case 'p':
-          if (PARENT_ID_KEY.equalsIgnoreCase(key)) {
-            classification = PARENT_ID;
-          }
-          break;
-        case 'x':
-          handledXForwarding(key, value);
-          break;
-        case 'f':
-          handledForwarding(key, value);
-          break;
-        case 'b':
-          lowerCaseKey = toLowerCase(key);
-          if (lowerCaseKey.startsWith(BAGGAGE_PREFIX_LC)) {
-            classification = BAGGAGE;
-          }
-          break;
-        case 'u':
-          handledUserAgent(key, value);
-          break;
-        default:
-      }
+        @Override
+        public boolean accept(String key, String value) {
+            if (null == key || key.isEmpty()) {
+                return true;
+            }
+            if (LOG_EXTRACT_HEADER_NAMES) {
+                log.debug("Header: {}", key);
+            }
+            char first = Character.toLowerCase(key.charAt(0));
+            String lowerCaseKey = null;
+            int classification = IGNORE;
+            switch (first) {
+                case 't':
+                    if (TRACE_ID_KEY.equalsIgnoreCase(key)) {
+                        classification = TRACE_ID;
+                    }
+                    break;
+                case 's':
+                    if (SPAN_ID_KEY.equalsIgnoreCase(key)) {
+                        classification = SPAN_ID;
+                    }
+                    break;
+                case 'p':
+                    if (PARENT_ID_KEY.equalsIgnoreCase(key)) {
+                        classification = PARENT_ID;
+                    }
+                    break;
+                case 'x':
+                    handledXForwarding(key, value);
+                    break;
+                case 'f':
+                    handledForwarding(key, value);
+                    break;
+                case 'b':
+                    lowerCaseKey = toLowerCase(key);
+                    if (lowerCaseKey.startsWith(BAGGAGE_PREFIX_LC)) {
+                        classification = BAGGAGE;
+                    }
+                    break;
+                case 'u':
+                    handledUserAgent(key, value);
+                    break;
+                default:
+            }
 
-      if (IGNORE != classification) {
-        try {
-          String firstValue = firstHeaderValue(value);
-          if (null != firstValue) {
-            switch (classification) {
-              case TRACE_ID:
-                traceId = DD64bTraceId.fromHex(convertUUIDToHexString(firstValue));
-                addReservedBaggageItem(HAYSTACK_TRACE_ID_BAGGAGE_KEY, firstValue);
-                break;
-              case SPAN_ID:
-                spanId = DDSpanId.fromHex(convertUUIDToHexString(firstValue));
-                addReservedBaggageItem(HAYSTACK_SPAN_ID_BAGGAGE_KEY, firstValue);
-                break;
-              case PARENT_ID:
-                addBaggageItem(HAYSTACK_PARENT_ID_BAGGAGE_KEY, firstValue);
-                break;
-              case BAGGAGE:
-                {
-                  addBaggageItem(lowerCaseKey.substring(BAGGAGE_PREFIX_LC.length()), value);
-                  break;
+            if (IGNORE != classification) {
+                try {
+                    String firstValue = firstHeaderValue(value);
+                    if (null != firstValue) {
+                        switch (classification) {
+                            case TRACE_ID:
+                                traceId = DD64bTraceId.fromHex(convertUUIDToHexString(firstValue));
+                                addReservedBaggageItem(HAYSTACK_TRACE_ID_BAGGAGE_KEY, firstValue);
+                                break;
+                            case SPAN_ID:
+                                spanId = DDSpanId.fromHex(convertUUIDToHexString(firstValue));
+                                addReservedBaggageItem(HAYSTACK_SPAN_ID_BAGGAGE_KEY, firstValue);
+                                break;
+                            case PARENT_ID:
+                                addBaggageItem(HAYSTACK_PARENT_ID_BAGGAGE_KEY, firstValue);
+                                break;
+                            case BAGGAGE: {
+                                addBaggageItem(lowerCaseKey.substring(BAGGAGE_PREFIX_LC.length()), value);
+                                break;
+                            }
+                            default:
+                        }
+                    }
+                } catch (RuntimeException e) {
+                    invalidateContext();
+                    log.debug("Exception when extracting context", e);
+                    return false;
                 }
-              default:
+            } else {
+                handledIpHeaders(key, value);
+                if (handleTags(key, value)) {
+                    return true;
+                }
+                handleMappedBaggage(key, value);
             }
-          }
-        } catch (RuntimeException e) {
-          invalidateContext();
-          log.debug("Exception when extracting context", e);
-          return false;
+            return true;
         }
-      } else {
-        handledIpHeaders(key, value);
-        if (handleTags(key, value)) {
-          return true;
+
+        /**
+         * Records the value of a reserved key, e.g. traceID/spanID. Ignores baggage item and byte
+         * limits to ensure propagation of key headers. However, if the header exceeds
+         * MAX_RESERVED_ID_LENGTH, value is rejected.
+         *
+         * @param key the reserved baggage key.
+         * @param value the id as it arrived, ignored when longer than {@link #MAX_RESERVED_ID_LENGTH}.
+         */
+        private void addReservedBaggageItem(String key, String value) {
+            if (value == null || value.length() > MAX_RESERVED_ID_LENGTH) {
+                return;
+            }
+            if (baggage.isEmpty()) {
+                baggage = new TreeMap<>();
+            }
+            baggage.put(key, HttpCodec.decode(value));
         }
-        handleMappedBaggage(key, value);
-      }
-      return true;
-    }
 
-    /**
-     * Records the value of a reserved key, e.g. traceID/spanID. Ignores baggage item and byte
-     * limits to ensure propagation of key headers. However, if the header exceeds
-     * MAX_RESERVED_ID_LENGTH, value is rejected.
-     *
-     * @param key the reserved baggage key.
-     * @param value the id as it arrived, ignored when longer than {@link #MAX_RESERVED_ID_LENGTH}.
-     */
-    private void addReservedBaggageItem(String key, String value) {
-      if (value == null || value.length() > MAX_RESERVED_ID_LENGTH) {
-        return;
-      }
-      if (baggage.isEmpty()) {
-        baggage = new TreeMap<>();
-      }
-      baggage.put(key, HttpCodec.decode(value));
+        @Override
+        protected int defaultSamplingPriority() {
+            return PrioritySampling.SAMPLER_KEEP;
+        }
     }
 
-    @Override
-    protected int defaultSamplingPriority() {
-      return PrioritySampling.SAMPLER_KEEP;
+    private static String convertLongToUUID(long id) {
+        // This is not a true/real UUID, as we don't care about the version and variant markers
+        //  the creation is just taking the least significant bits and doing static most significant
+        // ones.
+        //  this is done for the purpose of being able to maintain cardinality and idempotence of the
+        // conversion
+        String idHex = String.format("%016x", id);
+        return DATADOG + "-" + idHex.substring(0, 4) + "-" + idHex.substring(4);
     }
-  }
 
-  private static String convertLongToUUID(long id) {
-    // This is not a true/real UUID, as we don't care about the version and variant markers
-    //  the creation is just taking the least significant bits and doing static most significant
-    // ones.
-    //  this is done for the purpose of being able to maintain cardinality and idempotence of the
-    // conversion
-    String idHex = String.format("%016x", id);
-    return DATADOG + "-" + idHex.substring(0, 4) + "-" + idHex.substring(4);
-  }
-
-  @SuppressForbidden
-  private static String convertUUIDToHexString(String value) {
-    try {
-      if (value.contains("-")) {
-        String[] strings = value.split("-");
-        // We are only interested in the least significant bit component, dropping the most
-        // significant one.
-        if (strings.length == 5) {
-          String idHex = strings[3] + strings[4];
-          return idHex;
-        }
-        throw new NumberFormatException("Invalid UUID format: " + value);
-      } else {
-        // This could be a regular hex id without separators
-        int length = value.length();
-        if (length == 32) {
-          return value.substring(16);
-        } else {
-          return value;
+    @SuppressForbidden
+    private static String convertUUIDToHexString(String value) {
+        try {
+            if (value.contains("-")) {
+                String[] strings = value.split("-");
+                // We are only interested in the least significant bit component, dropping the most
+                // significant one.
+                if (strings.length == 5) {
+                    String idHex = strings[3] + strings[4];
+                    return idHex;
+                }
+                throw new NumberFormatException("Invalid UUID format: " + value);
+            } else {
+                // This could be a regular hex id without separators
+                int length = value.length();
+                if (length == 32) {
+                    return value.substring(16);
+                } else {
+                    return value;
+                }
+            }
+        } catch (final Exception e) {
+            throw new IllegalArgumentException("Exception when converting UUID to BigInteger: " + value, e);
         }
-      }
-    } catch (final Exception e) {
-      throw new IllegalArgumentException(
-          "Exception when converting UUID to BigInteger: " + value, e);
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java
index 61e9a8f105e..2650137af64 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java
@@ -32,383 +32,371 @@
 
 public class HttpCodec {
 
-  private static final Logger log = LoggerFactory.getLogger(HttpCodec.class);
-  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Forwarded
-  static final String FORWARDED_KEY = "forwarded";
-  static final String FORWARDED_FOR_KEY = "forwarded-for";
-  static final String X_FORWARDED_PROTO_KEY = "x-forwarded-proto";
-  static final String X_FORWARDED_HOST_KEY = "x-forwarded-host";
-  static final String X_FORWARDED_FOR_KEY = "x-forwarded-for";
-  static final String X_FORWARDED_PORT_KEY = "x-forwarded-port";
-
-  // other headers which may contain real ip
-  static final String X_CLIENT_IP_KEY = "x-client-ip";
-  static final String TRUE_CLIENT_IP_KEY = "true-client-ip";
-  static final String X_CLUSTER_CLIENT_IP_KEY = "x-cluster-client-ip";
-  static final String X_REAL_IP_KEY = "x-real-ip";
-  static final String USER_AGENT_KEY = "user-agent";
-  static final String FASTLY_CLIENT_IP_KEY = "fastly-client-ip";
-  static final String CF_CONNECTING_IP_KEY = "cf-connecting-ip";
-  static final String CF_CONNECTING_IP_V6_KEY = "cf-connecting-ipv6";
-
-  public interface Injector {
-    <C> void inject(final DDSpanContext context, final C carrier, final CarrierSetter<C> setter);
-  }
-
-  /** This interface defines propagated context extractor. */
-  public interface Extractor {
-    /**
-     * Extracts a propagated context from the given carrier using the provided getter.
-     *
-     * @param carrier The carrier containing the propagated context.
-     * @param getter The getter used to extract data from the carrier.
-     * @param <C> The type of the carrier.
-     * @return {@code null} for failed context extraction, a {@link TagContext} instance for partial
-     *     context extraction or an {@link ExtractedContext} for complete context extraction.
-     */
-    <C> TagContext extract(final C carrier, final AgentPropagation.ContextVisitor<C> getter);
-
-    /**
-     * Cleans up any thread local resources associated with this extractor.
-     *
-     * <p>Implementations should override this method if they need to clean up any resources.
-     *
-     * <p><i>Currently only used from tests.</i>
-     */
-    default void cleanup() {}
-  }
-
-  public static Injector createInjector(
-      Config config,
-      Set<TracePropagationStyle> styles,
-      Map<String, String> invertedBaggageMapping) {
-    ArrayList<Injector> injectors =
-        new ArrayList<>(createInjectors(config, styles, invertedBaggageMapping).values());
-    return new CompoundInjector(injectors);
-  }
-
-  public static Map<TracePropagationStyle, Injector> allInjectorsFor(
-      Config config, Map<String, String> reverseBaggageMapping) {
-    return createInjectors(
-        config, EnumSet.allOf(TracePropagationStyle.class), reverseBaggageMapping);
-  }
-
-  private static Map<TracePropagationStyle, Injector> createInjectors(
-      Config config,
-      Set<TracePropagationStyle> propagationStyles,
-      Map<String, String> reverseBaggageMapping) {
-    EnumMap<TracePropagationStyle, Injector> result = new EnumMap<>(TracePropagationStyle.class);
-    for (TracePropagationStyle style : propagationStyles) {
-      switch (style) {
-        case DATADOG:
-          result.put(style, DatadogHttpCodec.newInjector(reverseBaggageMapping));
-          break;
-        case B3SINGLE:
-          result.put(
-              style,
-              B3HttpCodec.newSingleInjector(config.isTracePropagationStyleB3PaddingEnabled()));
-          break;
-        case B3MULTI:
-          result.put(
-              style,
-              B3HttpCodec.newMultiInjector(config.isTracePropagationStyleB3PaddingEnabled()));
-          break;
-        case HAYSTACK:
-          result.put(style, HaystackHttpCodec.newInjector(reverseBaggageMapping));
-          break;
-        case XRAY:
-          result.put(style, XRayHttpCodec.newInjector(reverseBaggageMapping));
-          break;
-        case NONE:
-          result.put(style, NoneCodec.INJECTOR);
-          break;
-        case TRACECONTEXT:
-          result.put(style, W3CHttpCodec.newInjector(reverseBaggageMapping));
-          break;
-        case BAGGAGE:
-          break;
-        default:
-          log.debug("No implementation found to inject propagation style: {}", style);
-          break;
-      }
+    private static final Logger log = LoggerFactory.getLogger(HttpCodec.class);
+    // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Forwarded
+    static final String FORWARDED_KEY = "forwarded";
+    static final String FORWARDED_FOR_KEY = "forwarded-for";
+    static final String X_FORWARDED_PROTO_KEY = "x-forwarded-proto";
+    static final String X_FORWARDED_HOST_KEY = "x-forwarded-host";
+    static final String X_FORWARDED_FOR_KEY = "x-forwarded-for";
+    static final String X_FORWARDED_PORT_KEY = "x-forwarded-port";
+
+    // other headers which may contain real ip
+    static final String X_CLIENT_IP_KEY = "x-client-ip";
+    static final String TRUE_CLIENT_IP_KEY = "true-client-ip";
+    static final String X_CLUSTER_CLIENT_IP_KEY = "x-cluster-client-ip";
+    static final String X_REAL_IP_KEY = "x-real-ip";
+    static final String USER_AGENT_KEY = "user-agent";
+    static final String FASTLY_CLIENT_IP_KEY = "fastly-client-ip";
+    static final String CF_CONNECTING_IP_KEY = "cf-connecting-ip";
+    static final String CF_CONNECTING_IP_V6_KEY = "cf-connecting-ipv6";
+
+    public interface Injector {
+        <C> void inject(final DDSpanContext context, final C carrier, final CarrierSetter<C> setter);
     }
-    return result;
-  }
-
-  public static Extractor createExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier) {
-    final List<Extractor> extractors = new ArrayList<>();
-    for (final TracePropagationStyle style : config.getTracePropagationStylesToExtract()) {
-      switch (style) {
-        case DATADOG:
-          extractors.add(DatadogHttpCodec.newExtractor(config, traceConfigSupplier));
-          break;
-        case B3SINGLE:
-          extractors.add(B3HttpCodec.newSingleExtractor(config, traceConfigSupplier));
-          break;
-        case B3MULTI:
-          extractors.add(B3HttpCodec.newMultiExtractor(config, traceConfigSupplier));
-          break;
-        case HAYSTACK:
-          extractors.add(HaystackHttpCodec.newExtractor(config, traceConfigSupplier));
-          break;
-        case XRAY:
-          extractors.add(XRayHttpCodec.newExtractor(config, traceConfigSupplier));
-          break;
-        case NONE:
-          extractors.add(NoneCodec.newExtractor(config, traceConfigSupplier));
-          break;
-        case TRACECONTEXT:
-          extractors.add(W3CHttpCodec.newExtractor(config, traceConfigSupplier));
-          break;
-        case BAGGAGE:
-          break;
-        default:
-          log.debug("No implementation found to extract propagation style: {}", style);
-          break;
-      }
-    }
-    switch (extractors.size()) {
-      case 0:
-        return StubExtractor.INSTANCE;
-      case 1:
-        return extractors.get(0);
-      default:
-        return new CompoundExtractor(extractors, config.isTracePropagationExtractFirst());
+
+    /** This interface defines propagated context extractor. */
+    public interface Extractor {
+        /**
+         * Extracts a propagated context from the given carrier using the provided getter.
+         *
+         * @param carrier The carrier containing the propagated context.
+         * @param getter The getter used to extract data from the carrier.
+         * @param <C> The type of the carrier.
+         * @return {@code null} for failed context extraction, a {@link TagContext} instance for partial
+         *     context extraction or an {@link ExtractedContext} for complete context extraction.
+         */
+        <C> TagContext extract(final C carrier, final AgentPropagation.ContextVisitor<C> getter);
+
+        /**
+         * Cleans up any thread local resources associated with this extractor.
+         *
+         * <p>Implementations should override this method if they need to clean up any resources.
+         *
+         * <p><i>Currently only used from tests.</i>
+         */
+        default void cleanup() {}
     }
-  }
 
-  public static class CompoundInjector implements Injector {
+    public static Injector createInjector(
+            Config config, Set<TracePropagationStyle> styles, Map<String, String> invertedBaggageMapping) {
+        ArrayList<Injector> injectors = new ArrayList<>(
+                createInjectors(config, styles, invertedBaggageMapping).values());
+        return new CompoundInjector(injectors);
+    }
 
-    private final List<Injector> injectors;
+    public static Map<TracePropagationStyle, Injector> allInjectorsFor(
+            Config config, Map<String, String> reverseBaggageMapping) {
+        return createInjectors(config, EnumSet.allOf(TracePropagationStyle.class), reverseBaggageMapping);
+    }
 
-    public CompoundInjector(final List<Injector> injectors) {
-      this.injectors = injectors;
+    private static Map<TracePropagationStyle, Injector> createInjectors(
+            Config config, Set<TracePropagationStyle> propagationStyles, Map<String, String> reverseBaggageMapping) {
+        EnumMap<TracePropagationStyle, Injector> result = new EnumMap<>(TracePropagationStyle.class);
+        for (TracePropagationStyle style : propagationStyles) {
+            switch (style) {
+                case DATADOG:
+                    result.put(style, DatadogHttpCodec.newInjector(reverseBaggageMapping));
+                    break;
+                case B3SINGLE:
+                    result.put(style, B3HttpCodec.newSingleInjector(config.isTracePropagationStyleB3PaddingEnabled()));
+                    break;
+                case B3MULTI:
+                    result.put(style, B3HttpCodec.newMultiInjector(config.isTracePropagationStyleB3PaddingEnabled()));
+                    break;
+                case HAYSTACK:
+                    result.put(style, HaystackHttpCodec.newInjector(reverseBaggageMapping));
+                    break;
+                case XRAY:
+                    result.put(style, XRayHttpCodec.newInjector(reverseBaggageMapping));
+                    break;
+                case NONE:
+                    result.put(style, NoneCodec.INJECTOR);
+                    break;
+                case TRACECONTEXT:
+                    result.put(style, W3CHttpCodec.newInjector(reverseBaggageMapping));
+                    break;
+                case BAGGAGE:
+                    break;
+                default:
+                    log.debug("No implementation found to inject propagation style: {}", style);
+                    break;
+            }
+        }
+        return result;
     }
 
-    @Override
-    public <C> void inject(
-        final DDSpanContext context, final C carrier, final CarrierSetter<C> setter) {
-      log.debug("Inject context {}", context);
-      for (final Injector injector : injectors) {
-        injector.inject(context, carrier, setter);
-      }
+    public static Extractor createExtractor(Config config, Supplier<TraceConfig> traceConfigSupplier) {
+        final List<Extractor> extractors = new ArrayList<>();
+        for (final TracePropagationStyle style : config.getTracePropagationStylesToExtract()) {
+            switch (style) {
+                case DATADOG:
+                    extractors.add(DatadogHttpCodec.newExtractor(config, traceConfigSupplier));
+                    break;
+                case B3SINGLE:
+                    extractors.add(B3HttpCodec.newSingleExtractor(config, traceConfigSupplier));
+                    break;
+                case B3MULTI:
+                    extractors.add(B3HttpCodec.newMultiExtractor(config, traceConfigSupplier));
+                    break;
+                case HAYSTACK:
+                    extractors.add(HaystackHttpCodec.newExtractor(config, traceConfigSupplier));
+                    break;
+                case XRAY:
+                    extractors.add(XRayHttpCodec.newExtractor(config, traceConfigSupplier));
+                    break;
+                case NONE:
+                    extractors.add(NoneCodec.newExtractor(config, traceConfigSupplier));
+                    break;
+                case TRACECONTEXT:
+                    extractors.add(W3CHttpCodec.newExtractor(config, traceConfigSupplier));
+                    break;
+                case BAGGAGE:
+                    break;
+                default:
+                    log.debug("No implementation found to extract propagation style: {}", style);
+                    break;
+            }
+        }
+        switch (extractors.size()) {
+            case 0:
+                return StubExtractor.INSTANCE;
+            case 1:
+                return extractors.get(0);
+            default:
+                return new CompoundExtractor(extractors, config.isTracePropagationExtractFirst());
+        }
     }
-  }
 
-  private static class StubExtractor implements Extractor {
-    private static final StubExtractor INSTANCE = new StubExtractor();
+    public static class CompoundInjector implements Injector {
 
-    @Override
-    public <C> TagContext extract(C carrier, AgentPropagation.ContextVisitor<C> getter) {
-      return null;
+        private final List<Injector> injectors;
+
+        public CompoundInjector(final List<Injector> injectors) {
+            this.injectors = injectors;
+        }
+
+        @Override
+        public <C> void inject(final DDSpanContext context, final C carrier, final CarrierSetter<C> setter) {
+            log.debug("Inject context {}", context);
+            for (final Injector injector : injectors) {
+                injector.inject(context, carrier, setter);
+            }
+        }
     }
-  }
 
-  public static class CompoundExtractor implements Extractor {
-    private final List<Extractor> extractors;
-    private final boolean extractFirst;
+    private static class StubExtractor implements Extractor {
+        private static final StubExtractor INSTANCE = new StubExtractor();
 
-    public CompoundExtractor(final List<Extractor> extractors, boolean extractFirst) {
-      this.extractors = extractors;
-      this.extractFirst = extractFirst;
+        @Override
+        public <C> TagContext extract(C carrier, AgentPropagation.ContextVisitor<C> getter) {
+            return null;
+        }
     }
 
-    @Override
-    public <C> TagContext extract(
-        final C carrier, final AgentPropagation.ContextVisitor<C> getter) {
-      ExtractedContext context = null;
-      TagContext partialContext = null;
-      // Extract and cache all headers in advance
-      ExtractionCache<C> extractionCache = new ExtractionCache<>(carrier, getter);
-
-      for (final Extractor extractor : this.extractors) {
-        TagContext extracted = extractor.extract(extractionCache, extractionCache);
-        // Check if context is valid
-        if (extracted instanceof ExtractedContext) {
-          ExtractedContext extractedContext = (ExtractedContext) extracted;
-          // If no prior valid context, store it as first valid context
-          if (context == null) {
-            context = extractedContext;
-            // Stop extraction if only extracting first valid context and drop everything else
-            if (this.extractFirst) {
-              break;
+    public static class CompoundExtractor implements Extractor {
+        private final List<Extractor> extractors;
+        private final boolean extractFirst;
+
+        public CompoundExtractor(final List<Extractor> extractors, boolean extractFirst) {
+            this.extractors = extractors;
+            this.extractFirst = extractFirst;
+        }
+
+        @Override
+        public <C> TagContext extract(final C carrier, final AgentPropagation.ContextVisitor<C> getter) {
+            ExtractedContext context = null;
+            TagContext partialContext = null;
+            // Extract and cache all headers in advance
+            ExtractionCache<C> extractionCache = new ExtractionCache<>(carrier, getter);
+
+            for (final Extractor extractor : this.extractors) {
+                TagContext extracted = extractor.extract(extractionCache, extractionCache);
+                // Check if context is valid
+                if (extracted instanceof ExtractedContext) {
+                    ExtractedContext extractedContext = (ExtractedContext) extracted;
+                    // If no prior valid context, store it as first valid context
+                    if (context == null) {
+                        context = extractedContext;
+                        // Stop extraction if only extracting first valid context and drop everything else
+                        if (this.extractFirst) {
+                            break;
+                        }
+                    }
+                    // If another valid context is extracted
+                    else {
+                        if (traceIdMatch(context.getTraceId(), extractedContext.getTraceId())) {
+                            boolean comingFromTraceContext = extracted.getPropagationStyle() == TRACECONTEXT;
+                            if (comingFromTraceContext) {
+                                applyTraceContextToFirstContext(context, extractedContext, extractionCache);
+                            }
+                        } else {
+                            // Terminate extracted context and add it as span link
+                            context.addTerminatedSpanLink(DDSpanLink.from(
+                                    (ExtractedContext) extracted,
+                                    SpanAttributes.builder()
+                                            .put("reason", "terminated_context")
+                                            .put(
+                                                    "context_headers",
+                                                    extracted
+                                                            .getPropagationStyle()
+                                                            .toString())
+                                            .build()));
+                            // TODO Note: Other vendor tracestate will be lost here
+                        }
+                    }
+                }
+                // Check if context is at least partial to keep it as first valid partial context found
+                else if (extracted != null && partialContext == null) {
+                    partialContext = extracted;
+                }
             }
-          }
-          // If another valid context is extracted
-          else {
-            if (traceIdMatch(context.getTraceId(), extractedContext.getTraceId())) {
-              boolean comingFromTraceContext = extracted.getPropagationStyle() == TRACECONTEXT;
-              if (comingFromTraceContext) {
-                applyTraceContextToFirstContext(context, extractedContext, extractionCache);
-              }
+
+            if (context != null) {
+                log.debug("Extract complete context {}", context);
+                return context;
+            } else if (partialContext != null) {
+                log.debug("Extract incomplete context {}", partialContext);
+                return partialContext;
             } else {
-              // Terminate extracted context and add it as span link
-              context.addTerminatedSpanLink(
-                  DDSpanLink.from(
-                      (ExtractedContext) extracted,
-                      SpanAttributes.builder()
-                          .put("reason", "terminated_context")
-                          .put("context_headers", extracted.getPropagationStyle().toString())
-                          .build()));
-              // TODO Note: Other vendor tracestate will be lost here
+                log.debug("Extract no context");
+                return null;
             }
-          }
         }
-        // Check if context is at least partial to keep it as first valid partial context found
-        else if (extracted != null && partialContext == null) {
-          partialContext = extracted;
+
+        /**
+         * Applies span ID from W3C trace context over any other valid context previously found.
+         *
+         * @param firstContext The first valid context found.
+         * @param traceContext The trace context to apply.
+         * @param extractionCache The extraction cache to get quick access to any extra information.
+         * @param <C> The carrier type.
+         */
+        private <C> void applyTraceContextToFirstContext(
+                ExtractedContext firstContext, ExtractedContext traceContext, ExtractionCache<C> extractionCache) {
+            // Propagate newly extracted W3C tracestate to first valid context
+            firstContext.getPropagationTags().updateW3CTracestateFrom(traceContext.getPropagationTags());
+            // Check if parent spans differ to reconcile them
+            if (firstContext.getSpanId() != traceContext.getSpanId()) {
+                // Override parent span id with W3C one
+                firstContext.overrideSpanId(traceContext.getSpanId());
+                // Add last parent ID as a span tag (check W3C first, else Datadog)
+                CharSequence lastParentId = traceContext.getPropagationTags().getLastParentId();
+                if (lastParentId == null) {
+                    lastParentId = extractionCache.getDatadogSpanIdHex();
+                }
+                if (lastParentId != null) {
+                    firstContext.putTag(PARENT_ID, lastParentId.toString());
+                }
+            }
         }
-      }
-
-      if (context != null) {
-        log.debug("Extract complete context {}", context);
-        return context;
-      } else if (partialContext != null) {
-        log.debug("Extract incomplete context {}", partialContext);
-        return partialContext;
-      } else {
-        log.debug("Extract no context");
-        return null;
-      }
     }
 
-    /**
-     * Applies span ID from W3C trace context over any other valid context previously found.
-     *
-     * @param firstContext The first valid context found.
-     * @param traceContext The trace context to apply.
-     * @param extractionCache The extraction cache to get quick access to any extra information.
-     * @param <C> The carrier type.
-     */
-    private <C> void applyTraceContextToFirstContext(
-        ExtractedContext firstContext,
-        ExtractedContext traceContext,
-        ExtractionCache<C> extractionCache) {
-      // Propagate newly extracted W3C tracestate to first valid context
-      firstContext.getPropagationTags().updateW3CTracestateFrom(traceContext.getPropagationTags());
-      // Check if parent spans differ to reconcile them
-      if (firstContext.getSpanId() != traceContext.getSpanId()) {
-        // Override parent span id with W3C one
-        firstContext.overrideSpanId(traceContext.getSpanId());
-        // Add last parent ID as a span tag (check W3C first, else Datadog)
-        CharSequence lastParentId = traceContext.getPropagationTags().getLastParentId();
-        if (lastParentId == null) {
-          lastParentId = extractionCache.getDatadogSpanIdHex();
+    private static class ExtractionCache<C>
+            implements AgentPropagation.KeyClassifier, AgentPropagation.ContextVisitor<ExtractionCache<?>> {
+        /** Cached context key-values (even indexes are header names, odd indexes are header values). */
+        private final List<String> keysAndValues;
+
+        /**
+         * The parent span identifier from {@link DatadogHttpCodec#SPAN_ID_KEY} header formatted as 16
+         * hexadecimal characters, {@code null} if absent or invalid.
+         */
+        private String datadogSpanIdHex;
+
+        public ExtractionCache(C carrier, AgentPropagation.ContextVisitor<C> getter) {
+            this.keysAndValues = new ArrayList<>(32);
+            getter.forEachKey(carrier, this);
         }
-        if (lastParentId != null) {
-          firstContext.putTag(PARENT_ID, lastParentId.toString());
+
+        @Override
+        public boolean accept(String key, String value) {
+            this.keysAndValues.add(key);
+            this.keysAndValues.add(value);
+            cacheDatadogSpanId(key, value);
+            return true;
         }
-      }
-    }
-  }
 
-  private static class ExtractionCache<C>
-      implements AgentPropagation.KeyClassifier,
-          AgentPropagation.ContextVisitor<ExtractionCache<?>> {
-    /** Cached context key-values (even indexes are header names, odd indexes are header values). */
-    private final List<String> keysAndValues;
+        private void cacheDatadogSpanId(String key, String value) {
+            if (SPAN_ID_KEY.equalsIgnoreCase(key)) {
+                try {
+                    // Parse numeric header value to format it as 16 hexadecimal character format
+                    this.datadogSpanIdHex = DDSpanId.toHexStringPadded(DDSpanId.from(value));
+                } catch (NumberFormatException ignored) {
+                }
+            }
+        }
 
-    /**
-     * The parent span identifier from {@link DatadogHttpCodec#SPAN_ID_KEY} header formatted as 16
-     * hexadecimal characters, {@code null} if absent or invalid.
-     */
-    private String datadogSpanIdHex;
+        private String getDatadogSpanIdHex() {
+            return this.datadogSpanIdHex;
+        }
 
-    public ExtractionCache(C carrier, AgentPropagation.ContextVisitor<C> getter) {
-      this.keysAndValues = new ArrayList<>(32);
-      getter.forEachKey(carrier, this);
+        @Override
+        public void forEachKey(ExtractionCache<?> carrier, AgentPropagation.KeyClassifier classifier) {
+            List<String> keysAndValues = carrier.keysAndValues;
+            for (int i = 0; i < keysAndValues.size(); i += 2) {
+                classifier.accept(keysAndValues.get(i), keysAndValues.get(i + 1));
+            }
+        }
     }
 
-    @Override
-    public boolean accept(String key, String value) {
-      this.keysAndValues.add(key);
-      this.keysAndValues.add(value);
-      cacheDatadogSpanId(key, value);
-      return true;
+    /**
+     * Checks if trace identifier matches, even if they are not encoded using the same size (64-bit vs
+     * 128-bit).
+     *
+     * @param a A trace identifier to check.
+     * @param b Another trace identifier to check.
+     * @return {@code true} if the trace identifiers matches, {@code false} otherwise.
+     */
+    private static boolean traceIdMatch(DDTraceId a, DDTraceId b) {
+        if (a instanceof DD128bTraceId && b instanceof DD128bTraceId
+                || a instanceof DD64bTraceId && b instanceof DD64bTraceId) {
+            return a.equals(b);
+        } else {
+            return a.toLong() == b.toLong();
+        }
     }
 
-    private void cacheDatadogSpanId(String key, String value) {
-      if (SPAN_ID_KEY.equalsIgnoreCase(key)) {
+    /** URL encode value */
+    static String encode(final String value) {
+        String encoded = value;
         try {
-          // Parse numeric header value to format it as 16 hexadecimal character format
-          this.datadogSpanIdHex = DDSpanId.toHexStringPadded(DDSpanId.from(value));
-        } catch (NumberFormatException ignored) {
+            encoded = URLEncoder.encode(value, "UTF-8");
+        } catch (final UnsupportedEncodingException e) {
+            log.debug("Failed to encode value - {}", value);
         }
-      }
+        return encoded;
     }
 
-    private String getDatadogSpanIdHex() {
-      return this.datadogSpanIdHex;
+    /**
+     * Encodes baggage value according <a href="https://www.w3.org/TR/baggage/#value">W3C RFC</a>.
+     *
+     * @param value The baggage value.
+     * @return The encoded baggage value.
+     */
+    static String encodeBaggage(final String value) {
+        // Fix encoding to comply with https://www.w3.org/TR/baggage/#value and use percent-encoding
+        // (RFC3986)
+        // for space ( ) instead of plus (+) from 'application/x-www-form' MIME encoding
+        return encode(value).replace("+", "%20");
     }
 
-    @Override
-    public void forEachKey(ExtractionCache<?> carrier, AgentPropagation.KeyClassifier classifier) {
-      List<String> keysAndValues = carrier.keysAndValues;
-      for (int i = 0; i < keysAndValues.size(); i += 2) {
-        classifier.accept(keysAndValues.get(i), keysAndValues.get(i + 1));
-      }
-    }
-  }
-
-  /**
-   * Checks if trace identifier matches, even if they are not encoded using the same size (64-bit vs
-   * 128-bit).
-   *
-   * @param a A trace identifier to check.
-   * @param b Another trace identifier to check.
-   * @return {@code true} if the trace identifiers matches, {@code false} otherwise.
-   */
-  private static boolean traceIdMatch(DDTraceId a, DDTraceId b) {
-    if (a instanceof DD128bTraceId && b instanceof DD128bTraceId
-        || a instanceof DD64bTraceId && b instanceof DD64bTraceId) {
-      return a.equals(b);
-    } else {
-      return a.toLong() == b.toLong();
-    }
-  }
-
-  /** URL encode value */
-  static String encode(final String value) {
-    String encoded = value;
-    try {
-      encoded = URLEncoder.encode(value, "UTF-8");
-    } catch (final UnsupportedEncodingException e) {
-      log.debug("Failed to encode value - {}", value);
-    }
-    return encoded;
-  }
-
-  /**
-   * Encodes baggage value according <a href="https://www.w3.org/TR/baggage/#value">W3C RFC</a>.
-   *
-   * @param value The baggage value.
-   * @return The encoded baggage value.
-   */
-  static String encodeBaggage(final String value) {
-    // Fix encoding to comply with https://www.w3.org/TR/baggage/#value and use percent-encoding
-    // (RFC3986)
-    // for space ( ) instead of plus (+) from 'application/x-www-form' MIME encoding
-    return encode(value).replace("+", "%20");
-  }
-
-  /** URL decode value */
-  static String decode(final String value) {
-    String decoded = value;
-    try {
-      decoded = URLDecoder.decode(value, "UTF-8");
-    } catch (final UnsupportedEncodingException | IllegalArgumentException e) {
-      log.debug("Failed to decode value - {}", value);
+    /** URL decode value */
+    static String decode(final String value) {
+        String decoded = value;
+        try {
+            decoded = URLDecoder.decode(value, "UTF-8");
+        } catch (final UnsupportedEncodingException | IllegalArgumentException e) {
+            log.debug("Failed to decode value - {}", value);
+        }
+        return decoded;
     }
-    return decoded;
-  }
 
-  static String firstHeaderValue(final String value) {
-    if (value == null) {
-      return null;
-    }
+    static String firstHeaderValue(final String value) {
+        if (value == null) {
+            return null;
+        }
 
-    int firstComma = value.indexOf(',');
-    return firstComma == -1 ? value : value.substring(0, firstComma).trim();
-  }
+        int firstComma = value.indexOf(',');
+        return firstComma == -1 ? value : value.substring(0, firstComma).trim();
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/InferredProxyPropagator.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/InferredProxyPropagator.java
index da51bf4643b..343c26fdf6c 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/InferredProxyPropagator.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/InferredProxyPropagator.java
@@ -15,46 +15,46 @@
 /** Inferred proxy propagator. Only extract, not meant for injection. */
 @ParametersAreNonnullByDefault
 public class InferredProxyPropagator implements Propagator {
-  private static final String INFERRED_PROXY_KEY_PREFIX = "x-dd-proxy";
+    private static final String INFERRED_PROXY_KEY_PREFIX = "x-dd-proxy";
 
-  @Override
-  public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {}
-
-  @Override
-  public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
-    if (context == null || carrier == null || visitor == null) {
-      return context;
-    }
-    InferredProxyContextExtractor extractor = new InferredProxyContextExtractor();
-    visitor.forEachKeyValue(carrier, extractor);
-    InferredProxySpan inferredProxySpan = extractor.inferredProxySpan();
-    if (inferredProxySpan != null) {
-      context = context.with(inferredProxySpan);
-    }
-    return context;
-  }
-
-  /** Extract inferred proxy related headers into a map. */
-  private static class InferredProxyContextExtractor implements BiConsumer<String, String> {
-    private Map<String, String> values;
+    @Override
+    public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {}
 
     @Override
-    public void accept(String key, String value) {
-      if (key == null || key.isEmpty() || !key.startsWith(INFERRED_PROXY_KEY_PREFIX)) {
-        return;
-      }
-      if (values == null) {
-        this.values = new HashMap<>();
-      }
-      this.values.put(key, value);
+    public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
+        if (context == null || carrier == null || visitor == null) {
+            return context;
+        }
+        InferredProxyContextExtractor extractor = new InferredProxyContextExtractor();
+        visitor.forEachKeyValue(carrier, extractor);
+        InferredProxySpan inferredProxySpan = extractor.inferredProxySpan();
+        if (inferredProxySpan != null) {
+            context = context.with(inferredProxySpan);
+        }
+        return context;
     }
 
-    public InferredProxySpan inferredProxySpan() {
-      if (this.values == null) {
-        return null;
-      }
-      InferredProxySpan inferredProxySpan = fromHeaders(this.values);
-      return inferredProxySpan.isValid() ? inferredProxySpan : null;
+    /** Extract inferred proxy related headers into a map. */
+    private static class InferredProxyContextExtractor implements BiConsumer<String, String> {
+        private Map<String, String> values;
+
+        @Override
+        public void accept(String key, String value) {
+            if (key == null || key.isEmpty() || !key.startsWith(INFERRED_PROXY_KEY_PREFIX)) {
+                return;
+            }
+            if (values == null) {
+                this.values = new HashMap<>();
+            }
+            this.values.put(key, value);
+        }
+
+        public InferredProxySpan inferredProxySpan() {
+            if (this.values == null) {
+                return null;
+            }
+            InferredProxySpan inferredProxySpan = fromHeaders(this.values);
+            return inferredProxySpan.isValid() ? inferredProxySpan : null;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/NoneCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/NoneCodec.java
index 66e0e0bcb8c..87f2ac424ba 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/NoneCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/NoneCodec.java
@@ -10,57 +10,55 @@
 import org.slf4j.LoggerFactory;
 
 public class NoneCodec {
-  private static final Logger log = LoggerFactory.getLogger(NoneCodec.class);
+    private static final Logger log = LoggerFactory.getLogger(NoneCodec.class);
 
-  private static class NoneContextInterpreter extends ContextInterpreter {
-    private NoneContextInterpreter(Config config) {
-      super(config);
-    }
+    private static class NoneContextInterpreter extends ContextInterpreter {
+        private NoneContextInterpreter(Config config) {
+            super(config);
+        }
 
-    @Override
-    public TracePropagationStyle style() {
-      return TracePropagationStyle.NONE;
-    }
+        @Override
+        public TracePropagationStyle style() {
+            return TracePropagationStyle.NONE;
+        }
 
-    @Override
-    public boolean accept(String key, String value) {
-      if (null == key || key.isEmpty()) {
-        return true;
-      }
-      if (LOG_EXTRACT_HEADER_NAMES) {
-        log.debug("Header: {}", key);
-      }
-      char first = Character.toLowerCase(key.charAt(0));
-      switch (first) {
-        case 'x':
-          handledXForwarding(key, value);
-          break;
-        case 'f':
-          handledForwarding(key, value);
-          break;
-        case 'u':
-          handledUserAgent(key, value);
-          break;
-        default:
-      }
+        @Override
+        public boolean accept(String key, String value) {
+            if (null == key || key.isEmpty()) {
+                return true;
+            }
+            if (LOG_EXTRACT_HEADER_NAMES) {
+                log.debug("Header: {}", key);
+            }
+            char first = Character.toLowerCase(key.charAt(0));
+            switch (first) {
+                case 'x':
+                    handledXForwarding(key, value);
+                    break;
+                case 'f':
+                    handledForwarding(key, value);
+                    break;
+                case 'u':
+                    handledUserAgent(key, value);
+                    break;
+                default:
+            }
 
-      handledIpHeaders(key, value);
-      if (handleTags(key, value)) {
-        return true;
-      }
-      handleMappedBaggage(key, value);
-      return true;
+            handledIpHeaders(key, value);
+            if (handleTags(key, value)) {
+                return true;
+            }
+            handleMappedBaggage(key, value);
+            return true;
+        }
     }
-  }
 
-  public static final HttpCodec.Injector INJECTOR =
-      new HttpCodec.Injector() {
+    public static final HttpCodec.Injector INJECTOR = new HttpCodec.Injector() {
         @Override
         public <C> void inject(DDSpanContext context, C carrier, CarrierSetter<C> setter) {}
-      };
+    };
 
-  public static HttpCodec.Extractor newExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier) {
-    return new TagContextExtractor(traceConfigSupplier, () -> new NoneContextInterpreter(config));
-  }
+    public static HttpCodec.Extractor newExtractor(Config config, Supplier<TraceConfig> traceConfigSupplier) {
+        return new TagContextExtractor(traceConfigSupplier, () -> new NoneContextInterpreter(config));
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/PropagationTags.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/PropagationTags.java
index 23b61ca99e8..6a1f79d2a38 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/PropagationTags.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/PropagationTags.java
@@ -23,232 +23,231 @@
  */
 public abstract class PropagationTags {
 
-  public static final class SamplingState {
-    private static final byte OTEL_POSITION_UNKNOWN = 0;
-    private static final byte OTEL_POSITION_PRESERVED = 1;
-    private static final byte OTEL_POSITION_REPLACED = 2;
-
-    private final int samplingPriority;
-    private final String tracestate;
-    private final CharSequence otelTraceState;
-    private final CharSequence decisionMaker;
-    private final CharSequence knuthSamplingRate;
-    private volatile byte otelPosition;
-
-    public SamplingState(
-        int samplingPriority,
-        String tracestate,
-        CharSequence otelTraceState,
-        CharSequence decisionMaker,
-        CharSequence knuthSamplingRate) {
-      this.samplingPriority = samplingPriority;
-      this.tracestate = tracestate;
-      this.otelTraceState = otelTraceState;
-      this.decisionMaker = decisionMaker;
-      this.knuthSamplingRate = knuthSamplingRate;
+    public static final class SamplingState {
+        private static final byte OTEL_POSITION_UNKNOWN = 0;
+        private static final byte OTEL_POSITION_PRESERVED = 1;
+        private static final byte OTEL_POSITION_REPLACED = 2;
+
+        private final int samplingPriority;
+        private final String tracestate;
+        private final CharSequence otelTraceState;
+        private final CharSequence decisionMaker;
+        private final CharSequence knuthSamplingRate;
+        private volatile byte otelPosition;
+
+        public SamplingState(
+                int samplingPriority,
+                String tracestate,
+                CharSequence otelTraceState,
+                CharSequence decisionMaker,
+                CharSequence knuthSamplingRate) {
+            this.samplingPriority = samplingPriority;
+            this.tracestate = tracestate;
+            this.otelTraceState = otelTraceState;
+            this.decisionMaker = decisionMaker;
+            this.knuthSamplingRate = knuthSamplingRate;
+        }
+
+        public int getSamplingPriority() {
+            return samplingPriority;
+        }
+
+        public String getTracestate() {
+            return tracestate;
+        }
+
+        public CharSequence getOtelTraceState() {
+            return otelTraceState;
+        }
+
+        public CharSequence getDecisionMaker() {
+            return decisionMaker;
+        }
+
+        public CharSequence getKnuthSamplingRate() {
+            return knuthSamplingRate;
+        }
+
+        public boolean preservesInheritedOtelPosition() {
+            if (tracestate == null || otelTraceState == null) {
+                return false;
+            }
+            byte position = otelPosition;
+            if (position == OTEL_POSITION_UNKNOWN) {
+                position = isUnchangedInheritedOtelMember(tracestate, otelTraceState)
+                        ? OTEL_POSITION_PRESERVED
+                        : OTEL_POSITION_REPLACED;
+                otelPosition = position;
+            }
+            return position == OTEL_POSITION_PRESERVED;
+        }
     }
 
-    public int getSamplingPriority() {
-      return samplingPriority;
+    public static PropagationTags.Factory factory(Config config) {
+        return factory(config.getxDatadogTagsMaxLength());
     }
 
-    public String getTracestate() {
-      return tracestate;
+    public static PropagationTags.Factory factory(int datadogTagsLimit) {
+        return new PTagsFactory(datadogTagsLimit);
     }
 
-    public CharSequence getOtelTraceState() {
-      return otelTraceState;
+    public static PropagationTags.Factory factory() {
+        return factory(DEFAULT_TRACE_X_DATADOG_TAGS_MAX_LENGTH);
     }
 
-    public CharSequence getDecisionMaker() {
-      return decisionMaker;
-    }
+    public enum HeaderType {
+        DATADOG,
+        W3C;
+
+        private static final int numValues = HeaderType.values().length;
 
-    public CharSequence getKnuthSamplingRate() {
-      return knuthSamplingRate;
+        public static int getNumValues() {
+            return numValues;
+        }
     }
 
-    public boolean preservesInheritedOtelPosition() {
-      if (tracestate == null || otelTraceState == null) {
-        return false;
-      }
-      byte position = otelPosition;
-      if (position == OTEL_POSITION_UNKNOWN) {
-        position =
-            isUnchangedInheritedOtelMember(tracestate, otelTraceState)
-                ? OTEL_POSITION_PRESERVED
-                : OTEL_POSITION_REPLACED;
-        otelPosition = position;
-      }
-      return position == OTEL_POSITION_PRESERVED;
+    public interface Factory {
+        PropagationTags empty();
+
+        PropagationTags fromHeaderValue(HeaderType headerType, String value);
+
+        /**
+         * Returns a fresh PropagationTags that re-encodes only the non-{@code dd} vendor sections of
+         * the supplied W3C tracestate. All Datadog-side state (sampling priority, origin, {@code
+         * _dd.p.*} tags) is dropped. If {@code originalTracestate} is {@code null} or empty, behaves
+         * like {@link #empty()}.
+         */
+        PropagationTags emptyW3C(String originalTracestate);
     }
-  }
 
-  public static PropagationTags.Factory factory(Config config) {
-    return factory(config.getxDatadogTagsMaxLength());
-  }
+    /**
+     * Updates the trace-level sampling priority decision if it hasn't already been made and _dd.p.dm
+     * tag doesn't exist. Called on the root span context.
+     */
+    public abstract void updateTraceSamplingPriority(int samplingPriority, int samplingMechanism);
+
+    public abstract boolean tryUpdateTraceSamplingPriority(
+            int samplingPriority, int samplingMechanism, boolean allowOverride);
+
+    public abstract boolean tryUpdateProbabilitySamplingDecision(
+            int samplingPriority,
+            int samplingMechanism,
+            double sampleRate,
+            boolean rateLimiterRejected,
+            long traceIdLowOrderBits,
+            boolean allowOverride);
+
+    public abstract void forceKeep(int samplingMechanism);
+
+    public abstract int getSamplingPriority();
+
+    public abstract SamplingState samplingState();
 
-  public static PropagationTags.Factory factory(int datadogTagsLimit) {
-    return new PTagsFactory(datadogTagsLimit);
-  }
+    public abstract void updateTraceOrigin(CharSequence origin);
 
-  public static PropagationTags.Factory factory() {
-    return factory(DEFAULT_TRACE_X_DATADOG_TAGS_MAX_LENGTH);
-  }
+    public abstract CharSequence getOrigin();
 
-  public enum HeaderType {
-    DATADOG,
-    W3C;
+    public abstract long getTraceIdHighOrderBits();
 
-    private static final int numValues = HeaderType.values().length;
+    public abstract void updateTraceIdHighOrderBits(long highOrderBits);
 
-    public static int getNumValues() {
-      return numValues;
+    public abstract CharSequence getLastParentId();
+
+    /**
+     * Gets the original <a href="https://www.w3.org/TR/trace-context/#tracestate-header">W3C
+     * tracestate header</a> value.
+     *
+     * @return The original W3C tracestate header value.
+     */
+    public abstract String getW3CTracestate();
+
+    public abstract String getW3CTracestate(SamplingState samplingState);
+
+    /**
+     * Stores the original <a href="https://www.w3.org/TR/trace-context/#tracestate-header">W3C
+     * tracestate header</a> value.
+     *
+     * @param tracestate The original W3C tracestate header value.
+     */
+    public abstract void updateW3CTracestate(String tracestate);
+
+    /** Updates the original W3C tracestate header from {@code source}. */
+    public void updateW3CTracestateFrom(PropagationTags source) {
+        updateW3CTracestate(source.getW3CTracestate());
     }
-  }
 
-  public interface Factory {
-    PropagationTags empty();
+    /**
+     * Constructs a header value that includes valid propagated _dd.p.* tags and possibly a new
+     * sampling decision tag _dd.p.dm based on the current state. Returns null if the value length
+     * exceeds a configured limit or empty.
+     */
+    public abstract String headerValue(HeaderType headerType);
 
-    PropagationTags fromHeaderValue(HeaderType headerType, String value);
+    /**
+     * Like {@link #headerValue(HeaderType)} but uses {@code lastParentIdOverride} for the W3C {@code
+     * p:} (last-parent-id) instead of the stored {@link #getLastParentId() last-parent-id}. Used at
+     * inject so the injecting span's id is supplied as a parameter rather than mutated into these
+     * (possibly trace-level, shared) tags — keeping transient per-injection identity out of shared
+     * state. A {@code null} override falls back to {@link #headerValue(HeaderType)}.
+     */
+    public abstract String headerValue(HeaderType headerType, CharSequence lastParentIdOverride);
+
+    public abstract String headerValue(
+            HeaderType headerType, CharSequence lastParentIdOverride, SamplingState samplingState);
+
+    /**
+     * Fills a provided tagMap with valid propagated _dd.p.* tags and possibly a new sampling decision
+     * tags _dd.p.dm (root span only) based on the current state, or sets only an error tag if the
+     * header value exceeds a configured limit.
+     */
+    public abstract void fillTagMap(Map<String, String> tagMap);
+
+    /**
+     * Updates the trace source to include the specified product.
+     *
+     * <p>The product value is parsed and interpreted according to the logic in {@link
+     * ProductTraceSource}. This method ensures that the given product is marked as part of the trace
+     * source.
+     *
+     * @param product the product identifier to be added to the trace source. Refer to {@link
+     *     ProductTraceSource} for details on how the value is interpreted.
+     */
+    public abstract void addTraceSource(int product);
+
+    /**
+     * Retrieves the current trace source.
+     *
+     * <p>The returned value is an encoded bitfield that represents the included products. To
+     * understand how this value is parsed and interpreted, refer to {@link ProductTraceSource}.
+     *
+     * @return the trace source as an integer bitfield. See {@link ProductTraceSource} for details on
+     *     its structure and usage.
+     */
+    public abstract int getTraceSource();
+
+    public abstract void updateDebugPropagation(String value);
+
+    public abstract String getDebugPropagation();
+
+    /**
+     * Returns the Org Propagation Marker (OPM) currently held in these tags, encoded as {@code
+     * _dd.p.opm} in Datadog headers and {@code t.opm} in W3C tracestate. Returns {@code null} if no
+     * OPM is set.
+     */
+    public abstract CharSequence getOrgPropagationMarker();
 
     /**
-     * Returns a fresh PropagationTags that re-encodes only the non-{@code dd} vendor sections of
-     * the supplied W3C tracestate. All Datadog-side state (sampling priority, origin, {@code
-     * _dd.p.*} tags) is dropped. If {@code originalTracestate} is {@code null} or empty, behaves
-     * like {@link #empty()}.
+     * Sets the Org Propagation Marker (OPM). Passing {@code null} clears the marker. The injection
+     * codecs call this just before serializing so that, when the local tracer knows its own OPM, it
+     * overrides any inbound OPM.
      */
-    PropagationTags emptyW3C(String originalTracestate);
-  }
-
-  /**
-   * Updates the trace-level sampling priority decision if it hasn't already been made and _dd.p.dm
-   * tag doesn't exist. Called on the root span context.
-   */
-  public abstract void updateTraceSamplingPriority(int samplingPriority, int samplingMechanism);
-
-  public abstract boolean tryUpdateTraceSamplingPriority(
-      int samplingPriority, int samplingMechanism, boolean allowOverride);
-
-  public abstract boolean tryUpdateProbabilitySamplingDecision(
-      int samplingPriority,
-      int samplingMechanism,
-      double sampleRate,
-      boolean rateLimiterRejected,
-      long traceIdLowOrderBits,
-      boolean allowOverride);
-
-  public abstract void forceKeep(int samplingMechanism);
-
-  public abstract int getSamplingPriority();
-
-  public abstract SamplingState samplingState();
-
-  public abstract void updateTraceOrigin(CharSequence origin);
-
-  public abstract CharSequence getOrigin();
-
-  public abstract long getTraceIdHighOrderBits();
-
-  public abstract void updateTraceIdHighOrderBits(long highOrderBits);
-
-  public abstract CharSequence getLastParentId();
-
-  /**
-   * Gets the original <a href="https://www.w3.org/TR/trace-context/#tracestate-header">W3C
-   * tracestate header</a> value.
-   *
-   * @return The original W3C tracestate header value.
-   */
-  public abstract String getW3CTracestate();
-
-  public abstract String getW3CTracestate(SamplingState samplingState);
-
-  /**
-   * Stores the original <a href="https://www.w3.org/TR/trace-context/#tracestate-header">W3C
-   * tracestate header</a> value.
-   *
-   * @param tracestate The original W3C tracestate header value.
-   */
-  public abstract void updateW3CTracestate(String tracestate);
-
-  /** Updates the original W3C tracestate header from {@code source}. */
-  public void updateW3CTracestateFrom(PropagationTags source) {
-    updateW3CTracestate(source.getW3CTracestate());
-  }
-
-  /**
-   * Constructs a header value that includes valid propagated _dd.p.* tags and possibly a new
-   * sampling decision tag _dd.p.dm based on the current state. Returns null if the value length
-   * exceeds a configured limit or empty.
-   */
-  public abstract String headerValue(HeaderType headerType);
-
-  /**
-   * Like {@link #headerValue(HeaderType)} but uses {@code lastParentIdOverride} for the W3C {@code
-   * p:} (last-parent-id) instead of the stored {@link #getLastParentId() last-parent-id}. Used at
-   * inject so the injecting span's id is supplied as a parameter rather than mutated into these
-   * (possibly trace-level, shared) tags — keeping transient per-injection identity out of shared
-   * state. A {@code null} override falls back to {@link #headerValue(HeaderType)}.
-   */
-  public abstract String headerValue(HeaderType headerType, CharSequence lastParentIdOverride);
-
-  public abstract String headerValue(
-      HeaderType headerType, CharSequence lastParentIdOverride, SamplingState samplingState);
-
-  /**
-   * Fills a provided tagMap with valid propagated _dd.p.* tags and possibly a new sampling decision
-   * tags _dd.p.dm (root span only) based on the current state, or sets only an error tag if the
-   * header value exceeds a configured limit.
-   */
-  public abstract void fillTagMap(Map<String, String> tagMap);
-
-  /**
-   * Updates the trace source to include the specified product.
-   *
-   * <p>The product value is parsed and interpreted according to the logic in {@link
-   * ProductTraceSource}. This method ensures that the given product is marked as part of the trace
-   * source.
-   *
-   * @param product the product identifier to be added to the trace source. Refer to {@link
-   *     ProductTraceSource} for details on how the value is interpreted.
-   */
-  public abstract void addTraceSource(int product);
-
-  /**
-   * Retrieves the current trace source.
-   *
-   * <p>The returned value is an encoded bitfield that represents the included products. To
-   * understand how this value is parsed and interpreted, refer to {@link ProductTraceSource}.
-   *
-   * @return the trace source as an integer bitfield. See {@link ProductTraceSource} for details on
-   *     its structure and usage.
-   */
-  public abstract int getTraceSource();
-
-  public abstract void updateDebugPropagation(String value);
-
-  public abstract String getDebugPropagation();
-
-  /**
-   * Returns the Org Propagation Marker (OPM) currently held in these tags, encoded as {@code
-   * _dd.p.opm} in Datadog headers and {@code t.opm} in W3C tracestate. Returns {@code null} if no
-   * OPM is set.
-   */
-  public abstract CharSequence getOrgPropagationMarker();
-
-  /**
-   * Sets the Org Propagation Marker (OPM). Passing {@code null} clears the marker. The injection
-   * codecs call this just before serializing so that, when the local tracer knows its own OPM, it
-   * overrides any inbound OPM.
-   */
-  public abstract void updateOrgPropagationMarker(CharSequence opm);
-
-  public HashMap<String, String> createTagMap() {
-    HashMap<String, String> result = new HashMap<>();
-    fillTagMap(result);
-    return result;
-  }
-
-  public abstract void updateAndLockDecisionMaker(PropagationTags source);
+    public abstract void updateOrgPropagationMarker(CharSequence opm);
+
+    public HashMap<String, String> createTagMap() {
+        HashMap<String, String> result = new HashMap<>();
+        fillTagMap(result);
+        return result;
+    }
+
+    public abstract void updateAndLockDecisionMaker(PropagationTags source);
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/TagContextExtractor.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/TagContextExtractor.java
index cb22ef0c083..eeb82170c03 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/TagContextExtractor.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/TagContextExtractor.java
@@ -7,24 +7,24 @@
 
 public class TagContextExtractor implements HttpCodec.Extractor {
 
-  private final Supplier<TraceConfig> traceConfigSupplier;
-  private final ThreadLocal<ContextInterpreter> ctxInterpreter;
+    private final Supplier<TraceConfig> traceConfigSupplier;
+    private final ThreadLocal<ContextInterpreter> ctxInterpreter;
 
-  public TagContextExtractor(
-      final Supplier<TraceConfig> traceConfigSupplier, final ContextInterpreter.Factory factory) {
-    this.traceConfigSupplier = traceConfigSupplier;
-    this.ctxInterpreter = ThreadLocal.withInitial(factory::create);
-  }
+    public TagContextExtractor(
+            final Supplier<TraceConfig> traceConfigSupplier, final ContextInterpreter.Factory factory) {
+        this.traceConfigSupplier = traceConfigSupplier;
+        this.ctxInterpreter = ThreadLocal.withInitial(factory::create);
+    }
 
-  @Override
-  public <C> TagContext extract(final C carrier, final AgentPropagation.ContextVisitor<C> getter) {
-    ContextInterpreter interpreter = this.ctxInterpreter.get().reset(traceConfigSupplier.get());
-    getter.forEachKey(carrier, interpreter);
-    return interpreter.build();
-  }
+    @Override
+    public <C> TagContext extract(final C carrier, final AgentPropagation.ContextVisitor<C> getter) {
+        ContextInterpreter interpreter = this.ctxInterpreter.get().reset(traceConfigSupplier.get());
+        getter.forEachKey(carrier, interpreter);
+        return interpreter.build();
+    }
 
-  @Override
-  public void cleanup() {
-    ctxInterpreter.remove();
-  }
+    @Override
+    public void cleanup() {
+        ctxInterpreter.remove();
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/TracingPropagator.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/TracingPropagator.java
index f9267c355d7..37d6ad038f4 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/TracingPropagator.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/TracingPropagator.java
@@ -20,65 +20,61 @@
 /** Propagator for tracing concern. */
 @ParametersAreNonnullByDefault
 public class TracingPropagator implements Propagator {
-  private final boolean enabled;
-  private final Injector injector;
-  private final Extractor extractor;
+    private final boolean enabled;
+    private final Injector injector;
+    private final Extractor extractor;
 
-  /**
-   * Constructor.
-   *
-   * @param enabled Whether APM tracing is enabled.
-   * @param injector The {@link Injector} used for tracing context injection.
-   * @param extractor The {@link Extractor} used for tracing context extraction.
-   */
-  public TracingPropagator(boolean enabled, Injector injector, Extractor extractor) {
-    this.enabled = enabled;
-    this.injector = injector;
-    this.extractor = extractor;
-  }
-
-  @Override
-  public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {
-    AgentSpan span;
-    //noinspection ConstantValue
-    if (context == null
-        || carrier == null
-        || setter == null
-        || (span = fromContext(context)) == null) {
-      return;
-    }
-    AgentSpanContext spanContext = span.spanContext();
-    if (spanContext instanceof DDSpanContext) {
-      DDSpanContext ddSpanContext = (DDSpanContext) spanContext;
-      // Stop injection if tracing is disabled and tracing span is coming from tracing only
-      if (!this.enabled && ddSpanContext.getPropagationTags().getTraceSource() == UNSET) {
-        return;
-      }
-      ddSpanContext.getTraceCollector().setSamplingPriorityIfNecessary();
-      this.injector.inject(ddSpanContext, carrier, setter);
+    /**
+     * Constructor.
+     *
+     * @param enabled Whether APM tracing is enabled.
+     * @param injector The {@link Injector} used for tracing context injection.
+     * @param extractor The {@link Extractor} used for tracing context extraction.
+     */
+    public TracingPropagator(boolean enabled, Injector injector, Extractor extractor) {
+        this.enabled = enabled;
+        this.injector = injector;
+        this.extractor = extractor;
     }
-  }
 
-  @Override
-  public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
-    //noinspection ConstantValue
-    if (context == null || carrier == null || visitor == null) {
-      return context;
+    @Override
+    public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {
+        AgentSpan span;
+        //noinspection ConstantValue
+        if (context == null || carrier == null || setter == null || (span = fromContext(context)) == null) {
+            return;
+        }
+        AgentSpanContext spanContext = span.spanContext();
+        if (spanContext instanceof DDSpanContext) {
+            DDSpanContext ddSpanContext = (DDSpanContext) spanContext;
+            // Stop injection if tracing is disabled and tracing span is coming from tracing only
+            if (!this.enabled && ddSpanContext.getPropagationTags().getTraceSource() == UNSET) {
+                return;
+            }
+            ddSpanContext.getTraceCollector().setSamplingPriorityIfNecessary();
+            this.injector.inject(ddSpanContext, carrier, setter);
+        }
     }
-    TagContext spanContext = this.extractor.extract(carrier, toContextVisitor(visitor));
-    // If the extraction fails, return the original context
-    if (spanContext == null) {
-      return context;
+
+    @Override
+    public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
+        //noinspection ConstantValue
+        if (context == null || carrier == null || visitor == null) {
+            return context;
+        }
+        TagContext spanContext = this.extractor.extract(carrier, toContextVisitor(visitor));
+        // If the extraction fails, return the original context
+        if (spanContext == null) {
+            return context;
+        }
+        // Otherwise, append a fake span wrapper to context
+        return context.with(fromSpanContext(spanContext));
     }
-    // Otherwise, append a fake span wrapper to context
-    return context.with(fromSpanContext(spanContext));
-  }
 
-  private static <C> AgentPropagation.ContextVisitor<C> toContextVisitor(
-      CarrierVisitor<C> visitor) {
-    if (visitor instanceof AgentPropagation.ContextVisitor) {
-      return (AgentPropagation.ContextVisitor<C>) visitor;
+    private static <C> AgentPropagation.ContextVisitor<C> toContextVisitor(CarrierVisitor<C> visitor) {
+        if (visitor instanceof AgentPropagation.ContextVisitor) {
+            return (AgentPropagation.ContextVisitor<C>) visitor;
+        }
+        return (carrier, classifier) -> visitor.forEachKeyValue(carrier, classifier::accept);
     }
-    return (carrier, classifier) -> visitor.forEachKeyValue(carrier, classifier::accept);
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java
index ae2e1ba3767..81877b83604 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java
@@ -31,338 +31,336 @@
 
 /** A codec designed for HTTP transport via headers using W3C traceparent and tracestate headers */
 class W3CHttpCodec {
-  private static final Logger log = LoggerFactory.getLogger(W3CHttpCodec.class);
+    private static final Logger log = LoggerFactory.getLogger(W3CHttpCodec.class);
 
-  private static final int TRACE_PARENT_TID_START = 2 + 1;
-  private static final int TRACE_PARENT_TID_END = TRACE_PARENT_TID_START + 32;
-  private static final int TRACE_PARENT_SID_START = TRACE_PARENT_TID_END + 1;
-  private static final int TRACE_PARENT_SID_END = TRACE_PARENT_SID_START + 16;
-  private static final int TRACE_PARENT_FLAGS_START = TRACE_PARENT_SID_END + 1;
-  private static final int TRACE_PARENT_FLAGS_SAMPLED = 1;
-  private static final int TRACE_PARENT_LENGTH = TRACE_PARENT_FLAGS_START + 2;
+    private static final int TRACE_PARENT_TID_START = 2 + 1;
+    private static final int TRACE_PARENT_TID_END = TRACE_PARENT_TID_START + 32;
+    private static final int TRACE_PARENT_SID_START = TRACE_PARENT_TID_END + 1;
+    private static final int TRACE_PARENT_SID_END = TRACE_PARENT_SID_START + 16;
+    private static final int TRACE_PARENT_FLAGS_START = TRACE_PARENT_SID_END + 1;
+    private static final int TRACE_PARENT_FLAGS_SAMPLED = 1;
+    private static final int TRACE_PARENT_LENGTH = TRACE_PARENT_FLAGS_START + 2;
 
-  @VisibleForTesting static final String TRACE_PARENT_KEY = "traceparent";
-  @VisibleForTesting static final String TRACE_STATE_KEY = "tracestate";
-  @VisibleForTesting static final String OT_BAGGAGE_PREFIX = "ot-baggage-";
-  static final String E2E_START_KEY = OT_BAGGAGE_PREFIX + DDTags.TRACE_START_TIME;
+    @VisibleForTesting
+    static final String TRACE_PARENT_KEY = "traceparent";
 
-  private W3CHttpCodec() {
-    // This class should not be created. This also makes code coverage checks happy.
-  }
+    @VisibleForTesting
+    static final String TRACE_STATE_KEY = "tracestate";
 
-  public static HttpCodec.Injector newInjector(Map<String, String> invertedBaggageMapping) {
-    return new Injector(invertedBaggageMapping);
-  }
+    @VisibleForTesting
+    static final String OT_BAGGAGE_PREFIX = "ot-baggage-";
 
-  private static class Injector implements HttpCodec.Injector {
+    static final String E2E_START_KEY = OT_BAGGAGE_PREFIX + DDTags.TRACE_START_TIME;
 
-    private final Map<String, String> invertedBaggageMapping;
-
-    public Injector(Map<String, String> invertedBaggageMapping) {
-      assert invertedBaggageMapping != null;
-      this.invertedBaggageMapping = invertedBaggageMapping;
+    private W3CHttpCodec() {
+        // This class should not be created. This also makes code coverage checks happy.
     }
 
-    @Override
-    public <C> void inject(
-        final DDSpanContext context, final C carrier, final CarrierSetter<C> setter) {
-      PropagationTags propagationTags = context.getPropagationTags();
-      SamplingState samplingState = propagationTags.samplingState();
-      injectTraceParent(context, samplingState, carrier, setter);
-      injectTraceState(context, propagationTags, samplingState, carrier, setter);
-      injectBaggage(context, carrier, setter);
+    public static HttpCodec.Injector newInjector(Map<String, String> invertedBaggageMapping) {
+        return new Injector(invertedBaggageMapping);
     }
 
-    private <C> void injectTraceParent(
-        DDSpanContext context, SamplingState samplingState, C carrier, CarrierSetter<C> setter) {
-      String traceparent =
-          W3CTraceParent.from(
-              context.getTraceId(), context.getSpanId(), samplingState.getSamplingPriority() > 0);
-      setter.set(carrier, TRACE_PARENT_KEY, traceparent);
-    }
+    private static class Injector implements HttpCodec.Injector {
 
-    private <C> void injectTraceState(
-        DDSpanContext context,
-        PropagationTags propagationTags,
-        SamplingState samplingState,
-        C carrier,
-        CarrierSetter<C> setter) {
-      // Supply the injecting span's id for the W3C `p:` as a parameter rather than mutating it into
-      // the (possibly trace-level, shared) tags — keeps transient per-injection identity out of
-      // shared state, so concurrent sibling injects can't race on it.
-      String tracestate =
-          propagationTags.headerValue(
-              W3C, DDSpanId.toHexStringPadded(context.getSpanId()), samplingState);
-      if (tracestate != null && !tracestate.isEmpty()) {
-        setter.set(carrier, TRACE_STATE_KEY, tracestate);
-      }
-    }
+        private final Map<String, String> invertedBaggageMapping;
 
-    private <C> void injectBaggage(DDSpanContext context, C carrier, CarrierSetter<C> setter) {
-      long e2eStart = context.getEndToEndStartTime();
-      if (e2eStart > 0) {
-        setter.set(carrier, E2E_START_KEY, Long.toString(NANOSECONDS.toMillis(e2eStart)));
-      }
-
-      for (final Map.Entry<String, String> entry : context.baggageItems()) {
-        String header = invertedBaggageMapping.get(entry.getKey());
-        header = header != null ? header : OT_BAGGAGE_PREFIX + entry.getKey();
-        setter.set(carrier, header, HttpCodec.encodeBaggage(entry.getValue()));
-      }
-    }
-  }
+        public Injector(Map<String, String> invertedBaggageMapping) {
+            assert invertedBaggageMapping != null;
+            this.invertedBaggageMapping = invertedBaggageMapping;
+        }
 
-  public static HttpCodec.Extractor newExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier) {
-    return new TagContextExtractor(traceConfigSupplier, () -> new W3CContextInterpreter(config));
-  }
+        @Override
+        public <C> void inject(final DDSpanContext context, final C carrier, final CarrierSetter<C> setter) {
+            PropagationTags propagationTags = context.getPropagationTags();
+            SamplingState samplingState = propagationTags.samplingState();
+            injectTraceParent(context, samplingState, carrier, setter);
+            injectTraceState(context, propagationTags, samplingState, carrier, setter);
+            injectBaggage(context, carrier, setter);
+        }
 
-  private static class W3CContextInterpreter extends ContextInterpreter {
+        private <C> void injectTraceParent(
+                DDSpanContext context, SamplingState samplingState, C carrier, CarrierSetter<C> setter) {
+            String traceparent = W3CTraceParent.from(
+                    context.getTraceId(), context.getSpanId(), samplingState.getSamplingPriority() > 0);
+            setter.set(carrier, TRACE_PARENT_KEY, traceparent);
+        }
 
-    private static final int TRACE_PARENT = 0;
-    private static final int TRACE_STATE = 1;
-    private static final int OT_BAGGAGE = 2;
-    private static final int E2E_START = 3;
-    private static final int IGNORE = -1;
+        private <C> void injectTraceState(
+                DDSpanContext context,
+                PropagationTags propagationTags,
+                SamplingState samplingState,
+                C carrier,
+                CarrierSetter<C> setter) {
+            // Supply the injecting span's id for the W3C `p:` as a parameter rather than mutating it into
+            // the (possibly trace-level, shared) tags — keeps transient per-injection identity out of
+            // shared state, so concurrent sibling injects can't race on it.
+            String tracestate =
+                    propagationTags.headerValue(W3C, DDSpanId.toHexStringPadded(context.getSpanId()), samplingState);
+            if (tracestate != null && !tracestate.isEmpty()) {
+                setter.set(carrier, TRACE_STATE_KEY, tracestate);
+            }
+        }
 
-    // We need to delay handling of the tracestate header until after traceparent
-    private String tracestateHeader = null;
-    private String traceparentHeader = null;
+        private <C> void injectBaggage(DDSpanContext context, C carrier, CarrierSetter<C> setter) {
+            long e2eStart = context.getEndToEndStartTime();
+            if (e2eStart > 0) {
+                setter.set(carrier, E2E_START_KEY, Long.toString(NANOSECONDS.toMillis(e2eStart)));
+            }
 
-    private W3CContextInterpreter(Config config) {
-      super(config);
+            for (final Map.Entry<String, String> entry : context.baggageItems()) {
+                String header = invertedBaggageMapping.get(entry.getKey());
+                header = header != null ? header : OT_BAGGAGE_PREFIX + entry.getKey();
+                setter.set(carrier, header, HttpCodec.encodeBaggage(entry.getValue()));
+            }
+        }
     }
 
-    @Override
-    public TracePropagationStyle style() {
-      return TRACECONTEXT;
+    public static HttpCodec.Extractor newExtractor(Config config, Supplier<TraceConfig> traceConfigSupplier) {
+        return new TagContextExtractor(traceConfigSupplier, () -> new W3CContextInterpreter(config));
     }
 
-    @Override
-    public ContextInterpreter reset(TraceConfig traceConfig) {
-      tracestateHeader = null;
-      traceparentHeader = null;
-      return super.reset(traceConfig);
-    }
+    private static class W3CContextInterpreter extends ContextInterpreter {
 
-    @Override
-    public boolean accept(String key, String value) {
-      if (null == key || key.isEmpty()) {
-        return true;
-      }
-      if (LOG_EXTRACT_HEADER_NAMES) {
-        log.debug("Header: {}", key);
-      }
-      String lowerCaseKey = null;
-      int classification = IGNORE;
-      char first = Character.toLowerCase(key.charAt(0));
-      switch (first) {
-        case 'f':
-          handledForwarding(key, value);
-          break;
-        case 'o':
-          lowerCaseKey = toLowerCase(key);
-          if (E2E_START_KEY.equals(lowerCaseKey)) {
-            classification = E2E_START;
-          } else if (lowerCaseKey.startsWith(OT_BAGGAGE_PREFIX)) {
-            classification = OT_BAGGAGE;
-          }
-          break;
-        case 't':
-          if (TRACE_PARENT_KEY.equalsIgnoreCase(key)) {
-            classification = TRACE_PARENT;
-          } else if (TRACE_STATE_KEY.equalsIgnoreCase(key)) {
-            classification = TRACE_STATE;
-          }
-          break;
-        case 'u':
-          handledUserAgent(key, value);
-          break;
-        case 'x':
-          handledXForwarding(key, value);
-          break;
-        default:
-      }
-
-      if (classification != IGNORE) {
-        try {
-          if (null != value) {
-            switch (classification) {
-              case TRACE_PARENT:
-                return storeTraceParent(value);
-              case TRACE_STATE:
-                return storeTraceState(value);
-              case E2E_START:
-                endToEndStartTime = extractEndToEndStartTime(firstHeaderValue(value));
-                break;
-              case OT_BAGGAGE:
-                addBaggageItem(lowerCaseKey.substring(OT_BAGGAGE_PREFIX.length()), value);
-                break;
-              default:
-            }
-          }
-        } catch (RuntimeException e) {
-          invalidateContext();
-          log.debug("Exception when extracting context", e);
-          return false;
+        private static final int TRACE_PARENT = 0;
+        private static final int TRACE_STATE = 1;
+        private static final int OT_BAGGAGE = 2;
+        private static final int E2E_START = 3;
+        private static final int IGNORE = -1;
+
+        // We need to delay handling of the tracestate header until after traceparent
+        private String tracestateHeader = null;
+        private String traceparentHeader = null;
+
+        private W3CContextInterpreter(Config config) {
+            super(config);
         }
-      } else {
-        handledIpHeaders(key, value);
-        if (handleTags(key, value)) {
-          return true;
+
+        @Override
+        public TracePropagationStyle style() {
+            return TRACECONTEXT;
         }
-        handleMappedBaggage(key, value);
-      }
-      return true;
-    }
 
-    private long extractEndToEndStartTime(String value) {
-      try {
-        return MILLISECONDS.toNanos(Long.parseLong(value));
-      } catch (RuntimeException e) {
-        log.debug("Ignoring invalid end-to-end start time {}", value, e);
-        return 0;
-      }
-    }
+        @Override
+        public ContextInterpreter reset(TraceConfig traceConfig) {
+            tracestateHeader = null;
+            traceparentHeader = null;
+            return super.reset(traceConfig);
+        }
 
-    private boolean storeTraceParent(String value) {
-      String trimmed = trim(value);
-      if (traceparentHeader != null) {
-        // We should not accept multiple traceparent headers
-        if (log.isDebugEnabled()) {
-          log.debug(
-              "Multiple traceparent headers. Had '{}' and got '{}'", traceparentHeader, trimmed);
+        @Override
+        public boolean accept(String key, String value) {
+            if (null == key || key.isEmpty()) {
+                return true;
+            }
+            if (LOG_EXTRACT_HEADER_NAMES) {
+                log.debug("Header: {}", key);
+            }
+            String lowerCaseKey = null;
+            int classification = IGNORE;
+            char first = Character.toLowerCase(key.charAt(0));
+            switch (first) {
+                case 'f':
+                    handledForwarding(key, value);
+                    break;
+                case 'o':
+                    lowerCaseKey = toLowerCase(key);
+                    if (E2E_START_KEY.equals(lowerCaseKey)) {
+                        classification = E2E_START;
+                    } else if (lowerCaseKey.startsWith(OT_BAGGAGE_PREFIX)) {
+                        classification = OT_BAGGAGE;
+                    }
+                    break;
+                case 't':
+                    if (TRACE_PARENT_KEY.equalsIgnoreCase(key)) {
+                        classification = TRACE_PARENT;
+                    } else if (TRACE_STATE_KEY.equalsIgnoreCase(key)) {
+                        classification = TRACE_STATE;
+                    }
+                    break;
+                case 'u':
+                    handledUserAgent(key, value);
+                    break;
+                case 'x':
+                    handledXForwarding(key, value);
+                    break;
+                default:
+            }
+
+            if (classification != IGNORE) {
+                try {
+                    if (null != value) {
+                        switch (classification) {
+                            case TRACE_PARENT:
+                                return storeTraceParent(value);
+                            case TRACE_STATE:
+                                return storeTraceState(value);
+                            case E2E_START:
+                                endToEndStartTime = extractEndToEndStartTime(firstHeaderValue(value));
+                                break;
+                            case OT_BAGGAGE:
+                                addBaggageItem(lowerCaseKey.substring(OT_BAGGAGE_PREFIX.length()), value);
+                                break;
+                            default:
+                        }
+                    }
+                } catch (RuntimeException e) {
+                    invalidateContext();
+                    log.debug("Exception when extracting context", e);
+                    return false;
+                }
+            } else {
+                handledIpHeaders(key, value);
+                if (handleTags(key, value)) {
+                    return true;
+                }
+                handleMappedBaggage(key, value);
+            }
+            return true;
         }
-        onlyTagContext();
-      } else {
-        traceparentHeader = trimmed;
-      }
-      return true;
-    }
 
-    private boolean storeTraceState(String value) {
-      String trimmed = trim(value);
-      if (!trimmed.isEmpty()) {
-        // Yes, this is not efficient for multiple headers, but that is hopefully not common
-        tracestateHeader = tracestateHeader == null ? trimmed : tracestateHeader + "," + trimmed;
-      }
-      return true;
-    }
+        private long extractEndToEndStartTime(String value) {
+            try {
+                return MILLISECONDS.toNanos(Long.parseLong(value));
+            } catch (RuntimeException e) {
+                log.debug("Ignoring invalid end-to-end start time {}", value, e);
+                return 0;
+            }
+        }
 
-    /**
-     * We need to delay handling of the W3C headers until the end since tracestate headers should be
-     * concatenated before processed, and only if there is a single valid traceparent header present
-     */
-    @Override
-    protected TagContext build() {
-      // If there is neither a traceparent nor a tracestate header, then ignore this
-      if (traceparentHeader == null && tracestateHeader == null) {
-        onlyTagContext();
-      }
-      if (valid && fullContext) {
-        try {
-          if (traceparentHeader == null && tracestateHeader != null) {
-            throw new IllegalStateException(
-                "Found no traceparent header but tracestate header '" + tracestateHeader + "'");
-          }
-          // Now we know that we have at least a traceparent header
-          parseTraceParentHeader(traceparentHeader);
-          parseTraceStateHeader(tracestateHeader);
-        } catch (RuntimeException e) {
-          onlyTagContext();
-          log.debug("Exception when building context", e);
+        private boolean storeTraceParent(String value) {
+            String trimmed = trim(value);
+            if (traceparentHeader != null) {
+                // We should not accept multiple traceparent headers
+                if (log.isDebugEnabled()) {
+                    log.debug("Multiple traceparent headers. Had '{}' and got '{}'", traceparentHeader, trimmed);
+                }
+                onlyTagContext();
+            } else {
+                traceparentHeader = trimmed;
+            }
+            return true;
         }
-      }
-      return super.build();
-    }
 
-    void parseTraceParentHeader(String tp) {
-      int length = tp == null ? 0 : tp.length();
-      if (length < TRACE_PARENT_LENGTH) {
-        throw new IllegalStateException("The length of traceparent '" + tp + "' is too short");
-      }
-      long version = LongStringUtils.parseUnsignedLongHex(tp, 0, 2, true);
-      if (version == 255) {
-        throw new IllegalStateException("Illegal version number " + tp.substring(0, 2));
-      } else if (version == 0 && length > TRACE_PARENT_LENGTH) {
-        throw new IllegalStateException("The length of traceparent '" + tp + "' is too long");
-      }
-      DDTraceId traceId = DD128bTraceId.fromHex(tp, TRACE_PARENT_TID_START, 32, true);
-      if (traceId.toLong() == 0) {
-        throw new IllegalStateException(
-            "Illegal all zero 64 bit trace id "
-                + tp.substring(TRACE_PARENT_TID_START, TRACE_PARENT_TID_END));
-      }
-      this.traceId = traceId;
-      this.spanId = DDSpanId.fromHex(tp, TRACE_PARENT_SID_START, 16, true);
-      if (this.spanId == 0) {
-        throw new IllegalStateException(
-            "Illegal all zero span id "
-                + tp.substring(TRACE_PARENT_SID_START, TRACE_PARENT_SID_END));
-      }
-      if (version != 0 && length > TRACE_PARENT_LENGTH && tp.charAt(TRACE_PARENT_LENGTH) != '-') {
-        throw new IllegalStateException("Illegal character after flags in '" + tp + "'");
-      }
-      long flags = LongStringUtils.parseUnsignedLongHex(tp, TRACE_PARENT_FLAGS_START, 2, true);
-      if ((flags & TRACE_PARENT_FLAGS_SAMPLED) != 0) {
-        this.samplingPriority = SAMPLER_KEEP;
-      } else {
-        this.samplingPriority = SAMPLER_DROP;
-      }
-    }
+        private boolean storeTraceState(String value) {
+            String trimmed = trim(value);
+            if (!trimmed.isEmpty()) {
+                // Yes, this is not efficient for multiple headers, but that is hopefully not common
+                tracestateHeader = tracestateHeader == null ? trimmed : tracestateHeader + "," + trimmed;
+            }
+            return true;
+        }
 
-    void parseTraceStateHeader(String tracestate) {
-      if (tracestate == null || tracestate.isEmpty()) {
-        this.propagationTags = this.propagationTagsFactory.empty();
-      } else {
-        this.propagationTags = this.propagationTagsFactory.fromHeaderValue(W3C, tracestate);
-      }
-      this.lastParentId = this.propagationTags.getLastParentId();
-      int ptagsPriority = this.propagationTags.getSamplingPriority();
-      int contextPriority = this.samplingPriority;
-      if ((contextPriority == SAMPLER_DROP && ptagsPriority > 0)
-          || (contextPriority == SAMPLER_KEEP && ptagsPriority <= 0)
-          || ptagsPriority == PrioritySampling.UNSET) {
-        // Override Datadog sampling priority with W3C one
-        this.propagationTags.updateTraceSamplingPriority(
-            contextPriority, SamplingMechanism.EXTERNAL_OVERRIDE);
-      } else {
-        // Use more detailed Datadog sampling priority in context
-        this.samplingPriority = ptagsPriority;
-      }
-      // Use the origin
-      this.origin = this.propagationTags.getOrigin();
-      // Ensure TraceId high-order bits match
-      this.propagationTags.updateTraceIdHighOrderBits(this.traceId.toHighOrderLong());
-    }
+        /**
+         * We need to delay handling of the W3C headers until the end since tracestate headers should be
+         * concatenated before processed, and only if there is a single valid traceparent header present
+         */
+        @Override
+        protected TagContext build() {
+            // If there is neither a traceparent nor a tracestate header, then ignore this
+            if (traceparentHeader == null && tracestateHeader == null) {
+                onlyTagContext();
+            }
+            if (valid && fullContext) {
+                try {
+                    if (traceparentHeader == null && tracestateHeader != null) {
+                        throw new IllegalStateException(
+                                "Found no traceparent header but tracestate header '" + tracestateHeader + "'");
+                    }
+                    // Now we know that we have at least a traceparent header
+                    parseTraceParentHeader(traceparentHeader);
+                    parseTraceStateHeader(tracestateHeader);
+                } catch (RuntimeException e) {
+                    onlyTagContext();
+                    log.debug("Exception when building context", e);
+                }
+            }
+            return super.build();
+        }
 
-    private static String trim(String input) {
-      if (input == null) {
-        return "";
-      }
-      final int last = input.length() - 1;
-      if (last == 0) {
-        return input;
-      }
-      int start;
-      for (start = 0; start <= last; start++) {
-        char c = input.charAt(start);
-        if (c != '\t' && c != ' ') {
-          break;
+        void parseTraceParentHeader(String tp) {
+            int length = tp == null ? 0 : tp.length();
+            if (length < TRACE_PARENT_LENGTH) {
+                throw new IllegalStateException("The length of traceparent '" + tp + "' is too short");
+            }
+            long version = LongStringUtils.parseUnsignedLongHex(tp, 0, 2, true);
+            if (version == 255) {
+                throw new IllegalStateException("Illegal version number " + tp.substring(0, 2));
+            } else if (version == 0 && length > TRACE_PARENT_LENGTH) {
+                throw new IllegalStateException("The length of traceparent '" + tp + "' is too long");
+            }
+            DDTraceId traceId = DD128bTraceId.fromHex(tp, TRACE_PARENT_TID_START, 32, true);
+            if (traceId.toLong() == 0) {
+                throw new IllegalStateException("Illegal all zero 64 bit trace id "
+                        + tp.substring(TRACE_PARENT_TID_START, TRACE_PARENT_TID_END));
+            }
+            this.traceId = traceId;
+            this.spanId = DDSpanId.fromHex(tp, TRACE_PARENT_SID_START, 16, true);
+            if (this.spanId == 0) {
+                throw new IllegalStateException(
+                        "Illegal all zero span id " + tp.substring(TRACE_PARENT_SID_START, TRACE_PARENT_SID_END));
+            }
+            if (version != 0 && length > TRACE_PARENT_LENGTH && tp.charAt(TRACE_PARENT_LENGTH) != '-') {
+                throw new IllegalStateException("Illegal character after flags in '" + tp + "'");
+            }
+            long flags = LongStringUtils.parseUnsignedLongHex(tp, TRACE_PARENT_FLAGS_START, 2, true);
+            if ((flags & TRACE_PARENT_FLAGS_SAMPLED) != 0) {
+                this.samplingPriority = SAMPLER_KEEP;
+            } else {
+                this.samplingPriority = SAMPLER_DROP;
+            }
+        }
+
+        void parseTraceStateHeader(String tracestate) {
+            if (tracestate == null || tracestate.isEmpty()) {
+                this.propagationTags = this.propagationTagsFactory.empty();
+            } else {
+                this.propagationTags = this.propagationTagsFactory.fromHeaderValue(W3C, tracestate);
+            }
+            this.lastParentId = this.propagationTags.getLastParentId();
+            int ptagsPriority = this.propagationTags.getSamplingPriority();
+            int contextPriority = this.samplingPriority;
+            if ((contextPriority == SAMPLER_DROP && ptagsPriority > 0)
+                    || (contextPriority == SAMPLER_KEEP && ptagsPriority <= 0)
+                    || ptagsPriority == PrioritySampling.UNSET) {
+                // Override Datadog sampling priority with W3C one
+                this.propagationTags.updateTraceSamplingPriority(contextPriority, SamplingMechanism.EXTERNAL_OVERRIDE);
+            } else {
+                // Use more detailed Datadog sampling priority in context
+                this.samplingPriority = ptagsPriority;
+            }
+            // Use the origin
+            this.origin = this.propagationTags.getOrigin();
+            // Ensure TraceId high-order bits match
+            this.propagationTags.updateTraceIdHighOrderBits(this.traceId.toHighOrderLong());
         }
-      }
-      int end;
-      for (end = last; end > start; end--) {
-        char c = input.charAt(end);
-        if (c != '\t' && c != ' ') {
-          break;
+
+        private static String trim(String input) {
+            if (input == null) {
+                return "";
+            }
+            final int last = input.length() - 1;
+            if (last == 0) {
+                return input;
+            }
+            int start;
+            for (start = 0; start <= last; start++) {
+                char c = input.charAt(start);
+                if (c != '\t' && c != ' ') {
+                    break;
+                }
+            }
+            int end;
+            for (end = last; end > start; end--) {
+                char c = input.charAt(end);
+                if (c != '\t' && c != ' ') {
+                    break;
+                }
+            }
+            if (start == 0 && end == last) {
+                return input;
+            } else {
+                return input.substring(start, end + 1);
+            }
         }
-      }
-      if (start == 0 && end == last) {
-        return input;
-      } else {
-        return input.substring(start, end + 1);
-      }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayHttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayHttpCodec.java
index 1060e706b89..c4d13616e6a 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayHttpCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayHttpCodec.java
@@ -27,219 +27,215 @@
  * https://docs.aws.amazon.com/xray/latest/devguide/xray-concepts.html#xray-concepts-tracingheader
  */
 class XRayHttpCodec {
-  private static final Logger log = LoggerFactory.getLogger(XRayHttpCodec.class);
+    private static final Logger log = LoggerFactory.getLogger(XRayHttpCodec.class);
 
-  public static final String X_AMZN_TRACE_ID = "X-Amzn-Trace-Id";
+    public static final String X_AMZN_TRACE_ID = "X-Amzn-Trace-Id";
 
-  static final String ROOT = "Root";
-  static final String PARENT = "Parent";
-  static final String SAMPLED = "Sampled";
-  static final String SELF = "Self";
+    static final String ROOT = "Root";
+    static final String PARENT = "Parent";
+    static final String SAMPLED = "Sampled";
+    static final String SELF = "Self";
 
-  static final String ROOT_PREFIX = ROOT + "=1-";
-  static final String TRACE_ID_PADDING = "-00000000";
-  static final String PARENT_PREFIX = PARENT + '=';
-  static final String SAMPLED_PREFIX = SAMPLED + '=';
-  static final String SELF_PREFIX = SELF + '=';
-  static final String ORIGIN_PREFIX = ORIGIN_KEY + '=';
+    static final String ROOT_PREFIX = ROOT + "=1-";
+    static final String TRACE_ID_PADDING = "-00000000";
+    static final String PARENT_PREFIX = PARENT + '=';
+    static final String SAMPLED_PREFIX = SAMPLED + '=';
+    static final String SELF_PREFIX = SELF + '=';
+    static final String ORIGIN_PREFIX = ORIGIN_KEY + '=';
 
-  static final int ROOT_PREAMBLE = ROOT_PREFIX.length() + 8; // prefix plus 8-character epoch
+    static final int ROOT_PREAMBLE = ROOT_PREFIX.length() + 8; // prefix plus 8-character epoch
 
-  static final String E2E_START_KEY = DDTags.TRACE_START_TIME;
-  static final String E2E_START_PREFIX = E2E_START_KEY + '=';
+    static final String E2E_START_KEY = DDTags.TRACE_START_TIME;
+    static final String E2E_START_PREFIX = E2E_START_KEY + '=';
 
-  static final int MAX_ADDITIONAL_BYTES = 256;
+    static final int MAX_ADDITIONAL_BYTES = 256;
 
-  private XRayHttpCodec() {
-    // This class should not be created. This also makes code coverage checks happy.
-  }
-
-  public static HttpCodec.Injector newInjector(Map<String, String> invertedBaggageMapping) {
-    return new Injector(invertedBaggageMapping);
-  }
+    private XRayHttpCodec() {
+        // This class should not be created. This also makes code coverage checks happy.
+    }
 
-  private static class Injector implements HttpCodec.Injector {
+    public static HttpCodec.Injector newInjector(Map<String, String> invertedBaggageMapping) {
+        return new Injector(invertedBaggageMapping);
+    }
 
-    private final Map<String, String> invertedBaggageMapping;
+    private static class Injector implements HttpCodec.Injector {
 
-    public Injector(Map<String, String> invertedBaggageMapping) {
-      this.invertedBaggageMapping = invertedBaggageMapping;
-    }
+        private final Map<String, String> invertedBaggageMapping;
 
-    @Override
-    public <C> void inject(DDSpanContext context, C carrier, CarrierSetter<C> setter) {
-      long e2eStart = context.getEndToEndStartTime();
-
-      StringBuilder buf =
-          new StringBuilder()
-              .append(ROOT_PREFIX)
-              .append(
-                  String.format(
-                      "%08x",
-                      e2eStart > 0
-                          ? NANOSECONDS.toSeconds(e2eStart)
-                          : MILLISECONDS.toSeconds(
-                              context.getTraceCollector().getTimeSource().getCurrentTimeMillis())))
-              .append(TRACE_ID_PADDING)
-              .append(context.getTraceId().toHexStringPadded(16))
-              .append(';' + PARENT_PREFIX)
-              .append(DDSpanId.toHexStringPadded(context.getSpanId()));
-
-      if (context.lockSamplingPriority()) {
-        buf.append(';' + SAMPLED_PREFIX)
-            .append(convertSamplingPriority(context.getSamplingPriority()));
-      }
-
-      int maxCapacity = buf.length() + MAX_ADDITIONAL_BYTES;
-
-      CharSequence origin = context.getOrigin();
-      if (origin != null) {
-        additionalPart(buf, ORIGIN_KEY, origin.toString(), maxCapacity);
-      }
-      if (e2eStart > 0) {
-        additionalPart(
-            buf, E2E_START_KEY, Long.toString(NANOSECONDS.toMillis(e2eStart)), maxCapacity);
-      }
-
-      for (Map.Entry<String, String> entry : context.baggageItems()) {
-        String header = invertedBaggageMapping.getOrDefault(entry.getKey(), entry.getKey());
-        if (!isReserved(header)) {
-          additionalPart(buf, header, HttpCodec.encode(entry.getValue()), maxCapacity);
+        public Injector(Map<String, String> invertedBaggageMapping) {
+            this.invertedBaggageMapping = invertedBaggageMapping;
         }
-      }
 
-      setter.set(carrier, X_AMZN_TRACE_ID, buf.toString());
-    }
+        @Override
+        public <C> void inject(DDSpanContext context, C carrier, CarrierSetter<C> setter) {
+            long e2eStart = context.getEndToEndStartTime();
+
+            StringBuilder buf = new StringBuilder()
+                    .append(ROOT_PREFIX)
+                    .append(String.format(
+                            "%08x",
+                            e2eStart > 0
+                                    ? NANOSECONDS.toSeconds(e2eStart)
+                                    : MILLISECONDS.toSeconds(context.getTraceCollector()
+                                            .getTimeSource()
+                                            .getCurrentTimeMillis())))
+                    .append(TRACE_ID_PADDING)
+                    .append(context.getTraceId().toHexStringPadded(16))
+                    .append(';' + PARENT_PREFIX)
+                    .append(DDSpanId.toHexStringPadded(context.getSpanId()));
+
+            if (context.lockSamplingPriority()) {
+                buf.append(';' + SAMPLED_PREFIX).append(convertSamplingPriority(context.getSamplingPriority()));
+            }
 
-    private boolean isReserved(String key) {
-      return ROOT.equals(key) || PARENT.equals(key) || SAMPLED.equals(key) || SELF.equals(key);
-    }
+            int maxCapacity = buf.length() + MAX_ADDITIONAL_BYTES;
 
-    private char convertSamplingPriority(int samplingPriority) {
-      return samplingPriority > 0 ? '1' : '0';
-    }
+            CharSequence origin = context.getOrigin();
+            if (origin != null) {
+                additionalPart(buf, ORIGIN_KEY, origin.toString(), maxCapacity);
+            }
+            if (e2eStart > 0) {
+                additionalPart(buf, E2E_START_KEY, Long.toString(NANOSECONDS.toMillis(e2eStart)), maxCapacity);
+            }
 
-    private void additionalPart(StringBuilder buf, String key, String value, int maxCapacity) {
-      if (buf.length() + key.length() + value.length() + 2 <= maxCapacity) {
-        buf.append(';').append(key).append('=').append(value);
-      }
-    }
-  }
+            for (Map.Entry<String, String> entry : context.baggageItems()) {
+                String header = invertedBaggageMapping.getOrDefault(entry.getKey(), entry.getKey());
+                if (!isReserved(header)) {
+                    additionalPart(buf, header, HttpCodec.encode(entry.getValue()), maxCapacity);
+                }
+            }
 
-  public static HttpCodec.Extractor newExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier) {
-    return new TagContextExtractor(traceConfigSupplier, () -> new XRayContextInterpreter(config));
-  }
+            setter.set(carrier, X_AMZN_TRACE_ID, buf.toString());
+        }
 
-  static class XRayContextInterpreter extends ContextInterpreter {
+        private boolean isReserved(String key) {
+            return ROOT.equals(key) || PARENT.equals(key) || SAMPLED.equals(key) || SELF.equals(key);
+        }
 
-    private XRayContextInterpreter(Config config) {
-      super(config);
+        private char convertSamplingPriority(int samplingPriority) {
+            return samplingPriority > 0 ? '1' : '0';
+        }
+
+        private void additionalPart(StringBuilder buf, String key, String value, int maxCapacity) {
+            if (buf.length() + key.length() + value.length() + 2 <= maxCapacity) {
+                buf.append(';').append(key).append('=').append(value);
+            }
+        }
     }
 
-    @Override
-    public TracePropagationStyle style() {
-      return XRAY;
+    public static HttpCodec.Extractor newExtractor(Config config, Supplier<TraceConfig> traceConfigSupplier) {
+        return new TagContextExtractor(traceConfigSupplier, () -> new XRayContextInterpreter(config));
     }
 
-    @Override
-    public boolean accept(String key, String value) {
-      if (null == key || key.isEmpty()) {
-        return true;
-      }
-      if (LOG_EXTRACT_HEADER_NAMES) {
-        log.debug("Header: {}", key);
-      }
-      try {
-        char first = Character.toLowerCase(key.charAt(0));
-        switch (first) {
-          case 'x':
-            if (X_AMZN_TRACE_ID.equalsIgnoreCase(key)) {
-              handleXRayTraceHeader(this, value);
-            } else {
-              handledXForwarding(key, value);
-            }
-            break;
-          case 'f':
-            handledForwarding(key, value);
-            break;
-          case 'u':
-            handledUserAgent(key, value);
-            break;
-          default:
-        }
+    static class XRayContextInterpreter extends ContextInterpreter {
 
-        handledIpHeaders(key, value);
-        if (!handleTags(key, value)) {
-          handleMappedBaggage(key, value);
+        private XRayContextInterpreter(Config config) {
+            super(config);
         }
-        return true;
-      } catch (RuntimeException e) {
-        invalidateContext();
-        log.debug("Exception when extracting context", e);
-        return false;
-      }
-    }
 
-    static void handleXRayTraceHeader(ContextInterpreter interpreter, String value) {
-      if (null != value) {
-        int rootPart = value.indexOf(ROOT_PREFIX);
-        if (rootPart < 0
-            || !value.regionMatches(
-                rootPart + ROOT_PREAMBLE, TRACE_ID_PADDING, 0, TRACE_ID_PADDING.length())) {
-          return; // header doesn't match our padded version, ignore it
+        @Override
+        public TracePropagationStyle style() {
+            return XRAY;
         }
-        int startPart = 0;
-        int length = value.length();
-        while (startPart < length) {
-          int endPart = value.indexOf(';', startPart);
-          if (endPart < 0) {
-            endPart = length;
-          }
-          String part = value.substring(startPart, endPart).trim();
-          if (part.startsWith(ROOT_PREFIX)) {
-            if (interpreter.traceId == null || interpreter.traceId == DDTraceId.ZERO) {
-              interpreter.traceId =
-                  DD64bTraceId.fromHex(part.substring(ROOT_PREAMBLE + TRACE_ID_PADDING.length()));
+
+        @Override
+        public boolean accept(String key, String value) {
+            if (null == key || key.isEmpty()) {
+                return true;
             }
-          } else if (part.startsWith(PARENT_PREFIX)) {
-            if (interpreter.spanId == DDSpanId.ZERO) {
-              interpreter.spanId = DDSpanId.fromHex(part.substring(PARENT_PREFIX.length()));
+            if (LOG_EXTRACT_HEADER_NAMES) {
+                log.debug("Header: {}", key);
             }
-          } else if (part.startsWith(SAMPLED_PREFIX)) {
-            if (interpreter.samplingPriority == PrioritySampling.UNSET) {
-              interpreter.samplingPriority =
-                  convertSamplingPriority(part.charAt(SAMPLED_PREFIX.length()));
+            try {
+                char first = Character.toLowerCase(key.charAt(0));
+                switch (first) {
+                    case 'x':
+                        if (X_AMZN_TRACE_ID.equalsIgnoreCase(key)) {
+                            handleXRayTraceHeader(this, value);
+                        } else {
+                            handledXForwarding(key, value);
+                        }
+                        break;
+                    case 'f':
+                        handledForwarding(key, value);
+                        break;
+                    case 'u':
+                        handledUserAgent(key, value);
+                        break;
+                    default:
+                }
+
+                handledIpHeaders(key, value);
+                if (!handleTags(key, value)) {
+                    handleMappedBaggage(key, value);
+                }
+                return true;
+            } catch (RuntimeException e) {
+                invalidateContext();
+                log.debug("Exception when extracting context", e);
+                return false;
             }
-          } else if (part.startsWith(SELF_PREFIX)) {
-            // Self is added by load-balancers and should be ignored
-          } else if (part.startsWith(ORIGIN_PREFIX)) {
-            interpreter.origin = part.substring(ORIGIN_PREFIX.length());
-          } else if (part.startsWith(E2E_START_PREFIX)) {
-            interpreter.endToEndStartTime =
-                extractEndToEndStartTime(part.substring(E2E_START_PREFIX.length()));
-          } else {
-            int eqIndex = part.indexOf('=');
-            if (eqIndex > 0) {
-              interpreter.addBaggageItem(part.substring(0, eqIndex), part.substring(eqIndex + 1));
+        }
+
+        static void handleXRayTraceHeader(ContextInterpreter interpreter, String value) {
+            if (null != value) {
+                int rootPart = value.indexOf(ROOT_PREFIX);
+                if (rootPart < 0
+                        || !value.regionMatches(
+                                rootPart + ROOT_PREAMBLE, TRACE_ID_PADDING, 0, TRACE_ID_PADDING.length())) {
+                    return; // header doesn't match our padded version, ignore it
+                }
+                int startPart = 0;
+                int length = value.length();
+                while (startPart < length) {
+                    int endPart = value.indexOf(';', startPart);
+                    if (endPart < 0) {
+                        endPart = length;
+                    }
+                    String part = value.substring(startPart, endPart).trim();
+                    if (part.startsWith(ROOT_PREFIX)) {
+                        if (interpreter.traceId == null || interpreter.traceId == DDTraceId.ZERO) {
+                            interpreter.traceId =
+                                    DD64bTraceId.fromHex(part.substring(ROOT_PREAMBLE + TRACE_ID_PADDING.length()));
+                        }
+                    } else if (part.startsWith(PARENT_PREFIX)) {
+                        if (interpreter.spanId == DDSpanId.ZERO) {
+                            interpreter.spanId = DDSpanId.fromHex(part.substring(PARENT_PREFIX.length()));
+                        }
+                    } else if (part.startsWith(SAMPLED_PREFIX)) {
+                        if (interpreter.samplingPriority == PrioritySampling.UNSET) {
+                            interpreter.samplingPriority =
+                                    convertSamplingPriority(part.charAt(SAMPLED_PREFIX.length()));
+                        }
+                    } else if (part.startsWith(SELF_PREFIX)) {
+                        // Self is added by load-balancers and should be ignored
+                    } else if (part.startsWith(ORIGIN_PREFIX)) {
+                        interpreter.origin = part.substring(ORIGIN_PREFIX.length());
+                    } else if (part.startsWith(E2E_START_PREFIX)) {
+                        interpreter.endToEndStartTime =
+                                extractEndToEndStartTime(part.substring(E2E_START_PREFIX.length()));
+                    } else {
+                        int eqIndex = part.indexOf('=');
+                        if (eqIndex > 0) {
+                            interpreter.addBaggageItem(part.substring(0, eqIndex), part.substring(eqIndex + 1));
+                        }
+                    }
+                    startPart = endPart + 1;
+                }
             }
-          }
-          startPart = endPart + 1;
         }
-      }
-    }
 
-    private static long extractEndToEndStartTime(String value) {
-      try {
-        return MILLISECONDS.toNanos(Long.parseLong(value));
-      } catch (RuntimeException e) {
-        log.debug("Ignoring invalid end-to-end start time {}", value, e);
-        return 0;
-      }
-    }
+        private static long extractEndToEndStartTime(String value) {
+            try {
+                return MILLISECONDS.toNanos(Long.parseLong(value));
+            } catch (RuntimeException e) {
+                log.debug("Ignoring invalid end-to-end start time {}", value, e);
+                return 0;
+            }
+        }
 
-    private static int convertSamplingPriority(char samplingPriority) {
-      return '1' == samplingPriority ? SAMPLER_KEEP : SAMPLER_DROP;
+        private static int convertSamplingPriority(char samplingPriority) {
+            return '1' == samplingPriority ? SAMPLER_KEEP : SAMPLER_DROP;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayPropagator.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayPropagator.java
index bffb5835bd9..85796955cca 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayPropagator.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayPropagator.java
@@ -22,37 +22,34 @@
  */
 @ParametersAreNonnullByDefault
 public class XRayPropagator implements Propagator {
-  private final HttpCodec.Injector injector;
+    private final HttpCodec.Injector injector;
 
-  /**
-   * Constructor.
-   *
-   * @param config the config get the baggage mapping from.
-   */
-  public XRayPropagator(Config config) {
-    this.injector = XRayHttpCodec.newInjector(config.getBaggageMapping());
-  }
-
-  @Override
-  public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {
-    AgentSpan span;
-    //noinspection ConstantValue
-    if (context == null
-        || carrier == null
-        || setter == null
-        || (span = fromContext(context)) == null) {
-      return;
+    /**
+     * Constructor.
+     *
+     * @param config the config get the baggage mapping from.
+     */
+    public XRayPropagator(Config config) {
+        this.injector = XRayHttpCodec.newInjector(config.getBaggageMapping());
     }
-    AgentSpanContext spanContext = span.spanContext();
-    if (spanContext instanceof DDSpanContext) {
-      DDSpanContext ddSpanContext = (DDSpanContext) spanContext;
-      ddSpanContext.getTraceCollector().setSamplingPriorityIfNecessary();
-      this.injector.inject(ddSpanContext, carrier, setter);
+
+    @Override
+    public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {
+        AgentSpan span;
+        //noinspection ConstantValue
+        if (context == null || carrier == null || setter == null || (span = fromContext(context)) == null) {
+            return;
+        }
+        AgentSpanContext spanContext = span.spanContext();
+        if (spanContext instanceof DDSpanContext) {
+            DDSpanContext ddSpanContext = (DDSpanContext) spanContext;
+            ddSpanContext.getTraceCollector().setSamplingPriorityIfNecessary();
+            this.injector.inject(ddSpanContext, carrier, setter);
+        }
     }
-  }
 
-  @Override
-  public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
-    return context;
-  }
+    @Override
+    public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
+        return context;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OpmStampingInjector.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OpmStampingInjector.java
index 6ee131b8df5..c0689dc067e 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OpmStampingInjector.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OpmStampingInjector.java
@@ -16,20 +16,20 @@
  */
 final class OpmStampingInjector implements HttpCodec.Injector {
 
-  private final HttpCodec.Injector delegate;
-  private final Supplier<String> localOpmSupplier;
+    private final HttpCodec.Injector delegate;
+    private final Supplier<String> localOpmSupplier;
 
-  OpmStampingInjector(HttpCodec.Injector delegate, Supplier<String> localOpmSupplier) {
-    this.delegate = delegate;
-    this.localOpmSupplier = localOpmSupplier;
-  }
+    OpmStampingInjector(HttpCodec.Injector delegate, Supplier<String> localOpmSupplier) {
+        this.delegate = delegate;
+        this.localOpmSupplier = localOpmSupplier;
+    }
 
-  @Override
-  public <C> void inject(DDSpanContext context, C carrier, CarrierSetter<C> setter) {
-    String localOpm = localOpmSupplier.get();
-    if (localOpm != null) {
-      context.getPropagationTags().updateOrgPropagationMarker(localOpm);
+    @Override
+    public <C> void inject(DDSpanContext context, C carrier, CarrierSetter<C> setter) {
+        String localOpm = localOpmSupplier.get();
+        if (localOpm != null) {
+            context.getPropagationTags().updateOrgPropagationMarker(localOpm);
+        }
+        delegate.inject(context, carrier, setter);
     }
-    delegate.inject(context, carrier, setter);
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OrgGuard.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OrgGuard.java
index 870bb80fd61..65d8bbc6a3d 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OrgGuard.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OrgGuard.java
@@ -16,48 +16,46 @@
  */
 public final class OrgGuard {
 
-  @Nullable private final OrgGuardEnforcer enforcer;
-
-  public static OrgGuard create(
-      Config config,
-      Supplier<String> localOpmSupplier,
-      PropagationTags.Factory propagationTagsFactory,
-      HealthMetrics healthMetrics) {
-    if (!config.isTraceOrgGuardEnabled()) {
-      return new OrgGuard(null);
+    @Nullable
+    private final OrgGuardEnforcer enforcer;
+
+    public static OrgGuard create(
+            Config config,
+            Supplier<String> localOpmSupplier,
+            PropagationTags.Factory propagationTagsFactory,
+            HealthMetrics healthMetrics) {
+        if (!config.isTraceOrgGuardEnabled()) {
+            return new OrgGuard(null);
+        }
+        return new OrgGuard(new OrgGuardEnforcer(config, localOpmSupplier, propagationTagsFactory, healthMetrics));
     }
-    return new OrgGuard(
-        new OrgGuardEnforcer(config, localOpmSupplier, propagationTagsFactory, healthMetrics));
-  }
 
-  private OrgGuard(@Nullable OrgGuardEnforcer enforcer) {
-    this.enforcer = enforcer;
-  }
+    private OrgGuard(@Nullable OrgGuardEnforcer enforcer) {
+        this.enforcer = enforcer;
+    }
 
-  public HttpCodec.Extractor decorateExtractor(HttpCodec.Extractor delegate) {
-    return enforcer == null ? delegate : new OrgGuardEnforcingExtractor(delegate, enforcer);
-  }
+    public HttpCodec.Extractor decorateExtractor(HttpCodec.Extractor delegate) {
+        return enforcer == null ? delegate : new OrgGuardEnforcingExtractor(delegate, enforcer);
+    }
 
-  public HttpCodec.Injector decorateInjector(HttpCodec.Injector delegate) {
-    return enforcer == null
-        ? delegate
-        : new OpmStampingInjector(delegate, enforcer.localOpmSupplier());
-  }
+    public HttpCodec.Injector decorateInjector(HttpCodec.Injector delegate) {
+        return enforcer == null ? delegate : new OpmStampingInjector(delegate, enforcer.localOpmSupplier());
+    }
 
-  /** Reason an extracted Datadog context was dropped by the OPG enforcer. */
-  public enum Reason {
-    MISMATCH("mismatch"),
-    STRICT_MISSING("strict_missing");
+    /** Reason an extracted Datadog context was dropped by the OPG enforcer. */
+    public enum Reason {
+        MISMATCH("mismatch"),
+        STRICT_MISSING("strict_missing");
 
-    private final String tag;
+        private final String tag;
 
-    Reason(String tag) {
-      this.tag = tag;
-    }
+        Reason(String tag) {
+            this.tag = tag;
+        }
 
-    /** Statsd tag value for the {@code reason} dimension on {@code org_guard.enforce} metrics. */
-    public String tag() {
-      return tag;
+        /** Statsd tag value for the {@code reason} dimension on {@code org_guard.enforce} metrics. */
+        public String tag() {
+            return tag;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OrgGuardEnforcer.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OrgGuardEnforcer.java
index 2bf37d87324..cf9cc5a0597 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OrgGuardEnforcer.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OrgGuardEnforcer.java
@@ -32,94 +32,93 @@
  */
 final class OrgGuardEnforcer {
 
-  private static final Logger log = LoggerFactory.getLogger(OrgGuardEnforcer.class);
+    private static final Logger log = LoggerFactory.getLogger(OrgGuardEnforcer.class);
 
-  private final boolean strict;
-  private final Set<String> trustedOpms;
-  private final Supplier<String> localOpmSupplier;
-  private final PropagationTags.Factory factory;
-  private final HealthMetrics healthMetrics;
+    private final boolean strict;
+    private final Set<String> trustedOpms;
+    private final Supplier<String> localOpmSupplier;
+    private final PropagationTags.Factory factory;
+    private final HealthMetrics healthMetrics;
 
-  OrgGuardEnforcer(
-      Config config,
-      Supplier<String> localOpmSupplier,
-      PropagationTags.Factory factory,
-      HealthMetrics healthMetrics) {
-    this(
-        config.isTraceOrgGuardStrict(),
-        config.getTraceOrgGuardTrustedOpms(),
-        localOpmSupplier,
-        factory,
-        healthMetrics);
-  }
-
-  // Visible for testing.
-  OrgGuardEnforcer(
-      boolean strict,
-      Set<String> trustedOpms,
-      Supplier<String> localOpmSupplier,
-      PropagationTags.Factory factory,
-      HealthMetrics healthMetrics) {
-    this.strict = strict;
-    this.trustedOpms = trustedOpms;
-    this.localOpmSupplier = localOpmSupplier;
-    this.factory = factory;
-    this.healthMetrics = healthMetrics;
-  }
-
-  Supplier<String> localOpmSupplier() {
-    return localOpmSupplier;
-  }
-
-  /**
-   * Returns {@code extracted} unchanged unless OPG enforcement applies, in which case it returns a
-   * fresh {@link ExtractedContext} with the Datadog-side context dropped.
-   */
-  public TagContext enforce(TagContext extracted) {
-    if (!(extracted instanceof ExtractedContext)) {
-      return extracted;
+    OrgGuardEnforcer(
+            Config config,
+            Supplier<String> localOpmSupplier,
+            PropagationTags.Factory factory,
+            HealthMetrics healthMetrics) {
+        this(
+                config.isTraceOrgGuardStrict(),
+                config.getTraceOrgGuardTrustedOpms(),
+                localOpmSupplier,
+                factory,
+                healthMetrics);
     }
-    ExtractedContext ctx = (ExtractedContext) extracted;
-    String localOpm = localOpmSupplier.get();
-    if (localOpm == null) {
-      // We don't know our own OPM yet — never enforce.
-      return extracted;
+
+    // Visible for testing.
+    OrgGuardEnforcer(
+            boolean strict,
+            Set<String> trustedOpms,
+            Supplier<String> localOpmSupplier,
+            PropagationTags.Factory factory,
+            HealthMetrics healthMetrics) {
+        this.strict = strict;
+        this.trustedOpms = trustedOpms;
+        this.localOpmSupplier = localOpmSupplier;
+        this.factory = factory;
+        this.healthMetrics = healthMetrics;
     }
-    CharSequence opmChars = ctx.getPropagationTags().getOrgPropagationMarker();
-    if (opmChars == null) {
-      if (!strict) {
-        return extracted;
-      }
-      return strip(ctx, OrgGuard.Reason.STRICT_MISSING, localOpm, null);
+
+    Supplier<String> localOpmSupplier() {
+        return localOpmSupplier;
     }
-    String inboundOpm = opmChars.toString();
-    if (localOpm.equals(inboundOpm) || trustedOpms.contains(inboundOpm)) {
-      return extracted;
+
+    /**
+     * Returns {@code extracted} unchanged unless OPG enforcement applies, in which case it returns a
+     * fresh {@link ExtractedContext} with the Datadog-side context dropped.
+     */
+    public TagContext enforce(TagContext extracted) {
+        if (!(extracted instanceof ExtractedContext)) {
+            return extracted;
+        }
+        ExtractedContext ctx = (ExtractedContext) extracted;
+        String localOpm = localOpmSupplier.get();
+        if (localOpm == null) {
+            // We don't know our own OPM yet — never enforce.
+            return extracted;
+        }
+        CharSequence opmChars = ctx.getPropagationTags().getOrgPropagationMarker();
+        if (opmChars == null) {
+            if (!strict) {
+                return extracted;
+            }
+            return strip(ctx, OrgGuard.Reason.STRICT_MISSING, localOpm, null);
+        }
+        String inboundOpm = opmChars.toString();
+        if (localOpm.equals(inboundOpm) || trustedOpms.contains(inboundOpm)) {
+            return extracted;
+        }
+        return strip(ctx, OrgGuard.Reason.MISMATCH, localOpm, inboundOpm);
     }
-    return strip(ctx, OrgGuard.Reason.MISMATCH, localOpm, inboundOpm);
-  }
 
-  private ExtractedContext strip(
-      ExtractedContext ctx, OrgGuard.Reason reason, String localOpm, String inboundOpm) {
-    log.debug(
-        "OPG enforcement: dropping dd context (reason={}, inbound={}, local={})",
-        reason.tag(),
-        inboundOpm,
-        localOpm);
-    healthMetrics.onOrgGuardEnforce(reason);
+    private ExtractedContext strip(ExtractedContext ctx, OrgGuard.Reason reason, String localOpm, String inboundOpm) {
+        log.debug(
+                "OPG enforcement: dropping dd context (reason={}, inbound={}, local={})",
+                reason.tag(),
+                inboundOpm,
+                localOpm);
+        healthMetrics.onOrgGuardEnforce(reason);
 
-    PropagationTags stripped = factory.emptyW3C(ctx.getPropagationTags().getW3CTracestate());
-    return new ExtractedContext(
-        ctx.getTraceId(),
-        ctx.getSpanId(),
-        PrioritySampling.UNSET,
-        null,
-        ctx.getEndToEndStartTime(),
-        ctx.getBaggage(),
-        ctx.getTags(),
-        null,
-        stripped,
-        ctx.getTraceConfig(),
-        ctx.getPropagationStyle());
-  }
+        PropagationTags stripped = factory.emptyW3C(ctx.getPropagationTags().getW3CTracestate());
+        return new ExtractedContext(
+                ctx.getTraceId(),
+                ctx.getSpanId(),
+                PrioritySampling.UNSET,
+                null,
+                ctx.getEndToEndStartTime(),
+                ctx.getBaggage(),
+                ctx.getTags(),
+                null,
+                stripped,
+                ctx.getTraceConfig(),
+                ctx.getPropagationStyle());
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OrgGuardEnforcingExtractor.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OrgGuardEnforcingExtractor.java
index c0526bf6dd8..3864eb2d49b 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OrgGuardEnforcingExtractor.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OrgGuardEnforcingExtractor.java
@@ -11,21 +11,21 @@
  */
 final class OrgGuardEnforcingExtractor implements HttpCodec.Extractor {
 
-  private final HttpCodec.Extractor delegate;
-  private final OrgGuardEnforcer enforcer;
+    private final HttpCodec.Extractor delegate;
+    private final OrgGuardEnforcer enforcer;
 
-  OrgGuardEnforcingExtractor(HttpCodec.Extractor delegate, OrgGuardEnforcer enforcer) {
-    this.delegate = delegate;
-    this.enforcer = enforcer;
-  }
+    OrgGuardEnforcingExtractor(HttpCodec.Extractor delegate, OrgGuardEnforcer enforcer) {
+        this.delegate = delegate;
+        this.enforcer = enforcer;
+    }
 
-  @Override
-  public <C> TagContext extract(C carrier, AgentPropagation.ContextVisitor<C> getter) {
-    return enforcer.enforce(delegate.extract(carrier, getter));
-  }
+    @Override
+    public <C> TagContext extract(C carrier, AgentPropagation.ContextVisitor<C> getter) {
+        return enforcer.enforce(delegate.extract(carrier, getter));
+    }
 
-  @Override
-  public void cleanup() {
-    delegate.cleanup();
-  }
+    @Override
+    public void cleanup() {
+        delegate.cleanup();
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/DatadogPTagsCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/DatadogPTagsCodec.java
index 3be0d091672..89acf0e58ec 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/DatadogPTagsCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/DatadogPTagsCodec.java
@@ -12,171 +12,158 @@
 
 /** Captures configuration required for PropagationTags logic */
 final class DatadogPTagsCodec extends PTagsCodec {
-  private static final RatelimitedLogger log =
-      new RatelimitedLogger(LoggerFactory.getLogger(DatadogPTagsCodec.class), 5, TimeUnit.MINUTES);
-  private static final String PROPAGATION_ERROR_EXTRACT_MAX_SIZE = "extract_max_size";
-  private static final String PROPAGATION_ERROR_DECODING_ERROR = "decoding_error";
-  private static final char TAGS_SEPARATOR = ',';
-  private static final char TAG_KEY_SEPARATOR = '=';
-  private static final int MIN_ALLOWED_CHAR = 32;
-  private static final int MAX_ALLOWED_CHAR = 126;
+    private static final RatelimitedLogger log =
+            new RatelimitedLogger(LoggerFactory.getLogger(DatadogPTagsCodec.class), 5, TimeUnit.MINUTES);
+    private static final String PROPAGATION_ERROR_EXTRACT_MAX_SIZE = "extract_max_size";
+    private static final String PROPAGATION_ERROR_DECODING_ERROR = "decoding_error";
+    private static final char TAGS_SEPARATOR = ',';
+    private static final char TAG_KEY_SEPARATOR = '=';
+    private static final int MIN_ALLOWED_CHAR = 32;
+    private static final int MAX_ALLOWED_CHAR = 126;
 
-  private final int xDatadogTagsLimit;
+    private final int xDatadogTagsLimit;
 
-  DatadogPTagsCodec(int xDatadogTagsLimit) {
-    this.xDatadogTagsLimit = xDatadogTagsLimit;
-  }
-
-  /**
-   * Parses a header value with next eBNF:
-   *
-   * <pre>
-   *   tagset = ( tag, { ",", tag } ) | "";
-   *   tag = ( identifier - space or equal ), "=", identifier;
-   *   identifier = allowed characters, { allowed characters };
-   *   allowed characters = ( ? ASCII characters 32-126 ? - comma );
-   *   space or equal = " " | "=";
-   *   comma = ",";
-   * </pre>
-   *
-   * All tags prefixed with `_dd.p.` are extracted from tagSet except for `_dd.p.upstream_services`.
-   * TagSet that doesn't respect the format will be dropped and a warning will be logged.
-   *
-   * @return a PropagationTags containing only _dd.p.* tags or an error if the header value is
-   *     invalid
-   */
-  @Override
-  PropagationTags fromHeaderValue(PTagsFactory tagsFactory, String value) {
-    if (value == null) {
-      return tagsFactory.empty();
-    }
-    if (value.length() > xDatadogTagsLimit) {
-      // Incoming x-datadog-tags value length exceeds datadogTagsLimit
-      // Set _dd.propagation_error:extract_max_size
-      return tagsFactory.createInvalid(PROPAGATION_ERROR_EXTRACT_MAX_SIZE);
+    DatadogPTagsCodec(int xDatadogTagsLimit) {
+        this.xDatadogTagsLimit = xDatadogTagsLimit;
     }
 
-    List<TagElement> tagPairs = null;
-    int len = value.length();
-    int tagPos = 0;
-    TagValue decisionMakerTagValue = null;
-    TagValue traceIdTagValue = null;
-    int traceSource = 0;
-    TagValue orgPropagationMarkerTagValue = null;
-    while (tagPos < len) {
-      int tagKeyEndsAt =
-          validateCharsUntilSeparatorOrEnd(
-              value, tagPos, TAG_KEY_SEPARATOR, DatadogPTagsCodec::isAllowedKeyChar);
-      if (tagKeyEndsAt < 0 || tagKeyEndsAt == len) {
-        log.warn("Invalid datadog tags header value: '{}' at {}", value, tagPos);
-        return tagsFactory.createInvalid(PROPAGATION_ERROR_DECODING_ERROR);
-      }
-      int tagValuePos = tagKeyEndsAt + 1;
-      int tagValueEndsAt =
-          validateCharsUntilSeparatorOrEnd(
-              value, tagValuePos, TAGS_SEPARATOR, DatadogPTagsCodec::isAllowedValueChar);
-      if (tagValueEndsAt < 0) {
-        log.warn("Invalid datadog tags header value: '{}' at {}", value, tagKeyEndsAt);
-        return tagsFactory.createInvalid(PROPAGATION_ERROR_DECODING_ERROR);
-      }
-      TagKey tagKey = TagKey.from(Encoding.DATADOG, value, tagPos, tagKeyEndsAt);
-      TagValue tagValue = TagValue.from(Encoding.DATADOG, value, tagValuePos, tagValueEndsAt);
-      if (tagKey != null) {
-        if (!tagKey.equals(UPSTREAM_SERVICES_DEPRECATED_TAG)) {
-          if (!validateTagValue(tagKey, tagValue)) {
-            log.warn(
-                "Invalid datadog tags header value: '{}' invalid tag value at {}",
-                value,
-                tagValuePos);
-            if (tagKey.equals(TRACE_ID_TAG)) {
-              return tagsFactory.createInvalid(PROPAGATION_ERROR_MALFORMED_TID + tagValue);
+    /**
+     * Parses a header value with next eBNF:
+     *
+     * <pre>
+     *   tagset = ( tag, { ",", tag } ) | "";
+     *   tag = ( identifier - space or equal ), "=", identifier;
+     *   identifier = allowed characters, { allowed characters };
+     *   allowed characters = ( ? ASCII characters 32-126 ? - comma );
+     *   space or equal = " " | "=";
+     *   comma = ",";
+     * </pre>
+     *
+     * All tags prefixed with `_dd.p.` are extracted from tagSet except for `_dd.p.upstream_services`.
+     * TagSet that doesn't respect the format will be dropped and a warning will be logged.
+     *
+     * @return a PropagationTags containing only _dd.p.* tags or an error if the header value is
+     *     invalid
+     */
+    @Override
+    PropagationTags fromHeaderValue(PTagsFactory tagsFactory, String value) {
+        if (value == null) {
+            return tagsFactory.empty();
+        }
+        if (value.length() > xDatadogTagsLimit) {
+            // Incoming x-datadog-tags value length exceeds datadogTagsLimit
+            // Set _dd.propagation_error:extract_max_size
+            return tagsFactory.createInvalid(PROPAGATION_ERROR_EXTRACT_MAX_SIZE);
+        }
+
+        List<TagElement> tagPairs = null;
+        int len = value.length();
+        int tagPos = 0;
+        TagValue decisionMakerTagValue = null;
+        TagValue traceIdTagValue = null;
+        int traceSource = 0;
+        TagValue orgPropagationMarkerTagValue = null;
+        while (tagPos < len) {
+            int tagKeyEndsAt = validateCharsUntilSeparatorOrEnd(
+                    value, tagPos, TAG_KEY_SEPARATOR, DatadogPTagsCodec::isAllowedKeyChar);
+            if (tagKeyEndsAt < 0 || tagKeyEndsAt == len) {
+                log.warn("Invalid datadog tags header value: '{}' at {}", value, tagPos);
+                return tagsFactory.createInvalid(PROPAGATION_ERROR_DECODING_ERROR);
+            }
+            int tagValuePos = tagKeyEndsAt + 1;
+            int tagValueEndsAt = validateCharsUntilSeparatorOrEnd(
+                    value, tagValuePos, TAGS_SEPARATOR, DatadogPTagsCodec::isAllowedValueChar);
+            if (tagValueEndsAt < 0) {
+                log.warn("Invalid datadog tags header value: '{}' at {}", value, tagKeyEndsAt);
+                return tagsFactory.createInvalid(PROPAGATION_ERROR_DECODING_ERROR);
             }
-            return tagsFactory.createInvalid(PROPAGATION_ERROR_DECODING_ERROR);
-          }
-          if (tagKey.equals(DECISION_MAKER_TAG)) {
-            decisionMakerTagValue = tagValue;
-          } else if (tagKey.equals(TRACE_ID_TAG)) {
-            traceIdTagValue = tagValue;
-          } else if (tagKey.equals(TRACE_SOURCE_TAG)) {
-            traceSource = ProductTraceSource.parseBitfieldHex(tagValue.toString());
-          } else if (tagKey.equals(ORG_PROPAGATION_MARKER_TAG)) {
-            orgPropagationMarkerTagValue = tagValue;
-          } else {
-            if (tagPairs == null) {
-              // This is roughly the size of a two element linked list but can hold six
-              tagPairs = new ArrayList<>(6);
+            TagKey tagKey = TagKey.from(Encoding.DATADOG, value, tagPos, tagKeyEndsAt);
+            TagValue tagValue = TagValue.from(Encoding.DATADOG, value, tagValuePos, tagValueEndsAt);
+            if (tagKey != null) {
+                if (!tagKey.equals(UPSTREAM_SERVICES_DEPRECATED_TAG)) {
+                    if (!validateTagValue(tagKey, tagValue)) {
+                        log.warn("Invalid datadog tags header value: '{}' invalid tag value at {}", value, tagValuePos);
+                        if (tagKey.equals(TRACE_ID_TAG)) {
+                            return tagsFactory.createInvalid(PROPAGATION_ERROR_MALFORMED_TID + tagValue);
+                        }
+                        return tagsFactory.createInvalid(PROPAGATION_ERROR_DECODING_ERROR);
+                    }
+                    if (tagKey.equals(DECISION_MAKER_TAG)) {
+                        decisionMakerTagValue = tagValue;
+                    } else if (tagKey.equals(TRACE_ID_TAG)) {
+                        traceIdTagValue = tagValue;
+                    } else if (tagKey.equals(TRACE_SOURCE_TAG)) {
+                        traceSource = ProductTraceSource.parseBitfieldHex(tagValue.toString());
+                    } else if (tagKey.equals(ORG_PROPAGATION_MARKER_TAG)) {
+                        orgPropagationMarkerTagValue = tagValue;
+                    } else {
+                        if (tagPairs == null) {
+                            // This is roughly the size of a two element linked list but can hold six
+                            tagPairs = new ArrayList<>(6);
+                        }
+                        tagPairs.add(tagKey);
+                        tagPairs.add(tagValue);
+                    }
+                }
             }
-            tagPairs.add(tagKey);
-            tagPairs.add(tagValue);
-          }
+            tagPos = tagValueEndsAt + 1;
         }
-      }
-      tagPos = tagValueEndsAt + 1;
+        return tagsFactory.createValid(
+                tagPairs, decisionMakerTagValue, traceIdTagValue, traceSource, orgPropagationMarkerTagValue);
     }
-    return tagsFactory.createValid(
-        tagPairs,
-        decisionMakerTagValue,
-        traceIdTagValue,
-        traceSource,
-        orgPropagationMarkerTagValue);
-  }
 
-  @Override
-  protected int appendTag(StringBuilder sb, TagElement key, TagElement value, int size) {
-    if (size <= xDatadogTagsLimit) {
-      if (sb.length() > 0) {
-        sb.append(TAGS_SEPARATOR);
-      }
-      sb.append(key.forType(Encoding.DATADOG));
-      sb.append(TAG_KEY_SEPARATOR);
-      sb.append(value.forType(Encoding.DATADOG));
+    @Override
+    protected int appendTag(StringBuilder sb, TagElement key, TagElement value, int size) {
+        if (size <= xDatadogTagsLimit) {
+            if (sb.length() > 0) {
+                sb.append(TAGS_SEPARATOR);
+            }
+            sb.append(key.forType(Encoding.DATADOG));
+            sb.append(TAG_KEY_SEPARATOR);
+            sb.append(value.forType(Encoding.DATADOG));
+        }
+        return size;
     }
-    return size;
-  }
 
-  @Override
-  protected boolean isTooLarge(StringBuilder sb, int size) {
-    return size > xDatadogTagsLimit;
-  }
-
-  @Override
-  protected boolean isEmpty(StringBuilder sb, int size) {
-    return sb.length() == 0;
-  }
+    @Override
+    protected boolean isTooLarge(StringBuilder sb, int size) {
+        return size > xDatadogTagsLimit;
+    }
 
-  private static int validateCharsUntilSeparatorOrEnd(
-      String s, int start, char separator, IntPredicate isValid) {
-    int end = s.length();
-    if (start >= end) {
-      return -1;
+    @Override
+    protected boolean isEmpty(StringBuilder sb, int size) {
+        return sb.length() == 0;
     }
-    int pos = start;
-    char c = s.charAt(pos);
-    do {
-      if (!isValid.test(c) || c == separator) {
-        return -1;
-      }
-      pos++;
-      if (pos < end) {
-        c = s.charAt(pos);
-        if (c == separator) {
-          break; // trailing separator allowed; caller resumes parsing from here
+
+    private static int validateCharsUntilSeparatorOrEnd(String s, int start, char separator, IntPredicate isValid) {
+        int end = s.length();
+        if (start >= end) {
+            return -1;
         }
-      }
-    } while (pos < end);
+        int pos = start;
+        char c = s.charAt(pos);
+        do {
+            if (!isValid.test(c) || c == separator) {
+                return -1;
+            }
+            pos++;
+            if (pos < end) {
+                c = s.charAt(pos);
+                if (c == separator) {
+                    break; // trailing separator allowed; caller resumes parsing from here
+                }
+            }
+        } while (pos < end);
 
-    return pos;
-  }
+        return pos;
+    }
 
-  private static boolean isAllowedKeyChar(int c) {
-    // space (MIN_ALLOWED_CHAR) is not allowed
-    return c > MIN_ALLOWED_CHAR
-        && c <= MAX_ALLOWED_CHAR
-        && c != TAG_KEY_SEPARATOR
-        && c != TAGS_SEPARATOR;
-  }
+    private static boolean isAllowedKeyChar(int c) {
+        // space (MIN_ALLOWED_CHAR) is not allowed
+        return c > MIN_ALLOWED_CHAR && c <= MAX_ALLOWED_CHAR && c != TAG_KEY_SEPARATOR && c != TAGS_SEPARATOR;
+    }
 
-  private static boolean isAllowedValueChar(int c) {
-    return c >= MIN_ALLOWED_CHAR && c <= MAX_ALLOWED_CHAR;
-  }
+    private static boolean isAllowedValueChar(int c) {
+        return c >= MIN_ALLOWED_CHAR && c <= MAX_ALLOWED_CHAR;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/OtelTraceState.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/OtelTraceState.java
index 267e5b9664b..7f07ddf31ee 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/OtelTraceState.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/OtelTraceState.java
@@ -3,457 +3,446 @@
 import datadog.trace.api.internal.util.LongStringUtils;
 
 final class OtelTraceState implements CharSequence {
-  private static final String RANDOM_VALUE_KEY = "rv:";
-  private static final String THRESHOLD_KEY = "th:";
-  private static final long HASH_MULTIPLIER = 1_111_111_111_111_111_111L;
-  private static final long MAX_56_BIT_VALUE = 0x00ff_ffff_ffff_ffffL;
-  private static final double TWO_TO_56 = 0x1.0p56;
-  private static final int MAX_VALUE_LENGTH = 256;
-
-  private final CharSequence value;
-  private final CharSequence fields;
-  private final int originalSize;
-  private final long randomValue;
-  private final long threshold;
-  private final int randomValueStart;
-  private final int randomValueEnd;
-  private final int thresholdStart;
-  private final int thresholdEnd;
-  private final boolean includeRandomValue;
-  private final boolean includeThreshold;
-  private final boolean inheritedRandomValue;
-  private volatile String materializedValue;
-
-  private OtelTraceState(
-      CharSequence value,
-      CharSequence fields,
-      int originalSize,
-      long randomValue,
-      long threshold,
-      int randomValueStart,
-      int randomValueEnd,
-      int thresholdStart,
-      int thresholdEnd,
-      boolean includeRandomValue,
-      boolean includeThreshold,
-      boolean inheritedRandomValue) {
-    this.value = value;
-    this.fields = fields;
-    this.originalSize = originalSize;
-    this.randomValue = randomValue;
-    this.threshold = threshold;
-    this.randomValueStart = randomValueStart;
-    this.randomValueEnd = randomValueEnd;
-    this.thresholdStart = thresholdStart;
-    this.thresholdEnd = thresholdEnd;
-    this.includeRandomValue = includeRandomValue;
-    this.includeThreshold = includeThreshold;
-    this.inheritedRandomValue = inheritedRandomValue;
-  }
-
-  static OtelTraceState parse(CharSequence raw, int originalSize) {
-    if (raw == null || raw.length() == 0 || raw.length() > MAX_VALUE_LENGTH) {
-      return null;
-    }
+    private static final String RANDOM_VALUE_KEY = "rv:";
+    private static final String THRESHOLD_KEY = "th:";
+    private static final long HASH_MULTIPLIER = 1_111_111_111_111_111_111L;
+    private static final long MAX_56_BIT_VALUE = 0x00ff_ffff_ffff_ffffL;
+    private static final double TWO_TO_56 = 0x1.0p56;
+    private static final int MAX_VALUE_LENGTH = 256;
+
+    private final CharSequence value;
+    private final CharSequence fields;
+    private final int originalSize;
+    private final long randomValue;
+    private final long threshold;
+    private final int randomValueStart;
+    private final int randomValueEnd;
+    private final int thresholdStart;
+    private final int thresholdEnd;
+    private final boolean includeRandomValue;
+    private final boolean includeThreshold;
+    private final boolean inheritedRandomValue;
+    private volatile String materializedValue;
+
+    private OtelTraceState(
+            CharSequence value,
+            CharSequence fields,
+            int originalSize,
+            long randomValue,
+            long threshold,
+            int randomValueStart,
+            int randomValueEnd,
+            int thresholdStart,
+            int thresholdEnd,
+            boolean includeRandomValue,
+            boolean includeThreshold,
+            boolean inheritedRandomValue) {
+        this.value = value;
+        this.fields = fields;
+        this.originalSize = originalSize;
+        this.randomValue = randomValue;
+        this.threshold = threshold;
+        this.randomValueStart = randomValueStart;
+        this.randomValueEnd = randomValueEnd;
+        this.thresholdStart = thresholdStart;
+        this.thresholdEnd = thresholdEnd;
+        this.includeRandomValue = includeRandomValue;
+        this.includeThreshold = includeThreshold;
+        this.inheritedRandomValue = inheritedRandomValue;
+    }
+
+    static OtelTraceState parse(CharSequence raw, int originalSize) {
+        if (raw == null || raw.length() == 0 || raw.length() > MAX_VALUE_LENGTH) {
+            return null;
+        }
 
-    int randomValueStart = -1;
-    int randomValueEnd = -1;
-    int thresholdStart = -1;
-    int thresholdEnd = -1;
-    boolean randomValueSeen = false;
-    boolean invalidRandomValue = false;
-    boolean managedFieldSeen = false;
-    boolean hasUnknownField = false;
-    boolean normalized = false;
-    int start = 0;
-    while (start <= raw.length()) {
-      int end = indexOf(raw, ';', start);
-      if (end < 0) {
-        end = raw.length();
-      }
-      if (startsWith(raw, start, end, RANDOM_VALUE_KEY)) {
-        managedFieldSeen = true;
-        int candidateStart = start + RANDOM_VALUE_KEY.length();
-        if (!randomValueSeen) {
-          randomValueSeen = true;
-          if (isLowerHex(raw, candidateStart, end, 14, 14)) {
-            randomValueStart = candidateStart;
-            randomValueEnd = end;
-          } else {
-            invalidRandomValue = true;
-            normalized = true;
-          }
-        } else {
-          normalized = true;
-        }
-      } else if (startsWith(raw, start, end, THRESHOLD_KEY)) {
-        managedFieldSeen = true;
-        int candidateStart = start + THRESHOLD_KEY.length();
-        if (thresholdStart < 0 && isLowerHex(raw, candidateStart, end, 1, 14)) {
-          thresholdStart = candidateStart;
-          thresholdEnd = end;
-        } else {
-          normalized = true;
-        }
-      } else if (isUnknownField(raw, start, end)) {
-        hasUnknownField = true;
-      } else {
-        normalized = true;
-      }
-      if (end == raw.length()) {
-        break;
-      }
-      start = end + 1;
-    }
+        int randomValueStart = -1;
+        int randomValueEnd = -1;
+        int thresholdStart = -1;
+        int thresholdEnd = -1;
+        boolean randomValueSeen = false;
+        boolean invalidRandomValue = false;
+        boolean managedFieldSeen = false;
+        boolean hasUnknownField = false;
+        boolean normalized = false;
+        int start = 0;
+        while (start <= raw.length()) {
+            int end = indexOf(raw, ';', start);
+            if (end < 0) {
+                end = raw.length();
+            }
+            if (startsWith(raw, start, end, RANDOM_VALUE_KEY)) {
+                managedFieldSeen = true;
+                int candidateStart = start + RANDOM_VALUE_KEY.length();
+                if (!randomValueSeen) {
+                    randomValueSeen = true;
+                    if (isLowerHex(raw, candidateStart, end, 14, 14)) {
+                        randomValueStart = candidateStart;
+                        randomValueEnd = end;
+                    } else {
+                        invalidRandomValue = true;
+                        normalized = true;
+                    }
+                } else {
+                    normalized = true;
+                }
+            } else if (startsWith(raw, start, end, THRESHOLD_KEY)) {
+                managedFieldSeen = true;
+                int candidateStart = start + THRESHOLD_KEY.length();
+                if (thresholdStart < 0 && isLowerHex(raw, candidateStart, end, 1, 14)) {
+                    thresholdStart = candidateStart;
+                    thresholdEnd = end;
+                } else {
+                    normalized = true;
+                }
+            } else if (isUnknownField(raw, start, end)) {
+                hasUnknownField = true;
+            } else {
+                normalized = true;
+            }
+            if (end == raw.length()) {
+                break;
+            }
+            start = end + 1;
+        }
 
-    if (invalidRandomValue) {
-      thresholdStart = -1;
-      thresholdEnd = -1;
-    }
+        if (invalidRandomValue) {
+            thresholdStart = -1;
+            thresholdEnd = -1;
+        }
 
-    if (randomValueStart < 0 && thresholdStart < 0 && !hasUnknownField) {
-      if (managedFieldSeen) {
-        return null;
-      }
-      return new OtelTraceState(raw, raw, originalSize, -1, -1, -1, -1, -1, -1, false, false, true);
-    }
-    if (normalized) {
-      CharSequence normalizedValue =
-          normalize(raw, randomValueStart, randomValueEnd, thresholdStart, thresholdEnd);
-      return parseCanonical(normalizedValue, originalSize);
-    }
-    return new OtelTraceState(
-        raw,
-        raw,
-        originalSize,
-        parseHex(raw, randomValueStart, randomValueEnd),
-        parseThreshold(raw, thresholdStart, thresholdEnd),
-        randomValueStart,
-        randomValueEnd,
-        thresholdStart,
-        thresholdEnd,
-        randomValueStart >= 0,
-        thresholdStart >= 0,
-        true);
-  }
-
-  private static OtelTraceState parseCanonical(CharSequence value, int originalSize) {
-    int randomValueStart = -1;
-    int randomValueEnd = -1;
-    int thresholdStart = -1;
-    int thresholdEnd = -1;
-    int start = 0;
-    while (start < value.length()) {
-      int end = indexOf(value, ';', start);
-      if (end < 0) {
-        end = value.length();
-      }
-      if (startsWith(value, start, end, RANDOM_VALUE_KEY)) {
-        randomValueStart = start + RANDOM_VALUE_KEY.length();
-        randomValueEnd = end;
-      } else if (startsWith(value, start, end, THRESHOLD_KEY)) {
-        thresholdStart = start + THRESHOLD_KEY.length();
-        thresholdEnd = end;
-      }
-      start = end + 1;
-    }
-    return new OtelTraceState(
-        value,
-        value,
-        originalSize,
-        parseHex(value, randomValueStart, randomValueEnd),
-        parseThreshold(value, thresholdStart, thresholdEnd),
-        randomValueStart,
-        randomValueEnd,
-        thresholdStart,
-        thresholdEnd,
-        randomValueStart >= 0,
-        thresholdStart >= 0,
-        true);
-  }
-
-  static OtelTraceState fromProbabilityDecision(
-      long traceIdLowOrderBits, double rate, int samplingPriority) {
-    long hash = traceIdLowOrderBits * HASH_MULTIPLIER;
-    long randomValue = (~hash) >>> 8;
-    long threshold = Math.round((1.0 - rate) * TWO_TO_56);
-    if (threshold > MAX_56_BIT_VALUE) {
-      threshold = MAX_56_BIT_VALUE;
-    } else if (threshold < 0) {
-      // rate > 1.0: saturate to "always sample", as formatKnuthSamplingRate does for t.ksr.
-      threshold = 0;
+        if (randomValueStart < 0 && thresholdStart < 0 && !hasUnknownField) {
+            if (managedFieldSeen) {
+                return null;
+            }
+            return new OtelTraceState(raw, raw, originalSize, -1, -1, -1, -1, -1, -1, false, false, true);
+        }
+        if (normalized) {
+            CharSequence normalizedValue =
+                    normalize(raw, randomValueStart, randomValueEnd, thresholdStart, thresholdEnd);
+            return parseCanonical(normalizedValue, originalSize);
+        }
+        return new OtelTraceState(
+                raw,
+                raw,
+                originalSize,
+                parseHex(raw, randomValueStart, randomValueEnd),
+                parseThreshold(raw, thresholdStart, thresholdEnd),
+                randomValueStart,
+                randomValueEnd,
+                thresholdStart,
+                thresholdEnd,
+                randomValueStart >= 0,
+                thresholdStart >= 0,
+                true);
+    }
+
+    private static OtelTraceState parseCanonical(CharSequence value, int originalSize) {
+        int randomValueStart = -1;
+        int randomValueEnd = -1;
+        int thresholdStart = -1;
+        int thresholdEnd = -1;
+        int start = 0;
+        while (start < value.length()) {
+            int end = indexOf(value, ';', start);
+            if (end < 0) {
+                end = value.length();
+            }
+            if (startsWith(value, start, end, RANDOM_VALUE_KEY)) {
+                randomValueStart = start + RANDOM_VALUE_KEY.length();
+                randomValueEnd = end;
+            } else if (startsWith(value, start, end, THRESHOLD_KEY)) {
+                thresholdStart = start + THRESHOLD_KEY.length();
+                thresholdEnd = end;
+            }
+            start = end + 1;
+        }
+        return new OtelTraceState(
+                value,
+                value,
+                originalSize,
+                parseHex(value, randomValueStart, randomValueEnd),
+                parseThreshold(value, thresholdStart, thresholdEnd),
+                randomValueStart,
+                randomValueEnd,
+                thresholdStart,
+                thresholdEnd,
+                randomValueStart >= 0,
+                thresholdStart >= 0,
+                true);
+    }
+
+    static OtelTraceState fromProbabilityDecision(long traceIdLowOrderBits, double rate, int samplingPriority) {
+        long hash = traceIdLowOrderBits * HASH_MULTIPLIER;
+        long randomValue = (~hash) >>> 8;
+        long threshold = Math.round((1.0 - rate) * TWO_TO_56);
+        if (threshold > MAX_56_BIT_VALUE) {
+            threshold = MAX_56_BIT_VALUE;
+        } else if (threshold < 0) {
+            // rate > 1.0: saturate to "always sample", as formatKnuthSamplingRate does for t.ksr.
+            threshold = 0;
+        }
+        if (samplingPriority > 0 && randomValue < threshold) {
+            randomValue = threshold;
+        } else if (samplingPriority <= 0 && randomValue >= threshold) {
+            randomValue = threshold == 0 ? 0 : threshold - 1;
+        }
+
+        return new OtelTraceState(null, null, 0, randomValue, threshold, -1, -1, -1, -1, true, true, false);
     }
-    if (samplingPriority > 0 && randomValue < threshold) {
-      randomValue = threshold;
-    } else if (samplingPriority <= 0 && randomValue >= threshold) {
-      randomValue = threshold == 0 ? 0 : threshold - 1;
+
+    OtelTraceState withoutThreshold() {
+        if (!includeThreshold) {
+            return this;
+        }
+        return withFields(includeRandomValue, false, inheritedRandomValue);
     }
 
-    return new OtelTraceState(
-        null, null, 0, randomValue, threshold, -1, -1, -1, -1, true, true, false);
-  }
+    OtelTraceState withoutInheritedThreshold() {
+        return inheritedRandomValue ? withoutThreshold() : this;
+    }
 
-  OtelTraceState withoutThreshold() {
-    if (!includeThreshold) {
-      return this;
+    OtelTraceState forNonProbabilityDecision() {
+        if (!includeThreshold && (!includeRandomValue || inheritedRandomValue)) {
+            return this;
+        }
+        return withFields(inheritedRandomValue && includeRandomValue, false, inheritedRandomValue);
     }
-    return withFields(includeRandomValue, false, inheritedRandomValue);
-  }
 
-  OtelTraceState withoutInheritedThreshold() {
-    return inheritedRandomValue ? withoutThreshold() : this;
-  }
+    boolean isConsistentWith(boolean sampled) {
+        if (!includeRandomValue || !includeThreshold) {
+            return true;
+        }
+        return (randomValue >= threshold) == sampled;
+    }
 
-  OtelTraceState forNonProbabilityDecision() {
-    if (!includeThreshold && (!includeRandomValue || inheritedRandomValue)) {
-      return this;
+    private OtelTraceState withFields(
+            boolean retainRandomValue, boolean retainThreshold, boolean randomValueIsInherited) {
+        if (!retainRandomValue && !retainThreshold && !hasUnknownFields()) {
+            return null;
+        }
+        return new OtelTraceState(
+                null,
+                fields,
+                0,
+                randomValue,
+                threshold,
+                randomValueStart,
+                randomValueEnd,
+                thresholdStart,
+                thresholdEnd,
+                retainRandomValue,
+                retainThreshold,
+                randomValueIsInherited);
     }
-    return withFields(inheritedRandomValue && includeRandomValue, false, inheritedRandomValue);
-  }
 
-  boolean isConsistentWith(boolean sampled) {
-    if (!includeRandomValue || !includeThreshold) {
-      return true;
+    int getOriginalSize() {
+        return originalSize;
     }
-    return (randomValue >= threshold) == sampled;
-  }
 
-  private OtelTraceState withFields(
-      boolean retainRandomValue, boolean retainThreshold, boolean randomValueIsInherited) {
-    if (!retainRandomValue && !retainThreshold && !hasUnknownFields()) {
-      return null;
+    boolean isMaterialized() {
+        return materializedValue != null;
     }
-    return new OtelTraceState(
-        null,
-        fields,
-        0,
-        randomValue,
-        threshold,
-        randomValueStart,
-        randomValueEnd,
-        thresholdStart,
-        thresholdEnd,
-        retainRandomValue,
-        retainThreshold,
-        randomValueIsInherited);
-  }
-
-  int getOriginalSize() {
-    return originalSize;
-  }
-
-  boolean isMaterialized() {
-    return materializedValue != null;
-  }
-
-  CharSequence comparisonValue() {
-    return value == null ? materialize() : value;
-  }
-
-  @Override
-  public int length() {
-    return value == null ? materialize().length() : value.length();
-  }
-
-  @Override
-  public char charAt(int index) {
-    return value == null ? materialize().charAt(index) : value.charAt(index);
-  }
-
-  @Override
-  public CharSequence subSequence(int start, int end) {
-    return value == null ? materialize().subSequence(start, end) : value.subSequence(start, end);
-  }
-
-  @Override
-  public String toString() {
-    return value == null ? materialize() : value.toString();
-  }
-
-  private String materialize() {
-    String current = materializedValue;
-    if (current != null) {
-      return current;
+
+    CharSequence comparisonValue() {
+        return value == null ? materialize() : value;
     }
-    StringBuilder result = new StringBuilder(32);
-    if (includeRandomValue) {
-      appendManagedField(
-          result, RANDOM_VALUE_KEY, randomValue, randomValueStart, randomValueEnd, false);
+
+    @Override
+    public int length() {
+        return value == null ? materialize().length() : value.length();
     }
-    if (includeThreshold) {
-      appendManagedField(result, THRESHOLD_KEY, threshold, thresholdStart, thresholdEnd, true);
+
+    @Override
+    public char charAt(int index) {
+        return value == null ? materialize().charAt(index) : value.charAt(index);
     }
-    appendUnknownFields(result);
-    current = result.toString();
-    materializedValue = current;
-    return current;
-  }
-
-  private void appendManagedField(
-      StringBuilder result,
-      String key,
-      long numericValue,
-      int sourceStart,
-      int sourceEnd,
-      boolean trimTrailingZeros) {
-    appendSeparator(result);
-    result.append(key);
-    if (fields != null && sourceStart >= 0) {
-      result.append(fields, sourceStart, sourceEnd);
-    } else {
-      appendHex(result, numericValue, trimTrailingZeros);
+
+    @Override
+    public CharSequence subSequence(int start, int end) {
+        return value == null ? materialize().subSequence(start, end) : value.subSequence(start, end);
     }
-  }
 
-  private void appendUnknownFields(StringBuilder result) {
-    if (fields == null) {
-      return;
+    @Override
+    public String toString() {
+        return value == null ? materialize() : value.toString();
     }
-    int start = 0;
-    while (start < fields.length()) {
-      int end = indexOf(fields, ';', start);
-      if (end < 0) {
-        end = fields.length();
-      }
-      if (!startsWith(fields, start, end, RANDOM_VALUE_KEY)
-          && !startsWith(fields, start, end, THRESHOLD_KEY)) {
+
+    private String materialize() {
+        String current = materializedValue;
+        if (current != null) {
+            return current;
+        }
+        StringBuilder result = new StringBuilder(32);
+        if (includeRandomValue) {
+            appendManagedField(result, RANDOM_VALUE_KEY, randomValue, randomValueStart, randomValueEnd, false);
+        }
+        if (includeThreshold) {
+            appendManagedField(result, THRESHOLD_KEY, threshold, thresholdStart, thresholdEnd, true);
+        }
+        appendUnknownFields(result);
+        current = result.toString();
+        materializedValue = current;
+        return current;
+    }
+
+    private void appendManagedField(
+            StringBuilder result,
+            String key,
+            long numericValue,
+            int sourceStart,
+            int sourceEnd,
+            boolean trimTrailingZeros) {
         appendSeparator(result);
-        result.append(fields, start, end);
-      }
-      start = end + 1;
+        result.append(key);
+        if (fields != null && sourceStart >= 0) {
+            result.append(fields, sourceStart, sourceEnd);
+        } else {
+            appendHex(result, numericValue, trimTrailingZeros);
+        }
     }
-  }
 
-  private boolean hasUnknownFields() {
-    if (fields == null) {
-      return false;
-    }
-    int start = 0;
-    while (start < fields.length()) {
-      int end = indexOf(fields, ';', start);
-      if (end < 0) {
-        end = fields.length();
-      }
-      if (!startsWith(fields, start, end, RANDOM_VALUE_KEY)
-          && !startsWith(fields, start, end, THRESHOLD_KEY)) {
-        return true;
-      }
-      start = end + 1;
+    private void appendUnknownFields(StringBuilder result) {
+        if (fields == null) {
+            return;
+        }
+        int start = 0;
+        while (start < fields.length()) {
+            int end = indexOf(fields, ';', start);
+            if (end < 0) {
+                end = fields.length();
+            }
+            if (!startsWith(fields, start, end, RANDOM_VALUE_KEY) && !startsWith(fields, start, end, THRESHOLD_KEY)) {
+                appendSeparator(result);
+                result.append(fields, start, end);
+            }
+            start = end + 1;
+        }
     }
-    return false;
-  }
-
-  private static CharSequence normalize(
-      CharSequence raw,
-      int randomValueStart,
-      int randomValueEnd,
-      int thresholdStart,
-      int thresholdEnd) {
-    StringBuilder result = new StringBuilder(raw.length());
-    if (randomValueStart >= 0) {
-      appendRange(result, RANDOM_VALUE_KEY, raw, randomValueStart, randomValueEnd);
+
+    private boolean hasUnknownFields() {
+        if (fields == null) {
+            return false;
+        }
+        int start = 0;
+        while (start < fields.length()) {
+            int end = indexOf(fields, ';', start);
+            if (end < 0) {
+                end = fields.length();
+            }
+            if (!startsWith(fields, start, end, RANDOM_VALUE_KEY) && !startsWith(fields, start, end, THRESHOLD_KEY)) {
+                return true;
+            }
+            start = end + 1;
+        }
+        return false;
     }
-    if (thresholdStart >= 0) {
-      appendRange(result, THRESHOLD_KEY, raw, thresholdStart, thresholdEnd);
+
+    private static CharSequence normalize(
+            CharSequence raw, int randomValueStart, int randomValueEnd, int thresholdStart, int thresholdEnd) {
+        StringBuilder result = new StringBuilder(raw.length());
+        if (randomValueStart >= 0) {
+            appendRange(result, RANDOM_VALUE_KEY, raw, randomValueStart, randomValueEnd);
+        }
+        if (thresholdStart >= 0) {
+            appendRange(result, THRESHOLD_KEY, raw, thresholdStart, thresholdEnd);
+        }
+        int start = 0;
+        while (start < raw.length()) {
+            int end = indexOf(raw, ';', start);
+            if (end < 0) {
+                end = raw.length();
+            }
+            if (!startsWith(raw, start, end, RANDOM_VALUE_KEY)
+                    && !startsWith(raw, start, end, THRESHOLD_KEY)
+                    && isUnknownField(raw, start, end)) {
+                appendSeparator(result);
+                result.append(raw, start, end);
+            }
+            start = end + 1;
+        }
+        return result.toString();
     }
-    int start = 0;
-    while (start < raw.length()) {
-      int end = indexOf(raw, ';', start);
-      if (end < 0) {
-        end = raw.length();
-      }
-      if (!startsWith(raw, start, end, RANDOM_VALUE_KEY)
-          && !startsWith(raw, start, end, THRESHOLD_KEY)
-          && isUnknownField(raw, start, end)) {
+
+    private static void appendRange(StringBuilder result, String key, CharSequence source, int start, int end) {
         appendSeparator(result);
-        result.append(raw, start, end);
-      }
-      start = end + 1;
+        result.append(key).append(source, start, end);
     }
-    return result.toString();
-  }
-
-  private static void appendRange(
-      StringBuilder result, String key, CharSequence source, int start, int end) {
-    appendSeparator(result);
-    result.append(key).append(source, start, end);
-  }
-
-  private static void appendSeparator(StringBuilder result) {
-    if (result.length() > 0) {
-      result.append(';');
-    }
-  }
-
-  private static void appendHex(StringBuilder result, long value, boolean trimTrailingZeros) {
-    int digits = 14;
-    if (trimTrailingZeros) {
-      long remaining = value;
-      while (digits > 1 && (remaining & 0xf) == 0) {
-        remaining >>>= 4;
-        digits--;
-      }
-    }
-    for (int i = 13; i >= 14 - digits; i--) {
-      int digit = (int) ((value >>> (i * 4)) & 0xf);
-      result.append((char) (digit < 10 ? '0' + digit : 'a' + digit - 10));
+
+    private static void appendSeparator(StringBuilder result) {
+        if (result.length() > 0) {
+            result.append(';');
+        }
     }
-  }
 
-  private static int indexOf(CharSequence value, char target, int start) {
-    return indexOf(value, target, start, value.length());
-  }
+    private static void appendHex(StringBuilder result, long value, boolean trimTrailingZeros) {
+        int digits = 14;
+        if (trimTrailingZeros) {
+            long remaining = value;
+            while (digits > 1 && (remaining & 0xf) == 0) {
+                remaining >>>= 4;
+                digits--;
+            }
+        }
+        for (int i = 13; i >= 14 - digits; i--) {
+            int digit = (int) ((value >>> (i * 4)) & 0xf);
+            result.append((char) (digit < 10 ? '0' + digit : 'a' + digit - 10));
+        }
+    }
 
-  private static int indexOf(CharSequence value, char target, int start, int end) {
-    for (int i = start; i < end; i++) {
-      if (value.charAt(i) == target) {
-        return i;
-      }
+    private static int indexOf(CharSequence value, char target, int start) {
+        return indexOf(value, target, start, value.length());
     }
-    return -1;
-  }
 
-  private static boolean startsWith(CharSequence value, int start, int end, CharSequence prefix) {
-    if (end - start < prefix.length()) {
-      return false;
+    private static int indexOf(CharSequence value, char target, int start, int end) {
+        for (int i = start; i < end; i++) {
+            if (value.charAt(i) == target) {
+                return i;
+            }
+        }
+        return -1;
     }
-    for (int i = 0; i < prefix.length(); i++) {
-      if (value.charAt(start + i) != prefix.charAt(i)) {
-        return false;
-      }
+
+    private static boolean startsWith(CharSequence value, int start, int end, CharSequence prefix) {
+        if (end - start < prefix.length()) {
+            return false;
+        }
+        for (int i = 0; i < prefix.length(); i++) {
+            if (value.charAt(start + i) != prefix.charAt(i)) {
+                return false;
+            }
+        }
+        return true;
     }
-    return true;
-  }
-
-  private static boolean isUnknownField(CharSequence value, int start, int end) {
-    return indexOf(value, ':', start + 1, end - 1) >= 0;
-  }
-
-  private static boolean isLowerHex(
-      CharSequence value, int start, int end, int minimumLength, int maximumLength) {
-    int length = end - start;
-    if (length < minimumLength || length > maximumLength) {
-      return false;
+
+    private static boolean isUnknownField(CharSequence value, int start, int end) {
+        return indexOf(value, ':', start + 1, end - 1) >= 0;
     }
-    for (int i = start; i < end; i++) {
-      if (!PTagsCodec.isHexDigit(value.charAt(i))) {
-        return false;
-      }
+
+    private static boolean isLowerHex(CharSequence value, int start, int end, int minimumLength, int maximumLength) {
+        int length = end - start;
+        if (length < minimumLength || length > maximumLength) {
+            return false;
+        }
+        for (int i = start; i < end; i++) {
+            if (!PTagsCodec.isHexDigit(value.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
     }
-    return true;
-  }
 
-  private static long parseHex(CharSequence value, int start, int end) {
-    if (start < 0) {
-      return -1;
+    private static long parseHex(CharSequence value, int start, int end) {
+        if (start < 0) {
+            return -1;
+        }
+        return LongStringUtils.parseUnsignedLongHex(value, start, end - start, true);
     }
-    return LongStringUtils.parseUnsignedLongHex(value, start, end - start, true);
-  }
 
-  private static long parseThreshold(CharSequence value, int start, int end) {
-    if (start < 0) {
-      return -1;
+    private static long parseThreshold(CharSequence value, int start, int end) {
+        if (start < 0) {
+            return -1;
+        }
+        return parseHex(value, start, end) << (4 * (14 - (end - start)));
     }
-    return parseHex(value, start, end) << (4 * (14 - (end - start)));
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/PTagsCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/PTagsCodec.java
index 57e713cadef..87c00d452ee 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/PTagsCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/PTagsCodec.java
@@ -12,288 +12,279 @@
 import java.util.Map;
 
 abstract class PTagsCodec {
-  private static final String PROPAGATION_ERROR_INJECT_MAX_SIZE = "inject_max_size";
-  private static final String PROPAGATION_ERROR_DISABLED = "disabled";
+    private static final String PROPAGATION_ERROR_INJECT_MAX_SIZE = "inject_max_size";
+    private static final String PROPAGATION_ERROR_DISABLED = "disabled";
 
-  protected static final TagKey DECISION_MAKER_TAG = TagKey.from("dm");
-  protected static final TagKey TRACE_ID_TAG = TagKey.from("tid");
-  protected static final TagKey TRACE_SOURCE_TAG = TagKey.from("ts");
-  protected static final TagKey DEBUG_TAG = TagKey.from("debug");
-  protected static final TagKey KNUTH_SAMPLING_RATE_TAG = TagKey.from("ksr");
-  protected static final TagKey ORG_PROPAGATION_MARKER_TAG = TagKey.from("opm");
-  protected static final String PROPAGATION_ERROR_MALFORMED_TID = "malformed_tid ";
-  protected static final String PROPAGATION_ERROR_INCONSISTENT_TID = "inconsistent_tid ";
-  protected static final TagKey UPSTREAM_SERVICES_DEPRECATED_TAG = TagKey.from("upstream_services");
+    protected static final TagKey DECISION_MAKER_TAG = TagKey.from("dm");
+    protected static final TagKey TRACE_ID_TAG = TagKey.from("tid");
+    protected static final TagKey TRACE_SOURCE_TAG = TagKey.from("ts");
+    protected static final TagKey DEBUG_TAG = TagKey.from("debug");
+    protected static final TagKey KNUTH_SAMPLING_RATE_TAG = TagKey.from("ksr");
+    protected static final TagKey ORG_PROPAGATION_MARKER_TAG = TagKey.from("opm");
+    protected static final String PROPAGATION_ERROR_MALFORMED_TID = "malformed_tid ";
+    protected static final String PROPAGATION_ERROR_INCONSISTENT_TID = "inconsistent_tid ";
+    protected static final TagKey UPSTREAM_SERVICES_DEPRECATED_TAG = TagKey.from("upstream_services");
 
-  static String headerValue(
-      PTagsCodec codec,
-      PTags ptags,
-      CharSequence lastParentIdOverride,
-      SamplingState samplingState) {
-    int estimate = codec.estimateHeaderSize(ptags, lastParentIdOverride, samplingState);
-    if (estimate == 0) {
-      return "";
-    }
+    static String headerValue(
+            PTagsCodec codec, PTags ptags, CharSequence lastParentIdOverride, SamplingState samplingState) {
+        int estimate = codec.estimateHeaderSize(ptags, lastParentIdOverride, samplingState);
+        if (estimate == 0) {
+            return "";
+        }
 
-    // No encoding validation here because we don't allow arbitrary tag change
-    StringBuilder sb = new StringBuilder(estimate);
-    int size = codec.appendPrefix(sb, ptags, lastParentIdOverride, samplingState);
-    if (!ptags.isPropagationTagsDisabled()) {
-      TagValue decisionMakerTagValue = ptags.getDecisionMakerTagValue(samplingState);
-      if (decisionMakerTagValue != null) {
-        size = codec.appendTag(sb, DECISION_MAKER_TAG, decisionMakerTagValue, size);
-      }
-      if (ptags.getTraceIdHighOrderBitsHexTagValue() != null) {
-        size = codec.appendTag(sb, TRACE_ID_TAG, ptags.getTraceIdHighOrderBitsHexTagValue(), size);
-      }
-      if (ptags.getTraceSource() != ProductTraceSource.UNSET) {
-        size =
-            codec.appendTag(
-                sb,
-                TRACE_SOURCE_TAG,
-                TagValue.from(ProductTraceSource.getBitfieldHex(ptags.getTraceSource())),
-                size);
-      }
-      if (ptags.getDebugPropagation() != null) {
-        size = codec.appendTag(sb, DEBUG_TAG, TagValue.from(ptags.getDebugPropagation()), size);
-      }
-      TagValue knuthSamplingRateTagValue = ptags.getKnuthSamplingRateTagValue(samplingState);
-      if (knuthSamplingRateTagValue != null) {
-        size = codec.appendTag(sb, KNUTH_SAMPLING_RATE_TAG, knuthSamplingRateTagValue, size);
-      }
-      if (ptags.getOrgPropagationMarkerTagValue() != null) {
-        size =
-            codec.appendTag(
-                sb, ORG_PROPAGATION_MARKER_TAG, ptags.getOrgPropagationMarkerTagValue(), size);
-      }
-      Iterator<TagElement> it = ptags.getTagPairs().iterator();
-      while (it.hasNext() && !codec.isTooLarge(sb, size)) {
-        TagElement tagKey = it.next();
-        TagElement tagValue = it.next();
-        size = codec.appendTag(sb, tagKey, tagValue, size);
-      }
-    }
-    size = codec.appendSuffix(sb, ptags, size, samplingState);
-    if (codec.isTooLarge(sb, size)) {
-      return null;
-    } else {
-      return codec.isEmpty(sb, size) ? null : sb.toString();
+        // No encoding validation here because we don't allow arbitrary tag change
+        StringBuilder sb = new StringBuilder(estimate);
+        int size = codec.appendPrefix(sb, ptags, lastParentIdOverride, samplingState);
+        if (!ptags.isPropagationTagsDisabled()) {
+            TagValue decisionMakerTagValue = ptags.getDecisionMakerTagValue(samplingState);
+            if (decisionMakerTagValue != null) {
+                size = codec.appendTag(sb, DECISION_MAKER_TAG, decisionMakerTagValue, size);
+            }
+            if (ptags.getTraceIdHighOrderBitsHexTagValue() != null) {
+                size = codec.appendTag(sb, TRACE_ID_TAG, ptags.getTraceIdHighOrderBitsHexTagValue(), size);
+            }
+            if (ptags.getTraceSource() != ProductTraceSource.UNSET) {
+                size = codec.appendTag(
+                        sb,
+                        TRACE_SOURCE_TAG,
+                        TagValue.from(ProductTraceSource.getBitfieldHex(ptags.getTraceSource())),
+                        size);
+            }
+            if (ptags.getDebugPropagation() != null) {
+                size = codec.appendTag(sb, DEBUG_TAG, TagValue.from(ptags.getDebugPropagation()), size);
+            }
+            TagValue knuthSamplingRateTagValue = ptags.getKnuthSamplingRateTagValue(samplingState);
+            if (knuthSamplingRateTagValue != null) {
+                size = codec.appendTag(sb, KNUTH_SAMPLING_RATE_TAG, knuthSamplingRateTagValue, size);
+            }
+            if (ptags.getOrgPropagationMarkerTagValue() != null) {
+                size = codec.appendTag(sb, ORG_PROPAGATION_MARKER_TAG, ptags.getOrgPropagationMarkerTagValue(), size);
+            }
+            Iterator<TagElement> it = ptags.getTagPairs().iterator();
+            while (it.hasNext() && !codec.isTooLarge(sb, size)) {
+                TagElement tagKey = it.next();
+                TagElement tagValue = it.next();
+                size = codec.appendTag(sb, tagKey, tagValue, size);
+            }
+        }
+        size = codec.appendSuffix(sb, ptags, size, samplingState);
+        if (codec.isTooLarge(sb, size)) {
+            return null;
+        } else {
+            return codec.isEmpty(sb, size) ? null : sb.toString();
+        }
     }
-  }
 
-  static void fillTagMap(PTags propagationTags, Map<String, String> tagMap) {
-    SamplingState samplingState = propagationTags.samplingState();
-    int newSize = propagationTags.getXDatadogTagsSize(samplingState);
+    static void fillTagMap(PTags propagationTags, Map<String, String> tagMap) {
+        SamplingState samplingState = propagationTags.samplingState();
+        int newSize = propagationTags.getXDatadogTagsSize(samplingState);
 
-    if (newSize > propagationTags.getxDatadogTagsLimit()) {
-      // Outgoing x-datadog-tags value length exceeds the configured limit
-      // Set _dd.propagation_error:inject_max_size if the configured limit is greater than zero,
-      // else set _dd.propagation_error:disabled
-      if (propagationTags.isPropagationTagsDisabled()) {
-        tagMap.put(PROPAGATION_ERROR_TAG_KEY, PROPAGATION_ERROR_DISABLED);
-      } else {
-        tagMap.put(PROPAGATION_ERROR_TAG_KEY, PROPAGATION_ERROR_INJECT_MAX_SIZE);
-      }
-      return;
-    }
+        if (newSize > propagationTags.getxDatadogTagsLimit()) {
+            // Outgoing x-datadog-tags value length exceeds the configured limit
+            // Set _dd.propagation_error:inject_max_size if the configured limit is greater than zero,
+            // else set _dd.propagation_error:disabled
+            if (propagationTags.isPropagationTagsDisabled()) {
+                tagMap.put(PROPAGATION_ERROR_TAG_KEY, PROPAGATION_ERROR_DISABLED);
+            } else {
+                tagMap.put(PROPAGATION_ERROR_TAG_KEY, PROPAGATION_ERROR_INJECT_MAX_SIZE);
+            }
+            return;
+        }
 
-    Iterator<TagElement> it = propagationTags.getTagPairs().iterator();
-    while (it.hasNext()) {
-      TagElement tagKey = it.next();
-      TagElement tagValue = it.next();
-      tagMap.put(
-          tagKey.forType(Encoding.DATADOG).toString(),
-          tagValue.forType(Encoding.DATADOG).toString());
-    }
-    TagValue decisionMakerTagValue = propagationTags.getDecisionMakerTagValue(samplingState);
-    if (decisionMakerTagValue != null) {
-      tagMap.put(
-          DECISION_MAKER_TAG.forType(Encoding.DATADOG).toString(),
-          decisionMakerTagValue.forType(Encoding.DATADOG).toString());
-    }
-    if (propagationTags.getTraceSource() != ProductTraceSource.UNSET) {
-      tagMap.put(
-          TRACE_SOURCE_TAG.forType(Encoding.DATADOG).toString(),
-          TagValue.from(ProductTraceSource.getBitfieldHex(propagationTags.getTraceSource()))
-              .forType(Encoding.DATADOG)
-              .toString());
-    }
-    if (propagationTags.getDebugPropagation() != null) {
-      tagMap.put(
-          DEBUG_TAG.forType(Encoding.DATADOG).toString(), propagationTags.getDebugPropagation());
+        Iterator<TagElement> it = propagationTags.getTagPairs().iterator();
+        while (it.hasNext()) {
+            TagElement tagKey = it.next();
+            TagElement tagValue = it.next();
+            tagMap.put(
+                    tagKey.forType(Encoding.DATADOG).toString(),
+                    tagValue.forType(Encoding.DATADOG).toString());
+        }
+        TagValue decisionMakerTagValue = propagationTags.getDecisionMakerTagValue(samplingState);
+        if (decisionMakerTagValue != null) {
+            tagMap.put(
+                    DECISION_MAKER_TAG.forType(Encoding.DATADOG).toString(),
+                    decisionMakerTagValue.forType(Encoding.DATADOG).toString());
+        }
+        if (propagationTags.getTraceSource() != ProductTraceSource.UNSET) {
+            tagMap.put(
+                    TRACE_SOURCE_TAG.forType(Encoding.DATADOG).toString(),
+                    TagValue.from(ProductTraceSource.getBitfieldHex(propagationTags.getTraceSource()))
+                            .forType(Encoding.DATADOG)
+                            .toString());
+        }
+        if (propagationTags.getDebugPropagation() != null) {
+            tagMap.put(DEBUG_TAG.forType(Encoding.DATADOG).toString(), propagationTags.getDebugPropagation());
+        }
+        TagValue knuthSamplingRateTagValue = propagationTags.getKnuthSamplingRateTagValue(samplingState);
+        if (knuthSamplingRateTagValue != null) {
+            tagMap.put(
+                    KNUTH_SAMPLING_RATE_TAG.forType(Encoding.DATADOG).toString(),
+                    knuthSamplingRateTagValue.forType(Encoding.DATADOG).toString());
+        }
+        if (propagationTags.getOrgPropagationMarkerTagValue() != null) {
+            tagMap.put(
+                    ORG_PROPAGATION_MARKER_TAG.forType(Encoding.DATADOG).toString(),
+                    propagationTags
+                            .getOrgPropagationMarkerTagValue()
+                            .forType(Encoding.DATADOG)
+                            .toString());
+        }
+        if (propagationTags.getTraceIdHighOrderBitsHexTagValue() != null) {
+            tagMap.put(
+                    TRACE_ID_TAG.forType(Encoding.DATADOG).toString(),
+                    propagationTags
+                            .getTraceIdHighOrderBitsHexTagValue()
+                            .forType(Encoding.DATADOG)
+                            .toString());
+        }
+        if (propagationTags.getError() != null) {
+            tagMap.put(PROPAGATION_ERROR_TAG_KEY, propagationTags.getError());
+        }
     }
-    TagValue knuthSamplingRateTagValue =
-        propagationTags.getKnuthSamplingRateTagValue(samplingState);
-    if (knuthSamplingRateTagValue != null) {
-      tagMap.put(
-          KNUTH_SAMPLING_RATE_TAG.forType(Encoding.DATADOG).toString(),
-          knuthSamplingRateTagValue.forType(Encoding.DATADOG).toString());
-    }
-    if (propagationTags.getOrgPropagationMarkerTagValue() != null) {
-      tagMap.put(
-          ORG_PROPAGATION_MARKER_TAG.forType(Encoding.DATADOG).toString(),
-          propagationTags.getOrgPropagationMarkerTagValue().forType(Encoding.DATADOG).toString());
-    }
-    if (propagationTags.getTraceIdHighOrderBitsHexTagValue() != null) {
-      tagMap.put(
-          TRACE_ID_TAG.forType(Encoding.DATADOG).toString(),
-          propagationTags
-              .getTraceIdHighOrderBitsHexTagValue()
-              .forType(Encoding.DATADOG)
-              .toString());
-    }
-    if (propagationTags.getError() != null) {
-      tagMap.put(PROPAGATION_ERROR_TAG_KEY, propagationTags.getError());
-    }
-  }
 
-  static int calcXDatadogTagsSize(List<TagElement> tagPairs) {
-    int size = 0;
-    int pl = Encoding.DATADOG.getPrefixLength();
-    boolean key = true;
-    for (CharSequence tagPair : tagPairs) {
-      if (key) {
-        size += pl;
-      }
-      key = !key;
-      size += tagPair.length();
-      size += 1; // tag or key separator
+    static int calcXDatadogTagsSize(List<TagElement> tagPairs) {
+        int size = 0;
+        int pl = Encoding.DATADOG.getPrefixLength();
+        boolean key = true;
+        for (CharSequence tagPair : tagPairs) {
+            if (key) {
+                size += pl;
+            }
+            key = !key;
+            size += tagPair.length();
+            size += 1; // tag or key separator
+        }
+        return size == 0 ? 0 : size - 1; // exclude last separator
     }
-    return size == 0 ? 0 : size - 1; // exclude last separator
-  }
 
-  static int calcXDatadogTagsSize(int size, TagKey tagKey, TagValue tagValue) {
-    if (tagValue != null) {
-      if (size > 0) {
-        // tag separator
-        size += 1;
-      }
-      size += tagKey.length();
-      // tag key separator
-      size += 1;
-      size += tagValue.length();
-      size += Encoding.DATADOG.getPrefixLength();
+    static int calcXDatadogTagsSize(int size, TagKey tagKey, TagValue tagValue) {
+        if (tagValue != null) {
+            if (size > 0) {
+                // tag separator
+                size += 1;
+            }
+            size += tagKey.length();
+            // tag key separator
+            size += 1;
+            size += tagValue.length();
+            size += Encoding.DATADOG.getPrefixLength();
+        }
+        return size;
     }
-    return size;
-  }
 
-  abstract PropagationTags fromHeaderValue(PTagsFactory tagsFactory, String value);
+    abstract PropagationTags fromHeaderValue(PTagsFactory tagsFactory, String value);
 
-  protected int estimateHeaderSize(
-      PTags pTags, CharSequence lastParentIdOverride, SamplingState samplingState) {
-    return pTags.getXDatadogTagsSize(samplingState);
-  }
+    protected int estimateHeaderSize(PTags pTags, CharSequence lastParentIdOverride, SamplingState samplingState) {
+        return pTags.getXDatadogTagsSize(samplingState);
+    }
 
-  protected int appendPrefix(
-      StringBuilder sb,
-      PTags ptags,
-      CharSequence lastParentIdOverride,
-      SamplingState samplingState) {
-    return ptags.getXDatadogTagsSize(samplingState);
-  }
+    protected int appendPrefix(
+            StringBuilder sb, PTags ptags, CharSequence lastParentIdOverride, SamplingState samplingState) {
+        return ptags.getXDatadogTagsSize(samplingState);
+    }
 
-  protected abstract int appendTag(StringBuilder sb, TagElement key, TagElement value, int size);
+    protected abstract int appendTag(StringBuilder sb, TagElement key, TagElement value, int size);
 
-  protected int appendSuffix(StringBuilder sb, PTags ptags, int size, SamplingState samplingState) {
-    return size;
-  }
+    protected int appendSuffix(StringBuilder sb, PTags ptags, int size, SamplingState samplingState) {
+        return size;
+    }
 
-  protected abstract boolean isTooLarge(StringBuilder sb, int size);
+    protected abstract boolean isTooLarge(StringBuilder sb, int size);
 
-  protected abstract boolean isEmpty(StringBuilder sb, int size);
+    protected abstract boolean isEmpty(StringBuilder sb, int size);
 
-  protected static boolean validateTagValue(TagKey tagKey, TagValue tagValue) {
-    if (tagKey.equals(DECISION_MAKER_TAG) && !validateDecisionMakerTag(tagValue)) {
-      return false;
-    } else if (tagKey.equals(TRACE_ID_TAG) && !validateTraceId(tagValue)) {
-      return false;
-    } else if (tagKey.equals(TRACE_SOURCE_TAG) && !validateTraceSourceTagValue(tagValue)) {
-      return false;
+    protected static boolean validateTagValue(TagKey tagKey, TagValue tagValue) {
+        if (tagKey.equals(DECISION_MAKER_TAG) && !validateDecisionMakerTag(tagValue)) {
+            return false;
+        } else if (tagKey.equals(TRACE_ID_TAG) && !validateTraceId(tagValue)) {
+            return false;
+        } else if (tagKey.equals(TRACE_SOURCE_TAG) && !validateTraceSourceTagValue(tagValue)) {
+            return false;
+        }
+        return true;
     }
-    return true;
-  }
 
-  /**
-   * Validates the dm tag format with next eBNF:
-   *
-   * <pre>
-   *   _dd.p.dm = [ service hash ], "-", sampling mechanism;
-   *
-   *   digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" ;
-   *   hexadecimal digit = digit | "a" | "b" | "c" | "d" | "e" | "f" ;
-   *
-   *   service hash = 10 * hexadecimal digit;
-   *   sampling mechanism = digit, { digit };
-   * </pre>
-   */
-  private static boolean validateDecisionMakerTag(TagValue value) {
-    int sepPos = value.indexOf('-');
-    if (sepPos < 0) {
-      // missing separator
-      return false;
-    }
-    if (sepPos != 0 && sepPos != 10) {
-      // invalid service hash length
-      return false;
-    }
-    int samplingMechanismPos = sepPos + 1;
-    int len = value.length();
-    if (samplingMechanismPos == len) {
-      // missing sampling mechanism
-      return false;
-    }
-    for (int i = 0; i < sepPos; i++) {
-      if (!isHexDigit(value.charAt(i))) {
-        // invalid service hash char
-        return false;
-      }
-    }
-    for (int i = samplingMechanismPos; i < len; i++) {
-      if (!isDigit(value.charAt(i))) {
-        // invalid sampling mechanism
-        return false;
-      }
+    /**
+     * Validates the dm tag format with next eBNF:
+     *
+     * <pre>
+     *   _dd.p.dm = [ service hash ], "-", sampling mechanism;
+     *
+     *   digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" ;
+     *   hexadecimal digit = digit | "a" | "b" | "c" | "d" | "e" | "f" ;
+     *
+     *   service hash = 10 * hexadecimal digit;
+     *   sampling mechanism = digit, { digit };
+     * </pre>
+     */
+    private static boolean validateDecisionMakerTag(TagValue value) {
+        int sepPos = value.indexOf('-');
+        if (sepPos < 0) {
+            // missing separator
+            return false;
+        }
+        if (sepPos != 0 && sepPos != 10) {
+            // invalid service hash length
+            return false;
+        }
+        int samplingMechanismPos = sepPos + 1;
+        int len = value.length();
+        if (samplingMechanismPos == len) {
+            // missing sampling mechanism
+            return false;
+        }
+        for (int i = 0; i < sepPos; i++) {
+            if (!isHexDigit(value.charAt(i))) {
+                // invalid service hash char
+                return false;
+            }
+        }
+        for (int i = samplingMechanismPos; i < len; i++) {
+            if (!isDigit(value.charAt(i))) {
+                // invalid sampling mechanism
+                return false;
+            }
+        }
+        return true;
     }
-    return true;
-  }
 
-  private static boolean validateTraceId(TagValue value) {
-    // invalid length
-    if (value.length() != 16) {
-      return false;
+    private static boolean validateTraceId(TagValue value) {
+        // invalid length
+        if (value.length() != 16) {
+            return false;
+        }
+        for (int i = 0; i < 16; i++) {
+            // invalid trace id character
+            if (!isHexDigit(value.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
     }
-    for (int i = 0; i < 16; i++) {
-      // invalid trace id character
-      if (!isHexDigit(value.charAt(i))) {
-        return false;
-      }
-    }
-    return true;
-  }
 
-  private static boolean validateTraceSourceTagValue(TagValue value) {
-    // Ensure the string is not null and has a length between 2 and 8
-    if (value == null || value.length() < 2 || value.length() > 8) {
-      return false;
-    }
-    for (int i = 0; i < value.length(); i++) {
-      // Ensure each character is a valid hex digit
-      if (!isHexDigitCaseInsensitive(value.charAt(i))) {
-        return false;
-      }
+    private static boolean validateTraceSourceTagValue(TagValue value) {
+        // Ensure the string is not null and has a length between 2 and 8
+        if (value == null || value.length() < 2 || value.length() > 8) {
+            return false;
+        }
+        for (int i = 0; i < value.length(); i++) {
+            // Ensure each character is a valid hex digit
+            if (!isHexDigitCaseInsensitive(value.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
     }
-    return true;
-  }
 
-  protected static boolean isDigit(char c) {
-    return c >= '0' && c <= '9';
-  }
+    protected static boolean isDigit(char c) {
+        return c >= '0' && c <= '9';
+    }
 
-  protected static boolean isHexDigit(char c) {
-    return c >= 'a' && c <= 'f' || isDigit(c);
-  }
+    protected static boolean isHexDigit(char c) {
+        return c >= 'a' && c <= 'f' || isDigit(c);
+    }
 
-  protected static boolean isHexDigitCaseInsensitive(char c) {
-    return isHexDigit(c) || c >= 'A' && c <= 'F';
-  }
+    protected static boolean isHexDigitCaseInsensitive(char c) {
+        return isHexDigit(c) || c >= 'A' && c <= 'F';
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/PTagsFactory.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/PTagsFactory.java
index 52e26b933ea..7949819842e 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/PTagsFactory.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/PTagsFactory.java
@@ -24,817 +24,786 @@
 import javax.annotation.Nonnull;
 
 public class PTagsFactory implements PropagationTags.Factory {
-  static final String PROPAGATION_ERROR_TAG_KEY = "_dd.propagation_error";
+    static final String PROPAGATION_ERROR_TAG_KEY = "_dd.propagation_error";
 
-  private final EnumMap<HeaderType, PTagsCodec> DEC_ENC_MAP = new EnumMap<>(HeaderType.class);
+    private final EnumMap<HeaderType, PTagsCodec> DEC_ENC_MAP = new EnumMap<>(HeaderType.class);
 
-  private final int xDatadogTagsLimit;
+    private final int xDatadogTagsLimit;
 
-  public PTagsFactory(int xDatadogTagsLimit) {
-    this.xDatadogTagsLimit = xDatadogTagsLimit;
-    DEC_ENC_MAP.put(DATADOG, new DatadogPTagsCodec(xDatadogTagsLimit));
-    DEC_ENC_MAP.put(W3C, new W3CPTagsCodec());
-  }
-
-  boolean isPropagationTagsDisabled() {
-    return xDatadogTagsLimit <= 0;
-  }
-
-  int getxDatadogTagsLimit() {
-    return xDatadogTagsLimit;
-  }
-
-  PTagsCodec getDecoderEncoder(@Nonnull HeaderType headerType) {
-    return DEC_ENC_MAP.get(headerType);
-  }
-
-  @Override
-  public final PropagationTags empty() {
-    return createValid(null, null, null, ProductTraceSource.UNSET, null);
-  }
-
-  @Override
-  public final PropagationTags fromHeaderValue(@Nonnull HeaderType headerType, String value) {
-    return DEC_ENC_MAP.get(headerType).fromHeaderValue(this, value);
-  }
-
-  @Override
-  public final PropagationTags emptyW3C(String originalTracestate) {
-    if (originalTracestate == null || originalTracestate.isEmpty()) {
-      return empty();
-    }
-    return W3CPTagsCodec.empty(this, originalTracestate);
-  }
-
-  PropagationTags createValid(
-      List<TagElement> tagPairs,
-      TagValue decisionMakerTagValue,
-      TagValue traceIdTagValue,
-      int productTraceSource,
-      TagValue orgPropagationMarkerTagValue) {
-    return new PTags(
-        this,
-        tagPairs,
-        decisionMakerTagValue,
-        traceIdTagValue,
-        productTraceSource,
-        orgPropagationMarkerTagValue);
-  }
-
-  PropagationTags createInvalid(String error) {
-    return PTags.withError(this, error);
-  }
-
-  static class PTags extends PropagationTags {
-    private static final String EMPTY = "";
-    private static final SamplingState EMPTY_SAMPLING_STATE =
-        new SamplingState(PrioritySampling.UNSET, null, null, null, null);
-
-    protected final PTagsFactory factory;
-
-    // tags that don't require any modifications and propagated as-is
-    private final List<TagElement> tagPairs;
-
-    private final Object samplingStateLock = new Object();
-
-    private boolean canChangeDecisionMaker;
-
-    private static final AtomicIntegerFieldUpdater<PTags> TRACE_SOURCE_UPDATER =
-        AtomicIntegerFieldUpdater.newUpdater(PTags.class, "traceSource");
-
-    private volatile int traceSource;
-    private volatile String debugPropagation;
-
-    private volatile TagValue orgPropagationMarkerTagValue;
-
-    private volatile SamplingState samplingState;
-
-    // Static cache for the most-recently-seen rate → TagValue. In steady state a service uses one
-    // rate, so this eliminates the char[] + String allocation on every new PTags instance.
-    // Writes are benign-racy: two threads computing the same rate produce equal TagValues.
-    private static volatile double cachedKsrRate = Double.NaN;
-    private static volatile TagValue cachedKsrTagValue;
-
-    private volatile SizeCacheEntry xDatadogTagsSizeCache;
-
-    private volatile CharSequence origin;
-    private volatile HeaderCacheEntry datadogHeaderCache;
-    private volatile HeaderCacheEntry w3cHeaderCache;
-    private volatile TracestateCacheEntry tracestateCache;
-
-    /** The high-order 64 bits of the trace id. */
-    private volatile long traceIdHighOrderBits;
-
-    /**
-     * The zero-padded lower-case 16 character hexadecimal representation of the high-order 64 bits
-     * of the trace id, wrapped into a {@link TagValue}, <code>null</code> if not set.
-     */
-    private volatile TagValue traceIdHighOrderBitsHexTagValue;
-
-    /**
-     * The original <a href="https://www.w3.org/TR/trace-context/#tracestate-header">W3C tracestate
-     * header</a> value.
-     */
-    protected volatile String tracestate;
-
-    /**
-     * The {@link PTagsFactory#PROPAGATION_ERROR_TAG_KEY propagation tag error} value, {@code null
-     * if no error while parsing header}.
-     */
-    protected volatile String error;
-
-    /**
-     * The last parent span id using the 16-characters zero padded hexadecimal representation,
-     * {@code null} if not set.
-     */
-    private volatile CharSequence lastParentId;
-
-    PTags(
-        PTagsFactory factory,
-        List<TagElement> tagPairs,
-        TagValue decisionMakerTagValue,
-        TagValue traceIdTagValue,
-        int traceSource,
-        TagValue orgPropagationMarkerTagValue) {
-      this(
-          factory,
-          tagPairs,
-          decisionMakerTagValue,
-          traceIdTagValue,
-          traceSource,
-          PrioritySampling.UNSET,
-          null,
-          null,
-          orgPropagationMarkerTagValue,
-          null,
-          null);
+    public PTagsFactory(int xDatadogTagsLimit) {
+        this.xDatadogTagsLimit = xDatadogTagsLimit;
+        DEC_ENC_MAP.put(DATADOG, new DatadogPTagsCodec(xDatadogTagsLimit));
+        DEC_ENC_MAP.put(W3C, new W3CPTagsCodec());
     }
 
-    // Takes tracestate/otelTraceState up-front to build SamplingState in one allocation.
-    PTags(
-        PTagsFactory factory,
-        List<TagElement> tagPairs,
-        TagValue decisionMakerTagValue,
-        TagValue traceIdTagValue,
-        int traceSource,
-        int samplingPriority,
-        CharSequence origin,
-        CharSequence lastParentId,
-        TagValue orgPropagationMarkerTagValue,
-        String tracestate,
-        OtelTraceState otelTraceState) {
-      assert tagPairs == null || tagPairs.size() % 2 == 0;
-      this.factory = factory;
-      this.tagPairs = tagPairs;
-      this.canChangeDecisionMaker = decisionMakerTagValue == null;
-      this.traceSource = traceSource;
-      this.tracestate = tracestate;
-      this.samplingState =
-          initialSamplingState(samplingPriority, tracestate, otelTraceState, decisionMakerTagValue);
-      this.origin = origin;
-      this.lastParentId = lastParentId;
-      this.orgPropagationMarkerTagValue = orgPropagationMarkerTagValue;
-      if (traceIdTagValue != null) {
-        CharSequence traceIdHighOrderBitsHex = traceIdTagValue.forType(TagElement.Encoding.DATADOG);
-        this.traceIdHighOrderBits =
-            LongStringUtils.parseUnsignedLongHex(
-                traceIdHighOrderBitsHex, 0, traceIdHighOrderBitsHex.length(), true);
-      }
-      this.traceIdHighOrderBitsHexTagValue = traceIdTagValue;
-      this.error = null;
+    boolean isPropagationTagsDisabled() {
+        return xDatadogTagsLimit <= 0;
     }
 
-    static PTags withError(PTagsFactory factory, String error) {
-      PTags pTags =
-          new PTags(
-              factory,
-              null,
-              null,
-              null,
-              ProductTraceSource.UNSET,
-              PrioritySampling.UNSET,
-              null,
-              null,
-              null,
-              null,
-              null);
-      pTags.error = error;
-      return pTags;
+    int getxDatadogTagsLimit() {
+        return xDatadogTagsLimit;
     }
 
-    @Override
-    public void updateTraceSamplingPriority(int samplingPriority, int samplingMechanism) {
-      synchronized (samplingStateLock) {
-        if (samplingPriority != PrioritySampling.UNSET && canChangeDecisionMaker
-            || samplingMechanism == SamplingMechanism.EXTERNAL_OVERRIDE) {
-          OtelTraceState nextOtelTraceState =
-              reconcileOtelTraceState(getOtelTraceState(), samplingPriority, samplingMechanism);
-          installSamplingState(samplingPriority, samplingMechanism, nextOtelTraceState);
-        }
-      }
+    PTagsCodec getDecoderEncoder(@Nonnull HeaderType headerType) {
+        return DEC_ENC_MAP.get(headerType);
     }
 
     @Override
-    public boolean tryUpdateTraceSamplingPriority(
-        int samplingPriority, int samplingMechanism, boolean allowOverride) {
-      synchronized (samplingStateLock) {
-        if (samplingPriority == PrioritySampling.UNSET) {
-          return false;
-        }
-        SamplingState current = samplingState;
-        if (!allowOverride && current.getSamplingPriority() != PrioritySampling.UNSET) {
-          return false;
-        }
-        OtelTraceState nextOtelTraceState =
-            reconcileOtelTraceState(getOtelTraceState(), samplingPriority, samplingMechanism);
-        installSamplingState(
-            samplingPriority,
-            samplingMechanism,
-            nextOtelTraceState,
-            getKnuthSamplingRateTagValue(),
-            canChangeDecisionMaker || samplingMechanism == SamplingMechanism.EXTERNAL_OVERRIDE);
-        return true;
-      }
+    public final PropagationTags empty() {
+        return createValid(null, null, null, ProductTraceSource.UNSET, null);
     }
 
     @Override
-    public boolean tryUpdateProbabilitySamplingDecision(
-        int samplingPriority,
-        int samplingMechanism,
-        double sampleRate,
-        boolean rateLimiterRejected,
-        long traceIdLowOrderBits,
-        boolean allowOverride) {
-      synchronized (samplingStateLock) {
-        SamplingState current = samplingState;
-        if (!allowOverride && current.getSamplingPriority() != PrioritySampling.UNSET) {
-          return false;
-        }
-        OtelTraceState nextOtelTraceState = getOtelTraceState();
-        if (nextOtelTraceState == null) {
-          if (!rateLimiterRejected) {
-            nextOtelTraceState =
-                OtelTraceState.fromProbabilityDecision(
-                    traceIdLowOrderBits, sampleRate, samplingPriority);
-          }
-        } else if (rateLimiterRejected) {
-          nextOtelTraceState = nextOtelTraceState.withoutThreshold();
-        } else {
-          nextOtelTraceState = nextOtelTraceState.withoutInheritedThreshold();
-        }
-        TagValue nextKnuthSamplingRate = knuthSamplingRateTagValue(sampleRate);
-        installSamplingState(
-            samplingPriority,
-            samplingMechanism,
-            nextOtelTraceState,
-            nextKnuthSamplingRate,
-            canChangeDecisionMaker || samplingMechanism == SamplingMechanism.EXTERNAL_OVERRIDE);
-        return true;
-      }
+    public final PropagationTags fromHeaderValue(@Nonnull HeaderType headerType, String value) {
+        return DEC_ENC_MAP.get(headerType).fromHeaderValue(this, value);
     }
 
     @Override
-    public void forceKeep(int samplingMechanism) {
-      synchronized (samplingStateLock) {
-        OtelTraceState nextOtelTraceState = getOtelTraceState();
-        if (nextOtelTraceState != null) {
-          nextOtelTraceState = nextOtelTraceState.forNonProbabilityDecision();
-        }
-        installSamplingState(PrioritySampling.USER_KEEP, samplingMechanism, nextOtelTraceState);
-      }
-    }
+    public final PropagationTags emptyW3C(String originalTracestate) {
+        if (originalTracestate == null || originalTracestate.isEmpty()) {
+            return empty();
+        }
+        return W3CPTagsCodec.empty(this, originalTracestate);
+    }
+
+    PropagationTags createValid(
+            List<TagElement> tagPairs,
+            TagValue decisionMakerTagValue,
+            TagValue traceIdTagValue,
+            int productTraceSource,
+            TagValue orgPropagationMarkerTagValue) {
+        return new PTags(
+                this,
+                tagPairs,
+                decisionMakerTagValue,
+                traceIdTagValue,
+                productTraceSource,
+                orgPropagationMarkerTagValue);
+    }
+
+    PropagationTags createInvalid(String error) {
+        return PTags.withError(this, error);
+    }
+
+    static class PTags extends PropagationTags {
+        private static final String EMPTY = "";
+        private static final SamplingState EMPTY_SAMPLING_STATE =
+                new SamplingState(PrioritySampling.UNSET, null, null, null, null);
+
+        protected final PTagsFactory factory;
+
+        // tags that don't require any modifications and propagated as-is
+        private final List<TagElement> tagPairs;
+
+        private final Object samplingStateLock = new Object();
+
+        private boolean canChangeDecisionMaker;
+
+        private static final AtomicIntegerFieldUpdater<PTags> TRACE_SOURCE_UPDATER =
+                AtomicIntegerFieldUpdater.newUpdater(PTags.class, "traceSource");
+
+        private volatile int traceSource;
+        private volatile String debugPropagation;
+
+        private volatile TagValue orgPropagationMarkerTagValue;
+
+        private volatile SamplingState samplingState;
+
+        // Static cache for the most-recently-seen rate → TagValue. In steady state a service uses one
+        // rate, so this eliminates the char[] + String allocation on every new PTags instance.
+        // Writes are benign-racy: two threads computing the same rate produce equal TagValues.
+        private static volatile double cachedKsrRate = Double.NaN;
+        private static volatile TagValue cachedKsrTagValue;
+
+        private volatile SizeCacheEntry xDatadogTagsSizeCache;
+
+        private volatile CharSequence origin;
+        private volatile HeaderCacheEntry datadogHeaderCache;
+        private volatile HeaderCacheEntry w3cHeaderCache;
+        private volatile TracestateCacheEntry tracestateCache;
+
+        /** The high-order 64 bits of the trace id. */
+        private volatile long traceIdHighOrderBits;
+
+        /**
+         * The zero-padded lower-case 16 character hexadecimal representation of the high-order 64 bits
+         * of the trace id, wrapped into a {@link TagValue}, <code>null</code> if not set.
+         */
+        private volatile TagValue traceIdHighOrderBitsHexTagValue;
+
+        /**
+         * The original <a href="https://www.w3.org/TR/trace-context/#tracestate-header">W3C tracestate
+         * header</a> value.
+         */
+        protected volatile String tracestate;
+
+        /**
+         * The {@link PTagsFactory#PROPAGATION_ERROR_TAG_KEY propagation tag error} value, {@code null
+         * if no error while parsing header}.
+         */
+        protected volatile String error;
+
+        /**
+         * The last parent span id using the 16-characters zero padded hexadecimal representation,
+         * {@code null} if not set.
+         */
+        private volatile CharSequence lastParentId;
+
+        PTags(
+                PTagsFactory factory,
+                List<TagElement> tagPairs,
+                TagValue decisionMakerTagValue,
+                TagValue traceIdTagValue,
+                int traceSource,
+                TagValue orgPropagationMarkerTagValue) {
+            this(
+                    factory,
+                    tagPairs,
+                    decisionMakerTagValue,
+                    traceIdTagValue,
+                    traceSource,
+                    PrioritySampling.UNSET,
+                    null,
+                    null,
+                    orgPropagationMarkerTagValue,
+                    null,
+                    null);
+        }
 
-    private void installSamplingState(
-        int samplingPriority, int samplingMechanism, OtelTraceState nextOtelTraceState) {
-      installSamplingState(
-          samplingPriority,
-          samplingMechanism,
-          nextOtelTraceState,
-          getKnuthSamplingRateTagValue(),
-          true);
-    }
+        // Takes tracestate/otelTraceState up-front to build SamplingState in one allocation.
+        PTags(
+                PTagsFactory factory,
+                List<TagElement> tagPairs,
+                TagValue decisionMakerTagValue,
+                TagValue traceIdTagValue,
+                int traceSource,
+                int samplingPriority,
+                CharSequence origin,
+                CharSequence lastParentId,
+                TagValue orgPropagationMarkerTagValue,
+                String tracestate,
+                OtelTraceState otelTraceState) {
+            assert tagPairs == null || tagPairs.size() % 2 == 0;
+            this.factory = factory;
+            this.tagPairs = tagPairs;
+            this.canChangeDecisionMaker = decisionMakerTagValue == null;
+            this.traceSource = traceSource;
+            this.tracestate = tracestate;
+            this.samplingState =
+                    initialSamplingState(samplingPriority, tracestate, otelTraceState, decisionMakerTagValue);
+            this.origin = origin;
+            this.lastParentId = lastParentId;
+            this.orgPropagationMarkerTagValue = orgPropagationMarkerTagValue;
+            if (traceIdTagValue != null) {
+                CharSequence traceIdHighOrderBitsHex = traceIdTagValue.forType(TagElement.Encoding.DATADOG);
+                this.traceIdHighOrderBits = LongStringUtils.parseUnsignedLongHex(
+                        traceIdHighOrderBitsHex, 0, traceIdHighOrderBitsHex.length(), true);
+            }
+            this.traceIdHighOrderBitsHexTagValue = traceIdTagValue;
+            this.error = null;
+        }
 
-    @SuppressWarnings("StringEquality")
-    @SuppressFBWarnings(
-        value = "ES_COMPARING_STRINGS_WITH_EQ",
-        justification =
-            "Identity preserves the raw tracestate reference used by the cached sampling state.")
-    private void installSamplingState(
-        int samplingPriority,
-        int samplingMechanism,
-        OtelTraceState nextOtelTraceState,
-        TagValue nextKnuthSamplingRateTagValue,
-        boolean updateDecisionMaker) {
-      SamplingState currentState = samplingState;
-      TagValue nextDecisionMakerTagValue = getDecisionMakerTagValue();
-      if (updateDecisionMaker && samplingPriority > 0) {
-        // TODO should try to keep the old sampling mechanism if we override the value?
-        if (samplingMechanism == SamplingMechanism.EXTERNAL_OVERRIDE) {
-          // There is no specific value for the EXTERNAL_OVERRIDE, so say that it's the DEFAULT
-          samplingMechanism = SamplingMechanism.DEFAULT;
-        }
-        // Protect against possible SamplingMechanism.UNKNOWN (-1) that doesn't comply with the
-        // format
-        if (samplingMechanism >= 0) {
-          TagValue newDM = TagValue.from("-" + samplingMechanism);
-          if (!newDM.equals(nextDecisionMakerTagValue)) {
-            // This should invalidate any cached w3c and datadog header
-            clearCachedHeader(DATADOG);
-            clearCachedHeader(W3C);
-          }
-          nextDecisionMakerTagValue = newDM;
-        }
-      } else if (updateDecisionMaker) {
-        // Drop the decision maker tag
-        if (nextDecisionMakerTagValue != null) {
-          // This should invalidate any cached w3c and datadog header
-          clearCachedHeader(DATADOG);
-          clearCachedHeader(W3C);
-        }
-        nextDecisionMakerTagValue = null;
-      }
-      if (currentState.getSamplingPriority() == samplingPriority
-          && currentState.getTracestate() == tracestate
-          && currentState.getOtelTraceState() == nextOtelTraceState
-          && Objects.equals(currentState.getDecisionMaker(), nextDecisionMakerTagValue)
-          && Objects.equals(currentState.getKnuthSamplingRate(), nextKnuthSamplingRateTagValue)) {
-        return;
-      }
-      clearCachedHeader(W3C);
-      samplingState =
-          new SamplingState(
-              samplingPriority,
-              tracestate,
-              nextOtelTraceState,
-              nextDecisionMakerTagValue,
-              nextKnuthSamplingRateTagValue);
-    }
+        static PTags withError(PTagsFactory factory, String error) {
+            PTags pTags = new PTags(
+                    factory,
+                    null,
+                    null,
+                    null,
+                    ProductTraceSource.UNSET,
+                    PrioritySampling.UNSET,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null);
+            pTags.error = error;
+            return pTags;
+        }
 
-    private static SamplingState initialSamplingState(
-        int samplingPriority,
-        String tracestate,
-        OtelTraceState otelTraceState,
-        TagValue decisionMakerTagValue) {
-      if (samplingPriority == PrioritySampling.UNSET
-          && tracestate == null
-          && otelTraceState == null
-          && decisionMakerTagValue == null) {
-        return EMPTY_SAMPLING_STATE;
-      }
-      return new SamplingState(
-          samplingPriority, tracestate, otelTraceState, decisionMakerTagValue, null);
-    }
+        @Override
+        public void updateTraceSamplingPriority(int samplingPriority, int samplingMechanism) {
+            synchronized (samplingStateLock) {
+                if (samplingPriority != PrioritySampling.UNSET && canChangeDecisionMaker
+                        || samplingMechanism == SamplingMechanism.EXTERNAL_OVERRIDE) {
+                    OtelTraceState nextOtelTraceState =
+                            reconcileOtelTraceState(getOtelTraceState(), samplingPriority, samplingMechanism);
+                    installSamplingState(samplingPriority, samplingMechanism, nextOtelTraceState);
+                }
+            }
+        }
 
-    private static OtelTraceState reconcileOtelTraceState(
-        OtelTraceState otelTraceState, int samplingPriority, int samplingMechanism) {
-      if (otelTraceState == null) {
-        return null;
-      }
-      if (samplingMechanism != SamplingMechanism.EXTERNAL_OVERRIDE
-          && samplingMechanism != SamplingMechanism.UNKNOWN) {
-        return otelTraceState.forNonProbabilityDecision();
-      }
-      if (!otelTraceState.isConsistentWith(samplingPriority > 0)) {
-        return otelTraceState.withoutThreshold();
-      }
-      return otelTraceState;
-    }
+        @Override
+        public boolean tryUpdateTraceSamplingPriority(
+                int samplingPriority, int samplingMechanism, boolean allowOverride) {
+            synchronized (samplingStateLock) {
+                if (samplingPriority == PrioritySampling.UNSET) {
+                    return false;
+                }
+                SamplingState current = samplingState;
+                if (!allowOverride && current.getSamplingPriority() != PrioritySampling.UNSET) {
+                    return false;
+                }
+                OtelTraceState nextOtelTraceState =
+                        reconcileOtelTraceState(getOtelTraceState(), samplingPriority, samplingMechanism);
+                installSamplingState(
+                        samplingPriority,
+                        samplingMechanism,
+                        nextOtelTraceState,
+                        getKnuthSamplingRateTagValue(),
+                        canChangeDecisionMaker || samplingMechanism == SamplingMechanism.EXTERNAL_OVERRIDE);
+                return true;
+            }
+        }
 
-    @Override
-    public void addTraceSource(final int product) {
-      TRACE_SOURCE_UPDATER.updateAndGet(
-          this,
-          currentValue -> {
-            // If the product is already marked, return the same value (no change)
-            if (ProductTraceSource.isProductMarked(currentValue, product)) {
-              return currentValue;
+        @Override
+        public boolean tryUpdateProbabilitySamplingDecision(
+                int samplingPriority,
+                int samplingMechanism,
+                double sampleRate,
+                boolean rateLimiterRejected,
+                long traceIdLowOrderBits,
+                boolean allowOverride) {
+            synchronized (samplingStateLock) {
+                SamplingState current = samplingState;
+                if (!allowOverride && current.getSamplingPriority() != PrioritySampling.UNSET) {
+                    return false;
+                }
+                OtelTraceState nextOtelTraceState = getOtelTraceState();
+                if (nextOtelTraceState == null) {
+                    if (!rateLimiterRejected) {
+                        nextOtelTraceState = OtelTraceState.fromProbabilityDecision(
+                                traceIdLowOrderBits, sampleRate, samplingPriority);
+                    }
+                } else if (rateLimiterRejected) {
+                    nextOtelTraceState = nextOtelTraceState.withoutThreshold();
+                } else {
+                    nextOtelTraceState = nextOtelTraceState.withoutInheritedThreshold();
+                }
+                TagValue nextKnuthSamplingRate = knuthSamplingRateTagValue(sampleRate);
+                installSamplingState(
+                        samplingPriority,
+                        samplingMechanism,
+                        nextOtelTraceState,
+                        nextKnuthSamplingRate,
+                        canChangeDecisionMaker || samplingMechanism == SamplingMechanism.EXTERNAL_OVERRIDE);
+                return true;
+            }
+        }
+
+        @Override
+        public void forceKeep(int samplingMechanism) {
+            synchronized (samplingStateLock) {
+                OtelTraceState nextOtelTraceState = getOtelTraceState();
+                if (nextOtelTraceState != null) {
+                    nextOtelTraceState = nextOtelTraceState.forNonProbabilityDecision();
+                }
+                installSamplingState(PrioritySampling.USER_KEEP, samplingMechanism, nextOtelTraceState);
             }
+        }
+
+        private void installSamplingState(
+                int samplingPriority, int samplingMechanism, OtelTraceState nextOtelTraceState) {
+            installSamplingState(
+                    samplingPriority, samplingMechanism, nextOtelTraceState, getKnuthSamplingRateTagValue(), true);
+        }
 
-            // Invalidate cached headers (atomic context ensures correctness)
-            clearCachedHeader(DATADOG);
+        @SuppressWarnings("StringEquality")
+        @SuppressFBWarnings(
+                value = "ES_COMPARING_STRINGS_WITH_EQ",
+                justification = "Identity preserves the raw tracestate reference used by the cached sampling state.")
+        private void installSamplingState(
+                int samplingPriority,
+                int samplingMechanism,
+                OtelTraceState nextOtelTraceState,
+                TagValue nextKnuthSamplingRateTagValue,
+                boolean updateDecisionMaker) {
+            SamplingState currentState = samplingState;
+            TagValue nextDecisionMakerTagValue = getDecisionMakerTagValue();
+            if (updateDecisionMaker && samplingPriority > 0) {
+                // TODO should try to keep the old sampling mechanism if we override the value?
+                if (samplingMechanism == SamplingMechanism.EXTERNAL_OVERRIDE) {
+                    // There is no specific value for the EXTERNAL_OVERRIDE, so say that it's the DEFAULT
+                    samplingMechanism = SamplingMechanism.DEFAULT;
+                }
+                // Protect against possible SamplingMechanism.UNKNOWN (-1) that doesn't comply with the
+                // format
+                if (samplingMechanism >= 0) {
+                    TagValue newDM = TagValue.from("-" + samplingMechanism);
+                    if (!newDM.equals(nextDecisionMakerTagValue)) {
+                        // This should invalidate any cached w3c and datadog header
+                        clearCachedHeader(DATADOG);
+                        clearCachedHeader(W3C);
+                    }
+                    nextDecisionMakerTagValue = newDM;
+                }
+            } else if (updateDecisionMaker) {
+                // Drop the decision maker tag
+                if (nextDecisionMakerTagValue != null) {
+                    // This should invalidate any cached w3c and datadog header
+                    clearCachedHeader(DATADOG);
+                    clearCachedHeader(W3C);
+                }
+                nextDecisionMakerTagValue = null;
+            }
+            if (currentState.getSamplingPriority() == samplingPriority
+                    && currentState.getTracestate() == tracestate
+                    && currentState.getOtelTraceState() == nextOtelTraceState
+                    && Objects.equals(currentState.getDecisionMaker(), nextDecisionMakerTagValue)
+                    && Objects.equals(currentState.getKnuthSamplingRate(), nextKnuthSamplingRateTagValue)) {
+                return;
+            }
             clearCachedHeader(W3C);
+            samplingState = new SamplingState(
+                    samplingPriority,
+                    tracestate,
+                    nextOtelTraceState,
+                    nextDecisionMakerTagValue,
+                    nextKnuthSamplingRateTagValue);
+        }
 
-            // Set the bit for the given product
-            return ProductTraceSource.updateProduct(currentValue, product);
-          });
-    }
+        private static SamplingState initialSamplingState(
+                int samplingPriority,
+                String tracestate,
+                OtelTraceState otelTraceState,
+                TagValue decisionMakerTagValue) {
+            if (samplingPriority == PrioritySampling.UNSET
+                    && tracestate == null
+                    && otelTraceState == null
+                    && decisionMakerTagValue == null) {
+                return EMPTY_SAMPLING_STATE;
+            }
+            return new SamplingState(samplingPriority, tracestate, otelTraceState, decisionMakerTagValue, null);
+        }
 
-    @Override
-    public int getTraceSource() {
-      return traceSource;
-    }
+        private static OtelTraceState reconcileOtelTraceState(
+                OtelTraceState otelTraceState, int samplingPriority, int samplingMechanism) {
+            if (otelTraceState == null) {
+                return null;
+            }
+            if (samplingMechanism != SamplingMechanism.EXTERNAL_OVERRIDE
+                    && samplingMechanism != SamplingMechanism.UNKNOWN) {
+                return otelTraceState.forNonProbabilityDecision();
+            }
+            if (!otelTraceState.isConsistentWith(samplingPriority > 0)) {
+                return otelTraceState.withoutThreshold();
+            }
+            return otelTraceState;
+        }
 
-    @Override
-    public void updateDebugPropagation(String value) {
-      debugPropagation = value;
-    }
+        @Override
+        public void addTraceSource(final int product) {
+            TRACE_SOURCE_UPDATER.updateAndGet(this, currentValue -> {
+                // If the product is already marked, return the same value (no change)
+                if (ProductTraceSource.isProductMarked(currentValue, product)) {
+                    return currentValue;
+                }
+
+                // Invalidate cached headers (atomic context ensures correctness)
+                clearCachedHeader(DATADOG);
+                clearCachedHeader(W3C);
+
+                // Set the bit for the given product
+                return ProductTraceSource.updateProduct(currentValue, product);
+            });
+        }
 
-    @Override
-    public String getDebugPropagation() {
-      return debugPropagation;
-    }
+        @Override
+        public int getTraceSource() {
+            return traceSource;
+        }
 
-    private static TagValue knuthSamplingRateTagValue(double rate) {
-      if (Double.isNaN(rate)) {
-        return null;
-      }
-      if (Double.compare(cachedKsrRate, rate) == 0) {
-        return cachedKsrTagValue;
-      }
-      TagValue value = TagValue.from(formatKnuthSamplingRate(rate));
-      cachedKsrTagValue = value;
-      cachedKsrRate = rate;
-      return value;
-    }
+        @Override
+        public void updateDebugPropagation(String value) {
+            debugPropagation = value;
+        }
 
-    /**
-     * Formats a sampling rate with up to 6 decimal digits of precision and no trailing zeros.
-     *
-     * <p>Values below 0.0000005 (which round to zero at 6 decimal places) return {@code "0"}.
-     * Values at or above 0.9999995 return {@code "1"}.
-     *
-     * <p>Uses char-array arithmetic to avoid {@link java.util.Formatter} allocations entirely.
-     */
-    static String formatKnuthSamplingRate(double rate) {
-      if (rate <= 0.0) return "0";
-      if (rate >= 1.0) return "1";
-
-      // Round to 6 decimal places.
-      long rounded = Math.round(rate * 1_000_000L);
-      if (rounded == 0) return "0";
-      if (rounded >= 1_000_000L) return "1";
-
-      // Build "0.DDDDDD" and trim trailing zeros in a single right-to-left pass.
-      char[] buf = new char[8]; // "0." + 6 digits
-      buf[0] = '0';
-      buf[1] = '.';
-      int end = 2; // exclusive end; updated on first non-zero digit found from the right
-      for (int i = 7; i >= 2; i--) {
-        int d = (int) (rounded % 10);
-        rounded /= 10;
-        buf[i] = (char) ('0' + d);
-        if (d != 0 && end == 2) {
-          end = i + 1;
-        }
-      }
-
-      return new String(buf, 0, end);
-    }
+        @Override
+        public String getDebugPropagation() {
+            return debugPropagation;
+        }
 
-    TagValue getKnuthSamplingRateTagValue() {
-      return getKnuthSamplingRateTagValue(samplingState);
-    }
+        private static TagValue knuthSamplingRateTagValue(double rate) {
+            if (Double.isNaN(rate)) {
+                return null;
+            }
+            if (Double.compare(cachedKsrRate, rate) == 0) {
+                return cachedKsrTagValue;
+            }
+            TagValue value = TagValue.from(formatKnuthSamplingRate(rate));
+            cachedKsrTagValue = value;
+            cachedKsrRate = rate;
+            return value;
+        }
 
-    TagValue getKnuthSamplingRateTagValue(SamplingState samplingState) {
-      return asTagValue(samplingState.getKnuthSamplingRate());
-    }
+        /**
+         * Formats a sampling rate with up to 6 decimal digits of precision and no trailing zeros.
+         *
+         * <p>Values below 0.0000005 (which round to zero at 6 decimal places) return {@code "0"}.
+         * Values at or above 0.9999995 return {@code "1"}.
+         *
+         * <p>Uses char-array arithmetic to avoid {@link java.util.Formatter} allocations entirely.
+         */
+        static String formatKnuthSamplingRate(double rate) {
+            if (rate <= 0.0) return "0";
+            if (rate >= 1.0) return "1";
+
+            // Round to 6 decimal places.
+            long rounded = Math.round(rate * 1_000_000L);
+            if (rounded == 0) return "0";
+            if (rounded >= 1_000_000L) return "1";
+
+            // Build "0.DDDDDD" and trim trailing zeros in a single right-to-left pass.
+            char[] buf = new char[8]; // "0." + 6 digits
+            buf[0] = '0';
+            buf[1] = '.';
+            int end = 2; // exclusive end; updated on first non-zero digit found from the right
+            for (int i = 7; i >= 2; i--) {
+                int d = (int) (rounded % 10);
+                rounded /= 10;
+                buf[i] = (char) ('0' + d);
+                if (d != 0 && end == 2) {
+                    end = i + 1;
+                }
+            }
 
-    @Override
-    public CharSequence getOrgPropagationMarker() {
-      return orgPropagationMarkerTagValue;
-    }
+            return new String(buf, 0, end);
+        }
 
-    @Override
-    public void updateOrgPropagationMarker(CharSequence opm) {
-      TagValue newValue = opm == null ? null : TagValue.from(opm);
-      if (!Objects.equals(this.orgPropagationMarkerTagValue, newValue)) {
-        clearCachedHeader(DATADOG);
-        clearCachedHeader(W3C);
-        this.orgPropagationMarkerTagValue = newValue;
-      }
-    }
+        TagValue getKnuthSamplingRateTagValue() {
+            return getKnuthSamplingRateTagValue(samplingState);
+        }
 
-    TagValue getOrgPropagationMarkerTagValue() {
-      return orgPropagationMarkerTagValue;
-    }
+        TagValue getKnuthSamplingRateTagValue(SamplingState samplingState) {
+            return asTagValue(samplingState.getKnuthSamplingRate());
+        }
 
-    @Override
-    public int getSamplingPriority() {
-      return samplingState.getSamplingPriority();
-    }
+        @Override
+        public CharSequence getOrgPropagationMarker() {
+            return orgPropagationMarkerTagValue;
+        }
 
-    @Override
-    public SamplingState samplingState() {
-      return samplingState;
-    }
+        @Override
+        public void updateOrgPropagationMarker(CharSequence opm) {
+            TagValue newValue = opm == null ? null : TagValue.from(opm);
+            if (!Objects.equals(this.orgPropagationMarkerTagValue, newValue)) {
+                clearCachedHeader(DATADOG);
+                clearCachedHeader(W3C);
+                this.orgPropagationMarkerTagValue = newValue;
+            }
+        }
 
-    @Override
-    public void updateTraceOrigin(CharSequence origin) {
-      // TODO we should really have UTF8ByteStrings for the regular ones
-      CharSequence existing = this.origin;
-      if (Objects.equals(existing, origin)) {
-        return;
-      }
-      // Invalidate any cached w3c header
-      clearCachedHeader(W3C);
-      this.origin = TagValue.from(origin);
-    }
+        TagValue getOrgPropagationMarkerTagValue() {
+            return orgPropagationMarkerTagValue;
+        }
 
-    @Override
-    public CharSequence getOrigin() {
-      return origin;
-    }
+        @Override
+        public int getSamplingPriority() {
+            return samplingState.getSamplingPriority();
+        }
 
-    @Override
-    public long getTraceIdHighOrderBits() {
-      return traceIdHighOrderBits;
-    }
+        @Override
+        public SamplingState samplingState() {
+            return samplingState;
+        }
 
-    public void updateTraceIdHighOrderBits(long highOrderBits) {
-      if (traceIdHighOrderBits != highOrderBits) {
-        traceIdHighOrderBits = highOrderBits;
-        traceIdHighOrderBitsHexTagValue =
-            highOrderBits == 0
-                ? null
-                : TagValue.from(LongStringUtils.toHexStringPadded(highOrderBits, 16));
-        clearCachedHeader(DATADOG);
-      }
-    }
+        @Override
+        public void updateTraceOrigin(CharSequence origin) {
+            // TODO we should really have UTF8ByteStrings for the regular ones
+            CharSequence existing = this.origin;
+            if (Objects.equals(existing, origin)) {
+                return;
+            }
+            // Invalidate any cached w3c header
+            clearCachedHeader(W3C);
+            this.origin = TagValue.from(origin);
+        }
 
-    @Override
-    public CharSequence getLastParentId() {
-      return lastParentId;
-    }
+        @Override
+        public CharSequence getOrigin() {
+            return origin;
+        }
 
-    @Override
-    @SuppressWarnings("StringEquality")
-    @SuppressFBWarnings("ES_COMPARING_STRINGS_WITH_EQ")
-    public String headerValue(HeaderType headerType) {
-      SamplingState currentSamplingState = samplingState;
-      String header = getCachedHeader(headerType, currentSamplingState);
-      if (header == null) {
-        header =
-            PTagsCodec.headerValue(
-                factory.getDecoderEncoder(headerType), this, null, currentSamplingState);
-        if (header != null) {
-          setCachedHeader(headerType, currentSamplingState, header);
-        } else {
-          // We can still cache the fact that we got back null
-          setCachedHeader(headerType, currentSamplingState, EMPTY);
-        }
-      }
-      if (header == EMPTY) {
-        return null;
-      }
-      return header;
-    }
+        @Override
+        public long getTraceIdHighOrderBits() {
+            return traceIdHighOrderBits;
+        }
 
-    @Override
-    public String headerValue(HeaderType headerType, CharSequence lastParentIdOverride) {
-      if (lastParentIdOverride == null) {
-        return headerValue(headerType);
-      }
-      SamplingState currentSamplingState = samplingState;
-      String header =
-          PTagsCodec.headerValue(
-              factory.getDecoderEncoder(headerType),
-              this,
-              lastParentIdOverride,
-              currentSamplingState);
-      return (header == null || header.isEmpty()) ? null : header;
-    }
+        public void updateTraceIdHighOrderBits(long highOrderBits) {
+            if (traceIdHighOrderBits != highOrderBits) {
+                traceIdHighOrderBits = highOrderBits;
+                traceIdHighOrderBitsHexTagValue =
+                        highOrderBits == 0 ? null : TagValue.from(LongStringUtils.toHexStringPadded(highOrderBits, 16));
+                clearCachedHeader(DATADOG);
+            }
+        }
 
-    @Override
-    public String headerValue(
-        HeaderType headerType, CharSequence lastParentIdOverride, SamplingState samplingState) {
-      String header =
-          PTagsCodec.headerValue(
-              factory.getDecoderEncoder(headerType), this, lastParentIdOverride, samplingState);
-      return (header == null || header.isEmpty()) ? null : header;
-    }
+        @Override
+        public CharSequence getLastParentId() {
+            return lastParentId;
+        }
 
-    @Override
-    public void fillTagMap(Map<String, String> tagMap) {
-      PTagsCodec.fillTagMap(this, tagMap);
-    }
+        @Override
+        @SuppressWarnings("StringEquality")
+        @SuppressFBWarnings("ES_COMPARING_STRINGS_WITH_EQ")
+        public String headerValue(HeaderType headerType) {
+            SamplingState currentSamplingState = samplingState;
+            String header = getCachedHeader(headerType, currentSamplingState);
+            if (header == null) {
+                header =
+                        PTagsCodec.headerValue(factory.getDecoderEncoder(headerType), this, null, currentSamplingState);
+                if (header != null) {
+                    setCachedHeader(headerType, currentSamplingState, header);
+                } else {
+                    // We can still cache the fact that we got back null
+                    setCachedHeader(headerType, currentSamplingState, EMPTY);
+                }
+            }
+            if (header == EMPTY) {
+                return null;
+            }
+            return header;
+        }
 
-    private String getCachedHeader(HeaderType headerType, SamplingState samplingState) {
-      HeaderCacheEntry cache = headerType == DATADOG ? datadogHeaderCache : w3cHeaderCache;
-      return cache != null && cache.samplingState == samplingState ? cache.header : null;
-    }
+        @Override
+        public String headerValue(HeaderType headerType, CharSequence lastParentIdOverride) {
+            if (lastParentIdOverride == null) {
+                return headerValue(headerType);
+            }
+            SamplingState currentSamplingState = samplingState;
+            String header = PTagsCodec.headerValue(
+                    factory.getDecoderEncoder(headerType), this, lastParentIdOverride, currentSamplingState);
+            return (header == null || header.isEmpty()) ? null : header;
+        }
 
-    private void setCachedHeader(
-        HeaderType headerType, SamplingState samplingState, String header) {
-      HeaderCacheEntry entry = new HeaderCacheEntry(samplingState, header);
-      if (headerType == DATADOG) {
-        datadogHeaderCache = entry;
-      } else {
-        w3cHeaderCache = entry;
-      }
-    }
+        @Override
+        public String headerValue(
+                HeaderType headerType, CharSequence lastParentIdOverride, SamplingState samplingState) {
+            String header = PTagsCodec.headerValue(
+                    factory.getDecoderEncoder(headerType), this, lastParentIdOverride, samplingState);
+            return (header == null || header.isEmpty()) ? null : header;
+        }
 
-    private void clearCachedHeader(HeaderType headerType) {
-      if (headerType == DATADOG) {
-        invalidateXDatadogTagsSize();
-      }
-      if (headerType == DATADOG) {
-        datadogHeaderCache = null;
-      } else {
-        w3cHeaderCache = null;
-      }
-    }
+        @Override
+        public void fillTagMap(Map<String, String> tagMap) {
+            PTagsCodec.fillTagMap(this, tagMap);
+        }
 
-    private static final class HeaderCacheEntry {
-      private final SamplingState samplingState;
-      private final String header;
+        private String getCachedHeader(HeaderType headerType, SamplingState samplingState) {
+            HeaderCacheEntry cache = headerType == DATADOG ? datadogHeaderCache : w3cHeaderCache;
+            return cache != null && cache.samplingState == samplingState ? cache.header : null;
+        }
 
-      private HeaderCacheEntry(SamplingState samplingState, String header) {
-        this.samplingState = samplingState;
-        this.header = header;
-      }
-    }
+        private void setCachedHeader(HeaderType headerType, SamplingState samplingState, String header) {
+            HeaderCacheEntry entry = new HeaderCacheEntry(samplingState, header);
+            if (headerType == DATADOG) {
+                datadogHeaderCache = entry;
+            } else {
+                w3cHeaderCache = entry;
+            }
+        }
 
-    int getxDatadogTagsLimit() {
-      return factory.getxDatadogTagsLimit();
-    }
+        private void clearCachedHeader(HeaderType headerType) {
+            if (headerType == DATADOG) {
+                invalidateXDatadogTagsSize();
+            }
+            if (headerType == DATADOG) {
+                datadogHeaderCache = null;
+            } else {
+                w3cHeaderCache = null;
+            }
+        }
 
-    boolean isPropagationTagsDisabled() {
-      return factory.isPropagationTagsDisabled();
-    }
+        private static final class HeaderCacheEntry {
+            private final SamplingState samplingState;
+            private final String header;
 
-    List<TagElement> getTagPairs() {
-      return tagPairs == null ? Collections.emptyList() : tagPairs;
-    }
+            private HeaderCacheEntry(SamplingState samplingState, String header) {
+                this.samplingState = samplingState;
+                this.header = header;
+            }
+        }
 
-    private void invalidateXDatadogTagsSize() {
-      xDatadogTagsSizeCache = null;
-    }
+        int getxDatadogTagsLimit() {
+            return factory.getxDatadogTagsLimit();
+        }
 
-    int getXDatadogTagsSize(SamplingState samplingState) {
-      SizeCacheEntry cache = xDatadogTagsSizeCache;
-      if (cache == null || cache.samplingState != samplingState) {
-        int size = PTagsCodec.calcXDatadogTagsSize(getTagPairs());
-        size =
-            PTagsCodec.calcXDatadogTagsSize(
-                size, DECISION_MAKER_TAG, getDecisionMakerTagValue(samplingState));
-        size = PTagsCodec.calcXDatadogTagsSize(size, TRACE_ID_TAG, traceIdHighOrderBitsHexTagValue);
-        size =
-            PTagsCodec.calcXDatadogTagsSize(
-                size, KNUTH_SAMPLING_RATE_TAG, getKnuthSamplingRateTagValue(samplingState));
-        size =
-            PTagsCodec.calcXDatadogTagsSize(
-                size, ORG_PROPAGATION_MARKER_TAG, getOrgPropagationMarkerTagValue());
-        int currentProductTraceSource = traceSource;
-        if (currentProductTraceSource != ProductTraceSource.UNSET) {
-          size =
-              PTagsCodec.calcXDatadogTagsSize(
-                  size,
-                  TRACE_SOURCE_TAG,
-                  TagValue.from(ProductTraceSource.getBitfieldHex(currentProductTraceSource)));
-        }
-        cache = new SizeCacheEntry(samplingState, size);
-        xDatadogTagsSizeCache = cache;
-      }
-      return cache.size;
-    }
+        boolean isPropagationTagsDisabled() {
+            return factory.isPropagationTagsDisabled();
+        }
 
-    private static final class SizeCacheEntry {
-      private final SamplingState samplingState;
-      private final int size;
+        List<TagElement> getTagPairs() {
+            return tagPairs == null ? Collections.emptyList() : tagPairs;
+        }
 
-      private SizeCacheEntry(SamplingState samplingState, int size) {
-        this.samplingState = samplingState;
-        this.size = size;
-      }
-    }
+        private void invalidateXDatadogTagsSize() {
+            xDatadogTagsSizeCache = null;
+        }
 
-    TagValue getTraceIdHighOrderBitsHexTagValue() {
-      return traceIdHighOrderBitsHexTagValue;
-    }
+        int getXDatadogTagsSize(SamplingState samplingState) {
+            SizeCacheEntry cache = xDatadogTagsSizeCache;
+            if (cache == null || cache.samplingState != samplingState) {
+                int size = PTagsCodec.calcXDatadogTagsSize(getTagPairs());
+                size = PTagsCodec.calcXDatadogTagsSize(
+                        size, DECISION_MAKER_TAG, getDecisionMakerTagValue(samplingState));
+                size = PTagsCodec.calcXDatadogTagsSize(size, TRACE_ID_TAG, traceIdHighOrderBitsHexTagValue);
+                size = PTagsCodec.calcXDatadogTagsSize(
+                        size, KNUTH_SAMPLING_RATE_TAG, getKnuthSamplingRateTagValue(samplingState));
+                size = PTagsCodec.calcXDatadogTagsSize(
+                        size, ORG_PROPAGATION_MARKER_TAG, getOrgPropagationMarkerTagValue());
+                int currentProductTraceSource = traceSource;
+                if (currentProductTraceSource != ProductTraceSource.UNSET) {
+                    size = PTagsCodec.calcXDatadogTagsSize(
+                            size,
+                            TRACE_SOURCE_TAG,
+                            TagValue.from(ProductTraceSource.getBitfieldHex(currentProductTraceSource)));
+                }
+                cache = new SizeCacheEntry(samplingState, size);
+                xDatadogTagsSizeCache = cache;
+            }
+            return cache.size;
+        }
 
-    TagValue getDecisionMakerTagValue() {
-      return getDecisionMakerTagValue(samplingState);
-    }
+        private static final class SizeCacheEntry {
+            private final SamplingState samplingState;
+            private final int size;
 
-    TagValue getDecisionMakerTagValue(SamplingState samplingState) {
-      return asTagValue(samplingState.getDecisionMaker());
-    }
+            private SizeCacheEntry(SamplingState samplingState, int size) {
+                this.samplingState = samplingState;
+                this.size = size;
+            }
+        }
 
-    private static TagValue asTagValue(CharSequence value) {
-      if (value == null) {
-        return null;
-      }
-      return value instanceof TagValue ? (TagValue) value : TagValue.from(value);
-    }
+        TagValue getTraceIdHighOrderBitsHexTagValue() {
+            return traceIdHighOrderBitsHexTagValue;
+        }
 
-    @Override
-    public String getW3CTracestate() {
-      return this.tracestate;
-    }
+        TagValue getDecisionMakerTagValue() {
+            return getDecisionMakerTagValue(samplingState);
+        }
 
-    @Override
-    public String getW3CTracestate(SamplingState samplingState) {
-      TracestateCacheEntry cache = tracestateCache;
-      if (cache == null || cache.samplingState != samplingState) {
-        cache =
-            new TracestateCacheEntry(samplingState, W3CPTagsCodec.rebuildTracestate(samplingState));
-        tracestateCache = cache;
-      }
-      return cache.tracestate;
-    }
+        TagValue getDecisionMakerTagValue(SamplingState samplingState) {
+            return asTagValue(samplingState.getDecisionMaker());
+        }
 
-    private static final class TracestateCacheEntry {
-      private final SamplingState samplingState;
-      private final String tracestate;
+        private static TagValue asTagValue(CharSequence value) {
+            if (value == null) {
+                return null;
+            }
+            return value instanceof TagValue ? (TagValue) value : TagValue.from(value);
+        }
 
-      private TracestateCacheEntry(SamplingState samplingState, String tracestate) {
-        this.samplingState = samplingState;
-        this.tracestate = tracestate;
-      }
-    }
+        @Override
+        public String getW3CTracestate() {
+            return this.tracestate;
+        }
 
-    @Override
-    public void updateW3CTracestate(String tracestate) {
-      setW3CTracestate(tracestate, W3CPTagsCodec.extractOtelTraceState(tracestate));
-    }
+        @Override
+        public String getW3CTracestate(SamplingState samplingState) {
+            TracestateCacheEntry cache = tracestateCache;
+            if (cache == null || cache.samplingState != samplingState) {
+                cache = new TracestateCacheEntry(samplingState, W3CPTagsCodec.rebuildTracestate(samplingState));
+                tracestateCache = cache;
+            }
+            return cache.tracestate;
+        }
 
-    @Override
-    public void updateW3CTracestateFrom(PropagationTags source) {
-      if (!(source instanceof PTags)) {
-        super.updateW3CTracestateFrom(source);
-        return;
-      }
-      PTags sourcePTags = (PTags) source;
-      SamplingState sourceState = sourcePTags.samplingState();
-      CharSequence sourceOtelTraceState = sourceState.getOtelTraceState();
-      setW3CTracestate(
-          sourceState.getTracestate(),
-          sourceOtelTraceState instanceof OtelTraceState
-              ? (OtelTraceState) sourceOtelTraceState
-              : W3CPTagsCodec.extractOtelTraceState(sourceState.getTracestate()));
-    }
+        private static final class TracestateCacheEntry {
+            private final SamplingState samplingState;
+            private final String tracestate;
 
-    private void setW3CTracestate(String tracestate, OtelTraceState otelTraceState) {
-      synchronized (samplingStateLock) {
-        clearCachedHeader(W3C);
-        int samplingPriority = samplingState.getSamplingPriority();
-        if (otelTraceState != null
-            && samplingPriority != PrioritySampling.UNSET
-            && !otelTraceState.isConsistentWith(samplingPriority > 0)) {
-          otelTraceState = otelTraceState.withoutThreshold();
-        }
-        this.tracestate = tracestate;
-        this.samplingState =
-            new SamplingState(
-                samplingPriority,
-                tracestate,
-                otelTraceState,
-                getDecisionMakerTagValue(),
-                getKnuthSamplingRateTagValue());
-      }
-    }
+            private TracestateCacheEntry(SamplingState samplingState, String tracestate) {
+                this.samplingState = samplingState;
+                this.tracestate = tracestate;
+            }
+        }
 
-    private OtelTraceState getOtelTraceState() {
-      return (OtelTraceState) samplingState.getOtelTraceState();
-    }
+        @Override
+        public void updateW3CTracestate(String tracestate) {
+            setW3CTracestate(tracestate, W3CPTagsCodec.extractOtelTraceState(tracestate));
+        }
 
-    @SuppressWarnings("StringEquality")
-    @SuppressFBWarnings(
-        value = "ES_COMPARING_STRINGS_WITH_EQ",
-        justification =
-            "Identity preserves the raw tracestate reference used by the cached sampling state.")
-    void setOtelTraceState(OtelTraceState otelTraceState) {
-      synchronized (samplingStateLock) {
-        SamplingState currentState = samplingState;
-        if (currentState.getTracestate() == tracestate
-            && currentState.getOtelTraceState() == otelTraceState) {
-          return;
-        }
-        clearCachedHeader(W3C);
-        samplingState =
-            new SamplingState(
-                currentState.getSamplingPriority(),
-                tracestate,
-                otelTraceState,
-                getDecisionMakerTagValue(currentState),
-                getKnuthSamplingRateTagValue(currentState));
-      }
-    }
+        @Override
+        public void updateW3CTracestateFrom(PropagationTags source) {
+            if (!(source instanceof PTags)) {
+                super.updateW3CTracestateFrom(source);
+                return;
+            }
+            PTags sourcePTags = (PTags) source;
+            SamplingState sourceState = sourcePTags.samplingState();
+            CharSequence sourceOtelTraceState = sourceState.getOtelTraceState();
+            setW3CTracestate(
+                    sourceState.getTracestate(),
+                    sourceOtelTraceState instanceof OtelTraceState
+                            ? (OtelTraceState) sourceOtelTraceState
+                            : W3CPTagsCodec.extractOtelTraceState(sourceState.getTracestate()));
+        }
 
-    String getError() {
-      return this.error;
-    }
+        private void setW3CTracestate(String tracestate, OtelTraceState otelTraceState) {
+            synchronized (samplingStateLock) {
+                clearCachedHeader(W3C);
+                int samplingPriority = samplingState.getSamplingPriority();
+                if (otelTraceState != null
+                        && samplingPriority != PrioritySampling.UNSET
+                        && !otelTraceState.isConsistentWith(samplingPriority > 0)) {
+                    otelTraceState = otelTraceState.withoutThreshold();
+                }
+                this.tracestate = tracestate;
+                this.samplingState = new SamplingState(
+                        samplingPriority,
+                        tracestate,
+                        otelTraceState,
+                        getDecisionMakerTagValue(),
+                        getKnuthSamplingRateTagValue());
+            }
+        }
 
-    @Override
-    public void updateAndLockDecisionMaker(PropagationTags source) {
-      synchronized (samplingStateLock) {
-        if (source instanceof PTags) {
-          canChangeDecisionMaker = false;
-          TagValue decisionMakerTagValue = ((PTags) source).getDecisionMakerTagValue();
-          if (decisionMakerTagValue != null) {
-            clearCachedHeader(DATADOG);
-            clearCachedHeader(W3C);
-          }
-          SamplingState currentState = samplingState;
-          samplingState =
-              new SamplingState(
-                  currentState.getSamplingPriority(),
-                  tracestate,
-                  getOtelTraceState(),
-                  decisionMakerTagValue,
-                  getKnuthSamplingRateTagValue(currentState));
-        }
-      }
+        private OtelTraceState getOtelTraceState() {
+            return (OtelTraceState) samplingState.getOtelTraceState();
+        }
+
+        @SuppressWarnings("StringEquality")
+        @SuppressFBWarnings(
+                value = "ES_COMPARING_STRINGS_WITH_EQ",
+                justification = "Identity preserves the raw tracestate reference used by the cached sampling state.")
+        void setOtelTraceState(OtelTraceState otelTraceState) {
+            synchronized (samplingStateLock) {
+                SamplingState currentState = samplingState;
+                if (currentState.getTracestate() == tracestate && currentState.getOtelTraceState() == otelTraceState) {
+                    return;
+                }
+                clearCachedHeader(W3C);
+                samplingState = new SamplingState(
+                        currentState.getSamplingPriority(),
+                        tracestate,
+                        otelTraceState,
+                        getDecisionMakerTagValue(currentState),
+                        getKnuthSamplingRateTagValue(currentState));
+            }
+        }
+
+        String getError() {
+            return this.error;
+        }
+
+        @Override
+        public void updateAndLockDecisionMaker(PropagationTags source) {
+            synchronized (samplingStateLock) {
+                if (source instanceof PTags) {
+                    canChangeDecisionMaker = false;
+                    TagValue decisionMakerTagValue = ((PTags) source).getDecisionMakerTagValue();
+                    if (decisionMakerTagValue != null) {
+                        clearCachedHeader(DATADOG);
+                        clearCachedHeader(W3C);
+                    }
+                    SamplingState currentState = samplingState;
+                    samplingState = new SamplingState(
+                            currentState.getSamplingPriority(),
+                            tracestate,
+                            getOtelTraceState(),
+                            decisionMakerTagValue,
+                            getKnuthSamplingRateTagValue(currentState));
+                }
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/TagElement.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/TagElement.java
index 8805e86d045..a1d99452043 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/TagElement.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/TagElement.java
@@ -1,40 +1,40 @@
 package datadog.trace.core.propagation.ptags;
 
 abstract class TagElement implements CharSequence {
-  public enum Encoding {
-    DATADOG("_dd.p."),
-    W3C("t.");
+    public enum Encoding {
+        DATADOG("_dd.p."),
+        W3C("t.");
 
-    private final String prefix;
+        private final String prefix;
 
-    Encoding(String prefix) {
-      this.prefix = prefix;
-    }
+        Encoding(String prefix) {
+            this.prefix = prefix;
+        }
 
-    public String getPrefix() {
-      return prefix;
-    }
+        public String getPrefix() {
+            return prefix;
+        }
 
-    public int getPrefixLength() {
-      return prefix.length();
-    }
+        public int getPrefixLength() {
+            return prefix.length();
+        }
 
-    private static final Encoding[] cachedValues;
-    private static final int numValues;
+        private static final Encoding[] cachedValues;
+        private static final int numValues;
 
-    static {
-      cachedValues = values();
-      numValues = cachedValues.length;
-    }
+        static {
+            cachedValues = values();
+            numValues = cachedValues.length;
+        }
 
-    static Encoding[] getCachedValues() {
-      return cachedValues;
-    }
+        static Encoding[] getCachedValues() {
+            return cachedValues;
+        }
 
-    static int getNumValues() {
-      return numValues;
+        static int getNumValues() {
+            return numValues;
+        }
     }
-  }
 
-  abstract CharSequence forType(Encoding encoding);
+    abstract CharSequence forType(Encoding encoding);
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/TagKey.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/TagKey.java
index 75b5276fdd3..313768906ef 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/TagKey.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/TagKey.java
@@ -6,141 +6,137 @@
 import org.slf4j.LoggerFactory;
 
 final class TagKey extends TagElement {
-  private static final Logger log = LoggerFactory.getLogger(TagKey.class);
-  private static final DDPartialKeyCache<String, TagKey> keyCache =
-      DDCaches.newFixedSizePartialKeyCache(64);
-
-  static TagKey from(String s) {
-    if (s == null || isHeaderInvalid(s, 0, s.length(), null)) {
-      if (log.isDebugEnabled()) {
-        log.debug("Invalid header s: {}", s);
-      }
-      return null;
-    }
-    return keyCache.computeIfAbsent(
-        s, 0, s.length(), TagKey::hash, TagKey::compare, TagKey::produce);
-  }
-
-  static TagKey from(Encoding encoding, String s) {
-    if (isHeaderInvalid(encoding, s)) {
-      if (log.isDebugEnabled()) {
-        log.debug("Invalid header h: {} s: {}", encoding, s);
-      }
-      return null;
-    }
-    int pl = encoding.getPrefixLength();
-    return keyCache.computeIfAbsent(
-        s, pl, s.length(), TagKey::hash, TagKey::compare, TagKey::produce);
-  }
-
-  static TagKey from(Encoding encoding, String s, int start, int end) {
-    if (isHeaderInvalid(encoding, s, start, end)) {
-      if (log.isDebugEnabled()) {
-        log.debug("Invalid header h: {} s: {} b: {} e: {}", encoding, s, start, end);
-      }
-      return null;
-    }
-    int pl = encoding.getPrefixLength();
-    return keyCache.computeIfAbsent(
-        s, start + pl, end, TagKey::hash, TagKey::compare, TagKey::produce);
-  }
-
-  private static boolean isHeaderInvalid(Encoding encoding, String s) {
-    if (encoding == null || s == null) {
-      return true;
-    }
-    return isHeaderInvalid(encoding, s, 0, s.length());
-  }
-
-  private static boolean isHeaderInvalid(Encoding encoding, String s, int start, int end) {
-    if (encoding == null || s == null) {
-      return true;
-    }
-    return isHeaderInvalid(s, start, end, encoding.getPrefix());
-  }
-
-  private static boolean isHeaderInvalid(String s, int start, int end, String prefix) {
-    int pl = prefix == null ? 0 : prefix.length();
-    int sl = s.length();
-    return start < 0
-        || end <= 0
-        || (end - start) <= pl
-        || sl <= pl
-        || sl < end
-        || (prefix != null && !s.startsWith(prefix, start));
-  }
-
-  private static int hash(String s, int start, int end) {
-    int h = 0;
-    end = Integer.min(s.length(), end);
-    if (start >= 0 && end > 0) {
-      for (int i = start; i < end; i++) {
-        h = 31 * h + s.charAt(i);
-      }
-    }
-    return h;
-  }
-
-  private static boolean compare(String s, int start, int end, TagKey tagKey) {
-    end = Integer.min(s.length(), end);
-    if (start < 0 || end < 0 || end - start != tagKey.length()) {
-      return false;
-    }
-    boolean eq = true;
-    for (int i = start, j = 0; eq && i < end; i++, j++) {
-      eq = s.charAt(i) == tagKey.charAt(j);
-    }
-    return eq;
-  }
-
-  private static TagKey produce(String s, int hash, int start, int end) {
-    return new TagKey(s, start, end);
-  }
-
-  private final String none;
-  private final String[] keys = new String[Encoding.getNumValues()];
-
-  TagKey(String s, int start, int end) {
-    none = (start == 0 && end == s.length()) ? s : s.substring(start, end);
-    for (Encoding p : Encoding.getCachedValues()) {
-      keys[p.ordinal()] = p.getPrefix() + none;
-    }
-  }
-
-  CharSequence forType(Encoding encoding) {
-    return keys[encoding.ordinal()];
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    TagKey tagKey = (TagKey) o;
-    return none.equals(tagKey.none);
-  }
-
-  @Override
-  public int hashCode() {
-    return none.hashCode();
-  }
-
-  @Override
-  public String toString() {
-    return none;
-  }
-
-  @Override
-  public int length() {
-    return none.length();
-  }
-
-  @Override
-  public char charAt(int index) {
-    return none.charAt(index);
-  }
-
-  @Override
-  public CharSequence subSequence(int start, int end) {
-    return none.subSequence(start, end);
-  }
+    private static final Logger log = LoggerFactory.getLogger(TagKey.class);
+    private static final DDPartialKeyCache<String, TagKey> keyCache = DDCaches.newFixedSizePartialKeyCache(64);
+
+    static TagKey from(String s) {
+        if (s == null || isHeaderInvalid(s, 0, s.length(), null)) {
+            if (log.isDebugEnabled()) {
+                log.debug("Invalid header s: {}", s);
+            }
+            return null;
+        }
+        return keyCache.computeIfAbsent(s, 0, s.length(), TagKey::hash, TagKey::compare, TagKey::produce);
+    }
+
+    static TagKey from(Encoding encoding, String s) {
+        if (isHeaderInvalid(encoding, s)) {
+            if (log.isDebugEnabled()) {
+                log.debug("Invalid header h: {} s: {}", encoding, s);
+            }
+            return null;
+        }
+        int pl = encoding.getPrefixLength();
+        return keyCache.computeIfAbsent(s, pl, s.length(), TagKey::hash, TagKey::compare, TagKey::produce);
+    }
+
+    static TagKey from(Encoding encoding, String s, int start, int end) {
+        if (isHeaderInvalid(encoding, s, start, end)) {
+            if (log.isDebugEnabled()) {
+                log.debug("Invalid header h: {} s: {} b: {} e: {}", encoding, s, start, end);
+            }
+            return null;
+        }
+        int pl = encoding.getPrefixLength();
+        return keyCache.computeIfAbsent(s, start + pl, end, TagKey::hash, TagKey::compare, TagKey::produce);
+    }
+
+    private static boolean isHeaderInvalid(Encoding encoding, String s) {
+        if (encoding == null || s == null) {
+            return true;
+        }
+        return isHeaderInvalid(encoding, s, 0, s.length());
+    }
+
+    private static boolean isHeaderInvalid(Encoding encoding, String s, int start, int end) {
+        if (encoding == null || s == null) {
+            return true;
+        }
+        return isHeaderInvalid(s, start, end, encoding.getPrefix());
+    }
+
+    private static boolean isHeaderInvalid(String s, int start, int end, String prefix) {
+        int pl = prefix == null ? 0 : prefix.length();
+        int sl = s.length();
+        return start < 0
+                || end <= 0
+                || (end - start) <= pl
+                || sl <= pl
+                || sl < end
+                || (prefix != null && !s.startsWith(prefix, start));
+    }
+
+    private static int hash(String s, int start, int end) {
+        int h = 0;
+        end = Integer.min(s.length(), end);
+        if (start >= 0 && end > 0) {
+            for (int i = start; i < end; i++) {
+                h = 31 * h + s.charAt(i);
+            }
+        }
+        return h;
+    }
+
+    private static boolean compare(String s, int start, int end, TagKey tagKey) {
+        end = Integer.min(s.length(), end);
+        if (start < 0 || end < 0 || end - start != tagKey.length()) {
+            return false;
+        }
+        boolean eq = true;
+        for (int i = start, j = 0; eq && i < end; i++, j++) {
+            eq = s.charAt(i) == tagKey.charAt(j);
+        }
+        return eq;
+    }
+
+    private static TagKey produce(String s, int hash, int start, int end) {
+        return new TagKey(s, start, end);
+    }
+
+    private final String none;
+    private final String[] keys = new String[Encoding.getNumValues()];
+
+    TagKey(String s, int start, int end) {
+        none = (start == 0 && end == s.length()) ? s : s.substring(start, end);
+        for (Encoding p : Encoding.getCachedValues()) {
+            keys[p.ordinal()] = p.getPrefix() + none;
+        }
+    }
+
+    CharSequence forType(Encoding encoding) {
+        return keys[encoding.ordinal()];
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        TagKey tagKey = (TagKey) o;
+        return none.equals(tagKey.none);
+    }
+
+    @Override
+    public int hashCode() {
+        return none.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return none;
+    }
+
+    @Override
+    public int length() {
+        return none.length();
+    }
+
+    @Override
+    public char charAt(int index) {
+        return none.charAt(index);
+    }
+
+    @Override
+    public CharSequence subSequence(int start, int end) {
+        return none.subSequence(start, end);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/TagValue.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/TagValue.java
index 8c1d6412fec..8e4c25496dc 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/TagValue.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/TagValue.java
@@ -6,211 +6,209 @@
 import org.slf4j.LoggerFactory;
 
 final class TagValue extends TagElement {
-  private static final Logger log = LoggerFactory.getLogger(TagValue.class);
-  private static final DDPartialKeyCache<CharSequence, TagValue> valueCache =
-      DDCaches.newFixedSizePartialKeyCache(128);
-  private static final int DD_SOURCE = Encoding.DATADOG.ordinal();
-
-  static TagValue from(CharSequence s) {
-    return from(Encoding.DATADOG, s);
-  }
-
-  static TagValue from(Encoding encoding, CharSequence s) {
-    return from(encoding, s, s == null ? -1 : 0, s == null ? -1 : s.length());
-  }
-
-  static TagValue from(Encoding encoding, CharSequence s, int start, int end) {
-    if (s == null || isValueInvalid(s, start, end)) {
-      if (log.isDebugEnabled()) {
-        log.debug("Invalid header h: {} s: {} b: {} e: {}", encoding, s, start, end);
-      }
-      return null;
-    }
-    if (encoding == Encoding.W3C) {
-      return valueCache.computeIfAbsent(
-          s, start, end, TagValue::hashW3C, TagValue::compareW3C, TagValue::produceW3C);
-    } else {
-      return valueCache.computeIfAbsent(
-          s, start, end, TagValue::hashDD, TagValue::compareDD, TagValue::produceDD);
-    }
-  }
-
-  private static boolean isValueInvalid(CharSequence s, int start, int end) {
-    return start < 0 || end <= 0 || s.length() < end;
-  }
-
-  private static int hashDD(CharSequence s, int start, int end) {
-    return hash(TagValue::convertDDtoW3C, s, start, end);
-  }
-
-  private static int hashW3C(CharSequence s, int start, int end) {
-    return hash(TagValue::identity, s, start, end);
-  }
-
-  private static int hash(CharConverter converter, CharSequence s, int start, int end) {
-    int h = 0;
-    end = Integer.min(s.length(), end);
-    if (start >= 0 && end > 0) {
-      for (int i = start; i < end; i++) {
-        h = 31 * h + converter.convert(s.charAt(i));
-      }
-    }
-    return h;
-  }
-
-  private static boolean compareDD(CharSequence s, int start, int end, TagValue tagValue) {
-    return compare(TagValue::identity, s, start, end, tagValue);
-  }
-
-  private static boolean compareW3C(CharSequence s, int start, int end, TagValue tagValue) {
-    return compare(TagValue::convertW3CtoDD, s, start, end, tagValue);
-  }
-
-  private static boolean compare(
-      CharConverter converter, CharSequence s, int start, int end, TagValue tagValue) {
-    end = Integer.min(s.length(), end);
-    if (start < 0 || end < 0 || end - start != tagValue.length()) {
-      return false;
-    }
-    boolean eq = true;
-    for (int i = start, j = 0; eq && i < end; i++, j++) {
-      eq = converter.convert(s.charAt(i)) == tagValue.charAt(j);
-    }
-    return eq;
-  }
-
-  private static TagValue produceDD(CharSequence s, int hash, int start, int end) {
-    return new TagValue(Encoding.DATADOG, hash, s, start, end);
-  }
-
-  private static TagValue produceW3C(CharSequence s, int hash, int start, int end) {
-    return new TagValue(Encoding.W3C, hash, s, start, end);
-  }
-
-  private interface CharConverter {
-    char convert(char c);
-  }
-
-  private static char convertDDtoW3C(char c) {
-    if (c == ',' || c == ';' || c == '~') {
-      return '_';
-    } else if (c == '=') {
-      return '~';
-    }
-    return c;
-  }
-
-  private static char identity(char c) {
-    return c;
-  }
-
-  private static char convertW3CtoDD(char c) {
-    if (c == '~') {
-      return '=';
-    }
-    return c;
-  }
-
-  private final CharSequence[] values = new CharSequence[Encoding.getNumValues()];
-  private final int source;
-  private final int hash;
-
-  TagValue(Encoding encoding, int hash, CharSequence s, int start, int end) {
-    this.source = encoding.ordinal();
-    this.hash = hash;
-    values[source] =
-        (start == 0 && end == s.length())
-            ? s
-            : new StringBuilder(end - start).append(s, start, end).toString();
-  }
-
-  CharSequence forType(Encoding encoding) {
-    int ordinal = encoding.ordinal();
-    CharSequence cs = values[ordinal];
-    if (cs == null) {
-      CharSequence from = values[source];
-      int len = from.length();
-      CharConverter cc = source == DD_SOURCE ? TagValue::convertDDtoW3C : TagValue::convertW3CtoDD;
-      StringBuilder sb = null;
-      for (int i = 0; i < len; i++) {
-        char c = from.charAt(i);
-        char tc = cc.convert(c);
-        if (tc != c && sb == null) {
-          sb = new StringBuilder(len);
-          sb.append(from, 0, i);
+    private static final Logger log = LoggerFactory.getLogger(TagValue.class);
+    private static final DDPartialKeyCache<CharSequence, TagValue> valueCache =
+            DDCaches.newFixedSizePartialKeyCache(128);
+    private static final int DD_SOURCE = Encoding.DATADOG.ordinal();
+
+    static TagValue from(CharSequence s) {
+        return from(Encoding.DATADOG, s);
+    }
+
+    static TagValue from(Encoding encoding, CharSequence s) {
+        return from(encoding, s, s == null ? -1 : 0, s == null ? -1 : s.length());
+    }
+
+    static TagValue from(Encoding encoding, CharSequence s, int start, int end) {
+        if (s == null || isValueInvalid(s, start, end)) {
+            if (log.isDebugEnabled()) {
+                log.debug("Invalid header h: {} s: {} b: {} e: {}", encoding, s, start, end);
+            }
+            return null;
+        }
+        if (encoding == Encoding.W3C) {
+            return valueCache.computeIfAbsent(
+                    s, start, end, TagValue::hashW3C, TagValue::compareW3C, TagValue::produceW3C);
+        } else {
+            return valueCache.computeIfAbsent(
+                    s, start, end, TagValue::hashDD, TagValue::compareDD, TagValue::produceDD);
+        }
+    }
+
+    private static boolean isValueInvalid(CharSequence s, int start, int end) {
+        return start < 0 || end <= 0 || s.length() < end;
+    }
+
+    private static int hashDD(CharSequence s, int start, int end) {
+        return hash(TagValue::convertDDtoW3C, s, start, end);
+    }
+
+    private static int hashW3C(CharSequence s, int start, int end) {
+        return hash(TagValue::identity, s, start, end);
+    }
+
+    private static int hash(CharConverter converter, CharSequence s, int start, int end) {
+        int h = 0;
+        end = Integer.min(s.length(), end);
+        if (start >= 0 && end > 0) {
+            for (int i = start; i < end; i++) {
+                h = 31 * h + converter.convert(s.charAt(i));
+            }
+        }
+        return h;
+    }
+
+    private static boolean compareDD(CharSequence s, int start, int end, TagValue tagValue) {
+        return compare(TagValue::identity, s, start, end, tagValue);
+    }
+
+    private static boolean compareW3C(CharSequence s, int start, int end, TagValue tagValue) {
+        return compare(TagValue::convertW3CtoDD, s, start, end, tagValue);
+    }
+
+    private static boolean compare(CharConverter converter, CharSequence s, int start, int end, TagValue tagValue) {
+        end = Integer.min(s.length(), end);
+        if (start < 0 || end < 0 || end - start != tagValue.length()) {
+            return false;
+        }
+        boolean eq = true;
+        for (int i = start, j = 0; eq && i < end; i++, j++) {
+            eq = converter.convert(s.charAt(i)) == tagValue.charAt(j);
+        }
+        return eq;
+    }
+
+    private static TagValue produceDD(CharSequence s, int hash, int start, int end) {
+        return new TagValue(Encoding.DATADOG, hash, s, start, end);
+    }
+
+    private static TagValue produceW3C(CharSequence s, int hash, int start, int end) {
+        return new TagValue(Encoding.W3C, hash, s, start, end);
+    }
+
+    private interface CharConverter {
+        char convert(char c);
+    }
+
+    private static char convertDDtoW3C(char c) {
+        if (c == ',' || c == ';' || c == '~') {
+            return '_';
+        } else if (c == '=') {
+            return '~';
+        }
+        return c;
+    }
+
+    private static char identity(char c) {
+        return c;
+    }
+
+    private static char convertW3CtoDD(char c) {
+        if (c == '~') {
+            return '=';
+        }
+        return c;
+    }
+
+    private final CharSequence[] values = new CharSequence[Encoding.getNumValues()];
+    private final int source;
+    private final int hash;
+
+    TagValue(Encoding encoding, int hash, CharSequence s, int start, int end) {
+        this.source = encoding.ordinal();
+        this.hash = hash;
+        values[source] = (start == 0 && end == s.length())
+                ? s
+                : new StringBuilder(end - start).append(s, start, end).toString();
+    }
+
+    CharSequence forType(Encoding encoding) {
+        int ordinal = encoding.ordinal();
+        CharSequence cs = values[ordinal];
+        if (cs == null) {
+            CharSequence from = values[source];
+            int len = from.length();
+            CharConverter cc = source == DD_SOURCE ? TagValue::convertDDtoW3C : TagValue::convertW3CtoDD;
+            StringBuilder sb = null;
+            for (int i = 0; i < len; i++) {
+                char c = from.charAt(i);
+                char tc = cc.convert(c);
+                if (tc != c && sb == null) {
+                    sb = new StringBuilder(len);
+                    sb.append(from, 0, i);
+                }
+                if (sb != null) {
+                    sb.append(tc);
+                }
+            }
+            cs = values[ordinal] = sb == null ? from : sb.toString();
+        }
+        return cs;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        TagValue ov = (TagValue) o;
+        if (hash != ov.hash) return false;
+        CharSequence cst = values[source];
+        CharSequence cso = ov.values[ov.source];
+        int len = cst.length();
+        if (len != cso.length()) return false;
+        if (source == ov.source) {
+            for (int i = 0; i < len; i++) {
+                if (cst.charAt(i) != cso.charAt(i)) return false;
+            }
+        } else {
+            CharConverter cct = source == DD_SOURCE ? TagValue::identity : TagValue::convertW3CtoDD;
+            CharConverter cco = ov.source == DD_SOURCE ? TagValue::identity : TagValue::convertW3CtoDD;
+            for (int i = 0; i < len; i++) {
+                if (cct.convert(cst.charAt(i)) != cco.convert(cso.charAt(i))) return false;
+            }
         }
-        if (sb != null) {
-          sb.append(tc);
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return hash;
+    }
+
+    @Override
+    public String toString() {
+        return values[source].toString();
+    }
+
+    @Override
+    public int length() {
+        return values[source].length();
+    }
+
+    @Override
+    public char charAt(int index) {
+        if (source == DD_SOURCE) {
+            return values[source].charAt(index);
+        } else {
+            return convertW3CtoDD(values[source].charAt(index));
         }
-      }
-      cs = values[ordinal] = sb == null ? from : sb.toString();
-    }
-    return cs;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    TagValue ov = (TagValue) o;
-    if (hash != ov.hash) return false;
-    CharSequence cst = values[source];
-    CharSequence cso = ov.values[ov.source];
-    int len = cst.length();
-    if (len != cso.length()) return false;
-    if (source == ov.source) {
-      for (int i = 0; i < len; i++) {
-        if (cst.charAt(i) != cso.charAt(i)) return false;
-      }
-    } else {
-      CharConverter cct = source == DD_SOURCE ? TagValue::identity : TagValue::convertW3CtoDD;
-      CharConverter cco = ov.source == DD_SOURCE ? TagValue::identity : TagValue::convertW3CtoDD;
-      for (int i = 0; i < len; i++) {
-        if (cct.convert(cst.charAt(i)) != cco.convert(cso.charAt(i))) return false;
-      }
-    }
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return hash;
-  }
-
-  @Override
-  public String toString() {
-    return values[source].toString();
-  }
-
-  @Override
-  public int length() {
-    return values[source].length();
-  }
-
-  @Override
-  public char charAt(int index) {
-    if (source == DD_SOURCE) {
-      return values[source].charAt(index);
-    } else {
-      return convertW3CtoDD(values[source].charAt(index));
-    }
-  }
-
-  @Override
-  public CharSequence subSequence(int start, int end) {
-    return values[source].subSequence(start, end);
-  }
-
-  public int indexOf(char c) {
-    c = source == DD_SOURCE ? c : convertDDtoW3C(c);
-    CharSequence cs = values[source];
-    int len = cs.length();
-    int index = -1;
-    for (int i = 0; i < len; i++) {
-      if (cs.charAt(i) == c) {
-        index = i;
-      }
-    }
-    return index;
-  }
+    }
+
+    @Override
+    public CharSequence subSequence(int start, int end) {
+        return values[source].subSequence(start, end);
+    }
+
+    public int indexOf(char c) {
+        c = source == DD_SOURCE ? c : convertDDtoW3C(c);
+        CharSequence cs = values[source];
+        int len = cs.length();
+        int index = -1;
+        for (int i = 0; i < len; i++) {
+            if (cs.charAt(i) == c) {
+                index = i;
+            }
+        }
+        return index;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/W3CPTagsCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/W3CPTagsCodec.java
index b92124377f2..e9da396eaba 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/W3CPTagsCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/W3CPTagsCodec.java
@@ -19,1052 +19,1020 @@
 import org.slf4j.LoggerFactory;
 
 public class W3CPTagsCodec extends PTagsCodec {
-  private static final RatelimitedLogger log =
-      new RatelimitedLogger(LoggerFactory.getLogger(W3CPTagsCodec.class), 5, TimeUnit.MINUTES);
-
-  private static final int MAX_HEADER_SIZE = 256;
-  private static final String DATADOG_MEMBER_KEY = "dd=";
-  private static final String OTEL_MEMBER_KEY = "ot=";
-  private static final int EMPTY_SIZE = DATADOG_MEMBER_KEY.length(); // 3
-  private static final char MEMBER_SEPARATOR = ',';
-  private static final char ELEMENT_SEPARATOR = ';';
-  private static final char KEY_VALUE_SEPARATOR = ':';
-  private static final int MIN_ALLOWED_CHAR = 32;
-  private static final int MAX_ALLOWED_CHAR = 126;
-  @VisibleForTesting public static final int MAX_MEMBER_COUNT = 32;
-
-  @Override
-  PropagationTags fromHeaderValue(PTagsFactory tagsFactory, String value) {
-    if (value == null || value.isEmpty()) {
-      return tagsFactory.empty();
-    }
+    private static final RatelimitedLogger log =
+            new RatelimitedLogger(LoggerFactory.getLogger(W3CPTagsCodec.class), 5, TimeUnit.MINUTES);
+
+    private static final int MAX_HEADER_SIZE = 256;
+    private static final String DATADOG_MEMBER_KEY = "dd=";
+    private static final String OTEL_MEMBER_KEY = "ot=";
+    private static final int EMPTY_SIZE = DATADOG_MEMBER_KEY.length(); // 3
+    private static final char MEMBER_SEPARATOR = ',';
+    private static final char ELEMENT_SEPARATOR = ';';
+    private static final char KEY_VALUE_SEPARATOR = ':';
+    private static final int MIN_ALLOWED_CHAR = 32;
+    private static final int MAX_ALLOWED_CHAR = 126;
+
+    @VisibleForTesting
+    public static final int MAX_MEMBER_COUNT = 32;
 
-    int len = value.length();
-    // Skip over leading whitespace and empty member list elements
-    int firstMemberStart = findNextMember(value, 0);
-    if (firstMemberStart == len) {
-      return tagsFactory.empty();
-    }
+    @Override
+    PropagationTags fromHeaderValue(PTagsFactory tagsFactory, String value) {
+        if (value == null || value.isEmpty()) {
+            return tagsFactory.empty();
+        }
 
-    // Validate the whole tracestate and figure out where the dd member key and value are located
-    int memberStart = firstMemberStart;
-    int ddMemberStart = -1; // dd member start position (inclusive)
-    int ddMemberValueStart = -1; // dd member value start position (inclusive)
-    int ddMemberValueEnd = -1; // dd member value end position including OWS (exclusive)
-    int memberIndex = 0;
-    int ddMemberIndex = -1;
-    int otelMemberStart = -1;
-    int otelMemberValueStart = -1;
-    int otelMemberValueEnd = -1;
-    while (memberStart < len) {
-      if (memberIndex == MAX_MEMBER_COUNT) {
-        // TODO should we return one with an error?
-        // TODO should we try to pick up the `dd` member anyway?
-        return tagsFactory.empty();
-      }
-      // Validate the member key
-      int memberValueStart = validateMemberKey(value, memberStart);
-      if (memberValueStart < 0) {
-        // TODO should we return one with an error?
-        return tagsFactory.empty();
-      }
-      int memberValueEnd = validateMemberValue(value, memberValueStart);
-      if (memberValueEnd < 0) {
-        // TODO should we return one with an error?
-        return tagsFactory.empty();
-      }
-
-      boolean datadogMember =
-          ddMemberIndex == -1 && value.startsWith(DATADOG_MEMBER_KEY, memberStart);
-      boolean otelMember =
-          !datadogMember && otelMemberStart == -1 && value.startsWith(OTEL_MEMBER_KEY, memberStart);
-      if (datadogMember) {
-        ddMemberStart = memberStart;
-        ddMemberValueStart = memberValueStart;
-        ddMemberIndex = memberIndex;
-        ddMemberValueEnd = memberValueEnd;
-
-      } else if (otelMember) {
-        otelMemberStart = memberStart;
-        otelMemberValueStart = memberValueStart;
-        otelMemberValueEnd = memberValueEnd;
-      }
-
-      memberIndex++;
-      memberStart = findNextMember(value, memberValueEnd);
-      if (memberStart < 0) {
-        // TODO should we return one with an error?
-        return tagsFactory.empty();
-      }
-    }
+        int len = value.length();
+        // Skip over leading whitespace and empty member list elements
+        int firstMemberStart = findNextMember(value, 0);
+        if (firstMemberStart == len) {
+            return tagsFactory.empty();
+        }
 
-    OtelTraceState otelTraceState = null;
-    if (otelMemberStart != -1) {
-      int valueEnd = stripTrailingOWC(value, otelMemberValueStart, otelMemberValueEnd);
-      otelTraceState =
-          OtelTraceState.parse(
-              SubSequence.of(value, otelMemberValueStart, valueEnd),
-              memberContributionSize(value, firstMemberStart, otelMemberStart, otelMemberValueEnd));
-    }
+        // Validate the whole tracestate and figure out where the dd member key and value are located
+        int memberStart = firstMemberStart;
+        int ddMemberStart = -1; // dd member start position (inclusive)
+        int ddMemberValueStart = -1; // dd member value start position (inclusive)
+        int ddMemberValueEnd = -1; // dd member value end position including OWS (exclusive)
+        int memberIndex = 0;
+        int ddMemberIndex = -1;
+        int otelMemberStart = -1;
+        int otelMemberValueStart = -1;
+        int otelMemberValueEnd = -1;
+        while (memberStart < len) {
+            if (memberIndex == MAX_MEMBER_COUNT) {
+                // TODO should we return one with an error?
+                // TODO should we try to pick up the `dd` member anyway?
+                return tagsFactory.empty();
+            }
+            // Validate the member key
+            int memberValueStart = validateMemberKey(value, memberStart);
+            if (memberValueStart < 0) {
+                // TODO should we return one with an error?
+                return tagsFactory.empty();
+            }
+            int memberValueEnd = validateMemberValue(value, memberValueStart);
+            if (memberValueEnd < 0) {
+                // TODO should we return one with an error?
+                return tagsFactory.empty();
+            }
 
-    if (ddMemberIndex == -1) {
-      // There was no dd member, so create an empty one with the _suffix_
-      return empty(tagsFactory, value, otelTraceState);
-    }
+            boolean datadogMember = ddMemberIndex == -1 && value.startsWith(DATADOG_MEMBER_KEY, memberStart);
+            boolean otelMember =
+                    !datadogMember && otelMemberStart == -1 && value.startsWith(OTEL_MEMBER_KEY, memberStart);
+            if (datadogMember) {
+                ddMemberStart = memberStart;
+                ddMemberValueStart = memberValueStart;
+                ddMemberIndex = memberIndex;
+                ddMemberValueEnd = memberValueEnd;
+
+            } else if (otelMember) {
+                otelMemberStart = memberStart;
+                otelMemberValueStart = memberValueStart;
+                otelMemberValueEnd = memberValueEnd;
+            }
 
-    List<TagElement> tagPairs = null;
-    int tagPos = ddMemberValueStart;
-    int samplingPriority = PrioritySampling.UNSET;
-    CharSequence origin = null;
-    TagValue decisionMakerTagValue = null;
-    TagValue traceIdTagValue = null;
-    int traceSource = ProductTraceSource.UNSET;
-    int maxUnknownSize = 0;
-    CharSequence lastParentId = null;
-    TagValue orgPropagationMarkerTagValue = null;
-    while (tagPos < ddMemberValueEnd) {
-      tagPos = skipEmptyElements(value, tagPos, ddMemberValueEnd);
-      if (tagPos >= ddMemberValueEnd) {
-        break;
-      }
-      int tagKeyEndsAt =
-          validateCharsUntilSeparatorOrEnd(
-              value,
-              tagPos,
-              ddMemberValueEnd,
-              KEY_VALUE_SEPARATOR,
-              false,
-              W3CPTagsCodec::isAllowedKeyChar);
-      if (tagKeyEndsAt < 0 || tagKeyEndsAt >= ddMemberValueEnd) {
-        int nextTagPos = skipMalformedElement(value, tagPos, ddMemberValueEnd);
-        maxUnknownSize += (nextTagPos - tagPos); // still relay malformed elements
-        tagPos = nextTagPos;
-        continue;
-      }
-      int tagValuePos = tagKeyEndsAt + 1;
-      int tagValueEndsAt =
-          validateCharsUntilSeparatorOrEnd(
-              value,
-              tagValuePos,
-              ddMemberValueEnd,
-              ELEMENT_SEPARATOR,
-              true,
-              W3CPTagsCodec::isAllowedValueChar);
-      if (tagValueEndsAt < 0) {
-        int nextTagPos = skipMalformedElement(value, tagValuePos, ddMemberValueEnd);
-        maxUnknownSize += (nextTagPos - tagPos); // still relay malformed elements
-        tagPos = nextTagPos;
-        continue;
-      }
-      int nextTagPos = tagValueEndsAt + 1;
-      if (tagValueEndsAt == ddMemberValueEnd) {
-        tagValueEndsAt = stripTrailingOWC(value, tagValuePos, tagValueEndsAt);
-      }
-      int keyLength = tagKeyEndsAt - tagPos;
-      char c = value.charAt(tagPos);
-      if (keyLength == 1 && c == 's') {
-        samplingPriority = validateSamplingPriority(value, tagValuePos, tagValueEndsAt);
-      } else if (keyLength == 1 && c == 'o') {
-        origin = TagValue.from(Encoding.W3C, value, tagValuePos, tagValueEndsAt);
-      } else if (keyLength == 1 && c == 'p') {
-        lastParentId = TagValue.from(Encoding.W3C, value, tagValuePos, tagValueEndsAt);
-      } else {
-        TagKey tagKey = TagKey.from(Encoding.W3C, value, tagPos, tagKeyEndsAt);
-        if (tagKey != null) {
-          TagValue tagValue = TagValue.from(Encoding.W3C, value, tagValuePos, tagValueEndsAt);
-          if (!tagKey.equals(UPSTREAM_SERVICES_DEPRECATED_TAG)) {
-            if (!validateTagValue(tagKey, tagValue)) {
-              log.warn(
-                  "Invalid datadog tags header value: '{}' invalid tag value at {}",
-                  value,
-                  tagValuePos);
-              if (tagKey.equals(TRACE_ID_TAG)) {
-                return tagsFactory.createInvalid(PROPAGATION_ERROR_MALFORMED_TID + tagValue);
-              }
-              return empty(
-                  tagsFactory,
-                  value,
-                  firstMemberStart,
-                  ddMemberStart,
-                  ddMemberValueEnd,
-                  otelTraceState);
+            memberIndex++;
+            memberStart = findNextMember(value, memberValueEnd);
+            if (memberStart < 0) {
+                // TODO should we return one with an error?
+                return tagsFactory.empty();
             }
-            if (tagKey.equals(DECISION_MAKER_TAG)) {
-              decisionMakerTagValue = tagValue;
-            } else if (tagKey.equals(TRACE_ID_TAG)) {
-              traceIdTagValue = tagValue;
-            } else if (tagKey.equals(TRACE_SOURCE_TAG)) {
-              traceSource = ProductTraceSource.parseBitfieldHex(tagValue.toString());
-            } else if (tagKey.equals(ORG_PROPAGATION_MARKER_TAG)) {
-              orgPropagationMarkerTagValue = tagValue;
+        }
+
+        OtelTraceState otelTraceState = null;
+        if (otelMemberStart != -1) {
+            int valueEnd = stripTrailingOWC(value, otelMemberValueStart, otelMemberValueEnd);
+            otelTraceState = OtelTraceState.parse(
+                    SubSequence.of(value, otelMemberValueStart, valueEnd),
+                    memberContributionSize(value, firstMemberStart, otelMemberStart, otelMemberValueEnd));
+        }
+
+        if (ddMemberIndex == -1) {
+            // There was no dd member, so create an empty one with the _suffix_
+            return empty(tagsFactory, value, otelTraceState);
+        }
+
+        List<TagElement> tagPairs = null;
+        int tagPos = ddMemberValueStart;
+        int samplingPriority = PrioritySampling.UNSET;
+        CharSequence origin = null;
+        TagValue decisionMakerTagValue = null;
+        TagValue traceIdTagValue = null;
+        int traceSource = ProductTraceSource.UNSET;
+        int maxUnknownSize = 0;
+        CharSequence lastParentId = null;
+        TagValue orgPropagationMarkerTagValue = null;
+        while (tagPos < ddMemberValueEnd) {
+            tagPos = skipEmptyElements(value, tagPos, ddMemberValueEnd);
+            if (tagPos >= ddMemberValueEnd) {
+                break;
+            }
+            int tagKeyEndsAt = validateCharsUntilSeparatorOrEnd(
+                    value, tagPos, ddMemberValueEnd, KEY_VALUE_SEPARATOR, false, W3CPTagsCodec::isAllowedKeyChar);
+            if (tagKeyEndsAt < 0 || tagKeyEndsAt >= ddMemberValueEnd) {
+                int nextTagPos = skipMalformedElement(value, tagPos, ddMemberValueEnd);
+                maxUnknownSize += (nextTagPos - tagPos); // still relay malformed elements
+                tagPos = nextTagPos;
+                continue;
+            }
+            int tagValuePos = tagKeyEndsAt + 1;
+            int tagValueEndsAt = validateCharsUntilSeparatorOrEnd(
+                    value, tagValuePos, ddMemberValueEnd, ELEMENT_SEPARATOR, true, W3CPTagsCodec::isAllowedValueChar);
+            if (tagValueEndsAt < 0) {
+                int nextTagPos = skipMalformedElement(value, tagValuePos, ddMemberValueEnd);
+                maxUnknownSize += (nextTagPos - tagPos); // still relay malformed elements
+                tagPos = nextTagPos;
+                continue;
+            }
+            int nextTagPos = tagValueEndsAt + 1;
+            if (tagValueEndsAt == ddMemberValueEnd) {
+                tagValueEndsAt = stripTrailingOWC(value, tagValuePos, tagValueEndsAt);
+            }
+            int keyLength = tagKeyEndsAt - tagPos;
+            char c = value.charAt(tagPos);
+            if (keyLength == 1 && c == 's') {
+                samplingPriority = validateSamplingPriority(value, tagValuePos, tagValueEndsAt);
+            } else if (keyLength == 1 && c == 'o') {
+                origin = TagValue.from(Encoding.W3C, value, tagValuePos, tagValueEndsAt);
+            } else if (keyLength == 1 && c == 'p') {
+                lastParentId = TagValue.from(Encoding.W3C, value, tagValuePos, tagValueEndsAt);
             } else {
-              if (tagPairs == null) {
-                // This is roughly the size of a two element linked list but can hold six
-                tagPairs = new ArrayList<>(6);
-              }
-              tagPairs.add(tagKey);
-              tagPairs.add(tagValue);
+                TagKey tagKey = TagKey.from(Encoding.W3C, value, tagPos, tagKeyEndsAt);
+                if (tagKey != null) {
+                    TagValue tagValue = TagValue.from(Encoding.W3C, value, tagValuePos, tagValueEndsAt);
+                    if (!tagKey.equals(UPSTREAM_SERVICES_DEPRECATED_TAG)) {
+                        if (!validateTagValue(tagKey, tagValue)) {
+                            log.warn(
+                                    "Invalid datadog tags header value: '{}' invalid tag value at {}",
+                                    value,
+                                    tagValuePos);
+                            if (tagKey.equals(TRACE_ID_TAG)) {
+                                return tagsFactory.createInvalid(PROPAGATION_ERROR_MALFORMED_TID + tagValue);
+                            }
+                            return empty(
+                                    tagsFactory,
+                                    value,
+                                    firstMemberStart,
+                                    ddMemberStart,
+                                    ddMemberValueEnd,
+                                    otelTraceState);
+                        }
+                        if (tagKey.equals(DECISION_MAKER_TAG)) {
+                            decisionMakerTagValue = tagValue;
+                        } else if (tagKey.equals(TRACE_ID_TAG)) {
+                            traceIdTagValue = tagValue;
+                        } else if (tagKey.equals(TRACE_SOURCE_TAG)) {
+                            traceSource = ProductTraceSource.parseBitfieldHex(tagValue.toString());
+                        } else if (tagKey.equals(ORG_PROPAGATION_MARKER_TAG)) {
+                            orgPropagationMarkerTagValue = tagValue;
+                        } else {
+                            if (tagPairs == null) {
+                                // This is roughly the size of a two element linked list but can hold six
+                                tagPairs = new ArrayList<>(6);
+                            }
+                            tagPairs.add(tagKey);
+                            tagPairs.add(tagValue);
+                        }
+                    }
+                } else {
+                    // Not a propagating tag and not a known tag
+                    if (maxUnknownSize != 0) {
+                        maxUnknownSize++; // delimiter
+                    }
+                    maxUnknownSize += (tagValueEndsAt - tagPos);
+                }
             }
-          }
-        } else {
-          // Not a propagating tag and not a known tag
-          if (maxUnknownSize != 0) {
-            maxUnknownSize++; // delimiter
-          }
-          maxUnknownSize += (tagValueEndsAt - tagPos);
+            tagPos = nextTagPos;
         }
-      }
-      tagPos = nextTagPos;
+        return new W3CPTags(
+                tagsFactory,
+                tagPairs,
+                decisionMakerTagValue,
+                traceIdTagValue,
+                traceSource,
+                samplingPriority,
+                origin,
+                value,
+                firstMemberStart,
+                ddMemberStart,
+                ddMemberValueEnd,
+                maxUnknownSize,
+                lastParentId,
+                orgPropagationMarkerTagValue,
+                otelTraceState);
     }
-    return new W3CPTags(
-        tagsFactory,
-        tagPairs,
-        decisionMakerTagValue,
-        traceIdTagValue,
-        traceSource,
-        samplingPriority,
-        origin,
-        value,
-        firstMemberStart,
-        ddMemberStart,
-        ddMemberValueEnd,
-        maxUnknownSize,
-        lastParentId,
-        orgPropagationMarkerTagValue,
-        otelTraceState);
-  }
-
-  @Override
-  @SuppressWarnings("StringEquality")
-  @SuppressFBWarnings(
-      value = "ES_COMPARING_STRINGS_WITH_EQ",
-      justification =
-          "Identity determines whether the sampling state retains this PTags instance's raw "
-              + "tracestate, allowing its parsed size metadata to be reused.")
-  protected int estimateHeaderSize(
-      PTags pTags, CharSequence lastParentIdOverride, SamplingState samplingState) {
-    int size = EMPTY_SIZE + 1;
-    size += pTags.getXDatadogTagsSize(samplingState);
-    if (pTags.getOrigin() != null) {
-      size += pTags.getOrigin().length() + 3;
-    }
-    if (samplingState.getSamplingPriority() != PrioritySampling.UNSET) {
-      size += 5;
-    }
-    CharSequence lastParent =
-        lastParentIdOverride != null ? lastParentIdOverride : pTags.getLastParentId();
-    if (lastParent != null) {
-      size += lastParent.length() + 3;
-    }
-    String originalTracestate = samplingState.getTracestate();
-    boolean includesOriginalTracestate = false;
-    if (originalTracestate != null
-        && pTags instanceof W3CPTags
-        && originalTracestate == pTags.tracestate) {
-      W3CPTags w3CPTags = (W3CPTags) pTags;
-      size += w3CPTags.maxUnknownSize;
-      if (w3CPTags.ddMemberStart != -1) {
-        size += originalTracestate.length() - (w3CPTags.ddMemberValueEnd - w3CPTags.ddMemberStart);
-        includesOriginalTracestate = true;
-      }
-    } else if (originalTracestate != null) {
-      size += originalTracestate.length();
-      includesOriginalTracestate = true;
-    }
-    CharSequence otelTraceState = samplingState.getOtelTraceState();
-    if (otelTraceState != null) {
-      if (includesOriginalTracestate && otelTraceState instanceof OtelTraceState) {
-        size -= ((OtelTraceState) otelTraceState).getOriginalSize();
-      }
-      size += OTEL_MEMBER_KEY.length() + otelTraceState.length() + 1;
-    }
-    return Math.min(size, MAX_HEADER_SIZE);
-  }
-
-  @Override
-  protected int appendPrefix(
-      StringBuilder sb,
-      PTags ptags,
-      CharSequence lastParentIdOverride,
-      SamplingState samplingState) {
-    sb.append(DATADOG_MEMBER_KEY);
-    // Append sampling priority (s)
-    if (samplingState.getSamplingPriority() != PrioritySampling.UNSET) {
-      sb.append("s:");
-      sb.append(samplingState.getSamplingPriority());
-    }
-    // Append origin (o)
-    CharSequence origin = ptags.getOrigin();
-    if (origin != null) {
-      if (sb.length() > EMPTY_SIZE) {
-        sb.append(';');
-      }
-      sb.append("o:");
-      if (origin instanceof TagValue) {
-        sb.append(((TagValue) origin).forType(Encoding.W3C));
-      } else {
-        sb.append(origin);
-      }
-    }
-    // append last ParentId (p)
-    CharSequence lastParent =
-        lastParentIdOverride != null ? lastParentIdOverride : ptags.getLastParentId();
-    if (lastParent != null) {
-      if (sb.length() > EMPTY_SIZE) {
-        sb.append(';');
-      }
-      sb.append("p:");
-      if (lastParent instanceof TagValue) {
-        sb.append(((TagValue) lastParent).forType(Encoding.W3C));
-      } else {
-        sb.append(lastParent);
-      }
-    }
-    return sb.length();
-  }
-
-  @Override
-  protected int appendTag(StringBuilder sb, TagElement key, TagElement value, int size) {
-    return appendTag(sb, key, value, Encoding.W3C, size);
-  }
-
-  @Override
-  protected int appendSuffix(StringBuilder sb, PTags ptags, int size, SamplingState samplingState) {
-    // If there is room for appending unknown from W3CPTags
-    if (size < MAX_HEADER_SIZE && ptags instanceof W3CPTags) {
-      W3CPTags w3cPTags = (W3CPTags) ptags;
-      size = cleanUpAndAppendUnknown(sb, w3cPTags, size);
-    }
-    // Check empty Datadog list-member only tracestate
-    if (size == EMPTY_SIZE) {
-      // If we haven't written anything but the 'dd=', then reset the StringBuilder
-      sb.setLength(0);
-      size = 0;
-    }
-    if (size == 0) {
-      String original = samplingState.getTracestate();
-      String trimmed = original == null ? null : original.trim();
-      if (canForwardRawTracestate(trimmed, samplingState.getOtelTraceState())) {
-        sb.append(trimmed);
-        return EMPTY_SIZE + 1;
-      }
-    }
-    // Append the managed OTel member and all other non-Datadog list-members
-    if (appendOtelAndVendorMembers(sb, samplingState, size != 0)) {
-      // We don't care about the total size in bytes here, but only the fact that we added something
-      // that should be returned
-      size = Math.max(size, EMPTY_SIZE + 1);
-    }
-    return size;
-  }
 
-  private static boolean canForwardRawTracestate(String trimmed, CharSequence otelTraceState) {
-    if (trimmed == null || trimmed.isEmpty()) {
-      return false;
-    }
-    if (findNextMember(trimmed, 0) != 0) {
-      return false;
-    }
-    int otelMemberCount = 0;
-    int memberStart = 0;
-    while (memberStart < trimmed.length()) {
-      int memberEnd = trimmed.indexOf(MEMBER_SEPARATOR, memberStart);
-      if (memberEnd < 0) {
-        memberEnd = trimmed.length();
-      }
-      if (trimmed.startsWith(DATADOG_MEMBER_KEY, memberStart)) {
-        return false;
-      }
-      if (trimmed.startsWith(OTEL_MEMBER_KEY, memberStart)) {
-        if (++otelMemberCount > 1 || otelTraceState == null) {
-          return false;
+    @Override
+    @SuppressWarnings("StringEquality")
+    @SuppressFBWarnings(
+            value = "ES_COMPARING_STRINGS_WITH_EQ",
+            justification = "Identity determines whether the sampling state retains this PTags instance's raw "
+                    + "tracestate, allowing its parsed size metadata to be reused.")
+    protected int estimateHeaderSize(PTags pTags, CharSequence lastParentIdOverride, SamplingState samplingState) {
+        int size = EMPTY_SIZE + 1;
+        size += pTags.getXDatadogTagsSize(samplingState);
+        if (pTags.getOrigin() != null) {
+            size += pTags.getOrigin().length() + 3;
         }
-        int valueStart = memberStart + OTEL_MEMBER_KEY.length();
-        int valueEnd = stripTrailingOWC(trimmed, valueStart, memberEnd);
-        if (!contentEquals(trimmed, valueStart, valueEnd, otelTraceState)) {
-          return false;
+        if (samplingState.getSamplingPriority() != PrioritySampling.UNSET) {
+            size += 5;
         }
-      }
-      memberStart = findNextMember(trimmed, memberEnd + 1);
-    }
-    return (otelTraceState == null) == (otelMemberCount == 0);
-  }
-
-  private static boolean contentEquals(String value, int start, int end, CharSequence expected) {
-    if (expected instanceof OtelTraceState) {
-      expected = ((OtelTraceState) expected).comparisonValue();
-    }
-    int length = expected.length();
-    if (end - start != length) {
-      return false;
-    }
-    for (int i = 0; i < length; i++) {
-      if (value.charAt(start + i) != expected.charAt(i)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  @Override
-  protected boolean isTooLarge(StringBuilder sb, int size) {
-    return size > MAX_HEADER_SIZE;
-  }
-
-  @Override
-  protected boolean isEmpty(StringBuilder sb, int size) {
-    return size <= EMPTY_SIZE;
-  }
-
-  private int appendTag(
-      StringBuilder sb, TagElement key, TagElement value, Encoding encoding, int size) {
-    if (size >= MAX_HEADER_SIZE) {
-      return size;
-    }
-    int validSize = size;
-    if (size > EMPTY_SIZE) {
-      sb.append(ELEMENT_SEPARATOR);
-      size++;
-    }
-    CharSequence s = key.forType(encoding);
-    sb.append(s);
-    size += s.length();
-    sb.append(KEY_VALUE_SEPARATOR);
-    size++;
-    s = value.forType(encoding);
-    sb.append(s);
-    size += s.length();
-    if (size > MAX_HEADER_SIZE) {
-      sb.setLength(validSize);
-      size = validSize;
+        CharSequence lastParent = lastParentIdOverride != null ? lastParentIdOverride : pTags.getLastParentId();
+        if (lastParent != null) {
+            size += lastParent.length() + 3;
+        }
+        String originalTracestate = samplingState.getTracestate();
+        boolean includesOriginalTracestate = false;
+        if (originalTracestate != null && pTags instanceof W3CPTags && originalTracestate == pTags.tracestate) {
+            W3CPTags w3CPTags = (W3CPTags) pTags;
+            size += w3CPTags.maxUnknownSize;
+            if (w3CPTags.ddMemberStart != -1) {
+                size += originalTracestate.length() - (w3CPTags.ddMemberValueEnd - w3CPTags.ddMemberStart);
+                includesOriginalTracestate = true;
+            }
+        } else if (originalTracestate != null) {
+            size += originalTracestate.length();
+            includesOriginalTracestate = true;
+        }
+        CharSequence otelTraceState = samplingState.getOtelTraceState();
+        if (otelTraceState != null) {
+            if (includesOriginalTracestate && otelTraceState instanceof OtelTraceState) {
+                size -= ((OtelTraceState) otelTraceState).getOriginalSize();
+            }
+            size += OTEL_MEMBER_KEY.length() + otelTraceState.length() + 1;
+        }
+        return Math.min(size, MAX_HEADER_SIZE);
     }
-    return size;
-  }
 
-  private static int validateCharsUntilSeparatorOrEnd(
-      String s, int start, int end, char separator, boolean allowOWC, IntPredicate isValid) {
-    if (start >= end) {
-      return -1;
-    }
-    int pos = start;
-    char c = s.charAt(pos);
-    boolean definitelyOWC = false;
-    do {
-      if (allowOWC && isOWC(c)) {
-        if (c == '\t') {
-          definitelyOWC = true;
+    @Override
+    protected int appendPrefix(
+            StringBuilder sb, PTags ptags, CharSequence lastParentIdOverride, SamplingState samplingState) {
+        sb.append(DATADOG_MEMBER_KEY);
+        // Append sampling priority (s)
+        if (samplingState.getSamplingPriority() != PrioritySampling.UNSET) {
+            sb.append("s:");
+            sb.append(samplingState.getSamplingPriority());
         }
-      } else {
-        if (definitelyOWC || !isValid.test(c) || c == separator) {
-          return -1;
+        // Append origin (o)
+        CharSequence origin = ptags.getOrigin();
+        if (origin != null) {
+            if (sb.length() > EMPTY_SIZE) {
+                sb.append(';');
+            }
+            sb.append("o:");
+            if (origin instanceof TagValue) {
+                sb.append(((TagValue) origin).forType(Encoding.W3C));
+            } else {
+                sb.append(origin);
+            }
         }
-      }
-      pos++;
-      if (pos < end) {
-        c = s.charAt(pos);
-        if (c == separator) {
-          break; // trailing separator allowed; caller resumes parsing from here
+        // append last ParentId (p)
+        CharSequence lastParent = lastParentIdOverride != null ? lastParentIdOverride : ptags.getLastParentId();
+        if (lastParent != null) {
+            if (sb.length() > EMPTY_SIZE) {
+                sb.append(';');
+            }
+            sb.append("p:");
+            if (lastParent instanceof TagValue) {
+                sb.append(((TagValue) lastParent).forType(Encoding.W3C));
+            } else {
+                sb.append(lastParent);
+            }
         }
-      }
-    } while (pos < end);
-
-    return pos;
-  }
-
-  private static boolean isAllowedKeyChar(int c) {
-    // We already know that the segments have been validated against the valid chars for
-    // the general tracestate header
-    return c > MIN_ALLOWED_CHAR
-        && c <= MAX_ALLOWED_CHAR
-        && c != KEY_VALUE_SEPARATOR
-        && c != ELEMENT_SEPARATOR;
-  }
-
-  private static boolean isAllowedValueChar(int c) {
-    // We already know that the segments have been validated against the valid chars for
-    // the general tracestate header
-    return c >= MIN_ALLOWED_CHAR && c <= MAX_ALLOWED_CHAR;
-  }
-
-  private static int validateSamplingPriority(String original, int start, int end) {
-    try {
-      return parseIntDecimal(original, start, end);
-    } catch (Exception ignored) {
-      return PrioritySampling.UNSET;
+        return sb.length();
     }
-  }
 
-  // Integer.parseInt(s, start, end, radix) is only available from Java9+, so do it by hand
-  private static int parseIntDecimal(String original, int start, int end)
-      throws NumberFormatException {
-    if (start < 0 || start > end || end > original.length()) {
-      throw new IndexOutOfBoundsException();
+    @Override
+    protected int appendTag(StringBuilder sb, TagElement key, TagElement value, int size) {
+        return appendTag(sb, key, value, Encoding.W3C, size);
     }
 
-    boolean negative = false;
-    int i = start;
-    int limit = -Integer.MAX_VALUE;
-
-    if (i < end) {
-      int firstChar = original.charAt(i);
-      if (firstChar < '0') {
-        if (firstChar == '-') {
-          negative = true;
-          limit = Integer.MIN_VALUE;
-        } else if (firstChar != '+') {
-          throw new NumberFormatException(original);
+    @Override
+    protected int appendSuffix(StringBuilder sb, PTags ptags, int size, SamplingState samplingState) {
+        // If there is room for appending unknown from W3CPTags
+        if (size < MAX_HEADER_SIZE && ptags instanceof W3CPTags) {
+            W3CPTags w3cPTags = (W3CPTags) ptags;
+            size = cleanUpAndAppendUnknown(sb, w3cPTags, size);
         }
-        i++;
-        if (i == end) {
-          // There needs to be something after the +/-
-          throw new NumberFormatException(original);
+        // Check empty Datadog list-member only tracestate
+        if (size == EMPTY_SIZE) {
+            // If we haven't written anything but the 'dd=', then reset the StringBuilder
+            sb.setLength(0);
+            size = 0;
         }
-      }
-      int multmin = limit / 10;
-      int result = 0;
-      while (i < end) {
-        // Accumulating negatively avoids surprises near MAX_VALUE
-        int digit = original.charAt(i) - '0';
-        if (digit < 0 || digit > 9 || result < multmin) {
-          throw new NumberFormatException(original);
+        if (size == 0) {
+            String original = samplingState.getTracestate();
+            String trimmed = original == null ? null : original.trim();
+            if (canForwardRawTracestate(trimmed, samplingState.getOtelTraceState())) {
+                sb.append(trimmed);
+                return EMPTY_SIZE + 1;
+            }
         }
-        result *= 10;
-        if (result < limit + digit) {
-          throw new NumberFormatException(original);
+        // Append the managed OTel member and all other non-Datadog list-members
+        if (appendOtelAndVendorMembers(sb, samplingState, size != 0)) {
+            // We don't care about the total size in bytes here, but only the fact that we added something
+            // that should be returned
+            size = Math.max(size, EMPTY_SIZE + 1);
         }
-        i++;
-        result -= digit;
-      }
-      return negative ? result : -result;
-    } else {
-      throw new NumberFormatException("");
+        return size;
     }
-  }
 
-  // This is The Fine Specification for the member key https://www.w3.org/TR/trace-context/#key
-  private static int validateMemberKey(String original, int start) {
-    int end = original.length();
-    if (start < 0 || start >= end) {
-      return -1;
-    }
-    boolean multi = false;
-    int length = 1;
-    int pos = start;
-    for (; pos < end; pos++, length++) {
-      if (length > 242) {
-        if (multi) {
-          // We're beyond the length of the allowed tenant id and @ delimiter
-          return -1;
-        } else if (length > 257) {
-          // We're beyond the length of the allowed simple key and = delimiter
-          return -1;
+    private static boolean canForwardRawTracestate(String trimmed, CharSequence otelTraceState) {
+        if (trimmed == null || trimmed.isEmpty()) {
+            return false;
         }
-      }
-      char c = original.charAt(pos);
-      if (isLcAlpha(c)) {
-        continue;
-      }
-      if (isDigit(c)) {
-        if (length == 1) {
-          multi = true;
+        if (findNextMember(trimmed, 0) != 0) {
+            return false;
         }
-        continue;
-      }
-      if (length == 1) {
-        // The member key can only start with lower case alpha or a number
-        return -1;
-      }
-      if (isValidExtra(c)) {
-        continue;
-      }
-      if (c == '=') {
-        if (multi) {
-          // If the member key started with a number then it's a multi tenant key and must have an @
-          return -1;
-        } else {
-          pos++;
-          break;
-        }
-      }
-      if (c == '@') {
-        if (length > 242) {
-          // We're beyond the length of the allowed tenant id and @ delimiter
-          return -1;
+        int otelMemberCount = 0;
+        int memberStart = 0;
+        while (memberStart < trimmed.length()) {
+            int memberEnd = trimmed.indexOf(MEMBER_SEPARATOR, memberStart);
+            if (memberEnd < 0) {
+                memberEnd = trimmed.length();
+            }
+            if (trimmed.startsWith(DATADOG_MEMBER_KEY, memberStart)) {
+                return false;
+            }
+            if (trimmed.startsWith(OTEL_MEMBER_KEY, memberStart)) {
+                if (++otelMemberCount > 1 || otelTraceState == null) {
+                    return false;
+                }
+                int valueStart = memberStart + OTEL_MEMBER_KEY.length();
+                int valueEnd = stripTrailingOWC(trimmed, valueStart, memberEnd);
+                if (!contentEquals(trimmed, valueStart, valueEnd, otelTraceState)) {
+                    return false;
+                }
+            }
+            memberStart = findNextMember(trimmed, memberEnd + 1);
         }
-        multi = true;
-        pos++;
-        break;
-      }
-      return -1;
+        return (otelTraceState == null) == (otelMemberCount == 0);
     }
 
-    if (multi) {
-      // Validate the multi tenant system id part
-      length = 1;
-      for (; pos < end; pos++, length++) {
-        if (length > 15) {
-          // We're beyond the length of the allowed system id and = delimiter
-          return -1;
+    private static boolean contentEquals(String value, int start, int end, CharSequence expected) {
+        if (expected instanceof OtelTraceState) {
+            expected = ((OtelTraceState) expected).comparisonValue();
         }
-        char c = original.charAt(pos);
-        if (isLcAlpha(c)) {
-          continue;
+        int length = expected.length();
+        if (end - start != length) {
+            return false;
         }
-        if (length == 1) {
-          // The system id can only start with lower case alpha
-          return -1;
-        }
-        if (isDigit(c) || isValidExtra(c)) {
-          continue;
-        }
-        if (c == '=') {
-          pos++;
-          break;
+        for (int i = 0; i < length; i++) {
+            if (value.charAt(start + i) != expected.charAt(i)) {
+                return false;
+            }
         }
-      }
+        return true;
     }
 
-    if (pos >= end) {
-      // There needs to be something after the equals sign
-      return -1;
+    @Override
+    protected boolean isTooLarge(StringBuilder sb, int size) {
+        return size > MAX_HEADER_SIZE;
     }
 
-    return pos;
-  }
-
-  // This is The Fine Specification for the member value https://www.w3.org/TR/trace-context/#value
-  // Please note the wonderful decision to allow ' ' in the value but not let it end with ' ', since
-  // that is indistinguishable from optional whitespace at the end
-  private static int validateMemberValue(String original, int start) {
-    int end = original.length();
-    if (start < 0 || start >= end) {
-      return -1;
-    }
-    int length = 1;
-    int nonOWSLength = 0;
-    int pos = start;
-    boolean inWhiteSpace = false;
-    boolean onlyWhiteSpace = true;
-    boolean moreNonWSAllowed = true;
-    for (; pos < end; pos++, length++) {
-      if (!inWhiteSpace) {
-        nonOWSLength = length - 1;
-      }
-      if (nonOWSLength > 256) {
-        // We're beyond the length of the allowed member value and ',' delimiter
-        return -1;
-      }
-      char c = original.charAt(pos);
-      if (c == ' ') {
-        inWhiteSpace = true;
-        continue;
-      }
-      if (c == '\t') {
-        inWhiteSpace = true;
-        // If we encounter a `\t` then we can't have more normal characters after
-        moreNonWSAllowed = false;
-        continue;
-      }
-      if (c == ',') {
-        break;
-      }
-      if (!moreNonWSAllowed) {
-        return -1;
-      }
-      inWhiteSpace = false;
-      if (isValidMemberValueChar(c)) {
-        onlyWhiteSpace = false;
-        continue;
-      }
-      return -1;
+    @Override
+    protected boolean isEmpty(StringBuilder sb, int size) {
+        return size <= EMPTY_SIZE;
     }
-    if (onlyWhiteSpace) {
-      return -1;
+
+    private int appendTag(StringBuilder sb, TagElement key, TagElement value, Encoding encoding, int size) {
+        if (size >= MAX_HEADER_SIZE) {
+            return size;
+        }
+        int validSize = size;
+        if (size > EMPTY_SIZE) {
+            sb.append(ELEMENT_SEPARATOR);
+            size++;
+        }
+        CharSequence s = key.forType(encoding);
+        sb.append(s);
+        size += s.length();
+        sb.append(KEY_VALUE_SEPARATOR);
+        size++;
+        s = value.forType(encoding);
+        sb.append(s);
+        size += s.length();
+        if (size > MAX_HEADER_SIZE) {
+            sb.setLength(validSize);
+            size = validSize;
+        }
+        return size;
     }
-    if (!inWhiteSpace && length > 257) {
-      // We're beyond the length of the allowed member value and ',' delimiter
-      return -1;
+
+    private static int validateCharsUntilSeparatorOrEnd(
+            String s, int start, int end, char separator, boolean allowOWC, IntPredicate isValid) {
+        if (start >= end) {
+            return -1;
+        }
+        int pos = start;
+        char c = s.charAt(pos);
+        boolean definitelyOWC = false;
+        do {
+            if (allowOWC && isOWC(c)) {
+                if (c == '\t') {
+                    definitelyOWC = true;
+                }
+            } else {
+                if (definitelyOWC || !isValid.test(c) || c == separator) {
+                    return -1;
+                }
+            }
+            pos++;
+            if (pos < end) {
+                c = s.charAt(pos);
+                if (c == separator) {
+                    break; // trailing separator allowed; caller resumes parsing from here
+                }
+            }
+        } while (pos < end);
+
+        return pos;
     }
 
-    return pos;
-  }
+    private static boolean isAllowedKeyChar(int c) {
+        // We already know that the segments have been validated against the valid chars for
+        // the general tracestate header
+        return c > MIN_ALLOWED_CHAR && c <= MAX_ALLOWED_CHAR && c != KEY_VALUE_SEPARATOR && c != ELEMENT_SEPARATOR;
+    }
 
-  private static int findNextMember(String original, int start) {
-    int len = original.length();
-    if (start < 0) {
-      return -1;
+    private static boolean isAllowedValueChar(int c) {
+        // We already know that the segments have been validated against the valid chars for
+        // the general tracestate header
+        return c >= MIN_ALLOWED_CHAR && c <= MAX_ALLOWED_CHAR;
     }
-    if (start >= len) {
-      return len;
+
+    private static int validateSamplingPriority(String original, int start, int end) {
+        try {
+            return parseIntDecimal(original, start, end);
+        } catch (Exception ignored) {
+            return PrioritySampling.UNSET;
+        }
     }
 
-    int pos = start;
-    for (; pos < len; pos++) {
-      char c = original.charAt(pos);
-      if (isOWC(c) || c == ',') {
-        continue;
-      }
-      break;
+    // Integer.parseInt(s, start, end, radix) is only available from Java9+, so do it by hand
+    private static int parseIntDecimal(String original, int start, int end) throws NumberFormatException {
+        if (start < 0 || start > end || end > original.length()) {
+            throw new IndexOutOfBoundsException();
+        }
+
+        boolean negative = false;
+        int i = start;
+        int limit = -Integer.MAX_VALUE;
+
+        if (i < end) {
+            int firstChar = original.charAt(i);
+            if (firstChar < '0') {
+                if (firstChar == '-') {
+                    negative = true;
+                    limit = Integer.MIN_VALUE;
+                } else if (firstChar != '+') {
+                    throw new NumberFormatException(original);
+                }
+                i++;
+                if (i == end) {
+                    // There needs to be something after the +/-
+                    throw new NumberFormatException(original);
+                }
+            }
+            int multmin = limit / 10;
+            int result = 0;
+            while (i < end) {
+                // Accumulating negatively avoids surprises near MAX_VALUE
+                int digit = original.charAt(i) - '0';
+                if (digit < 0 || digit > 9 || result < multmin) {
+                    throw new NumberFormatException(original);
+                }
+                result *= 10;
+                if (result < limit + digit) {
+                    throw new NumberFormatException(original);
+                }
+                i++;
+                result -= digit;
+            }
+            return negative ? result : -result;
+        } else {
+            throw new NumberFormatException("");
+        }
     }
-    return pos;
-  }
 
-  private static boolean isLcAlpha(char c) {
-    return c >= 'a' && c <= 'z';
-  }
+    // This is The Fine Specification for the member key https://www.w3.org/TR/trace-context/#key
+    private static int validateMemberKey(String original, int start) {
+        int end = original.length();
+        if (start < 0 || start >= end) {
+            return -1;
+        }
+        boolean multi = false;
+        int length = 1;
+        int pos = start;
+        for (; pos < end; pos++, length++) {
+            if (length > 242) {
+                if (multi) {
+                    // We're beyond the length of the allowed tenant id and @ delimiter
+                    return -1;
+                } else if (length > 257) {
+                    // We're beyond the length of the allowed simple key and = delimiter
+                    return -1;
+                }
+            }
+            char c = original.charAt(pos);
+            if (isLcAlpha(c)) {
+                continue;
+            }
+            if (isDigit(c)) {
+                if (length == 1) {
+                    multi = true;
+                }
+                continue;
+            }
+            if (length == 1) {
+                // The member key can only start with lower case alpha or a number
+                return -1;
+            }
+            if (isValidExtra(c)) {
+                continue;
+            }
+            if (c == '=') {
+                if (multi) {
+                    // If the member key started with a number then it's a multi tenant key and must have an @
+                    return -1;
+                } else {
+                    pos++;
+                    break;
+                }
+            }
+            if (c == '@') {
+                if (length > 242) {
+                    // We're beyond the length of the allowed tenant id and @ delimiter
+                    return -1;
+                }
+                multi = true;
+                pos++;
+                break;
+            }
+            return -1;
+        }
 
-  private static boolean isValidExtra(char c) {
-    return c == '_' || c == '-' || c == '*' || c == '/';
-  }
+        if (multi) {
+            // Validate the multi tenant system id part
+            length = 1;
+            for (; pos < end; pos++, length++) {
+                if (length > 15) {
+                    // We're beyond the length of the allowed system id and = delimiter
+                    return -1;
+                }
+                char c = original.charAt(pos);
+                if (isLcAlpha(c)) {
+                    continue;
+                }
+                if (length == 1) {
+                    // The system id can only start with lower case alpha
+                    return -1;
+                }
+                if (isDigit(c) || isValidExtra(c)) {
+                    continue;
+                }
+                if (c == '=') {
+                    pos++;
+                    break;
+                }
+            }
+        }
 
-  private static boolean isValidMemberValueChar(char c) {
-    return c >= ' ' && c <= '~' && c != ',' && c != '=';
-  }
+        if (pos >= end) {
+            // There needs to be something after the equals sign
+            return -1;
+        }
 
-  private static boolean isOWC(char c) {
-    return c == ' ' || c == '\t';
-  }
+        return pos;
+    }
 
-  private static int stripTrailingOWC(String value, int start, int end) {
-    while (end > start + 1 && isOWC(value.charAt(end - 1))) {
-      end--;
+    // This is The Fine Specification for the member value https://www.w3.org/TR/trace-context/#value
+    // Please note the wonderful decision to allow ' ' in the value but not let it end with ' ', since
+    // that is indistinguishable from optional whitespace at the end
+    private static int validateMemberValue(String original, int start) {
+        int end = original.length();
+        if (start < 0 || start >= end) {
+            return -1;
+        }
+        int length = 1;
+        int nonOWSLength = 0;
+        int pos = start;
+        boolean inWhiteSpace = false;
+        boolean onlyWhiteSpace = true;
+        boolean moreNonWSAllowed = true;
+        for (; pos < end; pos++, length++) {
+            if (!inWhiteSpace) {
+                nonOWSLength = length - 1;
+            }
+            if (nonOWSLength > 256) {
+                // We're beyond the length of the allowed member value and ',' delimiter
+                return -1;
+            }
+            char c = original.charAt(pos);
+            if (c == ' ') {
+                inWhiteSpace = true;
+                continue;
+            }
+            if (c == '\t') {
+                inWhiteSpace = true;
+                // If we encounter a `\t` then we can't have more normal characters after
+                moreNonWSAllowed = false;
+                continue;
+            }
+            if (c == ',') {
+                break;
+            }
+            if (!moreNonWSAllowed) {
+                return -1;
+            }
+            inWhiteSpace = false;
+            if (isValidMemberValueChar(c)) {
+                onlyWhiteSpace = false;
+                continue;
+            }
+            return -1;
+        }
+        if (onlyWhiteSpace) {
+            return -1;
+        }
+        if (!inWhiteSpace && length > 257) {
+            // We're beyond the length of the allowed member value and ',' delimiter
+            return -1;
+        }
+
+        return pos;
     }
-    return end;
-  }
-
-  private static int skipMalformedElement(String value, int start, int end) {
-    log.warn(
-        "Invalid datadog tags header value: '{}' dropping malformed element at {}", value, start);
-    int pos = start;
-    while (pos < end) {
-      char c = value.charAt(pos++);
-      if (c == ELEMENT_SEPARATOR) {
+
+    private static int findNextMember(String original, int start) {
+        int len = original.length();
+        if (start < 0) {
+            return -1;
+        }
+        if (start >= len) {
+            return len;
+        }
+
+        int pos = start;
+        for (; pos < len; pos++) {
+            char c = original.charAt(pos);
+            if (isOWC(c) || c == ',') {
+                continue;
+            }
+            break;
+        }
         return pos;
-      }
     }
-    return end;
-  }
-
-  private static int skipEmptyElements(String value, int start, int end) {
-    int pos = start;
-    while (pos < end) {
-      char c = value.charAt(pos++);
-      if (c == ELEMENT_SEPARATOR) {
-        start = pos;
-      } else if (!isOWC(c)) {
-        return start;
-      }
+
+    private static boolean isLcAlpha(char c) {
+        return c >= 'a' && c <= 'z';
     }
-    return end;
-  }
-
-  private static int cleanUpAndAppendUnknown(StringBuilder sb, W3CPTags w3CPTags, int size) {
-    if (w3CPTags.maxUnknownSize == 0
-        || w3CPTags.ddMemberStart == -1
-        || w3CPTags.ddMemberStart >= w3CPTags.ddMemberValueEnd) {
-      return size;
+
+    private static boolean isValidExtra(char c) {
+        return c == '_' || c == '-' || c == '*' || c == '/';
     }
-    String original = w3CPTags.tracestate;
-    int elementStart = w3CPTags.ddMemberStart + EMPTY_SIZE; // skip over 'dd='
-    int okSize = size;
-    while (elementStart < w3CPTags.ddMemberValueEnd && size < MAX_HEADER_SIZE) {
-      elementStart = skipEmptyElements(original, elementStart, w3CPTags.ddMemberValueEnd);
-      if (elementStart == w3CPTags.ddMemberValueEnd) {
-        break;
-      }
-      okSize = size;
-      int elementEnd = original.indexOf(ELEMENT_SEPARATOR, elementStart);
-      if (elementEnd < 0 || elementEnd > w3CPTags.ddMemberValueEnd) {
-        elementEnd = w3CPTags.ddMemberValueEnd;
-      }
-      if (!original.startsWith(Encoding.W3C.getPrefix(), elementStart)) {
-        char first = original.charAt(elementStart);
-        // ignore known o:, s:, and p: elements because we always add them back in appendPrefix
-        if ((first != 'o' && first != 's' && first != 'p')
-            || elementStart + 1 >= elementEnd
-            || original.charAt(elementStart + 1) != KEY_VALUE_SEPARATOR) {
-          if (sb.length() > EMPTY_SIZE) {
-            sb.append(ELEMENT_SEPARATOR);
-            size++;
-          }
-          int end = elementEnd;
-          if (end == w3CPTags.ddMemberValueEnd) {
-            end = stripTrailingOWC(original, elementStart, end);
-          }
-          sb.append(original, elementStart, end);
-          size += (end - elementStart);
-        }
-      }
-      elementStart = elementEnd + 1;
+
+    private static boolean isValidMemberValueChar(char c) {
+        return c >= ' ' && c <= '~' && c != ',' && c != '=';
     }
-    if (size > MAX_HEADER_SIZE) {
-      sb.setLength(okSize);
-      size = okSize;
+
+    private static boolean isOWC(char c) {
+        return c == ' ' || c == '\t';
     }
-    return size;
-  }
-
-  private static boolean appendOtelAndVendorMembers(
-      StringBuilder sb, SamplingState samplingState, boolean hasDatadogMember) {
-    String original = samplingState.getTracestate();
-    CharSequence otelTraceState = samplingState.getOtelTraceState();
-    int remainingMembers = MAX_MEMBER_COUNT - (hasDatadogMember ? 1 : 0);
-    boolean memberAppended = false;
-    boolean preserveOtelPosition = samplingState.preservesInheritedOtelPosition();
-    if (!preserveOtelPosition && otelTraceState != null && remainingMembers > 0) {
-      appendMember(sb, OTEL_MEMBER_KEY, otelTraceState.toString());
-      remainingMembers--;
-      memberAppended = true;
+
+    private static int stripTrailingOWC(String value, int start, int end) {
+        while (end > start + 1 && isOWC(value.charAt(end - 1))) {
+            end--;
+        }
+        return end;
     }
-    int len = original == null ? 0 : original.length();
-    int memberStart = original == null ? 0 : findNextMember(original, 0);
-    while (memberStart < len && remainingMembers > 0) {
-      int memberEnd = original.indexOf(MEMBER_SEPARATOR, memberStart);
-      if (memberEnd < 0) {
-        memberEnd = len;
-      }
-      boolean datadogMember = original.startsWith(DATADOG_MEMBER_KEY, memberStart);
-      boolean otelMember = original.startsWith(OTEL_MEMBER_KEY, memberStart);
-      if (!datadogMember && (!otelMember || preserveOtelPosition)) {
-        int end = stripTrailingOWC(original, memberStart, memberEnd);
-        appendMember(sb, original, memberStart, end);
-        remainingMembers--;
-        memberAppended = true;
-      }
-      memberStart = findNextMember(original, memberEnd + 1);
+
+    private static int skipMalformedElement(String value, int start, int end) {
+        log.warn("Invalid datadog tags header value: '{}' dropping malformed element at {}", value, start);
+        int pos = start;
+        while (pos < end) {
+            char c = value.charAt(pos++);
+            if (c == ELEMENT_SEPARATOR) {
+                return pos;
+            }
+        }
+        return end;
     }
-    return memberAppended;
-  }
 
-  public static boolean isUnchangedInheritedOtelMember(
-      String original, CharSequence otelTraceState) {
-    if (original == null || otelTraceState == null) {
-      return false;
+    private static int skipEmptyElements(String value, int start, int end) {
+        int pos = start;
+        while (pos < end) {
+            char c = value.charAt(pos++);
+            if (c == ELEMENT_SEPARATOR) {
+                start = pos;
+            } else if (!isOWC(c)) {
+                return start;
+            }
+        }
+        return end;
     }
-    int otelMemberCount = 0;
-    int memberStart = findNextMember(original, 0);
-    while (memberStart < original.length()) {
-      int memberEnd = original.indexOf(MEMBER_SEPARATOR, memberStart);
-      if (memberEnd < 0) {
-        memberEnd = original.length();
-      }
-      if (original.startsWith(OTEL_MEMBER_KEY, memberStart)) {
-        if (++otelMemberCount > 1) {
-          return false;
+
+    private static int cleanUpAndAppendUnknown(StringBuilder sb, W3CPTags w3CPTags, int size) {
+        if (w3CPTags.maxUnknownSize == 0
+                || w3CPTags.ddMemberStart == -1
+                || w3CPTags.ddMemberStart >= w3CPTags.ddMemberValueEnd) {
+            return size;
         }
-        int valueStart = memberStart + OTEL_MEMBER_KEY.length();
-        int valueEnd = stripTrailingOWC(original, valueStart, memberEnd);
-        if (!contentEquals(original, valueStart, valueEnd, otelTraceState)) {
-          return false;
+        String original = w3CPTags.tracestate;
+        int elementStart = w3CPTags.ddMemberStart + EMPTY_SIZE; // skip over 'dd='
+        int okSize = size;
+        while (elementStart < w3CPTags.ddMemberValueEnd && size < MAX_HEADER_SIZE) {
+            elementStart = skipEmptyElements(original, elementStart, w3CPTags.ddMemberValueEnd);
+            if (elementStart == w3CPTags.ddMemberValueEnd) {
+                break;
+            }
+            okSize = size;
+            int elementEnd = original.indexOf(ELEMENT_SEPARATOR, elementStart);
+            if (elementEnd < 0 || elementEnd > w3CPTags.ddMemberValueEnd) {
+                elementEnd = w3CPTags.ddMemberValueEnd;
+            }
+            if (!original.startsWith(Encoding.W3C.getPrefix(), elementStart)) {
+                char first = original.charAt(elementStart);
+                // ignore known o:, s:, and p: elements because we always add them back in appendPrefix
+                if ((first != 'o' && first != 's' && first != 'p')
+                        || elementStart + 1 >= elementEnd
+                        || original.charAt(elementStart + 1) != KEY_VALUE_SEPARATOR) {
+                    if (sb.length() > EMPTY_SIZE) {
+                        sb.append(ELEMENT_SEPARATOR);
+                        size++;
+                    }
+                    int end = elementEnd;
+                    if (end == w3CPTags.ddMemberValueEnd) {
+                        end = stripTrailingOWC(original, elementStart, end);
+                    }
+                    sb.append(original, elementStart, end);
+                    size += (end - elementStart);
+                }
+            }
+            elementStart = elementEnd + 1;
+        }
+        if (size > MAX_HEADER_SIZE) {
+            sb.setLength(okSize);
+            size = okSize;
         }
-      }
-      memberStart = findNextMember(original, memberEnd + 1);
+        return size;
     }
-    return otelMemberCount == 1;
-  }
-
-  public static String rebuildTracestate(SamplingState samplingState) {
-    String original = samplingState.getTracestate();
-    CharSequence otelTraceState = samplingState.getOtelTraceState();
-    // TODO Consider a raw passthrough for unchanged state after checking dd= is not duplicated.
-    StringBuilder result = new StringBuilder(MAX_HEADER_SIZE);
-    int memberCount = 0;
-
-    if (original != null) {
-      int memberStart = findNextMember(original, 0);
-      while (memberStart < original.length()) {
-        int memberEnd = original.indexOf(MEMBER_SEPARATOR, memberStart);
-        if (memberEnd < 0) {
-          memberEnd = original.length();
+
+    private static boolean appendOtelAndVendorMembers(
+            StringBuilder sb, SamplingState samplingState, boolean hasDatadogMember) {
+        String original = samplingState.getTracestate();
+        CharSequence otelTraceState = samplingState.getOtelTraceState();
+        int remainingMembers = MAX_MEMBER_COUNT - (hasDatadogMember ? 1 : 0);
+        boolean memberAppended = false;
+        boolean preserveOtelPosition = samplingState.preservesInheritedOtelPosition();
+        if (!preserveOtelPosition && otelTraceState != null && remainingMembers > 0) {
+            appendMember(sb, OTEL_MEMBER_KEY, otelTraceState.toString());
+            remainingMembers--;
+            memberAppended = true;
         }
-        if (original.startsWith(DATADOG_MEMBER_KEY, memberStart)) {
-          int end = stripTrailingOWC(original, memberStart, memberEnd);
-          appendMember(result, original, memberStart, end);
-          memberCount++;
-          break;
+        int len = original == null ? 0 : original.length();
+        int memberStart = original == null ? 0 : findNextMember(original, 0);
+        while (memberStart < len && remainingMembers > 0) {
+            int memberEnd = original.indexOf(MEMBER_SEPARATOR, memberStart);
+            if (memberEnd < 0) {
+                memberEnd = len;
+            }
+            boolean datadogMember = original.startsWith(DATADOG_MEMBER_KEY, memberStart);
+            boolean otelMember = original.startsWith(OTEL_MEMBER_KEY, memberStart);
+            if (!datadogMember && (!otelMember || preserveOtelPosition)) {
+                int end = stripTrailingOWC(original, memberStart, memberEnd);
+                appendMember(sb, original, memberStart, end);
+                remainingMembers--;
+                memberAppended = true;
+            }
+            memberStart = findNextMember(original, memberEnd + 1);
         }
-        memberStart = findNextMember(original, memberEnd + 1);
-      }
+        return memberAppended;
     }
 
-    if (otelTraceState != null && memberCount < MAX_MEMBER_COUNT) {
-      appendMember(result, OTEL_MEMBER_KEY, otelTraceState);
-      memberCount++;
+    public static boolean isUnchangedInheritedOtelMember(String original, CharSequence otelTraceState) {
+        if (original == null || otelTraceState == null) {
+            return false;
+        }
+        int otelMemberCount = 0;
+        int memberStart = findNextMember(original, 0);
+        while (memberStart < original.length()) {
+            int memberEnd = original.indexOf(MEMBER_SEPARATOR, memberStart);
+            if (memberEnd < 0) {
+                memberEnd = original.length();
+            }
+            if (original.startsWith(OTEL_MEMBER_KEY, memberStart)) {
+                if (++otelMemberCount > 1) {
+                    return false;
+                }
+                int valueStart = memberStart + OTEL_MEMBER_KEY.length();
+                int valueEnd = stripTrailingOWC(original, valueStart, memberEnd);
+                if (!contentEquals(original, valueStart, valueEnd, otelTraceState)) {
+                    return false;
+                }
+            }
+            memberStart = findNextMember(original, memberEnd + 1);
+        }
+        return otelMemberCount == 1;
     }
 
-    if (original != null) {
-      int memberStart = findNextMember(original, 0);
-      while (memberStart < original.length() && memberCount < MAX_MEMBER_COUNT) {
-        int memberEnd = original.indexOf(MEMBER_SEPARATOR, memberStart);
-        if (memberEnd < 0) {
-          memberEnd = original.length();
+    public static String rebuildTracestate(SamplingState samplingState) {
+        String original = samplingState.getTracestate();
+        CharSequence otelTraceState = samplingState.getOtelTraceState();
+        // TODO Consider a raw passthrough for unchanged state after checking dd= is not duplicated.
+        StringBuilder result = new StringBuilder(MAX_HEADER_SIZE);
+        int memberCount = 0;
+
+        if (original != null) {
+            int memberStart = findNextMember(original, 0);
+            while (memberStart < original.length()) {
+                int memberEnd = original.indexOf(MEMBER_SEPARATOR, memberStart);
+                if (memberEnd < 0) {
+                    memberEnd = original.length();
+                }
+                if (original.startsWith(DATADOG_MEMBER_KEY, memberStart)) {
+                    int end = stripTrailingOWC(original, memberStart, memberEnd);
+                    appendMember(result, original, memberStart, end);
+                    memberCount++;
+                    break;
+                }
+                memberStart = findNextMember(original, memberEnd + 1);
+            }
         }
-        boolean managed =
-            original.startsWith(DATADOG_MEMBER_KEY, memberStart)
-                || original.startsWith(OTEL_MEMBER_KEY, memberStart);
-        if (!managed) {
-          int end = stripTrailingOWC(original, memberStart, memberEnd);
-          appendMember(result, original, memberStart, end);
-          memberCount++;
+
+        if (otelTraceState != null && memberCount < MAX_MEMBER_COUNT) {
+            appendMember(result, OTEL_MEMBER_KEY, otelTraceState);
+            memberCount++;
+        }
+
+        if (original != null) {
+            int memberStart = findNextMember(original, 0);
+            while (memberStart < original.length() && memberCount < MAX_MEMBER_COUNT) {
+                int memberEnd = original.indexOf(MEMBER_SEPARATOR, memberStart);
+                if (memberEnd < 0) {
+                    memberEnd = original.length();
+                }
+                boolean managed = original.startsWith(DATADOG_MEMBER_KEY, memberStart)
+                        || original.startsWith(OTEL_MEMBER_KEY, memberStart);
+                if (!managed) {
+                    int end = stripTrailingOWC(original, memberStart, memberEnd);
+                    appendMember(result, original, memberStart, end);
+                    memberCount++;
+                }
+                memberStart = findNextMember(original, memberEnd + 1);
+            }
         }
-        memberStart = findNextMember(original, memberEnd + 1);
-      }
+        return result.length() == 0 ? null : result.toString();
     }
-    return result.length() == 0 ? null : result.toString();
-  }
 
-  private static void appendMember(StringBuilder sb, String member, int start, int end) {
-    if (sb.length() != 0) {
-      sb.append(MEMBER_SEPARATOR);
+    private static void appendMember(StringBuilder sb, String member, int start, int end) {
+        if (sb.length() != 0) {
+            sb.append(MEMBER_SEPARATOR);
+        }
+        sb.append(member, start, end);
     }
-    sb.append(member, start, end);
-  }
 
-  private static void appendMember(StringBuilder sb, String key, CharSequence value) {
-    if (sb.length() != 0) {
-      sb.append(MEMBER_SEPARATOR);
+    private static void appendMember(StringBuilder sb, String key, CharSequence value) {
+        if (sb.length() != 0) {
+            sb.append(MEMBER_SEPARATOR);
+        }
+        sb.append(key).append(value);
+    }
+
+    static OtelTraceState extractOtelTraceState(String tracestate) {
+        if (tracestate == null || tracestate.isEmpty()) {
+            return null;
+        }
+        int firstMemberStart = findNextMember(tracestate, 0);
+        int memberStart = firstMemberStart;
+        int otelMemberStart = -1;
+        int otelMemberValueStart = -1;
+        int otelMemberValueEnd = -1;
+        while (memberStart < tracestate.length()) {
+            int memberValueStart = validateMemberKey(tracestate, memberStart);
+            if (memberValueStart < 0) {
+                return null;
+            }
+            int memberValueEnd = validateMemberValue(tracestate, memberValueStart);
+            if (memberValueEnd < 0) {
+                return null;
+            }
+            if (tracestate.startsWith(OTEL_MEMBER_KEY, memberStart)) {
+                otelMemberStart = memberStart;
+                otelMemberValueStart = memberValueStart;
+                otelMemberValueEnd = memberValueEnd;
+                break;
+            }
+            memberStart = findNextMember(tracestate, memberValueEnd);
+        }
+        if (otelMemberStart == -1) {
+            return null;
+        }
+        int valueEnd = stripTrailingOWC(tracestate, otelMemberValueStart, otelMemberValueEnd);
+        return OtelTraceState.parse(
+                SubSequence.of(tracestate, otelMemberValueStart, valueEnd),
+                memberContributionSize(tracestate, firstMemberStart, otelMemberStart, otelMemberValueEnd));
     }
-    sb.append(key).append(value);
-  }
 
-  static OtelTraceState extractOtelTraceState(String tracestate) {
-    if (tracestate == null || tracestate.isEmpty()) {
-      return null;
+    private static int memberContributionSize(String tracestate, int firstMemberStart, int memberStart, int memberEnd) {
+        int memberSize = memberEnd - memberStart;
+        boolean isOnlyMember = memberStart == firstMemberStart && memberEnd == tracestate.length();
+        return isOnlyMember ? memberSize : memberSize + 1;
     }
-    int firstMemberStart = findNextMember(tracestate, 0);
-    int memberStart = firstMemberStart;
-    int otelMemberStart = -1;
-    int otelMemberValueStart = -1;
-    int otelMemberValueEnd = -1;
-    while (memberStart < tracestate.length()) {
-      int memberValueStart = validateMemberKey(tracestate, memberStart);
-      if (memberValueStart < 0) {
-        return null;
-      }
-      int memberValueEnd = validateMemberValue(tracestate, memberValueStart);
-      if (memberValueEnd < 0) {
-        return null;
-      }
-      if (tracestate.startsWith(OTEL_MEMBER_KEY, memberStart)) {
-        otelMemberStart = memberStart;
-        otelMemberValueStart = memberValueStart;
-        otelMemberValueEnd = memberValueEnd;
-        break;
-      }
-      memberStart = findNextMember(tracestate, memberValueEnd);
+
+    /** Creates tags that preserve unmanaged W3C tracestate members without sampling state. */
+    static W3CPTags empty(PTagsFactory factory, String original) {
+        return empty(factory, original, null);
     }
-    if (otelMemberStart == -1) {
-      return null;
+
+    private static W3CPTags empty(PTagsFactory factory, String original, OtelTraceState otelTraceState) {
+        return empty(factory, original, 0, -1, -1, otelTraceState);
     }
-    int valueEnd = stripTrailingOWC(tracestate, otelMemberValueStart, otelMemberValueEnd);
-    return OtelTraceState.parse(
-        SubSequence.of(tracestate, otelMemberValueStart, valueEnd),
-        memberContributionSize(tracestate, firstMemberStart, otelMemberStart, otelMemberValueEnd));
-  }
-
-  private static int memberContributionSize(
-      String tracestate, int firstMemberStart, int memberStart, int memberEnd) {
-    int memberSize = memberEnd - memberStart;
-    boolean isOnlyMember = memberStart == firstMemberStart && memberEnd == tracestate.length();
-    return isOnlyMember ? memberSize : memberSize + 1;
-  }
-
-  /** Creates tags that preserve unmanaged W3C tracestate members without sampling state. */
-  static W3CPTags empty(PTagsFactory factory, String original) {
-    return empty(factory, original, null);
-  }
-
-  private static W3CPTags empty(
-      PTagsFactory factory, String original, OtelTraceState otelTraceState) {
-    return empty(factory, original, 0, -1, -1, otelTraceState);
-  }
-
-  private static W3CPTags empty(
-      PTagsFactory factory,
-      String original,
-      int firstMemberStart,
-      int ddMemberStart,
-      int ddMemberValueEnd,
-      OtelTraceState otelTraceState) {
-    return new W3CPTags(
-        factory,
-        null,
-        null,
-        null,
-        ProductTraceSource.UNSET,
-        PrioritySampling.UNSET,
-        null,
-        original,
-        firstMemberStart,
-        ddMemberStart,
-        ddMemberValueEnd,
-        0,
-        null,
-        null,
-        otelTraceState);
-  }
-
-  private static class W3CPTags extends PTags {
-    /** The index of the first tracestate list-member position in {@link #tracestate}. */
-    private final int firstMemberStart;
-
-    /**
-     * The index of the Datadog tracestate list-member (dd=) position in {@link #tracestate}, {@code
-     * -1 if Datadog list-member not found}.
-     */
-    private final int ddMemberStart;
-
-    /**
-     * The index of the end Datadog tracestate list-member (dd=) in {@link #tracestate}, {@code -1
-     * if Datadog list-member not found}.
-     */
-    private final int ddMemberValueEnd;
-
-    private final int maxUnknownSize;
-
-    public W3CPTags(
-        PTagsFactory factory,
-        List<TagElement> tagPairs,
-        TagValue decisionMakerTagValue,
-        TagValue traceIdTagValue,
-        int traceSource,
-        int samplingPriority,
-        CharSequence origin,
-        String original,
-        int firstMemberStart,
-        int ddMemberStart,
-        int ddMemberValueEnd,
-        int maxUnknownSize,
-        CharSequence lastParentId,
-        TagValue orgPropagationMarkerTagValue,
-        OtelTraceState otelTraceState) {
-      super(
-          factory,
-          tagPairs,
-          decisionMakerTagValue,
-          traceIdTagValue,
-          traceSource,
-          samplingPriority,
-          origin,
-          lastParentId,
-          orgPropagationMarkerTagValue,
-          original,
-          otelTraceState);
-      this.firstMemberStart = firstMemberStart;
-      this.ddMemberStart = ddMemberStart;
-      this.ddMemberValueEnd = ddMemberValueEnd;
-      this.maxUnknownSize = maxUnknownSize;
+
+    private static W3CPTags empty(
+            PTagsFactory factory,
+            String original,
+            int firstMemberStart,
+            int ddMemberStart,
+            int ddMemberValueEnd,
+            OtelTraceState otelTraceState) {
+        return new W3CPTags(
+                factory,
+                null,
+                null,
+                null,
+                ProductTraceSource.UNSET,
+                PrioritySampling.UNSET,
+                null,
+                original,
+                firstMemberStart,
+                ddMemberStart,
+                ddMemberValueEnd,
+                0,
+                null,
+                null,
+                otelTraceState);
     }
 
-    @Override
-    public void updateTraceIdHighOrderBits(long highOrderBits) {
-      long currentHighOrderBits = getTraceIdHighOrderBits();
-      // If defined from parsing but different from expected value, mark as decoding error
-      if (currentHighOrderBits != 0 && currentHighOrderBits != highOrderBits) {
-        this.error =
-            PROPAGATION_ERROR_INCONSISTENT_TID + toHexStringPadded(currentHighOrderBits, 16);
-      }
-      super.updateTraceIdHighOrderBits(highOrderBits);
+    private static class W3CPTags extends PTags {
+        /** The index of the first tracestate list-member position in {@link #tracestate}. */
+        private final int firstMemberStart;
+
+        /**
+         * The index of the Datadog tracestate list-member (dd=) position in {@link #tracestate}, {@code
+         * -1 if Datadog list-member not found}.
+         */
+        private final int ddMemberStart;
+
+        /**
+         * The index of the end Datadog tracestate list-member (dd=) in {@link #tracestate}, {@code -1
+         * if Datadog list-member not found}.
+         */
+        private final int ddMemberValueEnd;
+
+        private final int maxUnknownSize;
+
+        public W3CPTags(
+                PTagsFactory factory,
+                List<TagElement> tagPairs,
+                TagValue decisionMakerTagValue,
+                TagValue traceIdTagValue,
+                int traceSource,
+                int samplingPriority,
+                CharSequence origin,
+                String original,
+                int firstMemberStart,
+                int ddMemberStart,
+                int ddMemberValueEnd,
+                int maxUnknownSize,
+                CharSequence lastParentId,
+                TagValue orgPropagationMarkerTagValue,
+                OtelTraceState otelTraceState) {
+            super(
+                    factory,
+                    tagPairs,
+                    decisionMakerTagValue,
+                    traceIdTagValue,
+                    traceSource,
+                    samplingPriority,
+                    origin,
+                    lastParentId,
+                    orgPropagationMarkerTagValue,
+                    original,
+                    otelTraceState);
+            this.firstMemberStart = firstMemberStart;
+            this.ddMemberStart = ddMemberStart;
+            this.ddMemberValueEnd = ddMemberValueEnd;
+            this.maxUnknownSize = maxUnknownSize;
+        }
+
+        @Override
+        public void updateTraceIdHighOrderBits(long highOrderBits) {
+            long currentHighOrderBits = getTraceIdHighOrderBits();
+            // If defined from parsing but different from expected value, mark as decoding error
+            if (currentHighOrderBits != 0 && currentHighOrderBits != highOrderBits) {
+                this.error = PROPAGATION_ERROR_INCONSISTENT_TID + toHexStringPadded(currentHighOrderBits, 16);
+            }
+            super.updateTraceIdHighOrderBits(highOrderBits);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java
index 0f6feaf095c..f8d811d8ce3 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java
@@ -9,203 +9,202 @@
 
 class ContinuableScope implements ContextScope {
 
-  // different sources of scopes
-  static final byte INSTRUMENTATION = 0;
-  static final byte MANUAL = 1;
-  static final byte ITERATION = 2;
-  static final byte CONTEXT = 3;
-
-  private final ContinuableScopeManager scopeManager;
-
-  final Context context; // package-private so scopeManager can access it directly
-
-  private boolean asyncPropagating;
-
-  private short checkpointCount = 0;
-
-  private final byte source;
-
-  private short referenceCount = 1;
-
-  private final Stateful scopeState;
-
-  ContinuableScope(
-      final ContinuableScopeManager scopeManager,
-      final Context context,
-      final byte source,
-      final boolean asyncPropagating,
-      final Stateful scopeState) {
-    this.scopeManager = scopeManager;
-    this.context = context;
-    this.source = source;
-    this.asyncPropagating = asyncPropagating;
-    this.scopeState = scopeState;
-  }
-
-  @Override
-  public final void close() {
-    final ScopeStack scopeStack = scopeManager.scopeStack();
-
-    // fast check first, only perform slower check when there's an inconsistency with the stack
-    if (!scopeStack.checkTop(this) && !scopeStack.checkOverdueScopes(this)) {
-      if (ContinuableScopeManager.log.isDebugEnabled()) {
-        ContinuableScopeManager.log.debug(
-            "Tried to close {} scope when not on top.  Current top: {}", this, scopeStack.top);
-      }
-
-      byte source = source();
-      scopeManager.healthMetrics.onScopeCloseError(source == MANUAL);
-      if (source == MANUAL && scopeManager.strictMode) {
-        throw new RuntimeException("Tried to close " + context + " scope when not on top");
-      }
-    }
-
-    final boolean alive = decrementReferences();
-    scopeManager.healthMetrics.onCloseScope();
-    if (!alive) {
-      scopeState.close();
-      cleanup(scopeStack);
-    }
-  }
-
-  void cleanup(final ScopeStack scopeStack) {
-    scopeStack.cleanup();
-  }
-
-  /*
-   * Exists to allow stack unwinding to do a delayed call to close when the close is
-   * finished properly.  e.g. When the scope is back on the top of the stack.
-   *
-   * DQH - If we clean-up the delegation code & notification semantics at later time,
-   * I would hope this becomes unnecessary.
-   */
-  final void onProperClose() {
-    boolean hasScopeListeners = !scopeManager.scopeListeners.isEmpty();
-    boolean hasExtendedListeners = !scopeManager.extendedScopeListeners.isEmpty();
-    if (!hasScopeListeners && !hasExtendedListeners) {
-      return;
-    }
-    if (hasScopeListeners) {
-      for (final ScopeListener listener : scopeManager.scopeListeners) {
-        try {
-          listener.afterScopeClosed();
-        } catch (Exception e) {
-          ContinuableScopeManager.log.debug("ScopeListener threw exception in close()", e);
+    // different sources of scopes
+    static final byte INSTRUMENTATION = 0;
+    static final byte MANUAL = 1;
+    static final byte ITERATION = 2;
+    static final byte CONTEXT = 3;
+
+    private final ContinuableScopeManager scopeManager;
+
+    final Context context; // package-private so scopeManager can access it directly
+
+    private boolean asyncPropagating;
+
+    private short checkpointCount = 0;
+
+    private final byte source;
+
+    private short referenceCount = 1;
+
+    private final Stateful scopeState;
+
+    ContinuableScope(
+            final ContinuableScopeManager scopeManager,
+            final Context context,
+            final byte source,
+            final boolean asyncPropagating,
+            final Stateful scopeState) {
+        this.scopeManager = scopeManager;
+        this.context = context;
+        this.source = source;
+        this.asyncPropagating = asyncPropagating;
+        this.scopeState = scopeState;
+    }
+
+    @Override
+    public final void close() {
+        final ScopeStack scopeStack = scopeManager.scopeStack();
+
+        // fast check first, only perform slower check when there's an inconsistency with the stack
+        if (!scopeStack.checkTop(this) && !scopeStack.checkOverdueScopes(this)) {
+            if (ContinuableScopeManager.log.isDebugEnabled()) {
+                ContinuableScopeManager.log.debug(
+                        "Tried to close {} scope when not on top.  Current top: {}", this, scopeStack.top);
+            }
+
+            byte source = source();
+            scopeManager.healthMetrics.onScopeCloseError(source == MANUAL);
+            if (source == MANUAL && scopeManager.strictMode) {
+                throw new RuntimeException("Tried to close " + context + " scope when not on top");
+            }
+        }
+
+        final boolean alive = decrementReferences();
+        scopeManager.healthMetrics.onCloseScope();
+        if (!alive) {
+            scopeState.close();
+            cleanup(scopeStack);
         }
-      }
     }
-    if (hasExtendedListeners) {
-      for (final ExtendedScopeListener listener : scopeManager.extendedScopeListeners) {
-        try {
-          listener.afterScopeClosed();
-        } catch (Exception e) {
-          ContinuableScopeManager.log.debug("ScopeListener threw exception in close()", e);
+
+    void cleanup(final ScopeStack scopeStack) {
+        scopeStack.cleanup();
+    }
+
+    /*
+     * Exists to allow stack unwinding to do a delayed call to close when the close is
+     * finished properly.  e.g. When the scope is back on the top of the stack.
+     *
+     * DQH - If we clean-up the delegation code & notification semantics at later time,
+     * I would hope this becomes unnecessary.
+     */
+    final void onProperClose() {
+        boolean hasScopeListeners = !scopeManager.scopeListeners.isEmpty();
+        boolean hasExtendedListeners = !scopeManager.extendedScopeListeners.isEmpty();
+        if (!hasScopeListeners && !hasExtendedListeners) {
+            return;
         }
-      }
-    }
-  }
-
-  final void incrementReferences() {
-    ++referenceCount;
-  }
-
-  /** Decrements ref count -- returns true if the scope is still alive */
-  final boolean decrementReferences() {
-    return --referenceCount > 0;
-  }
-
-  final void clearReferences() {
-    referenceCount = 0;
-  }
-
-  /** Returns true if the scope is still alive (non-zero ref count) */
-  final boolean alive() {
-    return referenceCount > 0;
-  }
-
-  public final boolean isAsyncPropagating() {
-    return asyncPropagating;
-  }
-
-  public final AgentSpan span() {
-    return AgentSpan.fromContext(context);
-  }
-
-  @Override
-  public Context context() {
-    return context;
-  }
-
-  public final void setAsyncPropagation(final boolean value) {
-    asyncPropagating = value;
-  }
-
-  @Override
-  public final String toString() {
-    return super.toString() + "->" + context;
-  }
-
-  public void checkpoint() {
-    checkpointCount++;
-  }
-
-  public boolean rollback() {
-    if (checkpointCount > 0) {
-      checkpointCount--;
-      return false; // stop rollback at checkpoint
-    } else {
-      return true;
-    }
-  }
-
-  public final void beforeActivated() {
-    if (scopeState == Stateful.DEFAULT) {
-      return;
-    }
-    AgentSpan span = span();
-    if (span == null) {
-      return;
-    }
-    try {
-      scopeState.activate(span.spanContext());
-    } catch (Throwable e) {
-      ContinuableScopeManager.ratelimitedLog.warn(
-          "ScopeState {} threw exception in beforeActivated()", scopeState.getClass(), e);
-    }
-  }
-
-  public final void afterActivated() {
-    boolean hasScopeListeners = !scopeManager.scopeListeners.isEmpty();
-    boolean hasExtendedListeners = !scopeManager.extendedScopeListeners.isEmpty();
-    if (!hasScopeListeners && !hasExtendedListeners) {
-      return;
-    }
-    AgentSpan span = span();
-    if (span == null) {
-      return;
-    }
-    if (hasScopeListeners) {
-      for (final ScopeListener listener : scopeManager.scopeListeners) {
-        try {
-          listener.afterScopeActivated();
-        } catch (Throwable e) {
-          ContinuableScopeManager.log.debug("ScopeListener threw exception in afterActivated()", e);
+        if (hasScopeListeners) {
+            for (final ScopeListener listener : scopeManager.scopeListeners) {
+                try {
+                    listener.afterScopeClosed();
+                } catch (Exception e) {
+                    ContinuableScopeManager.log.debug("ScopeListener threw exception in close()", e);
+                }
+            }
+        }
+        if (hasExtendedListeners) {
+            for (final ExtendedScopeListener listener : scopeManager.extendedScopeListeners) {
+                try {
+                    listener.afterScopeClosed();
+                } catch (Exception e) {
+                    ContinuableScopeManager.log.debug("ScopeListener threw exception in close()", e);
+                }
+            }
         }
-      }
     }
-    if (hasExtendedListeners) {
-      for (final ExtendedScopeListener listener : scopeManager.extendedScopeListeners) {
+
+    final void incrementReferences() {
+        ++referenceCount;
+    }
+
+    /** Decrements ref count -- returns true if the scope is still alive */
+    final boolean decrementReferences() {
+        return --referenceCount > 0;
+    }
+
+    final void clearReferences() {
+        referenceCount = 0;
+    }
+
+    /** Returns true if the scope is still alive (non-zero ref count) */
+    final boolean alive() {
+        return referenceCount > 0;
+    }
+
+    public final boolean isAsyncPropagating() {
+        return asyncPropagating;
+    }
+
+    public final AgentSpan span() {
+        return AgentSpan.fromContext(context);
+    }
+
+    @Override
+    public Context context() {
+        return context;
+    }
+
+    public final void setAsyncPropagation(final boolean value) {
+        asyncPropagating = value;
+    }
+
+    @Override
+    public final String toString() {
+        return super.toString() + "->" + context;
+    }
+
+    public void checkpoint() {
+        checkpointCount++;
+    }
+
+    public boolean rollback() {
+        if (checkpointCount > 0) {
+            checkpointCount--;
+            return false; // stop rollback at checkpoint
+        } else {
+            return true;
+        }
+    }
+
+    public final void beforeActivated() {
+        if (scopeState == Stateful.DEFAULT) {
+            return;
+        }
+        AgentSpan span = span();
+        if (span == null) {
+            return;
+        }
         try {
-          listener.afterScopeActivated(span.getTraceId(), span.getSpanId());
+            scopeState.activate(span.spanContext());
         } catch (Throwable e) {
-          ContinuableScopeManager.log.debug(
-              "ExtendedScopeListener threw exception in afterActivated()", e);
+            ContinuableScopeManager.ratelimitedLog.warn(
+                    "ScopeState {} threw exception in beforeActivated()", scopeState.getClass(), e);
         }
-      }
     }
-  }
 
-  public byte source() {
-    return (byte) (source & 0x7F);
-  }
+    public final void afterActivated() {
+        boolean hasScopeListeners = !scopeManager.scopeListeners.isEmpty();
+        boolean hasExtendedListeners = !scopeManager.extendedScopeListeners.isEmpty();
+        if (!hasScopeListeners && !hasExtendedListeners) {
+            return;
+        }
+        AgentSpan span = span();
+        if (span == null) {
+            return;
+        }
+        if (hasScopeListeners) {
+            for (final ScopeListener listener : scopeManager.scopeListeners) {
+                try {
+                    listener.afterScopeActivated();
+                } catch (Throwable e) {
+                    ContinuableScopeManager.log.debug("ScopeListener threw exception in afterActivated()", e);
+                }
+            }
+        }
+        if (hasExtendedListeners) {
+            for (final ExtendedScopeListener listener : scopeManager.extendedScopeListeners) {
+                try {
+                    listener.afterScopeActivated(span.getTraceId(), span.getSpanId());
+                } catch (Throwable e) {
+                    ContinuableScopeManager.log.debug("ExtendedScopeListener threw exception in afterActivated()", e);
+                }
+            }
+        }
+    }
+
+    public byte source() {
+        return (byte) (source & 0x7F);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java
index 7f0e1a92c1e..31ba5ffc036 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java
@@ -47,437 +47,433 @@
  */
 public final class ContinuableScopeManager {
 
-  static final Logger log = LoggerFactory.getLogger(ContinuableScopeManager.class);
-  static final RatelimitedLogger ratelimitedLog = new RatelimitedLogger(log, 1, MINUTES);
-
-  private static final NoopContinuation ROOT_CONTINUATION = NoopContinuation.INSTANCE;
-  private static final NoopScope INVALID_SCOPE = NoopScope.INSTANCE;
-
-  static final long iterationKeepAlive =
-      SECONDS.toMillis(Config.get().getScopeIterationKeepAlive());
-  volatile ConcurrentMap<ScopeStack, ContinuableScope> rootIterationScopes;
-  final List<ScopeListener> scopeListeners;
-  final List<ExtendedScopeListener> extendedScopeListeners;
-  final boolean strictMode;
-  private final ScopeStackThreadLocal tlsScopeStack;
-  private final int depthLimit;
-  final HealthMetrics healthMetrics;
-  private final ProfilingContextIntegration profilingContextIntegration;
-  private final boolean profilingEnabled;
-  private final boolean hasDepthLimit;
-
-  /**
-   * Constructor with NOOP Profiling and HealthMetrics implementations.
-   *
-   * @param depthLimit The maximum scope depth limit, <code>0</code> for unlimited.
-   * @param strictMode Whether check if the closed spans are the active ones or not.
-   */
-  public ContinuableScopeManager(final int depthLimit, final boolean strictMode) {
-    this(depthLimit, strictMode, ProfilingContextIntegration.NoOp.INSTANCE, HealthMetrics.NO_OP);
-  }
-
-  /**
-   * Default constructor.
-   *
-   * @param depthLimit The maximum scope depth limit, <code>0</code> for unlimited.
-   * @param strictMode Whether check if the closed spans are the active ones or not.
-   */
-  public ContinuableScopeManager(
-      final int depthLimit,
-      final boolean strictMode,
-      final ProfilingContextIntegration profilingContextIntegration,
-      final HealthMetrics healthMetrics) {
-    this.depthLimit = depthLimit == 0 ? Integer.MAX_VALUE : depthLimit;
-    this.hasDepthLimit = this.depthLimit < Integer.MAX_VALUE;
-    this.strictMode = strictMode;
-    this.scopeListeners = new CopyOnWriteArrayList<>();
-    this.extendedScopeListeners = new CopyOnWriteArrayList<>();
-    this.healthMetrics = healthMetrics;
-    this.tlsScopeStack = new ScopeStackThreadLocal(profilingContextIntegration);
-    this.profilingContextIntegration = profilingContextIntegration;
-    this.profilingEnabled =
-        !(profilingContextIntegration instanceof ProfilingContextIntegration.NoOp);
-  }
-
-  public ContextScope activateSpan(final AgentSpan span) {
-    return activate(span, INSTRUMENTATION, true, DEFAULT_ASYNC_PROPAGATING);
-  }
-
-  public ContextScope activateManualSpan(final AgentSpan span) {
-    return activate(span, MANUAL, false, /* ignored */ false);
-  }
-
-  private ContextScope activate(
-      final AgentSpan span,
-      final byte source,
-      final boolean overrideAsyncPropagation,
-      final boolean isAsyncPropagating) {
-    ScopeStack scopeStack = scopeStack();
-
-    final ContinuableScope top = scopeStack.top;
-    if (top != null && span.equals(top.span())) {
-      top.incrementReferences();
-      return top;
+    static final Logger log = LoggerFactory.getLogger(ContinuableScopeManager.class);
+    static final RatelimitedLogger ratelimitedLog = new RatelimitedLogger(log, 1, MINUTES);
+
+    private static final NoopContinuation ROOT_CONTINUATION = NoopContinuation.INSTANCE;
+    private static final NoopScope INVALID_SCOPE = NoopScope.INSTANCE;
+
+    static final long iterationKeepAlive = SECONDS.toMillis(Config.get().getScopeIterationKeepAlive());
+    volatile ConcurrentMap<ScopeStack, ContinuableScope> rootIterationScopes;
+    final List<ScopeListener> scopeListeners;
+    final List<ExtendedScopeListener> extendedScopeListeners;
+    final boolean strictMode;
+    private final ScopeStackThreadLocal tlsScopeStack;
+    private final int depthLimit;
+    final HealthMetrics healthMetrics;
+    private final ProfilingContextIntegration profilingContextIntegration;
+    private final boolean profilingEnabled;
+    private final boolean hasDepthLimit;
+
+    /**
+     * Constructor with NOOP Profiling and HealthMetrics implementations.
+     *
+     * @param depthLimit The maximum scope depth limit, <code>0</code> for unlimited.
+     * @param strictMode Whether check if the closed spans are the active ones or not.
+     */
+    public ContinuableScopeManager(final int depthLimit, final boolean strictMode) {
+        this(depthLimit, strictMode, ProfilingContextIntegration.NoOp.INSTANCE, HealthMetrics.NO_OP);
+    }
+
+    /**
+     * Default constructor.
+     *
+     * @param depthLimit The maximum scope depth limit, <code>0</code> for unlimited.
+     * @param strictMode Whether check if the closed spans are the active ones or not.
+     */
+    public ContinuableScopeManager(
+            final int depthLimit,
+            final boolean strictMode,
+            final ProfilingContextIntegration profilingContextIntegration,
+            final HealthMetrics healthMetrics) {
+        this.depthLimit = depthLimit == 0 ? Integer.MAX_VALUE : depthLimit;
+        this.hasDepthLimit = this.depthLimit < Integer.MAX_VALUE;
+        this.strictMode = strictMode;
+        this.scopeListeners = new CopyOnWriteArrayList<>();
+        this.extendedScopeListeners = new CopyOnWriteArrayList<>();
+        this.healthMetrics = healthMetrics;
+        this.tlsScopeStack = new ScopeStackThreadLocal(profilingContextIntegration);
+        this.profilingContextIntegration = profilingContextIntegration;
+        this.profilingEnabled = !(profilingContextIntegration instanceof ProfilingContextIntegration.NoOp);
     }
 
-    // DQH - This check could go before the check above, since depth limit checking is fast
-    if (hasDepthLimit) {
-      final int currentDepth = scopeStack.depth();
-      if (depthLimit <= currentDepth) {
-        healthMetrics.onScopeStackOverflow();
-        log.debug("Scope depth limit exceeded ({}).  Returning NoopScope.", currentDepth);
-        return INVALID_SCOPE;
-      }
+    public ContextScope activateSpan(final AgentSpan span) {
+        return activate(span, INSTRUMENTATION, true, DEFAULT_ASYNC_PROPAGATING);
     }
 
-    assert span != null;
+    public ContextScope activateManualSpan(final AgentSpan span) {
+        return activate(span, MANUAL, false, /* ignored */ false);
+    }
 
-    // Inherit the async propagation from the active scope unless the value is overridden
-    boolean asyncPropagation =
-        overrideAsyncPropagation
-            ? isAsyncPropagating
-            : top != null ? top.isAsyncPropagating() : DEFAULT_ASYNC_PROPAGATING;
+    private ContextScope activate(
+            final AgentSpan span,
+            final byte source,
+            final boolean overrideAsyncPropagation,
+            final boolean isAsyncPropagating) {
+        ScopeStack scopeStack = scopeStack();
+
+        final ContinuableScope top = scopeStack.top;
+        if (top != null && span.equals(top.span())) {
+            top.incrementReferences();
+            return top;
+        }
 
-    Context context = top != null ? top.context.with(span) : span;
+        // DQH - This check could go before the check above, since depth limit checking is fast
+        if (hasDepthLimit) {
+            final int currentDepth = scopeStack.depth();
+            if (depthLimit <= currentDepth) {
+                healthMetrics.onScopeStackOverflow();
+                log.debug("Scope depth limit exceeded ({}).  Returning NoopScope.", currentDepth);
+                return INVALID_SCOPE;
+            }
+        }
 
-    final ContinuableScope scope =
-        new ContinuableScope(this, context, source, asyncPropagation, createScopeState(context));
-    scopeStack.push(scope);
-    healthMetrics.onActivateScope();
+        assert span != null;
 
-    return scope;
-  }
+        // Inherit the async propagation from the active scope unless the value is overridden
+        boolean asyncPropagation = overrideAsyncPropagation
+                ? isAsyncPropagating
+                : top != null ? top.isAsyncPropagating() : DEFAULT_ASYNC_PROPAGATING;
 
-  private ContextScope activate(final Context context) {
-    ScopeStack scopeStack = scopeStack();
+        Context context = top != null ? top.context.with(span) : span;
 
-    final ContinuableScope top = scopeStack.top;
-    if (top != null && top.context.equals(context)) {
-      top.incrementReferences();
-      return top;
-    }
+        final ContinuableScope scope =
+                new ContinuableScope(this, context, source, asyncPropagation, createScopeState(context));
+        scopeStack.push(scope);
+        healthMetrics.onActivateScope();
 
-    // DQH - This check could go before the check above, since depth limit checking is fast
-    if (hasDepthLimit) {
-      final int currentDepth = scopeStack.depth();
-      if (depthLimit <= currentDepth) {
-        healthMetrics.onScopeStackOverflow();
-        log.debug("Scope depth limit exceeded ({}).  Returning NoopScope.", currentDepth);
-        return INVALID_SCOPE;
-      }
+        return scope;
     }
 
-    assert context != null;
-
-    // Inherit the async propagation from the active scope
-    boolean asyncPropagation = top != null ? top.isAsyncPropagating() : DEFAULT_ASYNC_PROPAGATING;
-
-    final ContinuableScope scope =
-        new ContinuableScope(this, context, CONTEXT, asyncPropagation, createScopeState(context));
-    scopeStack.push(scope);
-    healthMetrics.onActivateScope();
-
-    return scope;
-  }
-
-  /**
-   * Activates a scope for the given {@link ScopeContinuation}.
-   *
-   * @param continuation {@code null} if a continuation is re-used
-   */
-  ContinuableScope continueSpan(
-      final ScopeContinuation continuation, final Context context, final byte source) {
-    ScopeStack scopeStack = scopeStack();
-
-    // optimization: if the top scope is already keeping the same span alive
-    // then re-use that scope (avoids allocation) and cancel the continuation
-    final ContinuableScope top = scopeStack.top;
-    if (top != null && top.context.equals(context)) {
-      top.incrementReferences();
-      if (continuation != null) {
-        continuation.cancelFromContinuedScopeClose();
-      }
-      return top;
-    }
+    private ContextScope activate(final Context context) {
+        ScopeStack scopeStack = scopeStack();
 
-    Stateful scopeState = createScopeState(context);
-    final ContinuableScope scope;
-    if (continuation != null) {
-      scope = new ContinuingScope(this, context, source, true, continuation, scopeState);
-    } else {
-      scope = new ContinuableScope(this, context, source, true, scopeState);
+        final ContinuableScope top = scopeStack.top;
+        if (top != null && top.context.equals(context)) {
+            top.incrementReferences();
+            return top;
+        }
+
+        // DQH - This check could go before the check above, since depth limit checking is fast
+        if (hasDepthLimit) {
+            final int currentDepth = scopeStack.depth();
+            if (depthLimit <= currentDepth) {
+                healthMetrics.onScopeStackOverflow();
+                log.debug("Scope depth limit exceeded ({}).  Returning NoopScope.", currentDepth);
+                return INVALID_SCOPE;
+            }
+        }
+
+        assert context != null;
+
+        // Inherit the async propagation from the active scope
+        boolean asyncPropagation = top != null ? top.isAsyncPropagating() : DEFAULT_ASYNC_PROPAGATING;
+
+        final ContinuableScope scope =
+                new ContinuableScope(this, context, CONTEXT, asyncPropagation, createScopeState(context));
+        scopeStack.push(scope);
+        healthMetrics.onActivateScope();
+
+        return scope;
     }
-    scopeStack.push(scope);
 
-    return scope;
-  }
+    /**
+     * Activates a scope for the given {@link ScopeContinuation}.
+     *
+     * @param continuation {@code null} if a continuation is re-used
+     */
+    ContinuableScope continueSpan(final ScopeContinuation continuation, final Context context, final byte source) {
+        ScopeStack scopeStack = scopeStack();
+
+        // optimization: if the top scope is already keeping the same span alive
+        // then re-use that scope (avoids allocation) and cancel the continuation
+        final ContinuableScope top = scopeStack.top;
+        if (top != null && top.context.equals(context)) {
+            top.incrementReferences();
+            if (continuation != null) {
+                continuation.cancelFromContinuedScopeClose();
+            }
+            return top;
+        }
 
-  public boolean isAsyncPropagationEnabled() {
-    ContinuableScope activeScope = scopeStack().active();
-    return activeScope != null && activeScope.isAsyncPropagating();
-  }
+        Stateful scopeState = createScopeState(context);
+        final ContinuableScope scope;
+        if (continuation != null) {
+            scope = new ContinuingScope(this, context, source, true, continuation, scopeState);
+        } else {
+            scope = new ContinuableScope(this, context, source, true, scopeState);
+        }
+        scopeStack.push(scope);
 
-  public void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) {
-    ContinuableScope activeScope = scopeStack().active();
-    if (activeScope != null) {
-      activeScope.setAsyncPropagation(asyncPropagationEnabled);
+        return scope;
     }
-  }
-
-  public void closePrevious(final boolean finishSpan) {
-    ScopeStack scopeStack = scopeStack();
-
-    // close any immediately previous iteration scope
-    final ContinuableScope top = scopeStack.top;
-    if (top != null && top.source() == ITERATION) {
-      if (iterationKeepAlive > 0) { // skip depth check because cancelling is cheap
-        cancelRootIterationScopeCleanup(scopeStack, top);
-      }
-      top.close();
-      scopeStack.cleanup();
-      AgentSpan span = top.span();
-      if (finishSpan && span != null) {
-        span.finishWithEndToEnd();
-      }
-    } else if (top != null) {
-      log.debug(
-          SEND_TELEMETRY,
-          "Scope found at top of stack has source {} when we expect {}. Current span at the top of the stack {}.",
-          top.source(),
-          ITERATION,
-          top.span());
+
+    public boolean isAsyncPropagationEnabled() {
+        ContinuableScope activeScope = scopeStack().active();
+        return activeScope != null && activeScope.isAsyncPropagating();
     }
-  }
 
-  public ContextScope activateNext(final AgentSpan span) {
-    ScopeStack scopeStack = scopeStack();
+    public void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) {
+        ContinuableScope activeScope = scopeStack().active();
+        if (activeScope != null) {
+            activeScope.setAsyncPropagation(asyncPropagationEnabled);
+        }
+    }
 
-    final int currentDepth = scopeStack.depth();
-    if (hasDepthLimit && depthLimit <= currentDepth) {
-      healthMetrics.onScopeStackOverflow();
-      log.debug("Scope depth limit exceeded ({}).  Returning NoopScope.", currentDepth);
-      return INVALID_SCOPE;
+    public void closePrevious(final boolean finishSpan) {
+        ScopeStack scopeStack = scopeStack();
+
+        // close any immediately previous iteration scope
+        final ContinuableScope top = scopeStack.top;
+        if (top != null && top.source() == ITERATION) {
+            if (iterationKeepAlive > 0) { // skip depth check because cancelling is cheap
+                cancelRootIterationScopeCleanup(scopeStack, top);
+            }
+            top.close();
+            scopeStack.cleanup();
+            AgentSpan span = top.span();
+            if (finishSpan && span != null) {
+                span.finishWithEndToEnd();
+            }
+        } else if (top != null) {
+            log.debug(
+                    SEND_TELEMETRY,
+                    "Scope found at top of stack has source {} when we expect {}. Current span at the top of the stack {}.",
+                    top.source(),
+                    ITERATION,
+                    top.span());
+        }
     }
 
-    assert span != null;
+    public ContextScope activateNext(final AgentSpan span) {
+        ScopeStack scopeStack = scopeStack();
 
-    final ContinuableScope top = scopeStack.top;
+        final int currentDepth = scopeStack.depth();
+        if (hasDepthLimit && depthLimit <= currentDepth) {
+            healthMetrics.onScopeStackOverflow();
+            log.debug("Scope depth limit exceeded ({}).  Returning NoopScope.", currentDepth);
+            return INVALID_SCOPE;
+        }
 
-    boolean asyncPropagation = top != null ? top.isAsyncPropagating() : DEFAULT_ASYNC_PROPAGATING;
+        assert span != null;
 
-    final ContinuableScope scope =
-        new ContinuableScope(this, span, ITERATION, asyncPropagation, createScopeState(span));
+        final ContinuableScope top = scopeStack.top;
 
-    if (iterationKeepAlive > 0 && currentDepth == 0) {
-      // no surrounding scope to aid cleanup, so use background task instead
-      scheduleRootIterationScopeCleanup(scopeStack, scope);
-    }
+        boolean asyncPropagation = top != null ? top.isAsyncPropagating() : DEFAULT_ASYNC_PROPAGATING;
 
-    scopeStack.push(scope);
+        final ContinuableScope scope =
+                new ContinuableScope(this, span, ITERATION, asyncPropagation, createScopeState(span));
 
-    return scope;
-  }
+        if (iterationKeepAlive > 0 && currentDepth == 0) {
+            // no surrounding scope to aid cleanup, so use background task instead
+            scheduleRootIterationScopeCleanup(scopeStack, scope);
+        }
 
-  public ContextScope active() {
-    return scopeStack().active();
-  }
+        scopeStack.push(scope);
 
-  public void checkpointActiveForRollback() {
-    ContinuableScope active = scopeStack().active();
-    if (active != null) {
-      active.checkpoint();
-    }
-  }
-
-  public void rollbackActiveToCheckpoint() {
-    ContinuableScope active;
-    while ((active = scopeStack().active()) != null) {
-      if (active.rollback()) {
-        active.close();
-      } else {
-        break; // stop at the most recent checkpointed scope
-      }
+        return scope;
     }
-  }
-
-  public AgentSpan activeSpan() {
-    final ContinuableScope active = scopeStack().active();
-    return active == null ? null : active.span();
-  }
-
-  /** Attach a listener to scope activation events */
-  public void addScopeListener(final ScopeListener listener) {
-    if (listener instanceof ExtendedScopeListener) {
-      addExtendedScopeListener((ExtendedScopeListener) listener);
-    } else {
-      scopeListeners.add(listener);
-      log.debug("Added scope listener {}", listener);
-      AgentSpan activeSpan = activeSpan();
-      if (activeSpan != null) {
-        // Notify the listener about the currently active scope
-        listener.afterScopeActivated();
-      }
+
+    public ContextScope active() {
+        return scopeStack().active();
     }
-  }
-
-  private void addExtendedScopeListener(final ExtendedScopeListener listener) {
-    extendedScopeListeners.add(listener);
-    log.debug("Added scope listener {}", listener);
-    AgentSpan activeSpan = activeSpan();
-    if (activeSpan != null && activeSpan != noopSpan()) {
-      // Notify the listener about the currently active scope
-      listener.afterScopeActivated(activeSpan.getTraceId(), activeSpan.getSpanId());
+
+    public void checkpointActiveForRollback() {
+        ContinuableScope active = scopeStack().active();
+        if (active != null) {
+            active.checkpoint();
+        }
     }
-  }
 
-  private Stateful createScopeState(Context context) {
-    if (!profilingEnabled) {
-      return Stateful.DEFAULT;
+    public void rollbackActiveToCheckpoint() {
+        ContinuableScope active;
+        while ((active = scopeStack().active()) != null) {
+            if (active.rollback()) {
+                active.close();
+            } else {
+                break; // stop at the most recent checkpointed scope
+            }
+        }
     }
-    // currently this just manages things the profiler has to do per scope, but could be expanded
-    // to encapsulate other scope lifecycle activities
-    // FIXME DDSpanContext is always a ProfilerContext anyway...
-    AgentSpan span = AgentSpan.fromContext(context);
-    if (span != null && span.spanContext() instanceof ProfilerContext) {
-      return profilingContextIntegration.newScopeState((ProfilerContext) span.spanContext());
+
+    public AgentSpan activeSpan() {
+        final ContinuableScope active = scopeStack().active();
+        return active == null ? null : active.span();
     }
-    return Stateful.DEFAULT;
-  }
-
-  ScopeStack scopeStack() {
-    return this.tlsScopeStack.get();
-  }
-
-  public Context currentContext() {
-    final ContinuableScope active = scopeStack().active();
-    return active == null ? Context.root() : active.context;
-  }
-
-  public ContextScope attach(@Nonnull Context context) {
-    return activate(context);
-  }
-
-  public Context swap(@Nonnull Context context) {
-    ScopeStack oldStack = tlsScopeStack.get();
-    ContinuableScope oldScope = oldStack.top;
-
-    ScopeStack newStack;
-    ContinuableScope newScope;
-    if (context instanceof ScopeContext) {
-      // restore previously swapped context stack
-      newStack = ((ScopeContext) context).restore(profilingContextIntegration);
-      newScope = newStack.top;
-    } else if (context != Context.root()) {
-      // start a new stack and record the new context as active
-      newStack = new ScopeStack(profilingContextIntegration);
-      newScope = new ContinuableScope(this, context, CONTEXT, true, createScopeState(context));
-      newStack.top = newScope;
-    } else {
-      // start a new stack with no active context
-      newStack = new ScopeStack(profilingContextIntegration);
-      newScope = null;
+
+    /** Attach a listener to scope activation events */
+    public void addScopeListener(final ScopeListener listener) {
+        if (listener instanceof ExtendedScopeListener) {
+            addExtendedScopeListener((ExtendedScopeListener) listener);
+        } else {
+            scopeListeners.add(listener);
+            log.debug("Added scope listener {}", listener);
+            AgentSpan activeSpan = activeSpan();
+            if (activeSpan != null) {
+                // Notify the listener about the currently active scope
+                listener.afterScopeActivated();
+            }
+        }
     }
 
-    tlsScopeStack.set(newStack);
-    if (oldScope != newScope && newScope != null) {
-      newScope.beforeActivated();
-      newScope.afterActivated();
+    private void addExtendedScopeListener(final ExtendedScopeListener listener) {
+        extendedScopeListeners.add(listener);
+        log.debug("Added scope listener {}", listener);
+        AgentSpan activeSpan = activeSpan();
+        if (activeSpan != null && activeSpan != noopSpan()) {
+            // Notify the listener about the currently active scope
+            listener.afterScopeActivated(activeSpan.getTraceId(), activeSpan.getSpanId());
+        }
     }
 
-    return new ScopeContext(oldStack);
-  }
+    private Stateful createScopeState(Context context) {
+        if (!profilingEnabled) {
+            return Stateful.DEFAULT;
+        }
+        // currently this just manages things the profiler has to do per scope, but could be expanded
+        // to encapsulate other scope lifecycle activities
+        // FIXME DDSpanContext is always a ProfilerContext anyway...
+        AgentSpan span = AgentSpan.fromContext(context);
+        if (span != null && span.spanContext() instanceof ProfilerContext) {
+            return profilingContextIntegration.newScopeState((ProfilerContext) span.spanContext());
+        }
+        return Stateful.DEFAULT;
+    }
 
-  public ContextContinuation capture(@Nonnull Context context) {
-    if (context == Context.root()) {
-      return ROOT_CONTINUATION;
+    ScopeStack scopeStack() {
+        return this.tlsScopeStack.get();
     }
 
-    // respect async propagation flag for any capture requests
-    ContinuableScope activeScope = scopeStack().active();
-    if (activeScope != null && !activeScope.isAsyncPropagating()) {
-      return ROOT_CONTINUATION;
+    public Context currentContext() {
+        final ContinuableScope active = scopeStack().active();
+        return active == null ? Context.root() : active.context;
     }
-    AgentSpan span = AgentSpan.fromContext(context);
-    AgentTraceCollector traceCollector;
-    if (span != null) {
-      traceCollector = span.spanContext().getTraceCollector();
-    } else {
-      traceCollector = AgentTracer.NoopAgentTraceCollector.INSTANCE;
+
+    public ContextScope attach(@Nonnull Context context) {
+        return activate(context);
     }
-    return new ScopeContinuation(this, context, CONTEXT, traceCollector).register();
-  }
 
-  static final class ScopeStackThreadLocal extends ThreadLocal<ScopeStack> {
+    public Context swap(@Nonnull Context context) {
+        ScopeStack oldStack = tlsScopeStack.get();
+        ContinuableScope oldScope = oldStack.top;
+
+        ScopeStack newStack;
+        ContinuableScope newScope;
+        if (context instanceof ScopeContext) {
+            // restore previously swapped context stack
+            newStack = ((ScopeContext) context).restore(profilingContextIntegration);
+            newScope = newStack.top;
+        } else if (context != Context.root()) {
+            // start a new stack and record the new context as active
+            newStack = new ScopeStack(profilingContextIntegration);
+            newScope = new ContinuableScope(this, context, CONTEXT, true, createScopeState(context));
+            newStack.top = newScope;
+        } else {
+            // start a new stack with no active context
+            newStack = new ScopeStack(profilingContextIntegration);
+            newScope = null;
+        }
 
-    private final ProfilingContextIntegration profilingContextIntegration;
+        tlsScopeStack.set(newStack);
+        if (oldScope != newScope && newScope != null) {
+            newScope.beforeActivated();
+            newScope.afterActivated();
+        }
 
-    ScopeStackThreadLocal(ProfilingContextIntegration profilingContextIntegration) {
-      this.profilingContextIntegration = profilingContextIntegration;
+        return new ScopeContext(oldStack);
     }
 
-    @Override
-    protected ScopeStack initialValue() {
-      return new ScopeStack(profilingContextIntegration);
-    }
-  }
+    public ContextContinuation capture(@Nonnull Context context) {
+        if (context == Context.root()) {
+            return ROOT_CONTINUATION;
+        }
 
-  private void scheduleRootIterationScopeCleanup(ScopeStack scopeStack, ContinuableScope scope) {
-    if (rootIterationScopes == null) {
-      synchronized (this) {
-        if (rootIterationScopes == null) {
-          rootIterationScopes = new ConcurrentHashMap<>();
-          RootIterationCleaner.scheduleFor(rootIterationScopes);
+        // respect async propagation flag for any capture requests
+        ContinuableScope activeScope = scopeStack().active();
+        if (activeScope != null && !activeScope.isAsyncPropagating()) {
+            return ROOT_CONTINUATION;
         }
-      }
+        AgentSpan span = AgentSpan.fromContext(context);
+        AgentTraceCollector traceCollector;
+        if (span != null) {
+            traceCollector = span.spanContext().getTraceCollector();
+        } else {
+            traceCollector = AgentTracer.NoopAgentTraceCollector.INSTANCE;
+        }
+        return new ScopeContinuation(this, context, CONTEXT, traceCollector).register();
     }
-    rootIterationScopes.put(scopeStack, scope);
-  }
 
-  private void cancelRootIterationScopeCleanup(ScopeStack scopeStack, ContinuableScope scope) {
-    if (rootIterationScopes != null) {
-      rootIterationScopes.remove(scopeStack, scope);
-    }
-  }
-
-  /**
-   * Background task to clean-up scopes from overdue root iterations that have no surrounding scope.
-   */
-  private static final class RootIterationCleaner
-      implements AgentTaskScheduler.Task<Map<ScopeStack, ContinuableScope>> {
-    private static final RootIterationCleaner CLEANER = new RootIterationCleaner();
-
-    public static void scheduleFor(Map<ScopeStack, ContinuableScope> rootIterationScopes) {
-      long period = Math.min(iterationKeepAlive, 10_000);
-      AgentTaskScheduler.get()
-          .scheduleAtFixedRate(
-              CLEANER, rootIterationScopes, iterationKeepAlive, period, TimeUnit.MILLISECONDS);
-    }
+    static final class ScopeStackThreadLocal extends ThreadLocal<ScopeStack> {
 
-    @Override
-    public void run(Map<ScopeStack, ContinuableScope> rootIterationScopes) {
-      Iterator<Map.Entry<ScopeStack, ContinuableScope>> itr =
-          rootIterationScopes.entrySet().iterator();
+        private final ProfilingContextIntegration profilingContextIntegration;
 
-      long cutOff = System.currentTimeMillis() - iterationKeepAlive;
+        ScopeStackThreadLocal(ProfilingContextIntegration profilingContextIntegration) {
+            this.profilingContextIntegration = profilingContextIntegration;
+        }
 
-      while (itr.hasNext()) {
-        Map.Entry<ScopeStack, ContinuableScope> entry = itr.next();
+        @Override
+        protected ScopeStack initialValue() {
+            return new ScopeStack(profilingContextIntegration);
+        }
+    }
 
-        ScopeStack scopeStack = entry.getKey();
-        ContinuableScope rootScope = entry.getValue();
+    private void scheduleRootIterationScopeCleanup(ScopeStack scopeStack, ContinuableScope scope) {
+        if (rootIterationScopes == null) {
+            synchronized (this) {
+                if (rootIterationScopes == null) {
+                    rootIterationScopes = new ConcurrentHashMap<>();
+                    RootIterationCleaner.scheduleFor(rootIterationScopes);
+                }
+            }
+        }
+        rootIterationScopes.put(scopeStack, scope);
+    }
 
-        if (!rootScope.alive()) { // no need to track this anymore
-          itr.remove();
-        } else {
-          AgentSpan span = rootScope.span();
-          if (span != null && NANOSECONDS.toMillis(span.getStartTime()) < cutOff) {
-            // mark scope as overdue to allow cleanup and avoid further spans being attached
-            scopeStack.overdueRootScope = rootScope;
-            span.finishWithEndToEnd();
-            itr.remove();
-          }
+    private void cancelRootIterationScopeCleanup(ScopeStack scopeStack, ContinuableScope scope) {
+        if (rootIterationScopes != null) {
+            rootIterationScopes.remove(scopeStack, scope);
+        }
+    }
+
+    /**
+     * Background task to clean-up scopes from overdue root iterations that have no surrounding scope.
+     */
+    private static final class RootIterationCleaner
+            implements AgentTaskScheduler.Task<Map<ScopeStack, ContinuableScope>> {
+        private static final RootIterationCleaner CLEANER = new RootIterationCleaner();
+
+        public static void scheduleFor(Map<ScopeStack, ContinuableScope> rootIterationScopes) {
+            long period = Math.min(iterationKeepAlive, 10_000);
+            AgentTaskScheduler.get()
+                    .scheduleAtFixedRate(
+                            CLEANER, rootIterationScopes, iterationKeepAlive, period, TimeUnit.MILLISECONDS);
+        }
+
+        @Override
+        public void run(Map<ScopeStack, ContinuableScope> rootIterationScopes) {
+            Iterator<Map.Entry<ScopeStack, ContinuableScope>> itr =
+                    rootIterationScopes.entrySet().iterator();
+
+            long cutOff = System.currentTimeMillis() - iterationKeepAlive;
+
+            while (itr.hasNext()) {
+                Map.Entry<ScopeStack, ContinuableScope> entry = itr.next();
+
+                ScopeStack scopeStack = entry.getKey();
+                ContinuableScope rootScope = entry.getValue();
+
+                if (!rootScope.alive()) { // no need to track this anymore
+                    itr.remove();
+                } else {
+                    AgentSpan span = rootScope.span();
+                    if (span != null && NANOSECONDS.toMillis(span.getStartTime()) < cutOff) {
+                        // mark scope as overdue to allow cleanup and avoid further spans being attached
+                        scopeStack.overdueRootScope = rootScope;
+                        span.finishWithEndToEnd();
+                        itr.remove();
+                    }
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuingScope.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuingScope.java
index c5140bc2f35..9a56f0e7858 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuingScope.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuingScope.java
@@ -4,23 +4,23 @@
 import datadog.trace.api.Stateful;
 
 final class ContinuingScope extends ContinuableScope {
-  /** Continuation that created this scope. */
-  private final ScopeContinuation continuation;
+    /** Continuation that created this scope. */
+    private final ScopeContinuation continuation;
 
-  ContinuingScope(
-      final ContinuableScopeManager scopeManager,
-      final Context context,
-      final byte source,
-      final boolean isAsyncPropagating,
-      final ScopeContinuation continuation,
-      final Stateful scopeState) {
-    super(scopeManager, context, source, isAsyncPropagating, scopeState);
-    this.continuation = continuation;
-  }
+    ContinuingScope(
+            final ContinuableScopeManager scopeManager,
+            final Context context,
+            final byte source,
+            final boolean isAsyncPropagating,
+            final ScopeContinuation continuation,
+            final Stateful scopeState) {
+        super(scopeManager, context, source, isAsyncPropagating, scopeState);
+        this.continuation = continuation;
+    }
 
-  @Override
-  void cleanup(final ScopeStack scopeStack) {
-    super.cleanup(scopeStack);
-    continuation.cancelFromContinuedScopeClose();
-  }
+    @Override
+    void cleanup(final ScopeStack scopeStack) {
+        super.cleanup(scopeStack);
+        continuation.cancelFromContinuedScopeClose();
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeContext.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeContext.java
index 8919fae96f4..a2cb5c664e4 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeContext.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeContext.java
@@ -7,40 +7,40 @@
 
 /** Wraps a {@link ScopeStack} as a {@link Context} so it can be swapped back later. */
 final class ScopeContext implements Context {
-  private final Thread originalThread = Thread.currentThread();
-  private final ScopeStack scopeStack;
-  private final ContinuableScope parent;
-  private final ContinuableScope active;
-  private final Context context;
+    private final Thread originalThread = Thread.currentThread();
+    private final ScopeStack scopeStack;
+    private final ContinuableScope parent;
+    private final ContinuableScope active;
+    private final Context context;
 
-  ScopeContext(ScopeStack scopeStack) {
-    this(scopeStack, scopeStack.top != null ? scopeStack.top.context : Context.root());
-  }
+    ScopeContext(ScopeStack scopeStack) {
+        this(scopeStack, scopeStack.top != null ? scopeStack.top.context : Context.root());
+    }
 
-  private ScopeContext(ScopeStack scopeStack, Context context) {
-    this.scopeStack = scopeStack;
-    this.parent = scopeStack.parent();
-    this.active = scopeStack.active();
-    this.context = context;
-  }
+    private ScopeContext(ScopeStack scopeStack, Context context) {
+        this.scopeStack = scopeStack;
+        this.parent = scopeStack.parent();
+        this.active = scopeStack.active();
+        this.context = context;
+    }
 
-  ScopeStack restore(ProfilingContextIntegration profilingContextIntegration) {
-    // restore full stack on original thread, for other threads restore shallow copy
-    if (Thread.currentThread() == originalThread) {
-      return scopeStack;
-    } else {
-      return new ScopeStack(profilingContextIntegration, parent, active);
+    ScopeStack restore(ProfilingContextIntegration profilingContextIntegration) {
+        // restore full stack on original thread, for other threads restore shallow copy
+        if (Thread.currentThread() == originalThread) {
+            return scopeStack;
+        } else {
+            return new ScopeStack(profilingContextIntegration, parent, active);
+        }
     }
-  }
 
-  @Nullable
-  @Override
-  public <T> T get(ContextKey<T> key) {
-    return context.get(key);
-  }
+    @Nullable
+    @Override
+    public <T> T get(ContextKey<T> key) {
+        return context.get(key);
+    }
 
-  @Override
-  public <T> Context with(ContextKey<T> key, @Nullable T value) {
-    return context.with(key, value);
-  }
+    @Override
+    public <T> Context with(ContextKey<T> key, @Nullable T value) {
+        return context.with(key, value);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeContinuation.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeContinuation.java
index 8dc2cd10517..46dec84a9e9 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeContinuation.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeContinuation.java
@@ -16,113 +16,113 @@
  * references (using too much memory).
  */
 final class ScopeContinuation implements ContextContinuation {
-  private static final AtomicIntegerFieldUpdater<ScopeContinuation> COUNT =
-      AtomicIntegerFieldUpdater.newUpdater(ScopeContinuation.class, "count");
+    private static final AtomicIntegerFieldUpdater<ScopeContinuation> COUNT =
+            AtomicIntegerFieldUpdater.newUpdater(ScopeContinuation.class, "count");
 
-  // these boundaries were selected to allow for speculative counting and fuzzy checks
-  private static final int CANCELLED = Integer.MIN_VALUE >> 1;
-  private static final int HELD = (Integer.MAX_VALUE >> 1) + 1;
+    // these boundaries were selected to allow for speculative counting and fuzzy checks
+    private static final int CANCELLED = Integer.MIN_VALUE >> 1;
+    private static final int HELD = (Integer.MAX_VALUE >> 1) + 1;
 
-  final ContinuableScopeManager scopeManager;
-  final Context context;
-  final byte source;
-  final AgentTraceCollector traceCollector;
+    final ContinuableScopeManager scopeManager;
+    final Context context;
+    final byte source;
+    final AgentTraceCollector traceCollector;
 
-  /**
-   * When positive this reflects the number of outstanding activations as well as whether there is
-   * an active hold on the continuation:
-   *
-   * <table>
-   * <tr><th>Value</th> <th>Meaning</th></tr>
-   * <tr><td>0</td><td>Not held or activated</td></tr>
-   * <tr><td>1..HELD-1</td><td>Activated, not held</td></tr>
-   * <tr><td>HELD</td><td>Held, not yet activated</td></tr>
-   * <tr><td>HELD..MAX_INT</td><td>Activated and held</td></tr>
-   * </table>
-   *
-   * where HELD is at the mid-point between 1 and MAX_INT.
-   *
-   * <p>A negative value of CANCELLED reflects that the continuation has either been activated and
-   * all associated scopes are now closed, or it has been explicitly cancelled. This value was
-   * chosen to be half the size of MIN_INT to avoid speculative additions in {@link #resume()} from
-   * overflowing to a positive count.
-   */
-  private volatile int count = 0;
+    /**
+     * When positive this reflects the number of outstanding activations as well as whether there is
+     * an active hold on the continuation:
+     *
+     * <table>
+     * <tr><th>Value</th> <th>Meaning</th></tr>
+     * <tr><td>0</td><td>Not held or activated</td></tr>
+     * <tr><td>1..HELD-1</td><td>Activated, not held</td></tr>
+     * <tr><td>HELD</td><td>Held, not yet activated</td></tr>
+     * <tr><td>HELD..MAX_INT</td><td>Activated and held</td></tr>
+     * </table>
+     *
+     * where HELD is at the mid-point between 1 and MAX_INT.
+     *
+     * <p>A negative value of CANCELLED reflects that the continuation has either been activated and
+     * all associated scopes are now closed, or it has been explicitly cancelled. This value was
+     * chosen to be half the size of MIN_INT to avoid speculative additions in {@link #resume()} from
+     * overflowing to a positive count.
+     */
+    private volatile int count = 0;
 
-  ScopeContinuation(
-      final ContinuableScopeManager scopeManager,
-      final Context context,
-      final byte source,
-      final AgentTraceCollector traceCollector) {
-    this.scopeManager = scopeManager;
-    this.context = context;
-    this.source = source;
-    this.traceCollector = traceCollector;
-  }
-
-  ScopeContinuation register() {
-    traceCollector.registerContinuation(this);
-    scopeManager.healthMetrics.onCaptureContinuation();
-    return this;
-  }
+    ScopeContinuation(
+            final ContinuableScopeManager scopeManager,
+            final Context context,
+            final byte source,
+            final AgentTraceCollector traceCollector) {
+        this.scopeManager = scopeManager;
+        this.context = context;
+        this.source = source;
+        this.traceCollector = traceCollector;
+    }
 
-  @Override
-  public ScopeContinuation hold() {
-    // update initial count to record that this continuation has a hold
-    COUNT.compareAndSet(this, 0, HELD);
-    return this;
-  }
+    ScopeContinuation register() {
+        traceCollector.registerContinuation(this);
+        scopeManager.healthMetrics.onCaptureContinuation();
+        return this;
+    }
 
-  @Override
-  public ContextScope resume() {
-    if (COUNT.incrementAndGet(this) > 0) {
-      // speculative update succeeded, continuation can be activated
-      return scopeManager.continueSpan(this, context, source);
-    } else {
-      // continuation cancelled or too many activations; rollback count
-      COUNT.decrementAndGet(this);
-      return NoopScope.INSTANCE;
+    @Override
+    public ScopeContinuation hold() {
+        // update initial count to record that this continuation has a hold
+        COUNT.compareAndSet(this, 0, HELD);
+        return this;
     }
-  }
 
-  @Override
-  public Context context() {
-    return context;
-  }
+    @Override
+    public ContextScope resume() {
+        if (COUNT.incrementAndGet(this) > 0) {
+            // speculative update succeeded, continuation can be activated
+            return scopeManager.continueSpan(this, context, source);
+        } else {
+            // continuation cancelled or too many activations; rollback count
+            COUNT.decrementAndGet(this);
+            return NoopScope.INSTANCE;
+        }
+    }
 
-  @Override
-  public void release() {
-    int current = count;
-    while (current >= HELD) {
-      // remove the hold on this continuation by removing the offset
-      COUNT.compareAndSet(this, current, current - HELD);
-      current = count;
+    @Override
+    public Context context() {
+        return context;
     }
-    while (current == 0) {
-      // no outstanding activations and hold has been removed
-      if (COUNT.compareAndSet(this, current, CANCELLED)) {
-        traceCollector.removeContinuation(this);
-        scopeManager.healthMetrics.onFinishContinuation();
-        return;
-      }
-      current = count;
+
+    @Override
+    public void release() {
+        int current = count;
+        while (current >= HELD) {
+            // remove the hold on this continuation by removing the offset
+            COUNT.compareAndSet(this, current, current - HELD);
+            current = count;
+        }
+        while (current == 0) {
+            // no outstanding activations and hold has been removed
+            if (COUNT.compareAndSet(this, current, CANCELLED)) {
+                traceCollector.removeContinuation(this);
+                scopeManager.healthMetrics.onFinishContinuation();
+                return;
+            }
+            current = count;
+        }
+        scopeManager.healthMetrics.onCancelContinuation();
     }
-    scopeManager.healthMetrics.onCancelContinuation();
-  }
 
-  void cancelFromContinuedScopeClose() {
-    if (COUNT.compareAndSet(this, 1, CANCELLED)) {
-      // fast path: only one activation of the continuation (no hold)
-      traceCollector.removeContinuation(this);
-      scopeManager.healthMetrics.onFinishContinuation();
-    } else if (COUNT.decrementAndGet(this) == 0) {
-      // slow path: multiple activations, all have now closed (no hold)
-      release();
-    } /* else there are outstanding activations or hold is in place */
-  }
+    void cancelFromContinuedScopeClose() {
+        if (COUNT.compareAndSet(this, 1, CANCELLED)) {
+            // fast path: only one activation of the continuation (no hold)
+            traceCollector.removeContinuation(this);
+            scopeManager.healthMetrics.onFinishContinuation();
+        } else if (COUNT.decrementAndGet(this) == 0) {
+            // slow path: multiple activations, all have now closed (no hold)
+            release();
+        } /* else there are outstanding activations or hold is in place */
+    }
 
-  @Override
-  public String toString() {
-    return getClass().getSimpleName() + "@" + Integer.toHexString(hashCode()) + "->" + context;
-  }
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "@" + Integer.toHexString(hashCode()) + "->" + context;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeStack.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeStack.java
index 84223a267d2..03ad046cd24 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeStack.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeStack.java
@@ -12,140 +12,138 @@
  */
 final class ScopeStack {
 
-  private final ProfilingContextIntegration profilingContextIntegration;
-  private final ArrayDeque<ContinuableScope> stack = new ArrayDeque<>(); // previous scopes
-
-  ContinuableScope top; // current scope
-
-  // set by background task when a root iteration scope remains unclosed for too long
-  volatile ContinuableScope overdueRootScope;
-
-  ScopeStack(ProfilingContextIntegration profilingContextIntegration) {
-    this.profilingContextIntegration = profilingContextIntegration;
-  }
-
-  /** Restore a shallow stack for async propagation purposes. */
-  ScopeStack(
-      ProfilingContextIntegration profilingContextIntegration,
-      ContinuableScope parent,
-      ContinuableScope active) {
-    this(profilingContextIntegration);
-    if (parent != null) {
-      stack.push(parent);
+    private final ProfilingContextIntegration profilingContextIntegration;
+    private final ArrayDeque<ContinuableScope> stack = new ArrayDeque<>(); // previous scopes
+
+    ContinuableScope top; // current scope
+
+    // set by background task when a root iteration scope remains unclosed for too long
+    volatile ContinuableScope overdueRootScope;
+
+    ScopeStack(ProfilingContextIntegration profilingContextIntegration) {
+        this.profilingContextIntegration = profilingContextIntegration;
     }
-    top = active;
-  }
-
-  ContinuableScope active() {
-    // avoid attaching further spans to the root scope when it's been marked as overdue
-    return top != overdueRootScope ? top : null;
-  }
-
-  ContinuableScope parent() {
-    return stack.peek();
-  }
-
-  /** Removes and closes all scopes up to the nearest live scope */
-  void cleanup() {
-    ContinuableScope curScope = top;
-    boolean changedTop = false;
-    while (curScope != null && !curScope.alive()) {
-      // no longer alive -- trigger listener & null out
-      curScope.onProperClose();
-      changedTop = true;
-      curScope = stack.poll();
+
+    /** Restore a shallow stack for async propagation purposes. */
+    ScopeStack(
+            ProfilingContextIntegration profilingContextIntegration, ContinuableScope parent, ContinuableScope active) {
+        this(profilingContextIntegration);
+        if (parent != null) {
+            stack.push(parent);
+        }
+        top = active;
     }
-    if (curScope != null && curScope == overdueRootScope) {
-      // we know this scope is the last on the stack and is overdue
-      curScope.onProperClose();
-      overdueRootScope = null;
-      top = null;
-    } else if (changedTop) {
-      top = curScope;
-      if (curScope != null) {
-        curScope.beforeActivated();
-        curScope.afterActivated();
-      }
+
+    ContinuableScope active() {
+        // avoid attaching further spans to the root scope when it's been marked as overdue
+        return top != overdueRootScope ? top : null;
     }
-    if (top == null) {
-      onBecomeEmpty();
+
+    ContinuableScope parent() {
+        return stack.peek();
     }
-  }
-
-  /** Marks a new scope as current, pushing the previous onto the stack */
-  void push(final ContinuableScope scope) {
-    scope.beforeActivated();
-    if (top != null) {
-      stack.push(top);
-    } else {
-      onBecomeNonEmpty();
+
+    /** Removes and closes all scopes up to the nearest live scope */
+    void cleanup() {
+        ContinuableScope curScope = top;
+        boolean changedTop = false;
+        while (curScope != null && !curScope.alive()) {
+            // no longer alive -- trigger listener & null out
+            curScope.onProperClose();
+            changedTop = true;
+            curScope = stack.poll();
+        }
+        if (curScope != null && curScope == overdueRootScope) {
+            // we know this scope is the last on the stack and is overdue
+            curScope.onProperClose();
+            overdueRootScope = null;
+            top = null;
+        } else if (changedTop) {
+            top = curScope;
+            if (curScope != null) {
+                curScope.beforeActivated();
+                curScope.afterActivated();
+            }
+        }
+        if (top == null) {
+            onBecomeEmpty();
+        }
     }
-    top = scope;
-    scope.afterActivated();
-  }
-
-  /** Fast check to see if the expectedScope is on top */
-  boolean checkTop(final ContinuableScope expectedScope) {
-    return expectedScope.equals(top);
-  }
-
-  /**
-   * Slower check to see if overdue scopes ahead of the expected scope are all ITERATION scopes.
-   * These represent iterations that are now out-of-scope and can be finished ready for cleanup.
-   */
-  final boolean checkOverdueScopes(final ContinuableScope expectedScope) {
-    // we already know 'top' isn't the expected scope, so just need to check its source
-    if (top == null || top.source() != ITERATION) {
-      return false;
+
+    /** Marks a new scope as current, pushing the previous onto the stack */
+    void push(final ContinuableScope scope) {
+        scope.beforeActivated();
+        if (top != null) {
+            stack.push(top);
+        } else {
+            onBecomeNonEmpty();
+        }
+        top = scope;
+        scope.afterActivated();
     }
-    // avoid calling close() as we're already in that method, instead just clear any
-    // remaining references so the scope gets removed in the subsequent cleanup() call
-    top.clearReferences();
-    AgentSpan span = top.span();
-    if (span != null) {
-      span.finishWithEndToEnd();
+
+    /** Fast check to see if the expectedScope is on top */
+    boolean checkTop(final ContinuableScope expectedScope) {
+        return expectedScope.equals(top);
     }
-    // now do the same for any previous iteration scopes ahead of the expected scope
-    for (ContinuableScope scope : stack) {
-      if (scope.source() != ITERATION) {
-        return expectedScope.equals(scope);
-      } else {
-        scope.clearReferences();
-        span = scope.span();
+
+    /**
+     * Slower check to see if overdue scopes ahead of the expected scope are all ITERATION scopes.
+     * These represent iterations that are now out-of-scope and can be finished ready for cleanup.
+     */
+    final boolean checkOverdueScopes(final ContinuableScope expectedScope) {
+        // we already know 'top' isn't the expected scope, so just need to check its source
+        if (top == null || top.source() != ITERATION) {
+            return false;
+        }
+        // avoid calling close() as we're already in that method, instead just clear any
+        // remaining references so the scope gets removed in the subsequent cleanup() call
+        top.clearReferences();
+        AgentSpan span = top.span();
         if (span != null) {
-          span.finishWithEndToEnd();
+            span.finishWithEndToEnd();
         }
-      }
+        // now do the same for any previous iteration scopes ahead of the expected scope
+        for (ContinuableScope scope : stack) {
+            if (scope.source() != ITERATION) {
+                return expectedScope.equals(scope);
+            } else {
+                scope.clearReferences();
+                span = scope.span();
+                if (span != null) {
+                    span.finishWithEndToEnd();
+                }
+            }
+        }
+        return false; // we didn't find the expected scope
+    }
+
+    /** Returns the current depth, including the top scope */
+    int depth() {
+        return top != null ? 1 + stack.size() : 0;
     }
-    return false; // we didn't find the expected scope
-  }
-
-  /** Returns the current depth, including the top scope */
-  int depth() {
-    return top != null ? 1 + stack.size() : 0;
-  }
-
-  // DQH - regrettably needed for pre-existing tests
-  void clear() {
-    stack.clear();
-    top = null;
-  }
-
-  /** Notifies profiler that this thread has a context now */
-  private void onBecomeNonEmpty() {
-    try {
-      profilingContextIntegration.onAttach();
-    } catch (Throwable e) {
-      ContinuableScopeManager.ratelimitedLog.warn("Unexpected profiling exception", e);
+
+    // DQH - regrettably needed for pre-existing tests
+    void clear() {
+        stack.clear();
+        top = null;
+    }
+
+    /** Notifies profiler that this thread has a context now */
+    private void onBecomeNonEmpty() {
+        try {
+            profilingContextIntegration.onAttach();
+        } catch (Throwable e) {
+            ContinuableScopeManager.ratelimitedLog.warn("Unexpected profiling exception", e);
+        }
     }
-  }
-
-  /** Notifies profiler that this thread no longer has a context */
-  private void onBecomeEmpty() {
-    try {
-      profilingContextIntegration.onDetach();
-    } catch (Throwable e) {
-      ContinuableScopeManager.ratelimitedLog.warn("Unexpected profiling exception", e);
+
+    /** Notifies profiler that this thread no longer has a context */
+    private void onBecomeEmpty() {
+        try {
+            profilingContextIntegration.onDetach();
+        } catch (Throwable e) {
+            ContinuableScopeManager.ratelimitedLog.warn("Unexpected profiling exception", e);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/servicediscovery/ForeignMemoryWriter.java b/dd-trace-core/src/main/java/datadog/trace/core/servicediscovery/ForeignMemoryWriter.java
index a74ba71bde8..3cdb0251da7 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/servicediscovery/ForeignMemoryWriter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/servicediscovery/ForeignMemoryWriter.java
@@ -2,5 +2,5 @@
 
 @FunctionalInterface
 public interface ForeignMemoryWriter {
-  void write(String fileName, byte[] payload);
+    void write(String fileName, byte[] payload);
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/servicediscovery/ForeignMemoryWriterFactory.java b/dd-trace-core/src/main/java/datadog/trace/core/servicediscovery/ForeignMemoryWriterFactory.java
index 6a8ace43b2e..f779e17a027 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/servicediscovery/ForeignMemoryWriterFactory.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/servicediscovery/ForeignMemoryWriterFactory.java
@@ -11,41 +11,37 @@
 import org.slf4j.LoggerFactory;
 
 public final class ForeignMemoryWriterFactory implements Supplier<ForeignMemoryWriter> {
-  private static final Logger log = LoggerFactory.getLogger(ForeignMemoryWriterFactory.class);
+    private static final Logger log = LoggerFactory.getLogger(ForeignMemoryWriterFactory.class);
 
-  @Override
-  public ForeignMemoryWriter get() {
-    switch (OperatingSystem.type()) {
-      case LINUX:
-        return createForLinux();
-      default:
-        return null;
+    @Override
+    public ForeignMemoryWriter get() {
+        switch (OperatingSystem.type()) {
+            case LINUX:
+                return createForLinux();
+            default:
+                return null;
+        }
     }
-  }
 
-  @SuppressForbidden // intentional Class.forName to force loading
-  private ForeignMemoryWriter createForLinux() {
-    try {
-      // first check if the arch is supported
-      if (OperatingSystem.architecture() == OperatingSystem.Architecture.UNKNOWN) {
-        log.debug(
-            SEND_TELEMETRY,
-            "service discovery not supported for arch={}",
-            SystemProperties.get("os.arch"));
-        return null;
-      }
-      final Class<?> memFdClass;
-      if (JavaVirtualMachine.isJavaVersionAtLeast(22)) {
-        memFdClass =
-            Class.forName("datadog.trace.agent.tooling.servicediscovery.MemFDUnixWriterFFM");
-      } else {
-        memFdClass =
-            Class.forName("datadog.trace.agent.tooling.servicediscovery.MemFDUnixWriterJNA");
-      }
-      return (ForeignMemoryWriter) memFdClass.newInstance();
-    } catch (Throwable t) {
-      log.debug("Unable to instantiate foreign memory writer", t);
-      return null;
+    @SuppressForbidden // intentional Class.forName to force loading
+    private ForeignMemoryWriter createForLinux() {
+        try {
+            // first check if the arch is supported
+            if (OperatingSystem.architecture() == OperatingSystem.Architecture.UNKNOWN) {
+                log.debug(
+                        SEND_TELEMETRY, "service discovery not supported for arch={}", SystemProperties.get("os.arch"));
+                return null;
+            }
+            final Class<?> memFdClass;
+            if (JavaVirtualMachine.isJavaVersionAtLeast(22)) {
+                memFdClass = Class.forName("datadog.trace.agent.tooling.servicediscovery.MemFDUnixWriterFFM");
+            } else {
+                memFdClass = Class.forName("datadog.trace.agent.tooling.servicediscovery.MemFDUnixWriterJNA");
+            }
+            return (ForeignMemoryWriter) memFdClass.newInstance();
+        } catch (Throwable t) {
+            log.debug("Unable to instantiate foreign memory writer", t);
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/servicediscovery/ServiceDiscovery.java b/dd-trace-core/src/main/java/datadog/trace/core/servicediscovery/ServiceDiscovery.java
index 7b2c4c1737f..73ceaaf1808 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/servicediscovery/ServiceDiscovery.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/servicediscovery/ServiceDiscovery.java
@@ -15,105 +15,104 @@
 import org.slf4j.LoggerFactory;
 
 public class ServiceDiscovery {
-  private static final Logger log = LoggerFactory.getLogger(ServiceDiscovery.class);
-
-  private final ForeignMemoryWriter foreignMemoryWriter;
-
-  public ServiceDiscovery(ForeignMemoryWriter foreignMemoryWriter) {
-    this.foreignMemoryWriter = foreignMemoryWriter;
-  }
-
-  public void writeTracerMetadata(Config config) {
-    try {
-      byte[] payload =
-          ServiceDiscovery.encodePayload(
-              TracerVersion.TRACER_VERSION,
-              config.getHostName(),
-              config.isAppLogsCollectionEnabled(),
-              config.getRuntimeId(),
-              config.getServiceName(),
-              config.getEnv(),
-              config.getVersion(),
-              ProcessTags.getTagsForSerialization(),
-              ContainerInfo.get().getContainerId());
-
-      foreignMemoryWriter.write(generateFileName(), payload);
-    } catch (Throwable t) {
-      log.debug("service discovery memfd write failed", t);
-    }
-  }
-
-  static String generateFileName() {
-    String suffix = RandomUtils.randomUUID().toString().substring(0, 8);
-    return "datadog-tracer-info-" + suffix;
-  }
-
-  static byte[] encodePayload(
-      String tracerVersion,
-      String hostname,
-      boolean appLogsCollectionEnabled,
-      String runtimeID,
-      String service,
-      String env,
-      String serviceVersion,
-      UTF8BytesString processTags,
-      String containerID) {
-    GrowableBuffer buffer = new GrowableBuffer(1024);
-    MsgPackWriter writer = new MsgPackWriter(buffer);
-
-    int mapElements = 5;
-    mapElements += (runtimeID != null && !runtimeID.isEmpty()) ? 1 : 0;
-    mapElements += (service != null && !service.isEmpty()) ? 1 : 0;
-    mapElements += (env != null && !env.isEmpty()) ? 1 : 0;
-    mapElements += (serviceVersion != null && !serviceVersion.isEmpty()) ? 1 : 0;
-    mapElements += (processTags != null && processTags.length() > 0) ? 1 : 0;
-    mapElements += (containerID != null && !containerID.isEmpty()) ? 1 : 0;
-
-    writer.startMap(mapElements);
-
-    writer.writeUTF8("schema_version".getBytes(ISO_8859_1));
-    writer.writeInt(2);
-
-    writer.writeUTF8("tracer_language".getBytes(ISO_8859_1));
-    writer.writeUTF8("java".getBytes(ISO_8859_1));
-
-    writer.writeUTF8("tracer_version".getBytes(ISO_8859_1));
-    writer.writeUTF8(tracerVersion.getBytes(ISO_8859_1));
-
-    writer.writeUTF8("hostname".getBytes(ISO_8859_1));
-    writer.writeUTF8(hostname.getBytes(ISO_8859_1));
-
-    writer.writeUTF8("logs_collected".getBytes(ISO_8859_1));
-    writer.writeBoolean(appLogsCollectionEnabled);
-
-    if (runtimeID != null && !runtimeID.isEmpty()) {
-      writer.writeUTF8("runtime_id".getBytes(ISO_8859_1));
-      writer.writeUTF8(runtimeID.getBytes(ISO_8859_1));
-    }
-    if (service != null && !service.isEmpty()) {
-      writer.writeUTF8("service_name".getBytes(ISO_8859_1));
-      writer.writeUTF8(service.getBytes(ISO_8859_1));
-    }
-    if (env != null && !env.isEmpty()) {
-      writer.writeUTF8("service_env".getBytes(ISO_8859_1));
-      writer.writeUTF8(env.getBytes(ISO_8859_1));
-    }
-    if (serviceVersion != null && !serviceVersion.isEmpty()) {
-      writer.writeUTF8("service_version".getBytes(ISO_8859_1));
-      writer.writeUTF8(serviceVersion.getBytes(ISO_8859_1));
+    private static final Logger log = LoggerFactory.getLogger(ServiceDiscovery.class);
+
+    private final ForeignMemoryWriter foreignMemoryWriter;
+
+    public ServiceDiscovery(ForeignMemoryWriter foreignMemoryWriter) {
+        this.foreignMemoryWriter = foreignMemoryWriter;
     }
-    if (processTags != null && processTags.length() > 0) {
-      writer.writeUTF8("process_tags".getBytes(ISO_8859_1));
-      writer.writeUTF8(processTags);
+
+    public void writeTracerMetadata(Config config) {
+        try {
+            byte[] payload = ServiceDiscovery.encodePayload(
+                    TracerVersion.TRACER_VERSION,
+                    config.getHostName(),
+                    config.isAppLogsCollectionEnabled(),
+                    config.getRuntimeId(),
+                    config.getServiceName(),
+                    config.getEnv(),
+                    config.getVersion(),
+                    ProcessTags.getTagsForSerialization(),
+                    ContainerInfo.get().getContainerId());
+
+            foreignMemoryWriter.write(generateFileName(), payload);
+        } catch (Throwable t) {
+            log.debug("service discovery memfd write failed", t);
+        }
     }
-    if (containerID != null && !containerID.isEmpty()) {
-      writer.writeUTF8("container_id".getBytes(ISO_8859_1));
-      writer.writeUTF8(containerID.getBytes(ISO_8859_1));
+
+    static String generateFileName() {
+        String suffix = RandomUtils.randomUUID().toString().substring(0, 8);
+        return "datadog-tracer-info-" + suffix;
     }
 
-    ByteBuffer byteBuffer = buffer.slice();
-    byte[] bytes = new byte[byteBuffer.remaining()];
-    byteBuffer.get(bytes);
-    return bytes;
-  }
+    static byte[] encodePayload(
+            String tracerVersion,
+            String hostname,
+            boolean appLogsCollectionEnabled,
+            String runtimeID,
+            String service,
+            String env,
+            String serviceVersion,
+            UTF8BytesString processTags,
+            String containerID) {
+        GrowableBuffer buffer = new GrowableBuffer(1024);
+        MsgPackWriter writer = new MsgPackWriter(buffer);
+
+        int mapElements = 5;
+        mapElements += (runtimeID != null && !runtimeID.isEmpty()) ? 1 : 0;
+        mapElements += (service != null && !service.isEmpty()) ? 1 : 0;
+        mapElements += (env != null && !env.isEmpty()) ? 1 : 0;
+        mapElements += (serviceVersion != null && !serviceVersion.isEmpty()) ? 1 : 0;
+        mapElements += (processTags != null && processTags.length() > 0) ? 1 : 0;
+        mapElements += (containerID != null && !containerID.isEmpty()) ? 1 : 0;
+
+        writer.startMap(mapElements);
+
+        writer.writeUTF8("schema_version".getBytes(ISO_8859_1));
+        writer.writeInt(2);
+
+        writer.writeUTF8("tracer_language".getBytes(ISO_8859_1));
+        writer.writeUTF8("java".getBytes(ISO_8859_1));
+
+        writer.writeUTF8("tracer_version".getBytes(ISO_8859_1));
+        writer.writeUTF8(tracerVersion.getBytes(ISO_8859_1));
+
+        writer.writeUTF8("hostname".getBytes(ISO_8859_1));
+        writer.writeUTF8(hostname.getBytes(ISO_8859_1));
+
+        writer.writeUTF8("logs_collected".getBytes(ISO_8859_1));
+        writer.writeBoolean(appLogsCollectionEnabled);
+
+        if (runtimeID != null && !runtimeID.isEmpty()) {
+            writer.writeUTF8("runtime_id".getBytes(ISO_8859_1));
+            writer.writeUTF8(runtimeID.getBytes(ISO_8859_1));
+        }
+        if (service != null && !service.isEmpty()) {
+            writer.writeUTF8("service_name".getBytes(ISO_8859_1));
+            writer.writeUTF8(service.getBytes(ISO_8859_1));
+        }
+        if (env != null && !env.isEmpty()) {
+            writer.writeUTF8("service_env".getBytes(ISO_8859_1));
+            writer.writeUTF8(env.getBytes(ISO_8859_1));
+        }
+        if (serviceVersion != null && !serviceVersion.isEmpty()) {
+            writer.writeUTF8("service_version".getBytes(ISO_8859_1));
+            writer.writeUTF8(serviceVersion.getBytes(ISO_8859_1));
+        }
+        if (processTags != null && processTags.length() > 0) {
+            writer.writeUTF8("process_tags".getBytes(ISO_8859_1));
+            writer.writeUTF8(processTags);
+        }
+        if (containerID != null && !containerID.isEmpty()) {
+            writer.writeUTF8("container_id".getBytes(ISO_8859_1));
+            writer.writeUTF8(containerID.getBytes(ISO_8859_1));
+        }
+
+        ByteBuffer byteBuffer = buffer.slice();
+        byte[] bytes = new byte[byteBuffer.remaining()];
+        byteBuffer.get(bytes);
+        return bytes;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/taginterceptor/RuleFlags.java b/dd-trace-core/src/main/java/datadog/trace/core/taginterceptor/RuleFlags.java
index 3dce57b3054..a78020ee6c8 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/taginterceptor/RuleFlags.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/taginterceptor/RuleFlags.java
@@ -4,53 +4,53 @@
 
 public class RuleFlags {
 
-  public enum Feature {
-    // These names all derive from the simple class names which
-    // were exposed as config at some point in the past.
-    RESOURCE_NAME("ResourceNameRule"),
-    URL_AS_RESOURCE_NAME("URLAsResourceNameRule"),
-    STATUS_404("Status404Rule"),
-    STATUS_404_DECORATOR("Status404Decorator"),
-    DB_STATEMENT("DBStatementRule"),
-    FORCE_MANUAL_DROP("ForceManualDropTagInterceptor"),
-    FORCE_MANUAL_KEEP("ForceManualKeepTagInterceptor"),
-    FORCE_SAMPLING_PRIORITY("ForceSamplingPriorityTagInterceptor"),
-    PEER_SERVICE("PeerServiceTagInterceptor", false),
-    SERVICE_NAME("ServiceNameTagInterceptor"),
-    SERVLET_CONTEXT("ServletContextTagInterceptor");
-
-    private final String name;
-
-    private final boolean defaultEnabled;
-
-    Feature(String name) {
-      this.name = name;
-      this.defaultEnabled = true;
+    public enum Feature {
+        // These names all derive from the simple class names which
+        // were exposed as config at some point in the past.
+        RESOURCE_NAME("ResourceNameRule"),
+        URL_AS_RESOURCE_NAME("URLAsResourceNameRule"),
+        STATUS_404("Status404Rule"),
+        STATUS_404_DECORATOR("Status404Decorator"),
+        DB_STATEMENT("DBStatementRule"),
+        FORCE_MANUAL_DROP("ForceManualDropTagInterceptor"),
+        FORCE_MANUAL_KEEP("ForceManualKeepTagInterceptor"),
+        FORCE_SAMPLING_PRIORITY("ForceSamplingPriorityTagInterceptor"),
+        PEER_SERVICE("PeerServiceTagInterceptor", false),
+        SERVICE_NAME("ServiceNameTagInterceptor"),
+        SERVLET_CONTEXT("ServletContextTagInterceptor");
+
+        private final String name;
+
+        private final boolean defaultEnabled;
+
+        Feature(String name) {
+            this.name = name;
+            this.defaultEnabled = true;
+        }
+
+        Feature(String name, boolean defaultEnabled) {
+            this.name = name;
+            this.defaultEnabled = defaultEnabled;
+        }
     }
 
-    Feature(String name, boolean defaultEnabled) {
-      this.name = name;
-      this.defaultEnabled = defaultEnabled;
-    }
-  }
-
-  private final boolean[] flags;
+    private final boolean[] flags;
 
-  public RuleFlags() {
-    this(Config.get());
-  }
+    public RuleFlags() {
+        this(Config.get());
+    }
 
-  public RuleFlags(Config config) {
-    Feature[] features = Feature.values();
-    this.flags = new boolean[features.length];
-    for (Feature feature : features) {
-      if (config.isRuleEnabled(feature.name, feature.defaultEnabled)) {
-        flags[feature.ordinal()] = true;
-      }
+    public RuleFlags(Config config) {
+        Feature[] features = Feature.values();
+        this.flags = new boolean[features.length];
+        for (Feature feature : features) {
+            if (config.isRuleEnabled(feature.name, feature.defaultEnabled)) {
+                flags[feature.ordinal()] = true;
+            }
+        }
     }
-  }
 
-  public boolean isEnabled(Feature feature) {
-    return flags[feature.ordinal()];
-  }
+    public boolean isEnabled(Feature feature) {
+        return flags[feature.ordinal()];
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/taginterceptor/TagInterceptor.java b/dd-trace-core/src/main/java/datadog/trace/core/taginterceptor/TagInterceptor.java
index d81a9cc8441..b5f50c7569b 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/taginterceptor/TagInterceptor.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/taginterceptor/TagInterceptor.java
@@ -44,385 +44,377 @@
 
 public class TagInterceptor {
 
-  private static final UTF8BytesString NOT_FOUND_RESOURCE_NAME = UTF8BytesString.create("404");
-
-  private final RuleFlags ruleFlags;
-  private final boolean isServiceNameSetByUser;
-  private final boolean splitByServletContext;
-  private final String inferredServiceName;
-  private final Set<String> splitServiceTags;
-
-  private final boolean shouldSet404ResourceName;
-  private final boolean shouldSetUrlResourceAsName;
-  private final boolean jeeSplitByDeployment;
-
-  public TagInterceptor(RuleFlags ruleFlags) {
-    this(
-        Config.get().isServiceNameSetByUser(),
-        CapturedEnvironment.get().getProperties().get(GeneralConfig.SERVICE_NAME),
-        Config.get().getSplitByTags(),
-        ruleFlags,
-        Config.get().isJeeSplitByDeployment());
-  }
-
-  public TagInterceptor(
-      boolean isServiceNameSetByUser,
-      String inferredServiceName,
-      Set<String> splitServiceTags,
-      RuleFlags ruleFlags,
-      boolean jeeSplitByDeployment) {
-    this.isServiceNameSetByUser = isServiceNameSetByUser;
-    this.inferredServiceName = inferredServiceName;
-    this.splitServiceTags = splitServiceTags;
-    this.ruleFlags = ruleFlags;
-    splitByServletContext = splitServiceTags.contains(SERVLET_CONTEXT);
-
-    shouldSet404ResourceName =
-        ruleFlags.isEnabled(URL_AS_RESOURCE_NAME)
-            && ruleFlags.isEnabled(STATUS_404)
-            && ruleFlags.isEnabled(STATUS_404_DECORATOR);
-    shouldSetUrlResourceAsName = ruleFlags.isEnabled(URL_AS_RESOURCE_NAME);
-    this.jeeSplitByDeployment = jeeSplitByDeployment;
-  }
-
-  public boolean needsIntercept(TagMap map) {
-    for (TagMap.EntryReader entry : map) {
-      if (needsIntercept(entry.tag())) return true;
+    private static final UTF8BytesString NOT_FOUND_RESOURCE_NAME = UTF8BytesString.create("404");
+
+    private final RuleFlags ruleFlags;
+    private final boolean isServiceNameSetByUser;
+    private final boolean splitByServletContext;
+    private final String inferredServiceName;
+    private final Set<String> splitServiceTags;
+
+    private final boolean shouldSet404ResourceName;
+    private final boolean shouldSetUrlResourceAsName;
+    private final boolean jeeSplitByDeployment;
+
+    public TagInterceptor(RuleFlags ruleFlags) {
+        this(
+                Config.get().isServiceNameSetByUser(),
+                CapturedEnvironment.get().getProperties().get(GeneralConfig.SERVICE_NAME),
+                Config.get().getSplitByTags(),
+                ruleFlags,
+                Config.get().isJeeSplitByDeployment());
     }
-    return false;
-  }
 
-  public boolean needsIntercept(Map<String, ?> map) {
-    for (String tag : map.keySet()) {
-      if (needsIntercept(tag)) return true;
+    public TagInterceptor(
+            boolean isServiceNameSetByUser,
+            String inferredServiceName,
+            Set<String> splitServiceTags,
+            RuleFlags ruleFlags,
+            boolean jeeSplitByDeployment) {
+        this.isServiceNameSetByUser = isServiceNameSetByUser;
+        this.inferredServiceName = inferredServiceName;
+        this.splitServiceTags = splitServiceTags;
+        this.ruleFlags = ruleFlags;
+        splitByServletContext = splitServiceTags.contains(SERVLET_CONTEXT);
+
+        shouldSet404ResourceName = ruleFlags.isEnabled(URL_AS_RESOURCE_NAME)
+                && ruleFlags.isEnabled(STATUS_404)
+                && ruleFlags.isEnabled(STATUS_404_DECORATOR);
+        shouldSetUrlResourceAsName = ruleFlags.isEnabled(URL_AS_RESOURCE_NAME);
+        this.jeeSplitByDeployment = jeeSplitByDeployment;
     }
-    return false;
-  }
-
-  public boolean needsIntercept(String tag) {
-    switch (tag) {
-      case DDTags.RESOURCE_NAME:
-      case Tags.DB_STATEMENT:
-      case DDTags.SERVICE_NAME:
-      case "service":
-      case Tags.PEER_SERVICE:
-      case DDTags.MANUAL_KEEP:
-      case DDTags.MANUAL_DROP:
-      case Tags.ASM_KEEP:
-      case Tags.AI_GUARD_KEEP:
-      case Tags.SAMPLING_PRIORITY:
-      case Tags.PROPAGATED_TRACE_SOURCE:
-      case Tags.PROPAGATED_DEBUG:
-      case SERVLET_CONTEXT:
-      case SPAN_TYPE:
-      case ANALYTICS_SAMPLE_RATE:
-      case Tags.ERROR:
-      case HTTP_STATUS:
-      case HTTP_METHOD:
-      case HTTP_URL:
-      case ORIGIN_KEY:
-      case MEASURED:
-      case Tags.SPAN_KIND:
-        return true;
 
-      default:
-        return splitServiceTags.contains(tag);
-    }
-  }
-
-  public boolean interceptTag(DDSpanContext span, String tag, Object value) {
-    switch (tag) {
-      case DDTags.RESOURCE_NAME:
-        return interceptResourceName(span, value);
-      case Tags.DB_STATEMENT:
-        return interceptDbStatement(span, value);
-      case DDTags.SERVICE_NAME:
-      case "service":
-        return interceptServiceName(SERVICE_NAME, span, value);
-      case Tags.PEER_SERVICE:
-        // we still need to intercept and add this tag when the user manually set
-        span.setTag(DDTags.PEER_SERVICE_SOURCE, Tags.PEER_SERVICE);
-        return interceptServiceName(PEER_SERVICE, span, value);
-      case DDTags.MANUAL_KEEP:
-        if (asBoolean(value)) {
-          span.forceKeep();
-          return true;
-        }
-        return false;
-      case DDTags.MANUAL_DROP:
-        return interceptSamplingPriority(
-            FORCE_MANUAL_DROP, USER_DROP, SamplingMechanism.MANUAL, span, value);
-      case Tags.ASM_KEEP:
-        if (asBoolean(value)) {
-          span.forceKeep(SamplingMechanism.APPSEC);
-          return true;
+    public boolean needsIntercept(TagMap map) {
+        for (TagMap.EntryReader entry : map) {
+            if (needsIntercept(entry.tag())) return true;
         }
         return false;
-      case Tags.AI_GUARD_KEEP:
-        if (asBoolean(value)) {
-          span.forceKeep(SamplingMechanism.AI_GUARD);
-          return true;
+    }
+
+    public boolean needsIntercept(Map<String, ?> map) {
+        for (String tag : map.keySet()) {
+            if (needsIntercept(tag)) return true;
         }
         return false;
-      case Tags.SAMPLING_PRIORITY:
-        return interceptSamplingPriority(span, value);
-      case Tags.PROPAGATED_TRACE_SOURCE:
-        if (value instanceof Integer) {
-          span.addPropagatedTraceSource((Integer) value);
-          return true;
+    }
+
+    public boolean needsIntercept(String tag) {
+        switch (tag) {
+            case DDTags.RESOURCE_NAME:
+            case Tags.DB_STATEMENT:
+            case DDTags.SERVICE_NAME:
+            case "service":
+            case Tags.PEER_SERVICE:
+            case DDTags.MANUAL_KEEP:
+            case DDTags.MANUAL_DROP:
+            case Tags.ASM_KEEP:
+            case Tags.AI_GUARD_KEEP:
+            case Tags.SAMPLING_PRIORITY:
+            case Tags.PROPAGATED_TRACE_SOURCE:
+            case Tags.PROPAGATED_DEBUG:
+            case SERVLET_CONTEXT:
+            case SPAN_TYPE:
+            case ANALYTICS_SAMPLE_RATE:
+            case Tags.ERROR:
+            case HTTP_STATUS:
+            case HTTP_METHOD:
+            case HTTP_URL:
+            case ORIGIN_KEY:
+            case MEASURED:
+            case Tags.SPAN_KIND:
+                return true;
+
+            default:
+                return splitServiceTags.contains(tag);
         }
-        return false;
-      case Tags.PROPAGATED_DEBUG:
-        span.updateDebugPropagation(String.valueOf(value));
-        return true;
-      case SERVLET_CONTEXT:
-        return interceptServletContext(span, value);
-      case SPAN_TYPE:
-        return interceptSpanType(span, value);
-      case ANALYTICS_SAMPLE_RATE:
-        return interceptAnalyticsSampleRate(span, value);
-      case Tags.ERROR:
-        return interceptError(span, value);
-      case HTTP_STATUS:
-        // not set internally but may come from manual instrumentation
-        return interceptHttpStatusCode(span, value);
-      case HTTP_METHOD:
-      case HTTP_URL:
-        return interceptUrlResourceAsNameRule(span, tag, value);
-      case ORIGIN_KEY:
-        return interceptOrigin(span, value);
-      case MEASURED:
-        return interceptMeasured(span, value);
-      case Tags.SPAN_KIND:
-        // Cache the ordinal for fast isOutbound() checks.
-        // Return false so the value is still stored in unsafeTags for serialization.
-        span.setSpanKindOrdinal(String.valueOf(value));
-        return false;
-      default:
-        return intercept(span, tag, value);
     }
-  }
-
-  private boolean interceptUrlResourceAsNameRule(DDSpanContext span, String tag, Object value) {
-    if (shouldSetUrlResourceAsName) {
-      if (HTTP_METHOD.equals(tag)) {
-        final Object url = span.unsafeGetTag(HTTP_URL);
-        if (url != null) {
-          setResourceFromUrl(span, value.toString(), url);
+
+    public boolean interceptTag(DDSpanContext span, String tag, Object value) {
+        switch (tag) {
+            case DDTags.RESOURCE_NAME:
+                return interceptResourceName(span, value);
+            case Tags.DB_STATEMENT:
+                return interceptDbStatement(span, value);
+            case DDTags.SERVICE_NAME:
+            case "service":
+                return interceptServiceName(SERVICE_NAME, span, value);
+            case Tags.PEER_SERVICE:
+                // we still need to intercept and add this tag when the user manually set
+                span.setTag(DDTags.PEER_SERVICE_SOURCE, Tags.PEER_SERVICE);
+                return interceptServiceName(PEER_SERVICE, span, value);
+            case DDTags.MANUAL_KEEP:
+                if (asBoolean(value)) {
+                    span.forceKeep();
+                    return true;
+                }
+                return false;
+            case DDTags.MANUAL_DROP:
+                return interceptSamplingPriority(FORCE_MANUAL_DROP, USER_DROP, SamplingMechanism.MANUAL, span, value);
+            case Tags.ASM_KEEP:
+                if (asBoolean(value)) {
+                    span.forceKeep(SamplingMechanism.APPSEC);
+                    return true;
+                }
+                return false;
+            case Tags.AI_GUARD_KEEP:
+                if (asBoolean(value)) {
+                    span.forceKeep(SamplingMechanism.AI_GUARD);
+                    return true;
+                }
+                return false;
+            case Tags.SAMPLING_PRIORITY:
+                return interceptSamplingPriority(span, value);
+            case Tags.PROPAGATED_TRACE_SOURCE:
+                if (value instanceof Integer) {
+                    span.addPropagatedTraceSource((Integer) value);
+                    return true;
+                }
+                return false;
+            case Tags.PROPAGATED_DEBUG:
+                span.updateDebugPropagation(String.valueOf(value));
+                return true;
+            case SERVLET_CONTEXT:
+                return interceptServletContext(span, value);
+            case SPAN_TYPE:
+                return interceptSpanType(span, value);
+            case ANALYTICS_SAMPLE_RATE:
+                return interceptAnalyticsSampleRate(span, value);
+            case Tags.ERROR:
+                return interceptError(span, value);
+            case HTTP_STATUS:
+                // not set internally but may come from manual instrumentation
+                return interceptHttpStatusCode(span, value);
+            case HTTP_METHOD:
+            case HTTP_URL:
+                return interceptUrlResourceAsNameRule(span, tag, value);
+            case ORIGIN_KEY:
+                return interceptOrigin(span, value);
+            case MEASURED:
+                return interceptMeasured(span, value);
+            case Tags.SPAN_KIND:
+                // Cache the ordinal for fast isOutbound() checks.
+                // Return false so the value is still stored in unsafeTags for serialization.
+                span.setSpanKindOrdinal(String.valueOf(value));
+                return false;
+            default:
+                return intercept(span, tag, value);
         }
-      } else if (HTTP_URL.equals(tag)) {
-        final Object method = span.unsafeGetTag(HTTP_METHOD);
-        setResourceFromUrl(span, method != null ? method.toString() : null, value);
-      }
     }
-    return false;
-  }
-
-  private static void setResourceFromUrl(
-      @Nonnull final DDSpanContext span, @Nullable final String method, @Nonnull final Object url) {
-    final String path;
-    if (url instanceof URIUtils.LazyUrl) {
-      path = ((URIUtils.LazyUrl) url).path();
-    } else {
-      URI uri = URIUtils.safeParse(url.toString());
-      path = uri == null ? null : uri.getPath();
+
+    private boolean interceptUrlResourceAsNameRule(DDSpanContext span, String tag, Object value) {
+        if (shouldSetUrlResourceAsName) {
+            if (HTTP_METHOD.equals(tag)) {
+                final Object url = span.unsafeGetTag(HTTP_URL);
+                if (url != null) {
+                    setResourceFromUrl(span, value.toString(), url);
+                }
+            } else if (HTTP_URL.equals(tag)) {
+                final Object method = span.unsafeGetTag(HTTP_METHOD);
+                setResourceFromUrl(span, method != null ? method.toString() : null, value);
+            }
+        }
+        return false;
     }
-    if (path != null) {
-      final boolean isClient = Tags.SPAN_KIND_CLIENT.equals(span.getSpanKindString());
-      Pair<CharSequence, Byte> normalized =
-          isClient
-              ? HttpResourceNames.computeForClient(method, path, false)
-              : HttpResourceNames.computeForServer(method, path, false);
-      if (normalized.hasLeft()) {
-        span.setResourceName(normalized.getLeft(), normalized.getRight());
-      }
-    } else {
-      span.setResourceName(
-          HttpResourceNames.DEFAULT_RESOURCE_NAME, ResourceNamePriorities.HTTP_PATH_NORMALIZER);
+
+    private static void setResourceFromUrl(
+            @Nonnull final DDSpanContext span, @Nullable final String method, @Nonnull final Object url) {
+        final String path;
+        if (url instanceof URIUtils.LazyUrl) {
+            path = ((URIUtils.LazyUrl) url).path();
+        } else {
+            URI uri = URIUtils.safeParse(url.toString());
+            path = uri == null ? null : uri.getPath();
+        }
+        if (path != null) {
+            final boolean isClient = Tags.SPAN_KIND_CLIENT.equals(span.getSpanKindString());
+            Pair<CharSequence, Byte> normalized = isClient
+                    ? HttpResourceNames.computeForClient(method, path, false)
+                    : HttpResourceNames.computeForServer(method, path, false);
+            if (normalized.hasLeft()) {
+                span.setResourceName(normalized.getLeft(), normalized.getRight());
+            }
+        } else {
+            span.setResourceName(HttpResourceNames.DEFAULT_RESOURCE_NAME, ResourceNamePriorities.HTTP_PATH_NORMALIZER);
+        }
     }
-  }
 
-  private boolean intercept(DDSpanContext span, String tag, Object value) {
-    if (splitServiceTags.contains(tag)) {
-      span.setServiceName(String.valueOf(value), SPLIT_BY_TAGS);
-      return true;
+    private boolean intercept(DDSpanContext span, String tag, Object value) {
+        if (splitServiceTags.contains(tag)) {
+            span.setServiceName(String.valueOf(value), SPLIT_BY_TAGS);
+            return true;
+        }
+        return false;
     }
-    return false;
-  }
 
-  private boolean interceptResourceName(DDSpanContext span, Object value) {
-    if (ruleFlags.isEnabled(RESOURCE_NAME)) {
-      if (null == value) {
+    private boolean interceptResourceName(DDSpanContext span, Object value) {
+        if (ruleFlags.isEnabled(RESOURCE_NAME)) {
+            if (null == value) {
+                return false;
+            }
+            if (value instanceof CharSequence) {
+                span.setResourceName((CharSequence) value, ResourceNamePriorities.TAG_INTERCEPTOR);
+            } else {
+                span.setResourceName(String.valueOf(value), ResourceNamePriorities.TAG_INTERCEPTOR);
+            }
+            return true;
+        }
         return false;
-      }
-      if (value instanceof CharSequence) {
-        span.setResourceName((CharSequence) value, ResourceNamePriorities.TAG_INTERCEPTOR);
-      } else {
-        span.setResourceName(String.valueOf(value), ResourceNamePriorities.TAG_INTERCEPTOR);
-      }
-      return true;
     }
-    return false;
-  }
-
-  private boolean interceptDbStatement(DDSpanContext span, Object value) {
-    if (value instanceof CharSequence) {
-      CharSequence resourceName = (CharSequence) value;
-      if (resourceName.length() > 0) {
-        span.setResourceName(resourceName, ResourceNamePriorities.TAG_INTERCEPTOR);
-      }
+
+    private boolean interceptDbStatement(DDSpanContext span, Object value) {
+        if (value instanceof CharSequence) {
+            CharSequence resourceName = (CharSequence) value;
+            if (resourceName.length() > 0) {
+                span.setResourceName(resourceName, ResourceNamePriorities.TAG_INTERCEPTOR);
+            }
+        }
+        return true;
     }
-    return true;
-  }
-
-  private boolean interceptError(DDSpanContext span, Object value) {
-    span.setErrorFlag(asBoolean(value), ErrorPriorities.DEFAULT);
-    return true;
-  }
-
-  private boolean interceptAnalyticsSampleRate(DDSpanContext span, Object value) {
-    Number analyticsSampleRate = getOrTryParse(value);
-    if (null != analyticsSampleRate) {
-      span.setMetric(ANALYTICS_SAMPLE_RATE, analyticsSampleRate);
+
+    private boolean interceptError(DDSpanContext span, Object value) {
+        span.setErrorFlag(asBoolean(value), ErrorPriorities.DEFAULT);
+        return true;
     }
-    return true;
-  }
-
-  private boolean interceptSpanType(DDSpanContext span, Object value) {
-    if (value instanceof CharSequence) {
-      span.setSpanType((CharSequence) value);
-    } else {
-      span.setSpanType(String.valueOf(value));
+
+    private boolean interceptAnalyticsSampleRate(DDSpanContext span, Object value) {
+        Number analyticsSampleRate = getOrTryParse(value);
+        if (null != analyticsSampleRate) {
+            span.setMetric(ANALYTICS_SAMPLE_RATE, analyticsSampleRate);
+        }
+        return true;
     }
-    return true;
-  }
-
-  boolean interceptServiceName(RuleFlags.Feature feature, DDSpanContext span, Object value) {
-    if (ruleFlags.isEnabled(feature)) {
-      String serviceName = String.valueOf(value);
-      span.setServiceName(serviceName);
-      ServiceNameCollector.get().addService(serviceName);
-      return true;
+
+    private boolean interceptSpanType(DDSpanContext span, Object value) {
+        if (value instanceof CharSequence) {
+            span.setSpanType((CharSequence) value);
+        } else {
+            span.setSpanType(String.valueOf(value));
+        }
+        return true;
     }
-    return false;
-  }
-
-  private boolean interceptSamplingPriority(
-      RuleFlags.Feature feature,
-      int samplingPriority,
-      int samplingMechanism,
-      DDSpanContext span,
-      Object value) {
-    if (ruleFlags.isEnabled(feature)) {
-      if (asBoolean(value)) {
-        span.setSamplingPriority(samplingPriority, samplingMechanism);
-      }
-      return true;
+
+    boolean interceptServiceName(RuleFlags.Feature feature, DDSpanContext span, Object value) {
+        if (ruleFlags.isEnabled(feature)) {
+            String serviceName = String.valueOf(value);
+            span.setServiceName(serviceName);
+            ServiceNameCollector.get().addService(serviceName);
+            return true;
+        }
+        return false;
     }
-    return false;
-  }
-
-  private boolean interceptSamplingPriority(DDSpanContext span, Object value) {
-    if (ruleFlags.isEnabled(FORCE_SAMPLING_PRIORITY)) {
-      Number samplingPriority = getOrTryParse(value);
-      if (null != samplingPriority) {
-        if (samplingPriority.intValue() > 0) {
-          span.forceKeep(SamplingMechanism.MANUAL);
-        } else {
-          span.setSamplingPriority(USER_DROP, SamplingMechanism.MANUAL);
+
+    private boolean interceptSamplingPriority(
+            RuleFlags.Feature feature, int samplingPriority, int samplingMechanism, DDSpanContext span, Object value) {
+        if (ruleFlags.isEnabled(feature)) {
+            if (asBoolean(value)) {
+                span.setSamplingPriority(samplingPriority, samplingMechanism);
+            }
+            return true;
         }
-      }
-      return true;
+        return false;
     }
-    return false;
-  }
-
-  boolean interceptServletContext(DDSpanContext span, Object value) {
-    // even though this tag is sometimes used to set the service name
-    // (which has the side effect of marking the span as eligible for metrics
-    // in the trace agent) we also want to store it in the tags no matter what,
-    // so will always return false here.
-    if (!splitByServletContext
-        && (isServiceNameSetByUser
-            || jeeSplitByDeployment
-            || !ruleFlags.isEnabled(RuleFlags.Feature.SERVLET_CONTEXT)
-            || !span.getServiceName().isEmpty()
-                && !span.getServiceName().equals(inferredServiceName)
-                && !span.getServiceName().equals(ConfigDefaults.DEFAULT_SERVICE_NAME))) {
-      return false;
+
+    private boolean interceptSamplingPriority(DDSpanContext span, Object value) {
+        if (ruleFlags.isEnabled(FORCE_SAMPLING_PRIORITY)) {
+            Number samplingPriority = getOrTryParse(value);
+            if (null != samplingPriority) {
+                if (samplingPriority.intValue() > 0) {
+                    span.forceKeep(SamplingMechanism.MANUAL);
+                } else {
+                    span.setSamplingPriority(USER_DROP, SamplingMechanism.MANUAL);
+                }
+            }
+            return true;
+        }
+        return false;
     }
-    String contextName = String.valueOf(value).trim();
-    if (!contextName.isEmpty()) {
-      String serviceName = null;
-      if (contextName.equals("/")) {
-        serviceName = Config.get().getRootContextServiceName();
-        span.setServiceName(serviceName, SPLIT_BY_SERVLET_CONTEXT);
-      } else if (contextName.charAt(0) == '/') {
-        if (contextName.length() > 1) {
-          serviceName = contextName.substring(1);
-          span.setServiceName(serviceName, SPLIT_BY_SERVLET_CONTEXT);
+
+    boolean interceptServletContext(DDSpanContext span, Object value) {
+        // even though this tag is sometimes used to set the service name
+        // (which has the side effect of marking the span as eligible for metrics
+        // in the trace agent) we also want to store it in the tags no matter what,
+        // so will always return false here.
+        if (!splitByServletContext
+                && (isServiceNameSetByUser
+                        || jeeSplitByDeployment
+                        || !ruleFlags.isEnabled(RuleFlags.Feature.SERVLET_CONTEXT)
+                        || !span.getServiceName().isEmpty()
+                                && !span.getServiceName().equals(inferredServiceName)
+                                && !span.getServiceName().equals(ConfigDefaults.DEFAULT_SERVICE_NAME))) {
+            return false;
+        }
+        String contextName = String.valueOf(value).trim();
+        if (!contextName.isEmpty()) {
+            String serviceName = null;
+            if (contextName.equals("/")) {
+                serviceName = Config.get().getRootContextServiceName();
+                span.setServiceName(serviceName, SPLIT_BY_SERVLET_CONTEXT);
+            } else if (contextName.charAt(0) == '/') {
+                if (contextName.length() > 1) {
+                    serviceName = contextName.substring(1);
+                    span.setServiceName(serviceName, SPLIT_BY_SERVLET_CONTEXT);
+                }
+            } else {
+                serviceName = contextName;
+                span.setServiceName(serviceName, SPLIT_BY_SERVLET_CONTEXT);
+            }
+            ServiceNameCollector.get().addService(serviceName);
         }
-      } else {
-        serviceName = contextName;
-        span.setServiceName(serviceName, SPLIT_BY_SERVLET_CONTEXT);
-      }
-      ServiceNameCollector.get().addService(serviceName);
+        return false;
     }
-    return false;
-  }
-
-  private boolean interceptHttpStatusCode(DDSpanContext span, Object statusCode) {
-    if (statusCode instanceof Number) {
-      span.setHttpStatusCode(((Number) statusCode).shortValue());
-      if (shouldSet404ResourceName && span.getHttpStatusCode() == 404) {
-        span.setResourceName(NOT_FOUND_RESOURCE_NAME, ResourceNamePriorities.HTTP_404);
-      }
-      return true;
+
+    private boolean interceptHttpStatusCode(DDSpanContext span, Object statusCode) {
+        if (statusCode instanceof Number) {
+            span.setHttpStatusCode(((Number) statusCode).shortValue());
+            if (shouldSet404ResourceName && span.getHttpStatusCode() == 404) {
+                span.setResourceName(NOT_FOUND_RESOURCE_NAME, ResourceNamePriorities.HTTP_404);
+            }
+            return true;
+        }
+        try {
+            span.setHttpStatusCode(Short.parseShort(String.valueOf(statusCode)));
+            if (shouldSet404ResourceName && span.getHttpStatusCode() == 404) {
+                span.setResourceName(NOT_FOUND_RESOURCE_NAME, ResourceNamePriorities.HTTP_404);
+            }
+            return true;
+        } catch (Throwable ignore) {
+        }
+        return false;
     }
-    try {
-      span.setHttpStatusCode(Short.parseShort(String.valueOf(statusCode)));
-      if (shouldSet404ResourceName && span.getHttpStatusCode() == 404) {
-        span.setResourceName(NOT_FOUND_RESOURCE_NAME, ResourceNamePriorities.HTTP_404);
-      }
-      return true;
-    } catch (Throwable ignore) {
+
+    private boolean interceptOrigin(final DDSpanContext span, final Object origin) {
+        if (origin instanceof CharSequence) {
+            span.setOrigin((CharSequence) origin);
+        } else {
+            span.setOrigin(String.valueOf(origin));
+        }
+        return true;
     }
-    return false;
-  }
-
-  private boolean interceptOrigin(final DDSpanContext span, final Object origin) {
-    if (origin instanceof CharSequence) {
-      span.setOrigin((CharSequence) origin);
-    } else {
-      span.setOrigin(String.valueOf(origin));
+
+    private static boolean interceptMeasured(DDSpanContext span, Object value) {
+        if ((value instanceof Number && ((Number) value).intValue() > 0) || asBoolean(value)) {
+            span.setMeasured(true);
+            return true;
+        }
+        return false;
     }
-    return true;
-  }
 
-  private static boolean interceptMeasured(DDSpanContext span, Object value) {
-    if ((value instanceof Number && ((Number) value).intValue() > 0) || asBoolean(value)) {
-      span.setMeasured(true);
-      return true;
+    private static boolean asBoolean(Object value) {
+        return Boolean.TRUE.equals(value)
+                || "1".equals(value)
+                || (!Boolean.FALSE.equals(value) && Boolean.parseBoolean(String.valueOf(value)));
     }
-    return false;
-  }
-
-  private static boolean asBoolean(Object value) {
-    return Boolean.TRUE.equals(value)
-        || "1".equals(value)
-        || (!Boolean.FALSE.equals(value) && Boolean.parseBoolean(String.valueOf(value)));
-  }
-
-  private static Number getOrTryParse(Object value) {
-    if (value instanceof Number) {
-      return (Number) value;
-    } else if (value instanceof String) {
-      try {
-        return Double.parseDouble((String) value);
-      } catch (NumberFormatException ignore) {
-
-      }
+
+    private static Number getOrTryParse(Object value) {
+        if (value instanceof Number) {
+            return (Number) value;
+        } else if (value instanceof String) {
+            try {
+                return Double.parseDouble((String) value);
+            } catch (NumberFormatException ignore) {
+
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/HttpEndpointPostProcessor.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/HttpEndpointPostProcessor.java
index c2e0dd72761..215e684079f 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/HttpEndpointPostProcessor.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/HttpEndpointPostProcessor.java
@@ -31,46 +31,44 @@
  * </ul>
  */
 public class HttpEndpointPostProcessor extends TagsPostProcessor {
-  private static final Logger log = LoggerFactory.getLogger(HttpEndpointPostProcessor.class);
+    private static final Logger log = LoggerFactory.getLogger(HttpEndpointPostProcessor.class);
 
-  private final EndpointResolver endpointResolver;
+    private final EndpointResolver endpointResolver;
 
-  /** Creates a new HttpEndpointPostProcessor using the global config. */
-  public HttpEndpointPostProcessor() {
-    this(
-        new EndpointResolver(
-            datadog.trace.api.Config.get().isTraceResourceRenamingEnabled(),
-            datadog.trace.api.Config.get().isTraceResourceRenamingAlwaysSimplifiedEndpoint()));
-  }
-
-  /**
-   * Creates a new HttpEndpointPostProcessor with the given endpoint resolver.
-   *
-   * @param endpointResolver the resolver to use for endpoint inference
-   */
-  @VisibleForTesting
-  HttpEndpointPostProcessor(EndpointResolver endpointResolver) {
-    this.endpointResolver = endpointResolver;
-  }
-
-  @Override
-  public void processTags(
-      TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
-    if (!endpointResolver.isEnabled()) {
-      log.debug("EndpointResolver is not enabled, skipping HTTP endpoint post processing");
-      return;
+    /** Creates a new HttpEndpointPostProcessor using the global config. */
+    public HttpEndpointPostProcessor() {
+        this(new EndpointResolver(
+                datadog.trace.api.Config.get().isTraceResourceRenamingEnabled(),
+                datadog.trace.api.Config.get().isTraceResourceRenamingAlwaysSimplifiedEndpoint()));
     }
 
-    if (unsafeTags.getObject(HTTP_METHOD) == null) {
-      return;
+    /**
+     * Creates a new HttpEndpointPostProcessor with the given endpoint resolver.
+     *
+     * @param endpointResolver the resolver to use for endpoint inference
+     */
+    @VisibleForTesting
+    HttpEndpointPostProcessor(EndpointResolver endpointResolver) {
+        this.endpointResolver = endpointResolver;
     }
 
-    try {
-      String httpRoute = unsafeTags.getString(HTTP_ROUTE);
-      String httpUrl = unsafeTags.getString(HTTP_URL);
-      endpointResolver.resolveEndpoint(unsafeTags, httpRoute, httpUrl);
-    } catch (Throwable t) {
-      log.debug("Error processing HTTP endpoint for span {}", spanContext.getSpanId(), t);
+    @Override
+    public void processTags(TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
+        if (!endpointResolver.isEnabled()) {
+            log.debug("EndpointResolver is not enabled, skipping HTTP endpoint post processing");
+            return;
+        }
+
+        if (unsafeTags.getObject(HTTP_METHOD) == null) {
+            return;
+        }
+
+        try {
+            String httpRoute = unsafeTags.getString(HTTP_ROUTE);
+            String httpUrl = unsafeTags.getString(HTTP_URL);
+            endpointResolver.resolveEndpoint(unsafeTags, httpRoute, httpUrl);
+        } catch (Throwable t) {
+            log.debug("Error processing HTTP endpoint for span {}", spanContext.getSpanId(), t);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/IntegrationAdder.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/IntegrationAdder.java
index 0aabbc29c47..f963caf0805 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/IntegrationAdder.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/IntegrationAdder.java
@@ -7,14 +7,13 @@
 import datadog.trace.core.DDSpanContext;
 
 public class IntegrationAdder extends TagsPostProcessor {
-  @Override
-  public void processTags(
-      TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
-    final CharSequence instrumentationName = spanContext.getIntegrationName();
-    if (instrumentationName != null) {
-      unsafeTags.set(DD_INTEGRATION, instrumentationName);
-    } else {
-      unsafeTags.remove(DD_INTEGRATION);
+    @Override
+    public void processTags(TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
+        final CharSequence instrumentationName = spanContext.getIntegrationName();
+        if (instrumentationName != null) {
+            unsafeTags.set(DD_INTEGRATION, instrumentationName);
+        } else {
+            unsafeTags.remove(DD_INTEGRATION);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/InternalTagsAdder.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/InternalTagsAdder.java
index 3e6b8b13192..ea645bd5f58 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/InternalTagsAdder.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/InternalTagsAdder.java
@@ -11,39 +11,39 @@
 import javax.annotation.Nullable;
 
 public final class InternalTagsAdder extends TagsPostProcessor {
-  private final UTF8BytesString ddService;
-
-  // Prebuilt once to avoid per-span Entry allocation.
-  private final TagMap.Entry baseServiceEntry;
-  @Nullable private final TagMap.Entry versionEntry;
-
-  public InternalTagsAdder(@Nonnull final String ddService, @Nullable final String version) {
-    this.ddService = UTF8BytesString.create(ddService);
-    this.baseServiceEntry = TagMap.Entry.create(DDTags.BASE_SERVICE, this.ddService);
-    this.versionEntry =
-        version != null && !version.isEmpty()
-            ? TagMap.Entry.create(VERSION, UTF8BytesString.create(version))
-            : null;
-  }
-
-  @Override
-  public void processTags(
-      TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
-    if (spanContext == null) {
-      return;
+    private final UTF8BytesString ddService;
+
+    // Prebuilt once to avoid per-span Entry allocation.
+    private final TagMap.Entry baseServiceEntry;
+
+    @Nullable
+    private final TagMap.Entry versionEntry;
+
+    public InternalTagsAdder(@Nonnull final String ddService, @Nullable final String version) {
+        this.ddService = UTF8BytesString.create(ddService);
+        this.baseServiceEntry = TagMap.Entry.create(DDTags.BASE_SERVICE, this.ddService);
+        this.versionEntry = version != null && !version.isEmpty()
+                ? TagMap.Entry.create(VERSION, UTF8BytesString.create(version))
+                : null;
     }
 
-    if (!ddService.toString().equalsIgnoreCase(spanContext.getServiceName())) {
-      if (baseServiceEntry != null) {
-        // service name != DD_SERVICE
-        unsafeTags.set(baseServiceEntry);
-      }
-    } else {
-      // as per config consistency, the version tag is added across tracers only if
-      // the service name is DD_SERVICE and version  tag is not manually set
-      if (versionEntry != null && !unsafeTags.containsKey(VERSION)) {
-        unsafeTags.set(versionEntry);
-      }
+    @Override
+    public void processTags(TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
+        if (spanContext == null) {
+            return;
+        }
+
+        if (!ddService.toString().equalsIgnoreCase(spanContext.getServiceName())) {
+            if (baseServiceEntry != null) {
+                // service name != DD_SERVICE
+                unsafeTags.set(baseServiceEntry);
+            }
+        } else {
+            // as per config consistency, the version tag is added across tracers only if
+            // the service name is DD_SERVICE and version  tag is not manually set
+            if (versionEntry != null && !unsafeTags.containsKey(VERSION)) {
+                unsafeTags.set(versionEntry);
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/PayloadTagsProcessor.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/PayloadTagsProcessor.java
index 09d382843a3..14aa7a3a3d1 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/PayloadTagsProcessor.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/PayloadTagsProcessor.java
@@ -24,247 +24,238 @@
 
 /** Post-processor that extracts tags from payload data injected as tags by instrumentations. */
 public final class PayloadTagsProcessor extends TagsPostProcessor {
-  private static final Logger log = LoggerFactory.getLogger(PayloadTagsProcessor.class);
-
-  private static final String REDACTED = "redacted";
-  private static final String BINARY = "<binary>";
-  private static final String DD_PAYLOAD_TAGS_INCOMPLETE = "_dd.payload_tags_incomplete";
-
-  @Nullable
-  public static PayloadTagsProcessor create(Config config) {
-    Map<String, RedactionRules> redactionRulesByTagPrefix = new HashMap<>();
-    if (config.isCloudRequestPayloadTaggingEnabled()) {
-      redactionRulesByTagPrefix.put(
-          ConfigDefaults.DEFAULT_TRACE_CLOUD_PAYLOAD_REQUEST_TAG,
-          new RedactionRules.Builder()
-              .addRedactionJsonPaths(ConfigDefaults.DEFAULT_CLOUD_COMMON_PAYLOAD_TAGGING)
-              .addRedactionJsonPaths(ConfigDefaults.DEFAULT_CLOUD_REQUEST_PAYLOAD_TAGGING)
-              .addParsedRedactionJsonPaths(config.getCloudRequestPayloadTagging())
-              .build());
-    }
-    if (config.isCloudResponsePayloadTaggingEnabled()) {
-      redactionRulesByTagPrefix.put(
-          ConfigDefaults.DEFAULT_TRACE_CLOUD_PAYLOAD_RESPONSE_TAG,
-          new RedactionRules.Builder()
-              .addRedactionJsonPaths(ConfigDefaults.DEFAULT_CLOUD_COMMON_PAYLOAD_TAGGING)
-              .addRedactionJsonPaths(ConfigDefaults.DEFAULT_CLOUD_RESPONSE_PAYLOAD_TAGGING)
-              .addParsedRedactionJsonPaths(config.getCloudResponsePayloadTagging())
-              .build());
+    private static final Logger log = LoggerFactory.getLogger(PayloadTagsProcessor.class);
+
+    private static final String REDACTED = "redacted";
+    private static final String BINARY = "<binary>";
+    private static final String DD_PAYLOAD_TAGS_INCOMPLETE = "_dd.payload_tags_incomplete";
+
+    @Nullable
+    public static PayloadTagsProcessor create(Config config) {
+        Map<String, RedactionRules> redactionRulesByTagPrefix = new HashMap<>();
+        if (config.isCloudRequestPayloadTaggingEnabled()) {
+            redactionRulesByTagPrefix.put(
+                    ConfigDefaults.DEFAULT_TRACE_CLOUD_PAYLOAD_REQUEST_TAG,
+                    new RedactionRules.Builder()
+                            .addRedactionJsonPaths(ConfigDefaults.DEFAULT_CLOUD_COMMON_PAYLOAD_TAGGING)
+                            .addRedactionJsonPaths(ConfigDefaults.DEFAULT_CLOUD_REQUEST_PAYLOAD_TAGGING)
+                            .addParsedRedactionJsonPaths(config.getCloudRequestPayloadTagging())
+                            .build());
+        }
+        if (config.isCloudResponsePayloadTaggingEnabled()) {
+            redactionRulesByTagPrefix.put(
+                    ConfigDefaults.DEFAULT_TRACE_CLOUD_PAYLOAD_RESPONSE_TAG,
+                    new RedactionRules.Builder()
+                            .addRedactionJsonPaths(ConfigDefaults.DEFAULT_CLOUD_COMMON_PAYLOAD_TAGGING)
+                            .addRedactionJsonPaths(ConfigDefaults.DEFAULT_CLOUD_RESPONSE_PAYLOAD_TAGGING)
+                            .addParsedRedactionJsonPaths(config.getCloudResponsePayloadTagging())
+                            .build());
+        }
+        if (redactionRulesByTagPrefix.isEmpty()) {
+            return null;
+        }
+        int maxDepth = config.getCloudPayloadTaggingMaxDepth();
+        int maxTags = config.getCloudPayloadTaggingMaxTags();
+        return new PayloadTagsProcessor(redactionRulesByTagPrefix, maxDepth, maxTags);
     }
-    if (redactionRulesByTagPrefix.isEmpty()) {
-      return null;
+
+    final Map<String, RedactionRules> redactionRulesByTagPrefix;
+    final int maxDepth;
+    final int maxTags;
+
+    PayloadTagsProcessor(Map<String, RedactionRules> redactionRulesByTagPrefix, int maxDepth, int maxTags) {
+        this.redactionRulesByTagPrefix = redactionRulesByTagPrefix;
+        this.maxDepth = maxDepth;
+        this.maxTags = maxTags;
     }
-    int maxDepth = config.getCloudPayloadTaggingMaxDepth();
-    int maxTags = config.getCloudPayloadTaggingMaxTags();
-    return new PayloadTagsProcessor(redactionRulesByTagPrefix, maxDepth, maxTags);
-  }
-
-  final Map<String, RedactionRules> redactionRulesByTagPrefix;
-  final int maxDepth;
-  final int maxTags;
-
-  PayloadTagsProcessor(
-      Map<String, RedactionRules> redactionRulesByTagPrefix, int maxDepth, int maxTags) {
-    this.redactionRulesByTagPrefix = redactionRulesByTagPrefix;
-    this.maxDepth = maxDepth;
-    this.maxTags = maxTags;
-  }
-
-  @Override
-  public void processTags(
-      TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
-    int spanMaxTags = maxTags + unsafeTags.size();
-    for (Map.Entry<String, RedactionRules> tagPrefixRedactionRules :
-        redactionRulesByTagPrefix.entrySet()) {
-      String tagPrefix = tagPrefixRedactionRules.getKey();
-      RedactionRules redactionRules = tagPrefixRedactionRules.getValue();
-      Object tagValue = unsafeTags.getObject(tagPrefix);
-      if (tagValue instanceof PayloadTagsData) {
-        if (unsafeTags.remove(tagPrefix)) {
-          spanMaxTags -= 1;
-        }
 
-        PayloadTagsData payloadTagsData = (PayloadTagsData) tagValue;
-        PayloadTagsCollector payloadTagsCollector =
-            new PayloadTagsCollector(maxDepth, spanMaxTags, redactionRules, tagPrefix, unsafeTags);
-        collectPayloadTags(payloadTagsData, payloadTagsCollector);
-      } else if (tagValue != null) {
-        log.debug(
-            LogCollector.SEND_TELEMETRY,
-            "Expected PayloadTagsData for known payload tag '{}', but got '{}'",
-            tagPrefix,
-            tagValue);
-      }
+    @Override
+    public void processTags(TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
+        int spanMaxTags = maxTags + unsafeTags.size();
+        for (Map.Entry<String, RedactionRules> tagPrefixRedactionRules : redactionRulesByTagPrefix.entrySet()) {
+            String tagPrefix = tagPrefixRedactionRules.getKey();
+            RedactionRules redactionRules = tagPrefixRedactionRules.getValue();
+            Object tagValue = unsafeTags.getObject(tagPrefix);
+            if (tagValue instanceof PayloadTagsData) {
+                if (unsafeTags.remove(tagPrefix)) {
+                    spanMaxTags -= 1;
+                }
+
+                PayloadTagsData payloadTagsData = (PayloadTagsData) tagValue;
+                PayloadTagsCollector payloadTagsCollector =
+                        new PayloadTagsCollector(maxDepth, spanMaxTags, redactionRules, tagPrefix, unsafeTags);
+                collectPayloadTags(payloadTagsData, payloadTagsCollector);
+            } else if (tagValue != null) {
+                log.debug(
+                        LogCollector.SEND_TELEMETRY,
+                        "Expected PayloadTagsData for known payload tag '{}', but got '{}'",
+                        tagPrefix,
+                        tagValue);
+            }
+        }
     }
-  }
-
-  private void collectPayloadTags(
-      PayloadTagsData payloadTagsData, PayloadTagsCollector payloadTagsCollector) {
-    for (PayloadTagsData.PathAndValue pathAndValue : payloadTagsData.pathAndValues) {
-      if (pathAndValue.path.length > maxDepth) {
-        continue;
-      }
-      if (!payloadTagsCollector.keepCollectingTags()) {
-        break;
-      }
-      PathCursor cursor = new PathCursor(pathAndValue.path, maxDepth);
-      if (payloadTagsCollector.notRedacted(cursor)) {
-        Object value = pathAndValue.value;
-        if (value instanceof InputStream) {
-          if (!JsonStreamParser.tryToParse((InputStream) value, payloadTagsCollector, cursor)) {
-            payloadTagsCollector.stringValue(cursor, BINARY);
-          }
-        } else if (value instanceof String) {
-          String str = (String) value;
-          if (!JsonStreamParser.tryToParse(str, payloadTagsCollector, cursor)) {
-            payloadTagsCollector.stringValue(cursor, str);
-          }
-        } else if (value instanceof Boolean) {
-          payloadTagsCollector.booleanValue(cursor, (Boolean) value);
-        } else if (value instanceof Integer) {
-          payloadTagsCollector.intValue(cursor, (Integer) value);
-        } else if (value instanceof Long) {
-          payloadTagsCollector.longValue(cursor, (Long) value);
-        } else if (value instanceof Double) {
-          payloadTagsCollector.doubleValue(cursor, (Double) value);
-        } else if (value == null) {
-          payloadTagsCollector.nullValue(cursor);
-        } else {
-          payloadTagsCollector.stringValue(cursor, String.valueOf(value));
+
+    private void collectPayloadTags(PayloadTagsData payloadTagsData, PayloadTagsCollector payloadTagsCollector) {
+        for (PayloadTagsData.PathAndValue pathAndValue : payloadTagsData.pathAndValues) {
+            if (pathAndValue.path.length > maxDepth) {
+                continue;
+            }
+            if (!payloadTagsCollector.keepCollectingTags()) {
+                break;
+            }
+            PathCursor cursor = new PathCursor(pathAndValue.path, maxDepth);
+            if (payloadTagsCollector.notRedacted(cursor)) {
+                Object value = pathAndValue.value;
+                if (value instanceof InputStream) {
+                    if (!JsonStreamParser.tryToParse((InputStream) value, payloadTagsCollector, cursor)) {
+                        payloadTagsCollector.stringValue(cursor, BINARY);
+                    }
+                } else if (value instanceof String) {
+                    String str = (String) value;
+                    if (!JsonStreamParser.tryToParse(str, payloadTagsCollector, cursor)) {
+                        payloadTagsCollector.stringValue(cursor, str);
+                    }
+                } else if (value instanceof Boolean) {
+                    payloadTagsCollector.booleanValue(cursor, (Boolean) value);
+                } else if (value instanceof Integer) {
+                    payloadTagsCollector.intValue(cursor, (Integer) value);
+                } else if (value instanceof Long) {
+                    payloadTagsCollector.longValue(cursor, (Long) value);
+                } else if (value instanceof Double) {
+                    payloadTagsCollector.doubleValue(cursor, (Double) value);
+                } else if (value == null) {
+                    payloadTagsCollector.nullValue(cursor);
+                } else {
+                    payloadTagsCollector.stringValue(cursor, String.valueOf(value));
+                }
+            }
         }
-      }
     }
-  }
 
-  static final class RedactionRules {
+    static final class RedactionRules {
 
-    public static final class Builder {
-      private final List<JsonPath> redactionRules = new ArrayList<>();
+        public static final class Builder {
+            private final List<JsonPath> redactionRules = new ArrayList<>();
 
-      public RedactionRules.Builder addRedactionJsonPaths(List<String> jsonPaths) {
-        this.redactionRules.addAll(parseJsonPaths(jsonPaths));
-        return this;
-      }
+            public RedactionRules.Builder addRedactionJsonPaths(List<String> jsonPaths) {
+                this.redactionRules.addAll(parseJsonPaths(jsonPaths));
+                return this;
+            }
 
-      public RedactionRules.Builder addParsedRedactionJsonPaths(List<JsonPath> jsonPaths) {
-        if (null == jsonPaths) {
-          log.warn("Provided JsonPaths list is null, skipping.");
-          return this;
+            public RedactionRules.Builder addParsedRedactionJsonPaths(List<JsonPath> jsonPaths) {
+                if (null == jsonPaths) {
+                    log.warn("Provided JsonPaths list is null, skipping.");
+                    return this;
+                }
+                this.redactionRules.addAll(jsonPaths);
+                return this;
+            }
+
+            RedactionRules build() {
+                return new RedactionRules(redactionRules);
+            }
         }
-        this.redactionRules.addAll(jsonPaths);
-        return this;
-      }
 
-      RedactionRules build() {
-        return new RedactionRules(redactionRules);
-      }
-    }
+        private final List<JsonPath> paths;
 
-    private final List<JsonPath> paths;
+        private RedactionRules(List<JsonPath> paths) {
+            this.paths = paths;
+        }
 
-    private RedactionRules(List<JsonPath> paths) {
-      this.paths = paths;
+        public JsonPath findMatching(PathCursor pathCursor) {
+            for (JsonPath jp : paths) {
+                if (jp.matches(pathCursor)) {
+                    return jp;
+                }
+            }
+            return null;
+        }
     }
 
-    public JsonPath findMatching(PathCursor pathCursor) {
-      for (JsonPath jp : paths) {
-        if (jp.matches(pathCursor)) {
-          return jp;
+    private static final class PayloadTagsCollector implements JsonStreamParser.Visitor {
+        private final int maxTags;
+        private final int maxDepth;
+        private final RedactionRules redactionRules;
+        private final String tagPrefix;
+
+        private final TagMap collectedTags;
+
+        public PayloadTagsCollector(
+                int maxDepth, int maxTags, RedactionRules redactionRules, String tagPrefix, TagMap collectedTags) {
+            this.maxDepth = maxDepth;
+            this.maxTags = maxTags;
+            this.redactionRules = redactionRules;
+            this.tagPrefix = tagPrefix;
+            this.collectedTags = collectedTags;
         }
-      }
-      return null;
-    }
-  }
-
-  private static final class PayloadTagsCollector implements JsonStreamParser.Visitor {
-    private final int maxTags;
-    private final int maxDepth;
-    private final RedactionRules redactionRules;
-    private final String tagPrefix;
-
-    private final TagMap collectedTags;
-
-    public PayloadTagsCollector(
-        int maxDepth,
-        int maxTags,
-        RedactionRules redactionRules,
-        String tagPrefix,
-        TagMap collectedTags) {
-      this.maxDepth = maxDepth;
-      this.maxTags = maxTags;
-      this.redactionRules = redactionRules;
-      this.tagPrefix = tagPrefix;
-      this.collectedTags = collectedTags;
-    }
 
-    @Override
-    public boolean visitCompound(PathCursor path) {
-      if (path.length() < maxDepth) {
-        return notRedacted(path);
-      }
-      return false;
-    }
+        @Override
+        public boolean visitCompound(PathCursor path) {
+            if (path.length() < maxDepth) {
+                return notRedacted(path);
+            }
+            return false;
+        }
 
-    @Override
-    public boolean visitPrimitive(PathCursor path) {
-      return notRedacted(path);
-    }
+        @Override
+        public boolean visitPrimitive(PathCursor path) {
+            return notRedacted(path);
+        }
 
-    private boolean notRedacted(PathCursor path) {
-      if (redactionRules.findMatching(path) != null) {
-        collectedTags.set(path.toString(tagPrefix), REDACTED);
-        return false;
-      }
-      return true;
-    }
+        private boolean notRedacted(PathCursor path) {
+            if (redactionRules.findMatching(path) != null) {
+                collectedTags.set(path.toString(tagPrefix), REDACTED);
+                return false;
+            }
+            return true;
+        }
 
-    @Override
-    public void booleanValue(PathCursor path, boolean value) {
-      collectedTags.set(path.toString(tagPrefix), value);
-    }
+        @Override
+        public void booleanValue(PathCursor path, boolean value) {
+            collectedTags.set(path.toString(tagPrefix), value);
+        }
 
-    @Override
-    public void stringValue(PathCursor path, String value) {
-      collectedTags.set(path.toString(tagPrefix), value);
-    }
+        @Override
+        public void stringValue(PathCursor path, String value) {
+            collectedTags.set(path.toString(tagPrefix), value);
+        }
 
-    @Override
-    public void intValue(PathCursor path, int value) {
-      collectedTags.set(path.toString(tagPrefix), value);
-    }
+        @Override
+        public void intValue(PathCursor path, int value) {
+            collectedTags.set(path.toString(tagPrefix), value);
+        }
 
-    @Override
-    public void longValue(PathCursor path, long value) {
-      collectedTags.set(path.toString(tagPrefix), value);
-    }
+        @Override
+        public void longValue(PathCursor path, long value) {
+            collectedTags.set(path.toString(tagPrefix), value);
+        }
 
-    @Override
-    public void doubleValue(PathCursor path, double value) {
-      collectedTags.set(path.toString(tagPrefix), value);
-    }
+        @Override
+        public void doubleValue(PathCursor path, double value) {
+            collectedTags.set(path.toString(tagPrefix), value);
+        }
 
-    @Override
-    public void nullValue(PathCursor path) {
-      collectedTags.set(path.toString(tagPrefix), null);
-    }
+        @Override
+        public void nullValue(PathCursor path) {
+            collectedTags.set(path.toString(tagPrefix), null);
+        }
 
-    @Override
-    public boolean keepParsing(PathCursor path) {
-      return keepCollectingTags();
-    }
+        @Override
+        public boolean keepParsing(PathCursor path) {
+            return keepCollectingTags();
+        }
 
-    public boolean keepCollectingTags() {
-      if (collectedTags.size() < maxTags) {
-        return true;
-      }
-      collectedTags.set(DD_PAYLOAD_TAGS_INCOMPLETE, true);
-      return false;
-    }
+        public boolean keepCollectingTags() {
+            if (collectedTags.size() < maxTags) {
+                return true;
+            }
+            collectedTags.set(DD_PAYLOAD_TAGS_INCOMPLETE, true);
+            return false;
+        }
 
-    @Override
-    public void expandValueFailed(PathCursor path, Exception exception) {
-      log.debug(
-          EXCLUDE_TELEMETRY, "Failed to expand value at path '{}'", path.toString(""), exception);
+        @Override
+        public void expandValueFailed(PathCursor path, Exception exception) {
+            log.debug(EXCLUDE_TELEMETRY, "Failed to expand value at path '{}'", path.toString(""), exception);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/PeerServiceCalculator.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/PeerServiceCalculator.java
index 198e2c78f1c..154be93ae22 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/PeerServiceCalculator.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/PeerServiceCalculator.java
@@ -13,52 +13,51 @@
 import javax.annotation.Nonnull;
 
 public final class PeerServiceCalculator extends TagsPostProcessor {
-  private final NamingSchema.ForPeerService peerServiceNaming;
+    private final NamingSchema.ForPeerService peerServiceNaming;
 
-  private final Map<String, String> peerServiceMapping;
+    private final Map<String, String> peerServiceMapping;
 
-  private final boolean canRemap;
+    private final boolean canRemap;
 
-  public PeerServiceCalculator() {
-    this(SpanNaming.instance().namingSchema().peerService(), Config.get().getPeerServiceMapping());
-  }
+    public PeerServiceCalculator() {
+        this(SpanNaming.instance().namingSchema().peerService(), Config.get().getPeerServiceMapping());
+    }
 
-  @VisibleForTesting
-  PeerServiceCalculator(
-      @Nonnull final NamingSchema.ForPeerService peerServiceNaming,
-      @Nonnull final Map<String, String> peerServiceMapping) {
-    this.peerServiceNaming = peerServiceNaming;
-    this.peerServiceMapping = peerServiceMapping;
-    this.canRemap = !peerServiceMapping.isEmpty();
-  }
+    @VisibleForTesting
+    PeerServiceCalculator(
+            @Nonnull final NamingSchema.ForPeerService peerServiceNaming,
+            @Nonnull final Map<String, String> peerServiceMapping) {
+        this.peerServiceNaming = peerServiceNaming;
+        this.peerServiceMapping = peerServiceMapping;
+        this.canRemap = !peerServiceMapping.isEmpty();
+    }
 
-  @Override
-  public void processTags(
-      TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
-    Object peerService = unsafeTags.getObject(Tags.PEER_SERVICE);
-    // the user set it
-    if (peerService != null) {
-      if (canRemap) {
-        remapPeerService(unsafeTags, peerService);
-        return;
-      }
-    } else if (peerServiceNaming.supports()) {
-      // calculate the defaults (if any)
-      peerServiceNaming.tags(unsafeTags);
-      // only remap if the mapping is not empty (saves one get)
-      remapPeerService(unsafeTags, canRemap ? unsafeTags.getObject(Tags.PEER_SERVICE) : null);
-      return;
+    @Override
+    public void processTags(TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
+        Object peerService = unsafeTags.getObject(Tags.PEER_SERVICE);
+        // the user set it
+        if (peerService != null) {
+            if (canRemap) {
+                remapPeerService(unsafeTags, peerService);
+                return;
+            }
+        } else if (peerServiceNaming.supports()) {
+            // calculate the defaults (if any)
+            peerServiceNaming.tags(unsafeTags);
+            // only remap if the mapping is not empty (saves one get)
+            remapPeerService(unsafeTags, canRemap ? unsafeTags.getObject(Tags.PEER_SERVICE) : null);
+            return;
+        }
+        // we have no peer.service and we do not compute defaults. Leave the map untouched
     }
-    // we have no peer.service and we do not compute defaults. Leave the map untouched
-  }
 
-  private void remapPeerService(TagMap unsafeTags, Object value) {
-    if (value != null) {
-      String mapped = peerServiceMapping.get(value);
-      if (mapped != null) {
-        unsafeTags.put(Tags.PEER_SERVICE, mapped);
-        unsafeTags.put(DDTags.PEER_SERVICE_REMAPPED_FROM, value);
-      }
+    private void remapPeerService(TagMap unsafeTags, Object value) {
+        if (value != null) {
+            String mapped = peerServiceMapping.get(value);
+            if (mapped != null) {
+                unsafeTags.put(Tags.PEER_SERVICE, mapped);
+                unsafeTags.put(DDTags.PEER_SERVICE_REMAPPED_FROM, value);
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/PostProcessorChain.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/PostProcessorChain.java
index 2a2668e1b6b..46e95c12e5d 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/PostProcessorChain.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/PostProcessorChain.java
@@ -7,17 +7,16 @@
 import javax.annotation.Nonnull;
 
 public final class PostProcessorChain extends TagsPostProcessor {
-  private final TagsPostProcessor[] chain;
+    private final TagsPostProcessor[] chain;
 
-  public PostProcessorChain(@Nonnull final TagsPostProcessor... processors) {
-    chain = Objects.requireNonNull(processors);
-  }
+    public PostProcessorChain(@Nonnull final TagsPostProcessor... processors) {
+        chain = Objects.requireNonNull(processors);
+    }
 
-  @Override
-  public void processTags(
-      TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
-    for (final TagsPostProcessor tagsPostProcessor : chain) {
-      tagsPostProcessor.processTags(unsafeTags, spanContext, spanLinks);
+    @Override
+    public void processTags(TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
+        for (final TagsPostProcessor tagsPostProcessor : chain) {
+            tagsPostProcessor.processTags(unsafeTags, spanContext, spanLinks);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/QueryObfuscator.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/QueryObfuscator.java
index 2c99c50244b..f05ff00830d 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/QueryObfuscator.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/QueryObfuscator.java
@@ -13,68 +13,67 @@
 
 public final class QueryObfuscator extends TagsPostProcessor {
 
-  private static final Logger log = LoggerFactory.getLogger(QueryObfuscator.class);
+    private static final Logger log = LoggerFactory.getLogger(QueryObfuscator.class);
 
-  private static final String DEFAULT_OBFUSCATION_PATTERN =
-      "(?i)(?:(?:\"|%22)?)(?:(?:old[-_]?|new[-_]?)?p(?:ass)?w(?:or)?d(?:1|2)?|pass(?:[-_]?phrase)?|secret|(?:api[-_]?|private[-_]?|public[-_]?|access[-_]?|secret[-_]?|app(?:lication)?[-_]?)key(?:[-_]?id)?|token|consumer[-_]?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)(?:(?:\\s|%20)*(?:=|%3D)[^&]+|(?:\"|%22)(?:\\s|%20)*(?::|%3A)(?:\\s|%20)*(?:\"|%22)(?:%2[^2]|%[^2]|[^\"%])+(?:\"|%22))|(?:bearer(?:\\s|%20)+[a-z0-9._\\-]+|token(?::|%3A)[a-z0-9]{13}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L](?:[\\w=-]|%3D)+\\.ey[I-L](?:[\\w=-]|%3D)+(?:\\.(?:[\\w.+/=-]|%3D|%2F|%2B)+)?|-{5}BEGIN(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY-{5}[^\\-]+-{5}END(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY(?:-{5})?(?:\\n|%0A)?|(?:ssh-(?:rsa|dss)|ecdsa-[a-z0-9]+-[a-z0-9]+)(?:\\s|%20|%09)+(?:[a-z0-9/.+]|%2F|%5C|%2B){100,}(?:=|%3D)*(?:(?:\\s|%20|%09)+[a-z0-9._-]+)?)";
+    private static final String DEFAULT_OBFUSCATION_PATTERN =
+            "(?i)(?:(?:\"|%22)?)(?:(?:old[-_]?|new[-_]?)?p(?:ass)?w(?:or)?d(?:1|2)?|pass(?:[-_]?phrase)?|secret|(?:api[-_]?|private[-_]?|public[-_]?|access[-_]?|secret[-_]?|app(?:lication)?[-_]?)key(?:[-_]?id)?|token|consumer[-_]?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)(?:(?:\\s|%20)*(?:=|%3D)[^&]+|(?:\"|%22)(?:\\s|%20)*(?::|%3A)(?:\\s|%20)*(?:\"|%22)(?:%2[^2]|%[^2]|[^\"%])+(?:\"|%22))|(?:bearer(?:\\s|%20)+[a-z0-9._\\-]+|token(?::|%3A)[a-z0-9]{13}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L](?:[\\w=-]|%3D)+\\.ey[I-L](?:[\\w=-]|%3D)+(?:\\.(?:[\\w.+/=-]|%3D|%2F|%2B)+)?|-{5}BEGIN(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY-{5}[^\\-]+-{5}END(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY(?:-{5})?(?:\\n|%0A)?|(?:ssh-(?:rsa|dss)|ecdsa-[a-z0-9]+-[a-z0-9]+)(?:\\s|%20|%09)+(?:[a-z0-9/.+]|%2F|%5C|%2B){100,}(?:=|%3D)*(?:(?:\\s|%20|%09)+[a-z0-9._-]+)?)";
 
-  private final Pattern pattern;
+    private final Pattern pattern;
 
-  /**
-   * If regex is null - then used default regex pattern If regex is empty string - then disable
-   * regex
-   */
-  public QueryObfuscator(String regex) {
-    // empty string -> disabled query obfuscation
-    if ("".equals(regex)) {
-      this.pattern = null;
-      return;
-    }
+    /**
+     * If regex is null - then used default regex pattern If regex is empty string - then disable
+     * regex
+     */
+    public QueryObfuscator(String regex) {
+        // empty string -> disabled query obfuscation
+        if ("".equals(regex)) {
+            this.pattern = null;
+            return;
+        }
 
-    // null -> use default regex
-    if (regex == null) {
-      regex = DEFAULT_OBFUSCATION_PATTERN;
-    }
+        // null -> use default regex
+        if (regex == null) {
+            regex = DEFAULT_OBFUSCATION_PATTERN;
+        }
 
-    Pattern pattern = null;
-    try {
-      pattern = Pattern.compile(regex);
-    } catch (PatternSyntaxException e) {
-      log.error("Could not compile given query obfuscation regex: {}", regex, e);
+        Pattern pattern = null;
+        try {
+            pattern = Pattern.compile(regex);
+        } catch (PatternSyntaxException e) {
+            log.error("Could not compile given query obfuscation regex: {}", regex, e);
+        }
+        this.pattern = pattern;
     }
-    this.pattern = pattern;
-  }
 
-  private String obfuscate(String query) {
-    if (pattern == null) {
-      return query;
-    }
-    final Matcher matcher = pattern.matcher(query);
-    if (!matcher.find()) {
-      return query;
+    private String obfuscate(String query) {
+        if (pattern == null) {
+            return query;
+        }
+        final Matcher matcher = pattern.matcher(query);
+        if (!matcher.find()) {
+            return query;
+        }
+        // TODO consider an upstream length cap too
+        final StringBuffer sb = new StringBuffer(query.length());
+        do {
+            matcher.appendReplacement(sb, "<redacted>");
+        } while (matcher.find());
+        matcher.appendTail(sb);
+        return sb.toString();
     }
-    // TODO consider an upstream length cap too
-    final StringBuffer sb = new StringBuffer(query.length());
-    do {
-      matcher.appendReplacement(sb, "<redacted>");
-    } while (matcher.find());
-    matcher.appendTail(sb);
-    return sb.toString();
-  }
 
-  @Override
-  public void processTags(
-      TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
-    Object query = unsafeTags.getObject(DDTags.HTTP_QUERY);
-    if (query instanceof CharSequence) {
-      query = obfuscate(query.toString());
+    @Override
+    public void processTags(TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
+        Object query = unsafeTags.getObject(DDTags.HTTP_QUERY);
+        if (query instanceof CharSequence) {
+            query = obfuscate(query.toString());
 
-      unsafeTags.put(DDTags.HTTP_QUERY, query);
+            unsafeTags.put(DDTags.HTTP_QUERY, query);
 
-      Object url = unsafeTags.getObject(Tags.HTTP_URL);
-      if (url instanceof CharSequence) {
-        unsafeTags.put(Tags.HTTP_URL, url + "?" + query);
-      }
+            Object url = unsafeTags.getObject(Tags.HTTP_URL);
+            if (url instanceof CharSequence) {
+                unsafeTags.put(Tags.HTTP_URL, url + "?" + query);
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/RemoteHostnameAdder.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/RemoteHostnameAdder.java
index bc0939a74cb..383a4766f81 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/RemoteHostnameAdder.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/RemoteHostnameAdder.java
@@ -7,34 +7,33 @@
 import java.util.function.Supplier;
 
 public final class RemoteHostnameAdder extends TagsPostProcessor {
-  private final Supplier<String> hostnameSupplier;
+    private final Supplier<String> hostnameSupplier;
 
-  private TagMap.Entry cachedHostEntry = null;
+    private TagMap.Entry cachedHostEntry = null;
 
-  public RemoteHostnameAdder(Supplier<String> hostnameSupplier) {
-    this.hostnameSupplier = hostnameSupplier;
-  }
-
-  @Override
-  public void processTags(
-      TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
-    if (spanContext.getSpanId() != spanContext.getRootSpanId()) {
-      return;
-    }
-
-    String hostname = hostnameSupplier.get();
-    if (hostname == null) {
-      return;
+    public RemoteHostnameAdder(Supplier<String> hostnameSupplier) {
+        this.hostnameSupplier = hostnameSupplier;
     }
 
-    TagMap.Entry cachedHostEntry = this.cachedHostEntry;
-    if (cachedHostEntry != null && hostname.equals(cachedHostEntry.objectValue())) {
-      unsafeTags.set(cachedHostEntry);
-      return;
+    @Override
+    public void processTags(TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
+        if (spanContext.getSpanId() != spanContext.getRootSpanId()) {
+            return;
+        }
+
+        String hostname = hostnameSupplier.get();
+        if (hostname == null) {
+            return;
+        }
+
+        TagMap.Entry cachedHostEntry = this.cachedHostEntry;
+        if (cachedHostEntry != null && hostname.equals(cachedHostEntry.objectValue())) {
+            unsafeTags.set(cachedHostEntry);
+            return;
+        }
+
+        TagMap.Entry newEntry = TagMap.Entry.create(DDTags.TRACER_HOST, hostname);
+        unsafeTags.set(newEntry);
+        this.cachedHostEntry = newEntry;
     }
-
-    TagMap.Entry newEntry = TagMap.Entry.create(DDTags.TRACER_HOST, hostname);
-    unsafeTags.set(newEntry);
-    this.cachedHostEntry = newEntry;
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/ServiceNameSourceAdder.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/ServiceNameSourceAdder.java
index 4b081889039..2b0d51d94c6 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/ServiceNameSourceAdder.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/ServiceNameSourceAdder.java
@@ -7,14 +7,13 @@
 import datadog.trace.core.DDSpanContext;
 
 public class ServiceNameSourceAdder extends TagsPostProcessor {
-  @Override
-  public void processTags(
-      TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
-    final CharSequence serviceNameSource = spanContext.getServiceNameSource();
-    if (serviceNameSource != null) {
-      unsafeTags.set(DD_SVC_SRC, serviceNameSource);
-    } else {
-      unsafeTags.remove(DD_SVC_SRC);
+    @Override
+    public void processTags(TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
+        final CharSequence serviceNameSource = spanContext.getServiceNameSource();
+        if (serviceNameSource != null) {
+            unsafeTags.set(DD_SVC_SRC, serviceNameSource);
+        } else {
+            unsafeTags.remove(DD_SVC_SRC);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/SpanPointersProcessor.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/SpanPointersProcessor.java
index b0d252db980..549254148a4 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/SpanPointersProcessor.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/SpanPointersProcessor.java
@@ -27,138 +27,134 @@
 import org.slf4j.LoggerFactory;
 
 public class SpanPointersProcessor extends TagsPostProcessor {
-  private static final Logger LOG = LoggerFactory.getLogger(SpanPointersProcessor.class);
-
-  // The pointer direction will always be down. The serverless agent handles cases where the
-  // direction is up.
-  public static final String DOWN_DIRECTION = "d";
-  public static final String DYNAMODB_PTR_KIND = "aws.dynamodb.item";
-  public static final String S3_PTR_KIND = "aws.s3.object";
-  public static final String LINK_KIND = "span-pointer";
-
-  @Override
-  public void processTags(
-      TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
-    // DQH - TODO - There's a lot room to optimize this using TagMap's capabilities
-    AgentSpanLink s3Link = handleS3SpanPointer(unsafeTags);
-    if (s3Link != null) {
-      spanLinks.addLink(s3Link);
+    private static final Logger LOG = LoggerFactory.getLogger(SpanPointersProcessor.class);
+
+    // The pointer direction will always be down. The serverless agent handles cases where the
+    // direction is up.
+    public static final String DOWN_DIRECTION = "d";
+    public static final String DYNAMODB_PTR_KIND = "aws.dynamodb.item";
+    public static final String S3_PTR_KIND = "aws.s3.object";
+    public static final String LINK_KIND = "span-pointer";
+
+    @Override
+    public void processTags(TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
+        // DQH - TODO - There's a lot room to optimize this using TagMap's capabilities
+        AgentSpanLink s3Link = handleS3SpanPointer(unsafeTags);
+        if (s3Link != null) {
+            spanLinks.addLink(s3Link);
+        }
+
+        AgentSpanLink dynamoDbLink = handleDynamoDbSpanPointer(unsafeTags);
+        if (dynamoDbLink != null) {
+            spanLinks.addLink(dynamoDbLink);
+        }
     }
 
-    AgentSpanLink dynamoDbLink = handleDynamoDbSpanPointer(unsafeTags);
-    if (dynamoDbLink != null) {
-      spanLinks.addLink(dynamoDbLink);
+    private static AgentSpanLink handleS3SpanPointer(Map<String, Object> unsafeTags) {
+        String eTag = asString(unsafeTags.remove(S3_ETAG));
+        if (eTag == null) {
+            return null;
+        }
+        String bucket = asString(unsafeTags.get(AWS_BUCKET_NAME));
+        String key = asString(unsafeTags.get(AWS_OBJECT_KEY));
+        if (bucket == null || key == null) {
+            // This might be from an S3 operation not supported by span pointers, so we skip without
+            // logging anything.
+            return null;
+        }
+
+        // Hash calculation rules:
+        // https://github.com/DataDog/dd-span-pointer-rules/blob/main/AWS/S3/Object/README.md
+        if (!eTag.isEmpty() && eTag.charAt(0) == '"' && eTag.charAt(eTag.length() - 1) == '"') {
+            eTag = eTag.substring(1, eTag.length() - 1);
+        }
+        String[] components = new String[] {bucket, key, eTag};
+        try {
+            String hash = generatePointerHash(components);
+            return buildSpanPointer(hash, S3_PTR_KIND);
+        } catch (Exception e) {
+            LOG.debug("Failed to add span pointer: {}", e.getMessage());
+            return null;
+        }
     }
-  }
 
-  private static AgentSpanLink handleS3SpanPointer(Map<String, Object> unsafeTags) {
-    String eTag = asString(unsafeTags.remove(S3_ETAG));
-    if (eTag == null) {
-      return null;
-    }
-    String bucket = asString(unsafeTags.get(AWS_BUCKET_NAME));
-    String key = asString(unsafeTags.get(AWS_OBJECT_KEY));
-    if (bucket == null || key == null) {
-      // This might be from an S3 operation not supported by span pointers, so we skip without
-      // logging anything.
-      return null;
+    private static AgentSpanLink handleDynamoDbSpanPointer(Map<String, Object> unsafeTags) {
+        // Hash calculation rules:
+        // https://github.com/DataDog/dd-span-pointer-rules/blob/main/AWS/DynamoDB/Item/README.md
+        String tableName = asString(unsafeTags.get(AWS_TABLE_NAME));
+        if (tableName == null) {
+            return null;
+        }
+        String primaryKey1Name = asString(unsafeTags.remove(DYNAMO_PRIMARY_KEY_1));
+        String primaryKey1Value = asString(unsafeTags.remove(DYNAMO_PRIMARY_KEY_1_VALUE));
+        if (primaryKey1Name == null || primaryKey1Value == null) {
+            // This might be from a DynamoDB operation not supported by span pointers, so we skip without
+            // logging anything.
+            return null;
+        }
+
+        // If these don't exist, the user has a table with only partition key but no sort key.
+        // Then, we set them to empty strings when calculating the hash.
+        String primaryKey2Name = asString(unsafeTags.remove(DYNAMO_PRIMARY_KEY_2));
+        String primaryKey2Value = asString(unsafeTags.remove(DYNAMO_PRIMARY_KEY_2_VALUE));
+        if (primaryKey2Name == null) {
+            primaryKey2Name = "";
+        }
+        if (primaryKey2Value == null) {
+            primaryKey2Value = "";
+        }
+
+        String[] components =
+                new String[] {tableName, primaryKey1Name, primaryKey1Value, primaryKey2Name, primaryKey2Value};
+        try {
+            String hash = generatePointerHash(components);
+            return buildSpanPointer(hash, DYNAMODB_PTR_KIND);
+        } catch (Exception e) {
+            LOG.debug("Failed to add span pointer: {}", e.getMessage());
+            return null;
+        }
     }
 
-    // Hash calculation rules:
-    // https://github.com/DataDog/dd-span-pointer-rules/blob/main/AWS/S3/Object/README.md
-    if (!eTag.isEmpty() && eTag.charAt(0) == '"' && eTag.charAt(eTag.length() - 1) == '"') {
-      eTag = eTag.substring(1, eTag.length() - 1);
-    }
-    String[] components = new String[] {bucket, key, eTag};
-    try {
-      String hash = generatePointerHash(components);
-      return buildSpanPointer(hash, S3_PTR_KIND);
-    } catch (Exception e) {
-      LOG.debug("Failed to add span pointer: {}", e.getMessage());
-      return null;
-    }
-  }
-
-  private static AgentSpanLink handleDynamoDbSpanPointer(Map<String, Object> unsafeTags) {
-    // Hash calculation rules:
-    // https://github.com/DataDog/dd-span-pointer-rules/blob/main/AWS/DynamoDB/Item/README.md
-    String tableName = asString(unsafeTags.get(AWS_TABLE_NAME));
-    if (tableName == null) {
-      return null;
-    }
-    String primaryKey1Name = asString(unsafeTags.remove(DYNAMO_PRIMARY_KEY_1));
-    String primaryKey1Value = asString(unsafeTags.remove(DYNAMO_PRIMARY_KEY_1_VALUE));
-    if (primaryKey1Name == null || primaryKey1Value == null) {
-      // This might be from a DynamoDB operation not supported by span pointers, so we skip without
-      // logging anything.
-      return null;
+    private static String asString(Object o) {
+        return o == null ? null : o.toString();
     }
 
-    // If these don't exist, the user has a table with only partition key but no sort key.
-    // Then, we set them to empty strings when calculating the hash.
-    String primaryKey2Name = asString(unsafeTags.remove(DYNAMO_PRIMARY_KEY_2));
-    String primaryKey2Value = asString(unsafeTags.remove(DYNAMO_PRIMARY_KEY_2_VALUE));
-    if (primaryKey2Name == null) {
-      primaryKey2Name = "";
-    }
-    if (primaryKey2Value == null) {
-      primaryKey2Value = "";
+    /**
+     * Generates a unique hash from an array of strings by joining them with | before hashing. Used to
+     * uniquely identify AWS requests for span pointers.
+     *
+     * @param components Array of strings to hash
+     * @return A 32-character hash uniquely identifying the components
+     * @throws NoSuchAlgorithmException this should never happen; but should be handled just in case.
+     */
+    private static String generatePointerHash(String[] components) throws NoSuchAlgorithmException {
+        MessageDigest messageDigest = MessageDigest.getInstance("SHA-256");
+
+        // Update the digest incrementally for each component.
+        boolean first = true;
+        for (String component : components) {
+            if (!first) {
+                messageDigest.update((byte) '|');
+            } else {
+                first = false;
+            }
+            messageDigest.update(component.getBytes(StandardCharsets.UTF_8));
+        }
+
+        byte[] fullHash = messageDigest.digest();
+        // Only take first 16 bytes of the hash and convert to hex
+        byte[] truncatedHash = Arrays.copyOf(fullHash, 16);
+        return Strings.toHexString(truncatedHash);
     }
 
-    String[] components =
-        new String[] {
-          tableName, primaryKey1Name, primaryKey1Value, primaryKey2Name, primaryKey2Value
-        };
-    try {
-      String hash = generatePointerHash(components);
-      return buildSpanPointer(hash, DYNAMODB_PTR_KIND);
-    } catch (Exception e) {
-      LOG.debug("Failed to add span pointer: {}", e.getMessage());
-      return null;
-    }
-  }
-
-  private static String asString(Object o) {
-    return o == null ? null : o.toString();
-  }
-
-  /**
-   * Generates a unique hash from an array of strings by joining them with | before hashing. Used to
-   * uniquely identify AWS requests for span pointers.
-   *
-   * @param components Array of strings to hash
-   * @return A 32-character hash uniquely identifying the components
-   * @throws NoSuchAlgorithmException this should never happen; but should be handled just in case.
-   */
-  private static String generatePointerHash(String[] components) throws NoSuchAlgorithmException {
-    MessageDigest messageDigest = MessageDigest.getInstance("SHA-256");
-
-    // Update the digest incrementally for each component.
-    boolean first = true;
-    for (String component : components) {
-      if (!first) {
-        messageDigest.update((byte) '|');
-      } else {
-        first = false;
-      }
-      messageDigest.update(component.getBytes(StandardCharsets.UTF_8));
-    }
+    private static AgentSpanLink buildSpanPointer(String hash, String ptrKind) {
+        SpanAttributes attributes = SpanAttributes.builder()
+                .put("ptr.kind", ptrKind)
+                .put("ptr.dir", DOWN_DIRECTION)
+                .put("ptr.hash", hash)
+                .put("link.kind", LINK_KIND)
+                .build();
 
-    byte[] fullHash = messageDigest.digest();
-    // Only take first 16 bytes of the hash and convert to hex
-    byte[] truncatedHash = Arrays.copyOf(fullHash, 16);
-    return Strings.toHexString(truncatedHash);
-  }
-
-  private static AgentSpanLink buildSpanPointer(String hash, String ptrKind) {
-    SpanAttributes attributes =
-        SpanAttributes.builder()
-            .put("ptr.kind", ptrKind)
-            .put("ptr.dir", DOWN_DIRECTION)
-            .put("ptr.hash", hash)
-            .put("link.kind", LINK_KIND)
-            .build();
-
-    return SpanLink.from(noopSpanContext(), DEFAULT_FLAGS, "", attributes);
-  }
+        return SpanLink.from(noopSpanContext(), DEFAULT_FLAGS, "", attributes);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/TagsPostProcessor.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/TagsPostProcessor.java
index e0c27e50aec..bf7aab90598 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/TagsPostProcessor.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/TagsPostProcessor.java
@@ -5,6 +5,5 @@
 import datadog.trace.core.DDSpanContext;
 
 public abstract class TagsPostProcessor {
-  public abstract void processTags(
-      TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks);
+    public abstract void processTags(TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks);
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/TagsPostProcessorFactory.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/TagsPostProcessorFactory.java
index 08c52a2658a..d96aa8591e8 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/TagsPostProcessorFactory.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/TagsPostProcessorFactory.java
@@ -5,86 +5,85 @@
 import java.util.List;
 
 public final class TagsPostProcessorFactory {
-  private static boolean addInternalTags = true;
-  private static boolean addRemoteHostname = true;
+    private static boolean addInternalTags = true;
+    private static boolean addRemoteHostname = true;
 
-  private static class Lazy {
-    private static TagsPostProcessor eagerProcessor = createEagerChain();
-    private static TagsPostProcessor lazyProcessor = createLazyChain();
+    private static class Lazy {
+        private static TagsPostProcessor eagerProcessor = createEagerChain();
+        private static TagsPostProcessor lazyProcessor = createLazyChain();
 
-    private static TagsPostProcessor createEagerChain() {
-      final List<TagsPostProcessor> processors = new ArrayList<>(3);
-      processors.add(new PeerServiceCalculator());
-      if (addInternalTags) {
-        processors.add(
-            new InternalTagsAdder(Config.get().getServiceName(), Config.get().getVersion()));
-      }
-      // Add HTTP endpoint post processor for resource renaming
-      // This must run BEFORE metrics aggregation so the correct resource name is used in metrics
-      if (Config.get().isTraceResourceRenamingEnabled()) {
-        processors.add(new HttpEndpointPostProcessor());
-      }
-      return new PostProcessorChain(processors.toArray(new TagsPostProcessor[0]));
-    }
+        private static TagsPostProcessor createEagerChain() {
+            final List<TagsPostProcessor> processors = new ArrayList<>(3);
+            processors.add(new PeerServiceCalculator());
+            if (addInternalTags) {
+                processors.add(new InternalTagsAdder(
+                        Config.get().getServiceName(), Config.get().getVersion()));
+            }
+            // Add HTTP endpoint post processor for resource renaming
+            // This must run BEFORE metrics aggregation so the correct resource name is used in metrics
+            if (Config.get().isTraceResourceRenamingEnabled()) {
+                processors.add(new HttpEndpointPostProcessor());
+            }
+            return new PostProcessorChain(processors.toArray(new TagsPostProcessor[0]));
+        }
 
-    private static TagsPostProcessor createLazyChain() {
-      final List<TagsPostProcessor> processors = new ArrayList<>(8);
+        private static TagsPostProcessor createLazyChain() {
+            final List<TagsPostProcessor> processors = new ArrayList<>(8);
 
-      processors.add(new QueryObfuscator(Config.get().getObfuscationQueryRegexp()));
-      if (addRemoteHostname) {
-        processors.add(new RemoteHostnameAdder(Config.get().getHostNameSupplier()));
-      }
-      if (Config.get().isCloudPayloadTaggingEnabled()) {
-        PayloadTagsProcessor ptp = PayloadTagsProcessor.create(Config.get());
-        if (ptp != null) {
-          processors.add(ptp);
+            processors.add(new QueryObfuscator(Config.get().getObfuscationQueryRegexp()));
+            if (addRemoteHostname) {
+                processors.add(new RemoteHostnameAdder(Config.get().getHostNameSupplier()));
+            }
+            if (Config.get().isCloudPayloadTaggingEnabled()) {
+                PayloadTagsProcessor ptp = PayloadTagsProcessor.create(Config.get());
+                if (ptp != null) {
+                    processors.add(ptp);
+                }
+            }
+            // today we only have aws as config key however we could have span pointers for different
+            // integrations.
+            // At that moment we should run the postprocessor for all the spans (and filter by component
+            // to skip non-interesting ones)
+            if (Config.get().isAddSpanPointers("aws")) {
+                processors.add(new SpanPointersProcessor());
+            }
+            processors.add(new IntegrationAdder());
+            processors.add(new ServiceNameSourceAdder());
+            return new PostProcessorChain(processors.toArray(processors.toArray(new TagsPostProcessor[0])));
         }
-      }
-      // today we only have aws as config key however we could have span pointers for different
-      // integrations.
-      // At that moment we should run the postprocessor for all the spans (and filter by component
-      // to skip non-interesting ones)
-      if (Config.get().isAddSpanPointers("aws")) {
-        processors.add(new SpanPointersProcessor());
-      }
-      processors.add(new IntegrationAdder());
-      processors.add(new ServiceNameSourceAdder());
-      return new PostProcessorChain(
-          processors.toArray(processors.toArray(new TagsPostProcessor[0])));
     }
-  }
 
-  public static TagsPostProcessor eagerProcessor() {
-    return Lazy.eagerProcessor;
-  }
+    public static TagsPostProcessor eagerProcessor() {
+        return Lazy.eagerProcessor;
+    }
 
-  public static TagsPostProcessor lazyProcessor() {
-    return Lazy.lazyProcessor;
-  }
+    public static TagsPostProcessor lazyProcessor() {
+        return Lazy.lazyProcessor;
+    }
 
-  /**
-   * Mostly used for test purposes.
-   *
-   * @param enabled if false, {@link InternalTagsAdder} is not put in the chain.
-   */
-  public static void withAddInternalTags(boolean enabled) {
-    addInternalTags = enabled;
-    Lazy.eagerProcessor = Lazy.createEagerChain();
-  }
+    /**
+     * Mostly used for test purposes.
+     *
+     * @param enabled if false, {@link InternalTagsAdder} is not put in the chain.
+     */
+    public static void withAddInternalTags(boolean enabled) {
+        addInternalTags = enabled;
+        Lazy.eagerProcessor = Lazy.createEagerChain();
+    }
 
-  /**
-   * Mostly used for test purposes.
-   *
-   * @param enabled if false, {@link RemoteHostnameAdder} is not put in the chain.
-   */
-  public static void withAddRemoteHostname(boolean enabled) {
-    addRemoteHostname = enabled;
-    Lazy.lazyProcessor = Lazy.createLazyChain();
-  }
+    /**
+     * Mostly used for test purposes.
+     *
+     * @param enabled if false, {@link RemoteHostnameAdder} is not put in the chain.
+     */
+    public static void withAddRemoteHostname(boolean enabled) {
+        addRemoteHostname = enabled;
+        Lazy.lazyProcessor = Lazy.createLazyChain();
+    }
 
-  /** Used for testing purposes. It reset the singleton and restore default options */
-  public static void reset() {
-    withAddInternalTags(true);
-    withAddRemoteHostname(true);
-  }
+    /** Used for testing purposes. It reset the singleton and restore default options */
+    public static void reset() {
+        withAddInternalTags(true);
+        withAddRemoteHostname(true);
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptor.java b/dd-trace-core/src/main/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptor.java
index 1f6f5818aa0..8f1e97543e1 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptor.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptor.java
@@ -19,27 +19,25 @@
  * the original sampling priority for this trace may have already been propagated.
  */
 public class LatencyTraceInterceptor extends AbstractTraceInterceptor {
-  private static final Logger log = LoggerFactory.getLogger(LatencyTraceInterceptor.class);
-  // duration configured in ms, need to be converted in nano seconds
-  private static final long LATENCY = Config.get().getTraceKeepLatencyThreshold() * 1000000L;
+    private static final Logger log = LoggerFactory.getLogger(LatencyTraceInterceptor.class);
+    // duration configured in ms, need to be converted in nano seconds
+    private static final long LATENCY = Config.get().getTraceKeepLatencyThreshold() * 1000000L;
 
-  public static final TraceInterceptor INSTANCE =
-      new LatencyTraceInterceptor(Priority.ROOT_SPAN_LATENCY);
+    public static final TraceInterceptor INSTANCE = new LatencyTraceInterceptor(Priority.ROOT_SPAN_LATENCY);
 
-  protected LatencyTraceInterceptor(Priority priority) {
-    super(priority);
-  }
-
-  @Override
-  public Collection<? extends MutableSpan> onTraceComplete(
-      Collection<? extends MutableSpan> latencyTrace) {
-    if (latencyTrace.isEmpty()) {
-      return latencyTrace;
+    protected LatencyTraceInterceptor(Priority priority) {
+        super(priority);
     }
-    MutableSpan rootSpan = latencyTrace.iterator().next().getLocalRootSpan();
-    if (rootSpan != null && rootSpan.getDurationNano() > LATENCY) {
-      rootSpan.setTag(DDTags.MANUAL_KEEP, true);
+
+    @Override
+    public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> latencyTrace) {
+        if (latencyTrace.isEmpty()) {
+            return latencyTrace;
+        }
+        MutableSpan rootSpan = latencyTrace.iterator().next().getLocalRootSpan();
+        if (rootSpan != null && rootSpan.getDurationNano() > LATENCY) {
+            rootSpan.setTag(DDTags.MANUAL_KEEP, true);
+        }
+        return latencyTrace;
     }
-    return latencyTrace;
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/BaseMatcher.java b/dd-trace-core/src/main/java/datadog/trace/core/util/BaseMatcher.java
index b4ff5133185..adae26930d6 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/util/BaseMatcher.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/BaseMatcher.java
@@ -4,95 +4,95 @@
 import java.math.BigInteger;
 
 public abstract class BaseMatcher implements Matcher {
-  public abstract boolean matches(String str);
+    public abstract boolean matches(String str);
 
-  public abstract boolean matches(CharSequence charSeq);
+    public abstract boolean matches(CharSequence charSeq);
 
-  @Override
-  public final boolean matches(Object value) {
-    if (value instanceof String) {
-      return matches((String) value);
-    } else if (value instanceof CharSequence) {
-      return matches((CharSequence) value);
-    } else if (value instanceof Boolean) {
-      return matches((boolean) value);
-    } else if (value instanceof Byte) {
-      return matches((byte) value);
-    } else if (value instanceof Short) {
-      return matches((short) value);
-    } else if (value instanceof Integer) {
-      return matches((int) value);
-    } else if (value instanceof Long) {
-      return matches((long) value);
-    } else if (value instanceof BigInteger) {
-      return matches((BigInteger) value);
-    } else if (value instanceof Float) {
-      return matches((float) value);
-    } else if (value instanceof Double) {
-      return matches((double) value);
-    } else if (value instanceof BigDecimal) {
-      return matches((BigDecimal) value);
-    } else {
-      return false;
+    @Override
+    public final boolean matches(Object value) {
+        if (value instanceof String) {
+            return matches((String) value);
+        } else if (value instanceof CharSequence) {
+            return matches((CharSequence) value);
+        } else if (value instanceof Boolean) {
+            return matches((boolean) value);
+        } else if (value instanceof Byte) {
+            return matches((byte) value);
+        } else if (value instanceof Short) {
+            return matches((short) value);
+        } else if (value instanceof Integer) {
+            return matches((int) value);
+        } else if (value instanceof Long) {
+            return matches((long) value);
+        } else if (value instanceof BigInteger) {
+            return matches((BigInteger) value);
+        } else if (value instanceof Float) {
+            return matches((float) value);
+        } else if (value instanceof Double) {
+            return matches((double) value);
+        } else if (value instanceof BigDecimal) {
+            return matches((BigDecimal) value);
+        } else {
+            return false;
+        }
     }
-  }
 
-  @Override
-  public boolean matches(boolean value) {
-    // DQH - TODO: Also 0 or 1???
-    return matches(value ? "true" : "false");
-  }
+    @Override
+    public boolean matches(boolean value) {
+        // DQH - TODO: Also 0 or 1???
+        return matches(value ? "true" : "false");
+    }
 
-  @Override
-  public boolean matches(byte value) {
-    return matches((int) value);
-  }
+    @Override
+    public boolean matches(byte value) {
+        return matches((int) value);
+    }
 
-  @Override
-  public boolean matches(short value) {
-    return matches((int) value);
-  }
+    @Override
+    public boolean matches(short value) {
+        return matches((int) value);
+    }
 
-  @Override
-  public boolean matches(int value) {
-    return matches(Integer.toString(value));
-  }
+    @Override
+    public boolean matches(int value) {
+        return matches(Integer.toString(value));
+    }
 
-  @Override
-  public boolean matches(long value) {
-    return matches(Long.toString(value));
-  }
+    @Override
+    public boolean matches(long value) {
+        return matches(Long.toString(value));
+    }
 
-  @Override
-  public boolean matches(BigInteger value) {
-    return matches(value.toString());
-  }
+    @Override
+    public boolean matches(BigInteger value) {
+        return matches(value.toString());
+    }
 
-  @Override
-  public boolean matches(double value) {
-    if (Math.floor(value) == value) {
-      return matches((int) value);
-    } else {
-      return false;
+    @Override
+    public boolean matches(double value) {
+        if (Math.floor(value) == value) {
+            return matches((int) value);
+        } else {
+            return false;
+        }
     }
-  }
 
-  @Override
-  public boolean matches(float value) {
-    if (Math.floor(value) == value) {
-      return matches((int) value);
-    } else {
-      return false;
+    @Override
+    public boolean matches(float value) {
+        if (Math.floor(value) == value) {
+            return matches((int) value);
+        } else {
+            return false;
+        }
     }
-  }
 
-  @Override
-  public boolean matches(BigDecimal value) {
-    String str = value.toPlainString();
-    if (str.indexOf('.') == -1) {
-      return matches(str);
-    } else {
-      return false;
+    @Override
+    public boolean matches(BigDecimal value) {
+        String str = value.toPlainString();
+        if (str.indexOf('.') == -1) {
+            return matches(str);
+        } else {
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java b/dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java
index 7049f958b7a..eb2a4de88e7 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java
@@ -4,44 +4,44 @@
 
 public final class GlobPattern {
 
-  public static Pattern globToRegexPattern(String globPattern) {
-    String regex = globToRegex(globPattern);
-    return Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
-  }
+    public static Pattern globToRegexPattern(String globPattern) {
+        String regex = globToRegex(globPattern);
+        return Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
+    }
 
-  static String globToRegex(String globPattern) {
-    StringBuilder sb = new StringBuilder(64);
-    sb.append('^');
-    for (int i = 0; i < globPattern.length(); i++) {
-      char ch = globPattern.charAt(i);
-      switch (ch) {
-        case '?':
-          sb.append('.');
-          break;
-        case '*':
-          sb.append(".*");
-          break;
-        case '^':
-        case '$':
-        case '|':
-        case '.':
-        case '\\':
-        case '(':
-        case ')':
-        case '[':
-        case ']':
-        case '{':
-        case '}':
-          sb.append('\\').append(ch);
-          break;
-        default:
-          sb.append(ch);
-          break;
-      }
+    static String globToRegex(String globPattern) {
+        StringBuilder sb = new StringBuilder(64);
+        sb.append('^');
+        for (int i = 0; i < globPattern.length(); i++) {
+            char ch = globPattern.charAt(i);
+            switch (ch) {
+                case '?':
+                    sb.append('.');
+                    break;
+                case '*':
+                    sb.append(".*");
+                    break;
+                case '^':
+                case '$':
+                case '|':
+                case '.':
+                case '\\':
+                case '(':
+                case ')':
+                case '[':
+                case ']':
+                case '{':
+                case '}':
+                    sb.append('\\').append(ch);
+                    break;
+                default:
+                    sb.append(ch);
+                    break;
+            }
+        }
+        sb.append('$');
+        return sb.toString();
     }
-    sb.append('$');
-    return sb.toString();
-  }
 
-  private GlobPattern() {}
+    private GlobPattern() {}
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/JmxSystemAccessProvider.java b/dd-trace-core/src/main/java/datadog/trace/core/util/JmxSystemAccessProvider.java
index 8a15f8acd04..0c9b1cc2c1f 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/util/JmxSystemAccessProvider.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/JmxSystemAccessProvider.java
@@ -5,18 +5,17 @@
 
 /** System provider based on JMX MXBeans */
 final class JmxSystemAccessProvider implements SystemAccessProvider {
-  private static final ThreadMXBean THREAD_MX_BEAN = ManagementFactory.getThreadMXBean();
-  private static final boolean CPU_TIME_SUPPORTED =
-      THREAD_MX_BEAN.isCurrentThreadCpuTimeSupported();
+    private static final ThreadMXBean THREAD_MX_BEAN = ManagementFactory.getThreadMXBean();
+    private static final boolean CPU_TIME_SUPPORTED = THREAD_MX_BEAN.isCurrentThreadCpuTimeSupported();
 
-  public static final JmxSystemAccessProvider INSTANCE = new JmxSystemAccessProvider();
+    public static final JmxSystemAccessProvider INSTANCE = new JmxSystemAccessProvider();
 
-  /**
-   * @return the actual thread CPU time as reported by {@linkplain
-   *     ThreadMXBean#getCurrentThreadCpuTime()}
-   */
-  @Override
-  public long getThreadCpuTime() {
-    return CPU_TIME_SUPPORTED ? THREAD_MX_BEAN.getCurrentThreadCpuTime() : 0;
-  }
+    /**
+     * @return the actual thread CPU time as reported by {@linkplain
+     *     ThreadMXBean#getCurrentThreadCpuTime()}
+     */
+    @Override
+    public long getThreadCpuTime() {
+        return CPU_TIME_SUPPORTED ? THREAD_MX_BEAN.getCurrentThreadCpuTime() : 0;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/JsonStreamParser.java b/dd-trace-core/src/main/java/datadog/trace/core/util/JsonStreamParser.java
index 4fd1769c54e..4ea40651367 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/util/JsonStreamParser.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/JsonStreamParser.java
@@ -16,200 +16,199 @@
  */
 public class JsonStreamParser {
 
-  public interface Visitor {
-    /**
-     * @return - true to visit the path, false to skip it
-     */
-    boolean visitCompound(PathCursor path);
+    public interface Visitor {
+        /**
+         * @return - true to visit the path, false to skip it
+         */
+        boolean visitCompound(PathCursor path);
 
-    /**
-     * @return - true to visit the path, false to skip it
-     */
-    boolean visitPrimitive(PathCursor path);
+        /**
+         * @return - true to visit the path, false to skip it
+         */
+        boolean visitPrimitive(PathCursor path);
+
+        void booleanValue(PathCursor path, boolean value);
 
-    void booleanValue(PathCursor path, boolean value);
+        void stringValue(PathCursor path, String value);
 
-    void stringValue(PathCursor path, String value);
+        void intValue(PathCursor path, int value);
 
-    void intValue(PathCursor path, int value);
+        void longValue(PathCursor path, long value);
 
-    void longValue(PathCursor path, long value);
+        void doubleValue(PathCursor path, double value);
 
-    void doubleValue(PathCursor path, double value);
+        void nullValue(PathCursor path);
 
-    void nullValue(PathCursor path);
+        /**
+         * Called at each iteration, so parsing can be stopped at any time
+         *
+         * @return - true to stop parsing, false to keep parsing
+         */
+        boolean keepParsing(PathCursor path);
+
+        /**
+         * Called when parsing of inner JSON-like value failed. It will be handled and continue parsing
+         * the outer JSON-like value.
+         */
+        void expandValueFailed(PathCursor path, Exception exception);
+    }
 
     /**
-     * Called at each iteration, so parsing can be stopped at any time
+     * Try to parse a JSON string if it looks like a JSON object or array.
      *
-     * @return - true to stop parsing, false to keep parsing
+     * @return - true if the string was a JSON object or array, false if it was not JSON or failed to
+     *     parse
      */
-    boolean keepParsing(PathCursor path);
+    public static boolean tryToParse(String raw, Visitor visitor, PathCursor pathCursor) {
+        if (raw.startsWith("{") && raw.endsWith("}") || raw.startsWith("[") && raw.endsWith("]")) {
+            try (InputStream is = new ByteArrayInputStream(raw.getBytes(StandardCharsets.UTF_8))) {
+                return tryToParse(is, visitor, pathCursor.copy());
+            } catch (Exception e) {
+                visitor.expandValueFailed(pathCursor, e);
+            }
+        }
+        return false;
+    }
 
     /**
-     * Called when parsing of inner JSON-like value failed. It will be handled and continue parsing
-     * the outer JSON-like value.
+     * Try to parse an InputStream as JSON if it starts as a JSON object or array.
+     *
+     * @return - true if it was successfully parsed as JSON, false if it was not JSON, or it failed to
+     *     parse.
      */
-    void expandValueFailed(PathCursor path, Exception exception);
-  }
-
-  /**
-   * Try to parse a JSON string if it looks like a JSON object or array.
-   *
-   * @return - true if the string was a JSON object or array, false if it was not JSON or failed to
-   *     parse
-   */
-  public static boolean tryToParse(String raw, Visitor visitor, PathCursor pathCursor) {
-    if (raw.startsWith("{") && raw.endsWith("}") || raw.startsWith("[") && raw.endsWith("]")) {
-      try (InputStream is = new ByteArrayInputStream(raw.getBytes(StandardCharsets.UTF_8))) {
-        return tryToParse(is, visitor, pathCursor.copy());
-      } catch (Exception e) {
-        visitor.expandValueFailed(pathCursor, e);
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Try to parse an InputStream as JSON if it starts as a JSON object or array.
-   *
-   * @return - true if it was successfully parsed as JSON, false if it was not JSON, or it failed to
-   *     parse.
-   */
-  public static boolean tryToParse(InputStream is, Visitor visitor, PathCursor pathCursor) {
-    try (BufferedSource source = Okio.buffer(Okio.source(is))) {
-      byte firstByte = source.peek().readByte();
-      if (firstByte == '{' || firstByte == '[') {
-        try (JsonReader reader = JsonReader.of(source)) {
-          reader.setLenient(true);
-          tryToParse(reader, visitor, pathCursor);
-          return true;
+    public static boolean tryToParse(InputStream is, Visitor visitor, PathCursor pathCursor) {
+        try (BufferedSource source = Okio.buffer(Okio.source(is))) {
+            byte firstByte = source.peek().readByte();
+            if (firstByte == '{' || firstByte == '[') {
+                try (JsonReader reader = JsonReader.of(source)) {
+                    reader.setLenient(true);
+                    tryToParse(reader, visitor, pathCursor);
+                    return true;
+                } catch (Exception e) {
+                    visitor.expandValueFailed(pathCursor, e);
+                }
+            }
         } catch (Exception e) {
-          visitor.expandValueFailed(pathCursor, e);
+            visitor.expandValueFailed(pathCursor, e);
         }
-      }
-    } catch (Exception e) {
-      visitor.expandValueFailed(pathCursor, e);
+        return false;
     }
-    return false;
-  }
-
-  private static void tryToParse(JsonReader reader, Visitor visitor, PathCursor pathCursor)
-      throws IOException {
-
-    while (visitor.keepParsing(pathCursor)) {
-
-      switch (reader.peek()) {
-        case END_DOCUMENT:
-          return;
-
-        case BEGIN_ARRAY:
-          if (visitor.visitCompound(pathCursor)) {
-            reader.beginArray();
-            pathCursor.push(0);
-          } else {
-            reader.skipValue();
-            pathCursor.advance();
-          }
-          break;
-
-        case BEGIN_OBJECT:
-          if (visitor.visitCompound(pathCursor)) {
-            reader.beginObject();
-          } else {
-            reader.skipValue();
-            pathCursor.advance();
-          }
-          break;
-
-        case NAME:
-          String key = reader.nextName();
-          pathCursor.push(key);
-          break;
-
-        case END_ARRAY:
-          reader.endArray();
-          pathCursor.pop();
-          pathCursor.advance();
-          break;
-
-        case END_OBJECT:
-          reader.endObject();
-          pathCursor.advance();
-          break;
-
-        case BOOLEAN:
-          if (visitor.visitPrimitive(pathCursor)) {
-            visitor.booleanValue(pathCursor, reader.nextBoolean());
-          } else {
-            reader.skipValue();
-          }
-          pathCursor.advance();
-          break;
-
-        case STRING:
-          if (!visitor.visitPrimitive(pathCursor)) {
-            reader.skipValue();
-          } else {
-            String str = reader.nextString();
-            if (!tryToParse(str, visitor, pathCursor)) {
-              visitor.stringValue(pathCursor, str);
-            }
-          }
-          pathCursor.advance();
-          break;
-
-        case NUMBER:
-          if (!visitor.visitPrimitive(pathCursor)) {
-            reader.skipValue();
-          } else {
-            String numberStr = reader.nextString();
-            if (!tryToParseInt(visitor, pathCursor, numberStr)
-                && !tryToParseLong(visitor, pathCursor, numberStr)
-                && !tryToParseDouble(visitor, pathCursor, numberStr)) {
-              visitor.stringValue(pathCursor, numberStr);
+
+    private static void tryToParse(JsonReader reader, Visitor visitor, PathCursor pathCursor) throws IOException {
+
+        while (visitor.keepParsing(pathCursor)) {
+
+            switch (reader.peek()) {
+                case END_DOCUMENT:
+                    return;
+
+                case BEGIN_ARRAY:
+                    if (visitor.visitCompound(pathCursor)) {
+                        reader.beginArray();
+                        pathCursor.push(0);
+                    } else {
+                        reader.skipValue();
+                        pathCursor.advance();
+                    }
+                    break;
+
+                case BEGIN_OBJECT:
+                    if (visitor.visitCompound(pathCursor)) {
+                        reader.beginObject();
+                    } else {
+                        reader.skipValue();
+                        pathCursor.advance();
+                    }
+                    break;
+
+                case NAME:
+                    String key = reader.nextName();
+                    pathCursor.push(key);
+                    break;
+
+                case END_ARRAY:
+                    reader.endArray();
+                    pathCursor.pop();
+                    pathCursor.advance();
+                    break;
+
+                case END_OBJECT:
+                    reader.endObject();
+                    pathCursor.advance();
+                    break;
+
+                case BOOLEAN:
+                    if (visitor.visitPrimitive(pathCursor)) {
+                        visitor.booleanValue(pathCursor, reader.nextBoolean());
+                    } else {
+                        reader.skipValue();
+                    }
+                    pathCursor.advance();
+                    break;
+
+                case STRING:
+                    if (!visitor.visitPrimitive(pathCursor)) {
+                        reader.skipValue();
+                    } else {
+                        String str = reader.nextString();
+                        if (!tryToParse(str, visitor, pathCursor)) {
+                            visitor.stringValue(pathCursor, str);
+                        }
+                    }
+                    pathCursor.advance();
+                    break;
+
+                case NUMBER:
+                    if (!visitor.visitPrimitive(pathCursor)) {
+                        reader.skipValue();
+                    } else {
+                        String numberStr = reader.nextString();
+                        if (!tryToParseInt(visitor, pathCursor, numberStr)
+                                && !tryToParseLong(visitor, pathCursor, numberStr)
+                                && !tryToParseDouble(visitor, pathCursor, numberStr)) {
+                            visitor.stringValue(pathCursor, numberStr);
+                        }
+                    }
+                    pathCursor.advance();
+                    break;
+
+                case NULL:
+                    if (visitor.visitPrimitive(pathCursor)) {
+                        reader.nextNull();
+                        visitor.nullValue(pathCursor);
+                    } else {
+                        reader.skipValue();
+                    }
+                    pathCursor.advance();
+                    break;
             }
-          }
-          pathCursor.advance();
-          break;
-
-        case NULL:
-          if (visitor.visitPrimitive(pathCursor)) {
-            reader.nextNull();
-            visitor.nullValue(pathCursor);
-          } else {
-            reader.skipValue();
-          }
-          pathCursor.advance();
-          break;
-      }
+        }
     }
-  }
-
-  private static boolean tryToParseInt(Visitor visitor, PathCursor path, String str) {
-    try {
-      visitor.intValue(path, Integer.parseInt(str));
-      return true;
-    } catch (NumberFormatException e) {
-      return false;
+
+    private static boolean tryToParseInt(Visitor visitor, PathCursor path, String str) {
+        try {
+            visitor.intValue(path, Integer.parseInt(str));
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
     }
-  }
-
-  private static boolean tryToParseLong(Visitor visitor, PathCursor path, String str) {
-    try {
-      visitor.longValue(path, Long.parseLong(str));
-      return true;
-    } catch (NumberFormatException e) {
-      return false;
+
+    private static boolean tryToParseLong(Visitor visitor, PathCursor path, String str) {
+        try {
+            visitor.longValue(path, Long.parseLong(str));
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
     }
-  }
-
-  private static boolean tryToParseDouble(Visitor visitor, PathCursor path, String str) {
-    try {
-      visitor.doubleValue(path, Double.parseDouble(str));
-      return true;
-    } catch (NumberFormatException e) {
-      return false;
+
+    private static boolean tryToParseDouble(Visitor visitor, PathCursor path, String str) {
+        try {
+            visitor.doubleValue(path, Double.parseDouble(str));
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/LRUCache.java b/dd-trace-core/src/main/java/datadog/trace/core/util/LRUCache.java
index b8d993ec043..8c9c896d5a7 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/util/LRUCache.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/LRUCache.java
@@ -5,42 +5,41 @@
 
 public final class LRUCache<K, V> extends LinkedHashMap<K, V> {
 
-  public interface ExpiryListener<T, U> {
-    void accept(Map.Entry<T, U> expired);
-  }
-
-  // Copied here since they for some reason are `package` and not `protected` in HashMap
-  private static final int DEFAULT_INITIAL_CAPACITY = 1 << 4;
-  private static final float DEFAULT_LOAD_FACTOR = 0.75f;
-
-  private final int maxEntries;
-  private final ExpiryListener<K, V> expiryListener;
-
-  public LRUCache(int maxEntries) {
-    this(DEFAULT_INITIAL_CAPACITY, maxEntries);
-  }
-
-  public LRUCache(int initialCapacity, int maxEntries) {
-    this(initialCapacity, DEFAULT_LOAD_FACTOR, maxEntries);
-  }
-
-  public LRUCache(int initialCapacity, float loadFactor, int maxEntries) {
-    this(null, initialCapacity, loadFactor, maxEntries);
-  }
-
-  public LRUCache(
-      ExpiryListener<K, V> expiryListener, int initialCapacity, float loadFactor, int maxEntries) {
-    super(initialCapacity, loadFactor, true); // keep track of access order
-    this.maxEntries = maxEntries;
-    this.expiryListener = expiryListener;
-  }
-
-  @Override
-  protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
-    boolean expire = size() > maxEntries;
-    if (null != expiryListener && expire) {
-      expiryListener.accept(eldest);
+    public interface ExpiryListener<T, U> {
+        void accept(Map.Entry<T, U> expired);
+    }
+
+    // Copied here since they for some reason are `package` and not `protected` in HashMap
+    private static final int DEFAULT_INITIAL_CAPACITY = 1 << 4;
+    private static final float DEFAULT_LOAD_FACTOR = 0.75f;
+
+    private final int maxEntries;
+    private final ExpiryListener<K, V> expiryListener;
+
+    public LRUCache(int maxEntries) {
+        this(DEFAULT_INITIAL_CAPACITY, maxEntries);
+    }
+
+    public LRUCache(int initialCapacity, int maxEntries) {
+        this(initialCapacity, DEFAULT_LOAD_FACTOR, maxEntries);
+    }
+
+    public LRUCache(int initialCapacity, float loadFactor, int maxEntries) {
+        this(null, initialCapacity, loadFactor, maxEntries);
+    }
+
+    public LRUCache(ExpiryListener<K, V> expiryListener, int initialCapacity, float loadFactor, int maxEntries) {
+        super(initialCapacity, loadFactor, true); // keep track of access order
+        this.maxEntries = maxEntries;
+        this.expiryListener = expiryListener;
+    }
+
+    @Override
+    protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
+        boolean expire = size() > maxEntries;
+        if (null != expiryListener && expire) {
+            expiryListener.accept(eldest);
+        }
+        return expire;
     }
-    return expire;
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/Matcher.java b/dd-trace-core/src/main/java/datadog/trace/core/util/Matcher.java
index f8c2b1a6f93..a0f756f3dca 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/util/Matcher.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/Matcher.java
@@ -4,27 +4,27 @@
 import java.math.BigInteger;
 
 public interface Matcher {
-  boolean matches(String str);
+    boolean matches(String str);
 
-  boolean matches(CharSequence charSeq);
+    boolean matches(CharSequence charSeq);
 
-  boolean matches(Object value);
+    boolean matches(Object value);
 
-  boolean matches(boolean value);
+    boolean matches(boolean value);
 
-  boolean matches(byte value);
+    boolean matches(byte value);
 
-  boolean matches(short value);
+    boolean matches(short value);
 
-  boolean matches(int value);
+    boolean matches(int value);
 
-  boolean matches(long value);
+    boolean matches(long value);
 
-  boolean matches(BigInteger value);
+    boolean matches(BigInteger value);
 
-  boolean matches(double value);
+    boolean matches(double value);
 
-  boolean matches(float value);
+    boolean matches(float value);
 
-  boolean matches(BigDecimal value);
+    boolean matches(BigDecimal value);
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/Matchers.java b/dd-trace-core/src/main/java/datadog/trace/core/util/Matchers.java
index 7d86ddf8a8c..c82acb0e86c 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/util/Matchers.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/Matchers.java
@@ -5,159 +5,159 @@
 import java.util.regex.Pattern;
 
 public final class Matchers {
-  public static final Matcher ANY = new AnyMatcher();
-
-  private Matchers() {}
-
-  public static Matcher compileGlob(String glob) {
-    if (glob == null || isAny(glob)) {
-      return ANY;
-    } else if (isExact(glob)) {
-      return new InsensitiveEqualsMatcher(glob);
-    } else {
-      // DQH - not sure about the error handling here
-      Pattern pattern = GlobPattern.globToRegexPattern(glob);
-      return new PatternMatcher(pattern);
-    }
-  }
-
-  public static boolean matches(Matcher matcher, String str) {
-    return (matcher == null) || matcher.matches(str);
-  }
-
-  public static boolean matches(Matcher matcher, CharSequence charSeq) {
-    return (matcher == null) || matcher.matches(charSeq);
-  }
-
-  static final boolean isAny(String glob) {
-    if ("*".equals(glob)) {
-      return true;
-    } else if (glob.length() == 0) {
-      return false;
-    } else {
-      for (int i = 0; i < glob.length(); ++i) {
-        if (glob.charAt(i) != '*') return false;
-      }
-      return true;
+    public static final Matcher ANY = new AnyMatcher();
+
+    private Matchers() {}
+
+    public static Matcher compileGlob(String glob) {
+        if (glob == null || isAny(glob)) {
+            return ANY;
+        } else if (isExact(glob)) {
+            return new InsensitiveEqualsMatcher(glob);
+        } else {
+            // DQH - not sure about the error handling here
+            Pattern pattern = GlobPattern.globToRegexPattern(glob);
+            return new PatternMatcher(pattern);
+        }
     }
-  }
-
-  static boolean isExact(String glob) {
-    return (glob.indexOf('*') == -1) && (glob.indexOf('?') == -1);
-  }
 
-  static final class AnyMatcher implements Matcher {
-    @Override
-    public boolean matches(CharSequence charSeq) {
-      return true;
+    public static boolean matches(Matcher matcher, String str) {
+        return (matcher == null) || matcher.matches(str);
     }
 
-    @Override
-    public boolean matches(String str) {
-      return true;
+    public static boolean matches(Matcher matcher, CharSequence charSeq) {
+        return (matcher == null) || matcher.matches(charSeq);
     }
 
-    @Override
-    public boolean matches(Object value) {
-      return true;
+    static final boolean isAny(String glob) {
+        if ("*".equals(glob)) {
+            return true;
+        } else if (glob.length() == 0) {
+            return false;
+        } else {
+            for (int i = 0; i < glob.length(); ++i) {
+                if (glob.charAt(i) != '*') return false;
+            }
+            return true;
+        }
     }
 
-    @Override
-    public boolean matches(boolean value) {
-      return true;
+    static boolean isExact(String glob) {
+        return (glob.indexOf('*') == -1) && (glob.indexOf('?') == -1);
     }
 
-    @Override
-    public boolean matches(byte value) {
-      return true;
-    }
+    static final class AnyMatcher implements Matcher {
+        @Override
+        public boolean matches(CharSequence charSeq) {
+            return true;
+        }
 
-    @Override
-    public boolean matches(short value) {
-      return true;
-    }
+        @Override
+        public boolean matches(String str) {
+            return true;
+        }
 
-    @Override
-    public boolean matches(int value) {
-      return true;
-    }
+        @Override
+        public boolean matches(Object value) {
+            return true;
+        }
 
-    @Override
-    public boolean matches(long value) {
-      return true;
-    }
+        @Override
+        public boolean matches(boolean value) {
+            return true;
+        }
 
-    @Override
-    public boolean matches(BigInteger value) {
-      return true;
-    }
+        @Override
+        public boolean matches(byte value) {
+            return true;
+        }
 
-    @Override
-    public boolean matches(double value) {
-      return true;
-    }
+        @Override
+        public boolean matches(short value) {
+            return true;
+        }
 
-    @Override
-    public boolean matches(float value) {
-      return true;
-    }
+        @Override
+        public boolean matches(int value) {
+            return true;
+        }
 
-    @Override
-    public boolean matches(BigDecimal value) {
-      return true;
-    }
-  }
+        @Override
+        public boolean matches(long value) {
+            return true;
+        }
 
-  static final class InsensitiveEqualsMatcher extends BaseMatcher {
-    private final String exact;
+        @Override
+        public boolean matches(BigInteger value) {
+            return true;
+        }
 
-    InsensitiveEqualsMatcher(String exact) {
-      this.exact = exact;
-    }
+        @Override
+        public boolean matches(double value) {
+            return true;
+        }
 
-    @Override
-    public boolean matches(String str) {
-      return exact.equalsIgnoreCase(str);
-    }
+        @Override
+        public boolean matches(float value) {
+            return true;
+        }
 
-    @Override
-    public boolean matches(CharSequence charSeq) {
-      int exactLen = exact.length();
-      int charSeqLen = charSeq.length();
-      if (exactLen != charSeqLen) {
-        return false;
-      } else if (charSeq instanceof String) {
-        return matches((String) charSeq);
-      } else {
-        // same length, but need to do insensitive compare
-        for (int i = 0; i < exactLen && i < charSeqLen; i++) {
-          char exactLowerChar = Character.toLowerCase(exact.charAt(i));
-          char charSeqLowerChar = Character.toLowerCase(charSeq.charAt(i));
-
-          if (exactLowerChar != charSeqLowerChar) {
-            return false;
-          }
+        @Override
+        public boolean matches(BigDecimal value) {
+            return true;
         }
-        return true;
-      }
     }
-  }
 
-  static final class PatternMatcher extends BaseMatcher {
-    private final Pattern pattern;
+    static final class InsensitiveEqualsMatcher extends BaseMatcher {
+        private final String exact;
 
-    PatternMatcher(Pattern pattern) {
-      this.pattern = pattern;
-    }
+        InsensitiveEqualsMatcher(String exact) {
+            this.exact = exact;
+        }
 
-    @Override
-    public boolean matches(CharSequence charSeq) {
-      return pattern.matcher(charSeq).matches();
+        @Override
+        public boolean matches(String str) {
+            return exact.equalsIgnoreCase(str);
+        }
+
+        @Override
+        public boolean matches(CharSequence charSeq) {
+            int exactLen = exact.length();
+            int charSeqLen = charSeq.length();
+            if (exactLen != charSeqLen) {
+                return false;
+            } else if (charSeq instanceof String) {
+                return matches((String) charSeq);
+            } else {
+                // same length, but need to do insensitive compare
+                for (int i = 0; i < exactLen && i < charSeqLen; i++) {
+                    char exactLowerChar = Character.toLowerCase(exact.charAt(i));
+                    char charSeqLowerChar = Character.toLowerCase(charSeq.charAt(i));
+
+                    if (exactLowerChar != charSeqLowerChar) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        }
     }
 
-    @Override
-    public boolean matches(String str) {
-      return pattern.matcher(str).matches();
+    static final class PatternMatcher extends BaseMatcher {
+        private final Pattern pattern;
+
+        PatternMatcher(Pattern pattern) {
+            this.pattern = pattern;
+        }
+
+        @Override
+        public boolean matches(CharSequence charSeq) {
+            return pattern.matcher(charSeq).matches();
+        }
+
+        @Override
+        public boolean matches(String str) {
+            return pattern.matcher(str).matches();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/NoneSystemAccessProvider.java b/dd-trace-core/src/main/java/datadog/trace/core/util/NoneSystemAccessProvider.java
index 1f1a9cd3ef4..1ac755f06db 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/util/NoneSystemAccessProvider.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/NoneSystemAccessProvider.java
@@ -1,8 +1,8 @@
 package datadog.trace.core.util;
 
 final class NoneSystemAccessProvider implements SystemAccessProvider {
-  @Override
-  public long getThreadCpuTime() {
-    return Long.MIN_VALUE;
-  }
+    @Override
+    public long getThreadCpuTime() {
+        return Long.MIN_VALUE;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/PercentEscaper.java b/dd-trace-core/src/main/java/datadog/trace/core/util/PercentEscaper.java
index 0d13be6ce32..788bfd08c1c 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/util/PercentEscaper.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/PercentEscaper.java
@@ -66,359 +66,357 @@
  */
 public final class PercentEscaper {
 
-  /** The amount of padding (chars) to use when growing the escape buffer. */
-  private static final int DEST_PAD = 32;
+    /** The amount of padding (chars) to use when growing the escape buffer. */
+    private static final int DEST_PAD = 32;
 
-  private static final String UNSAFE_CHARACTERS_KEY = "\",;\\()/:<=>?@[]{} ";
-  private static final String UNSAFE_CHARACTERS_VALUE = "\",;\\ %";
+    private static final String UNSAFE_CHARACTERS_KEY = "\",;\\()/:<=>?@[]{} ";
+    private static final String UNSAFE_CHARACTERS_VALUE = "\",;\\ %";
 
-  // Percent escapers output upper case hex digits (uri escapers require this).
-  private static final char[] UPPER_HEX_DIGITS = "0123456789ABCDEF".toCharArray();
+    // Percent escapers output upper case hex digits (uri escapers require this).
+    private static final char[] UPPER_HEX_DIGITS = "0123456789ABCDEF".toCharArray();
 
-  /**
-   * Arrays of flags where for any {@code char c} if {@code safeOctets[c]} is true then {@code c}
-   * should remain unmodified in the output. If {@code c >= safeOctets.length} then it should be
-   * escaped.
-   */
-  private static final boolean[] unsafeKeyOctets = createUnsafeOctets(UNSAFE_CHARACTERS_KEY);
+    /**
+     * Arrays of flags where for any {@code char c} if {@code safeOctets[c]} is true then {@code c}
+     * should remain unmodified in the output. If {@code c >= safeOctets.length} then it should be
+     * escaped.
+     */
+    private static final boolean[] unsafeKeyOctets = createUnsafeOctets(UNSAFE_CHARACTERS_KEY);
 
-  private static final boolean[] unsafeValOctets = createUnsafeOctets(UNSAFE_CHARACTERS_VALUE);
+    private static final boolean[] unsafeValOctets = createUnsafeOctets(UNSAFE_CHARACTERS_VALUE);
 
-  /** The default {@link PercentEscaper} which will *not* replace spaces with plus signs. */
-  public static PercentEscaper create() {
-    return new PercentEscaper();
-  }
-
-  /**
-   * Creates a boolean array with entries corresponding to the character values specified in
-   * safeChars set to true. The array is as small as is required to hold the given character
-   * information.
-   */
-  private static boolean[] createUnsafeOctets(String safeChars) {
-    int maxChar = -1;
-    char[] safeCharArray = safeChars.toCharArray();
-    for (char c : safeCharArray) {
-      maxChar = Math.max(c, maxChar);
+    /** The default {@link PercentEscaper} which will *not* replace spaces with plus signs. */
+    public static PercentEscaper create() {
+        return new PercentEscaper();
     }
-    boolean[] octets = new boolean[maxChar + 1];
-    for (char c : safeCharArray) {
-      octets[c] = true;
+
+    /**
+     * Creates a boolean array with entries corresponding to the character values specified in
+     * safeChars set to true. The array is as small as is required to hold the given character
+     * information.
+     */
+    private static boolean[] createUnsafeOctets(String safeChars) {
+        int maxChar = -1;
+        char[] safeCharArray = safeChars.toCharArray();
+        for (char c : safeCharArray) {
+            maxChar = Math.max(c, maxChar);
+        }
+        boolean[] octets = new boolean[maxChar + 1];
+        for (char c : safeCharArray) {
+            octets[c] = true;
+        }
+        return octets;
     }
-    return octets;
-  }
 
-  public Escaped escapeKey(String s) {
-    return escape(s, unsafeKeyOctets);
-  }
+    public Escaped escapeKey(String s) {
+        return escape(s, unsafeKeyOctets);
+    }
 
-  public Escaped escapeValue(String s) {
-    return escape(s, unsafeValOctets);
-  }
+    public Escaped escapeValue(String s) {
+        return escape(s, unsafeValOctets);
+    }
 
-  private static boolean needsEncoding(char c, boolean[] unsafeOctets) {
-    if (c > '~' || c <= ' ' || c < unsafeOctets.length && unsafeOctets[c]) {
-      return true;
+    private static boolean needsEncoding(char c, boolean[] unsafeOctets) {
+        if (c > '~' || c <= ' ' || c < unsafeOctets.length && unsafeOctets[c]) {
+            return true;
+        }
+        return false;
     }
-    return false;
-  }
 
-  private boolean needsEncoding(String key, boolean[] unsafeOctets) {
-    int slen = key.length();
-    for (int index = 0; index < slen; index++) {
-      char c = key.charAt(index);
-      if (needsEncoding(c, unsafeOctets)) {
-        return true;
-      }
+    private boolean needsEncoding(String key, boolean[] unsafeOctets) {
+        int slen = key.length();
+        for (int index = 0; index < slen; index++) {
+            char c = key.charAt(index);
+            if (needsEncoding(c, unsafeOctets)) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 
-  public boolean keyNeedsEncoding(String key) {
-    return needsEncoding(key, unsafeKeyOctets);
-  }
+    public boolean keyNeedsEncoding(String key) {
+        return needsEncoding(key, unsafeKeyOctets);
+    }
 
-  public boolean valNeedsEncoding(String val) {
-    return needsEncoding(val, unsafeValOctets);
-  }
+    public boolean valNeedsEncoding(String val) {
+        return needsEncoding(val, unsafeValOctets);
+    }
 
-  /** Escape the provided String, using percent-style URL Encoding. */
-  public Escaped escape(String s, boolean[] unsafeOctets) {
-    int slen = s.length();
-    for (int index = 0; index < slen; index++) {
-      char c = s.charAt(index);
-      if (needsEncoding(c, unsafeOctets)) {
-        return escapeSlow(s, index, unsafeOctets);
-      }
+    /** Escape the provided String, using percent-style URL Encoding. */
+    public Escaped escape(String s, boolean[] unsafeOctets) {
+        int slen = s.length();
+        for (int index = 0; index < slen; index++) {
+            char c = s.charAt(index);
+            if (needsEncoding(c, unsafeOctets)) {
+                return escapeSlow(s, index, unsafeOctets);
+            }
+        }
+        return new Escaped(s, slen);
     }
-    return new Escaped(s, slen);
-  }
 
-  /*
-   * Overridden for performance. For unescaped strings this improved the performance of the uri
-   * escaper from ~760ns to ~400ns as measured by {@link CharEscapersBenchmark}.
-   */
-  /**
-   * Returns the escaped form of a given literal string, starting at the given index. This method is
-   * called by the {@link #escape(String, boolean[])} method when it discovers that escaping is
-   * required. It is protected to allow subclasses to override the fastpath escaping function to
-   * inline their escaping test.
-   *
-   * <p>This method is not reentrant and may only be invoked by the top level {@link #escape(String,
-   * boolean[])} method.
-   *
-   * @param s the literal string to be escaped
-   * @param index the index to start escaping from
-   * @return the escaped form of {@code string}
-   * @throws NullPointerException if {@code string} is null
-   * @throws IllegalArgumentException if invalid surrogate characters are encountered
-   */
-  private static Escaped escapeSlow(String s, int index, boolean[] unsafeOctets) {
-    int end = s.length();
+    /*
+     * Overridden for performance. For unescaped strings this improved the performance of the uri
+     * escaper from ~760ns to ~400ns as measured by {@link CharEscapersBenchmark}.
+     */
+    /**
+     * Returns the escaped form of a given literal string, starting at the given index. This method is
+     * called by the {@link #escape(String, boolean[])} method when it discovers that escaping is
+     * required. It is protected to allow subclasses to override the fastpath escaping function to
+     * inline their escaping test.
+     *
+     * <p>This method is not reentrant and may only be invoked by the top level {@link #escape(String,
+     * boolean[])} method.
+     *
+     * @param s the literal string to be escaped
+     * @param index the index to start escaping from
+     * @return the escaped form of {@code string}
+     * @throws NullPointerException if {@code string} is null
+     * @throws IllegalArgumentException if invalid surrogate characters are encountered
+     */
+    private static Escaped escapeSlow(String s, int index, boolean[] unsafeOctets) {
+        int end = s.length();
 
-    // Get a destination buffer and setup some loop variables.
-    char[] dest = new char[1024]; // 1024 from the original guava source
-    int destIndex = 0;
-    int unescapedChunkStart = 0;
-    Escaped result = new Escaped("", index);
+        // Get a destination buffer and setup some loop variables.
+        char[] dest = new char[1024]; // 1024 from the original guava source
+        int destIndex = 0;
+        int unescapedChunkStart = 0;
+        Escaped result = new Escaped("", index);
 
-    while (index < end) {
-      int cp = codePointAt(s, index, end);
-      if (cp < 0) {
-        throw new IllegalArgumentException("Trailing high surrogate at end of input");
-      }
-      // It is possible for this to return null because nextEscapeIndex() may
-      // (for performance reasons) yield some false positives but it must never
-      // give false negatives.
-      char[] escaped = escape(cp, result, unsafeOctets);
-      int nextIndex = index + (Character.isSupplementaryCodePoint(cp) ? 2 : 1);
-      if (escaped != null) {
-        int charsSkipped = index - unescapedChunkStart;
+        while (index < end) {
+            int cp = codePointAt(s, index, end);
+            if (cp < 0) {
+                throw new IllegalArgumentException("Trailing high surrogate at end of input");
+            }
+            // It is possible for this to return null because nextEscapeIndex() may
+            // (for performance reasons) yield some false positives but it must never
+            // give false negatives.
+            char[] escaped = escape(cp, result, unsafeOctets);
+            int nextIndex = index + (Character.isSupplementaryCodePoint(cp) ? 2 : 1);
+            if (escaped != null) {
+                int charsSkipped = index - unescapedChunkStart;
 
-        // This is the size needed to add the replacement, not the full
-        // size needed by the string. We only regrow when we absolutely must.
-        int sizeNeeded = destIndex + charsSkipped + escaped.length;
-        if (dest.length < sizeNeeded) {
-          int destLength = sizeNeeded + (end - index) + DEST_PAD;
-          dest = growBuffer(dest, destIndex, destLength);
+                // This is the size needed to add the replacement, not the full
+                // size needed by the string. We only regrow when we absolutely must.
+                int sizeNeeded = destIndex + charsSkipped + escaped.length;
+                if (dest.length < sizeNeeded) {
+                    int destLength = sizeNeeded + (end - index) + DEST_PAD;
+                    dest = growBuffer(dest, destIndex, destLength);
+                }
+                // If we have skipped any characters, we need to copy them now.
+                if (charsSkipped > 0) {
+                    s.getChars(unescapedChunkStart, index, dest, destIndex);
+                    destIndex += charsSkipped;
+                }
+                if (escaped.length > 0) {
+                    System.arraycopy(escaped, 0, dest, destIndex, escaped.length);
+                    destIndex += escaped.length;
+                }
+                // If we dealt with an escaped character, reset the unescaped range.
+                unescapedChunkStart = nextIndex;
+            }
+            index = nextEscapeIndex(s, nextIndex, end, unsafeOctets);
         }
-        // If we have skipped any characters, we need to copy them now.
+
+        // Process trailing unescaped characters - no need to account for escaped
+        // length or padding the allocation.
+        int charsSkipped = end - unescapedChunkStart;
         if (charsSkipped > 0) {
-          s.getChars(unescapedChunkStart, index, dest, destIndex);
-          destIndex += charsSkipped;
-        }
-        if (escaped.length > 0) {
-          System.arraycopy(escaped, 0, dest, destIndex, escaped.length);
-          destIndex += escaped.length;
+            int endIndex = destIndex + charsSkipped;
+            if (dest.length < endIndex) {
+                dest = growBuffer(dest, destIndex, endIndex);
+            }
+            s.getChars(unescapedChunkStart, end, dest, destIndex);
+            destIndex = endIndex;
         }
-        // If we dealt with an escaped character, reset the unescaped range.
-        unescapedChunkStart = nextIndex;
-      }
-      index = nextEscapeIndex(s, nextIndex, end, unsafeOctets);
-    }
+        // Adding characters in-between characters that want to be encoded
+        result.size += charsSkipped;
 
-    // Process trailing unescaped characters - no need to account for escaped
-    // length or padding the allocation.
-    int charsSkipped = end - unescapedChunkStart;
-    if (charsSkipped > 0) {
-      int endIndex = destIndex + charsSkipped;
-      if (dest.length < endIndex) {
-        dest = growBuffer(dest, destIndex, endIndex);
-      }
-      s.getChars(unescapedChunkStart, end, dest, destIndex);
-      destIndex = endIndex;
+        result.data = new String(dest, 0, destIndex);
+        return result;
     }
-    // Adding characters in-between characters that want to be encoded
-    result.size += charsSkipped;
 
-    result.data = new String(dest, 0, destIndex);
-    return result;
-  }
-
-  private static int nextEscapeIndex(CharSequence csq, int index, int end, boolean[] unsafeOctets) {
-    for (; index < end; index++) {
-      if (needsEncoding(csq.charAt(index), unsafeOctets)) {
-        break;
-      }
+    private static int nextEscapeIndex(CharSequence csq, int index, int end, boolean[] unsafeOctets) {
+        for (; index < end; index++) {
+            if (needsEncoding(csq.charAt(index), unsafeOctets)) {
+                break;
+            }
+        }
+        return index;
     }
-    return index;
-  }
 
-  /** Escapes the given Unicode code point in UTF-8. */
-  @CheckForNull
-  @SuppressWarnings("UngroupedOverloads")
-  private static char[] escape(int cp, Escaped escaped, boolean[] unsafeOctets) {
-    // We should never get negative values here but if we do it will throw an
-    // IndexOutOfBoundsException, so at least it will get spotted.
-    if (cp <= '~' && !needsEncoding((char) cp, unsafeOctets)) {
-      return null;
-    } else if (cp <= 0x7F) {
-      // Single byte UTF-8 characters
-      // Start with "%--" and fill in the blanks
-      char[] dest = new char[3];
-      dest[0] = '%';
-      dest[2] = UPPER_HEX_DIGITS[cp & 0xF];
-      dest[1] = UPPER_HEX_DIGITS[cp >>> 4];
-      escaped.size++;
-      return dest;
-    } else if (cp <= 0x7ff) {
-      // Two byte UTF-8 characters [cp >= 0x80 && cp <= 0x7ff]
-      // Start with "%--%--" and fill in the blanks
-      char[] dest = new char[6];
-      dest[0] = '%';
-      dest[3] = '%';
-      dest[5] = UPPER_HEX_DIGITS[cp & 0xF];
-      cp >>>= 4;
-      dest[4] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)];
-      cp >>>= 2;
-      dest[2] = UPPER_HEX_DIGITS[cp & 0xF];
-      cp >>>= 4;
-      dest[1] = UPPER_HEX_DIGITS[0xC | cp];
-      escaped.size += 2;
-      return dest;
-    } else if (cp <= 0xffff) {
-      // Three byte UTF-8 characters [cp >= 0x800 && cp <= 0xffff]
-      // Start with "%E-%--%--" and fill in the blanks
-      char[] dest = new char[9];
-      dest[0] = '%';
-      dest[1] = 'E';
-      dest[3] = '%';
-      dest[6] = '%';
-      dest[8] = UPPER_HEX_DIGITS[cp & 0xF];
-      cp >>>= 4;
-      dest[7] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)];
-      cp >>>= 2;
-      dest[5] = UPPER_HEX_DIGITS[cp & 0xF];
-      cp >>>= 4;
-      dest[4] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)];
-      cp >>>= 2;
-      dest[2] = UPPER_HEX_DIGITS[cp];
-      escaped.size += 3;
-      return dest;
-    } else if (cp <= 0x10ffff) {
-      char[] dest = new char[12];
-      // Four byte UTF-8 characters [cp >= 0xffff && cp <= 0x10ffff]
-      // Start with "%F-%--%--%--" and fill in the blanks
-      dest[0] = '%';
-      dest[1] = 'F';
-      dest[3] = '%';
-      dest[6] = '%';
-      dest[9] = '%';
-      dest[11] = UPPER_HEX_DIGITS[cp & 0xF];
-      cp >>>= 4;
-      dest[10] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)];
-      cp >>>= 2;
-      dest[8] = UPPER_HEX_DIGITS[cp & 0xF];
-      cp >>>= 4;
-      dest[7] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)];
-      cp >>>= 2;
-      dest[5] = UPPER_HEX_DIGITS[cp & 0xF];
-      cp >>>= 4;
-      dest[4] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)];
-      cp >>>= 2;
-      dest[2] = UPPER_HEX_DIGITS[cp & 0x7];
-      escaped.size += 4;
-      return dest;
-    } else {
-      // If this ever happens it is due to bug in UnicodeEscaper, not bad input.
-      throw new IllegalArgumentException("Invalid unicode character value " + cp);
+    /** Escapes the given Unicode code point in UTF-8. */
+    @CheckForNull
+    @SuppressWarnings("UngroupedOverloads")
+    private static char[] escape(int cp, Escaped escaped, boolean[] unsafeOctets) {
+        // We should never get negative values here but if we do it will throw an
+        // IndexOutOfBoundsException, so at least it will get spotted.
+        if (cp <= '~' && !needsEncoding((char) cp, unsafeOctets)) {
+            return null;
+        } else if (cp <= 0x7F) {
+            // Single byte UTF-8 characters
+            // Start with "%--" and fill in the blanks
+            char[] dest = new char[3];
+            dest[0] = '%';
+            dest[2] = UPPER_HEX_DIGITS[cp & 0xF];
+            dest[1] = UPPER_HEX_DIGITS[cp >>> 4];
+            escaped.size++;
+            return dest;
+        } else if (cp <= 0x7ff) {
+            // Two byte UTF-8 characters [cp >= 0x80 && cp <= 0x7ff]
+            // Start with "%--%--" and fill in the blanks
+            char[] dest = new char[6];
+            dest[0] = '%';
+            dest[3] = '%';
+            dest[5] = UPPER_HEX_DIGITS[cp & 0xF];
+            cp >>>= 4;
+            dest[4] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)];
+            cp >>>= 2;
+            dest[2] = UPPER_HEX_DIGITS[cp & 0xF];
+            cp >>>= 4;
+            dest[1] = UPPER_HEX_DIGITS[0xC | cp];
+            escaped.size += 2;
+            return dest;
+        } else if (cp <= 0xffff) {
+            // Three byte UTF-8 characters [cp >= 0x800 && cp <= 0xffff]
+            // Start with "%E-%--%--" and fill in the blanks
+            char[] dest = new char[9];
+            dest[0] = '%';
+            dest[1] = 'E';
+            dest[3] = '%';
+            dest[6] = '%';
+            dest[8] = UPPER_HEX_DIGITS[cp & 0xF];
+            cp >>>= 4;
+            dest[7] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)];
+            cp >>>= 2;
+            dest[5] = UPPER_HEX_DIGITS[cp & 0xF];
+            cp >>>= 4;
+            dest[4] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)];
+            cp >>>= 2;
+            dest[2] = UPPER_HEX_DIGITS[cp];
+            escaped.size += 3;
+            return dest;
+        } else if (cp <= 0x10ffff) {
+            char[] dest = new char[12];
+            // Four byte UTF-8 characters [cp >= 0xffff && cp <= 0x10ffff]
+            // Start with "%F-%--%--%--" and fill in the blanks
+            dest[0] = '%';
+            dest[1] = 'F';
+            dest[3] = '%';
+            dest[6] = '%';
+            dest[9] = '%';
+            dest[11] = UPPER_HEX_DIGITS[cp & 0xF];
+            cp >>>= 4;
+            dest[10] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)];
+            cp >>>= 2;
+            dest[8] = UPPER_HEX_DIGITS[cp & 0xF];
+            cp >>>= 4;
+            dest[7] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)];
+            cp >>>= 2;
+            dest[5] = UPPER_HEX_DIGITS[cp & 0xF];
+            cp >>>= 4;
+            dest[4] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)];
+            cp >>>= 2;
+            dest[2] = UPPER_HEX_DIGITS[cp & 0x7];
+            escaped.size += 4;
+            return dest;
+        } else {
+            // If this ever happens it is due to bug in UnicodeEscaper, not bad input.
+            throw new IllegalArgumentException("Invalid unicode character value " + cp);
+        }
     }
-  }
 
-  /**
-   * Returns the Unicode code point of the character at the given index.
-   *
-   * <p>Unlike {@link Character#codePointAt(CharSequence, int)} or {@link String#codePointAt(int)}
-   * this method will never fail silently when encountering an invalid surrogate pair.
-   *
-   * <p>The behaviour of this method is as follows:
-   *
-   * <ol>
-   *   <li>If {@code index >= end}, {@link IndexOutOfBoundsException} is thrown.
-   *   <li><b>If the character at the specified index is not a surrogate, it is returned.</b>
-   *   <li>If the first character was a high surrogate value, then an attempt is made to read the
-   *       next character.
-   *       <ol>
-   *         <li><b>If the end of the sequence was reached, the negated value of the trailing high
-   *             surrogate is returned.</b>
-   *         <li><b>If the next character was a valid low surrogate, the code point value of the
-   *             high/low surrogate pair is returned.</b>
-   *         <li>If the next character was not a low surrogate value, then {@link
-   *             IllegalArgumentException} is thrown.
-   *       </ol>
-   *   <li>If the first character was a low surrogate value, {@link IllegalArgumentException} is
-   *       thrown.
-   * </ol>
-   *
-   * @param seq the sequence of characters from which to decode the code point
-   * @param index the index of the first character to decode
-   * @param end the index beyond the last valid character to decode
-   * @return the Unicode code point for the given index or the negated value of the trailing high
-   *     surrogate character at the end of the sequence
-   */
-  private static int codePointAt(CharSequence seq, int index, int end) {
-    if (index < end) {
-      char c1 = seq.charAt(index++);
-      if (c1 < Character.MIN_HIGH_SURROGATE || c1 > Character.MAX_LOW_SURROGATE) {
-        // Fast path (first test is probably all we need to do)
-        return c1;
-      } else if (c1 <= Character.MAX_HIGH_SURROGATE) {
-        // If the high surrogate was the last character, return its inverse
-        if (index == end) {
-          return -c1;
+    /**
+     * Returns the Unicode code point of the character at the given index.
+     *
+     * <p>Unlike {@link Character#codePointAt(CharSequence, int)} or {@link String#codePointAt(int)}
+     * this method will never fail silently when encountering an invalid surrogate pair.
+     *
+     * <p>The behaviour of this method is as follows:
+     *
+     * <ol>
+     *   <li>If {@code index >= end}, {@link IndexOutOfBoundsException} is thrown.
+     *   <li><b>If the character at the specified index is not a surrogate, it is returned.</b>
+     *   <li>If the first character was a high surrogate value, then an attempt is made to read the
+     *       next character.
+     *       <ol>
+     *         <li><b>If the end of the sequence was reached, the negated value of the trailing high
+     *             surrogate is returned.</b>
+     *         <li><b>If the next character was a valid low surrogate, the code point value of the
+     *             high/low surrogate pair is returned.</b>
+     *         <li>If the next character was not a low surrogate value, then {@link
+     *             IllegalArgumentException} is thrown.
+     *       </ol>
+     *   <li>If the first character was a low surrogate value, {@link IllegalArgumentException} is
+     *       thrown.
+     * </ol>
+     *
+     * @param seq the sequence of characters from which to decode the code point
+     * @param index the index of the first character to decode
+     * @param end the index beyond the last valid character to decode
+     * @return the Unicode code point for the given index or the negated value of the trailing high
+     *     surrogate character at the end of the sequence
+     */
+    private static int codePointAt(CharSequence seq, int index, int end) {
+        if (index < end) {
+            char c1 = seq.charAt(index++);
+            if (c1 < Character.MIN_HIGH_SURROGATE || c1 > Character.MAX_LOW_SURROGATE) {
+                // Fast path (first test is probably all we need to do)
+                return c1;
+            } else if (c1 <= Character.MAX_HIGH_SURROGATE) {
+                // If the high surrogate was the last character, return its inverse
+                if (index == end) {
+                    return -c1;
+                }
+                // Otherwise look for the low surrogate following it
+                char c2 = seq.charAt(index);
+                if (Character.isLowSurrogate(c2)) {
+                    return Character.toCodePoint(c1, c2);
+                }
+                throw new IllegalArgumentException("Expected low surrogate but got char '"
+                        + c2
+                        + "' with value "
+                        + (int) c2
+                        + " at index "
+                        + index
+                        + " in '"
+                        + seq
+                        + "'");
+            } else {
+                throw new IllegalArgumentException("Unexpected low surrogate character '"
+                        + c1
+                        + "' with value "
+                        + (int) c1
+                        + " at index "
+                        + (index - 1)
+                        + " in '"
+                        + seq
+                        + "'");
+            }
         }
-        // Otherwise look for the low surrogate following it
-        char c2 = seq.charAt(index);
-        if (Character.isLowSurrogate(c2)) {
-          return Character.toCodePoint(c1, c2);
-        }
-        throw new IllegalArgumentException(
-            "Expected low surrogate but got char '"
-                + c2
-                + "' with value "
-                + (int) c2
-                + " at index "
-                + index
-                + " in '"
-                + seq
-                + "'");
-      } else {
-        throw new IllegalArgumentException(
-            "Unexpected low surrogate character '"
-                + c1
-                + "' with value "
-                + (int) c1
-                + " at index "
-                + (index - 1)
-                + " in '"
-                + seq
-                + "'");
-      }
+        throw new IndexOutOfBoundsException("Index exceeds specified range");
     }
-    throw new IndexOutOfBoundsException("Index exceeds specified range");
-  }
 
-  /**
-   * Helper method to grow the character buffer as needed, this only happens once in a while so it's
-   * ok if it's in a method call. If the index passed in is 0 then no copying will be done.
-   */
-  private static char[] growBuffer(char[] dest, int index, int size) {
-    if (size < 0) { // overflow - should be OutOfMemoryError but GWT/j2cl don't support it
-      throw new AssertionError("Cannot increase internal buffer any further");
-    }
-    char[] copy = new char[size];
-    if (index > 0) {
-      System.arraycopy(dest, 0, copy, 0, index);
+    /**
+     * Helper method to grow the character buffer as needed, this only happens once in a while so it's
+     * ok if it's in a method call. If the index passed in is 0 then no copying will be done.
+     */
+    private static char[] growBuffer(char[] dest, int index, int size) {
+        if (size < 0) { // overflow - should be OutOfMemoryError but GWT/j2cl don't support it
+            throw new AssertionError("Cannot increase internal buffer any further");
+        }
+        char[] copy = new char[size];
+        if (index > 0) {
+            System.arraycopy(dest, 0, copy, 0, index);
+        }
+        return copy;
     }
-    return copy;
-  }
 
-  public static class Escaped {
-    public String data;
-    public int size;
+    public static class Escaped {
+        public String data;
+        public int size;
 
-    public Escaped(String data, int size) {
-      this.data = data;
-      this.size = size;
+        public Escaped(String data, int size) {
+            this.data = data;
+            this.size = size;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/SimpleRateLimiter.java b/dd-trace-core/src/main/java/datadog/trace/core/util/SimpleRateLimiter.java
index a011c61f618..53e46ff70a3 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/util/SimpleRateLimiter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/SimpleRateLimiter.java
@@ -10,73 +10,73 @@
  * per second. Tokens are not smoothed across the second.
  */
 public class SimpleRateLimiter {
-  private final TimeSource timeSource;
-  private final int capacity;
-  private final long startNanos;
-  private final AtomicLong secondsAndCount;
+    private final TimeSource timeSource;
+    private final int capacity;
+    private final long startNanos;
+    private final AtomicLong secondsAndCount;
 
-  public SimpleRateLimiter(int rate) {
-    this(rate, SystemTimeSource.INSTANCE);
-  }
+    public SimpleRateLimiter(int rate) {
+        this(rate, SystemTimeSource.INSTANCE);
+    }
 
-  protected SimpleRateLimiter(int rate, TimeSource timeSource) {
-    this.timeSource = timeSource;
-    this.startNanos = timeSource.getNanoTicks();
-    capacity = Math.max(1, rate);
-    secondsAndCount = new AtomicLong(0);
-  }
+    protected SimpleRateLimiter(int rate, TimeSource timeSource) {
+        this.timeSource = timeSource;
+        this.startNanos = timeSource.getNanoTicks();
+        capacity = Math.max(1, rate);
+        secondsAndCount = new AtomicLong(0);
+    }
 
-  public boolean tryAcquire() {
-    long storedSecondsAndCount;
-    long newSecondsAndCount;
-    int seconds = 0;
-    boolean readTime = true;
-    do {
-      storedSecondsAndCount = secondsAndCount.get();
-      if (readTime) {
-        // There will be an issue when the application has been running for more than 2^31 seconds,
-        // roughly 68 years, so that is an acceptable trade off
-        seconds = (int) TimeUnit.NANOSECONDS.toSeconds(timeSource.getNanoTicks() - startNanos);
-        readTime = false;
-      }
-      final int storedSeconds = getStoredSeconds(storedSecondsAndCount);
-      final int storedCount = getStoredCount(storedSecondsAndCount);
-      final int diff = seconds - storedSeconds;
-      if (diff <= 0) {
-        // We're roughly in the same second, so try to acquire a token
-        final int count = storedCount + 1;
-        if (count > capacity || count < 0) {
-          // We're all out of tokens
-          return false;
-        }
-        newSecondsAndCount = combineSecondsAndCount(storedSeconds, count);
-        if (diff < 0) {
-          // If we fail to acquire a token, then reread the time since it's taken too long
-          readTime = true;
-        }
-      } else {
-        // At least one second has elapsed, so try to reset the tokens
-        newSecondsAndCount = combineSecondsAndCount(seconds, 1);
-      }
-    } while (!secondsAndCount.compareAndSet(storedSecondsAndCount, newSecondsAndCount));
+    public boolean tryAcquire() {
+        long storedSecondsAndCount;
+        long newSecondsAndCount;
+        int seconds = 0;
+        boolean readTime = true;
+        do {
+            storedSecondsAndCount = secondsAndCount.get();
+            if (readTime) {
+                // There will be an issue when the application has been running for more than 2^31 seconds,
+                // roughly 68 years, so that is an acceptable trade off
+                seconds = (int) TimeUnit.NANOSECONDS.toSeconds(timeSource.getNanoTicks() - startNanos);
+                readTime = false;
+            }
+            final int storedSeconds = getStoredSeconds(storedSecondsAndCount);
+            final int storedCount = getStoredCount(storedSecondsAndCount);
+            final int diff = seconds - storedSeconds;
+            if (diff <= 0) {
+                // We're roughly in the same second, so try to acquire a token
+                final int count = storedCount + 1;
+                if (count > capacity || count < 0) {
+                    // We're all out of tokens
+                    return false;
+                }
+                newSecondsAndCount = combineSecondsAndCount(storedSeconds, count);
+                if (diff < 0) {
+                    // If we fail to acquire a token, then reread the time since it's taken too long
+                    readTime = true;
+                }
+            } else {
+                // At least one second has elapsed, so try to reset the tokens
+                newSecondsAndCount = combineSecondsAndCount(seconds, 1);
+            }
+        } while (!secondsAndCount.compareAndSet(storedSecondsAndCount, newSecondsAndCount));
 
-    return true;
-  }
+        return true;
+    }
 
-  public int getCapacity() {
-    return capacity;
-  }
+    public int getCapacity() {
+        return capacity;
+    }
 
-  private static int getStoredSeconds(long timeAndCount) {
-    return (int) (timeAndCount >> 32);
-  }
+    private static int getStoredSeconds(long timeAndCount) {
+        return (int) (timeAndCount >> 32);
+    }
 
-  private static int getStoredCount(long timeAndCount) {
-    return (int) (timeAndCount & Integer.MAX_VALUE);
-  }
+    private static int getStoredCount(long timeAndCount) {
+        return (int) (timeAndCount & Integer.MAX_VALUE);
+    }
 
-  private static long combineSecondsAndCount(int seconds, int count) {
-    // We can safely assume that count is a positive int
-    return ((long) (seconds & Integer.MAX_VALUE)) << 32 | count;
-  }
+    private static long combineSecondsAndCount(int seconds, int count) {
+        // We can safely assume that count is a positive int
+        return ((long) (seconds & Integer.MAX_VALUE)) << 32 | count;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/StackTraces.java b/dd-trace-core/src/main/java/datadog/trace/core/util/StackTraces.java
index 47299f034f6..d6f28bfb54a 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/util/StackTraces.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/StackTraces.java
@@ -12,200 +12,195 @@
 import java.util.stream.Collectors;
 
 public final class StackTraces {
-  private StackTraces() {}
-
-  /**
-   * Safely retrieves the message from a throwable.
-   *
-   * <p>Third-party exception classes occasionally use formatting utilities (e.g. {@code
-   * java.text.MessageFormat}) inside {@code getMessage()}, which can throw when the pattern
-   * contains non-integer placeholders.
-   *
-   * @param t the throwable to retrieve the message from
-   * @return {@code null} if {@code t} is {@code null}; the result of {@link Throwable#getMessage()}
-   *     on success; or a diagnostic string of the form {@code "(Exception message unavailable for
-   *     ClassName: getMessage() threw ExceptionType)"} if {@code getMessage()} throws
-   */
-  public static String safeGetMessage(Throwable t) {
-    if (t == null) {
-      return null;
-    }
-    try {
-      return t.getMessage();
-    } catch (Exception | StackOverflowError e) {
-      return "(Exception message unavailable for "
-          + t.getClass().getSimpleName()
-          + ": getMessage() threw "
-          + e.getClass().getSimpleName()
-          + ")";
-    }
-  }
-
-  /**
-   * Returns the stack trace of {@code t} as a string, truncated to {@code maxChars} characters.
-   *
-   * <p>Uses {@link Throwable#printStackTrace(java.io.PrintWriter)} to produce the full trace
-   * including {@code Caused by} and {@code Suppressed} chains. If {@code printStackTrace} itself
-   * throws (e.g. because {@link Throwable#getMessage()} throws inside {@code toString()}), falls
-   * back to reconstructing the trace from {@link Throwable#getStackTrace()} so the call site
-   * remains locatable.
-   *
-   * @param t the throwable to format
-   * @param maxChars maximum length of the returned string
-   * @return the stack trace string, truncated if necessary
-   */
-  public static String getStackTrace(Throwable t, int maxChars) {
-    String trace;
-    try {
-      StringWriter sw = new StringWriter();
-      t.printStackTrace(new PrintWriter(sw));
-      trace = sw.toString();
-    } catch (Exception | StackOverflowError ignored) {
-      // printStackTrace() failed (e.g. getMessage() throws inside toString(), or a
-      // StackOverflowError while formatting an already stack-constrained throwable).
-      // Reconstruct from getStackTrace() so the call site is still locatable.
-      try {
-        trace =
-            t.getClass().getName()
-                + System.lineSeparator()
-                + Arrays.stream(t.getStackTrace())
-                    .map(f -> "\tat " + f)
-                    .collect(Collectors.joining(System.lineSeparator()));
-      } catch (Exception | StackOverflowError ignored2) {
+    private StackTraces() {}
+
+    /**
+     * Safely retrieves the message from a throwable.
+     *
+     * <p>Third-party exception classes occasionally use formatting utilities (e.g. {@code
+     * java.text.MessageFormat}) inside {@code getMessage()}, which can throw when the pattern
+     * contains non-integer placeholders.
+     *
+     * @param t the throwable to retrieve the message from
+     * @return {@code null} if {@code t} is {@code null}; the result of {@link Throwable#getMessage()}
+     *     on success; or a diagnostic string of the form {@code "(Exception message unavailable for
+     *     ClassName: getMessage() threw ExceptionType)"} if {@code getMessage()} throws
+     */
+    public static String safeGetMessage(Throwable t) {
+        if (t == null) {
+            return null;
+        }
         try {
-          trace = t.getClass().getName() + ": " + t.getMessage();
-        } catch (Exception | StackOverflowError ignored3) {
-          trace = t.getClass().getName();
+            return t.getMessage();
+        } catch (Exception | StackOverflowError e) {
+            return "(Exception message unavailable for "
+                    + t.getClass().getSimpleName()
+                    + ": getMessage() threw "
+                    + e.getClass().getSimpleName()
+                    + ")";
         }
-      }
     }
-    try {
-      return truncate(trace, maxChars);
-    } catch (Exception | StackOverflowError e) {
-      // If something goes wrong (including a further StackOverflowError while the stack is
-      // still constrained), return the untruncated trace rather than propagate.
-      return trace;
-    }
-  }
 
-  static String truncate(String trace, int maxChars) {
-    if (trace.length() <= maxChars) {
-      return trace;
+    /**
+     * Returns the stack trace of {@code t} as a string, truncated to {@code maxChars} characters.
+     *
+     * <p>Uses {@link Throwable#printStackTrace(java.io.PrintWriter)} to produce the full trace
+     * including {@code Caused by} and {@code Suppressed} chains. If {@code printStackTrace} itself
+     * throws (e.g. because {@link Throwable#getMessage()} throws inside {@code toString()}), falls
+     * back to reconstructing the trace from {@link Throwable#getStackTrace()} so the call site
+     * remains locatable.
+     *
+     * @param t the throwable to format
+     * @param maxChars maximum length of the returned string
+     * @return the stack trace string, truncated if necessary
+     */
+    public static String getStackTrace(Throwable t, int maxChars) {
+        String trace;
+        try {
+            StringWriter sw = new StringWriter();
+            t.printStackTrace(new PrintWriter(sw));
+            trace = sw.toString();
+        } catch (Exception | StackOverflowError ignored) {
+            // printStackTrace() failed (e.g. getMessage() throws inside toString(), or a
+            // StackOverflowError while formatting an already stack-constrained throwable).
+            // Reconstruct from getStackTrace() so the call site is still locatable.
+            try {
+                trace = t.getClass().getName()
+                        + System.lineSeparator()
+                        + Arrays.stream(t.getStackTrace())
+                                .map(f -> "\tat " + f)
+                                .collect(Collectors.joining(System.lineSeparator()));
+            } catch (Exception | StackOverflowError ignored2) {
+                try {
+                    trace = t.getClass().getName() + ": " + t.getMessage();
+                } catch (Exception | StackOverflowError ignored3) {
+                    trace = t.getClass().getName();
+                }
+            }
+        }
+        try {
+            return truncate(trace, maxChars);
+        } catch (Exception | StackOverflowError e) {
+            // If something goes wrong (including a further StackOverflowError while the stack is
+            // still constrained), return the untruncated trace rather than propagate.
+            return trace;
+        }
     }
 
-    trace = abbreviatePackageNames(trace);
-    if (trace.length() <= maxChars) {
-      return trace;
-    }
+    static String truncate(String trace, int maxChars) {
+        if (trace.length() <= maxChars) {
+            return trace;
+        }
 
-    trace = removeStackTraceMiddleForEachException(trace);
-    if (trace.length() <= maxChars) {
-      return trace;
-    }
+        trace = abbreviatePackageNames(trace);
+        if (trace.length() <= maxChars) {
+            return trace;
+        }
 
-    /* last-ditch centre cut to guarantee the limit */
-    String cutMessage = "\t... trace centre-cut to " + maxChars + " chars ...";
-    int retainedLength = maxChars - cutMessage.length() - 2; // 2 for the newlines
-    if (retainedLength <= 0) {
-      return cutMessage + System.lineSeparator();
+        trace = removeStackTraceMiddleForEachException(trace);
+        if (trace.length() <= maxChars) {
+            return trace;
+        }
+
+        /* last-ditch centre cut to guarantee the limit */
+        String cutMessage = "\t... trace centre-cut to " + maxChars + " chars ...";
+        int retainedLength = maxChars - cutMessage.length() - 2; // 2 for the newlines
+        if (retainedLength <= 0) {
+            return cutMessage + System.lineSeparator();
+        }
+        int half = retainedLength / 2;
+        return trace.substring(0, half)
+                + System.lineSeparator()
+                + cutMessage
+                + System.lineSeparator()
+                + trace.substring(trace.length() - (retainedLength - half));
     }
-    int half = retainedLength / 2;
-    return trace.substring(0, half)
-        + System.lineSeparator()
-        + cutMessage
-        + System.lineSeparator()
-        + trace.substring(trace.length() - (retainedLength - half));
-  }
-
-  private static final Pattern FRAME = Pattern.compile("^\\s*at ([^(]+)(\\(.*)$");
-
-  private static String abbreviatePackageNames(String trace) {
-    StringBuilder sb = new StringBuilder(trace.length());
-    new BufferedReader(new StringReader(trace))
-        .lines()
-        .forEach(
-            line -> {
-              Matcher m = FRAME.matcher(line);
-              if (m.matches()) {
+
+    private static final Pattern FRAME = Pattern.compile("^\\s*at ([^(]+)(\\(.*)$");
+
+    private static String abbreviatePackageNames(String trace) {
+        StringBuilder sb = new StringBuilder(trace.length());
+        new BufferedReader(new StringReader(trace)).lines().forEach(line -> {
+            Matcher m = FRAME.matcher(line);
+            if (m.matches()) {
                 sb.append("\tat ").append(abbreviatePackageName(m.group(1))).append(m.group(2));
-              } else {
+            } else {
                 sb.append(line);
-              }
-              sb.append(System.lineSeparator());
-            });
-    return sb.toString();
-  }
-
-  /**
-   * Abbreviates only the package part of a fully qualified class name with member. For example,
-   * "com.myorg.MyClass.myMethod" to "c.m.MyClass.myMethod". If there is no package (e.g.
-   * "MyClass.myMethod"), returns the input unchanged.
-   */
-  private static String abbreviatePackageName(String fqcnWithMember) {
-    int lastDot = fqcnWithMember.lastIndexOf('.');
-    if (lastDot < 0) {
-      return fqcnWithMember;
-    }
-    int preClassDot = fqcnWithMember.lastIndexOf('.', lastDot - 1);
-    if (preClassDot < 0) {
-      return fqcnWithMember;
+            }
+            sb.append(System.lineSeparator());
+        });
+        return sb.toString();
     }
-    String packagePart = fqcnWithMember.substring(0, preClassDot);
-    String classAndAfter = fqcnWithMember.substring(preClassDot + 1);
-
-    StringBuilder sb = new StringBuilder(fqcnWithMember.length());
-    int segmentStart = 0;
-    for (int i = 0; i <= packagePart.length(); i++) {
-      if (i == packagePart.length() || packagePart.charAt(i) == '.') {
-        sb.append(packagePart.charAt(segmentStart)).append('.');
-        segmentStart = i + 1;
-      }
+
+    /**
+     * Abbreviates only the package part of a fully qualified class name with member. For example,
+     * "com.myorg.MyClass.myMethod" to "c.m.MyClass.myMethod". If there is no package (e.g.
+     * "MyClass.myMethod"), returns the input unchanged.
+     */
+    private static String abbreviatePackageName(String fqcnWithMember) {
+        int lastDot = fqcnWithMember.lastIndexOf('.');
+        if (lastDot < 0) {
+            return fqcnWithMember;
+        }
+        int preClassDot = fqcnWithMember.lastIndexOf('.', lastDot - 1);
+        if (preClassDot < 0) {
+            return fqcnWithMember;
+        }
+        String packagePart = fqcnWithMember.substring(0, preClassDot);
+        String classAndAfter = fqcnWithMember.substring(preClassDot + 1);
+
+        StringBuilder sb = new StringBuilder(fqcnWithMember.length());
+        int segmentStart = 0;
+        for (int i = 0; i <= packagePart.length(); i++) {
+            if (i == packagePart.length() || packagePart.charAt(i) == '.') {
+                sb.append(packagePart.charAt(segmentStart)).append('.');
+                segmentStart = i + 1;
+            }
+        }
+        sb.append(classAndAfter);
+        return sb.toString();
     }
-    sb.append(classAndAfter);
-    return sb.toString();
-  }
-
-  private static final int HEAD_LINES = 8, TAIL_LINES = 4;
-
-  /**
-   * Removes lines from the middle of each exception stack trace, leaving {@link
-   * StackTraces#HEAD_LINES} lines at the beginning and {@link StackTraces#TAIL_LINES} lines at the
-   * end
-   */
-  private static String removeStackTraceMiddleForEachException(String trace) {
-    List<String> lines =
-        new BufferedReader(new StringReader(trace)).lines().collect(Collectors.toList());
-    List<String> out = new ArrayList<>(lines.size());
-    int i = 0;
-    while (i < lines.size()) {
-      out.add(lines.get(i++)); // "Exception ..." / "Caused by: ..."
-      int start = i;
-      while (i < lines.size() && lines.get(i).startsWith("\tat")) {
-        i++;
-      }
-
-      int total = i - start;
-
-      int keepHead = Math.min(HEAD_LINES, total);
-      for (int j = 0; j < keepHead; j++) {
-        out.add(lines.get(start + j));
-      }
-
-      int keepTail = Math.min(TAIL_LINES, total - keepHead);
-      int skipped = total - keepHead - keepTail;
-      if (skipped > 0) {
-        out.add("\t... " + skipped + " trimmed ...");
-      }
-
-      for (int j = total - keepTail; j < total; j++) {
-        out.add(lines.get(start + j));
-      }
-
-      // "... n more" continuation markers
-      if (i < lines.size() && lines.get(i).startsWith("\t...")) {
-        out.add(lines.get(i++));
-      }
+
+    private static final int HEAD_LINES = 8, TAIL_LINES = 4;
+
+    /**
+     * Removes lines from the middle of each exception stack trace, leaving {@link
+     * StackTraces#HEAD_LINES} lines at the beginning and {@link StackTraces#TAIL_LINES} lines at the
+     * end
+     */
+    private static String removeStackTraceMiddleForEachException(String trace) {
+        List<String> lines = new BufferedReader(new StringReader(trace)).lines().collect(Collectors.toList());
+        List<String> out = new ArrayList<>(lines.size());
+        int i = 0;
+        while (i < lines.size()) {
+            out.add(lines.get(i++)); // "Exception ..." / "Caused by: ..."
+            int start = i;
+            while (i < lines.size() && lines.get(i).startsWith("\tat")) {
+                i++;
+            }
+
+            int total = i - start;
+
+            int keepHead = Math.min(HEAD_LINES, total);
+            for (int j = 0; j < keepHead; j++) {
+                out.add(lines.get(start + j));
+            }
+
+            int keepTail = Math.min(TAIL_LINES, total - keepHead);
+            int skipped = total - keepHead - keepTail;
+            if (skipped > 0) {
+                out.add("\t... " + skipped + " trimmed ...");
+            }
+
+            for (int j = total - keepTail; j < total; j++) {
+                out.add(lines.get(start + j));
+            }
+
+            // "... n more" continuation markers
+            if (i < lines.size() && lines.get(i).startsWith("\t...")) {
+                out.add(lines.get(i++));
+            }
+        }
+        return String.join(System.lineSeparator(), out) + System.lineSeparator();
     }
-    return String.join(System.lineSeparator(), out) + System.lineSeparator();
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/SystemAccess.java b/dd-trace-core/src/main/java/datadog/trace/core/util/SystemAccess.java
index da82cf71625..eb5eca1734a 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/util/SystemAccess.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/SystemAccess.java
@@ -5,55 +5,53 @@
 import org.slf4j.LoggerFactory;
 
 public final class SystemAccess {
-  private static final Logger log = LoggerFactory.getLogger(SystemAccess.class);
-  private static volatile SystemAccessProvider systemAccessProvider = SystemAccessProvider.NONE;
+    private static final Logger log = LoggerFactory.getLogger(SystemAccess.class);
+    private static volatile SystemAccessProvider systemAccessProvider = SystemAccessProvider.NONE;
 
-  /**
-   * Disable JMX based system access. Will flip back to the {@linkplain SystemAccessProvider#NONE}
-   * implementation.
-   */
-  public static void disableJmx() {
-    log.debug("Disabling JMX system access provider");
-    systemAccessProvider = SystemAccessProvider.NONE;
-  }
-
-  /** Enable JMX accesses */
-  public static void enableJmx() {
-    if (!Config.get().isProfilingEnabled() && !Config.get().isHealthMetricsEnabled()) {
-      log.debug("Will not enable JMX access. Profiling and metrics are both disabled.");
-      return;
+    /**
+     * Disable JMX based system access. Will flip back to the {@linkplain SystemAccessProvider#NONE}
+     * implementation.
+     */
+    public static void disableJmx() {
+        log.debug("Disabling JMX system access provider");
+        systemAccessProvider = SystemAccessProvider.NONE;
     }
-    try {
-      log.debug("Enabling JMX system provider");
-      /*
-       * Can not use direct class reference to JmxSystemProvider since on some rare JVM implementations
-       * using eager class resolution that class could be resolved at the moment when methods are being loaded,
-       * potentially triggering j.u.l initialization which is potentially dangerous and can be done only at certain
-       * point in time.
-       * Using reflection should alleviate this problem - no class constant to resolve during class load. The JMX
-       * system provider will be loaded at exact moment when the reflection code is executed. Then it is up
-       * to the caller to ensure that it is safe to use JMX.
-       */
-      systemAccessProvider =
-          (SystemAccessProvider)
-              Class.forName(
-                      "datadog.trace.core.util.JmxSystemAccessProvider",
-                      false,
-                      SystemAccess.class.getClassLoader())
-                  .getField("INSTANCE")
-                  .get(null);
-    } catch (final ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
-      log.info("Unable to initialize JMX system provider", e);
+
+    /** Enable JMX accesses */
+    public static void enableJmx() {
+        if (!Config.get().isProfilingEnabled() && !Config.get().isHealthMetricsEnabled()) {
+            log.debug("Will not enable JMX access. Profiling and metrics are both disabled.");
+            return;
+        }
+        try {
+            log.debug("Enabling JMX system provider");
+            /*
+             * Can not use direct class reference to JmxSystemProvider since on some rare JVM implementations
+             * using eager class resolution that class could be resolved at the moment when methods are being loaded,
+             * potentially triggering j.u.l initialization which is potentially dangerous and can be done only at certain
+             * point in time.
+             * Using reflection should alleviate this problem - no class constant to resolve during class load. The JMX
+             * system provider will be loaded at exact moment when the reflection code is executed. Then it is up
+             * to the caller to ensure that it is safe to use JMX.
+             */
+            systemAccessProvider = (SystemAccessProvider) Class.forName(
+                            "datadog.trace.core.util.JmxSystemAccessProvider",
+                            false,
+                            SystemAccess.class.getClassLoader())
+                    .getField("INSTANCE")
+                    .get(null);
+        } catch (final ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
+            log.info("Unable to initialize JMX system provider", e);
+        }
     }
-  }
 
-  /**
-   * Get the current thread CPU time
-   *
-   * @return the actual current thread CPU time or {@linkplain Long#MIN_VALUE} if the JMX provider
-   *     is not available
-   */
-  public static long getCurrentThreadCpuTime() {
-    return systemAccessProvider.getThreadCpuTime();
-  }
+    /**
+     * Get the current thread CPU time
+     *
+     * @return the actual current thread CPU time or {@linkplain Long#MIN_VALUE} if the JMX provider
+     *     is not available
+     */
+    public static long getCurrentThreadCpuTime() {
+        return systemAccessProvider.getThreadCpuTime();
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/SystemAccessProvider.java b/dd-trace-core/src/main/java/datadog/trace/core/util/SystemAccessProvider.java
index b7eb198a29b..ebeb07753d8 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/util/SystemAccessProvider.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/SystemAccessProvider.java
@@ -8,8 +8,8 @@
  * {@linkplain JmxSystemAccessProvider} on-the-fly once JMX is safe to use.
  */
 public interface SystemAccessProvider {
-  SystemAccessProvider NONE = new NoneSystemAccessProvider();
+    SystemAccessProvider NONE = new NoneSystemAccessProvider();
 
-  /** Get the current thread CPU time */
-  long getThreadCpuTime();
+    /** Get the current thread CPU time */
+    long getThreadCpuTime();
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/TagsMatcher.java b/dd-trace-core/src/main/java/datadog/trace/core/util/TagsMatcher.java
index 50b8c287a2f..389156171bb 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/util/TagsMatcher.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/util/TagsMatcher.java
@@ -5,32 +5,32 @@
 import java.util.Map;
 
 public final class TagsMatcher {
-  public static TagsMatcher create(Map<String, String> tags) {
-    Map<String, Matcher> matchers = new HashMap<String, Matcher>(tags.size());
+    public static TagsMatcher create(Map<String, String> tags) {
+        Map<String, Matcher> matchers = new HashMap<String, Matcher>(tags.size());
 
-    for (Map.Entry<String, String> entry : tags.entrySet()) {
-      String tag = entry.getKey();
-      String glob = entry.getValue();
+        for (Map.Entry<String, String> entry : tags.entrySet()) {
+            String tag = entry.getKey();
+            String glob = entry.getValue();
 
-      matchers.put(tag, Matchers.compileGlob(glob));
+            matchers.put(tag, Matchers.compileGlob(glob));
+        }
+        return new TagsMatcher(matchers);
     }
-    return new TagsMatcher(matchers);
-  }
 
-  private final Map<String, Matcher> matchers;
+    private final Map<String, Matcher> matchers;
 
-  public TagsMatcher(Map<String, Matcher> matchers) {
-    this.matchers = matchers;
-  }
+    public TagsMatcher(Map<String, Matcher> matchers) {
+        this.matchers = matchers;
+    }
 
-  public <T extends CoreSpan<T>> boolean matches(T span) {
-    for (Map.Entry<String, Matcher> entry : matchers.entrySet()) {
-      String tag = entry.getKey();
-      Matcher matcher = entry.getValue();
+    public <T extends CoreSpan<T>> boolean matches(T span) {
+        for (Map.Entry<String, Matcher> entry : matchers.entrySet()) {
+            String tag = entry.getKey();
+            Matcher matcher = entry.getValue();
 
-      Object value = span.getTag(tag);
-      if (value == null || !matcher.matches(value)) return false;
+            Object value = span.getTag(tag);
+            if (value == null || !matcher.matches(value)) return false;
+        }
+        return true;
     }
-    return true;
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/lambda/ContentTypeBodyParser.java b/dd-trace-core/src/main/java/datadog/trace/lambda/ContentTypeBodyParser.java
index abfc0e20585..1777b42f556 100644
--- a/dd-trace-core/src/main/java/datadog/trace/lambda/ContentTypeBodyParser.java
+++ b/dd-trace-core/src/main/java/datadog/trace/lambda/ContentTypeBodyParser.java
@@ -25,291 +25,287 @@
  */
 final class ContentTypeBodyParser {
 
-  private static final Logger log = LoggerFactory.getLogger(ContentTypeBodyParser.class);
+    private static final Logger log = LoggerFactory.getLogger(ContentTypeBodyParser.class);
 
-  // These bound the work done in this parser only: exceeding any of them degrades the body to a raw
-  // string rather than dropping content.
-  static final int MAX_BYTES = 1024 * 1024;
-  static final int MAX_PARTS = 256;
-  static final int MAX_DEPTH = 20;
+    // These bound the work done in this parser only: exceeding any of them degrades the body to a raw
+    // string rather than dropping content.
+    static final int MAX_BYTES = 1024 * 1024;
+    static final int MAX_PARTS = 256;
+    static final int MAX_DEPTH = 20;
 
-  /** What a form body's percent-escapes mean when it declares no charset of its own. */
-  private static final String DEFAULT_CHARSET = "UTF-8";
+    /** What a form body's percent-escapes mean when it declares no charset of its own. */
+    private static final String DEFAULT_CHARSET = "UTF-8";
 
-  private ContentTypeBodyParser() {}
-
-  /**
-   * State shared across a whole parse: the byte and part allowances, and the filenames collected
-   * along the way. A multipart part may itself hold a multipart body, so a per-call allowance would
-   * be re-satisfied at every nesting level.
-   */
-  static final class ParseContext {
-    private int bytes;
-    private int parts = MAX_PARTS;
-
-    ParseContext() {
-      this(MAX_BYTES);
-    }
+    private ContentTypeBodyParser() {}
 
     /**
-     * @param byteAllowance the total number of characters this parse may read, nesting included
+     * State shared across a whole parse: the byte and part allowances, and the filenames collected
+     * along the way. A multipart part may itself hold a multipart body, so a per-call allowance would
+     * be re-satisfied at every nesting level.
      */
-    ParseContext(final int byteAllowance) {
-      this.bytes = byteAllowance;
-    }
+    static final class ParseContext {
+        private int bytes;
+        private int parts = MAX_PARTS;
 
-    /** Allocated only once a file part is seen, which most bodies never do. */
-    private List<String> filenames;
+        ParseContext() {
+            this(MAX_BYTES);
+        }
 
-    int remainingParts() {
-      return parts;
-    }
+        /**
+         * @param byteAllowance the total number of characters this parse may read, nesting included
+         */
+        ParseContext(final int byteAllowance) {
+            this.bytes = byteAllowance;
+        }
 
-    void consumeParts(final int count) {
-      parts -= count;
-    }
+        /** Allocated only once a file part is seen, which most bodies never do. */
+        private List<String> filenames;
 
-    /**
-     * @return {@code false} when the parse can no longer afford to read {@code count} characters
-     */
-    boolean takeBytes(final int count) {
-      if (bytes < count) {
-        return false;
-      }
-      bytes -= count;
-      return true;
-    }
+        int remainingParts() {
+            return parts;
+        }
 
-    /**
-     * @return {@code false} once the part allowance is spent. A multipart part and an urlencoded
-     *     parameter both draw from it.
-     */
-    boolean takePart() {
-      if (parts == 0) {
-        return false;
-      }
-      parts--;
-      return true;
-    }
+        void consumeParts(final int count) {
+            parts -= count;
+        }
 
-    void addFilename(final String filename) {
-      if (filenames == null) {
-        filenames = new ArrayList<>(2);
-      }
-      filenames.add(filename);
+        /**
+         * @return {@code false} when the parse can no longer afford to read {@code count} characters
+         */
+        boolean takeBytes(final int count) {
+            if (bytes < count) {
+                return false;
+            }
+            bytes -= count;
+            return true;
+        }
+
+        /**
+         * @return {@code false} once the part allowance is spent. A multipart part and an urlencoded
+         *     parameter both draw from it.
+         */
+        boolean takePart() {
+            if (parts == 0) {
+                return false;
+            }
+            parts--;
+            return true;
+        }
+
+        void addFilename(final String filename) {
+            if (filenames == null) {
+                filenames = new ArrayList<>(2);
+            }
+            filenames.add(filename);
+        }
+
+        /**
+         * @return the filenames of the multipart file parts found, in body order, empty when there were
+         *     none
+         */
+        List<String> filenames() {
+            return filenames == null ? Collections.emptyList() : filenames;
+        }
     }
 
     /**
-     * @return the filenames of the multipart file parts found, in body order, empty when there were
-     *     none
+     * Parses a decoded request body according to its {@code Content-Type}.
+     *
+     * @param context also collects the filenames of any multipart file parts found, which the caller
+     *     reports separately from the body
      */
-    List<String> filenames() {
-      return filenames == null ? Collections.emptyList() : filenames;
+    static Object parseBody(final String body, final String contentType, final ParseContext context) {
+        return dispatch(body, contentType, 0, context);
     }
-  }
-
-  /**
-   * Parses a decoded request body according to its {@code Content-Type}.
-   *
-   * @param context also collects the filenames of any multipart file parts found, which the caller
-   *     reports separately from the body
-   */
-  static Object parseBody(final String body, final String contentType, final ParseContext context) {
-    return dispatch(body, contentType, 0, context);
-  }
 
-  static Object dispatch(
-      final String body, final String contentType, final int depth, final ParseContext context) {
-    if (body == null) {
-      return null;
-    }
-    if (depth >= MAX_DEPTH) {
-      log.debug("Body nesting depth {} reached, keeping raw string", depth);
-      return body;
-    }
-    if (!context.takeBytes(body.length())) {
-      log.debug(
-          "Byte allowance cannot cover a body of {} chars, keeping raw string", body.length());
-      return body;
-    }
-    final MediaType mediaType = MediaType.parse(contentType);
-    if (isJsonOrUntyped(mediaType)) {
-      final Object parsed = LambdaEventParser.parseBodyAsJson(body);
-      return parsed != null ? parsed : body;
-    }
-    if ("application".equals(mediaType.getType())
-        && "x-www-form-urlencoded".equals(mediaType.getSubtype())) {
-      final Object parsed = parseUrlEncoded(body, charsetName(contentType), context);
-      return parsed != null ? parsed : body;
-    }
-    if ("multipart".equals(mediaType.getType())) {
-      final Object parsed = parseMultipart(body, contentType, depth, context);
-      return parsed != null ? parsed : body;
+    static Object dispatch(final String body, final String contentType, final int depth, final ParseContext context) {
+        if (body == null) {
+            return null;
+        }
+        if (depth >= MAX_DEPTH) {
+            log.debug("Body nesting depth {} reached, keeping raw string", depth);
+            return body;
+        }
+        if (!context.takeBytes(body.length())) {
+            log.debug("Byte allowance cannot cover a body of {} chars, keeping raw string", body.length());
+            return body;
+        }
+        final MediaType mediaType = MediaType.parse(contentType);
+        if (isJsonOrUntyped(mediaType)) {
+            final Object parsed = LambdaEventParser.parseBodyAsJson(body);
+            return parsed != null ? parsed : body;
+        }
+        if ("application".equals(mediaType.getType()) && "x-www-form-urlencoded".equals(mediaType.getSubtype())) {
+            final Object parsed = parseUrlEncoded(body, charsetName(contentType), context);
+            return parsed != null ? parsed : body;
+        }
+        if ("multipart".equals(mediaType.getType())) {
+            final Object parsed = parseMultipart(body, contentType, depth, context);
+            return parsed != null ? parsed : body;
+        }
+        // text/* and everything else stay raw strings. In particular a text/plain body of "12345" must
+        // reach the WAF as a String, not as the Double a JSON parse would produce.
+        return body;
     }
-    // text/* and everything else stay raw strings. In particular a text/plain body of "12345" must
-    // reach the WAF as a String, not as the Double a JSON parse would produce.
-    return body;
-  }
 
-  static boolean isJsonOrUntyped(final MediaType mediaType) {
-    final String subtype = mediaType.getSubtype();
-    return mediaType.getType() == null
-        || (subtype != null && (subtype.contains("json") || subtype.contains("javascript")));
-  }
-
-  /**
-   * Parses an {@code application/x-www-form-urlencoded} body into a multimap, matching the shape
-   * produced for query parameters.
-   *
-   * @return the parsed parameters, or {@code null} if nothing usable was found or the body exhausts
-   *     the part allowance
-   */
-  private static Map<String, List<String>> parseUrlEncoded(
-      final String body, final String charset, final ParseContext context) {
-    if (body.isEmpty()) {
-      return null;
-    }
-    final Map<String, List<String>> parameters = new LinkedHashMap<>();
-    final StringTokenizer tokenizer = new StringTokenizer(body, "&");
-    while (tokenizer.hasMoreTokens()) {
-      if (!context.takePart()) {
-        log.debug("Part allowance exhausted, keeping urlencoded body as a raw string");
-        return null;
-      }
-      final String pair = tokenizer.nextToken();
-      final int equals = pair.indexOf('=');
-      // An empty name is kept rather than dropped: the handler still decodes the parameter, so
-      // dropping it would hide its value from the WAF. The Netty body collector keeps it too.
-      final String name = decode(equals == -1 ? pair : pair.substring(0, equals), charset);
-      parameters
-          .computeIfAbsent(name, k -> new ArrayList<>(1))
-          .add(equals == -1 ? "" : decode(pair.substring(equals + 1), charset));
+    static boolean isJsonOrUntyped(final MediaType mediaType) {
+        final String subtype = mediaType.getSubtype();
+        return mediaType.getType() == null
+                || (subtype != null && (subtype.contains("json") || subtype.contains("javascript")));
     }
-    if (parameters.isEmpty()) {
-      return null;
-    }
-    log.debug("Body parsed as {} urlencoded parameters", parameters.size());
-    return parameters;
-  }
 
-  /**
-   * Parses a {@code multipart/*} body into its form fields.
-   *
-   * @return the fields found, or {@code null} if the body has no usable boundary, it holds more
-   *     parts than the allowance, or it yields no field
-   */
-  private static Object parseMultipart(
-      final String body, final String contentType, final int depth, final ParseContext context) {
-    final String boundary = MultipartSplitter.extractBoundary(contentType);
-    if (boundary == null) {
-      log.debug("Multipart body without a usable boundary, keeping raw string");
-      return null;
-    }
-    // One over the allowance, so that a body holding more parts than may be read is distinguishable
-    // from one holding exactly the allowance
-    final int allowance = context.remainingParts();
-    final List<Part> parts = MultipartSplitter.split(body, boundary, allowance + 1);
-    if (parts.size() > allowance) {
-      log.debug("Part allowance exhausted, keeping multipart body as a raw string");
-      return null;
+    /**
+     * Parses an {@code application/x-www-form-urlencoded} body into a multimap, matching the shape
+     * produced for query parameters.
+     *
+     * @return the parsed parameters, or {@code null} if nothing usable was found or the body exhausts
+     *     the part allowance
+     */
+    private static Map<String, List<String>> parseUrlEncoded(
+            final String body, final String charset, final ParseContext context) {
+        if (body.isEmpty()) {
+            return null;
+        }
+        final Map<String, List<String>> parameters = new LinkedHashMap<>();
+        final StringTokenizer tokenizer = new StringTokenizer(body, "&");
+        while (tokenizer.hasMoreTokens()) {
+            if (!context.takePart()) {
+                log.debug("Part allowance exhausted, keeping urlencoded body as a raw string");
+                return null;
+            }
+            final String pair = tokenizer.nextToken();
+            final int equals = pair.indexOf('=');
+            // An empty name is kept rather than dropped: the handler still decodes the parameter, so
+            // dropping it would hide its value from the WAF. The Netty body collector keeps it too.
+            final String name = decode(equals == -1 ? pair : pair.substring(0, equals), charset);
+            parameters
+                    .computeIfAbsent(name, k -> new ArrayList<>(1))
+                    .add(equals == -1 ? "" : decode(pair.substring(equals + 1), charset));
+        }
+        if (parameters.isEmpty()) {
+            return null;
+        }
+        log.debug("Body parsed as {} urlencoded parameters", parameters.size());
+        return parameters;
     }
-    context.consumeParts(parts.size());
 
-    final Map<String, Object> fields = new LinkedHashMap<>();
-    final Map<String, List<Object>> promoted = new HashMap<>();
-    for (final Part part : parts) {
-      final String disposition = part.contentDisposition;
-      if (disposition == null) {
-        continue;
-      }
-      final String filename = MultipartSplitter.parameter(disposition, "filename");
-      if (filename != null) {
-        if (!filename.isEmpty()) {
-          context.addFilename(filename);
+    /**
+     * Parses a {@code multipart/*} body into its form fields.
+     *
+     * @return the fields found, or {@code null} if the body has no usable boundary, it holds more
+     *     parts than the allowance, or it yields no field
+     */
+    private static Object parseMultipart(
+            final String body, final String contentType, final int depth, final ParseContext context) {
+        final String boundary = MultipartSplitter.extractBoundary(contentType);
+        if (boundary == null) {
+            log.debug("Multipart body without a usable boundary, keeping raw string");
+            return null;
         }
-        continue;
-      }
-      // A part with no name parameter at all is not a form field, but one named "" is: the handler
-      // decodes it, so it is reported under the empty key rather than dropped, as Netty does.
-      final String name = MultipartSplitter.parameter(disposition, "name");
-      if (name == null) {
-        continue;
-      }
-      final String partContentType = part.contentType;
-      final String content = body.substring(part.contentStart, part.contentEnd);
-      // A part that declares no type is kept as a raw string
-      final Object value =
-          partContentType == null || partContentType.isEmpty()
-              ? content
-              : dispatch(content, partContentType, depth + 1, context);
-      addField(fields, promoted, name, value);
-    }
-    return fields.isEmpty() ? null : fields;
-  }
+        // One over the allowance, so that a body holding more parts than may be read is distinguishable
+        // from one holding exactly the allowance
+        final int allowance = context.remainingParts();
+        final List<Part> parts = MultipartSplitter.split(body, boundary, allowance + 1);
+        if (parts.size() > allowance) {
+            log.debug("Part allowance exhausted, keeping multipart body as a raw string");
+            return null;
+        }
+        context.consumeParts(parts.size());
 
-  /**
-   * Accumulates a field as a scalar on first sight and promotes it to a list on repeat.
-   * Deliberately a different shape from urlencoded's always-a-list, matching the peer tracers.
-   *
-   * @param promoted the list each promoted field was given, by name, mutated as fields are
-   *     promoted. Tracked rather than inferred from the stored value's type: a part whose body
-   *     parsed as a JSON array is itself a List, and appending to it would flatten the two apart.
-   */
-  private static void addField(
-      final Map<String, Object> fields,
-      final Map<String, List<Object>> promoted,
-      final String name,
-      final Object value) {
-    final List<Object> values = promoted.get(name);
-    if (values != null) {
-      values.add(value);
-      return;
-    }
-    // A part value is never null, so an absent key is exactly a null lookup
-    final Object existing = fields.get(name);
-    if (existing == null) {
-      fields.put(name, value);
-    } else {
-      final List<Object> promotion = new ArrayList<>(2);
-      promotion.add(existing);
-      promotion.add(value);
-      fields.put(name, promotion);
-      promoted.put(name, promotion);
+        final Map<String, Object> fields = new LinkedHashMap<>();
+        final Map<String, List<Object>> promoted = new HashMap<>();
+        for (final Part part : parts) {
+            final String disposition = part.contentDisposition;
+            if (disposition == null) {
+                continue;
+            }
+            final String filename = MultipartSplitter.parameter(disposition, "filename");
+            if (filename != null) {
+                if (!filename.isEmpty()) {
+                    context.addFilename(filename);
+                }
+                continue;
+            }
+            // A part with no name parameter at all is not a form field, but one named "" is: the handler
+            // decodes it, so it is reported under the empty key rather than dropped, as Netty does.
+            final String name = MultipartSplitter.parameter(disposition, "name");
+            if (name == null) {
+                continue;
+            }
+            final String partContentType = part.contentType;
+            final String content = body.substring(part.contentStart, part.contentEnd);
+            // A part that declares no type is kept as a raw string
+            final Object value = partContentType == null || partContentType.isEmpty()
+                    ? content
+                    : dispatch(content, partContentType, depth + 1, context);
+            addField(fields, promoted, name, value);
+        }
+        return fields.isEmpty() ? null : fields;
     }
-  }
 
-  /**
-   * Resolves the charset a form body declares, which decides what its percent-escapes mean: {@code
-   * %E9} is one character under ISO-8859-1 and an invalid sequence under UTF-8. Reading it the way
-   * the handler does keeps the WAF matching on the same value the application consumes.
-   *
-   * @return the declared charset, or UTF-8 when none is declared or it is not one this JVM has
-   */
-  private static String charsetName(final String contentType) {
-    final String declared = MultipartSplitter.parameter(contentType, "charset");
-    if (declared == null || declared.isEmpty()) {
-      return DEFAULT_CHARSET;
-    }
-    try {
-      if (Charset.isSupported(declared)) {
-        return declared;
-      }
-    } catch (final IllegalArgumentException e) {
-      // Not a charset name at all: a body may declare anything
+    /**
+     * Accumulates a field as a scalar on first sight and promotes it to a list on repeat.
+     * Deliberately a different shape from urlencoded's always-a-list, matching the peer tracers.
+     *
+     * @param promoted the list each promoted field was given, by name, mutated as fields are
+     *     promoted. Tracked rather than inferred from the stored value's type: a part whose body
+     *     parsed as a JSON array is itself a List, and appending to it would flatten the two apart.
+     */
+    private static void addField(
+            final Map<String, Object> fields,
+            final Map<String, List<Object>> promoted,
+            final String name,
+            final Object value) {
+        final List<Object> values = promoted.get(name);
+        if (values != null) {
+            values.add(value);
+            return;
+        }
+        // A part value is never null, so an absent key is exactly a null lookup
+        final Object existing = fields.get(name);
+        if (existing == null) {
+            fields.put(name, value);
+        } else {
+            final List<Object> promotion = new ArrayList<>(2);
+            promotion.add(existing);
+            promotion.add(value);
+            fields.put(name, promotion);
+            promoted.put(name, promotion);
+        }
     }
-    log.debug("Unsupported charset {} declared, decoding the body as UTF-8", declared);
-    return DEFAULT_CHARSET;
-  }
 
-  /** Percent-decodes a single token, keeping it undecoded rather than dropping it on failure. */
-  private static String decode(final String value, final String charset) {
-    if (value.isEmpty()) {
-      return value;
+    /**
+     * Resolves the charset a form body declares, which decides what its percent-escapes mean: {@code
+     * %E9} is one character under ISO-8859-1 and an invalid sequence under UTF-8. Reading it the way
+     * the handler does keeps the WAF matching on the same value the application consumes.
+     *
+     * @return the declared charset, or UTF-8 when none is declared or it is not one this JVM has
+     */
+    private static String charsetName(final String contentType) {
+        final String declared = MultipartSplitter.parameter(contentType, "charset");
+        if (declared == null || declared.isEmpty()) {
+            return DEFAULT_CHARSET;
+        }
+        try {
+            if (Charset.isSupported(declared)) {
+                return declared;
+            }
+        } catch (final IllegalArgumentException e) {
+            // Not a charset name at all: a body may declare anything
+        }
+        log.debug("Unsupported charset {} declared, decoding the body as UTF-8", declared);
+        return DEFAULT_CHARSET;
     }
-    try {
-      return URLDecoder.decode(value, charset);
-    } catch (final UnsupportedEncodingException | IllegalArgumentException e) {
-      return value;
+
+    /** Percent-decodes a single token, keeping it undecoded rather than dropping it on failure. */
+    private static String decode(final String value, final String charset) {
+        if (value.isEmpty()) {
+            return value;
+        }
+        try {
+            return URLDecoder.decode(value, charset);
+        } catch (final UnsupportedEncodingException | IllegalArgumentException e) {
+            return value;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaAppSecHandler.java b/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaAppSecHandler.java
index 8ed1eb4cb6a..d64dd4cefb5 100644
--- a/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaAppSecHandler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaAppSecHandler.java
@@ -53,499 +53,475 @@
  */
 public class LambdaAppSecHandler {
 
-  private static final Logger log = LoggerFactory.getLogger(LambdaAppSecHandler.class);
-  private static final RatelimitedLogger rlLog = new RatelimitedLogger(log, 5, TimeUnit.MINUTES);
-
-  /**
-   * Marks an invocation AppSec did not process because the trigger is not HTTP, or if the event is
-   * unreadable (not a {@code ByteArrayInputStream}, empty, oversized, or unparseable).
-   */
-  private static final String UNSUPPORTED_EVENT_TYPE_METRIC = "_dd.appsec.unsupported_event_type";
-
-  // Carries the detected trigger type from processRequestStart to processResponseData within the
-  // same Lambda invocation. Cleared in processRequestEnd.
-  private static final ThreadLocal<LambdaTriggerType> CURRENT_TRIGGER_TYPE = new ThreadLocal<>();
-
-  /**
-   * Processes AppSec request data at the start of a Lambda invocation: invokes all relevant AppSec
-   * gateway callbacks on the parsed event, and, for recognised HTTP triggers, applies the HTTP tags
-   * to the returned context so they land on the invocation span at creation.
-   *
-   * @param event the Lambda event object
-   * @return a {@link TagContext} carrying the AppSec request context and the HTTP tags, or null if
-   *     AppSec is disabled, the trigger is not HTTP, the event is not a parseable payload, or
-   *     processing fails
-   */
-  public static AgentSpanContext processRequestStart(Object event) {
-    if (!ActiveSubsystems.APPSEC_ACTIVE) {
-      log.debug("AppSec is not active, skipping request start processing");
-      return null;
-    }
+    private static final Logger log = LoggerFactory.getLogger(LambdaAppSecHandler.class);
+    private static final RatelimitedLogger rlLog = new RatelimitedLogger(log, 5, TimeUnit.MINUTES);
+
+    /**
+     * Marks an invocation AppSec did not process because the trigger is not HTTP, or if the event is
+     * unreadable (not a {@code ByteArrayInputStream}, empty, oversized, or unparseable).
+     */
+    private static final String UNSUPPORTED_EVENT_TYPE_METRIC = "_dd.appsec.unsupported_event_type";
+
+    // Carries the detected trigger type from processRequestStart to processResponseData within the
+    // same Lambda invocation. Cleared in processRequestEnd.
+    private static final ThreadLocal<LambdaTriggerType> CURRENT_TRIGGER_TYPE = new ThreadLocal<>();
+
+    /**
+     * Processes AppSec request data at the start of a Lambda invocation: invokes all relevant AppSec
+     * gateway callbacks on the parsed event, and, for recognised HTTP triggers, applies the HTTP tags
+     * to the returned context so they land on the invocation span at creation.
+     *
+     * @param event the Lambda event object
+     * @return a {@link TagContext} carrying the AppSec request context and the HTTP tags, or null if
+     *     AppSec is disabled, the trigger is not HTTP, the event is not a parseable payload, or
+     *     processing fails
+     */
+    public static AgentSpanContext processRequestStart(Object event) {
+        if (!ActiveSubsystems.APPSEC_ACTIVE) {
+            log.debug("AppSec is not active, skipping request start processing");
+            return null;
+        }
 
-    CURRENT_TRIGGER_TYPE.set(LambdaTriggerType.UNKNOWN);
+        CURRENT_TRIGGER_TYPE.set(LambdaTriggerType.UNKNOWN);
 
-    if (!(event instanceof ByteArrayInputStream)) {
-      log.debug(
-          "Event is not a ByteArrayInputStream, type: {}",
-          event != null ? event.getClass().getName() : "null");
-      return null;
-    }
+        if (!(event instanceof ByteArrayInputStream)) {
+            log.debug(
+                    "Event is not a ByteArrayInputStream, type: {}",
+                    event != null ? event.getClass().getName() : "null");
+            return null;
+        }
 
-    try {
-      LambdaRequestData eventData = parseEvent((ByteArrayInputStream) event);
-      if (eventData == LambdaRequestData.EMPTY) {
-        return null;
-      }
-      CURRENT_TRIGGER_TYPE.set(eventData.triggerType);
-      if (!eventData.triggerType.isHttp()) {
-        log.debug("Trigger type {} is not HTTP, skipping AppSec processing", eventData.triggerType);
-        // unsupported event metric is added on request end since span doesn't exist yet
-        return null;
-      }
-      // v2 payloads carry the request line verbatim; the others expose the path and a decoded
-      // parameter map only, so the query string has to be rebuilt from them
-      String fullPath = eventData.rawUri;
-      if (fullPath == null && eventData.path != null) {
-        fullPath = buildFullPath(eventData.path, eventData.queryParameters);
-      }
-      LambdaURIDataAdapter uriAdapter =
-          new LambdaURIDataAdapter(fullPath, eventData.headers, eventData.host);
-      AgentSpanContext context = processAppSecRequestData(eventData, uriAdapter);
-      if (context instanceof TagContext) {
-        applyHttpTags((TagContext) context, eventData, uriAdapter);
-      }
-      return context;
-    } catch (Exception e) {
-      log.debug("Failed to process AppSec request data", e);
-      return null;
-    }
-  }
-
-  /**
-   * Invokes the requestEnded gateway callback to add AppSec data to the span, propagates the
-   * sampling decision of trace-tagging rules, and clears the per-invocation state.
-   *
-   * @param span the current span
-   */
-  public static void processRequestEnd(AgentSpan span) {
-    LambdaTriggerType triggerType = CURRENT_TRIGGER_TYPE.get();
-    CURRENT_TRIGGER_TYPE.remove();
-
-    if (!ActiveSubsystems.APPSEC_ACTIVE || span == null || triggerType == null) {
-      return;
+        try {
+            LambdaRequestData eventData = parseEvent((ByteArrayInputStream) event);
+            if (eventData == LambdaRequestData.EMPTY) {
+                return null;
+            }
+            CURRENT_TRIGGER_TYPE.set(eventData.triggerType);
+            if (!eventData.triggerType.isHttp()) {
+                log.debug("Trigger type {} is not HTTP, skipping AppSec processing", eventData.triggerType);
+                // unsupported event metric is added on request end since span doesn't exist yet
+                return null;
+            }
+            // v2 payloads carry the request line verbatim; the others expose the path and a decoded
+            // parameter map only, so the query string has to be rebuilt from them
+            String fullPath = eventData.rawUri;
+            if (fullPath == null && eventData.path != null) {
+                fullPath = buildFullPath(eventData.path, eventData.queryParameters);
+            }
+            LambdaURIDataAdapter uriAdapter = new LambdaURIDataAdapter(fullPath, eventData.headers, eventData.host);
+            AgentSpanContext context = processAppSecRequestData(eventData, uriAdapter);
+            if (context instanceof TagContext) {
+                applyHttpTags((TagContext) context, eventData, uriAdapter);
+            }
+            return context;
+        } catch (Exception e) {
+            log.debug("Failed to process AppSec request data", e);
+            return null;
+        }
     }
 
-    // A null trigger type means processRequestStart never ran, so the invocation was not analysed
-    // at all, which is not the same as an unsupported trigger.
-    if (!triggerType.isHttp()) {
-      span.setMetric(UNSUPPORTED_EVENT_TYPE_METRIC, 1);
-      return;
-    }
+    /**
+     * Invokes the requestEnded gateway callback to add AppSec data to the span, propagates the
+     * sampling decision of trace-tagging rules, and clears the per-invocation state.
+     *
+     * @param span the current span
+     */
+    public static void processRequestEnd(AgentSpan span) {
+        LambdaTriggerType triggerType = CURRENT_TRIGGER_TYPE.get();
+        CURRENT_TRIGGER_TYPE.remove();
+
+        if (!ActiveSubsystems.APPSEC_ACTIVE || span == null || triggerType == null) {
+            return;
+        }
 
-    RequestContext requestContext = span.getRequestContext();
-    Object rawAppSecCtx =
-        requestContext != null ? requestContext.getData(RequestContextSlot.APPSEC) : null;
-    if (rawAppSecCtx != null) {
-      AgentTracer.TracerAPI tracer = AgentTracer.get();
-      BiFunction<RequestContext, IGSpanInfo, Flow<Void>> requestEndedCallback =
-          tracer.getCallbackProvider(RequestContextSlot.APPSEC).getCallback(EVENTS.requestEnded());
-      if (requestEndedCallback != null) {
-        requestEndedCallback.apply(requestContext, span);
-      } else {
-        log.debug("requestEnded callback is null");
-      }
-
-      // In Lambda, the WAF runs in processRequestStart before the span exists.
-      // GatewayBridge propagates ASM_KEEP based on WAF attack events, but not on
-      // isManuallyKept(), which is set by trace-tagging rules that produce no events.
-      // Apply it here so those traces are not silently dropped.
-      AppSecContext appSecCtx =
-          rawAppSecCtx instanceof AppSecContext ? (AppSecContext) rawAppSecCtx : null;
-      if (appSecCtx != null && appSecCtx.isManuallyKept()) {
-        TraceSegment traceSeg = requestContext.getTraceSegment();
-        traceSeg.setTagTop(Tags.ASM_KEEP, true);
-        traceSeg.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
-      }
-    }
-  }
-
-  /**
-   * Processes response data through the WAF before the request context is closed: fires the
-   * response gateway events with the status code, headers and body parsed from the Lambda response,
-   * and sets {@code http.status_code} on the span. Only applies to recognised HTTP triggers.
-   *
-   * @param span the current span
-   * @param result the Lambda handler result (expected to be a ByteArrayOutputStream)
-   */
-  public static void processResponseData(AgentSpan span, Object result) {
-    if (!ActiveSubsystems.APPSEC_ACTIVE
-        || span == null
-        || !(result instanceof ByteArrayOutputStream)) {
-      return;
-    }
+        // A null trigger type means processRequestStart never ran, so the invocation was not analysed
+        // at all, which is not the same as an unsupported trigger.
+        if (!triggerType.isHttp()) {
+            span.setMetric(UNSUPPORTED_EVENT_TYPE_METRIC, 1);
+            return;
+        }
 
-    // Only process response for known HTTP trigger types.
-    LambdaTriggerType triggerType = CURRENT_TRIGGER_TYPE.get();
-    if (triggerType == null || !triggerType.isHttp()) {
-      return;
+        RequestContext requestContext = span.getRequestContext();
+        Object rawAppSecCtx = requestContext != null ? requestContext.getData(RequestContextSlot.APPSEC) : null;
+        if (rawAppSecCtx != null) {
+            AgentTracer.TracerAPI tracer = AgentTracer.get();
+            BiFunction<RequestContext, IGSpanInfo, Flow<Void>> requestEndedCallback =
+                    tracer.getCallbackProvider(RequestContextSlot.APPSEC).getCallback(EVENTS.requestEnded());
+            if (requestEndedCallback != null) {
+                requestEndedCallback.apply(requestContext, span);
+            } else {
+                log.debug("requestEnded callback is null");
+            }
+
+            // In Lambda, the WAF runs in processRequestStart before the span exists.
+            // GatewayBridge propagates ASM_KEEP based on WAF attack events, but not on
+            // isManuallyKept(), which is set by trace-tagging rules that produce no events.
+            // Apply it here so those traces are not silently dropped.
+            AppSecContext appSecCtx = rawAppSecCtx instanceof AppSecContext ? (AppSecContext) rawAppSecCtx : null;
+            if (appSecCtx != null && appSecCtx.isManuallyKept()) {
+                TraceSegment traceSeg = requestContext.getTraceSegment();
+                traceSeg.setTagTop(Tags.ASM_KEEP, true);
+                traceSeg.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
+            }
+        }
     }
 
-    RequestContext requestContext = span.getRequestContext();
-    boolean hasAppSecContext =
-        requestContext != null && requestContext.getData(RequestContextSlot.APPSEC) != null;
-
-    try {
-      byte[] bytes = ((ByteArrayOutputStream) result).toByteArray();
-      if (bytes.length == 0 || bytes.length > MAX_EVENT_SIZE) {
-        log.debug(
-            "Response size {} exceeds limit {} or is empty, skipping response processing",
-            bytes.length,
-            MAX_EVENT_SIZE);
-        return;
-      }
-
-      String rawResponse = new String(bytes, StandardCharsets.UTF_8);
-      LambdaResponseData responseData = parseResponse(rawResponse, triggerType);
-
-      // A missing or non-positive status is not one the client can have seen, so it is published
-      // neither to the span nor to the WAF.
-      Integer statusCode = responseData.statusCode;
-      boolean hasUsableStatus = statusCode != null && statusCode > 0;
-
-      // The only HTTP tag set on the exit path: the status does not exist at span creation.
-      if (hasUsableStatus) {
-        span.setHttpStatusCode(statusCode);
-        boolean isError = Config.get().getHttpServerErrorStatuses().get(statusCode);
-        span.setError(isError, ErrorPriorities.HTTP_SERVER_DECORATOR);
-      }
-
-      // http.status_code is a tracing tag and is published above whether or not AppSec ran: a
-      // failure inside processRequestStart must not also cost the span its status. The WAF
-      // callbacks below, in contrast, have nowhere to deliver without an AppSec request context.
-      if (!hasAppSecContext) {
-        log.debug("Span has no AppSec request context, skipping response WAF callbacks");
-        return;
-      }
-
-      AgentTracer.TracerAPI tracer = AgentTracer.get();
-      CallbackProvider cbp = tracer.getCallbackProvider(RequestContextSlot.APPSEC);
-
-      // Fire response gateway events. Flow results are intentionally ignored: blocking on response
-      // is not supported for Lambda because remote config is unavailable in that environment.
-
-      // Fire responseStarted only for usable HTTP statuses: an unusable one must not unlock
-      // publication of the response status and headers to the WAF.
-      if (hasUsableStatus) {
-        BiFunction<RequestContext, Integer, Flow<Void>> responseStartedCb =
-            cbp.getCallback(EVENTS.responseStarted());
-        if (responseStartedCb != null) {
-          responseStartedCb.apply(requestContext, statusCode);
+    /**
+     * Processes response data through the WAF before the request context is closed: fires the
+     * response gateway events with the status code, headers and body parsed from the Lambda response,
+     * and sets {@code http.status_code} on the span. Only applies to recognised HTTP triggers.
+     *
+     * @param span the current span
+     * @param result the Lambda handler result (expected to be a ByteArrayOutputStream)
+     */
+    public static void processResponseData(AgentSpan span, Object result) {
+        if (!ActiveSubsystems.APPSEC_ACTIVE || span == null || !(result instanceof ByteArrayOutputStream)) {
+            return;
         }
-      }
-
-      // Fire responseHeader for each allowed header
-      if (!responseData.headers.isEmpty()) {
-        TriConsumer<RequestContext, String, String> responseHeaderCb =
-            cbp.getCallback(EVENTS.responseHeader());
-        if (responseHeaderCb != null) {
-          for (Map.Entry<String, String> header : responseData.headers.entrySet()) {
-            responseHeaderCb.accept(requestContext, header.getKey(), header.getValue());
-          }
+
+        // Only process response for known HTTP trigger types.
+        LambdaTriggerType triggerType = CURRENT_TRIGGER_TYPE.get();
+        if (triggerType == null || !triggerType.isHttp()) {
+            return;
         }
-      }
-
-      // Fire responseHeaderDone
-      Function<RequestContext, Flow<Void>> responseHeaderDoneCb =
-          cbp.getCallback(EVENTS.responseHeaderDone());
-      if (responseHeaderDoneCb != null) {
-        responseHeaderDoneCb.apply(requestContext);
-      }
-
-      // Fire responseBody
-      if (responseData.body != null) {
-        BiFunction<RequestContext, Object, Flow<Void>> responseBodyCb =
-            cbp.getCallback(EVENTS.responseBody());
-        if (responseBodyCb != null) {
-          responseBodyCb.apply(requestContext, responseData.body);
+
+        RequestContext requestContext = span.getRequestContext();
+        boolean hasAppSecContext = requestContext != null && requestContext.getData(RequestContextSlot.APPSEC) != null;
+
+        try {
+            byte[] bytes = ((ByteArrayOutputStream) result).toByteArray();
+            if (bytes.length == 0 || bytes.length > MAX_EVENT_SIZE) {
+                log.debug(
+                        "Response size {} exceeds limit {} or is empty, skipping response processing",
+                        bytes.length,
+                        MAX_EVENT_SIZE);
+                return;
+            }
+
+            String rawResponse = new String(bytes, StandardCharsets.UTF_8);
+            LambdaResponseData responseData = parseResponse(rawResponse, triggerType);
+
+            // A missing or non-positive status is not one the client can have seen, so it is published
+            // neither to the span nor to the WAF.
+            Integer statusCode = responseData.statusCode;
+            boolean hasUsableStatus = statusCode != null && statusCode > 0;
+
+            // The only HTTP tag set on the exit path: the status does not exist at span creation.
+            if (hasUsableStatus) {
+                span.setHttpStatusCode(statusCode);
+                boolean isError = Config.get().getHttpServerErrorStatuses().get(statusCode);
+                span.setError(isError, ErrorPriorities.HTTP_SERVER_DECORATOR);
+            }
+
+            // http.status_code is a tracing tag and is published above whether or not AppSec ran: a
+            // failure inside processRequestStart must not also cost the span its status. The WAF
+            // callbacks below, in contrast, have nowhere to deliver without an AppSec request context.
+            if (!hasAppSecContext) {
+                log.debug("Span has no AppSec request context, skipping response WAF callbacks");
+                return;
+            }
+
+            AgentTracer.TracerAPI tracer = AgentTracer.get();
+            CallbackProvider cbp = tracer.getCallbackProvider(RequestContextSlot.APPSEC);
+
+            // Fire response gateway events. Flow results are intentionally ignored: blocking on response
+            // is not supported for Lambda because remote config is unavailable in that environment.
+
+            // Fire responseStarted only for usable HTTP statuses: an unusable one must not unlock
+            // publication of the response status and headers to the WAF.
+            if (hasUsableStatus) {
+                BiFunction<RequestContext, Integer, Flow<Void>> responseStartedCb =
+                        cbp.getCallback(EVENTS.responseStarted());
+                if (responseStartedCb != null) {
+                    responseStartedCb.apply(requestContext, statusCode);
+                }
+            }
+
+            // Fire responseHeader for each allowed header
+            if (!responseData.headers.isEmpty()) {
+                TriConsumer<RequestContext, String, String> responseHeaderCb = cbp.getCallback(EVENTS.responseHeader());
+                if (responseHeaderCb != null) {
+                    for (Map.Entry<String, String> header : responseData.headers.entrySet()) {
+                        responseHeaderCb.accept(requestContext, header.getKey(), header.getValue());
+                    }
+                }
+            }
+
+            // Fire responseHeaderDone
+            Function<RequestContext, Flow<Void>> responseHeaderDoneCb = cbp.getCallback(EVENTS.responseHeaderDone());
+            if (responseHeaderDoneCb != null) {
+                responseHeaderDoneCb.apply(requestContext);
+            }
+
+            // Fire responseBody
+            if (responseData.body != null) {
+                BiFunction<RequestContext, Object, Flow<Void>> responseBodyCb = cbp.getCallback(EVENTS.responseBody());
+                if (responseBodyCb != null) {
+                    responseBodyCb.apply(requestContext, responseData.body);
+                }
+            }
+        } catch (Exception e) {
+            log.debug("Failed to process AppSec response data", e);
         }
-      }
-    } catch (Exception e) {
-      log.debug("Failed to process AppSec response data", e);
-    }
-  }
-
-  /**
-   * Merges the AppSec request context data and the HTTP tags into the context returned by the
-   * Lambda Extension, which is the one that survives and seeds the invocation span.
-   *
-   * @param extensionContext context from the extension, may be null when no extension is in the
-   *     path
-   * @param appSecContext context returned by {@link #processRequestStart(Object)}, may be null
-   * @return the surviving context: the extension one when both are present
-   */
-  public static AgentSpanContext mergeContexts(
-      AgentSpanContext extensionContext, AgentSpanContext appSecContext) {
-    if (appSecContext == null) {
-      return extensionContext;
     }
-    if (extensionContext == null) {
-      return appSecContext;
-    }
-
-    if (appSecContext instanceof TagContext) {
-      TagContext extracted = (TagContext) appSecContext;
-      Object appSecData = extracted.getRequestContextDataAppSec();
 
-      if (extensionContext instanceof TagContext) {
-        TagContext merged = (TagContext) extensionContext;
-        if (appSecData != null) {
-          merged.withRequestContextDataAppSec(appSecData);
+    /**
+     * Merges the AppSec request context data and the HTTP tags into the context returned by the
+     * Lambda Extension, which is the one that survives and seeds the invocation span.
+     *
+     * @param extensionContext context from the extension, may be null when no extension is in the
+     *     path
+     * @param appSecContext context returned by {@link #processRequestStart(Object)}, may be null
+     * @return the surviving context: the extension one when both are present
+     */
+    public static AgentSpanContext mergeContexts(AgentSpanContext extensionContext, AgentSpanContext appSecContext) {
+        if (appSecContext == null) {
+            return extensionContext;
         }
-        // The extension context is the one that survives, so the HTTP tags applied to the AppSec
-        // context have to be carried over: CoreTracer copies them onto the span at creation.
-        // The AppSec-derived values win on a key collision. No collision is reachable today: the
-        // extension context only carries tags for headers mapped through
-        // DD_TRACE_REQUEST_HEADER_TAGS
-        // (ContextInterpreter.handleTags), and those would have to be mapped onto an http.* key.
-        for (TagMap.EntryReader tag : extracted.getTags()) {
-          merged.putTag(tag.tag(), tag.stringValue());
+        if (extensionContext == null) {
+            return appSecContext;
         }
-        return merged;
-      }
-
-      rlLog.warn(
-          "Cannot merge AppSec data: extension context is not a TagContext: {}",
-          extensionContext.getClass());
-    }
-    return extensionContext;
-  }
-
-  /**
-   * Writes the HTTP tags derived from the Lambda event onto the context that will seed the
-   * invocation span. Transcribed from {@code HttpServerDecorator.doOnRequest}, minus the client IP
-   * tags, {@code span.kind} and {@code http.fragment}.
-   */
-  static void applyHttpTags(TagContext ctx, LambdaRequestData req, LambdaURIDataAdapter url) {
-    ctx.putTag(Tags.COMPONENT, "aws-lambda");
-
-    // The synthetic "WEBSOCKET" method stays inside the AppSec path; none is fabricated here.
-    if (req.method != null && req.triggerType != LambdaTriggerType.API_GATEWAY_V2_WEBSOCKET) {
-      ctx.putTag(Tags.HTTP_METHOD, req.method);
-    }
-
-    if (req.host != null) {
-      // No query string: QueryObfuscator obfuscates DDTags.HTTP_QUERY and re-appends it here.
-      ctx.putTag(
-          Tags.HTTP_URL, URIUtils.buildURL(url.scheme(), url.host(), url.port(), url.path()));
-    }
 
-    String query = url.rawQuery();
-    if (query != null && !query.isEmpty() && Config.get().isHttpServerTagQueryString()) {
-      ctx.putTag(DDTags.HTTP_QUERY, query);
+        if (appSecContext instanceof TagContext) {
+            TagContext extracted = (TagContext) appSecContext;
+            Object appSecData = extracted.getRequestContextDataAppSec();
+
+            if (extensionContext instanceof TagContext) {
+                TagContext merged = (TagContext) extensionContext;
+                if (appSecData != null) {
+                    merged.withRequestContextDataAppSec(appSecData);
+                }
+                // The extension context is the one that survives, so the HTTP tags applied to the AppSec
+                // context have to be carried over: CoreTracer copies them onto the span at creation.
+                // The AppSec-derived values win on a key collision. No collision is reachable today: the
+                // extension context only carries tags for headers mapped through
+                // DD_TRACE_REQUEST_HEADER_TAGS
+                // (ContextInterpreter.handleTags), and those would have to be mapped onto an http.* key.
+                for (TagMap.EntryReader tag : extracted.getTags()) {
+                    merged.putTag(tag.tag(), tag.stringValue());
+                }
+                return merged;
+            }
+
+            rlLog.warn(
+                    "Cannot merge AppSec data: extension context is not a TagContext: {}", extensionContext.getClass());
+        }
+        return extensionContext;
     }
 
-    String userAgent = findHeader(req.headers, "user-agent");
-    if (userAgent != null) {
-      ctx.putTag(Tags.HTTP_USER_AGENT, userAgent);
-    }
+    /**
+     * Writes the HTTP tags derived from the Lambda event onto the context that will seed the
+     * invocation span. Transcribed from {@code HttpServerDecorator.doOnRequest}, minus the client IP
+     * tags, {@code span.kind} and {@code http.fragment}.
+     */
+    static void applyHttpTags(TagContext ctx, LambdaRequestData req, LambdaURIDataAdapter url) {
+        ctx.putTag(Tags.COMPONENT, "aws-lambda");
+
+        // The synthetic "WEBSOCKET" method stays inside the AppSec path; none is fabricated here.
+        if (req.method != null && req.triggerType != LambdaTriggerType.API_GATEWAY_V2_WEBSOCKET) {
+            ctx.putTag(Tags.HTTP_METHOD, req.method);
+        }
 
-    if (req.route != null) {
-      ctx.putTag(Tags.HTTP_ROUTE, req.route);
-    }
+        if (req.host != null) {
+            // No query string: QueryObfuscator obfuscates DDTags.HTTP_QUERY and re-appends it here.
+            ctx.putTag(Tags.HTTP_URL, URIUtils.buildURL(url.scheme(), url.host(), url.port(), url.path()));
+        }
 
-    // Deliberately a different host from the one in http.url, as in the decorator
-    String forwardedHost = findHeader(req.headers, "x-forwarded-host");
-    String hostname = forwardedHost != null ? forwardedHost : req.host;
-    if (hostname != null) {
-      ctx.putTag(Tags.HTTP_HOSTNAME, hostname);
-    }
-  }
-
-  /**
-   * Fires the request-phase gateway callbacks against a {@link TemporaryRequestContext}, since the
-   * span does not exist yet, and returns the context carrying the resulting AppSec request context.
-   *
-   * @return the context to hand back to the tracer, or null if AppSec registered no {@code
-   *     requestStarted} callback
-   */
-  private static AgentSpanContext processAppSecRequestData(
-      LambdaRequestData eventData, LambdaURIDataAdapter uriAdapter) {
-    AgentTracer.TracerAPI tracer = AgentTracer.get();
-    Supplier<Flow<Object>> requestStartedCallback =
-        tracer.getCallbackProvider(RequestContextSlot.APPSEC).getCallback(EVENTS.requestStarted());
-    if (requestStartedCallback == null) {
-      log.debug("requestStarted callback is null");
-      return null;
-    }
+        String query = url.rawQuery();
+        if (query != null && !query.isEmpty() && Config.get().isHttpServerTagQueryString()) {
+            ctx.putTag(DDTags.HTTP_QUERY, query);
+        }
 
-    TagContext tagContext = new TagContext();
-    Object appSecRequestContext;
-
-    // Call requestStarted
-    appSecRequestContext = requestStartedCallback.get().getResult();
-    tagContext.withRequestContextDataAppSec(appSecRequestContext);
-
-    if (appSecRequestContext != null) {
-      TemporaryRequestContext requestContext = new TemporaryRequestContext(appSecRequestContext);
-
-      // Call requestMethodUriRaw
-      if (eventData.method != null && eventData.path != null) {
-        datadog.trace.api.function.TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>>
-            methodUriCallback =
-                tracer
-                    .getCallbackProvider(RequestContextSlot.APPSEC)
-                    .getCallback(EVENTS.requestMethodUriRaw());
-        if (methodUriCallback != null) {
-          methodUriCallback.apply(requestContext, eventData.method, uriAdapter);
-        } else {
-          log.debug("requestMethodUriRaw callback is null");
+        String userAgent = findHeader(req.headers, "user-agent");
+        if (userAgent != null) {
+            ctx.putTag(Tags.HTTP_USER_AGENT, userAgent);
         }
-      }
-
-      // Call requestHeader for each header
-      if (eventData.headers != null && !eventData.headers.isEmpty()) {
-        TriConsumer<RequestContext, String, String> headerCallback =
-            tracer
-                .getCallbackProvider(RequestContextSlot.APPSEC)
-                .getCallback(EVENTS.requestHeader());
-        if (headerCallback != null) {
-          for (Map.Entry<String, String> header : eventData.headers.entrySet()) {
-            headerCallback.accept(requestContext, header.getKey(), header.getValue());
-          }
-        } else {
-          log.debug("requestHeader callback is null");
+
+        if (req.route != null) {
+            ctx.putTag(Tags.HTTP_ROUTE, req.route);
         }
-      }
-
-      // Call requestClientSocketAddress
-      if (eventData.sourceIp != null) {
-        datadog.trace.api.function.TriFunction<RequestContext, String, Integer, Flow<Void>>
-            socketAddrCallback =
-                tracer
-                    .getCallbackProvider(RequestContextSlot.APPSEC)
-                    .getCallback(EVENTS.requestClientSocketAddress());
-        if (socketAddrCallback != null) {
-          Integer port = eventData.sourcePort != null ? eventData.sourcePort : 0;
-          socketAddrCallback.apply(requestContext, eventData.sourceIp, port);
-        } else {
-          log.debug("requestClientSocketAddress callback is null");
+
+        // Deliberately a different host from the one in http.url, as in the decorator
+        String forwardedHost = findHeader(req.headers, "x-forwarded-host");
+        String hostname = forwardedHost != null ? forwardedHost : req.host;
+        if (hostname != null) {
+            ctx.putTag(Tags.HTTP_HOSTNAME, hostname);
         }
-      }
-
-      // Call requestHeaderDone
-      Function<RequestContext, Flow<Void>> headerDoneCallback =
-          tracer
-              .getCallbackProvider(RequestContextSlot.APPSEC)
-              .getCallback(EVENTS.requestHeaderDone());
-      if (headerDoneCallback != null) {
-        headerDoneCallback.apply(requestContext);
-      } else {
-        log.debug("requestHeaderDone callback is null");
-      }
-
-      // Call requestPathParams
-      if (eventData.pathParameters != null && !eventData.pathParameters.isEmpty()) {
-        BiFunction<RequestContext, Map<String, ?>, Flow<Void>> pathParamsCallback =
-            tracer
-                .getCallbackProvider(RequestContextSlot.APPSEC)
-                .getCallback(EVENTS.requestPathParams());
-        if (pathParamsCallback != null) {
-          pathParamsCallback.apply(requestContext, eventData.pathParameters);
-        } else {
-          log.debug("requestPathParams callback is null");
+    }
+
+    /**
+     * Fires the request-phase gateway callbacks against a {@link TemporaryRequestContext}, since the
+     * span does not exist yet, and returns the context carrying the resulting AppSec request context.
+     *
+     * @return the context to hand back to the tracer, or null if AppSec registered no {@code
+     *     requestStarted} callback
+     */
+    private static AgentSpanContext processAppSecRequestData(
+            LambdaRequestData eventData, LambdaURIDataAdapter uriAdapter) {
+        AgentTracer.TracerAPI tracer = AgentTracer.get();
+        Supplier<Flow<Object>> requestStartedCallback =
+                tracer.getCallbackProvider(RequestContextSlot.APPSEC).getCallback(EVENTS.requestStarted());
+        if (requestStartedCallback == null) {
+            log.debug("requestStarted callback is null");
+            return null;
         }
-      }
-
-      // Call requestBodyProcessed
-      if (eventData.body != null) {
-        BiFunction<RequestContext, Object, Flow<Void>> bodyCallback =
-            tracer
-                .getCallbackProvider(RequestContextSlot.APPSEC)
-                .getCallback(EVENTS.requestBodyProcessed());
-        if (bodyCallback != null) {
-          bodyCallback.apply(requestContext, eventData.body);
-        } else {
-          log.debug("requestBodyProcessed callback is null");
+
+        TagContext tagContext = new TagContext();
+        Object appSecRequestContext;
+
+        // Call requestStarted
+        appSecRequestContext = requestStartedCallback.get().getResult();
+        tagContext.withRequestContextDataAppSec(appSecRequestContext);
+
+        if (appSecRequestContext != null) {
+            TemporaryRequestContext requestContext = new TemporaryRequestContext(appSecRequestContext);
+
+            // Call requestMethodUriRaw
+            if (eventData.method != null && eventData.path != null) {
+                datadog.trace.api.function.TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>>
+                        methodUriCallback = tracer.getCallbackProvider(RequestContextSlot.APPSEC)
+                                .getCallback(EVENTS.requestMethodUriRaw());
+                if (methodUriCallback != null) {
+                    methodUriCallback.apply(requestContext, eventData.method, uriAdapter);
+                } else {
+                    log.debug("requestMethodUriRaw callback is null");
+                }
+            }
+
+            // Call requestHeader for each header
+            if (eventData.headers != null && !eventData.headers.isEmpty()) {
+                TriConsumer<RequestContext, String, String> headerCallback =
+                        tracer.getCallbackProvider(RequestContextSlot.APPSEC).getCallback(EVENTS.requestHeader());
+                if (headerCallback != null) {
+                    for (Map.Entry<String, String> header : eventData.headers.entrySet()) {
+                        headerCallback.accept(requestContext, header.getKey(), header.getValue());
+                    }
+                } else {
+                    log.debug("requestHeader callback is null");
+                }
+            }
+
+            // Call requestClientSocketAddress
+            if (eventData.sourceIp != null) {
+                datadog.trace.api.function.TriFunction<RequestContext, String, Integer, Flow<Void>> socketAddrCallback =
+                        tracer.getCallbackProvider(RequestContextSlot.APPSEC)
+                                .getCallback(EVENTS.requestClientSocketAddress());
+                if (socketAddrCallback != null) {
+                    Integer port = eventData.sourcePort != null ? eventData.sourcePort : 0;
+                    socketAddrCallback.apply(requestContext, eventData.sourceIp, port);
+                } else {
+                    log.debug("requestClientSocketAddress callback is null");
+                }
+            }
+
+            // Call requestHeaderDone
+            Function<RequestContext, Flow<Void>> headerDoneCallback =
+                    tracer.getCallbackProvider(RequestContextSlot.APPSEC).getCallback(EVENTS.requestHeaderDone());
+            if (headerDoneCallback != null) {
+                headerDoneCallback.apply(requestContext);
+            } else {
+                log.debug("requestHeaderDone callback is null");
+            }
+
+            // Call requestPathParams
+            if (eventData.pathParameters != null && !eventData.pathParameters.isEmpty()) {
+                BiFunction<RequestContext, Map<String, ?>, Flow<Void>> pathParamsCallback =
+                        tracer.getCallbackProvider(RequestContextSlot.APPSEC).getCallback(EVENTS.requestPathParams());
+                if (pathParamsCallback != null) {
+                    pathParamsCallback.apply(requestContext, eventData.pathParameters);
+                } else {
+                    log.debug("requestPathParams callback is null");
+                }
+            }
+
+            // Call requestBodyProcessed
+            if (eventData.body != null) {
+                BiFunction<RequestContext, Object, Flow<Void>> bodyCallback = tracer.getCallbackProvider(
+                                RequestContextSlot.APPSEC)
+                        .getCallback(EVENTS.requestBodyProcessed());
+                if (bodyCallback != null) {
+                    bodyCallback.apply(requestContext, eventData.body);
+                } else {
+                    log.debug("requestBodyProcessed callback is null");
+                }
+            }
+
+            // Call requestFilesFilenames. Only the names are reported: the file content shares the
+            // body's UTF-8 decode, so for anything that is not text it is already lossy.
+            if (!eventData.filenames.isEmpty()) {
+                BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCallback = tracer.getCallbackProvider(
+                                RequestContextSlot.APPSEC)
+                        .getCallback(EVENTS.requestFilesFilenames());
+                if (filenamesCallback != null) {
+                    filenamesCallback.apply(requestContext, eventData.filenames);
+                } else {
+                    log.debug("requestFilesFilenames callback is null");
+                }
+            }
         }
-      }
-
-      // Call requestFilesFilenames. Only the names are reported: the file content shares the
-      // body's UTF-8 decode, so for anything that is not text it is already lossy.
-      if (!eventData.filenames.isEmpty()) {
-        BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCallback =
-            tracer
-                .getCallbackProvider(RequestContextSlot.APPSEC)
-                .getCallback(EVENTS.requestFilesFilenames());
-        if (filenamesCallback != null) {
-          filenamesCallback.apply(requestContext, eventData.filenames);
+        return tagContext;
+    }
+
+    /** Sets the current trigger type thread-local. Package-private for use in tests only. */
+    static void setCurrentTriggerType(LambdaTriggerType type) {
+        if (type == null) {
+            CURRENT_TRIGGER_TYPE.remove();
         } else {
-          log.debug("requestFilesFilenames callback is null");
+            CURRENT_TRIGGER_TYPE.set(type);
         }
-      }
     }
-    return tagContext;
-  }
-
-  /** Sets the current trigger type thread-local. Package-private for use in tests only. */
-  static void setCurrentTriggerType(LambdaTriggerType type) {
-    if (type == null) {
-      CURRENT_TRIGGER_TYPE.remove();
-    } else {
-      CURRENT_TRIGGER_TYPE.set(type);
-    }
-  }
 
-  /**
-   * Temporary RequestContext implementation to hold AppSecRequestContext before a span is created.
-   */
-  private static class TemporaryRequestContext implements RequestContext {
-    private final Object appSecRequestContext;
+    /**
+     * Temporary RequestContext implementation to hold AppSecRequestContext before a span is created.
+     */
+    private static class TemporaryRequestContext implements RequestContext {
+        private final Object appSecRequestContext;
 
-    TemporaryRequestContext(Object appSecRequestContext) {
-      this.appSecRequestContext = appSecRequestContext;
-    }
+        TemporaryRequestContext(Object appSecRequestContext) {
+            this.appSecRequestContext = appSecRequestContext;
+        }
 
-    @Override
-    public <T> T getData(RequestContextSlot slot) {
-      if (slot == RequestContextSlot.APPSEC) {
-        return (T) appSecRequestContext;
-      }
-      return null;
-    }
+        @Override
+        public <T> T getData(RequestContextSlot slot) {
+            if (slot == RequestContextSlot.APPSEC) {
+                return (T) appSecRequestContext;
+            }
+            return null;
+        }
 
-    @Override
-    public TraceSegment getTraceSegment() {
-      return TraceSegment.NoOp.INSTANCE;
-    }
+        @Override
+        public TraceSegment getTraceSegment() {
+            return TraceSegment.NoOp.INSTANCE;
+        }
 
-    @Override
-    public void setBlockResponseFunction(BlockResponseFunction blockResponseFunction) {
-      // No-op for temporary context
-    }
+        @Override
+        public void setBlockResponseFunction(BlockResponseFunction blockResponseFunction) {
+            // No-op for temporary context
+        }
 
-    @Override
-    public BlockResponseFunction getBlockResponseFunction() {
-      return null;
-    }
+        @Override
+        public BlockResponseFunction getBlockResponseFunction() {
+            return null;
+        }
 
-    @Override
-    public <T> T getOrCreateMetaStructTop(String key, Function<String, T> defaultValue) {
-      return null;
-    }
+        @Override
+        public <T> T getOrCreateMetaStructTop(String key, Function<String, T> defaultValue) {
+            return null;
+        }
 
-    @Override
-    public void setClientIpAddressData(ClientIpAddressData clientIpAddressData) {
-      // No-op for temporary context
-    }
+        @Override
+        public void setClientIpAddressData(ClientIpAddressData clientIpAddressData) {
+            // No-op for temporary context
+        }
 
-    @Override
-    public ClientIpAddressData getClientIpAddressData() {
-      return null;
-    }
+        @Override
+        public ClientIpAddressData getClientIpAddressData() {
+            return null;
+        }
 
-    @Override
-    public void close() {
-      // No-op for temporary context
+        @Override
+        public void close() {
+            // No-op for temporary context
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaEventParser.java b/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaEventParser.java
index 6dfcca2729c..0f2a266a822 100644
--- a/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaEventParser.java
+++ b/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaEventParser.java
@@ -29,848 +29,838 @@
  */
 final class LambdaEventParser {
 
-  private static final Logger log = LoggerFactory.getLogger(LambdaEventParser.class);
-
-  private static final Moshi MOSHI = new Moshi.Builder().build();
-  private static final JsonAdapter<Map> MAP_ADAPTER = MOSHI.adapter(Map.class);
-  private static final JsonAdapter<Object> OBJECT_ADAPTER = MOSHI.adapter(Object.class);
-
-  static final int MAX_EVENT_SIZE = Config.get().getAppSecBodyParsingSizeLimit();
-
-  private LambdaEventParser() {}
-
-  /**
-   * Parses a Lambda event payload without consuming it.
-   *
-   * @param inputStream the raw event payload
-   * @return the extracted event data, or {@link LambdaRequestData#EMPTY} if the payload is empty,
-   *     too large or unparseable
-   */
-  static LambdaRequestData parseEvent(ByteArrayInputStream inputStream) throws IOException {
-    inputStream.mark(0);
-    try {
-      int availableBytes = inputStream.available();
-
-      if (availableBytes <= 0 || availableBytes > MAX_EVENT_SIZE) {
-        log.debug(
-            "Event size {} exceeds limit {} or is invalid, skipping AppSec processing",
-            availableBytes,
-            MAX_EVENT_SIZE);
-        return LambdaRequestData.EMPTY;
-      }
-
-      byte[] bytes = new byte[availableBytes];
-      int read = inputStream.read(bytes);
-      if (read <= 0) {
-        return LambdaRequestData.EMPTY;
-      }
-      return parseEvent(new String(bytes, 0, read, StandardCharsets.UTF_8));
-    } finally {
-      inputStream.reset();
-    }
-  }
-
-  static LambdaRequestData parseEvent(String json) {
-    try {
-      // Parse JSON into a Map
-      Map<String, Object> event = MAP_ADAPTER.fromJson(json);
-      log.debug("Event JSON parsed successfully");
-
-      if (event == null) {
-        return LambdaRequestData.EMPTY;
-      }
-
-      // Detect trigger type
-      LambdaTriggerType triggerType = detectTriggerType(event);
-      log.debug("Detected Lambda trigger type: {}", triggerType);
-
-      // Extract data based on trigger type
-      switch (triggerType) {
-        case API_GATEWAY_V1_REST:
-          return extractApiGatewayV1Data(event);
-        case API_GATEWAY_V2_HTTP:
-        case LAMBDA_URL:
-          return extractApiGatewayV2HttpData(event, triggerType);
-        case API_GATEWAY_V2_WEBSOCKET:
-          return extractApiGatewayV2WebSocketData(event);
-        case ALB:
-        case ALB_MULTI_VALUE:
-          return extractAlbData(event, triggerType);
-        default:
-          // Unsupported trigger: returning EMPTY makes the caller skip the invocation, so there is
-          // nothing to extract since the event is not supported.
-          return LambdaRequestData.EMPTY;
-      }
-    } catch (Exception e) {
-      log.debug("Failed to parse event data from JSON", e);
-      return LambdaRequestData.EMPTY;
-    }
-  }
-
-  /**
-   * Parses a Lambda handler response into what the gateway would have put on the wire for the given
-   * trigger.
-   *
-   * <p>A return value that is not an API-GW envelope is reported as the body in full, with the
-   * {@code application/json} content type the gateway applies to it. The envelope-looking fields of
-   * a near-miss payload are then ordinary body content: a {@code body} field stays base64-encoded
-   * and a declared content type is neither honoured nor forwarded, which is what the client sees.
-   *
-   * @param rawResponseString the raw response payload
-   * @param triggerType the trigger the invocation came from
-   * @return the response data, never {@code null}
-   */
-  static LambdaResponseData parseResponse(String rawResponseString, LambdaTriggerType triggerType) {
-    Object rawResponse;
-    try {
-      rawResponse = OBJECT_ADAPTER.fromJson(rawResponseString);
-    } catch (Exception e) {
-      log.debug("Failed to parse response data from JSON", e);
-      // Not JSON at all, so not a valid response for any HTTP trigger.
-      return new LambdaResponseData(
-          null, Collections.singletonMap("content-type", "text/plain"), rawResponseString);
+    private static final Logger log = LoggerFactory.getLogger(LambdaEventParser.class);
+
+    private static final Moshi MOSHI = new Moshi.Builder().build();
+    private static final JsonAdapter<Map> MAP_ADAPTER = MOSHI.adapter(Map.class);
+    private static final JsonAdapter<Object> OBJECT_ADAPTER = MOSHI.adapter(Object.class);
+
+    static final int MAX_EVENT_SIZE = Config.get().getAppSecBodyParsingSizeLimit();
+
+    private LambdaEventParser() {}
+
+    /**
+     * Parses a Lambda event payload without consuming it.
+     *
+     * @param inputStream the raw event payload
+     * @return the extracted event data, or {@link LambdaRequestData#EMPTY} if the payload is empty,
+     *     too large or unparseable
+     */
+    static LambdaRequestData parseEvent(ByteArrayInputStream inputStream) throws IOException {
+        inputStream.mark(0);
+        try {
+            int availableBytes = inputStream.available();
+
+            if (availableBytes <= 0 || availableBytes > MAX_EVENT_SIZE) {
+                log.debug(
+                        "Event size {} exceeds limit {} or is invalid, skipping AppSec processing",
+                        availableBytes,
+                        MAX_EVENT_SIZE);
+                return LambdaRequestData.EMPTY;
+            }
+
+            byte[] bytes = new byte[availableBytes];
+            int read = inputStream.read(bytes);
+            if (read <= 0) {
+                return LambdaRequestData.EMPTY;
+            }
+            return parseEvent(new String(bytes, 0, read, StandardCharsets.UTF_8));
+        } finally {
+            inputStream.reset();
+        }
     }
 
-    Map<?, ?> response = rawResponse instanceof Map ? (Map<?, ?>) rawResponse : null;
+    static LambdaRequestData parseEvent(String json) {
+        try {
+            // Parse JSON into a Map
+            Map<String, Object> event = MAP_ADAPTER.fromJson(json);
+            log.debug("Event JSON parsed successfully");
 
-    // On a trigger with implicit success, a return value without statusCode is not a response the
-    // gateway honours — it serialises the whole value as the body of a 200. Decided before the
-    // envelope fields are read, because they are then ordinary body content.
-    if (triggerType.supportsImplicitSuccessStatus()
-        && (response == null || !response.containsKey("statusCode"))) {
-      return new LambdaResponseData(
-          200, Collections.singletonMap("content-type", "application/json"), rawResponse);
+            if (event == null) {
+                return LambdaRequestData.EMPTY;
+            }
+
+            // Detect trigger type
+            LambdaTriggerType triggerType = detectTriggerType(event);
+            log.debug("Detected Lambda trigger type: {}", triggerType);
+
+            // Extract data based on trigger type
+            switch (triggerType) {
+                case API_GATEWAY_V1_REST:
+                    return extractApiGatewayV1Data(event);
+                case API_GATEWAY_V2_HTTP:
+                case LAMBDA_URL:
+                    return extractApiGatewayV2HttpData(event, triggerType);
+                case API_GATEWAY_V2_WEBSOCKET:
+                    return extractApiGatewayV2WebSocketData(event);
+                case ALB:
+                case ALB_MULTI_VALUE:
+                    return extractAlbData(event, triggerType);
+                default:
+                    // Unsupported trigger: returning EMPTY makes the caller skip the invocation, so there is
+                    // nothing to extract since the event is not supported.
+                    return LambdaRequestData.EMPTY;
+            }
+        } catch (Exception e) {
+            log.debug("Failed to parse event data from JSON", e);
+            return LambdaRequestData.EMPTY;
+        }
     }
 
-    if (response != null) {
-      // The status as the payload carried it, null when it carried none or a non-numeric one
-      Object statusCodeObj = response.get("statusCode");
-      Integer statusCode =
-          statusCodeObj instanceof Number ? ((Number) statusCodeObj).intValue() : null;
+    /**
+     * Parses a Lambda handler response into what the gateway would have put on the wire for the given
+     * trigger.
+     *
+     * <p>A return value that is not an API-GW envelope is reported as the body in full, with the
+     * {@code application/json} content type the gateway applies to it. The envelope-looking fields of
+     * a near-miss payload are then ordinary body content: a {@code body} field stays base64-encoded
+     * and a declared content type is neither honoured nor forwarded, which is what the client sees.
+     *
+     * @param rawResponseString the raw response payload
+     * @param triggerType the trigger the invocation came from
+     * @return the response data, never {@code null}
+     */
+    static LambdaResponseData parseResponse(String rawResponseString, LambdaTriggerType triggerType) {
+        Object rawResponse;
+        try {
+            rawResponse = OBJECT_ADAPTER.fromJson(rawResponseString);
+        } catch (Exception e) {
+            log.debug("Failed to parse response data from JSON", e);
+            // Not JSON at all, so not a valid response for any HTTP trigger.
+            return new LambdaResponseData(
+                    null, Collections.singletonMap("content-type", "text/plain"), rawResponseString);
+        }
 
-      // Extract headers — keys are lowercased to normalise casing across API GW / ALB variants
-      Map<String, String> headers = extractHeaderMap(response.get("headers"));
+        Map<?, ?> response = rawResponse instanceof Map ? (Map<?, ?>) rawResponse : null;
 
-      // Merge multiValueHeaders if present (API GW v1 / ALB), also lowercasing keys
-      headers = mergeMultiValueHeaders(headers, response.get("multiValueHeaders"));
+        // On a trigger with implicit success, a return value without statusCode is not a response the
+        // gateway honours — it serialises the whole value as the body of a 200. Decided before the
+        // envelope fields are read, because they are then ordinary body content.
+        if (triggerType.supportsImplicitSuccessStatus() && (response == null || !response.containsKey("statusCode"))) {
+            return new LambdaResponseData(
+                    200, Collections.singletonMap("content-type", "application/json"), rawResponse);
+        }
 
-      Object body = extractResponseBody(response, headers);
+        if (response != null) {
+            // The status as the payload carried it, null when it carried none or a non-numeric one
+            Object statusCodeObj = response.get("statusCode");
+            Integer statusCode = statusCodeObj instanceof Number ? ((Number) statusCodeObj).intValue() : null;
 
-      // An object carrying none of the envelope fields is an ordinary return value the gateway
-      // serialises wholesale, not a response it honours. Any numeric statusCode counts, including
-      // 0: the handler put it there deliberately, however unusable it is.
-      if (statusCode != null || !headers.isEmpty() || body != null) {
-        return new LambdaResponseData(statusCode, headers, body);
-      }
-    }
+            // Extract headers — keys are lowercased to normalise casing across API GW / ALB variants
+            Map<String, String> headers = extractHeaderMap(response.get("headers"));
 
-    return new LambdaResponseData(
-        null, Collections.singletonMap("content-type", "application/json"), rawResponse);
-  }
+            // Merge multiValueHeaders if present (API GW v1 / ALB), also lowercasing keys
+            headers = mergeMultiValueHeaders(headers, response.get("multiValueHeaders"));
 
-  /** Extracts the {@code body} field of an API-GW envelope, decoded and parsed where applicable. */
-  private static Object extractResponseBody(Map<?, ?> response, Map<String, String> headers) {
-    Object bodyObj = response.get("body");
-    if (bodyObj == null) {
-      return null;
-    }
-    String bodyString = String.valueOf(bodyObj);
-
-    // Handle base64 encoding
-    Object isBase64EncodedObj = response.get("isBase64Encoded");
-    if (Boolean.TRUE.equals(isBase64EncodedObj) || "true".equals(isBase64EncodedObj)) {
-      try {
-        bodyString = new String(Base64.getDecoder().decode(bodyString), StandardCharsets.UTF_8);
-      } catch (Exception e) {
-        log.debug("Failed to decode base64 response body", e);
-        return null;
-      }
-    }
+            Object body = extractResponseBody(response, headers);
 
-    // A response body is only ever structured as JSON, never as urlencoded or multipart
-    MediaType mediaType = MediaType.parse(headers.get("content-type"));
-    Object parsed =
-        ContentTypeBodyParser.isJsonOrUntyped(mediaType) ? parseBodyAsJson(bodyString) : null;
-    return parsed != null ? parsed : bodyString;
-  }
-
-  static LambdaTriggerType detectTriggerType(Map<String, Object> event) {
-    Object requestContextObj = event.get("requestContext");
-
-    if (requestContextObj instanceof Map) {
-      Map<?, ?> requestContext = (Map<?, ?>) requestContextObj;
-
-      // Check for ALB trigger (has elb object)
-      if (requestContext.containsKey("elb")) {
-        // Check if event has multiValueHeaders
-        if (event.containsKey("multiValueHeaders")) {
-          return LambdaTriggerType.ALB_MULTI_VALUE;
-        }
-        return LambdaTriggerType.ALB;
-      }
-
-      // Check for WebSocket
-      if (requestContext.containsKey("connectionId")
-          && (requestContext.containsKey("eventType") || requestContext.containsKey("routeKey"))) {
-        return LambdaTriggerType.API_GATEWAY_V2_WEBSOCKET;
-      }
-
-      // Check for API Gateway v2 format
-      Object httpObj = requestContext.get("http");
-      if (httpObj instanceof Map) {
-        Object domainNameObj = requestContext.get("domainName");
-        if (domainNameObj instanceof String) {
-          String domainName = (String) domainNameObj;
-          if (domainName.contains("lambda-url")) {
-            return LambdaTriggerType.LAMBDA_URL;
-          } else {
-            return LambdaTriggerType.API_GATEWAY_V2_HTTP;
-          }
-        } else {
-          return LambdaTriggerType.LAMBDA_URL;
+            // An object carrying none of the envelope fields is an ordinary return value the gateway
+            // serialises wholesale, not a response it honours. Any numeric statusCode counts, including
+            // 0: the handler put it there deliberately, however unusable it is.
+            if (statusCode != null || !headers.isEmpty() || body != null) {
+                return new LambdaResponseData(statusCode, headers, body);
+            }
         }
-      }
 
-      // Check for API Gateway v1 REST API
-      if (requestContext.containsKey("httpMethod") || requestContext.containsKey("requestId")) {
-        return LambdaTriggerType.API_GATEWAY_V1_REST;
-      }
-    }
-    return LambdaTriggerType.UNKNOWN;
-  }
-
-  /** Extracts data from API Gateway v1 (REST API) event */
-  private static LambdaRequestData extractApiGatewayV1Data(Map<String, Object> event) {
-    // A REST proxy event carries both maps, and the single-value one keeps only the last value of a
-    // repeated header, so the multi-value one is merged over it
-    Map<String, String> headers =
-        mergeMultiValueHeaders(
-            extractHeaders(event.get("headers")), event.get("multiValueHeaders"));
-    Map<String, String> pathParameters = extractPathParameters(event.get("pathParameters"));
-    // Preferred over queryStringParameters, which keeps only the last value of a repeated key
-    Map<String, List<String>> queryParameters =
-        extractMultiValueQueryParameters(event.get("multiValueQueryStringParameters"));
-    if (queryParameters.isEmpty()) {
-      queryParameters = extractQueryParameters(event.get("queryStringParameters"));
-    }
-    ParseContext parseContext = new ParseContext();
-    Object body = extractBody(event, headers, parseContext);
-
-    Map<?, ?> requestContext = (Map<?, ?>) event.get("requestContext");
-    String method = (String) requestContext.get("httpMethod");
-    String path = (String) event.get("path");
-
-    String sourceIp = null;
-    Object identityObj = requestContext.get("identity");
-    if (identityObj instanceof Map) {
-      Map<?, ?> identity = (Map<?, ?>) identityObj;
-      sourceIp = (String) identity.get("sourceIp");
+        return new LambdaResponseData(null, Collections.singletonMap("content-type", "application/json"), rawResponse);
     }
 
-    return new LambdaRequestData(
-        headers,
-        method,
-        path,
-        sourceIp,
-        null,
-        LambdaTriggerType.API_GATEWAY_V1_REST,
-        pathParameters,
-        queryParameters,
-        body,
-        extractHost(requestContext, headers),
-        // REST APIs expose the parameterized route as the top-level "resource"
-        stringOrNull(event.get("resource")),
-        null,
-        parseContext.filenames());
-  }
-
-  /** Extracts data from API Gateway v2 (HTTP API) or Lambda URL event */
-  private static LambdaRequestData extractApiGatewayV2HttpData(
-      Map<String, Object> event, LambdaTriggerType triggerType) {
-    Map<String, String> headers = extractHeadersWithCookies(event);
-    Map<String, String> pathParameters = extractPathParameters(event.get("pathParameters"));
-    Map<String, List<String>> queryParameters =
-        extractQueryParameters(event.get("queryStringParameters"));
-    ParseContext parseContext = new ParseContext();
-    Object body = extractBody(event, headers, parseContext);
-
-    Map<?, ?> requestContext = (Map<?, ?>) event.get("requestContext");
-    Map<?, ?> http = (Map<?, ?>) requestContext.get("http");
-
-    String method = (String) http.get("method");
-    String path = (String) http.get("path");
-    String sourceIp = (String) http.get("sourceIp");
-
-    // Extract port if available
-    Integer sourcePort = null;
-    Object portObj = http.get("sourcePort");
-    if (portObj instanceof Number) {
-      sourcePort = ((Number) portObj).intValue();
-    }
+    /** Extracts the {@code body} field of an API-GW envelope, decoded and parsed where applicable. */
+    private static Object extractResponseBody(Map<?, ?> response, Map<String, String> headers) {
+        Object bodyObj = response.get("body");
+        if (bodyObj == null) {
+            return null;
+        }
+        String bodyString = String.valueOf(bodyObj);
+
+        // Handle base64 encoding
+        Object isBase64EncodedObj = response.get("isBase64Encoded");
+        if (Boolean.TRUE.equals(isBase64EncodedObj) || "true".equals(isBase64EncodedObj)) {
+            try {
+                bodyString = new String(Base64.getDecoder().decode(bodyString), StandardCharsets.UTF_8);
+            } catch (Exception e) {
+                log.debug("Failed to decode base64 response body", e);
+                return null;
+            }
+        }
 
-    return new LambdaRequestData(
-        headers,
-        method,
-        path,
-        sourceIp,
-        sourcePort,
-        triggerType,
-        pathParameters,
-        queryParameters,
-        body,
-        extractHost(requestContext, headers),
-        extractRouteKey(requestContext),
-        extractRawUri(event),
-        parseContext.filenames());
-  }
-
-  /**
-   * Reassembles the verbatim request line from {@code rawPath} and {@code rawQueryString}, or null
-   * when the payload has no {@code rawPath}, so the caller falls back to rebuilding the path.
-   */
-  private static String extractRawUri(Map<String, Object> event) {
-    String rawPath = stringOrNull(event.get("rawPath"));
-    if (rawPath == null) {
-      return null;
-    }
-    // Present but empty whenever the request carried no query string
-    String rawQueryString = stringOrNull(event.get("rawQueryString"));
-    if (rawQueryString == null || rawQueryString.isEmpty()) {
-      return rawPath;
-    }
-    return rawPath + '?' + rawQueryString;
-  }
-
-  /** Extracts data from API Gateway v2 WebSocket event */
-  private static LambdaRequestData extractApiGatewayV2WebSocketData(Map<String, Object> event) {
-    Map<String, String> headers = extractHeadersWithCookies(event);
-    Map<String, String> pathParameters = extractPathParameters(event.get("pathParameters"));
-    Map<String, List<String>> queryParameters =
-        extractQueryParameters(event.get("queryStringParameters"));
-    ParseContext parseContext = new ParseContext();
-    Object body = extractBody(event, headers, parseContext);
-
-    Map<?, ?> requestContext = (Map<?, ?>) event.get("requestContext");
-
-    String method = "WEBSOCKET";
-    String routeKey = (String) requestContext.get("routeKey");
-    String path = routeKey != null ? routeKey : "/";
-
-    String sourceIp = null;
-    Object identityObj = requestContext.get("identity");
-    if (identityObj instanceof Map) {
-      Map<?, ?> identity = (Map<?, ?>) identityObj;
-      sourceIp = (String) identity.get("sourceIp");
+        // A response body is only ever structured as JSON, never as urlencoded or multipart
+        MediaType mediaType = MediaType.parse(headers.get("content-type"));
+        Object parsed = ContentTypeBodyParser.isJsonOrUntyped(mediaType) ? parseBodyAsJson(bodyString) : null;
+        return parsed != null ? parsed : bodyString;
     }
 
-    return new LambdaRequestData(
-        headers,
-        method,
-        path,
-        sourceIp,
-        null,
-        LambdaTriggerType.API_GATEWAY_V2_WEBSOCKET,
-        pathParameters,
-        queryParameters,
-        body,
-        extractHost(requestContext, headers),
-        // Verbatim: WebSocket route keys are not "METHOD /path", and $connect is a real route
-        routeKey,
-        null,
-        parseContext.filenames());
-  }
-
-  /** Extracts data from ALB event (with or without multi-value headers) */
-  private static LambdaRequestData extractAlbData(
-      Map<String, Object> event, LambdaTriggerType triggerType) {
-    Map<String, String> headers;
-
-    if (triggerType == LambdaTriggerType.ALB_MULTI_VALUE) {
-      headers = mergeMultiValueHeaders(new HashMap<>(), event.get("multiValueHeaders"));
-      if (headers.isEmpty()) {
-        // multiValueHeaders was present but unusable — fall back to the single-value map
-        headers = extractHeaders(event.get("headers"));
-      }
-    } else {
-      headers = extractHeaders(event.get("headers"));
-    }
+    static LambdaTriggerType detectTriggerType(Map<String, Object> event) {
+        Object requestContextObj = event.get("requestContext");
 
-    Map<String, String> pathParameters = extractPathParameters(event.get("pathParameters"));
-
-    // ALB can have both queryStringParameters and multiValueQueryStringParameters
-    Map<String, List<String>> queryParameters;
-    if (triggerType == LambdaTriggerType.ALB_MULTI_VALUE) {
-      queryParameters =
-          extractMultiValueQueryParameters(event.get("multiValueQueryStringParameters"));
-      if (queryParameters.isEmpty()) {
-        // ALB_MULTI_VALUE is classified on multiValueHeaders alone, so this map may be absent
-        queryParameters = extractQueryParameters(event.get("queryStringParameters"));
-      }
-    } else {
-      queryParameters = extractQueryParameters(event.get("queryStringParameters"));
-    }
+        if (requestContextObj instanceof Map) {
+            Map<?, ?> requestContext = (Map<?, ?>) requestContextObj;
 
-    ParseContext parseContext = new ParseContext();
-    Object body = extractBody(event, headers, parseContext);
+            // Check for ALB trigger (has elb object)
+            if (requestContext.containsKey("elb")) {
+                // Check if event has multiValueHeaders
+                if (event.containsKey("multiValueHeaders")) {
+                    return LambdaTriggerType.ALB_MULTI_VALUE;
+                }
+                return LambdaTriggerType.ALB;
+            }
 
-    String method = (String) event.get("httpMethod");
-    String path = (String) event.get("path");
-    String xff = headers.get("x-forwarded-for");
-    String sourceIp = null;
-    if (xff != null) {
-      int commaIdx = xff.indexOf(',');
-      sourceIp = (commaIdx >= 0 ? xff.substring(0, commaIdx) : xff).trim();
-    }
+            // Check for WebSocket
+            if (requestContext.containsKey("connectionId")
+                    && (requestContext.containsKey("eventType") || requestContext.containsKey("routeKey"))) {
+                return LambdaTriggerType.API_GATEWAY_V2_WEBSOCKET;
+            }
 
-    // ALB events carry no requestContext.domainName and expose no parameterized route
-    return new LambdaRequestData(
-        headers,
-        method,
-        path,
-        sourceIp,
-        null,
-        triggerType,
-        pathParameters,
-        queryParameters,
-        body,
-        stripPort(findHeader(headers, "host")),
-        null,
-        null,
-        parseContext.filenames());
-  }
-
-  /**
-   * Looks a header up in a map produced by {@link #extractHeaders}, whose keys are already
-   * lowercased, so {@code lowerCaseName} must be lowercase for a match.
-   */
-  static String findHeader(Map<String, String> headers, String lowerCaseName) {
-    return headers == null ? null : headers.get(lowerCaseName);
-  }
-
-  /**
-   * Extracts the host the request was addressed to, used as the authority of {@code http.url},
-   * preferring {@code requestContext.domainName} over the {@code Host} header as the extension
-   * does.
-   */
-  private static String extractHost(Map<?, ?> requestContext, Map<String, String> headers) {
-    if (requestContext != null) {
-      String domainName = stringOrNull(requestContext.get("domainName"));
-      if (domainName != null) {
-        return domainName;
-      }
-    }
-    return stripPort(findHeader(headers, "host"));
-  }
-
-  /**
-   * Removes a trailing {@code :port}, leaving a bracketed IPv6 literal alone unless it too carries
-   * one. The port is tracked separately, from {@code x-forwarded-port}, so a {@code Host} of {@code
-   * example.com:8080} would otherwise have {@code URIUtils.buildURL} emit it twice.
-   */
-  private static String stripPort(String host) {
-    if (host == null) {
-      return null;
-    }
-    int colon = host.lastIndexOf(':');
-    return colon > 0 && colon > host.lastIndexOf(']') ? host.substring(0, colon) : host;
-  }
-
-  /**
-   * Extracts the parameterized route from an API Gateway v2 {@code requestContext.routeKey}, which
-   * has the form {@code "GET /users/{id}"}. {@code $default} is a catch-all, not a route.
-   */
-  private static String extractRouteKey(Map<?, ?> requestContext) {
-    String routeKey = stringOrNull(requestContext.get("routeKey"));
-    if (routeKey == null || "$default".equals(routeKey)) {
-      return null;
-    }
-    int space = routeKey.indexOf(' ');
-    String route = space >= 0 ? routeKey.substring(space + 1).trim() : routeKey;
-    return route.isEmpty() ? null : route;
-  }
-
-  /** Returns the value as a non-empty trimmed string, or {@code null} if it is neither. */
-  private static String stringOrNull(Object value) {
-    if (!(value instanceof String)) {
-      return null;
-    }
-    String trimmed = ((String) value).trim();
-    return trimmed.isEmpty() ? null : trimmed;
-  }
-
-  /**
-   * Helper method to extract a header map from an untyped JSON object. Converts all keys and values
-   * to strings, filtering out null entries. Keys are lowercased.
-   */
-  private static Map<String, String> extractHeaderMap(Object headersObj) {
-    if (!(headersObj instanceof Map)) {
-      return new HashMap<>();
-    }
-    Map<?, ?> rawMap = (Map<?, ?>) headersObj;
-    Map<String, String> headers = new HashMap<>(rawMap.size() * 2);
-    for (Map.Entry<?, ?> entry : rawMap.entrySet()) {
-      if (entry.getKey() != null && entry.getValue() != null) {
-        headers.put(
-            String.valueOf(entry.getKey()).toLowerCase(Locale.ROOT),
-            String.valueOf(entry.getValue()));
-      }
-    }
-    return headers;
-  }
-
-  /** Helper method to extract headers from event. */
-  private static Map<String, String> extractHeaders(Object headersObj) {
-    Map<String, String> headers = extractHeaderMap(headersObj);
-    log.debug("Extracted {} headers", headers.size());
-    if (headers.containsKey("cookie")) {
-      log.debug("Cookie header found with value length: {}", headers.get("cookie").length());
-    }
-    return headers;
-  }
-
-  /**
-   * Merges a {@code multiValueHeaders} map over headers already extracted from the single-value
-   * map, joining a header's values the way its own grammar rejoins them: {@code "; "} for {@code
-   * Cookie} per RFC 6265, {@code ", "} for every other header. API Gateway v1 and ALB send both
-   * maps, and the single-value one keeps only one value of a repeated header, so reading it alone
-   * would hide the others from the WAF.
-   *
-   * @param headers mutated in place and returned; a value it already holds is overwritten by the
-   *     multi-value reading of the same header
-   * @param multiValueHeadersObj the raw event member, of any shape or absent
-   */
-  private static Map<String, String> mergeMultiValueHeaders(
-      Map<String, String> headers, Object multiValueHeadersObj) {
-    if (!(multiValueHeadersObj instanceof Map)) {
-      return headers;
-    }
-    for (Map.Entry<?, ?> entry : ((Map<?, ?>) multiValueHeadersObj).entrySet()) {
-      if (entry.getKey() == null || entry.getValue() == null) {
-        continue;
-      }
-      // Lowercased for the same reason as extractHeaderMap
-      String key = String.valueOf(entry.getKey()).toLowerCase(Locale.ROOT);
-      if (entry.getValue() instanceof List) {
-        List<?> values = (List<?>) entry.getValue();
-        // A cookie value may itself hold a comma, so joining cookies with ", " would let the second
-        // cookie's name be read as part of the first one's value and hide it from the cookie rules
-        String separator = "cookie".equals(key) ? "; " : ", ";
-        headers.put(key, values.stream().map(String::valueOf).collect(joining(separator)));
-      } else {
-        // Not a shape AWS sends, but reported rather than dropped: the runtime would still deliver
-        // the header
-        headers.put(key, String.valueOf(entry.getValue()));
-      }
-    }
-    return headers;
-  }
+            // Check for API Gateway v2 format
+            Object httpObj = requestContext.get("http");
+            if (httpObj instanceof Map) {
+                Object domainNameObj = requestContext.get("domainName");
+                if (domainNameObj instanceof String) {
+                    String domainName = (String) domainNameObj;
+                    if (domainName.contains("lambda-url")) {
+                        return LambdaTriggerType.LAMBDA_URL;
+                    } else {
+                        return LambdaTriggerType.API_GATEWAY_V2_HTTP;
+                    }
+                } else {
+                    return LambdaTriggerType.LAMBDA_URL;
+                }
+            }
 
-  /** Helper method to extract path parameters from event. */
-  private static Map<String, String> extractPathParameters(Object pathParamsObj) {
-    if (!(pathParamsObj instanceof Map)) {
-      return new HashMap<>();
-    }
-    Map<?, ?> rawMap = (Map<?, ?>) pathParamsObj;
-    Map<String, String> pathParams = new HashMap<>(rawMap.size() * 2);
-    for (Map.Entry<?, ?> entry : rawMap.entrySet()) {
-      if (entry.getKey() != null && entry.getValue() != null) {
-        pathParams.put(String.valueOf(entry.getKey()), String.valueOf(entry.getValue()));
-      }
+            // Check for API Gateway v1 REST API
+            if (requestContext.containsKey("httpMethod") || requestContext.containsKey("requestId")) {
+                return LambdaTriggerType.API_GATEWAY_V1_REST;
+            }
+        }
+        return LambdaTriggerType.UNKNOWN;
+    }
+
+    /** Extracts data from API Gateway v1 (REST API) event */
+    private static LambdaRequestData extractApiGatewayV1Data(Map<String, Object> event) {
+        // A REST proxy event carries both maps, and the single-value one keeps only the last value of a
+        // repeated header, so the multi-value one is merged over it
+        Map<String, String> headers =
+                mergeMultiValueHeaders(extractHeaders(event.get("headers")), event.get("multiValueHeaders"));
+        Map<String, String> pathParameters = extractPathParameters(event.get("pathParameters"));
+        // Preferred over queryStringParameters, which keeps only the last value of a repeated key
+        Map<String, List<String>> queryParameters =
+                extractMultiValueQueryParameters(event.get("multiValueQueryStringParameters"));
+        if (queryParameters.isEmpty()) {
+            queryParameters = extractQueryParameters(event.get("queryStringParameters"));
+        }
+        ParseContext parseContext = new ParseContext();
+        Object body = extractBody(event, headers, parseContext);
+
+        Map<?, ?> requestContext = (Map<?, ?>) event.get("requestContext");
+        String method = (String) requestContext.get("httpMethod");
+        String path = (String) event.get("path");
+
+        String sourceIp = null;
+        Object identityObj = requestContext.get("identity");
+        if (identityObj instanceof Map) {
+            Map<?, ?> identity = (Map<?, ?>) identityObj;
+            sourceIp = (String) identity.get("sourceIp");
+        }
+
+        return new LambdaRequestData(
+                headers,
+                method,
+                path,
+                sourceIp,
+                null,
+                LambdaTriggerType.API_GATEWAY_V1_REST,
+                pathParameters,
+                queryParameters,
+                body,
+                extractHost(requestContext, headers),
+                // REST APIs expose the parameterized route as the top-level "resource"
+                stringOrNull(event.get("resource")),
+                null,
+                parseContext.filenames());
+    }
+
+    /** Extracts data from API Gateway v2 (HTTP API) or Lambda URL event */
+    private static LambdaRequestData extractApiGatewayV2HttpData(
+            Map<String, Object> event, LambdaTriggerType triggerType) {
+        Map<String, String> headers = extractHeadersWithCookies(event);
+        Map<String, String> pathParameters = extractPathParameters(event.get("pathParameters"));
+        Map<String, List<String>> queryParameters = extractQueryParameters(event.get("queryStringParameters"));
+        ParseContext parseContext = new ParseContext();
+        Object body = extractBody(event, headers, parseContext);
+
+        Map<?, ?> requestContext = (Map<?, ?>) event.get("requestContext");
+        Map<?, ?> http = (Map<?, ?>) requestContext.get("http");
+
+        String method = (String) http.get("method");
+        String path = (String) http.get("path");
+        String sourceIp = (String) http.get("sourceIp");
+
+        // Extract port if available
+        Integer sourcePort = null;
+        Object portObj = http.get("sourcePort");
+        if (portObj instanceof Number) {
+            sourcePort = ((Number) portObj).intValue();
+        }
+
+        return new LambdaRequestData(
+                headers,
+                method,
+                path,
+                sourceIp,
+                sourcePort,
+                triggerType,
+                pathParameters,
+                queryParameters,
+                body,
+                extractHost(requestContext, headers),
+                extractRouteKey(requestContext),
+                extractRawUri(event),
+                parseContext.filenames());
     }
-    log.debug("Extracted {} path parameters", pathParams.size());
-    return pathParams;
-  }
-
-  /**
-   * Helper method to extract query parameters from event. Converts Map<String, String> to
-   * Map<String, List<String>> format expected by AppSec.
-   *
-   * <p>Insertion-ordered so the query string rebuilt by {@link #buildFullPath} follows the event
-   * rather than varying with hash order between invocations of the same request shape.
-   */
-  private static Map<String, List<String>> extractQueryParameters(Object queryParamsObj) {
-    Map<String, List<String>> result = new LinkedHashMap<>();
-    if (queryParamsObj instanceof Map) {
-      Map<?, ?> rawMap = (Map<?, ?>) queryParamsObj;
-      for (Map.Entry<?, ?> entry : rawMap.entrySet()) {
-        if (entry.getKey() != null && entry.getValue() != null) {
-          String key = String.valueOf(entry.getKey());
-          String value = String.valueOf(entry.getValue());
-          result.put(key, Collections.singletonList(value));
-        }
-      }
+
+    /**
+     * Reassembles the verbatim request line from {@code rawPath} and {@code rawQueryString}, or null
+     * when the payload has no {@code rawPath}, so the caller falls back to rebuilding the path.
+     */
+    private static String extractRawUri(Map<String, Object> event) {
+        String rawPath = stringOrNull(event.get("rawPath"));
+        if (rawPath == null) {
+            return null;
+        }
+        // Present but empty whenever the request carried no query string
+        String rawQueryString = stringOrNull(event.get("rawQueryString"));
+        if (rawQueryString == null || rawQueryString.isEmpty()) {
+            return rawPath;
+        }
+        return rawPath + '?' + rawQueryString;
     }
-    log.debug("Extracted {} query parameters", result.size());
-    return result;
-  }
-
-  /**
-   * Helper method to extract multi-value query parameters (used by ALB). Handles Map<String,
-   * List<String>> format directly.
-   *
-   * <p>Insertion-ordered for the same reason as {@link #extractQueryParameters}.
-   */
-  private static Map<String, List<String>> extractMultiValueQueryParameters(Object queryParamsObj) {
-    Map<String, List<String>> result = new LinkedHashMap<>();
-    if (queryParamsObj instanceof Map) {
-      Map<?, ?> rawMap = (Map<?, ?>) queryParamsObj;
-      for (Map.Entry<?, ?> entry : rawMap.entrySet()) {
-        if (entry.getKey() != null && entry.getValue() != null) {
-          String key = String.valueOf(entry.getKey());
-          if (entry.getValue() instanceof List) {
-            List<?> values = (List<?>) entry.getValue();
-            List<String> stringValues = new ArrayList<>();
-            for (Object value : values) {
-              if (value != null) {
-                stringValues.add(String.valueOf(value));
-              }
+
+    /** Extracts data from API Gateway v2 WebSocket event */
+    private static LambdaRequestData extractApiGatewayV2WebSocketData(Map<String, Object> event) {
+        Map<String, String> headers = extractHeadersWithCookies(event);
+        Map<String, String> pathParameters = extractPathParameters(event.get("pathParameters"));
+        Map<String, List<String>> queryParameters = extractQueryParameters(event.get("queryStringParameters"));
+        ParseContext parseContext = new ParseContext();
+        Object body = extractBody(event, headers, parseContext);
+
+        Map<?, ?> requestContext = (Map<?, ?>) event.get("requestContext");
+
+        String method = "WEBSOCKET";
+        String routeKey = (String) requestContext.get("routeKey");
+        String path = routeKey != null ? routeKey : "/";
+
+        String sourceIp = null;
+        Object identityObj = requestContext.get("identity");
+        if (identityObj instanceof Map) {
+            Map<?, ?> identity = (Map<?, ?>) identityObj;
+            sourceIp = (String) identity.get("sourceIp");
+        }
+
+        return new LambdaRequestData(
+                headers,
+                method,
+                path,
+                sourceIp,
+                null,
+                LambdaTriggerType.API_GATEWAY_V2_WEBSOCKET,
+                pathParameters,
+                queryParameters,
+                body,
+                extractHost(requestContext, headers),
+                // Verbatim: WebSocket route keys are not "METHOD /path", and $connect is a real route
+                routeKey,
+                null,
+                parseContext.filenames());
+    }
+
+    /** Extracts data from ALB event (with or without multi-value headers) */
+    private static LambdaRequestData extractAlbData(Map<String, Object> event, LambdaTriggerType triggerType) {
+        Map<String, String> headers;
+
+        if (triggerType == LambdaTriggerType.ALB_MULTI_VALUE) {
+            headers = mergeMultiValueHeaders(new HashMap<>(), event.get("multiValueHeaders"));
+            if (headers.isEmpty()) {
+                // multiValueHeaders was present but unusable — fall back to the single-value map
+                headers = extractHeaders(event.get("headers"));
             }
-            result.put(key, stringValues);
-          } else {
-            result.put(key, Collections.singletonList(String.valueOf(entry.getValue())));
-          }
+        } else {
+            headers = extractHeaders(event.get("headers"));
         }
-      }
-    }
-    log.debug("Extracted {} multi-value query parameters", result.size());
-    return result;
-  }
-
-  /**
-   * Helper method to build full path including query string. Lambda events provide path and query
-   * parameters separately, so we need to reconstruct the full URI for AppSec to parse.
-   */
-  static String buildFullPath(String path, Map<String, List<String>> queryParameters) {
-    if (queryParameters == null || queryParameters.isEmpty()) {
-      return path;
+
+        Map<String, String> pathParameters = extractPathParameters(event.get("pathParameters"));
+
+        // ALB can have both queryStringParameters and multiValueQueryStringParameters
+        Map<String, List<String>> queryParameters;
+        if (triggerType == LambdaTriggerType.ALB_MULTI_VALUE) {
+            queryParameters = extractMultiValueQueryParameters(event.get("multiValueQueryStringParameters"));
+            if (queryParameters.isEmpty()) {
+                // ALB_MULTI_VALUE is classified on multiValueHeaders alone, so this map may be absent
+                queryParameters = extractQueryParameters(event.get("queryStringParameters"));
+            }
+        } else {
+            queryParameters = extractQueryParameters(event.get("queryStringParameters"));
+        }
+
+        ParseContext parseContext = new ParseContext();
+        Object body = extractBody(event, headers, parseContext);
+
+        String method = (String) event.get("httpMethod");
+        String path = (String) event.get("path");
+        String xff = headers.get("x-forwarded-for");
+        String sourceIp = null;
+        if (xff != null) {
+            int commaIdx = xff.indexOf(',');
+            sourceIp = (commaIdx >= 0 ? xff.substring(0, commaIdx) : xff).trim();
+        }
+
+        // ALB events carry no requestContext.domainName and expose no parameterized route
+        return new LambdaRequestData(
+                headers,
+                method,
+                path,
+                sourceIp,
+                null,
+                triggerType,
+                pathParameters,
+                queryParameters,
+                body,
+                stripPort(findHeader(headers, "host")),
+                null,
+                null,
+                parseContext.filenames());
     }
 
-    StringBuilder fullPath = new StringBuilder(path);
-    fullPath.append('?');
+    /**
+     * Looks a header up in a map produced by {@link #extractHeaders}, whose keys are already
+     * lowercased, so {@code lowerCaseName} must be lowercase for a match.
+     */
+    static String findHeader(Map<String, String> headers, String lowerCaseName) {
+        return headers == null ? null : headers.get(lowerCaseName);
+    }
 
-    boolean first = true;
-    for (Map.Entry<String, List<String>> entry : queryParameters.entrySet()) {
-      String key = entry.getKey();
-      for (String value : entry.getValue()) {
-        if (!first) {
-          fullPath.append('&');
+    /**
+     * Extracts the host the request was addressed to, used as the authority of {@code http.url},
+     * preferring {@code requestContext.domainName} over the {@code Host} header as the extension
+     * does.
+     */
+    private static String extractHost(Map<?, ?> requestContext, Map<String, String> headers) {
+        if (requestContext != null) {
+            String domainName = stringOrNull(requestContext.get("domainName"));
+            if (domainName != null) {
+                return domainName;
+            }
         }
-        first = false;
-        try {
-          // Encoded so a '&' inside a value is not read as a delimiter when AppSec re-parses it
-          fullPath.append(URLEncoder.encode(key, "UTF-8"));
-          if (value != null) {
-            fullPath.append('=').append(URLEncoder.encode(value, "UTF-8"));
-          }
-        } catch (java.io.UnsupportedEncodingException e) {
-          // UTF-8 is always available; fall back to unencoded
-          fullPath.append(key);
-          if (value != null) {
-            fullPath.append('=').append(value);
-          }
-        }
-      }
+        return stripPort(findHeader(headers, "host"));
     }
 
-    return fullPath.toString();
-  }
-
-  /**
-   * Helper method to extract and merge headers with cookies array from event. API Gateway v2
-   * provides a separate 'cookies' array that should be merged with headers.
-   */
-  private static Map<String, String> extractHeadersWithCookies(Map<String, Object> event) {
-    Map<String, String> headers = extractHeaders(event.get("headers"));
-
-    // API Gateway v2 provides a pre-parsed cookies array
-    Object cookiesObj = event.get("cookies");
-    if (cookiesObj instanceof List) {
-      List<?> cookiesList = (List<?>) cookiesObj;
-      if (!cookiesList.isEmpty()) {
-        // Join cookies with "; " separator per RFC 6265
-        String cookieValue = cookiesList.stream().map(String::valueOf).collect(joining("; "));
-
-        // Merge with existing cookie header if present
-        String existingCookie = headers.get("cookie");
-        if (existingCookie != null && !existingCookie.isEmpty()) {
-          headers.put("cookie", existingCookie + "; " + cookieValue);
-        } else {
-          headers.put("cookie", cookieValue);
+    /**
+     * Removes a trailing {@code :port}, leaving a bracketed IPv6 literal alone unless it too carries
+     * one. The port is tracked separately, from {@code x-forwarded-port}, so a {@code Host} of {@code
+     * example.com:8080} would otherwise have {@code URIUtils.buildURL} emit it twice.
+     */
+    private static String stripPort(String host) {
+        if (host == null) {
+            return null;
         }
-      }
+        int colon = host.lastIndexOf(':');
+        return colon > 0 && colon > host.lastIndexOf(']') ? host.substring(0, colon) : host;
     }
 
-    return headers;
-  }
+    /**
+     * Extracts the parameterized route from an API Gateway v2 {@code requestContext.routeKey}, which
+     * has the form {@code "GET /users/{id}"}. {@code $default} is a catch-all, not a route.
+     */
+    private static String extractRouteKey(Map<?, ?> requestContext) {
+        String routeKey = stringOrNull(requestContext.get("routeKey"));
+        if (routeKey == null || "$default".equals(routeKey)) {
+            return null;
+        }
+        int space = routeKey.indexOf(' ');
+        String route = space >= 0 ? routeKey.substring(space + 1).trim() : routeKey;
+        return route.isEmpty() ? null : route;
+    }
 
-  /** Helper method to extract and parse body from event */
-  private static Object extractBody(
-      Map<String, Object> event, Map<String, String> headers, ParseContext parseContext) {
-    Object bodyObj = event.get("body");
-    if (bodyObj == null) {
-      return null;
+    /** Returns the value as a non-empty trimmed string, or {@code null} if it is neither. */
+    private static String stringOrNull(Object value) {
+        if (!(value instanceof String)) {
+            return null;
+        }
+        String trimmed = ((String) value).trim();
+        return trimmed.isEmpty() ? null : trimmed;
     }
 
-    String bodyString = String.valueOf(bodyObj);
-
-    // Check if body is base64 encoded (API Gateway feature)
-    Object isBase64EncodedObj = event.get("isBase64Encoded");
-    if (Boolean.TRUE.equals(isBase64EncodedObj) || "true".equals(isBase64EncodedObj)) {
-      try {
-        bodyString = new String(Base64.getDecoder().decode(bodyString), StandardCharsets.UTF_8);
-      } catch (Exception e) {
-        log.debug("Failed to decode base64 body", e);
-        return null;
-      }
+    /**
+     * Helper method to extract a header map from an untyped JSON object. Converts all keys and values
+     * to strings, filtering out null entries. Keys are lowercased.
+     */
+    private static Map<String, String> extractHeaderMap(Object headersObj) {
+        if (!(headersObj instanceof Map)) {
+            return new HashMap<>();
+        }
+        Map<?, ?> rawMap = (Map<?, ?>) headersObj;
+        Map<String, String> headers = new HashMap<>(rawMap.size() * 2);
+        for (Map.Entry<?, ?> entry : rawMap.entrySet()) {
+            if (entry.getKey() != null && entry.getValue() != null) {
+                headers.put(String.valueOf(entry.getKey()).toLowerCase(Locale.ROOT), String.valueOf(entry.getValue()));
+            }
+        }
+        return headers;
     }
 
-    return ContentTypeBodyParser.parseBody(bodyString, headers.get("content-type"), parseContext);
-  }
+    /** Helper method to extract headers from event. */
+    private static Map<String, String> extractHeaders(Object headersObj) {
+        Map<String, String> headers = extractHeaderMap(headersObj);
+        log.debug("Extracted {} headers", headers.size());
+        if (headers.containsKey("cookie")) {
+            log.debug(
+                    "Cookie header found with value length: {}",
+                    headers.get("cookie").length());
+        }
+        return headers;
+    }
 
-  /** Helper method to parse body as JSON */
-  static Object parseBodyAsJson(String body) {
-    if (body == null || body.isEmpty() || "null".equals(body)) {
-      return null;
+    /**
+     * Merges a {@code multiValueHeaders} map over headers already extracted from the single-value
+     * map, joining a header's values the way its own grammar rejoins them: {@code "; "} for {@code
+     * Cookie} per RFC 6265, {@code ", "} for every other header. API Gateway v1 and ALB send both
+     * maps, and the single-value one keeps only one value of a repeated header, so reading it alone
+     * would hide the others from the WAF.
+     *
+     * @param headers mutated in place and returned; a value it already holds is overwritten by the
+     *     multi-value reading of the same header
+     * @param multiValueHeadersObj the raw event member, of any shape or absent
+     */
+    private static Map<String, String> mergeMultiValueHeaders(
+            Map<String, String> headers, Object multiValueHeadersObj) {
+        if (!(multiValueHeadersObj instanceof Map)) {
+            return headers;
+        }
+        for (Map.Entry<?, ?> entry : ((Map<?, ?>) multiValueHeadersObj).entrySet()) {
+            if (entry.getKey() == null || entry.getValue() == null) {
+                continue;
+            }
+            // Lowercased for the same reason as extractHeaderMap
+            String key = String.valueOf(entry.getKey()).toLowerCase(Locale.ROOT);
+            if (entry.getValue() instanceof List) {
+                List<?> values = (List<?>) entry.getValue();
+                // A cookie value may itself hold a comma, so joining cookies with ", " would let the second
+                // cookie's name be read as part of the first one's value and hide it from the cookie rules
+                String separator = "cookie".equals(key) ? "; " : ", ";
+                headers.put(key, values.stream().map(String::valueOf).collect(joining(separator)));
+            } else {
+                // Not a shape AWS sends, but reported rather than dropped: the runtime would still deliver
+                // the header
+                headers.put(key, String.valueOf(entry.getValue()));
+            }
+        }
+        return headers;
     }
 
-    try {
-      return OBJECT_ADAPTER.fromJson(body);
-    } catch (Exception e) {
-      return null;
+    /** Helper method to extract path parameters from event. */
+    private static Map<String, String> extractPathParameters(Object pathParamsObj) {
+        if (!(pathParamsObj instanceof Map)) {
+            return new HashMap<>();
+        }
+        Map<?, ?> rawMap = (Map<?, ?>) pathParamsObj;
+        Map<String, String> pathParams = new HashMap<>(rawMap.size() * 2);
+        for (Map.Entry<?, ?> entry : rawMap.entrySet()) {
+            if (entry.getKey() != null && entry.getValue() != null) {
+                pathParams.put(String.valueOf(entry.getKey()), String.valueOf(entry.getValue()));
+            }
+        }
+        log.debug("Extracted {} path parameters", pathParams.size());
+        return pathParams;
     }
-  }
-
-  /** Enum representing different AWS Lambda trigger types */
-  enum LambdaTriggerType {
-    API_GATEWAY_V1_REST, // API Gateway REST API (v1)
-    API_GATEWAY_V2_HTTP, // API Gateway HTTP API (v2)
-    API_GATEWAY_V2_WEBSOCKET, // API Gateway WebSocket
-    ALB, // Application Load Balancer
-    ALB_MULTI_VALUE, // ALB with multi-value headers
-    LAMBDA_URL, // Lambda Function URL
-    UNKNOWN; // Unknown or unsupported trigger
 
     /**
-     * Whitelist rather than {@code != UNKNOWN} so a trigger type added later defaults to non-HTTP,
-     * and therefore to being skipped by AppSec, until it is deliberately listed here.
+     * Helper method to extract query parameters from event. Converts Map<String, String> to
+     * Map<String, List<String>> format expected by AppSec.
+     *
+     * <p>Insertion-ordered so the query string rebuilt by {@link #buildFullPath} follows the event
+     * rather than varying with hash order between invocations of the same request shape.
      */
-    boolean isHttp() {
-      switch (this) {
-        case API_GATEWAY_V1_REST:
-        case API_GATEWAY_V2_HTTP:
-        case API_GATEWAY_V2_WEBSOCKET:
-        case ALB:
-        case ALB_MULTI_VALUE:
-        case LAMBDA_URL:
-          return true;
-        default:
-          return false;
-      }
+    private static Map<String, List<String>> extractQueryParameters(Object queryParamsObj) {
+        Map<String, List<String>> result = new LinkedHashMap<>();
+        if (queryParamsObj instanceof Map) {
+            Map<?, ?> rawMap = (Map<?, ?>) queryParamsObj;
+            for (Map.Entry<?, ?> entry : rawMap.entrySet()) {
+                if (entry.getKey() != null && entry.getValue() != null) {
+                    String key = String.valueOf(entry.getKey());
+                    String value = String.valueOf(entry.getValue());
+                    result.put(key, Collections.singletonList(value));
+                }
+            }
+        }
+        log.debug("Extracted {} query parameters", result.size());
+        return result;
     }
 
     /**
-     * Whether the trigger turns a return value carrying no {@code statusCode} into a 200 response.
-     * HTTP API v2 and Function URLs do; the proxy-only triggers reject such a response instead.
+     * Helper method to extract multi-value query parameters (used by ALB). Handles Map<String,
+     * List<String>> format directly.
+     *
+     * <p>Insertion-ordered for the same reason as {@link #extractQueryParameters}.
      */
-    boolean supportsImplicitSuccessStatus() {
-      return this == API_GATEWAY_V2_HTTP || this == LAMBDA_URL;
+    private static Map<String, List<String>> extractMultiValueQueryParameters(Object queryParamsObj) {
+        Map<String, List<String>> result = new LinkedHashMap<>();
+        if (queryParamsObj instanceof Map) {
+            Map<?, ?> rawMap = (Map<?, ?>) queryParamsObj;
+            for (Map.Entry<?, ?> entry : rawMap.entrySet()) {
+                if (entry.getKey() != null && entry.getValue() != null) {
+                    String key = String.valueOf(entry.getKey());
+                    if (entry.getValue() instanceof List) {
+                        List<?> values = (List<?>) entry.getValue();
+                        List<String> stringValues = new ArrayList<>();
+                        for (Object value : values) {
+                            if (value != null) {
+                                stringValues.add(String.valueOf(value));
+                            }
+                        }
+                        result.put(key, stringValues);
+                    } else {
+                        result.put(key, Collections.singletonList(String.valueOf(entry.getValue())));
+                    }
+                }
+            }
+        }
+        log.debug("Extracted {} multi-value query parameters", result.size());
+        return result;
     }
-  }
-
-  /** Data extracted from a Lambda event, for the WAF request callbacks and the HTTP span tags. */
-  static class LambdaRequestData {
-    final Map<String, String> headers;
-    final String method;
-    final String path;
-    final String sourceIp;
-    final Integer sourcePort;
-    final LambdaTriggerType triggerType;
-    final Map<String, String> pathParameters;
-    final Map<String, List<String>> queryParameters;
-    final Object body;
-
-    /** Host the request was addressed to, used as the authority of {@code http.url}. */
-    final String host;
-
-    /** Parameterized route, when the trigger exposes one. */
-    final String route;
 
     /**
-     * Request line as the client sent it, for the API Gateway v2 and Function URL payloads that
-     * expose it, null otherwise. Rebuilding it from {@link #queryParameters} instead cannot be
-     * faithful: v2 comma-joins repeated keys, so {@code ?a=1&a=2} comes back as {@code a=1%2C2}.
+     * Helper method to build full path including query string. Lambda events provide path and query
+     * parameters separately, so we need to reconstruct the full URI for AppSec to parse.
      */
-    final String rawUri;
-
-    /** Filenames of the multipart file parts carried by the body, empty when there are none. */
-    final List<String> filenames;
-
-    static final LambdaRequestData EMPTY =
-        new LambdaRequestData(
-            Collections.emptyMap(),
-            null,
-            null,
-            null,
-            null,
-            LambdaTriggerType.UNKNOWN,
-            Collections.emptyMap(),
-            Collections.emptyMap(),
-            null,
-            null,
-            null,
-            null,
-            Collections.emptyList());
-
-    LambdaRequestData(
-        Map<String, String> headers,
-        String method,
-        String path,
-        String sourceIp,
-        Integer sourcePort,
-        LambdaTriggerType triggerType,
-        Map<String, String> pathParameters,
-        Map<String, List<String>> queryParameters,
-        Object body,
-        String host,
-        String route,
-        String rawUri,
-        List<String> filenames) {
-      this.headers = headers;
-      this.method = method;
-      this.path = path;
-      this.sourceIp = sourceIp;
-      this.sourcePort = sourcePort;
-      this.triggerType = triggerType;
-      this.pathParameters = pathParameters;
-      this.queryParameters = queryParameters;
-      this.body = body;
-      this.host = host;
-      this.route = route;
-      this.rawUri = rawUri;
-      this.filenames = filenames;
+    static String buildFullPath(String path, Map<String, List<String>> queryParameters) {
+        if (queryParameters == null || queryParameters.isEmpty()) {
+            return path;
+        }
+
+        StringBuilder fullPath = new StringBuilder(path);
+        fullPath.append('?');
+
+        boolean first = true;
+        for (Map.Entry<String, List<String>> entry : queryParameters.entrySet()) {
+            String key = entry.getKey();
+            for (String value : entry.getValue()) {
+                if (!first) {
+                    fullPath.append('&');
+                }
+                first = false;
+                try {
+                    // Encoded so a '&' inside a value is not read as a delimiter when AppSec re-parses it
+                    fullPath.append(URLEncoder.encode(key, "UTF-8"));
+                    if (value != null) {
+                        fullPath.append('=').append(URLEncoder.encode(value, "UTF-8"));
+                    }
+                } catch (java.io.UnsupportedEncodingException e) {
+                    // UTF-8 is always available; fall back to unencoded
+                    fullPath.append(key);
+                    if (value != null) {
+                        fullPath.append('=').append(value);
+                    }
+                }
+            }
+        }
+
+        return fullPath.toString();
     }
-  }
 
-  /**
-   * Data extracted from a Lambda handler response, for the WAF response callbacks and {@code
-   * http.status_code}.
-   */
-  static class LambdaResponseData {
     /**
-     * Status as the payload carried it, defaulted to 200 when the trigger turns a return value
-     * without a {@code statusCode} into a success. {@code null} when the payload carried none, or
-     * one that is not a number. Kept verbatim: a value outside the HTTP range reached the gateway
-     * too, so callers decide for themselves whether to report it.
+     * Helper method to extract and merge headers with cookies array from event. API Gateway v2
+     * provides a separate 'cookies' array that should be merged with headers.
      */
-    final Integer statusCode;
+    private static Map<String, String> extractHeadersWithCookies(Map<String, Object> event) {
+        Map<String, String> headers = extractHeaders(event.get("headers"));
+
+        // API Gateway v2 provides a pre-parsed cookies array
+        Object cookiesObj = event.get("cookies");
+        if (cookiesObj instanceof List) {
+            List<?> cookiesList = (List<?>) cookiesObj;
+            if (!cookiesList.isEmpty()) {
+                // Join cookies with "; " separator per RFC 6265
+                String cookieValue = cookiesList.stream().map(String::valueOf).collect(joining("; "));
+
+                // Merge with existing cookie header if present
+                String existingCookie = headers.get("cookie");
+                if (existingCookie != null && !existingCookie.isEmpty()) {
+                    headers.put("cookie", existingCookie + "; " + cookieValue);
+                } else {
+                    headers.put("cookie", cookieValue);
+                }
+            }
+        }
 
-    final Map<String, String> headers;
-    final Object body;
+        return headers;
+    }
+
+    /** Helper method to extract and parse body from event */
+    private static Object extractBody(
+            Map<String, Object> event, Map<String, String> headers, ParseContext parseContext) {
+        Object bodyObj = event.get("body");
+        if (bodyObj == null) {
+            return null;
+        }
+
+        String bodyString = String.valueOf(bodyObj);
+
+        // Check if body is base64 encoded (API Gateway feature)
+        Object isBase64EncodedObj = event.get("isBase64Encoded");
+        if (Boolean.TRUE.equals(isBase64EncodedObj) || "true".equals(isBase64EncodedObj)) {
+            try {
+                bodyString = new String(Base64.getDecoder().decode(bodyString), StandardCharsets.UTF_8);
+            } catch (Exception e) {
+                log.debug("Failed to decode base64 body", e);
+                return null;
+            }
+        }
+
+        return ContentTypeBodyParser.parseBody(bodyString, headers.get("content-type"), parseContext);
+    }
 
-    LambdaResponseData(Integer statusCode, Map<String, String> headers, Object body) {
-      this.statusCode = statusCode;
-      this.headers = headers;
-      this.body = body;
+    /** Helper method to parse body as JSON */
+    static Object parseBodyAsJson(String body) {
+        if (body == null || body.isEmpty() || "null".equals(body)) {
+            return null;
+        }
+
+        try {
+            return OBJECT_ADAPTER.fromJson(body);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /** Enum representing different AWS Lambda trigger types */
+    enum LambdaTriggerType {
+        API_GATEWAY_V1_REST, // API Gateway REST API (v1)
+        API_GATEWAY_V2_HTTP, // API Gateway HTTP API (v2)
+        API_GATEWAY_V2_WEBSOCKET, // API Gateway WebSocket
+        ALB, // Application Load Balancer
+        ALB_MULTI_VALUE, // ALB with multi-value headers
+        LAMBDA_URL, // Lambda Function URL
+        UNKNOWN; // Unknown or unsupported trigger
+
+        /**
+         * Whitelist rather than {@code != UNKNOWN} so a trigger type added later defaults to non-HTTP,
+         * and therefore to being skipped by AppSec, until it is deliberately listed here.
+         */
+        boolean isHttp() {
+            switch (this) {
+                case API_GATEWAY_V1_REST:
+                case API_GATEWAY_V2_HTTP:
+                case API_GATEWAY_V2_WEBSOCKET:
+                case ALB:
+                case ALB_MULTI_VALUE:
+                case LAMBDA_URL:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        /**
+         * Whether the trigger turns a return value carrying no {@code statusCode} into a 200 response.
+         * HTTP API v2 and Function URLs do; the proxy-only triggers reject such a response instead.
+         */
+        boolean supportsImplicitSuccessStatus() {
+            return this == API_GATEWAY_V2_HTTP || this == LAMBDA_URL;
+        }
+    }
+
+    /** Data extracted from a Lambda event, for the WAF request callbacks and the HTTP span tags. */
+    static class LambdaRequestData {
+        final Map<String, String> headers;
+        final String method;
+        final String path;
+        final String sourceIp;
+        final Integer sourcePort;
+        final LambdaTriggerType triggerType;
+        final Map<String, String> pathParameters;
+        final Map<String, List<String>> queryParameters;
+        final Object body;
+
+        /** Host the request was addressed to, used as the authority of {@code http.url}. */
+        final String host;
+
+        /** Parameterized route, when the trigger exposes one. */
+        final String route;
+
+        /**
+         * Request line as the client sent it, for the API Gateway v2 and Function URL payloads that
+         * expose it, null otherwise. Rebuilding it from {@link #queryParameters} instead cannot be
+         * faithful: v2 comma-joins repeated keys, so {@code ?a=1&a=2} comes back as {@code a=1%2C2}.
+         */
+        final String rawUri;
+
+        /** Filenames of the multipart file parts carried by the body, empty when there are none. */
+        final List<String> filenames;
+
+        static final LambdaRequestData EMPTY = new LambdaRequestData(
+                Collections.emptyMap(),
+                null,
+                null,
+                null,
+                null,
+                LambdaTriggerType.UNKNOWN,
+                Collections.emptyMap(),
+                Collections.emptyMap(),
+                null,
+                null,
+                null,
+                null,
+                Collections.emptyList());
+
+        LambdaRequestData(
+                Map<String, String> headers,
+                String method,
+                String path,
+                String sourceIp,
+                Integer sourcePort,
+                LambdaTriggerType triggerType,
+                Map<String, String> pathParameters,
+                Map<String, List<String>> queryParameters,
+                Object body,
+                String host,
+                String route,
+                String rawUri,
+                List<String> filenames) {
+            this.headers = headers;
+            this.method = method;
+            this.path = path;
+            this.sourceIp = sourceIp;
+            this.sourcePort = sourcePort;
+            this.triggerType = triggerType;
+            this.pathParameters = pathParameters;
+            this.queryParameters = queryParameters;
+            this.body = body;
+            this.host = host;
+            this.route = route;
+            this.rawUri = rawUri;
+            this.filenames = filenames;
+        }
+    }
+
+    /**
+     * Data extracted from a Lambda handler response, for the WAF response callbacks and {@code
+     * http.status_code}.
+     */
+    static class LambdaResponseData {
+        /**
+         * Status as the payload carried it, defaulted to 200 when the trigger turns a return value
+         * without a {@code statusCode} into a success. {@code null} when the payload carried none, or
+         * one that is not a number. Kept verbatim: a value outside the HTTP range reached the gateway
+         * too, so callers decide for themselves whether to report it.
+         */
+        final Integer statusCode;
+
+        final Map<String, String> headers;
+        final Object body;
+
+        LambdaResponseData(Integer statusCode, Map<String, String> headers, Object body) {
+            this.statusCode = statusCode;
+            this.headers = headers;
+            this.body = body;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaHandler.java b/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaHandler.java
index 7e693ed82c8..77a401f628b 100644
--- a/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaHandler.java
+++ b/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaHandler.java
@@ -31,146 +31,137 @@
  */
 public class LambdaHandler {
 
-  private static final Logger log = LoggerFactory.getLogger(LambdaHandler.class);
-
-  // Note: this header is used to disable tracing for calls to the extension
-  private static final String DATADOG_META_LANG = "Datadog-Meta-Lang";
-
-  private static final String DATADOG_TRACE_ID = "x-datadog-trace-id";
-  private static final String DATADOG_SPAN_ID = "x-datadog-span-id";
-  private static final String DATADOG_SAMPLING_PRIORITY = "x-datadog-sampling-priority";
-  private static final String DATADOG_INVOCATION_ERROR = "x-datadog-invocation-error";
-  private static final String DATADOG_INVOCATION_ERROR_MSG = "x-datadog-invocation-error-msg";
-  private static final String DATADOG_INVOCATION_ERROR_TYPE = "x-datadog-invocation-error-type";
-  private static final String DATADOG_INVOCATION_ERROR_STACK = "x-datadog-invocation-error-stack";
-  private static final String LAMBDA_RUNTIME_AWS_REQUEST_ID = "lambda-runtime-aws-request-id";
-
-  private static final String START_INVOCATION = "/lambda/start-invocation";
-  private static final String END_INVOCATION = "/lambda/end-invocation";
-
-  private static final Long REQUEST_TIMEOUT_IN_S = 3L;
-  private static final int MAX_IDLE_CONNECTIONS = 5;
-  private static final Long KEEP_ALIVE_DURATION = 300L;
-
-  private static OkHttpClient HTTP_CLIENT =
-      new OkHttpClient.Builder()
-          .retryOnConnectionFailure(true)
-          .connectTimeout(REQUEST_TIMEOUT_IN_S, SECONDS)
-          .writeTimeout(REQUEST_TIMEOUT_IN_S, SECONDS)
-          .readTimeout(REQUEST_TIMEOUT_IN_S, SECONDS)
-          .callTimeout(REQUEST_TIMEOUT_IN_S, SECONDS)
-          .connectionPool(new ConnectionPool(MAX_IDLE_CONNECTIONS, KEEP_ALIVE_DURATION, SECONDS))
-          .build();
-
-  private static final MediaType jsonMediaType = MediaType.parse("application/json");
-  private static final JsonAdapter<Object> adapter =
-      new Moshi.Builder()
-          .add(ByteArrayInputStream.class, new ReadFromInputStreamJsonAdapter())
-          .add(ByteArrayOutputStream.class, new ReadFromOutputStreamJsonAdapter())
-          .add(SkipUnsupportedTypeJsonAdapter.newFactory())
-          .build()
-          .adapter(Object.class);
-
-  private static String EXTENSION_BASE_URL = "http://127.0.0.1:8124";
-
-  public static AgentSpanContext notifyStartInvocation(Object event, String lambdaRequestId) {
-    RequestBody body = RequestBody.create(jsonMediaType, writeValueAsString(event));
-    try (Response response =
-        HTTP_CLIENT
-            .newCall(
-                new Request.Builder()
-                    .url(EXTENSION_BASE_URL + START_INVOCATION)
-                    .addHeader(DATADOG_META_LANG, "java")
-                    .addHeader(LAMBDA_RUNTIME_AWS_REQUEST_ID, lambdaRequestId)
-                    .post(body)
-                    .build())
-            .execute()) {
-      if (response.isSuccessful()) {
-        return extractContextAndGetSpanContext(
-            response.headers(),
-            (carrier, classifier) -> {
-              for (String headerName : carrier.names()) {
-                classifier.accept(headerName, carrier.get(headerName));
-              }
-            });
-      } else {
-        log.debug("Extension call failed with status: {}", response.code());
-      }
-    } catch (Throwable ignored) {
-      log.error("could not reach the extension");
-    }
-    return null;
-  }
-
-  public static boolean notifyEndInvocation(
-      AgentSpan span, Object result, boolean isError, String lambdaRequestId) {
-    if (null == span || null == span.getSamplingPriority()) {
-      log.error(
-          "could not notify the extension as the lambda span is null or no sampling priority has been found");
-      return false;
+    private static final Logger log = LoggerFactory.getLogger(LambdaHandler.class);
+
+    // Note: this header is used to disable tracing for calls to the extension
+    private static final String DATADOG_META_LANG = "Datadog-Meta-Lang";
+
+    private static final String DATADOG_TRACE_ID = "x-datadog-trace-id";
+    private static final String DATADOG_SPAN_ID = "x-datadog-span-id";
+    private static final String DATADOG_SAMPLING_PRIORITY = "x-datadog-sampling-priority";
+    private static final String DATADOG_INVOCATION_ERROR = "x-datadog-invocation-error";
+    private static final String DATADOG_INVOCATION_ERROR_MSG = "x-datadog-invocation-error-msg";
+    private static final String DATADOG_INVOCATION_ERROR_TYPE = "x-datadog-invocation-error-type";
+    private static final String DATADOG_INVOCATION_ERROR_STACK = "x-datadog-invocation-error-stack";
+    private static final String LAMBDA_RUNTIME_AWS_REQUEST_ID = "lambda-runtime-aws-request-id";
+
+    private static final String START_INVOCATION = "/lambda/start-invocation";
+    private static final String END_INVOCATION = "/lambda/end-invocation";
+
+    private static final Long REQUEST_TIMEOUT_IN_S = 3L;
+    private static final int MAX_IDLE_CONNECTIONS = 5;
+    private static final Long KEEP_ALIVE_DURATION = 300L;
+
+    private static OkHttpClient HTTP_CLIENT = new OkHttpClient.Builder()
+            .retryOnConnectionFailure(true)
+            .connectTimeout(REQUEST_TIMEOUT_IN_S, SECONDS)
+            .writeTimeout(REQUEST_TIMEOUT_IN_S, SECONDS)
+            .readTimeout(REQUEST_TIMEOUT_IN_S, SECONDS)
+            .callTimeout(REQUEST_TIMEOUT_IN_S, SECONDS)
+            .connectionPool(new ConnectionPool(MAX_IDLE_CONNECTIONS, KEEP_ALIVE_DURATION, SECONDS))
+            .build();
+
+    private static final MediaType jsonMediaType = MediaType.parse("application/json");
+    private static final JsonAdapter<Object> adapter = new Moshi.Builder()
+            .add(ByteArrayInputStream.class, new ReadFromInputStreamJsonAdapter())
+            .add(ByteArrayOutputStream.class, new ReadFromOutputStreamJsonAdapter())
+            .add(SkipUnsupportedTypeJsonAdapter.newFactory())
+            .build()
+            .adapter(Object.class);
+
+    private static String EXTENSION_BASE_URL = "http://127.0.0.1:8124";
+
+    public static AgentSpanContext notifyStartInvocation(Object event, String lambdaRequestId) {
+        RequestBody body = RequestBody.create(jsonMediaType, writeValueAsString(event));
+        try (Response response = HTTP_CLIENT
+                .newCall(new Request.Builder()
+                        .url(EXTENSION_BASE_URL + START_INVOCATION)
+                        .addHeader(DATADOG_META_LANG, "java")
+                        .addHeader(LAMBDA_RUNTIME_AWS_REQUEST_ID, lambdaRequestId)
+                        .post(body)
+                        .build())
+                .execute()) {
+            if (response.isSuccessful()) {
+                return extractContextAndGetSpanContext(response.headers(), (carrier, classifier) -> {
+                    for (String headerName : carrier.names()) {
+                        classifier.accept(headerName, carrier.get(headerName));
+                    }
+                });
+            } else {
+                log.debug("Extension call failed with status: {}", response.code());
+            }
+        } catch (Throwable ignored) {
+            log.error("could not reach the extension");
+        }
+        return null;
     }
 
-    RequestBody body = RequestBody.create(jsonMediaType, writeValueAsString(result));
-    Request.Builder builder =
-        new Request.Builder()
-            .url(EXTENSION_BASE_URL + END_INVOCATION)
-            .addHeader(DATADOG_TRACE_ID, span.getTraceId().toString())
-            .addHeader(DATADOG_SPAN_ID, DDSpanId.toString(span.getSpanId()))
-            .addHeader(DATADOG_SAMPLING_PRIORITY, span.getSamplingPriority().toString())
-            .addHeader(DATADOG_META_LANG, "java")
-            .addHeader(LAMBDA_RUNTIME_AWS_REQUEST_ID, lambdaRequestId)
-            .post(body);
-
-    addHeaderIfValid(builder, DATADOG_INVOCATION_ERROR_MSG, span.getTag(DDTags.ERROR_MSG));
-    addHeaderIfValid(builder, DATADOG_INVOCATION_ERROR_TYPE, span.getTag(DDTags.ERROR_TYPE));
-
-    Object errorStack = span.getTag(DDTags.ERROR_STACK);
-    if (errorStack != null) {
-      String encodedErrStack =
-          Base64.getEncoder()
-              .encodeToString(errorStack.toString().getBytes(StandardCharsets.UTF_8));
-      if (Strings.isNotBlank(encodedErrStack)) {
-        builder.addHeader(DATADOG_INVOCATION_ERROR_STACK, encodedErrStack);
-      }
+    public static boolean notifyEndInvocation(AgentSpan span, Object result, boolean isError, String lambdaRequestId) {
+        if (null == span || null == span.getSamplingPriority()) {
+            log.error(
+                    "could not notify the extension as the lambda span is null or no sampling priority has been found");
+            return false;
+        }
+
+        RequestBody body = RequestBody.create(jsonMediaType, writeValueAsString(result));
+        Request.Builder builder = new Request.Builder()
+                .url(EXTENSION_BASE_URL + END_INVOCATION)
+                .addHeader(DATADOG_TRACE_ID, span.getTraceId().toString())
+                .addHeader(DATADOG_SPAN_ID, DDSpanId.toString(span.getSpanId()))
+                .addHeader(DATADOG_SAMPLING_PRIORITY, span.getSamplingPriority().toString())
+                .addHeader(DATADOG_META_LANG, "java")
+                .addHeader(LAMBDA_RUNTIME_AWS_REQUEST_ID, lambdaRequestId)
+                .post(body);
+
+        addHeaderIfValid(builder, DATADOG_INVOCATION_ERROR_MSG, span.getTag(DDTags.ERROR_MSG));
+        addHeaderIfValid(builder, DATADOG_INVOCATION_ERROR_TYPE, span.getTag(DDTags.ERROR_TYPE));
+
+        Object errorStack = span.getTag(DDTags.ERROR_STACK);
+        if (errorStack != null) {
+            String encodedErrStack =
+                    Base64.getEncoder().encodeToString(errorStack.toString().getBytes(StandardCharsets.UTF_8));
+            if (Strings.isNotBlank(encodedErrStack)) {
+                builder.addHeader(DATADOG_INVOCATION_ERROR_STACK, encodedErrStack);
+            }
+        }
+
+        if (isError) {
+            builder.addHeader(DATADOG_INVOCATION_ERROR, "true");
+        }
+
+        try (Response response = HTTP_CLIENT.newCall(builder.build()).execute()) {
+            if (response.isSuccessful()) {
+                log.debug("notifyEndInvocation success");
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("could not reach the extension, not injecting the context", e);
+        }
+        return false;
     }
 
-    if (isError) {
-      builder.addHeader(DATADOG_INVOCATION_ERROR, "true");
+    public static String writeValueAsString(Object obj) {
+        String json = "{}";
+        if (null != obj) {
+            try {
+                json = adapter.toJson(obj);
+            } catch (Exception e) {
+                log.debug("could not write the value into a string", e);
+            }
+        }
+        return json;
     }
 
-    try (Response response = HTTP_CLIENT.newCall(builder.build()).execute()) {
-      if (response.isSuccessful()) {
-        log.debug("notifyEndInvocation success");
-        return true;
-      }
-    } catch (Exception e) {
-      log.error("could not reach the extension, not injecting the context", e);
-    }
-    return false;
-  }
-
-  public static String writeValueAsString(Object obj) {
-    String json = "{}";
-    if (null != obj) {
-      try {
-        json = adapter.toJson(obj);
-      } catch (Exception e) {
-        log.debug("could not write the value into a string", e);
-      }
+    private static void addHeaderIfValid(Request.Builder builder, String name, Object value) {
+        if (value != null) {
+            final String stringValue = value.toString();
+            if (Strings.isNotBlank(stringValue)) {
+                builder.addHeader(name, stringValue);
+            }
+        }
     }
-    return json;
-  }
-
-  private static void addHeaderIfValid(Request.Builder builder, String name, Object value) {
-    if (value != null) {
-      final String stringValue = value.toString();
-      if (Strings.isNotBlank(stringValue)) {
-        builder.addHeader(name, stringValue);
-      }
-    }
-  }
 
-  public static void setExtensionBaseUrl(String extensionBaseUrl) {
-    EXTENSION_BASE_URL = extensionBaseUrl;
-  }
+    public static void setExtensionBaseUrl(String extensionBaseUrl) {
+        EXTENSION_BASE_URL = extensionBaseUrl;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaURIDataAdapter.java b/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaURIDataAdapter.java
index f3fe6982d17..8e9087d730d 100644
--- a/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaURIDataAdapter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaURIDataAdapter.java
@@ -18,91 +18,91 @@
  * the {@code raw.resource} / {@code raw.query-string} settings have no effect.
  */
 class LambdaURIDataAdapter extends URIDataAdapterBase {
-  private final String path;
-  private final String query;
-  private final String scheme;
-  private final String host;
-  private final int port;
-
-  LambdaURIDataAdapter(String pathWithQuery, Map<String, String> headers, String host) {
-    if (pathWithQuery != null) {
-      int queryIndex = pathWithQuery.indexOf('?');
-      if (queryIndex != -1) {
-        this.path = pathWithQuery.substring(0, queryIndex);
-        this.query = pathWithQuery.substring(queryIndex + 1);
-      } else {
-        this.path = pathWithQuery;
-        this.query = null;
-      }
-    } else {
-      this.path = "/";
-      this.query = null;
+    private final String path;
+    private final String query;
+    private final String scheme;
+    private final String host;
+    private final int port;
+
+    LambdaURIDataAdapter(String pathWithQuery, Map<String, String> headers, String host) {
+        if (pathWithQuery != null) {
+            int queryIndex = pathWithQuery.indexOf('?');
+            if (queryIndex != -1) {
+                this.path = pathWithQuery.substring(0, queryIndex);
+                this.query = pathWithQuery.substring(queryIndex + 1);
+            } else {
+                this.path = pathWithQuery;
+                this.query = null;
+            }
+        } else {
+            this.path = "/";
+            this.query = null;
+        }
+
+        this.host = host;
+
+        // Lowercased because the port default below and URIUtils.buildURL both compare the scheme
+        // exactly; whitelisted because X-Forwarded-Proto is client-influenceable and arrives
+        // comma-joined when duplicated, which would render as "https, http://host/path".
+        String forwardedProto = findHeader(headers, "x-forwarded-proto");
+        String proto = forwardedProto == null ? null : forwardedProto.toLowerCase(Locale.ROOT);
+        this.scheme = "http".equals(proto) || "https".equals(proto) ? proto : "https";
+
+        String forwardedPort = findHeader(headers, "x-forwarded-port");
+        int parsedPort = -1;
+        if (forwardedPort != null && !forwardedPort.isEmpty()) {
+            try {
+                parsedPort = Integer.parseInt(forwardedPort.trim());
+            } catch (NumberFormatException ignored) {
+            }
+        }
+        // URIUtils.buildURL only suppresses the port for 80 on http and 443 on https, so the default
+        // has to follow the scheme or an http URL would leak ":443".
+        this.port = parsedPort > 0 ? parsedPort : ("http".equals(this.scheme) ? 80 : 443);
     }
 
-    this.host = host;
-
-    // Lowercased because the port default below and URIUtils.buildURL both compare the scheme
-    // exactly; whitelisted because X-Forwarded-Proto is client-influenceable and arrives
-    // comma-joined when duplicated, which would render as "https, http://host/path".
-    String forwardedProto = findHeader(headers, "x-forwarded-proto");
-    String proto = forwardedProto == null ? null : forwardedProto.toLowerCase(Locale.ROOT);
-    this.scheme = "http".equals(proto) || "https".equals(proto) ? proto : "https";
-
-    String forwardedPort = findHeader(headers, "x-forwarded-port");
-    int parsedPort = -1;
-    if (forwardedPort != null && !forwardedPort.isEmpty()) {
-      try {
-        parsedPort = Integer.parseInt(forwardedPort.trim());
-      } catch (NumberFormatException ignored) {
-      }
+    @Override
+    public String scheme() {
+        return scheme;
+    }
+
+    @Override
+    public String host() {
+        return host;
+    }
+
+    @Override
+    public int port() {
+        return port;
+    }
+
+    @Override
+    public String path() {
+        return path;
+    }
+
+    @Override
+    public String fragment() {
+        return null;
+    }
+
+    @Override
+    public String query() {
+        return query;
+    }
+
+    @Override
+    public boolean supportsRaw() {
+        return true;
+    }
+
+    @Override
+    public String rawPath() {
+        return path;
+    }
+
+    @Override
+    public String rawQuery() {
+        return query;
     }
-    // URIUtils.buildURL only suppresses the port for 80 on http and 443 on https, so the default
-    // has to follow the scheme or an http URL would leak ":443".
-    this.port = parsedPort > 0 ? parsedPort : ("http".equals(this.scheme) ? 80 : 443);
-  }
-
-  @Override
-  public String scheme() {
-    return scheme;
-  }
-
-  @Override
-  public String host() {
-    return host;
-  }
-
-  @Override
-  public int port() {
-    return port;
-  }
-
-  @Override
-  public String path() {
-    return path;
-  }
-
-  @Override
-  public String fragment() {
-    return null;
-  }
-
-  @Override
-  public String query() {
-    return query;
-  }
-
-  @Override
-  public boolean supportsRaw() {
-    return true;
-  }
-
-  @Override
-  public String rawPath() {
-    return path;
-  }
-
-  @Override
-  public String rawQuery() {
-    return query;
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/lambda/MultipartSplitter.java b/dd-trace-core/src/main/java/datadog/trace/lambda/MultipartSplitter.java
index 37902ae53b6..759d241e759 100644
--- a/dd-trace-core/src/main/java/datadog/trace/lambda/MultipartSplitter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/lambda/MultipartSplitter.java
@@ -10,324 +10,319 @@
  */
 final class MultipartSplitter {
 
-  private static final int MAX_BOUNDARY_LENGTH = 70;
+    private static final int MAX_BOUNDARY_LENGTH = 70;
 
-  private MultipartSplitter() {}
+    private MultipartSplitter() {}
 
-  /**
-   * One part of a multipart body. Content is an index range into the body passed to {@link #split}.
-   */
-  static final class Part {
-    /** {@code null} when the part declares no such header. Duplicates keep the last seen value. */
-    final String contentDisposition;
+    /**
+     * One part of a multipart body. Content is an index range into the body passed to {@link #split}.
+     */
+    static final class Part {
+        /** {@code null} when the part declares no such header. Duplicates keep the last seen value. */
+        final String contentDisposition;
 
-    final String contentType;
-    final int contentStart;
-    final int contentEnd;
+        final String contentType;
+        final int contentStart;
+        final int contentEnd;
 
-    private Part(
-        final String contentDisposition,
-        final String contentType,
-        final int contentStart,
-        final int contentEnd) {
-      this.contentDisposition = contentDisposition;
-      this.contentType = contentType;
-      this.contentStart = contentStart;
-      this.contentEnd = contentEnd;
+        private Part(
+                final String contentDisposition,
+                final String contentType,
+                final int contentStart,
+                final int contentEnd) {
+            this.contentDisposition = contentDisposition;
+            this.contentType = contentType;
+            this.contentStart = contentStart;
+            this.contentEnd = contentEnd;
+        }
     }
-  }
 
-  /**
-   * Splits a multipart body into at most {@code partBudget} parts.
-   *
-   * @return the parts found, in order; empty if the body holds none or is not parseable as
-   *     multipart
-   */
-  static List<Part> split(final String body, final String boundary, final int partBudget) {
-    final List<Part> parts = new ArrayList<>();
-    if (body == null || boundary == null || boundary.isEmpty() || partBudget <= 0) {
-      return parts;
-    }
-    final String delimiter = "--" + boundary;
-    final int length = body.length();
-    int position = nextDelimiter(body, delimiter, 0);
+    /**
+     * Splits a multipart body into at most {@code partBudget} parts.
+     *
+     * @return the parts found, in order; empty if the body holds none or is not parseable as
+     *     multipart
+     */
+    static List<Part> split(final String body, final String boundary, final int partBudget) {
+        final List<Part> parts = new ArrayList<>();
+        if (body == null || boundary == null || boundary.isEmpty() || partBudget <= 0) {
+            return parts;
+        }
+        final String delimiter = "--" + boundary;
+        final int length = body.length();
+        int position = nextDelimiter(body, delimiter, 0);
 
-    while (position >= 0 && parts.size() < partBudget) {
-      final int afterDelimiter = position + delimiter.length();
-      if (body.startsWith("--", afterDelimiter)) {
-        // Close delimiter: anything past it is the epilogue
-        break;
-      }
-      final int headerStart = lineStart(body, afterDelimiter);
-      if (headerStart < 0) {
-        // Not a part boundary after all — the delimiter was part of some part's content
-        position = nextDelimiter(body, delimiter, afterDelimiter);
-        continue;
-      }
-      // Only these two headers are ever read, so the others are matched and dropped rather than
-      // collected: a part declaring thousands of them costs nothing but the scan.
-      String contentDisposition = null;
-      String contentType = null;
-      int cursor = headerStart;
-      boolean headersComplete = false;
-      while (cursor < length) {
-        if (body.startsWith(delimiter, cursor) && endsLine(body, cursor + delimiter.length())) {
-          // This part's headers are not followed by a blank line, so no conforming parser reads
-          // this body as multipart. Report nothing rather than the parts that happen to survive:
-          // the caller then keeps the raw string, and the WAF sees every byte of it.
-          return Collections.emptyList();
+        while (position >= 0 && parts.size() < partBudget) {
+            final int afterDelimiter = position + delimiter.length();
+            if (body.startsWith("--", afterDelimiter)) {
+                // Close delimiter: anything past it is the epilogue
+                break;
+            }
+            final int headerStart = lineStart(body, afterDelimiter);
+            if (headerStart < 0) {
+                // Not a part boundary after all — the delimiter was part of some part's content
+                position = nextDelimiter(body, delimiter, afterDelimiter);
+                continue;
+            }
+            // Only these two headers are ever read, so the others are matched and dropped rather than
+            // collected: a part declaring thousands of them costs nothing but the scan.
+            String contentDisposition = null;
+            String contentType = null;
+            int cursor = headerStart;
+            boolean headersComplete = false;
+            while (cursor < length) {
+                if (body.startsWith(delimiter, cursor) && endsLine(body, cursor + delimiter.length())) {
+                    // This part's headers are not followed by a blank line, so no conforming parser reads
+                    // this body as multipart. Report nothing rather than the parts that happen to survive:
+                    // the caller then keeps the raw string, and the WAF sees every byte of it.
+                    return Collections.emptyList();
+                }
+                final int newline = body.indexOf('\n', cursor);
+                final int lineEnd = newline < 0 ? length : newline;
+                final int trimmed = lineEnd > cursor && body.charAt(lineEnd - 1) == '\r' ? lineEnd - 1 : lineEnd;
+                if (trimmed == cursor) {
+                    headersComplete = true;
+                    cursor = newline < 0 ? length : newline + 1;
+                    break;
+                }
+                final String disposition = headerValue(body, cursor, trimmed, "Content-Disposition");
+                if (disposition != null) {
+                    contentDisposition = disposition;
+                } else {
+                    final String type = headerValue(body, cursor, trimmed, "Content-Type");
+                    if (type != null) {
+                        contentType = type;
+                    }
+                }
+                if (newline < 0) {
+                    cursor = length;
+                    break;
+                }
+                cursor = newline + 1;
+            }
+            if (!headersComplete) {
+                // The body ended inside this part's headers. They are content in their own right — a
+                // filename lives there — and no parser accepts a body cut short like this, so report
+                // nothing and let the caller keep the raw string.
+                return Collections.emptyList();
+            }
+            // The search starts past the first line break of the content, never at the content itself: a
+            // delimiter there would have no line break of its own, having spent the one that terminated
+            // the headers.
+            final int contentBreak = body.indexOf('\n', cursor);
+            final int next = contentBreak < 0 ? -1 : nextDelimiter(body, delimiter, contentBreak + 1);
+            parts.add(new Part(contentDisposition, contentType, cursor, contentEnd(body, cursor, next)));
+            position = next;
         }
-        final int newline = body.indexOf('\n', cursor);
-        final int lineEnd = newline < 0 ? length : newline;
-        final int trimmed =
-            lineEnd > cursor && body.charAt(lineEnd - 1) == '\r' ? lineEnd - 1 : lineEnd;
-        if (trimmed == cursor) {
-          headersComplete = true;
-          cursor = newline < 0 ? length : newline + 1;
-          break;
+        return parts;
+    }
+
+    /**
+     * Reads the {@code boundary} parameter of a {@code Content-Type} header, case preserved.
+     *
+     * @return the boundary, or {@code null} if absent or unusable
+     */
+    static String extractBoundary(final String contentType) {
+        final String boundary = parameter(contentType, "boundary");
+        if (boundary == null || boundary.isEmpty() || boundary.length() > MAX_BOUNDARY_LENGTH) {
+            return null;
         }
-        final String disposition = headerValue(body, cursor, trimmed, "Content-Disposition");
-        if (disposition != null) {
-          contentDisposition = disposition;
-        } else {
-          final String type = headerValue(body, cursor, trimmed, "Content-Type");
-          if (type != null) {
-            contentType = type;
-          }
+        return boundary;
+    }
+
+    /**
+     * Reads a header parameter, case preserved. The name is matched case-insensitively and only at a
+     * parameter boundary, so {@code filename} does not satisfy a lookup for {@code name}. Quoted
+     * values may hold separators and {@code \"} escapes, and are skipped whole: a field named {@code
+     * "; filename=x"} does not read as a {@code filename} parameter.
+     *
+     * @return the parameter value, {@code ""} when it is present but empty, or {@code null} when the
+     *     parameter is absent
+     */
+    static String parameter(final String headerValue, final String paramName) {
+        if (headerValue == null || paramName == null) {
+            return null;
         }
-        if (newline < 0) {
-          cursor = length;
-          break;
+        final int length = headerValue.length();
+        final int nameLength = paramName.length();
+        boolean atBoundary = true;
+        for (int i = 0; i < length; i++) {
+            final char c = headerValue.charAt(i);
+            if (c == '"') {
+                i = endOfQuoted(headerValue, i);
+                atBoundary = false;
+                continue;
+            }
+            if (atBoundary && headerValue.regionMatches(true, i, paramName, 0, nameLength)) {
+                final int equals = skipOptionalWhitespace(headerValue, i + nameLength);
+                if (equals < length && headerValue.charAt(equals) == '=') {
+                    return value(headerValue, skipOptionalWhitespace(headerValue, equals + 1));
+                }
+            }
+            atBoundary = isParameterSeparator(c);
         }
-        cursor = newline + 1;
-      }
-      if (!headersComplete) {
-        // The body ended inside this part's headers. They are content in their own right — a
-        // filename lives there — and no parser accepts a body cut short like this, so report
-        // nothing and let the caller keep the raw string.
-        return Collections.emptyList();
-      }
-      // The search starts past the first line break of the content, never at the content itself: a
-      // delimiter there would have no line break of its own, having spent the one that terminated
-      // the headers.
-      final int contentBreak = body.indexOf('\n', cursor);
-      final int next = contentBreak < 0 ? -1 : nextDelimiter(body, delimiter, contentBreak + 1);
-      parts.add(new Part(contentDisposition, contentType, cursor, contentEnd(body, cursor, next)));
-      position = next;
+        return null;
     }
-    return parts;
-  }
 
-  /**
-   * Reads the {@code boundary} parameter of a {@code Content-Type} header, case preserved.
-   *
-   * @return the boundary, or {@code null} if absent or unusable
-   */
-  static String extractBoundary(final String contentType) {
-    final String boundary = parameter(contentType, "boundary");
-    if (boundary == null || boundary.isEmpty() || boundary.length() > MAX_BOUNDARY_LENGTH) {
-      return null;
+    /**
+     * Walks a quoted value, honouring {@code \"} escapes.
+     *
+     * @param openQuote the index of the opening quote
+     * @return the index of the closing quote, or the body length when the quote is unterminated
+     */
+    private static int endOfQuoted(final String headerValue, final int openQuote) {
+        final int length = headerValue.length();
+        for (int i = openQuote + 1; i < length; i++) {
+            final char c = headerValue.charAt(i);
+            if (c == '\\' && i + 1 < length) {
+                i++;
+            } else if (c == '"') {
+                return i;
+            }
+        }
+        return length;
     }
-    return boundary;
-  }
 
-  /**
-   * Reads a header parameter, case preserved. The name is matched case-insensitively and only at a
-   * parameter boundary, so {@code filename} does not satisfy a lookup for {@code name}. Quoted
-   * values may hold separators and {@code \"} escapes, and are skipped whole: a field named {@code
-   * "; filename=x"} does not read as a {@code filename} parameter.
-   *
-   * @return the parameter value, {@code ""} when it is present but empty, or {@code null} when the
-   *     parameter is absent
-   */
-  static String parameter(final String headerValue, final String paramName) {
-    if (headerValue == null || paramName == null) {
-      return null;
-    }
-    final int length = headerValue.length();
-    final int nameLength = paramName.length();
-    boolean atBoundary = true;
-    for (int i = 0; i < length; i++) {
-      final char c = headerValue.charAt(i);
-      if (c == '"') {
-        i = endOfQuoted(headerValue, i);
-        atBoundary = false;
-        continue;
-      }
-      if (atBoundary && headerValue.regionMatches(true, i, paramName, 0, nameLength)) {
-        final int equals = skipOptionalWhitespace(headerValue, i + nameLength);
-        if (equals < length && headerValue.charAt(equals) == '=') {
-          return value(headerValue, skipOptionalWhitespace(headerValue, equals + 1));
+    private static String value(final String headerValue, final int from) {
+        final int length = headerValue.length();
+        if (from < length && headerValue.charAt(from) == '"') {
+            // An unterminated quote ends at the body length, so what was read is kept rather than the
+            // parameter being dropped.
+            final int close = endOfQuoted(headerValue, from);
+            final StringBuilder unquoted = new StringBuilder(close - from);
+            for (int i = from + 1; i < close; i++) {
+                final char c = headerValue.charAt(i);
+                if (c == '\\' && i + 1 < length) {
+                    unquoted.append(headerValue.charAt(++i));
+                } else {
+                    unquoted.append(c);
+                }
+            }
+            return unquoted.toString();
         }
-      }
-      atBoundary = isParameterSeparator(c);
+        int end = length;
+        for (int i = from; i < length; i++) {
+            if (isParameterSeparator(headerValue.charAt(i))) {
+                end = i;
+                break;
+            }
+        }
+        return headerValue.substring(from, end);
     }
-    return null;
-  }
 
-  /**
-   * Walks a quoted value, honouring {@code \"} escapes.
-   *
-   * @param openQuote the index of the opening quote
-   * @return the index of the closing quote, or the body length when the quote is unterminated
-   */
-  private static int endOfQuoted(final String headerValue, final int openQuote) {
-    final int length = headerValue.length();
-    for (int i = openQuote + 1; i < length; i++) {
-      final char c = headerValue.charAt(i);
-      if (c == '\\' && i + 1 < length) {
-        i++;
-      } else if (c == '"') {
+    private static int skipOptionalWhitespace(final String headerValue, final int from) {
+        int i = from;
+        final int length = headerValue.length();
+        while (i < length && isOptionalWhitespace(headerValue.charAt(i))) {
+            i++;
+        }
         return i;
-      }
     }
-    return length;
-  }
 
-  private static String value(final String headerValue, final int from) {
-    final int length = headerValue.length();
-    if (from < length && headerValue.charAt(from) == '"') {
-      // An unterminated quote ends at the body length, so what was read is kept rather than the
-      // parameter being dropped.
-      final int close = endOfQuoted(headerValue, from);
-      final StringBuilder unquoted = new StringBuilder(close - from);
-      for (int i = from + 1; i < close; i++) {
-        final char c = headerValue.charAt(i);
-        if (c == '\\' && i + 1 < length) {
-          unquoted.append(headerValue.charAt(++i));
-        } else {
-          unquoted.append(c);
-        }
-      }
-      return unquoted.toString();
-    }
-    int end = length;
-    for (int i = from; i < length; i++) {
-      if (isParameterSeparator(headerValue.charAt(i))) {
-        end = i;
-        break;
-      }
+    private static boolean isParameterSeparator(final char c) {
+        return c == ';' || c == ',' || c == ' ' || c == '\t';
     }
-    return headerValue.substring(from, end);
-  }
 
-  private static int skipOptionalWhitespace(final String headerValue, final int from) {
-    int i = from;
-    final int length = headerValue.length();
-    while (i < length && isOptionalWhitespace(headerValue.charAt(i))) {
-      i++;
+    /**
+     * Finds the next delimiter at or after {@code from}.
+     *
+     * @return the index the delimiter starts at, or {@code -1} if there is none
+     */
+    private static int nextDelimiter(final String body, final String delimiter, final int from) {
+        if (body.startsWith(delimiter, from) && endsLine(body, from + delimiter.length())) {
+            return from;
+        }
+        for (int newline = body.indexOf('\n', from); newline >= 0; newline = body.indexOf('\n', newline + 1)) {
+            if (body.startsWith(delimiter, newline + 1) && endsLine(body, newline + 1 + delimiter.length())) {
+                return newline + 1;
+            }
+        }
+        return -1;
     }
-    return i;
-  }
 
-  private static boolean isParameterSeparator(final char c) {
-    return c == ';' || c == ',' || c == ' ' || c == '\t';
-  }
-
-  /**
-   * Finds the next delimiter at or after {@code from}.
-   *
-   * @return the index the delimiter starts at, or {@code -1} if there is none
-   */
-  private static int nextDelimiter(final String body, final String delimiter, final int from) {
-    if (body.startsWith(delimiter, from) && endsLine(body, from + delimiter.length())) {
-      return from;
-    }
-    for (int newline = body.indexOf('\n', from);
-        newline >= 0;
-        newline = body.indexOf('\n', newline + 1)) {
-      if (body.startsWith(delimiter, newline + 1)
-          && endsLine(body, newline + 1 + delimiter.length())) {
-        return newline + 1;
-      }
+    /**
+     * A delimiter only delimits if its line ends there, RFC 2046 transport padding aside — for the
+     * close delimiter, past its trailing {@code --}. A content line that merely starts with one, be
+     * it {@code --x-not-a-boundary} or {@code --x--not-a-close}, is data, and must not end the part
+     * early and hide the rest from the WAF.
+     *
+     * @param after the index just past the matched delimiter
+     */
+    private static boolean endsLine(final String body, final int after) {
+        final int end = body.startsWith("--", after) ? after + 2 : after;
+        return end == body.length() || lineStart(body, end) >= 0;
     }
-    return -1;
-  }
 
-  /**
-   * A delimiter only delimits if its line ends there, RFC 2046 transport padding aside — for the
-   * close delimiter, past its trailing {@code --}. A content line that merely starts with one, be
-   * it {@code --x-not-a-boundary} or {@code --x--not-a-close}, is data, and must not end the part
-   * early and hide the rest from the WAF.
-   *
-   * @param after the index just past the matched delimiter
-   */
-  private static boolean endsLine(final String body, final int after) {
-    final int end = body.startsWith("--", after) ? after + 2 : after;
-    return end == body.length() || lineStart(body, end) >= 0;
-  }
-
-  /**
-   * Skips the linear whitespace and line break that follow a delimiter.
-   *
-   * @return the index the header lines start at, or {@code -1} if no line break follows
-   */
-  private static int lineStart(final String body, final int from) {
-    int i = from;
-    final int length = body.length();
-    while (i < length && isOptionalWhitespace(body.charAt(i))) {
-      i++;
-    }
-    if (i < length && body.charAt(i) == '\r') {
-      i++;
+    /**
+     * Skips the linear whitespace and line break that follow a delimiter.
+     *
+     * @return the index the header lines start at, or {@code -1} if no line break follows
+     */
+    private static int lineStart(final String body, final int from) {
+        int i = from;
+        final int length = body.length();
+        while (i < length && isOptionalWhitespace(body.charAt(i))) {
+            i++;
+        }
+        if (i < length && body.charAt(i) == '\r') {
+            i++;
+        }
+        return i < length && body.charAt(i) == '\n' ? i + 1 : -1;
     }
-    return i < length && body.charAt(i) == '\n' ? i + 1 : -1;
-  }
 
-  /**
-   * Ends a part's content before the line break that introduces the next delimiter, or at the end
-   * of the body when the closing delimiter was truncated away.
-   */
-  private static int contentEnd(final String body, final int contentStart, final int next) {
-    if (next < 0) {
-      return body.length();
-    }
-    int end = next > contentStart ? next - 1 : contentStart;
-    if (end > contentStart && body.charAt(end - 1) == '\r') {
-      end--;
+    /**
+     * Ends a part's content before the line break that introduces the next delimiter, or at the end
+     * of the body when the closing delimiter was truncated away.
+     */
+    private static int contentEnd(final String body, final int contentStart, final int next) {
+        if (next < 0) {
+            return body.length();
+        }
+        int end = next > contentStart ? next - 1 : contentStart;
+        if (end > contentStart && body.charAt(end - 1) == '\r') {
+            end--;
+        }
+        return end;
     }
-    return end;
-  }
 
-  /**
-   * Reads one header line, without allocating unless the name is the one asked for.
-   *
-   * @param from the first index of the line, {@code to} the index past its last character, the
-   *     trailing {@code \r} already excluded
-   * @param name the header name to match, case-insensitively
-   * @return the trimmed header value, or {@code null} when the line declares another header or is
-   *     not a header line at all — there is no colon, and obs-fold is unsupported
-   */
-  private static String headerValue(
-      final String body, final int from, final int to, final String name) {
-    int colon = -1;
-    for (int i = from; i < to; i++) {
-      if (body.charAt(i) == ':') {
-        colon = i;
-        break;
-      }
-    }
-    if (colon < 0) {
-      return null;
-    }
-    int start = from;
-    int end = colon;
-    while (start < end && isOptionalWhitespace(body.charAt(start))) {
-      start++;
-    }
-    while (end > start && isOptionalWhitespace(body.charAt(end - 1))) {
-      end--;
-    }
-    // The canonical spelling first: that comparison is intrinsified, and every real client sends it
-    if (end - start != name.length()
-        || !(body.regionMatches(start, name, 0, name.length())
-            || body.regionMatches(true, start, name, 0, name.length()))) {
-      return null;
+    /**
+     * Reads one header line, without allocating unless the name is the one asked for.
+     *
+     * @param from the first index of the line, {@code to} the index past its last character, the
+     *     trailing {@code \r} already excluded
+     * @param name the header name to match, case-insensitively
+     * @return the trimmed header value, or {@code null} when the line declares another header or is
+     *     not a header line at all — there is no colon, and obs-fold is unsupported
+     */
+    private static String headerValue(final String body, final int from, final int to, final String name) {
+        int colon = -1;
+        for (int i = from; i < to; i++) {
+            if (body.charAt(i) == ':') {
+                colon = i;
+                break;
+            }
+        }
+        if (colon < 0) {
+            return null;
+        }
+        int start = from;
+        int end = colon;
+        while (start < end && isOptionalWhitespace(body.charAt(start))) {
+            start++;
+        }
+        while (end > start && isOptionalWhitespace(body.charAt(end - 1))) {
+            end--;
+        }
+        // The canonical spelling first: that comparison is intrinsified, and every real client sends it
+        if (end - start != name.length()
+                || !(body.regionMatches(start, name, 0, name.length())
+                        || body.regionMatches(true, start, name, 0, name.length()))) {
+            return null;
+        }
+        return body.substring(colon + 1, to).trim();
     }
-    return body.substring(colon + 1, to).trim();
-  }
 
-  private static boolean isOptionalWhitespace(final char c) {
-    return c == ' ' || c == '\t';
-  }
+    private static boolean isOptionalWhitespace(final char c) {
+        return c == ' ' || c == '\t';
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/lambda/ReadFromInputStreamJsonAdapter.java b/dd-trace-core/src/main/java/datadog/trace/lambda/ReadFromInputStreamJsonAdapter.java
index 76b6081d24f..7d34383bef4 100644
--- a/dd-trace-core/src/main/java/datadog/trace/lambda/ReadFromInputStreamJsonAdapter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/lambda/ReadFromInputStreamJsonAdapter.java
@@ -9,26 +9,26 @@
 
 public final class ReadFromInputStreamJsonAdapter extends JsonAdapter<ByteArrayInputStream> {
 
-  @Override
-  public ByteArrayInputStream fromJson(JsonReader reader) throws IOException {
-    throw new UnsupportedOperationException();
-  }
+    @Override
+    public ByteArrayInputStream fromJson(JsonReader reader) throws IOException {
+        throw new UnsupportedOperationException();
+    }
 
-  @Override
-  public void toJson(JsonWriter writer, ByteArrayInputStream inputStream) throws IOException {
-    if (inputStream != null) {
-      BufferedSink sink = writer.valueSink();
-      byte[] bytes = getInputBytes(inputStream);
-      sink.write(bytes);
-      sink.flush();
+    @Override
+    public void toJson(JsonWriter writer, ByteArrayInputStream inputStream) throws IOException {
+        if (inputStream != null) {
+            BufferedSink sink = writer.valueSink();
+            byte[] bytes = getInputBytes(inputStream);
+            sink.write(bytes);
+            sink.flush();
+        }
     }
-  }
 
-  private byte[] getInputBytes(ByteArrayInputStream inputStream) throws IOException {
-    inputStream.mark(0);
-    byte[] bytes = new byte[inputStream.available()];
-    inputStream.read(bytes);
-    inputStream.reset();
-    return bytes;
-  }
+    private byte[] getInputBytes(ByteArrayInputStream inputStream) throws IOException {
+        inputStream.mark(0);
+        byte[] bytes = new byte[inputStream.available()];
+        inputStream.read(bytes);
+        inputStream.reset();
+        return bytes;
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/lambda/ReadFromOutputStreamJsonAdapter.java b/dd-trace-core/src/main/java/datadog/trace/lambda/ReadFromOutputStreamJsonAdapter.java
index fcda88ace2b..3d9e5146a11 100644
--- a/dd-trace-core/src/main/java/datadog/trace/lambda/ReadFromOutputStreamJsonAdapter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/lambda/ReadFromOutputStreamJsonAdapter.java
@@ -9,18 +9,18 @@
 
 public final class ReadFromOutputStreamJsonAdapter extends JsonAdapter<ByteArrayOutputStream> {
 
-  @Override
-  public ByteArrayOutputStream fromJson(JsonReader reader) throws IOException {
-    throw new UnsupportedOperationException();
-  }
+    @Override
+    public ByteArrayOutputStream fromJson(JsonReader reader) throws IOException {
+        throw new UnsupportedOperationException();
+    }
 
-  @Override
-  public void toJson(JsonWriter writer, ByteArrayOutputStream outputStream) throws IOException {
-    if (outputStream != null) {
-      BufferedSink sink = writer.valueSink();
-      byte[] bytes = outputStream.toByteArray();
-      sink.write(bytes);
-      sink.flush();
+    @Override
+    public void toJson(JsonWriter writer, ByteArrayOutputStream outputStream) throws IOException {
+        if (outputStream != null) {
+            BufferedSink sink = writer.valueSink();
+            byte[] bytes = outputStream.toByteArray();
+            sink.write(bytes);
+            sink.flush();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/lambda/SkipUnsupportedTypeJsonAdapter.java b/dd-trace-core/src/main/java/datadog/trace/lambda/SkipUnsupportedTypeJsonAdapter.java
index 6be76c05225..7ef1c65747d 100644
--- a/dd-trace-core/src/main/java/datadog/trace/lambda/SkipUnsupportedTypeJsonAdapter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/lambda/SkipUnsupportedTypeJsonAdapter.java
@@ -11,29 +11,28 @@
 
 public final class SkipUnsupportedTypeJsonAdapter<T> extends JsonAdapter<T> {
 
-  @Override
-  public T fromJson(JsonReader reader) throws IOException {
-    throw new UnsupportedOperationException();
-  }
+    @Override
+    public T fromJson(JsonReader reader) throws IOException {
+        throw new UnsupportedOperationException();
+    }
 
-  @Override
-  public void toJson(JsonWriter writer, T value) throws IOException {
-    // nothing to do when we deal with an unsupported type, let's skip it.
-    writer.beginObject();
-    writer.endObject();
-  }
+    @Override
+    public void toJson(JsonWriter writer, T value) throws IOException {
+        // nothing to do when we deal with an unsupported type, let's skip it.
+        writer.beginObject();
+        writer.endObject();
+    }
 
-  public static Factory newFactory() {
-    return new Factory() {
-      @Override
-      public JsonAdapter<?> create(
-          Type requestedType, Set<? extends Annotation> annotations, Moshi moshi) {
-        try {
-          return moshi.nextAdapter(this, requestedType, annotations);
-        } catch (IllegalArgumentException e) {
-          return new SkipUnsupportedTypeJsonAdapter<>();
-        }
-      }
-    };
-  }
+    public static Factory newFactory() {
+        return new Factory() {
+            @Override
+            public JsonAdapter<?> create(Type requestedType, Set<? extends Annotation> annotations, Moshi moshi) {
+                try {
+                    return moshi.nextAdapter(this, requestedType, annotations);
+                } catch (IllegalArgumentException e) {
+                    return new SkipUnsupportedTypeJsonAdapter<>();
+                }
+            }
+        };
+    }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanDataAdapter.java b/dd-trace-core/src/main/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanDataAdapter.java
index fdaa17f542d..1d2ef42a7e4 100644
--- a/dd-trace-core/src/main/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanDataAdapter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanDataAdapter.java
@@ -14,257 +14,243 @@
 
 /** Adapts the internal tag representation of an LLM Observability span to the public API. */
 final class LLMObsSpanDataAdapter implements LLMObsSpanData {
-  private static final LLMObs.LLMMessage[] NO_MESSAGES = new LLMObs.LLMMessage[0];
-  private static final String LLMOBS_TAG_PREFIX = "_ml_obs_tag.";
-  private static final String INPUT_TAG = LLMOBS_TAG_PREFIX + "input";
-  private static final String OUTPUT_TAG = LLMOBS_TAG_PREFIX + "output";
-  private static final String SPAN_KIND_TAG = LLMOBS_TAG_PREFIX + Tags.SPAN_KIND;
+    private static final LLMObs.LLMMessage[] NO_MESSAGES = new LLMObs.LLMMessage[0];
+    private static final String LLMOBS_TAG_PREFIX = "_ml_obs_tag.";
+    private static final String INPUT_TAG = LLMOBS_TAG_PREFIX + "input";
+    private static final String OUTPUT_TAG = LLMOBS_TAG_PREFIX + "output";
+    private static final String SPAN_KIND_TAG = LLMOBS_TAG_PREFIX + Tags.SPAN_KIND;
 
-  private enum IOType {
-    NONE,
-    MESSAGES,
-    DOCUMENTS,
-    VALUE
-  }
-
-  private final CoreSpan<?> span;
-  private final String kind;
-  private final Object originalInput;
-  private final Object originalOutput;
-  private final IOType inputType;
-  private final IOType outputType;
-  private final LLMObs.LLMMessage[] initialInput;
-  private final LLMObs.LLMMessage[] initialOutput;
-  private List<LLMObs.LLMMessage> input;
-  private List<LLMObs.LLMMessage> output;
-  private boolean inputModified;
-  private boolean outputModified;
-
-  LLMObsSpanDataAdapter(CoreSpan<?> span) {
-    this.span = span;
-    Object rawKind = span.getTag(SPAN_KIND_TAG);
-    kind = rawKind == null ? "unknown" : String.valueOf(rawKind);
-    originalInput = span.getTag(INPUT_TAG);
-    originalOutput = span.getTag(OUTPUT_TAG);
-    inputType = ioType(kind, originalInput, true);
-    outputType = ioType(kind, originalOutput, false);
-    input = asMessages(originalInput, inputType);
-    output = asMessages(originalOutput, outputType);
-    initialInput = snapshot(input);
-    initialOutput = snapshot(output);
-  }
-
-  @Override
-  public String getKind() {
-    return kind;
-  }
-
-  @Override
-  public List<LLMObs.LLMMessage> getInput() {
-    return input;
-  }
-
-  @Override
-  public void setInput(List<LLMObs.LLMMessage> input) {
-    this.input = new ArrayList<>(requireNonNull(input, "input"));
-    inputModified = true;
-  }
-
-  @Override
-  public List<LLMObs.LLMMessage> getOutput() {
-    return output;
-  }
+    private enum IOType {
+        NONE,
+        MESSAGES,
+        DOCUMENTS,
+        VALUE
+    }
 
-  @Override
-  public void setOutput(List<LLMObs.LLMMessage> output) {
-    this.output = new ArrayList<>(requireNonNull(output, "output"));
-    outputModified = true;
-  }
+    private final CoreSpan<?> span;
+    private final String kind;
+    private final Object originalInput;
+    private final Object originalOutput;
+    private final IOType inputType;
+    private final IOType outputType;
+    private final LLMObs.LLMMessage[] initialInput;
+    private final LLMObs.LLMMessage[] initialOutput;
+    private List<LLMObs.LLMMessage> input;
+    private List<LLMObs.LLMMessage> output;
+    private boolean inputModified;
+    private boolean outputModified;
 
-  @Override
-  public String getTag(String key) {
-    Object value = span.getTag(LLMOBS_TAG_PREFIX + key);
-    if (value == null && "error".equals(key)) {
-      int error = span.getError();
-      value = error == 0 ? null : error;
-    }
-    if (value == null && "error_type".equals(key)) {
-      value = span.getTag(DDTags.ERROR_TYPE);
+    LLMObsSpanDataAdapter(CoreSpan<?> span) {
+        this.span = span;
+        Object rawKind = span.getTag(SPAN_KIND_TAG);
+        kind = rawKind == null ? "unknown" : String.valueOf(rawKind);
+        originalInput = span.getTag(INPUT_TAG);
+        originalOutput = span.getTag(OUTPUT_TAG);
+        inputType = ioType(kind, originalInput, true);
+        outputType = ioType(kind, originalOutput, false);
+        input = asMessages(originalInput, inputType);
+        output = asMessages(originalOutput, outputType);
+        initialInput = snapshot(input);
+        initialOutput = snapshot(output);
     }
-    return value == null ? null : String.valueOf(value);
-  }
 
-  void apply(LLMObsSpanData processedSpan) {
-    if (processedSpan != this || inputModified || wasModified(input, initialInput)) {
-      applyIO(
-          span,
-          INPUT_TAG,
-          originalInput,
-          inputType,
-          new ArrayList<>(requireNonNull(processedSpan.getInput(), "processed input")));
+    @Override
+    public String getKind() {
+        return kind;
     }
-    if (processedSpan != this || outputModified || wasModified(output, initialOutput)) {
-      applyIO(
-          span,
-          OUTPUT_TAG,
-          originalOutput,
-          outputType,
-          new ArrayList<>(requireNonNull(processedSpan.getOutput(), "processed output")));
-    }
-  }
 
-  private static IOType ioType(String kind, Object value, boolean input) {
-    if (value == null) {
-      if (Tags.LLMOBS_LLM_SPAN_KIND.equals(kind)) {
-        return IOType.MESSAGES;
-      }
-      if ((input && Tags.LLMOBS_EMBEDDING_SPAN_KIND.equals(kind))
-          || (!input && Tags.LLMOBS_RETRIEVAL_SPAN_KIND.equals(kind))) {
-        return IOType.DOCUMENTS;
-      }
-      return IOType.VALUE;
-    }
-    Object unwrapped = unwrapMessages(value);
-    if (Tags.LLMOBS_LLM_SPAN_KIND.equals(kind)) {
-      if (input && value instanceof Map && !((Map<?, ?>) value).containsKey("messages")) {
-        return IOType.MESSAGES;
-      }
-      return unwrapped instanceof List && allMessages((List<?>) unwrapped)
-          ? IOType.MESSAGES
-          : IOType.NONE;
+    @Override
+    public List<LLMObs.LLMMessage> getInput() {
+        return input;
     }
-    if (((input && Tags.LLMOBS_EMBEDDING_SPAN_KIND.equals(kind))
-            || (!input && Tags.LLMOBS_RETRIEVAL_SPAN_KIND.equals(kind)))
-        && value instanceof List
-        && allDocuments((List<?>) value)) {
-      return IOType.DOCUMENTS;
+
+    @Override
+    public void setInput(List<LLMObs.LLMMessage> input) {
+        this.input = new ArrayList<>(requireNonNull(input, "input"));
+        inputModified = true;
     }
-    return IOType.VALUE;
-  }
 
-  @SuppressWarnings("unchecked")
-  private static List<LLMObs.LLMMessage> asMessages(Object value, IOType type) {
-    if (value == null || type == IOType.NONE) {
-      return new ArrayList<>();
+    @Override
+    public List<LLMObs.LLMMessage> getOutput() {
+        return output;
     }
-    if (type == IOType.MESSAGES) {
-      Object messages = unwrapMessages(value);
-      return messages == null
-          ? new ArrayList<>()
-          : new ArrayList<>((List<LLMObs.LLMMessage>) messages);
+
+    @Override
+    public void setOutput(List<LLMObs.LLMMessage> output) {
+        this.output = new ArrayList<>(requireNonNull(output, "output"));
+        outputModified = true;
     }
-    if (type == IOType.DOCUMENTS) {
-      List<LLMObs.LLMMessage> messages = new ArrayList<>(((List<?>) value).size());
-      for (Object valueElement : (List<?>) value) {
-        LLMObs.Document document = (LLMObs.Document) valueElement;
-        messages.add(LLMObs.LLMMessage.from("", document.getText()));
-      }
-      return messages;
+
+    @Override
+    public String getTag(String key) {
+        Object value = span.getTag(LLMOBS_TAG_PREFIX + key);
+        if (value == null && "error".equals(key)) {
+            int error = span.getError();
+            value = error == 0 ? null : error;
+        }
+        if (value == null && "error_type".equals(key)) {
+            value = span.getTag(DDTags.ERROR_TYPE);
+        }
+        return value == null ? null : String.valueOf(value);
     }
-    List<LLMObs.LLMMessage> messages = new ArrayList<>(1);
-    messages.add(LLMObs.LLMMessage.from("", String.valueOf(value)));
-    return messages;
-  }
 
-  private static Object unwrapMessages(Object value) {
-    if (value instanceof Map) {
-      return ((Map<?, ?>) value).get("messages");
+    void apply(LLMObsSpanData processedSpan) {
+        if (processedSpan != this || inputModified || wasModified(input, initialInput)) {
+            applyIO(
+                    span,
+                    INPUT_TAG,
+                    originalInput,
+                    inputType,
+                    new ArrayList<>(requireNonNull(processedSpan.getInput(), "processed input")));
+        }
+        if (processedSpan != this || outputModified || wasModified(output, initialOutput)) {
+            applyIO(
+                    span,
+                    OUTPUT_TAG,
+                    originalOutput,
+                    outputType,
+                    new ArrayList<>(requireNonNull(processedSpan.getOutput(), "processed output")));
+        }
     }
-    return value;
-  }
 
-  private static boolean allMessages(List<?> values) {
-    for (Object value : values) {
-      if (!(value instanceof LLMObs.LLMMessage)) {
-        return false;
-      }
+    private static IOType ioType(String kind, Object value, boolean input) {
+        if (value == null) {
+            if (Tags.LLMOBS_LLM_SPAN_KIND.equals(kind)) {
+                return IOType.MESSAGES;
+            }
+            if ((input && Tags.LLMOBS_EMBEDDING_SPAN_KIND.equals(kind))
+                    || (!input && Tags.LLMOBS_RETRIEVAL_SPAN_KIND.equals(kind))) {
+                return IOType.DOCUMENTS;
+            }
+            return IOType.VALUE;
+        }
+        Object unwrapped = unwrapMessages(value);
+        if (Tags.LLMOBS_LLM_SPAN_KIND.equals(kind)) {
+            if (input && value instanceof Map && !((Map<?, ?>) value).containsKey("messages")) {
+                return IOType.MESSAGES;
+            }
+            return unwrapped instanceof List && allMessages((List<?>) unwrapped) ? IOType.MESSAGES : IOType.NONE;
+        }
+        if (((input && Tags.LLMOBS_EMBEDDING_SPAN_KIND.equals(kind))
+                        || (!input && Tags.LLMOBS_RETRIEVAL_SPAN_KIND.equals(kind)))
+                && value instanceof List
+                && allDocuments((List<?>) value)) {
+            return IOType.DOCUMENTS;
+        }
+        return IOType.VALUE;
     }
-    return true;
-  }
 
-  private static boolean allDocuments(List<?> values) {
-    for (Object value : values) {
-      if (!(value instanceof LLMObs.Document)) {
-        return false;
-      }
+    @SuppressWarnings("unchecked")
+    private static List<LLMObs.LLMMessage> asMessages(Object value, IOType type) {
+        if (value == null || type == IOType.NONE) {
+            return new ArrayList<>();
+        }
+        if (type == IOType.MESSAGES) {
+            Object messages = unwrapMessages(value);
+            return messages == null ? new ArrayList<>() : new ArrayList<>((List<LLMObs.LLMMessage>) messages);
+        }
+        if (type == IOType.DOCUMENTS) {
+            List<LLMObs.LLMMessage> messages = new ArrayList<>(((List<?>) value).size());
+            for (Object valueElement : (List<?>) value) {
+                LLMObs.Document document = (LLMObs.Document) valueElement;
+                messages.add(LLMObs.LLMMessage.from("", document.getText()));
+            }
+            return messages;
+        }
+        List<LLMObs.LLMMessage> messages = new ArrayList<>(1);
+        messages.add(LLMObs.LLMMessage.from("", String.valueOf(value)));
+        return messages;
     }
-    return true;
-  }
 
-  private static LLMObs.LLMMessage[] snapshot(List<LLMObs.LLMMessage> messages) {
-    return messages.isEmpty()
-        ? NO_MESSAGES
-        : messages.toArray(new LLMObs.LLMMessage[messages.size()]);
-  }
+    private static Object unwrapMessages(Object value) {
+        if (value instanceof Map) {
+            return ((Map<?, ?>) value).get("messages");
+        }
+        return value;
+    }
 
-  private static boolean wasModified(
-      List<LLMObs.LLMMessage> messages, LLMObs.LLMMessage[] initialMessages) {
-    if (messages.size() != initialMessages.length) {
-      return true;
+    private static boolean allMessages(List<?> values) {
+        for (Object value : values) {
+            if (!(value instanceof LLMObs.LLMMessage)) {
+                return false;
+            }
+        }
+        return true;
     }
-    for (int i = 0; i < initialMessages.length; i++) {
-      if (messages.get(i) != initialMessages[i]) {
+
+    private static boolean allDocuments(List<?> values) {
+        for (Object value : values) {
+            if (!(value instanceof LLMObs.Document)) {
+                return false;
+            }
+        }
         return true;
-      }
     }
-    return false;
-  }
 
-  private static void applyIO(
-      CoreSpan<?> span,
-      String tag,
-      Object originalValue,
-      IOType type,
-      List<LLMObs.LLMMessage> messages) {
-    if (type == IOType.NONE) {
-      return;
+    private static LLMObs.LLMMessage[] snapshot(List<LLMObs.LLMMessage> messages) {
+        return messages.isEmpty() ? NO_MESSAGES : messages.toArray(new LLMObs.LLMMessage[messages.size()]);
     }
-    if (messages.isEmpty()) {
-      if (originalValue == null) {
-        return;
-      }
-      if (type == IOType.MESSAGES && originalValue instanceof Map) {
-        Map<Object, Object> updatedValue = new HashMap<>((Map<?, ?>) originalValue);
-        updatedValue.remove("messages");
-        if (updatedValue.isEmpty()) {
-          span.removeTag(tag);
-        } else {
-          span.setTag(tag, updatedValue);
+
+    private static boolean wasModified(List<LLMObs.LLMMessage> messages, LLMObs.LLMMessage[] initialMessages) {
+        if (messages.size() != initialMessages.length) {
+            return true;
+        }
+        for (int i = 0; i < initialMessages.length; i++) {
+            if (messages.get(i) != initialMessages[i]) {
+                return true;
+            }
         }
-      } else {
-        span.removeTag(tag);
-      }
-      return;
+        return false;
     }
-    if (type == IOType.MESSAGES) {
-      if (originalValue instanceof Map) {
-        Map<Object, Object> updatedValue = new HashMap<>((Map<?, ?>) originalValue);
-        updatedValue.put("messages", messages);
-        span.setTag(tag, updatedValue);
-      } else {
-        span.setTag(tag, messages);
-      }
-    } else if (type == IOType.DOCUMENTS) {
-      List<?> originalDocuments = originalValue instanceof List ? (List<?>) originalValue : null;
-      List<LLMObs.Document> documents = new ArrayList<>(messages.size());
-      for (int i = 0; i < messages.size(); i++) {
-        LLMObs.LLMMessage message = messages.get(i);
-        Object originalDocument =
-            originalDocuments != null && i < originalDocuments.size()
-                ? originalDocuments.get(i)
-                : null;
-        if (originalDocument instanceof LLMObs.Document) {
-          LLMObs.Document document = (LLMObs.Document) originalDocument;
-          documents.add(
-              LLMObs.Document.from(
-                  message.getContent(), document.getName(), document.getId(), document.getScore()));
+
+    private static void applyIO(
+            CoreSpan<?> span, String tag, Object originalValue, IOType type, List<LLMObs.LLMMessage> messages) {
+        if (type == IOType.NONE) {
+            return;
+        }
+        if (messages.isEmpty()) {
+            if (originalValue == null) {
+                return;
+            }
+            if (type == IOType.MESSAGES && originalValue instanceof Map) {
+                Map<Object, Object> updatedValue = new HashMap<>((Map<?, ?>) originalValue);
+                updatedValue.remove("messages");
+                if (updatedValue.isEmpty()) {
+                    span.removeTag(tag);
+                } else {
+                    span.setTag(tag, updatedValue);
+                }
+            } else {
+                span.removeTag(tag);
+            }
+            return;
+        }
+        if (type == IOType.MESSAGES) {
+            if (originalValue instanceof Map) {
+                Map<Object, Object> updatedValue = new HashMap<>((Map<?, ?>) originalValue);
+                updatedValue.put("messages", messages);
+                span.setTag(tag, updatedValue);
+            } else {
+                span.setTag(tag, messages);
+            }
+        } else if (type == IOType.DOCUMENTS) {
+            List<?> originalDocuments = originalValue instanceof List ? (List<?>) originalValue : null;
+            List<LLMObs.Document> documents = new ArrayList<>(messages.size());
+            for (int i = 0; i < messages.size(); i++) {
+                LLMObs.LLMMessage message = messages.get(i);
+                Object originalDocument =
+                        originalDocuments != null && i < originalDocuments.size() ? originalDocuments.get(i) : null;
+                if (originalDocument instanceof LLMObs.Document) {
+                    LLMObs.Document document = (LLMObs.Document) originalDocument;
+                    documents.add(LLMObs.Document.from(
+                            message.getContent(), document.getName(), document.getId(), document.getScore()));
+                } else {
+                    documents.add(LLMObs.Document.from(message.getContent()));
+                }
+            }
+            span.setTag(tag, documents);
         } else {
-          documents.add(LLMObs.Document.from(message.getContent()));
+            span.setTag(tag, messages.get(0).getContent());
         }
-      }
-      span.setTag(tag, documents);
-    } else {
-      span.setTag(tag, messages.get(0).getContent());
     }
-  }
 }
diff --git a/dd-trace-core/src/main/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapper.java b/dd-trace-core/src/main/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapper.java
index c1961472ef0..d243e159845 100644
--- a/dd-trace-core/src/main/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapper.java
+++ b/dd-trace-core/src/main/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapper.java
@@ -42,781 +42,760 @@
 
 public class LLMObsSpanMapper implements RemoteMapper {
 
-  private static final boolean[] NO_DROPPED_SPANS = new boolean[0];
-
-  // Well known tags for LLM obs will be prefixed with _ml_obs_(tags|metrics).
-  // Prefix for tags
-  private static final String LLMOBS_TAG_PREFIX = "_ml_obs_tag.";
-  // Prefix for metrics
-  private static final String LLMOBS_METRIC_PREFIX = "_ml_obs_metric.";
-
-  // internal tags to be prefixed
-  private static final String INPUT = "input";
-  private static final String INPUT_PROMPT = "input_prompt";
-  private static final String OUTPUT = "output";
-  private static final String SPAN_KIND_TAG_KEY = LLMOBS_TAG_PREFIX + Tags.SPAN_KIND;
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(LLMObsSpanMapper.class);
-  private static final RatelimitedLogger PROCESSOR_ERROR_LOGGER =
-      new RatelimitedLogger(LOGGER, 1, MINUTES);
-
-  private static final byte[] STAGE = "_dd.stage".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] EVENT_TYPE = "event_type".getBytes(StandardCharsets.UTF_8);
-
-  private static final byte[] SPAN_ID = "span_id".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] TRACE_ID = "trace_id".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] DD = "_dd".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] APM_TRACE_ID = "apm_trace_id".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] PARENT_ID = "parent_id".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] SESSION_ID = "session_id".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] SAMPLE_RATE = "sample_rate".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] SAMPLING_DECISION =
-      "sampling_decision".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] NAME = "name".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] DURATION = "duration".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] START_NS = "start_ns".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] STATUS = "status".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] ERROR = "error".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] ERROR_MESSAGE = "message".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] ERROR_TYPE = "type".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] ERROR_STACK = "stack".getBytes(StandardCharsets.UTF_8);
-
-  private static final byte[] META = "meta".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] AGENT_ATTRIBUTION =
-      "agent_attribution".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] PAGENT_NAME = "pagent_name".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] PAGENT_SPAN_ID = "pagent_span_id".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] METADATA = "metadata".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] PROMPT = "prompt".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] SPAN_KIND = "span.kind".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] SPANS = "spans".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] METRICS = "metrics".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] TAGS = "tags".getBytes(StandardCharsets.UTF_8);
-  private static final String LLMOBS_LANGUAGE_TAG = "language:jvm";
-
-  private static final byte[] LLM_MESSAGE_ROLE = "role".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] LLM_MESSAGE_CONTENT = "content".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] LLM_MESSAGE_TOOL_CALLS =
-      "tool_calls".getBytes(StandardCharsets.UTF_8);
-
-  private static final byte[] LLM_TOOL_CALL_NAME = "name".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] LLM_TOOL_CALL_TYPE = "type".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] LLM_TOOL_CALL_TOOL_ID = "tool_id".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] LLM_TOOL_CALL_ARGUMENTS =
-      "arguments".getBytes(StandardCharsets.UTF_8);
-
-  private static final byte[] LLM_MESSAGE_TOOL_RESULTS =
-      "tool_results".getBytes(StandardCharsets.UTF_8);
-  private static final byte[] LLM_TOOL_RESULT_RESULT = "result".getBytes(StandardCharsets.UTF_8);
-
-  private static final String PARENT_ID_TAG_INTERNAL_FULL = LLMOBS_TAG_PREFIX + "parent_id";
-  private static final String SESSION_ID_TAG_INTERNAL_FULL =
-      LLMOBS_TAG_PREFIX + LLMObsTags.SESSION_ID;
-  private static final String SAMPLE_RATE_TAG_INTERNAL_FULL = LLMOBS_TAG_PREFIX + "sample_rate";
-  private static final String SAMPLING_DECISION_TAG_INTERNAL_FULL =
-      LLMOBS_TAG_PREFIX + "sampling_decision";
-
-  /**
-   * Fallback pair meaning "retain", used if a span reaches the mapper without a stamped decision.
-   */
-  private static final String SAMPLING_DECISION_SAMPLED = "1";
-
-  private static final String SAMPLE_RATE_ALL = "1";
-
-  /**
-   * Internal tags serialized as dedicated top-level fields, which must therefore not also be
-   * emitted into the {@code tags} array.
-   *
-   * <p>These are skipped while writing rather than removed from the span. {@link
-   * datadog.communication.serialization.msgpack.MsgPackWriter#format} re-invokes {@code map} on the
-   * same span instances after a buffer overflow, so a span mutated on the first pass serializes
-   * differently on the retry — a dropped span would lose its verdict and be re-emitted as retained.
-   */
-  private static final Set<String> TAGS_WRITTEN_AS_TOP_LEVEL_FIELDS =
-      Collections.unmodifiableSet(
-          new HashSet<>(
-              Arrays.asList(
-                  PARENT_ID_TAG_INTERNAL_FULL,
-                  SAMPLING_DECISION_TAG_INTERNAL_FULL,
-                  SAMPLE_RATE_TAG_INTERNAL_FULL,
-                  SPAN_KIND_TAG_KEY)));
-
-  private static final String PAGENT_SPAN_ID_TAG_INTERNAL_FULL =
-      LLMOBS_TAG_PREFIX + LLMObsTags.PAGENT_SPAN_ID;
-  private static final String PAGENT_NAME_TAG_INTERNAL_FULL =
-      LLMOBS_TAG_PREFIX + LLMObsTags.PAGENT_NAME;
-
-  private final MetaWriter metaWriter = new MetaWriter();
-  private final int size;
-
-  private final ByteBuffer header;
-  private boolean[] pendingDroppedSpans;
-  private int spansWritten;
-
-  public LLMObsSpanMapper() {
-    this(EvpProxy.PAYLOAD_SIZE_LIMIT_BYTES);
-  }
-
-  private LLMObsSpanMapper(int size) {
-    this.size = size;
-
-    GrowableBuffer header = new GrowableBuffer(64);
-    MsgPackWriter headerWriter = new MsgPackWriter(header);
-
-    headerWriter.startMap(3);
-    headerWriter.writeUTF8(EVENT_TYPE);
-    headerWriter.writeString("span", null);
-    headerWriter.writeUTF8(STAGE);
-    headerWriter.writeString("raw", null);
-    headerWriter.writeUTF8(SPANS);
-
-    this.header = header.slice();
-  }
-
-  @Override
-  public void map(List<? extends CoreSpan<?>> trace, Writable writable) {
-    this.map(trace, writable, false);
-  }
-
-  @Override
-  public void map(List<? extends CoreSpan<?>> trace, Writable writable, boolean retry) {
-    if (!retry) {
-      pendingDroppedSpans = null;
+    private static final boolean[] NO_DROPPED_SPANS = new boolean[0];
+
+    // Well known tags for LLM obs will be prefixed with _ml_obs_(tags|metrics).
+    // Prefix for tags
+    private static final String LLMOBS_TAG_PREFIX = "_ml_obs_tag.";
+    // Prefix for metrics
+    private static final String LLMOBS_METRIC_PREFIX = "_ml_obs_metric.";
+
+    // internal tags to be prefixed
+    private static final String INPUT = "input";
+    private static final String INPUT_PROMPT = "input_prompt";
+    private static final String OUTPUT = "output";
+    private static final String SPAN_KIND_TAG_KEY = LLMOBS_TAG_PREFIX + Tags.SPAN_KIND;
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LLMObsSpanMapper.class);
+    private static final RatelimitedLogger PROCESSOR_ERROR_LOGGER = new RatelimitedLogger(LOGGER, 1, MINUTES);
+
+    private static final byte[] STAGE = "_dd.stage".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] EVENT_TYPE = "event_type".getBytes(StandardCharsets.UTF_8);
+
+    private static final byte[] SPAN_ID = "span_id".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] TRACE_ID = "trace_id".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] DD = "_dd".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] APM_TRACE_ID = "apm_trace_id".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] PARENT_ID = "parent_id".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] SESSION_ID = "session_id".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] SAMPLE_RATE = "sample_rate".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] SAMPLING_DECISION = "sampling_decision".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] NAME = "name".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] DURATION = "duration".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] START_NS = "start_ns".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] STATUS = "status".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] ERROR = "error".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] ERROR_MESSAGE = "message".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] ERROR_TYPE = "type".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] ERROR_STACK = "stack".getBytes(StandardCharsets.UTF_8);
+
+    private static final byte[] META = "meta".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] AGENT_ATTRIBUTION = "agent_attribution".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] PAGENT_NAME = "pagent_name".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] PAGENT_SPAN_ID = "pagent_span_id".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] METADATA = "metadata".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] PROMPT = "prompt".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] SPAN_KIND = "span.kind".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] SPANS = "spans".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] METRICS = "metrics".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] TAGS = "tags".getBytes(StandardCharsets.UTF_8);
+    private static final String LLMOBS_LANGUAGE_TAG = "language:jvm";
+
+    private static final byte[] LLM_MESSAGE_ROLE = "role".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] LLM_MESSAGE_CONTENT = "content".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] LLM_MESSAGE_TOOL_CALLS = "tool_calls".getBytes(StandardCharsets.UTF_8);
+
+    private static final byte[] LLM_TOOL_CALL_NAME = "name".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] LLM_TOOL_CALL_TYPE = "type".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] LLM_TOOL_CALL_TOOL_ID = "tool_id".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] LLM_TOOL_CALL_ARGUMENTS = "arguments".getBytes(StandardCharsets.UTF_8);
+
+    private static final byte[] LLM_MESSAGE_TOOL_RESULTS = "tool_results".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] LLM_TOOL_RESULT_RESULT = "result".getBytes(StandardCharsets.UTF_8);
+
+    private static final String PARENT_ID_TAG_INTERNAL_FULL = LLMOBS_TAG_PREFIX + "parent_id";
+    private static final String SESSION_ID_TAG_INTERNAL_FULL = LLMOBS_TAG_PREFIX + LLMObsTags.SESSION_ID;
+    private static final String SAMPLE_RATE_TAG_INTERNAL_FULL = LLMOBS_TAG_PREFIX + "sample_rate";
+    private static final String SAMPLING_DECISION_TAG_INTERNAL_FULL = LLMOBS_TAG_PREFIX + "sampling_decision";
+
+    /**
+     * Fallback pair meaning "retain", used if a span reaches the mapper without a stamped decision.
+     */
+    private static final String SAMPLING_DECISION_SAMPLED = "1";
+
+    private static final String SAMPLE_RATE_ALL = "1";
+
+    /**
+     * Internal tags serialized as dedicated top-level fields, which must therefore not also be
+     * emitted into the {@code tags} array.
+     *
+     * <p>These are skipped while writing rather than removed from the span. {@link
+     * datadog.communication.serialization.msgpack.MsgPackWriter#format} re-invokes {@code map} on the
+     * same span instances after a buffer overflow, so a span mutated on the first pass serializes
+     * differently on the retry — a dropped span would lose its verdict and be re-emitted as retained.
+     */
+    private static final Set<String> TAGS_WRITTEN_AS_TOP_LEVEL_FIELDS =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+                    PARENT_ID_TAG_INTERNAL_FULL,
+                    SAMPLING_DECISION_TAG_INTERNAL_FULL,
+                    SAMPLE_RATE_TAG_INTERNAL_FULL,
+                    SPAN_KIND_TAG_KEY)));
+
+    private static final String PAGENT_SPAN_ID_TAG_INTERNAL_FULL = LLMOBS_TAG_PREFIX + LLMObsTags.PAGENT_SPAN_ID;
+    private static final String PAGENT_NAME_TAG_INTERNAL_FULL = LLMOBS_TAG_PREFIX + LLMObsTags.PAGENT_NAME;
+
+    private final MetaWriter metaWriter = new MetaWriter();
+    private final int size;
+
+    private final ByteBuffer header;
+    private boolean[] pendingDroppedSpans;
+    private int spansWritten;
+
+    public LLMObsSpanMapper() {
+        this(EvpProxy.PAYLOAD_SIZE_LIMIT_BYTES);
     }
 
-    List<? extends CoreSpan<?>> llmobsSpans =
-        trace.stream().filter(LLMObsSpanMapper::isLLMObsSpan).collect(Collectors.toList());
+    private LLMObsSpanMapper(int size) {
+        this.size = size;
 
-    if (llmobsSpans.isEmpty()) {
-      // do nothing if no llmobs spans in the trace
-      return;
+        GrowableBuffer header = new GrowableBuffer(64);
+        MsgPackWriter headerWriter = new MsgPackWriter(header);
+
+        headerWriter.startMap(3);
+        headerWriter.writeUTF8(EVENT_TYPE);
+        headerWriter.writeString("span", null);
+        headerWriter.writeUTF8(STAGE);
+        headerWriter.writeString("raw", null);
+        headerWriter.writeUTF8(SPANS);
+
+        this.header = header.slice();
     }
 
-    llmobsSpans = processSpans(llmobsSpans, retry);
-
-    for (CoreSpan<?> span : llmobsSpans) {
-      // Read session_id off the span before opening the map so we can size it correctly.
-      // We deliberately do NOT remove the tag (unlike parent_id) — the session_id:<value>
-      // entry must remain in the tags[] array to match dd-trace-py and dd-trace-js behavior.
-      // span.getTag returns Object — guard against generic tag APIs setting a non-string
-      // session_id value, which would otherwise throw ClassCastException here and drop
-      // the entire LLMObs payload for the trace.
-      Object rawSessionId = span.getTag(SESSION_ID_TAG_INTERNAL_FULL);
-      String sessionId = rawSessionId instanceof String ? (String) rawSessionId : null;
-      boolean hasSessionId = sessionId != null && !sessionId.isEmpty();
-
-      // Fallback to set default sampling tags when the fields are absent.
-      Object rawSamplingDecision = span.getTag(SAMPLING_DECISION_TAG_INTERNAL_FULL);
-      Object rawSampleRate = span.getTag(SAMPLE_RATE_TAG_INTERNAL_FULL);
-      boolean stamped = rawSamplingDecision instanceof String && rawSampleRate instanceof String;
-      String samplingDecision = stamped ? (String) rawSamplingDecision : SAMPLING_DECISION_SAMPLED;
-      String sampleRate = stamped ? (String) rawSampleRate : SAMPLE_RATE_ALL;
-
-      writable.startMap(hasSessionId ? 12 : 11);
-      // 1
-      writable.writeUTF8(SPAN_ID);
-      writable.writeString(String.valueOf(span.getSpanId()), null);
-
-      // 2
-      writable.writeUTF8(TRACE_ID);
-      writable.writeString(span.getTraceId().toHexString(), null);
-
-      // 3
-      writable.writeUTF8(PARENT_ID);
-      writable.writeString(span.getTag(PARENT_ID_TAG_INTERNAL_FULL), null);
-
-      // 4
-      writable.writeUTF8(NAME);
-      writable.writeString(llmObsSpanName(span), null);
-
-      // 5
-      writable.writeUTF8(START_NS);
-      writable.writeUnsignedLong(span.getStartTime());
-
-      // 6
-      writable.writeUTF8(DURATION);
-      writable.writeFloat(span.getDurationNano());
-
-      // 7
-      writable.writeUTF8(STATUS);
-      writable.writeString(span.getError() == 0 ? "ok" : "error", null);
-
-      // 8
-      writable.writeUTF8(DD);
-      writable.startMap(5);
-      writable.writeUTF8(SPAN_ID);
-      writable.writeString(String.valueOf(span.getSpanId()), null);
-      writable.writeUTF8(TRACE_ID);
-      writable.writeString(span.getTraceId().toHexString(), null);
-      writable.writeUTF8(APM_TRACE_ID);
-      writable.writeString(span.getTraceId().toHexString(), null);
-      writable.writeUTF8(SAMPLING_DECISION);
-      writable.writeString(samplingDecision, null);
-      writable.writeUTF8(SAMPLE_RATE);
-      writable.writeString(sampleRate, null);
-
-      // 9 — optional top-level session_id field. Required by the LLMObs HTTP intake schema
-      // and by the LLM Trace Explorer's Sessions filter, which keys off this field.
-      if (hasSessionId) {
-        writable.writeUTF8(SESSION_ID);
-        writable.writeString(sessionId, null);
-      }
-
-      /* 10 (metrics), 11 (tags), 12 meta — shift down 1 if session_id absent */
-      span.processTagsAndBaggage(metaWriter.withWritable(writable, getErrorsMap(span)));
+    @Override
+    public void map(List<? extends CoreSpan<?>> trace, Writable writable) {
+        this.map(trace, writable, false);
     }
 
-    // Increase only after all spans have been written. This way, if it rolls back because of a
-    // buffer overflow, the counter won't be skewed.
-    spansWritten += llmobsSpans.size();
-    pendingDroppedSpans = null;
-  }
-
-  private List<? extends CoreSpan<?>> processSpans(
-      List<? extends CoreSpan<?>> spans, boolean retry) {
-    if (retry && pendingDroppedSpans != null) {
-      boolean[] droppedSpans = pendingDroppedSpans;
-      pendingDroppedSpans = null;
-      if (droppedSpans.length == 0) {
-        return spans;
-      }
-
-      List<CoreSpan<?>> processedSpans = new ArrayList<>(spans.size());
-      for (int i = 0; i < spans.size(); i++) {
-        if (!droppedSpans[i]) {
-          processedSpans.add(spans.get(i));
+    @Override
+    public void map(List<? extends CoreSpan<?>> trace, Writable writable, boolean retry) {
+        if (!retry) {
+            pendingDroppedSpans = null;
+        }
+
+        List<? extends CoreSpan<?>> llmobsSpans =
+                trace.stream().filter(LLMObsSpanMapper::isLLMObsSpan).collect(Collectors.toList());
+
+        if (llmobsSpans.isEmpty()) {
+            // do nothing if no llmobs spans in the trace
+            return;
         }
-      }
-      return processedSpans;
-    }
 
-    LLMObsSpanProcessor processor = LLMObsInternal.getSpanProcessor();
-    if (processor == null) {
-      return spans;
+        llmobsSpans = processSpans(llmobsSpans, retry);
+
+        for (CoreSpan<?> span : llmobsSpans) {
+            // Read session_id off the span before opening the map so we can size it correctly.
+            // We deliberately do NOT remove the tag (unlike parent_id) — the session_id:<value>
+            // entry must remain in the tags[] array to match dd-trace-py and dd-trace-js behavior.
+            // span.getTag returns Object — guard against generic tag APIs setting a non-string
+            // session_id value, which would otherwise throw ClassCastException here and drop
+            // the entire LLMObs payload for the trace.
+            Object rawSessionId = span.getTag(SESSION_ID_TAG_INTERNAL_FULL);
+            String sessionId = rawSessionId instanceof String ? (String) rawSessionId : null;
+            boolean hasSessionId = sessionId != null && !sessionId.isEmpty();
+
+            // Fallback to set default sampling tags when the fields are absent.
+            Object rawSamplingDecision = span.getTag(SAMPLING_DECISION_TAG_INTERNAL_FULL);
+            Object rawSampleRate = span.getTag(SAMPLE_RATE_TAG_INTERNAL_FULL);
+            boolean stamped = rawSamplingDecision instanceof String && rawSampleRate instanceof String;
+            String samplingDecision = stamped ? (String) rawSamplingDecision : SAMPLING_DECISION_SAMPLED;
+            String sampleRate = stamped ? (String) rawSampleRate : SAMPLE_RATE_ALL;
+
+            writable.startMap(hasSessionId ? 12 : 11);
+            // 1
+            writable.writeUTF8(SPAN_ID);
+            writable.writeString(String.valueOf(span.getSpanId()), null);
+
+            // 2
+            writable.writeUTF8(TRACE_ID);
+            writable.writeString(span.getTraceId().toHexString(), null);
+
+            // 3
+            writable.writeUTF8(PARENT_ID);
+            writable.writeString(span.getTag(PARENT_ID_TAG_INTERNAL_FULL), null);
+
+            // 4
+            writable.writeUTF8(NAME);
+            writable.writeString(llmObsSpanName(span), null);
+
+            // 5
+            writable.writeUTF8(START_NS);
+            writable.writeUnsignedLong(span.getStartTime());
+
+            // 6
+            writable.writeUTF8(DURATION);
+            writable.writeFloat(span.getDurationNano());
+
+            // 7
+            writable.writeUTF8(STATUS);
+            writable.writeString(span.getError() == 0 ? "ok" : "error", null);
+
+            // 8
+            writable.writeUTF8(DD);
+            writable.startMap(5);
+            writable.writeUTF8(SPAN_ID);
+            writable.writeString(String.valueOf(span.getSpanId()), null);
+            writable.writeUTF8(TRACE_ID);
+            writable.writeString(span.getTraceId().toHexString(), null);
+            writable.writeUTF8(APM_TRACE_ID);
+            writable.writeString(span.getTraceId().toHexString(), null);
+            writable.writeUTF8(SAMPLING_DECISION);
+            writable.writeString(samplingDecision, null);
+            writable.writeUTF8(SAMPLE_RATE);
+            writable.writeString(sampleRate, null);
+
+            // 9 — optional top-level session_id field. Required by the LLMObs HTTP intake schema
+            // and by the LLM Trace Explorer's Sessions filter, which keys off this field.
+            if (hasSessionId) {
+                writable.writeUTF8(SESSION_ID);
+                writable.writeString(sessionId, null);
+            }
+
+            /* 10 (metrics), 11 (tags), 12 meta — shift down 1 if session_id absent */
+            span.processTagsAndBaggage(metaWriter.withWritable(writable, getErrorsMap(span)));
+        }
+
+        // Increase only after all spans have been written. This way, if it rolls back because of a
+        // buffer overflow, the counter won't be skewed.
+        spansWritten += llmobsSpans.size();
+        pendingDroppedSpans = null;
     }
 
-    pendingDroppedSpans = NO_DROPPED_SPANS;
-    List<CoreSpan<?>> processedSpans = new ArrayList<>(spans.size());
-    for (int i = 0; i < spans.size(); i++) {
-      CoreSpan<?> span = spans.get(i);
-      boolean processorError = false;
-      try {
-        LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
-        LLMObsSpanData result = processor.process(adapter);
-        if (result != null) {
-          adapter.apply(result);
-          processedSpans.add(span);
-        } else {
-          markDroppedSpan(i, spans.size());
+    private List<? extends CoreSpan<?>> processSpans(List<? extends CoreSpan<?>> spans, boolean retry) {
+        if (retry && pendingDroppedSpans != null) {
+            boolean[] droppedSpans = pendingDroppedSpans;
+            pendingDroppedSpans = null;
+            if (droppedSpans.length == 0) {
+                return spans;
+            }
+
+            List<CoreSpan<?>> processedSpans = new ArrayList<>(spans.size());
+            for (int i = 0; i < spans.size(); i++) {
+                if (!droppedSpans[i]) {
+                    processedSpans.add(spans.get(i));
+                }
+            }
+            return processedSpans;
+        }
+
+        LLMObsSpanProcessor processor = LLMObsInternal.getSpanProcessor();
+        if (processor == null) {
+            return spans;
         }
-      } catch (Throwable error) {
-        processorError = true;
-        markDroppedSpan(i, spans.size());
-        PROCESSOR_ERROR_LOGGER.warn(
-            "Error in LLM Observability span processor, dropping span", error);
-      } finally {
-        LLMObsMetricCollector.get().recordUserProcessorCalled(processorError);
-      }
+
+        pendingDroppedSpans = NO_DROPPED_SPANS;
+        List<CoreSpan<?>> processedSpans = new ArrayList<>(spans.size());
+        for (int i = 0; i < spans.size(); i++) {
+            CoreSpan<?> span = spans.get(i);
+            boolean processorError = false;
+            try {
+                LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
+                LLMObsSpanData result = processor.process(adapter);
+                if (result != null) {
+                    adapter.apply(result);
+                    processedSpans.add(span);
+                } else {
+                    markDroppedSpan(i, spans.size());
+                }
+            } catch (Throwable error) {
+                processorError = true;
+                markDroppedSpan(i, spans.size());
+                PROCESSOR_ERROR_LOGGER.warn("Error in LLM Observability span processor, dropping span", error);
+            } finally {
+                LLMObsMetricCollector.get().recordUserProcessorCalled(processorError);
+            }
+        }
+        return processedSpans;
     }
-    return processedSpans;
-  }
 
-  private void markDroppedSpan(int index, int spanCount) {
-    if (pendingDroppedSpans.length == 0) {
-      pendingDroppedSpans = new boolean[spanCount];
+    private void markDroppedSpan(int index, int spanCount) {
+        if (pendingDroppedSpans.length == 0) {
+            pendingDroppedSpans = new boolean[spanCount];
+        }
+        pendingDroppedSpans[index] = true;
     }
-    pendingDroppedSpans[index] = true;
-  }
 
-  private CharSequence llmObsSpanName(CoreSpan<?> span) {
-    CharSequence operationName = span.getOperationName();
-    if ("openai.request".contentEquals(operationName)) {
-      return "OpenAI." + span.getResourceName();
+    private CharSequence llmObsSpanName(CoreSpan<?> span) {
+        CharSequence operationName = span.getOperationName();
+        if ("openai.request".contentEquals(operationName)) {
+            return "OpenAI." + span.getResourceName();
+        }
+        return operationName;
     }
-    return operationName;
-  }
-
-  private static boolean isLLMObsSpan(CoreSpan<?> span) {
-    CharSequence type = span.getType();
-    return type != null && type.toString().contentEquals(InternalSpanTypes.LLMOBS);
-  }
-
-  @Override
-  public Payload newPayload() {
-    return new PayloadV1(header, spansWritten);
-  }
-
-  @Override
-  public int messageBufferSize() {
-    return size;
-  }
-
-  @Override
-  public void reset() {
-    // Reset the number of spans per message with each flush.
-    spansWritten = 0;
-  }
-
-  @Override
-  public String endpoint() {
-    return TrackType.LLMOBS + "/v2";
-  }
-
-  private static Map<String, String> getErrorsMap(CoreSpan<?> span) {
-    Map<String, String> errors = new HashMap<>();
-    String errorMsg = span.getTag(DDTags.ERROR_MSG);
-    if (errorMsg != null && !errorMsg.isEmpty()) {
-      errors.put("message", errorMsg);
+
+    private static boolean isLLMObsSpan(CoreSpan<?> span) {
+        CharSequence type = span.getType();
+        return type != null && type.toString().contentEquals(InternalSpanTypes.LLMOBS);
     }
-    String errorType = span.getTag(DDTags.ERROR_TYPE);
-    if (errorType != null && !errorType.isEmpty()) {
-      errors.put("type", errorType);
+
+    @Override
+    public Payload newPayload() {
+        return new PayloadV1(header, spansWritten);
     }
-    String errorStack = span.getTag(DDTags.ERROR_STACK);
-    if (errorStack != null && !errorStack.isEmpty()) {
-      errors.put("stack", errorStack);
+
+    @Override
+    public int messageBufferSize() {
+        return size;
     }
-    return errors;
-  }
-
-  private static final class MetaWriter implements MetadataConsumer {
-
-    private Writable writable;
-    private Map<String, String> errorInfo;
-
-    private static final Set<String> TAGS_FOR_REMAPPING =
-        Collections.unmodifiableSet(
-            new HashSet<>(
-                Arrays.asList(
-                    LLMOBS_TAG_PREFIX + INPUT,
-                    LLMOBS_TAG_PREFIX + INPUT_PROMPT,
-                    LLMOBS_TAG_PREFIX + OUTPUT,
-                    LLMOBS_TAG_PREFIX + LLMObsTags.MODEL_NAME,
-                    LLMOBS_TAG_PREFIX + LLMObsTags.MODEL_PROVIDER,
-                    LLMOBS_TAG_PREFIX + LLMObsTags.MODEL_VERSION,
-                    LLMOBS_TAG_PREFIX + LLMObsTags.TOOL_DEFINITIONS,
-                    LLMOBS_TAG_PREFIX + LLMObsTags.METADATA,
-                    PAGENT_SPAN_ID_TAG_INTERNAL_FULL,
-                    PAGENT_NAME_TAG_INTERNAL_FULL)));
-
-    MetaWriter withWritable(Writable writable, Map<String, String> errorInfo) {
-      this.writable = writable;
-      this.errorInfo = errorInfo;
-      return this;
+
+    @Override
+    public void reset() {
+        // Reset the number of spans per message with each flush.
+        spansWritten = 0;
     }
 
     @Override
-    public void accept(Metadata metadata) {
-      Map<String, Object> tagsToRemapToMeta = new HashMap<>();
-      int metricsSize = 0, tagsSize = 0;
-      String spanKind = "unknown";
-      for (Map.Entry<String, Object> tag : metadata.getTags().entrySet()) {
-        String key = tag.getKey();
-        if (key.equals(SPAN_KIND_TAG_KEY)) {
-          spanKind = String.valueOf(tag.getValue());
-        } else if (TAGS_WRITTEN_AS_TOP_LEVEL_FIELDS.contains(key)) {
-          // Already written as a dedicated field; not counted here so it stays out of the array.
-        } else if (TAGS_FOR_REMAPPING.contains(key)) {
-          tagsToRemapToMeta.put(key, tag.getValue());
-        } else if (key.startsWith(LLMOBS_METRIC_PREFIX) && tag.getValue() instanceof Number) {
-          ++metricsSize;
-        } else if (key.startsWith(LLMOBS_TAG_PREFIX)) {
-          if (key.startsWith(LLMOBS_TAG_PREFIX)) {
-            key = key.substring(LLMOBS_TAG_PREFIX.length());
-          }
-          if (TAGS_FOR_REMAPPING.contains(key)) {
-            tagsToRemapToMeta.put(key, tag.getValue());
-          } else {
-            ++tagsSize;
-          }
-        }
-      }
-
-      if (spanKind.equals("unknown")) {
-        LOGGER.warn("missing span kind");
-      }
-
-      String inputTag = LLMOBS_TAG_PREFIX + INPUT;
-      String inputPromptTag = LLMOBS_TAG_PREFIX + INPUT_PROMPT;
-      boolean hasInput = tagsToRemapToMeta.containsKey(inputTag);
-      boolean hasInputPrompt = tagsToRemapToMeta.containsKey(inputPromptTag);
-      Object parentAgentSpanIdVal = tagsToRemapToMeta.get(PAGENT_SPAN_ID_TAG_INTERNAL_FULL);
-      boolean hasAgentAttribution =
-          parentAgentSpanIdVal instanceof String && !((String) parentAgentSpanIdVal).isEmpty();
-      boolean hasAgentAttributionName =
-          tagsToRemapToMeta.containsKey(PAGENT_NAME_TAG_INTERNAL_FULL);
-      Object inputPrompt = null;
-      if (hasInputPrompt) {
-        if (spanKind.equals(Tags.LLMOBS_LLM_SPAN_KIND)) {
-          inputPrompt = tagsToRemapToMeta.get(inputPromptTag);
-        } else {
-          LOGGER.warn(
-              "dropping prompt on non-LLM span kind, annotating prompts is only supported for LLM span kinds");
+    public String endpoint() {
+        return TrackType.LLMOBS + "/v2";
+    }
+
+    private static Map<String, String> getErrorsMap(CoreSpan<?> span) {
+        Map<String, String> errors = new HashMap<>();
+        String errorMsg = span.getTag(DDTags.ERROR_MSG);
+        if (errorMsg != null && !errorMsg.isEmpty()) {
+            errors.put("message", errorMsg);
         }
-      }
-
-      // write metrics (9)
-      writable.writeUTF8(METRICS);
-      writable.startMap(metricsSize);
-      for (Map.Entry<String, Object> tag : metadata.getTags().entrySet()) {
-        String tagKey = tag.getKey();
-        if (tagKey.startsWith(LLMOBS_METRIC_PREFIX) && tag.getValue() instanceof Number) {
-          writable.writeString(tagKey.substring(LLMOBS_METRIC_PREFIX.length()), null);
-          writable.writeObject(tag.getValue(), null);
+        String errorType = span.getTag(DDTags.ERROR_TYPE);
+        if (errorType != null && !errorType.isEmpty()) {
+            errors.put("type", errorType);
         }
-      }
-
-      // write tags (10)
-      writable.writeUTF8(TAGS);
-      writable.startArray(tagsSize + 1);
-      writable.writeString(LLMOBS_LANGUAGE_TAG, null);
-      for (Map.Entry<String, Object> tag : metadata.getTags().entrySet()) {
-        String key = tag.getKey();
-        Object value = tag.getValue();
-        if (!tagsToRemapToMeta.containsKey(key)
-            && !TAGS_WRITTEN_AS_TOP_LEVEL_FIELDS.contains(key)
-            && key.startsWith(LLMOBS_TAG_PREFIX)) {
-          writable.writeObject(key.substring(LLMOBS_TAG_PREFIX.length()) + ":" + value, null);
+        String errorStack = span.getTag(DDTags.ERROR_STACK);
+        if (errorStack != null && !errorStack.isEmpty()) {
+            errors.put("stack", errorStack);
         }
-      }
-
-      // write meta (11)
-      // pagent_name is always emitted inside agent_attribution (never standalone), so subtract 1
-      // whenever it is in the map regardless of whether pagent_span_id is also present.
-      // When pagent_span_id exists but is invalid (non-string or empty), the whole
-      // agent_attribution block is skipped; subtract 1 for that entry too.
-      boolean hasInvalidParentAgentSpanId =
-          tagsToRemapToMeta.containsKey(PAGENT_SPAN_ID_TAG_INTERNAL_FULL) && !hasAgentAttribution;
-      int metaSize =
-          tagsToRemapToMeta.size()
-              - (hasInputPrompt ? 1 : 0)
-              + (inputPrompt != null && !hasInput ? 1 : 0)
-              + 1
-              + (null != errorInfo && !errorInfo.isEmpty() ? 1 : 0)
-              - (hasAgentAttributionName ? 1 : 0)
-              - (hasInvalidParentAgentSpanId ? 1 : 0);
-      writable.writeUTF8(META);
-      writable.startMap(metaSize);
-      writable.writeUTF8(SPAN_KIND);
-      writable.writeString(spanKind, null);
-
-      if (null != errorInfo && !errorInfo.isEmpty()) {
-        writable.writeUTF8(ERROR);
-        writable.startMap(errorInfo.size());
-        for (Map.Entry<String, String> error : errorInfo.entrySet()) {
-          switch (error.getKey()) {
-            case "message":
-              writable.writeUTF8(ERROR_MESSAGE);
-              break;
-            case "type":
-              writable.writeUTF8(ERROR_TYPE);
-              break;
-            case "stack":
-              writable.writeUTF8(ERROR_STACK);
-              break;
-            default:
-              writable.writeString(error.getKey(), null);
-              break;
-          }
-          writable.writeString(error.getValue(), null);
+        return errors;
+    }
+
+    private static final class MetaWriter implements MetadataConsumer {
+
+        private Writable writable;
+        private Map<String, String> errorInfo;
+
+        private static final Set<String> TAGS_FOR_REMAPPING = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+                LLMOBS_TAG_PREFIX + INPUT,
+                LLMOBS_TAG_PREFIX + INPUT_PROMPT,
+                LLMOBS_TAG_PREFIX + OUTPUT,
+                LLMOBS_TAG_PREFIX + LLMObsTags.MODEL_NAME,
+                LLMOBS_TAG_PREFIX + LLMObsTags.MODEL_PROVIDER,
+                LLMOBS_TAG_PREFIX + LLMObsTags.MODEL_VERSION,
+                LLMOBS_TAG_PREFIX + LLMObsTags.TOOL_DEFINITIONS,
+                LLMOBS_TAG_PREFIX + LLMObsTags.METADATA,
+                PAGENT_SPAN_ID_TAG_INTERNAL_FULL,
+                PAGENT_NAME_TAG_INTERNAL_FULL)));
+
+        MetaWriter withWritable(Writable writable, Map<String, String> errorInfo) {
+            this.writable = writable;
+            this.errorInfo = errorInfo;
+            return this;
         }
-      }
-
-      for (Map.Entry<String, Object> tag : tagsToRemapToMeta.entrySet()) {
-        String key = tag.getKey().substring(LLMOBS_TAG_PREFIX.length());
-        Object val = tag.getValue();
-        if (key.equals("pagent_name")) {
-          // Emitted inside the agent_attribution block below; skip standalone entry.
-          continue;
-        } else if (key.equals("pagent_span_id")) {
-          if (!hasAgentAttribution) {
-            // Value was invalid (non-string or empty); skip — subtracted from metaSize above.
-            continue;
-          }
-          // Emit the structured agent_attribution map.
-          writable.writeUTF8(AGENT_ATTRIBUTION);
-          writable.startMap(2);
-          writable.writeUTF8(PAGENT_NAME);
-          Object nameVal = tagsToRemapToMeta.get(PAGENT_NAME_TAG_INTERNAL_FULL);
-          if (nameVal instanceof String) {
-            writable.writeString((String) nameVal, null);
-          } else {
-            writable.writeNull();
-          }
-          writable.writeUTF8(PAGENT_SPAN_ID);
-          writable.writeString((String) parentAgentSpanIdVal, null);
-          continue;
-        } else if (key.equals(INPUT) || key.equals(OUTPUT)) {
-          boolean isDocumentIO =
-              (spanKind.equals(Tags.LLMOBS_EMBEDDING_SPAN_KIND) && key.equals(INPUT))
-                  || (spanKind.equals(Tags.LLMOBS_RETRIEVAL_SPAN_KIND) && key.equals(OUTPUT));
-          if (spanKind.equals(Tags.LLMOBS_LLM_SPAN_KIND)) {
-            writable.writeString(key, null);
-            if (val instanceof List) {
-              writeLlmMessagesField((List<?>) val, key.equals(INPUT) ? inputPrompt : null);
-            } else if (key.equals(INPUT) && val instanceof Map) {
-              writeLlmInputMap((Map<?, ?>) val, inputPrompt);
-            } else {
-              LOGGER.warn(
-                  "unexpectedly found incorrect type for LLM span IO {}, expecting list",
-                  val.getClass().getName());
-              continue;
+
+        @Override
+        public void accept(Metadata metadata) {
+            Map<String, Object> tagsToRemapToMeta = new HashMap<>();
+            int metricsSize = 0, tagsSize = 0;
+            String spanKind = "unknown";
+            for (Map.Entry<String, Object> tag : metadata.getTags().entrySet()) {
+                String key = tag.getKey();
+                if (key.equals(SPAN_KIND_TAG_KEY)) {
+                    spanKind = String.valueOf(tag.getValue());
+                } else if (TAGS_WRITTEN_AS_TOP_LEVEL_FIELDS.contains(key)) {
+                    // Already written as a dedicated field; not counted here so it stays out of the array.
+                } else if (TAGS_FOR_REMAPPING.contains(key)) {
+                    tagsToRemapToMeta.put(key, tag.getValue());
+                } else if (key.startsWith(LLMOBS_METRIC_PREFIX) && tag.getValue() instanceof Number) {
+                    ++metricsSize;
+                } else if (key.startsWith(LLMOBS_TAG_PREFIX)) {
+                    if (key.startsWith(LLMOBS_TAG_PREFIX)) {
+                        key = key.substring(LLMOBS_TAG_PREFIX.length());
+                    }
+                    if (TAGS_FOR_REMAPPING.contains(key)) {
+                        tagsToRemapToMeta.put(key, tag.getValue());
+                    } else {
+                        ++tagsSize;
+                    }
+                }
             }
-          } else if (isDocumentIO && isDocumentList(val)) {
-            writable.writeString(key, null);
-            writable.startMap(1);
-            List<LLMObs.Document> documents = (List<LLMObs.Document>) val;
-            writable.writeString("documents", null);
-            writable.startArray(documents.size());
-            for (LLMObs.Document document : documents) {
-              int documentSize = 1;
-              if (document.getName() != null) documentSize++;
-              if (document.getId() != null) documentSize++;
-              if (document.getScore() != null) documentSize++;
-              writable.startMap(documentSize);
-              writable.writeString("text", null);
-              writable.writeString(document.getText(), null);
-              if (document.getName() != null) {
-                writable.writeString("name", null);
-                writable.writeString(document.getName(), null);
-              }
-              if (document.getId() != null) {
-                writable.writeString("id", null);
-                writable.writeString(document.getId(), null);
-              }
-              if (document.getScore() != null) {
-                writable.writeString("score", null);
-                writable.writeObject(document.getScore(), null);
-              }
+
+            if (spanKind.equals("unknown")) {
+                LOGGER.warn("missing span kind");
             }
-          } else {
-            if (isDocumentIO) {
-              LOGGER.warn(
-                  "unexpectedly found invalid document data for {} span {}, serializing as value",
-                  spanKind,
-                  key);
+
+            String inputTag = LLMOBS_TAG_PREFIX + INPUT;
+            String inputPromptTag = LLMOBS_TAG_PREFIX + INPUT_PROMPT;
+            boolean hasInput = tagsToRemapToMeta.containsKey(inputTag);
+            boolean hasInputPrompt = tagsToRemapToMeta.containsKey(inputPromptTag);
+            Object parentAgentSpanIdVal = tagsToRemapToMeta.get(PAGENT_SPAN_ID_TAG_INTERNAL_FULL);
+            boolean hasAgentAttribution =
+                    parentAgentSpanIdVal instanceof String && !((String) parentAgentSpanIdVal).isEmpty();
+            boolean hasAgentAttributionName = tagsToRemapToMeta.containsKey(PAGENT_NAME_TAG_INTERNAL_FULL);
+            Object inputPrompt = null;
+            if (hasInputPrompt) {
+                if (spanKind.equals(Tags.LLMOBS_LLM_SPAN_KIND)) {
+                    inputPrompt = tagsToRemapToMeta.get(inputPromptTag);
+                } else {
+                    LOGGER.warn(
+                            "dropping prompt on non-LLM span kind, annotating prompts is only supported for LLM span kinds");
+                }
             }
-            writable.writeString(key, null);
-            writable.startMap(1);
-            writable.writeString("value", null);
-            writable.writeObject(val, null);
-          }
-        } else if (key.equals(INPUT_PROMPT)) {
-          // Serialized as meta.input.prompt above, or after this loop when no input is present.
-          continue;
-        } else if (key.equals(LLMObsTags.TOOL_DEFINITIONS) && val instanceof List) {
-          writable.writeString(key, null);
-          writeToolDefinitions((List<?>) val);
-        } else if (key.equals(LLMObsTags.METADATA) && val instanceof Map) {
-          Map<String, Object> metadataMap = (Map) val;
-          writable.writeUTF8(METADATA);
-          writable.startMap(metadataMap.size());
-          for (Map.Entry<String, Object> entry : metadataMap.entrySet()) {
-            writable.writeString(entry.getKey(), null);
-            writable.writeObject(entry.getValue(), null);
-          }
-        } else {
-          writable.writeString(key, null);
-          writable.writeObject(val, null);
-        }
-      }
-
-      if (inputPrompt != null && !hasInput) {
-        writable.writeString(INPUT, null);
-        writable.startMap(1);
-        writable.writeUTF8(PROMPT);
-        writable.writeObject(inputPrompt, null);
-      }
-    }
 
-    private void writeToolDefinitions(List<?> toolDefinitions) {
-      writable.startArray(toolDefinitions.size());
-      for (Object toolDefinitionObject : toolDefinitions) {
-        if (!(toolDefinitionObject instanceof LLMObs.ToolDefinition)) {
-          writable.writeObject(toolDefinitionObject, null);
-          continue;
-        }
+            // write metrics (9)
+            writable.writeUTF8(METRICS);
+            writable.startMap(metricsSize);
+            for (Map.Entry<String, Object> tag : metadata.getTags().entrySet()) {
+                String tagKey = tag.getKey();
+                if (tagKey.startsWith(LLMOBS_METRIC_PREFIX) && tag.getValue() instanceof Number) {
+                    writable.writeString(tagKey.substring(LLMOBS_METRIC_PREFIX.length()), null);
+                    writable.writeObject(tag.getValue(), null);
+                }
+            }
 
-        LLMObs.ToolDefinition toolDefinition = (LLMObs.ToolDefinition) toolDefinitionObject;
-        int mapSize = 1;
-        if (toolDefinition.getDescription() != null) mapSize++;
-        if (toolDefinition.getSchema() != null) mapSize++;
-        if (toolDefinition.getVersion() != null) mapSize++;
-
-        writable.startMap(mapSize);
-        writable.writeString("name", null);
-        writable.writeString(toolDefinition.getName(), null);
-        if (toolDefinition.getDescription() != null) {
-          writable.writeString("description", null);
-          writable.writeString(toolDefinition.getDescription(), null);
-        }
-        if (toolDefinition.getSchema() != null) {
-          writable.writeString("schema", null);
-          writable.writeObject(toolDefinition.getSchema(), null);
-        }
-        if (toolDefinition.getVersion() != null) {
-          writable.writeString("version", null);
-          writable.writeString(toolDefinition.getVersion(), null);
-        }
-      }
-    }
+            // write tags (10)
+            writable.writeUTF8(TAGS);
+            writable.startArray(tagsSize + 1);
+            writable.writeString(LLMOBS_LANGUAGE_TAG, null);
+            for (Map.Entry<String, Object> tag : metadata.getTags().entrySet()) {
+                String key = tag.getKey();
+                Object value = tag.getValue();
+                if (!tagsToRemapToMeta.containsKey(key)
+                        && !TAGS_WRITTEN_AS_TOP_LEVEL_FIELDS.contains(key)
+                        && key.startsWith(LLMOBS_TAG_PREFIX)) {
+                    writable.writeObject(key.substring(LLMOBS_TAG_PREFIX.length()) + ":" + value, null);
+                }
+            }
 
-    private static boolean isDocumentList(Object value) {
-      if (!(value instanceof List)) {
-        return false;
-      }
-      for (Object item : (List<?>) value) {
-        if (!(item instanceof LLMObs.Document)) {
-          return false;
-        }
-      }
-      return true;
-    }
+            // write meta (11)
+            // pagent_name is always emitted inside agent_attribution (never standalone), so subtract 1
+            // whenever it is in the map regardless of whether pagent_span_id is also present.
+            // When pagent_span_id exists but is invalid (non-string or empty), the whole
+            // agent_attribution block is skipped; subtract 1 for that entry too.
+            boolean hasInvalidParentAgentSpanId =
+                    tagsToRemapToMeta.containsKey(PAGENT_SPAN_ID_TAG_INTERNAL_FULL) && !hasAgentAttribution;
+            int metaSize = tagsToRemapToMeta.size()
+                    - (hasInputPrompt ? 1 : 0)
+                    + (inputPrompt != null && !hasInput ? 1 : 0)
+                    + 1
+                    + (null != errorInfo && !errorInfo.isEmpty() ? 1 : 0)
+                    - (hasAgentAttributionName ? 1 : 0)
+                    - (hasInvalidParentAgentSpanId ? 1 : 0);
+            writable.writeUTF8(META);
+            writable.startMap(metaSize);
+            writable.writeUTF8(SPAN_KIND);
+            writable.writeString(spanKind, null);
+
+            if (null != errorInfo && !errorInfo.isEmpty()) {
+                writable.writeUTF8(ERROR);
+                writable.startMap(errorInfo.size());
+                for (Map.Entry<String, String> error : errorInfo.entrySet()) {
+                    switch (error.getKey()) {
+                        case "message":
+                            writable.writeUTF8(ERROR_MESSAGE);
+                            break;
+                        case "type":
+                            writable.writeUTF8(ERROR_TYPE);
+                            break;
+                        case "stack":
+                            writable.writeUTF8(ERROR_STACK);
+                            break;
+                        default:
+                            writable.writeString(error.getKey(), null);
+                            break;
+                    }
+                    writable.writeString(error.getValue(), null);
+                }
+            }
 
-    private void writeLlmMessagesField(List<?> messages, Object inputPrompt) {
-      writable.startMap(inputPrompt == null ? 1 : 2);
-      writable.writeString("messages", null);
-      writeLlmMessages(messages);
-      if (inputPrompt != null) {
-        writable.writeUTF8(PROMPT);
-        writable.writeObject(inputPrompt, null);
-      }
-    }
+            for (Map.Entry<String, Object> tag : tagsToRemapToMeta.entrySet()) {
+                String key = tag.getKey().substring(LLMOBS_TAG_PREFIX.length());
+                Object val = tag.getValue();
+                if (key.equals("pagent_name")) {
+                    // Emitted inside the agent_attribution block below; skip standalone entry.
+                    continue;
+                } else if (key.equals("pagent_span_id")) {
+                    if (!hasAgentAttribution) {
+                        // Value was invalid (non-string or empty); skip — subtracted from metaSize above.
+                        continue;
+                    }
+                    // Emit the structured agent_attribution map.
+                    writable.writeUTF8(AGENT_ATTRIBUTION);
+                    writable.startMap(2);
+                    writable.writeUTF8(PAGENT_NAME);
+                    Object nameVal = tagsToRemapToMeta.get(PAGENT_NAME_TAG_INTERNAL_FULL);
+                    if (nameVal instanceof String) {
+                        writable.writeString((String) nameVal, null);
+                    } else {
+                        writable.writeNull();
+                    }
+                    writable.writeUTF8(PAGENT_SPAN_ID);
+                    writable.writeString((String) parentAgentSpanIdVal, null);
+                    continue;
+                } else if (key.equals(INPUT) || key.equals(OUTPUT)) {
+                    boolean isDocumentIO = (spanKind.equals(Tags.LLMOBS_EMBEDDING_SPAN_KIND) && key.equals(INPUT))
+                            || (spanKind.equals(Tags.LLMOBS_RETRIEVAL_SPAN_KIND) && key.equals(OUTPUT));
+                    if (spanKind.equals(Tags.LLMOBS_LLM_SPAN_KIND)) {
+                        writable.writeString(key, null);
+                        if (val instanceof List) {
+                            writeLlmMessagesField((List<?>) val, key.equals(INPUT) ? inputPrompt : null);
+                        } else if (key.equals(INPUT) && val instanceof Map) {
+                            writeLlmInputMap((Map<?, ?>) val, inputPrompt);
+                        } else {
+                            LOGGER.warn(
+                                    "unexpectedly found incorrect type for LLM span IO {}, expecting list",
+                                    val.getClass().getName());
+                            continue;
+                        }
+                    } else if (isDocumentIO && isDocumentList(val)) {
+                        writable.writeString(key, null);
+                        writable.startMap(1);
+                        List<LLMObs.Document> documents = (List<LLMObs.Document>) val;
+                        writable.writeString("documents", null);
+                        writable.startArray(documents.size());
+                        for (LLMObs.Document document : documents) {
+                            int documentSize = 1;
+                            if (document.getName() != null) documentSize++;
+                            if (document.getId() != null) documentSize++;
+                            if (document.getScore() != null) documentSize++;
+                            writable.startMap(documentSize);
+                            writable.writeString("text", null);
+                            writable.writeString(document.getText(), null);
+                            if (document.getName() != null) {
+                                writable.writeString("name", null);
+                                writable.writeString(document.getName(), null);
+                            }
+                            if (document.getId() != null) {
+                                writable.writeString("id", null);
+                                writable.writeString(document.getId(), null);
+                            }
+                            if (document.getScore() != null) {
+                                writable.writeString("score", null);
+                                writable.writeObject(document.getScore(), null);
+                            }
+                        }
+                    } else {
+                        if (isDocumentIO) {
+                            LOGGER.warn(
+                                    "unexpectedly found invalid document data for {} span {}, serializing as value",
+                                    spanKind,
+                                    key);
+                        }
+                        writable.writeString(key, null);
+                        writable.startMap(1);
+                        writable.writeString("value", null);
+                        writable.writeObject(val, null);
+                    }
+                } else if (key.equals(INPUT_PROMPT)) {
+                    // Serialized as meta.input.prompt above, or after this loop when no input is present.
+                    continue;
+                } else if (key.equals(LLMObsTags.TOOL_DEFINITIONS) && val instanceof List) {
+                    writable.writeString(key, null);
+                    writeToolDefinitions((List<?>) val);
+                } else if (key.equals(LLMObsTags.METADATA) && val instanceof Map) {
+                    Map<String, Object> metadataMap = (Map) val;
+                    writable.writeUTF8(METADATA);
+                    writable.startMap(metadataMap.size());
+                    for (Map.Entry<String, Object> entry : metadataMap.entrySet()) {
+                        writable.writeString(entry.getKey(), null);
+                        writable.writeObject(entry.getValue(), null);
+                    }
+                } else {
+                    writable.writeString(key, null);
+                    writable.writeObject(val, null);
+                }
+            }
 
-    private void writeLlmInputMap(Map<?, ?> inputMap, Object inputPrompt) {
-      boolean addInputPrompt = inputPrompt != null && !inputMap.containsKey("prompt");
-      writable.startMap(inputMap.size() + (addInputPrompt ? 1 : 0));
-      for (Map.Entry<?, ?> entry : inputMap.entrySet()) {
-        String inputKey = String.valueOf(entry.getKey());
-        Object inputValue = entry.getValue();
-        writable.writeString(inputKey, null);
-        if ("messages".equals(inputKey) && inputValue instanceof List) {
-          writeLlmMessages((List<?>) inputValue);
-        } else {
-          writable.writeObject(inputValue, null);
+            if (inputPrompt != null && !hasInput) {
+                writable.writeString(INPUT, null);
+                writable.startMap(1);
+                writable.writeUTF8(PROMPT);
+                writable.writeObject(inputPrompt, null);
+            }
         }
-      }
-      if (addInputPrompt) {
-        writable.writeUTF8(PROMPT);
-        writable.writeObject(inputPrompt, null);
-      }
-    }
 
-    private void writeLlmMessages(List<?> messages) {
-      writable.startArray(messages.size());
-      for (Object messageObj : messages) {
-        if (!(messageObj instanceof LLMObs.LLMMessage)) {
-          writable.writeObject(messageObj, null);
-          continue;
+        private void writeToolDefinitions(List<?> toolDefinitions) {
+            writable.startArray(toolDefinitions.size());
+            for (Object toolDefinitionObject : toolDefinitions) {
+                if (!(toolDefinitionObject instanceof LLMObs.ToolDefinition)) {
+                    writable.writeObject(toolDefinitionObject, null);
+                    continue;
+                }
+
+                LLMObs.ToolDefinition toolDefinition = (LLMObs.ToolDefinition) toolDefinitionObject;
+                int mapSize = 1;
+                if (toolDefinition.getDescription() != null) mapSize++;
+                if (toolDefinition.getSchema() != null) mapSize++;
+                if (toolDefinition.getVersion() != null) mapSize++;
+
+                writable.startMap(mapSize);
+                writable.writeString("name", null);
+                writable.writeString(toolDefinition.getName(), null);
+                if (toolDefinition.getDescription() != null) {
+                    writable.writeString("description", null);
+                    writable.writeString(toolDefinition.getDescription(), null);
+                }
+                if (toolDefinition.getSchema() != null) {
+                    writable.writeString("schema", null);
+                    writable.writeObject(toolDefinition.getSchema(), null);
+                }
+                if (toolDefinition.getVersion() != null) {
+                    writable.writeString("version", null);
+                    writable.writeString(toolDefinition.getVersion(), null);
+                }
+            }
         }
 
-        LLMObs.LLMMessage message = (LLMObs.LLMMessage) messageObj;
-        List<LLMObs.ToolCall> toolCalls = message.getToolCalls();
-        List<LLMObs.ToolResult> toolResults = message.getToolResults();
-        boolean hasToolCalls = null != toolCalls && !toolCalls.isEmpty();
-        boolean hasToolResults = null != toolResults && !toolResults.isEmpty();
-        boolean hasContent = message.getContent() != null;
-        int mapSize = 1;
-        if (hasContent) mapSize++;
-        if (hasToolCalls) mapSize++;
-        if (hasToolResults) mapSize++;
-        writable.startMap(mapSize);
-        writable.writeUTF8(LLM_MESSAGE_ROLE);
-        writable.writeString(message.getRole(), null);
-        if (hasContent) {
-          writable.writeUTF8(LLM_MESSAGE_CONTENT);
-          writable.writeString(message.getContent(), null);
-        }
-        if (hasToolCalls) {
-          writable.writeUTF8(LLM_MESSAGE_TOOL_CALLS);
-          writable.startArray(toolCalls.size());
-          for (LLMObs.ToolCall toolCall : toolCalls) {
-            Map<String, Object> arguments = toolCall.getArguments();
-            boolean hasArguments = null != arguments && !arguments.isEmpty();
-            writable.startMap(hasArguments ? 4 : 3);
-            writable.writeUTF8(LLM_TOOL_CALL_NAME);
-            writable.writeString(toolCall.getName(), null);
-            writable.writeUTF8(LLM_TOOL_CALL_TYPE);
-            writable.writeString(toolCall.getType(), null);
-            writable.writeUTF8(LLM_TOOL_CALL_TOOL_ID);
-            writable.writeString(toolCall.getToolId(), null);
-            if (hasArguments) {
-              writable.writeUTF8(LLM_TOOL_CALL_ARGUMENTS);
-              writable.startMap(arguments.size());
-              for (Map.Entry<String, Object> argument : arguments.entrySet()) {
-                writable.writeString(argument.getKey(), null);
-                writable.writeObject(argument.getValue(), null);
-              }
+        private static boolean isDocumentList(Object value) {
+            if (!(value instanceof List)) {
+                return false;
+            }
+            for (Object item : (List<?>) value) {
+                if (!(item instanceof LLMObs.Document)) {
+                    return false;
+                }
             }
-          }
+            return true;
         }
-        if (hasToolResults) {
-          writable.writeUTF8(LLM_MESSAGE_TOOL_RESULTS);
-          writable.startArray(toolResults.size());
-          for (LLMObs.ToolResult toolResult : toolResults) {
-            writable.startMap(4);
-            writable.writeUTF8(LLM_TOOL_CALL_NAME);
-            writable.writeString(toolResult.getName(), null);
-            writable.writeUTF8(LLM_TOOL_CALL_TYPE);
-            writable.writeString(toolResult.getType(), null);
-            writable.writeUTF8(LLM_TOOL_CALL_TOOL_ID);
-            writable.writeString(toolResult.getToolId(), null);
-            writable.writeUTF8(LLM_TOOL_RESULT_RESULT);
-            writable.writeString(toolResult.getResult(), null);
-          }
+
+        private void writeLlmMessagesField(List<?> messages, Object inputPrompt) {
+            writable.startMap(inputPrompt == null ? 1 : 2);
+            writable.writeString("messages", null);
+            writeLlmMessages(messages);
+            if (inputPrompt != null) {
+                writable.writeUTF8(PROMPT);
+                writable.writeObject(inputPrompt, null);
+            }
         }
-      }
-    }
-  }
 
-  private static class PayloadV1 extends Payload {
-    private final ByteBuffer header;
-    private final int spansWritten;
+        private void writeLlmInputMap(Map<?, ?> inputMap, Object inputPrompt) {
+            boolean addInputPrompt = inputPrompt != null && !inputMap.containsKey("prompt");
+            writable.startMap(inputMap.size() + (addInputPrompt ? 1 : 0));
+            for (Map.Entry<?, ?> entry : inputMap.entrySet()) {
+                String inputKey = String.valueOf(entry.getKey());
+                Object inputValue = entry.getValue();
+                writable.writeString(inputKey, null);
+                if ("messages".equals(inputKey) && inputValue instanceof List) {
+                    writeLlmMessages((List<?>) inputValue);
+                } else {
+                    writable.writeObject(inputValue, null);
+                }
+            }
+            if (addInputPrompt) {
+                writable.writeUTF8(PROMPT);
+                writable.writeObject(inputPrompt, null);
+            }
+        }
 
-    public PayloadV1(ByteBuffer header, int spansWritten) {
-      this.spansWritten = spansWritten;
-      this.header = header;
+        private void writeLlmMessages(List<?> messages) {
+            writable.startArray(messages.size());
+            for (Object messageObj : messages) {
+                if (!(messageObj instanceof LLMObs.LLMMessage)) {
+                    writable.writeObject(messageObj, null);
+                    continue;
+                }
+
+                LLMObs.LLMMessage message = (LLMObs.LLMMessage) messageObj;
+                List<LLMObs.ToolCall> toolCalls = message.getToolCalls();
+                List<LLMObs.ToolResult> toolResults = message.getToolResults();
+                boolean hasToolCalls = null != toolCalls && !toolCalls.isEmpty();
+                boolean hasToolResults = null != toolResults && !toolResults.isEmpty();
+                boolean hasContent = message.getContent() != null;
+                int mapSize = 1;
+                if (hasContent) mapSize++;
+                if (hasToolCalls) mapSize++;
+                if (hasToolResults) mapSize++;
+                writable.startMap(mapSize);
+                writable.writeUTF8(LLM_MESSAGE_ROLE);
+                writable.writeString(message.getRole(), null);
+                if (hasContent) {
+                    writable.writeUTF8(LLM_MESSAGE_CONTENT);
+                    writable.writeString(message.getContent(), null);
+                }
+                if (hasToolCalls) {
+                    writable.writeUTF8(LLM_MESSAGE_TOOL_CALLS);
+                    writable.startArray(toolCalls.size());
+                    for (LLMObs.ToolCall toolCall : toolCalls) {
+                        Map<String, Object> arguments = toolCall.getArguments();
+                        boolean hasArguments = null != arguments && !arguments.isEmpty();
+                        writable.startMap(hasArguments ? 4 : 3);
+                        writable.writeUTF8(LLM_TOOL_CALL_NAME);
+                        writable.writeString(toolCall.getName(), null);
+                        writable.writeUTF8(LLM_TOOL_CALL_TYPE);
+                        writable.writeString(toolCall.getType(), null);
+                        writable.writeUTF8(LLM_TOOL_CALL_TOOL_ID);
+                        writable.writeString(toolCall.getToolId(), null);
+                        if (hasArguments) {
+                            writable.writeUTF8(LLM_TOOL_CALL_ARGUMENTS);
+                            writable.startMap(arguments.size());
+                            for (Map.Entry<String, Object> argument : arguments.entrySet()) {
+                                writable.writeString(argument.getKey(), null);
+                                writable.writeObject(argument.getValue(), null);
+                            }
+                        }
+                    }
+                }
+                if (hasToolResults) {
+                    writable.writeUTF8(LLM_MESSAGE_TOOL_RESULTS);
+                    writable.startArray(toolResults.size());
+                    for (LLMObs.ToolResult toolResult : toolResults) {
+                        writable.startMap(4);
+                        writable.writeUTF8(LLM_TOOL_CALL_NAME);
+                        writable.writeString(toolResult.getName(), null);
+                        writable.writeUTF8(LLM_TOOL_CALL_TYPE);
+                        writable.writeString(toolResult.getType(), null);
+                        writable.writeUTF8(LLM_TOOL_CALL_TOOL_ID);
+                        writable.writeString(toolResult.getToolId(), null);
+                        writable.writeUTF8(LLM_TOOL_RESULT_RESULT);
+                        writable.writeString(toolResult.getResult(), null);
+                    }
+                }
+            }
+        }
     }
 
-    @Override
-    public int sizeInBytes() {
-      if (traceCount() == 0) {
-        return msgpackMapHeaderSize(0);
-      }
-      return header.remaining() + msgpackArrayHeaderSize(spansWritten) + body.remaining();
-    }
+    private static class PayloadV1 extends Payload {
+        private final ByteBuffer header;
+        private final int spansWritten;
 
-    @Override
-    public void writeTo(WritableByteChannel channel) throws IOException {
-      // If traceCount is 0, we write a map with 0 elements in MsgPack format.
-      if (traceCount() == 0) {
-        ByteBuffer emptyDict = msgpackMapHeader(0);
-        while (emptyDict.hasRemaining()) {
-          channel.write(emptyDict);
+        public PayloadV1(ByteBuffer header, int spansWritten) {
+            this.spansWritten = spansWritten;
+            this.header = header;
         }
-      } else {
-        while (body.hasRemaining()) {
-          channel.write(header.slice());
-          channel.write(msgpackArrayHeader(spansWritten));
-          channel.write(body);
+
+        @Override
+        public int sizeInBytes() {
+            if (traceCount() == 0) {
+                return msgpackMapHeaderSize(0);
+            }
+            return header.remaining() + msgpackArrayHeaderSize(spansWritten) + body.remaining();
         }
-      }
-    }
 
-    @Override
-    public RequestBody toRequest() {
-      List<ByteBuffer> buffers;
-      if (traceCount() == 0) {
-        buffers = Collections.singletonList(msgpackMapHeader(0));
-      } else {
-        buffers =
-            Arrays.asList(
-                header.slice(),
-                // Third Value: is an array of spans serialized into the body
-                msgpackArrayHeader(spansWritten),
-                body);
-      }
-      return gzippedMsgpackRequestBodyOf(buffers);
+        @Override
+        public void writeTo(WritableByteChannel channel) throws IOException {
+            // If traceCount is 0, we write a map with 0 elements in MsgPack format.
+            if (traceCount() == 0) {
+                ByteBuffer emptyDict = msgpackMapHeader(0);
+                while (emptyDict.hasRemaining()) {
+                    channel.write(emptyDict);
+                }
+            } else {
+                while (body.hasRemaining()) {
+                    channel.write(header.slice());
+                    channel.write(msgpackArrayHeader(spansWritten));
+                    channel.write(body);
+                }
+            }
+        }
+
+        @Override
+        public RequestBody toRequest() {
+            List<ByteBuffer> buffers;
+            if (traceCount() == 0) {
+                buffers = Collections.singletonList(msgpackMapHeader(0));
+            } else {
+                buffers = Arrays.asList(
+                        header.slice(),
+                        // Third Value: is an array of spans serialized into the body
+                        msgpackArrayHeader(spansWritten),
+                        body);
+            }
+            return gzippedMsgpackRequestBodyOf(buffers);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/common/socket/UnixDomainServerSocketFactory.java b/dd-trace-core/src/test/java/datadog/common/socket/UnixDomainServerSocketFactory.java
index 6cad92ba460..725ad2c6829 100644
--- a/dd-trace-core/src/test/java/datadog/common/socket/UnixDomainServerSocketFactory.java
+++ b/dd-trace-core/src/test/java/datadog/common/socket/UnixDomainServerSocketFactory.java
@@ -21,89 +21,88 @@
  * socket sample</a>.
  */
 public final class UnixDomainServerSocketFactory extends ServerSocketFactory {
-  private final File path;
+    private final File path;
 
-  public UnixDomainServerSocketFactory(File path) {
-    this.path = path;
-  }
-
-  @Override
-  public ServerSocket createServerSocket() throws IOException {
-    return new UnixDomainServerSocket();
-  }
-
-  @Override
-  public ServerSocket createServerSocket(int port) throws IOException {
-    return createServerSocket();
-  }
-
-  @Override
-  public ServerSocket createServerSocket(int port, int backlog) throws IOException {
-    return createServerSocket();
-  }
-
-  @Override
-  public ServerSocket createServerSocket(int port, int backlog, InetAddress inetAddress)
-      throws IOException {
-    return createServerSocket();
-  }
-
-  private final class UnixDomainServerSocket extends ServerSocket {
-    private UnixServerSocketChannel serverSocketChannel;
-    private InetSocketAddress endpoint;
-
-    private UnixDomainServerSocket() throws IOException {}
-
-    @Override
-    public void bind(SocketAddress endpoint, int backlog) throws IOException {
-      this.endpoint = (InetSocketAddress) endpoint;
-      UnixServerSocketChannel channel = UnixServerSocketChannel.open();
-      boolean bound = false;
-      try {
-        channel.configureBlocking(true);
-        channel.socket().bind(new UnixSocketAddress(path));
-        serverSocketChannel = channel;
-        bound = true;
-      } finally {
-        if (!bound) {
-          channel.close();
-        }
-      }
+    public UnixDomainServerSocketFactory(File path) {
+        this.path = path;
     }
 
     @Override
-    public void setReuseAddress(boolean on) {
-      // MockWebServer configures this TCP option before binding. It has no UDS equivalent.
+    public ServerSocket createServerSocket() throws IOException {
+        return new UnixDomainServerSocket();
     }
 
     @Override
-    public int getLocalPort() {
-      return 1; // MockWebServer requires a port even though a UDS has none.
+    public ServerSocket createServerSocket(int port) throws IOException {
+        return createServerSocket();
     }
 
     @Override
-    public SocketAddress getLocalSocketAddress() {
-      return endpoint;
+    public ServerSocket createServerSocket(int port, int backlog) throws IOException {
+        return createServerSocket();
     }
 
     @Override
-    public Socket accept() throws IOException {
-      try {
-        UnixSocketChannel channel = serverSocketChannel.accept();
-        return new TunnelingUnixSocket(path, channel, endpoint);
-      } catch (ClosedChannelException e) {
-        SocketException socketException = new SocketException("Socket is closed");
-        socketException.initCause(e);
-        throw socketException;
-      }
+    public ServerSocket createServerSocket(int port, int backlog, InetAddress inetAddress) throws IOException {
+        return createServerSocket();
     }
 
-    @Override
-    public void close() throws IOException {
-      super.close();
-      if (serverSocketChannel != null) {
-        serverSocketChannel.close();
-      }
+    private final class UnixDomainServerSocket extends ServerSocket {
+        private UnixServerSocketChannel serverSocketChannel;
+        private InetSocketAddress endpoint;
+
+        private UnixDomainServerSocket() throws IOException {}
+
+        @Override
+        public void bind(SocketAddress endpoint, int backlog) throws IOException {
+            this.endpoint = (InetSocketAddress) endpoint;
+            UnixServerSocketChannel channel = UnixServerSocketChannel.open();
+            boolean bound = false;
+            try {
+                channel.configureBlocking(true);
+                channel.socket().bind(new UnixSocketAddress(path));
+                serverSocketChannel = channel;
+                bound = true;
+            } finally {
+                if (!bound) {
+                    channel.close();
+                }
+            }
+        }
+
+        @Override
+        public void setReuseAddress(boolean on) {
+            // MockWebServer configures this TCP option before binding. It has no UDS equivalent.
+        }
+
+        @Override
+        public int getLocalPort() {
+            return 1; // MockWebServer requires a port even though a UDS has none.
+        }
+
+        @Override
+        public SocketAddress getLocalSocketAddress() {
+            return endpoint;
+        }
+
+        @Override
+        public Socket accept() throws IOException {
+            try {
+                UnixSocketChannel channel = serverSocketChannel.accept();
+                return new TunnelingUnixSocket(path, channel, endpoint);
+            } catch (ClosedChannelException e) {
+                SocketException socketException = new SocketException("Socket is closed");
+                socketException.initCause(e);
+                throw socketException;
+            }
+        }
+
+        @Override
+        public void close() throws IOException {
+            super.close();
+            if (serverSocketChannel != null) {
+                serverSocketChannel.close();
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/SamplingPriorityMetadataChecker.java b/dd-trace-core/src/test/java/datadog/trace/SamplingPriorityMetadataChecker.java
index d2936af7a43..cc564b7c9aa 100644
--- a/dd-trace-core/src/test/java/datadog/trace/SamplingPriorityMetadataChecker.java
+++ b/dd-trace-core/src/test/java/datadog/trace/SamplingPriorityMetadataChecker.java
@@ -4,10 +4,10 @@
 import datadog.trace.core.MetadataConsumer;
 
 public class SamplingPriorityMetadataChecker implements MetadataConsumer {
-  public volatile boolean hasSamplingPriority;
+    public volatile boolean hasSamplingPriority;
 
-  @Override
-  public void accept(Metadata metadata) {
-    this.hasSamplingPriority = metadata.hasSamplingPriority();
-  }
+    @Override
+    public void accept(Metadata metadata) {
+        this.hasSamplingPriority = metadata.hasSamplingPriority();
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/TestInterceptor.java b/dd-trace-core/src/test/java/datadog/trace/TestInterceptor.java
index fd783edf847..4aa8bc0e6bf 100644
--- a/dd-trace-core/src/test/java/datadog/trace/TestInterceptor.java
+++ b/dd-trace-core/src/test/java/datadog/trace/TestInterceptor.java
@@ -7,17 +7,16 @@
 
 @AutoService(TraceInterceptor.class)
 public class TestInterceptor implements TraceInterceptor {
-  // We set a high priority to avoid competing with real TraceInterceptors.
-  public static volatile int priority = 999;
+    // We set a high priority to avoid competing with real TraceInterceptors.
+    public static volatile int priority = 999;
 
-  @Override
-  public Collection<? extends MutableSpan> onTraceComplete(
-      final Collection<? extends MutableSpan> trace) {
-    return trace;
-  }
+    @Override
+    public Collection<? extends MutableSpan> onTraceComplete(final Collection<? extends MutableSpan> trace) {
+        return trace;
+    }
 
-  @Override
-  public int priority() {
-    return priority;
-  }
+    @Override
+    public int priority() {
+        return priority;
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/TracerConnectionReliabilityTest.java b/dd-trace-core/src/test/java/datadog/trace/TracerConnectionReliabilityTest.java
index 490df7f06a4..4b6fc569679 100644
--- a/dd-trace-core/src/test/java/datadog/trace/TracerConnectionReliabilityTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/TracerConnectionReliabilityTest.java
@@ -32,154 +32,148 @@
 
 public class TracerConnectionReliabilityTest extends DDJavaSpecification {
 
-  static final int FEATURES_DISCOVERY_MIN_DELAY = 10;
-
-  static OkHttpClient client;
-  static JsonAdapter<List<List<SentTraces>>> traceJsonAdapter;
-
-  int agentContainerPort;
-  CoreTracer tracer;
-
-  @BeforeAll
-  static void setupSpec() {
-    client = new OkHttpClient();
-    // Create body parser for /test/traces route
-    Moshi moshi = new Moshi.Builder().build();
-    Type type =
-        Types.newParameterizedType(
-            List.class, Types.newParameterizedType(List.class, SentTraces.class));
-    traceJsonAdapter = moshi.adapter(type);
-  }
-
-  @BeforeEach
-  void setup() {
-    // Pick a random port for the test agent
-    agentContainerPort = PortUtils.randomOpenPort();
-    // Build a tracer talking to the test agent (with the right port and traces endpoint)
-    Properties properties = new Properties();
-    properties.put("trace.agent.port", Integer.toString(agentContainerPort));
-    SharedCommunicationObjects sharedCommunicationObjects = new SharedCommunicationObjects();
-    sharedCommunicationObjects.agentUrl = HttpUrl.get("http://localhost:" + agentContainerPort);
-    sharedCommunicationObjects.agentHttpClient = client;
-    FixedTraceEndpointFeaturesDiscovery fixedFeaturesDiscovery =
-        new FixedTraceEndpointFeaturesDiscovery(sharedCommunicationObjects);
-    sharedCommunicationObjects.setFeaturesDiscovery(fixedFeaturesDiscovery);
-
-    tracer =
-        CoreTracer.builder()
-            .idGenerationStrategy(IdGenerationStrategy.fromName("SEQUENTIAL"))
-            .withProperties(properties)
-            .sharedCommunicationObjects(sharedCommunicationObjects)
-            .build();
-  }
-
-  @AfterEach
-  void cleanup() {
-    if (tracer != null) {
-      tracer.close();
+    static final int FEATURES_DISCOVERY_MIN_DELAY = 10;
+
+    static OkHttpClient client;
+    static JsonAdapter<List<List<SentTraces>>> traceJsonAdapter;
+
+    int agentContainerPort;
+    CoreTracer tracer;
+
+    @BeforeAll
+    static void setupSpec() {
+        client = new OkHttpClient();
+        // Create body parser for /test/traces route
+        Moshi moshi = new Moshi.Builder().build();
+        Type type = Types.newParameterizedType(List.class, Types.newParameterizedType(List.class, SentTraces.class));
+        traceJsonAdapter = moshi.adapter(type);
+    }
+
+    @BeforeEach
+    void setup() {
+        // Pick a random port for the test agent
+        agentContainerPort = PortUtils.randomOpenPort();
+        // Build a tracer talking to the test agent (with the right port and traces endpoint)
+        Properties properties = new Properties();
+        properties.put("trace.agent.port", Integer.toString(agentContainerPort));
+        SharedCommunicationObjects sharedCommunicationObjects = new SharedCommunicationObjects();
+        sharedCommunicationObjects.agentUrl = HttpUrl.get("http://localhost:" + agentContainerPort);
+        sharedCommunicationObjects.agentHttpClient = client;
+        FixedTraceEndpointFeaturesDiscovery fixedFeaturesDiscovery =
+                new FixedTraceEndpointFeaturesDiscovery(sharedCommunicationObjects);
+        sharedCommunicationObjects.setFeaturesDiscovery(fixedFeaturesDiscovery);
+
+        tracer = CoreTracer.builder()
+                .idGenerationStrategy(IdGenerationStrategy.fromName("SEQUENTIAL"))
+                .withProperties(properties)
+                .sharedCommunicationObjects(sharedCommunicationObjects)
+                .build();
+    }
+
+    @AfterEach
+    void cleanup() {
+        if (tracer != null) {
+            tracer.close();
+        }
+    }
+
+    @Test
+    void testLateAgentStart() throws Exception {
+        createSpans(10, 100);
+        tracer.flush();
+
+        GenericContainer agentContainer = startTestAgentContainer();
+        int noAgentCount = getTraceCount(agentContainer);
+        waitForDiscoveryTimeout();
+
+        createSpans(20, 100);
+        tracer.flush();
+        int withAgentCount = getTraceCount(agentContainer);
+        agentContainer.stop();
+
+        assertFalse(agentContainer.isRunning());
+        assertEquals(0, noAgentCount);
+        assertEquals(20, withAgentCount);
+    }
+
+    @Test
+    void testAgentRestart() throws Exception {
+        GenericContainer agentContainer = startTestAgentContainer();
+
+        createSpans(10, 100);
+        tracer.flush();
+        int withAgentCount = getTraceCount(agentContainer);
+
+        assertEquals(10, withAgentCount);
+
+        agentContainer.stop();
+        createSpans(10, 100);
+        tracer.flush();
+
+        waitForDiscoveryTimeout();
+        agentContainer = startTestAgentContainer();
+        int noTraceCount = getTraceCount(agentContainer);
+        createSpans(10, 100);
+        tracer.flush();
+        withAgentCount = getTraceCount(agentContainer);
+        agentContainer.stop();
+
+        assertFalse(agentContainer.isRunning());
+        assertEquals(0, noTraceCount);
+        assertEquals(10, withAgentCount);
     }
-  }
-
-  @Test
-  void testLateAgentStart() throws Exception {
-    createSpans(10, 100);
-    tracer.flush();
-
-    GenericContainer agentContainer = startTestAgentContainer();
-    int noAgentCount = getTraceCount(agentContainer);
-    waitForDiscoveryTimeout();
-
-    createSpans(20, 100);
-    tracer.flush();
-    int withAgentCount = getTraceCount(agentContainer);
-    agentContainer.stop();
-
-    assertFalse(agentContainer.isRunning());
-    assertEquals(0, noAgentCount);
-    assertEquals(20, withAgentCount);
-  }
-
-  @Test
-  void testAgentRestart() throws Exception {
-    GenericContainer agentContainer = startTestAgentContainer();
-
-    createSpans(10, 100);
-    tracer.flush();
-    int withAgentCount = getTraceCount(agentContainer);
-
-    assertEquals(10, withAgentCount);
-
-    agentContainer.stop();
-    createSpans(10, 100);
-    tracer.flush();
-
-    waitForDiscoveryTimeout();
-    agentContainer = startTestAgentContainer();
-    int noTraceCount = getTraceCount(agentContainer);
-    createSpans(10, 100);
-    tracer.flush();
-    withAgentCount = getTraceCount(agentContainer);
-    agentContainer.stop();
-
-    assertFalse(agentContainer.isRunning());
-    assertEquals(0, noTraceCount);
-    assertEquals(10, withAgentCount);
-  }
-
-  @SuppressWarnings({"deprecation", "rawtypes", "unchecked"})
-  GenericContainer startTestAgentContainer() {
-    //noinspection GrDeprecatedAPIUsage Use FixedHostPortGenericContainer against deprecation
-    // because we need to know the exposed to configure the tracer at start
-    GenericContainer agentContainer =
-        new FixedHostPortGenericContainer(System.getProperty("test.ddapm.agent.image"))
-            .withFixedExposedPort(agentContainerPort, DEFAULT_TRACE_AGENT_PORT)
-            .withEnv(
-                "ENABLED_CHECKS",
-                "trace_count_header,meta_tracer_version_header,trace_content_length")
-            .waitingFor(Wait.forHttp("/test/traces"));
-    agentContainer.start();
-    return agentContainer;
-  }
-
-  void createSpans(int count, int delay) throws InterruptedException {
-    for (int index = 1; index <= count; index++) {
-      datadog.trace.bootstrap.instrumentation.api.AgentSpan span =
-          tracer.buildSpan("datadog", "operation-" + index).start();
-      Thread.sleep(delay);
-      span.finish();
+
+    @SuppressWarnings({"deprecation", "rawtypes", "unchecked"})
+    GenericContainer startTestAgentContainer() {
+        //noinspection GrDeprecatedAPIUsage Use FixedHostPortGenericContainer against deprecation
+        // because we need to know the exposed to configure the tracer at start
+        GenericContainer agentContainer = new FixedHostPortGenericContainer(
+                        System.getProperty("test.ddapm.agent.image"))
+                .withFixedExposedPort(agentContainerPort, DEFAULT_TRACE_AGENT_PORT)
+                .withEnv("ENABLED_CHECKS", "trace_count_header,meta_tracer_version_header,trace_content_length")
+                .waitingFor(Wait.forHttp("/test/traces"));
+        agentContainer.start();
+        return agentContainer;
     }
-  }
-
-  static void waitForDiscoveryTimeout() throws InterruptedException {
-    Thread.sleep((long) (FEATURES_DISCOVERY_MIN_DELAY * 1.5));
-  }
-
-  int getTraceCount(GenericContainer agentContainer) throws IOException {
-    Request request =
-        new Request.Builder()
-            .url("http://" + agentContainer.getHost() + ":" + agentContainerPort + "/test/traces")
-            .build();
-    String body = client.newCall(request).execute().body().string();
-    return traceJsonAdapter.fromJson(body).size();
-  }
-
-  static class FixedTraceEndpointFeaturesDiscovery extends DDAgentFeaturesDiscovery {
-    FixedTraceEndpointFeaturesDiscovery(SharedCommunicationObjects objects) {
-      super(objects.agentHttpClient, Monitoring.DISABLED, objects.agentUrl, V0_4, false, false);
+
+    void createSpans(int count, int delay) throws InterruptedException {
+        for (int index = 1; index <= count; index++) {
+            datadog.trace.bootstrap.instrumentation.api.AgentSpan span =
+                    tracer.buildSpan("datadog", "operation-" + index).start();
+            Thread.sleep(delay);
+            span.finish();
+        }
+    }
+
+    static void waitForDiscoveryTimeout() throws InterruptedException {
+        Thread.sleep((long) (FEATURES_DISCOVERY_MIN_DELAY * 1.5));
     }
 
-    @Override
-    public String getTraceEndpoint() {
-      return V04_ENDPOINT;
+    int getTraceCount(GenericContainer agentContainer) throws IOException {
+        Request request = new Request.Builder()
+                .url("http://" + agentContainer.getHost() + ":" + agentContainerPort + "/test/traces")
+                .build();
+        String body = client.newCall(request).execute().body().string();
+        return traceJsonAdapter.fromJson(body).size();
     }
 
-    @Override
-    protected long getFeaturesDiscoveryMinDelayMillis() {
-      return FEATURES_DISCOVERY_MIN_DELAY;
+    static class FixedTraceEndpointFeaturesDiscovery extends DDAgentFeaturesDiscovery {
+        FixedTraceEndpointFeaturesDiscovery(SharedCommunicationObjects objects) {
+            super(objects.agentHttpClient, Monitoring.DISABLED, objects.agentUrl, V0_4, false, false);
+        }
+
+        @Override
+        public String getTraceEndpoint() {
+            return V04_ENDPOINT;
+        }
+
+        @Override
+        protected long getFeaturesDiscoveryMinDelayMillis() {
+            return FEATURES_DISCOVERY_MIN_DELAY;
+        }
     }
-  }
 
-  static class SentTraces {
-    String name;
-  }
+    static class SentTraces {
+        String name;
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/api/datastreams/TransactionInfoTestBridge.java b/dd-trace-core/src/test/java/datadog/trace/api/datastreams/TransactionInfoTestBridge.java
index 9cd65594f25..043d3e7c7e3 100644
--- a/dd-trace-core/src/test/java/datadog/trace/api/datastreams/TransactionInfoTestBridge.java
+++ b/dd-trace-core/src/test/java/datadog/trace/api/datastreams/TransactionInfoTestBridge.java
@@ -5,7 +5,7 @@
  * TransactionInfo}
  */
 public class TransactionInfoTestBridge {
-  public static void resetCache() {
-    TransactionInfo.resetCache();
-  }
+    public static void resetCache() {
+        TransactionInfo.resetCache();
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/api/remoteconfig/ServiceNameCollectorTestBridge.java b/dd-trace-core/src/test/java/datadog/trace/api/remoteconfig/ServiceNameCollectorTestBridge.java
index 8d66cdb4f83..6c1570ecef2 100644
--- a/dd-trace-core/src/test/java/datadog/trace/api/remoteconfig/ServiceNameCollectorTestBridge.java
+++ b/dd-trace-core/src/test/java/datadog/trace/api/remoteconfig/ServiceNameCollectorTestBridge.java
@@ -5,7 +5,7 @@
  * ServiceNameCollector}
  */
 public class ServiceNameCollectorTestBridge {
-  public static void setInstance(ServiceNameCollector instance) {
-    ServiceNameCollector.setInstance(instance);
-  }
+    public static void setInstance(ServiceNameCollector instance) {
+        ServiceNameCollector.setInstance(instance);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/api/writer/PrintingWriterTest.java b/dd-trace-core/src/test/java/datadog/trace/api/writer/PrintingWriterTest.java
index 8289bfe35a0..2ed9b96b667 100644
--- a/dd-trace-core/src/test/java/datadog/trace/api/writer/PrintingWriterTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/api/writer/PrintingWriterTest.java
@@ -25,121 +25,113 @@
 @SuppressWarnings({"unchecked", "rawtypes"})
 public class PrintingWriterTest extends DDCoreJavaSpecification {
 
-  private CoreTracer tracer;
-  private List<DDSpan> sampleTrace;
-  private List<DDSpan> secondTrace;
-  private JsonAdapter adapter;
-
-  @BeforeEach
-  void setup() {
-    tracer = tracerBuilder().writer(new ListWriter()).build();
-    adapter =
-        new Moshi.Builder()
-            .build()
-            .adapter(
-                Types.newParameterizedType(
-                    Map.class,
-                    String.class,
-                    Types.newParameterizedType(
-                        List.class, Types.newParameterizedType(List.class, Map.class))));
-
-    AgentTracer.SpanBuilder builder =
-        tracer
-            .buildSpan("datadog", "fakeOperation")
-            .withServiceName("fakeService")
-            .withResourceName("fakeResource")
-            .withSpanType("fakeType");
-
-    sampleTrace = Arrays.asList((DDSpan) builder.start(), (DDSpan) builder.start());
-    secondTrace = Collections.singletonList((DDSpan) builder.start());
-  }
-
-  @AfterEach
-  void cleanup() {
-    if (tracer != null) {
-      tracer.close();
+    private CoreTracer tracer;
+    private List<DDSpan> sampleTrace;
+    private List<DDSpan> secondTrace;
+    private JsonAdapter adapter;
+
+    @BeforeEach
+    void setup() {
+        tracer = tracerBuilder().writer(new ListWriter()).build();
+        adapter = new Moshi.Builder()
+                .build()
+                .adapter(Types.newParameterizedType(
+                        Map.class,
+                        String.class,
+                        Types.newParameterizedType(List.class, Types.newParameterizedType(List.class, Map.class))));
+
+        AgentTracer.SpanBuilder builder = tracer.buildSpan("datadog", "fakeOperation")
+                .withServiceName("fakeService")
+                .withResourceName("fakeResource")
+                .withSpanType("fakeType");
+
+        sampleTrace = Arrays.asList((DDSpan) builder.start(), (DDSpan) builder.start());
+        secondTrace = Collections.singletonList((DDSpan) builder.start());
     }
-  }
 
-  @Test
-  void testPrintingRegularIds() throws Exception {
-    Buffer buffer = new Buffer();
-    PrintingWriter writer = new PrintingWriter(buffer.outputStream(), false);
+    @AfterEach
+    void cleanup() {
+        if (tracer != null) {
+            tracer.close();
+        }
+    }
 
-    writer.write(sampleTrace);
-    Map<String, List<List<Map>>> result =
-        (Map<String, List<List<Map>>>) adapter.fromJson(buffer.readString(StandardCharsets.UTF_8));
+    @Test
+    void testPrintingRegularIds() throws Exception {
+        Buffer buffer = new Buffer();
+        PrintingWriter writer = new PrintingWriter(buffer.outputStream(), false);
 
-    assertEquals(sampleTrace.size(), result.get("traces").get(0).size());
-    for (Map span : result.get("traces").get(0)) {
-      assertRegularSpanFields(span, false);
-    }
+        writer.write(sampleTrace);
+        Map<String, List<List<Map>>> result =
+                (Map<String, List<List<Map>>>) adapter.fromJson(buffer.readString(StandardCharsets.UTF_8));
+
+        assertEquals(sampleTrace.size(), result.get("traces").get(0).size());
+        for (Map span : result.get("traces").get(0)) {
+            assertRegularSpanFields(span, false);
+        }
 
-    writer.write(secondTrace);
-    result =
-        (Map<String, List<List<Map>>>) adapter.fromJson(buffer.readString(StandardCharsets.UTF_8));
+        writer.write(secondTrace);
+        result = (Map<String, List<List<Map>>>) adapter.fromJson(buffer.readString(StandardCharsets.UTF_8));
 
-    assertEquals(secondTrace.size(), result.get("traces").get(0).size());
-    for (Map span : result.get("traces").get(0)) {
-      assertRegularSpanFields(span, false);
+        assertEquals(secondTrace.size(), result.get("traces").get(0).size());
+        for (Map span : result.get("traces").get(0)) {
+            assertRegularSpanFields(span, false);
+        }
     }
-  }
 
-  @Test
-  void testPrintingRegularHexIds() throws Exception {
-    Buffer buffer = new Buffer();
-    PrintingWriter writer = new PrintingWriter(buffer.outputStream(), true);
+    @Test
+    void testPrintingRegularHexIds() throws Exception {
+        Buffer buffer = new Buffer();
+        PrintingWriter writer = new PrintingWriter(buffer.outputStream(), true);
 
-    writer.write(sampleTrace);
-    Map<String, List<List<Map>>> result =
-        (Map<String, List<List<Map>>>) adapter.fromJson(buffer.readString(StandardCharsets.UTF_8));
+        writer.write(sampleTrace);
+        Map<String, List<List<Map>>> result =
+                (Map<String, List<List<Map>>>) adapter.fromJson(buffer.readString(StandardCharsets.UTF_8));
 
-    assertEquals(sampleTrace.size(), result.get("traces").get(0).size());
-    for (Map span : result.get("traces").get(0)) {
-      assertRegularSpanFields(span, true);
+        assertEquals(sampleTrace.size(), result.get("traces").get(0).size());
+        for (Map span : result.get("traces").get(0)) {
+            assertRegularSpanFields(span, true);
+        }
     }
-  }
-
-  @Test
-  void testPrintingMultipleTraces() throws Exception {
-    Buffer buffer = new Buffer();
-    PrintingWriter writer = new PrintingWriter(buffer.outputStream(), false);
-
-    writer.write(sampleTrace);
-    writer.write(secondTrace);
-    Map<String, List<List<Map>>> result1 =
-        (Map<String, List<List<Map>>>) adapter.fromJson(buffer.readUtf8Line());
-    Map<String, List<List<Map>>> result2 =
-        (Map<String, List<List<Map>>>) adapter.fromJson(buffer.readUtf8Line());
-
-    assertEquals(sampleTrace.size(), result1.get("traces").get(0).size());
-    for (Map span : result2.get("traces").get(0)) {
-      assertRegularSpanFields(span, false);
-    }
-    assertEquals(secondTrace.size(), result2.get("traces").get(0).size());
-    for (Map span : result2.get("traces").get(0)) {
-      assertRegularSpanFields(span, false);
+
+    @Test
+    void testPrintingMultipleTraces() throws Exception {
+        Buffer buffer = new Buffer();
+        PrintingWriter writer = new PrintingWriter(buffer.outputStream(), false);
+
+        writer.write(sampleTrace);
+        writer.write(secondTrace);
+        Map<String, List<List<Map>>> result1 = (Map<String, List<List<Map>>>) adapter.fromJson(buffer.readUtf8Line());
+        Map<String, List<List<Map>>> result2 = (Map<String, List<List<Map>>>) adapter.fromJson(buffer.readUtf8Line());
+
+        assertEquals(sampleTrace.size(), result1.get("traces").get(0).size());
+        for (Map span : result2.get("traces").get(0)) {
+            assertRegularSpanFields(span, false);
+        }
+        assertEquals(secondTrace.size(), result2.get("traces").get(0).size());
+        for (Map span : result2.get("traces").get(0)) {
+            assertRegularSpanFields(span, false);
+        }
     }
-  }
-
-  private void assertRegularSpanFields(Map span, boolean hexIds) {
-    assertEquals("fakeService", span.get("service"));
-    assertEquals("fakeOperation", span.get("name"));
-    assertEquals("fakeResource", span.get("resource"));
-    assertEquals("fakeType", span.get("type"));
-    if (hexIds) {
-      assertInstanceOf(String.class, span.get("trace_id"));
-      assertInstanceOf(String.class, span.get("span_id"));
-      assertInstanceOf(String.class, span.get("parent_id"));
-    } else {
-      assertInstanceOf(Number.class, span.get("trace_id"));
-      assertInstanceOf(Number.class, span.get("span_id"));
-      assertInstanceOf(Number.class, span.get("parent_id"));
+
+    private void assertRegularSpanFields(Map span, boolean hexIds) {
+        assertEquals("fakeService", span.get("service"));
+        assertEquals("fakeOperation", span.get("name"));
+        assertEquals("fakeResource", span.get("resource"));
+        assertEquals("fakeType", span.get("type"));
+        if (hexIds) {
+            assertInstanceOf(String.class, span.get("trace_id"));
+            assertInstanceOf(String.class, span.get("span_id"));
+            assertInstanceOf(String.class, span.get("parent_id"));
+        } else {
+            assertInstanceOf(Number.class, span.get("trace_id"));
+            assertInstanceOf(Number.class, span.get("span_id"));
+            assertInstanceOf(Number.class, span.get("parent_id"));
+        }
+        assertInstanceOf(Number.class, span.get("start"));
+        assertInstanceOf(Number.class, span.get("duration"));
+        assertEquals(0, ((Number) span.get("error")).intValue());
+        assertInstanceOf(Map.class, span.get("metrics"));
+        assertInstanceOf(Map.class, span.get("meta"));
     }
-    assertInstanceOf(Number.class, span.get("start"));
-    assertInstanceOf(Number.class, span.get("duration"));
-    assertEquals(0, ((Number) span.get("error")).intValue());
-    assertInstanceOf(Map.class, span.get("metrics"));
-    assertInstanceOf(Map.class, span.get("meta"));
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityApmProtocolInterceptorTest.java b/dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityApmProtocolInterceptorTest.java
index 1ffc71e7ed3..f4d237e50b0 100644
--- a/dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityApmProtocolInterceptorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityApmProtocolInterceptorTest.java
@@ -20,70 +20,71 @@
 @Timeout(value = 10, unit = TimeUnit.SECONDS)
 public class CiVisibilityApmProtocolInterceptorTest extends DDCoreJavaSpecification {
 
-  private ListWriter writer;
-  private CoreTracer tracer;
-
-  @BeforeEach
-  void setup() {
-    writer = new ListWriter();
-    tracer = tracerBuilder().writer(writer).build();
-  }
-
-  @AfterEach
-  void cleanup() {
-    if (tracer != null) {
-      tracer.close();
+    private ListWriter writer;
+    private CoreTracer tracer;
+
+    @BeforeEach
+    void setup() {
+        writer = new ListWriter();
+        tracer = tracerBuilder().writer(writer).build();
+    }
+
+    @AfterEach
+    void cleanup() {
+        if (tracer != null) {
+            tracer.close();
+        }
+    }
+
+    @Test
+    void testSuiteAndTestModuleSpansAreFilteredOut() throws InterruptedException, TimeoutException {
+        tracer.addTraceInterceptor(CiVisibilityApmProtocolInterceptor.INSTANCE);
+
+        tracer.buildSpan("datadog", "test-module")
+                .withSpanType(DDSpanTypes.TEST_MODULE_END)
+                .start()
+                .finish();
+        tracer.buildSpan("datadog", "test-suite")
+                .withSpanType(DDSpanTypes.TEST_SUITE_END)
+                .start()
+                .finish();
+        tracer.buildSpan("datadog", "test")
+                .withSpanType(DDSpanTypes.TEST)
+                .start()
+                .finish();
+
+        writer.waitForTraces(1);
+
+        List<DDSpan> trace = writer.firstTrace();
+        assertEquals(1, trace.size());
+
+        DDSpan span = trace.get(0);
+        assertEquals("test", span.getOperationName().toString());
+    }
+
+    @Test
+    void testSessionTestModuleAndTestSuiteIdsAreNullified() throws InterruptedException, TimeoutException {
+        tracer.addTraceInterceptor(CiVisibilityApmProtocolInterceptor.INSTANCE);
+
+        DDSpan testSpan = (DDSpan) tracer.buildSpan("datadog", "test")
+                .withSpanType(DDSpanTypes.TEST)
+                .start();
+        testSpan.setTag(Tags.TEST_SESSION_ID, "session ID");
+        testSpan.setTag(Tags.TEST_MODULE_ID, "module ID");
+        testSpan.setTag(Tags.TEST_SUITE_ID, "suite ID");
+        testSpan.setTag("random tag", "random value");
+        testSpan.finish();
+
+        writer.waitForTraces(1);
+
+        List<DDSpan> trace = writer.firstTrace();
+        assertEquals(1, trace.size());
+
+        DDSpan span = trace.get(0);
+
+        assertNull(span.getTag(Tags.TEST_SESSION_ID));
+        assertNull(span.getTag(Tags.TEST_MODULE_ID));
+        assertNull(span.getTag(Tags.TEST_SUITE_ID));
+        assertEquals("random value", span.getTag("random tag"));
     }
-  }
-
-  @Test
-  void testSuiteAndTestModuleSpansAreFilteredOut() throws InterruptedException, TimeoutException {
-    tracer.addTraceInterceptor(CiVisibilityApmProtocolInterceptor.INSTANCE);
-
-    tracer
-        .buildSpan("datadog", "test-module")
-        .withSpanType(DDSpanTypes.TEST_MODULE_END)
-        .start()
-        .finish();
-    tracer
-        .buildSpan("datadog", "test-suite")
-        .withSpanType(DDSpanTypes.TEST_SUITE_END)
-        .start()
-        .finish();
-    tracer.buildSpan("datadog", "test").withSpanType(DDSpanTypes.TEST).start().finish();
-
-    writer.waitForTraces(1);
-
-    List<DDSpan> trace = writer.firstTrace();
-    assertEquals(1, trace.size());
-
-    DDSpan span = trace.get(0);
-    assertEquals("test", span.getOperationName().toString());
-  }
-
-  @Test
-  void testSessionTestModuleAndTestSuiteIdsAreNullified()
-      throws InterruptedException, TimeoutException {
-    tracer.addTraceInterceptor(CiVisibilityApmProtocolInterceptor.INSTANCE);
-
-    DDSpan testSpan =
-        (DDSpan) tracer.buildSpan("datadog", "test").withSpanType(DDSpanTypes.TEST).start();
-    testSpan.setTag(Tags.TEST_SESSION_ID, "session ID");
-    testSpan.setTag(Tags.TEST_MODULE_ID, "module ID");
-    testSpan.setTag(Tags.TEST_SUITE_ID, "suite ID");
-    testSpan.setTag("random tag", "random value");
-    testSpan.finish();
-
-    writer.waitForTraces(1);
-
-    List<DDSpan> trace = writer.firstTrace();
-    assertEquals(1, trace.size());
-
-    DDSpan span = trace.get(0);
-
-    assertNull(span.getTag(Tags.TEST_SESSION_ID));
-    assertNull(span.getTag(Tags.TEST_MODULE_ID));
-    assertNull(span.getTag(Tags.TEST_SUITE_ID));
-    assertEquals("random value", span.getTag("random tag"));
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptorTest.java b/dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptorTest.java
index dcc81fe9908..782262df495 100644
--- a/dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptorTest.java
@@ -23,63 +23,64 @@
 @Timeout(value = 10, unit = TimeUnit.SECONDS)
 public class CiVisibilityTraceInterceptorTest extends DDCoreJavaSpecification {
 
-  private ListWriter writer;
-  private CoreTracer tracer;
+    private ListWriter writer;
+    private CoreTracer tracer;
 
-  @BeforeEach
-  void setup() {
-    writer = new ListWriter();
-    tracer = tracerBuilder().writer(writer).build();
-  }
+    @BeforeEach
+    void setup() {
+        writer = new ListWriter();
+        tracer = tracerBuilder().writer(writer).build();
+    }
 
-  @AfterEach
-  void cleanup() {
-    if (tracer != null) {
-      tracer.close();
+    @AfterEach
+    void cleanup() {
+        if (tracer != null) {
+            tracer.close();
+        }
     }
-  }
 
-  @Test
-  void discardATraceThatDoesNotComeFromCiApp() {
-    tracer.addTraceInterceptor(CiVisibilityTraceInterceptor.INSTANCE);
-    tracer.buildSpan("datadog", "sample-span").start().finish();
+    @Test
+    void discardATraceThatDoesNotComeFromCiApp() {
+        tracer.addTraceInterceptor(CiVisibilityTraceInterceptor.INSTANCE);
+        tracer.buildSpan("datadog", "sample-span").start().finish();
 
-    assertEquals(0, writer.size());
-  }
+        assertEquals(0, writer.size());
+    }
 
-  @Test
-  void doNotDiscardATraceThatComesFromCiApp() {
-    tracer.addTraceInterceptor(CiVisibilityTraceInterceptor.INSTANCE);
+    @Test
+    void doNotDiscardATraceThatComesFromCiApp() {
+        tracer.addTraceInterceptor(CiVisibilityTraceInterceptor.INSTANCE);
 
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "sample-span").start();
-    span.spanContext().setOrigin(CIConstants.CIAPP_TEST_ORIGIN);
-    span.finish();
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "sample-span").start();
+        span.spanContext().setOrigin(CIConstants.CIAPP_TEST_ORIGIN);
+        span.finish();
 
-    // expect:
-    assertEquals(1, writer.size());
-  }
+        // expect:
+        assertEquals(1, writer.size());
+    }
 
-  @TableTest({
-    "scenario         | spanType                    ",
-    "test             | DDSpanTypes.TEST            ",
-    "test suite end   | DDSpanTypes.TEST_SUITE_END  ",
-    "test module end  | DDSpanTypes.TEST_MODULE_END ",
-    "test session end | DDSpanTypes.TEST_SESSION_END"
-  })
-  void addTracerVersionToSpansOfType(@ConvertWith(DDSpanTypesConverter.class) String spanType)
-      throws InterruptedException, TimeoutException {
-    tracer.addTraceInterceptor(CiVisibilityTraceInterceptor.INSTANCE);
+    @TableTest({
+      "scenario         | spanType                    ",
+      "test             | DDSpanTypes.TEST            ",
+      "test suite end   | DDSpanTypes.TEST_SUITE_END  ",
+      "test module end  | DDSpanTypes.TEST_MODULE_END ",
+      "test session end | DDSpanTypes.TEST_SESSION_END"
+    })
+    void addTracerVersionToSpansOfType(@ConvertWith(DDSpanTypesConverter.class) String spanType)
+            throws InterruptedException, TimeoutException {
+        tracer.addTraceInterceptor(CiVisibilityTraceInterceptor.INSTANCE);
 
-    DDSpan span =
-        (DDSpan) tracer.buildSpan("datadog", "sample-span").withSpanType(spanType).start();
-    span.spanContext().setOrigin(CIConstants.CIAPP_TEST_ORIGIN);
-    span.finish();
-    writer.waitForTraces(1);
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "sample-span")
+                .withSpanType(spanType)
+                .start();
+        span.spanContext().setOrigin(CIConstants.CIAPP_TEST_ORIGIN);
+        span.finish();
+        writer.waitForTraces(1);
 
-    List<DDSpan> trace = writer.firstTrace();
-    assertEquals(1, trace.size());
+        List<DDSpan> trace = writer.firstTrace();
+        assertEquals(1, trace.size());
 
-    DDSpan receivedSpan = trace.get(0);
-    assertNotNull(receivedSpan.getTag(DDTags.LIBRARY_VERSION_TAG_KEY));
-  }
+        DDSpan receivedSpan = trace.get(0);
+        assertNotNull(receivedSpan.getTag(DDTags.LIBRARY_VERSION_TAG_KEY));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/civisibility/writer/ddintake/CiTestCovMapperV2Test.java b/dd-trace-core/src/test/java/datadog/trace/civisibility/writer/ddintake/CiTestCovMapperV2Test.java
index b6c42fc9388..a81e2908d3b 100644
--- a/dd-trace-core/src/test/java/datadog/trace/civisibility/writer/ddintake/CiTestCovMapperV2Test.java
+++ b/dd-trace-core/src/test/java/datadog/trace/civisibility/writer/ddintake/CiTestCovMapperV2Test.java
@@ -34,307 +34,277 @@
 @SuppressWarnings("unchecked")
 public class CiTestCovMapperV2Test extends DDCoreJavaSpecification {
 
-  private static final ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory());
+    private static final ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory());
 
-  @Test
-  void testWritesMessage() throws Exception {
-    List<DDSpan> trace =
-        givenTrace(
-            new TestReport(
-                DDTraceId.from(1),
-                2L,
-                3L,
-                Arrays.asList(
-                    new TestReportFileEntry("source", BitSet.valueOf(new long[] {3, 5, 8})))));
+    @Test
+    void testWritesMessage() throws Exception {
+        List<DDSpan> trace = givenTrace(new TestReport(
+                DDTraceId.from(1), 2L, 3L, Arrays.asList(new TestReportFileEntry("source", BitSet.valueOf(new long[] {
+                    3, 5, 8
+                })))));
 
-    Map<String, Object> message = getMappedMessage(trace);
+        Map<String, Object> message = getMappedMessage(trace);
 
-    List<Map<String, Object>> coverages = assertVersionAndGetCoverages(message, 2);
-    assertEquals(1, coverages.size());
+        List<Map<String, Object>> coverages = assertVersionAndGetCoverages(message, 2);
+        assertEquals(1, coverages.size());
 
-    Map<String, Object> coverage = coverages.get(0);
-    assertCoverage(coverage, 1, 2, 3);
+        Map<String, Object> coverage = coverages.get(0);
+        assertCoverage(coverage, 1, 2, 3);
 
-    List<Map<String, Object>> files = (List<Map<String, Object>>) coverage.get("files");
-    assertEquals(1, files.size());
-    assertFile(
-        files.get(0), "source", new byte[] {3, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 8});
-  }
+        List<Map<String, Object>> files = (List<Map<String, Object>>) coverage.get("files");
+        assertEquals(1, files.size());
+        assertFile(files.get(0), "source", new byte[] {3, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 8});
+    }
 
-  @Test
-  void testWritesMessageWithMultipleFilesAndMultipleLines() throws Exception {
-    List<DDSpan> trace =
-        givenTrace(
-            new TestReport(
+    @Test
+    void testWritesMessageWithMultipleFilesAndMultipleLines() throws Exception {
+        List<DDSpan> trace = givenTrace(new TestReport(
                 DDTraceId.from(1),
                 2L,
                 3L,
                 Arrays.asList(
-                    new TestReportFileEntry("sourceA", BitSet.valueOf(new long[] {3, 5, 8})),
-                    new TestReportFileEntry("sourceB", BitSet.valueOf(new long[] {1, 255, 7})))));
-
-    Map<String, Object> message = getMappedMessage(trace);
-
-    List<Map<String, Object>> coverages = assertVersionAndGetCoverages(message, 2);
-    assertEquals(1, coverages.size());
-
-    Map<String, Object> coverage = coverages.get(0);
-    assertCoverage(coverage, 1, 2, 3);
-
-    List<Map<String, Object>> files = (List<Map<String, Object>>) coverage.get("files");
-    assertEquals(2, files.size());
-    assertFile(
-        files.get(0), "sourceA", new byte[] {3, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 8});
-    assertFile(
-        files.get(1), "sourceB", new byte[] {1, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 7});
-  }
-
-  @Test
-  void testWritesMessageWithMultipleReports() throws Exception {
-    List<DDSpan> trace =
-        givenTrace(
-            new TestReport(
-                DDTraceId.from(1),
-                2L,
-                3L,
-                Arrays.asList(
-                    new TestReportFileEntry("sourceA", BitSet.valueOf(new long[] {2, 17, 41})))),
-            new TestReport(
-                DDTraceId.from(1),
-                2L,
-                4L,
-                Arrays.asList(
-                    new TestReportFileEntry("sourceB", BitSet.valueOf(new long[] {11, 13, 55})))));
-
-    Map<String, Object> message = getMappedMessage(trace);
-
-    List<Map<String, Object>> coverages = assertVersionAndGetCoverages(message, 2);
-    assertEquals(2, coverages.size());
-
-    Map<String, Object> coverage0 = coverages.get(0);
-    assertCoverage(coverage0, 1, 2, 3);
-    List<Map<String, Object>> files0 = (List<Map<String, Object>>) coverage0.get("files");
-    assertEquals(1, files0.size());
-    assertFile(
-        files0.get(0), "sourceA", new byte[] {2, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, 41});
-
-    Map<String, Object> coverage1 = coverages.get(1);
-    assertCoverage(coverage1, 1, 2, 4);
-    List<Map<String, Object>> files1 = (List<Map<String, Object>>) coverage1.get("files");
-    assertEquals(1, files1.size());
-    assertFile(
-        files1.get(0),
-        "sourceB",
-        new byte[] {11, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 55});
-  }
-
-  @Test
-  void skipsSpansThatHaveNoReports() throws Exception {
-    List<DDSpan> trace =
-        givenTrace(
-            null,
-            new TestReport(
-                DDTraceId.from(1),
-                2L,
-                3L,
-                Arrays.asList(
-                    new TestReportFileEntry("source", BitSet.valueOf(new long[] {83, 25, 48})))),
-            null);
+                        new TestReportFileEntry("sourceA", BitSet.valueOf(new long[] {3, 5, 8})),
+                        new TestReportFileEntry("sourceB", BitSet.valueOf(new long[] {1, 255, 7})))));
 
-    Map<String, Object> message = getMappedMessage(trace);
+        Map<String, Object> message = getMappedMessage(trace);
 
-    List<Map<String, Object>> coverages = assertVersionAndGetCoverages(message, 2);
-    assertEquals(1, coverages.size());
+        List<Map<String, Object>> coverages = assertVersionAndGetCoverages(message, 2);
+        assertEquals(1, coverages.size());
 
-    Map<String, Object> coverage = coverages.get(0);
-    assertCoverage(coverage, 1, 2, 3);
+        Map<String, Object> coverage = coverages.get(0);
+        assertCoverage(coverage, 1, 2, 3);
 
-    List<Map<String, Object>> files = (List<Map<String, Object>>) coverage.get("files");
-    assertEquals(1, files.size());
-    assertFile(
-        files.get(0), "source", new byte[] {83, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 48});
-  }
+        List<Map<String, Object>> files = (List<Map<String, Object>>) coverage.get("files");
+        assertEquals(2, files.size());
+        assertFile(files.get(0), "sourceA", new byte[] {3, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 8});
+        assertFile(files.get(1), "sourceB", new byte[] {1, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 7});
+    }
 
-  @Test
-  void skipsEmptyReports() throws Exception {
-    List<DDSpan> trace =
-        givenTrace(
-            new TestReport(
-                DDTraceId.from(1),
-                2L,
-                3L,
-                Arrays.asList(
-                    new TestReportFileEntry("source", BitSet.valueOf(new long[] {33, 53, 87})))),
-            new TestReport(DDTraceId.from(1), 2L, 4L, Collections.emptyList()));
-
-    Map<String, Object> message = getMappedMessage(trace);
-
-    List<Map<String, Object>> coverages = assertVersionAndGetCoverages(message, 2);
-    assertEquals(1, coverages.size());
-
-    Map<String, Object> coverage = coverages.get(0);
-    assertCoverage(coverage, 1, 2, 3);
-
-    List<Map<String, Object>> files = (List<Map<String, Object>>) coverage.get("files");
-    assertEquals(1, files.size());
-    assertFile(
-        files.get(0), "source", new byte[] {33, 0, 0, 0, 0, 0, 0, 0, 53, 0, 0, 0, 0, 0, 0, 0, 87});
-  }
-
-  @Test
-  void skipsDuplicateReports() throws Exception {
-    List<DDSpan> trace = new ArrayList<>();
-    TestReport report =
-        new TestReport(
-            DDTraceId.from(1),
-            2L,
-            3L,
-            Arrays.asList(new TestReportFileEntry("source", BitSet.valueOf(new long[] {3, 5, 8}))));
-
-    trace.add(
-        buildSpan(
-            0,
-            InternalSpanTypes.TEST,
-            PropagationTags.factory().empty(),
-            Collections.emptyMap(),
-            PrioritySampling.SAMPLER_KEEP,
-            new DummyTestContext(new DummyReportHolder(report))));
-    trace.add(
-        buildSpan(
-            0,
-            "testChild",
-            PropagationTags.factory().empty(),
-            Collections.emptyMap(),
-            PrioritySampling.SAMPLER_KEEP,
-            new DummyTestContext(new DummyReportHolder(report))));
-
-    Map<String, Object> message = getMappedMessage(trace);
-
-    List<Map<String, Object>> coverages = assertVersionAndGetCoverages(message, 2);
-    assertEquals(1, coverages.size());
-
-    Map<String, Object> coverage = coverages.get(0);
-    assertCoverage(coverage, 1, 2, 3);
-
-    List<Map<String, Object>> files = (List<Map<String, Object>>) coverage.get("files");
-    assertEquals(1, files.size());
-    assertFile(
-        files.get(0), "source", new byte[] {3, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 8});
-  }
-
-  private List<DDSpan> givenTrace(TestReport... testReports) {
-    List<DDSpan> trace = new ArrayList<>();
-    for (TestReport testReport : testReports) {
-      DummyReportHolder testReportHolder = new DummyReportHolder(testReport);
-      trace.add(
-          buildSpan(
-              0,
-              InternalSpanTypes.TEST,
-              PropagationTags.factory().empty(),
-              Collections.emptyMap(),
-              PrioritySampling.SAMPLER_KEEP,
-              new DummyTestContext(testReportHolder)));
+    @Test
+    void testWritesMessageWithMultipleReports() throws Exception {
+        List<DDSpan> trace = givenTrace(
+                new TestReport(
+                        DDTraceId.from(1),
+                        2L,
+                        3L,
+                        Arrays.asList(new TestReportFileEntry("sourceA", BitSet.valueOf(new long[] {2, 17, 41})))),
+                new TestReport(
+                        DDTraceId.from(1),
+                        2L,
+                        4L,
+                        Arrays.asList(new TestReportFileEntry("sourceB", BitSet.valueOf(new long[] {11, 13, 55})))));
+
+        Map<String, Object> message = getMappedMessage(trace);
+
+        List<Map<String, Object>> coverages = assertVersionAndGetCoverages(message, 2);
+        assertEquals(2, coverages.size());
+
+        Map<String, Object> coverage0 = coverages.get(0);
+        assertCoverage(coverage0, 1, 2, 3);
+        List<Map<String, Object>> files0 = (List<Map<String, Object>>) coverage0.get("files");
+        assertEquals(1, files0.size());
+        assertFile(files0.get(0), "sourceA", new byte[] {2, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, 41});
+
+        Map<String, Object> coverage1 = coverages.get(1);
+        assertCoverage(coverage1, 1, 2, 4);
+        List<Map<String, Object>> files1 = (List<Map<String, Object>>) coverage1.get("files");
+        assertEquals(1, files1.size());
+        assertFile(files1.get(0), "sourceB", new byte[] {11, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 55});
     }
-    return trace;
-  }
-
-  private Map<String, Object> getMappedMessage(List<DDSpan> trace) throws IOException {
-    GrowableBuffer buffer = new GrowableBuffer(1024);
-    CiTestCovMapperV2 mapper = new CiTestCovMapperV2(false);
-    mapper.map(trace, new MsgPackWriter(buffer));
-
-    ByteArrayWritableByteChannel channel = new ByteArrayWritableByteChannel();
-    mapper.newPayload().withBody(1, buffer.slice()).writeTo(channel);
-
-    return objectMapper.readValue(channel.toByteArray(), Map.class);
-  }
-
-  private List<Map<String, Object>> assertVersionAndGetCoverages(
-      Map<String, Object> message, int version) {
-    assertEquals(version, message.get("version"));
-    return (List<Map<String, Object>>) message.get("coverages");
-  }
-
-  private void assertCoverage(
-      Map<String, Object> coverage, int sessionId, int suiteId, int spanId) {
-    assertEquals(sessionId, coverage.get("test_session_id"));
-    assertEquals(suiteId, coverage.get("test_suite_id"));
-    assertEquals(spanId, coverage.get("span_id"));
-  }
-
-  private void assertFile(Map<String, Object> file, String filename, byte[] bitmap) {
-    assertEquals(filename, file.get("filename"));
-    assertArrayEquals(bitmap, (byte[]) file.get("bitmap"));
-  }
-
-  private static final class DummyReportHolder implements CoverageStore {
-    private final TestReport testReport;
-
-    DummyReportHolder(TestReport testReport) {
-      this.testReport = testReport;
+
+    @Test
+    void skipsSpansThatHaveNoReports() throws Exception {
+        List<DDSpan> trace = givenTrace(
+                null,
+                new TestReport(
+                        DDTraceId.from(1),
+                        2L,
+                        3L,
+                        Arrays.asList(new TestReportFileEntry("source", BitSet.valueOf(new long[] {83, 25, 48})))),
+                null);
+
+        Map<String, Object> message = getMappedMessage(trace);
+
+        List<Map<String, Object>> coverages = assertVersionAndGetCoverages(message, 2);
+        assertEquals(1, coverages.size());
+
+        Map<String, Object> coverage = coverages.get(0);
+        assertCoverage(coverage, 1, 2, 3);
+
+        List<Map<String, Object>> files = (List<Map<String, Object>>) coverage.get("files");
+        assertEquals(1, files.size());
+        assertFile(files.get(0), "source", new byte[] {83, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 48});
     }
 
-    @Override
-    public TestReport getReport() {
-      return testReport;
+    @Test
+    void skipsEmptyReports() throws Exception {
+        List<DDSpan> trace = givenTrace(
+                new TestReport(
+                        DDTraceId.from(1),
+                        2L,
+                        3L,
+                        Arrays.asList(new TestReportFileEntry("source", BitSet.valueOf(new long[] {33, 53, 87})))),
+                new TestReport(DDTraceId.from(1), 2L, 4L, Collections.emptyList()));
+
+        Map<String, Object> message = getMappedMessage(trace);
+
+        List<Map<String, Object>> coverages = assertVersionAndGetCoverages(message, 2);
+        assertEquals(1, coverages.size());
+
+        Map<String, Object> coverage = coverages.get(0);
+        assertCoverage(coverage, 1, 2, 3);
+
+        List<Map<String, Object>> files = (List<Map<String, Object>>) coverage.get("files");
+        assertEquals(1, files.size());
+        assertFile(files.get(0), "source", new byte[] {33, 0, 0, 0, 0, 0, 0, 0, 53, 0, 0, 0, 0, 0, 0, 0, 87});
     }
 
-    @Override
-    public boolean report(DDTraceId testSessionId, Long testSuiteId, long spanId) {
-      return false;
+    @Test
+    void skipsDuplicateReports() throws Exception {
+        List<DDSpan> trace = new ArrayList<>();
+        TestReport report = new TestReport(
+                DDTraceId.from(1), 2L, 3L, Arrays.asList(new TestReportFileEntry("source", BitSet.valueOf(new long[] {
+                    3, 5, 8
+                }))));
+
+        trace.add(buildSpan(
+                0,
+                InternalSpanTypes.TEST,
+                PropagationTags.factory().empty(),
+                Collections.emptyMap(),
+                PrioritySampling.SAMPLER_KEEP,
+                new DummyTestContext(new DummyReportHolder(report))));
+        trace.add(buildSpan(
+                0,
+                "testChild",
+                PropagationTags.factory().empty(),
+                Collections.emptyMap(),
+                PrioritySampling.SAMPLER_KEEP,
+                new DummyTestContext(new DummyReportHolder(report))));
+
+        Map<String, Object> message = getMappedMessage(trace);
+
+        List<Map<String, Object>> coverages = assertVersionAndGetCoverages(message, 2);
+        assertEquals(1, coverages.size());
+
+        Map<String, Object> coverage = coverages.get(0);
+        assertCoverage(coverage, 1, 2, 3);
+
+        List<Map<String, Object>> files = (List<Map<String, Object>>) coverage.get("files");
+        assertEquals(1, files.size());
+        assertFile(files.get(0), "source", new byte[] {3, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 8});
     }
 
-    @Override
-    public CoverageProbes getProbes() {
-      return NoOpProbes.INSTANCE;
+    private List<DDSpan> givenTrace(TestReport... testReports) {
+        List<DDSpan> trace = new ArrayList<>();
+        for (TestReport testReport : testReports) {
+            DummyReportHolder testReportHolder = new DummyReportHolder(testReport);
+            trace.add(buildSpan(
+                    0,
+                    InternalSpanTypes.TEST,
+                    PropagationTags.factory().empty(),
+                    Collections.emptyMap(),
+                    PrioritySampling.SAMPLER_KEEP,
+                    new DummyTestContext(testReportHolder)));
+        }
+        return trace;
     }
-  }
 
-  private static final class DummyTestContext implements TestContext {
-    private final CoverageStore coverageStore;
+    private Map<String, Object> getMappedMessage(List<DDSpan> trace) throws IOException {
+        GrowableBuffer buffer = new GrowableBuffer(1024);
+        CiTestCovMapperV2 mapper = new CiTestCovMapperV2(false);
+        mapper.map(trace, new MsgPackWriter(buffer));
 
-    DummyTestContext(CoverageStore coverageStore) {
-      this.coverageStore = coverageStore;
-    }
+        ByteArrayWritableByteChannel channel = new ByteArrayWritableByteChannel();
+        mapper.newPayload().withBody(1, buffer.slice()).writeTo(channel);
 
-    @Override
-    public CoverageStore getCoverageStore() {
-      return coverageStore;
+        return objectMapper.readValue(channel.toByteArray(), Map.class);
     }
 
-    @Override
-    public <T> void set(Class<T> key, T value) {}
+    private List<Map<String, Object>> assertVersionAndGetCoverages(Map<String, Object> message, int version) {
+        assertEquals(version, message.get("version"));
+        return (List<Map<String, Object>>) message.get("coverages");
+    }
 
-    @Override
-    public <T> T get(Class<T> key) {
-      return null;
+    private void assertCoverage(Map<String, Object> coverage, int sessionId, int suiteId, int spanId) {
+        assertEquals(sessionId, coverage.get("test_session_id"));
+        assertEquals(suiteId, coverage.get("test_suite_id"));
+        assertEquals(spanId, coverage.get("span_id"));
     }
-  }
-
-  private static final class ByteArrayWritableByteChannel implements WritableByteChannel {
-    private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
-    @Override
-    public int write(ByteBuffer src) throws IOException {
-      int remaining = src.remaining();
-      byte[] buffer = new byte[remaining];
-      src.get(buffer);
-      outputStream.write(buffer);
-      return remaining;
+
+    private void assertFile(Map<String, Object> file, String filename, byte[] bitmap) {
+        assertEquals(filename, file.get("filename"));
+        assertArrayEquals(bitmap, (byte[]) file.get("bitmap"));
     }
 
-    @Override
-    public boolean isOpen() {
-      return true;
+    private static final class DummyReportHolder implements CoverageStore {
+        private final TestReport testReport;
+
+        DummyReportHolder(TestReport testReport) {
+            this.testReport = testReport;
+        }
+
+        @Override
+        public TestReport getReport() {
+            return testReport;
+        }
+
+        @Override
+        public boolean report(DDTraceId testSessionId, Long testSuiteId, long spanId) {
+            return false;
+        }
+
+        @Override
+        public CoverageProbes getProbes() {
+            return NoOpProbes.INSTANCE;
+        }
     }
 
-    @Override
-    public void close() throws IOException {
-      outputStream.close();
+    private static final class DummyTestContext implements TestContext {
+        private final CoverageStore coverageStore;
+
+        DummyTestContext(CoverageStore coverageStore) {
+            this.coverageStore = coverageStore;
+        }
+
+        @Override
+        public CoverageStore getCoverageStore() {
+            return coverageStore;
+        }
+
+        @Override
+        public <T> void set(Class<T> key, T value) {}
+
+        @Override
+        public <T> T get(Class<T> key) {
+            return null;
+        }
     }
 
-    byte[] toByteArray() {
-      return outputStream.toByteArray();
+    private static final class ByteArrayWritableByteChannel implements WritableByteChannel {
+        private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+        @Override
+        public int write(ByteBuffer src) throws IOException {
+            int remaining = src.remaining();
+            byte[] buffer = new byte[remaining];
+            src.get(buffer);
+            outputStream.write(buffer);
+            return remaining;
+        }
+
+        @Override
+        public boolean isOpen() {
+            return true;
+        }
+
+        @Override
+        public void close() throws IOException {
+            outputStream.close();
+        }
+
+        byte[] toByteArray() {
+            return outputStream.toByteArray();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1PayloadTest.java b/dd-trace-core/src/test/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1PayloadTest.java
index e59f758056e..37e90d0dfe2 100644
--- a/dd-trace-core/src/test/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1PayloadTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1PayloadTest.java
@@ -52,530 +52,515 @@
 
 public class CiTestCycleMapperV1PayloadTest extends DDJavaSpecification {
 
-  @TableTest({
-    "scenario                                   | bufferSize | traceCount | lowCardinality",
-    "20k buffer, 0 traces, low cardinality      | 20480      | 0          | true          ",
-    "20k buffer, 1 trace, low cardinality       | 20480      | 1          | true          ",
-    "30k buffer, 1 trace, low cardinality       | 30720      | 1          | true          ",
-    "30k buffer, 2 traces, low cardinality      | 30720      | 2          | true          ",
-    "20k buffer, 0 traces, high cardinality     | 20480      | 0          | false         ",
-    "20k buffer, 1 trace, high cardinality      | 20480      | 1          | false         ",
-    "30k buffer, 1 trace, high cardinality      | 30720      | 1          | false         ",
-    "30k buffer, 2 traces, high cardinality     | 30720      | 2          | false         ",
-    "100k buffer, 0 traces, low cardinality     | 102400     | 0          | true          ",
-    "100k buffer, 1 trace, low cardinality      | 102400     | 1          | true          ",
-    "100k buffer, 10 traces, low cardinality    | 102400     | 10         | true          ",
-    "100k buffer, 100 traces, low cardinality   | 102400     | 100        | true          ",
-    "100k buffer, 1000 traces, low cardinality  | 102400     | 1000       | true          ",
-    "100k buffer, 0 traces, high cardinality    | 102400     | 0          | false         ",
-    "100k buffer, 1 trace, high cardinality     | 102400     | 1          | false         ",
-    "100k buffer, 10 traces, high cardinality   | 102400     | 10         | false         ",
-    "100k buffer, 100 traces, high cardinality  | 102400     | 100        | false         ",
-    "100k buffer, 1000 traces, high cardinality | 102400     | 1000       | false         "
-  })
-  void testTracesWrittenCorrectly(int bufferSize, int traceCount, boolean lowCardinality) {
-    CiVisibilityWellKnownTags wellKnownTags =
-        new CiVisibilityWellKnownTags(
-            "runtimeid",
-            "my-env",
-            "language",
-            "my-runtime-name",
-            "my-runtime-version",
-            "my-runtime-vendor",
-            "my-os-arch",
-            "my-os-platform",
-            "my-os-version",
-            "false");
-    CiTestCycleMapperV1 mapper = new CiTestCycleMapperV1(wellKnownTags, false);
-
-    List<List<TraceGenerator.PojoSpan>> traces = generateRandomTraces(traceCount, lowCardinality);
-    PayloadVerifier verifier = new PayloadVerifier(wellKnownTags, traces, mapper);
-
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier));
-
-    boolean tracesFitInBuffer = true;
-    for (List<TraceGenerator.PojoSpan> trace : traces) {
-      if (!packer.format(trace, mapper)) {
-        verifier.skipLargeTrace();
-        tracesFitInBuffer = false;
-      }
+    @TableTest({
+      "scenario                                   | bufferSize | traceCount | lowCardinality",
+      "20k buffer, 0 traces, low cardinality      | 20480      | 0          | true          ",
+      "20k buffer, 1 trace, low cardinality       | 20480      | 1          | true          ",
+      "30k buffer, 1 trace, low cardinality       | 30720      | 1          | true          ",
+      "30k buffer, 2 traces, low cardinality      | 30720      | 2          | true          ",
+      "20k buffer, 0 traces, high cardinality     | 20480      | 0          | false         ",
+      "20k buffer, 1 trace, high cardinality      | 20480      | 1          | false         ",
+      "30k buffer, 1 trace, high cardinality      | 30720      | 1          | false         ",
+      "30k buffer, 2 traces, high cardinality     | 30720      | 2          | false         ",
+      "100k buffer, 0 traces, low cardinality     | 102400     | 0          | true          ",
+      "100k buffer, 1 trace, low cardinality      | 102400     | 1          | true          ",
+      "100k buffer, 10 traces, low cardinality    | 102400     | 10         | true          ",
+      "100k buffer, 100 traces, low cardinality   | 102400     | 100        | true          ",
+      "100k buffer, 1000 traces, low cardinality  | 102400     | 1000       | true          ",
+      "100k buffer, 0 traces, high cardinality    | 102400     | 0          | false         ",
+      "100k buffer, 1 trace, high cardinality     | 102400     | 1          | false         ",
+      "100k buffer, 10 traces, high cardinality   | 102400     | 10         | false         ",
+      "100k buffer, 100 traces, high cardinality  | 102400     | 100        | false         ",
+      "100k buffer, 1000 traces, high cardinality | 102400     | 1000       | false         "
+    })
+    void testTracesWrittenCorrectly(int bufferSize, int traceCount, boolean lowCardinality) {
+        CiVisibilityWellKnownTags wellKnownTags = new CiVisibilityWellKnownTags(
+                "runtimeid",
+                "my-env",
+                "language",
+                "my-runtime-name",
+                "my-runtime-version",
+                "my-runtime-vendor",
+                "my-os-arch",
+                "my-os-platform",
+                "my-os-version",
+                "false");
+        CiTestCycleMapperV1 mapper = new CiTestCycleMapperV1(wellKnownTags, false);
+
+        List<List<TraceGenerator.PojoSpan>> traces = generateRandomTraces(traceCount, lowCardinality);
+        PayloadVerifier verifier = new PayloadVerifier(wellKnownTags, traces, mapper);
+
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier));
+
+        boolean tracesFitInBuffer = true;
+        for (List<TraceGenerator.PojoSpan> trace : traces) {
+            if (!packer.format(trace, mapper)) {
+                verifier.skipLargeTrace();
+                tracesFitInBuffer = false;
+            }
+        }
+        packer.flush();
+
+        if (tracesFitInBuffer) {
+            verifier.verifyTracesConsumed();
+        }
     }
-    packer.flush();
 
-    if (tracesFitInBuffer) {
-      verifier.verifyTracesConsumed();
+    @Test
+    void verifyTestSuiteIdTestModuleIdAndTestSessionIdAreWrittenAsTopLevelTagsInTestEvent() {
+        Map<String, Object> extraTags = new HashMap<>();
+        extraTags.put(Tags.TEST_SESSION_ID, DDTraceId.from(123));
+        extraTags.put(Tags.TEST_MODULE_ID, 456L);
+        extraTags.put(Tags.TEST_SUITE_ID, 789L);
+        TraceGenerator.PojoSpan span = generateRandomSpan(InternalSpanTypes.TEST, extraTags);
+
+        Map<String, Object> deserializedSpan = whenASpanIsWritten(span);
+
+        verifyTopLevelTags(deserializedSpan, DDTraceId.from(123), 456L, 789L);
+
+        Map<String, Object> spanContent = getContent(deserializedSpan);
+        assertTrue(spanContent.containsKey("trace_id"));
+        assertTrue(spanContent.containsKey("span_id"));
+        assertTrue(spanContent.containsKey("parent_id"));
     }
-  }
-
-  @Test
-  void verifyTestSuiteIdTestModuleIdAndTestSessionIdAreWrittenAsTopLevelTagsInTestEvent() {
-    Map<String, Object> extraTags = new HashMap<>();
-    extraTags.put(Tags.TEST_SESSION_ID, DDTraceId.from(123));
-    extraTags.put(Tags.TEST_MODULE_ID, 456L);
-    extraTags.put(Tags.TEST_SUITE_ID, 789L);
-    TraceGenerator.PojoSpan span = generateRandomSpan(InternalSpanTypes.TEST, extraTags);
-
-    Map<String, Object> deserializedSpan = whenASpanIsWritten(span);
-
-    verifyTopLevelTags(deserializedSpan, DDTraceId.from(123), 456L, 789L);
-
-    Map<String, Object> spanContent = getContent(deserializedSpan);
-    assertTrue(spanContent.containsKey("trace_id"));
-    assertTrue(spanContent.containsKey("span_id"));
-    assertTrue(spanContent.containsKey("parent_id"));
-  }
-
-  @Test
-  void truncatesMetaStringValuesAndPreservesMetricsAndTopLevelIds() {
-    String longValue = repeat("a", MAX_META_STRING_VALUE_LENGTH + 1);
-    String exactValue = repeat("b", MAX_META_STRING_VALUE_LENGTH);
-    Map<String, Object> extraTags = new HashMap<>();
-    extraTags.put(Tags.TEST_SESSION_ID, DDTraceId.from(123));
-    extraTags.put(Tags.TEST_MODULE_ID, 456L);
-    extraTags.put(Tags.TEST_SUITE_ID, 789L);
-    extraTags.put("custom.tag", longValue);
-    extraTags.put("exact.tag", exactValue);
-    extraTags.put("custom.metric", 42);
-    TraceGenerator.PojoSpan span = generateRandomSpan(InternalSpanTypes.TEST, extraTags);
-
-    Map<String, Object> deserializedSpan = whenASpanIsWritten(span);
-
-    verifyTopLevelTags(deserializedSpan, DDTraceId.from(123), 456L, 789L);
-
-    Map<String, Object> spanContent = getContent(deserializedSpan);
-    Map<String, Object> deserializedMetrics = getMetrics(spanContent);
-    Map<String, Object> deserializedMeta = getMeta(spanContent);
-
-    assertEquals(
-        longValue.substring(0, MAX_META_STRING_VALUE_LENGTH), deserializedMeta.get("custom.tag"));
-    assertEquals(
-        MAX_META_STRING_VALUE_LENGTH, ((String) deserializedMeta.get("custom.tag")).length());
-    assertEquals(exactValue, deserializedMeta.get("exact.tag"));
-    assertEquals(42, deserializedMetrics.get("custom.metric"));
-  }
-
-  @Test
-  void truncatesPayloadMetadataValues() {
-    String longValue = repeat("m", MAX_META_STRING_VALUE_LENGTH + 1);
-    CiVisibilityWellKnownTags wellKnownTags =
-        new CiVisibilityWellKnownTags(
-            longValue, longValue, longValue, longValue, longValue, longValue, longValue, longValue,
-            longValue, longValue);
-    CiTestCycleMapperV1 mapper = new CiTestCycleMapperV1(wellKnownTags, false);
-    List<List<TraceGenerator.PojoSpan>> traces =
-        Collections.singletonList(
-            Collections.singletonList(
-                generateRandomSpan(InternalSpanTypes.TEST, Collections.emptyMap())));
-    PayloadVerifier verifier = new PayloadVerifier(wellKnownTags, traces, mapper);
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(100 << 10, verifier));
-
-    packer.format(traces.get(0), mapper);
-    packer.flush();
-
-    verifier.verifyTracesConsumed();
-  }
-
-  @Test
-  void verifyTestSuiteEndEventIsWrittenCorrectly() {
-    Map<String, Object> extraTags = new HashMap<>();
-    extraTags.put(Tags.TEST_SESSION_ID, DDTraceId.from(123));
-    extraTags.put(Tags.TEST_MODULE_ID, 456L);
-    extraTags.put(Tags.TEST_SUITE_ID, 789L);
-    TraceGenerator.PojoSpan span = generateRandomSpan(InternalSpanTypes.TEST_SUITE_END, extraTags);
-
-    Map<String, Object> deserializedSpan = whenASpanIsWritten(span);
-
-    verifyTopLevelTags(deserializedSpan, DDTraceId.from(123), 456L, 789L);
-
-    Map<String, Object> spanContent = getContent(deserializedSpan);
-    assertFalse(spanContent.containsKey("trace_id"));
-    assertFalse(spanContent.containsKey("span_id"));
-    assertFalse(spanContent.containsKey("parent_id"));
-  }
-
-  @Test
-  void verifyTestModuleEndEventIsWrittenCorrectly() {
-    Map<String, Object> extraTags = new HashMap<>();
-    extraTags.put(Tags.TEST_SESSION_ID, DDTraceId.from(123));
-    extraTags.put(Tags.TEST_MODULE_ID, 456L);
-    TraceGenerator.PojoSpan span = generateRandomSpan(InternalSpanTypes.TEST_MODULE_END, extraTags);
-
-    Map<String, Object> deserializedSpan = whenASpanIsWritten(span);
-
-    verifyTopLevelTags(deserializedSpan, DDTraceId.from(123), 456L, null);
-
-    Map<String, Object> spanContent = getContent(deserializedSpan);
-    assertFalse(spanContent.containsKey("trace_id"));
-    assertFalse(spanContent.containsKey("span_id"));
-    assertFalse(spanContent.containsKey("parent_id"));
-  }
-
-  @Test
-  void verifyResultIsNotAffectedBySuccessiveMappingCalls() {
-    Map<String, Object> extraTags = new HashMap<>();
-    extraTags.put(Tags.TEST_SESSION_ID, DDTraceId.from(123));
-    extraTags.put(Tags.TEST_MODULE_ID, 456L);
-    extraTags.put(Tags.TEST_SUITE_ID, 789L);
-    TraceGenerator.PojoSpan span = generateRandomSpan(InternalSpanTypes.TEST, extraTags);
-
-    whenASpanIsWritten(span);
-    Map<String, Object> deserializedSpan = whenASpanIsWritten(span);
-
-    verifyTopLevelTags(deserializedSpan, DDTraceId.from(123), 456L, 789L);
-
-    Map<String, Object> spanContent = getContent(deserializedSpan);
-    assertTrue(spanContent.containsKey("trace_id"));
-    assertTrue(spanContent.containsKey("span_id"));
-    assertTrue(spanContent.containsKey("parent_id"));
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> getContent(Map<String, Object> deserializedSpan) {
-    return (Map<String, Object>) deserializedSpan.get("content");
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> getMetrics(Map<String, Object> spanContent) {
-    return (Map<String, Object>) spanContent.get("metrics");
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> getMeta(Map<String, Object> spanContent) {
-    return (Map<String, Object>) spanContent.get("meta");
-  }
-
-  private static void verifyTopLevelTags(
-      Map<String, Object> deserializedSpan,
-      DDTraceId testSessionId,
-      Long testModuleId,
-      Long testSuiteId) {
-    Map<String, Object> spanContent = getContent(deserializedSpan);
-    Map<String, Object> deserializedMetrics = getMetrics(spanContent);
-    Map<String, Object> deserializedMeta = getMeta(spanContent);
-
-    if (testSessionId != null) {
-      assertEquals(
-          testSessionId.toLong(), ((Number) spanContent.get(Tags.TEST_SESSION_ID)).longValue());
-    } else {
-      assertFalse(spanContent.containsKey(Tags.TEST_SESSION_ID));
+
+    @Test
+    void truncatesMetaStringValuesAndPreservesMetricsAndTopLevelIds() {
+        String longValue = repeat("a", MAX_META_STRING_VALUE_LENGTH + 1);
+        String exactValue = repeat("b", MAX_META_STRING_VALUE_LENGTH);
+        Map<String, Object> extraTags = new HashMap<>();
+        extraTags.put(Tags.TEST_SESSION_ID, DDTraceId.from(123));
+        extraTags.put(Tags.TEST_MODULE_ID, 456L);
+        extraTags.put(Tags.TEST_SUITE_ID, 789L);
+        extraTags.put("custom.tag", longValue);
+        extraTags.put("exact.tag", exactValue);
+        extraTags.put("custom.metric", 42);
+        TraceGenerator.PojoSpan span = generateRandomSpan(InternalSpanTypes.TEST, extraTags);
+
+        Map<String, Object> deserializedSpan = whenASpanIsWritten(span);
+
+        verifyTopLevelTags(deserializedSpan, DDTraceId.from(123), 456L, 789L);
+
+        Map<String, Object> spanContent = getContent(deserializedSpan);
+        Map<String, Object> deserializedMetrics = getMetrics(spanContent);
+        Map<String, Object> deserializedMeta = getMeta(spanContent);
+
+        assertEquals(longValue.substring(0, MAX_META_STRING_VALUE_LENGTH), deserializedMeta.get("custom.tag"));
+        assertEquals(MAX_META_STRING_VALUE_LENGTH, ((String) deserializedMeta.get("custom.tag")).length());
+        assertEquals(exactValue, deserializedMeta.get("exact.tag"));
+        assertEquals(42, deserializedMetrics.get("custom.metric"));
     }
 
-    if (testModuleId != null) {
-      assertEquals(
-          testModuleId.longValue(), ((Number) spanContent.get(Tags.TEST_MODULE_ID)).longValue());
-    } else {
-      assertFalse(spanContent.containsKey(Tags.TEST_MODULE_ID));
+    @Test
+    void truncatesPayloadMetadataValues() {
+        String longValue = repeat("m", MAX_META_STRING_VALUE_LENGTH + 1);
+        CiVisibilityWellKnownTags wellKnownTags = new CiVisibilityWellKnownTags(
+                longValue, longValue, longValue, longValue, longValue, longValue, longValue, longValue, longValue,
+                longValue);
+        CiTestCycleMapperV1 mapper = new CiTestCycleMapperV1(wellKnownTags, false);
+        List<List<TraceGenerator.PojoSpan>> traces = Collections.singletonList(
+                Collections.singletonList(generateRandomSpan(InternalSpanTypes.TEST, Collections.emptyMap())));
+        PayloadVerifier verifier = new PayloadVerifier(wellKnownTags, traces, mapper);
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(100 << 10, verifier));
+
+        packer.format(traces.get(0), mapper);
+        packer.flush();
+
+        verifier.verifyTracesConsumed();
     }
 
-    if (testSuiteId != null) {
-      assertEquals(
-          testSuiteId.longValue(), ((Number) spanContent.get(Tags.TEST_SUITE_ID)).longValue());
-    } else {
-      assertFalse(spanContent.containsKey(Tags.TEST_SUITE_ID));
+    @Test
+    void verifyTestSuiteEndEventIsWrittenCorrectly() {
+        Map<String, Object> extraTags = new HashMap<>();
+        extraTags.put(Tags.TEST_SESSION_ID, DDTraceId.from(123));
+        extraTags.put(Tags.TEST_MODULE_ID, 456L);
+        extraTags.put(Tags.TEST_SUITE_ID, 789L);
+        TraceGenerator.PojoSpan span = generateRandomSpan(InternalSpanTypes.TEST_SUITE_END, extraTags);
+
+        Map<String, Object> deserializedSpan = whenASpanIsWritten(span);
+
+        verifyTopLevelTags(deserializedSpan, DDTraceId.from(123), 456L, 789L);
+
+        Map<String, Object> spanContent = getContent(deserializedSpan);
+        assertFalse(spanContent.containsKey("trace_id"));
+        assertFalse(spanContent.containsKey("span_id"));
+        assertFalse(spanContent.containsKey("parent_id"));
     }
 
-    assertFalse(deserializedMetrics.containsKey(Tags.TEST_SESSION_ID));
-    assertFalse(deserializedMetrics.containsKey(Tags.TEST_MODULE_ID));
-    assertFalse(deserializedMetrics.containsKey(Tags.TEST_SUITE_ID));
-
-    assertFalse(deserializedMeta.containsKey(Tags.TEST_SESSION_ID));
-    assertFalse(deserializedMeta.containsKey(Tags.TEST_MODULE_ID));
-    assertFalse(deserializedMeta.containsKey(Tags.TEST_SUITE_ID));
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> whenASpanIsWritten(TraceGenerator.PojoSpan span) {
-    List<TraceGenerator.PojoSpan> trace = Collections.singletonList(span);
-
-    CiVisibilityWellKnownTags wellKnownTags =
-        new CiVisibilityWellKnownTags(
-            "runtimeid",
-            "my-env",
-            "language",
-            "my-runtime-name",
-            "my-runtime-version",
-            "my-runtime-vendor",
-            "my-os-arch",
-            "my-os-platform",
-            "my-os-version",
-            "false");
-    CiTestCycleMapperV1 mapper = new CiTestCycleMapperV1(wellKnownTags, false);
-
-    CaptureConsumer consumer = new CaptureConsumer();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(100 << 10, consumer));
-
-    packer.format(trace, mapper);
-    packer.flush();
-
-    ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory());
-    try {
-      return (Map<String, Object>) objectMapper.readValue(consumer.bytes, Object.class);
-    } catch (IOException e) {
-      fail("Failed to deserialize span: " + e.getMessage());
-      return null;
+    @Test
+    void verifyTestModuleEndEventIsWrittenCorrectly() {
+        Map<String, Object> extraTags = new HashMap<>();
+        extraTags.put(Tags.TEST_SESSION_ID, DDTraceId.from(123));
+        extraTags.put(Tags.TEST_MODULE_ID, 456L);
+        TraceGenerator.PojoSpan span = generateRandomSpan(InternalSpanTypes.TEST_MODULE_END, extraTags);
+
+        Map<String, Object> deserializedSpan = whenASpanIsWritten(span);
+
+        verifyTopLevelTags(deserializedSpan, DDTraceId.from(123), 456L, null);
+
+        Map<String, Object> spanContent = getContent(deserializedSpan);
+        assertFalse(spanContent.containsKey("trace_id"));
+        assertFalse(spanContent.containsKey("span_id"));
+        assertFalse(spanContent.containsKey("parent_id"));
     }
-  }
 
-  private static String repeat(String s, int count) {
-    StringBuilder sb = new StringBuilder(s.length() * count);
-    for (int i = 0; i < count; i++) {
-      sb.append(s);
+    @Test
+    void verifyResultIsNotAffectedBySuccessiveMappingCalls() {
+        Map<String, Object> extraTags = new HashMap<>();
+        extraTags.put(Tags.TEST_SESSION_ID, DDTraceId.from(123));
+        extraTags.put(Tags.TEST_MODULE_ID, 456L);
+        extraTags.put(Tags.TEST_SUITE_ID, 789L);
+        TraceGenerator.PojoSpan span = generateRandomSpan(InternalSpanTypes.TEST, extraTags);
+
+        whenASpanIsWritten(span);
+        Map<String, Object> deserializedSpan = whenASpanIsWritten(span);
+
+        verifyTopLevelTags(deserializedSpan, DDTraceId.from(123), 456L, 789L);
+
+        Map<String, Object> spanContent = getContent(deserializedSpan);
+        assertTrue(spanContent.containsKey("trace_id"));
+        assertTrue(spanContent.containsKey("span_id"));
+        assertTrue(spanContent.containsKey("parent_id"));
     }
-    return sb.toString();
-  }
-
-  private static void assertEqualsWithNullAsEmpty(CharSequence expected, CharSequence actual) {
-    if (null == expected) {
-      assertEquals("", actual);
-    } else {
-      assertEquals(expected.toString(), actual.toString());
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> getContent(Map<String, Object> deserializedSpan) {
+        return (Map<String, Object>) deserializedSpan.get("content");
     }
-  }
 
-  private static final class CaptureConsumer implements ByteBufferConsumer {
-    private byte[] bytes;
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> getMetrics(Map<String, Object> spanContent) {
+        return (Map<String, Object>) spanContent.get("metrics");
+    }
 
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {
-      this.bytes = new byte[buffer.limit() - buffer.position()];
-      buffer.get(bytes);
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> getMeta(Map<String, Object> spanContent) {
+        return (Map<String, Object>) spanContent.get("meta");
     }
-  }
 
-  private static final class PayloadVerifier implements ByteBufferConsumer, WritableByteChannel {
+    private static void verifyTopLevelTags(
+            Map<String, Object> deserializedSpan, DDTraceId testSessionId, Long testModuleId, Long testSuiteId) {
+        Map<String, Object> spanContent = getContent(deserializedSpan);
+        Map<String, Object> deserializedMetrics = getMetrics(spanContent);
+        Map<String, Object> deserializedMeta = getMeta(spanContent);
 
-    private final List<List<TraceGenerator.PojoSpan>> expectedTraces;
-    private final CiTestCycleMapperV1 mapper;
-    private final CiVisibilityWellKnownTags wellKnownTags;
-    private ByteBuffer captured = ByteBuffer.allocate(200 << 10);
+        if (testSessionId != null) {
+            assertEquals(testSessionId.toLong(), ((Number) spanContent.get(Tags.TEST_SESSION_ID)).longValue());
+        } else {
+            assertFalse(spanContent.containsKey(Tags.TEST_SESSION_ID));
+        }
+
+        if (testModuleId != null) {
+            assertEquals(testModuleId.longValue(), ((Number) spanContent.get(Tags.TEST_MODULE_ID)).longValue());
+        } else {
+            assertFalse(spanContent.containsKey(Tags.TEST_MODULE_ID));
+        }
 
-    private int position = 0;
+        if (testSuiteId != null) {
+            assertEquals(testSuiteId.longValue(), ((Number) spanContent.get(Tags.TEST_SUITE_ID)).longValue());
+        } else {
+            assertFalse(spanContent.containsKey(Tags.TEST_SUITE_ID));
+        }
+
+        assertFalse(deserializedMetrics.containsKey(Tags.TEST_SESSION_ID));
+        assertFalse(deserializedMetrics.containsKey(Tags.TEST_MODULE_ID));
+        assertFalse(deserializedMetrics.containsKey(Tags.TEST_SUITE_ID));
 
-    private PayloadVerifier(
-        CiVisibilityWellKnownTags wellKnownTags,
-        List<List<TraceGenerator.PojoSpan>> traces,
-        CiTestCycleMapperV1 mapper) {
-      this.expectedTraces = traces;
-      this.mapper = mapper;
-      this.wellKnownTags = wellKnownTags;
+        assertFalse(deserializedMeta.containsKey(Tags.TEST_SESSION_ID));
+        assertFalse(deserializedMeta.containsKey(Tags.TEST_MODULE_ID));
+        assertFalse(deserializedMeta.containsKey(Tags.TEST_SUITE_ID));
     }
 
-    void skipLargeTrace() {
-      ++position;
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> whenASpanIsWritten(TraceGenerator.PojoSpan span) {
+        List<TraceGenerator.PojoSpan> trace = Collections.singletonList(span);
+
+        CiVisibilityWellKnownTags wellKnownTags = new CiVisibilityWellKnownTags(
+                "runtimeid",
+                "my-env",
+                "language",
+                "my-runtime-name",
+                "my-runtime-version",
+                "my-runtime-vendor",
+                "my-os-arch",
+                "my-os-platform",
+                "my-os-version",
+                "false");
+        CiTestCycleMapperV1 mapper = new CiTestCycleMapperV1(wellKnownTags, false);
+
+        CaptureConsumer consumer = new CaptureConsumer();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(100 << 10, consumer));
+
+        packer.format(trace, mapper);
+        packer.flush();
+
+        ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory());
+        try {
+            return (Map<String, Object>) objectMapper.readValue(consumer.bytes, Object.class);
+        } catch (IOException e) {
+            fail("Failed to deserialize span: " + e.getMessage());
+            return null;
+        }
     }
 
-    void verifyTracesConsumed() {
-      assertEquals(expectedTraces.size(), position);
+    private static String repeat(String s, int count) {
+        StringBuilder sb = new StringBuilder(s.length() * count);
+        for (int i = 0; i < count; i++) {
+            sb.append(s);
+        }
+        return sb.toString();
     }
 
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {
-      if (expectedTraces.isEmpty() && messageCount == 0) {
-        return;
-      }
-
-      try {
-        Payload payload = mapper.newPayload().withBody(messageCount, buffer);
-        payload.writeTo(this);
-        captured.flip();
-        assertNotNull(payload.toRequest());
-        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(captured);
-        assertEquals(3, unpacker.unpackMapHeader());
-        assertEquals("version", unpacker.unpackString());
-        assertEquals(1, unpacker.unpackInt());
-        assertEquals("metadata", unpacker.unpackString());
-        assertEquals(1, unpacker.unpackMapHeader());
-        assertEquals("*", unpacker.unpackString());
-
-        assertEquals(10, unpacker.unpackMapHeader());
-        assertEquals("env", unpacker.unpackString());
-        assertEquals(
-            truncate(wellKnownTags.getEnv().toString(), MAX_META_STRING_VALUE_LENGTH),
-            unpacker.unpackString());
-        assertEquals("runtime-id", unpacker.unpackString());
-        assertEquals(
-            truncate(wellKnownTags.getRuntimeId().toString(), MAX_META_STRING_VALUE_LENGTH),
-            unpacker.unpackString());
-        assertEquals("language", unpacker.unpackString());
-        assertEquals(
-            truncate(wellKnownTags.getLanguage().toString(), MAX_META_STRING_VALUE_LENGTH),
-            unpacker.unpackString());
-        assertEquals(Tags.RUNTIME_NAME, unpacker.unpackString());
-        assertEquals(
-            truncate(wellKnownTags.getRuntimeName().toString(), MAX_META_STRING_VALUE_LENGTH),
-            unpacker.unpackString());
-        assertEquals(Tags.RUNTIME_VENDOR, unpacker.unpackString());
-        assertEquals(
-            truncate(wellKnownTags.getRuntimeVendor().toString(), MAX_META_STRING_VALUE_LENGTH),
-            unpacker.unpackString());
-        assertEquals(Tags.RUNTIME_VERSION, unpacker.unpackString());
-        assertEquals(
-            truncate(wellKnownTags.getRuntimeVersion().toString(), MAX_META_STRING_VALUE_LENGTH),
-            unpacker.unpackString());
-        assertEquals(Tags.OS_ARCHITECTURE, unpacker.unpackString());
-        assertEquals(
-            truncate(wellKnownTags.getOsArch().toString(), MAX_META_STRING_VALUE_LENGTH),
-            unpacker.unpackString());
-        assertEquals(Tags.OS_PLATFORM, unpacker.unpackString());
-        assertEquals(
-            truncate(wellKnownTags.getOsPlatform().toString(), MAX_META_STRING_VALUE_LENGTH),
-            unpacker.unpackString());
-        assertEquals(Tags.OS_VERSION, unpacker.unpackString());
-        assertEquals(
-            truncate(wellKnownTags.getOsVersion().toString(), MAX_META_STRING_VALUE_LENGTH),
-            unpacker.unpackString());
-        assertEquals(DDTags.TEST_IS_USER_PROVIDED_SERVICE, unpacker.unpackString());
-        assertEquals(
-            truncate(
-                wellKnownTags.getIsUserProvidedService().toString(), MAX_META_STRING_VALUE_LENGTH),
-            unpacker.unpackString());
-
-        assertEquals("events", unpacker.unpackString());
-
-        List<TraceGenerator.PojoSpan> expectedTrace = expectedTraces.get(position++);
-        int eventCount = unpacker.unpackArrayHeader();
-        while (expectedTrace.size() < eventCount) {
-          expectedTrace.addAll(expectedTraces.get(position++));
+    private static void assertEqualsWithNullAsEmpty(CharSequence expected, CharSequence actual) {
+        if (null == expected) {
+            assertEquals("", actual);
+        } else {
+            assertEquals(expected.toString(), actual.toString());
         }
-        assertEquals(expectedTrace.size(), eventCount);
-        for (int k = 0; k < eventCount; ++k) {
-          TraceGenerator.PojoSpan expectedSpan = expectedTrace.get(k);
-          assertEquals(3, unpacker.unpackMapHeader());
-          assertEquals("type", unpacker.unpackString());
-          if ("test".equals(String.valueOf(expectedSpan.getType()))) {
-            assertEquals("test", unpacker.unpackString());
-          } else {
-            assertEquals("span", unpacker.unpackString());
-          }
-          assertEquals("version", unpacker.unpackString());
-          assertEquals(1, unpacker.unpackInt());
-          assertEquals("content", unpacker.unpackString());
-          assertEquals(11, unpacker.unpackMapHeader());
-          assertEquals("trace_id", unpacker.unpackString());
-          long traceId = unpacker.unpackValue().asNumberValue().toLong();
-          assertEquals(expectedSpan.getTraceId().toLong(), traceId);
-          assertEquals("span_id", unpacker.unpackString());
-          long spanId = unpacker.unpackValue().asNumberValue().toLong();
-          assertEquals(expectedSpan.getSpanId(), spanId);
-          assertEquals("parent_id", unpacker.unpackString());
-          long parentId = unpacker.unpackValue().asNumberValue().toLong();
-          assertEquals(expectedSpan.getParentId(), parentId);
-          assertEquals("service", unpacker.unpackString());
-          String serviceName = unpacker.unpackString();
-          assertEqualsWithNullAsEmpty(expectedSpan.getServiceName(), serviceName);
-          assertEquals("name", unpacker.unpackString());
-          String operationName = unpacker.unpackString();
-          assertEqualsWithNullAsEmpty(expectedSpan.getOperationName(), operationName);
-          assertEquals("resource", unpacker.unpackString());
-          String resourceName = unpacker.unpackString();
-          assertEqualsWithNullAsEmpty(expectedSpan.getResourceName(), resourceName);
-
-          assertEquals("start", unpacker.unpackString());
-          long startTime = unpacker.unpackLong();
-          assertEquals(expectedSpan.getStartTime(), startTime);
-          assertEquals("duration", unpacker.unpackString());
-          long duration = unpacker.unpackLong();
-          assertEquals(expectedSpan.getDurationNano(), duration);
-          assertEquals("error", unpacker.unpackString());
-          int error = unpacker.unpackInt();
-          assertEquals(expectedSpan.getError(), error);
-          assertEquals("metrics", unpacker.unpackString());
-          int metricsSize = unpacker.unpackMapHeader();
-          HashMap<String, Number> metrics = new HashMap<>();
-          for (int j = 0; j < metricsSize; ++j) {
-            String key = unpacker.unpackString();
-            Number n = null;
-            MessageFormat format = unpacker.getNextFormat();
-            if (format == NEGFIXINT
-                || format == POSFIXINT
-                || format == INT8
-                || format == UINT8
-                || format == INT16
-                || format == UINT16
-                || format == INT32
-                || format == UINT32) {
-              n = unpacker.unpackInt();
-            } else if (format == INT64 || format == UINT64) {
-              n = unpacker.unpackLong();
-            } else if (format == FLOAT32) {
-              n = unpacker.unpackFloat();
-            } else if (format == FLOAT64) {
-              n = unpacker.unpackDouble();
-            } else {
-              fail("Unexpected type in metrics values: " + format);
-            }
-            if (DD_MEASURED.toString().equals(key)) {
-              assertTrue(
-                  (n != null && n.intValue() == 1 && expectedSpan.isMeasured())
-                      || !expectedSpan.isMeasured());
-            } else if (DDSpanContext.PRIORITY_SAMPLING_KEY.equals(key)) {
-              // check that priority sampling is only on first and last span
-              if (k == 0 || k == eventCount - 1) {
-                assertEquals(expectedSpan.samplingPriority(), n.intValue());
-              } else {
-                assertFalse(expectedSpan.hasSamplingPriority());
-              }
-            } else {
-              metrics.put(key, n);
+    }
+
+    private static final class CaptureConsumer implements ByteBufferConsumer {
+        private byte[] bytes;
+
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {
+            this.bytes = new byte[buffer.limit() - buffer.position()];
+            buffer.get(bytes);
+        }
+    }
+
+    private static final class PayloadVerifier implements ByteBufferConsumer, WritableByteChannel {
+
+        private final List<List<TraceGenerator.PojoSpan>> expectedTraces;
+        private final CiTestCycleMapperV1 mapper;
+        private final CiVisibilityWellKnownTags wellKnownTags;
+        private ByteBuffer captured = ByteBuffer.allocate(200 << 10);
+
+        private int position = 0;
+
+        private PayloadVerifier(
+                CiVisibilityWellKnownTags wellKnownTags,
+                List<List<TraceGenerator.PojoSpan>> traces,
+                CiTestCycleMapperV1 mapper) {
+            this.expectedTraces = traces;
+            this.mapper = mapper;
+            this.wellKnownTags = wellKnownTags;
+        }
+
+        void skipLargeTrace() {
+            ++position;
+        }
+
+        void verifyTracesConsumed() {
+            assertEquals(expectedTraces.size(), position);
+        }
+
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {
+            if (expectedTraces.isEmpty() && messageCount == 0) {
+                return;
             }
-          }
-          for (Map.Entry<String, Number> metric : metrics.entrySet()) {
-            if (metric.getValue() instanceof Double || metric.getValue() instanceof Float) {
-              assertEquals(
-                  ((Number) expectedSpan.getTag(metric.getKey())).doubleValue(),
-                  metric.getValue().doubleValue(),
-                  0.001);
-            } else {
-              assertEquals(expectedSpan.getTag(metric.getKey()), metric.getValue());
+
+            try {
+                Payload payload = mapper.newPayload().withBody(messageCount, buffer);
+                payload.writeTo(this);
+                captured.flip();
+                assertNotNull(payload.toRequest());
+                MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(captured);
+                assertEquals(3, unpacker.unpackMapHeader());
+                assertEquals("version", unpacker.unpackString());
+                assertEquals(1, unpacker.unpackInt());
+                assertEquals("metadata", unpacker.unpackString());
+                assertEquals(1, unpacker.unpackMapHeader());
+                assertEquals("*", unpacker.unpackString());
+
+                assertEquals(10, unpacker.unpackMapHeader());
+                assertEquals("env", unpacker.unpackString());
+                assertEquals(
+                        truncate(wellKnownTags.getEnv().toString(), MAX_META_STRING_VALUE_LENGTH),
+                        unpacker.unpackString());
+                assertEquals("runtime-id", unpacker.unpackString());
+                assertEquals(
+                        truncate(wellKnownTags.getRuntimeId().toString(), MAX_META_STRING_VALUE_LENGTH),
+                        unpacker.unpackString());
+                assertEquals("language", unpacker.unpackString());
+                assertEquals(
+                        truncate(wellKnownTags.getLanguage().toString(), MAX_META_STRING_VALUE_LENGTH),
+                        unpacker.unpackString());
+                assertEquals(Tags.RUNTIME_NAME, unpacker.unpackString());
+                assertEquals(
+                        truncate(wellKnownTags.getRuntimeName().toString(), MAX_META_STRING_VALUE_LENGTH),
+                        unpacker.unpackString());
+                assertEquals(Tags.RUNTIME_VENDOR, unpacker.unpackString());
+                assertEquals(
+                        truncate(wellKnownTags.getRuntimeVendor().toString(), MAX_META_STRING_VALUE_LENGTH),
+                        unpacker.unpackString());
+                assertEquals(Tags.RUNTIME_VERSION, unpacker.unpackString());
+                assertEquals(
+                        truncate(wellKnownTags.getRuntimeVersion().toString(), MAX_META_STRING_VALUE_LENGTH),
+                        unpacker.unpackString());
+                assertEquals(Tags.OS_ARCHITECTURE, unpacker.unpackString());
+                assertEquals(
+                        truncate(wellKnownTags.getOsArch().toString(), MAX_META_STRING_VALUE_LENGTH),
+                        unpacker.unpackString());
+                assertEquals(Tags.OS_PLATFORM, unpacker.unpackString());
+                assertEquals(
+                        truncate(wellKnownTags.getOsPlatform().toString(), MAX_META_STRING_VALUE_LENGTH),
+                        unpacker.unpackString());
+                assertEquals(Tags.OS_VERSION, unpacker.unpackString());
+                assertEquals(
+                        truncate(wellKnownTags.getOsVersion().toString(), MAX_META_STRING_VALUE_LENGTH),
+                        unpacker.unpackString());
+                assertEquals(DDTags.TEST_IS_USER_PROVIDED_SERVICE, unpacker.unpackString());
+                assertEquals(
+                        truncate(wellKnownTags.getIsUserProvidedService().toString(), MAX_META_STRING_VALUE_LENGTH),
+                        unpacker.unpackString());
+
+                assertEquals("events", unpacker.unpackString());
+
+                List<TraceGenerator.PojoSpan> expectedTrace = expectedTraces.get(position++);
+                int eventCount = unpacker.unpackArrayHeader();
+                while (expectedTrace.size() < eventCount) {
+                    expectedTrace.addAll(expectedTraces.get(position++));
+                }
+                assertEquals(expectedTrace.size(), eventCount);
+                for (int k = 0; k < eventCount; ++k) {
+                    TraceGenerator.PojoSpan expectedSpan = expectedTrace.get(k);
+                    assertEquals(3, unpacker.unpackMapHeader());
+                    assertEquals("type", unpacker.unpackString());
+                    if ("test".equals(String.valueOf(expectedSpan.getType()))) {
+                        assertEquals("test", unpacker.unpackString());
+                    } else {
+                        assertEquals("span", unpacker.unpackString());
+                    }
+                    assertEquals("version", unpacker.unpackString());
+                    assertEquals(1, unpacker.unpackInt());
+                    assertEquals("content", unpacker.unpackString());
+                    assertEquals(11, unpacker.unpackMapHeader());
+                    assertEquals("trace_id", unpacker.unpackString());
+                    long traceId = unpacker.unpackValue().asNumberValue().toLong();
+                    assertEquals(expectedSpan.getTraceId().toLong(), traceId);
+                    assertEquals("span_id", unpacker.unpackString());
+                    long spanId = unpacker.unpackValue().asNumberValue().toLong();
+                    assertEquals(expectedSpan.getSpanId(), spanId);
+                    assertEquals("parent_id", unpacker.unpackString());
+                    long parentId = unpacker.unpackValue().asNumberValue().toLong();
+                    assertEquals(expectedSpan.getParentId(), parentId);
+                    assertEquals("service", unpacker.unpackString());
+                    String serviceName = unpacker.unpackString();
+                    assertEqualsWithNullAsEmpty(expectedSpan.getServiceName(), serviceName);
+                    assertEquals("name", unpacker.unpackString());
+                    String operationName = unpacker.unpackString();
+                    assertEqualsWithNullAsEmpty(expectedSpan.getOperationName(), operationName);
+                    assertEquals("resource", unpacker.unpackString());
+                    String resourceName = unpacker.unpackString();
+                    assertEqualsWithNullAsEmpty(expectedSpan.getResourceName(), resourceName);
+
+                    assertEquals("start", unpacker.unpackString());
+                    long startTime = unpacker.unpackLong();
+                    assertEquals(expectedSpan.getStartTime(), startTime);
+                    assertEquals("duration", unpacker.unpackString());
+                    long duration = unpacker.unpackLong();
+                    assertEquals(expectedSpan.getDurationNano(), duration);
+                    assertEquals("error", unpacker.unpackString());
+                    int error = unpacker.unpackInt();
+                    assertEquals(expectedSpan.getError(), error);
+                    assertEquals("metrics", unpacker.unpackString());
+                    int metricsSize = unpacker.unpackMapHeader();
+                    HashMap<String, Number> metrics = new HashMap<>();
+                    for (int j = 0; j < metricsSize; ++j) {
+                        String key = unpacker.unpackString();
+                        Number n = null;
+                        MessageFormat format = unpacker.getNextFormat();
+                        if (format == NEGFIXINT
+                                || format == POSFIXINT
+                                || format == INT8
+                                || format == UINT8
+                                || format == INT16
+                                || format == UINT16
+                                || format == INT32
+                                || format == UINT32) {
+                            n = unpacker.unpackInt();
+                        } else if (format == INT64 || format == UINT64) {
+                            n = unpacker.unpackLong();
+                        } else if (format == FLOAT32) {
+                            n = unpacker.unpackFloat();
+                        } else if (format == FLOAT64) {
+                            n = unpacker.unpackDouble();
+                        } else {
+                            fail("Unexpected type in metrics values: " + format);
+                        }
+                        if (DD_MEASURED.toString().equals(key)) {
+                            assertTrue((n != null && n.intValue() == 1 && expectedSpan.isMeasured())
+                                    || !expectedSpan.isMeasured());
+                        } else if (DDSpanContext.PRIORITY_SAMPLING_KEY.equals(key)) {
+                            // check that priority sampling is only on first and last span
+                            if (k == 0 || k == eventCount - 1) {
+                                assertEquals(expectedSpan.samplingPriority(), n.intValue());
+                            } else {
+                                assertFalse(expectedSpan.hasSamplingPriority());
+                            }
+                        } else {
+                            metrics.put(key, n);
+                        }
+                    }
+                    for (Map.Entry<String, Number> metric : metrics.entrySet()) {
+                        if (metric.getValue() instanceof Double || metric.getValue() instanceof Float) {
+                            assertEquals(
+                                    ((Number) expectedSpan.getTag(metric.getKey())).doubleValue(),
+                                    metric.getValue().doubleValue(),
+                                    0.001);
+                        } else {
+                            assertEquals(expectedSpan.getTag(metric.getKey()), metric.getValue());
+                        }
+                    }
+                    assertEquals("meta", unpacker.unpackString());
+                    int metaSize = unpacker.unpackMapHeader();
+                    HashMap<String, String> meta = new HashMap<>();
+                    for (int j = 0; j < metaSize; ++j) {
+                        meta.put(unpacker.unpackString(), unpacker.unpackString());
+                    }
+                    for (Map.Entry<String, String> entry : meta.entrySet()) {
+                        if (Tags.HTTP_STATUS.equals(entry.getKey())) {
+                            assertEquals(String.valueOf(expectedSpan.getHttpStatusCode()), entry.getValue());
+                        } else {
+                            Object tag = expectedSpan.getTag(entry.getKey());
+                            if (null != tag) {
+                                assertEquals(String.valueOf(tag), entry.getValue());
+                            } else {
+                                assertEquals(expectedSpan.getBaggage().get(entry.getKey()), entry.getValue());
+                            }
+                        }
+                    }
+                }
+            } catch (IOException e) {
+                fail(e.getMessage());
+            } finally {
+                mapper.reset();
+                captured.position(0);
+                captured.limit(captured.capacity());
             }
-          }
-          assertEquals("meta", unpacker.unpackString());
-          int metaSize = unpacker.unpackMapHeader();
-          HashMap<String, String> meta = new HashMap<>();
-          for (int j = 0; j < metaSize; ++j) {
-            meta.put(unpacker.unpackString(), unpacker.unpackString());
-          }
-          for (Map.Entry<String, String> entry : meta.entrySet()) {
-            if (Tags.HTTP_STATUS.equals(entry.getKey())) {
-              assertEquals(String.valueOf(expectedSpan.getHttpStatusCode()), entry.getValue());
-            } else {
-              Object tag = expectedSpan.getTag(entry.getKey());
-              if (null != tag) {
-                assertEquals(String.valueOf(tag), entry.getValue());
-              } else {
-                assertEquals(expectedSpan.getBaggage().get(entry.getKey()), entry.getValue());
-              }
+        }
+
+        @Override
+        public int write(ByteBuffer src) throws IOException {
+            if (captured.remaining() < src.remaining()) {
+                ByteBuffer newBuffer = ByteBuffer.allocate(captured.capacity() + src.capacity());
+                captured.flip();
+                newBuffer.put(captured);
+                captured = newBuffer;
+                return write(src);
             }
-          }
+            captured.put(src);
+            return src.position();
         }
-      } catch (IOException e) {
-        fail(e.getMessage());
-      } finally {
-        mapper.reset();
-        captured.position(0);
-        captured.limit(captured.capacity());
-      }
-    }
 
-    @Override
-    public int write(ByteBuffer src) throws IOException {
-      if (captured.remaining() < src.remaining()) {
-        ByteBuffer newBuffer = ByteBuffer.allocate(captured.capacity() + src.capacity());
-        captured.flip();
-        newBuffer.put(captured);
-        captured = newBuffer;
-        return write(src);
-      }
-      captured.put(src);
-      return src.position();
-    }
+        @Override
+        public boolean isOpen() {
+            return true;
+        }
 
-    @Override
-    public boolean isOpen() {
-      return true;
+        @Override
+        public void close() throws IOException {}
     }
-
-    @Override
-    public void close() throws IOException {}
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/AdditionalTagsSchemaTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/AdditionalTagsSchemaTest.java
index 65ebf357055..1d5ca82d397 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/AdditionalTagsSchemaTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/AdditionalTagsSchemaTest.java
@@ -17,214 +17,210 @@
 
 class AdditionalTagsSchemaTest {
 
-  @Test
-  void emptyConfigReturnsSharedEmptySchema() {
-    assertSame(AdditionalTagsSchema.EMPTY, AdditionalTagsSchema.from(null));
-    assertSame(AdditionalTagsSchema.EMPTY, AdditionalTagsSchema.from(Collections.emptySet()));
-  }
-
-  @Test
-  void schemaSortsKeysAlphabetically() {
-    AdditionalTagsSchema schema =
-        AdditionalTagsSchema.from(new LinkedHashSet<>(Arrays.asList("region", "tenant_id", "az")));
-    assertArrayEquals(new String[] {"az", "region", "tenant_id"}, schema.names);
-  }
-
-  @Test
-  void schemaSortsAndCapsAtMaxTagKeys() {
-    LinkedHashSet<String> configured = new LinkedHashSet<>();
-    // 6 distinct keys, more than MAX_ADDITIONAL_TAG_KEYS (4). Sort alphabetically, drop the last 2.
-    for (int i = 0; i < 6; i++) {
-      configured.add(String.format("tag%02d", i));
-    }
-    AdditionalTagsSchema schema = AdditionalTagsSchema.from(configured);
-    assertEquals(AdditionalTagsSchema.MAX_ADDITIONAL_TAG_KEYS, schema.size());
-    assertArrayEquals(new String[] {"tag00", "tag01", "tag02", "tag03"}, schema.names);
-  }
-
-  @Test
-  void rejectsEmptyAndColonContainingKeys() {
-    AdditionalTagsSchema schema =
-        AdditionalTagsSchema.from(
-            new LinkedHashSet<>(Arrays.asList("region", "", "bad:key", "tenant_id")));
-    // Empty key and "bad:key" are dropped; only the two valid keys remain.
-    assertArrayEquals(new String[] {"region", "tenant_id"}, schema.names);
-  }
-
-  @Test
-  void allInvalidKeysReturnsEmptySchema() {
-    AdditionalTagsSchema schema =
-        AdditionalTagsSchema.from(new LinkedHashSet<>(Arrays.asList("", "also:bad")));
-    assertSame(AdditionalTagsSchema.EMPTY, schema);
-  }
-
-  @Test
-  void emptySchemaHasZeroSize() {
-    AdditionalTagsSchema schema = AdditionalTagsSchema.EMPTY;
-    assertEquals(0, schema.size());
-    assertTrue(schema.names.length == 0);
-  }
-
-  @Test
-  void perKeyCardinalityBudgetsAreIndependent() {
-    // Two configured keys, cardinality limit 1 each. Exhausting one key's budget must neither
-    // consume nor block the other's -- each key gets its own TagCardinalityHandler.
-    AdditionalTagsSchema schema =
-        AdditionalTagsSchema.from(
-            new LinkedHashSet<>(Arrays.asList("region", "tenant_id")), 1, true);
-    int region = indexOf(schema, "region");
-    int tenant = indexOf(schema, "tenant_id");
-
-    // region: first value fits, second collapses to the blocked sentinel.
-    assertEquals("region:us-east-1", schema.register(region, "us-east-1").toString());
-    assertEquals("region:tracer_blocked_value", schema.register(region, "eu-west-1").toString());
-
-    // tenant_id is untouched by region's exhaustion: its first value still flows through, and its
-    // own budget collapses only its own second value.
-    assertEquals("tenant_id:acme-corp", schema.register(tenant, "acme-corp").toString());
-    assertEquals("tenant_id:tracer_blocked_value", schema.register(tenant, "globex").toString());
-  }
-
-  @Test
-  void resetHandlersReportsCardinalityCollapseUnderFieldName() {
-    // Cardinality-collapsed values surface as the health-metric tag
-    // "collapsed:additional_metric_tags"
-    // -- the lowercased protobuf field name, not the individual tag key -- per the approved
-    // Cardinality Limits RFC.
-    AdditionalTagsSchema schema =
-        AdditionalTagsSchema.from(Collections.singleton("region"), 1, true);
-    int region = indexOf(schema, "region");
-    schema.register(region, "us-east-1"); // within budget
-    schema.register(region, "eu-west-1"); // collapsed (cardinality)
-    schema.register(region, "ap-south-1"); // collapsed (cardinality)
-
-    HealthMetrics metrics = mock(HealthMetrics.class);
-    schema.resetHandlers(metrics, new CardinalityLimitReporter());
-
-    verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:additional_metric_tags"}, 2L);
-    verifyNoMoreInteractions(metrics);
-  }
-
-  @Test
-  void resetHandlersFeedsCollapseCountToTelemetry() {
-    // The reset site also feeds the telemetry counter (independent of the statsd HealthMetrics
-    // sink) under the same "collapsed:additional_metric_tags" reason tag.
-    AdditionalTagsSchema schema =
-        AdditionalTagsSchema.from(Collections.singleton("region"), 1, true);
-    int region = indexOf(schema, "region");
-    schema.register(region, "us-east-1"); // within budget
-    schema.register(region, "eu-west-1"); // collapsed (cardinality)
-    schema.register(region, "ap-south-1"); // collapsed (cardinality)
-
-    // Drain any pre-existing delta so the assertion measures only this reset's contribution.
-    drainTelemetryDelta("collapsed:additional_metric_tags");
-    schema.resetHandlers(mock(HealthMetrics.class), new CardinalityLimitReporter());
-
-    assertEquals(2L, drainTelemetryDelta("collapsed:additional_metric_tags"));
-  }
-
-  /** Reads and resets the telemetry delta for {@code reason}; 0 if no counter exists yet. */
-  private static long drainTelemetryDelta(String reason) {
-    for (StatsMetrics.TaggedCounter counter : StatsMetrics.getInstance().getTaggedCounters()) {
-      if (reason.equals(counter.getTag())) {
-        return counter.getValueAndReset();
-      }
-    }
-    return 0L;
-  }
-
-  @Test
-  void resetHandlersAggregatesCardinalityCollapseAcrossKeysUnderOneFieldTag() {
-    // Two keys each collapse: the field-level health metric sums both under a single
-    // "collapsed:additional_metric_tags" tag rather than emitting per key name.
-    AdditionalTagsSchema schema =
-        AdditionalTagsSchema.from(
-            new LinkedHashSet<>(Arrays.asList("region", "tenant_id")), 1, true);
-    int region = indexOf(schema, "region");
-    int tenant = indexOf(schema, "tenant_id");
-    schema.register(region, "us-east-1"); // within budget
-    schema.register(region, "eu-west-1"); // collapsed
-    schema.register(tenant, "acme-corp"); // within budget
-    schema.register(tenant, "globex"); // collapsed
-
-    HealthMetrics metrics = mock(HealthMetrics.class);
-    schema.resetHandlers(metrics, new CardinalityLimitReporter());
-
-    verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:additional_metric_tags"}, 2L);
-    verifyNoMoreInteractions(metrics);
-  }
-
-  @Test
-  void resetHandlersReportsLengthAndCardinalityCollapsesUnderDistinctTags() {
-    // A single cycle with both a length collapse (oversized) and a cardinality collapse must emit
-    // two distinct health-metric tags: oversized:additional_metric_tags and
-    // collapsed:additional_metric_tags.
-    AdditionalTagsSchema schema =
-        AdditionalTagsSchema.from(Collections.singleton("region"), 1, true);
-    int region = indexOf(schema, "region");
-    schema.register(region, "us-east-1"); // within budget
-    schema.register(region, "eu-west-1"); // collapsed (cardinality)
-    schema.register(region, stringOfLength(201)); // oversized (length)
-
-    HealthMetrics metrics = mock(HealthMetrics.class);
-    schema.resetHandlers(metrics, new CardinalityLimitReporter());
-
-    verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:additional_metric_tags"}, 1L);
-    verify(metrics).onTagCardinalityBlocked(new String[] {"oversized:additional_metric_tags"}, 1L);
-    verifyNoMoreInteractions(metrics);
-  }
-
-  @Test
-  void resetHandlersWithNoBlocksDoesNotCallHealthMetrics() {
-    AdditionalTagsSchema schema =
-        AdditionalTagsSchema.from(Collections.singleton("region"), 4, true);
-    schema.register(indexOf(schema, "region"), "us-east-1");
-
-    HealthMetrics metrics = mock(HealthMetrics.class);
-    schema.resetHandlers(metrics, new CardinalityLimitReporter());
-
-    verifyNoMoreInteractions(metrics);
-  }
-
-  @Test
-  void additionalTagValueAtLengthCapPassesAndOverCapCollapses() {
-    // End-to-end through the shipped wiring: AdditionalTagsSchema builds its handlers with
-    // MetricCardinalityLimits.ADDITIONAL_TAG_MAX_VALUE_LENGTH as the per-value length cap. A value
-    // of exactly the cap passes verbatim; one character longer collapses to the blocked sentinel.
-    // The cardinality budget is generous so only the length branch can block.
-    int cap = MetricCardinalityLimits.ADDITIONAL_TAG_MAX_VALUE_LENGTH;
-    // Pin the shipped magnitude: RFC and dd-trace-dotnet both use 200.
-    assertEquals(200, cap);
-
-    AdditionalTagsSchema schema =
-        AdditionalTagsSchema.from(Collections.singleton("region"), 100, true);
-    int region = indexOf(schema, "region");
-    String atCap = stringOfLength(cap);
-    String overCap = stringOfLength(cap + 1);
-
-    assertEquals("region:" + atCap, schema.register(region, atCap).toString());
-    assertEquals("region:tracer_blocked_value", schema.register(region, overCap).toString());
-
-    // The over-cap value is a length collapse: it surfaces as oversized:additional_metric_tags,
-    // not the cardinality collapsed: tag.
-    HealthMetrics metrics = mock(HealthMetrics.class);
-    schema.resetHandlers(metrics, new CardinalityLimitReporter());
-    verify(metrics).onTagCardinalityBlocked(new String[] {"oversized:additional_metric_tags"}, 1L);
-    verifyNoMoreInteractions(metrics);
-  }
-
-  private static String stringOfLength(int length) {
-    char[] chars = new char[length];
-    Arrays.fill(chars, 'x');
-    return new String(chars);
-  }
-
-  private static int indexOf(AdditionalTagsSchema schema, String name) {
-    for (int i = 0; i < schema.size(); i++) {
-      if (name.equals(schema.name(i))) {
-        return i;
-      }
-    }
-    throw new IllegalArgumentException("no such configured key: " + name);
-  }
+    @Test
+    void emptyConfigReturnsSharedEmptySchema() {
+        assertSame(AdditionalTagsSchema.EMPTY, AdditionalTagsSchema.from(null));
+        assertSame(AdditionalTagsSchema.EMPTY, AdditionalTagsSchema.from(Collections.emptySet()));
+    }
+
+    @Test
+    void schemaSortsKeysAlphabetically() {
+        AdditionalTagsSchema schema =
+                AdditionalTagsSchema.from(new LinkedHashSet<>(Arrays.asList("region", "tenant_id", "az")));
+        assertArrayEquals(new String[] {"az", "region", "tenant_id"}, schema.names);
+    }
+
+    @Test
+    void schemaSortsAndCapsAtMaxTagKeys() {
+        LinkedHashSet<String> configured = new LinkedHashSet<>();
+        // 6 distinct keys, more than MAX_ADDITIONAL_TAG_KEYS (4). Sort alphabetically, drop the last 2.
+        for (int i = 0; i < 6; i++) {
+            configured.add(String.format("tag%02d", i));
+        }
+        AdditionalTagsSchema schema = AdditionalTagsSchema.from(configured);
+        assertEquals(AdditionalTagsSchema.MAX_ADDITIONAL_TAG_KEYS, schema.size());
+        assertArrayEquals(new String[] {"tag00", "tag01", "tag02", "tag03"}, schema.names);
+    }
+
+    @Test
+    void rejectsEmptyAndColonContainingKeys() {
+        AdditionalTagsSchema schema =
+                AdditionalTagsSchema.from(new LinkedHashSet<>(Arrays.asList("region", "", "bad:key", "tenant_id")));
+        // Empty key and "bad:key" are dropped; only the two valid keys remain.
+        assertArrayEquals(new String[] {"region", "tenant_id"}, schema.names);
+    }
+
+    @Test
+    void allInvalidKeysReturnsEmptySchema() {
+        AdditionalTagsSchema schema = AdditionalTagsSchema.from(new LinkedHashSet<>(Arrays.asList("", "also:bad")));
+        assertSame(AdditionalTagsSchema.EMPTY, schema);
+    }
+
+    @Test
+    void emptySchemaHasZeroSize() {
+        AdditionalTagsSchema schema = AdditionalTagsSchema.EMPTY;
+        assertEquals(0, schema.size());
+        assertTrue(schema.names.length == 0);
+    }
+
+    @Test
+    void perKeyCardinalityBudgetsAreIndependent() {
+        // Two configured keys, cardinality limit 1 each. Exhausting one key's budget must neither
+        // consume nor block the other's -- each key gets its own TagCardinalityHandler.
+        AdditionalTagsSchema schema =
+                AdditionalTagsSchema.from(new LinkedHashSet<>(Arrays.asList("region", "tenant_id")), 1, true);
+        int region = indexOf(schema, "region");
+        int tenant = indexOf(schema, "tenant_id");
+
+        // region: first value fits, second collapses to the blocked sentinel.
+        assertEquals("region:us-east-1", schema.register(region, "us-east-1").toString());
+        assertEquals(
+                "region:tracer_blocked_value",
+                schema.register(region, "eu-west-1").toString());
+
+        // tenant_id is untouched by region's exhaustion: its first value still flows through, and its
+        // own budget collapses only its own second value.
+        assertEquals("tenant_id:acme-corp", schema.register(tenant, "acme-corp").toString());
+        assertEquals(
+                "tenant_id:tracer_blocked_value",
+                schema.register(tenant, "globex").toString());
+    }
+
+    @Test
+    void resetHandlersReportsCardinalityCollapseUnderFieldName() {
+        // Cardinality-collapsed values surface as the health-metric tag
+        // "collapsed:additional_metric_tags"
+        // -- the lowercased protobuf field name, not the individual tag key -- per the approved
+        // Cardinality Limits RFC.
+        AdditionalTagsSchema schema = AdditionalTagsSchema.from(Collections.singleton("region"), 1, true);
+        int region = indexOf(schema, "region");
+        schema.register(region, "us-east-1"); // within budget
+        schema.register(region, "eu-west-1"); // collapsed (cardinality)
+        schema.register(region, "ap-south-1"); // collapsed (cardinality)
+
+        HealthMetrics metrics = mock(HealthMetrics.class);
+        schema.resetHandlers(metrics, new CardinalityLimitReporter());
+
+        verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:additional_metric_tags"}, 2L);
+        verifyNoMoreInteractions(metrics);
+    }
+
+    @Test
+    void resetHandlersFeedsCollapseCountToTelemetry() {
+        // The reset site also feeds the telemetry counter (independent of the statsd HealthMetrics
+        // sink) under the same "collapsed:additional_metric_tags" reason tag.
+        AdditionalTagsSchema schema = AdditionalTagsSchema.from(Collections.singleton("region"), 1, true);
+        int region = indexOf(schema, "region");
+        schema.register(region, "us-east-1"); // within budget
+        schema.register(region, "eu-west-1"); // collapsed (cardinality)
+        schema.register(region, "ap-south-1"); // collapsed (cardinality)
+
+        // Drain any pre-existing delta so the assertion measures only this reset's contribution.
+        drainTelemetryDelta("collapsed:additional_metric_tags");
+        schema.resetHandlers(mock(HealthMetrics.class), new CardinalityLimitReporter());
+
+        assertEquals(2L, drainTelemetryDelta("collapsed:additional_metric_tags"));
+    }
+
+    /** Reads and resets the telemetry delta for {@code reason}; 0 if no counter exists yet. */
+    private static long drainTelemetryDelta(String reason) {
+        for (StatsMetrics.TaggedCounter counter : StatsMetrics.getInstance().getTaggedCounters()) {
+            if (reason.equals(counter.getTag())) {
+                return counter.getValueAndReset();
+            }
+        }
+        return 0L;
+    }
+
+    @Test
+    void resetHandlersAggregatesCardinalityCollapseAcrossKeysUnderOneFieldTag() {
+        // Two keys each collapse: the field-level health metric sums both under a single
+        // "collapsed:additional_metric_tags" tag rather than emitting per key name.
+        AdditionalTagsSchema schema =
+                AdditionalTagsSchema.from(new LinkedHashSet<>(Arrays.asList("region", "tenant_id")), 1, true);
+        int region = indexOf(schema, "region");
+        int tenant = indexOf(schema, "tenant_id");
+        schema.register(region, "us-east-1"); // within budget
+        schema.register(region, "eu-west-1"); // collapsed
+        schema.register(tenant, "acme-corp"); // within budget
+        schema.register(tenant, "globex"); // collapsed
+
+        HealthMetrics metrics = mock(HealthMetrics.class);
+        schema.resetHandlers(metrics, new CardinalityLimitReporter());
+
+        verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:additional_metric_tags"}, 2L);
+        verifyNoMoreInteractions(metrics);
+    }
+
+    @Test
+    void resetHandlersReportsLengthAndCardinalityCollapsesUnderDistinctTags() {
+        // A single cycle with both a length collapse (oversized) and a cardinality collapse must emit
+        // two distinct health-metric tags: oversized:additional_metric_tags and
+        // collapsed:additional_metric_tags.
+        AdditionalTagsSchema schema = AdditionalTagsSchema.from(Collections.singleton("region"), 1, true);
+        int region = indexOf(schema, "region");
+        schema.register(region, "us-east-1"); // within budget
+        schema.register(region, "eu-west-1"); // collapsed (cardinality)
+        schema.register(region, stringOfLength(201)); // oversized (length)
+
+        HealthMetrics metrics = mock(HealthMetrics.class);
+        schema.resetHandlers(metrics, new CardinalityLimitReporter());
+
+        verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:additional_metric_tags"}, 1L);
+        verify(metrics).onTagCardinalityBlocked(new String[] {"oversized:additional_metric_tags"}, 1L);
+        verifyNoMoreInteractions(metrics);
+    }
+
+    @Test
+    void resetHandlersWithNoBlocksDoesNotCallHealthMetrics() {
+        AdditionalTagsSchema schema = AdditionalTagsSchema.from(Collections.singleton("region"), 4, true);
+        schema.register(indexOf(schema, "region"), "us-east-1");
+
+        HealthMetrics metrics = mock(HealthMetrics.class);
+        schema.resetHandlers(metrics, new CardinalityLimitReporter());
+
+        verifyNoMoreInteractions(metrics);
+    }
+
+    @Test
+    void additionalTagValueAtLengthCapPassesAndOverCapCollapses() {
+        // End-to-end through the shipped wiring: AdditionalTagsSchema builds its handlers with
+        // MetricCardinalityLimits.ADDITIONAL_TAG_MAX_VALUE_LENGTH as the per-value length cap. A value
+        // of exactly the cap passes verbatim; one character longer collapses to the blocked sentinel.
+        // The cardinality budget is generous so only the length branch can block.
+        int cap = MetricCardinalityLimits.ADDITIONAL_TAG_MAX_VALUE_LENGTH;
+        // Pin the shipped magnitude: RFC and dd-trace-dotnet both use 200.
+        assertEquals(200, cap);
+
+        AdditionalTagsSchema schema = AdditionalTagsSchema.from(Collections.singleton("region"), 100, true);
+        int region = indexOf(schema, "region");
+        String atCap = stringOfLength(cap);
+        String overCap = stringOfLength(cap + 1);
+
+        assertEquals("region:" + atCap, schema.register(region, atCap).toString());
+        assertEquals(
+                "region:tracer_blocked_value", schema.register(region, overCap).toString());
+
+        // The over-cap value is a length collapse: it surfaces as oversized:additional_metric_tags,
+        // not the cardinality collapsed: tag.
+        HealthMetrics metrics = mock(HealthMetrics.class);
+        schema.resetHandlers(metrics, new CardinalityLimitReporter());
+        verify(metrics).onTagCardinalityBlocked(new String[] {"oversized:additional_metric_tags"}, 1L);
+        verifyNoMoreInteractions(metrics);
+    }
+
+    private static String stringOfLength(int length) {
+        char[] chars = new char[length];
+        Arrays.fill(chars, 'x');
+        return new String(chars);
+    }
+
+    private static int indexOf(AdditionalTagsSchema schema, String name) {
+        for (int i = 0; i < schema.size(); i++) {
+            if (name.equals(schema.name(i))) {
+                return i;
+            }
+        }
+        throw new IllegalArgumentException("no such configured key: " + name);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTest.java
index f2fc1d5710d..878f4b48eef 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTest.java
@@ -18,113 +18,98 @@
 
 class AggregateEntryTest {
 
-  @BeforeAll
-  static void initAgentMeter() {
-    // recordOneDuration -> Histogram.accept needs AgentMeter to be initialized.
-    MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
-    AgentMeter.registerIfAbsent(StatsDClient.NO_OP, monitoring, DDSketchHistograms.FACTORY);
-    monitoring.newTimer("test.init");
-  }
+    @BeforeAll
+    static void initAgentMeter() {
+        // recordOneDuration -> Histogram.accept needs AgentMeter to be initialized.
+        MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
+        AgentMeter.registerIfAbsent(StatsDClient.NO_OP, monitoring, DDSketchHistograms.FACTORY);
+        monitoring.newTimer("test.init");
+    }
 
-  @Test
-  void recordOneDurationSumsToTotal() {
-    AggregateEntry entry = newEntry();
-    entry.recordOneDuration(1L);
-    entry.recordOneDuration(2L);
-    entry.recordOneDuration(3L);
-    assertEquals(6, entry.getDuration());
-  }
+    @Test
+    void recordOneDurationSumsToTotal() {
+        AggregateEntry entry = newEntry();
+        entry.recordOneDuration(1L);
+        entry.recordOneDuration(2L);
+        entry.recordOneDuration(3L);
+        assertEquals(6, entry.getDuration());
+    }
 
-  @Test
-  void clearResetsAllCounters() {
-    AggregateEntry entry = newEntry();
-    entry.recordOneDuration(5L);
-    entry.recordOneDuration(ERROR_TAG | 6L);
-    entry.recordOneDuration(TOP_LEVEL_TAG | 7L);
-    entry.clearAggregate();
-    assertEquals(0, entry.getDuration());
-    assertEquals(0, entry.getErrorCount());
-    assertEquals(0, entry.getTopLevelCount());
-    assertEquals(0, entry.getHitCount());
-  }
+    @Test
+    void clearResetsAllCounters() {
+        AggregateEntry entry = newEntry();
+        entry.recordOneDuration(5L);
+        entry.recordOneDuration(ERROR_TAG | 6L);
+        entry.recordOneDuration(TOP_LEVEL_TAG | 7L);
+        entry.clearAggregate();
+        assertEquals(0, entry.getDuration());
+        assertEquals(0, entry.getErrorCount());
+        assertEquals(0, entry.getTopLevelCount());
+        assertEquals(0, entry.getHitCount());
+    }
 
-  @Test
-  void recordOneDurationAccumulatesOkErrorAndTopLevel() {
-    AggregateEntry entry = newEntry();
-    entry.recordOneDuration(10L);
-    entry.recordOneDuration(10L | TOP_LEVEL_TAG);
-    entry.recordOneDuration(10L | ERROR_TAG);
+    @Test
+    void recordOneDurationAccumulatesOkErrorAndTopLevel() {
+        AggregateEntry entry = newEntry();
+        entry.recordOneDuration(10L);
+        entry.recordOneDuration(10L | TOP_LEVEL_TAG);
+        entry.recordOneDuration(10L | ERROR_TAG);
 
-    assertEquals(3, entry.getHitCount());
-    assertEquals(30, entry.getDuration());
-    assertEquals(1, entry.getErrorCount());
-    assertEquals(1, entry.getTopLevelCount());
-  }
+        assertEquals(3, entry.getHitCount());
+        assertEquals(30, entry.getDuration());
+        assertEquals(1, entry.getErrorCount());
+        assertEquals(1, entry.getTopLevelCount());
+    }
 
-  @Test
-  void hitCountIncludesErrors() {
-    AggregateEntry entry = newEntry();
-    entry.recordOneDuration(1L);
-    entry.recordOneDuration(2L);
-    entry.recordOneDuration(3L | ERROR_TAG);
-    assertEquals(3, entry.getHitCount());
-    assertEquals(1, entry.getErrorCount());
-  }
+    @Test
+    void hitCountIncludesErrors() {
+        AggregateEntry entry = newEntry();
+        entry.recordOneDuration(1L);
+        entry.recordOneDuration(2L);
+        entry.recordOneDuration(3L | ERROR_TAG);
+        assertEquals(3, entry.getHitCount());
+        assertEquals(1, entry.getErrorCount());
+    }
 
-  @Test
-  void okAndErrorLatenciesTrackedSeparately() {
-    AggregateEntry entry = newEntry();
-    long[] durations = {
-      1L, 100L | ERROR_TAG, 2L, 99L | ERROR_TAG, 3L, 98L | ERROR_TAG, 4L, 97L | ERROR_TAG
-    };
-    for (long d : durations) {
-      entry.recordOneDuration(d);
+    @Test
+    void okAndErrorLatenciesTrackedSeparately() {
+        AggregateEntry entry = newEntry();
+        long[] durations = {1L, 100L | ERROR_TAG, 2L, 99L | ERROR_TAG, 3L, 98L | ERROR_TAG, 4L, 97L | ERROR_TAG};
+        for (long d : durations) {
+            entry.recordOneDuration(d);
+        }
+        assertTrue(entry.getErrorLatencies().getMaxValue() >= 99);
+        assertTrue(entry.getOkLatencies().getMaxValue() <= 5);
     }
-    assertTrue(entry.getErrorLatencies().getMaxValue() >= 99);
-    assertTrue(entry.getOkLatencies().getMaxValue() <= 5);
-  }
 
-  @Test
-  void absentOptionalFieldsResolveToEmptySentinel() {
-    // serviceSource / httpMethod / httpEndpoint / grpcStatusCode = null on input -> EMPTY on the
-    // entry. EMPTY is the universal "absent" sentinel; SerializingMetricWriter and equality use
-    // identity comparison against it.
-    AggregateEntry entry = newEntry();
-    assertSame(EMPTY, entry.getServiceSource());
-    assertSame(EMPTY, entry.getHttpMethod());
-    assertSame(EMPTY, entry.getHttpEndpoint());
-    assertSame(EMPTY, entry.getGrpcStatusCode());
-  }
+    @Test
+    void absentOptionalFieldsResolveToEmptySentinel() {
+        // serviceSource / httpMethod / httpEndpoint / grpcStatusCode = null on input -> EMPTY on the
+        // entry. EMPTY is the universal "absent" sentinel; SerializingMetricWriter and equality use
+        // identity comparison against it.
+        AggregateEntry entry = newEntry();
+        assertSame(EMPTY, entry.getServiceSource());
+        assertSame(EMPTY, entry.getHttpMethod());
+        assertSame(EMPTY, entry.getHttpEndpoint());
+        assertSame(EMPTY, entry.getGrpcStatusCode());
+    }
 
-  @Test
-  void presentOptionalFieldsCarryTheirValue() {
-    AggregateEntry entry =
-        AggregateEntryTestUtils.of(
-            "resource",
-            "svc",
-            "op",
-            "src",
-            "type",
-            200,
-            false,
-            true,
-            "client",
-            null,
-            "GET",
-            "/api/v1/foo",
-            "0");
-    assertNotSame(EMPTY, entry.getServiceSource());
-    assertNotSame(EMPTY, entry.getHttpMethod());
-    assertNotSame(EMPTY, entry.getHttpEndpoint());
-    assertNotSame(EMPTY, entry.getGrpcStatusCode());
-    assertEquals("src", entry.getServiceSource().toString());
-    assertEquals("GET", entry.getHttpMethod().toString());
-    assertEquals("/api/v1/foo", entry.getHttpEndpoint().toString());
-    assertEquals("0", entry.getGrpcStatusCode().toString());
-  }
+    @Test
+    void presentOptionalFieldsCarryTheirValue() {
+        AggregateEntry entry = AggregateEntryTestUtils.of(
+                "resource", "svc", "op", "src", "type", 200, false, true, "client", null, "GET", "/api/v1/foo", "0");
+        assertNotSame(EMPTY, entry.getServiceSource());
+        assertNotSame(EMPTY, entry.getHttpMethod());
+        assertNotSame(EMPTY, entry.getHttpEndpoint());
+        assertNotSame(EMPTY, entry.getGrpcStatusCode());
+        assertEquals("src", entry.getServiceSource().toString());
+        assertEquals("GET", entry.getHttpMethod().toString());
+        assertEquals("/api/v1/foo", entry.getHttpEndpoint().toString());
+        assertEquals("0", entry.getGrpcStatusCode().toString());
+    }
 
-  private static AggregateEntry newEntry() {
-    return AggregateEntryTestUtils.of(
-        "resource", "svc", "op", null, "type", 200, false, true, "client", null, null, null, null);
-  }
+    private static AggregateEntry newEntry() {
+        return AggregateEntryTestUtils.of(
+                "resource", "svc", "op", null, "type", 200, false, true, "client", null, null, null, null);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTestUtils.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTestUtils.java
index 221d23909d8..33e64a7c155 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTestUtils.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTestUtils.java
@@ -24,169 +24,167 @@
  * folds in the encoded list, so the contract stays consistent.
  */
 public final class AggregateEntryTestUtils {
-  private AggregateEntryTestUtils() {}
+    private AggregateEntryTestUtils() {}
 
-  /**
-   * Builds an {@link AggregateEntry} from positional args. Bypasses the cardinality handlers so
-   * tests can create expected values without mutating shared handler state. Content-equal entries
-   * from {@link AggregateEntry.Canonical#createEntry} still compare equal via {@link
-   * #equals(AggregateEntry, AggregateEntry)}.
-   */
-  public static AggregateEntry of(
-      CharSequence resource,
-      CharSequence service,
-      CharSequence operationName,
-      @Nullable CharSequence serviceSource,
-      CharSequence type,
-      int httpStatusCode,
-      boolean synthetic,
-      boolean traceRoot,
-      CharSequence spanKind,
-      @Nullable List<UTF8BytesString> peerTags,
-      @Nullable CharSequence httpMethod,
-      @Nullable CharSequence httpEndpoint,
-      @Nullable CharSequence grpcStatusCode) {
-    return of(
-        resource,
-        service,
-        operationName,
-        serviceSource,
-        type,
-        httpStatusCode,
-        synthetic,
-        traceRoot,
-        spanKind,
-        peerTags,
-        httpMethod,
-        httpEndpoint,
-        grpcStatusCode,
-        null);
-  }
+    /**
+     * Builds an {@link AggregateEntry} from positional args. Bypasses the cardinality handlers so
+     * tests can create expected values without mutating shared handler state. Content-equal entries
+     * from {@link AggregateEntry.Canonical#createEntry} still compare equal via {@link
+     * #equals(AggregateEntry, AggregateEntry)}.
+     */
+    public static AggregateEntry of(
+            CharSequence resource,
+            CharSequence service,
+            CharSequence operationName,
+            @Nullable CharSequence serviceSource,
+            CharSequence type,
+            int httpStatusCode,
+            boolean synthetic,
+            boolean traceRoot,
+            CharSequence spanKind,
+            @Nullable List<UTF8BytesString> peerTags,
+            @Nullable CharSequence httpMethod,
+            @Nullable CharSequence httpEndpoint,
+            @Nullable CharSequence grpcStatusCode) {
+        return of(
+                resource,
+                service,
+                operationName,
+                serviceSource,
+                type,
+                httpStatusCode,
+                synthetic,
+                traceRoot,
+                spanKind,
+                peerTags,
+                httpMethod,
+                httpEndpoint,
+                grpcStatusCode,
+                null);
+    }
 
-  /**
-   * Same as {@link #of} but also carries pre-packed {@code "key:value"} additional metric tags (in
-   * schema order), letting the OTLP/serializing writer tests exercise the additional-tags path
-   * without driving a full {@code AggregateTable}/{@code AdditionalTagsSchema} canonicalization.
-   */
-  public static AggregateEntry of(
-      CharSequence resource,
-      CharSequence service,
-      CharSequence operationName,
-      @Nullable CharSequence serviceSource,
-      CharSequence type,
-      int httpStatusCode,
-      boolean synthetic,
-      boolean traceRoot,
-      CharSequence spanKind,
-      @Nullable List<UTF8BytesString> peerTags,
-      @Nullable CharSequence httpMethod,
-      @Nullable CharSequence httpEndpoint,
-      @Nullable CharSequence grpcStatusCode,
-      @Nullable UTF8BytesString[] additionalTags) {
-    UTF8BytesString resourceUtf = AggregateEntry.createUtf8(resource);
-    UTF8BytesString serviceUtf = AggregateEntry.createUtf8(service);
-    UTF8BytesString operationNameUtf = AggregateEntry.createUtf8(operationName);
-    UTF8BytesString serviceSourceUtf = AggregateEntry.createUtf8(serviceSource);
-    UTF8BytesString typeUtf = AggregateEntry.createUtf8(type);
-    UTF8BytesString spanKindUtf = AggregateEntry.createUtf8(spanKind);
-    UTF8BytesString httpMethodUtf = AggregateEntry.createUtf8(httpMethod);
-    UTF8BytesString httpEndpointUtf = AggregateEntry.createUtf8(httpEndpoint);
-    UTF8BytesString grpcUtf = AggregateEntry.createUtf8(grpcStatusCode);
-    List<UTF8BytesString> peerTagsList = peerTags == null ? Collections.emptyList() : peerTags;
-    UTF8BytesString[] peerTagsArr = peerTagsList.toArray(new UTF8BytesString[0]);
-    UTF8BytesString[] additionalTagsArr =
-        additionalTags == null ? new UTF8BytesString[0] : additionalTags;
-    long keyHash =
-        AggregateEntry.hashOf(
-            resourceUtf,
-            serviceUtf,
-            operationNameUtf,
-            serviceSourceUtf,
-            typeUtf,
-            spanKindUtf,
-            httpMethodUtf,
-            httpEndpointUtf,
-            grpcUtf,
-            (short) httpStatusCode,
-            synthetic,
-            traceRoot,
-            peerTagsArr,
-            peerTagsArr.length,
-            additionalTagsArr,
-            additionalTagsArr.length);
-    return new AggregateEntry(
-        keyHash,
-        resourceUtf,
-        serviceUtf,
-        operationNameUtf,
-        serviceSourceUtf,
-        typeUtf,
-        spanKindUtf,
-        httpMethodUtf,
-        httpEndpointUtf,
-        grpcUtf,
-        (short) httpStatusCode,
-        synthetic,
-        traceRoot,
-        peerTagsList,
-        additionalTagsArr);
-  }
+    /**
+     * Same as {@link #of} but also carries pre-packed {@code "key:value"} additional metric tags (in
+     * schema order), letting the OTLP/serializing writer tests exercise the additional-tags path
+     * without driving a full {@code AggregateTable}/{@code AdditionalTagsSchema} canonicalization.
+     */
+    public static AggregateEntry of(
+            CharSequence resource,
+            CharSequence service,
+            CharSequence operationName,
+            @Nullable CharSequence serviceSource,
+            CharSequence type,
+            int httpStatusCode,
+            boolean synthetic,
+            boolean traceRoot,
+            CharSequence spanKind,
+            @Nullable List<UTF8BytesString> peerTags,
+            @Nullable CharSequence httpMethod,
+            @Nullable CharSequence httpEndpoint,
+            @Nullable CharSequence grpcStatusCode,
+            @Nullable UTF8BytesString[] additionalTags) {
+        UTF8BytesString resourceUtf = AggregateEntry.createUtf8(resource);
+        UTF8BytesString serviceUtf = AggregateEntry.createUtf8(service);
+        UTF8BytesString operationNameUtf = AggregateEntry.createUtf8(operationName);
+        UTF8BytesString serviceSourceUtf = AggregateEntry.createUtf8(serviceSource);
+        UTF8BytesString typeUtf = AggregateEntry.createUtf8(type);
+        UTF8BytesString spanKindUtf = AggregateEntry.createUtf8(spanKind);
+        UTF8BytesString httpMethodUtf = AggregateEntry.createUtf8(httpMethod);
+        UTF8BytesString httpEndpointUtf = AggregateEntry.createUtf8(httpEndpoint);
+        UTF8BytesString grpcUtf = AggregateEntry.createUtf8(grpcStatusCode);
+        List<UTF8BytesString> peerTagsList = peerTags == null ? Collections.emptyList() : peerTags;
+        UTF8BytesString[] peerTagsArr = peerTagsList.toArray(new UTF8BytesString[0]);
+        UTF8BytesString[] additionalTagsArr = additionalTags == null ? new UTF8BytesString[0] : additionalTags;
+        long keyHash = AggregateEntry.hashOf(
+                resourceUtf,
+                serviceUtf,
+                operationNameUtf,
+                serviceSourceUtf,
+                typeUtf,
+                spanKindUtf,
+                httpMethodUtf,
+                httpEndpointUtf,
+                grpcUtf,
+                (short) httpStatusCode,
+                synthetic,
+                traceRoot,
+                peerTagsArr,
+                peerTagsArr.length,
+                additionalTagsArr,
+                additionalTagsArr.length);
+        return new AggregateEntry(
+                keyHash,
+                resourceUtf,
+                serviceUtf,
+                operationNameUtf,
+                serviceSourceUtf,
+                typeUtf,
+                spanKindUtf,
+                httpMethodUtf,
+                httpEndpointUtf,
+                grpcUtf,
+                (short) httpStatusCode,
+                synthetic,
+                traceRoot,
+                peerTagsList,
+                additionalTagsArr);
+    }
 
-  /**
-   * Records one OK hit of {@code durationNanos} on {@code e}. Exposes the package-private {@link
-   * AggregateEntry#recordOneDuration} to tests in other packages (e.g. the OTLP metrics writer
-   * tests) without widening the production mutation API.
-   */
-  public static AggregateEntry recordOk(AggregateEntry e, long durationNanos) {
-    return e.recordOneDuration(durationNanos);
-  }
+    /**
+     * Records one OK hit of {@code durationNanos} on {@code e}. Exposes the package-private {@link
+     * AggregateEntry#recordOneDuration} to tests in other packages (e.g. the OTLP metrics writer
+     * tests) without widening the production mutation API.
+     */
+    public static AggregateEntry recordOk(AggregateEntry e, long durationNanos) {
+        return e.recordOneDuration(durationNanos);
+    }
 
-  /** Records one error hit of {@code durationNanos} on {@code e}. See {@link #recordOk}. */
-  public static AggregateEntry recordError(AggregateEntry e, long durationNanos) {
-    return e.recordOneDuration(durationNanos | AggregateEntry.ERROR_TAG);
-  }
+    /** Records one error hit of {@code durationNanos} on {@code e}. See {@link #recordOk}. */
+    public static AggregateEntry recordError(AggregateEntry e, long durationNanos) {
+        return e.recordOneDuration(durationNanos | AggregateEntry.ERROR_TAG);
+    }
 
-  /** Records one top-level OK hit of {@code durationNanos} on {@code e}. See {@link #recordOk}. */
-  public static AggregateEntry recordTopLevel(AggregateEntry e, long durationNanos) {
-    return e.recordOneDuration(durationNanos | AggregateEntry.TOP_LEVEL_TAG);
-  }
+    /** Records one top-level OK hit of {@code durationNanos} on {@code e}. See {@link #recordOk}. */
+    public static AggregateEntry recordTopLevel(AggregateEntry e, long durationNanos) {
+        return e.recordOneDuration(durationNanos | AggregateEntry.TOP_LEVEL_TAG);
+    }
 
-  /** Clears the per-cycle counters and histograms on {@code e}. See {@link #recordOk}. */
-  public static void clear(AggregateEntry e) {
-    e.clearAggregate();
-  }
+    /** Clears the per-cycle counters and histograms on {@code e}. See {@link #recordOk}. */
+    public static void clear(AggregateEntry e) {
+        e.clearAggregate();
+    }
 
-  /**
-   * Whether {@code a} and {@code b} carry identical label fields. Counter and histogram state is
-   * intentionally excluded -- this compares the key identity, not the aggregate.
-   */
-  public static boolean equals(AggregateEntry a, AggregateEntry b) {
-    if (a == b) return true;
-    if (a == null || b == null) return false;
-    return a.getHttpStatusCode() == b.getHttpStatusCode()
-        && a.isSynthetics() == b.isSynthetics()
-        && a.isTraceRoot() == b.isTraceRoot()
-        && Objects.equals(a.getResource(), b.getResource())
-        && Objects.equals(a.getService(), b.getService())
-        && Objects.equals(a.getOperationName(), b.getOperationName())
-        && Objects.equals(a.getServiceSource(), b.getServiceSource())
-        && Objects.equals(a.getType(), b.getType())
-        && Objects.equals(a.getSpanKind(), b.getSpanKind())
-        && a.getPeerTags().equals(b.getPeerTags())
-        && Objects.equals(a.getHttpMethod(), b.getHttpMethod())
-        && Objects.equals(a.getHttpEndpoint(), b.getHttpEndpoint())
-        && Objects.equals(a.getGrpcStatusCode(), b.getGrpcStatusCode())
-        // Additional tags are part of the key (folded into keyHash in schema order), so entries
-        // that differ only in additional tags must not compare equal.
-        && Arrays.equals(a.getAdditionalTags(), b.getAdditionalTags());
-  }
+    /**
+     * Whether {@code a} and {@code b} carry identical label fields. Counter and histogram state is
+     * intentionally excluded -- this compares the key identity, not the aggregate.
+     */
+    public static boolean equals(AggregateEntry a, AggregateEntry b) {
+        if (a == b) return true;
+        if (a == null || b == null) return false;
+        return a.getHttpStatusCode() == b.getHttpStatusCode()
+                && a.isSynthetics() == b.isSynthetics()
+                && a.isTraceRoot() == b.isTraceRoot()
+                && Objects.equals(a.getResource(), b.getResource())
+                && Objects.equals(a.getService(), b.getService())
+                && Objects.equals(a.getOperationName(), b.getOperationName())
+                && Objects.equals(a.getServiceSource(), b.getServiceSource())
+                && Objects.equals(a.getType(), b.getType())
+                && Objects.equals(a.getSpanKind(), b.getSpanKind())
+                && a.getPeerTags().equals(b.getPeerTags())
+                && Objects.equals(a.getHttpMethod(), b.getHttpMethod())
+                && Objects.equals(a.getHttpEndpoint(), b.getHttpEndpoint())
+                && Objects.equals(a.getGrpcStatusCode(), b.getGrpcStatusCode())
+                // Additional tags are part of the key (folded into keyHash in schema order), so entries
+                // that differ only in additional tags must not compare equal.
+                && Arrays.equals(a.getAdditionalTags(), b.getAdditionalTags());
+    }
 
-  /**
-   * Stable hash matching {@link #equals(AggregateEntry, AggregateEntry)} -- derived from {@link
-   * AggregateEntry#keyHash}, which {@link AggregateEntry#hashOf} computes from the same fields the
-   * helper's {@code equals} compares.
-   */
-  public static int hashCode(AggregateEntry e) {
-    return e == null ? 0 : (int) e.keyHash;
-  }
+    /**
+     * Stable hash matching {@link #equals(AggregateEntry, AggregateEntry)} -- derived from {@link
+     * AggregateEntry#keyHash}, which {@link AggregateEntry#hashOf} computes from the same fields the
+     * helper's {@code equals} compares.
+     */
+    public static int hashCode(AggregateEntry e) {
+        return e == null ? 0 : (int) e.keyHash;
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateTableAdditionalTagsTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateTableAdditionalTagsTest.java
index 20402a662c5..5ed24d02d81 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateTableAdditionalTagsTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateTableAdditionalTagsTest.java
@@ -17,68 +17,68 @@
 
 class AggregateTableAdditionalTagsTest {
 
-  @BeforeAll
-  static void initAgentMeter() {
-    MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
-    AgentMeter.registerIfAbsent(StatsDClient.NO_OP, monitoring, DDSketchHistograms.FACTORY);
-    monitoring.newTimer("test.init");
-  }
+    @BeforeAll
+    static void initAgentMeter() {
+        MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
+        AgentMeter.registerIfAbsent(StatsDClient.NO_OP, monitoring, DDSketchHistograms.FACTORY);
+        monitoring.newTimer("test.init");
+    }
 
-  @Test
-  void distinctAdditionalTagValuesYieldDistinctEntries() {
-    AdditionalTagsSchema schema = schemaFor("region");
-    AggregateTable table = newTable(schema);
+    @Test
+    void distinctAdditionalTagValuesYieldDistinctEntries() {
+        AdditionalTagsSchema schema = schemaFor("region");
+        AggregateTable table = newTable(schema);
 
-    AggregateEntry usEast = table.findOrInsert(snapshot(schema, "us-east-1"));
-    AggregateEntry euWest = table.findOrInsert(snapshot(schema, "eu-west-1"));
+        AggregateEntry usEast = table.findOrInsert(snapshot(schema, "us-east-1"));
+        AggregateEntry euWest = table.findOrInsert(snapshot(schema, "eu-west-1"));
 
-    assertNotNull(usEast);
-    assertNotNull(euWest);
-    assertNotSame(usEast, euWest);
-    assertEquals(2, table.size());
-  }
+        assertNotNull(usEast);
+        assertNotNull(euWest);
+        assertNotSame(usEast, euWest);
+        assertEquals(2, table.size());
+    }
 
-  @Test
-  void sameAdditionalTagValuesShareEntry() {
-    AdditionalTagsSchema schema = schemaFor("region");
-    AggregateTable table = newTable(schema);
+    @Test
+    void sameAdditionalTagValuesShareEntry() {
+        AdditionalTagsSchema schema = schemaFor("region");
+        AggregateTable table = newTable(schema);
 
-    AggregateEntry first = table.findOrInsert(snapshot(schema, "us-east-1"));
-    AggregateEntry second = table.findOrInsert(snapshot(schema, "us-east-1"));
+        AggregateEntry first = table.findOrInsert(snapshot(schema, "us-east-1"));
+        AggregateEntry second = table.findOrInsert(snapshot(schema, "us-east-1"));
 
-    assertSame(first, second);
-    assertEquals(1, table.size());
-  }
+        assertSame(first, second);
+        assertEquals(1, table.size());
+    }
 
-  // ---------- helpers ----------
+    // ---------- helpers ----------
 
-  private static AdditionalTagsSchema schemaFor(String... names) {
-    return AdditionalTagsSchema.from(new LinkedHashSet<>(Arrays.asList(names)));
-  }
+    private static AdditionalTagsSchema schemaFor(String... names) {
+        return AdditionalTagsSchema.from(new LinkedHashSet<>(Arrays.asList(names)));
+    }
 
-  private static AggregateTable newTable(AdditionalTagsSchema schema) {
-    return new AggregateTable(256, schema);
-  }
+    private static AggregateTable newTable(AdditionalTagsSchema schema) {
+        return new AggregateTable(256, schema);
+    }
 
-  private static SpanSnapshot snapshot(AdditionalTagsSchema schema, String regionValue) {
-    String[] values = new String[schema.size()];
-    values[0] = regionValue;
-    return new SpanSnapshot(
-        "resource",
-        "service",
-        "operation",
-        null,
-        "web",
-        (short) 200,
-        false,
-        true,
-        "client",
-        null,
-        null,
-        null,
-        null,
-        null,
-        values,
-        0L);
-  }
+    private static SpanSnapshot snapshot(AdditionalTagsSchema schema, String regionValue) {
+        String[] values = new String[schema.size()];
+        values[0] = regionValue;
+        return new SpanSnapshot(
+                "resource",
+                "service",
+                "operation",
+                null,
+                "web",
+                (short) 200,
+                false,
+                true,
+                "client",
+                null,
+                null,
+                null,
+                null,
+                null,
+                values,
+                0L);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateTableTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateTableTest.java
index 993ef163591..ac1c7e23ab8 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateTableTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateTableTest.java
@@ -27,372 +27,373 @@
 
 class AggregateTableTest {
 
-  @BeforeAll
-  static void initAgentMeter() {
-    // AggregateEntry.recordOneDuration -> Histogram.accept needs AgentMeter to be initialized.
-    MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
-    AgentMeter.registerIfAbsent(StatsDClient.NO_OP, monitoring, DDSketchHistograms.FACTORY);
-    monitoring.newTimer("test.init");
-  }
-
-  @Test
-  void insertOnMissReturnsNewAggregate() {
-    AggregateTable table = new AggregateTable(8);
-    SpanSnapshot s = snapshot("svc", "op", "client");
-
-    AggregateEntry agg = table.findOrInsert(s);
-
-    assertNotNull(agg);
-    assertEquals(1, table.size());
-    assertEquals(0, agg.getHitCount());
-  }
-
-  @Test
-  void hitReturnsSameAggregateInstance() {
-    AggregateTable table = new AggregateTable(8);
-    SpanSnapshot s1 = snapshot("svc", "op", "client");
-    SpanSnapshot s2 = snapshot("svc", "op", "client");
-
-    AggregateEntry first = table.findOrInsert(s1);
-    AggregateEntry second = table.findOrInsert(s2);
-
-    assertSame(first, second);
-    assertEquals(1, table.size());
-  }
-
-  @Test
-  void differentKindFieldsAreDistinct() {
-    AggregateTable table = new AggregateTable(8);
-
-    AggregateEntry clientAgg = table.findOrInsert(snapshot("svc", "op", "client"));
-    AggregateEntry serverAgg = table.findOrInsert(snapshot("svc", "op", "server"));
-
-    assertNotSame(clientAgg, serverAgg);
-    assertEquals(2, table.size());
-  }
-
-  @Test
-  void peerTagPairsParticipateInIdentity() {
-    AggregateTable table = new AggregateTable(8);
-    SpanSnapshot withTags =
-        builder("svc", "op", "client").peerTags("peer.hostname", "host-a").build();
-    SpanSnapshot otherTags =
-        builder("svc", "op", "client").peerTags("peer.hostname", "host-b").build();
-    SpanSnapshot noTags = builder("svc", "op", "client").build();
-
-    AggregateEntry a = table.findOrInsert(withTags);
-    AggregateEntry b = table.findOrInsert(otherTags);
-    AggregateEntry c = table.findOrInsert(noTags);
-
-    assertNotSame(a, b);
-    assertNotSame(a, c);
-    assertNotSame(b, c);
-    assertEquals(3, table.size());
-  }
-
-  @Test
-  void capOverrunEvictsStaleEntry() {
-    AggregateTable table = new AggregateTable(2);
-
-    AggregateEntry stale = table.findOrInsert(snapshot("svc-a", "op", "client"));
-    // do not record on stale -> hitCount stays at 0
-
-    AggregateEntry live = table.findOrInsert(snapshot("svc-b", "op", "client"));
-    live.recordOneDuration(10L | TOP_LEVEL_TAG); // hitCount=1, not evictable
-
-    // table is full (size=2). Inserting a third should evict the stale one and succeed.
-    AggregateEntry newcomer = table.findOrInsert(snapshot("svc-c", "op", "client"));
-    assertNotNull(newcomer);
-    assertEquals(2, table.size());
-
-    // re-inserting the stale snapshot should miss now (it was evicted) and produce a fresh entry
-    AggregateEntry staleAgain = table.findOrInsert(snapshot("svc-a", "op", "client"));
-    assertNotSame(stale, staleAgain);
-  }
-
-  @Test
-  void backToBackEvictionsAllSucceed() {
-    // Cursor amortization regression: cap the table, fill with stale entries, then force a
-    // sequence of cap-overrun inserts. Each insert must succeed (evicting one stale entry and
-    // inserting one new). The cursor field is internal, but if it were ever wedged (e.g.
-    // pointing past the end of buckets, or not advancing after a successful eviction), some
-    // later insert would fail to find a stale entry. Drives ~3x the capacity worth of inserts to
-    // give wrap-around plenty of chances to misbehave.
-    AggregateTable table = new AggregateTable(8);
-    for (int i = 0; i < 8; i++) {
-      table.findOrInsert(snapshot("init-" + i, "op", "client"));
+    @BeforeAll
+    static void initAgentMeter() {
+        // AggregateEntry.recordOneDuration -> Histogram.accept needs AgentMeter to be initialized.
+        MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
+        AgentMeter.registerIfAbsent(StatsDClient.NO_OP, monitoring, DDSketchHistograms.FACTORY);
+        monitoring.newTimer("test.init");
     }
-    for (int i = 0; i < 32; i++) {
-      AggregateEntry inserted = table.findOrInsert(snapshot("post-" + i, "op", "client"));
-      assertNotNull(
-          inserted, "insert #" + i + " should evict a stale entry and succeed (table full)");
+
+    @Test
+    void insertOnMissReturnsNewAggregate() {
+        AggregateTable table = new AggregateTable(8);
+        SpanSnapshot s = snapshot("svc", "op", "client");
+
+        AggregateEntry agg = table.findOrInsert(s);
+
+        assertNotNull(agg);
+        assertEquals(1, table.size());
+        assertEquals(0, agg.getHitCount());
+    }
+
+    @Test
+    void hitReturnsSameAggregateInstance() {
+        AggregateTable table = new AggregateTable(8);
+        SpanSnapshot s1 = snapshot("svc", "op", "client");
+        SpanSnapshot s2 = snapshot("svc", "op", "client");
+
+        AggregateEntry first = table.findOrInsert(s1);
+        AggregateEntry second = table.findOrInsert(s2);
+
+        assertSame(first, second);
+        assertEquals(1, table.size());
+    }
+
+    @Test
+    void differentKindFieldsAreDistinct() {
+        AggregateTable table = new AggregateTable(8);
+
+        AggregateEntry clientAgg = table.findOrInsert(snapshot("svc", "op", "client"));
+        AggregateEntry serverAgg = table.findOrInsert(snapshot("svc", "op", "server"));
+
+        assertNotSame(clientAgg, serverAgg);
+        assertEquals(2, table.size());
+    }
+
+    @Test
+    void peerTagPairsParticipateInIdentity() {
+        AggregateTable table = new AggregateTable(8);
+        SpanSnapshot withTags = builder("svc", "op", "client")
+                .peerTags("peer.hostname", "host-a")
+                .build();
+        SpanSnapshot otherTags = builder("svc", "op", "client")
+                .peerTags("peer.hostname", "host-b")
+                .build();
+        SpanSnapshot noTags = builder("svc", "op", "client").build();
+
+        AggregateEntry a = table.findOrInsert(withTags);
+        AggregateEntry b = table.findOrInsert(otherTags);
+        AggregateEntry c = table.findOrInsert(noTags);
+
+        assertNotSame(a, b);
+        assertNotSame(a, c);
+        assertNotSame(b, c);
+        assertEquals(3, table.size());
+    }
+
+    @Test
+    void capOverrunEvictsStaleEntry() {
+        AggregateTable table = new AggregateTable(2);
+
+        AggregateEntry stale = table.findOrInsert(snapshot("svc-a", "op", "client"));
+        // do not record on stale -> hitCount stays at 0
+
+        AggregateEntry live = table.findOrInsert(snapshot("svc-b", "op", "client"));
+        live.recordOneDuration(10L | TOP_LEVEL_TAG); // hitCount=1, not evictable
+
+        // table is full (size=2). Inserting a third should evict the stale one and succeed.
+        AggregateEntry newcomer = table.findOrInsert(snapshot("svc-c", "op", "client"));
+        assertNotNull(newcomer);
+        assertEquals(2, table.size());
+
+        // re-inserting the stale snapshot should miss now (it was evicted) and produce a fresh entry
+        AggregateEntry staleAgain = table.findOrInsert(snapshot("svc-a", "op", "client"));
+        assertNotSame(stale, staleAgain);
+    }
+
+    @Test
+    void backToBackEvictionsAllSucceed() {
+        // Cursor amortization regression: cap the table, fill with stale entries, then force a
+        // sequence of cap-overrun inserts. Each insert must succeed (evicting one stale entry and
+        // inserting one new). The cursor field is internal, but if it were ever wedged (e.g.
+        // pointing past the end of buckets, or not advancing after a successful eviction), some
+        // later insert would fail to find a stale entry. Drives ~3x the capacity worth of inserts to
+        // give wrap-around plenty of chances to misbehave.
+        AggregateTable table = new AggregateTable(8);
+        for (int i = 0; i < 8; i++) {
+            table.findOrInsert(snapshot("init-" + i, "op", "client"));
+        }
+        for (int i = 0; i < 32; i++) {
+            AggregateEntry inserted = table.findOrInsert(snapshot("post-" + i, "op", "client"));
+            assertNotNull(inserted, "insert #" + i + " should evict a stale entry and succeed (table full)");
+        }
+        assertEquals(8, table.size());
     }
-    assertEquals(8, table.size());
-  }
-
-  @Test
-  void clearResetsCursorForSubsequentEvictions() {
-    // The cursor must reset to 0 on clear so a re-filled table doesn't start eviction at a
-    // stale bucket index. Verified indirectly: clear and re-fill, then force an eviction; the
-    // newcomer must successfully take a slot (which only works if a stale entry was found).
-    AggregateTable table = new AggregateTable(4);
-
-    // Fill, age, evict once -- cursor lands at some non-zero bucket
-    for (int i = 0; i < 4; i++) {
-      table.findOrInsert(snapshot("warm-" + i, "op", "client"));
+
+    @Test
+    void clearResetsCursorForSubsequentEvictions() {
+        // The cursor must reset to 0 on clear so a re-filled table doesn't start eviction at a
+        // stale bucket index. Verified indirectly: clear and re-fill, then force an eviction; the
+        // newcomer must successfully take a slot (which only works if a stale entry was found).
+        AggregateTable table = new AggregateTable(4);
+
+        // Fill, age, evict once -- cursor lands at some non-zero bucket
+        for (int i = 0; i < 4; i++) {
+            table.findOrInsert(snapshot("warm-" + i, "op", "client"));
+        }
+        table.findOrInsert(snapshot("evict-trigger", "op", "client"));
+
+        table.clear();
+        assertEquals(0, table.size());
+
+        // Re-fill, age, force eviction -- should still find a stale entry from bucket 0 onward
+        for (int i = 0; i < 4; i++) {
+            table.findOrInsert(snapshot("fresh-" + i, "op", "client"));
+        }
+        AggregateEntry newcomer = table.findOrInsert(snapshot("post-clear", "op", "client"));
+        assertNotNull(newcomer, "post-clear cap-overrun insert must succeed via cursor-reset evict");
     }
-    table.findOrInsert(snapshot("evict-trigger", "op", "client"));
 
-    table.clear();
-    assertEquals(0, table.size());
+    @Test
+    void capOverrunWithNoStaleReturnsNull() {
+        AggregateTable table = new AggregateTable(2);
+
+        AggregateEntry a = table.findOrInsert(snapshot("svc-a", "op", "client"));
+        AggregateEntry b = table.findOrInsert(snapshot("svc-b", "op", "client"));
+        a.recordOneDuration(10L);
+        b.recordOneDuration(20L);
 
-    // Re-fill, age, force eviction -- should still find a stale entry from bucket 0 onward
-    for (int i = 0; i < 4; i++) {
-      table.findOrInsert(snapshot("fresh-" + i, "op", "client"));
+        AggregateEntry c = table.findOrInsert(snapshot("svc-c", "op", "client"));
+        assertNull(c);
+        assertEquals(2, table.size());
     }
-    AggregateEntry newcomer = table.findOrInsert(snapshot("post-clear", "op", "client"));
-    assertNotNull(newcomer, "post-clear cap-overrun insert must succeed via cursor-reset evict");
-  }
-
-  @Test
-  void capOverrunWithNoStaleReturnsNull() {
-    AggregateTable table = new AggregateTable(2);
-
-    AggregateEntry a = table.findOrInsert(snapshot("svc-a", "op", "client"));
-    AggregateEntry b = table.findOrInsert(snapshot("svc-b", "op", "client"));
-    a.recordOneDuration(10L);
-    b.recordOneDuration(20L);
-
-    AggregateEntry c = table.findOrInsert(snapshot("svc-c", "op", "client"));
-    assertNull(c);
-    assertEquals(2, table.size());
-  }
-
-  @Test
-  void expungeStaleAggregatesRemovesZeroHitsOnly() {
-    AggregateTable table = new AggregateTable(16);
-
-    AggregateEntry live = table.findOrInsert(snapshot("svc-live", "op", "client"));
-    live.recordOneDuration(10L);
-    AggregateEntry stale1 = table.findOrInsert(snapshot("svc-stale1", "op", "client"));
-    AggregateEntry stale2 = table.findOrInsert(snapshot("svc-stale2", "op", "client"));
-    assertEquals(3, table.size());
-    assertEquals(0, stale1.getHitCount());
-    assertEquals(0, stale2.getHitCount());
-
-    table.expungeStaleAggregates();
-
-    assertEquals(1, table.size());
-    // the live entry must still be reachable
-    assertSame(live, table.findOrInsert(snapshot("svc-live", "op", "client")));
-  }
-
-  @Test
-  void forEachVisitsEveryEntry() {
-    AggregateTable table = new AggregateTable(8);
-    table.findOrInsert(snapshot("a", "op", "client")).recordOneDuration(1L);
-    table.findOrInsert(snapshot("b", "op", "client")).recordOneDuration(2L);
-    table.findOrInsert(snapshot("c", "op", "client")).recordOneDuration(3L | ERROR_TAG);
-
-    Map<String, Long> visited = new HashMap<>();
-    table.forEach(e -> visited.put(e.getService().toString(), e.getDuration()));
-
-    assertEquals(3, visited.size());
-    assertEquals(1L, visited.get("a"));
-    assertEquals(2L, visited.get("b"));
-    assertEquals(3L, visited.get("c"));
-  }
-
-  @Test
-  void clearEmptiesTheTable() {
-    AggregateTable table = new AggregateTable(8);
-    table.findOrInsert(snapshot("a", "op", "client"));
-    table.findOrInsert(snapshot("b", "op", "client"));
-    assertEquals(2, table.size());
-
-    table.clear();
-
-    assertTrue(table.isEmpty());
-    assertEquals(0, table.size());
-    // and re-insertion works after clear
-    assertNotNull(table.findOrInsert(snapshot("a", "op", "client")));
-  }
-
-  @Test
-  void encodedLabelsAreBuiltOnInsert() {
-    AggregateTable table = new AggregateTable(4);
-    List<AggregateEntry> seen = new ArrayList<>();
-    table.findOrInsert(snapshot("svc", "op", "client"));
-    table.forEach(seen::add);
-
-    assertEquals(1, seen.size());
-    AggregateEntry e = seen.get(0);
-    assertEquals("svc", e.getService().toString());
-    assertEquals("op", e.getOperationName().toString());
-    assertEquals("client", e.getSpanKind().toString());
-  }
-
-  @Test
-  void nullAndEmptyOptionalFieldsCollapseToOneEntry() {
-    // null and length-zero are treated as equivalent for optional fields, so snapshots that
-    // differ only in null-vs-"" land on the same entry.
-    AggregateTable table = new AggregateTable(8);
-
-    SpanSnapshot snapNull = nullableSnapshot(null, null, null, null);
-    SpanSnapshot snapEmpty = nullableSnapshot("", "", "", "");
-
-    AggregateEntry first = table.findOrInsert(snapNull);
-    AggregateEntry secondNull = table.findOrInsert(nullableSnapshot(null, null, null, null));
-    AggregateEntry forEmpty = table.findOrInsert(snapEmpty);
-
-    assertSame(first, secondNull, "two null-fielded snapshots must hit the same entry");
-    assertSame(first, forEmpty, "null- and empty-fielded snapshots must hit the same entry");
-    assertEquals(1, table.size());
-  }
-
-  @Test
-  void nullServiceAndSpanKindDoNotNpeAndCollapseWithEmpty() {
-    // Null service and spanKind are accepted (canonicalize to length-zero) and collapse with
-    // empty-string variants onto the same entry.
-    AggregateTable table = new AggregateTable(8);
-
-    SpanSnapshot allNulls = nullServiceKindSnapshot(null, null);
-    SpanSnapshot allEmpty = nullServiceKindSnapshot("", "");
-
-    AggregateEntry first = table.findOrInsert(allNulls);
-    AggregateEntry secondNull = table.findOrInsert(nullServiceKindSnapshot(null, null));
-    AggregateEntry forEmpty = table.findOrInsert(allEmpty);
-
-    assertSame(first, secondNull, "two null-service/-kind snapshots must hit the same entry");
-    assertSame(first, forEmpty, "null- and empty-service/-kind snapshots must hit the same entry");
-    assertEquals(1, table.size());
-    assertEquals(0, first.getService().length(), "null serviceName should canonicalize to EMPTY");
-    assertEquals(0, first.getSpanKind().length(), "null spanKind should canonicalize to EMPTY");
-  }
-
-  private static SpanSnapshot nullServiceKindSnapshot(String service, String spanKind) {
-    return new SpanSnapshot(
-        "resource",
-        service,
-        "op",
-        null,
-        "web",
-        (short) 200,
-        false,
-        true,
-        spanKind,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        0L);
-  }
-
-  private static SpanSnapshot nullableSnapshot(
-      String resource, String operation, String type, String serviceNameSource) {
-    return new SpanSnapshot(
-        resource,
-        "svc",
-        operation,
-        serviceNameSource,
-        type,
-        (short) 200,
-        false,
-        true,
-        "client",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        0L);
-  }
-
-  @Test
-  void resetCoreHandlersClearsBlockedCountsAndRefreshesCapacity() {
-    // Inject the core handlers via the 3-arg constructor to test resetCoreHandlers() directly.
-    CoreHandlers handlers = new CoreHandlers();
-    AggregateTable table = new AggregateTable(512, handlers, AdditionalTagsSchema.EMPTY);
-
-    // Fill the service cardinality budget and push one value over the limit.
-    for (int i = 0; i < MetricCardinalityLimits.SERVICE; i++) {
-      table.findOrInsert(snapshot("svc-" + i, "op", "client"));
+
+    @Test
+    void expungeStaleAggregatesRemovesZeroHitsOnly() {
+        AggregateTable table = new AggregateTable(16);
+
+        AggregateEntry live = table.findOrInsert(snapshot("svc-live", "op", "client"));
+        live.recordOneDuration(10L);
+        AggregateEntry stale1 = table.findOrInsert(snapshot("svc-stale1", "op", "client"));
+        AggregateEntry stale2 = table.findOrInsert(snapshot("svc-stale2", "op", "client"));
+        assertEquals(3, table.size());
+        assertEquals(0, stale1.getHitCount());
+        assertEquals(0, stale2.getHitCount());
+
+        table.expungeStaleAggregates();
+
+        assertEquals(1, table.size());
+        // the live entry must still be reachable
+        assertSame(live, table.findOrInsert(snapshot("svc-live", "op", "client")));
     }
-    AggregateEntry blocked = table.findOrInsert(snapshot("svc-overflow", "op", "client"));
-    // All overflow services map to the same sentinel bucket.
-    AggregateEntry blocked2 = table.findOrInsert(snapshot("svc-overflow-2", "op", "client"));
-    assertSame(blocked, blocked2);
-
-    HealthMetrics metrics = mock(HealthMetrics.class);
-    table.resetCoreHandlers(metrics, new CardinalityLimitReporter());
-
-    verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:service"}, 2L);
-    verifyNoMoreInteractions(metrics);
-
-    // After reset, a new service name should land in a fresh bucket, not the sentinel.
-    AggregateEntry afterReset = table.findOrInsert(snapshot("svc-new", "op", "client"));
-    assertNotSame(blocked, afterReset);
-    assertEquals("svc-new", afterReset.getService().toString());
-  }
-
-  // ---------- helpers ----------
-
-  private static SpanSnapshot snapshot(String service, String operation, String spanKind) {
-    return builder(service, operation, spanKind).build();
-  }
-
-  private static SnapshotBuilder builder(String service, String operation, String spanKind) {
-    return new SnapshotBuilder(service, operation, spanKind);
-  }
-
-  private static final class SnapshotBuilder {
-    private final String service;
-    private final String operation;
-    private final String spanKind;
-    private PeerTagSchema peerTagSchema;
-    private String[] peerTagValues;
-    private long tagAndDuration = 0L;
-
-    SnapshotBuilder(String service, String operation, String spanKind) {
-      this.service = service;
-      this.operation = operation;
-      this.spanKind = spanKind;
+
+    @Test
+    void forEachVisitsEveryEntry() {
+        AggregateTable table = new AggregateTable(8);
+        table.findOrInsert(snapshot("a", "op", "client")).recordOneDuration(1L);
+        table.findOrInsert(snapshot("b", "op", "client")).recordOneDuration(2L);
+        table.findOrInsert(snapshot("c", "op", "client")).recordOneDuration(3L | ERROR_TAG);
+
+        Map<String, Long> visited = new HashMap<>();
+        table.forEach(e -> visited.put(e.getService().toString(), e.getDuration()));
+
+        assertEquals(3, visited.size());
+        assertEquals(1L, visited.get("a"));
+        assertEquals(2L, visited.get("b"));
+        assertEquals(3L, visited.get("c"));
+    }
+
+    @Test
+    void clearEmptiesTheTable() {
+        AggregateTable table = new AggregateTable(8);
+        table.findOrInsert(snapshot("a", "op", "client"));
+        table.findOrInsert(snapshot("b", "op", "client"));
+        assertEquals(2, table.size());
+
+        table.clear();
+
+        assertTrue(table.isEmpty());
+        assertEquals(0, table.size());
+        // and re-insertion works after clear
+        assertNotNull(table.findOrInsert(snapshot("a", "op", "client")));
+    }
+
+    @Test
+    void encodedLabelsAreBuiltOnInsert() {
+        AggregateTable table = new AggregateTable(4);
+        List<AggregateEntry> seen = new ArrayList<>();
+        table.findOrInsert(snapshot("svc", "op", "client"));
+        table.forEach(seen::add);
+
+        assertEquals(1, seen.size());
+        AggregateEntry e = seen.get(0);
+        assertEquals("svc", e.getService().toString());
+        assertEquals("op", e.getOperationName().toString());
+        assertEquals("client", e.getSpanKind().toString());
+    }
+
+    @Test
+    void nullAndEmptyOptionalFieldsCollapseToOneEntry() {
+        // null and length-zero are treated as equivalent for optional fields, so snapshots that
+        // differ only in null-vs-"" land on the same entry.
+        AggregateTable table = new AggregateTable(8);
+
+        SpanSnapshot snapNull = nullableSnapshot(null, null, null, null);
+        SpanSnapshot snapEmpty = nullableSnapshot("", "", "", "");
+
+        AggregateEntry first = table.findOrInsert(snapNull);
+        AggregateEntry secondNull = table.findOrInsert(nullableSnapshot(null, null, null, null));
+        AggregateEntry forEmpty = table.findOrInsert(snapEmpty);
+
+        assertSame(first, secondNull, "two null-fielded snapshots must hit the same entry");
+        assertSame(first, forEmpty, "null- and empty-fielded snapshots must hit the same entry");
+        assertEquals(1, table.size());
+    }
+
+    @Test
+    void nullServiceAndSpanKindDoNotNpeAndCollapseWithEmpty() {
+        // Null service and spanKind are accepted (canonicalize to length-zero) and collapse with
+        // empty-string variants onto the same entry.
+        AggregateTable table = new AggregateTable(8);
+
+        SpanSnapshot allNulls = nullServiceKindSnapshot(null, null);
+        SpanSnapshot allEmpty = nullServiceKindSnapshot("", "");
+
+        AggregateEntry first = table.findOrInsert(allNulls);
+        AggregateEntry secondNull = table.findOrInsert(nullServiceKindSnapshot(null, null));
+        AggregateEntry forEmpty = table.findOrInsert(allEmpty);
+
+        assertSame(first, secondNull, "two null-service/-kind snapshots must hit the same entry");
+        assertSame(first, forEmpty, "null- and empty-service/-kind snapshots must hit the same entry");
+        assertEquals(1, table.size());
+        assertEquals(0, first.getService().length(), "null serviceName should canonicalize to EMPTY");
+        assertEquals(0, first.getSpanKind().length(), "null spanKind should canonicalize to EMPTY");
+    }
+
+    private static SpanSnapshot nullServiceKindSnapshot(String service, String spanKind) {
+        return new SpanSnapshot(
+                "resource",
+                service,
+                "op",
+                null,
+                "web",
+                (short) 200,
+                false,
+                true,
+                spanKind,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                0L);
+    }
+
+    private static SpanSnapshot nullableSnapshot(
+            String resource, String operation, String type, String serviceNameSource) {
+        return new SpanSnapshot(
+                resource,
+                "svc",
+                operation,
+                serviceNameSource,
+                type,
+                (short) 200,
+                false,
+                true,
+                "client",
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                0L);
+    }
+
+    @Test
+    void resetCoreHandlersClearsBlockedCountsAndRefreshesCapacity() {
+        // Inject the core handlers via the 3-arg constructor to test resetCoreHandlers() directly.
+        CoreHandlers handlers = new CoreHandlers();
+        AggregateTable table = new AggregateTable(512, handlers, AdditionalTagsSchema.EMPTY);
+
+        // Fill the service cardinality budget and push one value over the limit.
+        for (int i = 0; i < MetricCardinalityLimits.SERVICE; i++) {
+            table.findOrInsert(snapshot("svc-" + i, "op", "client"));
+        }
+        AggregateEntry blocked = table.findOrInsert(snapshot("svc-overflow", "op", "client"));
+        // All overflow services map to the same sentinel bucket.
+        AggregateEntry blocked2 = table.findOrInsert(snapshot("svc-overflow-2", "op", "client"));
+        assertSame(blocked, blocked2);
+
+        HealthMetrics metrics = mock(HealthMetrics.class);
+        table.resetCoreHandlers(metrics, new CardinalityLimitReporter());
+
+        verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:service"}, 2L);
+        verifyNoMoreInteractions(metrics);
+
+        // After reset, a new service name should land in a fresh bucket, not the sentinel.
+        AggregateEntry afterReset = table.findOrInsert(snapshot("svc-new", "op", "client"));
+        assertNotSame(blocked, afterReset);
+        assertEquals("svc-new", afterReset.getService().toString());
+    }
+
+    // ---------- helpers ----------
+
+    private static SpanSnapshot snapshot(String service, String operation, String spanKind) {
+        return builder(service, operation, spanKind).build();
     }
 
-    SnapshotBuilder peerTags(String... namesAndValues) {
-      int pairCount = namesAndValues.length / 2;
-      String[] names = new String[pairCount];
-      String[] values = new String[pairCount];
-      for (int i = 0; i < pairCount; i++) {
-        names[i] = namesAndValues[2 * i];
-        values[i] = namesAndValues[2 * i + 1];
-      }
-      this.peerTagSchema = new PeerTagSchema(names, PeerTagSchema.NO_STATE);
-      this.peerTagValues = values;
-      return this;
+    private static SnapshotBuilder builder(String service, String operation, String spanKind) {
+        return new SnapshotBuilder(service, operation, spanKind);
     }
 
-    SpanSnapshot build() {
-      return new SpanSnapshot(
-          "resource",
-          service,
-          operation,
-          null,
-          "web",
-          (short) 200,
-          false,
-          true,
-          spanKind,
-          peerTagSchema,
-          peerTagValues,
-          null,
-          null,
-          null,
-          null,
-          tagAndDuration);
+    private static final class SnapshotBuilder {
+        private final String service;
+        private final String operation;
+        private final String spanKind;
+        private PeerTagSchema peerTagSchema;
+        private String[] peerTagValues;
+        private long tagAndDuration = 0L;
+
+        SnapshotBuilder(String service, String operation, String spanKind) {
+            this.service = service;
+            this.operation = operation;
+            this.spanKind = spanKind;
+        }
+
+        SnapshotBuilder peerTags(String... namesAndValues) {
+            int pairCount = namesAndValues.length / 2;
+            String[] names = new String[pairCount];
+            String[] values = new String[pairCount];
+            for (int i = 0; i < pairCount; i++) {
+                names[i] = namesAndValues[2 * i];
+                values[i] = namesAndValues[2 * i + 1];
+            }
+            this.peerTagSchema = new PeerTagSchema(names, PeerTagSchema.NO_STATE);
+            this.peerTagValues = values;
+            return this;
+        }
+
+        SpanSnapshot build() {
+            return new SpanSnapshot(
+                    "resource",
+                    service,
+                    operation,
+                    null,
+                    "web",
+                    (short) 200,
+                    false,
+                    true,
+                    spanKind,
+                    peerTagSchema,
+                    peerTagValues,
+                    null,
+                    null,
+                    null,
+                    null,
+                    tagAndDuration);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/CardinalityHandlerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/CardinalityHandlerTest.java
index 944558c17b0..c5387d80d72 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/CardinalityHandlerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/CardinalityHandlerTest.java
@@ -10,285 +10,285 @@
 
 class CardinalityHandlerTest {
 
-  @Test
-  void propertyReturnsSameInstanceForRepeatedValueUntilLimit() {
-    PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 3);
-    UTF8BytesString a1 = h.register("a");
-    UTF8BytesString a2 = h.register("a");
-    assertSame(a1, a2);
-    assertEquals("a", a1.toString());
-  }
-
-  @Test
-  void propertyOverLimitReturnsBlockedSentinel() {
-    PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 2);
-    UTF8BytesString a = h.register("a");
-    UTF8BytesString b = h.register("b");
-    UTF8BytesString blocked1 = h.register("c");
-    UTF8BytesString blocked2 = h.register("d");
-
-    assertEquals("tracer_blocked_value", blocked1.toString());
-    assertSame(blocked1, blocked2); // same sentinel for all overflow values
-    assertNotSame(blocked1, a);
-    assertNotSame(blocked1, b);
-  }
-
-  @Test
-  void propertyResetRefreshesBudget() {
-    PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 2);
-    h.register("a");
-    h.register("b");
-    UTF8BytesString blocked = h.register("c");
-    assertEquals("tracer_blocked_value", blocked.toString());
-
-    h.reset();
-
-    // After reset, three distinct values fit again. Prior-cycle instances are reused
-    // (see propertyPriorCycleInstancesAreReusedAcrossReset for the dedicated check); here
-    // we just confirm that the budget refreshed so values previously blocked now have
-    // a slot.
-    UTF8BytesString afterReset = h.register("a");
-    assertEquals("a", afterReset.toString());
-    UTF8BytesString c = h.register("c");
-    assertEquals("c", c.toString());
-    UTF8BytesString blockedAgain = h.register("d");
-    UTF8BytesString blockedYetAgain = h.register("e");
-    assertEquals("tracer_blocked_value", blockedAgain.toString());
-    assertSame(blockedAgain, blockedYetAgain);
-  }
-
-  @Test
-  void propertyPriorCycleInstancesAreReusedAcrossReset() {
-    // Dual role: the handler is also a UTF8 cache. Values held in the prior cycle are
-    // reused on the first registration in the new cycle, so aggregate entries that hold a
-    // reference to a UTF8BytesString still match on identity after the per-cycle reset.
-    // This is the cache-survives-reset property the canonical-key lookup depends on.
-    PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 4);
-    UTF8BytesString aBefore = h.register("a");
-    UTF8BytesString bBefore = h.register("b");
-
-    h.reset();
-
-    assertSame(aBefore, h.register("a"));
-    assertSame(bBefore, h.register("b"));
-    // Same-cycle subsequent registration continues to return the reused instance.
-    assertSame(aBefore, h.register("a"));
-  }
-
-  @Test
-  void propertyPriorCycleReuseSurvivesOneResetButNotTwo() {
-    // Reuse window is one cycle deep -- the handler swaps current/prior on reset, so a
-    // value last seen two cycles ago is no longer cached and will be re-allocated.
-    PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 4);
-    UTF8BytesString first = h.register("a");
-
-    h.reset();
-    h.reset();
-
-    UTF8BytesString afterTwoResets = h.register("a");
-    assertNotSame(first, afterTwoResets);
-    assertEquals("a", afterTwoResets.toString());
-  }
-
-  @Test
-  void tagPrefixesValuesAndReusesUnderLimit() {
-    TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 4);
-    UTF8BytesString first = h.register("host-a");
-    UTF8BytesString second = h.register("host-a");
-    UTF8BytesString other = h.register("host-b");
-
-    assertSame(first, second);
-    assertNotSame(first, other);
-    assertEquals("peer.hostname:host-a", first.toString());
-    assertEquals("peer.hostname:host-b", other.toString());
-  }
-
-  @Test
-  void tagOverLimitReturnsTaggedSentinel() {
-    TagCardinalityHandler h = new TagCardinalityHandler("peer.service", 1);
-    h.register("svc-1");
-    UTF8BytesString blocked = h.register("svc-2");
-    assertEquals("peer.service:tracer_blocked_value", blocked.toString());
-  }
-
-  @Test
-  void tagResetRefreshesBudgetAndSentinelStaysStable() {
-    TagCardinalityHandler h = new TagCardinalityHandler("x", 1);
-    h.register("v1");
-    UTF8BytesString blockedBefore = h.register("v2");
-    h.reset();
-    h.register("v1");
-    UTF8BytesString blockedAfter = h.register("v2");
-    // Both are the same sentinel instance (cacheBlocked is not cleared on reset).
-    assertSame(blockedBefore, blockedAfter);
-  }
-
-  @Test
-  void tagPriorCycleInstancesAreReusedAcrossReset() {
-    // Mirrors propertyPriorCycleInstancesAreReusedAcrossReset: the pre-built "tag:value"
-    // UTF8BytesString from the prior cycle is reused on the first registration in the new
-    // cycle -- no re-concatenation, no re-encoding.
-    TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 4);
-    UTF8BytesString hostABefore = h.register("host-a");
-    UTF8BytesString hostBBefore = h.register("host-b");
-
-    h.reset();
-
-    assertSame(hostABefore, h.register("host-a"));
-    assertSame(hostBBefore, h.register("host-b"));
-  }
-
-  @Test
-  void tagValueAtLengthCapPassesAndOverCapCollapses() {
-    // Length cap is enforced independently of the cardinality budget: give a generous budget (10)
-    // so only the length branch can block. A value of exactly maxValueLength passes; one character
-    // longer collapses to the blocked sentinel. The 200-char cap here is the shipped
-    // MetricCardinalityLimits.ADDITIONAL_TAG_MAX_VALUE_LENGTH.
-    TagCardinalityHandler h = new TagCardinalityHandler("k", 10, true, 200);
-    String atCap = stringOfLength(200);
-    String overCap = stringOfLength(201);
-
-    assertEquals("k:" + atCap, h.register(atCap).toString());
-    assertEquals("k:tracer_blocked_value", h.register(overCap).toString());
-    // The over-cap value is a length ("oversized") collapse, tracked separately from the
-    // cardinality-collapse count that reset() returns.
-    assertEquals(1, h.oversizedCount());
-    assertEquals(0, h.reset());
-  }
-
-  @Test
-  void tagValueLengthCapNotEnforcedWhenSentinelDisabled() {
-    // With the blocked sentinel disabled the length branch is skipped: an oversized value flows
-    // through verbatim (limits-disabled mode never masks values).
-    TagCardinalityHandler h = new TagCardinalityHandler("k", 10, false, 200);
-    String overCap = stringOfLength(201);
-    assertEquals("k:" + overCap, h.register(overCap).toString());
-    assertEquals(0, h.oversizedCount());
-    assertEquals(0, h.reset());
-  }
-
-  @Test
-  void propertyRegisterOfNullReturnsEmpty() {
-    PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 4);
-    // Null input short-circuits to UTF8BytesString.EMPTY -- the universal "absent" sentinel that
-    // AggregateEntry's optional UTF8 fields use in place of null.
-    assertSame(UTF8BytesString.EMPTY, h.register(null));
-  }
-
-  @Test
-  void propertyRegisterOfNullDoesNotConsumeBudget() {
-    PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 2);
-    h.register(null);
-    h.register(null);
-    h.register(null);
-    // Three null registrations didn't consume the budget; two real values still fit.
-    assertEquals("a", h.register("a").toString());
-    assertEquals("b", h.register("b").toString());
-    // Third real value spills to the blocked sentinel (limit = 2).
-    assertEquals("tracer_blocked_value", h.register("c").toString());
-  }
-
-  @Test
-  void tagRegisterOfNullReturnsEmpty() {
-    TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 4);
-    // Null returns EMPTY (no "tag:" prefix applied -- the sentinel is the same EMPTY singleton
-    // every handler returns for null input).
-    assertSame(UTF8BytesString.EMPTY, h.register(null));
-  }
-
-  @Test
-  void tagRegisterOfNullDoesNotConsumeBudget() {
-    TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 2);
-    h.register(null);
-    h.register(null);
-    h.register(null);
-    // Three null registrations didn't consume the budget; two real values still fit.
-    assertEquals("peer.hostname:a", h.register("a").toString());
-    assertEquals("peer.hostname:b", h.register("b").toString());
-    // Third real value spills to the blocked sentinel (limit = 2).
-    assertEquals("peer.hostname:tracer_blocked_value", h.register("c").toString());
-  }
-
-  @Test
-  void propertyResetReturnsBlockedCount() {
-    PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 1);
-    h.register("a"); // within limit
-    h.register("b"); // blocked
-    h.register("c"); // blocked
-    assertEquals(2, h.reset());
-    assertEquals(0, h.reset()); // no blocks in the empty new cycle
-  }
-
-  @Test
-  void tagResetReturnsBlockedCount() {
-    TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 1);
-    h.register("a"); // within limit
-    h.register("b"); // blocked
-    h.register("c"); // blocked
-    assertEquals(2, h.reset());
-    assertEquals(0, h.reset()); // no blocks in the empty new cycle
-  }
-
-  // ---- limits-disabled mode (Config flag off): cache size still capped, but over-cap values
-  // get freshly-allocated UTF8 rather than the blocked sentinel.
-
-  @Test
-  void propertyOverLimitWithSentinelDisabledReturnsFreshUtf8() {
-    PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 2, false);
-    UTF8BytesString a = h.register("a");
-    UTF8BytesString b = h.register("b");
-    UTF8BytesString c = h.register("c");
-    UTF8BytesString d = h.register("d");
-
-    // Real values (not the "tracer_blocked_value" sentinel) so the wire format carries them.
-    assertEquals("c", c.toString());
-    assertEquals("d", d.toString());
-    // The first two stay cached and identity-stable.
-    assertSame(a, h.register("a"));
-    assertSame(b, h.register("b"));
-    // Over-cap values are NOT cached -- a second call allocates a fresh instance.
-    assertNotSame(c, h.register("c"));
-    assertEquals("c", h.register("c").toString());
-  }
-
-  @Test
-  void propertyOverLimitWithSentinelDisabledReusesPriorCycleInstances() {
-    // Prior-cycle reuse runs in disabled mode too: a value that was seen last cycle but is now
-    // over-budget still gets its prior-cycle UTF8BytesString back instead of an allocation.
-    PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 2, false);
-    UTF8BytesString cBeforeReset = h.register("c");
-
-    h.reset();
-
-    // Fill the budget with two different values so "c" lands over-cap.
-    h.register("x");
-    h.register("y");
-    UTF8BytesString cAfterReset = h.register("c");
-    assertSame(cBeforeReset, cAfterReset);
-  }
-
-  @Test
-  void tagOverLimitWithSentinelDisabledReturnsFreshUtf8() {
-    TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 1, false);
-    h.register("host-a");
-    UTF8BytesString hostB = h.register("host-b");
-    UTF8BytesString hostC = h.register("host-c");
-
-    assertEquals("peer.hostname:host-b", hostB.toString());
-    assertEquals("peer.hostname:host-c", hostC.toString());
-  }
-
-  @Test
-  void tagOverLimitWithSentinelDisabledNeverSubstitutesBlockedSentinel() {
-    TagCardinalityHandler h = new TagCardinalityHandler("peer.service", 1, false);
-    h.register("svc-1");
-    UTF8BytesString overCap = h.register("svc-2");
-    assertEquals("peer.service:svc-2", overCap.toString());
-  }
-
-  private static String stringOfLength(int length) {
-    char[] chars = new char[length];
-    Arrays.fill(chars, 'x');
-    return new String(chars);
-  }
+    @Test
+    void propertyReturnsSameInstanceForRepeatedValueUntilLimit() {
+        PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 3);
+        UTF8BytesString a1 = h.register("a");
+        UTF8BytesString a2 = h.register("a");
+        assertSame(a1, a2);
+        assertEquals("a", a1.toString());
+    }
+
+    @Test
+    void propertyOverLimitReturnsBlockedSentinel() {
+        PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 2);
+        UTF8BytesString a = h.register("a");
+        UTF8BytesString b = h.register("b");
+        UTF8BytesString blocked1 = h.register("c");
+        UTF8BytesString blocked2 = h.register("d");
+
+        assertEquals("tracer_blocked_value", blocked1.toString());
+        assertSame(blocked1, blocked2); // same sentinel for all overflow values
+        assertNotSame(blocked1, a);
+        assertNotSame(blocked1, b);
+    }
+
+    @Test
+    void propertyResetRefreshesBudget() {
+        PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 2);
+        h.register("a");
+        h.register("b");
+        UTF8BytesString blocked = h.register("c");
+        assertEquals("tracer_blocked_value", blocked.toString());
+
+        h.reset();
+
+        // After reset, three distinct values fit again. Prior-cycle instances are reused
+        // (see propertyPriorCycleInstancesAreReusedAcrossReset for the dedicated check); here
+        // we just confirm that the budget refreshed so values previously blocked now have
+        // a slot.
+        UTF8BytesString afterReset = h.register("a");
+        assertEquals("a", afterReset.toString());
+        UTF8BytesString c = h.register("c");
+        assertEquals("c", c.toString());
+        UTF8BytesString blockedAgain = h.register("d");
+        UTF8BytesString blockedYetAgain = h.register("e");
+        assertEquals("tracer_blocked_value", blockedAgain.toString());
+        assertSame(blockedAgain, blockedYetAgain);
+    }
+
+    @Test
+    void propertyPriorCycleInstancesAreReusedAcrossReset() {
+        // Dual role: the handler is also a UTF8 cache. Values held in the prior cycle are
+        // reused on the first registration in the new cycle, so aggregate entries that hold a
+        // reference to a UTF8BytesString still match on identity after the per-cycle reset.
+        // This is the cache-survives-reset property the canonical-key lookup depends on.
+        PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 4);
+        UTF8BytesString aBefore = h.register("a");
+        UTF8BytesString bBefore = h.register("b");
+
+        h.reset();
+
+        assertSame(aBefore, h.register("a"));
+        assertSame(bBefore, h.register("b"));
+        // Same-cycle subsequent registration continues to return the reused instance.
+        assertSame(aBefore, h.register("a"));
+    }
+
+    @Test
+    void propertyPriorCycleReuseSurvivesOneResetButNotTwo() {
+        // Reuse window is one cycle deep -- the handler swaps current/prior on reset, so a
+        // value last seen two cycles ago is no longer cached and will be re-allocated.
+        PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 4);
+        UTF8BytesString first = h.register("a");
+
+        h.reset();
+        h.reset();
+
+        UTF8BytesString afterTwoResets = h.register("a");
+        assertNotSame(first, afterTwoResets);
+        assertEquals("a", afterTwoResets.toString());
+    }
+
+    @Test
+    void tagPrefixesValuesAndReusesUnderLimit() {
+        TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 4);
+        UTF8BytesString first = h.register("host-a");
+        UTF8BytesString second = h.register("host-a");
+        UTF8BytesString other = h.register("host-b");
+
+        assertSame(first, second);
+        assertNotSame(first, other);
+        assertEquals("peer.hostname:host-a", first.toString());
+        assertEquals("peer.hostname:host-b", other.toString());
+    }
+
+    @Test
+    void tagOverLimitReturnsTaggedSentinel() {
+        TagCardinalityHandler h = new TagCardinalityHandler("peer.service", 1);
+        h.register("svc-1");
+        UTF8BytesString blocked = h.register("svc-2");
+        assertEquals("peer.service:tracer_blocked_value", blocked.toString());
+    }
+
+    @Test
+    void tagResetRefreshesBudgetAndSentinelStaysStable() {
+        TagCardinalityHandler h = new TagCardinalityHandler("x", 1);
+        h.register("v1");
+        UTF8BytesString blockedBefore = h.register("v2");
+        h.reset();
+        h.register("v1");
+        UTF8BytesString blockedAfter = h.register("v2");
+        // Both are the same sentinel instance (cacheBlocked is not cleared on reset).
+        assertSame(blockedBefore, blockedAfter);
+    }
+
+    @Test
+    void tagPriorCycleInstancesAreReusedAcrossReset() {
+        // Mirrors propertyPriorCycleInstancesAreReusedAcrossReset: the pre-built "tag:value"
+        // UTF8BytesString from the prior cycle is reused on the first registration in the new
+        // cycle -- no re-concatenation, no re-encoding.
+        TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 4);
+        UTF8BytesString hostABefore = h.register("host-a");
+        UTF8BytesString hostBBefore = h.register("host-b");
+
+        h.reset();
+
+        assertSame(hostABefore, h.register("host-a"));
+        assertSame(hostBBefore, h.register("host-b"));
+    }
+
+    @Test
+    void tagValueAtLengthCapPassesAndOverCapCollapses() {
+        // Length cap is enforced independently of the cardinality budget: give a generous budget (10)
+        // so only the length branch can block. A value of exactly maxValueLength passes; one character
+        // longer collapses to the blocked sentinel. The 200-char cap here is the shipped
+        // MetricCardinalityLimits.ADDITIONAL_TAG_MAX_VALUE_LENGTH.
+        TagCardinalityHandler h = new TagCardinalityHandler("k", 10, true, 200);
+        String atCap = stringOfLength(200);
+        String overCap = stringOfLength(201);
+
+        assertEquals("k:" + atCap, h.register(atCap).toString());
+        assertEquals("k:tracer_blocked_value", h.register(overCap).toString());
+        // The over-cap value is a length ("oversized") collapse, tracked separately from the
+        // cardinality-collapse count that reset() returns.
+        assertEquals(1, h.oversizedCount());
+        assertEquals(0, h.reset());
+    }
+
+    @Test
+    void tagValueLengthCapNotEnforcedWhenSentinelDisabled() {
+        // With the blocked sentinel disabled the length branch is skipped: an oversized value flows
+        // through verbatim (limits-disabled mode never masks values).
+        TagCardinalityHandler h = new TagCardinalityHandler("k", 10, false, 200);
+        String overCap = stringOfLength(201);
+        assertEquals("k:" + overCap, h.register(overCap).toString());
+        assertEquals(0, h.oversizedCount());
+        assertEquals(0, h.reset());
+    }
+
+    @Test
+    void propertyRegisterOfNullReturnsEmpty() {
+        PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 4);
+        // Null input short-circuits to UTF8BytesString.EMPTY -- the universal "absent" sentinel that
+        // AggregateEntry's optional UTF8 fields use in place of null.
+        assertSame(UTF8BytesString.EMPTY, h.register(null));
+    }
+
+    @Test
+    void propertyRegisterOfNullDoesNotConsumeBudget() {
+        PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 2);
+        h.register(null);
+        h.register(null);
+        h.register(null);
+        // Three null registrations didn't consume the budget; two real values still fit.
+        assertEquals("a", h.register("a").toString());
+        assertEquals("b", h.register("b").toString());
+        // Third real value spills to the blocked sentinel (limit = 2).
+        assertEquals("tracer_blocked_value", h.register("c").toString());
+    }
+
+    @Test
+    void tagRegisterOfNullReturnsEmpty() {
+        TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 4);
+        // Null returns EMPTY (no "tag:" prefix applied -- the sentinel is the same EMPTY singleton
+        // every handler returns for null input).
+        assertSame(UTF8BytesString.EMPTY, h.register(null));
+    }
+
+    @Test
+    void tagRegisterOfNullDoesNotConsumeBudget() {
+        TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 2);
+        h.register(null);
+        h.register(null);
+        h.register(null);
+        // Three null registrations didn't consume the budget; two real values still fit.
+        assertEquals("peer.hostname:a", h.register("a").toString());
+        assertEquals("peer.hostname:b", h.register("b").toString());
+        // Third real value spills to the blocked sentinel (limit = 2).
+        assertEquals("peer.hostname:tracer_blocked_value", h.register("c").toString());
+    }
+
+    @Test
+    void propertyResetReturnsBlockedCount() {
+        PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 1);
+        h.register("a"); // within limit
+        h.register("b"); // blocked
+        h.register("c"); // blocked
+        assertEquals(2, h.reset());
+        assertEquals(0, h.reset()); // no blocks in the empty new cycle
+    }
+
+    @Test
+    void tagResetReturnsBlockedCount() {
+        TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 1);
+        h.register("a"); // within limit
+        h.register("b"); // blocked
+        h.register("c"); // blocked
+        assertEquals(2, h.reset());
+        assertEquals(0, h.reset()); // no blocks in the empty new cycle
+    }
+
+    // ---- limits-disabled mode (Config flag off): cache size still capped, but over-cap values
+    // get freshly-allocated UTF8 rather than the blocked sentinel.
+
+    @Test
+    void propertyOverLimitWithSentinelDisabledReturnsFreshUtf8() {
+        PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 2, false);
+        UTF8BytesString a = h.register("a");
+        UTF8BytesString b = h.register("b");
+        UTF8BytesString c = h.register("c");
+        UTF8BytesString d = h.register("d");
+
+        // Real values (not the "tracer_blocked_value" sentinel) so the wire format carries them.
+        assertEquals("c", c.toString());
+        assertEquals("d", d.toString());
+        // The first two stay cached and identity-stable.
+        assertSame(a, h.register("a"));
+        assertSame(b, h.register("b"));
+        // Over-cap values are NOT cached -- a second call allocates a fresh instance.
+        assertNotSame(c, h.register("c"));
+        assertEquals("c", h.register("c").toString());
+    }
+
+    @Test
+    void propertyOverLimitWithSentinelDisabledReusesPriorCycleInstances() {
+        // Prior-cycle reuse runs in disabled mode too: a value that was seen last cycle but is now
+        // over-budget still gets its prior-cycle UTF8BytesString back instead of an allocation.
+        PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 2, false);
+        UTF8BytesString cBeforeReset = h.register("c");
+
+        h.reset();
+
+        // Fill the budget with two different values so "c" lands over-cap.
+        h.register("x");
+        h.register("y");
+        UTF8BytesString cAfterReset = h.register("c");
+        assertSame(cBeforeReset, cAfterReset);
+    }
+
+    @Test
+    void tagOverLimitWithSentinelDisabledReturnsFreshUtf8() {
+        TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 1, false);
+        h.register("host-a");
+        UTF8BytesString hostB = h.register("host-b");
+        UTF8BytesString hostC = h.register("host-c");
+
+        assertEquals("peer.hostname:host-b", hostB.toString());
+        assertEquals("peer.hostname:host-c", hostC.toString());
+    }
+
+    @Test
+    void tagOverLimitWithSentinelDisabledNeverSubstitutesBlockedSentinel() {
+        TagCardinalityHandler h = new TagCardinalityHandler("peer.service", 1, false);
+        h.register("svc-1");
+        UTF8BytesString overCap = h.register("svc-2");
+        assertEquals("peer.service:svc-2", overCap.toString());
+    }
+
+    private static String stringOfLength(int length) {
+        char[] chars = new char[length];
+        Arrays.fill(chars, 'x');
+        return new String(chars);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/CardinalityLimitReporterTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/CardinalityLimitReporterTest.java
index 8190c07c2c3..5e5916b3c06 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/CardinalityLimitReporterTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/CardinalityLimitReporterTest.java
@@ -22,101 +22,101 @@
 
 class CardinalityLimitReporterTest {
 
-  private Logger logger;
-  private Level previousLevel;
-  private ListAppender<ILoggingEvent> appender;
-
-  @BeforeEach
-  void attachAppender() {
-    logger = (Logger) LoggerFactory.getLogger(CardinalityLimitReporter.class);
-    previousLevel = logger.getLevel();
-    // WARN (not DEBUG) so RatelimitedLogger takes the rate-limited path rather than logging always.
-    logger.setLevel(Level.WARN);
-    appender = new ListAppender<>();
-    appender.start();
-    logger.addAppender(appender);
-  }
-
-  @AfterEach
-  void detachAppender() {
-    logger.detachAppender(appender);
-    logger.setLevel(previousLevel);
-  }
-
-  @Test
-  void reportsNothingWhenNoBlocksRecorded() {
-    CardinalityLimitReporter reporter = new CardinalityLimitReporter();
-
-    reporter.reportIfDue();
-
-    assertEquals(0, appender.list.size());
-  }
-
-  @Test
-  void aggregatesCountsByTagNameIntoOneLine() {
-    CardinalityLimitReporter reporter = new CardinalityLimitReporter();
-    // Same tag recorded twice across cycles must sum; distinct tags each appear once.
-    reporter.record("resource", 5);
-    reporter.record("resource", 3);
-    reporter.record("peer.service", 2);
-
-    reporter.reportIfDue();
-
-    assertEquals(1, appender.list.size());
-    // Iteration order is the Hashtable's bucket order, not sorted -- assert each entry
-    // independently.
-    String message = appender.list.get(0).getFormattedMessage();
-    assertTrue(message.contains("resource=8"), message);
-    assertTrue(message.contains("peer.service=2"), message);
-    assertTrue(message.contains("tracer_blocked_value"), message);
-  }
-
-  @Test
-  void rateLimitsRepeatedReportsWithinTheWindow() {
-    CardinalityLimitReporter reporter = new CardinalityLimitReporter();
-    reporter.record("resource", 1);
-    reporter.reportIfDue(); // first call in the window logs immediately
-
-    // A later cycle within the 5-minute window records more but must not emit a second line.
-    reporter.record("resource", 4);
-    reporter.reportIfDue();
-
-    assertEquals(1, appender.list.size());
-  }
-
-  @Test
-  void retainsCountsUntilAWarningIsActuallyEmitted() {
-    // Drive the rate limiter directly: suppress the first attempt, permit the second. Counts
-    // recorded while suppressed must survive and appear -- summed with later counts -- in the line
-    // that is eventually emitted, and only then be cleared.
-    RatelimitedLogger rlLog = mock(RatelimitedLogger.class);
-    when(rlLog.warn(anyString(), any())).thenReturn(false, true);
-    CardinalityLimitReporter reporter = new CardinalityLimitReporter(rlLog);
-
-    reporter.record("resource", 3);
-    reporter.reportIfDue(); // suppressed: nothing cleared
-    reporter.record("resource", 4);
-    reporter.reportIfDue(); // permitted: emits the retained 3 + new 4
-
-    ArgumentCaptor<Object> summary = ArgumentCaptor.forClass(Object.class);
-    verify(rlLog, times(2)).warn(anyString(), summary.capture());
-    // First (suppressed) attempt still saw only 3; the emitting attempt carries the full 7.
-    assertEquals("resource=3", summary.getAllValues().get(0));
-    assertEquals("resource=7", summary.getAllValues().get(1));
-
-    // A successful emit cleared the store: with nothing recorded since, the next due-check
-    // short-circuits and never touches the logger again.
-    reporter.reportIfDue();
-    verify(rlLog, times(2)).warn(anyString(), any());
-  }
-
-  @Test
-  void zeroAndNegativeCountsAreIgnored() {
-    CardinalityLimitReporter reporter = new CardinalityLimitReporter();
-    reporter.record("resource", 0);
-
-    reporter.reportIfDue();
-
-    assertEquals(0, appender.list.size());
-  }
+    private Logger logger;
+    private Level previousLevel;
+    private ListAppender<ILoggingEvent> appender;
+
+    @BeforeEach
+    void attachAppender() {
+        logger = (Logger) LoggerFactory.getLogger(CardinalityLimitReporter.class);
+        previousLevel = logger.getLevel();
+        // WARN (not DEBUG) so RatelimitedLogger takes the rate-limited path rather than logging always.
+        logger.setLevel(Level.WARN);
+        appender = new ListAppender<>();
+        appender.start();
+        logger.addAppender(appender);
+    }
+
+    @AfterEach
+    void detachAppender() {
+        logger.detachAppender(appender);
+        logger.setLevel(previousLevel);
+    }
+
+    @Test
+    void reportsNothingWhenNoBlocksRecorded() {
+        CardinalityLimitReporter reporter = new CardinalityLimitReporter();
+
+        reporter.reportIfDue();
+
+        assertEquals(0, appender.list.size());
+    }
+
+    @Test
+    void aggregatesCountsByTagNameIntoOneLine() {
+        CardinalityLimitReporter reporter = new CardinalityLimitReporter();
+        // Same tag recorded twice across cycles must sum; distinct tags each appear once.
+        reporter.record("resource", 5);
+        reporter.record("resource", 3);
+        reporter.record("peer.service", 2);
+
+        reporter.reportIfDue();
+
+        assertEquals(1, appender.list.size());
+        // Iteration order is the Hashtable's bucket order, not sorted -- assert each entry
+        // independently.
+        String message = appender.list.get(0).getFormattedMessage();
+        assertTrue(message.contains("resource=8"), message);
+        assertTrue(message.contains("peer.service=2"), message);
+        assertTrue(message.contains("tracer_blocked_value"), message);
+    }
+
+    @Test
+    void rateLimitsRepeatedReportsWithinTheWindow() {
+        CardinalityLimitReporter reporter = new CardinalityLimitReporter();
+        reporter.record("resource", 1);
+        reporter.reportIfDue(); // first call in the window logs immediately
+
+        // A later cycle within the 5-minute window records more but must not emit a second line.
+        reporter.record("resource", 4);
+        reporter.reportIfDue();
+
+        assertEquals(1, appender.list.size());
+    }
+
+    @Test
+    void retainsCountsUntilAWarningIsActuallyEmitted() {
+        // Drive the rate limiter directly: suppress the first attempt, permit the second. Counts
+        // recorded while suppressed must survive and appear -- summed with later counts -- in the line
+        // that is eventually emitted, and only then be cleared.
+        RatelimitedLogger rlLog = mock(RatelimitedLogger.class);
+        when(rlLog.warn(anyString(), any())).thenReturn(false, true);
+        CardinalityLimitReporter reporter = new CardinalityLimitReporter(rlLog);
+
+        reporter.record("resource", 3);
+        reporter.reportIfDue(); // suppressed: nothing cleared
+        reporter.record("resource", 4);
+        reporter.reportIfDue(); // permitted: emits the retained 3 + new 4
+
+        ArgumentCaptor<Object> summary = ArgumentCaptor.forClass(Object.class);
+        verify(rlLog, times(2)).warn(anyString(), summary.capture());
+        // First (suppressed) attempt still saw only 3; the emitting attempt carries the full 7.
+        assertEquals("resource=3", summary.getAllValues().get(0));
+        assertEquals("resource=7", summary.getAllValues().get(1));
+
+        // A successful emit cleared the store: with nothing recorded since, the next due-check
+        // short-circuits and never touches the logger again.
+        reporter.reportIfDue();
+        verify(rlLog, times(2)).warn(anyString(), any());
+    }
+
+    @Test
+    void zeroAndNegativeCountsAreIgnored() {
+        CardinalityLimitReporter reporter = new CardinalityLimitReporter();
+        reporter.record("resource", 0);
+
+        reporter.reportIfDue();
+
+        assertEquals(0, appender.list.size());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorBootstrapTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorBootstrapTest.java
index 758f5db9910..7a22bb0d360 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorBootstrapTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorBootstrapTest.java
@@ -42,301 +42,289 @@
  */
 class ClientStatsAggregatorBootstrapTest {
 
-  @Test
-  void bootstrapHappensOnceOnFirstPublish() {
-    // Producer-side bootstrap is synchronized; we want to confirm only the first publish
-    // queries features and subsequent publishes hit the cached schema.
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(Collections.<String>singleton("peer.hostname"));
-    when(features.state()).thenReturn("state-1");
+    @Test
+    void bootstrapHappensOnceOnFirstPublish() {
+        // Producer-side bootstrap is synchronized; we want to confirm only the first publish
+        // queries features and subsequent publishes hit the cached schema.
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(Collections.<String>singleton("peer.hostname"));
+        when(features.state()).thenReturn("state-1");
 
-    ClientStatsAggregator aggregator =
-        new ClientStatsAggregator(
-            Collections.<String>emptySet(),
-            features,
-            healthMetrics,
-            sink,
-            writer,
-            /* maxAggregates */ 16,
-            /* queueSize */ 64,
-            /* reportingInterval */ 10,
-            SECONDS,
-            /* includeEndpointInMetrics */ false);
+        ClientStatsAggregator aggregator = new ClientStatsAggregator(
+                Collections.<String>emptySet(),
+                features,
+                healthMetrics,
+                sink,
+                writer,
+                /* maxAggregates */ 16,
+                /* queueSize */ 64,
+                /* reportingInterval */ 10,
+                SECONDS,
+                /* includeEndpointInMetrics */ false);
 
-    // Do not start the aggregator thread -- reconcile must not run, only bootstrap.
-    aggregator.publish(Collections.<CoreSpan<?>>singletonList(peerAggregationSpan()));
-    aggregator.publish(Collections.<CoreSpan<?>>singletonList(peerAggregationSpan()));
-    aggregator.publish(Collections.<CoreSpan<?>>singletonList(peerAggregationSpan()));
+        // Do not start the aggregator thread -- reconcile must not run, only bootstrap.
+        aggregator.publish(Collections.<CoreSpan<?>>singletonList(peerAggregationSpan()));
+        aggregator.publish(Collections.<CoreSpan<?>>singletonList(peerAggregationSpan()));
+        aggregator.publish(Collections.<CoreSpan<?>>singletonList(peerAggregationSpan()));
 
-    // Bootstrap is the only path that queries features for peer-tag schema, and it runs
-    // exactly once across three publishes.
-    verify(features, times(1)).peerTags();
-    verify(features, times(1)).state();
-    aggregator.close();
-  }
+        // Bootstrap is the only path that queries features for peer-tag schema, and it runs
+        // exactly once across three publishes.
+        verify(features, times(1)).peerTags();
+        verify(features, times(1)).state();
+        aggregator.close();
+    }
 
-  @Test
-  void reconcileSkipsDeepCompareWhenStateMatches() throws Exception {
-    // Two reporting cycles with the same (mocked-constant) discovery state -- the second
-    // reconcile must short-circuit on the state compare and avoid touching peerTags().
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(Collections.<String>singleton("peer.hostname"));
-    when(features.state()).thenReturn("state-1");
+    @Test
+    void reconcileSkipsDeepCompareWhenStateMatches() throws Exception {
+        // Two reporting cycles with the same (mocked-constant) discovery state -- the second
+        // reconcile must short-circuit on the state compare and avoid touching peerTags().
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(Collections.<String>singleton("peer.hostname"));
+        when(features.state()).thenReturn("state-1");
 
-    ClientStatsAggregator aggregator =
-        new ClientStatsAggregator(
-            Collections.<String>emptySet(),
-            features,
-            healthMetrics,
-            sink,
-            writer,
-            /* maxAggregates */ 16,
-            /* queueSize */ 64,
-            /* reportingInterval */ 10,
-            SECONDS,
-            /* includeEndpointInMetrics */ false);
-    aggregator.start();
-    try {
-      CountDownLatch cycle1 = new CountDownLatch(1);
-      CountDownLatch cycle2 = new CountDownLatch(1);
-      // Both reports flush a bucket; the cycle1/cycle2 countdowns synchronize the test thread
-      // with the aggregator thread's per-cycle completion.
-      org.mockito.Mockito.doAnswer(
-              invocation -> {
-                cycle1.countDown();
-                return null;
-              })
-          .doAnswer(
-              invocation -> {
-                cycle2.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
+        ClientStatsAggregator aggregator = new ClientStatsAggregator(
+                Collections.<String>emptySet(),
+                features,
+                healthMetrics,
+                sink,
+                writer,
+                /* maxAggregates */ 16,
+                /* queueSize */ 64,
+                /* reportingInterval */ 10,
+                SECONDS,
+                /* includeEndpointInMetrics */ false);
+        aggregator.start();
+        try {
+            CountDownLatch cycle1 = new CountDownLatch(1);
+            CountDownLatch cycle2 = new CountDownLatch(1);
+            // Both reports flush a bucket; the cycle1/cycle2 countdowns synchronize the test thread
+            // with the aggregator thread's per-cycle completion.
+            org.mockito.Mockito.doAnswer(invocation -> {
+                        cycle1.countDown();
+                        return null;
+                    })
+                    .doAnswer(invocation -> {
+                        cycle2.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
 
-      aggregator.publish(Collections.<CoreSpan<?>>singletonList(peerAggregationSpan()));
-      aggregator.report();
-      assertTrue(cycle1.await(2, SECONDS));
+            aggregator.publish(Collections.<CoreSpan<?>>singletonList(peerAggregationSpan()));
+            aggregator.report();
+            assertTrue(cycle1.await(2, SECONDS));
 
-      aggregator.publish(Collections.<CoreSpan<?>>singletonList(peerAggregationSpan()));
-      aggregator.report();
-      assertTrue(cycle2.await(2, SECONDS));
+            aggregator.publish(Collections.<CoreSpan<?>>singletonList(peerAggregationSpan()));
+            aggregator.report();
+            assertTrue(cycle2.await(2, SECONDS));
 
-      // peerTags() is called only by bootstrap; both reconciles short-circuit on the state
-      // fast path (cached state == features.state() == "state-1"), so neither reconcile reaches
-      // the deep set compare. Total peerTags() calls: 1.
-      verify(features, times(1)).peerTags();
-      // state() is called by bootstrap (1) + each reconcile (2) = 3 total.
-      verify(features, times(3)).state();
-    } finally {
-      aggregator.close();
+            // peerTags() is called only by bootstrap; both reconciles short-circuit on the state
+            // fast path (cached state == features.state() == "state-1"), so neither reconcile reaches
+            // the deep set compare. Total peerTags() calls: 1.
+            verify(features, times(1)).peerTags();
+            // state() is called by bootstrap (1) + each reconcile (2) = 3 total.
+            verify(features, times(3)).state();
+        } finally {
+            aggregator.close();
+        }
     }
-  }
 
-  @Test
-  void reconcileSurvivesStateChangeWhenTagsUnchanged() throws Exception {
-    // Behavioral cross-check on the "set is unchanged, just update state" branch: discovery
-    // refreshes (state hash moves) but the underlying tag set is identical. The aggregator must
-    // continue producing valid buckets for the same logical peer tag across cycles.
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    // peerTags() returns content-equal sets across calls -- the reconcile slow path's
-    // hasSameTagsAs check should return true.
-    when(features.peerTags())
-        .thenReturn(new LinkedHashSet<>(Collections.<String>singleton("peer.hostname")))
-        .thenReturn(new LinkedHashSet<>(Collections.<String>singleton("peer.hostname")))
-        .thenReturn(new LinkedHashSet<>(Collections.<String>singleton("peer.hostname")));
-    // State hash changes every reconcile -- forces reconcile into the slow path each time.
-    when(features.state()).thenReturn("state-1", "state-2", "state-3");
+    @Test
+    void reconcileSurvivesStateChangeWhenTagsUnchanged() throws Exception {
+        // Behavioral cross-check on the "set is unchanged, just update state" branch: discovery
+        // refreshes (state hash moves) but the underlying tag set is identical. The aggregator must
+        // continue producing valid buckets for the same logical peer tag across cycles.
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        // peerTags() returns content-equal sets across calls -- the reconcile slow path's
+        // hasSameTagsAs check should return true.
+        when(features.peerTags())
+                .thenReturn(new LinkedHashSet<>(Collections.<String>singleton("peer.hostname")))
+                .thenReturn(new LinkedHashSet<>(Collections.<String>singleton("peer.hostname")))
+                .thenReturn(new LinkedHashSet<>(Collections.<String>singleton("peer.hostname")));
+        // State hash changes every reconcile -- forces reconcile into the slow path each time.
+        when(features.state()).thenReturn("state-1", "state-2", "state-3");
 
-    ClientStatsAggregator aggregator =
-        new ClientStatsAggregator(
-            Collections.<String>emptySet(),
-            features,
-            healthMetrics,
-            sink,
-            writer,
-            /* maxAggregates */ 16,
-            /* queueSize */ 64,
-            /* reportingInterval */ 10,
-            SECONDS,
-            /* includeEndpointInMetrics */ false);
-    aggregator.start();
-    try {
-      CountDownLatch cycle1 = new CountDownLatch(1);
-      CountDownLatch cycle2 = new CountDownLatch(1);
-      org.mockito.Mockito.doAnswer(
-              invocation -> {
-                cycle1.countDown();
-                return null;
-              })
-          .doAnswer(
-              invocation -> {
-                cycle2.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
+        ClientStatsAggregator aggregator = new ClientStatsAggregator(
+                Collections.<String>emptySet(),
+                features,
+                healthMetrics,
+                sink,
+                writer,
+                /* maxAggregates */ 16,
+                /* queueSize */ 64,
+                /* reportingInterval */ 10,
+                SECONDS,
+                /* includeEndpointInMetrics */ false);
+        aggregator.start();
+        try {
+            CountDownLatch cycle1 = new CountDownLatch(1);
+            CountDownLatch cycle2 = new CountDownLatch(1);
+            org.mockito.Mockito.doAnswer(invocation -> {
+                        cycle1.countDown();
+                        return null;
+                    })
+                    .doAnswer(invocation -> {
+                        cycle2.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
 
-      aggregator.publish(Collections.<CoreSpan<?>>singletonList(peerAggregationSpan()));
-      aggregator.report();
-      assertTrue(cycle1.await(2, SECONDS));
+            aggregator.publish(Collections.<CoreSpan<?>>singletonList(peerAggregationSpan()));
+            aggregator.report();
+            assertTrue(cycle1.await(2, SECONDS));
 
-      aggregator.publish(Collections.<CoreSpan<?>>singletonList(peerAggregationSpan()));
-      aggregator.report();
-      assertTrue(cycle2.await(2, SECONDS));
+            aggregator.publish(Collections.<CoreSpan<?>>singletonList(peerAggregationSpan()));
+            aggregator.report();
+            assertTrue(cycle2.await(2, SECONDS));
 
-      // Both cycles flushed (both latches counted down via writer.finishBucket). The schema kept
-      // producing buckets across the state-hash changes; if the schema had been broken by the
-      // update-in-place path, the second cycle's flush would not have happened.
-      verify(writer, times(2)).finishBucket();
-      // Bootstrap (1) + two reconciles (2) -- each reconcile saw a state mismatch and went
-      // through the deep compare, calling peerTags() once = 3 total.
-      verify(features, times(3)).peerTags();
-      verify(features, atLeastOnce()).state();
-    } finally {
-      aggregator.close();
+            // Both cycles flushed (both latches counted down via writer.finishBucket). The schema kept
+            // producing buckets across the state-hash changes; if the schema had been broken by the
+            // update-in-place path, the second cycle's flush would not have happened.
+            verify(writer, times(2)).finishBucket();
+            // Bootstrap (1) + two reconciles (2) -- each reconcile saw a state mismatch and went
+            // through the deep compare, calling peerTags() once = 3 total.
+            verify(features, times(3)).peerTags();
+            verify(features, atLeastOnce()).state();
+        } finally {
+            aggregator.close();
+        }
     }
-  }
 
-  @Test
-  void reconcileSwapsSchemaWhenTagSetChanges() throws Exception {
-    // The reconcile slow-path's swap branch: discovery refreshes the state AND the tag set
-    // grows. Cached schema is rebuilt and the volatile reference points at the new schema.
-    // Verification is end-to-end -- we look at the AggregateEntry the writer receives. Pre-swap
-    // the span snapshot was pinned to the old schema so only peer.hostname appears; post-swap a
-    // new publish reads the new schema and the next flush carries both peer tags.
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    // peerTags() shape evolves across calls:
-    //   - bootstrap reads {peer.hostname}
-    //   - cycle 1 reconcile slow-path reads {peer.hostname, peer.service}
-    //   - cycle 2 reconcile is state fast-path (no peerTags call)
-    when(features.peerTags())
-        .thenReturn(Collections.<String>singleton("peer.hostname"))
-        .thenReturn(new LinkedHashSet<>(Arrays.asList("peer.hostname", "peer.service")));
-    // state() evolves: bootstrap = "state-1", then changes to "state-2" for cycle 1's reconcile
-    // (mismatch -> slow path), stable at "state-2" for cycle 2's reconcile (match -> fast path).
-    when(features.state()).thenReturn("state-1", "state-2", "state-2");
+    @Test
+    void reconcileSwapsSchemaWhenTagSetChanges() throws Exception {
+        // The reconcile slow-path's swap branch: discovery refreshes the state AND the tag set
+        // grows. Cached schema is rebuilt and the volatile reference points at the new schema.
+        // Verification is end-to-end -- we look at the AggregateEntry the writer receives. Pre-swap
+        // the span snapshot was pinned to the old schema so only peer.hostname appears; post-swap a
+        // new publish reads the new schema and the next flush carries both peer tags.
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        // peerTags() shape evolves across calls:
+        //   - bootstrap reads {peer.hostname}
+        //   - cycle 1 reconcile slow-path reads {peer.hostname, peer.service}
+        //   - cycle 2 reconcile is state fast-path (no peerTags call)
+        when(features.peerTags())
+                .thenReturn(Collections.<String>singleton("peer.hostname"))
+                .thenReturn(new LinkedHashSet<>(Arrays.asList("peer.hostname", "peer.service")));
+        // state() evolves: bootstrap = "state-1", then changes to "state-2" for cycle 1's reconcile
+        // (mismatch -> slow path), stable at "state-2" for cycle 2's reconcile (match -> fast path).
+        when(features.state()).thenReturn("state-1", "state-2", "state-2");
 
-    ClientStatsAggregator aggregator =
-        new ClientStatsAggregator(
-            Collections.<String>emptySet(),
-            features,
-            healthMetrics,
-            sink,
-            writer,
-            /* maxAggregates */ 16,
-            /* queueSize */ 64,
-            /* reportingInterval */ 10,
-            SECONDS,
-            /* includeEndpointInMetrics */ false);
-    aggregator.start();
-    try {
-      CountDownLatch cycle1 = new CountDownLatch(1);
-      CountDownLatch cycle2 = new CountDownLatch(1);
-      org.mockito.Mockito.doAnswer(
-              invocation -> {
-                cycle1.countDown();
-                return null;
-              })
-          .doAnswer(
-              invocation -> {
-                cycle2.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
+        ClientStatsAggregator aggregator = new ClientStatsAggregator(
+                Collections.<String>emptySet(),
+                features,
+                healthMetrics,
+                sink,
+                writer,
+                /* maxAggregates */ 16,
+                /* queueSize */ 64,
+                /* reportingInterval */ 10,
+                SECONDS,
+                /* includeEndpointInMetrics */ false);
+        aggregator.start();
+        try {
+            CountDownLatch cycle1 = new CountDownLatch(1);
+            CountDownLatch cycle2 = new CountDownLatch(1);
+            org.mockito.Mockito.doAnswer(invocation -> {
+                        cycle1.countDown();
+                        return null;
+                    })
+                    .doAnswer(invocation -> {
+                        cycle2.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
 
-      // Publish 1: snapshot pinned to the original {peer.hostname} schema. cycle 1's reconcile
-      // will swap the cached schema BEFORE the flush, but this snapshot is already pinned so the
-      // resulting AggregateEntry will still carry only peer.hostname.
-      aggregator.publish(
-          Collections.<CoreSpan<?>>singletonList(peerAggregationSpanWithBothPeerTags()));
-      aggregator.report();
-      assertTrue(cycle1.await(2, SECONDS));
+            // Publish 1: snapshot pinned to the original {peer.hostname} schema. cycle 1's reconcile
+            // will swap the cached schema BEFORE the flush, but this snapshot is already pinned so the
+            // resulting AggregateEntry will still carry only peer.hostname.
+            aggregator.publish(Collections.<CoreSpan<?>>singletonList(peerAggregationSpanWithBothPeerTags()));
+            aggregator.report();
+            assertTrue(cycle1.await(2, SECONDS));
 
-      // Publish 2: now reads the post-swap schema {peer.hostname, peer.service} so the snapshot
-      // captures both tag values. cycle 2's reconcile short-circuits on timestamp match.
-      aggregator.publish(
-          Collections.<CoreSpan<?>>singletonList(peerAggregationSpanWithBothPeerTags()));
-      aggregator.report();
-      assertTrue(cycle2.await(2, SECONDS));
+            // Publish 2: now reads the post-swap schema {peer.hostname, peer.service} so the snapshot
+            // captures both tag values. cycle 2's reconcile short-circuits on timestamp match.
+            aggregator.publish(Collections.<CoreSpan<?>>singletonList(peerAggregationSpanWithBothPeerTags()));
+            aggregator.report();
+            assertTrue(cycle2.await(2, SECONDS));
 
-      // Capture every AggregateEntry the writer saw across both cycles. Pre-swap snapshot has 1
-      // peer tag, post-swap has 2.
-      ArgumentCaptor<AggregateEntry> entryCaptor = ArgumentCaptor.forClass(AggregateEntry.class);
-      verify(writer, times(2)).add(entryCaptor.capture());
-      List<AggregateEntry> entries = entryCaptor.getAllValues();
-      assertEquals(
-          Collections.singletonList(UTF8BytesString.create("peer.hostname:localhost")),
-          entries.get(0).getPeerTags(),
-          "pre-swap snapshot should encode only peer.hostname");
-      assertEquals(
-          Arrays.asList(
-              UTF8BytesString.create("peer.hostname:localhost"),
-              UTF8BytesString.create("peer.service:billing")),
-          entries.get(1).getPeerTags(),
-          "post-swap snapshot should encode both peer.hostname and peer.service");
+            // Capture every AggregateEntry the writer saw across both cycles. Pre-swap snapshot has 1
+            // peer tag, post-swap has 2.
+            ArgumentCaptor<AggregateEntry> entryCaptor = ArgumentCaptor.forClass(AggregateEntry.class);
+            verify(writer, times(2)).add(entryCaptor.capture());
+            List<AggregateEntry> entries = entryCaptor.getAllValues();
+            assertEquals(
+                    Collections.singletonList(UTF8BytesString.create("peer.hostname:localhost")),
+                    entries.get(0).getPeerTags(),
+                    "pre-swap snapshot should encode only peer.hostname");
+            assertEquals(
+                    Arrays.asList(
+                            UTF8BytesString.create("peer.hostname:localhost"),
+                            UTF8BytesString.create("peer.service:billing")),
+                    entries.get(1).getPeerTags(),
+                    "post-swap snapshot should encode both peer.hostname and peer.service");
 
-      // Bootstrap (1) + cycle 1 slow-path (1) -- cycle 2 is fast-path so doesn't reach peerTags().
-      verify(features, times(2)).peerTags();
-      verify(features, atLeastOnce()).state();
-    } finally {
-      aggregator.close();
+            // Bootstrap (1) + cycle 1 slow-path (1) -- cycle 2 is fast-path so doesn't reach peerTags().
+            verify(features, times(2)).peerTags();
+            verify(features, atLeastOnce()).state();
+        } finally {
+            aggregator.close();
+        }
     }
-  }
 
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  private static CoreSpan<?> peerAggregationSpan() {
-    CoreSpan span = mock(CoreSpan.class);
-    when(span.isMeasured()).thenReturn(false);
-    when(span.isTopLevel()).thenReturn(true);
-    // Return true for any SpanKindFilter -- shouldComputeMetric will see METRICS_ELIGIBLE_KINDS
-    // match, and peerTagSchemaFor will see PEER_AGGREGATION_KINDS match (checked first), which
-    // routes the span through the bootstrap path.
-    when(span.isKind(any(SpanKindFilter.class))).thenReturn(true);
-    when(span.getLongRunningVersion()).thenReturn(0);
-    when(span.getDurationNano()).thenReturn(100L);
-    when(span.getError()).thenReturn(0);
-    when(span.getResourceName()).thenReturn("resource");
-    when(span.getServiceName()).thenReturn("svc");
-    when(span.getOperationName()).thenReturn("op");
-    when(span.getServiceNameSource()).thenReturn(null);
-    when(span.getType()).thenReturn("web");
-    when(span.getHttpStatusCode()).thenReturn((short) 200);
-    when(span.getParentId()).thenReturn(0L);
-    when(span.getOrigin()).thenReturn(null);
-    when(span.getSpanKindString()).thenReturn("client");
-    // peer.hostname tag is set so capturePeerTagValues fires for the bootstrapped schema.
-    when(span.unsafeGetTag("peer.hostname")).thenReturn("localhost");
-    return span;
-  }
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private static CoreSpan<?> peerAggregationSpan() {
+        CoreSpan span = mock(CoreSpan.class);
+        when(span.isMeasured()).thenReturn(false);
+        when(span.isTopLevel()).thenReturn(true);
+        // Return true for any SpanKindFilter -- shouldComputeMetric will see METRICS_ELIGIBLE_KINDS
+        // match, and peerTagSchemaFor will see PEER_AGGREGATION_KINDS match (checked first), which
+        // routes the span through the bootstrap path.
+        when(span.isKind(any(SpanKindFilter.class))).thenReturn(true);
+        when(span.getLongRunningVersion()).thenReturn(0);
+        when(span.getDurationNano()).thenReturn(100L);
+        when(span.getError()).thenReturn(0);
+        when(span.getResourceName()).thenReturn("resource");
+        when(span.getServiceName()).thenReturn("svc");
+        when(span.getOperationName()).thenReturn("op");
+        when(span.getServiceNameSource()).thenReturn(null);
+        when(span.getType()).thenReturn("web");
+        when(span.getHttpStatusCode()).thenReturn((short) 200);
+        when(span.getParentId()).thenReturn(0L);
+        when(span.getOrigin()).thenReturn(null);
+        when(span.getSpanKindString()).thenReturn("client");
+        // peer.hostname tag is set so capturePeerTagValues fires for the bootstrapped schema.
+        when(span.unsafeGetTag("peer.hostname")).thenReturn("localhost");
+        return span;
+    }
 
-  /**
-   * Variant of {@link #peerAggregationSpan()} that sets both {@code peer.hostname} and {@code
-   * peer.service}. Used by {@link #reconcileSwapsSchemaWhenTagSetChanges()} where the schema
-   * evolves from {@code {peer.hostname}} to {@code {peer.hostname, peer.service}} mid-test, and the
-   * post-swap snapshot must be able to capture the newly-relevant tag value.
-   */
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  private static CoreSpan<?> peerAggregationSpanWithBothPeerTags() {
-    CoreSpan span = peerAggregationSpan();
-    when(span.unsafeGetTag("peer.service")).thenReturn("billing");
-    return span;
-  }
+    /**
+     * Variant of {@link #peerAggregationSpan()} that sets both {@code peer.hostname} and {@code
+     * peer.service}. Used by {@link #reconcileSwapsSchemaWhenTagSetChanges()} where the schema
+     * evolves from {@code {peer.hostname}} to {@code {peer.hostname, peer.service}} mid-test, and the
+     * post-swap snapshot must be able to capture the newly-relevant tag value.
+     */
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private static CoreSpan<?> peerAggregationSpanWithBothPeerTags() {
+        CoreSpan span = peerAggregationSpan();
+        when(span.unsafeGetTag("peer.service")).thenReturn("billing");
+        return span;
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorDisableTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorDisableTest.java
index 3239cca4e90..87482e0102e 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorDisableTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorDisableTest.java
@@ -45,188 +45,184 @@
  */
 class ClientStatsAggregatorDisableTest {
 
-  @Test
-  void downgradeRoutesClearThroughInboxBeforeNextReport() throws Exception {
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(Collections.<String>emptySet());
-    when(features.state()).thenReturn("state-1");
-
-    ClientStatsAggregator aggregator =
-        new ClientStatsAggregator(
-            Collections.<String>emptySet(),
-            features,
-            healthMetrics,
-            sink,
-            writer,
-            /* maxAggregates */ 16,
-            /* queueSize */ 64,
-            /* reportingInterval */ 10,
-            SECONDS,
-            /* includeEndpointInMetrics */ false);
-    aggregator.start();
-    try {
-      // Baseline: publish a span, run a report, verify the table flushes normally. This gives
-      // us a clean post-first-report state with the aggregator's reconcile already having fired
-      // once on the aggregator thread.
-      CountDownLatch firstFlush = new CountDownLatch(1);
-      org.mockito.Mockito.doAnswer(
-              invocation -> {
-                firstFlush.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      aggregator.publish(Collections.<CoreSpan<?>>singletonList(metricsEligibleSpan()));
-      aggregator.report();
-      assertTrue(firstFlush.await(2, SECONDS));
-
-      // Reset writer-side mock interactions so the post-disable verify() blocks below only see
-      // what happens after the downgrade. features mock keeps accumulating call counts -- we use
-      // those counts as a latch on aggregator-thread reconcile timing.
-      reset(writer);
-
-      // Flip the discovery state. disable()'s first action is features.discover() followed by a
-      // features.supportsMetrics() check; returning false here selects the clear path.
-      when(features.supportsMetrics()).thenReturn(false);
-
-      // Fire DOWNGRADED on the test thread. This is the production scenario where the OkHttpSink
-      // callback thread triggers onEvent. disable() offers ClearSignal.CLEAR to the inbox but
-      // does not (and must not) mutate AggregateTable directly here.
-      aggregator.onEvent(EventListener.EventType.DOWNGRADED, "");
-
-      // First: verify nothing flushes immediately after disable. We can't pin reconcile-on-the-
-      // aggregator-thread as a latch here because CLEAR's inbox.clear() drops any REPORT we'd
-      // queue behind it -- so we just wait a window for any flush attempt to materialize.
-      verify(writer, after(500).never()).startBucket(anyInt(), anyLong(), anyLong());
-
-      // Stronger contract: prove the table is actually empty after CLEAR by re-enabling metrics
-      // and publishing a *marker* span with a distinct resource name. The next report should
-      // flush exactly one entry -- the marker -- with the original "resource" gone. If disable()
-      // had failed to clear the table (or had cleared it from the wrong thread and corrupted
-      // bucket chains), this assertion would catch it.
-      when(features.supportsMetrics()).thenReturn(true);
-      CountDownLatch postClearFlush = new CountDownLatch(1);
-      org.mockito.Mockito.doAnswer(
-              invocation -> {
-                postClearFlush.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-      aggregator.publish(Collections.<CoreSpan<?>>singletonList(markerSpan()));
-      aggregator.report();
-      assertTrue(postClearFlush.await(2, SECONDS));
-
-      ArgumentCaptor<AggregateEntry> entryCaptor = ArgumentCaptor.forClass(AggregateEntry.class);
-      verify(writer, times(1)).add(entryCaptor.capture());
-      assertEquals(
-          "marker-resource",
-          entryCaptor.getValue().getResource().toString(),
-          "post-CLEAR bucket should contain only the marker -- the original entry was wiped");
-    } finally {
-      aggregator.close();
+    @Test
+    void downgradeRoutesClearThroughInboxBeforeNextReport() throws Exception {
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(Collections.<String>emptySet());
+        when(features.state()).thenReturn("state-1");
+
+        ClientStatsAggregator aggregator = new ClientStatsAggregator(
+                Collections.<String>emptySet(),
+                features,
+                healthMetrics,
+                sink,
+                writer,
+                /* maxAggregates */ 16,
+                /* queueSize */ 64,
+                /* reportingInterval */ 10,
+                SECONDS,
+                /* includeEndpointInMetrics */ false);
+        aggregator.start();
+        try {
+            // Baseline: publish a span, run a report, verify the table flushes normally. This gives
+            // us a clean post-first-report state with the aggregator's reconcile already having fired
+            // once on the aggregator thread.
+            CountDownLatch firstFlush = new CountDownLatch(1);
+            org.mockito.Mockito.doAnswer(invocation -> {
+                        firstFlush.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            aggregator.publish(Collections.<CoreSpan<?>>singletonList(metricsEligibleSpan()));
+            aggregator.report();
+            assertTrue(firstFlush.await(2, SECONDS));
+
+            // Reset writer-side mock interactions so the post-disable verify() blocks below only see
+            // what happens after the downgrade. features mock keeps accumulating call counts -- we use
+            // those counts as a latch on aggregator-thread reconcile timing.
+            reset(writer);
+
+            // Flip the discovery state. disable()'s first action is features.discover() followed by a
+            // features.supportsMetrics() check; returning false here selects the clear path.
+            when(features.supportsMetrics()).thenReturn(false);
+
+            // Fire DOWNGRADED on the test thread. This is the production scenario where the OkHttpSink
+            // callback thread triggers onEvent. disable() offers ClearSignal.CLEAR to the inbox but
+            // does not (and must not) mutate AggregateTable directly here.
+            aggregator.onEvent(EventListener.EventType.DOWNGRADED, "");
+
+            // First: verify nothing flushes immediately after disable. We can't pin reconcile-on-the-
+            // aggregator-thread as a latch here because CLEAR's inbox.clear() drops any REPORT we'd
+            // queue behind it -- so we just wait a window for any flush attempt to materialize.
+            verify(writer, after(500).never()).startBucket(anyInt(), anyLong(), anyLong());
+
+            // Stronger contract: prove the table is actually empty after CLEAR by re-enabling metrics
+            // and publishing a *marker* span with a distinct resource name. The next report should
+            // flush exactly one entry -- the marker -- with the original "resource" gone. If disable()
+            // had failed to clear the table (or had cleared it from the wrong thread and corrupted
+            // bucket chains), this assertion would catch it.
+            when(features.supportsMetrics()).thenReturn(true);
+            CountDownLatch postClearFlush = new CountDownLatch(1);
+            org.mockito.Mockito.doAnswer(invocation -> {
+                        postClearFlush.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+            aggregator.publish(Collections.<CoreSpan<?>>singletonList(markerSpan()));
+            aggregator.report();
+            assertTrue(postClearFlush.await(2, SECONDS));
+
+            ArgumentCaptor<AggregateEntry> entryCaptor = ArgumentCaptor.forClass(AggregateEntry.class);
+            verify(writer, times(1)).add(entryCaptor.capture());
+            assertEquals(
+                    "marker-resource",
+                    entryCaptor.getValue().getResource().toString(),
+                    "post-CLEAR bucket should contain only the marker -- the original entry was wiped");
+        } finally {
+            aggregator.close();
+        }
     }
-  }
-
-  @Test
-  void clearDoesNotTrampleQueuedStopSignal() throws Exception {
-    // CLEAR handler clears only the aggregates table; queued signals (STOP, REPORT) survive and
-    // get processed normally.
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(Collections.<String>emptySet());
-    when(features.state()).thenReturn("state-1");
-
-    ClientStatsAggregator aggregator =
-        new ClientStatsAggregator(
-            Collections.<String>emptySet(),
-            features,
-            healthMetrics,
-            sink,
-            writer,
-            /* maxAggregates */ 16,
-            /* queueSize */ 64,
-            /* reportingInterval */ 10,
-            SECONDS,
-            /* includeEndpointInMetrics */ false);
-    aggregator.start();
-
-    // Force at least one snapshot into the inbox so the aggregator has something to drain.
-    aggregator.publish(Collections.<CoreSpan<?>>singletonList(metricsEligibleSpan()));
-
-    // Fire DOWNGRADED on this thread. disable() flips supportsMetrics() to false and offers
-    // CLEAR. Then immediately call close() which offers STOP. If CLEAR's handler clears the
-    // inbox, STOP gets trampled and close() hangs until the join timeout.
-    when(features.supportsMetrics()).thenReturn(false);
-    aggregator.onEvent(EventListener.EventType.DOWNGRADED, "");
-
-    // close() is synchronous; bound it ourselves rather than trusting THREAD_JOIN_TIMEOUT_MS.
-    long deadlineNanos = System.nanoTime() + java.util.concurrent.TimeUnit.SECONDS.toNanos(2);
-    Thread closer = new Thread(aggregator::close, "test-closer");
-    closer.start();
-    while (closer.isAlive() && System.nanoTime() < deadlineNanos) {
-      closer.join(50);
+
+    @Test
+    void clearDoesNotTrampleQueuedStopSignal() throws Exception {
+        // CLEAR handler clears only the aggregates table; queued signals (STOP, REPORT) survive and
+        // get processed normally.
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(Collections.<String>emptySet());
+        when(features.state()).thenReturn("state-1");
+
+        ClientStatsAggregator aggregator = new ClientStatsAggregator(
+                Collections.<String>emptySet(),
+                features,
+                healthMetrics,
+                sink,
+                writer,
+                /* maxAggregates */ 16,
+                /* queueSize */ 64,
+                /* reportingInterval */ 10,
+                SECONDS,
+                /* includeEndpointInMetrics */ false);
+        aggregator.start();
+
+        // Force at least one snapshot into the inbox so the aggregator has something to drain.
+        aggregator.publish(Collections.<CoreSpan<?>>singletonList(metricsEligibleSpan()));
+
+        // Fire DOWNGRADED on this thread. disable() flips supportsMetrics() to false and offers
+        // CLEAR. Then immediately call close() which offers STOP. If CLEAR's handler clears the
+        // inbox, STOP gets trampled and close() hangs until the join timeout.
+        when(features.supportsMetrics()).thenReturn(false);
+        aggregator.onEvent(EventListener.EventType.DOWNGRADED, "");
+
+        // close() is synchronous; bound it ourselves rather than trusting THREAD_JOIN_TIMEOUT_MS.
+        long deadlineNanos = System.nanoTime() + java.util.concurrent.TimeUnit.SECONDS.toNanos(2);
+        Thread closer = new Thread(aggregator::close, "test-closer");
+        closer.start();
+        while (closer.isAlive() && System.nanoTime() < deadlineNanos) {
+            closer.join(50);
+        }
+        assertTrue(
+                !closer.isAlive(),
+                "close() must return promptly -- if CLEAR trampled STOP, this hangs out the join timeout");
+    }
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private static CoreSpan<?> metricsEligibleSpan() {
+        CoreSpan span = mock(CoreSpan.class);
+        when(span.isMeasured()).thenReturn(false);
+        when(span.isTopLevel()).thenReturn(true);
+        // Return true for any SpanKindFilter so peerTagSchemaFor enters the bootstrap path on the
+        // first publish. We want that bootstrap to fire (it's what makes features.state()
+        // observable), even though peerTags() returns emptySet here and the resulting schema has
+        // size 0.
+        when(span.isKind(any(SpanKindFilter.class))).thenReturn(true);
+        when(span.getLongRunningVersion()).thenReturn(0);
+        when(span.getDurationNano()).thenReturn(100L);
+        when(span.getError()).thenReturn(0);
+        when(span.getResourceName()).thenReturn("resource");
+        when(span.getServiceName()).thenReturn("svc");
+        when(span.getOperationName()).thenReturn("op");
+        when(span.getServiceNameSource()).thenReturn(null);
+        when(span.getType()).thenReturn("web");
+        when(span.getHttpStatusCode()).thenReturn((short) 200);
+        when(span.getParentId()).thenReturn(0L);
+        when(span.getOrigin()).thenReturn(null);
+        when(span.getSpanKindString()).thenReturn("client");
+        return span;
+    }
+
+    /**
+     * Distinct from {@link #metricsEligibleSpan()} via the resource name: post-CLEAR the writer
+     * should see "marker-resource", proving the original "resource" entry is gone from the table.
+     */
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private static CoreSpan<?> markerSpan() {
+        CoreSpan span = mock(CoreSpan.class);
+        when(span.isMeasured()).thenReturn(false);
+        when(span.isTopLevel()).thenReturn(true);
+        when(span.isKind(any(SpanKindFilter.class))).thenReturn(true);
+        when(span.getLongRunningVersion()).thenReturn(0);
+        when(span.getDurationNano()).thenReturn(100L);
+        when(span.getError()).thenReturn(0);
+        when(span.getResourceName()).thenReturn("marker-resource");
+        when(span.getServiceName()).thenReturn("svc");
+        when(span.getOperationName()).thenReturn("op");
+        when(span.getServiceNameSource()).thenReturn(null);
+        when(span.getType()).thenReturn("web");
+        when(span.getHttpStatusCode()).thenReturn((short) 200);
+        when(span.getParentId()).thenReturn(0L);
+        when(span.getOrigin()).thenReturn(null);
+        when(span.getSpanKindString()).thenReturn("client");
+        return span;
     }
-    assertTrue(
-        !closer.isAlive(),
-        "close() must return promptly -- if CLEAR trampled STOP, this hangs out the join timeout");
-  }
-
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  private static CoreSpan<?> metricsEligibleSpan() {
-    CoreSpan span = mock(CoreSpan.class);
-    when(span.isMeasured()).thenReturn(false);
-    when(span.isTopLevel()).thenReturn(true);
-    // Return true for any SpanKindFilter so peerTagSchemaFor enters the bootstrap path on the
-    // first publish. We want that bootstrap to fire (it's what makes features.state()
-    // observable), even though peerTags() returns emptySet here and the resulting schema has
-    // size 0.
-    when(span.isKind(any(SpanKindFilter.class))).thenReturn(true);
-    when(span.getLongRunningVersion()).thenReturn(0);
-    when(span.getDurationNano()).thenReturn(100L);
-    when(span.getError()).thenReturn(0);
-    when(span.getResourceName()).thenReturn("resource");
-    when(span.getServiceName()).thenReturn("svc");
-    when(span.getOperationName()).thenReturn("op");
-    when(span.getServiceNameSource()).thenReturn(null);
-    when(span.getType()).thenReturn("web");
-    when(span.getHttpStatusCode()).thenReturn((short) 200);
-    when(span.getParentId()).thenReturn(0L);
-    when(span.getOrigin()).thenReturn(null);
-    when(span.getSpanKindString()).thenReturn("client");
-    return span;
-  }
-
-  /**
-   * Distinct from {@link #metricsEligibleSpan()} via the resource name: post-CLEAR the writer
-   * should see "marker-resource", proving the original "resource" entry is gone from the table.
-   */
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  private static CoreSpan<?> markerSpan() {
-    CoreSpan span = mock(CoreSpan.class);
-    when(span.isMeasured()).thenReturn(false);
-    when(span.isTopLevel()).thenReturn(true);
-    when(span.isKind(any(SpanKindFilter.class))).thenReturn(true);
-    when(span.getLongRunningVersion()).thenReturn(0);
-    when(span.getDurationNano()).thenReturn(100L);
-    when(span.getError()).thenReturn(0);
-    when(span.getResourceName()).thenReturn("marker-resource");
-    when(span.getServiceName()).thenReturn("svc");
-    when(span.getOperationName()).thenReturn("op");
-    when(span.getServiceNameSource()).thenReturn(null);
-    when(span.getType()).thenReturn("web");
-    when(span.getHttpStatusCode()).thenReturn((short) 200);
-    when(span.getParentId()).thenReturn(0L);
-    when(span.getOrigin()).thenReturn(null);
-    when(span.getSpanKindString()).thenReturn("client");
-    return span;
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorInboxFullTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorInboxFullTest.java
index 3683bef7f42..f46516a00ee 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorInboxFullTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorInboxFullTest.java
@@ -22,61 +22,60 @@
  */
 class ClientStatsAggregatorInboxFullTest {
 
-  @Test
-  void publishFiresOnStatsInboxFullOnceInboxIsAtCapacity() {
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(Collections.<String>emptySet());
+    @Test
+    void publishFiresOnStatsInboxFullOnceInboxIsAtCapacity() {
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(Collections.<String>emptySet());
 
-    // Small inbox; jctools MPSC array queue rounds up to the next power of two, so use a power of
-    // two directly. Note: we deliberately do NOT call aggregator.start() so the consumer thread
-    // never drains -- snapshots accumulate in the inbox until capacity, then the next publish hits
-    // the size-vs-capacity fast path.
-    int queueSize = 8;
-    ClientStatsAggregator aggregator =
-        new ClientStatsAggregator(
-            Collections.<String>emptySet(),
-            features,
-            healthMetrics,
-            sink,
-            writer,
-            /* maxAggregates */ 16,
-            queueSize,
-            /* reportingInterval */ 10,
-            SECONDS,
-            /* includeEndpointInMetrics */ false);
+        // Small inbox; jctools MPSC array queue rounds up to the next power of two, so use a power of
+        // two directly. Note: we deliberately do NOT call aggregator.start() so the consumer thread
+        // never drains -- snapshots accumulate in the inbox until capacity, then the next publish hits
+        // the size-vs-capacity fast path.
+        int queueSize = 8;
+        ClientStatsAggregator aggregator = new ClientStatsAggregator(
+                Collections.<String>emptySet(),
+                features,
+                healthMetrics,
+                sink,
+                writer,
+                /* maxAggregates */ 16,
+                queueSize,
+                /* reportingInterval */ 10,
+                SECONDS,
+                /* includeEndpointInMetrics */ false);
 
-    // Publish well past capacity. The first `queueSize` calls land in the inbox; subsequent calls
-    // see size >= capacity and hit the fast path.
-    for (int i = 0; i < queueSize * 4; i++) {
-      aggregator.publish(Collections.<CoreSpan<?>>singletonList(metricsEligibleSpan()));
-    }
+        // Publish well past capacity. The first `queueSize` calls land in the inbox; subsequent calls
+        // see size >= capacity and hit the fast path.
+        for (int i = 0; i < queueSize * 4; i++) {
+            aggregator.publish(Collections.<CoreSpan<?>>singletonList(metricsEligibleSpan()));
+        }
 
-    verify(healthMetrics, atLeastOnce()).onStatsInboxFull();
-    aggregator.close();
-  }
+        verify(healthMetrics, atLeastOnce()).onStatsInboxFull();
+        aggregator.close();
+    }
 
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  private static CoreSpan<?> metricsEligibleSpan() {
-    CoreSpan span = mock(CoreSpan.class);
-    when(span.isMeasured()).thenReturn(false);
-    when(span.isTopLevel()).thenReturn(true);
-    when(span.isKind(any(SpanKindFilter.class))).thenReturn(false);
-    when(span.getLongRunningVersion()).thenReturn(0);
-    when(span.getDurationNano()).thenReturn(100L);
-    when(span.getError()).thenReturn(0);
-    when(span.getResourceName()).thenReturn("resource");
-    when(span.getServiceName()).thenReturn("svc");
-    when(span.getOperationName()).thenReturn("op");
-    when(span.getServiceNameSource()).thenReturn(null);
-    when(span.getType()).thenReturn("web");
-    when(span.getHttpStatusCode()).thenReturn((short) 200);
-    when(span.getParentId()).thenReturn(0L);
-    when(span.getOrigin()).thenReturn(null);
-    when(span.getSpanKindString()).thenReturn("client");
-    return span;
-  }
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private static CoreSpan<?> metricsEligibleSpan() {
+        CoreSpan span = mock(CoreSpan.class);
+        when(span.isMeasured()).thenReturn(false);
+        when(span.isTopLevel()).thenReturn(true);
+        when(span.isKind(any(SpanKindFilter.class))).thenReturn(false);
+        when(span.getLongRunningVersion()).thenReturn(0);
+        when(span.getDurationNano()).thenReturn(100L);
+        when(span.getError()).thenReturn(0);
+        when(span.getResourceName()).thenReturn("resource");
+        when(span.getServiceName()).thenReturn("svc");
+        when(span.getOperationName()).thenReturn("op");
+        when(span.getServiceNameSource()).thenReturn(null);
+        when(span.getType()).thenReturn("web");
+        when(span.getHttpStatusCode()).thenReturn((short) 200);
+        when(span.getParentId()).thenReturn(0L);
+        when(span.getOrigin()).thenReturn(null);
+        when(span.getSpanKindString()).thenReturn("client");
+        return span;
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorOtlpExportTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorOtlpExportTest.java
index b8d56bde658..93c375f48a0 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorOtlpExportTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorOtlpExportTest.java
@@ -26,60 +26,59 @@
  */
 class ClientStatsAggregatorOtlpExportTest {
 
-  @Test
-  void grpcStatusExtractedFromGrpcTypedSpanOnOtlpPath() throws Exception {
-    OtlpStatsMetricWriter writer = mock(OtlpStatsMetricWriter.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.peerTags()).thenReturn(Collections.<String>emptySet());
-    Sink sink = mock(Sink.class);
+    @Test
+    void grpcStatusExtractedFromGrpcTypedSpanOnOtlpPath() throws Exception {
+        OtlpStatsMetricWriter writer = mock(OtlpStatsMetricWriter.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.peerTags()).thenReturn(Collections.<String>emptySet());
+        Sink sink = mock(Sink.class);
 
-    ClientStatsAggregator aggregator =
-        new ClientStatsAggregator(
-            Collections.<String>emptySet(),
-            features,
-            HealthMetrics.NO_OP,
-            sink,
-            writer,
-            /* maxAggregates */ 16,
-            /* queueSize */ 16,
-            /* reportingInterval */ 10,
-            SECONDS,
-            /* includeEndpointInMetrics */ false);
-    aggregator.start();
-    try {
-      // A span typed "grpc" (not "rpc") carrying grpc.status.code -- a key + type combo the native
-      // v0.6 path would not surface. On the OTLP path it must still be extracted.
-      aggregator.publish(Collections.<CoreSpan<?>>singletonList(grpcSpan("grpc.status.code", "0")));
-      aggregator.forceReport().get(5, SECONDS);
+        ClientStatsAggregator aggregator = new ClientStatsAggregator(
+                Collections.<String>emptySet(),
+                features,
+                HealthMetrics.NO_OP,
+                sink,
+                writer,
+                /* maxAggregates */ 16,
+                /* queueSize */ 16,
+                /* reportingInterval */ 10,
+                SECONDS,
+                /* includeEndpointInMetrics */ false);
+        aggregator.start();
+        try {
+            // A span typed "grpc" (not "rpc") carrying grpc.status.code -- a key + type combo the native
+            // v0.6 path would not surface. On the OTLP path it must still be extracted.
+            aggregator.publish(Collections.<CoreSpan<?>>singletonList(grpcSpan("grpc.status.code", "0")));
+            aggregator.forceReport().get(5, SECONDS);
 
-      ArgumentCaptor<AggregateEntry> captor = ArgumentCaptor.forClass(AggregateEntry.class);
-      verify(writer).add(captor.capture());
-      assertEquals("0", captor.getValue().getGrpcStatusCode().toString());
-    } finally {
-      aggregator.close();
+            ArgumentCaptor<AggregateEntry> captor = ArgumentCaptor.forClass(AggregateEntry.class);
+            verify(writer).add(captor.capture());
+            assertEquals("0", captor.getValue().getGrpcStatusCode().toString());
+        } finally {
+            aggregator.close();
+        }
     }
-  }
 
-  /** A metrics-eligible, top-level span typed {@code grpc} carrying a single tag. */
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  private static CoreSpan<?> grpcSpan(String tagKey, String tagValue) {
-    CoreSpan span = mock(CoreSpan.class);
-    when(span.isMeasured()).thenReturn(false);
-    when(span.isTopLevel()).thenReturn(true);
-    when(span.isKind(any(SpanKindFilter.class))).thenReturn(false);
-    when(span.getLongRunningVersion()).thenReturn(0);
-    when(span.getDurationNano()).thenReturn(SECONDS.toNanos(1));
-    when(span.getError()).thenReturn(0);
-    when(span.getResourceName()).thenReturn("grpc.request");
-    when(span.getServiceName()).thenReturn("svc");
-    when(span.getOperationName()).thenReturn("grpc.request");
-    when(span.getServiceNameSource()).thenReturn(null);
-    when(span.getType()).thenReturn("grpc");
-    when(span.getHttpStatusCode()).thenReturn((short) 0);
-    when(span.getParentId()).thenReturn(0L);
-    when(span.getOrigin()).thenReturn(null);
-    when(span.unsafeGetTag(eq(Tags.SPAN_KIND), any(CharSequence.class))).thenReturn("");
-    when(span.unsafeGetTag(tagKey)).thenReturn(tagValue);
-    return span;
-  }
+    /** A metrics-eligible, top-level span typed {@code grpc} carrying a single tag. */
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private static CoreSpan<?> grpcSpan(String tagKey, String tagValue) {
+        CoreSpan span = mock(CoreSpan.class);
+        when(span.isMeasured()).thenReturn(false);
+        when(span.isTopLevel()).thenReturn(true);
+        when(span.isKind(any(SpanKindFilter.class))).thenReturn(false);
+        when(span.getLongRunningVersion()).thenReturn(0);
+        when(span.getDurationNano()).thenReturn(SECONDS.toNanos(1));
+        when(span.getError()).thenReturn(0);
+        when(span.getResourceName()).thenReturn("grpc.request");
+        when(span.getServiceName()).thenReturn("svc");
+        when(span.getOperationName()).thenReturn("grpc.request");
+        when(span.getServiceNameSource()).thenReturn(null);
+        when(span.getType()).thenReturn("grpc");
+        when(span.getHttpStatusCode()).thenReturn((short) 0);
+        when(span.getParentId()).thenReturn(0L);
+        when(span.getOrigin()).thenReturn(null);
+        when(span.unsafeGetTag(eq(Tags.SPAN_KIND), any(CharSequence.class))).thenReturn("");
+        when(span.unsafeGetTag(tagKey)).thenReturn(tagValue);
+        return span;
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorTest.java
index 7269bbbf580..cb884aaa333 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorTest.java
@@ -52,2614 +52,2155 @@
 
 class ClientStatsAggregatorTest {
 
-  private static final int HTTP_OK = 200;
-  private static final long REPORTING_INTERVAL = 1;
-  private static final int QUEUE_SIZE = 256;
-
-  @Test
-  void shouldIgnoreTracesWithNoMeasuredSpans() throws Exception {
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    WellKnownTags wellKnownTags =
-        new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
-    try (ClientStatsAggregator aggregator =
-        new ClientStatsAggregator(
-            wellKnownTags,
-            emptySet(),
-            AdditionalTagsSchema.EMPTY,
-            features,
-            HealthMetrics.NO_OP,
-            sink,
-            10,
-            QUEUE_SIZE,
-            1,
-            MILLISECONDS,
-            false)) {
-      aggregator.start();
-
-      aggregator.publish(
-          singletonList(new SimpleSpan("", "", "", "", false, false, false, 0, 0, HTTP_OK)));
-
-      waitUntilAggregatorIsEmpty(aggregator);
-      clearInvocations(sink);
-      aggregator.forceReport().get(2, SECONDS);
-
-      verifyNoInteractions(sink);
+    private static final int HTTP_OK = 200;
+    private static final long REPORTING_INTERVAL = 1;
+    private static final int QUEUE_SIZE = 256;
+
+    @Test
+    void shouldIgnoreTracesWithNoMeasuredSpans() throws Exception {
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        WellKnownTags wellKnownTags =
+                new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
+        try (ClientStatsAggregator aggregator = new ClientStatsAggregator(
+                wellKnownTags,
+                emptySet(),
+                AdditionalTagsSchema.EMPTY,
+                features,
+                HealthMetrics.NO_OP,
+                sink,
+                10,
+                QUEUE_SIZE,
+                1,
+                MILLISECONDS,
+                false)) {
+            aggregator.start();
+
+            aggregator.publish(singletonList(new SimpleSpan("", "", "", "", false, false, false, 0, 0, HTTP_OK)));
+
+            waitUntilAggregatorIsEmpty(aggregator);
+            clearInvocations(sink);
+            aggregator.forceReport().get(2, SECONDS);
+
+            verifyNoInteractions(sink);
+        }
     }
-  }
-
-  @Test
-  void shouldIgnoreTracesWithIgnoredResourceNames() throws Exception {
-    String ignoredResourceName = "foo";
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    WellKnownTags wellKnownTags =
-        new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
-    Set<String> ignoredResources = Collections.singleton(ignoredResourceName);
-    try (ClientStatsAggregator aggregator =
-        new ClientStatsAggregator(
-            wellKnownTags,
-            ignoredResources,
-            AdditionalTagsSchema.EMPTY,
-            features,
-            HealthMetrics.NO_OP,
-            sink,
-            10,
-            QUEUE_SIZE,
-            1,
-            MILLISECONDS,
-            false)) {
-      aggregator.start();
-      clearInvocations(sink);
-
-      // publish ignored resource names
-      aggregator.publish(
-          singletonList(
-              new SimpleSpan("", "", ignoredResourceName, "", true, true, false, 0, 0, HTTP_OK)));
-      aggregator.publish(
-          singletonList(
-              new SimpleSpan(
-                  "",
-                  "",
-                  UTF8BytesString.create(ignoredResourceName),
-                  "",
-                  true,
-                  true,
-                  false,
-                  0,
-                  0,
-                  HTTP_OK)));
-      aggregator.publish(
-          Arrays.asList(
-              new SimpleSpan("", "", ignoredResourceName, "", true, true, false, 0, 0, HTTP_OK),
-              new SimpleSpan(
-                  "",
-                  "",
-                  "measured, not ignored, but child of ignored, so should be ignored",
-                  "",
-                  true,
-                  true,
-                  false,
-                  0,
-                  0,
-                  HTTP_OK)));
-      aggregator.forceReport().get(2, SECONDS);
-
-      verifyNoInteractions(sink);
-    }
-  }
-
-  @Test
-  void shouldBeResilientToNullResourceNames() throws Exception {
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, false)) {
-      aggregator.start();
-
-      CountDownLatch latch = new CountDownLatch(1);
-      AggregateEntry expectedEntry =
-          AggregateEntryTestUtils.of(
-              null,
-              "service",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              "baz",
-              emptyList(),
-              null,
-              null,
-              null);
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                assertTrue(AggregateEntryTestUtils.equals(e, expectedEntry));
-                assertEquals(1, e.getHitCount());
-                assertEquals(1, e.getTopLevelCount());
-                assertEquals(100, e.getDuration());
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      aggregator.publish(
-          singletonList(
-              new SimpleSpan(
-                      "service", "operation", null, "type", false, true, false, 0, 100, HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "baz")));
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      assertTrue(latchTriggered);
-      verify(writer).startBucket(eq(1), anyLong(), anyLong());
-      verify(writer, times(1)).add(any(AggregateEntry.class));
-      verify(writer).finishBucket();
-    }
-  }
-
-  @Test
-  void unmeasuredTopLevelSpansHaveMetricsComputed() throws Exception {
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, false)) {
-      aggregator.start();
-
-      CountDownLatch latch = new CountDownLatch(1);
-      AggregateEntry expectedEntry =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              "baz",
-              emptyList(),
-              null,
-              null,
-              null);
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                assertTrue(AggregateEntryTestUtils.equals(e, expectedEntry));
-                assertEquals(1, e.getHitCount());
-                assertEquals(1, e.getTopLevelCount());
-                assertEquals(100, e.getDuration());
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      aggregator.publish(
-          singletonList(
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      false,
-                      true,
-                      false,
-                      0,
-                      100,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "baz")));
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      assertTrue(latchTriggered);
-      verify(writer).startBucket(eq(1), anyLong(), anyLong());
-      verify(writer, times(1)).add(any(AggregateEntry.class));
-      verify(writer).finishBucket();
-    }
-  }
-
-  @TableTest({
-    "scenario                        | kind        | httpMethod | httpEndpoint      | statsComputed",
-    "client                          | client      |            |                   | true         ",
-    "producer                        | producer    |            |                   | true         ",
-    "consumer                        | consumer    |            |                   | true         ",
-    "server (UTF8BytesString)        | UTF8.server |            |                   | true         ",
-    "internal                        | internal    |            |                   | false        ",
-    "null kind                       |             |            |                   | false        ",
-    "server GET /api/users/:id       | server      | GET        | /api/users/:id    | true         ",
-    "server POST /api/orders         | server      | POST       | /api/orders       | true         ",
-    "server DELETE /api/products/:id | server      | DELETE     | /api/products/:id | true         ",
-    "client GET /external/api        | client      | GET        | /external/api     | true         "
-  })
-  void shouldComputeStatsForSpanKind(
-      @ConvertWith(StringOrUTF8ByteStringConverter.class) CharSequence kind,
-      String httpMethod,
-      String httpEndpoint,
-      boolean statsComputed)
-      throws Exception {
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, true)) {
-      aggregator.start();
-
-      CountDownLatch latch = new CountDownLatch(1);
-      if (statsComputed) {
-        AggregateEntry expectedEntry =
-            AggregateEntryTestUtils.of(
-                "resource",
-                "service",
-                "operation",
-                null,
-                "type",
-                HTTP_OK,
-                false,
-                false,
-                kind == null ? null : kind.toString(),
-                emptyList(),
-                httpMethod,
-                httpEndpoint,
-                null);
-        doAnswer(
-                invocation -> {
-                  AggregateEntry e = invocation.getArgument(0);
-                  assertTrue(AggregateEntryTestUtils.equals(e, expectedEntry));
-                  assertEquals(1, e.getHitCount());
-                  assertEquals(0, e.getTopLevelCount());
-                  assertEquals(100, e.getDuration());
-                  return null;
-                })
-            .when(writer)
-            .add(any(AggregateEntry.class));
-        doAnswer(
-                invocation -> {
-                  latch.countDown();
-                  return null;
-                })
-            .when(writer)
-            .finishBucket();
-      }
-
-      SimpleSpan span =
-          new SimpleSpan(
-                  "service", "operation", "resource", "type", false, false, false, 0, 100, HTTP_OK)
-              .setTag(Tags.SPAN_KIND, kind);
-      if (httpMethod != null) {
-        span.setTag("http.method", httpMethod);
-      }
-      if (httpEndpoint != null) {
-        span.setTag("http.endpoint", httpEndpoint);
-      }
-      aggregator.publish(singletonList(span));
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      assertEquals(statsComputed, latchTriggered);
-      verify(writer, times(statsComputed ? 1 : 0)).startBucket(eq(1), anyLong(), anyLong());
-      verify(writer, times(statsComputed ? 1 : 0)).add(any(AggregateEntry.class));
-      verify(writer, times(statsComputed ? 1 : 0)).finishBucket();
-    }
-  }
-
-  static class StringOrUTF8ByteStringConverter implements ArgumentConverter {
-    public static final String UTF_8_PREFIX = "UTF8.";
-
-    @Override
-    public Object convert(Object source, ParameterContext context)
-        throws ArgumentConversionException {
-      if (source == null) {
-        return null;
-      }
-      String s = source.toString();
-      if (s.isEmpty()) return null;
-      if (s.startsWith(UTF_8_PREFIX)) {
-        return UTF8BytesString.create(s.substring(UTF_8_PREFIX.length()));
-      }
-      return s;
-    }
-  }
-
-  @Test
-  void shouldCreateSeparateBucketsForDistinctPeerTagValues() throws Exception {
-    // Peer-tag NAMES are configured per-tracer and stable for the duration of a trace publish;
-    // peer-tag VALUES vary per-span. Two spans with the same names but different values should
-    // produce two distinct aggregate buckets.
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags())
-        .thenReturn(new LinkedHashSet<>(Arrays.asList("country", "georegion")));
-
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, false)) {
-      aggregator.start();
-
-      CountDownLatch latch = new CountDownLatch(1);
-
-      AggregateEntry expectedFranceEntry =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              "client",
-              Arrays.asList(
-                  UTF8BytesString.create("country:france"),
-                  UTF8BytesString.create("georegion:europe")),
-              null,
-              null,
-              null);
-      AggregateEntry expectedGermanyEntry =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              "client",
-              Arrays.asList(
-                  UTF8BytesString.create("country:germany"),
-                  UTF8BytesString.create("georegion:europe")),
-              null,
-              null,
-              null);
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                if (AggregateEntryTestUtils.equals(e, expectedFranceEntry)
-                    || AggregateEntryTestUtils.equals(e, expectedGermanyEntry)) {
-                  assertEquals(1, e.getHitCount());
-                  assertEquals(0, e.getTopLevelCount());
-                  assertEquals(100, e.getDuration());
-                } else {
-                  throw new AssertionError("Unexpected AggregateEntry in add(): " + e);
-                }
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      aggregator.publish(
-          Arrays.asList(
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      true,
-                      false,
-                      false,
-                      0,
-                      100,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "client")
-                  .setTag("country", "france")
-                  .setTag("georegion", "europe"),
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      true,
-                      false,
-                      false,
-                      0,
-                      100,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "client")
-                  .setTag("country", "germany")
-                  .setTag("georegion", "europe")));
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      assertTrue(latchTriggered);
-      verify(writer, times(1)).startBucket(eq(2), anyLong(), anyLong());
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedFranceEntry)));
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGermanyEntry)));
-      verify(writer, times(1)).finishBucket();
-    }
-  }
-
-  @TableTest({
-    "scenario | kind     | expectedPeerTagStrings                              ",
-    "client   | client   | ['peer.hostname:localhost', '_dd.base_service:test']",
-    "internal | internal | ['_dd.base_service:test']                           ",
-    "server   | server   | []                                                  "
-  })
-  void shouldAggregateTheRightPeerTagsForKind(
-      @ConvertWith(StringOrUTF8ByteStringConverter.class) CharSequence kind,
-      List<String> expectedPeerTagStrings)
-      throws Exception {
-    List<UTF8BytesString> expectedPeerTags = new ArrayList<>();
-    for (String tag : expectedPeerTagStrings) {
-      expectedPeerTags.add(UTF8BytesString.create(tag));
-    }
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags())
-        .thenReturn(new LinkedHashSet<>(Arrays.asList("peer.hostname", "_dd.base_service")));
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, false)) {
-      aggregator.start();
-
-      CountDownLatch latch = new CountDownLatch(1);
-      AggregateEntry expectedEntry =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              kind,
-              expectedPeerTags,
-              null,
-              null,
-              null);
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                assertTrue(AggregateEntryTestUtils.equals(e, expectedEntry));
-                assertEquals(1, e.getHitCount());
-                assertEquals(0, e.getTopLevelCount());
-                assertEquals(100, e.getDuration());
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      aggregator.publish(
-          singletonList(
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      true,
-                      false,
-                      false,
-                      0,
-                      100,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, kind)
-                  .setTag("peer.hostname", "localhost")
-                  .setTag("_dd.base_service", UTF8BytesString.create("test"))));
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      assertTrue(latchTriggered);
-      verify(writer).startBucket(eq(1), anyLong(), anyLong());
-      verify(writer, times(1)).add(any(AggregateEntry.class));
-      verify(writer).finishBucket();
+
+    @Test
+    void shouldIgnoreTracesWithIgnoredResourceNames() throws Exception {
+        String ignoredResourceName = "foo";
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        WellKnownTags wellKnownTags =
+                new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
+        Set<String> ignoredResources = Collections.singleton(ignoredResourceName);
+        try (ClientStatsAggregator aggregator = new ClientStatsAggregator(
+                wellKnownTags,
+                ignoredResources,
+                AdditionalTagsSchema.EMPTY,
+                features,
+                HealthMetrics.NO_OP,
+                sink,
+                10,
+                QUEUE_SIZE,
+                1,
+                MILLISECONDS,
+                false)) {
+            aggregator.start();
+            clearInvocations(sink);
+
+            // publish ignored resource names
+            aggregator.publish(
+                    singletonList(new SimpleSpan("", "", ignoredResourceName, "", true, true, false, 0, 0, HTTP_OK)));
+            aggregator.publish(singletonList(new SimpleSpan(
+                    "", "", UTF8BytesString.create(ignoredResourceName), "", true, true, false, 0, 0, HTTP_OK)));
+            aggregator.publish(Arrays.asList(
+                    new SimpleSpan("", "", ignoredResourceName, "", true, true, false, 0, 0, HTTP_OK),
+                    new SimpleSpan(
+                            "",
+                            "",
+                            "measured, not ignored, but child of ignored, so should be ignored",
+                            "",
+                            true,
+                            true,
+                            false,
+                            0,
+                            0,
+                            HTTP_OK)));
+            aggregator.forceReport().get(2, SECONDS);
+
+            verifyNoInteractions(sink);
+        }
     }
-  }
-
-  @TableTest({
-    "scenario                   | measured | topLevel | topLevelCount",
-    "measured no top level      | true     | false    | 0            ",
-    "measured and top level     | true     | true     | 1            ",
-    "not measured but top level | false    | true     | 1            "
-  })
-  void measuredSpansDoNotContributeToTopLevelCount(
-      boolean measured, boolean topLevel, int topLevelCount) throws Exception {
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, false)) {
-      aggregator.start();
-
-      CountDownLatch latch = new CountDownLatch(1);
-      AggregateEntry expectedEntry =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              "baz",
-              emptyList(),
-              null,
-              null,
-              null);
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                assertTrue(AggregateEntryTestUtils.equals(e, expectedEntry));
-                assertEquals(1, e.getHitCount());
-                assertEquals(topLevelCount, e.getTopLevelCount());
-                assertEquals(100, e.getDuration());
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      aggregator.publish(
-          singletonList(
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      measured,
-                      topLevel,
-                      false,
-                      0,
-                      100,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "baz")));
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      assertTrue(latchTriggered);
-      verify(writer).startBucket(eq(1), anyLong(), anyLong());
-      verify(writer, times(1)).add(any(AggregateEntry.class));
-      verify(writer).finishBucket();
+
+    @Test
+    void shouldBeResilientToNullResourceNames() throws Exception {
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator = createClientStatsAggregator(features, sink, writer, false)) {
+            aggregator.start();
+
+            CountDownLatch latch = new CountDownLatch(1);
+            AggregateEntry expectedEntry = AggregateEntryTestUtils.of(
+                    null,
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    "baz",
+                    emptyList(),
+                    null,
+                    null,
+                    null);
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        assertTrue(AggregateEntryTestUtils.equals(e, expectedEntry));
+                        assertEquals(1, e.getHitCount());
+                        assertEquals(1, e.getTopLevelCount());
+                        assertEquals(100, e.getDuration());
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            aggregator.publish(singletonList(
+                    new SimpleSpan("service", "operation", null, "type", false, true, false, 0, 100, HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, "baz")));
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            assertTrue(latchTriggered);
+            verify(writer).startBucket(eq(1), anyLong(), anyLong());
+            verify(writer, times(1)).add(any(AggregateEntry.class));
+            verify(writer).finishBucket();
+        }
     }
-  }
-
-  @TableTest({
-    "scenario    | count",
-    "count = 10  | 10   ",
-    "count = 100 | 100  "
-  })
-  void aggregateRepetitiveSpans(int count) throws Exception {
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, false)) {
-      long duration = 100;
-      List<SimpleSpan> trace =
-          Arrays.asList(
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      true,
-                      false,
-                      false,
-                      0,
-                      duration,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "baz"),
-              new SimpleSpan(
-                      "service1",
-                      "operation1",
-                      "resource1",
-                      "type",
-                      false,
-                      false,
-                      false,
-                      0,
-                      0,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "baz"),
-              new SimpleSpan(
-                      "service2",
-                      "operation2",
-                      "resource2",
-                      "type",
-                      true,
-                      false,
-                      false,
-                      0,
-                      duration * 2,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "baz"));
-      aggregator.start();
-
-      CountDownLatch latch = new CountDownLatch(1);
-      AggregateEntry expectedEntry1 =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              "baz",
-              emptyList(),
-              null,
-              null,
-              null);
-      AggregateEntry expectedEntry2 =
-          AggregateEntryTestUtils.of(
-              "resource2",
-              "service2",
-              "operation2",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              "baz",
-              emptyList(),
-              null,
-              null,
-              null);
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                if (AggregateEntryTestUtils.equals(e, expectedEntry1)) {
-                  assertEquals(count, e.getHitCount());
-                  assertEquals(count * duration, e.getDuration());
-                } else if (AggregateEntryTestUtils.equals(e, expectedEntry2)) {
-                  assertEquals(count, e.getHitCount());
-                  assertEquals(count * duration * 2, e.getDuration());
-                } else {
-                  throw new AssertionError("Unexpected AggregateEntry in add()");
-                }
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      for (int i = 0; i < count; ++i) {
-        aggregator.publish(trace);
-      }
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      // metrics should be conflated
-      assertTrue(latchTriggered);
-      verify(writer).finishBucket();
-      verify(writer).startBucket(eq(2), anyLong(), eq(SECONDS.toNanos(REPORTING_INTERVAL)));
-      verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedEntry1)));
-      verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedEntry2)));
+
+    @Test
+    void unmeasuredTopLevelSpansHaveMetricsComputed() throws Exception {
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator = createClientStatsAggregator(features, sink, writer, false)) {
+            aggregator.start();
+
+            CountDownLatch latch = new CountDownLatch(1);
+            AggregateEntry expectedEntry = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    "baz",
+                    emptyList(),
+                    null,
+                    null,
+                    null);
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        assertTrue(AggregateEntryTestUtils.equals(e, expectedEntry));
+                        assertEquals(1, e.getHitCount());
+                        assertEquals(1, e.getTopLevelCount());
+                        assertEquals(100, e.getDuration());
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            aggregator.publish(singletonList(
+                    new SimpleSpan("service", "operation", "resource", "type", false, true, false, 0, 100, HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, "baz")));
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            assertTrue(latchTriggered);
+            verify(writer).startBucket(eq(1), anyLong(), anyLong());
+            verify(writer, times(1)).add(any(AggregateEntry.class));
+            verify(writer).finishBucket();
+        }
     }
-  }
-
-  @Test
-  void aggregateSpansWithSameHttpEndpointTogetherSeparateDifferentEndpoints() throws Exception {
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, true)) {
-      aggregator.start();
-
-      // Cycle 1: publish multiple spans with same endpoint
-      int count = 5;
-      long duration = 100;
-      CountDownLatch latch = new CountDownLatch(1);
-      CountDownLatch latch2 = new CountDownLatch(1);
-
-      AggregateEntry expectedGetUsers =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              "server",
-              emptyList(),
-              "GET",
-              "/api/users/:id",
-              null);
-      AggregateEntry expectedGetOrders =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              "server",
-              emptyList(),
-              "GET",
-              "/api/orders/:id",
-              null);
-      AggregateEntry expectedPostUsers =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              "server",
-              emptyList(),
-              "POST",
-              "/api/users/:id",
-              null);
-
-      AtomicInteger cycle = new AtomicInteger(1);
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                if (cycle.get() == 1) {
-                  // should aggregate into single metric
-                  assertTrue(AggregateEntryTestUtils.equals(e, expectedGetUsers));
-                  assertEquals(count, e.getHitCount());
-                  assertEquals(count * duration, e.getDuration());
-                } else {
-                  // separate metrics for each endpoint/method combination
-                  if (AggregateEntryTestUtils.equals(e, expectedGetUsers)) {
-                    assertEquals(1, e.getHitCount());
-                    assertEquals(duration, e.getDuration());
-                  } else if (AggregateEntryTestUtils.equals(e, expectedGetOrders)) {
-                    assertEquals(1, e.getHitCount());
-                    assertEquals(duration * 2, e.getDuration());
-                  } else if (AggregateEntryTestUtils.equals(e, expectedPostUsers)) {
-                    assertEquals(1, e.getHitCount());
-                    assertEquals(duration * 3, e.getDuration());
-                  } else {
-                    throw new AssertionError("Unexpected AggregateEntry in cycle 2 add()");
-                  }
-                }
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                cycle.incrementAndGet();
-                latch.countDown();
-                return null;
-              })
-          .doAnswer(
-              invocation -> {
-                latch2.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      for (int i = 0; i < count; ++i) {
-        aggregator.publish(
-            singletonList(
-                new SimpleSpan(
+
+    @TableTest({
+      "scenario                        | kind        | httpMethod | httpEndpoint      | statsComputed",
+      "client                          | client      |            |                   | true         ",
+      "producer                        | producer    |            |                   | true         ",
+      "consumer                        | consumer    |            |                   | true         ",
+      "server (UTF8BytesString)        | UTF8.server |            |                   | true         ",
+      "internal                        | internal    |            |                   | false        ",
+      "null kind                       |             |            |                   | false        ",
+      "server GET /api/users/:id       | server      | GET        | /api/users/:id    | true         ",
+      "server POST /api/orders         | server      | POST       | /api/orders       | true         ",
+      "server DELETE /api/products/:id | server      | DELETE     | /api/products/:id | true         ",
+      "client GET /external/api        | client      | GET        | /external/api     | true         "
+    })
+    void shouldComputeStatsForSpanKind(
+            @ConvertWith(StringOrUTF8ByteStringConverter.class) CharSequence kind,
+            String httpMethod,
+            String httpEndpoint,
+            boolean statsComputed)
+            throws Exception {
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator = createClientStatsAggregator(features, sink, writer, true)) {
+            aggregator.start();
+
+            CountDownLatch latch = new CountDownLatch(1);
+            if (statsComputed) {
+                AggregateEntry expectedEntry = AggregateEntryTestUtils.of(
+                        "resource",
                         "service",
                         "operation",
-                        "resource",
+                        null,
                         "type",
-                        true,
+                        HTTP_OK,
                         false,
                         false,
-                        0,
-                        duration,
-                        HTTP_OK)
-                    .setTag(Tags.SPAN_KIND, "server")
-                    .setTag("http.method", "GET")
-                    .setTag("http.endpoint", "/api/users/:id")));
-      }
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      // should aggregate into single metric
-      assertTrue(latchTriggered);
-      verify(writer, times(1)).startBucket(eq(1), anyLong(), anyLong());
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGetUsers)));
-
-      // publish spans with different endpoints
-      aggregator.publish(
-          Arrays.asList(
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      true,
-                      false,
-                      false,
-                      0,
-                      duration,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "server")
-                  .setTag("http.method", "GET")
-                  .setTag("http.endpoint", "/api/users/:id"),
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      true,
-                      false,
-                      false,
-                      0,
-                      duration * 2,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "server")
-                  .setTag("http.method", "GET")
-                  .setTag("http.endpoint", "/api/orders/:id"),
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      true,
-                      false,
-                      false,
-                      0,
-                      duration * 3,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "server")
-                  .setTag("http.method", "POST")
-                  .setTag("http.endpoint", "/api/users/:id")));
-      aggregator.report();
-      boolean latchTriggered2 = latch2.await(2, SECONDS);
-
-      // should create separate metrics for each endpoint/method combination
-      assertTrue(latchTriggered2);
-      verify(writer, times(1)).startBucket(eq(3), anyLong(), anyLong());
-      verify(writer, times(2))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGetUsers)));
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGetOrders)));
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedPostUsers)));
-      verify(writer, times(2)).finishBucket();
+                        kind == null ? null : kind.toString(),
+                        emptyList(),
+                        httpMethod,
+                        httpEndpoint,
+                        null);
+                doAnswer(invocation -> {
+                            AggregateEntry e = invocation.getArgument(0);
+                            assertTrue(AggregateEntryTestUtils.equals(e, expectedEntry));
+                            assertEquals(1, e.getHitCount());
+                            assertEquals(0, e.getTopLevelCount());
+                            assertEquals(100, e.getDuration());
+                            return null;
+                        })
+                        .when(writer)
+                        .add(any(AggregateEntry.class));
+                doAnswer(invocation -> {
+                            latch.countDown();
+                            return null;
+                        })
+                        .when(writer)
+                        .finishBucket();
+            }
+
+            SimpleSpan span = new SimpleSpan(
+                            "service", "operation", "resource", "type", false, false, false, 0, 100, HTTP_OK)
+                    .setTag(Tags.SPAN_KIND, kind);
+            if (httpMethod != null) {
+                span.setTag("http.method", httpMethod);
+            }
+            if (httpEndpoint != null) {
+                span.setTag("http.endpoint", httpEndpoint);
+            }
+            aggregator.publish(singletonList(span));
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            assertEquals(statsComputed, latchTriggered);
+            verify(writer, times(statsComputed ? 1 : 0)).startBucket(eq(1), anyLong(), anyLong());
+            verify(writer, times(statsComputed ? 1 : 0)).add(any(AggregateEntry.class));
+            verify(writer, times(statsComputed ? 1 : 0)).finishBucket();
+        }
     }
-  }
-
-  @Test
-  void createSeparateMetricsForDifferentHttpMethodEndpointStatusCombinations() throws Exception {
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, true)) {
-      aggregator.start();
-
-      // publish spans with different combinations
-      CountDownLatch latch = new CountDownLatch(1);
-      long duration = 100;
-
-      AggregateEntry expectedGet200Users =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              200,
-              false,
-              false,
-              "server",
-              emptyList(),
-              "GET",
-              "/api/users/:id",
-              null);
-      AggregateEntry expectedPost200Users =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              200,
-              false,
-              false,
-              "server",
-              emptyList(),
-              "POST",
-              "/api/users/:id",
-              null);
-      AggregateEntry expectedGet404Users =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              404,
-              false,
-              false,
-              "server",
-              emptyList(),
-              "GET",
-              "/api/users/:id",
-              null);
-      AggregateEntry expectedGet200Orders =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              200,
-              false,
-              false,
-              "server",
-              emptyList(),
-              "GET",
-              "/api/orders/:id",
-              null);
-
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                if (AggregateEntryTestUtils.equals(e, expectedGet200Users)) {
-                  assertEquals(1, e.getHitCount());
-                  assertEquals(duration, e.getDuration());
-                } else if (AggregateEntryTestUtils.equals(e, expectedPost200Users)) {
-                  assertEquals(1, e.getHitCount());
-                  assertEquals(duration * 2, e.getDuration());
-                } else if (AggregateEntryTestUtils.equals(e, expectedGet404Users)) {
-                  assertEquals(1, e.getHitCount());
-                  assertEquals(duration * 3, e.getDuration());
-                } else if (AggregateEntryTestUtils.equals(e, expectedGet200Orders)) {
-                  assertEquals(1, e.getHitCount());
-                  assertEquals(duration * 4, e.getDuration());
-                } else {
-                  throw new AssertionError("Unexpected AggregateEntry in add()");
-                }
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
+
+    static class StringOrUTF8ByteStringConverter implements ArgumentConverter {
+        public static final String UTF_8_PREFIX = "UTF8.";
+
+        @Override
+        public Object convert(Object source, ParameterContext context) throws ArgumentConversionException {
+            if (source == null) {
                 return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      aggregator.publish(
-          Arrays.asList(
-              // Same endpoint, different methods
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      true,
-                      false,
-                      false,
-                      0,
-                      duration,
-                      200)
-                  .setTag(Tags.SPAN_KIND, "server")
-                  .setTag("http.method", "GET")
-                  .setTag("http.endpoint", "/api/users/:id"),
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      true,
-                      false,
-                      false,
-                      0,
-                      duration * 2,
-                      200)
-                  .setTag(Tags.SPAN_KIND, "server")
-                  .setTag("http.method", "POST")
-                  .setTag("http.endpoint", "/api/users/:id"),
-              // Same method/endpoint, different status
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      true,
-                      false,
-                      false,
-                      0,
-                      duration * 3,
-                      404)
-                  .setTag(Tags.SPAN_KIND, "server")
-                  .setTag("http.method", "GET")
-                  .setTag("http.endpoint", "/api/users/:id"),
-              // Different endpoint
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      true,
-                      false,
-                      false,
-                      0,
-                      duration * 4,
-                      200)
-                  .setTag(Tags.SPAN_KIND, "server")
-                  .setTag("http.method", "GET")
-                  .setTag("http.endpoint", "/api/orders/:id")));
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      // should create 4 separate metrics
-      assertTrue(latchTriggered);
-      verify(writer).startBucket(eq(4), anyLong(), anyLong());
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGet200Users)));
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedPost200Users)));
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGet404Users)));
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGet200Orders)));
-      verify(writer).finishBucket();
+            }
+            String s = source.toString();
+            if (s.isEmpty()) return null;
+            if (s.startsWith(UTF_8_PREFIX)) {
+                return UTF8BytesString.create(s.substring(UTF_8_PREFIX.length()));
+            }
+            return s;
+        }
     }
-  }
-
-  @Test
-  void handleSpansWithoutHttpEndpointTagsForBackwardCompatibility() throws Exception {
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, true)) {
-      aggregator.start();
-
-      // publish spans with and without HTTP tags
-      CountDownLatch latch = new CountDownLatch(1);
-      long duration = 100;
-
-      AggregateEntry expectedNoHttpTags =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              200,
-              false,
-              false,
-              "server",
-              emptyList(),
-              null,
-              null,
-              null);
-      AggregateEntry expectedWithHttpTags =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              200,
-              false,
-              false,
-              "server",
-              emptyList(),
-              "GET",
-              "/api/users/:id",
-              null);
-
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                if (AggregateEntryTestUtils.equals(e, expectedNoHttpTags)) {
-                  assertEquals(1, e.getHitCount());
-                  assertEquals(duration, e.getDuration());
-                } else if (AggregateEntryTestUtils.equals(e, expectedWithHttpTags)) {
-                  assertEquals(1, e.getHitCount());
-                  assertEquals(duration * 2, e.getDuration());
-                } else {
-                  throw new AssertionError("Unexpected AggregateEntry in add()");
-                }
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      aggregator.publish(
-          Arrays.asList(
-              // Span without HTTP tags (legacy behavior)
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      true,
-                      false,
-                      false,
-                      0,
-                      duration,
-                      200)
-                  .setTag(Tags.SPAN_KIND, "server"),
-              // Span with HTTP tags (new behavior)
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      true,
-                      false,
-                      false,
-                      0,
-                      duration * 2,
-                      200)
-                  .setTag(Tags.SPAN_KIND, "server")
-                  .setTag("http.method", "GET")
-                  .setTag("http.endpoint", "/api/users/:id")));
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      // should create separate metric keys for spans with and without HTTP tags
-      assertTrue(latchTriggered);
-      verify(writer).startBucket(eq(2), anyLong(), anyLong());
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedNoHttpTags)));
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedWithHttpTags)));
-      verify(writer).finishBucket();
+
+    @Test
+    void shouldCreateSeparateBucketsForDistinctPeerTagValues() throws Exception {
+        // Peer-tag NAMES are configured per-tracer and stable for the duration of a trace publish;
+        // peer-tag VALUES vary per-span. Two spans with the same names but different values should
+        // produce two distinct aggregate buckets.
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(new LinkedHashSet<>(Arrays.asList("country", "georegion")));
+
+        try (ClientStatsAggregator aggregator = createClientStatsAggregator(features, sink, writer, false)) {
+            aggregator.start();
+
+            CountDownLatch latch = new CountDownLatch(1);
+
+            AggregateEntry expectedFranceEntry = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    "client",
+                    Arrays.asList(UTF8BytesString.create("country:france"), UTF8BytesString.create("georegion:europe")),
+                    null,
+                    null,
+                    null);
+            AggregateEntry expectedGermanyEntry = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    "client",
+                    Arrays.asList(
+                            UTF8BytesString.create("country:germany"), UTF8BytesString.create("georegion:europe")),
+                    null,
+                    null,
+                    null);
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        if (AggregateEntryTestUtils.equals(e, expectedFranceEntry)
+                                || AggregateEntryTestUtils.equals(e, expectedGermanyEntry)) {
+                            assertEquals(1, e.getHitCount());
+                            assertEquals(0, e.getTopLevelCount());
+                            assertEquals(100, e.getDuration());
+                        } else {
+                            throw new AssertionError("Unexpected AggregateEntry in add(): " + e);
+                        }
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            aggregator.publish(Arrays.asList(
+                    new SimpleSpan("service", "operation", "resource", "type", true, false, false, 0, 100, HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, "client")
+                            .setTag("country", "france")
+                            .setTag("georegion", "europe"),
+                    new SimpleSpan("service", "operation", "resource", "type", true, false, false, 0, 100, HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, "client")
+                            .setTag("country", "germany")
+                            .setTag("georegion", "europe")));
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            assertTrue(latchTriggered);
+            verify(writer, times(1)).startBucket(eq(2), anyLong(), anyLong());
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedFranceEntry)));
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGermanyEntry)));
+            verify(writer, times(1)).finishBucket();
+        }
     }
-  }
-
-  @Test
-  void gatherTheServiceNameSourceWhenTheSpanIsPublished() throws Exception {
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, false)) {
-      aggregator.start();
-
-      // publish spans with different service name source
-      CountDownLatch latch = new CountDownLatch(1);
-      long duration = 100;
-
-      AggregateEntry expectedWithSource =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              "source",
-              "type",
-              200,
-              false,
-              false,
-              "server",
-              emptyList(),
-              null,
-              null,
-              null);
-      AggregateEntry expectedWithoutSource =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              200,
-              false,
-              false,
-              "server",
-              emptyList(),
-              null,
-              null,
-              null);
-
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                if (AggregateEntryTestUtils.equals(e, expectedWithSource)) {
-                  assertEquals(2, e.getHitCount());
-                  assertEquals(2 * duration, e.getDuration());
-                } else if (AggregateEntryTestUtils.equals(e, expectedWithoutSource)) {
-                  assertEquals(1, e.getHitCount());
-                  assertEquals(duration, e.getDuration());
-                } else {
-                  throw new AssertionError("Unexpected AggregateEntry in add()");
-                }
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      aggregator.publish(
-          Arrays.asList(
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      true,
-                      true,
-                      false,
-                      0,
-                      duration,
-                      200,
-                      false,
-                      0,
-                      "source")
-                  .setTag(Tags.SPAN_KIND, "server"),
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      true,
-                      true,
-                      false,
-                      0,
-                      duration,
-                      200,
-                      false,
-                      0,
-                      null)
-                  .setTag(Tags.SPAN_KIND, "server"),
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      true,
-                      true,
-                      false,
-                      0,
-                      duration,
-                      200,
-                      false,
-                      0,
-                      "source")
-                  .setTag(Tags.SPAN_KIND, "server")));
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      // should create the different metric keys for spans with and without sources
-      assertTrue(latchTriggered);
-      verify(writer).startBucket(eq(2), anyLong(), anyLong());
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedWithSource)));
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedWithoutSource)));
-      verify(writer).finishBucket();
+
+    @TableTest({
+      "scenario | kind     | expectedPeerTagStrings                              ",
+      "client   | client   | ['peer.hostname:localhost', '_dd.base_service:test']",
+      "internal | internal | ['_dd.base_service:test']                           ",
+      "server   | server   | []                                                  "
+    })
+    void shouldAggregateTheRightPeerTagsForKind(
+            @ConvertWith(StringOrUTF8ByteStringConverter.class) CharSequence kind, List<String> expectedPeerTagStrings)
+            throws Exception {
+        List<UTF8BytesString> expectedPeerTags = new ArrayList<>();
+        for (String tag : expectedPeerTagStrings) {
+            expectedPeerTags.add(UTF8BytesString.create(tag));
+        }
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(new LinkedHashSet<>(Arrays.asList("peer.hostname", "_dd.base_service")));
+        try (ClientStatsAggregator aggregator = createClientStatsAggregator(features, sink, writer, false)) {
+            aggregator.start();
+
+            CountDownLatch latch = new CountDownLatch(1);
+            AggregateEntry expectedEntry = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    kind,
+                    expectedPeerTags,
+                    null,
+                    null,
+                    null);
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        assertTrue(AggregateEntryTestUtils.equals(e, expectedEntry));
+                        assertEquals(1, e.getHitCount());
+                        assertEquals(0, e.getTopLevelCount());
+                        assertEquals(100, e.getDuration());
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            aggregator.publish(singletonList(
+                    new SimpleSpan("service", "operation", "resource", "type", true, false, false, 0, 100, HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, kind)
+                            .setTag("peer.hostname", "localhost")
+                            .setTag("_dd.base_service", UTF8BytesString.create("test"))));
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            assertTrue(latchTriggered);
+            verify(writer).startBucket(eq(1), anyLong(), anyLong());
+            verify(writer, times(1)).add(any(AggregateEntry.class));
+            verify(writer).finishBucket();
+        }
     }
-  }
-
-  @Test
-  void newAggregatesBeyondSizeLimitAreDroppedWhenNoStaleEntriesCanBeEvicted() throws Exception {
-    // The table only evicts entries with hitCount == 0 to make room. When all entries are live
-    // (all have been recorded against), an over-cap insert drops the new key rather than evicting
-    // an established one. This protects the data we've already collected from a burst of new keys.
-    int maxAggregates = 10;
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(
-            features, HealthMetrics.NO_OP, sink, writer, maxAggregates, false)) {
-      long duration = 100;
-      aggregator.start();
-
-      CountDownLatch latch = new CountDownLatch(1);
-
-      AggregateEntry expectedDropped =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service10",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              "baz",
-              emptyList(),
-              null,
-              null,
-              null);
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                assertEquals(1, e.getHitCount());
-                assertEquals(duration, e.getDuration());
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      for (int i = 0; i < 11; ++i) {
-        aggregator.publish(
-            singletonList(
-                new SimpleSpan(
-                        "service" + i,
-                        "operation",
-                        "resource",
-                        "type",
-                        false,
-                        true,
-                        false,
-                        0,
-                        duration,
-                        HTTP_OK)
+
+    @TableTest({
+      "scenario                   | measured | topLevel | topLevelCount",
+      "measured no top level      | true     | false    | 0            ",
+      "measured and top level     | true     | true     | 1            ",
+      "not measured but top level | false    | true     | 1            "
+    })
+    void measuredSpansDoNotContributeToTopLevelCount(boolean measured, boolean topLevel, int topLevelCount)
+            throws Exception {
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator = createClientStatsAggregator(features, sink, writer, false)) {
+            aggregator.start();
+
+            CountDownLatch latch = new CountDownLatch(1);
+            AggregateEntry expectedEntry = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    "baz",
+                    emptyList(),
+                    null,
+                    null,
+                    null);
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        assertTrue(AggregateEntryTestUtils.equals(e, expectedEntry));
+                        assertEquals(1, e.getHitCount());
+                        assertEquals(topLevelCount, e.getTopLevelCount());
+                        assertEquals(100, e.getDuration());
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            aggregator.publish(singletonList(new SimpleSpan(
+                            "service", "operation", "resource", "type", measured, topLevel, false, 0, 100, HTTP_OK)
                     .setTag(Tags.SPAN_KIND, "baz")));
-      }
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      // the established service0..service9 are reported; service10 is dropped
-      assertTrue(latchTriggered);
-      verify(writer).startBucket(eq(10), anyLong(), eq(SECONDS.toNanos(REPORTING_INTERVAL)));
-      for (int i = 0; i < 10; ++i) {
-        AggregateEntry expected =
-            AggregateEntryTestUtils.of(
-                "resource",
-                "service" + i,
-                "operation",
-                null,
-                "type",
-                HTTP_OK,
-                false,
-                false,
-                "baz",
-                emptyList(),
-                null,
-                null,
-                null);
-        verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expected)));
-      }
-      verify(writer, never()).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedDropped)));
-      verify(writer).finishBucket();
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            assertTrue(latchTriggered);
+            verify(writer).startBucket(eq(1), anyLong(), anyLong());
+            verify(writer, times(1)).add(any(AggregateEntry.class));
+            verify(writer).finishBucket();
+        }
     }
-  }
-
-  @Test
-  void shouldReportDroppedAggregateToHealthMetricsOnLruEviction() throws Exception {
-    int maxAggregates = 10;
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, healthMetrics, sink, writer, maxAggregates, false)) {
-      long duration = 100;
-      aggregator.start();
-
-      CountDownLatch latch = new CountDownLatch(1);
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      for (int i = 0; i < maxAggregates + 1; ++i) {
-        aggregator.publish(
-            singletonList(
-                new SimpleSpan(
-                        "service" + i,
-                        "operation",
-                        "resource",
-                        "type",
-                        false,
-                        true,
-                        false,
-                        0,
-                        duration,
-                        HTTP_OK)
-                    .setTag(Tags.SPAN_KIND, "baz")));
-      }
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
 
-      assertTrue(latchTriggered);
-      verify(writer).finishBucket();
-      verify(healthMetrics).onStatsAggregateDropped();
+    @TableTest({
+      "scenario    | count",
+      "count = 10  | 10   ",
+      "count = 100 | 100  "
+    })
+    void aggregateRepetitiveSpans(int count) throws Exception {
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator = createClientStatsAggregator(features, sink, writer, false)) {
+            long duration = 100;
+            List<SimpleSpan> trace = Arrays.asList(
+                    new SimpleSpan("service", "operation", "resource", "type", true, false, false, 0, duration, HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, "baz"),
+                    new SimpleSpan("service1", "operation1", "resource1", "type", false, false, false, 0, 0, HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, "baz"),
+                    new SimpleSpan(
+                                    "service2",
+                                    "operation2",
+                                    "resource2",
+                                    "type",
+                                    true,
+                                    false,
+                                    false,
+                                    0,
+                                    duration * 2,
+                                    HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, "baz"));
+            aggregator.start();
+
+            CountDownLatch latch = new CountDownLatch(1);
+            AggregateEntry expectedEntry1 = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    "baz",
+                    emptyList(),
+                    null,
+                    null,
+                    null);
+            AggregateEntry expectedEntry2 = AggregateEntryTestUtils.of(
+                    "resource2",
+                    "service2",
+                    "operation2",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    "baz",
+                    emptyList(),
+                    null,
+                    null,
+                    null);
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        if (AggregateEntryTestUtils.equals(e, expectedEntry1)) {
+                            assertEquals(count, e.getHitCount());
+                            assertEquals(count * duration, e.getDuration());
+                        } else if (AggregateEntryTestUtils.equals(e, expectedEntry2)) {
+                            assertEquals(count, e.getHitCount());
+                            assertEquals(count * duration * 2, e.getDuration());
+                        } else {
+                            throw new AssertionError("Unexpected AggregateEntry in add()");
+                        }
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            for (int i = 0; i < count; ++i) {
+                aggregator.publish(trace);
+            }
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            // metrics should be conflated
+            assertTrue(latchTriggered);
+            verify(writer).finishBucket();
+            verify(writer).startBucket(eq(2), anyLong(), eq(SECONDS.toNanos(REPORTING_INTERVAL)));
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedEntry1)));
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedEntry2)));
+        }
     }
-  }
-
-  @Test
-  void shouldNotReportDroppedAggregateWhenEvictedEntryWasAlreadyFlushed() throws Exception {
-    int maxAggregates = 5;
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, healthMetrics, sink, writer, maxAggregates, false)) {
-      aggregator.start();
-
-      // fill cache and flush — entries are cleared (hitCount=0) but stay in the LRU
-      CountDownLatch latch1 = new CountDownLatch(1);
-      doAnswer(
-              invocation -> {
-                latch1.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      for (int i = 0; i < maxAggregates; ++i) {
-        aggregator.publish(
-            singletonList(
-                new SimpleSpan(
-                        "service" + i,
-                        "operation",
-                        "resource",
-                        "type",
-                        false,
-                        true,
-                        false,
-                        0,
-                        100,
-                        HTTP_OK)
-                    .setTag(Tags.SPAN_KIND, "baz")));
-      }
-      aggregator.report();
-      latch1.await(2, SECONDS);
 
-      verify(writer, times(1)).finishBucket();
+    @Test
+    void aggregateSpansWithSameHttpEndpointTogetherSeparateDifferentEndpoints() throws Exception {
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator = createClientStatsAggregator(features, sink, writer, true)) {
+            aggregator.start();
+
+            // Cycle 1: publish multiple spans with same endpoint
+            int count = 5;
+            long duration = 100;
+            CountDownLatch latch = new CountDownLatch(1);
+            CountDownLatch latch2 = new CountDownLatch(1);
+
+            AggregateEntry expectedGetUsers = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    "GET",
+                    "/api/users/:id",
+                    null);
+            AggregateEntry expectedGetOrders = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    "GET",
+                    "/api/orders/:id",
+                    null);
+            AggregateEntry expectedPostUsers = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    "POST",
+                    "/api/users/:id",
+                    null);
+
+            AtomicInteger cycle = new AtomicInteger(1);
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        if (cycle.get() == 1) {
+                            // should aggregate into single metric
+                            assertTrue(AggregateEntryTestUtils.equals(e, expectedGetUsers));
+                            assertEquals(count, e.getHitCount());
+                            assertEquals(count * duration, e.getDuration());
+                        } else {
+                            // separate metrics for each endpoint/method combination
+                            if (AggregateEntryTestUtils.equals(e, expectedGetUsers)) {
+                                assertEquals(1, e.getHitCount());
+                                assertEquals(duration, e.getDuration());
+                            } else if (AggregateEntryTestUtils.equals(e, expectedGetOrders)) {
+                                assertEquals(1, e.getHitCount());
+                                assertEquals(duration * 2, e.getDuration());
+                            } else if (AggregateEntryTestUtils.equals(e, expectedPostUsers)) {
+                                assertEquals(1, e.getHitCount());
+                                assertEquals(duration * 3, e.getDuration());
+                            } else {
+                                throw new AssertionError("Unexpected AggregateEntry in cycle 2 add()");
+                            }
+                        }
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        cycle.incrementAndGet();
+                        latch.countDown();
+                        return null;
+                    })
+                    .doAnswer(invocation -> {
+                        latch2.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            for (int i = 0; i < count; ++i) {
+                aggregator.publish(singletonList(new SimpleSpan(
+                                "service", "operation", "resource", "type", true, false, false, 0, duration, HTTP_OK)
+                        .setTag(Tags.SPAN_KIND, "server")
+                        .setTag("http.method", "GET")
+                        .setTag("http.endpoint", "/api/users/:id")));
+            }
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            // should aggregate into single metric
+            assertTrue(latchTriggered);
+            verify(writer, times(1)).startBucket(eq(1), anyLong(), anyLong());
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGetUsers)));
+
+            // publish spans with different endpoints
+            aggregator.publish(Arrays.asList(
+                    new SimpleSpan("service", "operation", "resource", "type", true, false, false, 0, duration, HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, "server")
+                            .setTag("http.method", "GET")
+                            .setTag("http.endpoint", "/api/users/:id"),
+                    new SimpleSpan(
+                                    "service",
+                                    "operation",
+                                    "resource",
+                                    "type",
+                                    true,
+                                    false,
+                                    false,
+                                    0,
+                                    duration * 2,
+                                    HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, "server")
+                            .setTag("http.method", "GET")
+                            .setTag("http.endpoint", "/api/orders/:id"),
+                    new SimpleSpan(
+                                    "service",
+                                    "operation",
+                                    "resource",
+                                    "type",
+                                    true,
+                                    false,
+                                    false,
+                                    0,
+                                    duration * 3,
+                                    HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, "server")
+                            .setTag("http.method", "POST")
+                            .setTag("http.endpoint", "/api/users/:id")));
+            aggregator.report();
+            boolean latchTriggered2 = latch2.await(2, SECONDS);
+
+            // should create separate metrics for each endpoint/method combination
+            assertTrue(latchTriggered2);
+            verify(writer, times(1)).startBucket(eq(3), anyLong(), anyLong());
+            verify(writer, times(2)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGetUsers)));
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGetOrders)));
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedPostUsers)));
+            verify(writer, times(2)).finishBucket();
+        }
+    }
 
-      // publish new distinct spans — LRU evicts the cleared entries before the next report
-      CountDownLatch latch2 = new CountDownLatch(1);
-      doAnswer(
-              invocation -> {
-                latch2.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      for (int i = maxAggregates; i < maxAggregates * 2; ++i) {
-        aggregator.publish(
-            singletonList(
-                new SimpleSpan(
+    @Test
+    void createSeparateMetricsForDifferentHttpMethodEndpointStatusCombinations() throws Exception {
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator = createClientStatsAggregator(features, sink, writer, true)) {
+            aggregator.start();
+
+            // publish spans with different combinations
+            CountDownLatch latch = new CountDownLatch(1);
+            long duration = 100;
+
+            AggregateEntry expectedGet200Users = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    200,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    "GET",
+                    "/api/users/:id",
+                    null);
+            AggregateEntry expectedPost200Users = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    200,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    "POST",
+                    "/api/users/:id",
+                    null);
+            AggregateEntry expectedGet404Users = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    404,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    "GET",
+                    "/api/users/:id",
+                    null);
+            AggregateEntry expectedGet200Orders = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    200,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    "GET",
+                    "/api/orders/:id",
+                    null);
+
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        if (AggregateEntryTestUtils.equals(e, expectedGet200Users)) {
+                            assertEquals(1, e.getHitCount());
+                            assertEquals(duration, e.getDuration());
+                        } else if (AggregateEntryTestUtils.equals(e, expectedPost200Users)) {
+                            assertEquals(1, e.getHitCount());
+                            assertEquals(duration * 2, e.getDuration());
+                        } else if (AggregateEntryTestUtils.equals(e, expectedGet404Users)) {
+                            assertEquals(1, e.getHitCount());
+                            assertEquals(duration * 3, e.getDuration());
+                        } else if (AggregateEntryTestUtils.equals(e, expectedGet200Orders)) {
+                            assertEquals(1, e.getHitCount());
+                            assertEquals(duration * 4, e.getDuration());
+                        } else {
+                            throw new AssertionError("Unexpected AggregateEntry in add()");
+                        }
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            aggregator.publish(Arrays.asList(
+                    // Same endpoint, different methods
+                    new SimpleSpan("service", "operation", "resource", "type", true, false, false, 0, duration, 200)
+                            .setTag(Tags.SPAN_KIND, "server")
+                            .setTag("http.method", "GET")
+                            .setTag("http.endpoint", "/api/users/:id"),
+                    new SimpleSpan("service", "operation", "resource", "type", true, false, false, 0, duration * 2, 200)
+                            .setTag(Tags.SPAN_KIND, "server")
+                            .setTag("http.method", "POST")
+                            .setTag("http.endpoint", "/api/users/:id"),
+                    // Same method/endpoint, different status
+                    new SimpleSpan("service", "operation", "resource", "type", true, false, false, 0, duration * 3, 404)
+                            .setTag(Tags.SPAN_KIND, "server")
+                            .setTag("http.method", "GET")
+                            .setTag("http.endpoint", "/api/users/:id"),
+                    // Different endpoint
+                    new SimpleSpan("service", "operation", "resource", "type", true, false, false, 0, duration * 4, 200)
+                            .setTag(Tags.SPAN_KIND, "server")
+                            .setTag("http.method", "GET")
+                            .setTag("http.endpoint", "/api/orders/:id")));
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            // should create 4 separate metrics
+            assertTrue(latchTriggered);
+            verify(writer).startBucket(eq(4), anyLong(), anyLong());
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGet200Users)));
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedPost200Users)));
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGet404Users)));
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGet200Orders)));
+            verify(writer).finishBucket();
+        }
+    }
+
+    @Test
+    void handleSpansWithoutHttpEndpointTagsForBackwardCompatibility() throws Exception {
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator = createClientStatsAggregator(features, sink, writer, true)) {
+            aggregator.start();
+
+            // publish spans with and without HTTP tags
+            CountDownLatch latch = new CountDownLatch(1);
+            long duration = 100;
+
+            AggregateEntry expectedNoHttpTags = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    200,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    null,
+                    null,
+                    null);
+            AggregateEntry expectedWithHttpTags = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    200,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    "GET",
+                    "/api/users/:id",
+                    null);
+
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        if (AggregateEntryTestUtils.equals(e, expectedNoHttpTags)) {
+                            assertEquals(1, e.getHitCount());
+                            assertEquals(duration, e.getDuration());
+                        } else if (AggregateEntryTestUtils.equals(e, expectedWithHttpTags)) {
+                            assertEquals(1, e.getHitCount());
+                            assertEquals(duration * 2, e.getDuration());
+                        } else {
+                            throw new AssertionError("Unexpected AggregateEntry in add()");
+                        }
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            aggregator.publish(Arrays.asList(
+                    // Span without HTTP tags (legacy behavior)
+                    new SimpleSpan("service", "operation", "resource", "type", true, false, false, 0, duration, 200)
+                            .setTag(Tags.SPAN_KIND, "server"),
+                    // Span with HTTP tags (new behavior)
+                    new SimpleSpan("service", "operation", "resource", "type", true, false, false, 0, duration * 2, 200)
+                            .setTag(Tags.SPAN_KIND, "server")
+                            .setTag("http.method", "GET")
+                            .setTag("http.endpoint", "/api/users/:id")));
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            // should create separate metric keys for spans with and without HTTP tags
+            assertTrue(latchTriggered);
+            verify(writer).startBucket(eq(2), anyLong(), anyLong());
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedNoHttpTags)));
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedWithHttpTags)));
+            verify(writer).finishBucket();
+        }
+    }
+
+    @Test
+    void gatherTheServiceNameSourceWhenTheSpanIsPublished() throws Exception {
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator = createClientStatsAggregator(features, sink, writer, false)) {
+            aggregator.start();
+
+            // publish spans with different service name source
+            CountDownLatch latch = new CountDownLatch(1);
+            long duration = 100;
+
+            AggregateEntry expectedWithSource = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    "source",
+                    "type",
+                    200,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    null,
+                    null,
+                    null);
+            AggregateEntry expectedWithoutSource = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    200,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    null,
+                    null,
+                    null);
+
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        if (AggregateEntryTestUtils.equals(e, expectedWithSource)) {
+                            assertEquals(2, e.getHitCount());
+                            assertEquals(2 * duration, e.getDuration());
+                        } else if (AggregateEntryTestUtils.equals(e, expectedWithoutSource)) {
+                            assertEquals(1, e.getHitCount());
+                            assertEquals(duration, e.getDuration());
+                        } else {
+                            throw new AssertionError("Unexpected AggregateEntry in add()");
+                        }
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            aggregator.publish(Arrays.asList(
+                    new SimpleSpan(
+                                    "service",
+                                    "operation",
+                                    "resource",
+                                    "type",
+                                    true,
+                                    true,
+                                    false,
+                                    0,
+                                    duration,
+                                    200,
+                                    false,
+                                    0,
+                                    "source")
+                            .setTag(Tags.SPAN_KIND, "server"),
+                    new SimpleSpan(
+                                    "service",
+                                    "operation",
+                                    "resource",
+                                    "type",
+                                    true,
+                                    true,
+                                    false,
+                                    0,
+                                    duration,
+                                    200,
+                                    false,
+                                    0,
+                                    null)
+                            .setTag(Tags.SPAN_KIND, "server"),
+                    new SimpleSpan(
+                                    "service",
+                                    "operation",
+                                    "resource",
+                                    "type",
+                                    true,
+                                    true,
+                                    false,
+                                    0,
+                                    duration,
+                                    200,
+                                    false,
+                                    0,
+                                    "source")
+                            .setTag(Tags.SPAN_KIND, "server")));
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            // should create the different metric keys for spans with and without sources
+            assertTrue(latchTriggered);
+            verify(writer).startBucket(eq(2), anyLong(), anyLong());
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedWithSource)));
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedWithoutSource)));
+            verify(writer).finishBucket();
+        }
+    }
+
+    @Test
+    void newAggregatesBeyondSizeLimitAreDroppedWhenNoStaleEntriesCanBeEvicted() throws Exception {
+        // The table only evicts entries with hitCount == 0 to make room. When all entries are live
+        // (all have been recorded against), an over-cap insert drops the new key rather than evicting
+        // an established one. This protects the data we've already collected from a burst of new keys.
+        int maxAggregates = 10;
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator =
+                createClientStatsAggregator(features, HealthMetrics.NO_OP, sink, writer, maxAggregates, false)) {
+            long duration = 100;
+            aggregator.start();
+
+            CountDownLatch latch = new CountDownLatch(1);
+
+            AggregateEntry expectedDropped = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service10",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    "baz",
+                    emptyList(),
+                    null,
+                    null,
+                    null);
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        assertEquals(1, e.getHitCount());
+                        assertEquals(duration, e.getDuration());
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            for (int i = 0; i < 11; ++i) {
+                aggregator.publish(singletonList(new SimpleSpan(
+                                "service" + i,
+                                "operation",
+                                "resource",
+                                "type",
+                                false,
+                                true,
+                                false,
+                                0,
+                                duration,
+                                HTTP_OK)
+                        .setTag(Tags.SPAN_KIND, "baz")));
+            }
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            // the established service0..service9 are reported; service10 is dropped
+            assertTrue(latchTriggered);
+            verify(writer).startBucket(eq(10), anyLong(), eq(SECONDS.toNanos(REPORTING_INTERVAL)));
+            for (int i = 0; i < 10; ++i) {
+                AggregateEntry expected = AggregateEntryTestUtils.of(
+                        "resource",
                         "service" + i,
                         "operation",
-                        "resource",
+                        null,
                         "type",
+                        HTTP_OK,
                         false,
-                        true,
                         false,
-                        0,
-                        100,
-                        HTTP_OK)
-                    .setTag(Tags.SPAN_KIND, "baz")));
-      }
-      aggregator.report();
-      latch2.await(2, SECONDS);
+                        "baz",
+                        emptyList(),
+                        null,
+                        null,
+                        null);
+                verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expected)));
+            }
+            verify(writer, never()).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedDropped)));
+            verify(writer).finishBucket();
+        }
+    }
 
-      // no drop metric because all evicted entries had hitCount=0 (already reported)
-      verify(writer, times(2)).finishBucket();
-      verify(healthMetrics, never()).onStatsAggregateDropped();
+    @Test
+    void shouldReportDroppedAggregateToHealthMetricsOnLruEviction() throws Exception {
+        int maxAggregates = 10;
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        try (ClientStatsAggregator aggregator =
+                createClientStatsAggregator(features, healthMetrics, sink, writer, maxAggregates, false)) {
+            long duration = 100;
+            aggregator.start();
+
+            CountDownLatch latch = new CountDownLatch(1);
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            for (int i = 0; i < maxAggregates + 1; ++i) {
+                aggregator.publish(singletonList(new SimpleSpan(
+                                "service" + i,
+                                "operation",
+                                "resource",
+                                "type",
+                                false,
+                                true,
+                                false,
+                                0,
+                                duration,
+                                HTTP_OK)
+                        .setTag(Tags.SPAN_KIND, "baz")));
+            }
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            assertTrue(latchTriggered);
+            verify(writer).finishBucket();
+            verify(healthMetrics).onStatsAggregateDropped();
+        }
     }
-  }
-
-  @Test
-  void aggregateNotUpdatedInReportingIntervalNotReported() throws Exception {
-    int maxAggregates = 10;
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(
-            features, HealthMetrics.NO_OP, sink, writer, maxAggregates, false)) {
-      long duration = 100;
-      aggregator.start();
-
-      // first cycle
-      CountDownLatch latch = new CountDownLatch(1);
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                assertEquals(1, e.getHitCount());
-                assertEquals(duration, e.getDuration());
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      for (int i = 0; i < 5; ++i) {
-        aggregator.publish(
-            singletonList(
-                new SimpleSpan(
+
+    @Test
+    void shouldNotReportDroppedAggregateWhenEvictedEntryWasAlreadyFlushed() throws Exception {
+        int maxAggregates = 5;
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        try (ClientStatsAggregator aggregator =
+                createClientStatsAggregator(features, healthMetrics, sink, writer, maxAggregates, false)) {
+            aggregator.start();
+
+            // fill cache and flush — entries are cleared (hitCount=0) but stay in the LRU
+            CountDownLatch latch1 = new CountDownLatch(1);
+            doAnswer(invocation -> {
+                        latch1.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            for (int i = 0; i < maxAggregates; ++i) {
+                aggregator.publish(singletonList(new SimpleSpan(
+                                "service" + i, "operation", "resource", "type", false, true, false, 0, 100, HTTP_OK)
+                        .setTag(Tags.SPAN_KIND, "baz")));
+            }
+            aggregator.report();
+            latch1.await(2, SECONDS);
+
+            verify(writer, times(1)).finishBucket();
+
+            // publish new distinct spans — LRU evicts the cleared entries before the next report
+            CountDownLatch latch2 = new CountDownLatch(1);
+            doAnswer(invocation -> {
+                        latch2.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            for (int i = maxAggregates; i < maxAggregates * 2; ++i) {
+                aggregator.publish(singletonList(new SimpleSpan(
+                                "service" + i, "operation", "resource", "type", false, true, false, 0, 100, HTTP_OK)
+                        .setTag(Tags.SPAN_KIND, "baz")));
+            }
+            aggregator.report();
+            latch2.await(2, SECONDS);
+
+            // no drop metric because all evicted entries had hitCount=0 (already reported)
+            verify(writer, times(2)).finishBucket();
+            verify(healthMetrics, never()).onStatsAggregateDropped();
+        }
+    }
+
+    @Test
+    void aggregateNotUpdatedInReportingIntervalNotReported() throws Exception {
+        int maxAggregates = 10;
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator =
+                createClientStatsAggregator(features, HealthMetrics.NO_OP, sink, writer, maxAggregates, false)) {
+            long duration = 100;
+            aggregator.start();
+
+            // first cycle
+            CountDownLatch latch = new CountDownLatch(1);
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        assertEquals(1, e.getHitCount());
+                        assertEquals(duration, e.getDuration());
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            for (int i = 0; i < 5; ++i) {
+                aggregator.publish(singletonList(new SimpleSpan(
+                                "service" + i,
+                                "operation",
+                                "resource",
+                                "type",
+                                false,
+                                true,
+                                false,
+                                0,
+                                duration,
+                                HTTP_OK)
+                        .setTag(Tags.SPAN_KIND, "baz")));
+            }
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            // all aggregates should be reported
+            assertTrue(latchTriggered);
+            verify(writer).startBucket(eq(5), anyLong(), eq(SECONDS.toNanos(REPORTING_INTERVAL)));
+            for (int i = 0; i < 5; ++i) {
+                AggregateEntry expected = AggregateEntryTestUtils.of(
+                        "resource",
                         "service" + i,
                         "operation",
-                        "resource",
+                        null,
                         "type",
+                        HTTP_OK,
                         false,
-                        true,
                         false,
-                        0,
-                        duration,
-                        HTTP_OK)
-                    .setTag(Tags.SPAN_KIND, "baz")));
-      }
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      // all aggregates should be reported
-      assertTrue(latchTriggered);
-      verify(writer).startBucket(eq(5), anyLong(), eq(SECONDS.toNanos(REPORTING_INTERVAL)));
-      for (int i = 0; i < 5; ++i) {
-        AggregateEntry expected =
-            AggregateEntryTestUtils.of(
-                "resource",
-                "service" + i,
-                "operation",
-                null,
-                "type",
-                HTTP_OK,
-                false,
-                false,
-                "baz",
-                emptyList(),
-                null,
-                null,
-                null);
-        verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expected)));
-      }
-      verify(writer, times(1)).finishBucket();
-
-      // second cycle - service0 not updated
-      CountDownLatch latch2 = new CountDownLatch(1);
-      doAnswer(
-              invocation -> {
-                latch2.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      for (int i = 1; i < 5; ++i) {
-        aggregator.publish(
-            singletonList(
-                new SimpleSpan(
+                        "baz",
+                        emptyList(),
+                        null,
+                        null,
+                        null);
+                verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expected)));
+            }
+            verify(writer, times(1)).finishBucket();
+
+            // second cycle - service0 not updated
+            CountDownLatch latch2 = new CountDownLatch(1);
+            doAnswer(invocation -> {
+                        latch2.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            for (int i = 1; i < 5; ++i) {
+                aggregator.publish(singletonList(new SimpleSpan(
+                                "service" + i,
+                                "operation",
+                                "resource",
+                                "type",
+                                false,
+                                true,
+                                false,
+                                0,
+                                duration,
+                                HTTP_OK)
+                        .setTag(Tags.SPAN_KIND, "baz")));
+            }
+            aggregator.report();
+            boolean latchTriggered2 = latch2.await(2, SECONDS);
+
+            // aggregate not updated in cycle is not reported
+            assertTrue(latchTriggered2);
+            verify(writer).startBucket(eq(4), anyLong(), eq(SECONDS.toNanos(REPORTING_INTERVAL)));
+            for (int i = 1; i < 5; ++i) {
+                AggregateEntry expected = AggregateEntryTestUtils.of(
+                        "resource",
                         "service" + i,
                         "operation",
-                        "resource",
+                        null,
                         "type",
+                        HTTP_OK,
                         false,
-                        true,
                         false,
-                        0,
-                        duration,
-                        HTTP_OK)
-                    .setTag(Tags.SPAN_KIND, "baz")));
-      }
-      aggregator.report();
-      boolean latchTriggered2 = latch2.await(2, SECONDS);
-
-      // aggregate not updated in cycle is not reported
-      assertTrue(latchTriggered2);
-      verify(writer).startBucket(eq(4), anyLong(), eq(SECONDS.toNanos(REPORTING_INTERVAL)));
-      for (int i = 1; i < 5; ++i) {
-        AggregateEntry expected =
-            AggregateEntryTestUtils.of(
-                "resource",
-                "service" + i,
-                "operation",
-                null,
-                "type",
-                HTTP_OK,
-                false,
-                false,
-                "baz",
-                emptyList(),
-                null,
-                null,
-                null);
-        verify(writer, times(2)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expected)));
-      }
-      AggregateEntry expectedService0 =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service0",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              "baz",
-              emptyList(),
-              null,
-              null,
-              null);
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedService0)));
-      verify(writer, times(2)).finishBucket();
+                        "baz",
+                        emptyList(),
+                        null,
+                        null,
+                        null);
+                verify(writer, times(2)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expected)));
+            }
+            AggregateEntry expectedService0 = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service0",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    "baz",
+                    emptyList(),
+                    null,
+                    null,
+                    null);
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedService0)));
+            verify(writer, times(2)).finishBucket();
+        }
     }
-  }
-
-  @Test
-  void whenNoAggregateIsUpdatedInReportingIntervalNothingIsReported() throws Exception {
-    int maxAggregates = 10;
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(
-            features, HealthMetrics.NO_OP, sink, writer, maxAggregates, false)) {
-      long duration = 100;
-      aggregator.start();
-
-      // first cycle
-      CountDownLatch latch = new CountDownLatch(1);
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                assertEquals(1, e.getHitCount());
-                assertEquals(duration, e.getDuration());
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      for (int i = 0; i < 5; ++i) {
-        aggregator.publish(
-            singletonList(
-                new SimpleSpan(
+
+    @Test
+    void whenNoAggregateIsUpdatedInReportingIntervalNothingIsReported() throws Exception {
+        int maxAggregates = 10;
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator =
+                createClientStatsAggregator(features, HealthMetrics.NO_OP, sink, writer, maxAggregates, false)) {
+            long duration = 100;
+            aggregator.start();
+
+            // first cycle
+            CountDownLatch latch = new CountDownLatch(1);
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        assertEquals(1, e.getHitCount());
+                        assertEquals(duration, e.getDuration());
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            for (int i = 0; i < 5; ++i) {
+                aggregator.publish(singletonList(new SimpleSpan(
+                                "service" + i,
+                                "operation",
+                                "resource",
+                                "type",
+                                false,
+                                true,
+                                false,
+                                0,
+                                duration,
+                                HTTP_OK)
+                        .setTag(Tags.SPAN_KIND, "quux")));
+            }
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            // all aggregates should be reported
+            assertTrue(latchTriggered);
+            verify(writer).startBucket(eq(5), anyLong(), eq(SECONDS.toNanos(REPORTING_INTERVAL)));
+            for (int i = 0; i < 5; ++i) {
+                AggregateEntry expected = AggregateEntryTestUtils.of(
+                        "resource",
                         "service" + i,
                         "operation",
-                        "resource",
+                        null,
                         "type",
+                        HTTP_OK,
                         false,
-                        true,
                         false,
-                        0,
-                        duration,
-                        HTTP_OK)
-                    .setTag(Tags.SPAN_KIND, "quux")));
-      }
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      // all aggregates should be reported
-      assertTrue(latchTriggered);
-      verify(writer).startBucket(eq(5), anyLong(), eq(SECONDS.toNanos(REPORTING_INTERVAL)));
-      for (int i = 0; i < 5; ++i) {
-        AggregateEntry expected =
-            AggregateEntryTestUtils.of(
-                "resource",
-                "service" + i,
-                "operation",
-                null,
-                "type",
-                HTTP_OK,
-                false,
-                false,
-                "quux",
-                emptyList(),
-                null,
-                null,
-                null);
-        verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expected)));
-      }
-      verify(writer, times(1)).finishBucket();
-
-      // second cycle - no updates at all
-      waitUntilAggregatorIsEmpty(aggregator);
-      clearInvocations(writer);
-      aggregator.forceReport().get(2, SECONDS);
-
-      // =aggregate not updated in cycle is not reported
-      verify(writer, never()).startBucket(anyInt(), anyLong(), anyLong());
-      verify(writer, never()).add(any(AggregateEntry.class));
-      verify(writer, never()).finishBucket();
+                        "quux",
+                        emptyList(),
+                        null,
+                        null,
+                        null);
+                verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expected)));
+            }
+            verify(writer, times(1)).finishBucket();
+
+            // second cycle - no updates at all
+            waitUntilAggregatorIsEmpty(aggregator);
+            clearInvocations(writer);
+            aggregator.forceReport().get(2, SECONDS);
+
+            // =aggregate not updated in cycle is not reported
+            verify(writer, never()).startBucket(anyInt(), anyLong(), anyLong());
+            verify(writer, never()).add(any(AggregateEntry.class));
+            verify(writer, never()).finishBucket();
+        }
     }
-  }
-
-  @Test
-  void shouldReportPeriodically() throws Exception {
-    int maxAggregates = 10;
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, maxAggregates, 1, SECONDS, false)) {
-      long duration = 100;
-      aggregator.start();
-
-      CountDownLatch latch = new CountDownLatch(1);
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                assertEquals(1, e.getHitCount());
-                assertEquals(duration, e.getDuration());
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      for (int i = 0; i < 5; ++i) {
-        aggregator.publish(
-            singletonList(
-                new SimpleSpan(
+
+    @Test
+    void shouldReportPeriodically() throws Exception {
+        int maxAggregates = 10;
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator =
+                createClientStatsAggregator(features, sink, writer, maxAggregates, 1, SECONDS, false)) {
+            long duration = 100;
+            aggregator.start();
+
+            CountDownLatch latch = new CountDownLatch(1);
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        assertEquals(1, e.getHitCount());
+                        assertEquals(duration, e.getDuration());
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            for (int i = 0; i < 5; ++i) {
+                aggregator.publish(singletonList(new SimpleSpan(
+                                "service" + i,
+                                "operation",
+                                "resource",
+                                "type",
+                                false,
+                                true,
+                                false,
+                                0,
+                                duration,
+                                HTTP_OK,
+                                true)
+                        .setTag(Tags.SPAN_KIND, "garply")));
+            }
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            // all aggregates should be reported
+            assertTrue(latchTriggered);
+            verify(writer).startBucket(eq(5), anyLong(), eq(SECONDS.toNanos(1)));
+            for (int i = 0; i < 5; ++i) {
+                AggregateEntry expected = AggregateEntryTestUtils.of(
+                        "resource",
                         "service" + i,
                         "operation",
-                        "resource",
+                        null,
                         "type",
+                        HTTP_OK,
                         false,
                         true,
-                        false,
-                        0,
-                        duration,
-                        HTTP_OK,
-                        true)
-                    .setTag(Tags.SPAN_KIND, "garply")));
-      }
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      // all aggregates should be reported
-      assertTrue(latchTriggered);
-      verify(writer).startBucket(eq(5), anyLong(), eq(SECONDS.toNanos(1)));
-      for (int i = 0; i < 5; ++i) {
-        AggregateEntry expected =
-            AggregateEntryTestUtils.of(
-                "resource",
-                "service" + i,
-                "operation",
-                null,
-                "type",
-                HTTP_OK,
-                false,
-                true,
-                "garply",
-                emptyList(),
-                null,
-                null,
-                null);
-        verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expected)));
-      }
-      verify(writer, times(1)).finishBucket();
+                        "garply",
+                        emptyList(),
+                        null,
+                        null,
+                        null);
+                verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expected)));
+            }
+            verify(writer, times(1)).finishBucket();
+        }
     }
-  }
-
-  @Test
-  void shouldBeResilientToSerializationErrors() throws Exception {
-    int maxAggregates = 10;
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, maxAggregates, 1, SECONDS, false)) {
-      long duration = 100;
-      aggregator.start();
-
-      CountDownLatch latch = new CountDownLatch(1);
-      doThrow(new IllegalArgumentException("something went wrong"))
-          .when(writer)
-          .startBucket(anyInt(), anyLong(), anyLong());
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .reset();
-
-      for (int i = 0; i < 5; ++i) {
-        aggregator.publish(
-            singletonList(
-                new SimpleSpan(
-                    "service" + i,
-                    "operation",
-                    "resource",
-                    "type",
-                    false,
-                    true,
-                    false,
-                    0,
-                    duration,
-                    HTTP_OK)));
-      }
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      // writer should be reset if reporting fails
-      assertTrue(latchTriggered);
-      verify(writer).startBucket(anyInt(), anyLong(), anyLong());
-      verify(writer).reset();
+
+    @Test
+    void shouldBeResilientToSerializationErrors() throws Exception {
+        int maxAggregates = 10;
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator =
+                createClientStatsAggregator(features, sink, writer, maxAggregates, 1, SECONDS, false)) {
+            long duration = 100;
+            aggregator.start();
+
+            CountDownLatch latch = new CountDownLatch(1);
+            doThrow(new IllegalArgumentException("something went wrong"))
+                    .when(writer)
+                    .startBucket(anyInt(), anyLong(), anyLong());
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .reset();
+
+            for (int i = 0; i < 5; ++i) {
+                aggregator.publish(singletonList(new SimpleSpan(
+                        "service" + i, "operation", "resource", "type", false, true, false, 0, duration, HTTP_OK)));
+            }
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            // writer should be reset if reporting fails
+            assertTrue(latchTriggered);
+            verify(writer).startBucket(anyInt(), anyLong(), anyLong());
+            verify(writer).reset();
+        }
     }
-  }
-
-  @Test
-  void forceFlushShouldNotBlockIfMetricsAreDisabled() throws Exception {
-    int maxAggregates = 10;
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, maxAggregates, 1, SECONDS, false)) {
-      aggregator.start();
-
-      Boolean flushed = aggregator.forceReport().get(10, SECONDS);
-
-      assertNotNull(flushed);
-      assertFalse(flushed);
+
+    @Test
+    void forceFlushShouldNotBlockIfMetricsAreDisabled() throws Exception {
+        int maxAggregates = 10;
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        try (ClientStatsAggregator aggregator =
+                createClientStatsAggregator(features, sink, writer, maxAggregates, 1, SECONDS, false)) {
+            aggregator.start();
+
+            Boolean flushed = aggregator.forceReport().get(10, SECONDS);
+
+            assertNotNull(flushed);
+            assertFalse(flushed);
+        }
     }
-  }
-
-  @Test
-  void shouldStartEvenIfTheAgentIsNotAvailable() throws Exception {
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(false);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, 10, 200, MILLISECONDS, false)) {
-      List<SimpleSpan> spans =
-          singletonList(
-              new SimpleSpan(
-                  "service", "operation", "resource", "type", false, true, false, 0, 10, HTTP_OK));
-      aggregator.start();
-
-      // metrics not available
-      aggregator.publish(spans);
-      Thread.sleep(1_000);
-
-      // no writer calls
-      verifyNoInteractions(writer);
-
-      // re-enable metrics
-      when(features.supportsMetrics()).thenReturn(true);
-      aggregator.publish(spans);
-      Thread.sleep(1_000);
-
-      // writer called at least once
-      verify(writer, atLeastOnce()).startBucket(anyInt(), anyLong(), anyLong());
+
+    @Test
+    void shouldStartEvenIfTheAgentIsNotAvailable() throws Exception {
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(false);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator =
+                createClientStatsAggregator(features, sink, writer, 10, 200, MILLISECONDS, false)) {
+            List<SimpleSpan> spans = singletonList(
+                    new SimpleSpan("service", "operation", "resource", "type", false, true, false, 0, 10, HTTP_OK));
+            aggregator.start();
+
+            // metrics not available
+            aggregator.publish(spans);
+            Thread.sleep(1_000);
+
+            // no writer calls
+            verifyNoInteractions(writer);
+
+            // re-enable metrics
+            when(features.supportsMetrics()).thenReturn(true);
+            aggregator.publish(spans);
+            Thread.sleep(1_000);
+
+            // writer called at least once
+            verify(writer, atLeastOnce()).startBucket(anyInt(), anyLong(), anyLong());
+        }
     }
-  }
-
-  @Test
-  void forceFlushShouldWaitForAggregatorToStart() throws Exception {
-    int maxAggregates = 10;
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, maxAggregates, 1, SECONDS, false)) {
-
-      // call forceReport before start
-      CompletableFuture<Boolean> async =
-          CompletableFuture.supplyAsync(
-              () -> {
+
+    @Test
+    void forceFlushShouldWaitForAggregatorToStart() throws Exception {
+        int maxAggregates = 10;
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        try (ClientStatsAggregator aggregator =
+                createClientStatsAggregator(features, sink, writer, maxAggregates, 1, SECONDS, false)) {
+
+            // call forceReport before start
+            CompletableFuture<Boolean> async = CompletableFuture.supplyAsync(() -> {
                 try {
-                  return aggregator.forceReport().get();
+                    return aggregator.forceReport().get();
                 } catch (Exception e) {
-                  throw new RuntimeException(e);
+                    throw new RuntimeException(e);
                 }
-              });
+            });
 
-      assertThrows(TimeoutException.class, () -> async.get(3, SECONDS));
+            assertThrows(TimeoutException.class, () -> async.get(3, SECONDS));
 
-      // start aggregator
-      aggregator.start();
-      Boolean flushed = async.get(3, TimeUnit.SECONDS);
+            // start aggregator
+            aggregator.start();
+            Boolean flushed = async.get(3, TimeUnit.SECONDS);
 
-      assertNotNull(flushed);
-      assertTrue(flushed);
+            assertNotNull(flushed);
+            assertTrue(flushed);
+        }
     }
-  }
-
-  @Test
-  void shouldNotCountPartialSnapshotLongRunning() throws Exception {
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, false)) {
-      aggregator.start();
-
-      CountDownLatch latch = new CountDownLatch(1);
-      AggregateEntry expectedEntry =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              true,
-              "",
-              emptyList(),
-              null,
-              null,
-              null);
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                assertTrue(AggregateEntryTestUtils.equals(e, expectedEntry));
-                assertEquals(1, e.getHitCount());
-                assertEquals(1, e.getTopLevelCount());
-                assertEquals(100, e.getDuration());
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      aggregator.publish(
-          Arrays.asList(
-              new SimpleSpan(
-                  "service",
-                  "operation",
-                  "resource",
-                  "type",
-                  true,
-                  true,
-                  false,
-                  0,
-                  100,
-                  HTTP_OK,
-                  true,
-                  12345),
-              new SimpleSpan(
-                  "service",
-                  "operation",
-                  "resource",
-                  "type",
-                  true,
-                  true,
-                  false,
-                  0,
-                  100,
-                  HTTP_OK,
-                  true,
-                  0)));
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      assertTrue(latchTriggered);
-      verify(writer).startBucket(eq(1), anyLong(), anyLong());
-      verify(writer, times(1)).add(any(AggregateEntry.class));
-      verify(writer).finishBucket();
+
+    @Test
+    void shouldNotCountPartialSnapshotLongRunning() throws Exception {
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        try (ClientStatsAggregator aggregator = createClientStatsAggregator(features, sink, writer, false)) {
+            aggregator.start();
+
+            CountDownLatch latch = new CountDownLatch(1);
+            AggregateEntry expectedEntry = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    true,
+                    "",
+                    emptyList(),
+                    null,
+                    null,
+                    null);
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        assertTrue(AggregateEntryTestUtils.equals(e, expectedEntry));
+                        assertEquals(1, e.getHitCount());
+                        assertEquals(1, e.getTopLevelCount());
+                        assertEquals(100, e.getDuration());
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            aggregator.publish(Arrays.asList(
+                    new SimpleSpan(
+                            "service",
+                            "operation",
+                            "resource",
+                            "type",
+                            true,
+                            true,
+                            false,
+                            0,
+                            100,
+                            HTTP_OK,
+                            true,
+                            12345),
+                    new SimpleSpan(
+                            "service", "operation", "resource", "type", true, true, false, 0, 100, HTTP_OK, true, 0)));
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            assertTrue(latchTriggered);
+            verify(writer).startBucket(eq(1), anyLong(), anyLong());
+            verify(writer, times(1)).add(any(AggregateEntry.class));
+            verify(writer).finishBucket();
+        }
     }
-  }
-
-  @Test
-  void shouldNotChangeMetricBucketsWhenIncludeEndpointInMetricsIsDisabled() throws Exception {
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, false)) {
-      aggregator.start();
-
-      // publishing spans with different http.method and http.endpoint
-      CountDownLatch latch = new CountDownLatch(1);
-      AggregateEntry expectedEntry =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              "server",
-              emptyList(),
-              null,
-              null,
-              null);
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                assertTrue(AggregateEntryTestUtils.equals(e, expectedEntry));
-                assertEquals(3, e.getHitCount());
-                assertEquals(3, e.getTopLevelCount());
-                assertEquals(450, e.getDuration());
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      aggregator.publish(
-          Arrays.asList(
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      false,
-                      true,
-                      false,
-                      0,
-                      100,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "server")
-                  .setTag("http.method", "GET")
-                  .setTag("http.endpoint", "/api/users/:id"),
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      false,
-                      true,
-                      false,
-                      0,
-                      200,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "server")
-                  .setTag("http.method", "POST")
-                  .setTag("http.endpoint", "/api/orders"),
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      false,
-                      true,
-                      false,
-                      0,
-                      150,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "server")));
-      aggregator.forceReport().get(2, SECONDS);
-      boolean latchTriggered = latch.await(0, SECONDS);
-
-      // all spans should go to the same bucket (httpMethod and httpEndpoint are ignored)
-      assertTrue(latchTriggered);
-      verify(writer).startBucket(eq(1), anyLong(), anyLong());
-      verify(writer, times(1)).add(any(AggregateEntry.class));
-      verify(writer).finishBucket();
+
+    @Test
+    void shouldNotChangeMetricBucketsWhenIncludeEndpointInMetricsIsDisabled() throws Exception {
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator = createClientStatsAggregator(features, sink, writer, false)) {
+            aggregator.start();
+
+            // publishing spans with different http.method and http.endpoint
+            CountDownLatch latch = new CountDownLatch(1);
+            AggregateEntry expectedEntry = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    null,
+                    null,
+                    null);
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        assertTrue(AggregateEntryTestUtils.equals(e, expectedEntry));
+                        assertEquals(3, e.getHitCount());
+                        assertEquals(3, e.getTopLevelCount());
+                        assertEquals(450, e.getDuration());
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            aggregator.publish(Arrays.asList(
+                    new SimpleSpan("service", "operation", "resource", "type", false, true, false, 0, 100, HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, "server")
+                            .setTag("http.method", "GET")
+                            .setTag("http.endpoint", "/api/users/:id"),
+                    new SimpleSpan("service", "operation", "resource", "type", false, true, false, 0, 200, HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, "server")
+                            .setTag("http.method", "POST")
+                            .setTag("http.endpoint", "/api/orders"),
+                    new SimpleSpan("service", "operation", "resource", "type", false, true, false, 0, 150, HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, "server")));
+            aggregator.forceReport().get(2, SECONDS);
+            boolean latchTriggered = latch.await(0, SECONDS);
+
+            // all spans should go to the same bucket (httpMethod and httpEndpoint are ignored)
+            assertTrue(latchTriggered);
+            verify(writer).startBucket(eq(1), anyLong(), anyLong());
+            verify(writer, times(1)).add(any(AggregateEntry.class));
+            verify(writer).finishBucket();
+        }
     }
-  }
-
-  @Test
-  void shouldSeparateMetricBucketsWhenIncludeEndpointInMetricsIsEnabled() throws Exception {
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, true)) {
-      aggregator.start();
-
-      // publishing spans with different http.method and http.endpoint
-      CountDownLatch latch = new CountDownLatch(1);
-      AggregateEntry expectedGetUsers =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              "server",
-              emptyList(),
-              "GET",
-              "/api/users/:id",
-              null);
-      AggregateEntry expectedPostOrders =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              "server",
-              emptyList(),
-              "POST",
-              "/api/orders",
-              null);
-      AggregateEntry expectedNoHttp =
-          AggregateEntryTestUtils.of(
-              "resource",
-              "service",
-              "operation",
-              null,
-              "type",
-              HTTP_OK,
-              false,
-              false,
-              "server",
-              emptyList(),
-              null,
-              null,
-              null);
-
-      doAnswer(
-              invocation -> {
-                AggregateEntry e = invocation.getArgument(0);
-                if (AggregateEntryTestUtils.equals(e, expectedGetUsers)) {
-                  assertEquals(1, e.getHitCount());
-                  assertEquals(1, e.getTopLevelCount());
-                  assertEquals(100, e.getDuration());
-                } else if (AggregateEntryTestUtils.equals(e, expectedPostOrders)) {
-                  assertEquals(1, e.getHitCount());
-                  assertEquals(1, e.getTopLevelCount());
-                  assertEquals(200, e.getDuration());
-                } else if (AggregateEntryTestUtils.equals(e, expectedNoHttp)) {
-                  assertEquals(1, e.getHitCount());
-                  assertEquals(1, e.getTopLevelCount());
-                  assertEquals(150, e.getDuration());
-                } else {
-                  throw new AssertionError("Unexpected AggregateEntry in add()");
-                }
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      aggregator.publish(
-          Arrays.asList(
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      false,
-                      true,
-                      false,
-                      0,
-                      100,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "server")
-                  .setTag("http.method", "GET")
-                  .setTag("http.endpoint", "/api/users/:id"),
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      false,
-                      true,
-                      false,
-                      0,
-                      200,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "server")
-                  .setTag("http.method", "POST")
-                  .setTag("http.endpoint", "/api/orders"),
-              new SimpleSpan(
-                      "service",
-                      "operation",
-                      "resource",
-                      "type",
-                      false,
-                      true,
-                      false,
-                      0,
-                      150,
-                      HTTP_OK)
-                  .setTag(Tags.SPAN_KIND, "server")));
-      aggregator.forceReport().get(2, SECONDS);
-      boolean latchTriggered = latch.await(0, SECONDS);
-
-      // spans should go to separate buckets based on httpMethod and httpEndpoint
-      assertTrue(latchTriggered);
-      verify(writer).startBucket(eq(3), anyLong(), anyLong());
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGetUsers)));
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedPostOrders)));
-      verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedNoHttp)));
-      verify(writer).finishBucket();
+
+    @Test
+    void shouldSeparateMetricBucketsWhenIncludeEndpointInMetricsIsEnabled() throws Exception {
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator = createClientStatsAggregator(features, sink, writer, true)) {
+            aggregator.start();
+
+            // publishing spans with different http.method and http.endpoint
+            CountDownLatch latch = new CountDownLatch(1);
+            AggregateEntry expectedGetUsers = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    "GET",
+                    "/api/users/:id",
+                    null);
+            AggregateEntry expectedPostOrders = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    "POST",
+                    "/api/orders",
+                    null);
+            AggregateEntry expectedNoHttp = AggregateEntryTestUtils.of(
+                    "resource",
+                    "service",
+                    "operation",
+                    null,
+                    "type",
+                    HTTP_OK,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    null,
+                    null,
+                    null);
+
+            doAnswer(invocation -> {
+                        AggregateEntry e = invocation.getArgument(0);
+                        if (AggregateEntryTestUtils.equals(e, expectedGetUsers)) {
+                            assertEquals(1, e.getHitCount());
+                            assertEquals(1, e.getTopLevelCount());
+                            assertEquals(100, e.getDuration());
+                        } else if (AggregateEntryTestUtils.equals(e, expectedPostOrders)) {
+                            assertEquals(1, e.getHitCount());
+                            assertEquals(1, e.getTopLevelCount());
+                            assertEquals(200, e.getDuration());
+                        } else if (AggregateEntryTestUtils.equals(e, expectedNoHttp)) {
+                            assertEquals(1, e.getHitCount());
+                            assertEquals(1, e.getTopLevelCount());
+                            assertEquals(150, e.getDuration());
+                        } else {
+                            throw new AssertionError("Unexpected AggregateEntry in add()");
+                        }
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            aggregator.publish(Arrays.asList(
+                    new SimpleSpan("service", "operation", "resource", "type", false, true, false, 0, 100, HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, "server")
+                            .setTag("http.method", "GET")
+                            .setTag("http.endpoint", "/api/users/:id"),
+                    new SimpleSpan("service", "operation", "resource", "type", false, true, false, 0, 200, HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, "server")
+                            .setTag("http.method", "POST")
+                            .setTag("http.endpoint", "/api/orders"),
+                    new SimpleSpan("service", "operation", "resource", "type", false, true, false, 0, 150, HTTP_OK)
+                            .setTag(Tags.SPAN_KIND, "server")));
+            aggregator.forceReport().get(2, SECONDS);
+            boolean latchTriggered = latch.await(0, SECONDS);
+
+            // spans should go to separate buckets based on httpMethod and httpEndpoint
+            assertTrue(latchTriggered);
+            verify(writer).startBucket(eq(3), anyLong(), anyLong());
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGetUsers)));
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedPostOrders)));
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedNoHttp)));
+            verify(writer).finishBucket();
+        }
     }
-  }
-
-  @Test
-  void shouldIncludeGrpcStatusCodeInMetricKeyForRpcSpans() throws Exception {
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, sink, writer, false)) {
-      aggregator.start();
-
-      CountDownLatch latch = new CountDownLatch(1);
-      AggregateEntry expectedGrpcStatus0 =
-          AggregateEntryTestUtils.of(
-              "grpc.service/Method",
-              "service",
-              "grpc.server",
-              null,
-              "rpc",
-              0,
-              false,
-              false,
-              "server",
-              emptyList(),
-              null,
-              null,
-              "0");
-      AggregateEntry expectedGrpcStatus5 =
-          AggregateEntryTestUtils.of(
-              "grpc.service/Method",
-              "service",
-              "grpc.server",
-              null,
-              "rpc",
-              0,
-              false,
-              false,
-              "server",
-              emptyList(),
-              null,
-              null,
-              "5");
-      AggregateEntry expectedHttpSpan =
-          AggregateEntryTestUtils.of(
-              "GET /api",
-              "service",
-              "http.request",
-              null,
-              "web",
-              200,
-              false,
-              false,
-              "server",
-              emptyList(),
-              null,
-              null,
-              null);
-
-      doAnswer(invocation -> null).when(writer).add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-
-      aggregator.publish(
-          Arrays.asList(
-              new SimpleSpan(
-                      "service",
-                      "grpc.server",
-                      "grpc.service/Method",
-                      "rpc",
-                      true,
-                      false,
-                      false,
-                      0,
-                      100,
-                      0)
-                  .setTag(Tags.SPAN_KIND, "server")
-                  .setTag(InstrumentationTags.GRPC_STATUS_CODE, 0),
-              new SimpleSpan(
-                      "service",
-                      "grpc.server",
-                      "grpc.service/Method",
-                      "rpc",
-                      true,
-                      false,
-                      false,
-                      0,
-                      50,
-                      0)
-                  .setTag(Tags.SPAN_KIND, "server")
-                  .setTag(InstrumentationTags.GRPC_STATUS_CODE, 5),
-              new SimpleSpan(
-                      "service", "http.request", "GET /api", "web", true, false, false, 0, 75, 200)
-                  .setTag(Tags.SPAN_KIND, "server")));
-      aggregator.report();
-      boolean latchTriggered = latch.await(2, SECONDS);
-
-      assertTrue(latchTriggered);
-      verify(writer).startBucket(eq(3), anyLong(), anyLong());
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGrpcStatus0)));
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGrpcStatus5)));
-      verify(writer, times(1))
-          .add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedHttpSpan)));
-      verify(writer).finishBucket();
+
+    @Test
+    void shouldIncludeGrpcStatusCodeInMetricKeyForRpcSpans() throws Exception {
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator = createClientStatsAggregator(features, sink, writer, false)) {
+            aggregator.start();
+
+            CountDownLatch latch = new CountDownLatch(1);
+            AggregateEntry expectedGrpcStatus0 = AggregateEntryTestUtils.of(
+                    "grpc.service/Method",
+                    "service",
+                    "grpc.server",
+                    null,
+                    "rpc",
+                    0,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    null,
+                    null,
+                    "0");
+            AggregateEntry expectedGrpcStatus5 = AggregateEntryTestUtils.of(
+                    "grpc.service/Method",
+                    "service",
+                    "grpc.server",
+                    null,
+                    "rpc",
+                    0,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    null,
+                    null,
+                    "5");
+            AggregateEntry expectedHttpSpan = AggregateEntryTestUtils.of(
+                    "GET /api",
+                    "service",
+                    "http.request",
+                    null,
+                    "web",
+                    200,
+                    false,
+                    false,
+                    "server",
+                    emptyList(),
+                    null,
+                    null,
+                    null);
+
+            doAnswer(invocation -> null).when(writer).add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+
+            aggregator.publish(Arrays.asList(
+                    new SimpleSpan(
+                                    "service",
+                                    "grpc.server",
+                                    "grpc.service/Method",
+                                    "rpc",
+                                    true,
+                                    false,
+                                    false,
+                                    0,
+                                    100,
+                                    0)
+                            .setTag(Tags.SPAN_KIND, "server")
+                            .setTag(InstrumentationTags.GRPC_STATUS_CODE, 0),
+                    new SimpleSpan("service", "grpc.server", "grpc.service/Method", "rpc", true, false, false, 0, 50, 0)
+                            .setTag(Tags.SPAN_KIND, "server")
+                            .setTag(InstrumentationTags.GRPC_STATUS_CODE, 5),
+                    new SimpleSpan("service", "http.request", "GET /api", "web", true, false, false, 0, 75, 200)
+                            .setTag(Tags.SPAN_KIND, "server")));
+            aggregator.report();
+            boolean latchTriggered = latch.await(2, SECONDS);
+
+            assertTrue(latchTriggered);
+            verify(writer).startBucket(eq(3), anyLong(), anyLong());
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGrpcStatus0)));
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedGrpcStatus5)));
+            verify(writer, times(1)).add(argThat(e -> AggregateEntryTestUtils.equals(e, expectedHttpSpan)));
+            verify(writer).finishBucket();
+        }
     }
-  }
-
-  @Test
-  void cardinalityLimitsResetBetweenReportCycles() throws Exception {
-    List<AggregateEntry> cycle1Entries = new ArrayList<>();
-    List<AggregateEntry> cycle2Entries = new ArrayList<>();
-    CountDownLatch latch1 = new CountDownLatch(1);
-    CountDownLatch latch2 = new CountDownLatch(1);
-    MetricWriter writer = mock(MetricWriter.class);
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    try (ClientStatsAggregator aggregator =
-        createClientStatsAggregator(features, HealthMetrics.NO_OP, sink, writer, 256, false)) {
-      aggregator.start();
-
-      // publish SERVICE+1 distinct services to fill and overflow the cardinality budget
-      doAnswer(
-              invocation -> {
-                cycle1Entries.add(invocation.getArgument(0));
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch1.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-      for (int i = 0; i <= MetricCardinalityLimits.SERVICE; i++) {
-        aggregator.publish(
-            singletonList(
-                new SimpleSpan(
-                    "svc-" + i, "op", "resource", "web", false, true, false, 0, 100, HTTP_OK)));
-      }
-      aggregator.report();
-      latch1.await(2, SECONDS);
-
-      // the overflow service maps to the tracer_blocked_value sentinel
-      verify(writer).startBucket(eq(MetricCardinalityLimits.SERVICE + 1), anyLong(), anyLong());
-      verify(writer, times(1)).finishBucket();
-      assertEquals(
-          1,
-          cycle1Entries.stream()
-              .filter(e -> e.getService().toString().equals("tracer_blocked_value"))
-              .count());
-
-      // publish the overflow service in the next cycle after the cardinality reset
-      clearInvocations(writer);
-      doAnswer(
-              invocation -> {
-                cycle2Entries.add(invocation.getArgument(0));
-                return null;
-              })
-          .when(writer)
-          .add(any(AggregateEntry.class));
-      doAnswer(
-              invocation -> {
-                latch2.countDown();
-                return null;
-              })
-          .when(writer)
-          .finishBucket();
-      String overflowServiceName = "svc-" + MetricCardinalityLimits.SERVICE;
-      aggregator.publish(
-          singletonList(
-              new SimpleSpan(
-                  overflowServiceName,
-                  "op",
-                  "resource",
-                  "web",
-                  false,
-                  true,
-                  false,
-                  0,
-                  100,
-                  HTTP_OK)));
-      aggregator.report();
-      latch2.await(2, SECONDS);
-
-      // after reset the overflow service name is accepted as a real entry
-      verify(writer).startBucket(eq(1), anyLong(), anyLong());
-      verify(writer, times(1)).add(any(AggregateEntry.class));
-      verify(writer, times(1)).finishBucket();
-      assertEquals(1, cycle2Entries.size());
-      assertEquals(overflowServiceName, cycle2Entries.get(0).getService().toString());
+
+    @Test
+    void cardinalityLimitsResetBetweenReportCycles() throws Exception {
+        List<AggregateEntry> cycle1Entries = new ArrayList<>();
+        List<AggregateEntry> cycle2Entries = new ArrayList<>();
+        CountDownLatch latch1 = new CountDownLatch(1);
+        CountDownLatch latch2 = new CountDownLatch(1);
+        MetricWriter writer = mock(MetricWriter.class);
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        try (ClientStatsAggregator aggregator =
+                createClientStatsAggregator(features, HealthMetrics.NO_OP, sink, writer, 256, false)) {
+            aggregator.start();
+
+            // publish SERVICE+1 distinct services to fill and overflow the cardinality budget
+            doAnswer(invocation -> {
+                        cycle1Entries.add(invocation.getArgument(0));
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch1.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+            for (int i = 0; i <= MetricCardinalityLimits.SERVICE; i++) {
+                aggregator.publish(singletonList(
+                        new SimpleSpan("svc-" + i, "op", "resource", "web", false, true, false, 0, 100, HTTP_OK)));
+            }
+            aggregator.report();
+            latch1.await(2, SECONDS);
+
+            // the overflow service maps to the tracer_blocked_value sentinel
+            verify(writer).startBucket(eq(MetricCardinalityLimits.SERVICE + 1), anyLong(), anyLong());
+            verify(writer, times(1)).finishBucket();
+            assertEquals(
+                    1,
+                    cycle1Entries.stream()
+                            .filter(e -> e.getService().toString().equals("tracer_blocked_value"))
+                            .count());
+
+            // publish the overflow service in the next cycle after the cardinality reset
+            clearInvocations(writer);
+            doAnswer(invocation -> {
+                        cycle2Entries.add(invocation.getArgument(0));
+                        return null;
+                    })
+                    .when(writer)
+                    .add(any(AggregateEntry.class));
+            doAnswer(invocation -> {
+                        latch2.countDown();
+                        return null;
+                    })
+                    .when(writer)
+                    .finishBucket();
+            String overflowServiceName = "svc-" + MetricCardinalityLimits.SERVICE;
+            aggregator.publish(singletonList(
+                    new SimpleSpan(overflowServiceName, "op", "resource", "web", false, true, false, 0, 100, HTTP_OK)));
+            aggregator.report();
+            latch2.await(2, SECONDS);
+
+            // after reset the overflow service name is accepted as a real entry
+            verify(writer).startBucket(eq(1), anyLong(), anyLong());
+            verify(writer, times(1)).add(any(AggregateEntry.class));
+            verify(writer, times(1)).finishBucket();
+            assertEquals(1, cycle2Entries.size());
+            assertEquals(overflowServiceName, cycle2Entries.get(0).getService().toString());
+        }
+    }
+
+    private void waitUntilAggregatorIsEmpty(ClientStatsAggregator aggregator) throws InterruptedException {
+        int i = 0;
+        while (!aggregator.isEmpty() && i++ < 100) {
+            Thread.sleep(10);
+        }
+    }
+
+    private static ClientStatsAggregator createClientStatsAggregator(
+            DDAgentFeaturesDiscovery features,
+            HealthMetrics healthMetrics,
+            Sink sink,
+            MetricWriter writer,
+            int maxAggregates,
+            boolean includeEndpointInMetrics) {
+        return new ClientStatsAggregator(
+                emptySet(),
+                features,
+                healthMetrics,
+                sink,
+                writer,
+                maxAggregates,
+                QUEUE_SIZE,
+                REPORTING_INTERVAL,
+                SECONDS,
+                includeEndpointInMetrics);
+    }
+
+    private static ClientStatsAggregator createClientStatsAggregator(
+            DDAgentFeaturesDiscovery features,
+            Sink sink,
+            MetricWriter writer,
+            int maxAggregates,
+            long reportingInterval,
+            TimeUnit timeUnit,
+            boolean includeEndpointInMetrics) {
+        return new ClientStatsAggregator(
+                emptySet(),
+                features,
+                HealthMetrics.NO_OP,
+                sink,
+                writer,
+                maxAggregates,
+                QUEUE_SIZE,
+                reportingInterval,
+                timeUnit,
+                includeEndpointInMetrics);
     }
-  }
 
-  private void waitUntilAggregatorIsEmpty(ClientStatsAggregator aggregator)
-      throws InterruptedException {
-    int i = 0;
-    while (!aggregator.isEmpty() && i++ < 100) {
-      Thread.sleep(10);
+    private static ClientStatsAggregator createClientStatsAggregator(
+            DDAgentFeaturesDiscovery features, Sink sink, MetricWriter writer, boolean includeEndpointInMetrics) {
+        return createClientStatsAggregator(features, HealthMetrics.NO_OP, sink, writer, 10, includeEndpointInMetrics);
     }
-  }
-
-  private static ClientStatsAggregator createClientStatsAggregator(
-      DDAgentFeaturesDiscovery features,
-      HealthMetrics healthMetrics,
-      Sink sink,
-      MetricWriter writer,
-      int maxAggregates,
-      boolean includeEndpointInMetrics) {
-    return new ClientStatsAggregator(
-        emptySet(),
-        features,
-        healthMetrics,
-        sink,
-        writer,
-        maxAggregates,
-        QUEUE_SIZE,
-        REPORTING_INTERVAL,
-        SECONDS,
-        includeEndpointInMetrics);
-  }
-
-  private static ClientStatsAggregator createClientStatsAggregator(
-      DDAgentFeaturesDiscovery features,
-      Sink sink,
-      MetricWriter writer,
-      int maxAggregates,
-      long reportingInterval,
-      TimeUnit timeUnit,
-      boolean includeEndpointInMetrics) {
-    return new ClientStatsAggregator(
-        emptySet(),
-        features,
-        HealthMetrics.NO_OP,
-        sink,
-        writer,
-        maxAggregates,
-        QUEUE_SIZE,
-        reportingInterval,
-        timeUnit,
-        includeEndpointInMetrics);
-  }
-
-  private static ClientStatsAggregator createClientStatsAggregator(
-      DDAgentFeaturesDiscovery features,
-      Sink sink,
-      MetricWriter writer,
-      boolean includeEndpointInMetrics) {
-    return createClientStatsAggregator(
-        features, HealthMetrics.NO_OP, sink, writer, 10, includeEndpointInMetrics);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/CoreHandlersTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/CoreHandlersTest.java
index 35c2fa8468c..45203b0d43e 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/CoreHandlersTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/CoreHandlersTest.java
@@ -11,85 +11,87 @@
 
 class CoreHandlersTest {
 
-  @Test
-  void resetReportsBlockedCountForExhaustedHandler() {
-    CoreHandlers handlers = new CoreHandlers();
-    // Exhaust span_kind (limit = 8) and record 2 blocked values.
-    for (int i = 0; i < MetricCardinalityLimits.SPAN_KIND; i++) {
-      handlers.spanKind.register("kind-" + i);
+    @Test
+    void resetReportsBlockedCountForExhaustedHandler() {
+        CoreHandlers handlers = new CoreHandlers();
+        // Exhaust span_kind (limit = 8) and record 2 blocked values.
+        for (int i = 0; i < MetricCardinalityLimits.SPAN_KIND; i++) {
+            handlers.spanKind.register("kind-" + i);
+        }
+        handlers.spanKind.register("overflow-1");
+        handlers.spanKind.register("overflow-2");
+
+        HealthMetrics metrics = mock(HealthMetrics.class);
+        handlers.reset(metrics, new CardinalityLimitReporter());
+
+        verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:span_kind"}, 2L);
+        verifyNoMoreInteractions(metrics);
     }
-    handlers.spanKind.register("overflow-1");
-    handlers.spanKind.register("overflow-2");
-
-    HealthMetrics metrics = mock(HealthMetrics.class);
-    handlers.reset(metrics, new CardinalityLimitReporter());
-
-    verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:span_kind"}, 2L);
-    verifyNoMoreInteractions(metrics);
-  }
-
-  @Test
-  void resetReportsBlockedCountForAllNineHandlers() {
-    CoreHandlers handlers = new CoreHandlers();
-    exhaustAndBlock(handlers.resource, MetricCardinalityLimits.RESOURCE);
-    exhaustAndBlock(handlers.service, MetricCardinalityLimits.SERVICE);
-    exhaustAndBlock(handlers.operation, MetricCardinalityLimits.OPERATION);
-    exhaustAndBlock(handlers.serviceSource, MetricCardinalityLimits.SERVICE_SOURCE);
-    exhaustAndBlock(handlers.type, MetricCardinalityLimits.TYPE);
-    exhaustAndBlock(handlers.spanKind, MetricCardinalityLimits.SPAN_KIND);
-    exhaustAndBlock(handlers.httpMethod, MetricCardinalityLimits.HTTP_METHOD);
-    exhaustAndBlock(handlers.httpEndpoint, MetricCardinalityLimits.HTTP_ENDPOINT);
-    exhaustAndBlock(handlers.grpcStatusCode, MetricCardinalityLimits.GRPC_STATUS_CODE);
-
-    HealthMetrics metrics = mock(HealthMetrics.class);
-    handlers.reset(metrics, new CardinalityLimitReporter());
-
-    verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:resource"}, 1L);
-    verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:service"}, 1L);
-    // operation is carried on the wire as the protobuf field "name", so it reports as
-    // collapsed:name
-    verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:name"}, 1L);
-    verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:service_source"}, 1L);
-    verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:type"}, 1L);
-    verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:span_kind"}, 1L);
-    verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:http_method"}, 1L);
-    verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:http_endpoint"}, 1L);
-    verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:grpc_status_code"}, 1L);
-    verifyNoMoreInteractions(metrics);
-  }
-
-  @Test
-  void resetRefreshesCapacityForNextCycle() {
-    CoreHandlers handlers = new CoreHandlers();
-    for (int i = 0; i < MetricCardinalityLimits.SPAN_KIND; i++) {
-      handlers.spanKind.register("kind-" + i);
-    }
-    assertEquals("tracer_blocked_value", handlers.spanKind.register("overflow").toString());
 
-    handlers.reset(HealthMetrics.NO_OP, new CardinalityLimitReporter());
+    @Test
+    void resetReportsBlockedCountForAllNineHandlers() {
+        CoreHandlers handlers = new CoreHandlers();
+        exhaustAndBlock(handlers.resource, MetricCardinalityLimits.RESOURCE);
+        exhaustAndBlock(handlers.service, MetricCardinalityLimits.SERVICE);
+        exhaustAndBlock(handlers.operation, MetricCardinalityLimits.OPERATION);
+        exhaustAndBlock(handlers.serviceSource, MetricCardinalityLimits.SERVICE_SOURCE);
+        exhaustAndBlock(handlers.type, MetricCardinalityLimits.TYPE);
+        exhaustAndBlock(handlers.spanKind, MetricCardinalityLimits.SPAN_KIND);
+        exhaustAndBlock(handlers.httpMethod, MetricCardinalityLimits.HTTP_METHOD);
+        exhaustAndBlock(handlers.httpEndpoint, MetricCardinalityLimits.HTTP_ENDPOINT);
+        exhaustAndBlock(handlers.grpcStatusCode, MetricCardinalityLimits.GRPC_STATUS_CODE);
+
+        HealthMetrics metrics = mock(HealthMetrics.class);
+        handlers.reset(metrics, new CardinalityLimitReporter());
+
+        verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:resource"}, 1L);
+        verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:service"}, 1L);
+        // operation is carried on the wire as the protobuf field "name", so it reports as
+        // collapsed:name
+        verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:name"}, 1L);
+        verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:service_source"}, 1L);
+        verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:type"}, 1L);
+        verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:span_kind"}, 1L);
+        verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:http_method"}, 1L);
+        verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:http_endpoint"}, 1L);
+        verify(metrics).onTagCardinalityBlocked(new String[] {"collapsed:grpc_status_code"}, 1L);
+        verifyNoMoreInteractions(metrics);
+    }
 
-    // Overflow value should now be accepted as a real value.
-    assertNotEquals("tracer_blocked_value", handlers.spanKind.register("overflow").toString());
-    assertEquals("overflow", handlers.spanKind.register("overflow").toString());
-  }
+    @Test
+    void resetRefreshesCapacityForNextCycle() {
+        CoreHandlers handlers = new CoreHandlers();
+        for (int i = 0; i < MetricCardinalityLimits.SPAN_KIND; i++) {
+            handlers.spanKind.register("kind-" + i);
+        }
+        assertEquals(
+                "tracer_blocked_value", handlers.spanKind.register("overflow").toString());
+
+        handlers.reset(HealthMetrics.NO_OP, new CardinalityLimitReporter());
+
+        // Overflow value should now be accepted as a real value.
+        assertNotEquals(
+                "tracer_blocked_value", handlers.spanKind.register("overflow").toString());
+        assertEquals("overflow", handlers.spanKind.register("overflow").toString());
+    }
 
-  @Test
-  void resetWithNoBlockedValuesDoesNotCallHealthMetrics() {
-    CoreHandlers handlers = new CoreHandlers();
-    handlers.resource.register("r1");
-    handlers.service.register("svc");
+    @Test
+    void resetWithNoBlockedValuesDoesNotCallHealthMetrics() {
+        CoreHandlers handlers = new CoreHandlers();
+        handlers.resource.register("r1");
+        handlers.service.register("svc");
 
-    HealthMetrics metrics = mock(HealthMetrics.class);
-    handlers.reset(metrics, new CardinalityLimitReporter());
+        HealthMetrics metrics = mock(HealthMetrics.class);
+        handlers.reset(metrics, new CardinalityLimitReporter());
 
-    verifyNoMoreInteractions(metrics);
-  }
+        verifyNoMoreInteractions(metrics);
+    }
 
-  /** Fills {@code handler} to its cardinality limit then registers one more to block it. */
-  private static void exhaustAndBlock(PropertyCardinalityHandler handler, int limit) {
-    for (int i = 0; i < limit; i++) {
-      handler.register("value-" + i);
+    /** Fills {@code handler} to its cardinality limit then registers one more to block it. */
+    private static void exhaustAndBlock(PropertyCardinalityHandler handler, int limit) {
+        for (int i = 0; i < limit; i++) {
+            handler.register("value-" + i);
+        }
+        handler.register("overflow");
     }
-    handler.register("overflow");
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/FootprintForkedTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/FootprintForkedTest.java
index ac54d7d700f..b30ff5d0be5 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/FootprintForkedTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/FootprintForkedTest.java
@@ -29,156 +29,150 @@
 @DisabledIf("datadog.environment.JavaVirtualMachine#isJ9")
 class FootprintForkedTest {
 
-  private static final Random RANDOM = new Random(0);
-
-  @BeforeAll
-  static void setupSpec() {
-    // Initialize metrics-lib histograms to register the DDSketch implementation
-    Histograms.register(DDSketchHistograms.FACTORY);
-  }
-
-  @TableTest({
-    "scenario                       | operationCardinality | servicePerOperation | resourceNamesPerService | typesPerOperation | errorRate",
-    "5 ops 10 resources 0% errors   | 5                    | 1                   | 10                      | 2                 | 0.00     ",
-    "5 ops 100 resources 0% errors  | 5                    | 1                   | 100                     | 2                 | 0.00     ",
-    "5 ops 10 resources 1% errors   | 5                    | 1                   | 10                      | 2                 | 0.01     ",
-    "5 ops 100 resources 1% errors  | 5                    | 1                   | 100                     | 2                 | 0.01     ",
-    "10 ops 100 resources 0% errors | 10                   | 1                   | 100                     | 2                 | 0.00     ",
-    "10 ops 100 resources 1% errors | 10                   | 1                   | 100                     | 2                 | 0.01     "
-  })
-  void footprintLessThan10MB(
-      int operationCardinality,
-      int servicePerOperation,
-      int resourceNamesPerService,
-      int typesPerOperation,
-      double errorRate)
-      throws Exception {
-    CountDownLatch latch = new CountDownLatch(1);
-    ValidatingSink sink = new ValidatingSink(latch);
-    DDAgentFeaturesDiscovery features =
-        mock(DDAgentFeaturesDiscovery.class, withSettings().stubOnly());
-    when(features.supportsMetrics()).thenReturn(true);
-    when(features.peerTags()).thenReturn(emptySet());
-    ClientStatsAggregator aggregator =
-        new ClientStatsAggregator(
-            new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language"),
-            emptySet(),
-            AdditionalTagsSchema.EMPTY,
-            features,
-            HealthMetrics.NO_OP,
-            sink,
-            1000,
-            1000,
-            100,
-            SECONDS,
-            false);
-    // Measuring the AggregateTable directly (rather than the whole ClientStatsAggregator) avoids
-    // both the 'features' mock (mocks are heavyweight, e.g. around 22MiB) and the aggregator's
-    // background Thread, whose ThreadGroup transitively references every other live thread in the
-    // JVM (test runner, JUnit engine, etc.), pulling in a huge, non-deterministic object graph.
-    long baseline = footprint(aggregator.aggregator().aggregates());
-    aggregator.start();
-    try {
-
-      // lots of traces are published
-      String[] operations = randomNames(operationCardinality);
-      Map<String, String[]> serviceNamesByOperation =
-          scopedRandomNames(operations, servicePerOperation);
-      Map<String, String[]> resourceNamesByService =
-          scopedRandomNames(serviceNamesByOperation.values(), resourceNamesPerService);
-      Map<String, String[]> typesByOperation = scopedRandomNames(operations, typesPerOperation);
-      int traceCount = 10_000;
-      int errorThreshold = (int) (errorRate * traceCount);
-      for (int i = 0; i < traceCount; ++i) {
-        String operation = operations[ThreadLocalRandom.current().nextInt(operations.length)];
-        String[] types = typesByOperation.get(operation);
-        String type = types[ThreadLocalRandom.current().nextInt(types.length)];
-        String[] serviceNames = serviceNamesByOperation.get(operation);
-        String serviceName = serviceNames[ThreadLocalRandom.current().nextInt(serviceNames.length)];
-        String[] resourceNames = resourceNamesByService.get(serviceName);
-        String resourceName =
-            resourceNames[ThreadLocalRandom.current().nextInt(resourceNames.length)];
-        boolean isError = ThreadLocalRandom.current().nextInt(traceCount) < errorThreshold;
-        aggregator.publish(
-            Collections.singletonList(
-                new SimpleSpan(
-                    serviceName,
-                    operation,
-                    resourceName,
-                    type,
-                    true,
-                    true,
-                    isError,
-                    System.nanoTime(),
-                    isError ? expDistributedNanoseconds(0.99) : expDistributedNanoseconds(0.01),
-                    200)));
-      }
-      if (!aggregator.report()) {
-        int attempts = 0;
-        while (++attempts < 10 && !aggregator.report()) {
-          Thread.sleep(10);
+    private static final Random RANDOM = new Random(0);
+
+    @BeforeAll
+    static void setupSpec() {
+        // Initialize metrics-lib histograms to register the DDSketch implementation
+        Histograms.register(DDSketchHistograms.FACTORY);
+    }
+
+    @TableTest({
+      "scenario                       | operationCardinality | servicePerOperation | resourceNamesPerService | typesPerOperation | errorRate",
+      "5 ops 10 resources 0% errors   | 5                    | 1                   | 10                      | 2                 | 0.00     ",
+      "5 ops 100 resources 0% errors  | 5                    | 1                   | 100                     | 2                 | 0.00     ",
+      "5 ops 10 resources 1% errors   | 5                    | 1                   | 10                      | 2                 | 0.01     ",
+      "5 ops 100 resources 1% errors  | 5                    | 1                   | 100                     | 2                 | 0.01     ",
+      "10 ops 100 resources 0% errors | 10                   | 1                   | 100                     | 2                 | 0.00     ",
+      "10 ops 100 resources 1% errors | 10                   | 1                   | 100                     | 2                 | 0.01     "
+    })
+    void footprintLessThan10MB(
+            int operationCardinality,
+            int servicePerOperation,
+            int resourceNamesPerService,
+            int typesPerOperation,
+            double errorRate)
+            throws Exception {
+        CountDownLatch latch = new CountDownLatch(1);
+        ValidatingSink sink = new ValidatingSink(latch);
+        DDAgentFeaturesDiscovery features =
+                mock(DDAgentFeaturesDiscovery.class, withSettings().stubOnly());
+        when(features.supportsMetrics()).thenReturn(true);
+        when(features.peerTags()).thenReturn(emptySet());
+        ClientStatsAggregator aggregator = new ClientStatsAggregator(
+                new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language"),
+                emptySet(),
+                AdditionalTagsSchema.EMPTY,
+                features,
+                HealthMetrics.NO_OP,
+                sink,
+                1000,
+                1000,
+                100,
+                SECONDS,
+                false);
+        // Measuring the AggregateTable directly (rather than the whole ClientStatsAggregator) avoids
+        // both the 'features' mock (mocks are heavyweight, e.g. around 22MiB) and the aggregator's
+        // background Thread, whose ThreadGroup transitively references every other live thread in the
+        // JVM (test runner, JUnit engine, etc.), pulling in a huge, non-deterministic object graph.
+        long baseline = footprint(aggregator.aggregator().aggregates());
+        aggregator.start();
+        try {
+
+            // lots of traces are published
+            String[] operations = randomNames(operationCardinality);
+            Map<String, String[]> serviceNamesByOperation = scopedRandomNames(operations, servicePerOperation);
+            Map<String, String[]> resourceNamesByService =
+                    scopedRandomNames(serviceNamesByOperation.values(), resourceNamesPerService);
+            Map<String, String[]> typesByOperation = scopedRandomNames(operations, typesPerOperation);
+            int traceCount = 10_000;
+            int errorThreshold = (int) (errorRate * traceCount);
+            for (int i = 0; i < traceCount; ++i) {
+                String operation = operations[ThreadLocalRandom.current().nextInt(operations.length)];
+                String[] types = typesByOperation.get(operation);
+                String type = types[ThreadLocalRandom.current().nextInt(types.length)];
+                String[] serviceNames = serviceNamesByOperation.get(operation);
+                String serviceName = serviceNames[ThreadLocalRandom.current().nextInt(serviceNames.length)];
+                String[] resourceNames = resourceNamesByService.get(serviceName);
+                String resourceName = resourceNames[ThreadLocalRandom.current().nextInt(resourceNames.length)];
+                boolean isError = ThreadLocalRandom.current().nextInt(traceCount) < errorThreshold;
+                aggregator.publish(Collections.singletonList(new SimpleSpan(
+                        serviceName,
+                        operation,
+                        resourceName,
+                        type,
+                        true,
+                        true,
+                        isError,
+                        System.nanoTime(),
+                        isError ? expDistributedNanoseconds(0.99) : expDistributedNanoseconds(0.01),
+                        200)));
+            }
+            if (!aggregator.report()) {
+                int attempts = 0;
+                while (++attempts < 10 && !aggregator.report()) {
+                    Thread.sleep(10);
+                }
+                assertTrue(attempts < 10, "aggregator failed to report within 10 attempts");
+            }
+            assertTrue(latch.await(30, SECONDS), "latch was not triggered within 30 seconds");
+            long after = footprint(aggregator.aggregator().aggregates());
+            assertTrue(after - baseline <= 10L * 1024 * 1024, "footprint growth exceeds 10MB");
+        } finally {
+            aggregator.close();
         }
-        assertTrue(attempts < 10, "aggregator failed to report within 10 attempts");
-      }
-      assertTrue(latch.await(30, SECONDS), "latch was not triggered within 30 seconds");
-      long after = footprint(aggregator.aggregator().aggregates());
-      assertTrue(after - baseline <= 10L * 1024 * 1024, "footprint growth exceeds 10MB");
-    } finally {
-      aggregator.close();
     }
-  }
 
-  private static String[] randomNames(int cardinality) {
-    String[] things = new String[cardinality];
-    for (int i = 0; i < things.length; ++i) {
-      things[i] = UUID.randomUUID().toString();
+    private static String[] randomNames(int cardinality) {
+        String[] things = new String[cardinality];
+        for (int i = 0; i < things.length; ++i) {
+            things[i] = UUID.randomUUID().toString();
+        }
+        return things;
     }
-    return things;
-  }
 
-  private static Map<String, String[]> scopedRandomNames(String[] parents, int childCardinality) {
-    Map<String, String[]> things = new HashMap<>();
-    for (String parent : parents) {
-      things.put(parent, randomNames(childCardinality));
+    private static Map<String, String[]> scopedRandomNames(String[] parents, int childCardinality) {
+        Map<String, String[]> things = new HashMap<>();
+        for (String parent : parents) {
+            things.put(parent, randomNames(childCardinality));
+        }
+        return things;
     }
-    return things;
-  }
-
-  private static Map<String, String[]> scopedRandomNames(
-      Collection<String[]> parents, int childCardinality) {
-    Map<String, String[]> things = new HashMap<>();
-    for (String[] parent : parents) {
-      for (String p : parent) {
-        things.put(p, randomNames(childCardinality));
-      }
+
+    private static Map<String, String[]> scopedRandomNames(Collection<String[]> parents, int childCardinality) {
+        Map<String, String[]> things = new HashMap<>();
+        for (String[] parent : parents) {
+            for (String p : parent) {
+                things.put(p, randomNames(childCardinality));
+            }
+        }
+        return things;
     }
-    return things;
-  }
 
-  private static long expDistributedNanoseconds(double intensity) {
-    return (long) (Math.log(RANDOM.nextDouble()) / Math.log(1 - intensity) + 1);
-  }
+    private static long expDistributedNanoseconds(double intensity) {
+        return (long) (Math.log(RANDOM.nextDouble()) / Math.log(1 - intensity) + 1);
+    }
 
-  private static long footprint(Object root) {
-    GraphLayout layout = GraphLayout.parseInstance(root);
-    System.out.println(layout.toFootprint());
-    return layout.totalSize();
-  }
+    private static long footprint(Object root) {
+        GraphLayout layout = GraphLayout.parseInstance(root);
+        System.out.println(layout.toFootprint());
+        return layout.totalSize();
+    }
 
-  private static class ValidatingSink implements Sink {
+    private static class ValidatingSink implements Sink {
 
-    final CountDownLatch latch;
+        final CountDownLatch latch;
 
-    ValidatingSink(CountDownLatch latch) {
-      this.latch = latch;
-    }
+        ValidatingSink(CountDownLatch latch) {
+            this.latch = latch;
+        }
 
-    @Override
-    public void register(EventListener listener) {}
+        @Override
+        public void register(EventListener listener) {}
 
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {
-      latch.countDown();
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {
+            latch.countDown();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/MetricsAggregatorFactoryTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/MetricsAggregatorFactoryTest.java
index e9d981df389..befb55879e0 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/MetricsAggregatorFactoryTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/MetricsAggregatorFactoryTest.java
@@ -28,62 +28,57 @@
  */
 class MetricsAggregatorFactoryTest {
 
-  private static SharedCommunicationObjects sharedCommunicationObjects() {
-    SharedCommunicationObjects sco = mock(SharedCommunicationObjects.class);
-    sco.agentUrl = HttpUrl.parse("http://localhost:8126");
-    when(sco.featuresDiscovery(any())).thenReturn(mock(DDAgentFeaturesDiscovery.class));
-    return sco;
-  }
+    private static SharedCommunicationObjects sharedCommunicationObjects() {
+        SharedCommunicationObjects sco = mock(SharedCommunicationObjects.class);
+        sco.agentUrl = HttpUrl.parse("http://localhost:8126");
+        when(sco.featuresDiscovery(any())).thenReturn(mock(DDAgentFeaturesDiscovery.class));
+        return sco;
+    }
 
-  private static Properties props(String... keyValues) {
-    Properties props = new Properties();
-    for (int i = 0; i < keyValues.length; i += 2) {
-      props.setProperty(keyValues[i], keyValues[i + 1]);
+    private static Properties props(String... keyValues) {
+        Properties props = new Properties();
+        for (int i = 0; i < keyValues.length; i += 2) {
+            props.setProperty(keyValues[i], keyValues[i + 1]);
+        }
+        return props;
     }
-    return props;
-  }
 
-  @Test
-  void whenAllMetricsDisabledNoOpAggregatorCreated() {
-    Config config = Config.get(props(TRACE_STATS_COMPUTATION_ENABLED, "false"));
+    @Test
+    void whenAllMetricsDisabledNoOpAggregatorCreated() {
+        Config config = Config.get(props(TRACE_STATS_COMPUTATION_ENABLED, "false"));
 
-    MetricsAggregator aggregator =
-        MetricsAggregatorFactory.createMetricsAggregator(
-            config, sharedCommunicationObjects(), HealthMetrics.NO_OP);
+        MetricsAggregator aggregator = MetricsAggregatorFactory.createMetricsAggregator(
+                config, sharedCommunicationObjects(), HealthMetrics.NO_OP);
 
-    assertInstanceOf(NoOpMetricsAggregator.class, aggregator);
-  }
+        assertInstanceOf(NoOpMetricsAggregator.class, aggregator);
+    }
 
-  @Test
-  void whenNativeTracerMetricsEnabledSerializingWriterSelected() {
-    // tracer metrics default to enabled; OTLP span metrics default off (no OTLP trace export).
-    Config config = Config.get(props());
+    @Test
+    void whenNativeTracerMetricsEnabledSerializingWriterSelected() {
+        // tracer metrics default to enabled; OTLP span metrics default off (no OTLP trace export).
+        Config config = Config.get(props());
 
-    MetricsAggregator aggregator =
-        MetricsAggregatorFactory.createMetricsAggregator(
-            config, sharedCommunicationObjects(), HealthMetrics.NO_OP);
+        MetricsAggregator aggregator = MetricsAggregatorFactory.createMetricsAggregator(
+                config, sharedCommunicationObjects(), HealthMetrics.NO_OP);
 
-    ClientStatsAggregator conflating = assertInstanceOf(ClientStatsAggregator.class, aggregator);
-    assertFalse(conflating.isOtlpStatsExportEnabled());
-    // native path uses a hardcoded 10s cadence, not trace.stats.interval.
-    assertEquals(10, conflating.reportingInterval());
-    assertEquals(SECONDS, conflating.reportingIntervalTimeUnit());
-  }
+        ClientStatsAggregator conflating = assertInstanceOf(ClientStatsAggregator.class, aggregator);
+        assertFalse(conflating.isOtlpStatsExportEnabled());
+        // native path uses a hardcoded 10s cadence, not trace.stats.interval.
+        assertEquals(10, conflating.reportingInterval());
+        assertEquals(SECONDS, conflating.reportingIntervalTimeUnit());
+    }
 
-  @Test
-  void whenOtlpTraceMetricsEnabledOtlpStatsMetricWriterSelected() {
-    Config config =
-        Config.get(
-            props(OTEL_TRACES_SPAN_METRICS_ENABLED, "true", OTLP_METRICS_PROTOCOL, "http/json"));
+    @Test
+    void whenOtlpTraceMetricsEnabledOtlpStatsMetricWriterSelected() {
+        Config config = Config.get(props(OTEL_TRACES_SPAN_METRICS_ENABLED, "true", OTLP_METRICS_PROTOCOL, "http/json"));
 
-    MetricsAggregator aggregator =
-        MetricsAggregatorFactory.createMetricsAggregator(
-            config, sharedCommunicationObjects(), HealthMetrics.NO_OP);
+        MetricsAggregator aggregator = MetricsAggregatorFactory.createMetricsAggregator(
+                config, sharedCommunicationObjects(), HealthMetrics.NO_OP);
 
-    ClientStatsAggregator conflating = assertInstanceOf(ClientStatsAggregator.class, aggregator);
-    assertTrue(conflating.isOtlpStatsExportEnabled());
-    // OTLP path sources the cadence from trace.stats.interval (ms), default 10s.
-    assertEquals(config.getTraceStatsInterval(), conflating.reportingInterval());
-    assertEquals(MILLISECONDS, conflating.reportingIntervalTimeUnit());
-  }
+        ClientStatsAggregator conflating = assertInstanceOf(ClientStatsAggregator.class, aggregator);
+        assertTrue(conflating.isOtlpStatsExportEnabled());
+        // OTLP path sources the cadence from trace.stats.interval (ms), default 10s.
+        assertEquals(config.getTraceStatsInterval(), conflating.reportingInterval());
+        assertEquals(MILLISECONDS, conflating.reportingIntervalTimeUnit());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/MetricsReliabilityTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/MetricsReliabilityTest.java
index cb204fdb426..7e3e58cbbe9 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/MetricsReliabilityTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/MetricsReliabilityTest.java
@@ -21,211 +21,189 @@
 
 class MetricsReliabilityTest extends DDCoreJavaSpecification {
 
-  @Test
-  void metricsShouldReliablyHandleMomentaryDowngrades() throws Exception {
-    State state = new State();
-    state.reset(true);
-    JavaTestHttpServer agent = newAgent(state);
-    Properties props = new Properties();
-    props.put("trace.agent.url", agent.getAddress().toString());
-    props.put("trace.stats.computation.enabled", "true");
-    Config config = Config.get(props);
-    SharedCommunicationObjects sharedComm = new SharedCommunicationObjects();
-    sharedComm.createRemaining(config);
-    DDAgentFeaturesDiscovery featuresDiscovery = sharedComm.featuresDiscovery(config);
-    TracerHealthMetrics healthMetrics = new TracerHealthMetrics(StatsDClient.NO_OP);
-    CoreTracer tracer =
-        tracerBuilder()
-            .sharedCommunicationObjects(sharedComm)
-            .healthMetrics(healthMetrics)
-            .config(config)
-            .build();
-
-    try {
-      // metrics enabled and discovery is performed
-      featuresDiscovery.discover();
-
-      // should support metrics
-      assertTrue(state.latch.await(10, SECONDS));
-      assertTrue(featuresDiscovery.supportsMetrics());
-
-      // a span is published
-      tracer.startSpan("test", "test").finish();
-      tracer.flush();
-      tracer.flushMetrics();
-
-      // should have sent statistics and informed the agent that we calculate the stats
-      assertTrue(state.receivedClientComputedHeader);
-      assertTrue(state.receivedStats);
-      // 1 trace processed. 1 p0 drop No errors
-      assertMetrics(healthMetrics, 1, 1, 1, 0, 0);
-
-      // simulate an agent downgrade
-      state.reset(false, 404);
-      tracer.startSpan("test", "test").finish();
-      tracer.flush();
-      tracer.flushMetrics();
-
-      // a discovery should have done - we do not support anymore stats calculation
-      assertTrue(state.latch.await(10, SECONDS));
-      assertFalse(featuresDiscovery.supportsMetrics());
-      // 2 traces processed. 2 p0 dropped. 2 requests and 1 downgrade no errors
-      assertMetrics(healthMetrics, 2, 2, 2, 0, 1);
-
-      // a span is published (we have a call to stats for the downgrade so reset the counter)
-      state.reset(false);
-      tracer.startSpan("test", "test").finish();
-      tracer.flush();
-      tracer.flushMetrics();
-
-      // then: should have not sent statistics and informed the agent that we don't calculate the
-      // stats anymore
-      assertFalse(state.receivedClientComputedHeader);
-      assertFalse(state.receivedStats);
-      // 2 traces processed. 1 p0 dropped. 2 requests and 1 downgrade no errors
-      assertMetrics(healthMetrics, 2, 2, 2, 0, 1);
-
-      // we detect that the agent can calculate the stats again
-      state.reset(true);
-      featuresDiscovery.discover();
-
-      // we should understand it
-      assertTrue(state.latch.await(10, SECONDS));
-      assertTrue(featuresDiscovery.supportsMetrics());
-
-      // a span is published
-      tracer.startSpan("test", "test").finish();
-      tracer.flush();
-      tracer.flushMetrics();
-
-      // we should have sent the stats and informed the agent to not calculate the stats on
-      // the trace payload
-      assertTrue(state.receivedClientComputedHeader);
-      assertTrue(state.receivedStats);
-      // 3 traces processed. 2 p0 dropped. 3 requests and 1 downgrade no errors
-      assertMetrics(healthMetrics, 3, 3, 3, 0, 1);
-
-      // an error occurred on the agent stats endpoint
-      state.reset(true, 500);
-      tracer.startSpan("test", "test").finish();
-      tracer.flush();
-      tracer.flushMetrics();
-
-      // the error counter is incremented
-      assertTrue(state.receivedClientComputedHeader);
-      assertTrue(state.receivedStats);
-      // 4 traces processed. 3 p0 dropped. 4 requests and 1 downgrade - 1 error
-      assertMetrics(healthMetrics, 4, 4, 4, 1, 1);
-
-      // the next call succeed
-      state.reset(true);
-      tracer.startSpan("test", "test").setError(true).finish();
-      tracer.flush();
-      tracer.flushMetrics();
-
-      // the request counter is incremented
-      assertTrue(state.receivedClientComputedHeader);
-      assertTrue(state.receivedStats);
-      // 5 traces processed. 3 p0 dropped (this one is errored so it's not dropped).
-      // 5 requests and 1 downgrade - 1 error
-      assertMetrics(healthMetrics, 5, 4, 5, 1, 1);
-
-    } finally {
-      tracer.close();
-      agent.stop();
+    @Test
+    void metricsShouldReliablyHandleMomentaryDowngrades() throws Exception {
+        State state = new State();
+        state.reset(true);
+        JavaTestHttpServer agent = newAgent(state);
+        Properties props = new Properties();
+        props.put("trace.agent.url", agent.getAddress().toString());
+        props.put("trace.stats.computation.enabled", "true");
+        Config config = Config.get(props);
+        SharedCommunicationObjects sharedComm = new SharedCommunicationObjects();
+        sharedComm.createRemaining(config);
+        DDAgentFeaturesDiscovery featuresDiscovery = sharedComm.featuresDiscovery(config);
+        TracerHealthMetrics healthMetrics = new TracerHealthMetrics(StatsDClient.NO_OP);
+        CoreTracer tracer = tracerBuilder()
+                .sharedCommunicationObjects(sharedComm)
+                .healthMetrics(healthMetrics)
+                .config(config)
+                .build();
+
+        try {
+            // metrics enabled and discovery is performed
+            featuresDiscovery.discover();
+
+            // should support metrics
+            assertTrue(state.latch.await(10, SECONDS));
+            assertTrue(featuresDiscovery.supportsMetrics());
+
+            // a span is published
+            tracer.startSpan("test", "test").finish();
+            tracer.flush();
+            tracer.flushMetrics();
+
+            // should have sent statistics and informed the agent that we calculate the stats
+            assertTrue(state.receivedClientComputedHeader);
+            assertTrue(state.receivedStats);
+            // 1 trace processed. 1 p0 drop No errors
+            assertMetrics(healthMetrics, 1, 1, 1, 0, 0);
+
+            // simulate an agent downgrade
+            state.reset(false, 404);
+            tracer.startSpan("test", "test").finish();
+            tracer.flush();
+            tracer.flushMetrics();
+
+            // a discovery should have done - we do not support anymore stats calculation
+            assertTrue(state.latch.await(10, SECONDS));
+            assertFalse(featuresDiscovery.supportsMetrics());
+            // 2 traces processed. 2 p0 dropped. 2 requests and 1 downgrade no errors
+            assertMetrics(healthMetrics, 2, 2, 2, 0, 1);
+
+            // a span is published (we have a call to stats for the downgrade so reset the counter)
+            state.reset(false);
+            tracer.startSpan("test", "test").finish();
+            tracer.flush();
+            tracer.flushMetrics();
+
+            // then: should have not sent statistics and informed the agent that we don't calculate the
+            // stats anymore
+            assertFalse(state.receivedClientComputedHeader);
+            assertFalse(state.receivedStats);
+            // 2 traces processed. 1 p0 dropped. 2 requests and 1 downgrade no errors
+            assertMetrics(healthMetrics, 2, 2, 2, 0, 1);
+
+            // we detect that the agent can calculate the stats again
+            state.reset(true);
+            featuresDiscovery.discover();
+
+            // we should understand it
+            assertTrue(state.latch.await(10, SECONDS));
+            assertTrue(featuresDiscovery.supportsMetrics());
+
+            // a span is published
+            tracer.startSpan("test", "test").finish();
+            tracer.flush();
+            tracer.flushMetrics();
+
+            // we should have sent the stats and informed the agent to not calculate the stats on
+            // the trace payload
+            assertTrue(state.receivedClientComputedHeader);
+            assertTrue(state.receivedStats);
+            // 3 traces processed. 2 p0 dropped. 3 requests and 1 downgrade no errors
+            assertMetrics(healthMetrics, 3, 3, 3, 0, 1);
+
+            // an error occurred on the agent stats endpoint
+            state.reset(true, 500);
+            tracer.startSpan("test", "test").finish();
+            tracer.flush();
+            tracer.flushMetrics();
+
+            // the error counter is incremented
+            assertTrue(state.receivedClientComputedHeader);
+            assertTrue(state.receivedStats);
+            // 4 traces processed. 3 p0 dropped. 4 requests and 1 downgrade - 1 error
+            assertMetrics(healthMetrics, 4, 4, 4, 1, 1);
+
+            // the next call succeed
+            state.reset(true);
+            tracer.startSpan("test", "test").setError(true).finish();
+            tracer.flush();
+            tracer.flushMetrics();
+
+            // the request counter is incremented
+            assertTrue(state.receivedClientComputedHeader);
+            assertTrue(state.receivedStats);
+            // 5 traces processed. 3 p0 dropped (this one is errored so it's not dropped).
+            // 5 requests and 1 downgrade - 1 error
+            assertMetrics(healthMetrics, 5, 4, 5, 1, 1);
+
+        } finally {
+            tracer.close();
+            agent.stop();
+        }
     }
-  }
-
-  private static JavaTestHttpServer newAgent(State state) {
-    return JavaTestHttpServer.httpServer(
-        server ->
-            server.handlers(
-                h -> {
-                  h.get(
-                      "/info",
-                      api -> {
-                        String res =
-                            "{\"version\":\"7.65.0\",\"endpoints\":["
-                                + (state.agentMetricsAvailable ? "\"/v0.6/stats\", " : "")
-                                + "\"/v0.4/traces\"], \"client_drop_p0s\" : true}";
-                        try {
-                          state.hash = Strings.sha256(res);
-                        } catch (NoSuchAlgorithmException e) {
-                          throw new RuntimeException(e);
-                        }
-                        api.getResponse().status(200).send(res);
-                        state.latch.countDown();
-                      });
-                  h.post(
-                      "/v0.6/stats",
-                      api -> {
-                        state.receivedStats = true;
-                        api.getResponse().status(state.statsResponseCode).send();
-                      });
-                  h.put(
-                      "/v0.4/traces",
-                      api -> {
-                        state.receivedClientComputedHeader =
-                            "true"
-                                .equals(
-                                    api.getRequest().getHeader("Datadog-Client-Computed-Stats"));
-                        api.getResponse()
-                            .status(200)
-                            .addHeader("Datadog-Agent-State", state.hash)
-                            .send();
-                      });
-                }));
-  }
-
-  private static void assertMetrics(
-      HealthMetrics healthMetrics,
-      int traces,
-      int drops,
-      int requests,
-      int errors,
-      int downgrades) {
-    String summary = healthMetrics.summary();
-    assertTrue(
-        summary.contains("clientStatsRequests=" + requests),
-        "clientStatsRequests mismatch in: " + summary);
-    assertTrue(
-        summary.contains("clientStatsErrors=" + errors),
-        "clientStatsErrors mismatch in: " + summary);
-    assertTrue(
-        summary.contains("clientStatsDowngrades=" + downgrades),
-        "clientStatsDowngrades mismatch in: " + summary);
-    assertTrue(
-        summary.contains("clientStatsP0DroppedSpans=" + drops),
-        "clientStatsP0DroppedSpans mismatch in: " + summary);
-    assertTrue(
-        summary.contains("clientStatsP0DroppedTraces=" + drops),
-        "clientStatsP0DroppedTraces mismatch in: " + summary);
-    assertTrue(
-        summary.contains("clientStatsProcessedSpans=" + traces),
-        "clientStatsProcessedSpans mismatch in: " + summary);
-    assertTrue(
-        summary.contains("clientStatsProcessedTraces=" + traces),
-        "clientStatsProcessedTraces mismatch in: " + summary);
-  }
-
-  private static class State {
-    volatile boolean agentMetricsAvailable = true;
-    volatile int statsResponseCode = 200;
-    volatile boolean receivedStats;
-    volatile boolean receivedClientComputedHeader;
-    volatile CountDownLatch latch;
-    volatile String hash;
-
-    void reset(boolean agentMetricsAvailable) {
-      reset(agentMetricsAvailable, 200);
+
+    private static JavaTestHttpServer newAgent(State state) {
+        return JavaTestHttpServer.httpServer(server -> server.handlers(h -> {
+            h.get("/info", api -> {
+                String res = "{\"version\":\"7.65.0\",\"endpoints\":["
+                        + (state.agentMetricsAvailable ? "\"/v0.6/stats\", " : "")
+                        + "\"/v0.4/traces\"], \"client_drop_p0s\" : true}";
+                try {
+                    state.hash = Strings.sha256(res);
+                } catch (NoSuchAlgorithmException e) {
+                    throw new RuntimeException(e);
+                }
+                api.getResponse().status(200).send(res);
+                state.latch.countDown();
+            });
+            h.post("/v0.6/stats", api -> {
+                state.receivedStats = true;
+                api.getResponse().status(state.statsResponseCode).send();
+            });
+            h.put("/v0.4/traces", api -> {
+                state.receivedClientComputedHeader =
+                        "true".equals(api.getRequest().getHeader("Datadog-Client-Computed-Stats"));
+                api.getResponse()
+                        .status(200)
+                        .addHeader("Datadog-Agent-State", state.hash)
+                        .send();
+            });
+        }));
+    }
+
+    private static void assertMetrics(
+            HealthMetrics healthMetrics, int traces, int drops, int requests, int errors, int downgrades) {
+        String summary = healthMetrics.summary();
+        assertTrue(summary.contains("clientStatsRequests=" + requests), "clientStatsRequests mismatch in: " + summary);
+        assertTrue(summary.contains("clientStatsErrors=" + errors), "clientStatsErrors mismatch in: " + summary);
+        assertTrue(
+                summary.contains("clientStatsDowngrades=" + downgrades),
+                "clientStatsDowngrades mismatch in: " + summary);
+        assertTrue(
+                summary.contains("clientStatsP0DroppedSpans=" + drops),
+                "clientStatsP0DroppedSpans mismatch in: " + summary);
+        assertTrue(
+                summary.contains("clientStatsP0DroppedTraces=" + drops),
+                "clientStatsP0DroppedTraces mismatch in: " + summary);
+        assertTrue(
+                summary.contains("clientStatsProcessedSpans=" + traces),
+                "clientStatsProcessedSpans mismatch in: " + summary);
+        assertTrue(
+                summary.contains("clientStatsProcessedTraces=" + traces),
+                "clientStatsProcessedTraces mismatch in: " + summary);
     }
 
-    void reset(boolean agentMetricsAvailable, int statsResponseCode) {
-      this.agentMetricsAvailable = agentMetricsAvailable;
-      this.statsResponseCode = statsResponseCode;
-      receivedStats = false;
-      receivedClientComputedHeader = false;
-      latch = new CountDownLatch(1);
+    private static class State {
+        volatile boolean agentMetricsAvailable = true;
+        volatile int statsResponseCode = 200;
+        volatile boolean receivedStats;
+        volatile boolean receivedClientComputedHeader;
+        volatile CountDownLatch latch;
+        volatile String hash;
+
+        void reset(boolean agentMetricsAvailable) {
+            reset(agentMetricsAvailable, 200);
+        }
+
+        void reset(boolean agentMetricsAvailable, int statsResponseCode) {
+            this.agentMetricsAvailable = agentMetricsAvailable;
+            this.statsResponseCode = statsResponseCode;
+            receivedStats = false;
+            receivedClientComputedHeader = false;
+            latch = new CountDownLatch(1);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/OkHttpSinkTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/OkHttpSinkTest.java
index c864baeaf8c..8f9a68a81ef 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/OkHttpSinkTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/OkHttpSinkTest.java
@@ -34,128 +34,123 @@
 
 class OkHttpSinkTest {
 
-  @TableTest({
-    "scenario           | eventType   | responseCode",
-    "404 -> DOWNGRADED  | DOWNGRADED  | 404         ",
-    "500 -> ERROR       | ERROR       | 500         ",
-    "0 throws -> ERROR  | ERROR       | 0           ",
-    "400 -> BAD_PAYLOAD | BAD_PAYLOAD | 400         ",
-    "200 -> OK          | OK          | 200         ",
-    "201 -> OK          | OK          | 201         "
-  })
-  void httpStatusCodeResponseCodeYieldsEventType(
-      EventListener.EventType eventType, int responseCode) {
-    String agentUrl = "http://localhost:8126";
-    EventListener listener = mock(EventListener.class);
-    OkHttpClient client = mock(OkHttpClient.class);
-    OkHttpSink sink =
-        new OkHttpSink(client, agentUrl, V06_METRICS_ENDPOINT, true, false, Collections.emptyMap());
-    sink.register(listener);
-
-    doAnswer(invocation -> respond(invocation.getArgument(0), responseCode))
-        .when(client)
-        .newCall(any());
-    sink.accept(0, ByteBuffer.allocate(0));
-
-    verify(client, times(1)).newCall(any());
-    verify(listener).onEvent(eq(eventType), any());
-  }
-
-  @Test
-  void degradeToAsyncModeWhenAgentSlowToRespond() throws Exception {
-    // metrics payloads are relatively large and we don't want to copy them,
-    // and we typically expect the agent to respond well within the aggregation
-    // window, so will send synchronously whenever possible to avoid allocating
-    // a copy of the payload. When the agent is slow to respond, we degrade to
-    // an asynchronous mode where up to 100 seconds of requests are copied and
-    // enqueued for sending in the background, because we don't want to lose
-    // them if it's possible not to.
-
-    String agentUrl = "http://localhost:8126";
-    CountDownLatch latch = new CountDownLatch(2);
-    BlockingListener listener = new BlockingListener(latch);
-    OkHttpClient client = mock(OkHttpClient.class);
-    OkHttpSink sink =
-        new OkHttpSink(client, agentUrl, V06_METRICS_ENDPOINT, true, false, Collections.emptyMap());
-    sink.register(listener);
-    // Single doAnswer handles all three calls using an atomic counter
-    AtomicInteger callCount = new AtomicInteger(0);
-    doAnswer(
-            invocation -> {
-              int callNumber = callCount.incrementAndGet();
-              Request request = invocation.getArgument(0);
-              if (callNumber == 1) {
-                // First call: simulate slow agent
-                Thread.sleep(1001);
-              } else if (callNumber == 2) {
-                // Second call: should be in degraded mode
-                assertTrue(sink.isInDegradedMode());
-              }
-              return respond(request, 200);
-            })
-        .when(client)
-        .newCall(any());
-
-    // one slow response followed by a request
-    sink.accept(1, ByteBuffer.allocate(0));
-    sink.accept(1, ByteBuffer.allocate(0));
-    latch.await(10, SECONDS);
-
-    // the second request degrades to async mode
-    verify(client, times(2)).newCall(any());
-    assertEquals(2, listener.events.size());
-    for (EventListener.EventType eventType : listener.events) {
-      assertEquals(OK, eventType);
+    @TableTest({
+      "scenario           | eventType   | responseCode",
+      "404 -> DOWNGRADED  | DOWNGRADED  | 404         ",
+      "500 -> ERROR       | ERROR       | 500         ",
+      "0 throws -> ERROR  | ERROR       | 0           ",
+      "400 -> BAD_PAYLOAD | BAD_PAYLOAD | 400         ",
+      "200 -> OK          | OK          | 200         ",
+      "201 -> OK          | OK          | 201         "
+    })
+    void httpStatusCodeResponseCodeYieldsEventType(EventListener.EventType eventType, int responseCode) {
+        String agentUrl = "http://localhost:8126";
+        EventListener listener = mock(EventListener.class);
+        OkHttpClient client = mock(OkHttpClient.class);
+        OkHttpSink sink = new OkHttpSink(client, agentUrl, V06_METRICS_ENDPOINT, true, false, Collections.emptyMap());
+        sink.register(listener);
+
+        doAnswer(invocation -> respond(invocation.getArgument(0), responseCode))
+                .when(client)
+                .newCall(any());
+        sink.accept(0, ByteBuffer.allocate(0));
+
+        verify(client, times(1)).newCall(any());
+        verify(listener).onEvent(eq(eventType), any());
     }
-    long asyncRequests = sink.asyncRequestCount();
-    assertEquals(1, asyncRequests);
-    assertTrue(sink.isInDegradedMode());
-
-    // the agent has recovered and has responded quickly once
-    sink.accept(1, ByteBuffer.allocate(0));
-
-    // the request was sent synchronously
-    verify(client, times(3)).newCall(any());
-    assertEquals(asyncRequests, sink.asyncRequestCount());
-    assertFalse(sink.isInDegradedMode());
-  }
-
-  private static Call respond(Request request, int code) throws IOException {
-    if (code == 0) {
-      return error();
+
+    @Test
+    void degradeToAsyncModeWhenAgentSlowToRespond() throws Exception {
+        // metrics payloads are relatively large and we don't want to copy them,
+        // and we typically expect the agent to respond well within the aggregation
+        // window, so will send synchronously whenever possible to avoid allocating
+        // a copy of the payload. When the agent is slow to respond, we degrade to
+        // an asynchronous mode where up to 100 seconds of requests are copied and
+        // enqueued for sending in the background, because we don't want to lose
+        // them if it's possible not to.
+
+        String agentUrl = "http://localhost:8126";
+        CountDownLatch latch = new CountDownLatch(2);
+        BlockingListener listener = new BlockingListener(latch);
+        OkHttpClient client = mock(OkHttpClient.class);
+        OkHttpSink sink = new OkHttpSink(client, agentUrl, V06_METRICS_ENDPOINT, true, false, Collections.emptyMap());
+        sink.register(listener);
+        // Single doAnswer handles all three calls using an atomic counter
+        AtomicInteger callCount = new AtomicInteger(0);
+        doAnswer(invocation -> {
+                    int callNumber = callCount.incrementAndGet();
+                    Request request = invocation.getArgument(0);
+                    if (callNumber == 1) {
+                        // First call: simulate slow agent
+                        Thread.sleep(1001);
+                    } else if (callNumber == 2) {
+                        // Second call: should be in degraded mode
+                        assertTrue(sink.isInDegradedMode());
+                    }
+                    return respond(request, 200);
+                })
+                .when(client)
+                .newCall(any());
+
+        // one slow response followed by a request
+        sink.accept(1, ByteBuffer.allocate(0));
+        sink.accept(1, ByteBuffer.allocate(0));
+        latch.await(10, SECONDS);
+
+        // the second request degrades to async mode
+        verify(client, times(2)).newCall(any());
+        assertEquals(2, listener.events.size());
+        for (EventListener.EventType eventType : listener.events) {
+            assertEquals(OK, eventType);
+        }
+        long asyncRequests = sink.asyncRequestCount();
+        assertEquals(1, asyncRequests);
+        assertTrue(sink.isInDegradedMode());
+
+        // the agent has recovered and has responded quickly once
+        sink.accept(1, ByteBuffer.allocate(0));
+
+        // the request was sent synchronously
+        verify(client, times(3)).newCall(any());
+        assertEquals(asyncRequests, sink.asyncRequestCount());
+        assertFalse(sink.isInDegradedMode());
+    }
+
+    private static Call respond(Request request, int code) throws IOException {
+        if (code == 0) {
+            return error();
+        }
+        Response response = new Response.Builder()
+                .code(code)
+                .request(request)
+                .protocol(Protocol.HTTP_1_1)
+                .message("message")
+                .body(ResponseBody.create(MediaType.get("text/plain"), "message"))
+                .build();
+        Call call = mock(Call.class);
+        doReturn(response).when(call).execute();
+        return call;
     }
-    Response response =
-        new Response.Builder()
-            .code(code)
-            .request(request)
-            .protocol(Protocol.HTTP_1_1)
-            .message("message")
-            .body(ResponseBody.create(MediaType.get("text/plain"), "message"))
-            .build();
-    Call call = mock(Call.class);
-    doReturn(response).when(call).execute();
-    return call;
-  }
-
-  private static Call error() throws IOException {
-    Call call = mock(Call.class);
-    doThrow(new IOException("thrown by test")).when(call).execute();
-    return call;
-  }
-
-  private static class BlockingListener implements EventListener {
-
-    private final CountDownLatch latch;
-    final List<EventType> events = new CopyOnWriteArrayList<>();
-
-    BlockingListener(CountDownLatch latch) {
-      this.latch = latch;
+
+    private static Call error() throws IOException {
+        Call call = mock(Call.class);
+        doThrow(new IOException("thrown by test")).when(call).execute();
+        return call;
     }
 
-    @Override
-    public void onEvent(EventType eventType, String message) {
-      events.add(eventType);
-      latch.countDown();
+    private static class BlockingListener implements EventListener {
+
+        private final CountDownLatch latch;
+        final List<EventType> events = new CopyOnWriteArrayList<>();
+
+        BlockingListener(CountDownLatch latch) {
+            this.latch = latch;
+        }
+
+        @Override
+        public void onEvent(EventType eventType, String message) {
+            events.add(eventType);
+            latch.countDown();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/PeerTagSchemaTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/PeerTagSchemaTest.java
index 3270917068f..e4b02e9acb8 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/PeerTagSchemaTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/PeerTagSchemaTest.java
@@ -17,138 +17,131 @@
 
 class PeerTagSchemaTest {
 
-  @Test
-  void ofBuildsSchemaFromSetWithState() {
-    Set<String> tags = new LinkedHashSet<>(Arrays.asList("peer.hostname", "peer.service"));
-    PeerTagSchema schema = PeerTagSchema.of(tags, "state-1234");
-
-    assertArrayEquals(new String[] {"peer.hostname", "peer.service"}, schema.names);
-    assertEquals("state-1234", schema.state);
-    assertEquals(2, schema.size());
-  }
-
-  @Test
-  void ofHandlesEmptySet() {
-    PeerTagSchema schema = PeerTagSchema.of(Collections.<String>emptySet(), null);
-
-    assertEquals(0, schema.size());
-    assertEquals(0, schema.names.length);
-  }
-
-  @Test
-  void internalSingletonCarriesBaseService() {
-    assertEquals(1, PeerTagSchema.INTERNAL.size());
-    assertEquals("_dd.base_service", PeerTagSchema.INTERNAL.names[0]);
-  }
-
-  @Test
-  void hasSameTagsAsReturnsTrueForExactMatch() {
-    PeerTagSchema schema =
-        PeerTagSchema.of(
-            new LinkedHashSet<>(Arrays.asList("peer.hostname", "peer.service")), "state-1");
-
-    // Same content via a different Set reference -- this is the case the reconcile fast-path
-    // depends on (Set returned from a fresh discovery cycle is content-equal to the prior one).
-    Set<String> equivalentSet = new HashSet<>(Arrays.asList("peer.service", "peer.hostname"));
-    assertTrue(schema.hasSameTagsAs(equivalentSet));
-  }
-
-  @Test
-  void hasSameTagsAsReturnsFalseWhenSetGrew() {
-    PeerTagSchema schema =
-        PeerTagSchema.of(Collections.<String>singleton("peer.hostname"), "state-1");
-
-    Set<String> larger = new HashSet<>(Arrays.asList("peer.hostname", "peer.service"));
-    assertFalse(schema.hasSameTagsAs(larger));
-  }
-
-  @Test
-  void hasSameTagsAsReturnsFalseWhenSetShrank() {
-    PeerTagSchema schema =
-        PeerTagSchema.of(
-            new LinkedHashSet<>(Arrays.asList("peer.hostname", "peer.service")), "state-1");
-
-    assertFalse(schema.hasSameTagsAs(Collections.<String>singleton("peer.hostname")));
-  }
-
-  @Test
-  void hasSameTagsAsReturnsFalseWhenContentDifferent() {
-    PeerTagSchema schema =
-        PeerTagSchema.of(Collections.<String>singleton("peer.hostname"), "state-1");
-
-    assertFalse(schema.hasSameTagsAs(Collections.<String>singleton("peer.service")));
-  }
-
-  @Test
-  void hasSameTagsAsHandlesEmpty() {
-    PeerTagSchema empty = PeerTagSchema.of(Collections.<String>emptySet(), "state-1");
-
-    assertTrue(empty.hasSameTagsAs(Collections.<String>emptySet()));
-    assertFalse(empty.hasSameTagsAs(Collections.<String>singleton("peer.hostname")));
-  }
-
-  @Test
-  void resetHandlersReportsBlockedCountToHealthMetrics() {
-    // Build a schema then replace its handler with a sentinel-mode instance at a low limit.
-    // (Production schemas use AggregateEntry.LIMITS_ENABLED which is currently false; this test
-    // exercises the reportingpath directly so it stays valid before and after the flag flips.)
-    PeerTagSchema schema =
-        new PeerTagSchema(new String[] {"peer.hostname"}, PeerTagSchema.NO_STATE);
-    schema.handlers[0] = new TagCardinalityHandler("peer.hostname", 1, true);
-
-    schema.register(0, "host-a"); // within limit
-    schema.register(0, "host-b"); // blocked
-    schema.register(0, "host-c"); // blocked
-
-    long[] recorded = {0};
-    HealthMetrics hm =
-        new HealthMetrics() {
-          @Override
-          public void onTagCardinalityBlocked(String[] tag, long count) {
-            recorded[0] += count;
-          }
+    @Test
+    void ofBuildsSchemaFromSetWithState() {
+        Set<String> tags = new LinkedHashSet<>(Arrays.asList("peer.hostname", "peer.service"));
+        PeerTagSchema schema = PeerTagSchema.of(tags, "state-1234");
+
+        assertArrayEquals(new String[] {"peer.hostname", "peer.service"}, schema.names);
+        assertEquals("state-1234", schema.state);
+        assertEquals(2, schema.size());
+    }
+
+    @Test
+    void ofHandlesEmptySet() {
+        PeerTagSchema schema = PeerTagSchema.of(Collections.<String>emptySet(), null);
+
+        assertEquals(0, schema.size());
+        assertEquals(0, schema.names.length);
+    }
+
+    @Test
+    void internalSingletonCarriesBaseService() {
+        assertEquals(1, PeerTagSchema.INTERNAL.size());
+        assertEquals("_dd.base_service", PeerTagSchema.INTERNAL.names[0]);
+    }
+
+    @Test
+    void hasSameTagsAsReturnsTrueForExactMatch() {
+        PeerTagSchema schema =
+                PeerTagSchema.of(new LinkedHashSet<>(Arrays.asList("peer.hostname", "peer.service")), "state-1");
+
+        // Same content via a different Set reference -- this is the case the reconcile fast-path
+        // depends on (Set returned from a fresh discovery cycle is content-equal to the prior one).
+        Set<String> equivalentSet = new HashSet<>(Arrays.asList("peer.service", "peer.hostname"));
+        assertTrue(schema.hasSameTagsAs(equivalentSet));
+    }
+
+    @Test
+    void hasSameTagsAsReturnsFalseWhenSetGrew() {
+        PeerTagSchema schema = PeerTagSchema.of(Collections.<String>singleton("peer.hostname"), "state-1");
+
+        Set<String> larger = new HashSet<>(Arrays.asList("peer.hostname", "peer.service"));
+        assertFalse(schema.hasSameTagsAs(larger));
+    }
+
+    @Test
+    void hasSameTagsAsReturnsFalseWhenSetShrank() {
+        PeerTagSchema schema =
+                PeerTagSchema.of(new LinkedHashSet<>(Arrays.asList("peer.hostname", "peer.service")), "state-1");
+
+        assertFalse(schema.hasSameTagsAs(Collections.<String>singleton("peer.hostname")));
+    }
+
+    @Test
+    void hasSameTagsAsReturnsFalseWhenContentDifferent() {
+        PeerTagSchema schema = PeerTagSchema.of(Collections.<String>singleton("peer.hostname"), "state-1");
+
+        assertFalse(schema.hasSameTagsAs(Collections.<String>singleton("peer.service")));
+    }
+
+    @Test
+    void hasSameTagsAsHandlesEmpty() {
+        PeerTagSchema empty = PeerTagSchema.of(Collections.<String>emptySet(), "state-1");
+
+        assertTrue(empty.hasSameTagsAs(Collections.<String>emptySet()));
+        assertFalse(empty.hasSameTagsAs(Collections.<String>singleton("peer.hostname")));
+    }
+
+    @Test
+    void resetHandlersReportsBlockedCountToHealthMetrics() {
+        // Build a schema then replace its handler with a sentinel-mode instance at a low limit.
+        // (Production schemas use AggregateEntry.LIMITS_ENABLED which is currently false; this test
+        // exercises the reportingpath directly so it stays valid before and after the flag flips.)
+        PeerTagSchema schema = new PeerTagSchema(new String[] {"peer.hostname"}, PeerTagSchema.NO_STATE);
+        schema.handlers[0] = new TagCardinalityHandler("peer.hostname", 1, true);
+
+        schema.register(0, "host-a"); // within limit
+        schema.register(0, "host-b"); // blocked
+        schema.register(0, "host-c"); // blocked
+
+        long[] recorded = {0};
+        HealthMetrics hm = new HealthMetrics() {
+            @Override
+            public void onTagCardinalityBlocked(String[] tag, long count) {
+                recorded[0] += count;
+            }
         };
 
-    schema.resetHandlers(hm, new CardinalityLimitReporter());
-    assertEquals(2, recorded[0]);
-
-    // After the reset, no new values were registered so the next reset reports nothing.
-    recorded[0] = 0;
-    schema.resetHandlers(hm, new CardinalityLimitReporter());
-    assertEquals(0, recorded[0]);
-  }
-
-  @Test
-  void resetHandlersAggregatesAllPeerTagsUnderSinglePeerTagsField() {
-    // The Cardinality Limits RFC reports peer-tag collapses under the protobuf field name peer_tags
-    // aggregated across every configured peer tag, not per individual tag name.
-    PeerTagSchema schema =
-        new PeerTagSchema(new String[] {"peer.hostname", "peer.service"}, PeerTagSchema.NO_STATE);
-    schema.handlers[0] = new TagCardinalityHandler("peer.hostname", 1, true);
-    schema.handlers[1] = new TagCardinalityHandler("peer.service", 1, true);
-
-    schema.register(0, "host-a"); // within limit
-    schema.register(0, "host-b"); // blocked
-    schema.register(1, "svc-a"); // within limit
-    schema.register(1, "svc-b"); // blocked
-    schema.register(1, "svc-c"); // blocked
-
-    List<String[]> tags = new ArrayList<>();
-    long[] total = {0};
-    HealthMetrics hm =
-        new HealthMetrics() {
-          @Override
-          public void onTagCardinalityBlocked(String[] tag, long count) {
-            tags.add(tag);
-            total[0] += count;
-          }
+        schema.resetHandlers(hm, new CardinalityLimitReporter());
+        assertEquals(2, recorded[0]);
+
+        // After the reset, no new values were registered so the next reset reports nothing.
+        recorded[0] = 0;
+        schema.resetHandlers(hm, new CardinalityLimitReporter());
+        assertEquals(0, recorded[0]);
+    }
+
+    @Test
+    void resetHandlersAggregatesAllPeerTagsUnderSinglePeerTagsField() {
+        // The Cardinality Limits RFC reports peer-tag collapses under the protobuf field name peer_tags
+        // aggregated across every configured peer tag, not per individual tag name.
+        PeerTagSchema schema =
+                new PeerTagSchema(new String[] {"peer.hostname", "peer.service"}, PeerTagSchema.NO_STATE);
+        schema.handlers[0] = new TagCardinalityHandler("peer.hostname", 1, true);
+        schema.handlers[1] = new TagCardinalityHandler("peer.service", 1, true);
+
+        schema.register(0, "host-a"); // within limit
+        schema.register(0, "host-b"); // blocked
+        schema.register(1, "svc-a"); // within limit
+        schema.register(1, "svc-b"); // blocked
+        schema.register(1, "svc-c"); // blocked
+
+        List<String[]> tags = new ArrayList<>();
+        long[] total = {0};
+        HealthMetrics hm = new HealthMetrics() {
+            @Override
+            public void onTagCardinalityBlocked(String[] tag, long count) {
+                tags.add(tag);
+                total[0] += count;
+            }
         };
 
-    schema.resetHandlers(hm, new CardinalityLimitReporter());
+        schema.resetHandlers(hm, new CardinalityLimitReporter());
 
-    // One health-metric call, tagged at the field granularity, summing both handlers' blocks.
-    assertEquals(1, tags.size());
-    assertArrayEquals(new String[] {"collapsed:peer_tags"}, tags.get(0));
-    assertEquals(3, total[0]);
-  }
+        // One health-metric call, tagged at the field granularity, summing both handlers' blocks.
+        assertEquals(1, tags.size());
+        assertArrayEquals(new String[] {"collapsed:peer_tags"}, tags.get(0));
+        assertEquals(3, total[0]);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/SerializingMetricWriterTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/SerializingMetricWriterTest.java
index bc05393cea3..fe1c70a4d77 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/SerializingMetricWriterTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/SerializingMetricWriterTest.java
@@ -40,800 +40,771 @@
 
 class SerializingMetricWriterTest extends DDJavaSpecification {
 
-  @BeforeAll
-  static void registerHistograms() {
-    Histograms.register(DDSketchHistograms.FACTORY);
-  }
-
-  /** Build an {@link AggregateEntry} with a pre-recorded duration count. */
-  private static AggregateEntry entry(
-      CharSequence resource,
-      CharSequence service,
-      CharSequence operationName,
-      CharSequence serviceSource,
-      CharSequence type,
-      int httpStatusCode,
-      boolean synthetic,
-      boolean traceRoot,
-      CharSequence spanKind,
-      List<UTF8BytesString> peerTags,
-      CharSequence httpMethod,
-      CharSequence httpEndpoint,
-      CharSequence grpcStatusCode,
-      int hitCount) {
-    AggregateEntry aggregateEntry =
-        AggregateEntryTestUtils.of(
-            resource,
-            service,
-            operationName,
-            serviceSource,
-            type,
-            httpStatusCode,
-            synthetic,
-            traceRoot,
-            spanKind,
-            peerTags,
-            httpMethod,
-            httpEndpoint,
-            grpcStatusCode);
-    for (int i = 0; i < hitCount; i++) {
-      aggregateEntry.recordOneDuration(1L);
+    @BeforeAll
+    static void registerHistograms() {
+        Histograms.register(DDSketchHistograms.FACTORY);
     }
-    return aggregateEntry;
-  }
 
-  static Stream<Arguments> shouldProduceCorrectMessageArguments() {
-    List<AggregateEntry> smallContent =
-        Arrays.asList(
-            entry(
-                "resource1",
-                "service1",
-                "operation1",
+    /** Build an {@link AggregateEntry} with a pre-recorded duration count. */
+    private static AggregateEntry entry(
+            CharSequence resource,
+            CharSequence service,
+            CharSequence operationName,
+            CharSequence serviceSource,
+            CharSequence type,
+            int httpStatusCode,
+            boolean synthetic,
+            boolean traceRoot,
+            CharSequence spanKind,
+            List<UTF8BytesString> peerTags,
+            CharSequence httpMethod,
+            CharSequence httpEndpoint,
+            CharSequence grpcStatusCode,
+            int hitCount) {
+        AggregateEntry aggregateEntry = AggregateEntryTestUtils.of(
+                resource,
+                service,
+                operationName,
+                serviceSource,
+                type,
+                httpStatusCode,
+                synthetic,
+                traceRoot,
+                spanKind,
+                peerTags,
+                httpMethod,
+                httpEndpoint,
+                grpcStatusCode);
+        for (int i = 0; i < hitCount; i++) {
+            aggregateEntry.recordOneDuration(1L);
+        }
+        return aggregateEntry;
+    }
+
+    static Stream<Arguments> shouldProduceCorrectMessageArguments() {
+        List<AggregateEntry> smallContent = Arrays.asList(
+                entry(
+                        "resource1",
+                        "service1",
+                        "operation1",
+                        null,
+                        "type",
+                        0,
+                        false,
+                        false,
+                        "client",
+                        Arrays.asList(
+                                UTF8BytesString.create("country:canada"),
+                                UTF8BytesString.create("georegion:amer"),
+                                UTF8BytesString.create("peer.service:remote-service")),
+                        null,
+                        null,
+                        null,
+                        10),
+                entry(
+                        "resource2",
+                        "service2",
+                        "operation2",
+                        null,
+                        "type2",
+                        200,
+                        true,
+                        false,
+                        "producer",
+                        Arrays.asList(
+                                UTF8BytesString.create("country:canada"),
+                                UTF8BytesString.create("georegion:amer"),
+                                UTF8BytesString.create("peer.service:remote-service")),
+                        null,
+                        null,
+                        null,
+                        9),
+                entry(
+                        "GET /api/users/:id",
+                        "web-service",
+                        "http.request",
+                        null,
+                        "web",
+                        200,
+                        false,
+                        true,
+                        "server",
+                        Collections.<UTF8BytesString>emptyList(),
+                        null,
+                        null,
+                        null,
+                        5));
+
+        List<AggregateEntry> largeContent = new ArrayList<>();
+        for (int i = 0; i <= 10000; i++) {
+            largeContent.add(entry(
+                    "resource" + i,
+                    "service" + i,
+                    "operation" + i,
+                    null,
+                    "type",
+                    0,
+                    false,
+                    false,
+                    "producer",
+                    Collections.singletonList(UTF8BytesString.create("messaging.destination:dest" + i)),
+                    null,
+                    null,
+                    null,
+                    10));
+        }
+
+        return Stream.of(
+                arguments("small content with process tags", smallContent, true),
+                arguments("large content without process tags", largeContent, false));
+    }
+
+    @ParameterizedTest(name = "should produce correct message: {0}")
+    @MethodSource("shouldProduceCorrectMessageArguments")
+    void shouldProduceCorrectMessage(String scenario, List<AggregateEntry> content, boolean withProcessTags) {
+        // setup
+        if (!withProcessTags) {
+            injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "false");
+        }
+        ProcessTags.reset(Config.get());
+        long startTime = MILLISECONDS.toNanos(System.currentTimeMillis());
+        long duration = SECONDS.toNanos(10);
+        WellKnownTags wellKnownTags =
+                new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
+        ValidatingSink sink = new ValidatingSink(wellKnownTags, startTime, duration, content);
+        SerializingMetricWriter writer = new SerializingMetricWriter(wellKnownTags, sink, 128);
+
+        try {
+            // when
+            writer.startBucket(content.size(), startTime, duration);
+            for (AggregateEntry aggregateEntry : content) {
+                writer.add(aggregateEntry);
+            }
+            writer.finishBucket();
+
+            // then
+            assertTrue(sink.validatedInput());
+        } finally {
+            // cleanup
+            removeSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED);
+            ProcessTags.reset(Config.get());
+        }
+    }
+
+    @Test
+    void serviceSourceOptionalInThePayload() {
+        // setup
+        long startTime = MILLISECONDS.toNanos(System.currentTimeMillis());
+        long duration = SECONDS.toNanos(10);
+        WellKnownTags wellKnownTags =
+                new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
+
+        AggregateEntry entryNoSource = entry(
+                "resource",
+                "service",
+                "operation",
                 null,
                 "type",
-                0,
+                200,
                 false,
                 false,
-                "client",
-                Arrays.asList(
-                    UTF8BytesString.create("country:canada"),
-                    UTF8BytesString.create("georegion:amer"),
-                    UTF8BytesString.create("peer.service:remote-service")),
+                "server",
+                Collections.<UTF8BytesString>emptyList(),
+                "GET",
+                "/api/users",
                 null,
+                1);
+        AggregateEntry entryWithSource = entry(
+                "resource",
+                "service",
+                "operation",
+                "source",
+                "type",
+                200,
+                false,
+                false,
+                "server",
+                Collections.<UTF8BytesString>emptyList(),
+                "POST",
                 null,
                 null,
-                10),
-            entry(
-                "resource2",
-                "service2",
-                "operation2",
+                1);
+
+        List<AggregateEntry> content = Arrays.asList(entryNoSource, entryWithSource);
+
+        ValidatingSink sink = new ValidatingSink(wellKnownTags, startTime, duration, content);
+        SerializingMetricWriter writer = new SerializingMetricWriter(wellKnownTags, sink, 128);
+
+        // when
+        writer.startBucket(content.size(), startTime, duration);
+        for (AggregateEntry aggregateEntry : content) {
+            writer.add(aggregateEntry);
+        }
+        writer.finishBucket();
+
+        // then
+        assertTrue(sink.validatedInput());
+    }
+
+    @Test
+    void httpMethodAndHttpEndpointFieldsAreOptionalInPayload() {
+        // setup
+        long startTime = MILLISECONDS.toNanos(System.currentTimeMillis());
+        long duration = SECONDS.toNanos(10);
+        WellKnownTags wellKnownTags =
+                new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
+
+        AggregateEntry entryWithBoth = entry(
+                "resource",
+                "service",
+                "operation",
                 null,
-                "type2",
+                "type",
                 200,
-                true,
                 false,
-                "producer",
-                Arrays.asList(
-                    UTF8BytesString.create("country:canada"),
-                    UTF8BytesString.create("georegion:amer"),
-                    UTF8BytesString.create("peer.service:remote-service")),
+                false,
+                "server",
+                Collections.<UTF8BytesString>emptyList(),
+                "GET",
+                "/api/users",
                 null,
+                1);
+        AggregateEntry entryWithMethodOnly = entry(
+                "resource",
+                "service",
+                "operation",
+                null,
+                "type",
+                200,
+                false,
+                false,
+                "server",
+                Collections.<UTF8BytesString>emptyList(),
+                "POST",
                 null,
                 null,
-                9),
-            entry(
-                "GET /api/users/:id",
-                "web-service",
-                "http.request",
+                1);
+        AggregateEntry entryWithEndpointOnly = entry(
+                "resource",
+                "service",
+                "operation",
                 null,
-                "web",
+                "type",
                 200,
                 false,
-                true,
+                false,
                 "server",
                 Collections.<UTF8BytesString>emptyList(),
                 null,
+                "/api/orders",
                 null,
+                1);
+        AggregateEntry entryWithNeither = entry(
+                "resource",
+                "service",
+                "operation",
                 null,
-                5));
-
-    List<AggregateEntry> largeContent = new ArrayList<>();
-    for (int i = 0; i <= 10000; i++) {
-      largeContent.add(
-          entry(
-              "resource" + i,
-              "service" + i,
-              "operation" + i,
-              null,
-              "type",
-              0,
-              false,
-              false,
-              "producer",
-              Collections.singletonList(UTF8BytesString.create("messaging.destination:dest" + i)),
-              null,
-              null,
-              null,
-              10));
-    }
+                "type",
+                200,
+                false,
+                false,
+                "client",
+                Collections.<UTF8BytesString>emptyList(),
+                null,
+                null,
+                null,
+                1);
 
-    return Stream.of(
-        arguments("small content with process tags", smallContent, true),
-        arguments("large content without process tags", largeContent, false));
-  }
-
-  @ParameterizedTest(name = "should produce correct message: {0}")
-  @MethodSource("shouldProduceCorrectMessageArguments")
-  void shouldProduceCorrectMessage(
-      String scenario, List<AggregateEntry> content, boolean withProcessTags) {
-    // setup
-    if (!withProcessTags) {
-      injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "false");
-    }
-    ProcessTags.reset(Config.get());
-    long startTime = MILLISECONDS.toNanos(System.currentTimeMillis());
-    long duration = SECONDS.toNanos(10);
-    WellKnownTags wellKnownTags =
-        new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
-    ValidatingSink sink = new ValidatingSink(wellKnownTags, startTime, duration, content);
-    SerializingMetricWriter writer = new SerializingMetricWriter(wellKnownTags, sink, 128);
-
-    try {
-      // when
-      writer.startBucket(content.size(), startTime, duration);
-      for (AggregateEntry aggregateEntry : content) {
-        writer.add(aggregateEntry);
-      }
-      writer.finishBucket();
-
-      // then
-      assertTrue(sink.validatedInput());
-    } finally {
-      // cleanup
-      removeSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED);
-      ProcessTags.reset(Config.get());
-    }
-  }
-
-  @Test
-  void serviceSourceOptionalInThePayload() {
-    // setup
-    long startTime = MILLISECONDS.toNanos(System.currentTimeMillis());
-    long duration = SECONDS.toNanos(10);
-    WellKnownTags wellKnownTags =
-        new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
-
-    AggregateEntry entryNoSource =
-        entry(
-            "resource",
-            "service",
-            "operation",
-            null,
-            "type",
-            200,
-            false,
-            false,
-            "server",
-            Collections.<UTF8BytesString>emptyList(),
-            "GET",
-            "/api/users",
-            null,
-            1);
-    AggregateEntry entryWithSource =
-        entry(
-            "resource",
-            "service",
-            "operation",
-            "source",
-            "type",
-            200,
-            false,
-            false,
-            "server",
-            Collections.<UTF8BytesString>emptyList(),
-            "POST",
-            null,
-            null,
-            1);
-
-    List<AggregateEntry> content = Arrays.asList(entryNoSource, entryWithSource);
-
-    ValidatingSink sink = new ValidatingSink(wellKnownTags, startTime, duration, content);
-    SerializingMetricWriter writer = new SerializingMetricWriter(wellKnownTags, sink, 128);
-
-    // when
-    writer.startBucket(content.size(), startTime, duration);
-    for (AggregateEntry aggregateEntry : content) {
-      writer.add(aggregateEntry);
-    }
-    writer.finishBucket();
-
-    // then
-    assertTrue(sink.validatedInput());
-  }
-
-  @Test
-  void httpMethodAndHttpEndpointFieldsAreOptionalInPayload() {
-    // setup
-    long startTime = MILLISECONDS.toNanos(System.currentTimeMillis());
-    long duration = SECONDS.toNanos(10);
-    WellKnownTags wellKnownTags =
-        new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
-
-    AggregateEntry entryWithBoth =
-        entry(
-            "resource",
-            "service",
-            "operation",
-            null,
-            "type",
-            200,
-            false,
-            false,
-            "server",
-            Collections.<UTF8BytesString>emptyList(),
-            "GET",
-            "/api/users",
-            null,
-            1);
-    AggregateEntry entryWithMethodOnly =
-        entry(
-            "resource",
-            "service",
-            "operation",
-            null,
-            "type",
-            200,
-            false,
-            false,
-            "server",
-            Collections.<UTF8BytesString>emptyList(),
-            "POST",
-            null,
-            null,
-            1);
-    AggregateEntry entryWithEndpointOnly =
-        entry(
-            "resource",
-            "service",
-            "operation",
-            null,
-            "type",
-            200,
-            false,
-            false,
-            "server",
-            Collections.<UTF8BytesString>emptyList(),
-            null,
-            "/api/orders",
-            null,
-            1);
-    AggregateEntry entryWithNeither =
-        entry(
-            "resource",
-            "service",
-            "operation",
-            null,
-            "type",
-            200,
-            false,
-            false,
-            "client",
-            Collections.<UTF8BytesString>emptyList(),
-            null,
-            null,
-            null,
-            1);
-
-    List<AggregateEntry> content =
-        Arrays.asList(entryWithBoth, entryWithMethodOnly, entryWithEndpointOnly, entryWithNeither);
-
-    ValidatingSink sink = new ValidatingSink(wellKnownTags, startTime, duration, content);
-    SerializingMetricWriter writer = new SerializingMetricWriter(wellKnownTags, sink, 128);
-
-    // when
-    writer.startBucket(content.size(), startTime, duration);
-    for (AggregateEntry aggregateEntry : content) {
-      writer.add(aggregateEntry);
-    }
-    writer.finishBucket();
-
-    // then
-    assertTrue(sink.validatedInput());
-  }
-
-  @TableTest({
-    "scenario        | shaCommit",
-    "no sha commit   |          ",
-    "with sha commit | 123456   "
-  })
-  void addGitShaCommitInfo(String shaCommit) {
-    // setup
-    GitInfoProvider gitInfoProvider = mock(GitInfoProvider.class);
-    when(gitInfoProvider.getGitInfo())
-        .thenReturn(new GitInfo(null, null, null, new CommitInfo(shaCommit)));
-
-    long startTime = MILLISECONDS.toNanos(System.currentTimeMillis());
-    long duration = SECONDS.toNanos(10);
-    WellKnownTags wellKnownTags =
-        new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
-
-    AggregateEntry aggregateEntry =
-        entry(
-            "resource",
-            "service",
-            "operation",
-            null,
-            "type",
-            200,
-            false,
-            false,
-            "server",
-            Collections.<UTF8BytesString>emptyList(),
-            "GET",
-            "/api/users",
-            null,
-            1);
-
-    List<AggregateEntry> content = Collections.singletonList(aggregateEntry);
-
-    ValidatingSink sink =
-        new ValidatingSink(wellKnownTags, startTime, duration, content, shaCommit);
-    SerializingMetricWriter writer =
-        new SerializingMetricWriter(wellKnownTags, sink, 128, gitInfoProvider);
-
-    // when
-    writer.startBucket(content.size(), startTime, duration);
-    for (AggregateEntry entryItem : content) {
-      writer.add(entryItem);
+        List<AggregateEntry> content =
+                Arrays.asList(entryWithBoth, entryWithMethodOnly, entryWithEndpointOnly, entryWithNeither);
+
+        ValidatingSink sink = new ValidatingSink(wellKnownTags, startTime, duration, content);
+        SerializingMetricWriter writer = new SerializingMetricWriter(wellKnownTags, sink, 128);
+
+        // when
+        writer.startBucket(content.size(), startTime, duration);
+        for (AggregateEntry aggregateEntry : content) {
+            writer.add(aggregateEntry);
+        }
+        writer.finishBucket();
+
+        // then
+        assertTrue(sink.validatedInput());
     }
-    writer.finishBucket();
-
-    // then
-    assertTrue(sink.validatedInput());
-  }
-
-  @Test
-  void grpcStatusCodeFieldIsPresentInPayloadForRpcTypeSpans() {
-    // setup
-    long startTime = MILLISECONDS.toNanos(System.currentTimeMillis());
-    long duration = SECONDS.toNanos(10);
-    WellKnownTags wellKnownTags =
-        new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
-
-    AggregateEntry entryWithGrpc =
-        entry(
-            "grpc.service/Method",
-            "grpc-service",
-            "grpc.server",
-            null,
-            "rpc",
-            0,
-            false,
-            false,
-            "server",
-            Collections.<UTF8BytesString>emptyList(),
-            null,
-            null,
-            "OK",
-            1);
-    AggregateEntry entryWithGrpcError =
-        entry(
-            "grpc.service/Method",
-            "grpc-service",
-            "grpc.server",
-            null,
-            "rpc",
-            0,
-            false,
-            false,
-            "client",
-            Collections.<UTF8BytesString>emptyList(),
-            null,
-            null,
-            "NOT_FOUND",
-            1);
-    AggregateEntry entryWithoutGrpc =
-        entry(
-            "resource",
-            "service",
-            "operation",
-            null,
-            "web",
-            200,
-            false,
-            false,
-            "server",
-            Collections.<UTF8BytesString>emptyList(),
-            null,
-            null,
-            null,
-            1);
-
-    List<AggregateEntry> content =
-        Arrays.asList(entryWithGrpc, entryWithGrpcError, entryWithoutGrpc);
-
-    ValidatingSink sink = new ValidatingSink(wellKnownTags, startTime, duration, content);
-    SerializingMetricWriter writer = new SerializingMetricWriter(wellKnownTags, sink, 128);
-
-    // when
-    writer.startBucket(content.size(), startTime, duration);
-    for (AggregateEntry aggregateEntry : content) {
-      writer.add(aggregateEntry);
+
+    @TableTest({
+      "scenario        | shaCommit",
+      "no sha commit   |          ",
+      "with sha commit | 123456   "
+    })
+    void addGitShaCommitInfo(String shaCommit) {
+        // setup
+        GitInfoProvider gitInfoProvider = mock(GitInfoProvider.class);
+        when(gitInfoProvider.getGitInfo()).thenReturn(new GitInfo(null, null, null, new CommitInfo(shaCommit)));
+
+        long startTime = MILLISECONDS.toNanos(System.currentTimeMillis());
+        long duration = SECONDS.toNanos(10);
+        WellKnownTags wellKnownTags =
+                new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
+
+        AggregateEntry aggregateEntry = entry(
+                "resource",
+                "service",
+                "operation",
+                null,
+                "type",
+                200,
+                false,
+                false,
+                "server",
+                Collections.<UTF8BytesString>emptyList(),
+                "GET",
+                "/api/users",
+                null,
+                1);
+
+        List<AggregateEntry> content = Collections.singletonList(aggregateEntry);
+
+        ValidatingSink sink = new ValidatingSink(wellKnownTags, startTime, duration, content, shaCommit);
+        SerializingMetricWriter writer = new SerializingMetricWriter(wellKnownTags, sink, 128, gitInfoProvider);
+
+        // when
+        writer.startBucket(content.size(), startTime, duration);
+        for (AggregateEntry entryItem : content) {
+            writer.add(entryItem);
+        }
+        writer.finishBucket();
+
+        // then
+        assertTrue(sink.validatedInput());
     }
-    writer.finishBucket();
-
-    // then
-    assertTrue(sink.validatedInput());
-  }
-
-  @Test
-  void additionalMetricTagsEmittedWhenSet() {
-    AdditionalTagsSchema schema =
-        AdditionalTagsSchema.from(new LinkedHashSet<>(Arrays.asList("region", "tenant_id")));
-    AggregateTable table = newTable(schema);
-
-    table.findOrInsert(snapshot(schema, "us-east-1", "acme-corp")).recordOneDuration(1L);
-
-    List<AggregateEntry> content = contentOf(table);
-    assertEquals(1, content.size());
-    // Both configured tags are packed in schema (alphabetical) order: region first, then
-    // tenant_id.
-    UTF8BytesString[] additionalTags = content.get(0).getAdditionalTags();
-    assertEquals(2, additionalTags.length);
-    assertEquals("region:us-east-1", additionalTags[0].toString());
-    assertEquals("tenant_id:acme-corp", additionalTags[1].toString());
-
-    // ValidatingSink re-checks the serialized AdditionalMetricTags array against the entry.
-    serializeAndValidate(content);
-  }
-
-  @Test
-  void additionalMetricTagsEmittedAsEmptyArrayWhenConfiguredButNoneSet() {
-    // Schema configured, but the span doesn't set any of the configured tags. Per the Span-Derived
-    // Primary Tags RFC the field is still present (as an empty array) whenever the feature is on.
-    AdditionalTagsSchema schema =
-        AdditionalTagsSchema.from(new LinkedHashSet<>(Arrays.asList("region")));
-    AggregateTable table = newTable(schema);
-
-    table.findOrInsert(snapshot(schema, new String[] {null})).recordOneDuration(1L);
-
-    List<AggregateEntry> content = contentOf(table);
-    assertEquals(1, content.size());
-    // No slots populated -> empty packed array, but the field is still emitted since configured.
-    assertEquals(0, content.get(0).getAdditionalTags().length);
-
-    serializeAndValidate(content);
-  }
-
-  @Test
-  void additionalMetricTagsFieldOmittedWhenFeatureOff() {
-    // Feature off (no schema): the writer omits AdditionalMetricTags entirely so non-users pay no
-    // payload overhead.
-    long startTime = MILLISECONDS.toNanos(System.currentTimeMillis());
-    long duration = SECONDS.toNanos(10);
-    WellKnownTags wellKnownTags =
-        new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
-    AggregateTable table = newTable(AdditionalTagsSchema.EMPTY);
-    table.findOrInsert(snapshot(AdditionalTagsSchema.EMPTY)).recordOneDuration(1L);
-    List<AggregateEntry> content = contentOf(table);
-    assertEquals(1, content.size());
-    assertEquals(0, content.get(0).getAdditionalTags().length);
-
-    // Default (unconfigured) sink + writer: the field must be absent.
-    ValidatingSink sink = new ValidatingSink(wellKnownTags, startTime, duration, content);
-    SerializingMetricWriter writer = new SerializingMetricWriter(wellKnownTags, sink, 128);
-    writer.startBucket(content.size(), startTime, duration);
-    for (AggregateEntry entry : content) {
-      writer.add(entry);
+
+    @Test
+    void grpcStatusCodeFieldIsPresentInPayloadForRpcTypeSpans() {
+        // setup
+        long startTime = MILLISECONDS.toNanos(System.currentTimeMillis());
+        long duration = SECONDS.toNanos(10);
+        WellKnownTags wellKnownTags =
+                new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
+
+        AggregateEntry entryWithGrpc = entry(
+                "grpc.service/Method",
+                "grpc-service",
+                "grpc.server",
+                null,
+                "rpc",
+                0,
+                false,
+                false,
+                "server",
+                Collections.<UTF8BytesString>emptyList(),
+                null,
+                null,
+                "OK",
+                1);
+        AggregateEntry entryWithGrpcError = entry(
+                "grpc.service/Method",
+                "grpc-service",
+                "grpc.server",
+                null,
+                "rpc",
+                0,
+                false,
+                false,
+                "client",
+                Collections.<UTF8BytesString>emptyList(),
+                null,
+                null,
+                "NOT_FOUND",
+                1);
+        AggregateEntry entryWithoutGrpc = entry(
+                "resource",
+                "service",
+                "operation",
+                null,
+                "web",
+                200,
+                false,
+                false,
+                "server",
+                Collections.<UTF8BytesString>emptyList(),
+                null,
+                null,
+                null,
+                1);
+
+        List<AggregateEntry> content = Arrays.asList(entryWithGrpc, entryWithGrpcError, entryWithoutGrpc);
+
+        ValidatingSink sink = new ValidatingSink(wellKnownTags, startTime, duration, content);
+        SerializingMetricWriter writer = new SerializingMetricWriter(wellKnownTags, sink, 128);
+
+        // when
+        writer.startBucket(content.size(), startTime, duration);
+        for (AggregateEntry aggregateEntry : content) {
+            writer.add(aggregateEntry);
+        }
+        writer.finishBucket();
+
+        // then
+        assertTrue(sink.validatedInput());
     }
-    writer.finishBucket();
-    assertTrue(sink.validatedInput());
-  }
-
-  @Test
-  void additionalMetricTagsSkipsNullSlots() {
-    AdditionalTagsSchema schema =
-        AdditionalTagsSchema.from(new LinkedHashSet<>(Arrays.asList("region", "tenant_id")));
-    AggregateTable table = newTable(schema);
-
-    // Set only tenant_id; leave region null.
-    table
-        .findOrInsert(
-            snapshot(
-                schema,
-                new String[] {
-                  /*region*/
-                  null, /*tenant_id*/ "acme-corp"
-                }))
-        .recordOneDuration(1L);
 
-    List<AggregateEntry> content = contentOf(table);
-    assertEquals(1, content.size());
-    // The null region slot is skipped; only tenant_id survives in the packed array.
-    UTF8BytesString[] additionalTags = content.get(0).getAdditionalTags();
-    assertEquals(1, additionalTags.length);
-    assertEquals("tenant_id:acme-corp", additionalTags[0].toString());
+    @Test
+    void additionalMetricTagsEmittedWhenSet() {
+        AdditionalTagsSchema schema =
+                AdditionalTagsSchema.from(new LinkedHashSet<>(Arrays.asList("region", "tenant_id")));
+        AggregateTable table = newTable(schema);
+
+        table.findOrInsert(snapshot(schema, "us-east-1", "acme-corp")).recordOneDuration(1L);
+
+        List<AggregateEntry> content = contentOf(table);
+        assertEquals(1, content.size());
+        // Both configured tags are packed in schema (alphabetical) order: region first, then
+        // tenant_id.
+        UTF8BytesString[] additionalTags = content.get(0).getAdditionalTags();
+        assertEquals(2, additionalTags.length);
+        assertEquals("region:us-east-1", additionalTags[0].toString());
+        assertEquals("tenant_id:acme-corp", additionalTags[1].toString());
+
+        // ValidatingSink re-checks the serialized AdditionalMetricTags array against the entry.
+        serializeAndValidate(content);
+    }
 
-    serializeAndValidate(content);
-  }
+    @Test
+    void additionalMetricTagsEmittedAsEmptyArrayWhenConfiguredButNoneSet() {
+        // Schema configured, but the span doesn't set any of the configured tags. Per the Span-Derived
+        // Primary Tags RFC the field is still present (as an empty array) whenever the feature is on.
+        AdditionalTagsSchema schema = AdditionalTagsSchema.from(new LinkedHashSet<>(Arrays.asList("region")));
+        AggregateTable table = newTable(schema);
 
-  // ---------- additional-tags helpers ----------
+        table.findOrInsert(snapshot(schema, new String[] {null})).recordOneDuration(1L);
 
-  private static AggregateTable newTable(AdditionalTagsSchema schema) {
-    return new AggregateTable(64, schema);
-  }
+        List<AggregateEntry> content = contentOf(table);
+        assertEquals(1, content.size());
+        // No slots populated -> empty packed array, but the field is still emitted since configured.
+        assertEquals(0, content.get(0).getAdditionalTags().length);
 
-  private static SpanSnapshot snapshot(AdditionalTagsSchema schema, String... values) {
-    String[] padded = new String[schema.size()];
-    if (values != null) {
-      System.arraycopy(values, 0, padded, 0, Math.min(values.length, padded.length));
+        serializeAndValidate(content);
     }
-    return new SpanSnapshot(
-        "resource",
-        "service",
-        "operation",
-        null,
-        "web",
-        (short) 200,
-        false,
-        true,
-        "client",
-        null,
-        null,
-        null,
-        null,
-        null,
-        padded,
-        0L);
-  }
-
-  /**
-   * Collects the table's entries in iteration order (the same order the writer serializes them).
-   */
-  private static List<AggregateEntry> contentOf(AggregateTable table) {
-    List<AggregateEntry> content = new ArrayList<>();
-    table.forEach(content::add);
-    return content;
-  }
-
-  /**
-   * Serializes {@code content} through the shared {@link ValidatingSink} and asserts it decoded.
-   */
-  private static void serializeAndValidate(List<AggregateEntry> content) {
-    long startTime = MILLISECONDS.toNanos(System.currentTimeMillis());
-    long duration = SECONDS.toNanos(10);
-    WellKnownTags wellKnownTags =
-        new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
-    // These helpers exercise the configured-feature path, so the writer is built configured and the
-    // sink expects the AdditionalMetricTags field present (possibly empty) on every entry.
-    ValidatingSink sink =
-        new ValidatingSink(wellKnownTags, startTime, duration, content, null, true);
-    SerializingMetricWriter writer = new SerializingMetricWriter(wellKnownTags, sink, true);
-
-    writer.startBucket(content.size(), startTime, duration);
-    for (AggregateEntry entry : content) {
-      writer.add(entry);
+
+    @Test
+    void additionalMetricTagsFieldOmittedWhenFeatureOff() {
+        // Feature off (no schema): the writer omits AdditionalMetricTags entirely so non-users pay no
+        // payload overhead.
+        long startTime = MILLISECONDS.toNanos(System.currentTimeMillis());
+        long duration = SECONDS.toNanos(10);
+        WellKnownTags wellKnownTags =
+                new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
+        AggregateTable table = newTable(AdditionalTagsSchema.EMPTY);
+        table.findOrInsert(snapshot(AdditionalTagsSchema.EMPTY)).recordOneDuration(1L);
+        List<AggregateEntry> content = contentOf(table);
+        assertEquals(1, content.size());
+        assertEquals(0, content.get(0).getAdditionalTags().length);
+
+        // Default (unconfigured) sink + writer: the field must be absent.
+        ValidatingSink sink = new ValidatingSink(wellKnownTags, startTime, duration, content);
+        SerializingMetricWriter writer = new SerializingMetricWriter(wellKnownTags, sink, 128);
+        writer.startBucket(content.size(), startTime, duration);
+        for (AggregateEntry entry : content) {
+            writer.add(entry);
+        }
+        writer.finishBucket();
+        assertTrue(sink.validatedInput());
     }
-    writer.finishBucket();
-
-    assertTrue(sink.validatedInput());
-  }
-
-  static final class ValidatingSink implements Sink {
-
-    private final WellKnownTags wellKnownTags;
-    private final long startTimeNanos;
-    private final long duration;
-    private boolean validated = false;
-    private final List<AggregateEntry> content;
-    private final String expectedGitCommitSha;
-    private final boolean additionalTagsConfigured;
-
-    ValidatingSink(
-        WellKnownTags wellKnownTags,
-        long startTimeNanos,
-        long duration,
-        List<AggregateEntry> content) {
-      this(wellKnownTags, startTimeNanos, duration, content, null);
+
+    @Test
+    void additionalMetricTagsSkipsNullSlots() {
+        AdditionalTagsSchema schema =
+                AdditionalTagsSchema.from(new LinkedHashSet<>(Arrays.asList("region", "tenant_id")));
+        AggregateTable table = newTable(schema);
+
+        // Set only tenant_id; leave region null.
+        table.findOrInsert(snapshot(schema, new String[] {
+                    /*region*/
+                    null, /*tenant_id*/ "acme-corp"
+                }))
+                .recordOneDuration(1L);
+
+        List<AggregateEntry> content = contentOf(table);
+        assertEquals(1, content.size());
+        // The null region slot is skipped; only tenant_id survives in the packed array.
+        UTF8BytesString[] additionalTags = content.get(0).getAdditionalTags();
+        assertEquals(1, additionalTags.length);
+        assertEquals("tenant_id:acme-corp", additionalTags[0].toString());
+
+        serializeAndValidate(content);
     }
 
-    ValidatingSink(
-        WellKnownTags wellKnownTags,
-        long startTimeNanos,
-        long duration,
-        List<AggregateEntry> content,
-        String expectedGitCommitSha) {
-      this(wellKnownTags, startTimeNanos, duration, content, expectedGitCommitSha, false);
+    // ---------- additional-tags helpers ----------
+
+    private static AggregateTable newTable(AdditionalTagsSchema schema) {
+        return new AggregateTable(64, schema);
     }
 
-    ValidatingSink(
-        WellKnownTags wellKnownTags,
-        long startTimeNanos,
-        long duration,
-        List<AggregateEntry> content,
-        String expectedGitCommitSha,
-        boolean additionalTagsConfigured) {
-      this.wellKnownTags = wellKnownTags;
-      this.startTimeNanos = startTimeNanos;
-      this.duration = duration;
-      this.content = content;
-      this.expectedGitCommitSha = expectedGitCommitSha;
-      this.additionalTagsConfigured = additionalTagsConfigured;
+    private static SpanSnapshot snapshot(AdditionalTagsSchema schema, String... values) {
+        String[] padded = new String[schema.size()];
+        if (values != null) {
+            System.arraycopy(values, 0, padded, 0, Math.min(values.length, padded.length));
+        }
+        return new SpanSnapshot(
+                "resource",
+                "service",
+                "operation",
+                null,
+                "web",
+                (short) 200,
+                false,
+                true,
+                "client",
+                null,
+                null,
+                null,
+                null,
+                null,
+                padded,
+                0L);
     }
 
-    @Override
-    public void register(EventListener listener) {}
-
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {
-      // Sink.accept can't declare checked exceptions; surface any msgpack decode failure as an
-      // assertion error so the test reports it.
-      try {
-        validate(buffer);
-      } catch (IOException e) {
-        throw new AssertionError("Failed to decode metric payload", e);
-      }
+    /**
+     * Collects the table's entries in iteration order (the same order the writer serializes them).
+     */
+    private static List<AggregateEntry> contentOf(AggregateTable table) {
+        List<AggregateEntry> content = new ArrayList<>();
+        table.forEach(content::add);
+        return content;
     }
 
-    private void validate(ByteBuffer buffer) throws IOException {
-      MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer);
-      int mapSize = unpacker.unpackMapHeader();
-      String gitCommitSha = expectedGitCommitSha;
-      assertEquals(
-          7
-              + (Config.get().isExperimentalPropagateProcessTagsEnabled() ? 1 : 0)
-              + (gitCommitSha != null ? 1 : 0),
-          mapSize);
-      assertEquals("RuntimeID", unpacker.unpackString());
-      assertEquals(wellKnownTags.getRuntimeId().toString(), unpacker.unpackString());
-      assertEquals("Sequence", unpacker.unpackString());
-      assertEquals(0L, unpacker.unpackLong());
-      assertEquals("Hostname", unpacker.unpackString());
-      assertEquals(wellKnownTags.getHostname().toString(), unpacker.unpackString());
-      assertEquals("Service", unpacker.unpackString());
-      assertEquals(wellKnownTags.getService().toString(), unpacker.unpackString());
-      assertEquals("Env", unpacker.unpackString());
-      assertEquals(wellKnownTags.getEnv().toString(), unpacker.unpackString());
-      assertEquals("Version", unpacker.unpackString());
-      assertEquals(wellKnownTags.getVersion().toString(), unpacker.unpackString());
-      if (Config.get().isExperimentalPropagateProcessTagsEnabled()) {
-        assertEquals("ProcessTags", unpacker.unpackString());
-        assertEquals(ProcessTags.getTagsForSerialization().toString(), unpacker.unpackString());
-      }
-      if (gitCommitSha != null) {
-        assertEquals("GitCommitSha", unpacker.unpackString());
-        assertEquals(gitCommitSha, unpacker.unpackString());
-      }
-      assertEquals("Stats", unpacker.unpackString());
-      int outerLength = unpacker.unpackArrayHeader();
-      assertEquals(1, outerLength);
-      assertEquals(3, unpacker.unpackMapHeader());
-      assertEquals("Start", unpacker.unpackString());
-      assertEquals(startTimeNanos, unpacker.unpackLong());
-      assertEquals("Duration", unpacker.unpackString());
-      assertEquals(duration, unpacker.unpackLong());
-      assertEquals("Stats", unpacker.unpackString());
-      int statCount = unpacker.unpackArrayHeader();
-      assertEquals(content.size(), statCount);
-      for (AggregateEntry entry : content) {
-        // counters now live on AggregateEntry
-        int metricMapSize = unpacker.unpackMapHeader();
-        // Calculate expected map size based on optional fields
-        boolean hasHttpMethod = entry.hasHttpMethod();
-        boolean hasHttpEndpoint = entry.hasHttpEndpoint();
-        boolean hasServiceSource = entry.hasServiceSource();
-        boolean hasGrpcStatusCode = entry.hasGrpcStatusCode();
-        UTF8BytesString[] additionalTags = entry.getAdditionalTags();
-        int expectedMapSize =
-            15
-                + (hasServiceSource ? 1 : 0)
-                + (hasHttpMethod ? 1 : 0)
-                + (hasHttpEndpoint ? 1 : 0)
-                + (hasGrpcStatusCode ? 1 : 0)
-                + (additionalTagsConfigured ? 1 : 0);
-        assertEquals(expectedMapSize, metricMapSize);
-        int elementCount = 0;
-        assertEquals("Name", unpacker.unpackString());
-        assertEquals(entry.getOperationName().toString(), unpacker.unpackString());
-        ++elementCount;
-        assertEquals("Service", unpacker.unpackString());
-        assertEquals(entry.getService().toString(), unpacker.unpackString());
-        ++elementCount;
-        assertEquals("Resource", unpacker.unpackString());
-        assertEquals(entry.getResource().toString(), unpacker.unpackString());
-        ++elementCount;
-        assertEquals("Type", unpacker.unpackString());
-        assertEquals(entry.getType().toString(), unpacker.unpackString());
-        ++elementCount;
-        assertEquals("HTTPStatusCode", unpacker.unpackString());
-        assertEquals(entry.getHttpStatusCode(), unpacker.unpackInt());
-        ++elementCount;
-        assertEquals("Synthetics", unpacker.unpackString());
-        assertEquals(entry.isSynthetics(), unpacker.unpackBoolean());
-        ++elementCount;
-        assertEquals("IsTraceRoot", unpacker.unpackString());
-        assertEquals(
-            entry.isTraceRoot() ? TriState.TRUE.serialValue : TriState.FALSE.serialValue,
-            unpacker.unpackInt());
-        ++elementCount;
-        assertEquals("SpanKind", unpacker.unpackString());
-        assertEquals(entry.getSpanKind().toString(), unpacker.unpackString());
-        ++elementCount;
-        assertEquals("PeerTags", unpacker.unpackString());
-        int peerTagsLength = unpacker.unpackArrayHeader();
-        assertEquals(entry.getPeerTags().size(), peerTagsLength);
-        for (int i = 0; i < peerTagsLength; i++) {
-          String unpackedPeerTag = unpacker.unpackString();
-          assertEquals(entry.getPeerTags().get(i).toString(), unpackedPeerTag);
+    /**
+     * Serializes {@code content} through the shared {@link ValidatingSink} and asserts it decoded.
+     */
+    private static void serializeAndValidate(List<AggregateEntry> content) {
+        long startTime = MILLISECONDS.toNanos(System.currentTimeMillis());
+        long duration = SECONDS.toNanos(10);
+        WellKnownTags wellKnownTags =
+                new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
+        // These helpers exercise the configured-feature path, so the writer is built configured and the
+        // sink expects the AdditionalMetricTags field present (possibly empty) on every entry.
+        ValidatingSink sink = new ValidatingSink(wellKnownTags, startTime, duration, content, null, true);
+        SerializingMetricWriter writer = new SerializingMetricWriter(wellKnownTags, sink, true);
+
+        writer.startBucket(content.size(), startTime, duration);
+        for (AggregateEntry entry : content) {
+            writer.add(entry);
         }
-        ++elementCount;
-        // AdditionalMetricTags is a packed array of pre-built "key:value" strings in schema
-        // (alphabetical-by-key) order. Emitted immediately after PeerTags whenever the feature is
-        // configured -- as an empty array for entries that matched no key -- and omitted entirely
-        // when the feature is off, mirroring the writer's field handling above.
-        if (additionalTagsConfigured) {
-          assertEquals("AdditionalMetricTags", unpacker.unpackString());
-          int additionalTagsLength = unpacker.unpackArrayHeader();
-          assertEquals(additionalTags.length, additionalTagsLength);
-          for (int i = 0; i < additionalTagsLength; i++) {
-            assertEquals(additionalTags[i].toString(), unpacker.unpackString());
-          }
-          ++elementCount;
+        writer.finishBucket();
+
+        assertTrue(sink.validatedInput());
+    }
+
+    static final class ValidatingSink implements Sink {
+
+        private final WellKnownTags wellKnownTags;
+        private final long startTimeNanos;
+        private final long duration;
+        private boolean validated = false;
+        private final List<AggregateEntry> content;
+        private final String expectedGitCommitSha;
+        private final boolean additionalTagsConfigured;
+
+        ValidatingSink(WellKnownTags wellKnownTags, long startTimeNanos, long duration, List<AggregateEntry> content) {
+            this(wellKnownTags, startTimeNanos, duration, content, null);
         }
-        // Service source is only present when the service name has been overridden by the tracer
-        if (hasServiceSource) {
-          assertEquals("srv_src", unpacker.unpackString());
-          assertEquals(entry.getServiceSource().toString(), unpacker.unpackString());
-          ++elementCount;
+
+        ValidatingSink(
+                WellKnownTags wellKnownTags,
+                long startTimeNanos,
+                long duration,
+                List<AggregateEntry> content,
+                String expectedGitCommitSha) {
+            this(wellKnownTags, startTimeNanos, duration, content, expectedGitCommitSha, false);
         }
-        // HTTPMethod and HTTPEndpoint are optional - only present if non-null
-        if (hasHttpMethod) {
-          assertEquals("HTTPMethod", unpacker.unpackString());
-          assertEquals(entry.getHttpMethod().toString(), unpacker.unpackString());
-          ++elementCount;
+
+        ValidatingSink(
+                WellKnownTags wellKnownTags,
+                long startTimeNanos,
+                long duration,
+                List<AggregateEntry> content,
+                String expectedGitCommitSha,
+                boolean additionalTagsConfigured) {
+            this.wellKnownTags = wellKnownTags;
+            this.startTimeNanos = startTimeNanos;
+            this.duration = duration;
+            this.content = content;
+            this.expectedGitCommitSha = expectedGitCommitSha;
+            this.additionalTagsConfigured = additionalTagsConfigured;
         }
-        if (hasHttpEndpoint) {
-          assertEquals("HTTPEndpoint", unpacker.unpackString());
-          assertEquals(entry.getHttpEndpoint().toString(), unpacker.unpackString());
-          ++elementCount;
+
+        @Override
+        public void register(EventListener listener) {}
+
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {
+            // Sink.accept can't declare checked exceptions; surface any msgpack decode failure as an
+            // assertion error so the test reports it.
+            try {
+                validate(buffer);
+            } catch (IOException e) {
+                throw new AssertionError("Failed to decode metric payload", e);
+            }
         }
-        if (hasGrpcStatusCode) {
-          assertEquals("GRPCStatusCode", unpacker.unpackString());
-          assertEquals(entry.getGrpcStatusCode().toString(), unpacker.unpackString());
-          ++elementCount;
+
+        private void validate(ByteBuffer buffer) throws IOException {
+            MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer);
+            int mapSize = unpacker.unpackMapHeader();
+            String gitCommitSha = expectedGitCommitSha;
+            assertEquals(
+                    7
+                            + (Config.get().isExperimentalPropagateProcessTagsEnabled() ? 1 : 0)
+                            + (gitCommitSha != null ? 1 : 0),
+                    mapSize);
+            assertEquals("RuntimeID", unpacker.unpackString());
+            assertEquals(wellKnownTags.getRuntimeId().toString(), unpacker.unpackString());
+            assertEquals("Sequence", unpacker.unpackString());
+            assertEquals(0L, unpacker.unpackLong());
+            assertEquals("Hostname", unpacker.unpackString());
+            assertEquals(wellKnownTags.getHostname().toString(), unpacker.unpackString());
+            assertEquals("Service", unpacker.unpackString());
+            assertEquals(wellKnownTags.getService().toString(), unpacker.unpackString());
+            assertEquals("Env", unpacker.unpackString());
+            assertEquals(wellKnownTags.getEnv().toString(), unpacker.unpackString());
+            assertEquals("Version", unpacker.unpackString());
+            assertEquals(wellKnownTags.getVersion().toString(), unpacker.unpackString());
+            if (Config.get().isExperimentalPropagateProcessTagsEnabled()) {
+                assertEquals("ProcessTags", unpacker.unpackString());
+                assertEquals(ProcessTags.getTagsForSerialization().toString(), unpacker.unpackString());
+            }
+            if (gitCommitSha != null) {
+                assertEquals("GitCommitSha", unpacker.unpackString());
+                assertEquals(gitCommitSha, unpacker.unpackString());
+            }
+            assertEquals("Stats", unpacker.unpackString());
+            int outerLength = unpacker.unpackArrayHeader();
+            assertEquals(1, outerLength);
+            assertEquals(3, unpacker.unpackMapHeader());
+            assertEquals("Start", unpacker.unpackString());
+            assertEquals(startTimeNanos, unpacker.unpackLong());
+            assertEquals("Duration", unpacker.unpackString());
+            assertEquals(duration, unpacker.unpackLong());
+            assertEquals("Stats", unpacker.unpackString());
+            int statCount = unpacker.unpackArrayHeader();
+            assertEquals(content.size(), statCount);
+            for (AggregateEntry entry : content) {
+                // counters now live on AggregateEntry
+                int metricMapSize = unpacker.unpackMapHeader();
+                // Calculate expected map size based on optional fields
+                boolean hasHttpMethod = entry.hasHttpMethod();
+                boolean hasHttpEndpoint = entry.hasHttpEndpoint();
+                boolean hasServiceSource = entry.hasServiceSource();
+                boolean hasGrpcStatusCode = entry.hasGrpcStatusCode();
+                UTF8BytesString[] additionalTags = entry.getAdditionalTags();
+                int expectedMapSize = 15
+                        + (hasServiceSource ? 1 : 0)
+                        + (hasHttpMethod ? 1 : 0)
+                        + (hasHttpEndpoint ? 1 : 0)
+                        + (hasGrpcStatusCode ? 1 : 0)
+                        + (additionalTagsConfigured ? 1 : 0);
+                assertEquals(expectedMapSize, metricMapSize);
+                int elementCount = 0;
+                assertEquals("Name", unpacker.unpackString());
+                assertEquals(entry.getOperationName().toString(), unpacker.unpackString());
+                ++elementCount;
+                assertEquals("Service", unpacker.unpackString());
+                assertEquals(entry.getService().toString(), unpacker.unpackString());
+                ++elementCount;
+                assertEquals("Resource", unpacker.unpackString());
+                assertEquals(entry.getResource().toString(), unpacker.unpackString());
+                ++elementCount;
+                assertEquals("Type", unpacker.unpackString());
+                assertEquals(entry.getType().toString(), unpacker.unpackString());
+                ++elementCount;
+                assertEquals("HTTPStatusCode", unpacker.unpackString());
+                assertEquals(entry.getHttpStatusCode(), unpacker.unpackInt());
+                ++elementCount;
+                assertEquals("Synthetics", unpacker.unpackString());
+                assertEquals(entry.isSynthetics(), unpacker.unpackBoolean());
+                ++elementCount;
+                assertEquals("IsTraceRoot", unpacker.unpackString());
+                assertEquals(
+                        entry.isTraceRoot() ? TriState.TRUE.serialValue : TriState.FALSE.serialValue,
+                        unpacker.unpackInt());
+                ++elementCount;
+                assertEquals("SpanKind", unpacker.unpackString());
+                assertEquals(entry.getSpanKind().toString(), unpacker.unpackString());
+                ++elementCount;
+                assertEquals("PeerTags", unpacker.unpackString());
+                int peerTagsLength = unpacker.unpackArrayHeader();
+                assertEquals(entry.getPeerTags().size(), peerTagsLength);
+                for (int i = 0; i < peerTagsLength; i++) {
+                    String unpackedPeerTag = unpacker.unpackString();
+                    assertEquals(entry.getPeerTags().get(i).toString(), unpackedPeerTag);
+                }
+                ++elementCount;
+                // AdditionalMetricTags is a packed array of pre-built "key:value" strings in schema
+                // (alphabetical-by-key) order. Emitted immediately after PeerTags whenever the feature is
+                // configured -- as an empty array for entries that matched no key -- and omitted entirely
+                // when the feature is off, mirroring the writer's field handling above.
+                if (additionalTagsConfigured) {
+                    assertEquals("AdditionalMetricTags", unpacker.unpackString());
+                    int additionalTagsLength = unpacker.unpackArrayHeader();
+                    assertEquals(additionalTags.length, additionalTagsLength);
+                    for (int i = 0; i < additionalTagsLength; i++) {
+                        assertEquals(additionalTags[i].toString(), unpacker.unpackString());
+                    }
+                    ++elementCount;
+                }
+                // Service source is only present when the service name has been overridden by the tracer
+                if (hasServiceSource) {
+                    assertEquals("srv_src", unpacker.unpackString());
+                    assertEquals(entry.getServiceSource().toString(), unpacker.unpackString());
+                    ++elementCount;
+                }
+                // HTTPMethod and HTTPEndpoint are optional - only present if non-null
+                if (hasHttpMethod) {
+                    assertEquals("HTTPMethod", unpacker.unpackString());
+                    assertEquals(entry.getHttpMethod().toString(), unpacker.unpackString());
+                    ++elementCount;
+                }
+                if (hasHttpEndpoint) {
+                    assertEquals("HTTPEndpoint", unpacker.unpackString());
+                    assertEquals(entry.getHttpEndpoint().toString(), unpacker.unpackString());
+                    ++elementCount;
+                }
+                if (hasGrpcStatusCode) {
+                    assertEquals("GRPCStatusCode", unpacker.unpackString());
+                    assertEquals(entry.getGrpcStatusCode().toString(), unpacker.unpackString());
+                    ++elementCount;
+                }
+                assertEquals("Hits", unpacker.unpackString());
+                assertEquals(entry.getHitCount(), unpacker.unpackInt());
+                ++elementCount;
+                assertEquals("Errors", unpacker.unpackString());
+                assertEquals(entry.getErrorCount(), unpacker.unpackInt());
+                ++elementCount;
+                assertEquals("TopLevelHits", unpacker.unpackString());
+                assertEquals(entry.getTopLevelCount(), unpacker.unpackInt());
+                ++elementCount;
+                assertEquals("Duration", unpacker.unpackString());
+                assertEquals(entry.getDuration(), unpacker.unpackLong());
+                ++elementCount;
+                assertEquals("OkSummary", unpacker.unpackString());
+                validateSketch(unpacker);
+                ++elementCount;
+                assertEquals("ErrorSummary", unpacker.unpackString());
+                validateSketch(unpacker);
+                ++elementCount;
+                assertEquals(metricMapSize, elementCount);
+            }
+            validated = true;
         }
-        assertEquals("Hits", unpacker.unpackString());
-        assertEquals(entry.getHitCount(), unpacker.unpackInt());
-        ++elementCount;
-        assertEquals("Errors", unpacker.unpackString());
-        assertEquals(entry.getErrorCount(), unpacker.unpackInt());
-        ++elementCount;
-        assertEquals("TopLevelHits", unpacker.unpackString());
-        assertEquals(entry.getTopLevelCount(), unpacker.unpackInt());
-        ++elementCount;
-        assertEquals("Duration", unpacker.unpackString());
-        assertEquals(entry.getDuration(), unpacker.unpackLong());
-        ++elementCount;
-        assertEquals("OkSummary", unpacker.unpackString());
-        validateSketch(unpacker);
-        ++elementCount;
-        assertEquals("ErrorSummary", unpacker.unpackString());
-        validateSketch(unpacker);
-        ++elementCount;
-        assertEquals(metricMapSize, elementCount);
-      }
-      validated = true;
-    }
 
-    private void validateSketch(MessageUnpacker unpacker) throws IOException {
-      int length = unpacker.unpackBinaryHeader();
-      assertTrue(length > 0);
-      unpacker.readPayload(length);
-    }
+        private void validateSketch(MessageUnpacker unpacker) throws IOException {
+            int length = unpacker.unpackBinaryHeader();
+            assertTrue(length > 0);
+            unpacker.readPayload(length);
+        }
 
-    boolean validatedInput() {
-      return validated;
+        boolean validatedInput() {
+            return validated;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/SimpleSpan.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/SimpleSpan.java
index 41a2a5a0d14..67990afe65c 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/SimpleSpan.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/SimpleSpan.java
@@ -12,378 +12,378 @@
 
 class SimpleSpan implements CoreSpan<SimpleSpan> {
 
-  private final String serviceName;
-  private final String operationName;
-  private final CharSequence resourceName;
-  private final CharSequence serviceNameSource;
-  private final String type;
-  private final boolean measured;
-  private final boolean topLevel;
-  private final boolean traceRoot;
-  private final boolean error;
-  private final short statusCode;
-  private final long duration;
-  private final long startTime;
-  private final long longRunningVersion;
-  private final Map<Object, Object> tags = new HashMap<>();
-
-  SimpleSpan(
-      String serviceName,
-      String operationName,
-      CharSequence resourceName,
-      String type,
-      boolean measured,
-      boolean topLevel,
-      boolean error,
-      long startTime,
-      long duration,
-      int statusCode) {
-    this(
-        serviceName,
-        operationName,
-        resourceName,
-        type,
-        measured,
-        topLevel,
-        error,
-        startTime,
-        duration,
-        statusCode,
-        false,
-        0,
-        null);
-  }
-
-  SimpleSpan(
-      String serviceName,
-      String operationName,
-      CharSequence resourceName,
-      String type,
-      boolean measured,
-      boolean topLevel,
-      boolean error,
-      long startTime,
-      long duration,
-      int statusCode,
-      boolean traceRoot) {
-    this(
-        serviceName,
-        operationName,
-        resourceName,
-        type,
-        measured,
-        topLevel,
-        error,
-        startTime,
-        duration,
-        statusCode,
-        traceRoot,
-        0,
-        null);
-  }
-
-  SimpleSpan(
-      String serviceName,
-      String operationName,
-      CharSequence resourceName,
-      String type,
-      boolean measured,
-      boolean topLevel,
-      boolean error,
-      long startTime,
-      long duration,
-      int statusCode,
-      boolean traceRoot,
-      long longRunningVersion) {
-    this(
-        serviceName,
-        operationName,
-        resourceName,
-        type,
-        measured,
-        topLevel,
-        error,
-        startTime,
-        duration,
-        statusCode,
-        traceRoot,
-        longRunningVersion,
-        null);
-  }
-
-  SimpleSpan(
-      String serviceName,
-      String operationName,
-      CharSequence resourceName,
-      String type,
-      boolean measured,
-      boolean topLevel,
-      boolean error,
-      long startTime,
-      long duration,
-      int statusCode,
-      boolean traceRoot,
-      long longRunningVersion,
-      CharSequence serviceNameSource) {
-    this.serviceName = serviceName;
-    this.operationName = operationName;
-    this.resourceName = resourceName;
-    this.serviceNameSource = serviceNameSource;
-    this.type = type;
-    this.measured = measured;
-    this.topLevel = topLevel;
-    this.traceRoot = traceRoot;
-    this.error = error;
-    this.startTime = startTime;
-    this.duration = duration;
-    this.statusCode = (short) statusCode;
-    this.longRunningVersion = longRunningVersion;
-  }
-
-  @Override
-  public SimpleSpan getLocalRootSpan() {
-    return this;
-  }
-
-  @Override
-  public String getServiceName() {
-    return serviceName;
-  }
-
-  @Override
-  public CharSequence getServiceNameSource() {
-    return serviceNameSource;
-  }
-
-  @Override
-  public CharSequence getOperationName() {
-    return operationName;
-  }
-
-  @Override
-  public CharSequence getResourceName() {
-    return resourceName;
-  }
-
-  @Override
-  public DDTraceId getTraceId() {
-    return DDTraceId.ZERO;
-  }
-
-  @Override
-  public long getSpanId() {
-    return DDSpanId.ZERO;
-  }
-
-  @Override
-  public long getParentId() {
-    return traceRoot ? DDSpanId.ZERO : 1L;
-  }
-
-  @Override
-  public long getStartTime() {
-    return startTime;
-  }
-
-  @Override
-  public long getDurationNano() {
-    return duration;
-  }
-
-  @Override
-  public int getError() {
-    return error ? 1 : 0;
-  }
-
-  @Override
-  public short getHttpStatusCode() {
-    return statusCode;
-  }
-
-  @Override
-  public CharSequence getOrigin() {
-    return null;
-  }
-
-  @Override
-  public SimpleSpan setMeasured(boolean measured) {
-    return this;
-  }
-
-  @Override
-  public SimpleSpan setErrorMessage(String errorMessage) {
-    return this;
-  }
-
-  @Override
-  public SimpleSpan addThrowable(Throwable error) {
-    return this;
-  }
-
-  @Override
-  public SimpleSpan setTag(String tag, String value) {
-    return setTag(tag, (Object) value);
-  }
-
-  @Override
-  public SimpleSpan setTag(String tag, boolean value) {
-    return setTag(tag, (Object) value);
-  }
-
-  @Override
-  public SimpleSpan setTag(String tag, int value) {
-    return setTag(tag, (Object) value);
-  }
-
-  @Override
-  public SimpleSpan setTag(String tag, long value) {
-    return setTag(tag, (Object) value);
-  }
-
-  @Override
-  public SimpleSpan setTag(String tag, double value) {
-    return setTag(tag, (Object) value);
-  }
-
-  @Override
-  public SimpleSpan setTag(String tag, Number value) {
-    return setTag(tag, (Object) value);
-  }
-
-  @Override
-  public SimpleSpan setTag(String tag, CharSequence value) {
-    return setTag(tag, (Object) value);
-  }
-
-  @Override
-  public SimpleSpan setTag(String tag, Object value) {
-    tags.put(tag, value);
-    return this;
-  }
-
-  @Override
-  public SimpleSpan removeTag(String tag) {
-    tags.remove(tag);
-    return this;
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public <U> U getTag(CharSequence name, U defaultValue) {
-    Object value = tags.get(String.valueOf(name));
-    return value != null ? (U) value : defaultValue;
-  }
-
-  @Override
-  public <U> U getTag(CharSequence name) {
-    return getTag(name, null);
-  }
-
-  @Override
-  public <U> U unsafeGetTag(CharSequence name, U defaultValue) {
-    return getTag(name, defaultValue);
-  }
-
-  @Override
-  public <U> U unsafeGetTag(CharSequence name) {
-    return getTag(name);
-  }
-
-  @Override
-  public boolean hasSamplingPriority() {
-    return false;
-  }
-
-  @Override
-  public boolean isMeasured() {
-    return measured;
-  }
-
-  @Override
-  public boolean isTopLevel() {
-    return topLevel;
-  }
-
-  @Override
-  public boolean isForceKeep() {
-    return false;
-  }
-
-  @Override
-  public boolean isKind(SpanKindFilter filter) {
-    Object kind = unsafeGetTag(Tags.SPAN_KIND);
-    return filter.matches(kind == null ? null : kind.toString());
-  }
-
-  @Override
-  public CharSequence getType() {
-    return type;
-  }
-
-  @Override
-  public void processServiceTags() {}
-
-  @Override
-  public void processTagsAndBaggage(MetadataConsumer consumer) {}
-
-  @Override
-  public SimpleSpan setSamplingPriority(int samplingPriority, int samplingMechanism) {
-    return this;
-  }
-
-  @Override
-  public SimpleSpan setSamplingPriority(
-      int samplingPriority, CharSequence rate, double sampleRate, int samplingMechanism) {
-    return this;
-  }
-
-  @Override
-  public SimpleSpan setSpanSamplingPriority(double rate, int limit) {
-    return this;
-  }
-
-  @Override
-  public SimpleSpan setMetric(CharSequence name, int value) {
-    return this;
-  }
-
-  @Override
-  public SimpleSpan setMetric(CharSequence name, long value) {
-    return this;
-  }
-
-  @Override
-  public SimpleSpan setMetric(CharSequence name, float value) {
-    return this;
-  }
-
-  @Override
-  public SimpleSpan setMetric(CharSequence name, double value) {
-    return this;
-  }
-
-  @Override
-  public SimpleSpan setFlag(CharSequence name, boolean value) {
-    return this;
-  }
-
-  @Override
-  public int samplingPriority() {
-    return 0;
-  }
-
-  @Override
-  public Map<String, Object> getMetaStruct() {
-    return Collections.emptyMap();
-  }
-
-  @Override
-  public SimpleSpan setMetaStruct(String field, Object value) {
-    return this;
-  }
-
-  @Override
-  public int getLongRunningVersion() {
-    return (int) longRunningVersion;
-  }
+    private final String serviceName;
+    private final String operationName;
+    private final CharSequence resourceName;
+    private final CharSequence serviceNameSource;
+    private final String type;
+    private final boolean measured;
+    private final boolean topLevel;
+    private final boolean traceRoot;
+    private final boolean error;
+    private final short statusCode;
+    private final long duration;
+    private final long startTime;
+    private final long longRunningVersion;
+    private final Map<Object, Object> tags = new HashMap<>();
+
+    SimpleSpan(
+            String serviceName,
+            String operationName,
+            CharSequence resourceName,
+            String type,
+            boolean measured,
+            boolean topLevel,
+            boolean error,
+            long startTime,
+            long duration,
+            int statusCode) {
+        this(
+                serviceName,
+                operationName,
+                resourceName,
+                type,
+                measured,
+                topLevel,
+                error,
+                startTime,
+                duration,
+                statusCode,
+                false,
+                0,
+                null);
+    }
+
+    SimpleSpan(
+            String serviceName,
+            String operationName,
+            CharSequence resourceName,
+            String type,
+            boolean measured,
+            boolean topLevel,
+            boolean error,
+            long startTime,
+            long duration,
+            int statusCode,
+            boolean traceRoot) {
+        this(
+                serviceName,
+                operationName,
+                resourceName,
+                type,
+                measured,
+                topLevel,
+                error,
+                startTime,
+                duration,
+                statusCode,
+                traceRoot,
+                0,
+                null);
+    }
+
+    SimpleSpan(
+            String serviceName,
+            String operationName,
+            CharSequence resourceName,
+            String type,
+            boolean measured,
+            boolean topLevel,
+            boolean error,
+            long startTime,
+            long duration,
+            int statusCode,
+            boolean traceRoot,
+            long longRunningVersion) {
+        this(
+                serviceName,
+                operationName,
+                resourceName,
+                type,
+                measured,
+                topLevel,
+                error,
+                startTime,
+                duration,
+                statusCode,
+                traceRoot,
+                longRunningVersion,
+                null);
+    }
+
+    SimpleSpan(
+            String serviceName,
+            String operationName,
+            CharSequence resourceName,
+            String type,
+            boolean measured,
+            boolean topLevel,
+            boolean error,
+            long startTime,
+            long duration,
+            int statusCode,
+            boolean traceRoot,
+            long longRunningVersion,
+            CharSequence serviceNameSource) {
+        this.serviceName = serviceName;
+        this.operationName = operationName;
+        this.resourceName = resourceName;
+        this.serviceNameSource = serviceNameSource;
+        this.type = type;
+        this.measured = measured;
+        this.topLevel = topLevel;
+        this.traceRoot = traceRoot;
+        this.error = error;
+        this.startTime = startTime;
+        this.duration = duration;
+        this.statusCode = (short) statusCode;
+        this.longRunningVersion = longRunningVersion;
+    }
+
+    @Override
+    public SimpleSpan getLocalRootSpan() {
+        return this;
+    }
+
+    @Override
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    @Override
+    public CharSequence getServiceNameSource() {
+        return serviceNameSource;
+    }
+
+    @Override
+    public CharSequence getOperationName() {
+        return operationName;
+    }
+
+    @Override
+    public CharSequence getResourceName() {
+        return resourceName;
+    }
+
+    @Override
+    public DDTraceId getTraceId() {
+        return DDTraceId.ZERO;
+    }
+
+    @Override
+    public long getSpanId() {
+        return DDSpanId.ZERO;
+    }
+
+    @Override
+    public long getParentId() {
+        return traceRoot ? DDSpanId.ZERO : 1L;
+    }
+
+    @Override
+    public long getStartTime() {
+        return startTime;
+    }
+
+    @Override
+    public long getDurationNano() {
+        return duration;
+    }
+
+    @Override
+    public int getError() {
+        return error ? 1 : 0;
+    }
+
+    @Override
+    public short getHttpStatusCode() {
+        return statusCode;
+    }
+
+    @Override
+    public CharSequence getOrigin() {
+        return null;
+    }
+
+    @Override
+    public SimpleSpan setMeasured(boolean measured) {
+        return this;
+    }
+
+    @Override
+    public SimpleSpan setErrorMessage(String errorMessage) {
+        return this;
+    }
+
+    @Override
+    public SimpleSpan addThrowable(Throwable error) {
+        return this;
+    }
+
+    @Override
+    public SimpleSpan setTag(String tag, String value) {
+        return setTag(tag, (Object) value);
+    }
+
+    @Override
+    public SimpleSpan setTag(String tag, boolean value) {
+        return setTag(tag, (Object) value);
+    }
+
+    @Override
+    public SimpleSpan setTag(String tag, int value) {
+        return setTag(tag, (Object) value);
+    }
+
+    @Override
+    public SimpleSpan setTag(String tag, long value) {
+        return setTag(tag, (Object) value);
+    }
+
+    @Override
+    public SimpleSpan setTag(String tag, double value) {
+        return setTag(tag, (Object) value);
+    }
+
+    @Override
+    public SimpleSpan setTag(String tag, Number value) {
+        return setTag(tag, (Object) value);
+    }
+
+    @Override
+    public SimpleSpan setTag(String tag, CharSequence value) {
+        return setTag(tag, (Object) value);
+    }
+
+    @Override
+    public SimpleSpan setTag(String tag, Object value) {
+        tags.put(tag, value);
+        return this;
+    }
+
+    @Override
+    public SimpleSpan removeTag(String tag) {
+        tags.remove(tag);
+        return this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <U> U getTag(CharSequence name, U defaultValue) {
+        Object value = tags.get(String.valueOf(name));
+        return value != null ? (U) value : defaultValue;
+    }
+
+    @Override
+    public <U> U getTag(CharSequence name) {
+        return getTag(name, null);
+    }
+
+    @Override
+    public <U> U unsafeGetTag(CharSequence name, U defaultValue) {
+        return getTag(name, defaultValue);
+    }
+
+    @Override
+    public <U> U unsafeGetTag(CharSequence name) {
+        return getTag(name);
+    }
+
+    @Override
+    public boolean hasSamplingPriority() {
+        return false;
+    }
+
+    @Override
+    public boolean isMeasured() {
+        return measured;
+    }
+
+    @Override
+    public boolean isTopLevel() {
+        return topLevel;
+    }
+
+    @Override
+    public boolean isForceKeep() {
+        return false;
+    }
+
+    @Override
+    public boolean isKind(SpanKindFilter filter) {
+        Object kind = unsafeGetTag(Tags.SPAN_KIND);
+        return filter.matches(kind == null ? null : kind.toString());
+    }
+
+    @Override
+    public CharSequence getType() {
+        return type;
+    }
+
+    @Override
+    public void processServiceTags() {}
+
+    @Override
+    public void processTagsAndBaggage(MetadataConsumer consumer) {}
+
+    @Override
+    public SimpleSpan setSamplingPriority(int samplingPriority, int samplingMechanism) {
+        return this;
+    }
+
+    @Override
+    public SimpleSpan setSamplingPriority(
+            int samplingPriority, CharSequence rate, double sampleRate, int samplingMechanism) {
+        return this;
+    }
+
+    @Override
+    public SimpleSpan setSpanSamplingPriority(double rate, int limit) {
+        return this;
+    }
+
+    @Override
+    public SimpleSpan setMetric(CharSequence name, int value) {
+        return this;
+    }
+
+    @Override
+    public SimpleSpan setMetric(CharSequence name, long value) {
+        return this;
+    }
+
+    @Override
+    public SimpleSpan setMetric(CharSequence name, float value) {
+        return this;
+    }
+
+    @Override
+    public SimpleSpan setMetric(CharSequence name, double value) {
+        return this;
+    }
+
+    @Override
+    public SimpleSpan setFlag(CharSequence name, boolean value) {
+        return this;
+    }
+
+    @Override
+    public int samplingPriority() {
+        return 0;
+    }
+
+    @Override
+    public Map<String, Object> getMetaStruct() {
+        return Collections.emptyMap();
+    }
+
+    @Override
+    public SimpleSpan setMetaStruct(String field, Object value) {
+        return this;
+    }
+
+    @Override
+    public int getLongRunningVersion() {
+        return (int) longRunningVersion;
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/AIGuardSamplingTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/AIGuardSamplingTest.java
index 4240ebc604c..4ef2ae916ae 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/AIGuardSamplingTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/AIGuardSamplingTest.java
@@ -20,95 +20,95 @@
 /** Verifies that AI Guard traces are kept regardless of APM/ASM configuration. */
 public class AIGuardSamplingTest extends DDCoreJavaSpecification {
 
-  private ListWriter writer;
-  private CoreTracer tracer;
+    private ListWriter writer;
+    private CoreTracer tracer;
 
-  @BeforeEach
-  void setUp() {
-    writer = new ListWriter();
-    tracer = tracerBuilder().writer(writer).build();
-  }
+    @BeforeEach
+    void setUp() {
+        writer = new ListWriter();
+        tracer = tracerBuilder().writer(writer).build();
+    }
 
-  @Test
-  void aiGuardTraceIsKeptWhenApmEnabled() throws Exception {
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation").start();
-    span.setTag(Tags.AI_GUARD_KEEP, true);
-    span.setTag(Tags.AI_GUARD_EVENT, true);
-    span.setTag(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.AI_GUARD);
-    span.finish();
-    writer.waitForTraces(1);
-    assertEquals(USER_KEEP, (int) span.getSamplingPriority());
-    assertDecisionMakerIsAiGuard(span);
-  }
+    @Test
+    void aiGuardTraceIsKeptWhenApmEnabled() throws Exception {
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation").start();
+        span.setTag(Tags.AI_GUARD_KEEP, true);
+        span.setTag(Tags.AI_GUARD_EVENT, true);
+        span.setTag(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.AI_GUARD);
+        span.finish();
+        writer.waitForTraces(1);
+        assertEquals(USER_KEEP, (int) span.getSamplingPriority());
+        assertDecisionMakerIsAiGuard(span);
+    }
 
-  @Test
-  @WithConfig(key = APM_TRACING_ENABLED, value = "false")
-  void aiGuardTraceIsKeptWhenApmAndAsmDisabled() throws Exception {
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation").start();
-    span.setTag(Tags.AI_GUARD_KEEP, true);
-    span.setTag(Tags.AI_GUARD_EVENT, true);
-    span.setTag(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.AI_GUARD);
-    span.finish();
-    writer.waitForTraces(1);
-    assertEquals(USER_KEEP, (int) span.getSamplingPriority());
-    assertDecisionMakerIsAiGuard(span);
-  }
+    @Test
+    @WithConfig(key = APM_TRACING_ENABLED, value = "false")
+    void aiGuardTraceIsKeptWhenApmAndAsmDisabled() throws Exception {
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation").start();
+        span.setTag(Tags.AI_GUARD_KEEP, true);
+        span.setTag(Tags.AI_GUARD_EVENT, true);
+        span.setTag(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.AI_GUARD);
+        span.finish();
+        writer.waitForTraces(1);
+        assertEquals(USER_KEEP, (int) span.getSamplingPriority());
+        assertDecisionMakerIsAiGuard(span);
+    }
 
-  @Test
-  @WithConfig(key = APM_TRACING_ENABLED, value = "false")
-  @WithConfig(key = APPSEC_ENABLED, value = "true")
-  void aiGuardTraceIsKeptInAsmStandaloneMode() throws Exception {
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation").start();
-    span.setTag(Tags.AI_GUARD_KEEP, true);
-    span.setTag(Tags.AI_GUARD_EVENT, true);
-    span.setTag(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.AI_GUARD);
-    span.finish();
-    writer.waitForTraces(1);
-    assertEquals(USER_KEEP, (int) span.getSamplingPriority());
-    assertDecisionMakerIsAiGuard(span);
-  }
+    @Test
+    @WithConfig(key = APM_TRACING_ENABLED, value = "false")
+    @WithConfig(key = APPSEC_ENABLED, value = "true")
+    void aiGuardTraceIsKeptInAsmStandaloneMode() throws Exception {
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation").start();
+        span.setTag(Tags.AI_GUARD_KEEP, true);
+        span.setTag(Tags.AI_GUARD_EVENT, true);
+        span.setTag(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.AI_GUARD);
+        span.finish();
+        writer.waitForTraces(1);
+        assertEquals(USER_KEEP, (int) span.getSamplingPriority());
+        assertDecisionMakerIsAiGuard(span);
+    }
 
-  /** _dd.p.ts alone (without AI_GUARD_KEEP) must not bypass the sampler. */
-  @Test
-  @WithConfig(key = APM_TRACING_ENABLED, value = "false")
-  @WithConfig(key = APPSEC_ENABLED, value = "true")
-  void propagatedTraceSourceAloneDoesNotBypassSampler() throws Exception {
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "op").start();
-    span.setTag(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.AI_GUARD);
-    span.finish();
-    writer.waitForTraces(1);
+    /** _dd.p.ts alone (without AI_GUARD_KEEP) must not bypass the sampler. */
+    @Test
+    @WithConfig(key = APM_TRACING_ENABLED, value = "false")
+    @WithConfig(key = APPSEC_ENABLED, value = "true")
+    void propagatedTraceSourceAloneDoesNotBypassSampler() throws Exception {
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "op").start();
+        span.setTag(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.AI_GUARD);
+        span.finish();
+        writer.waitForTraces(1);
 
-    // _dd.p.ts alone must not force-keep the trace; only AI_GUARD_KEEP does that.
-    assertNotEquals(USER_KEEP, (int) span.getSamplingPriority());
-  }
+        // _dd.p.ts alone must not force-keep the trace; only AI_GUARD_KEEP does that.
+        assertNotEquals(USER_KEEP, (int) span.getSamplingPriority());
+    }
 
-  /**
-   * AI Guard traces must be kept even when AsmStandaloneSampler has exhausted its rate-limit slot.
-   */
-  @Test
-  @WithConfig(key = APM_TRACING_ENABLED, value = "false")
-  @WithConfig(key = APPSEC_ENABLED, value = "true")
-  void aiGuardTraceIsKeptAfterRateLimitSlotIsExhausted() throws Exception {
-    // consume the first allowed slot
-    DDSpan first = (DDSpan) tracer.buildSpan("datadog", "op").start();
-    first.finish();
-    writer.waitForTraces(1);
+    /**
+     * AI Guard traces must be kept even when AsmStandaloneSampler has exhausted its rate-limit slot.
+     */
+    @Test
+    @WithConfig(key = APM_TRACING_ENABLED, value = "false")
+    @WithConfig(key = APPSEC_ENABLED, value = "true")
+    void aiGuardTraceIsKeptAfterRateLimitSlotIsExhausted() throws Exception {
+        // consume the first allowed slot
+        DDSpan first = (DDSpan) tracer.buildSpan("datadog", "op").start();
+        first.finish();
+        writer.waitForTraces(1);
 
-    // AI Guard trace must still be force-kept even though the rate-limit slot is gone
-    DDSpan aiGuard = (DDSpan) tracer.buildSpan("datadog", "op").start();
-    aiGuard.setTag(Tags.AI_GUARD_KEEP, true);
-    aiGuard.setTag(Tags.AI_GUARD_EVENT, true);
-    aiGuard.setTag(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.AI_GUARD);
-    aiGuard.finish();
-    writer.waitForTraces(2);
+        // AI Guard trace must still be force-kept even though the rate-limit slot is gone
+        DDSpan aiGuard = (DDSpan) tracer.buildSpan("datadog", "op").start();
+        aiGuard.setTag(Tags.AI_GUARD_KEEP, true);
+        aiGuard.setTag(Tags.AI_GUARD_EVENT, true);
+        aiGuard.setTag(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.AI_GUARD);
+        aiGuard.finish();
+        writer.waitForTraces(2);
 
-    assertEquals(USER_KEEP, (int) aiGuard.getSamplingPriority());
-    assertDecisionMakerIsAiGuard(aiGuard);
-  }
+        assertEquals(USER_KEEP, (int) aiGuard.getSamplingPriority());
+        assertDecisionMakerIsAiGuard(aiGuard);
+    }
 
-  private static void assertDecisionMakerIsAiGuard(DDSpan span) {
-    Map<String, String> ptags = span.spanContext().getPropagationTags().createTagMap();
-    assertEquals("-13", ptags.get("_dd.p.dm"), "_dd.p.dm must be -13 (AI Guard decision maker)");
-    assertEquals("20", ptags.get("_dd.p.ts"), "_dd.p.ts must have AI Guard bit set (0x20)");
-  }
+    private static void assertDecisionMakerIsAiGuard(DDSpan span) {
+        Map<String, String> ptags = span.spanContext().getPropagationTags().createTagMap();
+        assertEquals("-13", ptags.get("_dd.p.dm"), "_dd.p.dm must be -13 (AI Guard decision maker)");
+        assertEquals("20", ptags.get("_dd.p.ts"), "_dd.p.ts must have AI Guard bit set (0x20)");
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/AllSamplerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/AllSamplerTest.java
index 41bc5921483..b2362f8da40 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/AllSamplerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/AllSamplerTest.java
@@ -8,13 +8,13 @@
 
 class AllSamplerTest {
 
-  private final DDSpan span = mock(DDSpan.class);
-  private final AllSampler sampler = new AllSampler();
+    private final DDSpan span = mock(DDSpan.class);
+    private final AllSampler sampler = new AllSampler();
 
-  @Test
-  void testAllSampler() {
-    for (int i = 0; i < 500; i++) {
-      assertTrue(sampler.sample(span));
+    @Test
+    void testAllSampler() {
+        for (int i = 0; i < 500; i++) {
+            assertTrue(sampler.sample(span));
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/AsmStandaloneSamplerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/AsmStandaloneSamplerTest.java
index a9a30e8ec29..2234d28fe29 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/AsmStandaloneSamplerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/AsmStandaloneSamplerTest.java
@@ -17,47 +17,47 @@
 
 class AsmStandaloneSamplerTest extends DDCoreJavaSpecification {
 
-  private final ListWriter writer = new ListWriter();
-
-  @Test
-  void testSetSamplingPriority() {
-    AtomicLong current = new AtomicLong(System.currentTimeMillis());
-    Clock clock = mock(Clock.class);
-    when(clock.millis()).thenAnswer(inv -> current.get());
-    AsmStandaloneSampler sampler = new AsmStandaloneSampler(clock);
-    CoreTracer tracer = tracerBuilder().writer(writer).sampler(sampler).build();
-
-    try {
-      doAnswer(inv -> current.updateAndGet(value -> value + 1000))
-          .when(clock)
-          .millis(); // increment in one second
-      DDSpan span1 = (DDSpan) tracer.buildSpan("datadog", "test").start();
-      sampler.setSamplingPriority(span1);
-
-      assertEquals(PrioritySampling.SAMPLER_KEEP, span1.getSamplingPriority());
-
-      clearInvocations(clock);
-
-      doAnswer(inv -> current.updateAndGet(value -> value + 1000))
-          .when(clock)
-          .millis(); // increment in one second
-      DDSpan span2 = (DDSpan) tracer.buildSpan("datadog", "test2").start();
-      sampler.setSamplingPriority(span2);
-
-      assertEquals(PrioritySampling.SAMPLER_DROP, span2.getSamplingPriority());
-
-      clearInvocations(clock);
-
-      doAnswer(inv -> current.updateAndGet(value -> value + 60000))
-          .when(clock)
-          .millis(); // increment in one minute
-      DDSpan span3 = (DDSpan) tracer.buildSpan("datadog", "test3").start();
-      sampler.setSamplingPriority(span3);
-
-      // Mock one minute later
-      assertEquals(PrioritySampling.SAMPLER_KEEP, span3.getSamplingPriority());
-    } finally {
-      tracer.close();
+    private final ListWriter writer = new ListWriter();
+
+    @Test
+    void testSetSamplingPriority() {
+        AtomicLong current = new AtomicLong(System.currentTimeMillis());
+        Clock clock = mock(Clock.class);
+        when(clock.millis()).thenAnswer(inv -> current.get());
+        AsmStandaloneSampler sampler = new AsmStandaloneSampler(clock);
+        CoreTracer tracer = tracerBuilder().writer(writer).sampler(sampler).build();
+
+        try {
+            doAnswer(inv -> current.updateAndGet(value -> value + 1000))
+                    .when(clock)
+                    .millis(); // increment in one second
+            DDSpan span1 = (DDSpan) tracer.buildSpan("datadog", "test").start();
+            sampler.setSamplingPriority(span1);
+
+            assertEquals(PrioritySampling.SAMPLER_KEEP, span1.getSamplingPriority());
+
+            clearInvocations(clock);
+
+            doAnswer(inv -> current.updateAndGet(value -> value + 1000))
+                    .when(clock)
+                    .millis(); // increment in one second
+            DDSpan span2 = (DDSpan) tracer.buildSpan("datadog", "test2").start();
+            sampler.setSamplingPriority(span2);
+
+            assertEquals(PrioritySampling.SAMPLER_DROP, span2.getSamplingPriority());
+
+            clearInvocations(clock);
+
+            doAnswer(inv -> current.updateAndGet(value -> value + 60000))
+                    .when(clock)
+                    .millis(); // increment in one minute
+            DDSpan span3 = (DDSpan) tracer.buildSpan("datadog", "test3").start();
+            sampler.setSamplingPriority(span3);
+
+            // Mock one minute later
+            assertEquals(PrioritySampling.SAMPLER_KEEP, span3.getSamplingPriority());
+        } finally {
+            tracer.close();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/DeterministicSpanSamplerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/DeterministicSpanSamplerTest.java
index b6cf5d5a817..ad6931e4aaf 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/DeterministicSpanSamplerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/DeterministicSpanSamplerTest.java
@@ -15,355 +15,354 @@
 
 class DeterministicSpanSamplerTest {
 
-  @TableTest({
-    "scenario                   | expected | spanId              ",
-    "10428415896243638596 false | false    | 10428415896243638596",
-    "11199607447739267382 false | false    | 11199607447739267382",
-    "11273630029763932141 false | false    | 11273630029763932141",
-    "11407674492757219439 false | false    | 11407674492757219439",
-    "11792151447964398879 false | false    | 11792151447964398879",
-    "12432680895096110463 false | false    | 12432680895096110463",
-    "13126262220165910460 false | false    | 13126262220165910460",
-    "13174268766980400525 false | false    | 13174268766980400525",
-    "15505210698284655633 false | false    | 15505210698284655633",
-    "15649472107743074779 false | false    | 15649472107743074779",
-    "17204678798284737396 false | false    | 17204678798284737396",
-    "17344948852394588913 false | false    | 17344948852394588913",
-    "17496662575514578077 false | false    | 17496662575514578077",
-    "18252401681137062077 false | false    | 18252401681137062077",
-    "18317291550776694829 false | false    | 18317291550776694829",
-    "1874068156324778273 false  | false    | 1874068156324778273 ",
-    "1905388747193831650 false  | false    | 1905388747193831650 ",
-    "2202916659517317514 false  | false    | 2202916659517317514 ",
-    "2227583514184312746 false  | false    | 2227583514184312746 ",
-    "2338498362660772719 false  | false    | 2338498362660772719 ",
-    "2781055864473387780 false  | false    | 2781055864473387780 ",
-    "3328451335138149956 false  | false    | 3328451335138149956 ",
-    "3337066551442961397 false  | false    | 3337066551442961397 ",
-    "3409814636252858217 false  | false    | 3409814636252858217 ",
-    "3510942875414458836 false  | false    | 3510942875414458836 ",
-    "3784560248718450071 false  | false    | 3784560248718450071 ",
-    "4751997750760398084 false  | false    | 4751997750760398084 ",
-    "4831389563158288344 false  | false    | 4831389563158288344 ",
-    "4990765271833742716 false  | false    | 4990765271833742716 ",
-    "5089134323978233018 false  | false    | 5089134323978233018 ",
-    "5199948958991797301 false  | false    | 5199948958991797301 ",
-    "5577006791947779410 false  | false    | 5577006791947779410 ",
-    "5600924393587988459 false  | false    | 5600924393587988459 ",
-    "5793183108815074904 false  | false    | 5793183108815074904 ",
-    "6263450610539110790 false  | false    | 6263450610539110790 ",
-    "6382800227808658932 false  | false    | 6382800227808658932 ",
-    "6651414131918424343 false  | false    | 6651414131918424343 ",
-    "6842348953158377901 false  | false    | 6842348953158377901 ",
-    "6941261091797652072 false  | false    | 6941261091797652072 ",
-    "7273596521315663110 false  | false    | 7273596521315663110 ",
-    "7504504064263669287 false  | false    | 7504504064263669287 ",
-    "788787457839692041 false   | false    | 788787457839692041  ",
-    "7955079406183515637 false  | false    | 7955079406183515637 ",
-    "8549944162621642512 false  | false    | 8549944162621642512 ",
-    "8603989663476771718 false  | false    | 8603989663476771718 ",
-    "8807817071862113702 false  | false    | 8807817071862113702 ",
-    "9010467728050264449 false  | false    | 9010467728050264449 ",
-    "10667007354186551956 true  | true     | 10667007354186551956",
-    "10683692646452562431 true  | true     | 10683692646452562431",
-    "10821471013040158923 true  | true     | 10821471013040158923",
-    "10950412492527322440 true  | true     | 10950412492527322440",
-    "11239168150708129139 true  | true     | 11239168150708129139",
-    "1169089424364679180 true   | true     | 1169089424364679180 ",
-    "11818186001859264308 true  | true     | 11818186001859264308",
-    "11833901312327420776 true  | true     | 11833901312327420776",
-    "11926759511765359899 true  | true     | 11926759511765359899",
-    "11926873763676642186 true  | true     | 11926873763676642186",
-    "11963748953446345529 true  | true     | 11963748953446345529",
-    "11998794077335055257 true  | true     | 11998794077335055257",
-    "12096659438561119542 true  | true     | 12096659438561119542",
-    "12156940908066221323 true  | true     | 12156940908066221323",
-    "12947799971452915849 true  | true     | 12947799971452915849",
-    "13260572831089785859 true  | true     | 13260572831089785859",
-    "13771804148684671731 true  | true     | 13771804148684671731",
-    "14117161486975057715 true  | true     | 14117161486975057715",
-    "14242321332569825828 true  | true     | 14242321332569825828",
-    "14486903973548550719 true  | true     | 14486903973548550719",
-    "14967026985784794439 true  | true     | 14967026985784794439",
-    "15213854965919594827 true  | true     | 15213854965919594827",
-    "15352856648520921629 true  | true     | 15352856648520921629",
-    "15399114114227588261 true  | true     | 15399114114227588261",
-    "15595235597337683065 true  | true     | 15595235597337683065",
-    "16194613440650274502 true  | true     | 16194613440650274502",
-    "1687184559264975024 true   | true     | 1687184559264975024 ",
-    "17490665426807838719 true  | true     | 17490665426807838719",
-    "18218388313430417611 true  | true     | 18218388313430417611",
-    "2601737961087659062 true   | true     | 2601737961087659062 ",
-    "261049867304784443 true    | true     | 261049867304784443  ",
-    "2740103009342231109 true   | true     | 2740103009342231109 ",
-    "2970700287221458280 true   | true     | 2970700287221458280 ",
-    "3916589616287113937 true   | true     | 3916589616287113937 ",
-    "4324745483838182873 true   | true     | 4324745483838182873 ",
-    "4937104021912138218 true   | true     | 4937104021912138218 ",
-    "5486140987150761883 true   | true     | 5486140987150761883 ",
-    "5944830206637008055 true   | true     | 5944830206637008055 ",
-    "6296367092202729479 true   | true     | 6296367092202729479 ",
-    "6334824724549167320 true   | true     | 6334824724549167320 ",
-    "6556961545928831643 true   | true     | 6556961545928831643 ",
-    "6735196588112087610 true   | true     | 6735196588112087610 ",
-    "7388428680384065704 true   | true     | 7388428680384065704 ",
-    "8249030965139585917 true   | true     | 8249030965139585917 ",
-    "837825985403119657 true    | true     | 837825985403119657  ",
-    "8505906760983331750 true   | true     | 8505906760983331750 ",
-    "8674665223082153551 true   | true     | 8674665223082153551 ",
-    "894385949183117216 true    | true     | 894385949183117216  ",
-    "898860202204764712 true    | true     | 898860202204764712  ",
-    "9768663798983814715 true   | true     | 9768663798983814715 ",
-    "9828766684487745566 true   | true     | 9828766684487745566 ",
-    "9908585559158765387 true   | true     | 9908585559158765387 ",
-    "9956202364908137547 true   | true     | 9956202364908137547 "
-  })
-  void testKnownValues(boolean expected, @ConvertWith(UnsignedLongConverter.class) long spanId) {
-    DeterministicSampler sampler = new DeterministicSampler.SpanSampler(0.5);
-    DDSpan span = mock(DDSpan.class);
-    when(span.getSpanId()).thenReturn(spanId);
+    @TableTest({
+      "scenario                   | expected | spanId              ",
+      "10428415896243638596 false | false    | 10428415896243638596",
+      "11199607447739267382 false | false    | 11199607447739267382",
+      "11273630029763932141 false | false    | 11273630029763932141",
+      "11407674492757219439 false | false    | 11407674492757219439",
+      "11792151447964398879 false | false    | 11792151447964398879",
+      "12432680895096110463 false | false    | 12432680895096110463",
+      "13126262220165910460 false | false    | 13126262220165910460",
+      "13174268766980400525 false | false    | 13174268766980400525",
+      "15505210698284655633 false | false    | 15505210698284655633",
+      "15649472107743074779 false | false    | 15649472107743074779",
+      "17204678798284737396 false | false    | 17204678798284737396",
+      "17344948852394588913 false | false    | 17344948852394588913",
+      "17496662575514578077 false | false    | 17496662575514578077",
+      "18252401681137062077 false | false    | 18252401681137062077",
+      "18317291550776694829 false | false    | 18317291550776694829",
+      "1874068156324778273 false  | false    | 1874068156324778273 ",
+      "1905388747193831650 false  | false    | 1905388747193831650 ",
+      "2202916659517317514 false  | false    | 2202916659517317514 ",
+      "2227583514184312746 false  | false    | 2227583514184312746 ",
+      "2338498362660772719 false  | false    | 2338498362660772719 ",
+      "2781055864473387780 false  | false    | 2781055864473387780 ",
+      "3328451335138149956 false  | false    | 3328451335138149956 ",
+      "3337066551442961397 false  | false    | 3337066551442961397 ",
+      "3409814636252858217 false  | false    | 3409814636252858217 ",
+      "3510942875414458836 false  | false    | 3510942875414458836 ",
+      "3784560248718450071 false  | false    | 3784560248718450071 ",
+      "4751997750760398084 false  | false    | 4751997750760398084 ",
+      "4831389563158288344 false  | false    | 4831389563158288344 ",
+      "4990765271833742716 false  | false    | 4990765271833742716 ",
+      "5089134323978233018 false  | false    | 5089134323978233018 ",
+      "5199948958991797301 false  | false    | 5199948958991797301 ",
+      "5577006791947779410 false  | false    | 5577006791947779410 ",
+      "5600924393587988459 false  | false    | 5600924393587988459 ",
+      "5793183108815074904 false  | false    | 5793183108815074904 ",
+      "6263450610539110790 false  | false    | 6263450610539110790 ",
+      "6382800227808658932 false  | false    | 6382800227808658932 ",
+      "6651414131918424343 false  | false    | 6651414131918424343 ",
+      "6842348953158377901 false  | false    | 6842348953158377901 ",
+      "6941261091797652072 false  | false    | 6941261091797652072 ",
+      "7273596521315663110 false  | false    | 7273596521315663110 ",
+      "7504504064263669287 false  | false    | 7504504064263669287 ",
+      "788787457839692041 false   | false    | 788787457839692041  ",
+      "7955079406183515637 false  | false    | 7955079406183515637 ",
+      "8549944162621642512 false  | false    | 8549944162621642512 ",
+      "8603989663476771718 false  | false    | 8603989663476771718 ",
+      "8807817071862113702 false  | false    | 8807817071862113702 ",
+      "9010467728050264449 false  | false    | 9010467728050264449 ",
+      "10667007354186551956 true  | true     | 10667007354186551956",
+      "10683692646452562431 true  | true     | 10683692646452562431",
+      "10821471013040158923 true  | true     | 10821471013040158923",
+      "10950412492527322440 true  | true     | 10950412492527322440",
+      "11239168150708129139 true  | true     | 11239168150708129139",
+      "1169089424364679180 true   | true     | 1169089424364679180 ",
+      "11818186001859264308 true  | true     | 11818186001859264308",
+      "11833901312327420776 true  | true     | 11833901312327420776",
+      "11926759511765359899 true  | true     | 11926759511765359899",
+      "11926873763676642186 true  | true     | 11926873763676642186",
+      "11963748953446345529 true  | true     | 11963748953446345529",
+      "11998794077335055257 true  | true     | 11998794077335055257",
+      "12096659438561119542 true  | true     | 12096659438561119542",
+      "12156940908066221323 true  | true     | 12156940908066221323",
+      "12947799971452915849 true  | true     | 12947799971452915849",
+      "13260572831089785859 true  | true     | 13260572831089785859",
+      "13771804148684671731 true  | true     | 13771804148684671731",
+      "14117161486975057715 true  | true     | 14117161486975057715",
+      "14242321332569825828 true  | true     | 14242321332569825828",
+      "14486903973548550719 true  | true     | 14486903973548550719",
+      "14967026985784794439 true  | true     | 14967026985784794439",
+      "15213854965919594827 true  | true     | 15213854965919594827",
+      "15352856648520921629 true  | true     | 15352856648520921629",
+      "15399114114227588261 true  | true     | 15399114114227588261",
+      "15595235597337683065 true  | true     | 15595235597337683065",
+      "16194613440650274502 true  | true     | 16194613440650274502",
+      "1687184559264975024 true   | true     | 1687184559264975024 ",
+      "17490665426807838719 true  | true     | 17490665426807838719",
+      "18218388313430417611 true  | true     | 18218388313430417611",
+      "2601737961087659062 true   | true     | 2601737961087659062 ",
+      "261049867304784443 true    | true     | 261049867304784443  ",
+      "2740103009342231109 true   | true     | 2740103009342231109 ",
+      "2970700287221458280 true   | true     | 2970700287221458280 ",
+      "3916589616287113937 true   | true     | 3916589616287113937 ",
+      "4324745483838182873 true   | true     | 4324745483838182873 ",
+      "4937104021912138218 true   | true     | 4937104021912138218 ",
+      "5486140987150761883 true   | true     | 5486140987150761883 ",
+      "5944830206637008055 true   | true     | 5944830206637008055 ",
+      "6296367092202729479 true   | true     | 6296367092202729479 ",
+      "6334824724549167320 true   | true     | 6334824724549167320 ",
+      "6556961545928831643 true   | true     | 6556961545928831643 ",
+      "6735196588112087610 true   | true     | 6735196588112087610 ",
+      "7388428680384065704 true   | true     | 7388428680384065704 ",
+      "8249030965139585917 true   | true     | 8249030965139585917 ",
+      "837825985403119657 true    | true     | 837825985403119657  ",
+      "8505906760983331750 true   | true     | 8505906760983331750 ",
+      "8674665223082153551 true   | true     | 8674665223082153551 ",
+      "894385949183117216 true    | true     | 894385949183117216  ",
+      "898860202204764712 true    | true     | 898860202204764712  ",
+      "9768663798983814715 true   | true     | 9768663798983814715 ",
+      "9828766684487745566 true   | true     | 9828766684487745566 ",
+      "9908585559158765387 true   | true     | 9908585559158765387 ",
+      "9956202364908137547 true   | true     | 9956202364908137547 "
+    })
+    void testKnownValues(boolean expected, @ConvertWith(UnsignedLongConverter.class) long spanId) {
+        DeterministicSampler sampler = new DeterministicSampler.SpanSampler(0.5);
+        DDSpan span = mock(DDSpan.class);
+        when(span.getSpanId()).thenReturn(spanId);
 
-    boolean sampled = sampler.sample(span);
+        boolean sampled = sampler.sample(span);
 
-    assertEquals(expected, sampled);
-  }
+        assertEquals(expected, sampled);
+    }
 
-  // These values are repeated from the "known values test"
-  // It is an arbitrary subset of all possible spanIds
-  @TableTest({
-    "scenario             | spanId              ",
-    "10428415896243638596 | 10428415896243638596",
-    "11199607447739267382 | 11199607447739267382",
-    "11273630029763932141 | 11273630029763932141",
-    "11407674492757219439 | 11407674492757219439",
-    "11792151447964398879 | 11792151447964398879",
-    "12432680895096110463 | 12432680895096110463",
-    "13126262220165910460 | 13126262220165910460",
-    "13174268766980400525 | 13174268766980400525",
-    "15505210698284655633 | 15505210698284655633",
-    "15649472107743074779 | 15649472107743074779",
-    "17204678798284737396 | 17204678798284737396",
-    "17344948852394588913 | 17344948852394588913",
-    "17496662575514578077 | 17496662575514578077",
-    "18252401681137062077 | 18252401681137062077",
-    "18317291550776694829 | 18317291550776694829",
-    "1874068156324778273  | 1874068156324778273 ",
-    "1905388747193831650  | 1905388747193831650 ",
-    "2202916659517317514  | 2202916659517317514 ",
-    "2227583514184312746  | 2227583514184312746 ",
-    "2338498362660772719  | 2338498362660772719 ",
-    "2781055864473387780  | 2781055864473387780 ",
-    "3328451335138149956  | 3328451335138149956 ",
-    "3337066551442961397  | 3337066551442961397 ",
-    "3409814636252858217  | 3409814636252858217 ",
-    "3510942875414458836  | 3510942875414458836 ",
-    "3784560248718450071  | 3784560248718450071 ",
-    "4751997750760398084  | 4751997750760398084 ",
-    "4831389563158288344  | 4831389563158288344 ",
-    "4990765271833742716  | 4990765271833742716 ",
-    "5089134323978233018  | 5089134323978233018 ",
-    "5199948958991797301  | 5199948958991797301 ",
-    "5577006791947779410  | 5577006791947779410 ",
-    "5600924393587988459  | 5600924393587988459 ",
-    "5793183108815074904  | 5793183108815074904 ",
-    "6263450610539110790  | 6263450610539110790 ",
-    "6382800227808658932  | 6382800227808658932 ",
-    "6651414131918424343  | 6651414131918424343 ",
-    "6842348953158377901  | 6842348953158377901 ",
-    "6941261091797652072  | 6941261091797652072 ",
-    "7273596521315663110  | 7273596521315663110 ",
-    "7504504064263669287  | 7504504064263669287 ",
-    "788787457839692041   | 788787457839692041  ",
-    "7955079406183515637  | 7955079406183515637 ",
-    "8549944162621642512  | 8549944162621642512 ",
-    "8603989663476771718  | 8603989663476771718 ",
-    "8807817071862113702  | 8807817071862113702 ",
-    "9010467728050264449  | 9010467728050264449 ",
-    "10667007354186551956 | 10667007354186551956",
-    "10683692646452562431 | 10683692646452562431",
-    "10821471013040158923 | 10821471013040158923",
-    "10950412492527322440 | 10950412492527322440",
-    "11239168150708129139 | 11239168150708129139",
-    "1169089424364679180  | 1169089424364679180 ",
-    "11818186001859264308 | 11818186001859264308",
-    "11833901312327420776 | 11833901312327420776",
-    "11926759511765359899 | 11926759511765359899",
-    "11926873763676642186 | 11926873763676642186",
-    "11963748953446345529 | 11963748953446345529",
-    "11998794077335055257 | 11998794077335055257",
-    "12096659438561119542 | 12096659438561119542",
-    "12156940908066221323 | 12156940908066221323",
-    "12947799971452915849 | 12947799971452915849",
-    "13260572831089785859 | 13260572831089785859",
-    "13771804148684671731 | 13771804148684671731",
-    "14117161486975057715 | 14117161486975057715",
-    "14242321332569825828 | 14242321332569825828",
-    "14486903973548550719 | 14486903973548550719",
-    "14967026985784794439 | 14967026985784794439",
-    "15213854965919594827 | 15213854965919594827",
-    "15352856648520921629 | 15352856648520921629",
-    "15399114114227588261 | 15399114114227588261",
-    "15595235597337683065 | 15595235597337683065",
-    "16194613440650274502 | 16194613440650274502",
-    "1687184559264975024  | 1687184559264975024 ",
-    "17490665426807838719 | 17490665426807838719",
-    "18218388313430417611 | 18218388313430417611",
-    "2601737961087659062  | 2601737961087659062 ",
-    "261049867304784443   | 261049867304784443  ",
-    "2740103009342231109  | 2740103009342231109 ",
-    "2970700287221458280  | 2970700287221458280 ",
-    "3916589616287113937  | 3916589616287113937 ",
-    "4324745483838182873  | 4324745483838182873 ",
-    "4937104021912138218  | 4937104021912138218 ",
-    "5486140987150761883  | 5486140987150761883 ",
-    "5944830206637008055  | 5944830206637008055 ",
-    "6296367092202729479  | 6296367092202729479 ",
-    "6334824724549167320  | 6334824724549167320 ",
-    "6556961545928831643  | 6556961545928831643 ",
-    "6735196588112087610  | 6735196588112087610 ",
-    "7388428680384065704  | 7388428680384065704 ",
-    "8249030965139585917  | 8249030965139585917 ",
-    "837825985403119657   | 837825985403119657  ",
-    "8505906760983331750  | 8505906760983331750 ",
-    "8674665223082153551  | 8674665223082153551 ",
-    "894385949183117216   | 894385949183117216  ",
-    "898860202204764712   | 898860202204764712  ",
-    "9768663798983814715  | 9768663798983814715 ",
-    "9828766684487745566  | 9828766684487745566 ",
-    "9908585559158765387  | 9908585559158765387 ",
-    "9956202364908137547  | 9956202364908137547 "
-  })
-  void testSamplingNone(@ConvertWith(UnsignedLongConverter.class) long spanId) {
-    DeterministicSampler sampler = new DeterministicSampler.SpanSampler(0);
-    DDSpan span = mock(DDSpan.class);
-    when(span.getSpanId()).thenReturn(spanId);
+    // These values are repeated from the "known values test"
+    // It is an arbitrary subset of all possible spanIds
+    @TableTest({
+      "scenario             | spanId              ",
+      "10428415896243638596 | 10428415896243638596",
+      "11199607447739267382 | 11199607447739267382",
+      "11273630029763932141 | 11273630029763932141",
+      "11407674492757219439 | 11407674492757219439",
+      "11792151447964398879 | 11792151447964398879",
+      "12432680895096110463 | 12432680895096110463",
+      "13126262220165910460 | 13126262220165910460",
+      "13174268766980400525 | 13174268766980400525",
+      "15505210698284655633 | 15505210698284655633",
+      "15649472107743074779 | 15649472107743074779",
+      "17204678798284737396 | 17204678798284737396",
+      "17344948852394588913 | 17344948852394588913",
+      "17496662575514578077 | 17496662575514578077",
+      "18252401681137062077 | 18252401681137062077",
+      "18317291550776694829 | 18317291550776694829",
+      "1874068156324778273  | 1874068156324778273 ",
+      "1905388747193831650  | 1905388747193831650 ",
+      "2202916659517317514  | 2202916659517317514 ",
+      "2227583514184312746  | 2227583514184312746 ",
+      "2338498362660772719  | 2338498362660772719 ",
+      "2781055864473387780  | 2781055864473387780 ",
+      "3328451335138149956  | 3328451335138149956 ",
+      "3337066551442961397  | 3337066551442961397 ",
+      "3409814636252858217  | 3409814636252858217 ",
+      "3510942875414458836  | 3510942875414458836 ",
+      "3784560248718450071  | 3784560248718450071 ",
+      "4751997750760398084  | 4751997750760398084 ",
+      "4831389563158288344  | 4831389563158288344 ",
+      "4990765271833742716  | 4990765271833742716 ",
+      "5089134323978233018  | 5089134323978233018 ",
+      "5199948958991797301  | 5199948958991797301 ",
+      "5577006791947779410  | 5577006791947779410 ",
+      "5600924393587988459  | 5600924393587988459 ",
+      "5793183108815074904  | 5793183108815074904 ",
+      "6263450610539110790  | 6263450610539110790 ",
+      "6382800227808658932  | 6382800227808658932 ",
+      "6651414131918424343  | 6651414131918424343 ",
+      "6842348953158377901  | 6842348953158377901 ",
+      "6941261091797652072  | 6941261091797652072 ",
+      "7273596521315663110  | 7273596521315663110 ",
+      "7504504064263669287  | 7504504064263669287 ",
+      "788787457839692041   | 788787457839692041  ",
+      "7955079406183515637  | 7955079406183515637 ",
+      "8549944162621642512  | 8549944162621642512 ",
+      "8603989663476771718  | 8603989663476771718 ",
+      "8807817071862113702  | 8807817071862113702 ",
+      "9010467728050264449  | 9010467728050264449 ",
+      "10667007354186551956 | 10667007354186551956",
+      "10683692646452562431 | 10683692646452562431",
+      "10821471013040158923 | 10821471013040158923",
+      "10950412492527322440 | 10950412492527322440",
+      "11239168150708129139 | 11239168150708129139",
+      "1169089424364679180  | 1169089424364679180 ",
+      "11818186001859264308 | 11818186001859264308",
+      "11833901312327420776 | 11833901312327420776",
+      "11926759511765359899 | 11926759511765359899",
+      "11926873763676642186 | 11926873763676642186",
+      "11963748953446345529 | 11963748953446345529",
+      "11998794077335055257 | 11998794077335055257",
+      "12096659438561119542 | 12096659438561119542",
+      "12156940908066221323 | 12156940908066221323",
+      "12947799971452915849 | 12947799971452915849",
+      "13260572831089785859 | 13260572831089785859",
+      "13771804148684671731 | 13771804148684671731",
+      "14117161486975057715 | 14117161486975057715",
+      "14242321332569825828 | 14242321332569825828",
+      "14486903973548550719 | 14486903973548550719",
+      "14967026985784794439 | 14967026985784794439",
+      "15213854965919594827 | 15213854965919594827",
+      "15352856648520921629 | 15352856648520921629",
+      "15399114114227588261 | 15399114114227588261",
+      "15595235597337683065 | 15595235597337683065",
+      "16194613440650274502 | 16194613440650274502",
+      "1687184559264975024  | 1687184559264975024 ",
+      "17490665426807838719 | 17490665426807838719",
+      "18218388313430417611 | 18218388313430417611",
+      "2601737961087659062  | 2601737961087659062 ",
+      "261049867304784443   | 261049867304784443  ",
+      "2740103009342231109  | 2740103009342231109 ",
+      "2970700287221458280  | 2970700287221458280 ",
+      "3916589616287113937  | 3916589616287113937 ",
+      "4324745483838182873  | 4324745483838182873 ",
+      "4937104021912138218  | 4937104021912138218 ",
+      "5486140987150761883  | 5486140987150761883 ",
+      "5944830206637008055  | 5944830206637008055 ",
+      "6296367092202729479  | 6296367092202729479 ",
+      "6334824724549167320  | 6334824724549167320 ",
+      "6556961545928831643  | 6556961545928831643 ",
+      "6735196588112087610  | 6735196588112087610 ",
+      "7388428680384065704  | 7388428680384065704 ",
+      "8249030965139585917  | 8249030965139585917 ",
+      "837825985403119657   | 837825985403119657  ",
+      "8505906760983331750  | 8505906760983331750 ",
+      "8674665223082153551  | 8674665223082153551 ",
+      "894385949183117216   | 894385949183117216  ",
+      "898860202204764712   | 898860202204764712  ",
+      "9768663798983814715  | 9768663798983814715 ",
+      "9828766684487745566  | 9828766684487745566 ",
+      "9908585559158765387  | 9908585559158765387 ",
+      "9956202364908137547  | 9956202364908137547 "
+    })
+    void testSamplingNone(@ConvertWith(UnsignedLongConverter.class) long spanId) {
+        DeterministicSampler sampler = new DeterministicSampler.SpanSampler(0);
+        DDSpan span = mock(DDSpan.class);
+        when(span.getSpanId()).thenReturn(spanId);
 
-    assertFalse(sampler.sample(span));
-  }
+        assertFalse(sampler.sample(span));
+    }
 
-  // These values are repeated from the "known values test"
-  // It is an arbitrary subset of all possible spanIds
-  @TableTest({
-    "scenario             | spanId              ",
-    "10428415896243638596 | 10428415896243638596",
-    "11199607447739267382 | 11199607447739267382",
-    "11273630029763932141 | 11273630029763932141",
-    "11407674492757219439 | 11407674492757219439",
-    "11792151447964398879 | 11792151447964398879",
-    "12432680895096110463 | 12432680895096110463",
-    "13126262220165910460 | 13126262220165910460",
-    "13174268766980400525 | 13174268766980400525",
-    "15505210698284655633 | 15505210698284655633",
-    "15649472107743074779 | 15649472107743074779",
-    "17204678798284737396 | 17204678798284737396",
-    "17344948852394588913 | 17344948852394588913",
-    "17496662575514578077 | 17496662575514578077",
-    "18252401681137062077 | 18252401681137062077",
-    "18317291550776694829 | 18317291550776694829",
-    "1874068156324778273  | 1874068156324778273 ",
-    "1905388747193831650  | 1905388747193831650 ",
-    "2202916659517317514  | 2202916659517317514 ",
-    "2227583514184312746  | 2227583514184312746 ",
-    "2338498362660772719  | 2338498362660772719 ",
-    "2781055864473387780  | 2781055864473387780 ",
-    "3328451335138149956  | 3328451335138149956 ",
-    "3337066551442961397  | 3337066551442961397 ",
-    "3409814636252858217  | 3409814636252858217 ",
-    "3510942875414458836  | 3510942875414458836 ",
-    "3784560248718450071  | 3784560248718450071 ",
-    "4751997750760398084  | 4751997750760398084 ",
-    "4831389563158288344  | 4831389563158288344 ",
-    "4990765271833742716  | 4990765271833742716 ",
-    "5089134323978233018  | 5089134323978233018 ",
-    "5199948958991797301  | 5199948958991797301 ",
-    "5577006791947779410  | 5577006791947779410 ",
-    "5600924393587988459  | 5600924393587988459 ",
-    "5793183108815074904  | 5793183108815074904 ",
-    "6263450610539110790  | 6263450610539110790 ",
-    "6382800227808658932  | 6382800227808658932 ",
-    "6651414131918424343  | 6651414131918424343 ",
-    "6842348953158377901  | 6842348953158377901 ",
-    "6941261091797652072  | 6941261091797652072 ",
-    "7273596521315663110  | 7273596521315663110 ",
-    "7504504064263669287  | 7504504064263669287 ",
-    "788787457839692041   | 788787457839692041  ",
-    "7955079406183515637  | 7955079406183515637 ",
-    "8549944162621642512  | 8549944162621642512 ",
-    "8603989663476771718  | 8603989663476771718 ",
-    "8807817071862113702  | 8807817071862113702 ",
-    "9010467728050264449  | 9010467728050264449 ",
-    "10667007354186551956 | 10667007354186551956",
-    "10683692646452562431 | 10683692646452562431",
-    "10821471013040158923 | 10821471013040158923",
-    "10950412492527322440 | 10950412492527322440",
-    "11239168150708129139 | 11239168150708129139",
-    "1169089424364679180  | 1169089424364679180 ",
-    "11818186001859264308 | 11818186001859264308",
-    "11833901312327420776 | 11833901312327420776",
-    "11926759511765359899 | 11926759511765359899",
-    "11926873763676642186 | 11926873763676642186",
-    "11963748953446345529 | 11963748953446345529",
-    "11998794077335055257 | 11998794077335055257",
-    "12096659438561119542 | 12096659438561119542",
-    "12156940908066221323 | 12156940908066221323",
-    "12947799971452915849 | 12947799971452915849",
-    "13260572831089785859 | 13260572831089785859",
-    "13771804148684671731 | 13771804148684671731",
-    "14117161486975057715 | 14117161486975057715",
-    "14242321332569825828 | 14242321332569825828",
-    "14486903973548550719 | 14486903973548550719",
-    "14967026985784794439 | 14967026985784794439",
-    "15213854965919594827 | 15213854965919594827",
-    "15352856648520921629 | 15352856648520921629",
-    "15399114114227588261 | 15399114114227588261",
-    "15595235597337683065 | 15595235597337683065",
-    "16194613440650274502 | 16194613440650274502",
-    "1687184559264975024  | 1687184559264975024 ",
-    "17490665426807838719 | 17490665426807838719",
-    "18218388313430417611 | 18218388313430417611",
-    "2601737961087659062  | 2601737961087659062 ",
-    "261049867304784443   | 261049867304784443  ",
-    "2740103009342231109  | 2740103009342231109 ",
-    "2970700287221458280  | 2970700287221458280 ",
-    "3916589616287113937  | 3916589616287113937 ",
-    "4324745483838182873  | 4324745483838182873 ",
-    "4937104021912138218  | 4937104021912138218 ",
-    "5486140987150761883  | 5486140987150761883 ",
-    "5944830206637008055  | 5944830206637008055 ",
-    "6296367092202729479  | 6296367092202729479 ",
-    "6334824724549167320  | 6334824724549167320 ",
-    "6556961545928831643  | 6556961545928831643 ",
-    "6735196588112087610  | 6735196588112087610 ",
-    "7388428680384065704  | 7388428680384065704 ",
-    "8249030965139585917  | 8249030965139585917 ",
-    "837825985403119657   | 837825985403119657  ",
-    "8505906760983331750  | 8505906760983331750 ",
-    "8674665223082153551  | 8674665223082153551 ",
-    "894385949183117216   | 894385949183117216  ",
-    "898860202204764712   | 898860202204764712  ",
-    "9768663798983814715  | 9768663798983814715 ",
-    "9828766684487745566  | 9828766684487745566 ",
-    "9908585559158765387  | 9908585559158765387 ",
-    "9956202364908137547  | 9956202364908137547 "
-  })
-  void testSamplingAll(@ConvertWith(UnsignedLongConverter.class) long spanId) {
-    DeterministicSampler sampler = new DeterministicSampler.SpanSampler(1);
-    DDSpan span = mock(DDSpan.class);
-    when(span.getSpanId()).thenReturn(spanId);
+    // These values are repeated from the "known values test"
+    // It is an arbitrary subset of all possible spanIds
+    @TableTest({
+      "scenario             | spanId              ",
+      "10428415896243638596 | 10428415896243638596",
+      "11199607447739267382 | 11199607447739267382",
+      "11273630029763932141 | 11273630029763932141",
+      "11407674492757219439 | 11407674492757219439",
+      "11792151447964398879 | 11792151447964398879",
+      "12432680895096110463 | 12432680895096110463",
+      "13126262220165910460 | 13126262220165910460",
+      "13174268766980400525 | 13174268766980400525",
+      "15505210698284655633 | 15505210698284655633",
+      "15649472107743074779 | 15649472107743074779",
+      "17204678798284737396 | 17204678798284737396",
+      "17344948852394588913 | 17344948852394588913",
+      "17496662575514578077 | 17496662575514578077",
+      "18252401681137062077 | 18252401681137062077",
+      "18317291550776694829 | 18317291550776694829",
+      "1874068156324778273  | 1874068156324778273 ",
+      "1905388747193831650  | 1905388747193831650 ",
+      "2202916659517317514  | 2202916659517317514 ",
+      "2227583514184312746  | 2227583514184312746 ",
+      "2338498362660772719  | 2338498362660772719 ",
+      "2781055864473387780  | 2781055864473387780 ",
+      "3328451335138149956  | 3328451335138149956 ",
+      "3337066551442961397  | 3337066551442961397 ",
+      "3409814636252858217  | 3409814636252858217 ",
+      "3510942875414458836  | 3510942875414458836 ",
+      "3784560248718450071  | 3784560248718450071 ",
+      "4751997750760398084  | 4751997750760398084 ",
+      "4831389563158288344  | 4831389563158288344 ",
+      "4990765271833742716  | 4990765271833742716 ",
+      "5089134323978233018  | 5089134323978233018 ",
+      "5199948958991797301  | 5199948958991797301 ",
+      "5577006791947779410  | 5577006791947779410 ",
+      "5600924393587988459  | 5600924393587988459 ",
+      "5793183108815074904  | 5793183108815074904 ",
+      "6263450610539110790  | 6263450610539110790 ",
+      "6382800227808658932  | 6382800227808658932 ",
+      "6651414131918424343  | 6651414131918424343 ",
+      "6842348953158377901  | 6842348953158377901 ",
+      "6941261091797652072  | 6941261091797652072 ",
+      "7273596521315663110  | 7273596521315663110 ",
+      "7504504064263669287  | 7504504064263669287 ",
+      "788787457839692041   | 788787457839692041  ",
+      "7955079406183515637  | 7955079406183515637 ",
+      "8549944162621642512  | 8549944162621642512 ",
+      "8603989663476771718  | 8603989663476771718 ",
+      "8807817071862113702  | 8807817071862113702 ",
+      "9010467728050264449  | 9010467728050264449 ",
+      "10667007354186551956 | 10667007354186551956",
+      "10683692646452562431 | 10683692646452562431",
+      "10821471013040158923 | 10821471013040158923",
+      "10950412492527322440 | 10950412492527322440",
+      "11239168150708129139 | 11239168150708129139",
+      "1169089424364679180  | 1169089424364679180 ",
+      "11818186001859264308 | 11818186001859264308",
+      "11833901312327420776 | 11833901312327420776",
+      "11926759511765359899 | 11926759511765359899",
+      "11926873763676642186 | 11926873763676642186",
+      "11963748953446345529 | 11963748953446345529",
+      "11998794077335055257 | 11998794077335055257",
+      "12096659438561119542 | 12096659438561119542",
+      "12156940908066221323 | 12156940908066221323",
+      "12947799971452915849 | 12947799971452915849",
+      "13260572831089785859 | 13260572831089785859",
+      "13771804148684671731 | 13771804148684671731",
+      "14117161486975057715 | 14117161486975057715",
+      "14242321332569825828 | 14242321332569825828",
+      "14486903973548550719 | 14486903973548550719",
+      "14967026985784794439 | 14967026985784794439",
+      "15213854965919594827 | 15213854965919594827",
+      "15352856648520921629 | 15352856648520921629",
+      "15399114114227588261 | 15399114114227588261",
+      "15595235597337683065 | 15595235597337683065",
+      "16194613440650274502 | 16194613440650274502",
+      "1687184559264975024  | 1687184559264975024 ",
+      "17490665426807838719 | 17490665426807838719",
+      "18218388313430417611 | 18218388313430417611",
+      "2601737961087659062  | 2601737961087659062 ",
+      "261049867304784443   | 261049867304784443  ",
+      "2740103009342231109  | 2740103009342231109 ",
+      "2970700287221458280  | 2970700287221458280 ",
+      "3916589616287113937  | 3916589616287113937 ",
+      "4324745483838182873  | 4324745483838182873 ",
+      "4937104021912138218  | 4937104021912138218 ",
+      "5486140987150761883  | 5486140987150761883 ",
+      "5944830206637008055  | 5944830206637008055 ",
+      "6296367092202729479  | 6296367092202729479 ",
+      "6334824724549167320  | 6334824724549167320 ",
+      "6556961545928831643  | 6556961545928831643 ",
+      "6735196588112087610  | 6735196588112087610 ",
+      "7388428680384065704  | 7388428680384065704 ",
+      "8249030965139585917  | 8249030965139585917 ",
+      "837825985403119657   | 837825985403119657  ",
+      "8505906760983331750  | 8505906760983331750 ",
+      "8674665223082153551  | 8674665223082153551 ",
+      "894385949183117216   | 894385949183117216  ",
+      "898860202204764712   | 898860202204764712  ",
+      "9768663798983814715  | 9768663798983814715 ",
+      "9828766684487745566  | 9828766684487745566 ",
+      "9908585559158765387  | 9908585559158765387 ",
+      "9956202364908137547  | 9956202364908137547 "
+    })
+    void testSamplingAll(@ConvertWith(UnsignedLongConverter.class) long spanId) {
+        DeterministicSampler sampler = new DeterministicSampler.SpanSampler(1);
+        DDSpan span = mock(DDSpan.class);
+        when(span.getSpanId()).thenReturn(spanId);
 
-    assertTrue(sampler.sample(span));
-  }
+        assertTrue(sampler.sample(span));
+    }
 
-  /** Converts unsigned decimal string cell values to signed {@code long} bit patterns. */
-  private static class UnsignedLongConverter implements ArgumentConverter {
+    /** Converts unsigned decimal string cell values to signed {@code long} bit patterns. */
+    private static class UnsignedLongConverter implements ArgumentConverter {
 
-    @Override
-    public Object convert(Object source, ParameterContext context)
-        throws ArgumentConversionException {
-      if (source == null) {
-        return 0L;
-      }
-      return Long.parseUnsignedLong(source.toString().trim());
+        @Override
+        public Object convert(Object source, ParameterContext context) throws ArgumentConversionException {
+            if (source == null) {
+                return 0L;
+            }
+            return Long.parseUnsignedLong(source.toString().trim());
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/DeterministicTraceSamplerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/DeterministicTraceSamplerTest.java
index c97a8056336..4f844da6725 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/DeterministicTraceSamplerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/DeterministicTraceSamplerTest.java
@@ -19,369 +19,370 @@
 
 class DeterministicTraceSamplerTest {
 
-  @TableTest({
-    "scenario               | expected | traceId             ",
-    "10428415896243638596 f | false    | 10428415896243638596",
-    "11199607447739267382 f | false    | 11199607447739267382",
-    "11273630029763932141 f | false    | 11273630029763932141",
-    "11407674492757219439 f | false    | 11407674492757219439",
-    "11792151447964398879 f | false    | 11792151447964398879",
-    "12432680895096110463 f | false    | 12432680895096110463",
-    "13126262220165910460 f | false    | 13126262220165910460",
-    "13174268766980400525 f | false    | 13174268766980400525",
-    "15505210698284655633 f | false    | 15505210698284655633",
-    "15649472107743074779 f | false    | 15649472107743074779",
-    "17204678798284737396 f | false    | 17204678798284737396",
-    "17344948852394588913 f | false    | 17344948852394588913",
-    "17496662575514578077 f | false    | 17496662575514578077",
-    "18252401681137062077 f | false    | 18252401681137062077",
-    "18317291550776694829 f | false    | 18317291550776694829",
-    "1874068156324778273 f  | false    | 1874068156324778273 ",
-    "1905388747193831650 f  | false    | 1905388747193831650 ",
-    "2202916659517317514 f  | false    | 2202916659517317514 ",
-    "2227583514184312746 f  | false    | 2227583514184312746 ",
-    "2338498362660772719 f  | false    | 2338498362660772719 ",
-    "2781055864473387780 f  | false    | 2781055864473387780 ",
-    "3328451335138149956 f  | false    | 3328451335138149956 ",
-    "3337066551442961397 f  | false    | 3337066551442961397 ",
-    "3409814636252858217 f  | false    | 3409814636252858217 ",
-    "3510942875414458836 f  | false    | 3510942875414458836 ",
-    "3784560248718450071 f  | false    | 3784560248718450071 ",
-    "4751997750760398084 f  | false    | 4751997750760398084 ",
-    "4831389563158288344 f  | false    | 4831389563158288344 ",
-    "4990765271833742716 f  | false    | 4990765271833742716 ",
-    "5089134323978233018 f  | false    | 5089134323978233018 ",
-    "5199948958991797301 f  | false    | 5199948958991797301 ",
-    "5577006791947779410 f  | false    | 5577006791947779410 ",
-    "5600924393587988459 f  | false    | 5600924393587988459 ",
-    "5793183108815074904 f  | false    | 5793183108815074904 ",
-    "6263450610539110790 f  | false    | 6263450610539110790 ",
-    "6382800227808658932 f  | false    | 6382800227808658932 ",
-    "6651414131918424343 f  | false    | 6651414131918424343 ",
-    "6842348953158377901 f  | false    | 6842348953158377901 ",
-    "6941261091797652072 f  | false    | 6941261091797652072 ",
-    "7273596521315663110 f  | false    | 7273596521315663110 ",
-    "7504504064263669287 f  | false    | 7504504064263669287 ",
-    "788787457839692041 f   | false    | 788787457839692041  ",
-    "7955079406183515637 f  | false    | 7955079406183515637 ",
-    "8549944162621642512 f  | false    | 8549944162621642512 ",
-    "8603989663476771718 f  | false    | 8603989663476771718 ",
-    "8807817071862113702 f  | false    | 8807817071862113702 ",
-    "9010467728050264449 f  | false    | 9010467728050264449 ",
-    "10667007354186551956 t | true     | 10667007354186551956",
-    "10683692646452562431 t | true     | 10683692646452562431",
-    "10821471013040158923 t | true     | 10821471013040158923",
-    "10950412492527322440 t | true     | 10950412492527322440",
-    "11239168150708129139 t | true     | 11239168150708129139",
-    "1169089424364679180 t  | true     | 1169089424364679180 ",
-    "11818186001859264308 t | true     | 11818186001859264308",
-    "11833901312327420776 t | true     | 11833901312327420776",
-    "11926759511765359899 t | true     | 11926759511765359899",
-    "11926873763676642186 t | true     | 11926873763676642186",
-    "11963748953446345529 t | true     | 11963748953446345529",
-    "11998794077335055257 t | true     | 11998794077335055257",
-    "12096659438561119542 t | true     | 12096659438561119542",
-    "12156940908066221323 t | true     | 12156940908066221323",
-    "12947799971452915849 t | true     | 12947799971452915849",
-    "13260572831089785859 t | true     | 13260572831089785859",
-    "13771804148684671731 t | true     | 13771804148684671731",
-    "14117161486975057715 t | true     | 14117161486975057715",
-    "14242321332569825828 t | true     | 14242321332569825828",
-    "14486903973548550719 t | true     | 14486903973548550719",
-    "14967026985784794439 t | true     | 14967026985784794439",
-    "15213854965919594827 t | true     | 15213854965919594827",
-    "15352856648520921629 t | true     | 15352856648520921629",
-    "15399114114227588261 t | true     | 15399114114227588261",
-    "15595235597337683065 t | true     | 15595235597337683065",
-    "16194613440650274502 t | true     | 16194613440650274502",
-    "1687184559264975024 t  | true     | 1687184559264975024 ",
-    "17490665426807838719 t | true     | 17490665426807838719",
-    "18218388313430417611 t | true     | 18218388313430417611",
-    "2601737961087659062 t  | true     | 2601737961087659062 ",
-    "261049867304784443 t   | true     | 261049867304784443  ",
-    "2740103009342231109 t  | true     | 2740103009342231109 ",
-    "2970700287221458280 t  | true     | 2970700287221458280 ",
-    "3916589616287113937 t  | true     | 3916589616287113937 ",
-    "4324745483838182873 t  | true     | 4324745483838182873 ",
-    "4937104021912138218 t  | true     | 4937104021912138218 ",
-    "5486140987150761883 t  | true     | 5486140987150761883 ",
-    "5944830206637008055 t  | true     | 5944830206637008055 ",
-    "6296367092202729479 t  | true     | 6296367092202729479 ",
-    "6334824724549167320 t  | true     | 6334824724549167320 ",
-    "6556961545928831643 t  | true     | 6556961545928831643 ",
-    "6735196588112087610 t  | true     | 6735196588112087610 ",
-    "7388428680384065704 t  | true     | 7388428680384065704 ",
-    "8249030965139585917 t  | true     | 8249030965139585917 ",
-    "837825985403119657 t   | true     | 837825985403119657  ",
-    "8505906760983331750 t  | true     | 8505906760983331750 ",
-    "8674665223082153551 t  | true     | 8674665223082153551 ",
-    "894385949183117216 t   | true     | 894385949183117216  ",
-    "898860202204764712 t   | true     | 898860202204764712  ",
-    "9768663798983814715 t  | true     | 9768663798983814715 ",
-    "9828766684487745566 t  | true     | 9828766684487745566 ",
-    "9908585559158765387 t  | true     | 9908585559158765387 ",
-    "9956202364908137547 t  | true     | 9956202364908137547 ",
-    "9223372036854775808 t  | true     | 9223372036854775808 "
-  })
-  void testKnownValues(boolean expected, String traceId) {
-    DeterministicSampler sampler = new DeterministicSampler.TraceSampler(0.5);
-    DDSpan span = mock(DDSpan.class);
-    when(span.getTraceId()).thenReturn(DDTraceId.from(traceId));
+    @TableTest({
+      "scenario               | expected | traceId             ",
+      "10428415896243638596 f | false    | 10428415896243638596",
+      "11199607447739267382 f | false    | 11199607447739267382",
+      "11273630029763932141 f | false    | 11273630029763932141",
+      "11407674492757219439 f | false    | 11407674492757219439",
+      "11792151447964398879 f | false    | 11792151447964398879",
+      "12432680895096110463 f | false    | 12432680895096110463",
+      "13126262220165910460 f | false    | 13126262220165910460",
+      "13174268766980400525 f | false    | 13174268766980400525",
+      "15505210698284655633 f | false    | 15505210698284655633",
+      "15649472107743074779 f | false    | 15649472107743074779",
+      "17204678798284737396 f | false    | 17204678798284737396",
+      "17344948852394588913 f | false    | 17344948852394588913",
+      "17496662575514578077 f | false    | 17496662575514578077",
+      "18252401681137062077 f | false    | 18252401681137062077",
+      "18317291550776694829 f | false    | 18317291550776694829",
+      "1874068156324778273 f  | false    | 1874068156324778273 ",
+      "1905388747193831650 f  | false    | 1905388747193831650 ",
+      "2202916659517317514 f  | false    | 2202916659517317514 ",
+      "2227583514184312746 f  | false    | 2227583514184312746 ",
+      "2338498362660772719 f  | false    | 2338498362660772719 ",
+      "2781055864473387780 f  | false    | 2781055864473387780 ",
+      "3328451335138149956 f  | false    | 3328451335138149956 ",
+      "3337066551442961397 f  | false    | 3337066551442961397 ",
+      "3409814636252858217 f  | false    | 3409814636252858217 ",
+      "3510942875414458836 f  | false    | 3510942875414458836 ",
+      "3784560248718450071 f  | false    | 3784560248718450071 ",
+      "4751997750760398084 f  | false    | 4751997750760398084 ",
+      "4831389563158288344 f  | false    | 4831389563158288344 ",
+      "4990765271833742716 f  | false    | 4990765271833742716 ",
+      "5089134323978233018 f  | false    | 5089134323978233018 ",
+      "5199948958991797301 f  | false    | 5199948958991797301 ",
+      "5577006791947779410 f  | false    | 5577006791947779410 ",
+      "5600924393587988459 f  | false    | 5600924393587988459 ",
+      "5793183108815074904 f  | false    | 5793183108815074904 ",
+      "6263450610539110790 f  | false    | 6263450610539110790 ",
+      "6382800227808658932 f  | false    | 6382800227808658932 ",
+      "6651414131918424343 f  | false    | 6651414131918424343 ",
+      "6842348953158377901 f  | false    | 6842348953158377901 ",
+      "6941261091797652072 f  | false    | 6941261091797652072 ",
+      "7273596521315663110 f  | false    | 7273596521315663110 ",
+      "7504504064263669287 f  | false    | 7504504064263669287 ",
+      "788787457839692041 f   | false    | 788787457839692041  ",
+      "7955079406183515637 f  | false    | 7955079406183515637 ",
+      "8549944162621642512 f  | false    | 8549944162621642512 ",
+      "8603989663476771718 f  | false    | 8603989663476771718 ",
+      "8807817071862113702 f  | false    | 8807817071862113702 ",
+      "9010467728050264449 f  | false    | 9010467728050264449 ",
+      "10667007354186551956 t | true     | 10667007354186551956",
+      "10683692646452562431 t | true     | 10683692646452562431",
+      "10821471013040158923 t | true     | 10821471013040158923",
+      "10950412492527322440 t | true     | 10950412492527322440",
+      "11239168150708129139 t | true     | 11239168150708129139",
+      "1169089424364679180 t  | true     | 1169089424364679180 ",
+      "11818186001859264308 t | true     | 11818186001859264308",
+      "11833901312327420776 t | true     | 11833901312327420776",
+      "11926759511765359899 t | true     | 11926759511765359899",
+      "11926873763676642186 t | true     | 11926873763676642186",
+      "11963748953446345529 t | true     | 11963748953446345529",
+      "11998794077335055257 t | true     | 11998794077335055257",
+      "12096659438561119542 t | true     | 12096659438561119542",
+      "12156940908066221323 t | true     | 12156940908066221323",
+      "12947799971452915849 t | true     | 12947799971452915849",
+      "13260572831089785859 t | true     | 13260572831089785859",
+      "13771804148684671731 t | true     | 13771804148684671731",
+      "14117161486975057715 t | true     | 14117161486975057715",
+      "14242321332569825828 t | true     | 14242321332569825828",
+      "14486903973548550719 t | true     | 14486903973548550719",
+      "14967026985784794439 t | true     | 14967026985784794439",
+      "15213854965919594827 t | true     | 15213854965919594827",
+      "15352856648520921629 t | true     | 15352856648520921629",
+      "15399114114227588261 t | true     | 15399114114227588261",
+      "15595235597337683065 t | true     | 15595235597337683065",
+      "16194613440650274502 t | true     | 16194613440650274502",
+      "1687184559264975024 t  | true     | 1687184559264975024 ",
+      "17490665426807838719 t | true     | 17490665426807838719",
+      "18218388313430417611 t | true     | 18218388313430417611",
+      "2601737961087659062 t  | true     | 2601737961087659062 ",
+      "261049867304784443 t   | true     | 261049867304784443  ",
+      "2740103009342231109 t  | true     | 2740103009342231109 ",
+      "2970700287221458280 t  | true     | 2970700287221458280 ",
+      "3916589616287113937 t  | true     | 3916589616287113937 ",
+      "4324745483838182873 t  | true     | 4324745483838182873 ",
+      "4937104021912138218 t  | true     | 4937104021912138218 ",
+      "5486140987150761883 t  | true     | 5486140987150761883 ",
+      "5944830206637008055 t  | true     | 5944830206637008055 ",
+      "6296367092202729479 t  | true     | 6296367092202729479 ",
+      "6334824724549167320 t  | true     | 6334824724549167320 ",
+      "6556961545928831643 t  | true     | 6556961545928831643 ",
+      "6735196588112087610 t  | true     | 6735196588112087610 ",
+      "7388428680384065704 t  | true     | 7388428680384065704 ",
+      "8249030965139585917 t  | true     | 8249030965139585917 ",
+      "837825985403119657 t   | true     | 837825985403119657  ",
+      "8505906760983331750 t  | true     | 8505906760983331750 ",
+      "8674665223082153551 t  | true     | 8674665223082153551 ",
+      "894385949183117216 t   | true     | 894385949183117216  ",
+      "898860202204764712 t   | true     | 898860202204764712  ",
+      "9768663798983814715 t  | true     | 9768663798983814715 ",
+      "9828766684487745566 t  | true     | 9828766684487745566 ",
+      "9908585559158765387 t  | true     | 9908585559158765387 ",
+      "9956202364908137547 t  | true     | 9956202364908137547 ",
+      "9223372036854775808 t  | true     | 9223372036854775808 "
+    })
+    void testKnownValues(boolean expected, String traceId) {
+        DeterministicSampler sampler = new DeterministicSampler.TraceSampler(0.5);
+        DDSpan span = mock(DDSpan.class);
+        when(span.getTraceId()).thenReturn(DDTraceId.from(traceId));
 
-    assertEquals(expected, sampler.sample(span));
-  }
+        assertEquals(expected, sampler.sample(span));
+    }
 
-  // These values are repeated from the "known values test"
-  // It is an arbitrary subset of all possible traceIds
-  @TableTest({
-    "scenario             | traceId             ",
-    "10428415896243638596 | 10428415896243638596",
-    "11199607447739267382 | 11199607447739267382",
-    "11273630029763932141 | 11273630029763932141",
-    "11407674492757219439 | 11407674492757219439",
-    "11792151447964398879 | 11792151447964398879",
-    "12432680895096110463 | 12432680895096110463",
-    "13126262220165910460 | 13126262220165910460",
-    "13174268766980400525 | 13174268766980400525",
-    "15505210698284655633 | 15505210698284655633",
-    "15649472107743074779 | 15649472107743074779",
-    "17204678798284737396 | 17204678798284737396",
-    "17344948852394588913 | 17344948852394588913",
-    "17496662575514578077 | 17496662575514578077",
-    "18252401681137062077 | 18252401681137062077",
-    "18317291550776694829 | 18317291550776694829",
-    "1874068156324778273  | 1874068156324778273 ",
-    "1905388747193831650  | 1905388747193831650 ",
-    "2202916659517317514  | 2202916659517317514 ",
-    "2227583514184312746  | 2227583514184312746 ",
-    "2338498362660772719  | 2338498362660772719 ",
-    "2781055864473387780  | 2781055864473387780 ",
-    "3328451335138149956  | 3328451335138149956 ",
-    "3337066551442961397  | 3337066551442961397 ",
-    "3409814636252858217  | 3409814636252858217 ",
-    "3510942875414458836  | 3510942875414458836 ",
-    "3784560248718450071  | 3784560248718450071 ",
-    "4751997750760398084  | 4751997750760398084 ",
-    "4831389563158288344  | 4831389563158288344 ",
-    "4990765271833742716  | 4990765271833742716 ",
-    "5089134323978233018  | 5089134323978233018 ",
-    "5199948958991797301  | 5199948958991797301 ",
-    "5577006791947779410  | 5577006791947779410 ",
-    "5600924393587988459  | 5600924393587988459 ",
-    "5793183108815074904  | 5793183108815074904 ",
-    "6263450610539110790  | 6263450610539110790 ",
-    "6382800227808658932  | 6382800227808658932 ",
-    "6651414131918424343  | 6651414131918424343 ",
-    "6842348953158377901  | 6842348953158377901 ",
-    "6941261091797652072  | 6941261091797652072 ",
-    "7273596521315663110  | 7273596521315663110 ",
-    "7504504064263669287  | 7504504064263669287 ",
-    "788787457839692041   | 788787457839692041  ",
-    "7955079406183515637  | 7955079406183515637 ",
-    "8549944162621642512  | 8549944162621642512 ",
-    "8603989663476771718  | 8603989663476771718 ",
-    "8807817071862113702  | 8807817071862113702 ",
-    "9010467728050264449  | 9010467728050264449 ",
-    "10667007354186551956 | 10667007354186551956",
-    "10683692646452562431 | 10683692646452562431",
-    "10821471013040158923 | 10821471013040158923",
-    "10950412492527322440 | 10950412492527322440",
-    "11239168150708129139 | 11239168150708129139",
-    "1169089424364679180  | 1169089424364679180 ",
-    "11818186001859264308 | 11818186001859264308",
-    "11833901312327420776 | 11833901312327420776",
-    "11926759511765359899 | 11926759511765359899",
-    "11926873763676642186 | 11926873763676642186",
-    "11963748953446345529 | 11963748953446345529",
-    "11998794077335055257 | 11998794077335055257",
-    "12096659438561119542 | 12096659438561119542",
-    "12156940908066221323 | 12156940908066221323",
-    "12947799971452915849 | 12947799971452915849",
-    "13260572831089785859 | 13260572831089785859",
-    "13771804148684671731 | 13771804148684671731",
-    "14117161486975057715 | 14117161486975057715",
-    "14242321332569825828 | 14242321332569825828",
-    "14486903973548550719 | 14486903973548550719",
-    "14967026985784794439 | 14967026985784794439",
-    "15213854965919594827 | 15213854965919594827",
-    "15352856648520921629 | 15352856648520921629",
-    "15399114114227588261 | 15399114114227588261",
-    "15595235597337683065 | 15595235597337683065",
-    "16194613440650274502 | 16194613440650274502",
-    "1687184559264975024  | 1687184559264975024 ",
-    "17490665426807838719 | 17490665426807838719",
-    "18218388313430417611 | 18218388313430417611",
-    "2601737961087659062  | 2601737961087659062 ",
-    "261049867304784443   | 261049867304784443  ",
-    "2740103009342231109  | 2740103009342231109 ",
-    "2970700287221458280  | 2970700287221458280 ",
-    "3916589616287113937  | 3916589616287113937 ",
-    "4324745483838182873  | 4324745483838182873 ",
-    "4937104021912138218  | 4937104021912138218 ",
-    "5486140987150761883  | 5486140987150761883 ",
-    "5944830206637008055  | 5944830206637008055 ",
-    "6296367092202729479  | 6296367092202729479 ",
-    "6334824724549167320  | 6334824724549167320 ",
-    "6556961545928831643  | 6556961545928831643 ",
-    "6735196588112087610  | 6735196588112087610 ",
-    "7388428680384065704  | 7388428680384065704 ",
-    "8249030965139585917  | 8249030965139585917 ",
-    "837825985403119657   | 837825985403119657  ",
-    "8505906760983331750  | 8505906760983331750 ",
-    "8674665223082153551  | 8674665223082153551 ",
-    "894385949183117216   | 894385949183117216  ",
-    "898860202204764712   | 898860202204764712  ",
-    "9768663798983814715  | 9768663798983814715 ",
-    "9828766684487745566  | 9828766684487745566 ",
-    "9908585559158765387  | 9908585559158765387 ",
-    "9956202364908137547  | 9956202364908137547 "
-  })
-  void testSamplingNone(String traceId) {
-    DeterministicSampler sampler = new DeterministicSampler.TraceSampler(0);
-    DDSpan span = mock(DDSpan.class);
-    when(span.getTraceId()).thenReturn(DDTraceId.from(traceId));
+    // These values are repeated from the "known values test"
+    // It is an arbitrary subset of all possible traceIds
+    @TableTest({
+      "scenario             | traceId             ",
+      "10428415896243638596 | 10428415896243638596",
+      "11199607447739267382 | 11199607447739267382",
+      "11273630029763932141 | 11273630029763932141",
+      "11407674492757219439 | 11407674492757219439",
+      "11792151447964398879 | 11792151447964398879",
+      "12432680895096110463 | 12432680895096110463",
+      "13126262220165910460 | 13126262220165910460",
+      "13174268766980400525 | 13174268766980400525",
+      "15505210698284655633 | 15505210698284655633",
+      "15649472107743074779 | 15649472107743074779",
+      "17204678798284737396 | 17204678798284737396",
+      "17344948852394588913 | 17344948852394588913",
+      "17496662575514578077 | 17496662575514578077",
+      "18252401681137062077 | 18252401681137062077",
+      "18317291550776694829 | 18317291550776694829",
+      "1874068156324778273  | 1874068156324778273 ",
+      "1905388747193831650  | 1905388747193831650 ",
+      "2202916659517317514  | 2202916659517317514 ",
+      "2227583514184312746  | 2227583514184312746 ",
+      "2338498362660772719  | 2338498362660772719 ",
+      "2781055864473387780  | 2781055864473387780 ",
+      "3328451335138149956  | 3328451335138149956 ",
+      "3337066551442961397  | 3337066551442961397 ",
+      "3409814636252858217  | 3409814636252858217 ",
+      "3510942875414458836  | 3510942875414458836 ",
+      "3784560248718450071  | 3784560248718450071 ",
+      "4751997750760398084  | 4751997750760398084 ",
+      "4831389563158288344  | 4831389563158288344 ",
+      "4990765271833742716  | 4990765271833742716 ",
+      "5089134323978233018  | 5089134323978233018 ",
+      "5199948958991797301  | 5199948958991797301 ",
+      "5577006791947779410  | 5577006791947779410 ",
+      "5600924393587988459  | 5600924393587988459 ",
+      "5793183108815074904  | 5793183108815074904 ",
+      "6263450610539110790  | 6263450610539110790 ",
+      "6382800227808658932  | 6382800227808658932 ",
+      "6651414131918424343  | 6651414131918424343 ",
+      "6842348953158377901  | 6842348953158377901 ",
+      "6941261091797652072  | 6941261091797652072 ",
+      "7273596521315663110  | 7273596521315663110 ",
+      "7504504064263669287  | 7504504064263669287 ",
+      "788787457839692041   | 788787457839692041  ",
+      "7955079406183515637  | 7955079406183515637 ",
+      "8549944162621642512  | 8549944162621642512 ",
+      "8603989663476771718  | 8603989663476771718 ",
+      "8807817071862113702  | 8807817071862113702 ",
+      "9010467728050264449  | 9010467728050264449 ",
+      "10667007354186551956 | 10667007354186551956",
+      "10683692646452562431 | 10683692646452562431",
+      "10821471013040158923 | 10821471013040158923",
+      "10950412492527322440 | 10950412492527322440",
+      "11239168150708129139 | 11239168150708129139",
+      "1169089424364679180  | 1169089424364679180 ",
+      "11818186001859264308 | 11818186001859264308",
+      "11833901312327420776 | 11833901312327420776",
+      "11926759511765359899 | 11926759511765359899",
+      "11926873763676642186 | 11926873763676642186",
+      "11963748953446345529 | 11963748953446345529",
+      "11998794077335055257 | 11998794077335055257",
+      "12096659438561119542 | 12096659438561119542",
+      "12156940908066221323 | 12156940908066221323",
+      "12947799971452915849 | 12947799971452915849",
+      "13260572831089785859 | 13260572831089785859",
+      "13771804148684671731 | 13771804148684671731",
+      "14117161486975057715 | 14117161486975057715",
+      "14242321332569825828 | 14242321332569825828",
+      "14486903973548550719 | 14486903973548550719",
+      "14967026985784794439 | 14967026985784794439",
+      "15213854965919594827 | 15213854965919594827",
+      "15352856648520921629 | 15352856648520921629",
+      "15399114114227588261 | 15399114114227588261",
+      "15595235597337683065 | 15595235597337683065",
+      "16194613440650274502 | 16194613440650274502",
+      "1687184559264975024  | 1687184559264975024 ",
+      "17490665426807838719 | 17490665426807838719",
+      "18218388313430417611 | 18218388313430417611",
+      "2601737961087659062  | 2601737961087659062 ",
+      "261049867304784443   | 261049867304784443  ",
+      "2740103009342231109  | 2740103009342231109 ",
+      "2970700287221458280  | 2970700287221458280 ",
+      "3916589616287113937  | 3916589616287113937 ",
+      "4324745483838182873  | 4324745483838182873 ",
+      "4937104021912138218  | 4937104021912138218 ",
+      "5486140987150761883  | 5486140987150761883 ",
+      "5944830206637008055  | 5944830206637008055 ",
+      "6296367092202729479  | 6296367092202729479 ",
+      "6334824724549167320  | 6334824724549167320 ",
+      "6556961545928831643  | 6556961545928831643 ",
+      "6735196588112087610  | 6735196588112087610 ",
+      "7388428680384065704  | 7388428680384065704 ",
+      "8249030965139585917  | 8249030965139585917 ",
+      "837825985403119657   | 837825985403119657  ",
+      "8505906760983331750  | 8505906760983331750 ",
+      "8674665223082153551  | 8674665223082153551 ",
+      "894385949183117216   | 894385949183117216  ",
+      "898860202204764712   | 898860202204764712  ",
+      "9768663798983814715  | 9768663798983814715 ",
+      "9828766684487745566  | 9828766684487745566 ",
+      "9908585559158765387  | 9908585559158765387 ",
+      "9956202364908137547  | 9956202364908137547 "
+    })
+    void testSamplingNone(String traceId) {
+        DeterministicSampler sampler = new DeterministicSampler.TraceSampler(0);
+        DDSpan span = mock(DDSpan.class);
+        when(span.getTraceId()).thenReturn(DDTraceId.from(traceId));
 
-    assertFalse(sampler.sample(span));
-  }
+        assertFalse(sampler.sample(span));
+    }
 
-  // These values are repeated from the "known values test"
-  // It is an arbitrary subset of all possible traceIds
-  @TableTest({
-    "scenario             | traceId             ",
-    "10428415896243638596 | 10428415896243638596",
-    "11199607447739267382 | 11199607447739267382",
-    "11273630029763932141 | 11273630029763932141",
-    "11407674492757219439 | 11407674492757219439",
-    "11792151447964398879 | 11792151447964398879",
-    "12432680895096110463 | 12432680895096110463",
-    "13126262220165910460 | 13126262220165910460",
-    "13174268766980400525 | 13174268766980400525",
-    "15505210698284655633 | 15505210698284655633",
-    "15649472107743074779 | 15649472107743074779",
-    "17204678798284737396 | 17204678798284737396",
-    "17344948852394588913 | 17344948852394588913",
-    "17496662575514578077 | 17496662575514578077",
-    "18252401681137062077 | 18252401681137062077",
-    "18317291550776694829 | 18317291550776694829",
-    "1874068156324778273  | 1874068156324778273 ",
-    "1905388747193831650  | 1905388747193831650 ",
-    "2202916659517317514  | 2202916659517317514 ",
-    "2227583514184312746  | 2227583514184312746 ",
-    "2338498362660772719  | 2338498362660772719 ",
-    "2781055864473387780  | 2781055864473387780 ",
-    "3328451335138149956  | 3328451335138149956 ",
-    "3337066551442961397  | 3337066551442961397 ",
-    "3409814636252858217  | 3409814636252858217 ",
-    "3510942875414458836  | 3510942875414458836 ",
-    "3784560248718450071  | 3784560248718450071 ",
-    "4751997750760398084  | 4751997750760398084 ",
-    "4831389563158288344  | 4831389563158288344 ",
-    "4990765271833742716  | 4990765271833742716 ",
-    "5089134323978233018  | 5089134323978233018 ",
-    "5199948958991797301  | 5199948958991797301 ",
-    "5577006791947779410  | 5577006791947779410 ",
-    "5600924393587988459  | 5600924393587988459 ",
-    "5793183108815074904  | 5793183108815074904 ",
-    "6263450610539110790  | 6263450610539110790 ",
-    "6382800227808658932  | 6382800227808658932 ",
-    "6651414131918424343  | 6651414131918424343 ",
-    "6842348953158377901  | 6842348953158377901 ",
-    "6941261091797652072  | 6941261091797652072 ",
-    "7273596521315663110  | 7273596521315663110 ",
-    "7504504064263669287  | 7504504064263669287 ",
-    "788787457839692041   | 788787457839692041  ",
-    "7955079406183515637  | 7955079406183515637 ",
-    "8549944162621642512  | 8549944162621642512 ",
-    "8603989663476771718  | 8603989663476771718 ",
-    "8807817071862113702  | 8807817071862113702 ",
-    "9010467728050264449  | 9010467728050264449 ",
-    "10667007354186551956 | 10667007354186551956",
-    "10683692646452562431 | 10683692646452562431",
-    "10821471013040158923 | 10821471013040158923",
-    "10950412492527322440 | 10950412492527322440",
-    "11239168150708129139 | 11239168150708129139",
-    "1169089424364679180  | 1169089424364679180 ",
-    "11818186001859264308 | 11818186001859264308",
-    "11833901312327420776 | 11833901312327420776",
-    "11926759511765359899 | 11926759511765359899",
-    "11926873763676642186 | 11926873763676642186",
-    "11963748953446345529 | 11963748953446345529",
-    "11998794077335055257 | 11998794077335055257",
-    "12096659438561119542 | 12096659438561119542",
-    "12156940908066221323 | 12156940908066221323",
-    "12947799971452915849 | 12947799971452915849",
-    "13260572831089785859 | 13260572831089785859",
-    "13771804148684671731 | 13771804148684671731",
-    "14117161486975057715 | 14117161486975057715",
-    "14242321332569825828 | 14242321332569825828",
-    "14486903973548550719 | 14486903973548550719",
-    "14967026985784794439 | 14967026985784794439",
-    "15213854965919594827 | 15213854965919594827",
-    "15352856648520921629 | 15352856648520921629",
-    "15399114114227588261 | 15399114114227588261",
-    "15595235597337683065 | 15595235597337683065",
-    "16194613440650274502 | 16194613440650274502",
-    "1687184559264975024  | 1687184559264975024 ",
-    "17490665426807838719 | 17490665426807838719",
-    "18218388313430417611 | 18218388313430417611",
-    "2601737961087659062  | 2601737961087659062 ",
-    "261049867304784443   | 261049867304784443  ",
-    "2740103009342231109  | 2740103009342231109 ",
-    "2970700287221458280  | 2970700287221458280 ",
-    "3916589616287113937  | 3916589616287113937 ",
-    "4324745483838182873  | 4324745483838182873 ",
-    "4937104021912138218  | 4937104021912138218 ",
-    "5486140987150761883  | 5486140987150761883 ",
-    "5944830206637008055  | 5944830206637008055 ",
-    "6296367092202729479  | 6296367092202729479 ",
-    "6334824724549167320  | 6334824724549167320 ",
-    "6556961545928831643  | 6556961545928831643 ",
-    "6735196588112087610  | 6735196588112087610 ",
-    "7388428680384065704  | 7388428680384065704 ",
-    "8249030965139585917  | 8249030965139585917 ",
-    "837825985403119657   | 837825985403119657  ",
-    "8505906760983331750  | 8505906760983331750 ",
-    "8674665223082153551  | 8674665223082153551 ",
-    "894385949183117216   | 894385949183117216  ",
-    "898860202204764712   | 898860202204764712  ",
-    "9768663798983814715  | 9768663798983814715 ",
-    "9828766684487745566  | 9828766684487745566 ",
-    "9908585559158765387  | 9908585559158765387 ",
-    "9956202364908137547  | 9956202364908137547 "
-  })
-  void testSamplingAll(String traceId) {
-    DeterministicSampler sampler = new DeterministicSampler.TraceSampler(1);
-    DDSpan span = mock(DDSpan.class);
-    when(span.getTraceId()).thenReturn(DDTraceId.from(traceId));
+    // These values are repeated from the "known values test"
+    // It is an arbitrary subset of all possible traceIds
+    @TableTest({
+      "scenario             | traceId             ",
+      "10428415896243638596 | 10428415896243638596",
+      "11199607447739267382 | 11199607447739267382",
+      "11273630029763932141 | 11273630029763932141",
+      "11407674492757219439 | 11407674492757219439",
+      "11792151447964398879 | 11792151447964398879",
+      "12432680895096110463 | 12432680895096110463",
+      "13126262220165910460 | 13126262220165910460",
+      "13174268766980400525 | 13174268766980400525",
+      "15505210698284655633 | 15505210698284655633",
+      "15649472107743074779 | 15649472107743074779",
+      "17204678798284737396 | 17204678798284737396",
+      "17344948852394588913 | 17344948852394588913",
+      "17496662575514578077 | 17496662575514578077",
+      "18252401681137062077 | 18252401681137062077",
+      "18317291550776694829 | 18317291550776694829",
+      "1874068156324778273  | 1874068156324778273 ",
+      "1905388747193831650  | 1905388747193831650 ",
+      "2202916659517317514  | 2202916659517317514 ",
+      "2227583514184312746  | 2227583514184312746 ",
+      "2338498362660772719  | 2338498362660772719 ",
+      "2781055864473387780  | 2781055864473387780 ",
+      "3328451335138149956  | 3328451335138149956 ",
+      "3337066551442961397  | 3337066551442961397 ",
+      "3409814636252858217  | 3409814636252858217 ",
+      "3510942875414458836  | 3510942875414458836 ",
+      "3784560248718450071  | 3784560248718450071 ",
+      "4751997750760398084  | 4751997750760398084 ",
+      "4831389563158288344  | 4831389563158288344 ",
+      "4990765271833742716  | 4990765271833742716 ",
+      "5089134323978233018  | 5089134323978233018 ",
+      "5199948958991797301  | 5199948958991797301 ",
+      "5577006791947779410  | 5577006791947779410 ",
+      "5600924393587988459  | 5600924393587988459 ",
+      "5793183108815074904  | 5793183108815074904 ",
+      "6263450610539110790  | 6263450610539110790 ",
+      "6382800227808658932  | 6382800227808658932 ",
+      "6651414131918424343  | 6651414131918424343 ",
+      "6842348953158377901  | 6842348953158377901 ",
+      "6941261091797652072  | 6941261091797652072 ",
+      "7273596521315663110  | 7273596521315663110 ",
+      "7504504064263669287  | 7504504064263669287 ",
+      "788787457839692041   | 788787457839692041  ",
+      "7955079406183515637  | 7955079406183515637 ",
+      "8549944162621642512  | 8549944162621642512 ",
+      "8603989663476771718  | 8603989663476771718 ",
+      "8807817071862113702  | 8807817071862113702 ",
+      "9010467728050264449  | 9010467728050264449 ",
+      "10667007354186551956 | 10667007354186551956",
+      "10683692646452562431 | 10683692646452562431",
+      "10821471013040158923 | 10821471013040158923",
+      "10950412492527322440 | 10950412492527322440",
+      "11239168150708129139 | 11239168150708129139",
+      "1169089424364679180  | 1169089424364679180 ",
+      "11818186001859264308 | 11818186001859264308",
+      "11833901312327420776 | 11833901312327420776",
+      "11926759511765359899 | 11926759511765359899",
+      "11926873763676642186 | 11926873763676642186",
+      "11963748953446345529 | 11963748953446345529",
+      "11998794077335055257 | 11998794077335055257",
+      "12096659438561119542 | 12096659438561119542",
+      "12156940908066221323 | 12156940908066221323",
+      "12947799971452915849 | 12947799971452915849",
+      "13260572831089785859 | 13260572831089785859",
+      "13771804148684671731 | 13771804148684671731",
+      "14117161486975057715 | 14117161486975057715",
+      "14242321332569825828 | 14242321332569825828",
+      "14486903973548550719 | 14486903973548550719",
+      "14967026985784794439 | 14967026985784794439",
+      "15213854965919594827 | 15213854965919594827",
+      "15352856648520921629 | 15352856648520921629",
+      "15399114114227588261 | 15399114114227588261",
+      "15595235597337683065 | 15595235597337683065",
+      "16194613440650274502 | 16194613440650274502",
+      "1687184559264975024  | 1687184559264975024 ",
+      "17490665426807838719 | 17490665426807838719",
+      "18218388313430417611 | 18218388313430417611",
+      "2601737961087659062  | 2601737961087659062 ",
+      "261049867304784443   | 261049867304784443  ",
+      "2740103009342231109  | 2740103009342231109 ",
+      "2970700287221458280  | 2970700287221458280 ",
+      "3916589616287113937  | 3916589616287113937 ",
+      "4324745483838182873  | 4324745483838182873 ",
+      "4937104021912138218  | 4937104021912138218 ",
+      "5486140987150761883  | 5486140987150761883 ",
+      "5944830206637008055  | 5944830206637008055 ",
+      "6296367092202729479  | 6296367092202729479 ",
+      "6334824724549167320  | 6334824724549167320 ",
+      "6556961545928831643  | 6556961545928831643 ",
+      "6735196588112087610  | 6735196588112087610 ",
+      "7388428680384065704  | 7388428680384065704 ",
+      "8249030965139585917  | 8249030965139585917 ",
+      "837825985403119657   | 837825985403119657  ",
+      "8505906760983331750  | 8505906760983331750 ",
+      "8674665223082153551  | 8674665223082153551 ",
+      "894385949183117216   | 894385949183117216  ",
+      "898860202204764712   | 898860202204764712  ",
+      "9768663798983814715  | 9768663798983814715 ",
+      "9828766684487745566  | 9828766684487745566 ",
+      "9908585559158765387  | 9908585559158765387 ",
+      "9956202364908137547  | 9956202364908137547 "
+    })
+    void testSamplingAll(String traceId) {
+        DeterministicSampler sampler = new DeterministicSampler.TraceSampler(1);
+        DDSpan span = mock(DDSpan.class);
+        when(span.getTraceId()).thenReturn(DDTraceId.from(traceId));
 
-    assertTrue(sampler.sample(span));
-  }
+        assertTrue(sampler.sample(span));
+    }
 
-  @TableTest({
-    "rate       ",
-    "0.123456789",
-    "0.999999999"
-  })
-  void preservesConfiguredSampleRate(double rate) {
-    assertEquals(rate, new DeterministicSampler.TraceSampler(rate).getSampleRate());
-  }
+    @TableTest({
+      "rate       ",
+      "0.123456789",
+      "0.999999999"
+    })
+    void preservesConfiguredSampleRate(double rate) {
+        assertEquals(rate, new DeterministicSampler.TraceSampler(rate).getSampleRate());
+    }
 
-  @ParameterizedTest(name = "rate={0}")
-  @MethodSource("testCutoffCalculationArguments")
-  void testCutoffCalculation(int rate) {
-    // Groovy's integer division uses BigDecimal arithmetic, equivalent to double precision
-    // here
-    long cutoff = DeterministicSampler.cutoff(rate / 100.0);
+    @ParameterizedTest(name = "rate={0}")
+    @MethodSource("testCutoffCalculationArguments")
+    void testCutoffCalculation(int rate) {
+        // Groovy's integer division uses BigDecimal arithmetic, equivalent to double precision
+        // here
+        long cutoff = DeterministicSampler.cutoff(rate / 100.0);
 
-    BigDecimal cutoffFactor =
-        new BigDecimal(BigInteger.valueOf(2).pow(64).subtract(BigInteger.ONE));
-    long expected =
-        new BigDecimal(rate / 100D).multiply(cutoffFactor).toBigInteger().longValue()
-            + Long.MIN_VALUE;
-    assertTrue(Math.abs(cutoff - expected) <= 1);
-  }
+        BigDecimal cutoffFactor = new BigDecimal(BigInteger.valueOf(2).pow(64).subtract(BigInteger.ONE));
+        long expected = new BigDecimal(rate / 100D)
+                        .multiply(cutoffFactor)
+                        .toBigInteger()
+                        .longValue()
+                + Long.MIN_VALUE;
+        assertTrue(Math.abs(cutoff - expected) <= 1);
+    }
 
-  static Stream<Arguments> testCutoffCalculationArguments() {
-    return IntStream.rangeClosed(0, 100).mapToObj(Arguments::arguments);
-  }
+    static Stream<Arguments> testCutoffCalculationArguments() {
+        return IntStream.rangeClosed(0, 100).mapToObj(Arguments::arguments);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/ForcePrioritySamplerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/ForcePrioritySamplerTest.java
index 6553672e57e..04e4703c366 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/ForcePrioritySamplerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/ForcePrioritySamplerTest.java
@@ -20,108 +20,108 @@
 
 class ForcePrioritySamplerTest extends DDCoreJavaSpecification {
 
-  private final ListWriter writer = new ListWriter();
+    private final ListWriter writer = new ListWriter();
 
-  @TableTest({
-    "scenario             | prioritySampling              | samplingMechanism                  | expectedSampling             ",
-    "SAMPLER_KEEP DEFAULT | PrioritySampling.SAMPLER_KEEP | SamplingMechanism.DEFAULT          | PrioritySampling.SAMPLER_KEEP",
-    "SAMPLER_DROP DEFAULT | PrioritySampling.SAMPLER_DROP | SamplingMechanism.DEFAULT          | PrioritySampling.SAMPLER_DROP",
-    "SAMPLER_KEEP AGENT   | PrioritySampling.SAMPLER_KEEP | SamplingMechanism.AGENT_RATE       | PrioritySampling.SAMPLER_KEEP",
-    "SAMPLER_DROP AGENT   | PrioritySampling.SAMPLER_DROP | SamplingMechanism.AGENT_RATE       | PrioritySampling.SAMPLER_DROP",
-    "SAMPLER_KEEP REMOTE  | PrioritySampling.SAMPLER_KEEP | SamplingMechanism.REMOTE_AUTO_RATE | PrioritySampling.SAMPLER_KEEP",
-    "SAMPLER_DROP REMOTE  | PrioritySampling.SAMPLER_DROP | SamplingMechanism.REMOTE_AUTO_RATE | PrioritySampling.SAMPLER_DROP"
-  })
-  void forcePrioritySampling(
-      @ConvertWith(PrioritySamplingConverter.class) int prioritySampling,
-      @ConvertWith(SamplingMechanismConverter.class) int samplingMechanism,
-      @ConvertWith(PrioritySamplingConverter.class) int expectedSampling) {
-    ForcePrioritySampler sampler = new ForcePrioritySampler(prioritySampling, samplingMechanism);
-    CoreTracer tracer = tracerBuilder().writer(writer).sampler(sampler).build();
-    try {
-      DDSpan span1 = (DDSpan) tracer.buildSpan("datadog", "test").start();
-      sampler.setSamplingPriority(span1);
+    @TableTest({
+      "scenario             | prioritySampling              | samplingMechanism                  | expectedSampling             ",
+      "SAMPLER_KEEP DEFAULT | PrioritySampling.SAMPLER_KEEP | SamplingMechanism.DEFAULT          | PrioritySampling.SAMPLER_KEEP",
+      "SAMPLER_DROP DEFAULT | PrioritySampling.SAMPLER_DROP | SamplingMechanism.DEFAULT          | PrioritySampling.SAMPLER_DROP",
+      "SAMPLER_KEEP AGENT   | PrioritySampling.SAMPLER_KEEP | SamplingMechanism.AGENT_RATE       | PrioritySampling.SAMPLER_KEEP",
+      "SAMPLER_DROP AGENT   | PrioritySampling.SAMPLER_DROP | SamplingMechanism.AGENT_RATE       | PrioritySampling.SAMPLER_DROP",
+      "SAMPLER_KEEP REMOTE  | PrioritySampling.SAMPLER_KEEP | SamplingMechanism.REMOTE_AUTO_RATE | PrioritySampling.SAMPLER_KEEP",
+      "SAMPLER_DROP REMOTE  | PrioritySampling.SAMPLER_DROP | SamplingMechanism.REMOTE_AUTO_RATE | PrioritySampling.SAMPLER_DROP"
+    })
+    void forcePrioritySampling(
+            @ConvertWith(PrioritySamplingConverter.class) int prioritySampling,
+            @ConvertWith(SamplingMechanismConverter.class) int samplingMechanism,
+            @ConvertWith(PrioritySamplingConverter.class) int expectedSampling) {
+        ForcePrioritySampler sampler = new ForcePrioritySampler(prioritySampling, samplingMechanism);
+        CoreTracer tracer = tracerBuilder().writer(writer).sampler(sampler).build();
+        try {
+            DDSpan span1 = (DDSpan) tracer.buildSpan("datadog", "test").start();
+            sampler.setSamplingPriority(span1);
 
-      assertEquals(expectedSampling, span1.getSamplingPriority());
-      assertTrue(sampler.sample(span1));
-    } finally {
-      tracer.close();
+            assertEquals(expectedSampling, span1.getSamplingPriority());
+            assertTrue(sampler.sample(span1));
+        } finally {
+            tracer.close();
+        }
     }
-  }
 
-  @TableTest({
-    "scenario             | prioritySampling              | samplingMechanism         | expectedSampling             ",
-    "SAMPLER_KEEP DEFAULT | PrioritySampling.SAMPLER_KEEP | SamplingMechanism.DEFAULT | PrioritySampling.SAMPLER_KEEP",
-    "SAMPLER_DROP DEFAULT | PrioritySampling.SAMPLER_DROP | SamplingMechanism.DEFAULT | PrioritySampling.SAMPLER_DROP"
-  })
-  void samplingPrioritySet(
-      @ConvertWith(PrioritySamplingConverter.class) int prioritySampling,
-      @ConvertWith(SamplingMechanismConverter.class) int samplingMechanism,
-      @ConvertWith(PrioritySamplingConverter.class) int expectedSampling)
-      throws Exception {
-    ForcePrioritySampler sampler = new ForcePrioritySampler(prioritySampling, samplingMechanism);
-    CoreTracer tracer = tracerBuilder().writer(writer).sampler(sampler).build();
-    try {
-      DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
+    @TableTest({
+      "scenario             | prioritySampling              | samplingMechanism         | expectedSampling             ",
+      "SAMPLER_KEEP DEFAULT | PrioritySampling.SAMPLER_KEEP | SamplingMechanism.DEFAULT | PrioritySampling.SAMPLER_KEEP",
+      "SAMPLER_DROP DEFAULT | PrioritySampling.SAMPLER_DROP | SamplingMechanism.DEFAULT | PrioritySampling.SAMPLER_DROP"
+    })
+    void samplingPrioritySet(
+            @ConvertWith(PrioritySamplingConverter.class) int prioritySampling,
+            @ConvertWith(SamplingMechanismConverter.class) int samplingMechanism,
+            @ConvertWith(PrioritySamplingConverter.class) int expectedSampling)
+            throws Exception {
+        ForcePrioritySampler sampler = new ForcePrioritySampler(prioritySampling, samplingMechanism);
+        CoreTracer tracer = tracerBuilder().writer(writer).sampler(sampler).build();
+        try {
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
 
-      assertNull(span.getSamplingPriority());
+            assertNull(span.getSamplingPriority());
 
-      span.setTag(DDTags.SERVICE_NAME, "spock");
+            span.setTag(DDTags.SERVICE_NAME, "spock");
 
-      span.finish();
-      writer.waitForTraces(1);
-      assertEquals(expectedSampling, span.getSamplingPriority());
-    } finally {
-      tracer.close();
+            span.finish();
+            writer.waitForTraces(1);
+            assertEquals(expectedSampling, span.getSamplingPriority());
+        } finally {
+            tracer.close();
+        }
     }
-  }
 
-  @TableTest({
-    "scenario         | tagName     | tagValue | expectedPriority          ",
-    "manual.drop true | manual.drop | true     | PrioritySampling.USER_DROP",
-    "manual.keep true | manual.keep | true     | PrioritySampling.USER_KEEP"
-  })
-  void settingForcedTracingViaTag(
-      String tagName,
-      boolean tagValue,
-      @ConvertWith(PrioritySamplingConverter.class) int expectedPriority) {
-    ForcePrioritySampler sampler =
-        new ForcePrioritySampler(PrioritySampling.SAMPLER_KEEP, SamplingMechanism.DEFAULT);
-    CoreTracer tracer = tracerBuilder().writer(new LoggingWriter()).sampler(sampler).build();
-    try {
-      DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
-      span.setTag(tagName, tagValue);
-      span.finish();
+    @TableTest({
+      "scenario         | tagName     | tagValue | expectedPriority          ",
+      "manual.drop true | manual.drop | true     | PrioritySampling.USER_DROP",
+      "manual.keep true | manual.keep | true     | PrioritySampling.USER_KEEP"
+    })
+    void settingForcedTracingViaTag(
+            String tagName, boolean tagValue, @ConvertWith(PrioritySamplingConverter.class) int expectedPriority) {
+        ForcePrioritySampler sampler =
+                new ForcePrioritySampler(PrioritySampling.SAMPLER_KEEP, SamplingMechanism.DEFAULT);
+        CoreTracer tracer =
+                tracerBuilder().writer(new LoggingWriter()).sampler(sampler).build();
+        try {
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
+            span.setTag(tagName, tagValue);
+            span.finish();
 
-      assertEquals(expectedPriority, span.getSamplingPriority());
-    } finally {
-      tracer.close();
+            assertEquals(expectedPriority, span.getSamplingPriority());
+        } finally {
+            tracer.close();
+        }
     }
-  }
 
-  @TableTest({
-    "scenario          | tagName     | tagValue",
-    "no tag            |             |         ",
-    "manual.drop false | manual.drop | false   ",
-    "manual.keep false | manual.keep | false   ",
-    "manual.drop 1     | manual.drop | 1       ",
-    "manual.keep 1     | manual.keep | 1       "
-  })
-  void notSettingForcedTracingViaTagOrSettingItWrongValueNotCausingException(
-      String tagName, @ConvertWith(BoxedValueConverter.class) Object tagValue) {
-    ForcePrioritySampler sampler =
-        new ForcePrioritySampler(PrioritySampling.SAMPLER_KEEP, SamplingMechanism.DEFAULT);
-    CoreTracer tracer = tracerBuilder().writer(new LoggingWriter()).sampler(sampler).build();
-    try {
-      DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
-      if (tagName != null) {
-        span.setTag(tagName, tagValue);
-      }
+    @TableTest({
+      "scenario          | tagName     | tagValue",
+      "no tag            |             |         ",
+      "manual.drop false | manual.drop | false   ",
+      "manual.keep false | manual.keep | false   ",
+      "manual.drop 1     | manual.drop | 1       ",
+      "manual.keep 1     | manual.keep | 1       "
+    })
+    void notSettingForcedTracingViaTagOrSettingItWrongValueNotCausingException(
+            String tagName, @ConvertWith(BoxedValueConverter.class) Object tagValue) {
+        ForcePrioritySampler sampler =
+                new ForcePrioritySampler(PrioritySampling.SAMPLER_KEEP, SamplingMechanism.DEFAULT);
+        CoreTracer tracer =
+                tracerBuilder().writer(new LoggingWriter()).sampler(sampler).build();
+        try {
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
+            if (tagName != null) {
+                span.setTag(tagName, tagValue);
+            }
 
-      assertNull(span.getSamplingPriority());
+            assertNull(span.getSamplingPriority());
 
-      span.finish();
-    } finally {
-      tracer.close();
+            span.finish();
+        } finally {
+            tracer.close();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/ParentBasedAlwaysOnSamplerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/ParentBasedAlwaysOnSamplerTest.java
index 19369beeac9..ac530d24b0e 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/ParentBasedAlwaysOnSamplerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/ParentBasedAlwaysOnSamplerTest.java
@@ -20,99 +20,105 @@
 
 class ParentBasedAlwaysOnSamplerTest {
 
-  private final ListWriter writer = new ListWriter();
-  private CoreTracer tracer;
+    private final ListWriter writer = new ListWriter();
+    private CoreTracer tracer;
+
+    @AfterEach
+    void tearDown() {
+        if (tracer != null) {
+            tracer.close();
+        }
+    }
 
-  @AfterEach
-  void tearDown() {
-    if (tracer != null) {
-      tracer.close();
+    private CoreTracer buildTracer(ParentBasedAlwaysOnSampler sampler) {
+        tracer = CoreTracer.builder().writer(writer).sampler(sampler).build();
+        return tracer;
     }
-  }
-
-  private CoreTracer buildTracer(ParentBasedAlwaysOnSampler sampler) {
-    tracer = CoreTracer.builder().writer(writer).sampler(sampler).build();
-    return tracer;
-  }
-
-  @Test
-  void alwaysSamplesSpans() {
-    ParentBasedAlwaysOnSampler sampler = new ParentBasedAlwaysOnSampler();
-    CoreTracer tracer = buildTracer(sampler);
-
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
-    try {
-      assertTrue(sampler.sample(span));
-    } finally {
-      span.finish();
+
+    @Test
+    void alwaysSamplesSpans() {
+        ParentBasedAlwaysOnSampler sampler = new ParentBasedAlwaysOnSampler();
+        CoreTracer tracer = buildTracer(sampler);
+
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
+        try {
+            assertTrue(sampler.sample(span));
+        } finally {
+            span.finish();
+        }
     }
-  }
-
-  @Test
-  void setsSamplingPriorityToSamplerKeep() {
-    ParentBasedAlwaysOnSampler sampler = new ParentBasedAlwaysOnSampler();
-    CoreTracer tracer = buildTracer(sampler);
-
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
-    try {
-      sampler.setSamplingPriority(span);
-      assertEquals(SAMPLER_KEEP, span.getSamplingPriority());
-    } finally {
-      span.finish();
+
+    @Test
+    void setsSamplingPriorityToSamplerKeep() {
+        ParentBasedAlwaysOnSampler sampler = new ParentBasedAlwaysOnSampler();
+        CoreTracer tracer = buildTracer(sampler);
+
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
+        try {
+            sampler.setSamplingPriority(span);
+            assertEquals(SAMPLER_KEEP, span.getSamplingPriority());
+        } finally {
+            span.finish();
+        }
     }
-  }
-
-  @Test
-  void childSpanInheritsSamplingPriorityFromLocalParent() {
-    ParentBasedAlwaysOnSampler sampler = new ParentBasedAlwaysOnSampler();
-    CoreTracer tracer = buildTracer(sampler);
-
-    DDSpan rootSpan = (DDSpan) tracer.buildSpan("datadog", "root").start();
-    sampler.setSamplingPriority(rootSpan);
-    DDSpan childSpan =
-        (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.spanContext()).start();
-    try {
-      assertEquals(SAMPLER_KEEP, rootSpan.getSamplingPriority());
-      assertEquals(SAMPLER_KEEP, childSpan.getSamplingPriority());
-    } finally {
-      childSpan.finish();
-      rootSpan.finish();
+
+    @Test
+    void childSpanInheritsSamplingPriorityFromLocalParent() {
+        ParentBasedAlwaysOnSampler sampler = new ParentBasedAlwaysOnSampler();
+        CoreTracer tracer = buildTracer(sampler);
+
+        DDSpan rootSpan = (DDSpan) tracer.buildSpan("datadog", "root").start();
+        sampler.setSamplingPriority(rootSpan);
+        DDSpan childSpan = (DDSpan) tracer.buildSpan("datadog", "child")
+                .asChildOf(rootSpan.spanContext())
+                .start();
+        try {
+            assertEquals(SAMPLER_KEEP, rootSpan.getSamplingPriority());
+            assertEquals(SAMPLER_KEEP, childSpan.getSamplingPriority());
+        } finally {
+            childSpan.finish();
+            rootSpan.finish();
+        }
     }
-  }
-
-  @TableTest({
-    "scenario     | parentPriority",
-    "sampler keep | 1             ",
-    "sampler drop | 0             ",
-    "user keep    | 2             ",
-    "user drop    | -1            "
-  })
-  @ParameterizedTest(name = "child span inherits sampling decision from remote parent [{index}]")
-  void childSpanInheritsSamplingDecisionFromRemoteParent(int parentPriority) {
-    ParentBasedAlwaysOnSampler sampler = new ParentBasedAlwaysOnSampler();
-    CoreTracer tracer = buildTracer(sampler);
-
-    ExtractedContext extractedContext =
-        new ExtractedContext(
-            DDTraceId.ONE, 2, parentPriority, null, PropagationTags.factory().empty(), DATADOG);
-
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(extractedContext).start();
-    try {
-      assertEquals(parentPriority, span.getSamplingPriority());
-    } finally {
-      span.finish();
+
+    @TableTest({
+      "scenario     | parentPriority",
+      "sampler keep | 1             ",
+      "sampler drop | 0             ",
+      "user keep    | 2             ",
+      "user drop    | -1            "
+    })
+    @ParameterizedTest(name = "child span inherits sampling decision from remote parent [{index}]")
+    void childSpanInheritsSamplingDecisionFromRemoteParent(int parentPriority) {
+        ParentBasedAlwaysOnSampler sampler = new ParentBasedAlwaysOnSampler();
+        CoreTracer tracer = buildTracer(sampler);
+
+        ExtractedContext extractedContext = new ExtractedContext(
+                DDTraceId.ONE,
+                2,
+                parentPriority,
+                null,
+                PropagationTags.factory().empty(),
+                DATADOG);
+
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("datadog", "child").asChildOf(extractedContext).start();
+        try {
+            assertEquals(parentPriority, span.getSamplingPriority());
+        } finally {
+            span.finish();
+        }
+    }
+
+    @Test
+    void isNotARemoteResponseListener() {
+        ParentBasedAlwaysOnSampler sampler = new ParentBasedAlwaysOnSampler();
+        assertFalse(sampler instanceof RemoteResponseListener);
+    }
+
+    @Test
+    void implementsPrioritySampler() {
+        ParentBasedAlwaysOnSampler sampler = new ParentBasedAlwaysOnSampler();
+        assertTrue(sampler instanceof PrioritySampler);
     }
-  }
-
-  @Test
-  void isNotARemoteResponseListener() {
-    ParentBasedAlwaysOnSampler sampler = new ParentBasedAlwaysOnSampler();
-    assertFalse(sampler instanceof RemoteResponseListener);
-  }
-
-  @Test
-  void implementsPrioritySampler() {
-    ParentBasedAlwaysOnSampler sampler = new ParentBasedAlwaysOnSampler();
-    assertTrue(sampler instanceof PrioritySampler);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/RateByServiceTraceSamplerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/RateByServiceTraceSamplerTest.java
index e77195183d0..14c17d29849 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/RateByServiceTraceSamplerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/RateByServiceTraceSamplerTest.java
@@ -30,485 +30,457 @@
 @TypeConverterSources(TableTestTypeConverters.class)
 class RateByServiceTraceSamplerTest extends DDCoreJavaSpecification {
 
-  /** Build a rate_by_service response map from a single entry (the fallback key). */
-  private static Map<String, Map<String, Number>> rateResponse(String key, Number rate) {
-    Map<String, Number> byService = new HashMap<>();
-    byService.put(key, rate);
-    Map<String, Map<String, Number>> response = new HashMap<>();
-    response.put("rate_by_service", byService);
-    return response;
-  }
-
-  /** Build a rate_by_service response map from multiple entries preserving insertion order. */
-  private static Map<String, Map<String, Number>> rateResponse(String[][] entries) {
-    Map<String, Number> byService = new LinkedHashMap<>();
-    for (String[] entry : entries) {
-      byService.put(entry[0], entry[1] == null ? null : Double.parseDouble(entry[1]));
+    /** Build a rate_by_service response map from a single entry (the fallback key). */
+    private static Map<String, Map<String, Number>> rateResponse(String key, Number rate) {
+        Map<String, Number> byService = new HashMap<>();
+        byService.put(key, rate);
+        Map<String, Map<String, Number>> response = new HashMap<>();
+        response.put("rate_by_service", byService);
+        return response;
     }
-    Map<String, Map<String, Number>> response = new HashMap<>();
-    response.put("rate_by_service", byService);
-    return response;
-  }
-
-  // these values are all precisely represented in floating point
-  @TableTest({
-    "scenario  | rate | expectedRate",
-    "null rate |      | 1.0         ",
-    "rate 1    | 1    | 1.0         ",
-    "rate 0    | 0    | 0.0         ",
-    "rate -5   | -5   | 1.0         ",
-    "rate 5    | 5    | 1.0         ",
-    "rate 0.5  | 0.5  | 0.5         "
-  })
-  void invalidRateTo1(Number rate, double expectedRate) {
-    RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
-    Map<String, Number> byService = new HashMap<>();
-    byService.put("service:,env:", rate);
-    Map<String, Map<String, Number>> response = new HashMap<>();
-    response.put("rate_by_service", byService);
-    serviceSampler.onResponse("traces", response);
-
-    assertEquals(expectedRate, serviceSampler.fallbackSampleRate(), 1e-6);
-    assertEquals(expectedRate, serviceSampler.sampleRateFor("not", "found"), 1e-6);
-  }
-
-  @TableTest({
-    "scenario            | service | env   | expectedRate",
-    "foo/bar             | foo     | bar   | 0.8         ",
-    "Foo/BAR case insens | Foo     | BAR   | 0.8         ",
-    "FOO/BAR case insens | FOO     | BAR   | 0.8         ",
-    "not found           | not     | found | 0.2         ",
-    "foo/baz fallback    | foo     | baz   | 0.2         ",
-    "fu/bar no match     | fu      | bar   | 0.2         "
-  })
-  void rateSelection(String service, String env, double expectedRate) {
-    RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
-    serviceSampler.onResponse(
-        "traces",
-        rateResponse(
-            new String[][] {
-              {"service:foo,env:bar", "0.8"},
-              {"service:,env:", "0.20"}
-            }));
 
-    double sampleRate = serviceSampler.sampleRateFor(env, service);
-    assertTrue(sampleRate > expectedRate - 0.01);
-    assertTrue(sampleRate < expectedRate + 0.01);
-  }
-
-  // case insensitive equivalence -- undefined behavior, first one wins
-  @TableTest({
-    "scenario | service | env | expectedRate",
-    "foo/bar  | foo     | bar | 0.8         ",
-    "foo/Bar  | foo     | Bar | 0.8         ",
-    "Foo/BAR  | Foo     | BAR | 0.8         ",
-    "FOO/BAR  | FOO     | BAR | 0.8         ",
-    "foo/baz  | foo     | baz | 0.3         ",
-    "FOO/BAZ  | FOO     | BAZ | 0.3         ",
-    "quux/baz | quux    | baz | 0.4         "
-  })
-  void ratePartialAndFullCollisions(String service, String env, double expectedRate) {
-    RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
-    serviceSampler.onResponse(
-        "traces",
-        rateResponse(
-            new String[][] {
-              {"service:foo,env:bar", "0.8"},
-              {"service:FOO,env:BAR", "0.2"},
-              {"service:FOO,env:BAZ", "0.3"},
-              {"service:quux,env:BAZ", "0.4"}
-            }));
+    /** Build a rate_by_service response map from multiple entries preserving insertion order. */
+    private static Map<String, Map<String, Number>> rateResponse(String[][] entries) {
+        Map<String, Number> byService = new LinkedHashMap<>();
+        for (String[] entry : entries) {
+            byService.put(entry[0], entry[1] == null ? null : Double.parseDouble(entry[1]));
+        }
+        Map<String, Map<String, Number>> response = new HashMap<>();
+        response.put("rate_by_service", byService);
+        return response;
+    }
+
+    // these values are all precisely represented in floating point
+    @TableTest({
+      "scenario  | rate | expectedRate",
+      "null rate |      | 1.0         ",
+      "rate 1    | 1    | 1.0         ",
+      "rate 0    | 0    | 0.0         ",
+      "rate -5   | -5   | 1.0         ",
+      "rate 5    | 5    | 1.0         ",
+      "rate 0.5  | 0.5  | 0.5         "
+    })
+    void invalidRateTo1(Number rate, double expectedRate) {
+        RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
+        Map<String, Number> byService = new HashMap<>();
+        byService.put("service:,env:", rate);
+        Map<String, Map<String, Number>> response = new HashMap<>();
+        response.put("rate_by_service", byService);
+        serviceSampler.onResponse("traces", response);
+
+        assertEquals(expectedRate, serviceSampler.fallbackSampleRate(), 1e-6);
+        assertEquals(expectedRate, serviceSampler.sampleRateFor("not", "found"), 1e-6);
+    }
+
+    @TableTest({
+      "scenario            | service | env   | expectedRate",
+      "foo/bar             | foo     | bar   | 0.8         ",
+      "Foo/BAR case insens | Foo     | BAR   | 0.8         ",
+      "FOO/BAR case insens | FOO     | BAR   | 0.8         ",
+      "not found           | not     | found | 0.2         ",
+      "foo/baz fallback    | foo     | baz   | 0.2         ",
+      "fu/bar no match     | fu      | bar   | 0.2         "
+    })
+    void rateSelection(String service, String env, double expectedRate) {
+        RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
+        serviceSampler.onResponse("traces", rateResponse(new String[][] {
+            {"service:foo,env:bar", "0.8"},
+            {"service:,env:", "0.20"}
+        }));
+
+        double sampleRate = serviceSampler.sampleRateFor(env, service);
+        assertTrue(sampleRate > expectedRate - 0.01);
+        assertTrue(sampleRate < expectedRate + 0.01);
+    }
 
-    double sampleRate = serviceSampler.sampleRateFor(env, service);
-    assertTrue(sampleRate > expectedRate - 0.01);
-    assertTrue(sampleRate < expectedRate + 0.01);
-  }
-
-  @Test
-  void rateByServiceName() {
-    RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
-    ListWriter writer = new ListWriter();
-    CoreTracer tracer = tracerBuilder().writer(writer).build();
-    try {
-      serviceSampler.onResponse("traces", rateResponse("service:spock,env:test", 0.0));
-      DDSpan span1 =
-          (DDSpan)
-              tracer
-                  .buildSpan("datadog", "fakeOperation")
-                  .withServiceName("foo")
-                  .withTag("env", "bar")
-                  .ignoreActiveSpan()
-                  .start();
-      serviceSampler.setSamplingPriority(span1);
-
-      assertEquals(SAMPLER_KEEP, span1.getSamplingPriority());
-      assertTrue(serviceSampler.sample(span1));
-
-      // case-insensitive equivalence - undefined in spec, but implemented as first one wins
-      serviceSampler.onResponse(
-          "traces",
-          rateResponse(
-              new String[][] {
+    // case insensitive equivalence -- undefined behavior, first one wins
+    @TableTest({
+      "scenario | service | env | expectedRate",
+      "foo/bar  | foo     | bar | 0.8         ",
+      "foo/Bar  | foo     | Bar | 0.8         ",
+      "Foo/BAR  | Foo     | BAR | 0.8         ",
+      "FOO/BAR  | FOO     | BAR | 0.8         ",
+      "foo/baz  | foo     | baz | 0.3         ",
+      "FOO/BAZ  | FOO     | BAZ | 0.3         ",
+      "quux/baz | quux    | baz | 0.4         "
+    })
+    void ratePartialAndFullCollisions(String service, String env, double expectedRate) {
+        RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
+        serviceSampler.onResponse("traces", rateResponse(new String[][] {
+            {"service:foo,env:bar", "0.8"},
+            {"service:FOO,env:BAR", "0.2"},
+            {"service:FOO,env:BAZ", "0.3"},
+            {"service:quux,env:BAZ", "0.4"}
+        }));
+
+        double sampleRate = serviceSampler.sampleRateFor(env, service);
+        assertTrue(sampleRate > expectedRate - 0.01);
+        assertTrue(sampleRate < expectedRate + 0.01);
+    }
+
+    @Test
+    void rateByServiceName() {
+        RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
+        ListWriter writer = new ListWriter();
+        CoreTracer tracer = tracerBuilder().writer(writer).build();
+        try {
+            serviceSampler.onResponse("traces", rateResponse("service:spock,env:test", 0.0));
+            DDSpan span1 = (DDSpan) tracer.buildSpan("datadog", "fakeOperation")
+                    .withServiceName("foo")
+                    .withTag("env", "bar")
+                    .ignoreActiveSpan()
+                    .start();
+            serviceSampler.setSamplingPriority(span1);
+
+            assertEquals(SAMPLER_KEEP, span1.getSamplingPriority());
+            assertTrue(serviceSampler.sample(span1));
+
+            // case-insensitive equivalence - undefined in spec, but implemented as first one wins
+            serviceSampler.onResponse("traces", rateResponse(new String[][] {
                 {"service:spock,env:test", "1.0"},
                 {"service:SPOCK,env:Test", "0.0"}
-              }));
-      DDSpan span2 =
-          (DDSpan)
-              tracer
-                  .buildSpan("datadog", "fakeOperation")
-                  .withServiceName("spock")
-                  .withTag("env", "test")
-                  .ignoreActiveSpan()
-                  .start();
-      serviceSampler.setSamplingPriority(span2);
-
-      assertEquals(SAMPLER_KEEP, span2.getSamplingPriority());
-      assertTrue(serviceSampler.sample(span2));
-    } finally {
-      tracer.close();
+            }));
+            DDSpan span2 = (DDSpan) tracer.buildSpan("datadog", "fakeOperation")
+                    .withServiceName("spock")
+                    .withTag("env", "test")
+                    .ignoreActiveSpan()
+                    .start();
+            serviceSampler.setSamplingPriority(span2);
+
+            assertEquals(SAMPLER_KEEP, span2.getSamplingPriority());
+            assertTrue(serviceSampler.sample(span2));
+        } finally {
+            tracer.close();
+        }
     }
-  }
-
-  @Test
-  void rateByServiceNameCaseInsensitive() {
-    RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      serviceSampler.onResponse("traces", rateResponse("service:spock,env:test", 1.0));
-      DDSpan span =
-          (DDSpan)
-              tracer
-                  .buildSpan("datadog", "fakeOperation")
-                  .withServiceName("SPOCK")
-                  .withTag("env", "Test")
-                  .ignoreActiveSpan()
-                  .start();
-      serviceSampler.setSamplingPriority(span);
-
-      assertEquals(SAMPLER_KEEP, span.getSamplingPriority());
-      assertTrue(serviceSampler.sample(span));
-    } finally {
-      tracer.close();
+
+    @Test
+    void rateByServiceNameCaseInsensitive() {
+        RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            serviceSampler.onResponse("traces", rateResponse("service:spock,env:test", 1.0));
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "fakeOperation")
+                    .withServiceName("SPOCK")
+                    .withTag("env", "Test")
+                    .ignoreActiveSpan()
+                    .start();
+            serviceSampler.setSamplingPriority(span);
+
+            assertEquals(SAMPLER_KEEP, span.getSamplingPriority());
+            assertTrue(serviceSampler.sample(span));
+        } finally {
+            tracer.close();
+        }
     }
-  }
-
-  @Test
-  void samplingPrioritySetOnContext() {
-    RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    serviceSampler.onResponse("traces", rateResponse("service:,env:", 1.0));
-    try {
-      DDSpan span =
-          (DDSpan)
-              tracer
-                  .buildSpan("datadog", "fakeOperation")
-                  .withServiceName("spock")
-                  .withTag("env", "test")
-                  .ignoreActiveSpan()
-                  .start();
-      serviceSampler.setSamplingPriority(span);
-
-      // sets correctly on root span
-      assertEquals(SAMPLER_KEEP, span.getSamplingPriority());
-      // RateByServiceSampler must not set the sample rate
-      assertNull(span.getTag(DDSpanContext.SAMPLE_RATE_KEY));
-    } finally {
-      tracer.close();
+
+    @Test
+    void samplingPrioritySetOnContext() {
+        RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        serviceSampler.onResponse("traces", rateResponse("service:,env:", 1.0));
+        try {
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "fakeOperation")
+                    .withServiceName("spock")
+                    .withTag("env", "test")
+                    .ignoreActiveSpan()
+                    .start();
+            serviceSampler.setSamplingPriority(span);
+
+            // sets correctly on root span
+            assertEquals(SAMPLER_KEEP, span.getSamplingPriority());
+            // RateByServiceSampler must not set the sample rate
+            assertNull(span.getTag(DDSpanContext.SAMPLE_RATE_KEY));
+        } finally {
+            tracer.close();
+        }
     }
-  }
-
-  @Test
-  void defaultFallbackEmitsConsistentProbabilityStateBeforeAgentResponse() {
-    RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      assertDefaultFallbackSampling(serviceSampler, tracer);
-    } finally {
-      tracer.close();
+
+    @Test
+    void defaultFallbackEmitsConsistentProbabilityStateBeforeAgentResponse() {
+        RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            assertDefaultFallbackSampling(serviceSampler, tracer);
+        } finally {
+            tracer.close();
+        }
     }
-  }
-
-  @Test
-  void emptyAndNullOnlyResponsesKeepDefaultProbabilityFallback() {
-    RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      serviceSampler.onResponse("traces", rateResponse(new String[0][0]));
-      assertEquals(1.0, serviceSampler.fallbackSampleRate());
-      assertDefaultFallbackSampling(serviceSampler, tracer);
-
-      serviceSampler.onResponse("traces", rateResponse("service:,env:", null));
-      assertEquals(1.0, serviceSampler.fallbackSampleRate());
-      assertDefaultFallbackSampling(serviceSampler, tracer);
-    } finally {
-      tracer.close();
+
+    @Test
+    void emptyAndNullOnlyResponsesKeepDefaultProbabilityFallback() {
+        RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            serviceSampler.onResponse("traces", rateResponse(new String[0][0]));
+            assertEquals(1.0, serviceSampler.fallbackSampleRate());
+            assertDefaultFallbackSampling(serviceSampler, tracer);
+
+            serviceSampler.onResponse("traces", rateResponse("service:,env:", null));
+            assertEquals(1.0, serviceSampler.fallbackSampleRate());
+            assertDefaultFallbackSampling(serviceSampler, tracer);
+        } finally {
+            tracer.close();
+        }
     }
-  }
-
-  private static void assertDefaultFallbackSampling(
-      RateByServiceTraceSampler serviceSampler, CoreTracer tracer) {
-    DDSpan span =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", "fallback")
+
+    private static void assertDefaultFallbackSampling(RateByServiceTraceSampler serviceSampler, CoreTracer tracer) {
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "fallback")
                 .withServiceName("spock")
                 .ignoreActiveSpan()
                 .start();
 
-    serviceSampler.setSamplingPriority(span);
-
-    assertEquals(SAMPLER_KEEP, span.getSamplingPriority());
-    String tracestate = span.spanContext().getPropagationTags().headerValue(W3C);
-    assertTrue(tracestate.matches(".*ot=rv:[0-9a-f]{14};th:0.*"), tracestate);
-    span.finish();
-  }
-
-  @Test
-  void samplingPrioritySetWhenServiceLater() throws Exception {
-    RateByServiceTraceSampler sampler = new RateByServiceTraceSampler();
-    ListWriter writer = new ListWriter();
-    CoreTracer tracer = tracerBuilder().writer(writer).sampler(sampler).build();
-    try {
-      sampler.onResponse(
-          "test",
-          rateResponse(
-              new String[][] {
+        serviceSampler.setSamplingPriority(span);
+
+        assertEquals(SAMPLER_KEEP, span.getSamplingPriority());
+        String tracestate = span.spanContext().getPropagationTags().headerValue(W3C);
+        assertTrue(tracestate.matches(".*ot=rv:[0-9a-f]{14};th:0.*"), tracestate);
+        span.finish();
+    }
+
+    @Test
+    void samplingPrioritySetWhenServiceLater() throws Exception {
+        RateByServiceTraceSampler sampler = new RateByServiceTraceSampler();
+        ListWriter writer = new ListWriter();
+        CoreTracer tracer = tracerBuilder().writer(writer).sampler(sampler).build();
+        try {
+            sampler.onResponse("test", rateResponse(new String[][] {
                 {"service:,env:", "1.0"},
                 {"service:spock,env:", "0.0"}
-              }));
+            }));
+
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
+
+            assertNull(span.getSamplingPriority());
+
+            span.setTag(DDTags.SERVICE_NAME, "spock");
+
+            span.finish();
+            writer.waitForTraces(1);
+            assertEquals(SAMPLER_DROP, span.getSamplingPriority());
+
+            span = (DDSpan) tracer.buildSpan("datadog", "test")
+                    .withTag(DDTags.SERVICE_NAME, "spock")
+                    .start();
+            span.finish();
+            writer.waitForTraces(2);
+
+            assertEquals(SAMPLER_DROP, span.getSamplingPriority());
+        } finally {
+            tracer.close();
+        }
+    }
 
-      DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
+    @TableTest({
+      "scenario         | tagName     | tagValue | expectedPriority          ",
+      "manual.drop true | manual.drop | true     | PrioritySampling.USER_DROP",
+      "manual.keep true | manual.keep | true     | PrioritySampling.USER_KEEP"
+    })
+    void settingForcedTracingViaTag(
+            String tagName, boolean tagValue, @ConvertWith(PrioritySamplingConverter.class) int expectedPriority) {
+        RateByServiceTraceSampler sampler = new RateByServiceTraceSampler();
+        CoreTracer tracer =
+                tracerBuilder().writer(new LoggingWriter()).sampler(sampler).build();
+        try {
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
+            span.setTag(tagName, tagValue);
+            span.finish();
+
+            assertEquals(expectedPriority, span.getSamplingPriority());
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    void shouldCapReturnsFalseWhenRateDecreasesOrStaysSame() {
+        assertFalse(RateByServiceTraceSampler.shouldCap(0.8, 0.4));
+        assertFalse(RateByServiceTraceSampler.shouldCap(0.5, 0.5));
+        assertFalse(RateByServiceTraceSampler.shouldCap(0.5, 1.0)); // 1.0 <= 0.5 * 2, no cap needed
+    }
+
+    @Test
+    void shouldCapReturnsFalseWhenOldRateIsZero() {
+        assertFalse(RateByServiceTraceSampler.shouldCap(0.0, 0.5));
+        assertFalse(RateByServiceTraceSampler.shouldCap(0.0, 1.0));
+    }
+
+    @Test
+    void shouldCapReturnsTrueWhenNewRateExceeds2xOldRate() {
+        assertTrue(RateByServiceTraceSampler.shouldCap(0.1, 1.0));
+        assertTrue(RateByServiceTraceSampler.shouldCap(0.2, 0.8));
+        assertTrue(RateByServiceTraceSampler.shouldCap(0.1, 0.3));
+    }
+
+    @Test
+    void cappedRateReturns2xOldRate() {
+        assertEquals(0.2, RateByServiceTraceSampler.cappedRate(0.1), 1e-6);
+        assertEquals(0.4, RateByServiceTraceSampler.cappedRate(0.2), 1e-6);
+        assertEquals(0.8, RateByServiceTraceSampler.cappedRate(0.4), 1e-6);
+    }
+
+    @Test
+    void rampUpCapsRateIncreasesAt2xPerInterval() {
+        ControllableTimeSource time = new ControllableTimeSource();
+        time.set(1_000_000_000L);
+        RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler(time);
+        double tolerance = 0.01;
+
+        // Set initial rate to 0.1
+        serviceSampler.onResponse("traces", rateResponse(new String[][] {
+            {"service:foo,env:bar", "0.1"}, {"service:,env:", "0.1"}
+        }));
+
+        assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.1) < tolerance);
+
+        // agent restart sends rate 1.0, first interval
+        time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS);
+        Map<String, Map<String, Number>> highRateResponse =
+                rateResponse(new String[][] {{"service:foo,env:bar", "1.0"}, {"service:,env:", "1.0"}});
+        serviceSampler.onResponse("traces", highRateResponse);
+
+        // rate is capped at 2x = 0.2
+        assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.2) < tolerance);
+        assertTrue(Math.abs(serviceSampler.fallbackSampleRate() - 0.2) < tolerance);
+
+        // second interval
+        time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS);
+        serviceSampler.onResponse("traces", highRateResponse);
+
+        // rate doubles to 0.4
+        assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.4) < tolerance);
+        assertTrue(Math.abs(serviceSampler.fallbackSampleRate() - 0.4) < tolerance);
+
+        // third interval
+        time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS);
+        serviceSampler.onResponse("traces", highRateResponse);
+
+        // rate doubles to 0.8
+        assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.8) < tolerance);
+        assertTrue(Math.abs(serviceSampler.fallbackSampleRate() - 0.8) < tolerance);
+
+        // fourth interval
+        time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS);
+        serviceSampler.onResponse("traces", highRateResponse);
+
+        // rate reaches target 1.0 (2x=1.6 > 1.0)
+        assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 1.0) < tolerance);
+        assertTrue(Math.abs(serviceSampler.fallbackSampleRate() - 1.0) < tolerance);
+    }
+
+    @Test
+    void rampDownAppliesImmediately() {
+        ControllableTimeSource time = new ControllableTimeSource();
+        time.set(1_000_000_000L);
+        RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler(time);
+        double tolerance = 0.01;
+
+        // Set initial rate to 0.8
+        serviceSampler.onResponse("traces", rateResponse(new String[][] {
+            {"service:foo,env:bar", "0.8"}, {"service:,env:", "0.8"}
+        }));
+
+        // rate decreases to 0.2
+        serviceSampler.onResponse("traces", rateResponse(new String[][] {
+            {"service:foo,env:bar", "0.2"}, {"service:,env:", "0.2"}
+        }));
+
+        // decrease is applied immediately
+        assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.2) < tolerance);
+        assertTrue(Math.abs(serviceSampler.fallbackSampleRate() - 0.2) < tolerance);
+    }
 
-      assertNull(span.getSamplingPriority());
+    @Test
+    void rateIncreaseBlockedDuringCooldown() {
+        ControllableTimeSource time = new ControllableTimeSource();
+        time.set(1_000_000_000L);
+        RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler(time);
+        double tolerance = 0.01;
+        Map<String, Map<String, Number>> highRateResponse = rateResponse("service:foo,env:bar", 1.0);
 
-      span.setTag(DDTags.SERVICE_NAME, "spock");
+        // Set initial rate to 0.1
+        serviceSampler.onResponse("traces", rateResponse("service:foo,env:bar", 0.1));
 
-      span.finish();
-      writer.waitForTraces(1);
-      assertEquals(SAMPLER_DROP, span.getSamplingPriority());
+        // rate jumps, first capped increase
+        time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS);
+        serviceSampler.onResponse("traces", highRateResponse);
 
-      span =
-          (DDSpan)
-              tracer.buildSpan("datadog", "test").withTag(DDTags.SERVICE_NAME, "spock").start();
-      span.finish();
-      writer.waitForTraces(2);
+        // capped to 0.2
+        assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.2) < tolerance);
 
-      assertEquals(SAMPLER_DROP, span.getSamplingPriority());
-    } finally {
-      tracer.close();
+        // try again immediately (within cooldown)
+        serviceSampler.onResponse("traces", highRateResponse);
+
+        // rate stays at 0.2 because cooldown hasn't elapsed
+        assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.2) < tolerance);
+
+        // after cooldown elapsed
+        time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS);
+        serviceSampler.onResponse("traces", highRateResponse);
+
+        // rate doubles to 0.4
+        assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.4) < tolerance);
     }
-  }
-
-  @TableTest({
-    "scenario         | tagName     | tagValue | expectedPriority          ",
-    "manual.drop true | manual.drop | true     | PrioritySampling.USER_DROP",
-    "manual.keep true | manual.keep | true     | PrioritySampling.USER_KEEP"
-  })
-  void settingForcedTracingViaTag(
-      String tagName,
-      boolean tagValue,
-      @ConvertWith(PrioritySamplingConverter.class) int expectedPriority) {
-    RateByServiceTraceSampler sampler = new RateByServiceTraceSampler();
-    CoreTracer tracer = tracerBuilder().writer(new LoggingWriter()).sampler(sampler).build();
-    try {
-      DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
-      span.setTag(tagName, tagValue);
-      span.finish();
-
-      assertEquals(expectedPriority, span.getSamplingPriority());
-    } finally {
-      tracer.close();
+
+    @Test
+    void cooldownNotResetByBlockedIncrease() {
+        ControllableTimeSource time = new ControllableTimeSource();
+        time.set(1_000_000_000L);
+        RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler(time);
+        double tolerance = 0.01;
+        Map<String, Map<String, Number>> highRateResponse = rateResponse("service:foo,env:bar", 1.0);
+
+        // Set initial low rate
+        serviceSampler.onResponse("traces", rateResponse("service:foo,env:bar", 0.01));
+
+        assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.01) < tolerance);
+
+        // wait for cooldown, apply increase: 0.01 -> 0.02
+        time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS);
+        serviceSampler.onResponse("traces", highRateResponse);
+
+        // rate is capped at 2x = 0.02
+        assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.02) < tolerance);
+
+        // before cooldown elapses, send another increase - rate should be held and lastCapped NOT reset
+        time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS / 2);
+        serviceSampler.onResponse("traces", highRateResponse);
+
+        // rate stays at 0.02 (cooldown)
+        assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.02) < tolerance);
+
+        // wait remaining half of cooldown from the original cap - should allow next ramp-up
+        time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS / 2);
+        serviceSampler.onResponse("traces", highRateResponse);
+
+        // rate doubles to 0.04 because lastCapped was NOT reset by the blocked increase
+        assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.04) < tolerance);
     }
-  }
-
-  @Test
-  void shouldCapReturnsFalseWhenRateDecreasesOrStaysSame() {
-    assertFalse(RateByServiceTraceSampler.shouldCap(0.8, 0.4));
-    assertFalse(RateByServiceTraceSampler.shouldCap(0.5, 0.5));
-    assertFalse(RateByServiceTraceSampler.shouldCap(0.5, 1.0)); // 1.0 <= 0.5 * 2, no cap needed
-  }
-
-  @Test
-  void shouldCapReturnsFalseWhenOldRateIsZero() {
-    assertFalse(RateByServiceTraceSampler.shouldCap(0.0, 0.5));
-    assertFalse(RateByServiceTraceSampler.shouldCap(0.0, 1.0));
-  }
-
-  @Test
-  void shouldCapReturnsTrueWhenNewRateExceeds2xOldRate() {
-    assertTrue(RateByServiceTraceSampler.shouldCap(0.1, 1.0));
-    assertTrue(RateByServiceTraceSampler.shouldCap(0.2, 0.8));
-    assertTrue(RateByServiceTraceSampler.shouldCap(0.1, 0.3));
-  }
-
-  @Test
-  void cappedRateReturns2xOldRate() {
-    assertEquals(0.2, RateByServiceTraceSampler.cappedRate(0.1), 1e-6);
-    assertEquals(0.4, RateByServiceTraceSampler.cappedRate(0.2), 1e-6);
-    assertEquals(0.8, RateByServiceTraceSampler.cappedRate(0.4), 1e-6);
-  }
-
-  @Test
-  void rampUpCapsRateIncreasesAt2xPerInterval() {
-    ControllableTimeSource time = new ControllableTimeSource();
-    time.set(1_000_000_000L);
-    RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler(time);
-    double tolerance = 0.01;
-
-    // Set initial rate to 0.1
-    serviceSampler.onResponse(
-        "traces",
-        rateResponse(new String[][] {{"service:foo,env:bar", "0.1"}, {"service:,env:", "0.1"}}));
-
-    assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.1) < tolerance);
-
-    // agent restart sends rate 1.0, first interval
-    time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS);
-    Map<String, Map<String, Number>> highRateResponse =
-        rateResponse(new String[][] {{"service:foo,env:bar", "1.0"}, {"service:,env:", "1.0"}});
-    serviceSampler.onResponse("traces", highRateResponse);
-
-    // rate is capped at 2x = 0.2
-    assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.2) < tolerance);
-    assertTrue(Math.abs(serviceSampler.fallbackSampleRate() - 0.2) < tolerance);
-
-    // second interval
-    time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS);
-    serviceSampler.onResponse("traces", highRateResponse);
-
-    // rate doubles to 0.4
-    assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.4) < tolerance);
-    assertTrue(Math.abs(serviceSampler.fallbackSampleRate() - 0.4) < tolerance);
-
-    // third interval
-    time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS);
-    serviceSampler.onResponse("traces", highRateResponse);
-
-    // rate doubles to 0.8
-    assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.8) < tolerance);
-    assertTrue(Math.abs(serviceSampler.fallbackSampleRate() - 0.8) < tolerance);
-
-    // fourth interval
-    time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS);
-    serviceSampler.onResponse("traces", highRateResponse);
-
-    // rate reaches target 1.0 (2x=1.6 > 1.0)
-    assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 1.0) < tolerance);
-    assertTrue(Math.abs(serviceSampler.fallbackSampleRate() - 1.0) < tolerance);
-  }
-
-  @Test
-  void rampDownAppliesImmediately() {
-    ControllableTimeSource time = new ControllableTimeSource();
-    time.set(1_000_000_000L);
-    RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler(time);
-    double tolerance = 0.01;
-
-    // Set initial rate to 0.8
-    serviceSampler.onResponse(
-        "traces",
-        rateResponse(new String[][] {{"service:foo,env:bar", "0.8"}, {"service:,env:", "0.8"}}));
-
-    // rate decreases to 0.2
-    serviceSampler.onResponse(
-        "traces",
-        rateResponse(new String[][] {{"service:foo,env:bar", "0.2"}, {"service:,env:", "0.2"}}));
-
-    // decrease is applied immediately
-    assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.2) < tolerance);
-    assertTrue(Math.abs(serviceSampler.fallbackSampleRate() - 0.2) < tolerance);
-  }
-
-  @Test
-  void rateIncreaseBlockedDuringCooldown() {
-    ControllableTimeSource time = new ControllableTimeSource();
-    time.set(1_000_000_000L);
-    RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler(time);
-    double tolerance = 0.01;
-    Map<String, Map<String, Number>> highRateResponse = rateResponse("service:foo,env:bar", 1.0);
-
-    // Set initial rate to 0.1
-    serviceSampler.onResponse("traces", rateResponse("service:foo,env:bar", 0.1));
-
-    // rate jumps, first capped increase
-    time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS);
-    serviceSampler.onResponse("traces", highRateResponse);
-
-    // capped to 0.2
-    assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.2) < tolerance);
-
-    // try again immediately (within cooldown)
-    serviceSampler.onResponse("traces", highRateResponse);
-
-    // rate stays at 0.2 because cooldown hasn't elapsed
-    assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.2) < tolerance);
-
-    // after cooldown elapsed
-    time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS);
-    serviceSampler.onResponse("traces", highRateResponse);
-
-    // rate doubles to 0.4
-    assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.4) < tolerance);
-  }
-
-  @Test
-  void cooldownNotResetByBlockedIncrease() {
-    ControllableTimeSource time = new ControllableTimeSource();
-    time.set(1_000_000_000L);
-    RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler(time);
-    double tolerance = 0.01;
-    Map<String, Map<String, Number>> highRateResponse = rateResponse("service:foo,env:bar", 1.0);
-
-    // Set initial low rate
-    serviceSampler.onResponse("traces", rateResponse("service:foo,env:bar", 0.01));
-
-    assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.01) < tolerance);
-
-    // wait for cooldown, apply increase: 0.01 -> 0.02
-    time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS);
-    serviceSampler.onResponse("traces", highRateResponse);
-
-    // rate is capped at 2x = 0.02
-    assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.02) < tolerance);
-
-    // before cooldown elapses, send another increase - rate should be held and lastCapped NOT reset
-    time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS / 2);
-    serviceSampler.onResponse("traces", highRateResponse);
-
-    // rate stays at 0.02 (cooldown)
-    assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.02) < tolerance);
-
-    // wait remaining half of cooldown from the original cap - should allow next ramp-up
-    time.advance(RateByServiceTraceSampler.RAMP_UP_INTERVAL_NANOS / 2);
-    serviceSampler.onResponse("traces", highRateResponse);
-
-    // rate doubles to 0.04 because lastCapped was NOT reset by the blocked increase
-    assertTrue(Math.abs(serviceSampler.sampleRateFor("bar", "foo") - 0.04) < tolerance);
-  }
-
-  @TableTest({
-    "scenario          | tagName     | tagValue",
-    "no tag            |             |         ",
-    "manual.drop false | manual.drop | false   ",
-    "manual.keep false | manual.keep | false   ",
-    "manual.drop 1     | manual.drop | 1       ",
-    "manual.keep 1     | manual.keep | 1       "
-  })
-  void notSettingForcedTracingViaTagOrSettingItWrongValueNotCausingException(
-      String tagName, @ConvertWith(BoxedValueConverter.class) Object tagValue) {
-    RateByServiceTraceSampler sampler = new RateByServiceTraceSampler();
-    CoreTracer tracer = tracerBuilder().writer(new LoggingWriter()).sampler(sampler).build();
-    try {
-      DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
-      if (tagName != null) {
-        span.setTag(tagName, tagValue);
-      }
-
-      assertNull(span.getSamplingPriority());
-
-      span.finish();
-    } finally {
-      tracer.close();
+
+    @TableTest({
+      "scenario          | tagName     | tagValue",
+      "no tag            |             |         ",
+      "manual.drop false | manual.drop | false   ",
+      "manual.keep false | manual.keep | false   ",
+      "manual.drop 1     | manual.drop | 1       ",
+      "manual.keep 1     | manual.keep | 1       "
+    })
+    void notSettingForcedTracingViaTagOrSettingItWrongValueNotCausingException(
+            String tagName, @ConvertWith(BoxedValueConverter.class) Object tagValue) {
+        RateByServiceTraceSampler sampler = new RateByServiceTraceSampler();
+        CoreTracer tracer =
+                tracerBuilder().writer(new LoggingWriter()).sampler(sampler).build();
+        try {
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
+            if (tagName != null) {
+                span.setTag(tagName, tagValue);
+            }
+
+            assertNull(span.getSamplingPriority());
+
+            span.finish();
+        } finally {
+            tracer.close();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/RuleBasedSamplerAgentRatesTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/RuleBasedSamplerAgentRatesTest.java
index 7194bdeba97..6bed52f53b4 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/RuleBasedSamplerAgentRatesTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/RuleBasedSamplerAgentRatesTest.java
@@ -26,151 +26,147 @@
  */
 class RuleBasedSamplerAgentRatesTest extends DDCoreJavaSpecification {
 
-  private static final String RULE_MISSING_SERVICE =
-      "[{\"service\": \"other-service\", \"sample_rate\": 1}]";
-
-  @Test
-  void ruleBasedSamplerForwardsAgentRatesToFallback() {
-    Properties properties = new Properties();
-    properties.setProperty(TRACE_SAMPLING_RULES, RULE_MISSING_SERVICE);
-    Sampler sampler = Sampler.Builder.forConfig(properties);
-    assertInstanceOf(RuleBasedTraceSampler.class, sampler);
-
-    // The agent asks for everything to be dropped for this service.
-    sampler.agentSampler().onResponse("traces", rateByService("service", "bar", 0.0));
-
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      DDSpan span = buildSpan(tracer, "service");
-      ((PrioritySampler) sampler).setSamplingPriority(span);
-
-      assertEquals(SAMPLER_DROP, (int) span.getSamplingPriority());
-      assertEquals(0.0, span.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
-    } finally {
-      tracer.close();
+    private static final String RULE_MISSING_SERVICE = "[{\"service\": \"other-service\", \"sample_rate\": 1}]";
+
+    @Test
+    void ruleBasedSamplerForwardsAgentRatesToFallback() {
+        Properties properties = new Properties();
+        properties.setProperty(TRACE_SAMPLING_RULES, RULE_MISSING_SERVICE);
+        Sampler sampler = Sampler.Builder.forConfig(properties);
+        assertInstanceOf(RuleBasedTraceSampler.class, sampler);
+
+        // The agent asks for everything to be dropped for this service.
+        sampler.agentSampler().onResponse("traces", rateByService("service", "bar", 0.0));
+
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            DDSpan span = buildSpan(tracer, "service");
+            ((PrioritySampler) sampler).setSamplingPriority(span);
+
+            assertEquals(SAMPLER_DROP, (int) span.getSamplingPriority());
+            assertEquals(0.0, span.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
+        } finally {
+            tracer.close();
+        }
     }
-  }
-
-  @Test
-  void agentRatesDoNotOverrideMatchedRules() {
-    Properties properties = new Properties();
-    properties.setProperty(
-        TRACE_SAMPLING_RULES, "[{\"service\": \"service\", \"sample_rate\": 1}]");
-    Sampler sampler = Sampler.Builder.forConfig(properties);
-
-    sampler.agentSampler().onResponse("traces", rateByService("service", "bar", 0.0));
-
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      DDSpan span = buildSpan(tracer, "service");
-      ((PrioritySampler) sampler).setSamplingPriority(span);
-
-      assertEquals(USER_KEEP, (int) span.getSamplingPriority());
-      assertEquals(1.0, span.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
-      assertNull(span.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
-    } finally {
-      tracer.close();
+
+    @Test
+    void agentRatesDoNotOverrideMatchedRules() {
+        Properties properties = new Properties();
+        properties.setProperty(TRACE_SAMPLING_RULES, "[{\"service\": \"service\", \"sample_rate\": 1}]");
+        Sampler sampler = Sampler.Builder.forConfig(properties);
+
+        sampler.agentSampler().onResponse("traces", rateByService("service", "bar", 0.0));
+
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            DDSpan span = buildSpan(tracer, "service");
+            ((PrioritySampler) sampler).setSamplingPriority(span);
+
+            assertEquals(USER_KEEP, (int) span.getSamplingPriority());
+            assertEquals(1.0, span.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
+            assertNull(span.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
+        } finally {
+            tracer.close();
+        }
     }
-  }
-
-  @Test
-  void defaultRateKeepsAgentRatesUnused() {
-    Properties properties = new Properties();
-    properties.setProperty(TRACE_SAMPLING_RULES, RULE_MISSING_SERVICE);
-    // A default rate matches every span, so the fallback is never reached.
-    properties.setProperty(TRACE_SAMPLE_RATE, "1");
-    Sampler sampler = Sampler.Builder.forConfig(properties);
-
-    sampler.agentSampler().onResponse("traces", rateByService("service", "bar", 0.0));
-
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      DDSpan span = buildSpan(tracer, "service");
-      ((PrioritySampler) sampler).setSamplingPriority(span);
-
-      assertEquals(USER_KEEP, (int) span.getSamplingPriority());
-      assertNull(span.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
-    } finally {
-      tracer.close();
+
+    @Test
+    void defaultRateKeepsAgentRatesUnused() {
+        Properties properties = new Properties();
+        properties.setProperty(TRACE_SAMPLING_RULES, RULE_MISSING_SERVICE);
+        // A default rate matches every span, so the fallback is never reached.
+        properties.setProperty(TRACE_SAMPLE_RATE, "1");
+        Sampler sampler = Sampler.Builder.forConfig(properties);
+
+        sampler.agentSampler().onResponse("traces", rateByService("service", "bar", 0.0));
+
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            DDSpan span = buildSpan(tracer, "service");
+            ((PrioritySampler) sampler).setSamplingPriority(span);
+
+            assertEquals(USER_KEEP, (int) span.getSamplingPriority());
+            assertNull(span.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
+        } finally {
+            tracer.close();
+        }
     }
-  }
 
-  @Test
-  void rulesKeepTheSuppliedAgentSampler() {
-    RateByServiceTraceSampler agentSampler = new RateByServiceTraceSampler();
-    Properties properties = new Properties();
-    properties.setProperty(TRACE_SAMPLING_RULES, RULE_MISSING_SERVICE);
+    @Test
+    void rulesKeepTheSuppliedAgentSampler() {
+        RateByServiceTraceSampler agentSampler = new RateByServiceTraceSampler();
+        Properties properties = new Properties();
+        properties.setProperty(TRACE_SAMPLING_RULES, RULE_MISSING_SERVICE);
 
-    Sampler sampler = Sampler.Builder.forConfig(Config.get(properties), null, agentSampler);
+        Sampler sampler = Sampler.Builder.forConfig(Config.get(properties), null, agentSampler);
 
-    assertInstanceOf(RuleBasedTraceSampler.class, sampler);
-    assertSame(agentSampler, ((RuleBasedTraceSampler<?>) sampler).agentSampler());
-  }
+        assertInstanceOf(RuleBasedTraceSampler.class, sampler);
+        assertSame(agentSampler, ((RuleBasedTraceSampler<?>) sampler).agentSampler());
+    }
 
-  @Test
-  void noRulesReturnsTheSuppliedAgentSampler() {
-    RateByServiceTraceSampler agentSampler = new RateByServiceTraceSampler();
+    @Test
+    void noRulesReturnsTheSuppliedAgentSampler() {
+        RateByServiceTraceSampler agentSampler = new RateByServiceTraceSampler();
 
-    Sampler sampler = Sampler.Builder.forConfig(Config.get(new Properties()), null, agentSampler);
+        Sampler sampler = Sampler.Builder.forConfig(Config.get(new Properties()), null, agentSampler);
 
-    assertSame(agentSampler, sampler);
-  }
+        assertSame(agentSampler, sampler);
+    }
 
-  @Test
-  void ratesLearnedBeforeARebuildStillApplyAfterIt() {
-    RateByServiceTraceSampler agentSampler = new RateByServiceTraceSampler();
-    agentSampler.onResponse("traces", rateByService("service", "bar", 0.0));
+    @Test
+    void ratesLearnedBeforeARebuildStillApplyAfterIt() {
+        RateByServiceTraceSampler agentSampler = new RateByServiceTraceSampler();
+        agentSampler.onResponse("traces", rateByService("service", "bar", 0.0));
+
+        // Rebuilding the sampler with the same agent sampler keeps the rates it has already learned.
+        Properties properties = new Properties();
+        properties.setProperty(TRACE_SAMPLING_RULES, RULE_MISSING_SERVICE);
+        Sampler sampler = Sampler.Builder.forConfig(Config.get(properties), null, agentSampler);
+
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            DDSpan span = buildSpan(tracer, "service");
+            ((PrioritySampler) sampler).setSamplingPriority(span);
+
+            assertEquals(SAMPLER_DROP, (int) span.getSamplingPriority());
+        } finally {
+            tracer.close();
+        }
+    }
 
-    // Rebuilding the sampler with the same agent sampler keeps the rates it has already learned.
-    Properties properties = new Properties();
-    properties.setProperty(TRACE_SAMPLING_RULES, RULE_MISSING_SERVICE);
-    Sampler sampler = Sampler.Builder.forConfig(Config.get(properties), null, agentSampler);
+    @Test
+    void agentSamplerIsNullWhenFallbackDoesNotUseAgentRates() {
+        // A fallback that isn't a Sampler at all, so it can't be a source of agent rates.
+        PrioritySampler fallback = mock(PrioritySampler.class);
+        RuleBasedTraceSampler<?> sampler = new RuleBasedTraceSampler<>(emptyList(), 100, fallback);
 
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      DDSpan span = buildSpan(tracer, "service");
-      ((PrioritySampler) sampler).setSamplingPriority(span);
+        assertNull(sampler.agentSampler());
+    }
 
-      assertEquals(SAMPLER_DROP, (int) span.getSamplingPriority());
-    } finally {
-      tracer.close();
+    @Test
+    void unknownServiceIsKeptUntilTheAgentReportsARate() {
+        Properties properties = new Properties();
+        properties.setProperty(TRACE_SAMPLING_RULES, RULE_MISSING_SERVICE);
+        Sampler sampler = Sampler.Builder.forConfig(properties);
+
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            DDSpan span = buildSpan(tracer, "service");
+            ((PrioritySampler) sampler).setSamplingPriority(span);
+
+            assertEquals(SAMPLER_KEEP, (int) span.getSamplingPriority());
+            assertEquals(1.0, span.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
+        } finally {
+            tracer.close();
+        }
     }
-  }
-
-  @Test
-  void agentSamplerIsNullWhenFallbackDoesNotUseAgentRates() {
-    // A fallback that isn't a Sampler at all, so it can't be a source of agent rates.
-    PrioritySampler fallback = mock(PrioritySampler.class);
-    RuleBasedTraceSampler<?> sampler = new RuleBasedTraceSampler<>(emptyList(), 100, fallback);
-
-    assertNull(sampler.agentSampler());
-  }
-
-  @Test
-  void unknownServiceIsKeptUntilTheAgentReportsARate() {
-    Properties properties = new Properties();
-    properties.setProperty(TRACE_SAMPLING_RULES, RULE_MISSING_SERVICE);
-    Sampler sampler = Sampler.Builder.forConfig(properties);
-
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      DDSpan span = buildSpan(tracer, "service");
-      ((PrioritySampler) sampler).setSamplingPriority(span);
-
-      assertEquals(SAMPLER_KEEP, (int) span.getSamplingPriority());
-      assertEquals(1.0, span.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
-    } finally {
-      tracer.close();
+
+    private static DDSpan buildSpan(CoreTracer tracer, String serviceName) {
+        return (DDSpan) tracer.buildSpan("datadog", "operation")
+                .withServiceName(serviceName)
+                .withTag("env", "bar")
+                .ignoreActiveSpan()
+                .start();
     }
-  }
-
-  private static DDSpan buildSpan(CoreTracer tracer, String serviceName) {
-    return (DDSpan)
-        tracer
-            .buildSpan("datadog", "operation")
-            .withServiceName(serviceName)
-            .withTag("env", "bar")
-            .ignoreActiveSpan()
-            .start();
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/RuleBasedSamplingTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/RuleBasedSamplingTest.java
index cfd4ab373aa..48e94937290 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/RuleBasedSamplingTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/RuleBasedSamplingTest.java
@@ -34,426 +34,397 @@
 
 class RuleBasedSamplingTest extends DDCoreJavaSpecification {
 
-  @Test
-  void ruleBasedSamplerIsNotCreatedWhenPropertiesNotSet() {
-    Sampler sampler = Sampler.Builder.forConfig(new Properties());
-
-    assertFalse(sampler instanceof RuleBasedTraceSampler);
-  }
-
-  @Test
-  void ruleBasedSamplerIsNotCreatedWhenJustRateLimitSet() {
-    Properties properties = new Properties();
-    properties.setProperty(TRACE_RATE_LIMIT, "50");
-    Sampler sampler = Sampler.Builder.forConfig(properties);
-
-    assertFalse(sampler instanceof RuleBasedTraceSampler);
-  }
-
-  // NOTE: Using a defaultRate is still considered to be a "rule"
-  // decisionMaker is LOCAL_USER_RULE and expectedRuleRate is non-null
-  // When trace is dropped, decisionMaker isn't tracked -- e.g. null
-  @TableTest({
-    "scenario            | serviceRules    | operationRules    | defaultRate | expectedDecisionMaker             | expectedPriority              | expectedRuleRate | expectedRateLimit | expectedAgentRate",
-    "svc xx no match     | xx:1            |                   |             | SamplingMechanism.AGENT_RATE      | PrioritySampling.SAMPLER_KEEP |                  |                   | 1.0              ",
-    "op xx no match      |                 | xx:1              |             | SamplingMechanism.AGENT_RATE      | PrioritySampling.SAMPLER_KEEP |                  |                   | 1.0              ",
-    "no rules default 1  |                 |                   | 1           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "no rules default 0  |                 |                   | 0           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "svc xx default 1    | xx:1            |                   | 1           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "op xx default 1     |                 | xx:1              | 1           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "svc xx default 0    | xx:1            |                   | 0           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "op xx default 0     |                 | xx:1              | 0           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "service:1           | service:1       |                   |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "s.*:1               | s.*:1           |                   |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    ".*e:1               | .*e:1           |                   |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "service:0           | service:0       |                   |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "s.*:0               | s.*:0           |                   |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    ".*e:0               | .*e:0           |                   |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "service:1 default 0 | service:1       |                   | 0           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "service:0 default 1 | service:0       |                   | 1           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "xxx:0 service:1     | xxx:0,service:1 |                   |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "xxx:1 service:0     | xxx:1,service:0 |                   |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "operation:1         |                 | operation:1       |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "o.*:1               |                 | o.*:1             |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    ".*n:1               |                 | .*n:1             |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "operation:0         |                 | operation:0       |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "o.*:0               |                 | o.*:0             |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    ".*n:0               |                 | .*n:0             |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "op:1 default 0      |                 | operation:1       | 0           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "op:0 default 1      |                 | operation:0       | 1           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "xxx:0 op:1          |                 | xxx:0,operation:1 |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "xxx:1 op:0          |                 | xxx:1,operation:0 |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "svc:1 op:0          | service:1       | operation:0       |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "svc:1 xxx:0         | service:1       | xxx:0             |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "svc:0 op:1          | service:0       | operation:1       |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "svc:0 xxx:1         | service:0       | xxx:1             |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "xxx:0 op:1 combo    | xxx:0           | operation:1       |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "xxx:1 op:0 combo    | xxx:1           | operation:0       |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  "
-  })
-  void samplingConfigCombinations(
-      String serviceRules,
-      String operationRules,
-      String defaultRate,
-      @ConvertWith(SamplingMechanismConverter.class) Byte expectedDecisionMaker,
-      @ConvertWith(PrioritySamplingConverter.class) byte expectedPriority,
-      Double expectedRuleRate,
-      Integer expectedRateLimit,
-      Double expectedAgentRate) {
-    Properties properties = new Properties();
-    if (serviceRules != null) {
-      properties.setProperty(TRACE_SAMPLING_SERVICE_RULES, serviceRules);
-    }
-    if (operationRules != null) {
-      properties.setProperty(TRACE_SAMPLING_OPERATION_RULES, operationRules);
+    @Test
+    void ruleBasedSamplerIsNotCreatedWhenPropertiesNotSet() {
+        Sampler sampler = Sampler.Builder.forConfig(new Properties());
+
+        assertFalse(sampler instanceof RuleBasedTraceSampler);
     }
-    if (defaultRate != null) {
-      properties.setProperty(TRACE_SAMPLE_RATE, defaultRate);
+
+    @Test
+    void ruleBasedSamplerIsNotCreatedWhenJustRateLimitSet() {
+        Properties properties = new Properties();
+        properties.setProperty(TRACE_RATE_LIMIT, "50");
+        Sampler sampler = Sampler.Builder.forConfig(properties);
+
+        assertFalse(sampler instanceof RuleBasedTraceSampler);
     }
-    properties.setProperty(TRACE_RATE_LIMIT, "50");
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      Sampler sampler = Sampler.Builder.forConfig(properties);
-      assertInstanceOf(PrioritySampler.class, sampler);
-
-      DDSpan span =
-          (DDSpan)
-              tracer
-                  .buildSpan("datadog", "operation")
-                  .withServiceName("service")
-                  .withTag("env", "bar")
-                  .ignoreActiveSpan()
-                  .start();
-      ((PrioritySampler) sampler).setSamplingPriority(span);
-
-      Map<String, String> propagationMap = span.spanContext().getPropagationTags().createTagMap();
-      String decisionMaker = propagationMap.get("_dd.p.dm");
-      String expectedDmStr =
-          expectedDecisionMaker == null ? null : "-" + (int) expectedDecisionMaker;
-
-      assertTagEquals(expectedRuleRate, span.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
-      assertTagEquals(expectedRateLimit, span.getTag(RuleBasedTraceSampler.SAMPLING_LIMIT_RATE));
-      assertTagEquals(
-          expectedAgentRate, span.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
-      assertEquals(expectedPriority, (int) span.getSamplingPriority());
-      assertEquals(expectedDmStr, decisionMaker);
-    } finally {
-      tracer.close();
+
+    // NOTE: Using a defaultRate is still considered to be a "rule"
+    // decisionMaker is LOCAL_USER_RULE and expectedRuleRate is non-null
+    // When trace is dropped, decisionMaker isn't tracked -- e.g. null
+    @TableTest({
+      "scenario            | serviceRules    | operationRules    | defaultRate | expectedDecisionMaker             | expectedPriority              | expectedRuleRate | expectedRateLimit | expectedAgentRate",
+      "svc xx no match     | xx:1            |                   |             | SamplingMechanism.AGENT_RATE      | PrioritySampling.SAMPLER_KEEP |                  |                   | 1.0              ",
+      "op xx no match      |                 | xx:1              |             | SamplingMechanism.AGENT_RATE      | PrioritySampling.SAMPLER_KEEP |                  |                   | 1.0              ",
+      "no rules default 1  |                 |                   | 1           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "no rules default 0  |                 |                   | 0           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "svc xx default 1    | xx:1            |                   | 1           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "op xx default 1     |                 | xx:1              | 1           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "svc xx default 0    | xx:1            |                   | 0           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "op xx default 0     |                 | xx:1              | 0           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "service:1           | service:1       |                   |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "s.*:1               | s.*:1           |                   |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      ".*e:1               | .*e:1           |                   |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "service:0           | service:0       |                   |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "s.*:0               | s.*:0           |                   |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      ".*e:0               | .*e:0           |                   |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "service:1 default 0 | service:1       |                   | 0           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "service:0 default 1 | service:0       |                   | 1           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "xxx:0 service:1     | xxx:0,service:1 |                   |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "xxx:1 service:0     | xxx:1,service:0 |                   |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "operation:1         |                 | operation:1       |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "o.*:1               |                 | o.*:1             |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      ".*n:1               |                 | .*n:1             |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "operation:0         |                 | operation:0       |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "o.*:0               |                 | o.*:0             |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      ".*n:0               |                 | .*n:0             |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "op:1 default 0      |                 | operation:1       | 0           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "op:0 default 1      |                 | operation:0       | 1           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "xxx:0 op:1          |                 | xxx:0,operation:1 |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "xxx:1 op:0          |                 | xxx:1,operation:0 |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "svc:1 op:0          | service:1       | operation:0       |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "svc:1 xxx:0         | service:1       | xxx:0             |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "svc:0 op:1          | service:0       | operation:1       |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "svc:0 xxx:1         | service:0       | xxx:1             |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "xxx:0 op:1 combo    | xxx:0           | operation:1       |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "xxx:1 op:0 combo    | xxx:1           | operation:0       |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  "
+    })
+    void samplingConfigCombinations(
+            String serviceRules,
+            String operationRules,
+            String defaultRate,
+            @ConvertWith(SamplingMechanismConverter.class) Byte expectedDecisionMaker,
+            @ConvertWith(PrioritySamplingConverter.class) byte expectedPriority,
+            Double expectedRuleRate,
+            Integer expectedRateLimit,
+            Double expectedAgentRate) {
+        Properties properties = new Properties();
+        if (serviceRules != null) {
+            properties.setProperty(TRACE_SAMPLING_SERVICE_RULES, serviceRules);
+        }
+        if (operationRules != null) {
+            properties.setProperty(TRACE_SAMPLING_OPERATION_RULES, operationRules);
+        }
+        if (defaultRate != null) {
+            properties.setProperty(TRACE_SAMPLE_RATE, defaultRate);
+        }
+        properties.setProperty(TRACE_RATE_LIMIT, "50");
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            Sampler sampler = Sampler.Builder.forConfig(properties);
+            assertInstanceOf(PrioritySampler.class, sampler);
+
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation")
+                    .withServiceName("service")
+                    .withTag("env", "bar")
+                    .ignoreActiveSpan()
+                    .start();
+            ((PrioritySampler) sampler).setSamplingPriority(span);
+
+            Map<String, String> propagationMap =
+                    span.spanContext().getPropagationTags().createTagMap();
+            String decisionMaker = propagationMap.get("_dd.p.dm");
+            String expectedDmStr = expectedDecisionMaker == null ? null : "-" + (int) expectedDecisionMaker;
+
+            assertTagEquals(expectedRuleRate, span.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
+            assertTagEquals(expectedRateLimit, span.getTag(RuleBasedTraceSampler.SAMPLING_LIMIT_RATE));
+            assertTagEquals(expectedAgentRate, span.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
+            assertEquals(expectedPriority, (int) span.getSamplingPriority());
+            assertEquals(expectedDmStr, decisionMaker);
+        } finally {
+            tracer.close();
+        }
     }
-  }
-
-  // NOTE: Using a defaultRate is still considered to be a "rule"
-  // decisionMaker is LOCAL_USER_RULE and expectedRuleRate is non-null
-  // When trace is dropped, decisionMaker isn't tracked -- e.g. null
-  @TableTest({
-    "scenario            | jsonRules                                                                                                                                                                                                                                                    | defaultRate | expectedDecisionMaker             | expectedPriority              | expectedRuleRate | expectedRateLimit | expectedAgentRate",
-    "svc xx no match     | '[{\"service\": \"xx\", \"sample_rate\": 1}]'                                                                                                                                                                                                                |             | SamplingMechanism.AGENT_RATE      | PrioritySampling.SAMPLER_KEEP |                  |                   | 1.0              ",
-    "name xx no match    | '[{\"name\": \"xx\", \"sample_rate\": 1}]'                                                                                                                                                                                                                   |             | SamplingMechanism.AGENT_RATE      | PrioritySampling.SAMPLER_KEEP |                  |                   | 1.0              ",
-    "sample_rate 1 def 1 | '[{\"sample_rate\": 1}]'                                                                                                                                                                                                                                     | 1           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "sample_rate 0 def 0 | '[{\"sample_rate\": 0}]'                                                                                                                                                                                                                                     | 0           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "empty rules def 0   | '[]'                                                                                                                                                                                                                                                         | 0           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "svc xx def 1        | '[{\"service\": \"xx\", \"sample_rate\": 1}]'                                                                                                                                                                                                                | 1           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "name xx def 1       | '[{\"name\": \"xx\", \"sample_rate\": 1}]'                                                                                                                                                                                                                   | 1           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "svc xx def 0        | '[{\"service\": \"xx\", \"sample_rate\": 1}]'                                                                                                                                                                                                                | 0           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "name xx def 0       | '[{\"name\": \"xx\", \"sample_rate\": 1}]'                                                                                                                                                                                                                   | 0           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "svc match keep      | '[{\"service\": \"service\", \"sample_rate\": 1}]'                                                                                                                                                                                                           |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "svc match drop      | '[{\"service\": \"service\", \"sample_rate\": 0}]'                                                                                                                                                                                                           |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "svc keep def 0      | '[{\"service\": \"service\", \"sample_rate\": 1}]'                                                                                                                                                                                                           | 0           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "svc drop def 1      | '[{\"service\": \"service\", \"sample_rate\": 0}]'                                                                                                                                                                                                           | 1           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "xxx:0 svc:1         | '[{\"service\": \"xxx\", \"sample_rate\": 0}, {\"service\": \"service\", \"sample_rate\": 1}]'                                                                                                                                                               |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "xxx:1 svc:0         | '[{\"service\": \"xxx\", \"sample_rate\": 1}, {\"service\": \"service\", \"sample_rate\": 0}]'                                                                                                                                                               |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "op match keep       | '[{\"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                                                                                                                            |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "op match drop       | '[{\"name\": \"operation\", \"sample_rate\": 0}]'                                                                                                                                                                                                            |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "op keep def 0       | '[{\"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                                                                                                                            | 0           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "op drop def 1       | '[{\"name\": \"operation\", \"sample_rate\": 0}]'                                                                                                                                                                                                            | 1           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "xxx:0 op:1          | '[{\"name\": \"xxx\", \"sample_rate\": 0}, {\"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                                                                                   |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "xxx:1 op:0          | '[{\"name\": \"xxx\", \"sample_rate\": 1}, {\"name\": \"operation\", \"sample_rate\": 0}]'                                                                                                                                                                   |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "res match keep      | '[{\"resource\": \"resource\", \"sample_rate\": 1}]'                                                                                                                                                                                                         |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "res match drop      | '[{\"resource\": \"resource\", \"sample_rate\": 0}]'                                                                                                                                                                                                         |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "res keep def 0      | '[{\"resource\": \"resource\", \"sample_rate\": 1}]'                                                                                                                                                                                                         | 0           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "res drop def 1      | '[{\"resource\": \"resource\", \"sample_rate\": 0}]'                                                                                                                                                                                                         | 1           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "xxx res:1           | '[{\"resource\": \"xxx\", \"sample_rate\": 0}, {\"resource\": \"resource\", \"sample_rate\": 1}]'                                                                                                                                                            |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "xxx res:0           | '[{\"resource\": \"xxx\", \"sample_rate\": 1}, {\"resource\": \"resource\", \"sample_rate\": 0}]'                                                                                                                                                            |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "svc:1 op:0          | '[{\"service\": \"service\", \"sample_rate\": 1}, {\"name\": \"operation\", \"sample_rate\": 0}]'                                                                                                                                                            |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "svc:1 xxx:0         | '[{\"service\": \"service\", \"sample_rate\": 1}, {\"name\": \"xxx\", \"sample_rate\": 0}]'                                                                                                                                                                  |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "svc:0 op:1          | '[{\"service\": \"service\", \"sample_rate\": 0}, {\"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                                                                            |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "svc:0 xxx:1         | '[{\"service\": \"service\", \"sample_rate\": 0}, {\"name\": \"xxx\", \"sample_rate\": 1}]'                                                                                                                                                                  |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "xxx:0 op:1          | '[{\"service\": \"xxx\", \"sample_rate\": 0}, {\"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                                                                                |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "xxx:1 op:0          | '[{\"service\": \"xxx\", \"sample_rate\": 1}, {\"name\": \"operation\", \"sample_rate\": 0}]'                                                                                                                                                                |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "svc+op keep         | '[{\"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                                                                                                  |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "svc+xxx then svc+op | '[{\"service\": \"service\", \"name\": \"xxx\", \"sample_rate\": 0}, {\"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                               |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "svc+xxx then svc    | '[{\"service\": \"service\", \"name\": \"xxx\", \"sample_rate\": 0}, {\"service\": \"service\", \"sample_rate\": 1}]'                                                                                                                                        |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "svc+xxx then op     | '[{\"service\": \"service\", \"name\": \"xxx\", \"sample_rate\": 0}, {\"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                                                         |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "svc+res:xxx res     | '[{\"service\": \"service\", \"resource\": \"xxx\", \"sample_rate\": 0}, {\"resource\": \"resource\", \"sample_rate\": 1}]'                                                                                                                                  |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "svc+op drop first   | '[{\"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 0}, {\"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                         |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "svc+op drop only    | '[{\"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 0}]'                                                                                                                                                                                  |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "svc+res match       | '[{\"service\": \"service\", \"resource\": \"xxx\", \"sample_rate\": 0}, {\"service\": \"service\", \"resource\": \"resource\", \"sample_rate\": 1}]'                                                                                                        |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "svc+res+op match    | '[{\"service\": \"service\", \"resource\": \"xxx\", \"sample_rate\": 0}, {\"service\": \"service\", \"resource\": \"resource\", \"name\": \"operation\", \"sample_rate\": 1}]'                                                                               |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "tag env:bar keep    | '[{\"tags\": {\"env\": \"xxx\"}, \"sample_rate\": 0}, {\"tags\": {\"env\": \"bar\"}, \"sample_rate\": 1}]'                                                                                                                                                   |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "tag env:*x then *   | '[{\"tags\": {\"env\": \"*x\"}, \"sample_rate\": 0}, {\"tags\": {\"env\": \"*\"}, \"sample_rate\": 1}]'                                                                                                                                                      |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "tag env:b?r keep    | '[{\"tags\": {\"env\": \"x??\"}, \"sample_rate\": 0}, {\"tags\": {\"env\": \"b?r\"}, \"sample_rate\": 1}]'                                                                                                                                                   |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "tag env:b?r drop    | '[{\"tags\": {\"env\": \"x??\"}, \"sample_rate\": 1}, {\"tags\": {\"env\": \"b?r\"}, \"sample_rate\": 0}]'                                                                                                                                                   |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "2tags env+tag keep  | '[{\"tags\": {\"env\": \"xxx\"}, \"sample_rate\": 0}, {\"tags\": {\"env\": \"bar\", \"tag\": \"foo\"}, \"sample_rate\": 1}]'                                                                                                                                 |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "2tags * keep        | '[{\"tags\": {\"env\": \"*x\"}, \"sample_rate\": 0}, {\"tags\": {\"env\": \"*\", \"tag\": \"*\"}, \"sample_rate\": 1}]'                                                                                                                                      |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "2tags b?r+f?? keep  | '[{\"tags\": {\"env\": \"x??\"}, \"sample_rate\": 0}, {\"tags\": {\"env\": \"b?r\", \"tag\": \"f??\"}, \"sample_rate\": 1}]'                                                                                                                                 |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
-    "2tags b?r+f?? drop  | '[{\"tags\": {\"env\": \"x??\"}, \"sample_rate\": 1}, {\"tags\": {\"env\": \"b?r\", \"tag\": \"f??\"}, \"sample_rate\": 0}]'                                                                                                                                 |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
-    "all combined        | '[{\"service\": \"service\", \"resource\": \"xxx\", \"tags\": {\"env\": \"x??\"}, \"sample_rate\": 0}, {\"service\": \"service\", \"resource\": \"resource\", \"name\": \"operation\", \"tags\": {\"env\": \"b?r\", \"tag\": \"f??\"}, \"sample_rate\": 1}]' |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  "
-  })
-  void samplingConfigJsonRulesCombinations(
-      String jsonRules,
-      String defaultRate,
-      @ConvertWith(SamplingMechanismConverter.class) Byte expectedDecisionMaker,
-      @ConvertWith(PrioritySamplingConverter.class) byte expectedPriority,
-      Double expectedRuleRate,
-      Integer expectedRateLimit,
-      Double expectedAgentRate) {
-    Properties properties = new Properties();
-    properties.setProperty(TRACE_SAMPLING_RULES, jsonRules);
-    if (defaultRate != null) {
-      properties.setProperty(TRACE_SAMPLE_RATE, defaultRate);
+
+    // NOTE: Using a defaultRate is still considered to be a "rule"
+    // decisionMaker is LOCAL_USER_RULE and expectedRuleRate is non-null
+    // When trace is dropped, decisionMaker isn't tracked -- e.g. null
+    @TableTest({
+      "scenario            | jsonRules                                                                                                                                                                                                                                                    | defaultRate | expectedDecisionMaker             | expectedPriority              | expectedRuleRate | expectedRateLimit | expectedAgentRate",
+      "svc xx no match     | '[{\"service\": \"xx\", \"sample_rate\": 1}]'                                                                                                                                                                                                                |             | SamplingMechanism.AGENT_RATE      | PrioritySampling.SAMPLER_KEEP |                  |                   | 1.0              ",
+      "name xx no match    | '[{\"name\": \"xx\", \"sample_rate\": 1}]'                                                                                                                                                                                                                   |             | SamplingMechanism.AGENT_RATE      | PrioritySampling.SAMPLER_KEEP |                  |                   | 1.0              ",
+      "sample_rate 1 def 1 | '[{\"sample_rate\": 1}]'                                                                                                                                                                                                                                     | 1           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "sample_rate 0 def 0 | '[{\"sample_rate\": 0}]'                                                                                                                                                                                                                                     | 0           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "empty rules def 0   | '[]'                                                                                                                                                                                                                                                         | 0           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "svc xx def 1        | '[{\"service\": \"xx\", \"sample_rate\": 1}]'                                                                                                                                                                                                                | 1           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "name xx def 1       | '[{\"name\": \"xx\", \"sample_rate\": 1}]'                                                                                                                                                                                                                   | 1           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "svc xx def 0        | '[{\"service\": \"xx\", \"sample_rate\": 1}]'                                                                                                                                                                                                                | 0           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "name xx def 0       | '[{\"name\": \"xx\", \"sample_rate\": 1}]'                                                                                                                                                                                                                   | 0           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "svc match keep      | '[{\"service\": \"service\", \"sample_rate\": 1}]'                                                                                                                                                                                                           |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "svc match drop      | '[{\"service\": \"service\", \"sample_rate\": 0}]'                                                                                                                                                                                                           |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "svc keep def 0      | '[{\"service\": \"service\", \"sample_rate\": 1}]'                                                                                                                                                                                                           | 0           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "svc drop def 1      | '[{\"service\": \"service\", \"sample_rate\": 0}]'                                                                                                                                                                                                           | 1           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "xxx:0 svc:1         | '[{\"service\": \"xxx\", \"sample_rate\": 0}, {\"service\": \"service\", \"sample_rate\": 1}]'                                                                                                                                                               |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "xxx:1 svc:0         | '[{\"service\": \"xxx\", \"sample_rate\": 1}, {\"service\": \"service\", \"sample_rate\": 0}]'                                                                                                                                                               |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "op match keep       | '[{\"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                                                                                                                            |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "op match drop       | '[{\"name\": \"operation\", \"sample_rate\": 0}]'                                                                                                                                                                                                            |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "op keep def 0       | '[{\"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                                                                                                                            | 0           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "op drop def 1       | '[{\"name\": \"operation\", \"sample_rate\": 0}]'                                                                                                                                                                                                            | 1           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "xxx:0 op:1          | '[{\"name\": \"xxx\", \"sample_rate\": 0}, {\"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                                                                                   |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "xxx:1 op:0          | '[{\"name\": \"xxx\", \"sample_rate\": 1}, {\"name\": \"operation\", \"sample_rate\": 0}]'                                                                                                                                                                   |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "res match keep      | '[{\"resource\": \"resource\", \"sample_rate\": 1}]'                                                                                                                                                                                                         |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "res match drop      | '[{\"resource\": \"resource\", \"sample_rate\": 0}]'                                                                                                                                                                                                         |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "res keep def 0      | '[{\"resource\": \"resource\", \"sample_rate\": 1}]'                                                                                                                                                                                                         | 0           | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "res drop def 1      | '[{\"resource\": \"resource\", \"sample_rate\": 0}]'                                                                                                                                                                                                         | 1           |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "xxx res:1           | '[{\"resource\": \"xxx\", \"sample_rate\": 0}, {\"resource\": \"resource\", \"sample_rate\": 1}]'                                                                                                                                                            |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "xxx res:0           | '[{\"resource\": \"xxx\", \"sample_rate\": 1}, {\"resource\": \"resource\", \"sample_rate\": 0}]'                                                                                                                                                            |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "svc:1 op:0          | '[{\"service\": \"service\", \"sample_rate\": 1}, {\"name\": \"operation\", \"sample_rate\": 0}]'                                                                                                                                                            |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "svc:1 xxx:0         | '[{\"service\": \"service\", \"sample_rate\": 1}, {\"name\": \"xxx\", \"sample_rate\": 0}]'                                                                                                                                                                  |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "svc:0 op:1          | '[{\"service\": \"service\", \"sample_rate\": 0}, {\"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                                                                            |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "svc:0 xxx:1         | '[{\"service\": \"service\", \"sample_rate\": 0}, {\"name\": \"xxx\", \"sample_rate\": 1}]'                                                                                                                                                                  |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "xxx:0 op:1          | '[{\"service\": \"xxx\", \"sample_rate\": 0}, {\"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                                                                                |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "xxx:1 op:0          | '[{\"service\": \"xxx\", \"sample_rate\": 1}, {\"name\": \"operation\", \"sample_rate\": 0}]'                                                                                                                                                                |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "svc+op keep         | '[{\"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                                                                                                  |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "svc+xxx then svc+op | '[{\"service\": \"service\", \"name\": \"xxx\", \"sample_rate\": 0}, {\"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                               |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "svc+xxx then svc    | '[{\"service\": \"service\", \"name\": \"xxx\", \"sample_rate\": 0}, {\"service\": \"service\", \"sample_rate\": 1}]'                                                                                                                                        |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "svc+xxx then op     | '[{\"service\": \"service\", \"name\": \"xxx\", \"sample_rate\": 0}, {\"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                                                         |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "svc+res:xxx res     | '[{\"service\": \"service\", \"resource\": \"xxx\", \"sample_rate\": 0}, {\"resource\": \"resource\", \"sample_rate\": 1}]'                                                                                                                                  |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "svc+op drop first   | '[{\"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 0}, {\"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 1}]'                                                                                                         |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "svc+op drop only    | '[{\"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 0}]'                                                                                                                                                                                  |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "svc+res match       | '[{\"service\": \"service\", \"resource\": \"xxx\", \"sample_rate\": 0}, {\"service\": \"service\", \"resource\": \"resource\", \"sample_rate\": 1}]'                                                                                                        |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "svc+res+op match    | '[{\"service\": \"service\", \"resource\": \"xxx\", \"sample_rate\": 0}, {\"service\": \"service\", \"resource\": \"resource\", \"name\": \"operation\", \"sample_rate\": 1}]'                                                                               |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "tag env:bar keep    | '[{\"tags\": {\"env\": \"xxx\"}, \"sample_rate\": 0}, {\"tags\": {\"env\": \"bar\"}, \"sample_rate\": 1}]'                                                                                                                                                   |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "tag env:*x then *   | '[{\"tags\": {\"env\": \"*x\"}, \"sample_rate\": 0}, {\"tags\": {\"env\": \"*\"}, \"sample_rate\": 1}]'                                                                                                                                                      |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "tag env:b?r keep    | '[{\"tags\": {\"env\": \"x??\"}, \"sample_rate\": 0}, {\"tags\": {\"env\": \"b?r\"}, \"sample_rate\": 1}]'                                                                                                                                                   |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "tag env:b?r drop    | '[{\"tags\": {\"env\": \"x??\"}, \"sample_rate\": 1}, {\"tags\": {\"env\": \"b?r\"}, \"sample_rate\": 0}]'                                                                                                                                                   |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "2tags env+tag keep  | '[{\"tags\": {\"env\": \"xxx\"}, \"sample_rate\": 0}, {\"tags\": {\"env\": \"bar\", \"tag\": \"foo\"}, \"sample_rate\": 1}]'                                                                                                                                 |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "2tags * keep        | '[{\"tags\": {\"env\": \"*x\"}, \"sample_rate\": 0}, {\"tags\": {\"env\": \"*\", \"tag\": \"*\"}, \"sample_rate\": 1}]'                                                                                                                                      |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "2tags b?r+f?? keep  | '[{\"tags\": {\"env\": \"x??\"}, \"sample_rate\": 0}, {\"tags\": {\"env\": \"b?r\", \"tag\": \"f??\"}, \"sample_rate\": 1}]'                                                                                                                                 |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  ",
+      "2tags b?r+f?? drop  | '[{\"tags\": {\"env\": \"x??\"}, \"sample_rate\": 1}, {\"tags\": {\"env\": \"b?r\", \"tag\": \"f??\"}, \"sample_rate\": 0}]'                                                                                                                                 |             |                                   | PrioritySampling.USER_DROP    | 0.0              |                   |                  ",
+      "all combined        | '[{\"service\": \"service\", \"resource\": \"xxx\", \"tags\": {\"env\": \"x??\"}, \"sample_rate\": 0}, {\"service\": \"service\", \"resource\": \"resource\", \"name\": \"operation\", \"tags\": {\"env\": \"b?r\", \"tag\": \"f??\"}, \"sample_rate\": 1}]' |             | SamplingMechanism.LOCAL_USER_RULE | PrioritySampling.USER_KEEP    | 1.0              | 50                |                  "
+    })
+    void samplingConfigJsonRulesCombinations(
+            String jsonRules,
+            String defaultRate,
+            @ConvertWith(SamplingMechanismConverter.class) Byte expectedDecisionMaker,
+            @ConvertWith(PrioritySamplingConverter.class) byte expectedPriority,
+            Double expectedRuleRate,
+            Integer expectedRateLimit,
+            Double expectedAgentRate) {
+        Properties properties = new Properties();
+        properties.setProperty(TRACE_SAMPLING_RULES, jsonRules);
+        if (defaultRate != null) {
+            properties.setProperty(TRACE_SAMPLE_RATE, defaultRate);
+        }
+        properties.setProperty(TRACE_RATE_LIMIT, "50");
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            Sampler sampler = Sampler.Builder.forConfig(properties);
+            assertInstanceOf(PrioritySampler.class, sampler);
+
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation")
+                    .withServiceName("service")
+                    .withTag("env", "bar")
+                    .withTag("tag", "foo")
+                    .withResourceName("resource")
+                    .ignoreActiveSpan()
+                    .start();
+            ((PrioritySampler) sampler).setSamplingPriority(span);
+
+            Map<String, String> propagationMap =
+                    span.spanContext().getPropagationTags().createTagMap();
+            String decisionMaker = propagationMap.get("_dd.p.dm");
+            String expectedDmStr = expectedDecisionMaker == null ? null : "-" + (int) expectedDecisionMaker;
+
+            assertTagEquals(expectedRuleRate, span.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
+            assertTagEquals(expectedRateLimit, span.getTag(RuleBasedTraceSampler.SAMPLING_LIMIT_RATE));
+            assertTagEquals(expectedAgentRate, span.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
+            assertEquals(expectedPriority, (int) span.getSamplingPriority());
+            assertEquals(expectedDmStr, decisionMaker);
+        } finally {
+            tracer.close();
+        }
     }
-    properties.setProperty(TRACE_RATE_LIMIT, "50");
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      Sampler sampler = Sampler.Builder.forConfig(properties);
-      assertInstanceOf(PrioritySampler.class, sampler);
-
-      DDSpan span =
-          (DDSpan)
-              tracer
-                  .buildSpan("datadog", "operation")
-                  .withServiceName("service")
-                  .withTag("env", "bar")
-                  .withTag("tag", "foo")
-                  .withResourceName("resource")
-                  .ignoreActiveSpan()
-                  .start();
-      ((PrioritySampler) sampler).setSamplingPriority(span);
-
-      Map<String, String> propagationMap = span.spanContext().getPropagationTags().createTagMap();
-      String decisionMaker = propagationMap.get("_dd.p.dm");
-      String expectedDmStr =
-          expectedDecisionMaker == null ? null : "-" + (int) expectedDecisionMaker;
-
-      assertTagEquals(expectedRuleRate, span.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
-      assertTagEquals(expectedRateLimit, span.getTag(RuleBasedTraceSampler.SAMPLING_LIMIT_RATE));
-      assertTagEquals(
-          expectedAgentRate, span.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
-      assertEquals(expectedPriority, (int) span.getSamplingPriority());
-      assertEquals(expectedDmStr, decisionMaker);
-    } finally {
-      tracer.close();
+
+    @SuppressWarnings("unused")
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("tagTypesTestArguments")
+    void tagTypesTest(String scenario, String tagPattern, Object tagValue, boolean expectedMatch) {
+        String json = "[{\"tags\": {\"testTag\": \"" + tagPattern + "\"}, \"sample_rate\": 1}]";
+        Properties properties = new Properties();
+        properties.setProperty(TRACE_SAMPLING_RULES, json);
+        properties.setProperty(TRACE_SAMPLE_RATE, "0");
+
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            PrioritySampler sampler = (PrioritySampler) Sampler.Builder.forConfig(properties);
+
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation")
+                    .withServiceName("service")
+                    .withResourceName("resource")
+                    .withTag("env", "bar")
+                    .ignoreActiveSpan()
+                    .start();
+            span.setTag("testTag", tagValue);
+            sampler.setSamplingPriority(span);
+
+            assertEquals(expectedMatch ? USER_KEEP : (int) USER_DROP, (int) span.getSamplingPriority());
+        } finally {
+            tracer.close();
+        }
     }
-  }
-
-  @SuppressWarnings("unused")
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("tagTypesTestArguments")
-  void tagTypesTest(String scenario, String tagPattern, Object tagValue, boolean expectedMatch) {
-    String json = "[{\"tags\": {\"testTag\": \"" + tagPattern + "\"}, \"sample_rate\": 1}]";
-    Properties properties = new Properties();
-    properties.setProperty(TRACE_SAMPLING_RULES, json);
-    properties.setProperty(TRACE_SAMPLE_RATE, "0");
-
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      PrioritySampler sampler = (PrioritySampler) Sampler.Builder.forConfig(properties);
-
-      DDSpan span =
-          (DDSpan)
-              tracer
-                  .buildSpan("datadog", "operation")
-                  .withServiceName("service")
-                  .withResourceName("resource")
-                  .withTag("env", "bar")
-                  .ignoreActiveSpan()
-                  .start();
-      span.setTag("testTag", tagValue);
-      sampler.setSamplingPriority(span);
-
-      assertEquals(expectedMatch ? USER_KEEP : (int) USER_DROP, (int) span.getSamplingPriority());
-    } finally {
-      tracer.close();
+
+    static Stream<Arguments> tagTypesTestArguments() {
+        return Stream.of(
+                arguments("* anything", "*", "anything...", true),
+                arguments("* null", "*", null, false),
+                arguments("* StringBuilder", "*", new StringBuilder("foo"), true),
+                arguments("* object", "*", new Object(), true),
+                arguments("** object", "**", new Object(), true),
+                arguments("? object", "?", new Object(), false),
+                arguments("* foo", "*", "foo", true),
+                arguments("** foo", "**", "foo", true),
+                arguments("** true", "**", true, true),
+                arguments("** false", "**", false, true),
+                arguments("** 20", "**", 20, true),
+                arguments("** 20L", "**", 20L, true),
+                arguments("** 20.1F", "**", 20.1F, true),
+                arguments("** 20.1D", "**", 20.1D, true),
+                arguments("** bigInt 20", "**", new BigInteger("20"), true),
+                arguments("** bigDec 20.1", "**", new BigDecimal("20.1"), true),
+                arguments("foo match", "foo", "foo", true),
+                arguments("foo StringBuilder", "foo", new StringBuilder("foo"), true),
+                arguments("foo not-foo", "foo", "not-foo", false),
+                arguments("ba? bar", "ba?", "bar", true),
+                arguments("20 == 20", "20", 20, true),
+                arguments("20 == Int 20", "20", 20, true),
+                arguments("20 == 20L", "20", 20L, true),
+                arguments("20 == Long 20", "20", 20L, true),
+                arguments("20 == 20F", "20", 20F, true),
+                arguments("20 != 20.1F", "20", 20.1F, false),
+                arguments("20.* != 20.1F", "20.*", 20.1F, false),
+                arguments("20.1 != 20.1D", "20.1", 20.1D, false),
+                arguments("* == 20.1D", "*", 20.1D, true),
+                arguments("20 == bigInt 20", "20", new BigInteger("20"), true),
+                arguments("20 == bigDec 20", "20", new BigDecimal("20"), true),
+                arguments("* == bigDec 20.1", "*", new BigDecimal("20.1"), true));
     }
-  }
-
-  static Stream<Arguments> tagTypesTestArguments() {
-    return Stream.of(
-        arguments("* anything", "*", "anything...", true),
-        arguments("* null", "*", null, false),
-        arguments("* StringBuilder", "*", new StringBuilder("foo"), true),
-        arguments("* object", "*", new Object(), true),
-        arguments("** object", "**", new Object(), true),
-        arguments("? object", "?", new Object(), false),
-        arguments("* foo", "*", "foo", true),
-        arguments("** foo", "**", "foo", true),
-        arguments("** true", "**", true, true),
-        arguments("** false", "**", false, true),
-        arguments("** 20", "**", 20, true),
-        arguments("** 20L", "**", 20L, true),
-        arguments("** 20.1F", "**", 20.1F, true),
-        arguments("** 20.1D", "**", 20.1D, true),
-        arguments("** bigInt 20", "**", new BigInteger("20"), true),
-        arguments("** bigDec 20.1", "**", new BigDecimal("20.1"), true),
-        arguments("foo match", "foo", "foo", true),
-        arguments("foo StringBuilder", "foo", new StringBuilder("foo"), true),
-        arguments("foo not-foo", "foo", "not-foo", false),
-        arguments("ba? bar", "ba?", "bar", true),
-        arguments("20 == 20", "20", 20, true),
-        arguments("20 == Int 20", "20", 20, true),
-        arguments("20 == 20L", "20", 20L, true),
-        arguments("20 == Long 20", "20", 20L, true),
-        arguments("20 == 20F", "20", 20F, true),
-        arguments("20 != 20.1F", "20", 20.1F, false),
-        arguments("20.* != 20.1F", "20.*", 20.1F, false),
-        arguments("20.1 != 20.1D", "20.1", 20.1D, false),
-        arguments("* == 20.1D", "*", 20.1D, true),
-        arguments("20 == bigInt 20", "20", new BigInteger("20"), true),
-        arguments("20 == bigDec 20", "20", new BigDecimal("20"), true),
-        arguments("* == bigDec 20.1", "*", new BigDecimal("20.1"), true));
-  }
-
-  @Test
-  void preferJsonRulesOverOtherDeprecatedOnes() {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      Properties properties = new Properties();
-      properties.setProperty(TRACE_SAMPLING_SERVICE_RULES, "service:0");
-      properties.setProperty(TRACE_SAMPLING_OPERATION_RULES, "operation:0");
-      properties.setProperty(
-          TRACE_SAMPLING_RULES,
-          "[{\"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 1.0}]");
-      properties.setProperty(TRACE_RATE_LIMIT, "1");
-      Sampler sampler = Sampler.Builder.forConfig(properties);
-
-      DDSpan span1 =
-          (DDSpan)
-              tracer
-                  .buildSpan("datadog", "operation")
-                  .withServiceName("service")
-                  .withTag("env", "bar")
-                  .ignoreActiveSpan()
-                  .start();
-      DDSpan span2 =
-          (DDSpan)
-              tracer
-                  .buildSpan("datadog", "operation")
-                  .withServiceName("service")
-                  .withTag("env", "bar")
-                  .ignoreActiveSpan()
-                  .start();
-
-      ((PrioritySampler) sampler).setSamplingPriority(span1);
-      // Span 2 should be rate limited if there isn't a >1 sec delay between these 2 lines
-      ((PrioritySampler) sampler).setSamplingPriority(span2);
-
-      assertTagEquals(1.0, span1.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
-      assertTagEquals(1.0, span1.getTag(RuleBasedTraceSampler.SAMPLING_LIMIT_RATE));
-      assertNull(span1.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
-      assertEquals(USER_KEEP, (int) span1.getSamplingPriority());
-
-      assertTagEquals(1.0, span2.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
-      assertTagEquals(1.0, span2.getTag(RuleBasedTraceSampler.SAMPLING_LIMIT_RATE));
-      assertNull(span2.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
-      assertEquals(USER_DROP, (int) span2.getSamplingPriority());
-    } finally {
-      tracer.close();
+
+    @Test
+    void preferJsonRulesOverOtherDeprecatedOnes() {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            Properties properties = new Properties();
+            properties.setProperty(TRACE_SAMPLING_SERVICE_RULES, "service:0");
+            properties.setProperty(TRACE_SAMPLING_OPERATION_RULES, "operation:0");
+            properties.setProperty(
+                    TRACE_SAMPLING_RULES,
+                    "[{\"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 1.0}]");
+            properties.setProperty(TRACE_RATE_LIMIT, "1");
+            Sampler sampler = Sampler.Builder.forConfig(properties);
+
+            DDSpan span1 = (DDSpan) tracer.buildSpan("datadog", "operation")
+                    .withServiceName("service")
+                    .withTag("env", "bar")
+                    .ignoreActiveSpan()
+                    .start();
+            DDSpan span2 = (DDSpan) tracer.buildSpan("datadog", "operation")
+                    .withServiceName("service")
+                    .withTag("env", "bar")
+                    .ignoreActiveSpan()
+                    .start();
+
+            ((PrioritySampler) sampler).setSamplingPriority(span1);
+            // Span 2 should be rate limited if there isn't a >1 sec delay between these 2 lines
+            ((PrioritySampler) sampler).setSamplingPriority(span2);
+
+            assertTagEquals(1.0, span1.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
+            assertTagEquals(1.0, span1.getTag(RuleBasedTraceSampler.SAMPLING_LIMIT_RATE));
+            assertNull(span1.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
+            assertEquals(USER_KEEP, (int) span1.getSamplingPriority());
+
+            assertTagEquals(1.0, span2.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
+            assertTagEquals(1.0, span2.getTag(RuleBasedTraceSampler.SAMPLING_LIMIT_RATE));
+            assertNull(span2.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
+            assertEquals(USER_DROP, (int) span2.getSamplingPriority());
+        } finally {
+            tracer.close();
+        }
     }
-  }
-
-  @Test
-  void rateLimitIsSetForRateLimitedSpans() {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      Properties properties = new Properties();
-      properties.setProperty(TRACE_SAMPLING_SERVICE_RULES, "service:1");
-      properties.setProperty(TRACE_RATE_LIMIT, "1");
-      Sampler sampler = Sampler.Builder.forConfig(properties);
-
-      DDSpan span1 =
-          (DDSpan)
-              tracer
-                  .buildSpan("datadog", "operation")
-                  .withServiceName("service")
-                  .withTag("env", "bar")
-                  .ignoreActiveSpan()
-                  .start();
-      DDSpan span2 =
-          (DDSpan)
-              tracer
-                  .buildSpan("datadog", "operation")
-                  .withServiceName("service")
-                  .withTag("env", "bar")
-                  .ignoreActiveSpan()
-                  .start();
-
-      ((PrioritySampler) sampler).setSamplingPriority(span1);
-      // Span 2 should be rate limited if there isn't a >1 sec delay between these 2 lines
-      ((PrioritySampler) sampler).setSamplingPriority(span2);
-
-      assertTagEquals(1.0, span1.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
-      assertTagEquals(1.0, span1.getTag(RuleBasedTraceSampler.SAMPLING_LIMIT_RATE));
-      assertNull(span1.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
-      assertEquals(USER_KEEP, (int) span1.getSamplingPriority());
-
-      assertTagEquals(1.0, span2.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
-      assertTagEquals(1.0, span2.getTag(RuleBasedTraceSampler.SAMPLING_LIMIT_RATE));
-      assertNull(span2.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
-      assertEquals(USER_DROP, (int) span2.getSamplingPriority());
-    } finally {
-      tracer.close();
+
+    @Test
+    void rateLimitIsSetForRateLimitedSpans() {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            Properties properties = new Properties();
+            properties.setProperty(TRACE_SAMPLING_SERVICE_RULES, "service:1");
+            properties.setProperty(TRACE_RATE_LIMIT, "1");
+            Sampler sampler = Sampler.Builder.forConfig(properties);
+
+            DDSpan span1 = (DDSpan) tracer.buildSpan("datadog", "operation")
+                    .withServiceName("service")
+                    .withTag("env", "bar")
+                    .ignoreActiveSpan()
+                    .start();
+            DDSpan span2 = (DDSpan) tracer.buildSpan("datadog", "operation")
+                    .withServiceName("service")
+                    .withTag("env", "bar")
+                    .ignoreActiveSpan()
+                    .start();
+
+            ((PrioritySampler) sampler).setSamplingPriority(span1);
+            // Span 2 should be rate limited if there isn't a >1 sec delay between these 2 lines
+            ((PrioritySampler) sampler).setSamplingPriority(span2);
+
+            assertTagEquals(1.0, span1.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
+            assertTagEquals(1.0, span1.getTag(RuleBasedTraceSampler.SAMPLING_LIMIT_RATE));
+            assertNull(span1.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
+            assertEquals(USER_KEEP, (int) span1.getSamplingPriority());
+
+            assertTagEquals(1.0, span2.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
+            assertTagEquals(1.0, span2.getTag(RuleBasedTraceSampler.SAMPLING_LIMIT_RATE));
+            assertNull(span2.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
+            assertEquals(USER_DROP, (int) span2.getSamplingPriority());
+        } finally {
+            tracer.close();
+        }
     }
-  }
-
-  @Test
-  void rateLimitIsSetForRateLimitedSpansMatchedOnDifferentRules() {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      Properties properties = new Properties();
-      properties.setProperty(TRACE_SAMPLING_SERVICE_RULES, "service:1,foo:1");
-      properties.setProperty(TRACE_RATE_LIMIT, "1");
-      Sampler sampler = Sampler.Builder.forConfig(properties);
-
-      DDSpan span1 =
-          (DDSpan)
-              tracer
-                  .buildSpan("datadog", "operation")
-                  .withServiceName("service")
-                  .withTag("env", "bar")
-                  .ignoreActiveSpan()
-                  .start();
-      DDSpan span2 =
-          (DDSpan)
-              tracer
-                  .buildSpan("datadog", "operation")
-                  .withServiceName("foo")
-                  .withTag("env", "bar")
-                  .ignoreActiveSpan()
-                  .start();
-
-      ((PrioritySampler) sampler).setSamplingPriority(span1);
-      // Span 2 should be rate limited if there isn't a >1 sec delay between these 2 lines
-      ((PrioritySampler) sampler).setSamplingPriority(span2);
-
-      assertTagEquals(1.0, span1.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
-      assertTagEquals(1.0, span1.getTag(RuleBasedTraceSampler.SAMPLING_LIMIT_RATE));
-      assertNull(span1.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
-      assertEquals(USER_KEEP, (int) span1.getSamplingPriority());
-
-      assertTagEquals(1.0, span2.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
-      assertTagEquals(1.0, span2.getTag(RuleBasedTraceSampler.SAMPLING_LIMIT_RATE));
-      assertNull(span2.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
-      assertEquals(USER_DROP, (int) span2.getSamplingPriority());
-    } finally {
-      tracer.close();
+
+    @Test
+    void rateLimitIsSetForRateLimitedSpansMatchedOnDifferentRules() {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            Properties properties = new Properties();
+            properties.setProperty(TRACE_SAMPLING_SERVICE_RULES, "service:1,foo:1");
+            properties.setProperty(TRACE_RATE_LIMIT, "1");
+            Sampler sampler = Sampler.Builder.forConfig(properties);
+
+            DDSpan span1 = (DDSpan) tracer.buildSpan("datadog", "operation")
+                    .withServiceName("service")
+                    .withTag("env", "bar")
+                    .ignoreActiveSpan()
+                    .start();
+            DDSpan span2 = (DDSpan) tracer.buildSpan("datadog", "operation")
+                    .withServiceName("foo")
+                    .withTag("env", "bar")
+                    .ignoreActiveSpan()
+                    .start();
+
+            ((PrioritySampler) sampler).setSamplingPriority(span1);
+            // Span 2 should be rate limited if there isn't a >1 sec delay between these 2 lines
+            ((PrioritySampler) sampler).setSamplingPriority(span2);
+
+            assertTagEquals(1.0, span1.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
+            assertTagEquals(1.0, span1.getTag(RuleBasedTraceSampler.SAMPLING_LIMIT_RATE));
+            assertNull(span1.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
+            assertEquals(USER_KEEP, (int) span1.getSamplingPriority());
+
+            assertTagEquals(1.0, span2.getTag(RuleBasedTraceSampler.SAMPLING_RULE_RATE));
+            assertTagEquals(1.0, span2.getTag(RuleBasedTraceSampler.SAMPLING_LIMIT_RATE));
+            assertNull(span2.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
+            assertEquals(USER_DROP, (int) span2.getSamplingPriority());
+        } finally {
+            tracer.close();
+        }
     }
-  }
-
-  private static void assertTagEquals(Number expected, Object actual) {
-    if (expected == null) {
-      assertNull(actual, "Expected tag to be null");
-    } else {
-      assertNotNull(actual, "Expected tag to be non-null");
-      assertEquals(expected.doubleValue(), ((Number) actual).doubleValue(), 1e-9);
+
+    private static void assertTagEquals(Number expected, Object actual) {
+        if (expected == null) {
+            assertNull(actual, "Expected tag to be null");
+        } else {
+            assertNotNull(actual, "Expected tag to be non-null");
+            assertEquals(expected.doubleValue(), ((Number) actual).doubleValue(), 1e-9);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/SamplerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/SamplerTest.java
index e4658e7046b..35658ed3525 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/SamplerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/SamplerTest.java
@@ -24,145 +24,145 @@
 
 class SamplerTest extends DDJavaSpecification {
 
-  @WithConfig(key = APM_TRACING_ENABLED, value = "false")
-  @WithConfig(key = APPSEC_ENABLED, value = "true")
-  @Test
-  void asmStandaloneSamplerSelectedWhenApmTracingDisabledAndAppsecEnabled() {
-    Config config = Config.get();
+    @WithConfig(key = APM_TRACING_ENABLED, value = "false")
+    @WithConfig(key = APPSEC_ENABLED, value = "true")
+    @Test
+    void asmStandaloneSamplerSelectedWhenApmTracingDisabledAndAppsecEnabled() {
+        Config config = Config.get();
 
-    Sampler sampler = Sampler.Builder.forConfig(config, null);
+        Sampler sampler = Sampler.Builder.forConfig(config, null);
 
-    assertInstanceOf(AsmStandaloneSampler.class, sampler);
-  }
-
-  @WithConfig(key = APM_TRACING_ENABLED, value = "false")
-  @WithConfig(key = IAST_ENABLED, value = "true")
-  @Test
-  void asmStandaloneSamplerSelectedWhenApmTracingDisabledAndIastEnabled() {
-    Config config = Config.get();
-
-    Sampler sampler = Sampler.Builder.forConfig(config, null);
+        assertInstanceOf(AsmStandaloneSampler.class, sampler);
+    }
 
-    assertInstanceOf(AsmStandaloneSampler.class, sampler);
-  }
+    @WithConfig(key = APM_TRACING_ENABLED, value = "false")
+    @WithConfig(key = IAST_ENABLED, value = "true")
+    @Test
+    void asmStandaloneSamplerSelectedWhenApmTracingDisabledAndIastEnabled() {
+        Config config = Config.get();
 
-  @WithConfig(key = APM_TRACING_ENABLED, value = "false")
-  @WithConfig(key = APPSEC_SCA_ENABLED, value = "true")
-  @Test
-  void asmStandaloneSamplerSelectedWhenApmTracingDisabledAndScaEnabled() {
-    Config config = Config.get();
+        Sampler sampler = Sampler.Builder.forConfig(config, null);
 
-    Sampler sampler = Sampler.Builder.forConfig(config, null);
+        assertInstanceOf(AsmStandaloneSampler.class, sampler);
+    }
 
-    assertInstanceOf(AsmStandaloneSampler.class, sampler);
-  }
+    @WithConfig(key = APM_TRACING_ENABLED, value = "false")
+    @WithConfig(key = APPSEC_SCA_ENABLED, value = "true")
+    @Test
+    void asmStandaloneSamplerSelectedWhenApmTracingDisabledAndScaEnabled() {
+        Config config = Config.get();
 
-  @WithConfig(key = APM_TRACING_ENABLED, value = "false")
-  @Test
-  void asmStandaloneSamplerNotSelectedWhenApmTracingAndAsmNotEnabled() {
-    Config config = Config.get();
+        Sampler sampler = Sampler.Builder.forConfig(config, null);
 
-    Sampler sampler = Sampler.Builder.forConfig(config, null);
+        assertInstanceOf(AsmStandaloneSampler.class, sampler);
+    }
 
-    assertFalse(sampler instanceof AsmStandaloneSampler);
-  }
+    @WithConfig(key = APM_TRACING_ENABLED, value = "false")
+    @Test
+    void asmStandaloneSamplerNotSelectedWhenApmTracingAndAsmNotEnabled() {
+        Config config = Config.get();
 
-  @Test
-  void asmStandaloneSamplerNotSelectedWhenApmTracingEnabledAndAsmNotEnabled() {
-    Config config = Config.get();
+        Sampler sampler = Sampler.Builder.forConfig(config, null);
 
-    Sampler sampler = Sampler.Builder.forConfig(config, null);
+        assertFalse(sampler instanceof AsmStandaloneSampler);
+    }
 
-    assertFalse(sampler instanceof AsmStandaloneSampler);
-  }
+    @Test
+    void asmStandaloneSamplerNotSelectedWhenApmTracingEnabledAndAsmNotEnabled() {
+        Config config = Config.get();
 
-  @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
-  @WithConfig(key = PRIORITY_SAMPLING, value = "false")
-  @Test
-  void parentBasedAlwaysOnSamplerReplacesAllSamplerWhenOtlpEnabledAndPrioritySamplingDisabled() {
-    Config config = Config.get();
+        Sampler sampler = Sampler.Builder.forConfig(config, null);
 
-    Sampler sampler = Sampler.Builder.forConfig(config, null);
+        assertFalse(sampler instanceof AsmStandaloneSampler);
+    }
 
-    assertInstanceOf(ParentBasedAlwaysOnSampler.class, sampler);
-  }
+    @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
+    @WithConfig(key = PRIORITY_SAMPLING, value = "false")
+    @Test
+    void parentBasedAlwaysOnSamplerReplacesAllSamplerWhenOtlpEnabledAndPrioritySamplingDisabled() {
+        Config config = Config.get();
 
-  @WithConfig(key = PRIORITY_SAMPLING, value = "false")
-  @Test
-  void allSamplerSelectedWhenOtlpDisabledAndPrioritySamplingDisabled() {
-    Config config = Config.get();
+        Sampler sampler = Sampler.Builder.forConfig(config, null);
 
-    Sampler sampler = Sampler.Builder.forConfig(config, null);
+        assertInstanceOf(ParentBasedAlwaysOnSampler.class, sampler);
+    }
 
-    assertInstanceOf(AllSampler.class, sampler);
-    assertFalse(sampler instanceof ParentBasedAlwaysOnSampler);
-  }
+    @WithConfig(key = PRIORITY_SAMPLING, value = "false")
+    @Test
+    void allSamplerSelectedWhenOtlpDisabledAndPrioritySamplingDisabled() {
+        Config config = Config.get();
 
-  @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
-  @WithConfig(key = TRACE_SAMPLE_RATE, value = "0.5")
-  @Test
-  void traceSamplingRulesRespectedWhenOtlpEnabled() {
-    Config config = Config.get();
+        Sampler sampler = Sampler.Builder.forConfig(config, null);
 
-    Sampler sampler = Sampler.Builder.forConfig(config, null);
+        assertInstanceOf(AllSampler.class, sampler);
+        assertFalse(sampler instanceof ParentBasedAlwaysOnSampler);
+    }
 
-    assertInstanceOf(RuleBasedTraceSampler.class, sampler);
-    assertFalse(sampler instanceof ParentBasedAlwaysOnSampler);
-  }
+    @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
+    @WithConfig(key = TRACE_SAMPLE_RATE, value = "0.5")
+    @Test
+    void traceSamplingRulesRespectedWhenOtlpEnabled() {
+        Config config = Config.get();
 
-  @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
-  @Test
-  void
-      parentBasedAlwaysOnSamplerReplacesRateByServiceTraceSamplerWhenOtlpEnabledWithDefaultPrioritySampling() {
-    Config config = Config.get();
+        Sampler sampler = Sampler.Builder.forConfig(config, null);
 
-    Sampler sampler = Sampler.Builder.forConfig(config, null);
+        assertInstanceOf(RuleBasedTraceSampler.class, sampler);
+        assertFalse(sampler instanceof ParentBasedAlwaysOnSampler);
+    }
 
-    assertInstanceOf(ParentBasedAlwaysOnSampler.class, sampler);
-    assertFalse(sampler instanceof RateByServiceTraceSampler);
-  }
+    @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
+    @Test
+    void parentBasedAlwaysOnSamplerReplacesRateByServiceTraceSamplerWhenOtlpEnabledWithDefaultPrioritySampling() {
+        Config config = Config.get();
 
-  @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
-  @WithConfig(key = PRIORITY_SAMPLING_FORCE, value = "keep")
-  @Test
-  void forcePrioritySamplerRespectedWhenOtlpEnabledAndPrioritySamplingForcedKeep() {
-    Config config = Config.get();
+        Sampler sampler = Sampler.Builder.forConfig(config, null);
 
-    Sampler sampler = Sampler.Builder.forConfig(config, null);
+        assertInstanceOf(ParentBasedAlwaysOnSampler.class, sampler);
+        assertFalse(sampler instanceof RateByServiceTraceSampler);
+    }
 
-    assertInstanceOf(ForcePrioritySampler.class, sampler);
-    assertFalse(sampler instanceof ParentBasedAlwaysOnSampler);
-  }
+    @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
+    @WithConfig(key = PRIORITY_SAMPLING_FORCE, value = "keep")
+    @Test
+    void forcePrioritySamplerRespectedWhenOtlpEnabledAndPrioritySamplingForcedKeep() {
+        Config config = Config.get();
 
-  @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
-  @WithConfig(key = PRIORITY_SAMPLING_FORCE, value = "drop")
-  @Test
-  void forcePrioritySamplerRespectedWhenOtlpEnabledAndPrioritySamplingForcedDrop() {
-    Config config = Config.get();
+        Sampler sampler = Sampler.Builder.forConfig(config, null);
 
-    Sampler sampler = Sampler.Builder.forConfig(config, null);
+        assertInstanceOf(ForcePrioritySampler.class, sampler);
+        assertFalse(sampler instanceof ParentBasedAlwaysOnSampler);
+    }
 
-    assertInstanceOf(ForcePrioritySampler.class, sampler);
-    assertFalse(sampler instanceof ParentBasedAlwaysOnSampler);
-  }
+    @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
+    @WithConfig(key = PRIORITY_SAMPLING_FORCE, value = "drop")
+    @Test
+    void forcePrioritySamplerRespectedWhenOtlpEnabledAndPrioritySamplingForcedDrop() {
+        Config config = Config.get();
 
-  @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
-  @WithConfig(key = PRIORITY_SAMPLING, value = "false")
-  @Test
-  void spansBuiltWithOtlpEnabledAndPrioritySamplingDisabledHaveNonUnsetSamplingPriority() {
-    Config config = Config.get();
-    Sampler sampler = Sampler.Builder.forConfig(config, null);
-    CoreTracer tracer = CoreTracer.builder().writer(new ListWriter()).sampler(sampler).build();
-    try {
-      DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
-      ((PrioritySampler) sampler).setSamplingPriority(span);
+        Sampler sampler = Sampler.Builder.forConfig(config, null);
 
-      assertNotNull(span.getSamplingPriority());
-      assertEquals(SAMPLER_KEEP, (int) span.getSamplingPriority());
+        assertInstanceOf(ForcePrioritySampler.class, sampler);
+        assertFalse(sampler instanceof ParentBasedAlwaysOnSampler);
+    }
 
-      span.finish();
-    } finally {
-      tracer.close();
+    @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
+    @WithConfig(key = PRIORITY_SAMPLING, value = "false")
+    @Test
+    void spansBuiltWithOtlpEnabledAndPrioritySamplingDisabledHaveNonUnsetSamplingPriority() {
+        Config config = Config.get();
+        Sampler sampler = Sampler.Builder.forConfig(config, null);
+        CoreTracer tracer =
+                CoreTracer.builder().writer(new ListWriter()).sampler(sampler).build();
+        try {
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
+            ((PrioritySampler) sampler).setSamplingPriority(span);
+
+            assertNotNull(span.getSamplingPriority());
+            assertEquals(SAMPLER_KEEP, (int) span.getSamplingPriority());
+
+            span.finish();
+        } finally {
+            tracer.close();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/SingleSpanSamplerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/SingleSpanSamplerTest.java
index 7d953341b2c..4a3f0a623ab 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/SingleSpanSamplerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/SingleSpanSamplerTest.java
@@ -28,231 +28,208 @@
 import org.tabletest.junit.TableTest;
 
 class SingleSpanSamplerTest extends DDCoreJavaSpecification {
-  @TempDir Path tempDir;
-
-  @TableTest({
-    "scenario                | rules                                                                                           ",
-    "null rules              |                                                                                                 ",
-    "empty rules             | '[]'                                                                                            ",
-    "invalid sample_rate 10  | '[ { \"service\": \"*\", \"name\": \"*\", \"sample_rate\": 10.0 } ]'                            ",
-    "invalid sample_rate all | '[ { \"service\": \"*\", \"name\": \"*\", \"sample_rate\": \"all\" } ]'                         ",
-    "invalid max_per_second  | '[ { \"service\": \"*\", \"name\": \"*\", \"sample_rate\": 1.0, \"max_per_second\": \"N/A\" } ]'"
-  })
-  void singleSpanSamplerNotCreatedWhenNoRulesProvided(String rules) {
-    Properties properties = new Properties();
-    if (rules != null) {
-      properties.setProperty(SPAN_SAMPLING_RULES, rules);
+    @TempDir
+    Path tempDir;
+
+    @TableTest({
+      "scenario                | rules                                                                                           ",
+      "null rules              |                                                                                                 ",
+      "empty rules             | '[]'                                                                                            ",
+      "invalid sample_rate 10  | '[ { \"service\": \"*\", \"name\": \"*\", \"sample_rate\": 10.0 } ]'                            ",
+      "invalid sample_rate all | '[ { \"service\": \"*\", \"name\": \"*\", \"sample_rate\": \"all\" } ]'                         ",
+      "invalid max_per_second  | '[ { \"service\": \"*\", \"name\": \"*\", \"sample_rate\": 1.0, \"max_per_second\": \"N/A\" } ]'"
+    })
+    void singleSpanSamplerNotCreatedWhenNoRulesProvided(String rules) {
+        Properties properties = new Properties();
+        if (rules != null) {
+            properties.setProperty(SPAN_SAMPLING_RULES, rules);
+        }
+
+        SingleSpanSampler sampler = SingleSpanSampler.Builder.forConfig(Config.get(properties));
+
+        assertNull(sampler);
     }
 
-    SingleSpanSampler sampler = SingleSpanSampler.Builder.forConfig(Config.get(properties));
-
-    assertNull(sampler);
-  }
-
-  @TableTest({
-    "scenario                   | rules                                                                                                     | isFirstSampled | expectedMechanism                    | expectedRate | expectedLimit",
-    "* match rate 1.0           | '[ { \"service\": \"*\", \"name\": \"*\", \"sample_rate\": 1.0 } ]'                                       | true           | SamplingMechanism.SPAN_SAMPLING_RATE | 1.0          |              ",
-    "* match rate 1.0 limit 10  | '[ { \"service\": \"*\", \"name\": \"*\", \"sample_rate\": 1.0, \"max_per_second\": 10 } ]'               | true           | SamplingMechanism.SPAN_SAMPLING_RATE | 1.0          | 10           ",
-    "ser* oper* limit 15        | '[ { \"service\": \"ser*\", \"name\": \"oper*\", \"sample_rate\": 1.0, \"max_per_second\": 15 } ]'        | true           | SamplingMechanism.SPAN_SAMPLING_RATE | 1.0          | 15           ",
-    "?ervice operati?n limit 10 | '[ { \"service\": \"?ervice\", \"name\": \"operati?n\", \"sample_rate\": 1.0, \"max_per_second\": 10 } ]' | true           | SamplingMechanism.SPAN_SAMPLING_RATE | 1.0          | 10           ",
-    "service operation limit 5  | '[ { \"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 1.0, \"max_per_second\": 5 } ]'  | true           | SamplingMechanism.SPAN_SAMPLING_RATE | 1.0          | 5            ",
-    "service-b no match         | '[ { \"service\": \"service-b\", \"name\": \"*\", \"sample_rate\": 1.0, \"max_per_second\": 10 } ]'       | false          |                                      |              |              ",
-    "rate 0.0 no sample         | '[ { \"service\": \"*\", \"name\": \"*\", \"sample_rate\": 0.0 } ]'                                       | false          |                                      |              |              ",
-    "operation-b no match       | '[ { \"service\": \"*\", \"name\": \"operation-b\", \"sample_rate\": 0.5 } ]'                             | false          |                                      |              |              "
-  })
-  void singleSpanSamplerSetSamplingPriority(
-      String rules,
-      boolean isFirstSampled,
-      @ConvertWith(SamplingMechanismConverter.class) Byte expectedMechanism,
-      Double expectedRate,
-      Integer expectedLimit) {
-    Properties properties = new Properties();
-    if (rules != null) {
-      properties.setProperty(SPAN_SAMPLING_RULES, rules);
-    }
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    SingleSpanSampler sampler = SingleSpanSampler.Builder.forConfig(Config.get(properties));
-
-    DDSpan span =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", "operation")
+    @TableTest({
+      "scenario                   | rules                                                                                                     | isFirstSampled | expectedMechanism                    | expectedRate | expectedLimit",
+      "* match rate 1.0           | '[ { \"service\": \"*\", \"name\": \"*\", \"sample_rate\": 1.0 } ]'                                       | true           | SamplingMechanism.SPAN_SAMPLING_RATE | 1.0          |              ",
+      "* match rate 1.0 limit 10  | '[ { \"service\": \"*\", \"name\": \"*\", \"sample_rate\": 1.0, \"max_per_second\": 10 } ]'               | true           | SamplingMechanism.SPAN_SAMPLING_RATE | 1.0          | 10           ",
+      "ser* oper* limit 15        | '[ { \"service\": \"ser*\", \"name\": \"oper*\", \"sample_rate\": 1.0, \"max_per_second\": 15 } ]'        | true           | SamplingMechanism.SPAN_SAMPLING_RATE | 1.0          | 15           ",
+      "?ervice operati?n limit 10 | '[ { \"service\": \"?ervice\", \"name\": \"operati?n\", \"sample_rate\": 1.0, \"max_per_second\": 10 } ]' | true           | SamplingMechanism.SPAN_SAMPLING_RATE | 1.0          | 10           ",
+      "service operation limit 5  | '[ { \"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 1.0, \"max_per_second\": 5 } ]'  | true           | SamplingMechanism.SPAN_SAMPLING_RATE | 1.0          | 5            ",
+      "service-b no match         | '[ { \"service\": \"service-b\", \"name\": \"*\", \"sample_rate\": 1.0, \"max_per_second\": 10 } ]'       | false          |                                      |              |              ",
+      "rate 0.0 no sample         | '[ { \"service\": \"*\", \"name\": \"*\", \"sample_rate\": 0.0 } ]'                                       | false          |                                      |              |              ",
+      "operation-b no match       | '[ { \"service\": \"*\", \"name\": \"operation-b\", \"sample_rate\": 0.5 } ]'                             | false          |                                      |              |              "
+    })
+    void singleSpanSamplerSetSamplingPriority(
+            String rules,
+            boolean isFirstSampled,
+            @ConvertWith(SamplingMechanismConverter.class) Byte expectedMechanism,
+            Double expectedRate,
+            Integer expectedLimit) {
+        Properties properties = new Properties();
+        if (rules != null) {
+            properties.setProperty(SPAN_SAMPLING_RULES, rules);
+        }
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        SingleSpanSampler sampler = SingleSpanSampler.Builder.forConfig(Config.get(properties));
+
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation")
                 .withServiceName("service")
                 .withTag("env", "bar")
                 .ignoreActiveSpan()
                 .start();
 
-    assertEquals(isFirstSampled, sampler.setSamplingPriority(span));
-
-    assertTagEquals(expectedMechanism, span.getTag("_dd.span_sampling.mechanism"));
-    assertTagEquals(expectedRate, span.getTag("_dd.span_sampling.rule_rate"));
-    assertTagEquals(expectedLimit, span.getTag("_dd.span_sampling.max_per_second"));
-  }
-
-  @TableTest({
-    "scenario              | rules                                                       | sampleRoot | sampleChild | rootMechanism                        | childMechanism                      ",
-    "web.request match     | '[{\"service\": \"webserver\", \"name\": \"web.request\"}]' | true       | false       | SamplingMechanism.SPAN_SAMPLING_RATE |                                     ",
-    "web.handler match     | '[{\"service\": \"webserver\", \"name\": \"web.handler\"}]' | false      | true        |                                      | SamplingMechanism.SPAN_SAMPLING_RATE",
-    "web.* match both      | '[{\"service\": \"webserver\", \"name\": \"web.*\"}]'       | true       | true        | SamplingMechanism.SPAN_SAMPLING_RATE | SamplingMechanism.SPAN_SAMPLING_RATE",
-    "other-server no match | '[{\"service\": \"other-server\"}]'                         | false      | false       |                                      |                                     "
-  })
-  void parentChildScenariosWhenTraceDroppedButSpansKeptBySingleSpanSampler(
-      String rules,
-      boolean sampleRoot,
-      boolean sampleChild,
-      @ConvertWith(SamplingMechanismConverter.class) Byte rootMechanism,
-      @ConvertWith(SamplingMechanismConverter.class) Byte childMechanism) {
-    Properties properties = new Properties();
-    if (rules != null) {
-      properties.setProperty(SPAN_SAMPLING_RULES, rules);
-      properties.setProperty(TRACE_SAMPLE_RATE, "0");
-    }
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        assertEquals(isFirstSampled, sampler.setSamplingPriority(span));
 
-    SingleSpanSampler sampler = SingleSpanSampler.Builder.forConfig(Config.get(properties));
+        assertTagEquals(expectedMechanism, span.getTag("_dd.span_sampling.mechanism"));
+        assertTagEquals(expectedRate, span.getTag("_dd.span_sampling.rule_rate"));
+        assertTagEquals(expectedLimit, span.getTag("_dd.span_sampling.max_per_second"));
+    }
 
-    DDSpan rootSpan =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", "web.request")
+    @TableTest({
+      "scenario              | rules                                                       | sampleRoot | sampleChild | rootMechanism                        | childMechanism                      ",
+      "web.request match     | '[{\"service\": \"webserver\", \"name\": \"web.request\"}]' | true       | false       | SamplingMechanism.SPAN_SAMPLING_RATE |                                     ",
+      "web.handler match     | '[{\"service\": \"webserver\", \"name\": \"web.handler\"}]' | false      | true        |                                      | SamplingMechanism.SPAN_SAMPLING_RATE",
+      "web.* match both      | '[{\"service\": \"webserver\", \"name\": \"web.*\"}]'       | true       | true        | SamplingMechanism.SPAN_SAMPLING_RATE | SamplingMechanism.SPAN_SAMPLING_RATE",
+      "other-server no match | '[{\"service\": \"other-server\"}]'                         | false      | false       |                                      |                                     "
+    })
+    void parentChildScenariosWhenTraceDroppedButSpansKeptBySingleSpanSampler(
+            String rules,
+            boolean sampleRoot,
+            boolean sampleChild,
+            @ConvertWith(SamplingMechanismConverter.class) Byte rootMechanism,
+            @ConvertWith(SamplingMechanismConverter.class) Byte childMechanism) {
+        Properties properties = new Properties();
+        if (rules != null) {
+            properties.setProperty(SPAN_SAMPLING_RULES, rules);
+            properties.setProperty(TRACE_SAMPLE_RATE, "0");
+        }
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        SingleSpanSampler sampler = SingleSpanSampler.Builder.forConfig(Config.get(properties));
+
+        DDSpan rootSpan = (DDSpan) tracer.buildSpan("datadog", "web.request")
                 .withServiceName("webserver")
                 .ignoreActiveSpan()
                 .start();
 
-    DDSpan childSpan =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", "web.handler")
+        DDSpan childSpan = (DDSpan) tracer.buildSpan("datadog", "web.handler")
                 .withServiceName("webserver")
                 .asChildOf(rootSpan)
                 .ignoreActiveSpan()
                 .start();
 
-    // set trace sampling priority to drop the trace
-    rootSpan.setSamplingPriority(SAMPLER_DROP, DEFAULT);
-
-    // set spans sampling priority
-    assertEquals(sampleRoot, sampler.setSamplingPriority(rootSpan));
-    assertEquals(sampleChild, sampler.setSamplingPriority(childSpan));
-
-    assertTagEquals(rootMechanism, rootSpan.getTag("_dd.span_sampling.mechanism"));
-    assertTagEquals(childMechanism, childSpan.getTag("_dd.span_sampling.mechanism"));
-  }
-
-  @TableTest({
-    "scenario                   | rules                                                                                                    | isFirstSampled | isSecondSampled",
-    "* limit 1 first only       | '[ { \"service\": \"*\", \"name\": \"*\", \"sample_rate\": 1.0, \"max_per_second\": 1 } ]'               | true           | false          ",
-    "ser* oper* limit 1         | '[ { \"service\": \"ser*\", \"name\": \"oper*\", \"sample_rate\": 1.0, \"max_per_second\": 1 } ]'        | true           | false          ",
-    "?ervice operati?n limit 1  | '[ { \"service\": \"?ervice\", \"name\": \"operati?n\", \"sample_rate\": 1.0, \"max_per_second\": 1 } ]' | true           | false          ",
-    "service operation limit 1  | '[ { \"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 1.0, \"max_per_second\": 1 } ]' | true           | false          ",
-    "service only limit 1       | '[ { \"service\": \"service\", \"max_per_second\": 1 } ]'                                                | true           | false          ",
-    "name only limit 1          | '[ { \"name\": \"operation\", \"sample_rate\": 1.0, \"max_per_second\": 1 } ]'                           | true           | false          ",
-    "* limit 2 both sampled     | '[ { \"service\": \"*\", \"name\": \"*\", \"sample_rate\": 1.0, \"max_per_second\": 2 } ]'               | true           | true           ",
-    "ser* oper* no rate limit 2 | '[ { \"service\": \"ser*\", \"name\": \"oper*\", \"max_per_second\": 2 } ]'                              | true           | true           ",
-    "?ervice operati?n limit 2  | '[ { \"service\": \"?ervice\", \"name\": \"operati?n\", \"sample_rate\": 1.0, \"max_per_second\": 2 } ]' | true           | true           "
-  })
-  void singleSpanSamplerSetSamplingPriorityWithMaxPerSecondLimit(
-      String rules, boolean isFirstSampled, boolean isSecondSampled) {
-    Properties properties = new Properties();
-    if (rules != null) {
-      properties.setProperty(SPAN_SAMPLING_RULES, rules);
-    }
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        // set trace sampling priority to drop the trace
+        rootSpan.setSamplingPriority(SAMPLER_DROP, DEFAULT);
+
+        // set spans sampling priority
+        assertEquals(sampleRoot, sampler.setSamplingPriority(rootSpan));
+        assertEquals(sampleChild, sampler.setSamplingPriority(childSpan));
 
-    SingleSpanSampler sampler = SingleSpanSampler.Builder.forConfig(Config.get(properties));
+        assertTagEquals(rootMechanism, rootSpan.getTag("_dd.span_sampling.mechanism"));
+        assertTagEquals(childMechanism, childSpan.getTag("_dd.span_sampling.mechanism"));
+    }
 
-    DDSpan span1 =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", "operation")
+    @TableTest({
+      "scenario                   | rules                                                                                                    | isFirstSampled | isSecondSampled",
+      "* limit 1 first only       | '[ { \"service\": \"*\", \"name\": \"*\", \"sample_rate\": 1.0, \"max_per_second\": 1 } ]'               | true           | false          ",
+      "ser* oper* limit 1         | '[ { \"service\": \"ser*\", \"name\": \"oper*\", \"sample_rate\": 1.0, \"max_per_second\": 1 } ]'        | true           | false          ",
+      "?ervice operati?n limit 1  | '[ { \"service\": \"?ervice\", \"name\": \"operati?n\", \"sample_rate\": 1.0, \"max_per_second\": 1 } ]' | true           | false          ",
+      "service operation limit 1  | '[ { \"service\": \"service\", \"name\": \"operation\", \"sample_rate\": 1.0, \"max_per_second\": 1 } ]' | true           | false          ",
+      "service only limit 1       | '[ { \"service\": \"service\", \"max_per_second\": 1 } ]'                                                | true           | false          ",
+      "name only limit 1          | '[ { \"name\": \"operation\", \"sample_rate\": 1.0, \"max_per_second\": 1 } ]'                           | true           | false          ",
+      "* limit 2 both sampled     | '[ { \"service\": \"*\", \"name\": \"*\", \"sample_rate\": 1.0, \"max_per_second\": 2 } ]'               | true           | true           ",
+      "ser* oper* no rate limit 2 | '[ { \"service\": \"ser*\", \"name\": \"oper*\", \"max_per_second\": 2 } ]'                              | true           | true           ",
+      "?ervice operati?n limit 2  | '[ { \"service\": \"?ervice\", \"name\": \"operati?n\", \"sample_rate\": 1.0, \"max_per_second\": 2 } ]' | true           | true           "
+    })
+    void singleSpanSamplerSetSamplingPriorityWithMaxPerSecondLimit(
+            String rules, boolean isFirstSampled, boolean isSecondSampled) {
+        Properties properties = new Properties();
+        if (rules != null) {
+            properties.setProperty(SPAN_SAMPLING_RULES, rules);
+        }
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        SingleSpanSampler sampler = SingleSpanSampler.Builder.forConfig(Config.get(properties));
+
+        DDSpan span1 = (DDSpan) tracer.buildSpan("datadog", "operation")
                 .withServiceName("service")
                 .withTag("env", "bar")
                 .ignoreActiveSpan()
                 .start();
 
-    DDSpan span2 =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", "operation")
+        DDSpan span2 = (DDSpan) tracer.buildSpan("datadog", "operation")
                 .withServiceName("service")
                 .withTag("env", "bar")
                 .ignoreActiveSpan()
                 .start();
 
-    assertEquals(isFirstSampled, sampler.setSamplingPriority(span1));
-    assertEquals(isSecondSampled, sampler.setSamplingPriority(span2));
-  }
+        assertEquals(isFirstSampled, sampler.setSamplingPriority(span1));
+        assertEquals(isSecondSampled, sampler.setSamplingPriority(span2));
+    }
 
-  @Test
-  void loadRulesFromFile() throws Exception {
-    String rules =
-        "[ { \"service\": \"*\", \"name\": \"op?ration*\", \"sample_rate\": 1.0, \"max_per_second\": 1 } ]";
-    Properties properties = new Properties();
-    properties.setProperty(SPAN_SAMPLING_RULES_FILE, createRulesFile(rules));
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+    @Test
+    void loadRulesFromFile() throws Exception {
+        String rules =
+                "[ { \"service\": \"*\", \"name\": \"op?ration*\", \"sample_rate\": 1.0, \"max_per_second\": 1 } ]";
+        Properties properties = new Properties();
+        properties.setProperty(SPAN_SAMPLING_RULES_FILE, createRulesFile(rules));
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
 
-    SingleSpanSampler sampler = SingleSpanSampler.Builder.forConfig(Config.get(properties));
+        SingleSpanSampler sampler = SingleSpanSampler.Builder.forConfig(Config.get(properties));
 
-    DDSpan span1 =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", "operation")
+        DDSpan span1 = (DDSpan) tracer.buildSpan("datadog", "operation")
                 .withServiceName("service")
                 .withTag("env", "bar")
                 .ignoreActiveSpan()
                 .start();
 
-    assertTrue(sampler.setSamplingPriority(span1));
-  }
-
-  @TableTest({
-    "scenario              | envVarRules                  | fileRules                    | matched",
-    "env 0 file 1 -> false | '[ { \"sample_rate\": 0 } ]' | '[ { \"sample_rate\": 1 } ]' | false  ",
-    "env 1 file 0 -> true  | '[ { \"sample_rate\": 1 } ]' | '[ { \"sample_rate\": 0 } ]' | true   "
-  })
-  void preferRulesInEnvVarOverRulesFromFile(String envVarRules, String fileRules, boolean matched)
-      throws Exception {
-    Properties properties = new Properties();
-    properties.setProperty(SPAN_SAMPLING_RULES, envVarRules);
-    properties.setProperty(SPAN_SAMPLING_RULES_FILE, createRulesFile(fileRules));
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    SingleSpanSampler sampler = SingleSpanSampler.Builder.forConfig(Config.get(properties));
-
-    DDSpan span1 =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", "operation")
+        assertTrue(sampler.setSamplingPriority(span1));
+    }
+
+    @TableTest({
+      "scenario              | envVarRules                  | fileRules                    | matched",
+      "env 0 file 1 -> false | '[ { \"sample_rate\": 0 } ]' | '[ { \"sample_rate\": 1 } ]' | false  ",
+      "env 1 file 0 -> true  | '[ { \"sample_rate\": 1 } ]' | '[ { \"sample_rate\": 0 } ]' | true   "
+    })
+    void preferRulesInEnvVarOverRulesFromFile(String envVarRules, String fileRules, boolean matched) throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty(SPAN_SAMPLING_RULES, envVarRules);
+        properties.setProperty(SPAN_SAMPLING_RULES_FILE, createRulesFile(fileRules));
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        SingleSpanSampler sampler = SingleSpanSampler.Builder.forConfig(Config.get(properties));
+
+        DDSpan span1 = (DDSpan) tracer.buildSpan("datadog", "operation")
                 .withServiceName("service")
                 .withTag("env", "bar")
                 .ignoreActiveSpan()
                 .start();
 
-    assertEquals(matched, sampler.setSamplingPriority(span1));
-  }
-
-  @Test
-  void throwNpeWhenPassedListOfRulesIsNull() {
-    NullPointerException exception =
-        assertThrows(
-            NullPointerException.class,
-            () -> new SingleSpanSampler.RuleBasedSingleSpanSampler(null));
-    assertEquals("SpanSamplingRules can't be null.", exception.getMessage());
-  }
-
-  private String createRulesFile(String rules) throws IOException {
-    Path tempFile = tempDir.resolve("single-span-sampling-rules.json");
-    Files.write(tempFile, rules.getBytes(StandardCharsets.UTF_8));
-    return tempFile.toString();
-  }
-
-  private static void assertTagEquals(Number expected, Object actual) {
-    if (expected == null) {
-      assertNull(actual, "Expected tag to be null");
-    } else {
-      assertNotNull(actual, "Expected tag to be non-null");
-      assertEquals(expected.doubleValue(), ((Number) actual).doubleValue(), 1e-9);
+        assertEquals(matched, sampler.setSamplingPriority(span1));
+    }
+
+    @Test
+    void throwNpeWhenPassedListOfRulesIsNull() {
+        NullPointerException exception =
+                assertThrows(NullPointerException.class, () -> new SingleSpanSampler.RuleBasedSingleSpanSampler(null));
+        assertEquals("SpanSamplingRules can't be null.", exception.getMessage());
+    }
+
+    private String createRulesFile(String rules) throws IOException {
+        Path tempFile = tempDir.resolve("single-span-sampling-rules.json");
+        Files.write(tempFile, rules.getBytes(StandardCharsets.UTF_8));
+        return tempFile.toString();
+    }
+
+    private static void assertTagEquals(Number expected, Object actual) {
+        if (expected == null) {
+            assertNull(actual, "Expected tag to be null");
+        } else {
+            assertNotNull(actual, "Expected tag to be non-null");
+            assertEquals(expected.doubleValue(), ((Number) actual).doubleValue(), 1e-9);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/SpanSamplingRulesFileTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/SpanSamplingRulesFileTest.java
index 49941602be7..84652e6ed6d 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/SpanSamplingRulesFileTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/SpanSamplingRulesFileTest.java
@@ -8,20 +8,21 @@
 
 class SpanSamplingRulesFileTest extends SpanSamplingRulesTest {
 
-  @TempDir Path tempDir;
+    @TempDir
+    Path tempDir;
 
-  String createRulesFile(String rules) throws IOException {
-    Path tempFile = tempDir.resolve("single-span-sampling-rules.json");
-    Files.write(tempFile, rules.getBytes(StandardCharsets.UTF_8));
-    return tempFile.toString();
-  }
+    String createRulesFile(String rules) throws IOException {
+        Path tempFile = tempDir.resolve("single-span-sampling-rules.json");
+        Files.write(tempFile, rules.getBytes(StandardCharsets.UTF_8));
+        return tempFile.toString();
+    }
 
-  @Override
-  protected SpanSamplingRules deserializeRules(String jsonRules) {
-    try {
-      return SpanSamplingRules.deserializeFile(createRulesFile(jsonRules));
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+    @Override
+    protected SpanSamplingRules deserializeRules(String jsonRules) {
+        try {
+            return SpanSamplingRules.deserializeFile(createRulesFile(jsonRules));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/SpanSamplingRulesTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/SpanSamplingRulesTest.java
index 021ab31171b..82285659b30 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/SpanSamplingRulesTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/SpanSamplingRulesTest.java
@@ -14,20 +14,18 @@
 
 class SpanSamplingRulesTest {
 
-  protected SpanSamplingRules deserializeRules(String jsonRules) {
-    return SpanSamplingRules.deserialize(jsonRules);
-  }
-
-  @Test
-  void deserializeEmptyListOfSpanSamplingRulesFromJson() {
-    assertTrue(deserializeRules("[]").isEmpty());
-  }
-
-  @Test
-  void deserializeSpanSamplingRulesFromJson() {
-    SpanSamplingRules result =
-        deserializeRules(
-            "[\n"
+    protected SpanSamplingRules deserializeRules(String jsonRules) {
+        return SpanSamplingRules.deserialize(jsonRules);
+    }
+
+    @Test
+    void deserializeEmptyListOfSpanSamplingRulesFromJson() {
+        assertTrue(deserializeRules("[]").isEmpty());
+    }
+
+    @Test
+    void deserializeSpanSamplingRulesFromJson() {
+        SpanSamplingRules result = deserializeRules("[\n"
                 + "  {\"service\": \"service-name\", \"name\": \"operation-name\", \"resource\": \"resource-name\", \"tags\":\n"
                 + "    {\"tag-name1\": \"tag-pattern1\",\n"
                 + "     \"tag-name2\": \"tag-pattern2\"},\n"
@@ -47,127 +45,120 @@ void deserializeSpanSamplingRulesFromJson() {
                 + "  {\"max_per_second\": 10.123},\n"
                 + "  {\"max_per_second\": 10000}\n"
                 + "]");
-    List<SpanSamplingRules.Rule> rules = result.getRules();
-    int ruleIndex = 0;
-
-    assertEquals(13, rules.size());
-
-    // Test a complete rule
-    Map<String, String> expectedTags = new LinkedHashMap<>();
-    expectedTags.put("tag-name1", "tag-pattern1");
-    expectedTags.put("tag-name2", "tag-pattern2");
-    assertEquals("service-name", rules.get(ruleIndex).getService());
-    assertEquals("operation-name", rules.get(ruleIndex).getName());
-    assertEquals("resource-name", rules.get(ruleIndex).getResource());
-    assertEquals(expectedTags, rules.get(ruleIndex).getTags());
-    assertEquals(0.0d, rules.get(ruleIndex).getSampleRate(), 1e-9);
-    assertEquals(10, rules.get(ruleIndex++).getMaxPerSecond());
-
-    // Test default values with an empty rule
-    assertEquals(MATCH_ALL, rules.get(ruleIndex).getService());
-    assertEquals(MATCH_ALL, rules.get(ruleIndex).getName());
-    assertEquals(MATCH_ALL, rules.get(ruleIndex).getResource());
-    assertTrue(rules.get(ruleIndex).getTags().isEmpty());
-    assertEquals(1d, rules.get(ruleIndex).getSampleRate(), 1e-9);
-    assertEquals(Integer.MAX_VALUE, rules.get(ruleIndex++).getMaxPerSecond());
-
-    // Test rule with empty values
-    assertEquals("", rules.get(ruleIndex).getService());
-    assertEquals("", rules.get(ruleIndex).getName());
-    assertEquals("", rules.get(ruleIndex).getResource());
-    assertTrue(rules.get(ruleIndex).getTags().isEmpty());
-    assertEquals(1d, rules.get(ruleIndex).getSampleRate(), 1e-9);
-    assertEquals(Integer.MAX_VALUE, rules.get(ruleIndex++).getMaxPerSecond());
-
-    // Test rule with null values
-    assertEquals(MATCH_ALL, rules.get(ruleIndex).getService());
-    assertEquals(MATCH_ALL, rules.get(ruleIndex).getName());
-    assertEquals(MATCH_ALL, rules.get(ruleIndex).getResource());
-    assertTrue(rules.get(ruleIndex).getTags().isEmpty());
-    assertEquals(1d, rules.get(ruleIndex).getSampleRate(), 1e-9);
-    assertEquals(Integer.MAX_VALUE, rules.get(ruleIndex++).getMaxPerSecond());
-
-    // Test different sample rate values
-    assertEquals(0.25d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
-    assertEquals(0.5d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
-    assertEquals(0.75d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
-    assertEquals(1d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
-
-    // Test different max per second values
-    assertEquals(1, rules.get(ruleIndex++).getMaxPerSecond());
-    assertEquals(1, rules.get(ruleIndex++).getMaxPerSecond());
-    assertEquals(10, rules.get(ruleIndex++).getMaxPerSecond());
-    assertEquals(10, rules.get(ruleIndex++).getMaxPerSecond());
-    assertEquals(10000, rules.get(ruleIndex++).getMaxPerSecond());
-  }
-
-  @TableTest({
-    "scenario | rate      ",
-    "-0.1     | -0.1      ",
-    "-11      | -11       ",
-    "1.2      | 1.2       ",
-    "100      | 100       ",
-    "\"zero\" | '\"zero\"'",
-    "\"\"     | '\"\"'    "
-  })
-  void skipSpanSamplingRulesWithInvalidSampleRateValues(String rate) {
-    String json =
-        "[{\"service\": \"usersvc\", \"name\": \"healthcheck\", \"sample_rate\": " + rate + "}]";
-    SpanSamplingRules result = deserializeRules(json);
-
-    assertTrue(result.isEmpty());
-  }
-
-  @TableTest({
-    "scenario | limit     ",
-    "0        | 0         ",
-    "-11      | -11       ",
-    "\"zero\" | '\"zero\"'",
-    "\"\"     | '\"\"'    "
-  })
-  void skipSpanSamplingRulesWithInvalidMaxPerSecondValues(String limit) {
-    String json =
-        "[{\"service\": \"usersvc\", \"name\": \"healthcheck\", \"max_per_second\": "
-            + limit
-            + "}]";
-    SpanSamplingRules result = deserializeRules(json);
-
-    assertTrue(result.isEmpty());
-  }
-
-  @TableTest({
-    "scenario               | jsonRules                    ",
-    "truncated open bracket | '['                          ",
-    "trailing comma         | '{\"service\": \"usersvc\",}'",
-    "empty string           | ''                           "
-  })
-  void skipSpanSamplingRulesWhenIncorrectJsonProvided(String jsonRules) {
-    assertTrue(deserializeRules(jsonRules).isEmpty());
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void renderJsonRuleCorrectlyWhenToStringIsCalled() throws Exception {
-    String json =
-        "{\"max_per_second\":\"10\",\"name\":\"name\",\"resource\":\"resource\",\"sample_rate\":\"0.5\",\"service\":\"service\",\"tags\":{\"a\":\"b\",\"foo\":\"bar\"}}";
-    Class<?> jsonRuleClass =
-        Class.forName("datadog.trace.common.sampling.SpanSamplingRules$JsonRule");
-    Moshi moshi = new Moshi.Builder().build();
-    JsonAdapter<Object> adapter = (JsonAdapter<Object>) moshi.adapter(jsonRuleClass);
-    Object jsonRule = adapter.fromJson(json);
-
-    assertEquals(json, jsonRule.toString());
-  }
-
-  @Test
-  void keepOnlyValidRulesWhenInvalidRulesArePresent() {
-    SpanSamplingRules rules =
-        SpanSamplingRules.deserialize(
-            "[\n"
+        List<SpanSamplingRules.Rule> rules = result.getRules();
+        int ruleIndex = 0;
+
+        assertEquals(13, rules.size());
+
+        // Test a complete rule
+        Map<String, String> expectedTags = new LinkedHashMap<>();
+        expectedTags.put("tag-name1", "tag-pattern1");
+        expectedTags.put("tag-name2", "tag-pattern2");
+        assertEquals("service-name", rules.get(ruleIndex).getService());
+        assertEquals("operation-name", rules.get(ruleIndex).getName());
+        assertEquals("resource-name", rules.get(ruleIndex).getResource());
+        assertEquals(expectedTags, rules.get(ruleIndex).getTags());
+        assertEquals(0.0d, rules.get(ruleIndex).getSampleRate(), 1e-9);
+        assertEquals(10, rules.get(ruleIndex++).getMaxPerSecond());
+
+        // Test default values with an empty rule
+        assertEquals(MATCH_ALL, rules.get(ruleIndex).getService());
+        assertEquals(MATCH_ALL, rules.get(ruleIndex).getName());
+        assertEquals(MATCH_ALL, rules.get(ruleIndex).getResource());
+        assertTrue(rules.get(ruleIndex).getTags().isEmpty());
+        assertEquals(1d, rules.get(ruleIndex).getSampleRate(), 1e-9);
+        assertEquals(Integer.MAX_VALUE, rules.get(ruleIndex++).getMaxPerSecond());
+
+        // Test rule with empty values
+        assertEquals("", rules.get(ruleIndex).getService());
+        assertEquals("", rules.get(ruleIndex).getName());
+        assertEquals("", rules.get(ruleIndex).getResource());
+        assertTrue(rules.get(ruleIndex).getTags().isEmpty());
+        assertEquals(1d, rules.get(ruleIndex).getSampleRate(), 1e-9);
+        assertEquals(Integer.MAX_VALUE, rules.get(ruleIndex++).getMaxPerSecond());
+
+        // Test rule with null values
+        assertEquals(MATCH_ALL, rules.get(ruleIndex).getService());
+        assertEquals(MATCH_ALL, rules.get(ruleIndex).getName());
+        assertEquals(MATCH_ALL, rules.get(ruleIndex).getResource());
+        assertTrue(rules.get(ruleIndex).getTags().isEmpty());
+        assertEquals(1d, rules.get(ruleIndex).getSampleRate(), 1e-9);
+        assertEquals(Integer.MAX_VALUE, rules.get(ruleIndex++).getMaxPerSecond());
+
+        // Test different sample rate values
+        assertEquals(0.25d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
+        assertEquals(0.5d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
+        assertEquals(0.75d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
+        assertEquals(1d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
+
+        // Test different max per second values
+        assertEquals(1, rules.get(ruleIndex++).getMaxPerSecond());
+        assertEquals(1, rules.get(ruleIndex++).getMaxPerSecond());
+        assertEquals(10, rules.get(ruleIndex++).getMaxPerSecond());
+        assertEquals(10, rules.get(ruleIndex++).getMaxPerSecond());
+        assertEquals(10000, rules.get(ruleIndex++).getMaxPerSecond());
+    }
+
+    @TableTest({
+      "scenario | rate      ",
+      "-0.1     | -0.1      ",
+      "-11      | -11       ",
+      "1.2      | 1.2       ",
+      "100      | 100       ",
+      "\"zero\" | '\"zero\"'",
+      "\"\"     | '\"\"'    "
+    })
+    void skipSpanSamplingRulesWithInvalidSampleRateValues(String rate) {
+        String json = "[{\"service\": \"usersvc\", \"name\": \"healthcheck\", \"sample_rate\": " + rate + "}]";
+        SpanSamplingRules result = deserializeRules(json);
+
+        assertTrue(result.isEmpty());
+    }
+
+    @TableTest({
+      "scenario | limit     ",
+      "0        | 0         ",
+      "-11      | -11       ",
+      "\"zero\" | '\"zero\"'",
+      "\"\"     | '\"\"'    "
+    })
+    void skipSpanSamplingRulesWithInvalidMaxPerSecondValues(String limit) {
+        String json = "[{\"service\": \"usersvc\", \"name\": \"healthcheck\", \"max_per_second\": " + limit + "}]";
+        SpanSamplingRules result = deserializeRules(json);
+
+        assertTrue(result.isEmpty());
+    }
+
+    @TableTest({
+      "scenario               | jsonRules                    ",
+      "truncated open bracket | '['                          ",
+      "trailing comma         | '{\"service\": \"usersvc\",}'",
+      "empty string           | ''                           "
+    })
+    void skipSpanSamplingRulesWhenIncorrectJsonProvided(String jsonRules) {
+        assertTrue(deserializeRules(jsonRules).isEmpty());
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void renderJsonRuleCorrectlyWhenToStringIsCalled() throws Exception {
+        String json =
+                "{\"max_per_second\":\"10\",\"name\":\"name\",\"resource\":\"resource\",\"sample_rate\":\"0.5\",\"service\":\"service\",\"tags\":{\"a\":\"b\",\"foo\":\"bar\"}}";
+        Class<?> jsonRuleClass = Class.forName("datadog.trace.common.sampling.SpanSamplingRules$JsonRule");
+        Moshi moshi = new Moshi.Builder().build();
+        JsonAdapter<Object> adapter = (JsonAdapter<Object>) moshi.adapter(jsonRuleClass);
+        Object jsonRule = adapter.fromJson(json);
+
+        assertEquals(json, jsonRule.toString());
+    }
+
+    @Test
+    void keepOnlyValidRulesWhenInvalidRulesArePresent() {
+        SpanSamplingRules rules = SpanSamplingRules.deserialize("[\n"
                 + "  {\"service\": \"usersvc\", \"name\": \"healthcheck\", \"sample_rate\": 0.5},\n"
                 + "  {\"service\": \"usersvc\", \"name\": \"healthcheck2\", \"sample_rate\": 200}\n"
                 + "]");
 
-    assertEquals(1, rules.getRules().size());
-  }
+        assertEquals(1, rules.getRules().size());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/TraceSamplingRulesTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/TraceSamplingRulesTest.java
index f580b717bcf..c2525eb3995 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/TraceSamplingRulesTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/TraceSamplingRulesTest.java
@@ -14,124 +14,118 @@
 
 class TraceSamplingRulesTest {
 
-  @Test
-  void deserializeEmptyListOfTraceSamplingRulesFromJson() {
-    assertTrue(TraceSamplingRules.deserialize("[]").isEmpty());
-  }
-
-  @Test
-  void deserializeTraceSamplingRulesFromJson() {
-    List<TraceSamplingRules.Rule> rules =
-        TraceSamplingRules.deserialize(
-                "[\n"
-                    + "  {\"service\": \"service-name\", \"name\": \"operation-name\", \"resource\": \"resource-name\", \"tags\":\n"
-                    + "    {\"tag-name1\": \"tag-pattern1\",\n"
-                    + "     \"tag-name2\": \"tag-pattern2\"},\n"
-                    + "    \"sample_rate\": 0.0},\n"
-                    + "  {},\n"
-                    + "  {\"service\": \"\", \"name\": \"\", \"resource\": \"\", \"tags\": {}},\n"
-                    + "  {\"service\": null, \"name\": null, \"resource\": null, \"tags\": null, \"sample_rate\": null},\n"
-                    + "\n"
-                    + "  {\"sample_rate\": 0.25},\n"
-                    + "  {\"sample_rate\": 0.5},\n"
-                    + "  {\"sample_rate\": 0.75},\n"
-                    + "  {\"sample_rate\": 1}\n"
-                    + "]")
-            .getRules();
-    int ruleIndex = 0;
-
-    assertEquals(8, rules.size());
-
-    // Test a complete rule
-    Map<String, String> expectedTags = new LinkedHashMap<>();
-    expectedTags.put("tag-name1", "tag-pattern1");
-    expectedTags.put("tag-name2", "tag-pattern2");
-    assertEquals("service-name", rules.get(ruleIndex).getService());
-    assertEquals("operation-name", rules.get(ruleIndex).getName());
-    assertEquals("resource-name", rules.get(ruleIndex).getResource());
-    assertEquals(expectedTags, rules.get(ruleIndex).getTags());
-    assertEquals(0d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
-
-    // Test default values with an empty rule
-    assertEquals(MATCH_ALL, rules.get(ruleIndex).getService());
-    assertEquals(MATCH_ALL, rules.get(ruleIndex).getName());
-    assertEquals(MATCH_ALL, rules.get(ruleIndex).getResource());
-    assertTrue(rules.get(ruleIndex).getTags().isEmpty());
-    assertEquals(1d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
-
-    // Test rule with empty values
-    assertEquals("", rules.get(ruleIndex).getService());
-    assertEquals("", rules.get(ruleIndex).getName());
-    assertEquals("", rules.get(ruleIndex).getResource());
-    assertTrue(rules.get(ruleIndex).getTags().isEmpty());
-    assertEquals(1d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
-
-    // Test rule with null values
-    assertEquals(MATCH_ALL, rules.get(ruleIndex).getService());
-    assertEquals(MATCH_ALL, rules.get(ruleIndex).getName());
-    assertEquals(MATCH_ALL, rules.get(ruleIndex).getResource());
-    assertTrue(rules.get(ruleIndex).getTags().isEmpty());
-    assertEquals(1d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
-
-    // Test different sample rate values
-    assertEquals(0.25d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
-    assertEquals(0.5d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
-    assertEquals(0.75d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
-    assertEquals(1d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
-  }
-
-  @TableTest({
-    "scenario | rate      ",
-    "-0.1     | -0.1      ",
-    "-11      | -11       ",
-    "1.2      | 1.2       ",
-    "100      | 100       ",
-    "\"zero\" | '\"zero\"'",
-    "\"\"     | '\"\"'    ",
-    "{}       | '{}'      ",
-    "[]       | '[]'      "
-  })
-  void skipTraceSamplingRulesWithInvalidSampleRateValues(String rate) {
-    String json =
-        "[{\"service\": \"usersvc\", \"name\": \"healthcheck\", \"sample_rate\": " + rate + "}]";
-    TraceSamplingRules result = TraceSamplingRules.deserialize(json);
-
-    assertTrue(result.isEmpty());
-  }
-
-  @TableTest({
-    "scenario               | jsonRules                    ",
-    "truncated open bracket | '['                          ",
-    "trailing comma         | '{\"service\": \"usersvc\",}'",
-    "empty string           | ''                           "
-  })
-  void skipTraceSamplingRulesWhenIncorrectJsonProvided(String jsonRules) {
-    assertTrue(TraceSamplingRules.deserialize(jsonRules).isEmpty());
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void renderJsonRuleCorrectlyWhenToStringIsCalled() throws Exception {
-    String json =
-        "{\"name\":\"name\",\"resource\":\"resource\",\"sample_rate\":\"0.5\",\"service\":\"service\",\"tags\":{\"a\":\"b\",\"foo\":\"bar\"}}";
-    Class<?> jsonRuleClass =
-        Class.forName("datadog.trace.common.sampling.TraceSamplingRules$JsonRule");
-    Moshi moshi = new Moshi.Builder().build();
-    JsonAdapter<Object> adapter = (JsonAdapter<Object>) moshi.adapter(jsonRuleClass);
-    Object jsonRule = adapter.fromJson(json);
-
-    assertEquals(json, jsonRule.toString());
-  }
-
-  @Test
-  void keepOnlyValidRulesWhenInvalidRulesArePresent() {
-    TraceSamplingRules rules =
-        TraceSamplingRules.deserialize(
-            "[\n"
+    @Test
+    void deserializeEmptyListOfTraceSamplingRulesFromJson() {
+        assertTrue(TraceSamplingRules.deserialize("[]").isEmpty());
+    }
+
+    @Test
+    void deserializeTraceSamplingRulesFromJson() {
+        List<TraceSamplingRules.Rule> rules = TraceSamplingRules.deserialize("[\n"
+                        + "  {\"service\": \"service-name\", \"name\": \"operation-name\", \"resource\": \"resource-name\", \"tags\":\n"
+                        + "    {\"tag-name1\": \"tag-pattern1\",\n"
+                        + "     \"tag-name2\": \"tag-pattern2\"},\n"
+                        + "    \"sample_rate\": 0.0},\n"
+                        + "  {},\n"
+                        + "  {\"service\": \"\", \"name\": \"\", \"resource\": \"\", \"tags\": {}},\n"
+                        + "  {\"service\": null, \"name\": null, \"resource\": null, \"tags\": null, \"sample_rate\": null},\n"
+                        + "\n"
+                        + "  {\"sample_rate\": 0.25},\n"
+                        + "  {\"sample_rate\": 0.5},\n"
+                        + "  {\"sample_rate\": 0.75},\n"
+                        + "  {\"sample_rate\": 1}\n"
+                        + "]")
+                .getRules();
+        int ruleIndex = 0;
+
+        assertEquals(8, rules.size());
+
+        // Test a complete rule
+        Map<String, String> expectedTags = new LinkedHashMap<>();
+        expectedTags.put("tag-name1", "tag-pattern1");
+        expectedTags.put("tag-name2", "tag-pattern2");
+        assertEquals("service-name", rules.get(ruleIndex).getService());
+        assertEquals("operation-name", rules.get(ruleIndex).getName());
+        assertEquals("resource-name", rules.get(ruleIndex).getResource());
+        assertEquals(expectedTags, rules.get(ruleIndex).getTags());
+        assertEquals(0d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
+
+        // Test default values with an empty rule
+        assertEquals(MATCH_ALL, rules.get(ruleIndex).getService());
+        assertEquals(MATCH_ALL, rules.get(ruleIndex).getName());
+        assertEquals(MATCH_ALL, rules.get(ruleIndex).getResource());
+        assertTrue(rules.get(ruleIndex).getTags().isEmpty());
+        assertEquals(1d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
+
+        // Test rule with empty values
+        assertEquals("", rules.get(ruleIndex).getService());
+        assertEquals("", rules.get(ruleIndex).getName());
+        assertEquals("", rules.get(ruleIndex).getResource());
+        assertTrue(rules.get(ruleIndex).getTags().isEmpty());
+        assertEquals(1d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
+
+        // Test rule with null values
+        assertEquals(MATCH_ALL, rules.get(ruleIndex).getService());
+        assertEquals(MATCH_ALL, rules.get(ruleIndex).getName());
+        assertEquals(MATCH_ALL, rules.get(ruleIndex).getResource());
+        assertTrue(rules.get(ruleIndex).getTags().isEmpty());
+        assertEquals(1d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
+
+        // Test different sample rate values
+        assertEquals(0.25d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
+        assertEquals(0.5d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
+        assertEquals(0.75d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
+        assertEquals(1d, rules.get(ruleIndex++).getSampleRate(), 1e-9);
+    }
+
+    @TableTest({
+      "scenario | rate      ",
+      "-0.1     | -0.1      ",
+      "-11      | -11       ",
+      "1.2      | 1.2       ",
+      "100      | 100       ",
+      "\"zero\" | '\"zero\"'",
+      "\"\"     | '\"\"'    ",
+      "{}       | '{}'      ",
+      "[]       | '[]'      "
+    })
+    void skipTraceSamplingRulesWithInvalidSampleRateValues(String rate) {
+        String json = "[{\"service\": \"usersvc\", \"name\": \"healthcheck\", \"sample_rate\": " + rate + "}]";
+        TraceSamplingRules result = TraceSamplingRules.deserialize(json);
+
+        assertTrue(result.isEmpty());
+    }
+
+    @TableTest({
+      "scenario               | jsonRules                    ",
+      "truncated open bracket | '['                          ",
+      "trailing comma         | '{\"service\": \"usersvc\",}'",
+      "empty string           | ''                           "
+    })
+    void skipTraceSamplingRulesWhenIncorrectJsonProvided(String jsonRules) {
+        assertTrue(TraceSamplingRules.deserialize(jsonRules).isEmpty());
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void renderJsonRuleCorrectlyWhenToStringIsCalled() throws Exception {
+        String json =
+                "{\"name\":\"name\",\"resource\":\"resource\",\"sample_rate\":\"0.5\",\"service\":\"service\",\"tags\":{\"a\":\"b\",\"foo\":\"bar\"}}";
+        Class<?> jsonRuleClass = Class.forName("datadog.trace.common.sampling.TraceSamplingRules$JsonRule");
+        Moshi moshi = new Moshi.Builder().build();
+        JsonAdapter<Object> adapter = (JsonAdapter<Object>) moshi.adapter(jsonRuleClass);
+        Object jsonRule = adapter.fromJson(json);
+
+        assertEquals(json, jsonRule.toString());
+    }
+
+    @Test
+    void keepOnlyValidRulesWhenInvalidRulesArePresent() {
+        TraceSamplingRules rules = TraceSamplingRules.deserialize("[\n"
                 + "  {\"service\": \"usersvc\", \"name\": \"healthcheck\", \"sample_rate\": 0.5},\n"
                 + "  {\"service\": \"usersvc\", \"name\": \"healthcheck\", \"sample_rate\": 200}\n"
                 + "]");
 
-    assertEquals(1, rules.getRules().size());
-  }
+        assertEquals(1, rules.getRules().size());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/CompositePayloadDispatcherTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/CompositePayloadDispatcherTest.java
index 17eb060e81d..4df9092b3f1 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/CompositePayloadDispatcherTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/CompositePayloadDispatcherTest.java
@@ -19,59 +19,58 @@
 @ExtendWith(MockitoExtension.class)
 class CompositePayloadDispatcherTest {
 
-  @Mock PayloadDispatcher dispatcherA;
-  @Mock PayloadDispatcher dispatcherB;
-
-  @Test
-  void testOnDroppedTrace() {
-    CompositePayloadDispatcher dispatcher =
-        new CompositePayloadDispatcher(dispatcherA, dispatcherB);
-    int droppedSpansCount = 1234;
-
-    dispatcher.onDroppedTrace(droppedSpansCount);
-
-    verify(dispatcherA).onDroppedTrace(droppedSpansCount);
-    verify(dispatcherB).onDroppedTrace(droppedSpansCount);
-    verifyNoMoreInteractions(dispatcherA, dispatcherB);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void testAddTrace() {
-    CompositePayloadDispatcher dispatcher =
-        new CompositePayloadDispatcher(dispatcherA, dispatcherB);
-    List<CoreSpan<?>> trace = Collections.singletonList(mock(CoreSpan.class));
-
-    dispatcher.addTrace(trace);
-
-    verify(dispatcherA).addTrace(trace);
-    verify(dispatcherB).addTrace(trace);
-    verifyNoMoreInteractions(dispatcherA, dispatcherB);
-  }
-
-  @Test
-  void testFlush() {
-    CompositePayloadDispatcher dispatcher =
-        new CompositePayloadDispatcher(dispatcherA, dispatcherB);
-
-    dispatcher.flush();
-
-    verify(dispatcherA).flush();
-    verify(dispatcherB).flush();
-    verifyNoMoreInteractions(dispatcherA, dispatcherB);
-  }
-
-  @Test
-  void testGetApis() {
-    CompositePayloadDispatcher dispatcher =
-        new CompositePayloadDispatcher(dispatcherA, dispatcherB);
-    RemoteApi apiA = mock(RemoteApi.class);
-    RemoteApi apiB = mock(RemoteApi.class);
-    when(dispatcherA.getApis()).thenReturn(Collections.singletonList(apiA));
-    when(dispatcherB.getApis()).thenReturn(Collections.singletonList(apiB));
-
-    Collection<RemoteApi> apis = dispatcher.getApis();
-
-    assertEquals(Arrays.asList(apiA, apiB), apis);
-  }
+    @Mock
+    PayloadDispatcher dispatcherA;
+
+    @Mock
+    PayloadDispatcher dispatcherB;
+
+    @Test
+    void testOnDroppedTrace() {
+        CompositePayloadDispatcher dispatcher = new CompositePayloadDispatcher(dispatcherA, dispatcherB);
+        int droppedSpansCount = 1234;
+
+        dispatcher.onDroppedTrace(droppedSpansCount);
+
+        verify(dispatcherA).onDroppedTrace(droppedSpansCount);
+        verify(dispatcherB).onDroppedTrace(droppedSpansCount);
+        verifyNoMoreInteractions(dispatcherA, dispatcherB);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void testAddTrace() {
+        CompositePayloadDispatcher dispatcher = new CompositePayloadDispatcher(dispatcherA, dispatcherB);
+        List<CoreSpan<?>> trace = Collections.singletonList(mock(CoreSpan.class));
+
+        dispatcher.addTrace(trace);
+
+        verify(dispatcherA).addTrace(trace);
+        verify(dispatcherB).addTrace(trace);
+        verifyNoMoreInteractions(dispatcherA, dispatcherB);
+    }
+
+    @Test
+    void testFlush() {
+        CompositePayloadDispatcher dispatcher = new CompositePayloadDispatcher(dispatcherA, dispatcherB);
+
+        dispatcher.flush();
+
+        verify(dispatcherA).flush();
+        verify(dispatcherB).flush();
+        verifyNoMoreInteractions(dispatcherA, dispatcherB);
+    }
+
+    @Test
+    void testGetApis() {
+        CompositePayloadDispatcher dispatcher = new CompositePayloadDispatcher(dispatcherA, dispatcherB);
+        RemoteApi apiA = mock(RemoteApi.class);
+        RemoteApi apiB = mock(RemoteApi.class);
+        when(dispatcherA.getApis()).thenReturn(Collections.singletonList(apiA));
+        when(dispatcherB.getApis()).thenReturn(Collections.singletonList(apiB));
+
+        Collection<RemoteApi> apis = dispatcher.getApis();
+
+        assertEquals(Arrays.asList(apiA, apiB), apis);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentApiTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentApiTest.java
index 66b50ff1dde..7a2afb387b3 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentApiTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentApiTest.java
@@ -70,727 +70,668 @@
 @TypeConverterSources(TableTestTypeConverters.class)
 public class DDAgentApiTest extends DDCoreJavaSpecification {
 
-  static final Monitoring monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
-  static final ObjectMapper mapper = new ObjectMapper(new MessagePackFactory());
-
-  // --- Helper: create a minimal agent server responding 200 to PUT latestVersion ---
-
-  static JavaTestHttpServer newAgent(String latestVersion) {
-    return JavaTestHttpServer.httpServer(
-        s ->
-            s.handlers(
-                h ->
-                    h.put(
-                        latestVersion,
-                        api -> {
-                          if (!"application/msgpack".equals(api.getRequest().getContentType())) {
-                            api.getResponse()
-                                .status(400)
-                                .send("wrong type: " + api.getRequest().getContentType());
-                          } else if (api.getRequest().getContentLength() <= 0) {
-                            api.getResponse().status(400).send("no content");
-                          } else {
-                            api.getResponse().status(200).send();
-                          }
-                        })));
-  }
-
-  // --- Tests ---
-
-  @TableTest({
-    "scenario    | agentVersion  | protocolVersion",
-    "v0.3 traces | 'v0.3/traces' | V0_4           ",
-    "v0.4 traces | 'v0.4/traces' | V0_4           ",
-    "v0.5 traces | 'v0.5/traces' | V0_5           ",
-    "v1.0 traces | 'v1.0/traces' | V1_0           "
-  })
-  void testSendingAnEmptyListOfTracesReturnsNoErrors(
-      String agentVersion, ProtocolVersion protocolVersion) {
-    JavaTestHttpServer agent = newAgent(agentVersion);
-    try {
-      DDAgentApi client = createAgentApi(agent.getAddress().toString(), protocolVersion).api;
-      Payload payload = prepareTraces(agentVersion, emptyList());
-      Response response = client.sendSerializedTraces(payload);
-      assertTrue(response.success());
-      assertTrue(response.status().isPresent());
-      assertEquals(200, response.status().getAsInt());
-      assertEquals("/" + agentVersion, agent.getLastRequest().getPath());
-    } finally {
-      agent.close();
+    static final Monitoring monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
+    static final ObjectMapper mapper = new ObjectMapper(new MessagePackFactory());
+
+    // --- Helper: create a minimal agent server responding 200 to PUT latestVersion ---
+
+    static JavaTestHttpServer newAgent(String latestVersion) {
+        return JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.put(latestVersion, api -> {
+            if (!"application/msgpack".equals(api.getRequest().getContentType())) {
+                api.getResponse()
+                        .status(400)
+                        .send("wrong type: " + api.getRequest().getContentType());
+            } else if (api.getRequest().getContentLength() <= 0) {
+                api.getResponse().status(400).send("no content");
+            } else {
+                api.getResponse().status(200).send();
+            }
+        })));
     }
-  }
-
-  @Test
-  void testResponseBodyPropagatedInCaseOfNon200Response() {
-    JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.put(
-                            "v0.4/traces",
-                            api -> api.getResponse().status(400).send("Test error"))));
-    try {
-      DDAgentApi client = createAgentApi(agent.getAddress().toString()).api;
-      Payload payload = prepareTraces("v0.4/traces", emptyList());
-      Response clientResponse = client.sendSerializedTraces(payload);
-      assertFalse(clientResponse.success());
-      assertTrue(clientResponse.status().isPresent());
-      assertEquals(400, clientResponse.status().getAsInt());
-      assertEquals("Test error", clientResponse.response());
-    } finally {
-      agent.close();
+
+    // --- Tests ---
+
+    @TableTest({
+      "scenario    | agentVersion  | protocolVersion",
+      "v0.3 traces | 'v0.3/traces' | V0_4           ",
+      "v0.4 traces | 'v0.4/traces' | V0_4           ",
+      "v0.5 traces | 'v0.5/traces' | V0_5           ",
+      "v1.0 traces | 'v1.0/traces' | V1_0           "
+    })
+    void testSendingAnEmptyListOfTracesReturnsNoErrors(String agentVersion, ProtocolVersion protocolVersion) {
+        JavaTestHttpServer agent = newAgent(agentVersion);
+        try {
+            DDAgentApi client = createAgentApi(agent.getAddress().toString(), protocolVersion).api;
+            Payload payload = prepareTraces(agentVersion, emptyList());
+            Response response = client.sendSerializedTraces(payload);
+            assertTrue(response.success());
+            assertTrue(response.status().isPresent());
+            assertEquals(200, response.status().getAsInt());
+            assertEquals("/" + agentVersion, agent.getLastRequest().getPath());
+        } finally {
+            agent.close();
+        }
     }
-  }
-
-  @Test
-  void testNon200Response() {
-    JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h -> {
-                      h.put("v0.4/traces", api -> api.getResponse().status(404).send());
-                      h.put("v0.3/traces", api -> api.getResponse().status(404).send());
-                    }));
-    try {
-      DDAgentApi client = createAgentApi(agent.getAddress().toString()).api;
-      Payload payload = prepareTraces("v0.3/traces", emptyList());
-      Response clientResponse = client.sendSerializedTraces(payload);
-      assertFalse(clientResponse.success());
-      assertTrue(clientResponse.status().isPresent());
-      assertEquals(404, clientResponse.status().getAsInt());
-      assertEquals("/v0.3/traces", agent.getLastRequest().getPath());
-    } finally {
-      agent.close();
+
+    @Test
+    void testResponseBodyPropagatedInCaseOfNon200Response() {
+        JavaTestHttpServer agent = JavaTestHttpServer.httpServer(s -> s.handlers(
+                h -> h.put("v0.4/traces", api -> api.getResponse().status(400).send("Test error"))));
+        try {
+            DDAgentApi client = createAgentApi(agent.getAddress().toString()).api;
+            Payload payload = prepareTraces("v0.4/traces", emptyList());
+            Response clientResponse = client.sendSerializedTraces(payload);
+            assertFalse(clientResponse.success());
+            assertTrue(clientResponse.status().isPresent());
+            assertEquals(400, clientResponse.status().getAsInt());
+            assertEquals("Test error", clientResponse.response());
+        } finally {
+            agent.close();
+        }
     }
-  }
-
-  @Test
-  void testContentIsSentAsMsgpackEmptyTraces() throws IOException {
-    String agentVersion = "v0.3/traces";
-    List<List<DDSpan>> traces = emptyList();
-    JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            s -> s.handlers(h -> h.put(agentVersion, api -> api.getResponse().send())));
-    try {
-      DDAgentApi client = createAgentApi(agent.getAddress().toString()).api;
-      Payload payload = prepareTraces(agentVersion, traces);
-      assertTrue(client.sendSerializedTraces(payload).success());
-      assertEquals("application/msgpack", agent.getLastRequest().getContentType());
-      assertEquals(
-          "true", agent.getLastRequest().getHeaders().get("Datadog-Client-Computed-Top-Level"));
-      assertEquals("java", agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang"));
-      assertEquals(
-          System.getProperty("java.version", "unknown"),
-          agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang-Version"));
-      assertEquals(
-          "Stubbed-Test-Version",
-          agent.getLastRequest().getHeaders().get("Datadog-Meta-Tracer-Version"));
-      assertEquals(
-          String.valueOf(traces.size()),
-          agent.getLastRequest().getHeaders().get("X-Datadog-Trace-Count"));
-      assertEquals(
-          String.valueOf(payload.droppedTraces()),
-          agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Traces"));
-      assertEquals(
-          String.valueOf(payload.droppedSpans()),
-          agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Spans"));
-      assertEquals(emptyList(), convertList(agentVersion, agent.getLastRequest().getBody()));
-    } finally {
-      agent.close();
+
+    @Test
+    void testNon200Response() {
+        JavaTestHttpServer agent = JavaTestHttpServer.httpServer(s -> s.handlers(h -> {
+            h.put("v0.4/traces", api -> api.getResponse().status(404).send());
+            h.put("v0.3/traces", api -> api.getResponse().status(404).send());
+        }));
+        try {
+            DDAgentApi client = createAgentApi(agent.getAddress().toString()).api;
+            Payload payload = prepareTraces("v0.3/traces", emptyList());
+            Response clientResponse = client.sendSerializedTraces(payload);
+            assertFalse(clientResponse.success());
+            assertTrue(clientResponse.status().isPresent());
+            assertEquals(404, clientResponse.status().getAsInt());
+            assertEquals("/v0.3/traces", agent.getLastRequest().getPath());
+        } finally {
+            agent.close();
+        }
     }
-  }
-
-  @Test
-  void testContentIsSentAsMsgpackServiceSpan() throws IOException {
-    String agentVersion = "v0.4/traces";
-    DDSpan span =
-        buildSpan(
-            1L,
-            "service.name",
-            "my-service",
-            PropagationTags.factory()
-                .fromHeaderValue(PropagationTags.HeaderType.DATADOG, "_dd.p.usr=123"));
-    span.finish();
-    setDurationNano(span, 10L);
-    List<List<DDSpan>> traces = singletonList(singletonList(span));
-
-    JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            s -> s.handlers(h -> h.put(agentVersion, api -> api.getResponse().send())));
-    try {
-      DDAgentApi client = createAgentApi(agent.getAddress().toString()).api;
-      Payload payload = prepareTraces(agentVersion, traces);
-      assertTrue(client.sendSerializedTraces(payload).success());
-      assertEquals("application/msgpack", agent.getLastRequest().getContentType());
-      assertEquals(
-          "true", agent.getLastRequest().getHeaders().get("Datadog-Client-Computed-Top-Level"));
-      assertEquals("java", agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang"));
-      assertEquals(
-          System.getProperty("java.version", "unknown"),
-          agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang-Version"));
-      assertEquals(
-          "Stubbed-Test-Version",
-          agent.getLastRequest().getHeaders().get("Datadog-Meta-Tracer-Version"));
-      assertEquals(
-          String.valueOf(traces.size()),
-          agent.getLastRequest().getHeaders().get("X-Datadog-Trace-Count"));
-      assertEquals(
-          String.valueOf(payload.droppedTraces()),
-          agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Traces"));
-      assertEquals(
-          String.valueOf(payload.droppedSpans()),
-          agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Spans"));
-
-      Map<String, Object> meta = new TreeMap<>();
-      meta.put("thread.name", Thread.currentThread().getName());
-      meta.put("_dd.p.usr", "123");
-      meta.put("_dd.p.dm", "-1");
-      meta.put("_dd.p.ksr", "1");
-      meta.put("_dd.svc_src", "m");
-      if (Config.get().isExperimentalPropagateProcessTagsEnabled()
-          && ProcessTags.getTagsForSerialization() != null) {
-        meta.put("_dd.tags.process", ProcessTags.getTagsForSerialization().toString());
-      }
-      // payload-scoped marker, written on the first span of the first non-empty chunk
-      meta.put(SDK_OTLP_EXPORT, "false");
-      Map<String, Object> metrics = new TreeMap<>();
-      metrics.put(DDSpanContext.PRIORITY_SAMPLING_KEY, 1);
-      metrics.put(InstrumentationTags.DD_TOP_LEVEL.toString(), 1);
-      metrics.put(RateByServiceTraceSampler.SAMPLING_AGENT_RATE, 1.0);
-      metrics.put("thread.id", Thread.currentThread().getId());
-      Map<String, Object> spanMap = new TreeMap<>();
-      spanMap.put("duration", 10);
-      spanMap.put("error", 0);
-      spanMap.put("meta", meta);
-      spanMap.put("metrics", metrics);
-      spanMap.put("name", "fakeOperation");
-      spanMap.put("parent_id", 0);
-      spanMap.put("resource", "fakeResource");
-      spanMap.put("service", "my-service");
-      spanMap.put("span_id", 1);
-      spanMap.put("start", 1000);
-      spanMap.put("trace_id", 1);
-      spanMap.put("type", "fakeType");
-      List<List<Map<String, Object>>> expectedRequestBody = singletonList(singletonList(spanMap));
-      assertDeepEquals(
-          expectedRequestBody, convertList(agentVersion, agent.getLastRequest().getBody()));
-    } finally {
-      agent.close();
+
+    @Test
+    void testContentIsSentAsMsgpackEmptyTraces() throws IOException {
+        String agentVersion = "v0.3/traces";
+        List<List<DDSpan>> traces = emptyList();
+        JavaTestHttpServer agent = JavaTestHttpServer.httpServer(s ->
+                s.handlers(h -> h.put(agentVersion, api -> api.getResponse().send())));
+        try {
+            DDAgentApi client = createAgentApi(agent.getAddress().toString()).api;
+            Payload payload = prepareTraces(agentVersion, traces);
+            assertTrue(client.sendSerializedTraces(payload).success());
+            assertEquals("application/msgpack", agent.getLastRequest().getContentType());
+            assertEquals("true", agent.getLastRequest().getHeaders().get("Datadog-Client-Computed-Top-Level"));
+            assertEquals("java", agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang"));
+            assertEquals(
+                    System.getProperty("java.version", "unknown"),
+                    agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang-Version"));
+            assertEquals(
+                    "Stubbed-Test-Version", agent.getLastRequest().getHeaders().get("Datadog-Meta-Tracer-Version"));
+            assertEquals(
+                    String.valueOf(traces.size()),
+                    agent.getLastRequest().getHeaders().get("X-Datadog-Trace-Count"));
+            assertEquals(
+                    String.valueOf(payload.droppedTraces()),
+                    agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Traces"));
+            assertEquals(
+                    String.valueOf(payload.droppedSpans()),
+                    agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Spans"));
+            assertEquals(
+                    emptyList(),
+                    convertList(agentVersion, agent.getLastRequest().getBody()));
+        } finally {
+            agent.close();
+        }
     }
-  }
-
-  @Test
-  void testContentIsSentAsMsgpackResourceSpan() throws IOException {
-    String agentVersion = "v0.4/traces";
-    DDSpan span =
-        buildSpan(
-            100L,
-            "resource.name",
-            "my-resource",
-            PropagationTags.factory()
-                .fromHeaderValue(PropagationTags.HeaderType.DATADOG, "_dd.p.usr=123"));
-    span.finish();
-    setDurationNano(span, 10L);
-    List<List<DDSpan>> traces = singletonList(singletonList(span));
-
-    JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            s -> s.handlers(h -> h.put(agentVersion, api -> api.getResponse().send())));
-    try {
-      DDAgentApi client = createAgentApi(agent.getAddress().toString()).api;
-      Payload payload = prepareTraces(agentVersion, traces);
-      assertTrue(client.sendSerializedTraces(payload).success());
-      assertEquals("application/msgpack", agent.getLastRequest().getContentType());
-      assertEquals(
-          "true", agent.getLastRequest().getHeaders().get("Datadog-Client-Computed-Top-Level"));
-      assertEquals("java", agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang"));
-      assertEquals(
-          System.getProperty("java.version", "unknown"),
-          agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang-Version"));
-      assertEquals(
-          "Stubbed-Test-Version",
-          agent.getLastRequest().getHeaders().get("Datadog-Meta-Tracer-Version"));
-      assertEquals(
-          String.valueOf(traces.size()),
-          agent.getLastRequest().getHeaders().get("X-Datadog-Trace-Count"));
-      assertEquals(
-          String.valueOf(payload.droppedTraces()),
-          agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Traces"));
-      assertEquals(
-          String.valueOf(payload.droppedSpans()),
-          agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Spans"));
-
-      Map<String, Object> meta = new TreeMap<>();
-      meta.put("thread.name", Thread.currentThread().getName());
-      meta.put("_dd.p.usr", "123");
-      meta.put("_dd.p.dm", "-1");
-      meta.put("_dd.p.ksr", "1");
-      if (Config.get().isExperimentalPropagateProcessTagsEnabled()
-          && ProcessTags.getTagsForSerialization() != null) {
-        meta.put("_dd.tags.process", ProcessTags.getTagsForSerialization().toString());
-      }
-      // payload-scoped marker, written on the first span of the first non-empty chunk
-      meta.put(SDK_OTLP_EXPORT, "false");
-      Map<String, Object> metrics = new TreeMap<>();
-      metrics.put(DDSpanContext.PRIORITY_SAMPLING_KEY, 1);
-      metrics.put(InstrumentationTags.DD_TOP_LEVEL.toString(), 1);
-      metrics.put(RateByServiceTraceSampler.SAMPLING_AGENT_RATE, 1.0);
-      metrics.put("thread.id", Thread.currentThread().getId());
-      Map<String, Object> spanMap = new TreeMap<>();
-      spanMap.put("duration", 10);
-      spanMap.put("error", 0);
-      spanMap.put("meta", meta);
-      spanMap.put("metrics", metrics);
-      spanMap.put("name", "fakeOperation");
-      spanMap.put("parent_id", 0);
-      spanMap.put("resource", "my-resource");
-      spanMap.put("service", "fakeService");
-      spanMap.put("span_id", 1);
-      spanMap.put("start", 100000);
-      spanMap.put("trace_id", 1);
-      spanMap.put("type", "fakeType");
-      List<List<Map<String, Object>>> expectedRequestBody = singletonList(singletonList(spanMap));
-      assertDeepEquals(
-          expectedRequestBody, convertList(agentVersion, agent.getLastRequest().getBody()));
-    } finally {
-      agent.close();
+
+    @Test
+    void testContentIsSentAsMsgpackServiceSpan() throws IOException {
+        String agentVersion = "v0.4/traces";
+        DDSpan span = buildSpan(
+                1L,
+                "service.name",
+                "my-service",
+                PropagationTags.factory().fromHeaderValue(PropagationTags.HeaderType.DATADOG, "_dd.p.usr=123"));
+        span.finish();
+        setDurationNano(span, 10L);
+        List<List<DDSpan>> traces = singletonList(singletonList(span));
+
+        JavaTestHttpServer agent = JavaTestHttpServer.httpServer(s ->
+                s.handlers(h -> h.put(agentVersion, api -> api.getResponse().send())));
+        try {
+            DDAgentApi client = createAgentApi(agent.getAddress().toString()).api;
+            Payload payload = prepareTraces(agentVersion, traces);
+            assertTrue(client.sendSerializedTraces(payload).success());
+            assertEquals("application/msgpack", agent.getLastRequest().getContentType());
+            assertEquals("true", agent.getLastRequest().getHeaders().get("Datadog-Client-Computed-Top-Level"));
+            assertEquals("java", agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang"));
+            assertEquals(
+                    System.getProperty("java.version", "unknown"),
+                    agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang-Version"));
+            assertEquals(
+                    "Stubbed-Test-Version", agent.getLastRequest().getHeaders().get("Datadog-Meta-Tracer-Version"));
+            assertEquals(
+                    String.valueOf(traces.size()),
+                    agent.getLastRequest().getHeaders().get("X-Datadog-Trace-Count"));
+            assertEquals(
+                    String.valueOf(payload.droppedTraces()),
+                    agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Traces"));
+            assertEquals(
+                    String.valueOf(payload.droppedSpans()),
+                    agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Spans"));
+
+            Map<String, Object> meta = new TreeMap<>();
+            meta.put("thread.name", Thread.currentThread().getName());
+            meta.put("_dd.p.usr", "123");
+            meta.put("_dd.p.dm", "-1");
+            meta.put("_dd.p.ksr", "1");
+            meta.put("_dd.svc_src", "m");
+            if (Config.get().isExperimentalPropagateProcessTagsEnabled()
+                    && ProcessTags.getTagsForSerialization() != null) {
+                meta.put(
+                        "_dd.tags.process",
+                        ProcessTags.getTagsForSerialization().toString());
+            }
+            // payload-scoped marker, written on the first span of the first non-empty chunk
+            meta.put(SDK_OTLP_EXPORT, "false");
+            Map<String, Object> metrics = new TreeMap<>();
+            metrics.put(DDSpanContext.PRIORITY_SAMPLING_KEY, 1);
+            metrics.put(InstrumentationTags.DD_TOP_LEVEL.toString(), 1);
+            metrics.put(RateByServiceTraceSampler.SAMPLING_AGENT_RATE, 1.0);
+            metrics.put("thread.id", Thread.currentThread().getId());
+            Map<String, Object> spanMap = new TreeMap<>();
+            spanMap.put("duration", 10);
+            spanMap.put("error", 0);
+            spanMap.put("meta", meta);
+            spanMap.put("metrics", metrics);
+            spanMap.put("name", "fakeOperation");
+            spanMap.put("parent_id", 0);
+            spanMap.put("resource", "fakeResource");
+            spanMap.put("service", "my-service");
+            spanMap.put("span_id", 1);
+            spanMap.put("start", 1000);
+            spanMap.put("trace_id", 1);
+            spanMap.put("type", "fakeType");
+            List<List<Map<String, Object>>> expectedRequestBody = singletonList(singletonList(spanMap));
+            assertDeepEquals(
+                    expectedRequestBody,
+                    convertList(agentVersion, agent.getLastRequest().getBody()));
+        } finally {
+            agent.close();
+        }
     }
-  }
-
-  @TableTest({
-    "scenario    | agentVersion ",
-    "v0.3 traces | 'v0.3/traces'",
-    "v0.4 traces | 'v0.4/traces'",
-    "v0.5 traces | 'v0.5/traces'"
-  })
-  void testApiResponseListenersSee200Responses(String agentVersion) {
-    AtomicReference<Map<String, Map<String, Number>>> agentResponse = new AtomicReference<>(null);
-    RemoteResponseListener responseListener =
-        (endpoint, responseJson) -> agentResponse.set(responseJson);
-
-    JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.put(
-                            agentVersion,
-                            api -> {
-                              int status = api.getRequest().getContentLength() > 0 ? 200 : 500;
-                              api.getResponse().status(status).send("{\"hello\":{}}");
-                            })));
-    try {
-      DDAgentApi client = createAgentApi(agent.getAddress().toString()).api;
-      client.addResponseListener(responseListener);
-      List<List<DDSpan>> traces = Arrays.asList(emptyList(), emptyList(), emptyList());
-      Payload payload = prepareTraces(agentVersion, traces);
-      payload.withDroppedTraces(1);
-      payload.withDroppedTraces(3);
-
-      client.sendSerializedTraces(payload);
-
-      Map<String, Map<String, Number>> response = agentResponse.get();
-      assertEquals(singletonMap("hello", emptyMap()), response);
-      assertEquals("java", agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang"));
-      assertEquals(
-          System.getProperty("java.version", "unknown"),
-          agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang-Version"));
-      assertEquals(
-          "Stubbed-Test-Version",
-          agent.getLastRequest().getHeaders().get("Datadog-Meta-Tracer-Version"));
-      assertEquals("3", agent.getLastRequest().getHeaders().get("X-Datadog-Trace-Count"));
-      assertEquals(
-          String.valueOf(payload.droppedTraces()),
-          agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Traces"));
-      assertEquals(
-          String.valueOf(payload.droppedSpans()),
-          agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Spans"));
-    } finally {
-      agent.close();
+
+    @Test
+    void testContentIsSentAsMsgpackResourceSpan() throws IOException {
+        String agentVersion = "v0.4/traces";
+        DDSpan span = buildSpan(
+                100L,
+                "resource.name",
+                "my-resource",
+                PropagationTags.factory().fromHeaderValue(PropagationTags.HeaderType.DATADOG, "_dd.p.usr=123"));
+        span.finish();
+        setDurationNano(span, 10L);
+        List<List<DDSpan>> traces = singletonList(singletonList(span));
+
+        JavaTestHttpServer agent = JavaTestHttpServer.httpServer(s ->
+                s.handlers(h -> h.put(agentVersion, api -> api.getResponse().send())));
+        try {
+            DDAgentApi client = createAgentApi(agent.getAddress().toString()).api;
+            Payload payload = prepareTraces(agentVersion, traces);
+            assertTrue(client.sendSerializedTraces(payload).success());
+            assertEquals("application/msgpack", agent.getLastRequest().getContentType());
+            assertEquals("true", agent.getLastRequest().getHeaders().get("Datadog-Client-Computed-Top-Level"));
+            assertEquals("java", agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang"));
+            assertEquals(
+                    System.getProperty("java.version", "unknown"),
+                    agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang-Version"));
+            assertEquals(
+                    "Stubbed-Test-Version", agent.getLastRequest().getHeaders().get("Datadog-Meta-Tracer-Version"));
+            assertEquals(
+                    String.valueOf(traces.size()),
+                    agent.getLastRequest().getHeaders().get("X-Datadog-Trace-Count"));
+            assertEquals(
+                    String.valueOf(payload.droppedTraces()),
+                    agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Traces"));
+            assertEquals(
+                    String.valueOf(payload.droppedSpans()),
+                    agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Spans"));
+
+            Map<String, Object> meta = new TreeMap<>();
+            meta.put("thread.name", Thread.currentThread().getName());
+            meta.put("_dd.p.usr", "123");
+            meta.put("_dd.p.dm", "-1");
+            meta.put("_dd.p.ksr", "1");
+            if (Config.get().isExperimentalPropagateProcessTagsEnabled()
+                    && ProcessTags.getTagsForSerialization() != null) {
+                meta.put(
+                        "_dd.tags.process",
+                        ProcessTags.getTagsForSerialization().toString());
+            }
+            // payload-scoped marker, written on the first span of the first non-empty chunk
+            meta.put(SDK_OTLP_EXPORT, "false");
+            Map<String, Object> metrics = new TreeMap<>();
+            metrics.put(DDSpanContext.PRIORITY_SAMPLING_KEY, 1);
+            metrics.put(InstrumentationTags.DD_TOP_LEVEL.toString(), 1);
+            metrics.put(RateByServiceTraceSampler.SAMPLING_AGENT_RATE, 1.0);
+            metrics.put("thread.id", Thread.currentThread().getId());
+            Map<String, Object> spanMap = new TreeMap<>();
+            spanMap.put("duration", 10);
+            spanMap.put("error", 0);
+            spanMap.put("meta", meta);
+            spanMap.put("metrics", metrics);
+            spanMap.put("name", "fakeOperation");
+            spanMap.put("parent_id", 0);
+            spanMap.put("resource", "my-resource");
+            spanMap.put("service", "fakeService");
+            spanMap.put("span_id", 1);
+            spanMap.put("start", 100000);
+            spanMap.put("trace_id", 1);
+            spanMap.put("type", "fakeType");
+            List<List<Map<String, Object>>> expectedRequestBody = singletonList(singletonList(spanMap));
+            assertDeepEquals(
+                    expectedRequestBody,
+                    convertList(agentVersion, agent.getLastRequest().getBody()));
+        } finally {
+            agent.close();
+        }
     }
-  }
-
-  @Test
-  void testApiDowngradesToV3IfV04NotAvailable() {
-    JavaTestHttpServer v3Agent =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.put(
-                            "v0.3/traces",
-                            api -> {
-                              int status = api.getRequest().getContentLength() > 0 ? 200 : 500;
-                              api.getResponse().status(status).send();
-                            })));
-    try {
-      DDAgentApi client = createAgentApi(v3Agent.getAddress().toString()).api;
-      Payload payload = prepareTraces("v0.4/traces", emptyList());
-      assertTrue(client.sendSerializedTraces(payload).success());
-      assertEquals("/v0.3/traces", v3Agent.getLastRequest().getPath());
-    } finally {
-      v3Agent.close();
+
+    @TableTest({
+      "scenario    | agentVersion ",
+      "v0.3 traces | 'v0.3/traces'",
+      "v0.4 traces | 'v0.4/traces'",
+      "v0.5 traces | 'v0.5/traces'"
+    })
+    void testApiResponseListenersSee200Responses(String agentVersion) {
+        AtomicReference<Map<String, Map<String, Number>>> agentResponse = new AtomicReference<>(null);
+        RemoteResponseListener responseListener = (endpoint, responseJson) -> agentResponse.set(responseJson);
+
+        JavaTestHttpServer agent = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.put(agentVersion, api -> {
+            int status = api.getRequest().getContentLength() > 0 ? 200 : 500;
+            api.getResponse().status(status).send("{\"hello\":{}}");
+        })));
+        try {
+            DDAgentApi client = createAgentApi(agent.getAddress().toString()).api;
+            client.addResponseListener(responseListener);
+            List<List<DDSpan>> traces = Arrays.asList(emptyList(), emptyList(), emptyList());
+            Payload payload = prepareTraces(agentVersion, traces);
+            payload.withDroppedTraces(1);
+            payload.withDroppedTraces(3);
+
+            client.sendSerializedTraces(payload);
+
+            Map<String, Map<String, Number>> response = agentResponse.get();
+            assertEquals(singletonMap("hello", emptyMap()), response);
+            assertEquals("java", agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang"));
+            assertEquals(
+                    System.getProperty("java.version", "unknown"),
+                    agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang-Version"));
+            assertEquals(
+                    "Stubbed-Test-Version", agent.getLastRequest().getHeaders().get("Datadog-Meta-Tracer-Version"));
+            assertEquals("3", agent.getLastRequest().getHeaders().get("X-Datadog-Trace-Count"));
+            assertEquals(
+                    String.valueOf(payload.droppedTraces()),
+                    agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Traces"));
+            assertEquals(
+                    String.valueOf(payload.droppedSpans()),
+                    agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Spans"));
+        } finally {
+            agent.close();
+        }
     }
-  }
-
-  @TableTest({
-    "scenario         | endpointVersion | delayTrace | badPort",
-    "v0.4 ok          | 'v0.4'          | 0          | false  ",
-    "v0.3 bad port    | 'v0.3'          | 0          | true   ",
-    "v0.4 short delay | 'v0.4'          | 500        | false  ",
-    "v0.3 long delay  | 'v0.3'          | 30000      | false  "
-  })
-  void testApiDowngradesToV3IfTimeoutExceeded(
-      String endpointVersion, int delayTrace, boolean badPort) {
-    JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h -> {
-                      h.put(
-                          "v0.3/traces",
-                          api -> {
-                            int status = api.getRequest().getContentLength() > 0 ? 200 : 500;
-                            api.getResponse().status(status).send();
-                          });
-                      h.put(
-                          "v0.4/traces",
-                          api -> {
-                            if (delayTrace > 0) {
-                              try {
-                                Thread.sleep(delayTrace);
-                              } catch (InterruptedException e) {
-                                Thread.currentThread().interrupt();
-                              }
-                            }
-                            int status = api.getRequest().getContentLength() > 0 ? 200 : 500;
-                            api.getResponse().status(status).send();
-                          });
-                    }));
-    try {
-      int port = badPort ? 999 : agent.getAddress().getPort();
-      String url = "http://" + agent.getAddress().getHost() + ":" + port;
-      DDAgentApi client = createAgentApi(url).api;
-      Payload payload = prepareTraces("v0.4/traces", emptyList());
-      Response result = client.sendSerializedTraces(payload);
-      assertEquals(!badPort, result.success());
-      if (!badPort) {
-        assertEquals("/" + endpointVersion + "/traces", agent.getLastRequest().getPath());
-      }
-    } finally {
-      agent.close();
+
+    @Test
+    void testApiDowngradesToV3IfV04NotAvailable() {
+        JavaTestHttpServer v3Agent = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.put("v0.3/traces", api -> {
+            int status = api.getRequest().getContentLength() > 0 ? 200 : 500;
+            api.getResponse().status(status).send();
+        })));
+        try {
+            DDAgentApi client = createAgentApi(v3Agent.getAddress().toString()).api;
+            Payload payload = prepareTraces("v0.4/traces", emptyList());
+            assertTrue(client.sendSerializedTraces(payload).success());
+            assertEquals("/v0.3/traces", v3Agent.getLastRequest().getPath());
+        } finally {
+            v3Agent.close();
+        }
     }
-  }
-
-  // all the tested traces are empty and it just so happens that
-  // arrays and maps take the same amount of space in messagepack, so
-  // all the sizes match, except in v0.5 where there is 1 byte for a
-  // 2 element array header and 1 byte for an empty dictionary
-  @TableTest({
-    "scenario          | agentVersion  | expectedLength | traceCount",
-    "v0.4 empty        | 'v0.4/traces' | 1              | 0         ",
-    "v0.4 2 traces     | 'v0.4/traces' | 3              | 2         ",
-    "v0.4 15 traces    | 'v0.4/traces' | 16             | 15        ",
-    "v0.4 16 traces    | 'v0.4/traces' | 19             | 16        ",
-    "v0.4 65535 traces | 'v0.4/traces' | 65538          | 65535     ",
-    "v0.4 65536 traces | 'v0.4/traces' | 65541          | 65536     ",
-    "v0.5 empty        | 'v0.5/traces' | 3              | 0         ",
-    "v0.5 2 traces     | 'v0.5/traces' | 5              | 2         ",
-    "v0.5 15 traces    | 'v0.5/traces' | 18             | 15        ",
-    "v0.5 16 traces    | 'v0.5/traces' | 21             | 16        ",
-    "v0.5 65535 traces | 'v0.5/traces' | 65540          | 65535     ",
-    "v0.5 65536 traces | 'v0.5/traces' | 65543          | 65536     "
-  })
-  void testVerifyContentLength(String agentVersion, long expectedLength, int traceCount) {
-    List<List<DDSpan>> traces = generateEmptyTraces(traceCount);
-    AtomicLong receivedContentLength = new AtomicLong();
-    JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.put(
-                            agentVersion,
-                            api -> {
-                              receivedContentLength.set(api.getRequest().getContentLength());
-                              api.getResponse().status(200).send();
-                            })));
-    try {
-      DDAgentApi client = createAgentApi(agent.getAddress().toString()).api;
-      Payload payload = prepareTraces(agentVersion, traces);
-      assertTrue(client.sendSerializedTraces(payload).success());
-      assertEquals(expectedLength, receivedContentLength.get());
-    } finally {
-      agent.close();
+
+    @TableTest({
+      "scenario         | endpointVersion | delayTrace | badPort",
+      "v0.4 ok          | 'v0.4'          | 0          | false  ",
+      "v0.3 bad port    | 'v0.3'          | 0          | true   ",
+      "v0.4 short delay | 'v0.4'          | 500        | false  ",
+      "v0.3 long delay  | 'v0.3'          | 30000      | false  "
+    })
+    void testApiDowngradesToV3IfTimeoutExceeded(String endpointVersion, int delayTrace, boolean badPort) {
+        JavaTestHttpServer agent = JavaTestHttpServer.httpServer(s -> s.handlers(h -> {
+            h.put("v0.3/traces", api -> {
+                int status = api.getRequest().getContentLength() > 0 ? 200 : 500;
+                api.getResponse().status(status).send();
+            });
+            h.put("v0.4/traces", api -> {
+                if (delayTrace > 0) {
+                    try {
+                        Thread.sleep(delayTrace);
+                    } catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
+                    }
+                }
+                int status = api.getRequest().getContentLength() > 0 ? 200 : 500;
+                api.getResponse().status(status).send();
+            });
+        }));
+        try {
+            int port = badPort ? 999 : agent.getAddress().getPort();
+            String url = "http://" + agent.getAddress().getHost() + ":" + port;
+            DDAgentApi client = createAgentApi(url).api;
+            Payload payload = prepareTraces("v0.4/traces", emptyList());
+            Response result = client.sendSerializedTraces(payload);
+            assertEquals(!badPort, result.success());
+            if (!badPort) {
+                assertEquals(
+                        "/" + endpointVersion + "/traces",
+                        agent.getLastRequest().getPath());
+            }
+        } finally {
+            agent.close();
+        }
     }
-  }
-
-  @Test
-  void testEmbeddedHttpClientRejectsAsyncRequests() throws Exception {
-    JavaTestHttpServer agent = newAgent("v0.5/traces");
-    try {
-      AgentApiPair pair = createAgentApi(agent.getAddress().toString());
-      pair.discovery.discover();
-      Field httpClientField = DDAgentApi.class.getDeclaredField("httpClient");
-      httpClientField.setAccessible(true);
-      OkHttpClient httpClient = (OkHttpClient) httpClientField.get(pair.api);
-      ExecutorService httpExecutorService = httpClient.dispatcher().executorService();
-      assertThrows(RejectedExecutionException.class, () -> httpExecutorService.execute(() -> {}));
-      assertTrue(httpExecutorService.isShutdown());
-    } finally {
-      agent.close();
+
+    // all the tested traces are empty and it just so happens that
+    // arrays and maps take the same amount of space in messagepack, so
+    // all the sizes match, except in v0.5 where there is 1 byte for a
+    // 2 element array header and 1 byte for an empty dictionary
+    @TableTest({
+      "scenario          | agentVersion  | expectedLength | traceCount",
+      "v0.4 empty        | 'v0.4/traces' | 1              | 0         ",
+      "v0.4 2 traces     | 'v0.4/traces' | 3              | 2         ",
+      "v0.4 15 traces    | 'v0.4/traces' | 16             | 15        ",
+      "v0.4 16 traces    | 'v0.4/traces' | 19             | 16        ",
+      "v0.4 65535 traces | 'v0.4/traces' | 65538          | 65535     ",
+      "v0.4 65536 traces | 'v0.4/traces' | 65541          | 65536     ",
+      "v0.5 empty        | 'v0.5/traces' | 3              | 0         ",
+      "v0.5 2 traces     | 'v0.5/traces' | 5              | 2         ",
+      "v0.5 15 traces    | 'v0.5/traces' | 18             | 15        ",
+      "v0.5 16 traces    | 'v0.5/traces' | 21             | 16        ",
+      "v0.5 65535 traces | 'v0.5/traces' | 65540          | 65535     ",
+      "v0.5 65536 traces | 'v0.5/traces' | 65543          | 65536     "
+    })
+    void testVerifyContentLength(String agentVersion, long expectedLength, int traceCount) {
+        List<List<DDSpan>> traces = generateEmptyTraces(traceCount);
+        AtomicLong receivedContentLength = new AtomicLong();
+        JavaTestHttpServer agent = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.put(agentVersion, api -> {
+            receivedContentLength.set(api.getRequest().getContentLength());
+            api.getResponse().status(200).send();
+        })));
+        try {
+            DDAgentApi client = createAgentApi(agent.getAddress().toString()).api;
+            Payload payload = prepareTraces(agentVersion, traces);
+            assertTrue(client.sendSerializedTraces(payload).success());
+            assertEquals(expectedLength, receivedContentLength.get());
+        } finally {
+            agent.close();
+        }
     }
-  }
-
-  @Test
-  void testMetaStructSupportOnTheEncodedSpans() throws IOException {
-    String agentVersion = "v0.4/traces";
-    JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            s -> s.handlers(h -> h.put(agentVersion, api -> api.getResponse().send())));
-    try {
-      DDAgentApi client = createAgentApi(agent.getAddress().toString()).api;
-      DDSpan span = buildSpan(1L, "fakeType", Collections.emptyMap());
-      span.setMetaStruct("meta_1", "Hello World!");
-      Map<String, Object> meta2 = new HashMap<>();
-      meta2.put("Hello", " World!");
-      span.setMetaStruct("meta_2", meta2);
-      Payload payload = prepareTraces(agentVersion, singletonList(singletonList(span)));
-      assertTrue(client.sendSerializedTraces(payload).success());
-
-      List<List<TreeMap<String, Object>>> body =
-          convertList(agentVersion, agent.getLastRequest().getBody());
-      @SuppressWarnings("unchecked")
-      Map<String, byte[]> metaStruct = (Map<String, byte[]>) body.get(0).get(0).get("meta_struct");
-      assertEquals(2, metaStruct.size());
-      assertEquals("Hello World!", mapper.readValue(metaStruct.get("meta_1"), String.class));
-      @SuppressWarnings("unchecked")
-      Map<String, Object> actualMeta2 = mapper.readValue(metaStruct.get("meta_2"), Map.class);
-      assertEquals(meta2, actualMeta2);
-    } finally {
-      agent.close();
+
+    @Test
+    void testEmbeddedHttpClientRejectsAsyncRequests() throws Exception {
+        JavaTestHttpServer agent = newAgent("v0.5/traces");
+        try {
+            AgentApiPair pair = createAgentApi(agent.getAddress().toString());
+            pair.discovery.discover();
+            Field httpClientField = DDAgentApi.class.getDeclaredField("httpClient");
+            httpClientField.setAccessible(true);
+            OkHttpClient httpClient = (OkHttpClient) httpClientField.get(pair.api);
+            ExecutorService httpExecutorService = httpClient.dispatcher().executorService();
+            assertThrows(RejectedExecutionException.class, () -> httpExecutorService.execute(() -> {}));
+            assertTrue(httpExecutorService.isShutdown());
+        } finally {
+            agent.close();
+        }
     }
-  }
-
-  @TableTest({
-    "scenario                                   | otlpSpanMetrics | nativeMetrics | expectedComputesStats",
-    "gap case: OTLP span metrics on, native off | true            | false         | true                 ",
-    "neither pipeline computes stats            | false           | false         | false                ",
-    "native stats on (regression guard)         | false           | true          | true                 ",
-    "both on                                    | true            | true          | true                 "
-  })
-  void testDatadogClientComputedStatsHeaderSetWhenEitherStatsPipelineIsEnabled(
-      boolean otlpSpanMetrics, boolean nativeMetrics, boolean expectedComputesStats) {
-    datadog.trace.test.junit.utils.config.WithConfigExtension.injectSysConfig(
-        OtlpConfig.OTEL_TRACES_SPAN_METRICS_ENABLED, String.valueOf(otlpSpanMetrics));
-
-    JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(h -> h.put("v0.4/traces", api -> api.getResponse().status(200).send())));
-    try {
-      HttpUrl agentUrl = HttpUrl.get(agent.getAddress().toString());
-
-      // Mock feature discovery so the native-stats pipeline signal can be controlled independently
-      // of what the (embedded) agent advertises. supportsMetrics() reflects agent-side client
-      // stats support.
-      DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-      when(discovery.getTraceEndpoint()).thenReturn("v0.4/traces");
-      when(discovery.supportsMetrics()).thenReturn(nativeMetrics);
-      when(discovery.state()).thenReturn(null);
-
-      OkHttpClient client = OkHttpUtils.buildHttpClient(agentUrl, 1000);
-      // nativeMetrics is the constructor flag WriterFactory sets from
-      // Config.isTracerMetricsEnabled().
-      DDAgentApi api = new DDAgentApi(client, agentUrl, discovery, monitoring, nativeMetrics);
-      Payload payload = prepareTraces("v0.4/traces", emptyList());
-
-      Response clientResponse = api.sendSerializedTraces(payload);
-
-      assertTrue(clientResponse.success());
-      assertEquals(
-          expectedComputesStats,
-          "true".equals(agent.getLastRequest().getHeaders().get("Datadog-Client-Computed-Stats")));
-    } finally {
-      agent.close();
+
+    @Test
+    void testMetaStructSupportOnTheEncodedSpans() throws IOException {
+        String agentVersion = "v0.4/traces";
+        JavaTestHttpServer agent = JavaTestHttpServer.httpServer(s ->
+                s.handlers(h -> h.put(agentVersion, api -> api.getResponse().send())));
+        try {
+            DDAgentApi client = createAgentApi(agent.getAddress().toString()).api;
+            DDSpan span = buildSpan(1L, "fakeType", Collections.emptyMap());
+            span.setMetaStruct("meta_1", "Hello World!");
+            Map<String, Object> meta2 = new HashMap<>();
+            meta2.put("Hello", " World!");
+            span.setMetaStruct("meta_2", meta2);
+            Payload payload = prepareTraces(agentVersion, singletonList(singletonList(span)));
+            assertTrue(client.sendSerializedTraces(payload).success());
+
+            List<List<TreeMap<String, Object>>> body =
+                    convertList(agentVersion, agent.getLastRequest().getBody());
+            @SuppressWarnings("unchecked")
+            Map<String, byte[]> metaStruct =
+                    (Map<String, byte[]>) body.get(0).get(0).get("meta_struct");
+            assertEquals(2, metaStruct.size());
+            assertEquals("Hello World!", mapper.readValue(metaStruct.get("meta_1"), String.class));
+            @SuppressWarnings("unchecked")
+            Map<String, Object> actualMeta2 = mapper.readValue(metaStruct.get("meta_2"), Map.class);
+            assertEquals(meta2, actualMeta2);
+        } finally {
+            agent.close();
+        }
     }
-  }
 
-  // --- Inner types ---
+    @TableTest({
+      "scenario                                   | otlpSpanMetrics | nativeMetrics | expectedComputesStats",
+      "gap case: OTLP span metrics on, native off | true            | false         | true                 ",
+      "neither pipeline computes stats            | false           | false         | false                ",
+      "native stats on (regression guard)         | false           | true          | true                 ",
+      "both on                                    | true            | true          | true                 "
+    })
+    void testDatadogClientComputedStatsHeaderSetWhenEitherStatsPipelineIsEnabled(
+            boolean otlpSpanMetrics, boolean nativeMetrics, boolean expectedComputesStats) {
+        datadog.trace.test.junit.utils.config.WithConfigExtension.injectSysConfig(
+                OtlpConfig.OTEL_TRACES_SPAN_METRICS_ENABLED, String.valueOf(otlpSpanMetrics));
+
+        JavaTestHttpServer agent = JavaTestHttpServer.httpServer(s -> s.handlers(
+                h -> h.put("v0.4/traces", api -> api.getResponse().status(200).send())));
+        try {
+            HttpUrl agentUrl = HttpUrl.get(agent.getAddress().toString());
+
+            // Mock feature discovery so the native-stats pipeline signal can be controlled independently
+            // of what the (embedded) agent advertises. supportsMetrics() reflects agent-side client
+            // stats support.
+            DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+            when(discovery.getTraceEndpoint()).thenReturn("v0.4/traces");
+            when(discovery.supportsMetrics()).thenReturn(nativeMetrics);
+            when(discovery.state()).thenReturn(null);
+
+            OkHttpClient client = OkHttpUtils.buildHttpClient(agentUrl, 1000);
+            // nativeMetrics is the constructor flag WriterFactory sets from
+            // Config.isTracerMetricsEnabled().
+            DDAgentApi api = new DDAgentApi(client, agentUrl, discovery, monitoring, nativeMetrics);
+            Payload payload = prepareTraces("v0.4/traces", emptyList());
+
+            Response clientResponse = api.sendSerializedTraces(payload);
+
+            assertTrue(clientResponse.success());
+            assertEquals(
+                    expectedComputesStats,
+                    "true".equals(agent.getLastRequest().getHeaders().get("Datadog-Client-Computed-Stats")));
+        } finally {
+            agent.close();
+        }
+    }
+
+    // --- Inner types ---
 
-  static class AgentApiPair {
-    final DDAgentFeaturesDiscovery discovery;
-    final DDAgentApi api;
+    static class AgentApiPair {
+        final DDAgentFeaturesDiscovery discovery;
+        final DDAgentApi api;
 
-    AgentApiPair(DDAgentFeaturesDiscovery discovery, DDAgentApi api) {
-      this.discovery = discovery;
-      this.api = api;
+        AgentApiPair(DDAgentFeaturesDiscovery discovery, DDAgentApi api) {
+            this.discovery = discovery;
+            this.api = api;
+        }
     }
-  }
 
-  static class TracesCapture implements ByteBufferConsumer {
-    int traceCount;
-    ByteBuffer buffer;
+    static class TracesCapture implements ByteBufferConsumer {
+        int traceCount;
+        ByteBuffer buffer;
 
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {
-      this.buffer = buffer;
-      this.traceCount = messageCount;
-    }
-  }
-
-  // --- Helper methods ---
-
-  AgentApiPair createAgentApi(String url, ProtocolVersion protocolVersion) {
-    HttpUrl agentUrl = HttpUrl.get(url);
-    OkHttpClient client = OkHttpUtils.buildHttpClient(agentUrl, 1000);
-    DDAgentFeaturesDiscovery discovery =
-        new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, protocolVersion, true, false);
-    return new AgentApiPair(
-        discovery, new DDAgentApi(client, agentUrl, discovery, monitoring, false));
-  }
-
-  AgentApiPair createAgentApi(String url) {
-    return createAgentApi(url, V0_5);
-  }
-
-  Payload prepareTraces(String agentVersion, List<List<DDSpan>> traces) {
-    TracesCapture traceCapture = new TracesCapture();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1 << 20, traceCapture));
-
-    TraceMapper traceMapper;
-    if ("v1.0/traces".equals(agentVersion)) {
-      traceMapper = new TraceMapperV1();
-    } else if ("v0.5/traces".equals(agentVersion)) {
-      traceMapper = new TraceMapperV0_5();
-    } else {
-      traceMapper = new TraceMapperV0_4();
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {
+            this.buffer = buffer;
+            this.traceCount = messageCount;
+        }
     }
 
-    for (List<DDSpan> trace : traces) {
-      packer.format(trace, traceMapper);
+    // --- Helper methods ---
+
+    AgentApiPair createAgentApi(String url, ProtocolVersion protocolVersion) {
+        HttpUrl agentUrl = HttpUrl.get(url);
+        OkHttpClient client = OkHttpUtils.buildHttpClient(agentUrl, 1000);
+        DDAgentFeaturesDiscovery discovery =
+                new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, protocolVersion, true, false);
+        return new AgentApiPair(discovery, new DDAgentApi(client, agentUrl, discovery, monitoring, false));
     }
-    packer.flush();
-
-    return traceMapper
-        .newPayload()
-        .withBody(
-            traceCapture.traceCount,
-            traces.isEmpty() ? ByteBuffer.allocate(0) : traceCapture.buffer);
-  }
-
-  static List<List<TreeMap<String, Object>>> convertList(String agentVersion, byte[] bytes)
-      throws IOException {
-    if ("v0.5/traces".equals(agentVersion)) {
-      return convertListV5(bytes);
+
+    AgentApiPair createAgentApi(String url) {
+        return createAgentApi(url, V0_5);
     }
-    List<List<TreeMap<String, Object>>> returnVal =
-        mapper.readValue(bytes, new TypeReference<List<List<TreeMap<String, Object>>>>() {});
-    for (List<TreeMap<String, Object>> trace : returnVal) {
-      for (TreeMap<String, Object> span : trace) {
-        @SuppressWarnings("unchecked")
-        Map<String, Object> meta = (Map<String, Object>) span.get("meta");
-        if (meta != null) {
-          meta.remove("runtime-id");
-          meta.remove("language");
+
+    Payload prepareTraces(String agentVersion, List<List<DDSpan>> traces) {
+        TracesCapture traceCapture = new TracesCapture();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1 << 20, traceCapture));
+
+        TraceMapper traceMapper;
+        if ("v1.0/traces".equals(agentVersion)) {
+            traceMapper = new TraceMapperV1();
+        } else if ("v0.5/traces".equals(agentVersion)) {
+            traceMapper = new TraceMapperV0_5();
+        } else {
+            traceMapper = new TraceMapperV0_4();
         }
-      }
-    }
-    return returnVal;
-  }
-
-  static List<List<TreeMap<String, Object>>> convertListV5(byte[] bytes) throws IOException {
-    List<List<List<Object>>> traces =
-        mapper.readValue(bytes, new TypeReference<List<List<List<Object>>>>() {});
-    List<List<TreeMap<String, Object>>> maps = new ArrayList<>(traces.size());
-    for (List<List<Object>> trace : traces) {
-      List<TreeMap<String, Object>> mapTrace = new ArrayList<>();
-      for (List<Object> span : trace) {
-        TreeMap<String, Object> map = new TreeMap<>();
-        if (!span.isEmpty()) {
-          map.put("service", span.get(0));
-          map.put("name", span.get(1));
-          map.put("resource", span.get(2));
-          map.put("trace_id", span.get(3));
-          map.put("span_id", span.get(4));
-          map.put("parent_id", span.get(5));
-          map.put("start", span.get(6));
-          map.put("duration", span.get(7));
-          map.put("error", span.get(8));
-          map.put("meta", span.get(9));
-          map.put("metrics", span.get(10));
-          map.put("type", span.get(11));
-
-          @SuppressWarnings("unchecked")
-          Map<Object, Object> meta = (Map<Object, Object>) map.get("meta");
-          if (meta != null) {
-            meta.remove("runtime-id");
-            meta.remove("language");
-          }
+
+        for (List<DDSpan> trace : traces) {
+            packer.format(trace, traceMapper);
         }
-        mapTrace.add(map);
-      }
-      maps.add(mapTrace);
+        packer.flush();
+
+        return traceMapper
+                .newPayload()
+                .withBody(traceCapture.traceCount, traces.isEmpty() ? ByteBuffer.allocate(0) : traceCapture.buffer);
     }
-    return maps;
-  }
 
-  static List<List<DDSpan>> generateEmptyTraces(int count) {
-    List<List<DDSpan>> traces = new ArrayList<>(count);
-    for (int i = 0; i < count; i++) {
-      traces.add(emptyList());
+    static List<List<TreeMap<String, Object>>> convertList(String agentVersion, byte[] bytes) throws IOException {
+        if ("v0.5/traces".equals(agentVersion)) {
+            return convertListV5(bytes);
+        }
+        List<List<TreeMap<String, Object>>> returnVal =
+                mapper.readValue(bytes, new TypeReference<List<List<TreeMap<String, Object>>>>() {});
+        for (List<TreeMap<String, Object>> trace : returnVal) {
+            for (TreeMap<String, Object> span : trace) {
+                @SuppressWarnings("unchecked")
+                Map<String, Object> meta = (Map<String, Object>) span.get("meta");
+                if (meta != null) {
+                    meta.remove("runtime-id");
+                    meta.remove("language");
+                }
+            }
+        }
+        return returnVal;
     }
-    return traces;
-  }
-
-  static void setDurationNano(DDSpan span, long duration) {
-    try {
-      Field field = DDSpan.class.getDeclaredField("durationNano");
-      field.setAccessible(true);
-      field.setLong(span, duration);
-    } catch (NoSuchFieldException | IllegalAccessException e) {
-      Assertions.fail("Could not set durationNano: " + e.getMessage());
+
+    static List<List<TreeMap<String, Object>>> convertListV5(byte[] bytes) throws IOException {
+        List<List<List<Object>>> traces = mapper.readValue(bytes, new TypeReference<List<List<List<Object>>>>() {});
+        List<List<TreeMap<String, Object>>> maps = new ArrayList<>(traces.size());
+        for (List<List<Object>> trace : traces) {
+            List<TreeMap<String, Object>> mapTrace = new ArrayList<>();
+            for (List<Object> span : trace) {
+                TreeMap<String, Object> map = new TreeMap<>();
+                if (!span.isEmpty()) {
+                    map.put("service", span.get(0));
+                    map.put("name", span.get(1));
+                    map.put("resource", span.get(2));
+                    map.put("trace_id", span.get(3));
+                    map.put("span_id", span.get(4));
+                    map.put("parent_id", span.get(5));
+                    map.put("start", span.get(6));
+                    map.put("duration", span.get(7));
+                    map.put("error", span.get(8));
+                    map.put("meta", span.get(9));
+                    map.put("metrics", span.get(10));
+                    map.put("type", span.get(11));
+
+                    @SuppressWarnings("unchecked")
+                    Map<Object, Object> meta = (Map<Object, Object>) map.get("meta");
+                    if (meta != null) {
+                        meta.remove("runtime-id");
+                        meta.remove("language");
+                    }
+                }
+                mapTrace.add(map);
+            }
+            maps.add(mapTrace);
+        }
+        return maps;
     }
-  }
 
-  @SuppressWarnings("unchecked")
-  static void assertDeepEquals(Object expected, Object actual) {
-    if (expected == null && actual == null) {
-      return;
+    static List<List<DDSpan>> generateEmptyTraces(int count) {
+        List<List<DDSpan>> traces = new ArrayList<>(count);
+        for (int i = 0; i < count; i++) {
+            traces.add(emptyList());
+        }
+        return traces;
     }
-    if (expected == null || actual == null) {
-      Assertions.fail("Expected " + expected + " but got " + actual);
+
+    static void setDurationNano(DDSpan span, long duration) {
+        try {
+            Field field = DDSpan.class.getDeclaredField("durationNano");
+            field.setAccessible(true);
+            field.setLong(span, duration);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            Assertions.fail("Could not set durationNano: " + e.getMessage());
+        }
     }
-    if (expected instanceof Map) {
-      assertInstanceOf(Map.class, actual, "Expected Map but got " + actual.getClass());
-      Map<Object, Object> expectedMap = (Map<Object, Object>) expected;
-      Map<Object, Object> actualMap = (Map<Object, Object>) actual;
-      assertEquals(expectedMap.size(), actualMap.size(), "Map size mismatch");
-      for (Map.Entry<Object, Object> entry : expectedMap.entrySet()) {
-        assertTrue(actualMap.containsKey(entry.getKey()), "Missing key: " + entry.getKey());
-        assertDeepEquals(entry.getValue(), actualMap.get(entry.getKey()));
-      }
-    } else if (expected instanceof List) {
-      assertInstanceOf(List.class, actual, "Expected List but got " + actual.getClass());
-      List<Object> expectedList = (List<Object>) expected;
-      List<Object> actualList = (List<Object>) actual;
-      assertEquals(expectedList.size(), actualList.size(), "List size mismatch");
-      for (int i = 0; i < expectedList.size(); i++) {
-        assertDeepEquals(expectedList.get(i), actualList.get(i));
-      }
-    } else if (expected instanceof Number && actual instanceof Number) {
-      if (expected instanceof Float
-          || expected instanceof Double
-          || actual instanceof Float
-          || actual instanceof Double) {
-        assertEquals(((Number) expected).doubleValue(), ((Number) actual).doubleValue(), 0.0001);
-      } else {
-        assertEquals(((Number) expected).longValue(), ((Number) actual).longValue());
-      }
-    } else {
-      assertEquals(expected, actual);
+
+    @SuppressWarnings("unchecked")
+    static void assertDeepEquals(Object expected, Object actual) {
+        if (expected == null && actual == null) {
+            return;
+        }
+        if (expected == null || actual == null) {
+            Assertions.fail("Expected " + expected + " but got " + actual);
+        }
+        if (expected instanceof Map) {
+            assertInstanceOf(Map.class, actual, "Expected Map but got " + actual.getClass());
+            Map<Object, Object> expectedMap = (Map<Object, Object>) expected;
+            Map<Object, Object> actualMap = (Map<Object, Object>) actual;
+            assertEquals(expectedMap.size(), actualMap.size(), "Map size mismatch");
+            for (Map.Entry<Object, Object> entry : expectedMap.entrySet()) {
+                assertTrue(actualMap.containsKey(entry.getKey()), "Missing key: " + entry.getKey());
+                assertDeepEquals(entry.getValue(), actualMap.get(entry.getKey()));
+            }
+        } else if (expected instanceof List) {
+            assertInstanceOf(List.class, actual, "Expected List but got " + actual.getClass());
+            List<Object> expectedList = (List<Object>) expected;
+            List<Object> actualList = (List<Object>) actual;
+            assertEquals(expectedList.size(), actualList.size(), "List size mismatch");
+            for (int i = 0; i < expectedList.size(); i++) {
+                assertDeepEquals(expectedList.get(i), actualList.get(i));
+            }
+        } else if (expected instanceof Number && actual instanceof Number) {
+            if (expected instanceof Float
+                    || expected instanceof Double
+                    || actual instanceof Float
+                    || actual instanceof Double) {
+                assertEquals(((Number) expected).doubleValue(), ((Number) actual).doubleValue(), 0.0001);
+            } else {
+                assertEquals(((Number) expected).longValue(), ((Number) actual).longValue());
+            }
+        } else {
+            assertEquals(expected, actual);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterCombinedTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterCombinedTest.java
index 8f3a8c40add..367e221bff0 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterCombinedTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterCombinedTest.java
@@ -74,857 +74,795 @@
 @Timeout(value = 10, unit = TimeUnit.SECONDS)
 class DDAgentWriterCombinedTest extends DDCoreJavaSpecification {
 
-  // DDAgentWriter default buffer size (matches private DDAgentWriter.BUFFER_SIZE)
-  private static final int AGENT_WRITER_BUFFER_SIZE = 1024;
-
-  MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
-  Phaser phaser = new Phaser();
-
-  // Only used to create spans
-  CoreTracer dummyTracer;
-
-  @BeforeEach
-  void setup() {
-    // Register for two threads.
-    phaser.register();
-    phaser.register();
-    dummyTracer = tracerBuilder().writer(new ListWriter()).build();
-  }
-
-  @AfterEach
-  void cleanup() {
-    if (dummyTracer != null) {
-      dummyTracer.close();
+    // DDAgentWriter default buffer size (matches private DDAgentWriter.BUFFER_SIZE)
+    private static final int AGENT_WRITER_BUFFER_SIZE = 1024;
+
+    MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
+    Phaser phaser = new Phaser();
+
+    // Only used to create spans
+    CoreTracer dummyTracer;
+
+    @BeforeEach
+    void setup() {
+        // Register for two threads.
+        phaser.register();
+        phaser.register();
+        dummyTracer = tracerBuilder().writer(new ListWriter()).build();
     }
-  }
-
-  @BeforeEach
-  void resetProcessTags() {
-    // Sync ProcessTags.enabled with the current Config (which may be modified by @WithConfig)
-    ProcessTags.reset(Config.get());
-  }
-
-  List<DDSpan> createMinimalTrace() {
-    // Use buildSpan from DDCoreJavaSpecification to create a real DDSpan with minimal fields
-    DDSpan span = buildSpan(0L, "", Collections.emptyMap());
-    return Collections.singletonList(span);
-  }
-
-  @Test
-  void noInteractionsBecauseOfInitialFlush() {
-    DDAgentApi api = Mockito.mock(DDAgentApi.class);
-    DDAgentWriter writer =
-        DDAgentWriter.builder()
-            .agentApi(api)
-            .traceBufferSize(8)
-            .monitoring(monitoring)
-            .flushIntervalMilliseconds(-1)
-            .build();
-    writer.start();
-
-    writer.flush();
-
-    // then: 0 * _ (no interactions at all on mocked api)
-    verifyNoMoreInteractions(api);
-
-    writer.close();
-  }
-
-  @TableTest({
-    "scenario | agentVersion ",
-    "v0.3     | 'v0.3/traces'",
-    "v0.4     | 'v0.4/traces'",
-    "v0.5     | 'v0.5/traces'"
-  })
-  void testHappyPath(String agentVersion) {
-    DDAgentApi api = mock(DDAgentApi.class);
-    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-    DDAgentWriter writer =
-        DDAgentWriter.builder()
-            .featureDiscovery(discovery)
-            .agentApi(api)
-            .traceBufferSize(1024)
-            .monitoring(monitoring)
-            .flushIntervalMilliseconds(-1)
-            .build();
-    writer.start();
-    DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start();
-    List<DDSpan> trace = Collections.singletonList(span);
-
-    when(discovery.getTraceEndpoint()).thenReturn(agentVersion);
-    when(api.sendSerializedTraces(argThat(payload -> payload.traceCount() == 2)))
-        .thenReturn(RemoteApi.Response.success(200));
-
-    writer.write(trace);
-    writer.write(trace);
-    writer.flush();
-
-    verify(discovery, times(2)).getTraceEndpoint();
-    verify(api, times(1)).sendSerializedTraces(argThat(payload -> payload.traceCount() == 2));
-    verifyNoMoreInteractions(api, discovery);
-
-    writer.close();
-  }
-
-  @TableTest({
-    "scenario | agentVersion ",
-    "v0.3     | 'v0.3/traces'",
-    "v0.4     | 'v0.4/traces'",
-    "v0.5     | 'v0.5/traces'"
-  })
-  void testFloodOfTraces(String agentVersion) {
-    // bufferSize = 1024; traceCount = 100 (shouldn't trigger payload, but bigger than disruptor
-    // size)
-    int bufferSize = 1024;
-    int traceCount = 100;
-
-    DDAgentApi api = mock(DDAgentApi.class);
-    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-    DDAgentWriter writer =
-        DDAgentWriter.builder()
-            .featureDiscovery(discovery)
-            .agentApi(api)
-            .traceBufferSize(bufferSize)
-            .monitoring(monitoring)
-            .flushIntervalMilliseconds(-1)
-            .build();
-    writer.start();
-    DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start();
-    List<DDSpan> trace = Collections.singletonList(span);
-
-    when(discovery.getTraceEndpoint()).thenReturn(agentVersion);
-    when(api.sendSerializedTraces(argThat(payload -> payload.traceCount() <= traceCount)))
-        .thenReturn(RemoteApi.Response.success(200));
-
-    for (int i = 1; i <= traceCount; i++) {
-      writer.write(trace);
+
+    @AfterEach
+    void cleanup() {
+        if (dummyTracer != null) {
+            dummyTracer.close();
+        }
     }
-    writer.flush();
-
-    verify(discovery, times(2)).getTraceEndpoint();
-    verify(api, times(1))
-        .sendSerializedTraces(argThat(payload -> payload.traceCount() <= traceCount));
-    verifyNoMoreInteractions(api, discovery);
-
-    writer.close();
-  }
-
-  @TableTest({
-    "scenario | agentVersion ",
-    "v0.3     | 'v0.3/traces'",
-    "v0.4     | 'v0.4/traces'",
-    "v0.5     | 'v0.5/traces'"
-  })
-  void testFlushByTime(String agentVersion) throws Exception {
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    DDAgentApi api = mock(DDAgentApi.class);
-    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-    DDAgentWriter writer =
-        DDAgentWriter.builder()
-            .featureDiscovery(discovery)
-            .agentApi(api)
-            .healthMetrics(healthMetrics)
-            .monitoring(monitoring)
-            .flushIntervalMilliseconds(1000)
-            .build();
-    writer.start();
-    DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start();
-    List<DDSpan> trace = Collections.nCopies(10, span);
-
-    when(discovery.getTraceEndpoint()).thenReturn(agentVersion);
-    when(api.sendSerializedTraces(argThat(payload -> payload.traceCount() == 5)))
-        .thenReturn(RemoteApi.Response.success(200));
-
-    // stub onSend to arrive at phaser
-    doAnswer(
-            invocation -> {
-              phaser.arrive();
-              return null;
-            })
-        .when(healthMetrics)
-        .onSend(anyInt(), anyInt(), any());
-
-    for (int i = 1; i <= 5; i++) {
-      writer.write(trace);
+
+    @BeforeEach
+    void resetProcessTags() {
+        // Sync ProcessTags.enabled with the current Config (which may be modified by @WithConfig)
+        ProcessTags.reset(Config.get());
     }
-    phaser.awaitAdvanceInterruptibly(phaser.arriveAndDeregister());
-
-    verify(discovery, times(2)).getTraceEndpoint();
-    verify(healthMetrics, times(1)).onSerialize(anyInt());
-    verify(api, times(1)).sendSerializedTraces(argThat(payload -> payload.traceCount() == 5));
-    // _ * healthMetrics.onPublish(_, _) means any number, so don't verify count
-    verify(healthMetrics).onSend(anyInt(), anyInt(), any());
-    verifyNoMoreInteractions(api, discovery);
-
-    writer.close();
-  }
-
-  @Timeout(value = 30, unit = TimeUnit.SECONDS)
-  @WithConfig(key = EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, value = "false")
-  @TableTest({
-    "scenario | agentVersion ",
-    "v0.3     | 'v0.3/traces'",
-    "v0.4     | 'v0.4/traces'",
-    "v0.5     | 'v0.5/traces'"
-  })
-  void testDefaultBufferSizeFor(String agentVersion) {
-    // setup: disable process tags since they are only written on the first span
-    // and it will break the trace size estimation
-    List<DDSpan> minimalTrace = createMinimalTrace();
-    DDAgentApi api = mock(DDAgentApi.class);
-    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-    DDAgentWriter writer =
-        DDAgentWriter.builder()
-            .featureDiscovery(discovery)
-            .agentApi(api)
-            .traceBufferSize(AGENT_WRITER_BUFFER_SIZE)
-            .prioritization(ENSURE_TRACE)
-            .monitoring(monitoring)
-            .flushIntervalMilliseconds(-1)
-            .build();
-    writer.start();
-
-    TraceMapper mapper =
-        agentVersion.equals("v0.5/traces") ? new TraceMapperV0_5() : new TraceMapperV0_4();
-    // The first trace of a payload is larger: it carries the payload-scoped _dd.sdk.otlp_export
-    // marker on its first span. Size both cases so the overflow point is exact.
-    int firstTraceSize = calculateSize(minimalTrace, mapper, true);
-    int traceSize = calculateSize(minimalTrace, mapper, false);
-    int maxedPayloadTraceCount = 1 + (mapper.messageBufferSize() - firstTraceSize) / traceSize;
-
-    when(discovery.getTraceEndpoint()).thenReturn(agentVersion);
-    when(api.sendSerializedTraces(
-            argThat(payload -> payload != null && payload.traceCount() == maxedPayloadTraceCount)))
-        .thenReturn(RemoteApi.Response.success(200));
-    when(api.sendSerializedTraces(argThat(payload -> payload != null && payload.traceCount() == 1)))
-        .thenReturn(RemoteApi.Response.success(200));
-
-    for (int i = 0; i <= maxedPayloadTraceCount; i++) {
-      writer.write(minimalTrace);
+
+    List<DDSpan> createMinimalTrace() {
+        // Use buildSpan from DDCoreJavaSpecification to create a real DDSpan with minimal fields
+        DDSpan span = buildSpan(0L, "", Collections.emptyMap());
+        return Collections.singletonList(span);
     }
-    writer.flush();
-
-    verify(discovery, times(2)).getTraceEndpoint();
-    verify(api, times(1))
-        .sendSerializedTraces(
-            argThat(payload -> payload != null && payload.traceCount() == maxedPayloadTraceCount));
-    verify(api, times(1))
-        .sendSerializedTraces(argThat(payload -> payload != null && payload.traceCount() == 1));
-    verifyNoMoreInteractions(api, discovery);
-
-    writer.close();
-  }
-
-  @Test
-  void checkThatThereAreNoInteractionsAfterClose() {
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    DDAgentApi api = mock(DDAgentApi.class);
-    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-    DDAgentWriter writer =
-        DDAgentWriter.builder()
-            .featureDiscovery(discovery)
-            .agentApi(api)
-            .healthMetrics(healthMetrics)
-            .monitoring(monitoring)
-            .build();
-    writer.start();
-    // Clear invocations from start() (Spock only counts interactions in when: blocks)
-    clearInvocations(healthMetrics, api, discovery);
-
-    writer.close();
-    writer.write(Collections.emptyList());
-    writer.flush();
-
-    // then: this will be checked during flushing
-    verify(healthMetrics, times(1)).onFailedPublish(anyInt(), anyInt());
-    verify(healthMetrics, times(1)).onFlush(any(Boolean.class));
-    verify(healthMetrics, times(1)).onShutdown(any(Boolean.class));
-    verify(healthMetrics, times(1)).close();
-    verifyNoMoreInteractions(healthMetrics, api, discovery);
-
-    writer.close();
-  }
-
-  @TableTest({
-    "scenario | agentVersion ",
-    "v0.3     | 'v0.3/traces'",
-    "v0.4     | 'v0.4/traces'",
-    "v0.5     | 'v0.5/traces'"
-  })
-  void monitorHappyPath(String agentVersion) {
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    List<DDSpan> minimalTrace = createMinimalTrace();
-
-    // DQH -- need to set-up a dummy agent for the final send callback to work
-    try (JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            server ->
-                server.handlers(
-                    h -> h.put(agentVersion, api -> api.getResponse().status(200).send())))) {
-      HttpUrl agentUrl = HttpUrl.get(agent.getAddress());
-      okhttp3.OkHttpClient client = OkHttpUtils.buildHttpClient(agentUrl, 1000);
-      DDAgentFeaturesDiscovery discovery =
-          new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, V0_5, true, false);
-      DDAgentApi api = new DDAgentApi(client, agentUrl, discovery, monitoring, true);
-      DDAgentWriter writer =
-          DDAgentWriter.builder()
-              .featureDiscovery(discovery)
-              .agentApi(api)
-              .monitoring(monitoring)
-              .healthMetrics(healthMetrics)
-              .build();
-
-      // start
-      writer.start();
-
-      verify(healthMetrics, times(1)).onStart((int) writer.getCapacity());
-
-      // write and flush
-      writer.write(minimalTrace);
-      writer.flush();
-
-      verify(healthMetrics, times(1)).onPublish(any(), anyInt());
-      verify(healthMetrics, times(1)).onSerialize(anyInt());
-      verify(healthMetrics, times(1)).onFlush(false);
-      verify(healthMetrics, times(1))
-          .onSend(
-              anyInt(),
-              anyInt(),
-              argThat(
-                  response ->
-                      response.success()
-                          && response.status().isPresent()
-                          && response.status().getAsInt() == 200));
-
-      writer.close();
-
-      verify(healthMetrics, times(1)).onShutdown(true);
+
+    @Test
+    void noInteractionsBecauseOfInitialFlush() {
+        DDAgentApi api = Mockito.mock(DDAgentApi.class);
+        DDAgentWriter writer = DDAgentWriter.builder()
+                .agentApi(api)
+                .traceBufferSize(8)
+                .monitoring(monitoring)
+                .flushIntervalMilliseconds(-1)
+                .build();
+        writer.start();
+
+        writer.flush();
+
+        // then: 0 * _ (no interactions at all on mocked api)
+        verifyNoMoreInteractions(api);
+
+        writer.close();
     }
-  }
-
-  @TableTest({
-    "scenario | agentVersion ",
-    "v0.3     | 'v0.3/traces'",
-    "v0.4     | 'v0.4/traces'",
-    "v0.5     | 'v0.5/traces'"
-  })
-  void monitorAgentReturnsError(String agentVersion) {
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    List<DDSpan> minimalTrace = createMinimalTrace();
-
-    // DQH -- need to set-up a dummy agent for the final send callback to work
-    try (JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            server ->
-                server.handlers(
-                    h -> h.put(agentVersion, api -> api.getResponse().status(500).send())))) {
-      HttpUrl agentUrl = HttpUrl.get(agent.getAddress());
-      okhttp3.OkHttpClient client = OkHttpUtils.buildHttpClient(agentUrl, 1000);
-      DDAgentFeaturesDiscovery discovery =
-          new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, V0_5, true, false);
-      DDAgentApi api = new DDAgentApi(client, agentUrl, discovery, monitoring, true);
-      DDAgentWriter writer =
-          DDAgentWriter.builder()
-              .featureDiscovery(discovery)
-              .agentApi(api)
-              .monitoring(monitoring)
-              .healthMetrics(healthMetrics)
-              .build();
-
-      // start
-      writer.start();
-
-      verify(healthMetrics, times(1)).onStart((int) writer.getCapacity());
-
-      // write and flush
-      writer.write(minimalTrace);
-      writer.flush();
-
-      verify(healthMetrics, times(1)).onPublish(any(), anyInt());
-      verify(healthMetrics, times(1)).onSerialize(anyInt());
-      verify(healthMetrics, times(1)).onFlush(false);
-      verify(healthMetrics, times(1))
-          .onFailedSend(
-              anyInt(),
-              anyInt(),
-              argThat(
-                  response ->
-                      !response.success()
-                          && response.status().isPresent()
-                          && response.status().getAsInt() == 500));
-
-      writer.close();
-
-      verify(healthMetrics, times(1)).onShutdown(true);
+
+    @TableTest({
+      "scenario | agentVersion ",
+      "v0.3     | 'v0.3/traces'",
+      "v0.4     | 'v0.4/traces'",
+      "v0.5     | 'v0.5/traces'"
+    })
+    void testHappyPath(String agentVersion) {
+        DDAgentApi api = mock(DDAgentApi.class);
+        DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+        DDAgentWriter writer = DDAgentWriter.builder()
+                .featureDiscovery(discovery)
+                .agentApi(api)
+                .traceBufferSize(1024)
+                .monitoring(monitoring)
+                .flushIntervalMilliseconds(-1)
+                .build();
+        writer.start();
+        DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start();
+        List<DDSpan> trace = Collections.singletonList(span);
+
+        when(discovery.getTraceEndpoint()).thenReturn(agentVersion);
+        when(api.sendSerializedTraces(argThat(payload -> payload.traceCount() == 2)))
+                .thenReturn(RemoteApi.Response.success(200));
+
+        writer.write(trace);
+        writer.write(trace);
+        writer.flush();
+
+        verify(discovery, times(2)).getTraceEndpoint();
+        verify(api, times(1)).sendSerializedTraces(argThat(payload -> payload.traceCount() == 2));
+        verifyNoMoreInteractions(api, discovery);
+
+        writer.close();
     }
-  }
-
-  @Test
-  @WithConfig(key = JDK_SOCKET_ENABLED, value = "true")
-  @EnabledForJreRange(min = JAVA_16)
-  @EnabledOnOs({LINUX, MAC})
-  void unixSocketTimeoutKeepsWorkerAliveAndReconnects() throws Exception {
-    assertTrue(Config.get().isJdkSocketEnabled());
-
-    Path socketPath = Files.createTempFile("dd-trace-agent-", ".sock");
-    Files.delete(socketPath);
-
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    AtomicReference<Thread> failedSendThread = new AtomicReference<>();
-    AtomicReference<Thread> successfulSendThread = new AtomicReference<>();
-    CountDownLatch failedSend = new CountDownLatch(1);
-    CountDownLatch successfulSend = new CountDownLatch(1);
-    doAnswer(
-            invocation -> {
-              failedSendThread.set(Thread.currentThread());
-              failedSend.countDown();
-              return null;
-            })
-        .when(healthMetrics)
-        .onFailedSend(anyInt(), anyInt(), any());
-    doAnswer(
-            invocation -> {
-              successfulSendThread.set(Thread.currentThread());
-              successfulSend.countDown();
-              return null;
-            })
-        .when(healthMetrics)
-        .onSend(anyInt(), anyInt(), any());
-
-    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-    when(discovery.getTraceEndpoint()).thenReturn("v0.4/traces");
-
-    try (MockWebServer server = new MockWebServer();
-        DDAgentWriter writer =
-            DDAgentWriter.builder()
+
+    @TableTest({
+      "scenario | agentVersion ",
+      "v0.3     | 'v0.3/traces'",
+      "v0.4     | 'v0.4/traces'",
+      "v0.5     | 'v0.5/traces'"
+    })
+    void testFloodOfTraces(String agentVersion) {
+        // bufferSize = 1024; traceCount = 100 (shouldn't trigger payload, but bigger than disruptor
+        // size)
+        int bufferSize = 1024;
+        int traceCount = 100;
+
+        DDAgentApi api = mock(DDAgentApi.class);
+        DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+        DDAgentWriter writer = DDAgentWriter.builder()
                 .featureDiscovery(discovery)
-                .unixDomainSocket(socketPath.toString())
-                .timeoutMillis(500)
+                .agentApi(api)
+                .traceBufferSize(bufferSize)
                 .monitoring(monitoring)
+                .flushIntervalMilliseconds(-1)
+                .build();
+        writer.start();
+        DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start();
+        List<DDSpan> trace = Collections.singletonList(span);
+
+        when(discovery.getTraceEndpoint()).thenReturn(agentVersion);
+        when(api.sendSerializedTraces(argThat(payload -> payload.traceCount() <= traceCount)))
+                .thenReturn(RemoteApi.Response.success(200));
+
+        for (int i = 1; i <= traceCount; i++) {
+            writer.write(trace);
+        }
+        writer.flush();
+
+        verify(discovery, times(2)).getTraceEndpoint();
+        verify(api, times(1)).sendSerializedTraces(argThat(payload -> payload.traceCount() <= traceCount));
+        verifyNoMoreInteractions(api, discovery);
+
+        writer.close();
+    }
+
+    @TableTest({
+      "scenario | agentVersion ",
+      "v0.3     | 'v0.3/traces'",
+      "v0.4     | 'v0.4/traces'",
+      "v0.5     | 'v0.5/traces'"
+    })
+    void testFlushByTime(String agentVersion) throws Exception {
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        DDAgentApi api = mock(DDAgentApi.class);
+        DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+        DDAgentWriter writer = DDAgentWriter.builder()
+                .featureDiscovery(discovery)
+                .agentApi(api)
                 .healthMetrics(healthMetrics)
-                .flushIntervalMilliseconds(10)
-                .flushTimeout(5, TimeUnit.SECONDS)
-                .build()) {
-      server.setServerSocketFactory(new UnixDomainServerSocketFactory(socketPath.toFile()));
-      // Read the first request fully, then withhold the response to trigger a header-read timeout.
-      server.enqueue(new MockResponse().setSocketPolicy(NO_RESPONSE));
-      server.enqueue(new MockResponse().setResponseCode(200).setSocketPolicy(DISCONNECT_AT_END));
-      server.start();
-
-      writer.start();
-
-      writer.write(createMinimalTrace());
-      assertTrue(
-          failedSend.await(5, TimeUnit.SECONDS), "The periodic flush did not report failure");
-
-      RecordedRequest failedRequest = server.takeRequest(5, TimeUnit.SECONDS);
-      assertNotNull(failedRequest);
-      assertEquals(0, failedRequest.getSequenceNumber());
-      assertEquals(1, server.getRequestCount());
-      verify(healthMetrics, times(1)).onFailedSend(anyInt(), anyInt(), any());
-
-      writer.write(createMinimalTrace());
-      assertTrue(
-          successfulSend.await(5, TimeUnit.SECONDS), "The worker did not send the next payload");
-
-      RecordedRequest successfulRequest = server.takeRequest(5, TimeUnit.SECONDS);
-      assertNotNull(successfulRequest);
-      // Sequence numbers are per connection; zero again proves that this used a fresh socket.
-      assertEquals(0, successfulRequest.getSequenceNumber());
-      assertEquals(2, server.getRequestCount());
-      verify(healthMetrics, times(1)).onSend(anyInt(), anyInt(), any());
-      assertSame(failedSendThread.get(), successfulSendThread.get());
-    } finally {
-      Files.deleteIfExists(socketPath);
+                .monitoring(monitoring)
+                .flushIntervalMilliseconds(1000)
+                .build();
+        writer.start();
+        DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start();
+        List<DDSpan> trace = Collections.nCopies(10, span);
+
+        when(discovery.getTraceEndpoint()).thenReturn(agentVersion);
+        when(api.sendSerializedTraces(argThat(payload -> payload.traceCount() == 5)))
+                .thenReturn(RemoteApi.Response.success(200));
+
+        // stub onSend to arrive at phaser
+        doAnswer(invocation -> {
+                    phaser.arrive();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onSend(anyInt(), anyInt(), any());
+
+        for (int i = 1; i <= 5; i++) {
+            writer.write(trace);
+        }
+        phaser.awaitAdvanceInterruptibly(phaser.arriveAndDeregister());
+
+        verify(discovery, times(2)).getTraceEndpoint();
+        verify(healthMetrics, times(1)).onSerialize(anyInt());
+        verify(api, times(1)).sendSerializedTraces(argThat(payload -> payload.traceCount() == 5));
+        // _ * healthMetrics.onPublish(_, _) means any number, so don't verify count
+        verify(healthMetrics).onSend(anyInt(), anyInt(), any());
+        verifyNoMoreInteractions(api, discovery);
+
+        writer.close();
+    }
+
+    @Timeout(value = 30, unit = TimeUnit.SECONDS)
+    @WithConfig(key = EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, value = "false")
+    @TableTest({
+      "scenario | agentVersion ",
+      "v0.3     | 'v0.3/traces'",
+      "v0.4     | 'v0.4/traces'",
+      "v0.5     | 'v0.5/traces'"
+    })
+    void testDefaultBufferSizeFor(String agentVersion) {
+        // setup: disable process tags since they are only written on the first span
+        // and it will break the trace size estimation
+        List<DDSpan> minimalTrace = createMinimalTrace();
+        DDAgentApi api = mock(DDAgentApi.class);
+        DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+        DDAgentWriter writer = DDAgentWriter.builder()
+                .featureDiscovery(discovery)
+                .agentApi(api)
+                .traceBufferSize(AGENT_WRITER_BUFFER_SIZE)
+                .prioritization(ENSURE_TRACE)
+                .monitoring(monitoring)
+                .flushIntervalMilliseconds(-1)
+                .build();
+        writer.start();
+
+        TraceMapper mapper = agentVersion.equals("v0.5/traces") ? new TraceMapperV0_5() : new TraceMapperV0_4();
+        // The first trace of a payload is larger: it carries the payload-scoped _dd.sdk.otlp_export
+        // marker on its first span. Size both cases so the overflow point is exact.
+        int firstTraceSize = calculateSize(minimalTrace, mapper, true);
+        int traceSize = calculateSize(minimalTrace, mapper, false);
+        int maxedPayloadTraceCount = 1 + (mapper.messageBufferSize() - firstTraceSize) / traceSize;
+
+        when(discovery.getTraceEndpoint()).thenReturn(agentVersion);
+        when(api.sendSerializedTraces(
+                        argThat(payload -> payload != null && payload.traceCount() == maxedPayloadTraceCount)))
+                .thenReturn(RemoteApi.Response.success(200));
+        when(api.sendSerializedTraces(argThat(payload -> payload != null && payload.traceCount() == 1)))
+                .thenReturn(RemoteApi.Response.success(200));
+
+        for (int i = 0; i <= maxedPayloadTraceCount; i++) {
+            writer.write(minimalTrace);
+        }
+        writer.flush();
+
+        verify(discovery, times(2)).getTraceEndpoint();
+        verify(api, times(1))
+                .sendSerializedTraces(
+                        argThat(payload -> payload != null && payload.traceCount() == maxedPayloadTraceCount));
+        verify(api, times(1)).sendSerializedTraces(argThat(payload -> payload != null && payload.traceCount() == 1));
+        verifyNoMoreInteractions(api, discovery);
+
+        writer.close();
+    }
+
+    @Test
+    void checkThatThereAreNoInteractionsAfterClose() {
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        DDAgentApi api = mock(DDAgentApi.class);
+        DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+        DDAgentWriter writer = DDAgentWriter.builder()
+                .featureDiscovery(discovery)
+                .agentApi(api)
+                .healthMetrics(healthMetrics)
+                .monitoring(monitoring)
+                .build();
+        writer.start();
+        // Clear invocations from start() (Spock only counts interactions in when: blocks)
+        clearInvocations(healthMetrics, api, discovery);
+
+        writer.close();
+        writer.write(Collections.emptyList());
+        writer.flush();
+
+        // then: this will be checked during flushing
+        verify(healthMetrics, times(1)).onFailedPublish(anyInt(), anyInt());
+        verify(healthMetrics, times(1)).onFlush(any(Boolean.class));
+        verify(healthMetrics, times(1)).onShutdown(any(Boolean.class));
+        verify(healthMetrics, times(1)).close();
+        verifyNoMoreInteractions(healthMetrics, api, discovery);
+
+        writer.close();
+    }
+
+    @TableTest({
+      "scenario | agentVersion ",
+      "v0.3     | 'v0.3/traces'",
+      "v0.4     | 'v0.4/traces'",
+      "v0.5     | 'v0.5/traces'"
+    })
+    void monitorHappyPath(String agentVersion) {
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        List<DDSpan> minimalTrace = createMinimalTrace();
+
+        // DQH -- need to set-up a dummy agent for the final send callback to work
+        try (JavaTestHttpServer agent = JavaTestHttpServer.httpServer(server -> server.handlers(
+                h -> h.put(agentVersion, api -> api.getResponse().status(200).send())))) {
+            HttpUrl agentUrl = HttpUrl.get(agent.getAddress());
+            okhttp3.OkHttpClient client = OkHttpUtils.buildHttpClient(agentUrl, 1000);
+            DDAgentFeaturesDiscovery discovery =
+                    new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, V0_5, true, false);
+            DDAgentApi api = new DDAgentApi(client, agentUrl, discovery, monitoring, true);
+            DDAgentWriter writer = DDAgentWriter.builder()
+                    .featureDiscovery(discovery)
+                    .agentApi(api)
+                    .monitoring(monitoring)
+                    .healthMetrics(healthMetrics)
+                    .build();
+
+            // start
+            writer.start();
+
+            verify(healthMetrics, times(1)).onStart((int) writer.getCapacity());
+
+            // write and flush
+            writer.write(minimalTrace);
+            writer.flush();
+
+            verify(healthMetrics, times(1)).onPublish(any(), anyInt());
+            verify(healthMetrics, times(1)).onSerialize(anyInt());
+            verify(healthMetrics, times(1)).onFlush(false);
+            verify(healthMetrics, times(1))
+                    .onSend(
+                            anyInt(),
+                            anyInt(),
+                            argThat(response -> response.success()
+                                    && response.status().isPresent()
+                                    && response.status().getAsInt() == 200));
+
+            writer.close();
+
+            verify(healthMetrics, times(1)).onShutdown(true);
+        }
     }
-  }
-
-  @TableTest({
-    "scenario | agentVersion ",
-    "v0.3     | 'v0.3/traces'",
-    "v0.4     | 'v0.4/traces'",
-    "v0.5     | 'v0.5/traces'"
-  })
-  void unreachableAgentTest(String agentVersion) {
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    List<DDSpan> minimalTrace = createMinimalTrace();
-    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-    when(discovery.getTraceEndpoint()).thenReturn(agentVersion);
-    DDAgentApi api = mock(DDAgentApi.class);
-    // simulating a communication failure to a server
-    when(api.sendSerializedTraces(any()))
-        .thenReturn(RemoteApi.Response.failed(new IOException("comm error")));
-
-    DDAgentWriter writer =
-        DDAgentWriter.builder()
-            .featureDiscovery(discovery)
-            .agentApi(api)
-            .monitoring(monitoring)
-            .healthMetrics(healthMetrics)
-            .build();
-
-    // start
-    writer.start();
-
-    verify(healthMetrics, times(1)).onStart((int) writer.getCapacity());
-
-    // write and flush
-    writer.write(minimalTrace);
-    writer.flush();
-
-    // then: if we know there's no agent, we'll drop the traces before serialising them
-    // but we also know that there's nowhere to send health metrics to
-    verify(healthMetrics, times(1)).onPublish(any(), anyInt());
-    verify(healthMetrics, times(1)).onFlush(false);
-
-    writer.close();
-
-    verify(healthMetrics, times(1)).onShutdown(true);
-  }
-
-  @Flaky("If execution is too slow, the http client timeout may trigger")
-  @TableTest({
-    "scenario | agentVersion ",
-    "v0.3     | 'v0.3/traces'",
-    "v0.4     | 'v0.4/traces'",
-    "v0.5     | 'v0.5/traces'"
-  })
-  void slowResponseTest(String agentVersion) throws Exception {
-    int numWritten = 0;
-    AtomicInteger numFlushes = new AtomicInteger(0);
-    AtomicInteger numPublished = new AtomicInteger(0);
-    AtomicInteger numFailedPublish = new AtomicInteger(0);
-    AtomicInteger numRequests = new AtomicInteger(0);
-    AtomicInteger numFailedRequests = new AtomicInteger(0);
-
-    Semaphore responseSemaphore = new Semaphore(1);
-
-    // Need to set-up a dummy agent for the final send callback to work
-    JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            server ->
-                server.handlers(
-                    h ->
-                        h.put(
-                            agentVersion,
-                            api -> {
-                              responseSemaphore.acquire();
-                              try {
-                                api.getResponse().status(200).send();
-                              } finally {
-                                responseSemaphore.release();
-                              }
-                            })));
-
-    // This test focuses just on failed publish, so not verifying every callback
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    doAnswer(
-            invocation -> {
-              numPublished.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onPublish(any(), anyInt());
-    doAnswer(
-            invocation -> {
-              numFailedPublish.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onFailedPublish(anyInt(), anyInt());
-    doAnswer(
-            invocation -> {
-              numFlushes.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onFlush(any(Boolean.class));
-    doAnswer(
-            invocation -> {
-              numRequests.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onSend(anyInt(), anyInt(), any());
-    doAnswer(
-            invocation -> {
-              numFailedRequests.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onFailedSend(anyInt(), anyInt(), any());
-
-    int bufferSize = 16;
-    List<DDSpan> minimalTrace = createMinimalTrace();
-    DDAgentWriter writer =
-        DDAgentWriter.builder()
-            .traceAgentProtocolVersion(V0_5)
-            .traceAgentPort(agent.getAddress().getPort())
-            .monitoring(monitoring)
-            .healthMetrics(healthMetrics)
-            .traceBufferSize(bufferSize)
-            .build();
-    writer.start();
-
-    // gate responses
-    responseSemaphore.acquire();
-
-    try {
-      // when: write a single trace and flush
-      // with responseSemaphore held, the response is blocked but may still time out
-      writer.write(minimalTrace);
-      numWritten += 1;
-
-      // sanity check coordination mechanism of test
-      // release to allow response to be generated
-      responseSemaphore.release();
-      writer.flush();
-
-      // reacquire semaphore to stall further responses
-      responseSemaphore.acquire();
-
-      assertEquals(0, numFailedPublish.get());
-      assertEquals(numWritten, numPublished.get());
-      assertEquals(numWritten, numPublished.get() + numFailedPublish.get());
-      assertEquals(1, numFlushes.get());
-
-      // when: send many traces to fill the sender queue...
-      //   loop until outstanding requests > finished requests
-      while (writer.traceProcessingWorker.getRemainingCapacity() > 0
-          || numFailedPublish.get() == 0) {
-        writer.write(minimalTrace);
-        numWritten += 1;
-      }
 
-      assertTrue(numFailedPublish.get() > 0);
-      assertEquals(numWritten, numPublished.get() + numFailedPublish.get());
+    @TableTest({
+      "scenario | agentVersion ",
+      "v0.3     | 'v0.3/traces'",
+      "v0.4     | 'v0.4/traces'",
+      "v0.5     | 'v0.5/traces'"
+    })
+    void monitorAgentReturnsError(String agentVersion) {
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        List<DDSpan> minimalTrace = createMinimalTrace();
+
+        // DQH -- need to set-up a dummy agent for the final send callback to work
+        try (JavaTestHttpServer agent = JavaTestHttpServer.httpServer(server -> server.handlers(
+                h -> h.put(agentVersion, api -> api.getResponse().status(500).send())))) {
+            HttpUrl agentUrl = HttpUrl.get(agent.getAddress());
+            okhttp3.OkHttpClient client = OkHttpUtils.buildHttpClient(agentUrl, 1000);
+            DDAgentFeaturesDiscovery discovery =
+                    new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, V0_5, true, false);
+            DDAgentApi api = new DDAgentApi(client, agentUrl, discovery, monitoring, true);
+            DDAgentWriter writer = DDAgentWriter.builder()
+                    .featureDiscovery(discovery)
+                    .agentApi(api)
+                    .monitoring(monitoring)
+                    .healthMetrics(healthMetrics)
+                    .build();
+
+            // start
+            writer.start();
+
+            verify(healthMetrics, times(1)).onStart((int) writer.getCapacity());
+
+            // write and flush
+            writer.write(minimalTrace);
+            writer.flush();
+
+            verify(healthMetrics, times(1)).onPublish(any(), anyInt());
+            verify(healthMetrics, times(1)).onSerialize(anyInt());
+            verify(healthMetrics, times(1)).onFlush(false);
+            verify(healthMetrics, times(1))
+                    .onFailedSend(
+                            anyInt(),
+                            anyInt(),
+                            argThat(response -> !response.success()
+                                    && response.status().isPresent()
+                                    && response.status().getAsInt() == 500));
+
+            writer.close();
+
+            verify(healthMetrics, times(1)).onShutdown(true);
+        }
+    }
 
-      // with both disruptor & queue full, should reject everything
-      int expectedRejects = 100;
-      for (int i = 1; i <= expectedRejects; i++) {
+    @Test
+    @WithConfig(key = JDK_SOCKET_ENABLED, value = "true")
+    @EnabledForJreRange(min = JAVA_16)
+    @EnabledOnOs({LINUX, MAC})
+    void unixSocketTimeoutKeepsWorkerAliveAndReconnects() throws Exception {
+        assertTrue(Config.get().isJdkSocketEnabled());
+
+        Path socketPath = Files.createTempFile("dd-trace-agent-", ".sock");
+        Files.delete(socketPath);
+
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        AtomicReference<Thread> failedSendThread = new AtomicReference<>();
+        AtomicReference<Thread> successfulSendThread = new AtomicReference<>();
+        CountDownLatch failedSend = new CountDownLatch(1);
+        CountDownLatch successfulSend = new CountDownLatch(1);
+        doAnswer(invocation -> {
+                    failedSendThread.set(Thread.currentThread());
+                    failedSend.countDown();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onFailedSend(anyInt(), anyInt(), any());
+        doAnswer(invocation -> {
+                    successfulSendThread.set(Thread.currentThread());
+                    successfulSend.countDown();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onSend(anyInt(), anyInt(), any());
+
+        DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+        when(discovery.getTraceEndpoint()).thenReturn("v0.4/traces");
+
+        try (MockWebServer server = new MockWebServer();
+                DDAgentWriter writer = DDAgentWriter.builder()
+                        .featureDiscovery(discovery)
+                        .unixDomainSocket(socketPath.toString())
+                        .timeoutMillis(500)
+                        .monitoring(monitoring)
+                        .healthMetrics(healthMetrics)
+                        .flushIntervalMilliseconds(10)
+                        .flushTimeout(5, TimeUnit.SECONDS)
+                        .build()) {
+            server.setServerSocketFactory(new UnixDomainServerSocketFactory(socketPath.toFile()));
+            // Read the first request fully, then withhold the response to trigger a header-read timeout.
+            server.enqueue(new MockResponse().setSocketPolicy(NO_RESPONSE));
+            server.enqueue(new MockResponse().setResponseCode(200).setSocketPolicy(DISCONNECT_AT_END));
+            server.start();
+
+            writer.start();
+
+            writer.write(createMinimalTrace());
+            assertTrue(failedSend.await(5, TimeUnit.SECONDS), "The periodic flush did not report failure");
+
+            RecordedRequest failedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+            assertNotNull(failedRequest);
+            assertEquals(0, failedRequest.getSequenceNumber());
+            assertEquals(1, server.getRequestCount());
+            verify(healthMetrics, times(1)).onFailedSend(anyInt(), anyInt(), any());
+
+            writer.write(createMinimalTrace());
+            assertTrue(successfulSend.await(5, TimeUnit.SECONDS), "The worker did not send the next payload");
+
+            RecordedRequest successfulRequest = server.takeRequest(5, TimeUnit.SECONDS);
+            assertNotNull(successfulRequest);
+            // Sequence numbers are per connection; zero again proves that this used a fresh socket.
+            assertEquals(0, successfulRequest.getSequenceNumber());
+            assertEquals(2, server.getRequestCount());
+            verify(healthMetrics, times(1)).onSend(anyInt(), anyInt(), any());
+            assertSame(failedSendThread.get(), successfulSendThread.get());
+        } finally {
+            Files.deleteIfExists(socketPath);
+        }
+    }
+
+    @TableTest({
+      "scenario | agentVersion ",
+      "v0.3     | 'v0.3/traces'",
+      "v0.4     | 'v0.4/traces'",
+      "v0.5     | 'v0.5/traces'"
+    })
+    void unreachableAgentTest(String agentVersion) {
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        List<DDSpan> minimalTrace = createMinimalTrace();
+        DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+        when(discovery.getTraceEndpoint()).thenReturn(agentVersion);
+        DDAgentApi api = mock(DDAgentApi.class);
+        // simulating a communication failure to a server
+        when(api.sendSerializedTraces(any())).thenReturn(RemoteApi.Response.failed(new IOException("comm error")));
+
+        DDAgentWriter writer = DDAgentWriter.builder()
+                .featureDiscovery(discovery)
+                .agentApi(api)
+                .monitoring(monitoring)
+                .healthMetrics(healthMetrics)
+                .build();
+
+        // start
+        writer.start();
+
+        verify(healthMetrics, times(1)).onStart((int) writer.getCapacity());
+
+        // write and flush
         writer.write(minimalTrace);
-        numWritten += 1;
-      }
-
-      assertEquals(numWritten, numPublished.get() + numFailedPublish.get());
-    } finally {
-      responseSemaphore.release();
-      writer.close();
-      agent.close();
+        writer.flush();
+
+        // then: if we know there's no agent, we'll drop the traces before serialising them
+        // but we also know that there's nowhere to send health metrics to
+        verify(healthMetrics, times(1)).onPublish(any(), anyInt());
+        verify(healthMetrics, times(1)).onFlush(false);
+
+        writer.close();
+
+        verify(healthMetrics, times(1)).onShutdown(true);
     }
-  }
-
-  @TableTest({
-    "scenario | agentVersion ",
-    "v0.3     | 'v0.3/traces'",
-    "v0.4     | 'v0.4/traces'",
-    "v0.5     | 'v0.5/traces'"
-  })
-  void multiThreaded(String agentVersion) throws Exception {
-    AtomicInteger numPublished = new AtomicInteger(0);
-    AtomicInteger numFailedPublish = new AtomicInteger(0);
-    AtomicInteger numRepSent = new AtomicInteger(0);
-
-    List<DDSpan> minimalTrace = createMinimalTrace();
-
-    // Need to set-up a dummy agent for the final send callback to work
-    JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            server ->
-                server.handlers(
-                    h -> h.put(agentVersion, api -> api.getResponse().status(200).send())));
-
-    // This test focuses just on failed publish, so not verifying every callback
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    doAnswer(
-            invocation -> {
-              numPublished.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onPublish(any(), anyInt());
-    doAnswer(
-            invocation -> {
-              numFailedPublish.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onFailedPublish(anyInt(), anyInt());
-    doAnswer(
-            invocation -> {
-              int repCount = invocation.getArgument(0);
-              numRepSent.addAndGet(repCount);
-              return null;
-            })
-        .when(healthMetrics)
-        .onSend(anyInt(), anyInt(), any());
-
-    DDAgentWriter writer =
-        DDAgentWriter.builder()
-            .traceAgentProtocolVersion(V0_5)
-            .traceAgentPort(agent.getAddress().getPort())
-            .monitoring(monitoring)
-            .healthMetrics(healthMetrics)
-            .build();
-    writer.start();
-
-    try {
-      Runnable producer =
-          () -> {
-            for (int i = 1; i <= 100; i++) {
-              writer.write(minimalTrace);
+
+    @Flaky("If execution is too slow, the http client timeout may trigger")
+    @TableTest({
+      "scenario | agentVersion ",
+      "v0.3     | 'v0.3/traces'",
+      "v0.4     | 'v0.4/traces'",
+      "v0.5     | 'v0.5/traces'"
+    })
+    void slowResponseTest(String agentVersion) throws Exception {
+        int numWritten = 0;
+        AtomicInteger numFlushes = new AtomicInteger(0);
+        AtomicInteger numPublished = new AtomicInteger(0);
+        AtomicInteger numFailedPublish = new AtomicInteger(0);
+        AtomicInteger numRequests = new AtomicInteger(0);
+        AtomicInteger numFailedRequests = new AtomicInteger(0);
+
+        Semaphore responseSemaphore = new Semaphore(1);
+
+        // Need to set-up a dummy agent for the final send callback to work
+        JavaTestHttpServer agent =
+                JavaTestHttpServer.httpServer(server -> server.handlers(h -> h.put(agentVersion, api -> {
+                    responseSemaphore.acquire();
+                    try {
+                        api.getResponse().status(200).send();
+                    } finally {
+                        responseSemaphore.release();
+                    }
+                })));
+
+        // This test focuses just on failed publish, so not verifying every callback
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        doAnswer(invocation -> {
+                    numPublished.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onPublish(any(), anyInt());
+        doAnswer(invocation -> {
+                    numFailedPublish.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onFailedPublish(anyInt(), anyInt());
+        doAnswer(invocation -> {
+                    numFlushes.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onFlush(any(Boolean.class));
+        doAnswer(invocation -> {
+                    numRequests.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onSend(anyInt(), anyInt(), any());
+        doAnswer(invocation -> {
+                    numFailedRequests.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onFailedSend(anyInt(), anyInt(), any());
+
+        int bufferSize = 16;
+        List<DDSpan> minimalTrace = createMinimalTrace();
+        DDAgentWriter writer = DDAgentWriter.builder()
+                .traceAgentProtocolVersion(V0_5)
+                .traceAgentPort(agent.getAddress().getPort())
+                .monitoring(monitoring)
+                .healthMetrics(healthMetrics)
+                .traceBufferSize(bufferSize)
+                .build();
+        writer.start();
+
+        // gate responses
+        responseSemaphore.acquire();
+
+        try {
+            // when: write a single trace and flush
+            // with responseSemaphore held, the response is blocked but may still time out
+            writer.write(minimalTrace);
+            numWritten += 1;
+
+            // sanity check coordination mechanism of test
+            // release to allow response to be generated
+            responseSemaphore.release();
+            writer.flush();
+
+            // reacquire semaphore to stall further responses
+            responseSemaphore.acquire();
+
+            assertEquals(0, numFailedPublish.get());
+            assertEquals(numWritten, numPublished.get());
+            assertEquals(numWritten, numPublished.get() + numFailedPublish.get());
+            assertEquals(1, numFlushes.get());
+
+            // when: send many traces to fill the sender queue...
+            //   loop until outstanding requests > finished requests
+            while (writer.traceProcessingWorker.getRemainingCapacity() > 0 || numFailedPublish.get() == 0) {
+                writer.write(minimalTrace);
+                numWritten += 1;
             }
-          };
 
-      Thread t1 = new Thread(producer);
-      t1.start();
+            assertTrue(numFailedPublish.get() > 0);
+            assertEquals(numWritten, numPublished.get() + numFailedPublish.get());
 
-      Thread t2 = new Thread(producer);
-      t2.start();
+            // with both disruptor & queue full, should reject everything
+            int expectedRejects = 100;
+            for (int i = 1; i <= expectedRejects; i++) {
+                writer.write(minimalTrace);
+                numWritten += 1;
+            }
 
-      t1.join();
-      t2.join();
+            assertEquals(numWritten, numPublished.get() + numFailedPublish.get());
+        } finally {
+            responseSemaphore.release();
+            writer.close();
+            agent.close();
+        }
+    }
 
-      writer.flush();
+    @TableTest({
+      "scenario | agentVersion ",
+      "v0.3     | 'v0.3/traces'",
+      "v0.4     | 'v0.4/traces'",
+      "v0.5     | 'v0.5/traces'"
+    })
+    void multiThreaded(String agentVersion) throws Exception {
+        AtomicInteger numPublished = new AtomicInteger(0);
+        AtomicInteger numFailedPublish = new AtomicInteger(0);
+        AtomicInteger numRepSent = new AtomicInteger(0);
+
+        List<DDSpan> minimalTrace = createMinimalTrace();
+
+        // Need to set-up a dummy agent for the final send callback to work
+        JavaTestHttpServer agent = JavaTestHttpServer.httpServer(server -> server.handlers(
+                h -> h.put(agentVersion, api -> api.getResponse().status(200).send())));
+
+        // This test focuses just on failed publish, so not verifying every callback
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        doAnswer(invocation -> {
+                    numPublished.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onPublish(any(), anyInt());
+        doAnswer(invocation -> {
+                    numFailedPublish.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onFailedPublish(anyInt(), anyInt());
+        doAnswer(invocation -> {
+                    int repCount = invocation.getArgument(0);
+                    numRepSent.addAndGet(repCount);
+                    return null;
+                })
+                .when(healthMetrics)
+                .onSend(anyInt(), anyInt(), any());
+
+        DDAgentWriter writer = DDAgentWriter.builder()
+                .traceAgentProtocolVersion(V0_5)
+                .traceAgentPort(agent.getAddress().getPort())
+                .monitoring(monitoring)
+                .healthMetrics(healthMetrics)
+                .build();
+        writer.start();
+
+        try {
+            Runnable producer = () -> {
+                for (int i = 1; i <= 100; i++) {
+                    writer.write(minimalTrace);
+                }
+            };
+
+            Thread t1 = new Thread(producer);
+            t1.start();
+
+            Thread t2 = new Thread(producer);
+            t2.start();
+
+            t1.join();
+            t2.join();
+
+            writer.flush();
+
+            // then: conditions.eventually { assert numPublished.get() == 200 && numRepSent.get() == 200 }
+            int totalTraces = 100 + 100;
+            long deadline = System.currentTimeMillis() + 5000;
+            while (System.currentTimeMillis() < deadline) {
+                if (numPublished.get() == totalTraces && numRepSent.get() == totalTraces) {
+                    break;
+                }
+                Thread.sleep(50);
+            }
+            assertEquals(totalTraces, numPublished.get());
+            assertEquals(totalTraces, numRepSent.get());
+        } finally {
+            writer.close();
+            agent.close();
+        }
+    }
 
-      // then: conditions.eventually { assert numPublished.get() == 200 && numRepSent.get() == 200 }
-      int totalTraces = 100 + 100;
-      long deadline = System.currentTimeMillis() + 5000;
-      while (System.currentTimeMillis() < deadline) {
-        if (numPublished.get() == totalTraces && numRepSent.get() == totalTraces) {
-          break;
+    @TableTest({
+      "scenario | agentVersion ",
+      "v0.3     | 'v0.3/traces'",
+      "v0.4     | 'v0.4/traces'",
+      "v0.5     | 'v0.5/traces'"
+    })
+    void statsdSuccess(String agentVersion) {
+        AtomicInteger numTracesAccepted = new AtomicInteger(0);
+        AtomicInteger numRequests = new AtomicInteger(0);
+        AtomicInteger numResponses = new AtomicInteger(0);
+
+        List<DDSpan> minimalTrace = createMinimalTrace();
+
+        // Need to set-up a dummy agent for the final send callback to work
+        JavaTestHttpServer agent = JavaTestHttpServer.httpServer(server -> server.handlers(
+                h -> h.put(agentVersion, api -> api.getResponse().status(200).send())));
+
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        doAnswer(invocation -> {
+                    numTracesAccepted.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onPublish(any(), anyInt());
+        doAnswer(invocation -> {
+                    numRequests.incrementAndGet();
+                    numResponses.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onSend(anyInt(), anyInt(), any());
+        DDAgentWriter writer = DDAgentWriter.builder()
+                .agentHost(agent.getAddress().getHost())
+                .traceAgentProtocolVersion(V0_5)
+                .traceAgentPort(agent.getAddress().getPort())
+                .monitoring(monitoring)
+                .healthMetrics(healthMetrics)
+                .build();
+        writer.start();
+
+        try {
+            writer.write(minimalTrace);
+            writer.flush();
+
+            assertEquals(1, numTracesAccepted.get());
+            assertEquals(1, numRequests.get());
+            assertEquals(1, numResponses.get());
+        } finally {
+            agent.close();
+            writer.close();
         }
-        Thread.sleep(50);
-      }
-      assertEquals(totalTraces, numPublished.get());
-      assertEquals(totalTraces, numRepSent.get());
-    } finally {
-      writer.close();
-      agent.close();
     }
-  }
-
-  @TableTest({
-    "scenario | agentVersion ",
-    "v0.3     | 'v0.3/traces'",
-    "v0.4     | 'v0.4/traces'",
-    "v0.5     | 'v0.5/traces'"
-  })
-  void statsdSuccess(String agentVersion) {
-    AtomicInteger numTracesAccepted = new AtomicInteger(0);
-    AtomicInteger numRequests = new AtomicInteger(0);
-    AtomicInteger numResponses = new AtomicInteger(0);
-
-    List<DDSpan> minimalTrace = createMinimalTrace();
-
-    // Need to set-up a dummy agent for the final send callback to work
-    JavaTestHttpServer agent =
-        JavaTestHttpServer.httpServer(
-            server ->
-                server.handlers(
-                    h -> h.put(agentVersion, api -> api.getResponse().status(200).send())));
-
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    doAnswer(
-            invocation -> {
-              numTracesAccepted.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onPublish(any(), anyInt());
-    doAnswer(
-            invocation -> {
-              numRequests.incrementAndGet();
-              numResponses.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onSend(anyInt(), anyInt(), any());
-    DDAgentWriter writer =
-        DDAgentWriter.builder()
-            .agentHost(agent.getAddress().getHost())
-            .traceAgentProtocolVersion(V0_5)
-            .traceAgentPort(agent.getAddress().getPort())
-            .monitoring(monitoring)
-            .healthMetrics(healthMetrics)
-            .build();
-    writer.start();
-
-    try {
-      writer.write(minimalTrace);
-      writer.flush();
-
-      assertEquals(1, numTracesAccepted.get());
-      assertEquals(1, numRequests.get());
-      assertEquals(1, numResponses.get());
-    } finally {
-      agent.close();
-      writer.close();
+
+    @Test
+    void statsdCommFailure() throws Exception {
+        List<DDSpan> minimalTrace = createMinimalTrace();
+
+        DDAgentApi api = Mockito.mock(DDAgentApi.class);
+        when(api.sendSerializedTraces(any())).thenReturn(RemoteApi.Response.failed(new IOException("comm error")));
+
+        CountDownLatch latch = new CountDownLatch(2);
+        StatsDClient statsd = mock(StatsDClient.class);
+        TracerHealthMetrics healthMetrics = new TracerHealthMetrics(statsd, 100, TimeUnit.MILLISECONDS);
+        DDAgentWriter writer = DDAgentWriter.builder()
+                .traceAgentProtocolVersion(V0_5)
+                .agentApi(api)
+                .monitoring(monitoring)
+                .healthMetrics(healthMetrics)
+                .build();
+        healthMetrics.start();
+        writer.start();
+
+        // stub statsd.count for latch coordination - called with varargs String... tags
+        doAnswer(invocation -> {
+                    latch.countDown();
+                    return null;
+                })
+                .when(statsd)
+                .count(anyString(), anyLong());
+
+        writer.write(minimalTrace);
+        writer.flush();
+        latch.await(10, TimeUnit.SECONDS);
+
+        verify(statsd, times(1)).count("api.requests.total", 1L);
+        verify(statsd, times(0)).incrementCounter("api.responses.total");
+        verify(statsd, times(1)).count("api.errors.total", 1L);
+
+        writer.close();
+        healthMetrics.close();
     }
-  }
-
-  @Test
-  void statsdCommFailure() throws Exception {
-    List<DDSpan> minimalTrace = createMinimalTrace();
-
-    DDAgentApi api = Mockito.mock(DDAgentApi.class);
-    when(api.sendSerializedTraces(any()))
-        .thenReturn(RemoteApi.Response.failed(new IOException("comm error")));
-
-    CountDownLatch latch = new CountDownLatch(2);
-    StatsDClient statsd = mock(StatsDClient.class);
-    TracerHealthMetrics healthMetrics = new TracerHealthMetrics(statsd, 100, TimeUnit.MILLISECONDS);
-    DDAgentWriter writer =
-        DDAgentWriter.builder()
-            .traceAgentProtocolVersion(V0_5)
-            .agentApi(api)
-            .monitoring(monitoring)
-            .healthMetrics(healthMetrics)
-            .build();
-    healthMetrics.start();
-    writer.start();
-
-    // stub statsd.count for latch coordination - called with varargs String... tags
-    doAnswer(
-            invocation -> {
-              latch.countDown();
-              return null;
-            })
-        .when(statsd)
-        .count(anyString(), anyLong());
-
-    writer.write(minimalTrace);
-    writer.flush();
-    latch.await(10, TimeUnit.SECONDS);
-
-    verify(statsd, times(1)).count("api.requests.total", 1L);
-    verify(statsd, times(0)).incrementCounter("api.responses.total");
-    verify(statsd, times(1)).count("api.errors.total", 1L);
-
-    writer.close();
-    healthMetrics.close();
-  }
-
-  /**
-   * Serialized size of {@code trace}, either as the first trace of a payload (which carries the
-   * payload-scoped markers on its first span) or as any later trace. Uses a throwaway mapper of the
-   * same kind so the caller's mapper keeps its state.
-   */
-  static int calculateSize(List<DDSpan> trace, TraceMapper mapper, boolean firstInPayload) {
-    AtomicInteger size = new AtomicInteger();
-    MsgPackWriter packer =
-        new MsgPackWriter(
-            new FlushingBuffer(
-                1024, (messageCount, buffer) -> size.set(buffer.limit() - buffer.position())));
-    TraceMapper sizingMapper =
-        mapper instanceof TraceMapperV0_5 ? new TraceMapperV0_5() : new TraceMapperV0_4();
-    if (!firstInPayload) {
-      // burn the payload-scoped markers on a throwaway trace
-      packer.format(trace, sizingMapper);
-      packer.flush();
+
+    /**
+     * Serialized size of {@code trace}, either as the first trace of a payload (which carries the
+     * payload-scoped markers on its first span) or as any later trace. Uses a throwaway mapper of the
+     * same kind so the caller's mapper keeps its state.
+     */
+    static int calculateSize(List<DDSpan> trace, TraceMapper mapper, boolean firstInPayload) {
+        AtomicInteger size = new AtomicInteger();
+        MsgPackWriter packer = new MsgPackWriter(
+                new FlushingBuffer(1024, (messageCount, buffer) -> size.set(buffer.limit() - buffer.position())));
+        TraceMapper sizingMapper = mapper instanceof TraceMapperV0_5 ? new TraceMapperV0_5() : new TraceMapperV0_4();
+        if (!firstInPayload) {
+            // burn the payload-scoped markers on a throwaway trace
+            packer.format(trace, sizingMapper);
+            packer.flush();
+        }
+        packer.format(trace, sizingMapper);
+        packer.flush();
+        return size.get();
     }
-    packer.format(trace, sizingMapper);
-    packer.flush();
-    return size.get();
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterTest.java
index ec781ff4131..86c4cfe375d 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterTest.java
@@ -34,192 +34,186 @@
 
 class DDAgentWriterTest extends DDCoreJavaSpecification {
 
-  HealthMetrics monitor = mock(HealthMetrics.class);
-  TraceProcessingWorker worker = mock(TraceProcessingWorker.class);
-  DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-  DDAgentApi api = mock(DDAgentApi.class);
-  MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, SECONDS);
-  PayloadDispatcherImpl dispatcher =
-      new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, monitor, monitoring);
-  DDAgentWriter writer = new DDAgentWriter(worker, dispatcher, monitor, 1, SECONDS, false);
-
-  // Only used to create spans
-  CoreTracer dummyTracer = tracerBuilder().writer(new ListWriter()).build();
-
-  @AfterEach
-  void cleanup() {
-    writer.close();
-    dummyTracer.close();
-  }
-
-  @Test
-  void testWriterBuilder() {
-    DDAgentWriter builtWriter = DDAgentWriter.builder().build();
-
-    assertNotNull(builtWriter);
-  }
-
-  @Test
-  void testWriterStart() {
-    int capacity = 5;
-
-    when(worker.getCapacity()).thenReturn(capacity);
-    writer.start();
-
-    verify(monitor).start();
-    verify(worker).start();
-    verify(worker).getCapacity();
-    verify(monitor).onStart(capacity);
-    verifyNoMoreInteractions(monitor, worker, discovery, api);
-  }
-
-  @Test
-  void testWriterStartClosed() {
-    writer.close();
-    clearInvocations(monitor, worker, discovery, api);
-
-    writer.start();
-
-    verifyNoMoreInteractions(monitor, worker, discovery, api);
-  }
-
-  @Test
-  void testWriterFlush() {
-    when(worker.flush(1, SECONDS)).thenReturn(true, false);
-
-    // first flush succeeds
-    writer.flush();
-
-    // monitor is notified
-    verify(worker).flush(1, SECONDS);
-    verify(monitor).onFlush(false);
-    verifyNoMoreInteractions(monitor, worker, discovery, api);
-
-    clearInvocations(monitor, worker, discovery, api);
-
-    // second flush returns false
-    writer.flush();
-
-    // no additional monitor notifications
-    verify(worker).flush(1, SECONDS);
-    verifyNoMoreInteractions(monitor, worker, discovery, api);
-  }
-
-  @Test
-  void testWriterFlushClosed() {
-    writer.close();
-    clearInvocations(monitor, worker, discovery, api);
-
-    writer.flush();
-
-    verifyNoMoreInteractions(monitor, worker, discovery, api);
-  }
-
-  @Test
-  void testWriterWritePublishSucceeds() {
-    List<DDSpan> trace =
-        Collections.singletonList(
-            (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start());
-
-    // publish succeeds
-    when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(ENQUEUED_FOR_SERIALIZATION);
-    writer.write(trace);
-
-    // monitor is notified of successful publication
-    verify(worker).publish(any(), anyInt(), eq(trace));
-    verify(monitor).onPublish(any(), anyInt());
-    verifyNoMoreInteractions(monitor, worker, discovery, api);
-  }
-
-  @Test
-  void testWriterWritePublishForSingleSpanSampling() {
-    List<DDSpan> trace =
-        Collections.singletonList(
-            (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start());
-
-    // publish succeeds (single span sampling)
-    when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(ENQUEUED_FOR_SINGLE_SPAN_SAMPLING);
-    writer.write(trace);
-
-    // monitor should not call onPublish for single span sampling
-    verify(worker).publish(any(), anyInt(), eq(trace));
-    verifyNoMoreInteractions(monitor, worker, discovery, api);
-  }
-
-  @TableTest({
-    "scenario                      | publishResult                      ",
-    "buffer overflow               | DROPPED_BUFFER_OVERFLOW            ",
-    "buffer overflow (sampled out) | DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT",
-    "dropped by policy             | DROPPED_BY_POLICY                  "
-  })
-  void testWriterWritePublishFails(PublishResult publishResult) {
-    List<DDSpan> trace =
-        Collections.singletonList(
-            (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start());
-
-    // publish fails
-    when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(publishResult);
-    writer.write(trace);
-
-    // monitor is notified of unsuccessful publication
-    verify(worker).publish(any(), anyInt(), eq(trace));
-    verify(monitor).onFailedPublish(anyInt(), anyInt());
-    verifyNoMoreInteractions(monitor, worker, discovery, api);
-  }
-
-  @Test
-  void testEmptyTracesShouldBeReportedAsFailures() {
-    // trace is empty
-    writer.write(Collections.emptyList());
-
-    // monitor is notified of unsuccessful publication
-    verify(monitor).onFailedPublish(anyInt(), anyInt());
-    verifyNoMoreInteractions(monitor, worker, discovery, api);
-  }
-
-  @Test
-  void testWriterWriteClosed() {
-    writer.close();
-    clearInvocations(monitor, worker, discovery, api);
-    List<DDSpan> trace =
-        Collections.singletonList(
-            (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start());
-
-    writer.write(trace);
-
-    verify(monitor).onFailedPublish(anyInt(), anyInt());
-    verifyNoMoreInteractions(monitor, worker, discovery, api);
-  }
-
-  @TableTest({
-    "scenario                      | publishResult                      ",
-    "dropped by policy             | DROPPED_BY_POLICY                  ",
-    "buffer overflow               | DROPPED_BUFFER_OVERFLOW            ",
-    "buffer overflow (sampled out) | DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT"
-  })
-  void testDroppedTraceIsCounted(PublishResult publishResult) {
-    // setup - use local mocks to avoid interference with instance-level mocks
-    TraceProcessingWorker localWorker = mock(TraceProcessingWorker.class);
-    HealthMetrics localMonitor = mock(HealthMetrics.class);
-    PayloadDispatcherImpl localDispatcher = mock(PayloadDispatcherImpl.class);
-    DDAgentWriter localWriter =
-        new DDAgentWriter(localWorker, localDispatcher, localMonitor, 1, SECONDS, false);
-
-    DDSpan p0 = newSpan();
-    p0.setSamplingPriority(PrioritySampling.SAMPLER_DROP);
-    List<DDSpan> trace = Arrays.asList(p0, newSpan());
-
-    when(localWorker.publish(eq(trace.get(0)), eq((int) PrioritySampling.SAMPLER_DROP), eq(trace)))
-        .thenReturn(publishResult);
-    localWriter.write(trace);
-
-    verify(localWorker)
-        .publish(eq(trace.get(0)), eq((int) PrioritySampling.SAMPLER_DROP), eq(trace));
-    verify(localDispatcher).onDroppedTrace(trace.size());
-  }
-
-  DDSpan newSpan() {
-    // Use the UNSET-priority variant so setSamplingPriority() can change the priority later
-    return buildSpan(0L, "test.tag", "test.value", PropagationTags.factory().empty());
-  }
+    HealthMetrics monitor = mock(HealthMetrics.class);
+    TraceProcessingWorker worker = mock(TraceProcessingWorker.class);
+    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+    DDAgentApi api = mock(DDAgentApi.class);
+    MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, SECONDS);
+    PayloadDispatcherImpl dispatcher =
+            new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, monitor, monitoring);
+    DDAgentWriter writer = new DDAgentWriter(worker, dispatcher, monitor, 1, SECONDS, false);
+
+    // Only used to create spans
+    CoreTracer dummyTracer = tracerBuilder().writer(new ListWriter()).build();
+
+    @AfterEach
+    void cleanup() {
+        writer.close();
+        dummyTracer.close();
+    }
+
+    @Test
+    void testWriterBuilder() {
+        DDAgentWriter builtWriter = DDAgentWriter.builder().build();
+
+        assertNotNull(builtWriter);
+    }
+
+    @Test
+    void testWriterStart() {
+        int capacity = 5;
+
+        when(worker.getCapacity()).thenReturn(capacity);
+        writer.start();
+
+        verify(monitor).start();
+        verify(worker).start();
+        verify(worker).getCapacity();
+        verify(monitor).onStart(capacity);
+        verifyNoMoreInteractions(monitor, worker, discovery, api);
+    }
+
+    @Test
+    void testWriterStartClosed() {
+        writer.close();
+        clearInvocations(monitor, worker, discovery, api);
+
+        writer.start();
+
+        verifyNoMoreInteractions(monitor, worker, discovery, api);
+    }
+
+    @Test
+    void testWriterFlush() {
+        when(worker.flush(1, SECONDS)).thenReturn(true, false);
+
+        // first flush succeeds
+        writer.flush();
+
+        // monitor is notified
+        verify(worker).flush(1, SECONDS);
+        verify(monitor).onFlush(false);
+        verifyNoMoreInteractions(monitor, worker, discovery, api);
+
+        clearInvocations(monitor, worker, discovery, api);
+
+        // second flush returns false
+        writer.flush();
+
+        // no additional monitor notifications
+        verify(worker).flush(1, SECONDS);
+        verifyNoMoreInteractions(monitor, worker, discovery, api);
+    }
+
+    @Test
+    void testWriterFlushClosed() {
+        writer.close();
+        clearInvocations(monitor, worker, discovery, api);
+
+        writer.flush();
+
+        verifyNoMoreInteractions(monitor, worker, discovery, api);
+    }
+
+    @Test
+    void testWriterWritePublishSucceeds() {
+        List<DDSpan> trace = Collections.singletonList(
+                (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start());
+
+        // publish succeeds
+        when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(ENQUEUED_FOR_SERIALIZATION);
+        writer.write(trace);
+
+        // monitor is notified of successful publication
+        verify(worker).publish(any(), anyInt(), eq(trace));
+        verify(monitor).onPublish(any(), anyInt());
+        verifyNoMoreInteractions(monitor, worker, discovery, api);
+    }
+
+    @Test
+    void testWriterWritePublishForSingleSpanSampling() {
+        List<DDSpan> trace = Collections.singletonList(
+                (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start());
+
+        // publish succeeds (single span sampling)
+        when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(ENQUEUED_FOR_SINGLE_SPAN_SAMPLING);
+        writer.write(trace);
+
+        // monitor should not call onPublish for single span sampling
+        verify(worker).publish(any(), anyInt(), eq(trace));
+        verifyNoMoreInteractions(monitor, worker, discovery, api);
+    }
+
+    @TableTest({
+      "scenario                      | publishResult                      ",
+      "buffer overflow               | DROPPED_BUFFER_OVERFLOW            ",
+      "buffer overflow (sampled out) | DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT",
+      "dropped by policy             | DROPPED_BY_POLICY                  "
+    })
+    void testWriterWritePublishFails(PublishResult publishResult) {
+        List<DDSpan> trace = Collections.singletonList(
+                (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start());
+
+        // publish fails
+        when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(publishResult);
+        writer.write(trace);
+
+        // monitor is notified of unsuccessful publication
+        verify(worker).publish(any(), anyInt(), eq(trace));
+        verify(monitor).onFailedPublish(anyInt(), anyInt());
+        verifyNoMoreInteractions(monitor, worker, discovery, api);
+    }
+
+    @Test
+    void testEmptyTracesShouldBeReportedAsFailures() {
+        // trace is empty
+        writer.write(Collections.emptyList());
+
+        // monitor is notified of unsuccessful publication
+        verify(monitor).onFailedPublish(anyInt(), anyInt());
+        verifyNoMoreInteractions(monitor, worker, discovery, api);
+    }
+
+    @Test
+    void testWriterWriteClosed() {
+        writer.close();
+        clearInvocations(monitor, worker, discovery, api);
+        List<DDSpan> trace = Collections.singletonList(
+                (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start());
+
+        writer.write(trace);
+
+        verify(monitor).onFailedPublish(anyInt(), anyInt());
+        verifyNoMoreInteractions(monitor, worker, discovery, api);
+    }
+
+    @TableTest({
+      "scenario                      | publishResult                      ",
+      "dropped by policy             | DROPPED_BY_POLICY                  ",
+      "buffer overflow               | DROPPED_BUFFER_OVERFLOW            ",
+      "buffer overflow (sampled out) | DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT"
+    })
+    void testDroppedTraceIsCounted(PublishResult publishResult) {
+        // setup - use local mocks to avoid interference with instance-level mocks
+        TraceProcessingWorker localWorker = mock(TraceProcessingWorker.class);
+        HealthMetrics localMonitor = mock(HealthMetrics.class);
+        PayloadDispatcherImpl localDispatcher = mock(PayloadDispatcherImpl.class);
+        DDAgentWriter localWriter = new DDAgentWriter(localWorker, localDispatcher, localMonitor, 1, SECONDS, false);
+
+        DDSpan p0 = newSpan();
+        p0.setSamplingPriority(PrioritySampling.SAMPLER_DROP);
+        List<DDSpan> trace = Arrays.asList(p0, newSpan());
+
+        when(localWorker.publish(eq(trace.get(0)), eq((int) PrioritySampling.SAMPLER_DROP), eq(trace)))
+                .thenReturn(publishResult);
+        localWriter.write(trace);
+
+        verify(localWorker).publish(eq(trace.get(0)), eq((int) PrioritySampling.SAMPLER_DROP), eq(trace));
+        verify(localDispatcher).onDroppedTrace(trace.size());
+    }
+
+    DDSpan newSpan() {
+        // Use the UNSET-priority variant so setSamplingPriority() can change the priority later
+        return buildSpan(0L, "test.tag", "test.value", PropagationTags.factory().empty());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterCombinedTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterCombinedTest.java
index c53286cb106..1eaf0f6b318 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterCombinedTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterCombinedTest.java
@@ -49,778 +49,720 @@
 @Timeout(value = 10, unit = TimeUnit.SECONDS)
 class DDIntakeWriterCombinedTest extends DDCoreJavaSpecification {
 
-  private static final CiVisibilityWellKnownTags wellKnownTags =
-      new CiVisibilityWellKnownTags(
-          "my-runtime-id",
-          "my-env",
-          "my-language",
-          "my-runtime-name",
-          "my-runtime-version",
-          "my-runtime-vendor",
-          "my-os-arch",
-          "my-os-platform",
-          "my-os-version",
-          "false");
-
-  MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
-  Phaser phaser = new Phaser();
-
-  // Only used to create spans
-  datadog.trace.core.CoreTracer dummyTracer;
-
-  @BeforeEach
-  void setup() {
-    // Register for two threads.
-    phaser.register();
-    phaser.register();
-    dummyTracer = tracerBuilder().writer(new ListWriter()).build();
-  }
-
-  @AfterEach
-  void cleanup() {
-    if (dummyTracer != null) {
-      dummyTracer.close();
+    private static final CiVisibilityWellKnownTags wellKnownTags = new CiVisibilityWellKnownTags(
+            "my-runtime-id",
+            "my-env",
+            "my-language",
+            "my-runtime-name",
+            "my-runtime-version",
+            "my-runtime-vendor",
+            "my-os-arch",
+            "my-os-platform",
+            "my-os-version",
+            "false");
+
+    MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
+    Phaser phaser = new Phaser();
+
+    // Only used to create spans
+    datadog.trace.core.CoreTracer dummyTracer;
+
+    @BeforeEach
+    void setup() {
+        // Register for two threads.
+        phaser.register();
+        phaser.register();
+        dummyTracer = tracerBuilder().writer(new ListWriter()).build();
     }
-  }
-
-  List<DDSpan> createMinimalTrace() {
-    // Use buildSpan from DDCoreJavaSpecification to create a real DDSpan with minimal fields
-    DDSpan span = buildSpan(0L, "", Collections.emptyMap());
-    return Collections.singletonList(span);
-  }
-
-  @Test
-  void noInteractionsBecauseOfInitialFlush() {
-    DDIntakeApi api = mock(DDIntakeApi.class);
-    DDIntakeWriter writer =
-        DDIntakeWriter.builder()
-            .addTrack(TrackType.NOOP, api)
-            .traceBufferSize(8)
-            .monitoring(monitoring)
-            .flushIntervalMilliseconds(-1)
-            .alwaysFlush(false)
-            .build();
-    writer.start();
-    // Clear setup-time interactions (e.g. isCompressionEnabled() called during build())
-    clearInvocations(api);
-
-    writer.flush();
-
-    // then: 0 * _ (no interactions at all on mocked api)
-    verifyNoMoreInteractions(api);
-
-    writer.close();
-  }
-
-  @Test
-  void testHappyPath() {
-    TrackType trackType = TrackType.CITESTCYCLE;
-    DDIntakeApi api = mock(DDIntakeApi.class);
-    DDIntakeWriter writer =
-        DDIntakeWriter.builder()
-            .addTrack(trackType, api)
-            .traceBufferSize(1024)
-            .monitoring(monitoring)
-            .flushIntervalMilliseconds(-1)
-            .alwaysFlush(false)
-            .build();
-    writer.start();
-    // Clear setup-time interactions (e.g. isCompressionEnabled() called during build())
-    clearInvocations(api);
-    DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start();
-    List<DDSpan> trace = Collections.singletonList(span);
-
-    doAnswer(invocation -> RemoteApi.Response.success(200))
-        .when(api)
-        .sendSerializedTraces(argThat(payload -> payload.traceCount() == 2));
-
-    writer.write(trace);
-    writer.write(trace);
-    writer.flush();
-
-    verify(api, times(1)).sendSerializedTraces(argThat(payload -> payload.traceCount() == 2));
-    verifyNoMoreInteractions(api);
-
-    writer.close();
-  }
-
-  @Test
-  void testFloodOfTraces() {
-    // bufferSize = 1024; traceCount = 100 (shouldn't trigger payload, but bigger than disruptor
-    // size)
-    int traceCount = 100;
-    TrackType trackType = TrackType.CITESTCYCLE;
-    DDIntakeApi api = mock(DDIntakeApi.class);
-    DDIntakeWriter writer =
-        DDIntakeWriter.builder()
-            .addTrack(trackType, api)
-            .traceBufferSize(1024)
-            .monitoring(monitoring)
-            .flushIntervalMilliseconds(-1)
-            .alwaysFlush(false)
-            .build();
-    writer.start();
-    // Clear setup-time interactions (e.g. isCompressionEnabled() called during build())
-    clearInvocations(api);
-    DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start();
-    List<DDSpan> trace = Collections.singletonList(span);
-
-    doAnswer(invocation -> RemoteApi.Response.success(200))
-        .when(api)
-        .sendSerializedTraces(argThat(payload -> payload.traceCount() <= traceCount));
-
-    for (int i = 1; i <= traceCount; i++) {
-      writer.write(trace);
+
+    @AfterEach
+    void cleanup() {
+        if (dummyTracer != null) {
+            dummyTracer.close();
+        }
     }
-    writer.flush();
-
-    verify(api, times(1))
-        .sendSerializedTraces(argThat(payload -> payload.traceCount() <= traceCount));
-    verifyNoMoreInteractions(api);
-
-    writer.close();
-  }
-
-  @Test
-  void testFlushByTime() throws Exception {
-    TrackType trackType = TrackType.CITESTCYCLE;
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    DDIntakeApi api = mock(DDIntakeApi.class);
-    DDIntakeWriter writer =
-        DDIntakeWriter.builder()
-            .addTrack(trackType, api)
-            .healthMetrics(healthMetrics)
-            .monitoring(monitoring)
-            .flushIntervalMilliseconds(1000)
-            .alwaysFlush(false)
-            .build();
-    writer.start();
-    // Clear setup-time interactions (e.g. isCompressionEnabled() called during build(), onStart
-    // from start())
-    clearInvocations(api, healthMetrics);
-    DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start();
-    List<DDSpan> trace = Collections.nCopies(10, span);
-
-    doAnswer(invocation -> RemoteApi.Response.success(200))
-        .when(api)
-        .sendSerializedTraces(argThat(payload -> payload.traceCount() == 5));
-
-    // stub onSend to arrive at phaser
-    doAnswer(
-            invocation -> {
-              phaser.arrive();
-              return null;
-            })
-        .when(healthMetrics)
-        .onSend(anyInt(), anyInt(), any());
-
-    for (int i = 1; i <= 5; i++) {
-      writer.write(trace);
+
+    List<DDSpan> createMinimalTrace() {
+        // Use buildSpan from DDCoreJavaSpecification to create a real DDSpan with minimal fields
+        DDSpan span = buildSpan(0L, "", Collections.emptyMap());
+        return Collections.singletonList(span);
     }
-    phaser.awaitAdvanceInterruptibly(phaser.arriveAndDeregister());
-
-    verify(healthMetrics, times(1)).onSerialize(anyInt());
-    verify(api, times(1)).sendSerializedTraces(argThat(payload -> payload.traceCount() == 5));
-    // _ * healthMetrics.onPublish(_, _) means any number, so don't verify count
-    verify(healthMetrics).onSend(anyInt(), anyInt(), any());
-    verifyNoMoreInteractions(api);
-
-    writer.close();
-  }
-
-  @Timeout(value = 30, unit = TimeUnit.SECONDS)
-  @Test
-  void testDefaultBufferSizeForCitestcycle() {
-    TrackType trackType = TrackType.CITESTCYCLE;
-    List<DDSpan> minimalTrace = createMinimalTrace();
-    DDIntakeApi api = mock(DDIntakeApi.class);
-    DDIntakeWriter writer =
-        DDIntakeWriter.builder()
-            .addTrack(trackType, api)
-            .wellKnownTags(wellKnownTags)
-            .traceBufferSize(1024)
-            .prioritization(ENSURE_TRACE)
-            .monitoring(monitoring)
-            .flushIntervalMilliseconds(-1)
-            .alwaysFlush(false)
-            .build();
-    writer.start();
-    // Clear setup-time interactions (e.g. isCompressionEnabled() called during build())
-    clearInvocations(api);
-
-    DDIntakeMapperDiscovery discovery =
-        new DDIntakeMapperDiscovery(trackType, wellKnownTags, false);
-    discovery.discover();
-    RemoteMapper mapper = discovery.getMapper();
-    int traceSize = calculateSize(minimalTrace, mapper);
-    int maxedPayloadTraceCount = (mapper.messageBufferSize() / traceSize);
-
-    doAnswer(invocation -> RemoteApi.Response.success(200))
-        .when(api)
-        .sendSerializedTraces(
-            argThat(payload -> payload != null && payload.traceCount() == maxedPayloadTraceCount));
-    doAnswer(invocation -> RemoteApi.Response.success(200))
-        .when(api)
-        .sendSerializedTraces(argThat(payload -> payload != null && payload.traceCount() == 1));
-
-    for (int i = 0; i <= maxedPayloadTraceCount; i++) {
-      writer.write(minimalTrace);
+
+    @Test
+    void noInteractionsBecauseOfInitialFlush() {
+        DDIntakeApi api = mock(DDIntakeApi.class);
+        DDIntakeWriter writer = DDIntakeWriter.builder()
+                .addTrack(TrackType.NOOP, api)
+                .traceBufferSize(8)
+                .monitoring(monitoring)
+                .flushIntervalMilliseconds(-1)
+                .alwaysFlush(false)
+                .build();
+        writer.start();
+        // Clear setup-time interactions (e.g. isCompressionEnabled() called during build())
+        clearInvocations(api);
+
+        writer.flush();
+
+        // then: 0 * _ (no interactions at all on mocked api)
+        verifyNoMoreInteractions(api);
+
+        writer.close();
     }
-    writer.flush();
-
-    verify(api, times(1))
-        .sendSerializedTraces(
-            argThat(payload -> payload != null && payload.traceCount() == maxedPayloadTraceCount));
-    verify(api, times(1))
-        .sendSerializedTraces(argThat(payload -> payload != null && payload.traceCount() == 1));
-    verifyNoMoreInteractions(api);
-
-    writer.close();
-  }
-
-  @Test
-  void checkThatThereAreNoInteractionsAfterClose() {
-    TrackType trackType = TrackType.CITESTCYCLE;
-    DDIntakeApi api = mock(DDIntakeApi.class);
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    DDIntakeWriter writer =
-        DDIntakeWriter.builder()
-            .addTrack(trackType, api)
-            .healthMetrics(healthMetrics)
-            .monitoring(monitoring)
-            .alwaysFlush(false)
-            .build();
-    writer.start();
-    // Clear setup-time interactions (e.g. isCompressionEnabled() called during build(), onStart
-    // from start())
-    clearInvocations(api, healthMetrics);
-
-    writer.close();
-    writer.write(Collections.emptyList());
-    writer.flush();
-
-    // then: this will be checked during flushing
-    verify(healthMetrics, times(1)).onFailedPublish(anyInt(), anyInt());
-    verify(healthMetrics, times(1)).onFlush(any(Boolean.class));
-    verify(healthMetrics, times(1)).onShutdown(any(Boolean.class));
-    verify(healthMetrics, times(1)).close();
-    verifyNoMoreInteractions(healthMetrics, api);
-
-    writer.close();
-  }
-
-  @Test
-  void monitorHappyPath() {
-    TrackType trackType = TrackType.CITESTCYCLE;
-    String apiVersion = "v2";
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    List<DDSpan> minimalTrace = createMinimalTrace();
-    String path = buildIntakePath(trackType, apiVersion);
-
-    JavaTestHttpServer intake =
-        JavaTestHttpServer.httpServer(
-            server ->
-                server.handlers(h -> h.post(path, api -> api.getResponse().status(200).send())));
-    try {
-      HttpUrl hostUrl = HttpUrl.get(intake.getAddress());
-      OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000);
-      DDIntakeApi api =
-          DDIntakeApi.builder()
-              .hostUrl(hostUrl)
-              .httpClient(httpClient)
-              .apiKey("my-api-key")
-              .trackType(trackType)
-              .build();
-      DDIntakeWriter writer =
-          DDIntakeWriter.builder()
-              .addTrack(trackType, api)
-              .healthMetrics(healthMetrics)
-              .monitoring(monitoring)
-              .alwaysFlush(false)
-              .build();
-
-      // start
-      writer.start();
-
-      verify(healthMetrics, times(1)).onStart((int) writer.getCapacity());
-
-      // write and flush
-      writer.write(minimalTrace);
-      writer.flush();
-
-      verify(healthMetrics, times(1)).onPublish(any(), anyInt());
-      verify(healthMetrics, times(1)).onSerialize(anyInt());
-      verify(healthMetrics, times(1)).onFlush(false);
-      verify(healthMetrics, times(1))
-          .onSend(
-              anyInt(),
-              anyInt(),
-              argThat(
-                  response ->
-                      response.success()
-                          && response.status().isPresent()
-                          && response.status().getAsInt() == 200));
-
-      writer.close();
-
-      verify(healthMetrics, times(1)).onShutdown(true);
-    } finally {
-      intake.close();
+
+    @Test
+    void testHappyPath() {
+        TrackType trackType = TrackType.CITESTCYCLE;
+        DDIntakeApi api = mock(DDIntakeApi.class);
+        DDIntakeWriter writer = DDIntakeWriter.builder()
+                .addTrack(trackType, api)
+                .traceBufferSize(1024)
+                .monitoring(monitoring)
+                .flushIntervalMilliseconds(-1)
+                .alwaysFlush(false)
+                .build();
+        writer.start();
+        // Clear setup-time interactions (e.g. isCompressionEnabled() called during build())
+        clearInvocations(api);
+        DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start();
+        List<DDSpan> trace = Collections.singletonList(span);
+
+        doAnswer(invocation -> RemoteApi.Response.success(200))
+                .when(api)
+                .sendSerializedTraces(argThat(payload -> payload.traceCount() == 2));
+
+        writer.write(trace);
+        writer.write(trace);
+        writer.flush();
+
+        verify(api, times(1)).sendSerializedTraces(argThat(payload -> payload.traceCount() == 2));
+        verifyNoMoreInteractions(api);
+
+        writer.close();
     }
-  }
-
-  @Test
-  void monitorIntakeReturnsError() {
-    TrackType trackType = TrackType.CITESTCYCLE;
-    String apiVersion = "v2";
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    List<DDSpan> minimalTrace = createMinimalTrace();
-    String path = buildIntakePath(trackType, apiVersion);
-
-    JavaTestHttpServer intake =
-        JavaTestHttpServer.httpServer(
-            server ->
-                server.handlers(h -> h.post(path, api -> api.getResponse().status(500).send())));
-    try {
-      HttpUrl hostUrl = HttpUrl.get(intake.getAddress());
-      okhttp3.OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000);
-      DDIntakeApi api =
-          DDIntakeApi.builder()
-              .hostUrl(hostUrl)
-              .httpClient(httpClient)
-              .apiKey("my-api-key")
-              .trackType(trackType)
-              .build();
-      DDIntakeWriter writer =
-          DDIntakeWriter.builder()
-              .addTrack(trackType, api)
-              .healthMetrics(healthMetrics)
-              .monitoring(monitoring)
-              .alwaysFlush(false)
-              .build();
-
-      // start
-      writer.start();
-
-      verify(healthMetrics, times(1)).onStart((int) writer.getCapacity());
-
-      // write and flush
-      writer.write(minimalTrace);
-      writer.flush();
-
-      verify(healthMetrics, times(1)).onPublish(any(), anyInt());
-      verify(healthMetrics, times(1)).onSerialize(anyInt());
-      verify(healthMetrics, times(1)).onFlush(false);
-      verify(healthMetrics, times(1))
-          .onFailedSend(
-              anyInt(),
-              anyInt(),
-              argThat(
-                  response ->
-                      !response.success()
-                          && response.status().isPresent()
-                          && response.status().getAsInt() == 500));
-
-      writer.close();
-
-      verify(healthMetrics, times(1)).onShutdown(true);
-    } finally {
-      intake.close();
+
+    @Test
+    void testFloodOfTraces() {
+        // bufferSize = 1024; traceCount = 100 (shouldn't trigger payload, but bigger than disruptor
+        // size)
+        int traceCount = 100;
+        TrackType trackType = TrackType.CITESTCYCLE;
+        DDIntakeApi api = mock(DDIntakeApi.class);
+        DDIntakeWriter writer = DDIntakeWriter.builder()
+                .addTrack(trackType, api)
+                .traceBufferSize(1024)
+                .monitoring(monitoring)
+                .flushIntervalMilliseconds(-1)
+                .alwaysFlush(false)
+                .build();
+        writer.start();
+        // Clear setup-time interactions (e.g. isCompressionEnabled() called during build())
+        clearInvocations(api);
+        DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start();
+        List<DDSpan> trace = Collections.singletonList(span);
+
+        doAnswer(invocation -> RemoteApi.Response.success(200))
+                .when(api)
+                .sendSerializedTraces(argThat(payload -> payload.traceCount() <= traceCount));
+
+        for (int i = 1; i <= traceCount; i++) {
+            writer.write(trace);
+        }
+        writer.flush();
+
+        verify(api, times(1)).sendSerializedTraces(argThat(payload -> payload.traceCount() <= traceCount));
+        verifyNoMoreInteractions(api);
+
+        writer.close();
     }
-  }
-
-  @Test
-  void unreachableIntakeTest() {
-    TrackType trackType = TrackType.CITESTCYCLE;
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    List<DDSpan> minimalTrace = createMinimalTrace();
-    DDIntakeApi api = mock(DDIntakeApi.class);
-    // simulating a communication failure to a server
-    doAnswer(invocation -> RemoteApi.Response.failed(new IOException("comm error")))
-        .when(api)
-        .sendSerializedTraces(any());
-
-    DDIntakeWriter writer =
-        DDIntakeWriter.builder()
-            .addTrack(trackType, api)
-            .monitoring(monitoring)
-            .healthMetrics(healthMetrics)
-            .alwaysFlush(false)
-            .build();
-
-    // start
-    writer.start();
-
-    verify(healthMetrics, times(1)).onStart((int) writer.getCapacity());
-
-    // write and flush
-    writer.write(minimalTrace);
-    writer.flush();
-
-    // then: if we know there's no agent, we'll drop the traces before serialising them
-    // but we also know that there's nowhere to send health metrics to
-    verify(healthMetrics, times(1)).onPublish(any(), anyInt());
-    verify(healthMetrics, times(1)).onFlush(false);
-
-    writer.close();
-
-    verify(healthMetrics, times(1)).onShutdown(true);
-  }
-
-  @Flaky("If execution is too slow, the http client timeout may trigger")
-  @Test
-  void slowResponseTest() throws Exception {
-    int numWritten = 0;
-    AtomicInteger numFlushes = new AtomicInteger(0);
-    AtomicInteger numPublished = new AtomicInteger(0);
-    AtomicInteger numFailedPublish = new AtomicInteger(0);
-    AtomicInteger numRequests = new AtomicInteger(0);
-    AtomicInteger numFailedRequests = new AtomicInteger(0);
-
-    Semaphore responseSemaphore = new Semaphore(1);
-
-    TrackType trackType = TrackType.CITESTCYCLE;
-    String apiVersion = "v2";
-    int bufferSize = 16;
-    List<DDSpan> minimalTrace = createMinimalTrace();
-    String path = buildIntakePath(trackType, apiVersion);
-
-    JavaTestHttpServer intake =
-        JavaTestHttpServer.httpServer(
-            server ->
-                server.handlers(
-                    h ->
-                        h.post(
-                            path,
-                            api -> {
-                              responseSemaphore.acquire();
-                              try {
-                                api.getResponse().status(200).send();
-                              } finally {
-                                responseSemaphore.release();
-                              }
-                            })));
-
-    // This test focuses just on failed publish, so not verifying every callback
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    doAnswer(
-            invocation -> {
-              numPublished.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onPublish(any(), anyInt());
-    doAnswer(
-            invocation -> {
-              numFailedPublish.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onFailedPublish(anyInt(), anyInt());
-    doAnswer(
-            invocation -> {
-              numFlushes.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onFlush(any(Boolean.class));
-    doAnswer(
-            invocation -> {
-              numRequests.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onSend(anyInt(), anyInt(), any());
-    doAnswer(
-            invocation -> {
-              numFailedRequests.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onFailedSend(anyInt(), anyInt(), any());
-
-    HttpUrl hostUrl = HttpUrl.get(intake.getAddress());
-    okhttp3.OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000);
-    DDIntakeApi api =
-        DDIntakeApi.builder()
-            .hostUrl(hostUrl)
-            .httpClient(httpClient)
-            .apiKey("my-api-key")
-            .trackType(trackType)
-            .build();
-    DDIntakeWriter writer =
-        DDIntakeWriter.builder()
-            .addTrack(trackType, api)
-            .healthMetrics(healthMetrics)
-            .traceBufferSize(bufferSize)
-            .alwaysFlush(false)
-            .build();
-    writer.start();
-
-    // gate responses
-    responseSemaphore.acquire();
-
-    try {
-      // sanity check coordination mechanism of test
-      // release to allow response to be generated
-      responseSemaphore.release();
-      writer.flush();
-
-      // reacquire semaphore to stall further responses
-      responseSemaphore.acquire();
-
-      // when: write a single trace and flush
-      // with responseSemaphore held, the response is blocked but may still time out
-      writer.write(minimalTrace);
-      numWritten += 1;
-
-      assertEquals(0, numFailedPublish.get());
-      assertEquals(numWritten, numPublished.get());
-      assertEquals(numWritten, numPublished.get() + numFailedPublish.get());
-      assertEquals(1, numFlushes.get());
-
-      // when: send many traces to fill the sender queue...
-      //   loop until outstanding requests > finished requests
-      while (writer.traceProcessingWorker.getRemainingCapacity() > 0
-          || numFailedPublish.get() == 0) {
-        writer.write(minimalTrace);
-        numWritten += 1;
-      }
 
-      assertTrue(numFailedPublish.get() > 0);
-      assertEquals(numWritten, numPublished.get() + numFailedPublish.get());
+    @Test
+    void testFlushByTime() throws Exception {
+        TrackType trackType = TrackType.CITESTCYCLE;
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        DDIntakeApi api = mock(DDIntakeApi.class);
+        DDIntakeWriter writer = DDIntakeWriter.builder()
+                .addTrack(trackType, api)
+                .healthMetrics(healthMetrics)
+                .monitoring(monitoring)
+                .flushIntervalMilliseconds(1000)
+                .alwaysFlush(false)
+                .build();
+        writer.start();
+        // Clear setup-time interactions (e.g. isCompressionEnabled() called during build(), onStart
+        // from start())
+        clearInvocations(api, healthMetrics);
+        DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start();
+        List<DDSpan> trace = Collections.nCopies(10, span);
+
+        doAnswer(invocation -> RemoteApi.Response.success(200))
+                .when(api)
+                .sendSerializedTraces(argThat(payload -> payload.traceCount() == 5));
+
+        // stub onSend to arrive at phaser
+        doAnswer(invocation -> {
+                    phaser.arrive();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onSend(anyInt(), anyInt(), any());
+
+        for (int i = 1; i <= 5; i++) {
+            writer.write(trace);
+        }
+        phaser.awaitAdvanceInterruptibly(phaser.arriveAndDeregister());
+
+        verify(healthMetrics, times(1)).onSerialize(anyInt());
+        verify(api, times(1)).sendSerializedTraces(argThat(payload -> payload.traceCount() == 5));
+        // _ * healthMetrics.onPublish(_, _) means any number, so don't verify count
+        verify(healthMetrics).onSend(anyInt(), anyInt(), any());
+        verifyNoMoreInteractions(api);
+
+        writer.close();
+    }
+
+    @Timeout(value = 30, unit = TimeUnit.SECONDS)
+    @Test
+    void testDefaultBufferSizeForCitestcycle() {
+        TrackType trackType = TrackType.CITESTCYCLE;
+        List<DDSpan> minimalTrace = createMinimalTrace();
+        DDIntakeApi api = mock(DDIntakeApi.class);
+        DDIntakeWriter writer = DDIntakeWriter.builder()
+                .addTrack(trackType, api)
+                .wellKnownTags(wellKnownTags)
+                .traceBufferSize(1024)
+                .prioritization(ENSURE_TRACE)
+                .monitoring(monitoring)
+                .flushIntervalMilliseconds(-1)
+                .alwaysFlush(false)
+                .build();
+        writer.start();
+        // Clear setup-time interactions (e.g. isCompressionEnabled() called during build())
+        clearInvocations(api);
+
+        DDIntakeMapperDiscovery discovery = new DDIntakeMapperDiscovery(trackType, wellKnownTags, false);
+        discovery.discover();
+        RemoteMapper mapper = discovery.getMapper();
+        int traceSize = calculateSize(minimalTrace, mapper);
+        int maxedPayloadTraceCount = (mapper.messageBufferSize() / traceSize);
+
+        doAnswer(invocation -> RemoteApi.Response.success(200))
+                .when(api)
+                .sendSerializedTraces(
+                        argThat(payload -> payload != null && payload.traceCount() == maxedPayloadTraceCount));
+        doAnswer(invocation -> RemoteApi.Response.success(200))
+                .when(api)
+                .sendSerializedTraces(argThat(payload -> payload != null && payload.traceCount() == 1));
+
+        for (int i = 0; i <= maxedPayloadTraceCount; i++) {
+            writer.write(minimalTrace);
+        }
+        writer.flush();
+
+        verify(api, times(1))
+                .sendSerializedTraces(
+                        argThat(payload -> payload != null && payload.traceCount() == maxedPayloadTraceCount));
+        verify(api, times(1)).sendSerializedTraces(argThat(payload -> payload != null && payload.traceCount() == 1));
+        verifyNoMoreInteractions(api);
+
+        writer.close();
+    }
+
+    @Test
+    void checkThatThereAreNoInteractionsAfterClose() {
+        TrackType trackType = TrackType.CITESTCYCLE;
+        DDIntakeApi api = mock(DDIntakeApi.class);
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        DDIntakeWriter writer = DDIntakeWriter.builder()
+                .addTrack(trackType, api)
+                .healthMetrics(healthMetrics)
+                .monitoring(monitoring)
+                .alwaysFlush(false)
+                .build();
+        writer.start();
+        // Clear setup-time interactions (e.g. isCompressionEnabled() called during build(), onStart
+        // from start())
+        clearInvocations(api, healthMetrics);
+
+        writer.close();
+        writer.write(Collections.emptyList());
+        writer.flush();
+
+        // then: this will be checked during flushing
+        verify(healthMetrics, times(1)).onFailedPublish(anyInt(), anyInt());
+        verify(healthMetrics, times(1)).onFlush(any(Boolean.class));
+        verify(healthMetrics, times(1)).onShutdown(any(Boolean.class));
+        verify(healthMetrics, times(1)).close();
+        verifyNoMoreInteractions(healthMetrics, api);
+
+        writer.close();
+    }
+
+    @Test
+    void monitorHappyPath() {
+        TrackType trackType = TrackType.CITESTCYCLE;
+        String apiVersion = "v2";
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        List<DDSpan> minimalTrace = createMinimalTrace();
+        String path = buildIntakePath(trackType, apiVersion);
+
+        JavaTestHttpServer intake = JavaTestHttpServer.httpServer(server -> server.handlers(
+                h -> h.post(path, api -> api.getResponse().status(200).send())));
+        try {
+            HttpUrl hostUrl = HttpUrl.get(intake.getAddress());
+            OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000);
+            DDIntakeApi api = DDIntakeApi.builder()
+                    .hostUrl(hostUrl)
+                    .httpClient(httpClient)
+                    .apiKey("my-api-key")
+                    .trackType(trackType)
+                    .build();
+            DDIntakeWriter writer = DDIntakeWriter.builder()
+                    .addTrack(trackType, api)
+                    .healthMetrics(healthMetrics)
+                    .monitoring(monitoring)
+                    .alwaysFlush(false)
+                    .build();
+
+            // start
+            writer.start();
+
+            verify(healthMetrics, times(1)).onStart((int) writer.getCapacity());
+
+            // write and flush
+            writer.write(minimalTrace);
+            writer.flush();
+
+            verify(healthMetrics, times(1)).onPublish(any(), anyInt());
+            verify(healthMetrics, times(1)).onSerialize(anyInt());
+            verify(healthMetrics, times(1)).onFlush(false);
+            verify(healthMetrics, times(1))
+                    .onSend(
+                            anyInt(),
+                            anyInt(),
+                            argThat(response -> response.success()
+                                    && response.status().isPresent()
+                                    && response.status().getAsInt() == 200));
+
+            writer.close();
+
+            verify(healthMetrics, times(1)).onShutdown(true);
+        } finally {
+            intake.close();
+        }
+    }
 
-      // with both disruptor & queue full, should reject everything
-      int expectedRejects = 100;
-      for (int i = 1; i <= expectedRejects; i++) {
+    @Test
+    void monitorIntakeReturnsError() {
+        TrackType trackType = TrackType.CITESTCYCLE;
+        String apiVersion = "v2";
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        List<DDSpan> minimalTrace = createMinimalTrace();
+        String path = buildIntakePath(trackType, apiVersion);
+
+        JavaTestHttpServer intake = JavaTestHttpServer.httpServer(server -> server.handlers(
+                h -> h.post(path, api -> api.getResponse().status(500).send())));
+        try {
+            HttpUrl hostUrl = HttpUrl.get(intake.getAddress());
+            okhttp3.OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000);
+            DDIntakeApi api = DDIntakeApi.builder()
+                    .hostUrl(hostUrl)
+                    .httpClient(httpClient)
+                    .apiKey("my-api-key")
+                    .trackType(trackType)
+                    .build();
+            DDIntakeWriter writer = DDIntakeWriter.builder()
+                    .addTrack(trackType, api)
+                    .healthMetrics(healthMetrics)
+                    .monitoring(monitoring)
+                    .alwaysFlush(false)
+                    .build();
+
+            // start
+            writer.start();
+
+            verify(healthMetrics, times(1)).onStart((int) writer.getCapacity());
+
+            // write and flush
+            writer.write(minimalTrace);
+            writer.flush();
+
+            verify(healthMetrics, times(1)).onPublish(any(), anyInt());
+            verify(healthMetrics, times(1)).onSerialize(anyInt());
+            verify(healthMetrics, times(1)).onFlush(false);
+            verify(healthMetrics, times(1))
+                    .onFailedSend(
+                            anyInt(),
+                            anyInt(),
+                            argThat(response -> !response.success()
+                                    && response.status().isPresent()
+                                    && response.status().getAsInt() == 500));
+
+            writer.close();
+
+            verify(healthMetrics, times(1)).onShutdown(true);
+        } finally {
+            intake.close();
+        }
+    }
+
+    @Test
+    void unreachableIntakeTest() {
+        TrackType trackType = TrackType.CITESTCYCLE;
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        List<DDSpan> minimalTrace = createMinimalTrace();
+        DDIntakeApi api = mock(DDIntakeApi.class);
+        // simulating a communication failure to a server
+        doAnswer(invocation -> RemoteApi.Response.failed(new IOException("comm error")))
+                .when(api)
+                .sendSerializedTraces(any());
+
+        DDIntakeWriter writer = DDIntakeWriter.builder()
+                .addTrack(trackType, api)
+                .monitoring(monitoring)
+                .healthMetrics(healthMetrics)
+                .alwaysFlush(false)
+                .build();
+
+        // start
+        writer.start();
+
+        verify(healthMetrics, times(1)).onStart((int) writer.getCapacity());
+
+        // write and flush
         writer.write(minimalTrace);
-        numWritten += 1;
-      }
-
-      assertEquals(numWritten, numPublished.get() + numFailedPublish.get());
-    } finally {
-      responseSemaphore.release();
-      writer.close();
-      intake.close();
+        writer.flush();
+
+        // then: if we know there's no agent, we'll drop the traces before serialising them
+        // but we also know that there's nowhere to send health metrics to
+        verify(healthMetrics, times(1)).onPublish(any(), anyInt());
+        verify(healthMetrics, times(1)).onFlush(false);
+
+        writer.close();
+
+        verify(healthMetrics, times(1)).onShutdown(true);
     }
-  }
-
-  @Test
-  void multiThreaded() throws Exception {
-    TrackType trackType = TrackType.CITESTCYCLE;
-    String apiVersion = "v2";
-    AtomicInteger numPublished = new AtomicInteger(0);
-    AtomicInteger numFailedPublish = new AtomicInteger(0);
-    AtomicInteger numRepSent = new AtomicInteger(0);
-
-    List<DDSpan> minimalTrace = createMinimalTrace();
-    String path = buildIntakePath(trackType, apiVersion);
-
-    JavaTestHttpServer intake =
-        JavaTestHttpServer.httpServer(
-            server ->
-                server.handlers(h -> h.post(path, api -> api.getResponse().status(200).send())));
-
-    // This test focuses just on failed publish, so not verifying every callback
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    doAnswer(
-            invocation -> {
-              numPublished.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onPublish(any(), anyInt());
-    doAnswer(
-            invocation -> {
-              numFailedPublish.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onFailedPublish(anyInt(), anyInt());
-    doAnswer(
-            invocation -> {
-              int repCount = invocation.getArgument(0);
-              numRepSent.addAndGet(repCount);
-              return null;
-            })
-        .when(healthMetrics)
-        .onSend(anyInt(), anyInt(), any());
-
-    HttpUrl hostUrl = HttpUrl.get(intake.getAddress());
-    okhttp3.OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000);
-    DDIntakeApi api =
-        DDIntakeApi.builder()
-            .hostUrl(hostUrl)
-            .httpClient(httpClient)
-            .apiKey("my-api-key")
-            .trackType(trackType)
-            .build();
-    DDIntakeWriter writer =
-        DDIntakeWriter.builder()
-            .addTrack(trackType, api)
-            .monitoring(monitoring)
-            .healthMetrics(healthMetrics)
-            .alwaysFlush(false)
-            .build();
-    writer.start();
-
-    try {
-      Runnable producer =
-          () -> {
-            for (int i = 1; i <= 100; i++) {
-              writer.write(minimalTrace);
+
+    @Flaky("If execution is too slow, the http client timeout may trigger")
+    @Test
+    void slowResponseTest() throws Exception {
+        int numWritten = 0;
+        AtomicInteger numFlushes = new AtomicInteger(0);
+        AtomicInteger numPublished = new AtomicInteger(0);
+        AtomicInteger numFailedPublish = new AtomicInteger(0);
+        AtomicInteger numRequests = new AtomicInteger(0);
+        AtomicInteger numFailedRequests = new AtomicInteger(0);
+
+        Semaphore responseSemaphore = new Semaphore(1);
+
+        TrackType trackType = TrackType.CITESTCYCLE;
+        String apiVersion = "v2";
+        int bufferSize = 16;
+        List<DDSpan> minimalTrace = createMinimalTrace();
+        String path = buildIntakePath(trackType, apiVersion);
+
+        JavaTestHttpServer intake = JavaTestHttpServer.httpServer(server -> server.handlers(h -> h.post(path, api -> {
+            responseSemaphore.acquire();
+            try {
+                api.getResponse().status(200).send();
+            } finally {
+                responseSemaphore.release();
+            }
+        })));
+
+        // This test focuses just on failed publish, so not verifying every callback
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        doAnswer(invocation -> {
+                    numPublished.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onPublish(any(), anyInt());
+        doAnswer(invocation -> {
+                    numFailedPublish.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onFailedPublish(anyInt(), anyInt());
+        doAnswer(invocation -> {
+                    numFlushes.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onFlush(any(Boolean.class));
+        doAnswer(invocation -> {
+                    numRequests.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onSend(anyInt(), anyInt(), any());
+        doAnswer(invocation -> {
+                    numFailedRequests.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onFailedSend(anyInt(), anyInt(), any());
+
+        HttpUrl hostUrl = HttpUrl.get(intake.getAddress());
+        okhttp3.OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000);
+        DDIntakeApi api = DDIntakeApi.builder()
+                .hostUrl(hostUrl)
+                .httpClient(httpClient)
+                .apiKey("my-api-key")
+                .trackType(trackType)
+                .build();
+        DDIntakeWriter writer = DDIntakeWriter.builder()
+                .addTrack(trackType, api)
+                .healthMetrics(healthMetrics)
+                .traceBufferSize(bufferSize)
+                .alwaysFlush(false)
+                .build();
+        writer.start();
+
+        // gate responses
+        responseSemaphore.acquire();
+
+        try {
+            // sanity check coordination mechanism of test
+            // release to allow response to be generated
+            responseSemaphore.release();
+            writer.flush();
+
+            // reacquire semaphore to stall further responses
+            responseSemaphore.acquire();
+
+            // when: write a single trace and flush
+            // with responseSemaphore held, the response is blocked but may still time out
+            writer.write(minimalTrace);
+            numWritten += 1;
+
+            assertEquals(0, numFailedPublish.get());
+            assertEquals(numWritten, numPublished.get());
+            assertEquals(numWritten, numPublished.get() + numFailedPublish.get());
+            assertEquals(1, numFlushes.get());
+
+            // when: send many traces to fill the sender queue...
+            //   loop until outstanding requests > finished requests
+            while (writer.traceProcessingWorker.getRemainingCapacity() > 0 || numFailedPublish.get() == 0) {
+                writer.write(minimalTrace);
+                numWritten += 1;
             }
-          };
 
-      Thread t1 = new Thread(producer);
-      t1.start();
+            assertTrue(numFailedPublish.get() > 0);
+            assertEquals(numWritten, numPublished.get() + numFailedPublish.get());
 
-      Thread t2 = new Thread(producer);
-      t2.start();
+            // with both disruptor & queue full, should reject everything
+            int expectedRejects = 100;
+            for (int i = 1; i <= expectedRejects; i++) {
+                writer.write(minimalTrace);
+                numWritten += 1;
+            }
 
-      t1.join();
-      t2.join();
+            assertEquals(numWritten, numPublished.get() + numFailedPublish.get());
+        } finally {
+            responseSemaphore.release();
+            writer.close();
+            intake.close();
+        }
+    }
 
-      writer.flush();
+    @Test
+    void multiThreaded() throws Exception {
+        TrackType trackType = TrackType.CITESTCYCLE;
+        String apiVersion = "v2";
+        AtomicInteger numPublished = new AtomicInteger(0);
+        AtomicInteger numFailedPublish = new AtomicInteger(0);
+        AtomicInteger numRepSent = new AtomicInteger(0);
+
+        List<DDSpan> minimalTrace = createMinimalTrace();
+        String path = buildIntakePath(trackType, apiVersion);
+
+        JavaTestHttpServer intake = JavaTestHttpServer.httpServer(server -> server.handlers(
+                h -> h.post(path, api -> api.getResponse().status(200).send())));
+
+        // This test focuses just on failed publish, so not verifying every callback
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        doAnswer(invocation -> {
+                    numPublished.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onPublish(any(), anyInt());
+        doAnswer(invocation -> {
+                    numFailedPublish.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onFailedPublish(anyInt(), anyInt());
+        doAnswer(invocation -> {
+                    int repCount = invocation.getArgument(0);
+                    numRepSent.addAndGet(repCount);
+                    return null;
+                })
+                .when(healthMetrics)
+                .onSend(anyInt(), anyInt(), any());
+
+        HttpUrl hostUrl = HttpUrl.get(intake.getAddress());
+        okhttp3.OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000);
+        DDIntakeApi api = DDIntakeApi.builder()
+                .hostUrl(hostUrl)
+                .httpClient(httpClient)
+                .apiKey("my-api-key")
+                .trackType(trackType)
+                .build();
+        DDIntakeWriter writer = DDIntakeWriter.builder()
+                .addTrack(trackType, api)
+                .monitoring(monitoring)
+                .healthMetrics(healthMetrics)
+                .alwaysFlush(false)
+                .build();
+        writer.start();
+
+        try {
+            Runnable producer = () -> {
+                for (int i = 1; i <= 100; i++) {
+                    writer.write(minimalTrace);
+                }
+            };
+
+            Thread t1 = new Thread(producer);
+            t1.start();
+
+            Thread t2 = new Thread(producer);
+            t2.start();
+
+            t1.join();
+            t2.join();
+
+            writer.flush();
+
+            // then: conditions.eventually { assert numPublished.get() == 200 && numRepSent.get() == 200 }
+            int totalTraces = 100 + 100;
+            long deadline = System.currentTimeMillis() + 5000;
+            while (System.currentTimeMillis() < deadline) {
+                if (numPublished.get() == totalTraces && numRepSent.get() == totalTraces) {
+                    break;
+                }
+                Thread.sleep(50);
+            }
+            assertEquals(totalTraces, numPublished.get());
+            assertEquals(totalTraces, numRepSent.get());
+        } finally {
+            writer.close();
+            intake.close();
+        }
+    }
 
-      // then: conditions.eventually { assert numPublished.get() == 200 && numRepSent.get() == 200 }
-      int totalTraces = 100 + 100;
-      long deadline = System.currentTimeMillis() + 5000;
-      while (System.currentTimeMillis() < deadline) {
-        if (numPublished.get() == totalTraces && numRepSent.get() == totalTraces) {
-          break;
+    @Test
+    void statsdSuccess() {
+        TrackType trackType = TrackType.CITESTCYCLE;
+        String apiVersion = "v2";
+        AtomicInteger numTracesAccepted = new AtomicInteger(0);
+        AtomicInteger numRequests = new AtomicInteger(0);
+        AtomicInteger numResponses = new AtomicInteger(0);
+
+        List<DDSpan> minimalTrace = createMinimalTrace();
+        String path = buildIntakePath(trackType, apiVersion);
+
+        JavaTestHttpServer intake = JavaTestHttpServer.httpServer(server -> server.handlers(
+                h -> h.post(path, api -> api.getResponse().status(200).send())));
+
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        doAnswer(invocation -> {
+                    numTracesAccepted.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onPublish(any(), anyInt());
+        doAnswer(invocation -> {
+                    numRequests.incrementAndGet();
+                    numResponses.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onSend(anyInt(), anyInt(), any());
+
+        HttpUrl hostUrl = HttpUrl.get(intake.getAddress());
+        okhttp3.OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000);
+        DDIntakeApi api = DDIntakeApi.builder()
+                .hostUrl(hostUrl)
+                .httpClient(httpClient)
+                .apiKey("my-api-key")
+                .trackType(trackType)
+                .build();
+        DDIntakeWriter writer = DDIntakeWriter.builder()
+                .addTrack(trackType, api)
+                .monitoring(monitoring)
+                .healthMetrics(healthMetrics)
+                .alwaysFlush(false)
+                .build();
+        writer.start();
+
+        try {
+            writer.write(minimalTrace);
+            writer.flush();
+
+            assertEquals(1, numTracesAccepted.get());
+            assertEquals(1, numRequests.get());
+            assertEquals(1, numResponses.get());
+        } finally {
+            intake.close();
+            writer.close();
         }
-        Thread.sleep(50);
-      }
-      assertEquals(totalTraces, numPublished.get());
-      assertEquals(totalTraces, numRepSent.get());
-    } finally {
-      writer.close();
-      intake.close();
     }
-  }
-
-  @Test
-  void statsdSuccess() {
-    TrackType trackType = TrackType.CITESTCYCLE;
-    String apiVersion = "v2";
-    AtomicInteger numTracesAccepted = new AtomicInteger(0);
-    AtomicInteger numRequests = new AtomicInteger(0);
-    AtomicInteger numResponses = new AtomicInteger(0);
-
-    List<DDSpan> minimalTrace = createMinimalTrace();
-    String path = buildIntakePath(trackType, apiVersion);
-
-    JavaTestHttpServer intake =
-        JavaTestHttpServer.httpServer(
-            server ->
-                server.handlers(h -> h.post(path, api -> api.getResponse().status(200).send())));
-
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    doAnswer(
-            invocation -> {
-              numTracesAccepted.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onPublish(any(), anyInt());
-    doAnswer(
-            invocation -> {
-              numRequests.incrementAndGet();
-              numResponses.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onSend(anyInt(), anyInt(), any());
-
-    HttpUrl hostUrl = HttpUrl.get(intake.getAddress());
-    okhttp3.OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000);
-    DDIntakeApi api =
-        DDIntakeApi.builder()
-            .hostUrl(hostUrl)
-            .httpClient(httpClient)
-            .apiKey("my-api-key")
-            .trackType(trackType)
-            .build();
-    DDIntakeWriter writer =
-        DDIntakeWriter.builder()
-            .addTrack(trackType, api)
-            .monitoring(monitoring)
-            .healthMetrics(healthMetrics)
-            .alwaysFlush(false)
-            .build();
-    writer.start();
-
-    try {
-      writer.write(minimalTrace);
-      writer.flush();
-
-      assertEquals(1, numTracesAccepted.get());
-      assertEquals(1, numRequests.get());
-      assertEquals(1, numResponses.get());
-    } finally {
-      intake.close();
-      writer.close();
+
+    @Test
+    void statsdCommFailure() throws Exception {
+        TrackType trackType = TrackType.CITESTCYCLE;
+        List<DDSpan> minimalTrace = createMinimalTrace();
+
+        DDIntakeApi api = mock(DDIntakeApi.class);
+        doAnswer(invocation -> RemoteApi.Response.failed(new IOException("comm error")))
+                .when(api)
+                .sendSerializedTraces(any());
+
+        CountDownLatch latch = new CountDownLatch(2);
+        StatsDClient statsd = mock(StatsDClient.class);
+        TracerHealthMetrics healthMetrics = new TracerHealthMetrics(statsd, 100, TimeUnit.MILLISECONDS);
+        DDIntakeWriter writer = DDIntakeWriter.builder()
+                .addTrack(trackType, api)
+                .monitoring(monitoring)
+                .healthMetrics(healthMetrics)
+                .alwaysFlush(false)
+                .build();
+        healthMetrics.start();
+        writer.start();
+
+        // Set up stubs with countDown BEFORE the action
+        doAnswer(invocation -> {
+                    latch.countDown();
+                    return null;
+                })
+                .when(statsd)
+                .count(anyString(), anyLong());
+
+        writer.write(minimalTrace);
+        writer.flush();
+        latch.await(10, TimeUnit.SECONDS);
+
+        verify(statsd, times(1)).count("api.requests.total", 1L);
+        verify(statsd, never()).incrementCounter("api.responses.total");
+        verify(statsd, times(1)).count("api.errors.total", 1L);
+
+        writer.close();
+        healthMetrics.close();
+    }
+
+    static String buildIntakePath(TrackType trackType, String apiVersion) {
+        return String.format("/api/%s/%s", apiVersion, trackType.name().toLowerCase());
+    }
+
+    static int calculateSize(List<DDSpan> trace, RemoteMapper mapper) {
+        AtomicInteger size = new AtomicInteger();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(
+                mapper.messageBufferSize(), (messageCount, buffer) -> size.set(buffer.limit() - buffer.position())));
+        packer.format(trace, mapper);
+        packer.flush();
+        return size.get();
     }
-  }
-
-  @Test
-  void statsdCommFailure() throws Exception {
-    TrackType trackType = TrackType.CITESTCYCLE;
-    List<DDSpan> minimalTrace = createMinimalTrace();
-
-    DDIntakeApi api = mock(DDIntakeApi.class);
-    doAnswer(invocation -> RemoteApi.Response.failed(new IOException("comm error")))
-        .when(api)
-        .sendSerializedTraces(any());
-
-    CountDownLatch latch = new CountDownLatch(2);
-    StatsDClient statsd = mock(StatsDClient.class);
-    TracerHealthMetrics healthMetrics = new TracerHealthMetrics(statsd, 100, TimeUnit.MILLISECONDS);
-    DDIntakeWriter writer =
-        DDIntakeWriter.builder()
-            .addTrack(trackType, api)
-            .monitoring(monitoring)
-            .healthMetrics(healthMetrics)
-            .alwaysFlush(false)
-            .build();
-    healthMetrics.start();
-    writer.start();
-
-    // Set up stubs with countDown BEFORE the action
-    doAnswer(
-            invocation -> {
-              latch.countDown();
-              return null;
-            })
-        .when(statsd)
-        .count(anyString(), anyLong());
-
-    writer.write(minimalTrace);
-    writer.flush();
-    latch.await(10, TimeUnit.SECONDS);
-
-    verify(statsd, times(1)).count("api.requests.total", 1L);
-    verify(statsd, never()).incrementCounter("api.responses.total");
-    verify(statsd, times(1)).count("api.errors.total", 1L);
-
-    writer.close();
-    healthMetrics.close();
-  }
-
-  static String buildIntakePath(TrackType trackType, String apiVersion) {
-    return String.format("/api/%s/%s", apiVersion, trackType.name().toLowerCase());
-  }
-
-  static int calculateSize(List<DDSpan> trace, RemoteMapper mapper) {
-    AtomicInteger size = new AtomicInteger();
-    MsgPackWriter packer =
-        new MsgPackWriter(
-            new FlushingBuffer(
-                mapper.messageBufferSize(),
-                (messageCount, buffer) -> size.set(buffer.limit() - buffer.position())));
-    packer.format(trace, mapper);
-    packer.flush();
-    return size.get();
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterTest.java
index 1a47599ee01..c3ed327229a 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterTest.java
@@ -35,190 +35,186 @@
 
 class DDIntakeWriterTest extends DDCoreJavaSpecification {
 
-  HealthMetrics healthMetrics = mock(HealthMetrics.class);
-  TraceProcessingWorker worker = mock(TraceProcessingWorker.class);
-  DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-  DDAgentApi api = mock(DDAgentApi.class);
-  MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
-  PayloadDispatcherImpl dispatcher =
-      new PayloadDispatcherImpl(
-          new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring);
-  DDIntakeWriter writer = new DDIntakeWriter(worker, dispatcher, healthMetrics, false);
-
-  // Only used to create spans
-  CoreTracer dummyTracer;
-
-  @BeforeEach
-  void setup() {
-    dummyTracer = tracerBuilder().writer(new ListWriter()).build();
-  }
-
-  @AfterEach
-  void cleanup() {
-    writer.close();
-    if (dummyTracer != null) {
-      dummyTracer.close();
+    HealthMetrics healthMetrics = mock(HealthMetrics.class);
+    TraceProcessingWorker worker = mock(TraceProcessingWorker.class);
+    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+    DDAgentApi api = mock(DDAgentApi.class);
+    MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
+    PayloadDispatcherImpl dispatcher =
+            new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring);
+    DDIntakeWriter writer = new DDIntakeWriter(worker, dispatcher, healthMetrics, false);
+
+    // Only used to create spans
+    CoreTracer dummyTracer;
+
+    @BeforeEach
+    void setup() {
+        dummyTracer = tracerBuilder().writer(new ListWriter()).build();
+    }
+
+    @AfterEach
+    void cleanup() {
+        writer.close();
+        if (dummyTracer != null) {
+            dummyTracer.close();
+        }
+    }
+
+    @Test
+    void testWriterBuilder() {
+        DDIntakeWriter builtWriter = DDIntakeWriter.builder()
+                .addTrack(TrackType.NOOP, mock(RemoteApi.class))
+                .build();
+
+        assertNotNull(builtWriter);
+    }
+
+    @Test
+    void testWriterStart() {
+        int capacity = 5;
+
+        when(worker.getCapacity()).thenReturn(capacity);
+        writer.start();
+
+        verify(healthMetrics).start();
+        verify(worker).start();
+        verify(worker).getCapacity();
+        verify(healthMetrics).onStart(capacity);
+        verifyNoMoreInteractions(healthMetrics, worker, discovery, api);
+    }
+
+    @Test
+    void testWriterFlush() {
+        when(worker.flush(1, TimeUnit.SECONDS)).thenReturn(true, false);
+
+        // first flush succeeds
+        writer.flush();
+
+        // monitor is notified
+        verify(worker).flush(1, TimeUnit.SECONDS);
+        verify(healthMetrics).onFlush(false);
+        verifyNoMoreInteractions(healthMetrics, worker, discovery, api);
+
+        clearInvocations(healthMetrics, worker, discovery, api);
+
+        // second flush returns false
+        writer.flush();
+
+        // no additional monitor notifications
+        verify(worker).flush(1, TimeUnit.SECONDS);
+        verifyNoMoreInteractions(healthMetrics, worker, discovery, api);
+    }
+
+    @Test
+    void testWriterFlushClosed() {
+        writer.close();
+        clearInvocations(healthMetrics, worker, discovery, api);
+
+        writer.flush();
+
+        verifyNoMoreInteractions(healthMetrics, worker, discovery, api);
+    }
+
+    @Test
+    void testWriterWritePublishSucceeds() {
+        List<DDSpan> trace = Collections.singletonList(
+                (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start());
+
+        // publish succeeds
+        when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(ENQUEUED_FOR_SERIALIZATION);
+        when(worker.flush(anyLong(), any(TimeUnit.class))).thenReturn(true);
+        writer.write(trace);
+
+        // monitor is notified of successful publication
+        verify(worker).publish(any(), anyInt(), eq(trace));
+        verify(healthMetrics).onPublish(any(), anyInt());
+        verifyNoMoreInteractions(healthMetrics);
+    }
+
+    @Test
+    void testWriterWritePublishForSingleSpanSampling() {
+        List<DDSpan> trace = Collections.singletonList(
+                (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start());
+
+        // publish succeeds for single span sampling
+        when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(ENQUEUED_FOR_SINGLE_SPAN_SAMPLING);
+        when(worker.flush(anyLong(), any(TimeUnit.class))).thenReturn(true);
+        writer.write(trace);
+
+        // monitor should not call onPublish for single span sampling
+        verify(worker).publish(any(), anyInt(), eq(trace));
+        verifyNoMoreInteractions(healthMetrics);
+    }
+
+    @TableTest({
+      "scenario                      | publishResult                      ",
+      "buffer overflow               | DROPPED_BUFFER_OVERFLOW            ",
+      "buffer overflow (sampled out) | DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT",
+      "dropped by policy             | DROPPED_BY_POLICY                  "
+    })
+    void testWriterWritePublishFails(PublishResult publishResult) {
+        List<DDSpan> trace = Collections.singletonList(
+                (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start());
+
+        // publish fails
+        when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(publishResult);
+        when(worker.flush(anyLong(), any(TimeUnit.class))).thenReturn(true);
+        writer.write(trace);
+
+        // monitor is notified of unsuccessful publication
+        verify(worker).publish(any(), anyInt(), eq(trace));
+        verify(healthMetrics).onFailedPublish(anyInt(), eq(1));
+        verifyNoMoreInteractions(healthMetrics);
+    }
+
+    @Test
+    void testEmptyTracesShouldBeReportedAsFailures() {
+        // trace is empty
+        when(worker.flush(anyLong(), any(TimeUnit.class))).thenReturn(true);
+        writer.write(Collections.emptyList());
+
+        // monitor is notified of unsuccessful publication
+        verify(healthMetrics).onFailedPublish(anyInt(), eq(0));
+        verifyNoMoreInteractions(healthMetrics);
+    }
+
+    @Test
+    void testWriterWriteClosed() {
+        writer.close();
+        clearInvocations(healthMetrics, worker, discovery, api);
+        List<DDSpan> trace = Collections.singletonList(
+                (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start());
+
+        when(worker.flush(anyLong(), any(TimeUnit.class))).thenReturn(true);
+        writer.write(trace);
+
+        verify(healthMetrics).onFailedPublish(anyInt(), eq(1));
+        verifyNoMoreInteractions(healthMetrics);
+    }
+
+    @TableTest({
+      "scenario                      | publishResult                      ",
+      "dropped by policy             | DROPPED_BY_POLICY                  ",
+      "buffer overflow               | DROPPED_BUFFER_OVERFLOW            ",
+      "buffer overflow (sampled out) | DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT"
+    })
+    void testDroppedTraceIsCounted(PublishResult publishResult) {
+        // setup - use local mocks
+        PayloadDispatcherImpl localDispatcher = mock(PayloadDispatcherImpl.class);
+        DDIntakeWriter localWriter = new DDIntakeWriter(worker, localDispatcher, healthMetrics, true);
+
+        DDSpan p0 = newSpan();
+        List<DDSpan> trace = java.util.Arrays.asList(p0, newSpan());
+
+        when(worker.publish(eq(trace.get(0)), anyInt(), eq(trace))).thenReturn(publishResult);
+        localWriter.write(trace);
+
+        verify(worker).publish(eq(trace.get(0)), anyInt(), eq(trace));
+        verify(localDispatcher).onDroppedTrace(trace.size());
+    }
+
+    DDSpan newSpan() {
+        // Use the UNSET-priority variant so setSamplingPriority() can change the priority later
+        return buildSpan(0L, "test.tag", "test.value", PropagationTags.factory().empty());
     }
-  }
-
-  @Test
-  void testWriterBuilder() {
-    DDIntakeWriter builtWriter =
-        DDIntakeWriter.builder().addTrack(TrackType.NOOP, mock(RemoteApi.class)).build();
-
-    assertNotNull(builtWriter);
-  }
-
-  @Test
-  void testWriterStart() {
-    int capacity = 5;
-
-    when(worker.getCapacity()).thenReturn(capacity);
-    writer.start();
-
-    verify(healthMetrics).start();
-    verify(worker).start();
-    verify(worker).getCapacity();
-    verify(healthMetrics).onStart(capacity);
-    verifyNoMoreInteractions(healthMetrics, worker, discovery, api);
-  }
-
-  @Test
-  void testWriterFlush() {
-    when(worker.flush(1, TimeUnit.SECONDS)).thenReturn(true, false);
-
-    // first flush succeeds
-    writer.flush();
-
-    // monitor is notified
-    verify(worker).flush(1, TimeUnit.SECONDS);
-    verify(healthMetrics).onFlush(false);
-    verifyNoMoreInteractions(healthMetrics, worker, discovery, api);
-
-    clearInvocations(healthMetrics, worker, discovery, api);
-
-    // second flush returns false
-    writer.flush();
-
-    // no additional monitor notifications
-    verify(worker).flush(1, TimeUnit.SECONDS);
-    verifyNoMoreInteractions(healthMetrics, worker, discovery, api);
-  }
-
-  @Test
-  void testWriterFlushClosed() {
-    writer.close();
-    clearInvocations(healthMetrics, worker, discovery, api);
-
-    writer.flush();
-
-    verifyNoMoreInteractions(healthMetrics, worker, discovery, api);
-  }
-
-  @Test
-  void testWriterWritePublishSucceeds() {
-    List<DDSpan> trace =
-        Collections.singletonList(
-            (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start());
-
-    // publish succeeds
-    when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(ENQUEUED_FOR_SERIALIZATION);
-    when(worker.flush(anyLong(), any(TimeUnit.class))).thenReturn(true);
-    writer.write(trace);
-
-    // monitor is notified of successful publication
-    verify(worker).publish(any(), anyInt(), eq(trace));
-    verify(healthMetrics).onPublish(any(), anyInt());
-    verifyNoMoreInteractions(healthMetrics);
-  }
-
-  @Test
-  void testWriterWritePublishForSingleSpanSampling() {
-    List<DDSpan> trace =
-        Collections.singletonList(
-            (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start());
-
-    // publish succeeds for single span sampling
-    when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(ENQUEUED_FOR_SINGLE_SPAN_SAMPLING);
-    when(worker.flush(anyLong(), any(TimeUnit.class))).thenReturn(true);
-    writer.write(trace);
-
-    // monitor should not call onPublish for single span sampling
-    verify(worker).publish(any(), anyInt(), eq(trace));
-    verifyNoMoreInteractions(healthMetrics);
-  }
-
-  @TableTest({
-    "scenario                      | publishResult                      ",
-    "buffer overflow               | DROPPED_BUFFER_OVERFLOW            ",
-    "buffer overflow (sampled out) | DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT",
-    "dropped by policy             | DROPPED_BY_POLICY                  "
-  })
-  void testWriterWritePublishFails(PublishResult publishResult) {
-    List<DDSpan> trace =
-        Collections.singletonList(
-            (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start());
-
-    // publish fails
-    when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(publishResult);
-    when(worker.flush(anyLong(), any(TimeUnit.class))).thenReturn(true);
-    writer.write(trace);
-
-    // monitor is notified of unsuccessful publication
-    verify(worker).publish(any(), anyInt(), eq(trace));
-    verify(healthMetrics).onFailedPublish(anyInt(), eq(1));
-    verifyNoMoreInteractions(healthMetrics);
-  }
-
-  @Test
-  void testEmptyTracesShouldBeReportedAsFailures() {
-    // trace is empty
-    when(worker.flush(anyLong(), any(TimeUnit.class))).thenReturn(true);
-    writer.write(Collections.emptyList());
-
-    // monitor is notified of unsuccessful publication
-    verify(healthMetrics).onFailedPublish(anyInt(), eq(0));
-    verifyNoMoreInteractions(healthMetrics);
-  }
-
-  @Test
-  void testWriterWriteClosed() {
-    writer.close();
-    clearInvocations(healthMetrics, worker, discovery, api);
-    List<DDSpan> trace =
-        Collections.singletonList(
-            (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start());
-
-    when(worker.flush(anyLong(), any(TimeUnit.class))).thenReturn(true);
-    writer.write(trace);
-
-    verify(healthMetrics).onFailedPublish(anyInt(), eq(1));
-    verifyNoMoreInteractions(healthMetrics);
-  }
-
-  @TableTest({
-    "scenario                      | publishResult                      ",
-    "dropped by policy             | DROPPED_BY_POLICY                  ",
-    "buffer overflow               | DROPPED_BUFFER_OVERFLOW            ",
-    "buffer overflow (sampled out) | DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT"
-  })
-  void testDroppedTraceIsCounted(PublishResult publishResult) {
-    // setup - use local mocks
-    PayloadDispatcherImpl localDispatcher = mock(PayloadDispatcherImpl.class);
-    DDIntakeWriter localWriter = new DDIntakeWriter(worker, localDispatcher, healthMetrics, true);
-
-    DDSpan p0 = newSpan();
-    List<DDSpan> trace = java.util.Arrays.asList(p0, newSpan());
-
-    when(worker.publish(eq(trace.get(0)), anyInt(), eq(trace))).thenReturn(publishResult);
-    localWriter.write(trace);
-
-    verify(worker).publish(eq(trace.get(0)), anyInt(), eq(trace));
-    verify(localDispatcher).onDroppedTrace(trace.size());
-  }
-
-  DDSpan newSpan() {
-    // Use the UNSET-priority variant so setSamplingPriority() can change the priority later
-    return buildSpan(0L, "test.tag", "test.value", PropagationTags.factory().empty());
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/FileBasedPayloadDispatcherTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/FileBasedPayloadDispatcherTest.java
index 2eb5e86f34b..b25f5b83af4 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/FileBasedPayloadDispatcherTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/FileBasedPayloadDispatcherTest.java
@@ -35,311 +35,313 @@
 
 class FileBasedPayloadDispatcherTest {
 
-  private static final ObjectMapper JSON = new ObjectMapper();
-
-  @Test
-  void flushWithNoEventsIsNoOp(@TempDir Path outputDir) throws IOException {
-    FileBasedPayloadDispatcher dispatcher =
-        new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
-
-    dispatcher.flush();
-
-    assertTrue(listFiles(outputDir).isEmpty());
-  }
-
-  @Test
-  void addTraceIsNoOpForEmptyTraces(@TempDir Path outputDir) throws IOException {
-    FileBasedPayloadDispatcher dispatcher =
-        new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
-
-    dispatcher.addTrace(Collections.emptyList());
-    dispatcher.flush();
-
-    assertTrue(listFiles(outputDir).isEmpty());
-  }
-
-  @Test
-  void onDroppedTraceIsNoOpAndGetApisReturnsEmpty(@TempDir Path outputDir) {
-    FileBasedPayloadDispatcher dispatcher =
-        new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
-
-    assertTrue(dispatcher.getApis().isEmpty());
-    dispatcher.onDroppedTrace(42); // does not throw
-  }
-
-  @Test
-  void citestcycleFlushWritesEnvelopeWithVersionMetadataAndEvents(@TempDir Path outputDir)
-      throws IOException {
-    FileBasedPayloadDispatcher dispatcher =
-        new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
-    Map<String, Object> tags = new HashMap<>();
-    tags.put(Tags.TEST_SESSION_ID, DDTraceId.from(123));
-    tags.put(Tags.TEST_MODULE_ID, 456L);
-    tags.put(Tags.TEST_SUITE_ID, 789L);
-    tags.put(Tags.ITR_CORRELATION_ID, "corr-1");
-    CoreSpan<?> span = mockSpan(InternalSpanTypes.TEST, tags);
-
-    dispatcher.addTrace(Collections.singletonList(span));
-    dispatcher.flush();
-
-    List<Path> files = listFiles(outputDir);
-    assertEquals(1, files.size());
-    String filename = files.get(0).getFileName().toString();
-    assertTrue(filename.startsWith("tests-"));
-    assertTrue(filename.endsWith(".json"));
-
-    JsonNode doc = JSON.readTree(files.get(0).toFile());
-    assertEquals(1, doc.get("version").asInt());
-    assertTrue(doc.has("metadata"));
-    assertTrue(doc.get("metadata").has("*"));
-    assertTrue(doc.get("events").isArray());
-    assertEquals(1, doc.get("events").size());
-
-    JsonNode event = doc.get("events").get(0);
-    assertEquals("test", event.get("type").asText());
-    assertEquals(2, event.get("version").asInt()); // has session/module/suite id
-    JsonNode content = event.get("content");
-    assertEquals(123L, content.get(Tags.TEST_SESSION_ID).asLong());
-    assertEquals(456L, content.get(Tags.TEST_MODULE_ID).asLong());
-    assertEquals(789L, content.get(Tags.TEST_SUITE_ID).asLong());
-    assertEquals("corr-1", content.get(Tags.ITR_CORRELATION_ID).asText());
-    // trace/span/parent ids must be JSON numbers (backend schema rejects strings)
-    assertTrue(content.get("trace_id").isNumber(), "trace_id should be a JSON number");
-    assertTrue(content.get("span_id").isNumber(), "span_id should be a JSON number");
-    assertTrue(content.get("parent_id").isNumber(), "parent_id should be a JSON number");
-  }
-
-  @Test
-  void citestcycleStripsCiGitOsRuntimeTagsAndWellKnownFields(@TempDir Path outputDir)
-      throws IOException {
-    FileBasedPayloadDispatcher dispatcher =
-        new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
-    Map<String, Object> tags = new HashMap<>();
-    tags.put("ci.provider.name", "github");
-    tags.put("git.branch", "main");
-    tags.put("os.name", "linux");
-    tags.put("runtime.name", "openjdk");
-    tags.put("runtime-id", "uuid");
-    tags.put("pr.number", "42");
-    tags.put("custom.tag", "kept");
-    tags.put("kept.metric", 99L);
-    CoreSpan<?> span = mockSpan(InternalSpanTypes.TEST, tags);
-
-    dispatcher.addTrace(Collections.singletonList(span));
-    dispatcher.flush();
-
-    JsonNode doc = JSON.readTree(listFiles(outputDir).get(0).toFile());
-    JsonNode content = doc.get("events").get(0).get("content");
-    JsonNode meta = content.get("meta");
-    JsonNode metrics = content.get("metrics");
-
-    assertFalse(meta.has("ci.provider.name"));
-    assertFalse(meta.has("git.branch"));
-    assertFalse(meta.has("os.name"));
-    assertFalse(meta.has("runtime.name"));
-    assertFalse(meta.has("runtime-id"));
-    assertFalse(meta.has("pr.number"));
-
-    assertEquals("kept", meta.get("custom.tag").asText());
-    assertEquals(99L, metrics.get("kept.metric").asLong());
-  }
-
-  @Test
-  void citestcycleTruncatesMetaValuesAndPreservesMetricsAndTopLevelIds(@TempDir Path outputDir)
-      throws IOException {
-    FileBasedPayloadDispatcher dispatcher =
-        new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
-    String longValue = longString(CIConstants.MAX_META_STRING_VALUE_LENGTH + 1, 'a');
-    String exactValue = longString(CIConstants.MAX_META_STRING_VALUE_LENGTH, 'b');
-    Map<String, Object> tags = new HashMap<>();
-    tags.put(Tags.TEST_SESSION_ID, DDTraceId.from(123));
-    tags.put(Tags.TEST_MODULE_ID, 456L);
-    tags.put(Tags.TEST_SUITE_ID, 789L);
-    tags.put("custom.tag", longValue);
-    tags.put("exact.tag", exactValue);
-    tags.put("custom.metric", 42L);
-    CoreSpan<?> span = mockSpan(InternalSpanTypes.TEST, tags);
-
-    dispatcher.addTrace(Collections.singletonList(span));
-    dispatcher.flush();
-
-    JsonNode content =
-        JSON.readTree(listFiles(outputDir).get(0).toFile()).get("events").get(0).get("content");
-    JsonNode meta = content.get("meta");
-    JsonNode metrics = content.get("metrics");
-
-    assertEquals(
-        longValue.substring(0, CIConstants.MAX_META_STRING_VALUE_LENGTH),
-        meta.get("custom.tag").asText());
-    assertEquals(
-        CIConstants.MAX_META_STRING_VALUE_LENGTH, meta.get("custom.tag").asText().length());
-    assertEquals(exactValue, meta.get("exact.tag").asText());
-    assertEquals(42L, metrics.get("custom.metric").asLong());
-    assertFalse(meta.has(Tags.TEST_SESSION_ID));
-    assertFalse(meta.has(Tags.TEST_MODULE_ID));
-    assertFalse(meta.has(Tags.TEST_SUITE_ID));
-    assertEquals(123L, content.get(Tags.TEST_SESSION_ID).asLong());
-    assertEquals(456L, content.get(Tags.TEST_MODULE_ID).asLong());
-    assertEquals(789L, content.get(Tags.TEST_SUITE_ID).asLong());
-  }
-
-  @Test
-  void citestcycleAssignsEventTypesForSessionModuleSuiteTestSpanSpans(@TempDir Path outputDir)
-      throws IOException {
-    FileBasedPayloadDispatcher dispatcher =
-        new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
-    List<CoreSpan<?>> spans =
-        Arrays.asList(
-            mockSpan(InternalSpanTypes.TEST_SESSION_END, Collections.emptyMap()),
-            mockSpan(InternalSpanTypes.TEST_MODULE_END, Collections.emptyMap()),
-            mockSpan(InternalSpanTypes.TEST_SUITE_END, Collections.emptyMap()),
-            mockSpan(InternalSpanTypes.TEST, Collections.emptyMap()),
-            mockSpan("other-span-type", Collections.emptyMap()));
-
-    dispatcher.addTrace(spans);
-    dispatcher.flush();
-
-    JsonNode events = JSON.readTree(listFiles(outputDir).get(0).toFile()).get("events");
-    assertEquals(5, events.size());
-    assertEquals(InternalSpanTypes.TEST_SESSION_END.toString(), events.get(0).get("type").asText());
-    assertEquals(InternalSpanTypes.TEST_MODULE_END.toString(), events.get(1).get("type").asText());
-    assertEquals(InternalSpanTypes.TEST_SUITE_END.toString(), events.get(2).get("type").asText());
-    assertEquals(InternalSpanTypes.TEST.toString(), events.get(3).get("type").asText());
-    assertEquals("span", events.get(4).get("type").asText());
-    // session/module/suite events do not have trace/span/parent ids
-    assertFalse(events.get(0).get("content").has("trace_id"));
-    assertFalse(events.get(1).get("content").has("trace_id"));
-    assertFalse(events.get(2).get("content").has("trace_id"));
-    // test and span events do
-    assertTrue(events.get(3).get("content").has("trace_id"));
-    assertTrue(events.get(4).get("content").has("trace_id"));
-  }
-
-  @Test
-  void citestcovSkipsNonTestSpansAndEmptyReports(@TempDir Path outputDir) throws IOException {
-    FileBasedPayloadDispatcher dispatcher =
-        new FileBasedPayloadDispatcher(outputDir.toString(), "coverage", TrackType.CITESTCOV);
-    CoreSpan<?> nonTest = mockSpan("not-a-test", Collections.emptyMap());
-    CoreSpan<?> testNoCoverage = mockSpan(InternalSpanTypes.TEST, Collections.emptyMap());
-
-    dispatcher.addTrace(Arrays.asList(nonTest, testNoCoverage));
-    dispatcher.flush();
-
-    assertTrue(listFiles(outputDir).isEmpty());
-  }
-
-  @Test
-  void filenameFollowsPrefixNsPidSeqConvention(@TempDir Path outputDir) throws IOException {
-    FileBasedPayloadDispatcher dispatcher =
-        new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
-    CoreSpan<?> span = mockSpan(InternalSpanTypes.TEST, Collections.emptyMap());
-
-    dispatcher.addTrace(Collections.singletonList(span));
-    dispatcher.flush();
-    dispatcher.addTrace(Collections.singletonList(span));
-    dispatcher.flush();
-
-    List<String> filenames = new ArrayList<>();
-    for (Path p : listFiles(outputDir)) {
-      filenames.add(p.getFileName().toString());
+    private static final ObjectMapper JSON = new ObjectMapper();
+
+    @Test
+    void flushWithNoEventsIsNoOp(@TempDir Path outputDir) throws IOException {
+        FileBasedPayloadDispatcher dispatcher =
+                new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
+
+        dispatcher.flush();
+
+        assertTrue(listFiles(outputDir).isEmpty());
+    }
+
+    @Test
+    void addTraceIsNoOpForEmptyTraces(@TempDir Path outputDir) throws IOException {
+        FileBasedPayloadDispatcher dispatcher =
+                new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
+
+        dispatcher.addTrace(Collections.emptyList());
+        dispatcher.flush();
+
+        assertTrue(listFiles(outputDir).isEmpty());
+    }
+
+    @Test
+    void onDroppedTraceIsNoOpAndGetApisReturnsEmpty(@TempDir Path outputDir) {
+        FileBasedPayloadDispatcher dispatcher =
+                new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
+
+        assertTrue(dispatcher.getApis().isEmpty());
+        dispatcher.onDroppedTrace(42); // does not throw
+    }
+
+    @Test
+    void citestcycleFlushWritesEnvelopeWithVersionMetadataAndEvents(@TempDir Path outputDir) throws IOException {
+        FileBasedPayloadDispatcher dispatcher =
+                new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
+        Map<String, Object> tags = new HashMap<>();
+        tags.put(Tags.TEST_SESSION_ID, DDTraceId.from(123));
+        tags.put(Tags.TEST_MODULE_ID, 456L);
+        tags.put(Tags.TEST_SUITE_ID, 789L);
+        tags.put(Tags.ITR_CORRELATION_ID, "corr-1");
+        CoreSpan<?> span = mockSpan(InternalSpanTypes.TEST, tags);
+
+        dispatcher.addTrace(Collections.singletonList(span));
+        dispatcher.flush();
+
+        List<Path> files = listFiles(outputDir);
+        assertEquals(1, files.size());
+        String filename = files.get(0).getFileName().toString();
+        assertTrue(filename.startsWith("tests-"));
+        assertTrue(filename.endsWith(".json"));
+
+        JsonNode doc = JSON.readTree(files.get(0).toFile());
+        assertEquals(1, doc.get("version").asInt());
+        assertTrue(doc.has("metadata"));
+        assertTrue(doc.get("metadata").has("*"));
+        assertTrue(doc.get("events").isArray());
+        assertEquals(1, doc.get("events").size());
+
+        JsonNode event = doc.get("events").get(0);
+        assertEquals("test", event.get("type").asText());
+        assertEquals(2, event.get("version").asInt()); // has session/module/suite id
+        JsonNode content = event.get("content");
+        assertEquals(123L, content.get(Tags.TEST_SESSION_ID).asLong());
+        assertEquals(456L, content.get(Tags.TEST_MODULE_ID).asLong());
+        assertEquals(789L, content.get(Tags.TEST_SUITE_ID).asLong());
+        assertEquals("corr-1", content.get(Tags.ITR_CORRELATION_ID).asText());
+        // trace/span/parent ids must be JSON numbers (backend schema rejects strings)
+        assertTrue(content.get("trace_id").isNumber(), "trace_id should be a JSON number");
+        assertTrue(content.get("span_id").isNumber(), "span_id should be a JSON number");
+        assertTrue(content.get("parent_id").isNumber(), "parent_id should be a JSON number");
+    }
+
+    @Test
+    void citestcycleStripsCiGitOsRuntimeTagsAndWellKnownFields(@TempDir Path outputDir) throws IOException {
+        FileBasedPayloadDispatcher dispatcher =
+                new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
+        Map<String, Object> tags = new HashMap<>();
+        tags.put("ci.provider.name", "github");
+        tags.put("git.branch", "main");
+        tags.put("os.name", "linux");
+        tags.put("runtime.name", "openjdk");
+        tags.put("runtime-id", "uuid");
+        tags.put("pr.number", "42");
+        tags.put("custom.tag", "kept");
+        tags.put("kept.metric", 99L);
+        CoreSpan<?> span = mockSpan(InternalSpanTypes.TEST, tags);
+
+        dispatcher.addTrace(Collections.singletonList(span));
+        dispatcher.flush();
+
+        JsonNode doc = JSON.readTree(listFiles(outputDir).get(0).toFile());
+        JsonNode content = doc.get("events").get(0).get("content");
+        JsonNode meta = content.get("meta");
+        JsonNode metrics = content.get("metrics");
+
+        assertFalse(meta.has("ci.provider.name"));
+        assertFalse(meta.has("git.branch"));
+        assertFalse(meta.has("os.name"));
+        assertFalse(meta.has("runtime.name"));
+        assertFalse(meta.has("runtime-id"));
+        assertFalse(meta.has("pr.number"));
+
+        assertEquals("kept", meta.get("custom.tag").asText());
+        assertEquals(99L, metrics.get("kept.metric").asLong());
     }
-    Collections.sort(filenames);
 
-    assertEquals(2, filenames.size());
-    Pattern expected = Pattern.compile("tests-\\d+-\\d+-\\d+\\.json");
-    for (String name : filenames) {
-      assertTrue(expected.matcher(name).matches(), "filename does not match pattern: " + name);
+    @Test
+    void citestcycleTruncatesMetaValuesAndPreservesMetricsAndTopLevelIds(@TempDir Path outputDir) throws IOException {
+        FileBasedPayloadDispatcher dispatcher =
+                new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
+        String longValue = longString(CIConstants.MAX_META_STRING_VALUE_LENGTH + 1, 'a');
+        String exactValue = longString(CIConstants.MAX_META_STRING_VALUE_LENGTH, 'b');
+        Map<String, Object> tags = new HashMap<>();
+        tags.put(Tags.TEST_SESSION_ID, DDTraceId.from(123));
+        tags.put(Tags.TEST_MODULE_ID, 456L);
+        tags.put(Tags.TEST_SUITE_ID, 789L);
+        tags.put("custom.tag", longValue);
+        tags.put("exact.tag", exactValue);
+        tags.put("custom.metric", 42L);
+        CoreSpan<?> span = mockSpan(InternalSpanTypes.TEST, tags);
+
+        dispatcher.addTrace(Collections.singletonList(span));
+        dispatcher.flush();
+
+        JsonNode content = JSON.readTree(listFiles(outputDir).get(0).toFile())
+                .get("events")
+                .get(0)
+                .get("content");
+        JsonNode meta = content.get("meta");
+        JsonNode metrics = content.get("metrics");
+
+        assertEquals(
+                longValue.substring(0, CIConstants.MAX_META_STRING_VALUE_LENGTH),
+                meta.get("custom.tag").asText());
+        assertEquals(
+                CIConstants.MAX_META_STRING_VALUE_LENGTH,
+                meta.get("custom.tag").asText().length());
+        assertEquals(exactValue, meta.get("exact.tag").asText());
+        assertEquals(42L, metrics.get("custom.metric").asLong());
+        assertFalse(meta.has(Tags.TEST_SESSION_ID));
+        assertFalse(meta.has(Tags.TEST_MODULE_ID));
+        assertFalse(meta.has(Tags.TEST_SUITE_ID));
+        assertEquals(123L, content.get(Tags.TEST_SESSION_ID).asLong());
+        assertEquals(456L, content.get(Tags.TEST_MODULE_ID).asLong());
+        assertEquals(789L, content.get(Tags.TEST_SUITE_ID).asLong());
     }
-    // sequence is the last number — must differ between the two files
-    assertFalse(filenames.get(0).equals(filenames.get(1)));
-  }
-
-  @Test
-  void flushClearsAccumulatorSoSubsequentFlushIsNoOp(@TempDir Path outputDir) throws IOException {
-    FileBasedPayloadDispatcher dispatcher =
-        new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
-    CoreSpan<?> span = mockSpan(InternalSpanTypes.TEST, Collections.emptyMap());
-
-    dispatcher.addTrace(Collections.singletonList(span));
-    dispatcher.flush();
-    dispatcher.flush();
-
-    assertEquals(1, listFiles(outputDir).size());
-  }
-
-  @Test
-  void outputDirectoryIsCreatedOnFirstFlush(@TempDir Path tmp) throws IOException {
-    Path nested = tmp.resolve("nested/does-not-exist");
-    assertFalse(Files.exists(nested));
-    FileBasedPayloadDispatcher dispatcher =
-        new FileBasedPayloadDispatcher(nested.toString(), "tests", TrackType.CITESTCYCLE);
-    dispatcher.addTrace(
-        Collections.singletonList(mockSpan(InternalSpanTypes.TEST, Collections.emptyMap())));
-
-    dispatcher.flush();
-
-    assertTrue(Files.isDirectory(nested));
-    assertEquals(1, listFiles(nested).size());
-  }
-
-  @SuppressWarnings("unchecked")
-  private static CoreSpan<?> mockSpan(CharSequence type, Map<String, Object> tags) {
-    CoreSpan<?> span = mock(CoreSpan.class);
-    when(span.getType()).thenReturn(type);
-    when(span.getTraceId()).thenReturn(DDTraceId.from(1L));
-    when(span.getSpanId()).thenReturn(100L);
-    when(span.getParentId()).thenReturn(0L);
-    when(span.getServiceName()).thenReturn("service");
-    when(span.getOperationName()).thenReturn("operation");
-    when(span.getResourceName()).thenReturn("resource");
-    when(span.getStartTime()).thenReturn(1_000_000L);
-    when(span.getDurationNano()).thenReturn(500_000L);
-    when(span.getError()).thenReturn(0);
-
-    // getTag is called for known top-level tags; return a value when present, else null
-    when(span.getTag(any(String.class))).thenAnswer(inv -> tags.get((String) inv.getArgument(0)));
-
-    // processTagsAndBaggage invokes the consumer with a Metadata built from the tags map
-    Metadata metadata =
-        new Metadata(
-            Thread.currentThread().getId(),
-            null,
-            TagMap.fromMap(tags),
-            Collections.<String, String>emptyMap(),
-            0,
-            false,
-            false,
-            0,
-            null,
-            0,
-            null,
-            null,
-            null);
-    doAnswer(
-            inv -> {
-              MetadataConsumer consumer = inv.getArgument(0);
-              consumer.accept(metadata);
-              return null;
-            })
-        .when(span)
-        .processTagsAndBaggage(any(MetadataConsumer.class));
-
-    return span;
-  }
-
-  private static List<Path> listFiles(Path dir) throws IOException {
-    List<Path> files = new ArrayList<>();
-    try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
-      for (Path p : stream) {
-        files.add(p);
-      }
+
+    @Test
+    void citestcycleAssignsEventTypesForSessionModuleSuiteTestSpanSpans(@TempDir Path outputDir) throws IOException {
+        FileBasedPayloadDispatcher dispatcher =
+                new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
+        List<CoreSpan<?>> spans = Arrays.asList(
+                mockSpan(InternalSpanTypes.TEST_SESSION_END, Collections.emptyMap()),
+                mockSpan(InternalSpanTypes.TEST_MODULE_END, Collections.emptyMap()),
+                mockSpan(InternalSpanTypes.TEST_SUITE_END, Collections.emptyMap()),
+                mockSpan(InternalSpanTypes.TEST, Collections.emptyMap()),
+                mockSpan("other-span-type", Collections.emptyMap()));
+
+        dispatcher.addTrace(spans);
+        dispatcher.flush();
+
+        JsonNode events = JSON.readTree(listFiles(outputDir).get(0).toFile()).get("events");
+        assertEquals(5, events.size());
+        assertEquals(
+                InternalSpanTypes.TEST_SESSION_END.toString(),
+                events.get(0).get("type").asText());
+        assertEquals(
+                InternalSpanTypes.TEST_MODULE_END.toString(),
+                events.get(1).get("type").asText());
+        assertEquals(
+                InternalSpanTypes.TEST_SUITE_END.toString(),
+                events.get(2).get("type").asText());
+        assertEquals(
+                InternalSpanTypes.TEST.toString(), events.get(3).get("type").asText());
+        assertEquals("span", events.get(4).get("type").asText());
+        // session/module/suite events do not have trace/span/parent ids
+        assertFalse(events.get(0).get("content").has("trace_id"));
+        assertFalse(events.get(1).get("content").has("trace_id"));
+        assertFalse(events.get(2).get("content").has("trace_id"));
+        // test and span events do
+        assertTrue(events.get(3).get("content").has("trace_id"));
+        assertTrue(events.get(4).get("content").has("trace_id"));
+    }
+
+    @Test
+    void citestcovSkipsNonTestSpansAndEmptyReports(@TempDir Path outputDir) throws IOException {
+        FileBasedPayloadDispatcher dispatcher =
+                new FileBasedPayloadDispatcher(outputDir.toString(), "coverage", TrackType.CITESTCOV);
+        CoreSpan<?> nonTest = mockSpan("not-a-test", Collections.emptyMap());
+        CoreSpan<?> testNoCoverage = mockSpan(InternalSpanTypes.TEST, Collections.emptyMap());
+
+        dispatcher.addTrace(Arrays.asList(nonTest, testNoCoverage));
+        dispatcher.flush();
+
+        assertTrue(listFiles(outputDir).isEmpty());
+    }
+
+    @Test
+    void filenameFollowsPrefixNsPidSeqConvention(@TempDir Path outputDir) throws IOException {
+        FileBasedPayloadDispatcher dispatcher =
+                new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
+        CoreSpan<?> span = mockSpan(InternalSpanTypes.TEST, Collections.emptyMap());
+
+        dispatcher.addTrace(Collections.singletonList(span));
+        dispatcher.flush();
+        dispatcher.addTrace(Collections.singletonList(span));
+        dispatcher.flush();
+
+        List<String> filenames = new ArrayList<>();
+        for (Path p : listFiles(outputDir)) {
+            filenames.add(p.getFileName().toString());
+        }
+        Collections.sort(filenames);
+
+        assertEquals(2, filenames.size());
+        Pattern expected = Pattern.compile("tests-\\d+-\\d+-\\d+\\.json");
+        for (String name : filenames) {
+            assertTrue(expected.matcher(name).matches(), "filename does not match pattern: " + name);
+        }
+        // sequence is the last number — must differ between the two files
+        assertFalse(filenames.get(0).equals(filenames.get(1)));
+    }
+
+    @Test
+    void flushClearsAccumulatorSoSubsequentFlushIsNoOp(@TempDir Path outputDir) throws IOException {
+        FileBasedPayloadDispatcher dispatcher =
+                new FileBasedPayloadDispatcher(outputDir.toString(), "tests", TrackType.CITESTCYCLE);
+        CoreSpan<?> span = mockSpan(InternalSpanTypes.TEST, Collections.emptyMap());
+
+        dispatcher.addTrace(Collections.singletonList(span));
+        dispatcher.flush();
+        dispatcher.flush();
+
+        assertEquals(1, listFiles(outputDir).size());
+    }
+
+    @Test
+    void outputDirectoryIsCreatedOnFirstFlush(@TempDir Path tmp) throws IOException {
+        Path nested = tmp.resolve("nested/does-not-exist");
+        assertFalse(Files.exists(nested));
+        FileBasedPayloadDispatcher dispatcher =
+                new FileBasedPayloadDispatcher(nested.toString(), "tests", TrackType.CITESTCYCLE);
+        dispatcher.addTrace(Collections.singletonList(mockSpan(InternalSpanTypes.TEST, Collections.emptyMap())));
+
+        dispatcher.flush();
+
+        assertTrue(Files.isDirectory(nested));
+        assertEquals(1, listFiles(nested).size());
+    }
+
+    @SuppressWarnings("unchecked")
+    private static CoreSpan<?> mockSpan(CharSequence type, Map<String, Object> tags) {
+        CoreSpan<?> span = mock(CoreSpan.class);
+        when(span.getType()).thenReturn(type);
+        when(span.getTraceId()).thenReturn(DDTraceId.from(1L));
+        when(span.getSpanId()).thenReturn(100L);
+        when(span.getParentId()).thenReturn(0L);
+        when(span.getServiceName()).thenReturn("service");
+        when(span.getOperationName()).thenReturn("operation");
+        when(span.getResourceName()).thenReturn("resource");
+        when(span.getStartTime()).thenReturn(1_000_000L);
+        when(span.getDurationNano()).thenReturn(500_000L);
+        when(span.getError()).thenReturn(0);
+
+        // getTag is called for known top-level tags; return a value when present, else null
+        when(span.getTag(any(String.class))).thenAnswer(inv -> tags.get((String) inv.getArgument(0)));
+
+        // processTagsAndBaggage invokes the consumer with a Metadata built from the tags map
+        Metadata metadata = new Metadata(
+                Thread.currentThread().getId(),
+                null,
+                TagMap.fromMap(tags),
+                Collections.<String, String>emptyMap(),
+                0,
+                false,
+                false,
+                0,
+                null,
+                0,
+                null,
+                null,
+                null);
+        doAnswer(inv -> {
+                    MetadataConsumer consumer = inv.getArgument(0);
+                    consumer.accept(metadata);
+                    return null;
+                })
+                .when(span)
+                .processTagsAndBaggage(any(MetadataConsumer.class));
+
+        return span;
+    }
+
+    private static List<Path> listFiles(Path dir) throws IOException {
+        List<Path> files = new ArrayList<>();
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
+            for (Path p : stream) {
+                files.add(p);
+            }
+        }
+        return files;
+    }
+
+    private static String longString(int length, char value) {
+        char[] chars = new char[length];
+        Arrays.fill(chars, value);
+        return new String(chars);
     }
-    return files;
-  }
-
-  private static String longString(int length, char value) {
-    char[] chars = new char[length];
-    Arrays.fill(chars, value);
-    return new String(chars);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/MultiWriterTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/MultiWriterTest.java
index 3dd2819f39d..bf0b1f8b681 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/MultiWriterTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/MultiWriterTest.java
@@ -16,64 +16,64 @@
 
 class MultiWriterTest extends DDJavaSpecification {
 
-  @Test
-  void testThatMultiWriterDelegatesToAll() {
-    Writer[] writers = new Writer[3];
-    Writer mockW1 = mock(Writer.class);
-    Writer mockW2 = mock(Writer.class);
-    writers[0] = mockW1;
-    // null in position 1 to check that we skip that
-    writers[2] = mockW2;
-    MultiWriter writer = new MultiWriter(writers);
-    List<DDSpan> trace = new LinkedList<>();
-
-    writer.start();
-
-    verify(mockW1).start();
-    verify(mockW2).start();
-    verifyNoMoreInteractions(mockW1, mockW2);
-    clearInvocations(mockW1, mockW2);
-
-    writer.write(trace);
-
-    verify(mockW1).write(trace);
-    verify(mockW2).write(trace);
-    verifyNoMoreInteractions(mockW1, mockW2);
-    clearInvocations(mockW1, mockW2);
-
-    // flush (both return true)
-    when(mockW1.flush()).thenReturn(true);
-    when(mockW2.flush()).thenReturn(true);
-    boolean flushed = writer.flush();
-
-    verify(mockW1).flush();
-    verify(mockW2).flush();
-    verifyNoMoreInteractions(mockW1, mockW2);
-    assertTrue(flushed);
-    clearInvocations(mockW1, mockW2);
-
-    // flush (one returns false)
-    when(mockW1.flush()).thenReturn(true);
-    when(mockW2.flush()).thenReturn(false);
-    boolean notFlushed = writer.flush();
-
-    verify(mockW1).flush();
-    verify(mockW2).flush();
-    verifyNoMoreInteractions(mockW1, mockW2);
-    assertFalse(notFlushed);
-    clearInvocations(mockW1, mockW2);
-
-    writer.close();
-
-    verify(mockW1).close();
-    verify(mockW2).close();
-    verifyNoMoreInteractions(mockW1, mockW2);
-    clearInvocations(mockW1, mockW2);
-
-    writer.incrementDropCounts(0);
-
-    verify(mockW1).incrementDropCounts(0);
-    verify(mockW2).incrementDropCounts(0);
-    verifyNoMoreInteractions(mockW1, mockW2);
-  }
+    @Test
+    void testThatMultiWriterDelegatesToAll() {
+        Writer[] writers = new Writer[3];
+        Writer mockW1 = mock(Writer.class);
+        Writer mockW2 = mock(Writer.class);
+        writers[0] = mockW1;
+        // null in position 1 to check that we skip that
+        writers[2] = mockW2;
+        MultiWriter writer = new MultiWriter(writers);
+        List<DDSpan> trace = new LinkedList<>();
+
+        writer.start();
+
+        verify(mockW1).start();
+        verify(mockW2).start();
+        verifyNoMoreInteractions(mockW1, mockW2);
+        clearInvocations(mockW1, mockW2);
+
+        writer.write(trace);
+
+        verify(mockW1).write(trace);
+        verify(mockW2).write(trace);
+        verifyNoMoreInteractions(mockW1, mockW2);
+        clearInvocations(mockW1, mockW2);
+
+        // flush (both return true)
+        when(mockW1.flush()).thenReturn(true);
+        when(mockW2.flush()).thenReturn(true);
+        boolean flushed = writer.flush();
+
+        verify(mockW1).flush();
+        verify(mockW2).flush();
+        verifyNoMoreInteractions(mockW1, mockW2);
+        assertTrue(flushed);
+        clearInvocations(mockW1, mockW2);
+
+        // flush (one returns false)
+        when(mockW1.flush()).thenReturn(true);
+        when(mockW2.flush()).thenReturn(false);
+        boolean notFlushed = writer.flush();
+
+        verify(mockW1).flush();
+        verify(mockW2).flush();
+        verifyNoMoreInteractions(mockW1, mockW2);
+        assertFalse(notFlushed);
+        clearInvocations(mockW1, mockW2);
+
+        writer.close();
+
+        verify(mockW1).close();
+        verify(mockW2).close();
+        verifyNoMoreInteractions(mockW1, mockW2);
+        clearInvocations(mockW1, mockW2);
+
+        writer.incrementDropCounts(0);
+
+        verify(mockW1).incrementDropCounts(0);
+        verify(mockW2).incrementDropCounts(0);
+        verifyNoMoreInteractions(mockW1, mockW2);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/OtlpPayloadDispatcherTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/OtlpPayloadDispatcherTest.java
index 280e37f0f41..47a506fd1d9 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/OtlpPayloadDispatcherTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/OtlpPayloadDispatcherTest.java
@@ -33,267 +33,268 @@
 
 @ExtendWith(MockitoExtension.class)
 class OtlpPayloadDispatcherTest {
-  @Mock OtlpSender sender;
-
-  TestCollector collector = new TestCollector();
-
-  @BeforeEach
-  void stubSuccessfulSend() {
-    lenient().when(sender.send(any())).thenReturn(RemoteApi.Response.success(200));
-    OtlpTelemetry.getInstance().prepareMetrics();
-    OtlpTelemetry.getInstance().drain();
-  }
+    @Mock
+    OtlpSender sender;
 
-  @Test
-  void sampledTraceForwardsAllSpans() {
-    OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
-    List<CoreSpan<?>> trace = Arrays.asList(sampledSpan(), sampledSpan());
-
-    dispatcher.addTrace(trace);
-    assertEquals(collector.spansToExport, trace);
-    dispatcher.flush();
-
-    // expect two spans to be exported
-    ArgumentCaptor<OtlpPayload> captor = ArgumentCaptor.forClass(OtlpPayload.class);
-    verify(sender).send(captor.capture());
-    assertEquals(2 /*spans*/, captor.getValue().getContentLength());
-  }
-
-  @Test
-  void droppedTraceWithoutSingleSpanSamplingForwardsNothing() {
-    OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
-
-    dispatcher.addTrace(Arrays.asList(droppedSpan(), droppedSpan()));
-    assertEquals(collector.spansToExport, emptyList());
-    dispatcher.flush();
-
-    verifyNoInteractions(sender);
-  }
-
-  @Test
-  void unsetPriorityTraceWithoutSingleSpanSamplingForwardsNothing() {
-    OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
-
-    dispatcher.addTrace(Arrays.asList(unsetSpan(), unsetSpan()));
-    assertEquals(collector.spansToExport, emptyList());
-    dispatcher.flush();
-
-    verifyNoInteractions(sender);
-  }
-
-  @Test
-  void droppedTraceWithSingleSpanSampledForwardsOnlyThoseSpans() {
-    OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
-    CoreSpan<?> keep = singleSpanSampledSpan();
-    CoreSpan<?> drop1 = droppedSpan();
-    CoreSpan<?> drop2 = droppedSpan();
-
-    dispatcher.addTrace(Arrays.asList(drop1, keep, drop2));
-    assertEquals(collector.spansToExport, singletonList(keep));
-    dispatcher.flush();
-
-    // expect only one span to be exported
-    ArgumentCaptor<OtlpPayload> captor = ArgumentCaptor.forClass(OtlpPayload.class);
-    verify(sender).send(captor.capture());
-    assertEquals(1 /*spans*/, captor.getValue().getContentLength());
-  }
-
-  @Test
-  void emptyTraceForwardsNothing() {
-    OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
-
-    dispatcher.addTrace(emptyList());
-    dispatcher.flush();
-
-    verifyNoInteractions(sender);
-  }
-
-  @Test
-  void largeTraceTriggersProactiveFlushWithoutExplicitFlush() {
-    OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
-    collector.fakeSizeInBytes = Integer.MAX_VALUE;
-
-    dispatcher.addTrace(singletonList(sampledSpan()));
-
-    // no explicit dispatcher.flush() call
-    ArgumentCaptor<OtlpPayload> captor = ArgumentCaptor.forClass(OtlpPayload.class);
-    verify(sender).send(captor.capture());
-    assertEquals(1 /*spans*/, captor.getValue().getContentLength());
-  }
-
-  @Test
-  void belowFlushThresholdDoesNotTriggerProactiveFlush() {
-    OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
-    collector.fakeSizeInBytes = (5 << 20) - 1; // one byte under FLUSH_THRESHOLD_BYTES
-
-    dispatcher.addTrace(singletonList(sampledSpan()));
-
-    verifyNoInteractions(sender);
-  }
-
-  @Test
-  void atFlushThresholdTriggersProactiveFlush() {
-    OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
-    collector.fakeSizeInBytes = 5 << 20; // exactly FLUSH_THRESHOLD_BYTES
-
-    dispatcher.addTrace(singletonList(sampledSpan()));
-
-    verify(sender).send(any(OtlpPayload.class));
-  }
-
-  @Test
-  void flushSwallowsCollectorFailureInsteadOfPropagating() {
-    // e.g. a held-back span pushes the payload over the buffer's hard cap only once
-    // collectTraces() finalizes it during a scheduled flush, not during addTrace()
-    OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
-    dispatcher.addTrace(singletonList(sampledSpan()));
-    collector.throwOnCollect = true;
-
-    dispatcher.flush();
-
-    verifyNoInteractions(sender);
-  }
-
-  @Test
-  void dispatcherRemainsUsableAfterCollectorFailure() {
-    OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
-    dispatcher.addTrace(singletonList(sampledSpan()));
-    collector.throwOnCollect = true;
-    dispatcher.flush();
-
-    collector.throwOnCollect = false;
-    dispatcher.addTrace(singletonList(sampledSpan()));
-    dispatcher.flush();
-
-    ArgumentCaptor<OtlpPayload> captor = ArgumentCaptor.forClass(OtlpPayload.class);
-    verify(sender).send(captor.capture());
-    assertEquals(1 /*spans*/, captor.getValue().getContentLength());
-  }
-
-  @Test
-  void flushRecordsSuccessfulExportTelemetry() {
-    RemoteApi.Response response = RemoteApi.Response.success(200);
-    when(sender.send(any())).thenReturn(response);
-    OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
-
-    dispatcher.addTrace(Arrays.asList(sampledSpan(), sampledSpan()));
-    dispatcher.flush();
-
-    Map<String, OtlpTelemetry.OtlpMetric> metrics = drainTracesTelemetry();
-    assertEquals(2, metrics.size());
-    assertEquals(1L, metrics.get("otel.traces_export_attempts").value);
-    assertEquals(1L, metrics.get("otel.traces_export_successes").value);
-  }
-
-  @Test
-  void flushRecordsFailedExportTelemetry() {
-    RemoteApi.Response response = RemoteApi.Response.failed(500);
-    when(sender.send(any())).thenReturn(response);
-    OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
-
-    dispatcher.addTrace(Arrays.asList(sampledSpan(), sampledSpan()));
-    dispatcher.flush();
-
-    Map<String, OtlpTelemetry.OtlpMetric> metrics = drainTracesTelemetry();
-    assertEquals(2, metrics.size());
-    assertEquals(1L, metrics.get("otel.traces_export_attempts").value);
-    assertEquals(1L, metrics.get("otel.traces_export_failures").value);
-  }
-
-  private static Map<String, OtlpTelemetry.OtlpMetric> drainTracesTelemetry() {
-    Map<String, OtlpTelemetry.OtlpMetric> byName = new HashMap<>();
-    OtlpTelemetry.getInstance().prepareMetrics();
-    for (OtlpTelemetry.OtlpMetric metric : OtlpTelemetry.getInstance().drain()) {
-      byName.put(metric.metricName, metric);
+    TestCollector collector = new TestCollector();
+
+    @BeforeEach
+    void stubSuccessfulSend() {
+        lenient().when(sender.send(any())).thenReturn(RemoteApi.Response.success(200));
+        OtlpTelemetry.getInstance().prepareMetrics();
+        OtlpTelemetry.getInstance().drain();
+    }
+
+    @Test
+    void sampledTraceForwardsAllSpans() {
+        OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
+        List<CoreSpan<?>> trace = Arrays.asList(sampledSpan(), sampledSpan());
+
+        dispatcher.addTrace(trace);
+        assertEquals(collector.spansToExport, trace);
+        dispatcher.flush();
+
+        // expect two spans to be exported
+        ArgumentCaptor<OtlpPayload> captor = ArgumentCaptor.forClass(OtlpPayload.class);
+        verify(sender).send(captor.capture());
+        assertEquals(2 /*spans*/, captor.getValue().getContentLength());
+    }
+
+    @Test
+    void droppedTraceWithoutSingleSpanSamplingForwardsNothing() {
+        OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
+
+        dispatcher.addTrace(Arrays.asList(droppedSpan(), droppedSpan()));
+        assertEquals(collector.spansToExport, emptyList());
+        dispatcher.flush();
+
+        verifyNoInteractions(sender);
+    }
+
+    @Test
+    void unsetPriorityTraceWithoutSingleSpanSamplingForwardsNothing() {
+        OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
+
+        dispatcher.addTrace(Arrays.asList(unsetSpan(), unsetSpan()));
+        assertEquals(collector.spansToExport, emptyList());
+        dispatcher.flush();
+
+        verifyNoInteractions(sender);
+    }
+
+    @Test
+    void droppedTraceWithSingleSpanSampledForwardsOnlyThoseSpans() {
+        OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
+        CoreSpan<?> keep = singleSpanSampledSpan();
+        CoreSpan<?> drop1 = droppedSpan();
+        CoreSpan<?> drop2 = droppedSpan();
+
+        dispatcher.addTrace(Arrays.asList(drop1, keep, drop2));
+        assertEquals(collector.spansToExport, singletonList(keep));
+        dispatcher.flush();
+
+        // expect only one span to be exported
+        ArgumentCaptor<OtlpPayload> captor = ArgumentCaptor.forClass(OtlpPayload.class);
+        verify(sender).send(captor.capture());
+        assertEquals(1 /*spans*/, captor.getValue().getContentLength());
+    }
+
+    @Test
+    void emptyTraceForwardsNothing() {
+        OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
+
+        dispatcher.addTrace(emptyList());
+        dispatcher.flush();
+
+        verifyNoInteractions(sender);
+    }
+
+    @Test
+    void largeTraceTriggersProactiveFlushWithoutExplicitFlush() {
+        OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
+        collector.fakeSizeInBytes = Integer.MAX_VALUE;
+
+        dispatcher.addTrace(singletonList(sampledSpan()));
+
+        // no explicit dispatcher.flush() call
+        ArgumentCaptor<OtlpPayload> captor = ArgumentCaptor.forClass(OtlpPayload.class);
+        verify(sender).send(captor.capture());
+        assertEquals(1 /*spans*/, captor.getValue().getContentLength());
+    }
+
+    @Test
+    void belowFlushThresholdDoesNotTriggerProactiveFlush() {
+        OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
+        collector.fakeSizeInBytes = (5 << 20) - 1; // one byte under FLUSH_THRESHOLD_BYTES
+
+        dispatcher.addTrace(singletonList(sampledSpan()));
+
+        verifyNoInteractions(sender);
+    }
+
+    @Test
+    void atFlushThresholdTriggersProactiveFlush() {
+        OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
+        collector.fakeSizeInBytes = 5 << 20; // exactly FLUSH_THRESHOLD_BYTES
+
+        dispatcher.addTrace(singletonList(sampledSpan()));
+
+        verify(sender).send(any(OtlpPayload.class));
+    }
+
+    @Test
+    void flushSwallowsCollectorFailureInsteadOfPropagating() {
+        // e.g. a held-back span pushes the payload over the buffer's hard cap only once
+        // collectTraces() finalizes it during a scheduled flush, not during addTrace()
+        OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
+        dispatcher.addTrace(singletonList(sampledSpan()));
+        collector.throwOnCollect = true;
+
+        dispatcher.flush();
+
+        verifyNoInteractions(sender);
     }
-    return byName;
-  }
-
-  @Test
-  void getApisIsEmpty() {
-    OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
-
-    assertTrue(dispatcher.getApis().isEmpty());
-  }
-
-  @Test
-  void onDroppedTraceDoesNothing() {
-    OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
-
-    dispatcher.onDroppedTrace(5);
-    dispatcher.flush();
-
-    verifyNoInteractions(sender);
-  }
-
-  private static CoreSpan<?> sampledSpan() {
-    CoreSpan<?> span = mock(CoreSpan.class);
-    when(span.samplingPriority()).thenReturn(1);
-    return span;
-  }
-
-  private static CoreSpan<?> droppedSpan() {
-    CoreSpan<?> span = mock(CoreSpan.class);
-    when(span.samplingPriority()).thenReturn(0);
-    when(span.getTag(SPAN_SAMPLING_MECHANISM_TAG)).thenReturn(null);
-    return span;
-  }
-
-  private static CoreSpan<?> singleSpanSampledSpan() {
-    CoreSpan<?> span = mock(CoreSpan.class);
-    when(span.samplingPriority()).thenReturn(0);
-    when(span.getTag(SPAN_SAMPLING_MECHANISM_TAG)).thenReturn(8);
-    return span;
-  }
-
-  private static CoreSpan<?> unsetSpan() {
-    CoreSpan<?> span = mock(CoreSpan.class);
-    when(span.samplingPriority()).thenReturn((int) PrioritySampling.UNSET);
-    when(span.getTag(SPAN_SAMPLING_MECHANISM_TAG)).thenReturn(null);
-    return span;
-  }
-
-  /** Test collector that creates payloads whose size equals the number of exported spans. */
-  private static class TestCollector extends OtlpTraceCollector {
-    final List<CoreSpan<?>> spansToExport = new ArrayList<>();
-
-    // lets tests drive the proactive-flush threshold independently of spansToExport
-    int fakeSizeInBytes;
-
-    // lets tests simulate a collectTraces() failure, e.g. a buffer overflow on the held-back span
-    boolean throwOnCollect;
-
-    @Override
-    public void addTrace(List<? extends CoreSpan<?>> spans) {
-      for (CoreSpan<?> span : spans) {
-        if (shouldExport(span)) {
-          spansToExport.add(span);
+
+    @Test
+    void dispatcherRemainsUsableAfterCollectorFailure() {
+        OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
+        dispatcher.addTrace(singletonList(sampledSpan()));
+        collector.throwOnCollect = true;
+        dispatcher.flush();
+
+        collector.throwOnCollect = false;
+        dispatcher.addTrace(singletonList(sampledSpan()));
+        dispatcher.flush();
+
+        ArgumentCaptor<OtlpPayload> captor = ArgumentCaptor.forClass(OtlpPayload.class);
+        verify(sender).send(captor.capture());
+        assertEquals(1 /*spans*/, captor.getValue().getContentLength());
+    }
+
+    @Test
+    void flushRecordsSuccessfulExportTelemetry() {
+        RemoteApi.Response response = RemoteApi.Response.success(200);
+        when(sender.send(any())).thenReturn(response);
+        OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
+
+        dispatcher.addTrace(Arrays.asList(sampledSpan(), sampledSpan()));
+        dispatcher.flush();
+
+        Map<String, OtlpTelemetry.OtlpMetric> metrics = drainTracesTelemetry();
+        assertEquals(2, metrics.size());
+        assertEquals(1L, metrics.get("otel.traces_export_attempts").value);
+        assertEquals(1L, metrics.get("otel.traces_export_successes").value);
+    }
+
+    @Test
+    void flushRecordsFailedExportTelemetry() {
+        RemoteApi.Response response = RemoteApi.Response.failed(500);
+        when(sender.send(any())).thenReturn(response);
+        OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
+
+        dispatcher.addTrace(Arrays.asList(sampledSpan(), sampledSpan()));
+        dispatcher.flush();
+
+        Map<String, OtlpTelemetry.OtlpMetric> metrics = drainTracesTelemetry();
+        assertEquals(2, metrics.size());
+        assertEquals(1L, metrics.get("otel.traces_export_attempts").value);
+        assertEquals(1L, metrics.get("otel.traces_export_failures").value);
+    }
+
+    private static Map<String, OtlpTelemetry.OtlpMetric> drainTracesTelemetry() {
+        Map<String, OtlpTelemetry.OtlpMetric> byName = new HashMap<>();
+        OtlpTelemetry.getInstance().prepareMetrics();
+        for (OtlpTelemetry.OtlpMetric metric : OtlpTelemetry.getInstance().drain()) {
+            byName.put(metric.metricName, metric);
         }
-      }
+        return byName;
+    }
+
+    @Test
+    void getApisIsEmpty() {
+        OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
+
+        assertTrue(dispatcher.getApis().isEmpty());
+    }
+
+    @Test
+    void onDroppedTraceDoesNothing() {
+        OtlpPayloadDispatcher dispatcher = new OtlpPayloadDispatcher(sender, collector);
+
+        dispatcher.onDroppedTrace(5);
+        dispatcher.flush();
+
+        verifyNoInteractions(sender);
+    }
+
+    private static CoreSpan<?> sampledSpan() {
+        CoreSpan<?> span = mock(CoreSpan.class);
+        when(span.samplingPriority()).thenReturn(1);
+        return span;
+    }
+
+    private static CoreSpan<?> droppedSpan() {
+        CoreSpan<?> span = mock(CoreSpan.class);
+        when(span.samplingPriority()).thenReturn(0);
+        when(span.getTag(SPAN_SAMPLING_MECHANISM_TAG)).thenReturn(null);
+        return span;
+    }
+
+    private static CoreSpan<?> singleSpanSampledSpan() {
+        CoreSpan<?> span = mock(CoreSpan.class);
+        when(span.samplingPriority()).thenReturn(0);
+        when(span.getTag(SPAN_SAMPLING_MECHANISM_TAG)).thenReturn(8);
+        return span;
     }
 
-    @Override
-    public OtlpPayload collectTraces() {
-      if (throwOnCollect) {
-        // mirrors the real collectors, which always reset state via a finally block
-        spansToExport.clear();
-        throw new IllegalStateException("simulated buffer overflow");
-      }
-      if (spansToExport.isEmpty()) {
-        return OtlpPayload.EMPTY;
-      }
-      try {
-        // number of bytes returned represents the number of exported spans
-        int contentLength = spansToExport.size();
-        return new OtlpPayload(ByteBuffer.allocate(contentLength), "application/octet-stream");
-      } finally {
-        spansToExport.clear();
-      }
+    private static CoreSpan<?> unsetSpan() {
+        CoreSpan<?> span = mock(CoreSpan.class);
+        when(span.samplingPriority()).thenReturn((int) PrioritySampling.UNSET);
+        when(span.getTag(SPAN_SAMPLING_MECHANISM_TAG)).thenReturn(null);
+        return span;
     }
 
-    @Override
-    public int sizeInBytes() {
-      return fakeSizeInBytes;
+    /** Test collector that creates payloads whose size equals the number of exported spans. */
+    private static class TestCollector extends OtlpTraceCollector {
+        final List<CoreSpan<?>> spansToExport = new ArrayList<>();
+
+        // lets tests drive the proactive-flush threshold independently of spansToExport
+        int fakeSizeInBytes;
+
+        // lets tests simulate a collectTraces() failure, e.g. a buffer overflow on the held-back span
+        boolean throwOnCollect;
+
+        @Override
+        public void addTrace(List<? extends CoreSpan<?>> spans) {
+            for (CoreSpan<?> span : spans) {
+                if (shouldExport(span)) {
+                    spansToExport.add(span);
+                }
+            }
+        }
+
+        @Override
+        public OtlpPayload collectTraces() {
+            if (throwOnCollect) {
+                // mirrors the real collectors, which always reset state via a finally block
+                spansToExport.clear();
+                throw new IllegalStateException("simulated buffer overflow");
+            }
+            if (spansToExport.isEmpty()) {
+                return OtlpPayload.EMPTY;
+            }
+            try {
+                // number of bytes returned represents the number of exported spans
+                int contentLength = spansToExport.size();
+                return new OtlpPayload(ByteBuffer.allocate(contentLength), "application/octet-stream");
+            } finally {
+                spansToExport.clear();
+            }
+        }
+
+        @Override
+        public int sizeInBytes() {
+            return fakeSizeInBytes;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/OtlpWriterCombinedTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/OtlpWriterCombinedTest.java
index 3da45b1b1e4..457fb041bf7 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/OtlpWriterCombinedTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/OtlpWriterCombinedTest.java
@@ -17,40 +17,36 @@
 @Timeout(value = 10, unit = TimeUnit.SECONDS)
 class OtlpWriterCombinedTest extends DDCoreJavaSpecification {
 
-  @Test
-  void happyPathOverHttp() throws IOException, InterruptedException {
-    injectSysConfig(TRACE_OTEL_EXPORTER, "otlp");
+    @Test
+    void happyPathOverHttp() throws IOException, InterruptedException {
+        injectSysConfig(TRACE_OTEL_EXPORTER, "otlp");
 
-    CountDownLatch received = new CountDownLatch(1);
-    HttpServer server = HttpServer.create(new InetSocketAddress("localhost", 0), 0);
-    server.createContext(
-        "/v1/traces",
-        exchange -> {
-          received.countDown();
-          exchange.sendResponseHeaders(200, -1);
-          exchange.close();
+        CountDownLatch received = new CountDownLatch(1);
+        HttpServer server = HttpServer.create(new InetSocketAddress("localhost", 0), 0);
+        server.createContext("/v1/traces", exchange -> {
+            received.countDown();
+            exchange.sendResponseHeaders(200, -1);
+            exchange.close();
         });
-    server.start();
+        server.start();
 
-    OtlpWriter writer =
-        OtlpWriter.builder()
-            .endpoint(
-                "http://"
-                    + server.getAddress().getHostString()
-                    + ":"
-                    + server.getAddress().getPort()
-                    + "/v1/traces")
-            .flushIntervalMilliseconds(-1)
-            .build();
-    CoreTracer tracer = tracerBuilder().writer(writer).build();
-    try {
-      tracer.buildSpan("test", "fakeOperation").start().finish();
-      writer.flush();
+        OtlpWriter writer = OtlpWriter.builder()
+                .endpoint("http://"
+                        + server.getAddress().getHostString()
+                        + ":"
+                        + server.getAddress().getPort()
+                        + "/v1/traces")
+                .flushIntervalMilliseconds(-1)
+                .build();
+        CoreTracer tracer = tracerBuilder().writer(writer).build();
+        try {
+            tracer.buildSpan("test", "fakeOperation").start().finish();
+            writer.flush();
 
-      assertTrue(received.await(5, TimeUnit.SECONDS), "OTLP server should receive a request");
-    } finally {
-      tracer.close();
-      server.stop(0);
+            assertTrue(received.await(5, TimeUnit.SECONDS), "OTLP server should receive a request");
+        } finally {
+            tracer.close();
+            server.stop(0);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/OtlpWriterTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/OtlpWriterTest.java
index df86d4384e3..748adefdac5 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/OtlpWriterTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/OtlpWriterTest.java
@@ -17,67 +17,68 @@
 @ExtendWith(MockitoExtension.class)
 class OtlpWriterTest {
 
-  @Mock OtlpSender sender;
+    @Mock
+    OtlpSender sender;
 
-  @Test
-  void closeShutsDownSender() {
-    OtlpWriter writer = OtlpWriter.builder().sender(sender).build();
-    writer.start();
+    @Test
+    void closeShutsDownSender() {
+        OtlpWriter writer = OtlpWriter.builder().sender(sender).build();
+        writer.start();
 
-    writer.close();
+        writer.close();
 
-    verify(sender).shutdown();
-  }
+        verify(sender).shutdown();
+    }
 
-  @Test
-  void getApisIsEmpty() {
-    OtlpWriter writer = OtlpWriter.builder().sender(sender).build();
-    writer.start();
-    try {
-      assertTrue(writer.getApis().isEmpty());
-    } finally {
-      writer.close();
+    @Test
+    void getApisIsEmpty() {
+        OtlpWriter writer = OtlpWriter.builder().sender(sender).build();
+        writer.start();
+        try {
+            assertTrue(writer.getApis().isEmpty());
+        } finally {
+            writer.close();
+        }
     }
-  }
 
-  @Test
-  void builderRespectsInjectedSenderAcrossProtocols() {
-    for (OtlpConfig.Protocol protocol : OtlpConfig.Protocol.values()) {
-      OtlpWriter writer = OtlpWriter.builder().protocol(protocol).sender(sender).build();
-      writer.start();
-      writer.close();
+    @Test
+    void builderRespectsInjectedSenderAcrossProtocols() {
+        for (OtlpConfig.Protocol protocol : OtlpConfig.Protocol.values()) {
+            OtlpWriter writer =
+                    OtlpWriter.builder().protocol(protocol).sender(sender).build();
+            writer.start();
+            writer.close();
+        }
+        // One shutdown per writer we built.
+        verify(sender, org.mockito.Mockito.times(OtlpConfig.Protocol.values().length))
+                .shutdown();
     }
-    // One shutdown per writer we built.
-    verify(sender, org.mockito.Mockito.times(OtlpConfig.Protocol.values().length)).shutdown();
-  }
 
-  @Test
-  void buildWithDefaultsDoesNotThrow() {
-    // Exercises the default-path sender construction (real OtlpHttpSender) without
-    // actually sending anything — start/close only. Guards against a default config
-    // that would otherwise fail at construction time.
-    assertDoesNotThrow(
-        () -> {
-          OtlpWriter writer = OtlpWriter.builder().build();
-          writer.start();
-          writer.close();
+    @Test
+    void buildWithDefaultsDoesNotThrow() {
+        // Exercises the default-path sender construction (real OtlpHttpSender) without
+        // actually sending anything — start/close only. Guards against a default config
+        // that would otherwise fail at construction time.
+        assertDoesNotThrow(() -> {
+            OtlpWriter writer = OtlpWriter.builder().build();
+            writer.start();
+            writer.close();
         });
-  }
+    }
 
-  @Test
-  void grpcProtocolUsesGrpcMethodPath() {
-    OtlpWriter writer =
-        OtlpWriter.builder()
-            .protocol(OtlpConfig.Protocol.GRPC)
-            .endpoint("http://localhost:4317")
-            .build();
-    try {
-      OtlpGrpcSender grpcSender = assertInstanceOf(OtlpGrpcSender.class, writer.getSender());
-      assertEquals(
-          "/opentelemetry.proto.collector.trace.v1.TraceService/Export",
-          grpcSender.url().encodedPath());
-    } finally {
-      writer.close();
+    @Test
+    void grpcProtocolUsesGrpcMethodPath() {
+        OtlpWriter writer = OtlpWriter.builder()
+                .protocol(OtlpConfig.Protocol.GRPC)
+                .endpoint("http://localhost:4317")
+                .build();
+        try {
+            OtlpGrpcSender grpcSender = assertInstanceOf(OtlpGrpcSender.class, writer.getSender());
+            assertEquals(
+                    "/opentelemetry.proto.collector.trace.v1.TraceService/Export",
+                    grpcSender.url().encodedPath());
+        } finally {
+            writer.close();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/PayloadDispatcherImplTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/PayloadDispatcherImplTest.java
index cf756003e7c..0fdc232390e 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/PayloadDispatcherImplTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/PayloadDispatcherImplTest.java
@@ -39,195 +39,181 @@
 
 class PayloadDispatcherImplTest extends DDJavaSpecification {
 
-  static final MonitoringImpl monitoring =
-      new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
+    static final MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
 
-  @Timeout(180)
-  // spotless:off
+    @Timeout(180)
+    // spotless:off
   @TableTest({
       "scenario | traceEndpoint",
       "v0.5     | 'v0.5/traces'",
       "v0.4     | 'v0.4/traces'"
   })
   // spotless:on
-  void testFlushAutomaticallyWhenDataLimitIsBreached(String traceEndpoint) throws Exception {
-    AtomicBoolean flushed = new AtomicBoolean();
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-    when(discovery.getTraceEndpoint()).thenReturn(traceEndpoint);
-    DDAgentApi api = mock(DDAgentApi.class);
-    when(api.sendSerializedTraces(any()))
-        .thenAnswer(
-            inv -> {
-              flushed.set(true);
-              return RemoteApi.Response.success(200);
-            });
-    PayloadDispatcherImpl dispatcher =
-        new PayloadDispatcherImpl(
-            new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring);
-    List<DDSpan> trace = Collections.singletonList(realSpan());
-
-    while (!flushed.get()) {
-      dispatcher.addTrace(trace);
+    void testFlushAutomaticallyWhenDataLimitIsBreached(String traceEndpoint) throws Exception {
+        AtomicBoolean flushed = new AtomicBoolean();
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+        when(discovery.getTraceEndpoint()).thenReturn(traceEndpoint);
+        DDAgentApi api = mock(DDAgentApi.class);
+        when(api.sendSerializedTraces(any())).thenAnswer(inv -> {
+            flushed.set(true);
+            return RemoteApi.Response.success(200);
+        });
+        PayloadDispatcherImpl dispatcher =
+                new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring);
+        List<DDSpan> trace = Collections.singletonList(realSpan());
+
+        while (!flushed.get()) {
+            dispatcher.addTrace(trace);
+        }
+
+        // the dispatcher has flushed
+        assertTrue(flushed.get());
     }
 
-    // the dispatcher has flushed
-    assertTrue(flushed.get());
-  }
+    @TableTest({
+      "scenario        | traceEndpoint | traceCount",
+      "v0.4 1 trace    | 'v0.4/traces' | 1         ",
+      "v0.4 10 traces  | 'v0.4/traces' | 10        ",
+      "v0.4 100 traces | 'v0.4/traces' | 100       ",
+      "v0.5 1 trace    | 'v0.5/traces' | 1         ",
+      "v0.5 10 traces  | 'v0.5/traces' | 10        ",
+      "v0.5 100 traces | 'v0.5/traces' | 100       "
+    })
+    void testShouldFlushBufferOnDemand(String traceEndpoint, int traceCount) throws Exception {
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+        DDAgentApi api = mock(DDAgentApi.class);
+        when(discovery.getTraceEndpoint()).thenReturn(traceEndpoint);
+        when(api.sendSerializedTraces(any())).thenReturn(RemoteApi.Response.success(200));
+        PayloadDispatcherImpl dispatcher =
+                new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring);
+        List<DDSpan> trace = Collections.singletonList(realSpan());
+
+        for (int i = 0; i < traceCount; ++i) {
+            dispatcher.addTrace(trace);
+        }
+        dispatcher.flush();
+
+        verify(discovery, org.mockito.Mockito.times(2)).getTraceEndpoint();
+        verify(healthMetrics).onSerialize(intThat(size -> size > 0));
+        verify(api).sendSerializedTraces(argThat(p -> p.traceCount() == traceCount));
+    }
 
-  @TableTest({
-    "scenario        | traceEndpoint | traceCount",
-    "v0.4 1 trace    | 'v0.4/traces' | 1         ",
-    "v0.4 10 traces  | 'v0.4/traces' | 10        ",
-    "v0.4 100 traces | 'v0.4/traces' | 100       ",
-    "v0.5 1 trace    | 'v0.5/traces' | 1         ",
-    "v0.5 10 traces  | 'v0.5/traces' | 10        ",
-    "v0.5 100 traces | 'v0.5/traces' | 100       "
-  })
-  void testShouldFlushBufferOnDemand(String traceEndpoint, int traceCount) throws Exception {
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-    DDAgentApi api = mock(DDAgentApi.class);
-    when(discovery.getTraceEndpoint()).thenReturn(traceEndpoint);
-    when(api.sendSerializedTraces(any())).thenReturn(RemoteApi.Response.success(200));
-    PayloadDispatcherImpl dispatcher =
-        new PayloadDispatcherImpl(
-            new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring);
-    List<DDSpan> trace = Collections.singletonList(realSpan());
-
-    for (int i = 0; i < traceCount; ++i) {
-      dispatcher.addTrace(trace);
+    @TableTest({
+      "scenario        | traceEndpoint | traceCount",
+      "v0.4 1 trace    | 'v0.4/traces' | 1         ",
+      "v0.4 10 traces  | 'v0.4/traces' | 10        ",
+      "v0.4 100 traces | 'v0.4/traces' | 100       ",
+      "v0.5 1 trace    | 'v0.5/traces' | 1         ",
+      "v0.5 10 traces  | 'v0.5/traces' | 10        ",
+      "v0.5 100 traces | 'v0.5/traces' | 100       "
+    })
+    void testShouldReportFailedRequestToMonitor(String traceEndpoint, int traceCount) throws Exception {
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+        DDAgentApi api = mock(DDAgentApi.class);
+        when(discovery.getTraceEndpoint()).thenReturn(traceEndpoint);
+        when(api.sendSerializedTraces(any())).thenReturn(RemoteApi.Response.failed(400));
+        PayloadDispatcherImpl dispatcher =
+                new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring);
+        List<DDSpan> trace = Collections.singletonList(realSpan());
+
+        for (int i = 0; i < traceCount; ++i) {
+            dispatcher.addTrace(trace);
+        }
+        dispatcher.flush();
+
+        verify(discovery, org.mockito.Mockito.times(2)).getTraceEndpoint();
+        verify(healthMetrics).onSerialize(intThat(size -> size > 0));
+        verify(api).sendSerializedTraces(argThat(p -> p.traceCount() == traceCount));
     }
-    dispatcher.flush();
 
-    verify(discovery, org.mockito.Mockito.times(2)).getTraceEndpoint();
-    verify(healthMetrics).onSerialize(intThat(size -> size > 0));
-    verify(api).sendSerializedTraces(argThat(p -> p.traceCount() == traceCount));
-  }
+    @Test
+    void testShouldDropTraceWhenThereIsNoAgentConnectivity() throws Exception {
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        DDAgentApi api = mock(DDAgentApi.class);
+        DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+        when(discovery.getTraceEndpoint()).thenReturn(null);
+        PayloadDispatcherImpl dispatcher =
+                new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring);
+        List<DDSpan> trace = Collections.singletonList(realSpan());
 
-  @TableTest({
-    "scenario        | traceEndpoint | traceCount",
-    "v0.4 1 trace    | 'v0.4/traces' | 1         ",
-    "v0.4 10 traces  | 'v0.4/traces' | 10        ",
-    "v0.4 100 traces | 'v0.4/traces' | 100       ",
-    "v0.5 1 trace    | 'v0.5/traces' | 1         ",
-    "v0.5 10 traces  | 'v0.5/traces' | 10        ",
-    "v0.5 100 traces | 'v0.5/traces' | 100       "
-  })
-  void testShouldReportFailedRequestToMonitor(String traceEndpoint, int traceCount)
-      throws Exception {
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-    DDAgentApi api = mock(DDAgentApi.class);
-    when(discovery.getTraceEndpoint()).thenReturn(traceEndpoint);
-    when(api.sendSerializedTraces(any())).thenReturn(RemoteApi.Response.failed(400));
-    PayloadDispatcherImpl dispatcher =
-        new PayloadDispatcherImpl(
-            new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring);
-    List<DDSpan> trace = Collections.singletonList(realSpan());
-
-    for (int i = 0; i < traceCount; ++i) {
-      dispatcher.addTrace(trace);
+        dispatcher.addTrace(trace);
+
+        verify(healthMetrics).onFailedPublish(eq((int) PrioritySampling.UNSET), anyInt());
+    }
+
+    @Test
+    void testTraceAndSpanCountsAreResetAfterAccess() {
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        DDAgentApi api = mock(DDAgentApi.class);
+        DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+        when(discovery.getTraceEndpoint()).thenReturn("v0.4/traces");
+        PayloadDispatcherImpl dispatcher =
+                new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring);
+
+        // add traces and dropped counts
+        dispatcher.addTrace(Collections.emptyList());
+        dispatcher.onDroppedTrace(20);
+        dispatcher.onDroppedTrace(2);
+        Payload payload = dispatcher.newPayload(1, ByteBuffer.allocate(0));
+
+        // dropped counts are accumulated
+        assertEquals(22, payload.droppedSpans());
+        assertEquals(2, payload.droppedTraces());
+
+        // create another payload
+        Payload newPayload = dispatcher.newPayload(1, ByteBuffer.allocate(0));
+
+        // counts are reset after access
+        assertEquals(0, newPayload.droppedSpans());
+        assertEquals(0, newPayload.droppedTraces());
     }
-    dispatcher.flush();
-
-    verify(discovery, org.mockito.Mockito.times(2)).getTraceEndpoint();
-    verify(healthMetrics).onSerialize(intThat(size -> size > 0));
-    verify(api).sendSerializedTraces(argThat(p -> p.traceCount() == traceCount));
-  }
-
-  @Test
-  void testShouldDropTraceWhenThereIsNoAgentConnectivity() throws Exception {
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    DDAgentApi api = mock(DDAgentApi.class);
-    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-    when(discovery.getTraceEndpoint()).thenReturn(null);
-    PayloadDispatcherImpl dispatcher =
-        new PayloadDispatcherImpl(
-            new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring);
-    List<DDSpan> trace = Collections.singletonList(realSpan());
-
-    dispatcher.addTrace(trace);
-
-    verify(healthMetrics).onFailedPublish(eq((int) PrioritySampling.UNSET), anyInt());
-  }
-
-  @Test
-  void testTraceAndSpanCountsAreResetAfterAccess() {
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    DDAgentApi api = mock(DDAgentApi.class);
-    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-    when(discovery.getTraceEndpoint()).thenReturn("v0.4/traces");
-    PayloadDispatcherImpl dispatcher =
-        new PayloadDispatcherImpl(
-            new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring);
-
-    // add traces and dropped counts
-    dispatcher.addTrace(Collections.emptyList());
-    dispatcher.onDroppedTrace(20);
-    dispatcher.onDroppedTrace(2);
-    Payload payload = dispatcher.newPayload(1, ByteBuffer.allocate(0));
-
-    // dropped counts are accumulated
-    assertEquals(22, payload.droppedSpans());
-    assertEquals(2, payload.droppedTraces());
-
-    // create another payload
-    Payload newPayload = dispatcher.newPayload(1, ByteBuffer.allocate(0));
-
-    // counts are reset after access
-    assertEquals(0, newPayload.droppedSpans());
-    assertEquals(0, newPayload.droppedTraces());
-  }
-
-  DDSpan realSpan() throws Exception {
-    // getTracer() and mapServiceName() are package-private in TraceCollector; use a custom
-    // Answer to handle them at runtime without compile-time accessibility issues
-    PendingTrace trace =
-        mock(
-            PendingTrace.class,
-            invocation -> {
-              Class<?> returnType = invocation.getMethod().getReturnType();
-              if (CoreTracer.class.isAssignableFrom(returnType)) {
+
+    DDSpan realSpan() throws Exception {
+        // getTracer() and mapServiceName() are package-private in TraceCollector; use a custom
+        // Answer to handle them at runtime without compile-time accessibility issues
+        PendingTrace trace = mock(PendingTrace.class, invocation -> {
+            Class<?> returnType = invocation.getMethod().getReturnType();
+            if (CoreTracer.class.isAssignableFrom(returnType)) {
                 // Use RETURNS_DEFAULTS so getTagInterceptor() returns null (matching Groovy Stub
                 // behavior)
                 return mock(CoreTracer.class);
-              }
-              if (returnType == String.class) {
+            }
+            if (returnType == String.class) {
                 Object[] args = invocation.getArguments();
                 // mapServiceName(String) - return the argument unchanged
                 if (args.length > 0 && args[0] instanceof String) {
-                  return args[0];
+                    return args[0];
                 }
                 return "";
-              }
-              return org.mockito.Mockito.RETURNS_DEFAULTS.answer(invocation);
-            });
-    DDSpanContext context =
-        new DDSpanContext(
-            DDTraceId.ONE,
-            1L,
-            DDSpanId.ZERO,
-            null,
-            "",
-            "",
-            "",
-            PrioritySampling.UNSET,
-            "",
-            Collections.emptyMap(),
-            false,
-            "",
-            0,
-            trace,
-            null,
-            null,
-            NoopPathwayContext.INSTANCE,
-            false,
-            PropagationTags.factory().empty());
-    Constructor<DDSpan> ctor =
-        DDSpan.class.getDeclaredConstructor(
-            String.class, long.class, DDSpanContext.class, List.class);
-    ctor.setAccessible(true);
-    return ctor.newInstance("test", 0L, context, null);
-  }
+            }
+            return org.mockito.Mockito.RETURNS_DEFAULTS.answer(invocation);
+        });
+        DDSpanContext context = new DDSpanContext(
+                DDTraceId.ONE,
+                1L,
+                DDSpanId.ZERO,
+                null,
+                "",
+                "",
+                "",
+                PrioritySampling.UNSET,
+                "",
+                Collections.emptyMap(),
+                false,
+                "",
+                0,
+                trace,
+                null,
+                null,
+                NoopPathwayContext.INSTANCE,
+                false,
+                PropagationTags.factory().empty());
+        Constructor<DDSpan> ctor =
+                DDSpan.class.getDeclaredConstructor(String.class, long.class, DDSpanContext.class, List.class);
+        ctor.setAccessible(true);
+        return ctor.newInstance("test", 0L, context, null);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/PrioritizationTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/PrioritizationTest.java
index cc1a16e9b94..b7d9ecd3b1e 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/PrioritizationTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/PrioritizationTest.java
@@ -27,285 +27,276 @@
 
 class PrioritizationTest extends DDJavaSpecification {
 
-  @SuppressWarnings("unchecked")
-  @TableTest({
-    "scenario           | primaryFull | priority                      | primaryOffers | secondaryOffers",
-    "unset full         | true        | PrioritySampling.UNSET        | 2             | 0              ",
-    "drop full          | true        | PrioritySampling.SAMPLER_DROP | 0             | 1              ",
-    "keep full          | true        | PrioritySampling.SAMPLER_KEEP | 2             | 0              ",
-    "drop full 2        | true        | PrioritySampling.SAMPLER_DROP | 0             | 1              ",
-    "user keep full     | true        | PrioritySampling.USER_KEEP    | 2             | 0              ",
-    "unset not full     | false       | PrioritySampling.UNSET        | 1             | 0              ",
-    "drop not full      | false       | PrioritySampling.SAMPLER_DROP | 0             | 1              ",
-    "keep not full      | false       | PrioritySampling.SAMPLER_KEEP | 1             | 0              ",
-    "drop not full 2    | false       | PrioritySampling.SAMPLER_DROP | 0             | 1              ",
-    "user keep not full | false       | PrioritySampling.USER_KEEP    | 1             | 0              "
-  })
-  void testEnsureTraceStrategyTriesToSendKeptAndUnsetPriorityTracesToPrimaryQueue(
-      boolean primaryFull,
-      @ConvertWith(PrioritySamplingConverter.class) int priority,
-      int primaryOffers,
-      int secondaryOffers) {
-    List<DDSpan> trace = Collections.emptyList();
-    Queue<Object> primary = mock(Queue.class);
-    Queue<Object> secondary = mock(Queue.class);
-    PrioritizationStrategy blocking =
-        Prioritization.ENSURE_TRACE.create(primary, secondary, null, () -> false);
-    // stub: first offer returns !primaryFull, second offer returns true
-    when(primary.offer(trace)).thenReturn(!primaryFull, true);
-    when(secondary.offer(trace)).thenReturn(true);
+    @SuppressWarnings("unchecked")
+    @TableTest({
+      "scenario           | primaryFull | priority                      | primaryOffers | secondaryOffers",
+      "unset full         | true        | PrioritySampling.UNSET        | 2             | 0              ",
+      "drop full          | true        | PrioritySampling.SAMPLER_DROP | 0             | 1              ",
+      "keep full          | true        | PrioritySampling.SAMPLER_KEEP | 2             | 0              ",
+      "drop full 2        | true        | PrioritySampling.SAMPLER_DROP | 0             | 1              ",
+      "user keep full     | true        | PrioritySampling.USER_KEEP    | 2             | 0              ",
+      "unset not full     | false       | PrioritySampling.UNSET        | 1             | 0              ",
+      "drop not full      | false       | PrioritySampling.SAMPLER_DROP | 0             | 1              ",
+      "keep not full      | false       | PrioritySampling.SAMPLER_KEEP | 1             | 0              ",
+      "drop not full 2    | false       | PrioritySampling.SAMPLER_DROP | 0             | 1              ",
+      "user keep not full | false       | PrioritySampling.USER_KEEP    | 1             | 0              "
+    })
+    void testEnsureTraceStrategyTriesToSendKeptAndUnsetPriorityTracesToPrimaryQueue(
+            boolean primaryFull,
+            @ConvertWith(PrioritySamplingConverter.class) int priority,
+            int primaryOffers,
+            int secondaryOffers) {
+        List<DDSpan> trace = Collections.emptyList();
+        Queue<Object> primary = mock(Queue.class);
+        Queue<Object> secondary = mock(Queue.class);
+        PrioritizationStrategy blocking = Prioritization.ENSURE_TRACE.create(primary, secondary, null, () -> false);
+        // stub: first offer returns !primaryFull, second offer returns true
+        when(primary.offer(trace)).thenReturn(!primaryFull, true);
+        when(secondary.offer(trace)).thenReturn(true);
 
-    PublishResult publishResult = blocking.publish(mock(DDSpan.class), priority, trace);
+        PublishResult publishResult = blocking.publish(mock(DDSpan.class), priority, trace);
 
-    assertEquals(ENQUEUED_FOR_SERIALIZATION, publishResult);
-    verify(primary, times(primaryOffers)).offer(trace);
-    verify(secondary, times(secondaryOffers)).offer(trace);
-  }
+        assertEquals(ENQUEUED_FOR_SERIALIZATION, publishResult);
+        verify(primary, times(primaryOffers)).offer(trace);
+        verify(secondary, times(secondaryOffers)).offer(trace);
+    }
 
-  @SuppressWarnings("unchecked")
-  @TableTest({
-    "scenario  | priority                      | primaryOffers | secondaryOffers | expectedResult                     ",
-    "unset     | PrioritySampling.UNSET        | 1             | 0               | DROPPED_BUFFER_OVERFLOW            ",
-    "drop      | PrioritySampling.SAMPLER_DROP | 0             | 1               | DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT",
-    "keep      | PrioritySampling.SAMPLER_KEEP | 1             | 0               | DROPPED_BUFFER_OVERFLOW            ",
-    "drop 2    | PrioritySampling.SAMPLER_DROP | 0             | 1               | DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT",
-    "user keep | PrioritySampling.USER_KEEP    | 1             | 0               | DROPPED_BUFFER_OVERFLOW            "
-  })
-  void testFastLaneStrategySendsKeptAndUnsetPriorityTracesToPrimaryQueue(
-      @ConvertWith(PrioritySamplingConverter.class) int priority,
-      int primaryOffers,
-      int secondaryOffers,
-      PublishResult expectedResult) {
-    List<DDSpan> trace = Collections.emptyList();
-    Queue<Object> primary = mock(Queue.class);
-    Queue<Object> secondary = mock(Queue.class);
-    PrioritizationStrategy fastLane =
-        Prioritization.FAST_LANE.create(primary, secondary, null, () -> false);
+    @SuppressWarnings("unchecked")
+    @TableTest({
+      "scenario  | priority                      | primaryOffers | secondaryOffers | expectedResult                     ",
+      "unset     | PrioritySampling.UNSET        | 1             | 0               | DROPPED_BUFFER_OVERFLOW            ",
+      "drop      | PrioritySampling.SAMPLER_DROP | 0             | 1               | DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT",
+      "keep      | PrioritySampling.SAMPLER_KEEP | 1             | 0               | DROPPED_BUFFER_OVERFLOW            ",
+      "drop 2    | PrioritySampling.SAMPLER_DROP | 0             | 1               | DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT",
+      "user keep | PrioritySampling.USER_KEEP    | 1             | 0               | DROPPED_BUFFER_OVERFLOW            "
+    })
+    void testFastLaneStrategySendsKeptAndUnsetPriorityTracesToPrimaryQueue(
+            @ConvertWith(PrioritySamplingConverter.class) int priority,
+            int primaryOffers,
+            int secondaryOffers,
+            PublishResult expectedResult) {
+        List<DDSpan> trace = Collections.emptyList();
+        Queue<Object> primary = mock(Queue.class);
+        Queue<Object> secondary = mock(Queue.class);
+        PrioritizationStrategy fastLane = Prioritization.FAST_LANE.create(primary, secondary, null, () -> false);
 
-    PublishResult publishResult = fastLane.publish(mock(DDSpan.class), priority, trace);
+        PublishResult publishResult = fastLane.publish(mock(DDSpan.class), priority, trace);
 
-    assertEquals(expectedResult, publishResult);
-    verify(primary, times(primaryOffers)).offer(trace);
-    verify(secondary, times(secondaryOffers)).offer(trace);
-  }
+        assertEquals(expectedResult, publishResult);
+        verify(primary, times(primaryOffers)).offer(trace);
+        verify(secondary, times(secondaryOffers)).offer(trace);
+    }
 
-  @SuppressWarnings("unchecked")
-  @TableTest({
-    "scenario  | priority                      | primaryOffers | expectedResult            ",
-    "unset     | PrioritySampling.UNSET        | 1             | ENQUEUED_FOR_SERIALIZATION",
-    "drop      | PrioritySampling.SAMPLER_DROP | 0             | DROPPED_BY_POLICY         ",
-    "keep      | PrioritySampling.SAMPLER_KEEP | 1             | ENQUEUED_FOR_SERIALIZATION",
-    "drop 2    | PrioritySampling.SAMPLER_DROP | 0             | DROPPED_BY_POLICY         ",
-    "user keep | PrioritySampling.USER_KEEP    | 1             | ENQUEUED_FOR_SERIALIZATION"
-  })
-  void testFastLaneWithActiveDroppingPolicySendsKeptAndUnsetTracesToPrimaryQueue(
-      @ConvertWith(PrioritySamplingConverter.class) int priority,
-      int primaryOffers,
-      PublishResult expectedResult) {
-    List<DDSpan> trace = Collections.emptyList();
-    Queue<Object> primary = mock(Queue.class);
-    Queue<Object> secondary = mock(Queue.class);
-    PrioritizationStrategy drop =
-        Prioritization.FAST_LANE.create(primary, secondary, null, () -> true);
-    when(primary.offer(trace)).thenReturn(true);
+    @SuppressWarnings("unchecked")
+    @TableTest({
+      "scenario  | priority                      | primaryOffers | expectedResult            ",
+      "unset     | PrioritySampling.UNSET        | 1             | ENQUEUED_FOR_SERIALIZATION",
+      "drop      | PrioritySampling.SAMPLER_DROP | 0             | DROPPED_BY_POLICY         ",
+      "keep      | PrioritySampling.SAMPLER_KEEP | 1             | ENQUEUED_FOR_SERIALIZATION",
+      "drop 2    | PrioritySampling.SAMPLER_DROP | 0             | DROPPED_BY_POLICY         ",
+      "user keep | PrioritySampling.USER_KEEP    | 1             | ENQUEUED_FOR_SERIALIZATION"
+    })
+    void testFastLaneWithActiveDroppingPolicySendsKeptAndUnsetTracesToPrimaryQueue(
+            @ConvertWith(PrioritySamplingConverter.class) int priority,
+            int primaryOffers,
+            PublishResult expectedResult) {
+        List<DDSpan> trace = Collections.emptyList();
+        Queue<Object> primary = mock(Queue.class);
+        Queue<Object> secondary = mock(Queue.class);
+        PrioritizationStrategy drop = Prioritization.FAST_LANE.create(primary, secondary, null, () -> true);
+        when(primary.offer(trace)).thenReturn(true);
 
-    PublishResult publishResult = drop.publish(mock(DDSpan.class), priority, trace);
+        PublishResult publishResult = drop.publish(mock(DDSpan.class), priority, trace);
 
-    assertEquals(expectedResult, publishResult);
-    verify(primary, times(primaryOffers)).offer(trace);
-    verify(secondary, never()).offer(trace);
-  }
+        assertEquals(expectedResult, publishResult);
+        verify(primary, times(primaryOffers)).offer(trace);
+        verify(secondary, never()).offer(trace);
+    }
 
-  @SuppressWarnings("unchecked")
-  @TableTest({
-    "scenario     | strategy    ",
-    "fast lane    | FAST_LANE   ",
-    "ensure trace | ENSURE_TRACE"
-  })
-  void testStrategyFlushesPrimaryQueue(Prioritization strategy) {
-    Queue<Object> primary = mock(Queue.class);
-    Queue<Object> secondary = mock(Queue.class);
-    PrioritizationStrategy prioritizationStrategy =
-        strategy.create(primary, secondary, null, () -> false);
-    when(primary.offer(any())).thenReturn(true);
+    @SuppressWarnings("unchecked")
+    @TableTest({
+      "scenario     | strategy    ",
+      "fast lane    | FAST_LANE   ",
+      "ensure trace | ENSURE_TRACE"
+    })
+    void testStrategyFlushesPrimaryQueue(Prioritization strategy) {
+        Queue<Object> primary = mock(Queue.class);
+        Queue<Object> secondary = mock(Queue.class);
+        PrioritizationStrategy prioritizationStrategy = strategy.create(primary, secondary, null, () -> false);
+        when(primary.offer(any())).thenReturn(true);
 
-    prioritizationStrategy.flush(100, TimeUnit.MILLISECONDS);
+        prioritizationStrategy.flush(100, TimeUnit.MILLISECONDS);
 
-    verify(primary).offer(any(FlushEvent.class));
-    verify(secondary, never()).offer(any());
-  }
+        verify(primary).offer(any(FlushEvent.class));
+        verify(secondary, never()).offer(any());
+    }
 
-  @SuppressWarnings("unchecked")
-  @TableTest({
-    "scenario                   | strategy  | forceKeep | expectedResult            ",
-    "force keep true fast lane  | FAST_LANE | true      | ENQUEUED_FOR_SERIALIZATION",
-    "force keep false fast lane | FAST_LANE | false     | DROPPED_BY_POLICY         "
-  })
-  void testDropStrategyRespectsForceKeep(
-      Prioritization strategy, boolean forceKeep, PublishResult expectedResult) {
-    Queue<Object> primary = mock(Queue.class);
-    PrioritizationStrategy drop = strategy.create(primary, null, null, () -> true);
-    DDSpan root = mock(DDSpan.class);
-    List<DDSpan> trace = Collections.singletonList(root);
-    when(root.isForceKeep()).thenReturn(forceKeep);
-    when(primary.offer(trace)).thenReturn(true);
+    @SuppressWarnings("unchecked")
+    @TableTest({
+      "scenario                   | strategy  | forceKeep | expectedResult            ",
+      "force keep true fast lane  | FAST_LANE | true      | ENQUEUED_FOR_SERIALIZATION",
+      "force keep false fast lane | FAST_LANE | false     | DROPPED_BY_POLICY         "
+    })
+    void testDropStrategyRespectsForceKeep(Prioritization strategy, boolean forceKeep, PublishResult expectedResult) {
+        Queue<Object> primary = mock(Queue.class);
+        PrioritizationStrategy drop = strategy.create(primary, null, null, () -> true);
+        DDSpan root = mock(DDSpan.class);
+        List<DDSpan> trace = Collections.singletonList(root);
+        when(root.isForceKeep()).thenReturn(forceKeep);
+        when(primary.offer(trace)).thenReturn(true);
 
-    PublishResult publishResult = drop.publish(root, PrioritySampling.SAMPLER_DROP, trace);
+        PublishResult publishResult = drop.publish(root, PrioritySampling.SAMPLER_DROP, trace);
 
-    assertEquals(expectedResult, publishResult);
-    verify(root).isForceKeep();
-    verify(primary, times(forceKeep ? 1 : 0)).offer(trace);
-    verifyNoMoreInteractions(root, primary);
-  }
+        assertEquals(expectedResult, publishResult);
+        verify(root).isForceKeep();
+        verify(primary, times(forceKeep ? 1 : 0)).offer(trace);
+        verifyNoMoreInteractions(root, primary);
+    }
 
-  @SuppressWarnings("unchecked")
-  @TableTest({
-    "scenario                 | primaryFull | priority                      | primaryOffers | singleSpanOffers | singleSpanFull | expectedResult                     ",
-    "unset full ss-not-full   | true        | PrioritySampling.UNSET        | 2             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
-    "drop full ss-not-full    | true        | PrioritySampling.SAMPLER_DROP | 0             | 1                | false          | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING  ",
-    "keep full ss-not-full    | true        | PrioritySampling.SAMPLER_KEEP | 2             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
-    "drop full 2 ss-not-full  | true        | PrioritySampling.SAMPLER_DROP | 0             | 1                | false          | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING  ",
-    "ukeep full ss-not-full   | true        | PrioritySampling.USER_KEEP    | 2             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
-    "unset nfull ss-not-full  | false       | PrioritySampling.UNSET        | 1             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
-    "drop nfull ss-not-full   | false       | PrioritySampling.SAMPLER_DROP | 0             | 1                | false          | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING  ",
-    "keep nfull ss-not-full   | false       | PrioritySampling.SAMPLER_KEEP | 1             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
-    "drop nfull 2 ss-not-full | false       | PrioritySampling.SAMPLER_DROP | 0             | 1                | false          | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING  ",
-    "ukeep nfull ss-not-full  | false       | PrioritySampling.USER_KEEP    | 1             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
-    "unset full ss-full       | true        | PrioritySampling.UNSET        | 2             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         ",
-    "drop full ss-full        | true        | PrioritySampling.SAMPLER_DROP | 0             | 1                | true           | DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN",
-    "keep full ss-full        | true        | PrioritySampling.SAMPLER_KEEP | 2             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         ",
-    "drop full 2 ss-full      | true        | PrioritySampling.SAMPLER_DROP | 0             | 1                | true           | DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN",
-    "ukeep full ss-full       | true        | PrioritySampling.USER_KEEP    | 2             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         ",
-    "unset nfull ss-full      | false       | PrioritySampling.UNSET        | 1             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         ",
-    "drop nfull ss-full       | false       | PrioritySampling.SAMPLER_DROP | 0             | 1                | true           | DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN",
-    "keep nfull ss-full       | false       | PrioritySampling.SAMPLER_KEEP | 1             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         ",
-    "drop nfull 2 ss-full     | false       | PrioritySampling.SAMPLER_DROP | 0             | 1                | true           | DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN",
-    "ukeep nfull ss-full      | false       | PrioritySampling.USER_KEEP    | 1             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         "
-  })
-  void testEnsureTraceStrategyWithSpanSamplingQueue(
-      boolean primaryFull,
-      @ConvertWith(PrioritySamplingConverter.class) int priority,
-      int primaryOffers,
-      int singleSpanOffers,
-      boolean singleSpanFull,
-      PublishResult expectedResult) {
-    List<DDSpan> trace = Collections.emptyList();
-    Queue<Object> primary = mock(Queue.class);
-    Queue<Object> secondary = mock(Queue.class);
-    Queue<Object> spanSampling = mock(Queue.class);
-    PrioritizationStrategy blocking =
-        Prioritization.ENSURE_TRACE.create(primary, secondary, spanSampling, () -> false);
-    when(primary.offer(trace)).thenReturn(!primaryFull, true);
-    when(spanSampling.offer(trace)).thenReturn(!singleSpanFull);
+    @SuppressWarnings("unchecked")
+    @TableTest({
+      "scenario                 | primaryFull | priority                      | primaryOffers | singleSpanOffers | singleSpanFull | expectedResult                     ",
+      "unset full ss-not-full   | true        | PrioritySampling.UNSET        | 2             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
+      "drop full ss-not-full    | true        | PrioritySampling.SAMPLER_DROP | 0             | 1                | false          | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING  ",
+      "keep full ss-not-full    | true        | PrioritySampling.SAMPLER_KEEP | 2             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
+      "drop full 2 ss-not-full  | true        | PrioritySampling.SAMPLER_DROP | 0             | 1                | false          | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING  ",
+      "ukeep full ss-not-full   | true        | PrioritySampling.USER_KEEP    | 2             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
+      "unset nfull ss-not-full  | false       | PrioritySampling.UNSET        | 1             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
+      "drop nfull ss-not-full   | false       | PrioritySampling.SAMPLER_DROP | 0             | 1                | false          | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING  ",
+      "keep nfull ss-not-full   | false       | PrioritySampling.SAMPLER_KEEP | 1             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
+      "drop nfull 2 ss-not-full | false       | PrioritySampling.SAMPLER_DROP | 0             | 1                | false          | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING  ",
+      "ukeep nfull ss-not-full  | false       | PrioritySampling.USER_KEEP    | 1             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
+      "unset full ss-full       | true        | PrioritySampling.UNSET        | 2             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         ",
+      "drop full ss-full        | true        | PrioritySampling.SAMPLER_DROP | 0             | 1                | true           | DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN",
+      "keep full ss-full        | true        | PrioritySampling.SAMPLER_KEEP | 2             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         ",
+      "drop full 2 ss-full      | true        | PrioritySampling.SAMPLER_DROP | 0             | 1                | true           | DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN",
+      "ukeep full ss-full       | true        | PrioritySampling.USER_KEEP    | 2             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         ",
+      "unset nfull ss-full      | false       | PrioritySampling.UNSET        | 1             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         ",
+      "drop nfull ss-full       | false       | PrioritySampling.SAMPLER_DROP | 0             | 1                | true           | DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN",
+      "keep nfull ss-full       | false       | PrioritySampling.SAMPLER_KEEP | 1             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         ",
+      "drop nfull 2 ss-full     | false       | PrioritySampling.SAMPLER_DROP | 0             | 1                | true           | DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN",
+      "ukeep nfull ss-full      | false       | PrioritySampling.USER_KEEP    | 1             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         "
+    })
+    void testEnsureTraceStrategyWithSpanSamplingQueue(
+            boolean primaryFull,
+            @ConvertWith(PrioritySamplingConverter.class) int priority,
+            int primaryOffers,
+            int singleSpanOffers,
+            boolean singleSpanFull,
+            PublishResult expectedResult) {
+        List<DDSpan> trace = Collections.emptyList();
+        Queue<Object> primary = mock(Queue.class);
+        Queue<Object> secondary = mock(Queue.class);
+        Queue<Object> spanSampling = mock(Queue.class);
+        PrioritizationStrategy blocking =
+                Prioritization.ENSURE_TRACE.create(primary, secondary, spanSampling, () -> false);
+        when(primary.offer(trace)).thenReturn(!primaryFull, true);
+        when(spanSampling.offer(trace)).thenReturn(!singleSpanFull);
 
-    PublishResult publishResult = blocking.publish(mock(DDSpan.class), priority, trace);
+        PublishResult publishResult = blocking.publish(mock(DDSpan.class), priority, trace);
 
-    assertEquals(expectedResult, publishResult);
-    verify(primary, times(primaryOffers)).offer(trace);
-    verify(secondary, never()).offer(trace); // expect no traces sent to the secondary queue
-    verify(spanSampling, times(singleSpanOffers)).offer(trace);
-  }
+        assertEquals(expectedResult, publishResult);
+        verify(primary, times(primaryOffers)).offer(trace);
+        verify(secondary, never()).offer(trace); // expect no traces sent to the secondary queue
+        verify(spanSampling, times(singleSpanOffers)).offer(trace);
+    }
 
-  @SuppressWarnings("unchecked")
-  @TableTest({
-    "scenario              | priority                      | primaryOffers | singleSpanOffers | singleSpanFull | expectedResult                     ",
-    "unset ss-not-full     | PrioritySampling.UNSET        | 1             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
-    "drop ss-not-full      | PrioritySampling.SAMPLER_DROP | 0             | 1                | false          | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING  ",
-    "keep ss-not-full      | PrioritySampling.SAMPLER_KEEP | 1             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
-    "drop 2 ss-not-full    | PrioritySampling.SAMPLER_DROP | 0             | 1                | false          | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING  ",
-    "user keep ss-not-full | PrioritySampling.USER_KEEP    | 1             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
-    "unset ss-full         | PrioritySampling.UNSET        | 1             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         ",
-    "drop ss-full          | PrioritySampling.SAMPLER_DROP | 0             | 1                | true           | DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN",
-    "keep ss-full          | PrioritySampling.SAMPLER_KEEP | 1             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         ",
-    "drop 2 ss-full        | PrioritySampling.SAMPLER_DROP | 0             | 1                | true           | DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN",
-    "user keep ss-full     | PrioritySampling.USER_KEEP    | 1             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         "
-  })
-  void testFastLaneStrategyWithSpanSamplingQueue(
-      @ConvertWith(PrioritySamplingConverter.class) int priority,
-      int primaryOffers,
-      int singleSpanOffers,
-      boolean singleSpanFull,
-      PublishResult expectedResult) {
-    List<DDSpan> trace = Collections.emptyList();
-    Queue<Object> primary = mock(Queue.class);
-    Queue<Object> secondary = mock(Queue.class);
-    Queue<Object> spanSampling = mock(Queue.class);
-    PrioritizationStrategy fastLane =
-        Prioritization.FAST_LANE.create(primary, secondary, spanSampling, () -> false);
-    when(primary.offer(trace)).thenReturn(true);
-    when(spanSampling.offer(trace)).thenReturn(!singleSpanFull);
+    @SuppressWarnings("unchecked")
+    @TableTest({
+      "scenario              | priority                      | primaryOffers | singleSpanOffers | singleSpanFull | expectedResult                     ",
+      "unset ss-not-full     | PrioritySampling.UNSET        | 1             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
+      "drop ss-not-full      | PrioritySampling.SAMPLER_DROP | 0             | 1                | false          | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING  ",
+      "keep ss-not-full      | PrioritySampling.SAMPLER_KEEP | 1             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
+      "drop 2 ss-not-full    | PrioritySampling.SAMPLER_DROP | 0             | 1                | false          | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING  ",
+      "user keep ss-not-full | PrioritySampling.USER_KEEP    | 1             | 0                | false          | ENQUEUED_FOR_SERIALIZATION         ",
+      "unset ss-full         | PrioritySampling.UNSET        | 1             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         ",
+      "drop ss-full          | PrioritySampling.SAMPLER_DROP | 0             | 1                | true           | DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN",
+      "keep ss-full          | PrioritySampling.SAMPLER_KEEP | 1             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         ",
+      "drop 2 ss-full        | PrioritySampling.SAMPLER_DROP | 0             | 1                | true           | DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN",
+      "user keep ss-full     | PrioritySampling.USER_KEEP    | 1             | 0                | true           | ENQUEUED_FOR_SERIALIZATION         "
+    })
+    void testFastLaneStrategyWithSpanSamplingQueue(
+            @ConvertWith(PrioritySamplingConverter.class) int priority,
+            int primaryOffers,
+            int singleSpanOffers,
+            boolean singleSpanFull,
+            PublishResult expectedResult) {
+        List<DDSpan> trace = Collections.emptyList();
+        Queue<Object> primary = mock(Queue.class);
+        Queue<Object> secondary = mock(Queue.class);
+        Queue<Object> spanSampling = mock(Queue.class);
+        PrioritizationStrategy fastLane =
+                Prioritization.FAST_LANE.create(primary, secondary, spanSampling, () -> false);
+        when(primary.offer(trace)).thenReturn(true);
+        when(spanSampling.offer(trace)).thenReturn(!singleSpanFull);
 
-    PublishResult publishResult = fastLane.publish(mock(DDSpan.class), priority, trace);
+        PublishResult publishResult = fastLane.publish(mock(DDSpan.class), priority, trace);
 
-    assertEquals(expectedResult, publishResult);
-    verify(primary, times(primaryOffers)).offer(trace);
-    verify(secondary, never()).offer(any()); // expect no traces sent to the secondary queue
-    verify(spanSampling, times(singleSpanOffers)).offer(trace);
-  }
+        assertEquals(expectedResult, publishResult);
+        verify(primary, times(primaryOffers)).offer(trace);
+        verify(secondary, never()).offer(any()); // expect no traces sent to the secondary queue
+        verify(spanSampling, times(singleSpanOffers)).offer(trace);
+    }
 
-  @SuppressWarnings("unchecked")
-  @TableTest({
-    "scenario  | priority                      | primaryOffers | singleSpanOffers | expectedResult                   ",
-    "unset     | PrioritySampling.UNSET        | 1             | 0                | ENQUEUED_FOR_SERIALIZATION       ",
-    "drop      | PrioritySampling.SAMPLER_DROP | 0             | 1                | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING",
-    "keep      | PrioritySampling.SAMPLER_KEEP | 1             | 0                | ENQUEUED_FOR_SERIALIZATION       ",
-    "drop 2    | PrioritySampling.SAMPLER_DROP | 0             | 1                | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING",
-    "user keep | PrioritySampling.USER_KEEP    | 1             | 0                | ENQUEUED_FOR_SERIALIZATION       "
-  })
-  void testFastLaneWithActiveDroppingPolicySendToSingleSpanSampling(
-      @ConvertWith(PrioritySamplingConverter.class) int priority,
-      int primaryOffers,
-      int singleSpanOffers,
-      PublishResult expectedResult) {
-    List<DDSpan> trace = Collections.emptyList();
-    Queue<Object> primary = mock(Queue.class);
-    Queue<Object> secondary = mock(Queue.class);
-    Queue<Object> spanSampling = mock(Queue.class);
-    PrioritizationStrategy drop =
-        Prioritization.FAST_LANE.create(primary, secondary, spanSampling, () -> true);
-    when(primary.offer(trace)).thenReturn(true);
-    when(spanSampling.offer(trace)).thenReturn(true);
+    @SuppressWarnings("unchecked")
+    @TableTest({
+      "scenario  | priority                      | primaryOffers | singleSpanOffers | expectedResult                   ",
+      "unset     | PrioritySampling.UNSET        | 1             | 0                | ENQUEUED_FOR_SERIALIZATION       ",
+      "drop      | PrioritySampling.SAMPLER_DROP | 0             | 1                | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING",
+      "keep      | PrioritySampling.SAMPLER_KEEP | 1             | 0                | ENQUEUED_FOR_SERIALIZATION       ",
+      "drop 2    | PrioritySampling.SAMPLER_DROP | 0             | 1                | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING",
+      "user keep | PrioritySampling.USER_KEEP    | 1             | 0                | ENQUEUED_FOR_SERIALIZATION       "
+    })
+    void testFastLaneWithActiveDroppingPolicySendToSingleSpanSampling(
+            @ConvertWith(PrioritySamplingConverter.class) int priority,
+            int primaryOffers,
+            int singleSpanOffers,
+            PublishResult expectedResult) {
+        List<DDSpan> trace = Collections.emptyList();
+        Queue<Object> primary = mock(Queue.class);
+        Queue<Object> secondary = mock(Queue.class);
+        Queue<Object> spanSampling = mock(Queue.class);
+        PrioritizationStrategy drop = Prioritization.FAST_LANE.create(primary, secondary, spanSampling, () -> true);
+        when(primary.offer(trace)).thenReturn(true);
+        when(spanSampling.offer(trace)).thenReturn(true);
 
-    PublishResult publishResult = drop.publish(mock(DDSpan.class), priority, trace);
+        PublishResult publishResult = drop.publish(mock(DDSpan.class), priority, trace);
 
-    assertEquals(expectedResult, publishResult);
-    verify(primary, times(primaryOffers)).offer(trace);
-    verify(secondary, never()).offer(trace);
-    verify(spanSampling, times(singleSpanOffers)).offer(trace);
-  }
+        assertEquals(expectedResult, publishResult);
+        verify(primary, times(primaryOffers)).offer(trace);
+        verify(secondary, never()).offer(trace);
+        verify(spanSampling, times(singleSpanOffers)).offer(trace);
+    }
 
-  @SuppressWarnings("unchecked")
-  @TableTest({
-    "scenario                               | strategy     | forceKeep | singleSpanFull | expectedResult                     ",
-    "force keep true full fast lane         | FAST_LANE    | true      | true           | ENQUEUED_FOR_SERIALIZATION         ",
-    "force keep false full fast lane        | FAST_LANE    | false     | true           | DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN",
-    "force keep true not full fast lane     | FAST_LANE    | true      | false          | ENQUEUED_FOR_SERIALIZATION         ",
-    "force keep false not full fast lane    | FAST_LANE    | false     | false          | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING  ",
-    "force keep true full ensure trace      | ENSURE_TRACE | true      | true           | ENQUEUED_FOR_SERIALIZATION         ",
-    "force keep false full ensure trace     | ENSURE_TRACE | false     | true           | DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN",
-    "force keep true not full ensure trace  | ENSURE_TRACE | true      | false          | ENQUEUED_FOR_SERIALIZATION         ",
-    "force keep false not full ensure trace | ENSURE_TRACE | false     | false          | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING  "
-  })
-  void testSpanSamplingDropStrategyRespectsForceKeep(
-      Prioritization strategy,
-      boolean forceKeep,
-      boolean singleSpanFull,
-      PublishResult expectedResult) {
-    Queue<Object> primary = mock(Queue.class);
-    Queue<Object> spanSampling = mock(Queue.class);
-    PrioritizationStrategy drop = strategy.create(primary, null, spanSampling, () -> true);
-    DDSpan root = mock(DDSpan.class);
-    List<DDSpan> trace = Collections.singletonList(root);
-    when(root.isForceKeep()).thenReturn(forceKeep);
-    when(primary.offer(trace)).thenReturn(true);
-    when(spanSampling.offer(trace)).thenReturn(!singleSpanFull);
+    @SuppressWarnings("unchecked")
+    @TableTest({
+      "scenario                               | strategy     | forceKeep | singleSpanFull | expectedResult                     ",
+      "force keep true full fast lane         | FAST_LANE    | true      | true           | ENQUEUED_FOR_SERIALIZATION         ",
+      "force keep false full fast lane        | FAST_LANE    | false     | true           | DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN",
+      "force keep true not full fast lane     | FAST_LANE    | true      | false          | ENQUEUED_FOR_SERIALIZATION         ",
+      "force keep false not full fast lane    | FAST_LANE    | false     | false          | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING  ",
+      "force keep true full ensure trace      | ENSURE_TRACE | true      | true           | ENQUEUED_FOR_SERIALIZATION         ",
+      "force keep false full ensure trace     | ENSURE_TRACE | false     | true           | DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN",
+      "force keep true not full ensure trace  | ENSURE_TRACE | true      | false          | ENQUEUED_FOR_SERIALIZATION         ",
+      "force keep false not full ensure trace | ENSURE_TRACE | false     | false          | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING  "
+    })
+    void testSpanSamplingDropStrategyRespectsForceKeep(
+            Prioritization strategy, boolean forceKeep, boolean singleSpanFull, PublishResult expectedResult) {
+        Queue<Object> primary = mock(Queue.class);
+        Queue<Object> spanSampling = mock(Queue.class);
+        PrioritizationStrategy drop = strategy.create(primary, null, spanSampling, () -> true);
+        DDSpan root = mock(DDSpan.class);
+        List<DDSpan> trace = Collections.singletonList(root);
+        when(root.isForceKeep()).thenReturn(forceKeep);
+        when(primary.offer(trace)).thenReturn(true);
+        when(spanSampling.offer(trace)).thenReturn(!singleSpanFull);
 
-    PublishResult publishResult = drop.publish(root, PrioritySampling.SAMPLER_DROP, trace);
+        PublishResult publishResult = drop.publish(root, PrioritySampling.SAMPLER_DROP, trace);
 
-    assertEquals(expectedResult, publishResult);
-    verify(root).isForceKeep();
-    verify(primary, times(forceKeep ? 1 : 0)).offer(trace);
-    verify(spanSampling, times(forceKeep ? 0 : 1)).offer(trace);
-    verifyNoMoreInteractions(root, primary, spanSampling);
-  }
+        assertEquals(expectedResult, publishResult);
+        verify(root).isForceKeep();
+        verify(primary, times(forceKeep ? 1 : 0)).offer(trace);
+        verify(spanSampling, times(forceKeep ? 0 : 1)).offer(trace);
+        verifyNoMoreInteractions(root, primary, spanSampling);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/RemoteWriterLoggingTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/RemoteWriterLoggingTest.java
index aa8f267cc0a..f2b9502ec1d 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/RemoteWriterLoggingTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/RemoteWriterLoggingTest.java
@@ -35,98 +35,95 @@
  */
 class RemoteWriterLoggingTest extends DDCoreJavaSpecification {
 
-  private Logger logger;
-  private Level previousLevel;
-  private ListAppender<ILoggingEvent> appender;
-
-  private final HealthMetrics monitor = mock(HealthMetrics.class);
-  private final TraceProcessingWorker worker = mock(TraceProcessingWorker.class);
-  private final PayloadDispatcherImpl dispatcher = mock(PayloadDispatcherImpl.class);
-  private final DDAgentWriter writer =
-      new DDAgentWriter(worker, dispatcher, monitor, 1, SECONDS, false);
-
-  @BeforeEach
-  void attachAppender() {
-    logger = (Logger) LoggerFactory.getLogger(RemoteWriter.class);
-    previousLevel = logger.getLevel();
-    // WARN, not DEBUG: at DEBUG the writer logs the detailed message instead of the rate-limited
-    // warning, which is not the path a user in production sees.
-    logger.setLevel(Level.WARN);
-    appender = new ListAppender<>();
-    appender.start();
-    logger.addAppender(appender);
-  }
-
-  @AfterEach
-  void detachAppender() {
-    logger.detachAppender(appender);
-    logger.setLevel(previousLevel);
-    writer.close();
-  }
-
-  @Test
-  void warnsWhenAKeptTraceIsLostToOverflow() {
-    write(PrioritySampling.SAMPLER_KEEP, DROPPED_BUFFER_OVERFLOW);
-
-    assertEquals(1, appender.list.size());
-    ILoggingEvent event = appender.list.get(0);
-    assertEquals(Level.WARN, event.getLevel());
-    assertTrue(
-        event.getFormattedMessage().contains("kept trace"),
-        "the warning should say a kept trace was lost: " + event.getFormattedMessage());
-  }
-
-  @Test
-  void staysQuietWhenOnlyASampledOutTraceIsLostToOverflow() {
-    write(PrioritySampling.SAMPLER_DROP, DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT);
-
-    assertEquals(
-        Collections.emptyList(),
-        appender.list,
-        "losing an already sampled-out trace must not warn the user");
-  }
-
-  @Test
-  void warnsWhenASingleSpanSamplingCandidateIsLostToOverflow() {
-    write(PrioritySampling.SAMPLER_DROP, DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN);
-
-    assertEquals(1, appender.list.size());
-    ILoggingEvent event = appender.list.get(0);
-    assertEquals(Level.WARN, event.getLevel());
-    assertTrue(
-        event.getFormattedMessage().contains("single span sampling"),
-        "the warning should say a single span sampling candidate was lost: "
-            + event.getFormattedMessage());
-  }
-
-  /**
-   * The rate limiter holds a single budget, so a flood of the benign case must not consume the
-   * budget that the genuine warning needs.
-   */
-  @Test
-  void sampledOutOverflowDoesNotSuppressAKeptTraceWarning() {
-    for (int i = 0; i < 100; i++) {
-      write(PrioritySampling.SAMPLER_DROP, DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT);
+    private Logger logger;
+    private Level previousLevel;
+    private ListAppender<ILoggingEvent> appender;
+
+    private final HealthMetrics monitor = mock(HealthMetrics.class);
+    private final TraceProcessingWorker worker = mock(TraceProcessingWorker.class);
+    private final PayloadDispatcherImpl dispatcher = mock(PayloadDispatcherImpl.class);
+    private final DDAgentWriter writer = new DDAgentWriter(worker, dispatcher, monitor, 1, SECONDS, false);
+
+    @BeforeEach
+    void attachAppender() {
+        logger = (Logger) LoggerFactory.getLogger(RemoteWriter.class);
+        previousLevel = logger.getLevel();
+        // WARN, not DEBUG: at DEBUG the writer logs the detailed message instead of the rate-limited
+        // warning, which is not the path a user in production sees.
+        logger.setLevel(Level.WARN);
+        appender = new ListAppender<>();
+        appender.start();
+        logger.addAppender(appender);
     }
 
-    write(PrioritySampling.SAMPLER_KEEP, DROPPED_BUFFER_OVERFLOW);
-
-    assertEquals(1, appender.list.size());
-    ILoggingEvent event = appender.list.get(0);
-    assertEquals(Level.WARN, event.getLevel());
-    // The surviving warning must be the one about the kept trace, not a benign one that happened
-    // to claim the budget first.
-    assertTrue(
-        event.getFormattedMessage().contains("kept trace"),
-        "expected the kept-trace warning, got: " + event.getFormattedMessage());
-  }
-
-  private void write(byte priority, PublishResult result) {
-    DDSpan root = buildSpan(0L, "test.tag", "test.value", PropagationTags.factory().empty());
-    root.setSamplingPriority(priority);
-    List<DDSpan> trace = Collections.singletonList(root);
-    when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(result);
-
-    writer.write(trace);
-  }
+    @AfterEach
+    void detachAppender() {
+        logger.detachAppender(appender);
+        logger.setLevel(previousLevel);
+        writer.close();
+    }
+
+    @Test
+    void warnsWhenAKeptTraceIsLostToOverflow() {
+        write(PrioritySampling.SAMPLER_KEEP, DROPPED_BUFFER_OVERFLOW);
+
+        assertEquals(1, appender.list.size());
+        ILoggingEvent event = appender.list.get(0);
+        assertEquals(Level.WARN, event.getLevel());
+        assertTrue(
+                event.getFormattedMessage().contains("kept trace"),
+                "the warning should say a kept trace was lost: " + event.getFormattedMessage());
+    }
+
+    @Test
+    void staysQuietWhenOnlyASampledOutTraceIsLostToOverflow() {
+        write(PrioritySampling.SAMPLER_DROP, DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT);
+
+        assertEquals(
+                Collections.emptyList(), appender.list, "losing an already sampled-out trace must not warn the user");
+    }
+
+    @Test
+    void warnsWhenASingleSpanSamplingCandidateIsLostToOverflow() {
+        write(PrioritySampling.SAMPLER_DROP, DROPPED_BUFFER_OVERFLOW_SINGLE_SPAN);
+
+        assertEquals(1, appender.list.size());
+        ILoggingEvent event = appender.list.get(0);
+        assertEquals(Level.WARN, event.getLevel());
+        assertTrue(
+                event.getFormattedMessage().contains("single span sampling"),
+                "the warning should say a single span sampling candidate was lost: " + event.getFormattedMessage());
+    }
+
+    /**
+     * The rate limiter holds a single budget, so a flood of the benign case must not consume the
+     * budget that the genuine warning needs.
+     */
+    @Test
+    void sampledOutOverflowDoesNotSuppressAKeptTraceWarning() {
+        for (int i = 0; i < 100; i++) {
+            write(PrioritySampling.SAMPLER_DROP, DROPPED_BUFFER_OVERFLOW_SAMPLED_OUT);
+        }
+
+        write(PrioritySampling.SAMPLER_KEEP, DROPPED_BUFFER_OVERFLOW);
+
+        assertEquals(1, appender.list.size());
+        ILoggingEvent event = appender.list.get(0);
+        assertEquals(Level.WARN, event.getLevel());
+        // The surviving warning must be the one about the kept trace, not a benign one that happened
+        // to claim the budget first.
+        assertTrue(
+                event.getFormattedMessage().contains("kept trace"),
+                "expected the kept-trace warning, got: " + event.getFormattedMessage());
+    }
+
+    private void write(byte priority, PublishResult result) {
+        DDSpan root = buildSpan(
+                0L, "test.tag", "test.value", PropagationTags.factory().empty());
+        root.setSamplingPriority(priority);
+        List<DDSpan> trace = Collections.singletonList(root);
+        when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(result);
+
+        writer.write(trace);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/SerializationTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/SerializationTest.java
index 0924581f26b..a2b0b7cdd49 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/SerializationTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/SerializationTest.java
@@ -17,44 +17,44 @@
 
 class SerializationTest extends DDJavaSpecification {
 
-  @Test
-  void testJsonMapperSerialization() throws Exception {
-    ObjectMapper mapper = new ObjectMapper();
-    Map<String, String> map = singletonMap("key1", "val1");
-    byte[] serializedMap = mapper.writeValueAsBytes(map);
-    byte[] serializedList = ("[" + new String(serializedMap) + "]").getBytes();
-
-    List<Map<String, String>> result =
-        mapper.readValue(serializedList, new TypeReference<List<Map<String, String>>>() {});
-
-    assertEquals(Collections.singletonList(map), result);
-    assertEquals("[{\"key1\":\"val1\"}]", new String(serializedList));
-  }
-
-  @Test
-  void testMsgpackMapperSerialization() throws Exception {
-    // setup
-    ObjectMapper mapper = new ObjectMapper(new MessagePackFactory());
-    // GStrings get odd results in the serializer.
-    List<Map<String, String>> input = new ArrayList<>();
-    for (int i = 1; i <= 1; i++) {
-      input.add(singletonMap("key" + i, "val" + i));
-    }
-    List<byte[]> serializedMaps = new ArrayList<>();
-    for (Map<String, String> item : input) {
-      serializedMaps.add(mapper.writeValueAsBytes(item));
+    @Test
+    void testJsonMapperSerialization() throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        Map<String, String> map = singletonMap("key1", "val1");
+        byte[] serializedMap = mapper.writeValueAsBytes(map);
+        byte[] serializedList = ("[" + new String(serializedMap) + "]").getBytes();
+
+        List<Map<String, String>> result =
+                mapper.readValue(serializedList, new TypeReference<List<Map<String, String>>>() {});
+
+        assertEquals(Collections.singletonList(map), result);
+        assertEquals("[{\"key1\":\"val1\"}]", new String(serializedList));
     }
 
-    MessageBufferPacker packer = MessagePack.newDefaultBufferPacker();
-    packer.packArrayHeader(serializedMaps.size());
-    for (byte[] bytes : serializedMaps) {
-      packer.writePayload(bytes);
+    @Test
+    void testMsgpackMapperSerialization() throws Exception {
+        // setup
+        ObjectMapper mapper = new ObjectMapper(new MessagePackFactory());
+        // GStrings get odd results in the serializer.
+        List<Map<String, String>> input = new ArrayList<>();
+        for (int i = 1; i <= 1; i++) {
+            input.add(singletonMap("key" + i, "val" + i));
+        }
+        List<byte[]> serializedMaps = new ArrayList<>();
+        for (Map<String, String> item : input) {
+            serializedMaps.add(mapper.writeValueAsBytes(item));
+        }
+
+        MessageBufferPacker packer = MessagePack.newDefaultBufferPacker();
+        packer.packArrayHeader(serializedMaps.size());
+        for (byte[] bytes : serializedMaps) {
+            packer.writePayload(bytes);
+        }
+        byte[] serializedList = packer.toByteArray();
+
+        List<Map<String, String>> result =
+                mapper.readValue(serializedList, new TypeReference<List<Map<String, String>>>() {});
+
+        assertEquals(input, result);
     }
-    byte[] serializedList = packer.toByteArray();
-
-    List<Map<String, String>> result =
-        mapper.readValue(serializedList, new TypeReference<List<Map<String, String>>>() {});
-
-    assertEquals(input, result);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/SpanSamplingWorkerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/SpanSamplingWorkerTest.java
index f03ecc985df..4f35846110a 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/SpanSamplingWorkerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/SpanSamplingWorkerTest.java
@@ -27,347 +27,328 @@
 
 class SpanSamplingWorkerTest extends DDJavaSpecification {
 
-  @Test
-  void testSendOnlySampledSpansToTheSampledSpanQueue() throws InterruptedException {
-    BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
-    BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(10);
-    SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    SpanSamplingWorker worker =
-        SpanSamplingWorker.build(
-            10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false);
-    worker.start();
-    DDSpan span1 = mock(DDSpan.class);
-    DDSpan span2 = mock(DDSpan.class);
-    DDSpan span3 = mock(DDSpan.class);
-    when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(true);
-    when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(false);
-    when(singleSpanSampler.setSamplingPriority(span3)).thenReturn(true);
-
-    worker.getSpanSamplingQueue().offer(Arrays.asList(span1, span2, span3));
-
-    assertEquals(Arrays.asList(span1, span3), primaryQueue.take());
-    assertEquals(Arrays.asList(span2), secondaryQueue.take());
-
-    worker.close();
-  }
-
-  @Test
-  void testHandleMultipleTraces() throws InterruptedException {
-    BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
-    BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(10);
-    SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    SpanSamplingWorker worker =
-        SpanSamplingWorker.build(
-            10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false);
-    worker.start();
-    DDSpan span1 = mock(DDSpan.class);
-    DDSpan span2 = mock(DDSpan.class);
-    DDSpan span3 = mock(DDSpan.class);
-    when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(true);
-    when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(false);
-    when(singleSpanSampler.setSamplingPriority(span3)).thenReturn(true);
-    DDSpan span4 = mock(DDSpan.class);
-    DDSpan span5 = mock(DDSpan.class);
-    when(singleSpanSampler.setSamplingPriority(span4)).thenReturn(true);
-    when(singleSpanSampler.setSamplingPriority(span5)).thenReturn(false);
-
-    worker.getSpanSamplingQueue().offer(Arrays.asList(span1, span2, span3));
-    worker.getSpanSamplingQueue().offer(Arrays.asList(span4, span5));
-
-    assertEquals(Arrays.asList(span1, span3), primaryQueue.take());
-    assertEquals(Arrays.asList(span2), secondaryQueue.take());
-    assertEquals(Arrays.asList(span4), primaryQueue.take());
-    assertEquals(Arrays.asList(span5), secondaryQueue.take());
-
-    worker.close();
-  }
-
-  @Test
-  void testSkipTracesWithNoSampledSpans() throws InterruptedException {
-    BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
-    BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(10);
-    SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    SpanSamplingWorker worker =
-        SpanSamplingWorker.build(
-            10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false);
-    worker.start();
-    DDSpan span1 = mock(DDSpan.class);
-    DDSpan span2 = mock(DDSpan.class);
-    DDSpan span3 = mock(DDSpan.class);
-    when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(true);
-    when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(false);
-    when(singleSpanSampler.setSamplingPriority(span3)).thenReturn(true);
-    DDSpan span4 = mock(DDSpan.class);
-    DDSpan span5 = mock(DDSpan.class);
-    when(singleSpanSampler.setSamplingPriority(span4)).thenReturn(false);
-    when(singleSpanSampler.setSamplingPriority(span5)).thenReturn(false);
-    DDSpan span6 = mock(DDSpan.class);
-    DDSpan span7 = mock(DDSpan.class);
-    when(singleSpanSampler.setSamplingPriority(span6)).thenReturn(true);
-    when(singleSpanSampler.setSamplingPriority(span7)).thenReturn(true);
-
-    assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span1, span2, span3)));
-    assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span4, span5)));
-    assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span6, span7)));
-
-    assertEquals(Arrays.asList(span1, span3), primaryQueue.take());
-    assertEquals(Arrays.asList(span2), secondaryQueue.take());
-    assertEquals(Arrays.asList(span4, span5), secondaryQueue.take());
-    assertEquals(Arrays.asList(span6, span7), primaryQueue.take());
-
-    worker.close();
-  }
-
-  @Test
-  void testIgnoreEmptyTraces() throws InterruptedException {
-    BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
-    BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(10);
-    SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    SpanSamplingWorker worker =
-        SpanSamplingWorker.build(
-            10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false);
-    worker.start();
-    DDSpan span1 = mock(DDSpan.class);
-    when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(true);
-
-    assertTrue(worker.getSpanSamplingQueue().offer(java.util.Collections.emptyList()));
-    assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span1)));
-
-    assertEquals(Arrays.asList(span1), primaryQueue.take());
-    assertTrue(secondaryQueue.isEmpty());
-
-    worker.close();
-  }
-
-  @Test
-  void testUpdateDroppedTracesMetricWhenNoTracerSpansHaveBeenSampled() throws InterruptedException {
-    BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
-    BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(10);
-    SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    CountDownLatch latch = new CountDownLatch(1);
-    SpanSamplingWorker worker =
-        new SpanSamplingWorker.DefaultSpanSamplingWorker(
-            10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false) {
-          @Override
-          protected void afterOnEvent() {
-            latch.countDown();
-          }
-        };
-    worker.start();
-    DDSpan span1 = mock(DDSpan.class);
-    DDSpan span2 = mock(DDSpan.class);
-    when(span1.samplingPriority()).thenReturn((int) PrioritySampling.USER_DROP);
-    when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(false);
-    when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(false);
-    List<DDSpan> trace = Arrays.asList(span1, span2);
-
-    assertTrue(worker.getSpanSamplingQueue().offer(trace));
-
-    // wait for processing
-    assertTrue(latch.await(10, TimeUnit.SECONDS));
-    assertTrue(primaryQueue.isEmpty());
-    assertEquals(trace, secondaryQueue.take());
-    verify(healthMetrics).onPublish(trace, PrioritySampling.USER_DROP);
-    verify(healthMetrics, never()).onFailedPublish(anyInt(), anyInt());
-    verify(healthMetrics, never()).onPartialPublish(anyInt());
-
-    worker.close();
-  }
-
-  @Test
-  void testUpdateDroppedTracesMetricWhenPrimaryQueueIsFull() throws InterruptedException {
-    BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(1);
-    BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(10);
-    primaryQueue.offer(java.util.Collections.emptyList()); // occupy the entire queue
-    SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    CountDownLatch latch = new CountDownLatch(1);
-    SpanSamplingWorker worker =
-        new SpanSamplingWorker.DefaultSpanSamplingWorker(
-            10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false) {
-          @Override
-          protected void afterOnEvent() {
-            latch.countDown();
-          }
-        };
-    worker.start();
-    DDSpan span1 = mock(DDSpan.class);
-    DDSpan span2 = mock(DDSpan.class);
-    when(span1.samplingPriority()).thenReturn((int) PrioritySampling.SAMPLER_DROP);
-    when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(false);
-    when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(true);
-    List<DDSpan> trace = Arrays.asList(span1, span2);
-
-    assertTrue(worker.getSpanSamplingQueue().offer(trace));
-
-    // wait for processing
-    assertTrue(latch.await(10, TimeUnit.SECONDS));
-    assertTrue(secondaryQueue.isEmpty());
-    verify(healthMetrics).onFailedPublish(eq((int) PrioritySampling.SAMPLER_DROP), anyInt());
-    verify(healthMetrics, never()).onPublish(any(), anyInt());
-    verify(healthMetrics, never()).onPartialPublish(anyInt());
-
-    worker.close();
-  }
-
-  @Test
-  void testUpdatePublishedTracesMetricWhenAllTraceSpansHaveBeenSampled()
-      throws InterruptedException {
-    BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
-    BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(10);
-    SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    SpanSamplingWorker worker =
-        SpanSamplingWorker.build(
-            10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false);
-    worker.start();
-    DDSpan span1 = mock(DDSpan.class);
-    DDSpan span2 = mock(DDSpan.class);
-    when(span1.samplingPriority()).thenReturn((int) PrioritySampling.SAMPLER_DROP);
-    when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(true);
-    when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(true);
-    List<DDSpan> trace = Arrays.asList(span1, span2);
-
-    assertTrue(worker.getSpanSamplingQueue().offer(trace));
-
-    // take() blocks until worker has put spans in primaryQueue
-    assertEquals(trace, primaryQueue.take());
-    assertTrue(secondaryQueue.isEmpty());
-    // use timeout to wait for healthMetrics to be called after queue operations
-    verify(healthMetrics, timeout(5000)).onPublish(trace, PrioritySampling.SAMPLER_DROP);
-    verify(healthMetrics, never()).onFailedPublish(anyInt(), anyInt());
-    verify(healthMetrics, never()).onPartialPublish(anyInt());
-
-    worker.close();
-  }
-
-  @Test
-  void testUpdatePartialTracesMetricWhenSomeSpansDroppedAndSentToSecondaryQueue()
-      throws InterruptedException {
-    BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
-    BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(10);
-    SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    SpanSamplingWorker worker =
-        SpanSamplingWorker.build(
-            10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false);
-    worker.start();
-    DDSpan span1 = mock(DDSpan.class);
-    DDSpan span2 = mock(DDSpan.class);
-    DDSpan span3 = mock(DDSpan.class);
-    when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(false);
-    when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(true);
-    when(singleSpanSampler.setSamplingPriority(span3)).thenReturn(false);
-    List<DDSpan> trace = Arrays.asList(span1, span2, span3);
-
-    assertTrue(worker.getSpanSamplingQueue().offer(trace));
-
-    // take() blocks until worker has put spans in queues
-    assertEquals(Arrays.asList(span2), primaryQueue.take());
-    assertEquals(Arrays.asList(span1, span3), secondaryQueue.take());
-    // use timeout to wait for healthMetrics to be called after queue operations
-    verify(healthMetrics, timeout(5000)).onPublish(trace, PrioritySampling.SAMPLER_DROP);
-    verify(healthMetrics, never()).onPartialPublish(anyInt());
-    verify(healthMetrics, never()).onFailedPublish(anyInt(), anyInt());
-
-    worker.close();
-  }
-
-  @TableTest({
-    "scenario                   | droppingPolicy | secondaryQueueIsFull",
-    "dropping active            | true           | false               ",
-    "secondary queue full       | false          | true                ",
-    "dropping active+full queue | true           | true                "
-  })
-  void testUpdatePartialTracesMetricWhenSpansDroppedAndSecondaryQueueFullOrDroppingPolicyActive(
-      boolean droppingPolicy, boolean secondaryQueueIsFull) throws InterruptedException {
-    BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
-    BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(secondaryQueueIsFull ? 1 : 10);
-    if (secondaryQueueIsFull) {
-      // occupy the entire queue
-      secondaryQueue.offer(java.util.Collections.emptyList());
+    @Test
+    void testSendOnlySampledSpansToTheSampledSpanQueue() throws InterruptedException {
+        BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
+        BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(10);
+        SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        SpanSamplingWorker worker = SpanSamplingWorker.build(
+                10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false);
+        worker.start();
+        DDSpan span1 = mock(DDSpan.class);
+        DDSpan span2 = mock(DDSpan.class);
+        DDSpan span3 = mock(DDSpan.class);
+        when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(true);
+        when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(false);
+        when(singleSpanSampler.setSamplingPriority(span3)).thenReturn(true);
+
+        worker.getSpanSamplingQueue().offer(Arrays.asList(span1, span2, span3));
+
+        assertEquals(Arrays.asList(span1, span3), primaryQueue.take());
+        assertEquals(Arrays.asList(span2), secondaryQueue.take());
+
+        worker.close();
     }
-    SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    SpanSamplingWorker worker =
-        new SpanSamplingWorker.DefaultSpanSamplingWorker(
-            10,
-            primaryQueue,
-            secondaryQueue,
-            singleSpanSampler,
-            healthMetrics,
-            () -> droppingPolicy);
-    worker.start();
-    DDSpan span1 = mock(DDSpan.class);
-    DDSpan span2 = mock(DDSpan.class);
-    DDSpan span3 = mock(DDSpan.class);
-    when(span1.samplingPriority()).thenReturn((int) PrioritySampling.SAMPLER_DROP);
-    when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(false);
-    when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(true);
-    when(singleSpanSampler.setSamplingPriority(span3)).thenReturn(false);
-
-    assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span1, span2, span3)));
-
-    // take() blocks until worker has put span2 in primaryQueue
-    assertEquals(Arrays.asList(span2), primaryQueue.take());
-    // use timeout to wait for healthMetrics to be called after queue operations
-    verify(healthMetrics, timeout(5000)).onPartialPublish(2);
-    verify(healthMetrics, never()).onFailedPublish(anyInt(), anyInt());
-    verify(healthMetrics, never()).onPublish(any(), anyInt());
-
-    worker.close();
-  }
-
-  @TableTest({
-    "scenario                   | droppingPolicy | secondaryQueueIsFull",
-    "dropping active            | true           | false               ",
-    "secondary queue full       | false          | true                ",
-    "dropping active+full queue | true           | true                "
-  })
-  void testUpdateFailedPublishMetricWhenAllSpansDroppedAndSecondaryQueueFullOrDroppingPolicyActive(
-      boolean droppingPolicy, boolean secondaryQueueIsFull) throws InterruptedException {
-    BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
-    BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(secondaryQueueIsFull ? 1 : 10);
-    if (secondaryQueueIsFull) {
-      // occupy the entire queue
-      secondaryQueue.offer(java.util.Collections.emptyList());
+
+    @Test
+    void testHandleMultipleTraces() throws InterruptedException {
+        BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
+        BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(10);
+        SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        SpanSamplingWorker worker = SpanSamplingWorker.build(
+                10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false);
+        worker.start();
+        DDSpan span1 = mock(DDSpan.class);
+        DDSpan span2 = mock(DDSpan.class);
+        DDSpan span3 = mock(DDSpan.class);
+        when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(true);
+        when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(false);
+        when(singleSpanSampler.setSamplingPriority(span3)).thenReturn(true);
+        DDSpan span4 = mock(DDSpan.class);
+        DDSpan span5 = mock(DDSpan.class);
+        when(singleSpanSampler.setSamplingPriority(span4)).thenReturn(true);
+        when(singleSpanSampler.setSamplingPriority(span5)).thenReturn(false);
+
+        worker.getSpanSamplingQueue().offer(Arrays.asList(span1, span2, span3));
+        worker.getSpanSamplingQueue().offer(Arrays.asList(span4, span5));
+
+        assertEquals(Arrays.asList(span1, span3), primaryQueue.take());
+        assertEquals(Arrays.asList(span2), secondaryQueue.take());
+        assertEquals(Arrays.asList(span4), primaryQueue.take());
+        assertEquals(Arrays.asList(span5), secondaryQueue.take());
+
+        worker.close();
+    }
+
+    @Test
+    void testSkipTracesWithNoSampledSpans() throws InterruptedException {
+        BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
+        BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(10);
+        SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        SpanSamplingWorker worker = SpanSamplingWorker.build(
+                10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false);
+        worker.start();
+        DDSpan span1 = mock(DDSpan.class);
+        DDSpan span2 = mock(DDSpan.class);
+        DDSpan span3 = mock(DDSpan.class);
+        when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(true);
+        when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(false);
+        when(singleSpanSampler.setSamplingPriority(span3)).thenReturn(true);
+        DDSpan span4 = mock(DDSpan.class);
+        DDSpan span5 = mock(DDSpan.class);
+        when(singleSpanSampler.setSamplingPriority(span4)).thenReturn(false);
+        when(singleSpanSampler.setSamplingPriority(span5)).thenReturn(false);
+        DDSpan span6 = mock(DDSpan.class);
+        DDSpan span7 = mock(DDSpan.class);
+        when(singleSpanSampler.setSamplingPriority(span6)).thenReturn(true);
+        when(singleSpanSampler.setSamplingPriority(span7)).thenReturn(true);
+
+        assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span1, span2, span3)));
+        assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span4, span5)));
+        assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span6, span7)));
+
+        assertEquals(Arrays.asList(span1, span3), primaryQueue.take());
+        assertEquals(Arrays.asList(span2), secondaryQueue.take());
+        assertEquals(Arrays.asList(span4, span5), secondaryQueue.take());
+        assertEquals(Arrays.asList(span6, span7), primaryQueue.take());
+
+        worker.close();
+    }
+
+    @Test
+    void testIgnoreEmptyTraces() throws InterruptedException {
+        BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
+        BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(10);
+        SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        SpanSamplingWorker worker = SpanSamplingWorker.build(
+                10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false);
+        worker.start();
+        DDSpan span1 = mock(DDSpan.class);
+        when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(true);
+
+        assertTrue(worker.getSpanSamplingQueue().offer(java.util.Collections.emptyList()));
+        assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span1)));
+
+        assertEquals(Arrays.asList(span1), primaryQueue.take());
+        assertTrue(secondaryQueue.isEmpty());
+
+        worker.close();
+    }
+
+    @Test
+    void testUpdateDroppedTracesMetricWhenNoTracerSpansHaveBeenSampled() throws InterruptedException {
+        BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
+        BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(10);
+        SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        CountDownLatch latch = new CountDownLatch(1);
+        SpanSamplingWorker worker =
+                new SpanSamplingWorker.DefaultSpanSamplingWorker(
+                        10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false) {
+                    @Override
+                    protected void afterOnEvent() {
+                        latch.countDown();
+                    }
+                };
+        worker.start();
+        DDSpan span1 = mock(DDSpan.class);
+        DDSpan span2 = mock(DDSpan.class);
+        when(span1.samplingPriority()).thenReturn((int) PrioritySampling.USER_DROP);
+        when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(false);
+        when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(false);
+        List<DDSpan> trace = Arrays.asList(span1, span2);
+
+        assertTrue(worker.getSpanSamplingQueue().offer(trace));
+
+        // wait for processing
+        assertTrue(latch.await(10, TimeUnit.SECONDS));
+        assertTrue(primaryQueue.isEmpty());
+        assertEquals(trace, secondaryQueue.take());
+        verify(healthMetrics).onPublish(trace, PrioritySampling.USER_DROP);
+        verify(healthMetrics, never()).onFailedPublish(anyInt(), anyInt());
+        verify(healthMetrics, never()).onPartialPublish(anyInt());
+
+        worker.close();
+    }
+
+    @Test
+    void testUpdateDroppedTracesMetricWhenPrimaryQueueIsFull() throws InterruptedException {
+        BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(1);
+        BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(10);
+        primaryQueue.offer(java.util.Collections.emptyList()); // occupy the entire queue
+        SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        CountDownLatch latch = new CountDownLatch(1);
+        SpanSamplingWorker worker =
+                new SpanSamplingWorker.DefaultSpanSamplingWorker(
+                        10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false) {
+                    @Override
+                    protected void afterOnEvent() {
+                        latch.countDown();
+                    }
+                };
+        worker.start();
+        DDSpan span1 = mock(DDSpan.class);
+        DDSpan span2 = mock(DDSpan.class);
+        when(span1.samplingPriority()).thenReturn((int) PrioritySampling.SAMPLER_DROP);
+        when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(false);
+        when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(true);
+        List<DDSpan> trace = Arrays.asList(span1, span2);
+
+        assertTrue(worker.getSpanSamplingQueue().offer(trace));
+
+        // wait for processing
+        assertTrue(latch.await(10, TimeUnit.SECONDS));
+        assertTrue(secondaryQueue.isEmpty());
+        verify(healthMetrics).onFailedPublish(eq((int) PrioritySampling.SAMPLER_DROP), anyInt());
+        verify(healthMetrics, never()).onPublish(any(), anyInt());
+        verify(healthMetrics, never()).onPartialPublish(anyInt());
+
+        worker.close();
+    }
+
+    @Test
+    void testUpdatePublishedTracesMetricWhenAllTraceSpansHaveBeenSampled() throws InterruptedException {
+        BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
+        BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(10);
+        SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        SpanSamplingWorker worker = SpanSamplingWorker.build(
+                10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false);
+        worker.start();
+        DDSpan span1 = mock(DDSpan.class);
+        DDSpan span2 = mock(DDSpan.class);
+        when(span1.samplingPriority()).thenReturn((int) PrioritySampling.SAMPLER_DROP);
+        when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(true);
+        when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(true);
+        List<DDSpan> trace = Arrays.asList(span1, span2);
+
+        assertTrue(worker.getSpanSamplingQueue().offer(trace));
+
+        // take() blocks until worker has put spans in primaryQueue
+        assertEquals(trace, primaryQueue.take());
+        assertTrue(secondaryQueue.isEmpty());
+        // use timeout to wait for healthMetrics to be called after queue operations
+        verify(healthMetrics, timeout(5000)).onPublish(trace, PrioritySampling.SAMPLER_DROP);
+        verify(healthMetrics, never()).onFailedPublish(anyInt(), anyInt());
+        verify(healthMetrics, never()).onPartialPublish(anyInt());
+
+        worker.close();
+    }
+
+    @Test
+    void testUpdatePartialTracesMetricWhenSomeSpansDroppedAndSentToSecondaryQueue() throws InterruptedException {
+        BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
+        BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(10);
+        SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        SpanSamplingWorker worker = SpanSamplingWorker.build(
+                10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false);
+        worker.start();
+        DDSpan span1 = mock(DDSpan.class);
+        DDSpan span2 = mock(DDSpan.class);
+        DDSpan span3 = mock(DDSpan.class);
+        when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(false);
+        when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(true);
+        when(singleSpanSampler.setSamplingPriority(span3)).thenReturn(false);
+        List<DDSpan> trace = Arrays.asList(span1, span2, span3);
+
+        assertTrue(worker.getSpanSamplingQueue().offer(trace));
+
+        // take() blocks until worker has put spans in queues
+        assertEquals(Arrays.asList(span2), primaryQueue.take());
+        assertEquals(Arrays.asList(span1, span3), secondaryQueue.take());
+        // use timeout to wait for healthMetrics to be called after queue operations
+        verify(healthMetrics, timeout(5000)).onPublish(trace, PrioritySampling.SAMPLER_DROP);
+        verify(healthMetrics, never()).onPartialPublish(anyInt());
+        verify(healthMetrics, never()).onFailedPublish(anyInt(), anyInt());
+
+        worker.close();
+    }
+
+    @TableTest({
+      "scenario                   | droppingPolicy | secondaryQueueIsFull",
+      "dropping active            | true           | false               ",
+      "secondary queue full       | false          | true                ",
+      "dropping active+full queue | true           | true                "
+    })
+    void testUpdatePartialTracesMetricWhenSpansDroppedAndSecondaryQueueFullOrDroppingPolicyActive(
+            boolean droppingPolicy, boolean secondaryQueueIsFull) throws InterruptedException {
+        BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
+        BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(secondaryQueueIsFull ? 1 : 10);
+        if (secondaryQueueIsFull) {
+            // occupy the entire queue
+            secondaryQueue.offer(java.util.Collections.emptyList());
+        }
+        SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        SpanSamplingWorker worker = new SpanSamplingWorker.DefaultSpanSamplingWorker(
+                10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> droppingPolicy);
+        worker.start();
+        DDSpan span1 = mock(DDSpan.class);
+        DDSpan span2 = mock(DDSpan.class);
+        DDSpan span3 = mock(DDSpan.class);
+        when(span1.samplingPriority()).thenReturn((int) PrioritySampling.SAMPLER_DROP);
+        when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(false);
+        when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(true);
+        when(singleSpanSampler.setSamplingPriority(span3)).thenReturn(false);
+
+        assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span1, span2, span3)));
+
+        // take() blocks until worker has put span2 in primaryQueue
+        assertEquals(Arrays.asList(span2), primaryQueue.take());
+        // use timeout to wait for healthMetrics to be called after queue operations
+        verify(healthMetrics, timeout(5000)).onPartialPublish(2);
+        verify(healthMetrics, never()).onFailedPublish(anyInt(), anyInt());
+        verify(healthMetrics, never()).onPublish(any(), anyInt());
+
+        worker.close();
+    }
+
+    @TableTest({
+      "scenario                   | droppingPolicy | secondaryQueueIsFull",
+      "dropping active            | true           | false               ",
+      "secondary queue full       | false          | true                ",
+      "dropping active+full queue | true           | true                "
+    })
+    void testUpdateFailedPublishMetricWhenAllSpansDroppedAndSecondaryQueueFullOrDroppingPolicyActive(
+            boolean droppingPolicy, boolean secondaryQueueIsFull) throws InterruptedException {
+        BlockingQueue<Object> primaryQueue = new LinkedBlockingDeque<>(10);
+        BlockingQueue<Object> secondaryQueue = new LinkedBlockingDeque<>(secondaryQueueIsFull ? 1 : 10);
+        if (secondaryQueueIsFull) {
+            // occupy the entire queue
+            secondaryQueue.offer(java.util.Collections.emptyList());
+        }
+        SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        CountDownLatch latch = new CountDownLatch(1);
+        SpanSamplingWorker worker =
+                new SpanSamplingWorker.DefaultSpanSamplingWorker(
+                        10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> droppingPolicy) {
+                    @Override
+                    protected void afterOnEvent() {
+                        latch.countDown();
+                    }
+                };
+        worker.start();
+        DDSpan span1 = mock(DDSpan.class);
+        DDSpan span2 = mock(DDSpan.class);
+        when(span1.samplingPriority()).thenReturn((int) PrioritySampling.SAMPLER_DROP);
+        when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(false);
+        when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(false);
+
+        assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span1, span2)));
+
+        // wait for processing via latch
+        assertTrue(latch.await(10, TimeUnit.SECONDS));
+        verify(healthMetrics).onFailedPublish(eq((int) PrioritySampling.SAMPLER_DROP), anyInt());
+        verify(healthMetrics, never()).onPartialPublish(anyInt());
+        verify(healthMetrics, never()).onPublish(any(), anyInt());
+
+        worker.close();
     }
-    SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class);
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    CountDownLatch latch = new CountDownLatch(1);
-    SpanSamplingWorker worker =
-        new SpanSamplingWorker.DefaultSpanSamplingWorker(
-            10,
-            primaryQueue,
-            secondaryQueue,
-            singleSpanSampler,
-            healthMetrics,
-            () -> droppingPolicy) {
-          @Override
-          protected void afterOnEvent() {
-            latch.countDown();
-          }
-        };
-    worker.start();
-    DDSpan span1 = mock(DDSpan.class);
-    DDSpan span2 = mock(DDSpan.class);
-    when(span1.samplingPriority()).thenReturn((int) PrioritySampling.SAMPLER_DROP);
-    when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(false);
-    when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(false);
-
-    assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span1, span2)));
-
-    // wait for processing via latch
-    assertTrue(latch.await(10, TimeUnit.SECONDS));
-    verify(healthMetrics).onFailedPublish(eq((int) PrioritySampling.SAMPLER_DROP), anyInt());
-    verify(healthMetrics, never()).onPartialPublish(anyInt());
-    verify(healthMetrics, never()).onPublish(any(), anyInt());
-
-    worker.close();
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceGenerator.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceGenerator.java
index 93d6130df92..27618c682d4 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceGenerator.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceGenerator.java
@@ -31,495 +31,493 @@
 
 public class TraceGenerator {
 
-  public static List<List<PojoSpan>> generateRandomTraces(int howMany, boolean lowCardinality) {
-    List<List<PojoSpan>> traces = new ArrayList<>(howMany);
-    for (int i = 0; i < howMany; ++i) {
-      int traceSize = ThreadLocalRandom.current().nextInt(2, 20);
-      traces.add(generateRandomTrace(traceSize, lowCardinality));
-    }
-    return traces;
-  }
-
-  private static List<PojoSpan> generateRandomTrace(int size, boolean lowCardinality) {
-    List<PojoSpan> trace = new ArrayList<>(size);
-    long traceId = ThreadLocalRandom.current().nextLong(1, Long.MAX_VALUE);
-    for (int i = 0; i < size; ++i) {
-      String spanType = "type-" + ThreadLocalRandom.current().nextInt(lowCardinality ? 1 : 100);
-      trace.add(randomSpan(traceId, lowCardinality, spanType, Collections.emptyMap()));
-    }
-    return trace;
-  }
-
-  private static final IdGenerationStrategy ID_GENERATION_STRATEGY =
-      IdGenerationStrategy.fromName("RANDOM");
-
-  public static PojoSpan generateRandomSpan(CharSequence type, Map<String, Object> extraTags) {
-    long traceId = ThreadLocalRandom.current().nextLong(1, Long.MAX_VALUE);
-    return randomSpan(traceId, true, type, extraTags);
-  }
-
-  private static PojoSpan randomSpan(
-      long traceId, boolean lowCardinality, CharSequence type, Map<String, Object> extraTags) {
-    ThreadLocalRandom random = ThreadLocalRandom.current();
-    Map<String, String> baggage = new HashMap<>();
-    if (random.nextBoolean()) {
-      baggage.put("baggage-key", lowCardinality ? "x" : randomString(100));
-      if (random.nextBoolean()) {
-        baggage.put("tag.1", "bar");
-        baggage.put("tag.2", "qux");
-      }
-    }
-    Map<String, Object> tags = new HashMap<>(extraTags);
-    int tagCount = random.nextInt(0, 20);
-    for (int i = 0; i < tagCount; ++i) {
-      tags.put("tag." + i, random.nextBoolean() ? "foo" : randomString(2000));
-      tags.put("tag.1." + i, lowCardinality ? "y" : UUID.randomUUID());
-      tags.put("tag.2." + i, random.nextBoolean());
-      switch (random.nextInt(8)) {
-        case 0:
-          tags.put("tag.3." + i, BigDecimal.valueOf(random.nextDouble()));
-          break;
-        case 1:
-          tags.put("tag.3." + i, BigInteger.valueOf(random.nextLong()));
-          break;
-        default:
-          break;
-      }
-    }
-    int metricCount = random.nextInt(0, 20);
-    for (int i = 0; i < metricCount; ++i) {
-      String name = "metric." + i;
-      Number metric = null;
-      switch (random.nextInt(4)) {
-        case 0:
-          metric = random.nextInt();
-          break;
-        case 1:
-          metric = random.nextLong();
-          break;
-        case 2:
-          metric = random.nextFloat();
-          break;
-        case 3:
-          metric = random.nextDouble();
-          break;
-      }
-      tags.put(name, metric);
+    public static List<List<PojoSpan>> generateRandomTraces(int howMany, boolean lowCardinality) {
+        List<List<PojoSpan>> traces = new ArrayList<>(howMany);
+        for (int i = 0; i < howMany; ++i) {
+            int traceSize = ThreadLocalRandom.current().nextInt(2, 20);
+            traces.add(generateRandomTrace(traceSize, lowCardinality));
+        }
+        return traces;
     }
 
-    return new PojoSpan(
-        "service-" + random.nextInt(lowCardinality ? 1 : 10),
-        "operation-" + random.nextInt(lowCardinality ? 1 : 100),
-        UTF8BytesString.create("resource-" + random.nextInt(lowCardinality ? 1 : 100)),
-        DDTraceId.from(traceId),
-        ID_GENERATION_STRATEGY.generateSpanId(),
-        DDSpanId.ZERO,
-        TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis()),
-        random.nextLong(500, 10_000_000),
-        random.nextInt(2),
-        baggage,
-        tags,
-        type,
-        random.nextBoolean(),
-        PrioritySampling.SAMPLER_KEEP,
-        200,
-        "some-origin");
-  }
-
-  private static String randomString(int maxLength) {
-    char[] chars = new char[ThreadLocalRandom.current().nextInt(maxLength)];
-    for (int i = 0; i < chars.length; ++i) {
-      char next = (char) ThreadLocalRandom.current().nextInt((int) Character.MAX_VALUE);
-      if (Character.isSurrogate(next)) {
-        if (i < chars.length - 1) {
-          chars[i++] = '\uD801';
-          chars[i] = '\uDC01';
-        } else {
-          chars[i] = 'a';
-        }
-      } else {
-        chars[i] = next;
-      }
-    }
-    return new String(chars);
-  }
-
-  public static class PojoSpan implements CoreSpan<PojoSpan> {
-
-    private final CharSequence serviceName;
-    private final CharSequence operationName;
-    private final CharSequence resourceName;
-    private final DDTraceId traceId;
-    private final long spanId;
-    private final long parentId;
-    private final long start;
-    private final long duration;
-    private final int error;
-    private final CharSequence type;
-    private final boolean measured;
-    private final Metadata metadata;
-    private short httpStatusCode;
-    private final int samplingPriority;
-    private final Map<String, Object> metaStruct = new HashMap<>();
-
-    public PojoSpan(
-        String serviceName,
-        String operationName,
-        CharSequence resourceName,
-        DDTraceId traceId,
-        long spanId,
-        long parentId,
-        long start,
-        long duration,
-        int error,
-        Map<String, String> baggage,
-        Map<String, Object> tags,
-        CharSequence type,
-        boolean measured,
-        int samplingPriority,
-        int statusCode,
-        CharSequence origin) {
-      this(
-          serviceName,
-          operationName,
-          resourceName,
-          traceId,
-          spanId,
-          parentId,
-          start,
-          duration,
-          error,
-          baggage,
-          tags,
-          type,
-          measured,
-          samplingPriority,
-          statusCode,
-          origin,
-          emptyList());
+    private static List<PojoSpan> generateRandomTrace(int size, boolean lowCardinality) {
+        List<PojoSpan> trace = new ArrayList<>(size);
+        long traceId = ThreadLocalRandom.current().nextLong(1, Long.MAX_VALUE);
+        for (int i = 0; i < size; ++i) {
+            String spanType = "type-" + ThreadLocalRandom.current().nextInt(lowCardinality ? 1 : 100);
+            trace.add(randomSpan(traceId, lowCardinality, spanType, Collections.emptyMap()));
+        }
+        return trace;
     }
 
-    public PojoSpan(
-        String serviceName,
-        String operationName,
-        CharSequence resourceName,
-        DDTraceId traceId,
-        long spanId,
-        long parentId,
-        long start,
-        long duration,
-        int error,
-        Map<String, String> baggage,
-        Map<String, Object> tags,
-        CharSequence type,
-        boolean measured,
-        int samplingPriority,
-        int statusCode,
-        CharSequence origin,
-        List<AgentSpanLink> spanLinks) {
-      this.serviceName = UTF8BytesString.create(serviceName);
-      this.operationName = UTF8BytesString.create(operationName);
-      this.resourceName = UTF8BytesString.create(resourceName);
-      this.traceId = traceId;
-      this.spanId = spanId;
-      this.parentId = parentId;
-      this.start = start;
-      this.duration = duration;
-      this.error = error;
-      this.type = type;
-      this.measured = measured;
-      this.samplingPriority = samplingPriority;
-      this.httpStatusCode = (short) statusCode;
-      this.metadata =
-          new Metadata(
-              Thread.currentThread().getId(),
-              UTF8BytesString.create(Thread.currentThread().getName()),
-              TagMap.fromMap(tags),
-              baggage,
-              samplingPriority,
-              measured,
-              isTopLevel(),
-              statusCode,
-              origin,
-              0,
-              ProcessTags.getTagsForSerialization(),
-              UTF8BytesString.create(String.valueOf(Config.get().isOtlpTracesExportEnabled())),
-              spanLinks);
-    }
+    private static final IdGenerationStrategy ID_GENERATION_STRATEGY = IdGenerationStrategy.fromName("RANDOM");
 
-    @Override
-    public PojoSpan getLocalRootSpan() {
-      return this;
+    public static PojoSpan generateRandomSpan(CharSequence type, Map<String, Object> extraTags) {
+        long traceId = ThreadLocalRandom.current().nextLong(1, Long.MAX_VALUE);
+        return randomSpan(traceId, true, type, extraTags);
     }
 
-    @Override
-    public String getServiceName() {
-      return serviceName.toString();
-    }
+    private static PojoSpan randomSpan(
+            long traceId, boolean lowCardinality, CharSequence type, Map<String, Object> extraTags) {
+        ThreadLocalRandom random = ThreadLocalRandom.current();
+        Map<String, String> baggage = new HashMap<>();
+        if (random.nextBoolean()) {
+            baggage.put("baggage-key", lowCardinality ? "x" : randomString(100));
+            if (random.nextBoolean()) {
+                baggage.put("tag.1", "bar");
+                baggage.put("tag.2", "qux");
+            }
+        }
+        Map<String, Object> tags = new HashMap<>(extraTags);
+        int tagCount = random.nextInt(0, 20);
+        for (int i = 0; i < tagCount; ++i) {
+            tags.put("tag." + i, random.nextBoolean() ? "foo" : randomString(2000));
+            tags.put("tag.1." + i, lowCardinality ? "y" : UUID.randomUUID());
+            tags.put("tag.2." + i, random.nextBoolean());
+            switch (random.nextInt(8)) {
+                case 0:
+                    tags.put("tag.3." + i, BigDecimal.valueOf(random.nextDouble()));
+                    break;
+                case 1:
+                    tags.put("tag.3." + i, BigInteger.valueOf(random.nextLong()));
+                    break;
+                default:
+                    break;
+            }
+        }
+        int metricCount = random.nextInt(0, 20);
+        for (int i = 0; i < metricCount; ++i) {
+            String name = "metric." + i;
+            Number metric = null;
+            switch (random.nextInt(4)) {
+                case 0:
+                    metric = random.nextInt();
+                    break;
+                case 1:
+                    metric = random.nextLong();
+                    break;
+                case 2:
+                    metric = random.nextFloat();
+                    break;
+                case 3:
+                    metric = random.nextDouble();
+                    break;
+            }
+            tags.put(name, metric);
+        }
 
-    @Override
-    public CharSequence getOperationName() {
-      return operationName;
-    }
+        return new PojoSpan(
+                "service-" + random.nextInt(lowCardinality ? 1 : 10),
+                "operation-" + random.nextInt(lowCardinality ? 1 : 100),
+                UTF8BytesString.create("resource-" + random.nextInt(lowCardinality ? 1 : 100)),
+                DDTraceId.from(traceId),
+                ID_GENERATION_STRATEGY.generateSpanId(),
+                DDSpanId.ZERO,
+                TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis()),
+                random.nextLong(500, 10_000_000),
+                random.nextInt(2),
+                baggage,
+                tags,
+                type,
+                random.nextBoolean(),
+                PrioritySampling.SAMPLER_KEEP,
+                200,
+                "some-origin");
+    }
+
+    private static String randomString(int maxLength) {
+        char[] chars = new char[ThreadLocalRandom.current().nextInt(maxLength)];
+        for (int i = 0; i < chars.length; ++i) {
+            char next = (char) ThreadLocalRandom.current().nextInt((int) Character.MAX_VALUE);
+            if (Character.isSurrogate(next)) {
+                if (i < chars.length - 1) {
+                    chars[i++] = '\uD801';
+                    chars[i] = '\uDC01';
+                } else {
+                    chars[i] = 'a';
+                }
+            } else {
+                chars[i] = next;
+            }
+        }
+        return new String(chars);
+    }
+
+    public static class PojoSpan implements CoreSpan<PojoSpan> {
+
+        private final CharSequence serviceName;
+        private final CharSequence operationName;
+        private final CharSequence resourceName;
+        private final DDTraceId traceId;
+        private final long spanId;
+        private final long parentId;
+        private final long start;
+        private final long duration;
+        private final int error;
+        private final CharSequence type;
+        private final boolean measured;
+        private final Metadata metadata;
+        private short httpStatusCode;
+        private final int samplingPriority;
+        private final Map<String, Object> metaStruct = new HashMap<>();
+
+        public PojoSpan(
+                String serviceName,
+                String operationName,
+                CharSequence resourceName,
+                DDTraceId traceId,
+                long spanId,
+                long parentId,
+                long start,
+                long duration,
+                int error,
+                Map<String, String> baggage,
+                Map<String, Object> tags,
+                CharSequence type,
+                boolean measured,
+                int samplingPriority,
+                int statusCode,
+                CharSequence origin) {
+            this(
+                    serviceName,
+                    operationName,
+                    resourceName,
+                    traceId,
+                    spanId,
+                    parentId,
+                    start,
+                    duration,
+                    error,
+                    baggage,
+                    tags,
+                    type,
+                    measured,
+                    samplingPriority,
+                    statusCode,
+                    origin,
+                    emptyList());
+        }
 
-    @Override
-    public CharSequence getResourceName() {
-      return resourceName;
-    }
+        public PojoSpan(
+                String serviceName,
+                String operationName,
+                CharSequence resourceName,
+                DDTraceId traceId,
+                long spanId,
+                long parentId,
+                long start,
+                long duration,
+                int error,
+                Map<String, String> baggage,
+                Map<String, Object> tags,
+                CharSequence type,
+                boolean measured,
+                int samplingPriority,
+                int statusCode,
+                CharSequence origin,
+                List<AgentSpanLink> spanLinks) {
+            this.serviceName = UTF8BytesString.create(serviceName);
+            this.operationName = UTF8BytesString.create(operationName);
+            this.resourceName = UTF8BytesString.create(resourceName);
+            this.traceId = traceId;
+            this.spanId = spanId;
+            this.parentId = parentId;
+            this.start = start;
+            this.duration = duration;
+            this.error = error;
+            this.type = type;
+            this.measured = measured;
+            this.samplingPriority = samplingPriority;
+            this.httpStatusCode = (short) statusCode;
+            this.metadata = new Metadata(
+                    Thread.currentThread().getId(),
+                    UTF8BytesString.create(Thread.currentThread().getName()),
+                    TagMap.fromMap(tags),
+                    baggage,
+                    samplingPriority,
+                    measured,
+                    isTopLevel(),
+                    statusCode,
+                    origin,
+                    0,
+                    ProcessTags.getTagsForSerialization(),
+                    UTF8BytesString.create(String.valueOf(Config.get().isOtlpTracesExportEnabled())),
+                    spanLinks);
+        }
 
-    @Override
-    public DDTraceId getTraceId() {
-      return traceId;
-    }
+        @Override
+        public PojoSpan getLocalRootSpan() {
+            return this;
+        }
 
-    @Override
-    public long getSpanId() {
-      return spanId;
-    }
+        @Override
+        public String getServiceName() {
+            return serviceName.toString();
+        }
 
-    @Override
-    public long getParentId() {
-      return parentId;
-    }
+        @Override
+        public CharSequence getOperationName() {
+            return operationName;
+        }
 
-    @Override
-    public long getStartTime() {
-      return start;
-    }
+        @Override
+        public CharSequence getResourceName() {
+            return resourceName;
+        }
 
-    @Override
-    public long getDurationNano() {
-      return duration;
-    }
+        @Override
+        public DDTraceId getTraceId() {
+            return traceId;
+        }
 
-    @Override
-    public int getError() {
-      return error;
-    }
+        @Override
+        public long getSpanId() {
+            return spanId;
+        }
 
-    @Override
-    public PojoSpan setMeasured(boolean measured) {
-      return this;
-    }
+        @Override
+        public long getParentId() {
+            return parentId;
+        }
 
-    @Override
-    public PojoSpan setErrorMessage(String errorMessage) {
-      return this;
-    }
+        @Override
+        public long getStartTime() {
+            return start;
+        }
 
-    @Override
-    public PojoSpan addThrowable(Throwable error) {
-      return this;
-    }
+        @Override
+        public long getDurationNano() {
+            return duration;
+        }
 
-    @Override
-    public PojoSpan setTag(String tag, String value) {
-      return this;
-    }
+        @Override
+        public int getError() {
+            return error;
+        }
 
-    @Override
-    public PojoSpan setTag(String tag, boolean value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setMeasured(boolean measured) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setTag(String tag, int value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setErrorMessage(String errorMessage) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setTag(String tag, long value) {
-      return this;
-    }
+        @Override
+        public PojoSpan addThrowable(Throwable error) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setTag(String tag, double value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setTag(String tag, String value) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setTag(String tag, Number value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setTag(String tag, boolean value) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setTag(String tag, CharSequence value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setTag(String tag, int value) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setTag(String tag, Object value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setTag(String tag, long value) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan removeTag(String tag) {
-      metadata.getTags().remove(tag);
-      return this;
-    }
+        @Override
+        public PojoSpan setTag(String tag, double value) {
+            return this;
+        }
 
-    @Override
-    public boolean isMeasured() {
-      return measured;
-    }
+        @Override
+        public PojoSpan setTag(String tag, Number value) {
+            return this;
+        }
 
-    @Override
-    public boolean isTopLevel() {
-      return false;
-    }
+        @Override
+        public PojoSpan setTag(String tag, CharSequence value) {
+            return this;
+        }
 
-    @Override
-    public boolean isForceKeep() {
-      return false;
-    }
+        @Override
+        public PojoSpan setTag(String tag, Object value) {
+            return this;
+        }
 
-    @Override
-    public short getHttpStatusCode() {
-      return httpStatusCode;
-    }
+        @Override
+        public PojoSpan removeTag(String tag) {
+            metadata.getTags().remove(tag);
+            return this;
+        }
 
-    @Override
-    public CharSequence getOrigin() {
-      return metadata.getOrigin();
-    }
+        @Override
+        public boolean isMeasured() {
+            return measured;
+        }
 
-    public Map<String, String> getBaggage() {
-      return metadata.getBaggage();
-    }
+        @Override
+        public boolean isTopLevel() {
+            return false;
+        }
 
-    public Map<String, Object> getTags() {
-      return metadata.getTags();
-    }
+        @Override
+        public boolean isForceKeep() {
+            return false;
+        }
 
-    @Override
-    public CharSequence getType() {
-      return this.type;
-    }
+        @Override
+        public short getHttpStatusCode() {
+            return httpStatusCode;
+        }
 
-    @Override
-    public void processServiceTags() {}
+        @Override
+        public CharSequence getOrigin() {
+            return metadata.getOrigin();
+        }
 
-    @Override
-    public void processTagsAndBaggage(MetadataConsumer consumer) {
-      consumer.accept(metadata);
-    }
+        public Map<String, String> getBaggage() {
+            return metadata.getBaggage();
+        }
 
-    @Override
-    public PojoSpan setSamplingPriority(int samplingPriority, int samplingMechanism) {
-      return this;
-    }
+        public Map<String, Object> getTags() {
+            return metadata.getTags();
+        }
 
-    @Override
-    public PojoSpan setSamplingPriority(
-        int samplingPriority, CharSequence rate, double sampleRate, int samplingMechanism) {
-      return this;
-    }
+        @Override
+        public CharSequence getType() {
+            return this.type;
+        }
 
-    @Override
-    public PojoSpan setSpanSamplingPriority(double rate, int limit) {
-      return this;
-    }
+        @Override
+        public void processServiceTags() {}
 
-    @Override
-    public PojoSpan setMetric(CharSequence name, int value) {
-      return this;
-    }
+        @Override
+        public void processTagsAndBaggage(MetadataConsumer consumer) {
+            consumer.accept(metadata);
+        }
 
-    @Override
-    public PojoSpan setMetric(CharSequence name, long value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setSamplingPriority(int samplingPriority, int samplingMechanism) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setMetric(CharSequence name, float value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setSamplingPriority(
+                int samplingPriority, CharSequence rate, double sampleRate, int samplingMechanism) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setMetric(CharSequence name, double value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setSpanSamplingPriority(double rate, int limit) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setFlag(CharSequence name, boolean value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setMetric(CharSequence name, int value) {
+            return this;
+        }
 
-    @Override
-    public int samplingPriority() {
-      return samplingPriority;
-    }
+        @Override
+        public PojoSpan setMetric(CharSequence name, long value) {
+            return this;
+        }
 
-    @Override
-    public <U> U getTag(CharSequence name, U defaultValue) {
-      U value = getTag(name);
-      return null == value ? defaultValue : value;
-    }
+        @Override
+        public PojoSpan setMetric(CharSequence name, float value) {
+            return this;
+        }
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public <U> U getTag(CharSequence name) {
-      // replicate logic here because DDSpanContext has to pretend some of its
-      // fields are elements of a map for backward compatibility reasons
-      String tag = String.valueOf(name);
-      Object value = null;
-      switch (tag) {
-        case DDTags.THREAD_ID:
-          value = metadata.getThreadId();
-          break;
-        case DDTags.THREAD_NAME:
-          value = metadata.getThreadName();
-          break;
-        default:
-          value = metadata.getTags().get(tag);
-      }
-      return (U) value;
-    }
+        @Override
+        public PojoSpan setMetric(CharSequence name, double value) {
+            return this;
+        }
 
-    @Override
-    public boolean hasSamplingPriority() {
-      return samplingPriority != UNSET;
-    }
+        @Override
+        public PojoSpan setFlag(CharSequence name, boolean value) {
+            return this;
+        }
 
-    @Override
-    public Map<String, Object> getMetaStruct() {
-      return metaStruct;
-    }
+        @Override
+        public int samplingPriority() {
+            return samplingPriority;
+        }
 
-    @Override
-    public PojoSpan setMetaStruct(String field, Object value) {
-      if (value == null) {
-        metaStruct.remove(field);
-      } else {
-        metaStruct.put(field, value);
-      }
-      return this;
-    }
+        @Override
+        public <U> U getTag(CharSequence name, U defaultValue) {
+            U value = getTag(name);
+            return null == value ? defaultValue : value;
+        }
 
-    @Override
-    public int getLongRunningVersion() {
-      return 0;
-    }
+        @Override
+        @SuppressWarnings("unchecked")
+        public <U> U getTag(CharSequence name) {
+            // replicate logic here because DDSpanContext has to pretend some of its
+            // fields are elements of a map for backward compatibility reasons
+            String tag = String.valueOf(name);
+            Object value = null;
+            switch (tag) {
+                case DDTags.THREAD_ID:
+                    value = metadata.getThreadId();
+                    break;
+                case DDTags.THREAD_NAME:
+                    value = metadata.getThreadName();
+                    break;
+                default:
+                    value = metadata.getTags().get(tag);
+            }
+            return (U) value;
+        }
 
-    @Override
-    public CharSequence getServiceNameSource() {
-      return null;
-    }
+        @Override
+        public boolean hasSamplingPriority() {
+            return samplingPriority != UNSET;
+        }
 
-    @Override
-    public boolean isKind(SpanKindFilter filter) {
-      Object kind = unsafeGetTag(Tags.SPAN_KIND);
-      return filter.matches(kind == null ? null : kind.toString());
-    }
+        @Override
+        public Map<String, Object> getMetaStruct() {
+            return metaStruct;
+        }
 
-    @Override
-    public <U> U unsafeGetTag(CharSequence name, U defaultValue) {
-      return getTag(name, defaultValue);
-    }
+        @Override
+        public PojoSpan setMetaStruct(String field, Object value) {
+            if (value == null) {
+                metaStruct.remove(field);
+            } else {
+                metaStruct.put(field, value);
+            }
+            return this;
+        }
+
+        @Override
+        public int getLongRunningVersion() {
+            return 0;
+        }
 
-    @Override
-    public <U> U unsafeGetTag(CharSequence name) {
-      return getTag(name);
+        @Override
+        public CharSequence getServiceNameSource() {
+            return null;
+        }
+
+        @Override
+        public boolean isKind(SpanKindFilter filter) {
+            Object kind = unsafeGetTag(Tags.SPAN_KIND);
+            return filter.matches(kind == null ? null : kind.toString());
+        }
+
+        @Override
+        public <U> U unsafeGetTag(CharSequence name, U defaultValue) {
+            return getTag(name, defaultValue);
+        }
+
+        @Override
+        public <U> U unsafeGetTag(CharSequence name) {
+            return getTag(name);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceMapperTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceMapperTest.java
index a88d7d9000f..16c1c3f003e 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceMapperTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceMapperTest.java
@@ -24,103 +24,101 @@
 
 class TraceMapperTest extends DDCoreJavaSpecification {
 
-  @Test
-  void testTraceMapperV05() throws Exception {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    DDSpan span =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", null)
+    @Test
+    void testTraceMapperV05() throws Exception {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", null)
                 .withTag("service.name", "my-service")
                 .withTag("elasticsearch.version", "7.0")
                 .start();
-    span.setBaggageItem("baggage", "item");
-    span.spanContext().setDataTop("mydata", "[1,2,3]");
-    List<DDSpan> trace = Collections.singletonList(span);
+        span.setBaggageItem("baggage", "item");
+        span.spanContext().setDataTop("mydata", "[1,2,3]");
+        List<DDSpan> trace = Collections.singletonList(span);
 
-    TraceMapperV0_5 traceMapper = new TraceMapperV0_5();
-    CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, sink));
-    packer.format(trace, traceMapper);
-    packer.flush();
+        TraceMapperV0_5 traceMapper = new TraceMapperV0_5();
+        CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, sink));
+        packer.format(trace, traceMapper);
+        packer.flush();
 
-    // only top-level statements in Spock then-blocks are power assertions;
-    // expressions inside for-loops are not, so we only assert the critical outcomes
-    assertNotNull(sink.captured);
-    GrowableBuffer dictionaryBuffer = TraceMapperTestBridge.getDictionary(traceMapper);
-    ByteBuffer dictionaryBytes = dictionaryBuffer.slice();
-    Map<String, String> meta = new HashMap<>();
+        // only top-level statements in Spock then-blocks are power assertions;
+        // expressions inside for-loops are not, so we only assert the critical outcomes
+        assertNotNull(sink.captured);
+        GrowableBuffer dictionaryBuffer = TraceMapperTestBridge.getDictionary(traceMapper);
+        ByteBuffer dictionaryBytes = dictionaryBuffer.slice();
+        Map<String, String> meta = new HashMap<>();
 
-    try (MessageUnpacker dictionaryUnpacker = MessagePack.newDefaultUnpacker(dictionaryBytes)) {
-      int dictionaryLength = TraceMapperTestBridge.getEncoding(traceMapper).size();
-      String[] dictionary = new String[dictionaryLength];
-      for (int i = 0; i < dictionary.length; ++i) {
-        dictionary[i] = dictionaryUnpacker.unpackString();
-      }
-      try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(sink.captured)) {
-        int traceCount = unpacker.unpackArrayHeader();
-        assertEquals(1, traceCount);
-        for (int i = 0; i < traceCount; ++i) {
-          int arrayLength = unpacker.unpackArrayHeader();
-          assertEquals(12, arrayLength);
-          String serviceName = dictionary[unpacker.unpackInt()];
-          assertEquals("my-service", serviceName);
-          String operationName = dictionary[unpacker.unpackInt()];
-          assertTrue(operationName.isEmpty());
-          String resourceName = dictionary[unpacker.unpackInt()];
-          assertTrue(resourceName.isEmpty());
-          long traceId = unpacker.unpackLong();
-          assertTrue(traceId > 0);
-          long spanId = unpacker.unpackLong();
-          assertTrue(spanId > 0);
-          long parentId = unpacker.unpackLong();
-          assertEquals(0, parentId);
-          long start = unpacker.unpackLong();
-          assertTrue(start > 0);
-          long duration = unpacker.unpackLong();
-          assertEquals(-start, duration);
-          int error = unpacker.unpackInt();
-          assertEquals(0, error);
-          int metaHeader = unpacker.unpackMapHeader();
-          for (int j = 0; j < metaHeader; ++j) {
-            String key = dictionary[unpacker.unpackInt()];
-            assertNotNull(key);
-            String value = dictionary[unpacker.unpackInt()];
-            assertNotNull(value);
-            meta.put(key, value);
-          }
-          int metricsHeader = unpacker.unpackMapHeader();
-          for (int j = 0; j < metricsHeader; ++j) {
-            String key = dictionary[unpacker.unpackInt()];
-            assertNotNull(key);
-            unpacker.skipValue();
-          }
-          String type = dictionary[unpacker.unpackInt()];
-          assertNotNull(type);
-          // find the meta entry whose key contains ".mydata." and verify its value
-          String myDataValue = null;
-          for (Map.Entry<String, String> entry : meta.entrySet()) {
-            if (entry.getKey().contains(".mydata.")) {
-              myDataValue = entry.getValue();
-              break;
+        try (MessageUnpacker dictionaryUnpacker = MessagePack.newDefaultUnpacker(dictionaryBytes)) {
+            int dictionaryLength =
+                    TraceMapperTestBridge.getEncoding(traceMapper).size();
+            String[] dictionary = new String[dictionaryLength];
+            for (int i = 0; i < dictionary.length; ++i) {
+                dictionary[i] = dictionaryUnpacker.unpackString();
             }
-          }
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(sink.captured)) {
+                int traceCount = unpacker.unpackArrayHeader();
+                assertEquals(1, traceCount);
+                for (int i = 0; i < traceCount; ++i) {
+                    int arrayLength = unpacker.unpackArrayHeader();
+                    assertEquals(12, arrayLength);
+                    String serviceName = dictionary[unpacker.unpackInt()];
+                    assertEquals("my-service", serviceName);
+                    String operationName = dictionary[unpacker.unpackInt()];
+                    assertTrue(operationName.isEmpty());
+                    String resourceName = dictionary[unpacker.unpackInt()];
+                    assertTrue(resourceName.isEmpty());
+                    long traceId = unpacker.unpackLong();
+                    assertTrue(traceId > 0);
+                    long spanId = unpacker.unpackLong();
+                    assertTrue(spanId > 0);
+                    long parentId = unpacker.unpackLong();
+                    assertEquals(0, parentId);
+                    long start = unpacker.unpackLong();
+                    assertTrue(start > 0);
+                    long duration = unpacker.unpackLong();
+                    assertEquals(-start, duration);
+                    int error = unpacker.unpackInt();
+                    assertEquals(0, error);
+                    int metaHeader = unpacker.unpackMapHeader();
+                    for (int j = 0; j < metaHeader; ++j) {
+                        String key = dictionary[unpacker.unpackInt()];
+                        assertNotNull(key);
+                        String value = dictionary[unpacker.unpackInt()];
+                        assertNotNull(value);
+                        meta.put(key, value);
+                    }
+                    int metricsHeader = unpacker.unpackMapHeader();
+                    for (int j = 0; j < metricsHeader; ++j) {
+                        String key = dictionary[unpacker.unpackInt()];
+                        assertNotNull(key);
+                        unpacker.skipValue();
+                    }
+                    String type = dictionary[unpacker.unpackInt()];
+                    assertNotNull(type);
+                    // find the meta entry whose key contains ".mydata." and verify its value
+                    String myDataValue = null;
+                    for (Map.Entry<String, String> entry : meta.entrySet()) {
+                        if (entry.getKey().contains(".mydata.")) {
+                            myDataValue = entry.getValue();
+                            break;
+                        }
+                    }
 
-          assertEquals("[1,2,3]", myDataValue);
+                    assertEquals("[1,2,3]", myDataValue);
+                }
+            }
         }
-      }
-    }
 
-    tracer.close();
-  }
+        tracer.close();
+    }
 
-  static class CapturingByteBufferConsumer implements ByteBufferConsumer {
+    static class CapturingByteBufferConsumer implements ByteBufferConsumer {
 
-    ByteBuffer captured;
+        ByteBuffer captured;
 
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {
-      captured = buffer;
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {
+            captured = buffer;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java
index 86dbfa61b22..a170f5e0729 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java
@@ -34,582 +34,547 @@
 
 class TraceProcessingWorkerTest extends DDJavaSpecification {
 
-  // -------------------------------------------------------------------------
-  // Helper: flush-counting payload dispatcher
-  // -------------------------------------------------------------------------
-
-  private PayloadDispatcherImpl flushCountingPayloadDispatcher(AtomicInteger flushCounter) {
-    PayloadDispatcherImpl dispatcher = mock(PayloadDispatcherImpl.class);
-    doAnswer(
-            inv -> {
-              flushCounter.incrementAndGet();
-              return null;
-            })
-        .when(dispatcher)
-        .flush();
-    return dispatcher;
-  }
-
-  // -------------------------------------------------------------------------
-  // Test 1: heartbeats should be triggered automatically when enabled
-  // -------------------------------------------------------------------------
-
-  @Test
-  void testHeartbeatsShouldBeTriggeredAutomaticallyWhenEnabled() throws Exception {
-    AtomicInteger flushCount = new AtomicInteger();
-    try (TraceProcessingWorker worker =
-        new TraceProcessingWorker(
-            10,
-            mock(HealthMetrics.class),
-            flushCountingPayloadDispatcher(flushCount),
-            () -> false,
-            FAST_LANE,
-            1,
-            TimeUnit.NANOSECONDS, // stop heartbeats from being throttled
-            null)) {
-
-      // processor is started
-      worker.start();
-
-      // heartbeat occurs automatically
-      long deadline = System.currentTimeMillis() + 5000;
-      while (System.currentTimeMillis() < deadline) {
-        if (flushCount.get() > 0) break;
-        Thread.sleep(50);
-      }
-      assertTrue(flushCount.get() > 0);
+    // -------------------------------------------------------------------------
+    // Helper: flush-counting payload dispatcher
+    // -------------------------------------------------------------------------
+
+    private PayloadDispatcherImpl flushCountingPayloadDispatcher(AtomicInteger flushCounter) {
+        PayloadDispatcherImpl dispatcher = mock(PayloadDispatcherImpl.class);
+        doAnswer(inv -> {
+                    flushCounter.incrementAndGet();
+                    return null;
+                })
+                .when(dispatcher)
+                .flush();
+        return dispatcher;
     }
-  }
-
-  // -------------------------------------------------------------------------
-  // Test 2: heartbeats should occur at least once per second when not throttled
-  // -------------------------------------------------------------------------
-
-  @Test
-  void testHeartbeatsShouldOccurAtLeastOncePerSecondWhenNotThrottled() throws Exception {
-    AtomicInteger flushCount = new AtomicInteger();
-    try (TraceProcessingWorker worker =
-        new TraceProcessingWorker(
-            10,
-            mock(HealthMetrics.class),
-            flushCountingPayloadDispatcher(flushCount),
-            () -> false,
-            FAST_LANE,
-            1,
-            TimeUnit.NANOSECONDS, // stop heartbeats from being throttled
-            null)) {
-
-      // processor is started
-      worker.start();
-
-      // heartbeat occurs automatically approximately once per second
-      // wait 1 second initial delay, then poll up to 1 second
-      Thread.sleep(1000);
-      long deadline = System.currentTimeMillis() + 1000;
-      while (System.currentTimeMillis() < deadline) {
-        if (flushCount.get() > 1) break;
-        Thread.sleep(50);
-      }
-      assertTrue(flushCount.get() > 1);
+
+    // -------------------------------------------------------------------------
+    // Test 1: heartbeats should be triggered automatically when enabled
+    // -------------------------------------------------------------------------
+
+    @Test
+    void testHeartbeatsShouldBeTriggeredAutomaticallyWhenEnabled() throws Exception {
+        AtomicInteger flushCount = new AtomicInteger();
+        try (TraceProcessingWorker worker = new TraceProcessingWorker(
+                10,
+                mock(HealthMetrics.class),
+                flushCountingPayloadDispatcher(flushCount),
+                () -> false,
+                FAST_LANE,
+                1,
+                TimeUnit.NANOSECONDS, // stop heartbeats from being throttled
+                null)) {
+
+            // processor is started
+            worker.start();
+
+            // heartbeat occurs automatically
+            long deadline = System.currentTimeMillis() + 5000;
+            while (System.currentTimeMillis() < deadline) {
+                if (flushCount.get() > 0) break;
+                Thread.sleep(50);
+            }
+            assertTrue(flushCount.get() > 0);
+        }
     }
-  }
-
-  // -------------------------------------------------------------------------
-  // Test 3: a flush should clear the primary queue
-  // -------------------------------------------------------------------------
-
-  @Test
-  void testAFlushShouldClearThePrimaryQueue() {
-    AtomicInteger flushCount = new AtomicInteger();
-    // prevent heartbeats from helping the flush happen
-
-    try (TraceProcessingWorker worker =
-        new TraceProcessingWorker(
-            10,
-            mock(HealthMetrics.class),
-            flushCountingPayloadDispatcher(flushCount),
-            () -> false,
-            FAST_LANE,
-            100,
-            TimeUnit.SECONDS, // prevent heartbeats from helping the flush happen
-            null)) {
-      // there is pending work it is completed before a flush
-      // processing this span will throw an exception, but it should be caught
-      // and not disrupt the flush
-      List<DDSpan> trace = Collections.singletonList(mock(DDSpan.class));
-      worker.getPrimaryQueue().offer(trace);
-      worker.start();
-      boolean flushed = worker.flush(10, TimeUnit.SECONDS);
-
-      // the flush succeeds, triggers a dispatch, and the queue is empty
-      assertTrue(flushed);
-      assertEquals(1, flushCount.get());
-      assertTrue(worker.getPrimaryQueue().isEmpty());
+
+    // -------------------------------------------------------------------------
+    // Test 2: heartbeats should occur at least once per second when not throttled
+    // -------------------------------------------------------------------------
+
+    @Test
+    void testHeartbeatsShouldOccurAtLeastOncePerSecondWhenNotThrottled() throws Exception {
+        AtomicInteger flushCount = new AtomicInteger();
+        try (TraceProcessingWorker worker = new TraceProcessingWorker(
+                10,
+                mock(HealthMetrics.class),
+                flushCountingPayloadDispatcher(flushCount),
+                () -> false,
+                FAST_LANE,
+                1,
+                TimeUnit.NANOSECONDS, // stop heartbeats from being throttled
+                null)) {
+
+            // processor is started
+            worker.start();
+
+            // heartbeat occurs automatically approximately once per second
+            // wait 1 second initial delay, then poll up to 1 second
+            Thread.sleep(1000);
+            long deadline = System.currentTimeMillis() + 1000;
+            while (System.currentTimeMillis() < deadline) {
+                if (flushCount.get() > 1) break;
+                Thread.sleep(50);
+            }
+            assertTrue(flushCount.get() > 1);
+        }
     }
-  }
-
-  // -------------------------------------------------------------------------
-  // Test 4: should report failure if serialization fails
-  // -------------------------------------------------------------------------
-
-  @TableTest({
-    "scenario     | priority                     ",
-    "sampler drop | PrioritySampling.SAMPLER_DROP",
-    "user drop    | PrioritySampling.USER_DROP   ",
-    "sampler keep | PrioritySampling.SAMPLER_KEEP",
-    "user keep    | PrioritySampling.USER_KEEP   ",
-    "unset        | PrioritySampling.UNSET       "
-  })
-  void testShouldReportFailureIfSerializationFails(
-      @ConvertWith(PrioritySamplingConverter.class) int priority) throws Exception {
-    Throwable theError = new IllegalStateException("thrown by test");
-    PayloadDispatcherImpl throwingDispatcher = mock(PayloadDispatcherImpl.class);
-    doAnswer(
-            inv -> {
-              throw theError;
-            })
-        .when(throwingDispatcher)
-        .addTrace(any());
-
-    AtomicInteger errorReported = new AtomicInteger();
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    // do this manually with a counter, despite mockito's lovely syntactical sugar so we don't have
-    // a race condition induced flaky test. All we care about is that an error was reported and that
-    // it was the right one
-    doAnswer(
-            inv -> {
-              errorReported.incrementAndGet();
-              return null;
-            })
-        .when(healthMetrics)
-        .onFailedSerialize(any(), any());
-
-    // prevent heartbeats from helping the flush happen
-
-    try (TraceProcessingWorker worker =
-        new TraceProcessingWorker(
-            10,
-            healthMetrics,
-            throwingDispatcher,
-            () -> false,
-            FAST_LANE,
-            100,
-            TimeUnit.SECONDS, // prevent heartbeats from helping the flush happen
-            null)) {
-      worker.start();
-      // a trace is processed but can't be passed on
-      worker.publish(mock(DDSpan.class), priority, Collections.singletonList(mock(DDSpan.class)));
-
-      // the error is reported to the monitor
-      long deadline = System.currentTimeMillis() + 5000;
-      while (System.currentTimeMillis() < deadline) {
-        if (errorReported.get() == 1) break;
-        Thread.sleep(50);
-      }
-      assertEquals(1, errorReported.get());
+
+    // -------------------------------------------------------------------------
+    // Test 3: a flush should clear the primary queue
+    // -------------------------------------------------------------------------
+
+    @Test
+    void testAFlushShouldClearThePrimaryQueue() {
+        AtomicInteger flushCount = new AtomicInteger();
+        // prevent heartbeats from helping the flush happen
+
+        try (TraceProcessingWorker worker = new TraceProcessingWorker(
+                10,
+                mock(HealthMetrics.class),
+                flushCountingPayloadDispatcher(flushCount),
+                () -> false,
+                FAST_LANE,
+                100,
+                TimeUnit.SECONDS, // prevent heartbeats from helping the flush happen
+                null)) {
+            // there is pending work it is completed before a flush
+            // processing this span will throw an exception, but it should be caught
+            // and not disrupt the flush
+            List<DDSpan> trace = Collections.singletonList(mock(DDSpan.class));
+            worker.getPrimaryQueue().offer(trace);
+            worker.start();
+            boolean flushed = worker.flush(10, TimeUnit.SECONDS);
+
+            // the flush succeeds, triggers a dispatch, and the queue is empty
+            assertTrue(flushed);
+            assertEquals(1, flushCount.get());
+            assertTrue(worker.getPrimaryQueue().isEmpty());
+        }
     }
-  }
-
-  // -------------------------------------------------------------------------
-  // Test 5: trace should be post-processed
-  // -------------------------------------------------------------------------
-
-  @Test
-  void testTraceShouldBePostProcessed() throws Exception {
-    AtomicInteger acceptedCount = new AtomicInteger();
-    PayloadDispatcherImpl countingDispatcher = mock(PayloadDispatcherImpl.class);
-    doAnswer(
-            inv -> {
-              acceptedCount.getAndIncrement();
-              return null;
-            })
-        .when(countingDispatcher)
-        .addTrace(any());
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-
-    // Create real DDSpan instances via reflection (DDSpan.create is package-private)
-    Method createMethod =
-        DDSpan.class.getDeclaredMethod(
-            "create", String.class, long.class, DDSpanContext.class, List.class);
-    createMethod.setAccessible(true);
-
-    DDSpanContext ctx1 = mock(DDSpanContext.class);
-    PendingTrace pendingTrace1 = mock(PendingTrace.class);
-    when(ctx1.getTraceCollector()).thenReturn(pendingTrace1);
-    when(pendingTrace1.getCurrentTimeNano()).thenReturn(0L);
-
-    DDSpanContext ctx2 = mock(DDSpanContext.class);
-    PendingTrace pendingTrace2 = mock(PendingTrace.class);
-    when(ctx2.getTraceCollector()).thenReturn(pendingTrace2);
-    when(pendingTrace2.getCurrentTimeNano()).thenReturn(0L);
-
-    DDSpan span1 = (DDSpan) createMethod.invoke(null, "test", 0L, ctx1, Collections.emptyList());
-    DDSpan span2 = (DDSpan) createMethod.invoke(null, "test", 0L, ctx2, Collections.emptyList());
-
-    AtomicBoolean processedSpan1 = new AtomicBoolean(false);
-    AtomicBoolean processedSpan2 = new AtomicBoolean(false);
-
-    SpanPostProcessor mockProcessor = mock(SpanPostProcessor.class);
-    doAnswer(
-            inv -> {
-              Object spanArg = inv.getArgument(0);
-              if (spanArg == span1) processedSpan1.set(true);
-              if (spanArg == span2) processedSpan2.set(true);
-              return null;
-            })
-        .when(mockProcessor)
-        .process(any(), any());
-
-    SpanPostProcessor.Holder.INSTANCE = mockProcessor;
-
-    try (TraceProcessingWorker worker =
-        new TraceProcessingWorker(
-            10,
-            healthMetrics,
-            countingDispatcher,
-            () -> false,
-            FAST_LANE,
-            100,
-            TimeUnit.SECONDS,
-            null)) {
-      worker.start();
-      // traces are submitted
-      List<DDSpan> trace = new ArrayList<>();
-      trace.add(span1);
-      trace.add(span2);
-      worker.publish(span1, SAMPLER_KEEP, trace);
-      worker.publish(span2, SAMPLER_KEEP, trace);
-
-      // traces are passed through unless rejected on submission
-      long deadline = System.currentTimeMillis() + 5000;
-      while (System.currentTimeMillis() < deadline) {
-        if (processedSpan1.get() && processedSpan2.get()) break;
-        Thread.sleep(50);
-      }
-      assertTrue(processedSpan1.get());
-      assertTrue(processedSpan2.get());
-    } finally {
-      SpanPostProcessor.Holder.INSTANCE = SpanPostProcessor.Holder.NOOP;
+
+    // -------------------------------------------------------------------------
+    // Test 4: should report failure if serialization fails
+    // -------------------------------------------------------------------------
+
+    @TableTest({
+      "scenario     | priority                     ",
+      "sampler drop | PrioritySampling.SAMPLER_DROP",
+      "user drop    | PrioritySampling.USER_DROP   ",
+      "sampler keep | PrioritySampling.SAMPLER_KEEP",
+      "user keep    | PrioritySampling.USER_KEEP   ",
+      "unset        | PrioritySampling.UNSET       "
+    })
+    void testShouldReportFailureIfSerializationFails(@ConvertWith(PrioritySamplingConverter.class) int priority)
+            throws Exception {
+        Throwable theError = new IllegalStateException("thrown by test");
+        PayloadDispatcherImpl throwingDispatcher = mock(PayloadDispatcherImpl.class);
+        doAnswer(inv -> {
+                    throw theError;
+                })
+                .when(throwingDispatcher)
+                .addTrace(any());
+
+        AtomicInteger errorReported = new AtomicInteger();
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        // do this manually with a counter, despite mockito's lovely syntactical sugar so we don't have
+        // a race condition induced flaky test. All we care about is that an error was reported and that
+        // it was the right one
+        doAnswer(inv -> {
+                    errorReported.incrementAndGet();
+                    return null;
+                })
+                .when(healthMetrics)
+                .onFailedSerialize(any(), any());
+
+        // prevent heartbeats from helping the flush happen
+
+        try (TraceProcessingWorker worker = new TraceProcessingWorker(
+                10,
+                healthMetrics,
+                throwingDispatcher,
+                () -> false,
+                FAST_LANE,
+                100,
+                TimeUnit.SECONDS, // prevent heartbeats from helping the flush happen
+                null)) {
+            worker.start();
+            // a trace is processed but can't be passed on
+            worker.publish(mock(DDSpan.class), priority, Collections.singletonList(mock(DDSpan.class)));
+
+            // the error is reported to the monitor
+            long deadline = System.currentTimeMillis() + 5000;
+            while (System.currentTimeMillis() < deadline) {
+                if (errorReported.get() == 1) break;
+                Thread.sleep(50);
+            }
+            assertEquals(1, errorReported.get());
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Test 5: trace should be post-processed
+    // -------------------------------------------------------------------------
+
+    @Test
+    void testTraceShouldBePostProcessed() throws Exception {
+        AtomicInteger acceptedCount = new AtomicInteger();
+        PayloadDispatcherImpl countingDispatcher = mock(PayloadDispatcherImpl.class);
+        doAnswer(inv -> {
+                    acceptedCount.getAndIncrement();
+                    return null;
+                })
+                .when(countingDispatcher)
+                .addTrace(any());
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+
+        // Create real DDSpan instances via reflection (DDSpan.create is package-private)
+        Method createMethod =
+                DDSpan.class.getDeclaredMethod("create", String.class, long.class, DDSpanContext.class, List.class);
+        createMethod.setAccessible(true);
+
+        DDSpanContext ctx1 = mock(DDSpanContext.class);
+        PendingTrace pendingTrace1 = mock(PendingTrace.class);
+        when(ctx1.getTraceCollector()).thenReturn(pendingTrace1);
+        when(pendingTrace1.getCurrentTimeNano()).thenReturn(0L);
+
+        DDSpanContext ctx2 = mock(DDSpanContext.class);
+        PendingTrace pendingTrace2 = mock(PendingTrace.class);
+        when(ctx2.getTraceCollector()).thenReturn(pendingTrace2);
+        when(pendingTrace2.getCurrentTimeNano()).thenReturn(0L);
+
+        DDSpan span1 = (DDSpan) createMethod.invoke(null, "test", 0L, ctx1, Collections.emptyList());
+        DDSpan span2 = (DDSpan) createMethod.invoke(null, "test", 0L, ctx2, Collections.emptyList());
+
+        AtomicBoolean processedSpan1 = new AtomicBoolean(false);
+        AtomicBoolean processedSpan2 = new AtomicBoolean(false);
+
+        SpanPostProcessor mockProcessor = mock(SpanPostProcessor.class);
+        doAnswer(inv -> {
+                    Object spanArg = inv.getArgument(0);
+                    if (spanArg == span1) processedSpan1.set(true);
+                    if (spanArg == span2) processedSpan2.set(true);
+                    return null;
+                })
+                .when(mockProcessor)
+                .process(any(), any());
+
+        SpanPostProcessor.Holder.INSTANCE = mockProcessor;
+
+        try (TraceProcessingWorker worker = new TraceProcessingWorker(
+                10, healthMetrics, countingDispatcher, () -> false, FAST_LANE, 100, TimeUnit.SECONDS, null)) {
+            worker.start();
+            // traces are submitted
+            List<DDSpan> trace = new ArrayList<>();
+            trace.add(span1);
+            trace.add(span2);
+            worker.publish(span1, SAMPLER_KEEP, trace);
+            worker.publish(span2, SAMPLER_KEEP, trace);
+
+            // traces are passed through unless rejected on submission
+            long deadline = System.currentTimeMillis() + 5000;
+            while (System.currentTimeMillis() < deadline) {
+                if (processedSpan1.get() && processedSpan2.get()) break;
+                Thread.sleep(50);
+            }
+            assertTrue(processedSpan1.get());
+            assertTrue(processedSpan2.get());
+        } finally {
+            SpanPostProcessor.Holder.INSTANCE = SpanPostProcessor.Holder.NOOP;
+        }
     }
-  }
-
-  // -------------------------------------------------------------------------
-  // Test 6: traces should be processed
-  // -------------------------------------------------------------------------
-
-  @TableTest({
-    "scenario          | priority                      | traceCount",
-    "sampler drop x1   | PrioritySampling.SAMPLER_DROP | 1         ",
-    "user drop x1      | PrioritySampling.USER_DROP    | 1         ",
-    "sampler keep x1   | PrioritySampling.SAMPLER_KEEP | 1         ",
-    "user keep x1      | PrioritySampling.USER_KEEP    | 1         ",
-    "unset x1          | PrioritySampling.UNSET        | 1         ",
-    "sampler drop x10  | PrioritySampling.SAMPLER_DROP | 10        ",
-    "user drop x10     | PrioritySampling.USER_DROP    | 10        ",
-    "sampler keep x10  | PrioritySampling.SAMPLER_KEEP | 10        ",
-    "user keep x10     | PrioritySampling.USER_KEEP    | 10        ",
-    "unset x10         | PrioritySampling.UNSET        | 10        ",
-    "sampler drop x20  | PrioritySampling.SAMPLER_DROP | 20        ",
-    "user drop x20     | PrioritySampling.USER_DROP    | 20        ",
-    "sampler keep x20  | PrioritySampling.SAMPLER_KEEP | 20        ",
-    "user keep x20     | PrioritySampling.USER_KEEP    | 20        ",
-    "unset x20         | PrioritySampling.UNSET        | 20        ",
-    "sampler drop x100 | PrioritySampling.SAMPLER_DROP | 100       ",
-    "user drop x100    | PrioritySampling.USER_DROP    | 100       ",
-    "sampler keep x100 | PrioritySampling.SAMPLER_KEEP | 100       ",
-    "user keep x100    | PrioritySampling.USER_KEEP    | 100       ",
-    "unset x100        | PrioritySampling.UNSET        | 100       "
-  })
-  void testTracesShouldBeProcessed(
-      @ConvertWith(PrioritySamplingConverter.class) int priority, int traceCount) throws Exception {
-    AtomicInteger acceptedCount = new AtomicInteger();
-    PayloadDispatcherImpl countingDispatcher = mock(PayloadDispatcherImpl.class);
-    doAnswer(
-            inv -> {
-              acceptedCount.getAndIncrement();
-              return null;
-            })
-        .when(countingDispatcher)
-        .addTrace(any());
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    // prevent heartbeats from helping the flush happen
-
-    try (TraceProcessingWorker worker =
-        new TraceProcessingWorker(
-            10,
-            healthMetrics,
-            countingDispatcher,
-            () -> false,
-            FAST_LANE,
-            100,
-            TimeUnit.SECONDS, // prevent heartbeats from helping the flush happen
-            null)) {
-      worker.start();
-      // traces are submitted
-      int submitted = 0;
-      for (int i = 0; i < traceCount; ++i) {
-        PublishResult publishResult =
-            worker.publish(
-                mock(DDSpan.class), priority, Collections.singletonList(mock(DDSpan.class)));
-        submitted += publishResult == ENQUEUED_FOR_SERIALIZATION ? 1 : 0;
-      }
-
-      // traces are passed through unless rejected on submission
-      int expectedSubmitted = submitted;
-      long deadline = System.currentTimeMillis() + 5000;
-      while (System.currentTimeMillis() < deadline) {
-        if (expectedSubmitted == acceptedCount.get()) break;
-        Thread.sleep(50);
-      }
-      assertEquals(expectedSubmitted, acceptedCount.get());
+
+    // -------------------------------------------------------------------------
+    // Test 6: traces should be processed
+    // -------------------------------------------------------------------------
+
+    @TableTest({
+      "scenario          | priority                      | traceCount",
+      "sampler drop x1   | PrioritySampling.SAMPLER_DROP | 1         ",
+      "user drop x1      | PrioritySampling.USER_DROP    | 1         ",
+      "sampler keep x1   | PrioritySampling.SAMPLER_KEEP | 1         ",
+      "user keep x1      | PrioritySampling.USER_KEEP    | 1         ",
+      "unset x1          | PrioritySampling.UNSET        | 1         ",
+      "sampler drop x10  | PrioritySampling.SAMPLER_DROP | 10        ",
+      "user drop x10     | PrioritySampling.USER_DROP    | 10        ",
+      "sampler keep x10  | PrioritySampling.SAMPLER_KEEP | 10        ",
+      "user keep x10     | PrioritySampling.USER_KEEP    | 10        ",
+      "unset x10         | PrioritySampling.UNSET        | 10        ",
+      "sampler drop x20  | PrioritySampling.SAMPLER_DROP | 20        ",
+      "user drop x20     | PrioritySampling.USER_DROP    | 20        ",
+      "sampler keep x20  | PrioritySampling.SAMPLER_KEEP | 20        ",
+      "user keep x20     | PrioritySampling.USER_KEEP    | 20        ",
+      "unset x20         | PrioritySampling.UNSET        | 20        ",
+      "sampler drop x100 | PrioritySampling.SAMPLER_DROP | 100       ",
+      "user drop x100    | PrioritySampling.USER_DROP    | 100       ",
+      "sampler keep x100 | PrioritySampling.SAMPLER_KEEP | 100       ",
+      "user keep x100    | PrioritySampling.USER_KEEP    | 100       ",
+      "unset x100        | PrioritySampling.UNSET        | 100       "
+    })
+    void testTracesShouldBeProcessed(@ConvertWith(PrioritySamplingConverter.class) int priority, int traceCount)
+            throws Exception {
+        AtomicInteger acceptedCount = new AtomicInteger();
+        PayloadDispatcherImpl countingDispatcher = mock(PayloadDispatcherImpl.class);
+        doAnswer(inv -> {
+                    acceptedCount.getAndIncrement();
+                    return null;
+                })
+                .when(countingDispatcher)
+                .addTrace(any());
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        // prevent heartbeats from helping the flush happen
+
+        try (TraceProcessingWorker worker = new TraceProcessingWorker(
+                10,
+                healthMetrics,
+                countingDispatcher,
+                () -> false,
+                FAST_LANE,
+                100,
+                TimeUnit.SECONDS, // prevent heartbeats from helping the flush happen
+                null)) {
+            worker.start();
+            // traces are submitted
+            int submitted = 0;
+            for (int i = 0; i < traceCount; ++i) {
+                PublishResult publishResult =
+                        worker.publish(mock(DDSpan.class), priority, Collections.singletonList(mock(DDSpan.class)));
+                submitted += publishResult == ENQUEUED_FOR_SERIALIZATION ? 1 : 0;
+            }
+
+            // traces are passed through unless rejected on submission
+            int expectedSubmitted = submitted;
+            long deadline = System.currentTimeMillis() + 5000;
+            while (System.currentTimeMillis() < deadline) {
+                if (expectedSubmitted == acceptedCount.get()) break;
+                Thread.sleep(50);
+            }
+            assertEquals(expectedSubmitted, acceptedCount.get());
+        }
+        // cleanup
     }
-    // cleanup
-  }
-
-  // -------------------------------------------------------------------------
-  // Test 7: flush of full queue after worker thread stopped will not flush but will return
-  // -------------------------------------------------------------------------
-
-  @Test
-  void testFlushOfFullQueueAfterWorkerThreadStoppedWillNotFlushButWillReturn() {
-    PayloadDispatcherImpl countingDispatcher = mock(PayloadDispatcherImpl.class);
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    TraceProcessingWorker worker =
-        new TraceProcessingWorker(
-            10,
-            healthMetrics,
-            countingDispatcher,
-            () -> false,
-            FAST_LANE,
-            100,
-            TimeUnit.SECONDS,
-            null);
-    worker.start();
-    worker.close();
-
-    while (worker.getPrimaryQueue().offer(Collections.singletonList(mock(DDSpan.class)))) {
-      // fill the queue
+
+    // -------------------------------------------------------------------------
+    // Test 7: flush of full queue after worker thread stopped will not flush but will return
+    // -------------------------------------------------------------------------
+
+    @Test
+    void testFlushOfFullQueueAfterWorkerThreadStoppedWillNotFlushButWillReturn() {
+        PayloadDispatcherImpl countingDispatcher = mock(PayloadDispatcherImpl.class);
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        TraceProcessingWorker worker = new TraceProcessingWorker(
+                10, healthMetrics, countingDispatcher, () -> false, FAST_LANE, 100, TimeUnit.SECONDS, null);
+        worker.start();
+        worker.close();
+
+        while (worker.getPrimaryQueue().offer(Collections.singletonList(mock(DDSpan.class)))) {
+            // fill the queue
+        }
+
+        boolean flushed = worker.flush(1, TimeUnit.SECONDS);
+        assertFalse(flushed);
     }
 
-    boolean flushed = worker.flush(1, TimeUnit.SECONDS);
-    assertFalse(flushed);
-  }
-
-  // -------------------------------------------------------------------------
-  // Test 8: send unsampled traces - dropping policy is active
-  // -------------------------------------------------------------------------
-
-  @TableTest({
-    "scenario                       | priority                      | traceCount | acceptedTraces | acceptedSpans | sampledSingleSpans | spanCount",
-    "sampler drop 1 trace 1 span    | PrioritySampling.SAMPLER_DROP | 1          | 1              | 1             | 1                  | 1        ",
-    "user drop 1 trace 2 spans      | PrioritySampling.USER_DROP    | 1          | 1              | 1             | 1                  | 2        ",
-    "sampler drop 1 trace 3 spans   | PrioritySampling.SAMPLER_DROP | 1          | 1              | 2             | 2                  | 3        ",
-    "user drop 1 trace 4 spans      | PrioritySampling.USER_DROP    | 1          | 1              | 2             | 2                  | 4        ",
-    "sampler drop 1 trace 5 spans   | PrioritySampling.SAMPLER_DROP | 1          | 1              | 3             | 3                  | 5        ",
-    "user drop 2 traces 1 span      | PrioritySampling.USER_DROP    | 2          | 1              | 1             | 1                  | 1        ",
-    "sampler drop 2 traces 2 spans  | PrioritySampling.SAMPLER_DROP | 2          | 2              | 2             | 2                  | 2        ",
-    "user drop 2 traces 3 spans     | PrioritySampling.USER_DROP    | 2          | 2              | 3             | 3                  | 3        ",
-    "sampler drop 2 traces 4 spans  | PrioritySampling.SAMPLER_DROP | 2          | 2              | 4             | 4                  | 4        ",
-    "user drop 2 traces 5 spans     | PrioritySampling.USER_DROP    | 2          | 2              | 5             | 5                  | 5        ",
-    "sampler drop 10 traces 1 span  | PrioritySampling.SAMPLER_DROP | 10         | 5              | 5             | 5                  | 1        ",
-    "user drop 10 traces 2 spans    | PrioritySampling.USER_DROP    | 10         | 10             | 10            | 10                 | 2        ",
-    "sampler drop 10 traces 3 spans | PrioritySampling.SAMPLER_DROP | 10         | 10             | 15            | 15                 | 3        ",
-    "user drop 10 traces 4 spans    | PrioritySampling.USER_DROP    | 10         | 10             | 20            | 20                 | 4        ",
-    "sampler drop 10 traces 5 spans | PrioritySampling.SAMPLER_DROP | 10         | 10             | 25            | 25                 | 5        ",
-    "sampler keep 1 trace 1 span    | PrioritySampling.SAMPLER_KEEP | 1          | 1              | 1             | 0                  | 1        ",
-    "user keep 1 trace 2 spans      | PrioritySampling.USER_KEEP    | 1          | 1              | 2             | 0                  | 2        ",
-    "sampler keep 1 trace 3 spans   | PrioritySampling.SAMPLER_KEEP | 1          | 1              | 3             | 0                  | 3        ",
-    "user keep 1 trace 4 spans      | PrioritySampling.USER_KEEP    | 1          | 1              | 4             | 0                  | 4        ",
-    "sampler keep 1 trace 5 spans   | PrioritySampling.SAMPLER_KEEP | 1          | 1              | 5             | 0                  | 5        ",
-    "user keep 2 traces 1 span      | PrioritySampling.USER_KEEP    | 2          | 2              | 2             | 0                  | 1        ",
-    "sampler keep 2 traces 2 spans  | PrioritySampling.SAMPLER_KEEP | 2          | 2              | 4             | 0                  | 2        ",
-    "user keep 2 traces 3 spans     | PrioritySampling.USER_KEEP    | 2          | 2              | 6             | 0                  | 3        ",
-    "sampler keep 2 traces 4 spans  | PrioritySampling.SAMPLER_KEEP | 2          | 2              | 8             | 0                  | 4        ",
-    "user keep 2 traces 5 spans     | PrioritySampling.USER_KEEP    | 2          | 2              | 10            | 0                  | 5        ",
-    "sampler keep 10 traces 1 span  | PrioritySampling.SAMPLER_KEEP | 10         | 10             | 10            | 0                  | 1        ",
-    "user keep 10 traces 2 spans    | PrioritySampling.USER_KEEP    | 10         | 10             | 20            | 0                  | 2        ",
-    "sampler keep 10 traces 3 spans | PrioritySampling.SAMPLER_KEEP | 10         | 10             | 30            | 0                  | 3        ",
-    "user keep 10 traces 4 spans    | PrioritySampling.USER_KEEP    | 10         | 10             | 40            | 0                  | 4        ",
-    "sampler keep 10 traces 5 spans | PrioritySampling.SAMPLER_KEEP | 10         | 10             | 50            | 0                  | 5        "
-  })
-  void testSendUnsampledTracesDroppingPolicyIsActive(
-      @ConvertWith(PrioritySamplingConverter.class) int priority,
-      int traceCount,
-      int acceptedTraces,
-      int acceptedSpans,
-      int sampledSingleSpans,
-      int spanCount)
-      throws Exception {
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    AtomicInteger acceptedCount = new AtomicInteger();
-    AtomicInteger acceptedSpanCount = new AtomicInteger();
-    PayloadDispatcherImpl countingDispatcher = mock(PayloadDispatcherImpl.class);
-    doAnswer(
-            inv -> {
-              List<?> traceList = inv.getArgument(0);
-              acceptedSpanCount.getAndAdd(traceList.size());
-              acceptedCount.getAndIncrement();
-              return null;
-            })
-        .when(countingDispatcher)
-        .addTrace(any());
-
-    AtomicInteger sampledSpansCount = new AtomicInteger();
-    // drop every other span
-    SingleSpanSampler singleSpanSampler =
-        new SingleSpanSampler() {
-          int counter = 0;
-
-          @Override
-          public <T extends CoreSpan<T>> boolean setSamplingPriority(T span) {
-            if (counter++ % 2 == 0) {
-              sampledSpansCount.incrementAndGet();
-              return true;
+    // -------------------------------------------------------------------------
+    // Test 8: send unsampled traces - dropping policy is active
+    // -------------------------------------------------------------------------
+
+    @TableTest({
+      "scenario                       | priority                      | traceCount | acceptedTraces | acceptedSpans | sampledSingleSpans | spanCount",
+      "sampler drop 1 trace 1 span    | PrioritySampling.SAMPLER_DROP | 1          | 1              | 1             | 1                  | 1        ",
+      "user drop 1 trace 2 spans      | PrioritySampling.USER_DROP    | 1          | 1              | 1             | 1                  | 2        ",
+      "sampler drop 1 trace 3 spans   | PrioritySampling.SAMPLER_DROP | 1          | 1              | 2             | 2                  | 3        ",
+      "user drop 1 trace 4 spans      | PrioritySampling.USER_DROP    | 1          | 1              | 2             | 2                  | 4        ",
+      "sampler drop 1 trace 5 spans   | PrioritySampling.SAMPLER_DROP | 1          | 1              | 3             | 3                  | 5        ",
+      "user drop 2 traces 1 span      | PrioritySampling.USER_DROP    | 2          | 1              | 1             | 1                  | 1        ",
+      "sampler drop 2 traces 2 spans  | PrioritySampling.SAMPLER_DROP | 2          | 2              | 2             | 2                  | 2        ",
+      "user drop 2 traces 3 spans     | PrioritySampling.USER_DROP    | 2          | 2              | 3             | 3                  | 3        ",
+      "sampler drop 2 traces 4 spans  | PrioritySampling.SAMPLER_DROP | 2          | 2              | 4             | 4                  | 4        ",
+      "user drop 2 traces 5 spans     | PrioritySampling.USER_DROP    | 2          | 2              | 5             | 5                  | 5        ",
+      "sampler drop 10 traces 1 span  | PrioritySampling.SAMPLER_DROP | 10         | 5              | 5             | 5                  | 1        ",
+      "user drop 10 traces 2 spans    | PrioritySampling.USER_DROP    | 10         | 10             | 10            | 10                 | 2        ",
+      "sampler drop 10 traces 3 spans | PrioritySampling.SAMPLER_DROP | 10         | 10             | 15            | 15                 | 3        ",
+      "user drop 10 traces 4 spans    | PrioritySampling.USER_DROP    | 10         | 10             | 20            | 20                 | 4        ",
+      "sampler drop 10 traces 5 spans | PrioritySampling.SAMPLER_DROP | 10         | 10             | 25            | 25                 | 5        ",
+      "sampler keep 1 trace 1 span    | PrioritySampling.SAMPLER_KEEP | 1          | 1              | 1             | 0                  | 1        ",
+      "user keep 1 trace 2 spans      | PrioritySampling.USER_KEEP    | 1          | 1              | 2             | 0                  | 2        ",
+      "sampler keep 1 trace 3 spans   | PrioritySampling.SAMPLER_KEEP | 1          | 1              | 3             | 0                  | 3        ",
+      "user keep 1 trace 4 spans      | PrioritySampling.USER_KEEP    | 1          | 1              | 4             | 0                  | 4        ",
+      "sampler keep 1 trace 5 spans   | PrioritySampling.SAMPLER_KEEP | 1          | 1              | 5             | 0                  | 5        ",
+      "user keep 2 traces 1 span      | PrioritySampling.USER_KEEP    | 2          | 2              | 2             | 0                  | 1        ",
+      "sampler keep 2 traces 2 spans  | PrioritySampling.SAMPLER_KEEP | 2          | 2              | 4             | 0                  | 2        ",
+      "user keep 2 traces 3 spans     | PrioritySampling.USER_KEEP    | 2          | 2              | 6             | 0                  | 3        ",
+      "sampler keep 2 traces 4 spans  | PrioritySampling.SAMPLER_KEEP | 2          | 2              | 8             | 0                  | 4        ",
+      "user keep 2 traces 5 spans     | PrioritySampling.USER_KEEP    | 2          | 2              | 10            | 0                  | 5        ",
+      "sampler keep 10 traces 1 span  | PrioritySampling.SAMPLER_KEEP | 10         | 10             | 10            | 0                  | 1        ",
+      "user keep 10 traces 2 spans    | PrioritySampling.USER_KEEP    | 10         | 10             | 20            | 0                  | 2        ",
+      "sampler keep 10 traces 3 spans | PrioritySampling.SAMPLER_KEEP | 10         | 10             | 30            | 0                  | 3        ",
+      "user keep 10 traces 4 spans    | PrioritySampling.USER_KEEP    | 10         | 10             | 40            | 0                  | 4        ",
+      "sampler keep 10 traces 5 spans | PrioritySampling.SAMPLER_KEEP | 10         | 10             | 50            | 0                  | 5        "
+    })
+    void testSendUnsampledTracesDroppingPolicyIsActive(
+            @ConvertWith(PrioritySamplingConverter.class) int priority,
+            int traceCount,
+            int acceptedTraces,
+            int acceptedSpans,
+            int sampledSingleSpans,
+            int spanCount)
+            throws Exception {
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        AtomicInteger acceptedCount = new AtomicInteger();
+        AtomicInteger acceptedSpanCount = new AtomicInteger();
+        PayloadDispatcherImpl countingDispatcher = mock(PayloadDispatcherImpl.class);
+        doAnswer(inv -> {
+                    List<?> traceList = inv.getArgument(0);
+                    acceptedSpanCount.getAndAdd(traceList.size());
+                    acceptedCount.getAndIncrement();
+                    return null;
+                })
+                .when(countingDispatcher)
+                .addTrace(any());
+
+        AtomicInteger sampledSpansCount = new AtomicInteger();
+        // drop every other span
+        SingleSpanSampler singleSpanSampler = new SingleSpanSampler() {
+            int counter = 0;
+
+            @Override
+            public <T extends CoreSpan<T>> boolean setSamplingPriority(T span) {
+                if (counter++ % 2 == 0) {
+                    sampledSpansCount.incrementAndGet();
+                    return true;
+                }
+                return false;
             }
-            return false;
-          }
         };
 
-    try (TraceProcessingWorker worker =
-        new TraceProcessingWorker(
-            10,
-            healthMetrics,
-            countingDispatcher,
-            () -> true,
-            FAST_LANE,
-            100,
-            TimeUnit.SECONDS,
-            singleSpanSampler)) {
-      worker.start();
-      // traces are submitted
-      for (int i = 0; i < traceCount; ++i) {
-        List<DDSpan> trace = new ArrayList<>();
-        for (int j = 0; j < spanCount; j++) {
-          trace.add(mock(DDSpan.class));
+        try (TraceProcessingWorker worker = new TraceProcessingWorker(
+                10,
+                healthMetrics,
+                countingDispatcher,
+                () -> true,
+                FAST_LANE,
+                100,
+                TimeUnit.SECONDS,
+                singleSpanSampler)) {
+            worker.start();
+            // traces are submitted
+            for (int i = 0; i < traceCount; ++i) {
+                List<DDSpan> trace = new ArrayList<>();
+                for (int j = 0; j < spanCount; j++) {
+                    trace.add(mock(DDSpan.class));
+                }
+                worker.publish(trace.get(0), priority, trace);
+            }
+
+            // traces are passed through unless rejected on submission
+            long deadline = System.currentTimeMillis() + 5000;
+            while (System.currentTimeMillis() < deadline) {
+                if (acceptedTraces == acceptedCount.get()
+                        && acceptedSpans == acceptedSpanCount.get()
+                        && sampledSingleSpans == sampledSpansCount.get()) break;
+                Thread.sleep(50);
+            }
+            assertEquals(acceptedTraces, acceptedCount.get());
+            assertEquals(acceptedSpans, acceptedSpanCount.get());
+            assertEquals(sampledSingleSpans, sampledSpansCount.get());
         }
-        worker.publish(trace.get(0), priority, trace);
-      }
-
-      // traces are passed through unless rejected on submission
-      long deadline = System.currentTimeMillis() + 5000;
-      while (System.currentTimeMillis() < deadline) {
-        if (acceptedTraces == acceptedCount.get()
-            && acceptedSpans == acceptedSpanCount.get()
-            && sampledSingleSpans == sampledSpansCount.get()) break;
-        Thread.sleep(50);
-      }
-      assertEquals(acceptedTraces, acceptedCount.get());
-      assertEquals(acceptedSpans, acceptedSpanCount.get());
-      assertEquals(sampledSingleSpans, sampledSpansCount.get());
     }
-  }
-
-  // -------------------------------------------------------------------------
-  // Test 9: send unsampled traces - dropping policy is inactive
-  // -------------------------------------------------------------------------
-
-  @TableTest({
-    "scenario                       | priority                      | traceCount | expectedChunks | expectedSpans | sampledSingleSpans | spanCount",
-    "sampler drop 1 trace 1 span    | PrioritySampling.SAMPLER_DROP | 1          | 1              | 1             | 1                  | 1        ",
-    "user drop 1 trace 2 spans      | PrioritySampling.USER_DROP    | 1          | 2              | 2             | 1                  | 2        ",
-    "sampler drop 1 trace 3 spans   | PrioritySampling.SAMPLER_DROP | 1          | 2              | 3             | 2                  | 3        ",
-    "user drop 1 trace 4 spans      | PrioritySampling.USER_DROP    | 1          | 2              | 4             | 2                  | 4        ",
-    "sampler drop 1 trace 5 spans   | PrioritySampling.SAMPLER_DROP | 1          | 2              | 5             | 3                  | 5        ",
-    "user drop 2 traces 1 span      | PrioritySampling.USER_DROP    | 2          | 2              | 2             | 1                  | 1        ",
-    "sampler drop 2 traces 2 spans  | PrioritySampling.SAMPLER_DROP | 2          | 4              | 4             | 2                  | 2        ",
-    "user drop 2 traces 3 spans     | PrioritySampling.USER_DROP    | 2          | 4              | 6             | 3                  | 3        ",
-    "sampler drop 2 traces 4 spans  | PrioritySampling.SAMPLER_DROP | 2          | 4              | 8             | 4                  | 4        ",
-    "user drop 2 traces 5 spans     | PrioritySampling.USER_DROP    | 2          | 4              | 10            | 5                  | 5        ",
-    "user drop 10 traces 1 span     | PrioritySampling.USER_DROP    | 10         | 10             | 10            | 5                  | 1        ",
-    "sampler drop 10 traces 2 spans | PrioritySampling.SAMPLER_DROP | 10         | 20             | 20            | 10                 | 2        ",
-    "user drop 10 traces 3 spans    | PrioritySampling.USER_DROP    | 10         | 20             | 30            | 15                 | 3        ",
-    "sampler drop 10 traces 4 spans | PrioritySampling.SAMPLER_DROP | 10         | 20             | 40            | 20                 | 4        ",
-    "user drop 10 traces 5 spans    | PrioritySampling.USER_DROP    | 10         | 20             | 50            | 25                 | 5        ",
-    "sampler keep 1 trace 1 span    | PrioritySampling.SAMPLER_KEEP | 1          | 1              | 1             | 0                  | 1        ",
-    "user keep 1 trace 2 spans      | PrioritySampling.USER_KEEP    | 1          | 1              | 2             | 0                  | 2        ",
-    "sampler keep 1 trace 3 spans   | PrioritySampling.SAMPLER_KEEP | 1          | 1              | 3             | 0                  | 3        ",
-    "user keep 1 trace 4 spans      | PrioritySampling.USER_KEEP    | 1          | 1              | 4             | 0                  | 4        ",
-    "sampler keep 1 trace 5 spans   | PrioritySampling.SAMPLER_KEEP | 1          | 1              | 5             | 0                  | 5        ",
-    "user keep 2 traces 1 span      | PrioritySampling.USER_KEEP    | 2          | 2              | 2             | 0                  | 1        ",
-    "sampler keep 2 traces 2 spans  | PrioritySampling.SAMPLER_KEEP | 2          | 2              | 4             | 0                  | 2        ",
-    "user keep 2 traces 3 spans     | PrioritySampling.USER_KEEP    | 2          | 2              | 6             | 0                  | 3        ",
-    "sampler keep 2 traces 4 spans  | PrioritySampling.SAMPLER_KEEP | 2          | 2              | 8             | 0                  | 4        ",
-    "user keep 2 traces 5 spans     | PrioritySampling.USER_KEEP    | 2          | 2              | 10            | 0                  | 5        ",
-    "sampler keep 10 traces 1 span  | PrioritySampling.SAMPLER_KEEP | 10         | 10             | 10            | 0                  | 1        ",
-    "user keep 10 traces 2 spans    | PrioritySampling.USER_KEEP    | 10         | 10             | 20            | 0                  | 2        ",
-    "sampler keep 10 traces 3 spans | PrioritySampling.SAMPLER_KEEP | 10         | 10             | 30            | 0                  | 3        ",
-    "user keep 10 traces 4 spans    | PrioritySampling.USER_KEEP    | 10         | 10             | 40            | 0                  | 4        ",
-    "sampler keep 10 traces 5 spans | PrioritySampling.SAMPLER_KEEP | 10         | 10             | 50            | 0                  | 5        "
-  })
-  void testSendUnsampledTracesDroppingPolicyIsInactive(
-      @ConvertWith(PrioritySamplingConverter.class) int priority,
-      int traceCount,
-      int expectedChunks,
-      int expectedSpans,
-      int sampledSingleSpans,
-      int spanCount)
-      throws Exception {
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    AtomicInteger chunksCount = new AtomicInteger();
-    AtomicInteger spansCount = new AtomicInteger();
-    PayloadDispatcherImpl countingDispatcher = mock(PayloadDispatcherImpl.class);
-    doAnswer(
-            inv -> {
-              List<?> traceList = inv.getArgument(0);
-              spansCount.getAndAdd(traceList.size());
-              chunksCount.getAndIncrement();
-              return null;
-            })
-        .when(countingDispatcher)
-        .addTrace(any());
-
-    AtomicInteger sampledSpansCount = new AtomicInteger();
-    // drop every other span
-    SingleSpanSampler singleSpanSampler =
-        new SingleSpanSampler() {
-          int counter = 0;
-
-          @Override
-          public <T extends CoreSpan<T>> boolean setSamplingPriority(T span) {
-            if (counter++ % 2 == 0) {
-              sampledSpansCount.incrementAndGet();
-              return true;
+
+    // -------------------------------------------------------------------------
+    // Test 9: send unsampled traces - dropping policy is inactive
+    // -------------------------------------------------------------------------
+
+    @TableTest({
+      "scenario                       | priority                      | traceCount | expectedChunks | expectedSpans | sampledSingleSpans | spanCount",
+      "sampler drop 1 trace 1 span    | PrioritySampling.SAMPLER_DROP | 1          | 1              | 1             | 1                  | 1        ",
+      "user drop 1 trace 2 spans      | PrioritySampling.USER_DROP    | 1          | 2              | 2             | 1                  | 2        ",
+      "sampler drop 1 trace 3 spans   | PrioritySampling.SAMPLER_DROP | 1          | 2              | 3             | 2                  | 3        ",
+      "user drop 1 trace 4 spans      | PrioritySampling.USER_DROP    | 1          | 2              | 4             | 2                  | 4        ",
+      "sampler drop 1 trace 5 spans   | PrioritySampling.SAMPLER_DROP | 1          | 2              | 5             | 3                  | 5        ",
+      "user drop 2 traces 1 span      | PrioritySampling.USER_DROP    | 2          | 2              | 2             | 1                  | 1        ",
+      "sampler drop 2 traces 2 spans  | PrioritySampling.SAMPLER_DROP | 2          | 4              | 4             | 2                  | 2        ",
+      "user drop 2 traces 3 spans     | PrioritySampling.USER_DROP    | 2          | 4              | 6             | 3                  | 3        ",
+      "sampler drop 2 traces 4 spans  | PrioritySampling.SAMPLER_DROP | 2          | 4              | 8             | 4                  | 4        ",
+      "user drop 2 traces 5 spans     | PrioritySampling.USER_DROP    | 2          | 4              | 10            | 5                  | 5        ",
+      "user drop 10 traces 1 span     | PrioritySampling.USER_DROP    | 10         | 10             | 10            | 5                  | 1        ",
+      "sampler drop 10 traces 2 spans | PrioritySampling.SAMPLER_DROP | 10         | 20             | 20            | 10                 | 2        ",
+      "user drop 10 traces 3 spans    | PrioritySampling.USER_DROP    | 10         | 20             | 30            | 15                 | 3        ",
+      "sampler drop 10 traces 4 spans | PrioritySampling.SAMPLER_DROP | 10         | 20             | 40            | 20                 | 4        ",
+      "user drop 10 traces 5 spans    | PrioritySampling.USER_DROP    | 10         | 20             | 50            | 25                 | 5        ",
+      "sampler keep 1 trace 1 span    | PrioritySampling.SAMPLER_KEEP | 1          | 1              | 1             | 0                  | 1        ",
+      "user keep 1 trace 2 spans      | PrioritySampling.USER_KEEP    | 1          | 1              | 2             | 0                  | 2        ",
+      "sampler keep 1 trace 3 spans   | PrioritySampling.SAMPLER_KEEP | 1          | 1              | 3             | 0                  | 3        ",
+      "user keep 1 trace 4 spans      | PrioritySampling.USER_KEEP    | 1          | 1              | 4             | 0                  | 4        ",
+      "sampler keep 1 trace 5 spans   | PrioritySampling.SAMPLER_KEEP | 1          | 1              | 5             | 0                  | 5        ",
+      "user keep 2 traces 1 span      | PrioritySampling.USER_KEEP    | 2          | 2              | 2             | 0                  | 1        ",
+      "sampler keep 2 traces 2 spans  | PrioritySampling.SAMPLER_KEEP | 2          | 2              | 4             | 0                  | 2        ",
+      "user keep 2 traces 3 spans     | PrioritySampling.USER_KEEP    | 2          | 2              | 6             | 0                  | 3        ",
+      "sampler keep 2 traces 4 spans  | PrioritySampling.SAMPLER_KEEP | 2          | 2              | 8             | 0                  | 4        ",
+      "user keep 2 traces 5 spans     | PrioritySampling.USER_KEEP    | 2          | 2              | 10            | 0                  | 5        ",
+      "sampler keep 10 traces 1 span  | PrioritySampling.SAMPLER_KEEP | 10         | 10             | 10            | 0                  | 1        ",
+      "user keep 10 traces 2 spans    | PrioritySampling.USER_KEEP    | 10         | 10             | 20            | 0                  | 2        ",
+      "sampler keep 10 traces 3 spans | PrioritySampling.SAMPLER_KEEP | 10         | 10             | 30            | 0                  | 3        ",
+      "user keep 10 traces 4 spans    | PrioritySampling.USER_KEEP    | 10         | 10             | 40            | 0                  | 4        ",
+      "sampler keep 10 traces 5 spans | PrioritySampling.SAMPLER_KEEP | 10         | 10             | 50            | 0                  | 5        "
+    })
+    void testSendUnsampledTracesDroppingPolicyIsInactive(
+            @ConvertWith(PrioritySamplingConverter.class) int priority,
+            int traceCount,
+            int expectedChunks,
+            int expectedSpans,
+            int sampledSingleSpans,
+            int spanCount)
+            throws Exception {
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        AtomicInteger chunksCount = new AtomicInteger();
+        AtomicInteger spansCount = new AtomicInteger();
+        PayloadDispatcherImpl countingDispatcher = mock(PayloadDispatcherImpl.class);
+        doAnswer(inv -> {
+                    List<?> traceList = inv.getArgument(0);
+                    spansCount.getAndAdd(traceList.size());
+                    chunksCount.getAndIncrement();
+                    return null;
+                })
+                .when(countingDispatcher)
+                .addTrace(any());
+
+        AtomicInteger sampledSpansCount = new AtomicInteger();
+        // drop every other span
+        SingleSpanSampler singleSpanSampler = new SingleSpanSampler() {
+            int counter = 0;
+
+            @Override
+            public <T extends CoreSpan<T>> boolean setSamplingPriority(T span) {
+                if (counter++ % 2 == 0) {
+                    sampledSpansCount.incrementAndGet();
+                    return true;
+                }
+                return false;
             }
-            return false;
-          }
         };
 
-    try (TraceProcessingWorker worker =
-        new TraceProcessingWorker(
-            10,
-            healthMetrics,
-            countingDispatcher,
-            () -> false,
-            FAST_LANE,
-            100,
-            TimeUnit.SECONDS,
-            singleSpanSampler)) {
-      worker.start();
-      // traces are submitted
-      for (int i = 0; i < traceCount; ++i) {
-        List<DDSpan> trace = new ArrayList<>();
-        for (int j = 0; j < spanCount; j++) {
-          trace.add(mock(DDSpan.class));
+        try (TraceProcessingWorker worker = new TraceProcessingWorker(
+                10,
+                healthMetrics,
+                countingDispatcher,
+                () -> false,
+                FAST_LANE,
+                100,
+                TimeUnit.SECONDS,
+                singleSpanSampler)) {
+            worker.start();
+            // traces are submitted
+            for (int i = 0; i < traceCount; ++i) {
+                List<DDSpan> trace = new ArrayList<>();
+                for (int j = 0; j < spanCount; j++) {
+                    trace.add(mock(DDSpan.class));
+                }
+                worker.publish(trace.get(0), priority, trace);
+            }
+
+            // traces are passed through unless rejected on submission
+            long deadline = System.currentTimeMillis() + 5000;
+            while (System.currentTimeMillis() < deadline) {
+                if (expectedChunks == chunksCount.get()
+                        && expectedSpans == spansCount.get()
+                        && sampledSingleSpans == sampledSpansCount.get()) break;
+                Thread.sleep(50);
+            }
+            assertEquals(expectedChunks, chunksCount.get());
+            assertEquals(expectedSpans, spansCount.get());
+            assertEquals(sampledSingleSpans, sampledSpansCount.get());
         }
-        worker.publish(trace.get(0), priority, trace);
-      }
-
-      // traces are passed through unless rejected on submission
-      long deadline = System.currentTimeMillis() + 5000;
-      while (System.currentTimeMillis() < deadline) {
-        if (expectedChunks == chunksCount.get()
-            && expectedSpans == spansCount.get()
-            && sampledSingleSpans == sampledSpansCount.get()) break;
-        Thread.sleep(50);
-      }
-      assertEquals(expectedChunks, chunksCount.get());
-      assertEquals(expectedSpans, spansCount.get());
-      assertEquals(sampledSingleSpans, sampledSpansCount.get());
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceStructureWriterTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceStructureWriterTest.java
index 67a83d58e01..a1f9ed97d3e 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceStructureWriterTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceStructureWriterTest.java
@@ -8,23 +8,23 @@
 
 public class TraceStructureWriterTest extends DDCoreJavaSpecification {
 
-  @TableTest({
-    "scenario                           | windows | cli                           | path         ",
-    "windows path                       | true    | C:/tmp/file                   | C:/tmp/file  ",
-    "windows backslash path             | true    | C:\\tmp\\file                 | C:\\tmp\\file",
-    "windows file                       | true    | file                          | file         ",
-    "windows path with option           | true    | C:/tmp/file:includeresource   | C:/tmp/file  ",
-    "windows backslash path with option | true    | C:\\tmp\\file:includeresource | C:\\tmp\\file",
-    "windows file with option           | true    | file:includeresource          | file         ",
-    "unix absolute path 1               | false   | /var/tmp/file                 | /var/tmp/file",
-    "unix file 1                        | false   | file                          | file         ",
-    "unix absolute path 2               | false   | /var/tmp/file                 | /var/tmp/file",
-    "unix file 2                        | false   | file                          | file         "
-  })
-  void parseCliArgs(boolean windows, String cli, String path) {
-    String[] args = TraceStructureWriter.parseArgs(cli, windows);
+    @TableTest({
+      "scenario                           | windows | cli                           | path         ",
+      "windows path                       | true    | C:/tmp/file                   | C:/tmp/file  ",
+      "windows backslash path             | true    | C:\\tmp\\file                 | C:\\tmp\\file",
+      "windows file                       | true    | file                          | file         ",
+      "windows path with option           | true    | C:/tmp/file:includeresource   | C:/tmp/file  ",
+      "windows backslash path with option | true    | C:\\tmp\\file:includeresource | C:\\tmp\\file",
+      "windows file with option           | true    | file:includeresource          | file         ",
+      "unix absolute path 1               | false   | /var/tmp/file                 | /var/tmp/file",
+      "unix file 1                        | false   | file                          | file         ",
+      "unix absolute path 2               | false   | /var/tmp/file                 | /var/tmp/file",
+      "unix file 2                        | false   | file                          | file         "
+    })
+    void parseCliArgs(boolean windows, String cli, String path) {
+        String[] args = TraceStructureWriter.parseArgs(cli, windows);
 
-    assertTrue(args.length > 0);
-    assertEquals(path, args[0]);
-  }
+        assertTrue(args.length > 0);
+        assertEquals(path, args[0]);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/WriterFactoryTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/WriterFactoryTest.java
index 9a7c8bdc946..77e6671b198 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/WriterFactoryTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/WriterFactoryTest.java
@@ -46,349 +46,324 @@
 
 class WriterFactoryTest extends DDJavaSpecification {
 
-  @TableTest({
-    "scenario                                    | configuredType                             | hasEvpProxy | evpProxySupportsCompression | isCiVisibilityAgentlessEnabled | expectedWriterClass                              | expectedApiClass                                   | isCompressionEnabled",
-    "LoggingWriter agentless                     | LoggingWriter                              | true        | false                       | true                           | datadog.trace.common.writer.LoggingWriter        |                                                    | false               ",
-    "PrintingWriter agentless                    | PrintingWriter                             | true        | false                       | true                           | datadog.trace.common.writer.PrintingWriter       |                                                    | false               ",
-    "TraceStructureWriter agentless              | TraceStructureWriter                       | true        | false                       | true                           | datadog.trace.common.writer.TraceStructureWriter |                                                    | false               ",
-    "MultiWriter agentless                       | 'MultiWriter:LoggingWriter,PrintingWriter' | true        | false                       | true                           | datadog.trace.common.writer.MultiWriter          |                                                    | false               ",
-    "DDIntakeWriter evp agentless                | DDIntakeWriter                             | true        | false                       | true                           | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDIntakeApi   | true                ",
-    "DDIntakeWriter evp not agentless            | DDIntakeWriter                             | true        | false                       | false                          | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDEvpProxyApi | false               ",
-    "DDIntakeWriter no evp agentless             | DDIntakeWriter                             | false       | false                       | true                           | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDIntakeApi   | true                ",
-    "DDIntakeWriter no evp not agentless         | DDIntakeWriter                             | false       | false                       | false                          | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDIntakeApi   | true                ",
-    "DDAgentWriter evp agentless                 | DDAgentWriter                              | true        | false                       | true                           | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDIntakeApi   | true                ",
-    "DDAgentWriter evp not agentless             | DDAgentWriter                              | true        | false                       | false                          | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDEvpProxyApi | false               ",
-    "DDAgentWriter evp compression not agentless | DDAgentWriter                              | true        | true                        | false                          | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDEvpProxyApi | true                ",
-    "DDAgentWriter no evp agentless              | DDAgentWriter                              | false       | false                       | true                           | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDIntakeApi   | true                ",
-    "DDAgentWriter no evp not agentless          | DDAgentWriter                              | false       | false                       | false                          | datadog.trace.common.writer.DDAgentWriter        | datadog.trace.common.writer.ddagent.DDAgentApi     | false               ",
-    "not-found evp agentless                     | 'not-found'                                | true        | false                       | true                           | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDIntakeApi   | true                ",
-    "not-found evp not agentless                 | 'not-found'                                | true        | false                       | false                          | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDEvpProxyApi | false               ",
-    "not-found no evp agentless                  | 'not-found'                                | false       | false                       | true                           | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDIntakeApi   | true                ",
-    "not-found no evp not agentless              | 'not-found'                                | false       | false                       | false                          | datadog.trace.common.writer.DDAgentWriter        | datadog.trace.common.writer.ddagent.DDAgentApi     | false               "
-  })
-  void testWriterCreationForCiVisibility(
-      String configuredType,
-      boolean hasEvpProxy,
-      boolean evpProxySupportsCompression,
-      boolean isCiVisibilityAgentlessEnabled,
-      Class<?> expectedWriterClass,
-      Class<?> expectedApiClass,
-      boolean isCompressionEnabled)
-      throws Exception {
-    Config config = mock(Config.class);
-    when(config.getApiKey()).thenReturn("my-api-key");
-    when(config.getAgentUrl()).thenReturn("http://my-agent.url");
-    //noinspection unchecked
-    doReturn(Prioritization.FAST_LANE)
-        .when(config)
-        .getEnumValue(
-            eq(PRIORITIZATION_TYPE),
-            (Class<Prioritization>) any(Class.class),
-            any(Prioritization.class));
-    when(config.isTracerMetricsEnabled()).thenReturn(true);
-    when(config.isCiVisibilityEnabled()).thenReturn(true);
-    when(config.isCiVisibilityCodeCoverageEnabled()).thenReturn(false);
-    when(config.isCiVisibilityAgentlessEnabled()).thenReturn(isCiVisibilityAgentlessEnabled);
-
-    // Mock agent info response
-    Response response =
-        buildHttpResponse(
-            hasEvpProxy, evpProxySupportsCompression, HttpUrl.parse("http://my-agent.url/info"));
-
-    // Mock HTTP client that simulates delayed response for async feature discovery
-    Call mockCall = mock(Call.class);
-    OkHttpClient mockHttpClient = mock(OkHttpClient.class);
-    when(mockCall.execute())
-        .thenAnswer(
-            inv -> {
-              // Add a delay
-              Thread.sleep(400);
-              return response;
-            });
-    when(mockHttpClient.newCall(any(Request.class))).thenReturn(mockCall);
-
-    // Create SharedCommunicationObjects with mocked HTTP client
-    SharedCommunicationObjects sharedComm = new SharedCommunicationObjects();
-    sharedComm.agentHttpClient = mockHttpClient;
-    sharedComm.agentUrl = HttpUrl.parse("http://my-agent.url");
-    sharedComm.createRemaining(config);
-    Sampler sampler = mock(Sampler.class);
-
-    Writer writer =
-        WriterFactory.createWriter(
-            config, sharedComm, sampler, null, HealthMetrics.NO_OP, configuredType);
-
-    List<Class<?>> expectedApiClasses =
-        expectedApiClass != null ? singletonList(expectedApiClass) : null;
-    Collection<RemoteApi> apis;
-    List<Class<?>> apiClasses;
-    if (expectedApiClasses != null) {
-      apis = ((RemoteWriter) writer).getApis();
-      apiClasses = apis.stream().map(Object::getClass).collect(Collectors.toList());
-    } else {
-      apis = java.util.Collections.emptyList();
-      apiClasses = java.util.Collections.emptyList();
+    @TableTest({
+      "scenario                                    | configuredType                             | hasEvpProxy | evpProxySupportsCompression | isCiVisibilityAgentlessEnabled | expectedWriterClass                              | expectedApiClass                                   | isCompressionEnabled",
+      "LoggingWriter agentless                     | LoggingWriter                              | true        | false                       | true                           | datadog.trace.common.writer.LoggingWriter        |                                                    | false               ",
+      "PrintingWriter agentless                    | PrintingWriter                             | true        | false                       | true                           | datadog.trace.common.writer.PrintingWriter       |                                                    | false               ",
+      "TraceStructureWriter agentless              | TraceStructureWriter                       | true        | false                       | true                           | datadog.trace.common.writer.TraceStructureWriter |                                                    | false               ",
+      "MultiWriter agentless                       | 'MultiWriter:LoggingWriter,PrintingWriter' | true        | false                       | true                           | datadog.trace.common.writer.MultiWriter          |                                                    | false               ",
+      "DDIntakeWriter evp agentless                | DDIntakeWriter                             | true        | false                       | true                           | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDIntakeApi   | true                ",
+      "DDIntakeWriter evp not agentless            | DDIntakeWriter                             | true        | false                       | false                          | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDEvpProxyApi | false               ",
+      "DDIntakeWriter no evp agentless             | DDIntakeWriter                             | false       | false                       | true                           | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDIntakeApi   | true                ",
+      "DDIntakeWriter no evp not agentless         | DDIntakeWriter                             | false       | false                       | false                          | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDIntakeApi   | true                ",
+      "DDAgentWriter evp agentless                 | DDAgentWriter                              | true        | false                       | true                           | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDIntakeApi   | true                ",
+      "DDAgentWriter evp not agentless             | DDAgentWriter                              | true        | false                       | false                          | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDEvpProxyApi | false               ",
+      "DDAgentWriter evp compression not agentless | DDAgentWriter                              | true        | true                        | false                          | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDEvpProxyApi | true                ",
+      "DDAgentWriter no evp agentless              | DDAgentWriter                              | false       | false                       | true                           | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDIntakeApi   | true                ",
+      "DDAgentWriter no evp not agentless          | DDAgentWriter                              | false       | false                       | false                          | datadog.trace.common.writer.DDAgentWriter        | datadog.trace.common.writer.ddagent.DDAgentApi     | false               ",
+      "not-found evp agentless                     | 'not-found'                                | true        | false                       | true                           | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDIntakeApi   | true                ",
+      "not-found evp not agentless                 | 'not-found'                                | true        | false                       | false                          | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDEvpProxyApi | false               ",
+      "not-found no evp agentless                  | 'not-found'                                | false       | false                       | true                           | datadog.trace.common.writer.DDIntakeWriter       | datadog.trace.common.writer.ddintake.DDIntakeApi   | true                ",
+      "not-found no evp not agentless              | 'not-found'                                | false       | false                       | false                          | datadog.trace.common.writer.DDAgentWriter        | datadog.trace.common.writer.ddagent.DDAgentApi     | false               "
+    })
+    void testWriterCreationForCiVisibility(
+            String configuredType,
+            boolean hasEvpProxy,
+            boolean evpProxySupportsCompression,
+            boolean isCiVisibilityAgentlessEnabled,
+            Class<?> expectedWriterClass,
+            Class<?> expectedApiClass,
+            boolean isCompressionEnabled)
+            throws Exception {
+        Config config = mock(Config.class);
+        when(config.getApiKey()).thenReturn("my-api-key");
+        when(config.getAgentUrl()).thenReturn("http://my-agent.url");
+        //noinspection unchecked
+        doReturn(Prioritization.FAST_LANE)
+                .when(config)
+                .getEnumValue(
+                        eq(PRIORITIZATION_TYPE), (Class<Prioritization>) any(Class.class), any(Prioritization.class));
+        when(config.isTracerMetricsEnabled()).thenReturn(true);
+        when(config.isCiVisibilityEnabled()).thenReturn(true);
+        when(config.isCiVisibilityCodeCoverageEnabled()).thenReturn(false);
+        when(config.isCiVisibilityAgentlessEnabled()).thenReturn(isCiVisibilityAgentlessEnabled);
+
+        // Mock agent info response
+        Response response =
+                buildHttpResponse(hasEvpProxy, evpProxySupportsCompression, HttpUrl.parse("http://my-agent.url/info"));
+
+        // Mock HTTP client that simulates delayed response for async feature discovery
+        Call mockCall = mock(Call.class);
+        OkHttpClient mockHttpClient = mock(OkHttpClient.class);
+        when(mockCall.execute()).thenAnswer(inv -> {
+            // Add a delay
+            Thread.sleep(400);
+            return response;
+        });
+        when(mockHttpClient.newCall(any(Request.class))).thenReturn(mockCall);
+
+        // Create SharedCommunicationObjects with mocked HTTP client
+        SharedCommunicationObjects sharedComm = new SharedCommunicationObjects();
+        sharedComm.agentHttpClient = mockHttpClient;
+        sharedComm.agentUrl = HttpUrl.parse("http://my-agent.url");
+        sharedComm.createRemaining(config);
+        Sampler sampler = mock(Sampler.class);
+
+        Writer writer =
+                WriterFactory.createWriter(config, sharedComm, sampler, null, HealthMetrics.NO_OP, configuredType);
+
+        List<Class<?>> expectedApiClasses = expectedApiClass != null ? singletonList(expectedApiClass) : null;
+        Collection<RemoteApi> apis;
+        List<Class<?>> apiClasses;
+        if (expectedApiClasses != null) {
+            apis = ((RemoteWriter) writer).getApis();
+            apiClasses = apis.stream().map(Object::getClass).collect(Collectors.toList());
+        } else {
+            apis = java.util.Collections.emptyList();
+            apiClasses = java.util.Collections.emptyList();
+        }
+
+        assertEquals(expectedWriterClass, writer.getClass());
+        assertTrue(expectedApiClasses == null || apiClasses.equals(expectedApiClasses));
+        assertTrue(expectedApiClasses == null
+                || apis.stream().allMatch(api -> api.isCompressionEnabled() == isCompressionEnabled));
     }
 
-    assertEquals(expectedWriterClass, writer.getClass());
-    assertTrue(expectedApiClasses == null || apiClasses.equals(expectedApiClasses));
-    assertTrue(
-        expectedApiClasses == null
-            || apis.stream().allMatch(api -> api.isCompressionEnabled() == isCompressionEnabled));
-  }
-
-  @TableTest({
-    "scenario                        | configuredType | agentRunning | hasEvpProxy | isLlmObsAgentlessEnabled | expectedWriterClass                        | expectedLlmObsApiClass                            ",
-    "evp proxy not agentless         | DDIntakeWriter | true         | true        | false                    | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDEvpProxyApi",
-    "no evp not agentless            | DDIntakeWriter | true         | false       | false                    | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi  ",
-    "agent not running not agentless | DDIntakeWriter | false        | false       | false                    | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi  ",
-    "evp proxy agentless             | DDIntakeWriter | true         | true        | true                     | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi  ",
-    "no evp agentless                | DDIntakeWriter | true         | false       | true                     | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi  ",
-    "agent not running agentless     | DDIntakeWriter | false        | false       | true                     | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi  "
-  })
-  void testWriterCreationForLlmObservability(
-      String configuredType,
-      boolean agentRunning,
-      boolean hasEvpProxy,
-      boolean isLlmObsAgentlessEnabled,
-      Class<?> expectedWriterClass,
-      Class<?> expectedLlmObsApiClass)
-      throws Exception {
-    Config config = mock(Config.class);
-    when(config.getApiKey()).thenReturn("my-api-key");
-    when(config.getAgentUrl()).thenReturn("http://my-agent.url");
-    //noinspection unchecked
-    doReturn(Prioritization.FAST_LANE)
-        .when(config)
-        .getEnumValue(
-            eq(PRIORITIZATION_TYPE),
-            (Class<Prioritization>) any(Class.class),
-            any(Prioritization.class));
-    when(config.isTracerMetricsEnabled()).thenReturn(true);
-    when(config.isLlmObsEnabled()).thenReturn(true);
-    when(config.isLlmObsAgentlessEnabled()).thenReturn(isLlmObsAgentlessEnabled);
-
-    // Mock agent info response
-    Response response;
-    if (agentRunning) {
-      response = buildHttpResponse(hasEvpProxy, true, HttpUrl.parse("http://my-agent.url/info"));
-    } else {
-      response = buildHttpResponseNotOk(HttpUrl.parse("http://my-agent.url/info"));
+    @TableTest({
+      "scenario                        | configuredType | agentRunning | hasEvpProxy | isLlmObsAgentlessEnabled | expectedWriterClass                        | expectedLlmObsApiClass                            ",
+      "evp proxy not agentless         | DDIntakeWriter | true         | true        | false                    | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDEvpProxyApi",
+      "no evp not agentless            | DDIntakeWriter | true         | false       | false                    | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi  ",
+      "agent not running not agentless | DDIntakeWriter | false        | false       | false                    | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi  ",
+      "evp proxy agentless             | DDIntakeWriter | true         | true        | true                     | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi  ",
+      "no evp agentless                | DDIntakeWriter | true         | false       | true                     | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi  ",
+      "agent not running agentless     | DDIntakeWriter | false        | false       | true                     | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi  "
+    })
+    void testWriterCreationForLlmObservability(
+            String configuredType,
+            boolean agentRunning,
+            boolean hasEvpProxy,
+            boolean isLlmObsAgentlessEnabled,
+            Class<?> expectedWriterClass,
+            Class<?> expectedLlmObsApiClass)
+            throws Exception {
+        Config config = mock(Config.class);
+        when(config.getApiKey()).thenReturn("my-api-key");
+        when(config.getAgentUrl()).thenReturn("http://my-agent.url");
+        //noinspection unchecked
+        doReturn(Prioritization.FAST_LANE)
+                .when(config)
+                .getEnumValue(
+                        eq(PRIORITIZATION_TYPE), (Class<Prioritization>) any(Class.class), any(Prioritization.class));
+        when(config.isTracerMetricsEnabled()).thenReturn(true);
+        when(config.isLlmObsEnabled()).thenReturn(true);
+        when(config.isLlmObsAgentlessEnabled()).thenReturn(isLlmObsAgentlessEnabled);
+
+        // Mock agent info response
+        Response response;
+        if (agentRunning) {
+            response = buildHttpResponse(hasEvpProxy, true, HttpUrl.parse("http://my-agent.url/info"));
+        } else {
+            response = buildHttpResponseNotOk(HttpUrl.parse("http://my-agent.url/info"));
+        }
+
+        // Mock HTTP client that simulates delayed response for async feature discovery
+        Call mockCall = mock(Call.class);
+        OkHttpClient mockHttpClient = mock(OkHttpClient.class);
+        when(mockCall.execute()).thenAnswer(inv -> {
+            // Add a delay
+            Thread.sleep(400);
+            return response;
+        });
+        when(mockHttpClient.newCall(any(Request.class))).thenReturn(mockCall);
+
+        // Create SharedCommunicationObjects with mocked HTTP client
+        SharedCommunicationObjects sharedComm = new SharedCommunicationObjects();
+        sharedComm.agentHttpClient = mockHttpClient;
+        sharedComm.agentUrl = HttpUrl.parse("http://my-agent.url");
+        sharedComm.createRemaining(config);
+        Sampler sampler = mock(Sampler.class);
+
+        Writer writer =
+                WriterFactory.createWriter(config, sharedComm, sampler, null, HealthMetrics.NO_OP, configuredType);
+        List<Class<?>> llmObsApiClasses = ((RemoteWriter) writer)
+                .getApis().stream()
+                        .filter(api -> {
+                            try {
+                                Field trackTypeField = api.getClass().getDeclaredField("trackType");
+                                trackTypeField.setAccessible(true);
+                                return trackTypeField.get(api) == TrackType.LLMOBS;
+                            } catch (Exception e) {
+                                return false;
+                            }
+                        })
+                        .map(Object::getClass)
+                        .collect(Collectors.toList());
+
+        assertEquals(expectedWriterClass, writer.getClass());
+        assertEquals(singletonList(expectedLlmObsApiClass), llmObsApiClasses);
     }
 
-    // Mock HTTP client that simulates delayed response for async feature discovery
-    Call mockCall = mock(Call.class);
-    OkHttpClient mockHttpClient = mock(OkHttpClient.class);
-    when(mockCall.execute())
-        .thenAnswer(
-            inv -> {
-              // Add a delay
-              Thread.sleep(400);
-              return response;
-            });
-    when(mockHttpClient.newCall(any(Request.class))).thenReturn(mockCall);
-
-    // Create SharedCommunicationObjects with mocked HTTP client
-    SharedCommunicationObjects sharedComm = new SharedCommunicationObjects();
-    sharedComm.agentHttpClient = mockHttpClient;
-    sharedComm.agentUrl = HttpUrl.parse("http://my-agent.url");
-    sharedComm.createRemaining(config);
-    Sampler sampler = mock(Sampler.class);
-
-    Writer writer =
-        WriterFactory.createWriter(
-            config, sharedComm, sampler, null, HealthMetrics.NO_OP, configuredType);
-    List<Class<?>> llmObsApiClasses =
-        ((RemoteWriter) writer)
-            .getApis().stream()
-                .filter(
-                    api -> {
-                      try {
-                        Field trackTypeField = api.getClass().getDeclaredField("trackType");
-                        trackTypeField.setAccessible(true);
-                        return trackTypeField.get(api) == TrackType.LLMOBS;
-                      } catch (Exception e) {
-                        return false;
-                      }
-                    })
-                .map(Object::getClass)
-                .collect(Collectors.toList());
-
-    assertEquals(expectedWriterClass, writer.getClass());
-    assertEquals(singletonList(expectedLlmObsApiClass), llmObsApiClasses);
-  }
-
-  @TableTest({
-    "scenario     | protocol      | compression | endpoint                               | expectedSenderClass                           | expectedUrl                                                                             | expectedGzip",
-    "http no gzip | HTTP_PROTOBUF | NONE        | 'http://otel-collector:4318/v1/traces' | datadog.trace.core.otlp.common.OtlpHttpSender | 'http://otel-collector:4318/v1/traces'                                                  | false       ",
-    "http gzip    | HTTP_PROTOBUF | GZIP        | 'http://otel-collector:4318/v1/traces' | datadog.trace.core.otlp.common.OtlpHttpSender | 'http://otel-collector:4318/v1/traces'                                                  | true        ",
-    "grpc no gzip | GRPC          | NONE        | 'http://otel-collector:4317'           | datadog.trace.core.otlp.common.OtlpGrpcSender | 'http://otel-collector:4317/opentelemetry.proto.collector.trace.v1.TraceService/Export' | false       "
-  })
-  void testWriterCreationForOtlpWriter(
-      OtlpConfig.Protocol protocol,
-      OtlpConfig.Compression compression,
-      String endpoint,
-      Class<?> expectedSenderClass,
-      String expectedUrl,
-      boolean expectedGzip)
-      throws Exception {
-    Config config = mock(Config.class);
-    Map<String, String> headers = new HashMap<>();
-    headers.put("api-key", "secret");
-
-    when(config.getTraceFlushIntervalSeconds()).thenReturn(1.0f);
-    when(config.getOtlpTracesEndpoint()).thenReturn(endpoint);
-    when(config.getOtlpTracesHeaders()).thenReturn(headers);
-    when(config.getOtlpTracesProtocol()).thenReturn(protocol);
-    when(config.getOtlpTracesCompression()).thenReturn(compression);
-    when(config.getOtlpTracesTimeout()).thenReturn(5000);
-
-    // OTLP branch in WriterFactory does not consult sharedComm or sampler, so nulls are safe here.
-    Writer writer =
-        WriterFactory.createWriter(config, null, null, null, HealthMetrics.NO_OP, "OtlpWriter");
-    Object sender = readField(writer, "sender");
-
-    assertEquals(OtlpWriter.class, writer.getClass());
-    assertEquals(expectedSenderClass, sender.getClass());
-    assertEquals(expectedUrl, readField(sender, "url").toString());
-    assertEquals(headers, readField(sender, "headers"));
-    assertEquals(expectedGzip, readField(sender, "gzip"));
-
-    writer.close();
-  }
-
-  @Test
-  void registersAgentSamplerAsResponseListener() throws Exception {
-    try (JavaTestHttpServer agent = tracesAgent()) {
-      RateByServiceTraceSampler agentRateSampler = mock(RateByServiceTraceSampler.class);
-      Sampler sampler = mock(Sampler.class);
-      when(sampler.agentSampler()).thenReturn(agentRateSampler);
-
-      try (Writer writer = createDDAgentWriter(agent, sampler)) {
-        DDAgentApi api = onlyApi(writer);
-        api.sendSerializedTraces(emptyV04Payload());
-
-        verify(agentRateSampler).onResponse(anyString(), any());
-      }
+    @TableTest({
+      "scenario     | protocol      | compression | endpoint                               | expectedSenderClass                           | expectedUrl                                                                             | expectedGzip",
+      "http no gzip | HTTP_PROTOBUF | NONE        | 'http://otel-collector:4318/v1/traces' | datadog.trace.core.otlp.common.OtlpHttpSender | 'http://otel-collector:4318/v1/traces'                                                  | false       ",
+      "http gzip    | HTTP_PROTOBUF | GZIP        | 'http://otel-collector:4318/v1/traces' | datadog.trace.core.otlp.common.OtlpHttpSender | 'http://otel-collector:4318/v1/traces'                                                  | true        ",
+      "grpc no gzip | GRPC          | NONE        | 'http://otel-collector:4317'           | datadog.trace.core.otlp.common.OtlpGrpcSender | 'http://otel-collector:4317/opentelemetry.proto.collector.trace.v1.TraceService/Export' | false       "
+    })
+    void testWriterCreationForOtlpWriter(
+            OtlpConfig.Protocol protocol,
+            OtlpConfig.Compression compression,
+            String endpoint,
+            Class<?> expectedSenderClass,
+            String expectedUrl,
+            boolean expectedGzip)
+            throws Exception {
+        Config config = mock(Config.class);
+        Map<String, String> headers = new HashMap<>();
+        headers.put("api-key", "secret");
+
+        when(config.getTraceFlushIntervalSeconds()).thenReturn(1.0f);
+        when(config.getOtlpTracesEndpoint()).thenReturn(endpoint);
+        when(config.getOtlpTracesHeaders()).thenReturn(headers);
+        when(config.getOtlpTracesProtocol()).thenReturn(protocol);
+        when(config.getOtlpTracesCompression()).thenReturn(compression);
+        when(config.getOtlpTracesTimeout()).thenReturn(5000);
+
+        // OTLP branch in WriterFactory does not consult sharedComm or sampler, so nulls are safe here.
+        Writer writer = WriterFactory.createWriter(config, null, null, null, HealthMetrics.NO_OP, "OtlpWriter");
+        Object sender = readField(writer, "sender");
+
+        assertEquals(OtlpWriter.class, writer.getClass());
+        assertEquals(expectedSenderClass, sender.getClass());
+        assertEquals(expectedUrl, readField(sender, "url").toString());
+        assertEquals(headers, readField(sender, "headers"));
+        assertEquals(expectedGzip, readField(sender, "gzip"));
+
+        writer.close();
     }
-  }
 
-  @Test
-  void registersCustomSamplerImplementingRemoteResponseListener() throws Exception {
-    try (JavaTestHttpServer agent = tracesAgent()) {
-      CustomListenerSampler sampler = mock(CustomListenerSampler.class);
-      when(sampler.agentSampler()).thenReturn(null);
+    @Test
+    void registersAgentSamplerAsResponseListener() throws Exception {
+        try (JavaTestHttpServer agent = tracesAgent()) {
+            RateByServiceTraceSampler agentRateSampler = mock(RateByServiceTraceSampler.class);
+            Sampler sampler = mock(Sampler.class);
+            when(sampler.agentSampler()).thenReturn(agentRateSampler);
 
-      try (Writer writer = createDDAgentWriter(agent, sampler)) {
-        DDAgentApi api = onlyApi(writer);
-        api.sendSerializedTraces(emptyV04Payload());
+            try (Writer writer = createDDAgentWriter(agent, sampler)) {
+                DDAgentApi api = onlyApi(writer);
+                api.sendSerializedTraces(emptyV04Payload());
 
-        verify(sampler).onResponse(anyString(), any());
-      }
+                verify(agentRateSampler).onResponse(anyString(), any());
+            }
+        }
     }
-  }
 
-  private interface CustomListenerSampler extends Sampler, RemoteResponseListener {}
+    @Test
+    void registersCustomSamplerImplementingRemoteResponseListener() throws Exception {
+        try (JavaTestHttpServer agent = tracesAgent()) {
+            CustomListenerSampler sampler = mock(CustomListenerSampler.class);
+            when(sampler.agentSampler()).thenReturn(null);
 
-  @Test
-  void skipsResponseListenerRegistrationWhenNoAgentSampler() throws Exception {
-    try (JavaTestHttpServer agent = tracesAgent()) {
-      Sampler sampler = mock(Sampler.class);
-      when(sampler.agentSampler()).thenReturn(null);
+            try (Writer writer = createDDAgentWriter(agent, sampler)) {
+                DDAgentApi api = onlyApi(writer);
+                api.sendSerializedTraces(emptyV04Payload());
 
-      try (Writer writer = createDDAgentWriter(agent, sampler)) {
-        DDAgentApi api = onlyApi(writer);
-        RemoteApi.Response response = api.sendSerializedTraces(emptyV04Payload());
+                verify(sampler).onResponse(anyString(), any());
+            }
+        }
+    }
+
+    private interface CustomListenerSampler extends Sampler, RemoteResponseListener {}
+
+    @Test
+    void skipsResponseListenerRegistrationWhenNoAgentSampler() throws Exception {
+        try (JavaTestHttpServer agent = tracesAgent()) {
+            Sampler sampler = mock(Sampler.class);
+            when(sampler.agentSampler()).thenReturn(null);
+
+            try (Writer writer = createDDAgentWriter(agent, sampler)) {
+                DDAgentApi api = onlyApi(writer);
+                RemoteApi.Response response = api.sendSerializedTraces(emptyV04Payload());
+
+                verify(sampler).agentSampler();
+                // No listener was registered, so a response with a body is handled without error.
+                assertTrue(response.success());
+            }
+        }
+    }
+
+    private static JavaTestHttpServer tracesAgent() {
+        return JavaTestHttpServer.httpServer(s -> s.handlers(
+                h -> h.put("v0.4/traces", api -> api.getResponse().status(200).send("{\"hello\":{}}"))));
+    }
+
+    private static Writer createDDAgentWriter(JavaTestHttpServer agent, Sampler sampler) throws Exception {
+        Config config = mock(Config.class);
+        //noinspection unchecked
+        doReturn(Prioritization.FAST_LANE)
+                .when(config)
+                .getEnumValue(
+                        eq(PRIORITIZATION_TYPE), (Class<Prioritization>) any(Class.class), any(Prioritization.class));
 
-        verify(sampler).agentSampler();
-        // No listener was registered, so a response with a body is handled without error.
-        assertTrue(response.success());
-      }
+        DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+        when(discovery.getTraceEndpoint()).thenReturn("v0.4/traces");
+
+        SharedCommunicationObjects sharedComm = new SharedCommunicationObjects();
+        sharedComm.agentUrl = HttpUrl.get(agent.getAddress().toString());
+        sharedComm.setFeaturesDiscovery(discovery);
+        sharedComm.createRemaining(config);
+
+        return WriterFactory.createWriter(config, sharedComm, sampler, null, HealthMetrics.NO_OP, "DDAgentWriter");
     }
-  }
-
-  private static JavaTestHttpServer tracesAgent() {
-    return JavaTestHttpServer.httpServer(
-        s ->
-            s.handlers(
-                h ->
-                    h.put(
-                        "v0.4/traces",
-                        api -> api.getResponse().status(200).send("{\"hello\":{}}"))));
-  }
-
-  private static Writer createDDAgentWriter(JavaTestHttpServer agent, Sampler sampler)
-      throws Exception {
-    Config config = mock(Config.class);
-    //noinspection unchecked
-    doReturn(Prioritization.FAST_LANE)
-        .when(config)
-        .getEnumValue(
-            eq(PRIORITIZATION_TYPE),
-            (Class<Prioritization>) any(Class.class),
-            any(Prioritization.class));
-
-    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-    when(discovery.getTraceEndpoint()).thenReturn("v0.4/traces");
-
-    SharedCommunicationObjects sharedComm = new SharedCommunicationObjects();
-    sharedComm.agentUrl = HttpUrl.get(agent.getAddress().toString());
-    sharedComm.setFeaturesDiscovery(discovery);
-    sharedComm.createRemaining(config);
-
-    return WriterFactory.createWriter(
-        config, sharedComm, sampler, null, HealthMetrics.NO_OP, "DDAgentWriter");
-  }
-
-  private static DDAgentApi onlyApi(Writer writer) {
-    return (DDAgentApi) ((RemoteWriter) writer).getApis().iterator().next();
-  }
-
-  private static Payload emptyV04Payload() {
-    return new TraceMapperV0_4().newPayload().withBody(0, ByteBuffer.allocate(0));
-  }
-
-  private static Response buildHttpResponse(
-      boolean hasEvpProxy, boolean evpProxySupportsCompression, HttpUrl agentUrl) {
-    List<String> endpoints = new ArrayList<>();
-    if (hasEvpProxy && evpProxySupportsCompression) {
-      endpoints.add(DDAgentFeaturesDiscovery.V4_EVP_PROXY_ENDPOINT);
-    } else if (hasEvpProxy) {
-      endpoints.add(DDAgentFeaturesDiscovery.V2_EVP_PROXY_ENDPOINT);
-    } else {
-      endpoints.add(DDAgentFeaturesDiscovery.V04_ENDPOINT);
+
+    private static DDAgentApi onlyApi(Writer writer) {
+        return (DDAgentApi) ((RemoteWriter) writer).getApis().iterator().next();
+    }
+
+    private static Payload emptyV04Payload() {
+        return new TraceMapperV0_4().newPayload().withBody(0, ByteBuffer.allocate(0));
+    }
+
+    private static Response buildHttpResponse(
+            boolean hasEvpProxy, boolean evpProxySupportsCompression, HttpUrl agentUrl) {
+        List<String> endpoints = new ArrayList<>();
+        if (hasEvpProxy && evpProxySupportsCompression) {
+            endpoints.add(DDAgentFeaturesDiscovery.V4_EVP_PROXY_ENDPOINT);
+        } else if (hasEvpProxy) {
+            endpoints.add(DDAgentFeaturesDiscovery.V2_EVP_PROXY_ENDPOINT);
+        } else {
+            endpoints.add(DDAgentFeaturesDiscovery.V04_ENDPOINT);
+        }
+
+        StringBuilder endpointsJson = new StringBuilder("[");
+        for (int i = 0; i < endpoints.size(); i++) {
+            if (i > 0) endpointsJson.append(",");
+            endpointsJson.append("\"").append(endpoints.get(i)).append("\"");
+        }
+        endpointsJson.append("]");
+        String json = "{\"version\":\"7.40.0\",\"endpoints\":" + endpointsJson + "}";
+
+        return new Response.Builder()
+                .code(200)
+                .message("OK")
+                .protocol(Protocol.HTTP_1_1)
+                .request(new Request.Builder().url(agentUrl.resolve("/info")).build())
+                .body(ResponseBody.create(MediaType.parse("application/json"), json))
+                .build();
+    }
+
+    private static Response buildHttpResponseNotOk(HttpUrl agentUrl) {
+        return new Response.Builder()
+                .code(500)
+                .message("ERROR")
+                .protocol(Protocol.HTTP_1_1)
+                .request(new Request.Builder().url(agentUrl.resolve("/info")).build())
+                .body(ResponseBody.create(MediaType.parse("application/json"), ""))
+                .build();
     }
 
-    StringBuilder endpointsJson = new StringBuilder("[");
-    for (int i = 0; i < endpoints.size(); i++) {
-      if (i > 0) endpointsJson.append(",");
-      endpointsJson.append("\"").append(endpoints.get(i)).append("\"");
+    private static Object readField(Object instance, String fieldName) throws Exception {
+        Field field = instance.getClass().getDeclaredField(fieldName);
+        field.setAccessible(true);
+        return field.get(instance);
     }
-    endpointsJson.append("]");
-    String json = "{\"version\":\"7.40.0\",\"endpoints\":" + endpointsJson + "}";
-
-    return new Response.Builder()
-        .code(200)
-        .message("OK")
-        .protocol(Protocol.HTTP_1_1)
-        .request(new Request.Builder().url(agentUrl.resolve("/info")).build())
-        .body(ResponseBody.create(MediaType.parse("application/json"), json))
-        .build();
-  }
-
-  private static Response buildHttpResponseNotOk(HttpUrl agentUrl) {
-    return new Response.Builder()
-        .code(500)
-        .message("ERROR")
-        .protocol(Protocol.HTTP_1_1)
-        .request(new Request.Builder().url(agentUrl.resolve("/info")).build())
-        .body(ResponseBody.create(MediaType.parse("application/json"), ""))
-        .build();
-  }
-
-  private static Object readField(Object instance, String fieldName) throws Exception {
-    Field field = instance.getClass().getDeclaredField(fieldName);
-    field.setAccessible(true);
-    return field.get(instance);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/PayloadVerifiers.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/PayloadVerifiers.java
index 4f2604a8d6b..4f04e48fc75 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/PayloadVerifiers.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/PayloadVerifiers.java
@@ -16,85 +16,85 @@
  * here.
  */
 final class PayloadVerifiers {
-  private PayloadVerifiers() {}
+    private PayloadVerifiers() {}
 
-  /** A serialized empty string round-trips as "", so a null expected value matches "". */
-  static void assertEqualsWithNullAsEmpty(CharSequence expected, CharSequence actual) {
-    if (expected == null) {
-      assertEquals("", actual);
-    } else {
-      assertEquals(expected.toString(), actual.toString());
+    /** A serialized empty string round-trips as "", so a null expected value matches "". */
+    static void assertEqualsWithNullAsEmpty(CharSequence expected, CharSequence actual) {
+        if (expected == null) {
+            assertEquals("", actual);
+        } else {
+            assertEquals(expected.toString(), actual.toString());
+        }
     }
-  }
 
-  /** Unpacks a msgpack numeric value, matching the encoder's int/long/float/double formats. */
-  static Number unpackNumber(MessageUnpacker unpacker, String key) throws IOException {
-    MessageFormat format = unpacker.getNextFormat();
-    switch (format) {
-      case NEGFIXINT:
-      case POSFIXINT:
-      case INT8:
-      case UINT8:
-      case INT16:
-      case UINT16:
-      case INT32:
-      case UINT32:
-        return unpacker.unpackInt();
-      case INT64:
-      case UINT64:
-        return unpacker.unpackLong();
-      case FLOAT32:
-        return unpacker.unpackFloat();
-      case FLOAT64:
-        return unpacker.unpackDouble();
-      default:
-        fail("Unexpected type in metrics values: " + format + " for key " + key);
-        return null; // unreachable
+    /** Unpacks a msgpack numeric value, matching the encoder's int/long/float/double formats. */
+    static Number unpackNumber(MessageUnpacker unpacker, String key) throws IOException {
+        MessageFormat format = unpacker.getNextFormat();
+        switch (format) {
+            case NEGFIXINT:
+            case POSFIXINT:
+            case INT8:
+            case UINT8:
+            case INT16:
+            case UINT16:
+            case INT32:
+            case UINT32:
+                return unpacker.unpackInt();
+            case INT64:
+            case UINT64:
+                return unpacker.unpackLong();
+            case FLOAT32:
+                return unpacker.unpackFloat();
+            case FLOAT64:
+                return unpacker.unpackDouble();
+            default:
+                fail("Unexpected type in metrics values: " + format + " for key " + key);
+                return null; // unreachable
+        }
     }
-  }
 
-  /**
-   * Growable capturing channel the payload verifiers write the mapper output into before decoding.
-   * Grows by the source's remaining bytes when needed.
-   */
-  static final class CapturingChannel implements WritableByteChannel {
-    private ByteBuffer captured;
+    /**
+     * Growable capturing channel the payload verifiers write the mapper output into before decoding.
+     * Grows by the source's remaining bytes when needed.
+     */
+    static final class CapturingChannel implements WritableByteChannel {
+        private ByteBuffer captured;
 
-    CapturingChannel(int size) {
-      this.captured = ByteBuffer.allocate(size);
-    }
+        CapturingChannel(int size) {
+            this.captured = ByteBuffer.allocate(size);
+        }
 
-    @Override
-    public int write(ByteBuffer src) {
-      if (captured.remaining() < src.remaining()) {
-        ByteBuffer bigger = ByteBuffer.allocate(captured.capacity() + src.remaining());
-        captured.flip();
-        bigger.put(captured);
-        captured = bigger;
-        return write(src);
-      }
-      captured.put(src);
-      return src.position();
-    }
+        @Override
+        public int write(ByteBuffer src) {
+            if (captured.remaining() < src.remaining()) {
+                ByteBuffer bigger = ByteBuffer.allocate(captured.capacity() + src.remaining());
+                captured.flip();
+                bigger.put(captured);
+                captured = bigger;
+                return write(src);
+            }
+            captured.put(src);
+            return src.position();
+        }
 
-    /** Flips the buffer and returns it ready for reading. */
-    ByteBuffer flipForReading() {
-      captured.flip();
-      return captured;
-    }
+        /** Flips the buffer and returns it ready for reading. */
+        ByteBuffer flipForReading() {
+            captured.flip();
+            return captured;
+        }
 
-    /** Resets the buffer for the next payload. */
-    void resetForWriting() {
-      captured.position(0);
-      captured.limit(captured.capacity());
-    }
+        /** Resets the buffer for the next payload. */
+        void resetForWriting() {
+            captured.position(0);
+            captured.limit(captured.capacity());
+        }
 
-    @Override
-    public boolean isOpen() {
-      return true;
-    }
+        @Override
+        public boolean isOpen() {
+            return true;
+        }
 
-    @Override
-    public void close() {}
-  }
+        @Override
+        public void close() {}
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperTestBridge.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperTestBridge.java
index 5632ee2e047..377cd2cbdb9 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperTestBridge.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperTestBridge.java
@@ -7,11 +7,11 @@
  * Bridge class to allow tests to access package-private method exposed by the {@code TraceMapper}
  */
 public class TraceMapperTestBridge {
-  public static GrowableBuffer getDictionary(TraceMapperV0_5 traceMapperV05) {
-    return traceMapperV05.getDictionary();
-  }
+    public static GrowableBuffer getDictionary(TraceMapperV0_5 traceMapperV05) {
+        return traceMapperV05.getDictionary();
+    }
 
-  public static Map<Object, Integer> getEncoding(TraceMapperV0_5 traceMapperV05) {
-    return traceMapperV05.getEncoding();
-  }
+    public static Map<Object, Integer> getEncoding(TraceMapperV0_5 traceMapperV05) {
+        return traceMapperV05.getEncoding();
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java
index 6663c7c9501..a813f5678c4 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java
@@ -49,407 +49,395 @@
 @ExtendWith(WithConfigExtension.class)
 class TraceMapperV04PayloadTest {
 
-  // Keep the ProcessTags static in sync with the (per-test rebuilt) Config, the way DDSpecification
-  // did for the original Spock tests. Runs after WithConfigExtension has rebuilt Config.
-  @BeforeEach
-  void syncProcessTags() {
-    ProcessTags.reset(Config.get());
-  }
-
-  @ParameterizedTest(name = "buffer={0} traces={1} lowCardinality={2}")
-  @MethodSource("tracesWrittenCorrectlyArguments")
-  void tracesWrittenCorrectly(int bufferSize, int traceCount, boolean lowCardinality) {
-    List<List<PojoSpan>> traces = generateRandomTraces(traceCount, lowCardinality);
-    TraceMapperV0_4 traceMapper = new TraceMapperV0_4();
-    PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper);
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier));
-    boolean tracesFitInBuffer = true;
-    for (List<PojoSpan> trace : traces) {
-      if (!packer.format(trace, traceMapper)) {
-        verifier.skipLargeTrace();
-        tracesFitInBuffer = false;
-      }
+    // Keep the ProcessTags static in sync with the (per-test rebuilt) Config, the way DDSpecification
+    // did for the original Spock tests. Runs after WithConfigExtension has rebuilt Config.
+    @BeforeEach
+    void syncProcessTags() {
+        ProcessTags.reset(Config.get());
     }
-    packer.flush();
 
-    if (tracesFitInBuffer) {
-      verifier.verifyTracesConsumed();
+    @ParameterizedTest(name = "buffer={0} traces={1} lowCardinality={2}")
+    @MethodSource("tracesWrittenCorrectlyArguments")
+    void tracesWrittenCorrectly(int bufferSize, int traceCount, boolean lowCardinality) {
+        List<List<PojoSpan>> traces = generateRandomTraces(traceCount, lowCardinality);
+        TraceMapperV0_4 traceMapper = new TraceMapperV0_4();
+        PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper);
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier));
+        boolean tracesFitInBuffer = true;
+        for (List<PojoSpan> trace : traces) {
+            if (!packer.format(trace, traceMapper)) {
+                verifier.skipLargeTrace();
+                tracesFitInBuffer = false;
+            }
+        }
+        packer.flush();
+
+        if (tracesFitInBuffer) {
+            verifier.verifyTracesConsumed();
+        }
+    }
+
+    private static Stream<Arguments> tracesWrittenCorrectlyArguments() {
+        return Stream.of(
+                arguments(20 << 10, 0, true),
+                arguments(20 << 10, 1, true),
+                arguments(30 << 10, 1, true),
+                arguments(30 << 10, 2, true),
+                arguments(20 << 10, 0, false),
+                arguments(20 << 10, 1, false),
+                arguments(30 << 10, 1, false),
+                arguments(30 << 10, 2, false),
+                arguments(100 << 10, 0, true),
+                arguments(100 << 10, 1, true),
+                arguments(100 << 10, 10, true),
+                arguments(100 << 10, 100, true),
+                arguments(100 << 10, 1000, true),
+                arguments(100 << 10, 0, false),
+                arguments(100 << 10, 1, false),
+                arguments(100 << 10, 10, false),
+                arguments(100 << 10, 100, false),
+                arguments(100 << 10, 1000, false));
     }
-  }
-
-  private static Stream<Arguments> tracesWrittenCorrectlyArguments() {
-    return Stream.of(
-        arguments(20 << 10, 0, true),
-        arguments(20 << 10, 1, true),
-        arguments(30 << 10, 1, true),
-        arguments(30 << 10, 2, true),
-        arguments(20 << 10, 0, false),
-        arguments(20 << 10, 1, false),
-        arguments(30 << 10, 1, false),
-        arguments(30 << 10, 2, false),
-        arguments(100 << 10, 0, true),
-        arguments(100 << 10, 1, true),
-        arguments(100 << 10, 10, true),
-        arguments(100 << 10, 100, true),
-        arguments(100 << 10, 1000, true),
-        arguments(100 << 10, 0, false),
-        arguments(100 << 10, 1, false),
-        arguments(100 << 10, 10, false),
-        arguments(100 << 10, 100, false),
-        arguments(100 << 10, 1000, false));
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("fullSixtyFourBitTraceAndSpanIdentifiersArguments")
-  void fullSixtyFourBitTraceAndSpanIdentifiers(
-      String scenario, DDTraceId traceId, long spanId, long parentId) {
-    PojoSpan span = plainSpan(traceId, spanId, parentId);
-    List<List<PojoSpan>> traces = Collections.singletonList(Collections.singletonList(span));
-    TraceMapperV0_4 traceMapper = new TraceMapperV0_4();
-    PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper);
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(20 << 10, verifier));
-
-    packer.format(Collections.singletonList(span), traceMapper);
-    packer.flush();
-
-    verifier.verifyTracesConsumed();
-  }
-
-  private static Stream<Arguments> fullSixtyFourBitTraceAndSpanIdentifiersArguments() {
-    return Stream.of(
-        arguments("ONE", DD64bTraceId.ONE, 2L, 3L),
-        arguments("MAX", DD64bTraceId.MAX, 2L, 3L),
-        arguments("negative", DD64bTraceId.from(-10), -11L, -12L));
-  }
-
-  @Test
-  void metaStructSupport() {
-    PojoSpan span = plainSpan(1L);
-    List<Map<String, String>> stack = new ArrayList<>();
-    for (StackTraceElement element : Thread.currentThread().getStackTrace()) {
-      Map<String, String> frame = new HashMap<>();
-      frame.put("file", element.getFileName() != null ? element.getFileName() : "");
-      frame.put("class_name", element.getClassName() != null ? element.getClassName() : "");
-      frame.put("function", element.getMethodName() != null ? element.getMethodName() : "");
-      stack.add(frame);
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("fullSixtyFourBitTraceAndSpanIdentifiersArguments")
+    void fullSixtyFourBitTraceAndSpanIdentifiers(String scenario, DDTraceId traceId, long spanId, long parentId) {
+        PojoSpan span = plainSpan(traceId, spanId, parentId);
+        List<List<PojoSpan>> traces = Collections.singletonList(Collections.singletonList(span));
+        TraceMapperV0_4 traceMapper = new TraceMapperV0_4();
+        PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper);
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(20 << 10, verifier));
+
+        packer.format(Collections.singletonList(span), traceMapper);
+        packer.flush();
+
+        verifier.verifyTracesConsumed();
     }
-    span.setMetaStruct("stack", stack);
-    List<List<PojoSpan>> traces = Collections.singletonList(Collections.singletonList(span));
-    TraceMapperV0_4 traceMapper = new TraceMapperV0_4();
-    PayloadVerifier verifier =
-        new PayloadVerifier(
-            traces,
-            traceMapper,
-            (expected, received) -> {
-              MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(received);
-              List<?> expectedStack = (List<?>) expected;
-              int size = unpacker.unpackArrayHeader();
-              assertEquals(expectedStack.size(), size);
-              for (Object entry : expectedStack) {
+
+    private static Stream<Arguments> fullSixtyFourBitTraceAndSpanIdentifiersArguments() {
+        return Stream.of(
+                arguments("ONE", DD64bTraceId.ONE, 2L, 3L),
+                arguments("MAX", DD64bTraceId.MAX, 2L, 3L),
+                arguments("negative", DD64bTraceId.from(-10), -11L, -12L));
+    }
+
+    @Test
+    void metaStructSupport() {
+        PojoSpan span = plainSpan(1L);
+        List<Map<String, String>> stack = new ArrayList<>();
+        for (StackTraceElement element : Thread.currentThread().getStackTrace()) {
+            Map<String, String> frame = new HashMap<>();
+            frame.put("file", element.getFileName() != null ? element.getFileName() : "");
+            frame.put("class_name", element.getClassName() != null ? element.getClassName() : "");
+            frame.put("function", element.getMethodName() != null ? element.getMethodName() : "");
+            stack.add(frame);
+        }
+        span.setMetaStruct("stack", stack);
+        List<List<PojoSpan>> traces = Collections.singletonList(Collections.singletonList(span));
+        TraceMapperV0_4 traceMapper = new TraceMapperV0_4();
+        PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper, (expected, received) -> {
+            MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(received);
+            List<?> expectedStack = (List<?>) expected;
+            int size = unpacker.unpackArrayHeader();
+            assertEquals(expectedStack.size(), size);
+            for (Object entry : expectedStack) {
                 @SuppressWarnings("unchecked")
                 Map<String, String> stackEntry = (Map<String, String>) entry;
                 int fields = unpacker.unpackMapHeader();
                 for (int f = 0; f < fields; ++f) {
-                  String field = unpacker.unpackString();
-                  assertEquals(stackEntry.get(field), unpacker.unpackString());
+                    String field = unpacker.unpackString();
+                    assertEquals(stackEntry.get(field), unpacker.unpackString());
                 }
-              }
-            });
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(20 << 10, verifier));
-
-    packer.format(Collections.singletonList(span), traceMapper);
-    packer.flush();
-
-    verifier.verifyTracesConsumed();
-  }
-
-  @Test
-  void processTagsSerialization() {
-    assertNotNull(ProcessTags.getTagsForSerialization());
-    List<PojoSpan> spans = new ArrayList<>();
-    for (long spanId = 1; spanId <= 2; ++spanId) {
-      spans.add(plainSpan(spanId));
+            }
+        });
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(20 << 10, verifier));
+
+        packer.format(Collections.singletonList(span), traceMapper);
+        packer.flush();
+
+        verifier.verifyTracesConsumed();
     }
 
-    List<List<PojoSpan>> traces = Collections.singletonList(spans);
-    TraceMapperV0_4 traceMapper = new TraceMapperV0_4();
-    PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper);
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(20 << 10, verifier));
-
-    packer.format(spans, traceMapper);
-    packer.flush();
-
-    verifier.verifyTracesConsumed();
-  }
-
-  /**
-   * v0.4 has no payload-level field, so the export-mode marker rides on the first span of the first
-   * non-empty chunk and the Agent hoists it onto {@code TracerPayload.tags}.
-   */
-  @Test
-  void otlpExportMarkerOnlyOnFirstSpanOfFirstNonEmptyChunk() {
-    List<List<PojoSpan>> traces =
-        Arrays.asList(
-            Collections.emptyList(),
-            Arrays.asList(plainSpan(1), plainSpan(2)),
-            Collections.singletonList(plainSpan(3)));
-    TraceMapperV0_4 traceMapper = new TraceMapperV0_4();
-    PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper);
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(200 << 10, verifier));
-
-    for (List<PojoSpan> trace : traces) {
-      assertTrue(packer.format(trace, traceMapper));
+    @Test
+    void processTagsSerialization() {
+        assertNotNull(ProcessTags.getTagsForSerialization());
+        List<PojoSpan> spans = new ArrayList<>();
+        for (long spanId = 1; spanId <= 2; ++spanId) {
+            spans.add(plainSpan(spanId));
+        }
+
+        List<List<PojoSpan>> traces = Collections.singletonList(spans);
+        TraceMapperV0_4 traceMapper = new TraceMapperV0_4();
+        PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper);
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(20 << 10, verifier));
+
+        packer.format(spans, traceMapper);
+        packer.flush();
+
+        verifier.verifyTracesConsumed();
     }
-    packer.flush();
-
-    verifier.verifyTracesConsumed();
-    // The verifier already asserts exactly one marker per payload, that it sits on span 0 and that
-    // it holds the expected value; pin down *which chunk* it landed on: the first NON-EMPTY one,
-    // not the leading empty one and not a later one.
-    assertEquals(1, verifier.otlpExportTraceIndex());
-  }
-
-  @Test
-  @WithConfig(
-      key = WRITER_TYPE,
-      value = MULTI_WRITER_TYPE + ":" + OTLP_WRITER_TYPE + ",DDAgentWriter")
-  void otlpExportMarkerIsTrueWhenAlsoExportingOverOtlp() {
-    List<List<PojoSpan>> traces =
-        Collections.singletonList(Collections.singletonList(plainSpan(1)));
-    TraceMapperV0_4 traceMapper = new TraceMapperV0_4();
-    PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper).expectOtlpExport("true");
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(200 << 10, verifier));
-
-    packer.format(traces.get(0), traceMapper);
-    packer.flush();
-
-    verifier.verifyTracesConsumed();
-    assertEquals(0, verifier.otlpExportTraceIndex());
-  }
-
-  private static PojoSpan plainSpan(long spanId) {
-    return plainSpan(DDTraceId.ONE, spanId, -1L);
-  }
-
-  private static PojoSpan plainSpan(DDTraceId traceId, long spanId, long parentId) {
-    return new PojoSpan(
-        "service",
-        "operation",
-        "resource",
-        traceId,
-        spanId,
-        parentId,
-        123L,
-        456L,
-        0,
-        Collections.emptyMap(),
-        Collections.emptyMap(),
-        "type",
-        false,
-        0,
-        0,
-        "origin");
-  }
-
-  private static final class PayloadVerifier implements ByteBufferConsumer {
-
-    private final List<List<PojoSpan>> expectedTraces;
-    private final TraceMapperV0_4 mapper;
-    private final MetaStructVerifier<Object> metaStructVerifier;
-    private final PayloadVerifiers.CapturingChannel channel =
-        new PayloadVerifiers.CapturingChannel(200 << 10);
-
-    private int position = 0;
-
-    /** Expected value of the payload-scoped {@code _dd.sdk.otlp_export} marker. */
-    private String expectedOtlpExport = "false";
 
     /**
-     * Payload-spanning index of the chunk the marker was last seen on, or {@code -1} if it was
-     * never seen. The span index within that chunk is not tracked: {@link #accept} already asserts
-     * the marker only ever rides span 0.
+     * v0.4 has no payload-level field, so the export-mode marker rides on the first span of the first
+     * non-empty chunk and the Agent hoists it onto {@code TracerPayload.tags}.
      */
-    private int otlpExportTraceIndex = -1;
+    @Test
+    void otlpExportMarkerOnlyOnFirstSpanOfFirstNonEmptyChunk() {
+        List<List<PojoSpan>> traces = Arrays.asList(
+                Collections.emptyList(),
+                Arrays.asList(plainSpan(1), plainSpan(2)),
+                Collections.singletonList(plainSpan(3)));
+        TraceMapperV0_4 traceMapper = new TraceMapperV0_4();
+        PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper);
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(200 << 10, verifier));
+
+        for (List<PojoSpan> trace : traces) {
+            assertTrue(packer.format(trace, traceMapper));
+        }
+        packer.flush();
 
-    private PayloadVerifier(List<List<PojoSpan>> traces, TraceMapperV0_4 mapper) {
-      this(traces, mapper, null);
+        verifier.verifyTracesConsumed();
+        // The verifier already asserts exactly one marker per payload, that it sits on span 0 and that
+        // it holds the expected value; pin down *which chunk* it landed on: the first NON-EMPTY one,
+        // not the leading empty one and not a later one.
+        assertEquals(1, verifier.otlpExportTraceIndex());
     }
 
-    private PayloadVerifier(
-        List<List<PojoSpan>> traces,
-        TraceMapperV0_4 mapper,
-        MetaStructVerifier<Object> metaStructVerifier) {
-      this.expectedTraces = traces;
-      this.mapper = mapper;
-      this.metaStructVerifier = metaStructVerifier;
-    }
+    @Test
+    @WithConfig(key = WRITER_TYPE, value = MULTI_WRITER_TYPE + ":" + OTLP_WRITER_TYPE + ",DDAgentWriter")
+    void otlpExportMarkerIsTrueWhenAlsoExportingOverOtlp() {
+        List<List<PojoSpan>> traces = Collections.singletonList(Collections.singletonList(plainSpan(1)));
+        TraceMapperV0_4 traceMapper = new TraceMapperV0_4();
+        PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper).expectOtlpExport("true");
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(200 << 10, verifier));
+
+        packer.format(traces.get(0), traceMapper);
+        packer.flush();
 
-    /** Sets the expected {@code _dd.sdk.otlp_export} value (defaults to {@code "false"}). */
-    PayloadVerifier expectOtlpExport(String value) {
-      this.expectedOtlpExport = value;
-      return this;
+        verifier.verifyTracesConsumed();
+        assertEquals(0, verifier.otlpExportTraceIndex());
     }
 
-    int otlpExportTraceIndex() {
-      return otlpExportTraceIndex;
+    private static PojoSpan plainSpan(long spanId) {
+        return plainSpan(DDTraceId.ONE, spanId, -1L);
     }
 
-    void skipLargeTrace() {
-      ++position;
+    private static PojoSpan plainSpan(DDTraceId traceId, long spanId, long parentId) {
+        return new PojoSpan(
+                "service",
+                "operation",
+                "resource",
+                traceId,
+                spanId,
+                parentId,
+                123L,
+                456L,
+                0,
+                Collections.emptyMap(),
+                Collections.emptyMap(),
+                "type",
+                false,
+                0,
+                0,
+                "origin");
     }
 
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {
-      if (expectedTraces.isEmpty() && messageCount == 0) {
-        return;
-      }
-      int processTagsCount = 0;
-      int otlpExportCount = 0;
-      try {
-        Payload payload = mapper.newPayload().withBody(messageCount, buffer);
-        payload.writeTo(channel);
-        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(channel.flipForReading());
-        int traceCount = unpacker.unpackArrayHeader();
-        for (int i = 0; i < traceCount; ++i) {
-          List<PojoSpan> expectedTrace = expectedTraces.get(position++);
-          int spanCount = unpacker.unpackArrayHeader();
-          assertEquals(expectedTrace.size(), spanCount);
-          for (int k = 0; k < spanCount; ++k) {
-            PojoSpan expectedSpan = expectedTrace.get(k);
-            int elementCount = unpacker.unpackMapHeader();
-            boolean hasMetaStruct = !expectedSpan.getMetaStruct().isEmpty();
-            assertEquals(hasMetaStruct ? 13 : 12, elementCount);
-            assertEquals("service", unpacker.unpackString());
-            String serviceName = unpacker.unpackString();
-            assertEqualsWithNullAsEmpty(expectedSpan.getServiceName(), serviceName);
-            assertEquals("name", unpacker.unpackString());
-            String operationName = unpacker.unpackString();
-            assertEqualsWithNullAsEmpty(expectedSpan.getOperationName(), operationName);
-            assertEquals("resource", unpacker.unpackString());
-            String resourceName = unpacker.unpackString();
-            assertEqualsWithNullAsEmpty(expectedSpan.getResourceName(), resourceName);
-            assertEquals("trace_id", unpacker.unpackString());
-            long traceId = unpacker.unpackValue().asNumberValue().toLong();
-            assertEquals(expectedSpan.getTraceId().toLong(), traceId);
-            assertEquals("span_id", unpacker.unpackString());
-            long spanId = unpacker.unpackValue().asNumberValue().toLong();
-            assertEquals(expectedSpan.getSpanId(), spanId);
-            assertEquals("parent_id", unpacker.unpackString());
-            long parentId = unpacker.unpackValue().asNumberValue().toLong();
-            assertEquals(expectedSpan.getParentId(), parentId);
-            assertEquals("start", unpacker.unpackString());
-            long startTime = unpacker.unpackLong();
-            assertEquals(expectedSpan.getStartTime(), startTime);
-            assertEquals("duration", unpacker.unpackString());
-            long duration = unpacker.unpackLong();
-            assertEquals(expectedSpan.getDurationNano(), duration);
-            assertEquals("type", unpacker.unpackString());
-            String type = unpacker.unpackString();
-            assertEquals(expectedSpan.getType(), type);
-            assertEquals("error", unpacker.unpackString());
-            int error = unpacker.unpackInt();
-            assertEquals(expectedSpan.getError(), error);
-            assertEquals("metrics", unpacker.unpackString());
-            int metricsSize = unpacker.unpackMapHeader();
-            HashMap<String, Number> metrics = new HashMap<>();
-            for (int j = 0; j < metricsSize; ++j) {
-              String key = unpacker.unpackString();
-              Number n = unpackNumber(unpacker, key);
-              if (DD_MEASURED.toString().equals(key)) {
-                assertTrue(
-                    (n.intValue() == 1 && expectedSpan.isMeasured()) || !expectedSpan.isMeasured());
-              } else if (DDSpanContext.PRIORITY_SAMPLING_KEY.equals(key)) {
-                // check that priority sampling is only on first and last span
-                if (k == 0 || k == spanCount - 1) {
-                  assertEquals(expectedSpan.samplingPriority(), n.intValue());
-                } else {
-                  assertFalse(expectedSpan.hasSamplingPriority());
-                }
-              } else {
-                metrics.put(key, n);
-              }
-            }
-            for (Map.Entry<String, Number> metric : metrics.entrySet()) {
-              if (metric.getValue() instanceof Double || metric.getValue() instanceof Float) {
-                assertEquals(
-                    ((Number) expectedSpan.getTag(metric.getKey())).doubleValue(),
-                    metric.getValue().doubleValue(),
-                    0.001);
-              } else {
-                // Integer-typed metrics round-trip through msgpack's minimal encoding, so a Long
-                // tag can come back as an Integer (and vice versa). Compare numerically.
-                assertEquals(
-                    ((Number) expectedSpan.getTag(metric.getKey())).longValue(),
-                    metric.getValue().longValue());
-              }
-            }
-            assertEquals("meta", unpacker.unpackString());
-            int metaSize = unpacker.unpackMapHeader();
-            HashMap<String, String> meta = new HashMap<>();
-            for (int j = 0; j < metaSize; ++j) {
-              meta.put(unpacker.unpackString(), unpacker.unpackString());
-            }
-            for (Map.Entry<String, String> entry : meta.entrySet()) {
-              if (Tags.HTTP_STATUS.equals(entry.getKey())) {
-                assertEquals(String.valueOf(expectedSpan.getHttpStatusCode()), entry.getValue());
-              } else if (DDTags.ORIGIN_KEY.equals(entry.getKey())) {
-                assertEquals(expectedSpan.getOrigin(), entry.getValue());
-              } else if (DDTags.PROCESS_TAGS.equals(entry.getKey())) {
-                assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled());
-                assertEquals(0, k);
-                assertEquals(ProcessTags.getTagsForSerialization().toString(), entry.getValue());
-                processTagsCount++;
-              } else if (DDTags.SDK_OTLP_EXPORT.equals(entry.getKey())) {
-                // Payload-scoped: only the first span of the first non-empty chunk carries it.
-                otlpExportCount++;
-                assertEquals(0, k);
-                assertEquals(expectedOtlpExport, entry.getValue());
-                // `position` was post-incremented when this trace was picked up, so the current
-                // trace's payload-spanning index is `position - 1`.
-                otlpExportTraceIndex = position - 1;
-              } else {
-                Object tag = expectedSpan.getTag(entry.getKey());
-                if (tag != null) {
-                  assertEquals(String.valueOf(tag), entry.getValue());
-                } else {
-                  assertEquals(expectedSpan.getBaggage().get(entry.getKey()), entry.getValue());
-                }
-              }
+    private static final class PayloadVerifier implements ByteBufferConsumer {
+
+        private final List<List<PojoSpan>> expectedTraces;
+        private final TraceMapperV0_4 mapper;
+        private final MetaStructVerifier<Object> metaStructVerifier;
+        private final PayloadVerifiers.CapturingChannel channel = new PayloadVerifiers.CapturingChannel(200 << 10);
+
+        private int position = 0;
+
+        /** Expected value of the payload-scoped {@code _dd.sdk.otlp_export} marker. */
+        private String expectedOtlpExport = "false";
+
+        /**
+         * Payload-spanning index of the chunk the marker was last seen on, or {@code -1} if it was
+         * never seen. The span index within that chunk is not tracked: {@link #accept} already asserts
+         * the marker only ever rides span 0.
+         */
+        private int otlpExportTraceIndex = -1;
+
+        private PayloadVerifier(List<List<PojoSpan>> traces, TraceMapperV0_4 mapper) {
+            this(traces, mapper, null);
+        }
+
+        private PayloadVerifier(
+                List<List<PojoSpan>> traces, TraceMapperV0_4 mapper, MetaStructVerifier<Object> metaStructVerifier) {
+            this.expectedTraces = traces;
+            this.mapper = mapper;
+            this.metaStructVerifier = metaStructVerifier;
+        }
+
+        /** Sets the expected {@code _dd.sdk.otlp_export} value (defaults to {@code "false"}). */
+        PayloadVerifier expectOtlpExport(String value) {
+            this.expectedOtlpExport = value;
+            return this;
+        }
+
+        int otlpExportTraceIndex() {
+            return otlpExportTraceIndex;
+        }
+
+        void skipLargeTrace() {
+            ++position;
+        }
+
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {
+            if (expectedTraces.isEmpty() && messageCount == 0) {
+                return;
             }
-            if (hasMetaStruct) {
-              Map<String, Object> metaStruct = expectedSpan.getMetaStruct();
-              assertEquals("meta_struct", unpacker.unpackString());
-              int metaStructSize = unpacker.unpackMapHeader();
-              for (int j = 0; j < metaStructSize; ++j) {
-                String field = unpacker.unpackString();
-                if (metaStructVerifier != null) {
-                  byte[] binary = new byte[unpacker.unpackBinaryHeader()];
-                  unpacker.readPayload(binary);
-                  metaStructVerifier.verify(metaStruct.get(field), binary);
+            int processTagsCount = 0;
+            int otlpExportCount = 0;
+            try {
+                Payload payload = mapper.newPayload().withBody(messageCount, buffer);
+                payload.writeTo(channel);
+                MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(channel.flipForReading());
+                int traceCount = unpacker.unpackArrayHeader();
+                for (int i = 0; i < traceCount; ++i) {
+                    List<PojoSpan> expectedTrace = expectedTraces.get(position++);
+                    int spanCount = unpacker.unpackArrayHeader();
+                    assertEquals(expectedTrace.size(), spanCount);
+                    for (int k = 0; k < spanCount; ++k) {
+                        PojoSpan expectedSpan = expectedTrace.get(k);
+                        int elementCount = unpacker.unpackMapHeader();
+                        boolean hasMetaStruct = !expectedSpan.getMetaStruct().isEmpty();
+                        assertEquals(hasMetaStruct ? 13 : 12, elementCount);
+                        assertEquals("service", unpacker.unpackString());
+                        String serviceName = unpacker.unpackString();
+                        assertEqualsWithNullAsEmpty(expectedSpan.getServiceName(), serviceName);
+                        assertEquals("name", unpacker.unpackString());
+                        String operationName = unpacker.unpackString();
+                        assertEqualsWithNullAsEmpty(expectedSpan.getOperationName(), operationName);
+                        assertEquals("resource", unpacker.unpackString());
+                        String resourceName = unpacker.unpackString();
+                        assertEqualsWithNullAsEmpty(expectedSpan.getResourceName(), resourceName);
+                        assertEquals("trace_id", unpacker.unpackString());
+                        long traceId = unpacker.unpackValue().asNumberValue().toLong();
+                        assertEquals(expectedSpan.getTraceId().toLong(), traceId);
+                        assertEquals("span_id", unpacker.unpackString());
+                        long spanId = unpacker.unpackValue().asNumberValue().toLong();
+                        assertEquals(expectedSpan.getSpanId(), spanId);
+                        assertEquals("parent_id", unpacker.unpackString());
+                        long parentId = unpacker.unpackValue().asNumberValue().toLong();
+                        assertEquals(expectedSpan.getParentId(), parentId);
+                        assertEquals("start", unpacker.unpackString());
+                        long startTime = unpacker.unpackLong();
+                        assertEquals(expectedSpan.getStartTime(), startTime);
+                        assertEquals("duration", unpacker.unpackString());
+                        long duration = unpacker.unpackLong();
+                        assertEquals(expectedSpan.getDurationNano(), duration);
+                        assertEquals("type", unpacker.unpackString());
+                        String type = unpacker.unpackString();
+                        assertEquals(expectedSpan.getType(), type);
+                        assertEquals("error", unpacker.unpackString());
+                        int error = unpacker.unpackInt();
+                        assertEquals(expectedSpan.getError(), error);
+                        assertEquals("metrics", unpacker.unpackString());
+                        int metricsSize = unpacker.unpackMapHeader();
+                        HashMap<String, Number> metrics = new HashMap<>();
+                        for (int j = 0; j < metricsSize; ++j) {
+                            String key = unpacker.unpackString();
+                            Number n = unpackNumber(unpacker, key);
+                            if (DD_MEASURED.toString().equals(key)) {
+                                assertTrue(
+                                        (n.intValue() == 1 && expectedSpan.isMeasured()) || !expectedSpan.isMeasured());
+                            } else if (DDSpanContext.PRIORITY_SAMPLING_KEY.equals(key)) {
+                                // check that priority sampling is only on first and last span
+                                if (k == 0 || k == spanCount - 1) {
+                                    assertEquals(expectedSpan.samplingPriority(), n.intValue());
+                                } else {
+                                    assertFalse(expectedSpan.hasSamplingPriority());
+                                }
+                            } else {
+                                metrics.put(key, n);
+                            }
+                        }
+                        for (Map.Entry<String, Number> metric : metrics.entrySet()) {
+                            if (metric.getValue() instanceof Double || metric.getValue() instanceof Float) {
+                                assertEquals(
+                                        ((Number) expectedSpan.getTag(metric.getKey())).doubleValue(),
+                                        metric.getValue().doubleValue(),
+                                        0.001);
+                            } else {
+                                // Integer-typed metrics round-trip through msgpack's minimal encoding, so a Long
+                                // tag can come back as an Integer (and vice versa). Compare numerically.
+                                assertEquals(
+                                        ((Number) expectedSpan.getTag(metric.getKey())).longValue(),
+                                        metric.getValue().longValue());
+                            }
+                        }
+                        assertEquals("meta", unpacker.unpackString());
+                        int metaSize = unpacker.unpackMapHeader();
+                        HashMap<String, String> meta = new HashMap<>();
+                        for (int j = 0; j < metaSize; ++j) {
+                            meta.put(unpacker.unpackString(), unpacker.unpackString());
+                        }
+                        for (Map.Entry<String, String> entry : meta.entrySet()) {
+                            if (Tags.HTTP_STATUS.equals(entry.getKey())) {
+                                assertEquals(String.valueOf(expectedSpan.getHttpStatusCode()), entry.getValue());
+                            } else if (DDTags.ORIGIN_KEY.equals(entry.getKey())) {
+                                assertEquals(expectedSpan.getOrigin(), entry.getValue());
+                            } else if (DDTags.PROCESS_TAGS.equals(entry.getKey())) {
+                                assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled());
+                                assertEquals(0, k);
+                                assertEquals(
+                                        ProcessTags.getTagsForSerialization().toString(), entry.getValue());
+                                processTagsCount++;
+                            } else if (DDTags.SDK_OTLP_EXPORT.equals(entry.getKey())) {
+                                // Payload-scoped: only the first span of the first non-empty chunk carries it.
+                                otlpExportCount++;
+                                assertEquals(0, k);
+                                assertEquals(expectedOtlpExport, entry.getValue());
+                                // `position` was post-incremented when this trace was picked up, so the current
+                                // trace's payload-spanning index is `position - 1`.
+                                otlpExportTraceIndex = position - 1;
+                            } else {
+                                Object tag = expectedSpan.getTag(entry.getKey());
+                                if (tag != null) {
+                                    assertEquals(String.valueOf(tag), entry.getValue());
+                                } else {
+                                    assertEquals(expectedSpan.getBaggage().get(entry.getKey()), entry.getValue());
+                                }
+                            }
+                        }
+                        if (hasMetaStruct) {
+                            Map<String, Object> metaStruct = expectedSpan.getMetaStruct();
+                            assertEquals("meta_struct", unpacker.unpackString());
+                            int metaStructSize = unpacker.unpackMapHeader();
+                            for (int j = 0; j < metaStructSize; ++j) {
+                                String field = unpacker.unpackString();
+                                if (metaStructVerifier != null) {
+                                    byte[] binary = new byte[unpacker.unpackBinaryHeader()];
+                                    unpacker.readPayload(binary);
+                                    metaStructVerifier.verify(metaStruct.get(field), binary);
+                                }
+                            }
+                        }
+                    }
                 }
-              }
+            } catch (IOException e) {
+                fail(e.getMessage());
+            } finally {
+                mapper.reset();
+                channel.resetForWriting();
+                assertEquals(Config.get().isExperimentalPropagateProcessTagsEnabled() ? 1 : 0, processTagsCount);
+                // exactly one _dd.sdk.otlp_export per payload, never per span
+                assertEquals(1, otlpExportCount);
             }
-          }
         }
-      } catch (IOException e) {
-        fail(e.getMessage());
-      } finally {
-        mapper.reset();
-        channel.resetForWriting();
-        assertEquals(
-            Config.get().isExperimentalPropagateProcessTagsEnabled() ? 1 : 0, processTagsCount);
-        // exactly one _dd.sdk.otlp_export per payload, never per span
-        assertEquals(1, otlpExportCount);
-      }
-    }
 
-    void verifyTracesConsumed() {
-      assertEquals(expectedTraces.size(), position);
+        void verifyTracesConsumed() {
+            assertEquals(expectedTraces.size(), position);
+        }
     }
-  }
 
-  @FunctionalInterface
-  private interface MetaStructVerifier<E> {
-    void verify(E expected, byte[] received) throws IOException;
-  }
+    @FunctionalInterface
+    private interface MetaStructVerifier<E> {
+        void verify(E expected, byte[] received) throws IOException;
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.java
index aada5c9bb7b..b229701d199 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.java
@@ -54,35 +54,33 @@
 @ExtendWith(WithConfigExtension.class)
 class TraceMapperV05PayloadTest {
 
-  // Keep the ProcessTags static in sync with the (per-test rebuilt) Config, the way DDSpecification
-  // did for the original Spock tests. Runs after WithConfigExtension has rebuilt Config.
-  @BeforeEach
-  void syncProcessTags() {
-    ProcessTags.reset(Config.get());
-  }
-
-  // A method-level @WithConfig below disables process tags, but WithConfigExtension only rebuilds
-  // Config after each test -- it does not reset the ProcessTags static. Reset it once the class is
-  // done so a disabled state can't leak into other tests sharing this Gradle JVM. By afterAll the
-  // extension has already restored Config to its defaults.
-  @AfterAll
-  static void resetProcessTags() {
-    ProcessTags.reset(Config.get());
-  }
-
-  // disable process tags since they are only on the first span of the chunk otherwise the
-  // calculation woes
-  @Test
-  @WithConfig(key = EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, value = "false")
-  void bodyOverflowCausesAFlush() {
-    // 4x 36 ASCII characters and 2 bytes of msgpack string prefix
-    int dictionarySpacePerTrace = 4 * (36 + 2);
-    // enough space for two traces with distinct string values, plus the header
-    int dictionarySize = dictionarySpacePerTrace * 2 + 5;
-    TraceMapperV0_5 traceMapper = new TraceMapperV0_5(dictionarySize);
-    List<PojoSpan> repeatedTrace =
-        Collections.singletonList(
-            new PojoSpan(
+    // Keep the ProcessTags static in sync with the (per-test rebuilt) Config, the way DDSpecification
+    // did for the original Spock tests. Runs after WithConfigExtension has rebuilt Config.
+    @BeforeEach
+    void syncProcessTags() {
+        ProcessTags.reset(Config.get());
+    }
+
+    // A method-level @WithConfig below disables process tags, but WithConfigExtension only rebuilds
+    // Config after each test -- it does not reset the ProcessTags static. Reset it once the class is
+    // done so a disabled state can't leak into other tests sharing this Gradle JVM. By afterAll the
+    // extension has already restored Config to its defaults.
+    @AfterAll
+    static void resetProcessTags() {
+        ProcessTags.reset(Config.get());
+    }
+
+    // disable process tags since they are only on the first span of the chunk otherwise the
+    // calculation woes
+    @Test
+    @WithConfig(key = EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, value = "false")
+    void bodyOverflowCausesAFlush() {
+        // 4x 36 ASCII characters and 2 bytes of msgpack string prefix
+        int dictionarySpacePerTrace = 4 * (36 + 2);
+        // enough space for two traces with distinct string values, plus the header
+        int dictionarySize = dictionarySpacePerTrace * 2 + 5;
+        TraceMapperV0_5 traceMapper = new TraceMapperV0_5(dictionarySize);
+        List<PojoSpan> repeatedTrace = Collections.singletonList(new PojoSpan(
                 UUID.randomUUID().toString(),
                 UUID.randomUUID().toString(),
                 UUID.randomUUID().toString(),
@@ -99,369 +97,361 @@ void bodyOverflowCausesAFlush() {
                 PrioritySampling.UNSET,
                 0,
                 null));
-    // The first trace of a payload is larger: it carries the payload-scoped _dd.sdk.otlp_export
-    // marker on its first span. Size both cases so the overflow point is exact.
-    int firstTraceSize = calculateSize(repeatedTrace, true);
-    int traceSize = calculateSize(repeatedTrace, false);
-    // 30KB body
-    int bufferSize = 30 << 10;
-    int tracesThatFitInBody = 1 + (bufferSize - firstTraceSize) / traceSize;
-    int tracesRequiredToOverflowBody = tracesThatFitInBody + 1;
-    List<List<PojoSpan>> traces = new ArrayList<>(tracesRequiredToOverflowBody);
-    for (int i = 0; i < tracesRequiredToOverflowBody; ++i) {
-      traces.add(repeatedTrace);
-    }
-    // the last one won't be flushed
-    List<List<PojoSpan>> flushedTraces = new ArrayList<>(traces);
-    flushedTraces.remove(traces.size() - 1);
-    // need space for the overflowing buffer, the dictionary, and two small array headers
-    PayloadVerifier verifier =
-        new PayloadVerifier(flushedTraces, traceMapper, bufferSize + dictionarySize + 1 + 1 + 5);
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier));
-    for (List<PojoSpan> trace : traces) {
-      packer.format(trace, traceMapper);
-    }
-    verifier.verifyTracesConsumed();
-  }
-
-  @ParameterizedTest(name = "buffer={0} dict={1} traces={2} lowCardinality={3}")
-  @MethodSource("dictionaryCompressedTracesWrittenCorrectlyArguments")
-  void dictionaryCompressedTracesWrittenCorrectly(
-      int bufferSize, int dictionarySize, int traceCount, boolean lowCardinality) {
-    List<List<PojoSpan>> traces = generateRandomTraces(traceCount, lowCardinality);
-    TraceMapperV0_5 traceMapper = new TraceMapperV0_5(dictionarySize);
-    PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper);
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier));
-    boolean tracesFitInBuffer = true;
-    for (List<PojoSpan> trace : traces) {
-      if (!packer.format(trace, traceMapper)) {
-        verifier.skipLargeTrace();
-        tracesFitInBuffer = false;
-      }
+        // The first trace of a payload is larger: it carries the payload-scoped _dd.sdk.otlp_export
+        // marker on its first span. Size both cases so the overflow point is exact.
+        int firstTraceSize = calculateSize(repeatedTrace, true);
+        int traceSize = calculateSize(repeatedTrace, false);
+        // 30KB body
+        int bufferSize = 30 << 10;
+        int tracesThatFitInBody = 1 + (bufferSize - firstTraceSize) / traceSize;
+        int tracesRequiredToOverflowBody = tracesThatFitInBody + 1;
+        List<List<PojoSpan>> traces = new ArrayList<>(tracesRequiredToOverflowBody);
+        for (int i = 0; i < tracesRequiredToOverflowBody; ++i) {
+            traces.add(repeatedTrace);
+        }
+        // the last one won't be flushed
+        List<List<PojoSpan>> flushedTraces = new ArrayList<>(traces);
+        flushedTraces.remove(traces.size() - 1);
+        // need space for the overflowing buffer, the dictionary, and two small array headers
+        PayloadVerifier verifier =
+                new PayloadVerifier(flushedTraces, traceMapper, bufferSize + dictionarySize + 1 + 1 + 5);
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier));
+        for (List<PojoSpan> trace : traces) {
+            packer.format(trace, traceMapper);
+        }
+        verifier.verifyTracesConsumed();
     }
-    packer.flush();
-    if (tracesFitInBuffer) {
-      verifier.verifyTracesConsumed();
+
+    @ParameterizedTest(name = "buffer={0} dict={1} traces={2} lowCardinality={3}")
+    @MethodSource("dictionaryCompressedTracesWrittenCorrectlyArguments")
+    void dictionaryCompressedTracesWrittenCorrectly(
+            int bufferSize, int dictionarySize, int traceCount, boolean lowCardinality) {
+        List<List<PojoSpan>> traces = generateRandomTraces(traceCount, lowCardinality);
+        TraceMapperV0_5 traceMapper = new TraceMapperV0_5(dictionarySize);
+        PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper);
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier));
+        boolean tracesFitInBuffer = true;
+        for (List<PojoSpan> trace : traces) {
+            if (!packer.format(trace, traceMapper)) {
+                verifier.skipLargeTrace();
+                tracesFitInBuffer = false;
+            }
+        }
+        packer.flush();
+        if (tracesFitInBuffer) {
+            verifier.verifyTracesConsumed();
+        }
     }
-  }
-
-  private static Stream<Arguments> dictionaryCompressedTracesWrittenCorrectlyArguments() {
-    return Stream.of(
-        arguments(10 << 10, 10 << 10, 0, true),
-        arguments(10 << 10, 10 << 10, 1, true),
-        arguments(10 << 10, 10 << 10, 10, true),
-        arguments(10 << 10, 10 << 10, 100, true),
-        arguments(10 << 10, 100 << 10, 1, true),
-        arguments(10 << 10, 100 << 10, 10, true),
-        arguments(10 << 10, 100 << 10, 100, true),
-        arguments(10 << 10, 10 << 10, 0, false),
-        arguments(10 << 10, 10 << 10, 1, false),
-        arguments(10 << 10, 10 << 10, 10, false),
-        arguments(10 << 10, 10 << 10, 100, false),
-        arguments(10 << 10, 100 << 10, 1, false),
-        arguments(10 << 10, 100 << 10, 10, false),
-        arguments(10 << 10, 100 << 10, 100, false),
-        arguments(100 << 10, 10 << 10, 0, true),
-        arguments(100 << 10, 10 << 10, 1, true),
-        arguments(100 << 10, 10 << 10, 10, true),
-        arguments(100 << 10, 10 << 10, 100, true),
-        arguments(100 << 10, 100 << 10, 1, true),
-        arguments(100 << 10, 100 << 10, 10, true),
-        arguments(100 << 10, 100 << 10, 100, true),
-        arguments(100 << 10, 10 << 10, 0, false),
-        arguments(100 << 10, 10 << 10, 1, false),
-        arguments(100 << 10, 10 << 10, 10, false),
-        arguments(100 << 10, 10 << 10, 100, false),
-        arguments(100 << 10, 100 << 10, 1, false),
-        arguments(100 << 10, 100 << 10, 10, false),
-        arguments(100 << 10, 100 << 10, 1000, false));
-  }
-
-  @Test
-  void processTagsSerialization() {
-    assertNotNull(ProcessTags.getTagsForSerialization());
-    List<PojoSpan> spans = new ArrayList<>();
-    for (long spanId = 1; spanId <= 2; ++spanId) {
-      spans.add(plainSpan(spanId));
+
+    private static Stream<Arguments> dictionaryCompressedTracesWrittenCorrectlyArguments() {
+        return Stream.of(
+                arguments(10 << 10, 10 << 10, 0, true),
+                arguments(10 << 10, 10 << 10, 1, true),
+                arguments(10 << 10, 10 << 10, 10, true),
+                arguments(10 << 10, 10 << 10, 100, true),
+                arguments(10 << 10, 100 << 10, 1, true),
+                arguments(10 << 10, 100 << 10, 10, true),
+                arguments(10 << 10, 100 << 10, 100, true),
+                arguments(10 << 10, 10 << 10, 0, false),
+                arguments(10 << 10, 10 << 10, 1, false),
+                arguments(10 << 10, 10 << 10, 10, false),
+                arguments(10 << 10, 10 << 10, 100, false),
+                arguments(10 << 10, 100 << 10, 1, false),
+                arguments(10 << 10, 100 << 10, 10, false),
+                arguments(10 << 10, 100 << 10, 100, false),
+                arguments(100 << 10, 10 << 10, 0, true),
+                arguments(100 << 10, 10 << 10, 1, true),
+                arguments(100 << 10, 10 << 10, 10, true),
+                arguments(100 << 10, 10 << 10, 100, true),
+                arguments(100 << 10, 100 << 10, 1, true),
+                arguments(100 << 10, 100 << 10, 10, true),
+                arguments(100 << 10, 100 << 10, 100, true),
+                arguments(100 << 10, 10 << 10, 0, false),
+                arguments(100 << 10, 10 << 10, 1, false),
+                arguments(100 << 10, 10 << 10, 10, false),
+                arguments(100 << 10, 10 << 10, 100, false),
+                arguments(100 << 10, 100 << 10, 1, false),
+                arguments(100 << 10, 100 << 10, 10, false),
+                arguments(100 << 10, 100 << 10, 1000, false));
     }
 
-    List<List<PojoSpan>> traces = Collections.singletonList(spans);
-    TraceMapperV0_5 traceMapper = new TraceMapperV0_5();
-    PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper);
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(20 << 10, verifier));
-
-    packer.format(spans, traceMapper);
-    packer.flush();
-
-    verifier.verifyTracesConsumed();
-  }
-
-  /**
-   * v0.5 has no payload-level field, so the export-mode marker rides on the first span of the first
-   * non-empty chunk and the Agent hoists it onto {@code TracerPayload.tags}.
-   */
-  @Test
-  void otlpExportMarkerOnlyOnFirstSpanOfFirstNonEmptyChunk() {
-    List<List<PojoSpan>> traces =
-        Arrays.asList(
-            Collections.emptyList(),
-            Arrays.asList(plainSpan(1), plainSpan(2)),
-            Collections.singletonList(plainSpan(3)));
-    TraceMapperV0_5 traceMapper = new TraceMapperV0_5();
-    PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper);
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(200 << 10, verifier));
-
-    for (List<PojoSpan> trace : traces) {
-      assertTrue(packer.format(trace, traceMapper));
+    @Test
+    void processTagsSerialization() {
+        assertNotNull(ProcessTags.getTagsForSerialization());
+        List<PojoSpan> spans = new ArrayList<>();
+        for (long spanId = 1; spanId <= 2; ++spanId) {
+            spans.add(plainSpan(spanId));
+        }
+
+        List<List<PojoSpan>> traces = Collections.singletonList(spans);
+        TraceMapperV0_5 traceMapper = new TraceMapperV0_5();
+        PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper);
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(20 << 10, verifier));
+
+        packer.format(spans, traceMapper);
+        packer.flush();
+
+        verifier.verifyTracesConsumed();
     }
-    packer.flush();
-
-    verifier.verifyTracesConsumed();
-    // The verifier already asserts exactly one marker per payload, that it sits on span 0 and that
-    // it holds the expected value; pin down *which chunk* it landed on: the first NON-EMPTY one,
-    // not the leading empty one and not a later one.
-    assertEquals(1, verifier.otlpExportTraceIndex());
-  }
-
-  @Test
-  @WithConfig(
-      key = WRITER_TYPE,
-      value = MULTI_WRITER_TYPE + ":" + OTLP_WRITER_TYPE + ",DDAgentWriter")
-  void otlpExportMarkerIsTrueWhenAlsoExportingOverOtlp() {
-    List<List<PojoSpan>> traces =
-        Collections.singletonList(Collections.singletonList(plainSpan(1)));
-    TraceMapperV0_5 traceMapper = new TraceMapperV0_5();
-    PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper).expectOtlpExport("true");
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(200 << 10, verifier));
-
-    packer.format(traces.get(0), traceMapper);
-    packer.flush();
-
-    verifier.verifyTracesConsumed();
-    assertEquals(0, verifier.otlpExportTraceIndex());
-  }
-
-  private static PojoSpan plainSpan(long spanId) {
-    return new PojoSpan(
-        "service",
-        "operation",
-        "resource",
-        DDTraceId.ONE,
-        spanId,
-        -1L,
-        123L,
-        456L,
-        0,
-        Collections.emptyMap(),
-        Collections.emptyMap(),
-        "type",
-        false,
-        0,
-        0,
-        "origin");
-  }
-
-  private static final class PayloadVerifier implements ByteBufferConsumer {
-
-    private final List<List<PojoSpan>> expectedTraces;
-    private final TraceMapperV0_5 mapper;
-    private final PayloadVerifiers.CapturingChannel channel;
-
-    private int position = 0;
-
-    /** Expected value of the payload-scoped {@code _dd.sdk.otlp_export} marker. */
-    private String expectedOtlpExport = "false";
 
     /**
-     * Payload-spanning index of the chunk the marker was last seen on, or {@code -1} if it was
-     * never seen. The span index within that chunk is not tracked: {@link #accept} already asserts
-     * the marker only ever rides span 0.
+     * v0.5 has no payload-level field, so the export-mode marker rides on the first span of the first
+     * non-empty chunk and the Agent hoists it onto {@code TracerPayload.tags}.
      */
-    private int otlpExportTraceIndex = -1;
+    @Test
+    void otlpExportMarkerOnlyOnFirstSpanOfFirstNonEmptyChunk() {
+        List<List<PojoSpan>> traces = Arrays.asList(
+                Collections.emptyList(),
+                Arrays.asList(plainSpan(1), plainSpan(2)),
+                Collections.singletonList(plainSpan(3)));
+        TraceMapperV0_5 traceMapper = new TraceMapperV0_5();
+        PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper);
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(200 << 10, verifier));
+
+        for (List<PojoSpan> trace : traces) {
+            assertTrue(packer.format(trace, traceMapper));
+        }
+        packer.flush();
 
-    private PayloadVerifier(List<List<PojoSpan>> traces, TraceMapperV0_5 mapper) {
-      this(traces, mapper, 200 << 10);
+        verifier.verifyTracesConsumed();
+        // The verifier already asserts exactly one marker per payload, that it sits on span 0 and that
+        // it holds the expected value; pin down *which chunk* it landed on: the first NON-EMPTY one,
+        // not the leading empty one and not a later one.
+        assertEquals(1, verifier.otlpExportTraceIndex());
     }
 
-    private PayloadVerifier(List<List<PojoSpan>> traces, TraceMapperV0_5 mapper, int size) {
-      this.expectedTraces = traces;
-      this.mapper = mapper;
-      this.channel = new PayloadVerifiers.CapturingChannel(size);
-    }
+    @Test
+    @WithConfig(key = WRITER_TYPE, value = MULTI_WRITER_TYPE + ":" + OTLP_WRITER_TYPE + ",DDAgentWriter")
+    void otlpExportMarkerIsTrueWhenAlsoExportingOverOtlp() {
+        List<List<PojoSpan>> traces = Collections.singletonList(Collections.singletonList(plainSpan(1)));
+        TraceMapperV0_5 traceMapper = new TraceMapperV0_5();
+        PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper).expectOtlpExport("true");
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(200 << 10, verifier));
 
-    /** Sets the expected {@code _dd.sdk.otlp_export} value (defaults to {@code "false"}). */
-    PayloadVerifier expectOtlpExport(String value) {
-      this.expectedOtlpExport = value;
-      return this;
-    }
+        packer.format(traces.get(0), traceMapper);
+        packer.flush();
 
-    int otlpExportTraceIndex() {
-      return otlpExportTraceIndex;
+        verifier.verifyTracesConsumed();
+        assertEquals(0, verifier.otlpExportTraceIndex());
     }
 
-    void skipLargeTrace() {
-      ++position;
+    private static PojoSpan plainSpan(long spanId) {
+        return new PojoSpan(
+                "service",
+                "operation",
+                "resource",
+                DDTraceId.ONE,
+                spanId,
+                -1L,
+                123L,
+                456L,
+                0,
+                Collections.emptyMap(),
+                Collections.emptyMap(),
+                "type",
+                false,
+                0,
+                0,
+                "origin");
     }
 
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {
-      if (expectedTraces.isEmpty() && messageCount == 0) {
-        return;
-      }
-      int processTagsCount = 0;
-      int otlpExportCount = 0;
-      try {
-        Payload payload = mapper.newPayload().withBody(messageCount, buffer);
-        payload.writeTo(channel);
-        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(channel.flipForReading());
-        int header = unpacker.unpackArrayHeader();
-        assertEquals(2, header);
-        int dictionarySize = unpacker.unpackArrayHeader();
-        String[] dictionary = new String[dictionarySize];
-        for (int i = 0; i < dictionary.length; ++i) {
-          dictionary[i] = unpacker.unpackString();
+    private static final class PayloadVerifier implements ByteBufferConsumer {
+
+        private final List<List<PojoSpan>> expectedTraces;
+        private final TraceMapperV0_5 mapper;
+        private final PayloadVerifiers.CapturingChannel channel;
+
+        private int position = 0;
+
+        /** Expected value of the payload-scoped {@code _dd.sdk.otlp_export} marker. */
+        private String expectedOtlpExport = "false";
+
+        /**
+         * Payload-spanning index of the chunk the marker was last seen on, or {@code -1} if it was
+         * never seen. The span index within that chunk is not tracked: {@link #accept} already asserts
+         * the marker only ever rides span 0.
+         */
+        private int otlpExportTraceIndex = -1;
+
+        private PayloadVerifier(List<List<PojoSpan>> traces, TraceMapperV0_5 mapper) {
+            this(traces, mapper, 200 << 10);
+        }
+
+        private PayloadVerifier(List<List<PojoSpan>> traces, TraceMapperV0_5 mapper, int size) {
+            this.expectedTraces = traces;
+            this.mapper = mapper;
+            this.channel = new PayloadVerifiers.CapturingChannel(size);
+        }
+
+        /** Sets the expected {@code _dd.sdk.otlp_export} value (defaults to {@code "false"}). */
+        PayloadVerifier expectOtlpExport(String value) {
+            this.expectedOtlpExport = value;
+            return this;
+        }
+
+        int otlpExportTraceIndex() {
+            return otlpExportTraceIndex;
         }
-        int traceCount = unpacker.unpackArrayHeader();
-        for (int i = 0; i < traceCount; ++i) {
-          List<PojoSpan> expectedTrace = expectedTraces.get(position++);
-          int spanCount = unpacker.unpackArrayHeader();
-          assertEquals(expectedTrace.size(), spanCount);
-          for (int k = 0; k < spanCount; ++k) {
-            PojoSpan expectedSpan = expectedTrace.get(k);
-            int elementCount = unpacker.unpackArrayHeader();
-            assertEquals(12, elementCount);
-            String serviceName = dictionary[unpacker.unpackInt()];
-            assertEqualsWithNullAsEmpty(expectedSpan.getServiceName(), serviceName);
-            String operationName = dictionary[unpacker.unpackInt()];
-            assertEqualsWithNullAsEmpty(expectedSpan.getOperationName(), operationName);
-            String resourceName = dictionary[unpacker.unpackInt()];
-            assertEqualsWithNullAsEmpty(expectedSpan.getResourceName(), resourceName);
-            long traceId = unpacker.unpackValue().asNumberValue().toLong();
-            assertEquals(expectedSpan.getTraceId().toLong(), traceId);
-            long spanId = unpacker.unpackValue().asNumberValue().toLong();
-            assertEquals(expectedSpan.getSpanId(), spanId);
-            long parentId = unpacker.unpackValue().asNumberValue().toLong();
-            assertEquals(expectedSpan.getParentId(), parentId);
-            long startTime = unpacker.unpackLong();
-            assertEquals(expectedSpan.getStartTime(), startTime);
-            long duration = unpacker.unpackLong();
-            assertEquals(expectedSpan.getDurationNano(), duration);
-            int error = unpacker.unpackInt();
-            assertEquals(expectedSpan.getError(), error);
-            int metaSize = unpacker.unpackMapHeader();
-            HashMap<String, String> meta = new HashMap<>();
-            for (int j = 0; j < metaSize; ++j) {
-              meta.put(dictionary[unpacker.unpackInt()], dictionary[unpacker.unpackInt()]);
+
+        void skipLargeTrace() {
+            ++position;
+        }
+
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {
+            if (expectedTraces.isEmpty() && messageCount == 0) {
+                return;
             }
-            for (Map.Entry<String, String> entry : meta.entrySet()) {
-              if (Tags.HTTP_STATUS.equals(entry.getKey())) {
-                assertEquals(String.valueOf(expectedSpan.getHttpStatusCode()), entry.getValue());
-              } else if (DDTags.ORIGIN_KEY.equals(entry.getKey())) {
-                assertEquals(expectedSpan.getOrigin(), entry.getValue());
-              } else if (DDTags.PROCESS_TAGS.equals(entry.getKey())) {
-                processTagsCount++;
-                assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled());
-                assertEquals(0, k);
-                assertEquals(ProcessTags.getTagsForSerialization().toString(), entry.getValue());
-              } else if (DDTags.SDK_OTLP_EXPORT.equals(entry.getKey())) {
-                // Payload-scoped: only the first span of the first non-empty chunk carries it.
-                otlpExportCount++;
-                assertEquals(0, k);
-                assertEquals(expectedOtlpExport, entry.getValue());
-                // `position` was post-incremented when this trace was picked up, so the current
-                // trace's payload-spanning index is `position - 1`.
-                otlpExportTraceIndex = position - 1;
-              } else {
-                Object tag = expectedSpan.getTag(entry.getKey());
-                if (tag != null) {
-                  assertEquals(String.valueOf(tag), entry.getValue());
-                } else {
-                  assertEquals(expectedSpan.getBaggage().get(entry.getKey()), entry.getValue());
+            int processTagsCount = 0;
+            int otlpExportCount = 0;
+            try {
+                Payload payload = mapper.newPayload().withBody(messageCount, buffer);
+                payload.writeTo(channel);
+                MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(channel.flipForReading());
+                int header = unpacker.unpackArrayHeader();
+                assertEquals(2, header);
+                int dictionarySize = unpacker.unpackArrayHeader();
+                String[] dictionary = new String[dictionarySize];
+                for (int i = 0; i < dictionary.length; ++i) {
+                    dictionary[i] = unpacker.unpackString();
                 }
-              }
-            }
-            int metricsSize = unpacker.unpackMapHeader();
-            HashMap<String, Number> metrics = new HashMap<>();
-            for (int j = 0; j < metricsSize; ++j) {
-              String key = dictionary[unpacker.unpackInt()];
-              Number n = unpackNumber(unpacker, key);
-              if (DD_MEASURED.toString().equals(key)) {
-                assertTrue(
-                    (n.intValue() == 1 && expectedSpan.isMeasured()) || !expectedSpan.isMeasured());
-              } else if (DDSpanContext.PRIORITY_SAMPLING_KEY.equals(key)) {
-                // check that priority sampling is only on first and last span
-                if (k == 0 || k == spanCount - 1) {
-                  assertEquals(expectedSpan.samplingPriority(), n.intValue());
-                } else {
-                  assertFalse(expectedSpan.hasSamplingPriority());
+                int traceCount = unpacker.unpackArrayHeader();
+                for (int i = 0; i < traceCount; ++i) {
+                    List<PojoSpan> expectedTrace = expectedTraces.get(position++);
+                    int spanCount = unpacker.unpackArrayHeader();
+                    assertEquals(expectedTrace.size(), spanCount);
+                    for (int k = 0; k < spanCount; ++k) {
+                        PojoSpan expectedSpan = expectedTrace.get(k);
+                        int elementCount = unpacker.unpackArrayHeader();
+                        assertEquals(12, elementCount);
+                        String serviceName = dictionary[unpacker.unpackInt()];
+                        assertEqualsWithNullAsEmpty(expectedSpan.getServiceName(), serviceName);
+                        String operationName = dictionary[unpacker.unpackInt()];
+                        assertEqualsWithNullAsEmpty(expectedSpan.getOperationName(), operationName);
+                        String resourceName = dictionary[unpacker.unpackInt()];
+                        assertEqualsWithNullAsEmpty(expectedSpan.getResourceName(), resourceName);
+                        long traceId = unpacker.unpackValue().asNumberValue().toLong();
+                        assertEquals(expectedSpan.getTraceId().toLong(), traceId);
+                        long spanId = unpacker.unpackValue().asNumberValue().toLong();
+                        assertEquals(expectedSpan.getSpanId(), spanId);
+                        long parentId = unpacker.unpackValue().asNumberValue().toLong();
+                        assertEquals(expectedSpan.getParentId(), parentId);
+                        long startTime = unpacker.unpackLong();
+                        assertEquals(expectedSpan.getStartTime(), startTime);
+                        long duration = unpacker.unpackLong();
+                        assertEquals(expectedSpan.getDurationNano(), duration);
+                        int error = unpacker.unpackInt();
+                        assertEquals(expectedSpan.getError(), error);
+                        int metaSize = unpacker.unpackMapHeader();
+                        HashMap<String, String> meta = new HashMap<>();
+                        for (int j = 0; j < metaSize; ++j) {
+                            meta.put(dictionary[unpacker.unpackInt()], dictionary[unpacker.unpackInt()]);
+                        }
+                        for (Map.Entry<String, String> entry : meta.entrySet()) {
+                            if (Tags.HTTP_STATUS.equals(entry.getKey())) {
+                                assertEquals(String.valueOf(expectedSpan.getHttpStatusCode()), entry.getValue());
+                            } else if (DDTags.ORIGIN_KEY.equals(entry.getKey())) {
+                                assertEquals(expectedSpan.getOrigin(), entry.getValue());
+                            } else if (DDTags.PROCESS_TAGS.equals(entry.getKey())) {
+                                processTagsCount++;
+                                assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled());
+                                assertEquals(0, k);
+                                assertEquals(
+                                        ProcessTags.getTagsForSerialization().toString(), entry.getValue());
+                            } else if (DDTags.SDK_OTLP_EXPORT.equals(entry.getKey())) {
+                                // Payload-scoped: only the first span of the first non-empty chunk carries it.
+                                otlpExportCount++;
+                                assertEquals(0, k);
+                                assertEquals(expectedOtlpExport, entry.getValue());
+                                // `position` was post-incremented when this trace was picked up, so the current
+                                // trace's payload-spanning index is `position - 1`.
+                                otlpExportTraceIndex = position - 1;
+                            } else {
+                                Object tag = expectedSpan.getTag(entry.getKey());
+                                if (tag != null) {
+                                    assertEquals(String.valueOf(tag), entry.getValue());
+                                } else {
+                                    assertEquals(expectedSpan.getBaggage().get(entry.getKey()), entry.getValue());
+                                }
+                            }
+                        }
+                        int metricsSize = unpacker.unpackMapHeader();
+                        HashMap<String, Number> metrics = new HashMap<>();
+                        for (int j = 0; j < metricsSize; ++j) {
+                            String key = dictionary[unpacker.unpackInt()];
+                            Number n = unpackNumber(unpacker, key);
+                            if (DD_MEASURED.toString().equals(key)) {
+                                assertTrue(
+                                        (n.intValue() == 1 && expectedSpan.isMeasured()) || !expectedSpan.isMeasured());
+                            } else if (DDSpanContext.PRIORITY_SAMPLING_KEY.equals(key)) {
+                                // check that priority sampling is only on first and last span
+                                if (k == 0 || k == spanCount - 1) {
+                                    assertEquals(expectedSpan.samplingPriority(), n.intValue());
+                                } else {
+                                    assertFalse(expectedSpan.hasSamplingPriority());
+                                }
+                            } else {
+                                metrics.put(key, n);
+                            }
+                        }
+                        for (Map.Entry<String, Number> metric : metrics.entrySet()) {
+                            if (metric.getValue() instanceof Double || metric.getValue() instanceof Float) {
+                                assertEquals(
+                                        ((Number) expectedSpan.getTag(metric.getKey())).doubleValue(),
+                                        metric.getValue().doubleValue(),
+                                        0.001,
+                                        metric.getKey());
+                            } else {
+                                // Integer-typed metrics round-trip through msgpack's minimal encoding, so a Long
+                                // tag can come back as an Integer (and vice versa). Compare numerically.
+                                assertEquals(
+                                        ((Number) expectedSpan.getTag(metric.getKey())).longValue(),
+                                        metric.getValue().longValue(),
+                                        metric.getKey());
+                            }
+                        }
+                        String type = dictionary[unpacker.unpackInt()];
+                        assertEquals(expectedSpan.getType(), type);
+                    }
                 }
-              } else {
-                metrics.put(key, n);
-              }
-            }
-            for (Map.Entry<String, Number> metric : metrics.entrySet()) {
-              if (metric.getValue() instanceof Double || metric.getValue() instanceof Float) {
-                assertEquals(
-                    ((Number) expectedSpan.getTag(metric.getKey())).doubleValue(),
-                    metric.getValue().doubleValue(),
-                    0.001,
-                    metric.getKey());
-              } else {
-                // Integer-typed metrics round-trip through msgpack's minimal encoding, so a Long
-                // tag can come back as an Integer (and vice versa). Compare numerically.
-                assertEquals(
-                    ((Number) expectedSpan.getTag(metric.getKey())).longValue(),
-                    metric.getValue().longValue(),
-                    metric.getKey());
-              }
+            } catch (IOException e) {
+                fail(e.getMessage());
+            } finally {
+                // Reset before asserting: a failing assertion here must not leave the mapper and channel
+                // dirty for the next payload of a multi-payload test.
+                mapper.reset();
+                channel.resetForWriting();
+                assertEquals(Config.get().isExperimentalPropagateProcessTagsEnabled() ? 1 : 0, processTagsCount);
+                // exactly one _dd.sdk.otlp_export per payload, never per span
+                assertEquals(1, otlpExportCount);
             }
-            String type = dictionary[unpacker.unpackInt()];
-            assertEquals(expectedSpan.getType(), type);
-          }
         }
-      } catch (IOException e) {
-        fail(e.getMessage());
-      } finally {
-        // Reset before asserting: a failing assertion here must not leave the mapper and channel
-        // dirty for the next payload of a multi-payload test.
-        mapper.reset();
-        channel.resetForWriting();
-        assertEquals(
-            Config.get().isExperimentalPropagateProcessTagsEnabled() ? 1 : 0, processTagsCount);
-        // exactly one _dd.sdk.otlp_export per payload, never per span
-        assertEquals(1, otlpExportCount);
-      }
-    }
 
-    void verifyTracesConsumed() {
-      assertEquals(expectedTraces.size(), position);
+        void verifyTracesConsumed() {
+            assertEquals(expectedTraces.size(), position);
+        }
     }
-  }
-
-  /**
-   * Serialized size of {@code trace}, either as the first trace of a payload (which carries the
-   * payload-scoped markers on its first span) or as any later trace.
-   */
-  private static int calculateSize(List<PojoSpan> trace, boolean firstInPayload) {
-    AtomicInteger size = new AtomicInteger();
-    MsgPackWriter packer =
-        new MsgPackWriter(
-            new FlushingBuffer(
-                1024,
-                new ByteBufferConsumer() {
-                  @Override
-                  public void accept(int messageCount, ByteBuffer buffer) {
-                    size.set(buffer.limit() - buffer.position());
-                  }
-                }));
-    TraceMapperV0_5 mapper = new TraceMapperV0_5(1024);
-    if (!firstInPayload) {
-      // burn the payload-scoped markers on a throwaway trace
-      packer.format(trace, mapper);
-      packer.flush();
+
+    /**
+     * Serialized size of {@code trace}, either as the first trace of a payload (which carries the
+     * payload-scoped markers on its first span) or as any later trace.
+     */
+    private static int calculateSize(List<PojoSpan> trace, boolean firstInPayload) {
+        AtomicInteger size = new AtomicInteger();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, new ByteBufferConsumer() {
+            @Override
+            public void accept(int messageCount, ByteBuffer buffer) {
+                size.set(buffer.limit() - buffer.position());
+            }
+        }));
+        TraceMapperV0_5 mapper = new TraceMapperV0_5(1024);
+        if (!firstInPayload) {
+            // burn the payload-scoped markers on a throwaway trace
+            packer.format(trace, mapper);
+            packer.flush();
+        }
+        packer.format(trace, mapper);
+        packer.flush();
+        return size.get();
     }
-    packer.format(trace, mapper);
-    packer.flush();
-    return size.get();
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV0_4RecalibrateTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV0_4RecalibrateTest.java
index 770b7422210..0bdc17281e6 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV0_4RecalibrateTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV0_4RecalibrateTest.java
@@ -6,26 +6,26 @@
 
 class TraceMapperV0_4RecalibrateTest {
 
-  @Test
-  void recalibratesOncePerInterval() {
-    final long interval = TraceMapperV0_4.RECALIBRATE_SPAN_INTERVAL;
+    @Test
+    void recalibratesOncePerInterval() {
+        final long interval = TraceMapperV0_4.RECALIBRATE_SPAN_INTERVAL;
 
-    // shouldRecalibrate() advances a shared counter, so assert a property that holds regardless of
-    // the starting value: any window of 2*interval consecutive spans crosses exactly two interval
-    // boundaries.
-    int recalibrations = 0;
-    for (long i = 0; i < 2 * interval; i++) {
-      if (TraceMapperV0_4.shouldRecalibrate()) {
-        recalibrations++;
-      }
+        // shouldRecalibrate() advances a shared counter, so assert a property that holds regardless of
+        // the starting value: any window of 2*interval consecutive spans crosses exactly two interval
+        // boundaries.
+        int recalibrations = 0;
+        for (long i = 0; i < 2 * interval; i++) {
+            if (TraceMapperV0_4.shouldRecalibrate()) {
+                recalibrations++;
+            }
+        }
+        assertEquals(2, recalibrations);
     }
-    assertEquals(2, recalibrations);
-  }
 
-  @Test
-  void intervalIsAPowerOfTwo() {
-    // shouldRecalibrate uses a bit mask, which is only correct for a power-of-two interval.
-    final long interval = TraceMapperV0_4.RECALIBRATE_SPAN_INTERVAL;
-    assertEquals(0, interval & (interval - 1), "RECALIBRATE_SPAN_INTERVAL must be a power of two");
-  }
+    @Test
+    void intervalIsAPowerOfTwo() {
+        // shouldRecalibrate uses a bit mask, which is only correct for a power-of-two interval.
+        final long interval = TraceMapperV0_4.RECALIBRATE_SPAN_INTERVAL;
+        assertEquals(0, interval & (interval - 1), "RECALIBRATE_SPAN_INTERVAL must be a power of two");
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.java
index 0da528e2eb4..ea5e5b09762 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.java
@@ -87,915 +87,891 @@
 @ExtendWith(WithConfigExtension.class)
 class TraceMapperV1PayloadTest {
 
-  private static final String DECISION_MAKER_TAG = "_dd.p.dm";
-
-  /** Every field the v1 payload header carries, mirroring {@code TraceMapperV1.buildHeader}. */
-  private static final Set<Integer> EXPECTED_PAYLOAD_FIELD_IDS =
-      new HashSet<>(
-          asList(
-              PayloadField.CONTAINER_ID,
-              PayloadField.LANGUAGE_NAME,
-              PayloadField.LANGUAGE_VERSION,
-              PayloadField.TRACER_VERSION,
-              PayloadField.RUNTIME_ID,
-              PayloadField.ENV,
-              PayloadField.HOSTNAME,
-              PayloadField.APP_VERSION,
-              PayloadField.ATTRIBUTES,
-              PayloadField.CHUNKS));
-
-  /** Every field a v1 span carries, mirroring {@code TraceMapperV1.encodeSpans}. */
-  private static final Set<Integer> EXPECTED_SPAN_FIELD_IDS =
-      new HashSet<>(
-          asList(
-              SpanField.SERVICE,
-              SpanField.NAME,
-              SpanField.RESOURCE,
-              SpanField.SPAN_ID,
-              SpanField.PARENT_ID,
-              SpanField.START,
-              SpanField.DURATION,
-              SpanField.ERROR,
-              SpanField.ATTRIBUTES,
-              SpanField.TYPE,
-              SpanField.LINKS,
-              SpanField.EVENTS,
-              SpanField.ENV,
-              SpanField.VERSION,
-              SpanField.COMPONENT,
-              SpanField.KIND));
-
-  // Keep the ProcessTags static in sync with the (per-test rebuilt) Config, the way DDSpecification
-  // did for the original Spock tests. Runs after WithConfigExtension has rebuilt Config.
-  @BeforeEach
-  void syncProcessTags() {
-    ProcessTags.reset(Config.get());
-  }
-
-  @TableTest({
-    "scenario                         | bufferSizeKb | traceCount | lowCardinality",
-    "no traces, low cardinality       | 20           | 0          | true          ",
-    "one trace, low cardinality       | 20           | 1          | true          ",
-    "two traces, low cardinality      | 30           | 2          | true          ",
-    "no traces, high cardinality      | 20           | 0          | false         ",
-    "one trace, high cardinality      | 20           | 1          | false         ",
-    "two traces, high cardinality     | 30           | 2          | false         ",
-    "ten traces, low cardinality      | 100          | 10         | true          ",
-    "hundred traces, high cardinality | 100          | 100        | false         "
-  })
-  void tracesWrittenCorrectly(
-      String scenario, int bufferSizeKb, int traceCount, boolean lowCardinality) {
-    List<List<PojoSpan>> traces = generateRandomTraces(traceCount, lowCardinality);
-    TraceMapperV1 traceMapper = new TraceMapperV1();
-    PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper);
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSizeKb << 10, verifier));
-
-    boolean tracesFitInBuffer = true;
-    for (List<PojoSpan> trace : traces) {
-      if (!packer.format(trace, traceMapper)) {
-        verifier.skipLargeTrace();
-        tracesFitInBuffer = false;
-      }
-    }
-    packer.flush();
-
-    if (tracesFitInBuffer) {
-      verifier.verifyTracesConsumed();
-    }
-  }
-
-  @Test
-  void endpointReturnsV1() {
-    assertEquals("v1.0", new TraceMapperV1().endpoint());
-  }
-
-  // expectedKind holds the wire values, which must stay in sync with TraceMapperV1.SPAN_KIND_*.
-  @TableTest({
-    "scenario               | spanKind | expectedKind",
-    "no span.kind tag       |          | 0           ",
-    "internal span kind     | internal | 1           ",
-    "server span kind       | server   | 2           ",
-    "client span kind       | client   | 3           ",
-    "producer span kind     | producer | 4           ",
-    "consumer span kind     | consumer | 5           ",
-    "unrecognized span kind | unknown  | 1           "
-  })
-  void spanKindValueConversion(String scenario, String spanKind, int expectedKind) {
-    assertEquals(expectedKind, TraceMapperV1.getSpanKindValue(spanKind));
-  }
-
-  @Test
-  void payloadContainsExpectedHeaderAndChunkFields() throws IOException {
-    Map<String, Object> tags = new HashMap<>();
-    tags.put(ENV, "prod");
-    tags.put(VERSION, "1.2.3");
-    tags.put(COMPONENT, "http-client");
-    tags.put(SPAN_KIND, SPAN_KIND_CLIENT);
-    tags.put("attr.string", "value");
-    tags.put("attr.bool", true);
-    tags.put("attr.number", 12.5d);
-    PojoSpan span =
-        new PojoSpan(
-            "service-a",
-            "operation-a",
-            "resource-a",
-            DDTraceId.ONE,
-            123L,
-            0L,
-            1000L,
-            2000L,
-            1,
-            singletonMap(DECISION_MAKER_TAG, "-3"),
-            tags,
-            "web",
-            false,
-            SAMPLER_KEEP,
-            200,
-            "rum");
-
-    byte[] encoded = serializeV1Payload(span);
-    List<String> stringTable = newStringTable();
-
-    try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded)) {
-      int payloadFieldCount = unpacker.unpackMapHeader();
-      Set<Integer> payloadFieldsSeen = new HashSet<>();
-      int chunkCount = -1;
-      Map<String, Object> payloadAttributes = null;
-
-      for (int i = 0; i < payloadFieldCount; i++) {
-        int fieldId = unpacker.unpackInt();
-        payloadFieldsSeen.add(fieldId);
-        if (fieldId == PayloadField.CHUNKS) {
-          chunkCount = unpacker.unpackArrayHeader();
-          assertEquals(1, chunkCount);
-          verifyChunk(unpacker, singletonList(span), stringTable);
-        } else if (fieldId == PayloadField.ATTRIBUTES) {
-          payloadAttributes = readAttributes(unpacker, stringTable);
-        } else {
-          skipPayloadField(unpacker, fieldId, stringTable);
+    private static final String DECISION_MAKER_TAG = "_dd.p.dm";
+
+    /** Every field the v1 payload header carries, mirroring {@code TraceMapperV1.buildHeader}. */
+    private static final Set<Integer> EXPECTED_PAYLOAD_FIELD_IDS = new HashSet<>(asList(
+            PayloadField.CONTAINER_ID,
+            PayloadField.LANGUAGE_NAME,
+            PayloadField.LANGUAGE_VERSION,
+            PayloadField.TRACER_VERSION,
+            PayloadField.RUNTIME_ID,
+            PayloadField.ENV,
+            PayloadField.HOSTNAME,
+            PayloadField.APP_VERSION,
+            PayloadField.ATTRIBUTES,
+            PayloadField.CHUNKS));
+
+    /** Every field a v1 span carries, mirroring {@code TraceMapperV1.encodeSpans}. */
+    private static final Set<Integer> EXPECTED_SPAN_FIELD_IDS = new HashSet<>(asList(
+            SpanField.SERVICE,
+            SpanField.NAME,
+            SpanField.RESOURCE,
+            SpanField.SPAN_ID,
+            SpanField.PARENT_ID,
+            SpanField.START,
+            SpanField.DURATION,
+            SpanField.ERROR,
+            SpanField.ATTRIBUTES,
+            SpanField.TYPE,
+            SpanField.LINKS,
+            SpanField.EVENTS,
+            SpanField.ENV,
+            SpanField.VERSION,
+            SpanField.COMPONENT,
+            SpanField.KIND));
+
+    // Keep the ProcessTags static in sync with the (per-test rebuilt) Config, the way DDSpecification
+    // did for the original Spock tests. Runs after WithConfigExtension has rebuilt Config.
+    @BeforeEach
+    void syncProcessTags() {
+        ProcessTags.reset(Config.get());
+    }
+
+    @TableTest({
+      "scenario                         | bufferSizeKb | traceCount | lowCardinality",
+      "no traces, low cardinality       | 20           | 0          | true          ",
+      "one trace, low cardinality       | 20           | 1          | true          ",
+      "two traces, low cardinality      | 30           | 2          | true          ",
+      "no traces, high cardinality      | 20           | 0          | false         ",
+      "one trace, high cardinality      | 20           | 1          | false         ",
+      "two traces, high cardinality     | 30           | 2          | false         ",
+      "ten traces, low cardinality      | 100          | 10         | true          ",
+      "hundred traces, high cardinality | 100          | 100        | false         "
+    })
+    void tracesWrittenCorrectly(String scenario, int bufferSizeKb, int traceCount, boolean lowCardinality) {
+        List<List<PojoSpan>> traces = generateRandomTraces(traceCount, lowCardinality);
+        TraceMapperV1 traceMapper = new TraceMapperV1();
+        PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper);
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSizeKb << 10, verifier));
+
+        boolean tracesFitInBuffer = true;
+        for (List<PojoSpan> trace : traces) {
+            if (!packer.format(trace, traceMapper)) {
+                verifier.skipLargeTrace();
+                tracesFitInBuffer = false;
+            }
         }
-      }
-
-      assertEquals(EXPECTED_PAYLOAD_FIELD_IDS.size(), payloadFieldCount);
-      assertEquals(EXPECTED_PAYLOAD_FIELD_IDS, payloadFieldsSeen);
-      assertEquals(1, chunkCount);
-      assertNotNull(payloadAttributes);
-      // The export-mode marker is payload-scoped and always written; process tags are conditional.
-      assertEquals("false", payloadAttributes.get(SDK_OTLP_EXPORT));
-      CharSequence processTags = ProcessTags.getTagsForSerialization();
-      if (processTags == null) {
-        assertEquals(1, payloadAttributes.size());
-      } else {
-        assertEquals(2, payloadAttributes.size());
-        assertEquals(processTags.toString(), payloadAttributes.get(PROCESS_TAGS));
-      }
-    }
-  }
-
-  /**
-   * v1 has a payload-level attribute map, so the export-mode marker lives there rather than on the
-   * first span the way v0.4/v0.5 must place it. The {@code "false"} default is covered by {@link
-   * #payloadContainsExpectedHeaderAndChunkFields()}, which also pins the attribute-map size.
-   */
-  @Test
-  @WithConfig(
-      key = WRITER_TYPE,
-      value = MULTI_WRITER_TYPE + ":" + OTLP_WRITER_TYPE + ",DDAgentWriter")
-  void otlpExportMarkerIsTrueWhenAlsoExportingOverOtlp() throws IOException {
-    Map<String, Object> attributes = readPayloadAttributes(serializeV1Payload(span(emptyMap())));
-
-    assertEquals("true", attributes.get(SDK_OTLP_EXPORT));
-  }
-
-  // expectedSamplingMechanism 0 is SamplingMechanism.DEFAULT.
-  @TableTest({
-    "scenario                      | decisionMakerTag | expectedSamplingMechanism",
-    "no _dd.p.dm tag               |                  | 0                        ",
-    "negative numeric value        | '-3'             | 3                        ",
-    "hashed prefix before the dash | '934086a686-7'   | 7                        ",
-    "unparseable value             | invalid          | 0                        "
-  })
-  void samplingMechanismNormalizationFromDecisionMaker(
-      String scenario, String decisionMakerTag, int expectedSamplingMechanism) throws IOException {
-    Map<String, String> baggage = new HashMap<>();
-    if (decisionMakerTag != null) {
-      baggage.put(DECISION_MAKER_TAG, decisionMakerTag);
-    }
-
-    byte[] encoded = serializeV1Payload(spanWithBaggage(baggage));
-
-    assertEquals(expectedSamplingMechanism, readFirstChunk(encoded).getSamplingMechanism());
-  }
-
-  @Test
-  void spanIdsAreEncodedAsUnsignedValues() throws IOException {
-    long spanId = Long.MIN_VALUE + 123L;
-    long parentId = Long.MIN_VALUE + 456L;
-
-    byte[] encoded = serializeV1Payload(spanWithIds(spanId, parentId));
-    List<String> stringTable = newStringTable();
-
-    Long actualSpanId = null;
-    Long actualParentId = null;
-    try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded)) {
-      int payloadFieldCount = unpacker.unpackMapHeader();
-      for (int i = 0; i < payloadFieldCount; i++) {
-        int payloadFieldId = unpacker.unpackInt();
-        if (payloadFieldId != PayloadField.CHUNKS) {
-          skipPayloadField(unpacker, payloadFieldId, stringTable);
-          continue;
+        packer.flush();
+
+        if (tracesFitInBuffer) {
+            verifier.verifyTracesConsumed();
         }
-        assertEquals(1, unpacker.unpackArrayHeader());
+    }
 
-        int chunkFieldCount = unpacker.unpackMapHeader();
-        for (int j = 0; j < chunkFieldCount; j++) {
-          int chunkFieldId = unpacker.unpackInt();
-          if (chunkFieldId != ChunkField.SPANS) {
-            skipChunkField(unpacker, chunkFieldId, stringTable);
-            continue;
-          }
-          assertEquals(1, unpacker.unpackArrayHeader());
-
-          int spanFieldCount = unpacker.unpackMapHeader();
-          for (int k = 0; k < spanFieldCount; k++) {
-            int spanFieldId = unpacker.unpackInt();
-            switch (spanFieldId) {
-              case SpanField.SPAN_ID:
-                actualSpanId = unpackUint64(unpacker);
-                break;
-              case SpanField.PARENT_ID:
-                actualParentId = unpackUint64(unpacker);
-                break;
-              default:
-                skipSpanField(unpacker, spanFieldId, stringTable);
+    @Test
+    void endpointReturnsV1() {
+        assertEquals("v1.0", new TraceMapperV1().endpoint());
+    }
+
+    // expectedKind holds the wire values, which must stay in sync with TraceMapperV1.SPAN_KIND_*.
+    @TableTest({
+      "scenario               | spanKind | expectedKind",
+      "no span.kind tag       |          | 0           ",
+      "internal span kind     | internal | 1           ",
+      "server span kind       | server   | 2           ",
+      "client span kind       | client   | 3           ",
+      "producer span kind     | producer | 4           ",
+      "consumer span kind     | consumer | 5           ",
+      "unrecognized span kind | unknown  | 1           "
+    })
+    void spanKindValueConversion(String scenario, String spanKind, int expectedKind) {
+        assertEquals(expectedKind, TraceMapperV1.getSpanKindValue(spanKind));
+    }
+
+    @Test
+    void payloadContainsExpectedHeaderAndChunkFields() throws IOException {
+        Map<String, Object> tags = new HashMap<>();
+        tags.put(ENV, "prod");
+        tags.put(VERSION, "1.2.3");
+        tags.put(COMPONENT, "http-client");
+        tags.put(SPAN_KIND, SPAN_KIND_CLIENT);
+        tags.put("attr.string", "value");
+        tags.put("attr.bool", true);
+        tags.put("attr.number", 12.5d);
+        PojoSpan span = new PojoSpan(
+                "service-a",
+                "operation-a",
+                "resource-a",
+                DDTraceId.ONE,
+                123L,
+                0L,
+                1000L,
+                2000L,
+                1,
+                singletonMap(DECISION_MAKER_TAG, "-3"),
+                tags,
+                "web",
+                false,
+                SAMPLER_KEEP,
+                200,
+                "rum");
+
+        byte[] encoded = serializeV1Payload(span);
+        List<String> stringTable = newStringTable();
+
+        try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded)) {
+            int payloadFieldCount = unpacker.unpackMapHeader();
+            Set<Integer> payloadFieldsSeen = new HashSet<>();
+            int chunkCount = -1;
+            Map<String, Object> payloadAttributes = null;
+
+            for (int i = 0; i < payloadFieldCount; i++) {
+                int fieldId = unpacker.unpackInt();
+                payloadFieldsSeen.add(fieldId);
+                if (fieldId == PayloadField.CHUNKS) {
+                    chunkCount = unpacker.unpackArrayHeader();
+                    assertEquals(1, chunkCount);
+                    verifyChunk(unpacker, singletonList(span), stringTable);
+                } else if (fieldId == PayloadField.ATTRIBUTES) {
+                    payloadAttributes = readAttributes(unpacker, stringTable);
+                } else {
+                    skipPayloadField(unpacker, fieldId, stringTable);
+                }
+            }
+
+            assertEquals(EXPECTED_PAYLOAD_FIELD_IDS.size(), payloadFieldCount);
+            assertEquals(EXPECTED_PAYLOAD_FIELD_IDS, payloadFieldsSeen);
+            assertEquals(1, chunkCount);
+            assertNotNull(payloadAttributes);
+            // The export-mode marker is payload-scoped and always written; process tags are conditional.
+            assertEquals("false", payloadAttributes.get(SDK_OTLP_EXPORT));
+            CharSequence processTags = ProcessTags.getTagsForSerialization();
+            if (processTags == null) {
+                assertEquals(1, payloadAttributes.size());
+            } else {
+                assertEquals(2, payloadAttributes.size());
+                assertEquals(processTags.toString(), payloadAttributes.get(PROCESS_TAGS));
             }
-          }
         }
-      }
-    }
-
-    assertEquals(spanId, actualSpanId);
-    assertEquals(parentId, actualParentId);
-  }
-
-  @Test
-  void spanLinksAreEncodedFromStructuredSpanLinks() throws IOException {
-    DDTraceId firstLinkTraceId = DDTraceId.fromHex("11223344556677889900aabbccddeeff");
-    long firstLinkSpanId = DDSpanId.fromHex("000000000000002a");
-    Map<String, String> firstLinkAttributes = new HashMap<>();
-    firstLinkAttributes.put("link.kind", "follows_from");
-    firstLinkAttributes.put("context_headers", "tracecontext");
-    DDTraceId secondLinkTraceId = DDTraceId.fromHex("00000000000000000000000000000001");
-    long secondLinkSpanId = DDSpanId.fromHex("0000000000000002");
-    List<AgentSpanLink> spanLinks = new ArrayList<>();
-    spanLinks.add(
-        new TestSpanLink(
-            firstLinkTraceId,
-            firstLinkSpanId,
-            (byte) 1,
-            "dd=s:1",
-            SpanAttributes.fromMap(firstLinkAttributes)));
-    spanLinks.add(
-        new TestSpanLink(secondLinkTraceId, secondLinkSpanId, (byte) 0, "", SpanAttributes.EMPTY));
-
-    List<V1SpanLink> links = readFirstSpan(serializeV1Payload(spanWithLinks(spanLinks))).getLinks();
-
-    assertEquals(2, links.size());
-    V1SpanLink firstLink = links.get(0);
-    assertArrayEquals(traceIdBytes(firstLinkTraceId), firstLink.getTraceId());
-    assertEquals(firstLinkSpanId, firstLink.getSpanId());
-    assertEquals("dd=s:1", firstLink.getTraceState());
-    assertEquals(1L, firstLink.getTraceFlags());
-    assertEquals(firstLinkAttributes, firstLink.getAttributes());
-
-    V1SpanLink secondLink = links.get(1);
-    assertArrayEquals(traceIdBytes(secondLinkTraceId), secondLink.getTraceId());
-    assertEquals(secondLinkSpanId, secondLink.getSpanId());
-    assertEquals("", secondLink.getTraceState());
-    assertEquals(0L, secondLink.getTraceFlags());
-    assertEquals(emptyMap(), secondLink.getAttributes());
-  }
-
-  @Test
-  void firstSpanTagsAreProcessedOnce() {
-    CountingPojoSpan firstSpan = new CountingPojoSpan("operation-a", "resource-a", 123L, 0L);
-    CountingPojoSpan secondSpan = new CountingPojoSpan("operation-b", "resource-b", 456L, 123L);
-    List<PojoSpan> trace = new ArrayList<>();
-    trace.add(firstSpan);
-    trace.add(secondSpan);
-
-    serializeV1Payload(trace);
-
-    assertEquals(1, firstSpan.processTagsAndBaggageCount);
-    assertEquals(1, secondSpan.processTagsAndBaggageCount);
-  }
-
-  @Test
-  void missingSpanLinksEncodeEmptyLinks() throws IOException {
-    byte[] encoded = serializeV1Payload(span(emptyMap()));
-
-    assertTrue(readFirstSpan(encoded).getLinks().isEmpty());
-  }
-
-  @Test
-  void spanEventsAreEncodedFromEventsTag() throws IOException {
-    Map<String, Object> firstEventAttributes = new HashMap<>();
-    firstEventAttributes.put("str", "v");
-    firstEventAttributes.put("int", 42L);
-    firstEventAttributes.put("double", 12.5d);
-    firstEventAttributes.put("bool", true);
-    firstEventAttributes.put("arr", asList("x", 7L, 2.5d, false));
-    Map<String, Object> firstEvent = new HashMap<>();
-    firstEvent.put("time_unix_nano", 1234567890L);
-    firstEvent.put("name", "event.one");
-    firstEvent.put("attributes", firstEventAttributes);
-    Map<String, Object> secondEvent = new HashMap<>();
-    secondEvent.put("time_unix_nano", 1234567891L);
-    secondEvent.put("name", "event.two");
-    PojoSpan span = span(singletonMap(SPAN_EVENTS, asList(firstEvent, secondEvent)));
-
-    List<V1SpanEvent> events = readFirstSpan(serializeV1Payload(span)).getEvents();
-
-    assertEquals(2, events.size());
-    V1SpanEvent firstDecodedEvent = events.get(0);
-    assertEquals(1234567890L, firstDecodedEvent.getTimeUnixNano());
-    assertEquals("event.one", firstDecodedEvent.getName());
-    Map<String, Object> firstDecodedAttributes = firstDecodedEvent.getAttributes();
-    assertEquals("v", firstDecodedAttributes.get("str"));
-    assertEquals(42L, firstDecodedAttributes.get("int"));
-    assertAttributeValueEquals(12.5d, firstDecodedAttributes.get("double"), "double");
-    assertEquals(true, firstDecodedAttributes.get("bool"));
-    assertEquals(asList("x", 7L, 2.5d, false), firstDecodedAttributes.get("arr"));
-
-    V1SpanEvent secondDecodedEvent = events.get(1);
-    assertEquals(1234567891L, secondDecodedEvent.getTimeUnixNano());
-    assertEquals("event.two", secondDecodedEvent.getName());
-    assertEquals(emptyMap(), secondDecodedEvent.getAttributes());
-  }
-
-  @Test
-  void malformedSpanEventsFallBackToEmptyEvents() throws IOException {
-    // a map instead of the expected list of events
-    PojoSpan span = span(singletonMap(SPAN_EVENTS, singletonMap("foo", "bar")));
-
-    assertTrue(readFirstSpan(serializeV1Payload(span)).getEvents().isEmpty());
-  }
-
-  @Test
-  void metaStructIsEncodedAsBytesAttribute() throws IOException {
-    PojoSpan span = span(emptyMap());
-    Map<String, Object> metaStructValue = new HashMap<>();
-    metaStructValue.put("foo", "bar");
-    metaStructValue.put("answer", 42L);
-    span.setMetaStruct("meta_key", metaStructValue);
-
-    Map<String, Object> attributes = readFirstSpan(serializeV1Payload(span)).getAttributes();
-    byte[] metaStructBytes = (byte[]) attributes.get("meta_key");
-    assertNotNull(metaStructBytes);
-
-    Map<String, Object> decodedMetaStruct = new HashMap<>();
-    try (MessageUnpacker metaStructUnpacker = MessagePack.newDefaultUnpacker(metaStructBytes)) {
-      int metaStructFieldCount = metaStructUnpacker.unpackMapHeader();
-      for (int i = 0; i < metaStructFieldCount; i++) {
-        String key = metaStructUnpacker.unpackString();
-        ValueType valueType = metaStructUnpacker.getNextFormat().getValueType();
-        switch (valueType) {
-          case INTEGER:
-            decodedMetaStruct.put(key, metaStructUnpacker.unpackLong());
-            break;
-          case STRING:
-            decodedMetaStruct.put(key, metaStructUnpacker.unpackString());
-            break;
-          default:
-            fail("Unexpected meta_struct value type for key " + key);
+    }
+
+    /**
+     * v1 has a payload-level attribute map, so the export-mode marker lives there rather than on the
+     * first span the way v0.4/v0.5 must place it. The {@code "false"} default is covered by {@link
+     * #payloadContainsExpectedHeaderAndChunkFields()}, which also pins the attribute-map size.
+     */
+    @Test
+    @WithConfig(key = WRITER_TYPE, value = MULTI_WRITER_TYPE + ":" + OTLP_WRITER_TYPE + ",DDAgentWriter")
+    void otlpExportMarkerIsTrueWhenAlsoExportingOverOtlp() throws IOException {
+        Map<String, Object> attributes = readPayloadAttributes(serializeV1Payload(span(emptyMap())));
+
+        assertEquals("true", attributes.get(SDK_OTLP_EXPORT));
+    }
+
+    // expectedSamplingMechanism 0 is SamplingMechanism.DEFAULT.
+    @TableTest({
+      "scenario                      | decisionMakerTag | expectedSamplingMechanism",
+      "no _dd.p.dm tag               |                  | 0                        ",
+      "negative numeric value        | '-3'             | 3                        ",
+      "hashed prefix before the dash | '934086a686-7'   | 7                        ",
+      "unparseable value             | invalid          | 0                        "
+    })
+    void samplingMechanismNormalizationFromDecisionMaker(
+            String scenario, String decisionMakerTag, int expectedSamplingMechanism) throws IOException {
+        Map<String, String> baggage = new HashMap<>();
+        if (decisionMakerTag != null) {
+            baggage.put(DECISION_MAKER_TAG, decisionMakerTag);
         }
-      }
-    }
-
-    assertEquals("bar", decodedMetaStruct.get("foo"));
-    assertEquals(42L, decodedMetaStruct.get("answer"));
-  }
-
-  @Test
-  void mapValuedSpanTagsAreFlattenedInAttributes() throws IOException {
-    Map<String, Object> user = new HashMap<>();
-    user.put("id", "123");
-    user.put("name", "alice");
-    user.put("authenticated", true);
-    user.put("profile", singletonMap("age", 30L));
-    Map<String, Object> loginMetadata = new HashMap<>();
-    loginMetadata.put("event", "login");
-    loginMetadata.put("attempts", 1L);
-    Map<String, Object> loginSuccess = new HashMap<>();
-    loginSuccess.put("metadata0", loginMetadata);
-    loginSuccess.put("metadata1", singletonMap("blocked", false));
-    Map<String, Object> tags = new HashMap<>();
-    tags.put("usr", user);
-    String loginSuccessTag = "appsec.events.users.login.success";
-    tags.put(loginSuccessTag, loginSuccess);
-
-    // status code 0 keeps the encoder from adding an http.status_code attribute
-    Map<String, Object> attributes =
-        readFirstSpan(serializeV1Payload(span(tags, 0))).getAttributes();
-
-    assertEquals("123", attributes.get("usr.id"));
-    assertEquals("alice", attributes.get("usr.name"));
-    assertEquals(true, attributes.get("usr.authenticated"));
-    assertAttributeValueEquals(30L, attributes.get("usr.profile.age"), "usr.profile.age");
-    assertEquals("login", attributes.get(loginSuccessTag + ".metadata0.event"));
-    assertAttributeValueEquals(
-        1L, attributes.get(loginSuccessTag + ".metadata0.attempts"), "attempts");
-    assertEquals(false, attributes.get(loginSuccessTag + ".metadata1.blocked"));
-    // the 7 flattened entries plus thread.id and thread.name, and nothing else
-    assertEquals(9, attributes.size());
-
-    // the map-valued tags themselves are replaced by their flattened entries
-    assertFalse(attributes.containsKey("usr"));
-    assertFalse(attributes.containsKey(loginSuccessTag));
-  }
-
-  @Test
-  void primitiveSpanTagsAreEncodedInAttributes() throws IOException {
-    Map<String, Object> tags = new HashMap<>();
-    tags.put("tag.bool", true);
-    tags.put("tag.int", 7);
-    tags.put("tag.long", 9L);
-    tags.put("tag.float", 3.5f);
-    tags.put("tag.double", 4.25d);
-
-    // status code 0 keeps the encoder from adding an http.status_code attribute
-    Map<String, Object> attributes =
-        readFirstSpan(serializeV1Payload(span(tags, 0))).getAttributes();
-
-    assertEquals(true, attributes.get("tag.bool"));
-    assertAttributeValueEquals(7, attributes.get("tag.int"), "tag.int");
-    assertAttributeValueEquals(9L, attributes.get("tag.long"), "tag.long");
-    assertAttributeValueEquals(3.5f, attributes.get("tag.float"), "tag.float");
-    assertAttributeValueEquals(4.25d, attributes.get("tag.double"), "tag.double");
-    // the 5 tags plus thread.id and thread.name, and nothing else
-    assertEquals(7, attributes.size());
-  }
-
-  @Test
-  void threadMetadataIsEncodedInAttributes() throws IOException {
-    // status code 0 keeps the encoder from adding an http.status_code attribute
-    PojoSpan span = span(emptyMap(), 0);
-
-    Map<String, Object> attributes = readFirstSpan(serializeV1Payload(span)).getAttributes();
-
-    assertAttributeValueEquals(span.getTag(THREAD_ID), attributes.get(THREAD_ID), THREAD_ID);
-    Object expectedThreadName = span.getTag(THREAD_NAME);
-    assertEquals(expectedThreadName.toString(), attributes.get(THREAD_NAME));
-    // thread metadata is all a tagless span encodes
-    assertEquals(2, attributes.size());
-  }
-
-  private static final class PayloadVerifier implements ByteBufferConsumer {
-
-    private final List<List<PojoSpan>> expectedTraces;
-    private final TraceMapperV1 mapper;
-    private final PayloadVerifiers.CapturingChannel channel =
-        new PayloadVerifiers.CapturingChannel(200 << 10);
-
-    private int position = 0;
-
-    private PayloadVerifier(List<List<PojoSpan>> expectedTraces, TraceMapperV1 mapper) {
-      this.expectedTraces = expectedTraces;
-      this.mapper = mapper;
-    }
-
-    void skipLargeTrace() {
-      ++position;
-    }
-
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {
-      if (expectedTraces.isEmpty() && messageCount == 0) {
-        return;
-      }
-      try {
-        Payload payload = mapper.newPayload().withBody(messageCount, buffer);
-        payload.writeTo(channel);
-        try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(channel.flipForReading())) {
-          if (messageCount == 0) {
-            assertEquals(0, unpacker.unpackMapHeader());
-            return;
-          }
 
-          List<String> stringTable = newStringTable();
-          int payloadFieldCount = unpacker.unpackMapHeader();
-          assertEquals(EXPECTED_PAYLOAD_FIELD_IDS.size(), payloadFieldCount);
+        byte[] encoded = serializeV1Payload(spanWithBaggage(baggage));
+
+        assertEquals(expectedSamplingMechanism, readFirstChunk(encoded).getSamplingMechanism());
+    }
+
+    @Test
+    void spanIdsAreEncodedAsUnsignedValues() throws IOException {
+        long spanId = Long.MIN_VALUE + 123L;
+        long parentId = Long.MIN_VALUE + 456L;
+
+        byte[] encoded = serializeV1Payload(spanWithIds(spanId, parentId));
+        List<String> stringTable = newStringTable();
+
+        Long actualSpanId = null;
+        Long actualParentId = null;
+        try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded)) {
+            int payloadFieldCount = unpacker.unpackMapHeader();
+            for (int i = 0; i < payloadFieldCount; i++) {
+                int payloadFieldId = unpacker.unpackInt();
+                if (payloadFieldId != PayloadField.CHUNKS) {
+                    skipPayloadField(unpacker, payloadFieldId, stringTable);
+                    continue;
+                }
+                assertEquals(1, unpacker.unpackArrayHeader());
+
+                int chunkFieldCount = unpacker.unpackMapHeader();
+                for (int j = 0; j < chunkFieldCount; j++) {
+                    int chunkFieldId = unpacker.unpackInt();
+                    if (chunkFieldId != ChunkField.SPANS) {
+                        skipChunkField(unpacker, chunkFieldId, stringTable);
+                        continue;
+                    }
+                    assertEquals(1, unpacker.unpackArrayHeader());
+
+                    int spanFieldCount = unpacker.unpackMapHeader();
+                    for (int k = 0; k < spanFieldCount; k++) {
+                        int spanFieldId = unpacker.unpackInt();
+                        switch (spanFieldId) {
+                            case SpanField.SPAN_ID:
+                                actualSpanId = unpackUint64(unpacker);
+                                break;
+                            case SpanField.PARENT_ID:
+                                actualParentId = unpackUint64(unpacker);
+                                break;
+                            default:
+                                skipSpanField(unpacker, spanFieldId, stringTable);
+                        }
+                    }
+                }
+            }
+        }
+
+        assertEquals(spanId, actualSpanId);
+        assertEquals(parentId, actualParentId);
+    }
+
+    @Test
+    void spanLinksAreEncodedFromStructuredSpanLinks() throws IOException {
+        DDTraceId firstLinkTraceId = DDTraceId.fromHex("11223344556677889900aabbccddeeff");
+        long firstLinkSpanId = DDSpanId.fromHex("000000000000002a");
+        Map<String, String> firstLinkAttributes = new HashMap<>();
+        firstLinkAttributes.put("link.kind", "follows_from");
+        firstLinkAttributes.put("context_headers", "tracecontext");
+        DDTraceId secondLinkTraceId = DDTraceId.fromHex("00000000000000000000000000000001");
+        long secondLinkSpanId = DDSpanId.fromHex("0000000000000002");
+        List<AgentSpanLink> spanLinks = new ArrayList<>();
+        spanLinks.add(new TestSpanLink(
+                firstLinkTraceId, firstLinkSpanId, (byte) 1, "dd=s:1", SpanAttributes.fromMap(firstLinkAttributes)));
+        spanLinks.add(new TestSpanLink(secondLinkTraceId, secondLinkSpanId, (byte) 0, "", SpanAttributes.EMPTY));
+
+        List<V1SpanLink> links =
+                readFirstSpan(serializeV1Payload(spanWithLinks(spanLinks))).getLinks();
+
+        assertEquals(2, links.size());
+        V1SpanLink firstLink = links.get(0);
+        assertArrayEquals(traceIdBytes(firstLinkTraceId), firstLink.getTraceId());
+        assertEquals(firstLinkSpanId, firstLink.getSpanId());
+        assertEquals("dd=s:1", firstLink.getTraceState());
+        assertEquals(1L, firstLink.getTraceFlags());
+        assertEquals(firstLinkAttributes, firstLink.getAttributes());
+
+        V1SpanLink secondLink = links.get(1);
+        assertArrayEquals(traceIdBytes(secondLinkTraceId), secondLink.getTraceId());
+        assertEquals(secondLinkSpanId, secondLink.getSpanId());
+        assertEquals("", secondLink.getTraceState());
+        assertEquals(0L, secondLink.getTraceFlags());
+        assertEquals(emptyMap(), secondLink.getAttributes());
+    }
+
+    @Test
+    void firstSpanTagsAreProcessedOnce() {
+        CountingPojoSpan firstSpan = new CountingPojoSpan("operation-a", "resource-a", 123L, 0L);
+        CountingPojoSpan secondSpan = new CountingPojoSpan("operation-b", "resource-b", 456L, 123L);
+        List<PojoSpan> trace = new ArrayList<>();
+        trace.add(firstSpan);
+        trace.add(secondSpan);
+
+        serializeV1Payload(trace);
+
+        assertEquals(1, firstSpan.processTagsAndBaggageCount);
+        assertEquals(1, secondSpan.processTagsAndBaggageCount);
+    }
+
+    @Test
+    void missingSpanLinksEncodeEmptyLinks() throws IOException {
+        byte[] encoded = serializeV1Payload(span(emptyMap()));
+
+        assertTrue(readFirstSpan(encoded).getLinks().isEmpty());
+    }
+
+    @Test
+    void spanEventsAreEncodedFromEventsTag() throws IOException {
+        Map<String, Object> firstEventAttributes = new HashMap<>();
+        firstEventAttributes.put("str", "v");
+        firstEventAttributes.put("int", 42L);
+        firstEventAttributes.put("double", 12.5d);
+        firstEventAttributes.put("bool", true);
+        firstEventAttributes.put("arr", asList("x", 7L, 2.5d, false));
+        Map<String, Object> firstEvent = new HashMap<>();
+        firstEvent.put("time_unix_nano", 1234567890L);
+        firstEvent.put("name", "event.one");
+        firstEvent.put("attributes", firstEventAttributes);
+        Map<String, Object> secondEvent = new HashMap<>();
+        secondEvent.put("time_unix_nano", 1234567891L);
+        secondEvent.put("name", "event.two");
+        PojoSpan span = span(singletonMap(SPAN_EVENTS, asList(firstEvent, secondEvent)));
+
+        List<V1SpanEvent> events = readFirstSpan(serializeV1Payload(span)).getEvents();
+
+        assertEquals(2, events.size());
+        V1SpanEvent firstDecodedEvent = events.get(0);
+        assertEquals(1234567890L, firstDecodedEvent.getTimeUnixNano());
+        assertEquals("event.one", firstDecodedEvent.getName());
+        Map<String, Object> firstDecodedAttributes = firstDecodedEvent.getAttributes();
+        assertEquals("v", firstDecodedAttributes.get("str"));
+        assertEquals(42L, firstDecodedAttributes.get("int"));
+        assertAttributeValueEquals(12.5d, firstDecodedAttributes.get("double"), "double");
+        assertEquals(true, firstDecodedAttributes.get("bool"));
+        assertEquals(asList("x", 7L, 2.5d, false), firstDecodedAttributes.get("arr"));
+
+        V1SpanEvent secondDecodedEvent = events.get(1);
+        assertEquals(1234567891L, secondDecodedEvent.getTimeUnixNano());
+        assertEquals("event.two", secondDecodedEvent.getName());
+        assertEquals(emptyMap(), secondDecodedEvent.getAttributes());
+    }
+
+    @Test
+    void malformedSpanEventsFallBackToEmptyEvents() throws IOException {
+        // a map instead of the expected list of events
+        PojoSpan span = span(singletonMap(SPAN_EVENTS, singletonMap("foo", "bar")));
+
+        assertTrue(readFirstSpan(serializeV1Payload(span)).getEvents().isEmpty());
+    }
+
+    @Test
+    void metaStructIsEncodedAsBytesAttribute() throws IOException {
+        PojoSpan span = span(emptyMap());
+        Map<String, Object> metaStructValue = new HashMap<>();
+        metaStructValue.put("foo", "bar");
+        metaStructValue.put("answer", 42L);
+        span.setMetaStruct("meta_key", metaStructValue);
+
+        Map<String, Object> attributes = readFirstSpan(serializeV1Payload(span)).getAttributes();
+        byte[] metaStructBytes = (byte[]) attributes.get("meta_key");
+        assertNotNull(metaStructBytes);
+
+        Map<String, Object> decodedMetaStruct = new HashMap<>();
+        try (MessageUnpacker metaStructUnpacker = MessagePack.newDefaultUnpacker(metaStructBytes)) {
+            int metaStructFieldCount = metaStructUnpacker.unpackMapHeader();
+            for (int i = 0; i < metaStructFieldCount; i++) {
+                String key = metaStructUnpacker.unpackString();
+                ValueType valueType = metaStructUnpacker.getNextFormat().getValueType();
+                switch (valueType) {
+                    case INTEGER:
+                        decodedMetaStruct.put(key, metaStructUnpacker.unpackLong());
+                        break;
+                    case STRING:
+                        decodedMetaStruct.put(key, metaStructUnpacker.unpackString());
+                        break;
+                    default:
+                        fail("Unexpected meta_struct value type for key " + key);
+                }
+            }
+        }
+
+        assertEquals("bar", decodedMetaStruct.get("foo"));
+        assertEquals(42L, decodedMetaStruct.get("answer"));
+    }
+
+    @Test
+    void mapValuedSpanTagsAreFlattenedInAttributes() throws IOException {
+        Map<String, Object> user = new HashMap<>();
+        user.put("id", "123");
+        user.put("name", "alice");
+        user.put("authenticated", true);
+        user.put("profile", singletonMap("age", 30L));
+        Map<String, Object> loginMetadata = new HashMap<>();
+        loginMetadata.put("event", "login");
+        loginMetadata.put("attempts", 1L);
+        Map<String, Object> loginSuccess = new HashMap<>();
+        loginSuccess.put("metadata0", loginMetadata);
+        loginSuccess.put("metadata1", singletonMap("blocked", false));
+        Map<String, Object> tags = new HashMap<>();
+        tags.put("usr", user);
+        String loginSuccessTag = "appsec.events.users.login.success";
+        tags.put(loginSuccessTag, loginSuccess);
+
+        // status code 0 keeps the encoder from adding an http.status_code attribute
+        Map<String, Object> attributes =
+                readFirstSpan(serializeV1Payload(span(tags, 0))).getAttributes();
+
+        assertEquals("123", attributes.get("usr.id"));
+        assertEquals("alice", attributes.get("usr.name"));
+        assertEquals(true, attributes.get("usr.authenticated"));
+        assertAttributeValueEquals(30L, attributes.get("usr.profile.age"), "usr.profile.age");
+        assertEquals("login", attributes.get(loginSuccessTag + ".metadata0.event"));
+        assertAttributeValueEquals(1L, attributes.get(loginSuccessTag + ".metadata0.attempts"), "attempts");
+        assertEquals(false, attributes.get(loginSuccessTag + ".metadata1.blocked"));
+        // the 7 flattened entries plus thread.id and thread.name, and nothing else
+        assertEquals(9, attributes.size());
+
+        // the map-valued tags themselves are replaced by their flattened entries
+        assertFalse(attributes.containsKey("usr"));
+        assertFalse(attributes.containsKey(loginSuccessTag));
+    }
+
+    @Test
+    void primitiveSpanTagsAreEncodedInAttributes() throws IOException {
+        Map<String, Object> tags = new HashMap<>();
+        tags.put("tag.bool", true);
+        tags.put("tag.int", 7);
+        tags.put("tag.long", 9L);
+        tags.put("tag.float", 3.5f);
+        tags.put("tag.double", 4.25d);
+
+        // status code 0 keeps the encoder from adding an http.status_code attribute
+        Map<String, Object> attributes =
+                readFirstSpan(serializeV1Payload(span(tags, 0))).getAttributes();
+
+        assertEquals(true, attributes.get("tag.bool"));
+        assertAttributeValueEquals(7, attributes.get("tag.int"), "tag.int");
+        assertAttributeValueEquals(9L, attributes.get("tag.long"), "tag.long");
+        assertAttributeValueEquals(3.5f, attributes.get("tag.float"), "tag.float");
+        assertAttributeValueEquals(4.25d, attributes.get("tag.double"), "tag.double");
+        // the 5 tags plus thread.id and thread.name, and nothing else
+        assertEquals(7, attributes.size());
+    }
+
+    @Test
+    void threadMetadataIsEncodedInAttributes() throws IOException {
+        // status code 0 keeps the encoder from adding an http.status_code attribute
+        PojoSpan span = span(emptyMap(), 0);
+
+        Map<String, Object> attributes = readFirstSpan(serializeV1Payload(span)).getAttributes();
+
+        assertAttributeValueEquals(span.getTag(THREAD_ID), attributes.get(THREAD_ID), THREAD_ID);
+        Object expectedThreadName = span.getTag(THREAD_NAME);
+        assertEquals(expectedThreadName.toString(), attributes.get(THREAD_NAME));
+        // thread metadata is all a tagless span encodes
+        assertEquals(2, attributes.size());
+    }
+
+    private static final class PayloadVerifier implements ByteBufferConsumer {
+
+        private final List<List<PojoSpan>> expectedTraces;
+        private final TraceMapperV1 mapper;
+        private final PayloadVerifiers.CapturingChannel channel = new PayloadVerifiers.CapturingChannel(200 << 10);
+
+        private int position = 0;
+
+        private PayloadVerifier(List<List<PojoSpan>> expectedTraces, TraceMapperV1 mapper) {
+            this.expectedTraces = expectedTraces;
+            this.mapper = mapper;
+        }
+
+        void skipLargeTrace() {
+            ++position;
+        }
+
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {
+            if (expectedTraces.isEmpty() && messageCount == 0) {
+                return;
+            }
+            try {
+                Payload payload = mapper.newPayload().withBody(messageCount, buffer);
+                payload.writeTo(channel);
+                try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(channel.flipForReading())) {
+                    if (messageCount == 0) {
+                        assertEquals(0, unpacker.unpackMapHeader());
+                        return;
+                    }
+
+                    List<String> stringTable = newStringTable();
+                    int payloadFieldCount = unpacker.unpackMapHeader();
+                    assertEquals(EXPECTED_PAYLOAD_FIELD_IDS.size(), payloadFieldCount);
+
+                    boolean seenChunks = false;
+                    for (int i = 0; i < payloadFieldCount; i++) {
+                        int fieldId = unpacker.unpackInt();
+                        if (fieldId == PayloadField.CHUNKS) {
+                            int traceCount = unpacker.unpackArrayHeader();
+                            assertEquals(messageCount, traceCount);
+                            seenChunks = true;
+                            for (int traceIndex = 0; traceIndex < traceCount; traceIndex++) {
+                                verifyChunk(unpacker, expectedTraces.get(position++), stringTable);
+                            }
+                        } else {
+                            skipPayloadField(unpacker, fieldId, stringTable);
+                        }
+                    }
+
+                    assertTrue(seenChunks);
+                }
+            } catch (IOException e) {
+                fail(e.getMessage());
+            } finally {
+                mapper.reset();
+                channel.resetForWriting();
+            }
+        }
+
+        void verifyTracesConsumed() {
+            assertEquals(expectedTraces.size(), position);
+        }
+    }
+
+    private static void verifyChunk(MessageUnpacker unpacker, List<PojoSpan> expectedTrace, List<String> stringTable)
+            throws IOException {
+        int chunkFieldCount = unpacker.unpackMapHeader();
+        assertEquals(6, chunkFieldCount);
 
-          boolean seenChunks = false;
-          for (int i = 0; i < payloadFieldCount; i++) {
+        Integer priority = null;
+        String origin = null;
+        Map<String, Object> chunkAttributes = null;
+        byte[] traceId = null;
+        Integer samplingMechanism = null;
+        boolean seenSpans = false;
+
+        for (int i = 0; i < chunkFieldCount; i++) {
             int fieldId = unpacker.unpackInt();
-            if (fieldId == PayloadField.CHUNKS) {
-              int traceCount = unpacker.unpackArrayHeader();
-              assertEquals(messageCount, traceCount);
-              seenChunks = true;
-              for (int traceIndex = 0; traceIndex < traceCount; traceIndex++) {
-                verifyChunk(unpacker, expectedTraces.get(position++), stringTable);
-              }
-            } else {
-              skipPayloadField(unpacker, fieldId, stringTable);
+            switch (fieldId) {
+                case ChunkField.PRIORITY:
+                    priority = unpacker.unpackInt();
+                    break;
+                case ChunkField.ORIGIN:
+                    origin = readStreamingString(unpacker, stringTable);
+                    break;
+                case ChunkField.ATTRIBUTES:
+                    chunkAttributes = readAttributes(unpacker, stringTable);
+                    break;
+                case ChunkField.SPANS:
+                    verifySpans(unpacker, expectedTrace, stringTable);
+                    seenSpans = true;
+                    break;
+                case ChunkField.TRACE_ID:
+                    traceId = readBinary(unpacker);
+                    break;
+                case ChunkField.SAMPLING_MECHANISM:
+                    samplingMechanism = unpacker.unpackInt();
+                    break;
+                default:
+                    fail("Unexpected chunk field id: " + fieldId);
             }
-          }
+        }
+
+        assertNotNull(priority);
+        assertNotNull(origin);
+        assertNotNull(chunkAttributes);
+        assertTrue(seenSpans);
+        assertNotNull(traceId);
+        assertNotNull(samplingMechanism);
+
+        PojoSpan firstSpan = expectedTrace.get(0);
+        assertEquals(firstSpan.samplingPriority(), priority.intValue());
+        assertEqualsWithNullAsEmpty(firstSpan.getOrigin(), origin);
+        assertEquals(1, chunkAttributes.size());
+        assertEqualsWithNullAsEmpty(
+                firstSpan.getLocalRootSpan().getServiceName(), (String) chunkAttributes.get("service"));
+        assertArrayEquals(traceIdBytes(firstSpan.getTraceId()), traceId);
+        assertEquals(expectedSamplingMechanism(firstSpan.getBaggage()), samplingMechanism.intValue());
+    }
+
+    private static void verifySpans(MessageUnpacker unpacker, List<PojoSpan> expectedTrace, List<String> stringTable)
+            throws IOException {
+        int spanCount = unpacker.unpackArrayHeader();
+        assertEquals(expectedTrace.size(), spanCount);
+
+        for (int i = 0; i < spanCount; i++) {
+            verifySpan(unpacker, expectedTrace.get(i), stringTable);
+        }
+    }
+
+    private static void verifySpan(MessageUnpacker unpacker, PojoSpan expectedSpan, List<String> stringTable)
+            throws IOException {
+        int spanFieldCount = unpacker.unpackMapHeader();
+        assertEquals(EXPECTED_SPAN_FIELD_IDS.size(), spanFieldCount);
+
+        Set<Integer> spanFieldsSeen = new HashSet<>();
+        String service = null;
+        String name = null;
+        String resource = null;
+        long spanId = 0;
+        long parentId = 0;
+        long start = 0;
+        long duration = 0;
+        boolean error = false;
+        Map<String, Object> attributes = null;
+        String type = null;
+        int linksCount = -1;
+        int eventsCount = -1;
+        String env = null;
+        String version = null;
+        String component = null;
+        int spanKind = -1;
+
+        for (int i = 0; i < spanFieldCount; i++) {
+            int fieldId = unpacker.unpackInt();
+            spanFieldsSeen.add(fieldId);
+            switch (fieldId) {
+                case SpanField.SERVICE:
+                    service = readStreamingString(unpacker, stringTable);
+                    break;
+                case SpanField.NAME:
+                    name = readStreamingString(unpacker, stringTable);
+                    break;
+                case SpanField.RESOURCE:
+                    resource = readStreamingString(unpacker, stringTable);
+                    break;
+                case SpanField.SPAN_ID:
+                    spanId = unpackUnsignedLong(unpacker);
+                    break;
+                case SpanField.PARENT_ID:
+                    parentId = unpackUnsignedLong(unpacker);
+                    break;
+                case SpanField.START:
+                    start = unpacker.unpackLong();
+                    break;
+                case SpanField.DURATION:
+                    duration = unpacker.unpackLong();
+                    break;
+                case SpanField.ERROR:
+                    error = unpacker.unpackBoolean();
+                    break;
+                case SpanField.ATTRIBUTES:
+                    attributes = readAttributes(unpacker, stringTable);
+                    break;
+                case SpanField.TYPE:
+                    type = readStreamingString(unpacker, stringTable);
+                    break;
+                case SpanField.LINKS:
+                    linksCount = unpacker.unpackArrayHeader();
+                    break;
+                case SpanField.EVENTS:
+                    eventsCount = unpacker.unpackArrayHeader();
+                    break;
+                case SpanField.ENV:
+                    env = readStreamingString(unpacker, stringTable);
+                    break;
+                case SpanField.VERSION:
+                    version = readStreamingString(unpacker, stringTable);
+                    break;
+                case SpanField.COMPONENT:
+                    component = readStreamingString(unpacker, stringTable);
+                    break;
+                case SpanField.KIND:
+                    spanKind = unpacker.unpackInt();
+                    break;
+                default:
+                    fail("Unexpected span field id: " + fieldId);
+            }
+        }
+
+        // A 16-entry map could still repeat one field id and omit another, which would leave a decoded
+        // value at its initial sentinel. Pinning the id set makes each field present exactly once, so
+        // the value assertions below cannot pass on an unwritten field (e.g. parentId 0, error false).
+        assertEquals(EXPECTED_SPAN_FIELD_IDS, spanFieldsSeen);
+
+        assertEqualsWithNullAsEmpty(expectedSpan.getServiceName(), service);
+        assertEqualsWithNullAsEmpty(expectedSpan.getOperationName(), name);
+        assertEqualsWithNullAsEmpty(expectedSpan.getResourceName(), resource);
+        assertEquals(expectedSpan.getSpanId(), spanId);
+        assertEquals(expectedSpan.getParentId(), parentId);
+        assertEquals(expectedSpan.getStartTime(), start);
+        assertEquals(expectedSpan.getDurationNano(), duration);
+        assertEquals(expectedSpan.getError() != 0, error);
+        assertEqualsWithNullAsEmpty(expectedSpan.getType(), type);
+        assertEquals(0, linksCount);
+        assertEquals(0, eventsCount);
+        assertEqualsWithNullAsEmpty(expectedSpan.getTag(ENV), env);
+        assertEqualsWithNullAsEmpty(expectedSpan.getTag(VERSION), version);
+        assertEqualsWithNullAsEmpty(expectedSpan.getTag(COMPONENT), component);
+        assertEquals(TraceMapperV1.getSpanKindValue(expectedSpan.getTag(SPAN_KIND)), spanKind);
+
+        assertNotNull(attributes);
+        int expectedHttpStatusCode = expectedSpan.getHttpStatusCode();
+        boolean shouldContainHttpStatus =
+                expectedHttpStatusCode != 0 && !expectedSpan.getTags().containsKey(HTTP_STATUS);
+        Map<String, Object> expectedAttributes = new HashMap<>(expectedSpan.getBaggage());
+        expectedAttributes.put(THREAD_ID, expectedSpan.getTag(THREAD_ID));
+        expectedAttributes.put(THREAD_NAME, expectedSpan.getTag(THREAD_NAME));
+        for (Map.Entry<String, Object> entry : expectedSpan.getTags().entrySet()) {
+            if (SPAN_EVENTS.equals(entry.getKey())) {
+                continue;
+            }
+            addFlattenedExpectedAttribute(expectedAttributes, entry.getKey(), entry.getValue());
+        }
+        if (shouldContainHttpStatus) {
+            expectedAttributes.put(HTTP_STATUS, Integer.toString(expectedHttpStatusCode));
+        }
+        if (expectedSpan.isTopLevel()) {
+            expectedAttributes.put(InstrumentationTags.DD_TOP_LEVEL.toString(), 1d);
+        }
 
-          assertTrue(seenChunks);
+        assertEquals(expectedAttributes.size(), attributes.size());
+        for (Map.Entry<String, Object> entry : expectedAttributes.entrySet()) {
+            String key = entry.getKey();
+            assertTrue(attributes.containsKey(key), "Missing attribute key: " + key);
+            assertAttributeValueEquals(entry.getValue(), attributes.get(key), key);
+        }
+    }
+
+    private static void assertAttributeValueEquals(Object expected, Object actual, String key) {
+        if (expected instanceof Number) {
+            assertInstanceOf(Number.class, actual, "Attribute " + key + " should be numeric");
+            double expectedValue = ((Number) expected).doubleValue();
+            double actualValue = ((Number) actual).doubleValue();
+            double delta = Math.max(0.000001d, Math.abs(expectedValue) * 0.000000000001d);
+            assertEquals(expectedValue, actualValue, delta, "Numeric mismatch for " + key);
+        } else if (expected instanceof Boolean) {
+            assertEquals(expected, actual, "Boolean mismatch for " + key);
+        } else {
+            assertEquals(String.valueOf(expected), String.valueOf(actual), "String mismatch for " + key);
+        }
+    }
+
+    private static void addFlattenedExpectedAttribute(
+            Map<String, Object> expectedAttributes, String key, Object value) {
+        if (!(value instanceof Map)) {
+            expectedAttributes.put(key, value);
+            return;
         }
-      } catch (IOException e) {
-        fail(e.getMessage());
-      } finally {
-        mapper.reset();
-        channel.resetForWriting();
-      }
-    }
-
-    void verifyTracesConsumed() {
-      assertEquals(expectedTraces.size(), position);
-    }
-  }
-
-  private static void verifyChunk(
-      MessageUnpacker unpacker, List<PojoSpan> expectedTrace, List<String> stringTable)
-      throws IOException {
-    int chunkFieldCount = unpacker.unpackMapHeader();
-    assertEquals(6, chunkFieldCount);
-
-    Integer priority = null;
-    String origin = null;
-    Map<String, Object> chunkAttributes = null;
-    byte[] traceId = null;
-    Integer samplingMechanism = null;
-    boolean seenSpans = false;
-
-    for (int i = 0; i < chunkFieldCount; i++) {
-      int fieldId = unpacker.unpackInt();
-      switch (fieldId) {
-        case ChunkField.PRIORITY:
-          priority = unpacker.unpackInt();
-          break;
-        case ChunkField.ORIGIN:
-          origin = readStreamingString(unpacker, stringTable);
-          break;
-        case ChunkField.ATTRIBUTES:
-          chunkAttributes = readAttributes(unpacker, stringTable);
-          break;
-        case ChunkField.SPANS:
-          verifySpans(unpacker, expectedTrace, stringTable);
-          seenSpans = true;
-          break;
-        case ChunkField.TRACE_ID:
-          traceId = readBinary(unpacker);
-          break;
-        case ChunkField.SAMPLING_MECHANISM:
-          samplingMechanism = unpacker.unpackInt();
-          break;
-        default:
-          fail("Unexpected chunk field id: " + fieldId);
-      }
-    }
-
-    assertNotNull(priority);
-    assertNotNull(origin);
-    assertNotNull(chunkAttributes);
-    assertTrue(seenSpans);
-    assertNotNull(traceId);
-    assertNotNull(samplingMechanism);
-
-    PojoSpan firstSpan = expectedTrace.get(0);
-    assertEquals(firstSpan.samplingPriority(), priority.intValue());
-    assertEqualsWithNullAsEmpty(firstSpan.getOrigin(), origin);
-    assertEquals(1, chunkAttributes.size());
-    assertEqualsWithNullAsEmpty(
-        firstSpan.getLocalRootSpan().getServiceName(), (String) chunkAttributes.get("service"));
-    assertArrayEquals(traceIdBytes(firstSpan.getTraceId()), traceId);
-    assertEquals(expectedSamplingMechanism(firstSpan.getBaggage()), samplingMechanism.intValue());
-  }
-
-  private static void verifySpans(
-      MessageUnpacker unpacker, List<PojoSpan> expectedTrace, List<String> stringTable)
-      throws IOException {
-    int spanCount = unpacker.unpackArrayHeader();
-    assertEquals(expectedTrace.size(), spanCount);
-
-    for (int i = 0; i < spanCount; i++) {
-      verifySpan(unpacker, expectedTrace.get(i), stringTable);
-    }
-  }
-
-  private static void verifySpan(
-      MessageUnpacker unpacker, PojoSpan expectedSpan, List<String> stringTable)
-      throws IOException {
-    int spanFieldCount = unpacker.unpackMapHeader();
-    assertEquals(EXPECTED_SPAN_FIELD_IDS.size(), spanFieldCount);
-
-    Set<Integer> spanFieldsSeen = new HashSet<>();
-    String service = null;
-    String name = null;
-    String resource = null;
-    long spanId = 0;
-    long parentId = 0;
-    long start = 0;
-    long duration = 0;
-    boolean error = false;
-    Map<String, Object> attributes = null;
-    String type = null;
-    int linksCount = -1;
-    int eventsCount = -1;
-    String env = null;
-    String version = null;
-    String component = null;
-    int spanKind = -1;
-
-    for (int i = 0; i < spanFieldCount; i++) {
-      int fieldId = unpacker.unpackInt();
-      spanFieldsSeen.add(fieldId);
-      switch (fieldId) {
-        case SpanField.SERVICE:
-          service = readStreamingString(unpacker, stringTable);
-          break;
-        case SpanField.NAME:
-          name = readStreamingString(unpacker, stringTable);
-          break;
-        case SpanField.RESOURCE:
-          resource = readStreamingString(unpacker, stringTable);
-          break;
-        case SpanField.SPAN_ID:
-          spanId = unpackUnsignedLong(unpacker);
-          break;
-        case SpanField.PARENT_ID:
-          parentId = unpackUnsignedLong(unpacker);
-          break;
-        case SpanField.START:
-          start = unpacker.unpackLong();
-          break;
-        case SpanField.DURATION:
-          duration = unpacker.unpackLong();
-          break;
-        case SpanField.ERROR:
-          error = unpacker.unpackBoolean();
-          break;
-        case SpanField.ATTRIBUTES:
-          attributes = readAttributes(unpacker, stringTable);
-          break;
-        case SpanField.TYPE:
-          type = readStreamingString(unpacker, stringTable);
-          break;
-        case SpanField.LINKS:
-          linksCount = unpacker.unpackArrayHeader();
-          break;
-        case SpanField.EVENTS:
-          eventsCount = unpacker.unpackArrayHeader();
-          break;
-        case SpanField.ENV:
-          env = readStreamingString(unpacker, stringTable);
-          break;
-        case SpanField.VERSION:
-          version = readStreamingString(unpacker, stringTable);
-          break;
-        case SpanField.COMPONENT:
-          component = readStreamingString(unpacker, stringTable);
-          break;
-        case SpanField.KIND:
-          spanKind = unpacker.unpackInt();
-          break;
-        default:
-          fail("Unexpected span field id: " + fieldId);
-      }
-    }
-
-    // A 16-entry map could still repeat one field id and omit another, which would leave a decoded
-    // value at its initial sentinel. Pinning the id set makes each field present exactly once, so
-    // the value assertions below cannot pass on an unwritten field (e.g. parentId 0, error false).
-    assertEquals(EXPECTED_SPAN_FIELD_IDS, spanFieldsSeen);
-
-    assertEqualsWithNullAsEmpty(expectedSpan.getServiceName(), service);
-    assertEqualsWithNullAsEmpty(expectedSpan.getOperationName(), name);
-    assertEqualsWithNullAsEmpty(expectedSpan.getResourceName(), resource);
-    assertEquals(expectedSpan.getSpanId(), spanId);
-    assertEquals(expectedSpan.getParentId(), parentId);
-    assertEquals(expectedSpan.getStartTime(), start);
-    assertEquals(expectedSpan.getDurationNano(), duration);
-    assertEquals(expectedSpan.getError() != 0, error);
-    assertEqualsWithNullAsEmpty(expectedSpan.getType(), type);
-    assertEquals(0, linksCount);
-    assertEquals(0, eventsCount);
-    assertEqualsWithNullAsEmpty(expectedSpan.getTag(ENV), env);
-    assertEqualsWithNullAsEmpty(expectedSpan.getTag(VERSION), version);
-    assertEqualsWithNullAsEmpty(expectedSpan.getTag(COMPONENT), component);
-    assertEquals(TraceMapperV1.getSpanKindValue(expectedSpan.getTag(SPAN_KIND)), spanKind);
-
-    assertNotNull(attributes);
-    int expectedHttpStatusCode = expectedSpan.getHttpStatusCode();
-    boolean shouldContainHttpStatus =
-        expectedHttpStatusCode != 0 && !expectedSpan.getTags().containsKey(HTTP_STATUS);
-    Map<String, Object> expectedAttributes = new HashMap<>(expectedSpan.getBaggage());
-    expectedAttributes.put(THREAD_ID, expectedSpan.getTag(THREAD_ID));
-    expectedAttributes.put(THREAD_NAME, expectedSpan.getTag(THREAD_NAME));
-    for (Map.Entry<String, Object> entry : expectedSpan.getTags().entrySet()) {
-      if (SPAN_EVENTS.equals(entry.getKey())) {
-        continue;
-      }
-      addFlattenedExpectedAttribute(expectedAttributes, entry.getKey(), entry.getValue());
-    }
-    if (shouldContainHttpStatus) {
-      expectedAttributes.put(HTTP_STATUS, Integer.toString(expectedHttpStatusCode));
-    }
-    if (expectedSpan.isTopLevel()) {
-      expectedAttributes.put(InstrumentationTags.DD_TOP_LEVEL.toString(), 1d);
-    }
-
-    assertEquals(expectedAttributes.size(), attributes.size());
-    for (Map.Entry<String, Object> entry : expectedAttributes.entrySet()) {
-      String key = entry.getKey();
-      assertTrue(attributes.containsKey(key), "Missing attribute key: " + key);
-      assertAttributeValueEquals(entry.getValue(), attributes.get(key), key);
-    }
-  }
-
-  private static void assertAttributeValueEquals(Object expected, Object actual, String key) {
-    if (expected instanceof Number) {
-      assertInstanceOf(Number.class, actual, "Attribute " + key + " should be numeric");
-      double expectedValue = ((Number) expected).doubleValue();
-      double actualValue = ((Number) actual).doubleValue();
-      double delta = Math.max(0.000001d, Math.abs(expectedValue) * 0.000000000001d);
-      assertEquals(expectedValue, actualValue, delta, "Numeric mismatch for " + key);
-    } else if (expected instanceof Boolean) {
-      assertEquals(expected, actual, "Boolean mismatch for " + key);
-    } else {
-      assertEquals(String.valueOf(expected), String.valueOf(actual), "String mismatch for " + key);
-    }
-  }
-
-  private static void addFlattenedExpectedAttribute(
-      Map<String, Object> expectedAttributes, String key, Object value) {
-    if (!(value instanceof Map)) {
-      expectedAttributes.put(key, value);
-      return;
-    }
-    for (Map.Entry<?, ?> entry : ((Map<?, ?>) value).entrySet()) {
-      addFlattenedExpectedAttribute(
-          expectedAttributes, key + "." + entry.getKey(), entry.getValue());
-    }
-  }
-
-  private static int expectedSamplingMechanism(Map<String, String> propagationMetadata) {
-    String decisionMaker = propagationMetadata.get(DECISION_MAKER_TAG);
-    if (decisionMaker == null) {
-      return SamplingMechanism.DEFAULT;
-    }
-
-    try {
-      return Math.abs(Integer.parseInt(decisionMaker));
-    } catch (NumberFormatException ignored) {
-      int separator = decisionMaker.lastIndexOf('-');
-      if (separator >= 0 && separator + 1 < decisionMaker.length()) {
+        for (Map.Entry<?, ?> entry : ((Map<?, ?>) value).entrySet()) {
+            addFlattenedExpectedAttribute(expectedAttributes, key + "." + entry.getKey(), entry.getValue());
+        }
+    }
+
+    private static int expectedSamplingMechanism(Map<String, String> propagationMetadata) {
+        String decisionMaker = propagationMetadata.get(DECISION_MAKER_TAG);
+        if (decisionMaker == null) {
+            return SamplingMechanism.DEFAULT;
+        }
+
         try {
-          return Math.abs(Integer.parseInt(decisionMaker.substring(separator + 1)));
-        } catch (NumberFormatException ignoredAgain) {
-          // not a mechanism suffix either, fall through to the default
+            return Math.abs(Integer.parseInt(decisionMaker));
+        } catch (NumberFormatException ignored) {
+            int separator = decisionMaker.lastIndexOf('-');
+            if (separator >= 0 && separator + 1 < decisionMaker.length()) {
+                try {
+                    return Math.abs(Integer.parseInt(decisionMaker.substring(separator + 1)));
+                } catch (NumberFormatException ignoredAgain) {
+                    // not a mechanism suffix either, fall through to the default
+                }
+            }
+            return SamplingMechanism.DEFAULT;
+        }
+    }
+
+    /** Asserts the next value is encoded as an unsigned 64-bit integer, and returns it. */
+    private static long unpackUint64(MessageUnpacker unpacker) throws IOException {
+        assertEquals(MessageFormat.UINT64, unpacker.getNextFormat());
+        return unpackUnsignedLong(unpacker);
+    }
+
+    private static byte[] serializeV1Payload(PojoSpan span) {
+        return serializeV1Payload(singletonList(span));
+    }
+
+    /** Maps a single trace and returns the complete v1 payload bytes. */
+    private static byte[] serializeV1Payload(List<PojoSpan> trace) {
+        TraceMapperV1 mapper = new TraceMapperV1();
+        CapturedBody capturedBody = new CapturedBody(mapper);
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(2 << 20, capturedBody));
+
+        assertTrue(packer.format(trace, mapper));
+        packer.flush();
+
+        assertNotNull(capturedBody.payloadBytes);
+        return capturedBody.payloadBytes;
+    }
+
+    private static PojoSpan span(Map<String, Object> tags) {
+        return span(123L, 0L, emptyMap(), tags, 200, emptyList());
+    }
+
+    private static PojoSpan span(Map<String, Object> tags, int statusCode) {
+        return span(123L, 0L, emptyMap(), tags, statusCode, emptyList());
+    }
+
+    private static PojoSpan spanWithBaggage(Map<String, String> baggage) {
+        return span(123L, 0L, baggage, emptyMap(), 200, emptyList());
+    }
+
+    private static PojoSpan spanWithIds(long spanId, long parentId) {
+        return span(spanId, parentId, emptyMap(), emptyMap(), 200, emptyList());
+    }
+
+    private static PojoSpan spanWithLinks(List<AgentSpanLink> spanLinks) {
+        return span(123L, 0L, emptyMap(), emptyMap(), 200, spanLinks);
+    }
+
+    /** A span carrying the fields shared by most tests; only the varying pieces are parameters. */
+    private static PojoSpan span(
+            long spanId,
+            long parentId,
+            Map<String, String> baggage,
+            Map<String, Object> tags,
+            int statusCode,
+            List<AgentSpanLink> spanLinks) {
+        return new PojoSpan(
+                "service-a",
+                "operation-a",
+                "resource-a",
+                DDTraceId.ONE,
+                spanId,
+                parentId,
+                1000L,
+                2000L,
+                0,
+                baggage,
+                tags,
+                "web",
+                false,
+                SAMPLER_KEEP,
+                statusCode,
+                null,
+                spanLinks);
+    }
+
+    private static final class CapturedBody implements ByteBufferConsumer {
+        private final TraceMapperV1 mapper;
+        private byte[] payloadBytes;
+
+        private CapturedBody(TraceMapperV1 mapper) {
+            this.mapper = mapper;
         }
-      }
-      return SamplingMechanism.DEFAULT;
-    }
-  }
-
-  /** Asserts the next value is encoded as an unsigned 64-bit integer, and returns it. */
-  private static long unpackUint64(MessageUnpacker unpacker) throws IOException {
-    assertEquals(MessageFormat.UINT64, unpacker.getNextFormat());
-    return unpackUnsignedLong(unpacker);
-  }
-
-  private static byte[] serializeV1Payload(PojoSpan span) {
-    return serializeV1Payload(singletonList(span));
-  }
-
-  /** Maps a single trace and returns the complete v1 payload bytes. */
-  private static byte[] serializeV1Payload(List<PojoSpan> trace) {
-    TraceMapperV1 mapper = new TraceMapperV1();
-    CapturedBody capturedBody = new CapturedBody(mapper);
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(2 << 20, capturedBody));
-
-    assertTrue(packer.format(trace, mapper));
-    packer.flush();
-
-    assertNotNull(capturedBody.payloadBytes);
-    return capturedBody.payloadBytes;
-  }
-
-  private static PojoSpan span(Map<String, Object> tags) {
-    return span(123L, 0L, emptyMap(), tags, 200, emptyList());
-  }
-
-  private static PojoSpan span(Map<String, Object> tags, int statusCode) {
-    return span(123L, 0L, emptyMap(), tags, statusCode, emptyList());
-  }
-
-  private static PojoSpan spanWithBaggage(Map<String, String> baggage) {
-    return span(123L, 0L, baggage, emptyMap(), 200, emptyList());
-  }
-
-  private static PojoSpan spanWithIds(long spanId, long parentId) {
-    return span(spanId, parentId, emptyMap(), emptyMap(), 200, emptyList());
-  }
-
-  private static PojoSpan spanWithLinks(List<AgentSpanLink> spanLinks) {
-    return span(123L, 0L, emptyMap(), emptyMap(), 200, spanLinks);
-  }
-
-  /** A span carrying the fields shared by most tests; only the varying pieces are parameters. */
-  private static PojoSpan span(
-      long spanId,
-      long parentId,
-      Map<String, String> baggage,
-      Map<String, Object> tags,
-      int statusCode,
-      List<AgentSpanLink> spanLinks) {
-    return new PojoSpan(
-        "service-a",
-        "operation-a",
-        "resource-a",
-        DDTraceId.ONE,
-        spanId,
-        parentId,
-        1000L,
-        2000L,
-        0,
-        baggage,
-        tags,
-        "web",
-        false,
-        SAMPLER_KEEP,
-        statusCode,
-        null,
-        spanLinks);
-  }
-
-  private static final class CapturedBody implements ByteBufferConsumer {
-    private final TraceMapperV1 mapper;
-    private byte[] payloadBytes;
-
-    private CapturedBody(TraceMapperV1 mapper) {
-      this.mapper = mapper;
-    }
-
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {
-      ByteArrayOutputStream out = new ByteArrayOutputStream();
-      try {
-        Payload payload = mapper.newPayload().withBody(messageCount, buffer);
-        payload.writeTo(Channels.newChannel(out));
-        payloadBytes = out.toByteArray();
-      } catch (IOException e) {
-        fail("Failed to serialize the v1 payload: " + e.getMessage());
-      } finally {
-        mapper.reset();
-      }
-    }
-  }
-
-  /** A span counting how many times its tags and baggage were handed to the mapper. */
-  private static final class CountingPojoSpan extends PojoSpan {
-    private int processTagsAndBaggageCount = 0;
-
-    private CountingPojoSpan(
-        String operationName, CharSequence resourceName, long spanId, long parentId) {
-      super(
-          "service-a",
-          operationName,
-          resourceName,
-          DDTraceId.ONE,
-          spanId,
-          parentId,
-          1000L,
-          2000L,
-          0,
-          emptyMap(),
-          singletonMap(HTTP_URL, "http://localhost:7777/"),
-          "web",
-          false,
-          SAMPLER_KEEP,
-          200,
-          null);
-    }
-
-    @Override
-    public void processTagsAndBaggage(MetadataConsumer consumer) {
-      processTagsAndBaggageCount++;
-      super.processTagsAndBaggage(consumer);
-    }
-  }
-
-  /** {@link SpanLink}'s constructor is protected, so tests reach it through a subclass. */
-  private static final class TestSpanLink extends SpanLink {
-    private TestSpanLink(
-        DDTraceId traceId,
-        long spanId,
-        byte traceFlags,
-        String traceState,
-        SpanAttributes attributes) {
-      super(traceId, spanId, traceFlags, traceState, attributes);
-    }
-  }
+
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            try {
+                Payload payload = mapper.newPayload().withBody(messageCount, buffer);
+                payload.writeTo(Channels.newChannel(out));
+                payloadBytes = out.toByteArray();
+            } catch (IOException e) {
+                fail("Failed to serialize the v1 payload: " + e.getMessage());
+            } finally {
+                mapper.reset();
+            }
+        }
+    }
+
+    /** A span counting how many times its tags and baggage were handed to the mapper. */
+    private static final class CountingPojoSpan extends PojoSpan {
+        private int processTagsAndBaggageCount = 0;
+
+        private CountingPojoSpan(String operationName, CharSequence resourceName, long spanId, long parentId) {
+            super(
+                    "service-a",
+                    operationName,
+                    resourceName,
+                    DDTraceId.ONE,
+                    spanId,
+                    parentId,
+                    1000L,
+                    2000L,
+                    0,
+                    emptyMap(),
+                    singletonMap(HTTP_URL, "http://localhost:7777/"),
+                    "web",
+                    false,
+                    SAMPLER_KEEP,
+                    200,
+                    null);
+        }
+
+        @Override
+        public void processTagsAndBaggage(MetadataConsumer consumer) {
+            processTagsAndBaggageCount++;
+            super.processTagsAndBaggage(consumer);
+        }
+    }
+
+    /** {@link SpanLink}'s constructor is protected, so tests reach it through a subclass. */
+    private static final class TestSpanLink extends SpanLink {
+        private TestSpanLink(
+                DDTraceId traceId, long spanId, byte traceFlags, String traceState, SpanAttributes attributes) {
+            super(traceId, spanId, traceFlags, traceState, attributes);
+        }
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/V1PayloadReader.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/V1PayloadReader.java
index 82ef0b2df65..c11b4cbebf0 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/V1PayloadReader.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/V1PayloadReader.java
@@ -36,591 +36,582 @@
  */
 public final class V1PayloadReader {
 
-  /** msgpack field ids of the top-level payload (header) map, mirroring {@code buildHeader}. */
-  static final class PayloadField {
-    static final int CONTAINER_ID = 2;
-    static final int LANGUAGE_NAME = 3;
-    static final int LANGUAGE_VERSION = 4;
-    static final int TRACER_VERSION = 5;
-    static final int RUNTIME_ID = 6;
-    static final int ENV = 7;
-    static final int HOSTNAME = 8;
-    static final int APP_VERSION = 9;
-    static final int ATTRIBUTES = 10;
-    static final int CHUNKS = 11;
-
-    private PayloadField() {}
-  }
-
-  /** msgpack field ids of a trace chunk map, mirroring {@code TraceMapperV1.map} (no field 5). */
-  static final class ChunkField {
-    static final int PRIORITY = 1;
-    static final int ORIGIN = 2;
-    static final int ATTRIBUTES = 3;
-    static final int SPANS = 4;
-    static final int TRACE_ID = 6;
-    static final int SAMPLING_MECHANISM = 7;
-
-    private ChunkField() {}
-  }
-
-  /** msgpack field ids of a span map, mirroring {@code encodeSpans} (16 fields). */
-  static final class SpanField {
-    static final int SERVICE = 1;
-    static final int NAME = 2;
-    static final int RESOURCE = 3;
-    static final int SPAN_ID = 4;
-    static final int PARENT_ID = 5;
-    static final int START = 6;
-    static final int DURATION = 7;
-    static final int ERROR = 8;
-    static final int ATTRIBUTES = 9;
-    static final int TYPE = 10;
-    static final int LINKS = 11;
-    static final int EVENTS = 12;
-    static final int ENV = 13;
-    static final int VERSION = 14;
-    static final int COMPONENT = 15;
-    static final int KIND = 16;
-
-    private SpanField() {}
-  }
-
-  /** msgpack field ids of a span link map, mirroring {@code encodeSpanLinks} (5 fields). */
-  private static final class LinkField {
-    static final int TRACE_ID = 1;
-    static final int SPAN_ID = 2;
-    static final int ATTRIBUTES = 3;
-    static final int TRACE_STATE = 4;
-    static final int TRACE_FLAGS = 5;
-
-    private LinkField() {}
-  }
-
-  /** msgpack field ids of a span event map, mirroring {@code encodeSpanEvents} (3 fields). */
-  private static final class EventField {
-    static final int TIME_UNIX_NANO = 1;
-    static final int NAME = 2;
-    static final int ATTRIBUTES = 3;
-
-    private EventField() {}
-  }
-
-  private V1PayloadReader() {}
-
-  /** Decodes the first span of the first chunk of an encoded V1 payload. */
-  public static V1Span readFirstSpan(byte[] encoded) throws IOException {
-    V1Chunk chunk = readFirstChunk(encoded);
-    assertEquals(1, chunk.getSpans().size());
-    return chunk.getSpans().get(0);
-  }
-
-  /** Decodes the first chunk of an encoded V1 payload. */
-  public static V1Chunk readFirstChunk(byte[] encoded) throws IOException {
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(encoded));
-    List<String> stringTable = newStringTable();
-    int payloadFieldCount = unpacker.unpackMapHeader();
-    for (int i = 0; i < payloadFieldCount; i++) {
-      int payloadFieldId = unpacker.unpackInt();
-      if (payloadFieldId != PayloadField.CHUNKS) {
-        skipPayloadField(unpacker, payloadFieldId, stringTable);
-        continue;
-      }
-      int chunkCount = unpacker.unpackArrayHeader();
-      assertEquals(1, chunkCount);
-      int chunkFieldCount = unpacker.unpackMapHeader();
-      List<V1Span> spans = Collections.emptyList();
-      int samplingMechanism = 0;
-      for (int j = 0; j < chunkFieldCount; j++) {
-        int chunkFieldId = unpacker.unpackInt();
-        if (chunkFieldId == ChunkField.SPANS) {
-          int spanCount = unpacker.unpackArrayHeader();
-          spans = new ArrayList<>(spanCount);
-          for (int k = 0; k < spanCount; k++) {
-            spans.add(decodeSpan(unpacker, stringTable));
-          }
-        } else if (chunkFieldId == ChunkField.SAMPLING_MECHANISM) {
-          samplingMechanism = unpacker.unpackInt();
-        } else {
-          skipChunkField(unpacker, chunkFieldId, stringTable);
-        }
-      }
-      return new V1Chunk(spans, samplingMechanism);
-    }
-    throw new AssertionError("Could not find first chunk in v1 payload");
-  }
-
-  /** Decodes the payload-level attribute map (field 10) of an encoded V1 payload. */
-  public static Map<String, Object> readPayloadAttributes(byte[] encoded) throws IOException {
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(encoded));
-    List<String> stringTable = newStringTable();
-    int payloadFieldCount = unpacker.unpackMapHeader();
-    for (int i = 0; i < payloadFieldCount; i++) {
-      int payloadFieldId = unpacker.unpackInt();
-      if (payloadFieldId == PayloadField.ATTRIBUTES) {
-        return readAttributes(unpacker, stringTable);
-      }
-      skipPayloadField(unpacker, payloadFieldId, stringTable);
-    }
-    throw new AssertionError("Could not find payload attributes in v1 payload");
-  }
-
-  /** Creates a string table seeded with the empty string at index 0, as the writer expects. */
-  public static List<String> newStringTable() {
-    List<String> stringTable = new ArrayList<>();
-    stringTable.add("");
-    return stringTable;
-  }
-
-  public static V1Span readFirstSpan(MessageUnpacker unpacker, List<String> stringTable)
-      throws IOException {
-    int payloadFieldCount = unpacker.unpackMapHeader();
-    for (int i = 0; i < payloadFieldCount; i++) {
-      int payloadFieldId = unpacker.unpackInt();
-      if (payloadFieldId != PayloadField.CHUNKS) {
-        skipPayloadField(unpacker, payloadFieldId, stringTable);
-        continue;
-      }
-      int chunkCount = unpacker.unpackArrayHeader();
-      assertEquals(1, chunkCount);
-      int chunkFieldCount = unpacker.unpackMapHeader();
-      for (int j = 0; j < chunkFieldCount; j++) {
-        int chunkFieldId = unpacker.unpackInt();
-        if (chunkFieldId != ChunkField.SPANS) {
-          skipChunkField(unpacker, chunkFieldId, stringTable);
-          continue;
-        }
-        int spanCount = unpacker.unpackArrayHeader();
-        assertEquals(1, spanCount);
-        return decodeSpan(unpacker, stringTable);
-      }
-    }
-    throw new AssertionError("Could not find first span in v1 payload");
-  }
-
-  private static V1Span decodeSpan(MessageUnpacker unpacker, List<String> stringTable)
-      throws IOException {
-    int spanFieldCount = unpacker.unpackMapHeader();
-    Map<String, Object> attributes = Collections.emptyMap();
-    List<V1SpanLink> links = Collections.emptyList();
-    List<V1SpanEvent> events = Collections.emptyList();
-    for (int i = 0; i < spanFieldCount; i++) {
-      int spanFieldId = unpacker.unpackInt();
-      switch (spanFieldId) {
-        case SpanField.ATTRIBUTES:
-          attributes = readAttributes(unpacker, stringTable);
-          break;
-        case SpanField.LINKS:
-          links = readSpanLinks(unpacker, stringTable);
-          break;
-        case SpanField.EVENTS:
-          events = readSpanEvents(unpacker, stringTable);
-          break;
-        default:
-          skipSpanField(unpacker, spanFieldId, stringTable);
-      }
-    }
-    return new V1Span(attributes, links, events);
-  }
-
-  public static Map<String, Object> readAttributes(
-      MessageUnpacker unpacker, List<String> stringTable) throws IOException {
-    int arraySize = unpacker.unpackArrayHeader();
-    assertEquals(0, arraySize % 3);
-    int attributeCount = arraySize / 3;
-    Map<String, Object> attributes = new HashMap<>();
-    for (int i = 0; i < attributeCount; i++) {
-      String key = readStreamingString(unpacker, stringTable);
-      int valueType = unpacker.unpackInt();
-      attributes.put(key, readAttributeValue(unpacker, stringTable, valueType));
-    }
-    return attributes;
-  }
-
-  private static Object readAttributeValue(
-      MessageUnpacker unpacker, List<String> stringTable, int valueType) throws IOException {
-    switch (valueType) {
-      case VALUE_TYPE_STRING:
-        return readStreamingString(unpacker, stringTable);
-      case VALUE_TYPE_BOOLEAN:
-        return unpacker.unpackBoolean();
-      case VALUE_TYPE_FLOAT:
-        return unpacker.unpackDouble();
-      case VALUE_TYPE_BYTES:
-        return readBinary(unpacker);
-      default:
-        throw new IllegalArgumentException("Unknown v1 attribute value type: " + valueType);
-    }
-  }
-
-  public static List<V1SpanLink> readSpanLinks(MessageUnpacker unpacker, List<String> stringTable)
-      throws IOException {
-    int linkCount = unpacker.unpackArrayHeader();
-    List<V1SpanLink> links = new ArrayList<>(linkCount);
-    for (int i = 0; i < linkCount; i++) {
-      int linkFieldCount = unpacker.unpackMapHeader();
-      byte[] traceId = null;
-      long spanId = 0;
-      Map<String, Object> attributes = Collections.emptyMap();
-      String traceState = "";
-      long traceFlags = 0;
-      for (int j = 0; j < linkFieldCount; j++) {
-        int linkFieldId = unpacker.unpackInt();
-        switch (linkFieldId) {
-          case LinkField.TRACE_ID:
-            traceId = readBinary(unpacker);
-            break;
-          case LinkField.SPAN_ID:
-            spanId = unpackUnsignedLong(unpacker);
-            break;
-          case LinkField.ATTRIBUTES:
-            attributes = readAttributes(unpacker, stringTable);
-            break;
-          case LinkField.TRACE_STATE:
-            traceState = readStreamingString(unpacker, stringTable);
-            break;
-          case LinkField.TRACE_FLAGS:
-            traceFlags = unpackUnsignedLong(unpacker);
-            break;
-          default:
-            throw new IllegalArgumentException("Unexpected v1 span link field id: " + linkFieldId);
-        }
-      }
-      links.add(new V1SpanLink(traceId, spanId, attributes, traceState, traceFlags));
-    }
-    return links;
-  }
-
-  public static List<V1SpanEvent> readSpanEvents(MessageUnpacker unpacker, List<String> stringTable)
-      throws IOException {
-    int eventCount = unpacker.unpackArrayHeader();
-    List<V1SpanEvent> events = new ArrayList<>(eventCount);
-    for (int i = 0; i < eventCount; i++) {
-      int eventFieldCount = unpacker.unpackMapHeader();
-      long timeUnixNano = 0;
-      String name = null;
-      Map<String, Object> attributes = Collections.emptyMap();
-      for (int j = 0; j < eventFieldCount; j++) {
-        int eventFieldId = unpacker.unpackInt();
-        switch (eventFieldId) {
-          case EventField.TIME_UNIX_NANO:
-            timeUnixNano = unpacker.unpackLong();
-            break;
-          case EventField.NAME:
-            name = readStreamingString(unpacker, stringTable);
-            break;
-          case EventField.ATTRIBUTES:
-            attributes = readEventAttributes(unpacker, stringTable);
-            break;
-          default:
-            throw new IllegalArgumentException(
-                "Unexpected v1 span event field id: " + eventFieldId);
-        }
-      }
-      events.add(new V1SpanEvent(timeUnixNano, name, attributes));
-    }
-    return events;
-  }
-
-  private static Map<String, Object> readEventAttributes(
-      MessageUnpacker unpacker, List<String> stringTable) throws IOException {
-    int arraySize = unpacker.unpackArrayHeader();
-    assertEquals(0, arraySize % 3);
-    int attributeCount = arraySize / 3;
-    Map<String, Object> attributes = new HashMap<>();
-    for (int i = 0; i < attributeCount; i++) {
-      String key = readStreamingString(unpacker, stringTable);
-      int valueType = unpacker.unpackInt();
-      Object value;
-      switch (valueType) {
-        case VALUE_TYPE_STRING:
-          value = readStreamingString(unpacker, stringTable);
-          break;
-        case VALUE_TYPE_BOOLEAN:
-          value = unpacker.unpackBoolean();
-          break;
-        case VALUE_TYPE_FLOAT:
-          value = unpacker.unpackDouble();
-          break;
-        case VALUE_TYPE_INT:
-          value = unpacker.unpackLong();
-          break;
-        case VALUE_TYPE_ARRAY:
-          value = readEventArrayValue(unpacker, stringTable);
-          break;
-        default:
-          throw new IllegalArgumentException("Unknown v1 event attribute value type: " + valueType);
-      }
-      attributes.put(key, value);
-    }
-    return attributes;
-  }
-
-  private static List<Object> readEventArrayValue(
-      MessageUnpacker unpacker, List<String> stringTable) throws IOException {
-    int arraySize = unpacker.unpackArrayHeader();
-    assertEquals(0, arraySize % 2);
-    int itemCount = arraySize / 2;
-    List<Object> values = new ArrayList<>(itemCount);
-    for (int i = 0; i < itemCount; i++) {
-      int itemType = unpacker.unpackInt();
-      switch (itemType) {
-        case VALUE_TYPE_STRING:
-          values.add(readStreamingString(unpacker, stringTable));
-          break;
-        case VALUE_TYPE_BOOLEAN:
-          values.add(unpacker.unpackBoolean());
-          break;
-        case VALUE_TYPE_FLOAT:
-          values.add(unpacker.unpackDouble());
-          break;
-        case VALUE_TYPE_INT:
-          values.add(unpacker.unpackLong());
-          break;
-        default:
-          throw new IllegalArgumentException("Unknown v1 event array item type: " + itemType);
-      }
-    }
-    return values;
-  }
-
-  public static void skipPayloadField(
-      MessageUnpacker unpacker, int fieldId, List<String> stringTable) throws IOException {
-    switch (fieldId) {
-      case PayloadField.CONTAINER_ID:
-      case PayloadField.LANGUAGE_NAME:
-      case PayloadField.LANGUAGE_VERSION:
-      case PayloadField.TRACER_VERSION:
-      case PayloadField.RUNTIME_ID:
-      case PayloadField.ENV:
-      case PayloadField.HOSTNAME:
-      case PayloadField.APP_VERSION:
-        readStreamingString(unpacker, stringTable);
-        break;
-      case PayloadField.ATTRIBUTES:
-        readAttributes(unpacker, stringTable);
-        break;
-      default:
-        throw new IllegalArgumentException("Unexpected v1 payload field id: " + fieldId);
-    }
-  }
-
-  public static void skipChunkField(MessageUnpacker unpacker, int fieldId, List<String> stringTable)
-      throws IOException {
-    switch (fieldId) {
-      case ChunkField.PRIORITY:
-      case ChunkField.SAMPLING_MECHANISM:
-        unpacker.unpackInt();
-        break;
-      case ChunkField.ORIGIN:
-        readStreamingString(unpacker, stringTable);
-        break;
-      case ChunkField.ATTRIBUTES:
-        readAttributes(unpacker, stringTable);
-        break;
-      case ChunkField.SPANS:
-        int spanCount = unpacker.unpackArrayHeader();
-        for (int i = 0; i < spanCount; i++) {
-          decodeSpan(unpacker, stringTable);
-        }
-        break;
-      case ChunkField.TRACE_ID:
-        readBinary(unpacker);
-        break;
-      default:
-        throw new IllegalArgumentException("Unexpected v1 chunk field id: " + fieldId);
-    }
-  }
-
-  public static void skipSpanField(MessageUnpacker unpacker, int fieldId, List<String> stringTable)
-      throws IOException {
-    switch (fieldId) {
-      case SpanField.SERVICE:
-      case SpanField.NAME:
-      case SpanField.RESOURCE:
-      case SpanField.TYPE:
-      case SpanField.ENV:
-      case SpanField.VERSION:
-      case SpanField.COMPONENT:
-        readStreamingString(unpacker, stringTable);
-        break;
-      case SpanField.SPAN_ID:
-      case SpanField.PARENT_ID:
-        unpackUnsignedLong(unpacker);
-        break;
-      case SpanField.START:
-      case SpanField.DURATION:
-        unpacker.unpackLong();
-        break;
-      case SpanField.ERROR:
-        unpacker.unpackBoolean();
-        break;
-      case SpanField.ATTRIBUTES:
-        readAttributes(unpacker, stringTable);
-        break;
-      case SpanField.LINKS:
-        readSpanLinks(unpacker, stringTable);
-        break;
-      case SpanField.EVENTS:
-        readSpanEvents(unpacker, stringTable);
-        break;
-      case SpanField.KIND:
-        unpacker.unpackInt();
-        break;
-      default:
-        throw new IllegalArgumentException("Unexpected v1 span field id: " + fieldId);
+    /** msgpack field ids of the top-level payload (header) map, mirroring {@code buildHeader}. */
+    static final class PayloadField {
+        static final int CONTAINER_ID = 2;
+        static final int LANGUAGE_NAME = 3;
+        static final int LANGUAGE_VERSION = 4;
+        static final int TRACER_VERSION = 5;
+        static final int RUNTIME_ID = 6;
+        static final int ENV = 7;
+        static final int HOSTNAME = 8;
+        static final int APP_VERSION = 9;
+        static final int ATTRIBUTES = 10;
+        static final int CHUNKS = 11;
+
+        private PayloadField() {}
+    }
+
+    /** msgpack field ids of a trace chunk map, mirroring {@code TraceMapperV1.map} (no field 5). */
+    static final class ChunkField {
+        static final int PRIORITY = 1;
+        static final int ORIGIN = 2;
+        static final int ATTRIBUTES = 3;
+        static final int SPANS = 4;
+        static final int TRACE_ID = 6;
+        static final int SAMPLING_MECHANISM = 7;
+
+        private ChunkField() {}
+    }
+
+    /** msgpack field ids of a span map, mirroring {@code encodeSpans} (16 fields). */
+    static final class SpanField {
+        static final int SERVICE = 1;
+        static final int NAME = 2;
+        static final int RESOURCE = 3;
+        static final int SPAN_ID = 4;
+        static final int PARENT_ID = 5;
+        static final int START = 6;
+        static final int DURATION = 7;
+        static final int ERROR = 8;
+        static final int ATTRIBUTES = 9;
+        static final int TYPE = 10;
+        static final int LINKS = 11;
+        static final int EVENTS = 12;
+        static final int ENV = 13;
+        static final int VERSION = 14;
+        static final int COMPONENT = 15;
+        static final int KIND = 16;
+
+        private SpanField() {}
+    }
+
+    /** msgpack field ids of a span link map, mirroring {@code encodeSpanLinks} (5 fields). */
+    private static final class LinkField {
+        static final int TRACE_ID = 1;
+        static final int SPAN_ID = 2;
+        static final int ATTRIBUTES = 3;
+        static final int TRACE_STATE = 4;
+        static final int TRACE_FLAGS = 5;
+
+        private LinkField() {}
+    }
+
+    /** msgpack field ids of a span event map, mirroring {@code encodeSpanEvents} (3 fields). */
+    private static final class EventField {
+        static final int TIME_UNIX_NANO = 1;
+        static final int NAME = 2;
+        static final int ATTRIBUTES = 3;
+
+        private EventField() {}
+    }
+
+    private V1PayloadReader() {}
+
+    /** Decodes the first span of the first chunk of an encoded V1 payload. */
+    public static V1Span readFirstSpan(byte[] encoded) throws IOException {
+        V1Chunk chunk = readFirstChunk(encoded);
+        assertEquals(1, chunk.getSpans().size());
+        return chunk.getSpans().get(0);
+    }
+
+    /** Decodes the first chunk of an encoded V1 payload. */
+    public static V1Chunk readFirstChunk(byte[] encoded) throws IOException {
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(encoded));
+        List<String> stringTable = newStringTable();
+        int payloadFieldCount = unpacker.unpackMapHeader();
+        for (int i = 0; i < payloadFieldCount; i++) {
+            int payloadFieldId = unpacker.unpackInt();
+            if (payloadFieldId != PayloadField.CHUNKS) {
+                skipPayloadField(unpacker, payloadFieldId, stringTable);
+                continue;
+            }
+            int chunkCount = unpacker.unpackArrayHeader();
+            assertEquals(1, chunkCount);
+            int chunkFieldCount = unpacker.unpackMapHeader();
+            List<V1Span> spans = Collections.emptyList();
+            int samplingMechanism = 0;
+            for (int j = 0; j < chunkFieldCount; j++) {
+                int chunkFieldId = unpacker.unpackInt();
+                if (chunkFieldId == ChunkField.SPANS) {
+                    int spanCount = unpacker.unpackArrayHeader();
+                    spans = new ArrayList<>(spanCount);
+                    for (int k = 0; k < spanCount; k++) {
+                        spans.add(decodeSpan(unpacker, stringTable));
+                    }
+                } else if (chunkFieldId == ChunkField.SAMPLING_MECHANISM) {
+                    samplingMechanism = unpacker.unpackInt();
+                } else {
+                    skipChunkField(unpacker, chunkFieldId, stringTable);
+                }
+            }
+            return new V1Chunk(spans, samplingMechanism);
+        }
+        throw new AssertionError("Could not find first chunk in v1 payload");
+    }
+
+    /** Decodes the payload-level attribute map (field 10) of an encoded V1 payload. */
+    public static Map<String, Object> readPayloadAttributes(byte[] encoded) throws IOException {
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(encoded));
+        List<String> stringTable = newStringTable();
+        int payloadFieldCount = unpacker.unpackMapHeader();
+        for (int i = 0; i < payloadFieldCount; i++) {
+            int payloadFieldId = unpacker.unpackInt();
+            if (payloadFieldId == PayloadField.ATTRIBUTES) {
+                return readAttributes(unpacker, stringTable);
+            }
+            skipPayloadField(unpacker, payloadFieldId, stringTable);
+        }
+        throw new AssertionError("Could not find payload attributes in v1 payload");
+    }
+
+    /** Creates a string table seeded with the empty string at index 0, as the writer expects. */
+    public static List<String> newStringTable() {
+        List<String> stringTable = new ArrayList<>();
+        stringTable.add("");
+        return stringTable;
+    }
+
+    public static V1Span readFirstSpan(MessageUnpacker unpacker, List<String> stringTable) throws IOException {
+        int payloadFieldCount = unpacker.unpackMapHeader();
+        for (int i = 0; i < payloadFieldCount; i++) {
+            int payloadFieldId = unpacker.unpackInt();
+            if (payloadFieldId != PayloadField.CHUNKS) {
+                skipPayloadField(unpacker, payloadFieldId, stringTable);
+                continue;
+            }
+            int chunkCount = unpacker.unpackArrayHeader();
+            assertEquals(1, chunkCount);
+            int chunkFieldCount = unpacker.unpackMapHeader();
+            for (int j = 0; j < chunkFieldCount; j++) {
+                int chunkFieldId = unpacker.unpackInt();
+                if (chunkFieldId != ChunkField.SPANS) {
+                    skipChunkField(unpacker, chunkFieldId, stringTable);
+                    continue;
+                }
+                int spanCount = unpacker.unpackArrayHeader();
+                assertEquals(1, spanCount);
+                return decodeSpan(unpacker, stringTable);
+            }
+        }
+        throw new AssertionError("Could not find first span in v1 payload");
+    }
+
+    private static V1Span decodeSpan(MessageUnpacker unpacker, List<String> stringTable) throws IOException {
+        int spanFieldCount = unpacker.unpackMapHeader();
+        Map<String, Object> attributes = Collections.emptyMap();
+        List<V1SpanLink> links = Collections.emptyList();
+        List<V1SpanEvent> events = Collections.emptyList();
+        for (int i = 0; i < spanFieldCount; i++) {
+            int spanFieldId = unpacker.unpackInt();
+            switch (spanFieldId) {
+                case SpanField.ATTRIBUTES:
+                    attributes = readAttributes(unpacker, stringTable);
+                    break;
+                case SpanField.LINKS:
+                    links = readSpanLinks(unpacker, stringTable);
+                    break;
+                case SpanField.EVENTS:
+                    events = readSpanEvents(unpacker, stringTable);
+                    break;
+                default:
+                    skipSpanField(unpacker, spanFieldId, stringTable);
+            }
+        }
+        return new V1Span(attributes, links, events);
+    }
+
+    public static Map<String, Object> readAttributes(MessageUnpacker unpacker, List<String> stringTable)
+            throws IOException {
+        int arraySize = unpacker.unpackArrayHeader();
+        assertEquals(0, arraySize % 3);
+        int attributeCount = arraySize / 3;
+        Map<String, Object> attributes = new HashMap<>();
+        for (int i = 0; i < attributeCount; i++) {
+            String key = readStreamingString(unpacker, stringTable);
+            int valueType = unpacker.unpackInt();
+            attributes.put(key, readAttributeValue(unpacker, stringTable, valueType));
+        }
+        return attributes;
+    }
+
+    private static Object readAttributeValue(MessageUnpacker unpacker, List<String> stringTable, int valueType)
+            throws IOException {
+        switch (valueType) {
+            case VALUE_TYPE_STRING:
+                return readStreamingString(unpacker, stringTable);
+            case VALUE_TYPE_BOOLEAN:
+                return unpacker.unpackBoolean();
+            case VALUE_TYPE_FLOAT:
+                return unpacker.unpackDouble();
+            case VALUE_TYPE_BYTES:
+                return readBinary(unpacker);
+            default:
+                throw new IllegalArgumentException("Unknown v1 attribute value type: " + valueType);
+        }
     }
-  }
-
-  /**
-   * Reads a streaming string: either an inline literal (which is appended to the table) or an
-   * integer index into the table populated by earlier literals.
-   */
-  public static String readStreamingString(MessageUnpacker unpacker, List<String> stringTable)
-      throws IOException {
-    ValueType valueType = unpacker.getNextFormat().getValueType();
-    if (valueType == ValueType.STRING) {
-      String value = unpacker.unpackString();
-      stringTable.add(value);
-      return value;
+
+    public static List<V1SpanLink> readSpanLinks(MessageUnpacker unpacker, List<String> stringTable)
+            throws IOException {
+        int linkCount = unpacker.unpackArrayHeader();
+        List<V1SpanLink> links = new ArrayList<>(linkCount);
+        for (int i = 0; i < linkCount; i++) {
+            int linkFieldCount = unpacker.unpackMapHeader();
+            byte[] traceId = null;
+            long spanId = 0;
+            Map<String, Object> attributes = Collections.emptyMap();
+            String traceState = "";
+            long traceFlags = 0;
+            for (int j = 0; j < linkFieldCount; j++) {
+                int linkFieldId = unpacker.unpackInt();
+                switch (linkFieldId) {
+                    case LinkField.TRACE_ID:
+                        traceId = readBinary(unpacker);
+                        break;
+                    case LinkField.SPAN_ID:
+                        spanId = unpackUnsignedLong(unpacker);
+                        break;
+                    case LinkField.ATTRIBUTES:
+                        attributes = readAttributes(unpacker, stringTable);
+                        break;
+                    case LinkField.TRACE_STATE:
+                        traceState = readStreamingString(unpacker, stringTable);
+                        break;
+                    case LinkField.TRACE_FLAGS:
+                        traceFlags = unpackUnsignedLong(unpacker);
+                        break;
+                    default:
+                        throw new IllegalArgumentException("Unexpected v1 span link field id: " + linkFieldId);
+                }
+            }
+            links.add(new V1SpanLink(traceId, spanId, attributes, traceState, traceFlags));
+        }
+        return links;
+    }
+
+    public static List<V1SpanEvent> readSpanEvents(MessageUnpacker unpacker, List<String> stringTable)
+            throws IOException {
+        int eventCount = unpacker.unpackArrayHeader();
+        List<V1SpanEvent> events = new ArrayList<>(eventCount);
+        for (int i = 0; i < eventCount; i++) {
+            int eventFieldCount = unpacker.unpackMapHeader();
+            long timeUnixNano = 0;
+            String name = null;
+            Map<String, Object> attributes = Collections.emptyMap();
+            for (int j = 0; j < eventFieldCount; j++) {
+                int eventFieldId = unpacker.unpackInt();
+                switch (eventFieldId) {
+                    case EventField.TIME_UNIX_NANO:
+                        timeUnixNano = unpacker.unpackLong();
+                        break;
+                    case EventField.NAME:
+                        name = readStreamingString(unpacker, stringTable);
+                        break;
+                    case EventField.ATTRIBUTES:
+                        attributes = readEventAttributes(unpacker, stringTable);
+                        break;
+                    default:
+                        throw new IllegalArgumentException("Unexpected v1 span event field id: " + eventFieldId);
+                }
+            }
+            events.add(new V1SpanEvent(timeUnixNano, name, attributes));
+        }
+        return events;
+    }
+
+    private static Map<String, Object> readEventAttributes(MessageUnpacker unpacker, List<String> stringTable)
+            throws IOException {
+        int arraySize = unpacker.unpackArrayHeader();
+        assertEquals(0, arraySize % 3);
+        int attributeCount = arraySize / 3;
+        Map<String, Object> attributes = new HashMap<>();
+        for (int i = 0; i < attributeCount; i++) {
+            String key = readStreamingString(unpacker, stringTable);
+            int valueType = unpacker.unpackInt();
+            Object value;
+            switch (valueType) {
+                case VALUE_TYPE_STRING:
+                    value = readStreamingString(unpacker, stringTable);
+                    break;
+                case VALUE_TYPE_BOOLEAN:
+                    value = unpacker.unpackBoolean();
+                    break;
+                case VALUE_TYPE_FLOAT:
+                    value = unpacker.unpackDouble();
+                    break;
+                case VALUE_TYPE_INT:
+                    value = unpacker.unpackLong();
+                    break;
+                case VALUE_TYPE_ARRAY:
+                    value = readEventArrayValue(unpacker, stringTable);
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unknown v1 event attribute value type: " + valueType);
+            }
+            attributes.put(key, value);
+        }
+        return attributes;
+    }
+
+    private static List<Object> readEventArrayValue(MessageUnpacker unpacker, List<String> stringTable)
+            throws IOException {
+        int arraySize = unpacker.unpackArrayHeader();
+        assertEquals(0, arraySize % 2);
+        int itemCount = arraySize / 2;
+        List<Object> values = new ArrayList<>(itemCount);
+        for (int i = 0; i < itemCount; i++) {
+            int itemType = unpacker.unpackInt();
+            switch (itemType) {
+                case VALUE_TYPE_STRING:
+                    values.add(readStreamingString(unpacker, stringTable));
+                    break;
+                case VALUE_TYPE_BOOLEAN:
+                    values.add(unpacker.unpackBoolean());
+                    break;
+                case VALUE_TYPE_FLOAT:
+                    values.add(unpacker.unpackDouble());
+                    break;
+                case VALUE_TYPE_INT:
+                    values.add(unpacker.unpackLong());
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unknown v1 event array item type: " + itemType);
+            }
+        }
+        return values;
+    }
+
+    public static void skipPayloadField(MessageUnpacker unpacker, int fieldId, List<String> stringTable)
+            throws IOException {
+        switch (fieldId) {
+            case PayloadField.CONTAINER_ID:
+            case PayloadField.LANGUAGE_NAME:
+            case PayloadField.LANGUAGE_VERSION:
+            case PayloadField.TRACER_VERSION:
+            case PayloadField.RUNTIME_ID:
+            case PayloadField.ENV:
+            case PayloadField.HOSTNAME:
+            case PayloadField.APP_VERSION:
+                readStreamingString(unpacker, stringTable);
+                break;
+            case PayloadField.ATTRIBUTES:
+                readAttributes(unpacker, stringTable);
+                break;
+            default:
+                throw new IllegalArgumentException("Unexpected v1 payload field id: " + fieldId);
+        }
     }
-    if (valueType == ValueType.INTEGER) {
-      int index = unpacker.unpackInt();
-      assertTrue(index >= 0 && index < stringTable.size(), "Invalid string-table index: " + index);
-      return stringTable.get(index);
+
+    public static void skipChunkField(MessageUnpacker unpacker, int fieldId, List<String> stringTable)
+            throws IOException {
+        switch (fieldId) {
+            case ChunkField.PRIORITY:
+            case ChunkField.SAMPLING_MECHANISM:
+                unpacker.unpackInt();
+                break;
+            case ChunkField.ORIGIN:
+                readStreamingString(unpacker, stringTable);
+                break;
+            case ChunkField.ATTRIBUTES:
+                readAttributes(unpacker, stringTable);
+                break;
+            case ChunkField.SPANS:
+                int spanCount = unpacker.unpackArrayHeader();
+                for (int i = 0; i < spanCount; i++) {
+                    decodeSpan(unpacker, stringTable);
+                }
+                break;
+            case ChunkField.TRACE_ID:
+                readBinary(unpacker);
+                break;
+            default:
+                throw new IllegalArgumentException("Unexpected v1 chunk field id: " + fieldId);
+        }
     }
-    throw new IllegalArgumentException("Expected v1 streaming string, got: " + valueType);
-  }
 
-  public static long unpackUnsignedLong(MessageUnpacker unpacker) throws IOException {
-    if (unpacker.getNextFormat() == MessageFormat.UINT64) {
-      return DDSpanId.from(unpacker.unpackBigInteger().toString());
+    public static void skipSpanField(MessageUnpacker unpacker, int fieldId, List<String> stringTable)
+            throws IOException {
+        switch (fieldId) {
+            case SpanField.SERVICE:
+            case SpanField.NAME:
+            case SpanField.RESOURCE:
+            case SpanField.TYPE:
+            case SpanField.ENV:
+            case SpanField.VERSION:
+            case SpanField.COMPONENT:
+                readStreamingString(unpacker, stringTable);
+                break;
+            case SpanField.SPAN_ID:
+            case SpanField.PARENT_ID:
+                unpackUnsignedLong(unpacker);
+                break;
+            case SpanField.START:
+            case SpanField.DURATION:
+                unpacker.unpackLong();
+                break;
+            case SpanField.ERROR:
+                unpacker.unpackBoolean();
+                break;
+            case SpanField.ATTRIBUTES:
+                readAttributes(unpacker, stringTable);
+                break;
+            case SpanField.LINKS:
+                readSpanLinks(unpacker, stringTable);
+                break;
+            case SpanField.EVENTS:
+                readSpanEvents(unpacker, stringTable);
+                break;
+            case SpanField.KIND:
+                unpacker.unpackInt();
+                break;
+            default:
+                throw new IllegalArgumentException("Unexpected v1 span field id: " + fieldId);
+        }
     }
-    return unpacker.unpackLong();
-  }
-
-  public static byte[] readBinary(MessageUnpacker unpacker) throws IOException {
-    byte[] bytes = new byte[unpacker.unpackBinaryHeader()];
-    unpacker.readPayload(bytes);
-    return bytes;
-  }
-
-  /** Encodes a trace id the same way {@link TraceMapperV1} serializes it (16 big-endian bytes). */
-  public static byte[] traceIdBytes(DDTraceId traceId) {
-    return ByteBuffer.allocate(16)
-        .putLong(traceId.toHighOrderLong())
-        .putLong(traceId.toLong())
-        .array();
-  }
-
-  /** A decoded V1 span, exposing only the fields the tests assert on. */
-  public static final class V1Span {
-    private final Map<String, Object> attributes;
-    private final List<V1SpanLink> links;
-    private final List<V1SpanEvent> events;
-
-    private V1Span(
-        Map<String, Object> attributes, List<V1SpanLink> links, List<V1SpanEvent> events) {
-      this.attributes = attributes;
-      this.links = links;
-      this.events = events;
+
+    /**
+     * Reads a streaming string: either an inline literal (which is appended to the table) or an
+     * integer index into the table populated by earlier literals.
+     */
+    public static String readStreamingString(MessageUnpacker unpacker, List<String> stringTable) throws IOException {
+        ValueType valueType = unpacker.getNextFormat().getValueType();
+        if (valueType == ValueType.STRING) {
+            String value = unpacker.unpackString();
+            stringTable.add(value);
+            return value;
+        }
+        if (valueType == ValueType.INTEGER) {
+            int index = unpacker.unpackInt();
+            assertTrue(index >= 0 && index < stringTable.size(), "Invalid string-table index: " + index);
+            return stringTable.get(index);
+        }
+        throw new IllegalArgumentException("Expected v1 streaming string, got: " + valueType);
     }
 
-    public Map<String, Object> getAttributes() {
-      return attributes;
+    public static long unpackUnsignedLong(MessageUnpacker unpacker) throws IOException {
+        if (unpacker.getNextFormat() == MessageFormat.UINT64) {
+            return DDSpanId.from(unpacker.unpackBigInteger().toString());
+        }
+        return unpacker.unpackLong();
     }
 
-    public List<V1SpanLink> getLinks() {
-      return links;
+    public static byte[] readBinary(MessageUnpacker unpacker) throws IOException {
+        byte[] bytes = new byte[unpacker.unpackBinaryHeader()];
+        unpacker.readPayload(bytes);
+        return bytes;
     }
 
-    public List<V1SpanEvent> getEvents() {
-      return events;
+    /** Encodes a trace id the same way {@link TraceMapperV1} serializes it (16 big-endian bytes). */
+    public static byte[] traceIdBytes(DDTraceId traceId) {
+        return ByteBuffer.allocate(16)
+                .putLong(traceId.toHighOrderLong())
+                .putLong(traceId.toLong())
+                .array();
     }
-  }
 
-  public static final class V1Chunk {
-    private final List<V1Span> spans;
-    private final int samplingMechanism;
+    /** A decoded V1 span, exposing only the fields the tests assert on. */
+    public static final class V1Span {
+        private final Map<String, Object> attributes;
+        private final List<V1SpanLink> links;
+        private final List<V1SpanEvent> events;
 
-    private V1Chunk(List<V1Span> spans, int samplingMechanism) {
-      this.spans = spans;
-      this.samplingMechanism = samplingMechanism;
-    }
+        private V1Span(Map<String, Object> attributes, List<V1SpanLink> links, List<V1SpanEvent> events) {
+            this.attributes = attributes;
+            this.links = links;
+            this.events = events;
+        }
 
-    public List<V1Span> getSpans() {
-      return spans;
-    }
+        public Map<String, Object> getAttributes() {
+            return attributes;
+        }
 
-    public int getSamplingMechanism() {
-      return samplingMechanism;
-    }
-  }
-
-  /** A decoded V1 structured span link. */
-  public static final class V1SpanLink {
-    private final byte[] traceId;
-    private final long spanId;
-    private final Map<String, Object> attributes;
-    private final String traceState;
-    private final long traceFlags;
-
-    private V1SpanLink(
-        byte[] traceId,
-        long spanId,
-        Map<String, Object> attributes,
-        String traceState,
-        long traceFlags) {
-      this.traceId = traceId;
-      this.spanId = spanId;
-      this.attributes = attributes;
-      this.traceState = traceState;
-      this.traceFlags = traceFlags;
-    }
+        public List<V1SpanLink> getLinks() {
+            return links;
+        }
 
-    public byte[] getTraceId() {
-      return traceId;
+        public List<V1SpanEvent> getEvents() {
+            return events;
+        }
     }
 
-    public long getSpanId() {
-      return spanId;
-    }
+    public static final class V1Chunk {
+        private final List<V1Span> spans;
+        private final int samplingMechanism;
 
-    public Map<String, Object> getAttributes() {
-      return attributes;
-    }
+        private V1Chunk(List<V1Span> spans, int samplingMechanism) {
+            this.spans = spans;
+            this.samplingMechanism = samplingMechanism;
+        }
 
-    public String getTraceState() {
-      return traceState;
-    }
+        public List<V1Span> getSpans() {
+            return spans;
+        }
 
-    public long getTraceFlags() {
-      return traceFlags;
-    }
-  }
-
-  /** A decoded V1 structured span event. */
-  public static final class V1SpanEvent {
-    private final long timeUnixNano;
-    private final String name;
-    private final Map<String, Object> attributes;
-
-    private V1SpanEvent(long timeUnixNano, String name, Map<String, Object> attributes) {
-      this.timeUnixNano = timeUnixNano;
-      this.name = name;
-      this.attributes = attributes;
+        public int getSamplingMechanism() {
+            return samplingMechanism;
+        }
     }
 
-    public long getTimeUnixNano() {
-      return timeUnixNano;
-    }
+    /** A decoded V1 structured span link. */
+    public static final class V1SpanLink {
+        private final byte[] traceId;
+        private final long spanId;
+        private final Map<String, Object> attributes;
+        private final String traceState;
+        private final long traceFlags;
+
+        private V1SpanLink(
+                byte[] traceId, long spanId, Map<String, Object> attributes, String traceState, long traceFlags) {
+            this.traceId = traceId;
+            this.spanId = spanId;
+            this.attributes = attributes;
+            this.traceState = traceState;
+            this.traceFlags = traceFlags;
+        }
+
+        public byte[] getTraceId() {
+            return traceId;
+        }
+
+        public long getSpanId() {
+            return spanId;
+        }
+
+        public Map<String, Object> getAttributes() {
+            return attributes;
+        }
+
+        public String getTraceState() {
+            return traceState;
+        }
 
-    public String getName() {
-      return name;
+        public long getTraceFlags() {
+            return traceFlags;
+        }
     }
 
-    public Map<String, Object> getAttributes() {
-      return attributes;
+    /** A decoded V1 structured span event. */
+    public static final class V1SpanEvent {
+        private final long timeUnixNano;
+        private final String name;
+        private final Map<String, Object> attributes;
+
+        private V1SpanEvent(long timeUnixNano, String name, Map<String, Object> attributes) {
+            this.timeUnixNano = timeUnixNano;
+            this.name = name;
+            this.attributes = attributes;
+        }
+
+        public long getTimeUnixNano() {
+            return timeUnixNano;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public Map<String, Object> getAttributes() {
+            return attributes;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDEvpProxyApiTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDEvpProxyApiTest.java
index c3464d47d36..258e1151f67 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDEvpProxyApiTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDEvpProxyApiTest.java
@@ -47,411 +47,384 @@
 @Timeout(20)
 class DDEvpProxyApiTest extends DDCoreJavaSpecification {
 
-  static final CiVisibilityWellKnownTags WELL_KNOWN_TAGS =
-      new CiVisibilityWellKnownTags(
-          "my-runtime-id",
-          "my-env",
-          "my-language",
-          "my-runtime-name",
-          "my-runtime-version",
-          "my-runtime-vendor",
-          "my-os-arch",
-          "my-os-platform",
-          "my-os-version",
-          "false");
-
-  static final String INTAKE_SUBDOMAIN = "citestcycle-intake";
-  static final ObjectMapper MSG_PACK_MAPPER = new ObjectMapper(new MessagePackFactory());
-  static final String DD_EVP_SUBDOMAIN_HEADER = "X-Datadog-EVP-Subdomain";
-
-  @Test
-  void testSendingAnEmptyListOfTracesReturnsNoErrors() {
-    TrackType trackType = TrackType.CITESTCYCLE;
-    String apiVersion = "v2";
-    String evpProxyEndpoint = V2_EVP_PROXY_ENDPOINT;
-    String path = buildAgentEvpProxyPath(evpProxyEndpoint, trackType, apiVersion);
-    JavaTestHttpServer agentEvpProxy =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.post(
-                            path,
-                            api -> {
-                              if (!"application/msgpack"
-                                  .equals(api.getRequest().getContentType())) {
-                                api.getResponse()
-                                    .status(400)
-                                    .send("wrong type: " + api.getRequest().getContentType());
-                              } else {
-                                api.getResponse().status(200).send();
-                              }
-                            })));
-    DDEvpProxyApi client =
-        createEvpProxyApi(
-            agentEvpProxy.getAddress().toString(), evpProxyEndpoint, trackType, false);
-    Payload payload = prepareTraces(trackType, false, Collections.emptyList());
-
-    try {
-      RemoteApi.Response clientResponse = client.sendSerializedTraces(payload);
-      assertTrue(clientResponse.success());
-      assertTrue(clientResponse.status().isPresent());
-      assertEquals(200, clientResponse.status().getAsInt());
-      assertEquals(path, agentEvpProxy.getLastRequest().getPath());
-      assertEquals(
-          INTAKE_SUBDOMAIN, agentEvpProxy.getLastRequest().getHeader(DD_EVP_SUBDOMAIN_HEADER));
-    } finally {
-      agentEvpProxy.close();
+    static final CiVisibilityWellKnownTags WELL_KNOWN_TAGS = new CiVisibilityWellKnownTags(
+            "my-runtime-id",
+            "my-env",
+            "my-language",
+            "my-runtime-name",
+            "my-runtime-version",
+            "my-runtime-vendor",
+            "my-os-arch",
+            "my-os-platform",
+            "my-os-version",
+            "false");
+
+    static final String INTAKE_SUBDOMAIN = "citestcycle-intake";
+    static final ObjectMapper MSG_PACK_MAPPER = new ObjectMapper(new MessagePackFactory());
+    static final String DD_EVP_SUBDOMAIN_HEADER = "X-Datadog-EVP-Subdomain";
+
+    @Test
+    void testSendingAnEmptyListOfTracesReturnsNoErrors() {
+        TrackType trackType = TrackType.CITESTCYCLE;
+        String apiVersion = "v2";
+        String evpProxyEndpoint = V2_EVP_PROXY_ENDPOINT;
+        String path = buildAgentEvpProxyPath(evpProxyEndpoint, trackType, apiVersion);
+        JavaTestHttpServer agentEvpProxy = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.post(path, api -> {
+            if (!"application/msgpack".equals(api.getRequest().getContentType())) {
+                api.getResponse()
+                        .status(400)
+                        .send("wrong type: " + api.getRequest().getContentType());
+            } else {
+                api.getResponse().status(200).send();
+            }
+        })));
+        DDEvpProxyApi client =
+                createEvpProxyApi(agentEvpProxy.getAddress().toString(), evpProxyEndpoint, trackType, false);
+        Payload payload = prepareTraces(trackType, false, Collections.emptyList());
+
+        try {
+            RemoteApi.Response clientResponse = client.sendSerializedTraces(payload);
+            assertTrue(clientResponse.success());
+            assertTrue(clientResponse.status().isPresent());
+            assertEquals(200, clientResponse.status().getAsInt());
+            assertEquals(path, agentEvpProxy.getLastRequest().getPath());
+            assertEquals(INTAKE_SUBDOMAIN, agentEvpProxy.getLastRequest().getHeader(DD_EVP_SUBDOMAIN_HEADER));
+        } finally {
+            agentEvpProxy.close();
+        }
     }
-  }
-
-  @Test
-  void testRetriesWhenBackendReturns5xx() {
-    TrackType trackType = TrackType.CITESTCYCLE;
-    String apiVersion = "v2";
-    String evpProxyEndpoint = V2_EVP_PROXY_ENDPOINT;
-    String path = buildAgentEvpProxyPath(evpProxyEndpoint, trackType, apiVersion);
-    int[] retry = {1};
-    JavaTestHttpServer agentEvpProxy =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.post(
-                            path,
-                            api -> {
-                              if (retry[0] < 5) {
-                                api.getResponse().status(503).send();
-                                retry[0]++;
-                              } else {
-                                api.getResponse().status(200).send();
-                              }
-                            })));
-    DDEvpProxyApi client =
-        createEvpProxyApi(
-            agentEvpProxy.getAddress().toString(), evpProxyEndpoint, trackType, false);
-    Payload payload = prepareTraces(trackType, false, Collections.emptyList());
-
-    try {
-      RemoteApi.Response clientResponse = client.sendSerializedTraces(payload);
-      assertTrue(clientResponse.success());
-      assertTrue(clientResponse.status().isPresent());
-      assertEquals(200, clientResponse.status().getAsInt());
-      assertEquals(path, agentEvpProxy.getLastRequest().getPath());
-      assertEquals(
-          INTAKE_SUBDOMAIN, agentEvpProxy.getLastRequest().getHeader(DD_EVP_SUBDOMAIN_HEADER));
-    } finally {
-      agentEvpProxy.close();
+
+    @Test
+    void testRetriesWhenBackendReturns5xx() {
+        TrackType trackType = TrackType.CITESTCYCLE;
+        String apiVersion = "v2";
+        String evpProxyEndpoint = V2_EVP_PROXY_ENDPOINT;
+        String path = buildAgentEvpProxyPath(evpProxyEndpoint, trackType, apiVersion);
+        int[] retry = {1};
+        JavaTestHttpServer agentEvpProxy = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.post(path, api -> {
+            if (retry[0] < 5) {
+                api.getResponse().status(503).send();
+                retry[0]++;
+            } else {
+                api.getResponse().status(200).send();
+            }
+        })));
+        DDEvpProxyApi client =
+                createEvpProxyApi(agentEvpProxy.getAddress().toString(), evpProxyEndpoint, trackType, false);
+        Payload payload = prepareTraces(trackType, false, Collections.emptyList());
+
+        try {
+            RemoteApi.Response clientResponse = client.sendSerializedTraces(payload);
+            assertTrue(clientResponse.success());
+            assertTrue(clientResponse.status().isPresent());
+            assertEquals(200, clientResponse.status().getAsInt());
+            assertEquals(path, agentEvpProxy.getLastRequest().getPath());
+            assertEquals(INTAKE_SUBDOMAIN, agentEvpProxy.getLastRequest().getHeader(DD_EVP_SUBDOMAIN_HEADER));
+        } finally {
+            agentEvpProxy.close();
+        }
+    }
+
+    @Test
+    void testContentIsSentAsMsgpackEmptyTraces() throws IOException {
+        runContentIsSentAsMsgpackTest(
+                TrackType.CITESTCYCLE, "v2", V2_EVP_PROXY_ENDPOINT, false, emptyList(), emptyMap());
+    }
+
+    @Test
+    void testContentIsSentAsMsgpackFakeTypeSpan() throws IOException {
+        DDSpan span = buildSpan(1L, "fakeType", Collections.singletonMap("service.name", "my-service"));
+        span.finish();
+        setDurationNano(span, 10L);
+        List<List<DDSpan>> traces = singletonList(singletonList(span));
+
+        Map<String, Object> metadata = buildMetadataMap();
+        Map<String, Object> content = new TreeMap<>();
+        content.put("service", "my-service");
+        content.put("name", "fakeOperation");
+        content.put("resource", "fakeResource");
+        content.put("error", 0);
+        content.put("trace_id", 1L);
+        content.put("span_id", 1L);
+        content.put("parent_id", 0L);
+        content.put("start", 1000L);
+        content.put("duration", 10L);
+        content.put("meta", singletonMap(DDTags.DD_SVC_SRC, ServiceNameSources.MANUAL.toString()));
+        content.put("metrics", emptyMap());
+        Map<String, Object> event = new TreeMap<>();
+        event.put("type", "span");
+        event.put("version", 1);
+        event.put("content", content);
+        Map<String, Object> expectedRequestBody = new TreeMap<>();
+        expectedRequestBody.put("version", 1);
+        expectedRequestBody.put("metadata", metadata);
+        expectedRequestBody.put("events", singletonList(event));
+
+        runContentIsSentAsMsgpackTest(
+                TrackType.CITESTCYCLE, "v2", V2_EVP_PROXY_ENDPOINT, false, traces, expectedRequestBody);
+    }
+
+    @Test
+    void testContentIsSentAsMsgpackTestSpan() throws IOException {
+        Map<String, Object> spanTags = new HashMap<>();
+        spanTags.put("test_suite_id", 123L);
+        spanTags.put("test_module_id", 456L);
+        DDSpan span = buildSpan(1L, InternalSpanTypes.TEST, spanTags);
+        span.finish();
+        setDurationNano(span, 10L);
+        List<List<DDSpan>> traces = singletonList(singletonList(span));
+
+        Map<String, Object> metadata = buildMetadataMap();
+        Map<String, Object> content = new TreeMap<>();
+        content.put("test_suite_id", 123L);
+        content.put("test_module_id", 456L);
+        content.put("service", "fakeService");
+        content.put("name", "fakeOperation");
+        content.put("resource", "fakeResource");
+        content.put("error", 0);
+        content.put("trace_id", 1L);
+        content.put("span_id", 1L);
+        content.put("parent_id", 0L);
+        content.put("start", 1000L);
+        content.put("duration", 10L);
+        content.put("meta", emptyMap());
+        content.put("metrics", emptyMap());
+        Map<String, Object> event = new TreeMap<>();
+        event.put("type", "test");
+        event.put("version", 2);
+        event.put("content", content);
+        Map<String, Object> expectedRequestBody = new TreeMap<>();
+        expectedRequestBody.put("version", 1);
+        expectedRequestBody.put("metadata", metadata);
+        expectedRequestBody.put("events", singletonList(event));
+
+        runContentIsSentAsMsgpackTest(
+                TrackType.CITESTCYCLE, "v2", V2_EVP_PROXY_ENDPOINT, false, traces, expectedRequestBody);
+    }
+
+    @Test
+    void testContentIsSentAsMsgpackTestSuiteEndSpan() throws IOException {
+        Map<String, Object> spanTags = new HashMap<>();
+        spanTags.put("test_suite_id", 123L);
+        spanTags.put("test_module_id", 456L);
+        DDSpan span = buildSpan(1L, InternalSpanTypes.TEST_SUITE_END, spanTags);
+        span.finish();
+        setDurationNano(span, 10L);
+        List<List<DDSpan>> traces = singletonList(singletonList(span));
+
+        Map<String, Object> metadata = buildMetadataMap();
+        Map<String, Object> content = new TreeMap<>();
+        content.put("test_suite_id", 123L);
+        content.put("test_module_id", 456L);
+        content.put("service", "fakeService");
+        content.put("name", "fakeOperation");
+        content.put("resource", "fakeResource");
+        content.put("error", 0);
+        content.put("start", 1000L);
+        content.put("duration", 10L);
+        content.put("meta", emptyMap());
+        content.put("metrics", emptyMap());
+        Map<String, Object> event = new TreeMap<>();
+        event.put("type", "test_suite_end");
+        event.put("version", 1);
+        event.put("content", content);
+        Map<String, Object> expectedRequestBody = new TreeMap<>();
+        expectedRequestBody.put("version", 1);
+        expectedRequestBody.put("metadata", metadata);
+        expectedRequestBody.put("events", singletonList(event));
+
+        runContentIsSentAsMsgpackTest(
+                TrackType.CITESTCYCLE, "v2", V2_EVP_PROXY_ENDPOINT, false, traces, expectedRequestBody);
+    }
+
+    @Test
+    void testContentIsSentAsMsgpackTestModuleEndSpanWithCompression() throws IOException {
+        Map<String, Object> spanTags = new HashMap<>();
+        spanTags.put("test_module_id", 456L);
+        DDSpan span = buildSpan(1L, InternalSpanTypes.TEST_MODULE_END, spanTags);
+        span.finish();
+        setDurationNano(span, 10L);
+        List<List<DDSpan>> traces = singletonList(singletonList(span));
+
+        Map<String, Object> metadata = buildMetadataMap();
+        Map<String, Object> content = new TreeMap<>();
+        content.put("test_module_id", 456L);
+        content.put("service", "fakeService");
+        content.put("name", "fakeOperation");
+        content.put("resource", "fakeResource");
+        content.put("error", 0);
+        content.put("start", 1000L);
+        content.put("duration", 10L);
+        content.put("meta", emptyMap());
+        content.put("metrics", emptyMap());
+        Map<String, Object> event = new TreeMap<>();
+        event.put("type", "test_module_end");
+        event.put("version", 1);
+        event.put("content", content);
+        Map<String, Object> expectedRequestBody = new TreeMap<>();
+        expectedRequestBody.put("version", 1);
+        expectedRequestBody.put("metadata", metadata);
+        expectedRequestBody.put("events", singletonList(event));
+
+        runContentIsSentAsMsgpackTest(
+                TrackType.CITESTCYCLE, "v2", V4_EVP_PROXY_ENDPOINT, true, traces, expectedRequestBody);
     }
-  }
-
-  @Test
-  void testContentIsSentAsMsgpackEmptyTraces() throws IOException {
-    runContentIsSentAsMsgpackTest(
-        TrackType.CITESTCYCLE, "v2", V2_EVP_PROXY_ENDPOINT, false, emptyList(), emptyMap());
-  }
-
-  @Test
-  void testContentIsSentAsMsgpackFakeTypeSpan() throws IOException {
-    DDSpan span = buildSpan(1L, "fakeType", Collections.singletonMap("service.name", "my-service"));
-    span.finish();
-    setDurationNano(span, 10L);
-    List<List<DDSpan>> traces = singletonList(singletonList(span));
-
-    Map<String, Object> metadata = buildMetadataMap();
-    Map<String, Object> content = new TreeMap<>();
-    content.put("service", "my-service");
-    content.put("name", "fakeOperation");
-    content.put("resource", "fakeResource");
-    content.put("error", 0);
-    content.put("trace_id", 1L);
-    content.put("span_id", 1L);
-    content.put("parent_id", 0L);
-    content.put("start", 1000L);
-    content.put("duration", 10L);
-    content.put("meta", singletonMap(DDTags.DD_SVC_SRC, ServiceNameSources.MANUAL.toString()));
-    content.put("metrics", emptyMap());
-    Map<String, Object> event = new TreeMap<>();
-    event.put("type", "span");
-    event.put("version", 1);
-    event.put("content", content);
-    Map<String, Object> expectedRequestBody = new TreeMap<>();
-    expectedRequestBody.put("version", 1);
-    expectedRequestBody.put("metadata", metadata);
-    expectedRequestBody.put("events", singletonList(event));
-
-    runContentIsSentAsMsgpackTest(
-        TrackType.CITESTCYCLE, "v2", V2_EVP_PROXY_ENDPOINT, false, traces, expectedRequestBody);
-  }
-
-  @Test
-  void testContentIsSentAsMsgpackTestSpan() throws IOException {
-    Map<String, Object> spanTags = new HashMap<>();
-    spanTags.put("test_suite_id", 123L);
-    spanTags.put("test_module_id", 456L);
-    DDSpan span = buildSpan(1L, InternalSpanTypes.TEST, spanTags);
-    span.finish();
-    setDurationNano(span, 10L);
-    List<List<DDSpan>> traces = singletonList(singletonList(span));
-
-    Map<String, Object> metadata = buildMetadataMap();
-    Map<String, Object> content = new TreeMap<>();
-    content.put("test_suite_id", 123L);
-    content.put("test_module_id", 456L);
-    content.put("service", "fakeService");
-    content.put("name", "fakeOperation");
-    content.put("resource", "fakeResource");
-    content.put("error", 0);
-    content.put("trace_id", 1L);
-    content.put("span_id", 1L);
-    content.put("parent_id", 0L);
-    content.put("start", 1000L);
-    content.put("duration", 10L);
-    content.put("meta", emptyMap());
-    content.put("metrics", emptyMap());
-    Map<String, Object> event = new TreeMap<>();
-    event.put("type", "test");
-    event.put("version", 2);
-    event.put("content", content);
-    Map<String, Object> expectedRequestBody = new TreeMap<>();
-    expectedRequestBody.put("version", 1);
-    expectedRequestBody.put("metadata", metadata);
-    expectedRequestBody.put("events", singletonList(event));
-
-    runContentIsSentAsMsgpackTest(
-        TrackType.CITESTCYCLE, "v2", V2_EVP_PROXY_ENDPOINT, false, traces, expectedRequestBody);
-  }
-
-  @Test
-  void testContentIsSentAsMsgpackTestSuiteEndSpan() throws IOException {
-    Map<String, Object> spanTags = new HashMap<>();
-    spanTags.put("test_suite_id", 123L);
-    spanTags.put("test_module_id", 456L);
-    DDSpan span = buildSpan(1L, InternalSpanTypes.TEST_SUITE_END, spanTags);
-    span.finish();
-    setDurationNano(span, 10L);
-    List<List<DDSpan>> traces = singletonList(singletonList(span));
-
-    Map<String, Object> metadata = buildMetadataMap();
-    Map<String, Object> content = new TreeMap<>();
-    content.put("test_suite_id", 123L);
-    content.put("test_module_id", 456L);
-    content.put("service", "fakeService");
-    content.put("name", "fakeOperation");
-    content.put("resource", "fakeResource");
-    content.put("error", 0);
-    content.put("start", 1000L);
-    content.put("duration", 10L);
-    content.put("meta", emptyMap());
-    content.put("metrics", emptyMap());
-    Map<String, Object> event = new TreeMap<>();
-    event.put("type", "test_suite_end");
-    event.put("version", 1);
-    event.put("content", content);
-    Map<String, Object> expectedRequestBody = new TreeMap<>();
-    expectedRequestBody.put("version", 1);
-    expectedRequestBody.put("metadata", metadata);
-    expectedRequestBody.put("events", singletonList(event));
-
-    runContentIsSentAsMsgpackTest(
-        TrackType.CITESTCYCLE, "v2", V2_EVP_PROXY_ENDPOINT, false, traces, expectedRequestBody);
-  }
-
-  @Test
-  void testContentIsSentAsMsgpackTestModuleEndSpanWithCompression() throws IOException {
-    Map<String, Object> spanTags = new HashMap<>();
-    spanTags.put("test_module_id", 456L);
-    DDSpan span = buildSpan(1L, InternalSpanTypes.TEST_MODULE_END, spanTags);
-    span.finish();
-    setDurationNano(span, 10L);
-    List<List<DDSpan>> traces = singletonList(singletonList(span));
-
-    Map<String, Object> metadata = buildMetadataMap();
-    Map<String, Object> content = new TreeMap<>();
-    content.put("test_module_id", 456L);
-    content.put("service", "fakeService");
-    content.put("name", "fakeOperation");
-    content.put("resource", "fakeResource");
-    content.put("error", 0);
-    content.put("start", 1000L);
-    content.put("duration", 10L);
-    content.put("meta", emptyMap());
-    content.put("metrics", emptyMap());
-    Map<String, Object> event = new TreeMap<>();
-    event.put("type", "test_module_end");
-    event.put("version", 1);
-    event.put("content", content);
-    Map<String, Object> expectedRequestBody = new TreeMap<>();
-    expectedRequestBody.put("version", 1);
-    expectedRequestBody.put("metadata", metadata);
-    expectedRequestBody.put("events", singletonList(event));
-
-    runContentIsSentAsMsgpackTest(
-        TrackType.CITESTCYCLE, "v2", V4_EVP_PROXY_ENDPOINT, true, traces, expectedRequestBody);
-  }
-
-  // --- Helper methods ---
-
-  private void runContentIsSentAsMsgpackTest(
-      TrackType trackType,
-      String apiVersion,
-      String evpProxyEndpoint,
-      boolean compressionEnabled,
-      List<List<DDSpan>> traces,
-      Map<String, Object> expectedRequestBody)
-      throws IOException {
-    String path = buildAgentEvpProxyPath(evpProxyEndpoint, trackType, apiVersion);
-    JavaTestHttpServer agentEvpProxy =
-        JavaTestHttpServer.httpServer(
-            s -> s.handlers(h -> h.post(path, api -> api.getResponse().send())));
-    DDEvpProxyApi client =
-        createEvpProxyApi(
-            agentEvpProxy.getAddress().toString(), evpProxyEndpoint, trackType, compressionEnabled);
-    Payload payload = prepareTraces(trackType, compressionEnabled, traces);
-
-    try {
-      client.sendSerializedTraces(payload).status();
-      assertEquals("application/msgpack", agentEvpProxy.getLastRequest().getContentType());
-      Map<String, Object> actualBody =
-          convertMap(agentEvpProxy.getLastRequest().getBody(), compressionEnabled);
-      assertDeepEquals(expectedRequestBody, actualBody);
-    } finally {
-      agentEvpProxy.close();
+
+    // --- Helper methods ---
+
+    private void runContentIsSentAsMsgpackTest(
+            TrackType trackType,
+            String apiVersion,
+            String evpProxyEndpoint,
+            boolean compressionEnabled,
+            List<List<DDSpan>> traces,
+            Map<String, Object> expectedRequestBody)
+            throws IOException {
+        String path = buildAgentEvpProxyPath(evpProxyEndpoint, trackType, apiVersion);
+        JavaTestHttpServer agentEvpProxy = JavaTestHttpServer.httpServer(
+                s -> s.handlers(h -> h.post(path, api -> api.getResponse().send())));
+        DDEvpProxyApi client = createEvpProxyApi(
+                agentEvpProxy.getAddress().toString(), evpProxyEndpoint, trackType, compressionEnabled);
+        Payload payload = prepareTraces(trackType, compressionEnabled, traces);
+
+        try {
+            client.sendSerializedTraces(payload).status();
+            assertEquals("application/msgpack", agentEvpProxy.getLastRequest().getContentType());
+            Map<String, Object> actualBody =
+                    convertMap(agentEvpProxy.getLastRequest().getBody(), compressionEnabled);
+            assertDeepEquals(expectedRequestBody, actualBody);
+        } finally {
+            agentEvpProxy.close();
+        }
     }
-  }
-
-  private static Map<String, Object> buildMetadataMap() {
-    Map<String, Object> star = new TreeMap<>();
-    star.put("env", "my-env");
-    star.put("runtime-id", "my-runtime-id");
-    star.put("language", "my-language");
-    star.put(Tags.RUNTIME_NAME, "my-runtime-name");
-    star.put(Tags.RUNTIME_VERSION, "my-runtime-version");
-    star.put(Tags.RUNTIME_VENDOR, "my-runtime-vendor");
-    star.put(Tags.OS_ARCHITECTURE, "my-os-arch");
-    star.put(Tags.OS_PLATFORM, "my-os-platform");
-    star.put(Tags.OS_VERSION, "my-os-version");
-    star.put(DDTags.TEST_IS_USER_PROVIDED_SERVICE, "false");
-    Map<String, Object> metadata = new TreeMap<>();
-    metadata.put("*", star);
-    return metadata;
-  }
-
-  private static void setDurationNano(DDSpan span, long duration) {
-    try {
-      Field field = DDSpan.class.getDeclaredField("durationNano");
-      field.setAccessible(true);
-      field.setLong(span, duration);
-    } catch (NoSuchFieldException | IllegalAccessException e) {
-      Assertions.fail("Could not set durationNano: " + e.getMessage());
+
+    private static Map<String, Object> buildMetadataMap() {
+        Map<String, Object> star = new TreeMap<>();
+        star.put("env", "my-env");
+        star.put("runtime-id", "my-runtime-id");
+        star.put("language", "my-language");
+        star.put(Tags.RUNTIME_NAME, "my-runtime-name");
+        star.put(Tags.RUNTIME_VERSION, "my-runtime-version");
+        star.put(Tags.RUNTIME_VENDOR, "my-runtime-vendor");
+        star.put(Tags.OS_ARCHITECTURE, "my-os-arch");
+        star.put(Tags.OS_PLATFORM, "my-os-platform");
+        star.put(Tags.OS_VERSION, "my-os-version");
+        star.put(DDTags.TEST_IS_USER_PROVIDED_SERVICE, "false");
+        Map<String, Object> metadata = new TreeMap<>();
+        metadata.put("*", star);
+        return metadata;
     }
-  }
 
-  static Map<String, Object> convertMap(byte[] bytes, boolean compressionEnabled)
-      throws IOException {
-    if (compressionEnabled) {
-      bytes = decompress(bytes);
+    private static void setDurationNano(DDSpan span, long duration) {
+        try {
+            Field field = DDSpan.class.getDeclaredField("durationNano");
+            field.setAccessible(true);
+            field.setLong(span, duration);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            Assertions.fail("Could not set durationNano: " + e.getMessage());
+        }
     }
-    return MSG_PACK_MAPPER.readValue(bytes, new TypeReference<TreeMap<String, Object>>() {});
-  }
-
-  static byte[] decompress(byte[] bytes) throws IOException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    try (GZIPInputStream zip = new GZIPInputStream(new ByteArrayInputStream(bytes))) {
-      byte[] buf = new byte[4096];
-      int len;
-      while ((len = zip.read(buf)) != -1) {
-        baos.write(buf, 0, len);
-      }
+
+    static Map<String, Object> convertMap(byte[] bytes, boolean compressionEnabled) throws IOException {
+        if (compressionEnabled) {
+            bytes = decompress(bytes);
+        }
+        return MSG_PACK_MAPPER.readValue(bytes, new TypeReference<TreeMap<String, Object>>() {});
     }
-    return baos.toByteArray();
-  }
-
-  private DDEvpProxyApi createEvpProxyApi(
-      String agentUrl, String evpProxyEndpoint, TrackType trackType, boolean compressionEnabled) {
-    return DDEvpProxyApi.builder()
-        .agentUrl(HttpUrl.get(agentUrl))
-        .evpProxyEndpoint(evpProxyEndpoint)
-        .trackType(trackType)
-        .compressionEnabled(compressionEnabled)
-        .build();
-  }
-
-  private RemoteMapper discoverMapper(TrackType trackType, boolean compressionEnabled) {
-    DDIntakeMapperDiscovery mapperDiscovery =
-        new DDIntakeMapperDiscovery(trackType, WELL_KNOWN_TAGS, compressionEnabled);
-    mapperDiscovery.discover();
-    return mapperDiscovery.getMapper();
-  }
-
-  private String buildAgentEvpProxyPath(
-      String evpProxyEndpoint, TrackType trackType, String apiVersion) {
-    return "/" + evpProxyEndpoint + "api/" + apiVersion + "/" + trackType.name().toLowerCase();
-  }
-
-  private Payload prepareTraces(
-      TrackType trackType, boolean compressionEnabled, List<List<DDSpan>> traces) {
-    TracesCapture traceCapture = new TracesCapture();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1 << 20, traceCapture));
-    RemoteMapper mapper = discoverMapper(trackType, compressionEnabled);
-    for (List<DDSpan> trace : traces) {
-      packer.format(trace, mapper);
+
+    static byte[] decompress(byte[] bytes) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (GZIPInputStream zip = new GZIPInputStream(new ByteArrayInputStream(bytes))) {
+            byte[] buf = new byte[4096];
+            int len;
+            while ((len = zip.read(buf)) != -1) {
+                baos.write(buf, 0, len);
+            }
+        }
+        return baos.toByteArray();
     }
-    packer.flush();
-    return mapper
-        .newPayload()
-        .withBody(
-            traceCapture.traceCount,
-            traces.isEmpty() ? ByteBuffer.allocate(0) : traceCapture.buffer);
-  }
-
-  @SuppressWarnings("unchecked")
-  static void assertDeepEquals(Object expected, Object actual) {
-    if (expected == null && actual == null) {
-      return;
+
+    private DDEvpProxyApi createEvpProxyApi(
+            String agentUrl, String evpProxyEndpoint, TrackType trackType, boolean compressionEnabled) {
+        return DDEvpProxyApi.builder()
+                .agentUrl(HttpUrl.get(agentUrl))
+                .evpProxyEndpoint(evpProxyEndpoint)
+                .trackType(trackType)
+                .compressionEnabled(compressionEnabled)
+                .build();
     }
-    if (expected == null || actual == null) {
-      Assertions.fail("Expected " + expected + " but got " + actual);
+
+    private RemoteMapper discoverMapper(TrackType trackType, boolean compressionEnabled) {
+        DDIntakeMapperDiscovery mapperDiscovery =
+                new DDIntakeMapperDiscovery(trackType, WELL_KNOWN_TAGS, compressionEnabled);
+        mapperDiscovery.discover();
+        return mapperDiscovery.getMapper();
     }
-    if (expected instanceof Map) {
-      assertInstanceOf(Map.class, actual, "Expected Map but got " + actual.getClass());
-      Map<Object, Object> expectedMap = (Map<Object, Object>) expected;
-      Map<Object, Object> actualMap = (Map<Object, Object>) actual;
-      assertEquals(expectedMap.size(), actualMap.size(), "Map size mismatch");
-      for (Map.Entry<Object, Object> entry : expectedMap.entrySet()) {
-        assertTrue(actualMap.containsKey(entry.getKey()), "Missing key: " + entry.getKey());
-        assertDeepEquals(entry.getValue(), actualMap.get(entry.getKey()));
-      }
-    } else if (expected instanceof List) {
-      assertInstanceOf(List.class, actual, "Expected List but got " + actual.getClass());
-      List<Object> expectedList = (List<Object>) expected;
-      List<Object> actualList = (List<Object>) actual;
-      assertEquals(expectedList.size(), actualList.size(), "List size mismatch");
-      for (int i = 0; i < expectedList.size(); i++) {
-        assertDeepEquals(expectedList.get(i), actualList.get(i));
-      }
-    } else if (expected instanceof Number && actual instanceof Number) {
-      if (expected instanceof Float
-          || expected instanceof Double
-          || actual instanceof Float
-          || actual instanceof Double) {
-        assertEquals(((Number) expected).doubleValue(), ((Number) actual).doubleValue(), 0.0001);
-      } else {
-        assertEquals(((Number) expected).longValue(), ((Number) actual).longValue());
-      }
-    } else {
-      assertEquals(expected, actual);
+
+    private String buildAgentEvpProxyPath(String evpProxyEndpoint, TrackType trackType, String apiVersion) {
+        return "/" + evpProxyEndpoint + "api/" + apiVersion + "/"
+                + trackType.name().toLowerCase();
+    }
+
+    private Payload prepareTraces(TrackType trackType, boolean compressionEnabled, List<List<DDSpan>> traces) {
+        TracesCapture traceCapture = new TracesCapture();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1 << 20, traceCapture));
+        RemoteMapper mapper = discoverMapper(trackType, compressionEnabled);
+        for (List<DDSpan> trace : traces) {
+            packer.format(trace, mapper);
+        }
+        packer.flush();
+        return mapper.newPayload()
+                .withBody(traceCapture.traceCount, traces.isEmpty() ? ByteBuffer.allocate(0) : traceCapture.buffer);
+    }
+
+    @SuppressWarnings("unchecked")
+    static void assertDeepEquals(Object expected, Object actual) {
+        if (expected == null && actual == null) {
+            return;
+        }
+        if (expected == null || actual == null) {
+            Assertions.fail("Expected " + expected + " but got " + actual);
+        }
+        if (expected instanceof Map) {
+            assertInstanceOf(Map.class, actual, "Expected Map but got " + actual.getClass());
+            Map<Object, Object> expectedMap = (Map<Object, Object>) expected;
+            Map<Object, Object> actualMap = (Map<Object, Object>) actual;
+            assertEquals(expectedMap.size(), actualMap.size(), "Map size mismatch");
+            for (Map.Entry<Object, Object> entry : expectedMap.entrySet()) {
+                assertTrue(actualMap.containsKey(entry.getKey()), "Missing key: " + entry.getKey());
+                assertDeepEquals(entry.getValue(), actualMap.get(entry.getKey()));
+            }
+        } else if (expected instanceof List) {
+            assertInstanceOf(List.class, actual, "Expected List but got " + actual.getClass());
+            List<Object> expectedList = (List<Object>) expected;
+            List<Object> actualList = (List<Object>) actual;
+            assertEquals(expectedList.size(), actualList.size(), "List size mismatch");
+            for (int i = 0; i < expectedList.size(); i++) {
+                assertDeepEquals(expectedList.get(i), actualList.get(i));
+            }
+        } else if (expected instanceof Number && actual instanceof Number) {
+            if (expected instanceof Float
+                    || expected instanceof Double
+                    || actual instanceof Float
+                    || actual instanceof Double) {
+                assertEquals(((Number) expected).doubleValue(), ((Number) actual).doubleValue(), 0.0001);
+            } else {
+                assertEquals(((Number) expected).longValue(), ((Number) actual).longValue());
+            }
+        } else {
+            assertEquals(expected, actual);
+        }
     }
-  }
 
-  static class TracesCapture implements ByteBufferConsumer {
-    int traceCount;
-    ByteBuffer buffer;
+    static class TracesCapture implements ByteBufferConsumer {
+        int traceCount;
+        ByteBuffer buffer;
 
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {
-      this.buffer = buffer;
-      this.traceCount = messageCount;
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {
+            this.buffer = buffer;
+            this.traceCount = messageCount;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeApiTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeApiTest.java
index c00f322d9da..82bee7b9650 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeApiTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeApiTest.java
@@ -44,421 +44,389 @@
 @Timeout(20)
 class DDIntakeApiTest extends DDCoreJavaSpecification {
 
-  static final CiVisibilityWellKnownTags WELL_KNOWN_TAGS =
-      new CiVisibilityWellKnownTags(
-          "my-runtime-id",
-          "my-env",
-          "my-language",
-          "my-runtime-name",
-          "my-runtime-version",
-          "my-runtime-vendor",
-          "my-os-arch",
-          "my-os-platform",
-          "my-os-version",
-          "false");
-
-  static final String API_KEY = "my-secret-apikey";
-  static final ObjectMapper MSG_PACK_MAPPER = new ObjectMapper(new MessagePackFactory());
-
-  @Test
-  void testSendingAnEmptyListOfTracesReturnsNoErrors() {
-    TrackType trackType = TrackType.CITESTCYCLE;
-    String apiVersion = "v2";
-    String path = buildIntakePath(trackType, apiVersion);
-    JavaTestHttpServer intake =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.post(
-                            path,
-                            api -> {
-                              if (!"application/msgpack"
-                                  .equals(api.getRequest().getContentType())) {
-                                api.getResponse()
-                                    .status(400)
-                                    .send("wrong type: " + api.getRequest().getContentType());
-                              } else {
-                                api.getResponse().status(200).send();
-                              }
-                            })));
-    DDIntakeApi client = createIntakeApi(intake.getAddress().toString(), trackType);
-    Payload payload = prepareTraces(trackType, Collections.emptyList());
-
-    try {
-      RemoteApi.Response clientResponse = client.sendSerializedTraces(payload);
-      assertTrue(clientResponse.success());
-      assertTrue(clientResponse.status().isPresent());
-      assertEquals(200, clientResponse.status().getAsInt());
-      assertEquals(path, intake.getLastRequest().getPath());
-    } finally {
-      intake.close();
+    static final CiVisibilityWellKnownTags WELL_KNOWN_TAGS = new CiVisibilityWellKnownTags(
+            "my-runtime-id",
+            "my-env",
+            "my-language",
+            "my-runtime-name",
+            "my-runtime-version",
+            "my-runtime-vendor",
+            "my-os-arch",
+            "my-os-platform",
+            "my-os-version",
+            "false");
+
+    static final String API_KEY = "my-secret-apikey";
+    static final ObjectMapper MSG_PACK_MAPPER = new ObjectMapper(new MessagePackFactory());
+
+    @Test
+    void testSendingAnEmptyListOfTracesReturnsNoErrors() {
+        TrackType trackType = TrackType.CITESTCYCLE;
+        String apiVersion = "v2";
+        String path = buildIntakePath(trackType, apiVersion);
+        JavaTestHttpServer intake = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.post(path, api -> {
+            if (!"application/msgpack".equals(api.getRequest().getContentType())) {
+                api.getResponse()
+                        .status(400)
+                        .send("wrong type: " + api.getRequest().getContentType());
+            } else {
+                api.getResponse().status(200).send();
+            }
+        })));
+        DDIntakeApi client = createIntakeApi(intake.getAddress().toString(), trackType);
+        Payload payload = prepareTraces(trackType, Collections.emptyList());
+
+        try {
+            RemoteApi.Response clientResponse = client.sendSerializedTraces(payload);
+            assertTrue(clientResponse.success());
+            assertTrue(clientResponse.status().isPresent());
+            assertEquals(200, clientResponse.status().getAsInt());
+            assertEquals(path, intake.getLastRequest().getPath());
+        } finally {
+            intake.close();
+        }
     }
-  }
-
-  @Test
-  void testRetriesWhenBackendReturns5xx() {
-    TrackType trackType = TrackType.CITESTCYCLE;
-    String apiVersion = "v2";
-    String path = buildIntakePath(trackType, apiVersion);
-    int[] retry = {1};
-    JavaTestHttpServer intake =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.post(
-                            path,
-                            api -> {
-                              if (retry[0] < 5) {
-                                api.getResponse().status(503).send();
-                                retry[0]++;
-                              } else {
-                                api.getResponse().status(200).send();
-                              }
-                            })));
-    DDIntakeApi client = createIntakeApi(intake.getAddress().toString(), trackType);
-    Payload payload = prepareTraces(trackType, Collections.emptyList());
-
-    try {
-      RemoteApi.Response clientResponse = client.sendSerializedTraces(payload);
-      assertTrue(clientResponse.success());
-      assertTrue(clientResponse.status().isPresent());
-      assertEquals(200, clientResponse.status().getAsInt());
-      assertEquals(path, intake.getLastRequest().getPath());
-    } finally {
-      intake.close();
+
+    @Test
+    void testRetriesWhenBackendReturns5xx() {
+        TrackType trackType = TrackType.CITESTCYCLE;
+        String apiVersion = "v2";
+        String path = buildIntakePath(trackType, apiVersion);
+        int[] retry = {1};
+        JavaTestHttpServer intake = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.post(path, api -> {
+            if (retry[0] < 5) {
+                api.getResponse().status(503).send();
+                retry[0]++;
+            } else {
+                api.getResponse().status(200).send();
+            }
+        })));
+        DDIntakeApi client = createIntakeApi(intake.getAddress().toString(), trackType);
+        Payload payload = prepareTraces(trackType, Collections.emptyList());
+
+        try {
+            RemoteApi.Response clientResponse = client.sendSerializedTraces(payload);
+            assertTrue(clientResponse.success());
+            assertTrue(clientResponse.status().isPresent());
+            assertEquals(200, clientResponse.status().getAsInt());
+            assertEquals(path, intake.getLastRequest().getPath());
+        } finally {
+            intake.close();
+        }
     }
-  }
-
-  @Test
-  void testRetriesWhenBackendReturns429TooManyRequests() {
-    TrackType trackType = TrackType.CITESTCYCLE;
-    String apiVersion = "v2";
-    String path = buildIntakePath(trackType, apiVersion);
-    int[] retry = {0};
-    try (JavaTestHttpServer intake =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.post(
-                            path,
-                            api -> {
-                              if (retry[0] < 1) {
-                                api.getResponse()
-                                    .status(429)
-                                    .addHeader("x-ratelimit-reset", "0")
-                                    .send();
-                                retry[0]++;
-                              } else {
-                                api.getResponse().status(200).send();
-                              }
-                            })))) {
-
-      DDIntakeApi client = createIntakeApi(intake.getAddress().toString(), trackType);
-      Payload payload = prepareTraces(trackType, Collections.emptyList());
-
-      RemoteApi.Response clientResponse = client.sendSerializedTraces(payload);
-      assertTrue(clientResponse.success());
-      assertTrue(clientResponse.status().isPresent());
-      assertEquals(200, clientResponse.status().getAsInt());
-      assertEquals(path, intake.getLastRequest().getPath());
+
+    @Test
+    void testRetriesWhenBackendReturns429TooManyRequests() {
+        TrackType trackType = TrackType.CITESTCYCLE;
+        String apiVersion = "v2";
+        String path = buildIntakePath(trackType, apiVersion);
+        int[] retry = {0};
+        try (JavaTestHttpServer intake = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.post(path, api -> {
+            if (retry[0] < 1) {
+                api.getResponse()
+                        .status(429)
+                        .addHeader("x-ratelimit-reset", "0")
+                        .send();
+                retry[0]++;
+            } else {
+                api.getResponse().status(200).send();
+            }
+        })))) {
+
+            DDIntakeApi client = createIntakeApi(intake.getAddress().toString(), trackType);
+            Payload payload = prepareTraces(trackType, Collections.emptyList());
+
+            RemoteApi.Response clientResponse = client.sendSerializedTraces(payload);
+            assertTrue(clientResponse.success());
+            assertTrue(clientResponse.status().isPresent());
+            assertEquals(200, clientResponse.status().getAsInt());
+            assertEquals(path, intake.getLastRequest().getPath());
+        }
     }
-  }
-
-  @Test
-  void testContentIsSentAsMsgpackEmptyTraces() throws IOException {
-    runContentIsSentAsMsgpackTest(TrackType.CITESTCYCLE, "v2", emptyList(), emptyMap());
-  }
-
-  @Test
-  void testContentIsSentAsMsgpackFakeTypeSpan() throws IOException {
-    DDSpan span = buildSpan(1L, "fakeType", Collections.singletonMap("service.name", "my-service"));
-    span.finish();
-    setDurationNano(span, 10L);
-    List<List<DDSpan>> traces = Collections.singletonList(Collections.singletonList(span));
-
-    Map<String, Object> metadata = buildMetadataMap();
-    Map<String, Object> content = new TreeMap<>();
-    content.put("service", "my-service");
-    content.put("name", "fakeOperation");
-    content.put("resource", "fakeResource");
-    content.put("error", 0);
-    content.put("trace_id", 1L);
-    content.put("span_id", 1L);
-    content.put("parent_id", 0L);
-    content.put("start", 1000L);
-    content.put("duration", 10L);
-    content.put(
-        "meta", Collections.singletonMap(DDTags.DD_SVC_SRC, ServiceNameSources.MANUAL.toString()));
-    content.put("metrics", emptyMap());
-    Map<String, Object> event = new TreeMap<>();
-    event.put("type", "span");
-    event.put("version", 1);
-    event.put("content", content);
-    Map<String, Object> expectedRequestBody = new TreeMap<>();
-    expectedRequestBody.put("version", 1);
-    expectedRequestBody.put("metadata", metadata);
-    expectedRequestBody.put("events", Collections.singletonList(event));
-
-    runContentIsSentAsMsgpackTest(TrackType.CITESTCYCLE, "v2", traces, expectedRequestBody);
-  }
-
-  @Test
-  void testContentIsSentAsMsgpackTestSpan() throws IOException {
-    Map<String, Object> spanTags = new HashMap<>();
-    spanTags.put("test_suite_id", 123L);
-    spanTags.put("test_module_id", 456L);
-    DDSpan span = buildSpan(1L, InternalSpanTypes.TEST, spanTags);
-    span.finish();
-    setDurationNano(span, 10L);
-    List<List<DDSpan>> traces = Collections.singletonList(Collections.singletonList(span));
-
-    Map<String, Object> metadata = buildMetadataMap();
-    Map<String, Object> content = new TreeMap<>();
-    content.put("test_suite_id", 123L);
-    content.put("test_module_id", 456L);
-    content.put("service", "fakeService");
-    content.put("name", "fakeOperation");
-    content.put("resource", "fakeResource");
-    content.put("error", 0);
-    content.put("trace_id", 1L);
-    content.put("span_id", 1L);
-    content.put("parent_id", 0L);
-    content.put("start", 1000L);
-    content.put("duration", 10L);
-    content.put("meta", emptyMap());
-    content.put("metrics", emptyMap());
-    Map<String, Object> event = new TreeMap<>();
-    event.put("type", "test");
-    event.put("version", 2);
-    event.put("content", content);
-    Map<String, Object> expectedRequestBody = new TreeMap<>();
-    expectedRequestBody.put("version", 1);
-    expectedRequestBody.put("metadata", metadata);
-    expectedRequestBody.put("events", Collections.singletonList(event));
-
-    runContentIsSentAsMsgpackTest(TrackType.CITESTCYCLE, "v2", traces, expectedRequestBody);
-  }
-
-  @Test
-  void testContentIsSentAsMsgpackTestSuiteEndSpan() throws IOException {
-    Map<String, Object> spanTags = new HashMap<>();
-    spanTags.put("test_suite_id", 123L);
-    spanTags.put("test_module_id", 456L);
-    DDSpan span = buildSpan(1L, InternalSpanTypes.TEST_SUITE_END, spanTags);
-    span.finish();
-    setDurationNano(span, 10L);
-    List<List<DDSpan>> traces = Collections.singletonList(Collections.singletonList(span));
-
-    Map<String, Object> metadata = buildMetadataMap();
-    Map<String, Object> content = new TreeMap<>();
-    content.put("test_suite_id", 123L);
-    content.put("test_module_id", 456L);
-    content.put("service", "fakeService");
-    content.put("name", "fakeOperation");
-    content.put("resource", "fakeResource");
-    content.put("error", 0);
-    content.put("start", 1000L);
-    content.put("duration", 10L);
-    content.put("meta", emptyMap());
-    content.put("metrics", emptyMap());
-    Map<String, Object> event = new TreeMap<>();
-    event.put("type", "test_suite_end");
-    event.put("version", 1);
-    event.put("content", content);
-    Map<String, Object> expectedRequestBody = new TreeMap<>();
-    expectedRequestBody.put("version", 1);
-    expectedRequestBody.put("metadata", metadata);
-    expectedRequestBody.put("events", Collections.singletonList(event));
-
-    runContentIsSentAsMsgpackTest(TrackType.CITESTCYCLE, "v2", traces, expectedRequestBody);
-  }
-
-  @Test
-  void testContentIsSentAsMsgpackTestModuleEndSpan() throws IOException {
-    DDSpan span =
-        buildSpan(
-            1L,
-            InternalSpanTypes.TEST_MODULE_END,
-            Collections.singletonMap("test_module_id", 456L));
-    span.finish();
-    setDurationNano(span, 10L);
-    List<List<DDSpan>> traces = Collections.singletonList(Collections.singletonList(span));
-
-    Map<String, Object> metadata = buildMetadataMap();
-    Map<String, Object> content = new TreeMap<>();
-    content.put("test_module_id", 456L);
-    content.put("service", "fakeService");
-    content.put("name", "fakeOperation");
-    content.put("resource", "fakeResource");
-    content.put("error", 0);
-    content.put("start", 1000L);
-    content.put("duration", 10L);
-    content.put("meta", emptyMap());
-    content.put("metrics", emptyMap());
-    Map<String, Object> event = new TreeMap<>();
-    event.put("type", "test_module_end");
-    event.put("version", 1);
-    event.put("content", content);
-    Map<String, Object> expectedRequestBody = new TreeMap<>();
-    expectedRequestBody.put("version", 1);
-    expectedRequestBody.put("metadata", metadata);
-    expectedRequestBody.put("events", Collections.singletonList(event));
-
-    runContentIsSentAsMsgpackTest(TrackType.CITESTCYCLE, "v2", traces, expectedRequestBody);
-  }
-
-  // --- Helper methods ---
-
-  private void runContentIsSentAsMsgpackTest(
-      TrackType trackType,
-      String apiVersion,
-      List<List<DDSpan>> traces,
-      Map<String, Object> expectedRequestBody)
-      throws IOException {
-    String path = buildIntakePath(trackType, apiVersion);
-    JavaTestHttpServer intake =
-        JavaTestHttpServer.httpServer(
-            s -> s.handlers(h -> h.post(path, api -> api.getResponse().send())));
-    DDIntakeApi client = createIntakeApi(intake.getAddress().toString(), trackType);
-    Payload payload = prepareTraces(trackType, traces);
-
-    try {
-      OptionalInt status = client.sendSerializedTraces(payload).status();
-      assertTrue(status.isPresent());
-      assertEquals(200, status.getAsInt());
-      assertEquals("application/msgpack", intake.getLastRequest().getContentType());
-      Map<String, Object> actualBody = convertMap(intake.getLastRequest().getBody());
-      assertDeepEquals(expectedRequestBody, actualBody);
-    } finally {
-      intake.close();
+
+    @Test
+    void testContentIsSentAsMsgpackEmptyTraces() throws IOException {
+        runContentIsSentAsMsgpackTest(TrackType.CITESTCYCLE, "v2", emptyList(), emptyMap());
     }
-  }
-
-  private static Map<String, Object> buildMetadataMap() {
-    Map<String, Object> star = new TreeMap<>();
-    star.put("env", "my-env");
-    star.put("runtime-id", "my-runtime-id");
-    star.put("language", "my-language");
-    star.put(Tags.RUNTIME_NAME, "my-runtime-name");
-    star.put(Tags.RUNTIME_VERSION, "my-runtime-version");
-    star.put(Tags.RUNTIME_VENDOR, "my-runtime-vendor");
-    star.put(Tags.OS_ARCHITECTURE, "my-os-arch");
-    star.put(Tags.OS_PLATFORM, "my-os-platform");
-    star.put(Tags.OS_VERSION, "my-os-version");
-    star.put(DDTags.TEST_IS_USER_PROVIDED_SERVICE, "false");
-    Map<String, Object> metadata = new TreeMap<>();
-    metadata.put("*", star);
-    return metadata;
-  }
-
-  private static void setDurationNano(DDSpan span, long duration) {
-    try {
-      Field field = DDSpan.class.getDeclaredField("durationNano");
-      field.setAccessible(true);
-      field.setLong(span, duration);
-    } catch (NoSuchFieldException | IllegalAccessException e) {
-      Assertions.fail("Could not set durationNano: " + e.getMessage());
+
+    @Test
+    void testContentIsSentAsMsgpackFakeTypeSpan() throws IOException {
+        DDSpan span = buildSpan(1L, "fakeType", Collections.singletonMap("service.name", "my-service"));
+        span.finish();
+        setDurationNano(span, 10L);
+        List<List<DDSpan>> traces = Collections.singletonList(Collections.singletonList(span));
+
+        Map<String, Object> metadata = buildMetadataMap();
+        Map<String, Object> content = new TreeMap<>();
+        content.put("service", "my-service");
+        content.put("name", "fakeOperation");
+        content.put("resource", "fakeResource");
+        content.put("error", 0);
+        content.put("trace_id", 1L);
+        content.put("span_id", 1L);
+        content.put("parent_id", 0L);
+        content.put("start", 1000L);
+        content.put("duration", 10L);
+        content.put("meta", Collections.singletonMap(DDTags.DD_SVC_SRC, ServiceNameSources.MANUAL.toString()));
+        content.put("metrics", emptyMap());
+        Map<String, Object> event = new TreeMap<>();
+        event.put("type", "span");
+        event.put("version", 1);
+        event.put("content", content);
+        Map<String, Object> expectedRequestBody = new TreeMap<>();
+        expectedRequestBody.put("version", 1);
+        expectedRequestBody.put("metadata", metadata);
+        expectedRequestBody.put("events", Collections.singletonList(event));
+
+        runContentIsSentAsMsgpackTest(TrackType.CITESTCYCLE, "v2", traces, expectedRequestBody);
     }
-  }
-
-  static Map<String, Object> convertMap(byte[] bytes) throws IOException {
-    return MSG_PACK_MAPPER.readValue(
-        decompress(bytes), new TypeReference<TreeMap<String, Object>>() {});
-  }
-
-  static byte[] decompress(byte[] bytes) throws IOException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    try (GZIPInputStream zip = new GZIPInputStream(new ByteArrayInputStream(bytes))) {
-      byte[] buf = new byte[4096];
-      int len;
-      while ((len = zip.read(buf)) != -1) {
-        baos.write(buf, 0, len);
-      }
+
+    @Test
+    void testContentIsSentAsMsgpackTestSpan() throws IOException {
+        Map<String, Object> spanTags = new HashMap<>();
+        spanTags.put("test_suite_id", 123L);
+        spanTags.put("test_module_id", 456L);
+        DDSpan span = buildSpan(1L, InternalSpanTypes.TEST, spanTags);
+        span.finish();
+        setDurationNano(span, 10L);
+        List<List<DDSpan>> traces = Collections.singletonList(Collections.singletonList(span));
+
+        Map<String, Object> metadata = buildMetadataMap();
+        Map<String, Object> content = new TreeMap<>();
+        content.put("test_suite_id", 123L);
+        content.put("test_module_id", 456L);
+        content.put("service", "fakeService");
+        content.put("name", "fakeOperation");
+        content.put("resource", "fakeResource");
+        content.put("error", 0);
+        content.put("trace_id", 1L);
+        content.put("span_id", 1L);
+        content.put("parent_id", 0L);
+        content.put("start", 1000L);
+        content.put("duration", 10L);
+        content.put("meta", emptyMap());
+        content.put("metrics", emptyMap());
+        Map<String, Object> event = new TreeMap<>();
+        event.put("type", "test");
+        event.put("version", 2);
+        event.put("content", content);
+        Map<String, Object> expectedRequestBody = new TreeMap<>();
+        expectedRequestBody.put("version", 1);
+        expectedRequestBody.put("metadata", metadata);
+        expectedRequestBody.put("events", Collections.singletonList(event));
+
+        runContentIsSentAsMsgpackTest(TrackType.CITESTCYCLE, "v2", traces, expectedRequestBody);
     }
-    return baos.toByteArray();
-  }
-
-  private DDIntakeApi createIntakeApi(String url, TrackType trackType) {
-    HttpUrl hostUrl = HttpUrl.get(url);
-    return DDIntakeApi.builder().hostUrl(hostUrl).trackType(trackType).apiKey(API_KEY).build();
-  }
-
-  private RemoteMapper discoverMapper(TrackType trackType) {
-    DDIntakeMapperDiscovery mapperDiscovery =
-        new DDIntakeMapperDiscovery(trackType, WELL_KNOWN_TAGS, true);
-    mapperDiscovery.discover();
-    return mapperDiscovery.getMapper();
-  }
-
-  private String buildIntakePath(TrackType trackType, String apiVersion) {
-    return String.format("/api/%s/%s", apiVersion, trackType.name().toLowerCase());
-  }
-
-  private Payload prepareTraces(TrackType trackType, List<List<DDSpan>> traces) {
-    TracesCapture traceCapture = new TracesCapture();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1 << 20, traceCapture));
-    RemoteMapper mapper = discoverMapper(trackType);
-    for (List<DDSpan> trace : traces) {
-      packer.format(trace, mapper);
+
+    @Test
+    void testContentIsSentAsMsgpackTestSuiteEndSpan() throws IOException {
+        Map<String, Object> spanTags = new HashMap<>();
+        spanTags.put("test_suite_id", 123L);
+        spanTags.put("test_module_id", 456L);
+        DDSpan span = buildSpan(1L, InternalSpanTypes.TEST_SUITE_END, spanTags);
+        span.finish();
+        setDurationNano(span, 10L);
+        List<List<DDSpan>> traces = Collections.singletonList(Collections.singletonList(span));
+
+        Map<String, Object> metadata = buildMetadataMap();
+        Map<String, Object> content = new TreeMap<>();
+        content.put("test_suite_id", 123L);
+        content.put("test_module_id", 456L);
+        content.put("service", "fakeService");
+        content.put("name", "fakeOperation");
+        content.put("resource", "fakeResource");
+        content.put("error", 0);
+        content.put("start", 1000L);
+        content.put("duration", 10L);
+        content.put("meta", emptyMap());
+        content.put("metrics", emptyMap());
+        Map<String, Object> event = new TreeMap<>();
+        event.put("type", "test_suite_end");
+        event.put("version", 1);
+        event.put("content", content);
+        Map<String, Object> expectedRequestBody = new TreeMap<>();
+        expectedRequestBody.put("version", 1);
+        expectedRequestBody.put("metadata", metadata);
+        expectedRequestBody.put("events", Collections.singletonList(event));
+
+        runContentIsSentAsMsgpackTest(TrackType.CITESTCYCLE, "v2", traces, expectedRequestBody);
     }
-    packer.flush();
-    return mapper
-        .newPayload()
-        .withBody(
-            traceCapture.traceCount,
-            traces.isEmpty() ? ByteBuffer.allocate(0) : traceCapture.buffer);
-  }
-
-  @SuppressWarnings("unchecked")
-  static void assertDeepEquals(Object expected, Object actual) {
-    if (expected == null && actual == null) {
-      return;
+
+    @Test
+    void testContentIsSentAsMsgpackTestModuleEndSpan() throws IOException {
+        DDSpan span =
+                buildSpan(1L, InternalSpanTypes.TEST_MODULE_END, Collections.singletonMap("test_module_id", 456L));
+        span.finish();
+        setDurationNano(span, 10L);
+        List<List<DDSpan>> traces = Collections.singletonList(Collections.singletonList(span));
+
+        Map<String, Object> metadata = buildMetadataMap();
+        Map<String, Object> content = new TreeMap<>();
+        content.put("test_module_id", 456L);
+        content.put("service", "fakeService");
+        content.put("name", "fakeOperation");
+        content.put("resource", "fakeResource");
+        content.put("error", 0);
+        content.put("start", 1000L);
+        content.put("duration", 10L);
+        content.put("meta", emptyMap());
+        content.put("metrics", emptyMap());
+        Map<String, Object> event = new TreeMap<>();
+        event.put("type", "test_module_end");
+        event.put("version", 1);
+        event.put("content", content);
+        Map<String, Object> expectedRequestBody = new TreeMap<>();
+        expectedRequestBody.put("version", 1);
+        expectedRequestBody.put("metadata", metadata);
+        expectedRequestBody.put("events", Collections.singletonList(event));
+
+        runContentIsSentAsMsgpackTest(TrackType.CITESTCYCLE, "v2", traces, expectedRequestBody);
     }
-    if (expected == null || actual == null) {
-      Assertions.fail("Expected " + expected + " but got " + actual);
+
+    // --- Helper methods ---
+
+    private void runContentIsSentAsMsgpackTest(
+            TrackType trackType, String apiVersion, List<List<DDSpan>> traces, Map<String, Object> expectedRequestBody)
+            throws IOException {
+        String path = buildIntakePath(trackType, apiVersion);
+        JavaTestHttpServer intake = JavaTestHttpServer.httpServer(
+                s -> s.handlers(h -> h.post(path, api -> api.getResponse().send())));
+        DDIntakeApi client = createIntakeApi(intake.getAddress().toString(), trackType);
+        Payload payload = prepareTraces(trackType, traces);
+
+        try {
+            OptionalInt status = client.sendSerializedTraces(payload).status();
+            assertTrue(status.isPresent());
+            assertEquals(200, status.getAsInt());
+            assertEquals("application/msgpack", intake.getLastRequest().getContentType());
+            Map<String, Object> actualBody = convertMap(intake.getLastRequest().getBody());
+            assertDeepEquals(expectedRequestBody, actualBody);
+        } finally {
+            intake.close();
+        }
+    }
+
+    private static Map<String, Object> buildMetadataMap() {
+        Map<String, Object> star = new TreeMap<>();
+        star.put("env", "my-env");
+        star.put("runtime-id", "my-runtime-id");
+        star.put("language", "my-language");
+        star.put(Tags.RUNTIME_NAME, "my-runtime-name");
+        star.put(Tags.RUNTIME_VERSION, "my-runtime-version");
+        star.put(Tags.RUNTIME_VENDOR, "my-runtime-vendor");
+        star.put(Tags.OS_ARCHITECTURE, "my-os-arch");
+        star.put(Tags.OS_PLATFORM, "my-os-platform");
+        star.put(Tags.OS_VERSION, "my-os-version");
+        star.put(DDTags.TEST_IS_USER_PROVIDED_SERVICE, "false");
+        Map<String, Object> metadata = new TreeMap<>();
+        metadata.put("*", star);
+        return metadata;
     }
-    if (expected instanceof Map) {
-      assertInstanceOf(Map.class, actual, "Expected Map but got " + actual.getClass());
-      Map<Object, Object> expectedMap = (Map<Object, Object>) expected;
-      Map<Object, Object> actualMap = (Map<Object, Object>) actual;
-      assertEquals(expectedMap.size(), actualMap.size(), "Map size mismatch");
-      for (Map.Entry<Object, Object> entry : expectedMap.entrySet()) {
-        assertTrue(actualMap.containsKey(entry.getKey()), "Missing key: " + entry.getKey());
-        assertDeepEquals(entry.getValue(), actualMap.get(entry.getKey()));
-      }
-    } else if (expected instanceof List) {
-      assertInstanceOf(List.class, actual, "Expected List but got " + actual.getClass());
-      List<Object> expectedList = (List<Object>) expected;
-      List<Object> actualList = (List<Object>) actual;
-      assertEquals(expectedList.size(), actualList.size(), "List size mismatch");
-      for (int i = 0; i < expectedList.size(); i++) {
-        assertDeepEquals(expectedList.get(i), actualList.get(i));
-      }
-    } else if (expected instanceof Number && actual instanceof Number) {
-      if (expected instanceof Float
-          || expected instanceof Double
-          || actual instanceof Float
-          || actual instanceof Double) {
-        assertEquals(((Number) expected).doubleValue(), ((Number) actual).doubleValue(), 0.0001);
-      } else {
-        assertEquals(((Number) expected).longValue(), ((Number) actual).longValue());
-      }
-    } else {
-      assertEquals(expected, actual);
+
+    private static void setDurationNano(DDSpan span, long duration) {
+        try {
+            Field field = DDSpan.class.getDeclaredField("durationNano");
+            field.setAccessible(true);
+            field.setLong(span, duration);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            Assertions.fail("Could not set durationNano: " + e.getMessage());
+        }
+    }
+
+    static Map<String, Object> convertMap(byte[] bytes) throws IOException {
+        return MSG_PACK_MAPPER.readValue(decompress(bytes), new TypeReference<TreeMap<String, Object>>() {});
+    }
+
+    static byte[] decompress(byte[] bytes) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (GZIPInputStream zip = new GZIPInputStream(new ByteArrayInputStream(bytes))) {
+            byte[] buf = new byte[4096];
+            int len;
+            while ((len = zip.read(buf)) != -1) {
+                baos.write(buf, 0, len);
+            }
+        }
+        return baos.toByteArray();
+    }
+
+    private DDIntakeApi createIntakeApi(String url, TrackType trackType) {
+        HttpUrl hostUrl = HttpUrl.get(url);
+        return DDIntakeApi.builder()
+                .hostUrl(hostUrl)
+                .trackType(trackType)
+                .apiKey(API_KEY)
+                .build();
+    }
+
+    private RemoteMapper discoverMapper(TrackType trackType) {
+        DDIntakeMapperDiscovery mapperDiscovery = new DDIntakeMapperDiscovery(trackType, WELL_KNOWN_TAGS, true);
+        mapperDiscovery.discover();
+        return mapperDiscovery.getMapper();
+    }
+
+    private String buildIntakePath(TrackType trackType, String apiVersion) {
+        return String.format("/api/%s/%s", apiVersion, trackType.name().toLowerCase());
+    }
+
+    private Payload prepareTraces(TrackType trackType, List<List<DDSpan>> traces) {
+        TracesCapture traceCapture = new TracesCapture();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1 << 20, traceCapture));
+        RemoteMapper mapper = discoverMapper(trackType);
+        for (List<DDSpan> trace : traces) {
+            packer.format(trace, mapper);
+        }
+        packer.flush();
+        return mapper.newPayload()
+                .withBody(traceCapture.traceCount, traces.isEmpty() ? ByteBuffer.allocate(0) : traceCapture.buffer);
+    }
+
+    @SuppressWarnings("unchecked")
+    static void assertDeepEquals(Object expected, Object actual) {
+        if (expected == null && actual == null) {
+            return;
+        }
+        if (expected == null || actual == null) {
+            Assertions.fail("Expected " + expected + " but got " + actual);
+        }
+        if (expected instanceof Map) {
+            assertInstanceOf(Map.class, actual, "Expected Map but got " + actual.getClass());
+            Map<Object, Object> expectedMap = (Map<Object, Object>) expected;
+            Map<Object, Object> actualMap = (Map<Object, Object>) actual;
+            assertEquals(expectedMap.size(), actualMap.size(), "Map size mismatch");
+            for (Map.Entry<Object, Object> entry : expectedMap.entrySet()) {
+                assertTrue(actualMap.containsKey(entry.getKey()), "Missing key: " + entry.getKey());
+                assertDeepEquals(entry.getValue(), actualMap.get(entry.getKey()));
+            }
+        } else if (expected instanceof List) {
+            assertInstanceOf(List.class, actual, "Expected List but got " + actual.getClass());
+            List<Object> expectedList = (List<Object>) expected;
+            List<Object> actualList = (List<Object>) actual;
+            assertEquals(expectedList.size(), actualList.size(), "List size mismatch");
+            for (int i = 0; i < expectedList.size(); i++) {
+                assertDeepEquals(expectedList.get(i), actualList.get(i));
+            }
+        } else if (expected instanceof Number && actual instanceof Number) {
+            if (expected instanceof Float
+                    || expected instanceof Double
+                    || actual instanceof Float
+                    || actual instanceof Double) {
+                assertEquals(((Number) expected).doubleValue(), ((Number) actual).doubleValue(), 0.0001);
+            } else {
+                assertEquals(((Number) expected).longValue(), ((Number) actual).longValue());
+            }
+        } else {
+            assertEquals(expected, actual);
+        }
     }
-  }
 
-  static class TracesCapture implements ByteBufferConsumer {
-    int traceCount;
-    ByteBuffer buffer;
+    static class TracesCapture implements ByteBufferConsumer {
+        int traceCount;
+        ByteBuffer buffer;
 
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {
-      this.buffer = buffer;
-      this.traceCount = messageCount;
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {
+            this.buffer = buffer;
+            this.traceCount = messageCount;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeTraceInterceptorTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeTraceInterceptorTest.java
index d757344634e..b1861355836 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeTraceInterceptorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeTraceInterceptorTest.java
@@ -19,83 +19,80 @@
 @Timeout(100)
 class DDIntakeTraceInterceptorTest extends DDCoreJavaSpecification {
 
-  ListWriter writer;
-  CoreTracer tracer;
+    ListWriter writer;
+    CoreTracer tracer;
 
-  @BeforeEach
-  void setup() {
-    writer = new ListWriter();
-    tracer = tracerBuilder().writer(writer).build();
-    tracer.addTraceInterceptor(DDIntakeTraceInterceptor.INSTANCE);
-  }
+    @BeforeEach
+    void setup() {
+        writer = new ListWriter();
+        tracer = tracerBuilder().writer(writer).build();
+        tracer.addTraceInterceptor(DDIntakeTraceInterceptor.INSTANCE);
+    }
 
-  @AfterEach
-  void cleanup() {
-    if (tracer != null) {
-      tracer.close();
+    @AfterEach
+    void cleanup() {
+        if (tracer != null) {
+            tracer.close();
+        }
     }
-  }
 
-  @TableTest({
-    "scenario     | httpStatus | expectedHttpStatus",
-    "null         |            |                   ",
-    "empty string | ''         |                   ",
-    "string 500   | '500'      | 500               ",
-    "integer 500  | 500        | 500               ",
-    "integer 600  | 600        |                   "
-  })
-  void testNormalizationForDdIntake(Object httpStatus, Integer expectedHttpStatus)
-      throws InterruptedException, TimeoutException {
-    tracer
-        .buildSpan("datadog", "my-operation-name")
-        .withResourceName("my-resource-name")
-        .withSpanType("my-span-type")
-        .withServiceName("my-service-name")
-        .withTag("some-tag-key", "some-tag-value")
-        .withTag("env", "     My_____Env     ")
-        .withTag(Tags.HTTP_STATUS, httpStatus)
-        .start()
-        .finish();
-    writer.waitForTraces(1);
+    @TableTest({
+      "scenario     | httpStatus | expectedHttpStatus",
+      "null         |            |                   ",
+      "empty string | ''         |                   ",
+      "string 500   | '500'      | 500               ",
+      "integer 500  | 500        | 500               ",
+      "integer 600  | 600        |                   "
+    })
+    void testNormalizationForDdIntake(Object httpStatus, Integer expectedHttpStatus)
+            throws InterruptedException, TimeoutException {
+        tracer.buildSpan("datadog", "my-operation-name")
+                .withResourceName("my-resource-name")
+                .withSpanType("my-span-type")
+                .withServiceName("my-service-name")
+                .withTag("some-tag-key", "some-tag-value")
+                .withTag("env", "     My_____Env     ")
+                .withTag(Tags.HTTP_STATUS, httpStatus)
+                .start()
+                .finish();
+        writer.waitForTraces(1);
 
-    List<DDSpan> trace = writer.firstTrace();
-    assertEquals(1, trace.size());
-    DDSpan span = trace.get(0);
-    assertEquals("my-service-name", span.getServiceName());
-    assertEquals("my_operation_name", span.getOperationName().toString());
-    assertEquals("my-resource-name", span.getResourceName().toString());
-    assertEquals("my-span-type", span.getSpanType());
-    assertEquals("some-tag-value", span.getTag("some-tag-key"));
-    assertEquals("my_env", span.getTag("env"));
-    assertEquals(expectedHttpStatus, span.getTag(Tags.HTTP_STATUS));
-  }
+        List<DDSpan> trace = writer.firstTrace();
+        assertEquals(1, trace.size());
+        DDSpan span = trace.get(0);
+        assertEquals("my-service-name", span.getServiceName());
+        assertEquals("my_operation_name", span.getOperationName().toString());
+        assertEquals("my-resource-name", span.getResourceName().toString());
+        assertEquals("my-span-type", span.getSpanType());
+        assertEquals("some-tag-value", span.getTag("some-tag-key"));
+        assertEquals("my_env", span.getTag("env"));
+        assertEquals(expectedHttpStatus, span.getTag(Tags.HTTP_STATUS));
+    }
 
-  @Test
-  void testNormalizationDoesNotImplicitlyConvertSpanType()
-      throws InterruptedException, TimeoutException {
-    UTF8BytesString originalSpanType = UTF8BytesString.create("a UTF8 span type");
-    tracer
-        .buildSpan("datadog", "my-operation-name")
-        .withSpanType(originalSpanType)
-        .start()
-        .finish();
+    @Test
+    void testNormalizationDoesNotImplicitlyConvertSpanType() throws InterruptedException, TimeoutException {
+        UTF8BytesString originalSpanType = UTF8BytesString.create("a UTF8 span type");
+        tracer.buildSpan("datadog", "my-operation-name")
+                .withSpanType(originalSpanType)
+                .start()
+                .finish();
 
-    writer.waitForTraces(1);
+        writer.waitForTraces(1);
 
-    List<DDSpan> trace = writer.firstTrace();
-    assertEquals(1, trace.size());
-    DDSpan span = trace.get(0);
-    assertEquals(originalSpanType, span.getType());
-  }
+        List<DDSpan> trace = writer.firstTrace();
+        assertEquals(1, trace.size());
+        DDSpan span = trace.get(0);
+        assertEquals(originalSpanType, span.getType());
+    }
 
-  @Test
-  void testDefaultEnvSetting() throws InterruptedException, TimeoutException {
-    tracer.buildSpan("datadog", "my-operation-name").start().finish();
-    writer.waitForTraces(1);
+    @Test
+    void testDefaultEnvSetting() throws InterruptedException, TimeoutException {
+        tracer.buildSpan("datadog", "my-operation-name").start().finish();
+        writer.waitForTraces(1);
 
-    List<DDSpan> trace = writer.firstTrace();
-    assertEquals(1, trace.size());
-    DDSpan span = trace.get(0);
-    assertEquals("none", span.getTag("env"));
-  }
+        List<DDSpan> trace = writer.firstTrace();
+        assertEquals(1, trace.size());
+        DDSpan span = trace.get(0);
+        assertEquals("none", span.getTag("env"));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeTrackTypeResolverTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeTrackTypeResolverTest.java
index 5166a371966..d4d9cfc9b76 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeTrackTypeResolverTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeTrackTypeResolverTest.java
@@ -11,20 +11,18 @@
 
 class DDIntakeTrackTypeResolverTest extends DDJavaSpecification {
 
-  @TableTest({
-    "scenario                           | ciVisibilityEnabled | ciVisibilityAgentlessEnabled | expectedTrackType",
-    "ci-vis disabled agentless disabled | false               | false                        | NOOP             ",
-    "ci-vis enabled agentless disabled  | true                | false                        | CITESTCYCLE      ",
-    "ci-vis enabled agentless enabled   | true                | true                         | CITESTCYCLE      "
-  })
-  void shouldReturnTheCorrectTrackType(
-      boolean ciVisibilityEnabled,
-      boolean ciVisibilityAgentlessEnabled,
-      TrackType expectedTrackType) {
-    Config config = mock(Config.class);
-    when(config.isCiVisibilityEnabled()).thenReturn(ciVisibilityEnabled);
-    when(config.isCiVisibilityAgentlessEnabled()).thenReturn(ciVisibilityAgentlessEnabled);
+    @TableTest({
+      "scenario                           | ciVisibilityEnabled | ciVisibilityAgentlessEnabled | expectedTrackType",
+      "ci-vis disabled agentless disabled | false               | false                        | NOOP             ",
+      "ci-vis enabled agentless disabled  | true                | false                        | CITESTCYCLE      ",
+      "ci-vis enabled agentless enabled   | true                | true                         | CITESTCYCLE      "
+    })
+    void shouldReturnTheCorrectTrackType(
+            boolean ciVisibilityEnabled, boolean ciVisibilityAgentlessEnabled, TrackType expectedTrackType) {
+        Config config = mock(Config.class);
+        when(config.isCiVisibilityEnabled()).thenReturn(ciVisibilityEnabled);
+        when(config.isCiVisibilityAgentlessEnabled()).thenReturn(ciVisibilityAgentlessEnabled);
 
-    assertEquals(expectedTrackType, DDIntakeTrackTypeResolver.resolve(config));
-  }
+        assertEquals(expectedTrackType, DDIntakeTrackTypeResolver.resolve(config));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/ApmTracingDisabledChunkMarkerTest.java b/dd-trace-core/src/test/java/datadog/trace/core/ApmTracingDisabledChunkMarkerTest.java
index 2450882f4dc..812a608aa76 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/ApmTracingDisabledChunkMarkerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/ApmTracingDisabledChunkMarkerTest.java
@@ -22,154 +22,158 @@
 @WithConfig(key = "apm.tracing.enabled", value = "false")
 class ApmTracingDisabledChunkMarkerTest extends DDCoreJavaSpecification {
 
-  private ListWriter writer;
-  private CoreTracer tracer;
-
-  @Override
-  protected boolean useStrictTraceWrites() {
-    // Production standalone-ASM uses the delaying PendingTraceBuffer, which is what lets a buffered
-    // root be written on its own before a late child arrives. Strict writes would instead select
-    // the discarding buffer and coalesce both spans into a single chunk, hiding the bug.
-    return false;
-  }
-
-  @BeforeEach
-  void setup() {
-    writer = new ListWriter();
-    tracer = tracerBuilder().writer(writer).build();
-  }
-
-  @AfterEach
-  void cleanup() {
-    if (tracer != null) {
-      tracer.close();
+    private ListWriter writer;
+    private CoreTracer tracer;
+
+    @Override
+    protected boolean useStrictTraceWrites() {
+        // Production standalone-ASM uses the delaying PendingTraceBuffer, which is what lets a buffered
+        // root be written on its own before a late child arrives. Strict writes would instead select
+        // the discarding buffer and coalesce both spans into a single chunk, hiding the bug.
+        return false;
     }
-  }
-
-  @Test
-  void everyExportedChunkCarriesApmDisabledMarker() throws InterruptedException, TimeoutException {
-    DDSpan root = (DDSpan) tracer.buildSpan("test", "root").start();
-    DDSpan child = (DDSpan) tracer.buildSpan("test", "child").asChildOf(root.spanContext()).start();
-
-    PendingTrace trace = (PendingTrace) root.spanContext().getTraceCollector();
-
-    // Root finishes while the child is still running -> root is buffered, not yet written.
-    root.finish();
-    assertTrue(writer.isEmpty());
-
-    // Write the buffered root out on its own chunk. This sets rootSpanWritten=true and is exactly
-    // what the PendingTraceBuffer worker does when a buffered root ages out (SEND_DELAY_NS).
-    trace.write();
-    writer.waitForTraces(1);
-
-    // The long-lived child finishes later. Because the root was already written, it flushes alone.
-    child.finish();
-    trace.write();
-    writer.waitForTraces(2);
-
-    List<DDSpan> rootChunk = writer.get(0);
-    List<DDSpan> childChunk = writer.get(1);
-    assertEquals(1, rootChunk.size(), "expected the root to flush alone in the first chunk");
-    assertEquals(1, childChunk.size(), "expected the child to flush alone in the second chunk");
-    assertEquals(root, rootChunk.get(0), "first chunk should be the local root");
-    assertEquals(child, childChunk.get(0), "second chunk should be the delayed child");
-
-    // Sanity: the child really is a child of the local root (a local, non-remote parent) — this is
-    // exactly the case that stamping the marker only on the local root span would miss.
-    assertEquals(root.getSpanId(), child.getParentId());
-
-    // Both chunks must carry the billing marker. The delayed child chunk is load-bearing: without
-    // the marker the intake would bill APM host usage for this otherwise-unmarked chunk.
-    assertAllSpansMarked(rootChunk, "root chunk");
-    assertAllSpansMarked(childChunk, "delayed child chunk");
-  }
-
-  @Test
-  void singleChunkTraceCarriesApmDisabledMarker() throws InterruptedException, TimeoutException {
-    // Positive control: when the whole trace is exported as a single chunk (child finishes before
-    // the root, so nothing is written until the root closes), the marker is present on every span.
-    DDSpan root = (DDSpan) tracer.buildSpan("test", "root").start();
-    DDSpan child = (DDSpan) tracer.buildSpan("test", "child").asChildOf(root.spanContext()).start();
-
-    child.finish();
-    assertTrue(writer.isEmpty(), "trace must not be written while the root is still open");
-    root.finish();
-    writer.waitForTraces(1);
-
-    assertEquals(1, writer.size(), "expected the whole trace in a single chunk");
-    List<DDSpan> chunk = writer.get(0);
-    assertEquals(2, chunk.size(), "expected both spans in the same chunk");
-    assertAllSpansMarked(chunk, "single-chunk trace");
-  }
-
-  @Test
-  void rootlessMultiSpanChunkMarksEverySpan() throws InterruptedException, TimeoutException {
-    // A multi-span chunk exported WITHOUT its local root (a partial flush / orphaned subtree): the
-    // root is written first, then its descendants flush together in a later, root-less chunk. Every
-    // span in that chunk must still carry the marker.
-    DDSpan root = (DDSpan) tracer.buildSpan("test", "root").start();
-    DDSpan childA =
-        (DDSpan) tracer.buildSpan("test", "childA").asChildOf(root.spanContext()).start();
-    DDSpan grandchild =
-        (DDSpan) tracer.buildSpan("test", "grandchild").asChildOf(childA.spanContext()).start();
-
-    PendingTrace trace = (PendingTrace) root.spanContext().getTraceCollector();
-
-    // Flush the root on its own first (rootSpanWritten=true), so the descendants can only export in
-    // a later, root-less chunk.
-    root.finish();
-    trace.write();
-    writer.waitForTraces(1);
-    assertEquals(1, writer.get(0).size(), "expected the root to flush alone in the first chunk");
-
-    // Both descendants finish, then flush together in a single root-less chunk.
-    childA.finish();
-    grandchild.finish();
-    trace.write();
-    writer.waitForTraces(2);
-
-    List<DDSpan> chunk = writer.get(1);
-    assertEquals(2, chunk.size(), "expected childA and grandchild in one root-less chunk");
-    assertTrue(chunk.contains(childA) && chunk.contains(grandchild), "chunk must hold both spans");
-    assertTrue(!chunk.contains(root), "the local root must not be part of this chunk");
-
-    // Every span in the root-less chunk carries the marker, including the inner grandchild whose
-    // parent is present in the chunk.
-    assertAllSpansMarked(chunk, "root-less descendant chunk");
-  }
-
-  @Test
-  @WithConfig(key = "apm.tracing.enabled", value = "true")
-  void apmTracingEnabledLeavesChunkUnmarked() throws InterruptedException, TimeoutException {
-    // Negative control: the method-level override flips APM tracing back on (overriding the
-    // class-level false before setup() builds the tracer), so the billing marker must NOT be
-    // stamped on any span. Guards against a regression that marks unconditionally, ignoring the
-    // apm.tracing.enabled flag.
-    DDSpan root = (DDSpan) tracer.buildSpan("test", "root").start();
-    DDSpan child = (DDSpan) tracer.buildSpan("test", "child").asChildOf(root.spanContext()).start();
-
-    child.finish();
-    root.finish();
-    writer.waitForTraces(1);
-
-    List<DDSpan> chunk = writer.get(0);
-    assertEquals(2, chunk.size(), "expected both spans in the same chunk");
-    for (DDSpan span : chunk) {
-      assertNull(
-          span.getTag(APM_ENABLED),
-          "span '"
-              + span.getOperationName()
-              + "' must not carry _dd.apm.enabled when APM tracing is enabled");
+
+    @BeforeEach
+    void setup() {
+        writer = new ListWriter();
+        tracer = tracerBuilder().writer(writer).build();
+    }
+
+    @AfterEach
+    void cleanup() {
+        if (tracer != null) {
+            tracer.close();
+        }
+    }
+
+    @Test
+    void everyExportedChunkCarriesApmDisabledMarker() throws InterruptedException, TimeoutException {
+        DDSpan root = (DDSpan) tracer.buildSpan("test", "root").start();
+        DDSpan child = (DDSpan)
+                tracer.buildSpan("test", "child").asChildOf(root.spanContext()).start();
+
+        PendingTrace trace = (PendingTrace) root.spanContext().getTraceCollector();
+
+        // Root finishes while the child is still running -> root is buffered, not yet written.
+        root.finish();
+        assertTrue(writer.isEmpty());
+
+        // Write the buffered root out on its own chunk. This sets rootSpanWritten=true and is exactly
+        // what the PendingTraceBuffer worker does when a buffered root ages out (SEND_DELAY_NS).
+        trace.write();
+        writer.waitForTraces(1);
+
+        // The long-lived child finishes later. Because the root was already written, it flushes alone.
+        child.finish();
+        trace.write();
+        writer.waitForTraces(2);
+
+        List<DDSpan> rootChunk = writer.get(0);
+        List<DDSpan> childChunk = writer.get(1);
+        assertEquals(1, rootChunk.size(), "expected the root to flush alone in the first chunk");
+        assertEquals(1, childChunk.size(), "expected the child to flush alone in the second chunk");
+        assertEquals(root, rootChunk.get(0), "first chunk should be the local root");
+        assertEquals(child, childChunk.get(0), "second chunk should be the delayed child");
+
+        // Sanity: the child really is a child of the local root (a local, non-remote parent) — this is
+        // exactly the case that stamping the marker only on the local root span would miss.
+        assertEquals(root.getSpanId(), child.getParentId());
+
+        // Both chunks must carry the billing marker. The delayed child chunk is load-bearing: without
+        // the marker the intake would bill APM host usage for this otherwise-unmarked chunk.
+        assertAllSpansMarked(rootChunk, "root chunk");
+        assertAllSpansMarked(childChunk, "delayed child chunk");
+    }
+
+    @Test
+    void singleChunkTraceCarriesApmDisabledMarker() throws InterruptedException, TimeoutException {
+        // Positive control: when the whole trace is exported as a single chunk (child finishes before
+        // the root, so nothing is written until the root closes), the marker is present on every span.
+        DDSpan root = (DDSpan) tracer.buildSpan("test", "root").start();
+        DDSpan child = (DDSpan)
+                tracer.buildSpan("test", "child").asChildOf(root.spanContext()).start();
+
+        child.finish();
+        assertTrue(writer.isEmpty(), "trace must not be written while the root is still open");
+        root.finish();
+        writer.waitForTraces(1);
+
+        assertEquals(1, writer.size(), "expected the whole trace in a single chunk");
+        List<DDSpan> chunk = writer.get(0);
+        assertEquals(2, chunk.size(), "expected both spans in the same chunk");
+        assertAllSpansMarked(chunk, "single-chunk trace");
+    }
+
+    @Test
+    void rootlessMultiSpanChunkMarksEverySpan() throws InterruptedException, TimeoutException {
+        // A multi-span chunk exported WITHOUT its local root (a partial flush / orphaned subtree): the
+        // root is written first, then its descendants flush together in a later, root-less chunk. Every
+        // span in that chunk must still carry the marker.
+        DDSpan root = (DDSpan) tracer.buildSpan("test", "root").start();
+        DDSpan childA = (DDSpan)
+                tracer.buildSpan("test", "childA").asChildOf(root.spanContext()).start();
+        DDSpan grandchild = (DDSpan) tracer.buildSpan("test", "grandchild")
+                .asChildOf(childA.spanContext())
+                .start();
+
+        PendingTrace trace = (PendingTrace) root.spanContext().getTraceCollector();
+
+        // Flush the root on its own first (rootSpanWritten=true), so the descendants can only export in
+        // a later, root-less chunk.
+        root.finish();
+        trace.write();
+        writer.waitForTraces(1);
+        assertEquals(1, writer.get(0).size(), "expected the root to flush alone in the first chunk");
+
+        // Both descendants finish, then flush together in a single root-less chunk.
+        childA.finish();
+        grandchild.finish();
+        trace.write();
+        writer.waitForTraces(2);
+
+        List<DDSpan> chunk = writer.get(1);
+        assertEquals(2, chunk.size(), "expected childA and grandchild in one root-less chunk");
+        assertTrue(chunk.contains(childA) && chunk.contains(grandchild), "chunk must hold both spans");
+        assertTrue(!chunk.contains(root), "the local root must not be part of this chunk");
+
+        // Every span in the root-less chunk carries the marker, including the inner grandchild whose
+        // parent is present in the chunk.
+        assertAllSpansMarked(chunk, "root-less descendant chunk");
     }
-  }
-
-  /** Every span of an exported chunk must carry the numeric {@code _dd.apm.enabled:0} marker. */
-  private static void assertAllSpansMarked(List<DDSpan> chunk, String description) {
-    for (DDSpan span : chunk) {
-      assertEquals(
-          Integer.valueOf(0),
-          span.getTag(APM_ENABLED),
-          description + " span '" + span.getOperationName() + "' is missing _dd.apm.enabled:0");
+
+    @Test
+    @WithConfig(key = "apm.tracing.enabled", value = "true")
+    void apmTracingEnabledLeavesChunkUnmarked() throws InterruptedException, TimeoutException {
+        // Negative control: the method-level override flips APM tracing back on (overriding the
+        // class-level false before setup() builds the tracer), so the billing marker must NOT be
+        // stamped on any span. Guards against a regression that marks unconditionally, ignoring the
+        // apm.tracing.enabled flag.
+        DDSpan root = (DDSpan) tracer.buildSpan("test", "root").start();
+        DDSpan child = (DDSpan)
+                tracer.buildSpan("test", "child").asChildOf(root.spanContext()).start();
+
+        child.finish();
+        root.finish();
+        writer.waitForTraces(1);
+
+        List<DDSpan> chunk = writer.get(0);
+        assertEquals(2, chunk.size(), "expected both spans in the same chunk");
+        for (DDSpan span : chunk) {
+            assertNull(
+                    span.getTag(APM_ENABLED),
+                    "span '"
+                            + span.getOperationName()
+                            + "' must not carry _dd.apm.enabled when APM tracing is enabled");
+        }
+    }
+
+    /** Every span of an exported chunk must carry the numeric {@code _dd.apm.enabled:0} marker. */
+    private static void assertAllSpansMarked(List<DDSpan> chunk, String description) {
+        for (DDSpan span : chunk) {
+            assertEquals(
+                    Integer.valueOf(0),
+                    span.getTag(APM_ENABLED),
+                    description + " span '" + span.getOperationName() + "' is missing _dd.apm.enabled:0");
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/BlackholeSpanTest.java b/dd-trace-core/src/test/java/datadog/trace/core/BlackholeSpanTest.java
index 4d0e94b5369..3fbca9e6bfa 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/BlackholeSpanTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/BlackholeSpanTest.java
@@ -15,43 +15,43 @@
 
 public class BlackholeSpanTest extends DDCoreJavaSpecification {
 
-  @ValueSource(strings = {"true", "false"})
-  @ParameterizedTest
-  void shouldMuteTracing(String use128bitTraceId) throws Exception {
-    injectSysConfig("trace.128.bit.traceid.logging.enabled", use128bitTraceId);
-    ListWriter writer = new ListWriter();
-    Properties props = new Properties();
-    CoreTracer tracer = tracerBuilder().withProperties(props).writer(writer).build();
-    try {
-      AgentSpan root = tracer.startSpan("test", "root");
-      ContextScope scope1 = tracer.activateSpan(root);
-      AgentSpan bh;
-      AgentSpan ignored;
-      AgentSpan child;
-      try {
-        bh = tracer.blackholeSpan();
-        ContextScope scope2 = tracer.activateSpan(bh);
+    @ValueSource(strings = {"true", "false"})
+    @ParameterizedTest
+    void shouldMuteTracing(String use128bitTraceId) throws Exception {
+        injectSysConfig("trace.128.bit.traceid.logging.enabled", use128bitTraceId);
+        ListWriter writer = new ListWriter();
+        Properties props = new Properties();
+        CoreTracer tracer = tracerBuilder().withProperties(props).writer(writer).build();
         try {
-          ignored = tracer.startSpan("test", "ignored");
-          ignored.finish();
+            AgentSpan root = tracer.startSpan("test", "root");
+            ContextScope scope1 = tracer.activateSpan(root);
+            AgentSpan bh;
+            AgentSpan ignored;
+            AgentSpan child;
+            try {
+                bh = tracer.blackholeSpan();
+                ContextScope scope2 = tracer.activateSpan(bh);
+                try {
+                    ignored = tracer.startSpan("test", "ignored");
+                    ignored.finish();
+                } finally {
+                    bh.finish();
+                    scope2.close();
+                }
+                child = tracer.startSpan("test", "child");
+                child.finish();
+            } finally {
+                root.finish();
+                scope1.close();
+            }
+            writer.waitForTraces(1);
+            assertEquals(2, writer.firstTrace().size());
+            assertTrue(writer.firstTrace().containsAll(Arrays.asList(root, child)));
+            assertFalse(writer.firstTrace().contains(bh));
+            assertFalse(writer.firstTrace().contains(ignored));
         } finally {
-          bh.finish();
-          scope2.close();
+            writer.close();
+            tracer.close();
         }
-        child = tracer.startSpan("test", "child");
-        child.finish();
-      } finally {
-        root.finish();
-        scope1.close();
-      }
-      writer.waitForTraces(1);
-      assertEquals(2, writer.firstTrace().size());
-      assertTrue(writer.firstTrace().containsAll(Arrays.asList(root, child)));
-      assertFalse(writer.firstTrace().contains(bh));
-      assertFalse(writer.firstTrace().contains(ignored));
-    } finally {
-      writer.close();
-      tracer.close();
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/BuilderTagsPrecedenceTest.java b/dd-trace-core/src/test/java/datadog/trace/core/BuilderTagsPrecedenceTest.java
index 453406fa1cf..4602e4dc45e 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/BuilderTagsPrecedenceTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/BuilderTagsPrecedenceTest.java
@@ -31,119 +31,112 @@
  */
 class BuilderTagsPrecedenceTest extends DDCoreJavaSpecification {
 
-  private static final String KEY = "test.collision.tag";
-  private static final String HEADER_VALUE = "from-header";
-  private static final String BUILDER_VALUE = "from-builder";
+    private static final String KEY = "test.collision.tag";
+    private static final String HEADER_VALUE = "from-header";
+    private static final String BUILDER_VALUE = "from-builder";
 
-  private CoreTracer tracer;
+    private CoreTracer tracer;
 
-  @AfterEach
-  void cleanup() {
-    if (tracer != null) {
-      tracer.close();
+    @AfterEach
+    void cleanup() {
+        if (tracer != null) {
+            tracer.close();
+        }
     }
-  }
 
-  /** An extracted context carrying a header-derived tag ({@code coreTags}) on the given key. */
-  private static ExtractedContext extractedWithHeaderTag(String key, String value) {
-    return new ExtractedContext(
-        DDTraceId.ONE,
-        2,
-        PrioritySampling.SAMPLER_KEEP,
-        null,
-        0,
-        Collections.<String, String>emptyMap(),
-        TagMap.fromMap(Collections.singletonMap(key, value)),
-        null,
-        PropagationTags.factory().empty(),
-        null,
-        DATADOG);
-  }
+    /** An extracted context carrying a header-derived tag ({@code coreTags}) on the given key. */
+    private static ExtractedContext extractedWithHeaderTag(String key, String value) {
+        return new ExtractedContext(
+                DDTraceId.ONE,
+                2,
+                PrioritySampling.SAMPLER_KEEP,
+                null,
+                0,
+                Collections.<String, String>emptyMap(),
+                TagMap.fromMap(Collections.singletonMap(key, value)),
+                null,
+                PropagationTags.factory().empty(),
+                null,
+                DATADOG);
+    }
 
-  /**
-   * Default config: the historical order applies, so the inbound header tag overrides the explicit
-   * builder tag. This documents the wart; flipping the default would (intentionally) break this.
-   */
-  @Test
-  void headerTagOverridesBuilderTagByDefault() {
-    tracer = tracerBuilder().build();
-    AgentSpan span =
-        tracer
-            .buildSpan("test", "root")
-            .asChildOf(extractedWithHeaderTag(KEY, HEADER_VALUE))
-            .withTag(KEY, BUILDER_VALUE)
-            .start();
-    try {
-      Object resolved = ((DDSpan) span).getTag(KEY);
-      assertEquals(
-          HEADER_VALUE,
-          resolved,
-          "By default the historical order lets the inbound header tag override the explicit "
-              + "builder tag (the documented wart). If this fails, the default ordering changed.");
-    } finally {
-      span.finish();
+    /**
+     * Default config: the historical order applies, so the inbound header tag overrides the explicit
+     * builder tag. This documents the wart; flipping the default would (intentionally) break this.
+     */
+    @Test
+    void headerTagOverridesBuilderTagByDefault() {
+        tracer = tracerBuilder().build();
+        AgentSpan span = tracer.buildSpan("test", "root")
+                .asChildOf(extractedWithHeaderTag(KEY, HEADER_VALUE))
+                .withTag(KEY, BUILDER_VALUE)
+                .start();
+        try {
+            Object resolved = ((DDSpan) span).getTag(KEY);
+            assertEquals(
+                    HEADER_VALUE,
+                    resolved,
+                    "By default the historical order lets the inbound header tag override the explicit "
+                            + "builder tag (the documented wart). If this fails, the default ordering changed.");
+        } finally {
+            span.finish();
+        }
     }
-  }
 
-  /**
-   * With the flag enabled, the explicit builder tag is applied last, so it wins over the inbound
-   * header tag -- the inversion this PR adds.
-   */
-  @Test
-  void builderTagWinsWhenPrecedenceEnabled() {
-    Properties properties = new Properties();
-    properties.setProperty(TracerConfig.TRACE_BUILDER_TAGS_PRECEDENCE_ENABLED, "true");
-    tracer = tracerBuilder().withProperties(properties).build();
+    /**
+     * With the flag enabled, the explicit builder tag is applied last, so it wins over the inbound
+     * header tag -- the inversion this PR adds.
+     */
+    @Test
+    void builderTagWinsWhenPrecedenceEnabled() {
+        Properties properties = new Properties();
+        properties.setProperty(TracerConfig.TRACE_BUILDER_TAGS_PRECEDENCE_ENABLED, "true");
+        tracer = tracerBuilder().withProperties(properties).build();
 
-    AgentSpan span =
-        tracer
-            .buildSpan("test", "root")
-            .asChildOf(extractedWithHeaderTag(KEY, HEADER_VALUE))
-            .withTag(KEY, BUILDER_VALUE)
-            .start();
-    try {
-      Object resolved = ((DDSpan) span).getTag(KEY);
-      assertEquals(
-          BUILDER_VALUE,
-          resolved,
-          "With trace.builder.tags.precedence.enabled=true, the explicit builder tag must win "
-              + "over the inbound header tag.");
-    } finally {
-      span.finish();
+        AgentSpan span = tracer.buildSpan("test", "root")
+                .asChildOf(extractedWithHeaderTag(KEY, HEADER_VALUE))
+                .withTag(KEY, BUILDER_VALUE)
+                .start();
+        try {
+            Object resolved = ((DDSpan) span).getTag(KEY);
+            assertEquals(
+                    BUILDER_VALUE,
+                    resolved,
+                    "With trace.builder.tags.precedence.enabled=true, the explicit builder tag must win "
+                            + "over the inbound header tag.");
+        } finally {
+            span.finish();
+        }
     }
-  }
 
-  /**
-   * Confirms the flag is read from the tracer's own config (set via {@code
-   * CoreTracerBuilder#withProperties}), not a cached global default -- the bug fixed alongside this
-   * test, per the review discussion on this PR.
-   */
-  @Test
-  void precedenceFlagIsPerTracerNotAGlobalDefault() {
-    tracer = tracerBuilder().build();
-    Properties properties = new Properties();
-    properties.setProperty(TracerConfig.TRACE_BUILDER_TAGS_PRECEDENCE_ENABLED, "true");
-    CoreTracer enabledTracer = tracerBuilder().withProperties(properties).build();
-    try {
-      AgentSpan defaultSpan =
-          tracer
-              .buildSpan("test", "root")
-              .asChildOf(extractedWithHeaderTag(KEY, HEADER_VALUE))
-              .withTag(KEY, BUILDER_VALUE)
-              .start();
-      defaultSpan.finish();
-      assertEquals(HEADER_VALUE, ((DDSpan) defaultSpan).getTag(KEY));
+    /**
+     * Confirms the flag is read from the tracer's own config (set via {@code
+     * CoreTracerBuilder#withProperties}), not a cached global default -- the bug fixed alongside this
+     * test, per the review discussion on this PR.
+     */
+    @Test
+    void precedenceFlagIsPerTracerNotAGlobalDefault() {
+        tracer = tracerBuilder().build();
+        Properties properties = new Properties();
+        properties.setProperty(TracerConfig.TRACE_BUILDER_TAGS_PRECEDENCE_ENABLED, "true");
+        CoreTracer enabledTracer = tracerBuilder().withProperties(properties).build();
+        try {
+            AgentSpan defaultSpan = tracer.buildSpan("test", "root")
+                    .asChildOf(extractedWithHeaderTag(KEY, HEADER_VALUE))
+                    .withTag(KEY, BUILDER_VALUE)
+                    .start();
+            defaultSpan.finish();
+            assertEquals(HEADER_VALUE, ((DDSpan) defaultSpan).getTag(KEY));
 
-      AgentSpan enabledSpan =
-          enabledTracer
-              .buildSpan("test", "root")
-              .asChildOf(extractedWithHeaderTag(KEY, HEADER_VALUE))
-              .withTag(KEY, BUILDER_VALUE)
-              .start();
-      enabledSpan.finish();
-      assertEquals(BUILDER_VALUE, ((DDSpan) enabledSpan).getTag(KEY));
-    } finally {
-      enabledTracer.close();
+            AgentSpan enabledSpan = enabledTracer
+                    .buildSpan("test", "root")
+                    .asChildOf(extractedWithHeaderTag(KEY, HEADER_VALUE))
+                    .withTag(KEY, BUILDER_VALUE)
+                    .start();
+            enabledSpan.finish();
+            assertEquals(BUILDER_VALUE, ((DDSpan) enabledSpan).getTag(KEY));
+        } finally {
+            enabledTracer.close();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java b/dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java
index 425c3616be9..ff1426ef2da 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java
@@ -59,70 +59,68 @@
 
 public class CoreSpanBuilderTest extends DDCoreJavaSpecification {
 
-  private static final String INHERITED_RANDOM_VALUE = "ef284ace7a91e1";
-  private static final String OTEL_TRACE_STATE =
-      "dd=s:0,ot=rv:" + INHERITED_RANDOM_VALUE + ";th:e6666666666668";
-  private static final String OTEL_MEMBER = "ot=";
-  private static final String THRESHOLD_0_5 = ";th:8";
-  private static final double SAMPLE_RATE_0_5 = 0.5;
-  private static final String DATADOG_TRACE_STATE = "_dd.p.dm=934086a686-4,_dd.p.anytag=value";
-
-  private ListWriter writer;
-  private CoreTracer tracer;
-
-  @BeforeEach
-  void setup() {
-    writer = new ListWriter();
-    tracer = tracerBuilder().writer(writer).build();
-  }
-
-  @Test
-  void buildSimpleSpan() {
-    DDSpan span = (DDSpan) tracer.buildSpan("test", "op name").withServiceName("foo").start();
-    assertEquals("op name", span.getOperationName());
-  }
-
-  @Test
-  void buildComplexSpan() {
-    String expectedName = "fakeName";
-    Map<String, Object> tags = new HashMap<>();
-    tags.put("1", true);
-    tags.put("2", "fakeString");
-    tags.put("3", 42.0);
-
-    AgentTracer.SpanBuilder builder =
-        tracer.buildSpan("datadog", expectedName).withServiceName("foo");
-    for (Map.Entry<String, Object> entry : tags.entrySet()) {
-      builder = builder.withTag(entry.getKey(), entry.getValue());
+    private static final String INHERITED_RANDOM_VALUE = "ef284ace7a91e1";
+    private static final String OTEL_TRACE_STATE = "dd=s:0,ot=rv:" + INHERITED_RANDOM_VALUE + ";th:e6666666666668";
+    private static final String OTEL_MEMBER = "ot=";
+    private static final String THRESHOLD_0_5 = ";th:8";
+    private static final double SAMPLE_RATE_0_5 = 0.5;
+    private static final String DATADOG_TRACE_STATE = "_dd.p.dm=934086a686-4,_dd.p.anytag=value";
+
+    private ListWriter writer;
+    private CoreTracer tracer;
+
+    @BeforeEach
+    void setup() {
+        writer = new ListWriter();
+        tracer = tracerBuilder().writer(writer).build();
     }
 
-    DDSpan span = (DDSpan) builder.start();
-
-    assertEquals(expectedName, span.getOperationName());
-    for (Map.Entry<String, Object> entry : tags.entrySet()) {
-      assertEquals(entry.getValue(), span.getTags().get(entry.getKey()));
+    @Test
+    void buildSimpleSpan() {
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("test", "op name").withServiceName("foo").start();
+        assertEquals("op name", span.getOperationName());
     }
 
-    span = (DDSpan) tracer.buildSpan("test", expectedName).withServiceName("foo").start();
-
-    Map<String, Object> expectedTags = new HashMap<>();
-    expectedTags.put(THREAD_NAME, Thread.currentThread().getName());
-    expectedTags.put(THREAD_ID, Thread.currentThread().getId());
-    expectedTags.put(RUNTIME_ID_TAG, Config.get().getRuntimeId());
-    expectedTags.put(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE);
-    expectedTags.put(PID_TAG, Config.get().getProcessId());
-    expectedTags.put(SCHEMA_VERSION_TAG_KEY, SpanNaming.instance().version());
-    expectedTags.putAll(productTags());
-    assertEquals(expectedTags, span.getTags());
-
-    String expectedResource = "fakeResource";
-    String expectedService = "fakeService";
-    String expectedType = "fakeType";
-
-    span =
-        (DDSpan)
-            tracer
-                .buildSpan("test", expectedName)
+    @Test
+    void buildComplexSpan() {
+        String expectedName = "fakeName";
+        Map<String, Object> tags = new HashMap<>();
+        tags.put("1", true);
+        tags.put("2", "fakeString");
+        tags.put("3", 42.0);
+
+        AgentTracer.SpanBuilder builder =
+                tracer.buildSpan("datadog", expectedName).withServiceName("foo");
+        for (Map.Entry<String, Object> entry : tags.entrySet()) {
+            builder = builder.withTag(entry.getKey(), entry.getValue());
+        }
+
+        DDSpan span = (DDSpan) builder.start();
+
+        assertEquals(expectedName, span.getOperationName());
+        for (Map.Entry<String, Object> entry : tags.entrySet()) {
+            assertEquals(entry.getValue(), span.getTags().get(entry.getKey()));
+        }
+
+        span = (DDSpan)
+                tracer.buildSpan("test", expectedName).withServiceName("foo").start();
+
+        Map<String, Object> expectedTags = new HashMap<>();
+        expectedTags.put(THREAD_NAME, Thread.currentThread().getName());
+        expectedTags.put(THREAD_ID, Thread.currentThread().getId());
+        expectedTags.put(RUNTIME_ID_TAG, Config.get().getRuntimeId());
+        expectedTags.put(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE);
+        expectedTags.put(PID_TAG, Config.get().getProcessId());
+        expectedTags.put(SCHEMA_VERSION_TAG_KEY, SpanNaming.instance().version());
+        expectedTags.putAll(productTags());
+        assertEquals(expectedTags, span.getTags());
+
+        String expectedResource = "fakeResource";
+        String expectedService = "fakeService";
+        String expectedType = "fakeType";
+
+        span = (DDSpan) tracer.buildSpan("test", expectedName)
                 .withServiceName("foo")
                 .withResourceName(expectedResource)
                 .withServiceName(expectedService)
@@ -130,516 +128,488 @@ void buildComplexSpan() {
                 .withSpanType(expectedType)
                 .start();
 
-    DDSpanContext spanContext = span.spanContext();
-
-    assertEquals(expectedResource, spanContext.getResourceName());
-    assertTrue(spanContext.getErrorFlag());
-    assertEquals(expectedService, spanContext.getServiceName());
-    assertEquals(expectedType, spanContext.getSpanType());
-    assertEquals(Thread.currentThread().getName(), spanContext.getTag(THREAD_NAME));
-    assertEquals(Thread.currentThread().getId(), spanContext.getTag(THREAD_ID));
-  }
-
-  @TableTest({
-    "scenario  | name      | value",
-    "null tag  | null.tag  |      ",
-    "empty tag | empty.tag | ''   "
-  })
-  void settingNameShouldRemove(String name, String value) {
-    DDSpan span =
-        (DDSpan)
-            tracer
-                .buildSpan("test", "op name")
+        DDSpanContext spanContext = span.spanContext();
+
+        assertEquals(expectedResource, spanContext.getResourceName());
+        assertTrue(spanContext.getErrorFlag());
+        assertEquals(expectedService, spanContext.getServiceName());
+        assertEquals(expectedType, spanContext.getSpanType());
+        assertEquals(Thread.currentThread().getName(), spanContext.getTag(THREAD_NAME));
+        assertEquals(Thread.currentThread().getId(), spanContext.getTag(THREAD_ID));
+    }
+
+    @TableTest({
+      "scenario  | name      | value",
+      "null tag  | null.tag  |      ",
+      "empty tag | empty.tag | ''   "
+    })
+    void settingNameShouldRemove(String name, String value) {
+        DDSpan span = (DDSpan) tracer.buildSpan("test", "op name")
                 .withTag(name, "tag value")
                 .withTag(name, value)
                 .start();
 
-    assertNull(span.getTags().get(name));
+        assertNull(span.getTags().get(name));
 
-    span.setTag(name, "a tag");
-    assertEquals("a tag", span.getTags().get(name));
+        span.setTag(name, "a tag");
+        assertEquals("a tag", span.getTags().get(name));
 
-    span.setTag(name, value);
-    assertNull(span.getTags().get(name));
-  }
+        span.setTag(name, value);
+        assertNull(span.getTags().get(name));
+    }
 
-  @Test
-  void shouldBuildSpanTimestampInNano() {
-    long expectedTimestamp = 487517802L * 1000 * 1000L;
-    String expectedName = "fakeName";
+    @Test
+    void shouldBuildSpanTimestampInNano() {
+        long expectedTimestamp = 487517802L * 1000 * 1000L;
+        String expectedName = "fakeName";
 
-    DDSpan span =
-        (DDSpan)
-            tracer
-                .buildSpan("test", expectedName)
+        DDSpan span = (DDSpan) tracer.buildSpan("test", expectedName)
                 .withServiceName("foo")
                 .withStartTimestamp(expectedTimestamp)
                 .start();
 
-    assertEquals(expectedTimestamp * 1000L, span.getStartTime());
-
-    long start = System.currentTimeMillis();
-    span = (DDSpan) tracer.buildSpan("test", expectedName).withServiceName("foo").start();
-    long stop = System.currentTimeMillis();
-
-    assertTrue(span.getStartTime() >= MILLISECONDS.toNanos(start - 1));
-    assertTrue(span.getStartTime() <= MILLISECONDS.toNanos(stop + 1));
-  }
-
-  @Test
-  void shouldLinkToParentSpan() {
-    long spanId = 1L;
-    DDTraceId traceId = DDTraceId.ONE;
-    long expectedParentId = spanId;
-
-    DDSpanContext mockedContext = mock(DDSpanContext.class);
-    when(mockedContext.getTraceId()).thenReturn(traceId);
-    when(mockedContext.getSpanId()).thenReturn(spanId);
-    when(mockedContext.getServiceName()).thenReturn("foo");
-    when(mockedContext.getBaggageItems()).thenReturn(Collections.<String, String>emptyMap());
-    when(mockedContext.getTraceCollector()).thenReturn(tracer.createTraceCollector(DDTraceId.ONE));
-    when(mockedContext.getPathwayContext()).thenReturn(NoopPathwayContext.INSTANCE);
-
-    DDSpan span =
-        (DDSpan)
-            tracer
-                .buildSpan("test", "fakeName")
+        assertEquals(expectedTimestamp * 1000L, span.getStartTime());
+
+        long start = System.currentTimeMillis();
+        span = (DDSpan)
+                tracer.buildSpan("test", expectedName).withServiceName("foo").start();
+        long stop = System.currentTimeMillis();
+
+        assertTrue(span.getStartTime() >= MILLISECONDS.toNanos(start - 1));
+        assertTrue(span.getStartTime() <= MILLISECONDS.toNanos(stop + 1));
+    }
+
+    @Test
+    void shouldLinkToParentSpan() {
+        long spanId = 1L;
+        DDTraceId traceId = DDTraceId.ONE;
+        long expectedParentId = spanId;
+
+        DDSpanContext mockedContext = mock(DDSpanContext.class);
+        when(mockedContext.getTraceId()).thenReturn(traceId);
+        when(mockedContext.getSpanId()).thenReturn(spanId);
+        when(mockedContext.getServiceName()).thenReturn("foo");
+        when(mockedContext.getBaggageItems()).thenReturn(Collections.<String, String>emptyMap());
+        when(mockedContext.getTraceCollector()).thenReturn(tracer.createTraceCollector(DDTraceId.ONE));
+        when(mockedContext.getPathwayContext()).thenReturn(NoopPathwayContext.INSTANCE);
+
+        DDSpan span = (DDSpan) tracer.buildSpan("test", "fakeName")
                 .withServiceName("foo")
                 .asChildOf(mockedContext)
                 .start();
 
-    DDSpanContext actualSpanContext = span.spanContext();
-    assertEquals(expectedParentId, actualSpanContext.getParentId());
-    assertEquals(traceId, actualSpanContext.getTraceId());
-  }
-
-  @TableTest({
-    "scenario                  | noopParent | serviceName     | expectTopLevel",
-    "same service, no noop     | false      | service         | false         ",
-    "noop parent, same service | true       | service         | true          ",
-    "diff service, no noop     | false      | another service | true          ",
-    "noop parent, diff service | true       | another service | true          "
-  })
-  void shouldLinkToParentSpanImplicitly(
-      boolean noopParent, String serviceName, boolean expectTopLevel) {
-    try (ContextScope parent =
-        tracer.activateSpan(
-            noopParent
-                ? noopSpan()
-                : tracer.buildSpan("test", "parent").withServiceName("service").start())) {
-      long expectedParentId =
-          noopParent ? DDSpanId.ZERO : AgentSpan.fromScope(parent).spanContext().getSpanId();
-
-      DDSpan span =
-          (DDSpan) tracer.buildSpan("test", "fakeName").withServiceName(serviceName).start();
-
-      DDSpanContext actualSpanContext = span.spanContext();
-      assertEquals(expectedParentId, actualSpanContext.getParentId());
-      assertEquals(expectTopLevel, span.isTopLevel());
+        DDSpanContext actualSpanContext = span.spanContext();
+        assertEquals(expectedParentId, actualSpanContext.getParentId());
+        assertEquals(traceId, actualSpanContext.getTraceId());
+    }
+
+    @TableTest({
+      "scenario                  | noopParent | serviceName     | expectTopLevel",
+      "same service, no noop     | false      | service         | false         ",
+      "noop parent, same service | true       | service         | true          ",
+      "diff service, no noop     | false      | another service | true          ",
+      "noop parent, diff service | true       | another service | true          "
+    })
+    void shouldLinkToParentSpanImplicitly(boolean noopParent, String serviceName, boolean expectTopLevel) {
+        try (ContextScope parent = tracer.activateSpan(
+                noopParent
+                        ? noopSpan()
+                        : tracer.buildSpan("test", "parent")
+                                .withServiceName("service")
+                                .start())) {
+            long expectedParentId = noopParent
+                    ? DDSpanId.ZERO
+                    : AgentSpan.fromScope(parent).spanContext().getSpanId();
+
+            DDSpan span = (DDSpan) tracer.buildSpan("test", "fakeName")
+                    .withServiceName(serviceName)
+                    .start();
+
+            DDSpanContext actualSpanContext = span.spanContext();
+            assertEquals(expectedParentId, actualSpanContext.getParentId());
+            assertEquals(expectTopLevel, span.isTopLevel());
+        }
     }
-  }
-
-  @Test
-  void shouldInheritTheDDParentAttributes() {
-    String expectedName = "fakeName";
-    String expectedParentResourceName = "fakeResourceName";
-    String expectedParentType = "fakeType";
-    String expectedParentServiceName = "fakeServiceName";
-    String expectedChildServiceName = "fakeServiceName-child";
-    String expectedChildResourceName = "fakeResourceName-child";
-    String expectedChildType = "fakeType-child";
-    String expectedBaggageItemKey = "fakeKey";
-    String expectedBaggageItemValue = "fakeValue";
-
-    DDSpan parent =
-        (DDSpan)
-            tracer
-                .buildSpan("test", expectedName)
+
+    @Test
+    void shouldInheritTheDDParentAttributes() {
+        String expectedName = "fakeName";
+        String expectedParentResourceName = "fakeResourceName";
+        String expectedParentType = "fakeType";
+        String expectedParentServiceName = "fakeServiceName";
+        String expectedChildServiceName = "fakeServiceName-child";
+        String expectedChildResourceName = "fakeResourceName-child";
+        String expectedChildType = "fakeType-child";
+        String expectedBaggageItemKey = "fakeKey";
+        String expectedBaggageItemValue = "fakeValue";
+
+        DDSpan parent = (DDSpan) tracer.buildSpan("test", expectedName)
                 .withServiceName("foo")
                 .withResourceName(expectedParentResourceName)
                 .withSpanType(expectedParentType)
                 .start();
 
-    parent.setBaggageItem(expectedBaggageItemKey, expectedBaggageItemValue);
+        parent.setBaggageItem(expectedBaggageItemKey, expectedBaggageItemValue);
 
-    // ServiceName and SpanType are always set by the parent if they are not present in the child
-    DDSpan span =
-        (DDSpan)
-            tracer
-                .buildSpan("test", expectedName)
+        // ServiceName and SpanType are always set by the parent if they are not present in the child
+        DDSpan span = (DDSpan) tracer.buildSpan("test", expectedName)
                 .withServiceName(expectedParentServiceName)
                 .asChildOf(parent)
                 .start();
 
-    assertEquals(expectedName, span.getOperationName());
-    assertEquals(expectedBaggageItemValue, span.getBaggageItem(expectedBaggageItemKey));
-    assertEquals(expectedParentServiceName, span.spanContext().getServiceName());
-    assertEquals(expectedName, span.spanContext().getResourceName());
-    assertNull(span.spanContext().getSpanType());
-    assertTrue(span.isTopLevel()); // service names differ between parent and child
-
-    // ServiceName and SpanType are always overwritten by the child if they are present
-    span =
-        (DDSpan)
-            tracer
-                .buildSpan("test", expectedName)
+        assertEquals(expectedName, span.getOperationName());
+        assertEquals(expectedBaggageItemValue, span.getBaggageItem(expectedBaggageItemKey));
+        assertEquals(expectedParentServiceName, span.spanContext().getServiceName());
+        assertEquals(expectedName, span.spanContext().getResourceName());
+        assertNull(span.spanContext().getSpanType());
+        assertTrue(span.isTopLevel()); // service names differ between parent and child
+
+        // ServiceName and SpanType are always overwritten by the child if they are present
+        span = (DDSpan) tracer.buildSpan("test", expectedName)
                 .withServiceName(expectedChildServiceName)
                 .withResourceName(expectedChildResourceName)
                 .withSpanType(expectedChildType)
                 .asChildOf(parent)
                 .start();
 
-    assertEquals(expectedName, span.getOperationName());
-    assertEquals(expectedBaggageItemValue, span.getBaggageItem(expectedBaggageItemKey));
-    assertEquals(expectedChildServiceName, span.spanContext().getServiceName());
-    assertEquals(expectedChildResourceName, span.spanContext().getResourceName());
-    assertEquals(expectedChildType, span.spanContext().getSpanType());
-  }
-
-  @Test
-  void shouldTrackAllSpansInTrace() {
-    int nbSamples = 10;
-    List<DDSpan> spans = new ArrayList<>();
-
-    DDSpan root = (DDSpan) tracer.buildSpan("test", "fake_O").withServiceName("foo").start();
-    DDSpan lastSpan = root;
-
-    for (int i = 1; i <= 10; i++) {
-      lastSpan =
-          (DDSpan)
-              tracer
-                  .buildSpan("test", "fake_" + i)
-                  .withServiceName("foo")
-                  .asChildOf(lastSpan)
-                  .start();
-      spans.add(lastSpan);
-      lastSpan.finish();
+        assertEquals(expectedName, span.getOperationName());
+        assertEquals(expectedBaggageItemValue, span.getBaggageItem(expectedBaggageItemKey));
+        assertEquals(expectedChildServiceName, span.spanContext().getServiceName());
+        assertEquals(expectedChildResourceName, span.spanContext().getResourceName());
+        assertEquals(expectedChildType, span.spanContext().getSpanType());
     }
 
-    PendingTrace traceCollector = (PendingTrace) root.spanContext().getTraceCollector();
-    assertEquals(root, traceCollector.getRootSpan());
-    assertEquals(nbSamples, traceCollector.size());
-    assertTrue(traceCollector.getSpans().containsAll(spans));
-    DDSpan randomSpan = spans.get((int) (Math.random() * nbSamples));
-    assertTrue(
-        ((PendingTrace) randomSpan.spanContext().getTraceCollector())
-            .getSpans()
-            .containsAll(spans));
-  }
-
-  static Stream<ExtractedContext> extractedContextShouldPopulateNewSpanDetailsArguments() {
-    return Stream.of(
-        new ExtractedContext(
-            DDTraceId.ONE,
-            2,
-            PrioritySampling.SAMPLER_DROP,
-            null,
-            0,
-            Collections.<String, String>emptyMap(),
-            Collections.<String, Object>emptyMap(),
-            null,
-            PropagationTags.factory()
-                .fromHeaderValue(
-                    PropagationTags.HeaderType.DATADOG, "_dd.p.dm=934086a686-4,_dd.p.anytag=value"),
-            null,
-            DATADOG),
-        new ExtractedContext(
-            DDTraceId.from(3),
-            4,
-            PrioritySampling.SAMPLER_KEEP,
-            "some-origin",
-            0,
-            Collections.singletonMap("asdf", "qwer"),
-            buildTagsMap(ORIGIN_KEY, "some-origin", "zxcv", "1234"),
-            null,
-            PropagationTags.factory().empty(),
-            null,
-            DATADOG));
-  }
-
-  @ParameterizedTest
-  @MethodSource("extractedContextShouldPopulateNewSpanDetailsArguments")
-  void extractedContextShouldPopulateNewSpanDetails(ExtractedContext extractedContext) {
-    Thread thread = Thread.currentThread();
-    DDSpan span = (DDSpan) tracer.buildSpan("test", "op name").asChildOf(extractedContext).start();
-
-    assertEquals(extractedContext.getTraceId(), span.getTraceId());
-    assertEquals(extractedContext.getSpanId(), span.getParentId());
-    assertEquals(extractedContext.getSamplingPriority(), (int) span.getSamplingPriority());
-    assertEquals(extractedContext.getOrigin(), span.spanContext().getOrigin());
-    assertEquals(extractedContext.getBaggage(), span.spanContext().getBaggageItems());
-    assertEquals(thread.getId(), span.getTag(THREAD_ID));
-    assertEquals(thread.getName(), span.getTag(THREAD_NAME));
-    assertEquals(
-        extractedContext.getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG),
-        span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG));
-  }
-
-  @Test
-  @WithConfig(key = "trace.propagation.behavior.extract", value = "restart")
-  void buildContextFromExtractedContextWithRestartBehavior() {
-    ExtractedContext extractedContext =
-        new ExtractedContext(
-            DDTraceId.ONE,
-            2,
-            PrioritySampling.SAMPLER_DROP,
-            null,
-            0,
-            Collections.<String, String>emptyMap(),
-            Collections.<String, Object>emptyMap(),
-            null,
-            propagationTagsWithOtelState(),
-            null,
-            DATADOG);
-    DDSpan span = (DDSpan) tracer.buildSpan("test", "op name").asChildOf(extractedContext).start();
-
-    assertNotEquals(extractedContext.getTraceId(), span.getTraceId());
-    assertNotEquals(extractedContext.getSpanId(), span.getParentId());
-    assertEquals(PrioritySampling.UNSET, span.samplingPriority());
-
-    List<? extends AgentSpanLink> spanLinks = span.getLinks();
-    assertEquals(1, spanLinks.size());
-    AgentSpanLink link = spanLinks.get(0);
-    assertEquals(extractedContext.getTraceId(), link.traceId());
-    assertEquals(extractedContext.getSpanId(), link.spanId());
-    assertEquals(
-        extractedContext.getPropagationTags().headerValue(PropagationTags.HeaderType.W3C),
-        link.traceState());
-    String initialTraceState =
-        span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.W3C);
-    assertTrue(initialTraceState == null || !initialTraceState.contains(OTEL_MEMBER));
-
-    span.setSamplingPriority(USER_KEEP, SAMPLING_RULE_RATE, SAMPLE_RATE_0_5, LOCAL_USER_RULE);
-
-    String freshTraceState =
-        span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.W3C);
-    assertFalse(freshTraceState.contains(INHERITED_RANDOM_VALUE));
-    assertTrue(freshTraceState.contains(THRESHOLD_0_5));
-  }
-
-  @Test
-  @WithConfig(key = "trace.propagation.behavior.extract", value = "ignore")
-  void buildContextFromExtractedContextWithIgnoreBehavior() {
-    ExtractedContext extractedContext =
-        new ExtractedContext(
-            DDTraceId.ONE,
-            2,
-            PrioritySampling.SAMPLER_DROP,
-            null,
-            0,
-            Collections.<String, String>emptyMap(),
-            Collections.<String, Object>emptyMap(),
-            null,
-            propagationTagsWithOtelState(),
-            null,
-            DATADOG);
-    DDSpan span = (DDSpan) tracer.buildSpan("test", "op name").asChildOf(extractedContext).start();
-
-    assertNotEquals(extractedContext.getTraceId(), span.getTraceId());
-    assertNotEquals(extractedContext.getSpanId(), span.getParentId());
-    assertEquals(PrioritySampling.UNSET, span.samplingPriority());
-    assertTrue(span.getLinks().isEmpty());
-    String initialTraceState =
-        span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.W3C);
-    assertTrue(initialTraceState == null || !initialTraceState.contains(OTEL_MEMBER));
-
-    span.setSamplingPriority(USER_KEEP, SAMPLING_RULE_RATE, SAMPLE_RATE_0_5, LOCAL_USER_RULE);
-
-    String freshTraceState =
-        span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.W3C);
-    assertFalse(freshTraceState.contains(INHERITED_RANDOM_VALUE));
-    assertTrue(freshTraceState.contains(THRESHOLD_0_5));
-  }
-
-  private static PropagationTags propagationTagsWithOtelState() {
-    PropagationTags propagationTags =
-        PropagationTags.factory()
-            .fromHeaderValue(PropagationTags.HeaderType.DATADOG, DATADOG_TRACE_STATE);
-    propagationTags.updateW3CTracestate(OTEL_TRACE_STATE);
-    return propagationTags;
-  }
-
-  @Test
-  @WithConfig(key = "trace.propagation.behavior.extract", value = "ignore")
-  void appSecContextPreservedFromTagContextWithIgnoreBehavior() {
-    Object appSecData = new Object();
-    Object iastData = new Object();
-    TagContext tagContext =
-        new TagContext()
-            .withRequestContextDataAppSec(appSecData)
-            .withRequestContextDataIast(iastData);
-
-    DDSpan span = (DDSpan) tracer.buildSpan("test", "op name").asChildOf(tagContext).start();
-
-    assertEquals(appSecData, span.getRequestContext().getData(RequestContextSlot.APPSEC));
-    assertEquals(iastData, span.getRequestContext().getData(RequestContextSlot.IAST));
-    span.finish();
-  }
-
-  @Test
-  @WithConfig(key = "trace.propagation.behavior.extract", value = "restart")
-  void appSecContextPreservedFromTagContextWithRestartBehavior() {
-    Object appSecData = new Object();
-    Object iastData = new Object();
-    TagContext tagContext =
-        new TagContext()
-            .withRequestContextDataAppSec(appSecData)
-            .withRequestContextDataIast(iastData);
-
-    DDSpan span = (DDSpan) tracer.buildSpan("test", "op name").asChildOf(tagContext).start();
-
-    assertEquals(appSecData, span.getRequestContext().getData(RequestContextSlot.APPSEC));
-    assertEquals(iastData, span.getRequestContext().getData(RequestContextSlot.IAST));
-    span.finish();
-  }
-
-  @TableTest({
-    "scenario      | origin      | tagMap      ",
-    "empty tag map |             | [:]         ",
-    "some origin   | some-origin | [asdf: qwer]"
-  })
-  void tagContextShouldPopulateDefaultSpanDetails(
-      String scenario, String origin, Map<String, String> tagMap) {
-    Thread thread = Thread.currentThread();
-    TagContext tagContext = new TagContext(origin, TagMap.fromMap(tagMap));
-    DDSpan span = (DDSpan) tracer.buildSpan("test", "op name").asChildOf(tagContext).start();
-
-    assertNotEquals(DDTraceId.ZERO, span.getTraceId());
-    assertEquals(DDSpanId.ZERO, span.getParentId());
-    assertNull(span.getSamplingPriority());
-    assertEquals(tagContext.getOrigin(), span.spanContext().getOrigin());
-    assertEquals(Collections.emptyMap(), span.spanContext().getBaggageItems());
-
-    Map<String, Object> expectedTags = new HashMap<>();
-    if (tagContext.getTags() != null) {
-      expectedTags.putAll(tagContext.getTags());
+    @Test
+    void shouldTrackAllSpansInTrace() {
+        int nbSamples = 10;
+        List<DDSpan> spans = new ArrayList<>();
+
+        DDSpan root = (DDSpan)
+                tracer.buildSpan("test", "fake_O").withServiceName("foo").start();
+        DDSpan lastSpan = root;
+
+        for (int i = 1; i <= 10; i++) {
+            lastSpan = (DDSpan) tracer.buildSpan("test", "fake_" + i)
+                    .withServiceName("foo")
+                    .asChildOf(lastSpan)
+                    .start();
+            spans.add(lastSpan);
+            lastSpan.finish();
+        }
+
+        PendingTrace traceCollector = (PendingTrace) root.spanContext().getTraceCollector();
+        assertEquals(root, traceCollector.getRootSpan());
+        assertEquals(nbSamples, traceCollector.size());
+        assertTrue(traceCollector.getSpans().containsAll(spans));
+        DDSpan randomSpan = spans.get((int) (Math.random() * nbSamples));
+        assertTrue(((PendingTrace) randomSpan.spanContext().getTraceCollector())
+                .getSpans()
+                .containsAll(spans));
     }
-    expectedTags.put(RUNTIME_ID_TAG, Config.get().getRuntimeId());
-    expectedTags.put(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE);
-    expectedTags.put(THREAD_NAME, thread.getName());
-    expectedTags.put(THREAD_ID, thread.getId());
-    expectedTags.put(PID_TAG, Config.get().getProcessId());
-    expectedTags.put(SCHEMA_VERSION_TAG_KEY, SpanNaming.instance().version());
-    expectedTags.putAll(productTags());
-    assertEquals(expectedTags, span.spanContext().getTags());
-  }
-
-  static Stream<Arguments> globalSpanTagsPopulatedOnEachSpanArguments() {
-    return Stream.of(
-        arguments("", Collections.emptyMap()),
-        arguments("is:val:id", Collections.singletonMap("is", "val:id")),
-        arguments("a:x", Collections.singletonMap("a", "x")),
-        arguments("a:a,a:b,a:c", Collections.singletonMap("a", "c")),
-        arguments("a:1,b-c:d", buildStringMap("a", "1", "b-c", "d")));
-  }
-
-  @TableTest({
-    "scenario          | tagString   | tags          ",
-    "empty             | ''          | [:]           ",
-    "column            | is:val:id   | [is: 'val:id']",
-    "single            | a:x         | [a: x]        ",
-    "same multi-values | a:a,a:b,a:c | [a: c]        ",
-    "multi values      | a:1,b-c:d   | [a: 1, b-c: d]"
-  })
-  void globalSpanTagsPopulatedOnEachSpan(String tagString, Map<String, String> tags) {
-    injectSysConfig("dd.trace.span.tags", tagString);
-    CoreTracer customTracer = tracerBuilder().writer(writer).build();
-    DDSpan span = (DDSpan) customTracer.buildSpan("test", "op name").withServiceName("foo").start();
-
-    Map<String, Object> expectedTags = new HashMap<>(tags);
-    expectedTags.put(THREAD_NAME, Thread.currentThread().getName());
-    expectedTags.put(THREAD_ID, Thread.currentThread().getId());
-    expectedTags.put(RUNTIME_ID_TAG, Config.get().getRuntimeId());
-    expectedTags.put(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE);
-    expectedTags.put(PID_TAG, Config.get().getProcessId());
-    expectedTags.put(SCHEMA_VERSION_TAG_KEY, SpanNaming.instance().version());
-    expectedTags.putAll(productTags());
-    assertEquals(expectedTags, span.getTags());
-  }
-
-  @Test
-  void canOverwriteRequestContextDataWithBuilderFromEmpty() {
-    AgentSpan span1 = tracer.startSpan("test", "span1");
-
-    assertNull(span1.getRequestContext().getData(RequestContextSlot.APPSEC));
-    assertNull(span1.getRequestContext().getData(RequestContextSlot.CI_VISIBILITY));
-    assertNull(span1.getRequestContext().getData(RequestContextSlot.IAST));
-
-    AgentSpan span2 =
-        tracer
-            .buildSpan("test", "span2")
-            .asChildOf(span1.spanContext())
-            .withRequestContextData(RequestContextSlot.APPSEC, "override")
-            .withRequestContextData(RequestContextSlot.CI_VISIBILITY, "override")
-            .withRequestContextData(RequestContextSlot.IAST, "override")
-            .start();
-
-    assertEquals("override", span2.getRequestContext().getData(RequestContextSlot.APPSEC));
-    assertEquals("override", span2.getRequestContext().getData(RequestContextSlot.CI_VISIBILITY));
-    assertEquals("override", span2.getRequestContext().getData(RequestContextSlot.IAST));
-
-    span2.finish();
-    span1.finish();
-  }
-
-  @Test
-  void canOverwriteRequestContextDataWithBuilder() {
-    TagContext context =
-        new TagContext()
-            .withCiVisibilityContextData("value")
-            .withRequestContextDataIast("value")
-            .withRequestContextDataAppSec("value");
-    AgentSpan span1 = tracer.buildSpan("test", "span1").asChildOf(context).start();
-
-    AgentSpan span2 = tracer.buildSpan("test", "span2").asChildOf(span1.spanContext()).start();
-
-    assertEquals("value", span2.getRequestContext().getData(RequestContextSlot.APPSEC));
-    assertEquals("value", span2.getRequestContext().getData(RequestContextSlot.CI_VISIBILITY));
-    assertEquals("value", span2.getRequestContext().getData(RequestContextSlot.IAST));
-
-    AgentSpan span3 =
-        tracer
-            .buildSpan("test", "span3")
-            .asChildOf(span2.spanContext())
-            .withRequestContextData(RequestContextSlot.APPSEC, "override")
-            .withRequestContextData(RequestContextSlot.CI_VISIBILITY, "override")
-            .withRequestContextData(RequestContextSlot.IAST, "override")
-            .start();
-
-    assertEquals("override", span3.getRequestContext().getData(RequestContextSlot.APPSEC));
-    assertEquals("override", span3.getRequestContext().getData(RequestContextSlot.CI_VISIBILITY));
-    assertEquals("override", span3.getRequestContext().getData(RequestContextSlot.IAST));
-
-    span3.finish();
-    span2.finish();
-    span1.finish();
-  }
-
-  private Map<String, Object> productTags() {
-    Map<String, Object> productTags = new HashMap<>();
-    productTags.put(PROFILING_ENABLED, Config.get().isProfilingEnabled() ? 1 : 0);
-    if (Config.get().isDataStreamsEnabled()) {
-      productTags.put(DSM_ENABLED, 1);
+
+    static Stream<ExtractedContext> extractedContextShouldPopulateNewSpanDetailsArguments() {
+        return Stream.of(
+                new ExtractedContext(
+                        DDTraceId.ONE,
+                        2,
+                        PrioritySampling.SAMPLER_DROP,
+                        null,
+                        0,
+                        Collections.<String, String>emptyMap(),
+                        Collections.<String, Object>emptyMap(),
+                        null,
+                        PropagationTags.factory()
+                                .fromHeaderValue(
+                                        PropagationTags.HeaderType.DATADOG, "_dd.p.dm=934086a686-4,_dd.p.anytag=value"),
+                        null,
+                        DATADOG),
+                new ExtractedContext(
+                        DDTraceId.from(3),
+                        4,
+                        PrioritySampling.SAMPLER_KEEP,
+                        "some-origin",
+                        0,
+                        Collections.singletonMap("asdf", "qwer"),
+                        buildTagsMap(ORIGIN_KEY, "some-origin", "zxcv", "1234"),
+                        null,
+                        PropagationTags.factory().empty(),
+                        null,
+                        DATADOG));
+    }
+
+    @ParameterizedTest
+    @MethodSource("extractedContextShouldPopulateNewSpanDetailsArguments")
+    void extractedContextShouldPopulateNewSpanDetails(ExtractedContext extractedContext) {
+        Thread thread = Thread.currentThread();
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("test", "op name").asChildOf(extractedContext).start();
+
+        assertEquals(extractedContext.getTraceId(), span.getTraceId());
+        assertEquals(extractedContext.getSpanId(), span.getParentId());
+        assertEquals(extractedContext.getSamplingPriority(), (int) span.getSamplingPriority());
+        assertEquals(extractedContext.getOrigin(), span.spanContext().getOrigin());
+        assertEquals(extractedContext.getBaggage(), span.spanContext().getBaggageItems());
+        assertEquals(thread.getId(), span.getTag(THREAD_ID));
+        assertEquals(thread.getName(), span.getTag(THREAD_NAME));
+        assertEquals(
+                extractedContext.getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG),
+                span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG));
+    }
+
+    @Test
+    @WithConfig(key = "trace.propagation.behavior.extract", value = "restart")
+    void buildContextFromExtractedContextWithRestartBehavior() {
+        ExtractedContext extractedContext = new ExtractedContext(
+                DDTraceId.ONE,
+                2,
+                PrioritySampling.SAMPLER_DROP,
+                null,
+                0,
+                Collections.<String, String>emptyMap(),
+                Collections.<String, Object>emptyMap(),
+                null,
+                propagationTagsWithOtelState(),
+                null,
+                DATADOG);
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("test", "op name").asChildOf(extractedContext).start();
+
+        assertNotEquals(extractedContext.getTraceId(), span.getTraceId());
+        assertNotEquals(extractedContext.getSpanId(), span.getParentId());
+        assertEquals(PrioritySampling.UNSET, span.samplingPriority());
+
+        List<? extends AgentSpanLink> spanLinks = span.getLinks();
+        assertEquals(1, spanLinks.size());
+        AgentSpanLink link = spanLinks.get(0);
+        assertEquals(extractedContext.getTraceId(), link.traceId());
+        assertEquals(extractedContext.getSpanId(), link.spanId());
+        assertEquals(
+                extractedContext.getPropagationTags().headerValue(PropagationTags.HeaderType.W3C), link.traceState());
+        String initialTraceState = span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.W3C);
+        assertTrue(initialTraceState == null || !initialTraceState.contains(OTEL_MEMBER));
+
+        span.setSamplingPriority(USER_KEEP, SAMPLING_RULE_RATE, SAMPLE_RATE_0_5, LOCAL_USER_RULE);
+
+        String freshTraceState = span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.W3C);
+        assertFalse(freshTraceState.contains(INHERITED_RANDOM_VALUE));
+        assertTrue(freshTraceState.contains(THRESHOLD_0_5));
+    }
+
+    @Test
+    @WithConfig(key = "trace.propagation.behavior.extract", value = "ignore")
+    void buildContextFromExtractedContextWithIgnoreBehavior() {
+        ExtractedContext extractedContext = new ExtractedContext(
+                DDTraceId.ONE,
+                2,
+                PrioritySampling.SAMPLER_DROP,
+                null,
+                0,
+                Collections.<String, String>emptyMap(),
+                Collections.<String, Object>emptyMap(),
+                null,
+                propagationTagsWithOtelState(),
+                null,
+                DATADOG);
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("test", "op name").asChildOf(extractedContext).start();
+
+        assertNotEquals(extractedContext.getTraceId(), span.getTraceId());
+        assertNotEquals(extractedContext.getSpanId(), span.getParentId());
+        assertEquals(PrioritySampling.UNSET, span.samplingPriority());
+        assertTrue(span.getLinks().isEmpty());
+        String initialTraceState = span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.W3C);
+        assertTrue(initialTraceState == null || !initialTraceState.contains(OTEL_MEMBER));
+
+        span.setSamplingPriority(USER_KEEP, SAMPLING_RULE_RATE, SAMPLE_RATE_0_5, LOCAL_USER_RULE);
+
+        String freshTraceState = span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.W3C);
+        assertFalse(freshTraceState.contains(INHERITED_RANDOM_VALUE));
+        assertTrue(freshTraceState.contains(THRESHOLD_0_5));
+    }
+
+    private static PropagationTags propagationTagsWithOtelState() {
+        PropagationTags propagationTags =
+                PropagationTags.factory().fromHeaderValue(PropagationTags.HeaderType.DATADOG, DATADOG_TRACE_STATE);
+        propagationTags.updateW3CTracestate(OTEL_TRACE_STATE);
+        return propagationTags;
     }
-    if (Config.get().isDataJobsEnabled()) {
-      productTags.put(DJM_ENABLED, 1);
+
+    @Test
+    @WithConfig(key = "trace.propagation.behavior.extract", value = "ignore")
+    void appSecContextPreservedFromTagContextWithIgnoreBehavior() {
+        Object appSecData = new Object();
+        Object iastData = new Object();
+        TagContext tagContext =
+                new TagContext().withRequestContextDataAppSec(appSecData).withRequestContextDataIast(iastData);
+
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("test", "op name").asChildOf(tagContext).start();
+
+        assertEquals(appSecData, span.getRequestContext().getData(RequestContextSlot.APPSEC));
+        assertEquals(iastData, span.getRequestContext().getData(RequestContextSlot.IAST));
+        span.finish();
+    }
+
+    @Test
+    @WithConfig(key = "trace.propagation.behavior.extract", value = "restart")
+    void appSecContextPreservedFromTagContextWithRestartBehavior() {
+        Object appSecData = new Object();
+        Object iastData = new Object();
+        TagContext tagContext =
+                new TagContext().withRequestContextDataAppSec(appSecData).withRequestContextDataIast(iastData);
+
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("test", "op name").asChildOf(tagContext).start();
+
+        assertEquals(appSecData, span.getRequestContext().getData(RequestContextSlot.APPSEC));
+        assertEquals(iastData, span.getRequestContext().getData(RequestContextSlot.IAST));
+        span.finish();
+    }
+
+    @TableTest({
+      "scenario      | origin      | tagMap      ",
+      "empty tag map |             | [:]         ",
+      "some origin   | some-origin | [asdf: qwer]"
+    })
+    void tagContextShouldPopulateDefaultSpanDetails(String scenario, String origin, Map<String, String> tagMap) {
+        Thread thread = Thread.currentThread();
+        TagContext tagContext = new TagContext(origin, TagMap.fromMap(tagMap));
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("test", "op name").asChildOf(tagContext).start();
+
+        assertNotEquals(DDTraceId.ZERO, span.getTraceId());
+        assertEquals(DDSpanId.ZERO, span.getParentId());
+        assertNull(span.getSamplingPriority());
+        assertEquals(tagContext.getOrigin(), span.spanContext().getOrigin());
+        assertEquals(Collections.emptyMap(), span.spanContext().getBaggageItems());
+
+        Map<String, Object> expectedTags = new HashMap<>();
+        if (tagContext.getTags() != null) {
+            expectedTags.putAll(tagContext.getTags());
+        }
+        expectedTags.put(RUNTIME_ID_TAG, Config.get().getRuntimeId());
+        expectedTags.put(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE);
+        expectedTags.put(THREAD_NAME, thread.getName());
+        expectedTags.put(THREAD_ID, thread.getId());
+        expectedTags.put(PID_TAG, Config.get().getProcessId());
+        expectedTags.put(SCHEMA_VERSION_TAG_KEY, SpanNaming.instance().version());
+        expectedTags.putAll(productTags());
+        assertEquals(expectedTags, span.spanContext().getTags());
+    }
+
+    static Stream<Arguments> globalSpanTagsPopulatedOnEachSpanArguments() {
+        return Stream.of(
+                arguments("", Collections.emptyMap()),
+                arguments("is:val:id", Collections.singletonMap("is", "val:id")),
+                arguments("a:x", Collections.singletonMap("a", "x")),
+                arguments("a:a,a:b,a:c", Collections.singletonMap("a", "c")),
+                arguments("a:1,b-c:d", buildStringMap("a", "1", "b-c", "d")));
+    }
+
+    @TableTest({
+      "scenario          | tagString   | tags          ",
+      "empty             | ''          | [:]           ",
+      "column            | is:val:id   | [is: 'val:id']",
+      "single            | a:x         | [a: x]        ",
+      "same multi-values | a:a,a:b,a:c | [a: c]        ",
+      "multi values      | a:1,b-c:d   | [a: 1, b-c: d]"
+    })
+    void globalSpanTagsPopulatedOnEachSpan(String tagString, Map<String, String> tags) {
+        injectSysConfig("dd.trace.span.tags", tagString);
+        CoreTracer customTracer = tracerBuilder().writer(writer).build();
+        DDSpan span = (DDSpan)
+                customTracer.buildSpan("test", "op name").withServiceName("foo").start();
+
+        Map<String, Object> expectedTags = new HashMap<>(tags);
+        expectedTags.put(THREAD_NAME, Thread.currentThread().getName());
+        expectedTags.put(THREAD_ID, Thread.currentThread().getId());
+        expectedTags.put(RUNTIME_ID_TAG, Config.get().getRuntimeId());
+        expectedTags.put(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE);
+        expectedTags.put(PID_TAG, Config.get().getProcessId());
+        expectedTags.put(SCHEMA_VERSION_TAG_KEY, SpanNaming.instance().version());
+        expectedTags.putAll(productTags());
+        assertEquals(expectedTags, span.getTags());
+    }
+
+    @Test
+    void canOverwriteRequestContextDataWithBuilderFromEmpty() {
+        AgentSpan span1 = tracer.startSpan("test", "span1");
+
+        assertNull(span1.getRequestContext().getData(RequestContextSlot.APPSEC));
+        assertNull(span1.getRequestContext().getData(RequestContextSlot.CI_VISIBILITY));
+        assertNull(span1.getRequestContext().getData(RequestContextSlot.IAST));
+
+        AgentSpan span2 = tracer.buildSpan("test", "span2")
+                .asChildOf(span1.spanContext())
+                .withRequestContextData(RequestContextSlot.APPSEC, "override")
+                .withRequestContextData(RequestContextSlot.CI_VISIBILITY, "override")
+                .withRequestContextData(RequestContextSlot.IAST, "override")
+                .start();
+
+        assertEquals("override", span2.getRequestContext().getData(RequestContextSlot.APPSEC));
+        assertEquals("override", span2.getRequestContext().getData(RequestContextSlot.CI_VISIBILITY));
+        assertEquals("override", span2.getRequestContext().getData(RequestContextSlot.IAST));
+
+        span2.finish();
+        span1.finish();
+    }
+
+    @Test
+    void canOverwriteRequestContextDataWithBuilder() {
+        TagContext context = new TagContext()
+                .withCiVisibilityContextData("value")
+                .withRequestContextDataIast("value")
+                .withRequestContextDataAppSec("value");
+        AgentSpan span1 = tracer.buildSpan("test", "span1").asChildOf(context).start();
+
+        AgentSpan span2 =
+                tracer.buildSpan("test", "span2").asChildOf(span1.spanContext()).start();
+
+        assertEquals("value", span2.getRequestContext().getData(RequestContextSlot.APPSEC));
+        assertEquals("value", span2.getRequestContext().getData(RequestContextSlot.CI_VISIBILITY));
+        assertEquals("value", span2.getRequestContext().getData(RequestContextSlot.IAST));
+
+        AgentSpan span3 = tracer.buildSpan("test", "span3")
+                .asChildOf(span2.spanContext())
+                .withRequestContextData(RequestContextSlot.APPSEC, "override")
+                .withRequestContextData(RequestContextSlot.CI_VISIBILITY, "override")
+                .withRequestContextData(RequestContextSlot.IAST, "override")
+                .start();
+
+        assertEquals("override", span3.getRequestContext().getData(RequestContextSlot.APPSEC));
+        assertEquals("override", span3.getRequestContext().getData(RequestContextSlot.CI_VISIBILITY));
+        assertEquals("override", span3.getRequestContext().getData(RequestContextSlot.IAST));
+
+        span3.finish();
+        span2.finish();
+        span1.finish();
+    }
+
+    private Map<String, Object> productTags() {
+        Map<String, Object> productTags = new HashMap<>();
+        productTags.put(PROFILING_ENABLED, Config.get().isProfilingEnabled() ? 1 : 0);
+        if (Config.get().isDataStreamsEnabled()) {
+            productTags.put(DSM_ENABLED, 1);
+        }
+        if (Config.get().isDataJobsEnabled()) {
+            productTags.put(DJM_ENABLED, 1);
+        }
+        return productTags;
     }
-    return productTags;
-  }
 
-  private static Map<String, Object> buildTagsMap(String... keyValues) {
-    Map<String, Object> map = new HashMap<>();
-    for (int i = 0; i < keyValues.length; i += 2) {
-      map.put(keyValues[i], keyValues[i + 1]);
+    private static Map<String, Object> buildTagsMap(String... keyValues) {
+        Map<String, Object> map = new HashMap<>();
+        for (int i = 0; i < keyValues.length; i += 2) {
+            map.put(keyValues[i], keyValues[i + 1]);
+        }
+        return map;
     }
-    return map;
-  }
 
-  private static Map<String, String> buildStringMap(String... keyValues) {
-    Map<String, String> map = new HashMap<>();
-    for (int i = 0; i < keyValues.length; i += 2) {
-      map.put(keyValues[i], keyValues[i + 1]);
+    private static Map<String, String> buildStringMap(String... keyValues) {
+        Map<String, String> map = new HashMap<>();
+        for (int i = 0; i < keyValues.length; i += 2) {
+            map.put(keyValues[i], keyValues[i + 1]);
+        }
+        return map;
     }
-    return map;
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest.java b/dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest.java
index 666431d8f1f..4286bfa7565 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest.java
@@ -64,833 +64,835 @@
 @Timeout(value = 10, unit = TimeUnit.SECONDS)
 public class CoreTracerTest extends DDCoreJavaSpecification {
 
-  private static final String FAKE_ENGINE = "fake-engine";
-
-  @BeforeAll
-  static void checkJvm() {
-    assumeFalse(
-        JavaVirtualMachine.isOracleJDK8(),
-        "Oracle JDK 1.8 did not merge the fix in JDK-8058322, leading to the JVM failing to"
-            + " correctly extract method parameters without args, when the code is compiled on a"
-            + " later JDK (targeting 8). This can manifest when creating mocks.");
-  }
-
-  @Test
-  void verifyDefaultsOnTracer() {
-    CoreTracer tracer = CoreTracer.builder().build();
-    try {
-      assertFalse(tracer.serviceName.isEmpty());
-      assertInstanceOf(RateByServiceTraceSampler.class, tracer.initialSampler);
-      assertInstanceOf(DDAgentWriter.class, tracer.writer);
-    } finally {
-      tracer.close();
-    }
-  }
-
-  private static final long SNAPSTART_CONSTRUCTION_TIME_NANOS = TimeUnit.SECONDS.toNanos(1000);
-
-  @Test
-  void
-      getTimeWithNanoTicks_whenNanoTicksStaleAfterSimulatedRestore_thenTimestampStaysAnchoredToConstructionTime() {
-    // Characterizes the AWS Lambda SnapStart bug this fix addresses: System.nanoTime() does not
-    // accumulate the frozen checkpoint/restore duration, so the nanoTicks a span is timestamped
-    // with right after restore is (almost) unchanged from construction (snapshot creation) time,
-    // even though wall-clock time has moved on by hours. Without a resync, span timestamps
-    // computed from that near-frozen nanoTicks stay anchored to construction time.
-    SnapStartTimeSource timeSource = new SnapStartTimeSource(SNAPSTART_CONSTRUCTION_TIME_NANOS);
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).timeSource(timeSource).build();
-    try {
-      long constructionTimeNanoTicks = timeSource.getNanoTicks();
-
-      // The restore happens much later: wall-clock jumps forward by 2 hours, but nanoTicks - tied
-      // to monotonic JVM uptime, which does not advance while the snapshot is frozen - does not.
-      timeSource.simulateSnapStartRestore(TimeUnit.HOURS.toNanos(2));
-
-      assertEquals(
-          SNAPSTART_CONSTRUCTION_TIME_NANOS,
-          tracer.getTimeWithNanoTicks(constructionTimeNanoTicks));
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @Test
-  @WithConfig(key = TracerConfig.TRACE_LAMBDA_SNAPSTART_CLOCK_RESYNC_ENABLED, value = "true")
-  void
-      maybeResyncClockForLambdaInvocation_whenEnabledAndCalledAfterSimulatedRestore_thenTimestampReflectsPostRestoreTime() {
-    SnapStartTimeSource timeSource = new SnapStartTimeSource(SNAPSTART_CONSTRUCTION_TIME_NANOS);
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).timeSource(timeSource).build();
-    try {
-      // The restore happens: wall-clock jumps forward by 2 hours, nanoTicks barely moves.
-      timeSource.simulateSnapStartRestore(TimeUnit.HOURS.toNanos(2));
-      long postRestoreNanos = timeSource.getCurrentTimeNanos();
-
-      tracer.maybeResyncClockForLambdaInvocation();
-
-      // A span timestamped with the near-frozen, post-restore nanoTicks reading now reflects the
-      // real post-restore time, not the stale construction-time anchor - proving the resync
-      // actually corrected counterDrift rather than the assertion just re-deriving the same
-      // reading.
-      assertEquals(postRestoreNanos, tracer.getTimeWithNanoTicks(timeSource.getNanoTicks()));
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @Test
-  @WithConfig(key = TracerConfig.TRACE_LAMBDA_SNAPSTART_CLOCK_RESYNC_ENABLED, value = "true")
-  void notifyLambdaStart_whenExplicitlyEnabled_thenResyncsClockToCurrentTime() {
-    // notifyLambdaStart runs once per Lambda invocation, before any span for that invocation is
-    // created - the actual trigger point for the resync in production, not just the extracted
-    // maybeResyncClockForLambdaInvocation() logic exercised directly above.
-    SnapStartTimeSource timeSource = new SnapStartTimeSource(SNAPSTART_CONSTRUCTION_TIME_NANOS);
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).timeSource(timeSource).build();
-    try {
-      timeSource.simulateSnapStartRestore(TimeUnit.HOURS.toNanos(2));
-      long postRestoreNanos = timeSource.getCurrentTimeNanos();
-
-      tracer.notifyLambdaStart(new Object(), "lambda-request-123");
-
-      // Same near-frozen-nanoTicks check as above: proves notifyLambdaStart's resync corrected
-      // the drift, rather than the assertion re-deriving the answer independently.
-      assertEquals(postRestoreNanos, tracer.getTimeWithNanoTicks(timeSource.getNanoTicks()));
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @Test
-  void
-      notifyLambdaStart_whenResyncDefaultsToDisabled_thenTimestampStaysAnchoredToConstructionTime() {
-    SnapStartTimeSource timeSource = new SnapStartTimeSource(SNAPSTART_CONSTRUCTION_TIME_NANOS);
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).timeSource(timeSource).build();
-    try {
-      long constructionTimeNanoTicks = timeSource.getNanoTicks();
-      timeSource.simulateSnapStartRestore(TimeUnit.HOURS.toNanos(2));
-
-      // No @WithConfig override here - this is an opt-in feature, off by default.
-      tracer.notifyLambdaStart(new Object(), "lambda-request-123");
-
-      assertEquals(
-          SNAPSTART_CONSTRUCTION_TIME_NANOS,
-          tracer.getTimeWithNanoTicks(constructionTimeNanoTicks));
-    } finally {
-      tracer.close();
-    }
-  }
-
-  /**
-   * A {@link datadog.trace.api.time.TimeSource} that decouples wall-clock time from nanoTicks, to
-   * simulate an AWS Lambda SnapStart checkpoint/restore: while frozen, monotonic nanoTicks do not
-   * advance but wall-clock time does. {@link ControllableTimeSource} can't simulate this because it
-   * derives both from the same underlying counter.
-   */
-  private static final class SnapStartTimeSource implements datadog.trace.api.time.TimeSource {
-    private final long nanoTicks;
-    private long currentTimeNanos;
-
-    SnapStartTimeSource(long initialNanos) {
-      this.nanoTicks = initialNanos;
-      this.currentTimeNanos = initialNanos;
-    }
-
-    void simulateSnapStartRestore(long wallClockJumpNanos) {
-      currentTimeNanos += wallClockJumpNanos;
-    }
-
-    @Override
-    public long getNanoTicks() {
-      return nanoTicks;
-    }
-
-    @Override
-    public long getCurrentTimeMillis() {
-      return TimeUnit.NANOSECONDS.toMillis(currentTimeNanos);
-    }
-
-    @Override
-    public long getCurrentTimeMicros() {
-      return TimeUnit.NANOSECONDS.toMicros(currentTimeNanos);
-    }
-
-    @Override
-    public long getCurrentTimeNanos() {
-      return currentTimeNanos;
-    }
-  }
-
-  @Test
-  @WithConfig(key = TracerConfig.PRIORITY_SAMPLING, value = "false")
-  void verifyOverridingSampler() {
-    CoreTracer tracer = tracerBuilder().build();
-    try {
-      assertInstanceOf(AllSampler.class, tracer.initialSampler);
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @Test
-  @WithConfig(key = TracerConfig.WRITER_TYPE, value = "LoggingWriter")
-  void verifyOverridingWriter() {
-    CoreTracer tracer = tracerBuilder().build();
-    try {
-      assertInstanceOf(LoggingWriter.class, tracer.writer);
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @Test
-  @WithConfig(key = TracerConfig.AGENT_UNIX_DOMAIN_SOCKET, value = "asdf")
-  void verifyUdsWindows() {
-    String originalOsName = System.getProperty("os.name");
-    try {
-      System.setProperty("os.name", "Windows ME");
-      assertEquals("asdf", Config.get().getAgentUnixDomainSocket());
-    } finally {
-      if (originalOsName != null) {
-        System.setProperty("os.name", originalOsName);
-      } else {
-        System.clearProperty("os.name");
-      }
-    }
-  }
-
-  @TableTest({
-    "scenario       | mapString             | map         ",
-    "duplicate keys | a:one, a:two, a:three | [a: three]  ",
-    "empty value    | a:b,c:d,e:            | [a: b, c: d]"
-  })
-  void verifyMappingConfigsOnTracer(String scenario, String mapString, Map<String, String> map) {
-    injectSysConfig(TracerConfig.SERVICE_MAPPING, mapString);
-    injectSysConfig(TracerConfig.SPAN_TAGS, mapString);
-    injectSysConfig(TracerConfig.HEADER_TAGS, mapString);
-    CoreTracer tracer = tracerBuilder().build();
-    try {
-      ConfigSnapshot config = tracer.captureTraceConfig();
-      assertEquals(map, config.mergedTracerTags);
-      assertEquals(map, config.getServiceMapping());
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @TableTest({
-    "scenario       | mapString             | map         ",
-    "duplicate keys | a:one, a:two, a:three | [a: three]  ",
-    "empty value    | a:b,c:d,e:            | [a: b, c: d]"
-  })
-  void verifyBaggageMappingConfigsOnTracer(
-      String scenario, String mapString, Map<String, String> map) {
-    injectSysConfig(TracerConfig.BAGGAGE_MAPPING, mapString);
-    CoreTracer tracer = tracerBuilder().build();
-    try {
-      assertEquals(map, tracer.captureTraceConfig().getBaggageMapping());
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @Test
-  @WithConfig(key = "agent.host", value = "somethingelse")
-  void verifyOverridingHost() {
-    assertEquals("somethingelse", Config.get().getAgentHost());
-  }
-
-  @TableTest({
-    "scenario   | key              | value",
-    "agent port | agent.port       | 777  ",
-    "trace port | trace.agent.port | 9999 "
-  })
-  void verifyOverridingPort(String key, String value) {
-    injectSysConfig(key, value);
-    assertEquals(Integer.valueOf(value), Config.get().getAgentPort());
-  }
-
-  @Test
-  @WithConfig(key = "writer.type", value = "LoggingWriter")
-  void writerIsLoggingWriterWhenPropertySet() {
-    CoreTracer tracer = tracerBuilder().build();
-    try {
-      assertInstanceOf(LoggingWriter.class, tracer.writer);
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @TableTest({
-    "scenario       | key               | value",
-    "priority true  | priority.sampling | true ",
-    "priority false | priority.sampling | false"
-  })
-  void sharesTraceCountWithDDApiWithKeyValue(String key, String value) {
-    injectSysConfig(key, value);
-    CoreTracer tracer = tracerBuilder().build();
-    try {
-      assertInstanceOf(DDAgentWriter.class, tracer.writer);
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @Test
-  void rootTagsAppliedOnlyToRootSpans() {
-    Map<String, Object> localRootSpanTags = new LinkedHashMap<>();
-    localRootSpanTags.put("only_root", "value");
-    CoreTracer tracer = tracerBuilder().localRootSpanTags(localRootSpanTags).build();
-    AgentSpan root = tracer.buildSpan("datadog", "my_root").start();
-    AgentSpan child = tracer.buildSpan("datadog", "my_child").asChildOf(root.spanContext()).start();
-    try {
-      assertTrue(root.getTags().containsKey("only_root"));
-      assertFalse(child.getTags().containsKey("only_root"));
-    } finally {
-      child.finish();
-      root.finish();
-      tracer.close();
-    }
-  }
-
-  @Test
-  void profilingContextEngineTagStampedWhenTheIntegrationIsAlreadyAvailable() {
-    CoreTracer tracer =
-        tracerBuilder().profilingContextIntegration(new FakeContextIntegration()).build();
-    AgentSpan root = tracer.buildSpan("datadog", "my_root").start();
-    try {
-      assertEquals(FAKE_ENGINE, root.getTags().get(DDTags.PROFILING_CONTEXT_ENGINE));
-    } finally {
-      root.finish();
-      tracer.close();
-    }
-  }
-
-  @Test
-  void profilingContextEngineTagWithheldUntilTheIntegrationBecomesAvailable() {
-    FakeContextIntegration integration = new FakeContextIntegration();
-    integration.deferAvailability = true;
-    CoreTracer tracer = tracerBuilder().profilingContextIntegration(integration).build();
-    try {
-      AgentSpan beforeSwap = tracer.buildSpan("datadog", "before").start();
-      assertFalse(beforeSwap.getTags().containsKey(DDTags.PROFILING_CONTEXT_ENGINE));
-      beforeSwap.finish();
-
-      integration.becomeAvailable();
-
-      AgentSpan afterSwap = tracer.buildSpan("datadog", "after").start();
-      assertEquals(FAKE_ENGINE, afterSwap.getTags().get(DDTags.PROFILING_CONTEXT_ENGINE));
-      afterSwap.finish();
-    } finally {
-      tracer.close();
-    }
-  }
-
-  /**
-   * Pins the needsIntercept half of the {@code LocalRootSpanTags} swap: {@code
-   * stampProfilingContextEngine()} recomputes {@code tagInterceptor.needsIntercept()} on the frozen
-   * tag map, so a root span started after the swap must apply interception rules (here, {@code
-   * trace.split-by-tags}) to the newly-stamped {@code _dd.profiling.ctx} tag exactly like any other
-   * tag present at span-start time, while one started before the swap must not.
-   */
-  @Test
-  @WithConfig(key = TracerConfig.SPLIT_BY_TAGS, value = DDTags.PROFILING_CONTEXT_ENGINE)
-  void needsInterceptRecomputationAppliesSplitByTagsOnceProfilingContextEngineTagIsStamped() {
-    FakeContextIntegration integration = new FakeContextIntegration();
-    integration.deferAvailability = true;
-    CoreTracer tracer = tracerBuilder().profilingContextIntegration(integration).build();
-    try {
-      DDSpan beforeSwap = (DDSpan) tracer.buildSpan("datadog", "before").start();
-      assertNotEquals(FAKE_ENGINE, beforeSwap.getServiceName());
-      beforeSwap.finish();
-
-      integration.becomeAvailable();
-
-      DDSpan afterSwap = (DDSpan) tracer.buildSpan("datadog", "after").start();
-      assertEquals(FAKE_ENGINE, afterSwap.getServiceName());
-      afterSwap.finish();
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @Test
-  void prioritySamplingWhenSpanFinishes() throws Exception {
-    ListWriter writer = new ListWriter();
-    CoreTracer tracer = tracerBuilder().writer(writer).build();
-    try {
-      DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation").start();
-      span.finish();
-      writer.waitForTraces(1);
-      assertEquals(PrioritySampling.SAMPLER_KEEP, (int) span.getSamplingPriority());
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @Test
-  void prioritySamplingSetWhenChildSpanComplete() throws Exception {
-    ListWriter writer = new ListWriter();
-    CoreTracer tracer = tracerBuilder().writer(writer).build();
-    try {
-      DDSpan root = (DDSpan) tracer.buildSpan("datadog", "operation").start();
-      DDSpan child =
-          (DDSpan) tracer.buildSpan("datadog", "my_child").asChildOf(root.spanContext()).start();
-      root.finish();
-
-      assertNull(root.getSamplingPriority());
-
-      child.finish();
-      writer.waitForTraces(1);
-
-      assertEquals(PrioritySampling.SAMPLER_KEEP, (int) root.getSamplingPriority());
-      assertEquals(root.getSamplingPriority(), child.getSamplingPriority());
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @Test
-  void verifyConfigurationPolling() throws Exception {
-    ParsedConfigKey key = ParsedConfigKey.parse("datadog/2/APM_TRACING/config_overrides/config");
-    ConfigurationPoller poller = mock(ConfigurationPoller.class);
-    SharedCommunicationObjects sco = createScoWithPoller(poller);
-
-    ProductListener[] capturedUpdater = {null};
-    doAnswer(
-            inv -> {
-              capturedUpdater[0] = inv.getArgument(1, ProductListener.class);
-              return null;
-            })
-        .when(poller)
-        .addListener(eq(Product.APM_TRACING), any(ProductListener.class));
-
-    CoreTracer tracer =
-        CoreTracer.builder().sharedCommunicationObjects(sco).pollForTracingConfiguration().build();
-    unclosedTracers.add(tracer);
-
-    try {
-      verify(poller).addListener(eq(Product.APM_TRACING), any(ProductListener.class));
-      assertNotNull(capturedUpdater[0]);
-      assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getServiceMapping());
-      assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getRequestHeaderTags());
-      assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getResponseHeaderTags());
-      assertNull(tracer.captureTraceConfig().getTraceSampleRate());
-
-      String json =
-          "{\n"
-              + "  \"lib_config\":\n"
-              + "  {\n"
-              + "    \"tracing_service_mapping\":\n"
-              + "    [{\n"
-              + "       \"from_key\": \"foobar\",\n"
-              + "       \"to_name\": \"bar\"\n"
-              + "    }, {\n"
-              + "       \"from_key\": \"snafu\",\n"
-              + "       \"to_name\": \"foo\"\n"
-              + "    }]\n"
-              + "    ,\n"
-              + "    \"tracing_header_tags\":\n"
-              + "    [{\n"
-              + "       \"header\": \"Cookie\",\n"
-              + "       \"tag_name\": \"\"\n"
-              + "    }, {\n"
-              + "       \"header\": \"Referer\",\n"
-              + "       \"tag_name\": \"http.referer\"\n"
-              + "    }, {\n"
-              + "       \"header\": \"  Some.Header  \",\n"
-              + "       \"tag_name\": \"\"\n"
-              + "    }, {\n"
-              + "       \"header\": \"C!!!ont_____ent----tYp!/!e\",\n"
-              + "       \"tag_name\": \"\"\n"
-              + "    }, {\n"
-              + "       \"header\": \"this.header\",\n"
-              + "       \"tag_name\": \"whatever.the.user.wants.this.header\"\n"
-              + "    }]\n"
-              + "    ,\n"
-              + "    \"tracing_sampling_rate\": 0.5\n"
-              + "  }\n"
-              + "}";
-
-      capturedUpdater[0].accept(key, json.getBytes(StandardCharsets.UTF_8), null);
-      capturedUpdater[0].commit(null);
-
-      Map<String, String> expectedServiceMapping = buildStringMap("foobar", "bar", "snafu", "foo");
-      assertEquals(expectedServiceMapping, tracer.captureTraceConfig().getServiceMapping());
-
-      Map<String, String> expectedRequestHeaderTags =
-          buildStringMap(
-              "cookie", "http.request.headers.cookie",
-              "referer", "http.referer",
-              "some.header", "http.request.headers.some_header",
-              "c!!!ont_____ent----typ!/!e", "http.request.headers.c___ont_____ent----typ_/_e",
-              "this.header", "whatever.the.user.wants.this.header");
-      assertEquals(expectedRequestHeaderTags, tracer.captureTraceConfig().getRequestHeaderTags());
-
-      Map<String, String> expectedResponseHeaderTags =
-          buildStringMap(
-              "cookie", "http.response.headers.cookie",
-              "referer", "http.referer",
-              "some.header", "http.response.headers.some_header",
-              "c!!!ont_____ent----typ!/!e", "http.response.headers.c___ont_____ent----typ_/_e",
-              "this.header", "whatever.the.user.wants.this.header");
-      assertEquals(expectedResponseHeaderTags, tracer.captureTraceConfig().getResponseHeaderTags());
-
-      assertEquals(0.5, tracer.captureTraceConfig().getTraceSampleRate(), 0.0001);
-
-      capturedUpdater[0].remove(key, null);
-      capturedUpdater[0].commit(null);
-
-      assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getServiceMapping());
-      assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getRequestHeaderTags());
-      assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getResponseHeaderTags());
-      assertNull(tracer.captureTraceConfig().getTraceSampleRate());
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @TableTest({
-    "scenario      | json                                                               | expectedValue     ",
-    "a:b c:d e:f   | '{\"lib_config\":{\"tracing_tags\": [\"a:b\", \"c:d\", \"e:f\"]}}' | [a: b, c: d, e: f]",
-    "empty and c:d | '{\"lib_config\":{\"tracing_tags\": [\"\", \"c:d\", \"\"]}}'       | [c: d]            ",
-    ":b c: e:f     | '{\"lib_config\":{\"tracing_tags\": [\":b\", \"c:\", \"e:f\"]}}'   | [e: f]            ",
-    ": c: e:f      | '{\"lib_config\":{\"tracing_tags\": [\":\", \"c:\", \"e:f\"]}}'    | [e: f]            ",
-    ": c: empty    | '{\"lib_config\":{\"tracing_tags\": [\":\", \"c:\", \"\"]}}'       | [:]               ",
-    "empty array   | '{\"lib_config\":{\"tracing_tags\": []}}'                          | [:]               "
-  })
-  void verifyConfigurationPollingWithCustomTags(
-      String scenario, String json, Map<String, String> expectedValue) throws Exception {
-    ParsedConfigKey key = ParsedConfigKey.parse("datadog/2/APM_TRACING/config_overrides/config");
-    ConfigurationPoller poller = mock(ConfigurationPoller.class);
-    SharedCommunicationObjects sco = createScoWithPoller(poller);
-
-    ProductListener[] capturedUpdater = {null};
-    doAnswer(
-            inv -> {
-              capturedUpdater[0] = inv.getArgument(1, ProductListener.class);
-              return null;
-            })
-        .when(poller)
-        .addListener(eq(Product.APM_TRACING), any(ProductListener.class));
-
-    CoreTracer tracer =
-        CoreTracer.builder().sharedCommunicationObjects(sco).pollForTracingConfiguration().build();
-    unclosedTracers.add(tracer);
-
-    try {
-      verify(poller).addListener(eq(Product.APM_TRACING), any(ProductListener.class));
-      assertNotNull(capturedUpdater[0]);
-      assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getTracingTags());
-
-      capturedUpdater[0].accept(key, json.getBytes(StandardCharsets.UTF_8), null);
-      capturedUpdater[0].commit(null);
-
-      ConfigSnapshot config = tracer.captureTraceConfig();
-      assertEquals(expectedValue, config.getTracingTags());
-      assertEquals(expectedValue, config.mergedTracerTags);
-
-      capturedUpdater[0].remove(key, null);
-      capturedUpdater[0].commit(null);
-
-      assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getTracingTags());
-    } finally {
-      tracer.close();
-    }
-  }
-
-  static final String ACTION_JSON =
-      "'{\"action\": \"enable\", \"lib_config\":"
-          + "{\"tracing_sampling_rate\": null,"
-          + " \"log_injection_enabled\": null, "
-          + "\"tracing_header_tags\": null,"
-          + " \"runtime_metrics_enabled\": null,"
-          + "\"tracing_debug\": null,"
-          + " \"tracing_service_mapping\": null,"
-          + "\"tracing_sampling_rules\": null,"
-          + " \"span_sampling_rules\": null,"
-          + "\"data_streams_enabled\": null,"
-          + " \"tracing_enabled\": false}}'";
-
-  @TableTest({
-    "scenario         | json                                            | expectedValue",
-    "tracing disabled | '{\"lib_config\":{\"tracing_enabled\": false}}' | false        ",
-    "tracing enabled  | '{\"lib_config\":{\"tracing_enabled\": true}}'  | true         "
-  })
-  @ParameterizedTest
-  @CsvSource(delimiter = '|', value = "action with tracing disabled | " + ACTION_JSON + " | false")
-  void verifyConfigurationPollingWithTracingEnabled(
-      String scenario, String json, boolean expectedValue) throws Exception {
-    ParsedConfigKey key = ParsedConfigKey.parse("datadog/2/APM_TRACING/config_overrides/config");
-    ConfigurationPoller poller = mock(ConfigurationPoller.class);
-    SharedCommunicationObjects sco = createScoWithPoller(poller);
-
-    ProductListener[] capturedUpdater = {null};
-    doAnswer(
-            inv -> {
-              capturedUpdater[0] = inv.getArgument(1, ProductListener.class);
-              return null;
-            })
-        .when(poller)
-        .addListener(eq(Product.APM_TRACING), any(ProductListener.class));
-
-    CoreTracer tracer =
-        CoreTracer.builder().sharedCommunicationObjects(sco).pollForTracingConfiguration().build();
-    unclosedTracers.add(tracer);
-
-    try {
-      verify(poller).addListener(eq(Product.APM_TRACING), any(ProductListener.class));
-      assertNotNull(capturedUpdater[0]);
-      assertTrue(tracer.captureTraceConfig().isTraceEnabled());
-
-      capturedUpdater[0].accept(key, json.getBytes(StandardCharsets.UTF_8), null);
-      capturedUpdater[0].commit(null);
-
-      assertEquals(expectedValue, tracer.captureTraceConfig().isTraceEnabled());
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @TableTest({
-    "scenario  | preferred | expected",
-    "no pref   |           | test    ",
-    "with pref | some      | some    "
-  })
-  void testLocalRootServiceNameOverride(String preferred, String expected) {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).serviceName("test").build();
-    tracer.updatePreferredServiceName(preferred, preferred);
-    try {
-      DDSpan span = (DDSpan) tracer.startSpan("", "test");
-      span.finish();
-      assertEquals(expected, span.getServiceName());
-      if (preferred != null) {
-        assertTrue(ServiceNameCollector.get().getServices().contains(preferred));
-      }
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @Test
-  @WithConfig(key = GeneralConfig.SERVICE_NAME, value = "dd_service_name")
-  @WithConfig(key = GeneralConfig.VERSION, value = "1.0.0")
-  void testDdVersionExistsOnlyIfServiceEqDdService() {
-    TagsPostProcessorFactory.withAddInternalTags(true);
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      DDSpan span =
-          (DDSpan)
-              tracer.buildSpan("datadog", "def").withTag(GeneralConfig.SERVICE_NAME, "foo").start();
-      span.finish();
-      assertEquals("foo", span.getServiceName());
-      assertFalse(span.getTags().containsKey("version"));
-
-      DDSpan span2 = (DDSpan) tracer.buildSpan("datadog", "abc").start();
-      span2.finish();
-      assertEquals("dd_service_name", span2.getServiceName());
-      assertEquals("1.0.0", String.valueOf(span2.getTags().get("version")));
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @Test
-  void flushesOnTracerCloseIfConfiguredToDoSo() {
-    WriterWithExplicitFlush writer = new WriterWithExplicitFlush();
-    CoreTracer tracer = tracerBuilder().writer(writer).flushOnClose(true).build();
-    tracer.buildSpan("datadog", "my_span").start().finish();
-    tracer.close();
-    assertFalse(writer.flushedTraces.isEmpty());
-  }
-
-  @TableTest({
-    "scenario                    | service | env | targetService | targetEnv",
-    "diff target service         | service | env | service_1     | env      ",
-    "diff target env             | service | env | service       | env_1    ",
-    "diff target service and env | service | env | service_2     | env_2    "
-  })
-  void verifyNoFilteringOfServiceEnvWhenMismatchedWithDdServiceDdEnv(
-      String service, String env, String targetService, String targetEnv) throws Exception {
-    injectSysConfig(GeneralConfig.SERVICE_NAME, service);
-    injectSysConfig(GeneralConfig.ENV, env);
-
-    ParsedConfigKey key = ParsedConfigKey.parse("datadog/2/APM_TRACING/config_overrides/config");
-    ConfigurationPoller poller = mock(ConfigurationPoller.class);
-    SharedCommunicationObjects sco = createScoWithPoller(poller);
-
-    ProductListener[] capturedUpdater = {null};
-    doAnswer(
-            inv -> {
-              capturedUpdater[0] = inv.getArgument(1, ProductListener.class);
-              return null;
-            })
-        .when(poller)
-        .addListener(eq(Product.APM_TRACING), any(ProductListener.class));
-
-    CoreTracer tracer =
-        CoreTracer.builder().sharedCommunicationObjects(sco).pollForTracingConfiguration().build();
-    unclosedTracers.add(tracer);
-
-    try {
-      verify(poller).addListener(eq(Product.APM_TRACING), any(ProductListener.class));
-      assertNotNull(capturedUpdater[0]);
-      assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getServiceMapping());
-
-      String json =
-          String.format(
-              "{\"service_target\":{\"service\":\"%s\",\"env\":\"%s\"},"
-                  + "\"lib_config\":{\"tracing_service_mapping\":"
-                  + "[{\"from_key\":\"foobar\",\"to_name\":\"bar\"}]}}",
-              targetService, targetEnv);
-
-      capturedUpdater[0].accept(key, json.getBytes(StandardCharsets.UTF_8), null);
-      capturedUpdater[0].commit(null);
-
-      assertEquals(
-          buildStringMap("foobar", "bar"), tracer.captureTraceConfig().getServiceMapping());
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @Test
-  void serviceNameSourceIsRecordedWhenUsingTwoParameterSetServiceName() {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation").start();
-      span.setServiceName("custom-service", "my-integration");
-      DDSpan child = (DDSpan) tracer.buildSpan("datadog", "child").start();
-      child.finish();
-      span.finish();
-
-      assertEquals("custom-service", span.getServiceName());
-      assertEquals("my-integration", span.getTag(DDTags.DD_SVC_SRC));
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @Test
-  void serviceNameSourceIsMarkedAsManualWhenUsingOneParameterSetServiceName() {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation").start();
-      span.setServiceName("custom-service", "my-integration");
-      span.setServiceName("another");
-      span.finish();
-
-      assertEquals("another", span.getServiceName());
-      assertEquals(ServiceNameSources.MANUAL, span.getTag(DDTags.DD_SVC_SRC));
-    } finally {
-      tracer.close();
-    }
-  }
-
-  @Test
-  void serviceNameSourceIsMissingWhenNotExplicitlySettingServiceName() {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation").start();
-      span.finish();
-
-      assertEquals(tracer.serviceName, span.getServiceName());
-      assertNull(span.getTag(DDTags.DD_SVC_SRC));
-    } finally {
-      tracer.close();
-    }
-  }
-
-  // --- helpers ---
-
-  private SharedCommunicationObjects createScoWithPoller(ConfigurationPoller poller)
-      throws Exception {
-    SharedCommunicationObjects sco = new SharedCommunicationObjects();
-    sco.agentHttpClient = mock(OkHttpClient.class);
-    sco.monitoring = mock(Monitoring.class);
-    sco.agentUrl = HttpUrl.get("https://example.com");
-    sco.setFeaturesDiscovery(mock(DDAgentFeaturesDiscovery.class));
-    Field pollerField = SharedCommunicationObjects.class.getDeclaredField("configurationPoller");
-    pollerField.setAccessible(true);
-    pollerField.set(sco, poller);
-    return sco;
-  }
-
-  private static Map<String, String> buildStringMap(String... keyValues) {
-    Map<String, String> map = new LinkedHashMap<>();
-    for (int i = 0; i < keyValues.length; i += 2) {
-      map.put(keyValues[i], keyValues[i + 1]);
-    }
-    return map;
-  }
-
-  // --- inner classes ---
-
-  /**
-   * A profiling context integration whose availability can be released after the tracer has been
-   * built, the way an integration whose construction is deferred off the premain thread does.
-   */
-  static class FakeContextIntegration implements ProfilingContextIntegration {
-    boolean deferAvailability;
-    private Runnable availabilityCallback;
-
-    @Override
-    public String name() {
-      return FAKE_ENGINE;
-    }
-
-    @Override
-    public void onRootSpanFinished(AgentSpan rootSpan, EndpointTracker tracker) {}
-
-    @Override
-    public EndpointTracker onRootSpanStarted(AgentSpan rootSpan) {
-      return EndpointTracker.NO_OP;
-    }
-
-    @Override
-    public Timing start(TimerType type) {
-      return Timing.NoOp.INSTANCE;
-    }
-
-    @Override
-    public void whenAvailable(Runnable callback) {
-      if (deferAvailability) {
-        this.availabilityCallback = callback;
-      } else {
-        callback.run();
-      }
-    }
-
-    void becomeAvailable() {
-      Runnable callback = this.availabilityCallback;
-      this.availabilityCallback = null;
-      if (callback != null) {
-        callback.run();
-      }
+    private static final String FAKE_ENGINE = "fake-engine";
+
+    @BeforeAll
+    static void checkJvm() {
+        assumeFalse(
+                JavaVirtualMachine.isOracleJDK8(),
+                "Oracle JDK 1.8 did not merge the fix in JDK-8058322, leading to the JVM failing to"
+                        + " correctly extract method parameters without args, when the code is compiled on a"
+                        + " later JDK (targeting 8). This can manifest when creating mocks.");
+    }
+
+    @Test
+    void verifyDefaultsOnTracer() {
+        CoreTracer tracer = CoreTracer.builder().build();
+        try {
+            assertFalse(tracer.serviceName.isEmpty());
+            assertInstanceOf(RateByServiceTraceSampler.class, tracer.initialSampler);
+            assertInstanceOf(DDAgentWriter.class, tracer.writer);
+        } finally {
+            tracer.close();
+        }
+    }
+
+    private static final long SNAPSTART_CONSTRUCTION_TIME_NANOS = TimeUnit.SECONDS.toNanos(1000);
+
+    @Test
+    void getTimeWithNanoTicks_whenNanoTicksStaleAfterSimulatedRestore_thenTimestampStaysAnchoredToConstructionTime() {
+        // Characterizes the AWS Lambda SnapStart bug this fix addresses: System.nanoTime() does not
+        // accumulate the frozen checkpoint/restore duration, so the nanoTicks a span is timestamped
+        // with right after restore is (almost) unchanged from construction (snapshot creation) time,
+        // even though wall-clock time has moved on by hours. Without a resync, span timestamps
+        // computed from that near-frozen nanoTicks stay anchored to construction time.
+        SnapStartTimeSource timeSource = new SnapStartTimeSource(SNAPSTART_CONSTRUCTION_TIME_NANOS);
+        CoreTracer tracer =
+                tracerBuilder().writer(new ListWriter()).timeSource(timeSource).build();
+        try {
+            long constructionTimeNanoTicks = timeSource.getNanoTicks();
+
+            // The restore happens much later: wall-clock jumps forward by 2 hours, but nanoTicks - tied
+            // to monotonic JVM uptime, which does not advance while the snapshot is frozen - does not.
+            timeSource.simulateSnapStartRestore(TimeUnit.HOURS.toNanos(2));
+
+            assertEquals(SNAPSTART_CONSTRUCTION_TIME_NANOS, tracer.getTimeWithNanoTicks(constructionTimeNanoTicks));
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    @WithConfig(key = TracerConfig.TRACE_LAMBDA_SNAPSTART_CLOCK_RESYNC_ENABLED, value = "true")
+    void
+            maybeResyncClockForLambdaInvocation_whenEnabledAndCalledAfterSimulatedRestore_thenTimestampReflectsPostRestoreTime() {
+        SnapStartTimeSource timeSource = new SnapStartTimeSource(SNAPSTART_CONSTRUCTION_TIME_NANOS);
+        CoreTracer tracer =
+                tracerBuilder().writer(new ListWriter()).timeSource(timeSource).build();
+        try {
+            // The restore happens: wall-clock jumps forward by 2 hours, nanoTicks barely moves.
+            timeSource.simulateSnapStartRestore(TimeUnit.HOURS.toNanos(2));
+            long postRestoreNanos = timeSource.getCurrentTimeNanos();
+
+            tracer.maybeResyncClockForLambdaInvocation();
+
+            // A span timestamped with the near-frozen, post-restore nanoTicks reading now reflects the
+            // real post-restore time, not the stale construction-time anchor - proving the resync
+            // actually corrected counterDrift rather than the assertion just re-deriving the same
+            // reading.
+            assertEquals(postRestoreNanos, tracer.getTimeWithNanoTicks(timeSource.getNanoTicks()));
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    @WithConfig(key = TracerConfig.TRACE_LAMBDA_SNAPSTART_CLOCK_RESYNC_ENABLED, value = "true")
+    void notifyLambdaStart_whenExplicitlyEnabled_thenResyncsClockToCurrentTime() {
+        // notifyLambdaStart runs once per Lambda invocation, before any span for that invocation is
+        // created - the actual trigger point for the resync in production, not just the extracted
+        // maybeResyncClockForLambdaInvocation() logic exercised directly above.
+        SnapStartTimeSource timeSource = new SnapStartTimeSource(SNAPSTART_CONSTRUCTION_TIME_NANOS);
+        CoreTracer tracer =
+                tracerBuilder().writer(new ListWriter()).timeSource(timeSource).build();
+        try {
+            timeSource.simulateSnapStartRestore(TimeUnit.HOURS.toNanos(2));
+            long postRestoreNanos = timeSource.getCurrentTimeNanos();
+
+            tracer.notifyLambdaStart(new Object(), "lambda-request-123");
+
+            // Same near-frozen-nanoTicks check as above: proves notifyLambdaStart's resync corrected
+            // the drift, rather than the assertion re-deriving the answer independently.
+            assertEquals(postRestoreNanos, tracer.getTimeWithNanoTicks(timeSource.getNanoTicks()));
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    void notifyLambdaStart_whenResyncDefaultsToDisabled_thenTimestampStaysAnchoredToConstructionTime() {
+        SnapStartTimeSource timeSource = new SnapStartTimeSource(SNAPSTART_CONSTRUCTION_TIME_NANOS);
+        CoreTracer tracer =
+                tracerBuilder().writer(new ListWriter()).timeSource(timeSource).build();
+        try {
+            long constructionTimeNanoTicks = timeSource.getNanoTicks();
+            timeSource.simulateSnapStartRestore(TimeUnit.HOURS.toNanos(2));
+
+            // No @WithConfig override here - this is an opt-in feature, off by default.
+            tracer.notifyLambdaStart(new Object(), "lambda-request-123");
+
+            assertEquals(SNAPSTART_CONSTRUCTION_TIME_NANOS, tracer.getTimeWithNanoTicks(constructionTimeNanoTicks));
+        } finally {
+            tracer.close();
+        }
+    }
+
+    /**
+     * A {@link datadog.trace.api.time.TimeSource} that decouples wall-clock time from nanoTicks, to
+     * simulate an AWS Lambda SnapStart checkpoint/restore: while frozen, monotonic nanoTicks do not
+     * advance but wall-clock time does. {@link ControllableTimeSource} can't simulate this because it
+     * derives both from the same underlying counter.
+     */
+    private static final class SnapStartTimeSource implements datadog.trace.api.time.TimeSource {
+        private final long nanoTicks;
+        private long currentTimeNanos;
+
+        SnapStartTimeSource(long initialNanos) {
+            this.nanoTicks = initialNanos;
+            this.currentTimeNanos = initialNanos;
+        }
+
+        void simulateSnapStartRestore(long wallClockJumpNanos) {
+            currentTimeNanos += wallClockJumpNanos;
+        }
+
+        @Override
+        public long getNanoTicks() {
+            return nanoTicks;
+        }
+
+        @Override
+        public long getCurrentTimeMillis() {
+            return TimeUnit.NANOSECONDS.toMillis(currentTimeNanos);
+        }
+
+        @Override
+        public long getCurrentTimeMicros() {
+            return TimeUnit.NANOSECONDS.toMicros(currentTimeNanos);
+        }
+
+        @Override
+        public long getCurrentTimeNanos() {
+            return currentTimeNanos;
+        }
+    }
+
+    @Test
+    @WithConfig(key = TracerConfig.PRIORITY_SAMPLING, value = "false")
+    void verifyOverridingSampler() {
+        CoreTracer tracer = tracerBuilder().build();
+        try {
+            assertInstanceOf(AllSampler.class, tracer.initialSampler);
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    @WithConfig(key = TracerConfig.WRITER_TYPE, value = "LoggingWriter")
+    void verifyOverridingWriter() {
+        CoreTracer tracer = tracerBuilder().build();
+        try {
+            assertInstanceOf(LoggingWriter.class, tracer.writer);
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    @WithConfig(key = TracerConfig.AGENT_UNIX_DOMAIN_SOCKET, value = "asdf")
+    void verifyUdsWindows() {
+        String originalOsName = System.getProperty("os.name");
+        try {
+            System.setProperty("os.name", "Windows ME");
+            assertEquals("asdf", Config.get().getAgentUnixDomainSocket());
+        } finally {
+            if (originalOsName != null) {
+                System.setProperty("os.name", originalOsName);
+            } else {
+                System.clearProperty("os.name");
+            }
+        }
+    }
+
+    @TableTest({
+      "scenario       | mapString             | map         ",
+      "duplicate keys | a:one, a:two, a:three | [a: three]  ",
+      "empty value    | a:b,c:d,e:            | [a: b, c: d]"
+    })
+    void verifyMappingConfigsOnTracer(String scenario, String mapString, Map<String, String> map) {
+        injectSysConfig(TracerConfig.SERVICE_MAPPING, mapString);
+        injectSysConfig(TracerConfig.SPAN_TAGS, mapString);
+        injectSysConfig(TracerConfig.HEADER_TAGS, mapString);
+        CoreTracer tracer = tracerBuilder().build();
+        try {
+            ConfigSnapshot config = tracer.captureTraceConfig();
+            assertEquals(map, config.mergedTracerTags);
+            assertEquals(map, config.getServiceMapping());
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @TableTest({
+      "scenario       | mapString             | map         ",
+      "duplicate keys | a:one, a:two, a:three | [a: three]  ",
+      "empty value    | a:b,c:d,e:            | [a: b, c: d]"
+    })
+    void verifyBaggageMappingConfigsOnTracer(String scenario, String mapString, Map<String, String> map) {
+        injectSysConfig(TracerConfig.BAGGAGE_MAPPING, mapString);
+        CoreTracer tracer = tracerBuilder().build();
+        try {
+            assertEquals(map, tracer.captureTraceConfig().getBaggageMapping());
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    @WithConfig(key = "agent.host", value = "somethingelse")
+    void verifyOverridingHost() {
+        assertEquals("somethingelse", Config.get().getAgentHost());
+    }
+
+    @TableTest({
+      "scenario   | key              | value",
+      "agent port | agent.port       | 777  ",
+      "trace port | trace.agent.port | 9999 "
+    })
+    void verifyOverridingPort(String key, String value) {
+        injectSysConfig(key, value);
+        assertEquals(Integer.valueOf(value), Config.get().getAgentPort());
+    }
+
+    @Test
+    @WithConfig(key = "writer.type", value = "LoggingWriter")
+    void writerIsLoggingWriterWhenPropertySet() {
+        CoreTracer tracer = tracerBuilder().build();
+        try {
+            assertInstanceOf(LoggingWriter.class, tracer.writer);
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @TableTest({
+      "scenario       | key               | value",
+      "priority true  | priority.sampling | true ",
+      "priority false | priority.sampling | false"
+    })
+    void sharesTraceCountWithDDApiWithKeyValue(String key, String value) {
+        injectSysConfig(key, value);
+        CoreTracer tracer = tracerBuilder().build();
+        try {
+            assertInstanceOf(DDAgentWriter.class, tracer.writer);
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    void rootTagsAppliedOnlyToRootSpans() {
+        Map<String, Object> localRootSpanTags = new LinkedHashMap<>();
+        localRootSpanTags.put("only_root", "value");
+        CoreTracer tracer = tracerBuilder().localRootSpanTags(localRootSpanTags).build();
+        AgentSpan root = tracer.buildSpan("datadog", "my_root").start();
+        AgentSpan child = tracer.buildSpan("datadog", "my_child")
+                .asChildOf(root.spanContext())
+                .start();
+        try {
+            assertTrue(root.getTags().containsKey("only_root"));
+            assertFalse(child.getTags().containsKey("only_root"));
+        } finally {
+            child.finish();
+            root.finish();
+            tracer.close();
+        }
+    }
+
+    @Test
+    void profilingContextEngineTagStampedWhenTheIntegrationIsAlreadyAvailable() {
+        CoreTracer tracer = tracerBuilder()
+                .profilingContextIntegration(new FakeContextIntegration())
+                .build();
+        AgentSpan root = tracer.buildSpan("datadog", "my_root").start();
+        try {
+            assertEquals(FAKE_ENGINE, root.getTags().get(DDTags.PROFILING_CONTEXT_ENGINE));
+        } finally {
+            root.finish();
+            tracer.close();
+        }
+    }
+
+    @Test
+    void profilingContextEngineTagWithheldUntilTheIntegrationBecomesAvailable() {
+        FakeContextIntegration integration = new FakeContextIntegration();
+        integration.deferAvailability = true;
+        CoreTracer tracer =
+                tracerBuilder().profilingContextIntegration(integration).build();
+        try {
+            AgentSpan beforeSwap = tracer.buildSpan("datadog", "before").start();
+            assertFalse(beforeSwap.getTags().containsKey(DDTags.PROFILING_CONTEXT_ENGINE));
+            beforeSwap.finish();
+
+            integration.becomeAvailable();
+
+            AgentSpan afterSwap = tracer.buildSpan("datadog", "after").start();
+            assertEquals(FAKE_ENGINE, afterSwap.getTags().get(DDTags.PROFILING_CONTEXT_ENGINE));
+            afterSwap.finish();
+        } finally {
+            tracer.close();
+        }
+    }
+
+    /**
+     * Pins the needsIntercept half of the {@code LocalRootSpanTags} swap: {@code
+     * stampProfilingContextEngine()} recomputes {@code tagInterceptor.needsIntercept()} on the frozen
+     * tag map, so a root span started after the swap must apply interception rules (here, {@code
+     * trace.split-by-tags}) to the newly-stamped {@code _dd.profiling.ctx} tag exactly like any other
+     * tag present at span-start time, while one started before the swap must not.
+     */
+    @Test
+    @WithConfig(key = TracerConfig.SPLIT_BY_TAGS, value = DDTags.PROFILING_CONTEXT_ENGINE)
+    void needsInterceptRecomputationAppliesSplitByTagsOnceProfilingContextEngineTagIsStamped() {
+        FakeContextIntegration integration = new FakeContextIntegration();
+        integration.deferAvailability = true;
+        CoreTracer tracer =
+                tracerBuilder().profilingContextIntegration(integration).build();
+        try {
+            DDSpan beforeSwap = (DDSpan) tracer.buildSpan("datadog", "before").start();
+            assertNotEquals(FAKE_ENGINE, beforeSwap.getServiceName());
+            beforeSwap.finish();
+
+            integration.becomeAvailable();
+
+            DDSpan afterSwap = (DDSpan) tracer.buildSpan("datadog", "after").start();
+            assertEquals(FAKE_ENGINE, afterSwap.getServiceName());
+            afterSwap.finish();
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    void prioritySamplingWhenSpanFinishes() throws Exception {
+        ListWriter writer = new ListWriter();
+        CoreTracer tracer = tracerBuilder().writer(writer).build();
+        try {
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation").start();
+            span.finish();
+            writer.waitForTraces(1);
+            assertEquals(PrioritySampling.SAMPLER_KEEP, (int) span.getSamplingPriority());
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    void prioritySamplingSetWhenChildSpanComplete() throws Exception {
+        ListWriter writer = new ListWriter();
+        CoreTracer tracer = tracerBuilder().writer(writer).build();
+        try {
+            DDSpan root = (DDSpan) tracer.buildSpan("datadog", "operation").start();
+            DDSpan child = (DDSpan) tracer.buildSpan("datadog", "my_child")
+                    .asChildOf(root.spanContext())
+                    .start();
+            root.finish();
+
+            assertNull(root.getSamplingPriority());
+
+            child.finish();
+            writer.waitForTraces(1);
+
+            assertEquals(PrioritySampling.SAMPLER_KEEP, (int) root.getSamplingPriority());
+            assertEquals(root.getSamplingPriority(), child.getSamplingPriority());
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    void verifyConfigurationPolling() throws Exception {
+        ParsedConfigKey key = ParsedConfigKey.parse("datadog/2/APM_TRACING/config_overrides/config");
+        ConfigurationPoller poller = mock(ConfigurationPoller.class);
+        SharedCommunicationObjects sco = createScoWithPoller(poller);
+
+        ProductListener[] capturedUpdater = {null};
+        doAnswer(inv -> {
+                    capturedUpdater[0] = inv.getArgument(1, ProductListener.class);
+                    return null;
+                })
+                .when(poller)
+                .addListener(eq(Product.APM_TRACING), any(ProductListener.class));
+
+        CoreTracer tracer = CoreTracer.builder()
+                .sharedCommunicationObjects(sco)
+                .pollForTracingConfiguration()
+                .build();
+        unclosedTracers.add(tracer);
+
+        try {
+            verify(poller).addListener(eq(Product.APM_TRACING), any(ProductListener.class));
+            assertNotNull(capturedUpdater[0]);
+            assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getServiceMapping());
+            assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getRequestHeaderTags());
+            assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getResponseHeaderTags());
+            assertNull(tracer.captureTraceConfig().getTraceSampleRate());
+
+            String json = "{\n"
+                    + "  \"lib_config\":\n"
+                    + "  {\n"
+                    + "    \"tracing_service_mapping\":\n"
+                    + "    [{\n"
+                    + "       \"from_key\": \"foobar\",\n"
+                    + "       \"to_name\": \"bar\"\n"
+                    + "    }, {\n"
+                    + "       \"from_key\": \"snafu\",\n"
+                    + "       \"to_name\": \"foo\"\n"
+                    + "    }]\n"
+                    + "    ,\n"
+                    + "    \"tracing_header_tags\":\n"
+                    + "    [{\n"
+                    + "       \"header\": \"Cookie\",\n"
+                    + "       \"tag_name\": \"\"\n"
+                    + "    }, {\n"
+                    + "       \"header\": \"Referer\",\n"
+                    + "       \"tag_name\": \"http.referer\"\n"
+                    + "    }, {\n"
+                    + "       \"header\": \"  Some.Header  \",\n"
+                    + "       \"tag_name\": \"\"\n"
+                    + "    }, {\n"
+                    + "       \"header\": \"C!!!ont_____ent----tYp!/!e\",\n"
+                    + "       \"tag_name\": \"\"\n"
+                    + "    }, {\n"
+                    + "       \"header\": \"this.header\",\n"
+                    + "       \"tag_name\": \"whatever.the.user.wants.this.header\"\n"
+                    + "    }]\n"
+                    + "    ,\n"
+                    + "    \"tracing_sampling_rate\": 0.5\n"
+                    + "  }\n"
+                    + "}";
+
+            capturedUpdater[0].accept(key, json.getBytes(StandardCharsets.UTF_8), null);
+            capturedUpdater[0].commit(null);
+
+            Map<String, String> expectedServiceMapping = buildStringMap("foobar", "bar", "snafu", "foo");
+            assertEquals(expectedServiceMapping, tracer.captureTraceConfig().getServiceMapping());
+
+            Map<String, String> expectedRequestHeaderTags = buildStringMap(
+                    "cookie", "http.request.headers.cookie",
+                    "referer", "http.referer",
+                    "some.header", "http.request.headers.some_header",
+                    "c!!!ont_____ent----typ!/!e", "http.request.headers.c___ont_____ent----typ_/_e",
+                    "this.header", "whatever.the.user.wants.this.header");
+            assertEquals(expectedRequestHeaderTags, tracer.captureTraceConfig().getRequestHeaderTags());
+
+            Map<String, String> expectedResponseHeaderTags = buildStringMap(
+                    "cookie", "http.response.headers.cookie",
+                    "referer", "http.referer",
+                    "some.header", "http.response.headers.some_header",
+                    "c!!!ont_____ent----typ!/!e", "http.response.headers.c___ont_____ent----typ_/_e",
+                    "this.header", "whatever.the.user.wants.this.header");
+            assertEquals(expectedResponseHeaderTags, tracer.captureTraceConfig().getResponseHeaderTags());
+
+            assertEquals(0.5, tracer.captureTraceConfig().getTraceSampleRate(), 0.0001);
+
+            capturedUpdater[0].remove(key, null);
+            capturedUpdater[0].commit(null);
+
+            assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getServiceMapping());
+            assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getRequestHeaderTags());
+            assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getResponseHeaderTags());
+            assertNull(tracer.captureTraceConfig().getTraceSampleRate());
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @TableTest({
+      "scenario      | json                                                               | expectedValue     ",
+      "a:b c:d e:f   | '{\"lib_config\":{\"tracing_tags\": [\"a:b\", \"c:d\", \"e:f\"]}}' | [a: b, c: d, e: f]",
+      "empty and c:d | '{\"lib_config\":{\"tracing_tags\": [\"\", \"c:d\", \"\"]}}'       | [c: d]            ",
+      ":b c: e:f     | '{\"lib_config\":{\"tracing_tags\": [\":b\", \"c:\", \"e:f\"]}}'   | [e: f]            ",
+      ": c: e:f      | '{\"lib_config\":{\"tracing_tags\": [\":\", \"c:\", \"e:f\"]}}'    | [e: f]            ",
+      ": c: empty    | '{\"lib_config\":{\"tracing_tags\": [\":\", \"c:\", \"\"]}}'       | [:]               ",
+      "empty array   | '{\"lib_config\":{\"tracing_tags\": []}}'                          | [:]               "
+    })
+    void verifyConfigurationPollingWithCustomTags(String scenario, String json, Map<String, String> expectedValue)
+            throws Exception {
+        ParsedConfigKey key = ParsedConfigKey.parse("datadog/2/APM_TRACING/config_overrides/config");
+        ConfigurationPoller poller = mock(ConfigurationPoller.class);
+        SharedCommunicationObjects sco = createScoWithPoller(poller);
+
+        ProductListener[] capturedUpdater = {null};
+        doAnswer(inv -> {
+                    capturedUpdater[0] = inv.getArgument(1, ProductListener.class);
+                    return null;
+                })
+                .when(poller)
+                .addListener(eq(Product.APM_TRACING), any(ProductListener.class));
+
+        CoreTracer tracer = CoreTracer.builder()
+                .sharedCommunicationObjects(sco)
+                .pollForTracingConfiguration()
+                .build();
+        unclosedTracers.add(tracer);
+
+        try {
+            verify(poller).addListener(eq(Product.APM_TRACING), any(ProductListener.class));
+            assertNotNull(capturedUpdater[0]);
+            assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getTracingTags());
+
+            capturedUpdater[0].accept(key, json.getBytes(StandardCharsets.UTF_8), null);
+            capturedUpdater[0].commit(null);
+
+            ConfigSnapshot config = tracer.captureTraceConfig();
+            assertEquals(expectedValue, config.getTracingTags());
+            assertEquals(expectedValue, config.mergedTracerTags);
+
+            capturedUpdater[0].remove(key, null);
+            capturedUpdater[0].commit(null);
+
+            assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getTracingTags());
+        } finally {
+            tracer.close();
+        }
+    }
+
+    static final String ACTION_JSON = "'{\"action\": \"enable\", \"lib_config\":"
+            + "{\"tracing_sampling_rate\": null,"
+            + " \"log_injection_enabled\": null, "
+            + "\"tracing_header_tags\": null,"
+            + " \"runtime_metrics_enabled\": null,"
+            + "\"tracing_debug\": null,"
+            + " \"tracing_service_mapping\": null,"
+            + "\"tracing_sampling_rules\": null,"
+            + " \"span_sampling_rules\": null,"
+            + "\"data_streams_enabled\": null,"
+            + " \"tracing_enabled\": false}}'";
+
+    @TableTest({
+      "scenario         | json                                            | expectedValue",
+      "tracing disabled | '{\"lib_config\":{\"tracing_enabled\": false}}' | false        ",
+      "tracing enabled  | '{\"lib_config\":{\"tracing_enabled\": true}}'  | true         "
+    })
+    @ParameterizedTest
+    @CsvSource(delimiter = '|', value = "action with tracing disabled | " + ACTION_JSON + " | false")
+    void verifyConfigurationPollingWithTracingEnabled(String scenario, String json, boolean expectedValue)
+            throws Exception {
+        ParsedConfigKey key = ParsedConfigKey.parse("datadog/2/APM_TRACING/config_overrides/config");
+        ConfigurationPoller poller = mock(ConfigurationPoller.class);
+        SharedCommunicationObjects sco = createScoWithPoller(poller);
+
+        ProductListener[] capturedUpdater = {null};
+        doAnswer(inv -> {
+                    capturedUpdater[0] = inv.getArgument(1, ProductListener.class);
+                    return null;
+                })
+                .when(poller)
+                .addListener(eq(Product.APM_TRACING), any(ProductListener.class));
+
+        CoreTracer tracer = CoreTracer.builder()
+                .sharedCommunicationObjects(sco)
+                .pollForTracingConfiguration()
+                .build();
+        unclosedTracers.add(tracer);
+
+        try {
+            verify(poller).addListener(eq(Product.APM_TRACING), any(ProductListener.class));
+            assertNotNull(capturedUpdater[0]);
+            assertTrue(tracer.captureTraceConfig().isTraceEnabled());
+
+            capturedUpdater[0].accept(key, json.getBytes(StandardCharsets.UTF_8), null);
+            capturedUpdater[0].commit(null);
+
+            assertEquals(expectedValue, tracer.captureTraceConfig().isTraceEnabled());
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @TableTest({
+      "scenario  | preferred | expected",
+      "no pref   |           | test    ",
+      "with pref | some      | some    "
+    })
+    void testLocalRootServiceNameOverride(String preferred, String expected) {
+        CoreTracer tracer =
+                tracerBuilder().writer(new ListWriter()).serviceName("test").build();
+        tracer.updatePreferredServiceName(preferred, preferred);
+        try {
+            DDSpan span = (DDSpan) tracer.startSpan("", "test");
+            span.finish();
+            assertEquals(expected, span.getServiceName());
+            if (preferred != null) {
+                assertTrue(ServiceNameCollector.get().getServices().contains(preferred));
+            }
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    @WithConfig(key = GeneralConfig.SERVICE_NAME, value = "dd_service_name")
+    @WithConfig(key = GeneralConfig.VERSION, value = "1.0.0")
+    void testDdVersionExistsOnlyIfServiceEqDdService() {
+        TagsPostProcessorFactory.withAddInternalTags(true);
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "def")
+                    .withTag(GeneralConfig.SERVICE_NAME, "foo")
+                    .start();
+            span.finish();
+            assertEquals("foo", span.getServiceName());
+            assertFalse(span.getTags().containsKey("version"));
+
+            DDSpan span2 = (DDSpan) tracer.buildSpan("datadog", "abc").start();
+            span2.finish();
+            assertEquals("dd_service_name", span2.getServiceName());
+            assertEquals("1.0.0", String.valueOf(span2.getTags().get("version")));
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    void flushesOnTracerCloseIfConfiguredToDoSo() {
+        WriterWithExplicitFlush writer = new WriterWithExplicitFlush();
+        CoreTracer tracer = tracerBuilder().writer(writer).flushOnClose(true).build();
+        tracer.buildSpan("datadog", "my_span").start().finish();
+        tracer.close();
+        assertFalse(writer.flushedTraces.isEmpty());
+    }
+
+    @TableTest({
+      "scenario                    | service | env | targetService | targetEnv",
+      "diff target service         | service | env | service_1     | env      ",
+      "diff target env             | service | env | service       | env_1    ",
+      "diff target service and env | service | env | service_2     | env_2    "
+    })
+    void verifyNoFilteringOfServiceEnvWhenMismatchedWithDdServiceDdEnv(
+            String service, String env, String targetService, String targetEnv) throws Exception {
+        injectSysConfig(GeneralConfig.SERVICE_NAME, service);
+        injectSysConfig(GeneralConfig.ENV, env);
+
+        ParsedConfigKey key = ParsedConfigKey.parse("datadog/2/APM_TRACING/config_overrides/config");
+        ConfigurationPoller poller = mock(ConfigurationPoller.class);
+        SharedCommunicationObjects sco = createScoWithPoller(poller);
+
+        ProductListener[] capturedUpdater = {null};
+        doAnswer(inv -> {
+                    capturedUpdater[0] = inv.getArgument(1, ProductListener.class);
+                    return null;
+                })
+                .when(poller)
+                .addListener(eq(Product.APM_TRACING), any(ProductListener.class));
+
+        CoreTracer tracer = CoreTracer.builder()
+                .sharedCommunicationObjects(sco)
+                .pollForTracingConfiguration()
+                .build();
+        unclosedTracers.add(tracer);
+
+        try {
+            verify(poller).addListener(eq(Product.APM_TRACING), any(ProductListener.class));
+            assertNotNull(capturedUpdater[0]);
+            assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getServiceMapping());
+
+            String json = String.format(
+                    "{\"service_target\":{\"service\":\"%s\",\"env\":\"%s\"},"
+                            + "\"lib_config\":{\"tracing_service_mapping\":"
+                            + "[{\"from_key\":\"foobar\",\"to_name\":\"bar\"}]}}",
+                    targetService, targetEnv);
+
+            capturedUpdater[0].accept(key, json.getBytes(StandardCharsets.UTF_8), null);
+            capturedUpdater[0].commit(null);
+
+            assertEquals(
+                    buildStringMap("foobar", "bar"), tracer.captureTraceConfig().getServiceMapping());
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    void serviceNameSourceIsRecordedWhenUsingTwoParameterSetServiceName() {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation").start();
+            span.setServiceName("custom-service", "my-integration");
+            DDSpan child = (DDSpan) tracer.buildSpan("datadog", "child").start();
+            child.finish();
+            span.finish();
+
+            assertEquals("custom-service", span.getServiceName());
+            assertEquals("my-integration", span.getTag(DDTags.DD_SVC_SRC));
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    void serviceNameSourceIsMarkedAsManualWhenUsingOneParameterSetServiceName() {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation").start();
+            span.setServiceName("custom-service", "my-integration");
+            span.setServiceName("another");
+            span.finish();
+
+            assertEquals("another", span.getServiceName());
+            assertEquals(ServiceNameSources.MANUAL, span.getTag(DDTags.DD_SVC_SRC));
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    void serviceNameSourceIsMissingWhenNotExplicitlySettingServiceName() {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation").start();
+            span.finish();
+
+            assertEquals(tracer.serviceName, span.getServiceName());
+            assertNull(span.getTag(DDTags.DD_SVC_SRC));
+        } finally {
+            tracer.close();
+        }
+    }
+
+    // --- helpers ---
+
+    private SharedCommunicationObjects createScoWithPoller(ConfigurationPoller poller) throws Exception {
+        SharedCommunicationObjects sco = new SharedCommunicationObjects();
+        sco.agentHttpClient = mock(OkHttpClient.class);
+        sco.monitoring = mock(Monitoring.class);
+        sco.agentUrl = HttpUrl.get("https://example.com");
+        sco.setFeaturesDiscovery(mock(DDAgentFeaturesDiscovery.class));
+        Field pollerField = SharedCommunicationObjects.class.getDeclaredField("configurationPoller");
+        pollerField.setAccessible(true);
+        pollerField.set(sco, poller);
+        return sco;
+    }
+
+    private static Map<String, String> buildStringMap(String... keyValues) {
+        Map<String, String> map = new LinkedHashMap<>();
+        for (int i = 0; i < keyValues.length; i += 2) {
+            map.put(keyValues[i], keyValues[i + 1]);
+        }
+        return map;
+    }
+
+    // --- inner classes ---
+
+    /**
+     * A profiling context integration whose availability can be released after the tracer has been
+     * built, the way an integration whose construction is deferred off the premain thread does.
+     */
+    static class FakeContextIntegration implements ProfilingContextIntegration {
+        boolean deferAvailability;
+        private Runnable availabilityCallback;
+
+        @Override
+        public String name() {
+            return FAKE_ENGINE;
+        }
+
+        @Override
+        public void onRootSpanFinished(AgentSpan rootSpan, EndpointTracker tracker) {}
+
+        @Override
+        public EndpointTracker onRootSpanStarted(AgentSpan rootSpan) {
+            return EndpointTracker.NO_OP;
+        }
+
+        @Override
+        public Timing start(TimerType type) {
+            return Timing.NoOp.INSTANCE;
+        }
+
+        @Override
+        public void whenAvailable(Runnable callback) {
+            if (deferAvailability) {
+                this.availabilityCallback = callback;
+            } else {
+                callback.run();
+            }
+        }
+
+        void becomeAvailable() {
+            Runnable callback = this.availabilityCallback;
+            this.availabilityCallback = null;
+            if (callback != null) {
+                callback.run();
+            }
+        }
+    }
+
+    static class WriterWithExplicitFlush implements datadog.trace.common.writer.Writer {
+        final List<List<DDSpan>> writtenTraces = new CopyOnWriteArrayList<>();
+        final List<List<DDSpan>> flushedTraces = new CopyOnWriteArrayList<>();
+
+        @Override
+        public void write(List<DDSpan> trace) {
+            writtenTraces.add(trace);
+        }
+
+        @Override
+        public void start() {}
+
+        @Override
+        public boolean flush() {
+            flushedTraces.addAll(writtenTraces);
+            writtenTraces.clear();
+            return true;
+        }
+
+        @Override
+        public void close() {}
+
+        @Override
+        public void incrementDropCounts(int spanCount) {}
     }
-  }
-
-  static class WriterWithExplicitFlush implements datadog.trace.common.writer.Writer {
-    final List<List<DDSpan>> writtenTraces = new CopyOnWriteArrayList<>();
-    final List<List<DDSpan>> flushedTraces = new CopyOnWriteArrayList<>();
-
-    @Override
-    public void write(List<DDSpan> trace) {
-      writtenTraces.add(trace);
-    }
-
-    @Override
-    public void start() {}
-
-    @Override
-    public boolean flush() {
-      flushedTraces.addAll(writtenTraces);
-      writtenTraces.clear();
-      return true;
-    }
-
-    @Override
-    public void close() {}
-
-    @Override
-    public void incrementDropCounts(int spanCount) {}
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest2.java b/dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest2.java
index 7e6ddaf8d71..4d5a43cb1e1 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest2.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest2.java
@@ -22,262 +22,250 @@
 // named CoreTracerTest2 to avoid collision with Groovy which appears to have messed up test
 // coverage
 public final class CoreTracerTest2 {
-  static final CoreTracer TRACER = CoreTracer.builder().build();
+    static final CoreTracer TRACER = CoreTracer.builder().build();
 
-  static final ReusableSingleSpanBuilderThreadLocalCache CACHE =
-      new ReusableSingleSpanBuilderThreadLocalCache(TRACER);
+    static final ReusableSingleSpanBuilderThreadLocalCache CACHE =
+            new ReusableSingleSpanBuilderThreadLocalCache(TRACER);
 
-  @Test
-  public void buildSpan() {
-    // buildSpan allows for constructing multiple spans from each returned CoreSpanBuilder
-    // so buildSpan cannot recycle objects - even when SpanBuilder reuse is enabled
-    CoreSpanBuilder builder1 = TRACER.buildSpan("foo", "bar");
+    @Test
+    public void buildSpan() {
+        // buildSpan allows for constructing multiple spans from each returned CoreSpanBuilder
+        // so buildSpan cannot recycle objects - even when SpanBuilder reuse is enabled
+        CoreSpanBuilder builder1 = TRACER.buildSpan("foo", "bar");
 
-    // need to build/start a span to prove that builder isn't being recycled
-    builder1.start();
+        // need to build/start a span to prove that builder isn't being recycled
+        builder1.start();
 
-    CoreSpanBuilder builder2 = TRACER.buildSpan("foo", "bar");
-    builder2.start();
+        CoreSpanBuilder builder2 = TRACER.buildSpan("foo", "bar");
+        builder2.start();
 
-    assertNotSame(builder1, builder2);
-  }
+        assertNotSame(builder1, builder2);
+    }
+
+    @Test
+    public void singleUseSpanBuilder() {
+        CoreSpanBuilder builder1 = TRACER.singleSpanBuilder("foo", "bar");
+        builder1.start();
+
+        CoreSpanBuilder builder2 = TRACER.singleSpanBuilder("baz", "quux");
+        builder2.start();
+
+        if (Config.get().isSpanBuilderReuseEnabled()) {
+            assertSame(builder1, builder2);
+        } else {
+            assertNotSame(builder1, builder2);
+        }
+    }
+
+    @Test
+    public void spanBuilderReuse() {
+        // Doesn't call reuseSpanBuilder(String, CharSeq) directly, since that will fail when the Config
+        // is disabled
+        ReusableSingleSpanBuilder builder1 = CoreTracer.reuseSingleSpanBuilder(TRACER, CACHE, "foo", "bar");
+        assertTrue(builder1.inUse);
+
+        builder1.start();
+        assertFalse(builder1.inUse);
+
+        ReusableSingleSpanBuilder builder2 = CoreTracer.reuseSingleSpanBuilder(TRACER, CACHE, "baz", "quux");
+        assertTrue(builder2.inUse);
+        assertSame(builder1, builder2);
+
+        builder2.start();
+        assertFalse(builder2.inUse);
+    }
+
+    @Test
+    public void spanBuilderReuse_stillInUse() {
+        // Doesn't call reuseSpanBuilder(String, CharSeq) directly, since that will fail when the Config
+        // is disabled
+        ReusableSingleSpanBuilder builder1 = CoreTracer.reuseSingleSpanBuilder(TRACER, CACHE, "foo", "bar");
+        assertTrue(builder1.inUse);
+
+        ReusableSingleSpanBuilder builder2 = CoreTracer.reuseSingleSpanBuilder(TRACER, CACHE, "baz", "quux");
+        assertTrue(builder2.inUse);
+        assertNotSame(builder1, builder2);
 
-  @Test
-  public void singleUseSpanBuilder() {
-    CoreSpanBuilder builder1 = TRACER.singleSpanBuilder("foo", "bar");
-    builder1.start();
+        builder2.start();
+        assertFalse(builder2.inUse);
 
-    CoreSpanBuilder builder2 = TRACER.singleSpanBuilder("baz", "quux");
-    builder2.start();
+        builder1.start();
+        assertFalse(builder1.inUse);
+    }
+
+    @Test
+    public void spanBuilderReuse_abandoned() {
+        // Doesn't call reuseSpanBuilder(String, CharSeq) directly, since that will fail when the Config
+        // is disabled
+
+        ReusableSingleSpanBuilder abandonedBuilder = CoreTracer.reuseSingleSpanBuilder(TRACER, CACHE, "foo", "bar");
+        assertTrue(abandonedBuilder.inUse);
+
+        // Requesting the next builder will replace the previous one in the thread local cache
+        // This is done so that an abandoned builder doesn't permanently burn the cache for a thread
+        ReusableSingleSpanBuilder builder1 = CoreTracer.reuseSingleSpanBuilder(TRACER, CACHE, "baz", "quux");
+        assertTrue(builder1.inUse);
+        assertNotSame(abandonedBuilder, builder1);
+
+        builder1.start();
+        assertFalse(builder1.inUse);
+
+        ReusableSingleSpanBuilder builder2 = CoreTracer.reuseSingleSpanBuilder(TRACER, CACHE, "baz", "quux");
+        assertTrue(builder2.inUse);
+        assertSame(builder1, builder2);
+
+        builder2.start();
+        assertFalse(builder2.inUse);
+    }
+
+    @Test
+    public void init_twice() {
+        ReusableSingleSpanBuilder builder = new ReusableSingleSpanBuilder(TRACER);
+        builder.init("foo", "bar");
+        assertTrue(builder.inUse);
+        assertEquals("foo", builder.instrumentationName);
+        assertEquals("bar", builder.operationName);
+
+        assertThrows(AssertionError.class, () -> builder.init("baz", "quux"));
+    }
 
-    if (Config.get().isSpanBuilderReuseEnabled()) {
-      assertSame(builder1, builder2);
-    } else {
-      assertNotSame(builder1, builder2);
+    @Test
+    public void reset_twice() {
+        ReusableSingleSpanBuilder builder = new ReusableSingleSpanBuilder(TRACER);
+        builder.reset("foo", "bar");
+        assertTrue(builder.inUse);
+        assertEquals("foo", builder.instrumentationName);
+        assertEquals("bar", builder.operationName);
+
+        assertFalse(builder.reset("baz", "quux"));
+        assertEquals("foo", builder.instrumentationName);
+        assertEquals("bar", builder.operationName);
     }
-  }
-
-  @Test
-  public void spanBuilderReuse() {
-    // Doesn't call reuseSpanBuilder(String, CharSeq) directly, since that will fail when the Config
-    // is disabled
-    ReusableSingleSpanBuilder builder1 =
-        CoreTracer.reuseSingleSpanBuilder(TRACER, CACHE, "foo", "bar");
-    assertTrue(builder1.inUse);
-
-    builder1.start();
-    assertFalse(builder1.inUse);
-
-    ReusableSingleSpanBuilder builder2 =
-        CoreTracer.reuseSingleSpanBuilder(TRACER, CACHE, "baz", "quux");
-    assertTrue(builder2.inUse);
-    assertSame(builder1, builder2);
-
-    builder2.start();
-    assertFalse(builder2.inUse);
-  }
-
-  @Test
-  public void spanBuilderReuse_stillInUse() {
-    // Doesn't call reuseSpanBuilder(String, CharSeq) directly, since that will fail when the Config
-    // is disabled
-    ReusableSingleSpanBuilder builder1 =
-        CoreTracer.reuseSingleSpanBuilder(TRACER, CACHE, "foo", "bar");
-    assertTrue(builder1.inUse);
-
-    ReusableSingleSpanBuilder builder2 =
-        CoreTracer.reuseSingleSpanBuilder(TRACER, CACHE, "baz", "quux");
-    assertTrue(builder2.inUse);
-    assertNotSame(builder1, builder2);
-
-    builder2.start();
-    assertFalse(builder2.inUse);
-
-    builder1.start();
-    assertFalse(builder1.inUse);
-  }
-
-  @Test
-  public void spanBuilderReuse_abandoned() {
-    // Doesn't call reuseSpanBuilder(String, CharSeq) directly, since that will fail when the Config
-    // is disabled
-
-    ReusableSingleSpanBuilder abandonedBuilder =
-        CoreTracer.reuseSingleSpanBuilder(TRACER, CACHE, "foo", "bar");
-    assertTrue(abandonedBuilder.inUse);
-
-    // Requesting the next builder will replace the previous one in the thread local cache
-    // This is done so that an abandoned builder doesn't permanently burn the cache for a thread
-    ReusableSingleSpanBuilder builder1 =
-        CoreTracer.reuseSingleSpanBuilder(TRACER, CACHE, "baz", "quux");
-    assertTrue(builder1.inUse);
-    assertNotSame(abandonedBuilder, builder1);
-
-    builder1.start();
-    assertFalse(builder1.inUse);
-
-    ReusableSingleSpanBuilder builder2 =
-        CoreTracer.reuseSingleSpanBuilder(TRACER, CACHE, "baz", "quux");
-    assertTrue(builder2.inUse);
-    assertSame(builder1, builder2);
-
-    builder2.start();
-    assertFalse(builder2.inUse);
-  }
-
-  @Test
-  public void init_twice() {
-    ReusableSingleSpanBuilder builder = new ReusableSingleSpanBuilder(TRACER);
-    builder.init("foo", "bar");
-    assertTrue(builder.inUse);
-    assertEquals("foo", builder.instrumentationName);
-    assertEquals("bar", builder.operationName);
-
-    assertThrows(AssertionError.class, () -> builder.init("baz", "quux"));
-  }
-
-  @Test
-  public void reset_twice() {
-    ReusableSingleSpanBuilder builder = new ReusableSingleSpanBuilder(TRACER);
-    builder.reset("foo", "bar");
-    assertTrue(builder.inUse);
-    assertEquals("foo", builder.instrumentationName);
-    assertEquals("bar", builder.operationName);
-
-    assertFalse(builder.reset("baz", "quux"));
-    assertEquals("foo", builder.instrumentationName);
-    assertEquals("bar", builder.operationName);
-  }
-
-  @Test
-  public void reset_and_start() {
-    ReusableSingleSpanBuilder builder = new ReusableSingleSpanBuilder(TRACER);
-    builder.reset("foo", "bar");
-    assertTrue(builder.inUse);
-    assertEquals("foo", builder.instrumentationName);
-    assertEquals("bar", builder.operationName);
-
-    AgentSpan span = builder.start();
-    assertEquals(span.getOperationName(), "bar");
-  }
-
-  @Test
-  public void init_and_start() {
-    ReusableSingleSpanBuilder builder = new ReusableSingleSpanBuilder(TRACER);
-    builder.reset("foo", "bar");
-    assertTrue(builder.inUse);
-    assertEquals("foo", builder.instrumentationName);
-    assertEquals("bar", builder.operationName);
-
-    AgentSpan span = builder.start();
-    assertFalse(builder.inUse);
-    assertEquals(span.getOperationName(), "bar");
-
-    builder.reset("baz", "quux");
-    assertTrue(builder.inUse);
-    assertEquals("baz", builder.instrumentationName);
-    assertEquals("quux", builder.operationName);
-  }
-
-  @Test
-  public void start_not_inUse() {
-    ReusableSingleSpanBuilder builder = new ReusableSingleSpanBuilder(TRACER);
-    assertThrows(AssertionError.class, () -> builder.start());
-  }
-
-  @Test
-  public void interceptNoInterceptors() {
-    // No interceptors should return the original list to avoid allocation
-    DDSpan span = (DDSpan) TRACER.startSpan("foo", "foo");
-
-    SpanList list = SpanList.of(span);
-    List<DDSpan> interceptedList = CoreTracer.interceptCompleteTrace(new TraceInterceptors(), list);
-    assertSame(list, interceptedList);
-  }
-
-  @Test
-  public void interceptEmptyList() {
-    DDSpan span = (DDSpan) TRACER.startSpan("foo", "foo");
-    TraceInterceptors interceptors = interceptors((list) -> SpanList.of(span));
-
-    SpanList list = new SpanList(0); // not using EMPTY deliberately
-    List<DDSpan> interceptedList = CoreTracer.interceptCompleteTrace(interceptors, list);
-    assertTrue(interceptedList.isEmpty());
-  }
-
-  @Test
-  public void interceptUnchanged() {
-    TraceInterceptors interceptors = interceptors((list) -> list, (list) -> list);
-
-    DDSpan span = (DDSpan) TRACER.startSpan("foo", "foo");
-    SpanList list = SpanList.of(span);
-    List<DDSpan> interceptedList = CoreTracer.interceptCompleteTrace(interceptors, list);
-    assertSame(list, interceptedList);
-  }
-
-  @Test
-  public void interceptNewList() {
-    DDSpan substituteSpan = (DDSpan) TRACER.startSpan("sub", "sub");
-    SpanList substituteList = SpanList.of(substituteSpan);
-    TraceInterceptors interceptors = interceptors((list) -> list, (list) -> substituteList);
-
-    DDSpan span = (DDSpan) TRACER.startSpan("foo", "foo");
-    SpanList list = SpanList.of(span);
-    List<DDSpan> interceptedList = CoreTracer.interceptCompleteTrace(interceptors, list);
-    assertEquals(1, interceptedList.size());
-    assertEquals("sub", interceptedList.get(0).getOperationName());
-  }
-
-  @Test
-  public void interceptAlteredList() {
-    // This is an unlikely case and arguably not something we need to support
-
-    DDSpan substituteSpan = (DDSpan) TRACER.startSpan("sub", "sub");
-    TraceInterceptors interceptors =
-        interceptors(
-            (list) -> list,
-            (list) -> {
-              List erasedList = (List) list;
-              erasedList.clear();
-              erasedList.add(substituteSpan);
-              return erasedList;
+
+    @Test
+    public void reset_and_start() {
+        ReusableSingleSpanBuilder builder = new ReusableSingleSpanBuilder(TRACER);
+        builder.reset("foo", "bar");
+        assertTrue(builder.inUse);
+        assertEquals("foo", builder.instrumentationName);
+        assertEquals("bar", builder.operationName);
+
+        AgentSpan span = builder.start();
+        assertEquals(span.getOperationName(), "bar");
+    }
+
+    @Test
+    public void init_and_start() {
+        ReusableSingleSpanBuilder builder = new ReusableSingleSpanBuilder(TRACER);
+        builder.reset("foo", "bar");
+        assertTrue(builder.inUse);
+        assertEquals("foo", builder.instrumentationName);
+        assertEquals("bar", builder.operationName);
+
+        AgentSpan span = builder.start();
+        assertFalse(builder.inUse);
+        assertEquals(span.getOperationName(), "bar");
+
+        builder.reset("baz", "quux");
+        assertTrue(builder.inUse);
+        assertEquals("baz", builder.instrumentationName);
+        assertEquals("quux", builder.operationName);
+    }
+
+    @Test
+    public void start_not_inUse() {
+        ReusableSingleSpanBuilder builder = new ReusableSingleSpanBuilder(TRACER);
+        assertThrows(AssertionError.class, () -> builder.start());
+    }
+
+    @Test
+    public void interceptNoInterceptors() {
+        // No interceptors should return the original list to avoid allocation
+        DDSpan span = (DDSpan) TRACER.startSpan("foo", "foo");
+
+        SpanList list = SpanList.of(span);
+        List<DDSpan> interceptedList = CoreTracer.interceptCompleteTrace(new TraceInterceptors(), list);
+        assertSame(list, interceptedList);
+    }
+
+    @Test
+    public void interceptEmptyList() {
+        DDSpan span = (DDSpan) TRACER.startSpan("foo", "foo");
+        TraceInterceptors interceptors = interceptors((list) -> SpanList.of(span));
+
+        SpanList list = new SpanList(0); // not using EMPTY deliberately
+        List<DDSpan> interceptedList = CoreTracer.interceptCompleteTrace(interceptors, list);
+        assertTrue(interceptedList.isEmpty());
+    }
+
+    @Test
+    public void interceptUnchanged() {
+        TraceInterceptors interceptors = interceptors((list) -> list, (list) -> list);
+
+        DDSpan span = (DDSpan) TRACER.startSpan("foo", "foo");
+        SpanList list = SpanList.of(span);
+        List<DDSpan> interceptedList = CoreTracer.interceptCompleteTrace(interceptors, list);
+        assertSame(list, interceptedList);
+    }
+
+    @Test
+    public void interceptNewList() {
+        DDSpan substituteSpan = (DDSpan) TRACER.startSpan("sub", "sub");
+        SpanList substituteList = SpanList.of(substituteSpan);
+        TraceInterceptors interceptors = interceptors((list) -> list, (list) -> substituteList);
+
+        DDSpan span = (DDSpan) TRACER.startSpan("foo", "foo");
+        SpanList list = SpanList.of(span);
+        List<DDSpan> interceptedList = CoreTracer.interceptCompleteTrace(interceptors, list);
+        assertEquals(1, interceptedList.size());
+        assertEquals("sub", interceptedList.get(0).getOperationName());
+    }
+
+    @Test
+    public void interceptAlteredList() {
+        // This is an unlikely case and arguably not something we need to support
+
+        DDSpan substituteSpan = (DDSpan) TRACER.startSpan("sub", "sub");
+        TraceInterceptors interceptors = interceptors((list) -> list, (list) -> {
+            List erasedList = (List) list;
+            erasedList.clear();
+            erasedList.add(substituteSpan);
+            return erasedList;
+        });
+
+        DDSpan span = (DDSpan) TRACER.startSpan("foo", "foo");
+        SpanList list = SpanList.of(span);
+        List<DDSpan> interceptedList = CoreTracer.interceptCompleteTrace(interceptors, list);
+        assertNotSame(interceptedList, list);
+        assertEquals(1, interceptedList.size());
+        assertEquals("sub", interceptedList.get(0).getOperationName());
+    }
+
+    static final TraceInterceptors interceptors(TestInterceptor... interceptors) {
+        TraceInterceptors traceInterceptors = new TraceInterceptors();
+        for (int i = 0; i < interceptors.length; ++i) {
+            int priority = i;
+            TestInterceptor interceptor = interceptors[i];
+
+            traceInterceptors.add(new TraceInterceptor() {
+                @Override
+                public int priority() {
+                    return priority;
+                }
+
+                @Override
+                public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
+                    return interceptor.onTraceComplete(trace);
+                }
             });
+        }
+        return traceInterceptors;
+    }
 
-    DDSpan span = (DDSpan) TRACER.startSpan("foo", "foo");
-    SpanList list = SpanList.of(span);
-    List<DDSpan> interceptedList = CoreTracer.interceptCompleteTrace(interceptors, list);
-    assertNotSame(interceptedList, list);
-    assertEquals(1, interceptedList.size());
-    assertEquals("sub", interceptedList.get(0).getOperationName());
-  }
-
-  static final TraceInterceptors interceptors(TestInterceptor... interceptors) {
-    TraceInterceptors traceInterceptors = new TraceInterceptors();
-    for (int i = 0; i < interceptors.length; ++i) {
-      int priority = i;
-      TestInterceptor interceptor = interceptors[i];
-
-      traceInterceptors.add(
-          new TraceInterceptor() {
-            @Override
-            public int priority() {
-              return priority;
-            }
-
-            @Override
-            public Collection<? extends MutableSpan> onTraceComplete(
-                Collection<? extends MutableSpan> trace) {
-              return interceptor.onTraceComplete(trace);
-            }
-          });
+    // Matches TraceInterceptor but priority is implied in interceptors
+    // Only having onTraceComplete allows this to @FunctionalInterface and a little nicer for a test
+    @FunctionalInterface
+    interface TestInterceptor {
+        Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace);
     }
-    return traceInterceptors;
-  }
-
-  // Matches TraceInterceptor but priority is implied in interceptors
-  // Only having onTraceComplete allows this to @FunctionalInterface and a little nicer for a test
-  @FunctionalInterface
-  interface TestInterceptor {
-    Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/DDCoreJavaSpecification.java b/dd-trace-core/src/test/java/datadog/trace/core/DDCoreJavaSpecification.java
index d5fead39ea7..f5a29eb3b2b 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/DDCoreJavaSpecification.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/DDCoreJavaSpecification.java
@@ -24,124 +24,116 @@
 
 public abstract class DDCoreJavaSpecification extends DDJavaSpecification {
 
-  protected static List<CoreTracer> unclosedTracers = new ArrayList<>();
-
-  protected static class AutoCloseableCoreTracerBuilder extends CoreTracerBuilder {
-    @Override
-    public CoreTracer build() {
-      CoreTracer tracer = super.build();
-      unclosedTracers.add(tracer);
-      return tracer;
+    protected static List<CoreTracer> unclosedTracers = new ArrayList<>();
+
+    protected static class AutoCloseableCoreTracerBuilder extends CoreTracerBuilder {
+        @Override
+        public CoreTracer build() {
+            CoreTracer tracer = super.build();
+            unclosedTracers.add(tracer);
+            return tracer;
+        }
     }
-  }
-
-  protected boolean useNoopStatsDClient() {
-    return true;
-  }
-
-  protected boolean useStrictTraceWrites() {
-    return true;
-  }
-
-  @BeforeAll
-  static void beforeAll() {
-    TagsPostProcessorFactory.withAddInternalTags(false);
-    TagsPostProcessorFactory.withAddRemoteHostname(false);
-  }
-
-  @AfterAll
-  static void afterAll() {
-    TagsPostProcessorFactory.reset();
-  }
-
-  @AfterEach
-  void cleanupCore() {
-    for (CoreTracer tracer : unclosedTracers) {
-      try {
-        tracer.close();
-      } catch (Throwable ignored) {
-      }
+
+    protected boolean useNoopStatsDClient() {
+        return true;
+    }
+
+    protected boolean useStrictTraceWrites() {
+        return true;
+    }
+
+    @BeforeAll
+    static void beforeAll() {
+        TagsPostProcessorFactory.withAddInternalTags(false);
+        TagsPostProcessorFactory.withAddRemoteHostname(false);
     }
-    unclosedTracers.clear();
-    AgentTaskScheduler.shutdownAndReset(10, TimeUnit.SECONDS);
-  }
-
-  protected CoreTracerBuilder tracerBuilder() {
-    CoreTracerBuilder builder = new AutoCloseableCoreTracerBuilder();
-    if (useNoopStatsDClient()) {
-      builder = builder.statsDClient(StatsDClient.NO_OP);
+
+    @AfterAll
+    static void afterAll() {
+        TagsPostProcessorFactory.reset();
     }
-    return builder.strictTraceWrites(useStrictTraceWrites());
-  }
-
-  protected DDSpan buildSpan(long timestamp, CharSequence spanType, Map<String, Object> tags) {
-    return buildSpan(
-        timestamp,
-        spanType,
-        PropagationTags.factory().empty(),
-        tags,
-        PrioritySampling.SAMPLER_KEEP,
-        null);
-  }
-
-  protected DDSpan buildSpan(
-      long timestamp, String tag, String value, PropagationTags propagationTags) {
-    Map<String, Object> tags = new HashMap<>();
-    tags.put(tag, value);
-    return buildSpan(timestamp, "fakeType", propagationTags, tags, PrioritySampling.UNSET, null);
-  }
-
-  protected DDSpan buildSpan(
-      long timestamp,
-      CharSequence spanType,
-      PropagationTags propagationTags,
-      Map<String, Object> tags,
-      byte prioritySampling,
-      Object ciVisibilityContextData) {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    DDSpanContext context =
-        new DDSpanContext(
-            DDTraceId.ONE,
-            1L,
-            DDSpanId.ZERO,
-            null,
-            null,
-            "fakeService",
-            "fakeOperation",
-            "fakeResource",
-            prioritySampling,
-            null,
-            Collections.emptyMap(),
-            null,
-            false,
-            spanType,
-            0,
-            tracer.createTraceCollector(DDTraceId.ONE),
-            null,
-            null,
-            ciVisibilityContextData,
-            NoopPathwayContext.INSTANCE,
-            false,
-            propagationTags,
-            ProfilingContextIntegration.NoOp.INSTANCE,
-            true,
-            true);
-
-    DDSpan span = DDSpan.create("test", timestamp, context, null);
-    for (Map.Entry<String, Object> entry : tags.entrySet()) {
-      span.setTag(entry.getKey(), entry.getValue());
+
+    @AfterEach
+    void cleanupCore() {
+        for (CoreTracer tracer : unclosedTracers) {
+            try {
+                tracer.close();
+            } catch (Throwable ignored) {
+            }
+        }
+        unclosedTracers.clear();
+        AgentTaskScheduler.shutdownAndReset(10, TimeUnit.SECONDS);
+    }
+
+    protected CoreTracerBuilder tracerBuilder() {
+        CoreTracerBuilder builder = new AutoCloseableCoreTracerBuilder();
+        if (useNoopStatsDClient()) {
+            builder = builder.statsDClient(StatsDClient.NO_OP);
+        }
+        return builder.strictTraceWrites(useStrictTraceWrites());
     }
 
-    tracer.close();
-    return span;
-  }
-
-  protected static Map<String, Map<String, Number>> rateByService(
-      String service, String env, double rate) {
-    Map<String, Number> byService = new HashMap<>();
-    byService.put("service:" + service + ",env:" + env, rate);
-    Map<String, Map<String, Number>> response = new HashMap<>();
-    response.put("rate_by_service", byService);
-    return response;
-  }
+    protected DDSpan buildSpan(long timestamp, CharSequence spanType, Map<String, Object> tags) {
+        return buildSpan(
+                timestamp, spanType, PropagationTags.factory().empty(), tags, PrioritySampling.SAMPLER_KEEP, null);
+    }
+
+    protected DDSpan buildSpan(long timestamp, String tag, String value, PropagationTags propagationTags) {
+        Map<String, Object> tags = new HashMap<>();
+        tags.put(tag, value);
+        return buildSpan(timestamp, "fakeType", propagationTags, tags, PrioritySampling.UNSET, null);
+    }
+
+    protected DDSpan buildSpan(
+            long timestamp,
+            CharSequence spanType,
+            PropagationTags propagationTags,
+            Map<String, Object> tags,
+            byte prioritySampling,
+            Object ciVisibilityContextData) {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        DDSpanContext context = new DDSpanContext(
+                DDTraceId.ONE,
+                1L,
+                DDSpanId.ZERO,
+                null,
+                null,
+                "fakeService",
+                "fakeOperation",
+                "fakeResource",
+                prioritySampling,
+                null,
+                Collections.emptyMap(),
+                null,
+                false,
+                spanType,
+                0,
+                tracer.createTraceCollector(DDTraceId.ONE),
+                null,
+                null,
+                ciVisibilityContextData,
+                NoopPathwayContext.INSTANCE,
+                false,
+                propagationTags,
+                ProfilingContextIntegration.NoOp.INSTANCE,
+                true,
+                true);
+
+        DDSpan span = DDSpan.create("test", timestamp, context, null);
+        for (Map.Entry<String, Object> entry : tags.entrySet()) {
+            span.setTag(entry.getKey(), entry.getValue());
+        }
+
+        tracer.close();
+        return span;
+    }
+
+    protected static Map<String, Map<String, Number>> rateByService(String service, String env, double rate) {
+        Map<String, Number> byService = new HashMap<>();
+        byService.put("service:" + service + ",env:" + env, rate);
+        Map<String, Map<String, Number>> response = new HashMap<>();
+        response.put("rate_by_service", byService);
+        return response;
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextPropagationTagsTest.java b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextPropagationTagsTest.java
index 522b0da3463..8e1e7114ab8 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextPropagationTagsTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextPropagationTagsTest.java
@@ -25,157 +25,151 @@
 @TypeConverterSources(TableTestTypeConverters.class)
 public class DDSpanContextPropagationTagsTest extends DDCoreJavaSpecification {
 
-  private ListWriter writer;
-  private CoreTracer tracer;
-
-  @BeforeEach
-  void setup() {
-    writer = new ListWriter();
-    tracer = tracerBuilder().writer(writer).build();
-  }
-
-  @TableTest({
-    "scenario                        | priority     | header                              | newPriority  | newMechanism | newHeader                           | tagMap                                  ",
-    "UNSET->USER_KEEP                | UNSET        | _dd.p.usr=123                       | USER_KEEP    | MANUAL       | _dd.p.dm=-4,_dd.p.usr=123           | [_dd.p.dm: -4, _dd.p.usr: 123]          ",
-    "UNSET->SAMPLER_DROP             | UNSET        | _dd.p.usr=123                       | SAMPLER_DROP | DEFAULT      | _dd.p.usr=123                       | [_dd.p.usr: 123]                        ",
-    "SAMPLER_KEEP->USER_KEEP with dm | SAMPLER_KEEP | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | USER_KEEP    | MANUAL       | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | [_dd.p.dm: 9bf3439f2f-1, _dd.p.usr: 123]",
-    "SAMPLER_KEEP->USER_DROP with dm | SAMPLER_KEEP | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | USER_DROP    | MANUAL       | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | [_dd.p.dm: 9bf3439f2f-1, _dd.p.usr: 123]",
-    "SAMPLER_KEEP->USER_KEEP no dm   | SAMPLER_KEEP | _dd.p.usr=123                       | USER_KEEP    | MANUAL       | _dd.p.usr=123                       | [_dd.p.usr: 123]                        "
-  })
-  void updateSpanPropagationTags(
-      String scenario,
-      int priority,
-      String header,
-      int newPriority,
-      int newMechanism,
-      String newHeader,
-      Map<String, String> tagMap) {
-    PropagationTags propagationTags =
-        tracer
-            .getPropagationTagsFactory()
-            .fromHeaderValue(PropagationTags.HeaderType.DATADOG, header);
-    AgentSpanContext extracted =
-        new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG)
-            .withRequestContextDataAppSec("dummy");
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "top").asChildOf(extracted).start();
-    PropagationTags dd = span.spanContext().getPropagationTags();
-
-    span.setSamplingPriority(newPriority, newMechanism);
-
-    assertEquals(newHeader, dd.headerValue(PropagationTags.HeaderType.DATADOG));
-    assertEquals(tagMap, dd.createTagMap());
-  }
-
-  @TableTest({
-    "scenario                        | priority     | header                              | newPriority  | newMechanism | rootHeader                          | rootTagMap                              ",
-    "UNSET->USER_KEEP                | UNSET        | _dd.p.usr=123                       | USER_KEEP    | MANUAL       | _dd.p.dm=-4,_dd.p.usr=123           | [_dd.p.dm: -4, _dd.p.usr: 123]          ",
-    "UNSET->SAMPLER_DROP             | UNSET        | _dd.p.usr=123                       | SAMPLER_DROP | DEFAULT      | _dd.p.usr=123                       | [_dd.p.usr: 123]                        ",
-    "SAMPLER_KEEP->USER_KEEP with dm | SAMPLER_KEEP | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | USER_KEEP    | MANUAL       | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | [_dd.p.dm: 9bf3439f2f-1, _dd.p.usr: 123]",
-    "SAMPLER_KEEP->USER_DROP with dm | SAMPLER_KEEP | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | USER_DROP    | MANUAL       | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | [_dd.p.dm: 9bf3439f2f-1, _dd.p.usr: 123]",
-    "SAMPLER_KEEP->USER_KEEP no dm   | SAMPLER_KEEP | _dd.p.usr=123                       | USER_KEEP    | MANUAL       | _dd.p.usr=123                       | [_dd.p.usr: 123]                        "
-  })
-  void updateTracePropagationTags(
-      String scenario,
-      int priority,
-      String header,
-      int newPriority,
-      int newMechanism,
-      String rootHeader,
-      Map<String, String> rootTagMap) {
-    PropagationTags propagationTags =
-        tracer
-            .getPropagationTagsFactory()
-            .fromHeaderValue(PropagationTags.HeaderType.DATADOG, header);
-    AgentSpanContext extracted =
-        new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG)
-            .withRequestContextDataAppSec("dummy");
-    DDSpan rootSpan = (DDSpan) tracer.buildSpan("datadog", "top").asChildOf(extracted).start();
-    PropagationTags ddRoot = rootSpan.spanContext().getPropagationTags();
-    DDSpan span =
-        (DDSpan) tracer.buildSpan("datadog", "current").asChildOf(rootSpan.spanContext()).start();
-
-    span.setSamplingPriority(newPriority, newMechanism);
-
-    assertEquals(rootHeader, ddRoot.headerValue(PropagationTags.HeaderType.DATADOG));
-    assertEquals(rootTagMap, ddRoot.createTagMap());
-  }
-
-  @TableTest({
-    "scenario             | priority     | header                              | newHeader                 | tagMap                        ",
-    "UNSET                | UNSET        | _dd.p.usr=123                       | _dd.p.dm=-4,_dd.p.usr=123 | [_dd.p.dm: -4, _dd.p.usr: 123]",
-    "SAMPLER_KEEP with dm | SAMPLER_KEEP | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | _dd.p.dm=-4,_dd.p.usr=123 | [_dd.p.dm: -4, _dd.p.usr: 123]",
-    "SAMPLER_KEEP no dm   | SAMPLER_KEEP | _dd.p.usr=123                       | _dd.p.dm=-4,_dd.p.usr=123 | [_dd.p.dm: -4, _dd.p.usr: 123]"
-  })
-  void forceKeepSpanPropagationTags(
-      String scenario, int priority, String header, String newHeader, Map<String, String> tagMap) {
-    PropagationTags propagationTags =
-        tracer
-            .getPropagationTagsFactory()
-            .fromHeaderValue(PropagationTags.HeaderType.DATADOG, header);
-    AgentSpanContext extracted =
-        new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG)
-            .withRequestContextDataAppSec("dummy");
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "top").asChildOf(extracted).start();
-    PropagationTags dd = span.spanContext().getPropagationTags();
-
-    span.spanContext().forceKeep();
-
-    assertEquals(newHeader, dd.headerValue(PropagationTags.HeaderType.DATADOG));
-    assertEquals(tagMap, dd.createTagMap());
-  }
-
-  @TableTest({
-    "scenario             | priority     | header                              | newHeader                 | tagMap                        ",
-    "UNSET                | UNSET        | _dd.p.usr=123                       | _dd.p.dm=-4,_dd.p.usr=123 | [_dd.p.dm: -4, _dd.p.usr: 123]",
-    "SAMPLER_KEEP with dm | SAMPLER_KEEP | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | _dd.p.dm=-4,_dd.p.usr=123 | [_dd.p.dm: -4, _dd.p.usr: 123]",
-    "SAMPLER_KEEP no dm   | SAMPLER_KEEP | _dd.p.usr=123                       | _dd.p.dm=-4,_dd.p.usr=123 | [_dd.p.dm: -4, _dd.p.usr: 123]"
-  })
-  void forceKeepTracePropagationTags(
-      String scenario,
-      int priority,
-      String header,
-      String rootHeader,
-      Map<String, String> rootTagMap) {
-    PropagationTags propagationTags =
-        tracer
-            .getPropagationTagsFactory()
-            .fromHeaderValue(PropagationTags.HeaderType.DATADOG, header);
-    AgentSpanContext extracted =
-        new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG)
-            .withRequestContextDataAppSec("dummy");
-    DDSpan rootSpan = (DDSpan) tracer.buildSpan("datadog", "top").asChildOf(extracted).start();
-    PropagationTags ddRoot = rootSpan.spanContext().getPropagationTags();
-    DDSpan span =
-        (DDSpan) tracer.buildSpan("datadog", "current").asChildOf(rootSpan.spanContext()).start();
-
-    span.spanContext().forceKeep();
-
-    assertEquals(rootHeader, ddRoot.headerValue(PropagationTags.HeaderType.DATADOG));
-    assertEquals(rootTagMap, ddRoot.createTagMap());
-  }
-
-  @TypeConverter
-  public static int toInt(String value) {
-    if (value == null) {
-      throw new IllegalArgumentException("Value cannot be null");
+    private ListWriter writer;
+    private CoreTracer tracer;
+
+    @BeforeEach
+    void setup() {
+        writer = new ListWriter();
+        tracer = tracerBuilder().writer(writer).build();
+    }
+
+    @TableTest({
+      "scenario                        | priority     | header                              | newPriority  | newMechanism | newHeader                           | tagMap                                  ",
+      "UNSET->USER_KEEP                | UNSET        | _dd.p.usr=123                       | USER_KEEP    | MANUAL       | _dd.p.dm=-4,_dd.p.usr=123           | [_dd.p.dm: -4, _dd.p.usr: 123]          ",
+      "UNSET->SAMPLER_DROP             | UNSET        | _dd.p.usr=123                       | SAMPLER_DROP | DEFAULT      | _dd.p.usr=123                       | [_dd.p.usr: 123]                        ",
+      "SAMPLER_KEEP->USER_KEEP with dm | SAMPLER_KEEP | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | USER_KEEP    | MANUAL       | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | [_dd.p.dm: 9bf3439f2f-1, _dd.p.usr: 123]",
+      "SAMPLER_KEEP->USER_DROP with dm | SAMPLER_KEEP | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | USER_DROP    | MANUAL       | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | [_dd.p.dm: 9bf3439f2f-1, _dd.p.usr: 123]",
+      "SAMPLER_KEEP->USER_KEEP no dm   | SAMPLER_KEEP | _dd.p.usr=123                       | USER_KEEP    | MANUAL       | _dd.p.usr=123                       | [_dd.p.usr: 123]                        "
+    })
+    void updateSpanPropagationTags(
+            String scenario,
+            int priority,
+            String header,
+            int newPriority,
+            int newMechanism,
+            String newHeader,
+            Map<String, String> tagMap) {
+        PropagationTags propagationTags =
+                tracer.getPropagationTagsFactory().fromHeaderValue(PropagationTags.HeaderType.DATADOG, header);
+        AgentSpanContext extracted = new ExtractedContext(
+                        DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG)
+                .withRequestContextDataAppSec("dummy");
+        DDSpan span =
+                (DDSpan) tracer.buildSpan("datadog", "top").asChildOf(extracted).start();
+        PropagationTags dd = span.spanContext().getPropagationTags();
+
+        span.setSamplingPriority(newPriority, newMechanism);
+
+        assertEquals(newHeader, dd.headerValue(PropagationTags.HeaderType.DATADOG));
+        assertEquals(tagMap, dd.createTagMap());
+    }
+
+    @TableTest({
+      "scenario                        | priority     | header                              | newPriority  | newMechanism | rootHeader                          | rootTagMap                              ",
+      "UNSET->USER_KEEP                | UNSET        | _dd.p.usr=123                       | USER_KEEP    | MANUAL       | _dd.p.dm=-4,_dd.p.usr=123           | [_dd.p.dm: -4, _dd.p.usr: 123]          ",
+      "UNSET->SAMPLER_DROP             | UNSET        | _dd.p.usr=123                       | SAMPLER_DROP | DEFAULT      | _dd.p.usr=123                       | [_dd.p.usr: 123]                        ",
+      "SAMPLER_KEEP->USER_KEEP with dm | SAMPLER_KEEP | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | USER_KEEP    | MANUAL       | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | [_dd.p.dm: 9bf3439f2f-1, _dd.p.usr: 123]",
+      "SAMPLER_KEEP->USER_DROP with dm | SAMPLER_KEEP | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | USER_DROP    | MANUAL       | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | [_dd.p.dm: 9bf3439f2f-1, _dd.p.usr: 123]",
+      "SAMPLER_KEEP->USER_KEEP no dm   | SAMPLER_KEEP | _dd.p.usr=123                       | USER_KEEP    | MANUAL       | _dd.p.usr=123                       | [_dd.p.usr: 123]                        "
+    })
+    void updateTracePropagationTags(
+            String scenario,
+            int priority,
+            String header,
+            int newPriority,
+            int newMechanism,
+            String rootHeader,
+            Map<String, String> rootTagMap) {
+        PropagationTags propagationTags =
+                tracer.getPropagationTagsFactory().fromHeaderValue(PropagationTags.HeaderType.DATADOG, header);
+        AgentSpanContext extracted = new ExtractedContext(
+                        DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG)
+                .withRequestContextDataAppSec("dummy");
+        DDSpan rootSpan =
+                (DDSpan) tracer.buildSpan("datadog", "top").asChildOf(extracted).start();
+        PropagationTags ddRoot = rootSpan.spanContext().getPropagationTags();
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "current")
+                .asChildOf(rootSpan.spanContext())
+                .start();
+
+        span.setSamplingPriority(newPriority, newMechanism);
+
+        assertEquals(rootHeader, ddRoot.headerValue(PropagationTags.HeaderType.DATADOG));
+        assertEquals(rootTagMap, ddRoot.createTagMap());
     }
-    switch (value) {
-      case "UNSET":
-        return UNSET;
-      case "SAMPLER_KEEP":
-        return SAMPLER_KEEP;
-      case "SAMPLER_DROP":
-        return SAMPLER_DROP;
-      case "USER_DROP":
-        return USER_DROP;
-      case "USER_KEEP":
-        return USER_KEEP;
-      case "MANUAL":
-        return MANUAL;
-      case "DEFAULT":
-        return DEFAULT;
-      default:
-        throw new IllegalArgumentException("Value is invalid for " + value);
+
+    @TableTest({
+      "scenario             | priority     | header                              | newHeader                 | tagMap                        ",
+      "UNSET                | UNSET        | _dd.p.usr=123                       | _dd.p.dm=-4,_dd.p.usr=123 | [_dd.p.dm: -4, _dd.p.usr: 123]",
+      "SAMPLER_KEEP with dm | SAMPLER_KEEP | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | _dd.p.dm=-4,_dd.p.usr=123 | [_dd.p.dm: -4, _dd.p.usr: 123]",
+      "SAMPLER_KEEP no dm   | SAMPLER_KEEP | _dd.p.usr=123                       | _dd.p.dm=-4,_dd.p.usr=123 | [_dd.p.dm: -4, _dd.p.usr: 123]"
+    })
+    void forceKeepSpanPropagationTags(
+            String scenario, int priority, String header, String newHeader, Map<String, String> tagMap) {
+        PropagationTags propagationTags =
+                tracer.getPropagationTagsFactory().fromHeaderValue(PropagationTags.HeaderType.DATADOG, header);
+        AgentSpanContext extracted = new ExtractedContext(
+                        DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG)
+                .withRequestContextDataAppSec("dummy");
+        DDSpan span =
+                (DDSpan) tracer.buildSpan("datadog", "top").asChildOf(extracted).start();
+        PropagationTags dd = span.spanContext().getPropagationTags();
+
+        span.spanContext().forceKeep();
+
+        assertEquals(newHeader, dd.headerValue(PropagationTags.HeaderType.DATADOG));
+        assertEquals(tagMap, dd.createTagMap());
+    }
+
+    @TableTest({
+      "scenario             | priority     | header                              | newHeader                 | tagMap                        ",
+      "UNSET                | UNSET        | _dd.p.usr=123                       | _dd.p.dm=-4,_dd.p.usr=123 | [_dd.p.dm: -4, _dd.p.usr: 123]",
+      "SAMPLER_KEEP with dm | SAMPLER_KEEP | _dd.p.dm=9bf3439f2f-1,_dd.p.usr=123 | _dd.p.dm=-4,_dd.p.usr=123 | [_dd.p.dm: -4, _dd.p.usr: 123]",
+      "SAMPLER_KEEP no dm   | SAMPLER_KEEP | _dd.p.usr=123                       | _dd.p.dm=-4,_dd.p.usr=123 | [_dd.p.dm: -4, _dd.p.usr: 123]"
+    })
+    void forceKeepTracePropagationTags(
+            String scenario, int priority, String header, String rootHeader, Map<String, String> rootTagMap) {
+        PropagationTags propagationTags =
+                tracer.getPropagationTagsFactory().fromHeaderValue(PropagationTags.HeaderType.DATADOG, header);
+        AgentSpanContext extracted = new ExtractedContext(
+                        DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG)
+                .withRequestContextDataAppSec("dummy");
+        DDSpan rootSpan =
+                (DDSpan) tracer.buildSpan("datadog", "top").asChildOf(extracted).start();
+        PropagationTags ddRoot = rootSpan.spanContext().getPropagationTags();
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "current")
+                .asChildOf(rootSpan.spanContext())
+                .start();
+
+        span.spanContext().forceKeep();
+
+        assertEquals(rootHeader, ddRoot.headerValue(PropagationTags.HeaderType.DATADOG));
+        assertEquals(rootTagMap, ddRoot.createTagMap());
+    }
+
+    @TypeConverter
+    public static int toInt(String value) {
+        if (value == null) {
+            throw new IllegalArgumentException("Value cannot be null");
+        }
+        switch (value) {
+            case "UNSET":
+                return UNSET;
+            case "SAMPLER_KEEP":
+                return SAMPLER_KEEP;
+            case "SAMPLER_DROP":
+                return SAMPLER_DROP;
+            case "USER_DROP":
+                return USER_DROP;
+            case "USER_KEEP":
+                return USER_KEEP;
+            case "MANUAL":
+                return MANUAL;
+            case "DEFAULT":
+                return DEFAULT;
+            default:
+                throw new IllegalArgumentException("Value is invalid for " + value);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextTest.java b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextTest.java
index 030687c06ec..5620fb43936 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextTest.java
@@ -55,60 +55,57 @@
 @TypeConverterSources(TableTestTypeConverters.class)
 public class DDSpanContextTest extends DDCoreJavaSpecification {
 
-  private ListWriter writer;
-  private CoreTracer tracer;
-  private ProfilingContextIntegration profilingContextIntegration;
-
-  @BeforeEach
-  void setup() {
-    writer = new ListWriter();
-    profilingContextIntegration = mock(ProfilingContextIntegration.class);
-    tracer =
-        tracerBuilder()
-            .writer(writer)
-            .profilingContextIntegration(profilingContextIntegration)
-            .build();
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {DDTags.SERVICE_NAME, DDTags.RESOURCE_NAME, DDTags.SPAN_TYPE, "some.tag"})
-  void nullValuesForTagsDeleteExistingTags(String name) throws Exception {
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", "fakeOperation")
-            .withServiceName("fakeService")
-            .withResourceName("fakeResource")
-            .withSpanType("fakeType")
-            .start();
-    DDSpanContext context = (DDSpanContext) span.spanContext();
-
-    context.setTag("some.tag", "asdf");
-    context.setTag(name, null);
-    context.setErrorFlag(true, ErrorPriorities.DEFAULT);
-    span.finish();
-    writer.waitForTraces(1);
-
-    Map<String, Object> expectedTags = createExpectedTagsFromCurrentThread();
-    if (!"some.tag".equals(name)) {
-      expectedTags.put("some.tag", "asdf");
+    private ListWriter writer;
+    private CoreTracer tracer;
+    private ProfilingContextIntegration profilingContextIntegration;
+
+    @BeforeEach
+    void setup() {
+        writer = new ListWriter();
+        profilingContextIntegration = mock(ProfilingContextIntegration.class);
+        tracer = tracerBuilder()
+                .writer(writer)
+                .profilingContextIntegration(profilingContextIntegration)
+                .build();
     }
 
-    assertTagmap(context.getTags(), expectedTags);
-    assertEquals("fakeService", context.getServiceName());
-    assertEquals("fakeResource", context.getResourceName().toString());
-    assertEquals("fakeType", context.getSpanType().toString());
-  }
-
-  private static Map<String, Object> createExpectedTagsFromCurrentThread() {
-    Thread thread = Thread.currentThread();
-    Map<String, Object> expectedTags = new HashMap<>();
-    expectedTags.put(THREAD_NAME, thread.getName());
-    expectedTags.put(THREAD_ID, thread.getId());
-    expectedTags.put(DDTags.DD_SVC_SRC, ServiceNameSources.MANUAL);
-    return expectedTags;
-  }
-
-  // spotless:off
+    @ParameterizedTest
+    @ValueSource(strings = {DDTags.SERVICE_NAME, DDTags.RESOURCE_NAME, DDTags.SPAN_TYPE, "some.tag"})
+    void nullValuesForTagsDeleteExistingTags(String name) throws Exception {
+        AgentSpan span = tracer.buildSpan("datadog", "fakeOperation")
+                .withServiceName("fakeService")
+                .withResourceName("fakeResource")
+                .withSpanType("fakeType")
+                .start();
+        DDSpanContext context = (DDSpanContext) span.spanContext();
+
+        context.setTag("some.tag", "asdf");
+        context.setTag(name, null);
+        context.setErrorFlag(true, ErrorPriorities.DEFAULT);
+        span.finish();
+        writer.waitForTraces(1);
+
+        Map<String, Object> expectedTags = createExpectedTagsFromCurrentThread();
+        if (!"some.tag".equals(name)) {
+            expectedTags.put("some.tag", "asdf");
+        }
+
+        assertTagmap(context.getTags(), expectedTags);
+        assertEquals("fakeService", context.getServiceName());
+        assertEquals("fakeResource", context.getResourceName().toString());
+        assertEquals("fakeType", context.getSpanType().toString());
+    }
+
+    private static Map<String, Object> createExpectedTagsFromCurrentThread() {
+        Thread thread = Thread.currentThread();
+        Map<String, Object> expectedTags = new HashMap<>();
+        expectedTags.put(THREAD_NAME, thread.getName());
+        expectedTags.put(THREAD_ID, thread.getId());
+        expectedTags.put(DDTags.DD_SVC_SRC, ServiceNameSources.MANUAL);
+        return expectedTags;
+    }
+
+    // spotless:off
   @TableTest({
     "scenario          | name                          | expected              | method       ",
     "SERVICE_NAME tag  | " + DDTags.SERVICE_NAME   + " | different service  | serviceName  ",
@@ -116,468 +113,450 @@ private static Map<String, Object> createExpectedTagsFromCurrentThread() {
     "SPAN_TYPE tag     | " + DDTags.SPAN_TYPE      + " | different type     | spanType     "
   })
   //spotless:on
-  void specialTagsSetCertainValues(String scenario, String name, String expected, String method)
-      throws Exception {
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", "fakeOperation")
-            .withServiceName("fakeService")
-            .withResourceName("fakeResource")
-            .withSpanType("fakeType")
-            .start();
-    DDSpanContext context = (DDSpanContext) span.spanContext();
-
-    context.setTag(name, expected);
-    span.finish();
-    writer.waitForTraces(1);
-
-    Map<String, Object> expectedTags = createExpectedTagsFromCurrentThread();
-    assertTagmap(context.getTags(), expectedTags);
-
-    String value;
-    switch (method) {
-      case "serviceName":
-        value = context.getServiceName();
-        break;
-      case "resourceName":
-        value = context.getResourceName().toString();
-        break;
-      case "spanType":
-        value = context.getSpanType().toString();
-        break;
-      default:
-        throw new IllegalArgumentException("Unknown method: " + method);
+    void specialTagsSetCertainValues(String scenario, String name, String expected, String method) throws Exception {
+        AgentSpan span = tracer.buildSpan("datadog", "fakeOperation")
+                .withServiceName("fakeService")
+                .withResourceName("fakeResource")
+                .withSpanType("fakeType")
+                .start();
+        DDSpanContext context = (DDSpanContext) span.spanContext();
+
+        context.setTag(name, expected);
+        span.finish();
+        writer.waitForTraces(1);
+
+        Map<String, Object> expectedTags = createExpectedTagsFromCurrentThread();
+        assertTagmap(context.getTags(), expectedTags);
+
+        String value;
+        switch (method) {
+            case "serviceName":
+                value = context.getServiceName();
+                break;
+            case "resourceName":
+                value = context.getResourceName().toString();
+                break;
+            case "spanType":
+                value = context.getSpanType().toString();
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown method: " + method);
+        }
+        assertEquals(expected, value);
     }
-    assertEquals(expected, value);
-  }
-
-  static Object[][] tagsCanBeAddedToContextArguments() {
-    return new Object[][] {
-      {"tag.name", "some value"},
-      {"tag with int", 1234},
-      {"tag-with-bool", false},
-      {"tag_with_float", 0.321}
-    };
-  }
-
-  @ParameterizedTest
-  @MethodSource("tagsCanBeAddedToContextArguments")
-  void tagsCanBeAddedToContext(String name, Object value) throws Exception {
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", "fakeOperation")
-            .withServiceName("fakeService")
-            .withResourceName("fakeResource")
-            .withSpanType("fakeType")
-            .start();
-    DDSpanContext context = (DDSpanContext) span.spanContext();
-
-    context.setTag(name, value);
-    span.finish();
-    writer.waitForTraces(1);
-
-    Map<String, Object> expectedTags = createExpectedTagsFromCurrentThread();
-    expectedTags.put(name, value);
-    assertTagmap(context.getTags(), expectedTags);
-  }
 
-  @TableTest({
-    "expectedType      | value            ",
-    "java.lang.Integer | 0                ",
-    "java.lang.Integer | Integer.MAX_VALUE",
-    "java.lang.Integer | Integer.MIN_VALUE",
-    "java.lang.Short   | Short.MAX_VALUE  ",
-    "java.lang.Short   | Short.MIN_VALUE  ",
-    "java.lang.Float   | Float.MAX_VALUE  ",
-    "java.lang.Float   | Float.MIN_VALUE  ",
-    "java.lang.Double  | Double.MAX_VALUE ",
-    "java.lang.Double  | Double.MIN_VALUE ",
-    "java.lang.Float   | 1f               ",
-    "java.lang.Double  | 1d               ",
-    "java.lang.Float   | 0.5f             ",
-    "java.lang.Double  | 0.5d             ",
-    "java.lang.Integer | 0x55             "
-  })
-  void metricsUseExpectedTypes(Class<?> expectedType, Number value) {
-    // floats should be converted to doubles.
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", "fakeOperation")
-            .withServiceName("fakeService")
-            .withResourceName("fakeResource")
-            .start();
-    DDSpanContext context = (DDSpanContext) span.spanContext();
-
-    context.setMetric("test", value);
-
-    assertInstanceOf(expectedType, context.getTag("test"));
-
-    span.finish();
-  }
-
-  @Test
-  void forceKeepReallyKeepsTrace() {
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", "fakeOperation")
-            .withServiceName("fakeService")
-            .withResourceName("fakeResource")
-            .start();
-    DDSpanContext context = (DDSpanContext) span.spanContext();
-
-    context.setSamplingPriority(SAMPLER_DROP, DEFAULT);
-    assertEquals(SAMPLER_DROP, context.getSamplingPriority());
-
-    context.lockSamplingPriority();
-    assertFalse(context.setSamplingPriority(USER_DROP, MANUAL));
-    assertEquals(SAMPLER_DROP, context.getSamplingPriority());
-
-    context.forceKeep();
-    assertEquals(USER_KEEP, context.getSamplingPriority());
-
-    span.finish();
-  }
-
-  @Test
-  void setTraceSegmentTagsAndDataOnCorrectSpan() {
-    ExtractedContext extracted =
-        (ExtractedContext)
-            new ExtractedContext(
-                    DDTraceId.from(123),
-                    456,
-                    SAMPLER_KEEP,
-                    "789",
-                    tracer.getPropagationTagsFactory().empty(),
-                    DATADOG)
+    static Object[][] tagsCanBeAddedToContextArguments() {
+        return new Object[][] {
+            {"tag.name", "some value"},
+            {"tag with int", 1234},
+            {"tag-with-bool", false},
+            {"tag_with_float", 0.321}
+        };
+    }
+
+    @ParameterizedTest
+    @MethodSource("tagsCanBeAddedToContextArguments")
+    void tagsCanBeAddedToContext(String name, Object value) throws Exception {
+        AgentSpan span = tracer.buildSpan("datadog", "fakeOperation")
+                .withServiceName("fakeService")
+                .withResourceName("fakeResource")
+                .withSpanType("fakeType")
+                .start();
+        DDSpanContext context = (DDSpanContext) span.spanContext();
+
+        context.setTag(name, value);
+        span.finish();
+        writer.waitForTraces(1);
+
+        Map<String, Object> expectedTags = createExpectedTagsFromCurrentThread();
+        expectedTags.put(name, value);
+        assertTagmap(context.getTags(), expectedTags);
+    }
+
+    @TableTest({
+      "expectedType      | value            ",
+      "java.lang.Integer | 0                ",
+      "java.lang.Integer | Integer.MAX_VALUE",
+      "java.lang.Integer | Integer.MIN_VALUE",
+      "java.lang.Short   | Short.MAX_VALUE  ",
+      "java.lang.Short   | Short.MIN_VALUE  ",
+      "java.lang.Float   | Float.MAX_VALUE  ",
+      "java.lang.Float   | Float.MIN_VALUE  ",
+      "java.lang.Double  | Double.MAX_VALUE ",
+      "java.lang.Double  | Double.MIN_VALUE ",
+      "java.lang.Float   | 1f               ",
+      "java.lang.Double  | 1d               ",
+      "java.lang.Float   | 0.5f             ",
+      "java.lang.Double  | 0.5d             ",
+      "java.lang.Integer | 0x55             "
+    })
+    void metricsUseExpectedTypes(Class<?> expectedType, Number value) {
+        // floats should be converted to doubles.
+        AgentSpan span = tracer.buildSpan("datadog", "fakeOperation")
+                .withServiceName("fakeService")
+                .withResourceName("fakeResource")
+                .start();
+        DDSpanContext context = (DDSpanContext) span.spanContext();
+
+        context.setMetric("test", value);
+
+        assertInstanceOf(expectedType, context.getTag("test"));
+
+        span.finish();
+    }
+
+    @Test
+    void forceKeepReallyKeepsTrace() {
+        AgentSpan span = tracer.buildSpan("datadog", "fakeOperation")
+                .withServiceName("fakeService")
+                .withResourceName("fakeResource")
+                .start();
+        DDSpanContext context = (DDSpanContext) span.spanContext();
+
+        context.setSamplingPriority(SAMPLER_DROP, DEFAULT);
+        assertEquals(SAMPLER_DROP, context.getSamplingPriority());
+
+        context.lockSamplingPriority();
+        assertFalse(context.setSamplingPriority(USER_DROP, MANUAL));
+        assertEquals(SAMPLER_DROP, context.getSamplingPriority());
+
+        context.forceKeep();
+        assertEquals(USER_KEEP, context.getSamplingPriority());
+
+        span.finish();
+    }
+
+    @Test
+    void setTraceSegmentTagsAndDataOnCorrectSpan() {
+        ExtractedContext extracted = (ExtractedContext) new ExtractedContext(
+                        DDTraceId.from(123),
+                        456,
+                        SAMPLER_KEEP,
+                        "789",
+                        tracer.getPropagationTagsFactory().empty(),
+                        DATADOG)
                 .withRequestContextDataAppSec("dummy");
 
-    AgentSpan top =
-        tracer.buildSpan("datadog", "top").asChildOf((AgentSpanContext) extracted).start();
-    DDSpanContext topC = (DDSpanContext) top.spanContext();
-    TraceSegment topTS = top.getRequestContext().getTraceSegment();
-
-    AgentSpan current = tracer.buildSpan("datadog", "current").asChildOf(top.spanContext()).start();
-    TraceSegment currentTS = current.getRequestContext().getTraceSegment();
-    DDSpanContext currentC = (DDSpanContext) current.spanContext();
-
-    currentTS.setDataTop("ctd", "[1]");
-    currentTS.setTagTop("ctt", "t1");
-    currentTS.setDataCurrent("ccd", "[2]");
-    currentTS.setTagCurrent("cct", "t2");
-    topTS.setDataTop("ttd", "[3]");
-    topTS.setTagTop("ttt", "t3");
-    topTS.setDataCurrent("tcd", "[4]");
-    topTS.setTagCurrent("tct", "t4");
-
-    Map<String, Object> expectedTopTags = new HashMap<>();
-    expectedTopTags.put(dataTag("ctd"), "[1]");
-    expectedTopTags.put("ctt", "t1");
-    expectedTopTags.put(dataTag("ttd"), "[3]");
-    expectedTopTags.put("ttt", "t3");
-    expectedTopTags.put(dataTag("tcd"), "[4]");
-    expectedTopTags.put("tct", "t4");
-    assertTagmap(topC.getTags(), expectedTopTags, true);
-
-    Map<String, Object> expectedCurrentTags = new HashMap<>();
-    expectedCurrentTags.put(dataTag("ccd"), "[2]");
-    expectedCurrentTags.put("cct", "t2");
-    assertTagmap(currentC.getTags(), expectedCurrentTags, true);
-
-    current.finish();
-    top.finish();
-  }
+        AgentSpan top = tracer.buildSpan("datadog", "top")
+                .asChildOf((AgentSpanContext) extracted)
+                .start();
+        DDSpanContext topC = (DDSpanContext) top.spanContext();
+        TraceSegment topTS = top.getRequestContext().getTraceSegment();
+
+        AgentSpan current = tracer.buildSpan("datadog", "current")
+                .asChildOf(top.spanContext())
+                .start();
+        TraceSegment currentTS = current.getRequestContext().getTraceSegment();
+        DDSpanContext currentC = (DDSpanContext) current.spanContext();
+
+        currentTS.setDataTop("ctd", "[1]");
+        currentTS.setTagTop("ctt", "t1");
+        currentTS.setDataCurrent("ccd", "[2]");
+        currentTS.setTagCurrent("cct", "t2");
+        topTS.setDataTop("ttd", "[3]");
+        topTS.setTagTop("ttt", "t3");
+        topTS.setDataCurrent("tcd", "[4]");
+        topTS.setTagCurrent("tct", "t4");
+
+        Map<String, Object> expectedTopTags = new HashMap<>();
+        expectedTopTags.put(dataTag("ctd"), "[1]");
+        expectedTopTags.put("ctt", "t1");
+        expectedTopTags.put(dataTag("ttd"), "[3]");
+        expectedTopTags.put("ttt", "t3");
+        expectedTopTags.put(dataTag("tcd"), "[4]");
+        expectedTopTags.put("tct", "t4");
+        assertTagmap(topC.getTags(), expectedTopTags, true);
+
+        Map<String, Object> expectedCurrentTags = new HashMap<>();
+        expectedCurrentTags.put(dataTag("ccd"), "[2]");
+        expectedCurrentTags.put("cct", "t2");
+        assertTagmap(currentC.getTags(), expectedCurrentTags, true);
+
+        current.finish();
+        top.finish();
+    }
 
-  @TableTest({
-    "rate | limit            ",
-    "1.0  | 10               ",
-    "0.5  | 100              ",
-    "0.25 | Integer.MAX_VALUE"
-  })
-  void setSingleSpanSamplingTags(double rate, int limit) {
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", "fakeOperation")
-            .withServiceName("fakeService")
-            .withResourceName("fakeResource")
-            .start();
-    DDSpanContext context = (DDSpanContext) span.spanContext();
-    assertEquals(UNSET, context.getSamplingPriority());
-
-    context.setSpanSamplingPriority(rate, limit);
-
-    assertEquals((int) SPAN_SAMPLING_RATE, context.getTag(SPAN_SAMPLING_MECHANISM_TAG));
-    assertEquals(rate, context.getTag(SPAN_SAMPLING_RULE_RATE_TAG));
-    assertEquals(
-        limit == Integer.MAX_VALUE ? null : Double.valueOf(limit),
-        context.getTag(SPAN_SAMPLING_MAX_PER_SECOND_TAG));
-    // single span sampling should not change the trace sampling priority
-    assertEquals(UNSET, context.getSamplingPriority());
-    // make sure the `_dd.p.dm` tag has not been set by single span sampling
-    assertFalse(context.getPropagationTags().createTagMap().containsKey("_dd.p.dm"));
-
-    span.finish();
-  }
-
-  @Test
-  void settingResourceNameToNullIsIgnored() {
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", "fakeOperation")
-            .withServiceName("fakeService")
-            .withResourceName("fakeResource")
-            .start();
-
-    span.setResourceName(null);
-
-    assertEquals("fakeResource", ((DDSpan) span).getResourceName().toString());
-
-    span.finish();
-  }
-
-  @Test
-  void settingOperationNameTriggersConstantEncoding() {
-    when(profilingContextIntegration.encodeOperationName("fakeOperation")).thenReturn(1);
-    when(profilingContextIntegration.encodeResourceName("fakeResource")).thenReturn(-1);
-
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", "fakeOperation")
-            .withServiceName("fakeService")
-            .withResourceName("fakeResource")
-            .start();
-
-    verify(profilingContextIntegration, times(1)).encodeOperationName("fakeOperation");
-    verify(profilingContextIntegration, times(1)).encodeResourceName("fakeResource");
-    assertEquals(1, ((DDSpanContext) span.spanContext()).getEncodedOperationName());
-    assertEquals(-1, ((DDSpanContext) span.spanContext()).getEncodedResourceName());
-
-    when(profilingContextIntegration.encodeOperationName("newOperationName")).thenReturn(2);
-    span.setOperationName("newOperationName");
-
-    verify(profilingContextIntegration, times(1)).encodeOperationName("newOperationName");
-    assertEquals(2, ((DDSpanContext) span.spanContext()).getEncodedOperationName());
-
-    when(profilingContextIntegration.encodeResourceName("newResourceName")).thenReturn(-2);
-    span.setResourceName("newResourceName");
-
-    verify(profilingContextIntegration, times(1)).encodeResourceName("newResourceName");
-    assertEquals(-2, ((DDSpanContext) span.spanContext()).getEncodedResourceName());
-
-    span.finish();
-  }
-
-  @Test
-  void spanIdsPrintedAsUnsignedLong() {
-    AgentSpan parent =
-        tracer
-            .buildSpan("datadog", "fakeOperation")
-            .withServiceName("fakeService")
-            .withResourceName("fakeResource")
-            .withSpanId(-987654321)
-            .start();
-
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", "fakeOperation")
-            .withServiceName("fakeService")
-            .withResourceName("fakeResource")
-            .withSpanId(-123456789)
-            .asChildOf(parent.spanContext())
-            .start();
-
-    DDSpanContext context = (DDSpanContext) span.spanContext();
-
-    // even though span ID and parent ID are setup as negative numbers, they should be printed as
-    // their unsigned value
-    // asserting there is no negative sign after ids is the best I can do.
-    assertFalse(context.toString().contains("id=-"));
-
-    span.finish();
-    parent.finish();
-  }
-
-  @Test
-  void serviceNameSourceIsPropagatedFromParentToChildSpan() {
-    AgentSpan parent =
-        tracer.buildSpan("datadog", "parentOperation").withServiceName("fakeService").start();
-
-    AgentSpan child =
-        tracer.buildSpan("datadog", "childOperation").asChildOf(parent.spanContext()).start();
-    DDSpanContext childContext = (DDSpanContext) child.spanContext();
-
-    assertEquals(ServiceNameSources.MANUAL, childContext.getServiceNameSource());
-
-    child.finish();
-    parent.finish();
-  }
-
-  @Test
-  void spanKindOrdinalConstantsAndSpanKindValuesArrayStayInSync() {
-    // SPAN_KIND_VALUES array covers all ordinals
-    assertEquals(DDSpanContext.SPAN_KIND_CUSTOM + 1, SPAN_KIND_VALUES.length);
-
-    // each known ordinal maps to the correct Tags constant"
-    assertEquals(Tags.SPAN_KIND_SERVER, SPAN_KIND_VALUES[DDSpanContext.SPAN_KIND_SERVER]);
-    assertEquals(Tags.SPAN_KIND_CLIENT, SPAN_KIND_VALUES[DDSpanContext.SPAN_KIND_CLIENT]);
-    assertEquals(Tags.SPAN_KIND_PRODUCER, SPAN_KIND_VALUES[DDSpanContext.SPAN_KIND_PRODUCER]);
-    assertEquals(Tags.SPAN_KIND_CONSUMER, SPAN_KIND_VALUES[DDSpanContext.SPAN_KIND_CONSUMER]);
-    assertEquals(Tags.SPAN_KIND_INTERNAL, SPAN_KIND_VALUES[DDSpanContext.SPAN_KIND_INTERNAL]);
-    assertEquals(Tags.SPAN_KIND_BROKER, SPAN_KIND_VALUES[DDSpanContext.SPAN_KIND_BROKER]);
-
-    // UNSET and CUSTOM map to null
-    assertNull(SPAN_KIND_VALUES[DDSpanContext.SPAN_KIND_UNSET]);
-    assertNull(SPAN_KIND_VALUES[DDSpanContext.SPAN_KIND_CUSTOM]);
-  }
+    @TableTest({
+      "rate | limit            ",
+      "1.0  | 10               ",
+      "0.5  | 100              ",
+      "0.25 | Integer.MAX_VALUE"
+    })
+    void setSingleSpanSamplingTags(double rate, int limit) {
+        AgentSpan span = tracer.buildSpan("datadog", "fakeOperation")
+                .withServiceName("fakeService")
+                .withResourceName("fakeResource")
+                .start();
+        DDSpanContext context = (DDSpanContext) span.spanContext();
+        assertEquals(UNSET, context.getSamplingPriority());
+
+        context.setSpanSamplingPriority(rate, limit);
+
+        assertEquals((int) SPAN_SAMPLING_RATE, context.getTag(SPAN_SAMPLING_MECHANISM_TAG));
+        assertEquals(rate, context.getTag(SPAN_SAMPLING_RULE_RATE_TAG));
+        assertEquals(
+                limit == Integer.MAX_VALUE ? null : Double.valueOf(limit),
+                context.getTag(SPAN_SAMPLING_MAX_PER_SECOND_TAG));
+        // single span sampling should not change the trace sampling priority
+        assertEquals(UNSET, context.getSamplingPriority());
+        // make sure the `_dd.p.dm` tag has not been set by single span sampling
+        assertFalse(context.getPropagationTags().createTagMap().containsKey("_dd.p.dm"));
+
+        span.finish();
+    }
 
-  @TableTest({
-    "scenario | kindString | expectedOrdinal                 ",
-    "server   | server     | DDSpanContext.SPAN_KIND_SERVER  ",
-    "client   | client     | DDSpanContext.SPAN_KIND_CLIENT  ",
-    "producer | producer   | DDSpanContext.SPAN_KIND_PRODUCER",
-    "consumer | consumer   | DDSpanContext.SPAN_KIND_CONSUMER",
-    "internal | internal   | DDSpanContext.SPAN_KIND_INTERNAL",
-    "broker   | broker     | DDSpanContext.SPAN_KIND_BROKER  "
-  })
-  void setSpanKindOrdinalRoundTripsWithSpanKindValues(
-      String scenario, String kindString, int expectedOrdinal) {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    DDSpanContext context = (DDSpanContext) span.spanContext();
-    context.setSpanKindOrdinal(kindString);
-
-    assertEquals(expectedOrdinal, context.getSpanKindOrdinal());
-    assertEquals(kindString, SPAN_KIND_VALUES[expectedOrdinal]);
-
-    span.finish();
-  }
-
-  @Test
-  void builderLedgerRemovalOfSpanKindClearsCachedOrdinal() {
-    // Setting then nulling span.kind on the same builder routes through
-    // setAllTags(TagMap.Ledger) at construction time. The removal path must
-    // keep the cached ordinal in sync with unsafeTags, otherwise eligibility
-    // checks that read the cached byte see a stale kind.
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", "test")
-            .withTag(SPAN_KIND, Tags.SPAN_KIND_CLIENT)
-            .withTag(SPAN_KIND, (Object) null)
-            .start();
-    DDSpanContext context = (DDSpanContext) span.spanContext();
-
-    assertNull(context.getTag(SPAN_KIND));
-    assertEquals(DDSpanContext.SPAN_KIND_UNSET, context.getSpanKindOrdinal());
-
-    span.finish();
-  }
-
-  @TypeConverter
-  public static int toInt(String value) {
-    if (value == null) {
-      throw new IllegalArgumentException("Value cannot be null");
+    @Test
+    void settingResourceNameToNullIsIgnored() {
+        AgentSpan span = tracer.buildSpan("datadog", "fakeOperation")
+                .withServiceName("fakeService")
+                .withResourceName("fakeResource")
+                .start();
+
+        span.setResourceName(null);
+
+        assertEquals("fakeResource", ((DDSpan) span).getResourceName().toString());
+
+        span.finish();
+    }
+
+    @Test
+    void settingOperationNameTriggersConstantEncoding() {
+        when(profilingContextIntegration.encodeOperationName("fakeOperation")).thenReturn(1);
+        when(profilingContextIntegration.encodeResourceName("fakeResource")).thenReturn(-1);
+
+        AgentSpan span = tracer.buildSpan("datadog", "fakeOperation")
+                .withServiceName("fakeService")
+                .withResourceName("fakeResource")
+                .start();
+
+        verify(profilingContextIntegration, times(1)).encodeOperationName("fakeOperation");
+        verify(profilingContextIntegration, times(1)).encodeResourceName("fakeResource");
+        assertEquals(1, ((DDSpanContext) span.spanContext()).getEncodedOperationName());
+        assertEquals(-1, ((DDSpanContext) span.spanContext()).getEncodedResourceName());
+
+        when(profilingContextIntegration.encodeOperationName("newOperationName"))
+                .thenReturn(2);
+        span.setOperationName("newOperationName");
+
+        verify(profilingContextIntegration, times(1)).encodeOperationName("newOperationName");
+        assertEquals(2, ((DDSpanContext) span.spanContext()).getEncodedOperationName());
+
+        when(profilingContextIntegration.encodeResourceName("newResourceName")).thenReturn(-2);
+        span.setResourceName("newResourceName");
+
+        verify(profilingContextIntegration, times(1)).encodeResourceName("newResourceName");
+        assertEquals(-2, ((DDSpanContext) span.spanContext()).getEncodedResourceName());
+
+        span.finish();
+    }
+
+    @Test
+    void spanIdsPrintedAsUnsignedLong() {
+        AgentSpan parent = tracer.buildSpan("datadog", "fakeOperation")
+                .withServiceName("fakeService")
+                .withResourceName("fakeResource")
+                .withSpanId(-987654321)
+                .start();
+
+        AgentSpan span = tracer.buildSpan("datadog", "fakeOperation")
+                .withServiceName("fakeService")
+                .withResourceName("fakeResource")
+                .withSpanId(-123456789)
+                .asChildOf(parent.spanContext())
+                .start();
+
+        DDSpanContext context = (DDSpanContext) span.spanContext();
+
+        // even though span ID and parent ID are setup as negative numbers, they should be printed as
+        // their unsigned value
+        // asserting there is no negative sign after ids is the best I can do.
+        assertFalse(context.toString().contains("id=-"));
+
+        span.finish();
+        parent.finish();
+    }
+
+    @Test
+    void serviceNameSourceIsPropagatedFromParentToChildSpan() {
+        AgentSpan parent = tracer.buildSpan("datadog", "parentOperation")
+                .withServiceName("fakeService")
+                .start();
+
+        AgentSpan child = tracer.buildSpan("datadog", "childOperation")
+                .asChildOf(parent.spanContext())
+                .start();
+        DDSpanContext childContext = (DDSpanContext) child.spanContext();
+
+        assertEquals(ServiceNameSources.MANUAL, childContext.getServiceNameSource());
+
+        child.finish();
+        parent.finish();
+    }
+
+    @Test
+    void spanKindOrdinalConstantsAndSpanKindValuesArrayStayInSync() {
+        // SPAN_KIND_VALUES array covers all ordinals
+        assertEquals(DDSpanContext.SPAN_KIND_CUSTOM + 1, SPAN_KIND_VALUES.length);
+
+        // each known ordinal maps to the correct Tags constant"
+        assertEquals(Tags.SPAN_KIND_SERVER, SPAN_KIND_VALUES[DDSpanContext.SPAN_KIND_SERVER]);
+        assertEquals(Tags.SPAN_KIND_CLIENT, SPAN_KIND_VALUES[DDSpanContext.SPAN_KIND_CLIENT]);
+        assertEquals(Tags.SPAN_KIND_PRODUCER, SPAN_KIND_VALUES[DDSpanContext.SPAN_KIND_PRODUCER]);
+        assertEquals(Tags.SPAN_KIND_CONSUMER, SPAN_KIND_VALUES[DDSpanContext.SPAN_KIND_CONSUMER]);
+        assertEquals(Tags.SPAN_KIND_INTERNAL, SPAN_KIND_VALUES[DDSpanContext.SPAN_KIND_INTERNAL]);
+        assertEquals(Tags.SPAN_KIND_BROKER, SPAN_KIND_VALUES[DDSpanContext.SPAN_KIND_BROKER]);
+
+        // UNSET and CUSTOM map to null
+        assertNull(SPAN_KIND_VALUES[DDSpanContext.SPAN_KIND_UNSET]);
+        assertNull(SPAN_KIND_VALUES[DDSpanContext.SPAN_KIND_CUSTOM]);
     }
-    switch (value) {
-      case "DDSpanContext.SPAN_KIND_SERVER":
-        return DDSpanContext.SPAN_KIND_SERVER;
-      case "DDSpanContext.SPAN_KIND_CLIENT":
-        return DDSpanContext.SPAN_KIND_CLIENT;
-      case "DDSpanContext.SPAN_KIND_PRODUCER":
-        return DDSpanContext.SPAN_KIND_PRODUCER;
-      case "DDSpanContext.SPAN_KIND_CONSUMER":
-        return DDSpanContext.SPAN_KIND_CONSUMER;
-      case "DDSpanContext.SPAN_KIND_BROKER":
-        return DDSpanContext.SPAN_KIND_BROKER;
-      case "DDSpanContext.SPAN_KIND_INTERNAL":
-        return DDSpanContext.SPAN_KIND_INTERNAL;
-      default:
-        return TableTestTypeConverters.toInt(value);
+
+    @TableTest({
+      "scenario | kindString | expectedOrdinal                 ",
+      "server   | server     | DDSpanContext.SPAN_KIND_SERVER  ",
+      "client   | client     | DDSpanContext.SPAN_KIND_CLIENT  ",
+      "producer | producer   | DDSpanContext.SPAN_KIND_PRODUCER",
+      "consumer | consumer   | DDSpanContext.SPAN_KIND_CONSUMER",
+      "internal | internal   | DDSpanContext.SPAN_KIND_INTERNAL",
+      "broker   | broker     | DDSpanContext.SPAN_KIND_BROKER  "
+    })
+    void setSpanKindOrdinalRoundTripsWithSpanKindValues(String scenario, String kindString, int expectedOrdinal) {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        DDSpanContext context = (DDSpanContext) span.spanContext();
+        context.setSpanKindOrdinal(kindString);
+
+        assertEquals(expectedOrdinal, context.getSpanKindOrdinal());
+        assertEquals(kindString, SPAN_KIND_VALUES[expectedOrdinal]);
+
+        span.finish();
     }
-  }
-
-  @ParameterizedTest
-  @ValueSource(
-      strings = {
-        Tags.SPAN_KIND_SERVER,
-        Tags.SPAN_KIND_CLIENT,
-        Tags.SPAN_KIND_PRODUCER,
-        Tags.SPAN_KIND_CONSUMER,
-        Tags.SPAN_KIND_INTERNAL,
-        Tags.SPAN_KIND_BROKER
-      })
-  void setTagAndGetTagRoundTripForSpanKind(String kindString) {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    span.setTag(SPAN_KIND, kindString);
-
-    assertEquals(kindString, span.getTag(SPAN_KIND));
-
-    span.finish();
-  }
-
-  @Test
-  void getTagReturnsNullWhenSpanKindNotSet() {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-
-    assertNull(span.getTag(SPAN_KIND));
-
-    span.finish();
-  }
-
-  @ParameterizedTest
-  @ValueSource(
-      strings = {
-        Tags.SPAN_KIND_SERVER,
-        Tags.SPAN_KIND_CLIENT,
-        Tags.SPAN_KIND_PRODUCER,
-        Tags.SPAN_KIND_CONSUMER,
-        Tags.SPAN_KIND_INTERNAL,
-        Tags.SPAN_KIND_BROKER
-      })
-  void setTagThenRemoveTagClearsSpanKind(String kindString) {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    span.setTag(SPAN_KIND, kindString);
-
-    assertEquals(kindString, span.getTag(SPAN_KIND));
-
-    ((DDSpan) span).spanContext().removeTag(SPAN_KIND);
-
-    assertNull(span.getTag(SPAN_KIND));
-
-    span.finish();
-  }
-
-  @Test
-  void setTagWithCustomSpanKindFallsBackToTagMap() {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    span.setTag(SPAN_KIND, "custom-kind");
-
-    assertEquals("custom-kind", span.getTag(SPAN_KIND));
-
-    span.finish();
-  }
-
-  static void assertTagmap(Map<?, ?> source, Map<?, ?> comparison) {
-    assertTagmap(source, comparison, false);
-  }
-
-  static void assertTagmap(Map<?, ?> source, Map<?, ?> comparison, boolean removeThread) {
-    Map<Object, Object> sourceWithoutCommonTags = new HashMap<>(source);
-    sourceWithoutCommonTags.remove("runtime-id");
-    sourceWithoutCommonTags.remove("language");
-    sourceWithoutCommonTags.remove("_dd.agent_psr");
-    sourceWithoutCommonTags.remove("_sample_rate");
-    sourceWithoutCommonTags.remove("process_id");
-    sourceWithoutCommonTags.remove("_dd.trace_span_attribute_schema");
-    sourceWithoutCommonTags.remove(PROFILING_ENABLED);
-    sourceWithoutCommonTags.remove(PROFILING_CONTEXT_ENGINE);
-    sourceWithoutCommonTags.remove(DSM_ENABLED);
-    sourceWithoutCommonTags.remove(DJM_ENABLED);
-    if (removeThread) {
-      sourceWithoutCommonTags.remove(THREAD_ID);
-      sourceWithoutCommonTags.remove(THREAD_NAME);
+
+    @Test
+    void builderLedgerRemovalOfSpanKindClearsCachedOrdinal() {
+        // Setting then nulling span.kind on the same builder routes through
+        // setAllTags(TagMap.Ledger) at construction time. The removal path must
+        // keep the cached ordinal in sync with unsafeTags, otherwise eligibility
+        // checks that read the cached byte see a stale kind.
+        AgentSpan span = tracer.buildSpan("datadog", "test")
+                .withTag(SPAN_KIND, Tags.SPAN_KIND_CLIENT)
+                .withTag(SPAN_KIND, (Object) null)
+                .start();
+        DDSpanContext context = (DDSpanContext) span.spanContext();
+
+        assertNull(context.getTag(SPAN_KIND));
+        assertEquals(DDSpanContext.SPAN_KIND_UNSET, context.getSpanKindOrdinal());
+
+        span.finish();
+    }
+
+    @TypeConverter
+    public static int toInt(String value) {
+        if (value == null) {
+            throw new IllegalArgumentException("Value cannot be null");
+        }
+        switch (value) {
+            case "DDSpanContext.SPAN_KIND_SERVER":
+                return DDSpanContext.SPAN_KIND_SERVER;
+            case "DDSpanContext.SPAN_KIND_CLIENT":
+                return DDSpanContext.SPAN_KIND_CLIENT;
+            case "DDSpanContext.SPAN_KIND_PRODUCER":
+                return DDSpanContext.SPAN_KIND_PRODUCER;
+            case "DDSpanContext.SPAN_KIND_CONSUMER":
+                return DDSpanContext.SPAN_KIND_CONSUMER;
+            case "DDSpanContext.SPAN_KIND_BROKER":
+                return DDSpanContext.SPAN_KIND_BROKER;
+            case "DDSpanContext.SPAN_KIND_INTERNAL":
+                return DDSpanContext.SPAN_KIND_INTERNAL;
+            default:
+                return TableTestTypeConverters.toInt(value);
+        }
     }
-    assertEquals(comparison, sourceWithoutCommonTags);
-  }
 
-  private static String dataTag(String tag) {
-    return "_dd." + tag + ".json";
-  }
+    @ParameterizedTest
+    @ValueSource(
+            strings = {
+                Tags.SPAN_KIND_SERVER,
+                Tags.SPAN_KIND_CLIENT,
+                Tags.SPAN_KIND_PRODUCER,
+                Tags.SPAN_KIND_CONSUMER,
+                Tags.SPAN_KIND_INTERNAL,
+                Tags.SPAN_KIND_BROKER
+            })
+    void setTagAndGetTagRoundTripForSpanKind(String kindString) {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        span.setTag(SPAN_KIND, kindString);
+
+        assertEquals(kindString, span.getTag(SPAN_KIND));
+
+        span.finish();
+    }
+
+    @Test
+    void getTagReturnsNullWhenSpanKindNotSet() {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+
+        assertNull(span.getTag(SPAN_KIND));
+
+        span.finish();
+    }
+
+    @ParameterizedTest
+    @ValueSource(
+            strings = {
+                Tags.SPAN_KIND_SERVER,
+                Tags.SPAN_KIND_CLIENT,
+                Tags.SPAN_KIND_PRODUCER,
+                Tags.SPAN_KIND_CONSUMER,
+                Tags.SPAN_KIND_INTERNAL,
+                Tags.SPAN_KIND_BROKER
+            })
+    void setTagThenRemoveTagClearsSpanKind(String kindString) {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        span.setTag(SPAN_KIND, kindString);
+
+        assertEquals(kindString, span.getTag(SPAN_KIND));
+
+        ((DDSpan) span).spanContext().removeTag(SPAN_KIND);
+
+        assertNull(span.getTag(SPAN_KIND));
+
+        span.finish();
+    }
+
+    @Test
+    void setTagWithCustomSpanKindFallsBackToTagMap() {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        span.setTag(SPAN_KIND, "custom-kind");
+
+        assertEquals("custom-kind", span.getTag(SPAN_KIND));
+
+        span.finish();
+    }
+
+    static void assertTagmap(Map<?, ?> source, Map<?, ?> comparison) {
+        assertTagmap(source, comparison, false);
+    }
+
+    static void assertTagmap(Map<?, ?> source, Map<?, ?> comparison, boolean removeThread) {
+        Map<Object, Object> sourceWithoutCommonTags = new HashMap<>(source);
+        sourceWithoutCommonTags.remove("runtime-id");
+        sourceWithoutCommonTags.remove("language");
+        sourceWithoutCommonTags.remove("_dd.agent_psr");
+        sourceWithoutCommonTags.remove("_sample_rate");
+        sourceWithoutCommonTags.remove("process_id");
+        sourceWithoutCommonTags.remove("_dd.trace_span_attribute_schema");
+        sourceWithoutCommonTags.remove(PROFILING_ENABLED);
+        sourceWithoutCommonTags.remove(PROFILING_CONTEXT_ENGINE);
+        sourceWithoutCommonTags.remove(DSM_ENABLED);
+        sourceWithoutCommonTags.remove(DJM_ENABLED);
+        if (removeThread) {
+            sourceWithoutCommonTags.remove(THREAD_ID);
+            sourceWithoutCommonTags.remove(THREAD_NAME);
+        }
+        assertEquals(comparison, sourceWithoutCommonTags);
+    }
+
+    private static String dataTag(String tag) {
+        return "_dd." + tag + ".json";
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanLinkTest.java b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanLinkTest.java
index 5c16dc08e1f..07f9f9c4f4b 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanLinkTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanLinkTest.java
@@ -41,210 +41,202 @@
 
 class DDSpanLinkTest extends DDCoreJavaSpecification {
 
-  private static final int SPAN_LINK_TAG_MAX_LENGTH = 25_000;
-  private static final ObjectMapper JSON_MAPPER = new ObjectMapper();
-  private static final CollectionType SPAN_LINK_LIST_TYPE =
-      JSON_MAPPER.getTypeFactory().constructCollectionType(List.class, SpanLinkAsTag.class);
-
-  private ListWriter writer;
-  private CoreTracer tracer;
-
-  @BeforeEach
-  void setup() {
-    this.writer = new ListWriter();
-    this.tracer = tracerBuilder().writer(this.writer).build();
-  }
-
-  @AfterEach
-  void cleanupTest() {
-    this.writer.clear();
-  }
-
-  @TableTest({
-    "scenario    | sampled | traceFlags | sample",
-    "sampled     | true    | '01'       | '1'   ",
-    "not sampled | false   | '00'       | '-1'  "
-  })
-  void createSpanLinkFromExtractedContext(boolean sampled, String traceFlags, String sample) {
-    String traceId = "11223344556677889900aabbccddeeff";
-    String spanId = "123456789abcdef0";
-    String traceState = "dd=s:" + sample + ";o:some;t.dm:-4";
-
-    Map<String, String> headers = new HashMap<>();
-    headers.put(TRACE_PARENT_KEY.toUpperCase(), "00-" + traceId + "-" + spanId + "-" + traceFlags);
-    headers.put(TRACE_STATE_KEY.toUpperCase(), traceState);
-    HttpCodec.Extractor extractor =
-        newW3cHttpCodecExtractor(
-            Config.get(), () -> DynamicConfig.create().apply().captureTraceConfig());
-
-    ExtractedContext context = (ExtractedContext) extractor.extract(headers, stringValuesMap());
-    SpanLink link = DDSpanLink.from(context);
-
-    assertEquals(DDTraceId.fromHex(traceId), link.traceId());
-    assertEquals(DDSpanId.fromHex(spanId), link.spanId());
-    assertEquals(sampled ? SAMPLED_FLAG : DEFAULT_FLAGS, link.traceFlags());
-    assertEquals(traceState + ";t.tid:" + traceId.substring(0, 16), link.traceState());
-  }
-
-  @Test
-  void testSpanLinkEncodingTagMaxSize() throws Exception {
-    int tooManyLinkCount = 300;
-    SpanBuilder builder = tracer.buildSpan("test", "operation");
-    List<SpanLink> links =
-        IntStream.range(0, tooManyLinkCount)
-            .mapToObj(this::createLink)
-            .peek(builder::withLink)
-            .collect(toList());
-    AgentSpan span = builder.start();
-    span.finish();
-    this.writer.waitForTraces(1);
-
-    assertEquals(1, this.writer.get(0).size());
-    String spanLinksTag = (String) this.writer.get(0).get(0).getTag(SPAN_LINKS);
-    List<SpanLinkAsTag> decodedSpanLinks = deserializeSpanLinks(spanLinksTag);
-
-    assertTrue(spanLinksTag.length() < SPAN_LINK_TAG_MAX_LENGTH);
-    assertTrue(decodedSpanLinks.size() < tooManyLinkCount);
-    assertTrue(
-        (double) spanLinksTag.length() / decodedSpanLinks.size() * (decodedSpanLinks.size() + 1)
-            > SPAN_LINK_TAG_MAX_LENGTH);
-    for (int i = 0; i < decodedSpanLinks.size(); i++) {
-      assertLink(links.get(i), decodedSpanLinks.get(i));
+    private static final int SPAN_LINK_TAG_MAX_LENGTH = 25_000;
+    private static final ObjectMapper JSON_MAPPER = new ObjectMapper();
+    private static final CollectionType SPAN_LINK_LIST_TYPE =
+            JSON_MAPPER.getTypeFactory().constructCollectionType(List.class, SpanLinkAsTag.class);
+
+    private ListWriter writer;
+    private CoreTracer tracer;
+
+    @BeforeEach
+    void setup() {
+        this.writer = new ListWriter();
+        this.tracer = tracerBuilder().writer(this.writer).build();
     }
-  }
-
-  @Test
-  void testSpanLinksEncodingPadsSpanId() throws Exception {
-    // A span id below 2^60 has a leading zero nibble. Long.toHexString would drop it and emit a
-    // 15-character id, which consumers expecting fixed-width hex reject.
-    String traceId = "11223344556677889900aabbccddeeff";
-    String spanId = "0a2b3c4d5e6f7a8b";
-    SpanLink link =
-        new DDSpanLink(
-            DDTraceId.fromHex(traceId), DDSpanId.fromHex(spanId), DEFAULT_FLAGS, "", EMPTY);
-    this.tracer.buildSpan("test", "operation").withLink(link).start().finish();
-    this.writer.waitForTraces(1);
-
-    assertEquals(1, this.writer.get(0).size());
-    String spanLinksTag = (String) writer.get(0).get(0).getTag(SPAN_LINKS);
-    assertEquals(
-        "[{\"span_id\":\"" + spanId + "\",\"trace_id\":\"" + traceId + "\"}]", spanLinksTag);
-  }
-
-  @Test
-  void testSpanLinksEncodingOmittedEmptyKeys() throws Exception {
-    SpanLink link =
-        new DDSpanLink(
-            DDTraceId.fromHex("11223344556677889900aabbccddeeff"),
-            DDSpanId.fromHex("123456789abcdef0"),
-            DEFAULT_FLAGS,
-            "",
-            EMPTY);
-    this.tracer.buildSpan("test", "operation").withLink(link).start().finish();
-    this.writer.waitForTraces(1);
-
-    assertEquals(1, this.writer.get(0).size());
-    String spanLinksTag = (String) writer.get(0).get(0).getTag(SPAN_LINKS);
-    assertEquals(
-        "[{\"span_id\":\"123456789abcdef0\",\"trace_id\":\"11223344556677889900aabbccddeeff\"}]",
-        spanLinksTag);
-  }
-
-  @TableTest({
-    "scenario               | beforeStart | afterStart",
-    "no links               | false       | false     ",
-    "link before start only | true        | false     ",
-    "link after start only  | false       | true      ",
-    "links before and after | true        | true      "
-  })
-  @ParameterizedTest(name = "add span link at any time [{index}]")
-  void addSpanLinkAtAnyTime(boolean beforeStart, boolean afterStart) throws Exception {
-    SpanBuilder builder = this.tracer.buildSpan("test", "operation");
-    List<SpanLink> links = new ArrayList<>();
-
-    if (beforeStart) {
-      SpanLink link = createLink(0);
-      builder.withLink(link);
-      links.add(link);
+
+    @AfterEach
+    void cleanupTest() {
+        this.writer.clear();
     }
-    AgentSpan span = builder.start();
-    if (afterStart) {
-      SpanLink link = createLink(1);
-      span.addLink(link);
-      links.add(link);
+
+    @TableTest({
+      "scenario    | sampled | traceFlags | sample",
+      "sampled     | true    | '01'       | '1'   ",
+      "not sampled | false   | '00'       | '-1'  "
+    })
+    void createSpanLinkFromExtractedContext(boolean sampled, String traceFlags, String sample) {
+        String traceId = "11223344556677889900aabbccddeeff";
+        String spanId = "123456789abcdef0";
+        String traceState = "dd=s:" + sample + ";o:some;t.dm:-4";
+
+        Map<String, String> headers = new HashMap<>();
+        headers.put(TRACE_PARENT_KEY.toUpperCase(), "00-" + traceId + "-" + spanId + "-" + traceFlags);
+        headers.put(TRACE_STATE_KEY.toUpperCase(), traceState);
+        HttpCodec.Extractor extractor = newW3cHttpCodecExtractor(
+                Config.get(), () -> DynamicConfig.create().apply().captureTraceConfig());
+
+        ExtractedContext context = (ExtractedContext) extractor.extract(headers, stringValuesMap());
+        SpanLink link = DDSpanLink.from(context);
+
+        assertEquals(DDTraceId.fromHex(traceId), link.traceId());
+        assertEquals(DDSpanId.fromHex(spanId), link.spanId());
+        assertEquals(sampled ? SAMPLED_FLAG : DEFAULT_FLAGS, link.traceFlags());
+        assertEquals(traceState + ";t.tid:" + traceId.substring(0, 16), link.traceState());
     }
-    span.finish();
-    this.writer.waitForTraces(1);
 
-    assertEquals(1, this.writer.get(0).size());
-    String spanLinksTag = (String) this.writer.get(0).get(0).getTag(SPAN_LINKS);
-    List<SpanLinkAsTag> decodedSpanLinks = deserializeSpanLinks(spanLinksTag);
+    @Test
+    void testSpanLinkEncodingTagMaxSize() throws Exception {
+        int tooManyLinkCount = 300;
+        SpanBuilder builder = tracer.buildSpan("test", "operation");
+        List<SpanLink> links = IntStream.range(0, tooManyLinkCount)
+                .mapToObj(this::createLink)
+                .peek(builder::withLink)
+                .collect(toList());
+        AgentSpan span = builder.start();
+        span.finish();
+        this.writer.waitForTraces(1);
+
+        assertEquals(1, this.writer.get(0).size());
+        String spanLinksTag = (String) this.writer.get(0).get(0).getTag(SPAN_LINKS);
+        List<SpanLinkAsTag> decodedSpanLinks = deserializeSpanLinks(spanLinksTag);
+
+        assertTrue(spanLinksTag.length() < SPAN_LINK_TAG_MAX_LENGTH);
+        assertTrue(decodedSpanLinks.size() < tooManyLinkCount);
+        assertTrue((double) spanLinksTag.length() / decodedSpanLinks.size() * (decodedSpanLinks.size() + 1)
+                > SPAN_LINK_TAG_MAX_LENGTH);
+        for (int i = 0; i < decodedSpanLinks.size(); i++) {
+            assertLink(links.get(i), decodedSpanLinks.get(i));
+        }
+    }
 
-    int expectedLinkCount = (beforeStart ? 1 : 0) + (afterStart ? 1 : 0);
-    assertEquals(expectedLinkCount, decodedSpanLinks.size());
-    for (int i = 0; i < decodedSpanLinks.size(); i++) {
-      assertLink(links.get(i), decodedSpanLinks.get(i));
+    @Test
+    void testSpanLinksEncodingPadsSpanId() throws Exception {
+        // A span id below 2^60 has a leading zero nibble. Long.toHexString would drop it and emit a
+        // 15-character id, which consumers expecting fixed-width hex reject.
+        String traceId = "11223344556677889900aabbccddeeff";
+        String spanId = "0a2b3c4d5e6f7a8b";
+        SpanLink link = new DDSpanLink(DDTraceId.fromHex(traceId), DDSpanId.fromHex(spanId), DEFAULT_FLAGS, "", EMPTY);
+        this.tracer.buildSpan("test", "operation").withLink(link).start().finish();
+        this.writer.waitForTraces(1);
+
+        assertEquals(1, this.writer.get(0).size());
+        String spanLinksTag = (String) writer.get(0).get(0).getTag(SPAN_LINKS);
+        assertEquals("[{\"span_id\":\"" + spanId + "\",\"trace_id\":\"" + traceId + "\"}]", spanLinksTag);
     }
-  }
-
-  @Test
-  void filterNullLinks() throws Exception {
-    SpanBuilder builder = this.tracer.buildSpan("test", "operation");
-
-    AgentSpan span = builder.withLink(null).start();
-    span.addLink(null);
-    span.finish();
-    this.writer.waitForTraces(1);
-
-    assertEquals(1, this.writer.get(0).size());
-    String spanLinksTag = (String) this.writer.get(0).get(0).getTag(SPAN_LINKS);
-    assertNull(spanLinksTag);
-  }
-
-  private SpanLink createLink(int index) {
-    Map<String, String> attributes = new HashMap<>();
-    attributes.put("link-index", Integer.toString(index));
-
-    return new DDSpanLink(
-        DDTraceId.fromHex(String.format("11223344556677889900aabbccdd%04d", index)),
-        DDSpanId.fromHex(String.format("123456789abc%04d", index)),
-        index % 2 == 0 ? SAMPLED_FLAG : DEFAULT_FLAGS,
-        "",
-        SpanAttributes.fromMap(attributes));
-  }
-
-  private void assertLink(SpanLink expected, SpanLinkAsTag actual) {
-    assertEquals(expected.traceId().toHexString(), actual.trace_id);
-    assertEquals(DDSpanId.toHexStringPadded(expected.spanId()), actual.span_id);
-    if (expected.traceFlags() == DEFAULT_FLAGS) {
-      assertNull(actual.flags);
-    } else {
-      assertEquals(expected.traceFlags(), actual.flags);
+
+    @Test
+    void testSpanLinksEncodingOmittedEmptyKeys() throws Exception {
+        SpanLink link = new DDSpanLink(
+                DDTraceId.fromHex("11223344556677889900aabbccddeeff"),
+                DDSpanId.fromHex("123456789abcdef0"),
+                DEFAULT_FLAGS,
+                "",
+                EMPTY);
+        this.tracer.buildSpan("test", "operation").withLink(link).start().finish();
+        this.writer.waitForTraces(1);
+
+        assertEquals(1, this.writer.get(0).size());
+        String spanLinksTag = (String) writer.get(0).get(0).getTag(SPAN_LINKS);
+        assertEquals(
+                "[{\"span_id\":\"123456789abcdef0\",\"trace_id\":\"11223344556677889900aabbccddeeff\"}]", spanLinksTag);
     }
-    if (expected.traceState().isEmpty()) {
-      assertNull(actual.tracestate);
-    } else {
-      assertEquals(expected.traceState(), actual.trace_id);
+
+    @TableTest({
+      "scenario               | beforeStart | afterStart",
+      "no links               | false       | false     ",
+      "link before start only | true        | false     ",
+      "link after start only  | false       | true      ",
+      "links before and after | true        | true      "
+    })
+    @ParameterizedTest(name = "add span link at any time [{index}]")
+    void addSpanLinkAtAnyTime(boolean beforeStart, boolean afterStart) throws Exception {
+        SpanBuilder builder = this.tracer.buildSpan("test", "operation");
+        List<SpanLink> links = new ArrayList<>();
+
+        if (beforeStart) {
+            SpanLink link = createLink(0);
+            builder.withLink(link);
+            links.add(link);
+        }
+        AgentSpan span = builder.start();
+        if (afterStart) {
+            SpanLink link = createLink(1);
+            span.addLink(link);
+            links.add(link);
+        }
+        span.finish();
+        this.writer.waitForTraces(1);
+
+        assertEquals(1, this.writer.get(0).size());
+        String spanLinksTag = (String) this.writer.get(0).get(0).getTag(SPAN_LINKS);
+        List<SpanLinkAsTag> decodedSpanLinks = deserializeSpanLinks(spanLinksTag);
+
+        int expectedLinkCount = (beforeStart ? 1 : 0) + (afterStart ? 1 : 0);
+        assertEquals(expectedLinkCount, decodedSpanLinks.size());
+        for (int i = 0; i < decodedSpanLinks.size(); i++) {
+            assertLink(links.get(i), decodedSpanLinks.get(i));
+        }
     }
-    if (expected.attributes().isEmpty()) {
-      assertNull(actual.attributes);
-    } else {
-      assertEquals(expected.attributes().asMap(), actual.attributes);
+
+    @Test
+    void filterNullLinks() throws Exception {
+        SpanBuilder builder = this.tracer.buildSpan("test", "operation");
+
+        AgentSpan span = builder.withLink(null).start();
+        span.addLink(null);
+        span.finish();
+        this.writer.waitForTraces(1);
+
+        assertEquals(1, this.writer.get(0).size());
+        String spanLinksTag = (String) this.writer.get(0).get(0).getTag(SPAN_LINKS);
+        assertNull(spanLinksTag);
+    }
+
+    private SpanLink createLink(int index) {
+        Map<String, String> attributes = new HashMap<>();
+        attributes.put("link-index", Integer.toString(index));
+
+        return new DDSpanLink(
+                DDTraceId.fromHex(String.format("11223344556677889900aabbccdd%04d", index)),
+                DDSpanId.fromHex(String.format("123456789abc%04d", index)),
+                index % 2 == 0 ? SAMPLED_FLAG : DEFAULT_FLAGS,
+                "",
+                SpanAttributes.fromMap(attributes));
+    }
+
+    private void assertLink(SpanLink expected, SpanLinkAsTag actual) {
+        assertEquals(expected.traceId().toHexString(), actual.trace_id);
+        assertEquals(DDSpanId.toHexStringPadded(expected.spanId()), actual.span_id);
+        if (expected.traceFlags() == DEFAULT_FLAGS) {
+            assertNull(actual.flags);
+        } else {
+            assertEquals(expected.traceFlags(), actual.flags);
+        }
+        if (expected.traceState().isEmpty()) {
+            assertNull(actual.tracestate);
+        } else {
+            assertEquals(expected.traceState(), actual.trace_id);
+        }
+        if (expected.attributes().isEmpty()) {
+            assertNull(actual.attributes);
+        } else {
+            assertEquals(expected.attributes().asMap(), actual.attributes);
+        }
+    }
+
+    static List<SpanLinkAsTag> deserializeSpanLinks(String json) throws IOException {
+        if (json == null) {
+            return emptyList();
+        }
+        return JSON_MAPPER.readValue(json, SPAN_LINK_LIST_TYPE);
     }
-  }
 
-  static List<SpanLinkAsTag> deserializeSpanLinks(String json) throws IOException {
-    if (json == null) {
-      return emptyList();
+    static class SpanLinkAsTag {
+        public String trace_id;
+        public String span_id;
+        public Byte flags;
+        public String tracestate;
+        public Map<String, String> attributes;
     }
-    return JSON_MAPPER.readValue(json, SPAN_LINK_LIST_TYPE);
-  }
-
-  static class SpanLinkAsTag {
-    public String trace_id;
-    public String span_id;
-    public Byte flags;
-    public String tracestate;
-    public Map<String, String> attributes;
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanSerializationTest.java b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanSerializationTest.java
index cf08059ea9f..6b8fa1edf23 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanSerializationTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanSerializationTest.java
@@ -58,778 +58,782 @@
 @WithConfig(key = EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, value = "false")
 public class DDSpanSerializationTest extends DDCoreJavaSpecification {
 
-  @BeforeAll
-  static void beforeAll() {
-    ProcessTags.reset(Config.get());
-  }
-
-  @AfterAll
-  static void afterAll() {
-    ProcessTags.reset(Config.get());
-  }
-
-  @TableTest({
-    "scenario                   | value                | spanType ",
-    "zero                       | 0                    |          ",
-    "one with type              | 1                    | some-type",
-    "max long minus one billion | 8223372036854775807  |          ",
-    "Long.MAX_VALUE minus one   | 9223372036854775806  | some-type",
-    "Long.MAX_VALUE plus one    | 9223372036854775808  |          ",
-    "2^64 minus one             | 18446744073709551615 | some-type"
-  })
-  void serializeTraceWithIdAsInt(String scenario, String value, String spanType) throws Exception {
-    ListWriter writer = new ListWriter();
-    CoreTracer tracer = tracerBuilder().writer(writer).build();
-    DDTraceId traceId = DDTraceId.from(value);
-    long spanId = DDSpanId.from(value);
-    DDSpanContext context = createSpanContext(spanType, tracer, traceId, spanId);
-    DDSpan span = DDSpan.create("test", 0, context, null);
-    CaptureBuffer capture = new CaptureBuffer();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
-    packer.format(Collections.singletonList(span), new TraceMapperV0_4());
-    packer.flush();
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(capture.bytes));
-    int traceCount = capture.messageCount;
-    int spanCount = unpacker.unpackArrayHeader();
-    int size = unpacker.unpackMapHeader();
-
-    assertEquals(1, traceCount);
-    assertEquals(1, spanCount);
-    assertEquals(12, size);
-    for (int i = 0; i < size; i++) {
-      String key = unpacker.unpackString();
-      switch (key) {
-        case "trace_id":
-          MessageFormat traceIdFormat = unpacker.getNextFormat();
-          assertEquals(ValueType.INTEGER, traceIdFormat.getValueType());
-          if (traceIdFormat == MessageFormat.UINT64) {
-            assertEquals(traceId, DDTraceId.from(unpacker.unpackBigInteger().toString()));
-          } else {
-            assertEquals(traceId, DDTraceId.from(unpacker.unpackLong()));
-          }
-          break;
-        case "span_id":
-          MessageFormat spanIdFormat = unpacker.getNextFormat();
-          assertEquals(ValueType.INTEGER, spanIdFormat.getValueType());
-          if (spanIdFormat == MessageFormat.UINT64) {
-            assertEquals(spanId, DDSpanId.from(unpacker.unpackBigInteger().toString()));
-          } else {
-            assertEquals(spanId, unpacker.unpackLong());
-          }
-          break;
-        default:
-          unpacker.unpackValue();
-      }
+    @BeforeAll
+    static void beforeAll() {
+        ProcessTags.reset(Config.get());
     }
-    tracer.close();
-  }
-
-  @TableTest({
-    "scenario                   | value                | spanType ",
-    "zero                       | 0                    |          ",
-    "one with type              | 1                    | some-type",
-    "max long minus one billion | 8223372036854775807  |          ",
-    "Long.MAX_VALUE minus one   | 9223372036854775806  | some-type",
-    "Long.MAX_VALUE plus one    | 9223372036854775808  |          ",
-    "2^64 minus one             | 18446744073709551615 | some-type"
-  })
-  void serializeTraceWithIdAsIntV05(String scenario, String value, String spanType)
-      throws Exception {
-    ListWriter writer = new ListWriter();
-    CoreTracer tracer = tracerBuilder().writer(writer).build();
-    DDTraceId traceId = DDTraceId.from(value);
-    long spanId = DDSpanId.from(value);
-    DDSpanContext context = createSpanContext(spanType, tracer, traceId, spanId);
-    DDSpan span = DDSpan.create("test", 0, context, null);
-    CaptureBuffer capture = new CaptureBuffer();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
-    TraceMapperV0_5 traceMapper = new TraceMapperV0_5();
-    packer.format(Collections.singletonList(span), traceMapper);
-    packer.flush();
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(capture.bytes));
-    int traceCount = capture.messageCount;
-    int spanCount = unpacker.unpackArrayHeader();
-    int size = unpacker.unpackArrayHeader();
-
-    assertEquals(1, traceCount);
-    assertEquals(1, spanCount);
-    assertEquals(12, size);
-    for (int i = 0; i < size; i++) {
-      switch (i) {
-        case 3:
-          MessageFormat traceIdFormat = unpacker.getNextFormat();
-          assertEquals(ValueType.INTEGER, traceIdFormat.getValueType());
-          if (traceIdFormat == MessageFormat.UINT64) {
-            assertEquals(traceId, DDTraceId.from(unpacker.unpackBigInteger().toString()));
-          } else {
-            assertEquals(traceId, DDTraceId.from(unpacker.unpackLong()));
-          }
-          break;
-        case 4:
-          MessageFormat spanIdFormat = unpacker.getNextFormat();
-          assertEquals(ValueType.INTEGER, spanIdFormat.getValueType());
-          if (spanIdFormat == MessageFormat.UINT64) {
-            assertEquals(spanId, DDSpanId.from(unpacker.unpackBigInteger().toString()));
-          } else {
-            assertEquals(spanId, unpacker.unpackLong());
-          }
-          break;
-        default:
-          unpacker.unpackValue();
-      }
+
+    @AfterAll
+    static void afterAll() {
+        ProcessTags.reset(Config.get());
+    }
+
+    @TableTest({
+      "scenario                   | value                | spanType ",
+      "zero                       | 0                    |          ",
+      "one with type              | 1                    | some-type",
+      "max long minus one billion | 8223372036854775807  |          ",
+      "Long.MAX_VALUE minus one   | 9223372036854775806  | some-type",
+      "Long.MAX_VALUE plus one    | 9223372036854775808  |          ",
+      "2^64 minus one             | 18446744073709551615 | some-type"
+    })
+    void serializeTraceWithIdAsInt(String scenario, String value, String spanType) throws Exception {
+        ListWriter writer = new ListWriter();
+        CoreTracer tracer = tracerBuilder().writer(writer).build();
+        DDTraceId traceId = DDTraceId.from(value);
+        long spanId = DDSpanId.from(value);
+        DDSpanContext context = createSpanContext(spanType, tracer, traceId, spanId);
+        DDSpan span = DDSpan.create("test", 0, context, null);
+        CaptureBuffer capture = new CaptureBuffer();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
+        packer.format(Collections.singletonList(span), new TraceMapperV0_4());
+        packer.flush();
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(capture.bytes));
+        int traceCount = capture.messageCount;
+        int spanCount = unpacker.unpackArrayHeader();
+        int size = unpacker.unpackMapHeader();
+
+        assertEquals(1, traceCount);
+        assertEquals(1, spanCount);
+        assertEquals(12, size);
+        for (int i = 0; i < size; i++) {
+            String key = unpacker.unpackString();
+            switch (key) {
+                case "trace_id":
+                    MessageFormat traceIdFormat = unpacker.getNextFormat();
+                    assertEquals(ValueType.INTEGER, traceIdFormat.getValueType());
+                    if (traceIdFormat == MessageFormat.UINT64) {
+                        assertEquals(
+                                traceId,
+                                DDTraceId.from(unpacker.unpackBigInteger().toString()));
+                    } else {
+                        assertEquals(traceId, DDTraceId.from(unpacker.unpackLong()));
+                    }
+                    break;
+                case "span_id":
+                    MessageFormat spanIdFormat = unpacker.getNextFormat();
+                    assertEquals(ValueType.INTEGER, spanIdFormat.getValueType());
+                    if (spanIdFormat == MessageFormat.UINT64) {
+                        assertEquals(
+                                spanId,
+                                DDSpanId.from(unpacker.unpackBigInteger().toString()));
+                    } else {
+                        assertEquals(spanId, unpacker.unpackLong());
+                    }
+                    break;
+                default:
+                    unpacker.unpackValue();
+            }
+        }
+        tracer.close();
+    }
+
+    @TableTest({
+      "scenario                   | value                | spanType ",
+      "zero                       | 0                    |          ",
+      "one with type              | 1                    | some-type",
+      "max long minus one billion | 8223372036854775807  |          ",
+      "Long.MAX_VALUE minus one   | 9223372036854775806  | some-type",
+      "Long.MAX_VALUE plus one    | 9223372036854775808  |          ",
+      "2^64 minus one             | 18446744073709551615 | some-type"
+    })
+    void serializeTraceWithIdAsIntV05(String scenario, String value, String spanType) throws Exception {
+        ListWriter writer = new ListWriter();
+        CoreTracer tracer = tracerBuilder().writer(writer).build();
+        DDTraceId traceId = DDTraceId.from(value);
+        long spanId = DDSpanId.from(value);
+        DDSpanContext context = createSpanContext(spanType, tracer, traceId, spanId);
+        DDSpan span = DDSpan.create("test", 0, context, null);
+        CaptureBuffer capture = new CaptureBuffer();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
+        TraceMapperV0_5 traceMapper = new TraceMapperV0_5();
+        packer.format(Collections.singletonList(span), traceMapper);
+        packer.flush();
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(capture.bytes));
+        int traceCount = capture.messageCount;
+        int spanCount = unpacker.unpackArrayHeader();
+        int size = unpacker.unpackArrayHeader();
+
+        assertEquals(1, traceCount);
+        assertEquals(1, spanCount);
+        assertEquals(12, size);
+        for (int i = 0; i < size; i++) {
+            switch (i) {
+                case 3:
+                    MessageFormat traceIdFormat = unpacker.getNextFormat();
+                    assertEquals(ValueType.INTEGER, traceIdFormat.getValueType());
+                    if (traceIdFormat == MessageFormat.UINT64) {
+                        assertEquals(
+                                traceId,
+                                DDTraceId.from(unpacker.unpackBigInteger().toString()));
+                    } else {
+                        assertEquals(traceId, DDTraceId.from(unpacker.unpackLong()));
+                    }
+                    break;
+                case 4:
+                    MessageFormat spanIdFormat = unpacker.getNextFormat();
+                    assertEquals(ValueType.INTEGER, spanIdFormat.getValueType());
+                    if (spanIdFormat == MessageFormat.UINT64) {
+                        assertEquals(
+                                spanId,
+                                DDSpanId.from(unpacker.unpackBigInteger().toString()));
+                    } else {
+                        assertEquals(spanId, unpacker.unpackLong());
+                    }
+                    break;
+                default:
+                    unpacker.unpackValue();
+            }
+        }
+        tracer.close();
+    }
+
+    @TableTest({
+      "scenario                              | baggage     | tags        | expected               | injectBaggage",
+      "empty baggage and tags inject         | [:]         | [:]         | [:]                    | true         ",
+      "baggage only inject                   | [foo: bbar] | [:]         | [foo: bbar]            | true         ",
+      "baggage and tags inject no overlap    | [foo: bbar] | [bar: tfoo] | [foo: bbar, bar: tfoo] | true         ",
+      "baggage and tags inject tag wins      | [foo: bbar] | [foo: tbar] | [foo: tbar]            | true         ",
+      "empty baggage and tags no inject      | [:]         | [:]         | [:]                    | false        ",
+      "baggage only no inject                | [foo: bbar] | [:]         | [:]                    | false        ",
+      "baggage and tags no inject no overlap | [foo: bbar] | [bar: tfoo] | [bar: tfoo]            | false        ",
+      "baggage and tags no inject tag wins   | [foo: bbar] | [foo: tbar] | [foo: tbar]            | false        "
+    })
+    void serializeTraceWithBaggageAndTagsCorrectlyV04(
+            String scenario,
+            Map<String, String> baggage,
+            Map<String, String> tags,
+            Map<String, String> expected,
+            boolean injectBaggage)
+            throws Exception {
+        ListWriter writer = new ListWriter();
+        CoreTracer tracer = tracerBuilder().writer(writer).build();
+        DDSpanContext context = new DDSpanContext(
+                DDTraceId.ONE,
+                1,
+                DDSpanId.ZERO,
+                null,
+                "fakeService",
+                "fakeOperation",
+                "fakeResource",
+                PrioritySampling.UNSET,
+                null,
+                baggage,
+                false,
+                null,
+                tags.size(),
+                tracer.createTraceCollector(DDTraceId.ONE),
+                null,
+                null,
+                NoopPathwayContext.INSTANCE,
+                false,
+                null,
+                injectBaggage,
+                true);
+        context.setAllTags(tags);
+        DDSpan span = DDSpan.create("test", 0, context, null);
+        CaptureBuffer capture = new CaptureBuffer();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
+        packer.format(Collections.singletonList(span), new TraceMapperV0_4());
+        packer.flush();
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(capture.bytes));
+        int traceCount = capture.messageCount;
+        int spanCount = unpacker.unpackArrayHeader();
+        int size = unpacker.unpackMapHeader();
+
+        assertEquals(1, traceCount);
+        assertEquals(1, spanCount);
+        assertEquals(12, size);
+        for (int i = 0; i < size; i++) {
+            String key = unpacker.unpackString();
+            if ("meta".equals(key)) {
+                int packedSize = unpacker.unpackMapHeader();
+                Map<String, String> unpackedMeta = new HashMap<>();
+                for (int j = 0; j < packedSize; j++) {
+                    String k = unpacker.unpackString();
+                    String v = unpacker.unpackString();
+                    if (!isWrittenByMapper(k)) {
+                        unpackedMeta.put(k, v);
+                    }
+                }
+                assertEquals(expected, unpackedMeta);
+            } else {
+                unpacker.unpackValue();
+            }
+        }
+        tracer.close();
     }
-    tracer.close();
-  }
-
-  @TableTest({
-    "scenario                              | baggage     | tags        | expected               | injectBaggage",
-    "empty baggage and tags inject         | [:]         | [:]         | [:]                    | true         ",
-    "baggage only inject                   | [foo: bbar] | [:]         | [foo: bbar]            | true         ",
-    "baggage and tags inject no overlap    | [foo: bbar] | [bar: tfoo] | [foo: bbar, bar: tfoo] | true         ",
-    "baggage and tags inject tag wins      | [foo: bbar] | [foo: tbar] | [foo: tbar]            | true         ",
-    "empty baggage and tags no inject      | [:]         | [:]         | [:]                    | false        ",
-    "baggage only no inject                | [foo: bbar] | [:]         | [:]                    | false        ",
-    "baggage and tags no inject no overlap | [foo: bbar] | [bar: tfoo] | [bar: tfoo]            | false        ",
-    "baggage and tags no inject tag wins   | [foo: bbar] | [foo: tbar] | [foo: tbar]            | false        "
-  })
-  void serializeTraceWithBaggageAndTagsCorrectlyV04(
-      String scenario,
-      Map<String, String> baggage,
-      Map<String, String> tags,
-      Map<String, String> expected,
-      boolean injectBaggage)
-      throws Exception {
-    ListWriter writer = new ListWriter();
-    CoreTracer tracer = tracerBuilder().writer(writer).build();
-    DDSpanContext context =
-        new DDSpanContext(
-            DDTraceId.ONE,
-            1,
-            DDSpanId.ZERO,
-            null,
-            "fakeService",
-            "fakeOperation",
-            "fakeResource",
-            PrioritySampling.UNSET,
-            null,
-            baggage,
-            false,
-            null,
-            tags.size(),
-            tracer.createTraceCollector(DDTraceId.ONE),
-            null,
-            null,
-            NoopPathwayContext.INSTANCE,
-            false,
-            null,
-            injectBaggage,
-            true);
-    context.setAllTags(tags);
-    DDSpan span = DDSpan.create("test", 0, context, null);
-    CaptureBuffer capture = new CaptureBuffer();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
-    packer.format(Collections.singletonList(span), new TraceMapperV0_4());
-    packer.flush();
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(capture.bytes));
-    int traceCount = capture.messageCount;
-    int spanCount = unpacker.unpackArrayHeader();
-    int size = unpacker.unpackMapHeader();
-
-    assertEquals(1, traceCount);
-    assertEquals(1, spanCount);
-    assertEquals(12, size);
-    for (int i = 0; i < size; i++) {
-      String key = unpacker.unpackString();
-      if ("meta".equals(key)) {
+
+    @TableTest({
+      "scenario                              | baggage     | tags        | expected               | injectBaggage",
+      "empty baggage and tags inject         | [:]         | [:]         | [:]                    | true         ",
+      "baggage only inject                   | [foo: bbar] | [:]         | [foo: bbar]            | true         ",
+      "baggage and tags inject no overlap    | [foo: bbar] | [bar: tfoo] | [foo: bbar, bar: tfoo] | true         ",
+      "baggage and tags inject tag wins      | [foo: bbar] | [foo: tbar] | [foo: tbar]            | true         ",
+      "empty baggage and tags no inject      | [:]         | [:]         | [:]                    | false        ",
+      "baggage only no inject                | [foo: bbar] | [:]         | [:]                    | false        ",
+      "baggage and tags no inject no overlap | [foo: bbar] | [bar: tfoo] | [bar: tfoo]            | false        ",
+      "baggage and tags no inject tag wins   | [foo: bbar] | [foo: tbar] | [foo: tbar]            | false        "
+    })
+    void serializeTraceWithBaggageAndTagsCorrectlyV05(
+            String scenario,
+            Map<String, String> baggage,
+            Map<String, String> tags,
+            Map<String, String> expected,
+            boolean injectBaggage)
+            throws Exception {
+        ListWriter writer = new ListWriter();
+        CoreTracer tracer = tracerBuilder().writer(writer).build();
+        DDSpanContext context = new DDSpanContext(
+                DDTraceId.ONE,
+                1,
+                DDSpanId.ZERO,
+                null,
+                "fakeService",
+                "fakeOperation",
+                "fakeResource",
+                PrioritySampling.UNSET,
+                null,
+                baggage,
+                false,
+                null,
+                tags.size(),
+                tracer.createTraceCollector(DDTraceId.ONE),
+                null,
+                null,
+                NoopPathwayContext.INSTANCE,
+                false,
+                null,
+                injectBaggage,
+                true);
+        context.setAllTags(tags);
+        DDSpan span = DDSpan.create("test", 0, context, null);
+        CaptureBuffer capture = new CaptureBuffer();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
+        TraceMapperV0_5 mapper = new TraceMapperV0_5();
+        packer.format(Collections.singletonList(span), mapper);
+        packer.flush();
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(capture.bytes));
+        int traceCount = capture.messageCount;
+        int spanCount = unpacker.unpackArrayHeader();
+        int size = unpacker.unpackArrayHeader();
+        String[] dictionary = buildDictionary(mapper);
+
+        assertEquals(1, traceCount);
+        assertEquals(1, spanCount);
+        assertEquals(12, size);
+        for (int i = 0; i < 9; ++i) {
+            unpacker.skipValue();
+        }
         int packedSize = unpacker.unpackMapHeader();
         Map<String, String> unpackedMeta = new HashMap<>();
         for (int j = 0; j < packedSize; j++) {
-          String k = unpacker.unpackString();
-          String v = unpacker.unpackString();
-          if (!isWrittenByMapper(k)) {
-            unpackedMeta.put(k, v);
-          }
+            String k = dictionary[unpacker.unpackInt()];
+            String v = dictionary[unpacker.unpackInt()];
+            if (!isWrittenByMapper(k)) {
+                unpackedMeta.put(k, v);
+            }
         }
         assertEquals(expected, unpackedMeta);
-      } else {
-        unpacker.unpackValue();
-      }
+        tracer.close();
     }
-    tracer.close();
-  }
-
-  @TableTest({
-    "scenario                              | baggage     | tags        | expected               | injectBaggage",
-    "empty baggage and tags inject         | [:]         | [:]         | [:]                    | true         ",
-    "baggage only inject                   | [foo: bbar] | [:]         | [foo: bbar]            | true         ",
-    "baggage and tags inject no overlap    | [foo: bbar] | [bar: tfoo] | [foo: bbar, bar: tfoo] | true         ",
-    "baggage and tags inject tag wins      | [foo: bbar] | [foo: tbar] | [foo: tbar]            | true         ",
-    "empty baggage and tags no inject      | [:]         | [:]         | [:]                    | false        ",
-    "baggage only no inject                | [foo: bbar] | [:]         | [:]                    | false        ",
-    "baggage and tags no inject no overlap | [foo: bbar] | [bar: tfoo] | [bar: tfoo]            | false        ",
-    "baggage and tags no inject tag wins   | [foo: bbar] | [foo: tbar] | [foo: tbar]            | false        "
-  })
-  void serializeTraceWithBaggageAndTagsCorrectlyV05(
-      String scenario,
-      Map<String, String> baggage,
-      Map<String, String> tags,
-      Map<String, String> expected,
-      boolean injectBaggage)
-      throws Exception {
-    ListWriter writer = new ListWriter();
-    CoreTracer tracer = tracerBuilder().writer(writer).build();
-    DDSpanContext context =
-        new DDSpanContext(
-            DDTraceId.ONE,
-            1,
-            DDSpanId.ZERO,
-            null,
-            "fakeService",
-            "fakeOperation",
-            "fakeResource",
-            PrioritySampling.UNSET,
-            null,
-            baggage,
-            false,
-            null,
-            tags.size(),
-            tracer.createTraceCollector(DDTraceId.ONE),
-            null,
-            null,
-            NoopPathwayContext.INSTANCE,
-            false,
-            null,
-            injectBaggage,
-            true);
-    context.setAllTags(tags);
-    DDSpan span = DDSpan.create("test", 0, context, null);
-    CaptureBuffer capture = new CaptureBuffer();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
-    TraceMapperV0_5 mapper = new TraceMapperV0_5();
-    packer.format(Collections.singletonList(span), mapper);
-    packer.flush();
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(capture.bytes));
-    int traceCount = capture.messageCount;
-    int spanCount = unpacker.unpackArrayHeader();
-    int size = unpacker.unpackArrayHeader();
-    String[] dictionary = buildDictionary(mapper);
-
-    assertEquals(1, traceCount);
-    assertEquals(1, spanCount);
-    assertEquals(12, size);
-    for (int i = 0; i < 9; ++i) {
-      unpacker.skipValue();
+
+    @TableTest({
+      "scenario         | injectBaggage",
+      "baggage enabled  | true         ",
+      "baggage disabled | false        "
+    })
+    @WithConfig(key = TRACE_BAGGAGE_TAG_KEYS, value = "user.id,custom")
+    void serializeTraceWithConfiguredBaggageAndTagsCorrectlyV1(String scenario, boolean injectBaggage)
+            throws Exception {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("legacy-baggage", "legacy-value");
+
+        Map<String, String> w3cBaggageItems = new HashMap<>();
+        w3cBaggageItems.put("user.id", "user-1");
+        w3cBaggageItems.put("custom", "custom-value");
+        w3cBaggageItems.put("ignored", "ignored-value");
+
+        DDSpanContext context =
+                createSpanContext(tracer, baggage, Baggage.create(w3cBaggageItems), injectBaggage, true, 1);
+        context.setTag("span-tag", "span-value");
+        DDSpan span = DDSpan.create("test", 0, context, null);
+
+        V1PayloadReader.V1Span payload = V1PayloadReader.readFirstSpan(serializeV1Payload(span));
+        Map<String, Object> attributes = payload.getAttributes();
+
+        assertEquals("span-value", attributes.get("span-tag"));
+        if (injectBaggage) {
+            assertEquals("legacy-value", attributes.get("legacy-baggage"));
+            assertEquals("user-1", attributes.get("baggage.user.id"));
+            assertEquals("custom-value", attributes.get("baggage.custom"));
+        } else {
+            assertFalse(attributes.containsKey("legacy-baggage"));
+            assertFalse(attributes.containsKey("baggage.user.id"));
+            assertFalse(attributes.containsKey("baggage.custom"));
+        }
+        assertFalse(attributes.containsKey("baggage.ignored"));
+        tracer.close();
     }
-    int packedSize = unpacker.unpackMapHeader();
-    Map<String, String> unpackedMeta = new HashMap<>();
-    for (int j = 0; j < packedSize; j++) {
-      String k = dictionary[unpacker.unpackInt()];
-      String v = dictionary[unpacker.unpackInt()];
-      if (!isWrittenByMapper(k)) {
-        unpackedMeta.put(k, v);
-      }
+
+    @Test
+    void serializeTraceWithSpanLinksAsStructuredLinksOnlyV1() throws Exception {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        DDSpanContext context = createSpanContext(tracer, Collections.emptyMap(), null, true, true, 0);
+        DDSpan span = DDSpan.create("test", 0, context, null);
+
+        Map<String, String> linkAttributes = new HashMap<>();
+        linkAttributes.put("link.source", "unit-test");
+        DDSpanLink link = new DDSpanLink(
+                DDTraceId.fromHex("11223344556677889900aabbccddeeff"),
+                DDSpanId.fromHex("123456789abcdef0"),
+                (byte) 1,
+                "dd=s:1",
+                SpanAttributes.fromMap(linkAttributes));
+        span.addLink(link);
+
+        V1PayloadReader.V1Span payload = V1PayloadReader.readFirstSpan(serializeV1Payload(span));
+
+        assertFalse(payload.getAttributes().containsKey(SPAN_LINKS));
+        assertEquals(1, payload.getLinks().size());
+        V1PayloadReader.V1SpanLink actualLink = payload.getLinks().get(0);
+        assertArrayEquals(V1PayloadReader.traceIdBytes(link.traceId()), actualLink.getTraceId());
+        assertEquals(link.spanId(), actualLink.getSpanId());
+        assertEquals(link.traceState(), actualLink.getTraceState());
+        assertEquals((long) (link.traceFlags() & 0xFF), actualLink.getTraceFlags());
+        assertEquals("unit-test", actualLink.getAttributes().get("link.source"));
+        tracer.close();
     }
-    assertEquals(expected, unpackedMeta);
-    tracer.close();
-  }
-
-  @TableTest({
-    "scenario         | injectBaggage",
-    "baggage enabled  | true         ",
-    "baggage disabled | false        "
-  })
-  @WithConfig(key = TRACE_BAGGAGE_TAG_KEYS, value = "user.id,custom")
-  void serializeTraceWithConfiguredBaggageAndTagsCorrectlyV1(String scenario, boolean injectBaggage)
-      throws Exception {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("legacy-baggage", "legacy-value");
-
-    Map<String, String> w3cBaggageItems = new HashMap<>();
-    w3cBaggageItems.put("user.id", "user-1");
-    w3cBaggageItems.put("custom", "custom-value");
-    w3cBaggageItems.put("ignored", "ignored-value");
-
-    DDSpanContext context =
-        createSpanContext(tracer, baggage, Baggage.create(w3cBaggageItems), injectBaggage, true, 1);
-    context.setTag("span-tag", "span-value");
-    DDSpan span = DDSpan.create("test", 0, context, null);
-
-    V1PayloadReader.V1Span payload = V1PayloadReader.readFirstSpan(serializeV1Payload(span));
-    Map<String, Object> attributes = payload.getAttributes();
-
-    assertEquals("span-value", attributes.get("span-tag"));
-    if (injectBaggage) {
-      assertEquals("legacy-value", attributes.get("legacy-baggage"));
-      assertEquals("user-1", attributes.get("baggage.user.id"));
-      assertEquals("custom-value", attributes.get("baggage.custom"));
-    } else {
-      assertFalse(attributes.containsKey("legacy-baggage"));
-      assertFalse(attributes.containsKey("baggage.user.id"));
-      assertFalse(attributes.containsKey("baggage.custom"));
+
+    @Test
+    void serializeTraceWithJsonSpanEventsV1() throws Exception {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        DDSpanContext context = createSpanContext(tracer, Collections.emptyMap(), null, true, true, 1);
+        context.setTag(
+                SPAN_EVENTS,
+                "[{\"time_unix_nano\":1234567890,\"name\":\"event.one\","
+                        + "\"attributes\":{\"str\":\"value\",\"int\":42,\"double\":12.5,"
+                        + "\"bool\":true,\"arr\":[\"x\",7,2.5,false]}},"
+                        + "{\"time_unix_nano\":1234567891,\"name\":\"event.two\"}]");
+        DDSpan span = DDSpan.create("test", 0, context, null);
+
+        V1PayloadReader.V1Span payload = V1PayloadReader.readFirstSpan(serializeV1Payload(span));
+
+        assertFalse(payload.getAttributes().containsKey(SPAN_EVENTS));
+        assertEquals(2, payload.getEvents().size());
+        V1PayloadReader.V1SpanEvent firstEvent = payload.getEvents().get(0);
+        assertEquals(1234567890L, firstEvent.getTimeUnixNano());
+        assertEquals("event.one", firstEvent.getName());
+        assertEquals("value", firstEvent.getAttributes().get("str"));
+        assertEquals(42L, firstEvent.getAttributes().get("int"));
+        assertEquals(12.5d, firstEvent.getAttributes().get("double"));
+        assertEquals(true, firstEvent.getAttributes().get("bool"));
+        assertEquals(
+                Arrays.asList("x", 7L, 2.5d, false), firstEvent.getAttributes().get("arr"));
+
+        V1PayloadReader.V1SpanEvent secondEvent = payload.getEvents().get(1);
+        assertEquals(1234567891L, secondEvent.getTimeUnixNano());
+        assertEquals("event.two", secondEvent.getName());
+        assertEquals(Collections.emptyMap(), secondEvent.getAttributes());
+        tracer.close();
     }
-    assertFalse(attributes.containsKey("baggage.ignored"));
-    tracer.close();
-  }
-
-  @Test
-  void serializeTraceWithSpanLinksAsStructuredLinksOnlyV1() throws Exception {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    DDSpanContext context = createSpanContext(tracer, Collections.emptyMap(), null, true, true, 0);
-    DDSpan span = DDSpan.create("test", 0, context, null);
-
-    Map<String, String> linkAttributes = new HashMap<>();
-    linkAttributes.put("link.source", "unit-test");
-    DDSpanLink link =
-        new DDSpanLink(
-            DDTraceId.fromHex("11223344556677889900aabbccddeeff"),
-            DDSpanId.fromHex("123456789abcdef0"),
-            (byte) 1,
-            "dd=s:1",
-            SpanAttributes.fromMap(linkAttributes));
-    span.addLink(link);
-
-    V1PayloadReader.V1Span payload = V1PayloadReader.readFirstSpan(serializeV1Payload(span));
-
-    assertFalse(payload.getAttributes().containsKey(SPAN_LINKS));
-    assertEquals(1, payload.getLinks().size());
-    V1PayloadReader.V1SpanLink actualLink = payload.getLinks().get(0);
-    assertArrayEquals(V1PayloadReader.traceIdBytes(link.traceId()), actualLink.getTraceId());
-    assertEquals(link.spanId(), actualLink.getSpanId());
-    assertEquals(link.traceState(), actualLink.getTraceState());
-    assertEquals((long) (link.traceFlags() & 0xFF), actualLink.getTraceFlags());
-    assertEquals("unit-test", actualLink.getAttributes().get("link.source"));
-    tracer.close();
-  }
-
-  @Test
-  void serializeTraceWithJsonSpanEventsV1() throws Exception {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    DDSpanContext context = createSpanContext(tracer, Collections.emptyMap(), null, true, true, 1);
-    context.setTag(
-        SPAN_EVENTS,
-        "[{\"time_unix_nano\":1234567890,\"name\":\"event.one\","
-            + "\"attributes\":{\"str\":\"value\",\"int\":42,\"double\":12.5,"
-            + "\"bool\":true,\"arr\":[\"x\",7,2.5,false]}},"
-            + "{\"time_unix_nano\":1234567891,\"name\":\"event.two\"}]");
-    DDSpan span = DDSpan.create("test", 0, context, null);
-
-    V1PayloadReader.V1Span payload = V1PayloadReader.readFirstSpan(serializeV1Payload(span));
-
-    assertFalse(payload.getAttributes().containsKey(SPAN_EVENTS));
-    assertEquals(2, payload.getEvents().size());
-    V1PayloadReader.V1SpanEvent firstEvent = payload.getEvents().get(0);
-    assertEquals(1234567890L, firstEvent.getTimeUnixNano());
-    assertEquals("event.one", firstEvent.getName());
-    assertEquals("value", firstEvent.getAttributes().get("str"));
-    assertEquals(42L, firstEvent.getAttributes().get("int"));
-    assertEquals(12.5d, firstEvent.getAttributes().get("double"));
-    assertEquals(true, firstEvent.getAttributes().get("bool"));
-    assertEquals(Arrays.asList("x", 7L, 2.5d, false), firstEvent.getAttributes().get("arr"));
-
-    V1PayloadReader.V1SpanEvent secondEvent = payload.getEvents().get(1);
-    assertEquals(1234567891L, secondEvent.getTimeUnixNano());
-    assertEquals("event.two", secondEvent.getName());
-    assertEquals(Collections.emptyMap(), secondEvent.getAttributes());
-    tracer.close();
-  }
-
-  @Test
-  void serializeTraceWithMalformedJsonSpanEventsAsEmptyV1() throws Exception {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    DDSpanContext context = createSpanContext(tracer, Collections.emptyMap(), null, true, true, 1);
-    context.setTag(SPAN_EVENTS, "[{");
-    DDSpan span = DDSpan.create("test", 0, context, null);
-
-    V1PayloadReader.V1Span payload = V1PayloadReader.readFirstSpan(serializeV1Payload(span));
-
-    assertFalse(payload.getAttributes().containsKey(SPAN_EVENTS));
-    assertEquals(Collections.emptyList(), payload.getEvents());
-    tracer.close();
-  }
-
-  @TableTest({
-    "protocol | rootFirst",
-    "v0.4     | true     ",
-    "v0.4     | false    ",
-    "v0.5     | true     ",
-    "v0.5     | false    ",
-    "v1       | true     ",
-    "v1       | false    "
-  })
-  void serializePropagationTagsOnFirstSpanOfChunk(String protocol, boolean rootFirst)
-      throws Exception {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    PropagationTags propagationTags =
-        tracer
-            .getPropagationTagsFactory()
-            .fromHeaderValue(PropagationTags.HeaderType.DATADOG, "_dd.p.dm=-3,_dd.p.any=value");
-    ExtractedContext extracted =
-        new ExtractedContext(
-            DDTraceId.ONE, 42, PrioritySampling.SAMPLER_KEEP, null, propagationTags, DATADOG);
-    DDSpan root = (DDSpan) tracer.buildSpan("test", "root").asChildOf(extracted).start();
-    DDSpan child = (DDSpan) tracer.buildSpan("test", "child").asChildOf(root).start();
-    DDSpan grandchild = (DDSpan) tracer.buildSpan("test", "grandchild").asChildOf(child).start();
-    root.setTag("root.only", "root-value");
-
-    List<DDSpan> chunk = rootFirst ? Arrays.asList(root, child) : Arrays.asList(child, grandchild);
-    List<Map<String, ?>> metadata;
-    int samplingMechanism = SamplingMechanism.DEFAULT;
-    switch (protocol) {
-      case "v0.4":
-        metadata = serializeV04Metadata(chunk);
-        break;
-      case "v0.5":
-        metadata = serializeV05Metadata(chunk);
-        break;
-      case "v1":
-        V1PayloadReader.V1Chunk v1Chunk = V1PayloadReader.readFirstChunk(serializeV1Payload(chunk));
-        metadata = new ArrayList<>(v1Chunk.getSpans().size());
-        for (V1PayloadReader.V1Span span : v1Chunk.getSpans()) {
-          metadata.add(span.getAttributes());
+
+    @Test
+    void serializeTraceWithMalformedJsonSpanEventsAsEmptyV1() throws Exception {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        DDSpanContext context = createSpanContext(tracer, Collections.emptyMap(), null, true, true, 1);
+        context.setTag(SPAN_EVENTS, "[{");
+        DDSpan span = DDSpan.create("test", 0, context, null);
+
+        V1PayloadReader.V1Span payload = V1PayloadReader.readFirstSpan(serializeV1Payload(span));
+
+        assertFalse(payload.getAttributes().containsKey(SPAN_EVENTS));
+        assertEquals(Collections.emptyList(), payload.getEvents());
+        tracer.close();
+    }
+
+    @TableTest({
+      "protocol | rootFirst",
+      "v0.4     | true     ",
+      "v0.4     | false    ",
+      "v0.5     | true     ",
+      "v0.5     | false    ",
+      "v1       | true     ",
+      "v1       | false    "
+    })
+    void serializePropagationTagsOnFirstSpanOfChunk(String protocol, boolean rootFirst) throws Exception {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        PropagationTags propagationTags = tracer.getPropagationTagsFactory()
+                .fromHeaderValue(PropagationTags.HeaderType.DATADOG, "_dd.p.dm=-3,_dd.p.any=value");
+        ExtractedContext extracted =
+                new ExtractedContext(DDTraceId.ONE, 42, PrioritySampling.SAMPLER_KEEP, null, propagationTags, DATADOG);
+        DDSpan root =
+                (DDSpan) tracer.buildSpan("test", "root").asChildOf(extracted).start();
+        DDSpan child =
+                (DDSpan) tracer.buildSpan("test", "child").asChildOf(root).start();
+        DDSpan grandchild =
+                (DDSpan) tracer.buildSpan("test", "grandchild").asChildOf(child).start();
+        root.setTag("root.only", "root-value");
+
+        List<DDSpan> chunk = rootFirst ? Arrays.asList(root, child) : Arrays.asList(child, grandchild);
+        List<Map<String, ?>> metadata;
+        int samplingMechanism = SamplingMechanism.DEFAULT;
+        switch (protocol) {
+            case "v0.4":
+                metadata = serializeV04Metadata(chunk);
+                break;
+            case "v0.5":
+                metadata = serializeV05Metadata(chunk);
+                break;
+            case "v1":
+                V1PayloadReader.V1Chunk v1Chunk = V1PayloadReader.readFirstChunk(serializeV1Payload(chunk));
+                metadata = new ArrayList<>(v1Chunk.getSpans().size());
+                for (V1PayloadReader.V1Span span : v1Chunk.getSpans()) {
+                    metadata.add(span.getAttributes());
+                }
+                samplingMechanism = v1Chunk.getSamplingMechanism();
+                break;
+            default:
+                throw new IllegalArgumentException("Unexpected protocol: " + protocol);
+        }
+
+        assertEquals("-3", metadata.get(0).get("_dd.p.dm"));
+        assertEquals("value", metadata.get(0).get("_dd.p.any"));
+        assertFalse(metadata.get(1).containsKey("_dd.p.dm"));
+        assertFalse(metadata.get(1).containsKey("_dd.p.any"));
+        assertEquals(
+                1L,
+                metadata.stream().filter(span -> span.containsKey("_dd.p.dm")).count());
+        assertEquals(
+                1L,
+                metadata.stream().filter(span -> span.containsKey("_dd.p.any")).count());
+        assertEquals(rootFirst, metadata.get(0).containsKey("root.only"));
+        assertFalse(metadata.get(1).containsKey("root.only"));
+        if ("v1".equals(protocol)) {
+            assertEquals(3, samplingMechanism);
         }
-        samplingMechanism = v1Chunk.getSamplingMechanism();
-        break;
-      default:
-        throw new IllegalArgumentException("Unexpected protocol: " + protocol);
+        tracer.close();
     }
 
-    assertEquals("-3", metadata.get(0).get("_dd.p.dm"));
-    assertEquals("value", metadata.get(0).get("_dd.p.any"));
-    assertFalse(metadata.get(1).containsKey("_dd.p.dm"));
-    assertFalse(metadata.get(1).containsKey("_dd.p.any"));
-    assertEquals(1L, metadata.stream().filter(span -> span.containsKey("_dd.p.dm")).count());
-    assertEquals(1L, metadata.stream().filter(span -> span.containsKey("_dd.p.any")).count());
-    assertEquals(rootFirst, metadata.get(0).containsKey("root.only"));
-    assertFalse(metadata.get(1).containsKey("root.only"));
-    if ("v1".equals(protocol)) {
-      assertEquals(3, samplingMechanism);
+    @Test
+    void serializeTraceWithFlatMapTagV04() throws Exception {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        DDSpanContext context = new DDSpanContext(
+                DDTraceId.ONE,
+                1,
+                DDSpanId.ZERO,
+                null,
+                "fakeService",
+                "fakeOperation",
+                "fakeResource",
+                PrioritySampling.UNSET,
+                null,
+                null,
+                false,
+                null,
+                0,
+                tracer.createTraceCollector(DDTraceId.ONE),
+                null,
+                null,
+                NoopPathwayContext.INSTANCE,
+                false,
+                null);
+        context.setTag("key1", "value1");
+        Map<String, String> nested = new HashMap<>();
+        nested.put("sub1", "v1");
+        nested.put("sub2", "v2");
+        context.setTag("key2", nested);
+        DDSpan span = DDSpan.create("test", 0, context, null);
+
+        CaptureBuffer capture = new CaptureBuffer();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
+        packer.format(Collections.singletonList(span), new TraceMapperV0_4());
+        packer.flush();
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(capture.bytes));
+        int traceCount = capture.messageCount;
+        int spanCount = unpacker.unpackArrayHeader();
+        int size = unpacker.unpackMapHeader();
+
+        Map<String, String> expectedMeta = new HashMap<>();
+        expectedMeta.put("key1", "value1");
+        expectedMeta.put("key2.sub1", "v1");
+        expectedMeta.put("key2.sub2", "v2");
+
+        assertEquals(1, traceCount);
+        assertEquals(1, spanCount);
+        for (int i = 0; i < size; i++) {
+            String key = unpacker.unpackString();
+            if ("meta".equals(key)) {
+                int packedSize = unpacker.unpackMapHeader();
+                Map<String, String> unpackedMeta = new HashMap<>();
+                for (int j = 0; j < packedSize; j++) {
+                    String k = unpacker.unpackString();
+                    String v = unpacker.unpackString();
+                    if (!isWrittenByMapper(k)) {
+                        unpackedMeta.put(k, v);
+                    }
+                }
+                assertEquals(expectedMeta, unpackedMeta);
+            } else {
+                unpacker.unpackValue();
+            }
+        }
+        tracer.close();
     }
-    tracer.close();
-  }
-
-  @Test
-  void serializeTraceWithFlatMapTagV04() throws Exception {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    DDSpanContext context =
-        new DDSpanContext(
-            DDTraceId.ONE,
-            1,
-            DDSpanId.ZERO,
-            null,
-            "fakeService",
-            "fakeOperation",
-            "fakeResource",
-            PrioritySampling.UNSET,
-            null,
-            null,
-            false,
-            null,
-            0,
-            tracer.createTraceCollector(DDTraceId.ONE),
-            null,
-            null,
-            NoopPathwayContext.INSTANCE,
-            false,
-            null);
-    context.setTag("key1", "value1");
-    Map<String, String> nested = new HashMap<>();
-    nested.put("sub1", "v1");
-    nested.put("sub2", "v2");
-    context.setTag("key2", nested);
-    DDSpan span = DDSpan.create("test", 0, context, null);
-
-    CaptureBuffer capture = new CaptureBuffer();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
-    packer.format(Collections.singletonList(span), new TraceMapperV0_4());
-    packer.flush();
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(capture.bytes));
-    int traceCount = capture.messageCount;
-    int spanCount = unpacker.unpackArrayHeader();
-    int size = unpacker.unpackMapHeader();
-
-    Map<String, String> expectedMeta = new HashMap<>();
-    expectedMeta.put("key1", "value1");
-    expectedMeta.put("key2.sub1", "v1");
-    expectedMeta.put("key2.sub2", "v2");
-
-    assertEquals(1, traceCount);
-    assertEquals(1, spanCount);
-    for (int i = 0; i < size; i++) {
-      String key = unpacker.unpackString();
-      if ("meta".equals(key)) {
+
+    @Test
+    void serializeTraceWithFlatMapTagV05() throws Exception {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        DDSpanContext context = new DDSpanContext(
+                DDTraceId.ONE,
+                1,
+                DDSpanId.ZERO,
+                null,
+                "fakeService",
+                "fakeOperation",
+                "fakeResource",
+                PrioritySampling.UNSET,
+                null,
+                null,
+                false,
+                null,
+                0,
+                tracer.createTraceCollector(DDTraceId.ONE),
+                null,
+                null,
+                NoopPathwayContext.INSTANCE,
+                false,
+                null);
+        context.setTag("key1", "value1");
+        Map<String, String> nested = new HashMap<>();
+        nested.put("sub1", "v1");
+        nested.put("sub2", "v2");
+        context.setTag("key2", nested);
+        DDSpan span = DDSpan.create("test", 0, context, null);
+
+        CaptureBuffer capture = new CaptureBuffer();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
+        TraceMapperV0_5 mapper = new TraceMapperV0_5();
+        packer.format(Collections.singletonList(span), mapper);
+        packer.flush();
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(capture.bytes));
+        int traceCount = capture.messageCount;
+        int spanCount = unpacker.unpackArrayHeader();
+        int size = unpacker.unpackArrayHeader();
+        String[] dictionary = buildDictionary(mapper);
+
+        Map<String, String> expectedMeta = new HashMap<>();
+        expectedMeta.put("key1", "value1");
+        expectedMeta.put("key2.sub1", "v1");
+        expectedMeta.put("key2.sub2", "v2");
+
+        assertEquals(1, traceCount);
+        assertEquals(1, spanCount);
+        assertEquals(12, size);
+        for (int i = 0; i < 9; ++i) {
+            unpacker.skipValue();
+        }
         int packedSize = unpacker.unpackMapHeader();
         Map<String, String> unpackedMeta = new HashMap<>();
         for (int j = 0; j < packedSize; j++) {
-          String k = unpacker.unpackString();
-          String v = unpacker.unpackString();
-          if (!isWrittenByMapper(k)) {
-            unpackedMeta.put(k, v);
-          }
+            String k = dictionary[unpacker.unpackInt()];
+            String v = dictionary[unpacker.unpackInt()];
+            if (!isWrittenByMapper(k)) {
+                unpackedMeta.put(k, v);
+            }
         }
         assertEquals(expectedMeta, unpackedMeta);
-      } else {
-        unpacker.unpackValue();
-      }
+        tracer.close();
     }
-    tracer.close();
-  }
-
-  @Test
-  void serializeTraceWithFlatMapTagV05() throws Exception {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    DDSpanContext context =
-        new DDSpanContext(
-            DDTraceId.ONE,
-            1,
-            DDSpanId.ZERO,
-            null,
-            "fakeService",
-            "fakeOperation",
-            "fakeResource",
-            PrioritySampling.UNSET,
-            null,
-            null,
-            false,
-            null,
-            0,
-            tracer.createTraceCollector(DDTraceId.ONE),
-            null,
-            null,
-            NoopPathwayContext.INSTANCE,
-            false,
-            null);
-    context.setTag("key1", "value1");
-    Map<String, String> nested = new HashMap<>();
-    nested.put("sub1", "v1");
-    nested.put("sub2", "v2");
-    context.setTag("key2", nested);
-    DDSpan span = DDSpan.create("test", 0, context, null);
-
-    CaptureBuffer capture = new CaptureBuffer();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
-    TraceMapperV0_5 mapper = new TraceMapperV0_5();
-    packer.format(Collections.singletonList(span), mapper);
-    packer.flush();
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(capture.bytes));
-    int traceCount = capture.messageCount;
-    int spanCount = unpacker.unpackArrayHeader();
-    int size = unpacker.unpackArrayHeader();
-    String[] dictionary = buildDictionary(mapper);
-
-    Map<String, String> expectedMeta = new HashMap<>();
-    expectedMeta.put("key1", "value1");
-    expectedMeta.put("key2.sub1", "v1");
-    expectedMeta.put("key2.sub2", "v2");
-
-    assertEquals(1, traceCount);
-    assertEquals(1, spanCount);
-    assertEquals(12, size);
-    for (int i = 0; i < 9; ++i) {
-      unpacker.skipValue();
-    }
-    int packedSize = unpacker.unpackMapHeader();
-    Map<String, String> unpackedMeta = new HashMap<>();
-    for (int j = 0; j < packedSize; j++) {
-      String k = dictionary[unpacker.unpackInt()];
-      String v = dictionary[unpacker.unpackInt()];
-      if (!isWrittenByMapper(k)) {
-        unpackedMeta.put(k, v);
-      }
+
+    /**
+     * thread.* and the payload-scoped _dd.sdk.otlp_export marker are written by the mapper, not by
+     * the span under test (see TraceMapperV04/V05PayloadTest).
+     */
+    private static boolean isWrittenByMapper(String key) {
+        return "thread.name".equals(key) || "thread.id".equals(key) || SDK_OTLP_EXPORT.equals(key);
     }
-    assertEquals(expectedMeta, unpackedMeta);
-    tracer.close();
-  }
-
-  /**
-   * thread.* and the payload-scoped _dd.sdk.otlp_export marker are written by the mapper, not by
-   * the span under test (see TraceMapperV04/V05PayloadTest).
-   */
-  private static boolean isWrittenByMapper(String key) {
-    return "thread.name".equals(key) || "thread.id".equals(key) || SDK_OTLP_EXPORT.equals(key);
-  }
-
-  private static class CaptureBuffer implements ByteBufferConsumer {
-    private byte[] bytes;
-    int messageCount;
-
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {
-      this.messageCount = messageCount;
-      this.bytes = new byte[buffer.limit() - buffer.position()];
-      buffer.get(bytes);
+
+    private static class CaptureBuffer implements ByteBufferConsumer {
+        private byte[] bytes;
+        int messageCount;
+
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {
+            this.messageCount = messageCount;
+            this.bytes = new byte[buffer.limit() - buffer.position()];
+            buffer.get(bytes);
+        }
     }
-  }
-
-  private static List<Map<String, ?>> serializeV04Metadata(List<DDSpan> spans) throws Exception {
-    CaptureBuffer capture = new CaptureBuffer();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
-    packer.format(spans, new TraceMapperV0_4());
-    packer.flush();
-
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(capture.bytes));
-    int spanCount = unpacker.unpackArrayHeader();
-    List<Map<String, ?>> metadata = new ArrayList<>(spanCount);
-    for (int i = 0; i < spanCount; i++) {
-      int fieldCount = unpacker.unpackMapHeader();
-      Map<String, String> spanMetadata = Collections.emptyMap();
-      for (int j = 0; j < fieldCount; j++) {
-        String field = unpacker.unpackString();
-        if (!"meta".equals(field)) {
-          unpacker.skipValue();
-          continue;
+
+    private static List<Map<String, ?>> serializeV04Metadata(List<DDSpan> spans) throws Exception {
+        CaptureBuffer capture = new CaptureBuffer();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
+        packer.format(spans, new TraceMapperV0_4());
+        packer.flush();
+
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(capture.bytes));
+        int spanCount = unpacker.unpackArrayHeader();
+        List<Map<String, ?>> metadata = new ArrayList<>(spanCount);
+        for (int i = 0; i < spanCount; i++) {
+            int fieldCount = unpacker.unpackMapHeader();
+            Map<String, String> spanMetadata = Collections.emptyMap();
+            for (int j = 0; j < fieldCount; j++) {
+                String field = unpacker.unpackString();
+                if (!"meta".equals(field)) {
+                    unpacker.skipValue();
+                    continue;
+                }
+                int metadataSize = unpacker.unpackMapHeader();
+                spanMetadata = new HashMap<>(metadataSize);
+                for (int k = 0; k < metadataSize; k++) {
+                    spanMetadata.put(unpacker.unpackString(), unpacker.unpackString());
+                }
+            }
+            metadata.add(spanMetadata);
         }
-        int metadataSize = unpacker.unpackMapHeader();
-        spanMetadata = new HashMap<>(metadataSize);
-        for (int k = 0; k < metadataSize; k++) {
-          spanMetadata.put(unpacker.unpackString(), unpacker.unpackString());
+        return metadata;
+    }
+
+    private static List<Map<String, ?>> serializeV05Metadata(List<DDSpan> spans) throws Exception {
+        CaptureBuffer capture = new CaptureBuffer();
+        TraceMapperV0_5 mapper = new TraceMapperV0_5();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
+        packer.format(spans, mapper);
+        packer.flush();
+
+        String[] dictionary = buildDictionary(mapper);
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(capture.bytes));
+        int spanCount = unpacker.unpackArrayHeader();
+        List<Map<String, ?>> metadata = new ArrayList<>(spanCount);
+        for (int i = 0; i < spanCount; i++) {
+            assertEquals(12, unpacker.unpackArrayHeader());
+            for (int j = 0; j < 9; j++) {
+                unpacker.skipValue();
+            }
+            int metadataSize = unpacker.unpackMapHeader();
+            Map<String, String> spanMetadata = new HashMap<>(metadataSize);
+            for (int j = 0; j < metadataSize; j++) {
+                spanMetadata.put(dictionary[unpacker.unpackInt()], dictionary[unpacker.unpackInt()]);
+            }
+            metadata.add(spanMetadata);
+            unpacker.skipValue();
+            unpacker.skipValue();
         }
-      }
-      metadata.add(spanMetadata);
+        return metadata;
     }
-    return metadata;
-  }
-
-  private static List<Map<String, ?>> serializeV05Metadata(List<DDSpan> spans) throws Exception {
-    CaptureBuffer capture = new CaptureBuffer();
-    TraceMapperV0_5 mapper = new TraceMapperV0_5();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
-    packer.format(spans, mapper);
-    packer.flush();
-
-    String[] dictionary = buildDictionary(mapper);
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(capture.bytes));
-    int spanCount = unpacker.unpackArrayHeader();
-    List<Map<String, ?>> metadata = new ArrayList<>(spanCount);
-    for (int i = 0; i < spanCount; i++) {
-      assertEquals(12, unpacker.unpackArrayHeader());
-      for (int j = 0; j < 9; j++) {
-        unpacker.skipValue();
-      }
-      int metadataSize = unpacker.unpackMapHeader();
-      Map<String, String> spanMetadata = new HashMap<>(metadataSize);
-      for (int j = 0; j < metadataSize; j++) {
-        spanMetadata.put(dictionary[unpacker.unpackInt()], dictionary[unpacker.unpackInt()]);
-      }
-      metadata.add(spanMetadata);
-      unpacker.skipValue();
-      unpacker.skipValue();
+
+    private DDSpanContext createSpanContext(String spanType, CoreTracer tracer, DDTraceId traceId, long spanId) {
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("a-baggage", "value");
+        DDSpanContext ctx = new DDSpanContext(
+                traceId,
+                spanId,
+                DDSpanId.ZERO,
+                null,
+                "fakeService",
+                "fakeOperation",
+                "fakeResource",
+                PrioritySampling.UNSET,
+                null,
+                baggage,
+                false,
+                spanType,
+                1,
+                tracer.createTraceCollector(DDTraceId.ONE),
+                null,
+                null,
+                NoopPathwayContext.INSTANCE,
+                false,
+                null);
+        Map<String, Object> tags = new HashMap<>();
+        tags.put("k1", "v1");
+        ctx.setAllTags(tags);
+        return ctx;
     }
-    return metadata;
-  }
-
-  private DDSpanContext createSpanContext(
-      String spanType, CoreTracer tracer, DDTraceId traceId, long spanId) {
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("a-baggage", "value");
-    DDSpanContext ctx =
-        new DDSpanContext(
-            traceId,
-            spanId,
-            DDSpanId.ZERO,
-            null,
-            "fakeService",
-            "fakeOperation",
-            "fakeResource",
-            PrioritySampling.UNSET,
-            null,
-            baggage,
-            false,
-            spanType,
-            1,
-            tracer.createTraceCollector(DDTraceId.ONE),
-            null,
-            null,
-            NoopPathwayContext.INSTANCE,
-            false,
-            null);
-    Map<String, Object> tags = new HashMap<>();
-    tags.put("k1", "v1");
-    ctx.setAllTags(tags);
-    return ctx;
-  }
-
-  private DDSpanContext createSpanContext(
-      CoreTracer tracer,
-      Map<String, String> baggage,
-      Baggage w3cBaggage,
-      boolean injectBaggage,
-      boolean injectLinks,
-      int tagsSize) {
-    return new DDSpanContext(
-        DDTraceId.ONE,
-        1,
-        DDSpanId.ZERO,
-        null,
-        null,
-        "fakeService",
-        "fakeOperation",
-        "fakeResource",
-        PrioritySampling.UNSET,
-        null,
-        baggage,
-        w3cBaggage,
-        false,
-        "fakeType",
-        tagsSize,
-        tracer.createTraceCollector(DDTraceId.ONE),
-        null,
-        null,
-        null,
-        NoopPathwayContext.INSTANCE,
-        false,
-        null,
-        ProfilingContextIntegration.NoOp.INSTANCE,
-        injectBaggage,
-        injectLinks);
-  }
-
-  private static byte[] serializeV1Payload(DDSpan span) throws Exception {
-    return serializeV1Payload(Collections.singletonList(span));
-  }
-
-  private static byte[] serializeV1Payload(List<DDSpan> spans) throws Exception {
-    TraceMapperV1 mapper = new TraceMapperV1();
-    CapturePayloadBuffer capture = new CapturePayloadBuffer(mapper);
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
-    packer.format(spans, mapper);
-    packer.flush();
-    assertNotNull(capture.bytes);
-    return capture.bytes;
-  }
-
-  private static String[] buildDictionary(TraceMapperV0_5 mapper) throws Exception {
-    GrowableBuffer dictionaryBuffer = TraceMapperTestBridge.getDictionary(mapper);
-    Map<?, ?> encoding = TraceMapperTestBridge.getEncoding(mapper);
-
-    String[] dictionary = new String[encoding.size()];
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(dictionaryBuffer.slice());
-    for (int i = 0; i < dictionary.length; ++i) {
-      dictionary[i] = unpacker.unpackString();
+
+    private DDSpanContext createSpanContext(
+            CoreTracer tracer,
+            Map<String, String> baggage,
+            Baggage w3cBaggage,
+            boolean injectBaggage,
+            boolean injectLinks,
+            int tagsSize) {
+        return new DDSpanContext(
+                DDTraceId.ONE,
+                1,
+                DDSpanId.ZERO,
+                null,
+                null,
+                "fakeService",
+                "fakeOperation",
+                "fakeResource",
+                PrioritySampling.UNSET,
+                null,
+                baggage,
+                w3cBaggage,
+                false,
+                "fakeType",
+                tagsSize,
+                tracer.createTraceCollector(DDTraceId.ONE),
+                null,
+                null,
+                null,
+                NoopPathwayContext.INSTANCE,
+                false,
+                null,
+                ProfilingContextIntegration.NoOp.INSTANCE,
+                injectBaggage,
+                injectLinks);
     }
-    return dictionary;
-  }
 
-  private static final class CapturePayloadBuffer implements ByteBufferConsumer {
-    private final TraceMapperV1 mapper;
-    private byte[] bytes;
+    private static byte[] serializeV1Payload(DDSpan span) throws Exception {
+        return serializeV1Payload(Collections.singletonList(span));
+    }
 
-    private CapturePayloadBuffer(TraceMapperV1 mapper) {
-      this.mapper = mapper;
+    private static byte[] serializeV1Payload(List<DDSpan> spans) throws Exception {
+        TraceMapperV1 mapper = new TraceMapperV1();
+        CapturePayloadBuffer capture = new CapturePayloadBuffer(mapper);
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture));
+        packer.format(spans, mapper);
+        packer.flush();
+        assertNotNull(capture.bytes);
+        return capture.bytes;
     }
 
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {
-      ByteArrayOutputStream out = new ByteArrayOutputStream();
-      try {
-        Payload payload = mapper.newPayload().withBody(messageCount, buffer);
-        payload.writeTo(Channels.newChannel(out));
-        bytes = out.toByteArray();
-      } catch (IOException e) {
-        throw new IllegalStateException(e);
-      } finally {
-        mapper.reset();
-      }
+    private static String[] buildDictionary(TraceMapperV0_5 mapper) throws Exception {
+        GrowableBuffer dictionaryBuffer = TraceMapperTestBridge.getDictionary(mapper);
+        Map<?, ?> encoding = TraceMapperTestBridge.getEncoding(mapper);
+
+        String[] dictionary = new String[encoding.size()];
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(dictionaryBuffer.slice());
+        for (int i = 0; i < dictionary.length; ++i) {
+            dictionary[i] = unpacker.unpackString();
+        }
+        return dictionary;
+    }
+
+    private static final class CapturePayloadBuffer implements ByteBufferConsumer {
+        private final TraceMapperV1 mapper;
+        private byte[] bytes;
+
+        private CapturePayloadBuffer(TraceMapperV1 mapper) {
+            this.mapper = mapper;
+        }
+
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            try {
+                Payload payload = mapper.newPayload().withBody(messageCount, buffer);
+                payload.writeTo(Channels.newChannel(out));
+                bytes = out.toByteArray();
+            } catch (IOException e) {
+                throw new IllegalStateException(e);
+            } finally {
+                mapper.reset();
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanTest.java b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanTest.java
index a05e9d982c4..5e5597223a4 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanTest.java
@@ -52,492 +52,473 @@
 
 public class DDSpanTest extends DDCoreJavaSpecification {
 
-  private ListWriter writer;
-  private CoreTracer tracer;
-
-  @BeforeEach
-  void setup() {
-    writer = new ListWriter();
-    tracer = tracerBuilder().writer(writer).sampler(new RateByServiceTraceSampler()).build();
-  }
-
-  @Test
-  void gettersAndSetters() {
-    DDSpan span =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", "fakeOperation")
+    private ListWriter writer;
+    private CoreTracer tracer;
+
+    @BeforeEach
+    void setup() {
+        writer = new ListWriter();
+        tracer = tracerBuilder()
+                .writer(writer)
+                .sampler(new RateByServiceTraceSampler())
+                .build();
+    }
+
+    @Test
+    void gettersAndSetters() {
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "fakeOperation")
                 .withServiceName("fakeService")
                 .withResourceName("fakeResource")
                 .withSpanType("fakeType")
                 .start();
 
-    span.setServiceName("service");
-    assertEquals("service", span.getServiceName());
+        span.setServiceName("service");
+        assertEquals("service", span.getServiceName());
 
-    span.setOperationName("operation");
-    assertEquals("operation", span.getOperationName().toString());
+        span.setOperationName("operation");
+        assertEquals("operation", span.getOperationName().toString());
 
-    span.setResourceName("resource");
-    assertEquals("resource", span.getResourceName().toString());
+        span.setResourceName("resource");
+        assertEquals("resource", span.getResourceName().toString());
 
-    span.setSpanType("type");
-    assertEquals("type", span.getType());
+        span.setSpanType("type");
+        assertEquals("type", span.getType());
 
-    span.setSamplingPriority(PrioritySampling.UNSET);
-    assertNull(span.getSamplingPriority());
+        span.setSamplingPriority(PrioritySampling.UNSET);
+        assertNull(span.getSamplingPriority());
 
-    span.setSamplingPriority(PrioritySampling.SAMPLER_KEEP);
-    assertEquals(PrioritySampling.SAMPLER_KEEP, (int) span.getSamplingPriority());
+        span.setSamplingPriority(PrioritySampling.SAMPLER_KEEP);
+        assertEquals(PrioritySampling.SAMPLER_KEEP, (int) span.getSamplingPriority());
 
-    span.spanContext().lockSamplingPriority();
-    span.setSamplingPriority(PrioritySampling.USER_KEEP);
-    assertEquals(PrioritySampling.SAMPLER_KEEP, (int) span.getSamplingPriority());
-  }
+        span.spanContext().lockSamplingPriority();
+        span.setSamplingPriority(PrioritySampling.USER_KEEP);
+        assertEquals(PrioritySampling.SAMPLER_KEEP, (int) span.getSamplingPriority());
+    }
 
-  @Test
-  void resourceNameEqualsOperationNameIfNull() {
-    String opName = "operationName";
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", opName).start();
-    assertEquals(opName, span.getResourceName().toString());
-    assertFalse(span.getServiceName().isEmpty());
+    @Test
+    void resourceNameEqualsOperationNameIfNull() {
+        String opName = "operationName";
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", opName).start();
+        assertEquals(opName, span.getResourceName().toString());
+        assertFalse(span.getServiceName().isEmpty());
 
-    String resourceName = "fake";
-    String serviceName = "myService";
-    span =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", opName)
+        String resourceName = "fake";
+        String serviceName = "myService";
+        span = (DDSpan) tracer.buildSpan("datadog", opName)
                 .withResourceName(resourceName)
                 .withServiceName(serviceName)
                 .start();
-    assertEquals(resourceName, span.getResourceName().toString());
-    assertEquals(serviceName, span.getServiceName());
-  }
-
-  @Test
-  void durationMeasuredInNanoseconds() {
-    long mod = TimeUnit.MILLISECONDS.toNanos(1);
-    long start = System.nanoTime();
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
-    long between = System.nanoTime();
-    long betweenDur = System.nanoTime() - between;
-    span.finish();
-    long total = System.nanoTime() - start;
-
-    // Generous 5 seconds to execute this test
-    assertTrue(
-        Math.abs(
-                TimeUnit.NANOSECONDS.toSeconds(span.getStartTime())
-                    - TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()))
-            < 5);
-    assertTrue(span.getDurationNano() > betweenDur);
-    assertTrue(span.getDurationNano() < total);
-    assertTrue(span.getDurationNano() % mod > 0);
-  }
-
-  @Test
-  void phasedFinishCapturesDurationButDoesNotPublishImmediately() throws Exception {
-    long mod = TimeUnit.MILLISECONDS.toNanos(1);
-    long start = System.nanoTime();
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
-    long between = System.nanoTime();
-    long betweenDur = System.nanoTime() - between;
-    // calling publish before phasedFinish
-    span.publish();
-    // has no effect
-    assertEquals(0, span.getDurationNano());
-    assertEquals(1, pendingReferenceCount(span));
-    assertEquals(0, writer.size());
-
-    boolean finish = span.phasedFinish();
-    long total = System.nanoTime() - start;
-
-    assertTrue(finish);
-    assertEquals(1, pendingReferenceCount(span));
-    assertTrue(spans(span).isEmpty());
-    assertTrue(writer.isEmpty());
-    // duration is recorded as negative to allow publishing
-    assertTrue(span.getDurationNano() < 0);
-    long actualDurationNano = span.getDurationNano() & Long.MAX_VALUE;
-    // Generous 5 seconds to execute this test
-    assertTrue(
-        Math.abs(
-                TimeUnit.NANOSECONDS.toSeconds(span.getStartTime())
-                    - TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()))
-            < 5);
-    assertTrue(actualDurationNano > betweenDur);
-    assertTrue(actualDurationNano < total);
-    assertTrue(actualDurationNano % mod > 0); // Very slim chance of a false negative.
-    // extra finishes
-    finish = span.phasedFinish();
-    // have no effect
-    span.finish(); // verify conflicting finishes are ignored
-    assertFalse(finish);
-    assertEquals(1, pendingReferenceCount(span));
-    assertTrue(spans(span).isEmpty());
-    assertTrue(writer.isEmpty());
-
-    span.publish();
-    // duration is flipped to positive
-    assertTrue(span.getDurationNano() > 0);
-    assertEquals(actualDurationNano, span.getDurationNano());
-    assertEquals(0, pendingReferenceCount(span));
-    assertEquals(1, writer.size());
-    // duplicate call to publish"
-    span.publish();
-    // has no effect
-    assertEquals(0, pendingReferenceCount(span));
-    assertEquals(1, writer.size());
-  }
-
-  @Test
-  void startingWithTimestampDisablesNanotime() {
-    long mod = TimeUnit.MILLISECONDS.toNanos(1);
-    long start = System.currentTimeMillis();
-    DDSpan span =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", "test")
+        assertEquals(resourceName, span.getResourceName().toString());
+        assertEquals(serviceName, span.getServiceName());
+    }
+
+    @Test
+    void durationMeasuredInNanoseconds() {
+        long mod = TimeUnit.MILLISECONDS.toNanos(1);
+        long start = System.nanoTime();
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
+        long between = System.nanoTime();
+        long betweenDur = System.nanoTime() - between;
+        span.finish();
+        long total = System.nanoTime() - start;
+
+        // Generous 5 seconds to execute this test
+        assertTrue(Math.abs(TimeUnit.NANOSECONDS.toSeconds(span.getStartTime())
+                        - TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()))
+                < 5);
+        assertTrue(span.getDurationNano() > betweenDur);
+        assertTrue(span.getDurationNano() < total);
+        assertTrue(span.getDurationNano() % mod > 0);
+    }
+
+    @Test
+    void phasedFinishCapturesDurationButDoesNotPublishImmediately() throws Exception {
+        long mod = TimeUnit.MILLISECONDS.toNanos(1);
+        long start = System.nanoTime();
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
+        long between = System.nanoTime();
+        long betweenDur = System.nanoTime() - between;
+        // calling publish before phasedFinish
+        span.publish();
+        // has no effect
+        assertEquals(0, span.getDurationNano());
+        assertEquals(1, pendingReferenceCount(span));
+        assertEquals(0, writer.size());
+
+        boolean finish = span.phasedFinish();
+        long total = System.nanoTime() - start;
+
+        assertTrue(finish);
+        assertEquals(1, pendingReferenceCount(span));
+        assertTrue(spans(span).isEmpty());
+        assertTrue(writer.isEmpty());
+        // duration is recorded as negative to allow publishing
+        assertTrue(span.getDurationNano() < 0);
+        long actualDurationNano = span.getDurationNano() & Long.MAX_VALUE;
+        // Generous 5 seconds to execute this test
+        assertTrue(Math.abs(TimeUnit.NANOSECONDS.toSeconds(span.getStartTime())
+                        - TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()))
+                < 5);
+        assertTrue(actualDurationNano > betweenDur);
+        assertTrue(actualDurationNano < total);
+        assertTrue(actualDurationNano % mod > 0); // Very slim chance of a false negative.
+        // extra finishes
+        finish = span.phasedFinish();
+        // have no effect
+        span.finish(); // verify conflicting finishes are ignored
+        assertFalse(finish);
+        assertEquals(1, pendingReferenceCount(span));
+        assertTrue(spans(span).isEmpty());
+        assertTrue(writer.isEmpty());
+
+        span.publish();
+        // duration is flipped to positive
+        assertTrue(span.getDurationNano() > 0);
+        assertEquals(actualDurationNano, span.getDurationNano());
+        assertEquals(0, pendingReferenceCount(span));
+        assertEquals(1, writer.size());
+        // duplicate call to publish"
+        span.publish();
+        // has no effect
+        assertEquals(0, pendingReferenceCount(span));
+        assertEquals(1, writer.size());
+    }
+
+    @Test
+    void startingWithTimestampDisablesNanotime() {
+        long mod = TimeUnit.MILLISECONDS.toNanos(1);
+        long start = System.currentTimeMillis();
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test")
                 .withStartTimestamp(TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis()))
                 .start();
-    long between = System.currentTimeMillis();
-    long betweenDur = System.currentTimeMillis() - between;
-    span.finish();
-    long total = Math.max(1, System.currentTimeMillis() - start);
-
-    // Generous 5 seconds to execute this test
-    assertTrue(
-        Math.abs(
-                TimeUnit.NANOSECONDS.toSeconds(span.getStartTime())
-                    - TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()))
-            < 5);
-    assertTrue(span.getDurationNano() >= TimeUnit.MILLISECONDS.toNanos(betweenDur));
-    assertTrue(span.getDurationNano() <= TimeUnit.MILLISECONDS.toNanos(total));
-    assertTrue(span.getDurationNano() % mod == 0 || span.getDurationNano() == 1);
-  }
-
-  @Test
-  void stoppingWithTimestampDisablesNanotime() {
-    long mod = TimeUnit.MILLISECONDS.toNanos(1);
-    long start = System.currentTimeMillis();
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
-    long between = System.currentTimeMillis();
-    long betweenDur = System.currentTimeMillis() - between;
-    span.finish(TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis() + 1));
-    long total = System.currentTimeMillis() - start + 1;
-
-    // Generous 5 seconds to execute this test
-    assertTrue(
-        Math.abs(
-                TimeUnit.NANOSECONDS.toSeconds(span.getStartTime())
-                    - TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()))
-            < 5);
-    assertTrue(span.getDurationNano() >= TimeUnit.MILLISECONDS.toNanos(betweenDur));
-    assertTrue(span.getDurationNano() <= TimeUnit.MILLISECONDS.toNanos(total));
-    // true span duration can be <1ms if clock was about to tick over, so allow for that
-    assertTrue(span.getDurationNano() % mod == 0 || span.getDurationNano() == 1);
-  }
-
-  @Test
-  void stoppingWithTimestampBeforeStartTimeYieldsMinDurationOfOne() {
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
-    // remove tick precision part of our internal time to match previous test condition
-    span.finish(
-        TimeUnit.MILLISECONDS.toMicros(TimeUnit.NANOSECONDS.toMillis(span.getStartTimeNano()))
-            - 10);
-    assertEquals(1, span.getDurationNano());
-  }
-
-  @Test
-  void prioritySamplingMetricSetOnlyOnRootSpan() {
-    DDSpan parent = (DDSpan) tracer.buildSpan("datadog", "testParent").start();
-    DDSpan child1 =
-        (DDSpan) tracer.buildSpan("datadog", "testChild1").asChildOf(parent.spanContext()).start();
-
-    child1.setSamplingPriority(PrioritySampling.SAMPLER_KEEP);
-    child1.spanContext().lockSamplingPriority();
-    parent.setSamplingPriority(PrioritySampling.SAMPLER_DROP);
-    child1.finish();
-    DDSpan child2 =
-        (DDSpan) tracer.buildSpan("datadog", "testChild2").asChildOf(parent.spanContext()).start();
-    child2.finish();
-    parent.finish();
-
-    assertEquals(PrioritySampling.SAMPLER_KEEP, parent.spanContext().getSamplingPriority());
-    assertEquals(PrioritySampling.SAMPLER_KEEP, (int) parent.getSamplingPriority());
-    assertTrue(parent.hasSamplingPriority());
-    assertEquals(parent.getSamplingPriority(), child1.getSamplingPriority());
-    assertEquals(parent.getSamplingPriority(), child2.getSamplingPriority());
-    assertFalse(child1.hasSamplingPriority());
-    assertFalse(child2.hasSamplingPriority());
-  }
-
-  static Stream<Arguments> originSetOnlyOnRootSpanArguments() {
-    return Stream.of(
-        arguments("TagContext", new TagContext("some-origin", TagMap.fromMap(new HashMap<>()))),
-        arguments(
-            "ExtractedContext",
-            new ExtractedContext(
-                DDTraceId.ONE,
-                2,
-                SAMPLER_DROP,
-                "some-origin",
-                PropagationTags.factory().empty(),
-                DATADOG)));
-  }
-
-  @ParameterizedTest
-  @MethodSource("originSetOnlyOnRootSpanArguments")
-  void originSetOnlyOnRootSpan(String scenario, AgentSpanContext extractedContext)
-      throws Exception {
-    DDSpanContext parent =
-        (DDSpanContext)
-            tracer
-                .buildSpan("datadog", "testParent")
+        long between = System.currentTimeMillis();
+        long betweenDur = System.currentTimeMillis() - between;
+        span.finish();
+        long total = Math.max(1, System.currentTimeMillis() - start);
+
+        // Generous 5 seconds to execute this test
+        assertTrue(Math.abs(TimeUnit.NANOSECONDS.toSeconds(span.getStartTime())
+                        - TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()))
+                < 5);
+        assertTrue(span.getDurationNano() >= TimeUnit.MILLISECONDS.toNanos(betweenDur));
+        assertTrue(span.getDurationNano() <= TimeUnit.MILLISECONDS.toNanos(total));
+        assertTrue(span.getDurationNano() % mod == 0 || span.getDurationNano() == 1);
+    }
+
+    @Test
+    void stoppingWithTimestampDisablesNanotime() {
+        long mod = TimeUnit.MILLISECONDS.toNanos(1);
+        long start = System.currentTimeMillis();
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
+        long between = System.currentTimeMillis();
+        long betweenDur = System.currentTimeMillis() - between;
+        span.finish(TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis() + 1));
+        long total = System.currentTimeMillis() - start + 1;
+
+        // Generous 5 seconds to execute this test
+        assertTrue(Math.abs(TimeUnit.NANOSECONDS.toSeconds(span.getStartTime())
+                        - TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()))
+                < 5);
+        assertTrue(span.getDurationNano() >= TimeUnit.MILLISECONDS.toNanos(betweenDur));
+        assertTrue(span.getDurationNano() <= TimeUnit.MILLISECONDS.toNanos(total));
+        // true span duration can be <1ms if clock was about to tick over, so allow for that
+        assertTrue(span.getDurationNano() % mod == 0 || span.getDurationNano() == 1);
+    }
+
+    @Test
+    void stoppingWithTimestampBeforeStartTimeYieldsMinDurationOfOne() {
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").start();
+        // remove tick precision part of our internal time to match previous test condition
+        span.finish(TimeUnit.MILLISECONDS.toMicros(TimeUnit.NANOSECONDS.toMillis(span.getStartTimeNano())) - 10);
+        assertEquals(1, span.getDurationNano());
+    }
+
+    @Test
+    void prioritySamplingMetricSetOnlyOnRootSpan() {
+        DDSpan parent = (DDSpan) tracer.buildSpan("datadog", "testParent").start();
+        DDSpan child1 = (DDSpan) tracer.buildSpan("datadog", "testChild1")
+                .asChildOf(parent.spanContext())
+                .start();
+
+        child1.setSamplingPriority(PrioritySampling.SAMPLER_KEEP);
+        child1.spanContext().lockSamplingPriority();
+        parent.setSamplingPriority(PrioritySampling.SAMPLER_DROP);
+        child1.finish();
+        DDSpan child2 = (DDSpan) tracer.buildSpan("datadog", "testChild2")
+                .asChildOf(parent.spanContext())
+                .start();
+        child2.finish();
+        parent.finish();
+
+        assertEquals(PrioritySampling.SAMPLER_KEEP, parent.spanContext().getSamplingPriority());
+        assertEquals(PrioritySampling.SAMPLER_KEEP, (int) parent.getSamplingPriority());
+        assertTrue(parent.hasSamplingPriority());
+        assertEquals(parent.getSamplingPriority(), child1.getSamplingPriority());
+        assertEquals(parent.getSamplingPriority(), child2.getSamplingPriority());
+        assertFalse(child1.hasSamplingPriority());
+        assertFalse(child2.hasSamplingPriority());
+    }
+
+    static Stream<Arguments> originSetOnlyOnRootSpanArguments() {
+        return Stream.of(
+                arguments("TagContext", new TagContext("some-origin", TagMap.fromMap(new HashMap<>()))),
+                arguments(
+                        "ExtractedContext",
+                        new ExtractedContext(
+                                DDTraceId.ONE,
+                                2,
+                                SAMPLER_DROP,
+                                "some-origin",
+                                PropagationTags.factory().empty(),
+                                DATADOG)));
+    }
+
+    @ParameterizedTest
+    @MethodSource("originSetOnlyOnRootSpanArguments")
+    void originSetOnlyOnRootSpan(String scenario, AgentSpanContext extractedContext) throws Exception {
+        DDSpanContext parent = (DDSpanContext) tracer.buildSpan("datadog", "testParent")
                 .asChildOf(extractedContext)
                 .start()
                 .spanContext();
-    DDSpanContext child =
-        (DDSpanContext)
-            tracer.buildSpan("datadog", "testChild1").asChildOf(parent).start().spanContext();
-
-    assertEquals("some-origin", parent.getOrigin().toString());
-    // Access field directly instead of getter.
-    Field originField = DDSpanContext.class.getDeclaredField("origin");
-    originField.setAccessible(true);
-    assertEquals("some-origin", originField.get(parent).toString());
-    assertEquals("some-origin", child.getOrigin().toString());
-    // Access field directly instead of getter.
-    assertNull(originField.get(child));
-  }
-
-  static Stream<Arguments> isRootSpanArguments() {
-    return Stream.of(
-        arguments("no parent", null, true),
-        arguments(
-            "distributed parent",
-            new ExtractedContext(
-                DDTraceId.from(123),
-                456,
-                SAMPLER_KEEP,
-                "789",
-                PropagationTags.factory().empty(),
-                DATADOG),
-            false));
-  }
-
-  @ParameterizedTest
-  @MethodSource("isRootSpanArguments")
-  void isRootSpanInAndNotInContextOfDistributedTracing(
-      String scenario, AgentSpanContext extractedContext, boolean isTraceRootSpan) {
-    DDSpan root = (DDSpan) tracer.buildSpan("datadog", "root").asChildOf(extractedContext).start();
-    DDSpan child =
-        (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(root.spanContext()).start();
-
-    assertEquals(isTraceRootSpan, root.isRootSpan());
-    assertFalse(child.isRootSpan());
-
-    child.finish();
-    root.finish();
-  }
-
-  static Stream<Arguments> getApplicationRootSpanArguments() {
-    return Stream.of(
-        arguments("no parent", null),
-        arguments(
-            "distributed parent",
-            new ExtractedContext(
-                DDTraceId.from(123),
-                456,
-                SAMPLER_KEEP,
-                "789",
-                PropagationTags.factory().empty(),
-                DATADOG)));
-  }
-
-  @ParameterizedTest
-  @MethodSource("getApplicationRootSpanArguments")
-  void getApplicationRootSpanInAndNotInContextOfDistributedTracing(
-      String scenario, AgentSpanContext extractedContext) {
-    DDSpan root = (DDSpan) tracer.buildSpan("datadog", "root").asChildOf(extractedContext).start();
-    DDSpan child =
-        (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(root.spanContext()).start();
-
-    assertEquals(root, root.getLocalRootSpan());
-    assertEquals(root, child.getLocalRootSpan());
-    // Checking for backward compatibility method names
-    assertEquals(root, root.getRootSpan());
-    assertEquals(root, child.getRootSpan());
-
-    child.finish();
-    root.finish();
-  }
-
-  @Test
-  void publishingOfRootSpanClosesRequestContextData() throws Exception {
-    Closeable reqContextData = mock(Closeable.class);
-    TagContext context = new TagContext().withRequestContextDataAppSec(reqContextData);
-    DDSpan root = (DDSpan) tracer.buildSpan("datadog", "root").asChildOf(context).start();
-    DDSpan child =
-        (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(root.spanContext()).start();
-
-    assertEquals(reqContextData, root.getRequestContext().getData(RequestContextSlot.APPSEC));
-    assertEquals(reqContextData, child.getRequestContext().getData(RequestContextSlot.APPSEC));
-
-    child.finish();
-    verify(reqContextData, never()).close();
-
-    root.finish();
-    verify(reqContextData, times(1)).close();
-  }
-
-  static Stream<Arguments> inferTopLevelFromParentServiceNameArguments() {
-    return Stream.of(
-        arguments("String foo", "foo", true),
-        arguments("UTF8BytesString foo", UTF8BytesString.create("foo"), true),
-        arguments("String fakeService", "fakeService", false),
-        arguments("UTF8BytesString fakeService", UTF8BytesString.create("fakeService"), false),
-        arguments("empty string", "", true),
-        arguments("null", null, true));
-  }
-
-  @ParameterizedTest
-  @MethodSource("inferTopLevelFromParentServiceNameArguments")
-  void inferTopLevelFromParentServiceName(
-      String scenario, CharSequence parentServiceName, boolean expectTopLevel) {
-    DDSpanContext context =
-        new DDSpanContext(
-            DDTraceId.ONE,
-            1,
-            DDSpanId.ZERO,
-            parentServiceName,
-            "fakeService",
-            "fakeOperation",
-            "fakeResource",
-            PrioritySampling.UNSET,
-            null,
-            Collections.emptyMap(),
-            false,
-            "fakeType",
-            0,
-            tracer.createTraceCollector(DDTraceId.ONE),
-            null,
-            null,
-            NoopPathwayContext.INSTANCE,
-            false,
-            PropagationTags.factory().empty());
-    assertEquals(expectTopLevel, context.isTopLevel());
-  }
-
-  @Test
-  void brokenPipeExceptionDoesNotCreateErrorSpan() {
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
-    span.addThrowable(new IOException("Broken pipe"));
-    assertFalse(span.isError());
-    assertNull(span.getTag(DDTags.ERROR_STACK));
-    assertEquals("Broken pipe", span.getTag(DDTags.ERROR_MSG));
-  }
-
-  @Test
-  void wrappedBrokenPipeExceptionDoesNotCreateErrorSpan() {
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
-    span.addThrowable(new RuntimeException(new IOException("Broken pipe")));
-    assertFalse(span.isError());
-    assertNull(span.getTag(DDTags.ERROR_STACK));
-    assertEquals("java.io.IOException: Broken pipe", span.getTag(DDTags.ERROR_MSG));
-  }
-
-  @Test
-  void nullExceptionSafeToAdd() {
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
-    span.addThrowable(null);
-    assertFalse(span.isError());
-    assertNull(span.getTag(DDTags.ERROR_STACK));
-  }
-
-  @Test
-  void addThrowableDoesNotFailWhenGetMessageThrows() {
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
-
-    span.addThrowable(TestThrowables.throwingGetMessage());
-
-    assertTrue(span.isError());
-    assertNotNull(span.getTag(DDTags.ERROR_TYPE));
-    assertNotNull(
-        span.getTag(DDTags.ERROR_STACK),
-        "stack trace must be captured even when getMessage() throws");
-    assertTrue(((String) span.getTag(DDTags.ERROR_MSG)).contains("Exception message unavailable"));
-  }
-
-  @Test
-  void addThrowableDoesNotFailWhenGetCauseMessageThrows() {
-    // Outer exception has a normal message, so the broken-pipe check reaches
-    // getCause().getMessage()
-    RuntimeException error =
-        new RuntimeException("outer message", TestThrowables.throwingGetMessage());
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
-
-    span.addThrowable(error);
-
-    assertTrue(span.isError());
-    assertNotNull(span.getTag(DDTags.ERROR_TYPE));
-    assertNotNull(
-        span.getTag(DDTags.ERROR_STACK),
-        "stack trace must be captured even when cause's getMessage() throws");
-    // Outer getMessage() works normally — message must be recorded
-    assertEquals("outer message", span.getTag(DDTags.ERROR_MSG));
-  }
-
-  @TableTest({
-    "scenario         | rate | limit     ",
-    "rate=1.0 lim=10  | 1.0  | 10        ",
-    "rate=0.5 lim=100 | 0.5  | 100       ",
-    "rate=0.25 no lim | 0.25 | 2147483647"
-  })
-  void setSingleSpanSamplingTags(String scenario, double rate, int limit) {
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "testSpan").start();
-    assertEquals(UNSET, span.samplingPriority());
-
-    span.setSpanSamplingPriority(rate, limit);
-
-    assertEquals((int) SPAN_SAMPLING_RATE, span.getTag(SPAN_SAMPLING_MECHANISM_TAG));
-    assertEquals(rate, span.getTag(SPAN_SAMPLING_RULE_RATE_TAG));
-    assertEquals(
-        limit == Integer.MAX_VALUE ? null : (double) limit,
-        span.getTag(SPAN_SAMPLING_MAX_PER_SECOND_TAG));
-    // single span sampling should not change the trace sampling priority
-    assertEquals(UNSET, span.samplingPriority());
-  }
-
-  @Test
-  void errorPrioritiesShouldBeRespected() {
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "testSpan").start();
-    assertFalse(span.isError());
-
-    span.setError(true);
-    assertTrue(span.isError());
-
-    span.setError(false);
-    assertFalse(span.isError());
-
-    span.setError(true, ErrorPriorities.HTTP_SERVER_DECORATOR);
-    assertFalse(span.isError());
-
-    span.setError(true, ErrorPriorities.MANUAL_INSTRUMENTATION);
-    assertTrue(span.isError());
-
-    span.setError(true, Byte.MAX_VALUE);
-    assertTrue(span.isError());
-  }
-
-  private static int pendingReferenceCount(DDSpan span) {
-    PendingTrace trace = (PendingTrace) span.spanContext().getTraceCollector();
-    return PendingTraceTestBridge.getPendingReferenceCount(trace);
-  }
-
-  private static Collection<DDSpan> spans(DDSpan span) {
-    PendingTrace trace = (PendingTrace) span.spanContext().getTraceCollector();
-    return trace.getSpans();
-  }
+        DDSpanContext child = (DDSpanContext) tracer.buildSpan("datadog", "testChild1")
+                .asChildOf(parent)
+                .start()
+                .spanContext();
+
+        assertEquals("some-origin", parent.getOrigin().toString());
+        // Access field directly instead of getter.
+        Field originField = DDSpanContext.class.getDeclaredField("origin");
+        originField.setAccessible(true);
+        assertEquals("some-origin", originField.get(parent).toString());
+        assertEquals("some-origin", child.getOrigin().toString());
+        // Access field directly instead of getter.
+        assertNull(originField.get(child));
+    }
+
+    static Stream<Arguments> isRootSpanArguments() {
+        return Stream.of(
+                arguments("no parent", null, true),
+                arguments(
+                        "distributed parent",
+                        new ExtractedContext(
+                                DDTraceId.from(123),
+                                456,
+                                SAMPLER_KEEP,
+                                "789",
+                                PropagationTags.factory().empty(),
+                                DATADOG),
+                        false));
+    }
+
+    @ParameterizedTest
+    @MethodSource("isRootSpanArguments")
+    void isRootSpanInAndNotInContextOfDistributedTracing(
+            String scenario, AgentSpanContext extractedContext, boolean isTraceRootSpan) {
+        DDSpan root = (DDSpan)
+                tracer.buildSpan("datadog", "root").asChildOf(extractedContext).start();
+        DDSpan child = (DDSpan) tracer.buildSpan("datadog", "child")
+                .asChildOf(root.spanContext())
+                .start();
+
+        assertEquals(isTraceRootSpan, root.isRootSpan());
+        assertFalse(child.isRootSpan());
+
+        child.finish();
+        root.finish();
+    }
+
+    static Stream<Arguments> getApplicationRootSpanArguments() {
+        return Stream.of(
+                arguments("no parent", null),
+                arguments(
+                        "distributed parent",
+                        new ExtractedContext(
+                                DDTraceId.from(123),
+                                456,
+                                SAMPLER_KEEP,
+                                "789",
+                                PropagationTags.factory().empty(),
+                                DATADOG)));
+    }
+
+    @ParameterizedTest
+    @MethodSource("getApplicationRootSpanArguments")
+    void getApplicationRootSpanInAndNotInContextOfDistributedTracing(
+            String scenario, AgentSpanContext extractedContext) {
+        DDSpan root = (DDSpan)
+                tracer.buildSpan("datadog", "root").asChildOf(extractedContext).start();
+        DDSpan child = (DDSpan) tracer.buildSpan("datadog", "child")
+                .asChildOf(root.spanContext())
+                .start();
+
+        assertEquals(root, root.getLocalRootSpan());
+        assertEquals(root, child.getLocalRootSpan());
+        // Checking for backward compatibility method names
+        assertEquals(root, root.getRootSpan());
+        assertEquals(root, child.getRootSpan());
+
+        child.finish();
+        root.finish();
+    }
+
+    @Test
+    void publishingOfRootSpanClosesRequestContextData() throws Exception {
+        Closeable reqContextData = mock(Closeable.class);
+        TagContext context = new TagContext().withRequestContextDataAppSec(reqContextData);
+        DDSpan root =
+                (DDSpan) tracer.buildSpan("datadog", "root").asChildOf(context).start();
+        DDSpan child = (DDSpan) tracer.buildSpan("datadog", "child")
+                .asChildOf(root.spanContext())
+                .start();
+
+        assertEquals(reqContextData, root.getRequestContext().getData(RequestContextSlot.APPSEC));
+        assertEquals(reqContextData, child.getRequestContext().getData(RequestContextSlot.APPSEC));
+
+        child.finish();
+        verify(reqContextData, never()).close();
+
+        root.finish();
+        verify(reqContextData, times(1)).close();
+    }
+
+    static Stream<Arguments> inferTopLevelFromParentServiceNameArguments() {
+        return Stream.of(
+                arguments("String foo", "foo", true),
+                arguments("UTF8BytesString foo", UTF8BytesString.create("foo"), true),
+                arguments("String fakeService", "fakeService", false),
+                arguments("UTF8BytesString fakeService", UTF8BytesString.create("fakeService"), false),
+                arguments("empty string", "", true),
+                arguments("null", null, true));
+    }
+
+    @ParameterizedTest
+    @MethodSource("inferTopLevelFromParentServiceNameArguments")
+    void inferTopLevelFromParentServiceName(String scenario, CharSequence parentServiceName, boolean expectTopLevel) {
+        DDSpanContext context = new DDSpanContext(
+                DDTraceId.ONE,
+                1,
+                DDSpanId.ZERO,
+                parentServiceName,
+                "fakeService",
+                "fakeOperation",
+                "fakeResource",
+                PrioritySampling.UNSET,
+                null,
+                Collections.emptyMap(),
+                false,
+                "fakeType",
+                0,
+                tracer.createTraceCollector(DDTraceId.ONE),
+                null,
+                null,
+                NoopPathwayContext.INSTANCE,
+                false,
+                PropagationTags.factory().empty());
+        assertEquals(expectTopLevel, context.isTopLevel());
+    }
+
+    @Test
+    void brokenPipeExceptionDoesNotCreateErrorSpan() {
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
+        span.addThrowable(new IOException("Broken pipe"));
+        assertFalse(span.isError());
+        assertNull(span.getTag(DDTags.ERROR_STACK));
+        assertEquals("Broken pipe", span.getTag(DDTags.ERROR_MSG));
+    }
+
+    @Test
+    void wrappedBrokenPipeExceptionDoesNotCreateErrorSpan() {
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
+        span.addThrowable(new RuntimeException(new IOException("Broken pipe")));
+        assertFalse(span.isError());
+        assertNull(span.getTag(DDTags.ERROR_STACK));
+        assertEquals("java.io.IOException: Broken pipe", span.getTag(DDTags.ERROR_MSG));
+    }
+
+    @Test
+    void nullExceptionSafeToAdd() {
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
+        span.addThrowable(null);
+        assertFalse(span.isError());
+        assertNull(span.getTag(DDTags.ERROR_STACK));
+    }
+
+    @Test
+    void addThrowableDoesNotFailWhenGetMessageThrows() {
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
+
+        span.addThrowable(TestThrowables.throwingGetMessage());
+
+        assertTrue(span.isError());
+        assertNotNull(span.getTag(DDTags.ERROR_TYPE));
+        assertNotNull(span.getTag(DDTags.ERROR_STACK), "stack trace must be captured even when getMessage() throws");
+        assertTrue(((String) span.getTag(DDTags.ERROR_MSG)).contains("Exception message unavailable"));
+    }
+
+    @Test
+    void addThrowableDoesNotFailWhenGetCauseMessageThrows() {
+        // Outer exception has a normal message, so the broken-pipe check reaches
+        // getCause().getMessage()
+        RuntimeException error = new RuntimeException("outer message", TestThrowables.throwingGetMessage());
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "root").start();
+
+        span.addThrowable(error);
+
+        assertTrue(span.isError());
+        assertNotNull(span.getTag(DDTags.ERROR_TYPE));
+        assertNotNull(
+                span.getTag(DDTags.ERROR_STACK), "stack trace must be captured even when cause's getMessage() throws");
+        // Outer getMessage() works normally — message must be recorded
+        assertEquals("outer message", span.getTag(DDTags.ERROR_MSG));
+    }
+
+    @TableTest({
+      "scenario         | rate | limit     ",
+      "rate=1.0 lim=10  | 1.0  | 10        ",
+      "rate=0.5 lim=100 | 0.5  | 100       ",
+      "rate=0.25 no lim | 0.25 | 2147483647"
+    })
+    void setSingleSpanSamplingTags(String scenario, double rate, int limit) {
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "testSpan").start();
+        assertEquals(UNSET, span.samplingPriority());
+
+        span.setSpanSamplingPriority(rate, limit);
+
+        assertEquals((int) SPAN_SAMPLING_RATE, span.getTag(SPAN_SAMPLING_MECHANISM_TAG));
+        assertEquals(rate, span.getTag(SPAN_SAMPLING_RULE_RATE_TAG));
+        assertEquals(limit == Integer.MAX_VALUE ? null : (double) limit, span.getTag(SPAN_SAMPLING_MAX_PER_SECOND_TAG));
+        // single span sampling should not change the trace sampling priority
+        assertEquals(UNSET, span.samplingPriority());
+    }
+
+    @Test
+    void errorPrioritiesShouldBeRespected() {
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "testSpan").start();
+        assertFalse(span.isError());
+
+        span.setError(true);
+        assertTrue(span.isError());
+
+        span.setError(false);
+        assertFalse(span.isError());
+
+        span.setError(true, ErrorPriorities.HTTP_SERVER_DECORATOR);
+        assertFalse(span.isError());
+
+        span.setError(true, ErrorPriorities.MANUAL_INSTRUMENTATION);
+        assertTrue(span.isError());
+
+        span.setError(true, Byte.MAX_VALUE);
+        assertTrue(span.isError());
+    }
+
+    private static int pendingReferenceCount(DDSpan span) {
+        PendingTrace trace = (PendingTrace) span.spanContext().getTraceCollector();
+        return PendingTraceTestBridge.getPendingReferenceCount(trace);
+    }
+
+    private static Collection<DDSpan> spans(DDSpan span) {
+        PendingTrace trace = (PendingTrace) span.spanContext().getTraceCollector();
+        return trace.getSpans();
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/KnuthSamplingRateTest.java b/dd-trace-core/src/test/java/datadog/trace/core/KnuthSamplingRateTest.java
index c4b300ce1e0..5bbac7f2771 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/KnuthSamplingRateTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/KnuthSamplingRateTest.java
@@ -24,211 +24,194 @@
 
 public class KnuthSamplingRateTest extends DDCoreJavaSpecification {
 
-  @TableTest({
-    "scenario                                  | rate            | expected",
-    "1.0                                       | 1.0             | 1       ",
-    "0.5                                       | 0.5             | 0.5     ",
-    "0.1                                       | 0.1             | 0.1     ",
-    "0.0                                       | 0.0             | 0       ",
-    "0.765432                                  | 0.765432        | 0.765432",
-    "0.7654321 rounds to 6 decimal             | 0.7654321       | 0.765432",
-    "0.123456                                  | 0.123456        | 0.123456",
-    "0.100000 trailing zeros                   | 0.100000        | 0.1     ",
-    "0.250 trailing zero                       | 0.250           | 0.25    ",
-    "0.05                                      | 0.05            | 0.05    ",
-    "0.0123456789 rounds at 6 decimal places   | 0.0123456789    | 0.012346",
-    "0.001                                     | 0.001           | 0.001   ",
-    "0.00500 trailing zeros                    | 0.00500         | 0.005   ",
-    "0.00123456789 rounds at 6 decimal places  | 0.00123456789   | 0.001235",
-    "0.0001                                    | 0.0001          | 0.0001  ",
-    "0.000500 trailing zeros                   | 0.000500        | 0.0005  ",
-    "0.000123456789 rounds at 6 decimal places | 0.000123456789  | 0.000123",
-    "0.9999995 rounds up to 1                  | 0.9999995       | 1       ",
-    "0.00001                                   | 0.00001         | 0.00001 ",
-    "0.000050 trailing zeros                   | 0.000050        | 0.00005 ",
-    "1.23456789e-5 rounds at 6dp               | 0.0000123456789 | 0.000012",
-    "1e-7 below precision rounds to 0          | 0.0000001       | 0       ",
-    "5.5e-10 below precision                   | 0.00000000055   | 0       ",
-    "0.000001 six decimal boundary             | 0.000001        | 0.000001",
-    "0.00000051 rounds up                      | 0.00000051      | 0.000001"
-  })
-  void probabilitySamplingDecisionFormatsRateCorrectly(
-      String scenario, double rate, String expected) {
-    PropagationTags pTags = PropagationTags.factory().empty();
-    int priority = rate == 1.0 ? SAMPLER_KEEP : SAMPLER_DROP;
-    pTags.tryUpdateProbabilitySamplingDecision(priority, AGENT_RATE, rate, false, 1L, false);
-    Map<String, String> tagMap = pTags.createTagMap();
-    assertEquals(expected, tagMap.get("_dd.p.ksr"));
-  }
-
-  @TableTest({
-    "scenario | rate | expectedKsr",
-    "rate 1.0 | 1.0  | 1          ",
-    "rate 0.5 | 0.5  | 0.5        ",
-    "rate 0.0 | 0.0  | 0          "
-  })
-  void agentRateSamplerSetsKsrPropagatedTag(String scenario, double rate, String expectedKsr) {
-    RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    Map<String, Number> rates = new HashMap<>();
-    rates.put("service:,env:", rate);
-    Map<String, Map<String, Number>> response = new HashMap<>();
-    response.put("rate_by_service", rates);
-    serviceSampler.onResponse("traces", response);
-
-    DDSpan span =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", "fakeOperation")
+    @TableTest({
+      "scenario                                  | rate            | expected",
+      "1.0                                       | 1.0             | 1       ",
+      "0.5                                       | 0.5             | 0.5     ",
+      "0.1                                       | 0.1             | 0.1     ",
+      "0.0                                       | 0.0             | 0       ",
+      "0.765432                                  | 0.765432        | 0.765432",
+      "0.7654321 rounds to 6 decimal             | 0.7654321       | 0.765432",
+      "0.123456                                  | 0.123456        | 0.123456",
+      "0.100000 trailing zeros                   | 0.100000        | 0.1     ",
+      "0.250 trailing zero                       | 0.250           | 0.25    ",
+      "0.05                                      | 0.05            | 0.05    ",
+      "0.0123456789 rounds at 6 decimal places   | 0.0123456789    | 0.012346",
+      "0.001                                     | 0.001           | 0.001   ",
+      "0.00500 trailing zeros                    | 0.00500         | 0.005   ",
+      "0.00123456789 rounds at 6 decimal places  | 0.00123456789   | 0.001235",
+      "0.0001                                    | 0.0001          | 0.0001  ",
+      "0.000500 trailing zeros                   | 0.000500        | 0.0005  ",
+      "0.000123456789 rounds at 6 decimal places | 0.000123456789  | 0.000123",
+      "0.9999995 rounds up to 1                  | 0.9999995       | 1       ",
+      "0.00001                                   | 0.00001         | 0.00001 ",
+      "0.000050 trailing zeros                   | 0.000050        | 0.00005 ",
+      "1.23456789e-5 rounds at 6dp               | 0.0000123456789 | 0.000012",
+      "1e-7 below precision rounds to 0          | 0.0000001       | 0       ",
+      "5.5e-10 below precision                   | 0.00000000055   | 0       ",
+      "0.000001 six decimal boundary             | 0.000001        | 0.000001",
+      "0.00000051 rounds up                      | 0.00000051      | 0.000001"
+    })
+    void probabilitySamplingDecisionFormatsRateCorrectly(String scenario, double rate, String expected) {
+        PropagationTags pTags = PropagationTags.factory().empty();
+        int priority = rate == 1.0 ? SAMPLER_KEEP : SAMPLER_DROP;
+        pTags.tryUpdateProbabilitySamplingDecision(priority, AGENT_RATE, rate, false, 1L, false);
+        Map<String, String> tagMap = pTags.createTagMap();
+        assertEquals(expected, tagMap.get("_dd.p.ksr"));
+    }
+
+    @TableTest({
+      "scenario | rate | expectedKsr",
+      "rate 1.0 | 1.0  | 1          ",
+      "rate 0.5 | 0.5  | 0.5        ",
+      "rate 0.0 | 0.0  | 0          "
+    })
+    void agentRateSamplerSetsKsrPropagatedTag(String scenario, double rate, String expectedKsr) {
+        RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        Map<String, Number> rates = new HashMap<>();
+        rates.put("service:,env:", rate);
+        Map<String, Map<String, Number>> response = new HashMap<>();
+        response.put("rate_by_service", rates);
+        serviceSampler.onResponse("traces", response);
+
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "fakeOperation")
                 .withServiceName("spock")
                 .withTag("env", "test")
                 .ignoreActiveSpan()
                 .start();
-    serviceSampler.setSamplingPriority(span);
-
-    Map<String, String> propagationMap = span.spanContext().getPropagationTags().createTagMap();
-    String ksr = propagationMap.get("_dd.p.ksr");
-
-    assertEquals(expectedKsr, ksr);
-    tracer.close();
-  }
-
-  @TableTest({
-    "scenario                                                        | jsonRules                                            | expectedKsr",
-    "Matching rule with rate 1 -> ksr is 1                           | '[{\"service\": \"service\", \"sample_rate\": 1}]'   | 1          ",
-    "Matching rule with rate 0.5 -> ksr is 0.5                       | '[{\"service\": \"service\", \"sample_rate\": 0.5}]' | 0.5        ",
-    "Matching rule with rate 0 -> ksr is 0 (drop, but ksr still set) | '[{\"service\": \"service\", \"sample_rate\": 0}]'   | 0          "
-  })
-  void ruleBasedSamplerSetsKsrPropagatedTagWhenRuleMatches(
-      String scenario, String jsonRules, String expectedKsr) {
-    Properties properties = new Properties();
-    properties.setProperty(TRACE_SAMPLING_RULES, jsonRules);
-    properties.setProperty(TRACE_RATE_LIMIT, "50");
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    Sampler sampler = Sampler.Builder.forConfig(properties);
-    DDSpan span =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", "operation")
+        serviceSampler.setSamplingPriority(span);
+
+        Map<String, String> propagationMap =
+                span.spanContext().getPropagationTags().createTagMap();
+        String ksr = propagationMap.get("_dd.p.ksr");
+
+        assertEquals(expectedKsr, ksr);
+        tracer.close();
+    }
+
+    @TableTest({
+      "scenario                                                        | jsonRules                                            | expectedKsr",
+      "Matching rule with rate 1 -> ksr is 1                           | '[{\"service\": \"service\", \"sample_rate\": 1}]'   | 1          ",
+      "Matching rule with rate 0.5 -> ksr is 0.5                       | '[{\"service\": \"service\", \"sample_rate\": 0.5}]' | 0.5        ",
+      "Matching rule with rate 0 -> ksr is 0 (drop, but ksr still set) | '[{\"service\": \"service\", \"sample_rate\": 0}]'   | 0          "
+    })
+    void ruleBasedSamplerSetsKsrPropagatedTagWhenRuleMatches(String scenario, String jsonRules, String expectedKsr) {
+        Properties properties = new Properties();
+        properties.setProperty(TRACE_SAMPLING_RULES, jsonRules);
+        properties.setProperty(TRACE_RATE_LIMIT, "50");
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        Sampler sampler = Sampler.Builder.forConfig(properties);
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation")
                 .withServiceName("service")
                 .withTag("env", "bar")
                 .ignoreActiveSpan()
                 .start();
-    ((PrioritySampler) sampler).setSamplingPriority(span);
-
-    Map<String, String> propagationMap = span.spanContext().getPropagationTags().createTagMap();
-    String ksr = propagationMap.get("_dd.p.ksr");
-
-    assertEquals(expectedKsr, ksr);
-    tracer.close();
-  }
-
-  @Test
-  void ruleBasedSamplerFallbackToAgentSamplerSetsKsr() {
-    Properties properties = new Properties();
-    // Rule that does NOT match "service"
-    properties.setProperty(
-        TRACE_SAMPLING_RULES, "[{\"service\": \"nomatch\", \"sample_rate\": 0.5}]");
-    properties.setProperty(TRACE_RATE_LIMIT, "50");
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    Sampler sampler = Sampler.Builder.forConfig(properties);
-    DDSpan span =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", "operation")
+        ((PrioritySampler) sampler).setSamplingPriority(span);
+
+        Map<String, String> propagationMap =
+                span.spanContext().getPropagationTags().createTagMap();
+        String ksr = propagationMap.get("_dd.p.ksr");
+
+        assertEquals(expectedKsr, ksr);
+        tracer.close();
+    }
+
+    @Test
+    void ruleBasedSamplerFallbackToAgentSamplerSetsKsr() {
+        Properties properties = new Properties();
+        // Rule that does NOT match "service"
+        properties.setProperty(TRACE_SAMPLING_RULES, "[{\"service\": \"nomatch\", \"sample_rate\": 0.5}]");
+        properties.setProperty(TRACE_RATE_LIMIT, "50");
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        Sampler sampler = Sampler.Builder.forConfig(properties);
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation")
                 .withServiceName("service")
                 .withTag("env", "bar")
                 .ignoreActiveSpan()
                 .start();
-    ((PrioritySampler) sampler).setSamplingPriority(span);
-
-    Map<String, String> propagationMap = span.spanContext().getPropagationTags().createTagMap();
-    String ksr = propagationMap.get("_dd.p.ksr");
-    // When falling back to agent sampler, ksr should still be set (agent rate = 1.0 by default)
-    assertEquals("1", ksr);
-    assertEquals(SAMPLER_KEEP, (int) span.getSamplingPriority());
-    tracer.close();
-  }
-
-  @Test
-  void serviceRuleSamplerSetsKsrPropagatedTag() {
-    Properties properties = new Properties();
-    properties.setProperty(TRACE_SAMPLING_SERVICE_RULES, "service:0.75");
-    properties.setProperty(TRACE_RATE_LIMIT, "50");
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    Sampler sampler = Sampler.Builder.forConfig(properties);
-    DDSpan span =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", "operation")
+        ((PrioritySampler) sampler).setSamplingPriority(span);
+
+        Map<String, String> propagationMap =
+                span.spanContext().getPropagationTags().createTagMap();
+        String ksr = propagationMap.get("_dd.p.ksr");
+        // When falling back to agent sampler, ksr should still be set (agent rate = 1.0 by default)
+        assertEquals("1", ksr);
+        assertEquals(SAMPLER_KEEP, (int) span.getSamplingPriority());
+        tracer.close();
+    }
+
+    @Test
+    void serviceRuleSamplerSetsKsrPropagatedTag() {
+        Properties properties = new Properties();
+        properties.setProperty(TRACE_SAMPLING_SERVICE_RULES, "service:0.75");
+        properties.setProperty(TRACE_RATE_LIMIT, "50");
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        Sampler sampler = Sampler.Builder.forConfig(properties);
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation")
                 .withServiceName("service")
                 .withTag("env", "bar")
                 .ignoreActiveSpan()
                 .start();
-    ((PrioritySampler) sampler).setSamplingPriority(span);
-
-    Map<String, String> propagationMap = span.spanContext().getPropagationTags().createTagMap();
-    String ksr = propagationMap.get("_dd.p.ksr");
-
-    assertEquals("0.75", ksr);
-    tracer.close();
-  }
-
-  @Test
-  void defaultRateSamplerSetsKsrPropagatedTag() {
-    Properties properties = new Properties();
-    properties.setProperty(TRACE_SAMPLE_RATE, "0.25");
-    properties.setProperty(TRACE_RATE_LIMIT, "50");
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    Sampler sampler = Sampler.Builder.forConfig(properties);
-    DDSpan span =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", "operation")
+        ((PrioritySampler) sampler).setSamplingPriority(span);
+
+        Map<String, String> propagationMap =
+                span.spanContext().getPropagationTags().createTagMap();
+        String ksr = propagationMap.get("_dd.p.ksr");
+
+        assertEquals("0.75", ksr);
+        tracer.close();
+    }
+
+    @Test
+    void defaultRateSamplerSetsKsrPropagatedTag() {
+        Properties properties = new Properties();
+        properties.setProperty(TRACE_SAMPLE_RATE, "0.25");
+        properties.setProperty(TRACE_RATE_LIMIT, "50");
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        Sampler sampler = Sampler.Builder.forConfig(properties);
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation")
                 .withServiceName("service")
                 .withTag("env", "bar")
                 .ignoreActiveSpan()
                 .start();
-    ((PrioritySampler) sampler).setSamplingPriority(span);
-
-    Map<String, String> propagationMap = span.spanContext().getPropagationTags().createTagMap();
-    String ksr = propagationMap.get("_dd.p.ksr");
-
-    assertEquals("0.25", ksr);
-    tracer.close();
-  }
-
-  @Test
-  void ksrIsPropagatedViaXDatadogTagsHeader() {
-    RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    Map<String, Number> rates = new HashMap<>();
-    rates.put("service:,env:", 0.5);
-    Map<String, Map<String, Number>> response = new HashMap<>();
-    response.put("rate_by_service", rates);
-    serviceSampler.onResponse("traces", response);
-
-    DDSpan span =
-        (DDSpan)
-            tracer
-                .buildSpan("datadog", "fakeOperation")
+        ((PrioritySampler) sampler).setSamplingPriority(span);
+
+        Map<String, String> propagationMap =
+                span.spanContext().getPropagationTags().createTagMap();
+        String ksr = propagationMap.get("_dd.p.ksr");
+
+        assertEquals("0.25", ksr);
+        tracer.close();
+    }
+
+    @Test
+    void ksrIsPropagatedViaXDatadogTagsHeader() {
+        RateByServiceTraceSampler serviceSampler = new RateByServiceTraceSampler();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        Map<String, Number> rates = new HashMap<>();
+        rates.put("service:,env:", 0.5);
+        Map<String, Map<String, Number>> response = new HashMap<>();
+        response.put("rate_by_service", rates);
+        serviceSampler.onResponse("traces", response);
+
+        DDSpan span = (DDSpan) tracer.buildSpan("datadog", "fakeOperation")
                 .withServiceName("spock")
                 .withTag("env", "test")
                 .ignoreActiveSpan()
                 .start();
-    serviceSampler.setSamplingPriority(span);
+        serviceSampler.setSamplingPriority(span);
 
-    String headerValue =
-        span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG);
+        String headerValue = span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG);
 
-    assertNotNull(headerValue);
-    assertTrue(headerValue.contains("_dd.p.ksr=0.5"));
-    tracer.close();
-  }
+        assertNotNull(headerValue);
+        assertTrue(headerValue.contains("_dd.p.ksr=0.5"));
+        tracer.close();
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/LongRunningTracesTrackerTest.java b/dd-trace-core/src/test/java/datadog/trace/core/LongRunningTracesTrackerTest.java
index 27c8156e27f..2ce7409b002 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/LongRunningTracesTrackerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/LongRunningTracesTrackerTest.java
@@ -38,203 +38,194 @@
 @WithConfig(key = "trace.experimental.long-running.flush.interval", value = "20")
 public class LongRunningTracesTrackerTest extends DDJavaSpecification {
 
-  private static final long INITIAL_FLUSH_PERIOD_MILLI = TimeUnit.SECONDS.toMillis(10);
-  private static final long FLUSH_PERIOD_MILLI = TimeUnit.SECONDS.toMillis(20);
-  private static final long MAX_TRACKED_DURATION_MILLI = TimeUnit.HOURS.toMillis(12);
-  private static final int MAX_TRACKED_TRACES = 10;
-
-  private CoreTracer tracer;
-  private CoreTracer.ConfigSnapshot traceConfig;
-  private DDAgentFeaturesDiscovery features;
-  private SharedCommunicationObjects sharedCommunicationObjects;
-  private ControllableTimeSource timeSource;
-  private PendingTraceBuffer.DelayingPendingTraceBuffer buffer;
-  private LongRunningTracesTracker tracker;
-  private PendingTrace.Factory factory;
-
-  @BeforeAll
-  static void checkJvm() {
-    Assumptions.assumeFalse(
-        JavaVirtualMachine.isOracleJDK8(),
-        "Oracle JDK 1.8 did not merge the fix in JDK-8058322, leading to the JVM failing to"
-            + " correctly extract method parameters without args, when the code is compiled on a"
-            + " later JDK (targeting 8). This can manifest when creating mocks.");
-  }
-
-  @BeforeEach
-  void setup() {
-    tracer = mock(CoreTracer.class);
-    traceConfig = mock(CoreTracer.ConfigSnapshot.class);
-    features = mock(DDAgentFeaturesDiscovery.class);
-    sharedCommunicationObjects = mock(SharedCommunicationObjects.class);
-    timeSource = new ControllableTimeSource();
-    timeSource.set(0L);
-
-    when(features.supportsLongRunning()).thenReturn(true);
-    when(tracer.captureTraceConfig()).thenReturn(traceConfig);
-    when(tracer.getTimeWithNanoTicks(anyLong())).thenAnswer(inv -> inv.<Long>getArgument(0));
-    when(traceConfig.getServiceMapping()).thenReturn(Collections.emptyMap());
-    when(sharedCommunicationObjects.featuresDiscovery(any())).thenReturn(features);
-
-    buffer =
-        new PendingTraceBuffer.DelayingPendingTraceBuffer(
-            MAX_TRACKED_TRACES,
-            timeSource,
-            Config.get(),
-            sharedCommunicationObjects,
-            HealthMetrics.NO_OP);
-    tracker = buffer.getRunningTracesTracker();
-    factory = new PendingTrace.Factory(tracer, buffer, timeSource, false, HealthMetrics.NO_OP);
-  }
-
-  @Test
-  void nullIsNotAdded() {
-    tracker.add(null);
-    assertEquals(0, tracker.trackedCount());
-  }
-
-  @Test
-  void traceWithNoSpanIsNotAdded() {
-    tracker.add(factory.create(DDTraceId.ONE));
-    assertEquals(0, tracker.trackedCount());
-  }
-
-  @Test
-  void traceWithoutRightStateAreNotTracked() {
-    List<Integer> statesToTest =
-        Arrays.asList(
-            LongRunningTracesTracker.NOT_TRACKED,
-            LongRunningTracesTracker.UNDEFINED,
-            LongRunningTracesTracker.TRACKED,
-            LongRunningTracesTracker.WRITE_RUNNING_SPANS,
-            LongRunningTracesTracker.EXPIRED);
-    for (int stateToTest : statesToTest) {
-      PendingTrace trace = newTraceToTrack();
-      trace.setLongRunningTrackedState(stateToTest);
-      tracker.add(trace);
+    private static final long INITIAL_FLUSH_PERIOD_MILLI = TimeUnit.SECONDS.toMillis(10);
+    private static final long FLUSH_PERIOD_MILLI = TimeUnit.SECONDS.toMillis(20);
+    private static final long MAX_TRACKED_DURATION_MILLI = TimeUnit.HOURS.toMillis(12);
+    private static final int MAX_TRACKED_TRACES = 10;
+
+    private CoreTracer tracer;
+    private CoreTracer.ConfigSnapshot traceConfig;
+    private DDAgentFeaturesDiscovery features;
+    private SharedCommunicationObjects sharedCommunicationObjects;
+    private ControllableTimeSource timeSource;
+    private PendingTraceBuffer.DelayingPendingTraceBuffer buffer;
+    private LongRunningTracesTracker tracker;
+    private PendingTrace.Factory factory;
+
+    @BeforeAll
+    static void checkJvm() {
+        Assumptions.assumeFalse(
+                JavaVirtualMachine.isOracleJDK8(),
+                "Oracle JDK 1.8 did not merge the fix in JDK-8058322, leading to the JVM failing to"
+                        + " correctly extract method parameters without args, when the code is compiled on a"
+                        + " later JDK (targeting 8). This can manifest when creating mocks.");
     }
-    assertEquals(0, tracker.trackedCount());
 
-    tracker.add(newTraceToTrack());
-    assertEquals(1, tracker.trackedCount());
-  }
+    @BeforeEach
+    void setup() {
+        tracer = mock(CoreTracer.class);
+        traceConfig = mock(CoreTracer.ConfigSnapshot.class);
+        features = mock(DDAgentFeaturesDiscovery.class);
+        sharedCommunicationObjects = mock(SharedCommunicationObjects.class);
+        timeSource = new ControllableTimeSource();
+        timeSource.set(0L);
+
+        when(features.supportsLongRunning()).thenReturn(true);
+        when(tracer.captureTraceConfig()).thenReturn(traceConfig);
+        when(tracer.getTimeWithNanoTicks(anyLong())).thenAnswer(inv -> inv.<Long>getArgument(0));
+        when(traceConfig.getServiceMapping()).thenReturn(Collections.emptyMap());
+        when(sharedCommunicationObjects.featuresDiscovery(any())).thenReturn(features);
+
+        buffer = new PendingTraceBuffer.DelayingPendingTraceBuffer(
+                MAX_TRACKED_TRACES, timeSource, Config.get(), sharedCommunicationObjects, HealthMetrics.NO_OP);
+        tracker = buffer.getRunningTracesTracker();
+        factory = new PendingTrace.Factory(tracer, buffer, timeSource, false, HealthMetrics.NO_OP);
+    }
+
+    @Test
+    void nullIsNotAdded() {
+        tracker.add(null);
+        assertEquals(0, tracker.trackedCount());
+    }
+
+    @Test
+    void traceWithNoSpanIsNotAdded() {
+        tracker.add(factory.create(DDTraceId.ONE));
+        assertEquals(0, tracker.trackedCount());
+    }
+
+    @Test
+    void traceWithoutRightStateAreNotTracked() {
+        List<Integer> statesToTest = Arrays.asList(
+                LongRunningTracesTracker.NOT_TRACKED,
+                LongRunningTracesTracker.UNDEFINED,
+                LongRunningTracesTracker.TRACKED,
+                LongRunningTracesTracker.WRITE_RUNNING_SPANS,
+                LongRunningTracesTracker.EXPIRED);
+        for (int stateToTest : statesToTest) {
+            PendingTrace trace = newTraceToTrack();
+            trace.setLongRunningTrackedState(stateToTest);
+            tracker.add(trace);
+        }
+        assertEquals(0, tracker.trackedCount());
+
+        tracker.add(newTraceToTrack());
+        assertEquals(1, tracker.trackedCount());
+    }
+
+    @Test
+    void maxTrackedTracesIsEnforced() {
+        for (int i = 0; i < MAX_TRACKED_TRACES + 1; i++) {
+            tracker.add(newTraceToTrack());
+        }
+        assertEquals(MAX_TRACKED_TRACES, tracker.trackedCount());
+        assertEquals(1, tracker.getDropped());
+    }
+
+    @Test
+    void expiredTraces() {
+        PendingTrace trace = newTraceToTrack();
+        tracker.add(trace);
+
+        tracker.flushAndCompact(MAX_TRACKED_DURATION_MILLI - 1000);
+        assertEquals(1, tracker.trackedCount());
+        assertEquals(LongRunningTracesTracker.WRITE_RUNNING_SPANS, trace.getLongRunningTrackedState());
+
+        tracker.flushAndCompact(1 + MAX_TRACKED_DURATION_MILLI);
+        assertEquals(0, tracker.trackedCount());
+        assertEquals(LongRunningTracesTracker.EXPIRED, trace.getLongRunningTrackedState());
+    }
+
+    @Test
+    void agentDisabledFeature() {
+        PendingTrace trace = newTraceToTrack();
+        tracker.add(trace);
+
+        when(features.supportsLongRunning()).thenReturn(false);
+        tracker.flushAndCompact(FLUSH_PERIOD_MILLI - 1000);
+        assertEquals(0, tracker.trackedCount());
+    }
+
+    @Test
+    void flushLogicWithInitialFlush() {
+        PendingTrace trace = newTraceToTrack();
+        tracker.add(trace);
+
+        // Before the initial flush
+        flushAt(INITIAL_FLUSH_PERIOD_MILLI - 1000);
+        verify(tracer, never()).write(any());
+        clearInvocations(tracer);
+
+        // After the initial flush
+        flushAt(INITIAL_FLUSH_PERIOD_MILLI + 1000);
+        verify(tracer, times(1)).write(any());
+        assertEquals(TimeUnit.MILLISECONDS.toNanos(INITIAL_FLUSH_PERIOD_MILLI + 1000), trace.getLastWriteTime());
+        clearInvocations(tracer);
+
+        // Before the regular flush
+        flushAt(INITIAL_FLUSH_PERIOD_MILLI + FLUSH_PERIOD_MILLI - 1000);
+        verify(tracer, never()).write(any());
+        assertEquals(TimeUnit.MILLISECONDS.toNanos(INITIAL_FLUSH_PERIOD_MILLI + 1000), trace.getLastWriteTime());
+        clearInvocations(tracer);
+
+        // After the first regular flush
+        flushAt(INITIAL_FLUSH_PERIOD_MILLI + FLUSH_PERIOD_MILLI + 2000);
+        verify(tracer, times(1)).write(any());
+        assertEquals(
+                TimeUnit.MILLISECONDS.toNanos(INITIAL_FLUSH_PERIOD_MILLI + FLUSH_PERIOD_MILLI + 2000),
+                trace.getLastWriteTime());
+    }
+
+    @TableTest({
+      "scenario     | priority | trackerExpectedSize | traceExpectedState",
+      "sampler drop | 0        | 0                   | -1                ",
+      "user drop    | -1       | 0                   | -1                ",
+      "user keep    | 2        | 1                   | 3                 ",
+      "sampler keep | 1        | 1                   | 3                 "
+    })
+    void priorityEvaluation(int priority, int trackerExpectedSize, int traceExpectedState) {
+        PendingTrace trace = factory.create(DDTraceId.ONE);
+        newSpanOf(trace, priority, 0);
+        tracker.add(trace);
+
+        tracker.flushAndCompact(MAX_TRACKED_DURATION_MILLI - 1000);
+
+        assertEquals(trackerExpectedSize, tracker.trackedCount());
+        assertEquals(traceExpectedState, trace.getLongRunningTrackedState());
+    }
+
+    private void flushAt(long timeMilli) {
+        timeSource.set(TimeUnit.MILLISECONDS.toNanos(timeMilli));
+        tracker.flushAndCompact(timeMilli);
+    }
+
+    private PendingTrace newTraceToTrack() {
+        PendingTrace trace = factory.create(DDTraceId.ONE);
+        newSpanOf(trace, PrioritySampling.SAMPLER_KEEP, 0);
+        return trace;
+    }
 
-  @Test
-  void maxTrackedTracesIsEnforced() {
-    for (int i = 0; i < MAX_TRACKED_TRACES + 1; i++) {
-      tracker.add(newTraceToTrack());
+    private static DDSpan newSpanOf(PendingTrace trace, int samplingPriority, long timestampMicro) {
+        DDSpanContext context = new DDSpanContext(
+                DDTraceId.ONE,
+                1,
+                DDSpanId.ZERO,
+                null,
+                "fakeService",
+                "fakeOperation",
+                "fakeResource",
+                samplingPriority,
+                null,
+                Collections.emptyMap(),
+                false,
+                "fakeType",
+                0,
+                trace,
+                null,
+                null,
+                NoopPathwayContext.INSTANCE,
+                false,
+                PropagationTags.factory().empty());
+        return DDSpan.create("test", timestampMicro, context, null);
     }
-    assertEquals(MAX_TRACKED_TRACES, tracker.trackedCount());
-    assertEquals(1, tracker.getDropped());
-  }
-
-  @Test
-  void expiredTraces() {
-    PendingTrace trace = newTraceToTrack();
-    tracker.add(trace);
-
-    tracker.flushAndCompact(MAX_TRACKED_DURATION_MILLI - 1000);
-    assertEquals(1, tracker.trackedCount());
-    assertEquals(LongRunningTracesTracker.WRITE_RUNNING_SPANS, trace.getLongRunningTrackedState());
-
-    tracker.flushAndCompact(1 + MAX_TRACKED_DURATION_MILLI);
-    assertEquals(0, tracker.trackedCount());
-    assertEquals(LongRunningTracesTracker.EXPIRED, trace.getLongRunningTrackedState());
-  }
-
-  @Test
-  void agentDisabledFeature() {
-    PendingTrace trace = newTraceToTrack();
-    tracker.add(trace);
-
-    when(features.supportsLongRunning()).thenReturn(false);
-    tracker.flushAndCompact(FLUSH_PERIOD_MILLI - 1000);
-    assertEquals(0, tracker.trackedCount());
-  }
-
-  @Test
-  void flushLogicWithInitialFlush() {
-    PendingTrace trace = newTraceToTrack();
-    tracker.add(trace);
-
-    // Before the initial flush
-    flushAt(INITIAL_FLUSH_PERIOD_MILLI - 1000);
-    verify(tracer, never()).write(any());
-    clearInvocations(tracer);
-
-    // After the initial flush
-    flushAt(INITIAL_FLUSH_PERIOD_MILLI + 1000);
-    verify(tracer, times(1)).write(any());
-    assertEquals(
-        TimeUnit.MILLISECONDS.toNanos(INITIAL_FLUSH_PERIOD_MILLI + 1000), trace.getLastWriteTime());
-    clearInvocations(tracer);
-
-    // Before the regular flush
-    flushAt(INITIAL_FLUSH_PERIOD_MILLI + FLUSH_PERIOD_MILLI - 1000);
-    verify(tracer, never()).write(any());
-    assertEquals(
-        TimeUnit.MILLISECONDS.toNanos(INITIAL_FLUSH_PERIOD_MILLI + 1000), trace.getLastWriteTime());
-    clearInvocations(tracer);
-
-    // After the first regular flush
-    flushAt(INITIAL_FLUSH_PERIOD_MILLI + FLUSH_PERIOD_MILLI + 2000);
-    verify(tracer, times(1)).write(any());
-    assertEquals(
-        TimeUnit.MILLISECONDS.toNanos(INITIAL_FLUSH_PERIOD_MILLI + FLUSH_PERIOD_MILLI + 2000),
-        trace.getLastWriteTime());
-  }
-
-  @TableTest({
-    "scenario     | priority | trackerExpectedSize | traceExpectedState",
-    "sampler drop | 0        | 0                   | -1                ",
-    "user drop    | -1       | 0                   | -1                ",
-    "user keep    | 2        | 1                   | 3                 ",
-    "sampler keep | 1        | 1                   | 3                 "
-  })
-  void priorityEvaluation(int priority, int trackerExpectedSize, int traceExpectedState) {
-    PendingTrace trace = factory.create(DDTraceId.ONE);
-    newSpanOf(trace, priority, 0);
-    tracker.add(trace);
-
-    tracker.flushAndCompact(MAX_TRACKED_DURATION_MILLI - 1000);
-
-    assertEquals(trackerExpectedSize, tracker.trackedCount());
-    assertEquals(traceExpectedState, trace.getLongRunningTrackedState());
-  }
-
-  private void flushAt(long timeMilli) {
-    timeSource.set(TimeUnit.MILLISECONDS.toNanos(timeMilli));
-    tracker.flushAndCompact(timeMilli);
-  }
-
-  private PendingTrace newTraceToTrack() {
-    PendingTrace trace = factory.create(DDTraceId.ONE);
-    newSpanOf(trace, PrioritySampling.SAMPLER_KEEP, 0);
-    return trace;
-  }
-
-  private static DDSpan newSpanOf(PendingTrace trace, int samplingPriority, long timestampMicro) {
-    DDSpanContext context =
-        new DDSpanContext(
-            DDTraceId.ONE,
-            1,
-            DDSpanId.ZERO,
-            null,
-            "fakeService",
-            "fakeOperation",
-            "fakeResource",
-            samplingPriority,
-            null,
-            Collections.emptyMap(),
-            false,
-            "fakeType",
-            0,
-            trace,
-            null,
-            null,
-            NoopPathwayContext.INSTANCE,
-            false,
-            PropagationTags.factory().empty());
-    return DDSpan.create("test", timestampMicro, context, null);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/MetadataTest.java b/dd-trace-core/src/test/java/datadog/trace/core/MetadataTest.java
index eab3afd2812..c7b43c3ec9f 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/MetadataTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/MetadataTest.java
@@ -19,50 +19,51 @@
  */
 class MetadataTest {
 
-  @ParameterizedTest
-  @ValueSource(ints = {200, 201, 404, 500, 599})
-  void rendersTheStatusOnlyWhenAsked(int status) {
-    Metadata metadata = metadataWithStatus(status);
+    @ParameterizedTest
+    @ValueSource(ints = {200, 201, 404, 500, 599})
+    void rendersTheStatusOnlyWhenAsked(int status) {
+        Metadata metadata = metadataWithStatus(status);
 
-    assertEquals(status, metadata.getHttpStatusCode());
-    assertEquals(Integer.toString(status), metadata.getHttpStatusCodeString().toString());
-  }
+        assertEquals(status, metadata.getHttpStatusCode());
+        assertEquals(
+                Integer.toString(status), metadata.getHttpStatusCodeString().toString());
+    }
 
-  @Test
-  void reportsNoStatusAsUnsetRatherThanZeroString() {
-    Metadata metadata = metadataWithStatus(UNSET_STATUS);
+    @Test
+    void reportsNoStatusAsUnsetRatherThanZeroString() {
+        Metadata metadata = metadataWithStatus(UNSET_STATUS);
 
-    assertEquals(UNSET_STATUS, metadata.getHttpStatusCode());
-    assertNull(
-        metadata.getHttpStatusCodeString(),
-        "an absent status must not render as \"0\": the string protocols write the key only when"
-            + " the span carries a status");
-  }
+        assertEquals(UNSET_STATUS, metadata.getHttpStatusCode());
+        assertNull(
+                metadata.getHttpStatusCodeString(),
+                "an absent status must not render as \"0\": the string protocols write the key only when"
+                        + " the span carries a status");
+    }
 
-  @Test
-  void reusesTheRenderedStatusAcrossSpans() {
-    // The point of routing through RadixTreeCache rather than rendering per span: two spans with
-    // the same status share one UTF8BytesString instead of allocating one apiece.
-    UTF8BytesString first = metadataWithStatus(404).getHttpStatusCodeString();
-    UTF8BytesString second = metadataWithStatus(404).getHttpStatusCodeString();
+    @Test
+    void reusesTheRenderedStatusAcrossSpans() {
+        // The point of routing through RadixTreeCache rather than rendering per span: two spans with
+        // the same status share one UTF8BytesString instead of allocating one apiece.
+        UTF8BytesString first = metadataWithStatus(404).getHttpStatusCodeString();
+        UTF8BytesString second = metadataWithStatus(404).getHttpStatusCodeString();
 
-    assertSame(first, second);
-  }
+        assertSame(first, second);
+    }
 
-  private static Metadata metadataWithStatus(int status) {
-    return new Metadata(
-        Thread.currentThread().getId(),
-        UTF8BytesString.create("main"),
-        TagMap.fromMap(emptyMap()),
-        emptyMap(),
-        0,
-        false,
-        false,
-        status,
-        null,
-        0,
-        null,
-        null,
-        emptyList());
-  }
+    private static Metadata metadataWithStatus(int status) {
+        return new Metadata(
+                Thread.currentThread().getId(),
+                UTF8BytesString.create("main"),
+                TagMap.fromMap(emptyMap()),
+                emptyMap(),
+                0,
+                false,
+                false,
+                status,
+                null,
+                0,
+                null,
+                null,
+                emptyList());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/OtelSamplingDecisionTest.java b/dd-trace-core/src/test/java/datadog/trace/core/OtelSamplingDecisionTest.java
index 84662abd620..a79245e4ef9 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/OtelSamplingDecisionTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/OtelSamplingDecisionTest.java
@@ -25,140 +25,133 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 class OtelSamplingDecisionTest extends DDCoreJavaSpecification {
-  private static final String AGENT_RATE_ENDPOINT = "traces";
-  private static final String OTEL_MEMBER = "ot=";
-  private static final String OTEL_RANDOM_VALUE_PREFIX = "ot=rv:";
-  private static final String HALF_THRESHOLD = ";th:8";
-  private static final String MAX_THRESHOLD = ";th:ffffffffffffff";
-  private static final double HALF_RATE = 0.5;
-  private static final String HALF_RATE_RULE = "[{\"sample_rate\": 0.5}]";
-  private static final String FULL_RATE_RULE = "[{\"sample_rate\": 1}]";
-
-  @Test
-  void initialAgentRateEstablishesDefaultProbabilityState() {
-    RateByServiceTraceSampler sampler = new RateByServiceTraceSampler();
-    withRootSpan(
-        span -> {
-          sampler.setSamplingPriority(span);
-
-          String header = w3cHeader(span);
-          assertTrue(header.contains(OTEL_RANDOM_VALUE_PREFIX));
-          assertTrue(header.contains(";th:0"));
+    private static final String AGENT_RATE_ENDPOINT = "traces";
+    private static final String OTEL_MEMBER = "ot=";
+    private static final String OTEL_RANDOM_VALUE_PREFIX = "ot=rv:";
+    private static final String HALF_THRESHOLD = ";th:8";
+    private static final String MAX_THRESHOLD = ";th:ffffffffffffff";
+    private static final double HALF_RATE = 0.5;
+    private static final String HALF_RATE_RULE = "[{\"sample_rate\": 0.5}]";
+    private static final String FULL_RATE_RULE = "[{\"sample_rate\": 1}]";
+
+    @Test
+    void initialAgentRateEstablishesDefaultProbabilityState() {
+        RateByServiceTraceSampler sampler = new RateByServiceTraceSampler();
+        withRootSpan(span -> {
+            sampler.setSamplingPriority(span);
+
+            String header = w3cHeader(span);
+            assertTrue(header.contains(OTEL_RANDOM_VALUE_PREFIX));
+            assertTrue(header.contains(";th:0"));
         });
-  }
-
-  @Test
-  void loadedAgentRateEstablishesProbabilityState() {
-    RateByServiceTraceSampler sampler = new RateByServiceTraceSampler();
-    sampler.onResponse(AGENT_RATE_ENDPOINT, agentRates(HALF_RATE));
-    withRootSpan(
-        span -> {
-          sampler.setSamplingPriority(span);
-
-          String header = w3cHeader(span);
-          assertTrue(header.contains(OTEL_RANDOM_VALUE_PREFIX));
-          assertTrue(header.contains(HALF_THRESHOLD));
+    }
+
+    @Test
+    void loadedAgentRateEstablishesProbabilityState() {
+        RateByServiceTraceSampler sampler = new RateByServiceTraceSampler();
+        sampler.onResponse(AGENT_RATE_ENDPOINT, agentRates(HALF_RATE));
+        withRootSpan(span -> {
+            sampler.setSamplingPriority(span);
+
+            String header = w3cHeader(span);
+            assertTrue(header.contains(OTEL_RANDOM_VALUE_PREFIX));
+            assertTrue(header.contains(HALF_THRESHOLD));
         });
-  }
-
-  @Test
-  void zeroAgentRateUsesDropConsistentMaximumThreshold() {
-    RateByServiceTraceSampler sampler = new RateByServiceTraceSampler();
-    sampler.onResponse(AGENT_RATE_ENDPOINT, agentRates(0));
-    withRootSpan(
-        span -> {
-          sampler.setSamplingPriority(span);
-
-          String header = w3cHeader(span);
-          assertTrue(header.contains(OTEL_RANDOM_VALUE_PREFIX));
-          assertFalse(header.contains("ot=rv:ffffffffffffff"));
-          assertTrue(header.contains(MAX_THRESHOLD));
+    }
+
+    @Test
+    void zeroAgentRateUsesDropConsistentMaximumThreshold() {
+        RateByServiceTraceSampler sampler = new RateByServiceTraceSampler();
+        sampler.onResponse(AGENT_RATE_ENDPOINT, agentRates(0));
+        withRootSpan(span -> {
+            sampler.setSamplingPriority(span);
+
+            String header = w3cHeader(span);
+            assertTrue(header.contains(OTEL_RANDOM_VALUE_PREFIX));
+            assertFalse(header.contains("ot=rv:ffffffffffffff"));
+            assertTrue(header.contains(MAX_THRESHOLD));
         });
-  }
-
-  @ParameterizedTest
-  @ValueSource(booleans = {true, false})
-  void configuredRulesEstablishProbabilityState(boolean traceRule) {
-    Properties properties = new Properties();
-    properties.setProperty(
-        traceRule ? TRACE_SAMPLING_RULES : TRACE_SAMPLE_RATE,
-        traceRule ? HALF_RATE_RULE : String.valueOf(HALF_RATE));
-    properties.setProperty(TRACE_RATE_LIMIT, "10000000");
-    PrioritySampler sampler = (PrioritySampler) Sampler.Builder.forConfig(properties);
-    withRootSpan(
-        span -> {
-          sampler.setSamplingPriority(span);
-
-          String header = w3cHeader(span);
-          assertTrue(header.contains(OTEL_RANDOM_VALUE_PREFIX));
-          assertTrue(header.contains(HALF_THRESHOLD));
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void configuredRulesEstablishProbabilityState(boolean traceRule) {
+        Properties properties = new Properties();
+        properties.setProperty(
+                traceRule ? TRACE_SAMPLING_RULES : TRACE_SAMPLE_RATE,
+                traceRule ? HALF_RATE_RULE : String.valueOf(HALF_RATE));
+        properties.setProperty(TRACE_RATE_LIMIT, "10000000");
+        PrioritySampler sampler = (PrioritySampler) Sampler.Builder.forConfig(properties);
+        withRootSpan(span -> {
+            sampler.setSamplingPriority(span);
+
+            String header = w3cHeader(span);
+            assertTrue(header.contains(OTEL_RANDOM_VALUE_PREFIX));
+            assertTrue(header.contains(HALF_THRESHOLD));
         });
-  }
-
-  @Test
-  void limiterRejectionDoesNotFabricateProbabilityState() {
-    Properties properties = new Properties();
-    properties.setProperty(TRACE_SAMPLING_RULES, FULL_RATE_RULE);
-    properties.setProperty(TRACE_RATE_LIMIT, "1");
-    PrioritySampler sampler = (PrioritySampler) Sampler.Builder.forConfig(properties);
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      DDSpan allowed = newRootSpan(tracer);
-      DDSpan rejected = newRootSpan(tracer);
-
-      sampler.setSamplingPriority(allowed);
-      sampler.setSamplingPriority(rejected);
-
-      assertTrue(w3cHeader(allowed).contains(OTEL_RANDOM_VALUE_PREFIX));
-      assertEquals(USER_DROP, rejected.samplingPriority());
-      assertFalse(w3cHeader(rejected).contains(OTEL_MEMBER));
-    } finally {
-      tracer.close();
     }
-  }
 
-  @Test
-  void manualOverrideRemovesLocallyGeneratedProbabilityState() {
-    withRootSpan(
-        span -> {
-          span.setSamplingPriority(USER_KEEP, SAMPLING_RULE_RATE, HALF_RATE, LOCAL_USER_RULE);
-          assertTrue(w3cHeader(span).contains(OTEL_RANDOM_VALUE_PREFIX));
+    @Test
+    void limiterRejectionDoesNotFabricateProbabilityState() {
+        Properties properties = new Properties();
+        properties.setProperty(TRACE_SAMPLING_RULES, FULL_RATE_RULE);
+        properties.setProperty(TRACE_RATE_LIMIT, "1");
+        PrioritySampler sampler = (PrioritySampler) Sampler.Builder.forConfig(properties);
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            DDSpan allowed = newRootSpan(tracer);
+            DDSpan rejected = newRootSpan(tracer);
+
+            sampler.setSamplingPriority(allowed);
+            sampler.setSamplingPriority(rejected);
+
+            assertTrue(w3cHeader(allowed).contains(OTEL_RANDOM_VALUE_PREFIX));
+            assertEquals(USER_DROP, rejected.samplingPriority());
+            assertFalse(w3cHeader(rejected).contains(OTEL_MEMBER));
+        } finally {
+            tracer.close();
+        }
+    }
+
+    @Test
+    void manualOverrideRemovesLocallyGeneratedProbabilityState() {
+        withRootSpan(span -> {
+            span.setSamplingPriority(USER_KEEP, SAMPLING_RULE_RATE, HALF_RATE, LOCAL_USER_RULE);
+            assertTrue(w3cHeader(span).contains(OTEL_RANDOM_VALUE_PREFIX));
 
-          span.spanContext().forceKeep();
+            span.spanContext().forceKeep();
 
-          assertFalse(w3cHeader(span).contains(OTEL_MEMBER));
+            assertFalse(w3cHeader(span).contains(OTEL_MEMBER));
         });
-  }
-
-  private void withRootSpan(java.util.function.Consumer<DDSpan> test) {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    try {
-      test.accept(newRootSpan(tracer));
-    } finally {
-      tracer.close();
     }
-  }
-
-  private static DDSpan newRootSpan(CoreTracer tracer) {
-    return (DDSpan)
-        tracer
-            .buildSpan("datadog", "operation")
-            .withServiceName("service")
-            .ignoreActiveSpan()
-            .start();
-  }
-
-  private static String w3cHeader(DDSpan span) {
-    String header = span.spanContext().getPropagationTags().headerValue(W3C);
-    assertNotNull(header);
-    return header;
-  }
-
-  private static Map<String, Map<String, Number>> agentRates(double rate) {
-    Map<String, Number> rates = new HashMap<>();
-    rates.put("service:,env:", rate);
-    Map<String, Map<String, Number>> response = new HashMap<>();
-    response.put("rate_by_service", rates);
-    return response;
-  }
+
+    private void withRootSpan(java.util.function.Consumer<DDSpan> test) {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        try {
+            test.accept(newRootSpan(tracer));
+        } finally {
+            tracer.close();
+        }
+    }
+
+    private static DDSpan newRootSpan(CoreTracer tracer) {
+        return (DDSpan) tracer.buildSpan("datadog", "operation")
+                .withServiceName("service")
+                .ignoreActiveSpan()
+                .start();
+    }
+
+    private static String w3cHeader(DDSpan span) {
+        String header = span.spanContext().getPropagationTags().headerValue(W3C);
+        assertNotNull(header);
+        return header;
+    }
+
+    private static Map<String, Map<String, Number>> agentRates(double rate) {
+        Map<String, Number> rates = new HashMap<>();
+        rates.put("service:,env:", rate);
+        Map<String, Map<String, Number>> response = new HashMap<>();
+        response.put("rate_by_service", rates);
+        return response;
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceBufferTest.java b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceBufferTest.java
index 926262c1b35..6772fd8b04d 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceBufferTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceBufferTest.java
@@ -60,550 +60,541 @@
 @Timeout(10)
 public class PendingTraceBufferTest extends DDJavaSpecification {
 
-  private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-
-  private PendingTraceBuffer buffer;
-  private PendingTraceBuffer bufferSpy;
-  private PendingTraceBuffer.DelayingPendingTraceBuffer delayingBuffer;
-  private CoreTracer tracer;
-  private CoreTracer.ConfigSnapshot traceConfig;
-  private ContinuableScopeManager scopeManager;
-  private PendingTrace.Factory factory;
-  private List<ContextContinuation> continuations;
-
-  @BeforeAll
-  static void checkJvm() {
-    Assumptions.assumeFalse(
-        JavaVirtualMachine.isOracleJDK8(),
-        "Oracle JDK 1.8 did not merge the fix in JDK-8058322, leading to the JVM failing to"
-            + " correctly extract method parameters without args, when the code is compiled on a"
-            + " later JDK (targeting 8). This can manifest when creating mocks.");
-  }
-
-  @BeforeEach
-  void setup() {
-    tracer = mock(CoreTracer.class);
-    traceConfig = mock(CoreTracer.ConfigSnapshot.class);
-    buffer = PendingTraceBuffer.delaying(SystemTimeSource.INSTANCE, mock(Config.class), null, null);
-    bufferSpy = spy(buffer);
-    delayingBuffer = (PendingTraceBuffer.DelayingPendingTraceBuffer) buffer;
-    scopeManager = new ContinuableScopeManager(10, true);
-    factory =
-        new PendingTrace.Factory(
-            tracer, bufferSpy, SystemTimeSource.INSTANCE, false, HealthMetrics.NO_OP);
-    continuations = new ArrayList<>();
-
-    when(tracer.captureTraceConfig()).thenReturn(traceConfig);
-    when(traceConfig.getServiceMapping()).thenReturn(Collections.emptyMap());
-    when(tracer.getPartialFlushMinSpans()).thenReturn(10);
-    when(tracer.writeTimer()).thenReturn(Monitoring.DISABLED.newTimer(""));
-    when(tracer.getTimeWithNanoTicks(anyLong())).thenAnswer(inv -> inv.<Long>getArgument(0));
-  }
-
-  @AfterEach
-  void cleanup() throws InterruptedException {
-    buffer.close();
-    delayingBuffer.getWorker().join(1000);
-  }
-
-  @Test
-  void testBufferLifecycle() throws InterruptedException {
-    assertFalse(delayingBuffer.getWorker().isAlive());
-
-    buffer.start();
-
-    assertTrue(delayingBuffer.getWorker().isAlive());
-    assertTrue(delayingBuffer.getWorker().isDaemon());
-
-    assertThrows(IllegalThreadStateException.class, () -> buffer.start());
-    assertTrue(delayingBuffer.getWorker().isAlive());
-    assertTrue(delayingBuffer.getWorker().isDaemon());
-
-    buffer.close();
-    delayingBuffer.getWorker().join(1000);
-
-    assertFalse(delayingBuffer.getWorker().isAlive());
-  }
-
-  @Test
-  void continuationBuffersRoot() {
-    PendingTrace trace = factory.create(DDTraceId.ONE);
-    DDSpan span = newSpanOf(trace);
-
-    assertFalse(trace.isRootSpanWritten());
-
-    addContinuation(span);
-    span.finish(); // This should enqueue
-
-    assertEquals(1, continuations.size());
-    assertEquals(1, trace.getPendingReferenceCount());
-    verify(bufferSpy).enqueue(trace);
-    verify(tracer).onRootSpanPublished(span);
-
-    clearInvocations(bufferSpy, tracer, traceConfig);
-
-    continuations.get(0).release();
-
-    assertEquals(0, trace.getPendingReferenceCount());
-    verify(tracer).write(argThat(it -> it.size() == 1));
-    verify(tracer).writeTimer();
-  }
-
-  @Test
-  void unfinishedChildBuffersRoot() {
-    PendingTrace trace = factory.create(DDTraceId.ONE);
-    DDSpan parent = newSpanOf(trace);
-    DDSpan child = newSpanOf(parent);
-
-    assertFalse(trace.isRootSpanWritten());
-
-    parent.finish(); // This should enqueue
-
-    assertEquals(1, trace.size());
-    assertEquals(1, trace.getPendingReferenceCount());
-    verify(bufferSpy).enqueue(trace);
-    verify(tracer).onRootSpanPublished(parent);
-
-    clearInvocations(bufferSpy, tracer);
-
-    child.finish();
-
-    assertEquals(0, trace.size());
-    assertEquals(0, trace.getPendingReferenceCount());
-    verify(tracer).write(argThat(it -> it.size() == 2));
-    verify(tracer).writeTimer();
-  }
-
-  @Test
-  void prioritySamplingIsAlwaysSent() {
-    SamplingPriorityMetadataChecker metadataChecker = new SamplingPriorityMetadataChecker();
-    doAnswer(
-            invocation -> {
-              List<DDSpan> spans = invocation.getArgument(0);
-              spans.get(0).processTagsAndBaggage(metadataChecker);
-              return null;
-            })
-        .when(tracer)
-        .write(any());
-
-    DDSpan parent = addContinuation(newSpanOf(factory.create(DDTraceId.ONE), USER_KEEP, 0));
-    // Fill the buffer - Only children - Priority taken from root
-    for (int i = 0; i < 11; i++) {
-      newSpanOf(parent).finish();
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+    private PendingTraceBuffer buffer;
+    private PendingTraceBuffer bufferSpy;
+    private PendingTraceBuffer.DelayingPendingTraceBuffer delayingBuffer;
+    private CoreTracer tracer;
+    private CoreTracer.ConfigSnapshot traceConfig;
+    private ContinuableScopeManager scopeManager;
+    private PendingTrace.Factory factory;
+    private List<ContextContinuation> continuations;
+
+    @BeforeAll
+    static void checkJvm() {
+        Assumptions.assumeFalse(
+                JavaVirtualMachine.isOracleJDK8(),
+                "Oracle JDK 1.8 did not merge the fix in JDK-8058322, leading to the JVM failing to"
+                        + " correctly extract method parameters without args, when the code is compiled on a"
+                        + " later JDK (targeting 8). This can manifest when creating mocks.");
     }
 
-    verify(tracer).write(any());
-    assertTrue(metadataChecker.hasSamplingPriority);
-  }
+    @BeforeEach
+    void setup() {
+        tracer = mock(CoreTracer.class);
+        traceConfig = mock(CoreTracer.ConfigSnapshot.class);
+        buffer = PendingTraceBuffer.delaying(SystemTimeSource.INSTANCE, mock(Config.class), null, null);
+        bufferSpy = spy(buffer);
+        delayingBuffer = (PendingTraceBuffer.DelayingPendingTraceBuffer) buffer;
+        scopeManager = new ContinuableScopeManager(10, true);
+        factory = new PendingTrace.Factory(tracer, bufferSpy, SystemTimeSource.INSTANCE, false, HealthMetrics.NO_OP);
+        continuations = new ArrayList<>();
+
+        when(tracer.captureTraceConfig()).thenReturn(traceConfig);
+        when(traceConfig.getServiceMapping()).thenReturn(Collections.emptyMap());
+        when(tracer.getPartialFlushMinSpans()).thenReturn(10);
+        when(tracer.writeTimer()).thenReturn(Monitoring.DISABLED.newTimer(""));
+        when(tracer.getTimeWithNanoTicks(anyLong())).thenAnswer(inv -> inv.<Long>getArgument(0));
+    }
+
+    @AfterEach
+    void cleanup() throws InterruptedException {
+        buffer.close();
+        delayingBuffer.getWorker().join(1000);
+    }
+
+    @Test
+    void testBufferLifecycle() throws InterruptedException {
+        assertFalse(delayingBuffer.getWorker().isAlive());
+
+        buffer.start();
+
+        assertTrue(delayingBuffer.getWorker().isAlive());
+        assertTrue(delayingBuffer.getWorker().isDaemon());
+
+        assertThrows(IllegalThreadStateException.class, () -> buffer.start());
+        assertTrue(delayingBuffer.getWorker().isAlive());
+        assertTrue(delayingBuffer.getWorker().isDaemon());
+
+        buffer.close();
+        delayingBuffer.getWorker().join(1000);
+
+        assertFalse(delayingBuffer.getWorker().isAlive());
+    }
+
+    @Test
+    void continuationBuffersRoot() {
+        PendingTrace trace = factory.create(DDTraceId.ONE);
+        DDSpan span = newSpanOf(trace);
+
+        assertFalse(trace.isRootSpanWritten());
+
+        addContinuation(span);
+        span.finish(); // This should enqueue
+
+        assertEquals(1, continuations.size());
+        assertEquals(1, trace.getPendingReferenceCount());
+        verify(bufferSpy).enqueue(trace);
+        verify(tracer).onRootSpanPublished(span);
+
+        clearInvocations(bufferSpy, tracer, traceConfig);
+
+        continuations.get(0).release();
+
+        assertEquals(0, trace.getPendingReferenceCount());
+        verify(tracer).write(argThat(it -> it.size() == 1));
+        verify(tracer).writeTimer();
+    }
+
+    @Test
+    void unfinishedChildBuffersRoot() {
+        PendingTrace trace = factory.create(DDTraceId.ONE);
+        DDSpan parent = newSpanOf(trace);
+        DDSpan child = newSpanOf(parent);
+
+        assertFalse(trace.isRootSpanWritten());
+
+        parent.finish(); // This should enqueue
+
+        assertEquals(1, trace.size());
+        assertEquals(1, trace.getPendingReferenceCount());
+        verify(bufferSpy).enqueue(trace);
+        verify(tracer).onRootSpanPublished(parent);
+
+        clearInvocations(bufferSpy, tracer);
+
+        child.finish();
+
+        assertEquals(0, trace.size());
+        assertEquals(0, trace.getPendingReferenceCount());
+        verify(tracer).write(argThat(it -> it.size() == 2));
+        verify(tracer).writeTimer();
+    }
+
+    @Test
+    void prioritySamplingIsAlwaysSent() {
+        SamplingPriorityMetadataChecker metadataChecker = new SamplingPriorityMetadataChecker();
+        doAnswer(invocation -> {
+                    List<DDSpan> spans = invocation.getArgument(0);
+                    spans.get(0).processTagsAndBaggage(metadataChecker);
+                    return null;
+                })
+                .when(tracer)
+                .write(any());
+
+        DDSpan parent = addContinuation(newSpanOf(factory.create(DDTraceId.ONE), USER_KEEP, 0));
+        // Fill the buffer - Only children - Priority taken from root
+        for (int i = 0; i < 11; i++) {
+            newSpanOf(parent).finish();
+        }
+
+        verify(tracer).write(any());
+        assertTrue(metadataChecker.hasSamplingPriority);
+    }
+
+    @Test
+    void bufferFullYieldsImmediateWrite() {
+        int capacity = delayingBuffer.getQueue().capacity();
 
-  @Test
-  void bufferFullYieldsImmediateWrite() {
-    int capacity = delayingBuffer.getQueue().capacity();
+        // Fill the buffer
+        for (int i = 0; i < capacity; i++) {
+            addContinuation(newSpanOf(factory.create(DDTraceId.ONE))).finish();
+        }
+
+        assertEquals(capacity, delayingBuffer.getQueue().size());
+        verify(bufferSpy, times(capacity)).enqueue(any());
+        verify(tracer, times(capacity)).onRootSpanPublished(any());
+
+        clearInvocations(bufferSpy, tracer, traceConfig);
+
+        PendingTrace pendingTrace = factory.create(DDTraceId.ONE);
+        addContinuation(newSpanOf(pendingTrace)).finish();
+
+        verify(bufferSpy).enqueue(any());
+        verify(tracer).write(argThat(it -> it.size() == 1));
+        verify(tracer).onRootSpanPublished(any());
+        assertEquals(0, pendingTrace.getIsEnqueued());
+    }
+
+    @Test
+    void longRunningTraceBufferFullDoesNotTriggerWrite() {
+        int capacity = delayingBuffer.getQueue().capacity();
+
+        // Fill the buffer
+        for (int i = 0; i < capacity; i++) {
+            addContinuation(newSpanOf(factory.create(DDTraceId.ONE))).finish();
+        }
+
+        assertEquals(capacity, delayingBuffer.getQueue().size());
+        verify(bufferSpy, times(capacity)).enqueue(any());
+        verify(tracer, times(capacity)).onRootSpanPublished(any());
+
+        clearInvocations(bufferSpy, tracer, traceConfig);
+
+        PendingTrace pendingTrace = factory.create(DDTraceId.ONE);
+        pendingTrace.setLongRunningTrackedState(LongRunningTracesTracker.TO_TRACK);
+        addContinuation(newSpanOf(pendingTrace)).finish();
 
-    // Fill the buffer
-    for (int i = 0; i < capacity; i++) {
-      addContinuation(newSpanOf(factory.create(DDTraceId.ONE))).finish();
+        verify(tracer).captureTraceConfig();
+        verify(bufferSpy).enqueue(any());
+        verify(tracer, never()).writeTimer();
+        verify(tracer, never()).write(argThat(it -> it.size() == 1));
+        verify(tracer).onRootSpanPublished(any());
+        assertEquals(0, pendingTrace.getIsEnqueued());
     }
 
-    assertEquals(capacity, delayingBuffer.getQueue().size());
-    verify(bufferSpy, times(capacity)).enqueue(any());
-    verify(tracer, times(capacity)).onRootSpanPublished(any());
+    @Test
+    void continuationAllowsAddingAfterRootFinished() {
+        PendingTrace trace = factory.create(DDTraceId.ONE);
+        DDSpan parent = addContinuation(newSpanOf(trace));
+        ContextContinuation continuation = continuations.get(0);
 
-    clearInvocations(bufferSpy, tracer, traceConfig);
+        assertEquals(1, continuations.size());
 
-    PendingTrace pendingTrace = factory.create(DDTraceId.ONE);
-    addContinuation(newSpanOf(pendingTrace)).finish();
+        parent.finish(); // This should enqueue
 
-    verify(bufferSpy).enqueue(any());
-    verify(tracer).write(argThat(it -> it.size() == 1));
-    verify(tracer).onRootSpanPublished(any());
-    assertEquals(0, pendingTrace.getIsEnqueued());
-  }
+        assertEquals(1, trace.size());
+        assertEquals(1, trace.getPendingReferenceCount());
+        assertFalse(trace.isRootSpanWritten());
+        verify(bufferSpy).enqueue(trace);
+        verify(tracer).onRootSpanPublished(parent);
 
-  @Test
-  void longRunningTraceBufferFullDoesNotTriggerWrite() {
-    int capacity = delayingBuffer.getQueue().capacity();
+        clearInvocations(bufferSpy, tracer);
 
-    // Fill the buffer
-    for (int i = 0; i < capacity; i++) {
-      addContinuation(newSpanOf(factory.create(DDTraceId.ONE))).finish();
+        DDSpan child = newSpanOf(parent);
+        child.finish();
+
+        assertEquals(2, trace.size());
+        assertEquals(1, trace.getPendingReferenceCount());
+        assertFalse(trace.isRootSpanWritten());
+
+        // Don't start the buffer thread here. When the continuation is cancelled,
+        // pendingReferenceCount drops to 0 with rootSpanWritten still false, so
+        // write() is called synchronously on this thread. Starting the buffer
+        // would introduce a race where the worker thread could process the
+        // enqueued trace before continuation.cancel(), causing unexpected interactions.
+        continuation.release();
+
+        assertEquals(0, trace.size());
+        assertEquals(0, trace.getPendingReferenceCount());
+        assertTrue(trace.isRootSpanWritten());
+        verify(tracer).write(argThat(it -> it.size() == 2));
+        verify(tracer).writeTimer();
     }
 
-    assertEquals(capacity, delayingBuffer.getQueue().size());
-    verify(bufferSpy, times(capacity)).enqueue(any());
-    verify(tracer, times(capacity)).onRootSpanPublished(any());
-
-    clearInvocations(bufferSpy, tracer, traceConfig);
-
-    PendingTrace pendingTrace = factory.create(DDTraceId.ONE);
-    pendingTrace.setLongRunningTrackedState(LongRunningTracesTracker.TO_TRACK);
-    addContinuation(newSpanOf(pendingTrace)).finish();
-
-    verify(tracer).captureTraceConfig();
-    verify(bufferSpy).enqueue(any());
-    verify(tracer, never()).writeTimer();
-    verify(tracer, never()).write(argThat(it -> it.size() == 1));
-    verify(tracer).onRootSpanPublished(any());
-    assertEquals(0, pendingTrace.getIsEnqueued());
-  }
-
-  @Test
-  void continuationAllowsAddingAfterRootFinished() {
-    PendingTrace trace = factory.create(DDTraceId.ONE);
-    DDSpan parent = addContinuation(newSpanOf(trace));
-    ContextContinuation continuation = continuations.get(0);
-
-    assertEquals(1, continuations.size());
-
-    parent.finish(); // This should enqueue
-
-    assertEquals(1, trace.size());
-    assertEquals(1, trace.getPendingReferenceCount());
-    assertFalse(trace.isRootSpanWritten());
-    verify(bufferSpy).enqueue(trace);
-    verify(tracer).onRootSpanPublished(parent);
-
-    clearInvocations(bufferSpy, tracer);
-
-    DDSpan child = newSpanOf(parent);
-    child.finish();
-
-    assertEquals(2, trace.size());
-    assertEquals(1, trace.getPendingReferenceCount());
-    assertFalse(trace.isRootSpanWritten());
-
-    // Don't start the buffer thread here. When the continuation is cancelled,
-    // pendingReferenceCount drops to 0 with rootSpanWritten still false, so
-    // write() is called synchronously on this thread. Starting the buffer
-    // would introduce a race where the worker thread could process the
-    // enqueued trace before continuation.cancel(), causing unexpected interactions.
-    continuation.release();
-
-    assertEquals(0, trace.size());
-    assertEquals(0, trace.getPendingReferenceCount());
-    assertTrue(trace.isRootSpanWritten());
-    verify(tracer).write(argThat(it -> it.size() == 2));
-    verify(tracer).writeTimer();
-  }
-
-  @Test
-  void lateArrivalSpanRequeuesPendingTrace() throws InterruptedException {
-    buffer.start();
-    CountDownLatch parentLatch = new CountDownLatch(1);
-    CountDownLatch childLatch = new CountDownLatch(1);
-
-    PendingTrace trace = factory.create(DDTraceId.ONE);
-    DDSpan parent = newSpanOf(trace);
-
-    doAnswer(
-            invocation -> {
-              parentLatch.countDown();
-              return null;
-            })
-        .doAnswer(
-            invocation -> {
-              childLatch.countDown();
-              return null;
-            })
-        .when(tracer)
-        .write(any());
-
-    parent.finish(); // This should enqueue
-    assertTrue(parentLatch.await(3, TimeUnit.SECONDS));
-
-    assertEquals(0, trace.size());
-    assertEquals(0, trace.getPendingReferenceCount());
-    assertTrue(trace.isRootSpanWritten());
-    verify(tracer).write(argThat(it -> it.size() == 1));
-    verify(tracer).onRootSpanPublished(parent);
-
-    clearInvocations(bufferSpy, tracer, traceConfig);
-
-    DDSpan child = newSpanOf(parent);
-    child.finish();
-    assertTrue(childLatch.await(3, TimeUnit.SECONDS));
-
-    assertEquals(0, trace.size());
-    assertEquals(0, trace.getPendingReferenceCount());
-    assertTrue(trace.isRootSpanWritten());
-    verify(bufferSpy).enqueue(trace);
-    verify(tracer).write(argThat(it -> it.size() == 1));
-  }
-
-  @Test
-  void flushClearsTheBuffer() throws InterruptedException {
-    buffer.start();
-    AtomicInteger counter = new AtomicInteger(0);
-    // Create a fake element that newer gets written
-    PendingTraceBuffer.Element element =
-        new PendingTraceBuffer.Element() {
-          @Override
-          public long oldestFinishedTime() {
-            return TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis());
-          }
-
-          @Override
-          public boolean lastReferencedNanosAgo(long nanos) {
-            return false;
-          }
-
-          @Override
-          public void write() {
-            counter.incrementAndGet();
-          }
-
-          @Override
-          public DDSpan getRootSpan() {
-            return null;
-          }
-
-          @Override
-          public boolean setEnqueued(boolean enqueued) {
-            return true;
-          }
-
-          @Override
-          public boolean writeOnBufferFull() {
-            return true;
-          }
+    @Test
+    void lateArrivalSpanRequeuesPendingTrace() throws InterruptedException {
+        buffer.start();
+        CountDownLatch parentLatch = new CountDownLatch(1);
+        CountDownLatch childLatch = new CountDownLatch(1);
+
+        PendingTrace trace = factory.create(DDTraceId.ONE);
+        DDSpan parent = newSpanOf(trace);
+
+        doAnswer(invocation -> {
+                    parentLatch.countDown();
+                    return null;
+                })
+                .doAnswer(invocation -> {
+                    childLatch.countDown();
+                    return null;
+                })
+                .when(tracer)
+                .write(any());
+
+        parent.finish(); // This should enqueue
+        assertTrue(parentLatch.await(3, TimeUnit.SECONDS));
+
+        assertEquals(0, trace.size());
+        assertEquals(0, trace.getPendingReferenceCount());
+        assertTrue(trace.isRootSpanWritten());
+        verify(tracer).write(argThat(it -> it.size() == 1));
+        verify(tracer).onRootSpanPublished(parent);
+
+        clearInvocations(bufferSpy, tracer, traceConfig);
+
+        DDSpan child = newSpanOf(parent);
+        child.finish();
+        assertTrue(childLatch.await(3, TimeUnit.SECONDS));
+
+        assertEquals(0, trace.size());
+        assertEquals(0, trace.getPendingReferenceCount());
+        assertTrue(trace.isRootSpanWritten());
+        verify(bufferSpy).enqueue(trace);
+        verify(tracer).write(argThat(it -> it.size() == 1));
+    }
+
+    @Test
+    void flushClearsTheBuffer() throws InterruptedException {
+        buffer.start();
+        AtomicInteger counter = new AtomicInteger(0);
+        // Create a fake element that newer gets written
+        PendingTraceBuffer.Element element = new PendingTraceBuffer.Element() {
+            @Override
+            public long oldestFinishedTime() {
+                return TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis());
+            }
+
+            @Override
+            public boolean lastReferencedNanosAgo(long nanos) {
+                return false;
+            }
+
+            @Override
+            public void write() {
+                counter.incrementAndGet();
+            }
+
+            @Override
+            public DDSpan getRootSpan() {
+                return null;
+            }
+
+            @Override
+            public boolean setEnqueued(boolean enqueued) {
+                return true;
+            }
+
+            @Override
+            public boolean writeOnBufferFull() {
+                return true;
+            }
         };
 
-    bufferSpy.enqueue(element);
-    bufferSpy.enqueue(element);
-    bufferSpy.enqueue(element);
+        bufferSpy.enqueue(element);
+        bufferSpy.enqueue(element);
+        bufferSpy.enqueue(element);
+
+        assertEquals(0, counter.get());
 
-    assertEquals(0, counter.get());
+        buffer.flush();
 
-    buffer.flush();
+        assertEquals(3, counter.get());
+    }
 
-    assertEquals(3, counter.get());
-  }
+    @Test
+    void samePendingTraceIsNotEnqueuedMultipleTimes() {
+        when(tracer.getPartialFlushMinSpans()).thenReturn(10000);
 
-  @Test
-  void samePendingTraceIsNotEnqueuedMultipleTimes() {
-    when(tracer.getPartialFlushMinSpans()).thenReturn(10000);
+        PendingTrace pendingTrace = factory.create(DDTraceId.ONE);
+        DDSpan span = newSpanOf(pendingTrace);
+        span.finish();
 
-    PendingTrace pendingTrace = factory.create(DDTraceId.ONE);
-    DDSpan span = newSpanOf(pendingTrace);
-    span.finish();
+        assertTrue(pendingTrace.isRootSpanWritten());
+        assertEquals(0, pendingTrace.getIsEnqueued());
+        assertEquals(0, delayingBuffer.getQueue().size());
+        verify(tracer).write(argThat(it -> it.size() == 1));
 
-    assertTrue(pendingTrace.isRootSpanWritten());
-    assertEquals(0, pendingTrace.getIsEnqueued());
-    assertEquals(0, delayingBuffer.getQueue().size());
-    verify(tracer).write(argThat(it -> it.size() == 1));
+        clearInvocations(bufferSpy, tracer, traceConfig);
 
-    clearInvocations(bufferSpy, tracer, traceConfig);
+        int capacity = delayingBuffer.getQueue().capacity();
+        // fail to fill the buffer
+        for (int i = 0; i < capacity; i++) {
+            addContinuation(newSpanOf(span)).finish();
+        }
 
-    int capacity = delayingBuffer.getQueue().capacity();
-    // fail to fill the buffer
-    for (int i = 0; i < capacity; i++) {
-      addContinuation(newSpanOf(span)).finish();
+        assertEquals(1, pendingTrace.getIsEnqueued());
+        assertEquals(1, delayingBuffer.getQueue().size());
+        verify(bufferSpy, times(capacity)).enqueue(any());
+
+        // process the buffer
+        buffer.start();
+
+        long deadline = System.currentTimeMillis() + 3000;
+        while (pendingTrace.getIsEnqueued() != 0 && System.currentTimeMillis() < deadline) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                break;
+            }
+        }
+        assertEquals(0, pendingTrace.getIsEnqueued());
     }
 
-    assertEquals(1, pendingTrace.getIsEnqueued());
-    assertEquals(1, delayingBuffer.getQueue().size());
-    verify(bufferSpy, times(capacity)).enqueue(any());
-
-    // process the buffer
-    buffer.start();
-
-    long deadline = System.currentTimeMillis() + 3000;
-    while (pendingTrace.getIsEnqueued() != 0 && System.currentTimeMillis() < deadline) {
-      try {
-        Thread.sleep(100);
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-        break;
-      }
+    @Test
+    void testingTracerFlareDumpWithMultipleTraces() throws IOException, InterruptedException {
+        TracerFlare.addReporter(zip -> {}); // exercises default methods
+        TracerFlare.Reporter dumpReporter = mock(TracerFlare.Reporter.class);
+        TracerFlare.addReporter(dumpReporter);
+
+        PendingTrace trace1 = factory.create(DDTraceId.ONE);
+        DDSpan parent1 = newSpanOf(trace1, UNSET, System.currentTimeMillis() * 1000);
+        DDSpan child1 = newSpanOf(parent1);
+        PendingTrace trace2 = factory.create(DDTraceId.from(2));
+        DDSpan parent2 = newSpanOf(trace2, UNSET, System.currentTimeMillis() * 2000);
+        DDSpan child2 = newSpanOf(parent2);
+        // first flare dump with two traces
+        parent1.finish();
+        parent2.finish();
+        buffer.start();
+        Map<String, Object> entries1 = buildAndExtractZip();
+
+        verify(dumpReporter).prepareForFlare();
+        verify(dumpReporter).addReportToFlare(any());
+        verify(dumpReporter).cleanupAfterFlare();
+
+        assertEquals(1, entries1.size());
+        String pendingTraceText1 = (String) entries1.get("pending_traces.txt");
+        assertTrue(
+                pendingTraceText1.startsWith(
+                        "[{\"service\":\"fakeService\",\"name\":\"fakeOperation\",\"resource\":\"fakeResource\",\"trace_id\":1,\"span_id\":1,\"parent_id\":0"));
+
+        List<Map<String, Object>> parsedTraces1 = parseTraceLines(pendingTraceText1);
+        assertEquals(2, parsedTraces1.size());
+        assertEquals(1L, ((Number) parsedTraces1.get(0).get("trace_id")).longValue());
+        assertEquals(2L, ((Number) parsedTraces1.get(1).get("trace_id")).longValue());
+        assertTrue(((Number) parsedTraces1.get(0).get("start")).longValue()
+                < ((Number) parsedTraces1.get(1).get("start")).longValue());
+
+        clearInvocations(dumpReporter);
+
+        // New pending traces are needed here because generating the first flare takes long enough that
+        // the
+        // earlier pending traces are flushed (within 500ms).
+        // second flare dump with new pending traces
+        // Finish the first set of traces
+        child1.finish();
+        child2.finish();
+        // Create new pending traces
+        PendingTrace trace3 = factory.create(DDTraceId.from(3));
+        DDSpan parent3 = newSpanOf(trace3, UNSET, System.currentTimeMillis() * 3000);
+        DDSpan child3 = newSpanOf(parent3);
+        PendingTrace trace4 = factory.create(DDTraceId.from(4));
+        DDSpan parent4 = newSpanOf(trace4, UNSET, System.currentTimeMillis() * 4000);
+        DDSpan child4 = newSpanOf(parent4);
+        parent3.finish();
+        parent4.finish();
+        Map<String, Object> entries2 = buildAndExtractZip();
+
+        verify(dumpReporter).prepareForFlare();
+        verify(dumpReporter).addReportToFlare(any());
+        verify(dumpReporter).cleanupAfterFlare();
+
+        assertEquals(1, entries2.size());
+        String pendingTraceText2 = (String) entries2.get("pending_traces.txt");
+        List<Map<String, Object>> parsedTraces2 = parseTraceLines(pendingTraceText2);
+        assertEquals(2, parsedTraces2.size());
+
+        child3.finish();
+        child4.finish();
+
+        long deadline = System.currentTimeMillis() + 3000;
+        while ((trace1.size() != 0 || trace2.size() != 0 || trace3.size() != 0 || trace4.size() != 0)
+                && System.currentTimeMillis() < deadline) {
+            Thread.sleep(50);
+        }
+
+        assertEquals(0, trace1.size());
+        assertEquals(0, trace1.getPendingReferenceCount());
+        assertEquals(0, trace2.size());
+        assertEquals(0, trace2.getPendingReferenceCount());
+        assertEquals(0, trace3.size());
+        assertEquals(0, trace3.getPendingReferenceCount());
+        assertEquals(0, trace4.size());
+        assertEquals(0, trace4.getPendingReferenceCount());
     }
-    assertEquals(0, pendingTrace.getIsEnqueued());
-  }
-
-  @Test
-  void testingTracerFlareDumpWithMultipleTraces() throws IOException, InterruptedException {
-    TracerFlare.addReporter(zip -> {}); // exercises default methods
-    TracerFlare.Reporter dumpReporter = mock(TracerFlare.Reporter.class);
-    TracerFlare.addReporter(dumpReporter);
-
-    PendingTrace trace1 = factory.create(DDTraceId.ONE);
-    DDSpan parent1 = newSpanOf(trace1, UNSET, System.currentTimeMillis() * 1000);
-    DDSpan child1 = newSpanOf(parent1);
-    PendingTrace trace2 = factory.create(DDTraceId.from(2));
-    DDSpan parent2 = newSpanOf(trace2, UNSET, System.currentTimeMillis() * 2000);
-    DDSpan child2 = newSpanOf(parent2);
-    // first flare dump with two traces
-    parent1.finish();
-    parent2.finish();
-    buffer.start();
-    Map<String, Object> entries1 = buildAndExtractZip();
-
-    verify(dumpReporter).prepareForFlare();
-    verify(dumpReporter).addReportToFlare(any());
-    verify(dumpReporter).cleanupAfterFlare();
-
-    assertEquals(1, entries1.size());
-    String pendingTraceText1 = (String) entries1.get("pending_traces.txt");
-    assertTrue(
-        pendingTraceText1.startsWith(
-            "[{\"service\":\"fakeService\",\"name\":\"fakeOperation\",\"resource\":\"fakeResource\",\"trace_id\":1,\"span_id\":1,\"parent_id\":0"));
-
-    List<Map<String, Object>> parsedTraces1 = parseTraceLines(pendingTraceText1);
-    assertEquals(2, parsedTraces1.size());
-    assertEquals(1L, ((Number) parsedTraces1.get(0).get("trace_id")).longValue());
-    assertEquals(2L, ((Number) parsedTraces1.get(1).get("trace_id")).longValue());
-    assertTrue(
-        ((Number) parsedTraces1.get(0).get("start")).longValue()
-            < ((Number) parsedTraces1.get(1).get("start")).longValue());
-
-    clearInvocations(dumpReporter);
-
-    // New pending traces are needed here because generating the first flare takes long enough that
-    // the
-    // earlier pending traces are flushed (within 500ms).
-    // second flare dump with new pending traces
-    // Finish the first set of traces
-    child1.finish();
-    child2.finish();
-    // Create new pending traces
-    PendingTrace trace3 = factory.create(DDTraceId.from(3));
-    DDSpan parent3 = newSpanOf(trace3, UNSET, System.currentTimeMillis() * 3000);
-    DDSpan child3 = newSpanOf(parent3);
-    PendingTrace trace4 = factory.create(DDTraceId.from(4));
-    DDSpan parent4 = newSpanOf(trace4, UNSET, System.currentTimeMillis() * 4000);
-    DDSpan child4 = newSpanOf(parent4);
-    parent3.finish();
-    parent4.finish();
-    Map<String, Object> entries2 = buildAndExtractZip();
-
-    verify(dumpReporter).prepareForFlare();
-    verify(dumpReporter).addReportToFlare(any());
-    verify(dumpReporter).cleanupAfterFlare();
-
-    assertEquals(1, entries2.size());
-    String pendingTraceText2 = (String) entries2.get("pending_traces.txt");
-    List<Map<String, Object>> parsedTraces2 = parseTraceLines(pendingTraceText2);
-    assertEquals(2, parsedTraces2.size());
-
-    child3.finish();
-    child4.finish();
-
-    long deadline = System.currentTimeMillis() + 3000;
-    while ((trace1.size() != 0 || trace2.size() != 0 || trace3.size() != 0 || trace4.size() != 0)
-        && System.currentTimeMillis() < deadline) {
-      Thread.sleep(50);
+
+    private DDSpan addContinuation(DDSpan span) {
+        ContextScope scope = scopeManager.activateSpan(span);
+        continuations.add(scopeManager.capture(span));
+        scope.close();
+        return span;
     }
 
-    assertEquals(0, trace1.size());
-    assertEquals(0, trace1.getPendingReferenceCount());
-    assertEquals(0, trace2.size());
-    assertEquals(0, trace2.getPendingReferenceCount());
-    assertEquals(0, trace3.size());
-    assertEquals(0, trace3.getPendingReferenceCount());
-    assertEquals(0, trace4.size());
-    assertEquals(0, trace4.getPendingReferenceCount());
-  }
-
-  private DDSpan addContinuation(DDSpan span) {
-    ContextScope scope = scopeManager.activateSpan(span);
-    continuations.add(scopeManager.capture(span));
-    scope.close();
-    return span;
-  }
-
-  private static DDSpan newSpanOf(PendingTrace trace) {
-    return newSpanOf(trace, UNSET, 0);
-  }
-
-  private static DDSpan newSpanOf(PendingTrace trace, int samplingPriority, long timestampMicro) {
-    DDSpanContext context =
-        new DDSpanContext(
-            trace.getTraceId(),
-            1,
-            DDSpanId.ZERO,
-            null,
-            "fakeService",
-            "fakeOperation",
-            "fakeResource",
-            samplingPriority,
-            null,
-            Collections.emptyMap(),
-            false,
-            "fakeType",
-            0,
-            trace,
-            null,
-            null,
-            NoopPathwayContext.INSTANCE,
-            false,
-            PropagationTags.factory().empty());
-    return DDSpan.create("test", timestampMicro, context, null);
-  }
-
-  private static DDSpan newSpanOf(DDSpan parent) {
-    TraceCollector traceCollector = parent.spanContext().getTraceCollector();
-    DDSpanContext context =
-        new DDSpanContext(
-            parent.spanContext().getTraceId(),
-            2,
-            parent.spanContext().getSpanId(),
-            null,
-            "fakeService",
-            "fakeOperation",
-            "fakeResource",
-            UNSET,
-            null,
-            Collections.emptyMap(),
-            false,
-            "fakeType",
-            0,
-            traceCollector,
-            null,
-            null,
-            NoopPathwayContext.INSTANCE,
-            false,
-            PropagationTags.factory().empty());
-    return DDSpan.create("test", 0, context, null);
-  }
-
-  private Map<String, Object> buildAndExtractZip() throws IOException {
-    TracerFlare.prepareForFlare();
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    try (ZipOutputStream zip = new ZipOutputStream(out)) {
-      TracerFlare.addReportsToFlare(zip);
-    } finally {
-      TracerFlare.cleanupAfterFlare();
+    private static DDSpan newSpanOf(PendingTrace trace) {
+        return newSpanOf(trace, UNSET, 0);
     }
 
-    Map<String, Object> entries = new LinkedHashMap<>();
-    try (ZipInputStream zip = new ZipInputStream(new ByteArrayInputStream(out.toByteArray()))) {
-      ZipEntry entry;
-      byte[] buf = new byte[4096];
-      while ((entry = zip.getNextEntry()) != null) {
-        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-        int read;
-        while ((read = zip.read(buf)) != -1) {
-          bytes.write(buf, 0, read);
+    private static DDSpan newSpanOf(PendingTrace trace, int samplingPriority, long timestampMicro) {
+        DDSpanContext context = new DDSpanContext(
+                trace.getTraceId(),
+                1,
+                DDSpanId.ZERO,
+                null,
+                "fakeService",
+                "fakeOperation",
+                "fakeResource",
+                samplingPriority,
+                null,
+                Collections.emptyMap(),
+                false,
+                "fakeType",
+                0,
+                trace,
+                null,
+                null,
+                NoopPathwayContext.INSTANCE,
+                false,
+                PropagationTags.factory().empty());
+        return DDSpan.create("test", timestampMicro, context, null);
+    }
+
+    private static DDSpan newSpanOf(DDSpan parent) {
+        TraceCollector traceCollector = parent.spanContext().getTraceCollector();
+        DDSpanContext context = new DDSpanContext(
+                parent.spanContext().getTraceId(),
+                2,
+                parent.spanContext().getSpanId(),
+                null,
+                "fakeService",
+                "fakeOperation",
+                "fakeResource",
+                UNSET,
+                null,
+                Collections.emptyMap(),
+                false,
+                "fakeType",
+                0,
+                traceCollector,
+                null,
+                null,
+                NoopPathwayContext.INSTANCE,
+                false,
+                PropagationTags.factory().empty());
+        return DDSpan.create("test", 0, context, null);
+    }
+
+    private Map<String, Object> buildAndExtractZip() throws IOException {
+        TracerFlare.prepareForFlare();
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (ZipOutputStream zip = new ZipOutputStream(out)) {
+            TracerFlare.addReportsToFlare(zip);
+        } finally {
+            TracerFlare.cleanupAfterFlare();
         }
-        String name = entry.getName();
-        if (name.endsWith(".bin")) {
-          entries.put(name, bytes.toByteArray());
-        } else {
-          entries.put(name, new String(bytes.toByteArray(), UTF_8));
+
+        Map<String, Object> entries = new LinkedHashMap<>();
+        try (ZipInputStream zip = new ZipInputStream(new ByteArrayInputStream(out.toByteArray()))) {
+            ZipEntry entry;
+            byte[] buf = new byte[4096];
+            while ((entry = zip.getNextEntry()) != null) {
+                ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+                int read;
+                while ((read = zip.read(buf)) != -1) {
+                    bytes.write(buf, 0, read);
+                }
+                String name = entry.getName();
+                if (name.endsWith(".bin")) {
+                    entries.put(name, bytes.toByteArray());
+                } else {
+                    entries.put(name, new String(bytes.toByteArray(), UTF_8));
+                }
+            }
         }
-      }
+        return entries;
     }
-    return entries;
-  }
-
-  private static List<Map<String, Object>> parseTraceLines(String text) throws IOException {
-    List<Map<String, Object>> allSpans = new ArrayList<>();
-    for (String line : text.split("\n")) {
-      if (!line.isEmpty()) {
-        List<Map<String, Object>> lineSpans =
-            OBJECT_MAPPER.readValue(line, new TypeReference<List<Map<String, Object>>>() {});
-        allSpans.addAll(lineSpans);
-      }
+
+    private static List<Map<String, Object>> parseTraceLines(String text) throws IOException {
+        List<Map<String, Object>> allSpans = new ArrayList<>();
+        for (String line : text.split("\n")) {
+            if (!line.isEmpty()) {
+                List<Map<String, Object>> lineSpans =
+                        OBJECT_MAPPER.readValue(line, new TypeReference<List<Map<String, Object>>>() {});
+                allSpans.addAll(lineSpans);
+            }
+        }
+        return allSpans;
     }
-    return allSpans;
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceStrictWriteTest.java b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceStrictWriteTest.java
index 309ac1db3ba..8634f55a557 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceStrictWriteTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceStrictWriteTest.java
@@ -12,53 +12,52 @@
 
 public class PendingTraceStrictWriteTest extends PendingTraceTestBase {
 
-  @Test
-  void traceNotReportedUntilContinuationClosed() throws InterruptedException {
-    ContextScope scope = tracer.activateSpan(rootSpan);
-    ContextContinuation continuation = tracer.capture(rootSpan);
-    scope.close();
-    rootSpan.finish();
-
-    assertEquals(1, traceCollector.getPendingReferenceCount());
-    assertEquals(Arrays.asList(rootSpan), new ArrayList<>(traceCollector.getSpans()));
-    assertTrue(writer.isEmpty());
-    // root span buffer delay expires
-    writer.waitForTracesMax(1, 1);
-
-    assertEquals(1, traceCollector.getPendingReferenceCount());
-    assertEquals(Arrays.asList(rootSpan), new ArrayList<>(traceCollector.getSpans()));
-    assertTrue(writer.isEmpty());
-    assertEquals(0, writer.getTraceCount());
-    // continuation is closed
-    continuation.release();
-
-    assertEquals(0, traceCollector.getPendingReferenceCount());
-    assertTrue(traceCollector.getSpans().isEmpty());
-    assertEquals(Arrays.asList(Arrays.asList(rootSpan)), new ArrayList<>(writer));
-    assertEquals(1, writer.getTraceCount());
-  }
-
-  @Test
-  void negativeReferenceCountThrowsException() {
-    ContextScope scope = tracer.activateSpan(rootSpan);
-    ContextContinuation continuation = tracer.capture(rootSpan);
-    scope.close();
-    rootSpan.finish();
-
-    assertEquals(1, traceCollector.getPendingReferenceCount());
-    assertEquals(Arrays.asList(rootSpan), new ArrayList<>(traceCollector.getSpans()));
-    assertTrue(writer.isEmpty());
-    // continuation is finished the first time
-    continuation.release();
-
-    assertEquals(0, traceCollector.getPendingReferenceCount());
-    assertTrue(traceCollector.getSpans().isEmpty());
-    assertEquals(Arrays.asList(Arrays.asList(rootSpan)), new ArrayList<>(writer));
-    assertEquals(1, writer.getTraceCount());
-    // continuation is finished the second time
-    // Yes this should be guarded by the used flag in the continuation,
-    // so remove it anyway to trigger the exception
-    assertThrows(
-        IllegalStateException.class, () -> traceCollector.removeContinuation(continuation));
-  }
+    @Test
+    void traceNotReportedUntilContinuationClosed() throws InterruptedException {
+        ContextScope scope = tracer.activateSpan(rootSpan);
+        ContextContinuation continuation = tracer.capture(rootSpan);
+        scope.close();
+        rootSpan.finish();
+
+        assertEquals(1, traceCollector.getPendingReferenceCount());
+        assertEquals(Arrays.asList(rootSpan), new ArrayList<>(traceCollector.getSpans()));
+        assertTrue(writer.isEmpty());
+        // root span buffer delay expires
+        writer.waitForTracesMax(1, 1);
+
+        assertEquals(1, traceCollector.getPendingReferenceCount());
+        assertEquals(Arrays.asList(rootSpan), new ArrayList<>(traceCollector.getSpans()));
+        assertTrue(writer.isEmpty());
+        assertEquals(0, writer.getTraceCount());
+        // continuation is closed
+        continuation.release();
+
+        assertEquals(0, traceCollector.getPendingReferenceCount());
+        assertTrue(traceCollector.getSpans().isEmpty());
+        assertEquals(Arrays.asList(Arrays.asList(rootSpan)), new ArrayList<>(writer));
+        assertEquals(1, writer.getTraceCount());
+    }
+
+    @Test
+    void negativeReferenceCountThrowsException() {
+        ContextScope scope = tracer.activateSpan(rootSpan);
+        ContextContinuation continuation = tracer.capture(rootSpan);
+        scope.close();
+        rootSpan.finish();
+
+        assertEquals(1, traceCollector.getPendingReferenceCount());
+        assertEquals(Arrays.asList(rootSpan), new ArrayList<>(traceCollector.getSpans()));
+        assertTrue(writer.isEmpty());
+        // continuation is finished the first time
+        continuation.release();
+
+        assertEquals(0, traceCollector.getPendingReferenceCount());
+        assertTrue(traceCollector.getSpans().isEmpty());
+        assertEquals(Arrays.asList(Arrays.asList(rootSpan)), new ArrayList<>(writer));
+        assertEquals(1, writer.getTraceCount());
+        // continuation is finished the second time
+        // Yes this should be guarded by the used flag in the continuation,
+        // so remove it anyway to trigger the exception
+        assertThrows(IllegalStateException.class, () -> traceCollector.removeContinuation(continuation));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTest.java b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTest.java
index 7d47a0b17c5..3a8fd8a533e 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTest.java
@@ -29,193 +29,168 @@
 @Timeout(60)
 public class PendingTraceTest extends PendingTraceTestBase {
 
-  @BeforeAll
-  static void checkJvm() {
-    Assumptions.assumeFalse(
-        JavaVirtualMachine.isOracleJDK8(),
-        "Oracle JDK 1.8 did not merge the fix in JDK-8058322, leading to the JVM failing to"
-            + " correctly extract method parameters without args, when the code is compiled on a"
-            + " later JDK (targeting 8). This can manifest when creating mocks.");
-  }
-
-  @Override
-  protected boolean useStrictTraceWrites() {
-    // This tests the behavior of the relaxed pending trace implementation
-    return false;
-  }
-
-  private DDSpan createSimpleSpan(PendingTrace trace) {
-    return createSimpleSpanWithID(trace, 1);
-  }
-
-  private DDSpan createSimpleSpanWithID(PendingTrace trace, long id) {
-    return new DDSpan(
-        "test",
-        0L,
-        new DDSpanContext(
-            DDTraceId.from(1),
-            id,
-            0,
-            null,
-            "",
-            "",
-            "",
-            UNSET,
-            "",
-            Collections.emptyMap(),
-            false,
-            "",
-            0,
-            trace,
-            null,
-            null,
-            NoopPathwayContext.INSTANCE,
-            false,
-            PropagationTags.factory().empty()),
-        null);
-  }
-
-  @Test
-  void traceStillReportedWhenUnfinishedContinuationDiscarded()
-      throws InterruptedException, TimeoutException {
-    ContextScope scope = tracer.activateSpan(rootSpan);
-    tracer.capture(rootSpan);
-    scope.close();
-
-    rootSpan.finish();
-
-    assertEquals(1, traceCollector.getPendingReferenceCount());
-    assertEquals(Arrays.asList(rootSpan), new ArrayList<>(traceCollector.getSpans()));
-    assertTrue(writer.isEmpty());
-    // root span buffer delay expires
-    writer.waitForTraces(1);
-
-    assertEquals(1, traceCollector.getPendingReferenceCount());
-    assertTrue(traceCollector.getSpans().isEmpty());
-    assertEquals(Arrays.asList(Arrays.asList(rootSpan)), new ArrayList<>(writer));
-    assertEquals(1, writer.getTraceCount());
-  }
-
-  @Test
-  void verifyHealthMetricsCalled() {
-    CoreTracer stubTracer = mock(CoreTracer.class);
-    CoreTracer.ConfigSnapshot traceConfig = mock(CoreTracer.ConfigSnapshot.class);
-    PendingTraceBuffer buffer = mock(PendingTraceBuffer.class);
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-
-    when(stubTracer.captureTraceConfig()).thenReturn(traceConfig);
-    when(traceConfig.getServiceMapping()).thenReturn(Collections.emptyMap());
-
-    PendingTrace trace =
-        new PendingTrace(
-            stubTracer,
-            DDTraceId.from(0),
-            buffer,
-            mock(TimeSource.class),
-            null,
-            false,
-            healthMetrics);
-
-    DDSpan span = createSimpleSpan(trace);
-    trace.registerSpan(span);
-
-    verify(healthMetrics, times(1)).onCreateSpan();
-
-    span.finish();
-
-    verify(healthMetrics, times(1)).onCreateTrace();
-  }
-
-  @Test
-  void writeWhenRunningSpansDisabledOnlyCompletedSpansWritten() {
-    CoreTracer stubTracer = mock(CoreTracer.class);
-    CoreTracer.ConfigSnapshot traceConfig = mock(CoreTracer.ConfigSnapshot.class);
-    PendingTraceBuffer buffer = mock(PendingTraceBuffer.class);
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-
-    when(stubTracer.captureTraceConfig()).thenReturn(traceConfig);
-    when(traceConfig.getServiceMapping()).thenReturn(Collections.emptyMap());
-    when(buffer.longRunningSpansEnabled()).thenReturn(true);
-
-    PendingTrace trace =
-        new PendingTrace(
-            stubTracer,
-            DDTraceId.from(0),
-            buffer,
-            mock(TimeSource.class),
-            null,
-            false,
-            healthMetrics);
-
-    DDSpan span1 = createSimpleSpanWithID(trace, 39);
-    span1.setDurationNano(31);
-    span1.setSamplingPriority(USER_KEEP);
-    trace.registerSpan(span1);
-
-    DDSpan unfinishedSpan = createSimpleSpanWithID(trace, 191);
-    trace.registerSpan(unfinishedSpan);
-
-    DDSpan span2 = createSimpleSpanWithID(trace, 9999);
-    span2.setDurationNano(9191);
-    trace.registerSpan(span2);
-
-    List<DDSpan> traceToWrite = new ArrayList<>(0);
-    int completedSpans = trace.enqueueSpansToWrite(traceToWrite, false);
-
-    assertEquals(2, completedSpans);
-    assertEquals(2, traceToWrite.size());
-    assertTrue(traceToWrite.containsAll(Arrays.asList(span1, span2)));
-    assertEquals(1, trace.getSpans().size());
-    assertEquals(unfinishedSpan, trace.getSpans().iterator().next());
-  }
-
-  @Test
-  void writeWhenRunningSpansEnabledCompleteAndRunningSpansWritten() {
-    CoreTracer stubTracer = mock(CoreTracer.class);
-    CoreTracer.ConfigSnapshot traceConfig = mock(CoreTracer.ConfigSnapshot.class);
-    PendingTraceBuffer buffer = mock(PendingTraceBuffer.class);
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-
-    when(stubTracer.captureTraceConfig()).thenReturn(traceConfig);
-    when(traceConfig.getServiceMapping()).thenReturn(Collections.emptyMap());
-    when(buffer.longRunningSpansEnabled()).thenReturn(true);
-
-    PendingTrace trace =
-        new PendingTrace(
-            stubTracer,
-            DDTraceId.from(0),
-            buffer,
-            mock(TimeSource.class),
-            null,
-            false,
-            healthMetrics);
-
-    DDSpan span1 = createSimpleSpanWithID(trace, 39);
-    span1.setDurationNano(31);
-    span1.setSamplingPriority(USER_KEEP);
-    trace.registerSpan(span1);
-
-    DDSpan unfinishedSpan = createSimpleSpanWithID(trace, 191);
-    trace.registerSpan(unfinishedSpan);
-
-    DDSpan span2 = createSimpleSpanWithID(trace, 9999);
-    span2.setServiceName("9191");
-    span2.setDurationNano(9191);
-    trace.registerSpan(span2);
-
-    DDSpan unfinishedSpan2 = createSimpleSpanWithID(trace, 77771);
-    trace.registerSpan(unfinishedSpan2);
-
-    List<DDSpan> traceToWrite = new ArrayList<>(0);
-    int completedSpans = trace.enqueueSpansToWrite(traceToWrite, true);
-
-    assertEquals(2, completedSpans);
-    assertEquals(4, traceToWrite.size());
-    assertTrue(
-        traceToWrite.containsAll(Arrays.asList(span1, span2, unfinishedSpan, unfinishedSpan2)));
-    assertEquals(2, trace.getSpans().size());
-    assertTrue(
-        new ArrayList<>(trace.getSpans())
-            .containsAll(Arrays.asList(unfinishedSpan, unfinishedSpan2)));
-  }
+    @BeforeAll
+    static void checkJvm() {
+        Assumptions.assumeFalse(
+                JavaVirtualMachine.isOracleJDK8(),
+                "Oracle JDK 1.8 did not merge the fix in JDK-8058322, leading to the JVM failing to"
+                        + " correctly extract method parameters without args, when the code is compiled on a"
+                        + " later JDK (targeting 8). This can manifest when creating mocks.");
+    }
+
+    @Override
+    protected boolean useStrictTraceWrites() {
+        // This tests the behavior of the relaxed pending trace implementation
+        return false;
+    }
+
+    private DDSpan createSimpleSpan(PendingTrace trace) {
+        return createSimpleSpanWithID(trace, 1);
+    }
+
+    private DDSpan createSimpleSpanWithID(PendingTrace trace, long id) {
+        return new DDSpan(
+                "test",
+                0L,
+                new DDSpanContext(
+                        DDTraceId.from(1),
+                        id,
+                        0,
+                        null,
+                        "",
+                        "",
+                        "",
+                        UNSET,
+                        "",
+                        Collections.emptyMap(),
+                        false,
+                        "",
+                        0,
+                        trace,
+                        null,
+                        null,
+                        NoopPathwayContext.INSTANCE,
+                        false,
+                        PropagationTags.factory().empty()),
+                null);
+    }
+
+    @Test
+    void traceStillReportedWhenUnfinishedContinuationDiscarded() throws InterruptedException, TimeoutException {
+        ContextScope scope = tracer.activateSpan(rootSpan);
+        tracer.capture(rootSpan);
+        scope.close();
+
+        rootSpan.finish();
+
+        assertEquals(1, traceCollector.getPendingReferenceCount());
+        assertEquals(Arrays.asList(rootSpan), new ArrayList<>(traceCollector.getSpans()));
+        assertTrue(writer.isEmpty());
+        // root span buffer delay expires
+        writer.waitForTraces(1);
+
+        assertEquals(1, traceCollector.getPendingReferenceCount());
+        assertTrue(traceCollector.getSpans().isEmpty());
+        assertEquals(Arrays.asList(Arrays.asList(rootSpan)), new ArrayList<>(writer));
+        assertEquals(1, writer.getTraceCount());
+    }
+
+    @Test
+    void verifyHealthMetricsCalled() {
+        CoreTracer stubTracer = mock(CoreTracer.class);
+        CoreTracer.ConfigSnapshot traceConfig = mock(CoreTracer.ConfigSnapshot.class);
+        PendingTraceBuffer buffer = mock(PendingTraceBuffer.class);
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+
+        when(stubTracer.captureTraceConfig()).thenReturn(traceConfig);
+        when(traceConfig.getServiceMapping()).thenReturn(Collections.emptyMap());
+
+        PendingTrace trace = new PendingTrace(
+                stubTracer, DDTraceId.from(0), buffer, mock(TimeSource.class), null, false, healthMetrics);
+
+        DDSpan span = createSimpleSpan(trace);
+        trace.registerSpan(span);
+
+        verify(healthMetrics, times(1)).onCreateSpan();
+
+        span.finish();
+
+        verify(healthMetrics, times(1)).onCreateTrace();
+    }
+
+    @Test
+    void writeWhenRunningSpansDisabledOnlyCompletedSpansWritten() {
+        CoreTracer stubTracer = mock(CoreTracer.class);
+        CoreTracer.ConfigSnapshot traceConfig = mock(CoreTracer.ConfigSnapshot.class);
+        PendingTraceBuffer buffer = mock(PendingTraceBuffer.class);
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+
+        when(stubTracer.captureTraceConfig()).thenReturn(traceConfig);
+        when(traceConfig.getServiceMapping()).thenReturn(Collections.emptyMap());
+        when(buffer.longRunningSpansEnabled()).thenReturn(true);
+
+        PendingTrace trace = new PendingTrace(
+                stubTracer, DDTraceId.from(0), buffer, mock(TimeSource.class), null, false, healthMetrics);
+
+        DDSpan span1 = createSimpleSpanWithID(trace, 39);
+        span1.setDurationNano(31);
+        span1.setSamplingPriority(USER_KEEP);
+        trace.registerSpan(span1);
+
+        DDSpan unfinishedSpan = createSimpleSpanWithID(trace, 191);
+        trace.registerSpan(unfinishedSpan);
+
+        DDSpan span2 = createSimpleSpanWithID(trace, 9999);
+        span2.setDurationNano(9191);
+        trace.registerSpan(span2);
+
+        List<DDSpan> traceToWrite = new ArrayList<>(0);
+        int completedSpans = trace.enqueueSpansToWrite(traceToWrite, false);
+
+        assertEquals(2, completedSpans);
+        assertEquals(2, traceToWrite.size());
+        assertTrue(traceToWrite.containsAll(Arrays.asList(span1, span2)));
+        assertEquals(1, trace.getSpans().size());
+        assertEquals(unfinishedSpan, trace.getSpans().iterator().next());
+    }
+
+    @Test
+    void writeWhenRunningSpansEnabledCompleteAndRunningSpansWritten() {
+        CoreTracer stubTracer = mock(CoreTracer.class);
+        CoreTracer.ConfigSnapshot traceConfig = mock(CoreTracer.ConfigSnapshot.class);
+        PendingTraceBuffer buffer = mock(PendingTraceBuffer.class);
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+
+        when(stubTracer.captureTraceConfig()).thenReturn(traceConfig);
+        when(traceConfig.getServiceMapping()).thenReturn(Collections.emptyMap());
+        when(buffer.longRunningSpansEnabled()).thenReturn(true);
+
+        PendingTrace trace = new PendingTrace(
+                stubTracer, DDTraceId.from(0), buffer, mock(TimeSource.class), null, false, healthMetrics);
+
+        DDSpan span1 = createSimpleSpanWithID(trace, 39);
+        span1.setDurationNano(31);
+        span1.setSamplingPriority(USER_KEEP);
+        trace.registerSpan(span1);
+
+        DDSpan unfinishedSpan = createSimpleSpanWithID(trace, 191);
+        trace.registerSpan(unfinishedSpan);
+
+        DDSpan span2 = createSimpleSpanWithID(trace, 9999);
+        span2.setServiceName("9191");
+        span2.setDurationNano(9191);
+        trace.registerSpan(span2);
+
+        DDSpan unfinishedSpan2 = createSimpleSpanWithID(trace, 77771);
+        trace.registerSpan(unfinishedSpan2);
+
+        List<DDSpan> traceToWrite = new ArrayList<>(0);
+        int completedSpans = trace.enqueueSpansToWrite(traceToWrite, true);
+
+        assertEquals(2, completedSpans);
+        assertEquals(4, traceToWrite.size());
+        assertTrue(traceToWrite.containsAll(Arrays.asList(span1, span2, unfinishedSpan, unfinishedSpan2)));
+        assertEquals(2, trace.getSpans().size());
+        assertTrue(new ArrayList<>(trace.getSpans()).containsAll(Arrays.asList(unfinishedSpan, unfinishedSpan2)));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTestBase.java b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTestBase.java
index aa986faa0e4..7465bd16570 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTestBase.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTestBase.java
@@ -23,203 +23,204 @@
 
 public abstract class PendingTraceTestBase extends DDCoreJavaSpecification {
 
-  protected ListWriter writer;
-  protected CoreTracer tracer;
-  protected DDSpan rootSpan;
-  protected PendingTrace traceCollector;
-
-  @BeforeEach
-  void setup() throws Exception {
-    writer = new ListWriter();
-    tracer = tracerBuilder().writer(writer).build();
-    rootSpan = (DDSpan) tracer.buildSpan("datadog", "fakeOperation").start();
-    traceCollector = (PendingTrace) rootSpan.spanContext().getTraceCollector();
-
-    assertEquals(0, traceCollector.size());
-    assertEquals(1, traceCollector.getPendingReferenceCount());
-    assertFalse(traceCollector.isRootSpanWritten());
-  }
-
-  @AfterEach
-  void cleanup() {
-    if (tracer != null) {
-      tracer.close();
+    protected ListWriter writer;
+    protected CoreTracer tracer;
+    protected DDSpan rootSpan;
+    protected PendingTrace traceCollector;
+
+    @BeforeEach
+    void setup() throws Exception {
+        writer = new ListWriter();
+        tracer = tracerBuilder().writer(writer).build();
+        rootSpan = (DDSpan) tracer.buildSpan("datadog", "fakeOperation").start();
+        traceCollector = (PendingTrace) rootSpan.spanContext().getTraceCollector();
+
+        assertEquals(0, traceCollector.size());
+        assertEquals(1, traceCollector.getPendingReferenceCount());
+        assertFalse(traceCollector.isRootSpanWritten());
     }
-  }
-
-  @Test
-  void singleSpanWrittenWhenFinished() throws InterruptedException, TimeoutException {
-    rootSpan.finish();
-    writer.waitForTraces(1);
-
-    assertTrue(traceCollector.getSpans().isEmpty());
-    assertEquals(Arrays.asList(Arrays.asList(rootSpan)), new ArrayList<>(writer));
-    assertEquals(1, writer.getTraceCount());
-  }
-
-  @Test
-  void childFinishesBeforeParent() throws InterruptedException, TimeoutException {
-    DDSpan child =
-        (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.spanContext()).start();
-
-    assertEquals(2, traceCollector.getPendingReferenceCount());
-
-    child.finish();
-
-    assertEquals(1, traceCollector.getPendingReferenceCount());
-    assertEquals(Arrays.asList(child), new ArrayList<>(traceCollector.getSpans()));
-    assertTrue(writer.isEmpty());
-
-    rootSpan.finish();
-    writer.waitForTraces(1);
-
-    assertEquals(0, traceCollector.getPendingReferenceCount());
-    assertTrue(traceCollector.getSpans().isEmpty());
-    assertEquals(Arrays.asList(Arrays.asList(rootSpan, child)), new ArrayList<>(writer));
-    assertEquals(1, writer.getTraceCount());
-  }
-
-  @Test
-  void parentFinishesBeforeChild() throws InterruptedException, TimeoutException {
-    DDSpan child =
-        (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.spanContext()).start();
-
-    assertEquals(2, traceCollector.getPendingReferenceCount());
-
-    rootSpan.finish();
-
-    assertEquals(1, traceCollector.getPendingReferenceCount());
-    assertEquals(Arrays.asList(rootSpan), new ArrayList<>(traceCollector.getSpans()));
-    assertTrue(writer.isEmpty());
-
-    child.finish();
-    writer.waitForTraces(1);
-
-    assertEquals(0, traceCollector.getPendingReferenceCount());
-    assertTrue(traceCollector.getSpans().isEmpty());
-    assertEquals(Arrays.asList(Arrays.asList(child, rootSpan)), new ArrayList<>(writer));
-    assertEquals(1, writer.getTraceCount());
-  }
-
-  @Test
-  void childSpansCreatedAfterWrittenReportedSeparately()
-      throws InterruptedException, TimeoutException {
-    rootSpan.finish();
-    // this shouldn't happen, but it's possible users of the api
-    // may incorrectly add spans after the trace is reported.
-    // in those cases we should still decrement the pending trace count
-    DDSpan childSpan =
-        (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.spanContext()).start();
-    childSpan.finish();
-    writer.waitForTraces(2);
-
-    assertEquals(0, traceCollector.getPendingReferenceCount());
-    assertTrue(traceCollector.getSpans().isEmpty());
-    assertEquals(
-        Arrays.asList(Arrays.asList(rootSpan), Arrays.asList(childSpan)), new ArrayList<>(writer));
-  }
-
-  @Test
-  void testGetCurrentTimeNano() {
-    long diffSeconds =
-        Math.abs(
-            TimeUnit.NANOSECONDS.toSeconds(traceCollector.getCurrentTimeNano())
+
+    @AfterEach
+    void cleanup() {
+        if (tracer != null) {
+            tracer.close();
+        }
+    }
+
+    @Test
+    void singleSpanWrittenWhenFinished() throws InterruptedException, TimeoutException {
+        rootSpan.finish();
+        writer.waitForTraces(1);
+
+        assertTrue(traceCollector.getSpans().isEmpty());
+        assertEquals(Arrays.asList(Arrays.asList(rootSpan)), new ArrayList<>(writer));
+        assertEquals(1, writer.getTraceCount());
+    }
+
+    @Test
+    void childFinishesBeforeParent() throws InterruptedException, TimeoutException {
+        DDSpan child = (DDSpan) tracer.buildSpan("datadog", "child")
+                .asChildOf(rootSpan.spanContext())
+                .start();
+
+        assertEquals(2, traceCollector.getPendingReferenceCount());
+
+        child.finish();
+
+        assertEquals(1, traceCollector.getPendingReferenceCount());
+        assertEquals(Arrays.asList(child), new ArrayList<>(traceCollector.getSpans()));
+        assertTrue(writer.isEmpty());
+
+        rootSpan.finish();
+        writer.waitForTraces(1);
+
+        assertEquals(0, traceCollector.getPendingReferenceCount());
+        assertTrue(traceCollector.getSpans().isEmpty());
+        assertEquals(Arrays.asList(Arrays.asList(rootSpan, child)), new ArrayList<>(writer));
+        assertEquals(1, writer.getTraceCount());
+    }
+
+    @Test
+    void parentFinishesBeforeChild() throws InterruptedException, TimeoutException {
+        DDSpan child = (DDSpan) tracer.buildSpan("datadog", "child")
+                .asChildOf(rootSpan.spanContext())
+                .start();
+
+        assertEquals(2, traceCollector.getPendingReferenceCount());
+
+        rootSpan.finish();
+
+        assertEquals(1, traceCollector.getPendingReferenceCount());
+        assertEquals(Arrays.asList(rootSpan), new ArrayList<>(traceCollector.getSpans()));
+        assertTrue(writer.isEmpty());
+
+        child.finish();
+        writer.waitForTraces(1);
+
+        assertEquals(0, traceCollector.getPendingReferenceCount());
+        assertTrue(traceCollector.getSpans().isEmpty());
+        assertEquals(Arrays.asList(Arrays.asList(child, rootSpan)), new ArrayList<>(writer));
+        assertEquals(1, writer.getTraceCount());
+    }
+
+    @Test
+    void childSpansCreatedAfterWrittenReportedSeparately() throws InterruptedException, TimeoutException {
+        rootSpan.finish();
+        // this shouldn't happen, but it's possible users of the api
+        // may incorrectly add spans after the trace is reported.
+        // in those cases we should still decrement the pending trace count
+        DDSpan childSpan = (DDSpan) tracer.buildSpan("datadog", "child")
+                .asChildOf(rootSpan.spanContext())
+                .start();
+        childSpan.finish();
+        writer.waitForTraces(2);
+
+        assertEquals(0, traceCollector.getPendingReferenceCount());
+        assertTrue(traceCollector.getSpans().isEmpty());
+        assertEquals(Arrays.asList(Arrays.asList(rootSpan), Arrays.asList(childSpan)), new ArrayList<>(writer));
+    }
+
+    @Test
+    void testGetCurrentTimeNano() {
+        long diffSeconds = Math.abs(TimeUnit.NANOSECONDS.toSeconds(traceCollector.getCurrentTimeNano())
                 - TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()));
-    // Generous 5 seconds to execute this test
-    assertTrue(diffSeconds < 5, "Expected time difference < 5 seconds, got: " + diffSeconds);
-  }
-
-  @Test
-  @WithConfig(key = PARTIAL_FLUSH_MIN_SPANS, value = "2")
-  void partialFlush() throws InterruptedException, TimeoutException {
-    CoreTracer quickTracer = tracerBuilder().writer(writer).build();
-    try {
-      DDSpan localRoot = (DDSpan) quickTracer.buildSpan("datadog", "root").start();
-      PendingTrace trace = (PendingTrace) localRoot.spanContext().getTraceCollector();
-      DDSpan child1 =
-          (DDSpan)
-              quickTracer.buildSpan("datadog", "child1").asChildOf(localRoot.spanContext()).start();
-      DDSpan child2 =
-          (DDSpan)
-              quickTracer.buildSpan("datadog", "child2").asChildOf(localRoot.spanContext()).start();
-
-      assertEquals(3, trace.getPendingReferenceCount());
-
-      child2.finish();
-
-      assertEquals(2, trace.getPendingReferenceCount());
-      assertEquals(Arrays.asList(child2), new ArrayList<>(trace.getSpans()));
-      assertTrue(writer.isEmpty());
-      assertEquals(0, writer.getTraceCount());
-
-      child1.finish();
-      writer.waitForTraces(1);
-
-      assertEquals(1, trace.getPendingReferenceCount());
-      assertEquals(Arrays.asList(), new ArrayList<>(trace.getSpans()));
-      assertEquals(Arrays.asList(Arrays.asList(child1, child2)), new ArrayList<>(writer));
-      assertEquals(1, writer.getTraceCount());
-
-      localRoot.finish();
-      writer.waitForTraces(2);
-
-      assertEquals(0, trace.getPendingReferenceCount());
-      assertTrue(trace.getSpans().isEmpty());
-      assertEquals(
-          Arrays.asList(Arrays.asList(child1, child2), Arrays.asList(localRoot)),
-          new ArrayList<>(writer));
-      assertEquals(2, writer.getTraceCount());
-    } finally {
-      quickTracer.close();
+        // Generous 5 seconds to execute this test
+        assertTrue(diffSeconds < 5, "Expected time difference < 5 seconds, got: " + diffSeconds);
+    }
+
+    @Test
+    @WithConfig(key = PARTIAL_FLUSH_MIN_SPANS, value = "2")
+    void partialFlush() throws InterruptedException, TimeoutException {
+        CoreTracer quickTracer = tracerBuilder().writer(writer).build();
+        try {
+            DDSpan localRoot = (DDSpan) quickTracer.buildSpan("datadog", "root").start();
+            PendingTrace trace = (PendingTrace) localRoot.spanContext().getTraceCollector();
+            DDSpan child1 = (DDSpan) quickTracer
+                    .buildSpan("datadog", "child1")
+                    .asChildOf(localRoot.spanContext())
+                    .start();
+            DDSpan child2 = (DDSpan) quickTracer
+                    .buildSpan("datadog", "child2")
+                    .asChildOf(localRoot.spanContext())
+                    .start();
+
+            assertEquals(3, trace.getPendingReferenceCount());
+
+            child2.finish();
+
+            assertEquals(2, trace.getPendingReferenceCount());
+            assertEquals(Arrays.asList(child2), new ArrayList<>(trace.getSpans()));
+            assertTrue(writer.isEmpty());
+            assertEquals(0, writer.getTraceCount());
+
+            child1.finish();
+            writer.waitForTraces(1);
+
+            assertEquals(1, trace.getPendingReferenceCount());
+            assertEquals(Arrays.asList(), new ArrayList<>(trace.getSpans()));
+            assertEquals(Arrays.asList(Arrays.asList(child1, child2)), new ArrayList<>(writer));
+            assertEquals(1, writer.getTraceCount());
+
+            localRoot.finish();
+            writer.waitForTraces(2);
+
+            assertEquals(0, trace.getPendingReferenceCount());
+            assertTrue(trace.getSpans().isEmpty());
+            assertEquals(
+                    Arrays.asList(Arrays.asList(child1, child2), Arrays.asList(localRoot)), new ArrayList<>(writer));
+            assertEquals(2, writer.getTraceCount());
+        } finally {
+            quickTracer.close();
+        }
     }
-  }
-
-  @Test
-  @WithConfig(key = PARTIAL_FLUSH_MIN_SPANS, value = "2")
-  void partialFlushWithRootSpanClosedLast() throws InterruptedException, TimeoutException {
-    CoreTracer quickTracer = tracerBuilder().writer(writer).build();
-    try {
-      DDSpan localRoot = (DDSpan) quickTracer.buildSpan("datadog", "root").start();
-      PendingTrace trace = (PendingTrace) localRoot.spanContext().getTraceCollector();
-      DDSpan child1 =
-          (DDSpan)
-              quickTracer.buildSpan("datadog", "child1").asChildOf(localRoot.spanContext()).start();
-      DDSpan child2 =
-          (DDSpan)
-              quickTracer.buildSpan("datadog", "child2").asChildOf(localRoot.spanContext()).start();
-
-      assertEquals(3, trace.getPendingReferenceCount());
-
-      child1.finish();
-
-      assertEquals(2, trace.getPendingReferenceCount());
-      assertEquals(Arrays.asList(child1), new ArrayList<>(trace.getSpans()));
-      assertTrue(writer.isEmpty());
-      assertEquals(0, writer.getTraceCount());
-
-      child2.finish();
-      writer.waitForTraces(1);
-
-      assertEquals(1, trace.getPendingReferenceCount());
-      assertTrue(trace.getSpans().isEmpty());
-      assertEquals(Arrays.asList(Arrays.asList(child2, child1)), new ArrayList<>(writer));
-      assertEquals(1, writer.getTraceCount());
-
-      localRoot.finish();
-      writer.waitForTraces(2);
-
-      assertEquals(0, trace.getPendingReferenceCount());
-      assertTrue(trace.getSpans().isEmpty());
-      assertEquals(
-          Arrays.asList(Arrays.asList(child2, child1), Arrays.asList(localRoot)),
-          new ArrayList<>(writer));
-      assertEquals(2, writer.getTraceCount());
-    } finally {
-      quickTracer.close();
+
+    @Test
+    @WithConfig(key = PARTIAL_FLUSH_MIN_SPANS, value = "2")
+    void partialFlushWithRootSpanClosedLast() throws InterruptedException, TimeoutException {
+        CoreTracer quickTracer = tracerBuilder().writer(writer).build();
+        try {
+            DDSpan localRoot = (DDSpan) quickTracer.buildSpan("datadog", "root").start();
+            PendingTrace trace = (PendingTrace) localRoot.spanContext().getTraceCollector();
+            DDSpan child1 = (DDSpan) quickTracer
+                    .buildSpan("datadog", "child1")
+                    .asChildOf(localRoot.spanContext())
+                    .start();
+            DDSpan child2 = (DDSpan) quickTracer
+                    .buildSpan("datadog", "child2")
+                    .asChildOf(localRoot.spanContext())
+                    .start();
+
+            assertEquals(3, trace.getPendingReferenceCount());
+
+            child1.finish();
+
+            assertEquals(2, trace.getPendingReferenceCount());
+            assertEquals(Arrays.asList(child1), new ArrayList<>(trace.getSpans()));
+            assertTrue(writer.isEmpty());
+            assertEquals(0, writer.getTraceCount());
+
+            child2.finish();
+            writer.waitForTraces(1);
+
+            assertEquals(1, trace.getPendingReferenceCount());
+            assertTrue(trace.getSpans().isEmpty());
+            assertEquals(Arrays.asList(Arrays.asList(child2, child1)), new ArrayList<>(writer));
+            assertEquals(1, writer.getTraceCount());
+
+            localRoot.finish();
+            writer.waitForTraces(2);
+
+            assertEquals(0, trace.getPendingReferenceCount());
+            assertTrue(trace.getSpans().isEmpty());
+            assertEquals(
+                    Arrays.asList(Arrays.asList(child2, child1), Arrays.asList(localRoot)), new ArrayList<>(writer));
+            assertEquals(2, writer.getTraceCount());
+        } finally {
+            quickTracer.close();
+        }
     }
-  }
 
-  // spotless:off
+    // spotless:off
   @TableTest({
     "scenario         | threadCount | spanCount",
     "1 thread 1 span  | 1           | 1        ",
@@ -231,56 +232,53 @@ void partialFlushWithRootSpanClosedLast() throws InterruptedException, TimeoutEx
     "50 threads 500   | 50          | 500      "
   })
   // spotless:on
-  void partialFlushConcurrencyTest(int threadCount, int spanCount)
-      throws InterruptedException, TimeoutException {
-    // reduce logging noise
-    Logger logger = (Logger) LoggerFactory.getLogger("datadog.trace");
-    Level previousLevel = logger.getLevel();
-    logger.setLevel(Level.OFF);
-    try {
-      CountDownLatch latch = new CountDownLatch(1);
-      DDSpan localRoot = (DDSpan) tracer.buildSpan("test", "root").start();
-      PendingTrace localTraceCollector = (PendingTrace) localRoot.spanContext().getTraceCollector();
-      List<Throwable> exceptions = new ArrayList<>();
-
-      List<Thread> threads = new ArrayList<>(threadCount);
-      for (int t = 0; t < threadCount; t++) {
-        Thread thread =
-            new Thread(
-                () -> {
-                  try {
-                    latch.await();
-                    List<DDSpan> spans = new ArrayList<>(spanCount);
-                    for (int s = 0; s < spanCount; s++) {
-                      spans.add(
-                          (DDSpan) tracer.startSpan("test", "child", localRoot.spanContext()));
-                    }
-                    for (DDSpan span : spans) {
-                      span.finish();
+    void partialFlushConcurrencyTest(int threadCount, int spanCount) throws InterruptedException, TimeoutException {
+        // reduce logging noise
+        Logger logger = (Logger) LoggerFactory.getLogger("datadog.trace");
+        Level previousLevel = logger.getLevel();
+        logger.setLevel(Level.OFF);
+        try {
+            CountDownLatch latch = new CountDownLatch(1);
+            DDSpan localRoot = (DDSpan) tracer.buildSpan("test", "root").start();
+            PendingTrace localTraceCollector =
+                    (PendingTrace) localRoot.spanContext().getTraceCollector();
+            List<Throwable> exceptions = new ArrayList<>();
+
+            List<Thread> threads = new ArrayList<>(threadCount);
+            for (int t = 0; t < threadCount; t++) {
+                Thread thread = new Thread(() -> {
+                    try {
+                        latch.await();
+                        List<DDSpan> spans = new ArrayList<>(spanCount);
+                        for (int s = 0; s < spanCount; s++) {
+                            spans.add((DDSpan) tracer.startSpan("test", "child", localRoot.spanContext()));
+                        }
+                        for (DDSpan span : spans) {
+                            span.finish();
+                        }
+                    } catch (Throwable ex) {
+                        exceptions.add(ex);
                     }
-                  } catch (Throwable ex) {
-                    exceptions.add(ex);
-                  }
                 });
-        thread.start();
-        threads.add(thread);
-      }
-      // Finish root span so other spans are queued automatically
-      localRoot.finish();
-      writer.waitForTraces(1);
-
-      latch.countDown();
-      for (Thread thread : threads) {
-        thread.join();
-      }
-      localTraceCollector.getPendingTraceBuffer().flush();
-
-      assertTrue(exceptions.isEmpty(), "Exceptions in worker threads: " + exceptions);
-      assertEquals(0, localTraceCollector.getPendingReferenceCount());
-      int totalSpans = writer.stream().mapToInt(List::size).sum();
-      assertEquals(threadCount * spanCount + 1, totalSpans);
-    } finally {
-      logger.setLevel(previousLevel);
+                thread.start();
+                threads.add(thread);
+            }
+            // Finish root span so other spans are queued automatically
+            localRoot.finish();
+            writer.waitForTraces(1);
+
+            latch.countDown();
+            for (Thread thread : threads) {
+                thread.join();
+            }
+            localTraceCollector.getPendingTraceBuffer().flush();
+
+            assertTrue(exceptions.isEmpty(), "Exceptions in worker threads: " + exceptions);
+            assertEquals(0, localTraceCollector.getPendingReferenceCount());
+            int totalSpans = writer.stream().mapToInt(List::size).sum();
+            assertEquals(threadCount * spanCount + 1, totalSpans);
+        } finally {
+            logger.setLevel(previousLevel);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTestBridge.java b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTestBridge.java
index 0d4fc04a9ac..942b0b158c3 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTestBridge.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTestBridge.java
@@ -4,7 +4,7 @@
  * Bridge class to allow tests to access package-private method exposed by the {@code PendingTrace}
  */
 public class PendingTraceTestBridge {
-  public static int getPendingReferenceCount(PendingTrace pendingTrace) {
-    return pendingTrace.getPendingReferenceCount();
-  }
+    public static int getPendingReferenceCount(PendingTrace pendingTrace) {
+        return pendingTrace.getPendingReferenceCount();
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/ScopeManagerTestBridge.java b/dd-trace-core/src/test/java/datadog/trace/core/ScopeManagerTestBridge.java
index 4c0682b4023..3444db82365 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/ScopeManagerTestBridge.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/ScopeManagerTestBridge.java
@@ -4,7 +4,7 @@
 
 /** Bridge to expose package-private {@code CoreTracer.scopeManager} to tests in other packages. */
 public class ScopeManagerTestBridge {
-  public static ContinuableScopeManager getScopeManager(CoreTracer tracer) {
-    return tracer.scopeManager;
-  }
+    public static ContinuableScopeManager getScopeManager(CoreTracer tracer) {
+        return tracer.scopeManager;
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/ServiceNameInheritanceForkedTest.java b/dd-trace-core/src/test/java/datadog/trace/core/ServiceNameInheritanceForkedTest.java
index caa0f407a61..95207946486 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/ServiceNameInheritanceForkedTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/ServiceNameInheritanceForkedTest.java
@@ -17,64 +17,63 @@
 @WithConfig(key = TracerConfig.TRACE_INFERRED_PROXY_SERVICES_ENABLED, value = "true")
 class ServiceNameInheritanceForkedTest extends DDCoreJavaSpecification {
 
-  @ParameterizedTest
-  @CsvSource({"checkout, servlet-context", "special-checkout, manual"})
-  void descendantsRetainApplicationServiceUnderInferredProxy(String service, String source) {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).serviceName("checkout").build();
-    assertFalse(SpanNaming.instance().namingSchema().allowInferredServices());
+    @ParameterizedTest
+    @CsvSource({"checkout, servlet-context", "special-checkout, manual"})
+    void descendantsRetainApplicationServiceUnderInferredProxy(String service, String source) {
+        CoreTracer tracer =
+                tracerBuilder().writer(new ListWriter()).serviceName("checkout").build();
+        assertFalse(SpanNaming.instance().namingSchema().allowInferredServices());
 
-    DDSpan proxy = (DDSpan) tracer.buildSpan("test", "aws.apigateway").start();
-    proxy.setServiceName("gateway.example.com", "inferred-proxy");
-    proxy.setTag("_dd.inferred_span", 1);
+        DDSpan proxy = (DDSpan) tracer.buildSpan("test", "aws.apigateway").start();
+        proxy.setServiceName("gateway.example.com", "inferred-proxy");
+        proxy.setTag("_dd.inferred_span", 1);
 
-    DDSpan entry =
-        (DDSpan) tracer.buildSpan("test", "servlet.request").asChildOf(proxy.spanContext()).start();
-    // HTTP server decoration resets the application entry service after creating it.
-    entry.setServiceName(service, source);
-    DDSpan child =
-        (DDSpan) tracer.buildSpan("test", "application").asChildOf(entry.spanContext()).start();
-    DDSpan grandchild =
-        (DDSpan)
-            tracer
-                .buildSpan("test", "database.query")
+        DDSpan entry = (DDSpan) tracer.buildSpan("test", "servlet.request")
+                .asChildOf(proxy.spanContext())
+                .start();
+        // HTTP server decoration resets the application entry service after creating it.
+        entry.setServiceName(service, source);
+        DDSpan child = (DDSpan) tracer.buildSpan("test", "application")
+                .asChildOf(entry.spanContext())
+                .start();
+        DDSpan grandchild = (DDSpan) tracer.buildSpan("test", "database.query")
                 .asChildOf(child.spanContext())
                 .withServiceName(SpanNaming.instance().namingSchema().database().service("mysql"))
                 .start();
 
-    grandchild.finish();
-    child.finish();
-    entry.finish();
-    proxy.finish();
+        grandchild.finish();
+        child.finish();
+        entry.finish();
+        proxy.finish();
 
-    assertEquals("gateway.example.com", proxy.getServiceName());
-    for (DDSpan span : new DDSpan[] {entry, child, grandchild}) {
-      assertEquals(service, span.getServiceName());
-      assertEquals(source, span.getServiceNameSource());
+        assertEquals("gateway.example.com", proxy.getServiceName());
+        for (DDSpan span : new DDSpan[] {entry, child, grandchild}) {
+            assertEquals(service, span.getServiceName());
+            assertEquals(source, span.getServiceNameSource());
+        }
     }
-  }
 
-  @ParameterizedTest
-  @CsvSource({"checkout, servlet-context", "special-checkout, manual"})
-  void ordinaryRootStillOverridesIntermediateAndExplicitServices(String service, String source) {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).serviceName("checkout").build();
-    DDSpan root = (DDSpan) tracer.buildSpan("test", "servlet.request").start();
-    root.setServiceName(service, source);
-    DDSpan child =
-        (DDSpan) tracer.buildSpan("test", "application").asChildOf(root.spanContext()).start();
-    child.setServiceName("intermediate-service", ServiceNameSources.MANUAL);
-    DDSpan grandchild =
-        (DDSpan)
-            tracer
-                .buildSpan("test", "database.query")
+    @ParameterizedTest
+    @CsvSource({"checkout, servlet-context", "special-checkout, manual"})
+    void ordinaryRootStillOverridesIntermediateAndExplicitServices(String service, String source) {
+        CoreTracer tracer =
+                tracerBuilder().writer(new ListWriter()).serviceName("checkout").build();
+        DDSpan root = (DDSpan) tracer.buildSpan("test", "servlet.request").start();
+        root.setServiceName(service, source);
+        DDSpan child = (DDSpan) tracer.buildSpan("test", "application")
+                .asChildOf(root.spanContext())
+                .start();
+        child.setServiceName("intermediate-service", ServiceNameSources.MANUAL);
+        DDSpan grandchild = (DDSpan) tracer.buildSpan("test", "database.query")
                 .asChildOf(child.spanContext())
                 .withServiceName("explicit-service")
                 .start();
 
-    grandchild.finish();
-    child.finish();
-    root.finish();
+        grandchild.finish();
+        child.finish();
+        root.finish();
 
-    assertEquals(service, grandchild.getServiceName());
-    assertEquals(source, grandchild.getServiceNameSource());
-  }
+        assertEquals(service, grandchild.getServiceName());
+        assertEquals(source, grandchild.getServiceNameSource());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/SpanPrototypeConstructionTest.java b/dd-trace-core/src/test/java/datadog/trace/core/SpanPrototypeConstructionTest.java
index 7a3722d77cf..1ac9e8d0145 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/SpanPrototypeConstructionTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/SpanPrototypeConstructionTest.java
@@ -19,141 +19,140 @@
  */
 public class SpanPrototypeConstructionTest extends DDCoreJavaSpecification {
 
-  private ListWriter writer;
-  private CoreTracer tracer;
-  private SpanPrototype prototype;
+    private ListWriter writer;
+    private CoreTracer tracer;
+    private SpanPrototype prototype;
 
-  @BeforeEach
-  void setup() {
-    writer = new ListWriter();
-    tracer = tracerBuilder().writer(writer).build();
-    prototype =
-        SpanPrototype.builder()
-            .initInstrumentationName("test-instr")
-            .initOperationName("proto.op")
-            .initSpanType("web")
-            .initKind(SPAN_KIND_SERVER)
-            .initComponentOnly("test-component")
-            .build();
-  }
+    @BeforeEach
+    void setup() {
+        writer = new ListWriter();
+        tracer = tracerBuilder().writer(writer).build();
+        prototype = SpanPrototype.builder()
+                .initInstrumentationName("test-instr")
+                .initOperationName("proto.op")
+                .initSpanType("web")
+                .initKind(SPAN_KIND_SERVER)
+                .initComponentOnly("test-component")
+                .build();
+    }
 
-  @AfterEach
-  void cleanup() {
-    tracer.close();
-  }
+    @AfterEach
+    void cleanup() {
+        tracer.close();
+    }
 
-  @Test
-  void buildSpanSeedsPrototypeAndFallsBackToPrototypeOperationName() {
-    DDSpan span = (DDSpan) tracer.buildSpan(prototype, null).start();
-    try {
-      assertEquals("proto.op", span.getOperationName().toString()); // null -> prototype's
-      assertEquals("web", span.getSpanType());
-      assertEquals("test-component", span.getTags().get(COMPONENT)); // constant tag seeded
-    } finally {
-      span.finish();
+    @Test
+    void buildSpanSeedsPrototypeAndFallsBackToPrototypeOperationName() {
+        DDSpan span = (DDSpan) tracer.buildSpan(prototype, null).start();
+        try {
+            assertEquals("proto.op", span.getOperationName().toString()); // null -> prototype's
+            assertEquals("web", span.getSpanType());
+            assertEquals("test-component", span.getTags().get(COMPONENT)); // constant tag seeded
+        } finally {
+            span.finish();
+        }
     }
-  }
 
-  @Test
-  void seedsSpanKindOrdinalAndTag() {
-    // span.kind is intercepted (its ordinal drives isOutbound). The prototype's tags seed through
-    // the interceptor, so BOTH the ordinal side-effect and the span.kind tag Entry must land.
-    DDSpan span = (DDSpan) tracer.buildSpan(prototype, null).start();
-    try {
-      assertEquals(SPAN_KIND_SERVER, span.getSpanKindString()); // ordinal side-effect applied
-      assertEquals(SPAN_KIND_SERVER, span.getTags().get(SPAN_KIND)); // tag (shared Entry) present
-    } finally {
-      span.finish();
+    @Test
+    void seedsSpanKindOrdinalAndTag() {
+        // span.kind is intercepted (its ordinal drives isOutbound). The prototype's tags seed through
+        // the interceptor, so BOTH the ordinal side-effect and the span.kind tag Entry must land.
+        DDSpan span = (DDSpan) tracer.buildSpan(prototype, null).start();
+        try {
+            assertEquals(SPAN_KIND_SERVER, span.getSpanKindString()); // ordinal side-effect applied
+            assertEquals(SPAN_KIND_SERVER, span.getTags().get(SPAN_KIND)); // tag (shared Entry) present
+        } finally {
+            span.finish();
+        }
     }
-  }
 
-  @Test
-  void explicitOperationNameOverridesPrototype() {
-    DDSpan span = (DDSpan) tracer.buildSpan(prototype, "explicit.op").start();
-    try {
-      assertEquals("explicit.op", span.getOperationName().toString()); // explicit wins
-    } finally {
-      span.finish();
+    @Test
+    void explicitOperationNameOverridesPrototype() {
+        DDSpan span = (DDSpan) tracer.buildSpan(prototype, "explicit.op").start();
+        try {
+            assertEquals("explicit.op", span.getOperationName().toString()); // explicit wins
+        } finally {
+            span.finish();
+        }
     }
-  }
 
-  @Test
-  void startSpanSeedsPrototype() {
-    DDSpan span = (DDSpan) tracer.startSpan(prototype, null);
-    try {
-      assertEquals("proto.op", span.getOperationName().toString());
-      assertEquals("test-component", span.getTags().get(COMPONENT));
-    } finally {
-      span.finish();
+    @Test
+    void startSpanSeedsPrototype() {
+        DDSpan span = (DDSpan) tracer.startSpan(prototype, null);
+        try {
+            assertEquals("proto.op", span.getOperationName().toString());
+            assertEquals("test-component", span.getTags().get(COMPONENT));
+        } finally {
+            span.finish();
+        }
     }
-  }
 
-  @Test
-  void explicitBuilderTagOverridesPrototypeConstant() {
-    // prototype seeds `component` just before the builder's own tags, so the explicit withTag wins
-    DDSpan span = (DDSpan) tracer.buildSpan(prototype, null).withTag(COMPONENT, "override").start();
-    try {
-      assertEquals("override", span.getTags().get(COMPONENT));
-    } finally {
-      span.finish();
+    @Test
+    void explicitBuilderTagOverridesPrototypeConstant() {
+        // prototype seeds `component` just before the builder's own tags, so the explicit withTag wins
+        DDSpan span = (DDSpan)
+                tracer.buildSpan(prototype, null).withTag(COMPONENT, "override").start();
+        try {
+            assertEquals("override", span.getTags().get(COMPONENT));
+        } finally {
+            span.finish();
+        }
     }
-  }
 
-  @Test
-  void initComponentAndIntegrationSetsIntegrationName() {
-    // Mirrors BaseDecorator.afterStart: the component tag is seeded AND the integration name is set
-    // on the context, which IntegrationAdder serializes as _dd.integration (field -> tag mapping is
-    // covered by IntegrationAdderTest).
-    SpanPrototype proto =
-        SpanPrototype.builder()
-            .initInstrumentationName("test-instr")
-            .initComponentAndIntegration("netty")
-            .build();
-    DDSpan span = (DDSpan) tracer.buildSpan(proto, "op").start();
-    try {
-      assertEquals("netty", span.getTags().get(COMPONENT)); // component tag seeded
-      assertEquals("netty", ((DDSpanContext) span.spanContext()).getIntegrationName());
-    } finally {
-      span.finish();
+    @Test
+    void initComponentAndIntegrationSetsIntegrationName() {
+        // Mirrors BaseDecorator.afterStart: the component tag is seeded AND the integration name is set
+        // on the context, which IntegrationAdder serializes as _dd.integration (field -> tag mapping is
+        // covered by IntegrationAdderTest).
+        SpanPrototype proto = SpanPrototype.builder()
+                .initInstrumentationName("test-instr")
+                .initComponentAndIntegration("netty")
+                .build();
+        DDSpan span = (DDSpan) tracer.buildSpan(proto, "op").start();
+        try {
+            assertEquals("netty", span.getTags().get(COMPONENT)); // component tag seeded
+            assertEquals("netty", ((DDSpanContext) span.spanContext()).getIntegrationName());
+        } finally {
+            span.finish();
+        }
     }
-  }
 
-  @Test
-  void initComponentOnlyDoesNotSetIntegrationName() {
-    // initComponentOnly is tag-only: no integration-name side effect, so no _dd.integration.
-    SpanPrototype proto =
-        SpanPrototype.builder()
-            .initInstrumentationName("test-instr")
-            .initComponentOnly("netty")
-            .build();
-    DDSpan span = (DDSpan) tracer.buildSpan(proto, "op").start();
-    try {
-      assertEquals("netty", span.getTags().get(COMPONENT)); // tag present
-      assertNull(((DDSpanContext) span.spanContext()).getIntegrationName()); // but no integration
-    } finally {
-      span.finish();
+    @Test
+    void initComponentOnlyDoesNotSetIntegrationName() {
+        // initComponentOnly is tag-only: no integration-name side effect, so no _dd.integration.
+        SpanPrototype proto = SpanPrototype.builder()
+                .initInstrumentationName("test-instr")
+                .initComponentOnly("netty")
+                .build();
+        DDSpan span = (DDSpan) tracer.buildSpan(proto, "op").start();
+        try {
+            assertEquals("netty", span.getTags().get(COMPONENT)); // tag present
+            assertNull(((DDSpanContext) span.spanContext()).getIntegrationName()); // but no integration
+        } finally {
+            span.finish();
+        }
     }
-  }
 
-  @Test
-  void extendsWithComponentOnlyOverrideLeavesInheritedIntegrationName() {
-    // Documents a known desync: overriding an inherited initComponentAndIntegration component with
-    // tag-only initComponentOnly does NOT clear the inherited integration name. Use
-    // initComponentAndIntegration to override both together.
-    SpanPrototype base =
-        SpanPrototype.builder()
-            .initInstrumentationName("test-instr")
-            .initComponentAndIntegration("netty")
-            .build();
-    SpanPrototype derived =
-        SpanPrototype.builder().extends_(base).initComponentOnly("other").build();
-    DDSpan span = (DDSpan) tracer.buildSpan(derived, "op").start();
-    try {
-      assertEquals("other", span.getTags().get(COMPONENT)); // component overridden
-      // integration name stays inherited from the base (the documented desync)
-      assertEquals("netty", ((DDSpanContext) span.spanContext()).getIntegrationName());
-    } finally {
-      span.finish();
+    @Test
+    void extendsWithComponentOnlyOverrideLeavesInheritedIntegrationName() {
+        // Documents a known desync: overriding an inherited initComponentAndIntegration component with
+        // tag-only initComponentOnly does NOT clear the inherited integration name. Use
+        // initComponentAndIntegration to override both together.
+        SpanPrototype base = SpanPrototype.builder()
+                .initInstrumentationName("test-instr")
+                .initComponentAndIntegration("netty")
+                .build();
+        SpanPrototype derived = SpanPrototype.builder()
+                .extends_(base)
+                .initComponentOnly("other")
+                .build();
+        DDSpan span = (DDSpan) tracer.buildSpan(derived, "op").start();
+        try {
+            assertEquals("other", span.getTags().get(COMPONENT)); // component overridden
+            // integration name stays inherited from the base (the documented desync)
+            assertEquals("netty", ((DDSpanContext) span.spanContext()).getIntegrationName());
+        } finally {
+            span.finish();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/SpanTest.java b/dd-trace-core/src/test/java/datadog/trace/core/SpanTest.java
index 7b3a631eaa9..c0ab1cf2ab8 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/SpanTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/SpanTest.java
@@ -9,97 +9,97 @@
 import org.junit.jupiter.api.Test;
 
 public class SpanTest {
-  static final CoreTracer TRACER = CoreTracer.builder().build();
-
-  @Test
-  @DisplayName("setMetric: int")
-  public void setMetricInt() {
-    int expected = 2;
-
-    AgentSpan span = TRACER.startSpan("foo", "foo");
-    span.setMetric("int", expected);
-
-    Object value = span.getTag("int");
-    assertInstanceOf(Integer.class, value);
-    assertEquals(Integer.valueOf(expected), value);
-  }
-
-  @Test
-  @DisplayName("setMetric: long")
-  public void setMetricLong() {
-    long expected = 20L;
-
-    AgentSpan span = TRACER.startSpan("foo", "foo");
-    span.setMetric("long", expected);
-
-    Object value = span.getTag("long");
-    assertInstanceOf(Long.class, value);
-    assertEquals(Long.valueOf(expected), value);
-  }
-
-  @Test
-  @DisplayName("setMetric: float")
-  public void setMetricFloat() {
-    float expected = 2.718F;
-
-    AgentSpan span = TRACER.startSpan("foo", "foo");
-    span.setMetric("float", expected);
-
-    Object value = span.getTag("float");
-    assertInstanceOf(Float.class, value);
-    assertEquals(Float.valueOf(expected), value);
-  }
-
-  @Test
-  @DisplayName("setMetric: double")
-  public void setMetricDouble() {
-    double expected = 3.1415D;
-
-    AgentSpan span = TRACER.startSpan("foo", "foo");
-    span.setMetric("double", expected);
-
-    Object value = span.getTag("double");
-    assertInstanceOf(Double.class, value);
-    assertEquals(Double.valueOf(expected), value);
-  }
-
-  @Test
-  @DisplayName("setTag: TagMap.Entry")
-  public void setTagEntry() {
-    AgentSpan span = TRACER.startSpan("foo", "foo");
-    span.setTag(TagMap.Entry.create("message", "hello"));
-
-    assertEquals("hello", span.getTag("message"));
-  }
-
-  @Test
-  @DisplayName("setTag: null")
-  public void setTagEntryNull() {
-    AgentSpan span = TRACER.startSpan("foo", "foo");
-    int initialSize = span.getTags().size();
-
-    span.setTag(null);
-
-    assertEquals(initialSize, span.getTags().size());
-  }
-
-  @Test
-  @DisplayName("setMetric: TagMap.Entry")
-  public void setMetricEntry() {
-    AgentSpan span = TRACER.startSpan("foo", "foo");
-    span.setMetric(TagMap.Entry.create("metric", 20L));
-
-    assertEquals(Long.valueOf(20L), span.getTag("metric"));
-  }
-
-  @Test
-  @DisplayName("setMetric: null")
-  public void setMetricEntryNull() {
-    AgentSpan span = TRACER.startSpan("foo", "foo");
-    int initialSize = span.getTags().size();
-
-    span.setMetric(null);
-
-    assertEquals(initialSize, span.getTags().size());
-  }
+    static final CoreTracer TRACER = CoreTracer.builder().build();
+
+    @Test
+    @DisplayName("setMetric: int")
+    public void setMetricInt() {
+        int expected = 2;
+
+        AgentSpan span = TRACER.startSpan("foo", "foo");
+        span.setMetric("int", expected);
+
+        Object value = span.getTag("int");
+        assertInstanceOf(Integer.class, value);
+        assertEquals(Integer.valueOf(expected), value);
+    }
+
+    @Test
+    @DisplayName("setMetric: long")
+    public void setMetricLong() {
+        long expected = 20L;
+
+        AgentSpan span = TRACER.startSpan("foo", "foo");
+        span.setMetric("long", expected);
+
+        Object value = span.getTag("long");
+        assertInstanceOf(Long.class, value);
+        assertEquals(Long.valueOf(expected), value);
+    }
+
+    @Test
+    @DisplayName("setMetric: float")
+    public void setMetricFloat() {
+        float expected = 2.718F;
+
+        AgentSpan span = TRACER.startSpan("foo", "foo");
+        span.setMetric("float", expected);
+
+        Object value = span.getTag("float");
+        assertInstanceOf(Float.class, value);
+        assertEquals(Float.valueOf(expected), value);
+    }
+
+    @Test
+    @DisplayName("setMetric: double")
+    public void setMetricDouble() {
+        double expected = 3.1415D;
+
+        AgentSpan span = TRACER.startSpan("foo", "foo");
+        span.setMetric("double", expected);
+
+        Object value = span.getTag("double");
+        assertInstanceOf(Double.class, value);
+        assertEquals(Double.valueOf(expected), value);
+    }
+
+    @Test
+    @DisplayName("setTag: TagMap.Entry")
+    public void setTagEntry() {
+        AgentSpan span = TRACER.startSpan("foo", "foo");
+        span.setTag(TagMap.Entry.create("message", "hello"));
+
+        assertEquals("hello", span.getTag("message"));
+    }
+
+    @Test
+    @DisplayName("setTag: null")
+    public void setTagEntryNull() {
+        AgentSpan span = TRACER.startSpan("foo", "foo");
+        int initialSize = span.getTags().size();
+
+        span.setTag(null);
+
+        assertEquals(initialSize, span.getTags().size());
+    }
+
+    @Test
+    @DisplayName("setMetric: TagMap.Entry")
+    public void setMetricEntry() {
+        AgentSpan span = TRACER.startSpan("foo", "foo");
+        span.setMetric(TagMap.Entry.create("metric", 20L));
+
+        assertEquals(Long.valueOf(20L), span.getTag("metric"));
+    }
+
+    @Test
+    @DisplayName("setMetric: null")
+    public void setMetricEntryNull() {
+        AgentSpan span = TRACER.startSpan("foo", "foo");
+        int initialSize = span.getTags().size();
+
+        span.setMetric(null);
+
+        assertEquals(initialSize, span.getTags().size());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/StatusLoggerTest.java b/dd-trace-core/src/test/java/datadog/trace/core/StatusLoggerTest.java
index eae2b69ffbd..942b68be396 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/StatusLoggerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/StatusLoggerTest.java
@@ -25,111 +25,110 @@
 @Timeout(value = 10, unit = TimeUnit.SECONDS)
 public class StatusLoggerTest extends DDJavaSpecification {
 
-  @Test
-  void otlpExportDisabledByDefault() throws IOException {
-    Map<String, Object> startupLog = startupLog();
-
-    assertFalse(flag(startupLog, "otlp_traces_export_enabled"));
-    assertFalse(flag(startupLog, "otlp_metrics_export_enabled"));
-    assertFalse(flag(startupLog, "otlp_logs_export_enabled"));
-  }
-
-  @Test
-  @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
-  @WithConfig(key = METRICS_OTEL_ENABLED, value = "true")
-  @WithConfig(key = METRICS_OTEL_EXPORTER, value = "otlp")
-  @WithConfig(key = LOGS_OTEL_ENABLED, value = "true")
-  @WithConfig(key = LOGS_OTEL_EXPORTER, value = "otlp")
-  void otlpExportEnabledWhenConfigured() throws IOException {
-    Map<String, Object> startupLog = startupLog();
-
-    assertTrue(flag(startupLog, "otlp_traces_export_enabled"));
-    assertTrue(flag(startupLog, "otlp_metrics_export_enabled"));
-    assertTrue(flag(startupLog, "otlp_logs_export_enabled"));
-  }
-
-  @Test
-  @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
-  @WithConfig(key = METRICS_OTEL_EXPORTER, value = "otlp")
-  @WithConfig(key = LOGS_OTEL_EXPORTER, value = "otlp")
-  void metricsAndLogsRequireOtelSignalEnabled() throws IOException {
-    Map<String, Object> startupLog = startupLog();
-
-    assertTrue(flag(startupLog, "otlp_traces_export_enabled"));
-    assertFalse(flag(startupLog, "otlp_metrics_export_enabled"));
-    assertFalse(flag(startupLog, "otlp_logs_export_enabled"));
-  }
-
-  @Test
-  @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
-  @WithConfig(key = WRITER_TYPE, value = DD_AGENT_WRITER_TYPE)
-  void tracesNotExportedWhenWriterTypeOverridesOtlpExporter() throws IOException {
-    assertFalse(flag(startupLog(), "otlp_traces_export_enabled"));
-  }
-
-  @Test
-  @WithConfig(key = WRITER_TYPE, value = "MultiWriter:OtlpWriter,DDAgentWriter")
-  void tracesExportedWhenMultiWriterIncludesOtlpWriter() throws IOException {
-    assertTrue(flag(startupLog(), "otlp_traces_export_enabled"));
-  }
-
-  @Test
-  @WithConfig(key = WRITER_TYPE, value = "MultiWriter:LoggingWriter,DDAgentWriter")
-  void tracesNotExportedWhenMultiWriterExcludesOtlpWriter() throws IOException {
-    assertFalse(flag(startupLog(), "otlp_traces_export_enabled"));
-  }
-
-  @Test
-  @WithConfig(key = WRITER_TYPE, value = "MultiWriter: OtlpWriter")
-  void tracesNotExportedWhenMultiWriterSubTypeIsPadded() throws IOException {
-    assertFalse(flag(startupLog(), "otlp_traces_export_enabled"));
-  }
-
-  @Test
-  @WithConfig(key = WRITER_TYPE, value = "MultiWriter:OtlpWriterExtra")
-  void tracesNotExportedWhenMultiWriterSubTypeOnlyPrefixesOtlpWriter() throws IOException {
-    assertFalse(flag(startupLog(), "otlp_traces_export_enabled"));
-  }
-
-  @Test
-  @WithConfig(key = WRITER_TYPE, value = "DDAgentWriter,OtlpWriter")
-  void tracesNotExportedWhenCommaSeparatedWithoutMultiWriterPrefix() throws IOException {
-    assertFalse(flag(startupLog(), "otlp_traces_export_enabled"));
-  }
-
-  @Test
-  @WithConfig(key = WRITER_TYPE, value = "TraceStructureWriter:/tmp/out,OtlpWriter")
-  void tracesNotExportedWhenTraceStructureWriterTakesPrecedence() throws IOException {
-    assertFalse(flag(startupLog(), "otlp_traces_export_enabled"));
-  }
-
-  @Test
-  @WithConfig(key = OTEL_TRACES_SPAN_METRICS_ENABLED, value = "true")
-  void metricsExportedWhenSpanMetricsEnabled() throws IOException {
-    assertTrue(flag(startupLog(), "otlp_metrics_export_enabled"));
-  }
-
-  @Test
-  @WithConfig(key = METRICS_OTEL_ENABLED, value = "true")
-  @WithConfig(key = METRICS_OTEL_EXPORTER, value = "otlp")
-  @WithConfig(key = OTEL_TRACES_SPAN_METRICS_ENABLED, value = "false")
-  void metricsExportedWhenOtelMetricsSignalEnabledWithoutSpanMetrics() throws IOException {
-    assertTrue(flag(startupLog(), "otlp_metrics_export_enabled"));
-  }
-
-  private static Map<String, Object> startupLog() throws IOException {
-    String json =
-        new Moshi.Builder()
-            .add(new StatusLogger())
-            .build()
-            .adapter(Config.class)
-            .toJson(Config.get());
-    return JsonMapper.fromJsonToMap(json);
-  }
-
-  private static boolean flag(Map<String, Object> startupLog, String name) {
-    Object value = startupLog.get(name);
-    assertTrue(value instanceof Boolean, name + " should be a boolean, was " + value);
-    return (Boolean) value;
-  }
+    @Test
+    void otlpExportDisabledByDefault() throws IOException {
+        Map<String, Object> startupLog = startupLog();
+
+        assertFalse(flag(startupLog, "otlp_traces_export_enabled"));
+        assertFalse(flag(startupLog, "otlp_metrics_export_enabled"));
+        assertFalse(flag(startupLog, "otlp_logs_export_enabled"));
+    }
+
+    @Test
+    @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
+    @WithConfig(key = METRICS_OTEL_ENABLED, value = "true")
+    @WithConfig(key = METRICS_OTEL_EXPORTER, value = "otlp")
+    @WithConfig(key = LOGS_OTEL_ENABLED, value = "true")
+    @WithConfig(key = LOGS_OTEL_EXPORTER, value = "otlp")
+    void otlpExportEnabledWhenConfigured() throws IOException {
+        Map<String, Object> startupLog = startupLog();
+
+        assertTrue(flag(startupLog, "otlp_traces_export_enabled"));
+        assertTrue(flag(startupLog, "otlp_metrics_export_enabled"));
+        assertTrue(flag(startupLog, "otlp_logs_export_enabled"));
+    }
+
+    @Test
+    @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
+    @WithConfig(key = METRICS_OTEL_EXPORTER, value = "otlp")
+    @WithConfig(key = LOGS_OTEL_EXPORTER, value = "otlp")
+    void metricsAndLogsRequireOtelSignalEnabled() throws IOException {
+        Map<String, Object> startupLog = startupLog();
+
+        assertTrue(flag(startupLog, "otlp_traces_export_enabled"));
+        assertFalse(flag(startupLog, "otlp_metrics_export_enabled"));
+        assertFalse(flag(startupLog, "otlp_logs_export_enabled"));
+    }
+
+    @Test
+    @WithConfig(key = TRACE_OTEL_EXPORTER, value = "otlp")
+    @WithConfig(key = WRITER_TYPE, value = DD_AGENT_WRITER_TYPE)
+    void tracesNotExportedWhenWriterTypeOverridesOtlpExporter() throws IOException {
+        assertFalse(flag(startupLog(), "otlp_traces_export_enabled"));
+    }
+
+    @Test
+    @WithConfig(key = WRITER_TYPE, value = "MultiWriter:OtlpWriter,DDAgentWriter")
+    void tracesExportedWhenMultiWriterIncludesOtlpWriter() throws IOException {
+        assertTrue(flag(startupLog(), "otlp_traces_export_enabled"));
+    }
+
+    @Test
+    @WithConfig(key = WRITER_TYPE, value = "MultiWriter:LoggingWriter,DDAgentWriter")
+    void tracesNotExportedWhenMultiWriterExcludesOtlpWriter() throws IOException {
+        assertFalse(flag(startupLog(), "otlp_traces_export_enabled"));
+    }
+
+    @Test
+    @WithConfig(key = WRITER_TYPE, value = "MultiWriter: OtlpWriter")
+    void tracesNotExportedWhenMultiWriterSubTypeIsPadded() throws IOException {
+        assertFalse(flag(startupLog(), "otlp_traces_export_enabled"));
+    }
+
+    @Test
+    @WithConfig(key = WRITER_TYPE, value = "MultiWriter:OtlpWriterExtra")
+    void tracesNotExportedWhenMultiWriterSubTypeOnlyPrefixesOtlpWriter() throws IOException {
+        assertFalse(flag(startupLog(), "otlp_traces_export_enabled"));
+    }
+
+    @Test
+    @WithConfig(key = WRITER_TYPE, value = "DDAgentWriter,OtlpWriter")
+    void tracesNotExportedWhenCommaSeparatedWithoutMultiWriterPrefix() throws IOException {
+        assertFalse(flag(startupLog(), "otlp_traces_export_enabled"));
+    }
+
+    @Test
+    @WithConfig(key = WRITER_TYPE, value = "TraceStructureWriter:/tmp/out,OtlpWriter")
+    void tracesNotExportedWhenTraceStructureWriterTakesPrecedence() throws IOException {
+        assertFalse(flag(startupLog(), "otlp_traces_export_enabled"));
+    }
+
+    @Test
+    @WithConfig(key = OTEL_TRACES_SPAN_METRICS_ENABLED, value = "true")
+    void metricsExportedWhenSpanMetricsEnabled() throws IOException {
+        assertTrue(flag(startupLog(), "otlp_metrics_export_enabled"));
+    }
+
+    @Test
+    @WithConfig(key = METRICS_OTEL_ENABLED, value = "true")
+    @WithConfig(key = METRICS_OTEL_EXPORTER, value = "otlp")
+    @WithConfig(key = OTEL_TRACES_SPAN_METRICS_ENABLED, value = "false")
+    void metricsExportedWhenOtelMetricsSignalEnabledWithoutSpanMetrics() throws IOException {
+        assertTrue(flag(startupLog(), "otlp_metrics_export_enabled"));
+    }
+
+    private static Map<String, Object> startupLog() throws IOException {
+        String json = new Moshi.Builder()
+                .add(new StatusLogger())
+                .build()
+                .adapter(Config.class)
+                .toJson(Config.get());
+        return JsonMapper.fromJsonToMap(json);
+    }
+
+    private static boolean flag(Map<String, Object> startupLog, String name) {
+        Object value = startupLog.get(name);
+        assertTrue(value instanceof Boolean, name + " should be a boolean, was " + value);
+        return (Boolean) value;
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/TraceCorrelationTest.java b/dd-trace-core/src/test/java/datadog/trace/core/TraceCorrelationTest.java
index c7f63ce836e..f7366758c46 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/TraceCorrelationTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/TraceCorrelationTest.java
@@ -15,70 +15,65 @@
 
 public class TraceCorrelationTest extends DDCoreJavaSpecification {
 
-  @ValueSource(booleans = {true, false})
-  @ParameterizedTest
-  void getTraceIdWithoutTrace(boolean log128bTraceId) {
-    WithConfigExtension.injectSysConfig(
-        TRACE_128_BIT_TRACEID_GENERATION_ENABLED, String.valueOf(log128bTraceId));
-    WithConfigExtension.injectSysConfig(
-        TRACE_128_BIT_TRACEID_LOGGING_ENABLED, String.valueOf(log128bTraceId));
-
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    AgentSpan span = tracer.buildSpan("datadog", "test").start();
-    ContextScope scope = tracer.activateSpan(span);
-    scope.close();
-
-    assertEquals("0", tracer.getTraceId());
-
-    span.finish();
-    tracer.close();
-  }
-
-  @ValueSource(booleans = {true, false})
-  @ParameterizedTest
-  void getTraceIdWithTrace(boolean log128bTraceId) {
-    WithConfigExtension.injectSysConfig(
-        TRACE_128_BIT_TRACEID_GENERATION_ENABLED, String.valueOf(log128bTraceId));
-    WithConfigExtension.injectSysConfig(
-        TRACE_128_BIT_TRACEID_LOGGING_ENABLED, String.valueOf(log128bTraceId));
-
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    AgentSpan span = tracer.buildSpan("datadog", "test").start();
-    ContextScope scope = tracer.activateSpan(span);
-
-    DDTraceId traceId = ((DDSpan) AgentSpan.fromScope(scope)).getTraceId();
-    String formattedTraceId = log128bTraceId ? traceId.toHexString() : traceId.toString();
-    assertEquals(formattedTraceId, tracer.getTraceId());
-
-    scope.close();
-    span.finish();
-    tracer.close();
-  }
-
-  @Test
-  void getSpanIdWithoutSpan() {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    AgentSpan span = tracer.buildSpan("datadog", "test").start();
-    ContextScope scope = tracer.activateSpan(span);
-    scope.close();
-
-    assertEquals("0", tracer.getSpanId());
-
-    span.finish();
-    tracer.close();
-  }
-
-  @Test
-  void getSpanIdWithTrace() {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    AgentSpan span = tracer.buildSpan("datadog", "test").start();
-    ContextScope scope = tracer.activateSpan(span);
-
-    assertEquals(
-        Long.toString(((DDSpan) AgentSpan.fromScope(scope)).getSpanId()), tracer.getSpanId());
-
-    scope.close();
-    span.finish();
-    tracer.close();
-  }
+    @ValueSource(booleans = {true, false})
+    @ParameterizedTest
+    void getTraceIdWithoutTrace(boolean log128bTraceId) {
+        WithConfigExtension.injectSysConfig(TRACE_128_BIT_TRACEID_GENERATION_ENABLED, String.valueOf(log128bTraceId));
+        WithConfigExtension.injectSysConfig(TRACE_128_BIT_TRACEID_LOGGING_ENABLED, String.valueOf(log128bTraceId));
+
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        AgentSpan span = tracer.buildSpan("datadog", "test").start();
+        ContextScope scope = tracer.activateSpan(span);
+        scope.close();
+
+        assertEquals("0", tracer.getTraceId());
+
+        span.finish();
+        tracer.close();
+    }
+
+    @ValueSource(booleans = {true, false})
+    @ParameterizedTest
+    void getTraceIdWithTrace(boolean log128bTraceId) {
+        WithConfigExtension.injectSysConfig(TRACE_128_BIT_TRACEID_GENERATION_ENABLED, String.valueOf(log128bTraceId));
+        WithConfigExtension.injectSysConfig(TRACE_128_BIT_TRACEID_LOGGING_ENABLED, String.valueOf(log128bTraceId));
+
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        AgentSpan span = tracer.buildSpan("datadog", "test").start();
+        ContextScope scope = tracer.activateSpan(span);
+
+        DDTraceId traceId = ((DDSpan) AgentSpan.fromScope(scope)).getTraceId();
+        String formattedTraceId = log128bTraceId ? traceId.toHexString() : traceId.toString();
+        assertEquals(formattedTraceId, tracer.getTraceId());
+
+        scope.close();
+        span.finish();
+        tracer.close();
+    }
+
+    @Test
+    void getSpanIdWithoutSpan() {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        AgentSpan span = tracer.buildSpan("datadog", "test").start();
+        ContextScope scope = tracer.activateSpan(span);
+        scope.close();
+
+        assertEquals("0", tracer.getSpanId());
+
+        span.finish();
+        tracer.close();
+    }
+
+    @Test
+    void getSpanIdWithTrace() {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        AgentSpan span = tracer.buildSpan("datadog", "test").start();
+        ContextScope scope = tracer.activateSpan(span);
+
+        assertEquals(Long.toString(((DDSpan) AgentSpan.fromScope(scope)).getSpanId()), tracer.getSpanId());
+
+        scope.close();
+        span.finish();
+        tracer.close();
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/TraceInterceptorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/TraceInterceptorTest.java
index 503038d1405..d784894950e 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/TraceInterceptorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/TraceInterceptorTest.java
@@ -32,220 +32,199 @@
 @WithConfig(key = TracerConfig.TRACE_GIT_METADATA_ENABLED, value = "false")
 public class TraceInterceptorTest extends DDCoreJavaSpecification {
 
-  private ListWriter writer;
-  private CoreTracer tracer;
-
-  @BeforeEach
-  void setup() {
-    writer = new ListWriter();
-    tracer = tracerBuilder().writer(writer).build();
-  }
-
-  @AfterEach
-  void cleanup() {
-    if (tracer != null) {
-      tracer.close();
+    private ListWriter writer;
+    private CoreTracer tracer;
+
+    @BeforeEach
+    void setup() {
+        writer = new ListWriter();
+        tracer = tracerBuilder().writer(writer).build();
+    }
+
+    @AfterEach
+    void cleanup() {
+        if (tracer != null) {
+            tracer.close();
+        }
     }
-  }
-
-  @Test
-  void interceptorIsRegisteredAsService() {
-    assertInstanceOf(TestInterceptor.class, tracer.getInterceptors().interceptors()[0]);
-  }
-
-  @Test
-  void interceptorsWithSamePriorityReplaced() {
-    int priority = 999;
-    TestInterceptor.priority = priority;
-    tracer
-        .getInterceptors()
-        .add(
-            new TraceInterceptor() {
-              @Override
-              public Collection<? extends MutableSpan> onTraceComplete(
-                  Collection<? extends MutableSpan> trace) {
+
+    @Test
+    void interceptorIsRegisteredAsService() {
+        assertInstanceOf(TestInterceptor.class, tracer.getInterceptors().interceptors()[0]);
+    }
+
+    @Test
+    void interceptorsWithSamePriorityReplaced() {
+        int priority = 999;
+        TestInterceptor.priority = priority;
+        tracer.getInterceptors().add(new TraceInterceptor() {
+            @Override
+            public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
                 return emptyList();
-              }
+            }
 
-              @Override
-              public int priority() {
+            @Override
+            public int priority() {
                 return priority;
-              }
-            });
-
-    TraceInterceptor[] interceptors = tracer.getInterceptors().interceptors();
-    assertEquals(1, interceptors.length);
-    assertInstanceOf(TestInterceptor.class, interceptors[0]);
-  }
-
-  @TableTest({
-    "scenario             | score | reverse",
-    "lower than existing  | -1    | false  ",
-    "higher than existing | 1000  | true   "
-  })
-  void interceptorsWithDifferentPrioritySorted(int score, boolean reverse) {
-    TraceInterceptor existingInterceptor = tracer.getInterceptors().interceptors()[0];
-    TraceInterceptor newInterceptor =
-        new TraceInterceptor() {
-          @Override
-          public Collection<? extends MutableSpan> onTraceComplete(
-              Collection<? extends MutableSpan> trace) {
-            return emptyList();
-          }
-
-          @Override
-          public int priority() {
-            return score;
-          }
+            }
+        });
+
+        TraceInterceptor[] interceptors = tracer.getInterceptors().interceptors();
+        assertEquals(1, interceptors.length);
+        assertInstanceOf(TestInterceptor.class, interceptors[0]);
+    }
+
+    @TableTest({
+      "scenario             | score | reverse",
+      "lower than existing  | -1    | false  ",
+      "higher than existing | 1000  | true   "
+    })
+    void interceptorsWithDifferentPrioritySorted(int score, boolean reverse) {
+        TraceInterceptor existingInterceptor = tracer.getInterceptors().interceptors()[0];
+        TraceInterceptor newInterceptor = new TraceInterceptor() {
+            @Override
+            public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
+                return emptyList();
+            }
+
+            @Override
+            public int priority() {
+                return score;
+            }
         };
-    tracer.getInterceptors().add(newInterceptor);
-
-    List<TraceInterceptor> sorted = Arrays.asList(tracer.getInterceptors().interceptors());
-    assertEquals(2, sorted.size());
-    if (reverse) {
-      assertEquals(existingInterceptor, sorted.get(0));
-      assertEquals(newInterceptor, sorted.get(1));
-    } else {
-      assertEquals(newInterceptor, sorted.get(0));
-      assertEquals(existingInterceptor, sorted.get(1));
+        tracer.getInterceptors().add(newInterceptor);
+
+        List<TraceInterceptor> sorted = Arrays.asList(tracer.getInterceptors().interceptors());
+        assertEquals(2, sorted.size());
+        if (reverse) {
+            assertEquals(existingInterceptor, sorted.get(0));
+            assertEquals(newInterceptor, sorted.get(1));
+        } else {
+            assertEquals(newInterceptor, sorted.get(0));
+            assertEquals(existingInterceptor, sorted.get(1));
+        }
     }
-  }
-
-  @TableTest({
-    "scenario       | deltaPriority | expectedSize",
-    "below priority | -1            | 2           ",
-    "same priority  | 0             | 1           ",
-    "above priority | 1             | 2           "
-  })
-  void interceptorCanDiscardTrace(int deltaPriority, int expectedSize)
-      throws InterruptedException, TimeoutException {
-    int score = TestInterceptor.priority + deltaPriority;
-    AtomicBoolean called = new AtomicBoolean(false);
-    CountDownLatch latch = new CountDownLatch(1);
-    tracer
-        .getInterceptors()
-        .add(
-            new TraceInterceptor() {
-              @Override
-              public Collection<? extends MutableSpan> onTraceComplete(
-                  Collection<? extends MutableSpan> trace) {
+
+    @TableTest({
+      "scenario       | deltaPriority | expectedSize",
+      "below priority | -1            | 2           ",
+      "same priority  | 0             | 1           ",
+      "above priority | 1             | 2           "
+    })
+    void interceptorCanDiscardTrace(int deltaPriority, int expectedSize) throws InterruptedException, TimeoutException {
+        int score = TestInterceptor.priority + deltaPriority;
+        AtomicBoolean called = new AtomicBoolean(false);
+        CountDownLatch latch = new CountDownLatch(1);
+        tracer.getInterceptors().add(new TraceInterceptor() {
+            @Override
+            public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
                 called.set(true);
                 latch.countDown();
                 return emptyList();
-              }
+            }
 
-              @Override
-              public int priority() {
+            @Override
+            public int priority() {
                 return score;
-              }
-            });
-
-    tracer.buildSpan("datadog", "test " + score).start().finish();
-    if (score == TestInterceptor.priority) {
-      writer.waitForTraces(1);
-    } else {
-      latch.await(5, TimeUnit.SECONDS);
+            }
+        });
+
+        tracer.buildSpan("datadog", "test " + score).start().finish();
+        if (score == TestInterceptor.priority) {
+            writer.waitForTraces(1);
+        } else {
+            latch.await(5, TimeUnit.SECONDS);
+        }
+
+        TraceInterceptor[] interceptors = tracer.getInterceptors().interceptors();
+        assertEquals(expectedSize, interceptors.length);
+        assertEquals(score != TestInterceptor.priority, called.get());
+        assertEquals(score != TestInterceptor.priority, writer.isEmpty());
     }
 
-    TraceInterceptor[] interceptors = tracer.getInterceptors().interceptors();
-    assertEquals(expectedSize, interceptors.length);
-    assertEquals(score != TestInterceptor.priority, called.get());
-    assertEquals(score != TestInterceptor.priority, writer.isEmpty());
-  }
-
-  @Test
-  void interceptorCanModifySpan() throws InterruptedException, TimeoutException {
-    tracer
-        .getInterceptors()
-        .add(
-            new TraceInterceptor() {
-              @Override
-              public Collection<? extends MutableSpan> onTraceComplete(
-                  Collection<? extends MutableSpan> trace) {
+    @Test
+    void interceptorCanModifySpan() throws InterruptedException, TimeoutException {
+        tracer.getInterceptors().add(new TraceInterceptor() {
+            @Override
+            public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
                 for (MutableSpan span : trace) {
-                  span.setOperationName("modifiedON-" + span.getOperationName())
-                      .setServiceName("modifiedSN-" + span.getServiceName())
-                      .setResourceName("modifiedRN-" + span.getResourceName())
-                      .setSpanType("modifiedST-" + span.getSpanType())
-                      .setTag("boolean-tag", true)
-                      .setTag("number-tag", 5.0)
-                      .setTag("string-tag", "howdy")
-                      .setError(true);
+                    span.setOperationName("modifiedON-" + span.getOperationName())
+                            .setServiceName("modifiedSN-" + span.getServiceName())
+                            .setResourceName("modifiedRN-" + span.getResourceName())
+                            .setSpanType("modifiedST-" + span.getSpanType())
+                            .setTag("boolean-tag", true)
+                            .setTag("number-tag", 5.0)
+                            .setTag("string-tag", "howdy")
+                            .setError(true);
                 }
                 return trace;
-              }
+            }
 
-              @Override
-              public int priority() {
+            @Override
+            public int priority() {
                 return 1;
-              }
-            });
-
-    tracer.buildSpan("datadog", "test").start().finish();
-    writer.waitForTraces(1);
-
-    List<DDSpan> trace = writer.firstTrace();
-    assertEquals(1, trace.size());
-
-    DDSpan span = trace.get(0);
-    assertEquals("modifiedON-test", span.spanContext().getOperationName().toString());
-    assertTrue(span.getServiceName().startsWith("modifiedSN-"));
-    assertEquals("modifiedRN-modifiedON-test", span.getResourceName().toString());
-    assertEquals("modifiedST-null", span.getSpanType());
-    assertTrue(span.spanContext().getErrorFlag());
-
-    TagMap tags = span.spanContext().getTags();
-    assertEquals(true, tags.get("boolean-tag"));
-    assertEquals(5.0, tags.get("number-tag"));
-    assertEquals("howdy", tags.get("string-tag"));
-    assertNotNull(tags.get("thread.name"));
-    assertNotNull(tags.get("thread.id"));
-    assertNotNull(tags.get("runtime-id"));
-    assertNotNull(tags.get("language"));
-    assertTrue(tags.size() >= 7);
-  }
-
-  @Test
-  void robustWhenInterceptorReturnsNull() {
-    tracer
-        .getInterceptors()
-        .add(
-            new TraceInterceptor() {
-              @Override
-              public Collection<? extends MutableSpan> onTraceComplete(
-                  Collection<? extends MutableSpan> trace) {
+            }
+        });
+
+        tracer.buildSpan("datadog", "test").start().finish();
+        writer.waitForTraces(1);
+
+        List<DDSpan> trace = writer.firstTrace();
+        assertEquals(1, trace.size());
+
+        DDSpan span = trace.get(0);
+        assertEquals("modifiedON-test", span.spanContext().getOperationName().toString());
+        assertTrue(span.getServiceName().startsWith("modifiedSN-"));
+        assertEquals("modifiedRN-modifiedON-test", span.getResourceName().toString());
+        assertEquals("modifiedST-null", span.getSpanType());
+        assertTrue(span.spanContext().getErrorFlag());
+
+        TagMap tags = span.spanContext().getTags();
+        assertEquals(true, tags.get("boolean-tag"));
+        assertEquals(5.0, tags.get("number-tag"));
+        assertEquals("howdy", tags.get("string-tag"));
+        assertNotNull(tags.get("thread.name"));
+        assertNotNull(tags.get("thread.id"));
+        assertNotNull(tags.get("runtime-id"));
+        assertNotNull(tags.get("language"));
+        assertTrue(tags.size() >= 7);
+    }
+
+    @Test
+    void robustWhenInterceptorReturnsNull() {
+        tracer.getInterceptors().add(new TraceInterceptor() {
+            @Override
+            public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
                 return null;
-              }
+            }
 
-              @Override
-              public int priority() {
+            @Override
+            public int priority() {
                 return 0;
-              }
-            });
-
-    DDSpan span = (DDSpan) tracer.startSpan("test", "test");
-    span.phasedFinish();
-    assertDoesNotThrow(() -> tracer.write(SpanList.of(span)));
-  }
-
-  @Test
-  void registerInterceptorThroughBridge() {
-    GlobalTracer.registerIfAbsent(tracer);
-    TraceInterceptor interceptor =
-        new TraceInterceptor() {
-          @Override
-          public Collection<? extends MutableSpan> onTraceComplete(
-              Collection<? extends MutableSpan> trace) {
-            return trace;
-          }
-
-          @Override
-          public int priority() {
-            return 38;
-          }
+            }
+        });
+
+        DDSpan span = (DDSpan) tracer.startSpan("test", "test");
+        span.phasedFinish();
+        assertDoesNotThrow(() -> tracer.write(SpanList.of(span)));
+    }
+
+    @Test
+    void registerInterceptorThroughBridge() {
+        GlobalTracer.registerIfAbsent(tracer);
+        TraceInterceptor interceptor = new TraceInterceptor() {
+            @Override
+            public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
+                return trace;
+            }
+
+            @Override
+            public int priority() {
+                return 38;
+            }
         };
 
-    assertTrue(GlobalTracer.get().addTraceInterceptor(interceptor));
-    assertTrue(Arrays.asList(tracer.getInterceptors().interceptors()).contains(interceptor));
-  }
+        assertTrue(GlobalTracer.get().addTraceInterceptor(interceptor));
+        assertTrue(Arrays.asList(tracer.getInterceptors().interceptors()).contains(interceptor));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/TraceInterceptorsTest.java b/dd-trace-core/src/test/java/datadog/trace/core/TraceInterceptorsTest.java
index 8d17c9e7ebd..7dd241fc647 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/TraceInterceptorsTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/TraceInterceptorsTest.java
@@ -16,123 +16,122 @@
 import org.junit.jupiter.api.Test;
 
 public class TraceInterceptorsTest {
-  @Test
-  public void empty() {
-    TraceInterceptors interceptors = new TraceInterceptors();
-    assertTrue(interceptors.isEmpty());
-
-    TraceInterceptor[] interceptorsArray = interceptors.interceptors();
-    assertEquals(0, interceptorsArray.length);
-  }
-
-  @Test
-  public void addInOrder() {
-    TestInterceptor first = new TestInterceptor(0);
-    TestInterceptor second = new TestInterceptor(1);
-    TestInterceptor third = new TestInterceptor(2);
-
-    TraceInterceptors interceptors = new TraceInterceptors();
-    assertNull(interceptors.add(first));
-    assertNull(interceptors.add(second));
-    assertNull(interceptors.add(third));
-
-    assertFalse(interceptors.isEmpty());
-
-    TraceInterceptor[] interceptorsArray = interceptors.interceptors();
-    assertEquals(3, interceptorsArray.length);
-    assertSame(first, interceptorsArray[0]);
-    assertSame(second, interceptorsArray[1]);
-    assertSame(third, interceptorsArray[2]);
-  }
-
-  @Test
-  public void addReverseOrder() {
-    TestInterceptor first = new TestInterceptor(0);
-    TestInterceptor second = new TestInterceptor(1);
-    TestInterceptor third = new TestInterceptor(2);
-
-    TraceInterceptors interceptors = new TraceInterceptors();
-    assertNull(interceptors.add(third));
-    assertNull(interceptors.add(second));
-    assertNull(interceptors.add(first));
-
-    assertFalse(interceptors.isEmpty());
-
-    TraceInterceptor[] interceptorsArray = interceptors.interceptors();
-    assertEquals(3, interceptorsArray.length);
-    assertSame(first, interceptorsArray[0]);
-    assertSame(second, interceptorsArray[1]);
-    assertSame(third, interceptorsArray[2]);
-  }
-
-  @Test
-  public void addShuffle() {
-    int SIZE = 10;
-    List<TraceInterceptor> toAdd = new ArrayList<>(SIZE);
-
-    for (int i = 0; i < SIZE; ++i) {
-      toAdd.add(new TestInterceptor(i));
+    @Test
+    public void empty() {
+        TraceInterceptors interceptors = new TraceInterceptors();
+        assertTrue(interceptors.isEmpty());
+
+        TraceInterceptor[] interceptorsArray = interceptors.interceptors();
+        assertEquals(0, interceptorsArray.length);
     }
 
-    List<TraceInterceptor> toAddShuffled = new ArrayList<>(toAdd);
-    Collections.shuffle(toAddShuffled);
+    @Test
+    public void addInOrder() {
+        TestInterceptor first = new TestInterceptor(0);
+        TestInterceptor second = new TestInterceptor(1);
+        TestInterceptor third = new TestInterceptor(2);
+
+        TraceInterceptors interceptors = new TraceInterceptors();
+        assertNull(interceptors.add(first));
+        assertNull(interceptors.add(second));
+        assertNull(interceptors.add(third));
+
+        assertFalse(interceptors.isEmpty());
 
-    TraceInterceptors interceptors = new TraceInterceptors();
-    for (TraceInterceptor interceptor : toAddShuffled) {
-      assertNull(interceptors.add(interceptor));
+        TraceInterceptor[] interceptorsArray = interceptors.interceptors();
+        assertEquals(3, interceptorsArray.length);
+        assertSame(first, interceptorsArray[0]);
+        assertSame(second, interceptorsArray[1]);
+        assertSame(third, interceptorsArray[2]);
     }
 
-    assertFalse(interceptors.isEmpty());
+    @Test
+    public void addReverseOrder() {
+        TestInterceptor first = new TestInterceptor(0);
+        TestInterceptor second = new TestInterceptor(1);
+        TestInterceptor third = new TestInterceptor(2);
 
-    TraceInterceptor[] interceptorsArray = interceptors.interceptors();
-    assertEquals(SIZE, interceptorsArray.length);
+        TraceInterceptors interceptors = new TraceInterceptors();
+        assertNull(interceptors.add(third));
+        assertNull(interceptors.add(second));
+        assertNull(interceptors.add(first));
 
-    for (int i = 0; i < interceptorsArray.length; ++i) {
-      TraceInterceptor expected = toAdd.get(i);
-      TraceInterceptor actual = interceptorsArray[i];
+        assertFalse(interceptors.isEmpty());
 
-      assertSame(expected, actual);
+        TraceInterceptor[] interceptorsArray = interceptors.interceptors();
+        assertEquals(3, interceptorsArray.length);
+        assertSame(first, interceptorsArray[0]);
+        assertSame(second, interceptorsArray[1]);
+        assertSame(third, interceptorsArray[2]);
     }
-  }
 
-  @Test
-  public void addConflict() {
-    TestInterceptor first = new TestInterceptor(0);
-    TestInterceptor second = new TestInterceptor(1);
-    TestInterceptor third = new TestInterceptor(2);
+    @Test
+    public void addShuffle() {
+        int SIZE = 10;
+        List<TraceInterceptor> toAdd = new ArrayList<>(SIZE);
 
-    TraceInterceptors interceptors = new TraceInterceptors();
+        for (int i = 0; i < SIZE; ++i) {
+            toAdd.add(new TestInterceptor(i));
+        }
 
-    assertNull(interceptors.add(first));
-    assertNull(interceptors.add(second));
-    assertNull(interceptors.add(third));
+        List<TraceInterceptor> toAddShuffled = new ArrayList<>(toAdd);
+        Collections.shuffle(toAddShuffled);
 
-    assertSame(first, interceptors.add(new TestInterceptor(0)));
-    assertSame(second, interceptors.add(new TestInterceptor(1)));
-    assertSame(third, interceptors.add(new TestInterceptor(2)));
-  }
+        TraceInterceptors interceptors = new TraceInterceptors();
+        for (TraceInterceptor interceptor : toAddShuffled) {
+            assertNull(interceptors.add(interceptor));
+        }
 
-  static final class TestInterceptor implements TraceInterceptor {
-    private final int priority;
+        assertFalse(interceptors.isEmpty());
 
-    TestInterceptor(int priority) {
-      this.priority = priority;
-    }
+        TraceInterceptor[] interceptorsArray = interceptors.interceptors();
+        assertEquals(SIZE, interceptorsArray.length);
+
+        for (int i = 0; i < interceptorsArray.length; ++i) {
+            TraceInterceptor expected = toAdd.get(i);
+            TraceInterceptor actual = interceptorsArray[i];
 
-    @Override
-    public Collection<? extends MutableSpan> onTraceComplete(
-        Collection<? extends MutableSpan> trace) {
-      return trace;
+            assertSame(expected, actual);
+        }
     }
 
-    @Override
-    public int priority() {
-      return this.priority;
+    @Test
+    public void addConflict() {
+        TestInterceptor first = new TestInterceptor(0);
+        TestInterceptor second = new TestInterceptor(1);
+        TestInterceptor third = new TestInterceptor(2);
+
+        TraceInterceptors interceptors = new TraceInterceptors();
+
+        assertNull(interceptors.add(first));
+        assertNull(interceptors.add(second));
+        assertNull(interceptors.add(third));
+
+        assertSame(first, interceptors.add(new TestInterceptor(0)));
+        assertSame(second, interceptors.add(new TestInterceptor(1)));
+        assertSame(third, interceptors.add(new TestInterceptor(2)));
     }
 
-    @Override
-    public String toString() {
-      return "TestInterceptor(priority=" + this.priority + ")";
+    static final class TestInterceptor implements TraceInterceptor {
+        private final int priority;
+
+        TestInterceptor(int priority) {
+            this.priority = priority;
+        }
+
+        @Override
+        public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
+            return trace;
+        }
+
+        @Override
+        public int priority() {
+            return this.priority;
+        }
+
+        @Override
+        public String toString() {
+            return "TestInterceptor(priority=" + this.priority + ")";
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/TracingConfigPollerTest.java b/dd-trace-core/src/test/java/datadog/trace/core/TracingConfigPollerTest.java
index d16ddc1d322..fc9522bc14e 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/TracingConfigPollerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/TracingConfigPollerTest.java
@@ -42,343 +42,337 @@
 @Timeout(10)
 public class TracingConfigPollerTest extends DDCoreJavaSpecification {
 
-  @Test
-  void mergeLibConfigsWithNullAndNonNullValues() {
-    TracingConfigPoller.LibConfig config1 = new TracingConfigPoller.LibConfig(); // all nulls
-    TracingConfigPoller.LibConfig config2 = new TracingConfigPoller.LibConfig();
-    config2.tracingEnabled = true;
-    config2.debugEnabled = false;
-    config2.runtimeMetricsEnabled = true;
-    config2.logsInjectionEnabled = false;
-    config2.dataStreamsEnabled = true;
-    config2.traceSampleRate = 0.5;
-    config2.dynamicInstrumentationEnabled = true;
-    config2.exceptionReplayEnabled = false;
-    config2.codeOriginEnabled = true;
-    config2.liveDebuggingEnabled = false;
+    @Test
+    void mergeLibConfigsWithNullAndNonNullValues() {
+        TracingConfigPoller.LibConfig config1 = new TracingConfigPoller.LibConfig(); // all nulls
+        TracingConfigPoller.LibConfig config2 = new TracingConfigPoller.LibConfig();
+        config2.tracingEnabled = true;
+        config2.debugEnabled = false;
+        config2.runtimeMetricsEnabled = true;
+        config2.logsInjectionEnabled = false;
+        config2.dataStreamsEnabled = true;
+        config2.traceSampleRate = 0.5;
+        config2.dynamicInstrumentationEnabled = true;
+        config2.exceptionReplayEnabled = false;
+        config2.codeOriginEnabled = true;
+        config2.liveDebuggingEnabled = false;
 
-    TracingConfigPoller.LibConfig config3 = new TracingConfigPoller.LibConfig();
-    config3.tracingEnabled = false;
-    config3.debugEnabled = true;
-    config3.runtimeMetricsEnabled = false;
-    config3.logsInjectionEnabled = true;
-    config3.dataStreamsEnabled = false;
-    config3.traceSampleRate = 0.8;
-    config3.dynamicInstrumentationEnabled = false;
-    config3.exceptionReplayEnabled = true;
-    config3.codeOriginEnabled = false;
-    config3.liveDebuggingEnabled = true;
+        TracingConfigPoller.LibConfig config3 = new TracingConfigPoller.LibConfig();
+        config3.tracingEnabled = false;
+        config3.debugEnabled = true;
+        config3.runtimeMetricsEnabled = false;
+        config3.logsInjectionEnabled = true;
+        config3.dataStreamsEnabled = false;
+        config3.traceSampleRate = 0.8;
+        config3.dynamicInstrumentationEnabled = false;
+        config3.exceptionReplayEnabled = true;
+        config3.codeOriginEnabled = false;
+        config3.liveDebuggingEnabled = true;
 
-    TracingConfigPoller.LibConfig merged =
-        TracingConfigPoller.LibConfig.mergeLibConfigs(Arrays.asList(config1, config2, config3));
+        TracingConfigPoller.LibConfig merged =
+                TracingConfigPoller.LibConfig.mergeLibConfigs(Arrays.asList(config1, config2, config3));
 
-    assertNotNull(merged);
-    // Should take first non-null values from config2
-    assertEquals(Boolean.TRUE, merged.tracingEnabled);
-    assertEquals(Boolean.FALSE, merged.debugEnabled);
-    assertEquals(Boolean.TRUE, merged.runtimeMetricsEnabled);
-    assertEquals(Boolean.FALSE, merged.logsInjectionEnabled);
-    assertEquals(Boolean.TRUE, merged.dataStreamsEnabled);
-    assertEquals(0.5, merged.traceSampleRate);
-    assertEquals(Boolean.TRUE, merged.dynamicInstrumentationEnabled);
-    assertEquals(Boolean.FALSE, merged.exceptionReplayEnabled);
-    assertEquals(Boolean.TRUE, merged.codeOriginEnabled);
-    assertEquals(Boolean.FALSE, merged.liveDebuggingEnabled);
-  }
-
-  @TableTest({
-    "scenario             | service      | env     | clusterName  | expectedPriority",
-    "service and env      | test-service | staging |              | 5               ",
-    "service and wildcard | test-service | *       |              | 4               ",
-    "wildcard and env     | *            | staging |              | 3               ",
-    "cluster target       |              |         | test-cluster | 2               ",
-    "wildcard org level   | *            | *       |              | 1               "
-  })
-  void configPriorityCalculation(
-      String service, String env, String clusterName, int expectedPriority) {
-    TracingConfigPoller.ConfigOverrides configOverrides = new TracingConfigPoller.ConfigOverrides();
-    if (service != null || env != null) {
-      configOverrides.serviceTarget = new TracingConfigPoller.ServiceTarget();
-      configOverrides.serviceTarget.service = service;
-      configOverrides.serviceTarget.env = env;
-    }
-    if (clusterName != null) {
-      TracingConfigPoller.ClusterTarget clusterTarget = new TracingConfigPoller.ClusterTarget();
-      clusterTarget.clusterName = clusterName;
-      clusterTarget.enabled = true;
-      configOverrides.k8sTargetV2 = new TracingConfigPoller.K8sTargetV2();
-      configOverrides.k8sTargetV2.clusterTargets = Collections.singletonList(clusterTarget);
+        assertNotNull(merged);
+        // Should take first non-null values from config2
+        assertEquals(Boolean.TRUE, merged.tracingEnabled);
+        assertEquals(Boolean.FALSE, merged.debugEnabled);
+        assertEquals(Boolean.TRUE, merged.runtimeMetricsEnabled);
+        assertEquals(Boolean.FALSE, merged.logsInjectionEnabled);
+        assertEquals(Boolean.TRUE, merged.dataStreamsEnabled);
+        assertEquals(0.5, merged.traceSampleRate);
+        assertEquals(Boolean.TRUE, merged.dynamicInstrumentationEnabled);
+        assertEquals(Boolean.FALSE, merged.exceptionReplayEnabled);
+        assertEquals(Boolean.TRUE, merged.codeOriginEnabled);
+        assertEquals(Boolean.FALSE, merged.liveDebuggingEnabled);
     }
-    configOverrides.libConfig = new TracingConfigPoller.LibConfig();
 
-    assertEquals(expectedPriority, configOverrides.getOverridePriority());
-  }
+    @TableTest({
+      "scenario             | service      | env     | clusterName  | expectedPriority",
+      "service and env      | test-service | staging |              | 5               ",
+      "service and wildcard | test-service | *       |              | 4               ",
+      "wildcard and env     | *            | staging |              | 3               ",
+      "cluster target       |              |         | test-cluster | 2               ",
+      "wildcard org level   | *            | *       |              | 1               "
+    })
+    void configPriorityCalculation(String service, String env, String clusterName, int expectedPriority) {
+        TracingConfigPoller.ConfigOverrides configOverrides = new TracingConfigPoller.ConfigOverrides();
+        if (service != null || env != null) {
+            configOverrides.serviceTarget = new TracingConfigPoller.ServiceTarget();
+            configOverrides.serviceTarget.service = service;
+            configOverrides.serviceTarget.env = env;
+        }
+        if (clusterName != null) {
+            TracingConfigPoller.ClusterTarget clusterTarget = new TracingConfigPoller.ClusterTarget();
+            clusterTarget.clusterName = clusterName;
+            clusterTarget.enabled = true;
+            configOverrides.k8sTargetV2 = new TracingConfigPoller.K8sTargetV2();
+            configOverrides.k8sTargetV2.clusterTargets = Collections.singletonList(clusterTarget);
+        }
+        configOverrides.libConfig = new TracingConfigPoller.LibConfig();
 
-  @Test
-  void actualConfigCommitWithServiceAndOrgLevelConfigs() throws Exception {
-    ParsedConfigKey orgKey = ParsedConfigKey.parse("datadog/2/APM_TRACING/org_config/config");
-    ParsedConfigKey serviceKey =
-        ParsedConfigKey.parse("datadog/2/APM_TRACING/service_config/config");
-    ConfigurationPoller poller = mock(ConfigurationPoller.class);
-    SharedCommunicationObjects sco = createScoWithPoller(poller);
+        assertEquals(expectedPriority, configOverrides.getOverridePriority());
+    }
 
-    ProductListener[] capturedUpdater = {null};
-    doAnswer(
-            inv -> {
-              // capture config updater for further testing
-              capturedUpdater[0] = inv.getArgument(1, ProductListener.class);
-              return null;
-            })
-        .when(poller)
-        .addListener(eq(Product.APM_TRACING), any(ProductListener.class));
+    @Test
+    void actualConfigCommitWithServiceAndOrgLevelConfigs() throws Exception {
+        ParsedConfigKey orgKey = ParsedConfigKey.parse("datadog/2/APM_TRACING/org_config/config");
+        ParsedConfigKey serviceKey = ParsedConfigKey.parse("datadog/2/APM_TRACING/service_config/config");
+        ConfigurationPoller poller = mock(ConfigurationPoller.class);
+        SharedCommunicationObjects sco = createScoWithPoller(poller);
 
-    CoreTracer tracer =
-        CoreTracer.builder().sharedCommunicationObjects(sco).pollForTracingConfiguration().build();
-    unclosedTracers.add(tracer);
+        ProductListener[] capturedUpdater = {null};
+        doAnswer(inv -> {
+                    // capture config updater for further testing
+                    capturedUpdater[0] = inv.getArgument(1, ProductListener.class);
+                    return null;
+                })
+                .when(poller)
+                .addListener(eq(Product.APM_TRACING), any(ProductListener.class));
 
-    try {
-      verify(poller).addListener(eq(Product.APM_TRACING), any(ProductListener.class));
-      assertNotNull(capturedUpdater[0]);
-      assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getServiceMapping());
-      assertNull(tracer.captureTraceConfig().getTraceSampleRate());
+        CoreTracer tracer = CoreTracer.builder()
+                .sharedCommunicationObjects(sco)
+                .pollForTracingConfiguration()
+                .build();
+        unclosedTracers.add(tracer);
 
-      ProductListener updater = capturedUpdater[0];
-      // Add org level config (priority 1) - should set service mapping
-      updater.accept(
-          orgKey,
-          ("{\n"
-                  + "  \"service_target\": {\n"
-                  + "    \"service\": \"*\",\n"
-                  + "    \"env\": \"*\"\n"
-                  + "  },\n"
-                  + "  \"lib_config\": {\n"
-                  + "    \"tracing_service_mapping\": [{\n"
-                  + "      \"from_key\": \"org-service\",\n"
-                  + "      \"to_name\": \"org-mapped\"\n"
-                  + "    }],\n"
-                  + "    \"tracing_sampling_rate\": 0.7\n"
-                  + "  }\n"
-                  + "}")
-              .getBytes(StandardCharsets.UTF_8),
-          null);
-      // Add service level config (priority 4) - should override service mapping and add header tags
-      updater.accept(
-          serviceKey,
-          ("{\n"
-                  + "  \"service_target\": {\n"
-                  + "    \"service\": \"test-service\",\n"
-                  + "    \"env\": \"*\"\n"
-                  + "  },\n"
-                  + "  \"lib_config\": {\n"
-                  + "    \"tracing_service_mapping\": [{\n"
-                  + "      \"from_key\": \"service-specific\",\n"
-                  + "      \"to_name\": \"service-mapped\"\n"
-                  + "    }],\n"
-                  + "    \"tracing_header_tags\": [{\n"
-                  + "      \"header\": \"X-Custom-Header\",\n"
-                  + "      \"tag_name\": \"custom.header\"\n"
-                  + "    }],\n"
-                  + "    \"tracing_sampling_rate\": 1.3,\n"
-                  + "    \"data_streams_transaction_extractors\": [{\n"
-                  + "      \"name\": \"test\",\n"
-                  + "      \"type\": \"unknown\",\n"
-                  + "      \"value\": \"value\"\n"
-                  + "    }]\n"
-                  + "  }\n"
-                  + "}")
-              .getBytes(StandardCharsets.UTF_8),
-          null);
-      // Commit both configs
-      updater.commit(null);
-      // Service level config should take precedence due to higher priority (4 vs 1)
-      assertEquals(
-          Collections.singletonMap("service-specific", "service-mapped"),
-          tracer.captureTraceConfig().getServiceMapping());
-      assertEquals(1.0, tracer.captureTraceConfig().getTraceSampleRate());
-      assertEquals(
-          Collections.singletonMap("x-custom-header", "custom.header"),
-          tracer.captureTraceConfig().getRequestHeaderTags());
-      assertEquals(
-          Collections.singletonMap("x-custom-header", "custom.header"),
-          tracer.captureTraceConfig().getResponseHeaderTags());
-      List<DataStreamsTransactionExtractor> extractors =
-          tracer.captureTraceConfig().getDataStreamsTransactionExtractors();
-      assertEquals(1, extractors.size());
-      assertEquals("test", extractors.get(0).getName());
-      assertEquals(DataStreamsTransactionExtractor.Type.UNKNOWN, extractors.get(0).getType());
-      assertEquals("value", extractors.get(0).getValue());
-      // Remove service level config
-      updater.remove(serviceKey, null);
-      updater.commit(null);
-      // Should fall back to org level config
-      assertEquals(
-          Collections.singletonMap("org-service", "org-mapped"),
-          tracer.captureTraceConfig().getServiceMapping());
-      assertEquals(0.7, tracer.captureTraceConfig().getTraceSampleRate());
-      assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getRequestHeaderTags());
-      assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getResponseHeaderTags());
-      // Remove org level config
-      updater.remove(orgKey, null);
-      updater.commit(null);
-      // Should have no configs
-      assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getServiceMapping());
-      assertNull(tracer.captureTraceConfig().getTraceSampleRate());
-    } finally {
-      tracer.close();
+        try {
+            verify(poller).addListener(eq(Product.APM_TRACING), any(ProductListener.class));
+            assertNotNull(capturedUpdater[0]);
+            assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getServiceMapping());
+            assertNull(tracer.captureTraceConfig().getTraceSampleRate());
+
+            ProductListener updater = capturedUpdater[0];
+            // Add org level config (priority 1) - should set service mapping
+            updater.accept(
+                    orgKey,
+                    ("{\n"
+                                    + "  \"service_target\": {\n"
+                                    + "    \"service\": \"*\",\n"
+                                    + "    \"env\": \"*\"\n"
+                                    + "  },\n"
+                                    + "  \"lib_config\": {\n"
+                                    + "    \"tracing_service_mapping\": [{\n"
+                                    + "      \"from_key\": \"org-service\",\n"
+                                    + "      \"to_name\": \"org-mapped\"\n"
+                                    + "    }],\n"
+                                    + "    \"tracing_sampling_rate\": 0.7\n"
+                                    + "  }\n"
+                                    + "}")
+                            .getBytes(StandardCharsets.UTF_8),
+                    null);
+            // Add service level config (priority 4) - should override service mapping and add header tags
+            updater.accept(
+                    serviceKey,
+                    ("{\n"
+                                    + "  \"service_target\": {\n"
+                                    + "    \"service\": \"test-service\",\n"
+                                    + "    \"env\": \"*\"\n"
+                                    + "  },\n"
+                                    + "  \"lib_config\": {\n"
+                                    + "    \"tracing_service_mapping\": [{\n"
+                                    + "      \"from_key\": \"service-specific\",\n"
+                                    + "      \"to_name\": \"service-mapped\"\n"
+                                    + "    }],\n"
+                                    + "    \"tracing_header_tags\": [{\n"
+                                    + "      \"header\": \"X-Custom-Header\",\n"
+                                    + "      \"tag_name\": \"custom.header\"\n"
+                                    + "    }],\n"
+                                    + "    \"tracing_sampling_rate\": 1.3,\n"
+                                    + "    \"data_streams_transaction_extractors\": [{\n"
+                                    + "      \"name\": \"test\",\n"
+                                    + "      \"type\": \"unknown\",\n"
+                                    + "      \"value\": \"value\"\n"
+                                    + "    }]\n"
+                                    + "  }\n"
+                                    + "}")
+                            .getBytes(StandardCharsets.UTF_8),
+                    null);
+            // Commit both configs
+            updater.commit(null);
+            // Service level config should take precedence due to higher priority (4 vs 1)
+            assertEquals(
+                    Collections.singletonMap("service-specific", "service-mapped"),
+                    tracer.captureTraceConfig().getServiceMapping());
+            assertEquals(1.0, tracer.captureTraceConfig().getTraceSampleRate());
+            assertEquals(
+                    Collections.singletonMap("x-custom-header", "custom.header"),
+                    tracer.captureTraceConfig().getRequestHeaderTags());
+            assertEquals(
+                    Collections.singletonMap("x-custom-header", "custom.header"),
+                    tracer.captureTraceConfig().getResponseHeaderTags());
+            List<DataStreamsTransactionExtractor> extractors =
+                    tracer.captureTraceConfig().getDataStreamsTransactionExtractors();
+            assertEquals(1, extractors.size());
+            assertEquals("test", extractors.get(0).getName());
+            assertEquals(
+                    DataStreamsTransactionExtractor.Type.UNKNOWN,
+                    extractors.get(0).getType());
+            assertEquals("value", extractors.get(0).getValue());
+            // Remove service level config
+            updater.remove(serviceKey, null);
+            updater.commit(null);
+            // Should fall back to org level config
+            assertEquals(
+                    Collections.singletonMap("org-service", "org-mapped"),
+                    tracer.captureTraceConfig().getServiceMapping());
+            assertEquals(0.7, tracer.captureTraceConfig().getTraceSampleRate());
+            assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getRequestHeaderTags());
+            assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getResponseHeaderTags());
+            // Remove org level config
+            updater.remove(orgKey, null);
+            updater.commit(null);
+            // Should have no configs
+            assertEquals(Collections.emptyMap(), tracer.captureTraceConfig().getServiceMapping());
+            assertNull(tracer.captureTraceConfig().getTraceSampleRate());
+        } finally {
+            tracer.close();
+        }
     }
-  }
 
-  @Test
-  void twoOrgLevelsConfigSettingDifferentFlagsWorks() throws Exception {
-    ParsedConfigKey orgConfig1Key =
-        ParsedConfigKey.parse("datadog/2/APM_TRACING/org_config/config1");
-    ParsedConfigKey orgConfig2Key =
-        ParsedConfigKey.parse("datadog/2/APM_TRACING/org_config/config2");
-    ConfigurationPoller poller = mock(ConfigurationPoller.class);
-    SharedCommunicationObjects sco = createScoWithPoller(poller);
+    @Test
+    void twoOrgLevelsConfigSettingDifferentFlagsWorks() throws Exception {
+        ParsedConfigKey orgConfig1Key = ParsedConfigKey.parse("datadog/2/APM_TRACING/org_config/config1");
+        ParsedConfigKey orgConfig2Key = ParsedConfigKey.parse("datadog/2/APM_TRACING/org_config/config2");
+        ConfigurationPoller poller = mock(ConfigurationPoller.class);
+        SharedCommunicationObjects sco = createScoWithPoller(poller);
 
-    ProductListener[] capturedUpdater = {null};
-    doAnswer(
-            inv -> {
-              // capture config updater for further testing
-              capturedUpdater[0] = inv.getArgument(1, ProductListener.class);
-              return null;
-            })
-        .when(poller)
-        .addListener(eq(Product.APM_TRACING), any(ProductListener.class));
+        ProductListener[] capturedUpdater = {null};
+        doAnswer(inv -> {
+                    // capture config updater for further testing
+                    capturedUpdater[0] = inv.getArgument(1, ProductListener.class);
+                    return null;
+                })
+                .when(poller)
+                .addListener(eq(Product.APM_TRACING), any(ProductListener.class));
 
-    CoreTracer tracer =
-        CoreTracer.builder().sharedCommunicationObjects(sco).pollForTracingConfiguration().build();
-    unclosedTracers.add(tracer);
+        CoreTracer tracer = CoreTracer.builder()
+                .sharedCommunicationObjects(sco)
+                .pollForTracingConfiguration()
+                .build();
+        unclosedTracers.add(tracer);
 
-    try {
-      verify(poller).addListener(eq(Product.APM_TRACING), any(ProductListener.class));
-      assertTrue(tracer.captureTraceConfig().isTraceEnabled());
-      assertFalse(tracer.captureTraceConfig().isDataStreamsEnabled());
+        try {
+            verify(poller).addListener(eq(Product.APM_TRACING), any(ProductListener.class));
+            assertTrue(tracer.captureTraceConfig().isTraceEnabled());
+            assertFalse(tracer.captureTraceConfig().isDataStreamsEnabled());
 
-      ProductListener updater = capturedUpdater[0];
-      // Add org level config with ApmTracing enabled
-      updater.accept(
-          orgConfig1Key,
-          ("{\n"
-                  + "  \"service_target\": {\n"
-                  + "    \"service\": \"*\",\n"
-                  + "    \"env\": \"*\"\n"
-                  + "  },\n"
-                  + "  \"lib_config\": {\n"
-                  + "    \"tracing_enabled\": true\n"
-                  + "  }\n"
-                  + "}")
-              .getBytes(StandardCharsets.UTF_8),
-          null);
-      // Add second org level config with DataStreams enabled
-      updater.accept(
-          orgConfig2Key,
-          ("{\n"
-                  + "  \"service_target\": {\n"
-                  + "    \"service\": \"*\",\n"
-                  + "    \"env\": \"*\"\n"
-                  + "  },\n"
-                  + "  \"lib_config\": {\n"
-                  + "    \"data_streams_enabled\": true\n"
-                  + "  }\n"
-                  + "}")
-              .getBytes(StandardCharsets.UTF_8),
-          null);
-      // Commit both configs
-      updater.commit(null);
-      // Both org level configs should be merged, with data streams enabled
-      assertTrue(tracer.captureTraceConfig().isTraceEnabled());
-      assertTrue(tracer.captureTraceConfig().isDataStreamsEnabled());
-    } finally {
-      tracer.close();
+            ProductListener updater = capturedUpdater[0];
+            // Add org level config with ApmTracing enabled
+            updater.accept(
+                    orgConfig1Key,
+                    ("{\n"
+                                    + "  \"service_target\": {\n"
+                                    + "    \"service\": \"*\",\n"
+                                    + "    \"env\": \"*\"\n"
+                                    + "  },\n"
+                                    + "  \"lib_config\": {\n"
+                                    + "    \"tracing_enabled\": true\n"
+                                    + "  }\n"
+                                    + "}")
+                            .getBytes(StandardCharsets.UTF_8),
+                    null);
+            // Add second org level config with DataStreams enabled
+            updater.accept(
+                    orgConfig2Key,
+                    ("{\n"
+                                    + "  \"service_target\": {\n"
+                                    + "    \"service\": \"*\",\n"
+                                    + "    \"env\": \"*\"\n"
+                                    + "  },\n"
+                                    + "  \"lib_config\": {\n"
+                                    + "    \"data_streams_enabled\": true\n"
+                                    + "  }\n"
+                                    + "}")
+                            .getBytes(StandardCharsets.UTF_8),
+                    null);
+            // Commit both configs
+            updater.commit(null);
+            // Both org level configs should be merged, with data streams enabled
+            assertTrue(tracer.captureTraceConfig().isTraceEnabled());
+            assertTrue(tracer.captureTraceConfig().isDataStreamsEnabled());
+        } finally {
+            tracer.close();
+        }
     }
-  }
 
-  @Test
-  void samplerRebuiltByRemoteConfigStillAppliesAgentRates() throws Exception {
-    ParsedConfigKey rulesKey = ParsedConfigKey.parse("datadog/2/APM_TRACING/service_config/config");
-    ConfigurationPoller poller = mock(ConfigurationPoller.class);
-    SharedCommunicationObjects sco = createScoWithPoller(poller);
+    @Test
+    void samplerRebuiltByRemoteConfigStillAppliesAgentRates() throws Exception {
+        ParsedConfigKey rulesKey = ParsedConfigKey.parse("datadog/2/APM_TRACING/service_config/config");
+        ConfigurationPoller poller = mock(ConfigurationPoller.class);
+        SharedCommunicationObjects sco = createScoWithPoller(poller);
 
-    ProductListener[] capturedUpdater = {null};
-    doAnswer(
-            inv -> {
-              capturedUpdater[0] = inv.getArgument(1, ProductListener.class);
-              return null;
-            })
-        .when(poller)
-        .addListener(eq(Product.APM_TRACING), any(ProductListener.class));
+        ProductListener[] capturedUpdater = {null};
+        doAnswer(inv -> {
+                    capturedUpdater[0] = inv.getArgument(1, ProductListener.class);
+                    return null;
+                })
+                .when(poller)
+                .addListener(eq(Product.APM_TRACING), any(ProductListener.class));
 
-    CoreTracer tracer =
-        CoreTracer.builder()
-            .writer(new ListWriter())
-            .sharedCommunicationObjects(sco)
-            .pollForTracingConfiguration()
-            .build();
-    unclosedTracers.add(tracer);
+        CoreTracer tracer = CoreTracer.builder()
+                .writer(new ListWriter())
+                .sharedCommunicationObjects(sco)
+                .pollForTracingConfiguration()
+                .build();
+        unclosedTracers.add(tracer);
 
-    try {
-      // Without rules, the initial sampler is the agent rate sampler itself, registered for rates.
-      Sampler initialSampler = tracer.captureTraceConfig().sampler;
-      assertInstanceOf(RateByServiceTraceSampler.class, initialSampler);
-      assertSame(initialSampler, tracer.agentSampler);
+        try {
+            // Without rules, the initial sampler is the agent rate sampler itself, registered for rates.
+            Sampler initialSampler = tracer.captureTraceConfig().sampler;
+            assertInstanceOf(RateByServiceTraceSampler.class, initialSampler);
+            assertSame(initialSampler, tracer.agentSampler);
 
-      ProductListener updater = capturedUpdater[0];
-      updater.accept(
-          rulesKey,
-          ("{\n"
-                  + "  \"service_target\": {\n"
-                  + "    \"service\": \"*\",\n"
-                  + "    \"env\": \"*\"\n"
-                  + "  },\n"
-                  + "  \"lib_config\": {\n"
-                  + "    \"tracing_sampling_rules\": [{\n"
-                  + "      \"service\": \"other-service\",\n"
-                  + "      \"sample_rate\": 1.0\n"
-                  + "    }]\n"
-                  + "  }\n"
-                  + "}")
-              .getBytes(StandardCharsets.UTF_8),
-          null);
-      updater.commit(null);
+            ProductListener updater = capturedUpdater[0];
+            updater.accept(
+                    rulesKey,
+                    ("{\n"
+                                    + "  \"service_target\": {\n"
+                                    + "    \"service\": \"*\",\n"
+                                    + "    \"env\": \"*\"\n"
+                                    + "  },\n"
+                                    + "  \"lib_config\": {\n"
+                                    + "    \"tracing_sampling_rules\": [{\n"
+                                    + "      \"service\": \"other-service\",\n"
+                                    + "      \"sample_rate\": 1.0\n"
+                                    + "    }]\n"
+                                    + "  }\n"
+                                    + "}")
+                            .getBytes(StandardCharsets.UTF_8),
+                    null);
+            updater.commit(null);
 
-      // The rules rebuilt the sampler, but around the same agent rate sampler.
-      Sampler rebuiltSampler = tracer.captureTraceConfig().sampler;
-      assertNotSame(initialSampler, rebuiltSampler);
-      assertInstanceOf(RuleBasedTraceSampler.class, rebuiltSampler);
-      assertSame(tracer.agentSampler, ((RuleBasedTraceSampler<?>) rebuiltSampler).agentSampler());
+            // The rules rebuilt the sampler, but around the same agent rate sampler.
+            Sampler rebuiltSampler = tracer.captureTraceConfig().sampler;
+            assertNotSame(initialSampler, rebuiltSampler);
+            assertInstanceOf(RuleBasedTraceSampler.class, rebuiltSampler);
+            assertSame(tracer.agentSampler, ((RuleBasedTraceSampler<?>) rebuiltSampler).agentSampler());
 
-      // Agent rates reach the registered (initial) sampler and must still apply to unmatched spans.
-      initialSampler.agentSampler().onResponse("traces", rateByService("service", "bar", 0.0));
+            // Agent rates reach the registered (initial) sampler and must still apply to unmatched spans.
+            initialSampler.agentSampler().onResponse("traces", rateByService("service", "bar", 0.0));
 
-      DDSpan span =
-          (DDSpan)
-              tracer
-                  .buildSpan("datadog", "operation")
-                  .withServiceName("service")
-                  .withTag("env", "bar")
-                  .ignoreActiveSpan()
-                  .start();
-      ((PrioritySampler) rebuiltSampler).setSamplingPriority(span);
+            DDSpan span = (DDSpan) tracer.buildSpan("datadog", "operation")
+                    .withServiceName("service")
+                    .withTag("env", "bar")
+                    .ignoreActiveSpan()
+                    .start();
+            ((PrioritySampler) rebuiltSampler).setSamplingPriority(span);
 
-      assertEquals(PrioritySampling.SAMPLER_DROP, (int) span.getSamplingPriority());
-      assertEquals(0.0, span.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
-    } finally {
-      tracer.close();
+            assertEquals(PrioritySampling.SAMPLER_DROP, (int) span.getSamplingPriority());
+            assertEquals(0.0, span.getTag(RateByServiceTraceSampler.SAMPLING_AGENT_RATE));
+        } finally {
+            tracer.close();
+        }
     }
-  }
 
-  private SharedCommunicationObjects createScoWithPoller(ConfigurationPoller poller)
-      throws Exception {
-    SharedCommunicationObjects sco = new SharedCommunicationObjects();
-    sco.agentHttpClient = mock(OkHttpClient.class);
-    sco.monitoring = mock(Monitoring.class);
-    sco.agentUrl = HttpUrl.get("https://example.com");
-    sco.setFeaturesDiscovery(mock(DDAgentFeaturesDiscovery.class));
-    Field pollerField = SharedCommunicationObjects.class.getDeclaredField("configurationPoller");
-    pollerField.setAccessible(true);
-    pollerField.set(sco, poller);
-    return sco;
-  }
+    private SharedCommunicationObjects createScoWithPoller(ConfigurationPoller poller) throws Exception {
+        SharedCommunicationObjects sco = new SharedCommunicationObjects();
+        sco.agentHttpClient = mock(OkHttpClient.class);
+        sco.monitoring = mock(Monitoring.class);
+        sco.agentUrl = HttpUrl.get("https://example.com");
+        sco.setFeaturesDiscovery(mock(DDAgentFeaturesDiscovery.class));
+        Field pollerField = SharedCommunicationObjects.class.getDeclaredField("configurationPoller");
+        pollerField.setAccessible(true);
+        pollerField.set(sco, poller);
+        return sco;
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/WithTracerTagsVersionTest.java b/dd-trace-core/src/test/java/datadog/trace/core/WithTracerTagsVersionTest.java
index fb859ae0433..10ef8732952 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/WithTracerTagsVersionTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/WithTracerTagsVersionTest.java
@@ -18,25 +18,25 @@
  */
 class WithTracerTagsVersionTest extends DDCoreJavaSpecification {
 
-  private static TagMap tracerTagsWithVersion(Config config) {
-    TagMap userTags = TagMap.create();
-    userTags.set(Tags.VERSION, "1.2.3");
-    return CoreTracer.withTracerTags(userTags, config, null);
-  }
+    private static TagMap tracerTagsWithVersion(Config config) {
+        TagMap userTags = TagMap.create();
+        userTags.set(Tags.VERSION, "1.2.3");
+        return CoreTracer.withTracerTags(userTags, config, null);
+    }
 
-  @Test
-  void versionStrippedFromBundleByDefault() {
-    assertNull(
-        tracerTagsWithVersion(Config.get()).getString(Tags.VERSION),
-        "version is kept out of the trace-level bundle by default (avoids per-span tombstone)");
-  }
+    @Test
+    void versionStrippedFromBundleByDefault() {
+        assertNull(
+                tracerTagsWithVersion(Config.get()).getString(Tags.VERSION),
+                "version is kept out of the trace-level bundle by default (avoids per-span tombstone)");
+    }
 
-  @Test
-  @WithConfig(key = SPLIT_BY_TAGS, value = "version")
-  void versionKeptInBundleWhenSplitByVersion() {
-    assertEquals(
-        "1.2.3",
-        tracerTagsWithVersion(Config.get()).getString(Tags.VERSION),
-        "version must stay in the bundle so split-by-tags can derive the service name");
-  }
+    @Test
+    @WithConfig(key = SPLIT_BY_TAGS, value = "version")
+    void versionKeptInBundleWhenSplitByVersion() {
+        assertEquals(
+                "1.2.3",
+                tracerTagsWithVersion(Config.get()).getString(Tags.VERSION),
+                "version must stay in the bundle so split-by-tags can derive the service name");
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java b/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java
index a227a5284f9..ab8549d006f 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java
@@ -23,129 +23,130 @@
 
 class BaggagePropagatorTelemetryTest {
 
-  private static final CarrierVisitor<Map<String, String>> MAP_VISITOR = Map::forEach;
-
-  @BeforeEach
-  void setup() {
-    // Drain any metrics accumulated by other tests
-    CoreMetricCollector.getInstance().prepareMetrics();
-    CoreMetricCollector.getInstance().drain();
-  }
-
-  @Test
-  void shouldDirectlyIncrementBaggageMetrics() {
-    BaggageMetrics baggageMetrics = BaggageMetrics.getInstance();
-    CoreMetricCollector collector = CoreMetricCollector.getInstance();
-
-    baggageMetrics.onBaggageInjected();
-    collector.prepareMetrics();
-    Collection<CoreMetric> metrics = collector.drain();
-
-    CoreMetric baggageMetric = metricFromName(metrics, "context_header_style.injected");
-    assertNotNull(baggageMetric);
-    assertTrue(baggageMetric.value.longValue() >= 1);
-    assertTrue(baggageMetric.tags.contains("header_style:baggage"));
-  }
-
-  @Test
-  void shouldIncrementTelemetryCounterWhenBaggageIsSuccessfullyExtracted() {
-    Config config = mock(Config.class);
-    when(config.isBaggageExtract()).thenReturn(true);
-    when(config.isBaggageInject()).thenReturn(true);
-    when(config.getTraceBaggageMaxItems()).thenReturn(64);
-    when(config.getTraceBaggageMaxBytes()).thenReturn(8192);
-    BaggagePropagator propagator = new BaggagePropagator(config);
-    Context context = Context.root();
-    Map<String, String> carrier = Collections.singletonMap("baggage", "key1=value1,key2=value2");
-    CoreMetricCollector collector = CoreMetricCollector.getInstance();
-
-    propagator.extract(context, carrier, MAP_VISITOR);
-    collector.prepareMetrics();
-    Collection<CoreMetric> metrics = collector.drain();
-
-    CoreMetric baggageMetric = metricFromName(metrics, "context_header_style.extracted");
-    assertNotNull(baggageMetric);
-    assertTrue(baggageMetric.value.longValue() >= 1);
-    assertTrue(baggageMetric.tags.contains("header_style:baggage"));
-  }
-
-  @Test
-  void shouldDirectlyIncrementAllBaggageMetrics() {
-    BaggageMetrics baggageMetrics = BaggageMetrics.getInstance();
-    CoreMetricCollector collector = CoreMetricCollector.getInstance();
-
-    baggageMetrics.onBaggageInjected();
-    baggageMetrics.onBaggageMalformed();
-    baggageMetrics.onBaggageTruncatedByInjectByteLimit();
-    baggageMetrics.onBaggageTruncatedByInjectItemLimit();
-    baggageMetrics.onBaggageTruncatedByExtractByteLimit();
-    baggageMetrics.onBaggageTruncatedByExtractItemLimit();
-    collector.prepareMetrics();
-    Collection<CoreMetric> metrics = collector.drain();
-
-    CoreMetric injectedMetric = metricFromName(metrics, "context_header_style.injected");
-    assertNotNull(injectedMetric);
-    assertEquals(1, injectedMetric.value.longValue());
-    assertTrue(injectedMetric.tags.contains("header_style:baggage"));
-
-    CoreMetric malformedMetric = metricFromName(metrics, "context_header_style.malformed");
-    assertNotNull(malformedMetric);
-    assertEquals(1, malformedMetric.value.longValue());
-    assertTrue(malformedMetric.tags.contains("header_style:baggage"));
-
-    CoreMetric bytesTruncatedMetric =
-        truncateMetricFromName(metrics, "truncation_reason:baggage_byte_count_exceeded");
-    assertNotNull(bytesTruncatedMetric);
-    assertEquals(1, bytesTruncatedMetric.value.longValue());
-
-    CoreMetric itemsTruncatedMetric =
-        truncateMetricFromName(metrics, "truncation_reason:baggage_item_count_exceeded");
-    assertNotNull(itemsTruncatedMetric);
-    assertEquals(1, itemsTruncatedMetric.value.longValue());
-
-    CoreMetric extractBytesTruncatedMetric =
-        truncateMetricFromName(metrics, "truncation_reason:baggage_extract_byte_exceeded");
-    assertNotNull(extractBytesTruncatedMetric);
-    assertEquals(1, extractBytesTruncatedMetric.value.longValue());
-
-    CoreMetric extractItemsTruncatedMetric =
-        truncateMetricFromName(metrics, "truncation_reason:baggage_extract_item_exceeded");
-    assertNotNull(extractItemsTruncatedMetric);
-    assertEquals(1, extractItemsTruncatedMetric.value.longValue());
-  }
-
-  @Test
-  void shouldNotIncrementTelemetryCounterWhenBaggageExtractionFails() {
-    Config config = mock(Config.class);
-    when(config.isBaggageExtract()).thenReturn(true);
-    when(config.isBaggageInject()).thenReturn(true);
-    when(config.getTraceBaggageMaxItems()).thenReturn(64);
-    when(config.getTraceBaggageMaxBytes()).thenReturn(8192);
-    BaggagePropagator propagator = new BaggagePropagator(config);
-    Context context = Context.root();
-    Map<String, String> carrier = Collections.emptyMap();
-    CoreMetricCollector collector = CoreMetricCollector.getInstance();
-
-    propagator.extract(context, carrier, MAP_VISITOR);
-    collector.prepareMetrics();
-    Collection<CoreMetric> metrics = collector.drain();
-
-    List<CoreMetric> foundMetrics =
-        metrics.stream()
-            .filter(m -> m.metricName.startsWith("context_header_style."))
-            .collect(Collectors.toList());
-    assertTrue(foundMetrics.isEmpty());
-  }
-
-  private static @Nullable CoreMetric metricFromName(Collection<CoreMetric> metrics, String name) {
-    return metrics.stream().filter(m -> name.equals(m.metricName)).findFirst().orElse(null);
-  }
-
-  private static @Nullable CoreMetric truncateMetricFromName(
-      Collection<CoreMetric> metrics, String name) {
-    return metrics.stream()
-        .filter(m -> "context_header.truncated".equals(m.metricName) && m.tags.contains(name))
-        .findFirst()
-        .orElse(null);
-  }
+    private static final CarrierVisitor<Map<String, String>> MAP_VISITOR = Map::forEach;
+
+    @BeforeEach
+    void setup() {
+        // Drain any metrics accumulated by other tests
+        CoreMetricCollector.getInstance().prepareMetrics();
+        CoreMetricCollector.getInstance().drain();
+    }
+
+    @Test
+    void shouldDirectlyIncrementBaggageMetrics() {
+        BaggageMetrics baggageMetrics = BaggageMetrics.getInstance();
+        CoreMetricCollector collector = CoreMetricCollector.getInstance();
+
+        baggageMetrics.onBaggageInjected();
+        collector.prepareMetrics();
+        Collection<CoreMetric> metrics = collector.drain();
+
+        CoreMetric baggageMetric = metricFromName(metrics, "context_header_style.injected");
+        assertNotNull(baggageMetric);
+        assertTrue(baggageMetric.value.longValue() >= 1);
+        assertTrue(baggageMetric.tags.contains("header_style:baggage"));
+    }
+
+    @Test
+    void shouldIncrementTelemetryCounterWhenBaggageIsSuccessfullyExtracted() {
+        Config config = mock(Config.class);
+        when(config.isBaggageExtract()).thenReturn(true);
+        when(config.isBaggageInject()).thenReturn(true);
+        when(config.getTraceBaggageMaxItems()).thenReturn(64);
+        when(config.getTraceBaggageMaxBytes()).thenReturn(8192);
+        BaggagePropagator propagator = new BaggagePropagator(config);
+        Context context = Context.root();
+        Map<String, String> carrier = Collections.singletonMap("baggage", "key1=value1,key2=value2");
+        CoreMetricCollector collector = CoreMetricCollector.getInstance();
+
+        propagator.extract(context, carrier, MAP_VISITOR);
+        collector.prepareMetrics();
+        Collection<CoreMetric> metrics = collector.drain();
+
+        CoreMetric baggageMetric = metricFromName(metrics, "context_header_style.extracted");
+        assertNotNull(baggageMetric);
+        assertTrue(baggageMetric.value.longValue() >= 1);
+        assertTrue(baggageMetric.tags.contains("header_style:baggage"));
+    }
+
+    @Test
+    void shouldDirectlyIncrementAllBaggageMetrics() {
+        BaggageMetrics baggageMetrics = BaggageMetrics.getInstance();
+        CoreMetricCollector collector = CoreMetricCollector.getInstance();
+
+        baggageMetrics.onBaggageInjected();
+        baggageMetrics.onBaggageMalformed();
+        baggageMetrics.onBaggageTruncatedByInjectByteLimit();
+        baggageMetrics.onBaggageTruncatedByInjectItemLimit();
+        baggageMetrics.onBaggageTruncatedByExtractByteLimit();
+        baggageMetrics.onBaggageTruncatedByExtractItemLimit();
+        collector.prepareMetrics();
+        Collection<CoreMetric> metrics = collector.drain();
+
+        CoreMetric injectedMetric = metricFromName(metrics, "context_header_style.injected");
+        assertNotNull(injectedMetric);
+        assertEquals(1, injectedMetric.value.longValue());
+        assertTrue(injectedMetric.tags.contains("header_style:baggage"));
+
+        CoreMetric malformedMetric = metricFromName(metrics, "context_header_style.malformed");
+        assertNotNull(malformedMetric);
+        assertEquals(1, malformedMetric.value.longValue());
+        assertTrue(malformedMetric.tags.contains("header_style:baggage"));
+
+        CoreMetric bytesTruncatedMetric =
+                truncateMetricFromName(metrics, "truncation_reason:baggage_byte_count_exceeded");
+        assertNotNull(bytesTruncatedMetric);
+        assertEquals(1, bytesTruncatedMetric.value.longValue());
+
+        CoreMetric itemsTruncatedMetric =
+                truncateMetricFromName(metrics, "truncation_reason:baggage_item_count_exceeded");
+        assertNotNull(itemsTruncatedMetric);
+        assertEquals(1, itemsTruncatedMetric.value.longValue());
+
+        CoreMetric extractBytesTruncatedMetric =
+                truncateMetricFromName(metrics, "truncation_reason:baggage_extract_byte_exceeded");
+        assertNotNull(extractBytesTruncatedMetric);
+        assertEquals(1, extractBytesTruncatedMetric.value.longValue());
+
+        CoreMetric extractItemsTruncatedMetric =
+                truncateMetricFromName(metrics, "truncation_reason:baggage_extract_item_exceeded");
+        assertNotNull(extractItemsTruncatedMetric);
+        assertEquals(1, extractItemsTruncatedMetric.value.longValue());
+    }
+
+    @Test
+    void shouldNotIncrementTelemetryCounterWhenBaggageExtractionFails() {
+        Config config = mock(Config.class);
+        when(config.isBaggageExtract()).thenReturn(true);
+        when(config.isBaggageInject()).thenReturn(true);
+        when(config.getTraceBaggageMaxItems()).thenReturn(64);
+        when(config.getTraceBaggageMaxBytes()).thenReturn(8192);
+        BaggagePropagator propagator = new BaggagePropagator(config);
+        Context context = Context.root();
+        Map<String, String> carrier = Collections.emptyMap();
+        CoreMetricCollector collector = CoreMetricCollector.getInstance();
+
+        propagator.extract(context, carrier, MAP_VISITOR);
+        collector.prepareMetrics();
+        Collection<CoreMetric> metrics = collector.drain();
+
+        List<CoreMetric> foundMetrics = metrics.stream()
+                .filter(m -> m.metricName.startsWith("context_header_style."))
+                .collect(Collectors.toList());
+        assertTrue(foundMetrics.isEmpty());
+    }
+
+    private static @Nullable CoreMetric metricFromName(Collection<CoreMetric> metrics, String name) {
+        return metrics.stream()
+                .filter(m -> name.equals(m.metricName))
+                .findFirst()
+                .orElse(null);
+    }
+
+    private static @Nullable CoreMetric truncateMetricFromName(Collection<CoreMetric> metrics, String name) {
+        return metrics.stream()
+                .filter(m -> "context_header.truncated".equals(m.metricName) && m.tags.contains(name))
+                .findFirst()
+                .orElse(null);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTest.java
index c88aa44ce1e..d0807bc34a7 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTest.java
@@ -21,249 +21,247 @@
 import org.tabletest.junit.TableTest;
 
 class BaggagePropagatorTest extends DDJavaSpecification {
-  private static final int DEFAULT_TRACE_BAGGAGE_MAX_ITEMS = 64;
-  private static final int DEFAULT_TRACE_BAGGAGE_MAX_BYTES = 8192;
-
-  private BaggagePropagator propagator;
-  private CarrierSetter<Map<String, String>> setter;
-  private Map<String, String> carrier;
-  private Context context;
-
-  @ParametersAreNonnullByDefault
-  static class MapCarrierAccessor
-      implements CarrierSetter<Map<String, String>>, CarrierVisitor<Map<String, String>> {
-    @Override
-    public void set(Map<String, String> carrier, String key, String value) {
-      if (carrier != null && key != null && value != null) {
-        carrier.put(key, value);
-      }
+    private static final int DEFAULT_TRACE_BAGGAGE_MAX_ITEMS = 64;
+    private static final int DEFAULT_TRACE_BAGGAGE_MAX_BYTES = 8192;
+
+    private BaggagePropagator propagator;
+    private CarrierSetter<Map<String, String>> setter;
+    private Map<String, String> carrier;
+    private Context context;
+
+    @ParametersAreNonnullByDefault
+    static class MapCarrierAccessor implements CarrierSetter<Map<String, String>>, CarrierVisitor<Map<String, String>> {
+        @Override
+        public void set(Map<String, String> carrier, String key, String value) {
+            if (carrier != null && key != null && value != null) {
+                carrier.put(key, value);
+            }
+        }
+
+        @Override
+        public void forEachKeyValue(Map<String, String> carrier, BiConsumer<String, String> visitor) {
+            carrier.forEach(visitor);
+        }
     }
 
-    @Override
-    public void forEachKeyValue(Map<String, String> carrier, BiConsumer<String, String> visitor) {
-      carrier.forEach(visitor);
+    @BeforeEach
+    void setup() {
+        this.propagator =
+                new BaggagePropagator(true, true, DEFAULT_TRACE_BAGGAGE_MAX_ITEMS, DEFAULT_TRACE_BAGGAGE_MAX_BYTES);
+        this.setter = new MapCarrierAccessor();
+        this.carrier = new HashMap<>();
+        this.context = Context.root();
+    }
+
+    @TableTest({
+      "scenario                      | baggageMap                         | baggageHeader                                                     ",
+      "three entries                 | [key1: val1, key2: val2, foo: bar] | 'key1=val1,key2=val2,foo=bar'                                     ",
+      "special chars are URL encoded | ['\",;\\()/:<=>?@[]{}': '\",;\\']  | '%22%2C%3B%5C%28%29%2F%3A%3C%3D%3E%3F%40%5B%5D%7B%7D=%22%2C%3B%5C'",
+      "single entry                  | [key1: val1]                       | 'key1=val1'                                                       ",
+      "two entries                   | [key1: val1, key2: val2]           | 'key1=val1,key2=val2'                                             ",
+      "space is encoded              | [serverNode: 'DF 28']              | 'serverNode=DF%2028'                                              ",
+      "non ASCII value               | [userId: Amélie]                   | 'userId=Am%C3%A9lie'                                              ",
+      "parenthesis in key            | ['user!d(me)': false]              | 'user!d%28me%29=false'                                            ",
+      "non ASCII heart symbol        | [abcdefg: 'hijklmnopq♥']          | 'abcdefg=hijklmnopq%E2%99%A5'                                     "
+    })
+    void testBaggagePropagatorContextInjection(Map<String, String> baggageMap, String baggageHeader) {
+        this.context = Baggage.create(baggageMap).storeInto(this.context);
+
+        this.propagator.inject(context, carrier, setter);
+
+        assertEquals(baggageHeader, carrier.get(BAGGAGE_KEY));
+    }
+
+    @TableTest({
+      "scenario            | baggage                              | baggageHeader        ",
+      "limit not reached   | [key1: val1, key2: val2]             | 'key1=val1,key2=val2'",
+      "third entry dropped | [key1: val1, key2: val2, key3: val3] | 'key1=val1,key2=val2'"
+    })
+    void testBaggageInjectItemLimit(Map<String, String> baggage, String baggageHeader) {
+        // Creating propagator with test item limit
+        propagator = new BaggagePropagator(true, true, 2, DEFAULT_TRACE_BAGGAGE_MAX_BYTES);
+        context = Baggage.create(baggage).storeInto(context);
+
+        this.propagator.inject(context, carrier, setter);
+
+        assertEquals(baggageHeader, carrier.get(BAGGAGE_KEY));
+    }
+
+    @TableTest({
+      "scenario                                | baggage                              | baggageHeader        ",
+      "limit not reached                       | [key1: val1, key2: val2]             | 'key1=val1,key2=val2'",
+      "third entry exceeds bytes               | [key1: val1, key2: val2, key3: val3] | 'key1=val1,key2=val2'",
+      "single entry exceeds bytes once encoded | [abcdefg: 'hijklmnopq♥']            | ''                   "
+    })
+    void testBaggageInjectBytesLimit(Map<String, String> baggage, String baggageHeader) {
+        // Creating propagator with test bytes limit
+        propagator = new BaggagePropagator(true, true, DEFAULT_TRACE_BAGGAGE_MAX_ITEMS, 20);
+        context = Baggage.create(baggage).storeInto(context);
+
+        this.propagator.inject(context, carrier, setter);
+
+        assertEquals(baggageHeader, carrier.get(BAGGAGE_KEY));
+    }
+
+    @TableTest({
+      "scenario                  | baggageHeader                                                      | baggageMap                        ",
+      "three entries             | 'key1=val1,key2=val2,foo=bar'                                      | [key1: val1, key2: val2, foo: bar]",
+      "URL encoded special chars | '%22%2C%3B%5C%28%29%2F%3A%3C%3D%3E%3F%40%5B%5D%7B%7D=%22%2C%3B%5C' | ['\",;\\()/:<=>?@[]{}': '\",;\\'] "
+    })
+    void testTracingPropagatorContextExtractor(String baggageHeader, Map<String, String> baggageMap) {
+        Map<String, String> headers = singletonMap(BAGGAGE_KEY, baggageHeader);
+
+        context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
+
+        Baggage baggage = Baggage.fromContext(context);
+        assertNotNull(baggage);
+        assertEquals(baggageMap, baggage.asMap());
+    }
+
+    @Test
+    void testExtractingNonAsciiHeaders() {
+        Map<String, String> headers = singletonMap(BAGGAGE_KEY, "key1=vallée,clé2=value");
+
+        context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
+        Baggage baggage = Baggage.fromContext(context);
+
+        // non-ASCII values data are still accessible as part of the API
+        assertNotNull(baggage);
+        assertEquals("vallée", baggage.asMap().get("key1"));
+        assertEquals("value", baggage.asMap().get("clé2"));
+        assertNull(baggage.getW3cHeader());
+
+        this.propagator.inject(Context.root().with(baggage), carrier, setter);
+
+        // baggage are URL encoded if not valid, even if not modified
+        assertEquals("key1=vall%C3%A9e,cl%C3%A92=value", carrier.get(BAGGAGE_KEY));
+    }
+
+    @TableTest({
+      "scenario                    | baggageHeader                                                      ",
+      "no equal sign in first pair | 'no-equal-sign,foo=gets-dropped-because-previous-pair-is-malformed'",
+      "trailing equals only        | 'foo=gets-dropped-because-subsequent-pair-is-malformed,='          ",
+      "empty key                   | '=no-key'                                                          ",
+      "empty value                 | 'no-value='                                                        ",
+      "empty header                | ''                                                                 ",
+      "only delimiters             | ',,'                                                               ",
+      "single equal sign           | '='                                                                "
+    })
+    void extractInvalidBaggageHeaders(String baggageHeader) {
+        Map<String, String> headers = singletonMap(BAGGAGE_KEY, baggageHeader);
+
+        context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
+
+        assertNull(Baggage.fromContext(context));
+    }
+
+    @TableTest({
+      "scenario                  | baggageHeader                 | cachedString                 ",
+      "valid header is cached    | 'key1=val1,key2=val2,foo=bar' | 'key1=val1,key2=val2,foo=bar'",
+      "invalid chars => no cache | '\";\\()/:<=>?@[]{}=\";\\'    |                              "
+    })
+    void testBaggageCache(String baggageHeader, String cachedString) {
+        Map<String, String> headers = singletonMap(BAGGAGE_KEY, baggageHeader);
+
+        context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
+
+        Baggage baggage = Baggage.fromContext(context);
+        assertNotNull(baggage);
+        assertEquals(cachedString, baggage.getW3cHeader());
+    }
+
+    @TableTest({
+      "scenario               | baggageHeader                             | cachedString         ",
+      "limit not reached      | 'key1=val1,key2=val2'                     | 'key1=val1,key2=val2'",
+      "third entry truncates  | 'key1=val1,key2=val2,key3=val3'           | 'key1=val1,key2=val2'",
+      "fourth entry truncates | 'key1=val1,key2=val2,key3=val3,key4=val4' | 'key1=val1,key2=val2'"
+    })
+    void testBaggageCacheItemsLimit(String baggageHeader, String cachedString) {
+        // creating a new instance after injecting config
+        propagator = new BaggagePropagator(true, true, 2, DEFAULT_TRACE_BAGGAGE_MAX_BYTES);
+        Map<String, String> headers = singletonMap(BAGGAGE_KEY, baggageHeader);
+
+        context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
+
+        Baggage baggage = Baggage.fromContext(context);
+        assertNotNull(baggage);
+        assertEquals(cachedString, baggage.getW3cHeader());
+    }
+
+    @TableTest({
+      "scenario              | baggageHeader                   | cachedString         ",
+      "limit not reached     | 'key1=val1,key2=val2'           | 'key1=val1,key2=val2'",
+      "third entry truncates | 'key1=val1,key2=val2,key3=val3' | 'key1=val1,key2=val2'"
+    })
+    void testBaggageCacheBytesLimit(String baggageHeader, String cachedString) {
+        // Creating propagator with test bytes limit
+        propagator = new BaggagePropagator(true, true, DEFAULT_TRACE_BAGGAGE_MAX_ITEMS, 20);
+        Map<String, String> headers = singletonMap(BAGGAGE_KEY, baggageHeader);
+
+        context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
+
+        Baggage baggage = Baggage.fromContext(context);
+        assertNotNull(baggage);
+        assertEquals(cachedString, baggage.getW3cHeader());
+    }
+
+    @TableTest({
+      "scenario            | baggageHeader                   | baggageMap              ",
+      "single entry        | 'key1=val1'                     | [key1: val1]            ",
+      "two entries         | 'key1=val1,key2=val2'           | [key1: val1, key2: val2]",
+      "third entry dropped | 'key1=val1,key2=val2,key3=val3' | [key1: val1, key2: val2]"
+    })
+    void testBaggageExtractItemsLimit(String baggageHeader, Map<String, String> baggageMap) {
+        // Creating propagator with test item limit
+        propagator = new BaggagePropagator(true, true, 2, DEFAULT_TRACE_BAGGAGE_MAX_BYTES);
+        Map<String, String> headers = singletonMap(BAGGAGE_KEY, baggageHeader);
+
+        context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
+
+        // parsing stops once the item limit is exceeded
+        Baggage baggage = Baggage.fromContext(context);
+        assertNotNull(baggage);
+        assertEquals(baggageMap, baggage.asMap());
+    }
+
+    @TableTest({
+      "scenario            | baggageHeader                   | baggageMap              ",
+      "single entry        | 'key1=val1'                     | [key1: val1]            ",
+      "two entries         | 'key1=val1,key2=val2'           | [key1: val1, key2: val2]",
+      "third entry dropped | 'key1=val1,key2=val2,key3=val3' | [key1: val1, key2: val2]"
+    })
+    void testBaggageExtractBytesLimit(String baggageHeader, Map<String, String> baggageMap) {
+        // Creating propagator with test bytes limit
+        propagator = new BaggagePropagator(true, true, DEFAULT_TRACE_BAGGAGE_MAX_ITEMS, 20);
+        Map<String, String> headers = singletonMap(BAGGAGE_KEY, baggageHeader);
+
+        context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
+
+        // parsing stops once the byte limit is exceeded
+        Baggage baggage = Baggage.fromContext(context);
+        assertNotNull(baggage);
+        assertEquals(baggageMap, baggage.asMap());
+    }
+
+    @Test
+    void testBaggageExtract0ItemLimit() {
+        // creating a new instance after injecting config
+        propagator = new BaggagePropagator(true, true, 0, DEFAULT_TRACE_BAGGAGE_MAX_BYTES);
+        Map<String, String> headers = singletonMap(BAGGAGE_KEY, "key1=value1");
+
+        context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
+
+        assertNull(Baggage.fromContext(context));
+    }
+
+    @Test
+    void testBaggageExtract0ByteLimit() {
+        // creating a new instance after injecting config
+        propagator = new BaggagePropagator(true, true, DEFAULT_TRACE_BAGGAGE_MAX_ITEMS, 0);
+        Map<String, String> headers = singletonMap(BAGGAGE_KEY, "key1=value1");
+
+        context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
+
+        assertNull(Baggage.fromContext(context));
     }
-  }
-
-  @BeforeEach
-  void setup() {
-    this.propagator =
-        new BaggagePropagator(
-            true, true, DEFAULT_TRACE_BAGGAGE_MAX_ITEMS, DEFAULT_TRACE_BAGGAGE_MAX_BYTES);
-    this.setter = new MapCarrierAccessor();
-    this.carrier = new HashMap<>();
-    this.context = Context.root();
-  }
-
-  @TableTest({
-    "scenario                      | baggageMap                         | baggageHeader                                                     ",
-    "three entries                 | [key1: val1, key2: val2, foo: bar] | 'key1=val1,key2=val2,foo=bar'                                     ",
-    "special chars are URL encoded | ['\",;\\()/:<=>?@[]{}': '\",;\\']  | '%22%2C%3B%5C%28%29%2F%3A%3C%3D%3E%3F%40%5B%5D%7B%7D=%22%2C%3B%5C'",
-    "single entry                  | [key1: val1]                       | 'key1=val1'                                                       ",
-    "two entries                   | [key1: val1, key2: val2]           | 'key1=val1,key2=val2'                                             ",
-    "space is encoded              | [serverNode: 'DF 28']              | 'serverNode=DF%2028'                                              ",
-    "non ASCII value               | [userId: Amélie]                   | 'userId=Am%C3%A9lie'                                              ",
-    "parenthesis in key            | ['user!d(me)': false]              | 'user!d%28me%29=false'                                            ",
-    "non ASCII heart symbol        | [abcdefg: 'hijklmnopq♥']          | 'abcdefg=hijklmnopq%E2%99%A5'                                     "
-  })
-  void testBaggagePropagatorContextInjection(Map<String, String> baggageMap, String baggageHeader) {
-    this.context = Baggage.create(baggageMap).storeInto(this.context);
-
-    this.propagator.inject(context, carrier, setter);
-
-    assertEquals(baggageHeader, carrier.get(BAGGAGE_KEY));
-  }
-
-  @TableTest({
-    "scenario            | baggage                              | baggageHeader        ",
-    "limit not reached   | [key1: val1, key2: val2]             | 'key1=val1,key2=val2'",
-    "third entry dropped | [key1: val1, key2: val2, key3: val3] | 'key1=val1,key2=val2'"
-  })
-  void testBaggageInjectItemLimit(Map<String, String> baggage, String baggageHeader) {
-    // Creating propagator with test item limit
-    propagator = new BaggagePropagator(true, true, 2, DEFAULT_TRACE_BAGGAGE_MAX_BYTES);
-    context = Baggage.create(baggage).storeInto(context);
-
-    this.propagator.inject(context, carrier, setter);
-
-    assertEquals(baggageHeader, carrier.get(BAGGAGE_KEY));
-  }
-
-  @TableTest({
-    "scenario                                | baggage                              | baggageHeader        ",
-    "limit not reached                       | [key1: val1, key2: val2]             | 'key1=val1,key2=val2'",
-    "third entry exceeds bytes               | [key1: val1, key2: val2, key3: val3] | 'key1=val1,key2=val2'",
-    "single entry exceeds bytes once encoded | [abcdefg: 'hijklmnopq♥']            | ''                   "
-  })
-  void testBaggageInjectBytesLimit(Map<String, String> baggage, String baggageHeader) {
-    // Creating propagator with test bytes limit
-    propagator = new BaggagePropagator(true, true, DEFAULT_TRACE_BAGGAGE_MAX_ITEMS, 20);
-    context = Baggage.create(baggage).storeInto(context);
-
-    this.propagator.inject(context, carrier, setter);
-
-    assertEquals(baggageHeader, carrier.get(BAGGAGE_KEY));
-  }
-
-  @TableTest({
-    "scenario                  | baggageHeader                                                      | baggageMap                        ",
-    "three entries             | 'key1=val1,key2=val2,foo=bar'                                      | [key1: val1, key2: val2, foo: bar]",
-    "URL encoded special chars | '%22%2C%3B%5C%28%29%2F%3A%3C%3D%3E%3F%40%5B%5D%7B%7D=%22%2C%3B%5C' | ['\",;\\()/:<=>?@[]{}': '\",;\\'] "
-  })
-  void testTracingPropagatorContextExtractor(String baggageHeader, Map<String, String> baggageMap) {
-    Map<String, String> headers = singletonMap(BAGGAGE_KEY, baggageHeader);
-
-    context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
-
-    Baggage baggage = Baggage.fromContext(context);
-    assertNotNull(baggage);
-    assertEquals(baggageMap, baggage.asMap());
-  }
-
-  @Test
-  void testExtractingNonAsciiHeaders() {
-    Map<String, String> headers = singletonMap(BAGGAGE_KEY, "key1=vallée,clé2=value");
-
-    context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
-    Baggage baggage = Baggage.fromContext(context);
-
-    // non-ASCII values data are still accessible as part of the API
-    assertNotNull(baggage);
-    assertEquals("vallée", baggage.asMap().get("key1"));
-    assertEquals("value", baggage.asMap().get("clé2"));
-    assertNull(baggage.getW3cHeader());
-
-    this.propagator.inject(Context.root().with(baggage), carrier, setter);
-
-    // baggage are URL encoded if not valid, even if not modified
-    assertEquals("key1=vall%C3%A9e,cl%C3%A92=value", carrier.get(BAGGAGE_KEY));
-  }
-
-  @TableTest({
-    "scenario                    | baggageHeader                                                      ",
-    "no equal sign in first pair | 'no-equal-sign,foo=gets-dropped-because-previous-pair-is-malformed'",
-    "trailing equals only        | 'foo=gets-dropped-because-subsequent-pair-is-malformed,='          ",
-    "empty key                   | '=no-key'                                                          ",
-    "empty value                 | 'no-value='                                                        ",
-    "empty header                | ''                                                                 ",
-    "only delimiters             | ',,'                                                               ",
-    "single equal sign           | '='                                                                "
-  })
-  void extractInvalidBaggageHeaders(String baggageHeader) {
-    Map<String, String> headers = singletonMap(BAGGAGE_KEY, baggageHeader);
-
-    context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
-
-    assertNull(Baggage.fromContext(context));
-  }
-
-  @TableTest({
-    "scenario                  | baggageHeader                 | cachedString                 ",
-    "valid header is cached    | 'key1=val1,key2=val2,foo=bar' | 'key1=val1,key2=val2,foo=bar'",
-    "invalid chars => no cache | '\";\\()/:<=>?@[]{}=\";\\'    |                              "
-  })
-  void testBaggageCache(String baggageHeader, String cachedString) {
-    Map<String, String> headers = singletonMap(BAGGAGE_KEY, baggageHeader);
-
-    context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
-
-    Baggage baggage = Baggage.fromContext(context);
-    assertNotNull(baggage);
-    assertEquals(cachedString, baggage.getW3cHeader());
-  }
-
-  @TableTest({
-    "scenario               | baggageHeader                             | cachedString         ",
-    "limit not reached      | 'key1=val1,key2=val2'                     | 'key1=val1,key2=val2'",
-    "third entry truncates  | 'key1=val1,key2=val2,key3=val3'           | 'key1=val1,key2=val2'",
-    "fourth entry truncates | 'key1=val1,key2=val2,key3=val3,key4=val4' | 'key1=val1,key2=val2'"
-  })
-  void testBaggageCacheItemsLimit(String baggageHeader, String cachedString) {
-    // creating a new instance after injecting config
-    propagator = new BaggagePropagator(true, true, 2, DEFAULT_TRACE_BAGGAGE_MAX_BYTES);
-    Map<String, String> headers = singletonMap(BAGGAGE_KEY, baggageHeader);
-
-    context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
-
-    Baggage baggage = Baggage.fromContext(context);
-    assertNotNull(baggage);
-    assertEquals(cachedString, baggage.getW3cHeader());
-  }
-
-  @TableTest({
-    "scenario              | baggageHeader                   | cachedString         ",
-    "limit not reached     | 'key1=val1,key2=val2'           | 'key1=val1,key2=val2'",
-    "third entry truncates | 'key1=val1,key2=val2,key3=val3' | 'key1=val1,key2=val2'"
-  })
-  void testBaggageCacheBytesLimit(String baggageHeader, String cachedString) {
-    // Creating propagator with test bytes limit
-    propagator = new BaggagePropagator(true, true, DEFAULT_TRACE_BAGGAGE_MAX_ITEMS, 20);
-    Map<String, String> headers = singletonMap(BAGGAGE_KEY, baggageHeader);
-
-    context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
-
-    Baggage baggage = Baggage.fromContext(context);
-    assertNotNull(baggage);
-    assertEquals(cachedString, baggage.getW3cHeader());
-  }
-
-  @TableTest({
-    "scenario            | baggageHeader                   | baggageMap              ",
-    "single entry        | 'key1=val1'                     | [key1: val1]            ",
-    "two entries         | 'key1=val1,key2=val2'           | [key1: val1, key2: val2]",
-    "third entry dropped | 'key1=val1,key2=val2,key3=val3' | [key1: val1, key2: val2]"
-  })
-  void testBaggageExtractItemsLimit(String baggageHeader, Map<String, String> baggageMap) {
-    // Creating propagator with test item limit
-    propagator = new BaggagePropagator(true, true, 2, DEFAULT_TRACE_BAGGAGE_MAX_BYTES);
-    Map<String, String> headers = singletonMap(BAGGAGE_KEY, baggageHeader);
-
-    context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
-
-    // parsing stops once the item limit is exceeded
-    Baggage baggage = Baggage.fromContext(context);
-    assertNotNull(baggage);
-    assertEquals(baggageMap, baggage.asMap());
-  }
-
-  @TableTest({
-    "scenario            | baggageHeader                   | baggageMap              ",
-    "single entry        | 'key1=val1'                     | [key1: val1]            ",
-    "two entries         | 'key1=val1,key2=val2'           | [key1: val1, key2: val2]",
-    "third entry dropped | 'key1=val1,key2=val2,key3=val3' | [key1: val1, key2: val2]"
-  })
-  void testBaggageExtractBytesLimit(String baggageHeader, Map<String, String> baggageMap) {
-    // Creating propagator with test bytes limit
-    propagator = new BaggagePropagator(true, true, DEFAULT_TRACE_BAGGAGE_MAX_ITEMS, 20);
-    Map<String, String> headers = singletonMap(BAGGAGE_KEY, baggageHeader);
-
-    context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
-
-    // parsing stops once the byte limit is exceeded
-    Baggage baggage = Baggage.fromContext(context);
-    assertNotNull(baggage);
-    assertEquals(baggageMap, baggage.asMap());
-  }
-
-  @Test
-  void testBaggageExtract0ItemLimit() {
-    // creating a new instance after injecting config
-    propagator = new BaggagePropagator(true, true, 0, DEFAULT_TRACE_BAGGAGE_MAX_BYTES);
-    Map<String, String> headers = singletonMap(BAGGAGE_KEY, "key1=value1");
-
-    context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
-
-    assertNull(Baggage.fromContext(context));
-  }
-
-  @Test
-  void testBaggageExtract0ByteLimit() {
-    // creating a new instance after injecting config
-    propagator = new BaggagePropagator(true, true, DEFAULT_TRACE_BAGGAGE_MAX_ITEMS, 0);
-    Map<String, String> headers = singletonMap(BAGGAGE_KEY, "key1=value1");
-
-    context = this.propagator.extract(context, headers, ContextVisitors.stringValuesMap());
-
-    assertNull(Baggage.fromContext(context));
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/CheckpointerTest.java b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/CheckpointerTest.java
index 9fd36af327d..6b511eeb3e0 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/CheckpointerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/CheckpointerTest.java
@@ -21,44 +21,43 @@
 // Enable DSM
 @WithConfig(key = DATA_STREAMS_ENABLED, value = "true")
 public class CheckpointerTest extends DDCoreJavaSpecification {
-  @Test
-  void testSettingProduceAndConsumeCheckpoint() {
-    // Create a test tracer
-    CoreTracer tracer = tracerBuilder().build();
-    AgentTracer.forceRegister(tracer);
-    // Get the test checkpointer
-    DataStreamsCheckpointer checkpointer = tracer.getDataStreamsCheckpointer();
-    // Declare the carrier to test injected data
-    CustomContextCarrier carrier = new CustomContextCarrier();
-    // Start and activate a span
-    AgentSpan span = tracer.buildSpan("test", "dsm-checkpoint").start();
-    ContextScope scope = tracer.activateSpan(span);
-
-    // Trigger produce checkpoint
-    checkpointer.setProduceCheckpoint("kafka", "testTopic", carrier);
-    checkpointer.setConsumeCheckpoint("kafka", "testTopic", carrier);
-    // Clean up span
-    scope.close();
-    span.finish();
-
-    boolean hasPathwayCtxBase64 =
-        carrier.entries().stream()
-            .anyMatch(entry -> "dd-pathway-ctx-base64".equals(entry.getKey()));
-    assertTrue(hasPathwayCtxBase64);
-    assertNotEquals(0L, ((DDSpan) span).spanContext().getPathwayContext().getHash());
-  }
+    @Test
+    void testSettingProduceAndConsumeCheckpoint() {
+        // Create a test tracer
+        CoreTracer tracer = tracerBuilder().build();
+        AgentTracer.forceRegister(tracer);
+        // Get the test checkpointer
+        DataStreamsCheckpointer checkpointer = tracer.getDataStreamsCheckpointer();
+        // Declare the carrier to test injected data
+        CustomContextCarrier carrier = new CustomContextCarrier();
+        // Start and activate a span
+        AgentSpan span = tracer.buildSpan("test", "dsm-checkpoint").start();
+        ContextScope scope = tracer.activateSpan(span);
+
+        // Trigger produce checkpoint
+        checkpointer.setProduceCheckpoint("kafka", "testTopic", carrier);
+        checkpointer.setConsumeCheckpoint("kafka", "testTopic", carrier);
+        // Clean up span
+        scope.close();
+        span.finish();
+
+        boolean hasPathwayCtxBase64 =
+                carrier.entries().stream().anyMatch(entry -> "dd-pathway-ctx-base64".equals(entry.getKey()));
+        assertTrue(hasPathwayCtxBase64);
+        assertNotEquals(0L, ((DDSpan) span).spanContext().getPathwayContext().getHash());
+    }
 
-  static class CustomContextCarrier implements DataStreamsContextCarrier {
-    private final Map<String, Object> data = new HashMap<>();
+    static class CustomContextCarrier implements DataStreamsContextCarrier {
+        private final Map<String, Object> data = new HashMap<>();
 
-    @Override
-    public Set<Map.Entry<String, Object>> entries() {
-      return data.entrySet();
-    }
+        @Override
+        public Set<Map.Entry<String, Object>> entries() {
+            return data.entrySet();
+        }
 
-    @Override
-    public void set(String key, String value) {
-      data.put(key, value);
+        @Override
+        public void set(String key, String value) {
+            data.put(key, value);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DataStreamsTransactionExtractorsTest.java b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DataStreamsTransactionExtractorsTest.java
index 51205505225..e032c538771 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DataStreamsTransactionExtractorsTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DataStreamsTransactionExtractorsTest.java
@@ -14,82 +14,75 @@
 import org.junit.jupiter.api.Test;
 
 public class DataStreamsTransactionExtractorsTest extends DDCoreJavaSpecification {
-  @Test
-  void deserializeFromJson() {
-    DataStreamsTransactionExtractors list =
-        DataStreamsTransactionExtractors.deserialize(
-            "[\n"
+    @Test
+    void deserializeFromJson() {
+        DataStreamsTransactionExtractors list = DataStreamsTransactionExtractors.deserialize("[\n"
                 + "  {\"name\": \"extractor\", \"type\": \"HTTP_OUT_HEADERS\", \"value\": \"transaction_id\"},\n"
                 + "  {\"name\": \"second_extractor\", \"type\": \"HTTP_IN_HEADERS\", \"value\": \"transaction_id\"}\n"
                 + "]");
-    List<DataStreamsTransactionExtractor> extractors = list.getExtractors();
-
-    assertEquals(2, extractors.size());
-    assertEquals("extractor", extractors.get(0).getName());
-    assertEquals(HTTP_OUT_HEADERS, extractors.get(0).getType());
-    assertEquals("transaction_id", extractors.get(0).getValue());
-    assertEquals("second_extractor", extractors.get(1).getName());
-    assertEquals(HTTP_IN_HEADERS, extractors.get(1).getType());
-    assertEquals("transaction_id", extractors.get(1).getValue());
-  }
-
-  @Test
-  void deserializeKafkaTypes() {
-    DataStreamsTransactionExtractors list =
-        DataStreamsTransactionExtractors.deserialize(
-            "["
+        List<DataStreamsTransactionExtractor> extractors = list.getExtractors();
+
+        assertEquals(2, extractors.size());
+        assertEquals("extractor", extractors.get(0).getName());
+        assertEquals(HTTP_OUT_HEADERS, extractors.get(0).getType());
+        assertEquals("transaction_id", extractors.get(0).getValue());
+        assertEquals("second_extractor", extractors.get(1).getName());
+        assertEquals(HTTP_IN_HEADERS, extractors.get(1).getType());
+        assertEquals("transaction_id", extractors.get(1).getValue());
+    }
+
+    @Test
+    void deserializeKafkaTypes() {
+        DataStreamsTransactionExtractors list = DataStreamsTransactionExtractors.deserialize("["
                 + "{\"name\": \"consume\", \"type\": \"KAFKA_CONSUME_HEADERS\", \"value\": \"txn\"},"
                 + "{\"name\": \"produce\", \"type\": \"KAFKA_PRODUCE_HEADERS\", \"value\": \"txn\"}"
                 + "]");
-    List<DataStreamsTransactionExtractor> extractors = list.getExtractors();
-
-    assertEquals(2, extractors.size());
-    assertEquals(KAFKA_CONSUME_HEADERS, extractors.get(0).getType());
-    assertEquals(KAFKA_PRODUCE_HEADERS, extractors.get(1).getType());
-  }
-
-  @Test
-  void deserializeUnknownTypeReturnsEmpty() {
-    DataStreamsTransactionExtractors list =
-        DataStreamsTransactionExtractors.deserialize(
-            "[{\"name\": \"ext\", \"type\": \"NOT_A_REAL_TYPE\", \"value\": \"v\"}]");
-
-    assertSame(DataStreamsTransactionExtractors.EMPTY, list);
-    assertTrue(list.getExtractors().isEmpty());
-  }
-
-  @Test
-  void deserializeEmptyArrayReturnsEmptyList() {
-    DataStreamsTransactionExtractors list = DataStreamsTransactionExtractors.deserialize("[]");
-
-    assertTrue(list.getExtractors().isEmpty());
-  }
-
-  @Test
-  void deserializeInvalidJsonReturnsEmpty() {
-    DataStreamsTransactionExtractors list =
-        DataStreamsTransactionExtractors.deserialize("not valid json");
-
-    assertSame(DataStreamsTransactionExtractors.EMPTY, list);
-    assertTrue(list.getExtractors().isEmpty());
-  }
-
-  @Test
-  void deserializeNullJsonReturnsEmpty() {
-    DataStreamsTransactionExtractors list = DataStreamsTransactionExtractors.deserialize("null");
-
-    assertTrue(list.getExtractors().isEmpty());
-  }
-
-  @Test
-  void implToStringContainsFields() {
-    DataStreamsTransactionExtractors list =
-        DataStreamsTransactionExtractors.deserialize(
-            "[{\"name\": \"myext\", \"type\": \"HTTP_OUT_HEADERS\", \"value\": \"myval\"}]");
-    String str = list.getExtractors().get(0).toString();
-
-    assertTrue(str.contains("myext"));
-    assertTrue(str.contains("HTTP_OUT_HEADERS"));
-    assertTrue(str.contains("myval"));
-  }
+        List<DataStreamsTransactionExtractor> extractors = list.getExtractors();
+
+        assertEquals(2, extractors.size());
+        assertEquals(KAFKA_CONSUME_HEADERS, extractors.get(0).getType());
+        assertEquals(KAFKA_PRODUCE_HEADERS, extractors.get(1).getType());
+    }
+
+    @Test
+    void deserializeUnknownTypeReturnsEmpty() {
+        DataStreamsTransactionExtractors list = DataStreamsTransactionExtractors.deserialize(
+                "[{\"name\": \"ext\", \"type\": \"NOT_A_REAL_TYPE\", \"value\": \"v\"}]");
+
+        assertSame(DataStreamsTransactionExtractors.EMPTY, list);
+        assertTrue(list.getExtractors().isEmpty());
+    }
+
+    @Test
+    void deserializeEmptyArrayReturnsEmptyList() {
+        DataStreamsTransactionExtractors list = DataStreamsTransactionExtractors.deserialize("[]");
+
+        assertTrue(list.getExtractors().isEmpty());
+    }
+
+    @Test
+    void deserializeInvalidJsonReturnsEmpty() {
+        DataStreamsTransactionExtractors list = DataStreamsTransactionExtractors.deserialize("not valid json");
+
+        assertSame(DataStreamsTransactionExtractors.EMPTY, list);
+        assertTrue(list.getExtractors().isEmpty());
+    }
+
+    @Test
+    void deserializeNullJsonReturnsEmpty() {
+        DataStreamsTransactionExtractors list = DataStreamsTransactionExtractors.deserialize("null");
+
+        assertTrue(list.getExtractors().isEmpty());
+    }
+
+    @Test
+    void implToStringContainsFields() {
+        DataStreamsTransactionExtractors list = DataStreamsTransactionExtractors.deserialize(
+                "[{\"name\": \"myext\", \"type\": \"HTTP_OUT_HEADERS\", \"value\": \"myval\"}]");
+        String str = list.getExtractors().get(0).toString();
+
+        assertTrue(str.contains("myext"));
+        assertTrue(str.contains("HTTP_OUT_HEADERS"));
+        assertTrue(str.contains("myval"));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DataStreamsWritingTest.java b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DataStreamsWritingTest.java
index 9b989a69ef3..d59bd358f15 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DataStreamsWritingTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DataStreamsWritingTest.java
@@ -50,715 +50,660 @@
  */
 public class DataStreamsWritingTest extends DDCoreJavaSpecification {
 
-  private static long defaultBucketDurationNanos;
-
-  private static JavaTestHttpServer server;
-  private static HttpUrl serverAddress;
-  private static List<byte[]> requestBodies;
-
-  @BeforeAll
-  static void startServer() {
-    defaultBucketDurationNanos = Config.get().getDataStreamsBucketDurationNanoseconds();
-    requestBodies = new CopyOnWriteArrayList<>();
-    server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.post(
-                            DDAgentFeaturesDiscovery.V01_DATASTREAMS_ENDPOINT,
-                            api -> {
-                              requestBodies.add(api.getRequest().getBody());
-                              api.getResponse().status(200).send();
-                            })));
-    serverAddress = HttpUrl.get(server.getAddress());
-  }
-
-  @AfterAll
-  static void stopServer() {
-    if (server != null) {
-      server.close();
+    private static long defaultBucketDurationNanos;
+
+    private static JavaTestHttpServer server;
+    private static HttpUrl serverAddress;
+    private static List<byte[]> requestBodies;
+
+    @BeforeAll
+    static void startServer() {
+        defaultBucketDurationNanos = Config.get().getDataStreamsBucketDurationNanoseconds();
+        requestBodies = new CopyOnWriteArrayList<>();
+        server = JavaTestHttpServer.httpServer(s ->
+                s.handlers(h -> h.post(DDAgentFeaturesDiscovery.V01_DATASTREAMS_ENDPOINT, api -> {
+                    requestBodies.add(api.getRequest().getBody());
+                    api.getResponse().status(200).send();
+                })));
+        serverAddress = HttpUrl.get(server.getAddress());
     }
-  }
 
-  @BeforeEach
-  void resetRequestBodies() {
-    requestBodies.clear();
-  }
-
-  private static void awaitOneRequestBody() throws InterruptedException {
-    long deadline = System.currentTimeMillis() + 2000;
-    while (requestBodies.size() < 1 && System.currentTimeMillis() < deadline) {
-      Thread.sleep(20);
+    @AfterAll
+    static void stopServer() {
+        if (server != null) {
+            server.close();
+        }
     }
-    assertEquals(1, requestBodies.size());
-  }
-
-  @Test
-  void serviceOverridesSplitBuckets() throws InterruptedException, IOException {
-    WellKnownTags wellKnownTags =
-        new WellKnownTags(
-            "runtimeid", "hostname", "test", Config.get().getServiceName(), "version", "java");
-    Config fakeConfig = mock(Config.class);
-    when(fakeConfig.getAgentUrl()).thenReturn(serverAddress.toString());
-    when(fakeConfig.getWellKnownTags()).thenReturn(wellKnownTags);
-    when(fakeConfig.getPrimaryTag()).thenReturn("region-1");
-
-    OkHttpClient testOkhttpClient = OkHttpUtils.buildHttpClient(serverAddress, 5000L);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsDataStreams()).thenReturn(true);
-    SharedCommunicationObjects sharedCommObjects = new SharedCommunicationObjects();
-    sharedCommObjects.setFeaturesDiscovery(features);
-    sharedCommObjects.agentHttpClient = testOkhttpClient;
-    sharedCommObjects.createRemaining(fakeConfig);
-
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    TraceConfig traceConfig = mock(TraceConfig.class);
-    when(traceConfig.isDataStreamsEnabled()).thenReturn(true);
-    String serviceNameOverride = "service-name-override";
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            fakeConfig, sharedCommObjects, timeSource, () -> traceConfig);
-    dataStreams.start();
-    dataStreams.setThreadServiceName(serviceNameOverride);
-    dataStreams.add(
-        new StatsPoint(
-            DataStreamsTags.create(null, null),
-            9,
-            0,
-            10,
-            timeSource.getCurrentTimeNanos(),
-            0,
-            0,
-            0,
-            serviceNameOverride));
-    dataStreams.trackBacklog(
-        DataStreamsTags.createWithPartition("kafka_produce", "testTopic", "1", null, null), 130);
-    timeSource.advance(defaultBucketDurationNanos);
-    // force flush
-    dataStreams.report();
-    dataStreams.close();
-    dataStreams.clearThreadServiceName();
-
-    awaitOneRequestBody();
-    GzipSource gzipSource =
-        new GzipSource(Okio.source(new ByteArrayInputStream(requestBodies.get(0))));
-    BufferedSource bufferedSource = Okio.buffer(gzipSource);
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bufferedSource.inputStream());
-
-    assertEquals(9, unpacker.unpackMapHeader());
-    assertEquals("Env", unpacker.unpackString());
-    assertEquals("test", unpacker.unpackString());
-    assertEquals("Service", unpacker.unpackString());
-    assertEquals(serviceNameOverride, unpacker.unpackString());
-  }
-
-  @ParameterizedTest(name = "Write bucket to mock server with process tags enabled {0}")
-  @ValueSource(booleans = {true, false})
-  void writeBucketToMockServer(boolean processTagsEnabled)
-      throws InterruptedException, IOException {
-    WithConfigExtension.injectSysConfig(
-        EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, Boolean.toString(processTagsEnabled));
-    ProcessTags.reset(Config.get());
-
-    WellKnownTags wellKnownTags =
-        new WellKnownTags(
-            "runtimeid", "hostname", "test", Config.get().getServiceName(), "version", "java");
-    Config fakeConfig = mock(Config.class);
-    when(fakeConfig.getAgentUrl()).thenReturn(serverAddress.toString());
-    when(fakeConfig.getWellKnownTags()).thenReturn(wellKnownTags);
-    when(fakeConfig.getPrimaryTag()).thenReturn("region-1");
-
-    OkHttpClient testOkhttpClient = OkHttpUtils.buildHttpClient(serverAddress, 5000L);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsDataStreams()).thenReturn(true);
-    SharedCommunicationObjects sharedCommObjects = new SharedCommunicationObjects();
-    sharedCommObjects.setFeaturesDiscovery(features);
-    sharedCommObjects.agentHttpClient = testOkhttpClient;
-    sharedCommObjects.createRemaining(fakeConfig);
-
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    TraceConfig traceConfig = mock(TraceConfig.class);
-    when(traceConfig.isDataStreamsEnabled()).thenReturn(true);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            fakeConfig, sharedCommObjects, timeSource, () -> traceConfig);
-    try {
-      dataStreams.start();
-      dataStreams.add(
-          new StatsPoint(
-              DataStreamsTags.create(null, null),
-              9,
-              0,
-              10,
-              timeSource.getCurrentTimeNanos(),
-              0,
-              0,
-              0,
-              null));
-      dataStreams.add(
-          new StatsPoint(
-              DataStreamsTags.create(
-                  "testType", DataStreamsTags.Direction.INBOUND, "testTopic", "testGroup", null),
-              1,
-              2,
-              5,
-              timeSource.getCurrentTimeNanos(),
-              0,
-              0,
-              0,
-              null));
-      dataStreams.trackBacklog(
-          DataStreamsTags.createWithPartition("kafka_produce", "testTopic", "1", null, null), 100);
-      dataStreams.trackBacklog(
-          DataStreamsTags.createWithPartition("kafka_produce", "testTopic", "1", null, null), 130);
-      timeSource.advance(defaultBucketDurationNanos - 100L);
-      dataStreams.add(
-          new StatsPoint(
-              DataStreamsTags.create(
-                  "testType", DataStreamsTags.Direction.INBOUND, "testTopic", "testGroup", null),
-              1,
-              2,
-              5,
-              timeSource.getCurrentTimeNanos(),
-              SECONDS.toNanos(10),
-              SECONDS.toNanos(10),
-              10,
-              null));
-      timeSource.advance(defaultBucketDurationNanos);
-      dataStreams.add(
-          new StatsPoint(
-              DataStreamsTags.create(
-                  "testType", DataStreamsTags.Direction.INBOUND, "testTopic", "testGroup", null),
-              1,
-              2,
-              5,
-              timeSource.getCurrentTimeNanos(),
-              SECONDS.toNanos(5),
-              SECONDS.toNanos(5),
-              5,
-              null));
-      dataStreams.add(
-          new StatsPoint(
-              DataStreamsTags.create(
-                  "testType", DataStreamsTags.Direction.INBOUND, "testTopic2", "testGroup", null),
-              3,
-              4,
-              6,
-              timeSource.getCurrentTimeNanos(),
-              SECONDS.toNanos(2),
-              0,
-              2,
-              null));
-      timeSource.advance(defaultBucketDurationNanos);
-      dataStreams.close();
-
-      awaitOneRequestBody();
-      validateMessage(requestBodies.get(0), processTagsEnabled);
-    } finally {
-      // cleanup
-      WithConfigExtension.injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true");
-      ProcessTags.reset(Config.get());
+
+    @BeforeEach
+    void resetRequestBodies() {
+        requestBodies.clear();
     }
-  }
-
-  @Test
-  void writeKafkaConfigsToMockServer() throws InterruptedException, IOException {
-    WellKnownTags wellKnownTags =
-        new WellKnownTags(
-            "runtimeid", "hostname", "test", Config.get().getServiceName(), "version", "java");
-    Config fakeConfig = mock(Config.class);
-    when(fakeConfig.getAgentUrl()).thenReturn(serverAddress.toString());
-    when(fakeConfig.getWellKnownTags()).thenReturn(wellKnownTags);
-    when(fakeConfig.getPrimaryTag()).thenReturn("region-1");
-
-    OkHttpClient testOkhttpClient = OkHttpUtils.buildHttpClient(serverAddress, 5000L);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsDataStreams()).thenReturn(true);
-    SharedCommunicationObjects sharedCommObjects = new SharedCommunicationObjects();
-    sharedCommObjects.setFeaturesDiscovery(features);
-    sharedCommObjects.agentHttpClient = testOkhttpClient;
-    sharedCommObjects.createRemaining(fakeConfig);
-
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    TraceConfig traceConfig = mock(TraceConfig.class);
-    when(traceConfig.isDataStreamsEnabled()).thenReturn(true);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            fakeConfig, sharedCommObjects, timeSource, () -> traceConfig);
-    dataStreams.start();
-
-    // Report a producer and consumer config
-    Map<String, String> producerConfig = new HashMap<>();
-    producerConfig.put("bootstrap.servers", "localhost:9092");
-    producerConfig.put("acks", "all");
-    producerConfig.put("linger.ms", "5");
-    dataStreams.reportKafkaConfig("kafka_producer", "", "", producerConfig);
-
-    Map<String, String> consumerConfig = new HashMap<>();
-    consumerConfig.put("bootstrap.servers", "localhost:9092");
-    consumerConfig.put("group.id", "test-group");
-    consumerConfig.put("auto.offset.reset", "earliest");
-    dataStreams.reportKafkaConfig("kafka_consumer", "", "test-group", consumerConfig);
-
-    // Also add a stats point so the bucket is not empty of stats
-    dataStreams.add(
-        new StatsPoint(
-            DataStreamsTags.create(null, null),
-            9,
-            0,
-            10,
-            timeSource.getCurrentTimeNanos(),
-            0,
-            0,
-            0,
-            null));
-
-    timeSource.advance(defaultBucketDurationNanos);
-    dataStreams.close();
-
-    awaitOneRequestBody();
-    validateKafkaConfigMessage(requestBodies.get(0));
-  }
-
-  @Test
-  void writeKafkaConsumerGroupMemberToMockServer() throws InterruptedException, IOException {
-    WellKnownTags wellKnownTags =
-        new WellKnownTags(
-            "runtimeid", "hostname", "test", Config.get().getServiceName(), "version", "java");
-    Config fakeConfig = mock(Config.class);
-    when(fakeConfig.getAgentUrl()).thenReturn(serverAddress.toString());
-    when(fakeConfig.getWellKnownTags()).thenReturn(wellKnownTags);
-    when(fakeConfig.getPrimaryTag()).thenReturn("region-1");
-
-    OkHttpClient testOkhttpClient = OkHttpUtils.buildHttpClient(serverAddress, 5000L);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsDataStreams()).thenReturn(true);
-    SharedCommunicationObjects sharedCommObjects = new SharedCommunicationObjects();
-    sharedCommObjects.setFeaturesDiscovery(features);
-    sharedCommObjects.agentHttpClient = testOkhttpClient;
-    sharedCommObjects.createRemaining(fakeConfig);
-
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    TraceConfig traceConfig = mock(TraceConfig.class);
-    when(traceConfig.isDataStreamsEnabled()).thenReturn(true);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            fakeConfig, sharedCommObjects, timeSource, () -> traceConfig);
-    dataStreams.start();
-
-    dataStreams.reportKafkaConsumerGroupMember(
-        "cluster-1", "test-group", "consumer-1-abc123", 7, "range");
-
-    dataStreams.add(
-        new StatsPoint(
-            DataStreamsTags.create(null, null),
-            9,
-            0,
-            10,
-            timeSource.getCurrentTimeNanos(),
-            0,
-            0,
-            0,
-            null));
-
-    timeSource.advance(defaultBucketDurationNanos);
-    dataStreams.close();
-
-    awaitOneRequestBody();
-    validateKafkaConsumerGroupMemberMessage(requestBodies.get(0));
-  }
-
-  @Test
-  void duplicateKafkaConfigsAreEachSerializedInPayload() throws InterruptedException, IOException {
-    WellKnownTags wellKnownTags =
-        new WellKnownTags(
-            "runtimeid", "hostname", "test", Config.get().getServiceName(), "version", "java");
-    Config fakeConfig = mock(Config.class);
-    when(fakeConfig.getAgentUrl()).thenReturn(serverAddress.toString());
-    when(fakeConfig.getWellKnownTags()).thenReturn(wellKnownTags);
-    when(fakeConfig.getPrimaryTag()).thenReturn("region-1");
-
-    OkHttpClient testOkhttpClient = OkHttpUtils.buildHttpClient(serverAddress, 5000L);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
-    when(features.supportsDataStreams()).thenReturn(true);
-    SharedCommunicationObjects sharedCommObjects = new SharedCommunicationObjects();
-    sharedCommObjects.setFeaturesDiscovery(features);
-    sharedCommObjects.agentHttpClient = testOkhttpClient;
-    sharedCommObjects.createRemaining(fakeConfig);
-
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    TraceConfig traceConfig = mock(TraceConfig.class);
-    when(traceConfig.isDataStreamsEnabled()).thenReturn(true);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            fakeConfig, sharedCommObjects, timeSource, () -> traceConfig);
-    dataStreams.start();
-
-    // Report the same producer config twice — both should be serialized
-    Map<String, String> producerConfig = new HashMap<>();
-    producerConfig.put("bootstrap.servers", "localhost:9092");
-    producerConfig.put("acks", "all");
-    dataStreams.reportKafkaConfig("kafka_producer", "", "", producerConfig);
-    dataStreams.reportKafkaConfig("kafka_producer", "", "", producerConfig);
-
-    // Also add a stats point so the bucket has content
-    dataStreams.add(
-        new StatsPoint(
-            DataStreamsTags.create(null, null),
-            9,
-            0,
-            10,
-            timeSource.getCurrentTimeNanos(),
-            0,
-            0,
-            0,
-            null));
-
-    timeSource.advance(defaultBucketDurationNanos);
-    dataStreams.close();
-
-    awaitOneRequestBody();
-    validateDuplicateKafkaConfigMessage(requestBodies.get(0));
-  }
-
-  private void validateKafkaConfigMessage(byte[] message) throws IOException {
-    GzipSource gzipSource = new GzipSource(Okio.source(new ByteArrayInputStream(message)));
-    BufferedSource bufferedSource = Okio.buffer(gzipSource);
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bufferedSource.inputStream());
-
-    // Outer map (same structure as other payloads)
-    int outerMapSize = unpacker.unpackMapHeader();
-    // Skip to Stats array
-    boolean foundStats = false;
-    for (int i = 0; i < outerMapSize; i++) {
-      String key = unpacker.unpackString();
-      if ("Stats".equals(key)) {
-        foundStats = true;
-        int numBuckets = unpacker.unpackArrayHeader();
-        assertTrue(numBuckets >= 1);
-
-        // Parse first bucket
-        int bucketMapSize = unpacker.unpackMapHeader();
-        boolean foundConfigs = false;
-        for (int j = 0; j < bucketMapSize; j++) {
-          String bucketKey = unpacker.unpackString();
-          if ("Configs".equals(bucketKey)) {
-            foundConfigs = true;
-            int numConfigs = unpacker.unpackArrayHeader();
-            assertEquals(2, numConfigs);
-
-            // Collect configs in a map keyed by type
-            Map<String, Map<String, String>> configsByType = new HashMap<>();
-            for (int n = 0; n < numConfigs; n++) {
-              assertEquals(7, unpacker.unpackMapHeader());
-              assertEquals("Type", unpacker.unpackString());
-              String type = unpacker.unpackString();
-              assertEquals("KafkaClusterId", unpacker.unpackString());
-              unpacker.unpackString(); // skip cluster id value
-              assertEquals("ConsumerGroup", unpacker.unpackString());
-              unpacker.unpackString(); // skip consumer group value
-              assertEquals("MemberId", unpacker.unpackString());
-              unpacker.unpackString();
-              assertEquals("GenerationId", unpacker.unpackString());
-              unpacker.unpackInt();
-              assertEquals("MemberProtocol", unpacker.unpackString());
-              unpacker.unpackString();
-              assertEquals("Config", unpacker.unpackString());
-              int configSize = unpacker.unpackMapHeader();
-              Map<String, String> configEntries = new HashMap<>();
-              for (int c = 0; c < configSize; c++) {
-                String ck = unpacker.unpackString();
-                String cv = unpacker.unpackString();
-                configEntries.put(ck, cv);
-              }
-              configsByType.put(type, configEntries);
-            }
 
-            // Verify producer config
-            assertTrue(configsByType.containsKey("kafka_producer"));
-            assertEquals(
-                "localhost:9092", configsByType.get("kafka_producer").get("bootstrap.servers"));
-            assertEquals("all", configsByType.get("kafka_producer").get("acks"));
-            assertEquals("5", configsByType.get("kafka_producer").get("linger.ms"));
-
-            // Verify consumer config
-            assertTrue(configsByType.containsKey("kafka_consumer"));
-            assertEquals(
-                "localhost:9092", configsByType.get("kafka_consumer").get("bootstrap.servers"));
-            assertEquals("test-group", configsByType.get("kafka_consumer").get("group.id"));
-            assertEquals("earliest", configsByType.get("kafka_consumer").get("auto.offset.reset"));
-          } else {
-            unpacker.skipValue();
-          }
+    private static void awaitOneRequestBody() throws InterruptedException {
+        long deadline = System.currentTimeMillis() + 2000;
+        while (requestBodies.size() < 1 && System.currentTimeMillis() < deadline) {
+            Thread.sleep(20);
         }
-        assertTrue(foundConfigs, "Configs field not found in bucket");
+        assertEquals(1, requestBodies.size());
+    }
 
-        // Skip remaining buckets
-        for (int b = 1; b < numBuckets; b++) {
-          unpacker.skipValue();
-        }
-      } else {
-        unpacker.skipValue();
-      }
+    @Test
+    void serviceOverridesSplitBuckets() throws InterruptedException, IOException {
+        WellKnownTags wellKnownTags =
+                new WellKnownTags("runtimeid", "hostname", "test", Config.get().getServiceName(), "version", "java");
+        Config fakeConfig = mock(Config.class);
+        when(fakeConfig.getAgentUrl()).thenReturn(serverAddress.toString());
+        when(fakeConfig.getWellKnownTags()).thenReturn(wellKnownTags);
+        when(fakeConfig.getPrimaryTag()).thenReturn("region-1");
+
+        OkHttpClient testOkhttpClient = OkHttpUtils.buildHttpClient(serverAddress, 5000L);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsDataStreams()).thenReturn(true);
+        SharedCommunicationObjects sharedCommObjects = new SharedCommunicationObjects();
+        sharedCommObjects.setFeaturesDiscovery(features);
+        sharedCommObjects.agentHttpClient = testOkhttpClient;
+        sharedCommObjects.createRemaining(fakeConfig);
+
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        TraceConfig traceConfig = mock(TraceConfig.class);
+        when(traceConfig.isDataStreamsEnabled()).thenReturn(true);
+        String serviceNameOverride = "service-name-override";
+
+        DefaultDataStreamsMonitoring dataStreams =
+                new DefaultDataStreamsMonitoring(fakeConfig, sharedCommObjects, timeSource, () -> traceConfig);
+        dataStreams.start();
+        dataStreams.setThreadServiceName(serviceNameOverride);
+        dataStreams.add(new StatsPoint(
+                DataStreamsTags.create(null, null),
+                9,
+                0,
+                10,
+                timeSource.getCurrentTimeNanos(),
+                0,
+                0,
+                0,
+                serviceNameOverride));
+        dataStreams.trackBacklog(
+                DataStreamsTags.createWithPartition("kafka_produce", "testTopic", "1", null, null), 130);
+        timeSource.advance(defaultBucketDurationNanos);
+        // force flush
+        dataStreams.report();
+        dataStreams.close();
+        dataStreams.clearThreadServiceName();
+
+        awaitOneRequestBody();
+        GzipSource gzipSource = new GzipSource(Okio.source(new ByteArrayInputStream(requestBodies.get(0))));
+        BufferedSource bufferedSource = Okio.buffer(gzipSource);
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bufferedSource.inputStream());
+
+        assertEquals(9, unpacker.unpackMapHeader());
+        assertEquals("Env", unpacker.unpackString());
+        assertEquals("test", unpacker.unpackString());
+        assertEquals("Service", unpacker.unpackString());
+        assertEquals(serviceNameOverride, unpacker.unpackString());
     }
-    assertTrue(foundStats, "Stats field not found in payload");
-  }
-
-  private void validateKafkaConsumerGroupMemberMessage(byte[] message) throws IOException {
-    GzipSource gzipSource = new GzipSource(Okio.source(new ByteArrayInputStream(message)));
-    BufferedSource bufferedSource = Okio.buffer(gzipSource);
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bufferedSource.inputStream());
-
-    int outerMapSize = unpacker.unpackMapHeader();
-    boolean foundStats = false;
-    for (int i = 0; i < outerMapSize; i++) {
-      String key = unpacker.unpackString();
-      if ("Stats".equals(key)) {
-        foundStats = true;
-        int numBuckets = unpacker.unpackArrayHeader();
-        assertTrue(numBuckets >= 1);
-
-        int bucketMapSize = unpacker.unpackMapHeader();
-        boolean foundConfigs = false;
-        for (int j = 0; j < bucketMapSize; j++) {
-          String bucketKey = unpacker.unpackString();
-          if ("Configs".equals(bucketKey)) {
-            foundConfigs = true;
-            int numConfigs = unpacker.unpackArrayHeader();
-            assertEquals(1, numConfigs);
-
-            assertEquals(7, unpacker.unpackMapHeader());
-            assertEquals("Type", unpacker.unpackString());
-            assertEquals("kafka_consumer", unpacker.unpackString());
-            assertEquals("KafkaClusterId", unpacker.unpackString());
-            assertEquals("cluster-1", unpacker.unpackString());
-            assertEquals("ConsumerGroup", unpacker.unpackString());
-            assertEquals("test-group", unpacker.unpackString());
-            assertEquals("MemberId", unpacker.unpackString());
-            assertEquals("consumer-1-abc123", unpacker.unpackString());
-            assertEquals("GenerationId", unpacker.unpackString());
-            assertEquals(7, unpacker.unpackInt());
-            assertEquals("MemberProtocol", unpacker.unpackString());
-            assertEquals("range", unpacker.unpackString());
-            assertEquals("Config", unpacker.unpackString());
-            assertEquals(0, unpacker.unpackMapHeader());
-          } else {
-            unpacker.skipValue();
-          }
+
+    @ParameterizedTest(name = "Write bucket to mock server with process tags enabled {0}")
+    @ValueSource(booleans = {true, false})
+    void writeBucketToMockServer(boolean processTagsEnabled) throws InterruptedException, IOException {
+        WithConfigExtension.injectSysConfig(
+                EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, Boolean.toString(processTagsEnabled));
+        ProcessTags.reset(Config.get());
+
+        WellKnownTags wellKnownTags =
+                new WellKnownTags("runtimeid", "hostname", "test", Config.get().getServiceName(), "version", "java");
+        Config fakeConfig = mock(Config.class);
+        when(fakeConfig.getAgentUrl()).thenReturn(serverAddress.toString());
+        when(fakeConfig.getWellKnownTags()).thenReturn(wellKnownTags);
+        when(fakeConfig.getPrimaryTag()).thenReturn("region-1");
+
+        OkHttpClient testOkhttpClient = OkHttpUtils.buildHttpClient(serverAddress, 5000L);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsDataStreams()).thenReturn(true);
+        SharedCommunicationObjects sharedCommObjects = new SharedCommunicationObjects();
+        sharedCommObjects.setFeaturesDiscovery(features);
+        sharedCommObjects.agentHttpClient = testOkhttpClient;
+        sharedCommObjects.createRemaining(fakeConfig);
+
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        TraceConfig traceConfig = mock(TraceConfig.class);
+        when(traceConfig.isDataStreamsEnabled()).thenReturn(true);
+
+        DefaultDataStreamsMonitoring dataStreams =
+                new DefaultDataStreamsMonitoring(fakeConfig, sharedCommObjects, timeSource, () -> traceConfig);
+        try {
+            dataStreams.start();
+            dataStreams.add(new StatsPoint(
+                    DataStreamsTags.create(null, null), 9, 0, 10, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+            dataStreams.add(new StatsPoint(
+                    DataStreamsTags.create(
+                            "testType", DataStreamsTags.Direction.INBOUND, "testTopic", "testGroup", null),
+                    1,
+                    2,
+                    5,
+                    timeSource.getCurrentTimeNanos(),
+                    0,
+                    0,
+                    0,
+                    null));
+            dataStreams.trackBacklog(
+                    DataStreamsTags.createWithPartition("kafka_produce", "testTopic", "1", null, null), 100);
+            dataStreams.trackBacklog(
+                    DataStreamsTags.createWithPartition("kafka_produce", "testTopic", "1", null, null), 130);
+            timeSource.advance(defaultBucketDurationNanos - 100L);
+            dataStreams.add(new StatsPoint(
+                    DataStreamsTags.create(
+                            "testType", DataStreamsTags.Direction.INBOUND, "testTopic", "testGroup", null),
+                    1,
+                    2,
+                    5,
+                    timeSource.getCurrentTimeNanos(),
+                    SECONDS.toNanos(10),
+                    SECONDS.toNanos(10),
+                    10,
+                    null));
+            timeSource.advance(defaultBucketDurationNanos);
+            dataStreams.add(new StatsPoint(
+                    DataStreamsTags.create(
+                            "testType", DataStreamsTags.Direction.INBOUND, "testTopic", "testGroup", null),
+                    1,
+                    2,
+                    5,
+                    timeSource.getCurrentTimeNanos(),
+                    SECONDS.toNanos(5),
+                    SECONDS.toNanos(5),
+                    5,
+                    null));
+            dataStreams.add(new StatsPoint(
+                    DataStreamsTags.create(
+                            "testType", DataStreamsTags.Direction.INBOUND, "testTopic2", "testGroup", null),
+                    3,
+                    4,
+                    6,
+                    timeSource.getCurrentTimeNanos(),
+                    SECONDS.toNanos(2),
+                    0,
+                    2,
+                    null));
+            timeSource.advance(defaultBucketDurationNanos);
+            dataStreams.close();
+
+            awaitOneRequestBody();
+            validateMessage(requestBodies.get(0), processTagsEnabled);
+        } finally {
+            // cleanup
+            WithConfigExtension.injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true");
+            ProcessTags.reset(Config.get());
         }
-        assertTrue(foundConfigs, "Configs field not found in bucket");
+    }
 
-        for (int b = 1; b < numBuckets; b++) {
-          unpacker.skipValue();
+    @Test
+    void writeKafkaConfigsToMockServer() throws InterruptedException, IOException {
+        WellKnownTags wellKnownTags =
+                new WellKnownTags("runtimeid", "hostname", "test", Config.get().getServiceName(), "version", "java");
+        Config fakeConfig = mock(Config.class);
+        when(fakeConfig.getAgentUrl()).thenReturn(serverAddress.toString());
+        when(fakeConfig.getWellKnownTags()).thenReturn(wellKnownTags);
+        when(fakeConfig.getPrimaryTag()).thenReturn("region-1");
+
+        OkHttpClient testOkhttpClient = OkHttpUtils.buildHttpClient(serverAddress, 5000L);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsDataStreams()).thenReturn(true);
+        SharedCommunicationObjects sharedCommObjects = new SharedCommunicationObjects();
+        sharedCommObjects.setFeaturesDiscovery(features);
+        sharedCommObjects.agentHttpClient = testOkhttpClient;
+        sharedCommObjects.createRemaining(fakeConfig);
+
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        TraceConfig traceConfig = mock(TraceConfig.class);
+        when(traceConfig.isDataStreamsEnabled()).thenReturn(true);
+
+        DefaultDataStreamsMonitoring dataStreams =
+                new DefaultDataStreamsMonitoring(fakeConfig, sharedCommObjects, timeSource, () -> traceConfig);
+        dataStreams.start();
+
+        // Report a producer and consumer config
+        Map<String, String> producerConfig = new HashMap<>();
+        producerConfig.put("bootstrap.servers", "localhost:9092");
+        producerConfig.put("acks", "all");
+        producerConfig.put("linger.ms", "5");
+        dataStreams.reportKafkaConfig("kafka_producer", "", "", producerConfig);
+
+        Map<String, String> consumerConfig = new HashMap<>();
+        consumerConfig.put("bootstrap.servers", "localhost:9092");
+        consumerConfig.put("group.id", "test-group");
+        consumerConfig.put("auto.offset.reset", "earliest");
+        dataStreams.reportKafkaConfig("kafka_consumer", "", "test-group", consumerConfig);
+
+        // Also add a stats point so the bucket is not empty of stats
+        dataStreams.add(new StatsPoint(
+                DataStreamsTags.create(null, null), 9, 0, 10, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+
+        timeSource.advance(defaultBucketDurationNanos);
+        dataStreams.close();
+
+        awaitOneRequestBody();
+        validateKafkaConfigMessage(requestBodies.get(0));
+    }
+
+    @Test
+    void writeKafkaConsumerGroupMemberToMockServer() throws InterruptedException, IOException {
+        WellKnownTags wellKnownTags =
+                new WellKnownTags("runtimeid", "hostname", "test", Config.get().getServiceName(), "version", "java");
+        Config fakeConfig = mock(Config.class);
+        when(fakeConfig.getAgentUrl()).thenReturn(serverAddress.toString());
+        when(fakeConfig.getWellKnownTags()).thenReturn(wellKnownTags);
+        when(fakeConfig.getPrimaryTag()).thenReturn("region-1");
+
+        OkHttpClient testOkhttpClient = OkHttpUtils.buildHttpClient(serverAddress, 5000L);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsDataStreams()).thenReturn(true);
+        SharedCommunicationObjects sharedCommObjects = new SharedCommunicationObjects();
+        sharedCommObjects.setFeaturesDiscovery(features);
+        sharedCommObjects.agentHttpClient = testOkhttpClient;
+        sharedCommObjects.createRemaining(fakeConfig);
+
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        TraceConfig traceConfig = mock(TraceConfig.class);
+        when(traceConfig.isDataStreamsEnabled()).thenReturn(true);
+
+        DefaultDataStreamsMonitoring dataStreams =
+                new DefaultDataStreamsMonitoring(fakeConfig, sharedCommObjects, timeSource, () -> traceConfig);
+        dataStreams.start();
+
+        dataStreams.reportKafkaConsumerGroupMember("cluster-1", "test-group", "consumer-1-abc123", 7, "range");
+
+        dataStreams.add(new StatsPoint(
+                DataStreamsTags.create(null, null), 9, 0, 10, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+
+        timeSource.advance(defaultBucketDurationNanos);
+        dataStreams.close();
+
+        awaitOneRequestBody();
+        validateKafkaConsumerGroupMemberMessage(requestBodies.get(0));
+    }
+
+    @Test
+    void duplicateKafkaConfigsAreEachSerializedInPayload() throws InterruptedException, IOException {
+        WellKnownTags wellKnownTags =
+                new WellKnownTags("runtimeid", "hostname", "test", Config.get().getServiceName(), "version", "java");
+        Config fakeConfig = mock(Config.class);
+        when(fakeConfig.getAgentUrl()).thenReturn(serverAddress.toString());
+        when(fakeConfig.getWellKnownTags()).thenReturn(wellKnownTags);
+        when(fakeConfig.getPrimaryTag()).thenReturn("region-1");
+
+        OkHttpClient testOkhttpClient = OkHttpUtils.buildHttpClient(serverAddress, 5000L);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class);
+        when(features.supportsDataStreams()).thenReturn(true);
+        SharedCommunicationObjects sharedCommObjects = new SharedCommunicationObjects();
+        sharedCommObjects.setFeaturesDiscovery(features);
+        sharedCommObjects.agentHttpClient = testOkhttpClient;
+        sharedCommObjects.createRemaining(fakeConfig);
+
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        TraceConfig traceConfig = mock(TraceConfig.class);
+        when(traceConfig.isDataStreamsEnabled()).thenReturn(true);
+
+        DefaultDataStreamsMonitoring dataStreams =
+                new DefaultDataStreamsMonitoring(fakeConfig, sharedCommObjects, timeSource, () -> traceConfig);
+        dataStreams.start();
+
+        // Report the same producer config twice — both should be serialized
+        Map<String, String> producerConfig = new HashMap<>();
+        producerConfig.put("bootstrap.servers", "localhost:9092");
+        producerConfig.put("acks", "all");
+        dataStreams.reportKafkaConfig("kafka_producer", "", "", producerConfig);
+        dataStreams.reportKafkaConfig("kafka_producer", "", "", producerConfig);
+
+        // Also add a stats point so the bucket has content
+        dataStreams.add(new StatsPoint(
+                DataStreamsTags.create(null, null), 9, 0, 10, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+
+        timeSource.advance(defaultBucketDurationNanos);
+        dataStreams.close();
+
+        awaitOneRequestBody();
+        validateDuplicateKafkaConfigMessage(requestBodies.get(0));
+    }
+
+    private void validateKafkaConfigMessage(byte[] message) throws IOException {
+        GzipSource gzipSource = new GzipSource(Okio.source(new ByteArrayInputStream(message)));
+        BufferedSource bufferedSource = Okio.buffer(gzipSource);
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bufferedSource.inputStream());
+
+        // Outer map (same structure as other payloads)
+        int outerMapSize = unpacker.unpackMapHeader();
+        // Skip to Stats array
+        boolean foundStats = false;
+        for (int i = 0; i < outerMapSize; i++) {
+            String key = unpacker.unpackString();
+            if ("Stats".equals(key)) {
+                foundStats = true;
+                int numBuckets = unpacker.unpackArrayHeader();
+                assertTrue(numBuckets >= 1);
+
+                // Parse first bucket
+                int bucketMapSize = unpacker.unpackMapHeader();
+                boolean foundConfigs = false;
+                for (int j = 0; j < bucketMapSize; j++) {
+                    String bucketKey = unpacker.unpackString();
+                    if ("Configs".equals(bucketKey)) {
+                        foundConfigs = true;
+                        int numConfigs = unpacker.unpackArrayHeader();
+                        assertEquals(2, numConfigs);
+
+                        // Collect configs in a map keyed by type
+                        Map<String, Map<String, String>> configsByType = new HashMap<>();
+                        for (int n = 0; n < numConfigs; n++) {
+                            assertEquals(7, unpacker.unpackMapHeader());
+                            assertEquals("Type", unpacker.unpackString());
+                            String type = unpacker.unpackString();
+                            assertEquals("KafkaClusterId", unpacker.unpackString());
+                            unpacker.unpackString(); // skip cluster id value
+                            assertEquals("ConsumerGroup", unpacker.unpackString());
+                            unpacker.unpackString(); // skip consumer group value
+                            assertEquals("MemberId", unpacker.unpackString());
+                            unpacker.unpackString();
+                            assertEquals("GenerationId", unpacker.unpackString());
+                            unpacker.unpackInt();
+                            assertEquals("MemberProtocol", unpacker.unpackString());
+                            unpacker.unpackString();
+                            assertEquals("Config", unpacker.unpackString());
+                            int configSize = unpacker.unpackMapHeader();
+                            Map<String, String> configEntries = new HashMap<>();
+                            for (int c = 0; c < configSize; c++) {
+                                String ck = unpacker.unpackString();
+                                String cv = unpacker.unpackString();
+                                configEntries.put(ck, cv);
+                            }
+                            configsByType.put(type, configEntries);
+                        }
+
+                        // Verify producer config
+                        assertTrue(configsByType.containsKey("kafka_producer"));
+                        assertEquals(
+                                "localhost:9092",
+                                configsByType.get("kafka_producer").get("bootstrap.servers"));
+                        assertEquals("all", configsByType.get("kafka_producer").get("acks"));
+                        assertEquals("5", configsByType.get("kafka_producer").get("linger.ms"));
+
+                        // Verify consumer config
+                        assertTrue(configsByType.containsKey("kafka_consumer"));
+                        assertEquals(
+                                "localhost:9092",
+                                configsByType.get("kafka_consumer").get("bootstrap.servers"));
+                        assertEquals(
+                                "test-group",
+                                configsByType.get("kafka_consumer").get("group.id"));
+                        assertEquals(
+                                "earliest", configsByType.get("kafka_consumer").get("auto.offset.reset"));
+                    } else {
+                        unpacker.skipValue();
+                    }
+                }
+                assertTrue(foundConfigs, "Configs field not found in bucket");
+
+                // Skip remaining buckets
+                for (int b = 1; b < numBuckets; b++) {
+                    unpacker.skipValue();
+                }
+            } else {
+                unpacker.skipValue();
+            }
         }
-      } else {
-        unpacker.skipValue();
-      }
+        assertTrue(foundStats, "Stats field not found in payload");
     }
-    assertTrue(foundStats, "Stats field not found in payload");
-  }
-
-  private void validateDuplicateKafkaConfigMessage(byte[] message) throws IOException {
-    GzipSource gzipSource = new GzipSource(Okio.source(new ByteArrayInputStream(message)));
-    BufferedSource bufferedSource = Okio.buffer(gzipSource);
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bufferedSource.inputStream());
-
-    int outerMapSize = unpacker.unpackMapHeader();
-    boolean foundStats = false;
-    for (int i = 0; i < outerMapSize; i++) {
-      String key = unpacker.unpackString();
-      if ("Stats".equals(key)) {
-        foundStats = true;
-        int numBuckets = unpacker.unpackArrayHeader();
-        assertTrue(numBuckets >= 1);
-
-        // Parse first bucket
-        int bucketMapSize = unpacker.unpackMapHeader();
-        boolean foundConfigs = false;
-        for (int j = 0; j < bucketMapSize; j++) {
-          String bucketKey = unpacker.unpackString();
-          if ("Configs".equals(bucketKey)) {
-            foundConfigs = true;
-            int numConfigs = unpacker.unpackArrayHeader();
-            // Both configs should be present (no deduplication)
-            assertEquals(2, numConfigs);
-
-            for (int n = 0; n < numConfigs; n++) {
-              assertEquals(7, unpacker.unpackMapHeader());
-              assertEquals("Type", unpacker.unpackString());
-              assertEquals("kafka_producer", unpacker.unpackString());
-              assertEquals("KafkaClusterId", unpacker.unpackString());
-              unpacker.unpackString(); // skip cluster id value
-              assertEquals("ConsumerGroup", unpacker.unpackString());
-              unpacker.unpackString(); // skip consumer group value
-              assertEquals("MemberId", unpacker.unpackString());
-              unpacker.unpackString();
-              assertEquals("GenerationId", unpacker.unpackString());
-              unpacker.unpackInt();
-              assertEquals("MemberProtocol", unpacker.unpackString());
-              unpacker.unpackString();
-              assertEquals("Config", unpacker.unpackString());
-              int configSize = unpacker.unpackMapHeader();
-              Map<String, String> configEntries = new HashMap<>();
-              for (int c = 0; c < configSize; c++) {
-                String ck = unpacker.unpackString();
-                String cv = unpacker.unpackString();
-                configEntries.put(ck, cv);
-              }
-              assertEquals("localhost:9092", configEntries.get("bootstrap.servers"));
-              assertEquals("all", configEntries.get("acks"));
+
+    private void validateKafkaConsumerGroupMemberMessage(byte[] message) throws IOException {
+        GzipSource gzipSource = new GzipSource(Okio.source(new ByteArrayInputStream(message)));
+        BufferedSource bufferedSource = Okio.buffer(gzipSource);
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bufferedSource.inputStream());
+
+        int outerMapSize = unpacker.unpackMapHeader();
+        boolean foundStats = false;
+        for (int i = 0; i < outerMapSize; i++) {
+            String key = unpacker.unpackString();
+            if ("Stats".equals(key)) {
+                foundStats = true;
+                int numBuckets = unpacker.unpackArrayHeader();
+                assertTrue(numBuckets >= 1);
+
+                int bucketMapSize = unpacker.unpackMapHeader();
+                boolean foundConfigs = false;
+                for (int j = 0; j < bucketMapSize; j++) {
+                    String bucketKey = unpacker.unpackString();
+                    if ("Configs".equals(bucketKey)) {
+                        foundConfigs = true;
+                        int numConfigs = unpacker.unpackArrayHeader();
+                        assertEquals(1, numConfigs);
+
+                        assertEquals(7, unpacker.unpackMapHeader());
+                        assertEquals("Type", unpacker.unpackString());
+                        assertEquals("kafka_consumer", unpacker.unpackString());
+                        assertEquals("KafkaClusterId", unpacker.unpackString());
+                        assertEquals("cluster-1", unpacker.unpackString());
+                        assertEquals("ConsumerGroup", unpacker.unpackString());
+                        assertEquals("test-group", unpacker.unpackString());
+                        assertEquals("MemberId", unpacker.unpackString());
+                        assertEquals("consumer-1-abc123", unpacker.unpackString());
+                        assertEquals("GenerationId", unpacker.unpackString());
+                        assertEquals(7, unpacker.unpackInt());
+                        assertEquals("MemberProtocol", unpacker.unpackString());
+                        assertEquals("range", unpacker.unpackString());
+                        assertEquals("Config", unpacker.unpackString());
+                        assertEquals(0, unpacker.unpackMapHeader());
+                    } else {
+                        unpacker.skipValue();
+                    }
+                }
+                assertTrue(foundConfigs, "Configs field not found in bucket");
+
+                for (int b = 1; b < numBuckets; b++) {
+                    unpacker.skipValue();
+                }
+            } else {
+                unpacker.skipValue();
             }
-          } else {
-            unpacker.skipValue();
-          }
         }
-        assertTrue(foundConfigs, "Configs field not found in bucket");
+        assertTrue(foundStats, "Stats field not found in payload");
+    }
 
-        for (int b = 1; b < numBuckets; b++) {
-          unpacker.skipValue();
+    private void validateDuplicateKafkaConfigMessage(byte[] message) throws IOException {
+        GzipSource gzipSource = new GzipSource(Okio.source(new ByteArrayInputStream(message)));
+        BufferedSource bufferedSource = Okio.buffer(gzipSource);
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bufferedSource.inputStream());
+
+        int outerMapSize = unpacker.unpackMapHeader();
+        boolean foundStats = false;
+        for (int i = 0; i < outerMapSize; i++) {
+            String key = unpacker.unpackString();
+            if ("Stats".equals(key)) {
+                foundStats = true;
+                int numBuckets = unpacker.unpackArrayHeader();
+                assertTrue(numBuckets >= 1);
+
+                // Parse first bucket
+                int bucketMapSize = unpacker.unpackMapHeader();
+                boolean foundConfigs = false;
+                for (int j = 0; j < bucketMapSize; j++) {
+                    String bucketKey = unpacker.unpackString();
+                    if ("Configs".equals(bucketKey)) {
+                        foundConfigs = true;
+                        int numConfigs = unpacker.unpackArrayHeader();
+                        // Both configs should be present (no deduplication)
+                        assertEquals(2, numConfigs);
+
+                        for (int n = 0; n < numConfigs; n++) {
+                            assertEquals(7, unpacker.unpackMapHeader());
+                            assertEquals("Type", unpacker.unpackString());
+                            assertEquals("kafka_producer", unpacker.unpackString());
+                            assertEquals("KafkaClusterId", unpacker.unpackString());
+                            unpacker.unpackString(); // skip cluster id value
+                            assertEquals("ConsumerGroup", unpacker.unpackString());
+                            unpacker.unpackString(); // skip consumer group value
+                            assertEquals("MemberId", unpacker.unpackString());
+                            unpacker.unpackString();
+                            assertEquals("GenerationId", unpacker.unpackString());
+                            unpacker.unpackInt();
+                            assertEquals("MemberProtocol", unpacker.unpackString());
+                            unpacker.unpackString();
+                            assertEquals("Config", unpacker.unpackString());
+                            int configSize = unpacker.unpackMapHeader();
+                            Map<String, String> configEntries = new HashMap<>();
+                            for (int c = 0; c < configSize; c++) {
+                                String ck = unpacker.unpackString();
+                                String cv = unpacker.unpackString();
+                                configEntries.put(ck, cv);
+                            }
+                            assertEquals("localhost:9092", configEntries.get("bootstrap.servers"));
+                            assertEquals("all", configEntries.get("acks"));
+                        }
+                    } else {
+                        unpacker.skipValue();
+                    }
+                }
+                assertTrue(foundConfigs, "Configs field not found in bucket");
+
+                for (int b = 1; b < numBuckets; b++) {
+                    unpacker.skipValue();
+                }
+            } else {
+                unpacker.skipValue();
+            }
         }
-      } else {
-        unpacker.skipValue();
-      }
+        assertTrue(foundStats, "Stats field not found in payload");
     }
-    assertTrue(foundStats, "Stats field not found in payload");
-  }
-
-  private void validateMessage(byte[] message, boolean processTagsEnabled) throws IOException {
-    GzipSource gzipSource = new GzipSource(Okio.source(new ByteArrayInputStream(message)));
-    BufferedSource bufferedSource = Okio.buffer(gzipSource);
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bufferedSource.inputStream());
-
-    assertEquals(8 + (processTagsEnabled ? 1 : 0), unpacker.unpackMapHeader());
-    assertEquals("Env", unpacker.unpackString());
-    assertEquals("test", unpacker.unpackString());
-    assertEquals("Service", unpacker.unpackString());
-    assertEquals(Config.get().getServiceName(), unpacker.unpackString());
-    assertEquals("Lang", unpacker.unpackString());
-    assertEquals("java", unpacker.unpackString());
-    assertEquals("PrimaryTag", unpacker.unpackString());
-    assertEquals("region-1", unpacker.unpackString());
-    assertEquals("TracerVersion", unpacker.unpackString());
-    assertEquals(DDTraceCoreInfo.VERSION, unpacker.unpackString());
-    assertEquals("Version", unpacker.unpackString());
-    assertEquals("version", unpacker.unpackString());
-    assertEquals("Stats", unpacker.unpackString());
-    assertEquals(2, unpacker.unpackArrayHeader()); // 2 time buckets
-
-    // FIRST BUCKET
-    assertEquals(4, unpacker.unpackMapHeader());
-    assertEquals("Start", unpacker.unpackString());
-    unpacker.skipValue();
-    assertEquals("Duration", unpacker.unpackString());
-    assertEquals(defaultBucketDurationNanos, unpacker.unpackLong());
-    assertEquals("Stats", unpacker.unpackString());
-    assertEquals(2, unpacker.unpackArrayHeader()); // 2 groups in first bucket
-
-    // we don't know the order the groups will be reported
-    Set<Integer> availableSizes = new HashSet<>();
-    availableSizes.add(5);
-    availableSizes.add(6);
-    for (int g = 0; g < 2; g++) {
-      int mapHeaderSize = unpacker.unpackMapHeader();
-      assertTrue(availableSizes.remove(mapHeaderSize));
-      if (mapHeaderSize == 5) {
-        // empty topic group
-        assertEquals("PathwayLatency", unpacker.unpackString());
-        unpacker.skipValue();
-        assertEquals("EdgeLatency", unpacker.unpackString());
-        unpacker.skipValue();
-        assertEquals("PayloadSize", unpacker.unpackString());
-        unpacker.skipValue();
-        assertEquals("Hash", unpacker.unpackString());
-        assertEquals(9L, unpacker.unpackLong());
-        assertEquals("ParentHash", unpacker.unpackString());
-        assertEquals(0L, unpacker.unpackLong());
-      } else {
-        // other group
-        assertEquals("PathwayLatency", unpacker.unpackString());
-        unpacker.skipValue();
-        assertEquals("EdgeLatency", unpacker.unpackString());
-        unpacker.skipValue();
-        assertEquals("PayloadSize", unpacker.unpackString());
+
+    private void validateMessage(byte[] message, boolean processTagsEnabled) throws IOException {
+        GzipSource gzipSource = new GzipSource(Okio.source(new ByteArrayInputStream(message)));
+        BufferedSource bufferedSource = Okio.buffer(gzipSource);
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bufferedSource.inputStream());
+
+        assertEquals(8 + (processTagsEnabled ? 1 : 0), unpacker.unpackMapHeader());
+        assertEquals("Env", unpacker.unpackString());
+        assertEquals("test", unpacker.unpackString());
+        assertEquals("Service", unpacker.unpackString());
+        assertEquals(Config.get().getServiceName(), unpacker.unpackString());
+        assertEquals("Lang", unpacker.unpackString());
+        assertEquals("java", unpacker.unpackString());
+        assertEquals("PrimaryTag", unpacker.unpackString());
+        assertEquals("region-1", unpacker.unpackString());
+        assertEquals("TracerVersion", unpacker.unpackString());
+        assertEquals(DDTraceCoreInfo.VERSION, unpacker.unpackString());
+        assertEquals("Version", unpacker.unpackString());
+        assertEquals("version", unpacker.unpackString());
+        assertEquals("Stats", unpacker.unpackString());
+        assertEquals(2, unpacker.unpackArrayHeader()); // 2 time buckets
+
+        // FIRST BUCKET
+        assertEquals(4, unpacker.unpackMapHeader());
+        assertEquals("Start", unpacker.unpackString());
         unpacker.skipValue();
-        assertEquals("Hash", unpacker.unpackString());
-        assertEquals(1L, unpacker.unpackLong());
-        assertEquals("ParentHash", unpacker.unpackString());
-        assertEquals(2L, unpacker.unpackLong());
-        assertEquals("EdgeTags", unpacker.unpackString());
-        assertEquals(4, unpacker.unpackArrayHeader());
-        assertEquals("direction:in", unpacker.unpackString());
+        assertEquals("Duration", unpacker.unpackString());
+        assertEquals(defaultBucketDurationNanos, unpacker.unpackLong());
+        assertEquals("Stats", unpacker.unpackString());
+        assertEquals(2, unpacker.unpackArrayHeader()); // 2 groups in first bucket
+
+        // we don't know the order the groups will be reported
+        Set<Integer> availableSizes = new HashSet<>();
+        availableSizes.add(5);
+        availableSizes.add(6);
+        for (int g = 0; g < 2; g++) {
+            int mapHeaderSize = unpacker.unpackMapHeader();
+            assertTrue(availableSizes.remove(mapHeaderSize));
+            if (mapHeaderSize == 5) {
+                // empty topic group
+                assertEquals("PathwayLatency", unpacker.unpackString());
+                unpacker.skipValue();
+                assertEquals("EdgeLatency", unpacker.unpackString());
+                unpacker.skipValue();
+                assertEquals("PayloadSize", unpacker.unpackString());
+                unpacker.skipValue();
+                assertEquals("Hash", unpacker.unpackString());
+                assertEquals(9L, unpacker.unpackLong());
+                assertEquals("ParentHash", unpacker.unpackString());
+                assertEquals(0L, unpacker.unpackLong());
+            } else {
+                // other group
+                assertEquals("PathwayLatency", unpacker.unpackString());
+                unpacker.skipValue();
+                assertEquals("EdgeLatency", unpacker.unpackString());
+                unpacker.skipValue();
+                assertEquals("PayloadSize", unpacker.unpackString());
+                unpacker.skipValue();
+                assertEquals("Hash", unpacker.unpackString());
+                assertEquals(1L, unpacker.unpackLong());
+                assertEquals("ParentHash", unpacker.unpackString());
+                assertEquals(2L, unpacker.unpackLong());
+                assertEquals("EdgeTags", unpacker.unpackString());
+                assertEquals(4, unpacker.unpackArrayHeader());
+                assertEquals("direction:in", unpacker.unpackString());
+                assertEquals("topic:testTopic", unpacker.unpackString());
+                assertEquals("type:testType", unpacker.unpackString());
+                assertEquals("group:testGroup", unpacker.unpackString());
+            }
+        }
+
+        // Kafka stats
+        assertEquals("Backlogs", unpacker.unpackString());
+        assertEquals(1, unpacker.unpackArrayHeader());
+        assertEquals(2, unpacker.unpackMapHeader());
+        assertEquals("Tags", unpacker.unpackString());
+        assertEquals(3, unpacker.unpackArrayHeader());
         assertEquals("topic:testTopic", unpacker.unpackString());
-        assertEquals("type:testType", unpacker.unpackString());
-        assertEquals("group:testGroup", unpacker.unpackString());
-      }
-    }
+        assertEquals("type:kafka_produce", unpacker.unpackString());
+        assertEquals("partition:1", unpacker.unpackString());
+        assertEquals("Value", unpacker.unpackString());
+        assertEquals(130L, unpacker.unpackLong());
+
+        // SECOND BUCKET
+        assertEquals(3, unpacker.unpackMapHeader());
+        assertEquals("Start", unpacker.unpackString());
+        unpacker.skipValue();
+        assertEquals("Duration", unpacker.unpackString());
+        assertEquals(defaultBucketDurationNanos, unpacker.unpackLong());
+        assertEquals("Stats", unpacker.unpackString());
+        assertEquals(2, unpacker.unpackArrayHeader()); // 2 groups in second bucket
+
+        // we don't know the order the groups will be reported
+        Set<Long> availableHashes = new HashSet<>();
+        availableHashes.add(1L);
+        availableHashes.add(3L);
+        for (int g = 0; g < 2; g++) {
+            assertEquals(6, unpacker.unpackMapHeader());
+            assertEquals("PathwayLatency", unpacker.unpackString());
+            unpacker.skipValue();
+            assertEquals("EdgeLatency", unpacker.unpackString());
+            unpacker.skipValue();
+            assertEquals("PayloadSize", unpacker.unpackString());
+            unpacker.skipValue();
+            assertEquals("Hash", unpacker.unpackString());
+            long hash = unpacker.unpackLong();
+            assertTrue(availableHashes.remove(hash));
+            assertEquals("ParentHash", unpacker.unpackString());
+            assertEquals(hash == 1L ? 2L : 4L, unpacker.unpackLong());
+            assertEquals("EdgeTags", unpacker.unpackString());
+            assertEquals(4, unpacker.unpackArrayHeader());
+            assertEquals("direction:in", unpacker.unpackString());
+            assertEquals(hash == 1L ? "topic:testTopic" : "topic:testTopic2", unpacker.unpackString());
+            assertEquals("type:testType", unpacker.unpackString());
+            assertEquals("group:testGroup", unpacker.unpackString());
+        }
 
-    // Kafka stats
-    assertEquals("Backlogs", unpacker.unpackString());
-    assertEquals(1, unpacker.unpackArrayHeader());
-    assertEquals(2, unpacker.unpackMapHeader());
-    assertEquals("Tags", unpacker.unpackString());
-    assertEquals(3, unpacker.unpackArrayHeader());
-    assertEquals("topic:testTopic", unpacker.unpackString());
-    assertEquals("type:kafka_produce", unpacker.unpackString());
-    assertEquals("partition:1", unpacker.unpackString());
-    assertEquals("Value", unpacker.unpackString());
-    assertEquals(130L, unpacker.unpackLong());
-
-    // SECOND BUCKET
-    assertEquals(3, unpacker.unpackMapHeader());
-    assertEquals("Start", unpacker.unpackString());
-    unpacker.skipValue();
-    assertEquals("Duration", unpacker.unpackString());
-    assertEquals(defaultBucketDurationNanos, unpacker.unpackLong());
-    assertEquals("Stats", unpacker.unpackString());
-    assertEquals(2, unpacker.unpackArrayHeader()); // 2 groups in second bucket
-
-    // we don't know the order the groups will be reported
-    Set<Long> availableHashes = new HashSet<>();
-    availableHashes.add(1L);
-    availableHashes.add(3L);
-    for (int g = 0; g < 2; g++) {
-      assertEquals(6, unpacker.unpackMapHeader());
-      assertEquals("PathwayLatency", unpacker.unpackString());
-      unpacker.skipValue();
-      assertEquals("EdgeLatency", unpacker.unpackString());
-      unpacker.skipValue();
-      assertEquals("PayloadSize", unpacker.unpackString());
-      unpacker.skipValue();
-      assertEquals("Hash", unpacker.unpackString());
-      long hash = unpacker.unpackLong();
-      assertTrue(availableHashes.remove(hash));
-      assertEquals("ParentHash", unpacker.unpackString());
-      assertEquals(hash == 1L ? 2L : 4L, unpacker.unpackLong());
-      assertEquals("EdgeTags", unpacker.unpackString());
-      assertEquals(4, unpacker.unpackArrayHeader());
-      assertEquals("direction:in", unpacker.unpackString());
-      assertEquals(hash == 1L ? "topic:testTopic" : "topic:testTopic2", unpacker.unpackString());
-      assertEquals("type:testType", unpacker.unpackString());
-      assertEquals("group:testGroup", unpacker.unpackString());
-    }
+        assertEquals("ProductMask", unpacker.unpackString());
+        assertEquals(1L, unpacker.unpackLong());
 
-    assertEquals("ProductMask", unpacker.unpackString());
-    assertEquals(1L, unpacker.unpackLong());
-
-    List<String> processTags = ProcessTags.getTagsAsStringList();
-    if (processTags == null) {
-      assertFalse(unpacker.hasNext());
-    } else {
-      assertTrue(unpacker.hasNext());
-      assertEquals("ProcessTags", unpacker.unpackString());
-      assertEquals(processTags.size(), unpacker.unpackArrayHeader());
-      for (String tag : processTags) {
-        assertEquals(tag, unpacker.unpackString());
-      }
+        List<String> processTags = ProcessTags.getTagsAsStringList();
+        if (processTags == null) {
+            assertFalse(unpacker.hasNext());
+        } else {
+            assertTrue(unpacker.hasNext());
+            assertEquals("ProcessTags", unpacker.unpackString());
+            assertEquals(processTags.size(), unpacker.unpackArrayHeader());
+            for (String tag : processTags) {
+                assertEquals(tag, unpacker.unpackString());
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoringTest.java b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoringTest.java
index 9438632a088..2f5abf1fd89 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoringTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoringTest.java
@@ -50,1597 +50,1397 @@
 
 public class DefaultDataStreamsMonitoringTest extends DDCoreJavaSpecification {
 
-  private static final long DEFAULT_BUCKET_DURATION_NANOS =
-      Config.get().getDataStreamsBucketDurationNanoseconds();
-
-  @BeforeAll
-  static void registerHistograms() {
-    Histograms.register(DDSketchHistograms.FACTORY);
-  }
-
-  private static void awaitIdle(DefaultDataStreamsMonitoring dataStreams)
-      throws InterruptedException {
-    long deadline = System.currentTimeMillis() + 1000;
-    while (System.currentTimeMillis() < deadline) {
-      if (isInboxEmpty(dataStreams) && getThreadState(dataStreams) != Thread.State.RUNNABLE) {
-        return;
-      }
-      Thread.sleep(10);
+    private static final long DEFAULT_BUCKET_DURATION_NANOS = Config.get().getDataStreamsBucketDurationNanoseconds();
+
+    @BeforeAll
+    static void registerHistograms() {
+        Histograms.register(DDSketchHistograms.FACTORY);
+    }
+
+    private static void awaitIdle(DefaultDataStreamsMonitoring dataStreams) throws InterruptedException {
+        long deadline = System.currentTimeMillis() + 1000;
+        while (System.currentTimeMillis() < deadline) {
+            if (isInboxEmpty(dataStreams) && getThreadState(dataStreams) != Thread.State.RUNNABLE) {
+                return;
+            }
+            Thread.sleep(10);
+        }
+        assertTrue(isInboxEmpty(dataStreams));
+        assertNotEquals(Thread.State.RUNNABLE, getThreadState(dataStreams));
+    }
+
+    private static void awaitBuckets(
+            DefaultDataStreamsMonitoring dataStreams, CapturingPayloadWriter writer, int expectedBuckets)
+            throws InterruptedException {
+        long deadline = System.currentTimeMillis() + 1000;
+        while (System.currentTimeMillis() < deadline) {
+            if (writer.buckets.size() == expectedBuckets
+                    && isInboxEmpty(dataStreams)
+                    && getThreadState(dataStreams) != Thread.State.RUNNABLE) {
+                return;
+            }
+            Thread.sleep(10);
+        }
+        assertTrue(isInboxEmpty(dataStreams));
+        assertNotEquals(Thread.State.RUNNABLE, getThreadState(dataStreams));
+        assertEquals(expectedBuckets, writer.buckets.size());
     }
-    assertTrue(isInboxEmpty(dataStreams));
-    assertNotEquals(Thread.State.RUNNABLE, getThreadState(dataStreams));
-  }
-
-  private static void awaitBuckets(
-      DefaultDataStreamsMonitoring dataStreams, CapturingPayloadWriter writer, int expectedBuckets)
-      throws InterruptedException {
-    long deadline = System.currentTimeMillis() + 1000;
-    while (System.currentTimeMillis() < deadline) {
-      if (writer.buckets.size() == expectedBuckets
-          && isInboxEmpty(dataStreams)
-          && getThreadState(dataStreams) != Thread.State.RUNNABLE) {
-        return;
-      }
-      Thread.sleep(10);
+
+    private static DDAgentFeaturesDiscovery stubFeatures(boolean supportsDataStreams) {
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
+        when(features.supportsDataStreams()).thenReturn(supportsDataStreams);
+        return features;
+    }
+
+    private static TraceConfig stubTraceConfig(boolean dataStreamsEnabled) {
+        TraceConfig traceConfig = mock(TraceConfig.class, RETURNS_SMART_NULLS);
+        when(traceConfig.isDataStreamsEnabled()).thenReturn(dataStreamsEnabled);
+        return traceConfig;
+    }
+
+    @TableTest({
+      "scenario             | enabledAtAgent | enabledInConfig",
+      "agent off, config on | false          | true           ",
+      "agent on, config off | true           | false          ",
+      "both off             | false          | false          "
+    })
+    void noPayloadsWrittenIfDataStreamsNotSupportedOrNotEnabled(boolean enabledAtAgent, boolean enabledInConfig)
+            throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(enabledAtAgent);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DatastreamsPayloadWriter payloadWriter = mock(DatastreamsPayloadWriter.class);
+        Sink sink = mock(Sink.class);
+        TraceConfig traceConfig = stubTraceConfig(enabledInConfig);
+
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        dataStreams.add(new StatsPoint(
+                DataStreamsTags.create("testType", null, "testTopic", "testGroup", null),
+                0,
+                0,
+                0,
+                timeSource.getCurrentTimeNanos(),
+                0,
+                0,
+                0,
+                null));
+        dataStreams.report();
+
+        awaitIdle(dataStreams);
+        verify(payloadWriter, org.mockito.Mockito.never()).writePayload(any(), any());
+
+        // cleanup
+        dataStreams.close();
     }
-    assertTrue(isInboxEmpty(dataStreams));
-    assertNotEquals(Thread.State.RUNNABLE, getThreadState(dataStreams));
-    assertEquals(expectedBuckets, writer.buckets.size());
-  }
-
-  private static DDAgentFeaturesDiscovery stubFeatures(boolean supportsDataStreams) {
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
-    when(features.supportsDataStreams()).thenReturn(supportsDataStreams);
-    return features;
-  }
-
-  private static TraceConfig stubTraceConfig(boolean dataStreamsEnabled) {
-    TraceConfig traceConfig = mock(TraceConfig.class, RETURNS_SMART_NULLS);
-    when(traceConfig.isDataStreamsEnabled()).thenReturn(dataStreamsEnabled);
-    return traceConfig;
-  }
-
-  @TableTest({
-    "scenario             | enabledAtAgent | enabledInConfig",
-    "agent off, config on | false          | true           ",
-    "agent on, config off | true           | false          ",
-    "both off             | false          | false          "
-  })
-  void noPayloadsWrittenIfDataStreamsNotSupportedOrNotEnabled(
-      boolean enabledAtAgent, boolean enabledInConfig) throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(enabledAtAgent);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DatastreamsPayloadWriter payloadWriter = mock(DatastreamsPayloadWriter.class);
-    Sink sink = mock(Sink.class);
-    TraceConfig traceConfig = stubTraceConfig(enabledInConfig);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    dataStreams.add(
-        new StatsPoint(
-            DataStreamsTags.create("testType", null, "testTopic", "testGroup", null),
-            0,
-            0,
-            0,
-            timeSource.getCurrentTimeNanos(),
-            0,
-            0,
-            0,
-            null));
-    dataStreams.report();
-
-    awaitIdle(dataStreams);
-    verify(payloadWriter, org.mockito.Mockito.never()).writePayload(any(), any());
-
-    // cleanup
-    dataStreams.close();
-  }
-
-  @Test
-  void contextCarrierAdapterTest() {
-    CustomContextCarrier carrier = new CustomContextCarrier();
-    String keyName = "keyName";
-    String keyValue = "keyValue";
-    String[] extracted = new String[] {""};
-
-    DataStreamsContextCarrierAdapter.INSTANCE.set(carrier, keyName, keyValue);
-    DataStreamsContextCarrierAdapter.INSTANCE.forEachKeyValue(
-        carrier,
-        (key, value) -> {
-          if (keyName.equals(key)) {
-            extracted[0] = value;
-          }
+
+    @Test
+    void contextCarrierAdapterTest() {
+        CustomContextCarrier carrier = new CustomContextCarrier();
+        String keyName = "keyName";
+        String keyValue = "keyValue";
+        String[] extracted = new String[] {""};
+
+        DataStreamsContextCarrierAdapter.INSTANCE.set(carrier, keyName, keyValue);
+        DataStreamsContextCarrierAdapter.INSTANCE.forEachKeyValue(carrier, (key, value) -> {
+            if (keyName.equals(key)) {
+                extracted[0] = value;
+            }
         });
 
-    assertEquals(keyValue, extracted[0]);
-  }
-
-  @Test
-  void writeGroupAfterADelay() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
-    dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    assertEquals(1, bucket.getGroups().size());
-    StatsGroup group = bucket.getGroups().iterator().next();
-    assertEquals("type:testType", group.getTags().getType());
-    assertEquals("group:testGroup", group.getTags().getGroup());
-    assertEquals("topic:testTopic", group.getTags().getTopic());
-    assertEquals(3, group.getTags().nonNullSize());
-    assertEquals(1L, group.getHash());
-    assertEquals(2L, group.getParentHash());
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  // This test relies on automatic reporting instead of manually calling report
-  @Test
-  void slowWriteGroupAfterADelay() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    long bucketDuration = TimeUnit.MILLISECONDS.toNanos(200);
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink, features, timeSource, () -> traceConfig, payloadWriter, bucketDuration);
-    dataStreams.start();
-    DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
-    dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(bucketDuration);
-
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    assertEquals(1, bucket.getGroups().size());
-    StatsGroup group = bucket.getGroups().iterator().next();
-    assertEquals("type:testType", group.getTags().getType());
-    assertEquals("group:testGroup", group.getTags().getGroup());
-    assertEquals("topic:testTopic", group.getTags().getTopic());
-    assertEquals(3, group.getTags().nonNullSize());
-    assertEquals(1L, group.getHash());
-    assertEquals(2L, group.getParentHash());
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void groupsForCurrentBucketAreNotReported() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
-    dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.add(new StatsPoint(tags, 3, 4, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS - 100L);
-    dataStreams.report();
-
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    assertEquals(1, bucket.getGroups().size());
-    StatsGroup group = bucket.getGroups().iterator().next();
-    assertEquals("type:testType", group.getTags().getType());
-    assertEquals("group:testGroup", group.getTags().getGroup());
-    assertEquals("topic:testTopic", group.getTags().getTopic());
-    assertEquals(3, group.getTags().nonNullSize());
-    assertEquals(1L, group.getHash());
-    assertEquals(2L, group.getParentHash());
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void allGroupsWrittenInClose() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    DataStreamsTags tags1 =
-        DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
-    DataStreamsTags tags2 =
-        DataStreamsTags.create("testType", null, "testTopic2", "testGroup", null);
-    dataStreams.add(
-        new StatsPoint(tags1, 1, 2, 5, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.add(
-        new StatsPoint(tags2, 3, 4, 6, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS - 100L);
-    dataStreams.close();
-
-    awaitBuckets(dataStreams, payloadWriter, 2);
-
-    StatsBucket bucket0 = payloadWriter.buckets.get(0);
-    assertEquals(1, bucket0.getGroups().size());
-    StatsGroup group0 = bucket0.getGroups().iterator().next();
-    assertEquals("type:testType", group0.getTags().getType());
-    assertEquals("group:testGroup", group0.getTags().getGroup());
-    assertEquals("topic:testTopic", group0.getTags().getTopic());
-    assertEquals(3, group0.getTags().nonNullSize());
-    assertEquals(1L, group0.getHash());
-    assertEquals(2L, group0.getParentHash());
-
-    StatsBucket bucket1 = payloadWriter.buckets.get(1);
-    assertEquals(1, bucket1.getGroups().size());
-    StatsGroup group1 = bucket1.getGroups().iterator().next();
-    assertEquals("type:testType", group1.getTags().getType());
-    assertEquals("group:testGroup", group1.getTags().getGroup());
-    assertEquals("topic:testTopic2", group1.getTags().getTopic());
-    assertEquals(3, group1.getTags().nonNullSize());
-    assertEquals(3L, group1.getHash());
-    assertEquals(4L, group1.getParentHash());
-
-    // cleanup
-    payloadWriter.close();
-  }
-
-  @Test
-  void kafkaOffsetsAreTracked() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    dataStreams.trackBacklog(
-        DataStreamsTags.createWithPartition("kafka_commit", "testTopic", "2", null, "testGroup"),
-        23);
-    dataStreams.trackBacklog(
-        DataStreamsTags.createWithPartition("kafka_commit", "testTopic", "2", null, "testGroup"),
-        24);
-    dataStreams.trackBacklog(
-        DataStreamsTags.createWithPartition("kafka_produce", "testTopic", "2", null, null), 23);
-    dataStreams.trackBacklog(
-        DataStreamsTags.createWithPartition("kafka_produce", "testTopic2", "2", null, null), 23);
-    dataStreams.trackBacklog(
-        DataStreamsTags.createWithPartition("kafka_produce", "testTopic", "2", null, null), 45);
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    Collection<Entry<DataStreamsTags, Long>> backlogs = bucket.getBacklogs();
-    assertEquals(3, backlogs.size());
-    List<Entry<DataStreamsTags, Long>> sortedBacklogs = new ArrayList<>(backlogs);
-    sortedBacklogs.sort(Comparator.comparing(e -> e.getKey().toString()));
-    assertEquals(
-        DataStreamsTags.createWithPartition("kafka_commit", "testTopic", "2", null, "testGroup"),
-        sortedBacklogs.get(0).getKey());
-    assertEquals(24L, sortedBacklogs.get(0).getValue());
-    assertEquals(
-        DataStreamsTags.createWithPartition("kafka_produce", "testTopic", "2", null, null),
-        sortedBacklogs.get(1).getKey());
-    assertEquals(45L, sortedBacklogs.get(1).getValue());
-    assertEquals(
-        DataStreamsTags.createWithPartition("kafka_produce", "testTopic2", "2", null, null),
-        sortedBacklogs.get(2).getKey());
-    assertEquals(23L, sortedBacklogs.get(2).getValue());
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void groupsFromMultipleBucketsAreReported() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    DataStreamsTags tags1 =
-        DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
-    dataStreams.add(
-        new StatsPoint(tags1, 1, 2, 5, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS * 10);
-    DataStreamsTags tags2 =
-        DataStreamsTags.create("testType", null, "testTopic2", "testGroup", null);
-    dataStreams.add(
-        new StatsPoint(tags2, 3, 4, 6, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    awaitBuckets(dataStreams, payloadWriter, 2);
-
-    StatsBucket bucket0 = payloadWriter.buckets.get(0);
-    assertEquals(1, bucket0.getGroups().size());
-    StatsGroup group0 = bucket0.getGroups().iterator().next();
-    assertEquals(3, group0.getTags().nonNullSize());
-    assertEquals("type:testType", group0.getTags().getType());
-    assertEquals("group:testGroup", group0.getTags().getGroup());
-    assertEquals("topic:testTopic", group0.getTags().getTopic());
-    assertEquals(1L, group0.getHash());
-    assertEquals(2L, group0.getParentHash());
-
-    StatsBucket bucket1 = payloadWriter.buckets.get(1);
-    assertEquals(1, bucket1.getGroups().size());
-    StatsGroup group1 = bucket1.getGroups().iterator().next();
-    assertEquals("type:testType", group1.getTags().getType());
-    assertEquals("group:testGroup", group1.getTags().getGroup());
-    assertEquals("topic:testTopic2", group1.getTags().getTopic());
-    assertEquals(3, group1.getTags().nonNullSize());
-    assertEquals(3L, group1.getHash());
-    assertEquals(4L, group1.getParentHash());
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void multiplePointsAreCorrectlyGroupedInMultipleBuckets() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    dataStreams.add(new StatsPoint(tags, 1, 2, 1, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS - 100L);
-    dataStreams.add(
-        new StatsPoint(
-            tags,
-            1,
-            2,
-            1,
-            timeSource.getCurrentTimeNanos(),
-            SECONDS.toNanos(10),
-            SECONDS.toNanos(10),
-            10,
-            null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.add(
-        new StatsPoint(
-            tags,
-            1,
-            2,
-            1,
-            timeSource.getCurrentTimeNanos(),
-            SECONDS.toNanos(5),
-            SECONDS.toNanos(5),
-            5,
-            null));
-    dataStreams.add(
-        new StatsPoint(
-            tags, 3, 4, 5, timeSource.getCurrentTimeNanos(), SECONDS.toNanos(2), 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    awaitBuckets(dataStreams, payloadWriter, 2);
-
-    StatsBucket bucket0 = payloadWriter.buckets.get(0);
-    assertEquals(1, bucket0.getGroups().size());
-    StatsGroup group0 = bucket0.getGroups().iterator().next();
-    assertEquals("type:testType", group0.getTags().getType());
-    assertEquals("group:testGroup", group0.getTags().getGroup());
-    assertEquals("topic:testTopic", group0.getTags().getTopic());
-    assertEquals(3, group0.getTags().nonNullSize());
-    assertEquals(1L, group0.getHash());
-    assertEquals(2L, group0.getParentHash());
-    assertTrue(Math.abs((group0.getPathwayLatency().getMaxValue() - 10) / 10) < 0.01);
-
-    StatsBucket bucket1 = payloadWriter.buckets.get(1);
-    assertEquals(2, bucket1.getGroups().size());
-    List<StatsGroup> sortedGroups = new ArrayList<>(bucket1.getGroups());
-    sortedGroups.sort(Comparator.comparingLong(StatsGroup::getHash));
-
-    StatsGroup sortedGroup0 = sortedGroups.get(0);
-    assertEquals(1L, sortedGroup0.getHash());
-    assertEquals(2L, sortedGroup0.getParentHash());
-    assertEquals("type:testType", sortedGroup0.getTags().getType());
-    assertEquals("group:testGroup", sortedGroup0.getTags().getGroup());
-    assertEquals("topic:testTopic", sortedGroup0.getTags().getTopic());
-    assertEquals(3, sortedGroup0.getTags().nonNullSize());
-    assertTrue(Math.abs((sortedGroup0.getPathwayLatency().getMaxValue() - 5) / 5) < 0.01);
-
-    StatsGroup sortedGroup1 = sortedGroups.get(1);
-    assertEquals(3L, sortedGroup1.getHash());
-    assertEquals(4L, sortedGroup1.getParentHash());
-    assertEquals("type:testType", sortedGroup1.getTags().getType());
-    assertEquals("group:testGroup", sortedGroup1.getTags().getGroup());
-    assertEquals("topic:testTopic", sortedGroup1.getTags().getTopic());
-    assertEquals(3, sortedGroup1.getTags().nonNullSize());
-    assertTrue(Math.abs((sortedGroup1.getPathwayLatency().getMaxValue() - 2) / 2) < 0.01);
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void featureUpgrade() throws InterruptedException {
-    boolean[] supportsDataStreaming = new boolean[] {false};
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
-    when(features.supportsDataStreams()).thenAnswer(invocation -> supportsDataStreaming[0]);
-
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    // reporting points when data streams is not supported
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
-    dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // no buckets are reported
-    awaitIdle(dataStreams);
-    assertTrue(payloadWriter.buckets.isEmpty());
-
-    // report called multiple times without advancing past check interval
-    dataStreams.report();
-    dataStreams.report();
-    dataStreams.report();
-
-    // features are not rechecked
-    awaitIdle(dataStreams);
-    verify(features, org.mockito.Mockito.never()).discover();
-    assertTrue(payloadWriter.buckets.isEmpty());
-
-    // submitting points after an upgrade
-    supportsDataStreaming[0] = true;
-    timeSource.advance(FEATURE_CHECK_INTERVAL_NANOS);
-    dataStreams.report();
-
-    dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // points are now reported
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    assertEquals(1, bucket.getGroups().size());
-    StatsGroup group = bucket.getGroups().iterator().next();
-    assertEquals("type:testType", group.getTags().getType());
-    assertEquals("group:testGroup", group.getTags().getGroup());
-    assertEquals("topic:testTopic", group.getTags().getTopic());
-    assertEquals(3, group.getTags().nonNullSize());
-    assertEquals(1L, group.getHash());
-    assertEquals(2L, group.getParentHash());
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void featureDowngradeThenUpgrade() throws InterruptedException {
-    boolean[] supportsDataStreaming = new boolean[] {true};
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
-    when(features.supportsDataStreams()).thenAnswer(invocation -> supportsDataStreaming[0]);
-
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    // reporting points after a downgrade
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    supportsDataStreaming[0] = false;
-    dataStreams.onEvent(EventListener.EventType.DOWNGRADED, "");
-    DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
-    dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // no buckets are reported
-    awaitIdle(dataStreams);
-    assertTrue(payloadWriter.buckets.isEmpty());
-
-    // submitting points after an upgrade
-    supportsDataStreaming[0] = true;
-    timeSource.advance(FEATURE_CHECK_INTERVAL_NANOS);
-    dataStreams.report();
-
-    dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // points are now reported
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    assertEquals(1, bucket.getGroups().size());
-    StatsGroup group = bucket.getGroups().iterator().next();
-    assertEquals("type:testType", group.getTags().getType());
-    assertEquals("group:testGroup", group.getTags().getGroup());
-    assertEquals("topic:testTopic", group.getTags().getTopic());
-    assertEquals(3, group.getTags().nonNullSize());
-    assertEquals(1L, group.getHash());
-    assertEquals(2L, group.getParentHash());
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void dynamicConfigEnableAndDisable() throws InterruptedException {
-    boolean[] supportsDataStreaming = new boolean[] {true};
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
-    when(features.supportsDataStreams()).thenAnswer(invocation -> supportsDataStreaming[0]);
-
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    boolean[] dsmEnabled = new boolean[] {false};
-    TraceConfig traceConfig = mock(TraceConfig.class, RETURNS_SMART_NULLS);
-    when(traceConfig.isDataStreamsEnabled()).thenAnswer(invocation -> dsmEnabled[0]);
-
-    // reporting points when data streams is not enabled
-    DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // no buckets are reported
-    awaitIdle(dataStreams);
-    assertTrue(payloadWriter.buckets.isEmpty());
-
-    // submitting points after dynamically enabled
-    dsmEnabled[0] = true;
-    dataStreams.report();
-
-    dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // points are now reported
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    assertEquals(1, bucket.getGroups().size());
-    StatsGroup group = bucket.getGroups().iterator().next();
-    assertEquals("type:testType", group.getTags().getType());
-    assertEquals("group:testGroup", group.getTags().getGroup());
-    assertEquals("topic:testTopic", group.getTags().getTopic());
-    assertEquals(3, group.getTags().nonNullSize());
-    assertEquals(1L, group.getHash());
-    assertEquals(2L, group.getParentHash());
-
-    // disabling data streams dynamically
-    dsmEnabled[0] = false;
-    dataStreams.report();
-
-    // inbox is processed
-    awaitIdle(dataStreams);
-
-    // submitting points after being disabled
-    payloadWriter.buckets.clear();
-
-    dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // points are no longer reported
-    awaitIdle(dataStreams);
-    assertTrue(payloadWriter.buckets.isEmpty());
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void featureAndDynamicConfigUpgradeInteractions() throws InterruptedException {
-    boolean[] supportsDataStreaming = new boolean[] {false};
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
-    when(features.supportsDataStreams()).thenAnswer(invocation -> supportsDataStreaming[0]);
-
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    boolean[] dsmEnabled = new boolean[] {false};
-    TraceConfig traceConfig = mock(TraceConfig.class, RETURNS_SMART_NULLS);
-    when(traceConfig.isDataStreamsEnabled()).thenAnswer(invocation -> dsmEnabled[0]);
-
-    // reporting points when data streams is not supported
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
-    dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // no buckets are reported
-    awaitIdle(dataStreams);
-    assertTrue(payloadWriter.buckets.isEmpty());
-
-    // submitting points after an upgrade with dsm disabled
-    supportsDataStreaming[0] = true;
-    timeSource.advance(FEATURE_CHECK_INTERVAL_NANOS);
-    dataStreams.report();
-
-    dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // points are not reported
-    awaitIdle(dataStreams);
-    assertTrue(payloadWriter.buckets.isEmpty());
-
-    // dsm is enabled dynamically
-    dsmEnabled[0] = true;
-    dataStreams.report();
-
-    dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // points are now reported
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    assertEquals(1, bucket.getGroups().size());
-    StatsGroup group = bucket.getGroups().iterator().next();
-    assertEquals("type:testType", group.getTags().getType());
-    assertEquals("group:testGroup", group.getTags().getGroup());
-    assertEquals("topic:testTopic", group.getTags().getTopic());
-    assertEquals(3, group.getTags().nonNullSize());
-    assertEquals(1L, group.getHash());
-    assertEquals(2L, group.getParentHash());
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void moreFeatureAndDynamicConfigUpgradeInteractions() throws InterruptedException {
-    boolean[] supportsDataStreaming = new boolean[] {false};
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
-    when(features.supportsDataStreams()).thenAnswer(invocation -> supportsDataStreaming[0]);
-
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    boolean[] dsmEnabled = new boolean[] {false};
-    TraceConfig traceConfig = mock(TraceConfig.class, RETURNS_SMART_NULLS);
-    when(traceConfig.isDataStreamsEnabled()).thenAnswer(invocation -> dsmEnabled[0]);
-
-    // reporting points when data streams is not supported
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
-    dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // no buckets are reported
-    awaitIdle(dataStreams);
-    assertTrue(payloadWriter.buckets.isEmpty());
-
-    // enabling dsm when not supported by agent
-    dsmEnabled[0] = true;
-    dataStreams.report();
-
-    dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // points are not reported
-    awaitIdle(dataStreams);
-    assertTrue(payloadWriter.buckets.isEmpty());
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void schemaRegistryUsagesAreAggregatedByOperation() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    Sink sink = mock(Sink.class);
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-
-    // Record serialize and deserialize operations
-    dataStreams.reportSchemaRegistryUsage(
-        "test-topic", "test-cluster", 123, true, false, "serialize");
-    // duplicate serialize
-    dataStreams.reportSchemaRegistryUsage(
-        "test-topic", "test-cluster", 123, true, false, "serialize");
-    dataStreams.reportSchemaRegistryUsage(
-        "test-topic", "test-cluster", 123, true, false, "deserialize");
-    // different schema/key
-    dataStreams.reportSchemaRegistryUsage(
-        "test-topic", "test-cluster", 456, true, true, "serialize");
-
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    Collection<Entry<StatsBucket.SchemaKey, Long>> usages = bucket.getSchemaRegistryUsages();
-    assertEquals(3, usages.size()); // 3 unique combinations
-
-    // Find serialize operation for schema 123 (should have count 2)
-    Entry<StatsBucket.SchemaKey, Long> serializeUsage = findUsage(usages, 123, "serialize", false);
-    assertNotNull(serializeUsage);
-    assertEquals(2L, serializeUsage.getValue()); // Aggregated 2 serialize operations
-
-    // Find deserialize operation for schema 123 (should have count 1)
-    Entry<StatsBucket.SchemaKey, Long> deserializeUsage =
-        findUsage(usages, 123, "deserialize", false);
-    assertNotNull(deserializeUsage);
-    assertEquals(1L, deserializeUsage.getValue());
-
-    // Find serialize operation for schema 456 with isKey=true (should have count 1)
-    Entry<StatsBucket.SchemaKey, Long> keySerializeUsage =
-        findUsage(usages, 456, "serialize", true);
-    assertNotNull(keySerializeUsage);
-    assertEquals(1L, keySerializeUsage.getValue());
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  private static Entry<StatsBucket.SchemaKey, Long> findUsage(
-      Collection<Entry<StatsBucket.SchemaKey, Long>> usages,
-      int schemaId,
-      String operation,
-      boolean isKey) {
-    for (Entry<StatsBucket.SchemaKey, Long> entry : usages) {
-      StatsBucket.SchemaKey key = entry.getKey();
-      if (key.getSchemaId() == schemaId
-          && operation.equals(key.getOperation())
-          && key.isKey() == isKey) {
-        return entry;
-      }
+        assertEquals(keyValue, extracted[0]);
+    }
+
+    @Test
+    void writeGroupAfterADelay() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
+        dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        assertEquals(1, bucket.getGroups().size());
+        StatsGroup group = bucket.getGroups().iterator().next();
+        assertEquals("type:testType", group.getTags().getType());
+        assertEquals("group:testGroup", group.getTags().getGroup());
+        assertEquals("topic:testTopic", group.getTags().getTopic());
+        assertEquals(3, group.getTags().nonNullSize());
+        assertEquals(1L, group.getHash());
+        assertEquals(2L, group.getParentHash());
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    // This test relies on automatic reporting instead of manually calling report
+    @Test
+    void slowWriteGroupAfterADelay() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        long bucketDuration = TimeUnit.MILLISECONDS.toNanos(200);
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, bucketDuration);
+        dataStreams.start();
+        DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
+        dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(bucketDuration);
+
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        assertEquals(1, bucket.getGroups().size());
+        StatsGroup group = bucket.getGroups().iterator().next();
+        assertEquals("type:testType", group.getTags().getType());
+        assertEquals("group:testGroup", group.getTags().getGroup());
+        assertEquals("topic:testTopic", group.getTags().getTopic());
+        assertEquals(3, group.getTags().nonNullSize());
+        assertEquals(1L, group.getHash());
+        assertEquals(2L, group.getParentHash());
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    @Test
+    void groupsForCurrentBucketAreNotReported() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
+        dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.add(new StatsPoint(tags, 3, 4, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS - 100L);
+        dataStreams.report();
+
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        assertEquals(1, bucket.getGroups().size());
+        StatsGroup group = bucket.getGroups().iterator().next();
+        assertEquals("type:testType", group.getTags().getType());
+        assertEquals("group:testGroup", group.getTags().getGroup());
+        assertEquals("topic:testTopic", group.getTags().getTopic());
+        assertEquals(3, group.getTags().nonNullSize());
+        assertEquals(1L, group.getHash());
+        assertEquals(2L, group.getParentHash());
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    @Test
+    void allGroupsWrittenInClose() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        DataStreamsTags tags1 = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
+        DataStreamsTags tags2 = DataStreamsTags.create("testType", null, "testTopic2", "testGroup", null);
+        dataStreams.add(new StatsPoint(tags1, 1, 2, 5, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.add(new StatsPoint(tags2, 3, 4, 6, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS - 100L);
+        dataStreams.close();
+
+        awaitBuckets(dataStreams, payloadWriter, 2);
+
+        StatsBucket bucket0 = payloadWriter.buckets.get(0);
+        assertEquals(1, bucket0.getGroups().size());
+        StatsGroup group0 = bucket0.getGroups().iterator().next();
+        assertEquals("type:testType", group0.getTags().getType());
+        assertEquals("group:testGroup", group0.getTags().getGroup());
+        assertEquals("topic:testTopic", group0.getTags().getTopic());
+        assertEquals(3, group0.getTags().nonNullSize());
+        assertEquals(1L, group0.getHash());
+        assertEquals(2L, group0.getParentHash());
+
+        StatsBucket bucket1 = payloadWriter.buckets.get(1);
+        assertEquals(1, bucket1.getGroups().size());
+        StatsGroup group1 = bucket1.getGroups().iterator().next();
+        assertEquals("type:testType", group1.getTags().getType());
+        assertEquals("group:testGroup", group1.getTags().getGroup());
+        assertEquals("topic:testTopic2", group1.getTags().getTopic());
+        assertEquals(3, group1.getTags().nonNullSize());
+        assertEquals(3L, group1.getHash());
+        assertEquals(4L, group1.getParentHash());
+
+        // cleanup
+        payloadWriter.close();
+    }
+
+    @Test
+    void kafkaOffsetsAreTracked() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        dataStreams.trackBacklog(
+                DataStreamsTags.createWithPartition("kafka_commit", "testTopic", "2", null, "testGroup"), 23);
+        dataStreams.trackBacklog(
+                DataStreamsTags.createWithPartition("kafka_commit", "testTopic", "2", null, "testGroup"), 24);
+        dataStreams.trackBacklog(
+                DataStreamsTags.createWithPartition("kafka_produce", "testTopic", "2", null, null), 23);
+        dataStreams.trackBacklog(
+                DataStreamsTags.createWithPartition("kafka_produce", "testTopic2", "2", null, null), 23);
+        dataStreams.trackBacklog(
+                DataStreamsTags.createWithPartition("kafka_produce", "testTopic", "2", null, null), 45);
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        Collection<Entry<DataStreamsTags, Long>> backlogs = bucket.getBacklogs();
+        assertEquals(3, backlogs.size());
+        List<Entry<DataStreamsTags, Long>> sortedBacklogs = new ArrayList<>(backlogs);
+        sortedBacklogs.sort(Comparator.comparing(e -> e.getKey().toString()));
+        assertEquals(
+                DataStreamsTags.createWithPartition("kafka_commit", "testTopic", "2", null, "testGroup"),
+                sortedBacklogs.get(0).getKey());
+        assertEquals(24L, sortedBacklogs.get(0).getValue());
+        assertEquals(
+                DataStreamsTags.createWithPartition("kafka_produce", "testTopic", "2", null, null),
+                sortedBacklogs.get(1).getKey());
+        assertEquals(45L, sortedBacklogs.get(1).getValue());
+        assertEquals(
+                DataStreamsTags.createWithPartition("kafka_produce", "testTopic2", "2", null, null),
+                sortedBacklogs.get(2).getKey());
+        assertEquals(23L, sortedBacklogs.get(2).getValue());
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    @Test
+    void groupsFromMultipleBucketsAreReported() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        DataStreamsTags tags1 = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
+        dataStreams.add(new StatsPoint(tags1, 1, 2, 5, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS * 10);
+        DataStreamsTags tags2 = DataStreamsTags.create("testType", null, "testTopic2", "testGroup", null);
+        dataStreams.add(new StatsPoint(tags2, 3, 4, 6, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        awaitBuckets(dataStreams, payloadWriter, 2);
+
+        StatsBucket bucket0 = payloadWriter.buckets.get(0);
+        assertEquals(1, bucket0.getGroups().size());
+        StatsGroup group0 = bucket0.getGroups().iterator().next();
+        assertEquals(3, group0.getTags().nonNullSize());
+        assertEquals("type:testType", group0.getTags().getType());
+        assertEquals("group:testGroup", group0.getTags().getGroup());
+        assertEquals("topic:testTopic", group0.getTags().getTopic());
+        assertEquals(1L, group0.getHash());
+        assertEquals(2L, group0.getParentHash());
+
+        StatsBucket bucket1 = payloadWriter.buckets.get(1);
+        assertEquals(1, bucket1.getGroups().size());
+        StatsGroup group1 = bucket1.getGroups().iterator().next();
+        assertEquals("type:testType", group1.getTags().getType());
+        assertEquals("group:testGroup", group1.getTags().getGroup());
+        assertEquals("topic:testTopic2", group1.getTags().getTopic());
+        assertEquals(3, group1.getTags().nonNullSize());
+        assertEquals(3L, group1.getHash());
+        assertEquals(4L, group1.getParentHash());
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    @Test
+    void multiplePointsAreCorrectlyGroupedInMultipleBuckets() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        dataStreams.add(new StatsPoint(tags, 1, 2, 1, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS - 100L);
+        dataStreams.add(new StatsPoint(
+                tags, 1, 2, 1, timeSource.getCurrentTimeNanos(), SECONDS.toNanos(10), SECONDS.toNanos(10), 10, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.add(new StatsPoint(
+                tags, 1, 2, 1, timeSource.getCurrentTimeNanos(), SECONDS.toNanos(5), SECONDS.toNanos(5), 5, null));
+        dataStreams.add(
+                new StatsPoint(tags, 3, 4, 5, timeSource.getCurrentTimeNanos(), SECONDS.toNanos(2), 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        awaitBuckets(dataStreams, payloadWriter, 2);
+
+        StatsBucket bucket0 = payloadWriter.buckets.get(0);
+        assertEquals(1, bucket0.getGroups().size());
+        StatsGroup group0 = bucket0.getGroups().iterator().next();
+        assertEquals("type:testType", group0.getTags().getType());
+        assertEquals("group:testGroup", group0.getTags().getGroup());
+        assertEquals("topic:testTopic", group0.getTags().getTopic());
+        assertEquals(3, group0.getTags().nonNullSize());
+        assertEquals(1L, group0.getHash());
+        assertEquals(2L, group0.getParentHash());
+        assertTrue(Math.abs((group0.getPathwayLatency().getMaxValue() - 10) / 10) < 0.01);
+
+        StatsBucket bucket1 = payloadWriter.buckets.get(1);
+        assertEquals(2, bucket1.getGroups().size());
+        List<StatsGroup> sortedGroups = new ArrayList<>(bucket1.getGroups());
+        sortedGroups.sort(Comparator.comparingLong(StatsGroup::getHash));
+
+        StatsGroup sortedGroup0 = sortedGroups.get(0);
+        assertEquals(1L, sortedGroup0.getHash());
+        assertEquals(2L, sortedGroup0.getParentHash());
+        assertEquals("type:testType", sortedGroup0.getTags().getType());
+        assertEquals("group:testGroup", sortedGroup0.getTags().getGroup());
+        assertEquals("topic:testTopic", sortedGroup0.getTags().getTopic());
+        assertEquals(3, sortedGroup0.getTags().nonNullSize());
+        assertTrue(Math.abs((sortedGroup0.getPathwayLatency().getMaxValue() - 5) / 5) < 0.01);
+
+        StatsGroup sortedGroup1 = sortedGroups.get(1);
+        assertEquals(3L, sortedGroup1.getHash());
+        assertEquals(4L, sortedGroup1.getParentHash());
+        assertEquals("type:testType", sortedGroup1.getTags().getType());
+        assertEquals("group:testGroup", sortedGroup1.getTags().getGroup());
+        assertEquals("topic:testTopic", sortedGroup1.getTags().getTopic());
+        assertEquals(3, sortedGroup1.getTags().nonNullSize());
+        assertTrue(Math.abs((sortedGroup1.getPathwayLatency().getMaxValue() - 2) / 2) < 0.01);
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    @Test
+    void featureUpgrade() throws InterruptedException {
+        boolean[] supportsDataStreaming = new boolean[] {false};
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
+        when(features.supportsDataStreams()).thenAnswer(invocation -> supportsDataStreaming[0]);
+
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        // reporting points when data streams is not supported
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
+        dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // no buckets are reported
+        awaitIdle(dataStreams);
+        assertTrue(payloadWriter.buckets.isEmpty());
+
+        // report called multiple times without advancing past check interval
+        dataStreams.report();
+        dataStreams.report();
+        dataStreams.report();
+
+        // features are not rechecked
+        awaitIdle(dataStreams);
+        verify(features, org.mockito.Mockito.never()).discover();
+        assertTrue(payloadWriter.buckets.isEmpty());
+
+        // submitting points after an upgrade
+        supportsDataStreaming[0] = true;
+        timeSource.advance(FEATURE_CHECK_INTERVAL_NANOS);
+        dataStreams.report();
+
+        dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // points are now reported
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        assertEquals(1, bucket.getGroups().size());
+        StatsGroup group = bucket.getGroups().iterator().next();
+        assertEquals("type:testType", group.getTags().getType());
+        assertEquals("group:testGroup", group.getTags().getGroup());
+        assertEquals("topic:testTopic", group.getTags().getTopic());
+        assertEquals(3, group.getTags().nonNullSize());
+        assertEquals(1L, group.getHash());
+        assertEquals(2L, group.getParentHash());
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    @Test
+    void featureDowngradeThenUpgrade() throws InterruptedException {
+        boolean[] supportsDataStreaming = new boolean[] {true};
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
+        when(features.supportsDataStreams()).thenAnswer(invocation -> supportsDataStreaming[0]);
+
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        // reporting points after a downgrade
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        supportsDataStreaming[0] = false;
+        dataStreams.onEvent(EventListener.EventType.DOWNGRADED, "");
+        DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
+        dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // no buckets are reported
+        awaitIdle(dataStreams);
+        assertTrue(payloadWriter.buckets.isEmpty());
+
+        // submitting points after an upgrade
+        supportsDataStreaming[0] = true;
+        timeSource.advance(FEATURE_CHECK_INTERVAL_NANOS);
+        dataStreams.report();
+
+        dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // points are now reported
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        assertEquals(1, bucket.getGroups().size());
+        StatsGroup group = bucket.getGroups().iterator().next();
+        assertEquals("type:testType", group.getTags().getType());
+        assertEquals("group:testGroup", group.getTags().getGroup());
+        assertEquals("topic:testTopic", group.getTags().getTopic());
+        assertEquals(3, group.getTags().nonNullSize());
+        assertEquals(1L, group.getHash());
+        assertEquals(2L, group.getParentHash());
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    @Test
+    void dynamicConfigEnableAndDisable() throws InterruptedException {
+        boolean[] supportsDataStreaming = new boolean[] {true};
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
+        when(features.supportsDataStreams()).thenAnswer(invocation -> supportsDataStreaming[0]);
+
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        boolean[] dsmEnabled = new boolean[] {false};
+        TraceConfig traceConfig = mock(TraceConfig.class, RETURNS_SMART_NULLS);
+        when(traceConfig.isDataStreamsEnabled()).thenAnswer(invocation -> dsmEnabled[0]);
+
+        // reporting points when data streams is not enabled
+        DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // no buckets are reported
+        awaitIdle(dataStreams);
+        assertTrue(payloadWriter.buckets.isEmpty());
+
+        // submitting points after dynamically enabled
+        dsmEnabled[0] = true;
+        dataStreams.report();
+
+        dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // points are now reported
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        assertEquals(1, bucket.getGroups().size());
+        StatsGroup group = bucket.getGroups().iterator().next();
+        assertEquals("type:testType", group.getTags().getType());
+        assertEquals("group:testGroup", group.getTags().getGroup());
+        assertEquals("topic:testTopic", group.getTags().getTopic());
+        assertEquals(3, group.getTags().nonNullSize());
+        assertEquals(1L, group.getHash());
+        assertEquals(2L, group.getParentHash());
+
+        // disabling data streams dynamically
+        dsmEnabled[0] = false;
+        dataStreams.report();
+
+        // inbox is processed
+        awaitIdle(dataStreams);
+
+        // submitting points after being disabled
+        payloadWriter.buckets.clear();
+
+        dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // points are no longer reported
+        awaitIdle(dataStreams);
+        assertTrue(payloadWriter.buckets.isEmpty());
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    @Test
+    void featureAndDynamicConfigUpgradeInteractions() throws InterruptedException {
+        boolean[] supportsDataStreaming = new boolean[] {false};
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
+        when(features.supportsDataStreams()).thenAnswer(invocation -> supportsDataStreaming[0]);
+
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        boolean[] dsmEnabled = new boolean[] {false};
+        TraceConfig traceConfig = mock(TraceConfig.class, RETURNS_SMART_NULLS);
+        when(traceConfig.isDataStreamsEnabled()).thenAnswer(invocation -> dsmEnabled[0]);
+
+        // reporting points when data streams is not supported
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
+        dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // no buckets are reported
+        awaitIdle(dataStreams);
+        assertTrue(payloadWriter.buckets.isEmpty());
+
+        // submitting points after an upgrade with dsm disabled
+        supportsDataStreaming[0] = true;
+        timeSource.advance(FEATURE_CHECK_INTERVAL_NANOS);
+        dataStreams.report();
+
+        dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // points are not reported
+        awaitIdle(dataStreams);
+        assertTrue(payloadWriter.buckets.isEmpty());
+
+        // dsm is enabled dynamically
+        dsmEnabled[0] = true;
+        dataStreams.report();
+
+        dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // points are now reported
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        assertEquals(1, bucket.getGroups().size());
+        StatsGroup group = bucket.getGroups().iterator().next();
+        assertEquals("type:testType", group.getTags().getType());
+        assertEquals("group:testGroup", group.getTags().getGroup());
+        assertEquals("topic:testTopic", group.getTags().getTopic());
+        assertEquals(3, group.getTags().nonNullSize());
+        assertEquals(1L, group.getHash());
+        assertEquals(2L, group.getParentHash());
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    @Test
+    void moreFeatureAndDynamicConfigUpgradeInteractions() throws InterruptedException {
+        boolean[] supportsDataStreaming = new boolean[] {false};
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
+        when(features.supportsDataStreams()).thenAnswer(invocation -> supportsDataStreaming[0]);
+
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        boolean[] dsmEnabled = new boolean[] {false};
+        TraceConfig traceConfig = mock(TraceConfig.class, RETURNS_SMART_NULLS);
+        when(traceConfig.isDataStreamsEnabled()).thenAnswer(invocation -> dsmEnabled[0]);
+
+        // reporting points when data streams is not supported
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
+        dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // no buckets are reported
+        awaitIdle(dataStreams);
+        assertTrue(payloadWriter.buckets.isEmpty());
+
+        // enabling dsm when not supported by agent
+        dsmEnabled[0] = true;
+        dataStreams.report();
+
+        dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // points are not reported
+        awaitIdle(dataStreams);
+        assertTrue(payloadWriter.buckets.isEmpty());
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    @Test
+    void schemaRegistryUsagesAreAggregatedByOperation() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        Sink sink = mock(Sink.class);
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+
+        // Record serialize and deserialize operations
+        dataStreams.reportSchemaRegistryUsage("test-topic", "test-cluster", 123, true, false, "serialize");
+        // duplicate serialize
+        dataStreams.reportSchemaRegistryUsage("test-topic", "test-cluster", 123, true, false, "serialize");
+        dataStreams.reportSchemaRegistryUsage("test-topic", "test-cluster", 123, true, false, "deserialize");
+        // different schema/key
+        dataStreams.reportSchemaRegistryUsage("test-topic", "test-cluster", 456, true, true, "serialize");
+
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        Collection<Entry<StatsBucket.SchemaKey, Long>> usages = bucket.getSchemaRegistryUsages();
+        assertEquals(3, usages.size()); // 3 unique combinations
+
+        // Find serialize operation for schema 123 (should have count 2)
+        Entry<StatsBucket.SchemaKey, Long> serializeUsage = findUsage(usages, 123, "serialize", false);
+        assertNotNull(serializeUsage);
+        assertEquals(2L, serializeUsage.getValue()); // Aggregated 2 serialize operations
+
+        // Find deserialize operation for schema 123 (should have count 1)
+        Entry<StatsBucket.SchemaKey, Long> deserializeUsage = findUsage(usages, 123, "deserialize", false);
+        assertNotNull(deserializeUsage);
+        assertEquals(1L, deserializeUsage.getValue());
+
+        // Find serialize operation for schema 456 with isKey=true (should have count 1)
+        Entry<StatsBucket.SchemaKey, Long> keySerializeUsage = findUsage(usages, 456, "serialize", true);
+        assertNotNull(keySerializeUsage);
+        assertEquals(1L, keySerializeUsage.getValue());
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    private static Entry<StatsBucket.SchemaKey, Long> findUsage(
+            Collection<Entry<StatsBucket.SchemaKey, Long>> usages, int schemaId, String operation, boolean isKey) {
+        for (Entry<StatsBucket.SchemaKey, Long> entry : usages) {
+            StatsBucket.SchemaKey key = entry.getKey();
+            if (key.getSchemaId() == schemaId && operation.equals(key.getOperation()) && key.isKey() == isKey) {
+                return entry;
+            }
+        }
+        return null;
     }
-    return null;
-  }
-
-  @Test
-  void schemaKeyEqualsAndHashCodeWorkCorrectly() {
-    StatsBucket.SchemaKey key1 =
-        new StatsBucket.SchemaKey("topic1", "cluster1", 123, true, false, "serialize");
-    StatsBucket.SchemaKey key2 =
-        new StatsBucket.SchemaKey("topic1", "cluster1", 123, true, false, "serialize");
-    // different topic
-    StatsBucket.SchemaKey key3 =
-        new StatsBucket.SchemaKey("topic2", "cluster1", 123, true, false, "serialize");
-    // different cluster
-    StatsBucket.SchemaKey key4 =
-        new StatsBucket.SchemaKey("topic1", "cluster2", 123, true, false, "serialize");
-    // different schema
-    StatsBucket.SchemaKey key5 =
-        new StatsBucket.SchemaKey("topic1", "cluster1", 456, true, false, "serialize");
-    // different success
-    StatsBucket.SchemaKey key6 =
-        new StatsBucket.SchemaKey("topic1", "cluster1", 123, false, false, "serialize");
-    // different isKey
-    StatsBucket.SchemaKey key7 =
-        new StatsBucket.SchemaKey("topic1", "cluster1", 123, true, true, "serialize");
-    // different operation
-    StatsBucket.SchemaKey key8 =
-        new StatsBucket.SchemaKey("topic1", "cluster1", 123, true, false, "deserialize");
-
-    // Reflexive
-    assertEquals(key1, key1);
-    assertEquals(key1.hashCode(), key1.hashCode());
-
-    // Symmetric
-    assertEquals(key1, key2);
-    assertEquals(key2, key1);
-    assertEquals(key1.hashCode(), key2.hashCode());
-
-    // Different topic
-    assertNotEquals(key1, key3);
-    assertNotEquals(key3, key1);
-
-    // Different cluster
-    assertNotEquals(key1, key4);
-    assertNotEquals(key4, key1);
-
-    // Different schema ID
-    assertNotEquals(key1, key5);
-    assertNotEquals(key5, key1);
-
-    // Different success
-    assertNotEquals(key1, key6);
-    assertNotEquals(key6, key1);
-
-    // Different isKey
-    assertNotEquals(key1, key7);
-    assertNotEquals(key7, key1);
-
-    // Different operation
-    assertNotEquals(key1, key8);
-    assertNotEquals(key8, key1);
-
-    // Null check
-    assertNotEquals(null, key1);
-
-    // Different class
-    assertNotEquals("not a schema key", key1);
-  }
-
-  @Test
-  void statsBucketAggregatesSchemaRegistryUsagesCorrectly() {
-    StatsBucket bucket = new StatsBucket(1000L, 10000L);
-    SchemaRegistryUsage usage1 =
-        new SchemaRegistryUsage("topic1", "cluster1", 123, true, false, "serialize", 1000L, null);
-    SchemaRegistryUsage usage2 =
-        new SchemaRegistryUsage("topic1", "cluster1", 123, true, false, "serialize", 2000L, null);
-    SchemaRegistryUsage usage3 =
-        new SchemaRegistryUsage("topic1", "cluster1", 123, true, false, "deserialize", 3000L, null);
-
-    bucket.addSchemaRegistryUsage(usage1);
-    // should increment count for same key
-    bucket.addSchemaRegistryUsage(usage2);
-    // different operation, new key
-    bucket.addSchemaRegistryUsage(usage3);
-
-    Collection<Entry<StatsBucket.SchemaKey, Long>> usages = bucket.getSchemaRegistryUsages();
-    Map<StatsBucket.SchemaKey, Long> usageMap = new HashMap<>();
-    for (Entry<StatsBucket.SchemaKey, Long> entry : usages) {
-      usageMap.put(entry.getKey(), entry.getValue());
+
+    @Test
+    void schemaKeyEqualsAndHashCodeWorkCorrectly() {
+        StatsBucket.SchemaKey key1 = new StatsBucket.SchemaKey("topic1", "cluster1", 123, true, false, "serialize");
+        StatsBucket.SchemaKey key2 = new StatsBucket.SchemaKey("topic1", "cluster1", 123, true, false, "serialize");
+        // different topic
+        StatsBucket.SchemaKey key3 = new StatsBucket.SchemaKey("topic2", "cluster1", 123, true, false, "serialize");
+        // different cluster
+        StatsBucket.SchemaKey key4 = new StatsBucket.SchemaKey("topic1", "cluster2", 123, true, false, "serialize");
+        // different schema
+        StatsBucket.SchemaKey key5 = new StatsBucket.SchemaKey("topic1", "cluster1", 456, true, false, "serialize");
+        // different success
+        StatsBucket.SchemaKey key6 = new StatsBucket.SchemaKey("topic1", "cluster1", 123, false, false, "serialize");
+        // different isKey
+        StatsBucket.SchemaKey key7 = new StatsBucket.SchemaKey("topic1", "cluster1", 123, true, true, "serialize");
+        // different operation
+        StatsBucket.SchemaKey key8 = new StatsBucket.SchemaKey("topic1", "cluster1", 123, true, false, "deserialize");
+
+        // Reflexive
+        assertEquals(key1, key1);
+        assertEquals(key1.hashCode(), key1.hashCode());
+
+        // Symmetric
+        assertEquals(key1, key2);
+        assertEquals(key2, key1);
+        assertEquals(key1.hashCode(), key2.hashCode());
+
+        // Different topic
+        assertNotEquals(key1, key3);
+        assertNotEquals(key3, key1);
+
+        // Different cluster
+        assertNotEquals(key1, key4);
+        assertNotEquals(key4, key1);
+
+        // Different schema ID
+        assertNotEquals(key1, key5);
+        assertNotEquals(key5, key1);
+
+        // Different success
+        assertNotEquals(key1, key6);
+        assertNotEquals(key6, key1);
+
+        // Different isKey
+        assertNotEquals(key1, key7);
+        assertNotEquals(key7, key1);
+
+        // Different operation
+        assertNotEquals(key1, key8);
+        assertNotEquals(key8, key1);
+
+        // Null check
+        assertNotEquals(null, key1);
+
+        // Different class
+        assertNotEquals("not a schema key", key1);
+    }
+
+    @Test
+    void statsBucketAggregatesSchemaRegistryUsagesCorrectly() {
+        StatsBucket bucket = new StatsBucket(1000L, 10000L);
+        SchemaRegistryUsage usage1 =
+                new SchemaRegistryUsage("topic1", "cluster1", 123, true, false, "serialize", 1000L, null);
+        SchemaRegistryUsage usage2 =
+                new SchemaRegistryUsage("topic1", "cluster1", 123, true, false, "serialize", 2000L, null);
+        SchemaRegistryUsage usage3 =
+                new SchemaRegistryUsage("topic1", "cluster1", 123, true, false, "deserialize", 3000L, null);
+
+        bucket.addSchemaRegistryUsage(usage1);
+        // should increment count for same key
+        bucket.addSchemaRegistryUsage(usage2);
+        // different operation, new key
+        bucket.addSchemaRegistryUsage(usage3);
+
+        Collection<Entry<StatsBucket.SchemaKey, Long>> usages = bucket.getSchemaRegistryUsages();
+        Map<StatsBucket.SchemaKey, Long> usageMap = new HashMap<>();
+        for (Entry<StatsBucket.SchemaKey, Long> entry : usages) {
+            usageMap.put(entry.getKey(), entry.getValue());
+        }
+
+        assertEquals(2, usages.size());
+
+        // Check serialize count
+        StatsBucket.SchemaKey serializeKey =
+                new StatsBucket.SchemaKey("topic1", "cluster1", 123, true, false, "serialize");
+        assertEquals(2L, usageMap.get(serializeKey));
+
+        // Check deserialize count
+        StatsBucket.SchemaKey deserializeKey =
+                new StatsBucket.SchemaKey("topic1", "cluster1", 123, true, false, "deserialize");
+        assertEquals(1L, usageMap.get(deserializeKey));
+
+        // Check that different operations create different keys
+        assertNotEquals(serializeKey, deserializeKey);
+    }
+
+    @Test
+    void kafkaProducerConfigIsReportedInBucket() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        Map<String, String> kafkaConfig = new HashMap<>();
+        kafkaConfig.put("bootstrap.servers", "localhost:9092");
+        kafkaConfig.put("acks", "all");
+        dataStreams.reportKafkaConfig("kafka_producer", "", "", kafkaConfig);
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        List<KafkaConfigReport> kafkaConfigs = bucket.getKafkaConfigs();
+        assertEquals(1, kafkaConfigs.size());
+        KafkaConfigReport report = kafkaConfigs.get(0);
+        assertEquals("kafka_producer", report.getType());
+        assertEquals("localhost:9092", report.getConfig().get("bootstrap.servers"));
+        assertEquals("all", report.getConfig().get("acks"));
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    @Test
+    void kafkaConsumerConfigIsReportedInBucket() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        Map<String, String> kafkaConfig = new HashMap<>();
+        kafkaConfig.put("bootstrap.servers", "localhost:9092");
+        kafkaConfig.put("group.id", "test-group");
+        kafkaConfig.put("auto.offset.reset", "earliest");
+        dataStreams.reportKafkaConfig("kafka_consumer", "", "test-group", kafkaConfig);
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        List<KafkaConfigReport> kafkaConfigs = bucket.getKafkaConfigs();
+        assertEquals(1, kafkaConfigs.size());
+        KafkaConfigReport report = kafkaConfigs.get(0);
+        assertEquals("kafka_consumer", report.getType());
+        assertEquals("localhost:9092", report.getConfig().get("bootstrap.servers"));
+        assertEquals("test-group", report.getConfig().get("group.id"));
+        assertEquals("earliest", report.getConfig().get("auto.offset.reset"));
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    @Test
+    void kafkaConsumerGroupMemberIsReportedInBucket() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        dataStreams.reportKafkaConsumerGroupMember("cluster-1", "test-group", "consumer-1-abc123", 7, "range");
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        List<KafkaConfigReport> kafkaConfigs = bucket.getKafkaConfigs();
+        assertEquals(1, kafkaConfigs.size());
+        KafkaConfigReport report = kafkaConfigs.get(0);
+        assertEquals("kafka_consumer", report.getType());
+        assertEquals("cluster-1", report.getKafkaClusterId());
+        assertEquals("test-group", report.getConsumerGroup());
+        assertEquals("consumer-1-abc123", report.getMemberId());
+        assertEquals(7, report.getGenerationId());
+        assertEquals("range", report.getMemberProtocol());
+        assertTrue(report.getConfig().isEmpty());
+
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    @Test
+    void duplicateKafkaConfigsAreEachReportedInTheBucket() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        // reporting the same config twice
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        Map<String, String> config1 = new HashMap<>();
+        config1.put("bootstrap.servers", "localhost:9092");
+        config1.put("acks", "all");
+        Map<String, String> config2 = new HashMap<>();
+        config2.put("bootstrap.servers", "localhost:9092");
+        config2.put("acks", "all");
+        dataStreams.reportKafkaConfig("kafka_producer", "", "", config1);
+        dataStreams.reportKafkaConfig("kafka_producer", "", "", config2);
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // both configs are reported in the bucket
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        List<KafkaConfigReport> kafkaConfigs = bucket.getKafkaConfigs();
+        assertEquals(2, kafkaConfigs.size());
+        for (KafkaConfigReport report : kafkaConfigs) {
+            assertEquals("kafka_producer", report.getType());
+            assertEquals("localhost:9092", report.getConfig().get("bootstrap.servers"));
+            assertEquals("all", report.getConfig().get("acks"));
+        }
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    @Test
+    void kafkaConfigsReportedInSeparateBucketsAppearInEachBucket() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        // reporting a config in the first bucket
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        Map<String, String> kafkaConfig = new HashMap<>();
+        kafkaConfig.put("bootstrap.servers", "localhost:9092");
+        kafkaConfig.put("acks", "all");
+        dataStreams.reportKafkaConfig("kafka_producer", "", "", kafkaConfig);
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // first bucket has the config
+        awaitBuckets(dataStreams, payloadWriter, 1);
+        assertEquals(1, payloadWriter.buckets.get(0).getKafkaConfigs().size());
+
+        // reporting the same config again in a new bucket
+        payloadWriter.buckets.clear();
+        dataStreams.reportKafkaConfig("kafka_producer", "", "", kafkaConfig);
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // second bucket also has the config
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        List<KafkaConfigReport> kafkaConfigs = bucket.getKafkaConfigs();
+        assertEquals(1, kafkaConfigs.size());
+        KafkaConfigReport report = kafkaConfigs.get(0);
+        assertEquals("kafka_producer", report.getType());
+        assertEquals("localhost:9092", report.getConfig().get("bootstrap.servers"));
+        assertEquals("all", report.getConfig().get("acks"));
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
+    }
+
+    @Test
+    void differentKafkaConfigsAreBothReported() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        // reporting producer and consumer configs
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        Map<String, String> producerConfig = new HashMap<>();
+        producerConfig.put("bootstrap.servers", "localhost:9092");
+        producerConfig.put("acks", "all");
+        dataStreams.reportKafkaConfig("kafka_producer", "", "", producerConfig);
+        Map<String, String> consumerConfig = new HashMap<>();
+        consumerConfig.put("bootstrap.servers", "localhost:9092");
+        consumerConfig.put("group.id", "my-group");
+        dataStreams.reportKafkaConfig("kafka_consumer", "", "my-group", consumerConfig);
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // both configs are reported
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        List<KafkaConfigReport> kafkaConfigs = bucket.getKafkaConfigs();
+        assertEquals(2, kafkaConfigs.size());
+
+        KafkaConfigReport producerReport = findReport(kafkaConfigs, "kafka_producer");
+        assertNotNull(producerReport);
+        assertEquals("localhost:9092", producerReport.getConfig().get("bootstrap.servers"));
+        assertEquals("all", producerReport.getConfig().get("acks"));
+
+        KafkaConfigReport consumerReport = findReport(kafkaConfigs, "kafka_consumer");
+        assertNotNull(consumerReport);
+        assertEquals("localhost:9092", consumerReport.getConfig().get("bootstrap.servers"));
+        assertEquals("my-group", consumerReport.getConfig().get("group.id"));
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
     }
 
-    assertEquals(2, usages.size());
-
-    // Check serialize count
-    StatsBucket.SchemaKey serializeKey =
-        new StatsBucket.SchemaKey("topic1", "cluster1", 123, true, false, "serialize");
-    assertEquals(2L, usageMap.get(serializeKey));
-
-    // Check deserialize count
-    StatsBucket.SchemaKey deserializeKey =
-        new StatsBucket.SchemaKey("topic1", "cluster1", 123, true, false, "deserialize");
-    assertEquals(1L, usageMap.get(deserializeKey));
-
-    // Check that different operations create different keys
-    assertNotEquals(serializeKey, deserializeKey);
-  }
-
-  @Test
-  void kafkaProducerConfigIsReportedInBucket() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    Map<String, String> kafkaConfig = new HashMap<>();
-    kafkaConfig.put("bootstrap.servers", "localhost:9092");
-    kafkaConfig.put("acks", "all");
-    dataStreams.reportKafkaConfig("kafka_producer", "", "", kafkaConfig);
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    List<KafkaConfigReport> kafkaConfigs = bucket.getKafkaConfigs();
-    assertEquals(1, kafkaConfigs.size());
-    KafkaConfigReport report = kafkaConfigs.get(0);
-    assertEquals("kafka_producer", report.getType());
-    assertEquals("localhost:9092", report.getConfig().get("bootstrap.servers"));
-    assertEquals("all", report.getConfig().get("acks"));
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void kafkaConsumerConfigIsReportedInBucket() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    Map<String, String> kafkaConfig = new HashMap<>();
-    kafkaConfig.put("bootstrap.servers", "localhost:9092");
-    kafkaConfig.put("group.id", "test-group");
-    kafkaConfig.put("auto.offset.reset", "earliest");
-    dataStreams.reportKafkaConfig("kafka_consumer", "", "test-group", kafkaConfig);
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    List<KafkaConfigReport> kafkaConfigs = bucket.getKafkaConfigs();
-    assertEquals(1, kafkaConfigs.size());
-    KafkaConfigReport report = kafkaConfigs.get(0);
-    assertEquals("kafka_consumer", report.getType());
-    assertEquals("localhost:9092", report.getConfig().get("bootstrap.servers"));
-    assertEquals("test-group", report.getConfig().get("group.id"));
-    assertEquals("earliest", report.getConfig().get("auto.offset.reset"));
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void kafkaConsumerGroupMemberIsReportedInBucket() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    dataStreams.reportKafkaConsumerGroupMember(
-        "cluster-1", "test-group", "consumer-1-abc123", 7, "range");
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    List<KafkaConfigReport> kafkaConfigs = bucket.getKafkaConfigs();
-    assertEquals(1, kafkaConfigs.size());
-    KafkaConfigReport report = kafkaConfigs.get(0);
-    assertEquals("kafka_consumer", report.getType());
-    assertEquals("cluster-1", report.getKafkaClusterId());
-    assertEquals("test-group", report.getConsumerGroup());
-    assertEquals("consumer-1-abc123", report.getMemberId());
-    assertEquals(7, report.getGenerationId());
-    assertEquals("range", report.getMemberProtocol());
-    assertTrue(report.getConfig().isEmpty());
-
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void duplicateKafkaConfigsAreEachReportedInTheBucket() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    // reporting the same config twice
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    Map<String, String> config1 = new HashMap<>();
-    config1.put("bootstrap.servers", "localhost:9092");
-    config1.put("acks", "all");
-    Map<String, String> config2 = new HashMap<>();
-    config2.put("bootstrap.servers", "localhost:9092");
-    config2.put("acks", "all");
-    dataStreams.reportKafkaConfig("kafka_producer", "", "", config1);
-    dataStreams.reportKafkaConfig("kafka_producer", "", "", config2);
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // both configs are reported in the bucket
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    List<KafkaConfigReport> kafkaConfigs = bucket.getKafkaConfigs();
-    assertEquals(2, kafkaConfigs.size());
-    for (KafkaConfigReport report : kafkaConfigs) {
-      assertEquals("kafka_producer", report.getType());
-      assertEquals("localhost:9092", report.getConfig().get("bootstrap.servers"));
-      assertEquals("all", report.getConfig().get("acks"));
+    private static KafkaConfigReport findReport(List<KafkaConfigReport> configs, String type) {
+        for (KafkaConfigReport report : configs) {
+            if (type.equals(report.getType())) {
+                return report;
+            }
+        }
+        return null;
     }
 
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void kafkaConfigsReportedInSeparateBucketsAppearInEachBucket() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    // reporting a config in the first bucket
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    Map<String, String> kafkaConfig = new HashMap<>();
-    kafkaConfig.put("bootstrap.servers", "localhost:9092");
-    kafkaConfig.put("acks", "all");
-    dataStreams.reportKafkaConfig("kafka_producer", "", "", kafkaConfig);
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // first bucket has the config
-    awaitBuckets(dataStreams, payloadWriter, 1);
-    assertEquals(1, payloadWriter.buckets.get(0).getKafkaConfigs().size());
-
-    // reporting the same config again in a new bucket
-    payloadWriter.buckets.clear();
-    dataStreams.reportKafkaConfig("kafka_producer", "", "", kafkaConfig);
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // second bucket also has the config
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    List<KafkaConfigReport> kafkaConfigs = bucket.getKafkaConfigs();
-    assertEquals(1, kafkaConfigs.size());
-    KafkaConfigReport report = kafkaConfigs.get(0);
-    assertEquals("kafka_producer", report.getType());
-    assertEquals("localhost:9092", report.getConfig().get("bootstrap.servers"));
-    assertEquals("all", report.getConfig().get("acks"));
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void differentKafkaConfigsAreBothReported() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    // reporting producer and consumer configs
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    Map<String, String> producerConfig = new HashMap<>();
-    producerConfig.put("bootstrap.servers", "localhost:9092");
-    producerConfig.put("acks", "all");
-    dataStreams.reportKafkaConfig("kafka_producer", "", "", producerConfig);
-    Map<String, String> consumerConfig = new HashMap<>();
-    consumerConfig.put("bootstrap.servers", "localhost:9092");
-    consumerConfig.put("group.id", "my-group");
-    dataStreams.reportKafkaConfig("kafka_consumer", "", "my-group", consumerConfig);
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // both configs are reported
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    List<KafkaConfigReport> kafkaConfigs = bucket.getKafkaConfigs();
-    assertEquals(2, kafkaConfigs.size());
-
-    KafkaConfigReport producerReport = findReport(kafkaConfigs, "kafka_producer");
-    assertNotNull(producerReport);
-    assertEquals("localhost:9092", producerReport.getConfig().get("bootstrap.servers"));
-    assertEquals("all", producerReport.getConfig().get("acks"));
-
-    KafkaConfigReport consumerReport = findReport(kafkaConfigs, "kafka_consumer");
-    assertNotNull(consumerReport);
-    assertEquals("localhost:9092", consumerReport.getConfig().get("bootstrap.servers"));
-    assertEquals("my-group", consumerReport.getConfig().get("group.id"));
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  private static KafkaConfigReport findReport(List<KafkaConfigReport> configs, String type) {
-    for (KafkaConfigReport report : configs) {
-      if (type.equals(report.getType())) {
-        return report;
-      }
+    @Test
+    void kafkaConfigsWithDifferentValuesForSameTypeAreNotDeduplicated() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        // reporting two producer configs with different settings
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        Map<String, String> config1 = new HashMap<>();
+        config1.put("bootstrap.servers", "localhost:9092");
+        config1.put("acks", "all");
+        dataStreams.reportKafkaConfig("kafka_producer", "", "", config1);
+        Map<String, String> config2 = new HashMap<>();
+        config2.put("bootstrap.servers", "localhost:9093");
+        config2.put("acks", "1");
+        dataStreams.reportKafkaConfig("kafka_producer", "", "", config2);
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // both configs are reported because they have different values
+        awaitBuckets(dataStreams, payloadWriter, 1);
+        assertEquals(2, payloadWriter.buckets.get(0).getKafkaConfigs().size());
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
     }
-    return null;
-  }
-
-  @Test
-  void kafkaConfigsWithDifferentValuesForSameTypeAreNotDeduplicated() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    // reporting two producer configs with different settings
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    Map<String, String> config1 = new HashMap<>();
-    config1.put("bootstrap.servers", "localhost:9092");
-    config1.put("acks", "all");
-    dataStreams.reportKafkaConfig("kafka_producer", "", "", config1);
-    Map<String, String> config2 = new HashMap<>();
-    config2.put("bootstrap.servers", "localhost:9093");
-    config2.put("acks", "1");
-    dataStreams.reportKafkaConfig("kafka_producer", "", "", config2);
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // both configs are reported because they have different values
-    awaitBuckets(dataStreams, payloadWriter, 1);
-    assertEquals(2, payloadWriter.buckets.get(0).getKafkaConfigs().size());
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void kafkaConfigsAreReportedAlongsideStatsPoints() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    // reporting both stats points and kafka configs
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
-    dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-    Map<String, String> kafkaConfig = new HashMap<>();
-    kafkaConfig.put("bootstrap.servers", "localhost:9092");
-    dataStreams.reportKafkaConfig("kafka_producer", "", "", kafkaConfig);
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    // bucket contains both stats groups and kafka configs
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    assertEquals(1, bucket.getGroups().size());
-    List<KafkaConfigReport> kafkaConfigs = bucket.getKafkaConfigs();
-    assertEquals(1, kafkaConfigs.size());
-
-    StatsGroup group = bucket.getGroups().iterator().next();
-    assertEquals("type:testType", group.getTags().getType());
-    assertEquals(1L, group.getHash());
-    assertEquals(2L, group.getParentHash());
-
-    KafkaConfigReport report = kafkaConfigs.get(0);
-    assertEquals("kafka_producer", report.getType());
-    assertEquals("localhost:9092", report.getConfig().get("bootstrap.servers"));
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @TableTest({
-    "scenario             | enabledAtAgent | enabledInConfig",
-    "agent off, config on | false          | true           ",
-    "agent on, config off | true           | false          ",
-    "both off             | false          | false          "
-  })
-  void kafkaConfigsNotReportedWhenDSMIsDisabled(boolean enabledAtAgent, boolean enabledInConfig)
-      throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(enabledAtAgent);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    Sink sink = mock(Sink.class);
-    TraceConfig traceConfig = stubTraceConfig(enabledInConfig);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    Map<String, String> kafkaConfig = new HashMap<>();
-    kafkaConfig.put("bootstrap.servers", "localhost:9092");
-    dataStreams.reportKafkaConfig("kafka_producer", "", "", kafkaConfig);
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.report();
-
-    awaitIdle(dataStreams);
-    assertTrue(payloadWriter.buckets.isEmpty());
-
-    // cleanup
-    payloadWriter.close();
-    dataStreams.close();
-  }
-
-  @Test
-  void kafkaConfigsFlushedOnClose() throws InterruptedException {
-    DDAgentFeaturesDiscovery features = stubFeatures(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    Sink sink = mock(Sink.class);
-    CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
-    TraceConfig traceConfig = stubTraceConfig(true);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-    dataStreams.start();
-    Map<String, String> kafkaConfig = new HashMap<>();
-    kafkaConfig.put("bootstrap.servers", "localhost:9092");
-    dataStreams.reportKafkaConfig("kafka_producer", "", "", kafkaConfig);
-    timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS - 100L);
-    dataStreams.close();
-
-    // configs in the current bucket are flushed on close
-    awaitBuckets(dataStreams, payloadWriter, 1);
-
-    StatsBucket bucket = payloadWriter.buckets.get(0);
-    List<KafkaConfigReport> kafkaConfigs = bucket.getKafkaConfigs();
-    assertEquals(1, kafkaConfigs.size());
-    KafkaConfigReport report = kafkaConfigs.get(0);
-    assertEquals("kafka_producer", report.getType());
-    assertEquals("localhost:9092", report.getConfig().get("bootstrap.servers"));
-
-    // cleanup
-    payloadWriter.close();
-  }
-
-  @Test
-  void kafkaConfigReportEqualsAndHashCodeWorkCorrectly() {
-    Map<String, String> sameConfig = new HashMap<>();
-    sameConfig.put("bootstrap.servers", "localhost:9092");
-    sameConfig.put("acks", "all");
-    Map<String, String> sameConfig2 = new HashMap<>();
-    sameConfig2.put("bootstrap.servers", "localhost:9092");
-    sameConfig2.put("acks", "all");
-    Map<String, String> differentConfig = new HashMap<>();
-    differentConfig.put("bootstrap.servers", "localhost:9093");
-
-    KafkaConfigReport config1 =
-        new KafkaConfigReport("kafka_producer", "", "", sameConfig, 1000L, null);
-    // different timestamp
-    KafkaConfigReport config2 =
-        new KafkaConfigReport("kafka_producer", "", "", sameConfig2, 2000L, null);
-    // different type
-    KafkaConfigReport config3 =
-        new KafkaConfigReport("kafka_consumer", "", "", sameConfig, 1000L, null);
-    // different config values
-    KafkaConfigReport config4 =
-        new KafkaConfigReport("kafka_producer", "", "", differentConfig, 1000L, null);
-    // different serviceNameOverride
-    KafkaConfigReport config5 =
-        new KafkaConfigReport("kafka_producer", "", "", sameConfig, 1000L, "other-service");
-
-    // Reflexive
-    assertEquals(config1, config1);
-    assertEquals(config1.hashCode(), config1.hashCode());
-
-    // Same type and config, different timestamp -- equals (timestamp is NOT part of equals)
-    assertEquals(config1, config2);
-    assertEquals(config2, config1);
-    assertEquals(config1.hashCode(), config2.hashCode());
-
-    // Same type and config, different serviceNameOverride -- equals (serviceNameOverride is NOT
-    // part of equals)
-    assertEquals(config1, config5);
-    assertEquals(config5, config1);
-    assertEquals(config1.hashCode(), config5.hashCode());
-
-    // Different type
-    assertNotEquals(config1, config3);
-    assertNotEquals(config3, config1);
-
-    // Different config values
-    assertNotEquals(config1, config4);
-    assertNotEquals(config4, config1);
-
-    // Null check
-    assertNotEquals(null, config1);
-
-    // Different class
-    assertNotEquals("not a config report", config1);
-  }
-
-  @Test
-  void statsBucketStoresKafkaConfigs() {
-    StatsBucket bucket = new StatsBucket(1000L, 10000L);
-    Map<String, String> producerCfg = new HashMap<>();
-    producerCfg.put("acks", "all");
-    KafkaConfigReport config1 =
-        new KafkaConfigReport("kafka_producer", "", "", producerCfg, 1000L, null);
-    Map<String, String> consumerCfg = new HashMap<>();
-    consumerCfg.put("group.id", "test");
-    KafkaConfigReport config2 =
-        new KafkaConfigReport("kafka_consumer", "", "test", consumerCfg, 2000L, null);
-
-    bucket.addKafkaConfig(config1);
-    bucket.addKafkaConfig(config2);
-
-    assertEquals(2, bucket.getKafkaConfigs().size());
-    assertEquals("kafka_producer", bucket.getKafkaConfigs().get(0).getType());
-    assertEquals("all", bucket.getKafkaConfigs().get(0).getConfig().get("acks"));
-    assertEquals("kafka_consumer", bucket.getKafkaConfigs().get(1).getType());
-    assertEquals("test", bucket.getKafkaConfigs().get(1).getConfig().get("group.id"));
-  }
-
-  static class CapturingPayloadWriter implements DatastreamsPayloadWriter {
-    boolean accepting = true;
-    final List<StatsBucket> buckets = new ArrayList<>();
-
-    @Override
-    public void writePayload(Collection<StatsBucket> payload, String serviceNameOverride) {
-      if (accepting) {
-        buckets.addAll(payload);
-      }
+
+    @Test
+    void kafkaConfigsAreReportedAlongsideStatsPoints() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        // reporting both stats points and kafka configs
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
+        dataStreams.add(new StatsPoint(tags, 1, 2, 3, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+        Map<String, String> kafkaConfig = new HashMap<>();
+        kafkaConfig.put("bootstrap.servers", "localhost:9092");
+        dataStreams.reportKafkaConfig("kafka_producer", "", "", kafkaConfig);
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        // bucket contains both stats groups and kafka configs
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        assertEquals(1, bucket.getGroups().size());
+        List<KafkaConfigReport> kafkaConfigs = bucket.getKafkaConfigs();
+        assertEquals(1, kafkaConfigs.size());
+
+        StatsGroup group = bucket.getGroups().iterator().next();
+        assertEquals("type:testType", group.getTags().getType());
+        assertEquals(1L, group.getHash());
+        assertEquals(2L, group.getParentHash());
+
+        KafkaConfigReport report = kafkaConfigs.get(0);
+        assertEquals("kafka_producer", report.getType());
+        assertEquals("localhost:9092", report.getConfig().get("bootstrap.servers"));
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
     }
 
-    void close() {
-      // Stop accepting new buckets so any late submissions by the reporting thread aren't seen
-      accepting = false;
+    @TableTest({
+      "scenario             | enabledAtAgent | enabledInConfig",
+      "agent off, config on | false          | true           ",
+      "agent on, config off | true           | false          ",
+      "both off             | false          | false          "
+    })
+    void kafkaConfigsNotReportedWhenDSMIsDisabled(boolean enabledAtAgent, boolean enabledInConfig)
+            throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(enabledAtAgent);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        Sink sink = mock(Sink.class);
+        TraceConfig traceConfig = stubTraceConfig(enabledInConfig);
+
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        Map<String, String> kafkaConfig = new HashMap<>();
+        kafkaConfig.put("bootstrap.servers", "localhost:9092");
+        dataStreams.reportKafkaConfig("kafka_producer", "", "", kafkaConfig);
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.report();
+
+        awaitIdle(dataStreams);
+        assertTrue(payloadWriter.buckets.isEmpty());
+
+        // cleanup
+        payloadWriter.close();
+        dataStreams.close();
     }
-  }
-
-  private DefaultDataStreamsMonitoring newDataStreamsMonitoring() {
-    return new DefaultDataStreamsMonitoring(
-        mock(Sink.class),
-        stubFeatures(true),
-        new ControllableTimeSource(),
-        () -> stubTraceConfig(true),
-        mock(DatastreamsPayloadWriter.class),
-        DEFAULT_BUCKET_DURATION_NANOS);
-  }
-
-  @Test
-  void setCheckpointTagsTheSpanWithThePathwayHash() {
-    DefaultDataStreamsMonitoring dataStreams = newDataStreamsMonitoring();
-
-    // Negative so the signed and unsigned string representations differ, proving the tag uses
-    // Long.toUnsignedString (pathway hashes are unsigned 64-bit values).
-    long hash = -1234567890123456789L;
-    PathwayContext pathwayContext = mock(PathwayContext.class);
-    when(pathwayContext.getHash()).thenReturn(hash);
-    AgentSpanContext spanContext = mock(AgentSpanContext.class);
-    when(spanContext.getPathwayContext()).thenReturn(pathwayContext);
-    AgentSpan span = mock(AgentSpan.class);
-    when(span.spanContext()).thenReturn(spanContext);
-    DataStreamsContext context = mock(DataStreamsContext.class);
-
-    dataStreams.setCheckpoint(span, context);
-
-    verify(pathwayContext).setCheckpoint(eq(context), any());
-    verify(span).setTag(DDTags.PATHWAY_HASH, Long.toUnsignedString(hash));
-  }
-
-  @Test
-  void setCheckpointDoesNotTagTheSpanWhenThePathwayHashIsZero() {
-    DefaultDataStreamsMonitoring dataStreams = newDataStreamsMonitoring();
-
-    PathwayContext pathwayContext = mock(PathwayContext.class);
-    when(pathwayContext.getHash()).thenReturn(0L);
-    AgentSpanContext spanContext = mock(AgentSpanContext.class);
-    when(spanContext.getPathwayContext()).thenReturn(pathwayContext);
-    AgentSpan span = mock(AgentSpan.class);
-    when(span.spanContext()).thenReturn(spanContext);
-
-    dataStreams.setCheckpoint(span, mock(DataStreamsContext.class));
-
-    verify(span, never()).setTag(eq(DDTags.PATHWAY_HASH), any(String.class));
-  }
-
-  @Test
-  void setCheckpointDoesNotTagTheSpanWhenThereIsNoPathwayContext() {
-    DefaultDataStreamsMonitoring dataStreams = newDataStreamsMonitoring();
-
-    AgentSpanContext spanContext = mock(AgentSpanContext.class);
-    when(spanContext.getPathwayContext()).thenReturn(null);
-    AgentSpan span = mock(AgentSpan.class);
-    when(span.spanContext()).thenReturn(spanContext);
-
-    dataStreams.setCheckpoint(span, mock(DataStreamsContext.class));
-
-    verify(span, never()).setTag(eq(DDTags.PATHWAY_HASH), any(String.class));
-  }
-
-  static class CustomContextCarrier implements DataStreamsContextCarrier {
-    private final Map<String, Object> data = new HashMap<>();
-
-    @Override
-    public Set<Entry<String, Object>> entries() {
-      return data.entrySet();
+
+    @Test
+    void kafkaConfigsFlushedOnClose() throws InterruptedException {
+        DDAgentFeaturesDiscovery features = stubFeatures(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        Sink sink = mock(Sink.class);
+        CapturingPayloadWriter payloadWriter = new CapturingPayloadWriter();
+        TraceConfig traceConfig = stubTraceConfig(true);
+
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+        dataStreams.start();
+        Map<String, String> kafkaConfig = new HashMap<>();
+        kafkaConfig.put("bootstrap.servers", "localhost:9092");
+        dataStreams.reportKafkaConfig("kafka_producer", "", "", kafkaConfig);
+        timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS - 100L);
+        dataStreams.close();
+
+        // configs in the current bucket are flushed on close
+        awaitBuckets(dataStreams, payloadWriter, 1);
+
+        StatsBucket bucket = payloadWriter.buckets.get(0);
+        List<KafkaConfigReport> kafkaConfigs = bucket.getKafkaConfigs();
+        assertEquals(1, kafkaConfigs.size());
+        KafkaConfigReport report = kafkaConfigs.get(0);
+        assertEquals("kafka_producer", report.getType());
+        assertEquals("localhost:9092", report.getConfig().get("bootstrap.servers"));
+
+        // cleanup
+        payloadWriter.close();
     }
 
-    @Override
-    public void set(String key, String value) {
-      data.put(key, value);
+    @Test
+    void kafkaConfigReportEqualsAndHashCodeWorkCorrectly() {
+        Map<String, String> sameConfig = new HashMap<>();
+        sameConfig.put("bootstrap.servers", "localhost:9092");
+        sameConfig.put("acks", "all");
+        Map<String, String> sameConfig2 = new HashMap<>();
+        sameConfig2.put("bootstrap.servers", "localhost:9092");
+        sameConfig2.put("acks", "all");
+        Map<String, String> differentConfig = new HashMap<>();
+        differentConfig.put("bootstrap.servers", "localhost:9093");
+
+        KafkaConfigReport config1 = new KafkaConfigReport("kafka_producer", "", "", sameConfig, 1000L, null);
+        // different timestamp
+        KafkaConfigReport config2 = new KafkaConfigReport("kafka_producer", "", "", sameConfig2, 2000L, null);
+        // different type
+        KafkaConfigReport config3 = new KafkaConfigReport("kafka_consumer", "", "", sameConfig, 1000L, null);
+        // different config values
+        KafkaConfigReport config4 = new KafkaConfigReport("kafka_producer", "", "", differentConfig, 1000L, null);
+        // different serviceNameOverride
+        KafkaConfigReport config5 = new KafkaConfigReport("kafka_producer", "", "", sameConfig, 1000L, "other-service");
+
+        // Reflexive
+        assertEquals(config1, config1);
+        assertEquals(config1.hashCode(), config1.hashCode());
+
+        // Same type and config, different timestamp -- equals (timestamp is NOT part of equals)
+        assertEquals(config1, config2);
+        assertEquals(config2, config1);
+        assertEquals(config1.hashCode(), config2.hashCode());
+
+        // Same type and config, different serviceNameOverride -- equals (serviceNameOverride is NOT
+        // part of equals)
+        assertEquals(config1, config5);
+        assertEquals(config5, config1);
+        assertEquals(config1.hashCode(), config5.hashCode());
+
+        // Different type
+        assertNotEquals(config1, config3);
+        assertNotEquals(config3, config1);
+
+        // Different config values
+        assertNotEquals(config1, config4);
+        assertNotEquals(config4, config1);
+
+        // Null check
+        assertNotEquals(null, config1);
+
+        // Different class
+        assertNotEquals("not a config report", config1);
+    }
+
+    @Test
+    void statsBucketStoresKafkaConfigs() {
+        StatsBucket bucket = new StatsBucket(1000L, 10000L);
+        Map<String, String> producerCfg = new HashMap<>();
+        producerCfg.put("acks", "all");
+        KafkaConfigReport config1 = new KafkaConfigReport("kafka_producer", "", "", producerCfg, 1000L, null);
+        Map<String, String> consumerCfg = new HashMap<>();
+        consumerCfg.put("group.id", "test");
+        KafkaConfigReport config2 = new KafkaConfigReport("kafka_consumer", "", "test", consumerCfg, 2000L, null);
+
+        bucket.addKafkaConfig(config1);
+        bucket.addKafkaConfig(config2);
+
+        assertEquals(2, bucket.getKafkaConfigs().size());
+        assertEquals("kafka_producer", bucket.getKafkaConfigs().get(0).getType());
+        assertEquals("all", bucket.getKafkaConfigs().get(0).getConfig().get("acks"));
+        assertEquals("kafka_consumer", bucket.getKafkaConfigs().get(1).getType());
+        assertEquals("test", bucket.getKafkaConfigs().get(1).getConfig().get("group.id"));
+    }
+
+    static class CapturingPayloadWriter implements DatastreamsPayloadWriter {
+        boolean accepting = true;
+        final List<StatsBucket> buckets = new ArrayList<>();
+
+        @Override
+        public void writePayload(Collection<StatsBucket> payload, String serviceNameOverride) {
+            if (accepting) {
+                buckets.addAll(payload);
+            }
+        }
+
+        void close() {
+            // Stop accepting new buckets so any late submissions by the reporting thread aren't seen
+            accepting = false;
+        }
+    }
+
+    private DefaultDataStreamsMonitoring newDataStreamsMonitoring() {
+        return new DefaultDataStreamsMonitoring(
+                mock(Sink.class),
+                stubFeatures(true),
+                new ControllableTimeSource(),
+                () -> stubTraceConfig(true),
+                mock(DatastreamsPayloadWriter.class),
+                DEFAULT_BUCKET_DURATION_NANOS);
+    }
+
+    @Test
+    void setCheckpointTagsTheSpanWithThePathwayHash() {
+        DefaultDataStreamsMonitoring dataStreams = newDataStreamsMonitoring();
+
+        // Negative so the signed and unsigned string representations differ, proving the tag uses
+        // Long.toUnsignedString (pathway hashes are unsigned 64-bit values).
+        long hash = -1234567890123456789L;
+        PathwayContext pathwayContext = mock(PathwayContext.class);
+        when(pathwayContext.getHash()).thenReturn(hash);
+        AgentSpanContext spanContext = mock(AgentSpanContext.class);
+        when(spanContext.getPathwayContext()).thenReturn(pathwayContext);
+        AgentSpan span = mock(AgentSpan.class);
+        when(span.spanContext()).thenReturn(spanContext);
+        DataStreamsContext context = mock(DataStreamsContext.class);
+
+        dataStreams.setCheckpoint(span, context);
+
+        verify(pathwayContext).setCheckpoint(eq(context), any());
+        verify(span).setTag(DDTags.PATHWAY_HASH, Long.toUnsignedString(hash));
+    }
+
+    @Test
+    void setCheckpointDoesNotTagTheSpanWhenThePathwayHashIsZero() {
+        DefaultDataStreamsMonitoring dataStreams = newDataStreamsMonitoring();
+
+        PathwayContext pathwayContext = mock(PathwayContext.class);
+        when(pathwayContext.getHash()).thenReturn(0L);
+        AgentSpanContext spanContext = mock(AgentSpanContext.class);
+        when(spanContext.getPathwayContext()).thenReturn(pathwayContext);
+        AgentSpan span = mock(AgentSpan.class);
+        when(span.spanContext()).thenReturn(spanContext);
+
+        dataStreams.setCheckpoint(span, mock(DataStreamsContext.class));
+
+        verify(span, never()).setTag(eq(DDTags.PATHWAY_HASH), any(String.class));
+    }
+
+    @Test
+    void setCheckpointDoesNotTagTheSpanWhenThereIsNoPathwayContext() {
+        DefaultDataStreamsMonitoring dataStreams = newDataStreamsMonitoring();
+
+        AgentSpanContext spanContext = mock(AgentSpanContext.class);
+        when(spanContext.getPathwayContext()).thenReturn(null);
+        AgentSpan span = mock(AgentSpan.class);
+        when(span.spanContext()).thenReturn(spanContext);
+
+        dataStreams.setCheckpoint(span, mock(DataStreamsContext.class));
+
+        verify(span, never()).setTag(eq(DDTags.PATHWAY_HASH), any(String.class));
+    }
+
+    static class CustomContextCarrier implements DataStreamsContextCarrier {
+        private final Map<String, Object> data = new HashMap<>();
+
+        @Override
+        public Set<Entry<String, Object>> entries() {
+            return data.entrySet();
+        }
+
+        @Override
+        public void set(String key, String value) {
+            data.put(key, value);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoringTestBridge.java b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoringTestBridge.java
index 37c204757fd..396c6fdf4cc 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoringTestBridge.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoringTestBridge.java
@@ -4,37 +4,37 @@
 import org.jctools.queues.MessagePassingQueue;
 
 final class DefaultDataStreamsMonitoringTestBridge {
-  private static final Field INBOX_FIELD;
-  private static final Field THREAD_FIELD;
+    private static final Field INBOX_FIELD;
+    private static final Field THREAD_FIELD;
 
-  static {
-    try {
-      INBOX_FIELD = DefaultDataStreamsMonitoring.class.getDeclaredField("inbox");
-      INBOX_FIELD.setAccessible(true);
-      THREAD_FIELD = DefaultDataStreamsMonitoring.class.getDeclaredField("thread");
-      THREAD_FIELD.setAccessible(true);
-    } catch (NoSuchFieldException e) {
-      throw new IllegalStateException(e);
+    static {
+        try {
+            INBOX_FIELD = DefaultDataStreamsMonitoring.class.getDeclaredField("inbox");
+            INBOX_FIELD.setAccessible(true);
+            THREAD_FIELD = DefaultDataStreamsMonitoring.class.getDeclaredField("thread");
+            THREAD_FIELD.setAccessible(true);
+        } catch (NoSuchFieldException e) {
+            throw new IllegalStateException(e);
+        }
     }
-  }
 
-  private DefaultDataStreamsMonitoringTestBridge() {}
+    private DefaultDataStreamsMonitoringTestBridge() {}
 
-  static boolean isInboxEmpty(DefaultDataStreamsMonitoring monitoring) {
-    try {
-      MessagePassingQueue<?> inbox = (MessagePassingQueue<?>) INBOX_FIELD.get(monitoring);
-      return inbox.isEmpty();
-    } catch (IllegalAccessException e) {
-      throw new IllegalStateException(e);
+    static boolean isInboxEmpty(DefaultDataStreamsMonitoring monitoring) {
+        try {
+            MessagePassingQueue<?> inbox = (MessagePassingQueue<?>) INBOX_FIELD.get(monitoring);
+            return inbox.isEmpty();
+        } catch (IllegalAccessException e) {
+            throw new IllegalStateException(e);
+        }
     }
-  }
 
-  static Thread.State getThreadState(DefaultDataStreamsMonitoring monitoring) {
-    try {
-      Thread thread = (Thread) THREAD_FIELD.get(monitoring);
-      return thread.getState();
-    } catch (IllegalAccessException e) {
-      throw new IllegalStateException(e);
+    static Thread.State getThreadState(DefaultDataStreamsMonitoring monitoring) {
+        try {
+            Thread thread = (Thread) THREAD_FIELD.get(monitoring);
+            return thread.getState();
+        } catch (IllegalAccessException e) {
+            throw new IllegalStateException(e);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultPathwayContextTest.java b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultPathwayContextTest.java
index 8860cf1571c..ca210e42add 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultPathwayContextTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultPathwayContextTest.java
@@ -46,690 +46,619 @@
 import org.tabletest.junit.TableTest;
 
 public class DefaultPathwayContextTest extends DDCoreJavaSpecification {
-  private static final long DEFAULT_BUCKET_DURATION_NANOS =
-      Config.get().getDataStreamsBucketDurationNanoseconds();
-  private static final long BASE_HASH = 12L;
-
-  private CapturingPointConsumer pointConsumer;
-
-  @BeforeEach
-  void setupConsumer() {
-    pointConsumer = new CapturingPointConsumer();
-  }
-
-  private static void verifyFirstPoint(StatsPoint point) {
-    assertEquals(0L, point.getParentHash());
-    assertEquals(0L, point.getPathwayLatencyNano());
-    assertEquals(0L, point.getEdgeLatencyNano());
-    assertEquals(0L, point.getPayloadSizeBytes());
-  }
-
-  @Test
-  void firstSetCheckpointStartsTheContext() {
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
-
-    timeSource.advance(50);
-    context.setCheckpoint(fromTags(DataStreamsTags.create("internal", null)), pointConsumer);
-
-    assertTrue(context.isStarted());
-    assertEquals(1, pointConsumer.points.size());
-    verifyFirstPoint(pointConsumer.points.get(0));
-  }
-
-  @Test
-  void checkpointGenerated() {
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
-
-    timeSource.advance(50);
-    context.setCheckpoint(
-        fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)),
-        pointConsumer);
-    timeSource.advance(25);
-    DataStreamsTags tags =
-        DataStreamsTags.create("kafka", DataStreamsTags.Direction.OUTBOUND, "topic", "group", null);
-    context.setCheckpoint(fromTags(tags), pointConsumer);
-
-    assertTrue(context.isStarted());
-    assertEquals(2, pointConsumer.points.size());
-    verifyFirstPoint(pointConsumer.points.get(0));
-    StatsPoint second = pointConsumer.points.get(1);
-    assertEquals("group:group", second.getTags().getGroup());
-    assertEquals("topic:topic", second.getTags().getTopic());
-    assertEquals("type:kafka", second.getTags().getType());
-    assertEquals("direction:out", second.getTags().getDirection());
-    assertEquals(4, second.getTags().nonNullSize());
-    assertEquals(pointConsumer.points.get(0).getHash(), second.getParentHash());
-    assertNotEquals(0L, second.getHash());
-    assertEquals(25L, second.getPathwayLatencyNano());
-    assertEquals(25L, second.getEdgeLatencyNano());
-  }
-
-  @Test
-  void checkpointWithPayloadSize() {
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
-
-    timeSource.advance(25);
-    context.setCheckpoint(
-        create(DataStreamsTags.create("kafka", null, "topic", "group", null), 0, 72),
-        pointConsumer);
-
-    assertTrue(context.isStarted());
-    assertEquals(1, pointConsumer.points.size());
-    StatsPoint first = pointConsumer.points.get(0);
-    assertEquals("group:group", first.getTags().getGroup());
-    assertEquals("topic:topic", first.getTags().getTopic());
-    assertEquals("type:kafka", first.getTags().getType());
-    assertEquals(3, first.getTags().nonNullSize());
-    assertNotEquals(0L, first.getHash());
-    assertEquals(72L, first.getPayloadSizeBytes());
-  }
-
-  @Test
-  void multipleCheckpointsGenerated() {
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
-
-    timeSource.advance(50);
-    context.setCheckpoint(
-        fromTags(DataStreamsTags.create("kafka", DataStreamsTags.Direction.OUTBOUND)),
-        pointConsumer);
-    timeSource.advance(25);
-    DataStreamsTags tags =
-        DataStreamsTags.create("kafka", DataStreamsTags.Direction.INBOUND, "topic", "group", null);
-    context.setCheckpoint(fromTags(tags), pointConsumer);
-    timeSource.advance(30);
-    context.setCheckpoint(fromTags(tags), pointConsumer);
-
-    assertTrue(context.isStarted());
-    assertEquals(3, pointConsumer.points.size());
-    verifyFirstPoint(pointConsumer.points.get(0));
-    StatsPoint second = pointConsumer.points.get(1);
-    assertEquals(4, second.getTags().nonNullSize());
-    assertEquals("direction:in", second.getTags().getDirection());
-    assertEquals("group:group", second.getTags().getGroup());
-    assertEquals("topic:topic", second.getTags().getTopic());
-    assertEquals("type:kafka", second.getTags().getType());
-    assertEquals(pointConsumer.points.get(0).getHash(), second.getParentHash());
-    assertNotEquals(0L, second.getHash());
-    assertEquals(25L, second.getPathwayLatencyNano());
-    assertEquals(25L, second.getEdgeLatencyNano());
-    StatsPoint third = pointConsumer.points.get(2);
-    assertEquals(4, third.getTags().nonNullSize());
-    assertEquals("direction:in", third.getTags().getDirection());
-    assertEquals("group:group", third.getTags().getGroup());
-    assertEquals("topic:topic", third.getTags().getTopic());
-    assertEquals("type:kafka", third.getTags().getType());
-    // this point should have the first point as parent,
-    // as the loop protection will reset the parent if two identical
-    // points (same hash for tag values) are about to form a hierarchy
-    assertEquals(pointConsumer.points.get(0).getHash(), third.getParentHash());
-    assertNotEquals(0L, third.getHash());
-    assertEquals(55L, third.getPathwayLatencyNano());
-    assertEquals(30L, third.getEdgeLatencyNano());
-  }
-
-  @Test
-  void exceptionThrownWhenTryingToEncodeUnstartedContext() {
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
-
-    assertThrows(IllegalStateException.class, context::encode);
-  }
-
-  @Test
-  void setCheckpointWithDatasetTags() throws IOException {
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
-
-    timeSource.advance(MILLISECONDS.toNanos(50));
-    context.setCheckpoint(
-        fromTags(
-            DataStreamsTags.createWithDataset(
-                "s3", DataStreamsTags.Direction.INBOUND, null, "my_object.csv", "my_bucket")),
-        pointConsumer);
-    String encoded = context.encode();
-    timeSource.advance(MILLISECONDS.toNanos(2));
-    DefaultPathwayContext decodedContext = DefaultPathwayContext.decode(timeSource, null, encoded);
-    timeSource.advance(MILLISECONDS.toNanos(25));
-    DataStreamsTags tags =
-        DataStreamsTags.createWithDataset(
-            "s3", DataStreamsTags.Direction.OUTBOUND, null, "my_object.csv", "my_bucket");
-    context.setCheckpoint(fromTags(tags), pointConsumer);
-
-    assertTrue(decodedContext.isStarted());
-    assertEquals(2, pointConsumer.points.size());
-
-    // all points should have datasetHash, which is not equal to hash or 0
-    for (StatsPoint point : pointConsumer.points) {
-      assertNotEquals(point.getHash(), point.getAggregationHash());
-      assertNotEquals(0L, point.getAggregationHash());
+    private static final long DEFAULT_BUCKET_DURATION_NANOS = Config.get().getDataStreamsBucketDurationNanoseconds();
+    private static final long BASE_HASH = 12L;
+
+    private CapturingPointConsumer pointConsumer;
+
+    @BeforeEach
+    void setupConsumer() {
+        pointConsumer = new CapturingPointConsumer();
     }
-  }
-
-  @Test
-  void encodingAndDecodingBase64AContext() throws IOException {
-    // Timesource needs to be advanced in milliseconds because encoding truncates to millis
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
-
-    timeSource.advance(MILLISECONDS.toNanos(50));
-    context.setCheckpoint(
-        fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)),
-        pointConsumer);
-    String encoded = context.encode();
-    timeSource.advance(MILLISECONDS.toNanos(2));
-    DefaultPathwayContext decodedContext = DefaultPathwayContext.decode(timeSource, null, encoded);
-    timeSource.advance(MILLISECONDS.toNanos(25));
-    context.setCheckpoint(
-        fromTags(DataStreamsTags.create("kafka", null, "topic", "group", null)), pointConsumer);
-
-    assertTrue(decodedContext.isStarted());
-    assertEquals(2, pointConsumer.points.size());
-
-    StatsPoint second = pointConsumer.points.get(1);
-    assertEquals(3, second.getTags().nonNullSize());
-    assertEquals("group:group", second.getTags().getGroup());
-    assertEquals("type:kafka", second.getTags().getType());
-    assertEquals("topic:topic", second.getTags().getTopic());
-    assertEquals(pointConsumer.points.get(0).getHash(), second.getParentHash());
-    assertNotEquals(0L, second.getHash());
-    assertEquals(MILLISECONDS.toNanos(27), second.getPathwayLatencyNano());
-    assertEquals(MILLISECONDS.toNanos(27), second.getEdgeLatencyNano());
-  }
-
-  @Test
-  void setCheckpointWithTimestamp() {
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
-    long timeFromQueue = timeSource.getCurrentTimeMillis() - 200;
-
-    context.setCheckpoint(
-        create(DataStreamsTags.create("internal", null), timeFromQueue, 0), pointConsumer);
-
-    assertTrue(context.isStarted());
-    assertEquals(1, pointConsumer.points.size());
-    StatsPoint first = pointConsumer.points.get(0);
-    assertEquals("type:internal", first.getTags().getType());
-    assertEquals(1, first.getTags().nonNullSize());
-    assertEquals(0L, first.getParentHash());
-    assertNotEquals(0L, first.getHash());
-    assertEquals(MILLISECONDS.toNanos(200), first.getPathwayLatencyNano());
-    assertEquals(MILLISECONDS.toNanos(200), first.getEdgeLatencyNano());
-  }
-
-  @Test
-  void encodingAndDecodingBase64WithContextsAndCheckpoints() throws IOException {
-    // Timesource needs to be advanced in milliseconds because encoding truncates to millis
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
-
-    timeSource.advance(MILLISECONDS.toNanos(50));
-    context.setCheckpoint(
-        fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)),
-        pointConsumer);
-
-    String encoded = context.encode();
-    timeSource.advance(MILLISECONDS.toNanos(1));
-    DefaultPathwayContext decodedContext = DefaultPathwayContext.decode(timeSource, null, encoded);
-    timeSource.advance(MILLISECONDS.toNanos(25));
-    context.setCheckpoint(
-        fromTags(
-            DataStreamsTags.create(
-                "kafka", DataStreamsTags.Direction.OUTBOUND, "topic", "group", null)),
-        pointConsumer);
-
-    assertTrue(decodedContext.isStarted());
-    assertEquals(2, pointConsumer.points.size());
-    StatsPoint second = pointConsumer.points.get(1);
-    assertEquals("group:group", second.getTags().getGroup());
-    assertEquals("topic:topic", second.getTags().getTopic());
-    assertEquals("type:kafka", second.getTags().getType());
-    assertEquals("direction:out", second.getTags().getDirection());
-    assertEquals(4, second.getTags().nonNullSize());
-    assertEquals(pointConsumer.points.get(0).getHash(), second.getParentHash());
-    assertNotEquals(0L, second.getHash());
-    assertEquals(MILLISECONDS.toNanos(26), second.getPathwayLatencyNano());
-    assertEquals(MILLISECONDS.toNanos(26), second.getEdgeLatencyNano());
-
-    String secondEncode = decodedContext.encode();
-    timeSource.advance(MILLISECONDS.toNanos(2));
-    DefaultPathwayContext secondDecode =
-        DefaultPathwayContext.decode(timeSource, null, secondEncode);
-    timeSource.advance(MILLISECONDS.toNanos(30));
-    context.setCheckpoint(
-        fromTags(
-            DataStreamsTags.create(
-                "kafka", DataStreamsTags.Direction.INBOUND, "topicB", "group", null)),
-        pointConsumer);
-
-    assertTrue(secondDecode.isStarted());
-    assertEquals(3, pointConsumer.points.size());
-    StatsPoint third = pointConsumer.points.get(2);
-    assertEquals("group:group", third.getTags().getGroup());
-    assertEquals("topic:topicB", third.getTags().getTopic());
-    assertEquals("type:kafka", third.getTags().getType());
-    assertEquals("direction:in", third.getTags().getDirection());
-    assertEquals(4, third.getTags().nonNullSize());
-    assertEquals(pointConsumer.points.get(1).getHash(), third.getParentHash());
-    assertNotEquals(0L, third.getHash());
-    assertEquals(MILLISECONDS.toNanos(58), third.getPathwayLatencyNano());
-    assertEquals(MILLISECONDS.toNanos(32), third.getEdgeLatencyNano());
-  }
-
-  @Test
-  void encodingAndDecodingBase64WithInjectsAndExtracts() throws IOException {
-    // Timesource needs to be advanced in milliseconds because encoding truncates to millis
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
-    Base64MapContextVisitor contextVisitor = new Base64MapContextVisitor();
-
-    timeSource.advance(MILLISECONDS.toNanos(50));
-    context.setCheckpoint(
-        fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)),
-        pointConsumer);
-
-    String encoded = context.encode();
-    Map<String, String> carrier = new HashMap<>();
-    carrier.put(PROPAGATION_KEY_BASE64, encoded);
-    carrier.put("someotherkey", "someothervalue");
-    timeSource.advance(MILLISECONDS.toNanos(1));
-    DefaultPathwayContext decodedContext =
-        DefaultPathwayContext.extract(carrier, contextVisitor, timeSource, null);
-    timeSource.advance(MILLISECONDS.toNanos(25));
-    context.setCheckpoint(
-        fromTags(
-            DataStreamsTags.create(
-                "kafka", DataStreamsTags.Direction.OUTBOUND, "topic", "group", null)),
-        pointConsumer);
-
-    assertTrue(decodedContext.isStarted());
-    assertEquals(2, pointConsumer.points.size());
-    StatsPoint second = pointConsumer.points.get(1);
-    assertEquals(4, second.getTags().nonNullSize());
-    assertEquals("group:group", second.getTags().getGroup());
-    assertEquals("topic:topic", second.getTags().getTopic());
-    assertEquals("type:kafka", second.getTags().getType());
-    assertEquals("direction:out", second.getTags().getDirection());
-    assertEquals(pointConsumer.points.get(0).getHash(), second.getParentHash());
-    assertNotEquals(0L, second.getHash());
-    assertEquals(MILLISECONDS.toNanos(26), second.getPathwayLatencyNano());
-    assertEquals(MILLISECONDS.toNanos(26), second.getEdgeLatencyNano());
-
-    String secondEncode = decodedContext.encode();
-    carrier = new HashMap<>();
-    carrier.put(PROPAGATION_KEY_BASE64, secondEncode);
-    timeSource.advance(MILLISECONDS.toNanos(2));
-    DefaultPathwayContext secondDecode =
-        DefaultPathwayContext.extract(carrier, contextVisitor, timeSource, null);
-    timeSource.advance(MILLISECONDS.toNanos(30));
-    context.setCheckpoint(
-        fromTags(
-            DataStreamsTags.create(
-                "kafka", DataStreamsTags.Direction.INBOUND, "topicB", "group", null)),
-        pointConsumer);
-
-    assertTrue(secondDecode.isStarted());
-    assertEquals(3, pointConsumer.points.size());
-    StatsPoint third = pointConsumer.points.get(2);
-    assertEquals(4, third.getTags().nonNullSize());
-    assertEquals("group:group", third.getTags().getGroup());
-    assertEquals("topic:topicB", third.getTags().getTopic());
-    assertEquals("type:kafka", third.getTags().getType());
-    assertEquals("direction:in", third.getTags().getDirection());
-    assertEquals(pointConsumer.points.get(1).getHash(), third.getParentHash());
-    assertNotEquals(0L, third.getHash());
-    assertEquals(MILLISECONDS.toNanos(58), third.getPathwayLatencyNano());
-    assertEquals(MILLISECONDS.toNanos(32), third.getEdgeLatencyNano());
-  }
-
-  @Test
-  void encodingAndDecodingSqsFormattedWithInjectsAndExtracts() throws IOException {
-    // Timesource needs to be advanced in milliseconds because encoding truncates to millis
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
-    Base64MapContextVisitor contextVisitor = new Base64MapContextVisitor();
-
-    timeSource.advance(MILLISECONDS.toNanos(50));
-    context.setCheckpoint(
-        fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)),
-        pointConsumer);
-
-    String encoded = context.encode();
-    Map<String, String> carrier = new HashMap<>();
-    carrier.put(PROPAGATION_KEY_BASE64, encoded);
-    carrier.put("someotherkey", "someothervalue");
-    timeSource.advance(MILLISECONDS.toNanos(1));
-    DefaultPathwayContext decodedContext =
-        DefaultPathwayContext.extract(carrier, contextVisitor, timeSource, null);
-    timeSource.advance(MILLISECONDS.toNanos(25));
-    context.setCheckpoint(
-        fromTags(
-            DataStreamsTags.create("sqs", DataStreamsTags.Direction.OUTBOUND, "topic", null, null)),
-        pointConsumer);
-
-    assertTrue(decodedContext.isStarted());
-    assertEquals(2, pointConsumer.points.size());
-    StatsPoint second = pointConsumer.points.get(1);
-    assertEquals("direction:out", second.getTags().getDirection());
-    assertEquals("topic:topic", second.getTags().getTopic());
-    assertEquals("type:sqs", second.getTags().getType());
-    assertEquals(3, second.getTags().nonNullSize());
-    assertEquals(pointConsumer.points.get(0).getHash(), second.getParentHash());
-    assertNotEquals(0L, second.getHash());
-    assertEquals(MILLISECONDS.toNanos(26), second.getPathwayLatencyNano());
-    assertEquals(MILLISECONDS.toNanos(26), second.getEdgeLatencyNano());
-
-    String secondEncode = decodedContext.encode();
-    carrier = new HashMap<>();
-    carrier.put(PROPAGATION_KEY_BASE64, secondEncode);
-    timeSource.advance(MILLISECONDS.toNanos(2));
-    DefaultPathwayContext secondDecode =
-        DefaultPathwayContext.extract(carrier, contextVisitor, timeSource, null);
-    timeSource.advance(MILLISECONDS.toNanos(30));
-    context.setCheckpoint(
-        fromTags(
-            DataStreamsTags.create("sqs", DataStreamsTags.Direction.INBOUND, "topicB", null, null)),
-        pointConsumer);
-
-    assertTrue(secondDecode.isStarted());
-    assertEquals(3, pointConsumer.points.size());
-    StatsPoint third = pointConsumer.points.get(2);
-    assertEquals("type:sqs", third.getTags().getType());
-    assertEquals("topic:topicB", third.getTags().getTopic());
-    assertEquals(3, third.getTags().nonNullSize());
-    assertEquals(pointConsumer.points.get(1).getHash(), third.getParentHash());
-    assertNotEquals(0L, third.getHash());
-    assertEquals(MILLISECONDS.toNanos(58), third.getPathwayLatencyNano());
-    assertEquals(MILLISECONDS.toNanos(32), third.getEdgeLatencyNano());
-  }
-
-  @Test
-  void emptyTagsNotSet() {
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
-
-    timeSource.advance(50);
-    context.setCheckpoint(
-        fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)),
-        pointConsumer);
-    timeSource.advance(25);
-    context.setCheckpoint(
-        fromTags(
-            DataStreamsTags.create(
-                "type", DataStreamsTags.Direction.OUTBOUND, "topic", "group", null)),
-        pointConsumer);
-    timeSource.advance(25);
-    context.setCheckpoint(fromTags(DataStreamsTags.create(null, null)), pointConsumer);
-
-    assertTrue(context.isStarted());
-    assertEquals(3, pointConsumer.points.size());
-    verifyFirstPoint(pointConsumer.points.get(0));
-    StatsPoint second = pointConsumer.points.get(1);
-    assertEquals("type:type", second.getTags().getType());
-    assertEquals("topic:topic", second.getTags().getTopic());
-    assertEquals("group:group", second.getTags().getGroup());
-    assertEquals("direction:out", second.getTags().getDirection());
-    assertEquals(4, second.getTags().nonNullSize());
-    assertEquals(pointConsumer.points.get(0).getHash(), second.getParentHash());
-    assertNotEquals(0L, second.getHash());
-    assertEquals(25L, second.getPathwayLatencyNano());
-    assertEquals(25L, second.getEdgeLatencyNano());
-    StatsPoint third = pointConsumer.points.get(2);
-    assertEquals(0, third.getTags().nonNullSize());
-    assertEquals(pointConsumer.points.get(1).getHash(), third.getParentHash());
-    assertNotEquals(0L, third.getHash());
-    assertEquals(50L, third.getPathwayLatencyNano());
-    assertEquals(25L, third.getEdgeLatencyNano());
-  }
-
-  @TableTest({
-    "scenario | dynamicConfigEnabled",
-    "enabled  | true                ",
-    "disabled | false               "
-  })
-  void checkContextExtractorDecoratorBehavior(boolean dynamicConfigEnabled) throws IOException {
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
-    when(features.supportsDataStreams()).thenReturn(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DatastreamsPayloadWriter payloadWriter = mock(DatastreamsPayloadWriter.class);
-
-    TraceConfig globalTraceConfig = mock(TraceConfig.class, RETURNS_SMART_NULLS);
-    when(globalTraceConfig.isDataStreamsEnabled()).thenReturn(dynamicConfigEnabled);
-
-    AgentTracer.TracerAPI tracerApi = mock(AgentTracer.TracerAPI.class, RETURNS_SMART_NULLS);
-    when(tracerApi.captureTraceConfig()).thenReturn(globalTraceConfig);
-    AgentTracer.TracerAPI originalTracer = AgentTracer.get();
-    AgentTracer.forceRegister(tracerApi);
-
-    try {
-      DefaultDataStreamsMonitoring dataStreams =
-          new DefaultDataStreamsMonitoring(
-              sink,
-              features,
-              timeSource,
-              () -> globalTraceConfig,
-              payloadWriter,
-              DEFAULT_BUCKET_DURATION_NANOS);
-
-      BaseHash.updateBaseHash(BASE_HASH);
-      DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
-      timeSource.advance(MILLISECONDS.toNanos(50));
-      context.setCheckpoint(
-          fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)),
-          pointConsumer);
-      String encoded = context.encode();
-      Map<String, String> carrier = new HashMap<>();
-      carrier.put(PROPAGATION_KEY_BASE64, encoded);
-      carrier.put("someotherkey", "someothervalue");
-      Base64MapContextVisitor contextVisitor = new Base64MapContextVisitor();
-      Propagator propagator = dataStreams.propagator();
-
-      Context extractedContext = propagator.extract(root(), carrier, contextVisitor);
-      AgentSpan extractedSpan = AgentSpan.fromContext(extractedContext);
-
-      assertEquals("L+lDG/Pa9hRkZA==", encoded);
-      if (dynamicConfigEnabled) {
-        assertNotNull(extractedSpan);
-        assertNotNull(extractedSpan.spanContext());
-        assertNotNull(extractedSpan.spanContext().getPathwayContext());
-        assertTrue(extractedSpan.spanContext().getPathwayContext().isStarted());
-      }
-    } finally {
-      // cleanup
-      AgentTracer.forceRegister(originalTracer);
+
+    private static void verifyFirstPoint(StatsPoint point) {
+        assertEquals(0L, point.getParentHash());
+        assertEquals(0L, point.getPathwayLatencyNano());
+        assertEquals(0L, point.getEdgeLatencyNano());
+        assertEquals(0L, point.getPayloadSizeBytes());
     }
-  }
-
-  @TableTest({
-    "scenario | globalDsmEnabled",
-    "enabled  | true            ",
-    "disabled | false           "
-  })
-  void checkContextExtractorDecoratorBehaviorWhenTraceDataIsNull(boolean globalDsmEnabled)
-      throws IOException {
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
-    when(features.supportsDataStreams()).thenReturn(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DatastreamsPayloadWriter payloadWriter = mock(DatastreamsPayloadWriter.class);
-
-    TraceConfig globalTraceConfig = mock(TraceConfig.class, RETURNS_SMART_NULLS);
-    when(globalTraceConfig.isDataStreamsEnabled()).thenReturn(globalDsmEnabled);
-
-    AgentTracer.TracerAPI tracerApi = mock(AgentTracer.TracerAPI.class, RETURNS_SMART_NULLS);
-    when(tracerApi.captureTraceConfig()).thenReturn(globalTraceConfig);
-    AgentTracer.TracerAPI originalTracer = AgentTracer.get();
-    AgentTracer.forceRegister(tracerApi);
-
-    try {
-      DefaultDataStreamsMonitoring dataStreams =
-          new DefaultDataStreamsMonitoring(
-              sink,
-              features,
-              timeSource,
-              () -> globalTraceConfig,
-              payloadWriter,
-              DEFAULT_BUCKET_DURATION_NANOS);
-
-      BaseHash.updateBaseHash(BASE_HASH);
-      DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
-      timeSource.advance(MILLISECONDS.toNanos(50));
-      context.setCheckpoint(
-          fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)),
-          pointConsumer);
-      String encoded = context.encode();
-
-      Map<String, String> carrier = new HashMap<>();
-      carrier.put(PROPAGATION_KEY_BASE64, encoded);
-      carrier.put("someotherkey", "someothervalue");
-      Base64MapContextVisitor contextVisitor = new Base64MapContextVisitor();
-      Propagator propagator = dataStreams.propagator();
-
-      Context extractedContext = propagator.extract(root(), carrier, contextVisitor);
-      AgentSpan extractedSpan = AgentSpan.fromContext(extractedContext);
-
-      assertEquals("L+lDG/Pa9hRkZA==", encoded);
-      if (globalDsmEnabled) {
-        assertNotNull(extractedSpan);
-        assertNotNull(extractedSpan.spanContext());
-        assertNotNull(extractedSpan.spanContext().getPathwayContext());
-        assertTrue(extractedSpan.spanContext().getPathwayContext().isStarted());
-      } else {
-        assertNull(extractedSpan);
-      }
-    } finally {
-      // cleanup
-      AgentTracer.forceRegister(originalTracer);
+
+    @Test
+    void firstSetCheckpointStartsTheContext() {
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
+
+        timeSource.advance(50);
+        context.setCheckpoint(fromTags(DataStreamsTags.create("internal", null)), pointConsumer);
+
+        assertTrue(context.isStarted());
+        assertEquals(1, pointConsumer.points.size());
+        verifyFirstPoint(pointConsumer.points.get(0));
+    }
+
+    @Test
+    void checkpointGenerated() {
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
+
+        timeSource.advance(50);
+        context.setCheckpoint(
+                fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)), pointConsumer);
+        timeSource.advance(25);
+        DataStreamsTags tags =
+                DataStreamsTags.create("kafka", DataStreamsTags.Direction.OUTBOUND, "topic", "group", null);
+        context.setCheckpoint(fromTags(tags), pointConsumer);
+
+        assertTrue(context.isStarted());
+        assertEquals(2, pointConsumer.points.size());
+        verifyFirstPoint(pointConsumer.points.get(0));
+        StatsPoint second = pointConsumer.points.get(1);
+        assertEquals("group:group", second.getTags().getGroup());
+        assertEquals("topic:topic", second.getTags().getTopic());
+        assertEquals("type:kafka", second.getTags().getType());
+        assertEquals("direction:out", second.getTags().getDirection());
+        assertEquals(4, second.getTags().nonNullSize());
+        assertEquals(pointConsumer.points.get(0).getHash(), second.getParentHash());
+        assertNotEquals(0L, second.getHash());
+        assertEquals(25L, second.getPathwayLatencyNano());
+        assertEquals(25L, second.getEdgeLatencyNano());
+    }
+
+    @Test
+    void checkpointWithPayloadSize() {
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
+
+        timeSource.advance(25);
+        context.setCheckpoint(
+                create(DataStreamsTags.create("kafka", null, "topic", "group", null), 0, 72), pointConsumer);
+
+        assertTrue(context.isStarted());
+        assertEquals(1, pointConsumer.points.size());
+        StatsPoint first = pointConsumer.points.get(0);
+        assertEquals("group:group", first.getTags().getGroup());
+        assertEquals("topic:topic", first.getTags().getTopic());
+        assertEquals("type:kafka", first.getTags().getType());
+        assertEquals(3, first.getTags().nonNullSize());
+        assertNotEquals(0L, first.getHash());
+        assertEquals(72L, first.getPayloadSizeBytes());
+    }
+
+    @Test
+    void multipleCheckpointsGenerated() {
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
+
+        timeSource.advance(50);
+        context.setCheckpoint(
+                fromTags(DataStreamsTags.create("kafka", DataStreamsTags.Direction.OUTBOUND)), pointConsumer);
+        timeSource.advance(25);
+        DataStreamsTags tags =
+                DataStreamsTags.create("kafka", DataStreamsTags.Direction.INBOUND, "topic", "group", null);
+        context.setCheckpoint(fromTags(tags), pointConsumer);
+        timeSource.advance(30);
+        context.setCheckpoint(fromTags(tags), pointConsumer);
+
+        assertTrue(context.isStarted());
+        assertEquals(3, pointConsumer.points.size());
+        verifyFirstPoint(pointConsumer.points.get(0));
+        StatsPoint second = pointConsumer.points.get(1);
+        assertEquals(4, second.getTags().nonNullSize());
+        assertEquals("direction:in", second.getTags().getDirection());
+        assertEquals("group:group", second.getTags().getGroup());
+        assertEquals("topic:topic", second.getTags().getTopic());
+        assertEquals("type:kafka", second.getTags().getType());
+        assertEquals(pointConsumer.points.get(0).getHash(), second.getParentHash());
+        assertNotEquals(0L, second.getHash());
+        assertEquals(25L, second.getPathwayLatencyNano());
+        assertEquals(25L, second.getEdgeLatencyNano());
+        StatsPoint third = pointConsumer.points.get(2);
+        assertEquals(4, third.getTags().nonNullSize());
+        assertEquals("direction:in", third.getTags().getDirection());
+        assertEquals("group:group", third.getTags().getGroup());
+        assertEquals("topic:topic", third.getTags().getTopic());
+        assertEquals("type:kafka", third.getTags().getType());
+        // this point should have the first point as parent,
+        // as the loop protection will reset the parent if two identical
+        // points (same hash for tag values) are about to form a hierarchy
+        assertEquals(pointConsumer.points.get(0).getHash(), third.getParentHash());
+        assertNotEquals(0L, third.getHash());
+        assertEquals(55L, third.getPathwayLatencyNano());
+        assertEquals(30L, third.getEdgeLatencyNano());
+    }
+
+    @Test
+    void exceptionThrownWhenTryingToEncodeUnstartedContext() {
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
+
+        assertThrows(IllegalStateException.class, context::encode);
+    }
+
+    @Test
+    void setCheckpointWithDatasetTags() throws IOException {
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
+
+        timeSource.advance(MILLISECONDS.toNanos(50));
+        context.setCheckpoint(
+                fromTags(DataStreamsTags.createWithDataset(
+                        "s3", DataStreamsTags.Direction.INBOUND, null, "my_object.csv", "my_bucket")),
+                pointConsumer);
+        String encoded = context.encode();
+        timeSource.advance(MILLISECONDS.toNanos(2));
+        DefaultPathwayContext decodedContext = DefaultPathwayContext.decode(timeSource, null, encoded);
+        timeSource.advance(MILLISECONDS.toNanos(25));
+        DataStreamsTags tags = DataStreamsTags.createWithDataset(
+                "s3", DataStreamsTags.Direction.OUTBOUND, null, "my_object.csv", "my_bucket");
+        context.setCheckpoint(fromTags(tags), pointConsumer);
+
+        assertTrue(decodedContext.isStarted());
+        assertEquals(2, pointConsumer.points.size());
+
+        // all points should have datasetHash, which is not equal to hash or 0
+        for (StatsPoint point : pointConsumer.points) {
+            assertNotEquals(point.getHash(), point.getAggregationHash());
+            assertNotEquals(0L, point.getAggregationHash());
+        }
+    }
+
+    @Test
+    void encodingAndDecodingBase64AContext() throws IOException {
+        // Timesource needs to be advanced in milliseconds because encoding truncates to millis
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
+
+        timeSource.advance(MILLISECONDS.toNanos(50));
+        context.setCheckpoint(
+                fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)), pointConsumer);
+        String encoded = context.encode();
+        timeSource.advance(MILLISECONDS.toNanos(2));
+        DefaultPathwayContext decodedContext = DefaultPathwayContext.decode(timeSource, null, encoded);
+        timeSource.advance(MILLISECONDS.toNanos(25));
+        context.setCheckpoint(fromTags(DataStreamsTags.create("kafka", null, "topic", "group", null)), pointConsumer);
+
+        assertTrue(decodedContext.isStarted());
+        assertEquals(2, pointConsumer.points.size());
+
+        StatsPoint second = pointConsumer.points.get(1);
+        assertEquals(3, second.getTags().nonNullSize());
+        assertEquals("group:group", second.getTags().getGroup());
+        assertEquals("type:kafka", second.getTags().getType());
+        assertEquals("topic:topic", second.getTags().getTopic());
+        assertEquals(pointConsumer.points.get(0).getHash(), second.getParentHash());
+        assertNotEquals(0L, second.getHash());
+        assertEquals(MILLISECONDS.toNanos(27), second.getPathwayLatencyNano());
+        assertEquals(MILLISECONDS.toNanos(27), second.getEdgeLatencyNano());
+    }
+
+    @Test
+    void setCheckpointWithTimestamp() {
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
+        long timeFromQueue = timeSource.getCurrentTimeMillis() - 200;
+
+        context.setCheckpoint(create(DataStreamsTags.create("internal", null), timeFromQueue, 0), pointConsumer);
+
+        assertTrue(context.isStarted());
+        assertEquals(1, pointConsumer.points.size());
+        StatsPoint first = pointConsumer.points.get(0);
+        assertEquals("type:internal", first.getTags().getType());
+        assertEquals(1, first.getTags().nonNullSize());
+        assertEquals(0L, first.getParentHash());
+        assertNotEquals(0L, first.getHash());
+        assertEquals(MILLISECONDS.toNanos(200), first.getPathwayLatencyNano());
+        assertEquals(MILLISECONDS.toNanos(200), first.getEdgeLatencyNano());
+    }
+
+    @Test
+    void encodingAndDecodingBase64WithContextsAndCheckpoints() throws IOException {
+        // Timesource needs to be advanced in milliseconds because encoding truncates to millis
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
+
+        timeSource.advance(MILLISECONDS.toNanos(50));
+        context.setCheckpoint(
+                fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)), pointConsumer);
+
+        String encoded = context.encode();
+        timeSource.advance(MILLISECONDS.toNanos(1));
+        DefaultPathwayContext decodedContext = DefaultPathwayContext.decode(timeSource, null, encoded);
+        timeSource.advance(MILLISECONDS.toNanos(25));
+        context.setCheckpoint(
+                fromTags(DataStreamsTags.create("kafka", DataStreamsTags.Direction.OUTBOUND, "topic", "group", null)),
+                pointConsumer);
+
+        assertTrue(decodedContext.isStarted());
+        assertEquals(2, pointConsumer.points.size());
+        StatsPoint second = pointConsumer.points.get(1);
+        assertEquals("group:group", second.getTags().getGroup());
+        assertEquals("topic:topic", second.getTags().getTopic());
+        assertEquals("type:kafka", second.getTags().getType());
+        assertEquals("direction:out", second.getTags().getDirection());
+        assertEquals(4, second.getTags().nonNullSize());
+        assertEquals(pointConsumer.points.get(0).getHash(), second.getParentHash());
+        assertNotEquals(0L, second.getHash());
+        assertEquals(MILLISECONDS.toNanos(26), second.getPathwayLatencyNano());
+        assertEquals(MILLISECONDS.toNanos(26), second.getEdgeLatencyNano());
+
+        String secondEncode = decodedContext.encode();
+        timeSource.advance(MILLISECONDS.toNanos(2));
+        DefaultPathwayContext secondDecode = DefaultPathwayContext.decode(timeSource, null, secondEncode);
+        timeSource.advance(MILLISECONDS.toNanos(30));
+        context.setCheckpoint(
+                fromTags(DataStreamsTags.create("kafka", DataStreamsTags.Direction.INBOUND, "topicB", "group", null)),
+                pointConsumer);
+
+        assertTrue(secondDecode.isStarted());
+        assertEquals(3, pointConsumer.points.size());
+        StatsPoint third = pointConsumer.points.get(2);
+        assertEquals("group:group", third.getTags().getGroup());
+        assertEquals("topic:topicB", third.getTags().getTopic());
+        assertEquals("type:kafka", third.getTags().getType());
+        assertEquals("direction:in", third.getTags().getDirection());
+        assertEquals(4, third.getTags().nonNullSize());
+        assertEquals(pointConsumer.points.get(1).getHash(), third.getParentHash());
+        assertNotEquals(0L, third.getHash());
+        assertEquals(MILLISECONDS.toNanos(58), third.getPathwayLatencyNano());
+        assertEquals(MILLISECONDS.toNanos(32), third.getEdgeLatencyNano());
+    }
+
+    @Test
+    void encodingAndDecodingBase64WithInjectsAndExtracts() throws IOException {
+        // Timesource needs to be advanced in milliseconds because encoding truncates to millis
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
+        Base64MapContextVisitor contextVisitor = new Base64MapContextVisitor();
+
+        timeSource.advance(MILLISECONDS.toNanos(50));
+        context.setCheckpoint(
+                fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)), pointConsumer);
+
+        String encoded = context.encode();
+        Map<String, String> carrier = new HashMap<>();
+        carrier.put(PROPAGATION_KEY_BASE64, encoded);
+        carrier.put("someotherkey", "someothervalue");
+        timeSource.advance(MILLISECONDS.toNanos(1));
+        DefaultPathwayContext decodedContext = DefaultPathwayContext.extract(carrier, contextVisitor, timeSource, null);
+        timeSource.advance(MILLISECONDS.toNanos(25));
+        context.setCheckpoint(
+                fromTags(DataStreamsTags.create("kafka", DataStreamsTags.Direction.OUTBOUND, "topic", "group", null)),
+                pointConsumer);
+
+        assertTrue(decodedContext.isStarted());
+        assertEquals(2, pointConsumer.points.size());
+        StatsPoint second = pointConsumer.points.get(1);
+        assertEquals(4, second.getTags().nonNullSize());
+        assertEquals("group:group", second.getTags().getGroup());
+        assertEquals("topic:topic", second.getTags().getTopic());
+        assertEquals("type:kafka", second.getTags().getType());
+        assertEquals("direction:out", second.getTags().getDirection());
+        assertEquals(pointConsumer.points.get(0).getHash(), second.getParentHash());
+        assertNotEquals(0L, second.getHash());
+        assertEquals(MILLISECONDS.toNanos(26), second.getPathwayLatencyNano());
+        assertEquals(MILLISECONDS.toNanos(26), second.getEdgeLatencyNano());
+
+        String secondEncode = decodedContext.encode();
+        carrier = new HashMap<>();
+        carrier.put(PROPAGATION_KEY_BASE64, secondEncode);
+        timeSource.advance(MILLISECONDS.toNanos(2));
+        DefaultPathwayContext secondDecode = DefaultPathwayContext.extract(carrier, contextVisitor, timeSource, null);
+        timeSource.advance(MILLISECONDS.toNanos(30));
+        context.setCheckpoint(
+                fromTags(DataStreamsTags.create("kafka", DataStreamsTags.Direction.INBOUND, "topicB", "group", null)),
+                pointConsumer);
+
+        assertTrue(secondDecode.isStarted());
+        assertEquals(3, pointConsumer.points.size());
+        StatsPoint third = pointConsumer.points.get(2);
+        assertEquals(4, third.getTags().nonNullSize());
+        assertEquals("group:group", third.getTags().getGroup());
+        assertEquals("topic:topicB", third.getTags().getTopic());
+        assertEquals("type:kafka", third.getTags().getType());
+        assertEquals("direction:in", third.getTags().getDirection());
+        assertEquals(pointConsumer.points.get(1).getHash(), third.getParentHash());
+        assertNotEquals(0L, third.getHash());
+        assertEquals(MILLISECONDS.toNanos(58), third.getPathwayLatencyNano());
+        assertEquals(MILLISECONDS.toNanos(32), third.getEdgeLatencyNano());
+    }
+
+    @Test
+    void encodingAndDecodingSqsFormattedWithInjectsAndExtracts() throws IOException {
+        // Timesource needs to be advanced in milliseconds because encoding truncates to millis
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
+        Base64MapContextVisitor contextVisitor = new Base64MapContextVisitor();
+
+        timeSource.advance(MILLISECONDS.toNanos(50));
+        context.setCheckpoint(
+                fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)), pointConsumer);
+
+        String encoded = context.encode();
+        Map<String, String> carrier = new HashMap<>();
+        carrier.put(PROPAGATION_KEY_BASE64, encoded);
+        carrier.put("someotherkey", "someothervalue");
+        timeSource.advance(MILLISECONDS.toNanos(1));
+        DefaultPathwayContext decodedContext = DefaultPathwayContext.extract(carrier, contextVisitor, timeSource, null);
+        timeSource.advance(MILLISECONDS.toNanos(25));
+        context.setCheckpoint(
+                fromTags(DataStreamsTags.create("sqs", DataStreamsTags.Direction.OUTBOUND, "topic", null, null)),
+                pointConsumer);
+
+        assertTrue(decodedContext.isStarted());
+        assertEquals(2, pointConsumer.points.size());
+        StatsPoint second = pointConsumer.points.get(1);
+        assertEquals("direction:out", second.getTags().getDirection());
+        assertEquals("topic:topic", second.getTags().getTopic());
+        assertEquals("type:sqs", second.getTags().getType());
+        assertEquals(3, second.getTags().nonNullSize());
+        assertEquals(pointConsumer.points.get(0).getHash(), second.getParentHash());
+        assertNotEquals(0L, second.getHash());
+        assertEquals(MILLISECONDS.toNanos(26), second.getPathwayLatencyNano());
+        assertEquals(MILLISECONDS.toNanos(26), second.getEdgeLatencyNano());
+
+        String secondEncode = decodedContext.encode();
+        carrier = new HashMap<>();
+        carrier.put(PROPAGATION_KEY_BASE64, secondEncode);
+        timeSource.advance(MILLISECONDS.toNanos(2));
+        DefaultPathwayContext secondDecode = DefaultPathwayContext.extract(carrier, contextVisitor, timeSource, null);
+        timeSource.advance(MILLISECONDS.toNanos(30));
+        context.setCheckpoint(
+                fromTags(DataStreamsTags.create("sqs", DataStreamsTags.Direction.INBOUND, "topicB", null, null)),
+                pointConsumer);
+
+        assertTrue(secondDecode.isStarted());
+        assertEquals(3, pointConsumer.points.size());
+        StatsPoint third = pointConsumer.points.get(2);
+        assertEquals("type:sqs", third.getTags().getType());
+        assertEquals("topic:topicB", third.getTags().getTopic());
+        assertEquals(3, third.getTags().nonNullSize());
+        assertEquals(pointConsumer.points.get(1).getHash(), third.getParentHash());
+        assertNotEquals(0L, third.getHash());
+        assertEquals(MILLISECONDS.toNanos(58), third.getPathwayLatencyNano());
+        assertEquals(MILLISECONDS.toNanos(32), third.getEdgeLatencyNano());
+    }
+
+    @Test
+    void emptyTagsNotSet() {
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
+
+        timeSource.advance(50);
+        context.setCheckpoint(
+                fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)), pointConsumer);
+        timeSource.advance(25);
+        context.setCheckpoint(
+                fromTags(DataStreamsTags.create("type", DataStreamsTags.Direction.OUTBOUND, "topic", "group", null)),
+                pointConsumer);
+        timeSource.advance(25);
+        context.setCheckpoint(fromTags(DataStreamsTags.create(null, null)), pointConsumer);
+
+        assertTrue(context.isStarted());
+        assertEquals(3, pointConsumer.points.size());
+        verifyFirstPoint(pointConsumer.points.get(0));
+        StatsPoint second = pointConsumer.points.get(1);
+        assertEquals("type:type", second.getTags().getType());
+        assertEquals("topic:topic", second.getTags().getTopic());
+        assertEquals("group:group", second.getTags().getGroup());
+        assertEquals("direction:out", second.getTags().getDirection());
+        assertEquals(4, second.getTags().nonNullSize());
+        assertEquals(pointConsumer.points.get(0).getHash(), second.getParentHash());
+        assertNotEquals(0L, second.getHash());
+        assertEquals(25L, second.getPathwayLatencyNano());
+        assertEquals(25L, second.getEdgeLatencyNano());
+        StatsPoint third = pointConsumer.points.get(2);
+        assertEquals(0, third.getTags().nonNullSize());
+        assertEquals(pointConsumer.points.get(1).getHash(), third.getParentHash());
+        assertNotEquals(0L, third.getHash());
+        assertEquals(50L, third.getPathwayLatencyNano());
+        assertEquals(25L, third.getEdgeLatencyNano());
+    }
+
+    @TableTest({
+      "scenario | dynamicConfigEnabled",
+      "enabled  | true                ",
+      "disabled | false               "
+    })
+    void checkContextExtractorDecoratorBehavior(boolean dynamicConfigEnabled) throws IOException {
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
+        when(features.supportsDataStreams()).thenReturn(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DatastreamsPayloadWriter payloadWriter = mock(DatastreamsPayloadWriter.class);
+
+        TraceConfig globalTraceConfig = mock(TraceConfig.class, RETURNS_SMART_NULLS);
+        when(globalTraceConfig.isDataStreamsEnabled()).thenReturn(dynamicConfigEnabled);
+
+        AgentTracer.TracerAPI tracerApi = mock(AgentTracer.TracerAPI.class, RETURNS_SMART_NULLS);
+        when(tracerApi.captureTraceConfig()).thenReturn(globalTraceConfig);
+        AgentTracer.TracerAPI originalTracer = AgentTracer.get();
+        AgentTracer.forceRegister(tracerApi);
+
+        try {
+            DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                    sink, features, timeSource, () -> globalTraceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+
+            BaseHash.updateBaseHash(BASE_HASH);
+            DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
+            timeSource.advance(MILLISECONDS.toNanos(50));
+            context.setCheckpoint(
+                    fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)), pointConsumer);
+            String encoded = context.encode();
+            Map<String, String> carrier = new HashMap<>();
+            carrier.put(PROPAGATION_KEY_BASE64, encoded);
+            carrier.put("someotherkey", "someothervalue");
+            Base64MapContextVisitor contextVisitor = new Base64MapContextVisitor();
+            Propagator propagator = dataStreams.propagator();
+
+            Context extractedContext = propagator.extract(root(), carrier, contextVisitor);
+            AgentSpan extractedSpan = AgentSpan.fromContext(extractedContext);
+
+            assertEquals("L+lDG/Pa9hRkZA==", encoded);
+            if (dynamicConfigEnabled) {
+                assertNotNull(extractedSpan);
+                assertNotNull(extractedSpan.spanContext());
+                assertNotNull(extractedSpan.spanContext().getPathwayContext());
+                assertTrue(extractedSpan.spanContext().getPathwayContext().isStarted());
+            }
+        } finally {
+            // cleanup
+            AgentTracer.forceRegister(originalTracer);
+        }
     }
-  }
-
-  @ParameterizedTest
-  @ValueSource(booleans = {true, false})
-  void checkContextExtractorDecoratorBehaviorWhenLocalTraceConfigIsNull(boolean globalDsmEnabled)
-      throws IOException {
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
-    when(features.supportsDataStreams()).thenReturn(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DatastreamsPayloadWriter payloadWriter = mock(DatastreamsPayloadWriter.class);
-
-    TraceConfig globalTraceConfig = mock(TraceConfig.class, RETURNS_SMART_NULLS);
-    when(globalTraceConfig.isDataStreamsEnabled()).thenReturn(globalDsmEnabled);
-
-    AgentTracer.TracerAPI tracerApi = mock(AgentTracer.TracerAPI.class, RETURNS_SMART_NULLS);
-    when(tracerApi.captureTraceConfig()).thenReturn(globalTraceConfig);
-    AgentTracer.TracerAPI originalTracer = AgentTracer.get();
-    AgentTracer.forceRegister(tracerApi);
-
-    try {
-      DefaultDataStreamsMonitoring dataStreams =
-          new DefaultDataStreamsMonitoring(
-              sink,
-              features,
-              timeSource,
-              () -> globalTraceConfig,
-              payloadWriter,
-              DEFAULT_BUCKET_DURATION_NANOS);
-
-      BaseHash.updateBaseHash(BASE_HASH);
-      DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
-      timeSource.advance(MILLISECONDS.toNanos(50));
-      context.setCheckpoint(
-          fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)),
-          pointConsumer);
-      String encoded = context.encode();
-      Map<String, String> carrier = new HashMap<>();
-      carrier.put(PROPAGATION_KEY_BASE64, encoded);
-      carrier.put("someotherkey", "someothervalue");
-      Base64MapContextVisitor contextVisitor = new Base64MapContextVisitor();
-      ExtractedContext spanContext =
-          new ExtractedContext(
-              DDTraceId.ONE,
-              1,
-              0,
-              null,
-              0,
-              null,
-              (TagMap) null,
-              null,
-              null,
-              globalTraceConfig,
-              DATADOG);
-      Context baseContext = AgentSpan.fromSpanContext(spanContext).storeInto(root());
-      Propagator propagator = dataStreams.propagator();
-
-      Context extractedContext = propagator.extract(baseContext, carrier, contextVisitor);
-      AgentSpan extractedSpan = AgentSpan.fromContext(extractedContext);
-
-      assertNotNull(extractedSpan);
-
-      Object extracted = extractedSpan.spanContext();
-
-      assertNotNull(extracted);
-      assertEquals("L+lDG/Pa9hRkZA==", encoded);
-      if (globalDsmEnabled) {
-        assertNotNull(extractedSpan.spanContext().getPathwayContext());
-        assertTrue(extractedSpan.spanContext().getPathwayContext().isStarted());
-      } else {
-        assertNull(extractedSpan.spanContext().getPathwayContext());
-      }
-    } finally {
-      // cleanup
-      AgentTracer.forceRegister(originalTracer);
+
+    @TableTest({
+      "scenario | globalDsmEnabled",
+      "enabled  | true            ",
+      "disabled | false           "
+    })
+    void checkContextExtractorDecoratorBehaviorWhenTraceDataIsNull(boolean globalDsmEnabled) throws IOException {
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
+        when(features.supportsDataStreams()).thenReturn(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DatastreamsPayloadWriter payloadWriter = mock(DatastreamsPayloadWriter.class);
+
+        TraceConfig globalTraceConfig = mock(TraceConfig.class, RETURNS_SMART_NULLS);
+        when(globalTraceConfig.isDataStreamsEnabled()).thenReturn(globalDsmEnabled);
+
+        AgentTracer.TracerAPI tracerApi = mock(AgentTracer.TracerAPI.class, RETURNS_SMART_NULLS);
+        when(tracerApi.captureTraceConfig()).thenReturn(globalTraceConfig);
+        AgentTracer.TracerAPI originalTracer = AgentTracer.get();
+        AgentTracer.forceRegister(tracerApi);
+
+        try {
+            DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                    sink, features, timeSource, () -> globalTraceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+
+            BaseHash.updateBaseHash(BASE_HASH);
+            DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
+            timeSource.advance(MILLISECONDS.toNanos(50));
+            context.setCheckpoint(
+                    fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)), pointConsumer);
+            String encoded = context.encode();
+
+            Map<String, String> carrier = new HashMap<>();
+            carrier.put(PROPAGATION_KEY_BASE64, encoded);
+            carrier.put("someotherkey", "someothervalue");
+            Base64MapContextVisitor contextVisitor = new Base64MapContextVisitor();
+            Propagator propagator = dataStreams.propagator();
+
+            Context extractedContext = propagator.extract(root(), carrier, contextVisitor);
+            AgentSpan extractedSpan = AgentSpan.fromContext(extractedContext);
+
+            assertEquals("L+lDG/Pa9hRkZA==", encoded);
+            if (globalDsmEnabled) {
+                assertNotNull(extractedSpan);
+                assertNotNull(extractedSpan.spanContext());
+                assertNotNull(extractedSpan.spanContext().getPathwayContext());
+                assertTrue(extractedSpan.spanContext().getPathwayContext().isStarted());
+            } else {
+                assertNull(extractedSpan);
+            }
+        } finally {
+            // cleanup
+            AgentTracer.forceRegister(originalTracer);
+        }
     }
-  }
-
-  @Test
-  void checkContextExtractorDecoratorBehaviorWhenTraceDataAndDsmDataAreNull() {
-    Sink sink = mock(Sink.class);
-    DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
-    when(features.supportsDataStreams()).thenReturn(true);
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    DatastreamsPayloadWriter payloadWriter = mock(DatastreamsPayloadWriter.class);
-
-    TraceConfig traceConfig = mock(TraceConfig.class, RETURNS_SMART_NULLS);
-    when(traceConfig.isDataStreamsEnabled()).thenReturn(true);
-
-    DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink,
-            features,
-            timeSource,
-            () -> traceConfig,
-            payloadWriter,
-            DEFAULT_BUCKET_DURATION_NANOS);
-
-    Map<String, String> carrier = new HashMap<>();
-    carrier.put("someotherkey", "someothervalue");
-    Base64MapContextVisitor contextVisitor = new Base64MapContextVisitor();
-    Propagator propagator = dataStreams.propagator();
-
-    Context extractedContext = propagator.extract(root(), carrier, contextVisitor);
-    AgentSpan extractedSpan = AgentSpan.fromContext(extractedContext);
-
-    assertNull(extractedSpan);
-  }
-
-  static class CapturingPointConsumer implements Consumer<StatsPoint> {
-    final List<StatsPoint> points = new ArrayList<>();
-
-    @Override
-    public void accept(StatsPoint point) {
-      points.add(point);
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void checkContextExtractorDecoratorBehaviorWhenLocalTraceConfigIsNull(boolean globalDsmEnabled) throws IOException {
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
+        when(features.supportsDataStreams()).thenReturn(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DatastreamsPayloadWriter payloadWriter = mock(DatastreamsPayloadWriter.class);
+
+        TraceConfig globalTraceConfig = mock(TraceConfig.class, RETURNS_SMART_NULLS);
+        when(globalTraceConfig.isDataStreamsEnabled()).thenReturn(globalDsmEnabled);
+
+        AgentTracer.TracerAPI tracerApi = mock(AgentTracer.TracerAPI.class, RETURNS_SMART_NULLS);
+        when(tracerApi.captureTraceConfig()).thenReturn(globalTraceConfig);
+        AgentTracer.TracerAPI originalTracer = AgentTracer.get();
+        AgentTracer.forceRegister(tracerApi);
+
+        try {
+            DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                    sink, features, timeSource, () -> globalTraceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+
+            BaseHash.updateBaseHash(BASE_HASH);
+            DefaultPathwayContext context = new DefaultPathwayContext(timeSource, null);
+            timeSource.advance(MILLISECONDS.toNanos(50));
+            context.setCheckpoint(
+                    fromTags(DataStreamsTags.create("internal", DataStreamsTags.Direction.INBOUND)), pointConsumer);
+            String encoded = context.encode();
+            Map<String, String> carrier = new HashMap<>();
+            carrier.put(PROPAGATION_KEY_BASE64, encoded);
+            carrier.put("someotherkey", "someothervalue");
+            Base64MapContextVisitor contextVisitor = new Base64MapContextVisitor();
+            ExtractedContext spanContext = new ExtractedContext(
+                    DDTraceId.ONE, 1, 0, null, 0, null, (TagMap) null, null, null, globalTraceConfig, DATADOG);
+            Context baseContext = AgentSpan.fromSpanContext(spanContext).storeInto(root());
+            Propagator propagator = dataStreams.propagator();
+
+            Context extractedContext = propagator.extract(baseContext, carrier, contextVisitor);
+            AgentSpan extractedSpan = AgentSpan.fromContext(extractedContext);
+
+            assertNotNull(extractedSpan);
+
+            Object extracted = extractedSpan.spanContext();
+
+            assertNotNull(extracted);
+            assertEquals("L+lDG/Pa9hRkZA==", encoded);
+            if (globalDsmEnabled) {
+                assertNotNull(extractedSpan.spanContext().getPathwayContext());
+                assertTrue(extractedSpan.spanContext().getPathwayContext().isStarted());
+            } else {
+                assertNull(extractedSpan.spanContext().getPathwayContext());
+            }
+        } finally {
+            // cleanup
+            AgentTracer.forceRegister(originalTracer);
+        }
     }
-  }
-
-  static class Base64MapContextVisitor
-      implements AgentPropagation.ContextVisitor<Map<String, String>> {
-    @Override
-    public void forEachKey(Map<String, String> carrier, AgentPropagation.KeyClassifier classifier) {
-      for (Map.Entry<String, String> entry : carrier.entrySet()) {
-        classifier.accept(entry.getKey(), entry.getValue());
-      }
+
+    @Test
+    void checkContextExtractorDecoratorBehaviorWhenTraceDataAndDsmDataAreNull() {
+        Sink sink = mock(Sink.class);
+        DDAgentFeaturesDiscovery features = mock(DDAgentFeaturesDiscovery.class, RETURNS_SMART_NULLS);
+        when(features.supportsDataStreams()).thenReturn(true);
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        DatastreamsPayloadWriter payloadWriter = mock(DatastreamsPayloadWriter.class);
+
+        TraceConfig traceConfig = mock(TraceConfig.class, RETURNS_SMART_NULLS);
+        when(traceConfig.isDataStreamsEnabled()).thenReturn(true);
+
+        DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, features, timeSource, () -> traceConfig, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS);
+
+        Map<String, String> carrier = new HashMap<>();
+        carrier.put("someotherkey", "someothervalue");
+        Base64MapContextVisitor contextVisitor = new Base64MapContextVisitor();
+        Propagator propagator = dataStreams.propagator();
+
+        Context extractedContext = propagator.extract(root(), carrier, contextVisitor);
+        AgentSpan extractedSpan = AgentSpan.fromContext(extractedContext);
+
+        assertNull(extractedSpan);
+    }
+
+    static class CapturingPointConsumer implements Consumer<StatsPoint> {
+        final List<StatsPoint> points = new ArrayList<>();
+
+        @Override
+        public void accept(StatsPoint point) {
+            points.add(point);
+        }
+    }
+
+    static class Base64MapContextVisitor implements AgentPropagation.ContextVisitor<Map<String, String>> {
+        @Override
+        public void forEachKey(Map<String, String> carrier, AgentPropagation.KeyClassifier classifier) {
+            for (Map.Entry<String, String> entry : carrier.entrySet()) {
+                classifier.accept(entry.getKey(), entry.getValue());
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/TransactionContainerTest.java b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/TransactionContainerTest.java
index 5f37096515e..7448bdaf2e9 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/TransactionContainerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/TransactionContainerTest.java
@@ -10,41 +10,41 @@
 
 public class TransactionContainerTest extends DDCoreJavaSpecification {
 
-  private static final byte[] EXPECTED_CONTAINER_DATA =
-      new byte[] {1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 49, 2, 0, 0, 0, 0, 0, 0, 0, 2, 1, 50};
-
-  @Test
-  void testWithNoResize() {
-    TransactionInfoTestBridge.resetCache();
-    TransactionContainer container = new TransactionContainer(1024);
-    container.add(new TransactionInfo("1", 1, "1"));
-    container.add(new TransactionInfo("2", 2, "2"));
-    byte[] data = container.getData();
-
-    assertEquals(22, data.length);
-    assertArrayEquals(EXPECTED_CONTAINER_DATA, data);
-  }
-
-  @Test
-  void testWithResize() {
-    TransactionInfoTestBridge.resetCache();
-    TransactionContainer container = new TransactionContainer(10);
-    container.add(new TransactionInfo("1", 1, "1"));
-    container.add(new TransactionInfo("2", 2, "2"));
-    byte[] data = container.getData();
-
-    assertEquals(22, data.length);
-    assertArrayEquals(EXPECTED_CONTAINER_DATA, data);
-  }
-
-  @Test
-  void testCheckpointMap() {
-    TransactionInfoTestBridge.resetCache();
-    new TransactionInfo("1", 1, "1");
-    new TransactionInfo("2", 2, "2");
-    byte[] data = TransactionInfo.getCheckpointIdCacheBytes();
-
-    assertEquals(6, data.length);
-    assertArrayEquals(new byte[] {1, 1, 49, 2, 1, 50}, data);
-  }
+    private static final byte[] EXPECTED_CONTAINER_DATA =
+            new byte[] {1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 49, 2, 0, 0, 0, 0, 0, 0, 0, 2, 1, 50};
+
+    @Test
+    void testWithNoResize() {
+        TransactionInfoTestBridge.resetCache();
+        TransactionContainer container = new TransactionContainer(1024);
+        container.add(new TransactionInfo("1", 1, "1"));
+        container.add(new TransactionInfo("2", 2, "2"));
+        byte[] data = container.getData();
+
+        assertEquals(22, data.length);
+        assertArrayEquals(EXPECTED_CONTAINER_DATA, data);
+    }
+
+    @Test
+    void testWithResize() {
+        TransactionInfoTestBridge.resetCache();
+        TransactionContainer container = new TransactionContainer(10);
+        container.add(new TransactionInfo("1", 1, "1"));
+        container.add(new TransactionInfo("2", 2, "2"));
+        byte[] data = container.getData();
+
+        assertEquals(22, data.length);
+        assertArrayEquals(EXPECTED_CONTAINER_DATA, data);
+    }
+
+    @Test
+    void testCheckpointMap() {
+        TransactionInfoTestBridge.resetCache();
+        new TransactionInfo("1", 1, "1");
+        new TransactionInfo("2", 2, "2");
+        byte[] data = TransactionInfo.getCheckpointIdCacheBytes();
+
+        assertEquals(6, data.length);
+        assertArrayEquals(new byte[] {1, 1, 49, 2, 1, 50}, data);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/monitor/HealthMetricsTest.java b/dd-trace-core/src/test/java/datadog/trace/core/monitor/HealthMetricsTest.java
index bf388364d78..7575d493316 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/monitor/HealthMetricsTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/monitor/HealthMetricsTest.java
@@ -29,511 +29,504 @@
 @ExtendWith(MockitoExtension.class)
 class HealthMetricsTest {
 
-  @Mock StatsDClient statsD;
-
-  @Test
-  void testOnShutdown() {
-    TracerHealthMetrics healthMetrics = new TracerHealthMetrics(statsD);
-    healthMetrics.onShutdown(true);
-    verifyNoInteractions(statsD);
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("testOnPublishArguments")
-  void testOnPublish(String scenario, List<DDSpan> trace, int samplingPriority, String priorityName)
-      throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(trace.isEmpty() ? 1 : 2);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onPublish(trace, samplingPriority);
-      assertTrue(latch.await(10, TimeUnit.SECONDS));
+    @Mock
+    StatsDClient statsD;
+
+    @Test
+    void testOnShutdown() {
+        TracerHealthMetrics healthMetrics = new TracerHealthMetrics(statsD);
+        healthMetrics.onShutdown(true);
+        verifyNoInteractions(statsD);
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("testOnPublishArguments")
+    void testOnPublish(String scenario, List<DDSpan> trace, int samplingPriority, String priorityName)
+            throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(trace.isEmpty() ? 1 : 2);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onPublish(trace, samplingPriority);
+            assertTrue(latch.await(10, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("queue.enqueued.traces", 1L, "priority:" + priorityName);
+        if (!trace.isEmpty()) {
+            verify(statsD).count("queue.enqueued.spans", (long) trace.size());
+        }
+        verifyNoMoreInteractions(statsD);
+    }
+
+    static Stream<Arguments> testOnPublishArguments() {
+        List<DDSpan> emptyTrace = Collections.emptyList();
+        List<DDSpan> twoSpanTrace = Arrays.<DDSpan>asList(null, null);
+        return Stream.of(
+                arguments("empty trace user_drop", emptyTrace, (int) PrioritySampling.USER_DROP, "user_drop"),
+                arguments("two span trace user_drop", twoSpanTrace, (int) PrioritySampling.USER_DROP, "user_drop"),
+                arguments("empty trace sampler_keep", emptyTrace, (int) PrioritySampling.SAMPLER_KEEP, "sampler_keep"),
+                arguments(
+                        "two span trace sampler_keep",
+                        twoSpanTrace,
+                        (int) PrioritySampling.SAMPLER_KEEP,
+                        "sampler_keep"));
+    }
+
+    @TableTest({
+      "scenario     | samplingPriority | samplingTag          ",
+      "sampler_keep | 1                | priority:sampler_keep",
+      "user_keep    | 2                | priority:user_keep   ",
+      "user_drop    | -1               | priority:user_drop   ",
+      "sampler_drop | 0                | priority:sampler_drop",
+      "unset        | -128             | priority:unset       "
+    })
+    @ParameterizedTest(name = "testOnFailedPublish [{index}]")
+    void testOnFailedPublish(int samplingPriority, String samplingTag) throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(2);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onFailedPublish(samplingPriority, 1);
+            assertTrue(latch.await(2, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("queue.dropped.traces", 1L, samplingTag);
+        verify(statsD).count("queue.dropped.spans", 1L, samplingTag);
+        verifyNoMoreInteractions(statsD);
+    }
+
+    @TableTest({
+      "scenario   | droppedSpans",
+      "1 dropped  | 1           ",
+      "42 dropped | 42          ",
+      "3 dropped  | 3           "
+    })
+    @ParameterizedTest(name = "testOnPartialPublish [{index}]")
+    void testOnPartialPublish(int droppedSpans) throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(2);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onPartialPublish(droppedSpans);
+            assertTrue(latch.await(10, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("queue.partial.traces", 1L);
+        verify(statsD).count("queue.dropped.spans", (long) droppedSpans, "priority:sampler_drop");
+        verifyNoMoreInteractions(statsD);
+    }
+
+    @Test
+    void testOnScheduleFlush() {
+        TracerHealthMetrics healthMetrics = new TracerHealthMetrics(statsD);
+        healthMetrics.onScheduleFlush(true);
+        verifyNoInteractions(statsD);
+    }
+
+    @Test
+    void testOnFlush() {
+        TracerHealthMetrics healthMetrics = new TracerHealthMetrics(statsD);
+        healthMetrics.onFlush(true);
+        verifyNoInteractions(statsD);
+    }
+
+    @Test
+    void testOnSerialize() throws InterruptedException {
+        int bytes = ThreadLocalRandom.current().nextInt(10000);
+        CountDownLatch latch = new CountDownLatch(1);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onSerialize(bytes);
+            assertTrue(latch.await(10, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("queue.enqueued.bytes", (long) bytes);
+        verifyNoMoreInteractions(statsD);
+    }
+
+    @Test
+    void testOnFailedSerialize() {
+        TracerHealthMetrics healthMetrics = new TracerHealthMetrics(statsD);
+        healthMetrics.onFailedSerialize(null, null);
+        verifyNoInteractions(statsD);
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("testOnSendArguments")
+    void testOnSend(String scenario, RemoteApi.Response response) throws InterruptedException {
+        int traceCount = ThreadLocalRandom.current().nextInt(1, 100);
+        int sendSize = ThreadLocalRandom.current().nextInt(1, 100);
+        int latchCount = 3
+                + (response.exception().isPresent() ? 1 : 0)
+                + (response.status().isPresent() ? 1 : 0);
+        CountDownLatch latch = new CountDownLatch(latchCount);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onSend(traceCount, sendSize, response);
+            assertTrue(latch.await(10, TimeUnit.SECONDS));
+        }
+        verifySendAttempt(response, traceCount, sendSize);
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("testOnFailedSendArguments")
+    void testOnFailedSend(String scenario, RemoteApi.Response response) throws InterruptedException {
+        int traceCount = ThreadLocalRandom.current().nextInt(1, 100);
+        int sendSize = ThreadLocalRandom.current().nextInt(1, 100);
+        int latchCount = 3
+                + (response.exception().isPresent() ? 1 : 0)
+                + (response.status().isPresent() ? 1 : 0);
+        CountDownLatch latch = new CountDownLatch(latchCount);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onFailedSend(traceCount, sendSize, response);
+            assertTrue(latch.await(10, TimeUnit.SECONDS));
+        }
+        verifySendAttempt(response, traceCount, sendSize);
+    }
+
+    private void verifySendAttempt(RemoteApi.Response response, int traceCount, int sendSize) {
+        verify(statsD).count("api.requests.total", 1L);
+        verify(statsD).count("flush.traces.total", (long) traceCount);
+        verify(statsD).count("flush.bytes.total", (long) sendSize);
+        if (response.exception().isPresent()) {
+            verify(statsD).count("api.errors.total", 1L);
+        }
+        if (response.status().isPresent()) {
+            verify(statsD)
+                    .incrementCounter(
+                            "api.responses.total", "status:" + response.status().getAsInt());
+        }
+        verifyNoMoreInteractions(statsD);
+    }
+
+    static Stream<Arguments> testOnSendArguments() {
+        return Stream.of(
+                arguments(
+                        "success with status",
+                        RemoteApi.Response.success(ThreadLocalRandom.current().nextInt(1, 100))),
+                arguments(
+                        "failed with status",
+                        RemoteApi.Response.failed(ThreadLocalRandom.current().nextInt(1, 100))),
+                arguments(
+                        "success with status and exception",
+                        RemoteApi.Response.success(ThreadLocalRandom.current().nextInt(1, 100), new Throwable())),
+                arguments("failed with exception", RemoteApi.Response.failed(new Throwable())));
+    }
+
+    static Stream<Arguments> testOnFailedSendArguments() {
+        return testOnSendArguments();
+    }
+
+    @Test
+    void testOnCreateTrace() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onCreateTrace();
+            assertTrue(latch.await(5, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("trace.pending.created", 1L);
+        verifyNoMoreInteractions(statsD);
+    }
+
+    @Test
+    void testOnCreateSpan() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onCreateSpan();
+            assertTrue(latch.await(5, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("span.pending.created", 1L);
+        verifyNoMoreInteractions(statsD);
+    }
+
+    @Test
+    void testOnCancelContinuation() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onCancelContinuation();
+            assertTrue(latch.await(5, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("span.continuations.canceled", 1L);
+        verifyNoMoreInteractions(statsD);
+    }
+
+    @Test
+    void testOnFinishContinuation() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onFinishContinuation();
+            assertTrue(latch.await(5, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("span.continuations.finished", 1L);
+        verifyNoMoreInteractions(statsD);
+    }
+
+    @Test
+    void testOnSingleSpanSample() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onSingleSpanSample();
+            assertTrue(latch.await(5, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("span.sampling.sampled", 1L, "sampler:single-span");
+        verifyNoMoreInteractions(statsD);
+    }
+
+    @Test
+    void testOnSingleSpanUnsampled() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onSingleSpanUnsampled();
+            assertTrue(latch.await(5, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("span.sampling.unsampled", 1L, "sampler:single-span");
+        verifyNoMoreInteractions(statsD);
+    }
+
+    @Test
+    void testOnFinishSpan() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onFinishSpan();
+            assertTrue(latch.await(5, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("span.pending.finished", 1L);
+        verifyNoMoreInteractions(statsD);
+    }
+
+    @Test
+    void testOnActivateScope() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onActivateScope();
+            assertTrue(latch.await(5, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("scope.activate.count", 1L);
+        verifyNoMoreInteractions(statsD);
+    }
+
+    @Test
+    void testOnCloseScope() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onCloseScope();
+            assertTrue(latch.await(5, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("scope.close.count", 1L);
+        verifyNoMoreInteractions(statsD);
+    }
+
+    @TableTest({
+      "scenario  | manual",
+      "automatic | false ",
+      "manual    | true  "
+    })
+    @ParameterizedTest(name = "testOnScopeCloseError [{index}]")
+    void testOnScopeCloseError(boolean manual) throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(manual ? 2 : 1);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onScopeCloseError(manual);
+            assertTrue(latch.await(5, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("scope.close.error", 1L);
+        if (manual) {
+            verify(statsD).count("scope.user.close.error", 1L);
+        }
+        verifyNoMoreInteractions(statsD);
+    }
+
+    @Test
+    void testOnScopeStackOverflow() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onScopeStackOverflow();
+            assertTrue(latch.await(5, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("scope.error.stack-overflow", 1L);
+        verifyNoMoreInteractions(statsD);
+    }
+
+    @Test
+    void testOnLongRunningUpdate() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(3);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onLongRunningUpdate(3, 10, 1);
+            assertTrue(latch.await(10, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("long-running.write", 10L);
+        verify(statsD).count("long-running.dropped", 3L);
+        verify(statsD).count("long-running.expired", 1L);
+        verifyNoMoreInteractions(statsD);
+    }
+
+    @Test
+    void testOnStatsAggregateDropped() throws InterruptedException {
+        // onStatsAggregateDropped emits two statsd calls: an immediate collapsed_spans count and the
+        // periodic stats.dropped_aggregates report — wait for both before verifying.
+        CountDownLatch latch = new CountDownLatch(2);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onStatsAggregateDropped();
+            assertTrue(latch.await(5, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("datadog.tracer.stats.collapsed_spans", 1L, "collapsed:whole_key");
+        verify(statsD).count("stats.dropped_aggregates", 1L, "reason:lru_eviction");
+        verifyNoMoreInteractions(statsD);
+    }
+
+    @Test
+    void testOnStatsInboxFull() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+        try (TracerHealthMetrics healthMetrics =
+                new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
+            healthMetrics.start();
+            healthMetrics.onStatsInboxFull();
+            assertTrue(latch.await(5, TimeUnit.SECONDS));
+        }
+        verify(statsD).count("stats.dropped_aggregates", 1L, "reason:inbox_full");
+        verifyNoMoreInteractions(statsD);
+    }
+
+    private static class Latched implements StatsDClient {
+        private final StatsDClient delegate;
+        private final CountDownLatch latch;
+
+        Latched(StatsDClient delegate, CountDownLatch latch) {
+            this.delegate = delegate;
+            this.latch = latch;
+        }
+
+        @Override
+        public void incrementCounter(String metricName, String... tags) {
+            try {
+                delegate.incrementCounter(metricName, tags);
+            } finally {
+                latch.countDown();
+            }
+        }
+
+        @Override
+        public void count(String metricName, long delta, String... tags) {
+            try {
+                delegate.count(metricName, delta, tags);
+            } finally {
+                latch.countDown();
+            }
+        }
+
+        @Override
+        public void gauge(String metricName, long value, String... tags) {
+            try {
+                delegate.gauge(metricName, value, tags);
+            } finally {
+                latch.countDown();
+            }
+        }
+
+        @Override
+        public void gauge(String metricName, double value, String... tags) {
+            try {
+                delegate.gauge(metricName, value, tags);
+            } finally {
+                latch.countDown();
+            }
+        }
+
+        @Override
+        public void histogram(String metricName, long value, String... tags) {
+            try {
+                delegate.histogram(metricName, value, tags);
+            } finally {
+                latch.countDown();
+            }
+        }
+
+        @Override
+        public void histogram(String metricName, double value, String... tags) {
+            try {
+                delegate.histogram(metricName, value, tags);
+            } finally {
+                latch.countDown();
+            }
+        }
+
+        @Override
+        public void distribution(String metricName, long value, String... tags) {
+            try {
+                delegate.distribution(metricName, value, tags);
+            } finally {
+                latch.countDown();
+            }
+        }
+
+        @Override
+        public void distribution(String metricName, double value, String... tags) {
+            try {
+                delegate.distribution(metricName, value, tags);
+            } finally {
+                latch.countDown();
+            }
+        }
+
+        @Override
+        public void serviceCheck(String serviceCheckName, String status, String message, String... tags) {
+            try {
+                delegate.serviceCheck(serviceCheckName, status, message, tags);
+            } finally {
+                latch.countDown();
+            }
+        }
+
+        @Override
+        public void error(Exception error) {
+            try {
+                delegate.error(error);
+            } finally {
+                latch.countDown();
+            }
+        }
+
+        @Override
+        public int getErrorCount() {
+            try {
+                return delegate.getErrorCount();
+            } finally {
+                latch.countDown();
+            }
+        }
+
+        @Override
+        public void close() {
+            try {
+                delegate.close();
+            } finally {
+                latch.countDown();
+            }
+        }
     }
-    verify(statsD).count("queue.enqueued.traces", 1L, "priority:" + priorityName);
-    if (!trace.isEmpty()) {
-      verify(statsD).count("queue.enqueued.spans", (long) trace.size());
-    }
-    verifyNoMoreInteractions(statsD);
-  }
-
-  static Stream<Arguments> testOnPublishArguments() {
-    List<DDSpan> emptyTrace = Collections.emptyList();
-    List<DDSpan> twoSpanTrace = Arrays.<DDSpan>asList(null, null);
-    return Stream.of(
-        arguments(
-            "empty trace user_drop", emptyTrace, (int) PrioritySampling.USER_DROP, "user_drop"),
-        arguments(
-            "two span trace user_drop",
-            twoSpanTrace,
-            (int) PrioritySampling.USER_DROP,
-            "user_drop"),
-        arguments(
-            "empty trace sampler_keep",
-            emptyTrace,
-            (int) PrioritySampling.SAMPLER_KEEP,
-            "sampler_keep"),
-        arguments(
-            "two span trace sampler_keep",
-            twoSpanTrace,
-            (int) PrioritySampling.SAMPLER_KEEP,
-            "sampler_keep"));
-  }
-
-  @TableTest({
-    "scenario     | samplingPriority | samplingTag          ",
-    "sampler_keep | 1                | priority:sampler_keep",
-    "user_keep    | 2                | priority:user_keep   ",
-    "user_drop    | -1               | priority:user_drop   ",
-    "sampler_drop | 0                | priority:sampler_drop",
-    "unset        | -128             | priority:unset       "
-  })
-  @ParameterizedTest(name = "testOnFailedPublish [{index}]")
-  void testOnFailedPublish(int samplingPriority, String samplingTag) throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(2);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onFailedPublish(samplingPriority, 1);
-      assertTrue(latch.await(2, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("queue.dropped.traces", 1L, samplingTag);
-    verify(statsD).count("queue.dropped.spans", 1L, samplingTag);
-    verifyNoMoreInteractions(statsD);
-  }
-
-  @TableTest({
-    "scenario   | droppedSpans",
-    "1 dropped  | 1           ",
-    "42 dropped | 42          ",
-    "3 dropped  | 3           "
-  })
-  @ParameterizedTest(name = "testOnPartialPublish [{index}]")
-  void testOnPartialPublish(int droppedSpans) throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(2);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onPartialPublish(droppedSpans);
-      assertTrue(latch.await(10, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("queue.partial.traces", 1L);
-    verify(statsD).count("queue.dropped.spans", (long) droppedSpans, "priority:sampler_drop");
-    verifyNoMoreInteractions(statsD);
-  }
-
-  @Test
-  void testOnScheduleFlush() {
-    TracerHealthMetrics healthMetrics = new TracerHealthMetrics(statsD);
-    healthMetrics.onScheduleFlush(true);
-    verifyNoInteractions(statsD);
-  }
-
-  @Test
-  void testOnFlush() {
-    TracerHealthMetrics healthMetrics = new TracerHealthMetrics(statsD);
-    healthMetrics.onFlush(true);
-    verifyNoInteractions(statsD);
-  }
-
-  @Test
-  void testOnSerialize() throws InterruptedException {
-    int bytes = ThreadLocalRandom.current().nextInt(10000);
-    CountDownLatch latch = new CountDownLatch(1);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onSerialize(bytes);
-      assertTrue(latch.await(10, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("queue.enqueued.bytes", (long) bytes);
-    verifyNoMoreInteractions(statsD);
-  }
-
-  @Test
-  void testOnFailedSerialize() {
-    TracerHealthMetrics healthMetrics = new TracerHealthMetrics(statsD);
-    healthMetrics.onFailedSerialize(null, null);
-    verifyNoInteractions(statsD);
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("testOnSendArguments")
-  void testOnSend(String scenario, RemoteApi.Response response) throws InterruptedException {
-    int traceCount = ThreadLocalRandom.current().nextInt(1, 100);
-    int sendSize = ThreadLocalRandom.current().nextInt(1, 100);
-    int latchCount =
-        3 + (response.exception().isPresent() ? 1 : 0) + (response.status().isPresent() ? 1 : 0);
-    CountDownLatch latch = new CountDownLatch(latchCount);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onSend(traceCount, sendSize, response);
-      assertTrue(latch.await(10, TimeUnit.SECONDS));
-    }
-    verifySendAttempt(response, traceCount, sendSize);
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("testOnFailedSendArguments")
-  void testOnFailedSend(String scenario, RemoteApi.Response response) throws InterruptedException {
-    int traceCount = ThreadLocalRandom.current().nextInt(1, 100);
-    int sendSize = ThreadLocalRandom.current().nextInt(1, 100);
-    int latchCount =
-        3 + (response.exception().isPresent() ? 1 : 0) + (response.status().isPresent() ? 1 : 0);
-    CountDownLatch latch = new CountDownLatch(latchCount);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onFailedSend(traceCount, sendSize, response);
-      assertTrue(latch.await(10, TimeUnit.SECONDS));
-    }
-    verifySendAttempt(response, traceCount, sendSize);
-  }
-
-  private void verifySendAttempt(RemoteApi.Response response, int traceCount, int sendSize) {
-    verify(statsD).count("api.requests.total", 1L);
-    verify(statsD).count("flush.traces.total", (long) traceCount);
-    verify(statsD).count("flush.bytes.total", (long) sendSize);
-    if (response.exception().isPresent()) {
-      verify(statsD).count("api.errors.total", 1L);
-    }
-    if (response.status().isPresent()) {
-      verify(statsD)
-          .incrementCounter("api.responses.total", "status:" + response.status().getAsInt());
-    }
-    verifyNoMoreInteractions(statsD);
-  }
-
-  static Stream<Arguments> testOnSendArguments() {
-    return Stream.of(
-        arguments(
-            "success with status",
-            RemoteApi.Response.success(ThreadLocalRandom.current().nextInt(1, 100))),
-        arguments(
-            "failed with status",
-            RemoteApi.Response.failed(ThreadLocalRandom.current().nextInt(1, 100))),
-        arguments(
-            "success with status and exception",
-            RemoteApi.Response.success(
-                ThreadLocalRandom.current().nextInt(1, 100), new Throwable())),
-        arguments("failed with exception", RemoteApi.Response.failed(new Throwable())));
-  }
-
-  static Stream<Arguments> testOnFailedSendArguments() {
-    return testOnSendArguments();
-  }
-
-  @Test
-  void testOnCreateTrace() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(1);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onCreateTrace();
-      assertTrue(latch.await(5, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("trace.pending.created", 1L);
-    verifyNoMoreInteractions(statsD);
-  }
-
-  @Test
-  void testOnCreateSpan() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(1);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onCreateSpan();
-      assertTrue(latch.await(5, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("span.pending.created", 1L);
-    verifyNoMoreInteractions(statsD);
-  }
-
-  @Test
-  void testOnCancelContinuation() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(1);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onCancelContinuation();
-      assertTrue(latch.await(5, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("span.continuations.canceled", 1L);
-    verifyNoMoreInteractions(statsD);
-  }
-
-  @Test
-  void testOnFinishContinuation() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(1);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onFinishContinuation();
-      assertTrue(latch.await(5, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("span.continuations.finished", 1L);
-    verifyNoMoreInteractions(statsD);
-  }
-
-  @Test
-  void testOnSingleSpanSample() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(1);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onSingleSpanSample();
-      assertTrue(latch.await(5, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("span.sampling.sampled", 1L, "sampler:single-span");
-    verifyNoMoreInteractions(statsD);
-  }
-
-  @Test
-  void testOnSingleSpanUnsampled() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(1);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onSingleSpanUnsampled();
-      assertTrue(latch.await(5, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("span.sampling.unsampled", 1L, "sampler:single-span");
-    verifyNoMoreInteractions(statsD);
-  }
-
-  @Test
-  void testOnFinishSpan() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(1);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onFinishSpan();
-      assertTrue(latch.await(5, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("span.pending.finished", 1L);
-    verifyNoMoreInteractions(statsD);
-  }
-
-  @Test
-  void testOnActivateScope() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(1);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onActivateScope();
-      assertTrue(latch.await(5, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("scope.activate.count", 1L);
-    verifyNoMoreInteractions(statsD);
-  }
-
-  @Test
-  void testOnCloseScope() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(1);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onCloseScope();
-      assertTrue(latch.await(5, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("scope.close.count", 1L);
-    verifyNoMoreInteractions(statsD);
-  }
-
-  @TableTest({
-    "scenario  | manual",
-    "automatic | false ",
-    "manual    | true  "
-  })
-  @ParameterizedTest(name = "testOnScopeCloseError [{index}]")
-  void testOnScopeCloseError(boolean manual) throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(manual ? 2 : 1);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onScopeCloseError(manual);
-      assertTrue(latch.await(5, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("scope.close.error", 1L);
-    if (manual) {
-      verify(statsD).count("scope.user.close.error", 1L);
-    }
-    verifyNoMoreInteractions(statsD);
-  }
-
-  @Test
-  void testOnScopeStackOverflow() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(1);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onScopeStackOverflow();
-      assertTrue(latch.await(5, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("scope.error.stack-overflow", 1L);
-    verifyNoMoreInteractions(statsD);
-  }
-
-  @Test
-  void testOnLongRunningUpdate() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(3);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onLongRunningUpdate(3, 10, 1);
-      assertTrue(latch.await(10, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("long-running.write", 10L);
-    verify(statsD).count("long-running.dropped", 3L);
-    verify(statsD).count("long-running.expired", 1L);
-    verifyNoMoreInteractions(statsD);
-  }
-
-  @Test
-  void testOnStatsAggregateDropped() throws InterruptedException {
-    // onStatsAggregateDropped emits two statsd calls: an immediate collapsed_spans count and the
-    // periodic stats.dropped_aggregates report — wait for both before verifying.
-    CountDownLatch latch = new CountDownLatch(2);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onStatsAggregateDropped();
-      assertTrue(latch.await(5, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("datadog.tracer.stats.collapsed_spans", 1L, "collapsed:whole_key");
-    verify(statsD).count("stats.dropped_aggregates", 1L, "reason:lru_eviction");
-    verifyNoMoreInteractions(statsD);
-  }
-
-  @Test
-  void testOnStatsInboxFull() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(1);
-    try (TracerHealthMetrics healthMetrics =
-        new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) {
-      healthMetrics.start();
-      healthMetrics.onStatsInboxFull();
-      assertTrue(latch.await(5, TimeUnit.SECONDS));
-    }
-    verify(statsD).count("stats.dropped_aggregates", 1L, "reason:inbox_full");
-    verifyNoMoreInteractions(statsD);
-  }
-
-  private static class Latched implements StatsDClient {
-    private final StatsDClient delegate;
-    private final CountDownLatch latch;
-
-    Latched(StatsDClient delegate, CountDownLatch latch) {
-      this.delegate = delegate;
-      this.latch = latch;
-    }
-
-    @Override
-    public void incrementCounter(String metricName, String... tags) {
-      try {
-        delegate.incrementCounter(metricName, tags);
-      } finally {
-        latch.countDown();
-      }
-    }
-
-    @Override
-    public void count(String metricName, long delta, String... tags) {
-      try {
-        delegate.count(metricName, delta, tags);
-      } finally {
-        latch.countDown();
-      }
-    }
-
-    @Override
-    public void gauge(String metricName, long value, String... tags) {
-      try {
-        delegate.gauge(metricName, value, tags);
-      } finally {
-        latch.countDown();
-      }
-    }
-
-    @Override
-    public void gauge(String metricName, double value, String... tags) {
-      try {
-        delegate.gauge(metricName, value, tags);
-      } finally {
-        latch.countDown();
-      }
-    }
-
-    @Override
-    public void histogram(String metricName, long value, String... tags) {
-      try {
-        delegate.histogram(metricName, value, tags);
-      } finally {
-        latch.countDown();
-      }
-    }
-
-    @Override
-    public void histogram(String metricName, double value, String... tags) {
-      try {
-        delegate.histogram(metricName, value, tags);
-      } finally {
-        latch.countDown();
-      }
-    }
-
-    @Override
-    public void distribution(String metricName, long value, String... tags) {
-      try {
-        delegate.distribution(metricName, value, tags);
-      } finally {
-        latch.countDown();
-      }
-    }
-
-    @Override
-    public void distribution(String metricName, double value, String... tags) {
-      try {
-        delegate.distribution(metricName, value, tags);
-      } finally {
-        latch.countDown();
-      }
-    }
-
-    @Override
-    public void serviceCheck(
-        String serviceCheckName, String status, String message, String... tags) {
-      try {
-        delegate.serviceCheck(serviceCheckName, status, message, tags);
-      } finally {
-        latch.countDown();
-      }
-    }
-
-    @Override
-    public void error(Exception error) {
-      try {
-        delegate.error(error);
-      } finally {
-        latch.countDown();
-      }
-    }
-
-    @Override
-    public int getErrorCount() {
-      try {
-        return delegate.getErrorCount();
-      } finally {
-        latch.countDown();
-      }
-    }
-
-    @Override
-    public void close() {
-      try {
-        delegate.close();
-      } finally {
-        latch.countDown();
-      }
-    }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpCommonJsonTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpCommonJsonTest.java
index ac77655d613..8c0008be1c5 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpCommonJsonTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpCommonJsonTest.java
@@ -20,89 +20,86 @@
 
 class OtlpCommonJsonTest {
 
-  @Test
-  void hexTraceIdEncodesHighAndLowOrderBytes() {
-    DD128bTraceId traceId = DD128bTraceId.from(0x0123456789abcdefL, 0xfedcba9876543210L);
-    assertEquals("0123456789abcdeffedcba9876543210", OtlpCommonJson.hexTraceId(traceId));
-  }
-
-  @Test
-  void hexSpanIdEncodes64Bits() {
-    assertEquals("0000000000000001", OtlpCommonJson.hexSpanId(1L));
-    assertEquals("00000000000004d2", OtlpCommonJson.hexSpanId(1234L));
-  }
-
-  @Test
-  void stringAttribute() throws IOException {
-    Map<String, Object> keyValue = writeAndParseAttribute(STRING_ATTRIBUTE, "k", "v");
-    assertEquals("k", keyValue.get("key"));
-    assertEquals("v", valueOf(keyValue).get("stringValue"));
-  }
-
-  @Test
-  void booleanAttribute() throws IOException {
-    Map<String, Object> keyValue = writeAndParseAttribute(BOOLEAN_ATTRIBUTE, "flag", true);
-    assertEquals(Boolean.TRUE, valueOf(keyValue).get("boolValue"));
-  }
-
-  @Test
-  void longAttributeIsEncodedAsDecimalString() throws IOException {
-    Map<String, Object> keyValue = writeAndParseAttribute(LONG_ATTRIBUTE, "n", 42L);
-    assertEquals("42", valueOf(keyValue).get("intValue"));
-  }
-
-  @Test
-  void doubleAttributeIsEncodedAsNumber() throws IOException {
-    Map<String, Object> keyValue = writeAndParseAttribute(DOUBLE_ATTRIBUTE, "d", 3.14);
-    assertEquals(3.14, ((Number) valueOf(keyValue).get("doubleValue")).doubleValue());
-  }
-
-  @Test
-  void stringArrayAttributeWrapsValuesInArrayValue() throws IOException {
-    Map<String, Object> keyValue =
-        writeAndParseAttribute(STRING_ARRAY_ATTRIBUTE, "tags", Arrays.asList("a", "b"));
-
-    Map<String, Object> value = valueOf(keyValue);
-    Map<String, Object> arrayValue = (Map<String, Object>) value.get("arrayValue");
-    List<Object> values = (List<Object>) arrayValue.get("values");
-    assertEquals(2, values.size());
-    assertEquals("a", ((Map<String, Object>) values.get(0)).get("stringValue"));
-    assertEquals("b", ((Map<String, Object>) values.get(1)).get("stringValue"));
-  }
-
-  @Test
-  void longArrayAttributeEncodesEachElementAsDecimalString() throws IOException {
-    Map<String, Object> keyValue =
-        writeAndParseAttribute(LONG_ARRAY_ATTRIBUTE, "ns", Arrays.asList(1L, 2L, 3L));
-
-    Map<String, Object> arrayValue = (Map<String, Object>) valueOf(keyValue).get("arrayValue");
-    List<Object> values = (List<Object>) arrayValue.get("values");
-    assertEquals("1", ((Map<String, Object>) values.get(0)).get("intValue"));
-    assertEquals("2", ((Map<String, Object>) values.get(1)).get("intValue"));
-    assertEquals("3", ((Map<String, Object>) values.get(2)).get("intValue"));
-  }
-
-  @Test
-  void booleanArrayAttribute() throws IOException {
-    Map<String, Object> keyValue =
-        writeAndParseAttribute(BOOLEAN_ARRAY_ATTRIBUTE, "flags", Arrays.asList(true, false));
-
-    Map<String, Object> arrayValue = (Map<String, Object>) valueOf(keyValue).get("arrayValue");
-    List<Object> values = (List<Object>) arrayValue.get("values");
-    assertEquals(Boolean.TRUE, ((Map<String, Object>) values.get(0)).get("boolValue"));
-    assertEquals(Boolean.FALSE, ((Map<String, Object>) values.get(1)).get("boolValue"));
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> valueOf(Map<String, Object> keyValue) {
-    return (Map<String, Object>) keyValue.get("value");
-  }
-
-  private static Map<String, Object> writeAndParseAttribute(int type, String key, Object value)
-      throws IOException {
-    try (JsonWriter writer = new JsonWriter()) {
-      OtlpCommonJson.writeAttribute(writer, type, key, value);
-      return JsonMapper.fromJsonToMap(writer.toString());
+    @Test
+    void hexTraceIdEncodesHighAndLowOrderBytes() {
+        DD128bTraceId traceId = DD128bTraceId.from(0x0123456789abcdefL, 0xfedcba9876543210L);
+        assertEquals("0123456789abcdeffedcba9876543210", OtlpCommonJson.hexTraceId(traceId));
+    }
+
+    @Test
+    void hexSpanIdEncodes64Bits() {
+        assertEquals("0000000000000001", OtlpCommonJson.hexSpanId(1L));
+        assertEquals("00000000000004d2", OtlpCommonJson.hexSpanId(1234L));
+    }
+
+    @Test
+    void stringAttribute() throws IOException {
+        Map<String, Object> keyValue = writeAndParseAttribute(STRING_ATTRIBUTE, "k", "v");
+        assertEquals("k", keyValue.get("key"));
+        assertEquals("v", valueOf(keyValue).get("stringValue"));
+    }
+
+    @Test
+    void booleanAttribute() throws IOException {
+        Map<String, Object> keyValue = writeAndParseAttribute(BOOLEAN_ATTRIBUTE, "flag", true);
+        assertEquals(Boolean.TRUE, valueOf(keyValue).get("boolValue"));
+    }
+
+    @Test
+    void longAttributeIsEncodedAsDecimalString() throws IOException {
+        Map<String, Object> keyValue = writeAndParseAttribute(LONG_ATTRIBUTE, "n", 42L);
+        assertEquals("42", valueOf(keyValue).get("intValue"));
+    }
+
+    @Test
+    void doubleAttributeIsEncodedAsNumber() throws IOException {
+        Map<String, Object> keyValue = writeAndParseAttribute(DOUBLE_ATTRIBUTE, "d", 3.14);
+        assertEquals(3.14, ((Number) valueOf(keyValue).get("doubleValue")).doubleValue());
+    }
+
+    @Test
+    void stringArrayAttributeWrapsValuesInArrayValue() throws IOException {
+        Map<String, Object> keyValue = writeAndParseAttribute(STRING_ARRAY_ATTRIBUTE, "tags", Arrays.asList("a", "b"));
+
+        Map<String, Object> value = valueOf(keyValue);
+        Map<String, Object> arrayValue = (Map<String, Object>) value.get("arrayValue");
+        List<Object> values = (List<Object>) arrayValue.get("values");
+        assertEquals(2, values.size());
+        assertEquals("a", ((Map<String, Object>) values.get(0)).get("stringValue"));
+        assertEquals("b", ((Map<String, Object>) values.get(1)).get("stringValue"));
+    }
+
+    @Test
+    void longArrayAttributeEncodesEachElementAsDecimalString() throws IOException {
+        Map<String, Object> keyValue = writeAndParseAttribute(LONG_ARRAY_ATTRIBUTE, "ns", Arrays.asList(1L, 2L, 3L));
+
+        Map<String, Object> arrayValue = (Map<String, Object>) valueOf(keyValue).get("arrayValue");
+        List<Object> values = (List<Object>) arrayValue.get("values");
+        assertEquals("1", ((Map<String, Object>) values.get(0)).get("intValue"));
+        assertEquals("2", ((Map<String, Object>) values.get(1)).get("intValue"));
+        assertEquals("3", ((Map<String, Object>) values.get(2)).get("intValue"));
+    }
+
+    @Test
+    void booleanArrayAttribute() throws IOException {
+        Map<String, Object> keyValue =
+                writeAndParseAttribute(BOOLEAN_ARRAY_ATTRIBUTE, "flags", Arrays.asList(true, false));
+
+        Map<String, Object> arrayValue = (Map<String, Object>) valueOf(keyValue).get("arrayValue");
+        List<Object> values = (List<Object>) arrayValue.get("values");
+        assertEquals(Boolean.TRUE, ((Map<String, Object>) values.get(0)).get("boolValue"));
+        assertEquals(Boolean.FALSE, ((Map<String, Object>) values.get(1)).get("boolValue"));
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> valueOf(Map<String, Object> keyValue) {
+        return (Map<String, Object>) keyValue.get("value");
+    }
+
+    private static Map<String, Object> writeAndParseAttribute(int type, String key, Object value) throws IOException {
+        try (JsonWriter writer = new JsonWriter()) {
+            OtlpCommonJson.writeAttribute(writer, type, key, value);
+            return JsonMapper.fromJsonToMap(writer.toString());
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpCommonProtoTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpCommonProtoTest.java
index 21b7641dc1a..bcc58d28b3d 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpCommonProtoTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpCommonProtoTest.java
@@ -43,336 +43,327 @@
  */
 class OtlpCommonProtoTest {
 
-  // ── encoding helpers ──────────────────────────────────────────────────────
-
-  private static byte[] encode(int type, String key, Object value) {
-    GrowableBuffer buf = new GrowableBuffer(256);
-    OtlpCommonProto.writeAttribute(buf, type, key, value);
-    ByteBuffer slice = buf.slice();
-    byte[] bytes = new byte[slice.remaining()];
-    slice.get(bytes);
-    return bytes;
-  }
-
-  private static byte[] encodeScope(OtelInstrumentationScope scope) {
-    GrowableBuffer buf = new GrowableBuffer(256);
-    OtlpCommonProto.writeInstrumentationScope(buf, scope);
-    ByteBuffer slice = buf.slice();
-    byte[] bytes = new byte[slice.remaining()];
-    slice.get(bytes);
-    return bytes;
-  }
-
-  /**
-   * {@code writeInstrumentationScope} prepends the {@code InstrumentationScope} body with its byte
-   * size as a varint. Remove that prefix and return a {@link CodedInputStream} over the body.
-   */
-  private static CodedInputStream instrumentationScopeStream(byte[] bytes) throws IOException {
-    CodedInputStream outer = CodedInputStream.newInstance(bytes);
-    int scopeSize = outer.readRawVarint32();
-    int varintSize = bytes.length - scopeSize;
-    return CodedInputStream.newInstance(Arrays.copyOfRange(bytes, varintSize, bytes.length));
-  }
-
-  /**
-   * {@code writeAttribute} prepends the {@code KeyValue} body with its byte size as a varint.
-   * Remove that prefix and return a {@link CodedInputStream} over the {@code KeyValue} body.
-   */
-  private static CodedInputStream keyValueStream(byte[] bytes) throws IOException {
-    CodedInputStream outer = CodedInputStream.newInstance(bytes);
-    int kvSize = outer.readRawVarint32();
-    int varintSize = bytes.length - kvSize;
-    return CodedInputStream.newInstance(Arrays.copyOfRange(bytes, varintSize, bytes.length));
-  }
-
-  // ── proto parsing helpers ─────────────────────────────────────────────────
-
-  /** Reads the {@code KeyValue.key} field (field 1, LEN) and returns the string value. */
-  private static String readKeyField(CodedInputStream kv) throws IOException {
-    int tag = kv.readTag();
-    assertEquals(1, WireFormat.getTagFieldNumber(tag), "KeyValue.key is field 1");
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
-    return kv.readString();
-  }
-
-  /**
-   * Reads the {@code KeyValue.value} field (field 2, LEN) and returns a stream over the {@code
-   * AnyValue} body.
-   */
-  private static CodedInputStream readAnyValueField(CodedInputStream kv) throws IOException {
-    int tag = kv.readTag();
-    assertEquals(2, WireFormat.getTagFieldNumber(tag), "KeyValue.value is field 2");
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
-    return kv.readBytes().newCodedInput();
-  }
-
-  /**
-   * Reads the {@code AnyValue.array_value} field (field 5, LEN) and returns a stream over the
-   * {@code ArrayValue} body.
-   */
-  private static CodedInputStream readArrayValueField(CodedInputStream av) throws IOException {
-    int tag = av.readTag();
-    assertEquals(5, WireFormat.getTagFieldNumber(tag), "AnyValue.array_value is field 5");
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
-    return av.readBytes().newCodedInput();
-  }
-
-  /**
-   * Reads one {@code ArrayValue.values} element (field 1, LEN) and returns a stream over the
-   * element's {@code AnyValue} body.
-   */
-  private static CodedInputStream readArrayElement(CodedInputStream arr) throws IOException {
-    int tag = arr.readTag();
-    assertEquals(1, WireFormat.getTagFieldNumber(tag), "ArrayValue.values is field 1");
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
-    return arr.readBytes().newCodedInput();
-  }
-
-  // ── instrumentation scope tests ───────────────────────────────────────────
-
-  @Test
-  void testInstrumentationScopeWithVersion() throws IOException {
-    byte[] bytes = encodeScope(new OtelInstrumentationScope("io.opentelemetry", "1.2.3", null));
-    CodedInputStream scope = instrumentationScopeStream(bytes);
-
-    int tag = scope.readTag();
-    assertEquals(1, WireFormat.getTagFieldNumber(tag), "InstrumentationScope.name is field 1");
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
-    assertEquals("io.opentelemetry", scope.readString());
-
-    tag = scope.readTag();
-    assertEquals(2, WireFormat.getTagFieldNumber(tag), "InstrumentationScope.version is field 2");
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
-    assertEquals("1.2.3", scope.readString());
-
-    assertTrue(scope.isAtEnd());
-  }
-
-  @Test
-  void testInstrumentationScopeWithNullVersion() throws IOException {
-    byte[] bytes = encodeScope(new OtelInstrumentationScope("io.opentelemetry", null, null));
-    CodedInputStream scope = instrumentationScopeStream(bytes);
-
-    int tag = scope.readTag();
-    assertEquals(1, WireFormat.getTagFieldNumber(tag), "InstrumentationScope.name is field 1");
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
-    assertEquals("io.opentelemetry", scope.readString());
-
-    assertTrue(scope.isAtEnd(), "version field must be absent when null");
-  }
-
-  // ── scalar attribute tests ────────────────────────────────────────────────
-
-  @ParameterizedTest
-  @ValueSource(strings = {"hello", "", "héllo", "日本語", "emoji 🎉"})
-  void testStringAttribute(String value) throws IOException {
-    byte[] bytes = encode(STRING_ATTRIBUTE, "str-key", value);
-    CodedInputStream kv = keyValueStream(bytes);
-
-    assertEquals("str-key", readKeyField(kv));
-
-    CodedInputStream av = readAnyValueField(kv);
-    int tag = av.readTag();
-    assertEquals(1, WireFormat.getTagFieldNumber(tag), "AnyValue.string_value is field 1");
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
-    assertEquals(value, av.readString());
-  }
-
-  @ParameterizedTest
-  @ValueSource(booleans = {true, false})
-  void testBooleanAttribute(boolean value) throws IOException {
-    byte[] bytes = encode(BOOLEAN_ATTRIBUTE, "bool-key", value);
-    CodedInputStream kv = keyValueStream(bytes);
-
-    assertEquals("bool-key", readKeyField(kv));
-
-    CodedInputStream av = readAnyValueField(kv);
-    int tag = av.readTag();
-    assertEquals(2, WireFormat.getTagFieldNumber(tag), "AnyValue.bool_value is field 2");
-    assertEquals(WireFormat.WIRETYPE_VARINT, WireFormat.getTagWireType(tag));
-    assertEquals(value, av.readBool());
-  }
-
-  @ParameterizedTest
-  @ValueSource(longs = {0L, 1L, -1L, 42L, Long.MIN_VALUE, Long.MAX_VALUE})
-  void testLongAttribute(long value) throws IOException {
-    byte[] bytes = encode(LONG_ATTRIBUTE, "long-key", value);
-    CodedInputStream kv = keyValueStream(bytes);
-
-    assertEquals("long-key", readKeyField(kv));
-
-    CodedInputStream av = readAnyValueField(kv);
-    int tag = av.readTag();
-    assertEquals(3, WireFormat.getTagFieldNumber(tag), "AnyValue.int_value is field 3");
-    assertEquals(WireFormat.WIRETYPE_VARINT, WireFormat.getTagWireType(tag));
-    assertEquals(value, av.readInt64());
-  }
-
-  @ParameterizedTest
-  @ValueSource(
-      doubles = {
-        0.0,
-        1.0,
-        -1.5,
-        3.14,
-        Double.MIN_VALUE,
-        Double.MAX_VALUE,
-        Double.NaN,
-        Double.POSITIVE_INFINITY,
-        Double.NEGATIVE_INFINITY
-      })
-  void testDoubleAttribute(double value) throws IOException {
-    byte[] bytes = encode(DOUBLE_ATTRIBUTE, "dbl-key", value);
-    CodedInputStream kv = keyValueStream(bytes);
-
-    assertEquals("dbl-key", readKeyField(kv));
-
-    CodedInputStream av = readAnyValueField(kv);
-    int tag = av.readTag();
-    assertEquals(4, WireFormat.getTagFieldNumber(tag), "AnyValue.double_value is field 4");
-    assertEquals(WireFormat.WIRETYPE_FIXED64, WireFormat.getTagWireType(tag));
-    // use raw bits to correctly handle NaN and negative zero
-    assertEquals(Double.doubleToRawLongBits(value), Double.doubleToRawLongBits(av.readDouble()));
-  }
-
-  // ── array attribute tests ─────────────────────────────────────────────────
-
-  @Test
-  void testEmptyStringArrayAttribute() throws IOException {
-    byte[] bytes = encode(STRING_ARRAY_ATTRIBUTE, "arr-str", Collections.emptyList());
-    CodedInputStream kv = keyValueStream(bytes);
-
-    assertEquals("arr-str", readKeyField(kv));
-
-    CodedInputStream av = readAnyValueField(kv);
-    CodedInputStream arr = readArrayValueField(av);
-    assertTrue(arr.isAtEnd());
-  }
-
-  @Test
-  void testStringArrayAttribute() throws IOException {
-    byte[] bytes =
-        encode(STRING_ARRAY_ATTRIBUTE, "arr-str", Arrays.asList("alpha", "héllo", "日本語"));
-    CodedInputStream kv = keyValueStream(bytes);
-
-    assertEquals("arr-str", readKeyField(kv));
-
-    CodedInputStream av = readAnyValueField(kv);
-    CodedInputStream arr = readArrayValueField(av);
-
-    for (String expected : new String[] {"alpha", "héllo", "日本語"}) {
-      CodedInputStream elem = readArrayElement(arr);
-      int tag = elem.readTag();
-      assertEquals(1, WireFormat.getTagFieldNumber(tag), "AnyValue.string_value is field 1");
-      assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
-      assertEquals(expected, elem.readString());
+    // ── encoding helpers ──────────────────────────────────────────────────────
+
+    private static byte[] encode(int type, String key, Object value) {
+        GrowableBuffer buf = new GrowableBuffer(256);
+        OtlpCommonProto.writeAttribute(buf, type, key, value);
+        ByteBuffer slice = buf.slice();
+        byte[] bytes = new byte[slice.remaining()];
+        slice.get(bytes);
+        return bytes;
     }
-    assertTrue(arr.isAtEnd());
-  }
 
-  @Test
-  void testEmptyBooleanArrayAttribute() throws IOException {
-    byte[] bytes = encode(BOOLEAN_ARRAY_ATTRIBUTE, "arr-bool", Collections.emptyList());
-    CodedInputStream kv = keyValueStream(bytes);
+    private static byte[] encodeScope(OtelInstrumentationScope scope) {
+        GrowableBuffer buf = new GrowableBuffer(256);
+        OtlpCommonProto.writeInstrumentationScope(buf, scope);
+        ByteBuffer slice = buf.slice();
+        byte[] bytes = new byte[slice.remaining()];
+        slice.get(bytes);
+        return bytes;
+    }
+
+    /**
+     * {@code writeInstrumentationScope} prepends the {@code InstrumentationScope} body with its byte
+     * size as a varint. Remove that prefix and return a {@link CodedInputStream} over the body.
+     */
+    private static CodedInputStream instrumentationScopeStream(byte[] bytes) throws IOException {
+        CodedInputStream outer = CodedInputStream.newInstance(bytes);
+        int scopeSize = outer.readRawVarint32();
+        int varintSize = bytes.length - scopeSize;
+        return CodedInputStream.newInstance(Arrays.copyOfRange(bytes, varintSize, bytes.length));
+    }
+
+    /**
+     * {@code writeAttribute} prepends the {@code KeyValue} body with its byte size as a varint.
+     * Remove that prefix and return a {@link CodedInputStream} over the {@code KeyValue} body.
+     */
+    private static CodedInputStream keyValueStream(byte[] bytes) throws IOException {
+        CodedInputStream outer = CodedInputStream.newInstance(bytes);
+        int kvSize = outer.readRawVarint32();
+        int varintSize = bytes.length - kvSize;
+        return CodedInputStream.newInstance(Arrays.copyOfRange(bytes, varintSize, bytes.length));
+    }
+
+    // ── proto parsing helpers ─────────────────────────────────────────────────
+
+    /** Reads the {@code KeyValue.key} field (field 1, LEN) and returns the string value. */
+    private static String readKeyField(CodedInputStream kv) throws IOException {
+        int tag = kv.readTag();
+        assertEquals(1, WireFormat.getTagFieldNumber(tag), "KeyValue.key is field 1");
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
+        return kv.readString();
+    }
+
+    /**
+     * Reads the {@code KeyValue.value} field (field 2, LEN) and returns a stream over the {@code
+     * AnyValue} body.
+     */
+    private static CodedInputStream readAnyValueField(CodedInputStream kv) throws IOException {
+        int tag = kv.readTag();
+        assertEquals(2, WireFormat.getTagFieldNumber(tag), "KeyValue.value is field 2");
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
+        return kv.readBytes().newCodedInput();
+    }
+
+    /**
+     * Reads the {@code AnyValue.array_value} field (field 5, LEN) and returns a stream over the
+     * {@code ArrayValue} body.
+     */
+    private static CodedInputStream readArrayValueField(CodedInputStream av) throws IOException {
+        int tag = av.readTag();
+        assertEquals(5, WireFormat.getTagFieldNumber(tag), "AnyValue.array_value is field 5");
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
+        return av.readBytes().newCodedInput();
+    }
+
+    /**
+     * Reads one {@code ArrayValue.values} element (field 1, LEN) and returns a stream over the
+     * element's {@code AnyValue} body.
+     */
+    private static CodedInputStream readArrayElement(CodedInputStream arr) throws IOException {
+        int tag = arr.readTag();
+        assertEquals(1, WireFormat.getTagFieldNumber(tag), "ArrayValue.values is field 1");
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
+        return arr.readBytes().newCodedInput();
+    }
+
+    // ── instrumentation scope tests ───────────────────────────────────────────
+
+    @Test
+    void testInstrumentationScopeWithVersion() throws IOException {
+        byte[] bytes = encodeScope(new OtelInstrumentationScope("io.opentelemetry", "1.2.3", null));
+        CodedInputStream scope = instrumentationScopeStream(bytes);
+
+        int tag = scope.readTag();
+        assertEquals(1, WireFormat.getTagFieldNumber(tag), "InstrumentationScope.name is field 1");
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
+        assertEquals("io.opentelemetry", scope.readString());
+
+        tag = scope.readTag();
+        assertEquals(2, WireFormat.getTagFieldNumber(tag), "InstrumentationScope.version is field 2");
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
+        assertEquals("1.2.3", scope.readString());
+
+        assertTrue(scope.isAtEnd());
+    }
+
+    @Test
+    void testInstrumentationScopeWithNullVersion() throws IOException {
+        byte[] bytes = encodeScope(new OtelInstrumentationScope("io.opentelemetry", null, null));
+        CodedInputStream scope = instrumentationScopeStream(bytes);
+
+        int tag = scope.readTag();
+        assertEquals(1, WireFormat.getTagFieldNumber(tag), "InstrumentationScope.name is field 1");
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
+        assertEquals("io.opentelemetry", scope.readString());
+
+        assertTrue(scope.isAtEnd(), "version field must be absent when null");
+    }
+
+    // ── scalar attribute tests ────────────────────────────────────────────────
+
+    @ParameterizedTest
+    @ValueSource(strings = {"hello", "", "héllo", "日本語", "emoji 🎉"})
+    void testStringAttribute(String value) throws IOException {
+        byte[] bytes = encode(STRING_ATTRIBUTE, "str-key", value);
+        CodedInputStream kv = keyValueStream(bytes);
+
+        assertEquals("str-key", readKeyField(kv));
+
+        CodedInputStream av = readAnyValueField(kv);
+        int tag = av.readTag();
+        assertEquals(1, WireFormat.getTagFieldNumber(tag), "AnyValue.string_value is field 1");
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
+        assertEquals(value, av.readString());
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void testBooleanAttribute(boolean value) throws IOException {
+        byte[] bytes = encode(BOOLEAN_ATTRIBUTE, "bool-key", value);
+        CodedInputStream kv = keyValueStream(bytes);
+
+        assertEquals("bool-key", readKeyField(kv));
+
+        CodedInputStream av = readAnyValueField(kv);
+        int tag = av.readTag();
+        assertEquals(2, WireFormat.getTagFieldNumber(tag), "AnyValue.bool_value is field 2");
+        assertEquals(WireFormat.WIRETYPE_VARINT, WireFormat.getTagWireType(tag));
+        assertEquals(value, av.readBool());
+    }
+
+    @ParameterizedTest
+    @ValueSource(longs = {0L, 1L, -1L, 42L, Long.MIN_VALUE, Long.MAX_VALUE})
+    void testLongAttribute(long value) throws IOException {
+        byte[] bytes = encode(LONG_ATTRIBUTE, "long-key", value);
+        CodedInputStream kv = keyValueStream(bytes);
+
+        assertEquals("long-key", readKeyField(kv));
+
+        CodedInputStream av = readAnyValueField(kv);
+        int tag = av.readTag();
+        assertEquals(3, WireFormat.getTagFieldNumber(tag), "AnyValue.int_value is field 3");
+        assertEquals(WireFormat.WIRETYPE_VARINT, WireFormat.getTagWireType(tag));
+        assertEquals(value, av.readInt64());
+    }
+
+    @ParameterizedTest
+    @ValueSource(
+            doubles = {
+                0.0,
+                1.0,
+                -1.5,
+                3.14,
+                Double.MIN_VALUE,
+                Double.MAX_VALUE,
+                Double.NaN,
+                Double.POSITIVE_INFINITY,
+                Double.NEGATIVE_INFINITY
+            })
+    void testDoubleAttribute(double value) throws IOException {
+        byte[] bytes = encode(DOUBLE_ATTRIBUTE, "dbl-key", value);
+        CodedInputStream kv = keyValueStream(bytes);
+
+        assertEquals("dbl-key", readKeyField(kv));
+
+        CodedInputStream av = readAnyValueField(kv);
+        int tag = av.readTag();
+        assertEquals(4, WireFormat.getTagFieldNumber(tag), "AnyValue.double_value is field 4");
+        assertEquals(WireFormat.WIRETYPE_FIXED64, WireFormat.getTagWireType(tag));
+        // use raw bits to correctly handle NaN and negative zero
+        assertEquals(Double.doubleToRawLongBits(value), Double.doubleToRawLongBits(av.readDouble()));
+    }
+
+    // ── array attribute tests ─────────────────────────────────────────────────
+
+    @Test
+    void testEmptyStringArrayAttribute() throws IOException {
+        byte[] bytes = encode(STRING_ARRAY_ATTRIBUTE, "arr-str", Collections.emptyList());
+        CodedInputStream kv = keyValueStream(bytes);
+
+        assertEquals("arr-str", readKeyField(kv));
+
+        CodedInputStream av = readAnyValueField(kv);
+        CodedInputStream arr = readArrayValueField(av);
+        assertTrue(arr.isAtEnd());
+    }
+
+    @Test
+    void testStringArrayAttribute() throws IOException {
+        byte[] bytes = encode(STRING_ARRAY_ATTRIBUTE, "arr-str", Arrays.asList("alpha", "héllo", "日本語"));
+        CodedInputStream kv = keyValueStream(bytes);
+
+        assertEquals("arr-str", readKeyField(kv));
+
+        CodedInputStream av = readAnyValueField(kv);
+        CodedInputStream arr = readArrayValueField(av);
+
+        for (String expected : new String[] {"alpha", "héllo", "日本語"}) {
+            CodedInputStream elem = readArrayElement(arr);
+            int tag = elem.readTag();
+            assertEquals(1, WireFormat.getTagFieldNumber(tag), "AnyValue.string_value is field 1");
+            assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
+            assertEquals(expected, elem.readString());
+        }
+        assertTrue(arr.isAtEnd());
+    }
+
+    @Test
+    void testEmptyBooleanArrayAttribute() throws IOException {
+        byte[] bytes = encode(BOOLEAN_ARRAY_ATTRIBUTE, "arr-bool", Collections.emptyList());
+        CodedInputStream kv = keyValueStream(bytes);
+
+        assertEquals("arr-bool", readKeyField(kv));
+
+        CodedInputStream av = readAnyValueField(kv);
+        CodedInputStream arr = readArrayValueField(av);
+        assertTrue(arr.isAtEnd());
+    }
+
+    @Test
+    void testBooleanArrayAttribute() throws IOException {
+        byte[] bytes = encode(BOOLEAN_ARRAY_ATTRIBUTE, "arr-bool", Arrays.asList(true, false, true));
+        CodedInputStream kv = keyValueStream(bytes);
+
+        assertEquals("arr-bool", readKeyField(kv));
+
+        CodedInputStream av = readAnyValueField(kv);
+        CodedInputStream arr = readArrayValueField(av);
 
-    assertEquals("arr-bool", readKeyField(kv));
+        for (boolean expected : new boolean[] {true, false, true}) {
+            CodedInputStream elem = readArrayElement(arr);
+            int tag = elem.readTag();
+            assertEquals(2, WireFormat.getTagFieldNumber(tag), "AnyValue.bool_value is field 2");
+            assertEquals(WireFormat.WIRETYPE_VARINT, WireFormat.getTagWireType(tag));
+            assertEquals(expected, elem.readBool());
+        }
+        assertTrue(arr.isAtEnd());
+    }
+
+    @Test
+    void testEmptyLongArrayAttribute() throws IOException {
+        byte[] bytes = encode(LONG_ARRAY_ATTRIBUTE, "arr-long", Collections.emptyList());
+        CodedInputStream kv = keyValueStream(bytes);
 
-    CodedInputStream av = readAnyValueField(kv);
-    CodedInputStream arr = readArrayValueField(av);
-    assertTrue(arr.isAtEnd());
-  }
+        assertEquals("arr-long", readKeyField(kv));
+
+        CodedInputStream av = readAnyValueField(kv);
+        CodedInputStream arr = readArrayValueField(av);
+        assertTrue(arr.isAtEnd());
+    }
 
-  @Test
-  void testBooleanArrayAttribute() throws IOException {
-    byte[] bytes = encode(BOOLEAN_ARRAY_ATTRIBUTE, "arr-bool", Arrays.asList(true, false, true));
-    CodedInputStream kv = keyValueStream(bytes);
+    @Test
+    void testLongArrayAttribute() throws IOException {
+        byte[] bytes = encode(LONG_ARRAY_ATTRIBUTE, "arr-long", Arrays.asList(0L, -1L, Long.MIN_VALUE, Long.MAX_VALUE));
+        CodedInputStream kv = keyValueStream(bytes);
 
-    assertEquals("arr-bool", readKeyField(kv));
+        assertEquals("arr-long", readKeyField(kv));
 
-    CodedInputStream av = readAnyValueField(kv);
-    CodedInputStream arr = readArrayValueField(av);
+        CodedInputStream av = readAnyValueField(kv);
+        CodedInputStream arr = readArrayValueField(av);
 
-    for (boolean expected : new boolean[] {true, false, true}) {
-      CodedInputStream elem = readArrayElement(arr);
-      int tag = elem.readTag();
-      assertEquals(2, WireFormat.getTagFieldNumber(tag), "AnyValue.bool_value is field 2");
-      assertEquals(WireFormat.WIRETYPE_VARINT, WireFormat.getTagWireType(tag));
-      assertEquals(expected, elem.readBool());
+        for (long expected : new long[] {0L, -1L, Long.MIN_VALUE, Long.MAX_VALUE}) {
+            CodedInputStream elem = readArrayElement(arr);
+            int tag = elem.readTag();
+            assertEquals(3, WireFormat.getTagFieldNumber(tag), "AnyValue.int_value is field 3");
+            assertEquals(WireFormat.WIRETYPE_VARINT, WireFormat.getTagWireType(tag));
+            assertEquals(expected, elem.readInt64());
+        }
+        assertTrue(arr.isAtEnd());
     }
-    assertTrue(arr.isAtEnd());
-  }
-
-  @Test
-  void testEmptyLongArrayAttribute() throws IOException {
-    byte[] bytes = encode(LONG_ARRAY_ATTRIBUTE, "arr-long", Collections.emptyList());
-    CodedInputStream kv = keyValueStream(bytes);
-
-    assertEquals("arr-long", readKeyField(kv));
-
-    CodedInputStream av = readAnyValueField(kv);
-    CodedInputStream arr = readArrayValueField(av);
-    assertTrue(arr.isAtEnd());
-  }
-
-  @Test
-  void testLongArrayAttribute() throws IOException {
-    byte[] bytes =
-        encode(
-            LONG_ARRAY_ATTRIBUTE,
-            "arr-long",
-            Arrays.asList(0L, -1L, Long.MIN_VALUE, Long.MAX_VALUE));
-    CodedInputStream kv = keyValueStream(bytes);
-
-    assertEquals("arr-long", readKeyField(kv));
-
-    CodedInputStream av = readAnyValueField(kv);
-    CodedInputStream arr = readArrayValueField(av);
-
-    for (long expected : new long[] {0L, -1L, Long.MIN_VALUE, Long.MAX_VALUE}) {
-      CodedInputStream elem = readArrayElement(arr);
-      int tag = elem.readTag();
-      assertEquals(3, WireFormat.getTagFieldNumber(tag), "AnyValue.int_value is field 3");
-      assertEquals(WireFormat.WIRETYPE_VARINT, WireFormat.getTagWireType(tag));
-      assertEquals(expected, elem.readInt64());
+
+    @Test
+    void testEmptyDoubleArrayAttribute() throws IOException {
+        byte[] bytes = encode(DOUBLE_ARRAY_ATTRIBUTE, "arr-dbl", Collections.emptyList());
+        CodedInputStream kv = keyValueStream(bytes);
+
+        assertEquals("arr-dbl", readKeyField(kv));
+
+        CodedInputStream av = readAnyValueField(kv);
+        CodedInputStream arr = readArrayValueField(av);
+        assertTrue(arr.isAtEnd());
     }
-    assertTrue(arr.isAtEnd());
-  }
-
-  @Test
-  void testEmptyDoubleArrayAttribute() throws IOException {
-    byte[] bytes = encode(DOUBLE_ARRAY_ATTRIBUTE, "arr-dbl", Collections.emptyList());
-    CodedInputStream kv = keyValueStream(bytes);
-
-    assertEquals("arr-dbl", readKeyField(kv));
-
-    CodedInputStream av = readAnyValueField(kv);
-    CodedInputStream arr = readArrayValueField(av);
-    assertTrue(arr.isAtEnd());
-  }
-
-  @Test
-  void testDoubleArrayAttribute() throws IOException {
-    byte[] bytes =
-        encode(
-            DOUBLE_ARRAY_ATTRIBUTE,
-            "arr-dbl",
-            Arrays.asList(0.0, -1.5, Double.NaN, Double.POSITIVE_INFINITY));
-    CodedInputStream kv = keyValueStream(bytes);
-
-    assertEquals("arr-dbl", readKeyField(kv));
-
-    CodedInputStream av = readAnyValueField(kv);
-    CodedInputStream arr = readArrayValueField(av);
-
-    for (double expected : new double[] {0.0, -1.5, Double.NaN, Double.POSITIVE_INFINITY}) {
-      CodedInputStream elem = readArrayElement(arr);
-      int tag = elem.readTag();
-      assertEquals(4, WireFormat.getTagFieldNumber(tag), "AnyValue.double_value is field 4");
-      assertEquals(WireFormat.WIRETYPE_FIXED64, WireFormat.getTagWireType(tag));
-      // use raw bits to correctly handle NaN and negative zero
-      assertEquals(
-          Double.doubleToRawLongBits(expected), Double.doubleToRawLongBits(elem.readDouble()));
+
+    @Test
+    void testDoubleArrayAttribute() throws IOException {
+        byte[] bytes = encode(
+                DOUBLE_ARRAY_ATTRIBUTE, "arr-dbl", Arrays.asList(0.0, -1.5, Double.NaN, Double.POSITIVE_INFINITY));
+        CodedInputStream kv = keyValueStream(bytes);
+
+        assertEquals("arr-dbl", readKeyField(kv));
+
+        CodedInputStream av = readAnyValueField(kv);
+        CodedInputStream arr = readArrayValueField(av);
+
+        for (double expected : new double[] {0.0, -1.5, Double.NaN, Double.POSITIVE_INFINITY}) {
+            CodedInputStream elem = readArrayElement(arr);
+            int tag = elem.readTag();
+            assertEquals(4, WireFormat.getTagFieldNumber(tag), "AnyValue.double_value is field 4");
+            assertEquals(WireFormat.WIRETYPE_FIXED64, WireFormat.getTagWireType(tag));
+            // use raw bits to correctly handle NaN and negative zero
+            assertEquals(Double.doubleToRawLongBits(expected), Double.doubleToRawLongBits(elem.readDouble()));
+        }
+        assertTrue(arr.isAtEnd());
     }
-    assertTrue(arr.isAtEnd());
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpGrpcRequestBodyTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpGrpcRequestBodyTest.java
index 702be21873c..f3ed3c3aedc 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpGrpcRequestBodyTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpGrpcRequestBodyTest.java
@@ -15,77 +15,69 @@
 
 class OtlpGrpcRequestBodyTest {
 
-  @Test
-  void contentTypeIsApplicationGrpc() {
-    OtlpGrpcRequestBody body =
-        new OtlpGrpcRequestBody(
-            new OtlpPayload(ByteBuffer.wrap(new byte[] {1, 2, 3}), "application/grpc+proto"),
-            false);
-
-    assertEquals(MediaType.get("application/grpc"), body.contentType());
-  }
-
-  @Test
-  void contentLengthIsHeaderPlusPayloadWhenUncompressed() {
-    OtlpGrpcRequestBody body =
-        new OtlpGrpcRequestBody(
-            new OtlpPayload(ByteBuffer.wrap(new byte[] {1, 2, 3, 4}), "application/grpc+proto"),
-            false);
-
-    // 5-byte header (1 flag + 4 length) + 4-byte payload = 9
-    assertEquals(9, body.contentLength());
-  }
-
-  @Test
-  void contentLengthIsNegativeOneWhenGzipped() {
-    OtlpGrpcRequestBody body =
-        new OtlpGrpcRequestBody(
-            new OtlpPayload(ByteBuffer.wrap(new byte[] {1, 2, 3, 4}), "application/grpc+proto"),
-            true);
-
-    assertEquals(-1, body.contentLength());
-  }
-
-  @Test
-  void writeToProducesGrpcFrameWithUncompressedFlagWhenNotGzipped() throws IOException {
-    byte[] data = {10, 20, 30, 40, 50};
-    OtlpGrpcRequestBody body =
-        new OtlpGrpcRequestBody(
-            new OtlpPayload(ByteBuffer.wrap(data), "application/grpc+proto"), false);
-    Buffer sink = new Buffer();
-
-    body.writeTo(sink);
-
-    assertEquals(0, sink.readByte()); // uncompressed flag
-    assertEquals(data.length, sink.readInt()); // 4-byte big-endian length
-    assertArrayEquals(data, sink.readByteArray()); // payload
-  }
-
-  @Test
-  void writeToProducesGrpcFrameWithCompressedFlagAndGzipDataWhenGzipped() throws IOException {
-    byte[] data = "the quick brown fox jumps over the lazy dog".getBytes();
-    OtlpGrpcRequestBody body =
-        new OtlpGrpcRequestBody(
-            new OtlpPayload(ByteBuffer.wrap(data), "application/grpc+proto"), true);
-    Buffer sink = new Buffer();
-
-    body.writeTo(sink);
-
-    assertEquals(1, sink.readByte()); // compressed flag
-    int gzipLength = sink.readInt(); // 4-byte big-endian gzip content length
-    byte[] gzipped = sink.readByteArray(gzipLength);
-    assertArrayEquals(data, gunzip(gzipped));
-  }
-
-  private static byte[] gunzip(byte[] gzipped) throws IOException {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    try (InputStream gz = new GZIPInputStream(new ByteArrayInputStream(gzipped))) {
-      byte[] buf = new byte[256];
-      int n;
-      while ((n = gz.read(buf)) > 0) {
-        out.write(buf, 0, n);
-      }
+    @Test
+    void contentTypeIsApplicationGrpc() {
+        OtlpGrpcRequestBody body = new OtlpGrpcRequestBody(
+                new OtlpPayload(ByteBuffer.wrap(new byte[] {1, 2, 3}), "application/grpc+proto"), false);
+
+        assertEquals(MediaType.get("application/grpc"), body.contentType());
+    }
+
+    @Test
+    void contentLengthIsHeaderPlusPayloadWhenUncompressed() {
+        OtlpGrpcRequestBody body = new OtlpGrpcRequestBody(
+                new OtlpPayload(ByteBuffer.wrap(new byte[] {1, 2, 3, 4}), "application/grpc+proto"), false);
+
+        // 5-byte header (1 flag + 4 length) + 4-byte payload = 9
+        assertEquals(9, body.contentLength());
+    }
+
+    @Test
+    void contentLengthIsNegativeOneWhenGzipped() {
+        OtlpGrpcRequestBody body = new OtlpGrpcRequestBody(
+                new OtlpPayload(ByteBuffer.wrap(new byte[] {1, 2, 3, 4}), "application/grpc+proto"), true);
+
+        assertEquals(-1, body.contentLength());
+    }
+
+    @Test
+    void writeToProducesGrpcFrameWithUncompressedFlagWhenNotGzipped() throws IOException {
+        byte[] data = {10, 20, 30, 40, 50};
+        OtlpGrpcRequestBody body =
+                new OtlpGrpcRequestBody(new OtlpPayload(ByteBuffer.wrap(data), "application/grpc+proto"), false);
+        Buffer sink = new Buffer();
+
+        body.writeTo(sink);
+
+        assertEquals(0, sink.readByte()); // uncompressed flag
+        assertEquals(data.length, sink.readInt()); // 4-byte big-endian length
+        assertArrayEquals(data, sink.readByteArray()); // payload
+    }
+
+    @Test
+    void writeToProducesGrpcFrameWithCompressedFlagAndGzipDataWhenGzipped() throws IOException {
+        byte[] data = "the quick brown fox jumps over the lazy dog".getBytes();
+        OtlpGrpcRequestBody body =
+                new OtlpGrpcRequestBody(new OtlpPayload(ByteBuffer.wrap(data), "application/grpc+proto"), true);
+        Buffer sink = new Buffer();
+
+        body.writeTo(sink);
+
+        assertEquals(1, sink.readByte()); // compressed flag
+        int gzipLength = sink.readInt(); // 4-byte big-endian gzip content length
+        byte[] gzipped = sink.readByteArray(gzipLength);
+        assertArrayEquals(data, gunzip(gzipped));
+    }
+
+    private static byte[] gunzip(byte[] gzipped) throws IOException {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (InputStream gz = new GZIPInputStream(new ByteArrayInputStream(gzipped))) {
+            byte[] buf = new byte[256];
+            int n;
+            while ((n = gz.read(buf)) > 0) {
+                out.write(buf, 0, n);
+            }
+        }
+        return out.toByteArray();
     }
-    return out.toByteArray();
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpHttpRequestBodyTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpHttpRequestBodyTest.java
index bd354049e9c..ac85d92bc01 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpHttpRequestBodyTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpHttpRequestBodyTest.java
@@ -15,72 +15,64 @@
 
 class OtlpHttpRequestBodyTest {
 
-  @Test
-  void contentTypeIsParsedFromPayload() {
-    OtlpHttpRequestBody body =
-        new OtlpHttpRequestBody(
-            new OtlpPayload(ByteBuffer.wrap(new byte[] {1, 2, 3}), "application/x-protobuf"),
-            false);
-
-    assertEquals(MediaType.get("application/x-protobuf"), body.contentType());
-  }
-
-  @Test
-  void contentLengthMatchesPayloadWhenUncompressed() {
-    OtlpHttpRequestBody body =
-        new OtlpHttpRequestBody(
-            new OtlpPayload(ByteBuffer.wrap(new byte[] {1, 2, 3, 4}), "application/x-protobuf"),
-            false);
-
-    assertEquals(4, body.contentLength());
-  }
-
-  @Test
-  void contentLengthIsNegativeOneWhenGzipped() {
-    // gzip writes chunked, so the framework can't know the length up front
-    OtlpHttpRequestBody body =
-        new OtlpHttpRequestBody(
-            new OtlpPayload(ByteBuffer.wrap(new byte[] {1, 2, 3, 4}), "application/x-protobuf"),
-            true);
-
-    assertEquals(-1, body.contentLength());
-  }
-
-  @Test
-  void writeToDrainsRawBytesWhenUncompressed() throws IOException {
-    byte[] data = {10, 20, 30, 40, 50};
-    OtlpHttpRequestBody body =
-        new OtlpHttpRequestBody(
-            new OtlpPayload(ByteBuffer.wrap(data), "application/x-protobuf"), false);
-    Buffer sink = new Buffer();
-
-    body.writeTo(sink);
-
-    assertArrayEquals(data, sink.readByteArray());
-  }
-
-  @Test
-  void writeToProducesGzipStreamThatDecompressesToPayloadWhenGzipped() throws IOException {
-    byte[] data = "the quick brown fox jumps over the lazy dog".getBytes();
-    OtlpHttpRequestBody body =
-        new OtlpHttpRequestBody(
-            new OtlpPayload(ByteBuffer.wrap(data), "application/x-protobuf"), true);
-    Buffer sink = new Buffer();
-
-    body.writeTo(sink);
-
-    assertArrayEquals(data, gunzip(sink.readByteArray()));
-  }
-
-  private static byte[] gunzip(byte[] gzipped) throws IOException {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    try (InputStream gz = new GZIPInputStream(new ByteArrayInputStream(gzipped))) {
-      byte[] buf = new byte[256];
-      int n;
-      while ((n = gz.read(buf)) > 0) {
-        out.write(buf, 0, n);
-      }
+    @Test
+    void contentTypeIsParsedFromPayload() {
+        OtlpHttpRequestBody body = new OtlpHttpRequestBody(
+                new OtlpPayload(ByteBuffer.wrap(new byte[] {1, 2, 3}), "application/x-protobuf"), false);
+
+        assertEquals(MediaType.get("application/x-protobuf"), body.contentType());
+    }
+
+    @Test
+    void contentLengthMatchesPayloadWhenUncompressed() {
+        OtlpHttpRequestBody body = new OtlpHttpRequestBody(
+                new OtlpPayload(ByteBuffer.wrap(new byte[] {1, 2, 3, 4}), "application/x-protobuf"), false);
+
+        assertEquals(4, body.contentLength());
+    }
+
+    @Test
+    void contentLengthIsNegativeOneWhenGzipped() {
+        // gzip writes chunked, so the framework can't know the length up front
+        OtlpHttpRequestBody body = new OtlpHttpRequestBody(
+                new OtlpPayload(ByteBuffer.wrap(new byte[] {1, 2, 3, 4}), "application/x-protobuf"), true);
+
+        assertEquals(-1, body.contentLength());
+    }
+
+    @Test
+    void writeToDrainsRawBytesWhenUncompressed() throws IOException {
+        byte[] data = {10, 20, 30, 40, 50};
+        OtlpHttpRequestBody body =
+                new OtlpHttpRequestBody(new OtlpPayload(ByteBuffer.wrap(data), "application/x-protobuf"), false);
+        Buffer sink = new Buffer();
+
+        body.writeTo(sink);
+
+        assertArrayEquals(data, sink.readByteArray());
+    }
+
+    @Test
+    void writeToProducesGzipStreamThatDecompressesToPayloadWhenGzipped() throws IOException {
+        byte[] data = "the quick brown fox jumps over the lazy dog".getBytes();
+        OtlpHttpRequestBody body =
+                new OtlpHttpRequestBody(new OtlpPayload(ByteBuffer.wrap(data), "application/x-protobuf"), true);
+        Buffer sink = new Buffer();
+
+        body.writeTo(sink);
+
+        assertArrayEquals(data, gunzip(sink.readByteArray()));
+    }
+
+    private static byte[] gunzip(byte[] gzipped) throws IOException {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (InputStream gz = new GZIPInputStream(new ByteArrayInputStream(gzipped))) {
+            byte[] buf = new byte[256];
+            int n;
+            while ((n = gz.read(buf)) > 0) {
+                out.write(buf, 0, n);
+            }
+        }
+        return out.toByteArray();
     }
-    return out.toByteArray();
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpProtoBufferTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpProtoBufferTest.java
index 794b36b8ee4..fde04cccf18 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpProtoBufferTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpProtoBufferTest.java
@@ -24,429 +24,427 @@
  */
 class OtlpProtoBufferTest {
 
-  private OtlpProtoBuffer buffer;
-
-  @BeforeEach
-  void setUp() {
-    buffer = new OtlpProtoBuffer(16);
-  }
-
-  // ─── helpers ─────────────────────────────────────────────────────────────
-
-  /** Reads all available bytes from the buffer without consuming the underlying state. */
-  private static byte[] readAll(OtlpProtoBuffer buf) {
-    ByteBuffer bb = buf.flip();
-    byte[] bytes = new byte[bb.remaining()];
-    bb.get(bytes);
-    return bytes;
-  }
-
-  /** Creates a pre-filled GrowableBuffer containing the given bytes. */
-  private static GrowableBuffer growable(byte... body) {
-    GrowableBuffer buf = new GrowableBuffer(Math.max(1, body.length));
-    if (body.length > 0) {
-      buf.put(body);
-    }
-    return buf;
-  }
-
-  // ─── initial state ───────────────────────────────────────────────────────
-
-  @Test
-  void initialBufferIsEmpty() {
-    assertEquals(0, buffer.flip().remaining());
-  }
-
-  @Test
-  void initialPayloadIsEmpty() {
-    OtlpPayload payload = buffer.toPayload();
-    assertEquals(0, payload.getContentLength());
-    assertEquals("application/x-protobuf", payload.getContentType());
-  }
-
-  @Test
-  void constructorRejectsCapacityExceedingMaxCapacity() {
-    // rounds up to a power of two above MAX_CAPACITY_BYTES; must reject before allocating
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> new OtlpProtoBuffer(OtlpProtoBuffer.MAX_CAPACITY_BYTES + 1));
-  }
-
-  // ─── recordMessage(GrowableBuffer, int) ──────────────────────────────────
-
-  @Test
-  void recordsSingleByteMessage() throws IOException {
-    // tag for field 1 = (1<<3)|2 = 10 → 1 varint byte; length=1 → 1 byte; body=1 → total 3
-    int returned = buffer.recordMessage(growable((byte) 0x42), 1);
-    assertEquals(3, returned);
-
-    CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
-    int tag = in.readTag();
-    assertEquals(1, WireFormat.getTagFieldNumber(tag));
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
-    assertArrayEquals(new byte[] {0x42}, in.readByteArray());
-    assertTrue(in.isAtEnd());
-  }
-
-  @Test
-  void recordsMultiByteBodyMessage() throws IOException {
-    byte[] body = {0x01, 0x02, 0x03};
-    // tag(field=2)=(2<<3)|2=18 → 1 byte; length=3 → 1 byte; body=3 → total 5
-    int returned = buffer.recordMessage(growable(body), 2);
-    assertEquals(5, returned);
-
-    CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
-    int tag = in.readTag();
-    assertEquals(2, WireFormat.getTagFieldNumber(tag));
-    assertArrayEquals(body, in.readByteArray());
-    assertTrue(in.isAtEnd());
-  }
-
-  @Test
-  void recordsEmptyBodyMessage() throws IOException {
-    // tag(1 byte) + length-varint(0, 1 byte) + 0 body bytes = 2
-    int returned = buffer.recordMessage(new GrowableBuffer(1), 1);
-    assertEquals(2, returned);
-
-    CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
-    assertEquals(1, WireFormat.getTagFieldNumber(in.readTag()));
-    assertEquals(0, in.readByteArray().length);
-    assertTrue(in.isAtEnd());
-  }
-
-  @Test
-  void recordsMessageWithLargeFieldNumber() throws IOException {
-    // field 16: tag=(16<<3)|2=130, needs 2 varint bytes; length=1 → 1 byte; body=1 → total 4
-    int returned = buffer.recordMessage(growable((byte) 0xAB), 16);
-    assertEquals(4, returned);
-
-    CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
-    int tag = in.readTag();
-    assertEquals(16, WireFormat.getTagFieldNumber(tag));
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
-    assertArrayEquals(new byte[] {(byte) 0xAB}, in.readByteArray());
-    assertTrue(in.isAtEnd());
-  }
-
-  @Test
-  void growableBufferIsReusableAfterRecordMessage() throws IOException {
-    // Verifies that the finally-block reset allows the same GrowableBuffer to be reused
-    GrowableBuffer buf = new GrowableBuffer(16);
-
-    buf.put((byte) 0x01);
-    buffer.recordMessage(buf, 1);
-
-    // After reset the buffer should accept new writes immediately
-    buf.put((byte) 0x02);
-    buffer.recordMessage(buf, 2);
-
-    CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
-    assertEquals(2, WireFormat.getTagFieldNumber(in.readTag()), "field 2 (last) first");
-    assertArrayEquals(new byte[] {0x02}, in.readByteArray());
-    assertEquals(1, WireFormat.getTagFieldNumber(in.readTag()), "field 1 (first) second");
-    assertArrayEquals(new byte[] {0x01}, in.readByteArray());
-    assertTrue(in.isAtEnd());
-  }
-
-  @Test
-  void growableBufferIsReusableAfterRecordMessageWithGrowth() throws IOException {
-    // OtlpProtoBuffer growth must not prevent the finally-block reset on the GrowableBuffer
-    OtlpProtoBuffer tinyBuf = new OtlpProtoBuffer(1);
-    GrowableBuffer buf = new GrowableBuffer(16);
-
-    buf.put(new byte[50]); // forces OtlpProtoBuffer growth
-    tinyBuf.recordMessage(buf, 1);
-
-    buf.put((byte) 0x42); // reuse after reset
-    tinyBuf.recordMessage(buf, 2);
-
-    CodedInputStream in = CodedInputStream.newInstance(readAll(tinyBuf));
-    assertEquals(2, WireFormat.getTagFieldNumber(in.readTag()));
-    assertArrayEquals(new byte[] {0x42}, in.readByteArray());
-    assertEquals(1, WireFormat.getTagFieldNumber(in.readTag()));
-    assertEquals(50, in.readByteArray().length);
-    assertTrue(in.isAtEnd());
-  }
-
-  // ─── recordMessage(GrowableBuffer, int, int bytesSoFar) ──────────────────
-
-  @Test
-  void bytesSoFarIncreasesEncodedLength() {
-    // field 1, body 1 byte, bytesSoFar 3 → encoded length = 4
-    // numBytes = sizeVarInt(10) + sizeVarInt(4) + 1 = 1+1+1 = 3; return 3+3 = 6
-    int returned = buffer.recordMessage(growable((byte) 0x01), 1, 3);
-    assertEquals(6, returned);
-  }
-
-  @Test
-  void bytesSoFarAtVarintBoundaryProducesMultiByteLengthField() {
-    // body=1 byte, bytesSoFar=127 → encoded length = 128, which needs 2 varint bytes
-    // numBytes = sizeVarInt(10) + sizeVarInt(128) + 1 = 1+2+1 = 4; return 4+127 = 131
-    int returned = buffer.recordMessage(growable((byte) 0x01), 1, 127);
-    assertEquals(131, returned);
-  }
-
-  @Test
-  void zeroBytesSoFarMatchesSimpleOverload() {
-    OtlpProtoBuffer buf1 = new OtlpProtoBuffer(16);
-    OtlpProtoBuffer buf2 = new OtlpProtoBuffer(16);
-    int ret1 = buf1.recordMessage(growable((byte) 0x05), 3);
-    int ret2 = buf2.recordMessage(growable((byte) 0x05), 3, 0);
-    assertEquals(ret1, ret2);
-    assertArrayEquals(readAll(buf1), readAll(buf2));
-  }
-
-  // ─── recordMessage(byte[]) ────────────────────────────────────────────────
-
-  @Test
-  void recordsByteArrayDirectly() {
-    // hand-crafted protobuf: field 1 (tag=0x0A), length 3, body [1, 2, 3]
-    byte[] encoded = {0x0A, 0x03, 0x01, 0x02, 0x03};
-    int returned = buffer.recordMessage(encoded);
-    assertEquals(5, returned);
-    assertArrayEquals(encoded, readAll(buffer));
-  }
-
-  @Test
-  void recordsEmptyByteArray() {
-    int returned = buffer.recordMessage(new byte[0]);
-    assertEquals(0, returned);
-    assertEquals(0, buffer.flip().remaining());
-  }
-
-  @Test
-  void byteArrayMessageAppearsInOutput() throws IOException {
-    // Encode field 4, body [0xBE, 0xEF] by hand: tag=(4<<3)|2=34, length=2
-    byte[] encoded = {0x22, 0x02, (byte) 0xBE, (byte) 0xEF};
-    buffer.recordMessage(encoded);
-
-    CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
-    assertEquals(4, WireFormat.getTagFieldNumber(in.readTag()));
-    assertArrayEquals(new byte[] {(byte) 0xBE, (byte) 0xEF}, in.readByteArray());
-    assertTrue(in.isAtEnd());
-  }
-
-  // ─── message ordering ────────────────────────────────────────────────────
-
-  @Test
-  void messagesAppearInReverseInsertionOrder() throws IOException {
-    buffer.recordMessage(growable((byte) 0x01), 1); // first inserted
-    buffer.recordMessage(growable((byte) 0x02), 2); // second → appears first in output
-
-    CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
-    assertEquals(2, WireFormat.getTagFieldNumber(in.readTag()), "field 2 (last) should be first");
-    in.readByteArray();
-    assertEquals(1, WireFormat.getTagFieldNumber(in.readTag()), "field 1 (first) should be second");
-    in.readByteArray();
-    assertTrue(in.isAtEnd());
-  }
-
-  @Test
-  void threeMessagesAreOrderedInReverseInsertion() throws IOException {
-    for (int i = 1; i <= 3; i++) {
-      buffer.recordMessage(growable((byte) i), i);
-    }
-
-    CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
-    for (int expected = 3; expected >= 1; expected--) {
-      assertEquals(expected, WireFormat.getTagFieldNumber(in.readTag()));
-      in.readByteArray();
-    }
-    assertTrue(in.isAtEnd());
-  }
-
-  @Test
-  void byteArrayAndGrowableMessagesInterleaveInReverseOrder() throws IOException {
-    // field 1 hand-encoded: tag=0x0A, length=1, body=0x11
-    buffer.recordMessage(new byte[] {0x0A, 0x01, 0x11}); // first
-    buffer.recordMessage(growable((byte) 0x22), 2); // second → first in output
-
-    CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
-    assertEquals(2, WireFormat.getTagFieldNumber(in.readTag()), "GrowableBuffer message first");
-    in.readByteArray();
-    assertEquals(1, WireFormat.getTagFieldNumber(in.readTag()), "byte[] message second");
-    in.readByteArray();
-    assertTrue(in.isAtEnd());
-  }
-
-  // ─── flip() ──────────────────────────────────────────────────────────────
-
-  @Test
-  void flipReturnsCorrectByteCount() {
-    // tag(1) + length(1) + body(2) = 4 bytes
-    buffer.recordMessage(growable((byte) 1, (byte) 2), 1);
-    assertEquals(4, buffer.flip().remaining());
-  }
-
-  @Test
-  void flipIsIdempotent() {
-    buffer.recordMessage(growable((byte) 0x55), 1);
-    assertArrayEquals(readAll(buffer), readAll(buffer));
-  }
-
-  // ─── toPayload() ─────────────────────────────────────────────────────────
-
-  @Test
-  void toPayloadHasProtobufContentType() {
-    assertEquals("application/x-protobuf", buffer.toPayload().getContentType());
-  }
-
-  @Test
-  void toPayloadContentLengthMatchesFlipRemaining() {
-    buffer.recordMessage(growable((byte) 1, (byte) 2, (byte) 3), 1);
-    OtlpPayload payload = buffer.toPayload();
-    assertEquals(buffer.flip().remaining(), payload.getContentLength());
-  }
-
-  @Test
-  void toPayloadContentMatchesFlip() {
-    buffer.recordMessage(growable((byte) 0xDE, (byte) 0xAD), 5);
-
-    // Capture expected bytes before toPayload(): both share the same ByteBuffer, so readAll
-    // must not consume the position that toPayload() will later restore via flip().
-    byte[] expected = readAll(buffer);
-    OtlpPayload payload = buffer.toPayload();
-
-    ByteBuffer content = payload.getContent();
-    byte[] actual = new byte[content.remaining()];
-    content.get(actual);
-    assertArrayEquals(expected, actual);
-  }
-
-  @Test
-  void toPayloadContentIsReadOnly() {
-    buffer.recordMessage(growable((byte) 1), 1);
-    assertThrows(
-        ReadOnlyBufferException.class, () -> buffer.toPayload().getContent().put((byte) 0));
-  }
-
-  // ─── reset() ─────────────────────────────────────────────────────────────
-
-  @Test
-  void resetClearsBuffer() {
-    buffer.recordMessage(growable((byte) 1), 1);
-    assertNotEquals(0, buffer.flip().remaining());
-
-    buffer.reset();
-    assertEquals(0, buffer.flip().remaining());
-  }
-
-  @Test
-  void resetAllowsNewMessagesToBeRecorded() throws IOException {
-    buffer.recordMessage(growable((byte) 0x01), 1);
-    buffer.reset();
-    buffer.recordMessage(growable((byte) 0x02), 2);
-
-    CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
-    int tag = in.readTag();
-    assertEquals(2, WireFormat.getTagFieldNumber(tag), "only field 2 should be present");
-    assertArrayEquals(new byte[] {0x02}, in.readByteArray());
-    assertTrue(in.isAtEnd());
-  }
-
-  @Test
-  void resetOnGrownBufferShrinksToInitialCapacityThenFunctionsCorrectly() {
-    // initialCapacity=1; recording 100 bytes forces growth
-    OtlpProtoBuffer buf = new OtlpProtoBuffer(1);
-    buf.recordMessage(new byte[100]);
-    assertEquals(100, buf.flip().remaining());
-
-    buf.reset();
-    assertEquals(0, buf.flip().remaining());
-
-    // Should continue to function correctly after shrink
-    int size = buf.recordMessage(growable((byte) 0x42), 1);
-    assertEquals(3, size);
-    assertEquals(3, buf.flip().remaining());
-  }
-
-  @Test
-  void resetPreservesPayloadContentLength() {
-    buffer.recordMessage(growable((byte) 0xAB), 1);
-    OtlpPayload payload = buffer.toPayload();
-    int expectedLength = payload.getContentLength();
-    assertTrue(expectedLength > 0);
-
-    buffer.reset();
-
-    // contentLength is eagerly captured in the payload constructor and unaffected by reset
-    assertEquals(expectedLength, payload.getContentLength());
-  }
-
-  @Test
-  void payloadContentRemainsReadableAfterReset() {
-    buffer.recordMessage(growable((byte) 0xAB, (byte) 0xCD), 7);
-    byte[] expected = readAll(buffer);
-    OtlpPayload payload = buffer.toPayload();
-
-    buffer.reset();
-
-    ByteBuffer content = payload.getContent();
-    byte[] actual = new byte[content.remaining()];
-    content.get(actual);
-    assertArrayEquals(expected, actual, "reset() must not corrupt existing payload content");
-  }
-
-  @Test
-  void payloadContentRemainsReadableAfterResetOnGrownBuffer() {
-    // initialCapacity=4; recording 50 bytes forces buffer growth, so reset() allocates a new
-    // ByteBuffer — the payload must still reference the old (orphaned) one correctly.
-    OtlpProtoBuffer buf = new OtlpProtoBuffer(4);
-    buf.recordMessage(new byte[50]);
-    byte[] expected = readAll(buf);
-    OtlpPayload payload = buf.toPayload();
-
-    buf.reset();
-
-    ByteBuffer content = payload.getContent();
-    byte[] actual = new byte[content.remaining()];
-    content.get(actual);
-    assertArrayEquals(
-        expected, actual, "reset() on a grown buffer must not corrupt existing payload content");
-  }
-
-  // ─── buffer growth ────────────────────────────────────────────────────────
-
-  @Test
-  void bufferAccommodatesMessageLargerThanInitialCapacity() {
-    OtlpProtoBuffer buf = new OtlpProtoBuffer(4);
-    byte[] big = new byte[50];
-    int returned = buf.recordMessage(big);
-    assertEquals(50, returned);
-    assertArrayEquals(big, readAll(buf));
-  }
-
-  @Test
-  void growthPreservesAlreadyRecordedMessages() throws IOException {
-    // initialCapacity=4; first message fills it exactly, second triggers growth
-    OtlpProtoBuffer buf = new OtlpProtoBuffer(4);
-    buf.recordMessage(growable((byte) 0x01, (byte) 0x02), 1); // tag+len+2body = 4 bytes
-    buf.recordMessage(growable((byte) 0x03, (byte) 0x04), 2); // 4 more bytes → forces growth
-
-    byte[] bytes = readAll(buf);
-    assertEquals(8, bytes.length);
-
-    CodedInputStream in = CodedInputStream.newInstance(bytes);
-    assertEquals(2, WireFormat.getTagFieldNumber(in.readTag()));
-    assertArrayEquals(new byte[] {0x03, 0x04}, in.readByteArray());
-    assertEquals(1, WireFormat.getTagFieldNumber(in.readTag()));
-    assertArrayEquals(new byte[] {0x01, 0x02}, in.readByteArray());
-    assertTrue(in.isAtEnd());
-  }
-
-  @Test
-  void repeatedGrowthsPreserveAllMessages() throws IOException {
-    // initialCapacity=4; each 4-byte message exhausts remaining, forcing growth each round
-    OtlpProtoBuffer buf = new OtlpProtoBuffer(4);
-    for (int i = 1; i <= 4; i++) {
-      buf.recordMessage(growable((byte) i, (byte) (i + 10)), i);
-    }
-
-    CodedInputStream in = CodedInputStream.newInstance(readAll(buf));
-    for (int expected = 4; expected >= 1; expected--) {
-      assertEquals(expected, WireFormat.getTagFieldNumber(in.readTag()));
-      assertArrayEquals(new byte[] {(byte) expected, (byte) (expected + 10)}, in.readByteArray());
-    }
-    assertTrue(in.isAtEnd());
-  }
+    private OtlpProtoBuffer buffer;
+
+    @BeforeEach
+    void setUp() {
+        buffer = new OtlpProtoBuffer(16);
+    }
+
+    // ─── helpers ─────────────────────────────────────────────────────────────
+
+    /** Reads all available bytes from the buffer without consuming the underlying state. */
+    private static byte[] readAll(OtlpProtoBuffer buf) {
+        ByteBuffer bb = buf.flip();
+        byte[] bytes = new byte[bb.remaining()];
+        bb.get(bytes);
+        return bytes;
+    }
+
+    /** Creates a pre-filled GrowableBuffer containing the given bytes. */
+    private static GrowableBuffer growable(byte... body) {
+        GrowableBuffer buf = new GrowableBuffer(Math.max(1, body.length));
+        if (body.length > 0) {
+            buf.put(body);
+        }
+        return buf;
+    }
+
+    // ─── initial state ───────────────────────────────────────────────────────
+
+    @Test
+    void initialBufferIsEmpty() {
+        assertEquals(0, buffer.flip().remaining());
+    }
+
+    @Test
+    void initialPayloadIsEmpty() {
+        OtlpPayload payload = buffer.toPayload();
+        assertEquals(0, payload.getContentLength());
+        assertEquals("application/x-protobuf", payload.getContentType());
+    }
+
+    @Test
+    void constructorRejectsCapacityExceedingMaxCapacity() {
+        // rounds up to a power of two above MAX_CAPACITY_BYTES; must reject before allocating
+        assertThrows(IllegalArgumentException.class, () -> new OtlpProtoBuffer(OtlpProtoBuffer.MAX_CAPACITY_BYTES + 1));
+    }
+
+    // ─── recordMessage(GrowableBuffer, int) ──────────────────────────────────
+
+    @Test
+    void recordsSingleByteMessage() throws IOException {
+        // tag for field 1 = (1<<3)|2 = 10 → 1 varint byte; length=1 → 1 byte; body=1 → total 3
+        int returned = buffer.recordMessage(growable((byte) 0x42), 1);
+        assertEquals(3, returned);
+
+        CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
+        int tag = in.readTag();
+        assertEquals(1, WireFormat.getTagFieldNumber(tag));
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
+        assertArrayEquals(new byte[] {0x42}, in.readByteArray());
+        assertTrue(in.isAtEnd());
+    }
+
+    @Test
+    void recordsMultiByteBodyMessage() throws IOException {
+        byte[] body = {0x01, 0x02, 0x03};
+        // tag(field=2)=(2<<3)|2=18 → 1 byte; length=3 → 1 byte; body=3 → total 5
+        int returned = buffer.recordMessage(growable(body), 2);
+        assertEquals(5, returned);
+
+        CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
+        int tag = in.readTag();
+        assertEquals(2, WireFormat.getTagFieldNumber(tag));
+        assertArrayEquals(body, in.readByteArray());
+        assertTrue(in.isAtEnd());
+    }
+
+    @Test
+    void recordsEmptyBodyMessage() throws IOException {
+        // tag(1 byte) + length-varint(0, 1 byte) + 0 body bytes = 2
+        int returned = buffer.recordMessage(new GrowableBuffer(1), 1);
+        assertEquals(2, returned);
+
+        CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
+        assertEquals(1, WireFormat.getTagFieldNumber(in.readTag()));
+        assertEquals(0, in.readByteArray().length);
+        assertTrue(in.isAtEnd());
+    }
+
+    @Test
+    void recordsMessageWithLargeFieldNumber() throws IOException {
+        // field 16: tag=(16<<3)|2=130, needs 2 varint bytes; length=1 → 1 byte; body=1 → total 4
+        int returned = buffer.recordMessage(growable((byte) 0xAB), 16);
+        assertEquals(4, returned);
+
+        CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
+        int tag = in.readTag();
+        assertEquals(16, WireFormat.getTagFieldNumber(tag));
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
+        assertArrayEquals(new byte[] {(byte) 0xAB}, in.readByteArray());
+        assertTrue(in.isAtEnd());
+    }
+
+    @Test
+    void growableBufferIsReusableAfterRecordMessage() throws IOException {
+        // Verifies that the finally-block reset allows the same GrowableBuffer to be reused
+        GrowableBuffer buf = new GrowableBuffer(16);
+
+        buf.put((byte) 0x01);
+        buffer.recordMessage(buf, 1);
+
+        // After reset the buffer should accept new writes immediately
+        buf.put((byte) 0x02);
+        buffer.recordMessage(buf, 2);
+
+        CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
+        assertEquals(2, WireFormat.getTagFieldNumber(in.readTag()), "field 2 (last) first");
+        assertArrayEquals(new byte[] {0x02}, in.readByteArray());
+        assertEquals(1, WireFormat.getTagFieldNumber(in.readTag()), "field 1 (first) second");
+        assertArrayEquals(new byte[] {0x01}, in.readByteArray());
+        assertTrue(in.isAtEnd());
+    }
+
+    @Test
+    void growableBufferIsReusableAfterRecordMessageWithGrowth() throws IOException {
+        // OtlpProtoBuffer growth must not prevent the finally-block reset on the GrowableBuffer
+        OtlpProtoBuffer tinyBuf = new OtlpProtoBuffer(1);
+        GrowableBuffer buf = new GrowableBuffer(16);
+
+        buf.put(new byte[50]); // forces OtlpProtoBuffer growth
+        tinyBuf.recordMessage(buf, 1);
+
+        buf.put((byte) 0x42); // reuse after reset
+        tinyBuf.recordMessage(buf, 2);
+
+        CodedInputStream in = CodedInputStream.newInstance(readAll(tinyBuf));
+        assertEquals(2, WireFormat.getTagFieldNumber(in.readTag()));
+        assertArrayEquals(new byte[] {0x42}, in.readByteArray());
+        assertEquals(1, WireFormat.getTagFieldNumber(in.readTag()));
+        assertEquals(50, in.readByteArray().length);
+        assertTrue(in.isAtEnd());
+    }
+
+    // ─── recordMessage(GrowableBuffer, int, int bytesSoFar) ──────────────────
+
+    @Test
+    void bytesSoFarIncreasesEncodedLength() {
+        // field 1, body 1 byte, bytesSoFar 3 → encoded length = 4
+        // numBytes = sizeVarInt(10) + sizeVarInt(4) + 1 = 1+1+1 = 3; return 3+3 = 6
+        int returned = buffer.recordMessage(growable((byte) 0x01), 1, 3);
+        assertEquals(6, returned);
+    }
+
+    @Test
+    void bytesSoFarAtVarintBoundaryProducesMultiByteLengthField() {
+        // body=1 byte, bytesSoFar=127 → encoded length = 128, which needs 2 varint bytes
+        // numBytes = sizeVarInt(10) + sizeVarInt(128) + 1 = 1+2+1 = 4; return 4+127 = 131
+        int returned = buffer.recordMessage(growable((byte) 0x01), 1, 127);
+        assertEquals(131, returned);
+    }
+
+    @Test
+    void zeroBytesSoFarMatchesSimpleOverload() {
+        OtlpProtoBuffer buf1 = new OtlpProtoBuffer(16);
+        OtlpProtoBuffer buf2 = new OtlpProtoBuffer(16);
+        int ret1 = buf1.recordMessage(growable((byte) 0x05), 3);
+        int ret2 = buf2.recordMessage(growable((byte) 0x05), 3, 0);
+        assertEquals(ret1, ret2);
+        assertArrayEquals(readAll(buf1), readAll(buf2));
+    }
+
+    // ─── recordMessage(byte[]) ────────────────────────────────────────────────
+
+    @Test
+    void recordsByteArrayDirectly() {
+        // hand-crafted protobuf: field 1 (tag=0x0A), length 3, body [1, 2, 3]
+        byte[] encoded = {0x0A, 0x03, 0x01, 0x02, 0x03};
+        int returned = buffer.recordMessage(encoded);
+        assertEquals(5, returned);
+        assertArrayEquals(encoded, readAll(buffer));
+    }
+
+    @Test
+    void recordsEmptyByteArray() {
+        int returned = buffer.recordMessage(new byte[0]);
+        assertEquals(0, returned);
+        assertEquals(0, buffer.flip().remaining());
+    }
+
+    @Test
+    void byteArrayMessageAppearsInOutput() throws IOException {
+        // Encode field 4, body [0xBE, 0xEF] by hand: tag=(4<<3)|2=34, length=2
+        byte[] encoded = {0x22, 0x02, (byte) 0xBE, (byte) 0xEF};
+        buffer.recordMessage(encoded);
+
+        CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
+        assertEquals(4, WireFormat.getTagFieldNumber(in.readTag()));
+        assertArrayEquals(new byte[] {(byte) 0xBE, (byte) 0xEF}, in.readByteArray());
+        assertTrue(in.isAtEnd());
+    }
+
+    // ─── message ordering ────────────────────────────────────────────────────
+
+    @Test
+    void messagesAppearInReverseInsertionOrder() throws IOException {
+        buffer.recordMessage(growable((byte) 0x01), 1); // first inserted
+        buffer.recordMessage(growable((byte) 0x02), 2); // second → appears first in output
+
+        CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
+        assertEquals(2, WireFormat.getTagFieldNumber(in.readTag()), "field 2 (last) should be first");
+        in.readByteArray();
+        assertEquals(1, WireFormat.getTagFieldNumber(in.readTag()), "field 1 (first) should be second");
+        in.readByteArray();
+        assertTrue(in.isAtEnd());
+    }
+
+    @Test
+    void threeMessagesAreOrderedInReverseInsertion() throws IOException {
+        for (int i = 1; i <= 3; i++) {
+            buffer.recordMessage(growable((byte) i), i);
+        }
+
+        CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
+        for (int expected = 3; expected >= 1; expected--) {
+            assertEquals(expected, WireFormat.getTagFieldNumber(in.readTag()));
+            in.readByteArray();
+        }
+        assertTrue(in.isAtEnd());
+    }
+
+    @Test
+    void byteArrayAndGrowableMessagesInterleaveInReverseOrder() throws IOException {
+        // field 1 hand-encoded: tag=0x0A, length=1, body=0x11
+        buffer.recordMessage(new byte[] {0x0A, 0x01, 0x11}); // first
+        buffer.recordMessage(growable((byte) 0x22), 2); // second → first in output
+
+        CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
+        assertEquals(2, WireFormat.getTagFieldNumber(in.readTag()), "GrowableBuffer message first");
+        in.readByteArray();
+        assertEquals(1, WireFormat.getTagFieldNumber(in.readTag()), "byte[] message second");
+        in.readByteArray();
+        assertTrue(in.isAtEnd());
+    }
+
+    // ─── flip() ──────────────────────────────────────────────────────────────
+
+    @Test
+    void flipReturnsCorrectByteCount() {
+        // tag(1) + length(1) + body(2) = 4 bytes
+        buffer.recordMessage(growable((byte) 1, (byte) 2), 1);
+        assertEquals(4, buffer.flip().remaining());
+    }
+
+    @Test
+    void flipIsIdempotent() {
+        buffer.recordMessage(growable((byte) 0x55), 1);
+        assertArrayEquals(readAll(buffer), readAll(buffer));
+    }
+
+    // ─── toPayload() ─────────────────────────────────────────────────────────
+
+    @Test
+    void toPayloadHasProtobufContentType() {
+        assertEquals("application/x-protobuf", buffer.toPayload().getContentType());
+    }
+
+    @Test
+    void toPayloadContentLengthMatchesFlipRemaining() {
+        buffer.recordMessage(growable((byte) 1, (byte) 2, (byte) 3), 1);
+        OtlpPayload payload = buffer.toPayload();
+        assertEquals(buffer.flip().remaining(), payload.getContentLength());
+    }
+
+    @Test
+    void toPayloadContentMatchesFlip() {
+        buffer.recordMessage(growable((byte) 0xDE, (byte) 0xAD), 5);
+
+        // Capture expected bytes before toPayload(): both share the same ByteBuffer, so readAll
+        // must not consume the position that toPayload() will later restore via flip().
+        byte[] expected = readAll(buffer);
+        OtlpPayload payload = buffer.toPayload();
+
+        ByteBuffer content = payload.getContent();
+        byte[] actual = new byte[content.remaining()];
+        content.get(actual);
+        assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    void toPayloadContentIsReadOnly() {
+        buffer.recordMessage(growable((byte) 1), 1);
+        assertThrows(
+                ReadOnlyBufferException.class,
+                () -> buffer.toPayload().getContent().put((byte) 0));
+    }
+
+    // ─── reset() ─────────────────────────────────────────────────────────────
+
+    @Test
+    void resetClearsBuffer() {
+        buffer.recordMessage(growable((byte) 1), 1);
+        assertNotEquals(0, buffer.flip().remaining());
+
+        buffer.reset();
+        assertEquals(0, buffer.flip().remaining());
+    }
+
+    @Test
+    void resetAllowsNewMessagesToBeRecorded() throws IOException {
+        buffer.recordMessage(growable((byte) 0x01), 1);
+        buffer.reset();
+        buffer.recordMessage(growable((byte) 0x02), 2);
+
+        CodedInputStream in = CodedInputStream.newInstance(readAll(buffer));
+        int tag = in.readTag();
+        assertEquals(2, WireFormat.getTagFieldNumber(tag), "only field 2 should be present");
+        assertArrayEquals(new byte[] {0x02}, in.readByteArray());
+        assertTrue(in.isAtEnd());
+    }
+
+    @Test
+    void resetOnGrownBufferShrinksToInitialCapacityThenFunctionsCorrectly() {
+        // initialCapacity=1; recording 100 bytes forces growth
+        OtlpProtoBuffer buf = new OtlpProtoBuffer(1);
+        buf.recordMessage(new byte[100]);
+        assertEquals(100, buf.flip().remaining());
+
+        buf.reset();
+        assertEquals(0, buf.flip().remaining());
+
+        // Should continue to function correctly after shrink
+        int size = buf.recordMessage(growable((byte) 0x42), 1);
+        assertEquals(3, size);
+        assertEquals(3, buf.flip().remaining());
+    }
+
+    @Test
+    void resetPreservesPayloadContentLength() {
+        buffer.recordMessage(growable((byte) 0xAB), 1);
+        OtlpPayload payload = buffer.toPayload();
+        int expectedLength = payload.getContentLength();
+        assertTrue(expectedLength > 0);
+
+        buffer.reset();
+
+        // contentLength is eagerly captured in the payload constructor and unaffected by reset
+        assertEquals(expectedLength, payload.getContentLength());
+    }
+
+    @Test
+    void payloadContentRemainsReadableAfterReset() {
+        buffer.recordMessage(growable((byte) 0xAB, (byte) 0xCD), 7);
+        byte[] expected = readAll(buffer);
+        OtlpPayload payload = buffer.toPayload();
+
+        buffer.reset();
+
+        ByteBuffer content = payload.getContent();
+        byte[] actual = new byte[content.remaining()];
+        content.get(actual);
+        assertArrayEquals(expected, actual, "reset() must not corrupt existing payload content");
+    }
+
+    @Test
+    void payloadContentRemainsReadableAfterResetOnGrownBuffer() {
+        // initialCapacity=4; recording 50 bytes forces buffer growth, so reset() allocates a new
+        // ByteBuffer — the payload must still reference the old (orphaned) one correctly.
+        OtlpProtoBuffer buf = new OtlpProtoBuffer(4);
+        buf.recordMessage(new byte[50]);
+        byte[] expected = readAll(buf);
+        OtlpPayload payload = buf.toPayload();
+
+        buf.reset();
+
+        ByteBuffer content = payload.getContent();
+        byte[] actual = new byte[content.remaining()];
+        content.get(actual);
+        assertArrayEquals(expected, actual, "reset() on a grown buffer must not corrupt existing payload content");
+    }
+
+    // ─── buffer growth ────────────────────────────────────────────────────────
+
+    @Test
+    void bufferAccommodatesMessageLargerThanInitialCapacity() {
+        OtlpProtoBuffer buf = new OtlpProtoBuffer(4);
+        byte[] big = new byte[50];
+        int returned = buf.recordMessage(big);
+        assertEquals(50, returned);
+        assertArrayEquals(big, readAll(buf));
+    }
+
+    @Test
+    void growthPreservesAlreadyRecordedMessages() throws IOException {
+        // initialCapacity=4; first message fills it exactly, second triggers growth
+        OtlpProtoBuffer buf = new OtlpProtoBuffer(4);
+        buf.recordMessage(growable((byte) 0x01, (byte) 0x02), 1); // tag+len+2body = 4 bytes
+        buf.recordMessage(growable((byte) 0x03, (byte) 0x04), 2); // 4 more bytes → forces growth
+
+        byte[] bytes = readAll(buf);
+        assertEquals(8, bytes.length);
+
+        CodedInputStream in = CodedInputStream.newInstance(bytes);
+        assertEquals(2, WireFormat.getTagFieldNumber(in.readTag()));
+        assertArrayEquals(new byte[] {0x03, 0x04}, in.readByteArray());
+        assertEquals(1, WireFormat.getTagFieldNumber(in.readTag()));
+        assertArrayEquals(new byte[] {0x01, 0x02}, in.readByteArray());
+        assertTrue(in.isAtEnd());
+    }
+
+    @Test
+    void repeatedGrowthsPreserveAllMessages() throws IOException {
+        // initialCapacity=4; each 4-byte message exhausts remaining, forcing growth each round
+        OtlpProtoBuffer buf = new OtlpProtoBuffer(4);
+        for (int i = 1; i <= 4; i++) {
+            buf.recordMessage(growable((byte) i, (byte) (i + 10)), i);
+        }
+
+        CodedInputStream in = CodedInputStream.newInstance(readAll(buf));
+        for (int expected = 4; expected >= 1; expected--) {
+            assertEquals(expected, WireFormat.getTagFieldNumber(in.readTag()));
+            assertArrayEquals(new byte[] {(byte) expected, (byte) (expected + 10)}, in.readByteArray());
+        }
+        assertTrue(in.isAtEnd());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpResourceJsonTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpResourceJsonTest.java
index 102027cf668..521a0d95986 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpResourceJsonTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpResourceJsonTest.java
@@ -38,289 +38,272 @@
  */
 class OtlpResourceJsonTest {
 
-  // ── test data ─────────────────────────────────────────────────────────────
+    // ── test data ─────────────────────────────────────────────────────────────
+
+    private static Properties props(String... keyValues) {
+        Properties props = new Properties();
+        for (int i = 0; i < keyValues.length; i += 2) {
+            props.setProperty(keyValues[i], keyValues[i + 1]);
+        }
+        return props;
+    }
 
-  private static Properties props(String... keyValues) {
-    Properties props = new Properties();
-    for (int i = 0; i < keyValues.length; i += 2) {
-      props.setProperty(keyValues[i], keyValues[i + 1]);
+    private static Map<String, Object> attrs(String... keyValues) {
+        Map<String, Object> map = new LinkedHashMap<>();
+        for (int i = 0; i < keyValues.length; i += 2) {
+            map.put(keyValues[i], keyValues[i + 1]);
+        }
+        map.put("telemetry.sdk.name", "datadog");
+        map.put("telemetry.sdk.version", TRACER_VERSION);
+        map.put("telemetry.sdk.language", "java");
+        return map;
     }
-    return props;
-  }
 
-  private static Map<String, Object> attrs(String... keyValues) {
-    Map<String, Object> map = new LinkedHashMap<>();
-    for (int i = 0; i < keyValues.length; i += 2) {
-      map.put(keyValues[i], keyValues[i + 1]);
+    @AfterEach
+    void resetProcessTags() {
+        ProcessTags.reset(Config.get());
     }
-    map.put("telemetry.sdk.name", "datadog");
-    map.put("telemetry.sdk.version", TRACER_VERSION);
-    map.put("telemetry.sdk.language", "java");
-    return map;
-  }
-
-  @AfterEach
-  void resetProcessTags() {
-    ProcessTags.reset(Config.get());
-  }
-
-  static Stream<Arguments> resourceFragmentCases() {
-    return Stream.of(
-        Arguments.of(
-            "service not set, no env, no version, no tags",
-            props(),
-            attrs("service.name", Config.get().getServiceName())),
-        Arguments.of(
-            "custom service name, no env, no version, no tags",
-            props(SERVICE_NAME, "my-service"),
-            attrs("service.name", "my-service")),
-        Arguments.of(
-            "env set to empty string",
-            props(SERVICE_NAME, "my-service", ENV, ""),
-            attrs("service.name", "my-service")),
-        Arguments.of(
-            "env set to non-empty value",
-            props(SERVICE_NAME, "my-service", ENV, "prod"),
-            attrs("service.name", "my-service", "deployment.environment.name", "prod")),
-        Arguments.of(
-            "version set to empty string",
-            props(SERVICE_NAME, "my-service", VERSION, ""),
-            attrs("service.name", "my-service")),
-        Arguments.of(
-            "version set to non-empty value",
-            props(SERVICE_NAME, "my-service", VERSION, "1.0.0"),
-            attrs("service.name", "my-service", "service.version", "1.0.0")),
-        Arguments.of(
-            "tags as comma-separated key:value pairs",
-            props(SERVICE_NAME, "my-service", TAGS, "region:us-east,team:platform"),
-            attrs(
-                "service.name", "my-service",
-                "region", "us-east",
-                "team", "platform")),
-        Arguments.of(
-            "report-hostname enabled",
-            props(SERVICE_NAME, "my-service", TRACE_REPORT_HOSTNAME, "true"),
-            attrs("service.name", "my-service", "host.name", Config.get().getHostName())),
-        Arguments.of(
-            "service, env, version, and tags all set",
-            props(
-                SERVICE_NAME,
-                "my-service",
-                ENV,
-                "staging",
-                VERSION,
-                "2.0.0",
-                TAGS,
-                "region:eu-west,"
-                    + "service:ignored-service,"
-                    + "env:ignored-env,"
-                    + "version:ignored-version,"
-                    + "SERVICE:ignored-service,"
-                    + "ENV:ignored-env,"
-                    + "VERSION:ignored-version,"
-                    + "service.name:ignored-service,"
-                    + "deployment.environment.name:ignored-env,"
-                    + "service.version:ignored-version,"
-                    + "SERVICE.NAME:ignored-service,"
-                    + "DEPLOYMENT.ENVIRONMENT.NAME:ignored-env,"
-                    + "SERVICE.VERSION:ignored-version,"
-                    + "telemetry.sdk.name:ignored-sdk,"
-                    + "telemetry.sdk.version:ignored-version,"
-                    + "telemetry.sdk.language:ignored-language,"
-                    + "datadog.sdk.semantics:ignored-semantics,"
-                    + "_dd.sdk.otlp_export:ignored-export"),
-            attrs(
-                "service.name", "my-service",
-                "deployment.environment.name", "staging",
-                "service.version", "2.0.0",
-                "region", "eu-west")));
-  }
-
-  // ── tests ─────────────────────────────────────────────────────────────────
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("resourceFragmentCases")
-  void testBuildResourceFragment(
-      String caseName, Properties properties, Map<String, Object> expectedAttributes)
-      throws IOException {
-    Config config = Config.get(properties);
-    String fragment = OtlpResourceJson.buildResourceFragment(config, Collections.emptyMap());
-
-    Map<String, Object> actualAttributes = parseResourceAttributes(fragment);
-    assertEquals(expectedAttributes, actualAttributes, "For case: " + caseName);
-  }
-
-  /**
-   * On the OTLP path the export-mode marker is a resource attribute and is always {@code "true"} --
-   * reaching this encoder means the payload is leaving over OTLP.
-   */
-  @Test
-  void traceResourceAttributesCarryOtlpExportMarker() throws IOException {
-    Config config = Config.get(props(SERVICE_NAME, "my-service"));
-
-    Map<String, Object> attributes =
-        parseResourceAttributes(
-            OtlpResourceJson.buildResourceFragment(config, traceResourceAttributes(config)));
-
-    assertEquals("true", attributes.get("_dd.sdk.otlp_export"));
-  }
-
-  @Test
-  void usesOtelSdkSemanticsWhenEnabled() throws IOException {
-    Config config = Config.get(props(TRACE_OTEL_SEMANTICS_ENABLED, "true"));
-
-    Map<String, Object> attributes =
-        parseResourceAttributes(
-            OtlpResourceJson.buildResourceFragment(config, traceResourceAttributes(config)));
-
-    assertEquals("otel", attributes.get("datadog.sdk.semantics"));
-  }
-
-  /** The datadog-attrs variant carries {@code datadog.runtime_id}; the plain variant omits it. */
-  @Test
-  void datadogResourceAttributesVariantCarriesRuntimeId() throws IOException {
-    Config config = Config.get(props(SERVICE_NAME, "my-service"));
-
-    Map<String, Object> withDatadog =
-        parseResourceAttributes(
-            OtlpResourceJson.buildResourceFragment(config, datadogResourceAttributes(config)));
-    Map<String, Object> plain =
-        parseResourceAttributes(
-            OtlpResourceJson.buildResourceFragment(config, Collections.emptyMap()));
-
-    assertTrue(
-        withDatadog.containsKey("datadog.runtime_id"),
-        "datadog-attrs variant carries datadog.runtime_id");
-    assertEquals(
-        config.getRuntimeId(),
-        withDatadog.get("datadog.runtime_id"),
-        "runtime id matches the config value");
-    assertFalse(plain.containsKey("datadog.runtime_id"), "plain variant omits datadog.runtime_id");
-  }
-
-  @Test
-  void datadogResourceAttributesOverrideCollidingGlobalProcessTag() throws IOException {
-    Config config =
-        Config.get(
-            props(
+
+    static Stream<Arguments> resourceFragmentCases() {
+        return Stream.of(
+                Arguments.of(
+                        "service not set, no env, no version, no tags",
+                        props(),
+                        attrs("service.name", Config.get().getServiceName())),
+                Arguments.of(
+                        "custom service name, no env, no version, no tags",
+                        props(SERVICE_NAME, "my-service"),
+                        attrs("service.name", "my-service")),
+                Arguments.of(
+                        "env set to empty string",
+                        props(SERVICE_NAME, "my-service", ENV, ""),
+                        attrs("service.name", "my-service")),
+                Arguments.of(
+                        "env set to non-empty value",
+                        props(SERVICE_NAME, "my-service", ENV, "prod"),
+                        attrs("service.name", "my-service", "deployment.environment.name", "prod")),
+                Arguments.of(
+                        "version set to empty string",
+                        props(SERVICE_NAME, "my-service", VERSION, ""),
+                        attrs("service.name", "my-service")),
+                Arguments.of(
+                        "version set to non-empty value",
+                        props(SERVICE_NAME, "my-service", VERSION, "1.0.0"),
+                        attrs("service.name", "my-service", "service.version", "1.0.0")),
+                Arguments.of(
+                        "tags as comma-separated key:value pairs",
+                        props(SERVICE_NAME, "my-service", TAGS, "region:us-east,team:platform"),
+                        attrs(
+                                "service.name", "my-service",
+                                "region", "us-east",
+                                "team", "platform")),
+                Arguments.of(
+                        "report-hostname enabled",
+                        props(SERVICE_NAME, "my-service", TRACE_REPORT_HOSTNAME, "true"),
+                        attrs(
+                                "service.name",
+                                "my-service",
+                                "host.name",
+                                Config.get().getHostName())),
+                Arguments.of(
+                        "service, env, version, and tags all set",
+                        props(
+                                SERVICE_NAME,
+                                "my-service",
+                                ENV,
+                                "staging",
+                                VERSION,
+                                "2.0.0",
+                                TAGS,
+                                "region:eu-west,"
+                                        + "service:ignored-service,"
+                                        + "env:ignored-env,"
+                                        + "version:ignored-version,"
+                                        + "SERVICE:ignored-service,"
+                                        + "ENV:ignored-env,"
+                                        + "VERSION:ignored-version,"
+                                        + "service.name:ignored-service,"
+                                        + "deployment.environment.name:ignored-env,"
+                                        + "service.version:ignored-version,"
+                                        + "SERVICE.NAME:ignored-service,"
+                                        + "DEPLOYMENT.ENVIRONMENT.NAME:ignored-env,"
+                                        + "SERVICE.VERSION:ignored-version,"
+                                        + "telemetry.sdk.name:ignored-sdk,"
+                                        + "telemetry.sdk.version:ignored-version,"
+                                        + "telemetry.sdk.language:ignored-language,"
+                                        + "datadog.sdk.semantics:ignored-semantics,"
+                                        + "_dd.sdk.otlp_export:ignored-export"),
+                        attrs(
+                                "service.name", "my-service",
+                                "deployment.environment.name", "staging",
+                                "service.version", "2.0.0",
+                                "region", "eu-west")));
+    }
+
+    // ── tests ─────────────────────────────────────────────────────────────────
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("resourceFragmentCases")
+    void testBuildResourceFragment(String caseName, Properties properties, Map<String, Object> expectedAttributes)
+            throws IOException {
+        Config config = Config.get(properties);
+        String fragment = OtlpResourceJson.buildResourceFragment(config, Collections.emptyMap());
+
+        Map<String, Object> actualAttributes = parseResourceAttributes(fragment);
+        assertEquals(expectedAttributes, actualAttributes, "For case: " + caseName);
+    }
+
+    /**
+     * On the OTLP path the export-mode marker is a resource attribute and is always {@code "true"} --
+     * reaching this encoder means the payload is leaving over OTLP.
+     */
+    @Test
+    void traceResourceAttributesCarryOtlpExportMarker() throws IOException {
+        Config config = Config.get(props(SERVICE_NAME, "my-service"));
+
+        Map<String, Object> attributes = parseResourceAttributes(
+                OtlpResourceJson.buildResourceFragment(config, traceResourceAttributes(config)));
+
+        assertEquals("true", attributes.get("_dd.sdk.otlp_export"));
+    }
+
+    @Test
+    void usesOtelSdkSemanticsWhenEnabled() throws IOException {
+        Config config = Config.get(props(TRACE_OTEL_SEMANTICS_ENABLED, "true"));
+
+        Map<String, Object> attributes = parseResourceAttributes(
+                OtlpResourceJson.buildResourceFragment(config, traceResourceAttributes(config)));
+
+        assertEquals("otel", attributes.get("datadog.sdk.semantics"));
+    }
+
+    /** The datadog-attrs variant carries {@code datadog.runtime_id}; the plain variant omits it. */
+    @Test
+    void datadogResourceAttributesVariantCarriesRuntimeId() throws IOException {
+        Config config = Config.get(props(SERVICE_NAME, "my-service"));
+
+        Map<String, Object> withDatadog = parseResourceAttributes(
+                OtlpResourceJson.buildResourceFragment(config, datadogResourceAttributes(config)));
+        Map<String, Object> plain =
+                parseResourceAttributes(OtlpResourceJson.buildResourceFragment(config, Collections.emptyMap()));
+
+        assertTrue(withDatadog.containsKey("datadog.runtime_id"), "datadog-attrs variant carries datadog.runtime_id");
+        assertEquals(
+                config.getRuntimeId(), withDatadog.get("datadog.runtime_id"), "runtime id matches the config value");
+        assertFalse(plain.containsKey("datadog.runtime_id"), "plain variant omits datadog.runtime_id");
+    }
+
+    @Test
+    void datadogResourceAttributesOverrideCollidingGlobalProcessTag() throws IOException {
+        Config config = Config.get(props(
                 SERVICE_NAME,
                 "my-service",
                 TAGS,
                 "datadog.process_tags:user-value",
                 EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED,
                 "true"));
-    ProcessTags.reset(config);
-    ProcessTags.addTag("entrypoint.name", "app");
-    ProcessTags.addTag("entrypoint.type", "web");
-
-    Map<String, Object> withDatadog =
-        parseResourceAttributes(
-            OtlpResourceJson.buildResourceFragment(config, datadogResourceAttributes(config)));
-
-    Object processTags = withDatadog.get("datadog.process_tags");
-    assertTrue(processTags instanceof List, "datadog.process_tags is a single arrayValue");
-    assertEquals(ProcessTags.getTagsAsStringList(), processTags);
-  }
-
-  @Test
-  void statsComputedVariantCarriesMarker() throws IOException {
-    Config withMetrics =
-        Config.get(props(SERVICE_NAME, "my-service", OTEL_TRACES_SPAN_METRICS_ENABLED, "true"));
-    Config withoutMetrics = Config.get(props(SERVICE_NAME, "my-service"));
-
-    Map<String, Object> withMarker =
-        parseResourceAttributes(
-            OtlpResourceJson.buildResourceFragment(
-                withMetrics, traceResourceAttributes(withMetrics)));
-    Map<String, Object> without =
-        parseResourceAttributes(
-            OtlpResourceJson.buildResourceFragment(
-                withoutMetrics, traceResourceAttributes(withoutMetrics)));
-
-    assertEquals(
-        "true", withMarker.get("_dd.stats_computed"), "marker present when stats computed");
-    assertFalse(without.containsKey("_dd.stats_computed"), "marker absent when stats not computed");
-    assertEquals("datadog", without.get("datadog.sdk.semantics"));
-    assertEquals("true", without.get("_dd.sdk.otlp_export"));
-  }
-
-  @Test
-  void cannedFragmentsMatchTheirProtoCounterparts() throws IOException {
-    assertEquals(
-        parseResourceAttributesFromProto(OtlpResourceProto.RESOURCE_MESSAGE),
-        parseResourceAttributes(OtlpResourceJson.RESOURCE_FRAGMENT));
-    assertEquals(
-        parseResourceAttributesFromProto(OtlpResourceProto.RESOURCE_MESSAGE_WITH_DATADOG_ATTRS),
-        parseResourceAttributes(OtlpResourceJson.RESOURCE_FRAGMENT_WITH_DATADOG_ATTRS));
-    assertEquals(
-        parseResourceAttributesFromProto(OtlpResourceProto.TRACE_RESOURCE_MESSAGE),
-        parseResourceAttributes(OtlpResourceJson.TRACE_RESOURCE_FRAGMENT));
-  }
-
-  // ── parsing helpers ───────────────────────────────────────────────────────
-
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> parseResourceAttributes(String fragment) throws IOException {
-    Map<String, Object> resource = JsonMapper.fromJsonToMap(fragment);
-    List<Object> attributes = (List<Object>) resource.get("attributes");
-
-    Map<String, Object> result = new LinkedHashMap<>();
-    for (Object attribute : attributes) {
-      Map<String, Object> keyValue = (Map<String, Object>) attribute;
-      Map<String, Object> value = (Map<String, Object>) keyValue.get("value");
-      String key = (String) keyValue.get("key");
-      assertFalse(result.containsKey(key), "duplicate resource attribute key: " + key);
-      result.put(key, readAnyValue(value));
+        ProcessTags.reset(config);
+        ProcessTags.addTag("entrypoint.name", "app");
+        ProcessTags.addTag("entrypoint.type", "web");
+
+        Map<String, Object> withDatadog = parseResourceAttributes(
+                OtlpResourceJson.buildResourceFragment(config, datadogResourceAttributes(config)));
+
+        Object processTags = withDatadog.get("datadog.process_tags");
+        assertTrue(processTags instanceof List, "datadog.process_tags is a single arrayValue");
+        assertEquals(ProcessTags.getTagsAsStringList(), processTags);
+    }
+
+    @Test
+    void statsComputedVariantCarriesMarker() throws IOException {
+        Config withMetrics = Config.get(props(SERVICE_NAME, "my-service", OTEL_TRACES_SPAN_METRICS_ENABLED, "true"));
+        Config withoutMetrics = Config.get(props(SERVICE_NAME, "my-service"));
+
+        Map<String, Object> withMarker = parseResourceAttributes(
+                OtlpResourceJson.buildResourceFragment(withMetrics, traceResourceAttributes(withMetrics)));
+        Map<String, Object> without = parseResourceAttributes(
+                OtlpResourceJson.buildResourceFragment(withoutMetrics, traceResourceAttributes(withoutMetrics)));
+
+        assertEquals("true", withMarker.get("_dd.stats_computed"), "marker present when stats computed");
+        assertFalse(without.containsKey("_dd.stats_computed"), "marker absent when stats not computed");
+        assertEquals("datadog", without.get("datadog.sdk.semantics"));
+        assertEquals("true", without.get("_dd.sdk.otlp_export"));
     }
-    return result;
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Object readAnyValue(Map<String, Object> value) {
-    if (value.containsKey("arrayValue")) {
-      Map<String, Object> arrayValue = (Map<String, Object>) value.get("arrayValue");
-      List<Object> elements = (List<Object>) arrayValue.get("values");
-      List<String> strings = new ArrayList<>();
-      for (Object element : elements) {
-        strings.add((String) readAnyValue((Map<String, Object>) element));
-      }
-      return strings;
+
+    @Test
+    void cannedFragmentsMatchTheirProtoCounterparts() throws IOException {
+        assertEquals(
+                parseResourceAttributesFromProto(OtlpResourceProto.RESOURCE_MESSAGE),
+                parseResourceAttributes(OtlpResourceJson.RESOURCE_FRAGMENT));
+        assertEquals(
+                parseResourceAttributesFromProto(OtlpResourceProto.RESOURCE_MESSAGE_WITH_DATADOG_ATTRS),
+                parseResourceAttributes(OtlpResourceJson.RESOURCE_FRAGMENT_WITH_DATADOG_ATTRS));
+        assertEquals(
+                parseResourceAttributesFromProto(OtlpResourceProto.TRACE_RESOURCE_MESSAGE),
+                parseResourceAttributes(OtlpResourceJson.TRACE_RESOURCE_FRAGMENT));
     }
-    return value.get("stringValue");
-  }
-
-  private static Map<String, Object> parseResourceAttributesFromProto(byte[] bytes)
-      throws IOException {
-    com.google.protobuf.CodedInputStream outer =
-        com.google.protobuf.CodedInputStream.newInstance(bytes);
-    outer.readTag();
-    com.google.protobuf.CodedInputStream resource = outer.readBytes().newCodedInput();
-
-    Map<String, Object> attributes = new LinkedHashMap<>();
-    while (!resource.isAtEnd()) {
-      resource.readTag();
-      com.google.protobuf.CodedInputStream kv = resource.readBytes().newCodedInput();
-      kv.readTag();
-      String key = kv.readString();
-      kv.readTag();
-      com.google.protobuf.CodedInputStream av = kv.readBytes().newCodedInput();
-      attributes.put(key, readAnyValueFromProto(av));
+
+    // ── parsing helpers ───────────────────────────────────────────────────────
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> parseResourceAttributes(String fragment) throws IOException {
+        Map<String, Object> resource = JsonMapper.fromJsonToMap(fragment);
+        List<Object> attributes = (List<Object>) resource.get("attributes");
+
+        Map<String, Object> result = new LinkedHashMap<>();
+        for (Object attribute : attributes) {
+            Map<String, Object> keyValue = (Map<String, Object>) attribute;
+            Map<String, Object> value = (Map<String, Object>) keyValue.get("value");
+            String key = (String) keyValue.get("key");
+            assertFalse(result.containsKey(key), "duplicate resource attribute key: " + key);
+            result.put(key, readAnyValue(value));
+        }
+        return result;
     }
-    return attributes;
-  }
-
-  private static Object readAnyValueFromProto(com.google.protobuf.CodedInputStream av)
-      throws IOException {
-    int tag = av.readTag();
-    if (com.google.protobuf.WireFormat.getTagFieldNumber(tag) == 5) { // array_value
-      com.google.protobuf.CodedInputStream arrayValue = av.readBytes().newCodedInput();
-      List<String> values = new ArrayList<>();
-      while (!arrayValue.isAtEnd()) {
-        arrayValue.readTag(); // ArrayValue.values (field 1, repeated AnyValue)
-        values.add((String) readAnyValueFromProto(arrayValue.readBytes().newCodedInput()));
-      }
-      return values;
+
+    @SuppressWarnings("unchecked")
+    private static Object readAnyValue(Map<String, Object> value) {
+        if (value.containsKey("arrayValue")) {
+            Map<String, Object> arrayValue = (Map<String, Object>) value.get("arrayValue");
+            List<Object> elements = (List<Object>) arrayValue.get("values");
+            List<String> strings = new ArrayList<>();
+            for (Object element : elements) {
+                strings.add((String) readAnyValue((Map<String, Object>) element));
+            }
+            return strings;
+        }
+        return value.get("stringValue");
+    }
+
+    private static Map<String, Object> parseResourceAttributesFromProto(byte[] bytes) throws IOException {
+        com.google.protobuf.CodedInputStream outer = com.google.protobuf.CodedInputStream.newInstance(bytes);
+        outer.readTag();
+        com.google.protobuf.CodedInputStream resource = outer.readBytes().newCodedInput();
+
+        Map<String, Object> attributes = new LinkedHashMap<>();
+        while (!resource.isAtEnd()) {
+            resource.readTag();
+            com.google.protobuf.CodedInputStream kv = resource.readBytes().newCodedInput();
+            kv.readTag();
+            String key = kv.readString();
+            kv.readTag();
+            com.google.protobuf.CodedInputStream av = kv.readBytes().newCodedInput();
+            attributes.put(key, readAnyValueFromProto(av));
+        }
+        return attributes;
+    }
+
+    private static Object readAnyValueFromProto(com.google.protobuf.CodedInputStream av) throws IOException {
+        int tag = av.readTag();
+        if (com.google.protobuf.WireFormat.getTagFieldNumber(tag) == 5) { // array_value
+            com.google.protobuf.CodedInputStream arrayValue = av.readBytes().newCodedInput();
+            List<String> values = new ArrayList<>();
+            while (!arrayValue.isAtEnd()) {
+                arrayValue.readTag(); // ArrayValue.values (field 1, repeated AnyValue)
+                values.add((String) readAnyValueFromProto(arrayValue.readBytes().newCodedInput()));
+            }
+            return values;
+        }
+        return av.readString(); // string_value (field 1)
     }
-    return av.readString(); // string_value (field 1)
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpResourceProtoTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpResourceProtoTest.java
index f2831b3bd19..dbad4687fdd 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpResourceProtoTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpResourceProtoTest.java
@@ -51,308 +51,294 @@
  */
 class OtlpResourceProtoTest {
 
-  // ── test data ─────────────────────────────────────────────────────────────
+    // ── test data ─────────────────────────────────────────────────────────────
+
+    private static Properties props(String... keyValues) {
+        Properties props = new Properties();
+        for (int i = 0; i < keyValues.length; i += 2) {
+            props.setProperty(keyValues[i], keyValues[i + 1]);
+        }
+        return props;
+    }
 
-  private static Properties props(String... keyValues) {
-    Properties props = new Properties();
-    for (int i = 0; i < keyValues.length; i += 2) {
-      props.setProperty(keyValues[i], keyValues[i + 1]);
+    private static Map<String, Object> attrs(String... keyValues) {
+        Map<String, Object> map = new LinkedHashMap<>();
+        for (int i = 0; i < keyValues.length; i += 2) {
+            map.put(keyValues[i], keyValues[i + 1]);
+        }
+        map.put("telemetry.sdk.name", "datadog");
+        map.put("telemetry.sdk.version", TRACER_VERSION);
+        map.put("telemetry.sdk.language", "java");
+        return map;
     }
-    return props;
-  }
 
-  private static Map<String, Object> attrs(String... keyValues) {
-    Map<String, Object> map = new LinkedHashMap<>();
-    for (int i = 0; i < keyValues.length; i += 2) {
-      map.put(keyValues[i], keyValues[i + 1]);
+    @AfterEach
+    void resetProcessTags() {
+        ProcessTags.reset(Config.get());
     }
-    map.put("telemetry.sdk.name", "datadog");
-    map.put("telemetry.sdk.version", TRACER_VERSION);
-    map.put("telemetry.sdk.language", "java");
-    return map;
-  }
-
-  @AfterEach
-  void resetProcessTags() {
-    ProcessTags.reset(Config.get());
-  }
-
-  static Stream<Arguments> resourceMessageCases() {
-    return Stream.of(
-        // service not set: should use the auto-detected name
-        Arguments.of(
-            "service not set, no env, no version, no tags",
-            props(),
-            attrs("service.name", Config.get().getServiceName())),
-        // custom service name
-        Arguments.of(
-            "custom service name, no env, no version, no tags",
-            props(SERVICE_NAME, "my-service"),
-            attrs("service.name", "my-service")),
-        // env set to empty string: no deployment.environment.name written;
-        Arguments.of(
-            "env set to empty string",
-            props(SERVICE_NAME, "my-service", ENV, ""),
-            attrs("service.name", "my-service")),
-        // env set to non-empty value: deployment.environment.name written;
-        Arguments.of(
-            "env set to non-empty value",
-            props(SERVICE_NAME, "my-service", ENV, "prod"),
-            attrs("service.name", "my-service", "deployment.environment.name", "prod")),
-        // version set to empty string: no service.version written;
-        Arguments.of(
-            "version set to empty string",
-            props(SERVICE_NAME, "my-service", VERSION, ""),
-            attrs("service.name", "my-service")),
-        // version set to non-empty value: service.version written;
-        Arguments.of(
-            "version set to non-empty value",
-            props(SERVICE_NAME, "my-service", VERSION, "1.0.0"),
-            attrs("service.name", "my-service", "service.version", "1.0.0")),
-        // tags as comma-separated key:value pairs (no env or version)
-        Arguments.of(
-            "tags as comma-separated key:value pairs",
-            props(SERVICE_NAME, "my-service", TAGS, "region:us-east,team:platform"),
-            attrs(
-                "service.name", "my-service",
-                "region", "us-east",
-                "team", "platform")),
-        // report-hostname enabled: host.name written with the detected hostname
-        Arguments.of(
-            "report-hostname enabled",
-            props(SERVICE_NAME, "my-service", TRACE_REPORT_HOSTNAME, "true"),
-            attrs("service.name", "my-service", "host.name", Config.get().getHostName())),
-        // all config values set together; telemetry.sdk.* keys in tags must be ignored
-        Arguments.of(
-            "service, env, version, and tags all set",
-            props(
-                SERVICE_NAME,
-                "my-service",
-                ENV,
-                "staging",
-                VERSION,
-                "2.0.0",
-                TAGS,
-                "region:eu-west,"
-                    + "service:ignored-service,"
-                    + "env:ignored-env,"
-                    + "version:ignored-version,"
-                    + "SERVICE:ignored-service,"
-                    + "ENV:ignored-env,"
-                    + "VERSION:ignored-version,"
-                    + "service.name:ignored-service,"
-                    + "deployment.environment.name:ignored-env,"
-                    + "service.version:ignored-version,"
-                    + "SERVICE.NAME:ignored-service,"
-                    + "DEPLOYMENT.ENVIRONMENT.NAME:ignored-env,"
-                    + "SERVICE.VERSION:ignored-version,"
-                    + "telemetry.sdk.name:ignored-sdk,"
-                    + "telemetry.sdk.version:ignored-version,"
-                    + "telemetry.sdk.language:ignored-language,"
-                    + "datadog.sdk.semantics:ignored-semantics,"
-                    + "_dd.sdk.otlp_export:ignored-export"),
-            attrs(
-                "service.name", "my-service",
-                "deployment.environment.name", "staging",
-                "service.version", "2.0.0",
-                "region", "eu-west")));
-  }
-
-  // ── test ─────────────────────────────────────────────────────────────────
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("resourceMessageCases")
-  void testBuildResourceMessage(
-      String caseName, Properties properties, Map<String, Object> expectedAttributes)
-      throws IOException {
-    Config config = Config.get(properties);
-    byte[] bytes = OtlpResourceProto.buildResourceMessage(config, Collections.emptyMap());
-
-    Map<String, Object> actualAttributes = parseResourceAttributes(bytes);
-    assertEquals(expectedAttributes, actualAttributes, "For case: " + caseName);
-  }
-
-  /**
-   * On the OTLP path the export-mode marker is a resource attribute and is always {@code "true"} --
-   * reaching this encoder means the payload is leaving over OTLP.
-   */
-  @Test
-  void traceResourceAttributesCarryOtlpExportMarker() throws IOException {
-    Config config = Config.get(props(SERVICE_NAME, "my-service"));
-
-    Map<String, Object> attributes =
-        parseResourceAttributes(
-            OtlpResourceProto.buildResourceMessage(config, traceResourceAttributes(config)));
-
-    assertEquals("true", attributes.get("_dd.sdk.otlp_export"));
-  }
-
-  @Test
-  void usesOtelSdkSemanticsWhenEnabled() throws IOException {
-    Config config = Config.get(props(TRACE_OTEL_SEMANTICS_ENABLED, "true"));
-
-    Map<String, Object> attributes =
-        parseResourceAttributes(
-            OtlpResourceProto.buildResourceMessage(config, traceResourceAttributes(config)));
-
-    assertEquals("otel", attributes.get("datadog.sdk.semantics"));
-  }
-
-  /**
-   * The datadog-attrs variant ({@code buildResourceMessage(config, datadogResourceAttributes)})
-   * carries {@code datadog.runtime_id}; the plain variant omits it.
-   */
-  @Test
-  void datadogResourceAttributesVariantCarriesRuntimeId() throws IOException {
-    Config config = Config.get(props(SERVICE_NAME, "my-service"));
-
-    Map<String, Object> withDatadog =
-        parseResourceAttributes(
-            OtlpResourceProto.buildResourceMessage(config, datadogResourceAttributes(config)));
-    Map<String, Object> plain =
-        parseResourceAttributes(
-            OtlpResourceProto.buildResourceMessage(config, Collections.emptyMap()));
-
-    assertTrue(
-        withDatadog.containsKey("datadog.runtime_id"),
-        "datadog-attrs variant carries datadog.runtime_id");
-    assertEquals(
-        config.getRuntimeId(),
-        withDatadog.get("datadog.runtime_id"),
-        "runtime id matches the config value");
-    assertFalse(plain.containsKey("datadog.runtime_id"), "plain variant omits datadog.runtime_id");
-  }
-
-  @Test
-  void datadogResourceAttributesOverrideCollidingGlobalProcessTag() throws IOException {
-    Config config =
-        Config.get(
-            props(
+
+    static Stream<Arguments> resourceMessageCases() {
+        return Stream.of(
+                // service not set: should use the auto-detected name
+                Arguments.of(
+                        "service not set, no env, no version, no tags",
+                        props(),
+                        attrs("service.name", Config.get().getServiceName())),
+                // custom service name
+                Arguments.of(
+                        "custom service name, no env, no version, no tags",
+                        props(SERVICE_NAME, "my-service"),
+                        attrs("service.name", "my-service")),
+                // env set to empty string: no deployment.environment.name written;
+                Arguments.of(
+                        "env set to empty string",
+                        props(SERVICE_NAME, "my-service", ENV, ""),
+                        attrs("service.name", "my-service")),
+                // env set to non-empty value: deployment.environment.name written;
+                Arguments.of(
+                        "env set to non-empty value",
+                        props(SERVICE_NAME, "my-service", ENV, "prod"),
+                        attrs("service.name", "my-service", "deployment.environment.name", "prod")),
+                // version set to empty string: no service.version written;
+                Arguments.of(
+                        "version set to empty string",
+                        props(SERVICE_NAME, "my-service", VERSION, ""),
+                        attrs("service.name", "my-service")),
+                // version set to non-empty value: service.version written;
+                Arguments.of(
+                        "version set to non-empty value",
+                        props(SERVICE_NAME, "my-service", VERSION, "1.0.0"),
+                        attrs("service.name", "my-service", "service.version", "1.0.0")),
+                // tags as comma-separated key:value pairs (no env or version)
+                Arguments.of(
+                        "tags as comma-separated key:value pairs",
+                        props(SERVICE_NAME, "my-service", TAGS, "region:us-east,team:platform"),
+                        attrs(
+                                "service.name", "my-service",
+                                "region", "us-east",
+                                "team", "platform")),
+                // report-hostname enabled: host.name written with the detected hostname
+                Arguments.of(
+                        "report-hostname enabled",
+                        props(SERVICE_NAME, "my-service", TRACE_REPORT_HOSTNAME, "true"),
+                        attrs(
+                                "service.name",
+                                "my-service",
+                                "host.name",
+                                Config.get().getHostName())),
+                // all config values set together; telemetry.sdk.* keys in tags must be ignored
+                Arguments.of(
+                        "service, env, version, and tags all set",
+                        props(
+                                SERVICE_NAME,
+                                "my-service",
+                                ENV,
+                                "staging",
+                                VERSION,
+                                "2.0.0",
+                                TAGS,
+                                "region:eu-west,"
+                                        + "service:ignored-service,"
+                                        + "env:ignored-env,"
+                                        + "version:ignored-version,"
+                                        + "SERVICE:ignored-service,"
+                                        + "ENV:ignored-env,"
+                                        + "VERSION:ignored-version,"
+                                        + "service.name:ignored-service,"
+                                        + "deployment.environment.name:ignored-env,"
+                                        + "service.version:ignored-version,"
+                                        + "SERVICE.NAME:ignored-service,"
+                                        + "DEPLOYMENT.ENVIRONMENT.NAME:ignored-env,"
+                                        + "SERVICE.VERSION:ignored-version,"
+                                        + "telemetry.sdk.name:ignored-sdk,"
+                                        + "telemetry.sdk.version:ignored-version,"
+                                        + "telemetry.sdk.language:ignored-language,"
+                                        + "datadog.sdk.semantics:ignored-semantics,"
+                                        + "_dd.sdk.otlp_export:ignored-export"),
+                        attrs(
+                                "service.name", "my-service",
+                                "deployment.environment.name", "staging",
+                                "service.version", "2.0.0",
+                                "region", "eu-west")));
+    }
+
+    // ── test ─────────────────────────────────────────────────────────────────
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("resourceMessageCases")
+    void testBuildResourceMessage(String caseName, Properties properties, Map<String, Object> expectedAttributes)
+            throws IOException {
+        Config config = Config.get(properties);
+        byte[] bytes = OtlpResourceProto.buildResourceMessage(config, Collections.emptyMap());
+
+        Map<String, Object> actualAttributes = parseResourceAttributes(bytes);
+        assertEquals(expectedAttributes, actualAttributes, "For case: " + caseName);
+    }
+
+    /**
+     * On the OTLP path the export-mode marker is a resource attribute and is always {@code "true"} --
+     * reaching this encoder means the payload is leaving over OTLP.
+     */
+    @Test
+    void traceResourceAttributesCarryOtlpExportMarker() throws IOException {
+        Config config = Config.get(props(SERVICE_NAME, "my-service"));
+
+        Map<String, Object> attributes = parseResourceAttributes(
+                OtlpResourceProto.buildResourceMessage(config, traceResourceAttributes(config)));
+
+        assertEquals("true", attributes.get("_dd.sdk.otlp_export"));
+    }
+
+    @Test
+    void usesOtelSdkSemanticsWhenEnabled() throws IOException {
+        Config config = Config.get(props(TRACE_OTEL_SEMANTICS_ENABLED, "true"));
+
+        Map<String, Object> attributes = parseResourceAttributes(
+                OtlpResourceProto.buildResourceMessage(config, traceResourceAttributes(config)));
+
+        assertEquals("otel", attributes.get("datadog.sdk.semantics"));
+    }
+
+    /**
+     * The datadog-attrs variant ({@code buildResourceMessage(config, datadogResourceAttributes)})
+     * carries {@code datadog.runtime_id}; the plain variant omits it.
+     */
+    @Test
+    void datadogResourceAttributesVariantCarriesRuntimeId() throws IOException {
+        Config config = Config.get(props(SERVICE_NAME, "my-service"));
+
+        Map<String, Object> withDatadog = parseResourceAttributes(
+                OtlpResourceProto.buildResourceMessage(config, datadogResourceAttributes(config)));
+        Map<String, Object> plain =
+                parseResourceAttributes(OtlpResourceProto.buildResourceMessage(config, Collections.emptyMap()));
+
+        assertTrue(withDatadog.containsKey("datadog.runtime_id"), "datadog-attrs variant carries datadog.runtime_id");
+        assertEquals(
+                config.getRuntimeId(), withDatadog.get("datadog.runtime_id"), "runtime id matches the config value");
+        assertFalse(plain.containsKey("datadog.runtime_id"), "plain variant omits datadog.runtime_id");
+    }
+
+    @Test
+    void datadogResourceAttributesOverrideCollidingGlobalProcessTag() throws IOException {
+        Config config = Config.get(props(
                 SERVICE_NAME,
                 "my-service",
                 TAGS,
                 "datadog.process_tags:user-value",
                 EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED,
                 "true"));
-    ProcessTags.reset(config);
-    ProcessTags.addTag("entrypoint.name", "app");
-    ProcessTags.addTag("entrypoint.type", "web");
-
-    Map<String, Object> withDatadog =
-        parseResourceAttributes(
-            OtlpResourceProto.buildResourceMessage(config, datadogResourceAttributes(config)));
-
-    Object processTags = withDatadog.get("datadog.process_tags");
-    assertTrue(processTags instanceof List, "datadog.process_tags is a single arrayValue");
-    assertEquals(ProcessTags.getTagsAsStringList(), processTags);
-  }
-
-  @Test
-  void statsComputedVariantCarriesMarker() throws IOException {
-    Config withMetrics =
-        Config.get(props(SERVICE_NAME, "my-service", OTEL_TRACES_SPAN_METRICS_ENABLED, "true"));
-    Config withoutMetrics = Config.get(props(SERVICE_NAME, "my-service"));
-
-    Map<String, Object> withMarker =
-        parseResourceAttributes(
-            OtlpResourceProto.buildResourceMessage(
-                withMetrics, traceResourceAttributes(withMetrics)));
-    Map<String, Object> without =
-        parseResourceAttributes(
-            OtlpResourceProto.buildResourceMessage(
-                withoutMetrics, traceResourceAttributes(withoutMetrics)));
-
-    assertEquals(
-        "true", withMarker.get("_dd.stats_computed"), "marker present when stats computed");
-    assertFalse(without.containsKey("_dd.stats_computed"), "marker absent when stats not computed");
-    assertEquals("datadog", without.get("datadog.sdk.semantics"));
-    assertEquals("true", without.get("_dd.sdk.otlp_export"));
-  }
-
-  // ── parsing helpers ───────────────────────────────────────────────────────
-
-  /**
-   * Parses the resource message bytes into an attribute map while validating the protobuf wire
-   * format (field numbers and wire types) of every field read.
-   *
-   * <p>{@code buildResourceMessage} returns a length-prefixed message with an outer tag (field 1,
-   * LEN wire type) followed by the Resource body size and body. Read the outer tag, then iterate
-   * over all {@code Resource.attributes} (field 1, LEN wire type). Each attribute is a {@code
-   * KeyValue} whose {@code value} is an {@code AnyValue} containing either a {@code string_value}
-   * (field 1) or, for {@code datadog.process_tags}, an {@code array_value} (field 5).
-   */
-  private static Map<String, Object> parseResourceAttributes(byte[] bytes) throws IOException {
-    // Read the outer tag (field 1, LEN wire type) that wraps the Resource body
-    CodedInputStream outer = CodedInputStream.newInstance(bytes);
-    int outerTag = outer.readTag();
-    assertEquals(1, WireFormat.getTagFieldNumber(outerTag), "outer field is Resource (field 1)");
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(outerTag));
-    CodedInputStream resource = outer.readBytes().newCodedInput();
-
-    Map<String, Object> attributes = new LinkedHashMap<>();
-    while (!resource.isAtEnd()) {
-      // Each attribute is Resource.attributes (field 1, LEN wire type)
-      int tag = resource.readTag();
-      assertEquals(1, WireFormat.getTagFieldNumber(tag), "Resource.attributes is field 1");
-      assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
-
-      // Read the full KeyValue body
-      CodedInputStream kv = resource.readBytes().newCodedInput();
-
-      String key = readKeyField(kv);
-      CodedInputStream av = readAnyValueField(kv);
-      Object value = readAnyValueBody(av);
-      assertTrue(kv.isAtEnd(), "no extra fields in KeyValue");
-
-      assertFalse(attributes.containsKey(key), "duplicate resource attribute key: " + key);
-      attributes.put(key, value);
+        ProcessTags.reset(config);
+        ProcessTags.addTag("entrypoint.name", "app");
+        ProcessTags.addTag("entrypoint.type", "web");
+
+        Map<String, Object> withDatadog = parseResourceAttributes(
+                OtlpResourceProto.buildResourceMessage(config, datadogResourceAttributes(config)));
+
+        Object processTags = withDatadog.get("datadog.process_tags");
+        assertTrue(processTags instanceof List, "datadog.process_tags is a single arrayValue");
+        assertEquals(ProcessTags.getTagsAsStringList(), processTags);
     }
-    return attributes;
-  }
-
-  /** Reads the {@code KeyValue.key} field (field 1, LEN) and returns the string value. */
-  private static String readKeyField(CodedInputStream kv) throws IOException {
-    int tag = kv.readTag();
-    assertEquals(1, WireFormat.getTagFieldNumber(tag), "KeyValue.key is field 1");
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
-    return kv.readString();
-  }
-
-  /**
-   * Reads the {@code KeyValue.value} field (field 2, LEN) and returns a stream over the {@code
-   * AnyValue} body.
-   */
-  private static CodedInputStream readAnyValueField(CodedInputStream kv) throws IOException {
-    int tag = kv.readTag();
-    assertEquals(2, WireFormat.getTagFieldNumber(tag), "KeyValue.value is field 2");
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
-    return kv.readBytes().newCodedInput();
-  }
-
-  /** Reads {@code AnyValue.string_value} (field 1) or {@code AnyValue.array_value} (field 5). */
-  private static Object readAnyValueBody(CodedInputStream av) throws IOException {
-    int avTag = av.readTag();
-    int field = WireFormat.getTagFieldNumber(avTag);
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(avTag));
-    Object value;
-    if (field == 5) {
-      value = readArrayValue(av.readBytes().newCodedInput());
-    } else {
-      assertEquals(1, field, "AnyValue.string_value is field 1");
-      value = av.readString();
+
+    @Test
+    void statsComputedVariantCarriesMarker() throws IOException {
+        Config withMetrics = Config.get(props(SERVICE_NAME, "my-service", OTEL_TRACES_SPAN_METRICS_ENABLED, "true"));
+        Config withoutMetrics = Config.get(props(SERVICE_NAME, "my-service"));
+
+        Map<String, Object> withMarker = parseResourceAttributes(
+                OtlpResourceProto.buildResourceMessage(withMetrics, traceResourceAttributes(withMetrics)));
+        Map<String, Object> without = parseResourceAttributes(
+                OtlpResourceProto.buildResourceMessage(withoutMetrics, traceResourceAttributes(withoutMetrics)));
+
+        assertEquals("true", withMarker.get("_dd.stats_computed"), "marker present when stats computed");
+        assertFalse(without.containsKey("_dd.stats_computed"), "marker absent when stats not computed");
+        assertEquals("datadog", without.get("datadog.sdk.semantics"));
+        assertEquals("true", without.get("_dd.sdk.otlp_export"));
     }
-    assertTrue(av.isAtEnd(), "no extra fields in AnyValue");
-    return value;
-  }
-
-  /** Reads {@code ArrayValue.values} (field 1, repeated {@code AnyValue}) into a string list. */
-  private static List<String> readArrayValue(CodedInputStream arrayValue) throws IOException {
-    List<String> values = new ArrayList<>();
-    while (!arrayValue.isAtEnd()) {
-      int tag = arrayValue.readTag();
-      assertEquals(1, WireFormat.getTagFieldNumber(tag), "ArrayValue.values is field 1");
-      values.add((String) readAnyValueBody(arrayValue.readBytes().newCodedInput()));
+
+    // ── parsing helpers ───────────────────────────────────────────────────────
+
+    /**
+     * Parses the resource message bytes into an attribute map while validating the protobuf wire
+     * format (field numbers and wire types) of every field read.
+     *
+     * <p>{@code buildResourceMessage} returns a length-prefixed message with an outer tag (field 1,
+     * LEN wire type) followed by the Resource body size and body. Read the outer tag, then iterate
+     * over all {@code Resource.attributes} (field 1, LEN wire type). Each attribute is a {@code
+     * KeyValue} whose {@code value} is an {@code AnyValue} containing either a {@code string_value}
+     * (field 1) or, for {@code datadog.process_tags}, an {@code array_value} (field 5).
+     */
+    private static Map<String, Object> parseResourceAttributes(byte[] bytes) throws IOException {
+        // Read the outer tag (field 1, LEN wire type) that wraps the Resource body
+        CodedInputStream outer = CodedInputStream.newInstance(bytes);
+        int outerTag = outer.readTag();
+        assertEquals(1, WireFormat.getTagFieldNumber(outerTag), "outer field is Resource (field 1)");
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(outerTag));
+        CodedInputStream resource = outer.readBytes().newCodedInput();
+
+        Map<String, Object> attributes = new LinkedHashMap<>();
+        while (!resource.isAtEnd()) {
+            // Each attribute is Resource.attributes (field 1, LEN wire type)
+            int tag = resource.readTag();
+            assertEquals(1, WireFormat.getTagFieldNumber(tag), "Resource.attributes is field 1");
+            assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
+
+            // Read the full KeyValue body
+            CodedInputStream kv = resource.readBytes().newCodedInput();
+
+            String key = readKeyField(kv);
+            CodedInputStream av = readAnyValueField(kv);
+            Object value = readAnyValueBody(av);
+            assertTrue(kv.isAtEnd(), "no extra fields in KeyValue");
+
+            assertFalse(attributes.containsKey(key), "duplicate resource attribute key: " + key);
+            attributes.put(key, value);
+        }
+        return attributes;
+    }
+
+    /** Reads the {@code KeyValue.key} field (field 1, LEN) and returns the string value. */
+    private static String readKeyField(CodedInputStream kv) throws IOException {
+        int tag = kv.readTag();
+        assertEquals(1, WireFormat.getTagFieldNumber(tag), "KeyValue.key is field 1");
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
+        return kv.readString();
+    }
+
+    /**
+     * Reads the {@code KeyValue.value} field (field 2, LEN) and returns a stream over the {@code
+     * AnyValue} body.
+     */
+    private static CodedInputStream readAnyValueField(CodedInputStream kv) throws IOException {
+        int tag = kv.readTag();
+        assertEquals(2, WireFormat.getTagFieldNumber(tag), "KeyValue.value is field 2");
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tag));
+        return kv.readBytes().newCodedInput();
+    }
+
+    /** Reads {@code AnyValue.string_value} (field 1) or {@code AnyValue.array_value} (field 5). */
+    private static Object readAnyValueBody(CodedInputStream av) throws IOException {
+        int avTag = av.readTag();
+        int field = WireFormat.getTagFieldNumber(avTag);
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(avTag));
+        Object value;
+        if (field == 5) {
+            value = readArrayValue(av.readBytes().newCodedInput());
+        } else {
+            assertEquals(1, field, "AnyValue.string_value is field 1");
+            value = av.readString();
+        }
+        assertTrue(av.isAtEnd(), "no extra fields in AnyValue");
+        return value;
+    }
+
+    /** Reads {@code ArrayValue.values} (field 1, repeated {@code AnyValue}) into a string list. */
+    private static List<String> readArrayValue(CodedInputStream arrayValue) throws IOException {
+        List<String> values = new ArrayList<>();
+        while (!arrayValue.isAtEnd()) {
+            int tag = arrayValue.readTag();
+            assertEquals(1, WireFormat.getTagFieldNumber(tag), "ArrayValue.values is field 1");
+            values.add((String) readAnyValueBody(arrayValue.readBytes().newCodedInput()));
+        }
+        return values;
     }
-    return values;
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpSenderSupportTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpSenderSupportTest.java
index 2d033113213..5aca97e995d 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpSenderSupportTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpSenderSupportTest.java
@@ -25,71 +25,68 @@
 
 class OtlpSenderSupportTest {
 
-  private final OkHttpClient client = mock(OkHttpClient.class);
-  private final HttpRetryPolicy.Factory retryPolicy = HttpRetryPolicy.Factory.NEVER_RETRY;
-  private final Request request =
-      new Request.Builder().url("http://localhost:4318/v1/traces").build();
-  private final RatelimitedLogger ratelimitedLogger = mock(RatelimitedLogger.class);
+    private final OkHttpClient client = mock(OkHttpClient.class);
+    private final HttpRetryPolicy.Factory retryPolicy = HttpRetryPolicy.Factory.NEVER_RETRY;
+    private final Request request =
+            new Request.Builder().url("http://localhost:4318/v1/traces").build();
+    private final RatelimitedLogger ratelimitedLogger = mock(RatelimitedLogger.class);
 
-  @Test
-  void successfulResponseIsReturnedWithoutLogging() throws IOException {
-    Response response = responseWithCode(200);
-    try (MockedStatic<OkHttpUtils> okHttpUtils = mockStatic(OkHttpUtils.class)) {
-      okHttpUtils
-          .when(() -> OkHttpUtils.sendWithRetries(client, retryPolicy, request))
-          .thenReturn(response);
+    @Test
+    void successfulResponseIsReturnedWithoutLogging() throws IOException {
+        Response response = responseWithCode(200);
+        try (MockedStatic<OkHttpUtils> okHttpUtils = mockStatic(OkHttpUtils.class)) {
+            okHttpUtils
+                    .when(() -> OkHttpUtils.sendWithRetries(client, retryPolicy, request))
+                    .thenReturn(response);
 
-      RemoteApi.Response result =
-          OtlpSenderSupport.send(client, retryPolicy, request, ratelimitedLogger);
+            RemoteApi.Response result = OtlpSenderSupport.send(client, retryPolicy, request, ratelimitedLogger);
 
-      assertTrue(result.success());
-      assertEquals(200, result.status().getAsInt());
-      verify(ratelimitedLogger, never()).warn(any(String.class), any());
+            assertTrue(result.success());
+            assertEquals(200, result.status().getAsInt());
+            verify(ratelimitedLogger, never()).warn(any(String.class), any());
+        }
     }
-  }
 
-  @Test
-  void unsuccessfulResponseIsReturnedAndLogged() throws IOException {
-    Response response = responseWithCode(500);
-    try (MockedStatic<OkHttpUtils> okHttpUtils = mockStatic(OkHttpUtils.class)) {
-      okHttpUtils
-          .when(() -> OkHttpUtils.sendWithRetries(client, retryPolicy, request))
-          .thenReturn(response);
+    @Test
+    void unsuccessfulResponseIsReturnedAndLogged() throws IOException {
+        Response response = responseWithCode(500);
+        try (MockedStatic<OkHttpUtils> okHttpUtils = mockStatic(OkHttpUtils.class)) {
+            okHttpUtils
+                    .when(() -> OkHttpUtils.sendWithRetries(client, retryPolicy, request))
+                    .thenReturn(response);
 
-      RemoteApi.Response result =
-          OtlpSenderSupport.send(client, retryPolicy, request, ratelimitedLogger);
+            RemoteApi.Response result = OtlpSenderSupport.send(client, retryPolicy, request, ratelimitedLogger);
 
-      assertFalse(result.success());
-      assertEquals(500, result.status().getAsInt());
-      verify(ratelimitedLogger).warn(any(String.class), any(), any(), any());
+            assertFalse(result.success());
+            assertEquals(500, result.status().getAsInt());
+            verify(ratelimitedLogger).warn(any(String.class), any(), any(), any());
+        }
     }
-  }
 
-  @Test
-  void ioExceptionIsReturnedAsFailureAndLogged() throws IOException {
-    IOException exception = new IOException("boom");
-    try (MockedStatic<OkHttpUtils> okHttpUtils = mockStatic(OkHttpUtils.class)) {
-      okHttpUtils
-          .when(() -> OkHttpUtils.sendWithRetries(client, retryPolicy, request))
-          .thenThrow(exception);
+    @Test
+    void ioExceptionIsReturnedAsFailureAndLogged() throws IOException {
+        IOException exception = new IOException("boom");
+        try (MockedStatic<OkHttpUtils> okHttpUtils = mockStatic(OkHttpUtils.class)) {
+            okHttpUtils
+                    .when(() -> OkHttpUtils.sendWithRetries(client, retryPolicy, request))
+                    .thenThrow(exception);
 
-      RemoteApi.Response result =
-          OtlpSenderSupport.send(client, retryPolicy, request, ratelimitedLogger);
+            RemoteApi.Response result = OtlpSenderSupport.send(client, retryPolicy, request, ratelimitedLogger);
 
-      assertFalse(result.success());
-      assertTrue(result.exception().isPresent());
-      assertEquals(exception, result.exception().get());
-      verify(ratelimitedLogger).warn(any(String.class), any(), any());
+            assertFalse(result.success());
+            assertTrue(result.exception().isPresent());
+            assertEquals(exception, result.exception().get());
+            verify(ratelimitedLogger).warn(any(String.class), any(), any());
+        }
     }
-  }
 
-  private Response responseWithCode(int code) {
-    return new Response.Builder()
-        .request(request)
-        .protocol(Protocol.HTTP_1_1)
-        .code(code)
-        .message(code == 200 ? "OK" : "Server Error")
-        .body(ResponseBody.create(MediaType.get("text/plain"), ""))
-        .build();
-  }
+    private Response responseWithCode(int code) {
+        return new Response.Builder()
+                .request(request)
+                .protocol(Protocol.HTTP_1_1)
+                .code(code)
+                .message(code == 200 ? "OK" : "Server Error")
+                .body(ResponseBody.create(MediaType.get("text/plain"), ""))
+                .build();
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsJsonCollectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsJsonCollectorTest.java
index 75c4cef2978..a5b0223e478 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsJsonCollectorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsJsonCollectorTest.java
@@ -35,136 +35,133 @@
  */
 class OtlpLogsJsonCollectorTest {
 
-  private static final CoreTracer TRACER = CoreTracer.builder().writer(new LoggingWriter()).build();
-  private static final OtelInstrumentationScope SCOPE =
-      new OtelInstrumentationScope("test.logger", null, null);
-
-  @Test
-  void emptyBatchProducesEmptyPayload() {
-    OtlpLogsJsonCollector collector = OtlpLogsJsonCollector.INSTANCE;
-    OtlpPayload payload = collector.collectLogs((visitor, interval) -> {}, 0);
-    assertEquals(OtlpPayload.EMPTY, payload);
-  }
-
-  @Test
-  void logRecordWithoutSpanContextHasNoTraceOrSpanId() throws IOException {
-    OtlpLogRecord record = logRecord("hello", null, null);
-
-    Map<String, Object> parsed = onlyLogRecord(collect(record, emptyMap()));
-
-    assertEquals("hello", ((Map<String, Object>) parsed.get("body")).get("stringValue"));
-    assertEquals("9", String.valueOf(parsed.get("severityNumber")));
-    assertEquals("INFO", parsed.get("severityText"));
-    assertTrue(parsed.get("timeUnixNano") instanceof String);
-    assertTrue(parsed.get("observedTimeUnixNano") instanceof String);
-    assertFalse(parsed.containsKey("traceId"));
-    assertFalse(parsed.containsKey("spanId"));
-    assertFalse(parsed.containsKey("flags"));
-  }
-
-  @Test
-  void logRecordWithSpanContextHasHexTraceAndSpanIdAndSampledFlag() throws IOException {
-    AgentSpan span = TRACER.startSpan("test", "test.op");
-    span.setSamplingPriority(PrioritySampling.USER_KEEP, SamplingMechanism.DEFAULT);
-    span.finish();
-    DDSpan ddSpan = (DDSpan) span;
-
-    OtlpLogRecord record = logRecord("with context", ddSpan.spanContext(), null);
-    Map<String, Object> parsed = onlyLogRecord(collect(record, emptyMap()));
-
-    assertEquals(hexTraceId(ddSpan.getTraceId()), parsed.get("traceId"));
-    assertEquals(hexSpanId(ddSpan.getSpanId()), parsed.get("spanId"));
-    assertEquals(1, ((Number) parsed.get("flags")).intValue(), "SAMPLED_TRACE_FLAG = 1");
-  }
-
-  @Test
-  void logRecordWithEventNameHasEventNameField() throws IOException {
-    OtlpLogRecord record = logRecord("clicked", null, "user.interaction");
-    Map<String, Object> parsed = onlyLogRecord(collect(record, emptyMap()));
-
-    assertEquals("user.interaction", parsed.get("eventName"));
-  }
-
-  @Test
-  void logRecordWithAttributesWritesAttributesArray() throws IOException {
-    OtlpLogRecord record = logRecord("tagged", null, null);
-    Map<String, Object> parsed =
-        onlyLogRecord(collect(record, Collections.singletonMap("service.name", "svc")));
-
-    List<Object> attributes = (List<Object>) parsed.get("attributes");
-    assertEquals(1, attributes.size());
-    Map<String, Object> attr = (Map<String, Object>) attributes.get(0);
-    assertEquals("service.name", attr.get("key"));
-  }
-
-  @Test
-  void collectionAfterFailedAttributeWriteIsStillWellFormed() throws IOException {
-    OtlpLogsJsonCollector collector = OtlpLogsJsonCollector.INSTANCE;
-
-    // open the attributes array on the shared/reused collector, then blow up before it's closed
-    assertThrows(
-        RuntimeException.class,
-        () ->
-            collector.collectLogs(
+    private static final CoreTracer TRACER =
+            CoreTracer.builder().writer(new LoggingWriter()).build();
+    private static final OtelInstrumentationScope SCOPE = new OtelInstrumentationScope("test.logger", null, null);
+
+    @Test
+    void emptyBatchProducesEmptyPayload() {
+        OtlpLogsJsonCollector collector = OtlpLogsJsonCollector.INSTANCE;
+        OtlpPayload payload = collector.collectLogs((visitor, interval) -> {}, 0);
+        assertEquals(OtlpPayload.EMPTY, payload);
+    }
+
+    @Test
+    void logRecordWithoutSpanContextHasNoTraceOrSpanId() throws IOException {
+        OtlpLogRecord record = logRecord("hello", null, null);
+
+        Map<String, Object> parsed = onlyLogRecord(collect(record, emptyMap()));
+
+        assertEquals("hello", ((Map<String, Object>) parsed.get("body")).get("stringValue"));
+        assertEquals("9", String.valueOf(parsed.get("severityNumber")));
+        assertEquals("INFO", parsed.get("severityText"));
+        assertTrue(parsed.get("timeUnixNano") instanceof String);
+        assertTrue(parsed.get("observedTimeUnixNano") instanceof String);
+        assertFalse(parsed.containsKey("traceId"));
+        assertFalse(parsed.containsKey("spanId"));
+        assertFalse(parsed.containsKey("flags"));
+    }
+
+    @Test
+    void logRecordWithSpanContextHasHexTraceAndSpanIdAndSampledFlag() throws IOException {
+        AgentSpan span = TRACER.startSpan("test", "test.op");
+        span.setSamplingPriority(PrioritySampling.USER_KEEP, SamplingMechanism.DEFAULT);
+        span.finish();
+        DDSpan ddSpan = (DDSpan) span;
+
+        OtlpLogRecord record = logRecord("with context", ddSpan.spanContext(), null);
+        Map<String, Object> parsed = onlyLogRecord(collect(record, emptyMap()));
+
+        assertEquals(hexTraceId(ddSpan.getTraceId()), parsed.get("traceId"));
+        assertEquals(hexSpanId(ddSpan.getSpanId()), parsed.get("spanId"));
+        assertEquals(1, ((Number) parsed.get("flags")).intValue(), "SAMPLED_TRACE_FLAG = 1");
+    }
+
+    @Test
+    void logRecordWithEventNameHasEventNameField() throws IOException {
+        OtlpLogRecord record = logRecord("clicked", null, "user.interaction");
+        Map<String, Object> parsed = onlyLogRecord(collect(record, emptyMap()));
+
+        assertEquals("user.interaction", parsed.get("eventName"));
+    }
+
+    @Test
+    void logRecordWithAttributesWritesAttributesArray() throws IOException {
+        OtlpLogRecord record = logRecord("tagged", null, null);
+        Map<String, Object> parsed = onlyLogRecord(collect(record, Collections.singletonMap("service.name", "svc")));
+
+        List<Object> attributes = (List<Object>) parsed.get("attributes");
+        assertEquals(1, attributes.size());
+        Map<String, Object> attr = (Map<String, Object>) attributes.get(0);
+        assertEquals("service.name", attr.get("key"));
+    }
+
+    @Test
+    void collectionAfterFailedAttributeWriteIsStillWellFormed() throws IOException {
+        OtlpLogsJsonCollector collector = OtlpLogsJsonCollector.INSTANCE;
+
+        // open the attributes array on the shared/reused collector, then blow up before it's closed
+        assertThrows(
+                RuntimeException.class,
+                () -> collector.collectLogs(
+                        (visitor, interval) -> {
+                            OtlpScopedLogsVisitor scoped = visitor.visitScopedLogs(SCOPE);
+                            scoped.visitAttribute(STRING_ATTRIBUTE, "service.name", "svc");
+                            throw new RuntimeException("boom");
+                        },
+                        0));
+
+        // a subsequent, successful collection must still emit a well-formed attributes array
+        OtlpLogRecord record = logRecord("tagged", null, null);
+        Map<String, Object> parsed = onlyLogRecord(collect(record, Collections.singletonMap("service.name", "svc")));
+
+        List<Object> attributes = (List<Object>) parsed.get("attributes");
+        assertEquals(1, attributes.size());
+        Map<String, Object> attr = (Map<String, Object>) attributes.get(0);
+        assertEquals("service.name", attr.get("key"));
+    }
+
+    // ── helpers ──────────────────────────────────────────────────────────────
+
+    private static OtlpLogRecord logRecord(String body, AgentSpanContext ctx, String eventName) {
+        return new OtlpLogRecord(
+                SCOPE,
+                1_700_000_000_000_000_000L,
+                1_700_000_000_001_000_000L,
+                9,
+                "INFO",
+                body,
+                emptyMap(),
+                ctx,
+                eventName);
+    }
+
+    private static OtlpPayload collect(OtlpLogRecord record, Map<String, Object> attrs) {
+        OtlpLogsJsonCollector collector = OtlpLogsJsonCollector.INSTANCE;
+        return collector.collectLogs(
                 (visitor, interval) -> {
-                  OtlpScopedLogsVisitor scoped = visitor.visitScopedLogs(SCOPE);
-                  scoped.visitAttribute(STRING_ATTRIBUTE, "service.name", "svc");
-                  throw new RuntimeException("boom");
+                    OtlpScopedLogsVisitor scoped = visitor.visitScopedLogs(SCOPE);
+                    for (Map.Entry<String, Object> attr : attrs.entrySet()) {
+                        scoped.visitAttribute(STRING_ATTRIBUTE, attr.getKey(), attr.getValue());
+                    }
+                    scoped.visitLogRecord(record);
                 },
-                0));
-
-    // a subsequent, successful collection must still emit a well-formed attributes array
-    OtlpLogRecord record = logRecord("tagged", null, null);
-    Map<String, Object> parsed =
-        onlyLogRecord(collect(record, Collections.singletonMap("service.name", "svc")));
-
-    List<Object> attributes = (List<Object>) parsed.get("attributes");
-    assertEquals(1, attributes.size());
-    Map<String, Object> attr = (Map<String, Object>) attributes.get(0);
-    assertEquals("service.name", attr.get("key"));
-  }
-
-  // ── helpers ──────────────────────────────────────────────────────────────
-
-  private static OtlpLogRecord logRecord(String body, AgentSpanContext ctx, String eventName) {
-    return new OtlpLogRecord(
-        SCOPE,
-        1_700_000_000_000_000_000L,
-        1_700_000_000_001_000_000L,
-        9,
-        "INFO",
-        body,
-        emptyMap(),
-        ctx,
-        eventName);
-  }
-
-  private static OtlpPayload collect(OtlpLogRecord record, Map<String, Object> attrs) {
-    OtlpLogsJsonCollector collector = OtlpLogsJsonCollector.INSTANCE;
-    return collector.collectLogs(
-        (visitor, interval) -> {
-          OtlpScopedLogsVisitor scoped = visitor.visitScopedLogs(SCOPE);
-          for (Map.Entry<String, Object> attr : attrs.entrySet()) {
-            scoped.visitAttribute(STRING_ATTRIBUTE, attr.getKey(), attr.getValue());
-          }
-          scoped.visitLogRecord(record);
-        },
-        0);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> onlyLogRecord(OtlpPayload payload) throws IOException {
-    byte[] bytes = new byte[payload.getContentLength()];
-    payload.getContent().get(bytes);
-    String json = new String(bytes, StandardCharsets.UTF_8);
-    Map<String, Object> root = JsonMapper.fromJsonToMap(json);
-
-    List<Object> resourceLogs = (List<Object>) root.get("resourceLogs");
-    Map<String, Object> resourceLog = (Map<String, Object>) resourceLogs.get(0);
-    List<Object> scopeLogs = (List<Object>) resourceLog.get("scopeLogs");
-    Map<String, Object> scopeLog = (Map<String, Object>) scopeLogs.get(0);
-    List<Object> logRecords = (List<Object>) scopeLog.get("logRecords");
-    assertEquals(1, logRecords.size());
-    return (Map<String, Object>) logRecords.get(0);
-  }
+                0);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> onlyLogRecord(OtlpPayload payload) throws IOException {
+        byte[] bytes = new byte[payload.getContentLength()];
+        payload.getContent().get(bytes);
+        String json = new String(bytes, StandardCharsets.UTF_8);
+        Map<String, Object> root = JsonMapper.fromJsonToMap(json);
+
+        List<Object> resourceLogs = (List<Object>) root.get("resourceLogs");
+        Map<String, Object> resourceLog = (Map<String, Object>) resourceLogs.get(0);
+        List<Object> scopeLogs = (List<Object>) resourceLog.get("scopeLogs");
+        Map<String, Object> scopeLog = (Map<String, Object>) scopeLogs.get(0);
+        List<Object> logRecords = (List<Object>) scopeLog.get("logRecords");
+        assertEquals(1, logRecords.size());
+        return (Map<String, Object>) logRecords.get(0);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsProtoTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsProtoTest.java
index 735653921cb..2f28526dac9 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsProtoTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsProtoTest.java
@@ -72,688 +72,656 @@
  */
 class OtlpLogsProtoTest {
 
-  static final CoreTracer TRACER = CoreTracer.builder().writer(new LoggingWriter()).build();
-
-  // ── well-known scopes ──────────────────────────────────────────────────────
-
-  static final OtelInstrumentationScope DEFAULT_SCOPE =
-      new OtelInstrumentationScope("test.logger", null, null);
-  static final OtelInstrumentationScope VERSIONED_SCOPE =
-      new OtelInstrumentationScope("io.example", "2.0.0", null);
-  static final OtelInstrumentationScope SCHEMA_SCOPE =
-      new OtelInstrumentationScope("io.example", "1.0", "https://opentelemetry.io/schemas/1.0");
+    static final CoreTracer TRACER =
+            CoreTracer.builder().writer(new LoggingWriter()).build();
+
+    // ── well-known scopes ──────────────────────────────────────────────────────
+
+    static final OtelInstrumentationScope DEFAULT_SCOPE = new OtelInstrumentationScope("test.logger", null, null);
+    static final OtelInstrumentationScope VERSIONED_SCOPE = new OtelInstrumentationScope("io.example", "2.0.0", null);
+    static final OtelInstrumentationScope SCHEMA_SCOPE =
+            new OtelInstrumentationScope("io.example", "1.0", "https://opentelemetry.io/schemas/1.0");
+
+    // ── spec class ─────────────────────────────────────────────────────────────
+
+    static final class LogSpec {
+        /** Instrumentation scope for this log record → drives ScopeLogs grouping. */
+        OtelInstrumentationScope scope;
+
+        /** time_unix_nano (proto field 1). */
+        final long timestampNanos;
+
+        /** observed_time_unix_nano (proto field 11). */
+        final long observedNanos;
+
+        /** severity_number (proto field 2). */
+        int severityNumber;
+
+        /** severity_text (proto field 3); {@code null} → field absent. */
+        @Nullable
+        String severityText;
+
+        /** body.string_value (proto field 5 → AnyValue field 1); {@code null} → field absent. */
+        @Nullable
+        final String body;
+
+        /** Extra attributes written via {@code visitAttribute} before the log record. */
+        Map<String, Object> attrs;
+
+        /**
+         * If ≥ 0, index into the pre-built span list for the span context, encoding trace_id, span_id,
+         * and flags. If -1, no span context → those fields absent.
+         */
+        int spanContextIndex;
+
+        /** event_name (proto field 12); {@code null} → field absent. */
+        @Nullable
+        String eventName;
+
+        /**
+         * If true, the span at {@code spanContextIndex} is started under a known 128-bit trace ID so
+         * the high-order bytes of trace_id are non-zero.
+         */
+        boolean use128BitTraceId;
+
+        LogSpec(@Nullable String body) {
+            this.body = body;
+            this.scope = DEFAULT_SCOPE;
+            this.timestampNanos = BASE_NANOS;
+            this.observedNanos = BASE_NANOS + OBSERVED_OFFSET_NANOS;
+            this.severityNumber = 9;
+            this.severityText = "INFO";
+            this.attrs = emptyMap();
+            this.spanContextIndex = -1;
+        }
 
-  // ── spec class ─────────────────────────────────────────────────────────────
+        LogSpec scope(OtelInstrumentationScope scope) {
+            this.scope = scope;
+            return this;
+        }
 
-  static final class LogSpec {
-    /** Instrumentation scope for this log record → drives ScopeLogs grouping. */
-    OtelInstrumentationScope scope;
+        LogSpec severity(int number, @Nullable String text) {
+            this.severityNumber = number;
+            this.severityText = text;
+            return this;
+        }
 
-    /** time_unix_nano (proto field 1). */
-    final long timestampNanos;
+        LogSpec attrs(Map<String, Object> attrs) {
+            this.attrs = attrs;
+            return this;
+        }
 
-    /** observed_time_unix_nano (proto field 11). */
-    final long observedNanos;
+        LogSpec spanContextIndex(int index) {
+            this.spanContextIndex = index;
+            return this;
+        }
 
-    /** severity_number (proto field 2). */
-    int severityNumber;
+        LogSpec eventName(@Nullable String name) {
+            this.eventName = name;
+            return this;
+        }
 
-    /** severity_text (proto field 3); {@code null} → field absent. */
-    @Nullable String severityText;
+        LogSpec use128BitTraceId() {
+            this.use128BitTraceId = true;
+            return this;
+        }
+    }
 
-    /** body.string_value (proto field 5 → AnyValue field 1); {@code null} → field absent. */
-    @Nullable final String body;
+    private static final class ParsedScope {
+        final String name;
+        final String version;
+        final String schemaUrl;
+        final List<byte[]> logRecordBlobs;
+
+        ParsedScope(String name, String version, String schemaUrl, List<byte[]> logRecordBlobs) {
+            this.name = name;
+            this.version = version;
+            this.schemaUrl = schemaUrl;
+            this.logRecordBlobs = logRecordBlobs;
+        }
+    }
 
-    /** Extra attributes written via {@code visitAttribute} before the log record. */
-    Map<String, Object> attrs;
+    // ── shorthand builders ─────────────────────────────────────────────────────
 
-    /**
-     * If ≥ 0, index into the pre-built span list for the span context, encoding trace_id, span_id,
-     * and flags. If -1, no span context → those fields absent.
-     */
-    int spanContextIndex;
+    private static final long BASE_NANOS = 1_700_000_000_000_000_000L;
+    private static final long OBSERVED_OFFSET_NANOS = 1_000_000L; // 1 ms
 
-    /** event_name (proto field 12); {@code null} → field absent. */
-    @Nullable String eventName;
+    /** A known 128-bit trace ID; high-order bits are non-zero to exercise the encoding path. */
+    static final DD128bTraceId TRACE_ID_128BIT = DD128bTraceId.from(0x0123456789abcdefL, 0xfedcba9876543210L);
 
-    /**
-     * If true, the span at {@code spanContextIndex} is started under a known 128-bit trace ID so
-     * the high-order bytes of trace_id are non-zero.
-     */
-    boolean use128BitTraceId;
-
-    LogSpec(@Nullable String body) {
-      this.body = body;
-      this.scope = DEFAULT_SCOPE;
-      this.timestampNanos = BASE_NANOS;
-      this.observedNanos = BASE_NANOS + OBSERVED_OFFSET_NANOS;
-      this.severityNumber = 9;
-      this.severityText = "INFO";
-      this.attrs = emptyMap();
-      this.spanContextIndex = -1;
+    private static LogSpec infoLog(String body) {
+        return new LogSpec(body);
     }
 
-    LogSpec scope(OtelInstrumentationScope scope) {
-      this.scope = scope;
-      return this;
+    private static LogSpec scopedLog(OtelInstrumentationScope scope, String body) {
+        return new LogSpec(body).scope(scope);
     }
 
-    LogSpec severity(int number, @Nullable String text) {
-      this.severityNumber = number;
-      this.severityText = text;
-      return this;
+    private static LogSpec severityLog(int severityNumber, @Nullable String severityText, String body) {
+        return new LogSpec(body).severity(severityNumber, severityText);
     }
 
-    LogSpec attrs(Map<String, Object> attrs) {
-      this.attrs = attrs;
-      return this;
+    private static LogSpec contextLog(String body, int spanContextIndex) {
+        return new LogSpec(body).spanContextIndex(spanContextIndex);
     }
 
-    LogSpec spanContextIndex(int index) {
-      this.spanContextIndex = index;
-      return this;
+    private static LogSpec eventLog(String body, String eventName) {
+        return new LogSpec(body).eventName(eventName);
     }
 
-    LogSpec eventName(@Nullable String name) {
-      this.eventName = name;
-      return this;
+    private static LogSpec eventOnlyLog(String eventName) {
+        return new LogSpec(null).eventName(eventName);
     }
 
-    LogSpec use128BitTraceId() {
-      this.use128BitTraceId = true;
-      return this;
+    private static LogSpec taggedLog(String body, Map<String, Object> attrs) {
+        return new LogSpec(body).attrs(attrs);
     }
-  }
-
-  private static final class ParsedScope {
-    final String name;
-    final String version;
-    final String schemaUrl;
-    final List<byte[]> logRecordBlobs;
-
-    ParsedScope(String name, String version, String schemaUrl, List<byte[]> logRecordBlobs) {
-      this.name = name;
-      this.version = version;
-      this.schemaUrl = schemaUrl;
-      this.logRecordBlobs = logRecordBlobs;
-    }
-  }
-
-  // ── shorthand builders ─────────────────────────────────────────────────────
-
-  private static final long BASE_NANOS = 1_700_000_000_000_000_000L;
-  private static final long OBSERVED_OFFSET_NANOS = 1_000_000L; // 1 ms
 
-  /** A known 128-bit trace ID; high-order bits are non-zero to exercise the encoding path. */
-  static final DD128bTraceId TRACE_ID_128BIT =
-      DD128bTraceId.from(0x0123456789abcdefL, 0xfedcba9876543210L);
+    private static Map<String, Object> attrs(Object... keyValues) {
+        Map<String, Object> map = new HashMap<>();
+        for (int i = 0; i < keyValues.length; i += 2) {
+            map.put((String) keyValues[i], keyValues[i + 1]);
+        }
+        return map;
+    }
 
-  private static LogSpec infoLog(String body) {
-    return new LogSpec(body);
-  }
+    // ── test cases ─────────────────────────────────────────────────────────────
+
+    static Stream<Arguments> cases() {
+        return Stream.of(
+
+                // ── empty ─────────────────────────────────────────────────────────────
+                Arguments.of("empty — no log records produces empty payload", emptyList()),
+
+                // ── minimal ───────────────────────────────────────────────────────────
+                Arguments.of("minimal log record — INFO with body", asList(infoLog("Hello, World!"))),
+
+                // ── severity ──────────────────────────────────────────────────────────
+                Arguments.of(
+                        "TRACE severity — severity_number=1, severity_text=TRACE",
+                        asList(severityLog(1, "TRACE", "trace message"))),
+                Arguments.of("DEBUG severity — severity_number=5", asList(severityLog(5, "DEBUG", "debug message"))),
+                Arguments.of("WARN severity — severity_number=13", asList(severityLog(13, "WARN", "warn message"))),
+                Arguments.of("ERROR severity — severity_number=17", asList(severityLog(17, "ERROR", "error message"))),
+                Arguments.of("FATAL severity — severity_number=21", asList(severityLog(21, "FATAL", "fatal message"))),
+                Arguments.of(
+                        "null severity text — severity_text field absent",
+                        asList(severityLog(9, null, "no severity text"))),
+
+                // ── body ──────────────────────────────────────────────────────────────
+                Arguments.of("empty body string — body.string_value is empty", asList(infoLog(""))),
+                Arguments.of(
+                        "Unicode body — UTF-8 multi-byte chars encoded correctly", asList(infoLog("日本語テスト emoji 🎉"))),
+
+                // ── span context ──────────────────────────────────────────────────────
+                Arguments.of(
+                        "log with span context — trace_id and span_id encoded, SAMPLED flag set",
+                        asList(infoLog("no context"), contextLog("with context", 0))),
+                Arguments.of(
+                        "log with 128-bit trace ID — high-order trace_id bytes non-zero",
+                        asList(contextLog("128-bit trace", 0).use128BitTraceId())),
+
+                // ── event name ────────────────────────────────────────────────────────
+                Arguments.of(
+                        "log with event name — event_name field written",
+                        asList(eventLog("button clicked", "user.interaction"))),
+                Arguments.of("null event name — event_name field absent", asList(infoLog("no event name"))),
+                Arguments.of(
+                        "event-only log — body absent when null, event_name field present",
+                        asList(eventOnlyLog("user.interaction"))),
+
+                // ── attributes ────────────────────────────────────────────────────────
+                Arguments.of(
+                        "log with string attribute", asList(taggedLog("tagged", attrs("service.name", "my-service")))),
+                Arguments.of("log with long attribute", asList(taggedLog("tagged", attrs("http.status_code", 200L)))),
+                Arguments.of("log with boolean attribute", asList(taggedLog("tagged", attrs("error", Boolean.TRUE)))),
+                Arguments.of("log with double attribute", asList(taggedLog("tagged", attrs("latency.ms", 3.14)))),
+                Arguments.of(
+                        "log with multiple mixed attributes",
+                        asList(taggedLog(
+                                "multi-tagged",
+                                attrs(
+                                        "service.name",
+                                        "svc",
+                                        "http.status_code",
+                                        500L,
+                                        "error",
+                                        Boolean.TRUE,
+                                        "latency.ms",
+                                        1.5)))),
+
+                // ── instrumentation scope ─────────────────────────────────────────────
+                Arguments.of(
+                        "versioned scope — scope name and version written",
+                        asList(scopedLog(VERSIONED_SCOPE, "versioned log"))),
+                Arguments.of(
+                        "scope with schema URL — schema_url field written in ScopeLogs",
+                        asList(scopedLog(SCHEMA_SCOPE, "schema log"))),
+
+                // ── multiple log records ───────────────────────────────────────────────
+                Arguments.of(
+                        "multiple log records under same scope",
+                        asList(infoLog("first"), infoLog("second"), severityLog(17, "ERROR", "third"))),
+
+                // ── multiple scopes ────────────────────────────────────────────────────
+                Arguments.of(
+                        "multiple scopes — each scope produces its own ScopeLogs entry",
+                        asList(
+                                scopedLog(DEFAULT_SCOPE, "scope A record"),
+                                scopedLog(VERSIONED_SCOPE, "scope B record"))));
+    }
 
-  private static LogSpec scopedLog(OtelInstrumentationScope scope, String body) {
-    return new LogSpec(body).scope(scope);
-  }
+    // ── parameterized test ────────────────────────────────────────────────────
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("cases")
+    void testCollectLogs(String caseName, List<LogSpec> specs) throws IOException {
+        List<DDSpan> spans = buildSpans(specs);
+
+        OtlpPayload payload = OtlpLogsProtoCollector.INSTANCE.collectLogs(
+                (visitor, interval) -> {
+                    for (List<LogSpec> scopeGroup : groupByScope(specs).values()) {
+                        OtlpScopedLogsVisitor scoped = visitor.visitScopedLogs(scopeGroup.get(0).scope);
+                        for (LogSpec spec : scopeGroup) {
+                            for (Map.Entry<String, Object> attr : spec.attrs.entrySet()) {
+                                scoped.visitAttribute(attrType(attr.getValue()), attr.getKey(), attr.getValue());
+                            }
+                            scoped.visitLogRecord(new OtlpLogRecord(
+                                    spec.scope,
+                                    spec.timestampNanos,
+                                    spec.observedNanos,
+                                    spec.severityNumber,
+                                    spec.severityText,
+                                    spec.body,
+                                    emptyMap(),
+                                    resolveContext(spans, spec),
+                                    spec.eventName));
+                        }
+                    }
+                },
+                0);
+
+        if (specs.isEmpty()) {
+            assertEquals(0, payload.getContentLength(), "empty specs must produce empty payload");
+            return;
+        }
 
-  private static LogSpec severityLog(
-      int severityNumber, @Nullable String severityText, String body) {
-    return new LogSpec(body).severity(severityNumber, severityText);
-  }
+        assertTrue(payload.getContentLength() > 0, "non-empty specs must produce bytes");
+
+        // ── parse LogsData ────────────────────────────────────────────────────
+        CodedInputStream logsData = CodedInputStream.newInstance(payload.getContent());
+        int logsTag = logsData.readTag();
+        assertEquals(1, WireFormat.getTagFieldNumber(logsTag), "LogsData.resource_logs is field 1");
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(logsTag));
+        CodedInputStream resourceLogs = logsData.readBytes().newCodedInput();
+        assertTrue(logsData.isAtEnd(), "expected exactly one ResourceLogs");
+
+        // ── parse ResourceLogs ────────────────────────────────────────────────
+        boolean resourceFound = false;
+        List<byte[]> scopeBlobs = new ArrayList<>();
+        while (!resourceLogs.isAtEnd()) {
+            int tag = resourceLogs.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 1:
+                    verifyResource(resourceLogs.readBytes().newCodedInput());
+                    resourceFound = true;
+                    break;
+                case 2:
+                    scopeBlobs.add(resourceLogs.readBytes().toByteArray());
+                    break;
+                default:
+                    resourceLogs.skipField(tag);
+            }
+        }
+        assertTrue(resourceFound, "Resource must be present in ResourceLogs [" + caseName + "]");
 
-  private static LogSpec contextLog(String body, int spanContextIndex) {
-    return new LogSpec(body).spanContextIndex(spanContextIndex);
-  }
+        // ── verify ScopeLogs groups (order-insensitive) ───────────────────────
+        Map<String, List<LogSpec>> expectedByScopeName = groupByScope(specs);
+        assertEquals(expectedByScopeName.size(), scopeBlobs.size(), "ScopeLogs count mismatch [" + caseName + "]");
 
-  private static LogSpec eventLog(String body, String eventName) {
-    return new LogSpec(body).eventName(eventName);
-  }
+        for (byte[] scopeBlob : scopeBlobs) {
+            ParsedScope parsedScope = parseScopeLogs(CodedInputStream.newInstance(scopeBlob), caseName);
+            List<LogSpec> group = expectedByScopeName.get(parsedScope.name);
+            assertNotNull(group, "unexpected scope '" + parsedScope.name + "' [" + caseName + "]");
+            verifyScope(parsedScope, group.get(0).scope, caseName);
 
-  private static LogSpec eventOnlyLog(String eventName) {
-    return new LogSpec(null).eventName(eventName);
-  }
+            Map<String, LogSpec> expectedByKey = new HashMap<>();
+            for (LogSpec spec : group) {
+                expectedByKey.put(logKey(spec), spec);
+            }
+            assertEquals(
+                    group.size(),
+                    parsedScope.logRecordBlobs.size(),
+                    "LogRecord count in scope " + parsedScope.name + " [" + caseName + "]");
+            for (byte[] recordBlob : parsedScope.logRecordBlobs) {
+                String key = parseLogKey(recordBlob);
+                LogSpec spec = expectedByKey.get(key);
+                assertNotNull(spec, "unexpected log record with key '" + key + "' [" + caseName + "]");
+                verifyLogRecord(CodedInputStream.newInstance(recordBlob), spec, resolveContext(spans, spec), caseName);
+            }
+        }
+    }
 
-  private static LogSpec taggedLog(String body, Map<String, Object> attrs) {
-    return new LogSpec(body).attrs(attrs);
-  }
+    // ── span construction ─────────────────────────────────────────────────────
 
-  private static Map<String, Object> attrs(Object... keyValues) {
-    Map<String, Object> map = new HashMap<>();
-    for (int i = 0; i < keyValues.length; i += 2) {
-      map.put((String) keyValues[i], keyValues[i + 1]);
-    }
-    return map;
-  }
-
-  // ── test cases ─────────────────────────────────────────────────────────────
-
-  static Stream<Arguments> cases() {
-    return Stream.of(
-
-        // ── empty ─────────────────────────────────────────────────────────────
-        Arguments.of("empty — no log records produces empty payload", emptyList()),
-
-        // ── minimal ───────────────────────────────────────────────────────────
-        Arguments.of("minimal log record — INFO with body", asList(infoLog("Hello, World!"))),
-
-        // ── severity ──────────────────────────────────────────────────────────
-        Arguments.of(
-            "TRACE severity — severity_number=1, severity_text=TRACE",
-            asList(severityLog(1, "TRACE", "trace message"))),
-        Arguments.of(
-            "DEBUG severity — severity_number=5", asList(severityLog(5, "DEBUG", "debug message"))),
-        Arguments.of(
-            "WARN severity — severity_number=13", asList(severityLog(13, "WARN", "warn message"))),
-        Arguments.of(
-            "ERROR severity — severity_number=17",
-            asList(severityLog(17, "ERROR", "error message"))),
-        Arguments.of(
-            "FATAL severity — severity_number=21",
-            asList(severityLog(21, "FATAL", "fatal message"))),
-        Arguments.of(
-            "null severity text — severity_text field absent",
-            asList(severityLog(9, null, "no severity text"))),
-
-        // ── body ──────────────────────────────────────────────────────────────
-        Arguments.of("empty body string — body.string_value is empty", asList(infoLog(""))),
-        Arguments.of(
-            "Unicode body — UTF-8 multi-byte chars encoded correctly",
-            asList(infoLog("日本語テスト emoji 🎉"))),
-
-        // ── span context ──────────────────────────────────────────────────────
-        Arguments.of(
-            "log with span context — trace_id and span_id encoded, SAMPLED flag set",
-            asList(infoLog("no context"), contextLog("with context", 0))),
-        Arguments.of(
-            "log with 128-bit trace ID — high-order trace_id bytes non-zero",
-            asList(contextLog("128-bit trace", 0).use128BitTraceId())),
-
-        // ── event name ────────────────────────────────────────────────────────
-        Arguments.of(
-            "log with event name — event_name field written",
-            asList(eventLog("button clicked", "user.interaction"))),
-        Arguments.of("null event name — event_name field absent", asList(infoLog("no event name"))),
-        Arguments.of(
-            "event-only log — body absent when null, event_name field present",
-            asList(eventOnlyLog("user.interaction"))),
-
-        // ── attributes ────────────────────────────────────────────────────────
-        Arguments.of(
-            "log with string attribute",
-            asList(taggedLog("tagged", attrs("service.name", "my-service")))),
-        Arguments.of(
-            "log with long attribute",
-            asList(taggedLog("tagged", attrs("http.status_code", 200L)))),
-        Arguments.of(
-            "log with boolean attribute",
-            asList(taggedLog("tagged", attrs("error", Boolean.TRUE)))),
-        Arguments.of(
-            "log with double attribute", asList(taggedLog("tagged", attrs("latency.ms", 3.14)))),
-        Arguments.of(
-            "log with multiple mixed attributes",
-            asList(
-                taggedLog(
-                    "multi-tagged",
-                    attrs(
-                        "service.name",
-                        "svc",
-                        "http.status_code",
-                        500L,
-                        "error",
-                        Boolean.TRUE,
-                        "latency.ms",
-                        1.5)))),
-
-        // ── instrumentation scope ─────────────────────────────────────────────
-        Arguments.of(
-            "versioned scope — scope name and version written",
-            asList(scopedLog(VERSIONED_SCOPE, "versioned log"))),
-        Arguments.of(
-            "scope with schema URL — schema_url field written in ScopeLogs",
-            asList(scopedLog(SCHEMA_SCOPE, "schema log"))),
-
-        // ── multiple log records ───────────────────────────────────────────────
-        Arguments.of(
-            "multiple log records under same scope",
-            asList(infoLog("first"), infoLog("second"), severityLog(17, "ERROR", "third"))),
-
-        // ── multiple scopes ────────────────────────────────────────────────────
-        Arguments.of(
-            "multiple scopes — each scope produces its own ScopeLogs entry",
-            asList(
-                scopedLog(DEFAULT_SCOPE, "scope A record"),
-                scopedLog(VERSIONED_SCOPE, "scope B record"))));
-  }
-
-  // ── parameterized test ────────────────────────────────────────────────────
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("cases")
-  void testCollectLogs(String caseName, List<LogSpec> specs) throws IOException {
-    List<DDSpan> spans = buildSpans(specs);
-
-    OtlpPayload payload =
-        OtlpLogsProtoCollector.INSTANCE.collectLogs(
-            (visitor, interval) -> {
-              for (List<LogSpec> scopeGroup : groupByScope(specs).values()) {
-                OtlpScopedLogsVisitor scoped = visitor.visitScopedLogs(scopeGroup.get(0).scope);
-                for (LogSpec spec : scopeGroup) {
-                  for (Map.Entry<String, Object> attr : spec.attrs.entrySet()) {
-                    scoped.visitAttribute(
-                        attrType(attr.getValue()), attr.getKey(), attr.getValue());
-                  }
-                  scoped.visitLogRecord(
-                      new OtlpLogRecord(
-                          spec.scope,
-                          spec.timestampNanos,
-                          spec.observedNanos,
-                          spec.severityNumber,
-                          spec.severityText,
-                          spec.body,
-                          emptyMap(),
-                          resolveContext(spans, spec),
-                          spec.eventName));
+    private static List<DDSpan> buildSpans(List<LogSpec> specs) {
+        int maxIndex = -1;
+        for (LogSpec spec : specs) {
+            if (spec.spanContextIndex > maxIndex) maxIndex = spec.spanContextIndex;
+        }
+        if (maxIndex < 0) {
+            return new ArrayList<>();
+        }
+        List<DDSpan> spans = new ArrayList<>(maxIndex + 1);
+        for (int i = 0; i <= maxIndex; i++) {
+            LogSpec refSpec = null;
+            for (LogSpec spec : specs) {
+                if (spec.spanContextIndex == i) {
+                    refSpec = spec;
+                    break;
                 }
-              }
-            },
-            0);
-
-    if (specs.isEmpty()) {
-      assertEquals(0, payload.getContentLength(), "empty specs must produce empty payload");
-      return;
+            }
+            AgentSpan span;
+            if (refSpec != null && refSpec.use128BitTraceId) {
+                ExtractedContext parent128 = new ExtractedContext(
+                        TRACE_ID_128BIT,
+                        0L,
+                        PrioritySampling.UNSET,
+                        null,
+                        PropagationTags.factory().empty(),
+                        TracePropagationStyle.DATADOG);
+                span = TRACER.startSpan("test", "test.op.128", parent128, 0L);
+            } else {
+                span = TRACER.startSpan("test", "test.op", 0L);
+                span.setSamplingPriority(PrioritySampling.USER_KEEP, SamplingMechanism.DEFAULT);
+            }
+            span.finish(0L);
+            spans.add((DDSpan) span);
+        }
+        return spans;
     }
 
-    assertTrue(payload.getContentLength() > 0, "non-empty specs must produce bytes");
-
-    // ── parse LogsData ────────────────────────────────────────────────────
-    CodedInputStream logsData = CodedInputStream.newInstance(payload.getContent());
-    int logsTag = logsData.readTag();
-    assertEquals(1, WireFormat.getTagFieldNumber(logsTag), "LogsData.resource_logs is field 1");
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(logsTag));
-    CodedInputStream resourceLogs = logsData.readBytes().newCodedInput();
-    assertTrue(logsData.isAtEnd(), "expected exactly one ResourceLogs");
-
-    // ── parse ResourceLogs ────────────────────────────────────────────────
-    boolean resourceFound = false;
-    List<byte[]> scopeBlobs = new ArrayList<>();
-    while (!resourceLogs.isAtEnd()) {
-      int tag = resourceLogs.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 1:
-          verifyResource(resourceLogs.readBytes().newCodedInput());
-          resourceFound = true;
-          break;
-        case 2:
-          scopeBlobs.add(resourceLogs.readBytes().toByteArray());
-          break;
-        default:
-          resourceLogs.skipField(tag);
-      }
-    }
-    assertTrue(resourceFound, "Resource must be present in ResourceLogs [" + caseName + "]");
-
-    // ── verify ScopeLogs groups (order-insensitive) ───────────────────────
-    Map<String, List<LogSpec>> expectedByScopeName = groupByScope(specs);
-    assertEquals(
-        expectedByScopeName.size(),
-        scopeBlobs.size(),
-        "ScopeLogs count mismatch [" + caseName + "]");
-
-    for (byte[] scopeBlob : scopeBlobs) {
-      ParsedScope parsedScope = parseScopeLogs(CodedInputStream.newInstance(scopeBlob), caseName);
-      List<LogSpec> group = expectedByScopeName.get(parsedScope.name);
-      assertNotNull(group, "unexpected scope '" + parsedScope.name + "' [" + caseName + "]");
-      verifyScope(parsedScope, group.get(0).scope, caseName);
-
-      Map<String, LogSpec> expectedByKey = new HashMap<>();
-      for (LogSpec spec : group) {
-        expectedByKey.put(logKey(spec), spec);
-      }
-      assertEquals(
-          group.size(),
-          parsedScope.logRecordBlobs.size(),
-          "LogRecord count in scope " + parsedScope.name + " [" + caseName + "]");
-      for (byte[] recordBlob : parsedScope.logRecordBlobs) {
-        String key = parseLogKey(recordBlob);
-        LogSpec spec = expectedByKey.get(key);
-        assertNotNull(spec, "unexpected log record with key '" + key + "' [" + caseName + "]");
-        verifyLogRecord(
-            CodedInputStream.newInstance(recordBlob), spec, resolveContext(spans, spec), caseName);
-      }
+    /**
+     * Resolves the {@link AgentSpanContext} for a spec: the span's own context, or null if no
+     * context.
+     */
+    @Nullable
+    private static AgentSpanContext resolveContext(List<DDSpan> spans, LogSpec spec) {
+        if (spec.spanContextIndex < 0) {
+            return null;
+        }
+        DDSpan span = spans.get(spec.spanContextIndex);
+        return span.spanContext();
     }
-  }
 
-  // ── span construction ─────────────────────────────────────────────────────
+    // ── grouping helper ───────────────────────────────────────────────────────
 
-  private static List<DDSpan> buildSpans(List<LogSpec> specs) {
-    int maxIndex = -1;
-    for (LogSpec spec : specs) {
-      if (spec.spanContextIndex > maxIndex) maxIndex = spec.spanContextIndex;
-    }
-    if (maxIndex < 0) {
-      return new ArrayList<>();
-    }
-    List<DDSpan> spans = new ArrayList<>(maxIndex + 1);
-    for (int i = 0; i <= maxIndex; i++) {
-      LogSpec refSpec = null;
-      for (LogSpec spec : specs) {
-        if (spec.spanContextIndex == i) {
-          refSpec = spec;
-          break;
+    private static Map<String, List<LogSpec>> groupByScope(List<LogSpec> specs) {
+        Map<String, List<LogSpec>> groups = new LinkedHashMap<>();
+        for (LogSpec spec : specs) {
+            groups.computeIfAbsent(spec.scope.getName().toString(), k -> new ArrayList<>())
+                    .add(spec);
         }
-      }
-      AgentSpan span;
-      if (refSpec != null && refSpec.use128BitTraceId) {
-        ExtractedContext parent128 =
-            new ExtractedContext(
-                TRACE_ID_128BIT,
-                0L,
-                PrioritySampling.UNSET,
-                null,
-                PropagationTags.factory().empty(),
-                TracePropagationStyle.DATADOG);
-        span = TRACER.startSpan("test", "test.op.128", parent128, 0L);
-      } else {
-        span = TRACER.startSpan("test", "test.op", 0L);
-        span.setSamplingPriority(PrioritySampling.USER_KEEP, SamplingMechanism.DEFAULT);
-      }
-      span.finish(0L);
-      spans.add((DDSpan) span);
-    }
-    return spans;
-  }
-
-  /**
-   * Resolves the {@link AgentSpanContext} for a spec: the span's own context, or null if no
-   * context.
-   */
-  @Nullable
-  private static AgentSpanContext resolveContext(List<DDSpan> spans, LogSpec spec) {
-    if (spec.spanContextIndex < 0) {
-      return null;
+        return groups;
     }
-    DDSpan span = spans.get(spec.spanContextIndex);
-    return span.spanContext();
-  }
 
-  // ── grouping helper ───────────────────────────────────────────────────────
+    // ── verification helpers ──────────────────────────────────────────────────
 
-  private static Map<String, List<LogSpec>> groupByScope(List<LogSpec> specs) {
-    Map<String, List<LogSpec>> groups = new LinkedHashMap<>();
-    for (LogSpec spec : specs) {
-      groups.computeIfAbsent(spec.scope.getName().toString(), k -> new ArrayList<>()).add(spec);
-    }
-    return groups;
-  }
-
-  // ── verification helpers ──────────────────────────────────────────────────
-
-  /**
-   * Parses a {@code Resource} message body and asserts it contains a {@code service.name}
-   * attribute.
-   */
-  private static void verifyResource(CodedInputStream resource) throws IOException {
-    boolean foundServiceName = false;
-    while (!resource.isAtEnd()) {
-      int tag = resource.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 1) {
-        String key = readKeyValueKey(resource.readBytes().newCodedInput());
-        if ("service.name".equals(key)) {
-          foundServiceName = true;
+    /**
+     * Parses a {@code Resource} message body and asserts it contains a {@code service.name}
+     * attribute.
+     */
+    private static void verifyResource(CodedInputStream resource) throws IOException {
+        boolean foundServiceName = false;
+        while (!resource.isAtEnd()) {
+            int tag = resource.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 1) {
+                String key = readKeyValueKey(resource.readBytes().newCodedInput());
+                if ("service.name".equals(key)) {
+                    foundServiceName = true;
+                }
+            } else {
+                resource.skipField(tag);
+            }
         }
-      } else {
-        resource.skipField(tag);
-      }
+        assertTrue(foundServiceName, "Resource must contain a 'service.name' attribute");
     }
-    assertTrue(foundServiceName, "Resource must contain a 'service.name' attribute");
-  }
-
-  /**
-   * Parses a {@code ScopeLogs} message body into a {@link ParsedScope} containing the scope
-   * identity and raw bytes of each {@code log_records} entry.
-   *
-   * <pre>
-   *   ScopeLogs { scope=1, log_records=2, schema_url=3 }
-   * </pre>
-   */
-  private static ParsedScope parseScopeLogs(CodedInputStream scopeLogs, String caseName)
-      throws IOException {
-    String name = null;
-    String version = null;
-    String schemaUrl = null;
-    List<byte[]> logRecords = new ArrayList<>();
-    boolean scopeFound = false;
-    while (!scopeLogs.isAtEnd()) {
-      int tag = scopeLogs.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 1:
-          CodedInputStream scopeStream = scopeLogs.readBytes().newCodedInput();
-          scopeFound = true;
-          while (!scopeStream.isAtEnd()) {
-            int scopeTag = scopeStream.readTag();
-            switch (WireFormat.getTagFieldNumber(scopeTag)) {
-              case 1:
-                name = scopeStream.readString();
-                break;
-              case 2:
-                version = scopeStream.readString();
-                break;
-              default:
-                scopeStream.skipField(scopeTag);
+
+    /**
+     * Parses a {@code ScopeLogs} message body into a {@link ParsedScope} containing the scope
+     * identity and raw bytes of each {@code log_records} entry.
+     *
+     * <pre>
+     *   ScopeLogs { scope=1, log_records=2, schema_url=3 }
+     * </pre>
+     */
+    private static ParsedScope parseScopeLogs(CodedInputStream scopeLogs, String caseName) throws IOException {
+        String name = null;
+        String version = null;
+        String schemaUrl = null;
+        List<byte[]> logRecords = new ArrayList<>();
+        boolean scopeFound = false;
+        while (!scopeLogs.isAtEnd()) {
+            int tag = scopeLogs.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 1:
+                    CodedInputStream scopeStream = scopeLogs.readBytes().newCodedInput();
+                    scopeFound = true;
+                    while (!scopeStream.isAtEnd()) {
+                        int scopeTag = scopeStream.readTag();
+                        switch (WireFormat.getTagFieldNumber(scopeTag)) {
+                            case 1:
+                                name = scopeStream.readString();
+                                break;
+                            case 2:
+                                version = scopeStream.readString();
+                                break;
+                            default:
+                                scopeStream.skipField(scopeTag);
+                        }
+                    }
+                    break;
+                case 2:
+                    logRecords.add(scopeLogs.readBytes().toByteArray());
+                    break;
+                case 3:
+                    schemaUrl = scopeLogs.readString();
+                    break;
+                default:
+                    scopeLogs.skipField(tag);
             }
-          }
-          break;
-        case 2:
-          logRecords.add(scopeLogs.readBytes().toByteArray());
-          break;
-        case 3:
-          schemaUrl = scopeLogs.readString();
-          break;
-        default:
-          scopeLogs.skipField(tag);
-      }
+        }
+        assertTrue(scopeFound, "InstrumentationScope must be present in ScopeLogs [" + caseName + "]");
+        return new ParsedScope(name, version, schemaUrl, logRecords);
     }
-    assertTrue(scopeFound, "InstrumentationScope must be present in ScopeLogs [" + caseName + "]");
-    return new ParsedScope(name, version, schemaUrl, logRecords);
-  }
-
-  /** Verifies that a parsed scope's identity fields match the expected scope. */
-  private static void verifyScope(
-      ParsedScope parsed, OtelInstrumentationScope expected, String caseName) {
-    assertEquals(
-        expected.getName().toString(), parsed.name, "scope.name mismatch [" + caseName + "]");
-    String expectedVersion =
-        expected.getVersion() != null ? expected.getVersion().toString() : null;
-    assertEquals(expectedVersion, parsed.version, "scope.version mismatch [" + caseName + "]");
-    String expectedSchemaUrl =
-        expected.getSchemaUrl() != null ? expected.getSchemaUrl().toString() : null;
-    assertEquals(expectedSchemaUrl, parsed.schemaUrl, "schema_url mismatch [" + caseName + "]");
-  }
-
-  /**
-   * Parses a {@code LogRecord} message body and verifies all fields against the spec.
-   *
-   * <pre>
-   *   LogRecord { time_unix_nano=1, severity_number=2, severity_text=3, body=5,
-   *               attributes=6, flags=8, trace_id=9, span_id=10,
-   *               observed_time_unix_nano=11, event_name=12 }
-   * </pre>
-   */
-  private static void verifyLogRecord(
-      CodedInputStream logRecord, LogSpec spec, @Nullable AgentSpanContext ctx, String caseName)
-      throws IOException {
-    long parsedTimestamp = -1;
-    long parsedObserved = -1;
-    int parsedSeverityNumber = -1;
-    String parsedSeverityText = null;
-    String parsedBody = null;
-    Set<String> attrKeys = new HashSet<>();
-    int parsedFlags = 0;
-    boolean flagsFound = false;
-    byte[] parsedTraceId = null;
-    byte[] parsedSpanId = null;
-    String parsedEventName = null;
-
-    while (!logRecord.isAtEnd()) {
-      int tag = logRecord.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 1:
-          parsedTimestamp = logRecord.readFixed64();
-          break;
-        case 2:
-          parsedSeverityNumber = logRecord.readEnum();
-          break;
-        case 3:
-          parsedSeverityText = logRecord.readString();
-          break;
-        case 5:
-          parsedBody = readBodyString(logRecord.readBytes().newCodedInput());
-          break;
-        case 6:
-          attrKeys.add(readKeyValueKey(logRecord.readBytes().newCodedInput()));
-          break;
-        case 8:
-          parsedFlags = logRecord.readFixed32();
-          flagsFound = true;
-          break;
-        case 9:
-          parsedTraceId = logRecord.readBytes().toByteArray();
-          break;
-        case 10:
-          parsedSpanId = logRecord.readBytes().toByteArray();
-          break;
-        case 11:
-          parsedObserved = logRecord.readFixed64();
-          break;
-        case 12:
-          parsedEventName = logRecord.readString();
-          break;
-        default:
-          logRecord.skipField(tag);
-      }
+
+    /** Verifies that a parsed scope's identity fields match the expected scope. */
+    private static void verifyScope(ParsedScope parsed, OtelInstrumentationScope expected, String caseName) {
+        assertEquals(expected.getName().toString(), parsed.name, "scope.name mismatch [" + caseName + "]");
+        String expectedVersion =
+                expected.getVersion() != null ? expected.getVersion().toString() : null;
+        assertEquals(expectedVersion, parsed.version, "scope.version mismatch [" + caseName + "]");
+        String expectedSchemaUrl =
+                expected.getSchemaUrl() != null ? expected.getSchemaUrl().toString() : null;
+        assertEquals(expectedSchemaUrl, parsed.schemaUrl, "schema_url mismatch [" + caseName + "]");
     }
 
-    // ── timestamps ────────────────────────────────────────────────────────────
-    assertEquals(
-        spec.timestampNanos, parsedTimestamp, "time_unix_nano mismatch [" + caseName + "]");
-    assertEquals(
-        spec.observedNanos, parsedObserved, "observed_time_unix_nano mismatch [" + caseName + "]");
+    /**
+     * Parses a {@code LogRecord} message body and verifies all fields against the spec.
+     *
+     * <pre>
+     *   LogRecord { time_unix_nano=1, severity_number=2, severity_text=3, body=5,
+     *               attributes=6, flags=8, trace_id=9, span_id=10,
+     *               observed_time_unix_nano=11, event_name=12 }
+     * </pre>
+     */
+    private static void verifyLogRecord(
+            CodedInputStream logRecord, LogSpec spec, @Nullable AgentSpanContext ctx, String caseName)
+            throws IOException {
+        long parsedTimestamp = -1;
+        long parsedObserved = -1;
+        int parsedSeverityNumber = -1;
+        String parsedSeverityText = null;
+        String parsedBody = null;
+        Set<String> attrKeys = new HashSet<>();
+        int parsedFlags = 0;
+        boolean flagsFound = false;
+        byte[] parsedTraceId = null;
+        byte[] parsedSpanId = null;
+        String parsedEventName = null;
+
+        while (!logRecord.isAtEnd()) {
+            int tag = logRecord.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 1:
+                    parsedTimestamp = logRecord.readFixed64();
+                    break;
+                case 2:
+                    parsedSeverityNumber = logRecord.readEnum();
+                    break;
+                case 3:
+                    parsedSeverityText = logRecord.readString();
+                    break;
+                case 5:
+                    parsedBody = readBodyString(logRecord.readBytes().newCodedInput());
+                    break;
+                case 6:
+                    attrKeys.add(readKeyValueKey(logRecord.readBytes().newCodedInput()));
+                    break;
+                case 8:
+                    parsedFlags = logRecord.readFixed32();
+                    flagsFound = true;
+                    break;
+                case 9:
+                    parsedTraceId = logRecord.readBytes().toByteArray();
+                    break;
+                case 10:
+                    parsedSpanId = logRecord.readBytes().toByteArray();
+                    break;
+                case 11:
+                    parsedObserved = logRecord.readFixed64();
+                    break;
+                case 12:
+                    parsedEventName = logRecord.readString();
+                    break;
+                default:
+                    logRecord.skipField(tag);
+            }
+        }
+
+        // ── timestamps ────────────────────────────────────────────────────────────
+        assertEquals(spec.timestampNanos, parsedTimestamp, "time_unix_nano mismatch [" + caseName + "]");
+        assertEquals(spec.observedNanos, parsedObserved, "observed_time_unix_nano mismatch [" + caseName + "]");
+
+        // ── severity ──────────────────────────────────────────────────────────────
+        assertEquals(spec.severityNumber, parsedSeverityNumber, "severity_number mismatch [" + caseName + "]");
+        assertEquals(spec.severityText, parsedSeverityText, "severity_text mismatch [" + caseName + "]");
+
+        // ── body ──────────────────────────────────────────────────────────────────
+        assertEquals(spec.body, parsedBody, "body mismatch [" + caseName + "]");
+
+        // ── event_name ────────────────────────────────────────────────────────────
+        assertEquals(spec.eventName, parsedEventName, "event_name mismatch [" + caseName + "]");
 
-    // ── severity ──────────────────────────────────────────────────────────────
-    assertEquals(
-        spec.severityNumber, parsedSeverityNumber, "severity_number mismatch [" + caseName + "]");
-    assertEquals(
-        spec.severityText, parsedSeverityText, "severity_text mismatch [" + caseName + "]");
+        // ── attributes ────────────────────────────────────────────────────────────
+        for (String key : spec.attrs.keySet()) {
+            assertTrue(attrKeys.contains(key), "attribute '" + key + "' must be present [" + caseName + "]");
+        }
 
-    // ── body ──────────────────────────────────────────────────────────────────
-    assertEquals(spec.body, parsedBody, "body mismatch [" + caseName + "]");
+        // ── span context fields (trace_id=9, span_id=10, flags=8) ─────────────────
+        if (ctx == null) {
+            assertNull(parsedTraceId, "trace_id must be absent when no span context [" + caseName + "]");
+            assertNull(parsedSpanId, "span_id must be absent when no span context [" + caseName + "]");
+            assertFalse(flagsFound, "flags must be absent when no span context [" + caseName + "]");
+        } else {
+            assertNotNull(parsedTraceId, "trace_id must be present [" + caseName + "]");
+            assertEquals(16, parsedTraceId.length, "trace_id must be 16 bytes [" + caseName + "]");
+            assertNotNull(parsedSpanId, "span_id must be present [" + caseName + "]");
+            assertEquals(8, parsedSpanId.length, "span_id must be 8 bytes [" + caseName + "]");
+            assertEquals(ctx.getSpanId(), readBigEndianLong(parsedSpanId), "span_id mismatch [" + caseName + "]");
+            if (ctx.getSamplingPriority() > 0) {
+                assertTrue(
+                        (parsedFlags & SAMPLED_TRACE_FLAG) != 0,
+                        "SAMPLED flag must be set in flags [" + caseName + "]");
+            }
+            if (spec.use128BitTraceId) {
+                long highOrderBytes = readBigEndianLong(parsedTraceId);
+                assertNotEquals(
+                        0L, highOrderBytes, "128-bit trace_id high-order bytes must be non-zero [" + caseName + "]");
+            }
+        }
+    }
 
-    // ── event_name ────────────────────────────────────────────────────────────
-    assertEquals(spec.eventName, parsedEventName, "event_name mismatch [" + caseName + "]");
+    // ── proto parsing helpers ─────────────────────────────────────────────────
 
-    // ── attributes ────────────────────────────────────────────────────────────
-    for (String key : spec.attrs.keySet()) {
-      assertTrue(
-          attrKeys.contains(key), "attribute '" + key + "' must be present [" + caseName + "]");
+    private static String logKey(LogSpec spec) {
+        return spec.body != null ? spec.body : "~event:" + spec.eventName;
     }
 
-    // ── span context fields (trace_id=9, span_id=10, flags=8) ─────────────────
-    if (ctx == null) {
-      assertNull(parsedTraceId, "trace_id must be absent when no span context [" + caseName + "]");
-      assertNull(parsedSpanId, "span_id must be absent when no span context [" + caseName + "]");
-      assertFalse(flagsFound, "flags must be absent when no span context [" + caseName + "]");
-    } else {
-      assertNotNull(parsedTraceId, "trace_id must be present [" + caseName + "]");
-      assertEquals(16, parsedTraceId.length, "trace_id must be 16 bytes [" + caseName + "]");
-      assertNotNull(parsedSpanId, "span_id must be present [" + caseName + "]");
-      assertEquals(8, parsedSpanId.length, "span_id must be 8 bytes [" + caseName + "]");
-      assertEquals(
-          ctx.getSpanId(), readBigEndianLong(parsedSpanId), "span_id mismatch [" + caseName + "]");
-      if (ctx.getSamplingPriority() > 0) {
-        assertTrue(
-            (parsedFlags & SAMPLED_TRACE_FLAG) != 0,
-            "SAMPLED flag must be set in flags [" + caseName + "]");
-      }
-      if (spec.use128BitTraceId) {
-        long highOrderBytes = readBigEndianLong(parsedTraceId);
-        assertNotEquals(
-            0L,
-            highOrderBytes,
-            "128-bit trace_id high-order bytes must be non-zero [" + caseName + "]");
-      }
+    private static String parseLogKey(byte[] blob) throws IOException {
+        CodedInputStream logRecord = CodedInputStream.newInstance(blob);
+        String body = null;
+        String eventName = null;
+        while (!logRecord.isAtEnd()) {
+            int tag = logRecord.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 5:
+                    body = readBodyString(logRecord.readBytes().newCodedInput());
+                    break;
+                case 12:
+                    eventName = logRecord.readString();
+                    break;
+                default:
+                    logRecord.skipField(tag);
+            }
+        }
+        return body != null ? body : "~event:" + eventName;
     }
-  }
-
-  // ── proto parsing helpers ─────────────────────────────────────────────────
-
-  private static String logKey(LogSpec spec) {
-    return spec.body != null ? spec.body : "~event:" + spec.eventName;
-  }
-
-  private static String parseLogKey(byte[] blob) throws IOException {
-    CodedInputStream logRecord = CodedInputStream.newInstance(blob);
-    String body = null;
-    String eventName = null;
-    while (!logRecord.isAtEnd()) {
-      int tag = logRecord.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 5:
-          body = readBodyString(logRecord.readBytes().newCodedInput());
-          break;
-        case 12:
-          eventName = logRecord.readString();
-          break;
-        default:
-          logRecord.skipField(tag);
-      }
+
+    /**
+     * Reads a {@code AnyValue} body and returns the string value from field 1 ({@code string_value}).
+     */
+    private static String readBodyString(CodedInputStream anyValue) throws IOException {
+        while (!anyValue.isAtEnd()) {
+            int tag = anyValue.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 1) {
+                return anyValue.readString();
+            }
+            anyValue.skipField(tag);
+        }
+        return null;
     }
-    return body != null ? body : "~event:" + eventName;
-  }
-
-  /**
-   * Reads a {@code AnyValue} body and returns the string value from field 1 ({@code string_value}).
-   */
-  private static String readBodyString(CodedInputStream anyValue) throws IOException {
-    while (!anyValue.isAtEnd()) {
-      int tag = anyValue.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 1) {
-        return anyValue.readString();
-      }
-      anyValue.skipField(tag);
+
+    /**
+     * Reads a {@code KeyValue} body and returns the key (field 1). The value is skipped; its encoding
+     * is covered by {@code OtlpCommonProtoTest}.
+     */
+    private static String readKeyValueKey(CodedInputStream keyValue) throws IOException {
+        while (!keyValue.isAtEnd()) {
+            int tag = keyValue.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 1) {
+                return keyValue.readString();
+            }
+            keyValue.skipField(tag);
+        }
+        return null;
     }
-    return null;
-  }
-
-  /**
-   * Reads a {@code KeyValue} body and returns the key (field 1). The value is skipped; its encoding
-   * is covered by {@code OtlpCommonProtoTest}.
-   */
-  private static String readKeyValueKey(CodedInputStream keyValue) throws IOException {
-    while (!keyValue.isAtEnd()) {
-      int tag = keyValue.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 1) {
-        return keyValue.readString();
-      }
-      keyValue.skipField(tag);
+
+    /** Returns the {@link OtlpAttributeVisitor} type constant for a given value. */
+    private static int attrType(Object value) {
+        if (value instanceof String) return STRING_ATTRIBUTE;
+        if (value instanceof Boolean) return BOOLEAN_ATTRIBUTE;
+        if (value instanceof Long) return LONG_ATTRIBUTE;
+        if (value instanceof Double) return DOUBLE_ATTRIBUTE;
+        throw new IllegalArgumentException("Unsupported attribute type: " + value.getClass());
     }
-    return null;
-  }
-
-  /** Returns the {@link OtlpAttributeVisitor} type constant for a given value. */
-  private static int attrType(Object value) {
-    if (value instanceof String) return STRING_ATTRIBUTE;
-    if (value instanceof Boolean) return BOOLEAN_ATTRIBUTE;
-    if (value instanceof Long) return LONG_ATTRIBUTE;
-    if (value instanceof Double) return DOUBLE_ATTRIBUTE;
-    throw new IllegalArgumentException("Unsupported attribute type: " + value.getClass());
-  }
-
-  /** Reads a big-endian 64-bit value from the first 8 bytes of the given array. */
-  private static long readBigEndianLong(byte[] bytes) {
-    long value = 0;
-    for (int i = 0; i < 8; i++) {
-      value = (value << 8) | (bytes[i] & 0xFF);
+
+    /** Reads a big-endian 64-bit value from the first 8 bytes of the given array. */
+    private static long readBigEndianLong(byte[] bytes) {
+        long value = 0;
+        for (int i = 0; i < 8; i++) {
+            value = (value << 8) | (bytes[i] & 0xFF);
+        }
+        return value;
     }
-    return value;
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsServiceTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsServiceTest.java
index 0954e0e56d2..6912b6ae47d 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsServiceTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsServiceTest.java
@@ -12,16 +12,16 @@
 
 class OtlpLogsServiceTest {
 
-  @Test
-  void httpJsonProtocolUsesJsonCollectorAndConfiguredEndpoint() {
-    Properties properties = new Properties();
-    properties.setProperty(OTLP_LOGS_PROTOCOL, "http/json");
-    properties.setProperty(OTLP_LOGS_ENDPOINT, "http://localhost:4318/v1/logs");
+    @Test
+    void httpJsonProtocolUsesJsonCollectorAndConfiguredEndpoint() {
+        Properties properties = new Properties();
+        properties.setProperty(OTLP_LOGS_PROTOCOL, "http/json");
+        properties.setProperty(OTLP_LOGS_ENDPOINT, "http://localhost:4318/v1/logs");
 
-    OtlpLogsService service = new OtlpLogsService(Config.get(properties));
+        OtlpLogsService service = new OtlpLogsService(Config.get(properties));
 
-    assertInstanceOf(OtlpLogsJsonCollector.class, service.getCollector());
-    OtlpHttpSender sender = assertInstanceOf(OtlpHttpSender.class, service.getSender());
-    assertEquals("http://localhost:4318/v1/logs", sender.url().toString());
-  }
+        assertInstanceOf(OtlpLogsJsonCollector.class, service.getCollector());
+        OtlpHttpSender sender = assertInstanceOf(OtlpHttpSender.class, service.getSender());
+        assertEquals("http://localhost:4318/v1/logs", sender.url().toString());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpMetricsJsonCollectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpMetricsJsonCollectorTest.java
index a3cbf6a0637..f56a6948f5b 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpMetricsJsonCollectorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpMetricsJsonCollectorTest.java
@@ -35,216 +35,175 @@
  */
 class OtlpMetricsJsonCollectorTest {
 
-  private static final long START_EPOCH_NS = TimeUnit.SECONDS.toNanos(1330837567);
-  private static final long END_EPOCH_NS = START_EPOCH_NS + TimeUnit.MINUTES.toNanos(30);
-
-  @Test
-  void emptyRegistryProducesEmptyPayload() {
-    OtlpMetricsJsonCollector collector = new OtlpMetricsJsonCollector(new ControllableTimeSource());
-    OtlpPayload payload = collector.collectMetrics(visitor -> {});
-    assertEquals(OtlpPayload.EMPTY, payload);
-  }
-
-  @Test
-  void metricWithNoDataPointsContributesNothing() throws IOException {
-    OtelInstrumentDescriptor descriptor =
-        new OtelInstrumentDescriptor("unused", COUNTER, true, null, null);
-
-    OtlpPayload payload =
-        collect(
-            visitor -> {
-              OtlpScopedMetricsVisitor scoped =
-                  visitor.visitScopedMetrics(new OtelInstrumentationScope("io.test", null, null));
-              scoped.visitMetric(descriptor); // never visited with an attribute or data point
-            });
-
-    assertEquals(OtlpPayload.EMPTY, payload);
-  }
-
-  @Test
-  void scopeWithNoDataPointsContributesNothingWhenAnotherScopeHasData() throws IOException {
-    OtelInstrumentDescriptor emptyDescriptor =
-        new OtelInstrumentDescriptor("unused", COUNTER, true, null, null);
-
-    OtlpPayload payload =
-        collect(
-            visitor -> {
-              OtlpScopedMetricsVisitor emptyScope =
-                  visitor.visitScopedMetrics(new OtelInstrumentationScope("io.empty", null, null));
-              emptyScope.visitMetric(emptyDescriptor); // never visited with a data point
-
-              OtlpScopedMetricsVisitor dataScope =
-                  visitor.visitScopedMetrics(new OtelInstrumentationScope("io.data", null, null));
-              OtlpMetricVisitor mv =
-                  dataScope.visitMetric(
-                      new OtelInstrumentDescriptor("requests", COUNTER, true, null, null));
-              mv.visitDataPoint(new OtlpLongPoint(1L));
-            });
-
-    List<Object> scopeMetrics = onlyScopeMetrics(payload);
-    assertEquals(1, scopeMetrics.size(), "the empty scope must not appear in the payload");
-
-    Map<String, Object> scopeMetric = (Map<String, Object>) scopeMetrics.get(0);
-    Map<String, Object> scope = (Map<String, Object>) scopeMetric.get("scope");
-    assertEquals("io.data", scope.get("name"));
-  }
-
-  @Test
-  void gaugeHasNoStartTimeOrTemporality() throws IOException {
-    Map<String, Object> metric =
-        onlyMetric(
-            collect(
-                visitor -> {
-                  OtlpScopedMetricsVisitor scoped =
-                      visitor.visitScopedMetrics(
-                          new OtelInstrumentationScope("io.gauge", null, null));
-                  OtlpMetricVisitor mv =
-                      scoped.visitMetric(
-                          new OtelInstrumentDescriptor("connections", GAUGE, false, null, null));
-                  mv.visitDataPoint(new OtlpDoublePoint(5.0));
-                }));
-
-    assertEquals("connections", metric.get("name"));
-    Map<String, Object> gauge = (Map<String, Object>) metric.get("gauge");
-    List<Object> dataPoints = (List<Object>) gauge.get("dataPoints");
-    assertEquals(1, dataPoints.size());
-    Map<String, Object> point = (Map<String, Object>) dataPoints.get(0);
-    assertFalse(point.containsKey("startTimeUnixNano"), "gauges have no start time");
-    assertEquals(Long.toString(END_EPOCH_NS), point.get("timeUnixNano"));
-    assertEquals(5.0, ((Number) point.get("asDouble")).doubleValue());
-  }
-
-  @Test
-  void counterIsMonotonicSumWithIntegerTemporalityAndDecimalStringValue() throws IOException {
-    Map<String, Object> metric =
-        onlyMetric(
-            collect(
-                visitor -> {
-                  OtlpScopedMetricsVisitor scoped =
-                      visitor.visitScopedMetrics(
-                          new OtelInstrumentationScope("io.test", null, null));
-                  OtlpMetricVisitor mv =
-                      scoped.visitMetric(
-                          new OtelInstrumentDescriptor("requests", COUNTER, true, null, null));
-                  mv.visitAttribute(STRING_ATTRIBUTE, "method", "GET");
-                  mv.visitDataPoint(new OtlpLongPoint(42L));
-                }));
-
-    Map<String, Object> sum = (Map<String, Object>) metric.get("sum");
-    assertTrue(((Number) sum.get("aggregationTemporality")).intValue() >= 1);
-    assertEquals(Boolean.TRUE, sum.get("isMonotonic"));
-
-    List<Object> dataPoints = (List<Object>) sum.get("dataPoints");
-    Map<String, Object> point = (Map<String, Object>) dataPoints.get(0);
-    assertEquals(Long.toString(START_EPOCH_NS), point.get("startTimeUnixNano"));
-    assertEquals(Long.toString(END_EPOCH_NS), point.get("timeUnixNano"));
-    assertEquals("42", point.get("asInt"));
-
-    List<Object> attributes = (List<Object>) point.get("attributes");
-    Map<String, Object> attr = (Map<String, Object>) attributes.get(0);
-    assertEquals("method", attr.get("key"));
-  }
-
-  @Test
-  void histogramWithOverflowBoundaryOmitsInfinityAndAppendsNoExtraZero() throws IOException {
-    Map<String, Object> metric =
-        onlyMetric(
-            collect(
-                visitor -> {
-                  OtlpScopedMetricsVisitor scoped =
-                      visitor.visitScopedMetrics(
-                          new OtelInstrumentationScope("io.hist", null, null));
-                  OtlpMetricVisitor mv =
-                      scoped.visitMetric(
-                          new OtelInstrumentDescriptor(
-                              "request.size", HISTOGRAM, false, null, null));
-                  mv.visitDataPoint(
-                      new OtlpHistogramPoint(
-                          5.0,
-                          Arrays.asList(100.0, Double.POSITIVE_INFINITY),
-                          Arrays.asList(4.0, 1.0),
-                          280.0,
-                          20.0,
-                          200.0));
-                }));
-
-    Map<String, Object> histogram = (Map<String, Object>) metric.get("histogram");
-    List<Object> dataPoints = (List<Object>) histogram.get("dataPoints");
-    Map<String, Object> point = (Map<String, Object>) dataPoints.get(0);
-
-    assertEquals("5", point.get("count"));
-    assertEquals(280.0, ((Number) point.get("sum")).doubleValue());
-    assertEquals(20.0, ((Number) point.get("min")).doubleValue());
-    assertEquals(200.0, ((Number) point.get("max")).doubleValue());
-
-    List<Object> bounds = (List<Object>) point.get("explicitBounds");
-    assertEquals(Arrays.asList(100.0), bounds);
-
-    List<Object> counts = (List<Object>) point.get("bucketCounts");
-    assertEquals(Arrays.asList("4", "1"), counts);
-  }
-
-  @Test
-  void histogramWithoutOverflowBoundaryAppendsExtraZeroCount() throws IOException {
-    Map<String, Object> metric =
-        onlyMetric(
-            collect(
-                visitor -> {
-                  OtlpScopedMetricsVisitor scoped =
-                      visitor.visitScopedMetrics(
-                          new OtelInstrumentationScope("io.hist", null, null));
-                  OtlpMetricVisitor mv =
-                      scoped.visitMetric(
-                          new OtelInstrumentDescriptor("queue.size", HISTOGRAM, false, null, null));
-                  mv.visitDataPoint(
-                      new OtlpHistogramPoint(
-                          8.0,
-                          Arrays.asList(50.0, 100.0),
-                          Arrays.asList(3.0, 5.0),
-                          750.0,
-                          10.0,
-                          95.0));
-                }));
-
-    Map<String, Object> histogram = (Map<String, Object>) metric.get("histogram");
-    Map<String, Object> point =
-        (Map<String, Object>) ((List<Object>) histogram.get("dataPoints")).get(0);
-
-    List<Object> bounds = (List<Object>) point.get("explicitBounds");
-    assertEquals(Arrays.asList(50.0, 100.0), bounds);
-
-    List<Object> counts = (List<Object>) point.get("bucketCounts");
-    assertEquals(Arrays.asList("3", "5", "0"), counts, "extra zero count appended, no overflow");
-  }
-
-  // ── helpers ──────────────────────────────────────────────────────────────
-
-  private static OtlpPayload collect(Consumer<OtlpMetricsVisitor> body) {
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    timeSource.set(START_EPOCH_NS); // captured in constructor
-    OtlpMetricsJsonCollector collector = new OtlpMetricsJsonCollector(timeSource);
-    timeSource.set(END_EPOCH_NS); // captured during collection
-    return collector.collectMetrics(body::accept);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> onlyMetric(OtlpPayload payload) throws IOException {
-    List<Object> scopeMetrics = onlyScopeMetrics(payload);
-    Map<String, Object> scopeMetric = (Map<String, Object>) scopeMetrics.get(0);
-    List<Object> metrics = (List<Object>) scopeMetric.get("metrics");
-    assertEquals(1, metrics.size());
-    return (Map<String, Object>) metrics.get(0);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static List<Object> onlyScopeMetrics(OtlpPayload payload) throws IOException {
-    byte[] bytes = new byte[payload.getContentLength()];
-    payload.getContent().get(bytes);
-    String json = new String(bytes, StandardCharsets.UTF_8);
-    Map<String, Object> root = JsonMapper.fromJsonToMap(json);
-
-    List<Object> resourceMetrics = (List<Object>) root.get("resourceMetrics");
-    Map<String, Object> resourceMetric = (Map<String, Object>) resourceMetrics.get(0);
-    return (List<Object>) resourceMetric.get("scopeMetrics");
-  }
+    private static final long START_EPOCH_NS = TimeUnit.SECONDS.toNanos(1330837567);
+    private static final long END_EPOCH_NS = START_EPOCH_NS + TimeUnit.MINUTES.toNanos(30);
+
+    @Test
+    void emptyRegistryProducesEmptyPayload() {
+        OtlpMetricsJsonCollector collector = new OtlpMetricsJsonCollector(new ControllableTimeSource());
+        OtlpPayload payload = collector.collectMetrics(visitor -> {});
+        assertEquals(OtlpPayload.EMPTY, payload);
+    }
+
+    @Test
+    void metricWithNoDataPointsContributesNothing() throws IOException {
+        OtelInstrumentDescriptor descriptor = new OtelInstrumentDescriptor("unused", COUNTER, true, null, null);
+
+        OtlpPayload payload = collect(visitor -> {
+            OtlpScopedMetricsVisitor scoped =
+                    visitor.visitScopedMetrics(new OtelInstrumentationScope("io.test", null, null));
+            scoped.visitMetric(descriptor); // never visited with an attribute or data point
+        });
+
+        assertEquals(OtlpPayload.EMPTY, payload);
+    }
+
+    @Test
+    void scopeWithNoDataPointsContributesNothingWhenAnotherScopeHasData() throws IOException {
+        OtelInstrumentDescriptor emptyDescriptor = new OtelInstrumentDescriptor("unused", COUNTER, true, null, null);
+
+        OtlpPayload payload = collect(visitor -> {
+            OtlpScopedMetricsVisitor emptyScope =
+                    visitor.visitScopedMetrics(new OtelInstrumentationScope("io.empty", null, null));
+            emptyScope.visitMetric(emptyDescriptor); // never visited with a data point
+
+            OtlpScopedMetricsVisitor dataScope =
+                    visitor.visitScopedMetrics(new OtelInstrumentationScope("io.data", null, null));
+            OtlpMetricVisitor mv =
+                    dataScope.visitMetric(new OtelInstrumentDescriptor("requests", COUNTER, true, null, null));
+            mv.visitDataPoint(new OtlpLongPoint(1L));
+        });
+
+        List<Object> scopeMetrics = onlyScopeMetrics(payload);
+        assertEquals(1, scopeMetrics.size(), "the empty scope must not appear in the payload");
+
+        Map<String, Object> scopeMetric = (Map<String, Object>) scopeMetrics.get(0);
+        Map<String, Object> scope = (Map<String, Object>) scopeMetric.get("scope");
+        assertEquals("io.data", scope.get("name"));
+    }
+
+    @Test
+    void gaugeHasNoStartTimeOrTemporality() throws IOException {
+        Map<String, Object> metric = onlyMetric(collect(visitor -> {
+            OtlpScopedMetricsVisitor scoped =
+                    visitor.visitScopedMetrics(new OtelInstrumentationScope("io.gauge", null, null));
+            OtlpMetricVisitor mv =
+                    scoped.visitMetric(new OtelInstrumentDescriptor("connections", GAUGE, false, null, null));
+            mv.visitDataPoint(new OtlpDoublePoint(5.0));
+        }));
+
+        assertEquals("connections", metric.get("name"));
+        Map<String, Object> gauge = (Map<String, Object>) metric.get("gauge");
+        List<Object> dataPoints = (List<Object>) gauge.get("dataPoints");
+        assertEquals(1, dataPoints.size());
+        Map<String, Object> point = (Map<String, Object>) dataPoints.get(0);
+        assertFalse(point.containsKey("startTimeUnixNano"), "gauges have no start time");
+        assertEquals(Long.toString(END_EPOCH_NS), point.get("timeUnixNano"));
+        assertEquals(5.0, ((Number) point.get("asDouble")).doubleValue());
+    }
+
+    @Test
+    void counterIsMonotonicSumWithIntegerTemporalityAndDecimalStringValue() throws IOException {
+        Map<String, Object> metric = onlyMetric(collect(visitor -> {
+            OtlpScopedMetricsVisitor scoped =
+                    visitor.visitScopedMetrics(new OtelInstrumentationScope("io.test", null, null));
+            OtlpMetricVisitor mv =
+                    scoped.visitMetric(new OtelInstrumentDescriptor("requests", COUNTER, true, null, null));
+            mv.visitAttribute(STRING_ATTRIBUTE, "method", "GET");
+            mv.visitDataPoint(new OtlpLongPoint(42L));
+        }));
+
+        Map<String, Object> sum = (Map<String, Object>) metric.get("sum");
+        assertTrue(((Number) sum.get("aggregationTemporality")).intValue() >= 1);
+        assertEquals(Boolean.TRUE, sum.get("isMonotonic"));
+
+        List<Object> dataPoints = (List<Object>) sum.get("dataPoints");
+        Map<String, Object> point = (Map<String, Object>) dataPoints.get(0);
+        assertEquals(Long.toString(START_EPOCH_NS), point.get("startTimeUnixNano"));
+        assertEquals(Long.toString(END_EPOCH_NS), point.get("timeUnixNano"));
+        assertEquals("42", point.get("asInt"));
+
+        List<Object> attributes = (List<Object>) point.get("attributes");
+        Map<String, Object> attr = (Map<String, Object>) attributes.get(0);
+        assertEquals("method", attr.get("key"));
+    }
+
+    @Test
+    void histogramWithOverflowBoundaryOmitsInfinityAndAppendsNoExtraZero() throws IOException {
+        Map<String, Object> metric = onlyMetric(collect(visitor -> {
+            OtlpScopedMetricsVisitor scoped =
+                    visitor.visitScopedMetrics(new OtelInstrumentationScope("io.hist", null, null));
+            OtlpMetricVisitor mv =
+                    scoped.visitMetric(new OtelInstrumentDescriptor("request.size", HISTOGRAM, false, null, null));
+            mv.visitDataPoint(new OtlpHistogramPoint(
+                    5.0, Arrays.asList(100.0, Double.POSITIVE_INFINITY), Arrays.asList(4.0, 1.0), 280.0, 20.0, 200.0));
+        }));
+
+        Map<String, Object> histogram = (Map<String, Object>) metric.get("histogram");
+        List<Object> dataPoints = (List<Object>) histogram.get("dataPoints");
+        Map<String, Object> point = (Map<String, Object>) dataPoints.get(0);
+
+        assertEquals("5", point.get("count"));
+        assertEquals(280.0, ((Number) point.get("sum")).doubleValue());
+        assertEquals(20.0, ((Number) point.get("min")).doubleValue());
+        assertEquals(200.0, ((Number) point.get("max")).doubleValue());
+
+        List<Object> bounds = (List<Object>) point.get("explicitBounds");
+        assertEquals(Arrays.asList(100.0), bounds);
+
+        List<Object> counts = (List<Object>) point.get("bucketCounts");
+        assertEquals(Arrays.asList("4", "1"), counts);
+    }
+
+    @Test
+    void histogramWithoutOverflowBoundaryAppendsExtraZeroCount() throws IOException {
+        Map<String, Object> metric = onlyMetric(collect(visitor -> {
+            OtlpScopedMetricsVisitor scoped =
+                    visitor.visitScopedMetrics(new OtelInstrumentationScope("io.hist", null, null));
+            OtlpMetricVisitor mv =
+                    scoped.visitMetric(new OtelInstrumentDescriptor("queue.size", HISTOGRAM, false, null, null));
+            mv.visitDataPoint(new OtlpHistogramPoint(
+                    8.0, Arrays.asList(50.0, 100.0), Arrays.asList(3.0, 5.0), 750.0, 10.0, 95.0));
+        }));
+
+        Map<String, Object> histogram = (Map<String, Object>) metric.get("histogram");
+        Map<String, Object> point = (Map<String, Object>) ((List<Object>) histogram.get("dataPoints")).get(0);
+
+        List<Object> bounds = (List<Object>) point.get("explicitBounds");
+        assertEquals(Arrays.asList(50.0, 100.0), bounds);
+
+        List<Object> counts = (List<Object>) point.get("bucketCounts");
+        assertEquals(Arrays.asList("3", "5", "0"), counts, "extra zero count appended, no overflow");
+    }
+
+    // ── helpers ──────────────────────────────────────────────────────────────
+
+    private static OtlpPayload collect(Consumer<OtlpMetricsVisitor> body) {
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        timeSource.set(START_EPOCH_NS); // captured in constructor
+        OtlpMetricsJsonCollector collector = new OtlpMetricsJsonCollector(timeSource);
+        timeSource.set(END_EPOCH_NS); // captured during collection
+        return collector.collectMetrics(body::accept);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> onlyMetric(OtlpPayload payload) throws IOException {
+        List<Object> scopeMetrics = onlyScopeMetrics(payload);
+        Map<String, Object> scopeMetric = (Map<String, Object>) scopeMetrics.get(0);
+        List<Object> metrics = (List<Object>) scopeMetric.get("metrics");
+        assertEquals(1, metrics.size());
+        return (Map<String, Object>) metrics.get(0);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static List<Object> onlyScopeMetrics(OtlpPayload payload) throws IOException {
+        byte[] bytes = new byte[payload.getContentLength()];
+        payload.getContent().get(bytes);
+        String json = new String(bytes, StandardCharsets.UTF_8);
+        Map<String, Object> root = JsonMapper.fromJsonToMap(json);
+
+        List<Object> resourceMetrics = (List<Object>) root.get("resourceMetrics");
+        Map<String, Object> resourceMetric = (Map<String, Object>) resourceMetrics.get(0);
+        return (List<Object>) resourceMetric.get("scopeMetrics");
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpMetricsProtoTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpMetricsProtoTest.java
index 8cc2ac4ea81..7f30868cca0 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpMetricsProtoTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpMetricsProtoTest.java
@@ -71,1071 +71,995 @@
  */
 class OtlpMetricsProtoTest {
 
-  // ── spec classes (test-data descriptors) ──────────────────────────────────
-
-  static final class ScopeSpec {
-    final String name;
-    final String version; // null → absent from wire
-    final String schemaUrl; // null → absent from wire
-    final List<MetricSpec> metrics;
-
-    ScopeSpec(String name, String version, String schemaUrl, List<MetricSpec> metrics) {
-      this.name = name;
-      this.version = version;
-      this.schemaUrl = schemaUrl;
-      this.metrics = metrics;
+    // ── spec classes (test-data descriptors) ──────────────────────────────────
+
+    static final class ScopeSpec {
+        final String name;
+        final String version; // null → absent from wire
+        final String schemaUrl; // null → absent from wire
+        final List<MetricSpec> metrics;
+
+        ScopeSpec(String name, String version, String schemaUrl, List<MetricSpec> metrics) {
+            this.name = name;
+            this.version = version;
+            this.schemaUrl = schemaUrl;
+            this.metrics = metrics;
+        }
+
+        OtelInstrumentationScope toScope() {
+            return new OtelInstrumentationScope(name, version, schemaUrl);
+        }
     }
 
-    OtelInstrumentationScope toScope() {
-      return new OtelInstrumentationScope(name, version, schemaUrl);
+    static final class MetricSpec {
+        final String name;
+        final String description; // null → absent from wire
+        final String unit; // null → absent from wire
+        final OtelInstrumentType type;
+        final boolean longValues;
+        final OtlpDataPoint point;
+        final List<AttrSpec> attrs;
+
+        MetricSpec(
+                String name,
+                String description,
+                String unit,
+                OtelInstrumentType type,
+                boolean longValues,
+                OtlpDataPoint point,
+                List<AttrSpec> attrs) {
+            this.name = name;
+            this.description = description;
+            this.unit = unit;
+            this.type = type;
+            this.longValues = longValues;
+            this.point = point;
+            this.attrs = attrs;
+        }
+
+        OtelInstrumentDescriptor toDescriptor() {
+            return new OtelInstrumentDescriptor(name, type, longValues, description, unit);
+        }
     }
-  }
-
-  static final class MetricSpec {
-    final String name;
-    final String description; // null → absent from wire
-    final String unit; // null → absent from wire
-    final OtelInstrumentType type;
-    final boolean longValues;
-    final OtlpDataPoint point;
-    final List<AttrSpec> attrs;
-
-    MetricSpec(
-        String name,
-        String description,
-        String unit,
-        OtelInstrumentType type,
-        boolean longValues,
-        OtlpDataPoint point,
-        List<AttrSpec> attrs) {
-      this.name = name;
-      this.description = description;
-      this.unit = unit;
-      this.type = type;
-      this.longValues = longValues;
-      this.point = point;
-      this.attrs = attrs;
+
+    static final class AttrSpec {
+        final int type;
+        final String key;
+        final Object value;
+
+        AttrSpec(int type, String key, Object value) {
+            this.type = type;
+            this.key = key;
+            this.value = value;
+        }
     }
 
-    OtelInstrumentDescriptor toDescriptor() {
-      return new OtelInstrumentDescriptor(name, type, longValues, description, unit);
+    private static final class ParsedScopeMetrics {
+        final String name;
+        final String version;
+        final String schemaUrl;
+        final List<byte[]> metricBlobs;
+
+        ParsedScopeMetrics(String name, String version, String schemaUrl, List<byte[]> metricBlobs) {
+            this.name = name;
+            this.version = version;
+            this.schemaUrl = schemaUrl;
+            this.metricBlobs = metricBlobs;
+        }
     }
-  }
 
-  static final class AttrSpec {
-    final int type;
-    final String key;
-    final Object value;
+    // ── shorthand builders ────────────────────────────────────────────────────
 
-    AttrSpec(int type, String key, Object value) {
-      this.type = type;
-      this.key = key;
-      this.value = value;
+    private static ScopeSpec scope(String name, MetricSpec... metrics) {
+        return new ScopeSpec(name, null, null, asList(metrics));
     }
-  }
-
-  private static final class ParsedScopeMetrics {
-    final String name;
-    final String version;
-    final String schemaUrl;
-    final List<byte[]> metricBlobs;
-
-    ParsedScopeMetrics(String name, String version, String schemaUrl, List<byte[]> metricBlobs) {
-      this.name = name;
-      this.version = version;
-      this.schemaUrl = schemaUrl;
-      this.metricBlobs = metricBlobs;
+
+    private static ScopeSpec scopeFull(String name, String version, String schemaUrl, MetricSpec... metrics) {
+        return new ScopeSpec(name, version, schemaUrl, asList(metrics));
     }
-  }
-
-  // ── shorthand builders ────────────────────────────────────────────────────
-
-  private static ScopeSpec scope(String name, MetricSpec... metrics) {
-    return new ScopeSpec(name, null, null, asList(metrics));
-  }
-
-  private static ScopeSpec scopeFull(
-      String name, String version, String schemaUrl, MetricSpec... metrics) {
-    return new ScopeSpec(name, version, schemaUrl, asList(metrics));
-  }
-
-  private static MetricSpec counterLong(String name, long value, AttrSpec... attrs) {
-    return new MetricSpec(name, null, null, COUNTER, true, longPoint(value), asList(attrs));
-  }
-
-  private static MetricSpec counterLongFull(
-      String name, String desc, String unit, long value, AttrSpec... attrs) {
-    return new MetricSpec(name, desc, unit, COUNTER, true, longPoint(value), asList(attrs));
-  }
-
-  private static MetricSpec counterDouble(String name, double value, AttrSpec... attrs) {
-    return new MetricSpec(name, null, null, COUNTER, false, doublePoint(value), asList(attrs));
-  }
-
-  private static MetricSpec gaugeLong(String name, long value) {
-    return new MetricSpec(name, null, null, GAUGE, true, longPoint(value), emptyList());
-  }
-
-  private static MetricSpec gaugeDouble(String name, double value) {
-    return new MetricSpec(name, null, null, GAUGE, false, doublePoint(value), emptyList());
-  }
-
-  private static MetricSpec upDownLong(String name, long value, AttrSpec... attrs) {
-    return new MetricSpec(name, null, null, UP_DOWN_COUNTER, true, longPoint(value), asList(attrs));
-  }
-
-  private static MetricSpec upDownDouble(String name, double value, AttrSpec... attrs) {
-    return new MetricSpec(
-        name, null, null, UP_DOWN_COUNTER, false, doublePoint(value), asList(attrs));
-  }
-
-  private static MetricSpec observableGaugeLong(String name, long value) {
-    return new MetricSpec(name, null, null, OBSERVABLE_GAUGE, true, longPoint(value), emptyList());
-  }
-
-  private static MetricSpec observableGaugeDouble(String name, double value) {
-    return new MetricSpec(
-        name, null, null, OBSERVABLE_GAUGE, false, doublePoint(value), emptyList());
-  }
-
-  private static MetricSpec observableCounterLong(String name, long value) {
-    return new MetricSpec(
-        name, null, null, OBSERVABLE_COUNTER, true, longPoint(value), emptyList());
-  }
-
-  private static MetricSpec observableCounterDouble(String name, double value) {
-    return new MetricSpec(
-        name, null, null, OBSERVABLE_COUNTER, false, doublePoint(value), emptyList());
-  }
-
-  private static MetricSpec observableUpDownCounterLong(String name, long value) {
-    return new MetricSpec(
-        name, null, null, OBSERVABLE_UP_DOWN_COUNTER, true, longPoint(value), emptyList());
-  }
-
-  private static MetricSpec observableUpDownCounterDouble(String name, double value) {
-    return new MetricSpec(
-        name, null, null, OBSERVABLE_UP_DOWN_COUNTER, false, doublePoint(value), emptyList());
-  }
-
-  private static MetricSpec histogram(
-      String name,
-      double count,
-      List<Double> bounds,
-      List<Double> counts,
-      double sum,
-      double min,
-      double max,
-      AttrSpec... attrs) {
-    return new MetricSpec(
-        name,
-        null,
-        null,
-        HISTOGRAM,
-        false,
-        histogramPoint(count, bounds, counts, sum, min, max),
-        asList(attrs));
-  }
-
-  private static AttrSpec strAttr(String key, String value) {
-    return new AttrSpec(STRING_ATTRIBUTE, key, value);
-  }
-
-  private static AttrSpec longAttr(String key, long value) {
-    return new AttrSpec(LONG_ATTRIBUTE, key, value);
-  }
-
-  private static AttrSpec boolAttr(String key, boolean value) {
-    return new AttrSpec(BOOLEAN_ATTRIBUTE, key, value);
-  }
-
-  private static AttrSpec dblAttr(String key, double value) {
-    return new AttrSpec(DOUBLE_ATTRIBUTE, key, value);
-  }
-
-  // ── test cases ─────────────────────────────────────────────────────────────
-
-  static Stream<Arguments> cases() {
-    return Stream.of(
-        // ── empty ─────────────────────────────────────────────────────────────
-        Arguments.of("empty — no scopes produces empty payload", emptyList()),
-
-        // ── scope with no metrics ─────────────────────────────────────────────
-        Arguments.of("scope with no metrics", asList(scope("io.empty"))),
-
-        // ── counter long boundary values ──────────────────────────────────────
-        Arguments.of(
-            "counter long zero — boundary", asList(scope("io.test", counterLong("requests", 0L)))),
-        Arguments.of(
-            "counter long Long.MAX_VALUE — boundary",
-            asList(scope("io.test", counterLong("requests", Long.MAX_VALUE)))),
-        Arguments.of(
-            "counter long Long.MIN_VALUE — negative boundary",
-            asList(scope("io.test", counterLong("requests", Long.MIN_VALUE)))),
-
-        // ── gauge long boundary values (no start time) ───────────────────────
-        Arguments.of("gauge long zero", asList(scope("io.gauge", gaugeLong("connections", 0L)))),
-        Arguments.of(
-            "gauge long Long.MAX_VALUE",
-            asList(scope("io.gauge", gaugeLong("connections", Long.MAX_VALUE)))),
-        Arguments.of(
-            "gauge long Long.MIN_VALUE — negative",
-            asList(scope("io.gauge", gaugeLong("balance", Long.MIN_VALUE)))),
-
-        // ── gauge double special values (no start time) ───────────────────────
-        Arguments.of("gauge double zero", asList(scope("io.gauge", gaugeDouble("rate", 0.0)))),
-        Arguments.of(
-            "gauge double -0.0 — negative zero",
-            asList(scope("io.gauge", gaugeDouble("temperature", -0.0)))),
-        Arguments.of(
-            "gauge double Double.MAX_VALUE",
-            asList(scope("io.gauge", gaugeDouble("temperature", Double.MAX_VALUE)))),
-        Arguments.of(
-            "gauge double +Infinity",
-            asList(scope("io.gauge", gaugeDouble("temperature", Double.POSITIVE_INFINITY)))),
-        Arguments.of(
-            "gauge double -Infinity",
-            asList(scope("io.gauge", gaugeDouble("temperature", Double.NEGATIVE_INFINITY)))),
-        Arguments.of(
-            "gauge double NaN", asList(scope("io.gauge", gaugeDouble("invalid", Double.NaN)))),
-
-        // ── up-down counter long (non-monotonic sum) ──────────────────────────
-        Arguments.of(
-            "up-down-counter long zero", asList(scope("io.test", upDownLong("queue.size", 0L)))),
-        Arguments.of(
-            "up-down-counter long Long.MAX_VALUE",
-            asList(scope("io.test", upDownLong("queue.size", Long.MAX_VALUE)))),
-        Arguments.of(
-            "up-down-counter long negative with string attr",
-            asList(scope("io.test", upDownLong("queue.size", -42L, strAttr("host", "my-host"))))),
-
-        // ── up-down counter double ────────────────────────────────────────────
-        Arguments.of(
-            "up-down-counter double positive",
-            asList(scope("io.test", upDownDouble("balance", 3.14)))),
-        Arguments.of(
-            "up-down-counter double negative",
-            asList(scope("io.test", upDownDouble("delta", -2.71)))),
-        Arguments.of(
-            "up-down-counter double zero", asList(scope("io.test", upDownDouble("offset", 0.0)))),
-
-        // ── counter double ────────────────────────────────────────────────────
-        Arguments.of(
-            "counter double zero — no attrs",
-            asList(scope("io.test", counterDouble("errors", 0.0)))),
-
-        // ── counter double with multiple attribute types ───────────────────────
-        Arguments.of(
-            "counter double with string, long, bool, double attrs",
-            asList(
-                scope(
-                    "io.test",
-                    counterDouble(
-                        "latency",
-                        3.14,
-                        strAttr("service", "web"),
-                        longAttr("status", 200L),
-                        boolAttr("success", true),
-                        dblAttr("rate", 0.5))))),
-
-        // ── histogram — overflow only (no explicit bounds) ────────────────────
-        Arguments.of(
-            "histogram no explicit bounds — overflow bucket only",
-            asList(
-                scope(
-                    "io.hist",
-                    histogram(
-                        "response.time",
-                        1.0,
-                        asList(Double.POSITIVE_INFINITY),
-                        asList(1.0),
-                        0.5,
-                        0.5,
-                        0.5)))),
-
-        // ── histogram — zero count and sum with overflow bucket ───────────────
-        Arguments.of(
-            "histogram zero count and sum",
-            asList(
-                scope(
-                    "io.hist",
-                    histogram(
-                        "idle.time",
-                        0.0,
-                        asList(Double.POSITIVE_INFINITY),
-                        asList(0.0),
-                        0.0,
-                        0.0,
-                        0.0)))),
-
-        // ── histogram — single explicit bound with overflow ───────────────────
-        Arguments.of(
-            "histogram single bound with overflow",
-            asList(
-                scope(
-                    "io.hist",
-                    histogram(
-                        "request.size",
-                        5.0,
-                        asList(100.0, Double.POSITIVE_INFINITY),
-                        asList(4.0, 1.0),
-                        280.0,
-                        20.0,
-                        200.0)))),
-
-        // ── histogram — finite bounds only (no overflow) — extra zero appended ─
-        Arguments.of(
-            "histogram finite bounds — no overflow — extra zero bucket appended",
-            asList(
-                scope(
-                    "io.hist",
-                    histogram(
-                        "queue.size",
-                        8.0,
-                        asList(50.0, 100.0),
-                        asList(3.0, 5.0),
-                        750.0,
-                        10.0,
-                        95.0)))),
-
-        // ── histogram — with explicit bounds, overflow, and attrs ─────────────
-        Arguments.of(
-            "histogram with bounds, overflow, and string attr",
-            asList(
-                scope(
-                    "io.hist",
-                    histogram(
-                        "response.time",
-                        10.0,
-                        asList(1.0, 5.0, 10.0, Double.POSITIVE_INFINITY),
-                        asList(2.0, 3.0, 4.0, 1.0),
-                        45.5,
-                        0.5,
-                        12.0,
-                        strAttr("region", "us-east"))))),
-
-        // ── histogram — many buckets with overflow and multiple attrs ──────────
-        Arguments.of(
-            "histogram many buckets with overflow, long and bool attrs",
-            asList(
-                scope(
-                    "io.hist",
-                    histogram(
-                        "latency.ms",
-                        100.0,
-                        asList(1.0, 2.0, 5.0, 10.0, 25.0, 50.0, 100.0, Double.POSITIVE_INFINITY),
-                        asList(5.0, 10.0, 20.0, 30.0, 15.0, 12.0, 6.0, 2.0),
-                        4321.0,
-                        0.5,
-                        150.0,
-                        longAttr("shard", 3L),
-                        boolAttr("cached", false))))),
-
-        // ── scope metadata — optional version and schema URL ──────────────────
-        Arguments.of(
-            "scope with version and schemaUrl",
-            asList(
-                scopeFull(
-                    "io.opentelemetry",
-                    "1.2.3",
-                    "https://opentelemetry.io/schemas/1.21",
-                    counterLong("events", 1L)))),
-        Arguments.of(
-            "scope with version only — no schemaUrl",
-            asList(scopeFull("io.versioned", "2.0.0", null, counterLong("events", 1L)))),
-        Arguments.of(
-            "scope with schemaUrl only — no version",
-            asList(
-                scopeFull(
-                    "io.schemed",
-                    null,
-                    "https://opentelemetry.io/schemas/1.21",
-                    counterLong("events", 1L)))),
-
-        // ── metric metadata — optional description and unit ───────────────────
-        Arguments.of(
-            "metric with description and unit",
-            asList(
-                scope(
-                    "io.test",
-                    counterLongFull("cpu.usage", "CPU utilisation of the process", "%", 75L)))),
-
-        // ── observable gauge ──────────────────────────────────────────────────
-        Arguments.of(
-            "observable gauge long — no start time written",
-            asList(scope("io.obs", observableGaugeLong("heap.used", 1024L * 1024L)))),
-        Arguments.of(
-            "observable gauge long zero", asList(scope("io.obs", observableGaugeLong("idle", 0L)))),
-        Arguments.of(
-            "observable gauge long Long.MIN_VALUE — negative",
-            asList(scope("io.obs", observableGaugeLong("balance", Long.MIN_VALUE)))),
-        Arguments.of(
-            "observable gauge double",
-            asList(scope("io.obs", observableGaugeDouble("cpu.percent", 75.5)))),
-        Arguments.of(
-            "observable gauge double NaN",
-            asList(scope("io.obs", observableGaugeDouble("invalid", Double.NaN)))),
-
-        // ── observable counter (monotonic sum) ────────────────────────────────
-        Arguments.of(
-            "observable counter long Long.MAX_VALUE — has temporality and is_monotonic",
-            asList(scope("io.obs", observableCounterLong("file.reads", Long.MAX_VALUE)))),
-        Arguments.of(
-            "observable counter long zero",
-            asList(scope("io.obs", observableCounterLong("events", 0L)))),
-        Arguments.of(
-            "observable counter double",
-            asList(scope("io.obs", observableCounterDouble("bytes.sent", 1024.5)))),
-        Arguments.of(
-            "observable counter double zero",
-            asList(scope("io.obs", observableCounterDouble("noop", 0.0)))),
-
-        // ── observable up-down-counter (non-monotonic sum) ────────────────────
-        Arguments.of(
-            "observable up-down-counter long positive",
-            asList(scope("io.obs", observableUpDownCounterLong("queue.depth", 42L)))),
-        Arguments.of(
-            "observable up-down-counter long negative",
-            asList(scope("io.obs", observableUpDownCounterLong("balance", -10L)))),
-        Arguments.of(
-            "observable up-down-counter long zero",
-            asList(scope("io.obs", observableUpDownCounterLong("empty", 0L)))),
-        Arguments.of(
-            "observable up-down-counter double",
-            asList(scope("io.obs", observableUpDownCounterDouble("ratio", 0.75)))),
-        Arguments.of(
-            "observable up-down-counter double negative",
-            asList(scope("io.obs", observableUpDownCounterDouble("delta", -1.5)))),
-
-        // ── empty scope between two scopes with metrics ───────────────────────
-        Arguments.of(
-            "middle scope with no metrics — flanked by scopes with metrics",
-            asList(
-                scope("io.first", counterLong("a", 1L)),
-                scope("io.empty"),
-                scope("io.last", counterLong("b", 2L)))),
-
-        // ── multiple scopes and multiple metrics ──────────────────────────────
-        Arguments.of(
-            "two scopes each with two metrics",
-            asList(
-                scope(
-                    "io.http",
-                    counterLong("requests", 100L, strAttr("method", "GET")),
-                    gaugeDouble("active.connections", 5.0)),
-                scope(
-                    "io.db",
-                    counterLong("queries", 50L),
-                    upDownLong("pool.size", 10L, longAttr("pool.id", 1L))))));
-  }
-
-  // ── parameterized test ────────────────────────────────────────────────────
-
-  private static final long START_EPOCH_NS = TimeUnit.SECONDS.toNanos(1330837567);
-  private static final long END_EPOCH_NS = START_EPOCH_NS + TimeUnit.MINUTES.toNanos(30);
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("cases")
-  void testCollectMetrics(String caseName, List<ScopeSpec> expectedScopes) throws IOException {
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    timeSource.set(START_EPOCH_NS); // captured in constructor
-    OtlpMetricsProtoCollector collector = new OtlpMetricsProtoCollector(timeSource);
-    timeSource.set(END_EPOCH_NS); // captured during collection
-    OtlpPayload payload =
-        collector.collectMetrics(
-            visitor -> {
-              for (ScopeSpec scope : expectedScopes) {
-                OtlpScopedMetricsVisitor sv = visitor.visitScopedMetrics(scope.toScope());
-                for (MetricSpec metric : scope.metrics) {
-                  OtlpMetricVisitor mv = sv.visitMetric(metric.toDescriptor());
-                  for (AttrSpec attr : metric.attrs) {
-                    mv.visitAttribute(attr.type, attr.key, attr.value);
-                  }
-                  mv.visitDataPoint(metric.point);
-                }
-              }
-            });
 
-    // Scopes with no metrics produce no wire output — filter them for verification
-    List<ScopeSpec> nonEmptyScopes = new ArrayList<>();
-    for (ScopeSpec scope : expectedScopes) {
-      if (!scope.metrics.isEmpty()) nonEmptyScopes.add(scope);
+    private static MetricSpec counterLong(String name, long value, AttrSpec... attrs) {
+        return new MetricSpec(name, null, null, COUNTER, true, longPoint(value), asList(attrs));
     }
 
-    if (nonEmptyScopes.isEmpty()) {
-      assertEquals(0, payload.getContentLength(), "empty registry must produce empty payload");
-      return;
+    private static MetricSpec counterLongFull(String name, String desc, String unit, long value, AttrSpec... attrs) {
+        return new MetricSpec(name, desc, unit, COUNTER, true, longPoint(value), asList(attrs));
     }
 
-    assertTrue(payload.getContentLength() > 0, "non-empty registry must produce bytes");
-
-    // ── parse MetricsData ──────────────────────────────────────────────────
-    // The full payload encodes a single MetricsData.resource_metrics (field 1, LEN).
-    CodedInputStream metricsData = CodedInputStream.newInstance(payload.getContent());
-    int metricsTag = metricsData.readTag();
-    assertEquals(
-        1, WireFormat.getTagFieldNumber(metricsTag), "MetricsData.resource_metrics is field 1");
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(metricsTag));
-    CodedInputStream resourceMetrics = metricsData.readBytes().newCodedInput();
-    assertTrue(metricsData.isAtEnd(), "expected exactly one ResourceMetrics");
-
-    // ── parse ResourceMetrics (order-insensitive) ──────────────────────────
-    // Fields: resource=1, scope_metrics=2 (repeated)
-    boolean resourceFound = false;
-    Map<String, ParsedScopeMetrics> parsedScopes = new HashMap<>();
-    while (!resourceMetrics.isAtEnd()) {
-      int tag = resourceMetrics.readTag();
-      int rmField = WireFormat.getTagFieldNumber(tag);
-      if (rmField == 1) {
-        verifyResource(resourceMetrics.readBytes().newCodedInput());
-        resourceFound = true;
-        continue;
-      }
-      assertEquals(2, rmField, "ResourceMetrics.scope_metrics is field 2");
-      ParsedScopeMetrics parsedScope =
-          parseScopeMetrics(resourceMetrics.readBytes().newCodedInput());
-      parsedScopes.put(parsedScope.name, parsedScope);
+    private static MetricSpec counterDouble(String name, double value, AttrSpec... attrs) {
+        return new MetricSpec(name, null, null, COUNTER, false, doublePoint(value), asList(attrs));
     }
-    assertTrue(resourceFound, "Resource message must be present in ResourceMetrics");
-    assertEquals(
-        nonEmptyScopes.size(), parsedScopes.size(), "scope count mismatch in case: " + caseName);
-
-    for (ScopeSpec expected : nonEmptyScopes) {
-      ParsedScopeMetrics parsedScope = parsedScopes.get(expected.name);
-      assertNotNull(
-          parsedScope,
-          "no ScopeMetrics found for scope '" + expected.name + "' [" + caseName + "]");
-      assertEquals(expected.version, parsedScope.version, "scope version");
-      assertEquals(expected.schemaUrl, parsedScope.schemaUrl, "scope schemaUrl");
-      assertEquals(
-          expected.metrics.size(),
-          parsedScope.metricBlobs.size(),
-          "metric count in scope " + expected.name);
-
-      Map<String, MetricSpec> expectedMetricsByName = new HashMap<>();
-      for (MetricSpec metricSpec : expected.metrics) {
-        expectedMetricsByName.put(metricSpec.name, metricSpec);
-      }
-      for (byte[] metricBlob : parsedScope.metricBlobs) {
-        String metricName = parseMetricName(metricBlob);
-        MetricSpec metricSpec = expectedMetricsByName.get(metricName);
-        assertNotNull(
-            metricSpec,
-            "unexpected metric '"
-                + metricName
-                + "' in scope "
-                + expected.name
-                + " ["
-                + caseName
-                + "]");
-        verifyMetric(CodedInputStream.newInstance(metricBlob), metricSpec);
-      }
+
+    private static MetricSpec gaugeLong(String name, long value) {
+        return new MetricSpec(name, null, null, GAUGE, true, longPoint(value), emptyList());
     }
-  }
-
-  // ── verification helpers ──────────────────────────────────────────────────
-
-  /**
-   * Parses a {@code Resource} message body and asserts it contains a {@code service.name}
-   * attribute. The value is not verified as it depends on the runtime environment.
-   *
-   * <pre>
-   *   Resource { repeated KeyValue attributes = 1; }
-   * </pre>
-   */
-  private static void verifyResource(CodedInputStream resource) throws IOException {
-    boolean foundServiceName = false;
-    while (!resource.isAtEnd()) {
-      int tag = resource.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 1) { // attributes (repeated KeyValue)
-        String key = readKeyValueKey(resource.readBytes().newCodedInput());
-        if ("service.name".equals(key)) {
-          foundServiceName = true;
-        }
-      } else {
-        resource.skipField(tag);
-      }
+
+    private static MetricSpec gaugeDouble(String name, double value) {
+        return new MetricSpec(name, null, null, GAUGE, false, doublePoint(value), emptyList());
     }
-    assertTrue(foundServiceName, "Resource must contain a 'service.name' attribute");
-  }
-
-  /**
-   * Parses a {@code ScopeMetrics} message body into a {@link ParsedScopeMetrics} containing the
-   * scope identity and raw bytes of each {@code metrics} entry.
-   *
-   * <pre>
-   *   ScopeMetrics { scope=1, metrics=2, schema_url=3 }
-   * </pre>
-   */
-  private static ParsedScopeMetrics parseScopeMetrics(CodedInputStream scopeMetrics)
-      throws IOException {
-    String name = null;
-    String version = null;
-    String schemaUrl = null;
-    List<byte[]> metricBlobs = new ArrayList<>();
-    while (!scopeMetrics.isAtEnd()) {
-      int tag = scopeMetrics.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 1: // InstrumentationScope
-          CodedInputStream scopeStream = scopeMetrics.readBytes().newCodedInput();
-          while (!scopeStream.isAtEnd()) {
-            int scopeTag = scopeStream.readTag();
-            switch (WireFormat.getTagFieldNumber(scopeTag)) {
-              case 1:
-                name = scopeStream.readString();
-                break;
-              case 2:
-                version = scopeStream.readString();
-                break;
-              default:
-                scopeStream.skipField(scopeTag);
-            }
-          }
-          break;
-        case 2: // Metric (repeated)
-          metricBlobs.add(scopeMetrics.readBytes().toByteArray());
-          break;
-        case 3: // schema_url
-          schemaUrl = scopeMetrics.readString();
-          break;
-        default:
-          scopeMetrics.skipField(tag);
-      }
+
+    private static MetricSpec upDownLong(String name, long value, AttrSpec... attrs) {
+        return new MetricSpec(name, null, null, UP_DOWN_COUNTER, true, longPoint(value), asList(attrs));
     }
-    return new ParsedScopeMetrics(name, version, schemaUrl, metricBlobs);
-  }
-
-  private static String parseMetricName(byte[] blob) throws IOException {
-    CodedInputStream metricStream = CodedInputStream.newInstance(blob);
-    while (!metricStream.isAtEnd()) {
-      int tag = metricStream.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 1) {
-        return metricStream.readString();
-      }
-      metricStream.skipField(tag);
+
+    private static MetricSpec upDownDouble(String name, double value, AttrSpec... attrs) {
+        return new MetricSpec(name, null, null, UP_DOWN_COUNTER, false, doublePoint(value), asList(attrs));
     }
-    return null;
-  }
-
-  /**
-   * Parses a {@code Metric} message body and asserts its content matches {@code expected}.
-   *
-   * <pre>
-   *   Metric { name=1, description=2, unit=3, gauge=5, sum=7, histogram=9 }
-   * </pre>
-   */
-  private static void verifyMetric(CodedInputStream metric, MetricSpec expected)
-      throws IOException {
-    String parsedName = null;
-    String parsedDesc = null;
-    String parsedUnit = null;
-    boolean dataFound = false;
-
-    while (!metric.isAtEnd()) {
-      int tag = metric.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 1:
-          parsedName = metric.readString();
-          break;
-        case 2:
-          parsedDesc = metric.readString();
-          break;
-        case 3:
-          parsedUnit = metric.readString();
-          break;
-        case 5: // Gauge
-          assertTrue(isGaugeType(expected.type), "unexpected gauge for " + expected.name);
-          verifyGauge(metric.readBytes().newCodedInput(), expected);
-          dataFound = true;
-          break;
-        case 7: // Sum
-          assertTrue(isSumType(expected.type), "unexpected sum for " + expected.name);
-          verifySum(metric.readBytes().newCodedInput(), expected);
-          dataFound = true;
-          break;
-        case 9: // Histogram
-          assertEquals(HISTOGRAM, expected.type, "unexpected histogram for " + expected.name);
-          verifyHistogram(metric.readBytes().newCodedInput(), expected);
-          dataFound = true;
-          break;
-        default:
-          metric.skipField(tag);
-      }
+
+    private static MetricSpec observableGaugeLong(String name, long value) {
+        return new MetricSpec(name, null, null, OBSERVABLE_GAUGE, true, longPoint(value), emptyList());
     }
 
-    assertEquals(expected.name, parsedName, "metric name");
-    assertEquals(expected.description, parsedDesc, "metric description");
-    assertEquals(expected.unit, parsedUnit, "metric unit");
-    assertTrue(dataFound, "no data payload found in metric " + expected.name);
-  }
-
-  private static boolean isGaugeType(OtelInstrumentType type) {
-    return type == GAUGE || type == OBSERVABLE_GAUGE;
-  }
-
-  private static boolean isSumType(OtelInstrumentType type) {
-    return type == COUNTER
-        || type == OBSERVABLE_COUNTER
-        || type == UP_DOWN_COUNTER
-        || type == OBSERVABLE_UP_DOWN_COUNTER;
-  }
-
-  /**
-   * Parses a {@code Gauge} message body. Gauge has no aggregation temporality or start time.
-   *
-   * <pre>
-   *   Gauge { data_points=1 }
-   * </pre>
-   */
-  private static void verifyGauge(CodedInputStream gauge, MetricSpec expected) throws IOException {
-    boolean foundDataPoint = false;
-    while (!gauge.isAtEnd()) {
-      int tag = gauge.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 1) {
-        assertFalse(foundDataPoint, "expected exactly one data point in gauge " + expected.name);
-        verifyNumberDataPoint(
-            gauge.readBytes().newCodedInput(), expected, /* hasStartTime= */ false);
-        foundDataPoint = true;
-      } else {
-        gauge.skipField(tag);
-      }
+    private static MetricSpec observableGaugeDouble(String name, double value) {
+        return new MetricSpec(name, null, null, OBSERVABLE_GAUGE, false, doublePoint(value), emptyList());
     }
-    assertTrue(foundDataPoint, "no data point found in gauge " + expected.name);
-  }
-
-  /**
-   * Parses a {@code Sum} message body and verifies temporality and monotonicity.
-   *
-   * <pre>
-   *   Sum { data_points=1, aggregation_temporality=2, is_monotonic=3 }
-   * </pre>
-   */
-  private static void verifySum(CodedInputStream sum, MetricSpec expected) throws IOException {
-    boolean foundDataPoint = false;
-    boolean foundTemporality = false;
-
-    while (!sum.isAtEnd()) {
-      int tag = sum.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 1: // NumberDataPoint
-          assertFalse(foundDataPoint, "expected exactly one data point in sum " + expected.name);
-          verifyNumberDataPoint(
-              sum.readBytes().newCodedInput(), expected, /* hasStartTime= */ true);
-          foundDataPoint = true;
-          break;
-        case 2: // AggregationTemporality (1=DELTA, 2=CUMULATIVE)
-          int temporality = sum.readEnum();
-          assertTrue(
-              temporality == 1 || temporality == 2,
-              "aggregation_temporality must be DELTA(1) or CUMULATIVE(2)");
-          foundTemporality = true;
-          break;
-        case 3: // is_monotonic
-          boolean isMonotonic = sum.readBool();
-          boolean expectedMonotonic =
-              expected.type == COUNTER || expected.type == OBSERVABLE_COUNTER;
-          assertEquals(expectedMonotonic, isMonotonic, "is_monotonic for " + expected.name);
-          break;
-        default:
-          sum.skipField(tag);
-      }
+
+    private static MetricSpec observableCounterLong(String name, long value) {
+        return new MetricSpec(name, null, null, OBSERVABLE_COUNTER, true, longPoint(value), emptyList());
+    }
+
+    private static MetricSpec observableCounterDouble(String name, double value) {
+        return new MetricSpec(name, null, null, OBSERVABLE_COUNTER, false, doublePoint(value), emptyList());
     }
 
-    assertTrue(foundDataPoint, "no data point found in sum " + expected.name);
-    assertTrue(foundTemporality, "aggregation_temporality missing from sum " + expected.name);
-  }
-
-  /**
-   * Parses a {@code Histogram} message body and verifies temporality.
-   *
-   * <pre>
-   *   Histogram { data_points=1, aggregation_temporality=2 }
-   * </pre>
-   */
-  private static void verifyHistogram(CodedInputStream histogram, MetricSpec expected)
-      throws IOException {
-    boolean foundDataPoint = false;
-    boolean foundTemporality = false;
-
-    while (!histogram.isAtEnd()) {
-      int tag = histogram.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 1: // HistogramDataPoint
-          assertFalse(
-              foundDataPoint, "expected exactly one data point in histogram " + expected.name);
-          verifyHistogramDataPoint(histogram.readBytes().newCodedInput(), expected);
-          foundDataPoint = true;
-          break;
-        case 2: // AggregationTemporality
-          int temporality = histogram.readEnum();
-          assertTrue(
-              temporality == 1 || temporality == 2,
-              "aggregation_temporality must be DELTA(1) or CUMULATIVE(2)");
-          foundTemporality = true;
-          break;
-        default:
-          histogram.skipField(tag);
-      }
+    private static MetricSpec observableUpDownCounterLong(String name, long value) {
+        return new MetricSpec(name, null, null, OBSERVABLE_UP_DOWN_COUNTER, true, longPoint(value), emptyList());
     }
 
-    assertTrue(foundDataPoint, "no data point found in histogram " + expected.name);
-    assertTrue(foundTemporality, "aggregation_temporality missing from histogram " + expected.name);
-  }
-
-  /**
-   * Parses a {@code NumberDataPoint} message body and asserts timestamps, value, and attributes.
-   *
-   * <pre>
-   *   NumberDataPoint { start_time_unix_nano=2, time_unix_nano=3,
-   *                     as_double=4, as_int=6, attributes=7 }
-   * </pre>
-   *
-   * @param hasStartTime true for non-gauge types; gauges omit {@code start_time_unix_nano}
-   */
-  private static void verifyNumberDataPoint(
-      CodedInputStream dataPoint, MetricSpec expected, boolean hasStartTime) throws IOException {
-    boolean foundStartTime = false;
-    boolean foundEndTime = false;
-    boolean foundValue = false;
-    List<String> parsedAttrKeys = new ArrayList<>();
-
-    while (!dataPoint.isAtEnd()) {
-      int tag = dataPoint.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 2: // start_time_unix_nano (fixed64)
-          assertEquals(
-              START_EPOCH_NS, dataPoint.readFixed64(), "start_time_unix_nano for " + expected.name);
-          foundStartTime = true;
-          break;
-        case 3: // time_unix_nano (fixed64)
-          assertEquals(
-              END_EPOCH_NS, dataPoint.readFixed64(), "time_unix_nano for " + expected.name);
-          foundEndTime = true;
-          break;
-        case 4: // as_double (double via fixed64 wire type)
-          double parsedDouble = dataPoint.readDouble();
-          OtlpDoublePoint expectedDouble = (OtlpDoublePoint) expected.point;
-          assertEquals(
-              Double.doubleToRawLongBits(expectedDouble.value),
-              Double.doubleToRawLongBits(parsedDouble),
-              "as_double for " + expected.name);
-          foundValue = true;
-          break;
-        case 6: // as_int (sfixed64)
-          long parsedLong = dataPoint.readSFixed64();
-          OtlpLongPoint expectedLong = (OtlpLongPoint) expected.point;
-          assertEquals(expectedLong.value, parsedLong, "as_int for " + expected.name);
-          foundValue = true;
-          break;
-        case 7: // attributes (repeated KeyValue)
-          parsedAttrKeys.add(readKeyValueKey(dataPoint.readBytes().newCodedInput()));
-          break;
-        default:
-          dataPoint.skipField(tag);
-      }
+    private static MetricSpec observableUpDownCounterDouble(String name, double value) {
+        return new MetricSpec(name, null, null, OBSERVABLE_UP_DOWN_COUNTER, false, doublePoint(value), emptyList());
     }
 
-    assertEquals(
-        hasStartTime, foundStartTime, "start_time_unix_nano presence for " + expected.name);
-    assertTrue(foundEndTime, "time_unix_nano required for " + expected.name);
-    assertTrue(foundValue, "value field required for " + expected.name);
-    assertEquals(
-        expected.attrs.size(), parsedAttrKeys.size(), "attribute count for " + expected.name);
-    for (int i = 0; i < expected.attrs.size(); i++) {
-      assertEquals(
-          expected.attrs.get(i).key,
-          parsedAttrKeys.get(i),
-          "attribute key[" + i + "] for " + expected.name);
+    private static MetricSpec histogram(
+            String name,
+            double count,
+            List<Double> bounds,
+            List<Double> counts,
+            double sum,
+            double min,
+            double max,
+            AttrSpec... attrs) {
+        return new MetricSpec(
+                name,
+                null,
+                null,
+                HISTOGRAM,
+                false,
+                histogramPoint(count, bounds, counts, sum, min, max),
+                asList(attrs));
     }
-  }
-
-  /**
-   * Parses a {@code HistogramDataPoint} message body and asserts timestamps, count, sum, min, max,
-   * bucket counts, explicit bounds, and attributes.
-   *
-   * <pre>
-   *   HistogramDataPoint { start_time_unix_nano=2, time_unix_nano=3, count=4,
-   *                        sum=5, bucket_counts=6, explicit_bounds=7, attributes=9,
-   *                        min=11, max=12 }
-   * </pre>
-   */
-  private static void verifyHistogramDataPoint(CodedInputStream dataPoint, MetricSpec expected)
-      throws IOException {
-    OtlpHistogramPoint hp = (OtlpHistogramPoint) expected.point;
-    boolean foundStartTime = false;
-    boolean foundEndTime = false;
-    boolean foundCount = false;
-    boolean foundSum = false;
-    boolean foundMin = false;
-    boolean foundMax = false;
-    List<Long> parsedBucketCounts = new ArrayList<>();
-    List<Double> parsedBounds = new ArrayList<>();
-    List<String> parsedAttrKeys = new ArrayList<>();
-
-    while (!dataPoint.isAtEnd()) {
-      int tag = dataPoint.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 2: // start_time_unix_nano
-          assertEquals(
-              START_EPOCH_NS, dataPoint.readFixed64(), "start_time_unix_nano for " + expected.name);
-          foundStartTime = true;
-          break;
-        case 3: // time_unix_nano
-          assertEquals(
-              END_EPOCH_NS, dataPoint.readFixed64(), "time_unix_nano for " + expected.name);
-          foundEndTime = true;
-          break;
-        case 4: // count (fixed64)
-          assertEquals((long) hp.count, dataPoint.readFixed64(), "histogram count");
-          foundCount = true;
-          break;
-        case 5: // sum (double via fixed64)
-          assertEquals(
-              Double.doubleToRawLongBits(hp.sum),
-              Double.doubleToRawLongBits(dataPoint.readDouble()),
-              "histogram sum");
-          foundSum = true;
-          break;
-        case 6: // bucket_counts (repeated fixed64)
-          parsedBucketCounts.add(dataPoint.readFixed64());
-          break;
-        case 7: // explicit_bounds (repeated double)
-          parsedBounds.add(dataPoint.readDouble());
-          break;
-        case 9: // attributes (repeated KeyValue)
-          parsedAttrKeys.add(readKeyValueKey(dataPoint.readBytes().newCodedInput()));
-          break;
-        case 11: // min (double via fixed64)
-          assertEquals(
-              Double.doubleToRawLongBits(hp.min),
-              Double.doubleToRawLongBits(dataPoint.readDouble()),
-              "histogram min");
-          foundMin = true;
-          break;
-        case 12: // max (double via fixed64)
-          assertEquals(
-              Double.doubleToRawLongBits(hp.max),
-              Double.doubleToRawLongBits(dataPoint.readDouble()),
-              "histogram max");
-          foundMax = true;
-          break;
-        default:
-          dataPoint.skipField(tag);
-      }
+
+    private static AttrSpec strAttr(String key, String value) {
+        return new AttrSpec(STRING_ATTRIBUTE, key, value);
+    }
+
+    private static AttrSpec longAttr(String key, long value) {
+        return new AttrSpec(LONG_ATTRIBUTE, key, value);
     }
 
-    assertTrue(foundStartTime, "start_time_unix_nano required for histogram " + expected.name);
-    assertTrue(foundEndTime, "time_unix_nano required for histogram " + expected.name);
-    assertTrue(foundCount, "count required for histogram " + expected.name);
-    assertTrue(foundSum, "sum required for histogram " + expected.name);
-    assertTrue(foundMin, "min required for histogram " + expected.name);
-    assertTrue(foundMax, "max required for histogram " + expected.name);
-
-    // Input uses equal counts and boundaries; derive the expected OTLP wire output:
-    // - finite boundaries are written as explicit_bounds (+Infinity overflow marker is dropped)
-    // - when there is no overflow boundary, one extra zero count is appended so that
-    //   bucket_counts.size() == explicit_bounds.size() + 1, as required by the OTLP spec
-    List<Double> expectedBounds = new ArrayList<>();
-    boolean hasOverflow = false;
-    for (double boundary : hp.bucketBoundaries) {
-      if (Double.isInfinite(boundary)) {
-        hasOverflow = true;
-      } else {
-        expectedBounds.add(boundary);
-      }
+    private static AttrSpec boolAttr(String key, boolean value) {
+        return new AttrSpec(BOOLEAN_ATTRIBUTE, key, value);
     }
-    List<Long> expectedCounts = new ArrayList<>();
-    for (double count : hp.bucketCounts) {
-      expectedCounts.add((long) count);
+
+    private static AttrSpec dblAttr(String key, double value) {
+        return new AttrSpec(DOUBLE_ATTRIBUTE, key, value);
     }
-    if (!expectedCounts.isEmpty() && !hasOverflow) {
-      expectedCounts.add(0L);
+
+    // ── test cases ─────────────────────────────────────────────────────────────
+
+    static Stream<Arguments> cases() {
+        return Stream.of(
+                // ── empty ─────────────────────────────────────────────────────────────
+                Arguments.of("empty — no scopes produces empty payload", emptyList()),
+
+                // ── scope with no metrics ─────────────────────────────────────────────
+                Arguments.of("scope with no metrics", asList(scope("io.empty"))),
+
+                // ── counter long boundary values ──────────────────────────────────────
+                Arguments.of("counter long zero — boundary", asList(scope("io.test", counterLong("requests", 0L)))),
+                Arguments.of(
+                        "counter long Long.MAX_VALUE — boundary",
+                        asList(scope("io.test", counterLong("requests", Long.MAX_VALUE)))),
+                Arguments.of(
+                        "counter long Long.MIN_VALUE — negative boundary",
+                        asList(scope("io.test", counterLong("requests", Long.MIN_VALUE)))),
+
+                // ── gauge long boundary values (no start time) ───────────────────────
+                Arguments.of("gauge long zero", asList(scope("io.gauge", gaugeLong("connections", 0L)))),
+                Arguments.of(
+                        "gauge long Long.MAX_VALUE",
+                        asList(scope("io.gauge", gaugeLong("connections", Long.MAX_VALUE)))),
+                Arguments.of(
+                        "gauge long Long.MIN_VALUE — negative",
+                        asList(scope("io.gauge", gaugeLong("balance", Long.MIN_VALUE)))),
+
+                // ── gauge double special values (no start time) ───────────────────────
+                Arguments.of("gauge double zero", asList(scope("io.gauge", gaugeDouble("rate", 0.0)))),
+                Arguments.of(
+                        "gauge double -0.0 — negative zero",
+                        asList(scope("io.gauge", gaugeDouble("temperature", -0.0)))),
+                Arguments.of(
+                        "gauge double Double.MAX_VALUE",
+                        asList(scope("io.gauge", gaugeDouble("temperature", Double.MAX_VALUE)))),
+                Arguments.of(
+                        "gauge double +Infinity",
+                        asList(scope("io.gauge", gaugeDouble("temperature", Double.POSITIVE_INFINITY)))),
+                Arguments.of(
+                        "gauge double -Infinity",
+                        asList(scope("io.gauge", gaugeDouble("temperature", Double.NEGATIVE_INFINITY)))),
+                Arguments.of("gauge double NaN", asList(scope("io.gauge", gaugeDouble("invalid", Double.NaN)))),
+
+                // ── up-down counter long (non-monotonic sum) ──────────────────────────
+                Arguments.of("up-down-counter long zero", asList(scope("io.test", upDownLong("queue.size", 0L)))),
+                Arguments.of(
+                        "up-down-counter long Long.MAX_VALUE",
+                        asList(scope("io.test", upDownLong("queue.size", Long.MAX_VALUE)))),
+                Arguments.of(
+                        "up-down-counter long negative with string attr",
+                        asList(scope("io.test", upDownLong("queue.size", -42L, strAttr("host", "my-host"))))),
+
+                // ── up-down counter double ────────────────────────────────────────────
+                Arguments.of(
+                        "up-down-counter double positive", asList(scope("io.test", upDownDouble("balance", 3.14)))),
+                Arguments.of("up-down-counter double negative", asList(scope("io.test", upDownDouble("delta", -2.71)))),
+                Arguments.of("up-down-counter double zero", asList(scope("io.test", upDownDouble("offset", 0.0)))),
+
+                // ── counter double ────────────────────────────────────────────────────
+                Arguments.of("counter double zero — no attrs", asList(scope("io.test", counterDouble("errors", 0.0)))),
+
+                // ── counter double with multiple attribute types ───────────────────────
+                Arguments.of(
+                        "counter double with string, long, bool, double attrs",
+                        asList(scope(
+                                "io.test",
+                                counterDouble(
+                                        "latency",
+                                        3.14,
+                                        strAttr("service", "web"),
+                                        longAttr("status", 200L),
+                                        boolAttr("success", true),
+                                        dblAttr("rate", 0.5))))),
+
+                // ── histogram — overflow only (no explicit bounds) ────────────────────
+                Arguments.of(
+                        "histogram no explicit bounds — overflow bucket only",
+                        asList(scope(
+                                "io.hist",
+                                histogram(
+                                        "response.time",
+                                        1.0,
+                                        asList(Double.POSITIVE_INFINITY),
+                                        asList(1.0),
+                                        0.5,
+                                        0.5,
+                                        0.5)))),
+
+                // ── histogram — zero count and sum with overflow bucket ───────────────
+                Arguments.of(
+                        "histogram zero count and sum",
+                        asList(scope(
+                                "io.hist",
+                                histogram(
+                                        "idle.time",
+                                        0.0,
+                                        asList(Double.POSITIVE_INFINITY),
+                                        asList(0.0),
+                                        0.0,
+                                        0.0,
+                                        0.0)))),
+
+                // ── histogram — single explicit bound with overflow ───────────────────
+                Arguments.of(
+                        "histogram single bound with overflow",
+                        asList(scope(
+                                "io.hist",
+                                histogram(
+                                        "request.size",
+                                        5.0,
+                                        asList(100.0, Double.POSITIVE_INFINITY),
+                                        asList(4.0, 1.0),
+                                        280.0,
+                                        20.0,
+                                        200.0)))),
+
+                // ── histogram — finite bounds only (no overflow) — extra zero appended ─
+                Arguments.of(
+                        "histogram finite bounds — no overflow — extra zero bucket appended",
+                        asList(scope(
+                                "io.hist",
+                                histogram(
+                                        "queue.size", 8.0, asList(50.0, 100.0), asList(3.0, 5.0), 750.0, 10.0, 95.0)))),
+
+                // ── histogram — with explicit bounds, overflow, and attrs ─────────────
+                Arguments.of(
+                        "histogram with bounds, overflow, and string attr",
+                        asList(scope(
+                                "io.hist",
+                                histogram(
+                                        "response.time",
+                                        10.0,
+                                        asList(1.0, 5.0, 10.0, Double.POSITIVE_INFINITY),
+                                        asList(2.0, 3.0, 4.0, 1.0),
+                                        45.5,
+                                        0.5,
+                                        12.0,
+                                        strAttr("region", "us-east"))))),
+
+                // ── histogram — many buckets with overflow and multiple attrs ──────────
+                Arguments.of(
+                        "histogram many buckets with overflow, long and bool attrs",
+                        asList(scope(
+                                "io.hist",
+                                histogram(
+                                        "latency.ms",
+                                        100.0,
+                                        asList(1.0, 2.0, 5.0, 10.0, 25.0, 50.0, 100.0, Double.POSITIVE_INFINITY),
+                                        asList(5.0, 10.0, 20.0, 30.0, 15.0, 12.0, 6.0, 2.0),
+                                        4321.0,
+                                        0.5,
+                                        150.0,
+                                        longAttr("shard", 3L),
+                                        boolAttr("cached", false))))),
+
+                // ── scope metadata — optional version and schema URL ──────────────────
+                Arguments.of(
+                        "scope with version and schemaUrl",
+                        asList(scopeFull(
+                                "io.opentelemetry",
+                                "1.2.3",
+                                "https://opentelemetry.io/schemas/1.21",
+                                counterLong("events", 1L)))),
+                Arguments.of(
+                        "scope with version only — no schemaUrl",
+                        asList(scopeFull("io.versioned", "2.0.0", null, counterLong("events", 1L)))),
+                Arguments.of(
+                        "scope with schemaUrl only — no version",
+                        asList(scopeFull(
+                                "io.schemed",
+                                null,
+                                "https://opentelemetry.io/schemas/1.21",
+                                counterLong("events", 1L)))),
+
+                // ── metric metadata — optional description and unit ───────────────────
+                Arguments.of(
+                        "metric with description and unit",
+                        asList(scope(
+                                "io.test", counterLongFull("cpu.usage", "CPU utilisation of the process", "%", 75L)))),
+
+                // ── observable gauge ──────────────────────────────────────────────────
+                Arguments.of(
+                        "observable gauge long — no start time written",
+                        asList(scope("io.obs", observableGaugeLong("heap.used", 1024L * 1024L)))),
+                Arguments.of("observable gauge long zero", asList(scope("io.obs", observableGaugeLong("idle", 0L)))),
+                Arguments.of(
+                        "observable gauge long Long.MIN_VALUE — negative",
+                        asList(scope("io.obs", observableGaugeLong("balance", Long.MIN_VALUE)))),
+                Arguments.of(
+                        "observable gauge double", asList(scope("io.obs", observableGaugeDouble("cpu.percent", 75.5)))),
+                Arguments.of(
+                        "observable gauge double NaN",
+                        asList(scope("io.obs", observableGaugeDouble("invalid", Double.NaN)))),
+
+                // ── observable counter (monotonic sum) ────────────────────────────────
+                Arguments.of(
+                        "observable counter long Long.MAX_VALUE — has temporality and is_monotonic",
+                        asList(scope("io.obs", observableCounterLong("file.reads", Long.MAX_VALUE)))),
+                Arguments.of(
+                        "observable counter long zero", asList(scope("io.obs", observableCounterLong("events", 0L)))),
+                Arguments.of(
+                        "observable counter double",
+                        asList(scope("io.obs", observableCounterDouble("bytes.sent", 1024.5)))),
+                Arguments.of(
+                        "observable counter double zero",
+                        asList(scope("io.obs", observableCounterDouble("noop", 0.0)))),
+
+                // ── observable up-down-counter (non-monotonic sum) ────────────────────
+                Arguments.of(
+                        "observable up-down-counter long positive",
+                        asList(scope("io.obs", observableUpDownCounterLong("queue.depth", 42L)))),
+                Arguments.of(
+                        "observable up-down-counter long negative",
+                        asList(scope("io.obs", observableUpDownCounterLong("balance", -10L)))),
+                Arguments.of(
+                        "observable up-down-counter long zero",
+                        asList(scope("io.obs", observableUpDownCounterLong("empty", 0L)))),
+                Arguments.of(
+                        "observable up-down-counter double",
+                        asList(scope("io.obs", observableUpDownCounterDouble("ratio", 0.75)))),
+                Arguments.of(
+                        "observable up-down-counter double negative",
+                        asList(scope("io.obs", observableUpDownCounterDouble("delta", -1.5)))),
+
+                // ── empty scope between two scopes with metrics ───────────────────────
+                Arguments.of(
+                        "middle scope with no metrics — flanked by scopes with metrics",
+                        asList(
+                                scope("io.first", counterLong("a", 1L)),
+                                scope("io.empty"),
+                                scope("io.last", counterLong("b", 2L)))),
+
+                // ── multiple scopes and multiple metrics ──────────────────────────────
+                Arguments.of(
+                        "two scopes each with two metrics",
+                        asList(
+                                scope(
+                                        "io.http",
+                                        counterLong("requests", 100L, strAttr("method", "GET")),
+                                        gaugeDouble("active.connections", 5.0)),
+                                scope(
+                                        "io.db",
+                                        counterLong("queries", 50L),
+                                        upDownLong("pool.size", 10L, longAttr("pool.id", 1L))))));
     }
 
-    // OTLP spec: bucket_counts.size() == explicit_bounds.size() + 1, or both 0
-    if (expectedCounts.isEmpty()) {
-      assertEquals(
-          0,
-          parsedBounds.size(),
-          "explicit_bounds must be 0 when bucket_counts is 0 for " + expected.name);
-      assertEquals(
-          0,
-          parsedBucketCounts.size(),
-          "bucket_counts must be 0 when explicit_bounds is 0 for " + expected.name);
-    } else {
-      assertEquals(
-          parsedBounds.size() + 1,
-          parsedBucketCounts.size(),
-          "OTLP spec: bucket_counts must be explicit_bounds + 1 for " + expected.name);
+    // ── parameterized test ────────────────────────────────────────────────────
+
+    private static final long START_EPOCH_NS = TimeUnit.SECONDS.toNanos(1330837567);
+    private static final long END_EPOCH_NS = START_EPOCH_NS + TimeUnit.MINUTES.toNanos(30);
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("cases")
+    void testCollectMetrics(String caseName, List<ScopeSpec> expectedScopes) throws IOException {
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        timeSource.set(START_EPOCH_NS); // captured in constructor
+        OtlpMetricsProtoCollector collector = new OtlpMetricsProtoCollector(timeSource);
+        timeSource.set(END_EPOCH_NS); // captured during collection
+        OtlpPayload payload = collector.collectMetrics(visitor -> {
+            for (ScopeSpec scope : expectedScopes) {
+                OtlpScopedMetricsVisitor sv = visitor.visitScopedMetrics(scope.toScope());
+                for (MetricSpec metric : scope.metrics) {
+                    OtlpMetricVisitor mv = sv.visitMetric(metric.toDescriptor());
+                    for (AttrSpec attr : metric.attrs) {
+                        mv.visitAttribute(attr.type, attr.key, attr.value);
+                    }
+                    mv.visitDataPoint(metric.point);
+                }
+            }
+        });
+
+        // Scopes with no metrics produce no wire output — filter them for verification
+        List<ScopeSpec> nonEmptyScopes = new ArrayList<>();
+        for (ScopeSpec scope : expectedScopes) {
+            if (!scope.metrics.isEmpty()) nonEmptyScopes.add(scope);
+        }
+
+        if (nonEmptyScopes.isEmpty()) {
+            assertEquals(0, payload.getContentLength(), "empty registry must produce empty payload");
+            return;
+        }
+
+        assertTrue(payload.getContentLength() > 0, "non-empty registry must produce bytes");
+
+        // ── parse MetricsData ──────────────────────────────────────────────────
+        // The full payload encodes a single MetricsData.resource_metrics (field 1, LEN).
+        CodedInputStream metricsData = CodedInputStream.newInstance(payload.getContent());
+        int metricsTag = metricsData.readTag();
+        assertEquals(1, WireFormat.getTagFieldNumber(metricsTag), "MetricsData.resource_metrics is field 1");
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(metricsTag));
+        CodedInputStream resourceMetrics = metricsData.readBytes().newCodedInput();
+        assertTrue(metricsData.isAtEnd(), "expected exactly one ResourceMetrics");
+
+        // ── parse ResourceMetrics (order-insensitive) ──────────────────────────
+        // Fields: resource=1, scope_metrics=2 (repeated)
+        boolean resourceFound = false;
+        Map<String, ParsedScopeMetrics> parsedScopes = new HashMap<>();
+        while (!resourceMetrics.isAtEnd()) {
+            int tag = resourceMetrics.readTag();
+            int rmField = WireFormat.getTagFieldNumber(tag);
+            if (rmField == 1) {
+                verifyResource(resourceMetrics.readBytes().newCodedInput());
+                resourceFound = true;
+                continue;
+            }
+            assertEquals(2, rmField, "ResourceMetrics.scope_metrics is field 2");
+            ParsedScopeMetrics parsedScope =
+                    parseScopeMetrics(resourceMetrics.readBytes().newCodedInput());
+            parsedScopes.put(parsedScope.name, parsedScope);
+        }
+        assertTrue(resourceFound, "Resource message must be present in ResourceMetrics");
+        assertEquals(nonEmptyScopes.size(), parsedScopes.size(), "scope count mismatch in case: " + caseName);
+
+        for (ScopeSpec expected : nonEmptyScopes) {
+            ParsedScopeMetrics parsedScope = parsedScopes.get(expected.name);
+            assertNotNull(parsedScope, "no ScopeMetrics found for scope '" + expected.name + "' [" + caseName + "]");
+            assertEquals(expected.version, parsedScope.version, "scope version");
+            assertEquals(expected.schemaUrl, parsedScope.schemaUrl, "scope schemaUrl");
+            assertEquals(
+                    expected.metrics.size(), parsedScope.metricBlobs.size(), "metric count in scope " + expected.name);
+
+            Map<String, MetricSpec> expectedMetricsByName = new HashMap<>();
+            for (MetricSpec metricSpec : expected.metrics) {
+                expectedMetricsByName.put(metricSpec.name, metricSpec);
+            }
+            for (byte[] metricBlob : parsedScope.metricBlobs) {
+                String metricName = parseMetricName(metricBlob);
+                MetricSpec metricSpec = expectedMetricsByName.get(metricName);
+                assertNotNull(
+                        metricSpec,
+                        "unexpected metric '" + metricName + "' in scope " + expected.name + " [" + caseName + "]");
+                verifyMetric(CodedInputStream.newInstance(metricBlob), metricSpec);
+            }
+        }
     }
 
-    // +Infinity must never appear as an explicit bound on the wire
-    assertFalse(
-        parsedBounds.stream().anyMatch(b -> Double.isInfinite(b)),
-        "+Infinity must not appear in explicit_bounds for " + expected.name);
-
-    assertEquals(
-        expectedBounds.size(), parsedBounds.size(), "explicit_bounds size for " + expected.name);
-    for (int i = 0; i < expectedBounds.size(); i++) {
-      assertEquals(
-          Double.doubleToRawLongBits(expectedBounds.get(i)),
-          Double.doubleToRawLongBits(parsedBounds.get(i)),
-          "explicit_bounds[" + i + "] for " + expected.name);
+    // ── verification helpers ──────────────────────────────────────────────────
+
+    /**
+     * Parses a {@code Resource} message body and asserts it contains a {@code service.name}
+     * attribute. The value is not verified as it depends on the runtime environment.
+     *
+     * <pre>
+     *   Resource { repeated KeyValue attributes = 1; }
+     * </pre>
+     */
+    private static void verifyResource(CodedInputStream resource) throws IOException {
+        boolean foundServiceName = false;
+        while (!resource.isAtEnd()) {
+            int tag = resource.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 1) { // attributes (repeated KeyValue)
+                String key = readKeyValueKey(resource.readBytes().newCodedInput());
+                if ("service.name".equals(key)) {
+                    foundServiceName = true;
+                }
+            } else {
+                resource.skipField(tag);
+            }
+        }
+        assertTrue(foundServiceName, "Resource must contain a 'service.name' attribute");
     }
 
-    assertEquals(
-        expectedCounts.size(),
-        parsedBucketCounts.size(),
-        "bucket_counts size for " + expected.name);
-    for (int i = 0; i < expectedCounts.size(); i++) {
-      assertEquals(
-          (long) expectedCounts.get(i),
-          (long) parsedBucketCounts.get(i),
-          "bucket_counts[" + i + "] for " + expected.name);
+    /**
+     * Parses a {@code ScopeMetrics} message body into a {@link ParsedScopeMetrics} containing the
+     * scope identity and raw bytes of each {@code metrics} entry.
+     *
+     * <pre>
+     *   ScopeMetrics { scope=1, metrics=2, schema_url=3 }
+     * </pre>
+     */
+    private static ParsedScopeMetrics parseScopeMetrics(CodedInputStream scopeMetrics) throws IOException {
+        String name = null;
+        String version = null;
+        String schemaUrl = null;
+        List<byte[]> metricBlobs = new ArrayList<>();
+        while (!scopeMetrics.isAtEnd()) {
+            int tag = scopeMetrics.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 1: // InstrumentationScope
+                    CodedInputStream scopeStream = scopeMetrics.readBytes().newCodedInput();
+                    while (!scopeStream.isAtEnd()) {
+                        int scopeTag = scopeStream.readTag();
+                        switch (WireFormat.getTagFieldNumber(scopeTag)) {
+                            case 1:
+                                name = scopeStream.readString();
+                                break;
+                            case 2:
+                                version = scopeStream.readString();
+                                break;
+                            default:
+                                scopeStream.skipField(scopeTag);
+                        }
+                    }
+                    break;
+                case 2: // Metric (repeated)
+                    metricBlobs.add(scopeMetrics.readBytes().toByteArray());
+                    break;
+                case 3: // schema_url
+                    schemaUrl = scopeMetrics.readString();
+                    break;
+                default:
+                    scopeMetrics.skipField(tag);
+            }
+        }
+        return new ParsedScopeMetrics(name, version, schemaUrl, metricBlobs);
     }
 
-    assertEquals(
-        expected.attrs.size(),
-        parsedAttrKeys.size(),
-        "attribute count for histogram " + expected.name);
-    for (int i = 0; i < expected.attrs.size(); i++) {
-      assertEquals(
-          expected.attrs.get(i).key,
-          parsedAttrKeys.get(i),
-          "attribute key[" + i + "] for histogram " + expected.name);
+    private static String parseMetricName(byte[] blob) throws IOException {
+        CodedInputStream metricStream = CodedInputStream.newInstance(blob);
+        while (!metricStream.isAtEnd()) {
+            int tag = metricStream.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 1) {
+                return metricStream.readString();
+            }
+            metricStream.skipField(tag);
+        }
+        return null;
     }
-  }
-
-  /**
-   * Reads a {@code KeyValue} body and returns the key (field 1). The value field is skipped; its
-   * encoding is covered by {@code OtlpCommonProtoTest}.
-   */
-  private static String readKeyValueKey(CodedInputStream keyValue) throws IOException {
-    while (!keyValue.isAtEnd()) {
-      int tag = keyValue.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 1) {
-        return keyValue.readString();
-      }
-      keyValue.skipField(tag);
+
+    /**
+     * Parses a {@code Metric} message body and asserts its content matches {@code expected}.
+     *
+     * <pre>
+     *   Metric { name=1, description=2, unit=3, gauge=5, sum=7, histogram=9 }
+     * </pre>
+     */
+    private static void verifyMetric(CodedInputStream metric, MetricSpec expected) throws IOException {
+        String parsedName = null;
+        String parsedDesc = null;
+        String parsedUnit = null;
+        boolean dataFound = false;
+
+        while (!metric.isAtEnd()) {
+            int tag = metric.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 1:
+                    parsedName = metric.readString();
+                    break;
+                case 2:
+                    parsedDesc = metric.readString();
+                    break;
+                case 3:
+                    parsedUnit = metric.readString();
+                    break;
+                case 5: // Gauge
+                    assertTrue(isGaugeType(expected.type), "unexpected gauge for " + expected.name);
+                    verifyGauge(metric.readBytes().newCodedInput(), expected);
+                    dataFound = true;
+                    break;
+                case 7: // Sum
+                    assertTrue(isSumType(expected.type), "unexpected sum for " + expected.name);
+                    verifySum(metric.readBytes().newCodedInput(), expected);
+                    dataFound = true;
+                    break;
+                case 9: // Histogram
+                    assertEquals(HISTOGRAM, expected.type, "unexpected histogram for " + expected.name);
+                    verifyHistogram(metric.readBytes().newCodedInput(), expected);
+                    dataFound = true;
+                    break;
+                default:
+                    metric.skipField(tag);
+            }
+        }
+
+        assertEquals(expected.name, parsedName, "metric name");
+        assertEquals(expected.description, parsedDesc, "metric description");
+        assertEquals(expected.unit, parsedUnit, "metric unit");
+        assertTrue(dataFound, "no data payload found in metric " + expected.name);
+    }
+
+    private static boolean isGaugeType(OtelInstrumentType type) {
+        return type == GAUGE || type == OBSERVABLE_GAUGE;
+    }
+
+    private static boolean isSumType(OtelInstrumentType type) {
+        return type == COUNTER
+                || type == OBSERVABLE_COUNTER
+                || type == UP_DOWN_COUNTER
+                || type == OBSERVABLE_UP_DOWN_COUNTER;
+    }
+
+    /**
+     * Parses a {@code Gauge} message body. Gauge has no aggregation temporality or start time.
+     *
+     * <pre>
+     *   Gauge { data_points=1 }
+     * </pre>
+     */
+    private static void verifyGauge(CodedInputStream gauge, MetricSpec expected) throws IOException {
+        boolean foundDataPoint = false;
+        while (!gauge.isAtEnd()) {
+            int tag = gauge.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 1) {
+                assertFalse(foundDataPoint, "expected exactly one data point in gauge " + expected.name);
+                verifyNumberDataPoint(gauge.readBytes().newCodedInput(), expected, /* hasStartTime= */ false);
+                foundDataPoint = true;
+            } else {
+                gauge.skipField(tag);
+            }
+        }
+        assertTrue(foundDataPoint, "no data point found in gauge " + expected.name);
+    }
+
+    /**
+     * Parses a {@code Sum} message body and verifies temporality and monotonicity.
+     *
+     * <pre>
+     *   Sum { data_points=1, aggregation_temporality=2, is_monotonic=3 }
+     * </pre>
+     */
+    private static void verifySum(CodedInputStream sum, MetricSpec expected) throws IOException {
+        boolean foundDataPoint = false;
+        boolean foundTemporality = false;
+
+        while (!sum.isAtEnd()) {
+            int tag = sum.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 1: // NumberDataPoint
+                    assertFalse(foundDataPoint, "expected exactly one data point in sum " + expected.name);
+                    verifyNumberDataPoint(sum.readBytes().newCodedInput(), expected, /* hasStartTime= */ true);
+                    foundDataPoint = true;
+                    break;
+                case 2: // AggregationTemporality (1=DELTA, 2=CUMULATIVE)
+                    int temporality = sum.readEnum();
+                    assertTrue(
+                            temporality == 1 || temporality == 2,
+                            "aggregation_temporality must be DELTA(1) or CUMULATIVE(2)");
+                    foundTemporality = true;
+                    break;
+                case 3: // is_monotonic
+                    boolean isMonotonic = sum.readBool();
+                    boolean expectedMonotonic = expected.type == COUNTER || expected.type == OBSERVABLE_COUNTER;
+                    assertEquals(expectedMonotonic, isMonotonic, "is_monotonic for " + expected.name);
+                    break;
+                default:
+                    sum.skipField(tag);
+            }
+        }
+
+        assertTrue(foundDataPoint, "no data point found in sum " + expected.name);
+        assertTrue(foundTemporality, "aggregation_temporality missing from sum " + expected.name);
+    }
+
+    /**
+     * Parses a {@code Histogram} message body and verifies temporality.
+     *
+     * <pre>
+     *   Histogram { data_points=1, aggregation_temporality=2 }
+     * </pre>
+     */
+    private static void verifyHistogram(CodedInputStream histogram, MetricSpec expected) throws IOException {
+        boolean foundDataPoint = false;
+        boolean foundTemporality = false;
+
+        while (!histogram.isAtEnd()) {
+            int tag = histogram.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 1: // HistogramDataPoint
+                    assertFalse(foundDataPoint, "expected exactly one data point in histogram " + expected.name);
+                    verifyHistogramDataPoint(histogram.readBytes().newCodedInput(), expected);
+                    foundDataPoint = true;
+                    break;
+                case 2: // AggregationTemporality
+                    int temporality = histogram.readEnum();
+                    assertTrue(
+                            temporality == 1 || temporality == 2,
+                            "aggregation_temporality must be DELTA(1) or CUMULATIVE(2)");
+                    foundTemporality = true;
+                    break;
+                default:
+                    histogram.skipField(tag);
+            }
+        }
+
+        assertTrue(foundDataPoint, "no data point found in histogram " + expected.name);
+        assertTrue(foundTemporality, "aggregation_temporality missing from histogram " + expected.name);
+    }
+
+    /**
+     * Parses a {@code NumberDataPoint} message body and asserts timestamps, value, and attributes.
+     *
+     * <pre>
+     *   NumberDataPoint { start_time_unix_nano=2, time_unix_nano=3,
+     *                     as_double=4, as_int=6, attributes=7 }
+     * </pre>
+     *
+     * @param hasStartTime true for non-gauge types; gauges omit {@code start_time_unix_nano}
+     */
+    private static void verifyNumberDataPoint(CodedInputStream dataPoint, MetricSpec expected, boolean hasStartTime)
+            throws IOException {
+        boolean foundStartTime = false;
+        boolean foundEndTime = false;
+        boolean foundValue = false;
+        List<String> parsedAttrKeys = new ArrayList<>();
+
+        while (!dataPoint.isAtEnd()) {
+            int tag = dataPoint.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 2: // start_time_unix_nano (fixed64)
+                    assertEquals(START_EPOCH_NS, dataPoint.readFixed64(), "start_time_unix_nano for " + expected.name);
+                    foundStartTime = true;
+                    break;
+                case 3: // time_unix_nano (fixed64)
+                    assertEquals(END_EPOCH_NS, dataPoint.readFixed64(), "time_unix_nano for " + expected.name);
+                    foundEndTime = true;
+                    break;
+                case 4: // as_double (double via fixed64 wire type)
+                    double parsedDouble = dataPoint.readDouble();
+                    OtlpDoublePoint expectedDouble = (OtlpDoublePoint) expected.point;
+                    assertEquals(
+                            Double.doubleToRawLongBits(expectedDouble.value),
+                            Double.doubleToRawLongBits(parsedDouble),
+                            "as_double for " + expected.name);
+                    foundValue = true;
+                    break;
+                case 6: // as_int (sfixed64)
+                    long parsedLong = dataPoint.readSFixed64();
+                    OtlpLongPoint expectedLong = (OtlpLongPoint) expected.point;
+                    assertEquals(expectedLong.value, parsedLong, "as_int for " + expected.name);
+                    foundValue = true;
+                    break;
+                case 7: // attributes (repeated KeyValue)
+                    parsedAttrKeys.add(readKeyValueKey(dataPoint.readBytes().newCodedInput()));
+                    break;
+                default:
+                    dataPoint.skipField(tag);
+            }
+        }
+
+        assertEquals(hasStartTime, foundStartTime, "start_time_unix_nano presence for " + expected.name);
+        assertTrue(foundEndTime, "time_unix_nano required for " + expected.name);
+        assertTrue(foundValue, "value field required for " + expected.name);
+        assertEquals(expected.attrs.size(), parsedAttrKeys.size(), "attribute count for " + expected.name);
+        for (int i = 0; i < expected.attrs.size(); i++) {
+            assertEquals(
+                    expected.attrs.get(i).key, parsedAttrKeys.get(i), "attribute key[" + i + "] for " + expected.name);
+        }
+    }
+
+    /**
+     * Parses a {@code HistogramDataPoint} message body and asserts timestamps, count, sum, min, max,
+     * bucket counts, explicit bounds, and attributes.
+     *
+     * <pre>
+     *   HistogramDataPoint { start_time_unix_nano=2, time_unix_nano=3, count=4,
+     *                        sum=5, bucket_counts=6, explicit_bounds=7, attributes=9,
+     *                        min=11, max=12 }
+     * </pre>
+     */
+    private static void verifyHistogramDataPoint(CodedInputStream dataPoint, MetricSpec expected) throws IOException {
+        OtlpHistogramPoint hp = (OtlpHistogramPoint) expected.point;
+        boolean foundStartTime = false;
+        boolean foundEndTime = false;
+        boolean foundCount = false;
+        boolean foundSum = false;
+        boolean foundMin = false;
+        boolean foundMax = false;
+        List<Long> parsedBucketCounts = new ArrayList<>();
+        List<Double> parsedBounds = new ArrayList<>();
+        List<String> parsedAttrKeys = new ArrayList<>();
+
+        while (!dataPoint.isAtEnd()) {
+            int tag = dataPoint.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 2: // start_time_unix_nano
+                    assertEquals(START_EPOCH_NS, dataPoint.readFixed64(), "start_time_unix_nano for " + expected.name);
+                    foundStartTime = true;
+                    break;
+                case 3: // time_unix_nano
+                    assertEquals(END_EPOCH_NS, dataPoint.readFixed64(), "time_unix_nano for " + expected.name);
+                    foundEndTime = true;
+                    break;
+                case 4: // count (fixed64)
+                    assertEquals((long) hp.count, dataPoint.readFixed64(), "histogram count");
+                    foundCount = true;
+                    break;
+                case 5: // sum (double via fixed64)
+                    assertEquals(
+                            Double.doubleToRawLongBits(hp.sum),
+                            Double.doubleToRawLongBits(dataPoint.readDouble()),
+                            "histogram sum");
+                    foundSum = true;
+                    break;
+                case 6: // bucket_counts (repeated fixed64)
+                    parsedBucketCounts.add(dataPoint.readFixed64());
+                    break;
+                case 7: // explicit_bounds (repeated double)
+                    parsedBounds.add(dataPoint.readDouble());
+                    break;
+                case 9: // attributes (repeated KeyValue)
+                    parsedAttrKeys.add(readKeyValueKey(dataPoint.readBytes().newCodedInput()));
+                    break;
+                case 11: // min (double via fixed64)
+                    assertEquals(
+                            Double.doubleToRawLongBits(hp.min),
+                            Double.doubleToRawLongBits(dataPoint.readDouble()),
+                            "histogram min");
+                    foundMin = true;
+                    break;
+                case 12: // max (double via fixed64)
+                    assertEquals(
+                            Double.doubleToRawLongBits(hp.max),
+                            Double.doubleToRawLongBits(dataPoint.readDouble()),
+                            "histogram max");
+                    foundMax = true;
+                    break;
+                default:
+                    dataPoint.skipField(tag);
+            }
+        }
+
+        assertTrue(foundStartTime, "start_time_unix_nano required for histogram " + expected.name);
+        assertTrue(foundEndTime, "time_unix_nano required for histogram " + expected.name);
+        assertTrue(foundCount, "count required for histogram " + expected.name);
+        assertTrue(foundSum, "sum required for histogram " + expected.name);
+        assertTrue(foundMin, "min required for histogram " + expected.name);
+        assertTrue(foundMax, "max required for histogram " + expected.name);
+
+        // Input uses equal counts and boundaries; derive the expected OTLP wire output:
+        // - finite boundaries are written as explicit_bounds (+Infinity overflow marker is dropped)
+        // - when there is no overflow boundary, one extra zero count is appended so that
+        //   bucket_counts.size() == explicit_bounds.size() + 1, as required by the OTLP spec
+        List<Double> expectedBounds = new ArrayList<>();
+        boolean hasOverflow = false;
+        for (double boundary : hp.bucketBoundaries) {
+            if (Double.isInfinite(boundary)) {
+                hasOverflow = true;
+            } else {
+                expectedBounds.add(boundary);
+            }
+        }
+        List<Long> expectedCounts = new ArrayList<>();
+        for (double count : hp.bucketCounts) {
+            expectedCounts.add((long) count);
+        }
+        if (!expectedCounts.isEmpty() && !hasOverflow) {
+            expectedCounts.add(0L);
+        }
+
+        // OTLP spec: bucket_counts.size() == explicit_bounds.size() + 1, or both 0
+        if (expectedCounts.isEmpty()) {
+            assertEquals(
+                    0, parsedBounds.size(), "explicit_bounds must be 0 when bucket_counts is 0 for " + expected.name);
+            assertEquals(
+                    0,
+                    parsedBucketCounts.size(),
+                    "bucket_counts must be 0 when explicit_bounds is 0 for " + expected.name);
+        } else {
+            assertEquals(
+                    parsedBounds.size() + 1,
+                    parsedBucketCounts.size(),
+                    "OTLP spec: bucket_counts must be explicit_bounds + 1 for " + expected.name);
+        }
+
+        // +Infinity must never appear as an explicit bound on the wire
+        assertFalse(
+                parsedBounds.stream().anyMatch(b -> Double.isInfinite(b)),
+                "+Infinity must not appear in explicit_bounds for " + expected.name);
+
+        assertEquals(expectedBounds.size(), parsedBounds.size(), "explicit_bounds size for " + expected.name);
+        for (int i = 0; i < expectedBounds.size(); i++) {
+            assertEquals(
+                    Double.doubleToRawLongBits(expectedBounds.get(i)),
+                    Double.doubleToRawLongBits(parsedBounds.get(i)),
+                    "explicit_bounds[" + i + "] for " + expected.name);
+        }
+
+        assertEquals(expectedCounts.size(), parsedBucketCounts.size(), "bucket_counts size for " + expected.name);
+        for (int i = 0; i < expectedCounts.size(); i++) {
+            assertEquals(
+                    (long) expectedCounts.get(i),
+                    (long) parsedBucketCounts.get(i),
+                    "bucket_counts[" + i + "] for " + expected.name);
+        }
+
+        assertEquals(expected.attrs.size(), parsedAttrKeys.size(), "attribute count for histogram " + expected.name);
+        for (int i = 0; i < expected.attrs.size(); i++) {
+            assertEquals(
+                    expected.attrs.get(i).key,
+                    parsedAttrKeys.get(i),
+                    "attribute key[" + i + "] for histogram " + expected.name);
+        }
+    }
+
+    /**
+     * Reads a {@code KeyValue} body and returns the key (field 1). The value field is skipped; its
+     * encoding is covered by {@code OtlpCommonProtoTest}.
+     */
+    private static String readKeyValueKey(CodedInputStream keyValue) throws IOException {
+        while (!keyValue.isAtEnd()) {
+            int tag = keyValue.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 1) {
+                return keyValue.readString();
+            }
+            keyValue.skipField(tag);
+        }
+        return null;
+    }
+
+    static OtlpLongPoint longPoint(long value) {
+        return new OtlpLongPoint(value);
+    }
+
+    static OtlpDoublePoint doublePoint(double value) {
+        return new OtlpDoublePoint(value);
+    }
+
+    static OtlpHistogramPoint histogramPoint(
+            double count,
+            List<Double> bucketBoundaries,
+            List<Double> bucketCounts,
+            double sum,
+            double min,
+            double max) {
+        return new OtlpHistogramPoint(count, bucketBoundaries, bucketCounts, sum, min, max);
     }
-    return null;
-  }
-
-  static OtlpLongPoint longPoint(long value) {
-    return new OtlpLongPoint(value);
-  }
-
-  static OtlpDoublePoint doublePoint(double value) {
-    return new OtlpDoublePoint(value);
-  }
-
-  static OtlpHistogramPoint histogramPoint(
-      double count,
-      List<Double> bucketBoundaries,
-      List<Double> bucketCounts,
-      double sum,
-      double min,
-      double max) {
-    return new OtlpHistogramPoint(count, bucketBoundaries, bucketCounts, sum, min, max);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpMetricsServiceTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpMetricsServiceTest.java
index 70e719a3dbb..0c4e6d4a8df 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpMetricsServiceTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpMetricsServiceTest.java
@@ -12,16 +12,16 @@
 
 class OtlpMetricsServiceTest {
 
-  @Test
-  void httpJsonProtocolUsesJsonCollectorAndConfiguredEndpoint() {
-    Properties properties = new Properties();
-    properties.setProperty(OTLP_METRICS_PROTOCOL, "http/json");
-    properties.setProperty(OTLP_METRICS_ENDPOINT, "http://localhost:4318/v1/metrics");
+    @Test
+    void httpJsonProtocolUsesJsonCollectorAndConfiguredEndpoint() {
+        Properties properties = new Properties();
+        properties.setProperty(OTLP_METRICS_PROTOCOL, "http/json");
+        properties.setProperty(OTLP_METRICS_ENDPOINT, "http://localhost:4318/v1/metrics");
 
-    OtlpMetricsService service = new OtlpMetricsService(Config.get(properties));
+        OtlpMetricsService service = new OtlpMetricsService(Config.get(properties));
 
-    assertInstanceOf(OtlpMetricsJsonCollector.class, service.getCollector());
-    OtlpHttpSender sender = assertInstanceOf(OtlpHttpSender.class, service.getSender());
-    assertEquals("http://localhost:4318/v1/metrics", sender.url().toString());
-  }
+        assertInstanceOf(OtlpMetricsJsonCollector.class, service.getCollector());
+        OtlpHttpSender sender = assertInstanceOf(OtlpHttpSender.class, service.getSender());
+        assertEquals("http://localhost:4318/v1/metrics", sender.url().toString());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpMetricsTemporalityTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpMetricsTemporalityTest.java
index 2ff24664d2f..002bb62e9d6 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpMetricsTemporalityTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpMetricsTemporalityTest.java
@@ -16,31 +16,31 @@
 
 class OtlpMetricsTemporalityTest {
 
-  @Test
-  void deltaPreferenceMakesEligibleTypesDelta() {
-    assertEquals(TEMPORALITY_DELTA, temporality(DELTA, HISTOGRAM));
-    assertEquals(TEMPORALITY_DELTA, temporality(DELTA, COUNTER));
-    assertEquals(TEMPORALITY_DELTA, temporality(DELTA, OBSERVABLE_COUNTER));
-  }
-
-  @Test
-  void deltaPreferenceKeepsIneligibleTypesCumulative() {
-    assertEquals(TEMPORALITY_CUMULATIVE, temporality(DELTA, GAUGE));
-  }
-
-  @Test
-  void lowMemoryPreferenceMakesEligibleTypesDelta() {
-    assertEquals(TEMPORALITY_DELTA, temporality(LOWMEMORY, HISTOGRAM));
-    assertEquals(TEMPORALITY_DELTA, temporality(LOWMEMORY, COUNTER));
-  }
-
-  @Test
-  void lowMemoryPreferenceKeepsObservableCounterCumulative() {
-    assertEquals(TEMPORALITY_CUMULATIVE, temporality(LOWMEMORY, OBSERVABLE_COUNTER));
-  }
-
-  @Test
-  void cumulativePreferenceIsAlwaysCumulative() {
-    assertEquals(TEMPORALITY_CUMULATIVE, temporality(CUMULATIVE, COUNTER));
-  }
+    @Test
+    void deltaPreferenceMakesEligibleTypesDelta() {
+        assertEquals(TEMPORALITY_DELTA, temporality(DELTA, HISTOGRAM));
+        assertEquals(TEMPORALITY_DELTA, temporality(DELTA, COUNTER));
+        assertEquals(TEMPORALITY_DELTA, temporality(DELTA, OBSERVABLE_COUNTER));
+    }
+
+    @Test
+    void deltaPreferenceKeepsIneligibleTypesCumulative() {
+        assertEquals(TEMPORALITY_CUMULATIVE, temporality(DELTA, GAUGE));
+    }
+
+    @Test
+    void lowMemoryPreferenceMakesEligibleTypesDelta() {
+        assertEquals(TEMPORALITY_DELTA, temporality(LOWMEMORY, HISTOGRAM));
+        assertEquals(TEMPORALITY_DELTA, temporality(LOWMEMORY, COUNTER));
+    }
+
+    @Test
+    void lowMemoryPreferenceKeepsObservableCounterCumulative() {
+        assertEquals(TEMPORALITY_CUMULATIVE, temporality(LOWMEMORY, OBSERVABLE_COUNTER));
+    }
+
+    @Test
+    void cumulativePreferenceIsAlwaysCumulative() {
+        assertEquals(TEMPORALITY_CUMULATIVE, temporality(CUMULATIVE, COUNTER));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpStatsHistogramBucketsTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpStatsHistogramBucketsTest.java
index a24fe5d64b1..fa12dd8bc89 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpStatsHistogramBucketsTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpStatsHistogramBucketsTest.java
@@ -25,121 +25,116 @@
  */
 class OtlpStatsHistogramBucketsTest {
 
-  private static final double NANOS_PER_SECOND = 1_000_000_000d;
-
-  // Tolerance for double assertions on exactly-computed values (e.g. sum from sumNanos, integer
-  // counts). DDSketch-derived values like min/max use looser tolerances inline, since the sketch
-  // only preserves values to within its relative accuracy.
-  private static final double EPS = 1e-9;
-
-  @BeforeAll
-  static void registerHistogramFactory() {
-    Histograms.register(DDSketchHistograms.FACTORY);
-  }
-
-  // ── bucketIndex ──────────────────────────────────────────────────────────
-
-  static Stream<Arguments> boundsWithIndex() {
-    return IntStream.range(0, BOUNDS_SECONDS.length)
-        .mapToObj(i -> Arguments.of(i, BOUNDS_SECONDS[i]));
-  }
-
-  @ParameterizedTest(name = "value exactly on BOUNDS_SECONDS[{0}]={1} returns index {0}")
-  @MethodSource("boundsWithIndex")
-  void valueExactlyOnBoundReturnsThatIndex(int index, double bound) {
-    // <= semantics: a value exactly on a bound falls in that bound's bucket.
-    assertEquals(index, bucketIndex(bound));
-  }
-
-  @Test
-  void valueJustAboveSmallBoundFallsInNextBucket() {
-    // 0.002 is the first bound; a value just above it but below the second bound (0.004)
-    // must roll into the next index.
-    assertEquals(0, bucketIndex(0.002));
-    assertEquals(1, bucketIndex(0.0020001));
-    assertEquals(1, bucketIndex(0.004));
-  }
-
-  @Test
-  void valueAboveLargestBoundIsOverflow() {
-    // > 15s overflows to the final (16th) index.
-    assertEquals(BOUNDS_SECONDS.length, bucketIndex(15.0000001));
-    assertEquals(BOUNDS_SECONDS.length, bucketIndex(100.0));
-    // exactly 15 (the largest non-overflow bound) is the last non-overflow index.
-    assertEquals(BOUNDS_SECONDS.length - 1, bucketIndex(15.0));
-  }
-
-  // ── EXPLICIT_BOUNDS layout ────────────────────────────────────────────────
-
-  @Test
-  void explicitBoundsHas17EntriesEndingInInfinity() {
-    assertEquals(17, EXPLICIT_BOUNDS.size());
-    assertEquals(Double.POSITIVE_INFINITY, EXPLICIT_BOUNDS.get(EXPLICIT_BOUNDS.size() - 1));
-  }
-
-  // ── toHistogramPoint ──────────────────────────────────────────────────────
-
-  @Test
-  void toHistogramPointSummary() {
-    Histogram h = Histogram.newHistogram();
-    // 1ns and 1ms are below the smallest bound (0.002s) and must land in bucket 0; 100ms → bucket
-    // 6, 3s → bucket 13.
-    long[] samplesNanos = {
-      1L,
-      (long) (0.001 * NANOS_PER_SECOND),
-      (long) (0.1 * NANOS_PER_SECOND),
-      (long) (3.0 * NANOS_PER_SECOND)
-    };
-    for (long s : samplesNanos) {
-      h.accept(s);
+    private static final double NANOS_PER_SECOND = 1_000_000_000d;
+
+    // Tolerance for double assertions on exactly-computed values (e.g. sum from sumNanos, integer
+    // counts). DDSketch-derived values like min/max use looser tolerances inline, since the sketch
+    // only preserves values to within its relative accuracy.
+    private static final double EPS = 1e-9;
+
+    @BeforeAll
+    static void registerHistogramFactory() {
+        Histograms.register(DDSketchHistograms.FACTORY);
+    }
+
+    // ── bucketIndex ──────────────────────────────────────────────────────────
+
+    static Stream<Arguments> boundsWithIndex() {
+        return IntStream.range(0, BOUNDS_SECONDS.length).mapToObj(i -> Arguments.of(i, BOUNDS_SECONDS[i]));
+    }
+
+    @ParameterizedTest(name = "value exactly on BOUNDS_SECONDS[{0}]={1} returns index {0}")
+    @MethodSource("boundsWithIndex")
+    void valueExactlyOnBoundReturnsThatIndex(int index, double bound) {
+        // <= semantics: a value exactly on a bound falls in that bound's bucket.
+        assertEquals(index, bucketIndex(bound));
     }
 
-    // Use a sumNanos that deliberately differs from the sketch's implied sum to prove the
-    // returned sum comes from the ARGUMENT, not the sketch.
-    long sumNanos = 42L * (long) NANOS_PER_SECOND;
-    OtlpHistogramPoint point = toHistogramPoint(h, sumNanos);
-
-    // 17 bucket counts (the EXPLICIT_BOUNDS layout itself is covered by its own test).
-    assertEquals(17, point.bucketCounts.size());
-
-    // total count == number of samples.
-    assertEquals(samplesNanos.length, (long) point.count);
-
-    // max is the 3s sample (CollapsingLowestDenseStore collapses the LOWEST bins, so the top is
-    // preserved accurately). The exact 1ns min is NOT recoverable: over this wide value range the
-    // lowest bins collapse, so getMinValue reports the collapsed bin (sub-2ms here), not 1ns. The
-    // tiny sample isn't lost though — that's proven by the count and bucket-0 assertions below.
-    // DDSketch is relative-accuracy, so min/max use loose tolerances.
-    assertTrue(
-        point.min > 0 && point.min <= BOUNDS_SECONDS[0], "min collapses into bucket 0 range");
-    assertEquals(3.0, point.max, 1e-2);
-
-    // sum equals the sumNanos ARGUMENT converted to seconds, not the sketch sum.
-    assertEquals(42.0, point.sum, EPS);
-
-    long bucketTotal = 0;
-    for (int i = 0; i < point.bucketCounts.size(); i++) {
-      long c = (long) point.bucketCounts.get(i).doubleValue();
-      bucketTotal += c;
-      if (i == 0) {
-        assertEquals(2L, c, "1ns + 1ms both land in bucket 0 (<= 0.002s)");
-      }
+    @Test
+    void valueJustAboveSmallBoundFallsInNextBucket() {
+        // 0.002 is the first bound; a value just above it but below the second bound (0.004)
+        // must roll into the next index.
+        assertEquals(0, bucketIndex(0.002));
+        assertEquals(1, bucketIndex(0.0020001));
+        assertEquals(1, bucketIndex(0.004));
     }
-    assertEquals(samplesNanos.length, bucketTotal);
-  }
-
-  @Test
-  void emptyHistogramHasZeroMinMaxAndCount() {
-    Histogram h = Histogram.newHistogram();
-    OtlpHistogramPoint point = toHistogramPoint(h, 0L);
-
-    assertEquals(0.0, point.count, EPS);
-    assertEquals(0.0, point.min, EPS);
-    assertEquals(0.0, point.max, EPS);
-    long bucketTotal = 0;
-    for (double c : point.bucketCounts) {
-      bucketTotal += (long) c;
+
+    @Test
+    void valueAboveLargestBoundIsOverflow() {
+        // > 15s overflows to the final (16th) index.
+        assertEquals(BOUNDS_SECONDS.length, bucketIndex(15.0000001));
+        assertEquals(BOUNDS_SECONDS.length, bucketIndex(100.0));
+        // exactly 15 (the largest non-overflow bound) is the last non-overflow index.
+        assertEquals(BOUNDS_SECONDS.length - 1, bucketIndex(15.0));
+    }
+
+    // ── EXPLICIT_BOUNDS layout ────────────────────────────────────────────────
+
+    @Test
+    void explicitBoundsHas17EntriesEndingInInfinity() {
+        assertEquals(17, EXPLICIT_BOUNDS.size());
+        assertEquals(Double.POSITIVE_INFINITY, EXPLICIT_BOUNDS.get(EXPLICIT_BOUNDS.size() - 1));
+    }
+
+    // ── toHistogramPoint ──────────────────────────────────────────────────────
+
+    @Test
+    void toHistogramPointSummary() {
+        Histogram h = Histogram.newHistogram();
+        // 1ns and 1ms are below the smallest bound (0.002s) and must land in bucket 0; 100ms → bucket
+        // 6, 3s → bucket 13.
+        long[] samplesNanos = {
+            1L, (long) (0.001 * NANOS_PER_SECOND), (long) (0.1 * NANOS_PER_SECOND), (long) (3.0 * NANOS_PER_SECOND)
+        };
+        for (long s : samplesNanos) {
+            h.accept(s);
+        }
+
+        // Use a sumNanos that deliberately differs from the sketch's implied sum to prove the
+        // returned sum comes from the ARGUMENT, not the sketch.
+        long sumNanos = 42L * (long) NANOS_PER_SECOND;
+        OtlpHistogramPoint point = toHistogramPoint(h, sumNanos);
+
+        // 17 bucket counts (the EXPLICIT_BOUNDS layout itself is covered by its own test).
+        assertEquals(17, point.bucketCounts.size());
+
+        // total count == number of samples.
+        assertEquals(samplesNanos.length, (long) point.count);
+
+        // max is the 3s sample (CollapsingLowestDenseStore collapses the LOWEST bins, so the top is
+        // preserved accurately). The exact 1ns min is NOT recoverable: over this wide value range the
+        // lowest bins collapse, so getMinValue reports the collapsed bin (sub-2ms here), not 1ns. The
+        // tiny sample isn't lost though — that's proven by the count and bucket-0 assertions below.
+        // DDSketch is relative-accuracy, so min/max use loose tolerances.
+        assertTrue(point.min > 0 && point.min <= BOUNDS_SECONDS[0], "min collapses into bucket 0 range");
+        assertEquals(3.0, point.max, 1e-2);
+
+        // sum equals the sumNanos ARGUMENT converted to seconds, not the sketch sum.
+        assertEquals(42.0, point.sum, EPS);
+
+        long bucketTotal = 0;
+        for (int i = 0; i < point.bucketCounts.size(); i++) {
+            long c = (long) point.bucketCounts.get(i).doubleValue();
+            bucketTotal += c;
+            if (i == 0) {
+                assertEquals(2L, c, "1ns + 1ms both land in bucket 0 (<= 0.002s)");
+            }
+        }
+        assertEquals(samplesNanos.length, bucketTotal);
+    }
+
+    @Test
+    void emptyHistogramHasZeroMinMaxAndCount() {
+        Histogram h = Histogram.newHistogram();
+        OtlpHistogramPoint point = toHistogramPoint(h, 0L);
+
+        assertEquals(0.0, point.count, EPS);
+        assertEquals(0.0, point.min, EPS);
+        assertEquals(0.0, point.max, EPS);
+        long bucketTotal = 0;
+        for (double c : point.bucketCounts) {
+            bucketTotal += (long) c;
+        }
+        assertEquals(0L, bucketTotal);
     }
-    assertEquals(0L, bucketTotal);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpStatsMetricWriterTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpStatsMetricWriterTest.java
index e20f8713b84..af843754e0d 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpStatsMetricWriterTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/metrics/OtlpStatsMetricWriterTest.java
@@ -52,764 +52,727 @@
  */
 class OtlpStatsMetricWriterTest {
 
-  private static final int TEMPORALITY_DELTA = 1;
-  private static final long BUCKET_START = SECONDS.toNanos(1_700_000_000L);
-  private static final long BUCKET_DURATION = SECONDS.toNanos(10);
-
-  @BeforeAll
-  static void registerHistogramFactory() {
-    Histograms.register(DDSketchHistograms.FACTORY);
-  }
-
-  // ── capturing sender ──────────────────────────────────────────────────────
-
-  private static final class CapturingSender implements OtlpSender {
-    int sendCount;
-    byte[] lastPayload;
-
-    @Override
-    public RemoteApi.Response send(OtlpPayload payload) {
-      sendCount++;
-      java.nio.ByteBuffer content = payload.getContent();
-      byte[] bytes = new byte[content.remaining()];
-      content.get(bytes);
-      lastPayload = bytes;
-      return success(200);
-    }
-
-    @Override
-    public void shutdown() {}
-  }
-
-  // ── entry builders ──────────────────────────────────────────────────────
-
-  private static AggregateEntry entry(
-      String resource,
-      boolean synthetic,
-      int httpStatusCode,
-      @Nullable String httpMethod,
-      @Nullable String httpEndpoint,
-      @Nullable String grpcStatusCode) {
-    return AggregateEntryTestUtils.of(
-        resource,
-        "web",
-        "servlet.request",
-        null,
-        "web",
-        httpStatusCode,
-        synthetic,
-        true,
-        "server",
-        null,
-        httpMethod,
-        httpEndpoint,
-        grpcStatusCode);
-  }
-
-  /** Build an entry and record {@code hits} ok durations of {@code durationNanos} each. */
-  private static AggregateEntry okEntry(long durationNanos, int hits) {
-    AggregateEntry e = entry("GET /users", false, 0, null, null, null);
-    for (int i = 0; i < hits; i++) {
-      AggregateEntryTestUtils.recordOk(e, durationNanos);
-    }
-    return e;
-  }
-
-  // ── decode helpers (adapted from OtlpMetricsProtoTest) ──────────────────────
-
-  /**
-   * A decoded histogram data point. Only the fields this test asserts on are decoded: the window
-   * timestamps, the total count, and the attributes. Per-bucket contents (bucket_counts,
-   * explicit_bounds), sum, min, and max are intentionally not decoded here.
-   */
-  private static final class DataPoint {
-    long start;
-    long end;
-    long count;
-    final Map<String, Object> attributes = new HashMap<>();
-  }
-
-  /** A decoded metric: name, unit, temporality, and its histogram data points. */
-  private static final class DecodedMetric {
-    String name;
-    String unit;
-    int temporality = -1;
-    final List<DataPoint> dataPoints = new ArrayList<>();
-  }
-
-  /** Decodes a full {@code MetricsData} payload into the single histogram metric it carries. */
-  private static DecodedMetric decode(byte[] payload) throws IOException {
-    CodedInputStream metricsData = CodedInputStream.newInstance(payload);
-    int metricsTag = metricsData.readTag();
-    assertEquals(1, WireFormat.getTagFieldNumber(metricsTag), "MetricsData.resource_metrics = 1");
-    CodedInputStream resourceMetrics = metricsData.readBytes().newCodedInput();
-    assertTrue(metricsData.isAtEnd(), "expected exactly one ResourceMetrics");
-
-    DecodedMetric metric = null;
-    while (!resourceMetrics.isAtEnd()) {
-      int tag = resourceMetrics.readTag();
-      int field = WireFormat.getTagFieldNumber(tag);
-      if (field == 2) { // ScopeMetrics
-        metric = parseScopeMetrics(resourceMetrics.readBytes().newCodedInput());
-      } else {
-        resourceMetrics.skipField(tag); // Resource (field 1) etc.
-      }
-    }
-    assertNotNull(metric, "no ScopeMetrics found");
-    return metric;
-  }
-
-  /**
-   * Decodes the {@code Resource.attributes} ({@code ResourceMetrics.resource = 1} → {@code
-   * Resource.attributes = 1}) into a key→value map, for asserting the {@code datadog.*} resource
-   * attributes emitted by the trace-metrics exporter.
-   */
-  private static Map<String, Object> decodeResourceAttributes(byte[] payload) throws IOException {
-    CodedInputStream metricsData = CodedInputStream.newInstance(payload);
-    metricsData.readTag(); // MetricsData.resource_metrics = 1
-    CodedInputStream resourceMetrics = metricsData.readBytes().newCodedInput();
-    Map<String, Object> attrs = new HashMap<>();
-    while (!resourceMetrics.isAtEnd()) {
-      int tag = resourceMetrics.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 1) { // Resource
-        CodedInputStream resource = resourceMetrics.readBytes().newCodedInput();
-        while (!resource.isAtEnd()) {
-          int rtag = resource.readTag();
-          if (WireFormat.getTagFieldNumber(rtag) == 1) { // KeyValue attributes
-            readKeyValue(resource.readBytes().newCodedInput(), attrs);
-          } else {
-            resource.skipField(rtag);
-          }
+    private static final int TEMPORALITY_DELTA = 1;
+    private static final long BUCKET_START = SECONDS.toNanos(1_700_000_000L);
+    private static final long BUCKET_DURATION = SECONDS.toNanos(10);
+
+    @BeforeAll
+    static void registerHistogramFactory() {
+        Histograms.register(DDSketchHistograms.FACTORY);
+    }
+
+    // ── capturing sender ──────────────────────────────────────────────────────
+
+    private static final class CapturingSender implements OtlpSender {
+        int sendCount;
+        byte[] lastPayload;
+
+        @Override
+        public RemoteApi.Response send(OtlpPayload payload) {
+            sendCount++;
+            java.nio.ByteBuffer content = payload.getContent();
+            byte[] bytes = new byte[content.remaining()];
+            content.get(bytes);
+            lastPayload = bytes;
+            return success(200);
+        }
+
+        @Override
+        public void shutdown() {}
+    }
+
+    // ── entry builders ──────────────────────────────────────────────────────
+
+    private static AggregateEntry entry(
+            String resource,
+            boolean synthetic,
+            int httpStatusCode,
+            @Nullable String httpMethod,
+            @Nullable String httpEndpoint,
+            @Nullable String grpcStatusCode) {
+        return AggregateEntryTestUtils.of(
+                resource,
+                "web",
+                "servlet.request",
+                null,
+                "web",
+                httpStatusCode,
+                synthetic,
+                true,
+                "server",
+                null,
+                httpMethod,
+                httpEndpoint,
+                grpcStatusCode);
+    }
+
+    /** Build an entry and record {@code hits} ok durations of {@code durationNanos} each. */
+    private static AggregateEntry okEntry(long durationNanos, int hits) {
+        AggregateEntry e = entry("GET /users", false, 0, null, null, null);
+        for (int i = 0; i < hits; i++) {
+            AggregateEntryTestUtils.recordOk(e, durationNanos);
+        }
+        return e;
+    }
+
+    // ── decode helpers (adapted from OtlpMetricsProtoTest) ──────────────────────
+
+    /**
+     * A decoded histogram data point. Only the fields this test asserts on are decoded: the window
+     * timestamps, the total count, and the attributes. Per-bucket contents (bucket_counts,
+     * explicit_bounds), sum, min, and max are intentionally not decoded here.
+     */
+    private static final class DataPoint {
+        long start;
+        long end;
+        long count;
+        final Map<String, Object> attributes = new HashMap<>();
+    }
+
+    /** A decoded metric: name, unit, temporality, and its histogram data points. */
+    private static final class DecodedMetric {
+        String name;
+        String unit;
+        int temporality = -1;
+        final List<DataPoint> dataPoints = new ArrayList<>();
+    }
+
+    /** Decodes a full {@code MetricsData} payload into the single histogram metric it carries. */
+    private static DecodedMetric decode(byte[] payload) throws IOException {
+        CodedInputStream metricsData = CodedInputStream.newInstance(payload);
+        int metricsTag = metricsData.readTag();
+        assertEquals(1, WireFormat.getTagFieldNumber(metricsTag), "MetricsData.resource_metrics = 1");
+        CodedInputStream resourceMetrics = metricsData.readBytes().newCodedInput();
+        assertTrue(metricsData.isAtEnd(), "expected exactly one ResourceMetrics");
+
+        DecodedMetric metric = null;
+        while (!resourceMetrics.isAtEnd()) {
+            int tag = resourceMetrics.readTag();
+            int field = WireFormat.getTagFieldNumber(tag);
+            if (field == 2) { // ScopeMetrics
+                metric = parseScopeMetrics(resourceMetrics.readBytes().newCodedInput());
+            } else {
+                resourceMetrics.skipField(tag); // Resource (field 1) etc.
+            }
+        }
+        assertNotNull(metric, "no ScopeMetrics found");
+        return metric;
+    }
+
+    /**
+     * Decodes the {@code Resource.attributes} ({@code ResourceMetrics.resource = 1} → {@code
+     * Resource.attributes = 1}) into a key→value map, for asserting the {@code datadog.*} resource
+     * attributes emitted by the trace-metrics exporter.
+     */
+    private static Map<String, Object> decodeResourceAttributes(byte[] payload) throws IOException {
+        CodedInputStream metricsData = CodedInputStream.newInstance(payload);
+        metricsData.readTag(); // MetricsData.resource_metrics = 1
+        CodedInputStream resourceMetrics = metricsData.readBytes().newCodedInput();
+        Map<String, Object> attrs = new HashMap<>();
+        while (!resourceMetrics.isAtEnd()) {
+            int tag = resourceMetrics.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 1) { // Resource
+                CodedInputStream resource = resourceMetrics.readBytes().newCodedInput();
+                while (!resource.isAtEnd()) {
+                    int rtag = resource.readTag();
+                    if (WireFormat.getTagFieldNumber(rtag) == 1) { // KeyValue attributes
+                        readKeyValue(resource.readBytes().newCodedInput(), attrs);
+                    } else {
+                        resource.skipField(rtag);
+                    }
+                }
+            } else {
+                resourceMetrics.skipField(tag);
+            }
+        }
+        return attrs;
+    }
+
+    private static DecodedMetric parseScopeMetrics(CodedInputStream scopeMetrics) throws IOException {
+        DecodedMetric metric = null;
+        while (!scopeMetrics.isAtEnd()) {
+            int tag = scopeMetrics.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 2) { // Metric
+                metric = parseMetric(scopeMetrics.readBytes().newCodedInput());
+            } else {
+                scopeMetrics.skipField(tag);
+            }
+        }
+        return metric;
+    }
+
+    private static DecodedMetric parseMetric(CodedInputStream m) throws IOException {
+        DecodedMetric metric = new DecodedMetric();
+        while (!m.isAtEnd()) {
+            int tag = m.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 1:
+                    metric.name = m.readString();
+                    break;
+                case 3:
+                    metric.unit = m.readString();
+                    break;
+                case 9: // Histogram
+                    parseHistogram(m.readBytes().newCodedInput(), metric);
+                    break;
+                default:
+                    m.skipField(tag);
+            }
+        }
+        return metric;
+    }
+
+    private static void parseHistogram(CodedInputStream h, DecodedMetric metric) throws IOException {
+        while (!h.isAtEnd()) {
+            int tag = h.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 1: // HistogramDataPoint (repeated)
+                    metric.dataPoints.add(parseDataPoint(h.readBytes().newCodedInput()));
+                    break;
+                case 2: // aggregation_temporality
+                    metric.temporality = h.readEnum();
+                    break;
+                default:
+                    h.skipField(tag);
+            }
+        }
+    }
+
+    private static DataPoint parseDataPoint(CodedInputStream dp) throws IOException {
+        DataPoint p = new DataPoint();
+        while (!dp.isAtEnd()) {
+            int tag = dp.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 2:
+                    p.start = dp.readFixed64();
+                    break;
+                case 3:
+                    p.end = dp.readFixed64();
+                    break;
+                case 4:
+                    p.count = dp.readFixed64();
+                    break;
+                case 9: // attributes (KeyValue)
+                    readKeyValue(dp.readBytes().newCodedInput(), p.attributes);
+                    break;
+                default: // sum, bucket_counts, explicit_bounds, min, max — not asserted here
+                    dp.skipField(tag);
+            }
+        }
+        return p;
+    }
+
+    /**
+     * Reads a {@code KeyValue} into {@code out}: key (field 1) → value. Value is an {@code AnyValue}
+     * (field 2); we decode string (field 1) and int (field 3) variants used by this writer.
+     */
+    private static void readKeyValue(CodedInputStream kv, Map<String, Object> out) throws IOException {
+        String key = null;
+        Object value = null;
+        while (!kv.isAtEnd()) {
+            int tag = kv.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 1:
+                    key = kv.readString();
+                    break;
+                case 2: // AnyValue
+                    value = readAnyValue(kv.readBytes().newCodedInput());
+                    break;
+                default:
+                    kv.skipField(tag);
+            }
+        }
+        if (key != null) {
+            out.put(key, value);
+        }
+    }
+
+    private static Object readAnyValue(CodedInputStream any) throws IOException {
+        Object value = null;
+        while (!any.isAtEnd()) {
+            int tag = any.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 1: // string_value
+                    value = any.readString();
+                    break;
+                case 2: // bool_value
+                    value = any.readBool();
+                    break;
+                case 3: // int_value
+                    value = any.readInt64();
+                    break;
+                case 5: // array_value
+                    value = readArrayValue(any.readBytes().newCodedInput());
+                    break;
+                default:
+                    any.skipField(tag);
+            }
+        }
+        return value;
+    }
+
+    /**
+     * Decodes an {@code ArrayValue.values} (field 1, repeated {@code AnyValue}) into a string list.
+     */
+    private static List<String> readArrayValue(CodedInputStream arrayValue) throws IOException {
+        List<String> values = new ArrayList<>();
+        while (!arrayValue.isAtEnd()) {
+            int tag = arrayValue.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 1) {
+                values.add((String) readAnyValue(arrayValue.readBytes().newCodedInput()));
+            } else {
+                arrayValue.skipField(tag);
+            }
+        }
+        return values;
+    }
+
+    // ── writer driver ─────────────────────────────────────────────────────────
+
+    /**
+     * Drives the writer through one full {@code startBucket → add → finishBucket} cycle for {@code
+     * entry} over the fixed {@link #BUCKET_START}/{@link #BUCKET_DURATION} window, asserts that
+     * exactly one payload was sent, and returns the decoded metric.
+     */
+    private static DecodedMetric writeAndDecode(AggregateEntry entry) throws IOException {
+        CapturingSender sender = new CapturingSender();
+        OtlpStatsMetricWriter writer = new OtlpStatsMetricWriter(sender);
+        writer.startBucket(1, BUCKET_START, BUCKET_DURATION);
+        writer.add(entry);
+        writer.finishBucket();
+        assertEquals(1, sender.sendCount, "exactly one payload sent");
+        return decode(sender.lastPayload);
+    }
+
+    // ── test cases ──────────────────────────────────────────────────────────
+
+    @Test
+    void okOnlyEntryProducesExactlyOneDataPoint() throws IOException {
+        DecodedMetric metric = writeAndDecode(okEntry(SECONDS.toNanos(1), 3));
+
+        assertEquals("traces.span.sdk.metrics.duration", metric.name);
+        assertEquals("s", metric.unit);
+        assertEquals(TEMPORALITY_DELTA, metric.temporality, "histogram must be delta temporality");
+        assertEquals(1, metric.dataPoints.size(), "ok-only → one data point");
+
+        DataPoint dp = metric.dataPoints.get(0);
+        assertEquals(BUCKET_START, dp.start, "start_time_unix_nano == startBucket start");
+        assertEquals(BUCKET_START + BUCKET_DURATION, dp.end, "time_unix_nano == start + duration");
+        assertEquals(3L, dp.count);
+        assertEquals("STATUS_CODE_OK", dp.attributes.get("status.code"), "ok point → STATUS_CODE_OK");
+    }
+
+    @Test
+    void okPlusErrorEntryProducesTwoDataPointsWithErrorStatus() throws IOException {
+        AggregateEntry e = entry("GET /users", false, 0, null, null, null);
+        AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1)); // ok
+        AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(2)); // ok
+        AggregateEntryTestUtils.recordError(e, SECONDS.toNanos(3)); // error
+
+        DecodedMetric metric = writeAndDecode(e);
+        assertEquals(2, metric.dataPoints.size(), "ok+error → two data points");
+
+        long okCount = 0;
+        long errorCount = 0;
+        DataPoint errorPoint = null;
+        DataPoint okPoint = null;
+        for (DataPoint dp : metric.dataPoints) {
+            if ("STATUS_CODE_ERROR".equals(dp.attributes.get("status.code"))) {
+                errorPoint = dp;
+                errorCount = dp.count;
+            } else {
+                okPoint = dp;
+                okCount = dp.count;
+            }
+        }
+        assertNotNull(errorPoint, "one data point must carry status.code=STATUS_CODE_ERROR");
+        assertNotNull(okPoint, "one data point must carry status.code=STATUS_CODE_OK");
+        assertEquals("STATUS_CODE_OK", okPoint.attributes.get("status.code"));
+        assertEquals(e.getOkLatencies().getCount(), (double) okCount, 1e-9);
+        assertEquals(e.getErrorLatencies().getCount(), (double) errorCount, 1e-9);
+    }
+
+    @Test
+    void errorSeriesDoesNotLingerAfterClearWhenBucketHasOnlyOkHits() throws IOException {
+        CapturingSender sender = new CapturingSender();
+        OtlpStatsMetricWriter writer = new OtlpStatsMetricWriter(sender);
+
+        // Bucket 1: the entry sees an error, so its error histogram is allocated and emits a point.
+        AggregateEntry e = entry("GET /users", false, 0, null, null, null);
+        AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1)); // ok
+        AggregateEntryTestUtils.recordError(e, SECONDS.toNanos(3)); // error
+
+        writer.startBucket(1, BUCKET_START, BUCKET_DURATION);
+        writer.add(e);
+        writer.finishBucket();
+        DecodedMetric bucket1 = decode(sender.lastPayload);
+        assertEquals(2, bucket1.dataPoints.size(), "bucket with an error → ok+error data points");
+        assertTrue(
+                bucket1.dataPoints.stream()
+                        .anyMatch(dp -> "STATUS_CODE_ERROR".equals(dp.attributes.get("status.code"))),
+                "bucket 1 must carry a status.code=STATUS_CODE_ERROR point");
+
+        // Bucket 2: same entry, reset then only OK hits. errorLatencies survives clear() (cleared, not
+        // nulled), so a non-null-but-empty histogram must NOT emit a phantom zero-count error series.
+        AggregateEntryTestUtils.clear(e);
+        AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(2)); // ok only
+
+        writer.startBucket(2, BUCKET_START + BUCKET_DURATION, BUCKET_DURATION);
+        writer.add(e);
+        writer.finishBucket();
+        DecodedMetric bucket2 = decode(sender.lastPayload);
+        assertEquals(1, bucket2.dataPoints.size(), "ok-only bucket → exactly one data point");
+        assertEquals(
+                "STATUS_CODE_OK",
+                bucket2.dataPoints.get(0).attributes.get("status.code"),
+                "recovered entry must not emit a lingering status.code=STATUS_CODE_ERROR series");
+    }
+
+    @Test
+    void httpAndGrpcAttributesAppearOnlyWhenSet() throws IOException {
+        AggregateEntry e = entry("GET /users/{id}", false, 200, "GET", "/users/{id}", "0");
+        AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
+
+        DecodedMetric metric = writeAndDecode(e);
+        assertEquals(1, metric.dataPoints.size());
+        Map<String, Object> attrs = metric.dataPoints.get(0).attributes;
+
+        assertEquals("GET", attrs.get("http.request.method"));
+        assertEquals(200L, attrs.get("http.response.status_code"));
+        assertEquals("/users/{id}", attrs.get("http.route"));
+        assertEquals("0", attrs.get("rpc.response.status_code"));
+
+        // a bare entry has none of these
+        Map<String, Object> bareAttrs =
+                writeAndDecode(okEntry(SECONDS.toNanos(1), 1)).dataPoints.get(0).attributes;
+        assertFalse(bareAttrs.containsKey("http.request.method"));
+        assertFalse(bareAttrs.containsKey("http.response.status_code"));
+        assertFalse(bareAttrs.containsKey("http.route"));
+        assertFalse(bareAttrs.containsKey("rpc.response.status_code"));
+    }
+
+    @Test
+    void additionalMetricTagsEmittedAsStringAttributes() throws IOException {
+        // Additional tags arrive on the entry pre-packed as "key:value" UTF8 strings in schema order;
+        // the writer splits each at the first ':' and emits it as a plain OTLP string attribute keyed
+        // by the tag name.
+        AggregateEntry e = AggregateEntryTestUtils.of(
+                "GET /users",
+                "web",
+                "servlet.request",
+                null,
+                "web",
+                0,
+                false,
+                true,
+                "server",
+                null,
+                null,
+                null,
+                null,
+                new UTF8BytesString[] {
+                    UTF8BytesString.create("region:us-east-1"),
+                    UTF8BytesString.create("tenant_id:acme:corp"),
+                    UTF8BytesString.create("datadog.custom:visible")
+                });
+        AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
+
+        Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
+        assertEquals("us-east-1", attrs.get("region"));
+        // value may itself contain ':' — only the first ':' separates key from value
+        assertEquals("acme:corp", attrs.get("tenant_id"));
+        assertEquals("visible", attrs.get("datadog.custom"));
+    }
+
+    @Test
+    void emptyValueEmittedButMalformedSlotsSkipped() throws IOException {
+        // A slot with no ':' or an empty key is dropped as malformed. An empty value ("key:") is NOT
+        // malformed -- aggregation treats an explicitly-empty tag as a distinct dimension from an
+        // absent
+        // one, so it is emitted as key="" to keep the OTLP attributes faithful to the aggregate key.
+        AggregateEntry e = AggregateEntryTestUtils.of(
+                "GET /users",
+                "web",
+                "servlet.request",
+                null,
+                "web",
+                0,
+                false,
+                true,
+                "server",
+                null,
+                null,
+                null,
+                null,
+                new UTF8BytesString[] {
+                    UTF8BytesString.create("noseparator"),
+                    UTF8BytesString.create(":emptykey"),
+                    UTF8BytesString.create("emptyvalue:"),
+                    UTF8BytesString.create("region:us-east-1")
+                });
+        AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
+
+        Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
+        assertEquals("us-east-1", attrs.get("region"), "well-formed tag still emitted");
+        assertFalse(attrs.containsKey("noseparator"), "no-separator slot skipped");
+        assertFalse(attrs.containsKey(""), "empty-key slot skipped");
+        assertTrue(attrs.containsKey("emptyvalue"), "empty-value slot emitted");
+        assertEquals("", attrs.get("emptyvalue"), "empty value emitted as empty string");
+    }
+
+    @Test
+    void serviceNameAlwaysEmittedOnDataPoint() throws IOException {
+        CapturingSender sender = new CapturingSender();
+        OtlpStatsMetricWriter writer = new OtlpStatsMetricWriter(sender);
+
+        long start = SECONDS.toNanos(1_700_000_000L);
+        writer.startBucket(2, start, SECONDS.toNanos(10));
+        writer.add(serviceEntry("web.request", "web"));
+        writer.add(serviceEntry("db.query", "postgres"));
+        writer.finishBucket();
+
+        DecodedMetric metric = decode(sender.lastPayload);
+        assertEquals(2, metric.dataPoints.size());
+
+        Map<String, Object> webAttrs = null;
+        Map<String, Object> postgresAttrs = null;
+        for (DataPoint dp : metric.dataPoints) {
+            if ("db.query".equals(dp.attributes.get("datadog.operation.name"))) {
+                postgresAttrs = dp.attributes;
+            } else {
+                webAttrs = dp.attributes;
+            }
+        }
+        assertNotNull(postgresAttrs, "postgres data point present");
+        assertNotNull(webAttrs, "web data point present");
+        assertEquals("postgres", postgresAttrs.get("service.name"));
+        assertEquals(
+                "web",
+                webAttrs.get("service.name"),
+                "service.name is emitted unconditionally, even matching the tracer's own default service");
+    }
+
+    /** An ok-only entry on the given service and operation name, recording a single 1s hit. */
+    private static AggregateEntry serviceEntry(String operationName, String service) {
+        AggregateEntry e = AggregateEntryTestUtils.of(
+                "GET /users", service, operationName, null, "web", 0, false, true, "server", null, null, null, null);
+        AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
+        return e;
+    }
+
+    @Test
+    void emptyBucketSendsNothing() {
+        CapturingSender sender = new CapturingSender();
+        OtlpStatsMetricWriter writer = new OtlpStatsMetricWriter(sender);
+
+        writer.startBucket(0, BUCKET_START, BUCKET_DURATION);
+        writer.finishBucket(); // no add()
+
+        assertEquals(0, sender.sendCount, "empty bucket must not invoke send");
+        assertNull(sender.lastPayload);
+    }
+
+    @Test
+    void nullSenderDoesNotThrowOnNonEmptyBucket() {
+        // mirrors the HTTP_JSON path where createSender(config) returns null.
+        OtlpStatsMetricWriter writer = new OtlpStatsMetricWriter((OtlpSender) null);
+        writer.startBucket(1, BUCKET_START, BUCKET_DURATION);
+        writer.add(okEntry(SECONDS.toNanos(1), 2));
+        try {
+            writer.finishBucket();
+        } catch (Exception ex) {
+            fail("finishBucket must not throw with a null sender, but threw: " + ex);
+        }
+    }
+
+    @ParameterizedTest
+    @CsvSource({"true", "false"})
+    void carriesDatadogAttributes(boolean topLevel) throws IOException {
+        AggregateEntry e = entry("servlet.request", false, 0, null, null, null);
+        if (topLevel) {
+            AggregateEntryTestUtils.recordTopLevel(e, SECONDS.toNanos(1));
+        } else {
+            AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
+        }
+
+        Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
+        assertTrue(attrs.containsKey("datadog.operation.name"));
+        assertTrue(attrs.containsKey("datadog.span.type"));
+        assertTrue(attrs.containsKey("datadog.span.top_level"));
+        assertTrue(attrs.get("datadog.span.top_level") instanceof Boolean);
+        assertEquals(topLevel, attrs.get("datadog.span.top_level"));
+        assertTrue(attrs.containsKey("span.name"));
+    }
+
+    @ParameterizedTest
+    @CsvSource({"true", "false"})
+    void emitsIsTraceRoot(boolean traceRoot) throws IOException {
+        AggregateEntry e = AggregateEntryTestUtils.of(
+                "GET /users",
+                "web",
+                "servlet.request",
+                null,
+                "web",
+                0,
+                false,
+                traceRoot,
+                "server",
+                null,
+                null,
+                null,
+                null);
+        AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
+
+        Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
+        assertTrue(attrs.get("datadog.is_trace_root") instanceof Boolean);
+        assertEquals(traceRoot, attrs.get("datadog.is_trace_root"));
+    }
+
+    @Test
+    void serviceSourceEmittedOnlyWhenSet() throws IOException {
+        AggregateEntry e = AggregateEntryTestUtils.of(
+                "GET /users",
+                "web",
+                "servlet.request",
+                "component",
+                "web",
+                0,
+                false,
+                true,
+                "server",
+                null,
+                null,
+                null,
+                null);
+        AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
+
+        Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
+        assertEquals("component", attrs.get("datadog.svc_src"));
+        assertTrue(attrs.get("datadog.svc_src") instanceof String);
+
+        Map<String, Object> absentAttrs =
+                writeAndDecode(okEntry(SECONDS.toNanos(1), 1)).dataPoints.get(0).attributes;
+        assertFalse(absentAttrs.containsKey("datadog.svc_src"));
+    }
+
+    @Test
+    void emitsPeerTags() throws IOException {
+        AggregateEntry e = AggregateEntryTestUtils.of(
+                "GET /users",
+                "web",
+                "servlet.request",
+                null,
+                "web",
+                0,
+                false,
+                true,
+                "client",
+                Arrays.asList(
+                        UTF8BytesString.create("peer.service:downstream"),
+                        UTF8BytesString.create("net.peer.name:downstream.example.com")),
+                null,
+                null,
+                null);
+        AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
+
+        Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
+        assertEquals(
+                Arrays.asList("peer.service:downstream", "net.peer.name:downstream.example.com"),
+                attrs.get("datadog.peer_tags"));
+    }
+
+    @Test
+    void omitsPeerTagsWhenEmpty() throws IOException {
+        AggregateEntry e = entry("GET /users", false, 0, null, null, null);
+        AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
+
+        Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
+        assertFalse(attrs.containsKey("datadog.peer_tags"));
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+            value = {
+                "server, SPAN_KIND_SERVER",
+                "client, SPAN_KIND_CLIENT",
+                "producer, SPAN_KIND_PRODUCER",
+                "consumer, SPAN_KIND_CONSUMER",
+                "broker, SPAN_KIND_INTERNAL",
+                "'', SPAN_KIND_INTERNAL",
+                "NULL, SPAN_KIND_INTERNAL",
+            },
+            nullValues = "NULL")
+    void spanKindIsCanonicalizedToUppercaseEnumName(String spanKind, String expected) throws IOException {
+        AggregateEntry e = AggregateEntryTestUtils.of(
+                "GET /users", "web", "servlet.request", null, "web", 0, false, true, spanKind, null, null, null, null);
+        AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
+
+        Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
+        assertEquals(expected, attrs.get("span.kind"));
+    }
+
+    /**
+     * A synthetic entry emits {@code datadog.origin = "synthetics"}; a non-synthetic entry omits the
+     * attribute. Origin has collapsed to a boolean {@code synthetic} flag upstream, so {@code
+     * "synthetics"} is the only origin value that can reach the writer.
+     */
+    @ParameterizedTest(name = "synthetic={0} → datadog.origin={1}")
+    @CsvSource(
+            nullValues = "NULL",
+            value = {"false, NULL", "true, synthetics"})
+    void emitsSyntheticOrigin(boolean synthetic, String expectedOrigin) throws IOException {
+        AggregateEntry e = entry("servlet.request", synthetic, 0, null, null, null);
+        AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
+
+        Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
+        if (expectedOrigin == null) {
+            assertFalse(attrs.containsKey("datadog.origin"), "non-synthetic → datadog.origin absent");
+        } else {
+            assertEquals(expectedOrigin, attrs.get("datadog.origin"), "synthetic → datadog.origin");
         }
-      } else {
-        resourceMetrics.skipField(tag);
-      }
-    }
-    return attrs;
-  }
-
-  private static DecodedMetric parseScopeMetrics(CodedInputStream scopeMetrics) throws IOException {
-    DecodedMetric metric = null;
-    while (!scopeMetrics.isAtEnd()) {
-      int tag = scopeMetrics.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 2) { // Metric
-        metric = parseMetric(scopeMetrics.readBytes().newCodedInput());
-      } else {
-        scopeMetrics.skipField(tag);
-      }
-    }
-    return metric;
-  }
-
-  private static DecodedMetric parseMetric(CodedInputStream m) throws IOException {
-    DecodedMetric metric = new DecodedMetric();
-    while (!m.isAtEnd()) {
-      int tag = m.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 1:
-          metric.name = m.readString();
-          break;
-        case 3:
-          metric.unit = m.readString();
-          break;
-        case 9: // Histogram
-          parseHistogram(m.readBytes().newCodedInput(), metric);
-          break;
-        default:
-          m.skipField(tag);
-      }
-    }
-    return metric;
-  }
-
-  private static void parseHistogram(CodedInputStream h, DecodedMetric metric) throws IOException {
-    while (!h.isAtEnd()) {
-      int tag = h.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 1: // HistogramDataPoint (repeated)
-          metric.dataPoints.add(parseDataPoint(h.readBytes().newCodedInput()));
-          break;
-        case 2: // aggregation_temporality
-          metric.temporality = h.readEnum();
-          break;
-        default:
-          h.skipField(tag);
-      }
-    }
-  }
-
-  private static DataPoint parseDataPoint(CodedInputStream dp) throws IOException {
-    DataPoint p = new DataPoint();
-    while (!dp.isAtEnd()) {
-      int tag = dp.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 2:
-          p.start = dp.readFixed64();
-          break;
-        case 3:
-          p.end = dp.readFixed64();
-          break;
-        case 4:
-          p.count = dp.readFixed64();
-          break;
-        case 9: // attributes (KeyValue)
-          readKeyValue(dp.readBytes().newCodedInput(), p.attributes);
-          break;
-        default: // sum, bucket_counts, explicit_bounds, min, max — not asserted here
-          dp.skipField(tag);
-      }
-    }
-    return p;
-  }
-
-  /**
-   * Reads a {@code KeyValue} into {@code out}: key (field 1) → value. Value is an {@code AnyValue}
-   * (field 2); we decode string (field 1) and int (field 3) variants used by this writer.
-   */
-  private static void readKeyValue(CodedInputStream kv, Map<String, Object> out)
-      throws IOException {
-    String key = null;
-    Object value = null;
-    while (!kv.isAtEnd()) {
-      int tag = kv.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 1:
-          key = kv.readString();
-          break;
-        case 2: // AnyValue
-          value = readAnyValue(kv.readBytes().newCodedInput());
-          break;
-        default:
-          kv.skipField(tag);
-      }
-    }
-    if (key != null) {
-      out.put(key, value);
-    }
-  }
-
-  private static Object readAnyValue(CodedInputStream any) throws IOException {
-    Object value = null;
-    while (!any.isAtEnd()) {
-      int tag = any.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 1: // string_value
-          value = any.readString();
-          break;
-        case 2: // bool_value
-          value = any.readBool();
-          break;
-        case 3: // int_value
-          value = any.readInt64();
-          break;
-        case 5: // array_value
-          value = readArrayValue(any.readBytes().newCodedInput());
-          break;
-        default:
-          any.skipField(tag);
-      }
-    }
-    return value;
-  }
-
-  /**
-   * Decodes an {@code ArrayValue.values} (field 1, repeated {@code AnyValue}) into a string list.
-   */
-  private static List<String> readArrayValue(CodedInputStream arrayValue) throws IOException {
-    List<String> values = new ArrayList<>();
-    while (!arrayValue.isAtEnd()) {
-      int tag = arrayValue.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 1) {
-        values.add((String) readAnyValue(arrayValue.readBytes().newCodedInput()));
-      } else {
-        arrayValue.skipField(tag);
-      }
-    }
-    return values;
-  }
-
-  // ── writer driver ─────────────────────────────────────────────────────────
-
-  /**
-   * Drives the writer through one full {@code startBucket → add → finishBucket} cycle for {@code
-   * entry} over the fixed {@link #BUCKET_START}/{@link #BUCKET_DURATION} window, asserts that
-   * exactly one payload was sent, and returns the decoded metric.
-   */
-  private static DecodedMetric writeAndDecode(AggregateEntry entry) throws IOException {
-    CapturingSender sender = new CapturingSender();
-    OtlpStatsMetricWriter writer = new OtlpStatsMetricWriter(sender);
-    writer.startBucket(1, BUCKET_START, BUCKET_DURATION);
-    writer.add(entry);
-    writer.finishBucket();
-    assertEquals(1, sender.sendCount, "exactly one payload sent");
-    return decode(sender.lastPayload);
-  }
-
-  // ── test cases ──────────────────────────────────────────────────────────
-
-  @Test
-  void okOnlyEntryProducesExactlyOneDataPoint() throws IOException {
-    DecodedMetric metric = writeAndDecode(okEntry(SECONDS.toNanos(1), 3));
-
-    assertEquals("traces.span.sdk.metrics.duration", metric.name);
-    assertEquals("s", metric.unit);
-    assertEquals(TEMPORALITY_DELTA, metric.temporality, "histogram must be delta temporality");
-    assertEquals(1, metric.dataPoints.size(), "ok-only → one data point");
-
-    DataPoint dp = metric.dataPoints.get(0);
-    assertEquals(BUCKET_START, dp.start, "start_time_unix_nano == startBucket start");
-    assertEquals(BUCKET_START + BUCKET_DURATION, dp.end, "time_unix_nano == start + duration");
-    assertEquals(3L, dp.count);
-    assertEquals("STATUS_CODE_OK", dp.attributes.get("status.code"), "ok point → STATUS_CODE_OK");
-  }
-
-  @Test
-  void okPlusErrorEntryProducesTwoDataPointsWithErrorStatus() throws IOException {
-    AggregateEntry e = entry("GET /users", false, 0, null, null, null);
-    AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1)); // ok
-    AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(2)); // ok
-    AggregateEntryTestUtils.recordError(e, SECONDS.toNanos(3)); // error
-
-    DecodedMetric metric = writeAndDecode(e);
-    assertEquals(2, metric.dataPoints.size(), "ok+error → two data points");
-
-    long okCount = 0;
-    long errorCount = 0;
-    DataPoint errorPoint = null;
-    DataPoint okPoint = null;
-    for (DataPoint dp : metric.dataPoints) {
-      if ("STATUS_CODE_ERROR".equals(dp.attributes.get("status.code"))) {
-        errorPoint = dp;
-        errorCount = dp.count;
-      } else {
-        okPoint = dp;
-        okCount = dp.count;
-      }
-    }
-    assertNotNull(errorPoint, "one data point must carry status.code=STATUS_CODE_ERROR");
-    assertNotNull(okPoint, "one data point must carry status.code=STATUS_CODE_OK");
-    assertEquals("STATUS_CODE_OK", okPoint.attributes.get("status.code"));
-    assertEquals(e.getOkLatencies().getCount(), (double) okCount, 1e-9);
-    assertEquals(e.getErrorLatencies().getCount(), (double) errorCount, 1e-9);
-  }
-
-  @Test
-  void errorSeriesDoesNotLingerAfterClearWhenBucketHasOnlyOkHits() throws IOException {
-    CapturingSender sender = new CapturingSender();
-    OtlpStatsMetricWriter writer = new OtlpStatsMetricWriter(sender);
-
-    // Bucket 1: the entry sees an error, so its error histogram is allocated and emits a point.
-    AggregateEntry e = entry("GET /users", false, 0, null, null, null);
-    AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1)); // ok
-    AggregateEntryTestUtils.recordError(e, SECONDS.toNanos(3)); // error
-
-    writer.startBucket(1, BUCKET_START, BUCKET_DURATION);
-    writer.add(e);
-    writer.finishBucket();
-    DecodedMetric bucket1 = decode(sender.lastPayload);
-    assertEquals(2, bucket1.dataPoints.size(), "bucket with an error → ok+error data points");
-    assertTrue(
-        bucket1.dataPoints.stream()
-            .anyMatch(dp -> "STATUS_CODE_ERROR".equals(dp.attributes.get("status.code"))),
-        "bucket 1 must carry a status.code=STATUS_CODE_ERROR point");
-
-    // Bucket 2: same entry, reset then only OK hits. errorLatencies survives clear() (cleared, not
-    // nulled), so a non-null-but-empty histogram must NOT emit a phantom zero-count error series.
-    AggregateEntryTestUtils.clear(e);
-    AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(2)); // ok only
-
-    writer.startBucket(2, BUCKET_START + BUCKET_DURATION, BUCKET_DURATION);
-    writer.add(e);
-    writer.finishBucket();
-    DecodedMetric bucket2 = decode(sender.lastPayload);
-    assertEquals(1, bucket2.dataPoints.size(), "ok-only bucket → exactly one data point");
-    assertEquals(
-        "STATUS_CODE_OK",
-        bucket2.dataPoints.get(0).attributes.get("status.code"),
-        "recovered entry must not emit a lingering status.code=STATUS_CODE_ERROR series");
-  }
-
-  @Test
-  void httpAndGrpcAttributesAppearOnlyWhenSet() throws IOException {
-    AggregateEntry e = entry("GET /users/{id}", false, 200, "GET", "/users/{id}", "0");
-    AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
-
-    DecodedMetric metric = writeAndDecode(e);
-    assertEquals(1, metric.dataPoints.size());
-    Map<String, Object> attrs = metric.dataPoints.get(0).attributes;
-
-    assertEquals("GET", attrs.get("http.request.method"));
-    assertEquals(200L, attrs.get("http.response.status_code"));
-    assertEquals("/users/{id}", attrs.get("http.route"));
-    assertEquals("0", attrs.get("rpc.response.status_code"));
-
-    // a bare entry has none of these
-    Map<String, Object> bareAttrs =
-        writeAndDecode(okEntry(SECONDS.toNanos(1), 1)).dataPoints.get(0).attributes;
-    assertFalse(bareAttrs.containsKey("http.request.method"));
-    assertFalse(bareAttrs.containsKey("http.response.status_code"));
-    assertFalse(bareAttrs.containsKey("http.route"));
-    assertFalse(bareAttrs.containsKey("rpc.response.status_code"));
-  }
-
-  @Test
-  void additionalMetricTagsEmittedAsStringAttributes() throws IOException {
-    // Additional tags arrive on the entry pre-packed as "key:value" UTF8 strings in schema order;
-    // the writer splits each at the first ':' and emits it as a plain OTLP string attribute keyed
-    // by the tag name.
-    AggregateEntry e =
-        AggregateEntryTestUtils.of(
-            "GET /users",
-            "web",
-            "servlet.request",
-            null,
-            "web",
-            0,
-            false,
-            true,
-            "server",
-            null,
-            null,
-            null,
-            null,
-            new UTF8BytesString[] {
-              UTF8BytesString.create("region:us-east-1"),
-              UTF8BytesString.create("tenant_id:acme:corp"),
-              UTF8BytesString.create("datadog.custom:visible")
-            });
-    AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
-
-    Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
-    assertEquals("us-east-1", attrs.get("region"));
-    // value may itself contain ':' — only the first ':' separates key from value
-    assertEquals("acme:corp", attrs.get("tenant_id"));
-    assertEquals("visible", attrs.get("datadog.custom"));
-  }
-
-  @Test
-  void emptyValueEmittedButMalformedSlotsSkipped() throws IOException {
-    // A slot with no ':' or an empty key is dropped as malformed. An empty value ("key:") is NOT
-    // malformed -- aggregation treats an explicitly-empty tag as a distinct dimension from an
-    // absent
-    // one, so it is emitted as key="" to keep the OTLP attributes faithful to the aggregate key.
-    AggregateEntry e =
-        AggregateEntryTestUtils.of(
-            "GET /users",
-            "web",
-            "servlet.request",
-            null,
-            "web",
-            0,
-            false,
-            true,
-            "server",
-            null,
-            null,
-            null,
-            null,
-            new UTF8BytesString[] {
-              UTF8BytesString.create("noseparator"),
-              UTF8BytesString.create(":emptykey"),
-              UTF8BytesString.create("emptyvalue:"),
-              UTF8BytesString.create("region:us-east-1")
-            });
-    AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
-
-    Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
-    assertEquals("us-east-1", attrs.get("region"), "well-formed tag still emitted");
-    assertFalse(attrs.containsKey("noseparator"), "no-separator slot skipped");
-    assertFalse(attrs.containsKey(""), "empty-key slot skipped");
-    assertTrue(attrs.containsKey("emptyvalue"), "empty-value slot emitted");
-    assertEquals("", attrs.get("emptyvalue"), "empty value emitted as empty string");
-  }
-
-  @Test
-  void serviceNameAlwaysEmittedOnDataPoint() throws IOException {
-    CapturingSender sender = new CapturingSender();
-    OtlpStatsMetricWriter writer = new OtlpStatsMetricWriter(sender);
-
-    long start = SECONDS.toNanos(1_700_000_000L);
-    writer.startBucket(2, start, SECONDS.toNanos(10));
-    writer.add(serviceEntry("web.request", "web"));
-    writer.add(serviceEntry("db.query", "postgres"));
-    writer.finishBucket();
-
-    DecodedMetric metric = decode(sender.lastPayload);
-    assertEquals(2, metric.dataPoints.size());
-
-    Map<String, Object> webAttrs = null;
-    Map<String, Object> postgresAttrs = null;
-    for (DataPoint dp : metric.dataPoints) {
-      if ("db.query".equals(dp.attributes.get("datadog.operation.name"))) {
-        postgresAttrs = dp.attributes;
-      } else {
-        webAttrs = dp.attributes;
-      }
-    }
-    assertNotNull(postgresAttrs, "postgres data point present");
-    assertNotNull(webAttrs, "web data point present");
-    assertEquals("postgres", postgresAttrs.get("service.name"));
-    assertEquals(
-        "web",
-        webAttrs.get("service.name"),
-        "service.name is emitted unconditionally, even matching the tracer's own default service");
-  }
-
-  /** An ok-only entry on the given service and operation name, recording a single 1s hit. */
-  private static AggregateEntry serviceEntry(String operationName, String service) {
-    AggregateEntry e =
-        AggregateEntryTestUtils.of(
-            "GET /users",
-            service,
-            operationName,
-            null,
-            "web",
-            0,
-            false,
-            true,
-            "server",
-            null,
-            null,
-            null,
-            null);
-    AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
-    return e;
-  }
-
-  @Test
-  void emptyBucketSendsNothing() {
-    CapturingSender sender = new CapturingSender();
-    OtlpStatsMetricWriter writer = new OtlpStatsMetricWriter(sender);
-
-    writer.startBucket(0, BUCKET_START, BUCKET_DURATION);
-    writer.finishBucket(); // no add()
-
-    assertEquals(0, sender.sendCount, "empty bucket must not invoke send");
-    assertNull(sender.lastPayload);
-  }
-
-  @Test
-  void nullSenderDoesNotThrowOnNonEmptyBucket() {
-    // mirrors the HTTP_JSON path where createSender(config) returns null.
-    OtlpStatsMetricWriter writer = new OtlpStatsMetricWriter((OtlpSender) null);
-    writer.startBucket(1, BUCKET_START, BUCKET_DURATION);
-    writer.add(okEntry(SECONDS.toNanos(1), 2));
-    try {
-      writer.finishBucket();
-    } catch (Exception ex) {
-      fail("finishBucket must not throw with a null sender, but threw: " + ex);
-    }
-  }
-
-  @ParameterizedTest
-  @CsvSource({"true", "false"})
-  void carriesDatadogAttributes(boolean topLevel) throws IOException {
-    AggregateEntry e = entry("servlet.request", false, 0, null, null, null);
-    if (topLevel) {
-      AggregateEntryTestUtils.recordTopLevel(e, SECONDS.toNanos(1));
-    } else {
-      AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
-    }
-
-    Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
-    assertTrue(attrs.containsKey("datadog.operation.name"));
-    assertTrue(attrs.containsKey("datadog.span.type"));
-    assertTrue(attrs.containsKey("datadog.span.top_level"));
-    assertTrue(attrs.get("datadog.span.top_level") instanceof Boolean);
-    assertEquals(topLevel, attrs.get("datadog.span.top_level"));
-    assertTrue(attrs.containsKey("span.name"));
-  }
-
-  @ParameterizedTest
-  @CsvSource({"true", "false"})
-  void emitsIsTraceRoot(boolean traceRoot) throws IOException {
-    AggregateEntry e =
-        AggregateEntryTestUtils.of(
-            "GET /users",
-            "web",
-            "servlet.request",
-            null,
-            "web",
-            0,
-            false,
-            traceRoot,
-            "server",
-            null,
-            null,
-            null,
-            null);
-    AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
-
-    Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
-    assertTrue(attrs.get("datadog.is_trace_root") instanceof Boolean);
-    assertEquals(traceRoot, attrs.get("datadog.is_trace_root"));
-  }
-
-  @Test
-  void serviceSourceEmittedOnlyWhenSet() throws IOException {
-    AggregateEntry e =
-        AggregateEntryTestUtils.of(
-            "GET /users",
-            "web",
-            "servlet.request",
-            "component",
-            "web",
-            0,
-            false,
-            true,
-            "server",
-            null,
-            null,
-            null,
-            null);
-    AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
-
-    Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
-    assertEquals("component", attrs.get("datadog.svc_src"));
-    assertTrue(attrs.get("datadog.svc_src") instanceof String);
-
-    Map<String, Object> absentAttrs =
-        writeAndDecode(okEntry(SECONDS.toNanos(1), 1)).dataPoints.get(0).attributes;
-    assertFalse(absentAttrs.containsKey("datadog.svc_src"));
-  }
-
-  @Test
-  void emitsPeerTags() throws IOException {
-    AggregateEntry e =
-        AggregateEntryTestUtils.of(
-            "GET /users",
-            "web",
-            "servlet.request",
-            null,
-            "web",
-            0,
-            false,
-            true,
-            "client",
-            Arrays.asList(
-                UTF8BytesString.create("peer.service:downstream"),
-                UTF8BytesString.create("net.peer.name:downstream.example.com")),
-            null,
-            null,
-            null);
-    AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
-
-    Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
-    assertEquals(
-        Arrays.asList("peer.service:downstream", "net.peer.name:downstream.example.com"),
-        attrs.get("datadog.peer_tags"));
-  }
-
-  @Test
-  void omitsPeerTagsWhenEmpty() throws IOException {
-    AggregateEntry e = entry("GET /users", false, 0, null, null, null);
-    AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
-
-    Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
-    assertFalse(attrs.containsKey("datadog.peer_tags"));
-  }
-
-  @ParameterizedTest
-  @CsvSource(
-      value = {
-        "server, SPAN_KIND_SERVER",
-        "client, SPAN_KIND_CLIENT",
-        "producer, SPAN_KIND_PRODUCER",
-        "consumer, SPAN_KIND_CONSUMER",
-        "broker, SPAN_KIND_INTERNAL",
-        "'', SPAN_KIND_INTERNAL",
-        "NULL, SPAN_KIND_INTERNAL",
-      },
-      nullValues = "NULL")
-  void spanKindIsCanonicalizedToUppercaseEnumName(String spanKind, String expected)
-      throws IOException {
-    AggregateEntry e =
-        AggregateEntryTestUtils.of(
-            "GET /users",
-            "web",
-            "servlet.request",
-            null,
-            "web",
-            0,
-            false,
-            true,
-            spanKind,
-            null,
-            null,
-            null,
-            null);
-    AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
-
-    Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
-    assertEquals(expected, attrs.get("span.kind"));
-  }
-
-  /**
-   * A synthetic entry emits {@code datadog.origin = "synthetics"}; a non-synthetic entry omits the
-   * attribute. Origin has collapsed to a boolean {@code synthetic} flag upstream, so {@code
-   * "synthetics"} is the only origin value that can reach the writer.
-   */
-  @ParameterizedTest(name = "synthetic={0} → datadog.origin={1}")
-  @CsvSource(
-      nullValues = "NULL",
-      value = {"false, NULL", "true, synthetics"})
-  void emitsSyntheticOrigin(boolean synthetic, String expectedOrigin) throws IOException {
-    AggregateEntry e = entry("servlet.request", synthetic, 0, null, null, null);
-    AggregateEntryTestUtils.recordOk(e, SECONDS.toNanos(1));
-
-    Map<String, Object> attrs = writeAndDecode(e).dataPoints.get(0).attributes;
-    if (expectedOrigin == null) {
-      assertFalse(attrs.containsKey("datadog.origin"), "non-synthetic → datadog.origin absent");
-    } else {
-      assertEquals(expectedOrigin, attrs.get("datadog.origin"), "synthetic → datadog.origin");
-    }
-  }
-
-  @Test
-  void snapshotsEntryDataBeforeAggregatorClearsIt() throws IOException {
-    // The aggregator clears each entry's per-interval data immediately after add() returns
-    // (Aggregator#report), before finishBucket() runs. The writer must snapshot the latency data
-    // (and the top-level count) at add() time; if it deferred reading to finishBucket() it would
-    // encode the already-cleared (empty, zero-count) entry.
-    CapturingSender sender = new CapturingSender();
-    OtlpStatsMetricWriter writer = new OtlpStatsMetricWriter(sender);
-
-    AggregateEntry e = entry("servlet.request", false, 0, null, null, null);
-    AggregateEntryTestUtils.recordTopLevel(e, SECONDS.toNanos(1));
-    AggregateEntryTestUtils.recordTopLevel(e, SECONDS.toNanos(1));
-    AggregateEntryTestUtils.recordTopLevel(e, SECONDS.toNanos(1));
-
-    writer.startBucket(1, BUCKET_START, BUCKET_DURATION);
-    writer.add(e);
-    AggregateEntryTestUtils.clear(e); // mimic Aggregator#report clearing right after add()
-    writer.finishBucket();
-
-    assertEquals(1, sender.sendCount, "cleared-after-add entry must still emit its snapshot");
-    DecodedMetric metric = decode(sender.lastPayload);
-    assertEquals(1, metric.dataPoints.size());
-    DataPoint dp = metric.dataPoints.get(0);
-    assertEquals(3L, dp.count, "count must reflect the pre-clear snapshot, not the cleared entry");
-    assertEquals(
-        Boolean.TRUE,
-        dp.attributes.get("datadog.span.top_level"),
-        "all pre-clear hits were top-level");
-  }
-
-  // ── resource attributes (datadog.runtime_id / process tags) ────────────────
-
-  @Test
-  void resourceCarriesRuntimeId() throws IOException {
-    CapturingSender sender = new CapturingSender();
-    OtlpStatsMetricWriter writer = new OtlpStatsMetricWriter(sender);
-    writer.startBucket(1, SECONDS.toNanos(1_700_000_000L), SECONDS.toNanos(10));
-    writer.add(okEntry(SECONDS.toNanos(1), 1));
-    writer.finishBucket();
-
-    Map<String, Object> resourceAttrs = decodeResourceAttributes(sender.lastPayload);
-    assertTrue(
-        resourceAttrs.containsKey("datadog.runtime_id"), "resource carries datadog.runtime_id");
-    Object runtimeId = resourceAttrs.get("datadog.runtime_id");
-    assertNotNull(runtimeId, "runtime id value present");
-    assertFalse(runtimeId.toString().isEmpty(), "runtime id value non-empty");
-  }
+    }
+
+    @Test
+    void snapshotsEntryDataBeforeAggregatorClearsIt() throws IOException {
+        // The aggregator clears each entry's per-interval data immediately after add() returns
+        // (Aggregator#report), before finishBucket() runs. The writer must snapshot the latency data
+        // (and the top-level count) at add() time; if it deferred reading to finishBucket() it would
+        // encode the already-cleared (empty, zero-count) entry.
+        CapturingSender sender = new CapturingSender();
+        OtlpStatsMetricWriter writer = new OtlpStatsMetricWriter(sender);
+
+        AggregateEntry e = entry("servlet.request", false, 0, null, null, null);
+        AggregateEntryTestUtils.recordTopLevel(e, SECONDS.toNanos(1));
+        AggregateEntryTestUtils.recordTopLevel(e, SECONDS.toNanos(1));
+        AggregateEntryTestUtils.recordTopLevel(e, SECONDS.toNanos(1));
+
+        writer.startBucket(1, BUCKET_START, BUCKET_DURATION);
+        writer.add(e);
+        AggregateEntryTestUtils.clear(e); // mimic Aggregator#report clearing right after add()
+        writer.finishBucket();
+
+        assertEquals(1, sender.sendCount, "cleared-after-add entry must still emit its snapshot");
+        DecodedMetric metric = decode(sender.lastPayload);
+        assertEquals(1, metric.dataPoints.size());
+        DataPoint dp = metric.dataPoints.get(0);
+        assertEquals(3L, dp.count, "count must reflect the pre-clear snapshot, not the cleared entry");
+        assertEquals(Boolean.TRUE, dp.attributes.get("datadog.span.top_level"), "all pre-clear hits were top-level");
+    }
+
+    // ── resource attributes (datadog.runtime_id / process tags) ────────────────
+
+    @Test
+    void resourceCarriesRuntimeId() throws IOException {
+        CapturingSender sender = new CapturingSender();
+        OtlpStatsMetricWriter writer = new OtlpStatsMetricWriter(sender);
+        writer.startBucket(1, SECONDS.toNanos(1_700_000_000L), SECONDS.toNanos(10));
+        writer.add(okEntry(SECONDS.toNanos(1), 1));
+        writer.finishBucket();
+
+        Map<String, Object> resourceAttrs = decodeResourceAttributes(sender.lastPayload);
+        assertTrue(resourceAttrs.containsKey("datadog.runtime_id"), "resource carries datadog.runtime_id");
+        Object runtimeId = resourceAttrs.get("datadog.runtime_id");
+        assertNotNull(runtimeId, "runtime id value present");
+        assertFalse(runtimeId.toString().isEmpty(), "runtime id value non-empty");
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceJsonCollectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceJsonCollectorTest.java
index 3f836227a39..c60d7d86d39 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceJsonCollectorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceJsonCollectorTest.java
@@ -46,375 +46,361 @@
  */
 class OtlpTraceJsonCollectorTest {
 
-  private static final CoreTracer TRACER = CoreTracer.builder().writer(new LoggingWriter()).build();
-
-  @Test
-  void emptyTraceProducesEmptyPayload() {
-    OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
-    OtlpPayload payload = collector.collectTraces();
-    assertEquals(OtlpPayload.EMPTY, payload);
-  }
-
-  @Test
-  void singleSpanIsEncodedWithHexIdsAndCamelCaseKeys() throws IOException {
-    DDSpan span = startAndFinish("op.first", "GET /api/users", null);
-
-    OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
-    collector.addTrace(asList((CoreSpan<?>) span));
-    OtlpPayload payload = collector.collectTraces();
-
-    Map<String, Object> parsedSpan = onlySpan(payload);
-
-    assertEquals(hexTraceId(span.getTraceId()), parsedSpan.get("traceId"));
-    assertEquals(hexSpanId(span.getSpanId()), parsedSpan.get("spanId"));
-    assertEquals("GET /api/users", parsedSpan.get("name"));
-    assertTrue(parsedSpan.get("startTimeUnixNano") instanceof String, "timestamps are strings");
-    assertTrue(parsedSpan.get("endTimeUnixNano") instanceof String, "timestamps are strings");
-    assertNull(parsedSpan.get("parentSpanId"), "root span has no parentSpanId");
-
-    Set<String> attrKeys = attributeKeys(parsedSpan);
-    assertTrue(attrKeys.contains("resource.name"));
-    assertTrue(attrKeys.contains("operation.name"));
-  }
-
-  @Test
-  void spanKindIsEncodedAsInteger() throws IOException {
-    DDSpan span = startAndFinish("op.server", "GET /api", SPAN_KIND_SERVER);
-
-    OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
-    collector.addTrace(asList((CoreSpan<?>) span));
-    Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
-
-    assertEquals(2, ((Number) parsedSpan.get("kind")).intValue(), "SPAN_KIND_SERVER = 2");
-  }
-
-  @Test
-  void errorSpanHasStatusObject() throws IOException {
-    AgentSpan agentSpan = TRACER.startSpan("test", "op.error");
-    agentSpan.setResourceName("POST /api/data");
-    agentSpan.setError(true);
-    agentSpan.setErrorMessage("boom");
-    agentSpan.finish();
-
-    OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
-    collector.addTrace(asList((CoreSpan<?>) agentSpan));
-    Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
+    private static final CoreTracer TRACER =
+            CoreTracer.builder().writer(new LoggingWriter()).build();
+
+    @Test
+    void emptyTraceProducesEmptyPayload() {
+        OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
+        OtlpPayload payload = collector.collectTraces();
+        assertEquals(OtlpPayload.EMPTY, payload);
+    }
+
+    @Test
+    void singleSpanIsEncodedWithHexIdsAndCamelCaseKeys() throws IOException {
+        DDSpan span = startAndFinish("op.first", "GET /api/users", null);
+
+        OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
+        collector.addTrace(asList((CoreSpan<?>) span));
+        OtlpPayload payload = collector.collectTraces();
+
+        Map<String, Object> parsedSpan = onlySpan(payload);
+
+        assertEquals(hexTraceId(span.getTraceId()), parsedSpan.get("traceId"));
+        assertEquals(hexSpanId(span.getSpanId()), parsedSpan.get("spanId"));
+        assertEquals("GET /api/users", parsedSpan.get("name"));
+        assertTrue(parsedSpan.get("startTimeUnixNano") instanceof String, "timestamps are strings");
+        assertTrue(parsedSpan.get("endTimeUnixNano") instanceof String, "timestamps are strings");
+        assertNull(parsedSpan.get("parentSpanId"), "root span has no parentSpanId");
+
+        Set<String> attrKeys = attributeKeys(parsedSpan);
+        assertTrue(attrKeys.contains("resource.name"));
+        assertTrue(attrKeys.contains("operation.name"));
+    }
+
+    @Test
+    void spanKindIsEncodedAsInteger() throws IOException {
+        DDSpan span = startAndFinish("op.server", "GET /api", SPAN_KIND_SERVER);
+
+        OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
+        collector.addTrace(asList((CoreSpan<?>) span));
+        Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
+
+        assertEquals(2, ((Number) parsedSpan.get("kind")).intValue(), "SPAN_KIND_SERVER = 2");
+    }
+
+    @Test
+    void errorSpanHasStatusObject() throws IOException {
+        AgentSpan agentSpan = TRACER.startSpan("test", "op.error");
+        agentSpan.setResourceName("POST /api/data");
+        agentSpan.setError(true);
+        agentSpan.setErrorMessage("boom");
+        agentSpan.finish();
+
+        OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
+        collector.addTrace(asList((CoreSpan<?>) agentSpan));
+        Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
+
+        @SuppressWarnings("unchecked")
+        Map<String, Object> status = (Map<String, Object>) parsedSpan.get("status");
+        assertEquals("boom", status.get("message"));
+        assertEquals(2, ((Number) status.get("code")).intValue(), "STATUS_CODE_ERROR = 2");
+    }
+
+    @Test
+    void nonErrorSpanHasNoStatusObject() throws IOException {
+        DDSpan span = startAndFinish("op.ok", "GET /health", null);
+
+        OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
+        collector.addTrace(asList((CoreSpan<?>) span));
+        Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
+
+        assertFalse(parsedSpan.containsKey("status"));
+    }
+
+    @Test
+    void spanTraceStateIncludesDefaultProbabilityDecision() throws IOException {
+        DDSpan span = startAndFinish("op.notracestate", "GET /no-tracestate", null);
+
+        OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
+        collector.addTrace(asList((CoreSpan<?>) span));
+        Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
+
+        assertTrue(
+                parsedSpan.get("traceState").toString().matches("ot=rv:[0-9a-f]{14};th:0"),
+                parsedSpan.get("traceState").toString());
+    }
+
+    @Test
+    void spanTraceStateIncludedWhenPropagated() throws IOException {
+        PropagationTags propagationTags = PropagationTags.factory().empty();
+        propagationTags.updateW3CTracestate("vendor=state");
+        ExtractedContext parent = new ExtractedContext(
+                DDTraceId.ONE, 0L, PrioritySampling.UNSET, null, propagationTags, TracePropagationStyle.DATADOG);
+
+        AgentSpan agentSpan = TRACER.startSpan("test", "op.tracestate", parent);
+        agentSpan.setResourceName("op.tracestate");
+        agentSpan.finish();
+
+        OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
+        collector.addTrace(asList((CoreSpan<?>) agentSpan));
+        Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
+
+        assertTrue(
+                parsedSpan.get("traceState").toString().matches("ot=rv:[0-9a-f]{14};th:0,vendor=state"),
+                parsedSpan.get("traceState").toString());
+    }
+
+    @Test
+    void spanFlagsOmittedWhenNotSampled() throws IOException {
+        AgentSpan agentSpan = TRACER.startSpan("test", "op.noflags");
+        agentSpan.setResourceName("op.noflags");
+        agentSpan.setSamplingPriority(PrioritySampling.USER_DROP, SamplingMechanism.MANUAL);
+        // Force export despite the dropped trace-level priority, via span-level sampling -
+        // otherwise OtlpTraceCollector#shouldExport would exclude this span entirely.
+        agentSpan.setTag(SPAN_SAMPLING_MECHANISM_TAG, SamplingMechanism.SPAN_SAMPLING_RATE);
+        agentSpan.finish();
+
+        OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
+        collector.addTrace(asList((CoreSpan<?>) agentSpan));
+        Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
+
+        assertFalse(parsedSpan.containsKey("flags"), "unsampled span should omit flags");
+    }
+
+    @Test
+    void spanFlagsIncludeSampledBitWhenSampled() throws IOException {
+        DDSpan span = startAndFinish("op.sampled", "GET /sampled", null);
+
+        OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
+        collector.addTrace(asList((CoreSpan<?>) span));
+        Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
+
+        assertEquals(SAMPLED_TRACE_FLAG, ((Number) parsedSpan.get("flags")).intValue());
+    }
+
+    @Test
+    void traceStateAndFlagsStayPairedAcrossSamplingDecisions() throws IOException {
+        Map<String, Object> localFallback = exportSamplingSpan(localProbabilitySpan(1.0, true));
+        assertTrue(localFallback.get("traceState").toString().matches("ot=rv:[0-9a-f]{14};th:0"));
+        assertEquals(SAMPLED_TRACE_FLAG, ((Number) localFallback.get("flags")).intValue());
+
+        Map<String, Object> inherited = exportSamplingSpan(inheritedSamplingSpan());
+        assertEquals("dd=s:1,ot=rv:ef284ace7a91e1;th:8,vendor=state", inherited.get("traceState"));
+        assertEquals(SAMPLED_TRACE_FLAG, ((Number) inherited.get("flags")).intValue());
+
+        Map<String, Object> probabilityDrop = exportSamplingSpan(localProbabilitySpan(0.0, false));
+        assertTrue(probabilityDrop.get("traceState").toString().matches("ot=rv:[0-9a-f]{14};th:ffffffffffffff"));
+        assertFalse(probabilityDrop.containsKey("flags"));
+
+        DDSpan limiterDrop = localSamplingSpan();
+        limiterDrop
+                .spanContext()
+                .getPropagationTags()
+                .tryUpdateProbabilitySamplingDecision(
+                        PrioritySampling.SAMPLER_DROP,
+                        SamplingMechanism.AGENT_RATE,
+                        1.0,
+                        true,
+                        limiterDrop.getTraceId().toLong(),
+                        true);
+        Map<String, Object> limiter = exportSamplingSpan(limiterDrop);
+        assertNull(limiter.get("traceState"));
+        assertFalse(limiter.containsKey("flags"));
+
+        DDSpan nonProbabilityKeep = localProbabilitySpan(0.0, false);
+        nonProbabilityKeep.spanContext().getPropagationTags().forceKeep(SamplingMechanism.MANUAL);
+        Map<String, Object> nonProbability = exportSamplingSpan(nonProbabilityKeep);
+        assertNull(nonProbability.get("traceState"));
+        assertEquals(SAMPLED_TRACE_FLAG, ((Number) nonProbability.get("flags")).intValue());
+    }
+
+    @Test
+    void multipleSpansInATraceAreAllWritten() throws IOException {
+        AgentSpan parent = TRACER.startSpan("test", "op.parent");
+        parent.setResourceName("parent.op");
+        AgentSpan child = TRACER.startSpan("test", "op.child", parent.spanContext());
+        child.setResourceName("child.op");
+        child.finish();
+        parent.finish();
+
+        List<CoreSpan<?>> spans = new ArrayList<>();
+        spans.add((CoreSpan<?>) parent);
+        spans.add((CoreSpan<?>) child);
+
+        OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
+        collector.addTrace(spans);
+        OtlpPayload payload = collector.collectTraces();
+
+        List<Map<String, Object>> parsedSpans = allSpans(payload);
+        assertEquals(2, parsedSpans.size());
+
+        Map<String, Object> parsedChild = parsedSpans.stream()
+                .filter(s -> "child.op".equals(s.get("name")))
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("child span not found"));
+        assertEquals(hexSpanId(((DDSpan) parent).getSpanId()), parsedChild.get("parentSpanId"));
+    }
+
+    @Test
+    void poisonedSpanResetsCollectorForNextTrace() throws IOException {
+        // mid-trace exception (e.g. from a malformed span) must not leave partial state behind
+        DDSpan realSpan = startAndFinish("op.first", "GET /first", null);
+
+        CoreSpan<?> poison = mock(CoreSpan.class);
+        when(poison.samplingPriority()).thenReturn(1);
+        when(poison.getTraceId()).thenThrow(new RuntimeException("boom"));
+
+        List<CoreSpan<?>> poisonedTrace = new ArrayList<>();
+        poisonedTrace.add((CoreSpan<?>) realSpan);
+        poisonedTrace.add(poison);
+
+        OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
+        assertThrows(RuntimeException.class, () -> collector.addTrace(poisonedTrace));
+
+        // a normal trace collected afterwards must not see any leftover state from the poisoned one
+        DDSpan normalSpan = startAndFinish("op.normal", "GET /normal", null);
+        collector.addTrace(asList((CoreSpan<?>) normalSpan));
+        Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
+
+        assertEquals("GET /normal", parsedSpan.get("name"));
+    }
+
+    @Test
+    void spanLinkOmitsTraceStateWhenEmpty() throws IOException {
+        AgentSpan linked = TRACER.startSpan("test", "op.linked");
+        linked.finish();
+
+        AgentSpan agentSpan = TRACER.startSpan("test", "op.link");
+        agentSpan.setResourceName("op.link");
+        agentSpan.addLink(SpanLink.from(linked.spanContext()));
+        agentSpan.finish();
+
+        OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
+        collector.addTrace(asList((CoreSpan<?>) agentSpan));
+        Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
+
+        Map<String, Object> parsedLink = onlyLink(parsedSpan);
+        assertFalse(parsedLink.containsKey("traceState"), "empty traceState should be omitted");
+    }
+
+    @Test
+    void spanLinkIncludesTraceStateWhenPresent() throws IOException {
+        AgentSpan linked = TRACER.startSpan("test", "op.linked");
+        linked.finish();
+
+        AgentSpan agentSpan = TRACER.startSpan("test", "op.link");
+        agentSpan.setResourceName("op.link");
+        agentSpan.addLink(SpanLink.from(linked.spanContext(), (byte) 0, "vendor=state", SpanAttributes.EMPTY));
+        agentSpan.finish();
+
+        OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
+        collector.addTrace(asList((CoreSpan<?>) agentSpan));
+        Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
+
+        Map<String, Object> parsedLink = onlyLink(parsedSpan);
+        assertEquals("vendor=state", parsedLink.get("traceState"));
+    }
+
+    // ── helpers ──────────────────────────────────────────────────────────────
+
+    private static DDSpan startAndFinish(String operationName, String resourceName, String spanKind) {
+        AgentSpan agentSpan = TRACER.startSpan("test", operationName);
+        agentSpan.setResourceName(resourceName);
+        if (spanKind != null) {
+            agentSpan.setTag(SPAN_KIND, spanKind);
+        }
+        agentSpan.setSamplingPriority(PrioritySampling.USER_KEEP, SamplingMechanism.DEFAULT);
+        agentSpan.finish();
+        return (DDSpan) agentSpan;
+    }
+
+    private static DDSpan localSamplingSpan() {
+        AgentSpan span = TRACER.startSpan("test", "op.sampling");
+        span.setResourceName("op.sampling");
+        return (DDSpan) span;
+    }
+
+    private static DDSpan localProbabilitySpan(double rate, boolean sampled) {
+        DDSpan span = localSamplingSpan();
+        span.spanContext()
+                .getPropagationTags()
+                .tryUpdateProbabilitySamplingDecision(
+                        sampled ? PrioritySampling.SAMPLER_KEEP : PrioritySampling.SAMPLER_DROP,
+                        SamplingMechanism.AGENT_RATE,
+                        rate,
+                        false,
+                        span.getTraceId().toLong(),
+                        true);
+        return span;
+    }
+
+    private static DDSpan inheritedSamplingSpan() {
+        PropagationTags propagationTags = PropagationTags.factory()
+                .fromHeaderValue(PropagationTags.HeaderType.W3C, "dd=s:1,vendor=state,ot=rv:ef284ace7a91e1;th:8");
+        ExtractedContext parent = new ExtractedContext(
+                DDTraceId.ONE,
+                0L,
+                PrioritySampling.SAMPLER_KEEP,
+                null,
+                propagationTags,
+                TracePropagationStyle.TRACECONTEXT);
+        AgentSpan span = TRACER.startSpan("test", "op.inherited", parent);
+        span.setResourceName("op.inherited");
+        return (DDSpan) span;
+    }
+
+    private static Map<String, Object> exportSamplingSpan(DDSpan span) throws IOException {
+        if (span.getSamplingPriority() <= 0) {
+            span.setTag(SPAN_SAMPLING_MECHANISM_TAG, SamplingMechanism.SPAN_SAMPLING_RATE);
+        }
+        span.finish();
+        OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
+        collector.addTrace(asList((CoreSpan<?>) span));
+        return onlySpan(collector.collectTraces());
+    }
 
     @SuppressWarnings("unchecked")
-    Map<String, Object> status = (Map<String, Object>) parsedSpan.get("status");
-    assertEquals("boom", status.get("message"));
-    assertEquals(2, ((Number) status.get("code")).intValue(), "STATUS_CODE_ERROR = 2");
-  }
-
-  @Test
-  void nonErrorSpanHasNoStatusObject() throws IOException {
-    DDSpan span = startAndFinish("op.ok", "GET /health", null);
-
-    OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
-    collector.addTrace(asList((CoreSpan<?>) span));
-    Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
-
-    assertFalse(parsedSpan.containsKey("status"));
-  }
-
-  @Test
-  void spanTraceStateIncludesDefaultProbabilityDecision() throws IOException {
-    DDSpan span = startAndFinish("op.notracestate", "GET /no-tracestate", null);
-
-    OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
-    collector.addTrace(asList((CoreSpan<?>) span));
-    Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
-
-    assertTrue(
-        parsedSpan.get("traceState").toString().matches("ot=rv:[0-9a-f]{14};th:0"),
-        parsedSpan.get("traceState").toString());
-  }
-
-  @Test
-  void spanTraceStateIncludedWhenPropagated() throws IOException {
-    PropagationTags propagationTags = PropagationTags.factory().empty();
-    propagationTags.updateW3CTracestate("vendor=state");
-    ExtractedContext parent =
-        new ExtractedContext(
-            DDTraceId.ONE,
-            0L,
-            PrioritySampling.UNSET,
-            null,
-            propagationTags,
-            TracePropagationStyle.DATADOG);
-
-    AgentSpan agentSpan = TRACER.startSpan("test", "op.tracestate", parent);
-    agentSpan.setResourceName("op.tracestate");
-    agentSpan.finish();
-
-    OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
-    collector.addTrace(asList((CoreSpan<?>) agentSpan));
-    Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
-
-    assertTrue(
-        parsedSpan.get("traceState").toString().matches("ot=rv:[0-9a-f]{14};th:0,vendor=state"),
-        parsedSpan.get("traceState").toString());
-  }
-
-  @Test
-  void spanFlagsOmittedWhenNotSampled() throws IOException {
-    AgentSpan agentSpan = TRACER.startSpan("test", "op.noflags");
-    agentSpan.setResourceName("op.noflags");
-    agentSpan.setSamplingPriority(PrioritySampling.USER_DROP, SamplingMechanism.MANUAL);
-    // Force export despite the dropped trace-level priority, via span-level sampling -
-    // otherwise OtlpTraceCollector#shouldExport would exclude this span entirely.
-    agentSpan.setTag(SPAN_SAMPLING_MECHANISM_TAG, SamplingMechanism.SPAN_SAMPLING_RATE);
-    agentSpan.finish();
-
-    OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
-    collector.addTrace(asList((CoreSpan<?>) agentSpan));
-    Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
-
-    assertFalse(parsedSpan.containsKey("flags"), "unsampled span should omit flags");
-  }
-
-  @Test
-  void spanFlagsIncludeSampledBitWhenSampled() throws IOException {
-    DDSpan span = startAndFinish("op.sampled", "GET /sampled", null);
-
-    OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
-    collector.addTrace(asList((CoreSpan<?>) span));
-    Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
-
-    assertEquals(SAMPLED_TRACE_FLAG, ((Number) parsedSpan.get("flags")).intValue());
-  }
-
-  @Test
-  void traceStateAndFlagsStayPairedAcrossSamplingDecisions() throws IOException {
-    Map<String, Object> localFallback = exportSamplingSpan(localProbabilitySpan(1.0, true));
-    assertTrue(localFallback.get("traceState").toString().matches("ot=rv:[0-9a-f]{14};th:0"));
-    assertEquals(SAMPLED_TRACE_FLAG, ((Number) localFallback.get("flags")).intValue());
-
-    Map<String, Object> inherited = exportSamplingSpan(inheritedSamplingSpan());
-    assertEquals("dd=s:1,ot=rv:ef284ace7a91e1;th:8,vendor=state", inherited.get("traceState"));
-    assertEquals(SAMPLED_TRACE_FLAG, ((Number) inherited.get("flags")).intValue());
-
-    Map<String, Object> probabilityDrop = exportSamplingSpan(localProbabilitySpan(0.0, false));
-    assertTrue(
-        probabilityDrop
-            .get("traceState")
-            .toString()
-            .matches("ot=rv:[0-9a-f]{14};th:ffffffffffffff"));
-    assertFalse(probabilityDrop.containsKey("flags"));
-
-    DDSpan limiterDrop = localSamplingSpan();
-    limiterDrop
-        .spanContext()
-        .getPropagationTags()
-        .tryUpdateProbabilitySamplingDecision(
-            PrioritySampling.SAMPLER_DROP,
-            SamplingMechanism.AGENT_RATE,
-            1.0,
-            true,
-            limiterDrop.getTraceId().toLong(),
-            true);
-    Map<String, Object> limiter = exportSamplingSpan(limiterDrop);
-    assertNull(limiter.get("traceState"));
-    assertFalse(limiter.containsKey("flags"));
-
-    DDSpan nonProbabilityKeep = localProbabilitySpan(0.0, false);
-    nonProbabilityKeep.spanContext().getPropagationTags().forceKeep(SamplingMechanism.MANUAL);
-    Map<String, Object> nonProbability = exportSamplingSpan(nonProbabilityKeep);
-    assertNull(nonProbability.get("traceState"));
-    assertEquals(SAMPLED_TRACE_FLAG, ((Number) nonProbability.get("flags")).intValue());
-  }
-
-  @Test
-  void multipleSpansInATraceAreAllWritten() throws IOException {
-    AgentSpan parent = TRACER.startSpan("test", "op.parent");
-    parent.setResourceName("parent.op");
-    AgentSpan child = TRACER.startSpan("test", "op.child", parent.spanContext());
-    child.setResourceName("child.op");
-    child.finish();
-    parent.finish();
-
-    List<CoreSpan<?>> spans = new ArrayList<>();
-    spans.add((CoreSpan<?>) parent);
-    spans.add((CoreSpan<?>) child);
-
-    OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
-    collector.addTrace(spans);
-    OtlpPayload payload = collector.collectTraces();
-
-    List<Map<String, Object>> parsedSpans = allSpans(payload);
-    assertEquals(2, parsedSpans.size());
-
-    Map<String, Object> parsedChild =
-        parsedSpans.stream()
-            .filter(s -> "child.op".equals(s.get("name")))
-            .findFirst()
-            .orElseThrow(() -> new AssertionError("child span not found"));
-    assertEquals(hexSpanId(((DDSpan) parent).getSpanId()), parsedChild.get("parentSpanId"));
-  }
-
-  @Test
-  void poisonedSpanResetsCollectorForNextTrace() throws IOException {
-    // mid-trace exception (e.g. from a malformed span) must not leave partial state behind
-    DDSpan realSpan = startAndFinish("op.first", "GET /first", null);
-
-    CoreSpan<?> poison = mock(CoreSpan.class);
-    when(poison.samplingPriority()).thenReturn(1);
-    when(poison.getTraceId()).thenThrow(new RuntimeException("boom"));
-
-    List<CoreSpan<?>> poisonedTrace = new ArrayList<>();
-    poisonedTrace.add((CoreSpan<?>) realSpan);
-    poisonedTrace.add(poison);
-
-    OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
-    assertThrows(RuntimeException.class, () -> collector.addTrace(poisonedTrace));
-
-    // a normal trace collected afterwards must not see any leftover state from the poisoned one
-    DDSpan normalSpan = startAndFinish("op.normal", "GET /normal", null);
-    collector.addTrace(asList((CoreSpan<?>) normalSpan));
-    Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
-
-    assertEquals("GET /normal", parsedSpan.get("name"));
-  }
-
-  @Test
-  void spanLinkOmitsTraceStateWhenEmpty() throws IOException {
-    AgentSpan linked = TRACER.startSpan("test", "op.linked");
-    linked.finish();
-
-    AgentSpan agentSpan = TRACER.startSpan("test", "op.link");
-    agentSpan.setResourceName("op.link");
-    agentSpan.addLink(SpanLink.from(linked.spanContext()));
-    agentSpan.finish();
-
-    OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
-    collector.addTrace(asList((CoreSpan<?>) agentSpan));
-    Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
-
-    Map<String, Object> parsedLink = onlyLink(parsedSpan);
-    assertFalse(parsedLink.containsKey("traceState"), "empty traceState should be omitted");
-  }
-
-  @Test
-  void spanLinkIncludesTraceStateWhenPresent() throws IOException {
-    AgentSpan linked = TRACER.startSpan("test", "op.linked");
-    linked.finish();
-
-    AgentSpan agentSpan = TRACER.startSpan("test", "op.link");
-    agentSpan.setResourceName("op.link");
-    agentSpan.addLink(
-        SpanLink.from(linked.spanContext(), (byte) 0, "vendor=state", SpanAttributes.EMPTY));
-    agentSpan.finish();
-
-    OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
-    collector.addTrace(asList((CoreSpan<?>) agentSpan));
-    Map<String, Object> parsedSpan = onlySpan(collector.collectTraces());
-
-    Map<String, Object> parsedLink = onlyLink(parsedSpan);
-    assertEquals("vendor=state", parsedLink.get("traceState"));
-  }
-
-  // ── helpers ──────────────────────────────────────────────────────────────
-
-  private static DDSpan startAndFinish(String operationName, String resourceName, String spanKind) {
-    AgentSpan agentSpan = TRACER.startSpan("test", operationName);
-    agentSpan.setResourceName(resourceName);
-    if (spanKind != null) {
-      agentSpan.setTag(SPAN_KIND, spanKind);
+    private static Map<String, Object> onlySpan(OtlpPayload payload) throws IOException {
+        List<Map<String, Object>> spans = allSpans(payload);
+        assertEquals(1, spans.size());
+        return spans.get(0);
     }
-    agentSpan.setSamplingPriority(PrioritySampling.USER_KEEP, SamplingMechanism.DEFAULT);
-    agentSpan.finish();
-    return (DDSpan) agentSpan;
-  }
-
-  private static DDSpan localSamplingSpan() {
-    AgentSpan span = TRACER.startSpan("test", "op.sampling");
-    span.setResourceName("op.sampling");
-    return (DDSpan) span;
-  }
-
-  private static DDSpan localProbabilitySpan(double rate, boolean sampled) {
-    DDSpan span = localSamplingSpan();
-    span.spanContext()
-        .getPropagationTags()
-        .tryUpdateProbabilitySamplingDecision(
-            sampled ? PrioritySampling.SAMPLER_KEEP : PrioritySampling.SAMPLER_DROP,
-            SamplingMechanism.AGENT_RATE,
-            rate,
-            false,
-            span.getTraceId().toLong(),
-            true);
-    return span;
-  }
-
-  private static DDSpan inheritedSamplingSpan() {
-    PropagationTags propagationTags =
-        PropagationTags.factory()
-            .fromHeaderValue(
-                PropagationTags.HeaderType.W3C, "dd=s:1,vendor=state,ot=rv:ef284ace7a91e1;th:8");
-    ExtractedContext parent =
-        new ExtractedContext(
-            DDTraceId.ONE,
-            0L,
-            PrioritySampling.SAMPLER_KEEP,
-            null,
-            propagationTags,
-            TracePropagationStyle.TRACECONTEXT);
-    AgentSpan span = TRACER.startSpan("test", "op.inherited", parent);
-    span.setResourceName("op.inherited");
-    return (DDSpan) span;
-  }
-
-  private static Map<String, Object> exportSamplingSpan(DDSpan span) throws IOException {
-    if (span.getSamplingPriority() <= 0) {
-      span.setTag(SPAN_SAMPLING_MECHANISM_TAG, SamplingMechanism.SPAN_SAMPLING_RATE);
+
+    @SuppressWarnings("unchecked")
+    private static List<Map<String, Object>> allSpans(OtlpPayload payload) throws IOException {
+        byte[] bytes = new byte[payload.getContentLength()];
+        payload.getContent().get(bytes);
+        String json = new String(bytes, StandardCharsets.UTF_8);
+        Map<String, Object> root = JsonMapper.fromJsonToMap(json);
+
+        List<Object> resourceSpans = (List<Object>) root.get("resourceSpans");
+        Map<String, Object> resourceSpan = (Map<String, Object>) resourceSpans.get(0);
+        List<Object> scopeSpans = (List<Object>) resourceSpan.get("scopeSpans");
+        Map<String, Object> scopeSpan = (Map<String, Object>) scopeSpans.get(0);
+        List<Object> spans = (List<Object>) scopeSpan.get("spans");
+
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (Object span : spans) {
+            result.add((Map<String, Object>) span);
+        }
+        return result;
     }
-    span.finish();
-    OtlpTraceJsonCollector collector = new OtlpTraceJsonCollector();
-    collector.addTrace(asList((CoreSpan<?>) span));
-    return onlySpan(collector.collectTraces());
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> onlySpan(OtlpPayload payload) throws IOException {
-    List<Map<String, Object>> spans = allSpans(payload);
-    assertEquals(1, spans.size());
-    return spans.get(0);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static List<Map<String, Object>> allSpans(OtlpPayload payload) throws IOException {
-    byte[] bytes = new byte[payload.getContentLength()];
-    payload.getContent().get(bytes);
-    String json = new String(bytes, StandardCharsets.UTF_8);
-    Map<String, Object> root = JsonMapper.fromJsonToMap(json);
-
-    List<Object> resourceSpans = (List<Object>) root.get("resourceSpans");
-    Map<String, Object> resourceSpan = (Map<String, Object>) resourceSpans.get(0);
-    List<Object> scopeSpans = (List<Object>) resourceSpan.get("scopeSpans");
-    Map<String, Object> scopeSpan = (Map<String, Object>) scopeSpans.get(0);
-    List<Object> spans = (List<Object>) scopeSpan.get("spans");
-
-    List<Map<String, Object>> result = new ArrayList<>();
-    for (Object span : spans) {
-      result.add((Map<String, Object>) span);
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> onlyLink(Map<String, Object> span) {
+        List<Object> links = (List<Object>) span.get("links");
+        assertEquals(1, links.size());
+        return (Map<String, Object>) links.get(0);
     }
-    return result;
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> onlyLink(Map<String, Object> span) {
-    List<Object> links = (List<Object>) span.get("links");
-    assertEquals(1, links.size());
-    return (Map<String, Object>) links.get(0);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Set<String> attributeKeys(Map<String, Object> span) {
-    List<Object> attributes = (List<Object>) span.get("attributes");
-    Set<String> keys = new HashSet<>();
-    for (Object attribute : attributes) {
-      keys.add((String) ((Map<String, Object>) attribute).get("key"));
+
+    @SuppressWarnings("unchecked")
+    private static Set<String> attributeKeys(Map<String, Object> span) {
+        List<Object> attributes = (List<Object>) span.get("attributes");
+        Set<String> keys = new HashSet<>();
+        for (Object attribute : attributes) {
+            keys.add((String) ((Map<String, Object>) attribute).get("key"));
+        }
+        return keys;
     }
-    return keys;
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceProtoTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceProtoTest.java
index e326a6958b8..5eacb9e4bb1 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceProtoTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceProtoTest.java
@@ -79,1241 +79,1172 @@
  */
 class OtlpTraceProtoTest {
 
-  static final CoreTracer TRACER = CoreTracer.builder().writer(new LoggingWriter()).build();
+    static final CoreTracer TRACER =
+            CoreTracer.builder().writer(new LoggingWriter()).build();
 
-  // ── spec classes (test-data descriptors) ──────────────────────────────────
+    // ── spec classes (test-data descriptors) ──────────────────────────────────
 
-  static final class SpanSpec {
-    /** Span resource name → Span.name (proto field 5). */
-    final String resourceName;
+    static final class SpanSpec {
+        /** Span resource name → Span.name (proto field 5). */
+        final String resourceName;
 
-    /** Passed to {@code startSpan} → attribute "operation.name". */
-    final String operationName;
+        /** Passed to {@code startSpan} → attribute "operation.name". */
+        final String operationName;
 
-    /** Span type → attribute "span.type". */
-    final String spanType;
+        /** Span type → attribute "span.type". */
+        final String spanType;
 
-    /** Span kind tag value; {@code null} → UNSPECIFIED (kind=0). */
-    String spanKind;
+        /** Span kind tag value; {@code null} → UNSPECIFIED (kind=0). */
+        String spanKind;
 
-    /** Start time in microseconds since epoch → start_time_unix_nano = startMicros * 1000. */
-    long startMicros;
+        /** Start time in microseconds since epoch → start_time_unix_nano = startMicros * 1000. */
+        long startMicros;
 
-    /** Finish time in microseconds since epoch → end_time_unix_nano = finishMicros * 1000. */
-    long finishMicros;
+        /** Finish time in microseconds since epoch → end_time_unix_nano = finishMicros * 1000. */
+        long finishMicros;
 
-    /** If true, marks the span as an error → status.code=ERROR(2). */
-    boolean error;
+        /** If true, marks the span as an error → status.code=ERROR(2). */
+        boolean error;
 
-    /** Optional error message → status.message; ignored when {@code error} is false. */
-    String errorMessage;
+        /** Optional error message → status.message; ignored when {@code error} is false. */
+        String errorMessage;
 
-    /** Sampling priority to set; 0 = not set explicitly. */
-    int samplingPriority;
+        /** Sampling priority to set; 0 = not set explicitly. */
+        int samplingPriority;
 
-    /** Override service name; {@code null} → use tracer default. */
-    String serviceName;
+        /** Override service name; {@code null} → use tracer default. */
+        String serviceName;
 
-    /** Additional tags to set on the span, exercising string/long/boolean/double paths. */
-    Map<String, Object> extraTags;
+        /** Additional tags to set on the span, exercising string/long/boolean/double paths. */
+        Map<String, Object> extraTags;
 
-    /**
-     * If ≥ 0, index into the already-built span list to use as parent; creates a child span. If -1,
-     * the span is a root span.
-     */
-    int parentIndex;
+        /**
+         * If ≥ 0, index into the already-built span list to use as parent; creates a child span. If -1,
+         * the span is a root span.
+         */
+        int parentIndex;
 
-    /**
-     * Links to add to this span (one {@link SpanLink} per entry). Each link targets a span that
-     * precedes this one in the list. An empty array means no links.
-     */
-    LinkSpec[] links;
+        /**
+         * Links to add to this span (one {@link SpanLink} per entry). Each link targets a span that
+         * precedes this one in the list. An empty array means no links.
+         */
+        LinkSpec[] links;
 
-    /** If true, the span is measured (sets the {@code _dd.measured} attribute). */
-    boolean measured;
+        /** If true, the span is measured (sets the {@code _dd.measured} attribute). */
+        boolean measured;
 
-    /** Non-zero HTTP status code to set via {@code setHttpStatusCode}; 0 = not set. */
-    int httpStatusCode;
+        /** Non-zero HTTP status code to set via {@code setHttpStatusCode}; 0 = not set. */
+        int httpStatusCode;
+
+        /**
+         * If true, starts the span under a synthetic {@link ExtractedContext} carrying a known 128-bit
+         * trace ID, exercising the high-order bytes of {@code writeTraceId}.
+         */
+        boolean use128BitTraceId;
+
+        /** Trace origin carried in the extracted parent context; {@code null} = no origin. */
+        String origin;
+
+        SpanSpec(String resourceName, String operationName, String spanType) {
+            this.resourceName = resourceName;
+            this.operationName = operationName;
+            this.spanType = spanType;
+            this.startMicros = BASE_MICROS;
+            this.finishMicros = BASE_MICROS + DURATION_MICROS;
+            this.parentIndex = -1;
+            this.links = new LinkSpec[0];
+            this.extraTags = emptyMap();
+        }
+
+        SpanSpec spanKind(String kind) {
+            this.spanKind = kind;
+            return this;
+        }
+
+        SpanSpec times(long start, long finish) {
+            this.startMicros = start;
+            this.finishMicros = finish;
+            return this;
+        }
+
+        SpanSpec error(String message) {
+            this.error = true;
+            this.errorMessage = message;
+            return this;
+        }
+
+        SpanSpec samplingPriority(int priority) {
+            this.samplingPriority = priority;
+            return this;
+        }
+
+        SpanSpec serviceName(String name) {
+            this.serviceName = name;
+            return this;
+        }
+
+        SpanSpec extraTags(Map<String, Object> tags) {
+            this.extraTags = tags;
+            return this;
+        }
+
+        SpanSpec parentIndex(int index) {
+            this.parentIndex = index;
+            return this;
+        }
+
+        SpanSpec links(LinkSpec... links) {
+            this.links = links;
+            return this;
+        }
+
+        SpanSpec measured() {
+            this.measured = true;
+            return this;
+        }
+
+        SpanSpec httpStatusCode(int code) {
+            this.httpStatusCode = code;
+            return this;
+        }
+
+        SpanSpec use128BitTraceId() {
+            this.use128BitTraceId = true;
+            return this;
+        }
+
+        /**
+         * Sets the origin propagated via an {@link ExtractedContext} parent so that {@code
+         * metadata.getOrigin()} is non-null and the {@code _dd.origin} attribute is written.
+         */
+        SpanSpec origin(String origin) {
+            this.origin = origin;
+            return this;
+        }
+    }
 
     /**
-     * If true, starts the span under a synthetic {@link ExtractedContext} carrying a known 128-bit
-     * trace ID, exercising the high-order bytes of {@code writeTraceId}.
+     * Descriptor for a single span link: target span index, optional attributes, tracestate, and
+     * flags.
      */
-    boolean use128BitTraceId;
-
-    /** Trace origin carried in the extracted parent context; {@code null} = no origin. */
-    String origin;
-
-    SpanSpec(String resourceName, String operationName, String spanType) {
-      this.resourceName = resourceName;
-      this.operationName = operationName;
-      this.spanType = spanType;
-      this.startMicros = BASE_MICROS;
-      this.finishMicros = BASE_MICROS + DURATION_MICROS;
-      this.parentIndex = -1;
-      this.links = new LinkSpec[0];
-      this.extraTags = emptyMap();
-    }
+    static final class LinkSpec {
+        final int targetIndex;
+        final SpanAttributes attributes;
+        final String traceState;
+        final byte traceFlags;
+
+        LinkSpec(int targetIndex) {
+            this(targetIndex, SpanAttributes.EMPTY, "", SpanLink.DEFAULT_FLAGS);
+        }
 
-    SpanSpec spanKind(String kind) {
-      this.spanKind = kind;
-      return this;
-    }
+        LinkSpec(int targetIndex, SpanAttributes attributes) {
+            this(targetIndex, attributes, "", SpanLink.DEFAULT_FLAGS);
+        }
 
-    SpanSpec times(long start, long finish) {
-      this.startMicros = start;
-      this.finishMicros = finish;
-      return this;
+        LinkSpec(int targetIndex, SpanAttributes attributes, String traceState, byte traceFlags) {
+            this.targetIndex = targetIndex;
+            this.attributes = attributes;
+            this.traceState = traceState;
+            this.traceFlags = traceFlags;
+        }
     }
 
-    SpanSpec error(String message) {
-      this.error = true;
-      this.errorMessage = message;
-      return this;
-    }
+    // ── shorthand builders ────────────────────────────────────────────────────
+
+    private static final long BASE_MICROS = 1_700_000_000_000_000L;
+    private static final long DURATION_MICROS = 500_000L; // 500 ms
+
+    /**
+     * A known 128-bit trace ID used by {@link SpanSpec#use128BitTraceId} test cases. High-order bits
+     * are non-zero so the test can assert the proto encodes them correctly.
+     */
+    static final DD128bTraceId TRACE_ID_128BIT = DD128bTraceId.from(0x0123456789abcdefL, 0xfedcba9876543210L);
 
-    SpanSpec samplingPriority(int priority) {
-      this.samplingPriority = priority;
-      return this;
+    private static SpanSpec span(String resourceName, String operationName, String spanType) {
+        return new SpanSpec(resourceName, operationName, spanType);
     }
 
-    SpanSpec serviceName(String name) {
-      this.serviceName = name;
-      return this;
+    private static SpanSpec kindSpan(String resourceName, String kind) {
+        return span(resourceName, "op." + kind, "web").spanKind(kind);
     }
 
-    SpanSpec extraTags(Map<String, Object> tags) {
-      this.extraTags = tags;
-      return this;
+    private static SpanSpec sampledSpan(String resourceName) {
+        return span(resourceName, "op.sampled", "web").samplingPriority(PrioritySampling.USER_KEEP);
     }
 
-    SpanSpec parentIndex(int index) {
-      this.parentIndex = index;
-      return this;
+    private static SpanSpec errorSpan(String resourceName, String errorMessage) {
+        return span(resourceName, "op.error", "web").error(errorMessage);
     }
 
-    SpanSpec links(LinkSpec... links) {
-      this.links = links;
-      return this;
+    private static SpanSpec taggedSpan(String resourceName, Map<String, Object> extraTags) {
+        return span(resourceName, "op.tagged", "web").extraTags(extraTags);
     }
 
-    SpanSpec measured() {
-      this.measured = true;
-      return this;
+    private static SpanSpec childSpan(String resourceName, int parentIndex) {
+        return span(resourceName, "op.child", "web")
+                .times(BASE_MICROS + 10_000, BASE_MICROS + DURATION_MICROS - 10_000)
+                .parentIndex(parentIndex);
     }
 
-    SpanSpec httpStatusCode(int code) {
-      this.httpStatusCode = code;
-      return this;
+    private static SpanSpec serviceSpan(String resourceName, String serviceName) {
+        return span(resourceName, "op.service", "web").serviceName(serviceName);
     }
 
-    SpanSpec use128BitTraceId() {
-      this.use128BitTraceId = true;
-      return this;
+    /** A span with {@link SpanLink}s pointing to the spans at the given {@code targetIndices}. */
+    private static SpanSpec linkedSpan(String resourceName, int... targetIndices) {
+        LinkSpec[] links = new LinkSpec[targetIndices.length];
+        for (int i = 0; i < targetIndices.length; i++) {
+            links[i] = new LinkSpec(targetIndices[i]);
+        }
+        return span(resourceName, "op.linked", "web").links(links);
     }
 
     /**
-     * Sets the origin propagated via an {@link ExtractedContext} parent so that {@code
-     * metadata.getOrigin()} is non-null and the {@code _dd.origin} attribute is written.
+     * A span with one {@link SpanLink} pointing to the span at {@code targetIndex}, carrying the
+     * given {@link SpanAttributes}.
      */
-    SpanSpec origin(String origin) {
-      this.origin = origin;
-      return this;
-    }
-  }
-
-  /**
-   * Descriptor for a single span link: target span index, optional attributes, tracestate, and
-   * flags.
-   */
-  static final class LinkSpec {
-    final int targetIndex;
-    final SpanAttributes attributes;
-    final String traceState;
-    final byte traceFlags;
-
-    LinkSpec(int targetIndex) {
-      this(targetIndex, SpanAttributes.EMPTY, "", SpanLink.DEFAULT_FLAGS);
+    private static SpanSpec linkedSpanWithAttrs(String resourceName, int targetIndex, SpanAttributes attributes) {
+        return span(resourceName, "op.linked", "web").links(new LinkSpec(targetIndex, attributes));
     }
 
-    LinkSpec(int targetIndex, SpanAttributes attributes) {
-      this(targetIndex, attributes, "", SpanLink.DEFAULT_FLAGS);
+    /** A span with one {@link SpanLink} carrying the given W3C tracestate string. */
+    private static SpanSpec linkedSpanWithTracestate(String resourceName, int targetIndex, String traceState) {
+        return span(resourceName, "op.linked", "web")
+                .links(new LinkSpec(targetIndex, SpanAttributes.EMPTY, traceState, SpanLink.DEFAULT_FLAGS));
     }
 
-    LinkSpec(int targetIndex, SpanAttributes attributes, String traceState, byte traceFlags) {
-      this.targetIndex = targetIndex;
-      this.attributes = attributes;
-      this.traceState = traceState;
-      this.traceFlags = traceFlags;
+    /** A span with one {@link SpanLink} carrying the given trace flags. */
+    private static SpanSpec linkedSpanWithFlags(String resourceName, int targetIndex, byte traceFlags) {
+        return span(resourceName, "op.linked", "web")
+                .links(new LinkSpec(targetIndex, SpanAttributes.EMPTY, "", traceFlags));
     }
-  }
-
-  // ── shorthand builders ────────────────────────────────────────────────────
-
-  private static final long BASE_MICROS = 1_700_000_000_000_000L;
-  private static final long DURATION_MICROS = 500_000L; // 500 ms
-
-  /**
-   * A known 128-bit trace ID used by {@link SpanSpec#use128BitTraceId} test cases. High-order bits
-   * are non-zero so the test can assert the proto encodes them correctly.
-   */
-  static final DD128bTraceId TRACE_ID_128BIT =
-      DD128bTraceId.from(0x0123456789abcdefL, 0xfedcba9876543210L);
-
-  private static SpanSpec span(String resourceName, String operationName, String spanType) {
-    return new SpanSpec(resourceName, operationName, spanType);
-  }
-
-  private static SpanSpec kindSpan(String resourceName, String kind) {
-    return span(resourceName, "op." + kind, "web").spanKind(kind);
-  }
-
-  private static SpanSpec sampledSpan(String resourceName) {
-    return span(resourceName, "op.sampled", "web").samplingPriority(PrioritySampling.USER_KEEP);
-  }
-
-  private static SpanSpec errorSpan(String resourceName, String errorMessage) {
-    return span(resourceName, "op.error", "web").error(errorMessage);
-  }
-
-  private static SpanSpec taggedSpan(String resourceName, Map<String, Object> extraTags) {
-    return span(resourceName, "op.tagged", "web").extraTags(extraTags);
-  }
-
-  private static SpanSpec childSpan(String resourceName, int parentIndex) {
-    return span(resourceName, "op.child", "web")
-        .times(BASE_MICROS + 10_000, BASE_MICROS + DURATION_MICROS - 10_000)
-        .parentIndex(parentIndex);
-  }
-
-  private static SpanSpec serviceSpan(String resourceName, String serviceName) {
-    return span(resourceName, "op.service", "web").serviceName(serviceName);
-  }
-
-  /** A span with {@link SpanLink}s pointing to the spans at the given {@code targetIndices}. */
-  private static SpanSpec linkedSpan(String resourceName, int... targetIndices) {
-    LinkSpec[] links = new LinkSpec[targetIndices.length];
-    for (int i = 0; i < targetIndices.length; i++) {
-      links[i] = new LinkSpec(targetIndices[i]);
+
+    private static Map<String, Object> tags(Object... keyValues) {
+        Map<String, Object> map = new HashMap<>();
+        for (int i = 0; i < keyValues.length; i += 2) {
+            map.put((String) keyValues[i], keyValues[i + 1]);
+        }
+        return map;
     }
-    return span(resourceName, "op.linked", "web").links(links);
-  }
-
-  /**
-   * A span with one {@link SpanLink} pointing to the span at {@code targetIndex}, carrying the
-   * given {@link SpanAttributes}.
-   */
-  private static SpanSpec linkedSpanWithAttrs(
-      String resourceName, int targetIndex, SpanAttributes attributes) {
-    return span(resourceName, "op.linked", "web").links(new LinkSpec(targetIndex, attributes));
-  }
-
-  /** A span with one {@link SpanLink} carrying the given W3C tracestate string. */
-  private static SpanSpec linkedSpanWithTracestate(
-      String resourceName, int targetIndex, String traceState) {
-    return span(resourceName, "op.linked", "web")
-        .links(new LinkSpec(targetIndex, SpanAttributes.EMPTY, traceState, SpanLink.DEFAULT_FLAGS));
-  }
-
-  /** A span with one {@link SpanLink} carrying the given trace flags. */
-  private static SpanSpec linkedSpanWithFlags(
-      String resourceName, int targetIndex, byte traceFlags) {
-    return span(resourceName, "op.linked", "web")
-        .links(new LinkSpec(targetIndex, SpanAttributes.EMPTY, "", traceFlags));
-  }
-
-  private static Map<String, Object> tags(Object... keyValues) {
-    Map<String, Object> map = new HashMap<>();
-    for (int i = 0; i < keyValues.length; i += 2) {
-      map.put((String) keyValues[i], keyValues[i + 1]);
+
+    // ── test cases ─────────────────────────────────────────────────────────────
+
+    static Stream<Arguments> cases() {
+        return Stream.of(
+                // ── empty ─────────────────────────────────────────────────────────────
+                Arguments.of("empty — no spans produces empty payload", emptyList()),
+
+                // ── span kinds ────────────────────────────────────────────────────────
+                Arguments.of(
+                        "minimal span — default UNSPECIFIED kind",
+                        asList(span("GET /api/users", "servlet.request", "web"))),
+
+                // ── null span type — regression: must not NPE, span.type attribute omitted ─
+                Arguments.of(
+                        "null span type — span.type attribute omitted, no NPE",
+                        asList(span("GET /api/users", "servlet.request", null))),
+                Arguments.of("internal span kind", asList(kindSpan("GET /api/users", SPAN_KIND_INTERNAL))),
+                Arguments.of("server span kind", asList(kindSpan("GET /api/users", SPAN_KIND_SERVER))),
+                Arguments.of("client span kind", asList(kindSpan("redis.get", SPAN_KIND_CLIENT))),
+                Arguments.of("producer span kind", asList(kindSpan("kafka.produce", SPAN_KIND_PRODUCER))),
+                Arguments.of("consumer span kind", asList(kindSpan("kafka.consume", SPAN_KIND_CONSUMER))),
+
+                // ── sampling flags ────────────────────────────────────────────────────
+                Arguments.of("sampled span — SAMPLED flag set in flags field", asList(sampledSpan("GET /health"))),
+
+                // ── error status ──────────────────────────────────────────────────────
+                Arguments.of("error span — status.code=ERROR, no message", asList(errorSpan("POST /api/data", null))),
+                Arguments.of(
+                        "error span with message — status.message set",
+                        asList(errorSpan("POST /api/data", "NullPointerException: value was null"))),
+
+                // ── tag types ─────────────────────────────────────────────────────────
+                Arguments.of("span with string tag", asList(taggedSpan("tagged.op", tags("http.method", "GET")))),
+                Arguments.of("span with long tag", asList(taggedSpan("tagged.op", tags("http.status_code", 200L)))),
+                Arguments.of("span with boolean tag", asList(taggedSpan("tagged.op", tags("http.ssl", Boolean.TRUE)))),
+                Arguments.of("span with double tag", asList(taggedSpan("tagged.op", tags("net.bytes_sent", 1024.5)))),
+                Arguments.of(
+                        "span with multiple mixed tag types",
+                        asList(taggedSpan(
+                                "multi.tagged",
+                                tags(
+                                        "http.method",
+                                        "POST",
+                                        "http.status_code",
+                                        201L,
+                                        "http.ssl",
+                                        Boolean.FALSE,
+                                        "latency.ms",
+                                        3.14)))),
+
+                // ── parent–child relationship ─────────────────────────────────────────
+                Arguments.of(
+                        "child span — parent_span_id must be set",
+                        asList(span("parent.op", "parent.op", "web"), childSpan("child.op", 0))),
+
+                // ── custom service name ───────────────────────────────────────────────
+                Arguments.of(
+                        "span with different service name — service.name attribute written",
+                        asList(serviceSpan("GET /users", "my-custom-service"))),
+
+                // ── span links ────────────────────────────────────────────────────────
+                Arguments.of(
+                        "span with one link — link encodes target trace_id and span_id",
+                        asList(span("anchor.op", "anchor.op", "web"), linkedSpan("linked.op", 0))),
+                Arguments.of(
+                        "span with multiple links to different spans",
+                        asList(
+                                span("target.a", "op.a", "web"),
+                                span("target.b", "op.b", "web"),
+                                linkedSpan("multi.linked", 0, 1))),
+                Arguments.of(
+                        "span link with attributes — link attributes written to proto",
+                        asList(
+                                span("anchor.op", "anchor.op", "web"),
+                                linkedSpanWithAttrs(
+                                        "attr.linked",
+                                        0,
+                                        SpanAttributes.builder()
+                                                .put("link.source", "test")
+                                                .build()))),
+                Arguments.of(
+                        "span link with tracestate — Link.trace_state field written",
+                        asList(
+                                span("anchor.op", "anchor.op", "web"),
+                                linkedSpanWithTracestate("tracestate.linked", 0, "vendor=abc;p=123"))),
+                Arguments.of(
+                        "span link with non-default flags — extra flag bit preserved alongside SAMPLED",
+                        asList(span("anchor.op", "anchor.op", "web"), linkedSpanWithFlags("flags.linked", 0, (byte)
+                                0x02))),
+                Arguments.of(
+                        "span link with high-bit flags — flags written as unsigned byte, not sign-extended",
+                        asList(
+                                span("anchor.op", "anchor.op", "web"),
+                                linkedSpanWithFlags("flags.highbit.linked", 0, (byte) 0x82))),
+
+                // ── metadata paths ────────────────────────────────────────────────────
+                Arguments.of(
+                        "measured span — _dd.measured attribute written",
+                        asList(span("measured.op", "op.measured", "web").measured())),
+                Arguments.of(
+                        "span with http status code — http.status_code written via setHttpStatusCode",
+                        asList(span("GET /resource", "servlet.request", "web").httpStatusCode(404))),
+                Arguments.of(
+                        "span with origin — _dd.origin attribute written",
+                        asList(span("GET /api", "servlet.request", "web").origin("rum"))),
+                Arguments.of(
+                        "span with 128-bit trace ID — high-order trace_id bytes non-zero",
+                        asList(span("GET /api", "servlet.request", "web").use128BitTraceId())),
+
+                // ── multiple spans in one payload ─────────────────────────────────────
+                Arguments.of(
+                        "multiple spans — three spans under the same default scope",
+                        asList(
+                                span("first.span", "op.first", "db"),
+                                span("second.span", "op.second", "web"),
+                                kindSpan("third.span", SPAN_KIND_SERVER))));
     }
-    return map;
-  }
-
-  // ── test cases ─────────────────────────────────────────────────────────────
-
-  static Stream<Arguments> cases() {
-    return Stream.of(
-        // ── empty ─────────────────────────────────────────────────────────────
-        Arguments.of("empty — no spans produces empty payload", emptyList()),
-
-        // ── span kinds ────────────────────────────────────────────────────────
-        Arguments.of(
-            "minimal span — default UNSPECIFIED kind",
-            asList(span("GET /api/users", "servlet.request", "web"))),
-
-        // ── null span type — regression: must not NPE, span.type attribute omitted ─
-        Arguments.of(
-            "null span type — span.type attribute omitted, no NPE",
-            asList(span("GET /api/users", "servlet.request", null))),
-        Arguments.of("internal span kind", asList(kindSpan("GET /api/users", SPAN_KIND_INTERNAL))),
-        Arguments.of("server span kind", asList(kindSpan("GET /api/users", SPAN_KIND_SERVER))),
-        Arguments.of("client span kind", asList(kindSpan("redis.get", SPAN_KIND_CLIENT))),
-        Arguments.of("producer span kind", asList(kindSpan("kafka.produce", SPAN_KIND_PRODUCER))),
-        Arguments.of("consumer span kind", asList(kindSpan("kafka.consume", SPAN_KIND_CONSUMER))),
-
-        // ── sampling flags ────────────────────────────────────────────────────
-        Arguments.of(
-            "sampled span — SAMPLED flag set in flags field", asList(sampledSpan("GET /health"))),
-
-        // ── error status ──────────────────────────────────────────────────────
-        Arguments.of(
-            "error span — status.code=ERROR, no message",
-            asList(errorSpan("POST /api/data", null))),
-        Arguments.of(
-            "error span with message — status.message set",
-            asList(errorSpan("POST /api/data", "NullPointerException: value was null"))),
-
-        // ── tag types ─────────────────────────────────────────────────────────
-        Arguments.of(
-            "span with string tag", asList(taggedSpan("tagged.op", tags("http.method", "GET")))),
-        Arguments.of(
-            "span with long tag", asList(taggedSpan("tagged.op", tags("http.status_code", 200L)))),
-        Arguments.of(
-            "span with boolean tag",
-            asList(taggedSpan("tagged.op", tags("http.ssl", Boolean.TRUE)))),
-        Arguments.of(
-            "span with double tag",
-            asList(taggedSpan("tagged.op", tags("net.bytes_sent", 1024.5)))),
-        Arguments.of(
-            "span with multiple mixed tag types",
-            asList(
-                taggedSpan(
-                    "multi.tagged",
-                    tags(
-                        "http.method",
-                        "POST",
-                        "http.status_code",
-                        201L,
-                        "http.ssl",
-                        Boolean.FALSE,
-                        "latency.ms",
-                        3.14)))),
-
-        // ── parent–child relationship ─────────────────────────────────────────
-        Arguments.of(
-            "child span — parent_span_id must be set",
-            asList(span("parent.op", "parent.op", "web"), childSpan("child.op", 0))),
-
-        // ── custom service name ───────────────────────────────────────────────
-        Arguments.of(
-            "span with different service name — service.name attribute written",
-            asList(serviceSpan("GET /users", "my-custom-service"))),
-
-        // ── span links ────────────────────────────────────────────────────────
-        Arguments.of(
-            "span with one link — link encodes target trace_id and span_id",
-            asList(span("anchor.op", "anchor.op", "web"), linkedSpan("linked.op", 0))),
-        Arguments.of(
-            "span with multiple links to different spans",
-            asList(
-                span("target.a", "op.a", "web"),
-                span("target.b", "op.b", "web"),
-                linkedSpan("multi.linked", 0, 1))),
-        Arguments.of(
-            "span link with attributes — link attributes written to proto",
-            asList(
-                span("anchor.op", "anchor.op", "web"),
-                linkedSpanWithAttrs(
-                    "attr.linked",
-                    0,
-                    SpanAttributes.builder().put("link.source", "test").build()))),
-        Arguments.of(
-            "span link with tracestate — Link.trace_state field written",
-            asList(
-                span("anchor.op", "anchor.op", "web"),
-                linkedSpanWithTracestate("tracestate.linked", 0, "vendor=abc;p=123"))),
-        Arguments.of(
-            "span link with non-default flags — extra flag bit preserved alongside SAMPLED",
-            asList(
-                span("anchor.op", "anchor.op", "web"),
-                linkedSpanWithFlags("flags.linked", 0, (byte) 0x02))),
-        Arguments.of(
-            "span link with high-bit flags — flags written as unsigned byte, not sign-extended",
-            asList(
-                span("anchor.op", "anchor.op", "web"),
-                linkedSpanWithFlags("flags.highbit.linked", 0, (byte) 0x82))),
-
-        // ── metadata paths ────────────────────────────────────────────────────
-        Arguments.of(
-            "measured span — _dd.measured attribute written",
-            asList(span("measured.op", "op.measured", "web").measured())),
-        Arguments.of(
-            "span with http status code — http.status_code written via setHttpStatusCode",
-            asList(span("GET /resource", "servlet.request", "web").httpStatusCode(404))),
-        Arguments.of(
-            "span with origin — _dd.origin attribute written",
-            asList(span("GET /api", "servlet.request", "web").origin("rum"))),
-        Arguments.of(
-            "span with 128-bit trace ID — high-order trace_id bytes non-zero",
-            asList(span("GET /api", "servlet.request", "web").use128BitTraceId())),
-
-        // ── multiple spans in one payload ─────────────────────────────────────
-        Arguments.of(
-            "multiple spans — three spans under the same default scope",
-            asList(
-                span("first.span", "op.first", "db"),
-                span("second.span", "op.second", "web"),
-                kindSpan("third.span", SPAN_KIND_SERVER))));
-  }
 
-  // ── parameterized test ────────────────────────────────────────────────────
+    // ── parameterized test ────────────────────────────────────────────────────
 
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("cases")
-  void testCollectTraces(String caseName, List<SpanSpec> specs) throws IOException {
-    List<DDSpan> spans = buildSpans(specs);
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("cases")
+    void testCollectTraces(String caseName, List<SpanSpec> specs) throws IOException {
+        List<DDSpan> spans = buildSpans(specs);
 
-    OtlpTraceProtoCollector collector = new OtlpTraceProtoCollector();
-    collector.addTrace(spans);
-    OtlpPayload payload = collector.collectTraces();
+        OtlpTraceProtoCollector collector = new OtlpTraceProtoCollector();
+        collector.addTrace(spans);
+        OtlpPayload payload = collector.collectTraces();
 
-    if (spans.isEmpty()) {
-      assertEquals(0, payload.getContentLength(), "empty span list must produce empty payload");
-      return;
-    }
+        if (spans.isEmpty()) {
+            assertEquals(0, payload.getContentLength(), "empty span list must produce empty payload");
+            return;
+        }
 
-    assertTrue(payload.getContentLength() > 0, "non-empty span list must produce bytes");
-
-    // ── parse TracesData ─────────────────────────────────────────────────
-    // Full payload encodes a single TracesData.resource_spans entry (field 1, LEN).
-    CodedInputStream tracesData = CodedInputStream.newInstance(payload.getContent());
-    int tracesTag = tracesData.readTag();
-    assertEquals(
-        1, WireFormat.getTagFieldNumber(tracesTag), "TracesData.resource_spans is field 1");
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tracesTag));
-    CodedInputStream resourceSpans = tracesData.readBytes().newCodedInput();
-    assertTrue(tracesData.isAtEnd(), "expected exactly one ResourceSpans");
-
-    // ── parse ResourceSpans ──────────────────────────────────────────────
-    // Fields: resource=1, scope_spans=2
-    boolean resourceFound = false;
-    CodedInputStream scopeSpans = null;
-    while (!resourceSpans.isAtEnd()) {
-      int tag = resourceSpans.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 1:
-          verifyResource(resourceSpans.readBytes().newCodedInput());
-          resourceFound = true;
-          break;
-        case 2:
-          scopeSpans = resourceSpans.readBytes().newCodedInput();
-          break;
-        default:
-          resourceSpans.skipField(tag);
-      }
-    }
-    assertTrue(resourceFound, "Resource must be present in ResourceSpans");
-    assertNotNull(scopeSpans, "ScopeSpans must be present in ResourceSpans");
-
-    // ── parse ScopeSpans ─────────────────────────────────────────────────
-    // Fields: scope=1, spans=2 (repeated), schema_url=3
-    List<byte[]> spanBlobs = new ArrayList<>();
-    while (!scopeSpans.isAtEnd()) {
-      int tag = scopeSpans.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 1:
-          verifyDefaultScope(scopeSpans.readBytes().newCodedInput());
-          break;
-        case 2:
-          spanBlobs.add(scopeSpans.readBytes().toByteArray());
-          break;
-        default:
-          scopeSpans.skipField(tag);
-      }
-    }
-    assertEquals(spans.size(), spanBlobs.size(), "span count mismatch in case: " + caseName);
+        assertTrue(payload.getContentLength() > 0, "non-empty span list must produce bytes");
+
+        // ── parse TracesData ─────────────────────────────────────────────────
+        // Full payload encodes a single TracesData.resource_spans entry (field 1, LEN).
+        CodedInputStream tracesData = CodedInputStream.newInstance(payload.getContent());
+        int tracesTag = tracesData.readTag();
+        assertEquals(1, WireFormat.getTagFieldNumber(tracesTag), "TracesData.resource_spans is field 1");
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tracesTag));
+        CodedInputStream resourceSpans = tracesData.readBytes().newCodedInput();
+        assertTrue(tracesData.isAtEnd(), "expected exactly one ResourceSpans");
+
+        // ── parse ResourceSpans ──────────────────────────────────────────────
+        // Fields: resource=1, scope_spans=2
+        boolean resourceFound = false;
+        CodedInputStream scopeSpans = null;
+        while (!resourceSpans.isAtEnd()) {
+            int tag = resourceSpans.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 1:
+                    verifyResource(resourceSpans.readBytes().newCodedInput());
+                    resourceFound = true;
+                    break;
+                case 2:
+                    scopeSpans = resourceSpans.readBytes().newCodedInput();
+                    break;
+                default:
+                    resourceSpans.skipField(tag);
+            }
+        }
+        assertTrue(resourceFound, "Resource must be present in ResourceSpans");
+        assertNotNull(scopeSpans, "ScopeSpans must be present in ResourceSpans");
+
+        // ── parse ScopeSpans ─────────────────────────────────────────────────
+        // Fields: scope=1, spans=2 (repeated), schema_url=3
+        List<byte[]> spanBlobs = new ArrayList<>();
+        while (!scopeSpans.isAtEnd()) {
+            int tag = scopeSpans.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 1:
+                    verifyDefaultScope(scopeSpans.readBytes().newCodedInput());
+                    break;
+                case 2:
+                    spanBlobs.add(scopeSpans.readBytes().toByteArray());
+                    break;
+                default:
+                    scopeSpans.skipField(tag);
+            }
+        }
+        assertEquals(spans.size(), spanBlobs.size(), "span count mismatch in case: " + caseName);
 
-    // ── verify each span ─────────────────────────────────────────────────
-    for (int i = 0; i < spans.size(); i++) {
-      verifySpan(
-          CodedInputStream.newInstance(spanBlobs.get(i)), spans.get(i), specs.get(i), caseName);
+        // ── verify each span ─────────────────────────────────────────────────
+        for (int i = 0; i < spans.size(); i++) {
+            verifySpan(CodedInputStream.newInstance(spanBlobs.get(i)), spans.get(i), specs.get(i), caseName);
+        }
     }
-  }
-
-  @Test
-  void testCollectMultipleTraces() throws IOException {
-    // Three independent traces — each root span gets its own auto-generated trace ID.
-    List<DDSpan> trace1 =
-        buildSpans(asList(span("trace1.root", "op.root", "web"), childSpan("trace1.child", 0)));
-    List<DDSpan> trace2 = buildSpans(asList(span("trace2.root", "op.root", "db")));
-    List<DDSpan> trace3 =
-        buildSpans(
-            asList(
-                span("trace3.a", "op.a", "web"),
-                span("trace3.b", "op.b", "web"),
-                span("trace3.c", "op.c", "web")));
-
-    // Sanity: all three traces must have distinct trace IDs.
-    DDTraceId traceId1 = trace1.get(0).getTraceId();
-    DDTraceId traceId2 = trace2.get(0).getTraceId();
-    DDTraceId traceId3 = trace3.get(0).getTraceId();
-    assertNotEquals(traceId1, traceId2, "trace IDs must be distinct");
-    assertNotEquals(traceId2, traceId3, "trace IDs must be distinct");
-    assertNotEquals(traceId1, traceId3, "trace IDs must be distinct");
-
-    OtlpTraceProtoCollector collector = new OtlpTraceProtoCollector();
-    collector.addTrace(trace1);
-    collector.addTrace(trace2);
-    collector.addTrace(trace3);
-    OtlpPayload payload = collector.collectTraces();
-
-    // Collect all span IDs we expect to find across all three traces.
-    Set<Long> expectedSpanIds = new HashSet<>();
-    Set<Long> expectedTraceIds = new HashSet<>();
-    for (List<DDSpan> trace : asList(trace1, trace2, trace3)) {
-      for (DDSpan span : trace) {
-        expectedSpanIds.add(span.getSpanId());
-        expectedTraceIds.add(span.getTraceId().toLong());
-      }
+
+    @Test
+    void testCollectMultipleTraces() throws IOException {
+        // Three independent traces — each root span gets its own auto-generated trace ID.
+        List<DDSpan> trace1 = buildSpans(asList(span("trace1.root", "op.root", "web"), childSpan("trace1.child", 0)));
+        List<DDSpan> trace2 = buildSpans(asList(span("trace2.root", "op.root", "db")));
+        List<DDSpan> trace3 = buildSpans(asList(
+                span("trace3.a", "op.a", "web"), span("trace3.b", "op.b", "web"), span("trace3.c", "op.c", "web")));
+
+        // Sanity: all three traces must have distinct trace IDs.
+        DDTraceId traceId1 = trace1.get(0).getTraceId();
+        DDTraceId traceId2 = trace2.get(0).getTraceId();
+        DDTraceId traceId3 = trace3.get(0).getTraceId();
+        assertNotEquals(traceId1, traceId2, "trace IDs must be distinct");
+        assertNotEquals(traceId2, traceId3, "trace IDs must be distinct");
+        assertNotEquals(traceId1, traceId3, "trace IDs must be distinct");
+
+        OtlpTraceProtoCollector collector = new OtlpTraceProtoCollector();
+        collector.addTrace(trace1);
+        collector.addTrace(trace2);
+        collector.addTrace(trace3);
+        OtlpPayload payload = collector.collectTraces();
+
+        // Collect all span IDs we expect to find across all three traces.
+        Set<Long> expectedSpanIds = new HashSet<>();
+        Set<Long> expectedTraceIds = new HashSet<>();
+        for (List<DDSpan> trace : asList(trace1, trace2, trace3)) {
+            for (DDSpan span : trace) {
+                expectedSpanIds.add(span.getSpanId());
+                expectedTraceIds.add(span.getTraceId().toLong());
+            }
+        }
+        int totalSpans = trace1.size() + trace2.size() + trace3.size(); // 6
+
+        assertTrue(payload.getContentLength() > 0, "multi-trace payload must be non-empty");
+
+        // Parse TracesData → ResourceSpans → ScopeSpans → extract span_id and trace_id per span.
+        CodedInputStream tracesData = CodedInputStream.newInstance(payload.getContent());
+        int tracesTag = tracesData.readTag();
+        assertEquals(1, WireFormat.getTagFieldNumber(tracesTag), "TracesData.resource_spans is field 1");
+        assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tracesTag));
+        CodedInputStream resourceSpans = tracesData.readBytes().newCodedInput();
+        assertTrue(tracesData.isAtEnd(), "expected exactly one ResourceSpans");
+
+        CodedInputStream scopeSpans = null;
+        while (!resourceSpans.isAtEnd()) {
+            int tag = resourceSpans.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 2) {
+                scopeSpans = resourceSpans.readBytes().newCodedInput();
+            } else {
+                resourceSpans.skipField(tag);
+            }
+        }
+        assertNotNull(scopeSpans, "ScopeSpans must be present in ResourceSpans");
+
+        Set<Long> parsedSpanIds = new HashSet<>();
+        Set<Long> parsedTraceIds = new HashSet<>();
+        while (!scopeSpans.isAtEnd()) {
+            int tag = scopeSpans.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 2) {
+                CodedInputStream spanData = scopeSpans.readBytes().newCodedInput();
+                byte[] parsedTraceId = null;
+                byte[] parsedSpanId = null;
+                while (!spanData.isAtEnd()) {
+                    int spanTag = spanData.readTag();
+                    switch (WireFormat.getTagFieldNumber(spanTag)) {
+                        case 1:
+                            parsedTraceId = spanData.readBytes().toByteArray();
+                            break;
+                        case 2:
+                            parsedSpanId = spanData.readBytes().toByteArray();
+                            break;
+                        default:
+                            spanData.skipField(spanTag);
+                    }
+                }
+                assertNotNull(parsedSpanId, "span_id must be present in every span");
+                assertNotNull(parsedTraceId, "trace_id must be present in every span");
+                assertEquals(16, parsedTraceId.length, "trace_id must be 16 bytes");
+                assertEquals(8, parsedSpanId.length, "span_id must be 8 bytes");
+                parsedSpanIds.add(readBigEndianLong(parsedSpanId));
+                // low-order part of traceId occupies parsedTraceId[8..15] (big-endian)
+                parsedTraceIds.add(readBigEndianLong(copyOfRange(parsedTraceId, 8, 16)));
+            } else {
+                scopeSpans.skipField(tag);
+            }
+        }
+
+        assertEquals(totalSpans, parsedSpanIds.size(), "all spans from all traces must appear in payload");
+        assertEquals(expectedSpanIds, parsedSpanIds, "span IDs in payload must match those built");
+        assertEquals(
+                expectedTraceIds.size(),
+                parsedTraceIds.size(),
+                "payload must contain spans with all three distinct trace IDs");
     }
-    int totalSpans = trace1.size() + trace2.size() + trace3.size(); // 6
-
-    assertTrue(payload.getContentLength() > 0, "multi-trace payload must be non-empty");
-
-    // Parse TracesData → ResourceSpans → ScopeSpans → extract span_id and trace_id per span.
-    CodedInputStream tracesData = CodedInputStream.newInstance(payload.getContent());
-    int tracesTag = tracesData.readTag();
-    assertEquals(
-        1, WireFormat.getTagFieldNumber(tracesTag), "TracesData.resource_spans is field 1");
-    assertEquals(WireFormat.WIRETYPE_LENGTH_DELIMITED, WireFormat.getTagWireType(tracesTag));
-    CodedInputStream resourceSpans = tracesData.readBytes().newCodedInput();
-    assertTrue(tracesData.isAtEnd(), "expected exactly one ResourceSpans");
-
-    CodedInputStream scopeSpans = null;
-    while (!resourceSpans.isAtEnd()) {
-      int tag = resourceSpans.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 2) {
-        scopeSpans = resourceSpans.readBytes().newCodedInput();
-      } else {
-        resourceSpans.skipField(tag);
-      }
+
+    @Test
+    void traceStateAndFlagsStayPairedAcrossSamplingDecisions() throws IOException {
+        EncodedSamplingState localFallback = exportSamplingState(localProbabilitySpan(1.0, true));
+        assertTrue(localFallback.traceState.matches("ot=rv:[0-9a-f]{14};th:0"));
+        assertEquals(SAMPLED_TRACE_FLAG, localFallback.flags);
+
+        EncodedSamplingState inherited = exportSamplingState(inheritedSamplingSpan());
+        assertEquals("dd=s:1,ot=rv:ef284ace7a91e1;th:8,vendor=state", inherited.traceState);
+        assertEquals(SAMPLED_TRACE_FLAG, inherited.flags);
+
+        EncodedSamplingState probabilityDrop = exportSamplingState(localProbabilitySpan(0.0, false));
+        assertTrue(probabilityDrop.traceState.matches("ot=rv:[0-9a-f]{14};th:ffffffffffffff"));
+        assertEquals(0, probabilityDrop.flags);
+
+        DDSpan limiterDrop = localSamplingSpan();
+        limiterDrop
+                .spanContext()
+                .getPropagationTags()
+                .tryUpdateProbabilitySamplingDecision(
+                        PrioritySampling.SAMPLER_DROP,
+                        SamplingMechanism.AGENT_RATE,
+                        1.0,
+                        true,
+                        limiterDrop.getTraceId().toLong(),
+                        true);
+        EncodedSamplingState limiter = exportSamplingState(limiterDrop);
+        assertNull(limiter.traceState);
+        assertEquals(0, limiter.flags);
+
+        DDSpan nonProbabilityKeep = localProbabilitySpan(0.0, false);
+        nonProbabilityKeep.spanContext().getPropagationTags().forceKeep(SamplingMechanism.MANUAL);
+        EncodedSamplingState nonProbability = exportSamplingState(nonProbabilityKeep);
+        assertNull(nonProbability.traceState);
+        assertEquals(SAMPLED_TRACE_FLAG, nonProbability.flags);
     }
-    assertNotNull(scopeSpans, "ScopeSpans must be present in ResourceSpans");
-
-    Set<Long> parsedSpanIds = new HashSet<>();
-    Set<Long> parsedTraceIds = new HashSet<>();
-    while (!scopeSpans.isAtEnd()) {
-      int tag = scopeSpans.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 2) {
-        CodedInputStream spanData = scopeSpans.readBytes().newCodedInput();
-        byte[] parsedTraceId = null;
-        byte[] parsedSpanId = null;
-        while (!spanData.isAtEnd()) {
-          int spanTag = spanData.readTag();
-          switch (WireFormat.getTagFieldNumber(spanTag)) {
-            case 1:
-              parsedTraceId = spanData.readBytes().toByteArray();
-              break;
-            case 2:
-              parsedSpanId = spanData.readBytes().toByteArray();
-              break;
-            default:
-              spanData.skipField(spanTag);
-          }
-        }
-        assertNotNull(parsedSpanId, "span_id must be present in every span");
-        assertNotNull(parsedTraceId, "trace_id must be present in every span");
-        assertEquals(16, parsedTraceId.length, "trace_id must be 16 bytes");
-        assertEquals(8, parsedSpanId.length, "span_id must be 8 bytes");
-        parsedSpanIds.add(readBigEndianLong(parsedSpanId));
-        // low-order part of traceId occupies parsedTraceId[8..15] (big-endian)
-        parsedTraceIds.add(readBigEndianLong(copyOfRange(parsedTraceId, 8, 16)));
-      } else {
-        scopeSpans.skipField(tag);
-      }
+
+    @Test
+    void poisonedSpanResetsCollectorForNextTrace() {
+        // mid-trace exception (e.g. from a malformed span) must not leave partial state behind
+        DDSpan realSpan =
+                buildSpans(asList(span("first.span", "op.first", "web"))).get(0);
+
+        CoreSpan<?> poison = mock(CoreSpan.class);
+        when(poison.samplingPriority()).thenReturn(1);
+        when(poison.getTraceId()).thenThrow(new RuntimeException("boom"));
+
+        List<CoreSpan<?>> poisonedTrace = new ArrayList<>();
+        poisonedTrace.add(poison);
+        poisonedTrace.add(realSpan);
+
+        OtlpTraceProtoCollector collector = new OtlpTraceProtoCollector();
+        assertThrows(RuntimeException.class, () -> collector.addTrace(poisonedTrace));
+
+        // a normal trace collected afterwards must not see any leftover state from the poisoned one
+        List<DDSpan> normalTrace = buildSpans(asList(span("normal.op", "op.normal", "web")));
+        collector.addTrace(normalTrace);
+        OtlpPayload payload = collector.collectTraces();
+
+        assertTrue(payload.getContentLength() > 0, "normal trace after reset must still export");
     }
 
-    assertEquals(
-        totalSpans, parsedSpanIds.size(), "all spans from all traces must appear in payload");
-    assertEquals(expectedSpanIds, parsedSpanIds, "span IDs in payload must match those built");
-    assertEquals(
-        expectedTraceIds.size(),
-        parsedTraceIds.size(),
-        "payload must contain spans with all three distinct trace IDs");
-  }
-
-  @Test
-  void traceStateAndFlagsStayPairedAcrossSamplingDecisions() throws IOException {
-    EncodedSamplingState localFallback = exportSamplingState(localProbabilitySpan(1.0, true));
-    assertTrue(localFallback.traceState.matches("ot=rv:[0-9a-f]{14};th:0"));
-    assertEquals(SAMPLED_TRACE_FLAG, localFallback.flags);
-
-    EncodedSamplingState inherited = exportSamplingState(inheritedSamplingSpan());
-    assertEquals("dd=s:1,ot=rv:ef284ace7a91e1;th:8,vendor=state", inherited.traceState);
-    assertEquals(SAMPLED_TRACE_FLAG, inherited.flags);
-
-    EncodedSamplingState probabilityDrop = exportSamplingState(localProbabilitySpan(0.0, false));
-    assertTrue(probabilityDrop.traceState.matches("ot=rv:[0-9a-f]{14};th:ffffffffffffff"));
-    assertEquals(0, probabilityDrop.flags);
-
-    DDSpan limiterDrop = localSamplingSpan();
-    limiterDrop
-        .spanContext()
-        .getPropagationTags()
-        .tryUpdateProbabilitySamplingDecision(
-            PrioritySampling.SAMPLER_DROP,
-            SamplingMechanism.AGENT_RATE,
-            1.0,
-            true,
-            limiterDrop.getTraceId().toLong(),
-            true);
-    EncodedSamplingState limiter = exportSamplingState(limiterDrop);
-    assertNull(limiter.traceState);
-    assertEquals(0, limiter.flags);
-
-    DDSpan nonProbabilityKeep = localProbabilitySpan(0.0, false);
-    nonProbabilityKeep.spanContext().getPropagationTags().forceKeep(SamplingMechanism.MANUAL);
-    EncodedSamplingState nonProbability = exportSamplingState(nonProbabilityKeep);
-    assertNull(nonProbability.traceState);
-    assertEquals(SAMPLED_TRACE_FLAG, nonProbability.flags);
-  }
-
-  @Test
-  void poisonedSpanResetsCollectorForNextTrace() {
-    // mid-trace exception (e.g. from a malformed span) must not leave partial state behind
-    DDSpan realSpan = buildSpans(asList(span("first.span", "op.first", "web"))).get(0);
-
-    CoreSpan<?> poison = mock(CoreSpan.class);
-    when(poison.samplingPriority()).thenReturn(1);
-    when(poison.getTraceId()).thenThrow(new RuntimeException("boom"));
-
-    List<CoreSpan<?>> poisonedTrace = new ArrayList<>();
-    poisonedTrace.add(poison);
-    poisonedTrace.add(realSpan);
-
-    OtlpTraceProtoCollector collector = new OtlpTraceProtoCollector();
-    assertThrows(RuntimeException.class, () -> collector.addTrace(poisonedTrace));
-
-    // a normal trace collected afterwards must not see any leftover state from the poisoned one
-    List<DDSpan> normalTrace = buildSpans(asList(span("normal.op", "op.normal", "web")));
-    collector.addTrace(normalTrace);
-    OtlpPayload payload = collector.collectTraces();
-
-    assertTrue(payload.getContentLength() > 0, "normal trace after reset must still export");
-  }
-
-  @Test
-  void testSpanOrderInTracePreserved() throws IOException {
-    // Verifies that spans appear in the payload with the same order as the original trace
-    List<DDSpan> spans =
-        buildSpans(
-            asList(
+    @Test
+    void testSpanOrderInTracePreserved() throws IOException {
+        // Verifies that spans appear in the payload with the same order as the original trace
+        List<DDSpan> spans = buildSpans(asList(
                 span("first.span", "op.first", "web"),
                 span("second.span", "op.second", "web"),
                 span("third.span", "op.third", "web")));
 
-    OtlpTraceProtoCollector collector = new OtlpTraceProtoCollector();
-    collector.addTrace(spans);
-    OtlpPayload payload = collector.collectTraces();
-
-    assertEquals(
-        asList("first.span", "second.span", "third.span"),
-        parseSpanNamesFromPayload(payload),
-        "spans must appear in trace order in the payload");
-  }
-
-  private static List<String> parseSpanNamesFromPayload(OtlpPayload payload) throws IOException {
-    CodedInputStream tracesData = CodedInputStream.newInstance(payload.getContent());
-    tracesData.readTag(); // field 1: TracesData.resource_spans
-    CodedInputStream resourceSpans = tracesData.readBytes().newCodedInput();
-
-    CodedInputStream scopeSpans = null;
-    while (!resourceSpans.isAtEnd()) {
-      int tag = resourceSpans.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 2) {
-        scopeSpans = resourceSpans.readBytes().newCodedInput();
-      } else {
-        resourceSpans.skipField(tag);
-      }
+        OtlpTraceProtoCollector collector = new OtlpTraceProtoCollector();
+        collector.addTrace(spans);
+        OtlpPayload payload = collector.collectTraces();
+
+        assertEquals(
+                asList("first.span", "second.span", "third.span"),
+                parseSpanNamesFromPayload(payload),
+                "spans must appear in trace order in the payload");
     }
-    assertNotNull(scopeSpans, "ScopeSpans must be present in ResourceSpans");
-
-    List<String> names = new ArrayList<>();
-    while (!scopeSpans.isAtEnd()) {
-      int tag = scopeSpans.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 2) {
-        CodedInputStream spanData = scopeSpans.readBytes().newCodedInput();
-        String name = null;
-        while (!spanData.isAtEnd()) {
-          int spanTag = spanData.readTag();
-          if (WireFormat.getTagFieldNumber(spanTag) == 5) {
-            name = spanData.readString();
-            break;
-          } else {
-            spanData.skipField(spanTag);
-          }
+
+    private static List<String> parseSpanNamesFromPayload(OtlpPayload payload) throws IOException {
+        CodedInputStream tracesData = CodedInputStream.newInstance(payload.getContent());
+        tracesData.readTag(); // field 1: TracesData.resource_spans
+        CodedInputStream resourceSpans = tracesData.readBytes().newCodedInput();
+
+        CodedInputStream scopeSpans = null;
+        while (!resourceSpans.isAtEnd()) {
+            int tag = resourceSpans.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 2) {
+                scopeSpans = resourceSpans.readBytes().newCodedInput();
+            } else {
+                resourceSpans.skipField(tag);
+            }
         }
-        names.add(name);
-      } else {
-        scopeSpans.skipField(tag);
-      }
-    }
-    return names;
-  }
-
-  private static DDSpan localSamplingSpan() {
-    AgentSpan span = TRACER.startSpan("test", "op.sampling");
-    span.setResourceName("op.sampling");
-    return (DDSpan) span;
-  }
-
-  private static DDSpan localProbabilitySpan(double rate, boolean sampled) {
-    DDSpan span = localSamplingSpan();
-    span.spanContext()
-        .getPropagationTags()
-        .tryUpdateProbabilitySamplingDecision(
-            sampled ? PrioritySampling.SAMPLER_KEEP : PrioritySampling.SAMPLER_DROP,
-            SamplingMechanism.AGENT_RATE,
-            rate,
-            false,
-            span.getTraceId().toLong(),
-            true);
-    return span;
-  }
-
-  private static DDSpan inheritedSamplingSpan() {
-    PropagationTags propagationTags =
-        PropagationTags.factory()
-            .fromHeaderValue(
-                PropagationTags.HeaderType.W3C, "dd=s:1,vendor=state,ot=rv:ef284ace7a91e1;th:8");
-    ExtractedContext parent =
-        new ExtractedContext(
-            DDTraceId.ONE,
-            0L,
-            PrioritySampling.SAMPLER_KEEP,
-            null,
-            propagationTags,
-            TracePropagationStyle.TRACECONTEXT);
-    AgentSpan span = TRACER.startSpan("test", "op.inherited", parent);
-    span.setResourceName("op.inherited");
-    return (DDSpan) span;
-  }
-
-  private static EncodedSamplingState exportSamplingState(DDSpan span) throws IOException {
-    if (span.getSamplingPriority() <= 0) {
-      span.setTag(SPAN_SAMPLING_MECHANISM_TAG, SamplingMechanism.SPAN_SAMPLING_RATE);
-    }
-    span.finish();
-    OtlpTraceProtoCollector collector = new OtlpTraceProtoCollector();
-    collector.addTrace(asList((CoreSpan<?>) span));
-    return parseOnlySpanSamplingState(collector.collectTraces());
-  }
-
-  private static EncodedSamplingState parseOnlySpanSamplingState(OtlpPayload payload)
-      throws IOException {
-    CodedInputStream tracesData = CodedInputStream.newInstance(payload.getContent());
-    tracesData.readTag();
-    CodedInputStream resourceSpans = tracesData.readBytes().newCodedInput();
-    CodedInputStream scopeSpans = null;
-    while (!resourceSpans.isAtEnd()) {
-      int tag = resourceSpans.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 2) {
-        scopeSpans = resourceSpans.readBytes().newCodedInput();
-      } else {
-        resourceSpans.skipField(tag);
-      }
-    }
-    assertNotNull(scopeSpans);
-
-    CodedInputStream spanData = null;
-    while (!scopeSpans.isAtEnd()) {
-      int tag = scopeSpans.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 2) {
-        spanData = scopeSpans.readBytes().newCodedInput();
-        break;
-      }
-      scopeSpans.skipField(tag);
-    }
-    assertNotNull(spanData);
-
-    String traceState = null;
-    int flags = 0;
-    while (!spanData.isAtEnd()) {
-      int tag = spanData.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 3:
-          traceState = spanData.readString();
-          break;
-        case 16:
-          flags = spanData.readFixed32();
-          break;
-        default:
-          spanData.skipField(tag);
-      }
+        assertNotNull(scopeSpans, "ScopeSpans must be present in ResourceSpans");
+
+        List<String> names = new ArrayList<>();
+        while (!scopeSpans.isAtEnd()) {
+            int tag = scopeSpans.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 2) {
+                CodedInputStream spanData = scopeSpans.readBytes().newCodedInput();
+                String name = null;
+                while (!spanData.isAtEnd()) {
+                    int spanTag = spanData.readTag();
+                    if (WireFormat.getTagFieldNumber(spanTag) == 5) {
+                        name = spanData.readString();
+                        break;
+                    } else {
+                        spanData.skipField(spanTag);
+                    }
+                }
+                names.add(name);
+            } else {
+                scopeSpans.skipField(tag);
+            }
+        }
+        return names;
     }
-    return new EncodedSamplingState(traceState, flags);
-  }
 
-  private static final class EncodedSamplingState {
-    private final String traceState;
-    private final int flags;
+    private static DDSpan localSamplingSpan() {
+        AgentSpan span = TRACER.startSpan("test", "op.sampling");
+        span.setResourceName("op.sampling");
+        return (DDSpan) span;
+    }
 
-    private EncodedSamplingState(String traceState, int flags) {
-      this.traceState = traceState;
-      this.flags = flags;
+    private static DDSpan localProbabilitySpan(double rate, boolean sampled) {
+        DDSpan span = localSamplingSpan();
+        span.spanContext()
+                .getPropagationTags()
+                .tryUpdateProbabilitySamplingDecision(
+                        sampled ? PrioritySampling.SAMPLER_KEEP : PrioritySampling.SAMPLER_DROP,
+                        SamplingMechanism.AGENT_RATE,
+                        rate,
+                        false,
+                        span.getTraceId().toLong(),
+                        true);
+        return span;
     }
-  }
-
-  // ── span construction ─────────────────────────────────────────────────────
-
-  /** Builds {@link DDSpan} instances from the given specs, collecting them in order. */
-  private static List<DDSpan> buildSpans(List<SpanSpec> specs) {
-    List<DDSpan> spans = new ArrayList<>(specs.size());
-    for (SpanSpec spec : specs) {
-      AgentSpan agentSpan;
-      if (spec.use128BitTraceId) {
-        ExtractedContext parent128 =
-            new ExtractedContext(
-                TRACE_ID_128BIT,
-                0L,
-                PrioritySampling.UNSET,
-                null,
-                PropagationTags.factory().empty(),
-                TracePropagationStyle.DATADOG);
-        agentSpan = TRACER.startSpan("test", spec.operationName, parent128, spec.startMicros);
-      } else if (spec.origin != null) {
-        ExtractedContext parentWithOrigin =
-            new ExtractedContext(
+
+    private static DDSpan inheritedSamplingSpan() {
+        PropagationTags propagationTags = PropagationTags.factory()
+                .fromHeaderValue(PropagationTags.HeaderType.W3C, "dd=s:1,vendor=state,ot=rv:ef284ace7a91e1;th:8");
+        ExtractedContext parent = new ExtractedContext(
                 DDTraceId.ONE,
                 0L,
-                PrioritySampling.UNSET,
-                spec.origin,
-                PropagationTags.factory().empty(),
-                TracePropagationStyle.DATADOG);
-        agentSpan =
-            TRACER.startSpan("test", spec.operationName, parentWithOrigin, spec.startMicros);
-      } else if (spec.parentIndex >= 0) {
-        agentSpan =
-            TRACER.startSpan(
-                "test",
-                spec.operationName,
-                spans.get(spec.parentIndex).spanContext(),
-                spec.startMicros);
-      } else {
-        agentSpan = TRACER.startSpan("test", spec.operationName, spec.startMicros);
-      }
-
-      agentSpan.setResourceName(spec.resourceName);
-      agentSpan.setSpanType(spec.spanType);
-
-      if (spec.spanKind != null) {
-        agentSpan.setTag(SPAN_KIND, spec.spanKind);
-      }
-      if (spec.serviceName != null) {
-        agentSpan.setServiceName(spec.serviceName);
-      }
-      if (spec.samplingPriority != 0) {
-        agentSpan.setSamplingPriority(spec.samplingPriority, SamplingMechanism.DEFAULT);
-      }
-      if (spec.error) {
-        agentSpan.setError(true);
-        if (spec.errorMessage != null) {
-          agentSpan.setErrorMessage(spec.errorMessage);
-        }
-      }
-      if (spec.measured) {
-        agentSpan.setMeasured(true);
-      }
-      if (spec.httpStatusCode != 0) {
-        agentSpan.setHttpStatusCode(spec.httpStatusCode);
-      }
-
-      spec.extraTags.forEach(
-          (key, value) -> {
-            if (value instanceof String) agentSpan.setTag(key, (String) value);
-            else if (value instanceof Long) agentSpan.setTag(key, (long) (Long) value);
-            else if (value instanceof Boolean) agentSpan.setTag(key, (boolean) (Boolean) value);
-            else if (value instanceof Double) agentSpan.setTag(key, (double) (Double) value);
-          });
-
-      for (LinkSpec link : spec.links) {
-        agentSpan.addLink(
-            SpanLink.from(
-                spans.get(link.targetIndex).spanContext(),
-                link.traceFlags,
-                link.traceState,
-                link.attributes));
-      }
-
-      agentSpan.finish(spec.finishMicros);
-      spans.add((DDSpan) agentSpan);
+                PrioritySampling.SAMPLER_KEEP,
+                null,
+                propagationTags,
+                TracePropagationStyle.TRACECONTEXT);
+        AgentSpan span = TRACER.startSpan("test", "op.inherited", parent);
+        span.setResourceName("op.inherited");
+        return (DDSpan) span;
     }
-    return spans;
-  }
-
-  // ── verification helpers ──────────────────────────────────────────────────
-
-  /**
-   * Parses a {@code Resource} message body and asserts it contains a {@code service.name}
-   * attribute.
-   *
-   * <pre>
-   *   Resource { repeated KeyValue attributes = 1; }
-   * </pre>
-   */
-  private static void verifyResource(CodedInputStream resource) throws IOException {
-    boolean foundServiceName = false;
-    while (!resource.isAtEnd()) {
-      int tag = resource.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 1) {
-        String key = readKeyValueKey(resource.readBytes().newCodedInput());
-        if ("service.name".equals(key)) {
-          foundServiceName = true;
+
+    private static EncodedSamplingState exportSamplingState(DDSpan span) throws IOException {
+        if (span.getSamplingPriority() <= 0) {
+            span.setTag(SPAN_SAMPLING_MECHANISM_TAG, SamplingMechanism.SPAN_SAMPLING_RATE);
         }
-      } else {
-        resource.skipField(tag);
-      }
+        span.finish();
+        OtlpTraceProtoCollector collector = new OtlpTraceProtoCollector();
+        collector.addTrace(asList((CoreSpan<?>) span));
+        return parseOnlySpanSamplingState(collector.collectTraces());
     }
-    assertTrue(foundServiceName, "Resource must contain a 'service.name' attribute");
-  }
-
-  /**
-   * Parses an {@code InstrumentationScope} message body and asserts the scope name is the empty
-   * string used by the default trace scope.
-   *
-   * <pre>
-   *   InstrumentationScope { string name = 1; string version = 2; }
-   * </pre>
-   */
-  private static void verifyDefaultScope(CodedInputStream scope) throws IOException {
-    String parsedName = null;
-    while (!scope.isAtEnd()) {
-      int tag = scope.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 1) {
-        parsedName = scope.readString();
-      } else {
-        scope.skipField(tag);
-      }
-    }
-    assertEquals("", parsedName, "default trace scope must have an empty name");
-  }
-
-  /**
-   * Parses a {@code Span} message body and asserts all fields match the given DDSpan and SpanSpec.
-   *
-   * <pre>
-   *   Span { trace_id=1, span_id=2, trace_state=3, parent_span_id=4, name=5, kind=6,
-   *          start_time_unix_nano=7, end_time_unix_nano=8, attributes=9 (repeated),
-   *          links=13 (repeated), status=15, flags=16 }
-   * </pre>
-   */
-  private static void verifySpan(
-      CodedInputStream spanData, DDSpan originalSpan, SpanSpec spec, String caseName)
-      throws IOException {
-    byte[] parsedTraceId = null;
-    byte[] parsedSpanId = null;
-    byte[] parsedParentSpanId = null;
-    String parsedName = null;
-    int parsedKind = -1;
-    long parsedStartNano = -1;
-    long parsedEndNano = -1;
-    int parsedFlags = 0;
-    boolean statusFound = false;
-    boolean statusIsError = false;
-    String parsedStatusMessage = null;
-    Set<String> attrKeys = new HashSet<>();
-    int linkCount = 0;
-
-    while (!spanData.isAtEnd()) {
-      int tag = spanData.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 1:
-          parsedTraceId = spanData.readBytes().toByteArray();
-          break;
-        case 2:
-          parsedSpanId = spanData.readBytes().toByteArray();
-          break;
-        case 3:
-          spanData.skipField(
-              tag); // trace_state: absent for locally-started spans, present when propagated
-          break;
-        case 4:
-          parsedParentSpanId = spanData.readBytes().toByteArray();
-          break;
-        case 5:
-          parsedName = spanData.readString();
-          break;
-        case 6:
-          parsedKind = spanData.readEnum();
-          break;
-        case 7:
-          parsedStartNano = spanData.readFixed64();
-          break;
-        case 8:
-          parsedEndNano = spanData.readFixed64();
-          break;
-        case 9:
-          attrKeys.add(readKeyValueKey(spanData.readBytes().newCodedInput()));
-          break;
-        case 13:
-          verifyLink(spanData.readBytes().newCodedInput(), spec.links[linkCount], caseName);
-          linkCount++;
-          break;
-        case 15:
-          {
-            CodedInputStream status = spanData.readBytes().newCodedInput();
-            statusFound = true;
-            while (!status.isAtEnd()) {
-              int st = status.readTag();
-              switch (WireFormat.getTagFieldNumber(st)) {
-                case 2:
-                  parsedStatusMessage = status.readString();
-                  break;
+
+    private static EncodedSamplingState parseOnlySpanSamplingState(OtlpPayload payload) throws IOException {
+        CodedInputStream tracesData = CodedInputStream.newInstance(payload.getContent());
+        tracesData.readTag();
+        CodedInputStream resourceSpans = tracesData.readBytes().newCodedInput();
+        CodedInputStream scopeSpans = null;
+        while (!resourceSpans.isAtEnd()) {
+            int tag = resourceSpans.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 2) {
+                scopeSpans = resourceSpans.readBytes().newCodedInput();
+            } else {
+                resourceSpans.skipField(tag);
+            }
+        }
+        assertNotNull(scopeSpans);
+
+        CodedInputStream spanData = null;
+        while (!scopeSpans.isAtEnd()) {
+            int tag = scopeSpans.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 2) {
+                spanData = scopeSpans.readBytes().newCodedInput();
+                break;
+            }
+            scopeSpans.skipField(tag);
+        }
+        assertNotNull(spanData);
+
+        String traceState = null;
+        int flags = 0;
+        while (!spanData.isAtEnd()) {
+            int tag = spanData.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
                 case 3:
-                  statusIsError = status.readEnum() == 2; // STATUS_CODE_ERROR = 2
-                  break;
+                    traceState = spanData.readString();
+                    break;
+                case 16:
+                    flags = spanData.readFixed32();
+                    break;
                 default:
-                  status.skipField(st);
-              }
+                    spanData.skipField(tag);
             }
-            break;
-          }
-        case 16:
-          parsedFlags = spanData.readFixed32();
-          break;
-        default:
-          spanData.skipField(tag);
-      }
+        }
+        return new EncodedSamplingState(traceState, flags);
     }
 
-    // ── trace_id (field 1): 16 bytes ─────────────────────────────────────────
-    assertNotNull(parsedTraceId, "trace_id must be present [" + caseName + "]");
-    assertEquals(16, parsedTraceId.length, "trace_id must be 16 bytes [" + caseName + "]");
-    if (spec.use128BitTraceId) {
-      // high-order part of traceId occupies parsedTraceId[0..7] (big-endian)
-      long highOrderBytes = readBigEndianLong(parsedTraceId);
-      assertNotEquals(
-          0L,
-          highOrderBytes,
-          "128-bit trace_id high-order bytes must be non-zero [" + caseName + "]");
-    }
+    private static final class EncodedSamplingState {
+        private final String traceState;
+        private final int flags;
 
-    // ── span_id (field 2): 8 bytes, encodes span.getSpanId() ─────────────────
-    assertNotNull(parsedSpanId, "span_id must be present [" + caseName + "]");
-    assertEquals(8, parsedSpanId.length, "span_id must be 8 bytes [" + caseName + "]");
-    assertEquals(
-        originalSpan.getSpanId(),
-        readBigEndianLong(parsedSpanId),
-        "span_id mismatch [" + caseName + "]");
-
-    // ── parent_span_id (field 4) ──────────────────────────────────────────────
-    if (spec.parentIndex >= 0) {
-      assertNotNull(
-          parsedParentSpanId, "parent_span_id must be present for child span [" + caseName + "]");
-      assertEquals(
-          8, parsedParentSpanId.length, "parent_span_id must be 8 bytes [" + caseName + "]");
-      assertEquals(
-          originalSpan.getParentId(),
-          readBigEndianLong(parsedParentSpanId),
-          "parent_span_id mismatch [" + caseName + "]");
-    } else {
-      // root spans either omit the field or write zero bytes
-      if (parsedParentSpanId != null) {
-        assertEquals(
-            0L,
-            readBigEndianLong(parsedParentSpanId),
-            "root span parent_span_id must be zero [" + caseName + "]");
-      }
+        private EncodedSamplingState(String traceState, int flags) {
+            this.traceState = traceState;
+            this.flags = flags;
+        }
     }
 
-    // ── name (field 5): resource name ─────────────────────────────────────────
-    assertEquals(
-        spec.resourceName, parsedName, "Span.name (resource name) mismatch [" + caseName + "]");
-
-    // ── kind (field 6): SpanKind enum ─────────────────────────────────────────
-    assertEquals(expectedKind(spec.spanKind), parsedKind, "kind mismatch [" + caseName + "]");
-
-    // ── start_time_unix_nano (field 7) ────────────────────────────────────────
-    assertEquals(
-        spec.startMicros * 1000L,
-        parsedStartNano,
-        "start_time_unix_nano mismatch [" + caseName + "]");
-
-    // ── end_time_unix_nano (field 8) ──────────────────────────────────────────
-    assertEquals(
-        spec.finishMicros * 1000L, parsedEndNano, "end_time_unix_nano mismatch [" + caseName + "]");
-
-    // ── flags (field 16): SAMPLED flag reflects span.samplingPriority() > 0 ──
-    // The default tracer sampler keeps all spans (priority > 0), so the SAMPLED flag is set for
-    // every span. We verify it is set when we've explicitly requested it; we don't assert it is
-    // absent otherwise because the default sampler may still set a positive priority.
-    if (spec.samplingPriority > 0) {
-      assertTrue(
-          (parsedFlags & SAMPLED_TRACE_FLAG) != 0,
-          "SAMPLED flag must be set in flags [" + caseName + "]");
-    }
+    // ── span construction ─────────────────────────────────────────────────────
+
+    /** Builds {@link DDSpan} instances from the given specs, collecting them in order. */
+    private static List<DDSpan> buildSpans(List<SpanSpec> specs) {
+        List<DDSpan> spans = new ArrayList<>(specs.size());
+        for (SpanSpec spec : specs) {
+            AgentSpan agentSpan;
+            if (spec.use128BitTraceId) {
+                ExtractedContext parent128 = new ExtractedContext(
+                        TRACE_ID_128BIT,
+                        0L,
+                        PrioritySampling.UNSET,
+                        null,
+                        PropagationTags.factory().empty(),
+                        TracePropagationStyle.DATADOG);
+                agentSpan = TRACER.startSpan("test", spec.operationName, parent128, spec.startMicros);
+            } else if (spec.origin != null) {
+                ExtractedContext parentWithOrigin = new ExtractedContext(
+                        DDTraceId.ONE,
+                        0L,
+                        PrioritySampling.UNSET,
+                        spec.origin,
+                        PropagationTags.factory().empty(),
+                        TracePropagationStyle.DATADOG);
+                agentSpan = TRACER.startSpan("test", spec.operationName, parentWithOrigin, spec.startMicros);
+            } else if (spec.parentIndex >= 0) {
+                agentSpan = TRACER.startSpan(
+                        "test", spec.operationName, spans.get(spec.parentIndex).spanContext(), spec.startMicros);
+            } else {
+                agentSpan = TRACER.startSpan("test", spec.operationName, spec.startMicros);
+            }
 
-    // ── attributes (field 9): mandatory Datadog attributes ───────────────────
-    assertTrue(
-        attrKeys.contains("resource.name"),
-        "attributes must include 'resource.name' [" + caseName + "]");
-    assertTrue(
-        attrKeys.contains("operation.name"),
-        "attributes must include 'operation.name' [" + caseName + "]");
-    if (spec.spanType != null) {
-      assertTrue(
-          attrKeys.contains("span.type"), "attributes must include 'span.type' [" + caseName + "]");
-    } else {
-      assertFalse(
-          attrKeys.contains("span.type"),
-          "attributes must omit 'span.type' when null [" + caseName + "]");
-    }
+            agentSpan.setResourceName(spec.resourceName);
+            agentSpan.setSpanType(spec.spanType);
 
-    // service.name attribute is written only when the span's service differs from the default
-    if (spec.serviceName != null) {
-      assertTrue(
-          attrKeys.contains("service.name"),
-          "attributes must include 'service.name' when service is overridden [" + caseName + "]");
-    }
+            if (spec.spanKind != null) {
+                agentSpan.setTag(SPAN_KIND, spec.spanKind);
+            }
+            if (spec.serviceName != null) {
+                agentSpan.setServiceName(spec.serviceName);
+            }
+            if (spec.samplingPriority != 0) {
+                agentSpan.setSamplingPriority(spec.samplingPriority, SamplingMechanism.DEFAULT);
+            }
+            if (spec.error) {
+                agentSpan.setError(true);
+                if (spec.errorMessage != null) {
+                    agentSpan.setErrorMessage(spec.errorMessage);
+                }
+            }
+            if (spec.measured) {
+                agentSpan.setMeasured(true);
+            }
+            if (spec.httpStatusCode != 0) {
+                agentSpan.setHttpStatusCode(spec.httpStatusCode);
+            }
 
-    // extra user tags must appear as attributes
-    for (String key : spec.extraTags.keySet()) {
-      assertTrue(
-          attrKeys.contains(key),
-          "attributes must include extra tag '" + key + "' [" + caseName + "]");
-    }
+            spec.extraTags.forEach((key, value) -> {
+                if (value instanceof String) agentSpan.setTag(key, (String) value);
+                else if (value instanceof Long) agentSpan.setTag(key, (long) (Long) value);
+                else if (value instanceof Boolean) agentSpan.setTag(key, (boolean) (Boolean) value);
+                else if (value instanceof Double) agentSpan.setTag(key, (double) (Double) value);
+            });
 
-    if (spec.measured) {
-      assertTrue(
-          attrKeys.contains("_dd.measured"),
-          "attributes must include '_dd.measured' for measured spans [" + caseName + "]");
-    }
-    if (spec.httpStatusCode != 0) {
-      assertTrue(
-          attrKeys.contains("http.status_code"),
-          "attributes must include 'http.status_code' when set via setHttpStatusCode ["
-              + caseName
-              + "]");
+            for (LinkSpec link : spec.links) {
+                agentSpan.addLink(SpanLink.from(
+                        spans.get(link.targetIndex).spanContext(), link.traceFlags, link.traceState, link.attributes));
+            }
+
+            agentSpan.finish(spec.finishMicros);
+            spans.add((DDSpan) agentSpan);
+        }
+        return spans;
     }
-    if (spec.origin != null) {
-      assertTrue(
-          attrKeys.contains("_dd.origin"),
-          "attributes must include '_dd.origin' when origin is set [" + caseName + "]");
+
+    // ── verification helpers ──────────────────────────────────────────────────
+
+    /**
+     * Parses a {@code Resource} message body and asserts it contains a {@code service.name}
+     * attribute.
+     *
+     * <pre>
+     *   Resource { repeated KeyValue attributes = 1; }
+     * </pre>
+     */
+    private static void verifyResource(CodedInputStream resource) throws IOException {
+        boolean foundServiceName = false;
+        while (!resource.isAtEnd()) {
+            int tag = resource.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 1) {
+                String key = readKeyValueKey(resource.readBytes().newCodedInput());
+                if ("service.name".equals(key)) {
+                    foundServiceName = true;
+                }
+            } else {
+                resource.skipField(tag);
+            }
+        }
+        assertTrue(foundServiceName, "Resource must contain a 'service.name' attribute");
     }
 
-    // ── status (field 15) ─────────────────────────────────────────────────────
-    if (spec.error) {
-      assertTrue(statusFound, "status must be present for error span [" + caseName + "]");
-      assertTrue(statusIsError, "status.code must be ERROR(2) [" + caseName + "]");
-      if (spec.errorMessage != null) {
-        assertEquals(
-            spec.errorMessage, parsedStatusMessage, "status.message mismatch [" + caseName + "]");
-      } else {
-        assertNull(
-            parsedStatusMessage, "status.message must be absent when not set [" + caseName + "]");
-      }
-    } else {
-      assertFalse(statusFound, "status must be absent for non-error span [" + caseName + "]");
+    /**
+     * Parses an {@code InstrumentationScope} message body and asserts the scope name is the empty
+     * string used by the default trace scope.
+     *
+     * <pre>
+     *   InstrumentationScope { string name = 1; string version = 2; }
+     * </pre>
+     */
+    private static void verifyDefaultScope(CodedInputStream scope) throws IOException {
+        String parsedName = null;
+        while (!scope.isAtEnd()) {
+            int tag = scope.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 1) {
+                parsedName = scope.readString();
+            } else {
+                scope.skipField(tag);
+            }
+        }
+        assertEquals("", parsedName, "default trace scope must have an empty name");
     }
 
-    // ── links (field 13) ──────────────────────────────────────────────────────
-    assertEquals(spec.links.length, linkCount, "link count mismatch [" + caseName + "]");
-  }
-
-  /**
-   * Parses a {@code Span.Link} message body and verifies trace_id, span_id, and (if expected) link
-   * attributes are present.
-   *
-   * <pre>
-   *   Link { bytes trace_id = 1; bytes span_id = 2; string trace_state = 3;
-   *          KeyValue attributes = 4; fixed32 flags = 6; }
-   * </pre>
-   */
-  private static void verifyLink(CodedInputStream link, LinkSpec linkSpec, String caseName)
-      throws IOException {
-    byte[] traceId = null;
-    byte[] spanId = null;
-    String parsedTraceState = null;
-    Set<String> linkAttrKeys = new HashSet<>();
-    int parsedFlags = 0;
-    while (!link.isAtEnd()) {
-      int tag = link.readTag();
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case 1:
-          traceId = link.readBytes().toByteArray();
-          break;
-        case 2:
-          spanId = link.readBytes().toByteArray();
-          break;
-        case 3:
-          parsedTraceState = link.readString();
-          break;
-        case 4:
-          linkAttrKeys.add(readKeyValueKey(link.readBytes().newCodedInput()));
-          break;
-        case 6:
-          parsedFlags = link.readFixed32();
-          break;
-        default:
-          link.skipField(tag);
-      }
+    /**
+     * Parses a {@code Span} message body and asserts all fields match the given DDSpan and SpanSpec.
+     *
+     * <pre>
+     *   Span { trace_id=1, span_id=2, trace_state=3, parent_span_id=4, name=5, kind=6,
+     *          start_time_unix_nano=7, end_time_unix_nano=8, attributes=9 (repeated),
+     *          links=13 (repeated), status=15, flags=16 }
+     * </pre>
+     */
+    private static void verifySpan(CodedInputStream spanData, DDSpan originalSpan, SpanSpec spec, String caseName)
+            throws IOException {
+        byte[] parsedTraceId = null;
+        byte[] parsedSpanId = null;
+        byte[] parsedParentSpanId = null;
+        String parsedName = null;
+        int parsedKind = -1;
+        long parsedStartNano = -1;
+        long parsedEndNano = -1;
+        int parsedFlags = 0;
+        boolean statusFound = false;
+        boolean statusIsError = false;
+        String parsedStatusMessage = null;
+        Set<String> attrKeys = new HashSet<>();
+        int linkCount = 0;
+
+        while (!spanData.isAtEnd()) {
+            int tag = spanData.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 1:
+                    parsedTraceId = spanData.readBytes().toByteArray();
+                    break;
+                case 2:
+                    parsedSpanId = spanData.readBytes().toByteArray();
+                    break;
+                case 3:
+                    spanData.skipField(tag); // trace_state: absent for locally-started spans, present when propagated
+                    break;
+                case 4:
+                    parsedParentSpanId = spanData.readBytes().toByteArray();
+                    break;
+                case 5:
+                    parsedName = spanData.readString();
+                    break;
+                case 6:
+                    parsedKind = spanData.readEnum();
+                    break;
+                case 7:
+                    parsedStartNano = spanData.readFixed64();
+                    break;
+                case 8:
+                    parsedEndNano = spanData.readFixed64();
+                    break;
+                case 9:
+                    attrKeys.add(readKeyValueKey(spanData.readBytes().newCodedInput()));
+                    break;
+                case 13:
+                    verifyLink(spanData.readBytes().newCodedInput(), spec.links[linkCount], caseName);
+                    linkCount++;
+                    break;
+                case 15: {
+                    CodedInputStream status = spanData.readBytes().newCodedInput();
+                    statusFound = true;
+                    while (!status.isAtEnd()) {
+                        int st = status.readTag();
+                        switch (WireFormat.getTagFieldNumber(st)) {
+                            case 2:
+                                parsedStatusMessage = status.readString();
+                                break;
+                            case 3:
+                                statusIsError = status.readEnum() == 2; // STATUS_CODE_ERROR = 2
+                                break;
+                            default:
+                                status.skipField(st);
+                        }
+                    }
+                    break;
+                }
+                case 16:
+                    parsedFlags = spanData.readFixed32();
+                    break;
+                default:
+                    spanData.skipField(tag);
+            }
+        }
+
+        // ── trace_id (field 1): 16 bytes ─────────────────────────────────────────
+        assertNotNull(parsedTraceId, "trace_id must be present [" + caseName + "]");
+        assertEquals(16, parsedTraceId.length, "trace_id must be 16 bytes [" + caseName + "]");
+        if (spec.use128BitTraceId) {
+            // high-order part of traceId occupies parsedTraceId[0..7] (big-endian)
+            long highOrderBytes = readBigEndianLong(parsedTraceId);
+            assertNotEquals(
+                    0L, highOrderBytes, "128-bit trace_id high-order bytes must be non-zero [" + caseName + "]");
+        }
+
+        // ── span_id (field 2): 8 bytes, encodes span.getSpanId() ─────────────────
+        assertNotNull(parsedSpanId, "span_id must be present [" + caseName + "]");
+        assertEquals(8, parsedSpanId.length, "span_id must be 8 bytes [" + caseName + "]");
+        assertEquals(originalSpan.getSpanId(), readBigEndianLong(parsedSpanId), "span_id mismatch [" + caseName + "]");
+
+        // ── parent_span_id (field 4) ──────────────────────────────────────────────
+        if (spec.parentIndex >= 0) {
+            assertNotNull(parsedParentSpanId, "parent_span_id must be present for child span [" + caseName + "]");
+            assertEquals(8, parsedParentSpanId.length, "parent_span_id must be 8 bytes [" + caseName + "]");
+            assertEquals(
+                    originalSpan.getParentId(),
+                    readBigEndianLong(parsedParentSpanId),
+                    "parent_span_id mismatch [" + caseName + "]");
+        } else {
+            // root spans either omit the field or write zero bytes
+            if (parsedParentSpanId != null) {
+                assertEquals(
+                        0L,
+                        readBigEndianLong(parsedParentSpanId),
+                        "root span parent_span_id must be zero [" + caseName + "]");
+            }
+        }
+
+        // ── name (field 5): resource name ─────────────────────────────────────────
+        assertEquals(spec.resourceName, parsedName, "Span.name (resource name) mismatch [" + caseName + "]");
+
+        // ── kind (field 6): SpanKind enum ─────────────────────────────────────────
+        assertEquals(expectedKind(spec.spanKind), parsedKind, "kind mismatch [" + caseName + "]");
+
+        // ── start_time_unix_nano (field 7) ────────────────────────────────────────
+        assertEquals(spec.startMicros * 1000L, parsedStartNano, "start_time_unix_nano mismatch [" + caseName + "]");
+
+        // ── end_time_unix_nano (field 8) ──────────────────────────────────────────
+        assertEquals(spec.finishMicros * 1000L, parsedEndNano, "end_time_unix_nano mismatch [" + caseName + "]");
+
+        // ── flags (field 16): SAMPLED flag reflects span.samplingPriority() > 0 ──
+        // The default tracer sampler keeps all spans (priority > 0), so the SAMPLED flag is set for
+        // every span. We verify it is set when we've explicitly requested it; we don't assert it is
+        // absent otherwise because the default sampler may still set a positive priority.
+        if (spec.samplingPriority > 0) {
+            assertTrue((parsedFlags & SAMPLED_TRACE_FLAG) != 0, "SAMPLED flag must be set in flags [" + caseName + "]");
+        }
+
+        // ── attributes (field 9): mandatory Datadog attributes ───────────────────
+        assertTrue(attrKeys.contains("resource.name"), "attributes must include 'resource.name' [" + caseName + "]");
+        assertTrue(attrKeys.contains("operation.name"), "attributes must include 'operation.name' [" + caseName + "]");
+        if (spec.spanType != null) {
+            assertTrue(attrKeys.contains("span.type"), "attributes must include 'span.type' [" + caseName + "]");
+        } else {
+            assertFalse(
+                    attrKeys.contains("span.type"), "attributes must omit 'span.type' when null [" + caseName + "]");
+        }
+
+        // service.name attribute is written only when the span's service differs from the default
+        if (spec.serviceName != null) {
+            assertTrue(
+                    attrKeys.contains("service.name"),
+                    "attributes must include 'service.name' when service is overridden [" + caseName + "]");
+        }
+
+        // extra user tags must appear as attributes
+        for (String key : spec.extraTags.keySet()) {
+            assertTrue(attrKeys.contains(key), "attributes must include extra tag '" + key + "' [" + caseName + "]");
+        }
+
+        if (spec.measured) {
+            assertTrue(
+                    attrKeys.contains("_dd.measured"),
+                    "attributes must include '_dd.measured' for measured spans [" + caseName + "]");
+        }
+        if (spec.httpStatusCode != 0) {
+            assertTrue(
+                    attrKeys.contains("http.status_code"),
+                    "attributes must include 'http.status_code' when set via setHttpStatusCode [" + caseName + "]");
+        }
+        if (spec.origin != null) {
+            assertTrue(
+                    attrKeys.contains("_dd.origin"),
+                    "attributes must include '_dd.origin' when origin is set [" + caseName + "]");
+        }
+
+        // ── status (field 15) ─────────────────────────────────────────────────────
+        if (spec.error) {
+            assertTrue(statusFound, "status must be present for error span [" + caseName + "]");
+            assertTrue(statusIsError, "status.code must be ERROR(2) [" + caseName + "]");
+            if (spec.errorMessage != null) {
+                assertEquals(spec.errorMessage, parsedStatusMessage, "status.message mismatch [" + caseName + "]");
+            } else {
+                assertNull(parsedStatusMessage, "status.message must be absent when not set [" + caseName + "]");
+            }
+        } else {
+            assertFalse(statusFound, "status must be absent for non-error span [" + caseName + "]");
+        }
+
+        // ── links (field 13) ──────────────────────────────────────────────────────
+        assertEquals(spec.links.length, linkCount, "link count mismatch [" + caseName + "]");
     }
-    assertNotNull(traceId, "Link.trace_id must be present [" + caseName + "]");
-    assertEquals(16, traceId.length, "Link.trace_id must be 16 bytes [" + caseName + "]");
-    assertNotNull(spanId, "Link.span_id must be present [" + caseName + "]");
-    assertEquals(8, spanId.length, "Link.span_id must be 8 bytes [" + caseName + "]");
-    if (!linkSpec.traceState.isEmpty()) {
-      assertEquals(
-          linkSpec.traceState, parsedTraceState, "Link.trace_state mismatch [" + caseName + "]");
-    } else {
-      assertNull(parsedTraceState, "empty Link.trace_state should be omitted [" + caseName + "]");
+
+    /**
+     * Parses a {@code Span.Link} message body and verifies trace_id, span_id, and (if expected) link
+     * attributes are present.
+     *
+     * <pre>
+     *   Link { bytes trace_id = 1; bytes span_id = 2; string trace_state = 3;
+     *          KeyValue attributes = 4; fixed32 flags = 6; }
+     * </pre>
+     */
+    private static void verifyLink(CodedInputStream link, LinkSpec linkSpec, String caseName) throws IOException {
+        byte[] traceId = null;
+        byte[] spanId = null;
+        String parsedTraceState = null;
+        Set<String> linkAttrKeys = new HashSet<>();
+        int parsedFlags = 0;
+        while (!link.isAtEnd()) {
+            int tag = link.readTag();
+            switch (WireFormat.getTagFieldNumber(tag)) {
+                case 1:
+                    traceId = link.readBytes().toByteArray();
+                    break;
+                case 2:
+                    spanId = link.readBytes().toByteArray();
+                    break;
+                case 3:
+                    parsedTraceState = link.readString();
+                    break;
+                case 4:
+                    linkAttrKeys.add(readKeyValueKey(link.readBytes().newCodedInput()));
+                    break;
+                case 6:
+                    parsedFlags = link.readFixed32();
+                    break;
+                default:
+                    link.skipField(tag);
+            }
+        }
+        assertNotNull(traceId, "Link.trace_id must be present [" + caseName + "]");
+        assertEquals(16, traceId.length, "Link.trace_id must be 16 bytes [" + caseName + "]");
+        assertNotNull(spanId, "Link.span_id must be present [" + caseName + "]");
+        assertEquals(8, spanId.length, "Link.span_id must be 8 bytes [" + caseName + "]");
+        if (!linkSpec.traceState.isEmpty()) {
+            assertEquals(linkSpec.traceState, parsedTraceState, "Link.trace_state mismatch [" + caseName + "]");
+        } else {
+            assertNull(parsedTraceState, "empty Link.trace_state should be omitted [" + caseName + "]");
+        }
+        // SpanLink.from() ORs in the SAMPLED_FLAG (0x01) when the target context has positive
+        // sampling priority, which all test anchor spans have via the default tracer sampler.
+        int expectedFlags = Byte.toUnsignedInt((byte) (linkSpec.traceFlags | 0x01));
+        assertEquals(expectedFlags, parsedFlags, "Link.flags mismatch [" + caseName + "]");
+        for (String expectedKey : linkSpec.attributes.asMap().keySet()) {
+            assertTrue(
+                    linkAttrKeys.contains(expectedKey),
+                    "Link attributes must include '" + expectedKey + "' [" + caseName + "]");
+        }
     }
-    // SpanLink.from() ORs in the SAMPLED_FLAG (0x01) when the target context has positive
-    // sampling priority, which all test anchor spans have via the default tracer sampler.
-    int expectedFlags = Byte.toUnsignedInt((byte) (linkSpec.traceFlags | 0x01));
-    assertEquals(expectedFlags, parsedFlags, "Link.flags mismatch [" + caseName + "]");
-    for (String expectedKey : linkSpec.attributes.asMap().keySet()) {
-      assertTrue(
-          linkAttrKeys.contains(expectedKey),
-          "Link attributes must include '" + expectedKey + "' [" + caseName + "]");
+
+    // ── proto parsing helpers ─────────────────────────────────────────────────
+
+    /**
+     * Returns the expected SpanKind enum value for the given Datadog span kind tag value.
+     *
+     * <pre>
+     *   SPAN_KIND_UNSPECIFIED = 0  (default)
+     *   SPAN_KIND_INTERNAL    = 1
+     *   SPAN_KIND_SERVER      = 2
+     *   SPAN_KIND_CLIENT      = 3
+     *   SPAN_KIND_PRODUCER    = 4
+     *   SPAN_KIND_CONSUMER    = 5
+     * </pre>
+     */
+    private static int expectedKind(String spanKind) {
+        if (SPAN_KIND_INTERNAL.equals(spanKind)) return 1;
+        if (SPAN_KIND_SERVER.equals(spanKind)) return 2;
+        if (SPAN_KIND_CLIENT.equals(spanKind)) return 3;
+        if (SPAN_KIND_PRODUCER.equals(spanKind)) return 4;
+        if (SPAN_KIND_CONSUMER.equals(spanKind)) return 5;
+        return 0; // UNSPECIFIED
     }
-  }
-
-  // ── proto parsing helpers ─────────────────────────────────────────────────
-
-  /**
-   * Returns the expected SpanKind enum value for the given Datadog span kind tag value.
-   *
-   * <pre>
-   *   SPAN_KIND_UNSPECIFIED = 0  (default)
-   *   SPAN_KIND_INTERNAL    = 1
-   *   SPAN_KIND_SERVER      = 2
-   *   SPAN_KIND_CLIENT      = 3
-   *   SPAN_KIND_PRODUCER    = 4
-   *   SPAN_KIND_CONSUMER    = 5
-   * </pre>
-   */
-  private static int expectedKind(String spanKind) {
-    if (SPAN_KIND_INTERNAL.equals(spanKind)) return 1;
-    if (SPAN_KIND_SERVER.equals(spanKind)) return 2;
-    if (SPAN_KIND_CLIENT.equals(spanKind)) return 3;
-    if (SPAN_KIND_PRODUCER.equals(spanKind)) return 4;
-    if (SPAN_KIND_CONSUMER.equals(spanKind)) return 5;
-    return 0; // UNSPECIFIED
-  }
-
-  /**
-   * Reads a {@code KeyValue} body and returns the key (field 1). The value is skipped; its encoding
-   * is covered by {@code OtlpCommonProtoTest}.
-   */
-  private static String readKeyValueKey(CodedInputStream keyValue) throws IOException {
-    while (!keyValue.isAtEnd()) {
-      int tag = keyValue.readTag();
-      if (WireFormat.getTagFieldNumber(tag) == 1) {
-        return keyValue.readString();
-      }
-      keyValue.skipField(tag);
+
+    /**
+     * Reads a {@code KeyValue} body and returns the key (field 1). The value is skipped; its encoding
+     * is covered by {@code OtlpCommonProtoTest}.
+     */
+    private static String readKeyValueKey(CodedInputStream keyValue) throws IOException {
+        while (!keyValue.isAtEnd()) {
+            int tag = keyValue.readTag();
+            if (WireFormat.getTagFieldNumber(tag) == 1) {
+                return keyValue.readString();
+            }
+            keyValue.skipField(tag);
+        }
+        return null;
     }
-    return null;
-  }
-
-  /** Reads a big-endian 64-bit value from the first 8 bytes of the given array. */
-  private static long readBigEndianLong(byte[] bytes) {
-    long value = 0;
-    for (int i = 0; i < 8; i++) {
-      value = (value << 8) | (bytes[i] & 0xFF);
+
+    /** Reads a big-endian 64-bit value from the first 8 bytes of the given array. */
+    private static long readBigEndianLong(byte[] bytes) {
+        long value = 0;
+        for (int i = 0; i < 8; i++) {
+            value = (value << 8) | (bytes[i] & 0xFF);
+        }
+        return value;
     }
-    return value;
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractHttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractHttpExtractorTest.java
index 081d9bb77a7..3eefef649da 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractHttpExtractorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractHttpExtractorTest.java
@@ -18,43 +18,40 @@
 /** This class is a base test class for the {@link HttpCodec.Extractor} tests. */
 @WithConfig(key = PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED, value = "true")
 abstract class AbstractHttpExtractorTest extends DDJavaSpecification {
-  protected static final String SOME_HEADER = "SOME_HEADER";
-  protected static final String SOME_TAG = "some-tag";
-  protected static final String SOME_CUSTOM_BAGGAGE_HEADER = "SOME_CUSTOM_BAGGAGE_HEADER";
-  protected static final String SOME_CUSTOM_BAGGAGE_HEADER_2 = "SOME_CUSTOM_BAGGAGE_HEADER_2";
-  protected static final String SOME_BAGGAGE = "some-baggage";
-  protected static final String SOME_CASE_SENSITIVE_BAGGAGE = "some-CaseSensitive-baggage";
-  protected static final String SOME_ARBITRARY_HEADER = "SOME_ARBITRARY_HEADER";
-
-  protected HttpCodec.Extractor extractor;
-
-  /** Creates the extractor for the propagation style under test. */
-  protected abstract HttpCodec.Extractor newExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier);
-
-  @BeforeEach
-  void setupExtractor() {
-    this.extractor = buildExtractor(this::newExtractor);
-  }
-
-  @AfterEach
-  void cleanupExtractor() {
-    if (this.extractor != null) {
-      this.extractor.cleanup();
+    protected static final String SOME_HEADER = "SOME_HEADER";
+    protected static final String SOME_TAG = "some-tag";
+    protected static final String SOME_CUSTOM_BAGGAGE_HEADER = "SOME_CUSTOM_BAGGAGE_HEADER";
+    protected static final String SOME_CUSTOM_BAGGAGE_HEADER_2 = "SOME_CUSTOM_BAGGAGE_HEADER_2";
+    protected static final String SOME_BAGGAGE = "some-baggage";
+    protected static final String SOME_CASE_SENSITIVE_BAGGAGE = "some-CaseSensitive-baggage";
+    protected static final String SOME_ARBITRARY_HEADER = "SOME_ARBITRARY_HEADER";
+
+    protected HttpCodec.Extractor extractor;
+
+    /** Creates the extractor for the propagation style under test. */
+    protected abstract HttpCodec.Extractor newExtractor(Config config, Supplier<TraceConfig> traceConfigSupplier);
+
+    @BeforeEach
+    void setupExtractor() {
+        this.extractor = buildExtractor(this::newExtractor);
+    }
+
+    @AfterEach
+    void cleanupExtractor() {
+        if (this.extractor != null) {
+            this.extractor.cleanup();
+        }
+    }
+
+    /** Builds an extractor with a test trace config (a basic baggage mapping and header tags). */
+    static HttpCodec.Extractor buildExtractor(BiFunction<Config, Supplier<TraceConfig>, HttpCodec.Extractor> factory) {
+        Map<String, String> baggageMapping = new HashMap<>();
+        baggageMapping.put(SOME_CUSTOM_BAGGAGE_HEADER, SOME_BAGGAGE);
+        baggageMapping.put(SOME_CUSTOM_BAGGAGE_HEADER_2, SOME_CASE_SENSITIVE_BAGGAGE);
+        DynamicConfig<DynamicConfig.Snapshot> dynamicConfig = DynamicConfig.create()
+                .setHeaderTags(singletonMap(SOME_HEADER, SOME_TAG))
+                .setBaggageMapping(baggageMapping)
+                .apply();
+        return factory.apply(Config.get(), dynamicConfig::captureTraceConfig);
     }
-  }
-
-  /** Builds an extractor with a test trace config (a basic baggage mapping and header tags). */
-  static HttpCodec.Extractor buildExtractor(
-      BiFunction<Config, Supplier<TraceConfig>, HttpCodec.Extractor> factory) {
-    Map<String, String> baggageMapping = new HashMap<>();
-    baggageMapping.put(SOME_CUSTOM_BAGGAGE_HEADER, SOME_BAGGAGE);
-    baggageMapping.put(SOME_CUSTOM_BAGGAGE_HEADER_2, SOME_CASE_SENSITIVE_BAGGAGE);
-    DynamicConfig<DynamicConfig.Snapshot> dynamicConfig =
-        DynamicConfig.create()
-            .setHeaderTags(singletonMap(SOME_HEADER, SOME_TAG))
-            .setBaggageMapping(baggageMapping)
-            .apply();
-    return factory.apply(Config.get(), dynamicConfig::captureTraceConfig);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractHttpInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractHttpInjectorTest.java
index 3098ab217ec..749d11186b8 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractHttpInjectorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractHttpInjectorTest.java
@@ -12,51 +12,51 @@
 
 /** This class is a base test class for the {@link HttpCodec.Injector} tests. */
 abstract class AbstractHttpInjectorTest extends DDCoreJavaSpecification {
-  protected CoreTracer tracer;
-  protected HttpCodec.Injector injector;
+    protected CoreTracer tracer;
+    protected HttpCodec.Injector injector;
 
-  /**
-   * Creates the injector under test.
-   *
-   * @return {@code null} by default for tests that build injectors per test case.
-   */
-  protected HttpCodec.Injector newInjector() {
-    return null;
-  }
+    /**
+     * Creates the injector under test.
+     *
+     * @return {@code null} by default for tests that build injectors per test case.
+     */
+    protected HttpCodec.Injector newInjector() {
+        return null;
+    }
 
-  @BeforeEach
-  void setupInjectorTest() {
-    this.tracer = tracerBuilder().writer(new ListWriter()).build();
-    this.injector = newInjector();
-  }
+    @BeforeEach
+    void setupInjectorTest() {
+        this.tracer = tracerBuilder().writer(new ListWriter()).build();
+        this.injector = newInjector();
+    }
 
-  /** Builds a span context with the standard fake service/operation/resource values. */
-  protected DDSpanContext mockSpanContext(
-      DDTraceId traceId,
-      long spanId,
-      int samplingPriority,
-      CharSequence origin,
-      Map<String, String> baggage,
-      PropagationTags propagationTags) {
-    return new DDSpanContext(
-        traceId,
-        spanId,
-        DDSpanId.ZERO,
-        null,
-        "fakeService",
-        "fakeOperation",
-        "fakeResource",
-        samplingPriority,
-        origin,
-        baggage,
-        false,
-        "fakeType",
-        0,
-        this.tracer.createTraceCollector(DDTraceId.ONE),
-        null,
-        null,
-        NoopPathwayContext.INSTANCE,
-        false,
-        propagationTags);
-  }
+    /** Builds a span context with the standard fake service/operation/resource values. */
+    protected DDSpanContext mockSpanContext(
+            DDTraceId traceId,
+            long spanId,
+            int samplingPriority,
+            CharSequence origin,
+            Map<String, String> baggage,
+            PropagationTags propagationTags) {
+        return new DDSpanContext(
+                traceId,
+                spanId,
+                DDSpanId.ZERO,
+                null,
+                "fakeService",
+                "fakeOperation",
+                "fakeResource",
+                samplingPriority,
+                origin,
+                baggage,
+                false,
+                "fakeType",
+                0,
+                this.tracer.createTraceCollector(DDTraceId.ONE),
+                null,
+                null,
+                NoopPathwayContext.INSTANCE,
+                false,
+                propagationTags);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractOTBaggageTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractOTBaggageTest.java
index 8eed302039d..782800e5419 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractOTBaggageTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractOTBaggageTest.java
@@ -26,86 +26,84 @@
  */
 abstract class AbstractOTBaggageTest {
 
-  /** Returns the extractor under test, built by the enclosing extractor test. */
-  protected abstract HttpCodec.Extractor extractor();
-
-  /**
-   * Returns the given baggage items, in order, in this style's wire format. A repeated key must be
-   * spelled so that the style reads it back as the same baggage key.
-   */
-  protected abstract Map<String, String> baggageHeaders(List<Entry<String, String>> items);
-
-  /** Returns the headers carrying {@code itemCount} generated baggage items. */
-  protected final Map<String, String> generateBaggageHeaders(int itemCount) {
-    return baggageHeaders(generateBaggageItems(itemCount));
-  }
-
-  /**
-   * Extracts the given headers and returns the baggage of the resulting context. Headers carrying
-   * nothing but baggage create no context at all once every item is dropped, which is reported as
-   * empty baggage rather than as a missing context.
-   */
-  protected final Map<String, String> extractBaggage(Map<String, String> headers) {
-    TagContext context = this.extractor().extract(headers, stringValuesMap());
-    return context == null ? emptyMap() : context.getBaggage();
-  }
-
-  @Test
-  @WithConfig(key = TRACE_BAGGAGE_MAX_ITEMS, value = "3")
-  void stopsAtItemLimit() {
-    assertEquals(3, extractBaggage(generateBaggageHeaders(50)).size());
-  }
-
-  @Test
-  @WithConfig(key = TRACE_BAGGAGE_MAX_BYTES, value = "24")
-  void stopsAtByteLimit() {
-    // with single digit indices each stored item is "keyN" + "valueN" = 10 bytes, so 2 fit in 24
-    // bytes and a third would take the total to 30
-    assertEquals(2, extractBaggage(generateBaggageHeaders(10)).size());
-  }
-
-  @Test
-  @WithConfig(key = TRACE_BAGGAGE_MAX_BYTES, value = "24")
-  @WithConfig(key = TRACE_BAGGAGE_MAX_ITEMS, value = "2")
-  void chargesRepeatedKeyOnce() {
-    Map<String, String> baggage =
-        extractBaggage(
-            baggageHeaders(baggageItems("key0", "val0", "a", "0123456789", "key0", "val1")));
-
-    Map<String, String> expected = new HashMap<>();
-    expected.put("key0", "val1");
-    expected.put("a", "0123456789");
-    assertEquals(expected, baggage);
-  }
-
-  @Test
-  @WithConfig(key = TRACE_BAGGAGE_MAX_BYTES, value = "8")
-  void chargesEncodedValueSize() {
-    // the budget is charged before decoding, so the 9 character raw value does not fit
-    Map<String, String> baggage =
-        extractBaggage(baggageHeaders(baggageItems("a", "b", "c", "%E2%99%A5")));
-
-    assertEquals(singletonMap("a", "b"), baggage);
-  }
-
-  @Test
-  @WithConfig(key = TRACE_BAGGAGE_MAX_BYTES, value = "3")
-  void chargesLiteralUtf8ByCharacterCount() {
-    // "a" + "♥" is 2 characters, so the 2 characters of "b" + "c" no longer fit
-    Map<String, String> baggage = extractBaggage(baggageHeaders(baggageItems("a", "♥", "b", "c")));
-
-    assertEquals(singletonMap("a", "♥"), baggage);
-  }
-
-  @Test
-  @WithConfig(key = TRACE_BAGGAGE_MAX_ITEMS, value = "0")
-  void dropsAllBaggageWhenItemLimitIsZero() {
-    assertTrue(extractBaggage(generateBaggageHeaders(10)).isEmpty());
-  }
-
-  @Test
-  @WithConfig(key = TRACE_BAGGAGE_MAX_BYTES, value = "0")
-  void dropsAllBaggageWhenByteLimitIsZero() {
-    assertTrue(extractBaggage(generateBaggageHeaders(10)).isEmpty());
-  }
+    /** Returns the extractor under test, built by the enclosing extractor test. */
+    protected abstract HttpCodec.Extractor extractor();
+
+    /**
+     * Returns the given baggage items, in order, in this style's wire format. A repeated key must be
+     * spelled so that the style reads it back as the same baggage key.
+     */
+    protected abstract Map<String, String> baggageHeaders(List<Entry<String, String>> items);
+
+    /** Returns the headers carrying {@code itemCount} generated baggage items. */
+    protected final Map<String, String> generateBaggageHeaders(int itemCount) {
+        return baggageHeaders(generateBaggageItems(itemCount));
+    }
+
+    /**
+     * Extracts the given headers and returns the baggage of the resulting context. Headers carrying
+     * nothing but baggage create no context at all once every item is dropped, which is reported as
+     * empty baggage rather than as a missing context.
+     */
+    protected final Map<String, String> extractBaggage(Map<String, String> headers) {
+        TagContext context = this.extractor().extract(headers, stringValuesMap());
+        return context == null ? emptyMap() : context.getBaggage();
+    }
+
+    @Test
+    @WithConfig(key = TRACE_BAGGAGE_MAX_ITEMS, value = "3")
+    void stopsAtItemLimit() {
+        assertEquals(3, extractBaggage(generateBaggageHeaders(50)).size());
+    }
+
+    @Test
+    @WithConfig(key = TRACE_BAGGAGE_MAX_BYTES, value = "24")
+    void stopsAtByteLimit() {
+        // with single digit indices each stored item is "keyN" + "valueN" = 10 bytes, so 2 fit in 24
+        // bytes and a third would take the total to 30
+        assertEquals(2, extractBaggage(generateBaggageHeaders(10)).size());
+    }
+
+    @Test
+    @WithConfig(key = TRACE_BAGGAGE_MAX_BYTES, value = "24")
+    @WithConfig(key = TRACE_BAGGAGE_MAX_ITEMS, value = "2")
+    void chargesRepeatedKeyOnce() {
+        Map<String, String> baggage =
+                extractBaggage(baggageHeaders(baggageItems("key0", "val0", "a", "0123456789", "key0", "val1")));
+
+        Map<String, String> expected = new HashMap<>();
+        expected.put("key0", "val1");
+        expected.put("a", "0123456789");
+        assertEquals(expected, baggage);
+    }
+
+    @Test
+    @WithConfig(key = TRACE_BAGGAGE_MAX_BYTES, value = "8")
+    void chargesEncodedValueSize() {
+        // the budget is charged before decoding, so the 9 character raw value does not fit
+        Map<String, String> baggage = extractBaggage(baggageHeaders(baggageItems("a", "b", "c", "%E2%99%A5")));
+
+        assertEquals(singletonMap("a", "b"), baggage);
+    }
+
+    @Test
+    @WithConfig(key = TRACE_BAGGAGE_MAX_BYTES, value = "3")
+    void chargesLiteralUtf8ByCharacterCount() {
+        // "a" + "♥" is 2 characters, so the 2 characters of "b" + "c" no longer fit
+        Map<String, String> baggage = extractBaggage(baggageHeaders(baggageItems("a", "♥", "b", "c")));
+
+        assertEquals(singletonMap("a", "♥"), baggage);
+    }
+
+    @Test
+    @WithConfig(key = TRACE_BAGGAGE_MAX_ITEMS, value = "0")
+    void dropsAllBaggageWhenItemLimitIsZero() {
+        assertTrue(extractBaggage(generateBaggageHeaders(10)).isEmpty());
+    }
+
+    @Test
+    @WithConfig(key = TRACE_BAGGAGE_MAX_BYTES, value = "0")
+    void dropsAllBaggageWhenByteLimitIsZero() {
+        assertTrue(extractBaggage(generateBaggageHeaders(10)).isEmpty());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/AppSecClientInterpreterClientIpTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/AppSecClientInterpreterClientIpTest.java
index dc3980ae077..a6d60e1fa84 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/AppSecClientInterpreterClientIpTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/AppSecClientInterpreterClientIpTest.java
@@ -38,72 +38,66 @@
  */
 @WithConfig(key = PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED, value = "true")
 class AppSecClientInterpreterClientIpTest extends DDJavaSpecification {
-  private boolean origAppSecActive;
-  private HttpCodec.Extractor extractor;
-
-  @BeforeEach
-  void enableAppSec() {
-    this.origAppSecActive = APPSEC_ACTIVE;
-    APPSEC_ACTIVE = true;
-  }
-
-  @AfterEach
-  void restoreAppSec() {
-    if (this.extractor != null) {
-      this.extractor.cleanup();
+    private boolean origAppSecActive;
+    private HttpCodec.Extractor extractor;
+
+    @BeforeEach
+    void enableAppSec() {
+        this.origAppSecActive = APPSEC_ACTIVE;
+        APPSEC_ACTIVE = true;
+    }
+
+    @AfterEach
+    void restoreAppSec() {
+        if (this.extractor != null) {
+            this.extractor.cleanup();
+        }
+        APPSEC_ACTIVE = this.origAppSecActive;
+    }
+
+    static Stream<Arguments> styles() {
+        return Stream.of(
+                arguments(new Style(
+                        "Datadog",
+                        DatadogHttpCodec::newExtractor,
+                        headers(DatadogHttpCodec.TRACE_ID_KEY, "1", DatadogHttpCodec.SPAN_ID_KEY, "2"),
+                        true)),
+                arguments(new Style(
+                        "B3",
+                        B3HttpCodec::newExtractor,
+                        headers(B3HttpCodec.TRACE_ID_KEY, "1", B3HttpCodec.SPAN_ID_KEY, "2"),
+                        true)),
+                arguments(new Style(
+                        "W3C",
+                        W3CHttpCodec::newExtractor,
+                        headers(
+                                W3CHttpCodec.TRACE_PARENT_KEY,
+                                "00-00000000000000000000000000000001-0000000000000002-01"),
+                        true)),
+                arguments(new Style(
+                        "Haystack",
+                        HaystackHttpCodec::newExtractor,
+                        headers(HaystackHttpCodec.TRACE_ID_KEY, "1", HaystackHttpCodec.SPAN_ID_KEY, "2"),
+                        true)),
+                arguments(new Style(
+                        "XRay",
+                        XRayHttpCodec::newExtractor,
+                        headers(
+                                XRayHttpCodec.X_AMZN_TRACE_ID,
+                                "Root=1-00000000-000000000000000000000001;Parent=0000000000000002"),
+                        true)),
+                arguments(new Style(
+                        "None",
+                        NoneCodec::newExtractor,
+                        headers(DatadogHttpCodec.TRACE_ID_KEY, "1", DatadogHttpCodec.SPAN_ID_KEY, "2"),
+                        false)));
     }
-    APPSEC_ACTIVE = this.origAppSecActive;
-  }
-
-  static Stream<Arguments> styles() {
-    return Stream.of(
-        arguments(
-            new Style(
-                "Datadog",
-                DatadogHttpCodec::newExtractor,
-                headers(DatadogHttpCodec.TRACE_ID_KEY, "1", DatadogHttpCodec.SPAN_ID_KEY, "2"),
-                true)),
-        arguments(
-            new Style(
-                "B3",
-                B3HttpCodec::newExtractor,
-                headers(B3HttpCodec.TRACE_ID_KEY, "1", B3HttpCodec.SPAN_ID_KEY, "2"),
-                true)),
-        arguments(
-            new Style(
-                "W3C",
-                W3CHttpCodec::newExtractor,
-                headers(
-                    W3CHttpCodec.TRACE_PARENT_KEY,
-                    "00-00000000000000000000000000000001-0000000000000002-01"),
-                true)),
-        arguments(
-            new Style(
-                "Haystack",
-                HaystackHttpCodec::newExtractor,
-                headers(HaystackHttpCodec.TRACE_ID_KEY, "1", HaystackHttpCodec.SPAN_ID_KEY, "2"),
-                true)),
-        arguments(
-            new Style(
-                "XRay",
-                XRayHttpCodec::newExtractor,
-                headers(
-                    XRayHttpCodec.X_AMZN_TRACE_ID,
-                    "Root=1-00000000-000000000000000000000001;Parent=0000000000000002"),
-                true)),
-        arguments(
-            new Style(
-                "None",
-                NoneCodec::newExtractor,
-                headers(DatadogHttpCodec.TRACE_ID_KEY, "1", DatadogHttpCodec.SPAN_ID_KEY, "2"),
-                false)));
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("styles")
-  void extractCommonHttpHeaders(Style style) {
-    this.extractor = buildExtractor(style.factory);
-    // spotless:off
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("styles")
+    void extractCommonHttpHeaders(Style style) {
+        this.extractor = buildExtractor(style.factory);
+        // spotless:off
     Map<String, String> headers = headers(
         HttpCodec.USER_AGENT_KEY, "some-user-agent",
         HttpCodec.X_CLUSTER_CLIENT_IP_KEY, "1.1.1.1",
@@ -117,154 +111,151 @@ void extractCommonHttpHeaders(Style style) {
         HttpCodec.CF_CONNECTING_IP_V6_KEY, "9.9.9.9");
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    assertEquals("some-user-agent", context.getUserAgent());
-    assertEquals("1.1.1.1", context.getXClusterClientIp());
-    assertEquals("2.2.2.2", context.getXRealIp());
-    assertEquals("3.3.3.3", context.getXClientIp());
-    assertEquals("4.4.4.4", context.getTrueClientIp());
-    assertEquals("5.5.5.5", context.getForwardedFor());
-    assertEquals("6.6.6.6", context.getForwarded());
-    assertEquals("7.7.7.7", context.getFastlyClientIp());
-    assertEquals("8.8.8.8", context.getCfConnectingIp());
-    assertEquals("9.9.9.9", context.getCfConnectingIpv6());
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("styles")
-  void extractEmptyHeadersReturnsNull(Style style) {
-    this.extractor = buildExtractor(style.factory);
-    assertNull(
-        this.extractor.extract(headers("ignored-header", "ignored-value"), stringValuesMap()));
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("styles")
-  void extractHeadersWithForwarding(Style style) {
-    this.extractor = buildExtractor(style.factory);
-    String forwarded = "for=1.2.3.4:1234";
-
-    TagContext tagOnly = this.extractor.extract(headers("Forwarded", forwarded), stringValuesMap());
-
-    assertNotNull(tagOnly);
-    assertFalse(tagOnly instanceof ExtractedContext);
-    assertEquals(forwarded, tagOnly.getForwarded());
-
-    Map<String, String> fullHeaders = new HashMap<>(style.minimalTraceHeaders);
-    fullHeaders.putAll(headers("Forwarded", forwarded));
-
-    TagContext full = this.extractor.extract(fullHeaders, stringValuesMap());
-
-    assertExpectedTraceContext(full, style);
-    assertEquals(forwarded, full.getForwarded());
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("styles")
-  void extractHeadersWithXForwarding(Style style) {
-    this.extractor = buildExtractor(style.factory);
-    String forwardedIp = "1.2.3.4";
-    String forwardedPort = "1234";
-
-    TagContext tagOnly =
-        this.extractor.extract(
-            headers("X-Forwarded-For", forwardedIp, "X-Forwarded-Port", forwardedPort),
-            stringValuesMap());
-
-    assertNotNull(tagOnly);
-    assertFalse(tagOnly instanceof ExtractedContext);
-    assertEquals(forwardedIp, tagOnly.getXForwardedFor());
-    assertEquals(forwardedPort, tagOnly.getXForwardedPort());
-
-    Map<String, String> fullHeaders = new HashMap<>(style.minimalTraceHeaders);
-    fullHeaders.putAll(headers("X-Forwarded-For", forwardedIp, "X-Forwarded-Port", forwardedPort));
-
-    TagContext full = this.extractor.extract(fullHeaders, stringValuesMap());
-
-    assertExpectedTraceContext(full, style);
-    assertEquals(forwardedIp, full.getXForwardedFor());
-    assertEquals(forwardedPort, full.getXForwardedPort());
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("styles")
-  @WithConfig(key = TRACE_CLIENT_IP_RESOLVER_ENABLED, value = "false")
-  void extractHeadersWithIpResolutionDisabled(Style style) {
-    // The extractor must be built after @WithConfig is applied: ContextInterpreter reads the
-    // client-IP resolution flag in its constructor.
-    this.extractor = buildExtractor(style.factory);
-    Map<String, String> headers = headers("X-Forwarded-For", "::1", "User-agent", "foo/bar");
-
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    assertNotNull(context);
-    assertNull(context.getXForwardedFor());
-    assertEquals("foo/bar", context.getUserAgent());
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("styles")
-  void extractHeadersWithIpResolutionDisabledAppsecDisabled(Style style) {
-    this.extractor = buildExtractor(style.factory);
-    // collectIpHeaders is recomputed per extract in ContextInterpreter.reset(), so toggling
-    // APPSEC_ACTIVE after building the extractor still takes effect.
-    APPSEC_ACTIVE = false;
-    Map<String, String> headers = headers("X-Forwarded-For", "::1", "User-agent", "foo/bar");
-
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    assertNotNull(context);
-    assertNull(context.getXForwardedFor());
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("styles")
-  @WithConfig(key = TRACE_CLIENT_IP_HEADER, value = "my-header")
-  void customIpHeaderCollectionDoesNotDisableStandardIpHeaderCollection(Style style) {
-    this.extractor = buildExtractor(style.factory);
-    Map<String, String> headers = headers("X-Forwarded-For", "::1", "My-Header", "8.8.8.8");
-
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    assertNotNull(context);
-    assertEquals("::1", context.getXForwardedFor());
-    assertEquals("8.8.8.8", context.getCustomIpHeader());
-  }
-
-  private static void assertExpectedTraceContext(TagContext context, Style style) {
-    if (style.buildsExtractedContext) {
-      ExtractedContext extracted = assertInstanceOf(ExtractedContext.class, context);
-      assertEquals(1L, extracted.getTraceId().toLong());
-      assertEquals(2L, extracted.getSpanId());
-    } else {
-      assertFalse(context instanceof ExtractedContext);
-      assertEquals(DDTraceId.ZERO, context.getTraceId());
-      assertEquals(DDSpanId.ZERO, context.getSpanId());
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        assertEquals("some-user-agent", context.getUserAgent());
+        assertEquals("1.1.1.1", context.getXClusterClientIp());
+        assertEquals("2.2.2.2", context.getXRealIp());
+        assertEquals("3.3.3.3", context.getXClientIp());
+        assertEquals("4.4.4.4", context.getTrueClientIp());
+        assertEquals("5.5.5.5", context.getForwardedFor());
+        assertEquals("6.6.6.6", context.getForwarded());
+        assertEquals("7.7.7.7", context.getFastlyClientIp());
+        assertEquals("8.8.8.8", context.getCfConnectingIp());
+        assertEquals("9.9.9.9", context.getCfConnectingIpv6());
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("styles")
+    void extractEmptyHeadersReturnsNull(Style style) {
+        this.extractor = buildExtractor(style.factory);
+        assertNull(this.extractor.extract(headers("ignored-header", "ignored-value"), stringValuesMap()));
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("styles")
+    void extractHeadersWithForwarding(Style style) {
+        this.extractor = buildExtractor(style.factory);
+        String forwarded = "for=1.2.3.4:1234";
+
+        TagContext tagOnly = this.extractor.extract(headers("Forwarded", forwarded), stringValuesMap());
+
+        assertNotNull(tagOnly);
+        assertFalse(tagOnly instanceof ExtractedContext);
+        assertEquals(forwarded, tagOnly.getForwarded());
+
+        Map<String, String> fullHeaders = new HashMap<>(style.minimalTraceHeaders);
+        fullHeaders.putAll(headers("Forwarded", forwarded));
+
+        TagContext full = this.extractor.extract(fullHeaders, stringValuesMap());
+
+        assertExpectedTraceContext(full, style);
+        assertEquals(forwarded, full.getForwarded());
     }
-  }
-
-  /** A propagation style under test: its extractor factory and minimal valid trace headers. */
-  static final class Style {
-    final String name;
-    final BiFunction<Config, Supplier<TraceConfig>, HttpCodec.Extractor> factory;
-    final Map<String, String> minimalTraceHeaders;
-    final boolean buildsExtractedContext;
-
-    Style(
-        String name,
-        BiFunction<Config, Supplier<TraceConfig>, HttpCodec.Extractor> factory,
-        Map<String, String> minimalTraceHeaders,
-        boolean buildsExtractedContext) {
-      this.name = name;
-      this.factory = factory;
-      this.minimalTraceHeaders = minimalTraceHeaders;
-      this.buildsExtractedContext = buildsExtractedContext;
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("styles")
+    void extractHeadersWithXForwarding(Style style) {
+        this.extractor = buildExtractor(style.factory);
+        String forwardedIp = "1.2.3.4";
+        String forwardedPort = "1234";
+
+        TagContext tagOnly = this.extractor.extract(
+                headers("X-Forwarded-For", forwardedIp, "X-Forwarded-Port", forwardedPort), stringValuesMap());
+
+        assertNotNull(tagOnly);
+        assertFalse(tagOnly instanceof ExtractedContext);
+        assertEquals(forwardedIp, tagOnly.getXForwardedFor());
+        assertEquals(forwardedPort, tagOnly.getXForwardedPort());
+
+        Map<String, String> fullHeaders = new HashMap<>(style.minimalTraceHeaders);
+        fullHeaders.putAll(headers("X-Forwarded-For", forwardedIp, "X-Forwarded-Port", forwardedPort));
+
+        TagContext full = this.extractor.extract(fullHeaders, stringValuesMap());
+
+        assertExpectedTraceContext(full, style);
+        assertEquals(forwardedIp, full.getXForwardedFor());
+        assertEquals(forwardedPort, full.getXForwardedPort());
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("styles")
+    @WithConfig(key = TRACE_CLIENT_IP_RESOLVER_ENABLED, value = "false")
+    void extractHeadersWithIpResolutionDisabled(Style style) {
+        // The extractor must be built after @WithConfig is applied: ContextInterpreter reads the
+        // client-IP resolution flag in its constructor.
+        this.extractor = buildExtractor(style.factory);
+        Map<String, String> headers = headers("X-Forwarded-For", "::1", "User-agent", "foo/bar");
+
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        assertNotNull(context);
+        assertNull(context.getXForwardedFor());
+        assertEquals("foo/bar", context.getUserAgent());
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("styles")
+    void extractHeadersWithIpResolutionDisabledAppsecDisabled(Style style) {
+        this.extractor = buildExtractor(style.factory);
+        // collectIpHeaders is recomputed per extract in ContextInterpreter.reset(), so toggling
+        // APPSEC_ACTIVE after building the extractor still takes effect.
+        APPSEC_ACTIVE = false;
+        Map<String, String> headers = headers("X-Forwarded-For", "::1", "User-agent", "foo/bar");
+
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        assertNotNull(context);
+        assertNull(context.getXForwardedFor());
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("styles")
+    @WithConfig(key = TRACE_CLIENT_IP_HEADER, value = "my-header")
+    void customIpHeaderCollectionDoesNotDisableStandardIpHeaderCollection(Style style) {
+        this.extractor = buildExtractor(style.factory);
+        Map<String, String> headers = headers("X-Forwarded-For", "::1", "My-Header", "8.8.8.8");
+
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        assertNotNull(context);
+        assertEquals("::1", context.getXForwardedFor());
+        assertEquals("8.8.8.8", context.getCustomIpHeader());
+    }
+
+    private static void assertExpectedTraceContext(TagContext context, Style style) {
+        if (style.buildsExtractedContext) {
+            ExtractedContext extracted = assertInstanceOf(ExtractedContext.class, context);
+            assertEquals(1L, extracted.getTraceId().toLong());
+            assertEquals(2L, extracted.getSpanId());
+        } else {
+            assertFalse(context instanceof ExtractedContext);
+            assertEquals(DDTraceId.ZERO, context.getTraceId());
+            assertEquals(DDSpanId.ZERO, context.getSpanId());
+        }
     }
 
-    @Override
-    public String toString() {
-      return this.name;
+    /** A propagation style under test: its extractor factory and minimal valid trace headers. */
+    static final class Style {
+        final String name;
+        final BiFunction<Config, Supplier<TraceConfig>, HttpCodec.Extractor> factory;
+        final Map<String, String> minimalTraceHeaders;
+        final boolean buildsExtractedContext;
+
+        Style(
+                String name,
+                BiFunction<Config, Supplier<TraceConfig>, HttpCodec.Extractor> factory,
+                Map<String, String> minimalTraceHeaders,
+                boolean buildsExtractedContext) {
+            this.name = name;
+            this.factory = factory;
+            this.minimalTraceHeaders = minimalTraceHeaders;
+            this.buildsExtractedContext = buildsExtractedContext;
+        }
+
+        @Override
+        public String toString() {
+            return this.name;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpExtractorTest.java
index f60136741d5..d7b18deca77 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpExtractorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpExtractorTest.java
@@ -29,28 +29,27 @@
 import org.tabletest.junit.TableTest;
 
 class B3HttpExtractorTest extends AbstractHttpExtractorTest {
-  private static final String SOME_VALUE = "my-interesting-info";
+    private static final String SOME_VALUE = "my-interesting-info";
 
-  @Override
-  protected HttpCodec.Extractor newExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier) {
-    return B3HttpCodec.newExtractor(config, traceConfigSupplier);
-  }
+    @Override
+    protected HttpCodec.Extractor newExtractor(Config config, Supplier<TraceConfig> traceConfigSupplier) {
+        return B3HttpCodec.newExtractor(config, traceConfigSupplier);
+    }
 
-  @TableTest({
-    "scenario          | traceIdHex         | spanIdHex          | samplingPriority | expectedSamplingPriority",
-    "no priority       | '1'                | '2'                |                  | UNSET                   ",
-    "sampler keep      | '2'                | '3'                | 1                | SAMPLER_KEEP            ",
-    "sampler drop      | '3'                | '4'                | 0                | SAMPLER_DROP            ",
-    "uint64 max drop   | 'ffffffffffffffff' | 'fffffffffffffffe' | 0                | SAMPLER_DROP            ",
-    "uint64 max-1 keep | 'fffffffffffffffe' | 'ffffffffffffffff' | 1                | SAMPLER_KEEP            "
-  })
-  void extractHttpHeaders(
-      String traceIdHex,
-      String spanIdHex,
-      Integer samplingPriority,
-      @ConvertWith(PrioritySamplingConverter.class) byte expectedSamplingPriority) {
-    // spotless:off
+    @TableTest({
+      "scenario          | traceIdHex         | spanIdHex          | samplingPriority | expectedSamplingPriority",
+      "no priority       | '1'                | '2'                |                  | UNSET                   ",
+      "sampler keep      | '2'                | '3'                | 1                | SAMPLER_KEEP            ",
+      "sampler drop      | '3'                | '4'                | 0                | SAMPLER_DROP            ",
+      "uint64 max drop   | 'ffffffffffffffff' | 'fffffffffffffffe' | 0                | SAMPLER_DROP            ",
+      "uint64 max-1 keep | 'fffffffffffffffe' | 'ffffffffffffffff' | 1                | SAMPLER_KEEP            "
+    })
+    void extractHttpHeaders(
+            String traceIdHex,
+            String spanIdHex,
+            Integer samplingPriority,
+            @ConvertWith(PrioritySamplingConverter.class) byte expectedSamplingPriority) {
+        // spotless:off
     Map<String, String> headers = headers(
         "", "empty key",
         TRACE_ID_KEY, traceIdHex,
@@ -59,32 +58,31 @@ void extractHttpHeaders(
         SAMPLING_PRIORITY_KEY, samplingPriority != null ? samplingPriority.toString() : null);
     // spotless:on
 
-    ExtractedContext context =
-        (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
+        ExtractedContext context = (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
 
-    assertEquals(B3TraceId.fromHex(traceIdHex), context.getTraceId());
-    assertEquals(DDSpanId.fromHex(spanIdHex), context.getSpanId());
-    assertEquals(emptyMap(), context.getBaggage());
-    assertEquals(expectedB3Tags(context), context.getTags());
-    assertEquals(expectedSamplingPriority, context.getSamplingPriority());
-    assertNull(context.getOrigin());
-  }
+        assertEquals(B3TraceId.fromHex(traceIdHex), context.getTraceId());
+        assertEquals(DDSpanId.fromHex(spanIdHex), context.getSpanId());
+        assertEquals(emptyMap(), context.getBaggage());
+        assertEquals(expectedB3Tags(context), context.getTags());
+        assertEquals(expectedSamplingPriority, context.getSamplingPriority());
+        assertNull(context.getOrigin());
+    }
 
-  @TableTest({
-    "scenario              | b3      | expectedTraceIdHex | expectedSpanId | expectedSamplingPriority",
-    "b3 takes precedence   | '2-3-0' | '2'                | 3              | SAMPLER_DROP            ",
-    "b3 without priority   | '2-3'   | '2'                | 3              | UNSET                   ",
-    "invalid b3 falls back | '0'     | '1'                | 2              | SAMPLER_KEEP            ",
-    "absent b3 falls back  |         | '1'                | 2              | SAMPLER_KEEP            "
-  })
-  void extractHttpHeadersWithB3HeaderAtTheBeginning(
-      String b3,
-      String expectedTraceIdHex,
-      long expectedSpanId,
-      @ConvertWith(PrioritySamplingConverter.class) byte expectedSamplingPriority) {
-    String traceIdHex = "1";
-    String spanIdHex = "2";
-    // spotless:off
+    @TableTest({
+      "scenario              | b3      | expectedTraceIdHex | expectedSpanId | expectedSamplingPriority",
+      "b3 takes precedence   | '2-3-0' | '2'                | 3              | SAMPLER_DROP            ",
+      "b3 without priority   | '2-3'   | '2'                | 3              | UNSET                   ",
+      "invalid b3 falls back | '0'     | '1'                | 2              | SAMPLER_KEEP            ",
+      "absent b3 falls back  |         | '1'                | 2              | SAMPLER_KEEP            "
+    })
+    void extractHttpHeadersWithB3HeaderAtTheBeginning(
+            String b3,
+            String expectedTraceIdHex,
+            long expectedSpanId,
+            @ConvertWith(PrioritySamplingConverter.class) byte expectedSamplingPriority) {
+        String traceIdHex = "1";
+        String spanIdHex = "2";
+        // spotless:off
     Map<String, String> headers = headers(
         "", "empty key",
         B3_KEY, b3,
@@ -95,28 +93,26 @@ void extractHttpHeadersWithB3HeaderAtTheBeginning(
     );
     // spotless:on
 
-    ExtractedContext context =
-        (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
+        ExtractedContext context = (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
 
-    assertB3MultiOrSingleContext(
-        context, expectedTraceIdHex, expectedSpanId, expectedSamplingPriority);
-  }
+        assertB3MultiOrSingleContext(context, expectedTraceIdHex, expectedSpanId, expectedSamplingPriority);
+    }
 
-  @TableTest({
-    "scenario              | b3      | expectedTraceIdHex | expectedSpanId | expectedSamplingPriority",
-    "b3 takes precedence   | '2-3-0' | '2'                | 3              | SAMPLER_DROP            ",
-    "b3 without priority   | '2-3'   | '2'                | 3              | UNSET                   ",
-    "invalid b3 falls back | '0'     | '1'                | 2              | SAMPLER_KEEP            ",
-    "absent b3 falls back  |         | '1'                | 2              | SAMPLER_KEEP            "
-  })
-  void extractHttpHeadersWithB3HeaderAtTheEnd(
-      String b3,
-      String expectedTraceIdHex,
-      long expectedSpanId,
-      @ConvertWith(PrioritySamplingConverter.class) byte expectedSamplingPriority) {
-    String traceIdHex = "1";
-    String spanIdHex = "2";
-    // spotless:off
+    @TableTest({
+      "scenario              | b3      | expectedTraceIdHex | expectedSpanId | expectedSamplingPriority",
+      "b3 takes precedence   | '2-3-0' | '2'                | 3              | SAMPLER_DROP            ",
+      "b3 without priority   | '2-3'   | '2'                | 3              | UNSET                   ",
+      "invalid b3 falls back | '0'     | '1'                | 2              | SAMPLER_KEEP            ",
+      "absent b3 falls back  |         | '1'                | 2              | SAMPLER_KEEP            "
+    })
+    void extractHttpHeadersWithB3HeaderAtTheEnd(
+            String b3,
+            String expectedTraceIdHex,
+            long expectedSpanId,
+            @ConvertWith(PrioritySamplingConverter.class) byte expectedSamplingPriority) {
+        String traceIdHex = "1";
+        String spanIdHex = "2";
+        // spotless:off
     Map<String, String> headers = headers(
         "", "empty key",
         TRACE_ID_KEY, traceIdHex,
@@ -127,89 +123,85 @@ void extractHttpHeadersWithB3HeaderAtTheEnd(
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
 
-    assertB3MultiOrSingleContext(
-        context, expectedTraceIdHex, expectedSpanId, expectedSamplingPriority);
-  }
+        assertB3MultiOrSingleContext(context, expectedTraceIdHex, expectedSpanId, expectedSamplingPriority);
+    }
 
-  private void assertB3MultiOrSingleContext(
-      TagContext context,
-      String expectedTraceIdHex,
-      long expectedSpanId,
-      int expectedSamplingPriority) {
-    assertEquals(B3TraceId.fromHex(expectedTraceIdHex), context.getTraceId());
-    assertEquals(expectedSpanId, context.getSpanId());
-    assertFalse(context.baggageItems().iterator().hasNext());
-    assertEquals(expectedB3Tags(context), context.getTags());
-    assertEquals(expectedSamplingPriority, context.getSamplingPriority());
-    assertNull(context.getOrigin());
-  }
+    private void assertB3MultiOrSingleContext(
+            TagContext context, String expectedTraceIdHex, long expectedSpanId, int expectedSamplingPriority) {
+        assertEquals(B3TraceId.fromHex(expectedTraceIdHex), context.getTraceId());
+        assertEquals(expectedSpanId, context.getSpanId());
+        assertFalse(context.baggageItems().iterator().hasNext());
+        assertEquals(expectedB3Tags(context), context.getTags());
+        assertEquals(expectedSamplingPriority, context.getSamplingPriority());
+        assertNull(context.getOrigin());
+    }
 
-  private Map<String, Object> expectedB3Tags(TagContext context) {
-    Map<String, Object> expected = new HashMap<>();
-    expected.put(B3_TRACE_ID, ((B3TraceId) context.getTraceId()).getOriginal());
-    expected.put(B3_SPAN_ID, DDSpanId.toHexString(context.getSpanId()));
-    expected.put(SOME_TAG, SOME_VALUE);
-    return expected;
-  }
+    private Map<String, Object> expectedB3Tags(TagContext context) {
+        Map<String, Object> expected = new HashMap<>();
+        expected.put(B3_TRACE_ID, ((B3TraceId) context.getTraceId()).getOriginal());
+        expected.put(B3_SPAN_ID, DDSpanId.toHexString(context.getSpanId()));
+        expected.put(SOME_TAG, SOME_VALUE);
+        return expected;
+    }
 
-  @TableTest({
-    "scenario               | traceId                             | spanId              | expectedTraceIdHex                 | expectedSpanId     ",
-    "negative traceId       | '-1'                                | '1'                 |                                    |                    ",
-    "negative spanId        | '1'                                 | '-1'                |                                    |                    ",
-    "zero traceId           | '0'                                 | '1'                 |                                    |                    ",
-    "padded traceId         | '00001'                             | '1'                 | '00001'                            | 1                  ",
-    "64-bit ids             | '463ac35c9f6413ad'                  | '463ac35c9f6413ad'  | '463ac35c9f6413ad'                 | 5060571933882717101",
-    "128-bit traceId        | '463ac35c9f6413ad48485a3953bb6124'  | '1'                 | '463ac35c9f6413ad48485a3953bb6124' | 1                  ",
-    "uint64 max traceId     | 'ffffffffffffffff'                  | '1'                 | 'ffffffffffffffff'                 | 1                  ",
-    "128-bit high-low max   | 'aaaaaaaaaaaaaaaaffffffffffffffff'  | '1'                 | 'aaaaaaaaaaaaaaaaffffffffffffffff' | 1                  ",
-    "traceId too long high1 | '1ffffffffffffffffffffffffffffffff' | '1'                 |                                    |                    ",
-    "traceId too long high0 | '0ffffffffffffffffffffffffffffffff' | '1'                 |                                    |                    ",
-    "uint64 max spanId      | '1'                                 | 'ffffffffffffffff'  | '1'                                | -1                 ",
-    "spanId too long        | '1'                                 | '1ffffffffffffffff' |                                    |                    "
-  })
-  void extract128BitIdTruncatesIdTo64Bit(
-      String traceId, String spanId, String expectedTraceIdHex, Long expectedSpanId) {
-    // spotless:off
+    @TableTest({
+      "scenario               | traceId                             | spanId              | expectedTraceIdHex                 | expectedSpanId     ",
+      "negative traceId       | '-1'                                | '1'                 |                                    |                    ",
+      "negative spanId        | '1'                                 | '-1'                |                                    |                    ",
+      "zero traceId           | '0'                                 | '1'                 |                                    |                    ",
+      "padded traceId         | '00001'                             | '1'                 | '00001'                            | 1                  ",
+      "64-bit ids             | '463ac35c9f6413ad'                  | '463ac35c9f6413ad'  | '463ac35c9f6413ad'                 | 5060571933882717101",
+      "128-bit traceId        | '463ac35c9f6413ad48485a3953bb6124'  | '1'                 | '463ac35c9f6413ad48485a3953bb6124' | 1                  ",
+      "uint64 max traceId     | 'ffffffffffffffff'                  | '1'                 | 'ffffffffffffffff'                 | 1                  ",
+      "128-bit high-low max   | 'aaaaaaaaaaaaaaaaffffffffffffffff'  | '1'                 | 'aaaaaaaaaaaaaaaaffffffffffffffff' | 1                  ",
+      "traceId too long high1 | '1ffffffffffffffffffffffffffffffff' | '1'                 |                                    |                    ",
+      "traceId too long high0 | '0ffffffffffffffffffffffffffffffff' | '1'                 |                                    |                    ",
+      "uint64 max spanId      | '1'                                 | 'ffffffffffffffff'  | '1'                                | -1                 ",
+      "spanId too long        | '1'                                 | '1ffffffffffffffff' |                                    |                    "
+    })
+    void extract128BitIdTruncatesIdTo64Bit(
+            String traceId, String spanId, String expectedTraceIdHex, Long expectedSpanId) {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, traceId,
         SPAN_ID_KEY, spanId
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
 
-    if (expectedTraceIdHex != null) {
-      assertInstanceOf(ExtractedContext.class, context);
-      B3TraceId expectedTraceId = B3TraceId.fromHex(expectedTraceIdHex);
-      assertEquals(expectedTraceId, context.getTraceId());
-      long spanIdValue = expectedSpanId == null ? 0L : expectedSpanId;
-      assertEquals(spanIdValue, context.getSpanId());
-      assertEquals(expectedTraceId.getOriginal(), context.getTags().getString(B3_TRACE_ID));
-      if (expectedSpanId == null) {
-        assertNull(context.getTags().getString(B3_SPAN_ID));
-      } else {
-        assertEquals(DDSpanId.toHexString(expectedSpanId), context.getTags().getString(B3_SPAN_ID));
-      }
-    } else if (context != null) {
-      assertInstanceOf(TagContext.class, context);
-      assertFalse(context instanceof ExtractedContext);
+        if (expectedTraceIdHex != null) {
+            assertInstanceOf(ExtractedContext.class, context);
+            B3TraceId expectedTraceId = B3TraceId.fromHex(expectedTraceIdHex);
+            assertEquals(expectedTraceId, context.getTraceId());
+            long spanIdValue = expectedSpanId == null ? 0L : expectedSpanId;
+            assertEquals(spanIdValue, context.getSpanId());
+            assertEquals(expectedTraceId.getOriginal(), context.getTags().getString(B3_TRACE_ID));
+            if (expectedSpanId == null) {
+                assertNull(context.getTags().getString(B3_SPAN_ID));
+            } else {
+                assertEquals(
+                        DDSpanId.toHexString(expectedSpanId), context.getTags().getString(B3_SPAN_ID));
+            }
+        } else if (context != null) {
+            assertInstanceOf(TagContext.class, context);
+            assertFalse(context instanceof ExtractedContext);
+        }
     }
-  }
 
-  @Test
-  void extractHeaderTagsWithNoPropagation() {
-    TagContext context =
-        this.extractor.extract(singletonMap(SOME_HEADER, SOME_VALUE), stringValuesMap());
+    @Test
+    void extractHeaderTagsWithNoPropagation() {
+        TagContext context = this.extractor.extract(singletonMap(SOME_HEADER, SOME_VALUE), stringValuesMap());
 
-    assertFalse(context instanceof ExtractedContext);
-    assertEquals(singletonMap(SOME_TAG, SOME_VALUE), context.getTags());
-  }
+        assertFalse(context instanceof ExtractedContext);
+        assertEquals(singletonMap(SOME_TAG, SOME_VALUE), context.getTags());
+    }
 
-  @Test
-  void extractHttpHeadersWithInvalidNonNumericId() {
-    // spotless:off
+    @Test
+    void extractHttpHeadersWithInvalidNonNumericId() {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, "traceId",
         SPAN_ID_KEY, "spanId",
@@ -217,15 +209,15 @@ void extractHttpHeadersWithInvalidNonNumericId() {
     );
     // spotless:on
 
-    TagContext context = extractor.extract(headers, stringValuesMap());
+        TagContext context = extractor.extract(headers, stringValuesMap());
 
-    assertFalse(context instanceof ExtractedContext);
-    assertEquals(singletonMap(SOME_TAG, SOME_VALUE), context.getTags());
-  }
+        assertFalse(context instanceof ExtractedContext);
+        assertEquals(singletonMap(SOME_TAG, SOME_VALUE), context.getTags());
+    }
 
-  @Test
-  void extractHttpHeadersWithOutOfRangeSpanId() {
-    // spotless:off
+    @Test
+    void extractHttpHeadersWithOutOfRangeSpanId() {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, "0",
         SPAN_ID_KEY, "-1",
@@ -233,49 +225,48 @@ void extractHttpHeadersWithOutOfRangeSpanId() {
     );
     // spotless:on
 
-    TagContext context = extractor.extract(headers, stringValuesMap());
+        TagContext context = extractor.extract(headers, stringValuesMap());
 
-    assertFalse(context instanceof ExtractedContext);
-    assertEquals(singletonMap(SOME_TAG, SOME_VALUE), context.getTags());
-  }
+        assertFalse(context instanceof ExtractedContext);
+        assertEquals(singletonMap(SOME_TAG, SOME_VALUE), context.getTags());
+    }
 
-  @TableTest({
-    "scenario             | traceId                            | spanId                | expectedSpanId     ",
-    "padded 64-bit        | '00001'                            | '00001'               | 1                  ",
-    "normal 64-bit        | '463ac35c9f6413ad'                 | '463ac35c9f6413ad'    | 5060571933882717101",
-    "128-bit truncated    | '463ac35c9f6413ad48485a3953bb6124' | '1'                   | 1                  ",
-    "uint64 max traceId   | 'ffffffffffffffff'                 | '1'                   | 1                  ",
-    "128-bit high+low max | 'aaaaaaaaaaaaaaaaffffffffffffffff' | '1'                   | 1                  ",
-    "uint64 max spanId    | '1'                                | 'ffffffffffffffff'    | -1                 ",
-    "padded uint64 max    | '1'                                | '000ffffffffffffffff' | -1                 "
-  })
-  void extractIdsWhileRetainingTheOriginalString(
-      String traceId, String spanId, long expectedSpanId) {
-    // spotless:off
+    @TableTest({
+      "scenario             | traceId                            | spanId                | expectedSpanId     ",
+      "padded 64-bit        | '00001'                            | '00001'               | 1                  ",
+      "normal 64-bit        | '463ac35c9f6413ad'                 | '463ac35c9f6413ad'    | 5060571933882717101",
+      "128-bit truncated    | '463ac35c9f6413ad48485a3953bb6124' | '1'                   | 1                  ",
+      "uint64 max traceId   | 'ffffffffffffffff'                 | '1'                   | 1                  ",
+      "128-bit high+low max | 'aaaaaaaaaaaaaaaaffffffffffffffff' | '1'                   | 1                  ",
+      "uint64 max spanId    | '1'                                | 'ffffffffffffffff'    | -1                 ",
+      "padded uint64 max    | '1'                                | '000ffffffffffffffff' | -1                 "
+    })
+    void extractIdsWhileRetainingTheOriginalString(String traceId, String spanId, long expectedSpanId) {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, traceId,
         SPAN_ID_KEY, spanId
     );
     // spotless:on
-    B3TraceId expectedTraceId = B3TraceId.fromHex(traceId);
+        B3TraceId expectedTraceId = B3TraceId.fromHex(traceId);
 
-    ExtractedContext context = (ExtractedContext) extractor.extract(headers, stringValuesMap());
+        ExtractedContext context = (ExtractedContext) extractor.extract(headers, stringValuesMap());
 
-    assertEquals(expectedTraceId, context.getTraceId());
-    assertEquals(traceId, ((B3TraceId) context.getTraceId()).getOriginal());
-    assertEquals(expectedSpanId, context.getSpanId());
-    assertEquals(trimmed(spanId), DDSpanId.toHexString(context.getSpanId()));
-  }
-
-  private static String trimmed(String hex) {
-    int length = hex.length();
-    int firstNonZero = 0;
-    while (firstNonZero < length && hex.charAt(firstNonZero) == '0') {
-      firstNonZero++;
+        assertEquals(expectedTraceId, context.getTraceId());
+        assertEquals(traceId, ((B3TraceId) context.getTraceId()).getOriginal());
+        assertEquals(expectedSpanId, context.getSpanId());
+        assertEquals(trimmed(spanId), DDSpanId.toHexString(context.getSpanId()));
     }
-    if (firstNonZero == length) {
-      return "0";
+
+    private static String trimmed(String hex) {
+        int length = hex.length();
+        int firstNonZero = 0;
+        while (firstNonZero < length && hex.charAt(firstNonZero) == '0') {
+            firstNonZero++;
+        }
+        if (firstNonZero == length) {
+            return "0";
+        }
+        return hex.substring(firstNonZero, length);
     }
-    return hex.substring(firstNonZero, length);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpInjectorTest.java
index 50f607d9c87..1e594f2f476 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpInjectorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpInjectorTest.java
@@ -27,108 +27,107 @@
 
 class B3HttpInjectorTest extends AbstractHttpInjectorTest {
 
-  private static final CarrierSetter<Map<String, String>> MAP_SETTER = Map::put;
-
-  protected boolean tracePropagationB3Padding() {
-    return DEFAULT_PROPAGATION_B3_PADDING_ENABLED;
-  }
-
-  @Override
-  protected HttpCodec.Injector newInjector() {
-    return B3HttpCodec.newCombinedInjector(tracePropagationB3Padding());
-  }
-
-  @TableTest({
-    "scenario          | traceId | spanId | samplingPriority | expectedSamplingPriority",
-    "unset             | 1       | 2      | UNSET            |                         ",
-    "sampler keep      | 2       | 3      | SAMPLER_KEEP     | SAMPLER_KEEP            ",
-    "sampler drop      | 4       | 5      | SAMPLER_DROP     | SAMPLER_DROP            ",
-    "user keep         | 5       | 6      | USER_KEEP        | SAMPLER_KEEP            ",
-    "user drop         | 6       | 7      | USER_DROP        | SAMPLER_DROP            ",
-    "uint64 max unset  | -1      | -2     | UNSET            |                         ",
-    "uint64 max-1 keep | -2      | -1     | SAMPLER_KEEP     | SAMPLER_KEEP            "
-  })
-  void injectHttpHeaders(
-      long traceId,
-      long spanId,
-      @ConvertWith(PrioritySamplingConverter.class) byte samplingPriority,
-      @ConvertWith(PrioritySamplingConverter.class) Byte expectedSamplingPriority) {
-
-    DDSpanContext spanContext =
-        mockedSpanContext(DDTraceId.from(traceId), spanId, samplingPriority);
-
-    Map<String, String> carrier = new HashMap<>();
-    this.injector.inject(spanContext, carrier, MAP_SETTER);
-
-    String traceIdHex = traceIdOrPadded(traceId, tracePropagationB3Padding());
-    String spanIdHex = spanIdOrPadded(spanId, tracePropagationB3Padding());
-    assertEquals(traceIdHex, carrier.get(TRACE_ID_KEY));
-    assertEquals(spanIdHex, carrier.get(SPAN_ID_KEY));
-
-    if (expectedSamplingPriority != null) {
-      assertEquals(4, carrier.size());
-      assertEquals(expectedSamplingPriority.toString(), carrier.get(SAMPLING_PRIORITY_KEY));
-      assertEquals(
-          traceIdHex + "-" + spanIdHex + "-" + expectedSamplingPriority, carrier.get(B3_KEY));
-    } else {
-      assertEquals(3, carrier.size());
-      assertEquals(traceIdHex + "-" + spanIdHex, carrier.get(B3_KEY));
+    private static final CarrierSetter<Map<String, String>> MAP_SETTER = Map::put;
+
+    protected boolean tracePropagationB3Padding() {
+        return DEFAULT_PROPAGATION_B3_PADDING_ENABLED;
     }
-  }
-
-  @TableTest({
-    "scenario             | traceId                            | spanId               ",
-    "padded 64-bit        | '00001'                            | '00001'              ",
-    "64-bit               | '463ac35c9f6413ad'                 | '463ac35c9f6413ad'   ",
-    "128-bit              | '463ac35c9f6413ad48485a3953bb6124' | '1'                  ",
-    "uint64 max traceId   | 'ffffffffffffffff'                 | '1'                  ",
-    "128-bit high+low max | 'aaaaaaaaaaaaaaaaffffffffffffffff' | '1'                  ",
-    "uint64 max spanId    | '1'                                | 'ffffffffffffffff'   ",
-    "padded uint64 max    | '1'                                | '000ffffffffffffffff'"
-  })
-  void injectHttpHeadersWithExtractedOriginal(String traceId, String spanId) {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(TRACE_ID_KEY.toUpperCase(), traceId);
-    headers.put(SPAN_ID_KEY.toUpperCase(), spanId);
-    DynamicConfig<DynamicConfig.Snapshot> dynamicConfig =
-        DynamicConfig.create().setHeaderTags(emptyMap()).setBaggageMapping(emptyMap()).apply();
-    HttpCodec.Extractor extractor =
-        B3HttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig);
-    TagContext context = extractor.extract(headers, stringValuesMap());
-
-    DDSpanContext mockedContext = mockedSpanContext(context);
-    Map<String, String> carrier = new HashMap<>();
-    this.injector.inject(mockedContext, carrier, MAP_SETTER);
-
-    String traceIdHex = traceIdOrPadded(traceId, tracePropagationB3Padding());
-    String spanIdHex = spanIdOrPadded(trimHex(spanId), tracePropagationB3Padding());
-    assertEquals(traceIdHex, carrier.get(TRACE_ID_KEY));
-    assertEquals(spanIdHex, carrier.get(SPAN_ID_KEY));
-    assertEquals(traceIdHex + "-" + spanIdHex, carrier.get(B3_KEY));
-    assertEquals(3, carrier.size());
-  }
-
-  private DDSpanContext mockedSpanContext(TagContext context) {
-    return mockedSpanContext(context.getTraceId(), context.getSpanId(), UNSET);
-  }
-
-  private DDSpanContext mockedSpanContext(DDTraceId traceId, long spanId, int samplingPriority) {
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("k1", "v1");
-    baggage.put("k2", "v2");
-    return mockSpanContext(
-        traceId,
-        spanId,
-        samplingPriority,
-        "fakeOrigin",
-        baggage,
-        PropagationTags.factory().empty());
-  }
-
-  static class B3HttpInjectorNonPaddedTest extends B3HttpInjectorTest {
+
     @Override
-    protected boolean tracePropagationB3Padding() {
-      return false;
+    protected HttpCodec.Injector newInjector() {
+        return B3HttpCodec.newCombinedInjector(tracePropagationB3Padding());
+    }
+
+    @TableTest({
+      "scenario          | traceId | spanId | samplingPriority | expectedSamplingPriority",
+      "unset             | 1       | 2      | UNSET            |                         ",
+      "sampler keep      | 2       | 3      | SAMPLER_KEEP     | SAMPLER_KEEP            ",
+      "sampler drop      | 4       | 5      | SAMPLER_DROP     | SAMPLER_DROP            ",
+      "user keep         | 5       | 6      | USER_KEEP        | SAMPLER_KEEP            ",
+      "user drop         | 6       | 7      | USER_DROP        | SAMPLER_DROP            ",
+      "uint64 max unset  | -1      | -2     | UNSET            |                         ",
+      "uint64 max-1 keep | -2      | -1     | SAMPLER_KEEP     | SAMPLER_KEEP            "
+    })
+    void injectHttpHeaders(
+            long traceId,
+            long spanId,
+            @ConvertWith(PrioritySamplingConverter.class) byte samplingPriority,
+            @ConvertWith(PrioritySamplingConverter.class) Byte expectedSamplingPriority) {
+
+        DDSpanContext spanContext = mockedSpanContext(DDTraceId.from(traceId), spanId, samplingPriority);
+
+        Map<String, String> carrier = new HashMap<>();
+        this.injector.inject(spanContext, carrier, MAP_SETTER);
+
+        String traceIdHex = traceIdOrPadded(traceId, tracePropagationB3Padding());
+        String spanIdHex = spanIdOrPadded(spanId, tracePropagationB3Padding());
+        assertEquals(traceIdHex, carrier.get(TRACE_ID_KEY));
+        assertEquals(spanIdHex, carrier.get(SPAN_ID_KEY));
+
+        if (expectedSamplingPriority != null) {
+            assertEquals(4, carrier.size());
+            assertEquals(expectedSamplingPriority.toString(), carrier.get(SAMPLING_PRIORITY_KEY));
+            assertEquals(traceIdHex + "-" + spanIdHex + "-" + expectedSamplingPriority, carrier.get(B3_KEY));
+        } else {
+            assertEquals(3, carrier.size());
+            assertEquals(traceIdHex + "-" + spanIdHex, carrier.get(B3_KEY));
+        }
+    }
+
+    @TableTest({
+      "scenario             | traceId                            | spanId               ",
+      "padded 64-bit        | '00001'                            | '00001'              ",
+      "64-bit               | '463ac35c9f6413ad'                 | '463ac35c9f6413ad'   ",
+      "128-bit              | '463ac35c9f6413ad48485a3953bb6124' | '1'                  ",
+      "uint64 max traceId   | 'ffffffffffffffff'                 | '1'                  ",
+      "128-bit high+low max | 'aaaaaaaaaaaaaaaaffffffffffffffff' | '1'                  ",
+      "uint64 max spanId    | '1'                                | 'ffffffffffffffff'   ",
+      "padded uint64 max    | '1'                                | '000ffffffffffffffff'"
+    })
+    void injectHttpHeadersWithExtractedOriginal(String traceId, String spanId) {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(TRACE_ID_KEY.toUpperCase(), traceId);
+        headers.put(SPAN_ID_KEY.toUpperCase(), spanId);
+        DynamicConfig<DynamicConfig.Snapshot> dynamicConfig = DynamicConfig.create()
+                .setHeaderTags(emptyMap())
+                .setBaggageMapping(emptyMap())
+                .apply();
+        HttpCodec.Extractor extractor = B3HttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig);
+        TagContext context = extractor.extract(headers, stringValuesMap());
+
+        DDSpanContext mockedContext = mockedSpanContext(context);
+        Map<String, String> carrier = new HashMap<>();
+        this.injector.inject(mockedContext, carrier, MAP_SETTER);
+
+        String traceIdHex = traceIdOrPadded(traceId, tracePropagationB3Padding());
+        String spanIdHex = spanIdOrPadded(trimHex(spanId), tracePropagationB3Padding());
+        assertEquals(traceIdHex, carrier.get(TRACE_ID_KEY));
+        assertEquals(spanIdHex, carrier.get(SPAN_ID_KEY));
+        assertEquals(traceIdHex + "-" + spanIdHex, carrier.get(B3_KEY));
+        assertEquals(3, carrier.size());
+    }
+
+    private DDSpanContext mockedSpanContext(TagContext context) {
+        return mockedSpanContext(context.getTraceId(), context.getSpanId(), UNSET);
+    }
+
+    private DDSpanContext mockedSpanContext(DDTraceId traceId, long spanId, int samplingPriority) {
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("k1", "v1");
+        baggage.put("k2", "v2");
+        return mockSpanContext(
+                traceId,
+                spanId,
+                samplingPriority,
+                "fakeOrigin",
+                baggage,
+                PropagationTags.factory().empty());
+    }
+
+    static class B3HttpInjectorNonPaddedTest extends B3HttpInjectorTest {
+        @Override
+        protected boolean tracePropagationB3Padding() {
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3TestHelper.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3TestHelper.java
index f8867c2b1cf..72f1116c9cf 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3TestHelper.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3TestHelper.java
@@ -8,65 +8,65 @@
  */
 public final class B3TestHelper {
 
-  private B3TestHelper() {}
+    private B3TestHelper() {}
 
-  static String traceIdOrPadded(DDTraceId id, boolean padding) {
-    if (id.toHighOrderLong() == 0) {
-      return idOrPadded(Long.toHexString(id.toLong()), 32, padding);
+    static String traceIdOrPadded(DDTraceId id, boolean padding) {
+        if (id.toHighOrderLong() == 0) {
+            return idOrPadded(Long.toHexString(id.toLong()), 32, padding);
+        }
+        return id.toHexString();
     }
-    return id.toHexString();
-  }
 
-  static String traceIdOrPadded(long id, boolean padding) {
-    return idOrPadded(id, 32, padding);
-  }
-
-  static String traceIdOrPadded(String hexTraceId, boolean padding) {
-    return idOrPadded(hexTraceId, 32, padding);
-  }
-
-  static String spanIdOrPadded(long id, boolean padding) {
-    return idOrPadded(id, 16, padding);
-  }
+    static String traceIdOrPadded(long id, boolean padding) {
+        return idOrPadded(id, 32, padding);
+    }
 
-  static String spanIdOrPadded(String hexSpanId, boolean padding) {
-    return idOrPadded(hexSpanId, 16, padding);
-  }
+    static String traceIdOrPadded(String hexTraceId, boolean padding) {
+        return idOrPadded(hexTraceId, 32, padding);
+    }
 
-  private static String idOrPadded(long id, int size, boolean padding) {
-    return idOrPadded(Long.toHexString(id), size, padding);
-  }
+    static String spanIdOrPadded(long id, boolean padding) {
+        return idOrPadded(id, 16, padding);
+    }
 
-  private static String idOrPadded(String id, int size, boolean padding) {
-    if (!padding) {
-      return id.toLowerCase();
+    static String spanIdOrPadded(String hexSpanId, boolean padding) {
+        return idOrPadded(hexSpanId, 16, padding);
     }
-    return padHexLower(id, size);
-  }
 
-  private static String padHexLower(String hex, int size) {
-    String lower = hex.toLowerCase();
-    int diff = size - lower.length();
-    if (diff <= 0) {
-      return lower;
+    private static String idOrPadded(long id, int size, boolean padding) {
+        return idOrPadded(Long.toHexString(id), size, padding);
     }
-    StringBuilder sb = new StringBuilder(size);
-    for (int i = 0; i < diff; i++) {
-      sb.append('0');
+
+    private static String idOrPadded(String id, int size, boolean padding) {
+        if (!padding) {
+            return id.toLowerCase();
+        }
+        return padHexLower(id, size);
     }
-    sb.append(lower);
-    return sb.toString();
-  }
 
-  static String trimHex(String hex) {
-    int length = hex.length();
-    int firstNonZero = 0;
-    while (firstNonZero < length && hex.charAt(firstNonZero) == '0') {
-      firstNonZero++;
+    private static String padHexLower(String hex, int size) {
+        String lower = hex.toLowerCase();
+        int diff = size - lower.length();
+        if (diff <= 0) {
+            return lower;
+        }
+        StringBuilder sb = new StringBuilder(size);
+        for (int i = 0; i < diff; i++) {
+            sb.append('0');
+        }
+        sb.append(lower);
+        return sb.toString();
     }
-    if (firstNonZero == length) {
-      return "0";
+
+    static String trimHex(String hex) {
+        int length = hex.length();
+        int firstNonZero = 0;
+        while (firstNonZero < length && hex.charAt(firstNonZero) == '0') {
+            firstNonZero++;
+        }
+        if (firstNonZero == length) {
+            return "0";
+        }
+        return hex.substring(firstNonZero, length);
     }
-    return hex.substring(firstNonZero, length);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/ConsumedHeaderTagMappingTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/ConsumedHeaderTagMappingTest.java
index ccaa756be71..d5a7fc74e5d 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/ConsumedHeaderTagMappingTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/ConsumedHeaderTagMappingTest.java
@@ -44,199 +44,185 @@
  */
 @WithConfig(key = PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED, value = "true")
 class ConsumedHeaderTagMappingTest extends DDJavaSpecification {
-  private boolean origAppSecActive;
-  private HttpCodec.Extractor extractor;
-
-  @BeforeEach
-  void enableAppSec() {
-    this.origAppSecActive = APPSEC_ACTIVE;
-    APPSEC_ACTIVE = true;
-  }
-
-  @AfterEach
-  void restoreAppSec() {
-    if (this.extractor != null) {
-      this.extractor.cleanup();
+    private boolean origAppSecActive;
+    private HttpCodec.Extractor extractor;
+
+    @BeforeEach
+    void enableAppSec() {
+        this.origAppSecActive = APPSEC_ACTIVE;
+        APPSEC_ACTIVE = true;
+    }
+
+    @AfterEach
+    void restoreAppSec() {
+        if (this.extractor != null) {
+            this.extractor.cleanup();
+        }
+        APPSEC_ACTIVE = this.origAppSecActive;
     }
-    APPSEC_ACTIVE = this.origAppSecActive;
-  }
-
-  static Stream<Arguments> styles() {
-    return Stream.of(
-        arguments(
-            new Style(
-                "Datadog",
-                DatadogHttpCodec::newExtractor,
-                headers(DatadogHttpCodec.TRACE_ID_KEY, "1", DatadogHttpCodec.SPAN_ID_KEY, "2"),
-                true)),
-        arguments(
-            new Style(
-                "B3Multi",
-                B3HttpCodec::newMultiExtractor,
-                headers(B3HttpCodec.TRACE_ID_KEY, "1", B3HttpCodec.SPAN_ID_KEY, "2"),
-                true)),
-        arguments(
-            new Style(
-                "B3Single",
-                B3HttpCodec::newSingleExtractor,
-                headers(B3HttpCodec.B3_KEY, "1-2-1"),
-                true)),
-        arguments(
-            new Style(
-                "W3C",
-                W3CHttpCodec::newExtractor,
-                headers(
-                    W3CHttpCodec.TRACE_PARENT_KEY,
-                    "00-00000000000000000000000000000001-0000000000000002-01"),
-                true)),
-        arguments(
-            new Style(
-                "Haystack",
-                HaystackHttpCodec::newExtractor,
-                headers(HaystackHttpCodec.TRACE_ID_KEY, "1", HaystackHttpCodec.SPAN_ID_KEY, "2"),
-                true)),
-        arguments(
-            new Style(
-                "XRay",
-                XRayHttpCodec::newExtractor,
-                headers(
-                    XRayHttpCodec.X_AMZN_TRACE_ID,
-                    "Root=1-00000000-000000000000000000000001;Parent=0000000000000002"),
-                true)),
-        arguments(new Style("None", NoneCodec::newExtractor, emptyMap(), false)));
-  }
-
-  /**
-   * Every header consumed by the {@code handled*} helpers, mapped to a distinct value. The tag name
-   * for each is {@code "tag." + headerKey}.
-   */
-  private static Map<String, String> consumedHeaderValues() {
-    Map<String, String> values = new LinkedHashMap<>();
-    values.put(HttpCodec.USER_AGENT_KEY, "test-agent"); // handledUserAgent
-    values.put(HttpCodec.X_FORWARDED_PROTO_KEY, "https"); // handledXForwarding
-    values.put(HttpCodec.X_FORWARDED_HOST_KEY, "example.com");
-    values.put(HttpCodec.X_FORWARDED_FOR_KEY, "1.1.1.1");
-    values.put(HttpCodec.X_FORWARDED_PORT_KEY, "8443");
-    values.put(HttpCodec.FORWARDED_KEY, "for=2.2.2.2"); // handledForwarding
-    values.put(HttpCodec.FORWARDED_FOR_KEY, "3.3.3.3");
-    values.put(HttpCodec.X_CLUSTER_CLIENT_IP_KEY, "4.4.4.4"); // handledIpHeaders
-    values.put(HttpCodec.X_REAL_IP_KEY, "5.5.5.5");
-    values.put(HttpCodec.X_CLIENT_IP_KEY, "6.6.6.6");
-    values.put(HttpCodec.TRUE_CLIENT_IP_KEY, "7.7.7.7");
-    values.put(HttpCodec.FASTLY_CLIENT_IP_KEY, "8.8.8.8");
-    values.put(HttpCodec.CF_CONNECTING_IP_KEY, "9.9.9.9");
-    values.put(HttpCodec.CF_CONNECTING_IP_V6_KEY, "2001:db8::1");
-    return values;
-  }
-
-  private static String tagFor(String headerKey) {
-    return "tag." + headerKey;
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("styles")
-  void honoursHeaderTagsMappedOntoConsumedHeaders(Style style) {
-    Map<String, String> consumed = consumedHeaderValues();
-
-    Map<String, String> headerTags = new HashMap<>();
-    consumed.keySet().forEach(header -> headerTags.put(header, tagFor(header)));
-    this.extractor = buildExtractorWithHeaderTags(style.factory, headerTags);
-
-    Map<String, String> requestHeaders = new HashMap<>(style.minimalTraceHeaders);
-    requestHeaders.putAll(consumed);
-
-    TagContext context = this.extractor.extract(requestHeaders, stringValuesMap());
-
-    assertNotNull(context);
-    // The header tag mapped onto each consumed header must be honoured (APMS-20654).
-    consumed.forEach(
-        (header, value) ->
-            assertEquals(
+
+    static Stream<Arguments> styles() {
+        return Stream.of(
+                arguments(new Style(
+                        "Datadog",
+                        DatadogHttpCodec::newExtractor,
+                        headers(DatadogHttpCodec.TRACE_ID_KEY, "1", DatadogHttpCodec.SPAN_ID_KEY, "2"),
+                        true)),
+                arguments(new Style(
+                        "B3Multi",
+                        B3HttpCodec::newMultiExtractor,
+                        headers(B3HttpCodec.TRACE_ID_KEY, "1", B3HttpCodec.SPAN_ID_KEY, "2"),
+                        true)),
+                arguments(new Style(
+                        "B3Single", B3HttpCodec::newSingleExtractor, headers(B3HttpCodec.B3_KEY, "1-2-1"), true)),
+                arguments(new Style(
+                        "W3C",
+                        W3CHttpCodec::newExtractor,
+                        headers(
+                                W3CHttpCodec.TRACE_PARENT_KEY,
+                                "00-00000000000000000000000000000001-0000000000000002-01"),
+                        true)),
+                arguments(new Style(
+                        "Haystack",
+                        HaystackHttpCodec::newExtractor,
+                        headers(HaystackHttpCodec.TRACE_ID_KEY, "1", HaystackHttpCodec.SPAN_ID_KEY, "2"),
+                        true)),
+                arguments(new Style(
+                        "XRay",
+                        XRayHttpCodec::newExtractor,
+                        headers(
+                                XRayHttpCodec.X_AMZN_TRACE_ID,
+                                "Root=1-00000000-000000000000000000000001;Parent=0000000000000002"),
+                        true)),
+                arguments(new Style("None", NoneCodec::newExtractor, emptyMap(), false)));
+    }
+
+    /**
+     * Every header consumed by the {@code handled*} helpers, mapped to a distinct value. The tag name
+     * for each is {@code "tag." + headerKey}.
+     */
+    private static Map<String, String> consumedHeaderValues() {
+        Map<String, String> values = new LinkedHashMap<>();
+        values.put(HttpCodec.USER_AGENT_KEY, "test-agent"); // handledUserAgent
+        values.put(HttpCodec.X_FORWARDED_PROTO_KEY, "https"); // handledXForwarding
+        values.put(HttpCodec.X_FORWARDED_HOST_KEY, "example.com");
+        values.put(HttpCodec.X_FORWARDED_FOR_KEY, "1.1.1.1");
+        values.put(HttpCodec.X_FORWARDED_PORT_KEY, "8443");
+        values.put(HttpCodec.FORWARDED_KEY, "for=2.2.2.2"); // handledForwarding
+        values.put(HttpCodec.FORWARDED_FOR_KEY, "3.3.3.3");
+        values.put(HttpCodec.X_CLUSTER_CLIENT_IP_KEY, "4.4.4.4"); // handledIpHeaders
+        values.put(HttpCodec.X_REAL_IP_KEY, "5.5.5.5");
+        values.put(HttpCodec.X_CLIENT_IP_KEY, "6.6.6.6");
+        values.put(HttpCodec.TRUE_CLIENT_IP_KEY, "7.7.7.7");
+        values.put(HttpCodec.FASTLY_CLIENT_IP_KEY, "8.8.8.8");
+        values.put(HttpCodec.CF_CONNECTING_IP_KEY, "9.9.9.9");
+        values.put(HttpCodec.CF_CONNECTING_IP_V6_KEY, "2001:db8::1");
+        return values;
+    }
+
+    private static String tagFor(String headerKey) {
+        return "tag." + headerKey;
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("styles")
+    void honoursHeaderTagsMappedOntoConsumedHeaders(Style style) {
+        Map<String, String> consumed = consumedHeaderValues();
+
+        Map<String, String> headerTags = new HashMap<>();
+        consumed.keySet().forEach(header -> headerTags.put(header, tagFor(header)));
+        this.extractor = buildExtractorWithHeaderTags(style.factory, headerTags);
+
+        Map<String, String> requestHeaders = new HashMap<>(style.minimalTraceHeaders);
+        requestHeaders.putAll(consumed);
+
+        TagContext context = this.extractor.extract(requestHeaders, stringValuesMap());
+
+        assertNotNull(context);
+        // The header tag mapped onto each consumed header must be honoured (APMS-20654).
+        consumed.forEach((header, value) -> assertEquals(
                 value,
                 context.getTags().getString(tagFor(header)),
                 "header tag mapped onto '" + header + "' should be honoured"));
 
-    // The semantic capture of each header must be preserved.
-    assertEquals("test-agent", context.getUserAgent());
-    assertEquals("https", context.getXForwardedProto());
-    assertEquals("example.com", context.getXForwardedHost());
-    assertEquals("1.1.1.1", context.getXForwardedFor());
-    assertEquals("8443", context.getXForwardedPort());
-    assertEquals("for=2.2.2.2", context.getForwarded());
-    assertEquals("3.3.3.3", context.getForwardedFor());
-    assertEquals("4.4.4.4", context.getXClusterClientIp());
-    assertEquals("5.5.5.5", context.getXRealIp());
-    assertEquals("6.6.6.6", context.getXClientIp());
-    assertEquals("7.7.7.7", context.getTrueClientIp());
-    assertEquals("8.8.8.8", context.getFastlyClientIp());
-    assertEquals("9.9.9.9", context.getCfConnectingIp());
-    assertEquals("2001:db8::1", context.getCfConnectingIpv6());
-
-    // The trace context must still be extracted (styles that carry one).
-    if (style.buildsExtractedContext) {
-      ExtractedContext extracted = assertInstanceOf(ExtractedContext.class, context);
-      assertEquals(1L, extracted.getTraceId().toLong());
-      assertEquals(2L, extracted.getSpanId());
-    } else {
-      assertFalse(context instanceof ExtractedContext);
+        // The semantic capture of each header must be preserved.
+        assertEquals("test-agent", context.getUserAgent());
+        assertEquals("https", context.getXForwardedProto());
+        assertEquals("example.com", context.getXForwardedHost());
+        assertEquals("1.1.1.1", context.getXForwardedFor());
+        assertEquals("8443", context.getXForwardedPort());
+        assertEquals("for=2.2.2.2", context.getForwarded());
+        assertEquals("3.3.3.3", context.getForwardedFor());
+        assertEquals("4.4.4.4", context.getXClusterClientIp());
+        assertEquals("5.5.5.5", context.getXRealIp());
+        assertEquals("6.6.6.6", context.getXClientIp());
+        assertEquals("7.7.7.7", context.getTrueClientIp());
+        assertEquals("8.8.8.8", context.getFastlyClientIp());
+        assertEquals("9.9.9.9", context.getCfConnectingIp());
+        assertEquals("2001:db8::1", context.getCfConnectingIpv6());
+
+        // The trace context must still be extracted (styles that carry one).
+        if (style.buildsExtractedContext) {
+            ExtractedContext extracted = assertInstanceOf(ExtractedContext.class, context);
+            assertEquals(1L, extracted.getTraceId().toLong());
+            assertEquals(2L, extracted.getSpanId());
+        } else {
+            assertFalse(context instanceof ExtractedContext);
+        }
     }
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("styles")
-  @WithConfig(key = TRACE_CLIENT_IP_HEADER, value = "my-header")
-  void honoursHeaderTagMappedOntoCustomIpHeader(Style style) {
-    // The extractor must be built after @WithConfig is applied: ContextInterpreter reads the
-    // custom client-IP header name in its constructor.
-    this.extractor =
-        buildExtractorWithHeaderTags(
-            style.factory, singletonHeaderTag("my-header", "tag.my-header"));
-
-    Map<String, String> requestHeaders = new HashMap<>(style.minimalTraceHeaders);
-    requestHeaders.put("my-header", "8.8.8.8");
-
-    TagContext context = this.extractor.extract(requestHeaders, stringValuesMap());
-
-    assertNotNull(context);
-    assertEquals("8.8.8.8", context.getTags().getString("tag.my-header"));
-    assertEquals("8.8.8.8", context.getCustomIpHeader());
-  }
-
-  private static Map<String, String> singletonHeaderTag(String header, String tag) {
-    Map<String, String> mapping = new HashMap<>();
-    mapping.put(header, tag);
-    return mapping;
-  }
-
-  static HttpCodec.Extractor buildExtractorWithHeaderTags(
-      BiFunction<Config, Supplier<TraceConfig>, HttpCodec.Extractor> factory,
-      Map<String, String> headerTags) {
-    DynamicConfig<DynamicConfig.Snapshot> dynamicConfig =
-        DynamicConfig.create().setHeaderTags(headerTags).apply();
-    return factory.apply(Config.get(), dynamicConfig::captureTraceConfig);
-  }
-
-  /** A propagation style under test: its extractor factory and minimal valid trace headers. */
-  static final class Style {
-    final String name;
-    final BiFunction<Config, Supplier<TraceConfig>, HttpCodec.Extractor> factory;
-    final Map<String, String> minimalTraceHeaders;
-    final boolean buildsExtractedContext;
-
-    Style(
-        String name,
-        BiFunction<Config, Supplier<TraceConfig>, HttpCodec.Extractor> factory,
-        Map<String, String> minimalTraceHeaders,
-        boolean buildsExtractedContext) {
-      this.name = name;
-      this.factory = factory;
-      this.minimalTraceHeaders = minimalTraceHeaders;
-      this.buildsExtractedContext = buildsExtractedContext;
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("styles")
+    @WithConfig(key = TRACE_CLIENT_IP_HEADER, value = "my-header")
+    void honoursHeaderTagMappedOntoCustomIpHeader(Style style) {
+        // The extractor must be built after @WithConfig is applied: ContextInterpreter reads the
+        // custom client-IP header name in its constructor.
+        this.extractor = buildExtractorWithHeaderTags(style.factory, singletonHeaderTag("my-header", "tag.my-header"));
+
+        Map<String, String> requestHeaders = new HashMap<>(style.minimalTraceHeaders);
+        requestHeaders.put("my-header", "8.8.8.8");
+
+        TagContext context = this.extractor.extract(requestHeaders, stringValuesMap());
+
+        assertNotNull(context);
+        assertEquals("8.8.8.8", context.getTags().getString("tag.my-header"));
+        assertEquals("8.8.8.8", context.getCustomIpHeader());
+    }
+
+    private static Map<String, String> singletonHeaderTag(String header, String tag) {
+        Map<String, String> mapping = new HashMap<>();
+        mapping.put(header, tag);
+        return mapping;
+    }
+
+    static HttpCodec.Extractor buildExtractorWithHeaderTags(
+            BiFunction<Config, Supplier<TraceConfig>, HttpCodec.Extractor> factory, Map<String, String> headerTags) {
+        DynamicConfig<DynamicConfig.Snapshot> dynamicConfig =
+                DynamicConfig.create().setHeaderTags(headerTags).apply();
+        return factory.apply(Config.get(), dynamicConfig::captureTraceConfig);
     }
 
-    @Override
-    public String toString() {
-      return this.name;
+    /** A propagation style under test: its extractor factory and minimal valid trace headers. */
+    static final class Style {
+        final String name;
+        final BiFunction<Config, Supplier<TraceConfig>, HttpCodec.Extractor> factory;
+        final Map<String, String> minimalTraceHeaders;
+        final boolean buildsExtractedContext;
+
+        Style(
+                String name,
+                BiFunction<Config, Supplier<TraceConfig>, HttpCodec.Extractor> factory,
+                Map<String, String> minimalTraceHeaders,
+                boolean buildsExtractedContext) {
+            this.name = name;
+            this.factory = factory;
+            this.minimalTraceHeaders = minimalTraceHeaders;
+            this.buildsExtractedContext = buildsExtractedContext;
+        }
+
+        @Override
+        public String toString() {
+            return this.name;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/ControllableSampler.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/ControllableSampler.java
index e649844069f..f138fef3578 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/ControllableSampler.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/ControllableSampler.java
@@ -8,15 +8,15 @@
 import datadog.trace.core.CoreSpan;
 
 public class ControllableSampler implements Sampler, PrioritySampler {
-  protected int nextSamplingPriority = SAMPLER_KEEP;
+    protected int nextSamplingPriority = SAMPLER_KEEP;
 
-  @Override
-  public <T extends CoreSpan<T>> void setSamplingPriority(T span) {
-    span.setSamplingPriority(nextSamplingPriority, DEFAULT);
-  }
+    @Override
+    public <T extends CoreSpan<T>> void setSamplingPriority(T span) {
+        span.setSamplingPriority(nextSamplingPriority, DEFAULT);
+    }
 
-  @Override
-  public <T extends CoreSpan<T>> boolean sample(T span) {
-    return true;
-  }
+    @Override
+    public <T extends CoreSpan<T>> boolean sample(T span) {
+        return true;
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpExtractorTest.java
index 356f6aeeda6..4f4fff3ab02 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpExtractorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpExtractorTest.java
@@ -47,25 +47,24 @@
 import org.tabletest.junit.TableTest;
 
 class DatadogHttpExtractorTest extends AbstractHttpExtractorTest {
-  @Override
-  protected HttpCodec.Extractor newExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier) {
-    return DatadogHttpCodec.newExtractor(config, traceConfigSupplier);
-  }
-
-  @TableTest({
-    "scenario          | traceId | spanId  | samplingPriority | origin  ",
-    "unset no origin   | '1'     | '2'     | UNSET            |         ",
-    "keep with origin  | '2'     | '3'     | SAMPLER_KEEP     | 'saipan'",
-    "uint64 max unset  | 'MAX'   | 'MAX-1' | UNSET            | 'saipan'",
-    "uint64 max-1 keep | 'MAX-1' | 'MAX'   | SAMPLER_KEEP     | 'saipan'"
-  })
-  void extractHttpHeaders(
-      @ConvertWith(TraceIdConverter.class) String traceId,
-      @ConvertWith(TraceIdConverter.class) String spanId,
-      @ConvertWith(PrioritySamplingConverter.class) byte samplingPriority,
-      String origin) {
-    // spotless:off
+    @Override
+    protected HttpCodec.Extractor newExtractor(Config config, Supplier<TraceConfig> traceConfigSupplier) {
+        return DatadogHttpCodec.newExtractor(config, traceConfigSupplier);
+    }
+
+    @TableTest({
+      "scenario          | traceId | spanId  | samplingPriority | origin  ",
+      "unset no origin   | '1'     | '2'     | UNSET            |         ",
+      "keep with origin  | '2'     | '3'     | SAMPLER_KEEP     | 'saipan'",
+      "uint64 max unset  | 'MAX'   | 'MAX-1' | UNSET            | 'saipan'",
+      "uint64 max-1 keep | 'MAX-1' | 'MAX'   | SAMPLER_KEEP     | 'saipan'"
+    })
+    void extractHttpHeaders(
+            @ConvertWith(TraceIdConverter.class) String traceId,
+            @ConvertWith(TraceIdConverter.class) String spanId,
+            @ConvertWith(PrioritySamplingConverter.class) byte samplingPriority,
+            String origin) {
+        // spotless:off
     Map<String, String> headers = headers(
         "", "empty key",
         TRACE_ID_KEY, traceId,
@@ -80,32 +79,33 @@ void extractHttpHeaders(
     );
     // spotless:on
 
-    ExtractedContext context = (ExtractedContext) extractor.extract(headers, stringValuesMap());
-
-    assertEquals(DDTraceId.from(traceId), context.getTraceId());
-    assertEquals(DDSpanId.from(spanId), context.getSpanId());
-    Map<String, String> expectedBaggage = new HashMap<>();
-    expectedBaggage.put("k1", "v1");
-    expectedBaggage.put("k2", "v2");
-    expectedBaggage.put(SOME_BAGGAGE, "my-interesting-baggage-info");
-    expectedBaggage.put(SOME_CASE_SENSITIVE_BAGGAGE, "my-interesting-baggage-info-2");
-    assertEquals(expectedBaggage, context.getBaggage());
-    assertEquals(singletonMap(SOME_TAG, "my-interesting-info,and-more"), context.getTags());
-    assertEquals(samplingPriority, context.getSamplingPriority());
-    assertEquals(origin, asString(context.getOrigin()));
-  }
-
-  @WithConfig(key = REQUEST_HEADER_TAGS_COMMA_ALLOWED, value = "false")
-  @Test
-  void extractHttpHeadersWithoutComma() {
-    // Recreate extractor with the new comma config
-    this.extractor.cleanup();
-    DynamicConfig<DynamicConfig.Snapshot> dynamicConfig =
-        DynamicConfig.create().setHeaderTags(singletonMap(SOME_HEADER, SOME_TAG)).apply();
-    this.extractor = DatadogHttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig);
-
-    String headerWithComma = "my-interesting-info,and-more";
-    // spotless:off
+        ExtractedContext context = (ExtractedContext) extractor.extract(headers, stringValuesMap());
+
+        assertEquals(DDTraceId.from(traceId), context.getTraceId());
+        assertEquals(DDSpanId.from(spanId), context.getSpanId());
+        Map<String, String> expectedBaggage = new HashMap<>();
+        expectedBaggage.put("k1", "v1");
+        expectedBaggage.put("k2", "v2");
+        expectedBaggage.put(SOME_BAGGAGE, "my-interesting-baggage-info");
+        expectedBaggage.put(SOME_CASE_SENSITIVE_BAGGAGE, "my-interesting-baggage-info-2");
+        assertEquals(expectedBaggage, context.getBaggage());
+        assertEquals(singletonMap(SOME_TAG, "my-interesting-info,and-more"), context.getTags());
+        assertEquals(samplingPriority, context.getSamplingPriority());
+        assertEquals(origin, asString(context.getOrigin()));
+    }
+
+    @WithConfig(key = REQUEST_HEADER_TAGS_COMMA_ALLOWED, value = "false")
+    @Test
+    void extractHttpHeadersWithoutComma() {
+        // Recreate extractor with the new comma config
+        this.extractor.cleanup();
+        DynamicConfig<DynamicConfig.Snapshot> dynamicConfig = DynamicConfig.create()
+                .setHeaderTags(singletonMap(SOME_HEADER, SOME_TAG))
+                .apply();
+        this.extractor = DatadogHttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig);
+
+        String headerWithComma = "my-interesting-info,and-more";
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, "1",
         SPAN_ID_KEY, "2",
@@ -113,27 +113,26 @@ void extractHttpHeadersWithoutComma() {
     );
     // spotless:on
 
-    ExtractedContext context =
-        (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
-
-    String expectedHeader = "my-interesting-info";
-    assertEquals(expectedHeader, context.getTags().getString(SOME_TAG));
-  }
-
-  @Test
-  void extractHeaderTagMappedOnAwsTraceHeader() {
-    // X-Amzn-Trace-Id is consumed as AWS X-Ray context, but a header tag mapped onto it must still
-    // be honoured. This is the load-balancer header example from the AWS documentation: it carries
-    // a Self field and is not in the padded format this codec extracts ids from, so only the tag
-    // is expected from it.
-    this.extractor.cleanup();
-    DynamicConfig<DynamicConfig.Snapshot> dynamicConfig =
-        DynamicConfig.create().setHeaderTags(singletonMap(X_AMZN_TRACE_ID, SOME_TAG)).apply();
-    this.extractor = DatadogHttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig);
-
-    String awsTraceHeader =
-        "Self=1-67891233-12456789abcdef012345678;Root=1-67891233-abcdef012345678912345678";
-    // spotless:off
+        ExtractedContext context = (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
+
+        String expectedHeader = "my-interesting-info";
+        assertEquals(expectedHeader, context.getTags().getString(SOME_TAG));
+    }
+
+    @Test
+    void extractHeaderTagMappedOnAwsTraceHeader() {
+        // X-Amzn-Trace-Id is consumed as AWS X-Ray context, but a header tag mapped onto it must still
+        // be honoured. This is the load-balancer header example from the AWS documentation: it carries
+        // a Self field and is not in the padded format this codec extracts ids from, so only the tag
+        // is expected from it.
+        this.extractor.cleanup();
+        DynamicConfig<DynamicConfig.Snapshot> dynamicConfig = DynamicConfig.create()
+                .setHeaderTags(singletonMap(X_AMZN_TRACE_ID, SOME_TAG))
+                .apply();
+        this.extractor = DatadogHttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig);
+
+        String awsTraceHeader = "Self=1-67891233-12456789abcdef012345678;Root=1-67891233-abcdef012345678912345678";
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, "1",
         SPAN_ID_KEY, "2",
@@ -141,46 +140,45 @@ void extractHeaderTagMappedOnAwsTraceHeader() {
     );
     // spotless:on
 
-    ExtractedContext context =
-        (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
+        ExtractedContext context = (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
 
-    assertEquals(awsTraceHeader, context.getTags().getString(SOME_TAG));
-    assertEquals(DDTraceId.from("1"), context.getTraceId());
-    assertEquals(DDSpanId.from("2"), context.getSpanId());
-  }
+        assertEquals(awsTraceHeader, context.getTags().getString(SOME_TAG));
+        assertEquals(DDTraceId.from("1"), context.getTraceId());
+        assertEquals(DDSpanId.from("2"), context.getSpanId());
+    }
 
-  @ParameterizedTest
-  @ValueSource(booleans = {false, true})
-  void extractHeaderTagsWithNoPropagation(boolean withOrigin) {
-    // spotless:off
+    @ParameterizedTest
+    @ValueSource(booleans = {false, true})
+    void extractHeaderTagsWithNoPropagation(boolean withOrigin) {
+        // spotless:off
     Map<String, String> headers = headers(
         ORIGIN_KEY, withOrigin ? "my-origin" : null,
         SOME_HEADER, "my-interesting-info"
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
 
-    assertFalse(context instanceof ExtractedContext);
-    assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
-    if (withOrigin) {
-      assertEquals("my-origin", asString(context.getOrigin()));
+        assertFalse(context instanceof ExtractedContext);
+        assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
+        if (withOrigin) {
+            assertEquals("my-origin", asString(context.getOrigin()));
+        }
     }
-  }
-
-  @TableTest({
-    "scenario            | hexId                             ",
-    "64-bit short        | '1'                               ",
-    "64-bit max chars    | '123456789abcdef0'                ",
-    "128-bit             | '123456789abcdef0123456789abcdef0'",
-    "128-bit zero middle | '64184f2400000000123456789abcdef0'",
-    "128-bit all f       | 'ffffffffffffffffffffffffffffffff'"
-  })
-  void extractHttpHeadersWith128BitTraceId(String hexId) {
-    DD128bTraceId traceId = DD128bTraceId.fromHex(hexId);
-    boolean is128bTrace = traceId.toHighOrderLong() != 0;
-
-    // spotless:off
+
+    @TableTest({
+      "scenario            | hexId                             ",
+      "64-bit short        | '1'                               ",
+      "64-bit max chars    | '123456789abcdef0'                ",
+      "128-bit             | '123456789abcdef0123456789abcdef0'",
+      "128-bit zero middle | '64184f2400000000123456789abcdef0'",
+      "128-bit all f       | 'ffffffffffffffffffffffffffffffff'"
+    })
+    void extractHttpHeadersWith128BitTraceId(String hexId) {
+        DD128bTraceId traceId = DD128bTraceId.fromHex(hexId);
+        boolean is128bTrace = traceId.toHighOrderLong() != 0;
+
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, traceId.toString(),
         SPAN_ID_KEY, "2",
@@ -193,22 +191,21 @@ void extractHttpHeadersWith128BitTraceId(String hexId) {
     );
     // spotless:on
 
-    ExtractedContext context =
-        (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
-
-    DDTraceId expectedTraceId = is128bTrace ? traceId : DD64bTraceId.from(traceId.toLong());
-    assertEquals(expectedTraceId, context.getTraceId());
-    assertEquals(DDSpanId.from("2"), context.getSpanId());
-    Map<String, String> expectedBaggage = new HashMap<>();
-    expectedBaggage.put("k1", "v1");
-    expectedBaggage.put("k2", "v2");
-    assertEquals(expectedBaggage, context.getBaggage());
-    assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
-  }
-
-  @Test
-  void extractHttpHeadersWithInvalidNonNumericId() {
-    // spotless:off
+        ExtractedContext context = (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
+
+        DDTraceId expectedTraceId = is128bTrace ? traceId : DD64bTraceId.from(traceId.toLong());
+        assertEquals(expectedTraceId, context.getTraceId());
+        assertEquals(DDSpanId.from("2"), context.getSpanId());
+        Map<String, String> expectedBaggage = new HashMap<>();
+        expectedBaggage.put("k1", "v1");
+        expectedBaggage.put("k2", "v2");
+        assertEquals(expectedBaggage, context.getBaggage());
+        assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
+    }
+
+    @Test
+    void extractHttpHeadersWithInvalidNonNumericId() {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, "traceId",
         SPAN_ID_KEY, "spanId",
@@ -218,14 +215,14 @@ void extractHttpHeadersWithInvalidNonNumericId() {
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
 
-    assertNull(context);
-  }
+        assertNull(context);
+    }
 
-  @Test
-  void extractHttpHeadersWithOutOfRangeTraceId() {
-    // spotless:off
+    @Test
+    void extractHttpHeadersWithOutOfRangeTraceId() {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, TRACE_ID_MAX_PLUS_1,
         SPAN_ID_KEY, "0",
@@ -235,14 +232,14 @@ void extractHttpHeadersWithOutOfRangeTraceId() {
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
 
-    assertNull(context);
-  }
+        assertNull(context);
+    }
 
-  @Test
-  void extractHttpHeadersWithOutOfRangeSpanId() {
-    // spotless:off
+    @Test
+    void extractHttpHeadersWithOutOfRangeSpanId() {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, "0",
         SPAN_ID_KEY, "-1",
@@ -252,51 +249,51 @@ void extractHttpHeadersWithOutOfRangeSpanId() {
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    assertNull(context);
-  }
-
-  @TableTest({
-    "scenario             | traceId | spanId  | expectExtraction",
-    "negative traceId     | '-1'    | '1'     | false           ",
-    "negative spanId      | '1'     | '-1'    | false           ",
-    "zero traceId         | '0'     | '1'     | false           ",
-    "zero spanId          | '1'     | '0'     | true            ",
-    "uint64 max traceId   | 'MAX'   | '1'     | true            ",
-    "out-of-range traceId | 'MAX+1' | '1'     | false           ",
-    "uint64 max spanId    | '1'     | 'MAX'   | true            ",
-    "out-of-range spanId  | '1'     | 'MAX+1' | false           "
-  })
-  void moreIdRangeValidation(
-      @ConvertWith(TraceIdConverter.class) String traceId,
-      @ConvertWith(TraceIdConverter.class) String spanId,
-      boolean expectExtraction) {
-    // spotless:off
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        assertNull(context);
+    }
+
+    @TableTest({
+      "scenario             | traceId | spanId  | expectExtraction",
+      "negative traceId     | '-1'    | '1'     | false           ",
+      "negative spanId      | '1'     | '-1'    | false           ",
+      "zero traceId         | '0'     | '1'     | false           ",
+      "zero spanId          | '1'     | '0'     | true            ",
+      "uint64 max traceId   | 'MAX'   | '1'     | true            ",
+      "out-of-range traceId | 'MAX+1' | '1'     | false           ",
+      "uint64 max spanId    | '1'     | 'MAX'   | true            ",
+      "out-of-range spanId  | '1'     | 'MAX+1' | false           "
+    })
+    void moreIdRangeValidation(
+            @ConvertWith(TraceIdConverter.class) String traceId,
+            @ConvertWith(TraceIdConverter.class) String spanId,
+            boolean expectExtraction) {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, traceId,
         SPAN_ID_KEY, spanId
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
 
-    if (expectExtraction) {
-      ExtractedContext extracted = assertInstanceOf(ExtractedContext.class, context);
-      assertEquals(DDTraceId.from(traceId), extracted.getTraceId());
-      assertEquals(DDSpanId.from(spanId), extracted.getSpanId());
-    } else {
-      assertNull(context);
+        if (expectExtraction) {
+            ExtractedContext extracted = assertInstanceOf(ExtractedContext.class, context);
+            assertEquals(DDTraceId.from(traceId), extracted.getTraceId());
+            assertEquals(DDSpanId.from(spanId), extracted.getSpanId());
+        } else {
+            assertNull(context);
+        }
     }
-  }
-
-  @TableTest({
-    "scenario   | traceId | spanId | endToEndStartTime",
-    "zero       | '1'     | '2'    | 0                ",
-    "epoch 2021 | '2'     | '3'    | 1610001234       "
-  })
-  void extractHttpHeadersWithEndToEnd(String traceId, String spanId, long endToEndStartTime) {
-    // spotless:off
+
+    @TableTest({
+      "scenario   | traceId | spanId | endToEndStartTime",
+      "zero       | '1'     | '2'    | 0                ",
+      "epoch 2021 | '2'     | '3'    | 1610001234       "
+    })
+    void extractHttpHeadersWithEndToEnd(String traceId, String spanId, long endToEndStartTime) {
+        // spotless:off
     Map<String, String> headers = headers(
         "", "empty key",
         TRACE_ID_KEY, traceId,
@@ -310,33 +307,32 @@ void extractHttpHeadersWithEndToEnd(String traceId, String spanId, long endToEnd
     );
     // spotless:on
 
-    ExtractedContext context =
-        (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
-
-    assertEquals(DDTraceId.from(traceId), context.getTraceId());
-    assertEquals(DDSpanId.from(spanId), context.getSpanId());
-    Map<String, String> expectedBaggage = new HashMap<>();
-    expectedBaggage.put("k1", "v1");
-    expectedBaggage.put("k2", "v2");
-    expectedBaggage.put(SOME_BAGGAGE, "my-interesting-baggage-info");
-    expectedBaggage.put(SOME_CASE_SENSITIVE_BAGGAGE, "my-interesting-baggage-info-2");
-    assertEquals(expectedBaggage, context.getBaggage());
-    assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
-    assertEquals(endToEndStartTime * 1000000L, context.getEndToEndStartTime());
-  }
-
-  @TableTest({
-    "scenario         | traceId | spanId  | ctxCreated",
-    "negative traceId | '-1'    | '1'     | false     ",
-    "negative spanId  | '1'     | '-1'    | false     ",
-    "zero traceId     | '0'     | '1'     | true      ",
-    "uint64 max-1 ids | 'MAX-1' | 'MAX-1' | true      "
-  })
-  void baggageIsMappedOnContextCreation(
-      @ConvertWith(TraceIdConverter.class) String traceId,
-      @ConvertWith(TraceIdConverter.class) String spanId,
-      boolean ctxCreated) {
-    // spotless:off
+        ExtractedContext context = (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
+
+        assertEquals(DDTraceId.from(traceId), context.getTraceId());
+        assertEquals(DDSpanId.from(spanId), context.getSpanId());
+        Map<String, String> expectedBaggage = new HashMap<>();
+        expectedBaggage.put("k1", "v1");
+        expectedBaggage.put("k2", "v2");
+        expectedBaggage.put(SOME_BAGGAGE, "my-interesting-baggage-info");
+        expectedBaggage.put(SOME_CASE_SENSITIVE_BAGGAGE, "my-interesting-baggage-info-2");
+        assertEquals(expectedBaggage, context.getBaggage());
+        assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
+        assertEquals(endToEndStartTime * 1000000L, context.getEndToEndStartTime());
+    }
+
+    @TableTest({
+      "scenario         | traceId | spanId  | ctxCreated",
+      "negative traceId | '-1'    | '1'     | false     ",
+      "negative spanId  | '1'     | '-1'    | false     ",
+      "zero traceId     | '0'     | '1'     | true      ",
+      "uint64 max-1 ids | 'MAX-1' | 'MAX-1' | true      "
+    })
+    void baggageIsMappedOnContextCreation(
+            @ConvertWith(TraceIdConverter.class) String traceId,
+            @ConvertWith(TraceIdConverter.class) String spanId,
+            boolean ctxCreated) {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, traceId,
         SPAN_ID_KEY, spanId,
@@ -347,48 +343,48 @@ void baggageIsMappedOnContextCreation(
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    if (ctxCreated) {
-      assertNotNull(context);
-      Map<String, String> expectedBaggage = new HashMap<>();
-      expectedBaggage.put(SOME_BAGGAGE, "mappedBaggageValue");
-      expectedBaggage.put("k1", "v1");
-      expectedBaggage.put("k2", "v2");
-      assertEquals(expectedBaggage, context.getBaggage());
-    } else {
-      assertNull(context);
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        if (ctxCreated) {
+            assertNotNull(context);
+            Map<String, String> expectedBaggage = new HashMap<>();
+            expectedBaggage.put(SOME_BAGGAGE, "mappedBaggageValue");
+            expectedBaggage.put("k1", "v1");
+            expectedBaggage.put("k2", "v2");
+            assertEquals(expectedBaggage, context.getBaggage());
+        } else {
+            assertNull(context);
+        }
     }
-  }
-
-  @Test
-  @WithConfig(key = TRACE_BAGGAGE_MAX_ITEMS, value = "1")
-  void extractMappedBaggageIsSubjectToTheItemLimit() {
-    // mapped baggage shares the item budget with the baggage read off the wire, so the wire item
-    // is dropped once the mapped header has claimed the only slot
-    Map<String, String> headers = new LinkedHashMap<>();
-    headers.put(SOME_CUSTOM_BAGGAGE_HEADER, "mappedBaggageValue");
-    headers.put(OT_BAGGAGE_PREFIX + "wireKey", "wireValue");
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
+    @Test
+    @WithConfig(key = TRACE_BAGGAGE_MAX_ITEMS, value = "1")
+    void extractMappedBaggageIsSubjectToTheItemLimit() {
+        // mapped baggage shares the item budget with the baggage read off the wire, so the wire item
+        // is dropped once the mapped header has claimed the only slot
+        Map<String, String> headers = new LinkedHashMap<>();
+        headers.put(SOME_CUSTOM_BAGGAGE_HEADER, "mappedBaggageValue");
+        headers.put(OT_BAGGAGE_PREFIX + "wireKey", "wireValue");
 
-    assertEquals(singletonMap(SOME_BAGGAGE, "mappedBaggageValue"), context.getBaggage());
-  }
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
 
-  @Nested
-  class BaggageLimits extends AbstractOTBaggageTest {
-    @Override
-    protected HttpCodec.Extractor extractor() {
-      return DatadogHttpExtractorTest.this.extractor;
+        assertEquals(singletonMap(SOME_BAGGAGE, "mappedBaggageValue"), context.getBaggage());
     }
 
-    @Override
-    protected Map<String, String> baggageHeaders(List<Entry<String, String>> items) {
-      return otBaggageHeaders(OT_BAGGAGE_PREFIX, items);
+    @Nested
+    class BaggageLimits extends AbstractOTBaggageTest {
+        @Override
+        protected HttpCodec.Extractor extractor() {
+            return DatadogHttpExtractorTest.this.extractor;
+        }
+
+        @Override
+        protected Map<String, String> baggageHeaders(List<Entry<String, String>> items) {
+            return otBaggageHeaders(OT_BAGGAGE_PREFIX, items);
+        }
     }
-  }
 
-  private static String asString(CharSequence cs) {
-    return cs == null ? null : cs.toString();
-  }
+    private static String asString(CharSequence cs) {
+        return cs == null ? null : cs.toString();
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpInjectorTest.java
index 20a49f0f901..c574926ba35 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpInjectorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpInjectorTest.java
@@ -28,158 +28,152 @@
 
 class DatadogHttpInjectorTest extends AbstractHttpInjectorTest {
 
-  @Override
-  protected HttpCodec.Injector newInjector() {
-    return DatadogHttpCodec.newInjector(singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER"));
-  }
-
-  @TableTest({
-    "scenario          | traceId | spanId  | samplingPriority | origin  ",
-    "unset no origin   | '1'     | '2'     | UNSET            |         ",
-    "keep with origin  | '1'     | '2'     | SAMPLER_KEEP     | 'saipan'",
-    "uint64 max unset  | 'MAX'   | 'MAX-1' | UNSET            | 'saipan'",
-    "uint64 max-1 keep | 'MAX-1' | 'MAX'   | SAMPLER_KEEP     |         "
-  })
-  void injectHttpHeaders(
-      @ConvertWith(TraceIdConverter.class) String traceId,
-      @ConvertWith(TraceIdConverter.class) String spanId,
-      @ConvertWith(PrioritySamplingConverter.class) byte samplingPriority,
-      String origin) {
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("k1", "v1");
-    baggage.put("k2", "v2");
-    baggage.put("some-baggage-key", "some-value");
-
-    DDSpanContext spanContext =
-        mockSpanContext(traceId, spanId, samplingPriority, origin, baggage, "_dd.p.usr=123");
-    Map<String, String> carrier = new HashMap<>();
-
-    this.injector.inject(spanContext, carrier, Map::put);
-
-    int expectedSize = 6; // trace_id, span_id, k1, k2, custom_header, datadog_tags
-    assertEquals(traceId, carrier.get(TRACE_ID_KEY));
-    assertEquals(spanId, carrier.get(SPAN_ID_KEY));
-    if (samplingPriority != UNSET) {
-      assertEquals(String.valueOf(samplingPriority), carrier.get(SAMPLING_PRIORITY_KEY));
-      expectedSize++;
+    @Override
+    protected HttpCodec.Injector newInjector() {
+        return DatadogHttpCodec.newInjector(singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER"));
     }
-    if (origin != null) {
-      assertEquals(origin, carrier.get(ORIGIN_KEY));
-      expectedSize++;
+
+    @TableTest({
+      "scenario          | traceId | spanId  | samplingPriority | origin  ",
+      "unset no origin   | '1'     | '2'     | UNSET            |         ",
+      "keep with origin  | '1'     | '2'     | SAMPLER_KEEP     | 'saipan'",
+      "uint64 max unset  | 'MAX'   | 'MAX-1' | UNSET            | 'saipan'",
+      "uint64 max-1 keep | 'MAX-1' | 'MAX'   | SAMPLER_KEEP     |         "
+    })
+    void injectHttpHeaders(
+            @ConvertWith(TraceIdConverter.class) String traceId,
+            @ConvertWith(TraceIdConverter.class) String spanId,
+            @ConvertWith(PrioritySamplingConverter.class) byte samplingPriority,
+            String origin) {
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("k1", "v1");
+        baggage.put("k2", "v2");
+        baggage.put("some-baggage-key", "some-value");
+
+        DDSpanContext spanContext =
+                mockSpanContext(traceId, spanId, samplingPriority, origin, baggage, "_dd.p.usr=123");
+        Map<String, String> carrier = new HashMap<>();
+
+        this.injector.inject(spanContext, carrier, Map::put);
+
+        int expectedSize = 6; // trace_id, span_id, k1, k2, custom_header, datadog_tags
+        assertEquals(traceId, carrier.get(TRACE_ID_KEY));
+        assertEquals(spanId, carrier.get(SPAN_ID_KEY));
+        if (samplingPriority != UNSET) {
+            assertEquals(String.valueOf(samplingPriority), carrier.get(SAMPLING_PRIORITY_KEY));
+            expectedSize++;
+        }
+        if (origin != null) {
+            assertEquals(origin, carrier.get(ORIGIN_KEY));
+            expectedSize++;
+        }
+        assertEquals("v1", carrier.get(OT_BAGGAGE_PREFIX + "k1"));
+        assertEquals("v2", carrier.get(OT_BAGGAGE_PREFIX + "k2"));
+        assertEquals("some-value", carrier.get("SOME_CUSTOM_HEADER"));
+        assertEquals("_dd.p.usr=123", carrier.get(DATADOG_TAGS_KEY));
+        assertEquals(expectedSize, carrier.size());
+    }
+
+    @Test
+    void injectHttpHeadersWithEndToEnd() {
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("k1", "v1");
+        baggage.put("k2", "v2");
+
+        DDSpanContext spanContext =
+                mockSpanContext("1", "2", UNSET, "fakeOrigin", baggage, "_dd.p.dm=-4,_dd.p.anytag=value");
+        spanContext.beginEndToEnd();
+        Map<String, String> carrier = new HashMap<>();
+
+        this.injector.inject(spanContext, carrier, Map::put);
+
+        String expectedT0 = String.valueOf(spanContext.getEndToEndStartTime() / 1_000_000L);
+        assertEquals("1", carrier.get(TRACE_ID_KEY));
+        assertEquals("2", carrier.get(SPAN_ID_KEY));
+        assertEquals("fakeOrigin", carrier.get(ORIGIN_KEY));
+        assertEquals(expectedT0, carrier.get(OT_BAGGAGE_PREFIX + "t0"));
+        assertEquals("v1", carrier.get(OT_BAGGAGE_PREFIX + "k1"));
+        assertEquals("v2", carrier.get(OT_BAGGAGE_PREFIX + "k2"));
+        assertEquals("_dd.p.dm=-4,_dd.p.anytag=value", carrier.get(DATADOG_TAGS_KEY));
+        assertEquals(7, carrier.size());
+    }
+
+    @Test
+    void injectTheDecisionMakerTag() {
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("k1", "v1");
+        baggage.put("k2", "v2");
+
+        DDSpanContext spanContext = mockSpanContext("1", "2", UNSET, "fakeOrigin", baggage, null);
+        spanContext.setSamplingPriority(USER_KEEP, MANUAL);
+        Map<String, String> carrier = new HashMap<>();
+
+        this.injector.inject(spanContext, carrier, Map::put);
+
+        assertEquals("1", carrier.get(TRACE_ID_KEY));
+        assertEquals("2", carrier.get(SPAN_ID_KEY));
+        assertEquals("fakeOrigin", carrier.get(ORIGIN_KEY));
+        assertEquals("v1", carrier.get(OT_BAGGAGE_PREFIX + "k1"));
+        assertEquals("v2", carrier.get(OT_BAGGAGE_PREFIX + "k2"));
+        assertEquals("2", carrier.get("x-datadog-sampling-priority"));
+        assertEquals("_dd.p.dm=-4", carrier.get(DATADOG_TAGS_KEY));
+        assertEquals(7, carrier.size());
+    }
+
+    @TableTest({
+      "scenario            | hexId                             ",
+      "64-bit short        | '1'                               ",
+      "64-bit max chars    | '123456789abcdef0'                ",
+      "128-bit             | '123456789abcdef0123456789abcdef0'",
+      "128-bit zero middle | '64184f2400000000123456789abcdef0'",
+      "128-bit all f       | 'ffffffffffffffffffffffffffffffff'"
+    })
+    void injectHttpHeadersWith128BitTraceId(String hexId) {
+        DD128bTraceId traceId = DD128bTraceId.fromHex(hexId);
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("k1", "v1");
+        baggage.put("k2", "v2");
+
+        DDSpanContext spanContext =
+                mockSpanContext(traceId, "2", UNSET, null, baggage, "_dd.p.dm=-4,_dd.p.anytag=value");
+        spanContext.beginEndToEnd();
+        Map<String, String> carrier = new HashMap<>();
+
+        this.injector.inject(spanContext, carrier, Map::put);
+
+        String expectedT0 = String.valueOf(spanContext.getEndToEndStartTime() / 1_000_000L);
+        String expectDdPTags = traceId.toHighOrderLong() == 0
+                ? "_dd.p.dm=-4,_dd.p.anytag=value"
+                : "_dd.p.dm=-4,_dd.p.tid=" + toHexStringPadded(traceId.toHighOrderLong(), 16) + ",_dd.p.anytag=value";
+        assertEquals(traceId.toString(), carrier.get(TRACE_ID_KEY));
+        assertEquals("2", carrier.get(SPAN_ID_KEY));
+        assertEquals(expectedT0, carrier.get(OT_BAGGAGE_PREFIX + "t0"));
+        assertEquals("v1", carrier.get(OT_BAGGAGE_PREFIX + "k1"));
+        assertEquals("v2", carrier.get(OT_BAGGAGE_PREFIX + "k2"));
+        assertEquals(expectDdPTags, carrier.get(DATADOG_TAGS_KEY));
+        assertEquals(6, carrier.size());
+    }
+
+    private DDSpanContext mockSpanContext(
+            String traceId,
+            String spanId,
+            byte samplingPriority,
+            String origin,
+            Map<String, String> baggage,
+            String ddPTags) {
+        return mockSpanContext(DDTraceId.from(traceId), spanId, samplingPriority, origin, baggage, ddPTags);
+    }
+
+    private DDSpanContext mockSpanContext(
+            DDTraceId traceId,
+            String spanId,
+            byte samplingPriority,
+            String origin,
+            Map<String, String> baggage,
+            String ddPTags) {
+        PropagationTags propagationTags = ddPTags == null
+                ? PropagationTags.factory().empty()
+                : PropagationTags.factory().fromHeaderValue(DATADOG, ddPTags);
+        return mockSpanContext(traceId, DDSpanId.from(spanId), samplingPriority, origin, baggage, propagationTags);
     }
-    assertEquals("v1", carrier.get(OT_BAGGAGE_PREFIX + "k1"));
-    assertEquals("v2", carrier.get(OT_BAGGAGE_PREFIX + "k2"));
-    assertEquals("some-value", carrier.get("SOME_CUSTOM_HEADER"));
-    assertEquals("_dd.p.usr=123", carrier.get(DATADOG_TAGS_KEY));
-    assertEquals(expectedSize, carrier.size());
-  }
-
-  @Test
-  void injectHttpHeadersWithEndToEnd() {
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("k1", "v1");
-    baggage.put("k2", "v2");
-
-    DDSpanContext spanContext =
-        mockSpanContext("1", "2", UNSET, "fakeOrigin", baggage, "_dd.p.dm=-4,_dd.p.anytag=value");
-    spanContext.beginEndToEnd();
-    Map<String, String> carrier = new HashMap<>();
-
-    this.injector.inject(spanContext, carrier, Map::put);
-
-    String expectedT0 = String.valueOf(spanContext.getEndToEndStartTime() / 1_000_000L);
-    assertEquals("1", carrier.get(TRACE_ID_KEY));
-    assertEquals("2", carrier.get(SPAN_ID_KEY));
-    assertEquals("fakeOrigin", carrier.get(ORIGIN_KEY));
-    assertEquals(expectedT0, carrier.get(OT_BAGGAGE_PREFIX + "t0"));
-    assertEquals("v1", carrier.get(OT_BAGGAGE_PREFIX + "k1"));
-    assertEquals("v2", carrier.get(OT_BAGGAGE_PREFIX + "k2"));
-    assertEquals("_dd.p.dm=-4,_dd.p.anytag=value", carrier.get(DATADOG_TAGS_KEY));
-    assertEquals(7, carrier.size());
-  }
-
-  @Test
-  void injectTheDecisionMakerTag() {
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("k1", "v1");
-    baggage.put("k2", "v2");
-
-    DDSpanContext spanContext = mockSpanContext("1", "2", UNSET, "fakeOrigin", baggage, null);
-    spanContext.setSamplingPriority(USER_KEEP, MANUAL);
-    Map<String, String> carrier = new HashMap<>();
-
-    this.injector.inject(spanContext, carrier, Map::put);
-
-    assertEquals("1", carrier.get(TRACE_ID_KEY));
-    assertEquals("2", carrier.get(SPAN_ID_KEY));
-    assertEquals("fakeOrigin", carrier.get(ORIGIN_KEY));
-    assertEquals("v1", carrier.get(OT_BAGGAGE_PREFIX + "k1"));
-    assertEquals("v2", carrier.get(OT_BAGGAGE_PREFIX + "k2"));
-    assertEquals("2", carrier.get("x-datadog-sampling-priority"));
-    assertEquals("_dd.p.dm=-4", carrier.get(DATADOG_TAGS_KEY));
-    assertEquals(7, carrier.size());
-  }
-
-  @TableTest({
-    "scenario            | hexId                             ",
-    "64-bit short        | '1'                               ",
-    "64-bit max chars    | '123456789abcdef0'                ",
-    "128-bit             | '123456789abcdef0123456789abcdef0'",
-    "128-bit zero middle | '64184f2400000000123456789abcdef0'",
-    "128-bit all f       | 'ffffffffffffffffffffffffffffffff'"
-  })
-  void injectHttpHeadersWith128BitTraceId(String hexId) {
-    DD128bTraceId traceId = DD128bTraceId.fromHex(hexId);
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("k1", "v1");
-    baggage.put("k2", "v2");
-
-    DDSpanContext spanContext =
-        mockSpanContext(traceId, "2", UNSET, null, baggage, "_dd.p.dm=-4,_dd.p.anytag=value");
-    spanContext.beginEndToEnd();
-    Map<String, String> carrier = new HashMap<>();
-
-    this.injector.inject(spanContext, carrier, Map::put);
-
-    String expectedT0 = String.valueOf(spanContext.getEndToEndStartTime() / 1_000_000L);
-    String expectDdPTags =
-        traceId.toHighOrderLong() == 0
-            ? "_dd.p.dm=-4,_dd.p.anytag=value"
-            : "_dd.p.dm=-4,_dd.p.tid="
-                + toHexStringPadded(traceId.toHighOrderLong(), 16)
-                + ",_dd.p.anytag=value";
-    assertEquals(traceId.toString(), carrier.get(TRACE_ID_KEY));
-    assertEquals("2", carrier.get(SPAN_ID_KEY));
-    assertEquals(expectedT0, carrier.get(OT_BAGGAGE_PREFIX + "t0"));
-    assertEquals("v1", carrier.get(OT_BAGGAGE_PREFIX + "k1"));
-    assertEquals("v2", carrier.get(OT_BAGGAGE_PREFIX + "k2"));
-    assertEquals(expectDdPTags, carrier.get(DATADOG_TAGS_KEY));
-    assertEquals(6, carrier.size());
-  }
-
-  private DDSpanContext mockSpanContext(
-      String traceId,
-      String spanId,
-      byte samplingPriority,
-      String origin,
-      Map<String, String> baggage,
-      String ddPTags) {
-    return mockSpanContext(
-        DDTraceId.from(traceId), spanId, samplingPriority, origin, baggage, ddPTags);
-  }
-
-  private DDSpanContext mockSpanContext(
-      DDTraceId traceId,
-      String spanId,
-      byte samplingPriority,
-      String origin,
-      Map<String, String> baggage,
-      String ddPTags) {
-    PropagationTags propagationTags =
-        ddPTags == null
-            ? PropagationTags.factory().empty()
-            : PropagationTags.factory().fromHeaderValue(DATADOG, ddPTags);
-    return mockSpanContext(
-        traceId, DDSpanId.from(spanId), samplingPriority, origin, baggage, propagationTags);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogPropagationTagsTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogPropagationTagsTest.java
index 73c6c8af9b9..2e13d15a093 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogPropagationTagsTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogPropagationTagsTest.java
@@ -19,180 +19,180 @@
 import org.tabletest.junit.TableTest;
 
 class DatadogPropagationTagsTest extends DDJavaSpecification {
-  @TableTest({
-    "scenario                          | headerValue                                                                                                                  | expectedHeaderValue                        | tags                                                      ",
-    "null input                        |                                                                                                                              |                                            | [:]                                                       ",
-    "empty input                       | ''                                                                                                                           |                                            | [:]                                                       ",
-    "valid dm tag short                | '_dd.p.dm=934086a686-4'                                                                                                      | '_dd.p.dm=934086a686-4'                    | [_dd.p.dm: '934086a686-4']                                ",
-    "valid dm tag 2-digit              | '_dd.p.dm=934086a686-10'                                                                                                     | '_dd.p.dm=934086a686-10'                   | [_dd.p.dm: '934086a686-10']                               ",
-    "valid dm tag 3-digit              | '_dd.p.dm=934086a686-102'                                                                                                    | '_dd.p.dm=934086a686-102'                  | [_dd.p.dm: '934086a686-102']                              ",
-    "dm tag minus only                 | '_dd.p.dm=-1'                                                                                                                | '_dd.p.dm=-1'                              | [_dd.p.dm: '-1']                                          ",
-    "dm tag with trailing separator    | '_dd.p.dm=-4,'                                                                                                               | '_dd.p.dm=-4'                              | [_dd.p.dm: '-4']                                          ",
-    "any p tag                         | '_dd.p.anytag=value'                                                                                                         | '_dd.p.anytag=value'                       | [_dd.p.anytag: 'value']                                   ",
-    "non p tag dropped                 | '_dd.b.somekey=value'                                                                                                        |                                            | [:]                                                       ",
-    "upstream services alone dropped   | '_dd.p.upstream_services=bWNudWx0eS13ZWI|0|1|0.1'                                                                            |                                            | [:]                                                       ",
-    "dm and anytag                     | '_dd.p.dm=934086a686-4,_dd.p.anytag=value'                                                                                   | '_dd.p.dm=934086a686-4,_dd.p.anytag=value' | [_dd.p.dm: '934086a686-4', _dd.p.anytag: 'value']         ",
-    "dm with upstream and anytag       | '_dd.p.dm=934086a686-4,_dd.p.upstream_services=bWNudWx0eS13ZWI|0|1|0.1,_dd.p.anytag=value'                                   | '_dd.p.dm=934086a686-4,_dd.p.anytag=value' | [_dd.p.dm: '934086a686-4', _dd.p.anytag: 'value']         ",
-    "ddb keyonly with dm upstream      | '_dd.b.keyonly=value,_dd.p.dm=934086a686-4,_dd.p.upstream_services=bWNudWx0eS13ZWI|0|1|0.1,_dd.p.anytag=value'               | '_dd.p.dm=934086a686-4,_dd.p.anytag=value' | [_dd.p.dm: '934086a686-4', _dd.p.anytag: 'value']         ",
-    "valid p tag with spaces           | '_dd.p.ab=1 2 3'                                                                                                             | '_dd.p.ab=1 2 3'                           | [_dd.p.ab: '1 2 3']                                       ",
-    "valid p tag leading trail spc     | '_dd.p.ab= 123 '                                                                                                             | '_dd.p.ab= 123 '                           | [_dd.p.ab: ' 123 ']                                       ",
-    "key only error                    | '_dd.p.keyonly'                                                                                                              |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "leading comma error               | ',_dd.p.dm=Value'                                                                                                            |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "comma only error                  | ','                                                                                                                          |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "ddb keyonly with embedded keyonly | '_dd.b.somekey=value,_dd.p.dm=934086a686-4,_dd.p.keyonly,_dd.p.upstream_services=bWNudWx0eS13ZWI|0|1|0.1,_dd.p.anytag=value' |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "embedded keyonly with dm upstream | '_dd.p.keyonly,_dd.p.dm=934086a686-4,_dd.p.upstream_services=bWNudWx0eS13ZWI|0|1|0.1,_dd.p.anytag=value'                     |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "leading comma with dm upstream    | ',_dd.p.dm=934086a686-4,_dd.p.upstream_services=bWNudWx0eS13ZWI|0|1|0.1,_dd.p.anytag=value'                                  |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "double comma in tagset            | '_dd.p.dm=934086a686-4,,_dd.p.upstream_services=bWNudWx0eS13ZWI|0|1|0.1,_dd.p.anytag=value'                                  |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "space tag in tagset               | '_dd.p.dm=934086a686-4, ,_dd.p.upstream_services=bWNudWx0eS13ZWI|0|1|0.1,_dd.p.anytag=value'                                 |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "upstream variant dropped alone    | '_dd.p.upstream_services=bmV1dHJvbg==|0|1|0.2253'                                                                            |                                            | [:]                                                       ",
-    "leading space error               | ' _dd.p.ab=123'                                                                                                              |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "key with space error              | '_dd.p.a b=123'                                                                                                              |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "trailing key space error          | '_dd.p.ab =123'                                                                                                              |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "space inside key error            | '_dd.p. ab=123'                                                                                                              |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "tag with eq value                 | '_dd.p.a=b=1=2'                                                                                                              | '_dd.p.a=b=1=2'                            | [_dd.p.a: 'b=1=2']                                        ",
-    "invalid key non-ascii             | '_dd.p.1ö2=value'                                                                                                            |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "value with equals                 | '_dd.p.ab=1=2'                                                                                                               | '_dd.p.ab=1=2'                             | [_dd.p.ab: '1=2']                                         ",
-    "invalid value non-ascii           | '_dd.p.ab=1ô2'                                                                                                               |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "dm tag upper case                 | '_dd.p.dm=934086A686-4'                                                                                                      |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "dm tag too short                  | '_dd.p.dm=934086a66-4'                                                                                                       |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "dm tag too long                   | '_dd.p.dm=934086a6653-4'                                                                                                     |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "dm tag missing separator          | '_dd.p.dm=934086a66534'                                                                                                      |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "dm tag missing mechanism          | '_dd.p.dm=934086a665-'                                                                                                       |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "dm tag invalid mechanism char     | '_dd.p.dm=934086a665-a'                                                                                                      |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "dm tag mechanism with letter      | '_dd.p.dm=934086a665-12b'                                                                                                    |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "tid empty                         | '_dd.p.tid='                                                                                                                 |                                            | [_dd.propagation_error: 'decoding_error']                 ",
-    "tid length 1                      | '_dd.p.tid=1'                                                                                                                |                                            | [_dd.propagation_error: 'malformed_tid 1']                ",
-    "tid length 15                     | '_dd.p.tid=111111111111111'                                                                                                  |                                            | [_dd.propagation_error: 'malformed_tid 111111111111111']  ",
-    "tid length 17                     | '_dd.p.tid=11111111111111111'                                                                                                |                                            | [_dd.propagation_error: 'malformed_tid 11111111111111111']",
-    "tid invalid uppercase             | '_dd.p.tid=123456789ABCDEF0'                                                                                                 |                                            | [_dd.propagation_error: 'malformed_tid 123456789ABCDEF0'] ",
-    "tid invalid non-hex               | '_dd.p.tid=123456789abcdefg'                                                                                                 |                                            | [_dd.propagation_error: 'malformed_tid 123456789abcdefg'] ",
-    "tid invalid negative              | '_dd.p.tid=-123456789abcdef'                                                                                                 |                                            | [_dd.propagation_error: 'malformed_tid -123456789abcdef'] ",
-    "ts valid 02                       | '_dd.p.ts=02'                                                                                                                | '_dd.p.ts=02'                              | [_dd.p.ts: '02']                                          ",
-    "ts zero dropped                   | '_dd.p.ts=00'                                                                                                                |                                            | [:]                                                       ",
-    "ts invalid foo                    | '_dd.p.ts=foo'                                                                                                               |                                            | [_dd.propagation_error: 'decoding_error']                 "
-  })
-  void createPropagationTagsFromHeaderValue(
-      String headerValue, String expectedHeaderValue, Map<String, String> tags) {
-    PropagationTags propagationTags = factory().fromHeaderValue(DATADOG, headerValue);
-
-    assertEquals(expectedHeaderValue, propagationTags.headerValue(DATADOG));
-    assertEquals(tags, propagationTags.createTagMap());
-  }
-
-  @TableTest({
-    "scenario          | headerValue                            | expectedHeaderValue               | tags                                         ",
-    "single dm tag     | '_dd.p.dm=934086a686-4'                | 'dd=t.dm:934086a686-4'            | [_dd.p.dm: '934086a686-4']                   ",
-    "dm and f tag      | '_dd.p.dm=934086a686-4,_dd.p.f=w00t==' | 'dd=t.dm:934086a686-4;t.f:w00t~~' | [_dd.p.dm: '934086a686-4', _dd.p.f: 'w00t==']",
-    "dm and appsec tag | '_dd.p.dm=934086a686-4,_dd.p.appsec=1' | 'dd=t.dm:934086a686-4;t.appsec:1' | [_dd.p.dm: '934086a686-4', _dd.p.appsec: '1']"
-  })
-  void datadogPropagationTagsShouldTranslateToW3cTags(
-      String headerValue, String expectedHeaderValue, Map<String, String> tags) {
-    PropagationTags propagationTags = factory().fromHeaderValue(DATADOG, headerValue);
-
-    assertEquals(expectedHeaderValue, propagationTags.headerValue(W3C));
-    assertEquals(tags, propagationTags.createTagMap());
-  }
-
-  @TableTest({
-    "scenario                          | originalTagSet                                              | priority     | mechanism                    | expectedHeaderValue                                         | tags                                                                  ",
-    "keep dm unchanged unset           | '_dd.p.dm=934086a686-4'                                     | UNSET        | SamplingMechanism.UNKNOWN    | '_dd.p.dm=934086a686-4'                                     | [_dd.p.dm: '934086a686-4']                                            ",
-    "keep dm unchanged sampler keep    | '_dd.p.dm=934086a686-3'                                     | SAMPLER_KEEP | SamplingMechanism.AGENT_RATE | '_dd.p.dm=934086a686-3'                                     | [_dd.p.dm: '934086a686-3']                                            ",
-    "keep dm unchanged appsec          | '_dd.p.dm=93485302ab-1'                                     | SAMPLER_KEEP | SamplingMechanism.APPSEC     | '_dd.p.dm=93485302ab-1'                                     | [_dd.p.dm: '93485302ab-1']                                            ",
-    "keep dm with anytag               | '_dd.p.dm=934086a686-4,_dd.p.anytag=value'                  | SAMPLER_KEEP | SamplingMechanism.AGENT_RATE | '_dd.p.dm=934086a686-4,_dd.p.anytag=value'                  | [_dd.p.dm: '934086a686-4', _dd.p.anytag: 'value']                     ",
-    "keep dm with anytag appsec        | '_dd.p.dm=93485302ab-2,_dd.p.anytag=value'                  | SAMPLER_KEEP | SamplingMechanism.APPSEC     | '_dd.p.dm=93485302ab-2,_dd.p.anytag=value'                  | [_dd.p.dm: '93485302ab-2', _dd.p.anytag: 'value']                     ",
-    "dm moves to front                 | '_dd.p.anytag=value,_dd.p.dm=934086a686-4'                  | SAMPLER_KEEP | SamplingMechanism.AGENT_RATE | '_dd.p.dm=934086a686-4,_dd.p.anytag=value'                  | [_dd.p.anytag: 'value', _dd.p.dm: '934086a686-4']                     ",
-    "dm moves to front appsec          | '_dd.p.anytag=value,_dd.p.dm=93485302ab-2'                  | SAMPLER_KEEP | SamplingMechanism.APPSEC     | '_dd.p.dm=93485302ab-2,_dd.p.anytag=value'                  | [_dd.p.anytag: 'value', _dd.p.dm: '93485302ab-2']                     ",
-    "dm reordered with multiple tags   | '_dd.p.anytag=value,_dd.p.dm=934086a686-4,_dd.p.atag=value' | SAMPLER_KEEP | SamplingMechanism.AGENT_RATE | '_dd.p.dm=934086a686-4,_dd.p.anytag=value,_dd.p.atag=value' | [_dd.p.anytag: 'value', _dd.p.dm: '934086a686-4', _dd.p.atag: 'value']",
-    "dm reordered multiple tags appsec | '_dd.p.anytag=value,_dd.p.dm=93485302ab-2,_dd.p.atag=value' | SAMPLER_KEEP | SamplingMechanism.APPSEC     | '_dd.p.dm=93485302ab-2,_dd.p.anytag=value,_dd.p.atag=value' | [_dd.p.anytag: 'value', _dd.p.dm: '93485302ab-2', _dd.p.atag: 'value']",
-    "user drop manual single dm        | '_dd.p.dm=93485302ab-2'                                     | USER_DROP    | SamplingMechanism.MANUAL     | '_dd.p.dm=93485302ab-2'                                     | [_dd.p.dm: '93485302ab-2']                                            ",
-    "sampler drop manual reorder       | '_dd.p.anytag=value,_dd.p.dm=93485302ab-2'                  | SAMPLER_DROP | SamplingMechanism.MANUAL     | '_dd.p.dm=93485302ab-2,_dd.p.anytag=value'                  | [_dd.p.anytag: 'value', _dd.p.dm: '93485302ab-2']                     ",
-    "user drop manual                  | '_dd.p.dm=93485302ab-2,_dd.p.anytag=value'                  | USER_DROP    | SamplingMechanism.MANUAL     | '_dd.p.dm=93485302ab-2,_dd.p.anytag=value'                  | [_dd.p.dm: '93485302ab-2', _dd.p.anytag: 'value']                     ",
-    "user drop manual triple           | '_dd.p.atag=value,_dd.p.dm=93485302ab-2,_dd.p.anytag=value' | USER_DROP    | SamplingMechanism.MANUAL     | '_dd.p.dm=93485302ab-2,_dd.p.atag=value,_dd.p.anytag=value' | [_dd.p.atag: 'value', _dd.p.dm: '93485302ab-2', _dd.p.anytag: 'value']",
-    "empty sampler keep default        | ''                                                          | SAMPLER_KEEP | SamplingMechanism.DEFAULT    | '_dd.p.dm=-0'                                               | [_dd.p.dm: '-0']                                                      ",
-    "empty sampler keep agent rate     | ''                                                          | SAMPLER_KEEP | SamplingMechanism.AGENT_RATE | '_dd.p.dm=-1'                                               | [_dd.p.dm: '-1']                                                      ",
-    "anytag user keep manual           | '_dd.p.anytag=value'                                        | USER_KEEP    | SamplingMechanism.MANUAL     | '_dd.p.dm=-4,_dd.p.anytag=value'                            | [_dd.p.anytag: 'value', _dd.p.dm: '-4']                               ",
-    "no dm change sampler drop manual  | '_dd.p.anytag=value,_dd.p.atag=value'                       | SAMPLER_DROP | SamplingMechanism.MANUAL     | '_dd.p.anytag=value,_dd.p.atag=value'                       | [_dd.p.anytag: 'value', _dd.p.atag: 'value']                          ",
-    "no dm when mechanism unknown      | '_dd.p.anytag=123'                                          | SAMPLER_KEEP | SamplingMechanism.UNKNOWN    | '_dd.p.anytag=123'                                          | [_dd.p.anytag: '123']                                                 ",
-    "invalid input still updates dm    | ',_dd.p.dm=Value'                                           | SAMPLER_KEEP | SamplingMechanism.AGENT_RATE | '_dd.p.dm=-1'                                               | [_dd.propagation_error: 'decoding_error', _dd.p.dm: '-1']             "
-  })
-  void updatePropagationTagsSamplingMechanism(
-      String originalTagSet,
-      @ConvertWith(PrioritySamplingConverter.class) byte priority,
-      @ConvertWith(SamplingMechanismConverter.class) byte mechanism,
-      String expectedHeaderValue,
-      Map<String, String> tags) {
-    PropagationTags propagationTags = factory().fromHeaderValue(DATADOG, originalTagSet);
-
-    propagationTags.updateTraceSamplingPriority(priority, mechanism);
-
-    assertEquals(expectedHeaderValue, propagationTags.headerValue(DATADOG));
-    assertEquals(tags, propagationTags.createTagMap());
-  }
-
-  @TableTest({
-    "scenario             | originalTagSet       | product                  | expectedHeaderValue | tags                                     ",
-    "set ts on empty      | ''                   | ProductTraceSource.ASM   | '_dd.p.ts=02'       | [_dd.p.ts: '02']                         ",
-    "promote from 00      | '_dd.p.ts=00'        | ProductTraceSource.ASM   | '_dd.p.ts=02'       | [_dd.p.ts: '02']                         ",
-    "demote from FFC00000 | '_dd.p.ts=FFC00000'  | ProductTraceSource.ASM   | '_dd.p.ts=02'       | [_dd.p.ts: '02']                         ",
-    "add dbm on 02        | '_dd.p.ts=02'        | ProductTraceSource.DBM   | '_dd.p.ts=12'       | [_dd.p.ts: '12']                         ",
-    "invalid empty        | '_dd.p.ts='          | ProductTraceSource.UNSET |                     | [_dd.propagation_error: 'decoding_error']",
-    "invalid single 0     | '_dd.p.ts=0'         | ProductTraceSource.UNSET |                     | [_dd.propagation_error: 'decoding_error']",
-    "invalid char in pair | '_dd.p.ts=0G'        | ProductTraceSource.UNSET |                     | [_dd.propagation_error: 'decoding_error']",
-    "invalid chars only   | '_dd.p.ts=GG'        | ProductTraceSource.UNSET |                     | [_dd.propagation_error: 'decoding_error']",
-    "invalid foo          | '_dd.p.ts=foo'       | ProductTraceSource.UNSET |                     | [_dd.propagation_error: 'decoding_error']",
-    "invalid too long     | '_dd.p.ts=000000002' | ProductTraceSource.UNSET |                     | [_dd.propagation_error: 'decoding_error']"
-  })
-  void updatePropagationTagsTraceSourcePropagation(
-      String originalTagSet,
-      @ConvertWith(ProductTraceSourceConverter.class) int product,
-      String expectedHeaderValue,
-      Map<String, String> tags) {
-    PropagationTags propagationTags = factory().fromHeaderValue(DATADOG, originalTagSet);
-
-    propagationTags.addTraceSource(product);
-
-    assertEquals(expectedHeaderValue, propagationTags.headerValue(DATADOG));
-    assertEquals(tags, propagationTags.createTagMap());
-  }
-
-  @Test
-  void extractionLimitExceeded() {
-    String tags = "_dd.p.anytag=value";
-    int limit = tags.length() - 1;
-    PropagationTags propagationTags = factory(limit).fromHeaderValue(DATADOG, tags);
-
-    propagationTags.updateTraceSamplingPriority(USER_KEEP, MANUAL);
-
-    assertEquals("_dd.p.dm=-4", propagationTags.headerValue(DATADOG));
-    Map<String, String> expected = new HashMap<>();
-    expected.put("_dd.propagation_error", "extract_max_size");
-    expected.put("_dd.p.dm", "-4");
-    assertEquals(expected, propagationTags.createTagMap());
-  }
-
-  @Test
-  void injectionLimitExceeded() {
-    String tags = "_dd.p.anytag=value";
-    int limit = tags.length();
-    PropagationTags propagationTags = factory(limit).fromHeaderValue(DATADOG, tags);
-
-    propagationTags.updateTraceSamplingPriority(USER_KEEP, MANUAL);
-
-    assertNull(propagationTags.headerValue(DATADOG));
-    Map<String, String> expected = new HashMap<>();
-    expected.put("_dd.propagation_error", "inject_max_size");
-    assertEquals(expected, propagationTags.createTagMap());
-  }
-
-  @Test
-  void injectionLimitExceededLimit0() {
-    PropagationTags propagationTags = factory(0).fromHeaderValue(DATADOG, "");
-
-    propagationTags.updateTraceSamplingPriority(USER_KEEP, MANUAL);
-
-    assertNull(propagationTags.headerValue(DATADOG));
-    Map<String, String> expected = new HashMap<>();
-    expected.put("_dd.propagation_error", "disabled");
-    assertEquals(expected, propagationTags.createTagMap());
-  }
+    @TableTest({
+      "scenario                          | headerValue                                                                                                                  | expectedHeaderValue                        | tags                                                      ",
+      "null input                        |                                                                                                                              |                                            | [:]                                                       ",
+      "empty input                       | ''                                                                                                                           |                                            | [:]                                                       ",
+      "valid dm tag short                | '_dd.p.dm=934086a686-4'                                                                                                      | '_dd.p.dm=934086a686-4'                    | [_dd.p.dm: '934086a686-4']                                ",
+      "valid dm tag 2-digit              | '_dd.p.dm=934086a686-10'                                                                                                     | '_dd.p.dm=934086a686-10'                   | [_dd.p.dm: '934086a686-10']                               ",
+      "valid dm tag 3-digit              | '_dd.p.dm=934086a686-102'                                                                                                    | '_dd.p.dm=934086a686-102'                  | [_dd.p.dm: '934086a686-102']                              ",
+      "dm tag minus only                 | '_dd.p.dm=-1'                                                                                                                | '_dd.p.dm=-1'                              | [_dd.p.dm: '-1']                                          ",
+      "dm tag with trailing separator    | '_dd.p.dm=-4,'                                                                                                               | '_dd.p.dm=-4'                              | [_dd.p.dm: '-4']                                          ",
+      "any p tag                         | '_dd.p.anytag=value'                                                                                                         | '_dd.p.anytag=value'                       | [_dd.p.anytag: 'value']                                   ",
+      "non p tag dropped                 | '_dd.b.somekey=value'                                                                                                        |                                            | [:]                                                       ",
+      "upstream services alone dropped   | '_dd.p.upstream_services=bWNudWx0eS13ZWI|0|1|0.1'                                                                            |                                            | [:]                                                       ",
+      "dm and anytag                     | '_dd.p.dm=934086a686-4,_dd.p.anytag=value'                                                                                   | '_dd.p.dm=934086a686-4,_dd.p.anytag=value' | [_dd.p.dm: '934086a686-4', _dd.p.anytag: 'value']         ",
+      "dm with upstream and anytag       | '_dd.p.dm=934086a686-4,_dd.p.upstream_services=bWNudWx0eS13ZWI|0|1|0.1,_dd.p.anytag=value'                                   | '_dd.p.dm=934086a686-4,_dd.p.anytag=value' | [_dd.p.dm: '934086a686-4', _dd.p.anytag: 'value']         ",
+      "ddb keyonly with dm upstream      | '_dd.b.keyonly=value,_dd.p.dm=934086a686-4,_dd.p.upstream_services=bWNudWx0eS13ZWI|0|1|0.1,_dd.p.anytag=value'               | '_dd.p.dm=934086a686-4,_dd.p.anytag=value' | [_dd.p.dm: '934086a686-4', _dd.p.anytag: 'value']         ",
+      "valid p tag with spaces           | '_dd.p.ab=1 2 3'                                                                                                             | '_dd.p.ab=1 2 3'                           | [_dd.p.ab: '1 2 3']                                       ",
+      "valid p tag leading trail spc     | '_dd.p.ab= 123 '                                                                                                             | '_dd.p.ab= 123 '                           | [_dd.p.ab: ' 123 ']                                       ",
+      "key only error                    | '_dd.p.keyonly'                                                                                                              |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "leading comma error               | ',_dd.p.dm=Value'                                                                                                            |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "comma only error                  | ','                                                                                                                          |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "ddb keyonly with embedded keyonly | '_dd.b.somekey=value,_dd.p.dm=934086a686-4,_dd.p.keyonly,_dd.p.upstream_services=bWNudWx0eS13ZWI|0|1|0.1,_dd.p.anytag=value' |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "embedded keyonly with dm upstream | '_dd.p.keyonly,_dd.p.dm=934086a686-4,_dd.p.upstream_services=bWNudWx0eS13ZWI|0|1|0.1,_dd.p.anytag=value'                     |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "leading comma with dm upstream    | ',_dd.p.dm=934086a686-4,_dd.p.upstream_services=bWNudWx0eS13ZWI|0|1|0.1,_dd.p.anytag=value'                                  |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "double comma in tagset            | '_dd.p.dm=934086a686-4,,_dd.p.upstream_services=bWNudWx0eS13ZWI|0|1|0.1,_dd.p.anytag=value'                                  |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "space tag in tagset               | '_dd.p.dm=934086a686-4, ,_dd.p.upstream_services=bWNudWx0eS13ZWI|0|1|0.1,_dd.p.anytag=value'                                 |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "upstream variant dropped alone    | '_dd.p.upstream_services=bmV1dHJvbg==|0|1|0.2253'                                                                            |                                            | [:]                                                       ",
+      "leading space error               | ' _dd.p.ab=123'                                                                                                              |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "key with space error              | '_dd.p.a b=123'                                                                                                              |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "trailing key space error          | '_dd.p.ab =123'                                                                                                              |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "space inside key error            | '_dd.p. ab=123'                                                                                                              |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "tag with eq value                 | '_dd.p.a=b=1=2'                                                                                                              | '_dd.p.a=b=1=2'                            | [_dd.p.a: 'b=1=2']                                        ",
+      "invalid key non-ascii             | '_dd.p.1ö2=value'                                                                                                            |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "value with equals                 | '_dd.p.ab=1=2'                                                                                                               | '_dd.p.ab=1=2'                             | [_dd.p.ab: '1=2']                                         ",
+      "invalid value non-ascii           | '_dd.p.ab=1ô2'                                                                                                               |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "dm tag upper case                 | '_dd.p.dm=934086A686-4'                                                                                                      |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "dm tag too short                  | '_dd.p.dm=934086a66-4'                                                                                                       |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "dm tag too long                   | '_dd.p.dm=934086a6653-4'                                                                                                     |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "dm tag missing separator          | '_dd.p.dm=934086a66534'                                                                                                      |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "dm tag missing mechanism          | '_dd.p.dm=934086a665-'                                                                                                       |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "dm tag invalid mechanism char     | '_dd.p.dm=934086a665-a'                                                                                                      |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "dm tag mechanism with letter      | '_dd.p.dm=934086a665-12b'                                                                                                    |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "tid empty                         | '_dd.p.tid='                                                                                                                 |                                            | [_dd.propagation_error: 'decoding_error']                 ",
+      "tid length 1                      | '_dd.p.tid=1'                                                                                                                |                                            | [_dd.propagation_error: 'malformed_tid 1']                ",
+      "tid length 15                     | '_dd.p.tid=111111111111111'                                                                                                  |                                            | [_dd.propagation_error: 'malformed_tid 111111111111111']  ",
+      "tid length 17                     | '_dd.p.tid=11111111111111111'                                                                                                |                                            | [_dd.propagation_error: 'malformed_tid 11111111111111111']",
+      "tid invalid uppercase             | '_dd.p.tid=123456789ABCDEF0'                                                                                                 |                                            | [_dd.propagation_error: 'malformed_tid 123456789ABCDEF0'] ",
+      "tid invalid non-hex               | '_dd.p.tid=123456789abcdefg'                                                                                                 |                                            | [_dd.propagation_error: 'malformed_tid 123456789abcdefg'] ",
+      "tid invalid negative              | '_dd.p.tid=-123456789abcdef'                                                                                                 |                                            | [_dd.propagation_error: 'malformed_tid -123456789abcdef'] ",
+      "ts valid 02                       | '_dd.p.ts=02'                                                                                                                | '_dd.p.ts=02'                              | [_dd.p.ts: '02']                                          ",
+      "ts zero dropped                   | '_dd.p.ts=00'                                                                                                                |                                            | [:]                                                       ",
+      "ts invalid foo                    | '_dd.p.ts=foo'                                                                                                               |                                            | [_dd.propagation_error: 'decoding_error']                 "
+    })
+    void createPropagationTagsFromHeaderValue(
+            String headerValue, String expectedHeaderValue, Map<String, String> tags) {
+        PropagationTags propagationTags = factory().fromHeaderValue(DATADOG, headerValue);
+
+        assertEquals(expectedHeaderValue, propagationTags.headerValue(DATADOG));
+        assertEquals(tags, propagationTags.createTagMap());
+    }
+
+    @TableTest({
+      "scenario          | headerValue                            | expectedHeaderValue               | tags                                         ",
+      "single dm tag     | '_dd.p.dm=934086a686-4'                | 'dd=t.dm:934086a686-4'            | [_dd.p.dm: '934086a686-4']                   ",
+      "dm and f tag      | '_dd.p.dm=934086a686-4,_dd.p.f=w00t==' | 'dd=t.dm:934086a686-4;t.f:w00t~~' | [_dd.p.dm: '934086a686-4', _dd.p.f: 'w00t==']",
+      "dm and appsec tag | '_dd.p.dm=934086a686-4,_dd.p.appsec=1' | 'dd=t.dm:934086a686-4;t.appsec:1' | [_dd.p.dm: '934086a686-4', _dd.p.appsec: '1']"
+    })
+    void datadogPropagationTagsShouldTranslateToW3cTags(
+            String headerValue, String expectedHeaderValue, Map<String, String> tags) {
+        PropagationTags propagationTags = factory().fromHeaderValue(DATADOG, headerValue);
+
+        assertEquals(expectedHeaderValue, propagationTags.headerValue(W3C));
+        assertEquals(tags, propagationTags.createTagMap());
+    }
+
+    @TableTest({
+      "scenario                          | originalTagSet                                              | priority     | mechanism                    | expectedHeaderValue                                         | tags                                                                  ",
+      "keep dm unchanged unset           | '_dd.p.dm=934086a686-4'                                     | UNSET        | SamplingMechanism.UNKNOWN    | '_dd.p.dm=934086a686-4'                                     | [_dd.p.dm: '934086a686-4']                                            ",
+      "keep dm unchanged sampler keep    | '_dd.p.dm=934086a686-3'                                     | SAMPLER_KEEP | SamplingMechanism.AGENT_RATE | '_dd.p.dm=934086a686-3'                                     | [_dd.p.dm: '934086a686-3']                                            ",
+      "keep dm unchanged appsec          | '_dd.p.dm=93485302ab-1'                                     | SAMPLER_KEEP | SamplingMechanism.APPSEC     | '_dd.p.dm=93485302ab-1'                                     | [_dd.p.dm: '93485302ab-1']                                            ",
+      "keep dm with anytag               | '_dd.p.dm=934086a686-4,_dd.p.anytag=value'                  | SAMPLER_KEEP | SamplingMechanism.AGENT_RATE | '_dd.p.dm=934086a686-4,_dd.p.anytag=value'                  | [_dd.p.dm: '934086a686-4', _dd.p.anytag: 'value']                     ",
+      "keep dm with anytag appsec        | '_dd.p.dm=93485302ab-2,_dd.p.anytag=value'                  | SAMPLER_KEEP | SamplingMechanism.APPSEC     | '_dd.p.dm=93485302ab-2,_dd.p.anytag=value'                  | [_dd.p.dm: '93485302ab-2', _dd.p.anytag: 'value']                     ",
+      "dm moves to front                 | '_dd.p.anytag=value,_dd.p.dm=934086a686-4'                  | SAMPLER_KEEP | SamplingMechanism.AGENT_RATE | '_dd.p.dm=934086a686-4,_dd.p.anytag=value'                  | [_dd.p.anytag: 'value', _dd.p.dm: '934086a686-4']                     ",
+      "dm moves to front appsec          | '_dd.p.anytag=value,_dd.p.dm=93485302ab-2'                  | SAMPLER_KEEP | SamplingMechanism.APPSEC     | '_dd.p.dm=93485302ab-2,_dd.p.anytag=value'                  | [_dd.p.anytag: 'value', _dd.p.dm: '93485302ab-2']                     ",
+      "dm reordered with multiple tags   | '_dd.p.anytag=value,_dd.p.dm=934086a686-4,_dd.p.atag=value' | SAMPLER_KEEP | SamplingMechanism.AGENT_RATE | '_dd.p.dm=934086a686-4,_dd.p.anytag=value,_dd.p.atag=value' | [_dd.p.anytag: 'value', _dd.p.dm: '934086a686-4', _dd.p.atag: 'value']",
+      "dm reordered multiple tags appsec | '_dd.p.anytag=value,_dd.p.dm=93485302ab-2,_dd.p.atag=value' | SAMPLER_KEEP | SamplingMechanism.APPSEC     | '_dd.p.dm=93485302ab-2,_dd.p.anytag=value,_dd.p.atag=value' | [_dd.p.anytag: 'value', _dd.p.dm: '93485302ab-2', _dd.p.atag: 'value']",
+      "user drop manual single dm        | '_dd.p.dm=93485302ab-2'                                     | USER_DROP    | SamplingMechanism.MANUAL     | '_dd.p.dm=93485302ab-2'                                     | [_dd.p.dm: '93485302ab-2']                                            ",
+      "sampler drop manual reorder       | '_dd.p.anytag=value,_dd.p.dm=93485302ab-2'                  | SAMPLER_DROP | SamplingMechanism.MANUAL     | '_dd.p.dm=93485302ab-2,_dd.p.anytag=value'                  | [_dd.p.anytag: 'value', _dd.p.dm: '93485302ab-2']                     ",
+      "user drop manual                  | '_dd.p.dm=93485302ab-2,_dd.p.anytag=value'                  | USER_DROP    | SamplingMechanism.MANUAL     | '_dd.p.dm=93485302ab-2,_dd.p.anytag=value'                  | [_dd.p.dm: '93485302ab-2', _dd.p.anytag: 'value']                     ",
+      "user drop manual triple           | '_dd.p.atag=value,_dd.p.dm=93485302ab-2,_dd.p.anytag=value' | USER_DROP    | SamplingMechanism.MANUAL     | '_dd.p.dm=93485302ab-2,_dd.p.atag=value,_dd.p.anytag=value' | [_dd.p.atag: 'value', _dd.p.dm: '93485302ab-2', _dd.p.anytag: 'value']",
+      "empty sampler keep default        | ''                                                          | SAMPLER_KEEP | SamplingMechanism.DEFAULT    | '_dd.p.dm=-0'                                               | [_dd.p.dm: '-0']                                                      ",
+      "empty sampler keep agent rate     | ''                                                          | SAMPLER_KEEP | SamplingMechanism.AGENT_RATE | '_dd.p.dm=-1'                                               | [_dd.p.dm: '-1']                                                      ",
+      "anytag user keep manual           | '_dd.p.anytag=value'                                        | USER_KEEP    | SamplingMechanism.MANUAL     | '_dd.p.dm=-4,_dd.p.anytag=value'                            | [_dd.p.anytag: 'value', _dd.p.dm: '-4']                               ",
+      "no dm change sampler drop manual  | '_dd.p.anytag=value,_dd.p.atag=value'                       | SAMPLER_DROP | SamplingMechanism.MANUAL     | '_dd.p.anytag=value,_dd.p.atag=value'                       | [_dd.p.anytag: 'value', _dd.p.atag: 'value']                          ",
+      "no dm when mechanism unknown      | '_dd.p.anytag=123'                                          | SAMPLER_KEEP | SamplingMechanism.UNKNOWN    | '_dd.p.anytag=123'                                          | [_dd.p.anytag: '123']                                                 ",
+      "invalid input still updates dm    | ',_dd.p.dm=Value'                                           | SAMPLER_KEEP | SamplingMechanism.AGENT_RATE | '_dd.p.dm=-1'                                               | [_dd.propagation_error: 'decoding_error', _dd.p.dm: '-1']             "
+    })
+    void updatePropagationTagsSamplingMechanism(
+            String originalTagSet,
+            @ConvertWith(PrioritySamplingConverter.class) byte priority,
+            @ConvertWith(SamplingMechanismConverter.class) byte mechanism,
+            String expectedHeaderValue,
+            Map<String, String> tags) {
+        PropagationTags propagationTags = factory().fromHeaderValue(DATADOG, originalTagSet);
+
+        propagationTags.updateTraceSamplingPriority(priority, mechanism);
+
+        assertEquals(expectedHeaderValue, propagationTags.headerValue(DATADOG));
+        assertEquals(tags, propagationTags.createTagMap());
+    }
+
+    @TableTest({
+      "scenario             | originalTagSet       | product                  | expectedHeaderValue | tags                                     ",
+      "set ts on empty      | ''                   | ProductTraceSource.ASM   | '_dd.p.ts=02'       | [_dd.p.ts: '02']                         ",
+      "promote from 00      | '_dd.p.ts=00'        | ProductTraceSource.ASM   | '_dd.p.ts=02'       | [_dd.p.ts: '02']                         ",
+      "demote from FFC00000 | '_dd.p.ts=FFC00000'  | ProductTraceSource.ASM   | '_dd.p.ts=02'       | [_dd.p.ts: '02']                         ",
+      "add dbm on 02        | '_dd.p.ts=02'        | ProductTraceSource.DBM   | '_dd.p.ts=12'       | [_dd.p.ts: '12']                         ",
+      "invalid empty        | '_dd.p.ts='          | ProductTraceSource.UNSET |                     | [_dd.propagation_error: 'decoding_error']",
+      "invalid single 0     | '_dd.p.ts=0'         | ProductTraceSource.UNSET |                     | [_dd.propagation_error: 'decoding_error']",
+      "invalid char in pair | '_dd.p.ts=0G'        | ProductTraceSource.UNSET |                     | [_dd.propagation_error: 'decoding_error']",
+      "invalid chars only   | '_dd.p.ts=GG'        | ProductTraceSource.UNSET |                     | [_dd.propagation_error: 'decoding_error']",
+      "invalid foo          | '_dd.p.ts=foo'       | ProductTraceSource.UNSET |                     | [_dd.propagation_error: 'decoding_error']",
+      "invalid too long     | '_dd.p.ts=000000002' | ProductTraceSource.UNSET |                     | [_dd.propagation_error: 'decoding_error']"
+    })
+    void updatePropagationTagsTraceSourcePropagation(
+            String originalTagSet,
+            @ConvertWith(ProductTraceSourceConverter.class) int product,
+            String expectedHeaderValue,
+            Map<String, String> tags) {
+        PropagationTags propagationTags = factory().fromHeaderValue(DATADOG, originalTagSet);
+
+        propagationTags.addTraceSource(product);
+
+        assertEquals(expectedHeaderValue, propagationTags.headerValue(DATADOG));
+        assertEquals(tags, propagationTags.createTagMap());
+    }
+
+    @Test
+    void extractionLimitExceeded() {
+        String tags = "_dd.p.anytag=value";
+        int limit = tags.length() - 1;
+        PropagationTags propagationTags = factory(limit).fromHeaderValue(DATADOG, tags);
+
+        propagationTags.updateTraceSamplingPriority(USER_KEEP, MANUAL);
+
+        assertEquals("_dd.p.dm=-4", propagationTags.headerValue(DATADOG));
+        Map<String, String> expected = new HashMap<>();
+        expected.put("_dd.propagation_error", "extract_max_size");
+        expected.put("_dd.p.dm", "-4");
+        assertEquals(expected, propagationTags.createTagMap());
+    }
+
+    @Test
+    void injectionLimitExceeded() {
+        String tags = "_dd.p.anytag=value";
+        int limit = tags.length();
+        PropagationTags propagationTags = factory(limit).fromHeaderValue(DATADOG, tags);
+
+        propagationTags.updateTraceSamplingPriority(USER_KEEP, MANUAL);
+
+        assertNull(propagationTags.headerValue(DATADOG));
+        Map<String, String> expected = new HashMap<>();
+        expected.put("_dd.propagation_error", "inject_max_size");
+        assertEquals(expected, propagationTags.createTagMap());
+    }
+
+    @Test
+    void injectionLimitExceededLimit0() {
+        PropagationTags propagationTags = factory(0).fromHeaderValue(DATADOG, "");
+
+        propagationTags.updateTraceSamplingPriority(USER_KEEP, MANUAL);
+
+        assertNull(propagationTags.headerValue(DATADOG));
+        Map<String, String> expected = new HashMap<>();
+        expected.put("_dd.propagation_error", "disabled");
+        assertEquals(expected, propagationTags.createTagMap());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HaystackHttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HaystackHttpExtractorTest.java
index 6bf02211256..666d4a45dba 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HaystackHttpExtractorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HaystackHttpExtractorTest.java
@@ -38,144 +38,131 @@
 import org.tabletest.junit.TableTest;
 
 class HaystackHttpExtractorTest extends AbstractHttpExtractorTest {
-  @Override
-  protected HttpCodec.Extractor newExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier) {
-    return HaystackHttpCodec.newExtractor(config, traceConfigSupplier);
-  }
-
-  @Nested
-  class BaggageLimits extends AbstractOTBaggageTest {
     @Override
-    protected HttpCodec.Extractor extractor() {
-      return HaystackHttpExtractorTest.this.extractor;
+    protected HttpCodec.Extractor newExtractor(Config config, Supplier<TraceConfig> traceConfigSupplier) {
+        return HaystackHttpCodec.newExtractor(config, traceConfigSupplier);
     }
 
-    @Override
-    protected Map<String, String> baggageHeaders(List<Entry<String, String>> items) {
-      return otBaggageHeaders(OT_BAGGAGE_PREFIX, items);
+    @Nested
+    class BaggageLimits extends AbstractOTBaggageTest {
+        @Override
+        protected HttpCodec.Extractor extractor() {
+            return HaystackHttpExtractorTest.this.extractor;
+        }
+
+        @Override
+        protected Map<String, String> baggageHeaders(List<Entry<String, String>> items) {
+            return otBaggageHeaders(OT_BAGGAGE_PREFIX, items);
+        }
+    }
+
+    @Test
+    @WithConfig(key = TRACE_BAGGAGE_MAX_ITEMS, value = "1")
+    void extractKeepsHaystackIdsWhenBaggageLimitReached() {
+        // the Haystack ids are recorded by the tracer for lossless injection, so caller supplied
+        // Baggage-* headers must not be able to evict them by exhausting the item limit
+        Map<String, String> headers = new HashMap<>(otBaggageHeaders(OT_BAGGAGE_PREFIX, generateBaggageItems(50)));
+        headers.put(TRACE_ID_KEY, "44617461-646f-6721-0000-000000000001");
+        headers.put(SPAN_ID_KEY, "44617461-646f-6721-0000-000000000002");
+
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        assertEquals(
+                "44617461-646f-6721-0000-000000000001", context.getBaggage().get(HAYSTACK_TRACE_ID_BAGGAGE_KEY));
+        assertEquals(
+                "44617461-646f-6721-0000-000000000002", context.getBaggage().get(HAYSTACK_SPAN_ID_BAGGAGE_KEY));
+    }
+
+    @Test
+    void extractUsesFirstConcatenatedHaystackIdHeaderValue() {
+        String traceUuid = "44617461-646f-6721-0000-000000000001";
+        String spanUuid = "44617461-646f-6721-0000-000000000002";
+        String parentUuid = "44617461-646f-6721-0000-000000000005";
+        Map<String, String> headers = headers(
+                TRACE_ID_KEY,
+                traceUuid + ",44617461-646f-6721-0000-000000000003",
+                SPAN_ID_KEY,
+                spanUuid + ",44617461-646f-6721-0000-000000000004",
+                PARENT_ID_KEY,
+                parentUuid + ",44617461-646f-6721-0000-000000000006");
+
+        ExtractedContext context = (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
+
+        assertEquals(DDTraceId.from(1), context.getTraceId());
+        assertEquals(DDSpanId.from("2"), context.getSpanId());
+        assertEquals(traceUuid, context.getBaggage().get(HAYSTACK_TRACE_ID_BAGGAGE_KEY));
+        assertEquals(spanUuid, context.getBaggage().get(HAYSTACK_SPAN_ID_BAGGAGE_KEY));
+        assertEquals(parentUuid, context.getBaggage().get(HAYSTACK_PARENT_ID_BAGGAGE_KEY));
     }
-  }
-
-  @Test
-  @WithConfig(key = TRACE_BAGGAGE_MAX_ITEMS, value = "1")
-  void extractKeepsHaystackIdsWhenBaggageLimitReached() {
-    // the Haystack ids are recorded by the tracer for lossless injection, so caller supplied
-    // Baggage-* headers must not be able to evict them by exhausting the item limit
-    Map<String, String> headers =
-        new HashMap<>(otBaggageHeaders(OT_BAGGAGE_PREFIX, generateBaggageItems(50)));
-    headers.put(TRACE_ID_KEY, "44617461-646f-6721-0000-000000000001");
-    headers.put(SPAN_ID_KEY, "44617461-646f-6721-0000-000000000002");
-
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    assertEquals(
-        "44617461-646f-6721-0000-000000000001",
-        context.getBaggage().get(HAYSTACK_TRACE_ID_BAGGAGE_KEY));
-    assertEquals(
-        "44617461-646f-6721-0000-000000000002",
-        context.getBaggage().get(HAYSTACK_SPAN_ID_BAGGAGE_KEY));
-  }
-
-  @Test
-  void extractUsesFirstConcatenatedHaystackIdHeaderValue() {
-    String traceUuid = "44617461-646f-6721-0000-000000000001";
-    String spanUuid = "44617461-646f-6721-0000-000000000002";
-    String parentUuid = "44617461-646f-6721-0000-000000000005";
-    Map<String, String> headers =
-        headers(
-            TRACE_ID_KEY,
-            traceUuid + ",44617461-646f-6721-0000-000000000003",
-            SPAN_ID_KEY,
-            spanUuid + ",44617461-646f-6721-0000-000000000004",
-            PARENT_ID_KEY,
-            parentUuid + ",44617461-646f-6721-0000-000000000006");
-
-    ExtractedContext context =
-        (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
-
-    assertEquals(DDTraceId.from(1), context.getTraceId());
-    assertEquals(DDSpanId.from("2"), context.getSpanId());
-    assertEquals(traceUuid, context.getBaggage().get(HAYSTACK_TRACE_ID_BAGGAGE_KEY));
-    assertEquals(spanUuid, context.getBaggage().get(HAYSTACK_SPAN_ID_BAGGAGE_KEY));
-    assertEquals(parentUuid, context.getBaggage().get(HAYSTACK_PARENT_ID_BAGGAGE_KEY));
-  }
-
-  @Test
-  void extractRetainsParentIdAsBaggage() {
-    // Parent-ID is not read back when injecting, so it is kept as ordinary caller baggage and
-    // still propagated downstream as Baggage-Haystack-Parent-ID
-    Map<String, String> headers =
-        headers(
-            TRACE_ID_KEY,
-            "44617461-646f-6721-0000-000000000001",
-            SPAN_ID_KEY,
-            "44617461-646f-6721-0000-000000000002",
-            PARENT_ID_KEY,
-            "44617461-646f-6721-0000-000000000003");
-
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    assertEquals(
-        "44617461-646f-6721-0000-000000000003",
-        context.getBaggage().get(HAYSTACK_PARENT_ID_BAGGAGE_KEY));
-  }
-
-  @Test
-  void extractDropsOversizedParentId() {
-    // unlike the reserved trace and span ids, Parent-ID is subject to the baggage limits
-    Map<String, String> headers =
-        headers(
-            TRACE_ID_KEY,
-            "44617461-646f-6721-0000-000000000001",
-            SPAN_ID_KEY,
-            "44617461-646f-6721-0000-000000000002",
-            PARENT_ID_KEY,
-            repeat('x', 10_000));
-
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    assertFalse(context.getBaggage().containsKey(HAYSTACK_PARENT_ID_BAGGAGE_KEY));
-  }
-
-  @Test
-  void extractDoesNotReserveOversizedTraceId() {
-    // reserved values skip the baggage budget, so they are capped to keep the overshoot fixed
-    Map<String, String> headers =
-        headers(
-            TRACE_ID_KEY,
-            repeat('a', 10_000) + "-646f-6721-0000-000000000001",
-            SPAN_ID_KEY,
-            "44617461-646f-6721-0000-000000000002");
-
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    // only the last two UUID segments carry the DataDog id, so extraction still succeeds
-    assertEquals(DDTraceId.fromHex("0000000000000001"), context.getTraceId());
-    assertFalse(context.getBaggage().containsKey(HAYSTACK_TRACE_ID_BAGGAGE_KEY));
-  }
-
-  private static String repeat(char value, int count) {
-    StringBuilder result = new StringBuilder(count);
-    for (int i = 0; i < count; i++) {
-      result.append(value);
+
+    @Test
+    void extractRetainsParentIdAsBaggage() {
+        // Parent-ID is not read back when injecting, so it is kept as ordinary caller baggage and
+        // still propagated downstream as Baggage-Haystack-Parent-ID
+        Map<String, String> headers = headers(
+                TRACE_ID_KEY,
+                "44617461-646f-6721-0000-000000000001",
+                SPAN_ID_KEY,
+                "44617461-646f-6721-0000-000000000002",
+                PARENT_ID_KEY,
+                "44617461-646f-6721-0000-000000000003");
+
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        assertEquals(
+                "44617461-646f-6721-0000-000000000003", context.getBaggage().get(HAYSTACK_PARENT_ID_BAGGAGE_KEY));
     }
-    return result.toString();
-  }
-
-  @TableTest({
-    "scenario         | traceId | spanId                 | traceUuid                              | spanUuid                              ",
-    "small ids        | '1'     | '2'                    | '44617461-646f-6721-0000-000000000001' | '44617461-646f-6721-0000-000000000002'",
-    "incrementing ids | '2'     | '3'                    | '44617461-646f-6721-0000-000000000002' | '44617461-646f-6721-0000-000000000003'",
-    "uint64 max       | 'MAX'   | '18446744073709551609' | '44617461-646f-6721-ffff-ffffffffffff' | '44617461-646f-6721-ffff-fffffffffff9'",
-    "uint64 max-1     | 'MAX-1' | '18446744073709551608' | '44617461-646f-6721-ffff-fffffffffffe' | '44617461-646f-6721-ffff-fffffffffff8'"
-  })
-  void extractHttpHeaders(
-      @ConvertWith(TraceIdConverter.class) String traceId,
-      String spanId,
-      String traceUuid,
-      String spanUuid) {
-    // spotless:off
+
+    @Test
+    void extractDropsOversizedParentId() {
+        // unlike the reserved trace and span ids, Parent-ID is subject to the baggage limits
+        Map<String, String> headers = headers(
+                TRACE_ID_KEY,
+                "44617461-646f-6721-0000-000000000001",
+                SPAN_ID_KEY,
+                "44617461-646f-6721-0000-000000000002",
+                PARENT_ID_KEY,
+                repeat('x', 10_000));
+
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        assertFalse(context.getBaggage().containsKey(HAYSTACK_PARENT_ID_BAGGAGE_KEY));
+    }
+
+    @Test
+    void extractDoesNotReserveOversizedTraceId() {
+        // reserved values skip the baggage budget, so they are capped to keep the overshoot fixed
+        Map<String, String> headers = headers(
+                TRACE_ID_KEY,
+                repeat('a', 10_000) + "-646f-6721-0000-000000000001",
+                SPAN_ID_KEY,
+                "44617461-646f-6721-0000-000000000002");
+
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        // only the last two UUID segments carry the DataDog id, so extraction still succeeds
+        assertEquals(DDTraceId.fromHex("0000000000000001"), context.getTraceId());
+        assertFalse(context.getBaggage().containsKey(HAYSTACK_TRACE_ID_BAGGAGE_KEY));
+    }
+
+    private static String repeat(char value, int count) {
+        StringBuilder result = new StringBuilder(count);
+        for (int i = 0; i < count; i++) {
+            result.append(value);
+        }
+        return result.toString();
+    }
+
+    @TableTest({
+      "scenario         | traceId | spanId                 | traceUuid                              | spanUuid                              ",
+      "small ids        | '1'     | '2'                    | '44617461-646f-6721-0000-000000000001' | '44617461-646f-6721-0000-000000000002'",
+      "incrementing ids | '2'     | '3'                    | '44617461-646f-6721-0000-000000000002' | '44617461-646f-6721-0000-000000000003'",
+      "uint64 max       | 'MAX'   | '18446744073709551609' | '44617461-646f-6721-ffff-ffffffffffff' | '44617461-646f-6721-ffff-fffffffffff9'",
+      "uint64 max-1     | 'MAX-1' | '18446744073709551608' | '44617461-646f-6721-ffff-fffffffffffe' | '44617461-646f-6721-ffff-fffffffffff8'"
+    })
+    void extractHttpHeaders(
+            @ConvertWith(TraceIdConverter.class) String traceId, String spanId, String traceUuid, String spanUuid) {
+        // spotless:off
     Map<String, String> headers = headers(
         "", "empty key",
         TRACE_ID_KEY, traceUuid,
@@ -189,38 +176,37 @@ void extractHttpHeaders(
     );
     // spotless:on
 
-    ExtractedContext context =
-        (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
-
-    assertEquals(DDTraceId.from(traceId), context.getTraceId());
-    assertEquals(DDSpanId.from(spanId), context.getSpanId());
-    Map<String, String> expectedBaggage = new HashMap<>();
-    expectedBaggage.put("k1", "v1");
-    expectedBaggage.put("k2", "v2");
-    expectedBaggage.put("k3", "%76%33"); // expect value decoded only once
-    expectedBaggage.put(HAYSTACK_TRACE_ID_BAGGAGE_KEY, traceUuid);
-    expectedBaggage.put(HAYSTACK_SPAN_ID_BAGGAGE_KEY, spanUuid);
-    expectedBaggage.put(SOME_BAGGAGE, "my-interesting-baggage-info");
-    expectedBaggage.put(SOME_CASE_SENSITIVE_BAGGAGE, "my-interesting-baggage-info-2");
-    assertEquals(expectedBaggage, context.getBaggage());
-    assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
-    assertEquals(SAMPLER_KEEP, context.getSamplingPriority());
-    assertNull(context.getOrigin());
-  }
-
-  @Test
-  void extractHeaderTagsWithNoPropagation() {
-    Map<String, String> headers = headers(SOME_HEADER, "my-interesting-info");
-
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    assertFalse(context instanceof ExtractedContext);
-    assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
-  }
-
-  @Test
-  void extractHttpHeadersWithInvalidNonNumericId() {
-    // spotless:off
+        ExtractedContext context = (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
+
+        assertEquals(DDTraceId.from(traceId), context.getTraceId());
+        assertEquals(DDSpanId.from(spanId), context.getSpanId());
+        Map<String, String> expectedBaggage = new HashMap<>();
+        expectedBaggage.put("k1", "v1");
+        expectedBaggage.put("k2", "v2");
+        expectedBaggage.put("k3", "%76%33"); // expect value decoded only once
+        expectedBaggage.put(HAYSTACK_TRACE_ID_BAGGAGE_KEY, traceUuid);
+        expectedBaggage.put(HAYSTACK_SPAN_ID_BAGGAGE_KEY, spanUuid);
+        expectedBaggage.put(SOME_BAGGAGE, "my-interesting-baggage-info");
+        expectedBaggage.put(SOME_CASE_SENSITIVE_BAGGAGE, "my-interesting-baggage-info-2");
+        assertEquals(expectedBaggage, context.getBaggage());
+        assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
+        assertEquals(SAMPLER_KEEP, context.getSamplingPriority());
+        assertNull(context.getOrigin());
+    }
+
+    @Test
+    void extractHeaderTagsWithNoPropagation() {
+        Map<String, String> headers = headers(SOME_HEADER, "my-interesting-info");
+
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        assertFalse(context instanceof ExtractedContext);
+        assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
+    }
+
+    @Test
+    void extractHttpHeadersWithInvalidNonNumericId() {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, "traceId",
         SPAN_ID_KEY, "spanId",
@@ -230,14 +216,14 @@ void extractHttpHeadersWithInvalidNonNumericId() {
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
 
-    assertNull(context);
-  }
+        assertNull(context);
+    }
 
-  @Test
-  void extractHttpHeadersWithOutOfRangeTraceId() {
-    // spotless:off
+    @Test
+    void extractHttpHeadersWithOutOfRangeTraceId() {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, TRACE_ID_MAX_PLUS_1,
         SPAN_ID_KEY, "0",
@@ -247,14 +233,14 @@ void extractHttpHeadersWithOutOfRangeTraceId() {
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
 
-    assertNull(context);
-  }
+        assertNull(context);
+    }
 
-  @Test
-  void extractHttpHeadersWithOutOfRangeSpanId() {
-    // spotless:off
+    @Test
+    void extractHttpHeadersWithOutOfRangeSpanId() {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, "0",
         SPAN_ID_KEY, "-1",
@@ -264,20 +250,20 @@ void extractHttpHeadersWithOutOfRangeSpanId() {
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
 
-    assertNull(context);
-  }
+        assertNull(context);
+    }
 
-  @TableTest({
-    "scenario       | traceId                                | spanId                                 | ctxCreated",
-    "negative trace | '-1'                                   | '1'                                    | false     ",
-    "negative span  | '1'                                    | '-1'                                   | false     ",
-    "zero traceId   | '0'                                    | '1'                                    | true      ",
-    "uuid format    | '44617461-646f-6721-463a-c35c9f6413ad' | '44617461-646f-6721-463a-c35c9f6413ad' | true      "
-  })
-  void baggageIsMappedOnContextCreation(String traceId, String spanId, boolean ctxCreated) {
-    // spotless:off
+    @TableTest({
+      "scenario       | traceId                                | spanId                                 | ctxCreated",
+      "negative trace | '-1'                                   | '1'                                    | false     ",
+      "negative span  | '1'                                    | '-1'                                   | false     ",
+      "zero traceId   | '0'                                    | '1'                                    | true      ",
+      "uuid format    | '44617461-646f-6721-463a-c35c9f6413ad' | '44617461-646f-6721-463a-c35c9f6413ad' | true      "
+    })
+    void baggageIsMappedOnContextCreation(String traceId, String spanId, boolean ctxCreated) {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, traceId,
         SPAN_ID_KEY, spanId,
@@ -288,61 +274,57 @@ void baggageIsMappedOnContextCreation(String traceId, String spanId, boolean ctx
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    if (ctxCreated) {
-      assertNotNull(context);
-      Map<String, String> expectedBaggage = new HashMap<>();
-      expectedBaggage.put(HAYSTACK_TRACE_ID_BAGGAGE_KEY, traceId);
-      expectedBaggage.put(HAYSTACK_SPAN_ID_BAGGAGE_KEY, spanId);
-      expectedBaggage.put(SOME_BAGGAGE, "mappedBaggageValue");
-      expectedBaggage.put("k1", "v1");
-      expectedBaggage.put("k2", "v2");
-      assertEquals(expectedBaggage, context.getBaggage());
-    } else {
-      assertNull(context);
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        if (ctxCreated) {
+            assertNotNull(context);
+            Map<String, String> expectedBaggage = new HashMap<>();
+            expectedBaggage.put(HAYSTACK_TRACE_ID_BAGGAGE_KEY, traceId);
+            expectedBaggage.put(HAYSTACK_SPAN_ID_BAGGAGE_KEY, spanId);
+            expectedBaggage.put(SOME_BAGGAGE, "mappedBaggageValue");
+            expectedBaggage.put("k1", "v1");
+            expectedBaggage.put("k2", "v2");
+            assertEquals(expectedBaggage, context.getBaggage());
+        } else {
+            assertNull(context);
+        }
     }
-  }
-
-  @TableTest({
-    "scenario               | traceId                                | spanId                                 | expectedTraceIdLong | expectedSpanId      | ctxCreated",
-    "negative traceId       | '-1'                                   | '1'                                    |                     | 0                   | false     ",
-    "negative spanId        | '1'                                    | '-1'                                   |                     | 0                   | false     ",
-    "zero traceId           | '0'                                    | '1'                                    |                     | 0                   | true      ",
-    "padded ones            | '00001'                                | '00001'                                | 1                   | 1                   | true      ",
-    "64-bit hex             | '463ac35c9f6413ad'                     | '463ac35c9f6413ad'                     | 5060571933882717101 | 5060571933882717101 | true      ",
-    "128-bit hex truncated  | '463ac35c9f6413ad48485a3953bb6124'     | '1'                                    | 5208512171318403364 | 1                   | true      ",
-    "uuid format same       | '44617461-646f-6721-463a-c35c9f6413ad' | '44617461-646f-6721-463a-c35c9f6413ad' | 5060571933882717101 | 5060571933882717101 | true      ",
-    "uint64 max 64-bit      | 'ffffffffffffffff'                     | '1'                                    | -1                  | 1                   | true      ",
-    "128-bit high+low max   | 'aaaaaaaaaaaaaaaaffffffffffffffff'     | '1'                                    | -1                  | 1                   | true      ",
-    "traceId too long high1 | '1ffffffffffffffffffffffffffffffff'    | '1'                                    |                     | 1                   | false     ",
-    "traceId too long high0 | '0ffffffffffffffffffffffffffffffff'    | '1'                                    |                     | 1                   | false     ",
-    "uint64 max spanId      | '1'                                    | 'ffffffffffffffff'                     | 1                   | -1                  | true      ",
-    "spanId too long        | '1'                                    | '1ffffffffffffffff'                    |                     | 0                   | false     ",
-    "padded uint64 max span | '1'                                    | '000ffffffffffffffff'                  | 1                   | -1                  | true      "
-  })
-  void extract128BitIdTruncatesIdTo64Bit(
-      String traceId,
-      String spanId,
-      Long expectedTraceIdLong,
-      long expectedSpanId,
-      boolean ctxCreated) {
-    // spotless:off
+
+    @TableTest({
+      "scenario               | traceId                                | spanId                                 | expectedTraceIdLong | expectedSpanId      | ctxCreated",
+      "negative traceId       | '-1'                                   | '1'                                    |                     | 0                   | false     ",
+      "negative spanId        | '1'                                    | '-1'                                   |                     | 0                   | false     ",
+      "zero traceId           | '0'                                    | '1'                                    |                     | 0                   | true      ",
+      "padded ones            | '00001'                                | '00001'                                | 1                   | 1                   | true      ",
+      "64-bit hex             | '463ac35c9f6413ad'                     | '463ac35c9f6413ad'                     | 5060571933882717101 | 5060571933882717101 | true      ",
+      "128-bit hex truncated  | '463ac35c9f6413ad48485a3953bb6124'     | '1'                                    | 5208512171318403364 | 1                   | true      ",
+      "uuid format same       | '44617461-646f-6721-463a-c35c9f6413ad' | '44617461-646f-6721-463a-c35c9f6413ad' | 5060571933882717101 | 5060571933882717101 | true      ",
+      "uint64 max 64-bit      | 'ffffffffffffffff'                     | '1'                                    | -1                  | 1                   | true      ",
+      "128-bit high+low max   | 'aaaaaaaaaaaaaaaaffffffffffffffff'     | '1'                                    | -1                  | 1                   | true      ",
+      "traceId too long high1 | '1ffffffffffffffffffffffffffffffff'    | '1'                                    |                     | 1                   | false     ",
+      "traceId too long high0 | '0ffffffffffffffffffffffffffffffff'    | '1'                                    |                     | 1                   | false     ",
+      "uint64 max spanId      | '1'                                    | 'ffffffffffffffff'                     | 1                   | -1                  | true      ",
+      "spanId too long        | '1'                                    | '1ffffffffffffffff'                    |                     | 0                   | false     ",
+      "padded uint64 max span | '1'                                    | '000ffffffffffffffff'                  | 1                   | -1                  | true      "
+    })
+    void extract128BitIdTruncatesIdTo64Bit(
+            String traceId, String spanId, Long expectedTraceIdLong, long expectedSpanId, boolean ctxCreated) {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, traceId,
         SPAN_ID_KEY, spanId);
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    if (expectedTraceIdLong != null) {
-      assertEquals(DDTraceId.from(expectedTraceIdLong), context.getTraceId());
-      assertEquals(expectedSpanId, context.getSpanId());
-    }
-    if (ctxCreated) {
-      assertNotNull(context);
-    } else {
-      assertNull(context);
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        if (expectedTraceIdLong != null) {
+            assertEquals(DDTraceId.from(expectedTraceIdLong), context.getTraceId());
+            assertEquals(expectedSpanId, context.getSpanId());
+        }
+        if (ctxCreated) {
+            assertNotNull(context);
+        } else {
+            assertNull(context);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HaystackHttpInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HaystackHttpInjectorTest.java
index 211663c4381..e4a470f378a 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HaystackHttpInjectorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HaystackHttpInjectorTest.java
@@ -22,85 +22,83 @@
 import org.tabletest.junit.TableTest;
 
 class HaystackHttpInjectorTest extends AbstractHttpInjectorTest {
-  // UUID representation of DDSpanId.ZERO
-  private static final String ZERO_UUID = "44617461-646f-6721-0000-000000000000";
+    // UUID representation of DDSpanId.ZERO
+    private static final String ZERO_UUID = "44617461-646f-6721-0000-000000000000";
 
-  @Override
-  protected HttpCodec.Injector newInjector() {
-    return HaystackHttpCodec.newInjector(singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER"));
-  }
+    @Override
+    protected HttpCodec.Injector newInjector() {
+        return HaystackHttpCodec.newInjector(singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER"));
+    }
 
-  @TableTest({
-    "scenario            | traceId | spanId  | traceUuid                              | spanUuid                              ",
-    "small ids           | '1'     | '2'     | '44617461-646f-6721-0000-000000000001' | '44617461-646f-6721-0000-000000000002'",
-    "small ids duplicate | '1'     | '2'     | '44617461-646f-6721-0000-000000000001' | '44617461-646f-6721-0000-000000000002'",
-    "uint64 max trace    | 'MAX'   | 'MAX-1' | '44617461-646f-6721-ffff-ffffffffffff' | '44617461-646f-6721-ffff-fffffffffffe'",
-    "uint64 max-1 trace  | 'MAX-1' | 'MAX'   | '44617461-646f-6721-ffff-fffffffffffe' | '44617461-646f-6721-ffff-ffffffffffff'"
-  })
-  void injectHttpHeaders(
-      @ConvertWith(TraceIdConverter.class) String traceId,
-      @ConvertWith(TraceIdConverter.class) String spanId,
-      String traceUuid,
-      String spanUuid) {
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("k1", "v1");
-    baggage.put("k2", "v2");
-    baggage.put("some-baggage-key", "some-value");
-    DDSpanContext spanContext = mockSpanContext(traceId, spanId, baggage);
-    Map<String, String> carrier = new HashMap<>();
+    @TableTest({
+      "scenario            | traceId | spanId  | traceUuid                              | spanUuid                              ",
+      "small ids           | '1'     | '2'     | '44617461-646f-6721-0000-000000000001' | '44617461-646f-6721-0000-000000000002'",
+      "small ids duplicate | '1'     | '2'     | '44617461-646f-6721-0000-000000000001' | '44617461-646f-6721-0000-000000000002'",
+      "uint64 max trace    | 'MAX'   | 'MAX-1' | '44617461-646f-6721-ffff-ffffffffffff' | '44617461-646f-6721-ffff-fffffffffffe'",
+      "uint64 max-1 trace  | 'MAX-1' | 'MAX'   | '44617461-646f-6721-ffff-fffffffffffe' | '44617461-646f-6721-ffff-ffffffffffff'"
+    })
+    void injectHttpHeaders(
+            @ConvertWith(TraceIdConverter.class) String traceId,
+            @ConvertWith(TraceIdConverter.class) String spanId,
+            String traceUuid,
+            String spanUuid) {
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("k1", "v1");
+        baggage.put("k2", "v2");
+        baggage.put("some-baggage-key", "some-value");
+        DDSpanContext spanContext = mockSpanContext(traceId, spanId, baggage);
+        Map<String, String> carrier = new HashMap<>();
 
-    this.injector.inject(spanContext, carrier, Map::put);
+        this.injector.inject(spanContext, carrier, Map::put);
 
-    assertEquals(traceUuid, carrier.get(TRACE_ID_KEY));
-    assertEquals(traceUuid, spanContext.unsafeGetTag(HAYSTACK_TRACE_ID_BAGGAGE_KEY));
-    assertEquals(traceId, carrier.get(DD_TRACE_ID_BAGGAGE_KEY));
-    assertEquals(spanUuid, carrier.get(SPAN_ID_KEY));
-    assertEquals(spanId, carrier.get(DD_SPAN_ID_BAGGAGE_KEY));
-    assertEquals(ZERO_UUID, carrier.get(PARENT_ID_KEY));
-    assertEquals("0", carrier.get(DD_PARENT_ID_BAGGAGE_KEY));
-    assertEquals("v1", carrier.get(OT_BAGGAGE_PREFIX + "k1"));
-    assertEquals("v2", carrier.get(OT_BAGGAGE_PREFIX + "k2"));
-    assertEquals("some-value", carrier.get("SOME_CUSTOM_HEADER"));
-    assertEquals(9, carrier.size());
-  }
+        assertEquals(traceUuid, carrier.get(TRACE_ID_KEY));
+        assertEquals(traceUuid, spanContext.unsafeGetTag(HAYSTACK_TRACE_ID_BAGGAGE_KEY));
+        assertEquals(traceId, carrier.get(DD_TRACE_ID_BAGGAGE_KEY));
+        assertEquals(spanUuid, carrier.get(SPAN_ID_KEY));
+        assertEquals(spanId, carrier.get(DD_SPAN_ID_BAGGAGE_KEY));
+        assertEquals(ZERO_UUID, carrier.get(PARENT_ID_KEY));
+        assertEquals("0", carrier.get(DD_PARENT_ID_BAGGAGE_KEY));
+        assertEquals("v1", carrier.get(OT_BAGGAGE_PREFIX + "k1"));
+        assertEquals("v2", carrier.get(OT_BAGGAGE_PREFIX + "k2"));
+        assertEquals("some-value", carrier.get("SOME_CUSTOM_HEADER"));
+        assertEquals(9, carrier.size());
+    }
 
-  @TableTest({
-    "scenario            | traceId | spanId  | traceUuid                              | spanUuid                              ",
-    "small ids           | '1'     | '2'     | '54617461-646f-6721-0000-000000000001' | '44617461-646f-6721-0000-000000000002'",
-    "small ids duplicate | '1'     | '2'     | '54617461-646f-6721-0000-000000000001' | '44617461-646f-6721-0000-000000000002'",
-    "uint64 max trace    | 'MAX'   | 'MAX-1' | '54617461-646f-6721-ffff-ffffffffffff' | '44617461-646f-6721-ffff-fffffffffffe'",
-    "uint64 max-1 trace  | 'MAX-1' | 'MAX'   | '54617461-646f-6721-ffff-fffffffffffe' | '44617461-646f-6721-ffff-ffffffffffff'"
-  })
-  void injectHttpHeadersWithHaystackTraceIdInBaggage(
-      @ConvertWith(TraceIdConverter.class) String traceId,
-      @ConvertWith(TraceIdConverter.class) String spanId,
-      String traceUuid,
-      String spanUuid) {
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("k1", "v1");
-    baggage.put("k2", "v2");
-    baggage.put(HAYSTACK_TRACE_ID_BAGGAGE_KEY, traceUuid);
-    DDSpanContext spanContext = mockSpanContext(traceId, spanId, baggage);
-    Map<String, String> carrier = new HashMap<>();
+    @TableTest({
+      "scenario            | traceId | spanId  | traceUuid                              | spanUuid                              ",
+      "small ids           | '1'     | '2'     | '54617461-646f-6721-0000-000000000001' | '44617461-646f-6721-0000-000000000002'",
+      "small ids duplicate | '1'     | '2'     | '54617461-646f-6721-0000-000000000001' | '44617461-646f-6721-0000-000000000002'",
+      "uint64 max trace    | 'MAX'   | 'MAX-1' | '54617461-646f-6721-ffff-ffffffffffff' | '44617461-646f-6721-ffff-fffffffffffe'",
+      "uint64 max-1 trace  | 'MAX-1' | 'MAX'   | '54617461-646f-6721-ffff-fffffffffffe' | '44617461-646f-6721-ffff-ffffffffffff'"
+    })
+    void injectHttpHeadersWithHaystackTraceIdInBaggage(
+            @ConvertWith(TraceIdConverter.class) String traceId,
+            @ConvertWith(TraceIdConverter.class) String spanId,
+            String traceUuid,
+            String spanUuid) {
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("k1", "v1");
+        baggage.put("k2", "v2");
+        baggage.put(HAYSTACK_TRACE_ID_BAGGAGE_KEY, traceUuid);
+        DDSpanContext spanContext = mockSpanContext(traceId, spanId, baggage);
+        Map<String, String> carrier = new HashMap<>();
 
-    this.injector.inject(spanContext, carrier, Map::put);
+        this.injector.inject(spanContext, carrier, Map::put);
 
-    assertEquals(traceUuid, carrier.get(TRACE_ID_KEY));
-    assertEquals(traceUuid, spanContext.unsafeGetTag(HAYSTACK_TRACE_ID_BAGGAGE_KEY));
-    assertEquals(traceId, carrier.get(DD_TRACE_ID_BAGGAGE_KEY));
-    assertEquals(spanUuid, carrier.get(SPAN_ID_KEY));
-    assertEquals(spanId, carrier.get(DD_SPAN_ID_BAGGAGE_KEY));
-    assertEquals(ZERO_UUID, carrier.get(PARENT_ID_KEY));
-    assertEquals("0", carrier.get(DD_PARENT_ID_BAGGAGE_KEY));
-    assertEquals("v1", carrier.get(OT_BAGGAGE_PREFIX + "k1"));
-    assertEquals("v2", carrier.get(OT_BAGGAGE_PREFIX + "k2"));
-    assertEquals(traceUuid, carrier.get(OT_BAGGAGE_PREFIX + "Haystack-Trace-ID"));
-    assertEquals(9, carrier.size());
-  }
+        assertEquals(traceUuid, carrier.get(TRACE_ID_KEY));
+        assertEquals(traceUuid, spanContext.unsafeGetTag(HAYSTACK_TRACE_ID_BAGGAGE_KEY));
+        assertEquals(traceId, carrier.get(DD_TRACE_ID_BAGGAGE_KEY));
+        assertEquals(spanUuid, carrier.get(SPAN_ID_KEY));
+        assertEquals(spanId, carrier.get(DD_SPAN_ID_BAGGAGE_KEY));
+        assertEquals(ZERO_UUID, carrier.get(PARENT_ID_KEY));
+        assertEquals("0", carrier.get(DD_PARENT_ID_BAGGAGE_KEY));
+        assertEquals("v1", carrier.get(OT_BAGGAGE_PREFIX + "k1"));
+        assertEquals("v2", carrier.get(OT_BAGGAGE_PREFIX + "k2"));
+        assertEquals(traceUuid, carrier.get(OT_BAGGAGE_PREFIX + "Haystack-Trace-ID"));
+        assertEquals(9, carrier.size());
+    }
 
-  private DDSpanContext mockSpanContext(
-      String traceId, String spanId, Map<String, String> baggage) {
-    return mockSpanContext(
-        DDTraceId.from(traceId), DDSpanId.from(spanId), SAMPLER_KEEP, null, baggage, null);
-  }
+    private DDSpanContext mockSpanContext(String traceId, String spanId, Map<String, String> baggage) {
+        return mockSpanContext(DDTraceId.from(traceId), DDSpanId.from(spanId), SAMPLER_KEEP, null, baggage, null);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpCodecTestHelper.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpCodecTestHelper.java
index f7473bf150d..4c217b3c86c 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpCodecTestHelper.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpCodecTestHelper.java
@@ -13,71 +13,71 @@
 
 /** Helper class used only for tests to bridge package-private classes */
 public class HttpCodecTestHelper {
-  // W3C Trace Context standard header names (W3CHttpCodec is package-private)
-  public static final String TRACE_PARENT_KEY = W3CHttpCodec.TRACE_PARENT_KEY;
-  public static final String TRACE_STATE_KEY = W3CHttpCodec.TRACE_STATE_KEY;
+    // W3C Trace Context standard header names (W3CHttpCodec is package-private)
+    public static final String TRACE_PARENT_KEY = W3CHttpCodec.TRACE_PARENT_KEY;
+    public static final String TRACE_STATE_KEY = W3CHttpCodec.TRACE_STATE_KEY;
 
-  public static HttpCodec.Extractor newW3cHttpCodecExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier) {
-    return W3CHttpCodec.newExtractor(config, traceConfigSupplier);
-  }
+    public static HttpCodec.Extractor newW3cHttpCodecExtractor(
+            Config config, Supplier<TraceConfig> traceConfigSupplier) {
+        return W3CHttpCodec.newExtractor(config, traceConfigSupplier);
+    }
 
-  /**
-   * Returns the given baggage key and value pairs, in order. A key may be repeated to exercise the
-   * replacement of a value already recorded.
-   */
-  static List<Entry<String, String>> baggageItems(String... keysAndValues) {
-    List<Entry<String, String>> items = new ArrayList<>();
-    for (int i = 0; i < keysAndValues.length; i += 2) {
-      items.add(new SimpleImmutableEntry<>(keysAndValues[i], keysAndValues[i + 1]));
+    /**
+     * Returns the given baggage key and value pairs, in order. A key may be repeated to exercise the
+     * replacement of a value already recorded.
+     */
+    static List<Entry<String, String>> baggageItems(String... keysAndValues) {
+        List<Entry<String, String>> items = new ArrayList<>();
+        for (int i = 0; i < keysAndValues.length; i += 2) {
+            items.add(new SimpleImmutableEntry<>(keysAndValues[i], keysAndValues[i + 1]));
+        }
+        return items;
     }
-    return items;
-  }
 
-  /**
-   * Returns {@code itemCount} generated baggage items, mapping {@code key0} to {@code value0}
-   * through {@code key(itemCount-1)} to {@code value(itemCount-1)}.
-   *
-   * <p>While the indices stay below 10, every item is exactly 10 characters of key plus value,
-   * which is what lets the byte limit cases state a limit as a number of items.
-   */
-  static List<Entry<String, String>> generateBaggageItems(int itemCount) {
-    List<Entry<String, String>> items = new ArrayList<>();
-    for (int i = 0; i < itemCount; i++) {
-      items.add(new SimpleImmutableEntry<>("key" + i, "value" + i));
+    /**
+     * Returns {@code itemCount} generated baggage items, mapping {@code key0} to {@code value0}
+     * through {@code key(itemCount-1)} to {@code value(itemCount-1)}.
+     *
+     * <p>While the indices stay below 10, every item is exactly 10 characters of key plus value,
+     * which is what lets the byte limit cases state a limit as a number of items.
+     */
+    static List<Entry<String, String>> generateBaggageItems(int itemCount) {
+        List<Entry<String, String>> items = new ArrayList<>();
+        for (int i = 0; i < itemCount; i++) {
+            items.add(new SimpleImmutableEntry<>("key" + i, "value" + i));
+        }
+        return items;
     }
-    return items;
-  }
 
-  /**
-   * Returns the given baggage items as one prefixed header per item, preserving order.
-   *
-   * <p>Each item needs its own header, so a repeated key is spelled by upper casing it: this only
-   * carries the same baggage key for the propagation styles that lowercase the keys they read.
-   */
-  static Map<String, String> otBaggageHeaders(String prefix, List<Entry<String, String>> items) {
-    Map<String, String> headers = new LinkedHashMap<>();
-    for (Entry<String, String> item : items) {
-      String key = item.getKey();
-      String header = prefix + (headers.containsKey(prefix + key) ? key.toUpperCase() : key);
-      if (headers.containsKey(header)) {
-        throw new IllegalArgumentException("Cannot repeat the baggage key " + key + " any further");
-      }
-      headers.put(header, item.getValue());
+    /**
+     * Returns the given baggage items as one prefixed header per item, preserving order.
+     *
+     * <p>Each item needs its own header, so a repeated key is spelled by upper casing it: this only
+     * carries the same baggage key for the propagation styles that lowercase the keys they read.
+     */
+    static Map<String, String> otBaggageHeaders(String prefix, List<Entry<String, String>> items) {
+        Map<String, String> headers = new LinkedHashMap<>();
+        for (Entry<String, String> item : items) {
+            String key = item.getKey();
+            String header = prefix + (headers.containsKey(prefix + key) ? key.toUpperCase() : key);
+            if (headers.containsKey(header)) {
+                throw new IllegalArgumentException("Cannot repeat the baggage key " + key + " any further");
+            }
+            headers.put(header, item.getValue());
+        }
+        return headers;
     }
-    return headers;
-  }
 
-  static Map<String, String> headers(String... headerKeysAndValues) {
-    HashMap<String, String> headers = new HashMap<>();
-    for (int i = 0; i < headerKeysAndValues.length / 2; i++) {
-      String headerValue = headerKeysAndValues[i * 2 + 1];
-      if (headerValue == null) {
-        continue;
-      }
-      String headerName = headerKeysAndValues[i * 2].toUpperCase();
-      headers.put(headerName, headerValue);
+    static Map<String, String> headers(String... headerKeysAndValues) {
+        HashMap<String, String> headers = new HashMap<>();
+        for (int i = 0; i < headerKeysAndValues.length / 2; i++) {
+            String headerValue = headerKeysAndValues[i * 2 + 1];
+            if (headerValue == null) {
+                continue;
+            }
+            String headerName = headerKeysAndValues[i * 2].toUpperCase();
+            headers.put(headerName, headerValue);
+        }
+        return headers;
     }
-    return headers;
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpExtractorTest.java
index a950013ab7a..88d21875ef9 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpExtractorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpExtractorTest.java
@@ -37,59 +37,58 @@
 
 class HttpExtractorTest extends DDJavaSpecification {
 
-  private static final String W3C_TRACE_ID = "00000000000000000000000000000001";
-  private static final String W3C_SPAN_ID = "123456789abcdef0";
-  private static final String W3C_TRACE_PARENT = "00-" + W3C_TRACE_ID + "-" + W3C_SPAN_ID + "-01";
-  private static final String W3C_PARENT_ID = "456789abcdef0123";
-  private static final String W3C_TRACE_STATE_WITH_P = "dd=p:" + W3C_PARENT_ID;
-  private static final String W3C_TRACE_STATE_NO_P = "dd=s:2,foo=1";
-  private static final String W3C_SPAN_ID_LSTR = Long.toString(DDSpanId.fromHex(W3C_SPAN_ID));
+    private static final String W3C_TRACE_ID = "00000000000000000000000000000001";
+    private static final String W3C_SPAN_ID = "123456789abcdef0";
+    private static final String W3C_TRACE_PARENT = "00-" + W3C_TRACE_ID + "-" + W3C_SPAN_ID + "-01";
+    private static final String W3C_PARENT_ID = "456789abcdef0123";
+    private static final String W3C_TRACE_STATE_WITH_P = "dd=p:" + W3C_PARENT_ID;
+    private static final String W3C_TRACE_STATE_NO_P = "dd=s:2,foo=1";
+    private static final String W3C_SPAN_ID_LSTR = Long.toString(DDSpanId.fromHex(W3C_SPAN_ID));
 
-  @TableTest({
-    "scenario                                  | styles                           | datadogTraceId         | datadogSpanId          | b3TraceId              | b3SpanId               | w3cTraceParent     | expectedTraceId | expectedSpanId     | putDatadogFields | expectDatadogFields | tagContext | extractFirst",
-    "DATADOG,B3MULTI ids                       | [DATADOG, B3MULTI]               | '1'                    | '2'                    | 'a'                    | 'b'                    |                    | '1'             | '2'                | true             | true                | false      | false       ",
-    "DATADOG,B3MULTI b3 only                   | [DATADOG, B3MULTI]               |                        |                        | 'a'                    | 'b'                    |                    | '10'            | '11'               | false            | false               | true       | false       ",
-    "DATADOG,B3MULTI b3 only with dd field     | [DATADOG, B3MULTI]               |                        |                        | 'a'                    | 'b'                    |                    |                 |                    | true             | true                | true       | false       ",
-    "DATADOG only                              | [DATADOG]                        | '1'                    | '2'                    | 'a'                    | 'b'                    |                    | '1'             | '2'                | true             | true                | false      | false       ",
-    "B3MULTI only                              | [B3MULTI]                        | '1'                    | '2'                    | 'a'                    | 'b'                    |                    | '10'            | '11'               | false            | false               | false      | false       ",
-    "B3MULTI,DATADOG                           | [B3MULTI, DATADOG]               | '1'                    | '2'                    | 'a'                    | 'b'                    |                    | '10'            | '11'               | false            | false               | false      | false       ",
-    "no styles                                 | []                               | '1'                    | '2'                    | 'a'                    | 'b'                    |                    |                 |                    | false            | false               | false      | false       ",
-    "DATADOG,B3MULTI invalid datadog trace     | [DATADOG, B3MULTI]               | 'abc'                  | '2'                    | 'a'                    | 'b'                    |                    | '10'            | '11'               | false            | false               | false      | false       ",
-    "DATADOG only invalid trace                | [DATADOG]                        | 'abc'                  | '2'                    | 'a'                    | 'b'                    |                    |                 |                    | false            | false               | false      | false       ",
-    "DATADOG,B3MULTI dd trace out of range     | [DATADOG, B3MULTI]               | '18446744073709551616' | '2'                    | 'a'                    | 'b'                    |                    | '10'            | '11'               | false            | false               | false      | false       ",
-    "DATADOG,B3MULTI dd span out of range      | [DATADOG, B3MULTI]               | '1'                    | '18446744073709551616' | 'a'                    | 'b'                    |                    | '10'            | '11'               | false            | false               | false      | false       ",
-    "DATADOG only dd trace out of range        | [DATADOG]                        | '18446744073709551616' | '2'                    | 'a'                    | 'b'                    |                    |                 |                    | false            | false               | false      | false       ",
-    "DATADOG only dd span out of range         | [DATADOG]                        | '1'                    | '18446744073709551616' | 'a'                    | 'b'                    |                    |                 |                    | false            | false               | false      | false       ",
-    "DATADOG,B3MULTI b3 trace out of range     | [DATADOG, B3MULTI]               | '1'                    | '2'                    | '18446744073709551616' | 'b'                    |                    | '1'             | '2'                | true             | false               | false      | false       ",
-    "DATADOG,B3MULTI b3 span out of range      | [DATADOG, B3MULTI]               | '1'                    | '2'                    | 'a'                    | '18446744073709551616' |                    | '1'             | '2'                | true             | false               | false      | false       ",
-    "NONE                                      | [NONE]                           | '1'                    | '2'                    |                        |                        |                    |                 |                    | true             | false               | true       | false       ",
-    "DATADOG,TRACECONTEXT w3c override         | [DATADOG, TRACECONTEXT]          | '1'                    | '2'                    |                        |                        | 'W3C_TRACE_PARENT' | '1'             | 'W3C_SPAN_ID_LSTR' | false            | false               | false      | false       ",
-    "DATADOG,TRACECONTEXT,B3MULTI w3c override | [DATADOG, TRACECONTEXT, B3MULTI] | '1'                    | '2'                    | '1'                    | '2'                    | 'W3C_TRACE_PARENT' | '1'             | 'W3C_SPAN_ID_LSTR' | false            | false               | false      | false       ",
-    "TRACECONTEXT,DATADOG                      | [TRACECONTEXT, DATADOG]          | '1'                    | '2'                    |                        |                        | 'W3C_TRACE_PARENT' | '1'             | 'W3C_SPAN_ID_LSTR' | false            | false               | false      | false       ",
-    "TRACECONTEXT,B3MULTI                      | [TRACECONTEXT, B3MULTI]          |                        |                        | '1'                    | '2'                    | 'W3C_TRACE_PARENT' | '1'             | 'W3C_SPAN_ID_LSTR' | false            | false               | false      | false       ",
-    "TRACECONTEXT,B3MULTI,DATADOG              | [TRACECONTEXT, B3MULTI, DATADOG] | '1'                    | '2'                    | '1'                    | '4'                    | 'W3C_TRACE_PARENT' | '1'             | 'W3C_SPAN_ID_LSTR' | false            | false               | false      | false       ",
-    "B3MULTI,DATADOG,TRACECONTEXT              | [B3MULTI, DATADOG, TRACECONTEXT] | '1'                    | '2'                    | '1'                    | '4'                    | 'W3C_TRACE_PARENT' | '1'             | 'W3C_SPAN_ID_LSTR' | false            | false               | false      | false       ",
-    "TRACECONTEXT only                         | [TRACECONTEXT]                   |                        |                        |                        |                        | 'W3C_TRACE_PARENT' | '1'             | 'W3C_SPAN_ID_LSTR' | false            | false               | false      | false       ",
-    "DATADOG,TRACECONTEXT no dd span           | [DATADOG, TRACECONTEXT]          | '1'                    |                        |                        |                        | 'W3C_TRACE_PARENT' | '1'             | 'W3C_SPAN_ID_LSTR' | false            | false               | false      | false       ",
-    "DATADOG,TRACECONTEXT extract first        | [DATADOG, TRACECONTEXT]          | '1'                    | '2'                    |                        |                        | 'W3C_TRACE_PARENT' | '1'             | '2'                | false            | false               | false      | true        "
-  })
-  void extractHttpHeadersUsingStyles(
-      List<TracePropagationStyle> styles,
-      String datadogTraceId,
-      String datadogSpanId,
-      String b3TraceId,
-      String b3SpanId,
-      @ConvertWith(W3cConstantConverter.class) String w3cTraceParent,
-      String expectedTraceId,
-      @ConvertWith(W3cConstantConverter.class) String expectedSpanId,
-      boolean putDatadogFields,
-      boolean expectDatadogFields,
-      boolean tagContext,
-      boolean extractFirst) {
-    HttpCodec.Extractor extractor =
-        createExtractor(styles, extractFirst, singletonMap("SOME_HEADER", "some-tag"));
+    @TableTest({
+      "scenario                                  | styles                           | datadogTraceId         | datadogSpanId          | b3TraceId              | b3SpanId               | w3cTraceParent     | expectedTraceId | expectedSpanId     | putDatadogFields | expectDatadogFields | tagContext | extractFirst",
+      "DATADOG,B3MULTI ids                       | [DATADOG, B3MULTI]               | '1'                    | '2'                    | 'a'                    | 'b'                    |                    | '1'             | '2'                | true             | true                | false      | false       ",
+      "DATADOG,B3MULTI b3 only                   | [DATADOG, B3MULTI]               |                        |                        | 'a'                    | 'b'                    |                    | '10'            | '11'               | false            | false               | true       | false       ",
+      "DATADOG,B3MULTI b3 only with dd field     | [DATADOG, B3MULTI]               |                        |                        | 'a'                    | 'b'                    |                    |                 |                    | true             | true                | true       | false       ",
+      "DATADOG only                              | [DATADOG]                        | '1'                    | '2'                    | 'a'                    | 'b'                    |                    | '1'             | '2'                | true             | true                | false      | false       ",
+      "B3MULTI only                              | [B3MULTI]                        | '1'                    | '2'                    | 'a'                    | 'b'                    |                    | '10'            | '11'               | false            | false               | false      | false       ",
+      "B3MULTI,DATADOG                           | [B3MULTI, DATADOG]               | '1'                    | '2'                    | 'a'                    | 'b'                    |                    | '10'            | '11'               | false            | false               | false      | false       ",
+      "no styles                                 | []                               | '1'                    | '2'                    | 'a'                    | 'b'                    |                    |                 |                    | false            | false               | false      | false       ",
+      "DATADOG,B3MULTI invalid datadog trace     | [DATADOG, B3MULTI]               | 'abc'                  | '2'                    | 'a'                    | 'b'                    |                    | '10'            | '11'               | false            | false               | false      | false       ",
+      "DATADOG only invalid trace                | [DATADOG]                        | 'abc'                  | '2'                    | 'a'                    | 'b'                    |                    |                 |                    | false            | false               | false      | false       ",
+      "DATADOG,B3MULTI dd trace out of range     | [DATADOG, B3MULTI]               | '18446744073709551616' | '2'                    | 'a'                    | 'b'                    |                    | '10'            | '11'               | false            | false               | false      | false       ",
+      "DATADOG,B3MULTI dd span out of range      | [DATADOG, B3MULTI]               | '1'                    | '18446744073709551616' | 'a'                    | 'b'                    |                    | '10'            | '11'               | false            | false               | false      | false       ",
+      "DATADOG only dd trace out of range        | [DATADOG]                        | '18446744073709551616' | '2'                    | 'a'                    | 'b'                    |                    |                 |                    | false            | false               | false      | false       ",
+      "DATADOG only dd span out of range         | [DATADOG]                        | '1'                    | '18446744073709551616' | 'a'                    | 'b'                    |                    |                 |                    | false            | false               | false      | false       ",
+      "DATADOG,B3MULTI b3 trace out of range     | [DATADOG, B3MULTI]               | '1'                    | '2'                    | '18446744073709551616' | 'b'                    |                    | '1'             | '2'                | true             | false               | false      | false       ",
+      "DATADOG,B3MULTI b3 span out of range      | [DATADOG, B3MULTI]               | '1'                    | '2'                    | 'a'                    | '18446744073709551616' |                    | '1'             | '2'                | true             | false               | false      | false       ",
+      "NONE                                      | [NONE]                           | '1'                    | '2'                    |                        |                        |                    |                 |                    | true             | false               | true       | false       ",
+      "DATADOG,TRACECONTEXT w3c override         | [DATADOG, TRACECONTEXT]          | '1'                    | '2'                    |                        |                        | 'W3C_TRACE_PARENT' | '1'             | 'W3C_SPAN_ID_LSTR' | false            | false               | false      | false       ",
+      "DATADOG,TRACECONTEXT,B3MULTI w3c override | [DATADOG, TRACECONTEXT, B3MULTI] | '1'                    | '2'                    | '1'                    | '2'                    | 'W3C_TRACE_PARENT' | '1'             | 'W3C_SPAN_ID_LSTR' | false            | false               | false      | false       ",
+      "TRACECONTEXT,DATADOG                      | [TRACECONTEXT, DATADOG]          | '1'                    | '2'                    |                        |                        | 'W3C_TRACE_PARENT' | '1'             | 'W3C_SPAN_ID_LSTR' | false            | false               | false      | false       ",
+      "TRACECONTEXT,B3MULTI                      | [TRACECONTEXT, B3MULTI]          |                        |                        | '1'                    | '2'                    | 'W3C_TRACE_PARENT' | '1'             | 'W3C_SPAN_ID_LSTR' | false            | false               | false      | false       ",
+      "TRACECONTEXT,B3MULTI,DATADOG              | [TRACECONTEXT, B3MULTI, DATADOG] | '1'                    | '2'                    | '1'                    | '4'                    | 'W3C_TRACE_PARENT' | '1'             | 'W3C_SPAN_ID_LSTR' | false            | false               | false      | false       ",
+      "B3MULTI,DATADOG,TRACECONTEXT              | [B3MULTI, DATADOG, TRACECONTEXT] | '1'                    | '2'                    | '1'                    | '4'                    | 'W3C_TRACE_PARENT' | '1'             | 'W3C_SPAN_ID_LSTR' | false            | false               | false      | false       ",
+      "TRACECONTEXT only                         | [TRACECONTEXT]                   |                        |                        |                        |                        | 'W3C_TRACE_PARENT' | '1'             | 'W3C_SPAN_ID_LSTR' | false            | false               | false      | false       ",
+      "DATADOG,TRACECONTEXT no dd span           | [DATADOG, TRACECONTEXT]          | '1'                    |                        |                        |                        | 'W3C_TRACE_PARENT' | '1'             | 'W3C_SPAN_ID_LSTR' | false            | false               | false      | false       ",
+      "DATADOG,TRACECONTEXT extract first        | [DATADOG, TRACECONTEXT]          | '1'                    | '2'                    |                        |                        | 'W3C_TRACE_PARENT' | '1'             | '2'                | false            | false               | false      | true        "
+    })
+    void extractHttpHeadersUsingStyles(
+            List<TracePropagationStyle> styles,
+            String datadogTraceId,
+            String datadogSpanId,
+            String b3TraceId,
+            String b3SpanId,
+            @ConvertWith(W3cConstantConverter.class) String w3cTraceParent,
+            String expectedTraceId,
+            @ConvertWith(W3cConstantConverter.class) String expectedSpanId,
+            boolean putDatadogFields,
+            boolean expectDatadogFields,
+            boolean tagContext,
+            boolean extractFirst) {
+        HttpCodec.Extractor extractor = createExtractor(styles, extractFirst, singletonMap("SOME_HEADER", "some-tag"));
 
-    // spotless:off
+        // spotless:off
     Map<String, String> headers = headers(
         DatadogHttpCodec.TRACE_ID_KEY, datadogTraceId,
         DatadogHttpCodec.SPAN_ID_KEY, datadogSpanId,
@@ -100,57 +99,59 @@ void extractHttpHeadersUsingStyles(
     );
     // spotless:on
 
-    TagContext context = extractor.extract(headers, stringValuesMap());
+        TagContext context = extractor.extract(headers, stringValuesMap());
 
-    if (tagContext) {
-      assertInstanceOf(TagContext.class, context);
-    } else {
-      if (expectedTraceId == null) {
-        assertNull(context);
-      } else {
-        assertEquals(DDTraceId.from(expectedTraceId).toLong(), context.getTraceId().toLong());
-        assertEquals(DDSpanId.from(expectedSpanId), context.getSpanId());
-      }
-    }
-    if (expectDatadogFields) {
-      Map<String, String> expectedTags = new LinkedHashMap<>();
-      if (tagContext && b3TraceId != null) {
-        expectedTags.put(B3_TRACE_ID, b3TraceId);
-        expectedTags.put(B3_SPAN_ID, b3SpanId);
-      }
-      expectedTags.put("some-tag", "my-interesting-info");
-      assertNotNull(context);
-      assertEquals(expectedTags, context.getTags());
+        if (tagContext) {
+            assertInstanceOf(TagContext.class, context);
+        } else {
+            if (expectedTraceId == null) {
+                assertNull(context);
+            } else {
+                assertEquals(
+                        DDTraceId.from(expectedTraceId).toLong(),
+                        context.getTraceId().toLong());
+                assertEquals(DDSpanId.from(expectedSpanId), context.getSpanId());
+            }
+        }
+        if (expectDatadogFields) {
+            Map<String, String> expectedTags = new LinkedHashMap<>();
+            if (tagContext && b3TraceId != null) {
+                expectedTags.put(B3_TRACE_ID, b3TraceId);
+                expectedTags.put(B3_SPAN_ID, b3SpanId);
+            }
+            expectedTags.put("some-tag", "my-interesting-info");
+            assertNotNull(context);
+            assertEquals(expectedTags, context.getTags());
+        }
     }
-  }
 
-  @TableTest({
-    "scenario                                       | styles                           | datadogTraceId | datadogSpanId | b3TraceId | b3SpanId | traceState               | expectedTraceId | expectedSpanId     | expectedParentId  ",
-    "DATADOG,TRACECONTEXT with traceState p         | [DATADOG, TRACECONTEXT]          | '1'            | '2'           |           |          | 'W3C_TRACE_STATE_WITH_P' | '1'             | 'W3C_SPAN_ID_LSTR' | 'W3C_PARENT_ID'   ",
-    "DATADOG,TRACECONTEXT no traceState             | [DATADOG, TRACECONTEXT]          | '1'            | '2'           |           |          |                          | '1'             | 'W3C_SPAN_ID_LSTR' | '0000000000000002'",
-    "DATADOG,TRACECONTEXT,B3MULTI with traceState p | [DATADOG, TRACECONTEXT, B3MULTI] | '1'            | '2'           | '1'       | '2'      | 'W3C_TRACE_STATE_WITH_P' | '1'             | 'W3C_SPAN_ID_LSTR' | 'W3C_PARENT_ID'   ",
-    "TRACECONTEXT,DATADOG with traceState p         | [TRACECONTEXT, DATADOG]          | '1'            | '2'           |           |          | 'W3C_TRACE_STATE_WITH_P' | '1'             | 'W3C_SPAN_ID_LSTR' |                   ",
-    "TRACECONTEXT,B3MULTI with traceState p         | [TRACECONTEXT, B3MULTI]          |                |               | '1'       | '2'      | 'W3C_TRACE_STATE_WITH_P' | '1'             | 'W3C_SPAN_ID_LSTR' |                   ",
-    "TRACECONTEXT,B3MULTI,DATADOG with traceState p | [TRACECONTEXT, B3MULTI, DATADOG] | '1'            | '2'           | '1'       | '4'      | 'W3C_TRACE_STATE_WITH_P' | '1'             | 'W3C_SPAN_ID_LSTR' |                   ",
-    "B3MULTI,DATADOG,TRACECONTEXT with traceState p | [B3MULTI, DATADOG, TRACECONTEXT] | '1'            | '2'           | '1'       | '4'      | 'W3C_TRACE_STATE_WITH_P' | '1'             | 'W3C_SPAN_ID_LSTR' | 'W3C_PARENT_ID'   ",
-    "TRACECONTEXT only with traceState p            | [TRACECONTEXT]                   |                |               |           |          | 'W3C_TRACE_STATE_WITH_P' | '1'             | 'W3C_SPAN_ID_LSTR' |                   ",
-    "B3MULTI,TRACECONTEXT with traceState p         | [B3MULTI, TRACECONTEXT]          |                |               | '1'       | '2'      | 'W3C_TRACE_STATE_WITH_P' | '1'             | 'W3C_SPAN_ID_LSTR' | 'W3C_PARENT_ID'   ",
-    "B3MULTI,DATADOG,TRACECONTEXT no traceState     | [B3MULTI, DATADOG, TRACECONTEXT] | '1'            | '2'           | '1'       | '4'      |                          | '1'             | 'W3C_SPAN_ID_LSTR' | '0000000000000002'",
-    "DATADOG,TRACECONTEXT no p traceState           | [DATADOG, TRACECONTEXT]          | '1'            | '2'           |           |          | 'W3C_TRACE_STATE_NO_P'   | '1'             | 'W3C_SPAN_ID_LSTR' | '0000000000000002'"
-  })
-  void checkW3CTraceContextOverride(
-      List<TracePropagationStyle> styles,
-      String datadogTraceId,
-      String datadogSpanId,
-      String b3TraceId,
-      String b3SpanId,
-      @ConvertWith(W3cConstantConverter.class) String traceState,
-      String expectedTraceId,
-      @ConvertWith(W3cConstantConverter.class) String expectedSpanId,
-      @ConvertWith(W3cConstantConverter.class) String expectedParentId) {
-    HttpCodec.Extractor extractor = createExtractor(styles);
+    @TableTest({
+      "scenario                                       | styles                           | datadogTraceId | datadogSpanId | b3TraceId | b3SpanId | traceState               | expectedTraceId | expectedSpanId     | expectedParentId  ",
+      "DATADOG,TRACECONTEXT with traceState p         | [DATADOG, TRACECONTEXT]          | '1'            | '2'           |           |          | 'W3C_TRACE_STATE_WITH_P' | '1'             | 'W3C_SPAN_ID_LSTR' | 'W3C_PARENT_ID'   ",
+      "DATADOG,TRACECONTEXT no traceState             | [DATADOG, TRACECONTEXT]          | '1'            | '2'           |           |          |                          | '1'             | 'W3C_SPAN_ID_LSTR' | '0000000000000002'",
+      "DATADOG,TRACECONTEXT,B3MULTI with traceState p | [DATADOG, TRACECONTEXT, B3MULTI] | '1'            | '2'           | '1'       | '2'      | 'W3C_TRACE_STATE_WITH_P' | '1'             | 'W3C_SPAN_ID_LSTR' | 'W3C_PARENT_ID'   ",
+      "TRACECONTEXT,DATADOG with traceState p         | [TRACECONTEXT, DATADOG]          | '1'            | '2'           |           |          | 'W3C_TRACE_STATE_WITH_P' | '1'             | 'W3C_SPAN_ID_LSTR' |                   ",
+      "TRACECONTEXT,B3MULTI with traceState p         | [TRACECONTEXT, B3MULTI]          |                |               | '1'       | '2'      | 'W3C_TRACE_STATE_WITH_P' | '1'             | 'W3C_SPAN_ID_LSTR' |                   ",
+      "TRACECONTEXT,B3MULTI,DATADOG with traceState p | [TRACECONTEXT, B3MULTI, DATADOG] | '1'            | '2'           | '1'       | '4'      | 'W3C_TRACE_STATE_WITH_P' | '1'             | 'W3C_SPAN_ID_LSTR' |                   ",
+      "B3MULTI,DATADOG,TRACECONTEXT with traceState p | [B3MULTI, DATADOG, TRACECONTEXT] | '1'            | '2'           | '1'       | '4'      | 'W3C_TRACE_STATE_WITH_P' | '1'             | 'W3C_SPAN_ID_LSTR' | 'W3C_PARENT_ID'   ",
+      "TRACECONTEXT only with traceState p            | [TRACECONTEXT]                   |                |               |           |          | 'W3C_TRACE_STATE_WITH_P' | '1'             | 'W3C_SPAN_ID_LSTR' |                   ",
+      "B3MULTI,TRACECONTEXT with traceState p         | [B3MULTI, TRACECONTEXT]          |                |               | '1'       | '2'      | 'W3C_TRACE_STATE_WITH_P' | '1'             | 'W3C_SPAN_ID_LSTR' | 'W3C_PARENT_ID'   ",
+      "B3MULTI,DATADOG,TRACECONTEXT no traceState     | [B3MULTI, DATADOG, TRACECONTEXT] | '1'            | '2'           | '1'       | '4'      |                          | '1'             | 'W3C_SPAN_ID_LSTR' | '0000000000000002'",
+      "DATADOG,TRACECONTEXT no p traceState           | [DATADOG, TRACECONTEXT]          | '1'            | '2'           |           |          | 'W3C_TRACE_STATE_NO_P'   | '1'             | 'W3C_SPAN_ID_LSTR' | '0000000000000002'"
+    })
+    void checkW3CTraceContextOverride(
+            List<TracePropagationStyle> styles,
+            String datadogTraceId,
+            String datadogSpanId,
+            String b3TraceId,
+            String b3SpanId,
+            @ConvertWith(W3cConstantConverter.class) String traceState,
+            String expectedTraceId,
+            @ConvertWith(W3cConstantConverter.class) String expectedSpanId,
+            @ConvertWith(W3cConstantConverter.class) String expectedParentId) {
+        HttpCodec.Extractor extractor = createExtractor(styles);
 
-    // spotless:off
+        // spotless:off
     Map<String, String> headers = headers(
         W3CHttpCodec.TRACE_PARENT_KEY, W3C_TRACE_PARENT,
         DatadogHttpCodec.TRACE_ID_KEY, datadogTraceId,
@@ -161,33 +162,34 @@ void checkW3CTraceContextOverride(
     );
     // spotless:on
 
-    TagContext context = extractor.extract(headers, stringValuesMap());
+        TagContext context = extractor.extract(headers, stringValuesMap());
 
-    assertEquals(DDTraceId.from(expectedTraceId).toLong(), context.getTraceId().toLong());
-    assertEquals(DDSpanId.from(expectedSpanId), context.getSpanId());
-    assertEquals(expectedParentId, context.getTags().getString(PARENT_ID));
-    // TODO Add some more W3C override checks
-  }
+        assertEquals(
+                DDTraceId.from(expectedTraceId).toLong(), context.getTraceId().toLong());
+        assertEquals(DDSpanId.from(expectedSpanId), context.getSpanId());
+        assertEquals(expectedParentId, context.getTags().getString(PARENT_ID));
+        // TODO Add some more W3C override checks
+    }
 
-  @TableTest({
-    "scenario                           | styles                           | datadogTraceId | datadogSpanId | b3TraceId | b3SpanId | w3cTraceParent     | traceState             | expectedSpanLinks      ",
-    "matching trace IDs no links        | [DATADOG, B3MULTI, TRACECONTEXT] | '1'            | '2'           | '1'       | 'b'      | 'W3C_TRACE_PARENT' | 'W3C_TRACE_STATE_NO_P' | []                     ",
-    "only tracecontext mismatch         | [DATADOG, B3MULTI, TRACECONTEXT] | '2'            | '2'           | '2'       | 'b'      | 'W3C_TRACE_PARENT' | 'W3C_TRACE_STATE_NO_P' | [TRACECONTEXT]         ",
-    "b3 and tracecontext mismatch       | [DATADOG, B3MULTI, TRACECONTEXT] | '2'            | '2'           | '1'       | 'b'      | 'W3C_TRACE_PARENT' | 'W3C_TRACE_STATE_NO_P' | [B3MULTI, TRACECONTEXT]",
-    "datadog mismatch from tracecontext | [TRACECONTEXT, B3MULTI, DATADOG] | '2'            | '2'           | '1'       | 'b'      | 'W3C_TRACE_PARENT' | 'W3C_TRACE_STATE_NO_P' | [DATADOG]              "
-  })
-  void verifyExistenceOfSpanLinks(
-      List<TracePropagationStyle> styles,
-      String datadogTraceId,
-      String datadogSpanId,
-      String b3TraceId,
-      String b3SpanId,
-      @ConvertWith(W3cConstantConverter.class) String w3cTraceParent,
-      @ConvertWith(W3cConstantConverter.class) String traceState,
-      List<TracePropagationStyle> expectedSpanLinks) {
-    HttpCodec.Extractor extractor = createExtractor(styles);
+    @TableTest({
+      "scenario                           | styles                           | datadogTraceId | datadogSpanId | b3TraceId | b3SpanId | w3cTraceParent     | traceState             | expectedSpanLinks      ",
+      "matching trace IDs no links        | [DATADOG, B3MULTI, TRACECONTEXT] | '1'            | '2'           | '1'       | 'b'      | 'W3C_TRACE_PARENT' | 'W3C_TRACE_STATE_NO_P' | []                     ",
+      "only tracecontext mismatch         | [DATADOG, B3MULTI, TRACECONTEXT] | '2'            | '2'           | '2'       | 'b'      | 'W3C_TRACE_PARENT' | 'W3C_TRACE_STATE_NO_P' | [TRACECONTEXT]         ",
+      "b3 and tracecontext mismatch       | [DATADOG, B3MULTI, TRACECONTEXT] | '2'            | '2'           | '1'       | 'b'      | 'W3C_TRACE_PARENT' | 'W3C_TRACE_STATE_NO_P' | [B3MULTI, TRACECONTEXT]",
+      "datadog mismatch from tracecontext | [TRACECONTEXT, B3MULTI, DATADOG] | '2'            | '2'           | '1'       | 'b'      | 'W3C_TRACE_PARENT' | 'W3C_TRACE_STATE_NO_P' | [DATADOG]              "
+    })
+    void verifyExistenceOfSpanLinks(
+            List<TracePropagationStyle> styles,
+            String datadogTraceId,
+            String datadogSpanId,
+            String b3TraceId,
+            String b3SpanId,
+            @ConvertWith(W3cConstantConverter.class) String w3cTraceParent,
+            @ConvertWith(W3cConstantConverter.class) String traceState,
+            List<TracePropagationStyle> expectedSpanLinks) {
+        HttpCodec.Extractor extractor = createExtractor(styles);
 
-    // spotless:off
+        // spotless:off
     Map<String, String> headers = headers(
         DatadogHttpCodec.TRACE_ID_KEY, datadogTraceId,
         DatadogHttpCodec.SPAN_ID_KEY, datadogSpanId,
@@ -198,67 +200,68 @@ void verifyExistenceOfSpanLinks(
     );
     // spotless:on
 
-    TagContext context = extractor.extract(headers, stringValuesMap());
+        TagContext context = extractor.extract(headers, stringValuesMap());
 
-    List<AgentSpanLink> links = context.getTerminatedSpanLinks();
-    assertEquals(expectedSpanLinks.size(), links.size());
-    for (int i = 0; i < links.size(); i++) {
-      TracePropagationStyle style = expectedSpanLinks.get(i);
-      if (style == TRACECONTEXT) {
-        assertEquals(W3C_TRACE_STATE_NO_P, links.get(i).traceState());
-      }
-      assertEquals(style.toString(), links.get(i).attributes().asMap().get("context_headers"));
+        List<AgentSpanLink> links = context.getTerminatedSpanLinks();
+        assertEquals(expectedSpanLinks.size(), links.size());
+        for (int i = 0; i < links.size(); i++) {
+            TracePropagationStyle style = expectedSpanLinks.get(i);
+            if (style == TRACECONTEXT) {
+                assertEquals(W3C_TRACE_STATE_NO_P, links.get(i).traceState());
+            }
+            assertEquals(style.toString(), links.get(i).attributes().asMap().get("context_headers"));
+        }
     }
-  }
 
-  private static Set<TracePropagationStyle> orderedSetOf(List<TracePropagationStyle> styles) {
-    return new LinkedHashSet<>(styles);
-  }
+    private static Set<TracePropagationStyle> orderedSetOf(List<TracePropagationStyle> styles) {
+        return new LinkedHashSet<>(styles);
+    }
 
-  private static HttpCodec.Extractor createExtractor(List<TracePropagationStyle> styles) {
-    return createExtractor(styles, false, emptyMap());
-  }
+    private static HttpCodec.Extractor createExtractor(List<TracePropagationStyle> styles) {
+        return createExtractor(styles, false, emptyMap());
+    }
 
-  private static HttpCodec.Extractor createExtractor(
-      List<TracePropagationStyle> styles, boolean extractFirst, Map<String, String> headerTags) {
-    Config config = mock(Config.class);
-    when(config.getTracePropagationStylesToExtract()).thenReturn(orderedSetOf(styles));
-    when(config.isTracePropagationExtractFirst()).thenReturn(extractFirst);
-    DynamicConfig<DynamicConfig.Snapshot> dynamicConfig =
-        DynamicConfig.create().setHeaderTags(headerTags).setBaggageMapping(emptyMap()).apply();
-    return HttpCodec.createExtractor(config, dynamicConfig::captureTraceConfig);
-  }
+    private static HttpCodec.Extractor createExtractor(
+            List<TracePropagationStyle> styles, boolean extractFirst, Map<String, String> headerTags) {
+        Config config = mock(Config.class);
+        when(config.getTracePropagationStylesToExtract()).thenReturn(orderedSetOf(styles));
+        when(config.isTracePropagationExtractFirst()).thenReturn(extractFirst);
+        DynamicConfig<DynamicConfig.Snapshot> dynamicConfig = DynamicConfig.create()
+                .setHeaderTags(headerTags)
+                .setBaggageMapping(emptyMap())
+                .apply();
+        return HttpCodec.createExtractor(config, dynamicConfig::captureTraceConfig);
+    }
 
-  @TypeConverter
-  static TracePropagationStyle parseTracePropagationStyle(String value) {
-    String name = value.trim();
-    if (name.startsWith("TracePropagationStyle.")) {
-      name = name.substring("TracePropagationStyle.".length());
+    @TypeConverter
+    static TracePropagationStyle parseTracePropagationStyle(String value) {
+        String name = value.trim();
+        if (name.startsWith("TracePropagationStyle.")) {
+            name = name.substring("TracePropagationStyle.".length());
+        }
+        return TracePropagationStyle.valueOf(name);
     }
-    return TracePropagationStyle.valueOf(name);
-  }
 
-  static class W3cConstantConverter implements ArgumentConverter {
-    @Override
-    public Object convert(Object source, ParameterContext context)
-        throws ArgumentConversionException {
-      if (source == null) {
-        return null;
-      }
-      switch (source.toString()) {
-        case "W3C_TRACE_PARENT":
-          return W3C_TRACE_PARENT;
-        case "W3C_TRACE_STATE_WITH_P":
-          return W3C_TRACE_STATE_WITH_P;
-        case "W3C_TRACE_STATE_NO_P":
-          return W3C_TRACE_STATE_NO_P;
-        case "W3C_SPAN_ID_LSTR":
-          return W3C_SPAN_ID_LSTR;
-        case "W3C_PARENT_ID":
-          return W3C_PARENT_ID;
-        default:
-          return source;
-      }
+    static class W3cConstantConverter implements ArgumentConverter {
+        @Override
+        public Object convert(Object source, ParameterContext context) throws ArgumentConversionException {
+            if (source == null) {
+                return null;
+            }
+            switch (source.toString()) {
+                case "W3C_TRACE_PARENT":
+                    return W3C_TRACE_PARENT;
+                case "W3C_TRACE_STATE_WITH_P":
+                    return W3C_TRACE_STATE_WITH_P;
+                case "W3C_TRACE_STATE_NO_P":
+                    return W3C_TRACE_STATE_NO_P;
+                case "W3C_SPAN_ID_LSTR":
+                    return W3C_SPAN_ID_LSTR;
+                case "W3C_PARENT_ID":
+                    return W3C_PARENT_ID;
+                default:
+                    return source;
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpInjectorTest.java
index 2fc5e1628dd..98513ca6803 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpInjectorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpInjectorTest.java
@@ -29,217 +29,205 @@
 
 class HttpInjectorTest extends AbstractHttpInjectorTest {
 
-  protected boolean tracePropagationB3Padding() {
-    return DEFAULT_PROPAGATION_B3_PADDING_ENABLED;
-  }
-
-  @TableTest({
-    "scenario                       | styles                       | samplingPriority | origin  ",
-    "DATADOG,B3SINGLE unset         | [DATADOG, B3SINGLE]          | UNSET            |         ",
-    "DATADOG,B3SINGLE keep saipan   | [DATADOG, B3SINGLE]          | SAMPLER_KEEP     | 'saipan'",
-    "DATADOG only unset             | [DATADOG]                    | UNSET            |         ",
-    "DATADOG only keep saipan       | [DATADOG]                    | SAMPLER_KEEP     | 'saipan'",
-    "B3SINGLE only unset            | [B3SINGLE]                   | UNSET            |         ",
-    "B3SINGLE only keep saipan      | [B3SINGLE]                   | SAMPLER_KEEP     | 'saipan'",
-    "B3SINGLE,DATADOG keep saipan   | [B3SINGLE, DATADOG]          | SAMPLER_KEEP     | 'saipan'",
-    "DATADOG,B3MULTI,B3SINGLE unset | [DATADOG, B3MULTI, B3SINGLE] | UNSET            |         ",
-    "DATADOG,B3MULTI,B3SINGLE keep  | [DATADOG, B3MULTI, B3SINGLE] | SAMPLER_KEEP     | 'saipan'",
-    "DATADOG,B3MULTI unset          | [DATADOG, B3MULTI]           | UNSET            |         ",
-    "DATADOG,B3MULTI keep saipan    | [DATADOG, B3MULTI]           | SAMPLER_KEEP     | 'saipan'",
-    "B3MULTI only unset             | [B3MULTI]                    | UNSET            |         ",
-    "B3MULTI only keep saipan       | [B3MULTI]                    | SAMPLER_KEEP     | 'saipan'",
-    "B3MULTI,DATADOG keep saipan    | [B3MULTI, DATADOG]           | SAMPLER_KEEP     | 'saipan'"
-  })
-  void injectHttpHeadersUsingStyles(
-      List<TracePropagationStyle> styles,
-      @ConvertWith(PrioritySamplingConverter.class) byte samplingPriority,
-      String origin) {
-    HttpCodec.Injector injector = createInjector(styles, emptyMap());
-
-    DDTraceId traceId = DDTraceId.ONE;
-    long spanId = 2;
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("k1", "v1");
-    baggage.put("k2", "v2");
-    DDSpanContext mockedContext = mockedContext(traceId, spanId, samplingPriority, origin, baggage);
-
-    Map<String, String> carrier = new HashMap<>();
-    injector.inject(mockedContext, carrier, Map::put);
-
-    String b3TraceIdHex = traceIdOrPadded(traceId, tracePropagationB3Padding());
-    String b3SpanIdHex = spanIdOrPadded(spanId, tracePropagationB3Padding());
-    int expectedSize = 0;
-    if (styles.contains(TracePropagationStyle.DATADOG)) {
-      assertEquals(traceId.toString(), carrier.get(DatadogHttpCodec.TRACE_ID_KEY));
-      assertEquals(Long.toString(spanId), carrier.get(DatadogHttpCodec.SPAN_ID_KEY));
-      assertEquals("v1", carrier.get(DatadogHttpCodec.OT_BAGGAGE_PREFIX + "k1"));
-      assertEquals("v2", carrier.get(DatadogHttpCodec.OT_BAGGAGE_PREFIX + "k2"));
-      assertEquals("_dd.p.usr=123", carrier.get(DATADOG_TAGS_KEY));
-      expectedSize += 5;
-      if (samplingPriority != UNSET) {
-        assertEquals(
-            Integer.toString(samplingPriority),
-            carrier.get(DatadogHttpCodec.SAMPLING_PRIORITY_KEY));
-        expectedSize++;
-      }
-      if (origin != null) {
-        assertEquals(origin, carrier.get(DatadogHttpCodec.ORIGIN_KEY));
-        expectedSize++;
-      }
+    protected boolean tracePropagationB3Padding() {
+        return DEFAULT_PROPAGATION_B3_PADDING_ENABLED;
     }
-    if (styles.contains(TracePropagationStyle.B3MULTI)) {
-      assertEquals(b3TraceIdHex, carrier.get(B3HttpCodec.TRACE_ID_KEY));
-      assertEquals(b3SpanIdHex, carrier.get(B3HttpCodec.SPAN_ID_KEY));
-      expectedSize += 2;
-      if (samplingPriority != UNSET) {
-        assertEquals("1", carrier.get(SAMPLING_PRIORITY_KEY));
-        expectedSize++;
-      }
+
+    @TableTest({
+      "scenario                       | styles                       | samplingPriority | origin  ",
+      "DATADOG,B3SINGLE unset         | [DATADOG, B3SINGLE]          | UNSET            |         ",
+      "DATADOG,B3SINGLE keep saipan   | [DATADOG, B3SINGLE]          | SAMPLER_KEEP     | 'saipan'",
+      "DATADOG only unset             | [DATADOG]                    | UNSET            |         ",
+      "DATADOG only keep saipan       | [DATADOG]                    | SAMPLER_KEEP     | 'saipan'",
+      "B3SINGLE only unset            | [B3SINGLE]                   | UNSET            |         ",
+      "B3SINGLE only keep saipan      | [B3SINGLE]                   | SAMPLER_KEEP     | 'saipan'",
+      "B3SINGLE,DATADOG keep saipan   | [B3SINGLE, DATADOG]          | SAMPLER_KEEP     | 'saipan'",
+      "DATADOG,B3MULTI,B3SINGLE unset | [DATADOG, B3MULTI, B3SINGLE] | UNSET            |         ",
+      "DATADOG,B3MULTI,B3SINGLE keep  | [DATADOG, B3MULTI, B3SINGLE] | SAMPLER_KEEP     | 'saipan'",
+      "DATADOG,B3MULTI unset          | [DATADOG, B3MULTI]           | UNSET            |         ",
+      "DATADOG,B3MULTI keep saipan    | [DATADOG, B3MULTI]           | SAMPLER_KEEP     | 'saipan'",
+      "B3MULTI only unset             | [B3MULTI]                    | UNSET            |         ",
+      "B3MULTI only keep saipan       | [B3MULTI]                    | SAMPLER_KEEP     | 'saipan'",
+      "B3MULTI,DATADOG keep saipan    | [B3MULTI, DATADOG]           | SAMPLER_KEEP     | 'saipan'"
+    })
+    void injectHttpHeadersUsingStyles(
+            List<TracePropagationStyle> styles,
+            @ConvertWith(PrioritySamplingConverter.class) byte samplingPriority,
+            String origin) {
+        HttpCodec.Injector injector = createInjector(styles, emptyMap());
+
+        DDTraceId traceId = DDTraceId.ONE;
+        long spanId = 2;
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("k1", "v1");
+        baggage.put("k2", "v2");
+        DDSpanContext mockedContext = mockedContext(traceId, spanId, samplingPriority, origin, baggage);
+
+        Map<String, String> carrier = new HashMap<>();
+        injector.inject(mockedContext, carrier, Map::put);
+
+        String b3TraceIdHex = traceIdOrPadded(traceId, tracePropagationB3Padding());
+        String b3SpanIdHex = spanIdOrPadded(spanId, tracePropagationB3Padding());
+        int expectedSize = 0;
+        if (styles.contains(TracePropagationStyle.DATADOG)) {
+            assertEquals(traceId.toString(), carrier.get(DatadogHttpCodec.TRACE_ID_KEY));
+            assertEquals(Long.toString(spanId), carrier.get(DatadogHttpCodec.SPAN_ID_KEY));
+            assertEquals("v1", carrier.get(DatadogHttpCodec.OT_BAGGAGE_PREFIX + "k1"));
+            assertEquals("v2", carrier.get(DatadogHttpCodec.OT_BAGGAGE_PREFIX + "k2"));
+            assertEquals("_dd.p.usr=123", carrier.get(DATADOG_TAGS_KEY));
+            expectedSize += 5;
+            if (samplingPriority != UNSET) {
+                assertEquals(Integer.toString(samplingPriority), carrier.get(DatadogHttpCodec.SAMPLING_PRIORITY_KEY));
+                expectedSize++;
+            }
+            if (origin != null) {
+                assertEquals(origin, carrier.get(DatadogHttpCodec.ORIGIN_KEY));
+                expectedSize++;
+            }
+        }
+        if (styles.contains(TracePropagationStyle.B3MULTI)) {
+            assertEquals(b3TraceIdHex, carrier.get(B3HttpCodec.TRACE_ID_KEY));
+            assertEquals(b3SpanIdHex, carrier.get(B3HttpCodec.SPAN_ID_KEY));
+            expectedSize += 2;
+            if (samplingPriority != UNSET) {
+                assertEquals("1", carrier.get(SAMPLING_PRIORITY_KEY));
+                expectedSize++;
+            }
+        }
+        if (styles.contains(TracePropagationStyle.B3SINGLE)) {
+            String expectedB3Value = samplingPriority != UNSET
+                    ? b3TraceIdHex + "-" + b3SpanIdHex + "-1"
+                    : b3TraceIdHex + "-" + b3SpanIdHex;
+            assertEquals(expectedB3Value, carrier.get(B3_KEY));
+            expectedSize++;
+        }
+        assertEquals(expectedSize, carrier.size());
     }
-    if (styles.contains(TracePropagationStyle.B3SINGLE)) {
-      String expectedB3Value =
-          samplingPriority != UNSET
-              ? b3TraceIdHex + "-" + b3SpanIdHex + "-1"
-              : b3TraceIdHex + "-" + b3SpanIdHex;
-      assertEquals(expectedB3Value, carrier.get(B3_KEY));
-      expectedSize++;
+
+    @TableTest({
+      "scenario               | style    | samplingPriority | origin  ",
+      "DATADOG unset          | DATADOG  | UNSET            |         ",
+      "DATADOG keep no origin | DATADOG  | SAMPLER_KEEP     |         ",
+      "DATADOG keep saipan    | DATADOG  | SAMPLER_KEEP     | 'saipan'",
+      "B3SINGLE unset         | B3SINGLE | UNSET            |         ",
+      "B3SINGLE keep no orig  | B3SINGLE | SAMPLER_KEEP     |         ",
+      "B3SINGLE keep saipan   | B3SINGLE | SAMPLER_KEEP     | 'saipan'",
+      "B3MULTI unset          | B3MULTI  | UNSET            |         ",
+      "B3MULTI keep no origin | B3MULTI  | SAMPLER_KEEP     |         ",
+      "B3MULTI keep saipan    | B3MULTI  | SAMPLER_KEEP     | 'saipan'"
+    })
+    void injectHttpHeadersUsingStyle(
+            TracePropagationStyle style,
+            @ConvertWith(PrioritySamplingConverter.class) byte samplingPriority,
+            String origin) {
+        Map<String, String> mapping = new HashMap<>();
+        mapping.put("some-baggage-item", "SOME_HEADER");
+        HttpCodec.Injector injector = createInjector(singletonList(style), mapping);
+
+        DDTraceId traceId = DDTraceId.ONE;
+        long spanId = 2;
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("k1", "v1");
+        baggage.put("k2", "v2");
+        baggage.put("some-baggage-item", "some-baggage-value");
+        DDSpanContext mockedContext = mockedContext(traceId, spanId, samplingPriority, origin, baggage);
+
+        Map<String, String> carrier = new HashMap<>();
+        injector.inject(mockedContext, carrier, Map::put);
+
+        String b3TraceIdHex = traceIdOrPadded(traceId, tracePropagationB3Padding());
+        String b3SpanIdHex = spanIdOrPadded(spanId, tracePropagationB3Padding());
+        int expectedSize = 0;
+        if (style == TracePropagationStyle.DATADOG) {
+            assertEquals(traceId.toString(), carrier.get(DatadogHttpCodec.TRACE_ID_KEY));
+            assertEquals(Long.toString(spanId), carrier.get(DatadogHttpCodec.SPAN_ID_KEY));
+            assertEquals("v1", carrier.get(DatadogHttpCodec.OT_BAGGAGE_PREFIX + "k1"));
+            assertEquals("v2", carrier.get(DatadogHttpCodec.OT_BAGGAGE_PREFIX + "k2"));
+            assertEquals("some-baggage-value", carrier.get("SOME_HEADER"));
+            assertEquals("_dd.p.usr=123", carrier.get(DATADOG_TAGS_KEY));
+            expectedSize = 6;
+            if (samplingPriority != UNSET) {
+                assertEquals(Integer.toString(samplingPriority), carrier.get(DatadogHttpCodec.SAMPLING_PRIORITY_KEY));
+                expectedSize++;
+            }
+            if (origin != null) {
+                assertEquals(origin, carrier.get(DatadogHttpCodec.ORIGIN_KEY));
+                expectedSize++;
+            }
+        } else if (style == TracePropagationStyle.B3MULTI) {
+            assertEquals(b3TraceIdHex, carrier.get(B3HttpCodec.TRACE_ID_KEY));
+            assertEquals(b3SpanIdHex, carrier.get(B3HttpCodec.SPAN_ID_KEY));
+            expectedSize = 2;
+            if (samplingPriority != UNSET) {
+                assertEquals("1", carrier.get(SAMPLING_PRIORITY_KEY));
+                expectedSize++;
+            }
+        } else if (style == TracePropagationStyle.B3SINGLE) {
+            String expectedB3Value = samplingPriority != UNSET
+                    ? b3TraceIdHex + "-" + b3SpanIdHex + "-1"
+                    : b3TraceIdHex + "-" + b3SpanIdHex;
+            assertEquals(expectedB3Value, carrier.get(B3_KEY));
+            expectedSize++;
+        }
+        assertEquals(expectedSize, carrier.size());
     }
-    assertEquals(expectedSize, carrier.size());
-  }
-
-  @TableTest({
-    "scenario               | style    | samplingPriority | origin  ",
-    "DATADOG unset          | DATADOG  | UNSET            |         ",
-    "DATADOG keep no origin | DATADOG  | SAMPLER_KEEP     |         ",
-    "DATADOG keep saipan    | DATADOG  | SAMPLER_KEEP     | 'saipan'",
-    "B3SINGLE unset         | B3SINGLE | UNSET            |         ",
-    "B3SINGLE keep no orig  | B3SINGLE | SAMPLER_KEEP     |         ",
-    "B3SINGLE keep saipan   | B3SINGLE | SAMPLER_KEEP     | 'saipan'",
-    "B3MULTI unset          | B3MULTI  | UNSET            |         ",
-    "B3MULTI keep no origin | B3MULTI  | SAMPLER_KEEP     |         ",
-    "B3MULTI keep saipan    | B3MULTI  | SAMPLER_KEEP     | 'saipan'"
-  })
-  void injectHttpHeadersUsingStyle(
-      TracePropagationStyle style,
-      @ConvertWith(PrioritySamplingConverter.class) byte samplingPriority,
-      String origin) {
-    Map<String, String> mapping = new HashMap<>();
-    mapping.put("some-baggage-item", "SOME_HEADER");
-    HttpCodec.Injector injector = createInjector(singletonList(style), mapping);
-
-    DDTraceId traceId = DDTraceId.ONE;
-    long spanId = 2;
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("k1", "v1");
-    baggage.put("k2", "v2");
-    baggage.put("some-baggage-item", "some-baggage-value");
-    DDSpanContext mockedContext = mockedContext(traceId, spanId, samplingPriority, origin, baggage);
-
-    Map<String, String> carrier = new HashMap<>();
-    injector.inject(mockedContext, carrier, Map::put);
-
-    String b3TraceIdHex = traceIdOrPadded(traceId, tracePropagationB3Padding());
-    String b3SpanIdHex = spanIdOrPadded(spanId, tracePropagationB3Padding());
-    int expectedSize = 0;
-    if (style == TracePropagationStyle.DATADOG) {
-      assertEquals(traceId.toString(), carrier.get(DatadogHttpCodec.TRACE_ID_KEY));
-      assertEquals(Long.toString(spanId), carrier.get(DatadogHttpCodec.SPAN_ID_KEY));
-      assertEquals("v1", carrier.get(DatadogHttpCodec.OT_BAGGAGE_PREFIX + "k1"));
-      assertEquals("v2", carrier.get(DatadogHttpCodec.OT_BAGGAGE_PREFIX + "k2"));
-      assertEquals("some-baggage-value", carrier.get("SOME_HEADER"));
-      assertEquals("_dd.p.usr=123", carrier.get(DATADOG_TAGS_KEY));
-      expectedSize = 6;
-      if (samplingPriority != UNSET) {
-        assertEquals(
-            Integer.toString(samplingPriority),
-            carrier.get(DatadogHttpCodec.SAMPLING_PRIORITY_KEY));
-        expectedSize++;
-      }
-      if (origin != null) {
-        assertEquals(origin, carrier.get(DatadogHttpCodec.ORIGIN_KEY));
-        expectedSize++;
-      }
-    } else if (style == TracePropagationStyle.B3MULTI) {
-      assertEquals(b3TraceIdHex, carrier.get(B3HttpCodec.TRACE_ID_KEY));
-      assertEquals(b3SpanIdHex, carrier.get(B3HttpCodec.SPAN_ID_KEY));
-      expectedSize = 2;
-      if (samplingPriority != UNSET) {
-        assertEquals("1", carrier.get(SAMPLING_PRIORITY_KEY));
-        expectedSize++;
-      }
-    } else if (style == TracePropagationStyle.B3SINGLE) {
-      String expectedB3Value =
-          samplingPriority != UNSET
-              ? b3TraceIdHex + "-" + b3SpanIdHex + "-1"
-              : b3TraceIdHex + "-" + b3SpanIdHex;
-      assertEquals(expectedB3Value, carrier.get(B3_KEY));
-      expectedSize++;
+
+    @TableTest({
+      "scenario              | style       ",
+      "datadog encoding      | DATADOG     ",
+      "tracecontext encoding | TRACECONTEXT",
+      "haystack encoding     | HAYSTACK    "
+    })
+    void encodeBaggageInHttpHeadersUsingStyle(TracePropagationStyle style) {
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("alpha", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
+        baggage.put("num", "01234567890");
+        baggage.put("whitespace", "ab \tcd");
+        baggage.put("specials", "ab.-*_cd");
+        baggage.put("excluded", "ab',:\\cd");
+        Map<String, String> mapping = baggage.keySet().stream().collect(Collectors.toMap(key -> key, key -> key));
+        HttpCodec.Injector injector = createInjector(singletonList(style), mapping);
+
+        DDTraceId traceId = DDTraceId.ONE;
+        long spanId = 2;
+        DDSpanContext mockedContext = mockedContext(traceId, spanId, UNSET, null, baggage);
+
+        Map<String, String> carrier = new HashMap<>();
+        injector.inject(mockedContext, carrier, Map::put);
+
+        assertEquals("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", carrier.get("alpha"));
+        assertEquals("01234567890", carrier.get("num"));
+        assertEquals("ab%20%09cd", carrier.get("whitespace"));
+        assertEquals("ab.-*_cd", carrier.get("specials"));
+        assertEquals("ab%27%2C%3A%5Ccd", carrier.get("excluded"));
     }
-    assertEquals(expectedSize, carrier.size());
-  }
-
-  @TableTest({
-    "scenario              | style       ",
-    "datadog encoding      | DATADOG     ",
-    "tracecontext encoding | TRACECONTEXT",
-    "haystack encoding     | HAYSTACK    "
-  })
-  void encodeBaggageInHttpHeadersUsingStyle(TracePropagationStyle style) {
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("alpha", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
-    baggage.put("num", "01234567890");
-    baggage.put("whitespace", "ab \tcd");
-    baggage.put("specials", "ab.-*_cd");
-    baggage.put("excluded", "ab',:\\cd");
-    Map<String, String> mapping =
-        baggage.keySet().stream().collect(Collectors.toMap(key -> key, key -> key));
-    HttpCodec.Injector injector = createInjector(singletonList(style), mapping);
-
-    DDTraceId traceId = DDTraceId.ONE;
-    long spanId = 2;
-    DDSpanContext mockedContext = mockedContext(traceId, spanId, UNSET, null, baggage);
-
-    Map<String, String> carrier = new HashMap<>();
-    injector.inject(mockedContext, carrier, Map::put);
-
-    assertEquals("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", carrier.get("alpha"));
-    assertEquals("01234567890", carrier.get("num"));
-    assertEquals("ab%20%09cd", carrier.get("whitespace"));
-    assertEquals("ab.-*_cd", carrier.get("specials"));
-    assertEquals("ab%27%2C%3A%5Ccd", carrier.get("excluded"));
-  }
-
-  HttpCodec.Injector createInjector(
-      List<TracePropagationStyle> overriddenStyles, Map<String, String> invertedBaggageMapping) {
-    Config config = mock(Config.class);
-    if (overriddenStyles != null) {
-      LinkedHashSet<TracePropagationStyle> orderedSet = new LinkedHashSet<>(overriddenStyles);
-      when(config.getTracePropagationStylesToInject()).thenReturn(orderedSet);
+
+    HttpCodec.Injector createInjector(
+            List<TracePropagationStyle> overriddenStyles, Map<String, String> invertedBaggageMapping) {
+        Config config = mock(Config.class);
+        if (overriddenStyles != null) {
+            LinkedHashSet<TracePropagationStyle> orderedSet = new LinkedHashSet<>(overriddenStyles);
+            when(config.getTracePropagationStylesToInject()).thenReturn(orderedSet);
+        }
+        when(config.isTracePropagationStyleB3PaddingEnabled()).thenReturn(tracePropagationB3Padding());
+        return HttpCodec.createInjector(config, config.getTracePropagationStylesToInject(), invertedBaggageMapping);
     }
-    when(config.isTracePropagationStyleB3PaddingEnabled()).thenReturn(tracePropagationB3Padding());
-    return HttpCodec.createInjector(
-        config, config.getTracePropagationStylesToInject(), invertedBaggageMapping);
-  }
-
-  DDSpanContext mockedContext(
-      DDTraceId traceId,
-      long spanId,
-      int samplingPriority,
-      String origin,
-      Map<String, String> baggage) {
-    return mockSpanContext(
-        traceId,
-        spanId,
-        samplingPriority,
-        origin,
-        baggage,
-        PropagationTags.factory().fromHeaderValue(DATADOG, "_dd.p.usr=123"));
-  }
-
-  static class HttpInjectorNonPaddedTest extends HttpInjectorTest {
-    @Override
-    protected boolean tracePropagationB3Padding() {
-      return false;
+
+    DDSpanContext mockedContext(
+            DDTraceId traceId, long spanId, int samplingPriority, String origin, Map<String, String> baggage) {
+        return mockSpanContext(
+                traceId,
+                spanId,
+                samplingPriority,
+                origin,
+                baggage,
+                PropagationTags.factory().fromHeaderValue(DATADOG, "_dd.p.usr=123"));
+    }
+
+    static class HttpInjectorNonPaddedTest extends HttpInjectorTest {
+        @Override
+        protected boolean tracePropagationB3Padding() {
+            return false;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/InferredProxyPropagatorTests.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/InferredProxyPropagatorTests.java
index 7742fc0deb4..a88b15069e9 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/InferredProxyPropagatorTests.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/InferredProxyPropagatorTests.java
@@ -24,132 +24,132 @@
 
 @DisplayName("InferredProxyPropagator Tests")
 class InferredProxyPropagatorTests {
-  private static final String PROXY_SYSTEM_KEY = "x-dd-proxy";
-  private static final String PROXY_REQUEST_TIME_MS_KEY = "x-dd-proxy-request-time-ms";
-  private static final String PROXY_PATH_KEY = "x-dd-proxy-path";
-  private static final String PROXY_RESOURCE_PATH_KEY = "x-dd-proxy-resource-path";
-  private static final String PROXY_HTTP_METHOD_KEY = "x-dd-proxy-httpmethod";
-  private static final String PROXY_DOMAIN_NAME_KEY = "x-dd-proxy-domain-name";
-  private static final MapVisitor MAP_VISITOR = new MapVisitor();
-
-  private InferredProxyPropagator propagator;
-
-  @BeforeEach
-  void setUp() {
-    this.propagator = new InferredProxyPropagator();
-  }
-
-  @Test
-  @DisplayName("Should extract InferredProxySpan when valid headers are present")
-  void testSuccessfulExtraction() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_SYSTEM_KEY, "aws-apigateway");
-    headers.put(PROXY_REQUEST_TIME_MS_KEY, "12345");
-    headers.put(PROXY_PATH_KEY, "/foo");
-    headers.put(PROXY_HTTP_METHOD_KEY, "GET");
-    headers.put(PROXY_DOMAIN_NAME_KEY, "api.example.com");
-
-    Context context = this.propagator.extract(root(), headers, MAP_VISITOR);
-    InferredProxySpan inferredProxySpan = fromContext(context);
-    assertNotNull(inferredProxySpan);
-    assertTrue(inferredProxySpan.isValid());
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("invalidOrMissingHeadersProviderForPropagator")
-  @DisplayName("Should not create InferredProxySpan if some critical headers are missing")
-  void testExtractionWithMissingCriticalHeaders(String description, Map<String, String> headers) {
-    Context rootContext = root();
-    Context extractedOuterContext = this.propagator.extract(rootContext, headers, MAP_VISITOR);
-    InferredProxySpan inferredProxySpan = fromContext(extractedOuterContext);
-    assertNull(inferredProxySpan, "Invalid inferred proxy span should not be extracted");
-  }
-
-  static Stream<Arguments> invalidOrMissingHeadersProviderForPropagator() { // Renamed
-    Map<String, String> missingSystem = new HashMap<>();
-    missingSystem.put(PROXY_REQUEST_TIME_MS_KEY, "12345");
-    missingSystem.put(PROXY_PATH_KEY, "/foo");
-
-    Map<String, String> emptyValue = new HashMap<>();
-    emptyValue.put(PROXY_SYSTEM_KEY, "");
-
-    Map<String, String> nullValue = new HashMap<>();
-    nullValue.put(PROXY_SYSTEM_KEY, null);
-
-    Map<String, String> missingTime = new HashMap<>();
-    missingTime.put(PROXY_SYSTEM_KEY, "aws-apigw");
-    missingTime.put(PROXY_PATH_KEY, "/foo");
-
-    return Stream.of(
-        of("PROXY_SYSTEM_KEY missing", missingSystem),
-        of("PROXY_SYSTEM_KEY empty", emptyValue),
-        of("PROXY_SYSTEM_KEY null", nullValue),
-        of("PROXY_REQUEST_TIME_MS_KEY missing", missingTime));
-  }
-
-  @Test
-  @DisplayName("Should extract x-dd-proxy-resource-path header when present")
-  void testResourcePathHeaderExtraction() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_SYSTEM_KEY, "aws-apigateway");
-    headers.put(PROXY_REQUEST_TIME_MS_KEY, "12345");
-    headers.put(PROXY_PATH_KEY, "/api/users/123");
-    headers.put(PROXY_RESOURCE_PATH_KEY, "/api/users/{id}");
-    headers.put(PROXY_HTTP_METHOD_KEY, "GET");
-    headers.put(PROXY_DOMAIN_NAME_KEY, "api.example.com");
-
-    Context context = this.propagator.extract(root(), headers, MAP_VISITOR);
-    InferredProxySpan inferredProxySpan = fromContext(context);
-    assertNotNull(inferredProxySpan);
-    assertTrue(inferredProxySpan.isValid());
-
-    // The resourcePath header should be extracted and available
-    // for use in http.route and resource.name
-  }
-
-  @Test
-  @DisplayName("Should work without x-dd-proxy-resource-path header for backwards compatibility")
-  void testExtractionWithoutResourcePath() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_SYSTEM_KEY, "aws-apigateway");
-    headers.put(PROXY_REQUEST_TIME_MS_KEY, "12345");
-    headers.put(PROXY_PATH_KEY, "/api/users/123");
-    // No PROXY_RESOURCE_PATH_KEY
-    headers.put(PROXY_HTTP_METHOD_KEY, "GET");
-    headers.put(PROXY_DOMAIN_NAME_KEY, "api.example.com");
-
-    Context context = this.propagator.extract(root(), headers, MAP_VISITOR);
-    InferredProxySpan inferredProxySpan = fromContext(context);
-    assertNotNull(inferredProxySpan);
-    assertTrue(inferredProxySpan.isValid());
-
-    // Should still be valid without resourcePath (backwards compatibility)
-  }
-
-  @Test
-  @DisplayName("Should extract x-dd-proxy-resource-path for aws-httpapi")
-  void testResourcePathHeaderExtractionForAwsHttpApi() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_SYSTEM_KEY, "aws-httpapi");
-    headers.put(PROXY_REQUEST_TIME_MS_KEY, "12345");
-    headers.put(PROXY_PATH_KEY, "/v2/items/abc-123");
-    headers.put(PROXY_RESOURCE_PATH_KEY, "/v2/items/{itemId}");
-    headers.put(PROXY_HTTP_METHOD_KEY, "POST");
-    headers.put(PROXY_DOMAIN_NAME_KEY, "httpapi.example.com");
-
-    Context context = this.propagator.extract(root(), headers, MAP_VISITOR);
-    InferredProxySpan inferredProxySpan = fromContext(context);
-    assertNotNull(inferredProxySpan);
-    assertTrue(inferredProxySpan.isValid());
-
-    // aws-httpapi should also support resourcePath extraction
-  }
-
-  @ParametersAreNonnullByDefault
-  private static class MapVisitor implements CarrierVisitor<Map<String, String>> {
-    @Override
-    public void forEachKeyValue(Map<String, String> carrier, BiConsumer<String, String> visitor) {
-      carrier.forEach(visitor);
+    private static final String PROXY_SYSTEM_KEY = "x-dd-proxy";
+    private static final String PROXY_REQUEST_TIME_MS_KEY = "x-dd-proxy-request-time-ms";
+    private static final String PROXY_PATH_KEY = "x-dd-proxy-path";
+    private static final String PROXY_RESOURCE_PATH_KEY = "x-dd-proxy-resource-path";
+    private static final String PROXY_HTTP_METHOD_KEY = "x-dd-proxy-httpmethod";
+    private static final String PROXY_DOMAIN_NAME_KEY = "x-dd-proxy-domain-name";
+    private static final MapVisitor MAP_VISITOR = new MapVisitor();
+
+    private InferredProxyPropagator propagator;
+
+    @BeforeEach
+    void setUp() {
+        this.propagator = new InferredProxyPropagator();
+    }
+
+    @Test
+    @DisplayName("Should extract InferredProxySpan when valid headers are present")
+    void testSuccessfulExtraction() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_SYSTEM_KEY, "aws-apigateway");
+        headers.put(PROXY_REQUEST_TIME_MS_KEY, "12345");
+        headers.put(PROXY_PATH_KEY, "/foo");
+        headers.put(PROXY_HTTP_METHOD_KEY, "GET");
+        headers.put(PROXY_DOMAIN_NAME_KEY, "api.example.com");
+
+        Context context = this.propagator.extract(root(), headers, MAP_VISITOR);
+        InferredProxySpan inferredProxySpan = fromContext(context);
+        assertNotNull(inferredProxySpan);
+        assertTrue(inferredProxySpan.isValid());
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("invalidOrMissingHeadersProviderForPropagator")
+    @DisplayName("Should not create InferredProxySpan if some critical headers are missing")
+    void testExtractionWithMissingCriticalHeaders(String description, Map<String, String> headers) {
+        Context rootContext = root();
+        Context extractedOuterContext = this.propagator.extract(rootContext, headers, MAP_VISITOR);
+        InferredProxySpan inferredProxySpan = fromContext(extractedOuterContext);
+        assertNull(inferredProxySpan, "Invalid inferred proxy span should not be extracted");
+    }
+
+    static Stream<Arguments> invalidOrMissingHeadersProviderForPropagator() { // Renamed
+        Map<String, String> missingSystem = new HashMap<>();
+        missingSystem.put(PROXY_REQUEST_TIME_MS_KEY, "12345");
+        missingSystem.put(PROXY_PATH_KEY, "/foo");
+
+        Map<String, String> emptyValue = new HashMap<>();
+        emptyValue.put(PROXY_SYSTEM_KEY, "");
+
+        Map<String, String> nullValue = new HashMap<>();
+        nullValue.put(PROXY_SYSTEM_KEY, null);
+
+        Map<String, String> missingTime = new HashMap<>();
+        missingTime.put(PROXY_SYSTEM_KEY, "aws-apigw");
+        missingTime.put(PROXY_PATH_KEY, "/foo");
+
+        return Stream.of(
+                of("PROXY_SYSTEM_KEY missing", missingSystem),
+                of("PROXY_SYSTEM_KEY empty", emptyValue),
+                of("PROXY_SYSTEM_KEY null", nullValue),
+                of("PROXY_REQUEST_TIME_MS_KEY missing", missingTime));
+    }
+
+    @Test
+    @DisplayName("Should extract x-dd-proxy-resource-path header when present")
+    void testResourcePathHeaderExtraction() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_SYSTEM_KEY, "aws-apigateway");
+        headers.put(PROXY_REQUEST_TIME_MS_KEY, "12345");
+        headers.put(PROXY_PATH_KEY, "/api/users/123");
+        headers.put(PROXY_RESOURCE_PATH_KEY, "/api/users/{id}");
+        headers.put(PROXY_HTTP_METHOD_KEY, "GET");
+        headers.put(PROXY_DOMAIN_NAME_KEY, "api.example.com");
+
+        Context context = this.propagator.extract(root(), headers, MAP_VISITOR);
+        InferredProxySpan inferredProxySpan = fromContext(context);
+        assertNotNull(inferredProxySpan);
+        assertTrue(inferredProxySpan.isValid());
+
+        // The resourcePath header should be extracted and available
+        // for use in http.route and resource.name
+    }
+
+    @Test
+    @DisplayName("Should work without x-dd-proxy-resource-path header for backwards compatibility")
+    void testExtractionWithoutResourcePath() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_SYSTEM_KEY, "aws-apigateway");
+        headers.put(PROXY_REQUEST_TIME_MS_KEY, "12345");
+        headers.put(PROXY_PATH_KEY, "/api/users/123");
+        // No PROXY_RESOURCE_PATH_KEY
+        headers.put(PROXY_HTTP_METHOD_KEY, "GET");
+        headers.put(PROXY_DOMAIN_NAME_KEY, "api.example.com");
+
+        Context context = this.propagator.extract(root(), headers, MAP_VISITOR);
+        InferredProxySpan inferredProxySpan = fromContext(context);
+        assertNotNull(inferredProxySpan);
+        assertTrue(inferredProxySpan.isValid());
+
+        // Should still be valid without resourcePath (backwards compatibility)
+    }
+
+    @Test
+    @DisplayName("Should extract x-dd-proxy-resource-path for aws-httpapi")
+    void testResourcePathHeaderExtractionForAwsHttpApi() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_SYSTEM_KEY, "aws-httpapi");
+        headers.put(PROXY_REQUEST_TIME_MS_KEY, "12345");
+        headers.put(PROXY_PATH_KEY, "/v2/items/abc-123");
+        headers.put(PROXY_RESOURCE_PATH_KEY, "/v2/items/{itemId}");
+        headers.put(PROXY_HTTP_METHOD_KEY, "POST");
+        headers.put(PROXY_DOMAIN_NAME_KEY, "httpapi.example.com");
+
+        Context context = this.propagator.extract(root(), headers, MAP_VISITOR);
+        InferredProxySpan inferredProxySpan = fromContext(context);
+        assertNotNull(inferredProxySpan);
+        assertTrue(inferredProxySpan.isValid());
+
+        // aws-httpapi should also support resourcePath extraction
+    }
+
+    @ParametersAreNonnullByDefault
+    private static class MapVisitor implements CarrierVisitor<Map<String, String>> {
+        @Override
+        public void forEachKeyValue(Map<String, String> carrier, BiConsumer<String, String> visitor) {
+            carrier.forEach(visitor);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/NoneHttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/NoneHttpExtractorTest.java
index 217e6d17ffc..3a8af48accc 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/NoneHttpExtractorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/NoneHttpExtractorTest.java
@@ -36,22 +36,20 @@
 import org.tabletest.junit.TableTest;
 
 class NoneHttpExtractorTest extends AbstractHttpExtractorTest {
-  @Override
-  protected HttpCodec.Extractor newExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier) {
-    return NoneCodec.newExtractor(config, traceConfigSupplier);
-  }
-
-  @TableTest({
-    "scenario     | traceId | spanId ",
-    "no origin    | '1'     | '2'    ",
-    "uint64 max   | 'MAX'   | 'MAX-1'",
-    "uint64 max-1 | 'MAX-1' | 'MAX'  "
-  })
-  void extractHttpHeaders(
-      @ConvertWith(TraceIdConverter.class) String traceId,
-      @ConvertWith(TraceIdConverter.class) String spanId) {
-    // spotless:off
+    @Override
+    protected HttpCodec.Extractor newExtractor(Config config, Supplier<TraceConfig> traceConfigSupplier) {
+        return NoneCodec.newExtractor(config, traceConfigSupplier);
+    }
+
+    @TableTest({
+      "scenario     | traceId | spanId ",
+      "no origin    | '1'     | '2'    ",
+      "uint64 max   | 'MAX'   | 'MAX-1'",
+      "uint64 max-1 | 'MAX-1' | 'MAX'  "
+    })
+    void extractHttpHeaders(
+            @ConvertWith(TraceIdConverter.class) String traceId, @ConvertWith(TraceIdConverter.class) String spanId) {
+        // spotless:off
     Map<String, String> headers = headers(
         "", "empty key",
         TRACE_ID_KEY, traceId,
@@ -64,35 +62,34 @@ void extractHttpHeaders(
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    assertEquals(DDTraceId.ZERO, context.getTraceId());
-    assertEquals(DDSpanId.ZERO, context.getSpanId());
-    Map<String, String> expectedBaggage = new HashMap<>();
-    expectedBaggage.put(SOME_BAGGAGE, "my-interesting-baggage-info");
-    expectedBaggage.put(SOME_CASE_SENSITIVE_BAGGAGE, "my-interesting-baggage-info-2");
-    assertEquals(expectedBaggage, context.getBaggage());
-    assertEquals(singletonMap(SOME_TAG, "my-interesting-info,and-more"), context.getTags());
-    assertEquals(UNSET, context.getSamplingPriority());
-    assertNull(context.getOrigin());
-  }
-
-  @WithConfig(key = REQUEST_HEADER_TAGS_COMMA_ALLOWED, value = "false")
-  @Test
-  void extractHttpHeadersWithoutComma() {
-    // Recreate extractor with the comma-disallowed config
-    this.extractor.cleanup();
-    Map<String, String> baggageMap = new HashMap<>();
-    baggageMap.put(SOME_CUSTOM_BAGGAGE_HEADER, SOME_BAGGAGE);
-    baggageMap.put(SOME_CUSTOM_BAGGAGE_HEADER_2, SOME_CASE_SENSITIVE_BAGGAGE);
-    DynamicConfig<DynamicConfig.Snapshot> dynamicConfig =
-        DynamicConfig.create()
-            .setHeaderTags(singletonMap(SOME_HEADER, SOME_TAG))
-            .setBaggageMapping(baggageMap)
-            .apply();
-    this.extractor = NoneCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig);
-
-    // spotless:off
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        assertEquals(DDTraceId.ZERO, context.getTraceId());
+        assertEquals(DDSpanId.ZERO, context.getSpanId());
+        Map<String, String> expectedBaggage = new HashMap<>();
+        expectedBaggage.put(SOME_BAGGAGE, "my-interesting-baggage-info");
+        expectedBaggage.put(SOME_CASE_SENSITIVE_BAGGAGE, "my-interesting-baggage-info-2");
+        assertEquals(expectedBaggage, context.getBaggage());
+        assertEquals(singletonMap(SOME_TAG, "my-interesting-info,and-more"), context.getTags());
+        assertEquals(UNSET, context.getSamplingPriority());
+        assertNull(context.getOrigin());
+    }
+
+    @WithConfig(key = REQUEST_HEADER_TAGS_COMMA_ALLOWED, value = "false")
+    @Test
+    void extractHttpHeadersWithoutComma() {
+        // Recreate extractor with the comma-disallowed config
+        this.extractor.cleanup();
+        Map<String, String> baggageMap = new HashMap<>();
+        baggageMap.put(SOME_CUSTOM_BAGGAGE_HEADER, SOME_BAGGAGE);
+        baggageMap.put(SOME_CUSTOM_BAGGAGE_HEADER_2, SOME_CASE_SENSITIVE_BAGGAGE);
+        DynamicConfig<DynamicConfig.Snapshot> dynamicConfig = DynamicConfig.create()
+                .setHeaderTags(singletonMap(SOME_HEADER, SOME_TAG))
+                .setBaggageMapping(baggageMap)
+                .apply();
+        this.extractor = NoneCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig);
+
+        // spotless:off
     Map<String, String> headers = headers(
         "", "empty key",
         TRACE_ID_KEY, "2",
@@ -105,46 +102,46 @@ void extractHttpHeadersWithoutComma() {
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    assertEquals(DDTraceId.ZERO, context.getTraceId());
-    assertEquals(DDSpanId.ZERO, context.getSpanId());
-    Map<String, String> expectedBaggage = new HashMap<>();
-    expectedBaggage.put(SOME_BAGGAGE, "my-interesting-baggage-info");
-    expectedBaggage.put(SOME_CASE_SENSITIVE_BAGGAGE, "my-interesting-baggage-info-2");
-    assertEquals(expectedBaggage, context.getBaggage());
-    assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
-  }
-
-  @ParameterizedTest
-  @ValueSource(booleans = {false, true})
-  void extractHeaderTagsWithNoPropagation(boolean withOrigin) {
-    // spotless:off
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        assertEquals(DDTraceId.ZERO, context.getTraceId());
+        assertEquals(DDSpanId.ZERO, context.getSpanId());
+        Map<String, String> expectedBaggage = new HashMap<>();
+        expectedBaggage.put(SOME_BAGGAGE, "my-interesting-baggage-info");
+        expectedBaggage.put(SOME_CASE_SENSITIVE_BAGGAGE, "my-interesting-baggage-info-2");
+        assertEquals(expectedBaggage, context.getBaggage());
+        assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {false, true})
+    void extractHeaderTagsWithNoPropagation(boolean withOrigin) {
+        // spotless:off
     Map<String, String> headers = headers(
         ORIGIN_KEY, withOrigin ? "my-origin" : null,
         SOME_HEADER, "my-interesting-info"
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    assertFalse(context instanceof ExtractedContext);
-    assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
-    assertNull(context.getOrigin());
-  }
-
-  @TableTest({
-    "scenario            | hexId                             ",
-    "64-bit short        | '1'                               ",
-    "64-bit max chars    | '123456789abcdef0'                ",
-    "128-bit             | '123456789abcdef0123456789abcdef0'",
-    "128-bit zero middle | '64184f2400000000123456789abcdef0'",
-    "128-bit all f       | 'ffffffffffffffffffffffffffffffff'"
-  })
-  void extractHttpHeadersWith128BitTraceId(String hexId) {
-    DD128bTraceId traceId = DD128bTraceId.fromHex(hexId);
-    boolean is128bTrace = traceId.toHighOrderLong() != 0;
-    // spotless:off
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        assertFalse(context instanceof ExtractedContext);
+        assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
+        assertNull(context.getOrigin());
+    }
+
+    @TableTest({
+      "scenario            | hexId                             ",
+      "64-bit short        | '1'                               ",
+      "64-bit max chars    | '123456789abcdef0'                ",
+      "128-bit             | '123456789abcdef0123456789abcdef0'",
+      "128-bit zero middle | '64184f2400000000123456789abcdef0'",
+      "128-bit all f       | 'ffffffffffffffffffffffffffffffff'"
+    })
+    void extractHttpHeadersWith128BitTraceId(String hexId) {
+        DD128bTraceId traceId = DD128bTraceId.fromHex(hexId);
+        boolean is128bTrace = traceId.toHighOrderLong() != 0;
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, traceId.toString(),
         SPAN_ID_KEY, "2",
@@ -157,17 +154,17 @@ void extractHttpHeadersWith128BitTraceId(String hexId) {
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
 
-    assertEquals(DDTraceId.ZERO, context.getTraceId());
-    assertEquals(DDSpanId.ZERO, context.getSpanId());
-    assertTrue(context.getBaggage().isEmpty());
-    assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
-  }
+        assertEquals(DDTraceId.ZERO, context.getTraceId());
+        assertEquals(DDSpanId.ZERO, context.getSpanId());
+        assertTrue(context.getBaggage().isEmpty());
+        assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
+    }
 
-  @Test
-  void extractHttpHeadersWithInvalidNonNumericId() {
-    // spotless:off
+    @Test
+    void extractHttpHeadersWithInvalidNonNumericId() {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_ID_KEY, "traceId",
         SPAN_ID_KEY,"spanId",
@@ -177,9 +174,9 @@ void extractHttpHeadersWithInvalidNonNumericId() {
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
 
-    assertInstanceOf(TagContext.class, context);
-    assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
-  }
+        assertInstanceOf(TagContext.class, context);
+        assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/OrgGuardEndToEndTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/OrgGuardEndToEndTest.java
index 3557ad10e68..27b296d63db 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/OrgGuardEndToEndTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/OrgGuardEndToEndTest.java
@@ -35,161 +35,160 @@
 
 @DisplayName("Org Propagation Guard end-to-end propagator wiring")
 class OrgGuardEndToEndTest {
-  private PropagationTags.Factory factory;
-  private HealthMetrics healthMetrics;
-  private Supplier<TraceConfig> traceConfigSupplier;
-
-  @BeforeEach
-  void setUp() {
-    factory = PropagationTags.factory();
-    healthMetrics = mock(HealthMetrics.class);
-    TraceConfig tc = mock(TraceConfig.class);
-    traceConfigSupplier = () -> tc;
-  }
-
-  @Test
-  @DisplayName("inject stamps the local OPM into x-datadog-tags and tracestate")
-  void injectStampsLocalOpm() {
-    TracingPropagator propagator = buildPropagator(true, false, Collections.emptySet(), () -> "L1");
-
-    Map<String, String> carrier = new HashMap<>();
-    Context ctx = Context.root().with(buildSpanForInjection(null));
-    propagator.inject(ctx, carrier, Map::put);
-
-    String datadogTags = carrier.get(DatadogHttpCodec.DATADOG_TAGS_KEY);
-    assertNotNull(datadogTags, "x-datadog-tags missing: " + carrier);
-    assertTrue(datadogTags.contains("_dd.p.opm=L1"), "datadog-tags = " + datadogTags);
-
-    String tracestate = carrier.get("tracestate");
-    assertNotNull(tracestate, "tracestate missing: " + carrier);
-    assertTrue(tracestate.contains("t.opm:L1"), "tracestate = " + tracestate);
-  }
-
-  @Test
-  @DisplayName("inject overrides any inherited OPM with the local one")
-  void injectOverridesInheritedOpm() {
-    TracingPropagator propagator = buildPropagator(true, false, Collections.emptySet(), () -> "L1");
-
-    Map<String, String> carrier = new HashMap<>();
-    Context ctx = Context.root().with(buildSpanForInjection("upstream-X"));
-    propagator.inject(ctx, carrier, Map::put);
-
-    String datadogTags = carrier.get(DatadogHttpCodec.DATADOG_TAGS_KEY);
-    assertNotNull(datadogTags);
-    assertTrue(datadogTags.contains("_dd.p.opm=L1"), "datadog-tags = " + datadogTags);
-    assertFalse(datadogTags.contains("_dd.p.opm=upstream-X"), "datadog-tags = " + datadogTags);
-  }
-
-  @Test
-  @DisplayName("extract drops dd context when OPM mismatches and enforcement is on")
-  void extractStripsOnMismatch() {
-    TracingPropagator propagator = buildPropagator(true, false, Collections.emptySet(), () -> "L1");
-
-    Map<String, String> headers = new HashMap<>();
-    headers.put(DatadogHttpCodec.TRACE_ID_KEY, "123");
-    headers.put(DatadogHttpCodec.SPAN_ID_KEY, "456");
-    headers.put(DatadogHttpCodec.SAMPLING_PRIORITY_KEY, "2");
-    headers.put(DatadogHttpCodec.DATADOG_TAGS_KEY, "_dd.p.opm=X1,_dd.p.dm=-4");
-
-    Context extracted = propagator.extract(Context.root(), headers, stringValuesMap());
-    AgentSpan span = AgentSpan.fromContext(extracted);
-    assertNotNull(span, "extracted span missing");
-    ExtractedContext ec = (ExtractedContext) span.spanContext();
-    assertEquals(DDTraceId.from(123L), ec.getTraceId());
-    assertEquals(456L, ec.getSpanId());
-    assertEquals(UNSET, ec.getSamplingPriority());
-    assertNull(ec.getOrigin());
-    assertNull(ec.getPropagationTags().getOrgPropagationMarker());
-  }
-
-  @Test
-  @DisplayName("extract honors trusted OPMs even when they differ from the local one")
-  void extractTrustedOpm() {
-    Set<String> trusted = new HashSet<>();
-    trusted.add("TRUSTED1");
-    TracingPropagator propagator = buildPropagator(true, false, trusted, () -> "L1");
-
-    Map<String, String> headers = new HashMap<>();
-    headers.put(DatadogHttpCodec.TRACE_ID_KEY, "123");
-    headers.put(DatadogHttpCodec.SPAN_ID_KEY, "456");
-    headers.put(DatadogHttpCodec.SAMPLING_PRIORITY_KEY, "2");
-    headers.put(DatadogHttpCodec.DATADOG_TAGS_KEY, "_dd.p.opm=TRUSTED1,_dd.p.dm=-4");
-
-    Context extracted = propagator.extract(Context.root(), headers, stringValuesMap());
-    ExtractedContext ec = (ExtractedContext) AgentSpan.fromContext(extracted).spanContext();
-    assertEquals(2, ec.getSamplingPriority());
-    assertEquals("TRUSTED1", ec.getPropagationTags().getOrgPropagationMarker().toString());
-  }
-
-  @Test
-  @DisplayName("extract+inject preserves non-dd tracestate vendors after stripping")
-  void roundTripPreservesForeignVendors() {
-    TracingPropagator propagator = buildPropagator(true, false, Collections.emptySet(), () -> "L1");
-
-    Map<String, String> headers = new HashMap<>();
-    headers.put(
-        "traceparent",
-        "00-0000000000000000000000000000007b-00000000000001c8-01"); // 0x7b=123, 0x1c8=456
-    headers.put("tracestate", "dd=s:2;o:foo;t.opm:upstream-X;t.dm:-4,vendor1=abc,vendor2=def");
-
-    Context extracted = propagator.extract(Context.root(), headers, stringValuesMap());
-    ExtractedContext ec = (ExtractedContext) AgentSpan.fromContext(extracted).spanContext();
-    assertEquals(UNSET, ec.getSamplingPriority(), "should be stripped");
-
-    String reEncoded = ec.getPropagationTags().headerValue(W3C);
-    assertNotNull(reEncoded, "re-encoded tracestate is null");
-    assertTrue(reEncoded.contains("vendor1=abc"), "vendor1 missing: " + reEncoded);
-    assertTrue(reEncoded.contains("vendor2=def"), "vendor2 missing: " + reEncoded);
-  }
-
-  // ---- helpers ----
-
-  private TracingPropagator buildPropagator(
-      boolean enabled, boolean strict, Set<String> trusted, Supplier<String> localOpmSupplier) {
-    Config config = mock(Config.class, RETURNS_DEFAULTS);
-    when(config.getxDatadogTagsMaxLength()).thenReturn(512);
-    when(config.getTracePropagationStylesToExtract())
-        .thenReturn(EnumSet.of(TracePropagationStyle.DATADOG, TracePropagationStyle.TRACECONTEXT));
-    when(config.getTracePropagationStylesToInject())
-        .thenReturn(EnumSet.of(TracePropagationStyle.DATADOG, TracePropagationStyle.TRACECONTEXT));
-    when(config.isTracePropagationExtractFirst()).thenReturn(false);
-    when(config.isAwsPropagationEnabled()).thenReturn(false);
-    when(config.getBaggageMapping()).thenReturn(Collections.emptyMap());
-    when(config.isTracePropagationStyleB3PaddingEnabled()).thenReturn(false);
-    when(config.isApmTracingEnabled()).thenReturn(true);
-    when(config.isTraceOrgGuardEnabled()).thenReturn(enabled);
-    when(config.isTraceOrgGuardStrict()).thenReturn(strict);
-    when(config.getTraceOrgGuardTrustedOpms()).thenReturn(trusted);
-
-    HttpCodec.Extractor extractor = HttpCodec.createExtractor(config, traceConfigSupplier);
-    HttpCodec.Injector injector =
-        HttpCodec.createInjector(
-            config, config.getTracePropagationStylesToInject(), Collections.emptyMap());
-    OrgGuard orgGuard = OrgGuard.create(config, localOpmSupplier, factory, healthMetrics);
-    return new TracingPropagator(
-        true, orgGuard.decorateInjector(injector), orgGuard.decorateExtractor(extractor));
-  }
-
-  /**
-   * Build a minimal AgentSpan wrapping a (mocked) DDSpanContext whose propagation tags can be
-   * controlled by the test.
-   */
-  private AgentSpan buildSpanForInjection(String preExistingOpm) {
-    PropagationTags tags = factory.empty();
-    if (preExistingOpm != null) {
-      tags.updateOrgPropagationMarker(preExistingOpm);
+    private PropagationTags.Factory factory;
+    private HealthMetrics healthMetrics;
+    private Supplier<TraceConfig> traceConfigSupplier;
+
+    @BeforeEach
+    void setUp() {
+        factory = PropagationTags.factory();
+        healthMetrics = mock(HealthMetrics.class);
+        TraceConfig tc = mock(TraceConfig.class);
+        traceConfigSupplier = () -> tc;
+    }
+
+    @Test
+    @DisplayName("inject stamps the local OPM into x-datadog-tags and tracestate")
+    void injectStampsLocalOpm() {
+        TracingPropagator propagator = buildPropagator(true, false, Collections.emptySet(), () -> "L1");
+
+        Map<String, String> carrier = new HashMap<>();
+        Context ctx = Context.root().with(buildSpanForInjection(null));
+        propagator.inject(ctx, carrier, Map::put);
+
+        String datadogTags = carrier.get(DatadogHttpCodec.DATADOG_TAGS_KEY);
+        assertNotNull(datadogTags, "x-datadog-tags missing: " + carrier);
+        assertTrue(datadogTags.contains("_dd.p.opm=L1"), "datadog-tags = " + datadogTags);
+
+        String tracestate = carrier.get("tracestate");
+        assertNotNull(tracestate, "tracestate missing: " + carrier);
+        assertTrue(tracestate.contains("t.opm:L1"), "tracestate = " + tracestate);
+    }
+
+    @Test
+    @DisplayName("inject overrides any inherited OPM with the local one")
+    void injectOverridesInheritedOpm() {
+        TracingPropagator propagator = buildPropagator(true, false, Collections.emptySet(), () -> "L1");
+
+        Map<String, String> carrier = new HashMap<>();
+        Context ctx = Context.root().with(buildSpanForInjection("upstream-X"));
+        propagator.inject(ctx, carrier, Map::put);
+
+        String datadogTags = carrier.get(DatadogHttpCodec.DATADOG_TAGS_KEY);
+        assertNotNull(datadogTags);
+        assertTrue(datadogTags.contains("_dd.p.opm=L1"), "datadog-tags = " + datadogTags);
+        assertFalse(datadogTags.contains("_dd.p.opm=upstream-X"), "datadog-tags = " + datadogTags);
+    }
+
+    @Test
+    @DisplayName("extract drops dd context when OPM mismatches and enforcement is on")
+    void extractStripsOnMismatch() {
+        TracingPropagator propagator = buildPropagator(true, false, Collections.emptySet(), () -> "L1");
+
+        Map<String, String> headers = new HashMap<>();
+        headers.put(DatadogHttpCodec.TRACE_ID_KEY, "123");
+        headers.put(DatadogHttpCodec.SPAN_ID_KEY, "456");
+        headers.put(DatadogHttpCodec.SAMPLING_PRIORITY_KEY, "2");
+        headers.put(DatadogHttpCodec.DATADOG_TAGS_KEY, "_dd.p.opm=X1,_dd.p.dm=-4");
+
+        Context extracted = propagator.extract(Context.root(), headers, stringValuesMap());
+        AgentSpan span = AgentSpan.fromContext(extracted);
+        assertNotNull(span, "extracted span missing");
+        ExtractedContext ec = (ExtractedContext) span.spanContext();
+        assertEquals(DDTraceId.from(123L), ec.getTraceId());
+        assertEquals(456L, ec.getSpanId());
+        assertEquals(UNSET, ec.getSamplingPriority());
+        assertNull(ec.getOrigin());
+        assertNull(ec.getPropagationTags().getOrgPropagationMarker());
+    }
+
+    @Test
+    @DisplayName("extract honors trusted OPMs even when they differ from the local one")
+    void extractTrustedOpm() {
+        Set<String> trusted = new HashSet<>();
+        trusted.add("TRUSTED1");
+        TracingPropagator propagator = buildPropagator(true, false, trusted, () -> "L1");
+
+        Map<String, String> headers = new HashMap<>();
+        headers.put(DatadogHttpCodec.TRACE_ID_KEY, "123");
+        headers.put(DatadogHttpCodec.SPAN_ID_KEY, "456");
+        headers.put(DatadogHttpCodec.SAMPLING_PRIORITY_KEY, "2");
+        headers.put(DatadogHttpCodec.DATADOG_TAGS_KEY, "_dd.p.opm=TRUSTED1,_dd.p.dm=-4");
+
+        Context extracted = propagator.extract(Context.root(), headers, stringValuesMap());
+        ExtractedContext ec =
+                (ExtractedContext) AgentSpan.fromContext(extracted).spanContext();
+        assertEquals(2, ec.getSamplingPriority());
+        assertEquals(
+                "TRUSTED1", ec.getPropagationTags().getOrgPropagationMarker().toString());
+    }
+
+    @Test
+    @DisplayName("extract+inject preserves non-dd tracestate vendors after stripping")
+    void roundTripPreservesForeignVendors() {
+        TracingPropagator propagator = buildPropagator(true, false, Collections.emptySet(), () -> "L1");
+
+        Map<String, String> headers = new HashMap<>();
+        headers.put("traceparent", "00-0000000000000000000000000000007b-00000000000001c8-01"); // 0x7b=123, 0x1c8=456
+        headers.put("tracestate", "dd=s:2;o:foo;t.opm:upstream-X;t.dm:-4,vendor1=abc,vendor2=def");
+
+        Context extracted = propagator.extract(Context.root(), headers, stringValuesMap());
+        ExtractedContext ec =
+                (ExtractedContext) AgentSpan.fromContext(extracted).spanContext();
+        assertEquals(UNSET, ec.getSamplingPriority(), "should be stripped");
+
+        String reEncoded = ec.getPropagationTags().headerValue(W3C);
+        assertNotNull(reEncoded, "re-encoded tracestate is null");
+        assertTrue(reEncoded.contains("vendor1=abc"), "vendor1 missing: " + reEncoded);
+        assertTrue(reEncoded.contains("vendor2=def"), "vendor2 missing: " + reEncoded);
+    }
+
+    // ---- helpers ----
+
+    private TracingPropagator buildPropagator(
+            boolean enabled, boolean strict, Set<String> trusted, Supplier<String> localOpmSupplier) {
+        Config config = mock(Config.class, RETURNS_DEFAULTS);
+        when(config.getxDatadogTagsMaxLength()).thenReturn(512);
+        when(config.getTracePropagationStylesToExtract())
+                .thenReturn(EnumSet.of(TracePropagationStyle.DATADOG, TracePropagationStyle.TRACECONTEXT));
+        when(config.getTracePropagationStylesToInject())
+                .thenReturn(EnumSet.of(TracePropagationStyle.DATADOG, TracePropagationStyle.TRACECONTEXT));
+        when(config.isTracePropagationExtractFirst()).thenReturn(false);
+        when(config.isAwsPropagationEnabled()).thenReturn(false);
+        when(config.getBaggageMapping()).thenReturn(Collections.emptyMap());
+        when(config.isTracePropagationStyleB3PaddingEnabled()).thenReturn(false);
+        when(config.isApmTracingEnabled()).thenReturn(true);
+        when(config.isTraceOrgGuardEnabled()).thenReturn(enabled);
+        when(config.isTraceOrgGuardStrict()).thenReturn(strict);
+        when(config.getTraceOrgGuardTrustedOpms()).thenReturn(trusted);
+
+        HttpCodec.Extractor extractor = HttpCodec.createExtractor(config, traceConfigSupplier);
+        HttpCodec.Injector injector =
+                HttpCodec.createInjector(config, config.getTracePropagationStylesToInject(), Collections.emptyMap());
+        OrgGuard orgGuard = OrgGuard.create(config, localOpmSupplier, factory, healthMetrics);
+        return new TracingPropagator(true, orgGuard.decorateInjector(injector), orgGuard.decorateExtractor(extractor));
+    }
+
+    /**
+     * Build a minimal AgentSpan wrapping a (mocked) DDSpanContext whose propagation tags can be
+     * controlled by the test.
+     */
+    private AgentSpan buildSpanForInjection(String preExistingOpm) {
+        PropagationTags tags = factory.empty();
+        if (preExistingOpm != null) {
+            tags.updateOrgPropagationMarker(preExistingOpm);
+        }
+        DDSpanContext ddCtx = mock(DDSpanContext.class);
+        when(ddCtx.getTraceId()).thenReturn(DDTraceId.from(123L));
+        when(ddCtx.getSpanId()).thenReturn(456L);
+        when(ddCtx.getSamplingPriority()).thenReturn(2);
+        when(ddCtx.lockSamplingPriority()).thenReturn(true);
+        when(ddCtx.getOrigin()).thenReturn(null);
+        when(ddCtx.getEndToEndStartTime()).thenReturn(0L);
+        when(ddCtx.baggageItems()).thenReturn(Collections.emptySet());
+        when(ddCtx.getPropagationTags()).thenReturn(tags);
+        TraceCollector collector = mock(TraceCollector.class);
+        when(ddCtx.getTraceCollector()).thenReturn(collector);
+        return AgentSpan.fromSpanContext(ddCtx);
     }
-    DDSpanContext ddCtx = mock(DDSpanContext.class);
-    when(ddCtx.getTraceId()).thenReturn(DDTraceId.from(123L));
-    when(ddCtx.getSpanId()).thenReturn(456L);
-    when(ddCtx.getSamplingPriority()).thenReturn(2);
-    when(ddCtx.lockSamplingPriority()).thenReturn(true);
-    when(ddCtx.getOrigin()).thenReturn(null);
-    when(ddCtx.getEndToEndStartTime()).thenReturn(0L);
-    when(ddCtx.baggageItems()).thenReturn(Collections.emptySet());
-    when(ddCtx.getPropagationTags()).thenReturn(tags);
-    TraceCollector collector = mock(TraceCollector.class);
-    when(ddCtx.getTraceCollector()).thenReturn(collector);
-    return AgentSpan.fromSpanContext(ddCtx);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/OtelTraceStatePropagationTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/OtelTraceStatePropagationTest.java
index dc6495ff9a9..b217da68edc 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/OtelTraceStatePropagationTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/OtelTraceStatePropagationTest.java
@@ -24,266 +24,242 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 class OtelTraceStatePropagationTest {
-  private static final String RV = "ef284ace7a91e1";
-  private static final String TH = "e6666666666668";
-
-  @Test
-  void reusesEmptySamplingState() {
-    PropagationTags.Factory factory = PropagationTags.factory();
-
-    assertSame(factory.empty().samplingState(), factory.empty().samplingState());
-  }
-
-  @ParameterizedTest
-  @MethodSource("inboundTracestates")
-  void normalizesAndForwardsOnlyFirstManagedOtelMember(String header, String expected) {
-    PropagationTags tags = PropagationTags.factory().fromHeaderValue(W3C, header);
-
-    assertEquals(expected, tags.headerValue(W3C));
-  }
-
-  static Stream<Arguments> inboundTracestates() {
-    return Stream.of(
-        arguments("ot=rv:" + RV + ";th:" + TH, "ot=rv:" + RV + ";th:" + TH),
-        arguments("ot=rv:" + RV, "ot=rv:" + RV),
-        arguments("ot=th:" + TH, "ot=th:" + TH),
-        arguments("ot=future:value", "ot=future:value"),
-        arguments("ot=someflag", "ot=someflag"),
-        arguments("vendor=state,ot=simplefield;blah;foo", "vendor=state,ot=simplefield;blah;foo"),
-        arguments(
-            "vendor=state,ot=rv:invalid;th:" + TH + ";future:value",
-            "ot=future:value,vendor=state"),
-        arguments("vendor=state,ot=rv:invalid;th:invalid", "vendor=state"),
-        arguments("ot=rv:EF284ACE7A91E1;th:" + TH, null),
-        arguments(
-            "vendor=state,ot=rv:" + RV + ",ot=rv:1234567890abcd,other=state",
-            "ot=rv:" + RV + ",vendor=state,other=state"),
-        arguments("dd=s:1,dd=s:0,ot=rv:" + RV, "dd=s:1,ot=rv:" + RV));
-  }
-
-  @Test
-  void forwardsOpaqueOtelStateAfterSamplingPriorityChanges() {
-    PropagationTags tags =
-        PropagationTags.factory().fromHeaderValue(W3C, "vendor=state,ot=simplefield;blah;foo");
-
-    tags.updateTraceSamplingPriority(USER_KEEP, MANUAL);
-
-    assertEquals("simplefield;blah;foo", tags.samplingState().getOtelTraceState().toString());
-    assertTrue(tags.headerValue(W3C).contains("ot=simplefield;blah;foo"));
-    assertEquals(
-        "ot=simplefield;blah;foo,vendor=state", tags.getW3CTracestate(tags.samplingState()));
-  }
-
-  @Test
-  void rebuildsDuplicateDatadogMembers() {
-    PropagationTags tags =
-        PropagationTags.factory().fromHeaderValue(W3C, "dd=s:1,dd=s:0,ot=rv:" + RV);
-
-    assertEquals("dd=s:1,ot=rv:" + RV, tags.getW3CTracestate(tags.samplingState()));
-  }
-
-  @Test
-  void publishesProbabilityPriorityAndOtelStateTogether() {
-    PropagationTags tags = PropagationTags.factory().empty();
-    SamplingState before = tags.samplingState();
-
-    assertTrue(
-        tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 1.0, false, 1L, false));
-    SamplingState after = tags.samplingState();
-
-    assertEquals(SAMPLER_KEEP, after.getSamplingPriority());
-    assertEquals("-1", after.getDecisionMaker().toString());
-    assertEquals("1", after.getKnuthSamplingRate().toString());
-    assertTrue(after.getOtelTraceState().toString().matches("rv:[0-9a-f]{14};th:0"));
-    assertNull(tags.getW3CTracestate(before));
-    String tracestate = tags.getW3CTracestate(after);
-    assertEquals("ot=" + after.getOtelTraceState(), tracestate);
-    assertSame(tracestate, tags.getW3CTracestate(after));
-  }
-
-  @Test
-  void reusesSamplingStateAndHeaderCachesForUnchangedProbabilityDecision() {
-    PropagationTags tags = PropagationTags.factory().empty();
-    assertTrue(
-        tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 1.0, false, 1L, false));
-    SamplingState expectedState = tags.samplingState();
-    String expectedDatadogHeader = tags.headerValue(DATADOG);
-    String expectedW3CHeader = tags.headerValue(W3C);
-    String expectedTracestate = tags.getW3CTracestate(expectedState);
-
-    assertTrue(
-        tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 1.0, false, 1L, true));
-
-    assertSame(expectedState, tags.samplingState());
-    assertSame(expectedDatadogHeader, tags.headerValue(DATADOG));
-    assertSame(expectedW3CHeader, tags.headerValue(W3C));
-    assertSame(expectedTracestate, tags.getW3CTracestate(expectedState));
-  }
-
-  @Test
-  void rejectedSamplingAttemptCannotReplaceProbabilityState() {
-    PropagationTags tags = PropagationTags.factory().empty();
-    assertTrue(
-        tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 0.5, false, 1L, false));
-    SamplingState established = tags.samplingState();
-
-    assertFalse(
-        tags.tryUpdateProbabilitySamplingDecision(SAMPLER_DROP, AGENT_RATE, 0.1, false, 2L, false));
-
-    assertEquals(established, tags.samplingState());
-  }
-
-  @Test
-  void atomicPriorityUpdatePreservesLockedDecisionMaker() {
-    PropagationTags tags =
-        PropagationTags.factory().fromHeaderValue(DATADOG, "_dd.p.dm=934086a686-4");
-
-    assertTrue(tags.tryUpdateTraceSamplingPriority(SAMPLER_KEEP, AGENT_RATE, false));
-
-    SamplingState state = tags.samplingState();
-    assertEquals(SAMPLER_KEEP, state.getSamplingPriority());
-    assertEquals("934086a686-4", state.getDecisionMaker().toString());
-  }
-
-  @Test
-  void atomicProbabilityUpdatePreservesLockedDecisionMaker() {
-    PropagationTags tags =
-        PropagationTags.factory().fromHeaderValue(DATADOG, "_dd.p.dm=934086a686-4");
-
-    assertTrue(
-        tags.tryUpdateProbabilitySamplingDecision(SAMPLER_DROP, AGENT_RATE, 0.5, false, 1L, false));
-
-    SamplingState state = tags.samplingState();
-    assertEquals(SAMPLER_DROP, state.getSamplingPriority());
-    assertEquals("934086a686-4", state.getDecisionMaker().toString());
-    assertEquals("0.5", state.getKnuthSamplingRate().toString());
-    assertTrue(state.getOtelTraceState().toString().matches("rv:[0-9a-f]{14};th:8"));
-  }
-
-  @Test
-  void inheritedStateRetainsItsPositionRelativeToVendors() {
-    PropagationTags tags =
-        PropagationTags.factory()
-            .fromHeaderValue(W3C, "vendor=state,ot=rv:ef284ace7a91e1;th:e6666666666668,dd=s:1");
-    tags.updateTraceSamplingPriority(SAMPLER_KEEP, EXTERNAL_OVERRIDE);
-
-    assertEquals(
-        "dd=s:1;t.dm:-0,vendor=state,ot=rv:ef284ace7a91e1;th:e6666666666668",
-        tags.headerValue(W3C));
-  }
-
-  @Test
-  void preservesFinalUnchangedInheritedOtelMember() {
-    PropagationTags tags =
-        PropagationTags.factory().fromHeaderValue(W3C, "dd=s:1,first=value,sec=value,ot=rv:" + RV);
-
-    assertEquals("dd=s:1,first=value,sec=value,ot=rv:" + RV, tags.headerValue(W3C));
-  }
-
-  @Test
-  void compoundConflictRemovesThresholdAndRetainsRandomValue() {
-    PropagationTags tags =
-        PropagationTags.factory()
-            .fromHeaderValue(W3C, "dd=s:1,ot=rv:00000000000001;th:8,vendor=state");
-
-    tags.updateTraceSamplingPriority(SAMPLER_KEEP, EXTERNAL_OVERRIDE);
-
-    assertEquals("dd=s:1;t.dm:-0,ot=rv:00000000000001,vendor=state", tags.headerValue(W3C));
-  }
-
-  @Test
-  void unknownPriorityUpdateRemovesInconsistentThreshold() {
-    PropagationTags tags =
-        PropagationTags.factory()
-            .fromHeaderValue(W3C, "dd=s:0,ot=rv:00000000000001;th:8,vendor=state");
-
-    tags.updateTraceSamplingPriority(SAMPLER_KEEP, UNKNOWN);
-
-    assertEquals("dd=s:1,ot=rv:00000000000001,vendor=state", tags.headerValue(W3C));
-  }
-
-  @Test
-  void forceKeepRemovesLocallyGeneratedProbabilityState() {
-    PropagationTags tags = PropagationTags.factory().empty();
-    assertTrue(
-        tags.tryUpdateProbabilitySamplingDecision(SAMPLER_DROP, AGENT_RATE, 0.0, false, 1L, false));
-
-    tags.forceKeep(MANUAL);
-
-    assertEquals(USER_KEEP, tags.samplingState().getSamplingPriority());
-    assertNull(tags.samplingState().getOtelTraceState());
-  }
-
-  @Test
-  void limiterDemotionDoesNotFabricateState() {
-    PropagationTags tags = PropagationTags.factory().empty();
-
-    assertTrue(
-        tags.tryUpdateProbabilitySamplingDecision(SAMPLER_DROP, AGENT_RATE, 1.0, true, 1L, false));
-
-    assertNull(tags.samplingState().getOtelTraceState());
-  }
-
-  @Test
-  void localProbabilityDecisionDropsInheritedThresholdAtFullRate() {
-    PropagationTags tags =
-        PropagationTags.factory().fromHeaderValue(W3C, "ot=rv:00000000000000;th:8;future:value");
+    private static final String RV = "ef284ace7a91e1";
+    private static final String TH = "e6666666666668";
 
-    assertTrue(
-        tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 1.0, false, 1L, false));
-
-    assertEquals(
-        "rv:00000000000000;future:value", tags.samplingState().getOtelTraceState().toString());
-  }
-
-  @Test
-  void localHalfRateDropsInheritedThresholdEvenWhenRandomValueAgrees() {
-    PropagationTags tags =
-        PropagationTags.factory().fromHeaderValue(W3C, "ot=rv:ffffffffffffff;th:4;future:value");
-
-    assertTrue(
-        tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 0.5, false, 1L, false));
-
-    assertEquals(
-        "rv:ffffffffffffff;future:value", tags.samplingState().getOtelTraceState().toString());
-  }
-
-  @Test
-  void localProbabilityDecisionDropsThresholdWhenInheritedRandomValueDisagrees() {
-    PropagationTags tags =
-        PropagationTags.factory().fromHeaderValue(W3C, "ot=rv:00000000000000;th:8;future:value");
+    @Test
+    void reusesEmptySamplingState() {
+        PropagationTags.Factory factory = PropagationTags.factory();
 
-    assertTrue(
-        tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 0.5, false, 1L, false));
-
-    assertEquals(
-        "rv:00000000000000;future:value", tags.samplingState().getOtelTraceState().toString());
-  }
+        assertSame(factory.empty().samplingState(), factory.empty().samplingState());
+    }
+
+    @ParameterizedTest
+    @MethodSource("inboundTracestates")
+    void normalizesAndForwardsOnlyFirstManagedOtelMember(String header, String expected) {
+        PropagationTags tags = PropagationTags.factory().fromHeaderValue(W3C, header);
+
+        assertEquals(expected, tags.headerValue(W3C));
+    }
+
+    static Stream<Arguments> inboundTracestates() {
+        return Stream.of(
+                arguments("ot=rv:" + RV + ";th:" + TH, "ot=rv:" + RV + ";th:" + TH),
+                arguments("ot=rv:" + RV, "ot=rv:" + RV),
+                arguments("ot=th:" + TH, "ot=th:" + TH),
+                arguments("ot=future:value", "ot=future:value"),
+                arguments("ot=someflag", "ot=someflag"),
+                arguments("vendor=state,ot=simplefield;blah;foo", "vendor=state,ot=simplefield;blah;foo"),
+                arguments("vendor=state,ot=rv:invalid;th:" + TH + ";future:value", "ot=future:value,vendor=state"),
+                arguments("vendor=state,ot=rv:invalid;th:invalid", "vendor=state"),
+                arguments("ot=rv:EF284ACE7A91E1;th:" + TH, null),
+                arguments(
+                        "vendor=state,ot=rv:" + RV + ",ot=rv:1234567890abcd,other=state",
+                        "ot=rv:" + RV + ",vendor=state,other=state"),
+                arguments("dd=s:1,dd=s:0,ot=rv:" + RV, "dd=s:1,ot=rv:" + RV));
+    }
+
+    @Test
+    void forwardsOpaqueOtelStateAfterSamplingPriorityChanges() {
+        PropagationTags tags = PropagationTags.factory().fromHeaderValue(W3C, "vendor=state,ot=simplefield;blah;foo");
+
+        tags.updateTraceSamplingPriority(USER_KEEP, MANUAL);
+
+        assertEquals(
+                "simplefield;blah;foo", tags.samplingState().getOtelTraceState().toString());
+        assertTrue(tags.headerValue(W3C).contains("ot=simplefield;blah;foo"));
+        assertEquals("ot=simplefield;blah;foo,vendor=state", tags.getW3CTracestate(tags.samplingState()));
+    }
+
+    @Test
+    void rebuildsDuplicateDatadogMembers() {
+        PropagationTags tags = PropagationTags.factory().fromHeaderValue(W3C, "dd=s:1,dd=s:0,ot=rv:" + RV);
+
+        assertEquals("dd=s:1,ot=rv:" + RV, tags.getW3CTracestate(tags.samplingState()));
+    }
+
+    @Test
+    void publishesProbabilityPriorityAndOtelStateTogether() {
+        PropagationTags tags = PropagationTags.factory().empty();
+        SamplingState before = tags.samplingState();
+
+        assertTrue(tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 1.0, false, 1L, false));
+        SamplingState after = tags.samplingState();
+
+        assertEquals(SAMPLER_KEEP, after.getSamplingPriority());
+        assertEquals("-1", after.getDecisionMaker().toString());
+        assertEquals("1", after.getKnuthSamplingRate().toString());
+        assertTrue(after.getOtelTraceState().toString().matches("rv:[0-9a-f]{14};th:0"));
+        assertNull(tags.getW3CTracestate(before));
+        String tracestate = tags.getW3CTracestate(after);
+        assertEquals("ot=" + after.getOtelTraceState(), tracestate);
+        assertSame(tracestate, tags.getW3CTracestate(after));
+    }
+
+    @Test
+    void reusesSamplingStateAndHeaderCachesForUnchangedProbabilityDecision() {
+        PropagationTags tags = PropagationTags.factory().empty();
+        assertTrue(tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 1.0, false, 1L, false));
+        SamplingState expectedState = tags.samplingState();
+        String expectedDatadogHeader = tags.headerValue(DATADOG);
+        String expectedW3CHeader = tags.headerValue(W3C);
+        String expectedTracestate = tags.getW3CTracestate(expectedState);
+
+        assertTrue(tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 1.0, false, 1L, true));
+
+        assertSame(expectedState, tags.samplingState());
+        assertSame(expectedDatadogHeader, tags.headerValue(DATADOG));
+        assertSame(expectedW3CHeader, tags.headerValue(W3C));
+        assertSame(expectedTracestate, tags.getW3CTracestate(expectedState));
+    }
+
+    @Test
+    void rejectedSamplingAttemptCannotReplaceProbabilityState() {
+        PropagationTags tags = PropagationTags.factory().empty();
+        assertTrue(tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 0.5, false, 1L, false));
+        SamplingState established = tags.samplingState();
+
+        assertFalse(tags.tryUpdateProbabilitySamplingDecision(SAMPLER_DROP, AGENT_RATE, 0.1, false, 2L, false));
+
+        assertEquals(established, tags.samplingState());
+    }
+
+    @Test
+    void atomicPriorityUpdatePreservesLockedDecisionMaker() {
+        PropagationTags tags = PropagationTags.factory().fromHeaderValue(DATADOG, "_dd.p.dm=934086a686-4");
+
+        assertTrue(tags.tryUpdateTraceSamplingPriority(SAMPLER_KEEP, AGENT_RATE, false));
+
+        SamplingState state = tags.samplingState();
+        assertEquals(SAMPLER_KEEP, state.getSamplingPriority());
+        assertEquals("934086a686-4", state.getDecisionMaker().toString());
+    }
+
+    @Test
+    void atomicProbabilityUpdatePreservesLockedDecisionMaker() {
+        PropagationTags tags = PropagationTags.factory().fromHeaderValue(DATADOG, "_dd.p.dm=934086a686-4");
+
+        assertTrue(tags.tryUpdateProbabilitySamplingDecision(SAMPLER_DROP, AGENT_RATE, 0.5, false, 1L, false));
+
+        SamplingState state = tags.samplingState();
+        assertEquals(SAMPLER_DROP, state.getSamplingPriority());
+        assertEquals("934086a686-4", state.getDecisionMaker().toString());
+        assertEquals("0.5", state.getKnuthSamplingRate().toString());
+        assertTrue(state.getOtelTraceState().toString().matches("rv:[0-9a-f]{14};th:8"));
+    }
+
+    @Test
+    void inheritedStateRetainsItsPositionRelativeToVendors() {
+        PropagationTags tags = PropagationTags.factory()
+                .fromHeaderValue(W3C, "vendor=state,ot=rv:ef284ace7a91e1;th:e6666666666668,dd=s:1");
+        tags.updateTraceSamplingPriority(SAMPLER_KEEP, EXTERNAL_OVERRIDE);
+
+        assertEquals("dd=s:1;t.dm:-0,vendor=state,ot=rv:ef284ace7a91e1;th:e6666666666668", tags.headerValue(W3C));
+    }
 
-  @Test
-  void localProbabilityDecisionDropsThresholdWithoutInheritedRandomValue() {
-    PropagationTags tags = PropagationTags.factory().fromHeaderValue(W3C, "ot=th:8;future:value");
+    @Test
+    void preservesFinalUnchangedInheritedOtelMember() {
+        PropagationTags tags =
+                PropagationTags.factory().fromHeaderValue(W3C, "dd=s:1,first=value,sec=value,ot=rv:" + RV);
 
-    assertTrue(
-        tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 1.0, false, 1L, false));
+        assertEquals("dd=s:1,first=value,sec=value,ot=rv:" + RV, tags.headerValue(W3C));
+    }
+
+    @Test
+    void compoundConflictRemovesThresholdAndRetainsRandomValue() {
+        PropagationTags tags =
+                PropagationTags.factory().fromHeaderValue(W3C, "dd=s:1,ot=rv:00000000000001;th:8,vendor=state");
+
+        tags.updateTraceSamplingPriority(SAMPLER_KEEP, EXTERNAL_OVERRIDE);
+
+        assertEquals("dd=s:1;t.dm:-0,ot=rv:00000000000001,vendor=state", tags.headerValue(W3C));
+    }
+
+    @Test
+    void unknownPriorityUpdateRemovesInconsistentThreshold() {
+        PropagationTags tags =
+                PropagationTags.factory().fromHeaderValue(W3C, "dd=s:0,ot=rv:00000000000001;th:8,vendor=state");
+
+        tags.updateTraceSamplingPriority(SAMPLER_KEEP, UNKNOWN);
+
+        assertEquals("dd=s:1,ot=rv:00000000000001,vendor=state", tags.headerValue(W3C));
+    }
+
+    @Test
+    void forceKeepRemovesLocallyGeneratedProbabilityState() {
+        PropagationTags tags = PropagationTags.factory().empty();
+        assertTrue(tags.tryUpdateProbabilitySamplingDecision(SAMPLER_DROP, AGENT_RATE, 0.0, false, 1L, false));
+
+        tags.forceKeep(MANUAL);
+
+        assertEquals(USER_KEEP, tags.samplingState().getSamplingPriority());
+        assertNull(tags.samplingState().getOtelTraceState());
+    }
+
+    @Test
+    void limiterDemotionDoesNotFabricateState() {
+        PropagationTags tags = PropagationTags.factory().empty();
+
+        assertTrue(tags.tryUpdateProbabilitySamplingDecision(SAMPLER_DROP, AGENT_RATE, 1.0, true, 1L, false));
+
+        assertNull(tags.samplingState().getOtelTraceState());
+    }
+
+    @Test
+    void localProbabilityDecisionDropsInheritedThresholdAtFullRate() {
+        PropagationTags tags = PropagationTags.factory().fromHeaderValue(W3C, "ot=rv:00000000000000;th:8;future:value");
+
+        assertTrue(tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 1.0, false, 1L, false));
+
+        assertEquals(
+                "rv:00000000000000;future:value",
+                tags.samplingState().getOtelTraceState().toString());
+    }
+
+    @Test
+    void localHalfRateDropsInheritedThresholdEvenWhenRandomValueAgrees() {
+        PropagationTags tags = PropagationTags.factory().fromHeaderValue(W3C, "ot=rv:ffffffffffffff;th:4;future:value");
+
+        assertTrue(tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 0.5, false, 1L, false));
+
+        assertEquals(
+                "rv:ffffffffffffff;future:value",
+                tags.samplingState().getOtelTraceState().toString());
+    }
+
+    @Test
+    void localProbabilityDecisionDropsThresholdWhenInheritedRandomValueDisagrees() {
+        PropagationTags tags = PropagationTags.factory().fromHeaderValue(W3C, "ot=rv:00000000000000;th:8;future:value");
+
+        assertTrue(tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 0.5, false, 1L, false));
+
+        assertEquals(
+                "rv:00000000000000;future:value",
+                tags.samplingState().getOtelTraceState().toString());
+    }
+
+    @Test
+    void localProbabilityDecisionDropsThresholdWithoutInheritedRandomValue() {
+        PropagationTags tags = PropagationTags.factory().fromHeaderValue(W3C, "ot=th:8;future:value");
 
-    assertEquals("future:value", tags.samplingState().getOtelTraceState().toString());
-  }
+        assertTrue(tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 1.0, false, 1L, false));
 
-  @Test
-  void generatedManagedMembersDisplaceRightmostVendorAtMemberLimit() {
-    StringBuilder original = new StringBuilder("v0=state");
-    for (int i = 1; i < 31; i++) {
-      original.append(",v").append(i).append("=state");
+        assertEquals("future:value", tags.samplingState().getOtelTraceState().toString());
     }
-    PropagationTags tags = PropagationTags.factory().fromHeaderValue(W3C, original.toString());
 
-    assertTrue(
-        tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 0.5, false, 1L, false));
+    @Test
+    void generatedManagedMembersDisplaceRightmostVendorAtMemberLimit() {
+        StringBuilder original = new StringBuilder("v0=state");
+        for (int i = 1; i < 31; i++) {
+            original.append(",v").append(i).append("=state");
+        }
+        PropagationTags tags = PropagationTags.factory().fromHeaderValue(W3C, original.toString());
 
-    String header = tags.headerValue(W3C);
-    assertEquals(32, header.split(",").length);
-    assertTrue(header.startsWith("dd=s:1;t.dm:-1;t.ksr:0.5,ot=rv:"));
-    assertFalse(header.contains("v30=state"));
-  }
+        assertTrue(tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 0.5, false, 1L, false));
+
+        String header = tags.headerValue(W3C);
+        assertEquals(32, header.split(",").length);
+        assertTrue(header.startsWith("dd=s:1;t.dm:-1;t.ksr:0.5,ot=rv:"));
+        assertFalse(header.contains("v30=state"));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/PropagationTagsLastParentIdTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/PropagationTagsLastParentIdTest.java
index 643a39126f1..d48f7d4ae1b 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/PropagationTagsLastParentIdTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/PropagationTagsLastParentIdTest.java
@@ -16,46 +16,45 @@
  */
 class PropagationTagsLastParentIdTest {
 
-  private static final String SPAN_A = "00000000000000aa";
-  private static final String SPAN_B = "00000000000000bb";
-
-  private static PropagationTags w3c(String header) {
-    return PropagationTags.factory().fromHeaderValue(W3C, header);
-  }
-
-  @Test
-  void overrideSuppliesW3cLastParentId() {
-    PropagationTags tags = w3c("dd=s:1;o:rum");
-    assertTrue(tags.headerValue(W3C, SPAN_A).contains("p:" + SPAN_A));
-  }
-
-  @Test
-  void overrideDoesNotMutateSharedTags_noCrossTalk() {
-    // One tags instance, two sibling spans injecting through it (the shared-root scenario).
-    PropagationTags shared = w3c("dd=s:1;o:rum"); // no inbound p:
-
-    String headerA = shared.headerValue(W3C, SPAN_A);
-    String headerB = shared.headerValue(W3C, SPAN_B);
-    String headerAagain = shared.headerValue(W3C, SPAN_A);
-
-    assertTrue(headerA.contains("p:" + SPAN_A));
-    assertTrue(headerB.contains("p:" + SPAN_B));
-    // Injecting B did not change what A injects — no shared mutation.
-    assertEquals(headerA, headerAagain, "a sibling inject must not change another span's header");
-    // The override is never written into the shared tags (no-override header has no p:).
-    assertFalse(shared.headerValue(W3C).contains("p:"), "override must not mutate the stored tags");
-  }
-
-  @Test
-  void inboundLastParentIdPreservedAndUnmutatedByOverride() {
-    PropagationTags tags = w3c("dd=s:1;p:" + SPAN_A); // arrived carrying a last-parent-id
-
-    // No-override path (e.g. span-link traceState) keeps the inbound p:.
-    assertTrue(tags.headerValue(W3C).contains("p:" + SPAN_A));
-    // An inject override replaces it for that produced header...
-    assertTrue(tags.headerValue(W3C, SPAN_B).contains("p:" + SPAN_B));
-    // ...without mutating the stored inbound value.
-    assertTrue(
-        tags.headerValue(W3C).contains("p:" + SPAN_A), "inbound p: must survive override use");
-  }
+    private static final String SPAN_A = "00000000000000aa";
+    private static final String SPAN_B = "00000000000000bb";
+
+    private static PropagationTags w3c(String header) {
+        return PropagationTags.factory().fromHeaderValue(W3C, header);
+    }
+
+    @Test
+    void overrideSuppliesW3cLastParentId() {
+        PropagationTags tags = w3c("dd=s:1;o:rum");
+        assertTrue(tags.headerValue(W3C, SPAN_A).contains("p:" + SPAN_A));
+    }
+
+    @Test
+    void overrideDoesNotMutateSharedTags_noCrossTalk() {
+        // One tags instance, two sibling spans injecting through it (the shared-root scenario).
+        PropagationTags shared = w3c("dd=s:1;o:rum"); // no inbound p:
+
+        String headerA = shared.headerValue(W3C, SPAN_A);
+        String headerB = shared.headerValue(W3C, SPAN_B);
+        String headerAagain = shared.headerValue(W3C, SPAN_A);
+
+        assertTrue(headerA.contains("p:" + SPAN_A));
+        assertTrue(headerB.contains("p:" + SPAN_B));
+        // Injecting B did not change what A injects — no shared mutation.
+        assertEquals(headerA, headerAagain, "a sibling inject must not change another span's header");
+        // The override is never written into the shared tags (no-override header has no p:).
+        assertFalse(shared.headerValue(W3C).contains("p:"), "override must not mutate the stored tags");
+    }
+
+    @Test
+    void inboundLastParentIdPreservedAndUnmutatedByOverride() {
+        PropagationTags tags = w3c("dd=s:1;p:" + SPAN_A); // arrived carrying a last-parent-id
+
+        // No-override path (e.g. span-link traceState) keeps the inbound p:.
+        assertTrue(tags.headerValue(W3C).contains("p:" + SPAN_A));
+        // An inject override replaces it for that produced header...
+        assertTrue(tags.headerValue(W3C, SPAN_B).contains("p:" + SPAN_B));
+        // ...without mutating the stored inbound value.
+        assertTrue(tags.headerValue(W3C).contains("p:" + SPAN_A), "inbound p: must survive override use");
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/PropagationTagsOpmTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/PropagationTagsOpmTest.java
index 48935a33195..a2e52ecaac6 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/PropagationTagsOpmTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/PropagationTagsOpmTest.java
@@ -15,110 +15,110 @@
 @DisplayName("PropagationTags OPM round-trip")
 class PropagationTagsOpmTest {
 
-  private PropagationTags.Factory factory;
+    private PropagationTags.Factory factory;
 
-  @BeforeEach
-  void setUp() {
-    factory = PropagationTags.factory();
-  }
+    @BeforeEach
+    void setUp() {
+        factory = PropagationTags.factory();
+    }
 
-  @Test
-  @DisplayName("Datadog: extract _dd.p.opm from x-datadog-tags then re-serialize it")
-  void datadogRoundTrip() {
-    PropagationTags tags = factory.fromHeaderValue(DATADOG, "_dd.p.opm=abc123def0");
-    assertNotNull(tags.getOrgPropagationMarker());
-    assertEquals("abc123def0", tags.getOrgPropagationMarker().toString());
-    String header = tags.headerValue(DATADOG);
-    assertNotNull(header);
-    assertTrue(header.contains("_dd.p.opm=abc123def0"), "header was: " + header);
-  }
+    @Test
+    @DisplayName("Datadog: extract _dd.p.opm from x-datadog-tags then re-serialize it")
+    void datadogRoundTrip() {
+        PropagationTags tags = factory.fromHeaderValue(DATADOG, "_dd.p.opm=abc123def0");
+        assertNotNull(tags.getOrgPropagationMarker());
+        assertEquals("abc123def0", tags.getOrgPropagationMarker().toString());
+        String header = tags.headerValue(DATADOG);
+        assertNotNull(header);
+        assertTrue(header.contains("_dd.p.opm=abc123def0"), "header was: " + header);
+    }
 
-  @Test
-  @DisplayName("W3C: extract t.opm from tracestate dd= section then re-serialize it")
-  void w3cRoundTrip() {
-    PropagationTags tags = factory.fromHeaderValue(W3C, "dd=t.opm:abc123def0");
-    assertNotNull(tags.getOrgPropagationMarker());
-    assertEquals("abc123def0", tags.getOrgPropagationMarker().toString());
-    String header = tags.headerValue(W3C);
-    assertNotNull(header);
-    assertTrue(header.contains("t.opm:abc123def0"), "header was: " + header);
-  }
+    @Test
+    @DisplayName("W3C: extract t.opm from tracestate dd= section then re-serialize it")
+    void w3cRoundTrip() {
+        PropagationTags tags = factory.fromHeaderValue(W3C, "dd=t.opm:abc123def0");
+        assertNotNull(tags.getOrgPropagationMarker());
+        assertEquals("abc123def0", tags.getOrgPropagationMarker().toString());
+        String header = tags.headerValue(W3C);
+        assertNotNull(header);
+        assertTrue(header.contains("t.opm:abc123def0"), "header was: " + header);
+    }
 
-  @Test
-  @DisplayName("update overrides any previously extracted OPM (W3C)")
-  void updateOverridesExtractedW3C() {
-    PropagationTags tags = factory.fromHeaderValue(W3C, "dd=t.opm:upstream-abc");
-    tags.updateOrgPropagationMarker("local-xyz");
-    assertEquals("local-xyz", tags.getOrgPropagationMarker().toString());
-    String header = tags.headerValue(W3C);
-    assertNotNull(header);
-    assertTrue(header.contains("t.opm:local-xyz"), "header was: " + header);
-  }
+    @Test
+    @DisplayName("update overrides any previously extracted OPM (W3C)")
+    void updateOverridesExtractedW3C() {
+        PropagationTags tags = factory.fromHeaderValue(W3C, "dd=t.opm:upstream-abc");
+        tags.updateOrgPropagationMarker("local-xyz");
+        assertEquals("local-xyz", tags.getOrgPropagationMarker().toString());
+        String header = tags.headerValue(W3C);
+        assertNotNull(header);
+        assertTrue(header.contains("t.opm:local-xyz"), "header was: " + header);
+    }
 
-  @Test
-  @DisplayName("update overrides any previously extracted OPM (Datadog)")
-  void updateOverridesExtractedDatadog() {
-    PropagationTags tags = factory.fromHeaderValue(DATADOG, "_dd.p.opm=upstream-abc");
-    tags.updateOrgPropagationMarker("local-xyz");
-    assertEquals("local-xyz", tags.getOrgPropagationMarker().toString());
-    String header = tags.headerValue(DATADOG);
-    assertNotNull(header);
-    assertTrue(header.contains("_dd.p.opm=local-xyz"), "header was: " + header);
-  }
+    @Test
+    @DisplayName("update overrides any previously extracted OPM (Datadog)")
+    void updateOverridesExtractedDatadog() {
+        PropagationTags tags = factory.fromHeaderValue(DATADOG, "_dd.p.opm=upstream-abc");
+        tags.updateOrgPropagationMarker("local-xyz");
+        assertEquals("local-xyz", tags.getOrgPropagationMarker().toString());
+        String header = tags.headerValue(DATADOG);
+        assertNotNull(header);
+        assertTrue(header.contains("_dd.p.opm=local-xyz"), "header was: " + header);
+    }
 
-  @Test
-  @DisplayName("update with null clears the OPM")
-  void updateWithNullClears() {
-    PropagationTags tags = factory.fromHeaderValue(W3C, "dd=t.opm:abc");
-    tags.updateOrgPropagationMarker(null);
-    assertNull(tags.getOrgPropagationMarker());
-    String header = tags.headerValue(W3C);
-    if (header != null) {
-      assertFalse(header.contains("t.opm"), "header still had t.opm: " + header);
+    @Test
+    @DisplayName("update with null clears the OPM")
+    void updateWithNullClears() {
+        PropagationTags tags = factory.fromHeaderValue(W3C, "dd=t.opm:abc");
+        tags.updateOrgPropagationMarker(null);
+        assertNull(tags.getOrgPropagationMarker());
+        String header = tags.headerValue(W3C);
+        if (header != null) {
+            assertFalse(header.contains("t.opm"), "header still had t.opm: " + header);
+        }
     }
-  }
 
-  @Test
-  @DisplayName("emptyW3C preserves non-dd vendor tracestate sections and drops dd content")
-  void emptyW3CPreservesNonDdVendors() {
-    String original = "dd=s:1;o:foo;t.dm:-4;t.opm:upstream-abc,vendor1=abc,vendor2=def";
-    PropagationTags stripped = factory.emptyW3C(original);
-    assertNull(stripped.getOrgPropagationMarker());
-    String reEncoded = stripped.headerValue(W3C);
-    assertNotNull(reEncoded);
-    assertFalse(reEncoded.contains("dd="), "should drop dd member but was: " + reEncoded);
-    assertTrue(reEncoded.contains("vendor1=abc"), "vendor1 missing: " + reEncoded);
-    assertTrue(reEncoded.contains("vendor2=def"), "vendor2 missing: " + reEncoded);
-  }
+    @Test
+    @DisplayName("emptyW3C preserves non-dd vendor tracestate sections and drops dd content")
+    void emptyW3CPreservesNonDdVendors() {
+        String original = "dd=s:1;o:foo;t.dm:-4;t.opm:upstream-abc,vendor1=abc,vendor2=def";
+        PropagationTags stripped = factory.emptyW3C(original);
+        assertNull(stripped.getOrgPropagationMarker());
+        String reEncoded = stripped.headerValue(W3C);
+        assertNotNull(reEncoded);
+        assertFalse(reEncoded.contains("dd="), "should drop dd member but was: " + reEncoded);
+        assertTrue(reEncoded.contains("vendor1=abc"), "vendor1 missing: " + reEncoded);
+        assertTrue(reEncoded.contains("vendor2=def"), "vendor2 missing: " + reEncoded);
+    }
 
-  @Test
-  @DisplayName("emptyW3C with null tracestate behaves like empty()")
-  void emptyW3CNullTracestate() {
-    PropagationTags stripped = factory.emptyW3C(null);
-    assertNull(stripped.getOrgPropagationMarker());
-    assertNull(stripped.headerValue(W3C));
-  }
+    @Test
+    @DisplayName("emptyW3C with null tracestate behaves like empty()")
+    void emptyW3CNullTracestate() {
+        PropagationTags stripped = factory.emptyW3C(null);
+        assertNull(stripped.getOrgPropagationMarker());
+        assertNull(stripped.headerValue(W3C));
+    }
 
-  @Test
-  @DisplayName("emptyW3C with empty string tracestate behaves like empty()")
-  void emptyW3CEmptyTracestate() {
-    PropagationTags stripped = factory.emptyW3C("");
-    assertNull(stripped.getOrgPropagationMarker());
-    assertNull(stripped.headerValue(W3C));
-  }
+    @Test
+    @DisplayName("emptyW3C with empty string tracestate behaves like empty()")
+    void emptyW3CEmptyTracestate() {
+        PropagationTags stripped = factory.emptyW3C("");
+        assertNull(stripped.getOrgPropagationMarker());
+        assertNull(stripped.headerValue(W3C));
+    }
 
-  @Test
-  @DisplayName("empty tags can have an OPM stamped on them and serialize it")
-  void emptyTagsCanReceiveOpm() {
-    PropagationTags tags = factory.empty();
-    assertNull(tags.getOrgPropagationMarker());
-    tags.updateOrgPropagationMarker("local-xyz");
-    assertEquals("local-xyz", tags.getOrgPropagationMarker().toString());
-    String datadog = tags.headerValue(DATADOG);
-    assertNotNull(datadog);
-    assertTrue(datadog.contains("_dd.p.opm=local-xyz"), "datadog header: " + datadog);
-    String w3c = tags.headerValue(W3C);
-    assertNotNull(w3c);
-    assertTrue(w3c.contains("t.opm:local-xyz"), "w3c header: " + w3c);
-  }
+    @Test
+    @DisplayName("empty tags can have an OPM stamped on them and serialize it")
+    void emptyTagsCanReceiveOpm() {
+        PropagationTags tags = factory.empty();
+        assertNull(tags.getOrgPropagationMarker());
+        tags.updateOrgPropagationMarker("local-xyz");
+        assertEquals("local-xyz", tags.getOrgPropagationMarker().toString());
+        String datadog = tags.headerValue(DATADOG);
+        assertNotNull(datadog);
+        assertTrue(datadog.contains("_dd.p.opm=local-xyz"), "datadog header: " + datadog);
+        String w3c = tags.headerValue(W3C);
+        assertNotNull(w3c);
+        assertTrue(w3c.contains("t.opm:local-xyz"), "w3c header: " + w3c);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/TracingPropagatorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/TracingPropagatorTest.java
index 1660604632a..6ebb13088fa 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/TracingPropagatorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/TracingPropagatorTest.java
@@ -37,165 +37,164 @@
 
 class TracingPropagatorTest extends DDCoreJavaSpecification {
 
-  private HttpCodec.Injector injector;
-  private HttpCodec.Extractor extractor;
-  private TracingPropagator propagator;
-
-  @BeforeEach
-  void setup() {
-    this.injector = mock(HttpCodec.Injector.class);
-    this.extractor = mock(HttpCodec.Extractor.class);
-    this.propagator = new TracingPropagator(true, this.injector, this.extractor);
-  }
-
-  @Test
-  void testTracingPropagatorContextInjection() {
-    CoreTracer tracer = tracerBuilder().build();
-    AgentSpan span = tracer.buildSpan("test", "operation").start();
-    Map<String, String> carrier = new HashMap<>();
-
-    this.propagator.inject(span, carrier, Map::put);
-
-    verify(this.injector).inject(same((DDSpanContext) span.spanContext()), same(carrier), any());
-
-    span.finish();
-    tracer.close();
-  }
-
-  @Test
-  void testTracingPropagatorContextExtractor() {
-    Context context = Context.root();
-    Map<String, String> carrier = new HashMap<>();
-
-    this.propagator.extract(context, carrier, stringValuesMap());
-
-    verify(this.extractor).extract(same(carrier), any());
-  }
-
-  @Test
-  void spanPrioritySetWhenInjecting() {
-    CoreTracer tracer = tracerBuilder().build();
-    Map<String, String> carrier = new HashMap<>();
-
-    AgentSpan root = tracer.buildSpan("test", "parent").start();
-    AgentSpan child = tracer.buildSpan("test", "child").asChildOf(root).start();
-    Propagators.defaultPropagator().inject(child, carrier, Map::put);
-
-    assertEquals(SAMPLER_KEEP, root.getSamplingPriority());
-    assertEquals(root.getSamplingPriority(), child.getSamplingPriority());
-    assertEquals(String.valueOf(SAMPLER_KEEP), carrier.get(SAMPLING_PRIORITY_KEY));
-
-    child.finish();
-    root.finish();
-    tracer.close();
-  }
-
-  @Test
-  void spanPriorityOnlySetAfterFirstInjection() {
-    ControllableSampler sampler = new ControllableSampler();
-    CoreTracer tracer = tracerBuilder().sampler(sampler).build();
-
-    AgentSpan root = tracer.buildSpan("test", "parent").start();
-    AgentSpan child = tracer.buildSpan("test", "child").asChildOf(root).start();
-
-    Map<String, String> carrier = new HashMap<>();
-    Propagators.defaultPropagator().inject(child, carrier, Map::put);
-
-    assertEquals(SAMPLER_KEEP, root.getSamplingPriority());
-    assertEquals(root.getSamplingPriority(), child.getSamplingPriority());
-    assertEquals(String.valueOf(SAMPLER_KEEP), carrier.get(SAMPLING_PRIORITY_KEY));
-
-    sampler.nextSamplingPriority = SAMPLER_DROP;
-    AgentSpan child2 = tracer.buildSpan("test", "child2").asChildOf(root).start();
-    Propagators.defaultPropagator().inject(child2, carrier, Map::put);
-
-    assertEquals(SAMPLER_KEEP, root.getSamplingPriority());
-    assertEquals(root.getSamplingPriority(), child.getSamplingPriority());
-    assertEquals(root.getSamplingPriority(), child2.getSamplingPriority());
-    assertEquals(String.valueOf(SAMPLER_KEEP), carrier.get(SAMPLING_PRIORITY_KEY));
-
-    child.finish();
-    child2.finish();
-    root.finish();
-    tracer.close();
-  }
-
-  @Test
-  void injectionDoesNotOverrideSetPriority() {
-    ControllableSampler sampler = new ControllableSampler();
-    CoreTracer tracer = tracerBuilder().sampler(sampler).build();
-
-    AgentSpan root = tracer.buildSpan("test", "root").start();
-    AgentSpan child = tracer.buildSpan("test", "child").asChildOf(root).start();
-    child.setSamplingPriority(USER_DROP);
-
-    Map<String, String> carrier = new HashMap<>();
-    Propagators.defaultPropagator().inject(child, carrier, Map::put);
-
-    assertEquals(USER_DROP, root.getSamplingPriority());
-    assertEquals(root.getSamplingPriority(), child.getSamplingPriority());
-    assertEquals(String.valueOf(USER_DROP), carrier.get(SAMPLING_PRIORITY_KEY));
-
-    child.finish();
-    root.finish();
-    tracer.close();
-  }
-
-  @TableTest({
-    "tracingEnabled | product                 ",
-    "true           | ProductTraceSource.ASM  ",
-    "true           | ProductTraceSource.UNSET",
-    "false          | ProductTraceSource.ASM  ",
-    "false          | ProductTraceSource.UNSET"
-  })
-  void testPropagationWhenTracingIsDisabled(
-      boolean tracingEnabled, @ConvertWith(ProductTraceSourceConverter.class) int product) {
-    // Recreating propagator to apply tracing test flag
-    this.propagator = new TracingPropagator(tracingEnabled, this.injector, this.extractor);
-
-    CoreTracer tracer = tracerBuilder().build();
-    AgentSpan span = tracer.buildSpan("test", "operation").start();
-    span.setTag(PROPAGATED_TRACE_SOURCE, product);
-
-    Map<String, String> carrier = new HashMap<>();
-    this.propagator.inject(span, carrier, Map::put);
-
-    int injected = (tracingEnabled || product != UNSET) ? 1 : 0;
-    verify(this.injector, times(injected))
-        .inject(same((DDSpanContext) span.spanContext()), same(carrier), any());
-
-    span.finish();
-    tracer.close();
-  }
-
-  @Test
-  void testAwsXRayPropagator() {
-    CoreTracer tracer = tracerBuilder().build();
-    AgentSpan span = tracer.buildSpan("test", "operation").start();
-    Propagator xrayPropagator = Propagators.forConcerns(XRAY_TRACING_CONCERN);
-
-    Map<String, String> carrier = new HashMap<>();
-    xrayPropagator.inject(span, carrier, Map::put);
-
-    assertNotNull(carrier.get(X_AMZN_TRACE_ID));
-
-    span.finish();
-    tracer.close();
-  }
-
-  @ParameterizedTest
-  @ValueSource(booleans = {true, false})
-  void testApmTracingDisabledPropagatorStopPropagation(boolean apmTracingEnabled) {
-    injectSysConfig("apm.tracing.enabled", String.valueOf(apmTracingEnabled));
-    CoreTracer tracer = tracerBuilder().build();
-    AgentSpan span = tracer.buildSpan("test", "operation").start();
-
-    Map<String, String> carrier = new HashMap<>();
-    Propagators.defaultPropagator().inject(span, carrier, Map::put);
-
-    assertEquals(apmTracingEnabled, !carrier.isEmpty());
-
-    span.finish();
-    tracer.close();
-  }
+    private HttpCodec.Injector injector;
+    private HttpCodec.Extractor extractor;
+    private TracingPropagator propagator;
+
+    @BeforeEach
+    void setup() {
+        this.injector = mock(HttpCodec.Injector.class);
+        this.extractor = mock(HttpCodec.Extractor.class);
+        this.propagator = new TracingPropagator(true, this.injector, this.extractor);
+    }
+
+    @Test
+    void testTracingPropagatorContextInjection() {
+        CoreTracer tracer = tracerBuilder().build();
+        AgentSpan span = tracer.buildSpan("test", "operation").start();
+        Map<String, String> carrier = new HashMap<>();
+
+        this.propagator.inject(span, carrier, Map::put);
+
+        verify(this.injector).inject(same((DDSpanContext) span.spanContext()), same(carrier), any());
+
+        span.finish();
+        tracer.close();
+    }
+
+    @Test
+    void testTracingPropagatorContextExtractor() {
+        Context context = Context.root();
+        Map<String, String> carrier = new HashMap<>();
+
+        this.propagator.extract(context, carrier, stringValuesMap());
+
+        verify(this.extractor).extract(same(carrier), any());
+    }
+
+    @Test
+    void spanPrioritySetWhenInjecting() {
+        CoreTracer tracer = tracerBuilder().build();
+        Map<String, String> carrier = new HashMap<>();
+
+        AgentSpan root = tracer.buildSpan("test", "parent").start();
+        AgentSpan child = tracer.buildSpan("test", "child").asChildOf(root).start();
+        Propagators.defaultPropagator().inject(child, carrier, Map::put);
+
+        assertEquals(SAMPLER_KEEP, root.getSamplingPriority());
+        assertEquals(root.getSamplingPriority(), child.getSamplingPriority());
+        assertEquals(String.valueOf(SAMPLER_KEEP), carrier.get(SAMPLING_PRIORITY_KEY));
+
+        child.finish();
+        root.finish();
+        tracer.close();
+    }
+
+    @Test
+    void spanPriorityOnlySetAfterFirstInjection() {
+        ControllableSampler sampler = new ControllableSampler();
+        CoreTracer tracer = tracerBuilder().sampler(sampler).build();
+
+        AgentSpan root = tracer.buildSpan("test", "parent").start();
+        AgentSpan child = tracer.buildSpan("test", "child").asChildOf(root).start();
+
+        Map<String, String> carrier = new HashMap<>();
+        Propagators.defaultPropagator().inject(child, carrier, Map::put);
+
+        assertEquals(SAMPLER_KEEP, root.getSamplingPriority());
+        assertEquals(root.getSamplingPriority(), child.getSamplingPriority());
+        assertEquals(String.valueOf(SAMPLER_KEEP), carrier.get(SAMPLING_PRIORITY_KEY));
+
+        sampler.nextSamplingPriority = SAMPLER_DROP;
+        AgentSpan child2 = tracer.buildSpan("test", "child2").asChildOf(root).start();
+        Propagators.defaultPropagator().inject(child2, carrier, Map::put);
+
+        assertEquals(SAMPLER_KEEP, root.getSamplingPriority());
+        assertEquals(root.getSamplingPriority(), child.getSamplingPriority());
+        assertEquals(root.getSamplingPriority(), child2.getSamplingPriority());
+        assertEquals(String.valueOf(SAMPLER_KEEP), carrier.get(SAMPLING_PRIORITY_KEY));
+
+        child.finish();
+        child2.finish();
+        root.finish();
+        tracer.close();
+    }
+
+    @Test
+    void injectionDoesNotOverrideSetPriority() {
+        ControllableSampler sampler = new ControllableSampler();
+        CoreTracer tracer = tracerBuilder().sampler(sampler).build();
+
+        AgentSpan root = tracer.buildSpan("test", "root").start();
+        AgentSpan child = tracer.buildSpan("test", "child").asChildOf(root).start();
+        child.setSamplingPriority(USER_DROP);
+
+        Map<String, String> carrier = new HashMap<>();
+        Propagators.defaultPropagator().inject(child, carrier, Map::put);
+
+        assertEquals(USER_DROP, root.getSamplingPriority());
+        assertEquals(root.getSamplingPriority(), child.getSamplingPriority());
+        assertEquals(String.valueOf(USER_DROP), carrier.get(SAMPLING_PRIORITY_KEY));
+
+        child.finish();
+        root.finish();
+        tracer.close();
+    }
+
+    @TableTest({
+      "tracingEnabled | product                 ",
+      "true           | ProductTraceSource.ASM  ",
+      "true           | ProductTraceSource.UNSET",
+      "false          | ProductTraceSource.ASM  ",
+      "false          | ProductTraceSource.UNSET"
+    })
+    void testPropagationWhenTracingIsDisabled(
+            boolean tracingEnabled, @ConvertWith(ProductTraceSourceConverter.class) int product) {
+        // Recreating propagator to apply tracing test flag
+        this.propagator = new TracingPropagator(tracingEnabled, this.injector, this.extractor);
+
+        CoreTracer tracer = tracerBuilder().build();
+        AgentSpan span = tracer.buildSpan("test", "operation").start();
+        span.setTag(PROPAGATED_TRACE_SOURCE, product);
+
+        Map<String, String> carrier = new HashMap<>();
+        this.propagator.inject(span, carrier, Map::put);
+
+        int injected = (tracingEnabled || product != UNSET) ? 1 : 0;
+        verify(this.injector, times(injected)).inject(same((DDSpanContext) span.spanContext()), same(carrier), any());
+
+        span.finish();
+        tracer.close();
+    }
+
+    @Test
+    void testAwsXRayPropagator() {
+        CoreTracer tracer = tracerBuilder().build();
+        AgentSpan span = tracer.buildSpan("test", "operation").start();
+        Propagator xrayPropagator = Propagators.forConcerns(XRAY_TRACING_CONCERN);
+
+        Map<String, String> carrier = new HashMap<>();
+        xrayPropagator.inject(span, carrier, Map::put);
+
+        assertNotNull(carrier.get(X_AMZN_TRACE_ID));
+
+        span.finish();
+        tracer.close();
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void testApmTracingDisabledPropagatorStopPropagation(boolean apmTracingEnabled) {
+        injectSysConfig("apm.tracing.enabled", String.valueOf(apmTracingEnabled));
+        CoreTracer tracer = tracerBuilder().build();
+        AgentSpan span = tracer.buildSpan("test", "operation").start();
+
+        Map<String, String> carrier = new HashMap<>();
+        Propagators.defaultPropagator().inject(span, carrier, Map::put);
+
+        assertEquals(apmTracingEnabled, !carrier.isEmpty());
+
+        span.finish();
+        tracer.close();
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpExtractorTest.java
index 427c8b898e0..353b4e1baa4 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpExtractorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpExtractorTest.java
@@ -39,116 +39,112 @@
 import org.tabletest.junit.TableTest;
 
 class W3CHttpExtractorTest extends AbstractHttpExtractorTest {
-  private static final long TEST_SPAN_ID = 1311768467463790320L;
-  private static final DDTraceId TRACE_ID_ONE =
-      DDTraceId.fromHex("00000000000000000000000000000001");
-  private static final DDTraceId TRACE_ID_NO_HIGH_LOW_MAX =
-      DDTraceId.fromHex("0000000000000000ffffffffffffffff");
-  private static final DDTraceId TRACE_ID_LOW_MAX =
-      DDTraceId.fromHex("123456789abcdef0ffffffffffffffff");
+    private static final long TEST_SPAN_ID = 1311768467463790320L;
+    private static final DDTraceId TRACE_ID_ONE = DDTraceId.fromHex("00000000000000000000000000000001");
+    private static final DDTraceId TRACE_ID_NO_HIGH_LOW_MAX = DDTraceId.fromHex("0000000000000000ffffffffffffffff");
+    private static final DDTraceId TRACE_ID_LOW_MAX = DDTraceId.fromHex("123456789abcdef0ffffffffffffffff");
 
-  @Override
-  protected HttpCodec.Extractor newExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier) {
-    return W3CHttpCodec.newExtractor(config, traceConfigSupplier);
-  }
-
-  @Nested
-  class BaggageLimits extends AbstractOTBaggageTest {
     @Override
-    protected HttpCodec.Extractor extractor() {
-      return W3CHttpExtractorTest.this.extractor;
+    protected HttpCodec.Extractor newExtractor(Config config, Supplier<TraceConfig> traceConfigSupplier) {
+        return W3CHttpCodec.newExtractor(config, traceConfigSupplier);
     }
 
-    @Override
-    protected Map<String, String> baggageHeaders(List<Entry<String, String>> items) {
-      return otBaggageHeaders(OT_BAGGAGE_PREFIX, items);
+    @Nested
+    class BaggageLimits extends AbstractOTBaggageTest {
+        @Override
+        protected HttpCodec.Extractor extractor() {
+            return W3CHttpExtractorTest.this.extractor;
+        }
+
+        @Override
+        protected Map<String, String> baggageHeaders(List<Entry<String, String>> items) {
+            return otBaggageHeaders(OT_BAGGAGE_PREFIX, items);
+        }
     }
-  }
 
-  @TableTest({
-    "scenario                              | traceparent                                                 | tpValid | traceId                  | spanId       | priority    ",
-    "null traceparent                      |                                                             | false   |                          | 0            | UNSET       ",
-    "all zeros trace id                    | '00-00000000000000000000000000000000-123456789abcdef0-01'   | false   |                          | 0            | UNSET       ",
-    "too long trace id                     | '00-123456789abcdef00000000000000000-123456789abcdef0-01'   | false   |                          | 0            | UNSET       ",
-    "all zeros span id                     | '00-00000000000000000000000000000001-0000000000000000-01'   | false   |                          | 0            | UNSET       ",
-    "valid keep                            | '00-00000000000000000000000000000001-123456789abcdef0-01'   | true    | TRACE_ID_ONE             | SPAN_ID_TEST | SAMPLER_KEEP",
-    "leading tab                           | '\t00-00000000000000000000000000000001-123456789abcdef0-01' | true    | TRACE_ID_ONE             | SPAN_ID_TEST | SAMPLER_KEEP",
-    "trailing tab                          | '00-00000000000000000000000000000001-123456789abcdef0-01\t' | true    | TRACE_ID_ONE             | SPAN_ID_TEST | SAMPLER_KEEP",
-    "surrounding spaces                    | ' 00-00000000000000000000000000000001-123456789abcdef0-01 ' | true    | TRACE_ID_ONE             | SPAN_ID_TEST | SAMPLER_KEEP",
-    "max span id keep                      | '00-0000000000000000ffffffffffffffff-ffffffffffffffff-01'   | true    | TRACE_ID_NO_HIGH_LOW_MAX | SPAN_ID_MAX  | SAMPLER_KEEP",
-    "max span id drop                      | '00-0000000000000000ffffffffffffffff-ffffffffffffffff-00'   | true    | TRACE_ID_NO_HIGH_LOW_MAX | SPAN_ID_MAX  | SAMPLER_DROP",
-    "low max trace id drop                 | '00-123456789abcdef0ffffffffffffffff-123456789abcdef0-00'   | true    | TRACE_ID_LOW_MAX         | SPAN_ID_TEST | SAMPLER_DROP",
-    "uppercase F in trace id low part      | '00-123456789abcdef0ffffffffffffffFf-123456789abcdef0-00'   | false   |                          | 0            | UNSET       ",
-    "uppercase F in trace id high part     | '00-123456789abcdeF0ffffffffffffffff-123456789abcdef0-00'   | false   |                          | 0            | UNSET       ",
-    "uppercase F in trace id mid           | '00-123456789abcdef0fffffffffFffffff-123456789abcdef0-00'   | false   |                          | 0            | UNSET       ",
-    "uppercase A in span id                | '00-123456789abcdef0ffffffffffffffff-123456789Abcdef0-00'   | false   |                          | 0            | UNSET       ",
-    "unicode a-umlaut in trace id start    | '00-123456789äbcdef0ffffffffffffffff-123456789abcdef0-00'   | false   |                          | 0            | UNSET       ",
-    "unicode a-umlaut in trace id mid      | '00-123456789abcdef0ffffffffäfffffff-123456789abcdef0-00'   | false   |                          | 0            | UNSET       ",
-    "unicode a-umlaut in span id           | '00-123456789abcdef0ffffffffffffffff-123456789äbcdef0-00'   | false   |                          | 0            | UNSET       ",
-    "version 01 flags 02                   | '01-00000000000000000000000000000001-0000000000000001-02'   | true    | TRACE_ID_ONE             | SPAN_ID_ONE  | SAMPLER_DROP",
-    "too long version                      | '000-0000000000000000000000000000001-0000000000000001-01'   | false   |                          | 0            | UNSET       ",
-    "space inside trace id                 | '00-0000000000000000000000000000001 -0000000000000001-01'   | false   |                          | 0            | UNSET       ",
-    "trace id too short                    | '00-0000000000000000000000000000001-0000000000000001-01'    | false   |                          | 0            | UNSET       ",
-    "span id too short                     | '00-00000000000000000000000000000001-000000000000001-01'    | false   |                          | 0            | UNSET       ",
-    "flags too short                       | '00-00000000000000000000000000000001-0000000000000001-0'    | false   |                          | 0            | UNSET       ",
-    "version ff invalid                    | 'ff-00000000000000000000000000000001-0000000000000001-00'   | false   |                          | 0            | UNSET       ",
-    "version fe flags 02                   | 'fe-00000000000000000000000000000001-0000000000000001-02'   | true    | TRACE_ID_ONE             | SPAN_ID_ONE  | SAMPLER_DROP",
-    "extra data with version 00            | '00-00000000000000000000000000000001-0000000000000001-03-0' | false   |                          | 0            | UNSET       ",
-    "invalid separator after flags with fe | 'fe-00000000000000000000000000000001-0000000000000001-02.0' | false   |                          | 0            | UNSET       "
-  })
-  void extractTraceparent(
-      String traceparent,
-      boolean tpValid,
-      @ConvertWith(TraceIdTestConverter.class) DDTraceId traceId,
-      @ConvertWith(SpanIdTestConverter.class) long spanId,
-      @ConvertWith(PrioritySamplingConverter.class) byte priority) {
-    Map<String, String> headers = headers(TRACE_PARENT_KEY, traceparent);
+    @TableTest({
+      "scenario                              | traceparent                                                 | tpValid | traceId                  | spanId       | priority    ",
+      "null traceparent                      |                                                             | false   |                          | 0            | UNSET       ",
+      "all zeros trace id                    | '00-00000000000000000000000000000000-123456789abcdef0-01'   | false   |                          | 0            | UNSET       ",
+      "too long trace id                     | '00-123456789abcdef00000000000000000-123456789abcdef0-01'   | false   |                          | 0            | UNSET       ",
+      "all zeros span id                     | '00-00000000000000000000000000000001-0000000000000000-01'   | false   |                          | 0            | UNSET       ",
+      "valid keep                            | '00-00000000000000000000000000000001-123456789abcdef0-01'   | true    | TRACE_ID_ONE             | SPAN_ID_TEST | SAMPLER_KEEP",
+      "leading tab                           | '\t00-00000000000000000000000000000001-123456789abcdef0-01' | true    | TRACE_ID_ONE             | SPAN_ID_TEST | SAMPLER_KEEP",
+      "trailing tab                          | '00-00000000000000000000000000000001-123456789abcdef0-01\t' | true    | TRACE_ID_ONE             | SPAN_ID_TEST | SAMPLER_KEEP",
+      "surrounding spaces                    | ' 00-00000000000000000000000000000001-123456789abcdef0-01 ' | true    | TRACE_ID_ONE             | SPAN_ID_TEST | SAMPLER_KEEP",
+      "max span id keep                      | '00-0000000000000000ffffffffffffffff-ffffffffffffffff-01'   | true    | TRACE_ID_NO_HIGH_LOW_MAX | SPAN_ID_MAX  | SAMPLER_KEEP",
+      "max span id drop                      | '00-0000000000000000ffffffffffffffff-ffffffffffffffff-00'   | true    | TRACE_ID_NO_HIGH_LOW_MAX | SPAN_ID_MAX  | SAMPLER_DROP",
+      "low max trace id drop                 | '00-123456789abcdef0ffffffffffffffff-123456789abcdef0-00'   | true    | TRACE_ID_LOW_MAX         | SPAN_ID_TEST | SAMPLER_DROP",
+      "uppercase F in trace id low part      | '00-123456789abcdef0ffffffffffffffFf-123456789abcdef0-00'   | false   |                          | 0            | UNSET       ",
+      "uppercase F in trace id high part     | '00-123456789abcdeF0ffffffffffffffff-123456789abcdef0-00'   | false   |                          | 0            | UNSET       ",
+      "uppercase F in trace id mid           | '00-123456789abcdef0fffffffffFffffff-123456789abcdef0-00'   | false   |                          | 0            | UNSET       ",
+      "uppercase A in span id                | '00-123456789abcdef0ffffffffffffffff-123456789Abcdef0-00'   | false   |                          | 0            | UNSET       ",
+      "unicode a-umlaut in trace id start    | '00-123456789äbcdef0ffffffffffffffff-123456789abcdef0-00'   | false   |                          | 0            | UNSET       ",
+      "unicode a-umlaut in trace id mid      | '00-123456789abcdef0ffffffffäfffffff-123456789abcdef0-00'   | false   |                          | 0            | UNSET       ",
+      "unicode a-umlaut in span id           | '00-123456789abcdef0ffffffffffffffff-123456789äbcdef0-00'   | false   |                          | 0            | UNSET       ",
+      "version 01 flags 02                   | '01-00000000000000000000000000000001-0000000000000001-02'   | true    | TRACE_ID_ONE             | SPAN_ID_ONE  | SAMPLER_DROP",
+      "too long version                      | '000-0000000000000000000000000000001-0000000000000001-01'   | false   |                          | 0            | UNSET       ",
+      "space inside trace id                 | '00-0000000000000000000000000000001 -0000000000000001-01'   | false   |                          | 0            | UNSET       ",
+      "trace id too short                    | '00-0000000000000000000000000000001-0000000000000001-01'    | false   |                          | 0            | UNSET       ",
+      "span id too short                     | '00-00000000000000000000000000000001-000000000000001-01'    | false   |                          | 0            | UNSET       ",
+      "flags too short                       | '00-00000000000000000000000000000001-0000000000000001-0'    | false   |                          | 0            | UNSET       ",
+      "version ff invalid                    | 'ff-00000000000000000000000000000001-0000000000000001-00'   | false   |                          | 0            | UNSET       ",
+      "version fe flags 02                   | 'fe-00000000000000000000000000000001-0000000000000001-02'   | true    | TRACE_ID_ONE             | SPAN_ID_ONE  | SAMPLER_DROP",
+      "extra data with version 00            | '00-00000000000000000000000000000001-0000000000000001-03-0' | false   |                          | 0            | UNSET       ",
+      "invalid separator after flags with fe | 'fe-00000000000000000000000000000001-0000000000000001-02.0' | false   |                          | 0            | UNSET       "
+    })
+    void extractTraceparent(
+            String traceparent,
+            boolean tpValid,
+            @ConvertWith(TraceIdTestConverter.class) DDTraceId traceId,
+            @ConvertWith(SpanIdTestConverter.class) long spanId,
+            @ConvertWith(PrioritySamplingConverter.class) byte priority) {
+        Map<String, String> headers = headers(TRACE_PARENT_KEY, traceparent);
 
-    TagContext result = this.extractor.extract(headers, stringValuesMap());
+        TagContext result = this.extractor.extract(headers, stringValuesMap());
 
-    if (tpValid) {
-      assertInstanceOf(ExtractedContext.class, result);
-      ExtractedContext context = (ExtractedContext) result;
-      assertEquals(traceId, context.getTraceId());
-      assertEquals(spanId, context.getSpanId());
-      assertEquals(priority, context.getSamplingPriority());
-    } else {
-      assertNull(result);
+        if (tpValid) {
+            assertInstanceOf(ExtractedContext.class, result);
+            ExtractedContext context = (ExtractedContext) result;
+            assertEquals(traceId, context.getTraceId());
+            assertEquals(spanId, context.getSpanId());
+            assertEquals(priority, context.getSamplingPriority());
+        } else {
+            assertNull(result);
+        }
     }
-  }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"TRACE_ID_LOW_MAX", "TRACE_ID_NO_HIGH_LOW_MAX"})
-  void checkMaxFromW3CTraceIds(@ConvertWith(TraceIdTestConverter.class) DDTraceId traceId) {
-    assertEquals(DD64bTraceId.MAX.toLong(), traceId.toLong());
-  }
+    @ParameterizedTest
+    @ValueSource(strings = {"TRACE_ID_LOW_MAX", "TRACE_ID_NO_HIGH_LOW_MAX"})
+    void checkMaxFromW3CTraceIds(@ConvertWith(TraceIdTestConverter.class) DDTraceId traceId) {
+        assertEquals(DD64bTraceId.MAX.toLong(), traceId.toLong());
+    }
 
-  @TableTest({
-    "scenario                                      | traceparent                                               | tracestate                  | priority     | decisionMaker             | origin",
-    "keep empty state                              | '00-00000000000000000000000000000001-123456789abcdef0-01' | ''                          | SAMPLER_KEEP | SamplingMechanism.DEFAULT |       ",
-    "drop empty state                              | '00-00000000000000000000000000000001-123456789abcdef0-00' | ''                          | SAMPLER_DROP |                           |       ",
-    "keep with user keep state                     | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:2;o:some'             | USER_KEEP    |                           | some  ",
-    "keep with trailing element separator          | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:2;o:some;'            | USER_KEEP    |                           | some  ",
-    "keep with trailing separator and OWS          | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:2;o:some; \t'         | USER_KEEP    |                           | some  ",
-    "keep with trailing separator OWS before comma | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:2;o:some;  ,x=y'      | USER_KEEP    |                           | some  ",
-    "skip empty element in middle                  | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:2;;o:some'            | USER_KEEP    |                           | some  ",
-    "skip leading separator                        | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=;s:2;o:some'            | USER_KEEP    |                           | some  ",
-    "skip bare element in middle                   | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:2;flag;o:some'        | USER_KEEP    |                           | some  ",
-    "skip multiple bare elements in middle         | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:2;flag1;flag2;o:some' | USER_KEEP    |                           | some  ",
-    "keep with user keep state and manual dm       | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:2;o:some;t.dm:-4'     | USER_KEEP    | SamplingMechanism.MANUAL  | some  ",
-    "drop with user keep state and manual dm       | '00-00000000000000000000000000000001-123456789abcdef0-00' | 'dd=s:2;o:some;t.dm:-4'     | SAMPLER_DROP |                           | some  ",
-    "drop with user drop state                     | '00-00000000000000000000000000000001-123456789abcdef0-00' | 'dd=s:-1;o:some'            | USER_DROP    |                           | some  ",
-    "drop with user drop state and manual dm       | '00-00000000000000000000000000000001-123456789abcdef0-00' | 'dd=s:-1;o:some;t.dm:-4'    | USER_DROP    | SamplingMechanism.MANUAL  | some  ",
-    "keep overrides user drop state with manual dm | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:-1;o:some;t.dm:-4'    | SAMPLER_KEEP | SamplingMechanism.DEFAULT | some  "
-  })
-  void extractTraceparentTracestateAndHttpHeaders(
-      String traceparent,
-      String tracestate,
-      @ConvertWith(PrioritySamplingConverter.class) byte priority,
-      @ConvertWith(SamplingMechanismConverter.class) Byte decisionMaker,
-      String origin) {
-    // spotless:off
+    @TableTest({
+      "scenario                                      | traceparent                                               | tracestate                  | priority     | decisionMaker             | origin",
+      "keep empty state                              | '00-00000000000000000000000000000001-123456789abcdef0-01' | ''                          | SAMPLER_KEEP | SamplingMechanism.DEFAULT |       ",
+      "drop empty state                              | '00-00000000000000000000000000000001-123456789abcdef0-00' | ''                          | SAMPLER_DROP |                           |       ",
+      "keep with user keep state                     | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:2;o:some'             | USER_KEEP    |                           | some  ",
+      "keep with trailing element separator          | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:2;o:some;'            | USER_KEEP    |                           | some  ",
+      "keep with trailing separator and OWS          | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:2;o:some; \t'         | USER_KEEP    |                           | some  ",
+      "keep with trailing separator OWS before comma | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:2;o:some;  ,x=y'      | USER_KEEP    |                           | some  ",
+      "skip empty element in middle                  | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:2;;o:some'            | USER_KEEP    |                           | some  ",
+      "skip leading separator                        | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=;s:2;o:some'            | USER_KEEP    |                           | some  ",
+      "skip bare element in middle                   | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:2;flag;o:some'        | USER_KEEP    |                           | some  ",
+      "skip multiple bare elements in middle         | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:2;flag1;flag2;o:some' | USER_KEEP    |                           | some  ",
+      "keep with user keep state and manual dm       | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:2;o:some;t.dm:-4'     | USER_KEEP    | SamplingMechanism.MANUAL  | some  ",
+      "drop with user keep state and manual dm       | '00-00000000000000000000000000000001-123456789abcdef0-00' | 'dd=s:2;o:some;t.dm:-4'     | SAMPLER_DROP |                           | some  ",
+      "drop with user drop state                     | '00-00000000000000000000000000000001-123456789abcdef0-00' | 'dd=s:-1;o:some'            | USER_DROP    |                           | some  ",
+      "drop with user drop state and manual dm       | '00-00000000000000000000000000000001-123456789abcdef0-00' | 'dd=s:-1;o:some;t.dm:-4'    | USER_DROP    | SamplingMechanism.MANUAL  | some  ",
+      "keep overrides user drop state with manual dm | '00-00000000000000000000000000000001-123456789abcdef0-01' | 'dd=s:-1;o:some;t.dm:-4'    | SAMPLER_KEEP | SamplingMechanism.DEFAULT | some  "
+    })
+    void extractTraceparentTracestateAndHttpHeaders(
+            String traceparent,
+            String tracestate,
+            @ConvertWith(PrioritySamplingConverter.class) byte priority,
+            @ConvertWith(SamplingMechanismConverter.class) Byte decisionMaker,
+            String origin) {
+        // spotless:off
     Map<String, String> headers = headers(
         "", "empty key",
         TRACE_PARENT_KEY, traceparent,
@@ -161,44 +157,43 @@ void extractTraceparentTracestateAndHttpHeaders(
     );
     // spotless:on
 
-    ExtractedContext context =
-        (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
+        ExtractedContext context = (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
 
-    assertEquals(TRACE_ID_ONE, context.getTraceId());
-    assertEquals(TEST_SPAN_ID, context.getSpanId());
-    Map<String, String> expectedBaggage = new HashMap<>();
-    expectedBaggage.put("k1", "v1");
-    expectedBaggage.put("k2", "v2");
-    expectedBaggage.put("some-baggage", "my-interesting-baggage-info");
-    expectedBaggage.put("some-CaseSensitive-baggage", "my-interesting-baggage-info-2");
-    assertEquals(expectedBaggage, context.getBaggage());
-    assertEquals(singletonMap("some-tag", "my-interesting-info"), context.getTags());
-    assertEquals(priority, context.getSamplingPriority());
-    Map<String, String> expectedPTags =
-        decisionMaker != null ? singletonMap("_dd.p.dm", "-" + decisionMaker) : emptyMap();
-    assertEquals(expectedPTags, context.getPropagationTags().createTagMap());
-    if (origin != null) {
-      assertEquals(origin, context.getOrigin().toString());
+        assertEquals(TRACE_ID_ONE, context.getTraceId());
+        assertEquals(TEST_SPAN_ID, context.getSpanId());
+        Map<String, String> expectedBaggage = new HashMap<>();
+        expectedBaggage.put("k1", "v1");
+        expectedBaggage.put("k2", "v2");
+        expectedBaggage.put("some-baggage", "my-interesting-baggage-info");
+        expectedBaggage.put("some-CaseSensitive-baggage", "my-interesting-baggage-info-2");
+        assertEquals(expectedBaggage, context.getBaggage());
+        assertEquals(singletonMap("some-tag", "my-interesting-info"), context.getTags());
+        assertEquals(priority, context.getSamplingPriority());
+        Map<String, String> expectedPTags =
+                decisionMaker != null ? singletonMap("_dd.p.dm", "-" + decisionMaker) : emptyMap();
+        assertEquals(expectedPTags, context.getPropagationTags().createTagMap());
+        if (origin != null) {
+            assertEquals(origin, context.getOrigin().toString());
+        }
     }
-  }
 
-  @Test
-  void extractHeaderTagsWithNoPropagation() {
-    Map<String, String> headers = headers(SOME_HEADER, "my-interesting-info");
+    @Test
+    void extractHeaderTagsWithNoPropagation() {
+        Map<String, String> headers = headers(SOME_HEADER, "my-interesting-info");
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
 
-    assertFalse(context instanceof ExtractedContext);
-    assertEquals(singletonMap("some-tag", "my-interesting-info"), context.getTags());
-  }
+        assertFalse(context instanceof ExtractedContext);
+        assertEquals(singletonMap("some-tag", "my-interesting-info"), context.getTags());
+    }
 
-  @TableTest({
-    "scenario            | endToEndStartTime",
-    "zero start time     | 0                ",
-    "non-zero start time | 1610001234       "
-  })
-  void extractHttpHeadersWithEndToEnd(long endToEndStartTime) {
-    // spotless:off
+    @TableTest({
+      "scenario            | endToEndStartTime",
+      "zero start time     | 0                ",
+      "non-zero start time | 1610001234       "
+    })
+    void extractHttpHeadersWithEndToEnd(long endToEndStartTime) {
+        // spotless:off
     Map<String, String> headers = headers(
         "", "empty key",
         TRACE_PARENT_KEY, "00-00000000000000000000000000000001-123456789abcdef0-01",
@@ -211,28 +206,28 @@ void extractHttpHeadersWithEndToEnd(long endToEndStartTime) {
     );
     // spotless:on
 
-    ExtractedContext context = (ExtractedContext) extractor.extract(headers, stringValuesMap());
+        ExtractedContext context = (ExtractedContext) extractor.extract(headers, stringValuesMap());
 
-    assertEquals(TRACE_ID_ONE, context.getTraceId());
-    assertEquals(TEST_SPAN_ID, context.getSpanId());
-    Map<String, String> expectedBaggage = new LinkedHashMap<>();
-    expectedBaggage.put("k1", "v1");
-    expectedBaggage.put("k2", "v2");
-    expectedBaggage.put("some-baggage", "my-interesting-baggage-info");
-    expectedBaggage.put("some-CaseSensitive-baggage", "my-interesting-baggage-info-2");
-    assertEquals(expectedBaggage, context.getBaggage());
-    assertEquals(singletonMap("some-tag", "my-interesting-info"), context.getTags());
-    assertEquals(endToEndStartTime * 1_000_000L, context.getEndToEndStartTime());
-  }
+        assertEquals(TRACE_ID_ONE, context.getTraceId());
+        assertEquals(TEST_SPAN_ID, context.getSpanId());
+        Map<String, String> expectedBaggage = new LinkedHashMap<>();
+        expectedBaggage.put("k1", "v1");
+        expectedBaggage.put("k2", "v2");
+        expectedBaggage.put("some-baggage", "my-interesting-baggage-info");
+        expectedBaggage.put("some-CaseSensitive-baggage", "my-interesting-baggage-info-2");
+        assertEquals(expectedBaggage, context.getBaggage());
+        assertEquals(singletonMap("some-tag", "my-interesting-info"), context.getTags());
+        assertEquals(endToEndStartTime * 1_000_000L, context.getEndToEndStartTime());
+    }
 
-  @TableTest({
-    "scenario                   | tpValid | traceparent                                              ",
-    "invalid all-zeros trace id | false   | '00-00000000000000000000000000000000-123456789abcdef0-01'",
-    "invalid all-zeros span id  | false   | '00-00000000000000000000000000000001-0000000000000000-01'",
-    "valid traceparent          | true    | '00-00000000000000000000000000000001-0000000000000001-01'"
-  })
-  void baggageIsMappedOnContextCreation(boolean tpValid, String traceparent) {
-    // spotless:off
+    @TableTest({
+      "scenario                   | tpValid | traceparent                                              ",
+      "invalid all-zeros trace id | false   | '00-00000000000000000000000000000000-123456789abcdef0-01'",
+      "invalid all-zeros span id  | false   | '00-00000000000000000000000000000001-0000000000000000-01'",
+      "valid traceparent          | true    | '00-00000000000000000000000000000001-0000000000000001-01'"
+    })
+    void baggageIsMappedOnContextCreation(boolean tpValid, String traceparent) {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_PARENT_KEY, traceparent,
         SOME_CUSTOM_BAGGAGE_HEADER, "mappedBaggageValue",
@@ -242,85 +237,82 @@ void baggageIsMappedOnContextCreation(boolean tpValid, String traceparent) {
     );
     // spotless:on
 
-    TagContext context = extractor.extract(headers, stringValuesMap());
+        TagContext context = extractor.extract(headers, stringValuesMap());
 
-    assertNotNull(context);
-    if (tpValid) {
-      assertEquals(TRACE_ID_ONE, context.getTraceId());
-      assertEquals(1L, context.getSpanId());
+        assertNotNull(context);
+        if (tpValid) {
+            assertEquals(TRACE_ID_ONE, context.getTraceId());
+            assertEquals(1L, context.getSpanId());
+        }
+        Map<String, String> expectedBaggage = new LinkedHashMap<>();
+        expectedBaggage.put("some-baggage", "mappedBaggageValue");
+        expectedBaggage.put("k1", "v1");
+        expectedBaggage.put("k2", "v2");
+        assertEquals(expectedBaggage, context.getBaggage());
     }
-    Map<String, String> expectedBaggage = new LinkedHashMap<>();
-    expectedBaggage.put("some-baggage", "mappedBaggageValue");
-    expectedBaggage.put("k1", "v1");
-    expectedBaggage.put("k2", "v2");
-    assertEquals(expectedBaggage, context.getBaggage());
-  }
 
-  @TableTest({
-    "scenario         | traceparent                                               | tracestate                  | consistent",
-    "empty state      | '00-123456789abcdef00fedcba987654321-123456789abcdef0-01' | ''                          | true      ",
-    "consistent tid   | '00-123456789abcdef00fedcba987654321-123456789abcdef0-01' | 'dd=t.tid:123456789abcdef0' | true      ",
-    "inconsistent tid | '00-123456789abcdef00fedcba987654321-123456789abcdef0-01' | 'dd=t.tid:123456789abcdef1' | false     "
-  })
-  void markInconsistentTidAsPropagationError(
-      String traceparent, String tracestate, boolean consistent) {
-    // spotless:off
+    @TableTest({
+      "scenario         | traceparent                                               | tracestate                  | consistent",
+      "empty state      | '00-123456789abcdef00fedcba987654321-123456789abcdef0-01' | ''                          | true      ",
+      "consistent tid   | '00-123456789abcdef00fedcba987654321-123456789abcdef0-01' | 'dd=t.tid:123456789abcdef0' | true      ",
+      "inconsistent tid | '00-123456789abcdef00fedcba987654321-123456789abcdef0-01' | 'dd=t.tid:123456789abcdef1' | false     "
+    })
+    void markInconsistentTidAsPropagationError(String traceparent, String tracestate, boolean consistent) {
+        // spotless:off
     Map<String, String> headers = headers(
         TRACE_PARENT_KEY, traceparent,
         TRACE_STATE_KEY, tracestate);
     // spotless:on
 
-    ExtractedContext context = (ExtractedContext) extractor.extract(headers, stringValuesMap());
+        ExtractedContext context = (ExtractedContext) extractor.extract(headers, stringValuesMap());
 
-    String tid = tracestate.isEmpty() ? "" : tracestate.substring(9);
-    Map<String, String> defaultTags = new LinkedHashMap<>();
-    defaultTags.put("_dd.p.dm", "-0");
-    defaultTags.put("_dd.p.tid", "123456789abcdef0");
-    Map<String, String> expectedTags = new LinkedHashMap<>(defaultTags);
-    if (!consistent) {
-      expectedTags.put("_dd.propagation_error", "inconsistent_tid " + tid);
+        String tid = tracestate.isEmpty() ? "" : tracestate.substring(9);
+        Map<String, String> defaultTags = new LinkedHashMap<>();
+        defaultTags.put("_dd.p.dm", "-0");
+        defaultTags.put("_dd.p.tid", "123456789abcdef0");
+        Map<String, String> expectedTags = new LinkedHashMap<>(defaultTags);
+        if (!consistent) {
+            expectedTags.put("_dd.propagation_error", "inconsistent_tid " + tid);
+        }
+        assertEquals(expectedTags, context.getPropagationTags().createTagMap());
     }
-    assertEquals(expectedTags, context.getPropagationTags().createTagMap());
-  }
 
-  static final class TraceIdTestConverter implements ArgumentConverter {
-    @Override
-    public Object convert(Object source, ParameterContext context)
-        throws ArgumentConversionException {
-      if (source == null) {
-        return null;
-      }
-      switch (source.toString()) {
-        case "TRACE_ID_ONE":
-          return TRACE_ID_ONE;
-        case "TRACE_ID_NO_HIGH_LOW_MAX":
-          return TRACE_ID_NO_HIGH_LOW_MAX;
-        case "TRACE_ID_LOW_MAX":
-          return TRACE_ID_LOW_MAX;
-        default:
-          return source;
-      }
+    static final class TraceIdTestConverter implements ArgumentConverter {
+        @Override
+        public Object convert(Object source, ParameterContext context) throws ArgumentConversionException {
+            if (source == null) {
+                return null;
+            }
+            switch (source.toString()) {
+                case "TRACE_ID_ONE":
+                    return TRACE_ID_ONE;
+                case "TRACE_ID_NO_HIGH_LOW_MAX":
+                    return TRACE_ID_NO_HIGH_LOW_MAX;
+                case "TRACE_ID_LOW_MAX":
+                    return TRACE_ID_LOW_MAX;
+                default:
+                    return source;
+            }
+        }
     }
-  }
 
-  static final class SpanIdTestConverter implements ArgumentConverter {
-    @Override
-    public Object convert(Object source, ParameterContext context)
-        throws ArgumentConversionException {
-      if (source == null) {
-        return null;
-      }
-      String s = source.toString();
-      switch (s) {
-        case "SPAN_ID_MAX":
-          return DDSpanId.MAX;
-        case "SPAN_ID_TEST":
-          return TEST_SPAN_ID;
-        case "SPAN_ID_ONE":
-          return 1;
-        default:
-          return Long.parseLong(s);
-      }
+    static final class SpanIdTestConverter implements ArgumentConverter {
+        @Override
+        public Object convert(Object source, ParameterContext context) throws ArgumentConversionException {
+            if (source == null) {
+                return null;
+            }
+            String s = source.toString();
+            switch (s) {
+                case "SPAN_ID_MAX":
+                    return DDSpanId.MAX;
+                case "SPAN_ID_TEST":
+                    return TEST_SPAN_ID;
+                case "SPAN_ID_ONE":
+                    return 1;
+                default:
+                    return Long.parseLong(s);
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpInjectorTest.java
index c5439e2eeb4..8afaf433855 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpInjectorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpInjectorTest.java
@@ -34,215 +34,200 @@
 
 class W3CHttpInjectorTest extends AbstractHttpInjectorTest {
 
-  @Override
-  protected HttpCodec.Injector newInjector() {
-    return W3CHttpCodec.newInjector(singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER"));
-  }
-
-  @TableTest({
-    "scenario                | traceId | spanId | samplingPriority | origin | tracestate                                    ",
-    "unset 1->2              | 1       | 2      | UNSET            |        | 'dd=p:0000000000000002;t.usr:123'             ",
-    "keep 1->4 saipan        | 1       | 4      | SAMPLER_KEEP     | saipan | 'dd=s:1;o:saipan;p:0000000000000004;t.usr:123'",
-    "unset max->max-1 saipan | MAX     | MAX-1  | UNSET            | saipan | 'dd=o:saipan;p:fffffffffffffffe;t.usr:123'    ",
-    "keep max-1->max         | MAX-1   | MAX    | SAMPLER_KEEP     |        | 'dd=s:1;p:ffffffffffffffff;t.usr:123'         ",
-    "drop max-1->max         | MAX-1   | MAX    | SAMPLER_DROP     |        | 'dd=s:0;p:ffffffffffffffff;t.usr:123'         "
-  })
-  void injectHttpHeaders(
-      @ConvertWith(TraceIdConverter.class) String traceId,
-      @ConvertWith(TraceIdConverter.class) String spanId,
-      @ConvertWith(PrioritySamplingConverter.class) byte samplingPriority,
-      String origin,
-      String tracestate) {
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("k1", "v1");
-    baggage.put("k2", "v2");
-    baggage.put("some-baggage-key", "some-value");
-    DDSpanContext spanContext =
-        mockSpanContext(
-            DDTraceId.from(traceId),
-            DDSpanId.from(spanId),
-            samplingPriority,
-            origin,
-            baggage,
-            PropagationTags.factory().fromHeaderValue(DATADOG, "_dd.p.usr=123"));
-    Map<String, String> carrier = new HashMap<>();
-
-    this.injector.inject(spanContext, carrier, Map::put);
-
-    Map<String, String> expected = new HashMap<>();
-    expected.put(TRACE_PARENT_KEY, buildTraceParent(traceId, spanId, samplingPriority));
-    expected.put(TRACE_STATE_KEY, tracestate);
-    expected.put(OT_BAGGAGE_PREFIX + "k1", "v1");
-    expected.put(OT_BAGGAGE_PREFIX + "k2", "v2");
-    expected.put("SOME_CUSTOM_HEADER", "some-value");
-    assertEquals(expected, carrier);
-  }
-
-  @Test
-  void injectHttpHeadersWithEndToEnd() {
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("k1", "v1");
-    baggage.put("k2", "v2");
-    DDSpanContext mockedContext =
-        mockSpanContext(
-            DDTraceId.from("1"),
-            DDSpanId.from("2"),
-            UNSET,
-            "fakeOrigin",
-            baggage,
-            PropagationTags.factory().fromHeaderValue(DATADOG, "_dd.p.dm=-4,_dd.p.anytag=value"));
-    mockedContext.beginEndToEnd();
-    Map<String, String> carrier = new HashMap<>();
-
-    this.injector.inject(mockedContext, carrier, Map::put);
-
-    Map<String, String> expected = new HashMap<>();
-    expected.put(TRACE_PARENT_KEY, buildTraceParent("1", "2", UNSET));
-    expected.put(TRACE_STATE_KEY, "dd=o:fakeOrigin;p:0000000000000002;t.dm:-4;t.anytag:value");
-    expected.put(
-        OT_BAGGAGE_PREFIX + "t0", String.valueOf(mockedContext.getEndToEndStartTime() / 1000000L));
-    expected.put(OT_BAGGAGE_PREFIX + "k1", "v1");
-    expected.put(OT_BAGGAGE_PREFIX + "k2", "v2");
-    assertEquals(expected, carrier);
-  }
-
-  @Test
-  void injectTheDecisionMakerTag() {
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("k1", "v1");
-    baggage.put("k2", "v2");
-    DDSpanContext mockedContext =
-        mockSpanContext(
-            DDTraceId.from("1"),
-            DDSpanId.from("2"),
-            UNSET,
-            "fakeOrigin",
-            baggage,
-            PropagationTags.factory().empty());
-    mockedContext.setSamplingPriority(USER_KEEP, MANUAL);
-    Map<String, String> carrier = new HashMap<>();
-
-    this.injector.inject(mockedContext, carrier, Map::put);
-
-    Map<String, String> expected = new HashMap<>();
-    expected.put(TRACE_PARENT_KEY, buildTraceParent("1", "2", USER_KEEP));
-    expected.put(TRACE_STATE_KEY, "dd=s:2;o:fakeOrigin;p:0000000000000002;t.dm:-4");
-    expected.put(OT_BAGGAGE_PREFIX + "k1", "v1");
-    expected.put(OT_BAGGAGE_PREFIX + "k2", "v2");
-    assertEquals(expected, carrier);
-  }
-
-  @Test
-  void injectUsesSingleSamplingStateAcrossHeaders() throws InterruptedException {
-    PropagationTags tags = PropagationTags.factory().fromHeaderValue(W3C, "ot=rv:ef284ace7a91e1");
-    assertTrue(
-        tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 1.0, false, 1L, true));
-    DDSpanContext context =
-        mockSpanContext(
-            DDTraceId.from("1"), DDSpanId.from("2"), SAMPLER_KEEP, null, new HashMap<>(), tags);
-    Map<String, String> carrier = new HashMap<>();
-    CountDownLatch traceparentWritten = new CountDownLatch(1);
-    CountDownLatch samplingUpdated = new CountDownLatch(1);
-    AtomicReference<Throwable> failure = new AtomicReference<>();
-    Thread updater =
-        new Thread(
-            () -> {
-              try {
+    @Override
+    protected HttpCodec.Injector newInjector() {
+        return W3CHttpCodec.newInjector(singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER"));
+    }
+
+    @TableTest({
+      "scenario                | traceId | spanId | samplingPriority | origin | tracestate                                    ",
+      "unset 1->2              | 1       | 2      | UNSET            |        | 'dd=p:0000000000000002;t.usr:123'             ",
+      "keep 1->4 saipan        | 1       | 4      | SAMPLER_KEEP     | saipan | 'dd=s:1;o:saipan;p:0000000000000004;t.usr:123'",
+      "unset max->max-1 saipan | MAX     | MAX-1  | UNSET            | saipan | 'dd=o:saipan;p:fffffffffffffffe;t.usr:123'    ",
+      "keep max-1->max         | MAX-1   | MAX    | SAMPLER_KEEP     |        | 'dd=s:1;p:ffffffffffffffff;t.usr:123'         ",
+      "drop max-1->max         | MAX-1   | MAX    | SAMPLER_DROP     |        | 'dd=s:0;p:ffffffffffffffff;t.usr:123'         "
+    })
+    void injectHttpHeaders(
+            @ConvertWith(TraceIdConverter.class) String traceId,
+            @ConvertWith(TraceIdConverter.class) String spanId,
+            @ConvertWith(PrioritySamplingConverter.class) byte samplingPriority,
+            String origin,
+            String tracestate) {
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("k1", "v1");
+        baggage.put("k2", "v2");
+        baggage.put("some-baggage-key", "some-value");
+        DDSpanContext spanContext = mockSpanContext(
+                DDTraceId.from(traceId),
+                DDSpanId.from(spanId),
+                samplingPriority,
+                origin,
+                baggage,
+                PropagationTags.factory().fromHeaderValue(DATADOG, "_dd.p.usr=123"));
+        Map<String, String> carrier = new HashMap<>();
+
+        this.injector.inject(spanContext, carrier, Map::put);
+
+        Map<String, String> expected = new HashMap<>();
+        expected.put(TRACE_PARENT_KEY, buildTraceParent(traceId, spanId, samplingPriority));
+        expected.put(TRACE_STATE_KEY, tracestate);
+        expected.put(OT_BAGGAGE_PREFIX + "k1", "v1");
+        expected.put(OT_BAGGAGE_PREFIX + "k2", "v2");
+        expected.put("SOME_CUSTOM_HEADER", "some-value");
+        assertEquals(expected, carrier);
+    }
+
+    @Test
+    void injectHttpHeadersWithEndToEnd() {
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("k1", "v1");
+        baggage.put("k2", "v2");
+        DDSpanContext mockedContext = mockSpanContext(
+                DDTraceId.from("1"),
+                DDSpanId.from("2"),
+                UNSET,
+                "fakeOrigin",
+                baggage,
+                PropagationTags.factory().fromHeaderValue(DATADOG, "_dd.p.dm=-4,_dd.p.anytag=value"));
+        mockedContext.beginEndToEnd();
+        Map<String, String> carrier = new HashMap<>();
+
+        this.injector.inject(mockedContext, carrier, Map::put);
+
+        Map<String, String> expected = new HashMap<>();
+        expected.put(TRACE_PARENT_KEY, buildTraceParent("1", "2", UNSET));
+        expected.put(TRACE_STATE_KEY, "dd=o:fakeOrigin;p:0000000000000002;t.dm:-4;t.anytag:value");
+        expected.put(OT_BAGGAGE_PREFIX + "t0", String.valueOf(mockedContext.getEndToEndStartTime() / 1000000L));
+        expected.put(OT_BAGGAGE_PREFIX + "k1", "v1");
+        expected.put(OT_BAGGAGE_PREFIX + "k2", "v2");
+        assertEquals(expected, carrier);
+    }
+
+    @Test
+    void injectTheDecisionMakerTag() {
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("k1", "v1");
+        baggage.put("k2", "v2");
+        DDSpanContext mockedContext = mockSpanContext(
+                DDTraceId.from("1"),
+                DDSpanId.from("2"),
+                UNSET,
+                "fakeOrigin",
+                baggage,
+                PropagationTags.factory().empty());
+        mockedContext.setSamplingPriority(USER_KEEP, MANUAL);
+        Map<String, String> carrier = new HashMap<>();
+
+        this.injector.inject(mockedContext, carrier, Map::put);
+
+        Map<String, String> expected = new HashMap<>();
+        expected.put(TRACE_PARENT_KEY, buildTraceParent("1", "2", USER_KEEP));
+        expected.put(TRACE_STATE_KEY, "dd=s:2;o:fakeOrigin;p:0000000000000002;t.dm:-4");
+        expected.put(OT_BAGGAGE_PREFIX + "k1", "v1");
+        expected.put(OT_BAGGAGE_PREFIX + "k2", "v2");
+        assertEquals(expected, carrier);
+    }
+
+    @Test
+    void injectUsesSingleSamplingStateAcrossHeaders() throws InterruptedException {
+        PropagationTags tags = PropagationTags.factory().fromHeaderValue(W3C, "ot=rv:ef284ace7a91e1");
+        assertTrue(tags.tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 1.0, false, 1L, true));
+        DDSpanContext context =
+                mockSpanContext(DDTraceId.from("1"), DDSpanId.from("2"), SAMPLER_KEEP, null, new HashMap<>(), tags);
+        Map<String, String> carrier = new HashMap<>();
+        CountDownLatch traceparentWritten = new CountDownLatch(1);
+        CountDownLatch samplingUpdated = new CountDownLatch(1);
+        AtomicReference<Throwable> failure = new AtomicReference<>();
+        Thread updater = new Thread(() -> {
+            try {
                 assertTrue(traceparentWritten.await(5, TimeUnit.SECONDS));
-                assertTrue(
-                    tags.tryUpdateProbabilitySamplingDecision(
-                        SAMPLER_DROP, AGENT_RATE, 0.0, false, 1L, true));
-              } catch (Throwable throwable) {
+                assertTrue(tags.tryUpdateProbabilitySamplingDecision(SAMPLER_DROP, AGENT_RATE, 0.0, false, 1L, true));
+            } catch (Throwable throwable) {
                 failure.set(throwable);
-              } finally {
+            } finally {
                 samplingUpdated.countDown();
-              }
-            });
-    updater.start();
-
-    injector.inject(
-        context,
-        carrier,
-        (headers, key, value) -> {
-          headers.put(key, value);
-          if (TRACE_PARENT_KEY.equals(key)) {
-            traceparentWritten.countDown();
-            try {
-              assertTrue(samplingUpdated.await(5, TimeUnit.SECONDS));
-            } catch (InterruptedException interrupted) {
-              Thread.currentThread().interrupt();
-              throw new AssertionError(interrupted);
             }
-          }
         });
-    updater.join(TimeUnit.SECONDS.toMillis(5));
+        updater.start();
+
+        injector.inject(context, carrier, (headers, key, value) -> {
+            headers.put(key, value);
+            if (TRACE_PARENT_KEY.equals(key)) {
+                traceparentWritten.countDown();
+                try {
+                    assertTrue(samplingUpdated.await(5, TimeUnit.SECONDS));
+                } catch (InterruptedException interrupted) {
+                    Thread.currentThread().interrupt();
+                    throw new AssertionError(interrupted);
+                }
+            }
+        });
+        updater.join(TimeUnit.SECONDS.toMillis(5));
 
-    assertFalse(updater.isAlive());
-    if (failure.get() != null) {
-      throw new AssertionError(failure.get());
+        assertFalse(updater.isAlive());
+        if (failure.get() != null) {
+            throw new AssertionError(failure.get());
+        }
+        assertTrue(carrier.get(TRACE_PARENT_KEY).endsWith("-01"));
+        assertEquals("dd=s:1;p:0000000000000002;t.dm:-1;t.ksr:1,ot=rv:ef284ace7a91e1", carrier.get(TRACE_STATE_KEY));
+        assertEquals("dd=s:0;t.ksr:0,ot=rv:ef284ace7a91e1", tags.headerValue(W3C));
     }
-    assertTrue(carrier.get(TRACE_PARENT_KEY).endsWith("-01"));
-    assertEquals(
-        "dd=s:1;p:0000000000000002;t.dm:-1;t.ksr:1,ot=rv:ef284ace7a91e1",
-        carrier.get(TRACE_STATE_KEY));
-    assertEquals("dd=s:0;t.ksr:0,ot=rv:ef284ace7a91e1", tags.headerValue(W3C));
-  }
-
-  @Test
-  void updateLastParentIdOnChildSpan() {
-    Map<String, String> carrier = new HashMap<>();
-
-    // injecting root span context
-    AgentSpan rootSpan = this.tracer.startSpan("test", "root");
-    long rootSpanId = rootSpan.getSpanId();
-    ContextScope rootScope = this.tracer.activateSpan(rootSpan);
-
-    this.injector.inject((DDSpanContext) rootSpan.spanContext(), carrier, Map::put);
-
-    // trace state has root span id as last parent
-    assertEquals(rootSpanId, extractLastParentId(carrier));
-
-    // injecting child span context
-    AgentSpan childSpan = this.tracer.startSpan("test", "child");
-    long childSpanId = childSpan.getSpanId();
-    carrier.clear();
-    this.injector.inject((DDSpanContext) childSpan.spanContext(), carrier, Map::put);
-
-    // trace state has child span id as last parent
-    assertEquals(childSpanId, extractLastParentId(carrier));
-
-    // injecting root span again
-    childSpan.finish();
-    carrier.clear();
-    this.injector.inject((DDSpanContext) rootSpan.spanContext(), carrier, Map::put);
-
-    // trace state has root span is as last parent again
-    assertEquals(rootSpanId, extractLastParentId(carrier));
-
-    rootScope.close();
-    rootSpan.finish();
-  }
-
-  static String buildTraceParent(String traceId, String spanId, int samplingPriority) {
-    return "00-"
-        + DDTraceId.from(traceId).toHexString()
-        + "-"
-        + DDSpanId.toHexStringPadded(DDSpanId.from(spanId))
-        + "-"
-        + (samplingPriority > 0 ? "01" : "00");
-  }
-
-  static long extractLastParentId(Map<String, String> carrier) {
-    String traceState = carrier.get(TRACE_STATE_KEY);
-    for (String member : traceState.split(",")) {
-      if (member.startsWith("dd=")) {
-        for (String part : member.substring(3).split(";")) {
-          if (part.startsWith("p:")) {
-            return DDSpanId.fromHex(part.substring(2));
-          }
+
+    @Test
+    void updateLastParentIdOnChildSpan() {
+        Map<String, String> carrier = new HashMap<>();
+
+        // injecting root span context
+        AgentSpan rootSpan = this.tracer.startSpan("test", "root");
+        long rootSpanId = rootSpan.getSpanId();
+        ContextScope rootScope = this.tracer.activateSpan(rootSpan);
+
+        this.injector.inject((DDSpanContext) rootSpan.spanContext(), carrier, Map::put);
+
+        // trace state has root span id as last parent
+        assertEquals(rootSpanId, extractLastParentId(carrier));
+
+        // injecting child span context
+        AgentSpan childSpan = this.tracer.startSpan("test", "child");
+        long childSpanId = childSpan.getSpanId();
+        carrier.clear();
+        this.injector.inject((DDSpanContext) childSpan.spanContext(), carrier, Map::put);
+
+        // trace state has child span id as last parent
+        assertEquals(childSpanId, extractLastParentId(carrier));
+
+        // injecting root span again
+        childSpan.finish();
+        carrier.clear();
+        this.injector.inject((DDSpanContext) rootSpan.spanContext(), carrier, Map::put);
+
+        // trace state has root span is as last parent again
+        assertEquals(rootSpanId, extractLastParentId(carrier));
+
+        rootScope.close();
+        rootSpan.finish();
+    }
+
+    static String buildTraceParent(String traceId, String spanId, int samplingPriority) {
+        return "00-"
+                + DDTraceId.from(traceId).toHexString()
+                + "-"
+                + DDSpanId.toHexStringPadded(DDSpanId.from(spanId))
+                + "-"
+                + (samplingPriority > 0 ? "01" : "00");
+    }
+
+    static long extractLastParentId(Map<String, String> carrier) {
+        String traceState = carrier.get(TRACE_STATE_KEY);
+        for (String member : traceState.split(",")) {
+            if (member.startsWith("dd=")) {
+                for (String part : member.substring(3).split(";")) {
+                    if (part.startsWith("p:")) {
+                        return DDSpanId.fromHex(part.substring(2));
+                    }
+                }
+            }
         }
-      }
+        throw new AssertionError("No 'p:' in dd tracestate: " + traceState);
     }
-    throw new AssertionError("No 'p:' in dd tracestate: " + traceState);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3COtelTraceStateContinuationTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3COtelTraceStateContinuationTest.java
index 3d28facc067..09b21f42f95 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3COtelTraceStateContinuationTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3COtelTraceStateContinuationTest.java
@@ -35,162 +35,155 @@
 
 /** Exercises {@code ot=} through real W3C extraction, continuation, and reinjection. */
 class W3COtelTraceStateContinuationTest extends DDCoreJavaSpecification {
-  private static final String TRACE_PARENT =
-      "00-00000000000000000000000000000001-123456789abcdef0-01";
-  private static final String RANDOM_VALUE = "ef284ace7a91e1";
-  private static final String THRESHOLD = "e6666666666668";
-  private static final String DD_MEMBER = "dd=s:2;p:123456789abcdef0";
-
-  private final HttpCodec.Injector injector = W3CHttpCodec.newInjector(emptyMap());
-
-  @Test
-  void roundTripsValidOtelState() {
-    String inbound = DD_MEMBER + ",ot=rv:" + RANDOM_VALUE + ";th:" + THRESHOLD;
-
-    assertTrue(continueTraceAndReinject(inbound).contains("ot=rv:" + RANDOM_VALUE + ";th:"));
-  }
-
-  @Test
-  void malformedRandomValueRemovesManagedPair() {
-    String inbound = DD_MEMBER + ",ot=rv:zz;th:" + THRESHOLD;
-    String outbound = continueTraceAndReinject(inbound);
-
-    assertFalse(outbound.contains("ot="));
-    assertFalse(outbound.contains("th:" + THRESHOLD));
-  }
-
-  @ParameterizedTest
-  @CsvSource({
-    "0, 01, ef284ace7a91e1, 00, false",
-    "2, 00, 00000000000000, 01, false",
-    "0, 00, 00000000000000, 00, true",
-    "2, 01, ef284ace7a91e1, 01, true"
-  })
-  void compoundExtractionKeepsFirstPriorityAndReconcilesOtelState(
-      int datadogPriority,
-      String inboundFlags,
-      String randomValue,
-      String outboundFlags,
-      boolean thresholdExpected) {
-    String traceParent = TRACE_PARENT.substring(0, TRACE_PARENT.length() - 2) + inboundFlags;
-    String inboundTracestate =
-        DD_MEMBER + ",ot=rv:" + randomValue + ";th:" + THRESHOLD + ",vendor=state";
-    Map<String, String> inboundHeaders =
-        headers(
-            DatadogHttpCodec.TRACE_ID_KEY,
-            "1",
-            DatadogHttpCodec.SPAN_ID_KEY,
-            "2",
-            DatadogHttpCodec.SAMPLING_PRIORITY_KEY,
-            String.valueOf(datadogPriority),
-            TRACE_PARENT_KEY,
-            traceParent,
-            TRACE_STATE_KEY,
-            inboundTracestate);
-    Config config = mock(Config.class);
-    when(config.getTracePropagationStylesToExtract())
-        .thenReturn(new LinkedHashSet<>(asList(DATADOG, TRACECONTEXT)));
-    when(config.getxDatadogTagsMaxLength()).thenReturn(DEFAULT_TRACE_X_DATADOG_TAGS_MAX_LENGTH);
-
-    CoreTracer tracer = tracerBuilder().build();
-    try {
-      HttpCodec.Extractor extractor = HttpCodec.createExtractor(config, tracer::captureTraceConfig);
-      ExtractedContext extracted =
-          assertInstanceOf(
-              ExtractedContext.class, extractor.extract(inboundHeaders, stringValuesMap()));
-      assertEquals(inboundTracestate, extracted.getPropagationTags().getW3CTracestate());
-
-      AgentSpan span = tracer.buildSpan("test", "continued").asChildOf(extracted).start();
-      Map<String, String> outboundHeaders = new HashMap<>();
-      injector.inject((DDSpanContext) span.spanContext(), outboundHeaders, Map::put);
-      span.finish();
-
-      assertTrue(outboundHeaders.get(TRACE_PARENT_KEY).endsWith("-" + outboundFlags));
-      String outboundTracestate = outboundHeaders.get(TRACE_STATE_KEY);
-      assertTrue(outboundTracestate.startsWith("dd=s:" + datadogPriority));
-      assertTrue(outboundTracestate.contains("ot=rv:" + randomValue));
-      assertTrue(outboundTracestate.endsWith("vendor=state"));
-      assertEquals(thresholdExpected, outboundTracestate.contains("th:" + THRESHOLD));
-    } finally {
-      tracer.close();
+    private static final String TRACE_PARENT = "00-00000000000000000000000000000001-123456789abcdef0-01";
+    private static final String RANDOM_VALUE = "ef284ace7a91e1";
+    private static final String THRESHOLD = "e6666666666668";
+    private static final String DD_MEMBER = "dd=s:2;p:123456789abcdef0";
+
+    private final HttpCodec.Injector injector = W3CHttpCodec.newInjector(emptyMap());
+
+    @Test
+    void roundTripsValidOtelState() {
+        String inbound = DD_MEMBER + ",ot=rv:" + RANDOM_VALUE + ";th:" + THRESHOLD;
+
+        assertTrue(continueTraceAndReinject(inbound).contains("ot=rv:" + RANDOM_VALUE + ";th:"));
+    }
+
+    @Test
+    void malformedRandomValueRemovesManagedPair() {
+        String inbound = DD_MEMBER + ",ot=rv:zz;th:" + THRESHOLD;
+        String outbound = continueTraceAndReinject(inbound);
+
+        assertFalse(outbound.contains("ot="));
+        assertFalse(outbound.contains("th:" + THRESHOLD));
     }
-  }
-
-  @Test
-  void compoundExtractionWithoutDatadogPriorityReconcilesFirstLocalDecision() {
-    String traceParent = TRACE_PARENT.substring(0, TRACE_PARENT.length() - 2) + "00";
-    String inboundTracestate = "ot=rv:00000000000000;th:8,vendor=state";
-    Map<String, String> inboundHeaders =
-        headers(
-            DatadogHttpCodec.TRACE_ID_KEY,
-            "1",
-            DatadogHttpCodec.SPAN_ID_KEY,
-            "2",
-            TRACE_PARENT_KEY,
-            traceParent,
-            TRACE_STATE_KEY,
-            inboundTracestate);
-    Config config = mock(Config.class);
-    when(config.getTracePropagationStylesToExtract())
-        .thenReturn(new LinkedHashSet<>(asList(DATADOG, TRACECONTEXT)));
-    when(config.getxDatadogTagsMaxLength()).thenReturn(DEFAULT_TRACE_X_DATADOG_TAGS_MAX_LENGTH);
-
-    CoreTracer tracer = tracerBuilder().build();
-    try {
-      ExtractedContext w3c =
-          assertInstanceOf(
-              ExtractedContext.class,
-              W3CHttpCodec.newExtractor(config, tracer::captureTraceConfig)
-                  .extract(inboundHeaders, stringValuesMap()));
-      assertEquals(SAMPLER_DROP, w3c.getSamplingPriority());
-      assertEquals(inboundTracestate, w3c.getPropagationTags().getW3CTracestate());
-
-      ExtractedContext extracted =
-          assertInstanceOf(
-              ExtractedContext.class,
-              HttpCodec.createExtractor(config, tracer::captureTraceConfig)
-                  .extract(inboundHeaders, stringValuesMap()));
-      assertEquals(UNSET, extracted.getSamplingPriority());
-      assertEquals(inboundTracestate, extracted.getPropagationTags().getW3CTracestate());
-
-      AgentSpan span = tracer.buildSpan("test", "continued").asChildOf(extracted).start();
-      new RateByServiceTraceSampler().setSamplingPriority((DDSpan) span);
-      assertEquals(SAMPLER_KEEP, span.getSamplingPriority());
-
-      Map<String, String> outboundHeaders = new HashMap<>();
-      injector.inject((DDSpanContext) span.spanContext(), outboundHeaders, Map::put);
-      span.finish();
-
-      assertTrue(outboundHeaders.get(TRACE_PARENT_KEY).endsWith("-01"));
-      assertTrue(
-          outboundHeaders.get(TRACE_STATE_KEY).contains("ot=rv:00000000000000,vendor=state"));
-      assertFalse(outboundHeaders.get(TRACE_STATE_KEY).contains(";th:"));
-    } finally {
-      tracer.close();
+
+    @ParameterizedTest
+    @CsvSource({
+        "0, 01, ef284ace7a91e1, 00, false",
+        "2, 00, 00000000000000, 01, false",
+        "0, 00, 00000000000000, 00, true",
+        "2, 01, ef284ace7a91e1, 01, true"
+    })
+    void compoundExtractionKeepsFirstPriorityAndReconcilesOtelState(
+            int datadogPriority,
+            String inboundFlags,
+            String randomValue,
+            String outboundFlags,
+            boolean thresholdExpected) {
+        String traceParent = TRACE_PARENT.substring(0, TRACE_PARENT.length() - 2) + inboundFlags;
+        String inboundTracestate = DD_MEMBER + ",ot=rv:" + randomValue + ";th:" + THRESHOLD + ",vendor=state";
+        Map<String, String> inboundHeaders = headers(
+                DatadogHttpCodec.TRACE_ID_KEY,
+                "1",
+                DatadogHttpCodec.SPAN_ID_KEY,
+                "2",
+                DatadogHttpCodec.SAMPLING_PRIORITY_KEY,
+                String.valueOf(datadogPriority),
+                TRACE_PARENT_KEY,
+                traceParent,
+                TRACE_STATE_KEY,
+                inboundTracestate);
+        Config config = mock(Config.class);
+        when(config.getTracePropagationStylesToExtract())
+                .thenReturn(new LinkedHashSet<>(asList(DATADOG, TRACECONTEXT)));
+        when(config.getxDatadogTagsMaxLength()).thenReturn(DEFAULT_TRACE_X_DATADOG_TAGS_MAX_LENGTH);
+
+        CoreTracer tracer = tracerBuilder().build();
+        try {
+            HttpCodec.Extractor extractor = HttpCodec.createExtractor(config, tracer::captureTraceConfig);
+            ExtractedContext extracted =
+                    assertInstanceOf(ExtractedContext.class, extractor.extract(inboundHeaders, stringValuesMap()));
+            assertEquals(inboundTracestate, extracted.getPropagationTags().getW3CTracestate());
+
+            AgentSpan span =
+                    tracer.buildSpan("test", "continued").asChildOf(extracted).start();
+            Map<String, String> outboundHeaders = new HashMap<>();
+            injector.inject((DDSpanContext) span.spanContext(), outboundHeaders, Map::put);
+            span.finish();
+
+            assertTrue(outboundHeaders.get(TRACE_PARENT_KEY).endsWith("-" + outboundFlags));
+            String outboundTracestate = outboundHeaders.get(TRACE_STATE_KEY);
+            assertTrue(outboundTracestate.startsWith("dd=s:" + datadogPriority));
+            assertTrue(outboundTracestate.contains("ot=rv:" + randomValue));
+            assertTrue(outboundTracestate.endsWith("vendor=state"));
+            assertEquals(thresholdExpected, outboundTracestate.contains("th:" + THRESHOLD));
+        } finally {
+            tracer.close();
+        }
     }
-  }
-
-  private String continueTraceAndReinject(String inboundTracestate) {
-    Map<String, String> inboundHeaders =
-        headers(TRACE_PARENT_KEY, TRACE_PARENT, TRACE_STATE_KEY, inboundTracestate);
-
-    CoreTracer tracer = tracerBuilder().build();
-    try {
-      HttpCodec.Extractor extractor =
-          W3CHttpCodec.newExtractor(Config.get(), tracer::captureTraceConfig);
-      ExtractedContext extracted =
-          assertInstanceOf(
-              ExtractedContext.class, extractor.extract(inboundHeaders, stringValuesMap()));
-
-      AgentSpan span = tracer.buildSpan("test", "continued").asChildOf(extracted).start();
-      assertEquals(extracted.getSamplingPriority(), span.getSamplingPriority());
-
-      Map<String, String> outboundHeaders = new HashMap<>();
-      injector.inject((DDSpanContext) span.spanContext(), outboundHeaders, Map::put);
-      span.finish();
-      return outboundHeaders.get(TRACE_STATE_KEY);
-    } finally {
-      tracer.close();
+
+    @Test
+    void compoundExtractionWithoutDatadogPriorityReconcilesFirstLocalDecision() {
+        String traceParent = TRACE_PARENT.substring(0, TRACE_PARENT.length() - 2) + "00";
+        String inboundTracestate = "ot=rv:00000000000000;th:8,vendor=state";
+        Map<String, String> inboundHeaders = headers(
+                DatadogHttpCodec.TRACE_ID_KEY,
+                "1",
+                DatadogHttpCodec.SPAN_ID_KEY,
+                "2",
+                TRACE_PARENT_KEY,
+                traceParent,
+                TRACE_STATE_KEY,
+                inboundTracestate);
+        Config config = mock(Config.class);
+        when(config.getTracePropagationStylesToExtract())
+                .thenReturn(new LinkedHashSet<>(asList(DATADOG, TRACECONTEXT)));
+        when(config.getxDatadogTagsMaxLength()).thenReturn(DEFAULT_TRACE_X_DATADOG_TAGS_MAX_LENGTH);
+
+        CoreTracer tracer = tracerBuilder().build();
+        try {
+            ExtractedContext w3c = assertInstanceOf(
+                    ExtractedContext.class,
+                    W3CHttpCodec.newExtractor(config, tracer::captureTraceConfig)
+                            .extract(inboundHeaders, stringValuesMap()));
+            assertEquals(SAMPLER_DROP, w3c.getSamplingPriority());
+            assertEquals(inboundTracestate, w3c.getPropagationTags().getW3CTracestate());
+
+            ExtractedContext extracted = assertInstanceOf(
+                    ExtractedContext.class,
+                    HttpCodec.createExtractor(config, tracer::captureTraceConfig)
+                            .extract(inboundHeaders, stringValuesMap()));
+            assertEquals(UNSET, extracted.getSamplingPriority());
+            assertEquals(inboundTracestate, extracted.getPropagationTags().getW3CTracestate());
+
+            AgentSpan span =
+                    tracer.buildSpan("test", "continued").asChildOf(extracted).start();
+            new RateByServiceTraceSampler().setSamplingPriority((DDSpan) span);
+            assertEquals(SAMPLER_KEEP, span.getSamplingPriority());
+
+            Map<String, String> outboundHeaders = new HashMap<>();
+            injector.inject((DDSpanContext) span.spanContext(), outboundHeaders, Map::put);
+            span.finish();
+
+            assertTrue(outboundHeaders.get(TRACE_PARENT_KEY).endsWith("-01"));
+            assertTrue(outboundHeaders.get(TRACE_STATE_KEY).contains("ot=rv:00000000000000,vendor=state"));
+            assertFalse(outboundHeaders.get(TRACE_STATE_KEY).contains(";th:"));
+        } finally {
+            tracer.close();
+        }
+    }
+
+    private String continueTraceAndReinject(String inboundTracestate) {
+        Map<String, String> inboundHeaders =
+                headers(TRACE_PARENT_KEY, TRACE_PARENT, TRACE_STATE_KEY, inboundTracestate);
+
+        CoreTracer tracer = tracerBuilder().build();
+        try {
+            HttpCodec.Extractor extractor = W3CHttpCodec.newExtractor(Config.get(), tracer::captureTraceConfig);
+            ExtractedContext extracted =
+                    assertInstanceOf(ExtractedContext.class, extractor.extract(inboundHeaders, stringValuesMap()));
+
+            AgentSpan span =
+                    tracer.buildSpan("test", "continued").asChildOf(extracted).start();
+            assertEquals(extracted.getSamplingPriority(), span.getSamplingPriority());
+
+            Map<String, String> outboundHeaders = new HashMap<>();
+            injector.inject((DDSpanContext) span.spanContext(), outboundHeaders, Map::put);
+            span.finish();
+            return outboundHeaders.get(TRACE_STATE_KEY);
+        } finally {
+            tracer.close();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CPropagationTagsTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CPropagationTagsTest.java
index 6f920526138..f72c83c3c57 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CPropagationTagsTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CPropagationTagsTest.java
@@ -30,394 +30,393 @@
 
 class W3CPropagationTagsTest extends DDCoreJavaSpecification {
 
-  @ParameterizedTest
-  @MethodSource("validateTracestateHeaderLimitsArguments")
-  void validateTracestateHeaderLimits(String headerValue, boolean valid) {
-    PropagationTags propagationTags = factory().fromHeaderValue(W3C, headerValue);
-
-    if (valid) {
-      assertEquals(headerValue.trim(), propagationTags.headerValue(W3C));
-    } else {
-      assertNull(propagationTags.headerValue(W3C));
+    @ParameterizedTest
+    @MethodSource("validateTracestateHeaderLimitsArguments")
+    void validateTracestateHeaderLimits(String headerValue, boolean valid) {
+        PropagationTags propagationTags = factory().fromHeaderValue(W3C, headerValue);
+
+        if (valid) {
+            assertEquals(headerValue.trim(), propagationTags.headerValue(W3C));
+        } else {
+            assertNull(propagationTags.headerValue(W3C));
+        }
+        // we're not using any dd members in the tests
+        assertTrue(propagationTags.createTagMap().isEmpty());
     }
-    // we're not using any dd members in the tests
-    assertTrue(propagationTags.createTagMap().isEmpty());
-  }
-
-  static Stream<Arguments> validateTracestateHeaderLimitsArguments() {
-    return Stream.of(
-        arguments(null, false),
-        arguments("", false),
-        // check basic key length limit
-        arguments(repeat("k", 251) + "0_-*/=1", true),
-        arguments(repeat("k", 252) + "0_-*/=1", false),
-        // check multi key length limit
-        arguments(repeat("t", 241) + "@" + repeat("s", 14) + "=1", true),
-        arguments(repeat("t", 242) + "@" + repeat("s", 14) + "=1", false),
-        arguments(repeat("t", 241) + "@" + repeat("s", 15) + "=1", false),
-        // check value length limit
-        arguments("k=" + repeat("v", 256), true),
-        arguments("k=" + repeat("v", 257), false),
-        // check value length limit with some trailing whitespace
-        arguments("k=" + repeat("v", 256) + " \t \t", true),
-        arguments("k=" + repeat("v", 257) + " \t \t", false));
-  }
-
-  @ParameterizedTest
-  @MethodSource("validateTracestateHeaderValidKeyContentsArguments")
-  void validateTracestateHeaderValidKeyContents(String headerChar) {
-    String lcAlpha = toLowerCaseAlpha(headerChar);
-    String simpleKeyHeader = lcAlpha + headerChar + "_-*/=1";
-    String multiKeyHeader = headerChar + "@" + lcAlpha + headerChar + "_-*/=1";
-
-    PropagationTags simpleKeyPT = factory().fromHeaderValue(W3C, simpleKeyHeader);
-    PropagationTags multiKeyPT = factory().fromHeaderValue(W3C, multiKeyHeader);
-
-    assertEquals(simpleKeyHeader, simpleKeyPT.headerValue(W3C));
-    assertEquals(multiKeyHeader, multiKeyPT.headerValue(W3C));
-    // we're not using any dd members in the tests
-    assertTrue(simpleKeyPT.createTagMap().isEmpty());
-    assertTrue(multiKeyPT.createTagMap().isEmpty());
-  }
-
-  static Stream<Arguments> validateTracestateHeaderValidKeyContentsArguments() {
-    return concat(rangeClosed('a', 'z'), rangeClosed('0', '9'))
-        .mapToObj(c -> arguments(String.valueOf((char) c)));
-  }
-
-  @ParameterizedTest
-  @MethodSource("validateTracestateHeaderInvalidKeyContentsArguments")
-  void validateTracestateHeaderInvalidKeyContents(String headerChar) {
-    String lcAlpha = toLowerCaseAlpha(headerChar);
-    String simpleKeyHeader = lcAlpha + headerChar + "_-*/=1";
-    String multiKeyHeader = lcAlpha + headerChar + "@" + lcAlpha + headerChar + "_-*/=1";
-
-    PropagationTags simpleKeyPT = factory().fromHeaderValue(W3C, simpleKeyHeader);
-    PropagationTags multiKeyPT = factory().fromHeaderValue(W3C, multiKeyHeader);
-
-    assertNull(simpleKeyPT.headerValue(W3C));
-    assertNull(multiKeyPT.headerValue(W3C));
-    // we're not using any dd members in the tests
-    assertEquals(emptyMap(), simpleKeyPT.createTagMap());
-    assertEquals(emptyMap(), multiKeyPT.createTagMap());
-  }
-
-  static Stream<Arguments> validateTracestateHeaderInvalidKeyContentsArguments() {
-    return rangeClosed(' ', 'ÿ')
-        .filter(W3CPropagationTagsTest::invalidKeyChar)
-        .mapToObj(value -> String.valueOf((char) value))
-        .map(Arguments::of);
-  }
-
-  static boolean invalidKeyChar(int i) {
-    if (i >= 'a' && i <= 'z') {
-      return false;
+
+    static Stream<Arguments> validateTracestateHeaderLimitsArguments() {
+        return Stream.of(
+                arguments(null, false),
+                arguments("", false),
+                // check basic key length limit
+                arguments(repeat("k", 251) + "0_-*/=1", true),
+                arguments(repeat("k", 252) + "0_-*/=1", false),
+                // check multi key length limit
+                arguments(repeat("t", 241) + "@" + repeat("s", 14) + "=1", true),
+                arguments(repeat("t", 242) + "@" + repeat("s", 14) + "=1", false),
+                arguments(repeat("t", 241) + "@" + repeat("s", 15) + "=1", false),
+                // check value length limit
+                arguments("k=" + repeat("v", 256), true),
+                arguments("k=" + repeat("v", 257), false),
+                // check value length limit with some trailing whitespace
+                arguments("k=" + repeat("v", 256) + " \t \t", true),
+                arguments("k=" + repeat("v", 257) + " \t \t", false));
+    }
+
+    @ParameterizedTest
+    @MethodSource("validateTracestateHeaderValidKeyContentsArguments")
+    void validateTracestateHeaderValidKeyContents(String headerChar) {
+        String lcAlpha = toLowerCaseAlpha(headerChar);
+        String simpleKeyHeader = lcAlpha + headerChar + "_-*/=1";
+        String multiKeyHeader = headerChar + "@" + lcAlpha + headerChar + "_-*/=1";
+
+        PropagationTags simpleKeyPT = factory().fromHeaderValue(W3C, simpleKeyHeader);
+        PropagationTags multiKeyPT = factory().fromHeaderValue(W3C, multiKeyHeader);
+
+        assertEquals(simpleKeyHeader, simpleKeyPT.headerValue(W3C));
+        assertEquals(multiKeyHeader, multiKeyPT.headerValue(W3C));
+        // we're not using any dd members in the tests
+        assertTrue(simpleKeyPT.createTagMap().isEmpty());
+        assertTrue(multiKeyPT.createTagMap().isEmpty());
+    }
+
+    static Stream<Arguments> validateTracestateHeaderValidKeyContentsArguments() {
+        return concat(rangeClosed('a', 'z'), rangeClosed('0', '9')).mapToObj(c -> arguments(String.valueOf((char) c)));
+    }
+
+    @ParameterizedTest
+    @MethodSource("validateTracestateHeaderInvalidKeyContentsArguments")
+    void validateTracestateHeaderInvalidKeyContents(String headerChar) {
+        String lcAlpha = toLowerCaseAlpha(headerChar);
+        String simpleKeyHeader = lcAlpha + headerChar + "_-*/=1";
+        String multiKeyHeader = lcAlpha + headerChar + "@" + lcAlpha + headerChar + "_-*/=1";
+
+        PropagationTags simpleKeyPT = factory().fromHeaderValue(W3C, simpleKeyHeader);
+        PropagationTags multiKeyPT = factory().fromHeaderValue(W3C, multiKeyHeader);
+
+        assertNull(simpleKeyPT.headerValue(W3C));
+        assertNull(multiKeyPT.headerValue(W3C));
+        // we're not using any dd members in the tests
+        assertEquals(emptyMap(), simpleKeyPT.createTagMap());
+        assertEquals(emptyMap(), multiKeyPT.createTagMap());
+    }
+
+    static Stream<Arguments> validateTracestateHeaderInvalidKeyContentsArguments() {
+        return rangeClosed(' ', 'ÿ')
+                .filter(W3CPropagationTagsTest::invalidKeyChar)
+                .mapToObj(value -> String.valueOf((char) value))
+                .map(Arguments::of);
+    }
+
+    static boolean invalidKeyChar(int i) {
+        if (i >= 'a' && i <= 'z') {
+            return false;
+        }
+        if (i >= '0' && i <= '9') {
+            return false;
+        }
+        return i != '_' && i != '-' && i != '*' && i != '/';
+    }
+
+    @ParameterizedTest
+    @MethodSource("validateTracestateHeaderValidValueContentsArguments")
+    void validateTracestateHeaderValidValueContents(String valueChar) {
+        String lcAlpha = toLowerCaseAlpha(valueChar);
+        String mostlyOkHeader = lcAlpha + "=" + valueChar;
+        String alwaysOkHeader = lcAlpha + "=" + lcAlpha + valueChar + lcAlpha;
+
+        PropagationTags mostlyOkPT = factory().fromHeaderValue(W3C, mostlyOkHeader);
+        PropagationTags alwaysOkPT = factory().fromHeaderValue(W3C, alwaysOkHeader);
+
+        if (" ".equals(valueChar)) {
+            assertNull(mostlyOkPT.headerValue(W3C));
+        } else {
+            assertEquals(mostlyOkHeader, mostlyOkPT.headerValue(W3C));
+        }
+        assertEquals(alwaysOkHeader, alwaysOkPT.headerValue(W3C));
+        // we're not using any dd members in the tests
+        assertEquals(emptyMap(), mostlyOkPT.createTagMap());
+        assertEquals(emptyMap(), alwaysOkPT.createTagMap());
+    }
+
+    static Stream<Arguments> validateTracestateHeaderValidValueContentsArguments() {
+        return rangeClosed(' ', '~')
+                .filter(c -> c != ',' && c != '=')
+                .mapToObj(String::valueOf)
+                .map(Arguments::of);
+    }
+
+    @ParameterizedTest
+    @MethodSource("validateTracestateHeaderInvalidValueContentsArguments")
+    void validateTracestateHeaderInvalidValueContents(String valueChar) {
+        String lcAlpha = toLowerCaseAlpha(valueChar);
+        String alwaysBadHeader = lcAlpha + "=" + lcAlpha + valueChar + lcAlpha;
+
+        PropagationTags alwaysBadPT = factory().fromHeaderValue(W3C, alwaysBadHeader);
+
+        assertNull(alwaysBadPT.headerValue(W3C));
+        // we're not using any dd members in the tests
+        assertEquals(emptyMap(), alwaysBadPT.createTagMap());
     }
-    if (i >= '0' && i <= '9') {
-      return false;
+
+    static Stream<Arguments> validateTracestateHeaderInvalidValueContentsArguments() {
+        return rangeClosed(' ', 'ÿ')
+                .filter(W3CPropagationTagsTest::invalidValueChar)
+                .mapToObj(value -> String.valueOf((char) value))
+                .map(Arguments::of);
     }
-    return i != '_' && i != '-' && i != '*' && i != '/';
-  }
-
-  @ParameterizedTest
-  @MethodSource("validateTracestateHeaderValidValueContentsArguments")
-  void validateTracestateHeaderValidValueContents(String valueChar) {
-    String lcAlpha = toLowerCaseAlpha(valueChar);
-    String mostlyOkHeader = lcAlpha + "=" + valueChar;
-    String alwaysOkHeader = lcAlpha + "=" + lcAlpha + valueChar + lcAlpha;
-
-    PropagationTags mostlyOkPT = factory().fromHeaderValue(W3C, mostlyOkHeader);
-    PropagationTags alwaysOkPT = factory().fromHeaderValue(W3C, alwaysOkHeader);
-
-    if (" ".equals(valueChar)) {
-      assertNull(mostlyOkPT.headerValue(W3C));
-    } else {
-      assertEquals(mostlyOkHeader, mostlyOkPT.headerValue(W3C));
+
+    static boolean invalidValueChar(int i) {
+        if (i >= ' ' && i <= '~') {
+            return i == ',' || i == '=';
+        }
+        return true;
     }
-    assertEquals(alwaysOkHeader, alwaysOkPT.headerValue(W3C));
-    // we're not using any dd members in the tests
-    assertEquals(emptyMap(), mostlyOkPT.createTagMap());
-    assertEquals(emptyMap(), alwaysOkPT.createTagMap());
-  }
-
-  static Stream<Arguments> validateTracestateHeaderValidValueContentsArguments() {
-    return rangeClosed(' ', '~')
-        .filter(c -> c != ',' && c != '=')
-        .mapToObj(String::valueOf)
-        .map(Arguments::of);
-  }
-
-  @ParameterizedTest
-  @MethodSource("validateTracestateHeaderInvalidValueContentsArguments")
-  void validateTracestateHeaderInvalidValueContents(String valueChar) {
-    String lcAlpha = toLowerCaseAlpha(valueChar);
-    String alwaysBadHeader = lcAlpha + "=" + lcAlpha + valueChar + lcAlpha;
-
-    PropagationTags alwaysBadPT = factory().fromHeaderValue(W3C, alwaysBadHeader);
-
-    assertNull(alwaysBadPT.headerValue(W3C));
-    // we're not using any dd members in the tests
-    assertEquals(emptyMap(), alwaysBadPT.createTagMap());
-  }
-
-  static Stream<Arguments> validateTracestateHeaderInvalidValueContentsArguments() {
-    return rangeClosed(' ', 'ÿ')
-        .filter(W3CPropagationTagsTest::invalidValueChar)
-        .mapToObj(value -> String.valueOf((char) value))
-        .map(Arguments::of);
-  }
-
-  static boolean invalidValueChar(int i) {
-    if (i >= ' ' && i <= '~') {
-      return i == ',' || i == '=';
+
+    @ParameterizedTest(name = "{0} members")
+    @MethodSource("memberCountArguments")
+    void validateTracestateHeaderNumberOfMembersWithoutDatadogMember(int memberCount) {
+        String header = buildHeader(memberCount);
+
+        PropagationTags headerPT = factory().fromHeaderValue(W3C, header);
+
+        if (memberCount <= 32) {
+            assertEquals(header, headerPT.headerValue(W3C));
+        } else {
+            assertNull(headerPT.headerValue(W3C));
+        }
+        // we're not using any dd members in the tests
+        assertEquals(emptyMap(), headerPT.createTagMap());
     }
-    return true;
-  }
 
-  @ParameterizedTest(name = "{0} members")
-  @MethodSource("memberCountArguments")
-  void validateTracestateHeaderNumberOfMembersWithoutDatadogMember(int memberCount) {
-    String header = buildHeader(memberCount);
+    @ParameterizedTest(name = "{0} members")
+    @MethodSource("memberCountArguments")
+    void validateTracestateHeaderNumberOfMembersWithDatadogMember(int memberCount) {
+        String header = "dd=s:1," + buildHeader(memberCount);
 
-    PropagationTags headerPT = factory().fromHeaderValue(W3C, header);
+        PropagationTags headerPT = factory().fromHeaderValue(W3C, header);
 
-    if (memberCount <= 32) {
-      assertEquals(header, headerPT.headerValue(W3C));
-    } else {
-      assertNull(headerPT.headerValue(W3C));
+        if (memberCount + 1 <= 32) {
+            assertEquals(header, headerPT.headerValue(W3C));
+        } else {
+            assertNull(headerPT.headerValue(W3C));
+        }
+        // we're not using any dd members in the tests
+        assertEquals(emptyMap(), headerPT.createTagMap());
     }
-    // we're not using any dd members in the tests
-    assertEquals(emptyMap(), headerPT.createTagMap());
-  }
 
-  @ParameterizedTest(name = "{0} members")
-  @MethodSource("memberCountArguments")
-  void validateTracestateHeaderNumberOfMembersWithDatadogMember(int memberCount) {
-    String header = "dd=s:1," + buildHeader(memberCount);
+    @ParameterizedTest(name = "{0} members")
+    @MethodSource("memberCountArguments")
+    void validateTracestateHeaderNumberOfMembersWhenPropagatingOriginalTracestate(int memberCount) {
+        String header = buildHeader(memberCount);
+        String expectedHeader =
+                "dd=t.dm:-4," + (memberCount > MAX_MEMBER_COUNT ? "" : buildHeader(min(memberCount, 31)));
+
+        PropagationTags datadogHeaderPT = factory().fromHeaderValue(HeaderType.DATADOG, "_dd.p.dm=-4");
+        PropagationTags headerPT = factory().fromHeaderValue(W3C, header);
+        datadogHeaderPT.updateW3CTracestate(headerPT.getW3CTracestate());
+
+        if (memberCount <= 32) {
+            assertEquals(expectedHeader, datadogHeaderPT.headerValue(W3C));
+        } else {
+            assertEquals("dd=t.dm:-4", datadogHeaderPT.headerValue(W3C));
+        }
+        assertEquals(singletonMap("_dd.p.dm", "-4"), datadogHeaderPT.createTagMap());
+    }
 
-    PropagationTags headerPT = factory().fromHeaderValue(W3C, header);
+    static IntStream memberCountArguments() {
+        return rangeClosed(1, 37);
+    }
 
-    if (memberCount + 1 <= 32) {
-      assertEquals(header, headerPT.headerValue(W3C));
-    } else {
-      assertNull(headerPT.headerValue(W3C));
+    @TableTest({
+      "scenario                                    | headerValue                                                            | expectedHeaderValue                                  | tags                                                        ",
+      "null                                        |                                                                        |                                                      | [:]                                                         ",
+      "empty                                       | ''                                                                     |                                                      | [:]                                                         ",
+      "dd only with dm                             | 'dd=s:0;t.dm:934086a686-4'                                             | 'dd=s:0;t.dm:934086a686-4'                           | [_dd.p.dm: 934086a686-4]                                    ",
+      "dd only with ts                             | 'dd=s:0;t.ts:02'                                                       | 'dd=s:0;t.ts:02'                                     | [_dd.p.ts: 02]                                              ",
+      "dd only with ts zero                        | 'dd=s:0;t.ts:00'                                                       | 'dd=s:0'                                             | [:]                                                         ",
+      "dd only with dm and ts                      | 'dd=s:0;t.dm:934086a686-4;t.ts:02'                                     | 'dd=s:0;t.dm:934086a686-4;t.ts:02'                   | [_dd.p.dm: 934086a686-4, _dd.p.ts: 02]                      ",
+      "other before dd                             | 'other=whatever,dd=s:0;t.dm:934086a686-4'                              | 'dd=s:0;t.dm:934086a686-4,other=whatever'            | [_dd.p.dm: 934086a686-4]                                    ",
+      "dd before other                             | 'dd=s:0;t.dm:934086a687-3,other=whatever'                              | 'dd=s:0;t.dm:934086a687-3,other=whatever'            | [_dd.p.dm: 934086a687-3]                                    ",
+      "some before dd before other                 | 'some=thing,dd=s:0;t.dm:934086a687-3,other=whatever'                   | 'dd=s:0;t.dm:934086a687-3,some=thing,other=whatever' | [_dd.p.dm: 934086a687-3]                                    ",
+      "no dd                                       | 'some=thing,other=whatever'                                            | 'some=thing,other=whatever'                          | [:]                                                         ",
+      "duplicate dd before ot                      | 'dd=s:1,dd=s:0,ot=rv:ef284ace7a91e1'                                   | 'dd=s:1,ot=rv:ef284ace7a91e1'                        | [:]                                                         ",
+      "dd offset before ot                         | 'first=value,dd=s:1,sec=value,dd=s:0,ot=rv:ef284ace7a91e1'             | 'dd=s:1,first=value,sec=value,ot=rv:ef284ace7a91e1'  | [:]                                                         ",
+      "dd after ot does not offset                 | 'first=value,ot=rv:ef284ace7a91e1,dd=s:1,sec=value'                    | 'dd=s:1,first=value,ot=rv:ef284ace7a91e1,sec=value'  | [:]                                                         ",
+      "dd with origin and dm                       | 'dd=s:0;o:some;t.dm:934086a686-4'                                      | 'dd=s:0;o:some;t.dm:934086a686-4'                    | [_dd.p.dm: 934086a686-4]                                    ",
+      "dd with unknown key                         | 'dd=s:0;x:unknown;t.dm:934086a686-4'                                   | 'dd=s:0;t.dm:934086a686-4;x:unknown'                 | [_dd.p.dm: 934086a686-4]                                    ",
+      "other before dd with unknown                | 'other=whatever,dd=s:0;x:unknown;t.dm:934086a686-4'                    | 'dd=s:0;t.dm:934086a686-4;x:unknown,other=whatever'  | [_dd.p.dm: 934086a686-4]                                    ",
+      "dd with xyz instead of s                    | 'other=whatever,dd=xyz:unknown;t.dm:934086a686-4'                      | 'dd=t.dm:934086a686-4;xyz:unknown,other=whatever'    | [_dd.p.dm: 934086a686-4]                                    ",
+      "dd with trailing whitespace                 | 'other=whatever,dd=t.dm:934086a686-4;xyz:unknown  '                    | 'dd=t.dm:934086a686-4;xyz:unknown,other=whatever'    | [_dd.p.dm: 934086a686-4]                                    ",
+      "ws and tabs around members                  | '\tsome=thing \t , dd=s:0;t.dm:934086a687-3\t\t,  other=whatever\t\t ' | 'dd=s:0;t.dm:934086a687-3,some=thing,other=whatever' | [_dd.p.dm: 934086a687-3]                                    ",
+      "dd with two t. tags                         | 'dd=s:0;t.a:b;t.x:y'                                                   | 'dd=s:0;t.a:b;t.x:y'                                 | [_dd.p.a: b, _dd.p.x: y]                                    ",
+      "dd with two t. tags trailing whitespace     | 'dd=s:0;t.a:b;t.x:y \t'                                                | 'dd=s:0;t.a:b;t.x:y'                                 | [_dd.p.a: b, _dd.p.x: y]                                    ",
+      "dd with two t. tags inner whitespace        | 'dd=s:0;t.a:b ;t.x:y \t'                                               | 'dd=s:0;t.a:b ;t.x:y'                                | ['_dd.p.a': 'b ', _dd.p.x: y]                               ",
+      "dd with two t. tags invalid whitespace      | 'dd=s:0;t.a:b \t;t.x:y \t'                                             |                                                      | [:]                                                         ",
+      "dd with tid                                 | 'dd=s:0;t.tid:123456789abcdef0'                                        | 'dd=s:0;t.tid:123456789abcdef0'                      | [_dd.p.tid: 123456789abcdef0]                               ",
+      "tid empty value                             | 'dd=t.tid:'                                                            |                                                      | [:]                                                         ",
+      "tid too short length 1                      | 'dd=t.tid:1'                                                           |                                                      | ['_dd.propagation_error': 'malformed_tid 1']                ",
+      "tid too short length 15                     | 'dd=t.tid:111111111111111'                                             |                                                      | ['_dd.propagation_error': 'malformed_tid 111111111111111']  ",
+      "tid too long length 17                      | 'dd=t.tid:11111111111111111'                                           |                                                      | ['_dd.propagation_error': 'malformed_tid 11111111111111111']",
+      "tid uppercase                               | 'dd=t.tid:123456789ABCDEF0'                                            |                                                      | ['_dd.propagation_error': 'malformed_tid 123456789ABCDEF0'] ",
+      "tid non-hex character                       | 'dd=t.tid:123456789abcdefg'                                            |                                                      | ['_dd.propagation_error': 'malformed_tid 123456789abcdefg'] ",
+      "tid negative                                | 'dd=t.tid:-123456789abcdef'                                            |                                                      | ['_dd.propagation_error': 'malformed_tid -123456789abcdef'] ",
+      "dd with trailing separator                  | 'dd=s:0;t.dm:934086a686-4;'                                            | 'dd=s:0;t.dm:934086a686-4'                           | [_dd.p.dm: 934086a686-4]                                    ",
+      "dd single tag trailing separator            | 'dd=t.dm:934086a686-4;'                                                | 'dd=t.dm:934086a686-4'                               | [_dd.p.dm: 934086a686-4]                                    ",
+      "dd before other trailing separator          | 'dd=s:0;t.dm:934086a687-3;,other=whatever'                             | 'dd=s:0;t.dm:934086a687-3,other=whatever'            | [_dd.p.dm: 934086a687-3]                                    ",
+      "dd trailing separator then ws               | 'dd=s:0;t.dm:934086a686-4;  '                                          | 'dd=s:0;t.dm:934086a686-4'                           | [_dd.p.dm: 934086a686-4]                                    ",
+      "dd trailing separator then tab              | 'dd=s:0;t.dm:934086a686-4;\t'                                          | 'dd=s:0;t.dm:934086a686-4'                           | [_dd.p.dm: 934086a686-4]                                    ",
+      "dd trailing separator ws then comma         | 'dd=s:0;t.dm:934086a687-3;  ,other=whatever'                           | 'dd=s:0;t.dm:934086a687-3,other=whatever'            | [_dd.p.dm: 934086a687-3]                                    ",
+      "unknown trailing separator                  | 'dd=x:y;'                                                              | 'dd=x:y'                                             | [:]                                                         ",
+      "unknown trailing separator then space       | 'dd=x:y; '                                                             | 'dd=x:y'                                             | [:]                                                         ",
+      "unknown trailing separator then tab         | 'dd=x:y;\t'                                                            | 'dd=x:y'                                             | [:]                                                         ",
+      "unknown two trailing separators             | 'dd=x:y;;'                                                             | 'dd=x:y'                                             | [:]                                                         ",
+      "unknown three trailing separators           | 'dd=x:y;;;'                                                            | 'dd=x:y'                                             | [:]                                                         ",
+      "leading empty element                       | 'dd=;x:y'                                                              | 'dd=x:y'                                             | [:]                                                         ",
+      "leading double empty element                | 'dd=;;x:y'                                                             | 'dd=x:y'                                             | [:]                                                         ",
+      "double separator between two unknowns       | 'dd=x:y;;z:w'                                                          | 'dd=x:y;z:w'                                         | [:]                                                         ",
+      "double separator between known tags         | 'dd=s:0;;t.dm:934086a686-4'                                            | 'dd=s:0;t.dm:934086a686-4'                           | [_dd.p.dm: 934086a686-4]                                    ",
+      "unknown then double sep then known tag      | 'dd=s:0;x:y;;t.dm:934086a686-4'                                        | 'dd=s:0;t.dm:934086a686-4;x:y'                       | [_dd.p.dm: 934086a686-4]                                    ",
+      "leading/interior/trailing empty elements    | 'dd=x:y;;;z:w;;'                                                       | 'dd=x:y;z:w'                                         | [:]                                                         ",
+      "only empty elements, no tags                | 'dd=;;;;'                                                              |                                                      | [:]                                                         ",
+      "only empty elements before other member     | 'other=whatever,dd=;;;;'                                               | 'other=whatever'                                     | [:]                                                         ",
+      "double sep then trailing space              | 'dd=x:y;; '                                                            | 'dd=x:y'                                             | [:]                                                         ",
+      "double sep then trailing tab                | 'dd=x:y;;\t'                                                           | 'dd=x:y'                                             | [:]                                                         ",
+      "triple sep then trailing space              | 'dd=x:y;;;  '                                                          | 'dd=x:y'                                             | [:]                                                         ",
+      "sep then ws then sep is empty element ws    | 'dd=x:y;  ;z:w'                                                        | 'dd=x:y;z:w'                                         | [:]                                                         ",
+      "2 seps then ws then sep is empty elem ws    | 'dd=x:y;;  ;z:w'                                                       | 'dd=x:y;z:w'                                         | [:]                                                         ",
+      "sampling unknown trailing sep then ws       | 'dd=s:0;x:y; '                                                         | 'dd=s:0;x:y'                                         | [:]                                                         ",
+      "sep then ws then sep is empty elem          | 'dd=s:0;  ;t.dm:934086a686-4'                                          | 'dd=s:0;t.dm:934086a686-4'                           | [_dd.p.dm: 934086a686-4]                                    ",
+      "dd interior ws between submembers           | 'dd=s:0;t.dm:934086a686-4;  t.x:y'                                     | 'dd=s:0;t.dm:934086a686-4;  t.x:y'                   | [_dd.p.dm: 934086a686-4]                                    ",
+      "dd interior single space submember          | 'dd=s:0; t.dm:934086a686-4'                                            | 'dd=s:0; t.dm:934086a686-4'                          | [:]                                                         ",
+      "sampling priority non-numeric dropped       | 'dd=s:abc;t.dm:934086a686-4'                                           | 'dd=t.dm:934086a686-4'                               | [_dd.p.dm: 934086a686-4]                                    ",
+      "sampling priority overflow dropped          | 'dd=s:99999999999;t.dm:934086a686-4'                                   | 'dd=t.dm:934086a686-4'                               | [_dd.p.dm: 934086a686-4]                                    ",
+      "sampling priority min int retained          | 'dd=s:-2147483648;t.dm:934086a686-4'                                   | 'dd=s:-2147483648;t.dm:934086a686-4'                 | [_dd.p.dm: 934086a686-4]                                    ",
+      "sampling priority leading plus              | 'dd=s:+5;t.dm:934086a686-4'                                            | 'dd=s:5;t.dm:934086a686-4'                           | [_dd.p.dm: 934086a686-4]                                    ",
+      "sampling priority lone minus dropped        | 'dd=s:-;t.dm:934086a686-4'                                             | 'dd=t.dm:934086a686-4'                               | [_dd.p.dm: 934086a686-4]                                    ",
+      "sampling priority empty value invalid       | 'dd=s:;t.dm:934086a686-4'                                              | 'dd=t.dm:934086a686-4'                               | [_dd.p.dm: 934086a686-4]                                    ",
+      "sampling priority ws only value dropped     | 'dd=s: ;t.dm:934086a686-4'                                             | 'dd=t.dm:934086a686-4'                               | [_dd.p.dm: 934086a686-4]                                    ",
+      "sampling priority just above max int        | 'dd=s:2147483648'                                                      |                                                      | [:]                                                         ",
+      "sampling priority just below min int        | 'dd=s:-2147483649'                                                     |                                                      | [:]                                                         ",
+      "bare element after known unknown            | 'dd=x:y;z'                                                             | 'dd=x:y;z'                                           | [:]                                                         ",
+      "bare element before known unknown           | 'dd=z;x:y'                                                             | 'dd=z;x:y'                                           | [:]                                                         ",
+      "bare element between known unknowns         | 'dd=x:y;z;a:b'                                                         | 'dd=x:y;z;a:b'                                       | [:]                                                         ",
+      "parent id not duplicated as unknown         | 'dd=p:b6241412414a;x:y'                                                | 'dd=p:b6241412414a;x:y'                              | [:]                                                         ",
+      "origin not duplicated as unknown            | 'dd=o:rum;x:y'                                                         | 'dd=o:rum;x:y'                                       | [:]                                                         ",
+      "sampling priority not duplicated as unknown | 'dd=s:1;x:y'                                                           | 'dd=s:1;x:y'                                         | [:]                                                         ",
+      "malformed element with leading space key    | 'dd=x:y; z:w'                                                          | 'dd=x:y; z:w'                                        | [:]                                                         ",
+      "malformed element with interior space key   | 'dd=x:y;a b:c'                                                         | 'dd=x:y;a b:c'                                       | [:]                                                         ",
+      "malformed element between known tags        | 'dd=s:1; z:w;o:rum'                                                    | 'dd=s:1;o:rum; z:w'                                  | [:]                                                         "
+    })
+    void createPropagationTagsFromHeaderValue(
+            String headerValue, String expectedHeaderValue, Map<String, String> tags) {
+        PropagationTags propagationTags = factory().fromHeaderValue(W3C, headerValue);
+
+        assertEquals(expectedHeaderValue, propagationTags.headerValue(W3C));
+        assertEquals(tags, propagationTags.createTagMap());
     }
-    // we're not using any dd members in the tests
-    assertEquals(emptyMap(), headerPT.createTagMap());
-  }
-
-  @ParameterizedTest(name = "{0} members")
-  @MethodSource("memberCountArguments")
-  void validateTracestateHeaderNumberOfMembersWhenPropagatingOriginalTracestate(int memberCount) {
-    String header = buildHeader(memberCount);
-    String expectedHeader =
-        "dd=t.dm:-4," + (memberCount > MAX_MEMBER_COUNT ? "" : buildHeader(min(memberCount, 31)));
-
-    PropagationTags datadogHeaderPT = factory().fromHeaderValue(HeaderType.DATADOG, "_dd.p.dm=-4");
-    PropagationTags headerPT = factory().fromHeaderValue(W3C, header);
-    datadogHeaderPT.updateW3CTracestate(headerPT.getW3CTracestate());
-
-    if (memberCount <= 32) {
-      assertEquals(expectedHeader, datadogHeaderPT.headerValue(W3C));
-    } else {
-      assertEquals("dd=t.dm:-4", datadogHeaderPT.headerValue(W3C));
+
+    @TableTest({
+      "scenario                          | headerValue              | expectedLastParentId | expectedHeaderValue    ",
+      "parent id                         | 'dd=p:b6241412414a'      | b6241412414a         | 'dd=p:b6241412414a'    ",
+      "parent id with trailing separator | 'dd=p:b6241412414a;'     | b6241412414a         | 'dd=p:b6241412414a'    ",
+      "sampling then parent id trailing  | 'dd=s:1;p:b6241412414a;' | b6241412414a         | 'dd=s:1;p:b6241412414a'",
+      "parent id trailing separator ws   | 'dd=p:b6241412414a;  '   | b6241412414a         | 'dd=p:b6241412414a'    "
+    })
+    void extractsLastParentIdWithTrailingSeparator(
+            String headerValue, String expectedLastParentId, String expectedHeaderValue) {
+        PropagationTags propagationTags = factory().fromHeaderValue(W3C, headerValue);
+
+        assertEquals(expectedLastParentId, propagationTags.getLastParentId().toString());
+        assertEquals(expectedHeaderValue, propagationTags.headerValue(W3C));
+    }
+
+    @TableTest({
+      "scenario             | headerValue                                                  | expectedHeaderValue                                | tags                                                     ",
+      "single dm            | 'dd=s:0;t.dm:934086a686-4'                                   | '_dd.p.dm=934086a686-4'                            | [_dd.p.dm: 934086a686-4]                                 ",
+      "dm and arbitrary t.f | 'other=whatever,dd=s:0;t.dm:934086a686-4;t.f:w00t~~'         | '_dd.p.dm=934086a686-4,_dd.p.f=w00t=='             | [_dd.p.dm: 934086a686-4, _dd.p.f: 'w00t==']              ",
+      "ts only              | 'dd=s:0;t.ts:02'                                             | '_dd.p.ts=02'                                      | [_dd.p.ts: 02]                                           ",
+      "ts zero              | 'dd=s:0;t.ts:00'                                             |                                                    | [:]                                                      ",
+      "ts too short         | 'dd=s:0;t.ts:0'                                              |                                                    | [:]                                                      ",
+      "ts invalid           | 'dd=s:0;t.ts:invalid'                                        |                                                    | [:]                                                      ",
+      "dm and t.f and ts    | 'other=whatever,dd=s:0;t.dm:934086a686-4;t.f:w00t~~;t.ts:02' | '_dd.p.dm=934086a686-4,_dd.p.ts=02,_dd.p.f=w00t==' | [_dd.p.dm: 934086a686-4, _dd.p.f: 'w00t==', _dd.p.ts: 02]",
+      "no dd                | 'some=thing,other=whatever'                                  |                                                    | [:]                                                      "
+    })
+    void w3cPropagationTagsShouldTranslateToDatadogTags(
+            String headerValue, String expectedHeaderValue, Map<String, String> tags) {
+        PropagationTags propagationTags = factory().fromHeaderValue(W3C, headerValue);
+
+        assertEquals(expectedHeaderValue, propagationTags.headerValue(HeaderType.DATADOG));
+        assertEquals(tags, propagationTags.createTagMap());
     }
-    assertEquals(singletonMap("_dd.p.dm", "-4"), datadogHeaderPT.createTagMap());
-  }
-
-  static IntStream memberCountArguments() {
-    return rangeClosed(1, 37);
-  }
-
-  @TableTest({
-    "scenario                                    | headerValue                                                            | expectedHeaderValue                                  | tags                                                        ",
-    "null                                        |                                                                        |                                                      | [:]                                                         ",
-    "empty                                       | ''                                                                     |                                                      | [:]                                                         ",
-    "dd only with dm                             | 'dd=s:0;t.dm:934086a686-4'                                             | 'dd=s:0;t.dm:934086a686-4'                           | [_dd.p.dm: 934086a686-4]                                    ",
-    "dd only with ts                             | 'dd=s:0;t.ts:02'                                                       | 'dd=s:0;t.ts:02'                                     | [_dd.p.ts: 02]                                              ",
-    "dd only with ts zero                        | 'dd=s:0;t.ts:00'                                                       | 'dd=s:0'                                             | [:]                                                         ",
-    "dd only with dm and ts                      | 'dd=s:0;t.dm:934086a686-4;t.ts:02'                                     | 'dd=s:0;t.dm:934086a686-4;t.ts:02'                   | [_dd.p.dm: 934086a686-4, _dd.p.ts: 02]                      ",
-    "other before dd                             | 'other=whatever,dd=s:0;t.dm:934086a686-4'                              | 'dd=s:0;t.dm:934086a686-4,other=whatever'            | [_dd.p.dm: 934086a686-4]                                    ",
-    "dd before other                             | 'dd=s:0;t.dm:934086a687-3,other=whatever'                              | 'dd=s:0;t.dm:934086a687-3,other=whatever'            | [_dd.p.dm: 934086a687-3]                                    ",
-    "some before dd before other                 | 'some=thing,dd=s:0;t.dm:934086a687-3,other=whatever'                   | 'dd=s:0;t.dm:934086a687-3,some=thing,other=whatever' | [_dd.p.dm: 934086a687-3]                                    ",
-    "no dd                                       | 'some=thing,other=whatever'                                            | 'some=thing,other=whatever'                          | [:]                                                         ",
-    "duplicate dd before ot                      | 'dd=s:1,dd=s:0,ot=rv:ef284ace7a91e1'                                   | 'dd=s:1,ot=rv:ef284ace7a91e1'                        | [:]                                                         ",
-    "dd offset before ot                         | 'first=value,dd=s:1,sec=value,dd=s:0,ot=rv:ef284ace7a91e1'             | 'dd=s:1,first=value,sec=value,ot=rv:ef284ace7a91e1'  | [:]                                                         ",
-    "dd after ot does not offset                 | 'first=value,ot=rv:ef284ace7a91e1,dd=s:1,sec=value'                    | 'dd=s:1,first=value,ot=rv:ef284ace7a91e1,sec=value'  | [:]                                                         ",
-    "dd with origin and dm                       | 'dd=s:0;o:some;t.dm:934086a686-4'                                      | 'dd=s:0;o:some;t.dm:934086a686-4'                    | [_dd.p.dm: 934086a686-4]                                    ",
-    "dd with unknown key                         | 'dd=s:0;x:unknown;t.dm:934086a686-4'                                   | 'dd=s:0;t.dm:934086a686-4;x:unknown'                 | [_dd.p.dm: 934086a686-4]                                    ",
-    "other before dd with unknown                | 'other=whatever,dd=s:0;x:unknown;t.dm:934086a686-4'                    | 'dd=s:0;t.dm:934086a686-4;x:unknown,other=whatever'  | [_dd.p.dm: 934086a686-4]                                    ",
-    "dd with xyz instead of s                    | 'other=whatever,dd=xyz:unknown;t.dm:934086a686-4'                      | 'dd=t.dm:934086a686-4;xyz:unknown,other=whatever'    | [_dd.p.dm: 934086a686-4]                                    ",
-    "dd with trailing whitespace                 | 'other=whatever,dd=t.dm:934086a686-4;xyz:unknown  '                    | 'dd=t.dm:934086a686-4;xyz:unknown,other=whatever'    | [_dd.p.dm: 934086a686-4]                                    ",
-    "ws and tabs around members                  | '\tsome=thing \t , dd=s:0;t.dm:934086a687-3\t\t,  other=whatever\t\t ' | 'dd=s:0;t.dm:934086a687-3,some=thing,other=whatever' | [_dd.p.dm: 934086a687-3]                                    ",
-    "dd with two t. tags                         | 'dd=s:0;t.a:b;t.x:y'                                                   | 'dd=s:0;t.a:b;t.x:y'                                 | [_dd.p.a: b, _dd.p.x: y]                                    ",
-    "dd with two t. tags trailing whitespace     | 'dd=s:0;t.a:b;t.x:y \t'                                                | 'dd=s:0;t.a:b;t.x:y'                                 | [_dd.p.a: b, _dd.p.x: y]                                    ",
-    "dd with two t. tags inner whitespace        | 'dd=s:0;t.a:b ;t.x:y \t'                                               | 'dd=s:0;t.a:b ;t.x:y'                                | ['_dd.p.a': 'b ', _dd.p.x: y]                               ",
-    "dd with two t. tags invalid whitespace      | 'dd=s:0;t.a:b \t;t.x:y \t'                                             |                                                      | [:]                                                         ",
-    "dd with tid                                 | 'dd=s:0;t.tid:123456789abcdef0'                                        | 'dd=s:0;t.tid:123456789abcdef0'                      | [_dd.p.tid: 123456789abcdef0]                               ",
-    "tid empty value                             | 'dd=t.tid:'                                                            |                                                      | [:]                                                         ",
-    "tid too short length 1                      | 'dd=t.tid:1'                                                           |                                                      | ['_dd.propagation_error': 'malformed_tid 1']                ",
-    "tid too short length 15                     | 'dd=t.tid:111111111111111'                                             |                                                      | ['_dd.propagation_error': 'malformed_tid 111111111111111']  ",
-    "tid too long length 17                      | 'dd=t.tid:11111111111111111'                                           |                                                      | ['_dd.propagation_error': 'malformed_tid 11111111111111111']",
-    "tid uppercase                               | 'dd=t.tid:123456789ABCDEF0'                                            |                                                      | ['_dd.propagation_error': 'malformed_tid 123456789ABCDEF0'] ",
-    "tid non-hex character                       | 'dd=t.tid:123456789abcdefg'                                            |                                                      | ['_dd.propagation_error': 'malformed_tid 123456789abcdefg'] ",
-    "tid negative                                | 'dd=t.tid:-123456789abcdef'                                            |                                                      | ['_dd.propagation_error': 'malformed_tid -123456789abcdef'] ",
-    "dd with trailing separator                  | 'dd=s:0;t.dm:934086a686-4;'                                            | 'dd=s:0;t.dm:934086a686-4'                           | [_dd.p.dm: 934086a686-4]                                    ",
-    "dd single tag trailing separator            | 'dd=t.dm:934086a686-4;'                                                | 'dd=t.dm:934086a686-4'                               | [_dd.p.dm: 934086a686-4]                                    ",
-    "dd before other trailing separator          | 'dd=s:0;t.dm:934086a687-3;,other=whatever'                             | 'dd=s:0;t.dm:934086a687-3,other=whatever'            | [_dd.p.dm: 934086a687-3]                                    ",
-    "dd trailing separator then ws               | 'dd=s:0;t.dm:934086a686-4;  '                                          | 'dd=s:0;t.dm:934086a686-4'                           | [_dd.p.dm: 934086a686-4]                                    ",
-    "dd trailing separator then tab              | 'dd=s:0;t.dm:934086a686-4;\t'                                          | 'dd=s:0;t.dm:934086a686-4'                           | [_dd.p.dm: 934086a686-4]                                    ",
-    "dd trailing separator ws then comma         | 'dd=s:0;t.dm:934086a687-3;  ,other=whatever'                           | 'dd=s:0;t.dm:934086a687-3,other=whatever'            | [_dd.p.dm: 934086a687-3]                                    ",
-    "unknown trailing separator                  | 'dd=x:y;'                                                              | 'dd=x:y'                                             | [:]                                                         ",
-    "unknown trailing separator then space       | 'dd=x:y; '                                                             | 'dd=x:y'                                             | [:]                                                         ",
-    "unknown trailing separator then tab         | 'dd=x:y;\t'                                                            | 'dd=x:y'                                             | [:]                                                         ",
-    "unknown two trailing separators             | 'dd=x:y;;'                                                             | 'dd=x:y'                                             | [:]                                                         ",
-    "unknown three trailing separators           | 'dd=x:y;;;'                                                            | 'dd=x:y'                                             | [:]                                                         ",
-    "leading empty element                       | 'dd=;x:y'                                                              | 'dd=x:y'                                             | [:]                                                         ",
-    "leading double empty element                | 'dd=;;x:y'                                                             | 'dd=x:y'                                             | [:]                                                         ",
-    "double separator between two unknowns       | 'dd=x:y;;z:w'                                                          | 'dd=x:y;z:w'                                         | [:]                                                         ",
-    "double separator between known tags         | 'dd=s:0;;t.dm:934086a686-4'                                            | 'dd=s:0;t.dm:934086a686-4'                           | [_dd.p.dm: 934086a686-4]                                    ",
-    "unknown then double sep then known tag      | 'dd=s:0;x:y;;t.dm:934086a686-4'                                        | 'dd=s:0;t.dm:934086a686-4;x:y'                       | [_dd.p.dm: 934086a686-4]                                    ",
-    "leading/interior/trailing empty elements    | 'dd=x:y;;;z:w;;'                                                       | 'dd=x:y;z:w'                                         | [:]                                                         ",
-    "only empty elements, no tags                | 'dd=;;;;'                                                              |                                                      | [:]                                                         ",
-    "only empty elements before other member     | 'other=whatever,dd=;;;;'                                               | 'other=whatever'                                     | [:]                                                         ",
-    "double sep then trailing space              | 'dd=x:y;; '                                                            | 'dd=x:y'                                             | [:]                                                         ",
-    "double sep then trailing tab                | 'dd=x:y;;\t'                                                           | 'dd=x:y'                                             | [:]                                                         ",
-    "triple sep then trailing space              | 'dd=x:y;;;  '                                                          | 'dd=x:y'                                             | [:]                                                         ",
-    "sep then ws then sep is empty element ws    | 'dd=x:y;  ;z:w'                                                        | 'dd=x:y;z:w'                                         | [:]                                                         ",
-    "2 seps then ws then sep is empty elem ws    | 'dd=x:y;;  ;z:w'                                                       | 'dd=x:y;z:w'                                         | [:]                                                         ",
-    "sampling unknown trailing sep then ws       | 'dd=s:0;x:y; '                                                         | 'dd=s:0;x:y'                                         | [:]                                                         ",
-    "sep then ws then sep is empty elem          | 'dd=s:0;  ;t.dm:934086a686-4'                                          | 'dd=s:0;t.dm:934086a686-4'                           | [_dd.p.dm: 934086a686-4]                                    ",
-    "dd interior ws between submembers           | 'dd=s:0;t.dm:934086a686-4;  t.x:y'                                     | 'dd=s:0;t.dm:934086a686-4;  t.x:y'                   | [_dd.p.dm: 934086a686-4]                                    ",
-    "dd interior single space submember          | 'dd=s:0; t.dm:934086a686-4'                                            | 'dd=s:0; t.dm:934086a686-4'                          | [:]                                                         ",
-    "sampling priority non-numeric dropped       | 'dd=s:abc;t.dm:934086a686-4'                                           | 'dd=t.dm:934086a686-4'                               | [_dd.p.dm: 934086a686-4]                                    ",
-    "sampling priority overflow dropped          | 'dd=s:99999999999;t.dm:934086a686-4'                                   | 'dd=t.dm:934086a686-4'                               | [_dd.p.dm: 934086a686-4]                                    ",
-    "sampling priority min int retained          | 'dd=s:-2147483648;t.dm:934086a686-4'                                   | 'dd=s:-2147483648;t.dm:934086a686-4'                 | [_dd.p.dm: 934086a686-4]                                    ",
-    "sampling priority leading plus              | 'dd=s:+5;t.dm:934086a686-4'                                            | 'dd=s:5;t.dm:934086a686-4'                           | [_dd.p.dm: 934086a686-4]                                    ",
-    "sampling priority lone minus dropped        | 'dd=s:-;t.dm:934086a686-4'                                             | 'dd=t.dm:934086a686-4'                               | [_dd.p.dm: 934086a686-4]                                    ",
-    "sampling priority empty value invalid       | 'dd=s:;t.dm:934086a686-4'                                              | 'dd=t.dm:934086a686-4'                               | [_dd.p.dm: 934086a686-4]                                    ",
-    "sampling priority ws only value dropped     | 'dd=s: ;t.dm:934086a686-4'                                             | 'dd=t.dm:934086a686-4'                               | [_dd.p.dm: 934086a686-4]                                    ",
-    "sampling priority just above max int        | 'dd=s:2147483648'                                                      |                                                      | [:]                                                         ",
-    "sampling priority just below min int        | 'dd=s:-2147483649'                                                     |                                                      | [:]                                                         ",
-    "bare element after known unknown            | 'dd=x:y;z'                                                             | 'dd=x:y;z'                                           | [:]                                                         ",
-    "bare element before known unknown           | 'dd=z;x:y'                                                             | 'dd=z;x:y'                                           | [:]                                                         ",
-    "bare element between known unknowns         | 'dd=x:y;z;a:b'                                                         | 'dd=x:y;z;a:b'                                       | [:]                                                         ",
-    "parent id not duplicated as unknown         | 'dd=p:b6241412414a;x:y'                                                | 'dd=p:b6241412414a;x:y'                              | [:]                                                         ",
-    "origin not duplicated as unknown            | 'dd=o:rum;x:y'                                                         | 'dd=o:rum;x:y'                                       | [:]                                                         ",
-    "sampling priority not duplicated as unknown | 'dd=s:1;x:y'                                                           | 'dd=s:1;x:y'                                         | [:]                                                         ",
-    "malformed element with leading space key    | 'dd=x:y; z:w'                                                          | 'dd=x:y; z:w'                                        | [:]                                                         ",
-    "malformed element with interior space key   | 'dd=x:y;a b:c'                                                         | 'dd=x:y;a b:c'                                       | [:]                                                         ",
-    "malformed element between known tags        | 'dd=s:1; z:w;o:rum'                                                    | 'dd=s:1;o:rum; z:w'                                  | [:]                                                         "
-  })
-  void createPropagationTagsFromHeaderValue(
-      String headerValue, String expectedHeaderValue, Map<String, String> tags) {
-    PropagationTags propagationTags = factory().fromHeaderValue(W3C, headerValue);
-
-    assertEquals(expectedHeaderValue, propagationTags.headerValue(W3C));
-    assertEquals(tags, propagationTags.createTagMap());
-  }
-
-  @TableTest({
-    "scenario                          | headerValue              | expectedLastParentId | expectedHeaderValue    ",
-    "parent id                         | 'dd=p:b6241412414a'      | b6241412414a         | 'dd=p:b6241412414a'    ",
-    "parent id with trailing separator | 'dd=p:b6241412414a;'     | b6241412414a         | 'dd=p:b6241412414a'    ",
-    "sampling then parent id trailing  | 'dd=s:1;p:b6241412414a;' | b6241412414a         | 'dd=s:1;p:b6241412414a'",
-    "parent id trailing separator ws   | 'dd=p:b6241412414a;  '   | b6241412414a         | 'dd=p:b6241412414a'    "
-  })
-  void extractsLastParentIdWithTrailingSeparator(
-      String headerValue, String expectedLastParentId, String expectedHeaderValue) {
-    PropagationTags propagationTags = factory().fromHeaderValue(W3C, headerValue);
-
-    assertEquals(expectedLastParentId, propagationTags.getLastParentId().toString());
-    assertEquals(expectedHeaderValue, propagationTags.headerValue(W3C));
-  }
-
-  @TableTest({
-    "scenario             | headerValue                                                  | expectedHeaderValue                                | tags                                                     ",
-    "single dm            | 'dd=s:0;t.dm:934086a686-4'                                   | '_dd.p.dm=934086a686-4'                            | [_dd.p.dm: 934086a686-4]                                 ",
-    "dm and arbitrary t.f | 'other=whatever,dd=s:0;t.dm:934086a686-4;t.f:w00t~~'         | '_dd.p.dm=934086a686-4,_dd.p.f=w00t=='             | [_dd.p.dm: 934086a686-4, _dd.p.f: 'w00t==']              ",
-    "ts only              | 'dd=s:0;t.ts:02'                                             | '_dd.p.ts=02'                                      | [_dd.p.ts: 02]                                           ",
-    "ts zero              | 'dd=s:0;t.ts:00'                                             |                                                    | [:]                                                      ",
-    "ts too short         | 'dd=s:0;t.ts:0'                                              |                                                    | [:]                                                      ",
-    "ts invalid           | 'dd=s:0;t.ts:invalid'                                        |                                                    | [:]                                                      ",
-    "dm and t.f and ts    | 'other=whatever,dd=s:0;t.dm:934086a686-4;t.f:w00t~~;t.ts:02' | '_dd.p.dm=934086a686-4,_dd.p.ts=02,_dd.p.f=w00t==' | [_dd.p.dm: 934086a686-4, _dd.p.f: 'w00t==', _dd.p.ts: 02]",
-    "no dd                | 'some=thing,other=whatever'                                  |                                                    | [:]                                                      "
-  })
-  void w3cPropagationTagsShouldTranslateToDatadogTags(
-      String headerValue, String expectedHeaderValue, Map<String, String> tags) {
-    PropagationTags propagationTags = factory().fromHeaderValue(W3C, headerValue);
-
-    assertEquals(expectedHeaderValue, propagationTags.headerValue(HeaderType.DATADOG));
-    assertEquals(tags, propagationTags.createTagMap());
-  }
-
-  @TableTest({
-    "scenario               | headerValue                       | priority     | mechanism                           | origin | expectedHeaderValue                | tags                    ",
-    "sampler keep default   | 'dd=s:0;o:some;t.dm:934086a686-4' | SAMPLER_KEEP | SamplingMechanism.DEFAULT           | other  | 'dd=s:0;o:other;t.dm:934086a686-4' | [_dd.p.dm: 934086a686-4]",
-    "user keep local rule   | 'dd=s:0;o:some;x:unknown'         | USER_KEEP    | SamplingMechanism.LOCAL_USER_RULE   | same   | 'dd=s:2;o:same;t.dm:-3;x:unknown'  | [_dd.p.dm: '-3']        ",
-    "user drop manual       | 'dd=s:0;o:some;x:unknown'         | USER_DROP    | SamplingMechanism.MANUAL            |        | 'dd=s:-1;x:unknown'                | [:]                     ",
-    "keep external override | 'dd=s:0;o:some;t.dm:934086a686-4' | SAMPLER_KEEP | SamplingMechanism.EXTERNAL_OVERRIDE | other  | 'dd=s:1;o:other;t.dm:-0'           | [_dd.p.dm: '-0']        ",
-    "drop external override | 'dd=s:1;o:some;t.dm:934086a686-4' | SAMPLER_DROP | SamplingMechanism.EXTERNAL_OVERRIDE | other  | 'dd=s:0;o:other'                   | [:]                     "
-  })
-  void propagationTagsShouldBeUpdatedBySamplingAndOrigin(
-      String headerValue,
-      @ConvertWith(PrioritySamplingConverter.class) byte priority,
-      @ConvertWith(SamplingMechanismConverter.class) byte mechanism,
-      String origin,
-      String expectedHeaderValue,
-      Map<String, String> tags) {
-    PropagationTags propagationTags = factory().fromHeaderValue(W3C, headerValue);
-
-    assertNotEquals(expectedHeaderValue, propagationTags.headerValue(W3C));
-
-    propagationTags.updateTraceSamplingPriority(priority, mechanism);
-    propagationTags.updateTraceOrigin(origin);
-
-    assertEquals(expectedHeaderValue, propagationTags.headerValue(W3C));
-    assertEquals(tags, propagationTags.createTagMap());
-  }
-
-  @TableTest({
-    "scenario        | headerValue            | product                | expectedHeaderValue    | tags          ",
-    "asm on unknown  | 'dd=x:unknown'         | ProductTraceSource.ASM | 'dd=t.ts:02;x:unknown' | [_dd.p.ts: 02]",
-    "dbm on existing | 'dd=t.ts:02;x:unknown' | ProductTraceSource.DBM | 'dd=t.ts:12;x:unknown' | [_dd.p.ts: 12]",
-    "asm on ts zero  | 'dd=t.ts:00'           | ProductTraceSource.ASM | 'dd=t.ts:02'           | [_dd.p.ts: 02]",
-    "asm on ts max   | 'dd=t.ts:FFC00000'     | ProductTraceSource.ASM | 'dd=t.ts:02'           | [_dd.p.ts: 02]"
-  })
-  void propagationTagsShouldBeUpdatedByProductTraceSourcePropagation(
-      String headerValue,
-      @ConvertWith(ProductTraceSourceConverter.class) int product,
-      String expectedHeaderValue,
-      Map<String, String> tags) {
-    PropagationTags propagationTags = factory().fromHeaderValue(W3C, headerValue);
-
-    assertNotEquals(expectedHeaderValue, propagationTags.headerValue(W3C));
-
-    propagationTags.addTraceSource(product);
-
-    assertEquals(expectedHeaderValue, propagationTags.headerValue(W3C));
-    assertEquals(tags, propagationTags.createTagMap());
-  }
-
-  private static String buildHeader(int memberCount) {
-    StringBuilder sb = new StringBuilder();
-    for (int i = 1; i <= memberCount; i++) {
-      if (sb.length() > 0) sb.append(',');
-      sb.append('k').append(i).append("=v").append(i);
+
+    @TableTest({
+      "scenario               | headerValue                       | priority     | mechanism                           | origin | expectedHeaderValue                | tags                    ",
+      "sampler keep default   | 'dd=s:0;o:some;t.dm:934086a686-4' | SAMPLER_KEEP | SamplingMechanism.DEFAULT           | other  | 'dd=s:0;o:other;t.dm:934086a686-4' | [_dd.p.dm: 934086a686-4]",
+      "user keep local rule   | 'dd=s:0;o:some;x:unknown'         | USER_KEEP    | SamplingMechanism.LOCAL_USER_RULE   | same   | 'dd=s:2;o:same;t.dm:-3;x:unknown'  | [_dd.p.dm: '-3']        ",
+      "user drop manual       | 'dd=s:0;o:some;x:unknown'         | USER_DROP    | SamplingMechanism.MANUAL            |        | 'dd=s:-1;x:unknown'                | [:]                     ",
+      "keep external override | 'dd=s:0;o:some;t.dm:934086a686-4' | SAMPLER_KEEP | SamplingMechanism.EXTERNAL_OVERRIDE | other  | 'dd=s:1;o:other;t.dm:-0'           | [_dd.p.dm: '-0']        ",
+      "drop external override | 'dd=s:1;o:some;t.dm:934086a686-4' | SAMPLER_DROP | SamplingMechanism.EXTERNAL_OVERRIDE | other  | 'dd=s:0;o:other'                   | [:]                     "
+    })
+    void propagationTagsShouldBeUpdatedBySamplingAndOrigin(
+            String headerValue,
+            @ConvertWith(PrioritySamplingConverter.class) byte priority,
+            @ConvertWith(SamplingMechanismConverter.class) byte mechanism,
+            String origin,
+            String expectedHeaderValue,
+            Map<String, String> tags) {
+        PropagationTags propagationTags = factory().fromHeaderValue(W3C, headerValue);
+
+        assertNotEquals(expectedHeaderValue, propagationTags.headerValue(W3C));
+
+        propagationTags.updateTraceSamplingPriority(priority, mechanism);
+        propagationTags.updateTraceOrigin(origin);
+
+        assertEquals(expectedHeaderValue, propagationTags.headerValue(W3C));
+        assertEquals(tags, propagationTags.createTagMap());
+    }
+
+    @TableTest({
+      "scenario        | headerValue            | product                | expectedHeaderValue    | tags          ",
+      "asm on unknown  | 'dd=x:unknown'         | ProductTraceSource.ASM | 'dd=t.ts:02;x:unknown' | [_dd.p.ts: 02]",
+      "dbm on existing | 'dd=t.ts:02;x:unknown' | ProductTraceSource.DBM | 'dd=t.ts:12;x:unknown' | [_dd.p.ts: 12]",
+      "asm on ts zero  | 'dd=t.ts:00'           | ProductTraceSource.ASM | 'dd=t.ts:02'           | [_dd.p.ts: 02]",
+      "asm on ts max   | 'dd=t.ts:FFC00000'     | ProductTraceSource.ASM | 'dd=t.ts:02'           | [_dd.p.ts: 02]"
+    })
+    void propagationTagsShouldBeUpdatedByProductTraceSourcePropagation(
+            String headerValue,
+            @ConvertWith(ProductTraceSourceConverter.class) int product,
+            String expectedHeaderValue,
+            Map<String, String> tags) {
+        PropagationTags propagationTags = factory().fromHeaderValue(W3C, headerValue);
+
+        assertNotEquals(expectedHeaderValue, propagationTags.headerValue(W3C));
+
+        propagationTags.addTraceSource(product);
+
+        assertEquals(expectedHeaderValue, propagationTags.headerValue(W3C));
+        assertEquals(tags, propagationTags.createTagMap());
+    }
+
+    private static String buildHeader(int memberCount) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 1; i <= memberCount; i++) {
+            if (sb.length() > 0) sb.append(',');
+            sb.append('k').append(i).append("=v").append(i);
+        }
+        return sb.toString();
+    }
+
+    private static String repeat(String s, int n) {
+        StringBuilder sb = new StringBuilder(s.length() * n);
+        for (int i = 0; i < n; i++) sb.append(s);
+        return sb.toString();
+    }
+
+    private static String toLowerCaseAlpha(String cs) {
+        char c = cs.charAt(0);
+        char a = 'a';
+        char z = 'z';
+        return String.valueOf((char) (a + (Math.abs(c - a) % (z - a))));
     }
-    return sb.toString();
-  }
-
-  private static String repeat(String s, int n) {
-    StringBuilder sb = new StringBuilder(s.length() * n);
-    for (int i = 0; i < n; i++) sb.append(s);
-    return sb.toString();
-  }
-
-  private static String toLowerCaseAlpha(String cs) {
-    char c = cs.charAt(0);
-    char a = 'a';
-    char z = 'z';
-    return String.valueOf((char) (a + (Math.abs(c - a) % (z - a))));
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpExtractorTest.java
index d7f0150d2d9..59daaa932a3 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpExtractorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpExtractorTest.java
@@ -31,67 +31,65 @@
 import org.tabletest.junit.TableTest;
 
 class XRayHttpExtractorTest extends AbstractHttpExtractorTest {
-  @Override
-  protected HttpCodec.Extractor newExtractor(
-      Config config, Supplier<TraceConfig> traceConfigSupplier) {
-    return XRayHttpCodec.newExtractor(config, traceConfigSupplier);
-  }
-
-  @Nested
-  class BaggageLimits extends AbstractOTBaggageTest {
     @Override
-    protected HttpCodec.Extractor extractor() {
-      return XRayHttpExtractorTest.this.extractor;
+    protected HttpCodec.Extractor newExtractor(Config config, Supplier<TraceConfig> traceConfigSupplier) {
+        return XRayHttpCodec.newExtractor(config, traceConfigSupplier);
     }
 
-    @Override
-    protected Map<String, String> baggageHeaders(List<Entry<String, String>> items) {
-      return headers(X_AMZN_TRACE_ID, traceHeader(items));
+    @Nested
+    class BaggageLimits extends AbstractOTBaggageTest {
+        @Override
+        protected HttpCodec.Extractor extractor() {
+            return XRayHttpExtractorTest.this.extractor;
+        }
+
+        @Override
+        protected Map<String, String> baggageHeaders(List<Entry<String, String>> items) {
+            return headers(X_AMZN_TRACE_ID, traceHeader(items));
+        }
     }
-  }
-
-  @Test
-  @WithConfig(key = TRACE_BAGGAGE_MAX_ITEMS, value = "3")
-  void extractTraceHeaderKeepsParsingContextAfterBaggageLimit() {
-    // reaching the baggage limit must not stop the header being parsed: the trace context segments
-    // can appear after the `key=value` segments that exhausted the limit
-    TagContext context =
-        this.extractor.extract(
-            headers(
-                X_AMZN_TRACE_ID,
-                traceHeader(generateBaggageItems(50)) + ";Parent=" + zeroPadId("2") + ";Sampled=1"),
-            stringValuesMap());
-
-    assertEquals(3, context.getBaggage().size());
-    assertEquals(zeroPadId("1"), context.getTraceId().toHexStringPadded(16));
-    assertEquals(zeroPadId("2"), DDSpanId.toHexStringPadded(context.getSpanId()));
-    assertEquals(SAMPLER_KEEP, context.getSamplingPriority());
-  }
-
-  private static String traceHeader(List<Entry<String, String>> baggage) {
-    // a single X-Amzn-Trace-Id header carries an arbitrary number of `key=value` segments, and can
-    // repeat a key outright
-    StringBuilder header = new StringBuilder("Root=1-00000000-00000000").append(zeroPadId("1"));
-    for (Entry<String, String> item : baggage) {
-      header.append(';').append(item.getKey()).append('=').append(item.getValue());
+
+    @Test
+    @WithConfig(key = TRACE_BAGGAGE_MAX_ITEMS, value = "3")
+    void extractTraceHeaderKeepsParsingContextAfterBaggageLimit() {
+        // reaching the baggage limit must not stop the header being parsed: the trace context segments
+        // can appear after the `key=value` segments that exhausted the limit
+        TagContext context = this.extractor.extract(
+                headers(
+                        X_AMZN_TRACE_ID,
+                        traceHeader(generateBaggageItems(50)) + ";Parent=" + zeroPadId("2") + ";Sampled=1"),
+                stringValuesMap());
+
+        assertEquals(3, context.getBaggage().size());
+        assertEquals(zeroPadId("1"), context.getTraceId().toHexStringPadded(16));
+        assertEquals(zeroPadId("2"), DDSpanId.toHexStringPadded(context.getSpanId()));
+        assertEquals(SAMPLER_KEEP, context.getSamplingPriority());
+    }
+
+    private static String traceHeader(List<Entry<String, String>> baggage) {
+        // a single X-Amzn-Trace-Id header carries an arbitrary number of `key=value` segments, and can
+        // repeat a key outright
+        StringBuilder header = new StringBuilder("Root=1-00000000-00000000").append(zeroPadId("1"));
+        for (Entry<String, String> item : baggage) {
+            header.append(';').append(item.getKey()).append('=').append(item.getValue());
+        }
+        return header.toString();
     }
-    return header.toString();
-  }
-
-  @TableTest({
-    "scenario    | traceId          | spanId           | samplingPriority | expectedSamplingPriority",
-    "no sampling | 1                | 2                | ''               | UNSET                   ",
-    "sampled 1   | 2                | 3                | ';Sampled=1'     | SAMPLER_KEEP            ",
-    "sampled 0   | 3                | 4                | ';Sampled=0'     | SAMPLER_DROP            ",
-    "max trace   | ffffffffffffffff | fffffffffffffffe | ';Sampled=0'     | SAMPLER_DROP            ",
-    "max span    | fffffffffffffffe | ffffffffffffffff | ';Sampled=1'     | SAMPLER_KEEP            "
-  })
-  void extractHttpHeaders(
-      String traceId,
-      String spanId,
-      String samplingPriority,
-      @ConvertWith(PrioritySamplingConverter.class) byte expectedSamplingPriority) {
-    // spotless:off
+
+    @TableTest({
+      "scenario    | traceId          | spanId           | samplingPriority | expectedSamplingPriority",
+      "no sampling | 1                | 2                | ''               | UNSET                   ",
+      "sampled 1   | 2                | 3                | ';Sampled=1'     | SAMPLER_KEEP            ",
+      "sampled 0   | 3                | 4                | ';Sampled=0'     | SAMPLER_DROP            ",
+      "max trace   | ffffffffffffffff | fffffffffffffffe | ';Sampled=0'     | SAMPLER_DROP            ",
+      "max span    | fffffffffffffffe | ffffffffffffffff | ';Sampled=1'     | SAMPLER_KEEP            "
+    })
+    void extractHttpHeaders(
+            String traceId,
+            String spanId,
+            String samplingPriority,
+            @ConvertWith(PrioritySamplingConverter.class) byte expectedSamplingPriority) {
+        // spotless:off
     Map<String, String> headers = headers(
         X_AMZN_TRACE_ID, "Root=1-00000000-00000000"
             + zeroPadId(traceId)
@@ -105,137 +103,130 @@ void extractHttpHeaders(
     );
     // spotless:on
 
-    ExtractedContext context =
-        (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
-
-    assertEquals(DDTraceId.fromHex(traceId), context.getTraceId());
-    assertEquals(DDSpanId.fromHex(spanId), context.getSpanId());
-    Map<String, String> expectedBaggage = new HashMap<>();
-    expectedBaggage.put("empty value", "");
-    expectedBaggage.put("some-baggage", "my-interesting-baggage-info");
-    expectedBaggage.put("some-CaseSensitive-baggage", "my-interesting-baggage-info-2");
-    assertEquals(expectedBaggage, context.getBaggage());
-    assertEquals(singletonMap("some-tag", "my-interesting-info"), context.getTags());
-    assertEquals(expectedSamplingPriority, context.getSamplingPriority());
-    assertNull(context.getOrigin());
-  }
-
-  @Test
-  void extractHeaderTagsWithNoPropagation() {
-    Map<String, String> headers = headers(SOME_HEADER, "my-interesting-info");
-
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    assertFalse(context instanceof ExtractedContext);
-    assertEquals(singletonMap("some-tag", "my-interesting-info"), context.getTags());
-  }
-
-  @Test
-  void extractTraceHeaderAlsoCapturesMappedHeaderTag() {
-    // the trace header is consumed as X-Ray context, and must also honour a header tag mapped onto
-    // it without that costing the extracted ids
-    this.extractor.cleanup();
-    DynamicConfig<DynamicConfig.Snapshot> dynamicConfig =
-        DynamicConfig.create().setHeaderTags(singletonMap(X_AMZN_TRACE_ID, SOME_TAG)).apply();
-    this.extractor = XRayHttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig);
-
-    String traceHeader = "Root=1-00000000-00000000" + zeroPadId("1") + ";Parent=" + zeroPadId("2");
-
-    TagContext context =
-        this.extractor.extract(headers(X_AMZN_TRACE_ID, traceHeader), stringValuesMap());
-
-    assertEquals(traceHeader, context.getTags().getString(SOME_TAG));
-    assertEquals(zeroPadId("1"), context.getTraceId().toHexStringPadded(16));
-    assertEquals(zeroPadId("2"), DDSpanId.toHexStringPadded(context.getSpanId()));
-  }
-
-  @Test
-  void noContextWithInvalidNonNumericId() {
-    // spotless:off
+        ExtractedContext context = (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
+
+        assertEquals(DDTraceId.fromHex(traceId), context.getTraceId());
+        assertEquals(DDSpanId.fromHex(spanId), context.getSpanId());
+        Map<String, String> expectedBaggage = new HashMap<>();
+        expectedBaggage.put("empty value", "");
+        expectedBaggage.put("some-baggage", "my-interesting-baggage-info");
+        expectedBaggage.put("some-CaseSensitive-baggage", "my-interesting-baggage-info-2");
+        assertEquals(expectedBaggage, context.getBaggage());
+        assertEquals(singletonMap("some-tag", "my-interesting-info"), context.getTags());
+        assertEquals(expectedSamplingPriority, context.getSamplingPriority());
+        assertNull(context.getOrigin());
+    }
+
+    @Test
+    void extractHeaderTagsWithNoPropagation() {
+        Map<String, String> headers = headers(SOME_HEADER, "my-interesting-info");
+
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        assertFalse(context instanceof ExtractedContext);
+        assertEquals(singletonMap("some-tag", "my-interesting-info"), context.getTags());
+    }
+
+    @Test
+    void extractTraceHeaderAlsoCapturesMappedHeaderTag() {
+        // the trace header is consumed as X-Ray context, and must also honour a header tag mapped onto
+        // it without that costing the extracted ids
+        this.extractor.cleanup();
+        DynamicConfig<DynamicConfig.Snapshot> dynamicConfig = DynamicConfig.create()
+                .setHeaderTags(singletonMap(X_AMZN_TRACE_ID, SOME_TAG))
+                .apply();
+        this.extractor = XRayHttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig);
+
+        String traceHeader = "Root=1-00000000-00000000" + zeroPadId("1") + ";Parent=" + zeroPadId("2");
+
+        TagContext context = this.extractor.extract(headers(X_AMZN_TRACE_ID, traceHeader), stringValuesMap());
+
+        assertEquals(traceHeader, context.getTags().getString(SOME_TAG));
+        assertEquals(zeroPadId("1"), context.getTraceId().toHexStringPadded(16));
+        assertEquals(zeroPadId("2"), DDSpanId.toHexStringPadded(context.getSpanId()));
+    }
+
+    @Test
+    void noContextWithInvalidNonNumericId() {
+        // spotless:off
     Map<String, String> headers = headers(
         "x-amzn-trace-Id", "Root=1-00000000-00000000000000000traceId;Parent=0000000000spanId",
         SOME_HEADER, "my-interesting-info"
     );
     // spotless:on
 
-    TagContext context = this.extractor.extract(headers, stringValuesMap());
-
-    assertNull(context);
-  }
-
-  @Test
-  void noContextWithTooLargeTraceId() {
-    Map<String, String> headers =
-        headers(
-            X_AMZN_TRACE_ID, "Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8");
-
-    TagContext context = extractor.extract(headers, stringValuesMap());
-
-    assertNull(context);
-  }
-
-  @Test
-  void extractHttpHeadersWithNonZeroEpoch() {
-    Map<String, String> headers =
-        headers(
-            X_AMZN_TRACE_ID, "Root=1-5759e988-00000000e1be46a994272793;Parent=53995c3f42cd8ad8");
-
-    TagContext context = extractor.extract(headers, stringValuesMap());
-
-    assertEquals(DDTraceId.fromHex("e1be46a994272793"), context.getTraceId());
-    assertEquals(DDSpanId.fromHex("53995c3f42cd8ad8"), context.getSpanId());
-    assertNull(context.getOrigin());
-  }
-
-  @TableTest({
-    "scenario   | traceId          | spanId           | expectedTraceIdHex | expectedSpanId     ",
-    "short ids  | 00001            | 00001            | 0000000000000001   | 1                  ",
-    "long ids   | 463ac35c9f6413ad | 463ac35c9f6413ad | 463ac35c9f6413ad   | 5060571933882717101",
-    "long trace | 48485a3953bb6124 | 1                | 48485a3953bb6124   | 1                  ",
-    "max trace  | ffffffffffffffff | 1                | ffffffffffffffff   | 1                  ",
-    "max span   | 1                | ffffffffffffffff | 0000000000000001   | -1                 "
-  })
-  void extractIdsWhileRetainingTheOriginalString(
-      String traceId, String spanId, String expectedTraceIdHex, long expectedSpanId) {
-    Map<String, String> headers =
-        headers(
-            X_AMZN_TRACE_ID,
-            "Root=1-00000000-00000000" + zeroPadId(traceId) + ";Parent=" + zeroPadId(spanId));
-
-    ExtractedContext context = (ExtractedContext) extractor.extract(headers, stringValuesMap());
-
-    assertEquals(DDTraceId.fromHex(expectedTraceIdHex), context.getTraceId());
-    assertEquals(zeroPadId(traceId), context.getTraceId().toHexStringPadded(16));
-    assertEquals(expectedSpanId, context.getSpanId());
-    assertEquals(zeroPadId(spanId), DDSpanId.toHexStringPadded(context.getSpanId()));
-  }
-
-  @TableTest({
-    "scenario | traceId | spanId | endToEndStartTime",
-    "zero     | 1       | 2      | 0                ",
-    "non-zero | 2       | 3      | 1610001234       "
-  })
-  void extractHeadersWithEndToEnd(String traceId, String spanId, long endToEndStartTime) {
-    Map<String, String> headers =
-        headers(
-            X_AMZN_TRACE_ID,
-            "Root=1-00000000-00000000"
-                + zeroPadId(traceId)
-                + ";Parent="
-                + zeroPadId(spanId)
-                + ";k1=v1;t0="
-                + endToEndStartTime
-                + ";k2=v2");
-
-    ExtractedContext context =
-        (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
-
-    assertEquals(DDTraceId.from(traceId), context.getTraceId());
-    assertEquals(DDSpanId.from(spanId), context.getSpanId());
-    Map<String, String> expectedBaggage = new HashMap<>();
-    expectedBaggage.put("k1", "v1");
-    expectedBaggage.put("k2", "v2");
-    assertEquals(expectedBaggage, context.getBaggage());
-    assertEquals(endToEndStartTime * 1_000_000L, context.getEndToEndStartTime());
-  }
+        TagContext context = this.extractor.extract(headers, stringValuesMap());
+
+        assertNull(context);
+    }
+
+    @Test
+    void noContextWithTooLargeTraceId() {
+        Map<String, String> headers =
+                headers(X_AMZN_TRACE_ID, "Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8");
+
+        TagContext context = extractor.extract(headers, stringValuesMap());
+
+        assertNull(context);
+    }
+
+    @Test
+    void extractHttpHeadersWithNonZeroEpoch() {
+        Map<String, String> headers =
+                headers(X_AMZN_TRACE_ID, "Root=1-5759e988-00000000e1be46a994272793;Parent=53995c3f42cd8ad8");
+
+        TagContext context = extractor.extract(headers, stringValuesMap());
+
+        assertEquals(DDTraceId.fromHex("e1be46a994272793"), context.getTraceId());
+        assertEquals(DDSpanId.fromHex("53995c3f42cd8ad8"), context.getSpanId());
+        assertNull(context.getOrigin());
+    }
+
+    @TableTest({
+      "scenario   | traceId          | spanId           | expectedTraceIdHex | expectedSpanId     ",
+      "short ids  | 00001            | 00001            | 0000000000000001   | 1                  ",
+      "long ids   | 463ac35c9f6413ad | 463ac35c9f6413ad | 463ac35c9f6413ad   | 5060571933882717101",
+      "long trace | 48485a3953bb6124 | 1                | 48485a3953bb6124   | 1                  ",
+      "max trace  | ffffffffffffffff | 1                | ffffffffffffffff   | 1                  ",
+      "max span   | 1                | ffffffffffffffff | 0000000000000001   | -1                 "
+    })
+    void extractIdsWhileRetainingTheOriginalString(
+            String traceId, String spanId, String expectedTraceIdHex, long expectedSpanId) {
+        Map<String, String> headers = headers(
+                X_AMZN_TRACE_ID, "Root=1-00000000-00000000" + zeroPadId(traceId) + ";Parent=" + zeroPadId(spanId));
+
+        ExtractedContext context = (ExtractedContext) extractor.extract(headers, stringValuesMap());
+
+        assertEquals(DDTraceId.fromHex(expectedTraceIdHex), context.getTraceId());
+        assertEquals(zeroPadId(traceId), context.getTraceId().toHexStringPadded(16));
+        assertEquals(expectedSpanId, context.getSpanId());
+        assertEquals(zeroPadId(spanId), DDSpanId.toHexStringPadded(context.getSpanId()));
+    }
+
+    @TableTest({
+      "scenario | traceId | spanId | endToEndStartTime",
+      "zero     | 1       | 2      | 0                ",
+      "non-zero | 2       | 3      | 1610001234       "
+    })
+    void extractHeadersWithEndToEnd(String traceId, String spanId, long endToEndStartTime) {
+        Map<String, String> headers = headers(
+                X_AMZN_TRACE_ID,
+                "Root=1-00000000-00000000"
+                        + zeroPadId(traceId)
+                        + ";Parent="
+                        + zeroPadId(spanId)
+                        + ";k1=v1;t0="
+                        + endToEndStartTime
+                        + ";k2=v2");
+
+        ExtractedContext context = (ExtractedContext) this.extractor.extract(headers, stringValuesMap());
+
+        assertEquals(DDTraceId.from(traceId), context.getTraceId());
+        assertEquals(DDSpanId.from(spanId), context.getSpanId());
+        Map<String, String> expectedBaggage = new HashMap<>();
+        expectedBaggage.put("k1", "v1");
+        expectedBaggage.put("k2", "v2");
+        assertEquals(expectedBaggage, context.getBaggage());
+        assertEquals(endToEndStartTime * 1_000_000L, context.getEndToEndStartTime());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpInjectorTest.java
index 2c88f9e10fe..2f0371985d5 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpInjectorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpInjectorTest.java
@@ -30,101 +30,100 @@
 
 class XRayHttpInjectorTest extends AbstractHttpInjectorTest {
 
-  @Override
-  protected CoreTracerBuilder tracerBuilder() {
-    TimeSource timeSource = mock(TimeSource.class);
-    when(timeSource.getCurrentTimeMillis()).thenReturn(1_664_906_869_196L);
-    when(timeSource.getCurrentTimeNanos()).thenReturn(1_664_906_869_196_787_813L);
-    when(timeSource.getNanoTicks()).thenReturn(1_664_906_869_196L);
-    return super.tracerBuilder()
-        .dataStreamsMonitoring(mock(DataStreamsMonitoring.class))
-        .timeSource(timeSource);
-  }
+    @Override
+    protected CoreTracerBuilder tracerBuilder() {
+        TimeSource timeSource = mock(TimeSource.class);
+        when(timeSource.getCurrentTimeMillis()).thenReturn(1_664_906_869_196L);
+        when(timeSource.getCurrentTimeNanos()).thenReturn(1_664_906_869_196_787_813L);
+        when(timeSource.getNanoTicks()).thenReturn(1_664_906_869_196L);
+        return super.tracerBuilder()
+                .dataStreamsMonitoring(mock(DataStreamsMonitoring.class))
+                .timeSource(timeSource);
+    }
 
-  @Override
-  protected HttpCodec.Injector newInjector() {
-    return XRayHttpCodec.newInjector(singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER"));
-  }
+    @Override
+    protected HttpCodec.Injector newInjector() {
+        return XRayHttpCodec.newInjector(singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER"));
+    }
 
-  @TableTest({
-    "scenario         | traceId | spanId | samplingPriority | expectedTraceHeader                                                                                                                 ",
-    "unset 1->2       | 1       | 2      | UNSET            | 'Root=1-633c7675-000000000000000000000001;Parent=0000000000000002;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'          ",
-    "keep 2->3        | 2       | 3      | SAMPLER_KEEP     | 'Root=1-633c7675-000000000000000000000002;Parent=0000000000000003;Sampled=1;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
-    "drop 4->5        | 4       | 5      | SAMPLER_DROP     | 'Root=1-633c7675-000000000000000000000004;Parent=0000000000000005;Sampled=0;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
-    "user keep 5->6   | 5       | 6      | USER_KEEP        | 'Root=1-633c7675-000000000000000000000005;Parent=0000000000000006;Sampled=1;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
-    "user drop 6->7   | 6       | 7      | USER_DROP        | 'Root=1-633c7675-000000000000000000000006;Parent=0000000000000007;Sampled=0;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
-    "unset max->max-1 | MAX     | MAX-1  | UNSET            | 'Root=1-633c7675-00000000ffffffffffffffff;Parent=fffffffffffffffe;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'          ",
-    "keep max-1->max  | MAX-1   | MAX    | SAMPLER_KEEP     | 'Root=1-633c7675-00000000fffffffffffffffe;Parent=ffffffffffffffff;Sampled=1;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'"
-  })
-  void injectHttpHeaders(
-      @ConvertWith(TraceIdConverter.class) String traceId,
-      @ConvertWith(TraceIdConverter.class) String spanId,
-      @ConvertWith(PrioritySamplingConverter.class) byte samplingPriority,
-      String expectedTraceHeader) {
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("k", "v");
-    baggage.put("some-baggage-key", "some-value");
-    DDSpanContext spanContext =
-        createContext(DDTraceId.from(traceId), DDSpanId.from(spanId), samplingPriority, baggage);
-    Map<String, String> carrier = new HashMap<>();
+    @TableTest({
+      "scenario         | traceId | spanId | samplingPriority | expectedTraceHeader                                                                                                                 ",
+      "unset 1->2       | 1       | 2      | UNSET            | 'Root=1-633c7675-000000000000000000000001;Parent=0000000000000002;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'          ",
+      "keep 2->3        | 2       | 3      | SAMPLER_KEEP     | 'Root=1-633c7675-000000000000000000000002;Parent=0000000000000003;Sampled=1;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
+      "drop 4->5        | 4       | 5      | SAMPLER_DROP     | 'Root=1-633c7675-000000000000000000000004;Parent=0000000000000005;Sampled=0;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
+      "user keep 5->6   | 5       | 6      | USER_KEEP        | 'Root=1-633c7675-000000000000000000000005;Parent=0000000000000006;Sampled=1;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
+      "user drop 6->7   | 6       | 7      | USER_DROP        | 'Root=1-633c7675-000000000000000000000006;Parent=0000000000000007;Sampled=0;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
+      "unset max->max-1 | MAX     | MAX-1  | UNSET            | 'Root=1-633c7675-00000000ffffffffffffffff;Parent=fffffffffffffffe;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'          ",
+      "keep max-1->max  | MAX-1   | MAX    | SAMPLER_KEEP     | 'Root=1-633c7675-00000000fffffffffffffffe;Parent=ffffffffffffffff;Sampled=1;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'"
+    })
+    void injectHttpHeaders(
+            @ConvertWith(TraceIdConverter.class) String traceId,
+            @ConvertWith(TraceIdConverter.class) String spanId,
+            @ConvertWith(PrioritySamplingConverter.class) byte samplingPriority,
+            String expectedTraceHeader) {
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("k", "v");
+        baggage.put("some-baggage-key", "some-value");
+        DDSpanContext spanContext =
+                createContext(DDTraceId.from(traceId), DDSpanId.from(spanId), samplingPriority, baggage);
+        Map<String, String> carrier = new HashMap<>();
 
-    this.injector.inject(spanContext, carrier, Map::put);
+        this.injector.inject(spanContext, carrier, Map::put);
 
-    assertEquals(1, carrier.size());
-    assertEquals(expectedTraceHeader, carrier.get(X_AMZN_TRACE_ID));
-  }
+        assertEquals(1, carrier.size());
+        assertEquals(expectedTraceHeader, carrier.get(X_AMZN_TRACE_ID));
+    }
 
-  @TableTest({
-    "scenario       | traceId          | spanId           | expectedTraceHeader                                                                                                       ",
-    "short ids      | 00001            | 00001            | 'Root=1-633c7675-000000000000000000000001;Parent=0000000000000001;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
-    "long ids same  | 463ac35c9f6413ad | 463ac35c9f6413ad | 'Root=1-633c7675-00000000463ac35c9f6413ad;Parent=463ac35c9f6413ad;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
-    "long trace     | 48485a3953bb6124 | 1                | 'Root=1-633c7675-0000000048485a3953bb6124;Parent=0000000000000001;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
-    "max trace id   | ffffffffffffffff | 1                | 'Root=1-633c7675-00000000ffffffffffffffff;Parent=0000000000000001;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
-    "mixed trace id | aaaaaaaaffffffff | 1                | 'Root=1-633c7675-00000000aaaaaaaaffffffff;Parent=0000000000000001;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
-    "max span id    | 1                | ffffffffffffffff | 'Root=1-633c7675-000000000000000000000001;Parent=ffffffffffffffff;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'"
-  })
-  void injectHttpHeadersWithExtractedOriginal(
-      String traceId, String spanId, String expectedTraceHeader) {
-    // spotless:off
+    @TableTest({
+      "scenario       | traceId          | spanId           | expectedTraceHeader                                                                                                       ",
+      "short ids      | 00001            | 00001            | 'Root=1-633c7675-000000000000000000000001;Parent=0000000000000001;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
+      "long ids same  | 463ac35c9f6413ad | 463ac35c9f6413ad | 'Root=1-633c7675-00000000463ac35c9f6413ad;Parent=463ac35c9f6413ad;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
+      "long trace     | 48485a3953bb6124 | 1                | 'Root=1-633c7675-0000000048485a3953bb6124;Parent=0000000000000001;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
+      "max trace id   | ffffffffffffffff | 1                | 'Root=1-633c7675-00000000ffffffffffffffff;Parent=0000000000000001;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
+      "mixed trace id | aaaaaaaaffffffff | 1                | 'Root=1-633c7675-00000000aaaaaaaaffffffff;Parent=0000000000000001;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'",
+      "max span id    | 1                | ffffffffffffffff | 'Root=1-633c7675-000000000000000000000001;Parent=ffffffffffffffff;_dd.origin=fakeOrigin;SOME_CUSTOM_HEADER=some-value;k=v'"
+    })
+    void injectHttpHeadersWithExtractedOriginal(String traceId, String spanId, String expectedTraceHeader) {
+        // spotless:off
     Map<String, String> headers = headers(
         X_AMZN_TRACE_ID,  "Root=1-00000000-00000000" + zeroPadId(traceId) + ";Parent=" + zeroPadId(spanId)
     );
     // spotless:on
-    DynamicConfig<DynamicConfig.Snapshot> dynamicConfig =
-        DynamicConfig.create().setHeaderTags(emptyMap()).setBaggageMapping(emptyMap()).apply();
-    HttpCodec.Extractor extractor =
-        XRayHttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig);
-    TagContext context = extractor.extract(headers, stringValuesMap());
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("k", "v");
-    baggage.put("some-baggage-key", "some-value");
-    DDSpanContext spanContext =
-        createContext(context.getTraceId(), context.getSpanId(), UNSET, baggage);
-    Map<String, String> carrier = new HashMap<>();
+        DynamicConfig<DynamicConfig.Snapshot> dynamicConfig = DynamicConfig.create()
+                .setHeaderTags(emptyMap())
+                .setBaggageMapping(emptyMap())
+                .apply();
+        HttpCodec.Extractor extractor = XRayHttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig);
+        TagContext context = extractor.extract(headers, stringValuesMap());
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("k", "v");
+        baggage.put("some-baggage-key", "some-value");
+        DDSpanContext spanContext = createContext(context.getTraceId(), context.getSpanId(), UNSET, baggage);
+        Map<String, String> carrier = new HashMap<>();
 
-    this.injector.inject(spanContext, carrier, Map::put);
+        this.injector.inject(spanContext, carrier, Map::put);
 
-    assertEquals(1, carrier.size());
-    assertEquals(expectedTraceHeader, carrier.get(X_AMZN_TRACE_ID));
-  }
+        assertEquals(1, carrier.size());
+        assertEquals(expectedTraceHeader, carrier.get(X_AMZN_TRACE_ID));
+    }
 
-  @Test
-  void injectHttpHeadersWithEndToEnd() {
-    DDSpanContext spanContext =
-        createContext(DDTraceId.from("1"), DDSpanId.from("2"), UNSET, singletonMap("k", "v"));
-    spanContext.beginEndToEnd();
-    Map<String, String> carrier = new HashMap<>();
+    @Test
+    void injectHttpHeadersWithEndToEnd() {
+        DDSpanContext spanContext =
+                createContext(DDTraceId.from("1"), DDSpanId.from("2"), UNSET, singletonMap("k", "v"));
+        spanContext.beginEndToEnd();
+        Map<String, String> carrier = new HashMap<>();
 
-    this.injector.inject(spanContext, carrier, Map::put);
+        this.injector.inject(spanContext, carrier, Map::put);
 
-    String expectedTraceHeader =
-        "Root=1-633c7675-000000000000000000000001;Parent=0000000000000002;_dd.origin=fakeOrigin;t0=1664906869196;k=v";
-    assertEquals(1, carrier.size());
-    assertEquals(expectedTraceHeader, carrier.get(X_AMZN_TRACE_ID));
-  }
+        String expectedTraceHeader =
+                "Root=1-633c7675-000000000000000000000001;Parent=0000000000000002;_dd.origin=fakeOrigin;t0=1664906869196;k=v";
+        assertEquals(1, carrier.size());
+        assertEquals(expectedTraceHeader, carrier.get(X_AMZN_TRACE_ID));
+    }
 
-  private DDSpanContext createContext(
-      DDTraceId traceId, long spanId, int samplingPriority, Map<String, String> baggage) {
-    return mockSpanContext(traceId, spanId, samplingPriority, "fakeOrigin", baggage, null);
-  }
+    private DDSpanContext createContext(
+            DDTraceId traceId, long spanId, int samplingPriority, Map<String, String> baggage) {
+        return mockSpanContext(traceId, spanId, samplingPriority, "fakeOrigin", baggage, null);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayTestHelper.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayTestHelper.java
index d8325552f43..51b166a50c7 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayTestHelper.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayTestHelper.java
@@ -1,15 +1,15 @@
 package datadog.trace.core.propagation;
 
 public class XRayTestHelper {
-  static String zeroPadId(String s) {
-    if (s.length() >= 16) {
-      return s;
+    static String zeroPadId(String s) {
+        if (s.length() >= 16) {
+            return s;
+        }
+        StringBuilder sb = new StringBuilder(16);
+        for (int i = 0; i < 16 - s.length(); i++) {
+            sb.append('0');
+        }
+        sb.append(s);
+        return sb.toString();
     }
-    StringBuilder sb = new StringBuilder(16);
-    for (int i = 0; i < 16 - s.length(); i++) {
-      sb.append('0');
-    }
-    sb.append(s);
-    return sb.toString();
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/opg/OpmStampingInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/opg/OpmStampingInjectorTest.java
index a614cc43783..5de3b329acb 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/opg/OpmStampingInjectorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/opg/OpmStampingInjectorTest.java
@@ -20,91 +20,91 @@
 
 @DisplayName("OpmStampingInjector")
 class OpmStampingInjectorTest {
-  @Test
-  @DisplayName("stamps the local OPM into PropagationTags before delegating")
-  void stampsLocalOpm() {
-    PropagationTags.Factory factory = PropagationTags.factory();
-    PropagationTags tags = factory.fromHeaderValue(W3C, "");
+    @Test
+    @DisplayName("stamps the local OPM into PropagationTags before delegating")
+    void stampsLocalOpm() {
+        PropagationTags.Factory factory = PropagationTags.factory();
+        PropagationTags tags = factory.fromHeaderValue(W3C, "");
 
-    DDSpanContext ctx = mock(DDSpanContext.class);
-    when(ctx.getPropagationTags()).thenReturn(tags);
+        DDSpanContext ctx = mock(DDSpanContext.class);
+        when(ctx.getPropagationTags()).thenReturn(tags);
 
-    HttpCodec.Injector delegate = new NoopInjector();
-    Supplier<String> supplier = () -> "local-opm-1";
-    OpmStampingInjector wrapped = new OpmStampingInjector(delegate, supplier);
+        HttpCodec.Injector delegate = new NoopInjector();
+        Supplier<String> supplier = () -> "local-opm-1";
+        OpmStampingInjector wrapped = new OpmStampingInjector(delegate, supplier);
 
-    Map<String, String> carrier = new HashMap<>();
-    wrapped.inject(ctx, carrier, Map::put);
+        Map<String, String> carrier = new HashMap<>();
+        wrapped.inject(ctx, carrier, Map::put);
 
-    assertNotNull(tags.getOrgPropagationMarker());
-    assertEquals("local-opm-1", tags.getOrgPropagationMarker().toString());
-  }
+        assertNotNull(tags.getOrgPropagationMarker());
+        assertEquals("local-opm-1", tags.getOrgPropagationMarker().toString());
+    }
 
-  @Test
-  @DisplayName("with null supplier value, leaves PropagationTags untouched")
-  void supplierNullLeavesTagsUntouched() {
-    PropagationTags.Factory factory = PropagationTags.factory();
-    PropagationTags tags = factory.fromHeaderValue(DATADOG, "_dd.p.opm=upstream-abc");
+    @Test
+    @DisplayName("with null supplier value, leaves PropagationTags untouched")
+    void supplierNullLeavesTagsUntouched() {
+        PropagationTags.Factory factory = PropagationTags.factory();
+        PropagationTags tags = factory.fromHeaderValue(DATADOG, "_dd.p.opm=upstream-abc");
 
-    DDSpanContext ctx = mock(DDSpanContext.class);
-    when(ctx.getPropagationTags()).thenReturn(tags);
+        DDSpanContext ctx = mock(DDSpanContext.class);
+        when(ctx.getPropagationTags()).thenReturn(tags);
 
-    HttpCodec.Injector delegate = new NoopInjector();
-    OpmStampingInjector wrapped = new OpmStampingInjector(delegate, () -> null);
+        HttpCodec.Injector delegate = new NoopInjector();
+        OpmStampingInjector wrapped = new OpmStampingInjector(delegate, () -> null);
 
-    Map<String, String> carrier = new HashMap<>();
-    wrapped.inject(ctx, carrier, Map::put);
+        Map<String, String> carrier = new HashMap<>();
+        wrapped.inject(ctx, carrier, Map::put);
 
-    assertNotNull(tags.getOrgPropagationMarker());
-    assertEquals("upstream-abc", tags.getOrgPropagationMarker().toString());
-  }
+        assertNotNull(tags.getOrgPropagationMarker());
+        assertEquals("upstream-abc", tags.getOrgPropagationMarker().toString());
+    }
 
-  @Test
-  @DisplayName("local supplier value overrides any inherited OPM")
-  void localOpmOverridesInherited() {
-    PropagationTags.Factory factory = PropagationTags.factory();
-    PropagationTags tags = factory.fromHeaderValue(DATADOG, "_dd.p.opm=upstream-abc");
+    @Test
+    @DisplayName("local supplier value overrides any inherited OPM")
+    void localOpmOverridesInherited() {
+        PropagationTags.Factory factory = PropagationTags.factory();
+        PropagationTags tags = factory.fromHeaderValue(DATADOG, "_dd.p.opm=upstream-abc");
 
-    DDSpanContext ctx = mock(DDSpanContext.class);
-    when(ctx.getPropagationTags()).thenReturn(tags);
+        DDSpanContext ctx = mock(DDSpanContext.class);
+        when(ctx.getPropagationTags()).thenReturn(tags);
 
-    HttpCodec.Injector delegate = new NoopInjector();
-    OpmStampingInjector wrapped = new OpmStampingInjector(delegate, () -> "local-xyz");
+        HttpCodec.Injector delegate = new NoopInjector();
+        OpmStampingInjector wrapped = new OpmStampingInjector(delegate, () -> "local-xyz");
 
-    Map<String, String> carrier = new HashMap<>();
-    wrapped.inject(ctx, carrier, Map::put);
+        Map<String, String> carrier = new HashMap<>();
+        wrapped.inject(ctx, carrier, Map::put);
 
-    assertEquals("local-xyz", tags.getOrgPropagationMarker().toString());
-  }
+        assertEquals("local-xyz", tags.getOrgPropagationMarker().toString());
+    }
 
-  @Test
-  @DisplayName("delegate is invoked exactly once per inject call")
-  void delegateInvoked() {
-    PropagationTags.Factory factory = PropagationTags.factory();
-    PropagationTags tags = factory.empty();
+    @Test
+    @DisplayName("delegate is invoked exactly once per inject call")
+    void delegateInvoked() {
+        PropagationTags.Factory factory = PropagationTags.factory();
+        PropagationTags tags = factory.empty();
 
-    DDSpanContext ctx = mock(DDSpanContext.class);
-    when(ctx.getPropagationTags()).thenReturn(tags);
+        DDSpanContext ctx = mock(DDSpanContext.class);
+        when(ctx.getPropagationTags()).thenReturn(tags);
 
-    CountingInjector delegate = new CountingInjector();
-    OpmStampingInjector wrapped = new OpmStampingInjector(delegate, () -> null);
+        CountingInjector delegate = new CountingInjector();
+        OpmStampingInjector wrapped = new OpmStampingInjector(delegate, () -> null);
 
-    wrapped.inject(ctx, new HashMap<>(), Map::put);
-    assertEquals(1, delegate.calls);
-    assertNull(tags.getOrgPropagationMarker());
-  }
+        wrapped.inject(ctx, new HashMap<>(), Map::put);
+        assertEquals(1, delegate.calls);
+        assertNull(tags.getOrgPropagationMarker());
+    }
 
-  private static final class NoopInjector implements HttpCodec.Injector {
-    @Override
-    public <C> void inject(DDSpanContext context, C carrier, CarrierSetter<C> setter) {}
-  }
+    private static final class NoopInjector implements HttpCodec.Injector {
+        @Override
+        public <C> void inject(DDSpanContext context, C carrier, CarrierSetter<C> setter) {}
+    }
 
-  private static final class CountingInjector implements HttpCodec.Injector {
-    int calls = 0;
+    private static final class CountingInjector implements HttpCodec.Injector {
+        int calls = 0;
 
-    @Override
-    public <C> void inject(DDSpanContext context, C carrier, CarrierSetter<C> setter) {
-      calls++;
+        @Override
+        public <C> void inject(DDSpanContext context, C carrier, CarrierSetter<C> setter) {
+            calls++;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/opg/OrgGuardEnforcerTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/opg/OrgGuardEnforcerTest.java
index bd56aeb298f..d98f1e09083 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/opg/OrgGuardEnforcerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/opg/OrgGuardEnforcerTest.java
@@ -36,180 +36,166 @@
 @DisplayName("OrgGuardEnforcer truth table")
 class OrgGuardEnforcerTest {
 
-  private PropagationTags.Factory factory;
-  private HealthMetrics healthMetrics;
-
-  @BeforeEach
-  void setUp() {
-    factory = PropagationTags.factory();
-    healthMetrics = mock(HealthMetrics.class);
-  }
-
-  @Test
-  @DisplayName("local OPM unknown -> no enforcement")
-  void localUnknown() {
-    OrgGuardEnforcer enforcer = enforcer(false, emptySet(), () -> null);
-    ExtractedContext ctx = ctxWithOpm("X");
-    assertSame(ctx, enforcer.enforce(ctx));
-    verify(healthMetrics, never()).onOrgGuardEnforce(any(OrgGuard.Reason.class));
-  }
-
-  @Test
-  @DisplayName("lax: inbound OPM missing -> no enforcement")
-  void laxInboundMissing() {
-    OrgGuardEnforcer enforcer = enforcer(false, emptySet(), () -> "L");
-    ExtractedContext ctx = ctxWithOpm(null);
-    assertSame(ctx, enforcer.enforce(ctx));
-    verify(healthMetrics, never()).onOrgGuardEnforce(any(OrgGuard.Reason.class));
-  }
-
-  @Test
-  @DisplayName("strict: inbound OPM missing -> strip with strict_missing")
-  void strictInboundMissing() {
-    OrgGuardEnforcer enforcer = enforcer(true, emptySet(), () -> "L");
-    ExtractedContext ctx = ctxWithOpm(null, /*samplingPriority*/ 2, "synthetics");
-    TagContext result = enforcer.enforce(ctx);
-    assertNotSame(ctx, result);
-    assertStripped((ExtractedContext) result, ctx);
-    verify(healthMetrics, times(1)).onOrgGuardEnforce(OrgGuard.Reason.STRICT_MISSING);
-  }
-
-  @Test
-  @DisplayName("inbound OPM matches local -> no enforcement")
-  void match() {
-    OrgGuardEnforcer enforcer = enforcer(false, emptySet(), () -> "L");
-    ExtractedContext ctx = ctxWithOpm("L");
-    assertSame(ctx, enforcer.enforce(ctx));
-    verify(healthMetrics, never()).onOrgGuardEnforce(any(OrgGuard.Reason.class));
-  }
-
-  @Test
-  @DisplayName("inbound OPM is in trusted list -> no enforcement")
-  void trusted() {
-    Set<String> trusted = new HashSet<>();
-    trusted.add("X");
-    trusted.add("Y");
-    OrgGuardEnforcer enforcer = enforcer(false, trusted, () -> "L");
-    ExtractedContext ctx = ctxWithOpm("X");
-    assertSame(ctx, enforcer.enforce(ctx));
-    verify(healthMetrics, never()).onOrgGuardEnforce(any(OrgGuard.Reason.class));
-  }
-
-  @Test
-  @DisplayName("lax: inbound != local -> strip with mismatch")
-  void mismatchLax() {
-    OrgGuardEnforcer enforcer = enforcer(false, emptySet(), () -> "L");
-    ExtractedContext ctx = ctxWithOpm("X", 2, "synthetics");
-    TagContext result = enforcer.enforce(ctx);
-    assertNotSame(ctx, result);
-    assertStripped((ExtractedContext) result, ctx);
-    verify(healthMetrics, times(1)).onOrgGuardEnforce(OrgGuard.Reason.MISMATCH);
-  }
-
-  @Test
-  @DisplayName("strict: inbound != local -> strip with mismatch")
-  void mismatchStrict() {
-    OrgGuardEnforcer enforcer = enforcer(true, emptySet(), () -> "L");
-    ExtractedContext ctx = ctxWithOpm("X", 2, "synthetics");
-    TagContext result = enforcer.enforce(ctx);
-    assertNotSame(ctx, result);
-    assertStripped((ExtractedContext) result, ctx);
-    verify(healthMetrics, times(1)).onOrgGuardEnforce(OrgGuard.Reason.MISMATCH);
-  }
-
-  @Test
-  @DisplayName("partial TagContext (not ExtractedContext) -> always pass through")
-  void partialContext() {
-    OrgGuardEnforcer enforcer = enforcer(true, emptySet(), () -> "L");
-    TagContext partial = new TagContext("upstream", null);
-    assertSame(partial, enforcer.enforce(partial));
-    verify(healthMetrics, never()).onOrgGuardEnforce(any(OrgGuard.Reason.class));
-  }
-
-  @Test
-  @DisplayName("null input is passed through")
-  void nullInput() {
-    OrgGuardEnforcer enforcer = enforcer(true, emptySet(), () -> "L");
-    assertNull(enforcer.enforce(null));
-    verify(healthMetrics, never()).onOrgGuardEnforce(any(OrgGuard.Reason.class));
-  }
-
-  @Test
-  @DisplayName("strip preserves W3C non-dd vendor tracestate sections")
-  void stripPreservesNonDdVendors() {
-    OrgGuardEnforcer enforcer = enforcer(false, emptySet(), () -> "L");
-    PropagationTags tags =
-        factory.fromHeaderValue(W3C, "dd=s:1;o:foo;t.opm:upstream-X,vendor1=abc,vendor2=def");
-    ExtractedContext ctx =
-        new ExtractedContext(
-            DDTraceId.from(123L), 456L, 2, "origin", tags, TracePropagationStyle.TRACECONTEXT);
-    TagContext result = enforcer.enforce(ctx);
-    assertNotSame(ctx, result);
-    ExtractedContext stripped = (ExtractedContext) result;
-    String reEncoded = stripped.getPropagationTags().headerValue(W3C);
-    assertNotNull(reEncoded);
-    assertFalse(reEncoded.contains("dd="), "dd= should be dropped: " + reEncoded);
-    assertTrue(reEncoded.contains("vendor1=abc"), "vendor1 missing: " + reEncoded);
-    assertTrue(reEncoded.contains("vendor2=def"), "vendor2 missing: " + reEncoded);
-  }
-
-  @Test
-  @DisplayName("strip replaces inherited OTel sampling state after local resampling")
-  void stripReplacesOtelSamplingStateAfterLocalResampling() {
-    OrgGuardEnforcer enforcer = enforcer(false, emptySet(), () -> "L");
-    PropagationTags tags =
-        factory.fromHeaderValue(
-            W3C, "dd=s:1;o:foo;t.opm:upstream-X,ot=rv:00000000000000;th:1,vendor1=abc");
-    ExtractedContext ctx =
-        new ExtractedContext(
-            DDTraceId.from(123L),
-            456L,
-            SAMPLER_KEEP,
-            "origin",
-            tags,
-            TracePropagationStyle.TRACECONTEXT);
-
-    ExtractedContext stripped = (ExtractedContext) enforcer.enforce(ctx);
-    assertTrue(
-        stripped
-            .getPropagationTags()
-            .tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 1.0, false, 1L, false));
-
-    String reEncoded = stripped.getPropagationTags().headerValue(W3C);
-    assertNotNull(reEncoded);
-    assertTrue(
-        reEncoded.matches("dd=s:1;t.dm:-1;t.ksr:1,ot=rv:[0-9a-f]{14};th:0,vendor1=abc"), reEncoded);
-  }
-
-  // ---- helpers ----
-
-  private OrgGuardEnforcer enforcer(
-      boolean strict, Set<String> trusted, Supplier<String> localOpmSupplier) {
-    return new OrgGuardEnforcer(strict, trusted, localOpmSupplier, factory, healthMetrics);
-  }
-
-  private ExtractedContext ctxWithOpm(String opm) {
-    return ctxWithOpm(opm, SAMPLER_KEEP, "origin");
-  }
-
-  private ExtractedContext ctxWithOpm(String opm, int samplingPriority, String origin) {
-    PropagationTags tags = factory.empty();
-    if (opm != null) {
-      tags.updateOrgPropagationMarker(opm);
-    }
-    tags.updateTraceSamplingPriority(samplingPriority, MANUAL);
-    tags.updateTraceOrigin(origin);
-    return new ExtractedContext(
-        DDTraceId.from(123L), 456L, samplingPriority, origin, tags, DATADOG);
-  }
-
-  private static void assertStripped(ExtractedContext stripped, ExtractedContext original) {
-    assertEquals(original.getTraceId(), stripped.getTraceId());
-    assertEquals(original.getSpanId(), stripped.getSpanId());
-    assertEquals(UNSET, stripped.getSamplingPriority());
-    assertNull(stripped.getOrigin());
-    assertNull(stripped.getPropagationTags().getOrgPropagationMarker());
-    assertNull(stripped.getPropagationTags().getOrigin());
-    assertEquals(UNSET, stripped.getPropagationTags().getSamplingPriority());
-  }
+    private PropagationTags.Factory factory;
+    private HealthMetrics healthMetrics;
+
+    @BeforeEach
+    void setUp() {
+        factory = PropagationTags.factory();
+        healthMetrics = mock(HealthMetrics.class);
+    }
+
+    @Test
+    @DisplayName("local OPM unknown -> no enforcement")
+    void localUnknown() {
+        OrgGuardEnforcer enforcer = enforcer(false, emptySet(), () -> null);
+        ExtractedContext ctx = ctxWithOpm("X");
+        assertSame(ctx, enforcer.enforce(ctx));
+        verify(healthMetrics, never()).onOrgGuardEnforce(any(OrgGuard.Reason.class));
+    }
+
+    @Test
+    @DisplayName("lax: inbound OPM missing -> no enforcement")
+    void laxInboundMissing() {
+        OrgGuardEnforcer enforcer = enforcer(false, emptySet(), () -> "L");
+        ExtractedContext ctx = ctxWithOpm(null);
+        assertSame(ctx, enforcer.enforce(ctx));
+        verify(healthMetrics, never()).onOrgGuardEnforce(any(OrgGuard.Reason.class));
+    }
+
+    @Test
+    @DisplayName("strict: inbound OPM missing -> strip with strict_missing")
+    void strictInboundMissing() {
+        OrgGuardEnforcer enforcer = enforcer(true, emptySet(), () -> "L");
+        ExtractedContext ctx = ctxWithOpm(null, /*samplingPriority*/ 2, "synthetics");
+        TagContext result = enforcer.enforce(ctx);
+        assertNotSame(ctx, result);
+        assertStripped((ExtractedContext) result, ctx);
+        verify(healthMetrics, times(1)).onOrgGuardEnforce(OrgGuard.Reason.STRICT_MISSING);
+    }
+
+    @Test
+    @DisplayName("inbound OPM matches local -> no enforcement")
+    void match() {
+        OrgGuardEnforcer enforcer = enforcer(false, emptySet(), () -> "L");
+        ExtractedContext ctx = ctxWithOpm("L");
+        assertSame(ctx, enforcer.enforce(ctx));
+        verify(healthMetrics, never()).onOrgGuardEnforce(any(OrgGuard.Reason.class));
+    }
+
+    @Test
+    @DisplayName("inbound OPM is in trusted list -> no enforcement")
+    void trusted() {
+        Set<String> trusted = new HashSet<>();
+        trusted.add("X");
+        trusted.add("Y");
+        OrgGuardEnforcer enforcer = enforcer(false, trusted, () -> "L");
+        ExtractedContext ctx = ctxWithOpm("X");
+        assertSame(ctx, enforcer.enforce(ctx));
+        verify(healthMetrics, never()).onOrgGuardEnforce(any(OrgGuard.Reason.class));
+    }
+
+    @Test
+    @DisplayName("lax: inbound != local -> strip with mismatch")
+    void mismatchLax() {
+        OrgGuardEnforcer enforcer = enforcer(false, emptySet(), () -> "L");
+        ExtractedContext ctx = ctxWithOpm("X", 2, "synthetics");
+        TagContext result = enforcer.enforce(ctx);
+        assertNotSame(ctx, result);
+        assertStripped((ExtractedContext) result, ctx);
+        verify(healthMetrics, times(1)).onOrgGuardEnforce(OrgGuard.Reason.MISMATCH);
+    }
+
+    @Test
+    @DisplayName("strict: inbound != local -> strip with mismatch")
+    void mismatchStrict() {
+        OrgGuardEnforcer enforcer = enforcer(true, emptySet(), () -> "L");
+        ExtractedContext ctx = ctxWithOpm("X", 2, "synthetics");
+        TagContext result = enforcer.enforce(ctx);
+        assertNotSame(ctx, result);
+        assertStripped((ExtractedContext) result, ctx);
+        verify(healthMetrics, times(1)).onOrgGuardEnforce(OrgGuard.Reason.MISMATCH);
+    }
+
+    @Test
+    @DisplayName("partial TagContext (not ExtractedContext) -> always pass through")
+    void partialContext() {
+        OrgGuardEnforcer enforcer = enforcer(true, emptySet(), () -> "L");
+        TagContext partial = new TagContext("upstream", null);
+        assertSame(partial, enforcer.enforce(partial));
+        verify(healthMetrics, never()).onOrgGuardEnforce(any(OrgGuard.Reason.class));
+    }
+
+    @Test
+    @DisplayName("null input is passed through")
+    void nullInput() {
+        OrgGuardEnforcer enforcer = enforcer(true, emptySet(), () -> "L");
+        assertNull(enforcer.enforce(null));
+        verify(healthMetrics, never()).onOrgGuardEnforce(any(OrgGuard.Reason.class));
+    }
+
+    @Test
+    @DisplayName("strip preserves W3C non-dd vendor tracestate sections")
+    void stripPreservesNonDdVendors() {
+        OrgGuardEnforcer enforcer = enforcer(false, emptySet(), () -> "L");
+        PropagationTags tags = factory.fromHeaderValue(W3C, "dd=s:1;o:foo;t.opm:upstream-X,vendor1=abc,vendor2=def");
+        ExtractedContext ctx =
+                new ExtractedContext(DDTraceId.from(123L), 456L, 2, "origin", tags, TracePropagationStyle.TRACECONTEXT);
+        TagContext result = enforcer.enforce(ctx);
+        assertNotSame(ctx, result);
+        ExtractedContext stripped = (ExtractedContext) result;
+        String reEncoded = stripped.getPropagationTags().headerValue(W3C);
+        assertNotNull(reEncoded);
+        assertFalse(reEncoded.contains("dd="), "dd= should be dropped: " + reEncoded);
+        assertTrue(reEncoded.contains("vendor1=abc"), "vendor1 missing: " + reEncoded);
+        assertTrue(reEncoded.contains("vendor2=def"), "vendor2 missing: " + reEncoded);
+    }
+
+    @Test
+    @DisplayName("strip replaces inherited OTel sampling state after local resampling")
+    void stripReplacesOtelSamplingStateAfterLocalResampling() {
+        OrgGuardEnforcer enforcer = enforcer(false, emptySet(), () -> "L");
+        PropagationTags tags =
+                factory.fromHeaderValue(W3C, "dd=s:1;o:foo;t.opm:upstream-X,ot=rv:00000000000000;th:1,vendor1=abc");
+        ExtractedContext ctx = new ExtractedContext(
+                DDTraceId.from(123L), 456L, SAMPLER_KEEP, "origin", tags, TracePropagationStyle.TRACECONTEXT);
+
+        ExtractedContext stripped = (ExtractedContext) enforcer.enforce(ctx);
+        assertTrue(stripped.getPropagationTags()
+                .tryUpdateProbabilitySamplingDecision(SAMPLER_KEEP, AGENT_RATE, 1.0, false, 1L, false));
+
+        String reEncoded = stripped.getPropagationTags().headerValue(W3C);
+        assertNotNull(reEncoded);
+        assertTrue(reEncoded.matches("dd=s:1;t.dm:-1;t.ksr:1,ot=rv:[0-9a-f]{14};th:0,vendor1=abc"), reEncoded);
+    }
+
+    // ---- helpers ----
+
+    private OrgGuardEnforcer enforcer(boolean strict, Set<String> trusted, Supplier<String> localOpmSupplier) {
+        return new OrgGuardEnforcer(strict, trusted, localOpmSupplier, factory, healthMetrics);
+    }
+
+    private ExtractedContext ctxWithOpm(String opm) {
+        return ctxWithOpm(opm, SAMPLER_KEEP, "origin");
+    }
+
+    private ExtractedContext ctxWithOpm(String opm, int samplingPriority, String origin) {
+        PropagationTags tags = factory.empty();
+        if (opm != null) {
+            tags.updateOrgPropagationMarker(opm);
+        }
+        tags.updateTraceSamplingPriority(samplingPriority, MANUAL);
+        tags.updateTraceOrigin(origin);
+        return new ExtractedContext(DDTraceId.from(123L), 456L, samplingPriority, origin, tags, DATADOG);
+    }
+
+    private static void assertStripped(ExtractedContext stripped, ExtractedContext original) {
+        assertEquals(original.getTraceId(), stripped.getTraceId());
+        assertEquals(original.getSpanId(), stripped.getSpanId());
+        assertEquals(UNSET, stripped.getSamplingPriority());
+        assertNull(stripped.getOrigin());
+        assertNull(stripped.getPropagationTags().getOrgPropagationMarker());
+        assertNull(stripped.getPropagationTags().getOrigin());
+        assertEquals(UNSET, stripped.getPropagationTags().getSamplingPriority());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/opg/OrgGuardTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/opg/OrgGuardTest.java
index f8521e34fdf..f6189d88a01 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/opg/OrgGuardTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/opg/OrgGuardTest.java
@@ -18,39 +18,37 @@
 @DisplayName("OrgGuard factory gating")
 class OrgGuardTest {
 
-  private static final Supplier<String> LOCAL_OPM = () -> "L";
+    private static final Supplier<String> LOCAL_OPM = () -> "L";
 
-  @Test
-  @DisplayName("disabled: decorate methods return the input unchanged")
-  void disabledIsZeroCost() {
-    Config config = mock(Config.class, RETURNS_DEFAULTS);
-    when(config.isTraceOrgGuardEnabled()).thenReturn(false);
+    @Test
+    @DisplayName("disabled: decorate methods return the input unchanged")
+    void disabledIsZeroCost() {
+        Config config = mock(Config.class, RETURNS_DEFAULTS);
+        when(config.isTraceOrgGuardEnabled()).thenReturn(false);
 
-    OrgGuard orgGuard =
-        OrgGuard.create(config, LOCAL_OPM, PropagationTags.factory(), mock(HealthMetrics.class));
+        OrgGuard orgGuard = OrgGuard.create(config, LOCAL_OPM, PropagationTags.factory(), mock(HealthMetrics.class));
 
-    HttpCodec.Extractor extractor = mock(HttpCodec.Extractor.class);
-    HttpCodec.Injector injector = mock(HttpCodec.Injector.class);
+        HttpCodec.Extractor extractor = mock(HttpCodec.Extractor.class);
+        HttpCodec.Injector injector = mock(HttpCodec.Injector.class);
 
-    assertSame(extractor, orgGuard.decorateExtractor(extractor));
-    assertSame(injector, orgGuard.decorateInjector(injector));
-  }
+        assertSame(extractor, orgGuard.decorateExtractor(extractor));
+        assertSame(injector, orgGuard.decorateInjector(injector));
+    }
 
-  @Test
-  @DisplayName("enabled: decorate methods wrap with the OPG decorators")
-  void enabledWrapsBothSides() {
-    Config config = mock(Config.class, RETURNS_DEFAULTS);
-    when(config.isTraceOrgGuardEnabled()).thenReturn(true);
-    when(config.isTraceOrgGuardStrict()).thenReturn(false);
-    when(config.getTraceOrgGuardTrustedOpms()).thenReturn(Collections.emptySet());
+    @Test
+    @DisplayName("enabled: decorate methods wrap with the OPG decorators")
+    void enabledWrapsBothSides() {
+        Config config = mock(Config.class, RETURNS_DEFAULTS);
+        when(config.isTraceOrgGuardEnabled()).thenReturn(true);
+        when(config.isTraceOrgGuardStrict()).thenReturn(false);
+        when(config.getTraceOrgGuardTrustedOpms()).thenReturn(Collections.emptySet());
 
-    OrgGuard orgGuard =
-        OrgGuard.create(config, LOCAL_OPM, PropagationTags.factory(), mock(HealthMetrics.class));
+        OrgGuard orgGuard = OrgGuard.create(config, LOCAL_OPM, PropagationTags.factory(), mock(HealthMetrics.class));
 
-    HttpCodec.Extractor extractor = mock(HttpCodec.Extractor.class);
-    HttpCodec.Injector injector = mock(HttpCodec.Injector.class);
+        HttpCodec.Extractor extractor = mock(HttpCodec.Extractor.class);
+        HttpCodec.Injector injector = mock(HttpCodec.Injector.class);
 
-    assertInstanceOf(OrgGuardEnforcingExtractor.class, orgGuard.decorateExtractor(extractor));
-    assertInstanceOf(OpmStampingInjector.class, orgGuard.decorateInjector(injector));
-  }
+        assertInstanceOf(OrgGuardEnforcingExtractor.class, orgGuard.decorateExtractor(extractor));
+        assertInstanceOf(OpmStampingInjector.class, orgGuard.decorateInjector(injector));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/ptags/OtelTraceStateParsingTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/ptags/OtelTraceStateParsingTest.java
index ce91b7c3488..ee50bab5320 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/ptags/OtelTraceStateParsingTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/ptags/OtelTraceStateParsingTest.java
@@ -9,90 +9,88 @@
 import org.junit.jupiter.api.Test;
 
 class OtelTraceStateParsingTest {
-  private static final String VALUE = "rv:0123456789abcd";
-  private static final int ORIGINAL_MEMBER_CONTRIBUTION_SIZE = 21;
+    private static final String VALUE = "rv:0123456789abcd";
+    private static final int ORIGINAL_MEMBER_CONTRIBUTION_SIZE = 21;
 
-  @Test
-  void ignoresAbsentValues() {
-    assertNull(OtelTraceState.parse(null, ORIGINAL_MEMBER_CONTRIBUTION_SIZE));
-    assertNull(OtelTraceState.parse("", ORIGINAL_MEMBER_CONTRIBUTION_SIZE));
-  }
+    @Test
+    void ignoresAbsentValues() {
+        assertNull(OtelTraceState.parse(null, ORIGINAL_MEMBER_CONTRIBUTION_SIZE));
+        assertNull(OtelTraceState.parse("", ORIGINAL_MEMBER_CONTRIBUTION_SIZE));
+    }
 
-  @Test
-  void retainsValueAndMemberSize() {
-    SubSequence value = SubSequence.of(VALUE, 0, VALUE.length());
-    OtelTraceState state = OtelTraceState.parse(value, ORIGINAL_MEMBER_CONTRIBUTION_SIZE);
+    @Test
+    void retainsValueAndMemberSize() {
+        SubSequence value = SubSequence.of(VALUE, 0, VALUE.length());
+        OtelTraceState state = OtelTraceState.parse(value, ORIGINAL_MEMBER_CONTRIBUTION_SIZE);
 
-    assertNotNull(state);
-    assertFalse(state.isMaterialized());
-    assertEquals(VALUE.length(), state.length());
-    assertEquals(ORIGINAL_MEMBER_CONTRIBUTION_SIZE, state.getOriginalSize());
-  }
+        assertNotNull(state);
+        assertFalse(state.isMaterialized());
+        assertEquals(VALUE.length(), state.length());
+        assertEquals(ORIGINAL_MEMBER_CONTRIBUTION_SIZE, state.getOriginalSize());
+    }
 
-  @Test
-  void retainsValidThresholdWithoutRandomValue() {
-    OtelTraceState state = OtelTraceState.parse("th:8", 0);
+    @Test
+    void retainsValidThresholdWithoutRandomValue() {
+        OtelTraceState state = OtelTraceState.parse("th:8", 0);
 
-    assertEquals("th:8", state.toString());
-  }
+        assertEquals("th:8", state.toString());
+    }
 
-  @Test
-  void passesThroughUnrecognizedFields() {
-    OtelTraceState state =
-        OtelTraceState.parse("simplefield;blah;foo", ORIGINAL_MEMBER_CONTRIBUTION_SIZE);
+    @Test
+    void passesThroughUnrecognizedFields() {
+        OtelTraceState state = OtelTraceState.parse("simplefield;blah;foo", ORIGINAL_MEMBER_CONTRIBUTION_SIZE);
 
-    assertEquals("simplefield;blah;foo", state.toString());
-    assertEquals(ORIGINAL_MEMBER_CONTRIBUTION_SIZE, state.getOriginalSize());
-    assertEquals("simplefield;blah;foo", state.forNonProbabilityDecision().toString());
-  }
+        assertEquals("simplefield;blah;foo", state.toString());
+        assertEquals(ORIGINAL_MEMBER_CONTRIBUTION_SIZE, state.getOriginalSize());
+        assertEquals("simplefield;blah;foo", state.forNonProbabilityDecision().toString());
+    }
 
-  @Test
-  void recognizesUnknownFieldAfterManyColonFreeFields() {
-    OtelTraceState state = OtelTraceState.parse("a;b;c;d;e;f:g", ORIGINAL_MEMBER_CONTRIBUTION_SIZE);
+    @Test
+    void recognizesUnknownFieldAfterManyColonFreeFields() {
+        OtelTraceState state = OtelTraceState.parse("a;b;c;d;e;f:g", ORIGINAL_MEMBER_CONTRIBUTION_SIZE);
 
-    assertEquals("f:g", state.toString());
-  }
+        assertEquals("f:g", state.toString());
+    }
 
-  @Test
-  void doesNotTreatColonInLaterFieldAsPartOfEarlierField() {
-    OtelTraceState state = OtelTraceState.parse("a;b:c", ORIGINAL_MEMBER_CONTRIBUTION_SIZE);
+    @Test
+    void doesNotTreatColonInLaterFieldAsPartOfEarlierField() {
+        OtelTraceState state = OtelTraceState.parse("a;b:c", ORIGINAL_MEMBER_CONTRIBUTION_SIZE);
 
-    assertEquals("b:c", state.toString());
-  }
+        assertEquals("b:c", state.toString());
+    }
 
-  @Test
-  void removesMalformedThresholdAndRetainsValidRandomValue() {
-    OtelTraceState state = OtelTraceState.parse("rv:0123456789abcd;th:not-hex;x:value", 0);
+    @Test
+    void removesMalformedThresholdAndRetainsValidRandomValue() {
+        OtelTraceState state = OtelTraceState.parse("rv:0123456789abcd;th:not-hex;x:value", 0);
 
-    assertEquals("rv:0123456789abcd;x:value", state.toString());
-  }
+        assertEquals("rv:0123456789abcd;x:value", state.toString());
+    }
 
-  @Test
-  void malformedRandomValueRemovesManagedPairButRetainsUnknownFields() {
-    OtelTraceState state = OtelTraceState.parse("rv:invalid;th:8;x:value", 0);
+    @Test
+    void malformedRandomValueRemovesManagedPairButRetainsUnknownFields() {
+        OtelTraceState state = OtelTraceState.parse("rv:invalid;th:8;x:value", 0);
 
-    assertEquals("x:value", state.toString());
-  }
+        assertEquals("x:value", state.toString());
+    }
 
-  @Test
-  void malformedFirstRandomValuePreventsRecoveryFromLaterValues() {
-    OtelTraceState state =
-        OtelTraceState.parse("rv:invalid;rv:0123456789abcd;rv:ffffffffffffff;th:8;th:4", 0);
+    @Test
+    void malformedFirstRandomValuePreventsRecoveryFromLaterValues() {
+        OtelTraceState state = OtelTraceState.parse("rv:invalid;rv:0123456789abcd;rv:ffffffffffffff;th:8;th:4", 0);
 
-    assertNull(state);
-  }
+        assertNull(state);
+    }
 
-  @Test
-  void keepsFirstValidManagedFields() {
-    OtelTraceState state = OtelTraceState.parse("rv:0123456789abcd;rv:ffffffffffffff;th:8;th:4", 0);
+    @Test
+    void keepsFirstValidManagedFields() {
+        OtelTraceState state = OtelTraceState.parse("rv:0123456789abcd;rv:ffffffffffffff;th:8;th:4", 0);
 
-    assertEquals("rv:0123456789abcd;th:8", state.toString());
-  }
+        assertEquals("rv:0123456789abcd;th:8", state.toString());
+    }
 
-  @Test
-  void rejectsUppercaseAndOverlongManagedFields() {
-    OtelTraceState state = OtelTraceState.parse("rv:0123456789ABCd;th:123456789abcdef;x:value", 0);
+    @Test
+    void rejectsUppercaseAndOverlongManagedFields() {
+        OtelTraceState state = OtelTraceState.parse("rv:0123456789ABCd;th:123456789abcdef;x:value", 0);
 
-    assertEquals("x:value", state.toString());
-  }
+        assertEquals("x:value", state.toString());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/ptags/OtelTraceStateTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/ptags/OtelTraceStateTest.java
index 404a7e40212..a98bb22033f 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/ptags/OtelTraceStateTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/ptags/OtelTraceStateTest.java
@@ -12,115 +12,112 @@
 import org.junit.jupiter.api.Test;
 
 class OtelTraceStateTest {
-  private static final long DROP_PRECISION_BOUNDARY_TRACE_ID = 5401449561355763072L;
-  private static final double DROP_PRECISION_BOUNDARY_RATE = 0.05;
-  private static final String DROP_PRECISION_BOUNDARY_RANDOM_VALUE = "f333333333332f";
-  private static final String DROP_PRECISION_BOUNDARY_THRESHOLD = "f333333333333";
-
-  @Test
-  void convertsDatadogProbabilityDecision() {
-    OtelTraceState state =
-        OtelTraceState.fromProbabilityDecision(0xfff972474538efffL, 0.1, SAMPLER_KEEP);
-
-    assertFalse(state.isMaterialized());
-    assertEquals("rv:ef284ace7a91e1;th:e6666666666668", state.toString());
-    assertTrue(state.isMaterialized());
-    assertTrue(state.isConsistentWith(true));
-  }
-
-  @Test
-  void serializesThresholds() {
-    assertThreshold(0.01, "fd70a3d70a3d7");
-    assertThreshold(0.1, "e6666666666668");
-    assertThreshold(0.2, "ccccccccccccd");
-    assertThreshold(0.5, "8");
-    assertThreshold(0.99, "028f5c28f5c29");
-    assertThreshold(1.0, "0");
-  }
-
-  @Test
-  void rateZeroUsesLargestWireThresholdAndRemainsDropConsistent() {
-    OtelTraceState state = OtelTraceState.fromProbabilityDecision(0L, 0.0, SAMPLER_DROP);
-
-    assertEquals("rv:fffffffffffffe;th:ffffffffffffff", state.toString());
-    assertTrue(state.isConsistentWith(false));
-  }
-
-  @Test
-  void rateAboveOneSaturatesToAlwaysSampleThreshold() {
-    OtelTraceState state = OtelTraceState.fromProbabilityDecision(1L, 1.5, SAMPLER_KEEP);
-
-    assertEquals("rv:f0948a54d43b8e;th:0", state.toString());
-    assertTrue(state.isConsistentWith(true));
-  }
-
-  @Test
-  void correctsOnlySerializedRandomValueAtKeepBoundary() {
-    OtelTraceState state =
-        OtelTraceState.fromProbabilityDecision(0x03a93ee8b1999f00L, 0.1, SAMPLER_KEEP);
-
-    assertEquals("rv:e6666666666668;th:e6666666666668", state.toString());
-    assertTrue(state.isConsistentWith(true));
-  }
-
-  @Test
-  void correctsOnlySerializedRandomValueAtDropBoundary() {
-    OtelTraceState state =
-        OtelTraceState.fromProbabilityDecision(
-            DROP_PRECISION_BOUNDARY_TRACE_ID, DROP_PRECISION_BOUNDARY_RATE, SAMPLER_DROP);
-
-    assertEquals(
-        "rv:" + DROP_PRECISION_BOUNDARY_RANDOM_VALUE + ";th:" + DROP_PRECISION_BOUNDARY_THRESHOLD,
-        state.toString());
-    assertTrue(state.isConsistentWith(false));
-  }
-
-  @Test
-  void removesLocalRandomnessForNonProbabilityDecision() {
-    OtelTraceState state = OtelTraceState.fromProbabilityDecision(1L, 1.0, SAMPLER_KEEP);
-
-    assertNull(state.forNonProbabilityDecision());
-  }
-
-  @Test
-  void retainsInheritedRandomnessAndUnknownFieldsWithoutThreshold() {
-    OtelTraceState state = OtelTraceState.parse("rv:0123456789abcd;th:8;x:value", 0);
-
-    OtelTraceState transformed = state.forNonProbabilityDecision();
-
-    assertEquals("rv:0123456789abcd;x:value", transformed.toString());
-    assertTrue(transformed.isConsistentWith(false));
-  }
-
-  @Test
-  void forNonProbabilityDecisionReturnsSameInstanceWhenAlreadyNonProbability() {
-    OtelTraceState state = OtelTraceState.parse("rv:0123456789abcd;x:value", 0);
-
-    assertSame(state, state.forNonProbabilityDecision());
-  }
-
-  @Test
-  void forNonProbabilityDecisionReturnsSameInstanceForUnknownFieldsOnly() {
-    OtelTraceState state = OtelTraceState.parse("x:value", 0);
-
-    assertSame(state, state.forNonProbabilityDecision());
-  }
-
-  @Test
-  void forNonProbabilityDecisionStillDropsUninheritedRandomValue() {
-    OtelTraceState state =
-        OtelTraceState.fromProbabilityDecision(1L, 0.1, SAMPLER_KEEP).withoutThreshold();
-
-    OtelTraceState transformed = state.forNonProbabilityDecision();
-
-    assertNotSame(state, transformed);
-    assertNull(transformed);
-  }
-
-  private static void assertThreshold(double rate, String expectedThreshold) {
-    int samplingPriority = rate > 0.0 ? SAMPLER_KEEP : SAMPLER_DROP;
-    OtelTraceState state = OtelTraceState.fromProbabilityDecision(1L, rate, samplingPriority);
-    String value = state.toString();
-    assertEquals(expectedThreshold, value.substring(value.indexOf(";th:") + 4));
-  }
+    private static final long DROP_PRECISION_BOUNDARY_TRACE_ID = 5401449561355763072L;
+    private static final double DROP_PRECISION_BOUNDARY_RATE = 0.05;
+    private static final String DROP_PRECISION_BOUNDARY_RANDOM_VALUE = "f333333333332f";
+    private static final String DROP_PRECISION_BOUNDARY_THRESHOLD = "f333333333333";
+
+    @Test
+    void convertsDatadogProbabilityDecision() {
+        OtelTraceState state = OtelTraceState.fromProbabilityDecision(0xfff972474538efffL, 0.1, SAMPLER_KEEP);
+
+        assertFalse(state.isMaterialized());
+        assertEquals("rv:ef284ace7a91e1;th:e6666666666668", state.toString());
+        assertTrue(state.isMaterialized());
+        assertTrue(state.isConsistentWith(true));
+    }
+
+    @Test
+    void serializesThresholds() {
+        assertThreshold(0.01, "fd70a3d70a3d7");
+        assertThreshold(0.1, "e6666666666668");
+        assertThreshold(0.2, "ccccccccccccd");
+        assertThreshold(0.5, "8");
+        assertThreshold(0.99, "028f5c28f5c29");
+        assertThreshold(1.0, "0");
+    }
+
+    @Test
+    void rateZeroUsesLargestWireThresholdAndRemainsDropConsistent() {
+        OtelTraceState state = OtelTraceState.fromProbabilityDecision(0L, 0.0, SAMPLER_DROP);
+
+        assertEquals("rv:fffffffffffffe;th:ffffffffffffff", state.toString());
+        assertTrue(state.isConsistentWith(false));
+    }
+
+    @Test
+    void rateAboveOneSaturatesToAlwaysSampleThreshold() {
+        OtelTraceState state = OtelTraceState.fromProbabilityDecision(1L, 1.5, SAMPLER_KEEP);
+
+        assertEquals("rv:f0948a54d43b8e;th:0", state.toString());
+        assertTrue(state.isConsistentWith(true));
+    }
+
+    @Test
+    void correctsOnlySerializedRandomValueAtKeepBoundary() {
+        OtelTraceState state = OtelTraceState.fromProbabilityDecision(0x03a93ee8b1999f00L, 0.1, SAMPLER_KEEP);
+
+        assertEquals("rv:e6666666666668;th:e6666666666668", state.toString());
+        assertTrue(state.isConsistentWith(true));
+    }
+
+    @Test
+    void correctsOnlySerializedRandomValueAtDropBoundary() {
+        OtelTraceState state = OtelTraceState.fromProbabilityDecision(
+                DROP_PRECISION_BOUNDARY_TRACE_ID, DROP_PRECISION_BOUNDARY_RATE, SAMPLER_DROP);
+
+        assertEquals(
+                "rv:" + DROP_PRECISION_BOUNDARY_RANDOM_VALUE + ";th:" + DROP_PRECISION_BOUNDARY_THRESHOLD,
+                state.toString());
+        assertTrue(state.isConsistentWith(false));
+    }
+
+    @Test
+    void removesLocalRandomnessForNonProbabilityDecision() {
+        OtelTraceState state = OtelTraceState.fromProbabilityDecision(1L, 1.0, SAMPLER_KEEP);
+
+        assertNull(state.forNonProbabilityDecision());
+    }
+
+    @Test
+    void retainsInheritedRandomnessAndUnknownFieldsWithoutThreshold() {
+        OtelTraceState state = OtelTraceState.parse("rv:0123456789abcd;th:8;x:value", 0);
+
+        OtelTraceState transformed = state.forNonProbabilityDecision();
+
+        assertEquals("rv:0123456789abcd;x:value", transformed.toString());
+        assertTrue(transformed.isConsistentWith(false));
+    }
+
+    @Test
+    void forNonProbabilityDecisionReturnsSameInstanceWhenAlreadyNonProbability() {
+        OtelTraceState state = OtelTraceState.parse("rv:0123456789abcd;x:value", 0);
+
+        assertSame(state, state.forNonProbabilityDecision());
+    }
+
+    @Test
+    void forNonProbabilityDecisionReturnsSameInstanceForUnknownFieldsOnly() {
+        OtelTraceState state = OtelTraceState.parse("x:value", 0);
+
+        assertSame(state, state.forNonProbabilityDecision());
+    }
+
+    @Test
+    void forNonProbabilityDecisionStillDropsUninheritedRandomValue() {
+        OtelTraceState state =
+                OtelTraceState.fromProbabilityDecision(1L, 0.1, SAMPLER_KEEP).withoutThreshold();
+
+        OtelTraceState transformed = state.forNonProbabilityDecision();
+
+        assertNotSame(state, transformed);
+        assertNull(transformed);
+    }
+
+    private static void assertThreshold(double rate, String expectedThreshold) {
+        int samplingPriority = rate > 0.0 ? SAMPLER_KEEP : SAMPLER_DROP;
+        OtelTraceState state = OtelTraceState.fromProbabilityDecision(1L, rate, samplingPriority);
+        String value = state.toString();
+        assertEquals(expectedThreshold, value.substring(value.indexOf(";th:") + 4));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/ptags/TagKeyTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/ptags/TagKeyTest.java
index aaa08648799..fc41392ba1e 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/ptags/TagKeyTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/ptags/TagKeyTest.java
@@ -9,66 +9,58 @@
 import org.tabletest.junit.TableTest;
 
 class TagKeyTest {
-  @TableTest({
-    "scenario      | seq1          | enc1    | seq2          | enc2    | same ",
-    "DD/DD same    | '_dd.p.foo1'  | DATADOG | '_dd.p.foo1'  | DATADOG | true ",
-    "W3C/W3C same  | 't.foo2'      | W3C     | 't.foo2'      | W3C     | true ",
-    "DD/W3C same   | '_dd.p.foo3'  | DATADOG | 't.foo3'      | W3C     | true ",
-    "W3C/DD same   | 't.foo4'      | W3C     | '_dd.p.foo4'  | DATADOG | true ",
-    "W3C ~ != DD = | 't.foo5~'     | W3C     | '_dd.p.foo5=' | DATADOG | false",
-    "DD ~ == W3C ~ | '_dd.p.foo6~' | DATADOG | 't.foo6~'     | W3C     | true ",
-    "DD ~ != W3C = | '_dd.p.foo7~' | DATADOG | 't.foo7='     | W3C     | false",
-    "diff suffixes | '_dd.p.foo81' | DATADOG | 't.foo82'     | W3C     | false"
-  })
-  void tagKeysShouldUseCachedValuesWhenAppropriate(
-      String seq1, Encoding enc1, String seq2, Encoding enc2, boolean same) {
-    TagKey tk1 = TagKey.from(enc1, seq1);
-    TagKey tk2 = TagKey.from(enc2, seq2);
+    @TableTest({
+      "scenario      | seq1          | enc1    | seq2          | enc2    | same ",
+      "DD/DD same    | '_dd.p.foo1'  | DATADOG | '_dd.p.foo1'  | DATADOG | true ",
+      "W3C/W3C same  | 't.foo2'      | W3C     | 't.foo2'      | W3C     | true ",
+      "DD/W3C same   | '_dd.p.foo3'  | DATADOG | 't.foo3'      | W3C     | true ",
+      "W3C/DD same   | 't.foo4'      | W3C     | '_dd.p.foo4'  | DATADOG | true ",
+      "W3C ~ != DD = | 't.foo5~'     | W3C     | '_dd.p.foo5=' | DATADOG | false",
+      "DD ~ == W3C ~ | '_dd.p.foo6~' | DATADOG | 't.foo6~'     | W3C     | true ",
+      "DD ~ != W3C = | '_dd.p.foo7~' | DATADOG | 't.foo7='     | W3C     | false",
+      "diff suffixes | '_dd.p.foo81' | DATADOG | 't.foo82'     | W3C     | false"
+    })
+    void tagKeysShouldUseCachedValuesWhenAppropriate(
+            String seq1, Encoding enc1, String seq2, Encoding enc2, boolean same) {
+        TagKey tk1 = TagKey.from(enc1, seq1);
+        TagKey tk2 = TagKey.from(enc2, seq2);
 
-    assertNotNull(tk1);
-    assertNotNull(tk2);
-    assertEquals(seq1, tk1.forType(enc1));
-    assertEquals(seq2, tk2.forType(enc2));
-    if (same) {
-      assertSame(tk1, tk2);
-      assertEquals(seq2, tk1.forType(enc2));
-    } else {
-      assertNotSame(tk1, tk2);
+        assertNotNull(tk1);
+        assertNotNull(tk2);
+        assertEquals(seq1, tk1.forType(enc1));
+        assertEquals(seq2, tk2.forType(enc2));
+        if (same) {
+            assertSame(tk1, tk2);
+            assertEquals(seq2, tk1.forType(enc2));
+        } else {
+            assertNotSame(tk1, tk2);
+        }
     }
-  }
 
-  @TableTest({
-    "scenario      | seq1           | enc1    | s1 | e1 | seq2           | enc2    | s2 | e2 | same ",
-    "DD/DD sub     | 'bb_dd.p.bar1' | DATADOG | 2  | 12 | 'r_dd.p.bar1r' | DATADOG | 1  | 11 | true ",
-    "W3C/DD sub    | 't.bar2ss'     | W3C     | 0  | 6  | 't_dd.p.bar2t' | DATADOG | 1  | 11 | true ",
-    "W3C ~ != DD = | 't.bar3~s'     | W3C     | 0  | 7  | 't_dd.p.bar3=' | DATADOG | 1  | 12 | false",
-    "W3C/W3C ~ sub | 't.bar4~s'     | W3C     | 0  | 7  | 'tt.bar4~'     | W3C     | 1  | 8  | true ",
-    "DD = != W3C ~ | 's_dd.p.bar5=' | DATADOG | 1  | 12 | 't.bar5~t'     | W3C     | 0  | 7  | false"
-  })
-  void tagKeysShouldUseCachedValuesFromSubSequences(
-      String seq1,
-      Encoding enc1,
-      int s1,
-      int e1,
-      String seq2,
-      Encoding enc2,
-      int s2,
-      int e2,
-      boolean same) {
-    TagKey tk1 = TagKey.from(enc1, seq1, s1, e1);
-    String sub1 = seq1.substring(s1, e1);
-    TagKey tk2 = TagKey.from(enc2, seq2, s2, e2);
-    String sub2 = seq2.substring(s2, e2);
+    @TableTest({
+      "scenario      | seq1           | enc1    | s1 | e1 | seq2           | enc2    | s2 | e2 | same ",
+      "DD/DD sub     | 'bb_dd.p.bar1' | DATADOG | 2  | 12 | 'r_dd.p.bar1r' | DATADOG | 1  | 11 | true ",
+      "W3C/DD sub    | 't.bar2ss'     | W3C     | 0  | 6  | 't_dd.p.bar2t' | DATADOG | 1  | 11 | true ",
+      "W3C ~ != DD = | 't.bar3~s'     | W3C     | 0  | 7  | 't_dd.p.bar3=' | DATADOG | 1  | 12 | false",
+      "W3C/W3C ~ sub | 't.bar4~s'     | W3C     | 0  | 7  | 'tt.bar4~'     | W3C     | 1  | 8  | true ",
+      "DD = != W3C ~ | 's_dd.p.bar5=' | DATADOG | 1  | 12 | 't.bar5~t'     | W3C     | 0  | 7  | false"
+    })
+    void tagKeysShouldUseCachedValuesFromSubSequences(
+            String seq1, Encoding enc1, int s1, int e1, String seq2, Encoding enc2, int s2, int e2, boolean same) {
+        TagKey tk1 = TagKey.from(enc1, seq1, s1, e1);
+        String sub1 = seq1.substring(s1, e1);
+        TagKey tk2 = TagKey.from(enc2, seq2, s2, e2);
+        String sub2 = seq2.substring(s2, e2);
 
-    assertNotNull(tk1);
-    assertNotNull(tk2);
-    assertEquals(sub1, tk1.forType(enc1));
-    assertEquals(sub2, tk2.forType(enc2));
-    if (same) {
-      assertSame(tk1, tk2);
-      assertEquals(sub2, tk1.forType(enc2));
-    } else {
-      assertNotSame(tk1, tk2);
+        assertNotNull(tk1);
+        assertNotNull(tk2);
+        assertEquals(sub1, tk1.forType(enc1));
+        assertEquals(sub2, tk2.forType(enc2));
+        if (same) {
+            assertSame(tk1, tk2);
+            assertEquals(sub2, tk1.forType(enc2));
+        } else {
+            assertNotSame(tk1, tk2);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/ptags/TagValueTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/ptags/TagValueTest.java
index e1640ab332c..31deb05abdc 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/ptags/TagValueTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/ptags/TagValueTest.java
@@ -9,69 +9,61 @@
 import org.tabletest.junit.TableTest;
 
 class TagValueTest {
-  @TableTest({
-    "scenario      | seq1    | enc1    | seq2    | enc2    | same ",
-    "DD/DD same    | 'foo1'  | DATADOG | 'foo1'  | DATADOG | true ",
-    "W3C/W3C same  | 'foo2'  | W3C     | 'foo2'  | W3C     | true ",
-    "DD/W3C same   | 'foo3'  | DATADOG | 'foo3'  | W3C     | true ",
-    "W3C/DD same   | 'foo4'  | W3C     | 'foo4'  | DATADOG | true ",
-    "W3C ~ == DD = | 'foo5~' | W3C     | 'foo5=' | DATADOG | true ",
-    "DD = == W3C ~ | 'foo6=' | DATADOG | 'foo6~' | W3C     | true ",
-    "DD ~ != W3C ~ | 'foo7~' | DATADOG | 'foo7~' | W3C     | false",
-    "diff suffixes | 'foo81' | DATADOG | 'foo82' | W3C     | false",
-    "DD ; != W3C _ | 'foo9;' | DATADOG | 'foo9_' | W3C     | false"
-  })
-  void tagValuesShouldUseCachedValuesWhenAppropriate(
-      String seq1, Encoding enc1, String seq2, Encoding enc2, boolean same) {
-    TagValue tv1 = TagValue.from(enc1, seq1);
-    TagValue tv2 = TagValue.from(enc2, seq2);
+    @TableTest({
+      "scenario      | seq1    | enc1    | seq2    | enc2    | same ",
+      "DD/DD same    | 'foo1'  | DATADOG | 'foo1'  | DATADOG | true ",
+      "W3C/W3C same  | 'foo2'  | W3C     | 'foo2'  | W3C     | true ",
+      "DD/W3C same   | 'foo3'  | DATADOG | 'foo3'  | W3C     | true ",
+      "W3C/DD same   | 'foo4'  | W3C     | 'foo4'  | DATADOG | true ",
+      "W3C ~ == DD = | 'foo5~' | W3C     | 'foo5=' | DATADOG | true ",
+      "DD = == W3C ~ | 'foo6=' | DATADOG | 'foo6~' | W3C     | true ",
+      "DD ~ != W3C ~ | 'foo7~' | DATADOG | 'foo7~' | W3C     | false",
+      "diff suffixes | 'foo81' | DATADOG | 'foo82' | W3C     | false",
+      "DD ; != W3C _ | 'foo9;' | DATADOG | 'foo9_' | W3C     | false"
+    })
+    void tagValuesShouldUseCachedValuesWhenAppropriate(
+            String seq1, Encoding enc1, String seq2, Encoding enc2, boolean same) {
+        TagValue tv1 = TagValue.from(enc1, seq1);
+        TagValue tv2 = TagValue.from(enc2, seq2);
 
-    assertNotNull(tv1);
-    assertNotNull(tv2);
-    assertEquals(seq1, tv1.forType(enc1));
-    assertEquals(seq2, tv2.forType(enc2));
-    if (same) {
-      assertSame(tv1, tv2);
-      assertEquals(seq2, tv1.forType(enc2));
-    } else {
-      assertNotSame(tv1, tv2);
+        assertNotNull(tv1);
+        assertNotNull(tv2);
+        assertEquals(seq1, tv1.forType(enc1));
+        assertEquals(seq2, tv2.forType(enc2));
+        if (same) {
+            assertSame(tv1, tv2);
+            assertEquals(seq2, tv1.forType(enc2));
+        } else {
+            assertNotSame(tv1, tv2);
+        }
     }
-  }
 
-  @TableTest({
-    "scenario          | seq1     | enc1    | s1 | e1 | seq2     | enc2    | s2 | e2 | same ",
-    "DD/DD same sub    | 'bbbar1' | DATADOG | 2  | 6  | 'rbar1r' | DATADOG | 1  | 5  | true ",
-    "W3C/DD same sub   | 'bar2ss' | W3C     | 0  | 4  | 'tbar2t' | DATADOG | 1  | 5  | true ",
-    "W3C ~ == DD = sub | 'bar3~s' | W3C     | 0  | 5  | 'tbar3=' | DATADOG | 1  | 6  | true ",
-    "W3C/W3C ~ sub     | 'bar4~s' | W3C     | 0  | 5  | 'tbar4~' | W3C     | 1  | 6  | true ",
-    "DD = == W3C ~ sub | 'sbar5=' | DATADOG | 1  | 6  | 'bar5~t' | W3C     | 0  | 5  | true ",
-    "DD ? != W3C ! sub | 'sbar6?' | DATADOG | 1  | 6  | 'bar5!t' | W3C     | 0  | 5  | false",
-    "DD , != W3C _ sub | 'sbar6,' | DATADOG | 1  | 6  | 'bar6_t' | W3C     | 0  | 5  | false"
-  })
-  void tagValuesShouldUseCachedValuesFromSubSequences(
-      String seq1,
-      Encoding enc1,
-      int s1,
-      int e1,
-      String seq2,
-      Encoding enc2,
-      int s2,
-      int e2,
-      boolean same) {
-    TagValue tv1 = TagValue.from(enc1, seq1, s1, e1);
-    String sub1 = seq1.substring(s1, e1);
-    TagValue tv2 = TagValue.from(enc2, seq2, s2, e2);
-    String sub2 = seq2.substring(s2, e2);
+    @TableTest({
+      "scenario          | seq1     | enc1    | s1 | e1 | seq2     | enc2    | s2 | e2 | same ",
+      "DD/DD same sub    | 'bbbar1' | DATADOG | 2  | 6  | 'rbar1r' | DATADOG | 1  | 5  | true ",
+      "W3C/DD same sub   | 'bar2ss' | W3C     | 0  | 4  | 'tbar2t' | DATADOG | 1  | 5  | true ",
+      "W3C ~ == DD = sub | 'bar3~s' | W3C     | 0  | 5  | 'tbar3=' | DATADOG | 1  | 6  | true ",
+      "W3C/W3C ~ sub     | 'bar4~s' | W3C     | 0  | 5  | 'tbar4~' | W3C     | 1  | 6  | true ",
+      "DD = == W3C ~ sub | 'sbar5=' | DATADOG | 1  | 6  | 'bar5~t' | W3C     | 0  | 5  | true ",
+      "DD ? != W3C ! sub | 'sbar6?' | DATADOG | 1  | 6  | 'bar5!t' | W3C     | 0  | 5  | false",
+      "DD , != W3C _ sub | 'sbar6,' | DATADOG | 1  | 6  | 'bar6_t' | W3C     | 0  | 5  | false"
+    })
+    void tagValuesShouldUseCachedValuesFromSubSequences(
+            String seq1, Encoding enc1, int s1, int e1, String seq2, Encoding enc2, int s2, int e2, boolean same) {
+        TagValue tv1 = TagValue.from(enc1, seq1, s1, e1);
+        String sub1 = seq1.substring(s1, e1);
+        TagValue tv2 = TagValue.from(enc2, seq2, s2, e2);
+        String sub2 = seq2.substring(s2, e2);
 
-    assertNotNull(tv1);
-    assertNotNull(tv2);
-    assertEquals(sub1, tv1.forType(enc1));
-    assertEquals(sub2, tv2.forType(enc2));
-    if (same) {
-      assertSame(tv1, tv2);
-      assertEquals(sub2, tv1.forType(enc2));
-    } else {
-      assertNotSame(tv1, tv2);
+        assertNotNull(tv1);
+        assertNotNull(tv2);
+        assertEquals(sub1, tv1.forType(enc1));
+        assertEquals(sub2, tv2.forType(enc2));
+        if (same) {
+            assertSame(tv1, tv2);
+            assertEquals(sub2, tv1.forType(enc2));
+        } else {
+            assertNotSame(tv1, tv2);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/IterationSpansForkedTest.java b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/IterationSpansForkedTest.java
index c73471994df..25fbd160b26 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/IterationSpansForkedTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/IterationSpansForkedTest.java
@@ -24,176 +24,176 @@
 @WithConfig(key = "trace.scope.iteration.keep.alive", value = "1")
 class IterationSpansForkedTest extends DDCoreJavaSpecification {
 
-  ListWriter writer;
-  CoreTracer tracer;
-  StatsDClient statsDClient;
-
-  @BeforeEach
-  void setup() {
-    writer = new ListWriter();
-    statsDClient = mock(StatsDClient.class);
-    tracer = tracerBuilder().writer(writer).statsDClient(statsDClient).build();
-  }
-
-  @AfterEach
-  void cleanup() throws Exception {
-    tracer.close();
-  }
-
-  @Test
-  void rootIterationScopeLifecycle() throws Exception {
-    tracer.closePrevious(true);
-    AgentSpan span1 = tracer.buildSpan("datadog", "next1").start();
-    ContextScope scope1 = tracer.activateNext(span1);
-
-    assertTrue(writer.isEmpty());
-    assertSame(span1, AgentSpan.fromScope(scope1));
-    assertSame(span1, tracer.activeSpan());
-    assertFalse(spanFinished(span1));
-
-    tracer.closePrevious(true);
-    AgentSpan span2 = tracer.buildSpan("datadog", "next2").start();
-    ContextScope scope2 = tracer.activateNext(span2);
-
-    assertTrue(spanFinished(span1));
-    assertEquals(1, writer.size());
-    assertSame(span1, writer.get(0).get(0));
-    assertSame(span2, AgentSpan.fromScope(scope2));
-    assertSame(span2, tracer.activeSpan());
-    assertFalse(spanFinished(span2));
-
-    tracer.closePrevious(true);
-    AgentSpan span3 = tracer.buildSpan("datadog", "next3").start();
-    ContextScope scope3 = tracer.activateNext(span3);
-    writer.waitForTraces(2);
-
-    assertTrue(spanFinished(span2));
-    assertEquals(2, writer.size());
-    assertSame(span3, AgentSpan.fromScope(scope3));
-    assertSame(span3, tracer.activeSpan());
-    assertFalse(spanFinished(span3));
-
-    // 'next3' should time out & finish after 1s
-    writer.waitForTraces(3);
-
-    assertTrue(spanFinished(span3));
-    assertEquals(3, writer.size());
-    assertNull(tracer.activeSpan());
-  }
-
-  @Test
-  void nonRootIterationScopeLifecycle() throws Exception {
-    AgentSpan span0 = tracer.buildSpan("datadog", "parent").start();
-    ContextScope scope0 = tracer.activateSpan(span0);
-
-    tracer.closePrevious(true);
-    AgentSpan span1 = tracer.buildSpan("datadog", "next1").start();
-    ContextScope scope1 = tracer.activateNext(span1);
-
-    assertTrue(writer.isEmpty());
-    assertSame(span1, AgentSpan.fromScope(scope1));
-    assertSame(span1, tracer.activeSpan());
-    assertFalse(spanFinished(span1));
-
-    tracer.closePrevious(true);
-    AgentSpan span2 = tracer.buildSpan("datadog", "next2").start();
-    ContextScope scope2 = tracer.activateNext(span2);
-
-    assertTrue(spanFinished(span1));
-    assertTrue(writer.isEmpty());
-    assertSame(span2, AgentSpan.fromScope(scope2));
-    assertSame(span2, tracer.activeSpan());
-    assertFalse(spanFinished(span2));
-
-    tracer.closePrevious(true);
-    AgentSpan span3 = tracer.buildSpan("datadog", "next3").start();
-    ContextScope scope3 = tracer.activateNext(span3);
-
-    assertTrue(spanFinished(span2));
-    assertTrue(writer.isEmpty());
-    assertSame(span3, AgentSpan.fromScope(scope3));
-    assertSame(span3, tracer.activeSpan());
-    assertFalse(spanFinished(span3));
-
-    scope0.close();
-    span0.finish();
-    // closing the parent scope will close & finish 'next3'
-    writer.waitForTraces(1);
-
-    assertTrue(spanFinished(span3));
-    assertTrue(spanFinished(span0));
-    sortSpansByStart();
-    List<DDSpan> trace = writer.get(0);
-    assertEquals(4, trace.size());
-    assertSame(span0, trace.get(0));
-    assertSame(span1, trace.get(1));
-    assertSame(span2, trace.get(2));
-    assertSame(span3, trace.get(3));
-    assertNull(tracer.activeSpan());
-  }
-
-  @Test
-  void nestedIterationScopeLifecycle() throws Exception {
-    tracer.closePrevious(true);
-    AgentSpan span1 = tracer.buildSpan("datadog", "next").start();
-    ContextScope scope1 = tracer.activateNext(span1);
-
-    assertTrue(writer.isEmpty());
-    assertSame(span1, AgentSpan.fromScope(scope1));
-    assertSame(span1, tracer.activeSpan());
-    assertFalse(spanFinished(span1));
-
-    AgentSpan span1A = tracer.buildSpan("datadog", "method").start();
-    ContextScope scope1A = tracer.activateSpan(span1A);
-
-    tracer.closePrevious(true);
-    AgentSpan span1A1 = tracer.buildSpan("datadog", "next").start();
-    ContextScope scope1A1 = tracer.activateNext(span1A1);
-
-    assertFalse(spanFinished(span1));
-    assertTrue(writer.isEmpty());
-    assertSame(span1A1, AgentSpan.fromScope(scope1A1));
-    assertSame(span1A1, tracer.activeSpan());
-    assertFalse(spanFinished(span1A1));
-
-    tracer.closePrevious(true);
-    AgentSpan span1A2 = tracer.buildSpan("datadog", "next").start();
-    ContextScope scope1A2 = tracer.activateNext(span1A2);
-
-    assertTrue(spanFinished(span1A1));
-    assertTrue(writer.isEmpty());
-    assertSame(span1A2, AgentSpan.fromScope(scope1A2));
-    assertSame(span1A2, tracer.activeSpan());
-    assertFalse(spanFinished(span1A2));
-
-    // closing the intervening scope will close & finish 'next1A2'
-    scope1A.close();
-    span1A.finish();
-
-    assertTrue(spanFinished(span1A2));
-    assertTrue(spanFinished(span1A));
-    assertFalse(spanFinished(span1));
-    assertTrue(writer.isEmpty());
-
-    // 'next1' should time out & finish after 1s to complete the trace
-    writer.waitForTraces(1);
-
-    assertTrue(spanFinished(span1));
-    sortSpansByStart();
-    List<DDSpan> trace = writer.get(0);
-    assertEquals(4, trace.size());
-    assertSame(span1, trace.get(0));
-    assertSame(span1A, trace.get(1));
-    assertSame(span1A1, trace.get(2));
-    assertSame(span1A2, trace.get(3));
-    assertNull(tracer.activeSpan());
-  }
-
-  private boolean spanFinished(AgentSpan span) {
-    return span instanceof DDSpan && ((DDSpan) span).isFinished();
-  }
-
-  private void sortSpansByStart() {
-    writer.firstTrace().sort(Comparator.comparingLong(DDSpan::getStartTimeNano));
-  }
+    ListWriter writer;
+    CoreTracer tracer;
+    StatsDClient statsDClient;
+
+    @BeforeEach
+    void setup() {
+        writer = new ListWriter();
+        statsDClient = mock(StatsDClient.class);
+        tracer = tracerBuilder().writer(writer).statsDClient(statsDClient).build();
+    }
+
+    @AfterEach
+    void cleanup() throws Exception {
+        tracer.close();
+    }
+
+    @Test
+    void rootIterationScopeLifecycle() throws Exception {
+        tracer.closePrevious(true);
+        AgentSpan span1 = tracer.buildSpan("datadog", "next1").start();
+        ContextScope scope1 = tracer.activateNext(span1);
+
+        assertTrue(writer.isEmpty());
+        assertSame(span1, AgentSpan.fromScope(scope1));
+        assertSame(span1, tracer.activeSpan());
+        assertFalse(spanFinished(span1));
+
+        tracer.closePrevious(true);
+        AgentSpan span2 = tracer.buildSpan("datadog", "next2").start();
+        ContextScope scope2 = tracer.activateNext(span2);
+
+        assertTrue(spanFinished(span1));
+        assertEquals(1, writer.size());
+        assertSame(span1, writer.get(0).get(0));
+        assertSame(span2, AgentSpan.fromScope(scope2));
+        assertSame(span2, tracer.activeSpan());
+        assertFalse(spanFinished(span2));
+
+        tracer.closePrevious(true);
+        AgentSpan span3 = tracer.buildSpan("datadog", "next3").start();
+        ContextScope scope3 = tracer.activateNext(span3);
+        writer.waitForTraces(2);
+
+        assertTrue(spanFinished(span2));
+        assertEquals(2, writer.size());
+        assertSame(span3, AgentSpan.fromScope(scope3));
+        assertSame(span3, tracer.activeSpan());
+        assertFalse(spanFinished(span3));
+
+        // 'next3' should time out & finish after 1s
+        writer.waitForTraces(3);
+
+        assertTrue(spanFinished(span3));
+        assertEquals(3, writer.size());
+        assertNull(tracer.activeSpan());
+    }
+
+    @Test
+    void nonRootIterationScopeLifecycle() throws Exception {
+        AgentSpan span0 = tracer.buildSpan("datadog", "parent").start();
+        ContextScope scope0 = tracer.activateSpan(span0);
+
+        tracer.closePrevious(true);
+        AgentSpan span1 = tracer.buildSpan("datadog", "next1").start();
+        ContextScope scope1 = tracer.activateNext(span1);
+
+        assertTrue(writer.isEmpty());
+        assertSame(span1, AgentSpan.fromScope(scope1));
+        assertSame(span1, tracer.activeSpan());
+        assertFalse(spanFinished(span1));
+
+        tracer.closePrevious(true);
+        AgentSpan span2 = tracer.buildSpan("datadog", "next2").start();
+        ContextScope scope2 = tracer.activateNext(span2);
+
+        assertTrue(spanFinished(span1));
+        assertTrue(writer.isEmpty());
+        assertSame(span2, AgentSpan.fromScope(scope2));
+        assertSame(span2, tracer.activeSpan());
+        assertFalse(spanFinished(span2));
+
+        tracer.closePrevious(true);
+        AgentSpan span3 = tracer.buildSpan("datadog", "next3").start();
+        ContextScope scope3 = tracer.activateNext(span3);
+
+        assertTrue(spanFinished(span2));
+        assertTrue(writer.isEmpty());
+        assertSame(span3, AgentSpan.fromScope(scope3));
+        assertSame(span3, tracer.activeSpan());
+        assertFalse(spanFinished(span3));
+
+        scope0.close();
+        span0.finish();
+        // closing the parent scope will close & finish 'next3'
+        writer.waitForTraces(1);
+
+        assertTrue(spanFinished(span3));
+        assertTrue(spanFinished(span0));
+        sortSpansByStart();
+        List<DDSpan> trace = writer.get(0);
+        assertEquals(4, trace.size());
+        assertSame(span0, trace.get(0));
+        assertSame(span1, trace.get(1));
+        assertSame(span2, trace.get(2));
+        assertSame(span3, trace.get(3));
+        assertNull(tracer.activeSpan());
+    }
+
+    @Test
+    void nestedIterationScopeLifecycle() throws Exception {
+        tracer.closePrevious(true);
+        AgentSpan span1 = tracer.buildSpan("datadog", "next").start();
+        ContextScope scope1 = tracer.activateNext(span1);
+
+        assertTrue(writer.isEmpty());
+        assertSame(span1, AgentSpan.fromScope(scope1));
+        assertSame(span1, tracer.activeSpan());
+        assertFalse(spanFinished(span1));
+
+        AgentSpan span1A = tracer.buildSpan("datadog", "method").start();
+        ContextScope scope1A = tracer.activateSpan(span1A);
+
+        tracer.closePrevious(true);
+        AgentSpan span1A1 = tracer.buildSpan("datadog", "next").start();
+        ContextScope scope1A1 = tracer.activateNext(span1A1);
+
+        assertFalse(spanFinished(span1));
+        assertTrue(writer.isEmpty());
+        assertSame(span1A1, AgentSpan.fromScope(scope1A1));
+        assertSame(span1A1, tracer.activeSpan());
+        assertFalse(spanFinished(span1A1));
+
+        tracer.closePrevious(true);
+        AgentSpan span1A2 = tracer.buildSpan("datadog", "next").start();
+        ContextScope scope1A2 = tracer.activateNext(span1A2);
+
+        assertTrue(spanFinished(span1A1));
+        assertTrue(writer.isEmpty());
+        assertSame(span1A2, AgentSpan.fromScope(scope1A2));
+        assertSame(span1A2, tracer.activeSpan());
+        assertFalse(spanFinished(span1A2));
+
+        // closing the intervening scope will close & finish 'next1A2'
+        scope1A.close();
+        span1A.finish();
+
+        assertTrue(spanFinished(span1A2));
+        assertTrue(spanFinished(span1A));
+        assertFalse(spanFinished(span1));
+        assertTrue(writer.isEmpty());
+
+        // 'next1' should time out & finish after 1s to complete the trace
+        writer.waitForTraces(1);
+
+        assertTrue(spanFinished(span1));
+        sortSpansByStart();
+        List<DDSpan> trace = writer.get(0);
+        assertEquals(4, trace.size());
+        assertSame(span1, trace.get(0));
+        assertSame(span1A, trace.get(1));
+        assertSame(span1A1, trace.get(2));
+        assertSame(span1A2, trace.get(3));
+        assertNull(tracer.activeSpan());
+    }
+
+    private boolean spanFinished(AgentSpan span) {
+        return span instanceof DDSpan && ((DDSpan) span).isFinished();
+    }
+
+    private void sortSpansByStart() {
+        writer.firstTrace().sort(Comparator.comparingLong(DDSpan::getStartTimeNano));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeAndContinuationLayoutTest.java b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeAndContinuationLayoutTest.java
index 53d40ce391d..51bfe997414 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeAndContinuationLayoutTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeAndContinuationLayoutTest.java
@@ -11,24 +11,24 @@
 
 class ScopeAndContinuationLayoutTest extends DDJavaSpecification {
 
-  @BeforeAll
-  static void assumeNotIbmJvm() {
-    assumeFalse(JavaVirtualMachine.isJ9());
-  }
+    @BeforeAll
+    static void assumeNotIbmJvm() {
+        assumeFalse(JavaVirtualMachine.isJ9());
+    }
 
-  @Test
-  void continuableScopeLayout() {
-    assertTrue(layoutAcceptable(ContinuableScope.class, 32));
-  }
+    @Test
+    void continuableScopeLayout() {
+        assertTrue(layoutAcceptable(ContinuableScope.class, 32));
+    }
 
-  @Test
-  void singleContinuationLayout() {
-    assertTrue(layoutAcceptable(ScopeContinuation.class, 32));
-  }
+    @Test
+    void singleContinuationLayout() {
+        assertTrue(layoutAcceptable(ScopeContinuation.class, 32));
+    }
 
-  private boolean layoutAcceptable(Class<?> klass, int acceptableSize) {
-    ClassLayout layout = ClassLayout.parseClass(klass);
-    System.err.println(layout.toPrintable());
-    return layout.instanceSize() <= acceptableSize;
-  }
+    private boolean layoutAcceptable(Class<?> klass, int acceptableSize) {
+        ClassLayout layout = ClassLayout.parseClass(klass);
+        System.err.println(layout.toPrintable());
+        return layout.instanceSize() <= acceptableSize;
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerDepthTest.java b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerDepthTest.java
index 02b1ae943ed..682198f7d20 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerDepthTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerDepthTest.java
@@ -17,112 +17,112 @@
 
 class ScopeManagerDepthTest extends DDCoreJavaSpecification {
 
-  @Test
-  void scopeManagerReturnsNoopScopeIfDepthExceeded() {
-    // Using a local constant here to avoid classloading issues with ConfigDefaults
-    int depth = 100;
-
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    ContinuableScopeManager scopeManager = ScopeManagerTestBridge.getScopeManager(tracer);
-
-    // fill up the scope stack
-    ContextScope scope = null;
-    for (int i = 0; i < depth; i++) {
-      AgentSpan testSpan = tracer.buildSpan("test", "test").start();
-      scope = tracer.activateSpan(testSpan);
-      assertInstanceOf(ContinuableScope.class, scope);
-    }
-
-    // last scope is still valid
-    assertEquals(depth, scopeManager.scopeStack().depth());
+    @Test
+    void scopeManagerReturnsNoopScopeIfDepthExceeded() {
+        // Using a local constant here to avoid classloading issues with ConfigDefaults
+        int depth = 100;
 
-    // activate span over limit
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    scope = tracer.activateSpan(span);
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        ContinuableScopeManager scopeManager = ScopeManagerTestBridge.getScopeManager(tracer);
 
-    // a noop instance is returned
-    assertInstanceOf(NoopScope.class, scope);
+        // fill up the scope stack
+        ContextScope scope = null;
+        for (int i = 0; i < depth; i++) {
+            AgentSpan testSpan = tracer.buildSpan("test", "test").start();
+            scope = tracer.activateSpan(testSpan);
+            assertInstanceOf(ContinuableScope.class, scope);
+        }
 
-    // activate a noop scope over the limit
-    scope = scopeManager.activateManualSpan(noopSpan());
+        // last scope is still valid
+        assertEquals(depth, scopeManager.scopeStack().depth());
 
-    // still have a noop instance
-    assertInstanceOf(NoopScope.class, scope);
+        // activate span over limit
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        scope = tracer.activateSpan(span);
 
-    // scope stack not effected
-    assertEquals(depth, scopeManager.scopeStack().depth());
+        // a noop instance is returned
+        assertInstanceOf(NoopScope.class, scope);
 
-    scopeManager.scopeStack().clear();
-    tracer.close();
-  }
+        // activate a noop scope over the limit
+        scope = scopeManager.activateManualSpan(noopSpan());
 
-  @Test
-  @WithConfig(key = TracerConfig.SCOPE_DEPTH_LIMIT, value = "0")
-  void scopeManagerIgnoresDepthLimitWhenZero() {
-    // Using a local constant here to avoid classloading issues with ConfigDefaults
-    int defaultLimit = 100;
+        // still have a noop instance
+        assertInstanceOf(NoopScope.class, scope);
 
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    ContinuableScopeManager scopeManager = ScopeManagerTestBridge.getScopeManager(tracer);
+        // scope stack not effected
+        assertEquals(depth, scopeManager.scopeStack().depth());
 
-    // fill up the scope stack
-    ContextScope scope = null;
-    for (int i = 0; i < defaultLimit; i++) {
-      AgentSpan testSpan = tracer.buildSpan("test", "test").start();
-      scope = tracer.activateSpan(testSpan);
-      assertInstanceOf(ContinuableScope.class, scope);
+        scopeManager.scopeStack().clear();
+        tracer.close();
     }
 
-    // last scope is still valid
-    assertEquals(defaultLimit, scopeManager.scopeStack().depth());
+    @Test
+    @WithConfig(key = TracerConfig.SCOPE_DEPTH_LIMIT, value = "0")
+    void scopeManagerIgnoresDepthLimitWhenZero() {
+        // Using a local constant here to avoid classloading issues with ConfigDefaults
+        int defaultLimit = 100;
 
-    // activate a scope
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    scope = tracer.activateSpan(span);
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        ContinuableScopeManager scopeManager = ScopeManagerTestBridge.getScopeManager(tracer);
 
-    // a real scope is returned
-    assertInstanceOf(ContinuableScope.class, scope);
-    assertEquals(defaultLimit + 1, scopeManager.scopeStack().depth());
+        // fill up the scope stack
+        ContextScope scope = null;
+        for (int i = 0; i < defaultLimit; i++) {
+            AgentSpan testSpan = tracer.buildSpan("test", "test").start();
+            scope = tracer.activateSpan(testSpan);
+            assertInstanceOf(ContinuableScope.class, scope);
+        }
 
-    // activate a noop span
-    scope = scopeManager.activateManualSpan(noopSpan());
+        // last scope is still valid
+        assertEquals(defaultLimit, scopeManager.scopeStack().depth());
 
-    // a real instance is still returned
-    assertInstanceOf(ContinuableScope.class, scope);
+        // activate a scope
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        scope = tracer.activateSpan(span);
 
-    // scope stack not effected
-    assertEquals(defaultLimit + 2, scopeManager.scopeStack().depth());
+        // a real scope is returned
+        assertInstanceOf(ContinuableScope.class, scope);
+        assertEquals(defaultLimit + 1, scopeManager.scopeStack().depth());
 
-    scopeManager.scopeStack().clear();
-    tracer.close();
-  }
+        // activate a noop span
+        scope = scopeManager.activateManualSpan(noopSpan());
 
-  @Test
-  void depthIsCorrectlyUpdatedWithOutOfOrderClosing() {
-    // The decision here is that depth is the top-most open scope
-    // Closed scopes that are not on top still count for depth
+        // a real instance is still returned
+        assertInstanceOf(ContinuableScope.class, scope);
 
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    ContinuableScopeManager scopeManager = ScopeManagerTestBridge.getScopeManager(tracer);
+        // scope stack not effected
+        assertEquals(defaultLimit + 2, scopeManager.scopeStack().depth());
+
+        scopeManager.scopeStack().clear();
+        tracer.close();
+    }
 
-    AgentSpan firstSpan = tracer.buildSpan("test", "foo").start();
-    ContextScope firstScope = tracer.activateSpan(firstSpan);
+    @Test
+    void depthIsCorrectlyUpdatedWithOutOfOrderClosing() {
+        // The decision here is that depth is the top-most open scope
+        // Closed scopes that are not on top still count for depth
 
-    AgentSpan secondSpan = tracer.buildSpan("test", "foo").start();
-    ContextScope secondScope = tracer.activateSpan(secondSpan);
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        ContinuableScopeManager scopeManager = ScopeManagerTestBridge.getScopeManager(tracer);
 
-    assertEquals(2, scopeManager.scopeStack().depth());
+        AgentSpan firstSpan = tracer.buildSpan("test", "foo").start();
+        ContextScope firstScope = tracer.activateSpan(firstSpan);
 
-    firstSpan.finish();
-    firstScope.close();
+        AgentSpan secondSpan = tracer.buildSpan("test", "foo").start();
+        ContextScope secondScope = tracer.activateSpan(secondSpan);
 
-    assertEquals(2, scopeManager.scopeStack().depth());
+        assertEquals(2, scopeManager.scopeStack().depth());
 
-    secondSpan.finish();
-    secondScope.close();
+        firstSpan.finish();
+        firstScope.close();
 
-    assertEquals(0, scopeManager.scopeStack().depth());
+        assertEquals(2, scopeManager.scopeStack().depth());
 
-    tracer.close();
-  }
+        secondSpan.finish();
+        secondScope.close();
+
+        assertEquals(0, scopeManager.scopeStack().depth());
+
+        tracer.close();
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerForkedTest.java b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerForkedTest.java
index 78dbe9d3a7c..20dbdec139f 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerForkedTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerForkedTest.java
@@ -63,1179 +63,1170 @@
 
 class ScopeManagerForkedTest extends DDCoreJavaSpecification {
 
-  enum EVENT {
-    ACTIVATE,
-    CLOSE
-  }
-
-  @Override
-  protected boolean useStrictTraceWrites() {
-    // This tests the behavior of the relaxed pending trace implementation
-    return false;
-  }
-
-  ListWriter writer;
-  CoreTracer tracer;
-  ContinuableScopeManager scopeManager;
-  EventCountingListener eventCountingListener;
-  EventCountingExtendedListener eventCountingExtendedListener;
-  ProfilingContextIntegration profilingContext;
-  Stateful state;
-
-  @BeforeAll
-  static void installLegacyContextManager() {
-    // this test requires use of legacy context manager
-    AgentTracer.installLegacyContextManager();
-  }
-
-  @BeforeEach
-  void setup() {
-    state = mock(Stateful.class);
-    profilingContext = mock(ProfilingContextIntegration.class);
-    when(profilingContext.newScopeState(any())).thenReturn(state);
-    when(profilingContext.name()).thenReturn("mock");
-    writer = new ListWriter();
-    tracer = tracerBuilder().writer(writer).profilingContextIntegration(profilingContext).build();
-    AgentTracer.forceRegister(tracer);
-    scopeManager = ScopeManagerTestBridge.getScopeManager(tracer);
-    eventCountingListener = new EventCountingListener();
-    scopeManager.addScopeListener(eventCountingListener);
-    eventCountingExtendedListener = new EventCountingExtendedListener();
-    scopeManager.addScopeListener(eventCountingExtendedListener);
-    // Clear interactions recorded during tracer initialization so each test starts clean
-    clearInvocations(profilingContext);
-  }
-
-  @AfterEach
-  void cleanup() {
-    tracer.close();
-  }
-
-  @Test
-  void nonDdspanActivationResultsInAContinuableScope() {
-    ContextScope scope = scopeManager.activateSpan(noopSpan());
-
-    assertSame(scope, scopeManager.active());
-    assertInstanceOf(ContinuableScope.class, scope);
-
-    scope.close();
-
-    assertNull(scopeManager.active());
-  }
-
-  @Test
-  void noScopeIsActiveBeforeActivation() throws Exception {
-    tracer.buildSpan("test", "test").start();
-
-    assertNull(scopeManager.active());
-    assertTrue(writer.isEmpty());
-  }
-
-  @Test
-  void simpleScopeAndSpanLifecycle() throws Exception {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    ContextScope scope = tracer.activateSpan(span);
-
-    assertSame(span, AgentSpan.fromScope(scope));
-    assertFalse(spanFinished(AgentSpan.fromScope(scope)));
-    assertSame(scope, scopeManager.active());
-    assertInstanceOf(ContinuableScope.class, scope);
-    assertTrue(writer.isEmpty());
-
-    scope.close();
-
-    assertFalse(spanFinished(AgentSpan.fromScope(scope)));
-    assertTrue(writer.isEmpty());
-    assertNull(scopeManager.active());
-
-    span.finish();
-    writer.waitForTraces(1);
-
-    assertTrue(spanFinished(AgentSpan.fromScope(scope)));
-    assertEquals(1, writer.size());
-    assertSame(AgentSpan.fromScope(scope), writer.get(0).get(0));
-    assertNull(scopeManager.active());
-  }
-
-  @Test
-  void setsParentAsCurrentUponClose() {
-    AgentSpan parentSpan = tracer.buildSpan("test", "parent").start();
-    ContextScope parentScope = tracer.activateSpan(parentSpan);
-    AgentSpan childSpan = tracer.buildSpan("test", "child").start();
-    ContextScope childScope = tracer.activateSpan(childSpan);
-
-    assertSame(childScope, scopeManager.active());
-    assertEquals(
-        AgentSpan.fromScope(parentScope).spanContext().getSpanId(),
-        ((DDSpan) AgentSpan.fromScope(childScope)).spanContext().getParentId());
-    assertSame(
-        AgentSpan.fromScope(parentScope).spanContext().getTraceCollector(),
-        AgentSpan.fromScope(childScope).spanContext().getTraceCollector());
-
-    childScope.close();
-
-    assertSame(parentScope, scopeManager.active());
-    assertFalse(spanFinished(AgentSpan.fromScope(childScope)));
-    assertFalse(spanFinished(AgentSpan.fromScope(parentScope)));
-    assertTrue(writer.isEmpty());
-  }
-
-  @Test
-  void setsParentAsCurrentUponCloseWithNoopChild() {
-    AgentSpan parentSpan = tracer.buildSpan("test", "parent").start();
-    ContextScope parentScope = tracer.activateSpan(parentSpan);
-    AgentSpan childSpan = noopSpan();
-    ContextScope childScope = tracer.activateSpan(childSpan);
-
-    assertSame(childScope, scopeManager.active());
-
-    childScope.close();
-
-    assertSame(parentScope, scopeManager.active());
-    assertFalse(spanFinished(AgentSpan.fromScope(parentScope)));
-    assertTrue(writer.isEmpty());
-  }
-
-  @Test
-  void ddScopeCreatesNoOpContinuationsWhenPropagationIsNotSet() {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    tracer.activateSpan(span);
-    tracer.setAsyncPropagationEnabled(false);
-    ContextContinuation continuation = Context.current().capture();
-
-    assertSame(Context.root(), continuation.context());
-
-    tracer.setAsyncPropagationEnabled(true);
-    continuation = Context.current().capture();
-
-    assertNotSame(Context.root(), continuation.context());
-    assertNotNull(continuation);
+    enum EVENT {
+        ACTIVATE,
+        CLOSE
+    }
 
-    continuation.release();
-  }
+    @Override
+    protected boolean useStrictTraceWrites() {
+        // This tests the behavior of the relaxed pending trace implementation
+        return false;
+    }
 
-  @Test
-  void continuationCancelDoesNotCloseParentScope() {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    ContextScope scope = tracer.activateSpan(span);
-    ContextContinuation continuation = Context.current().capture();
-
-    assertNotNull(continuation);
-
-    continuation.release();
-
-    assertSame(scope, scopeManager.active());
-  }
-
-  // @Flaky("awaitGC is flaky")
-  @Test
-  void testContinuationDoesNotHaveHardReferenceOnScope() throws InterruptedException {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    AtomicReference<ContextScope> scopeRef = new AtomicReference<>(tracer.activateSpan(span));
-    ContextContinuation continuation = Context.current().capture();
-
-    assertNotNull(continuation);
-
-    scopeRef.get().close();
-
-    assertNull(scopeManager.active());
-
-    WeakReference<ContextScope> ref = new WeakReference<>(scopeRef.get());
-    scopeRef.set(null);
-    awaitGC(ref);
-
-    assertNotNull(continuation);
-    assertNull(ref.get());
-    assertFalse(spanFinished(span));
-    assertTrue(writer.isEmpty());
-  }
-
-  @ValueSource(booleans = {true, false})
-  @ParameterizedTest
-  void hardReferenceOnContinuationDoesNotPreventTraceFromReporting(boolean autoClose)
-      throws Exception {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    ContextScope scope = tracer.activateSpan(span);
-    ContextContinuation continuation = Context.current().capture();
-
-    assertNotNull(continuation);
-
-    scope.close();
-    span.finish();
-    if (autoClose) {
-      continuation.release();
+    ListWriter writer;
+    CoreTracer tracer;
+    ContinuableScopeManager scopeManager;
+    EventCountingListener eventCountingListener;
+    EventCountingExtendedListener eventCountingExtendedListener;
+    ProfilingContextIntegration profilingContext;
+    Stateful state;
+
+    @BeforeAll
+    static void installLegacyContextManager() {
+        // this test requires use of legacy context manager
+        AgentTracer.installLegacyContextManager();
     }
 
-    assertNull(scopeManager.active());
-    assertTrue(spanFinished(span));
-
-    writer.waitForTraces(1);
-
-    assertEquals(1, writer.size());
-    assertSame(span, writer.get(0).get(0));
-  }
-
-  @Test
-  void continuationRestoresTrace() throws Exception {
-    AgentSpan parentSpan = tracer.buildSpan("test", "parent").start();
-    ContextScope parentScope = tracer.activateSpan(parentSpan);
-    AgentSpan childSpan = tracer.buildSpan("test", "child").start();
-    ContextScope childScope = tracer.activateSpan(childSpan);
-
-    ContextContinuation continuation = Context.current().capture();
-    childScope.close();
-
-    assertNotNull(continuation);
-    assertSame(parentScope, scopeManager.active());
-    assertFalse(spanFinished(childSpan));
-    assertFalse(spanFinished(parentSpan));
-
-    parentScope.close();
-    parentSpan.finish();
-
-    // parent span is finished, but trace is not reported
-    assertNull(scopeManager.active());
-    assertFalse(spanFinished(childSpan));
-    assertTrue(spanFinished(parentSpan));
-    assertTrue(writer.isEmpty());
-
-    // activating the continuation
-    ContextScope newScope = continuation.resume();
-
-    // the continued scope becomes active and span state doesn't change
-    assertInstanceOf(ContinuableScope.class, newScope);
-    assertTrue(tracer.isAsyncPropagationEnabled());
-    assertSame(newScope, scopeManager.active());
-    assertNotSame(childScope, newScope);
-    assertNotSame(parentScope, newScope);
-    assertSame(childSpan, AgentSpan.fromContext(newScope.context()));
-    assertFalse(spanFinished(childSpan));
-    assertTrue(spanFinished(parentSpan));
-    assertTrue(writer.isEmpty());
-
-    // creating and activating a second continuation
-    ContextContinuation newContinuation = Context.current().capture();
-    newScope.close();
-    ContextScope secondContinuedScope = newContinuation.resume();
-    secondContinuedScope.close();
-    childSpan.finish();
-    writer.waitForTraces(1);
-
-    // spans are all finished and trace is reported
-    assertNull(scopeManager.active());
-    assertTrue(spanFinished(childSpan));
-    assertTrue(spanFinished(parentSpan));
-    assertEquals(1, writer.size());
-    assertTrue(writer.get(0).containsAll(Arrays.asList(childSpan, parentSpan)));
-  }
-
-  @Test
-  void continuationAllowsAddingSpansEvenAfterOtherSpansWereCompleted() throws Exception {
-    // creating and activating a continuation
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    ContextScope scope = tracer.activateSpan(span);
-    ContextContinuation continuation = Context.current().capture();
-    scope.close();
-    span.finish();
-
-    ContextScope newScope = continuation.resume();
-
-    // the continuation sets the active scope
-    assertInstanceOf(ContinuableScope.class, newScope);
-    assertNotSame(scope, newScope);
-    assertSame(newScope, scopeManager.active());
-    assertTrue(spanFinished(span));
-    assertTrue(writer.isEmpty());
-
-    // creating a new child span under a continued scope
-    AgentSpan childSpan = tracer.buildSpan("test", "child").start();
-    ContextScope childScope = tracer.activateSpan(childSpan);
-    childScope.close();
-    childSpan.finish();
-
-    assertSame(newScope, scopeManager.active());
-
-    scopeManager.active().close();
-    writer.waitForTraces(1);
-
-    // the child has the correct parent
-    assertNull(scopeManager.active());
-    assertTrue(spanFinished(childSpan));
-    assertEquals(span.spanContext().getSpanId(), ((DDSpan) childSpan).spanContext().getParentId());
-    assertEquals(1, writer.size());
-    assertTrue(writer.get(0).containsAll(Arrays.asList(childSpan, span)));
-  }
-
-  @Test
-  void testActivatingSameSpanMultipleTimes() {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    Stateful localState = mock(Stateful.class);
-    when(profilingContext.newScopeState(any())).thenReturn(localState);
-    clearInvocations(profilingContext);
-
-    ContextScope scope1 = scopeManager.activateSpan(span);
-
-    assertEvents(Arrays.asList(ACTIVATE));
-    verify(profilingContext, times(1)).newScopeState(any());
-    clearInvocations(profilingContext);
-
-    ContextScope scope2 = scopeManager.activateSpan(span);
-
-    // Activating the same span multiple times does not create a new scope
-    assertEvents(Arrays.asList(ACTIVATE));
-    verify(profilingContext, never()).newScopeState(any());
-    clearInvocations(profilingContext);
-
-    scope2.close();
-
-    // Closing a scope once that has been activated multiple times does not close
-    assertEvents(Arrays.asList(ACTIVATE));
-    verify(localState, never()).close();
-    clearInvocations(localState);
-
-    scope1.close();
-
-    assertEvents(Arrays.asList(ACTIVATE, CLOSE));
-    verify(localState, times(1)).close();
-  }
-
-  @Test
-  void openingAndClosingMultipleScopes() {
-    AgentSpan span = tracer.buildSpan("test", "foo").start();
-    ContextScope continuableScope = tracer.activateSpan(span);
-
-    assertInstanceOf(ContinuableScope.class, continuableScope);
-    assertEvents(Arrays.asList(ACTIVATE));
-
-    AgentSpan childSpan = tracer.buildSpan("test", "foo").start();
-    ContextScope childDDScope = tracer.activateSpan(childSpan);
-
-    assertInstanceOf(ContinuableScope.class, childDDScope);
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE));
-
-    childDDScope.close();
-    childSpan.finish();
-
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, ACTIVATE));
-
-    continuableScope.close();
-    span.finish();
-
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, ACTIVATE, CLOSE));
-  }
-
-  @Test
-  void closingScopeOutOfOrderSimple() {
-    AgentSpan firstSpan = tracer.buildSpan("test", "foo").start();
-    ContextScope firstScope = tracer.activateSpan(firstSpan);
-
-    AgentSpan secondSpan = tracer.buildSpan("test", "bar").start();
-    ContextScope secondScope = tracer.activateSpan(secondSpan);
-
-    firstSpan.finish();
-    firstScope.close();
-
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE));
-    verify(profilingContext, times(1)).onRootSpanStarted(any());
-    verify(profilingContext, times(1)).onAttach();
-    verify(profilingContext, times(1)).encodeOperationName("foo");
-    verify(profilingContext, times(1)).encodeOperationName("bar");
-    verify(profilingContext, times(2)).newScopeState(any());
-    verifyNoMoreInteractions(profilingContext);
-    clearInvocations(profilingContext);
-
-    secondSpan.finish();
-    secondScope.close();
-
-    verify(profilingContext, times(1)).onRootSpanFinished(any(), any());
-    verify(profilingContext, times(1)).onDetach();
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, CLOSE));
-    verifyNoMoreInteractions(profilingContext);
-    clearInvocations(profilingContext);
-
-    firstScope.close();
-
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, CLOSE));
-  }
-
-  @Test
-  void closingScopeOutOfOrderComplex() {
-    // Events are checked twice in each case to ensure a call to
-    // scopeManager.active() or tracer.activeSpan() doesn't change the count
-
-    AgentSpan firstSpan = tracer.buildSpan("test", "foo").start();
-    ContextScope firstScope = tracer.activateSpan(firstSpan);
-
-    assertEvents(Arrays.asList(ACTIVATE));
-    assertSame(firstSpan, tracer.activeSpan());
-    assertSame(firstScope, scopeManager.active());
-    assertEvents(Arrays.asList(ACTIVATE));
-    verify(profilingContext, times(1)).onRootSpanStarted(any());
-    verify(profilingContext, times(1)).onAttach();
-    verify(profilingContext, times(1)).encodeOperationName("foo");
-    verify(profilingContext, times(1)).newScopeState(any());
-    verifyNoMoreInteractions(profilingContext);
-    clearInvocations(profilingContext);
-
-    AgentSpan secondSpan = tracer.buildSpan("test", "bar").start();
-    ContextScope secondScope = tracer.activateSpan(secondSpan);
-
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE));
-    assertSame(secondSpan, tracer.activeSpan());
-    assertSame(secondScope, scopeManager.active());
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE));
-    verify(profilingContext, times(1)).encodeOperationName("bar");
-    verify(profilingContext, times(1)).newScopeState(any());
-    verifyNoMoreInteractions(profilingContext);
-    clearInvocations(profilingContext);
-
-    AgentSpan thirdSpan = tracer.buildSpan("test", "quux").start();
-    ContextScope thirdScope = tracer.activateSpan(thirdSpan);
-
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE));
-    assertSame(thirdSpan, tracer.activeSpan());
-    assertSame(thirdScope, scopeManager.active());
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE));
-    verify(profilingContext, times(1)).encodeOperationName("quux");
-    verify(profilingContext, times(1)).newScopeState(any());
-    verifyNoMoreInteractions(profilingContext);
-    clearInvocations(profilingContext);
-
-    secondScope.close();
+    @BeforeEach
+    void setup() {
+        state = mock(Stateful.class);
+        profilingContext = mock(ProfilingContextIntegration.class);
+        when(profilingContext.newScopeState(any())).thenReturn(state);
+        when(profilingContext.name()).thenReturn("mock");
+        writer = new ListWriter();
+        tracer = tracerBuilder()
+                .writer(writer)
+                .profilingContextIntegration(profilingContext)
+                .build();
+        AgentTracer.forceRegister(tracer);
+        scopeManager = ScopeManagerTestBridge.getScopeManager(tracer);
+        eventCountingListener = new EventCountingListener();
+        scopeManager.addScopeListener(eventCountingListener);
+        eventCountingExtendedListener = new EventCountingExtendedListener();
+        scopeManager.addScopeListener(eventCountingExtendedListener);
+        // Clear interactions recorded during tracer initialization so each test starts clean
+        clearInvocations(profilingContext);
+    }
 
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE));
-    assertSame(thirdSpan, tracer.activeSpan());
-    assertSame(thirdScope, scopeManager.active());
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE));
-    verifyNoMoreInteractions(profilingContext);
-    clearInvocations(profilingContext);
-
-    thirdScope.close();
-
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE, CLOSE, CLOSE, ACTIVATE));
-    assertSame(firstSpan, tracer.activeSpan());
-    assertSame(firstScope, scopeManager.active());
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE, CLOSE, CLOSE, ACTIVATE));
-    verifyNoMoreInteractions(profilingContext);
-    clearInvocations(profilingContext);
-
-    firstScope.close();
-
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE, CLOSE, CLOSE, ACTIVATE, CLOSE));
-    assertNull(scopeManager.active());
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE, CLOSE, CLOSE, ACTIVATE, CLOSE));
-    verify(profilingContext, times(1)).onDetach();
-    verifyNoMoreInteractions(profilingContext);
-  }
-
-  @Test
-  void closingScopeOutOfOrderMultipleActivations() {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    clearInvocations(profilingContext);
-
-    ContextScope scope1 = scopeManager.activateSpan(span);
-
-    assertEvents(Arrays.asList(ACTIVATE));
-
-    ContextScope scope2 = scopeManager.activateSpan(span);
-
-    // Activating the same span multiple times does not create a new scope
-    assertEvents(Arrays.asList(ACTIVATE));
-    clearInvocations(profilingContext);
-
-    AgentSpan thirdSpan = tracer.buildSpan("test", "quux").start();
-    ContextScope thirdScope = tracer.activateSpan(thirdSpan);
-
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE));
-    assertSame(thirdSpan, tracer.activeSpan());
-    assertSame(thirdScope, scopeManager.active());
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE));
-    verify(profilingContext, times(1)).encodeOperationName("quux");
-    verify(profilingContext, times(1)).newScopeState(any());
-    verifyNoMoreInteractions(profilingContext);
-    clearInvocations(profilingContext);
-
-    scope2.close();
-
-    // Closing a scope once that has been activated multiple times does not close
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE));
-    verifyNoMoreInteractions(profilingContext);
-    clearInvocations(profilingContext);
-
-    thirdScope.close();
-    thirdSpan.finish();
-
-    // Closing scope above multiple activated scope does not close it
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, ACTIVATE));
-    verifyNoMoreInteractions(profilingContext);
-    clearInvocations(profilingContext);
-
-    scope1.close();
-
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, ACTIVATE, CLOSE));
-  }
-
-  @Test
-  void closingAContinuedScopeOutOfOrderCancelsTheContinuation() throws Exception {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    ContextScope scope = tracer.activateSpan(span);
-    ContextContinuation continuation = Context.current().capture();
-    scope.close();
-    span.finish();
-
-    assertNull(scopeManager.active());
-    assertTrue(spanFinished(span));
-    assertTrue(writer.isEmpty());
-
-    ContextScope continuedScope = continuation.resume();
-
-    AgentSpan secondSpan = tracer.buildSpan("test", "test2").start();
-    ContextScope secondScope = (ContinuableScope) tracer.activateSpan(secondSpan);
-
-    assertSame(secondScope, scopeManager.active());
-
-    continuedScope.close();
-
-    assertSame(secondScope, scopeManager.active());
-    assertTrue(writer.isEmpty());
-
-    secondScope.close();
-    secondSpan.finish();
-    writer.waitForTraces(1);
-
-    assertEquals(1, writer.size());
-    assertTrue(writer.get(0).containsAll(Arrays.asList(secondSpan, span)));
-  }
-
-  @Test
-  void exceptionThrownInTraceInterceptorDoesNotLeaveScopeManagerInBadState() throws Exception {
-    ExceptionThrowingInterceptor interceptor = new ExceptionThrowingInterceptor();
-    tracer.addTraceInterceptor(interceptor);
-
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    ContextScope scope = tracer.activateSpan(span);
-    scope.close();
-    span.finish();
-
-    // exception is thrown in same thread
-    assertTrue(interceptor.lastTrace.contains(span));
-
-    // scopeManager in good state
-    assertNull(scopeManager.active());
-    assertTrue(spanFinished(span));
-    assertEquals(0, scopeManager.scopeStack().depth());
-    assertEquals(1, writer.size());
-    assertSame(span, writer.get(0).get(0));
-
-    // completing another scope lifecycle
-    AgentSpan span2 = tracer.buildSpan("test", "test").start();
-    ContextScope scope2 = tracer.activateSpan(span2);
-
-    assertSame(scope2, scopeManager.active());
-
-    interceptor.shouldThrowException = false;
-    scope2.close();
-    span2.finish();
-    writer.waitForTraces(1);
-
-    // second lifecycle gets reported
-    assertNull(scopeManager.active());
-    assertTrue(spanFinished(span2));
-    assertEquals(0, scopeManager.scopeStack().depth());
-    assertEquals(2, writer.size());
-    assertSame(span2, writer.get(1).get(0));
-  }
-
-  @Test
-  void
-      exceptionThrownInTraceInterceptorDoesNotLeaveScopeManagerInBadStateWhenReportingThroughPendingTraceBuffer()
-          throws Exception {
-    ExceptionThrowingInterceptor interceptor = new ExceptionThrowingInterceptor();
-    tracer.addTraceInterceptor(interceptor);
-
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    ContextScope scope = tracer.activateSpan(span);
-    ContextContinuation continuation = Context.current().capture();
-    scope.close();
-    span.finish();
-
-    assertNotNull(continuation);
-    assertNull(scopeManager.active());
-    assertTrue(spanFinished(span));
-    assertEquals(0, scopeManager.scopeStack().depth());
-    assertTrue(writer.isEmpty());
-
-    // wait for root span to be reported from PendingTraceBuffer
-    writer.waitForTraces(1);
-
-    assertTrue(interceptor.lastTrace.contains(span));
-
-    // scopeManager in good state
-    assertNull(scopeManager.active());
-    assertTrue(spanFinished(span));
-    assertEquals(0, scopeManager.scopeStack().depth());
-    assertEquals(1, writer.size());
-    assertSame(span, writer.get(0).get(0));
-
-    // completing another async scope lifecycle
-    AgentSpan span2 = tracer.buildSpan("test", "test").start();
-    ContextScope scope2 = tracer.activateSpan(span2);
-    ContextContinuation continuation2 = Context.current().capture();
-
-    assertNotNull(continuation2);
-    assertSame(scope2, scopeManager.active());
-
-    interceptor.shouldThrowException = false;
-    scope2.close();
-    span2.finish();
-
-    writer.waitForTraces(2);
-
-    // second lifecycle gets reported as well
-    assertNull(scopeManager.active());
-    assertTrue(spanFinished(span2));
-    assertEquals(0, scopeManager.scopeStack().depth());
-    assertEquals(2, writer.size());
-    assertSame(span2, writer.get(1).get(0));
-  }
-
-  @Test
-  void continuationCanBeActivatedAndClosedInMultipleThreads() throws Throwable {
-    long sendDelayNanos = TimeUnit.MILLISECONDS.toNanos(500 - 100);
-
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    long start = System.nanoTime();
-    ContextScope scope = tracer.activateSpan(span);
-    AtomicReference<ContextContinuation> continuation =
-        new AtomicReference<>(Context.current().capture());
-    scope.close();
-    span.finish();
-
-    continuation.get().hold();
-
-    AtomicInteger iteration = new AtomicInteger(0);
-    ThreadUtils.runConcurrently(
-        8,
-        512,
-        () -> {
-          int iter = iteration.incrementAndGet();
-          if ((iter & 1) != 0) {
-            Thread.sleep(1);
-          }
-          ContextScope s = continuation.get().resume();
-          assertSame(s, scopeManager.active());
-          if ((iter & 2) != 0) {
-            Thread.sleep(1);
-          }
-          s.close();
-        });
+    @AfterEach
+    void cleanup() {
+        tracer.close();
+    }
+
+    @Test
+    void nonDdspanActivationResultsInAContinuableScope() {
+        ContextScope scope = scopeManager.activateSpan(noopSpan());
+
+        assertSame(scope, scopeManager.active());
+        assertInstanceOf(ContinuableScope.class, scope);
+
+        scope.close();
+
+        assertNull(scopeManager.active());
+    }
+
+    @Test
+    void noScopeIsActiveBeforeActivation() throws Exception {
+        tracer.buildSpan("test", "test").start();
+
+        assertNull(scopeManager.active());
+        assertTrue(writer.isEmpty());
+    }
+
+    @Test
+    void simpleScopeAndSpanLifecycle() throws Exception {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        ContextScope scope = tracer.activateSpan(span);
+
+        assertSame(span, AgentSpan.fromScope(scope));
+        assertFalse(spanFinished(AgentSpan.fromScope(scope)));
+        assertSame(scope, scopeManager.active());
+        assertInstanceOf(ContinuableScope.class, scope);
+        assertTrue(writer.isEmpty());
+
+        scope.close();
+
+        assertFalse(spanFinished(AgentSpan.fromScope(scope)));
+        assertTrue(writer.isEmpty());
+        assertNull(scopeManager.active());
+
+        span.finish();
+        writer.waitForTraces(1);
+
+        assertTrue(spanFinished(AgentSpan.fromScope(scope)));
+        assertEquals(1, writer.size());
+        assertSame(AgentSpan.fromScope(scope), writer.get(0).get(0));
+        assertNull(scopeManager.active());
+    }
+
+    @Test
+    void setsParentAsCurrentUponClose() {
+        AgentSpan parentSpan = tracer.buildSpan("test", "parent").start();
+        ContextScope parentScope = tracer.activateSpan(parentSpan);
+        AgentSpan childSpan = tracer.buildSpan("test", "child").start();
+        ContextScope childScope = tracer.activateSpan(childSpan);
+
+        assertSame(childScope, scopeManager.active());
+        assertEquals(
+                AgentSpan.fromScope(parentScope).spanContext().getSpanId(),
+                ((DDSpan) AgentSpan.fromScope(childScope)).spanContext().getParentId());
+        assertSame(
+                AgentSpan.fromScope(parentScope).spanContext().getTraceCollector(),
+                AgentSpan.fromScope(childScope).spanContext().getTraceCollector());
+
+        childScope.close();
+
+        assertSame(parentScope, scopeManager.active());
+        assertFalse(spanFinished(AgentSpan.fromScope(childScope)));
+        assertFalse(spanFinished(AgentSpan.fromScope(parentScope)));
+        assertTrue(writer.isEmpty());
+    }
+
+    @Test
+    void setsParentAsCurrentUponCloseWithNoopChild() {
+        AgentSpan parentSpan = tracer.buildSpan("test", "parent").start();
+        ContextScope parentScope = tracer.activateSpan(parentSpan);
+        AgentSpan childSpan = noopSpan();
+        ContextScope childScope = tracer.activateSpan(childSpan);
+
+        assertSame(childScope, scopeManager.active());
+
+        childScope.close();
+
+        assertSame(parentScope, scopeManager.active());
+        assertFalse(spanFinished(AgentSpan.fromScope(parentScope)));
+        assertTrue(writer.isEmpty());
+    }
+
+    @Test
+    void ddScopeCreatesNoOpContinuationsWhenPropagationIsNotSet() {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        tracer.activateSpan(span);
+        tracer.setAsyncPropagationEnabled(false);
+        ContextContinuation continuation = Context.current().capture();
+
+        assertSame(Context.root(), continuation.context());
+
+        tracer.setAsyncPropagationEnabled(true);
+        continuation = Context.current().capture();
+
+        assertNotSame(Context.root(), continuation.context());
+        assertNotNull(continuation);
+
+        continuation.release();
+    }
+
+    @Test
+    void continuationCancelDoesNotCloseParentScope() {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        ContextScope scope = tracer.activateSpan(span);
+        ContextContinuation continuation = Context.current().capture();
+
+        assertNotNull(continuation);
+
+        continuation.release();
+
+        assertSame(scope, scopeManager.active());
+    }
+
+    // @Flaky("awaitGC is flaky")
+    @Test
+    void testContinuationDoesNotHaveHardReferenceOnScope() throws InterruptedException {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        AtomicReference<ContextScope> scopeRef = new AtomicReference<>(tracer.activateSpan(span));
+        ContextContinuation continuation = Context.current().capture();
+
+        assertNotNull(continuation);
+
+        scopeRef.get().close();
+
+        assertNull(scopeManager.active());
+
+        WeakReference<ContextScope> ref = new WeakReference<>(scopeRef.get());
+        scopeRef.set(null);
+        awaitGC(ref);
+
+        assertNotNull(continuation);
+        assertNull(ref.get());
+        assertFalse(spanFinished(span));
+        assertTrue(writer.isEmpty());
+    }
+
+    @ValueSource(booleans = {true, false})
+    @ParameterizedTest
+    void hardReferenceOnContinuationDoesNotPreventTraceFromReporting(boolean autoClose) throws Exception {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        ContextScope scope = tracer.activateSpan(span);
+        ContextContinuation continuation = Context.current().capture();
+
+        assertNotNull(continuation);
+
+        scope.close();
+        span.finish();
+        if (autoClose) {
+            continuation.release();
+        }
+
+        assertNull(scopeManager.active());
+        assertTrue(spanFinished(span));
+
+        writer.waitForTraces(1);
+
+        assertEquals(1, writer.size());
+        assertSame(span, writer.get(0).get(0));
+    }
+
+    @Test
+    void continuationRestoresTrace() throws Exception {
+        AgentSpan parentSpan = tracer.buildSpan("test", "parent").start();
+        ContextScope parentScope = tracer.activateSpan(parentSpan);
+        AgentSpan childSpan = tracer.buildSpan("test", "child").start();
+        ContextScope childScope = tracer.activateSpan(childSpan);
+
+        ContextContinuation continuation = Context.current().capture();
+        childScope.close();
+
+        assertNotNull(continuation);
+        assertSame(parentScope, scopeManager.active());
+        assertFalse(spanFinished(childSpan));
+        assertFalse(spanFinished(parentSpan));
+
+        parentScope.close();
+        parentSpan.finish();
+
+        // parent span is finished, but trace is not reported
+        assertNull(scopeManager.active());
+        assertFalse(spanFinished(childSpan));
+        assertTrue(spanFinished(parentSpan));
+        assertTrue(writer.isEmpty());
+
+        // activating the continuation
+        ContextScope newScope = continuation.resume();
+
+        // the continued scope becomes active and span state doesn't change
+        assertInstanceOf(ContinuableScope.class, newScope);
+        assertTrue(tracer.isAsyncPropagationEnabled());
+        assertSame(newScope, scopeManager.active());
+        assertNotSame(childScope, newScope);
+        assertNotSame(parentScope, newScope);
+        assertSame(childSpan, AgentSpan.fromContext(newScope.context()));
+        assertFalse(spanFinished(childSpan));
+        assertTrue(spanFinished(parentSpan));
+        assertTrue(writer.isEmpty());
+
+        // creating and activating a second continuation
+        ContextContinuation newContinuation = Context.current().capture();
+        newScope.close();
+        ContextScope secondContinuedScope = newContinuation.resume();
+        secondContinuedScope.close();
+        childSpan.finish();
+        writer.waitForTraces(1);
+
+        // spans are all finished and trace is reported
+        assertNull(scopeManager.active());
+        assertTrue(spanFinished(childSpan));
+        assertTrue(spanFinished(parentSpan));
+        assertEquals(1, writer.size());
+        assertTrue(writer.get(0).containsAll(Arrays.asList(childSpan, parentSpan)));
+    }
+
+    @Test
+    void continuationAllowsAddingSpansEvenAfterOtherSpansWereCompleted() throws Exception {
+        // creating and activating a continuation
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        ContextScope scope = tracer.activateSpan(span);
+        ContextContinuation continuation = Context.current().capture();
+        scope.close();
+        span.finish();
+
+        ContextScope newScope = continuation.resume();
+
+        // the continuation sets the active scope
+        assertInstanceOf(ContinuableScope.class, newScope);
+        assertNotSame(scope, newScope);
+        assertSame(newScope, scopeManager.active());
+        assertTrue(spanFinished(span));
+        assertTrue(writer.isEmpty());
+
+        // creating a new child span under a continued scope
+        AgentSpan childSpan = tracer.buildSpan("test", "child").start();
+        ContextScope childScope = tracer.activateSpan(childSpan);
+        childScope.close();
+        childSpan.finish();
+
+        assertSame(newScope, scopeManager.active());
+
+        scopeManager.active().close();
+        writer.waitForTraces(1);
+
+        // the child has the correct parent
+        assertNull(scopeManager.active());
+        assertTrue(spanFinished(childSpan));
+        assertEquals(
+                span.spanContext().getSpanId(),
+                ((DDSpan) childSpan).spanContext().getParentId());
+        assertEquals(1, writer.size());
+        assertTrue(writer.get(0).containsAll(Arrays.asList(childSpan, span)));
+    }
+
+    @Test
+    void testActivatingSameSpanMultipleTimes() {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        Stateful localState = mock(Stateful.class);
+        when(profilingContext.newScopeState(any())).thenReturn(localState);
+        clearInvocations(profilingContext);
+
+        ContextScope scope1 = scopeManager.activateSpan(span);
+
+        assertEvents(Arrays.asList(ACTIVATE));
+        verify(profilingContext, times(1)).newScopeState(any());
+        clearInvocations(profilingContext);
+
+        ContextScope scope2 = scopeManager.activateSpan(span);
+
+        // Activating the same span multiple times does not create a new scope
+        assertEvents(Arrays.asList(ACTIVATE));
+        verify(profilingContext, never()).newScopeState(any());
+        clearInvocations(profilingContext);
+
+        scope2.close();
+
+        // Closing a scope once that has been activated multiple times does not close
+        assertEvents(Arrays.asList(ACTIVATE));
+        verify(localState, never()).close();
+        clearInvocations(localState);
+
+        scope1.close();
+
+        assertEvents(Arrays.asList(ACTIVATE, CLOSE));
+        verify(localState, times(1)).close();
+    }
+
+    @Test
+    void openingAndClosingMultipleScopes() {
+        AgentSpan span = tracer.buildSpan("test", "foo").start();
+        ContextScope continuableScope = tracer.activateSpan(span);
+
+        assertInstanceOf(ContinuableScope.class, continuableScope);
+        assertEvents(Arrays.asList(ACTIVATE));
+
+        AgentSpan childSpan = tracer.buildSpan("test", "foo").start();
+        ContextScope childDDScope = tracer.activateSpan(childSpan);
+
+        assertInstanceOf(ContinuableScope.class, childDDScope);
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE));
+
+        childDDScope.close();
+        childSpan.finish();
+
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, ACTIVATE));
+
+        continuableScope.close();
+        span.finish();
 
-    long duration = System.nanoTime() - start;
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, ACTIVATE, CLOSE));
+    }
+
+    @Test
+    void closingScopeOutOfOrderSimple() {
+        AgentSpan firstSpan = tracer.buildSpan("test", "foo").start();
+        ContextScope firstScope = tracer.activateSpan(firstSpan);
+
+        AgentSpan secondSpan = tracer.buildSpan("test", "bar").start();
+        ContextScope secondScope = tracer.activateSpan(secondSpan);
+
+        firstSpan.finish();
+        firstScope.close();
+
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE));
+        verify(profilingContext, times(1)).onRootSpanStarted(any());
+        verify(profilingContext, times(1)).onAttach();
+        verify(profilingContext, times(1)).encodeOperationName("foo");
+        verify(profilingContext, times(1)).encodeOperationName("bar");
+        verify(profilingContext, times(2)).newScopeState(any());
+        verifyNoMoreInteractions(profilingContext);
+        clearInvocations(profilingContext);
+
+        secondSpan.finish();
+        secondScope.close();
+
+        verify(profilingContext, times(1)).onRootSpanFinished(any(), any());
+        verify(profilingContext, times(1)).onDetach();
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, CLOSE));
+        verifyNoMoreInteractions(profilingContext);
+        clearInvocations(profilingContext);
+
+        firstScope.close();
+
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, CLOSE));
+    }
+
+    @Test
+    void closingScopeOutOfOrderComplex() {
+        // Events are checked twice in each case to ensure a call to
+        // scopeManager.active() or tracer.activeSpan() doesn't change the count
+
+        AgentSpan firstSpan = tracer.buildSpan("test", "foo").start();
+        ContextScope firstScope = tracer.activateSpan(firstSpan);
+
+        assertEvents(Arrays.asList(ACTIVATE));
+        assertSame(firstSpan, tracer.activeSpan());
+        assertSame(firstScope, scopeManager.active());
+        assertEvents(Arrays.asList(ACTIVATE));
+        verify(profilingContext, times(1)).onRootSpanStarted(any());
+        verify(profilingContext, times(1)).onAttach();
+        verify(profilingContext, times(1)).encodeOperationName("foo");
+        verify(profilingContext, times(1)).newScopeState(any());
+        verifyNoMoreInteractions(profilingContext);
+        clearInvocations(profilingContext);
+
+        AgentSpan secondSpan = tracer.buildSpan("test", "bar").start();
+        ContextScope secondScope = tracer.activateSpan(secondSpan);
+
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE));
+        assertSame(secondSpan, tracer.activeSpan());
+        assertSame(secondScope, scopeManager.active());
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE));
+        verify(profilingContext, times(1)).encodeOperationName("bar");
+        verify(profilingContext, times(1)).newScopeState(any());
+        verifyNoMoreInteractions(profilingContext);
+        clearInvocations(profilingContext);
+
+        AgentSpan thirdSpan = tracer.buildSpan("test", "quux").start();
+        ContextScope thirdScope = tracer.activateSpan(thirdSpan);
+
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE));
+        assertSame(thirdSpan, tracer.activeSpan());
+        assertSame(thirdScope, scopeManager.active());
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE));
+        verify(profilingContext, times(1)).encodeOperationName("quux");
+        verify(profilingContext, times(1)).newScopeState(any());
+        verifyNoMoreInteractions(profilingContext);
+        clearInvocations(profilingContext);
+
+        secondScope.close();
+
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE));
+        assertSame(thirdSpan, tracer.activeSpan());
+        assertSame(thirdScope, scopeManager.active());
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE));
+        verifyNoMoreInteractions(profilingContext);
+        clearInvocations(profilingContext);
+
+        thirdScope.close();
+
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE, CLOSE, CLOSE, ACTIVATE));
+        assertSame(firstSpan, tracer.activeSpan());
+        assertSame(firstScope, scopeManager.active());
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE, CLOSE, CLOSE, ACTIVATE));
+        verifyNoMoreInteractions(profilingContext);
+        clearInvocations(profilingContext);
+
+        firstScope.close();
+
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE, CLOSE, CLOSE, ACTIVATE, CLOSE));
+        assertNull(scopeManager.active());
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE, CLOSE, CLOSE, ACTIVATE, CLOSE));
+        verify(profilingContext, times(1)).onDetach();
+        verifyNoMoreInteractions(profilingContext);
+    }
+
+    @Test
+    void closingScopeOutOfOrderMultipleActivations() {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        clearInvocations(profilingContext);
+
+        ContextScope scope1 = scopeManager.activateSpan(span);
+
+        assertEvents(Arrays.asList(ACTIVATE));
+
+        ContextScope scope2 = scopeManager.activateSpan(span);
+
+        // Activating the same span multiple times does not create a new scope
+        assertEvents(Arrays.asList(ACTIVATE));
+        clearInvocations(profilingContext);
+
+        AgentSpan thirdSpan = tracer.buildSpan("test", "quux").start();
+        ContextScope thirdScope = tracer.activateSpan(thirdSpan);
+
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE));
+        assertSame(thirdSpan, tracer.activeSpan());
+        assertSame(thirdScope, scopeManager.active());
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE));
+        verify(profilingContext, times(1)).encodeOperationName("quux");
+        verify(profilingContext, times(1)).newScopeState(any());
+        verifyNoMoreInteractions(profilingContext);
+        clearInvocations(profilingContext);
+
+        scope2.close();
+
+        // Closing a scope once that has been activated multiple times does not close
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE));
+        verifyNoMoreInteractions(profilingContext);
+        clearInvocations(profilingContext);
+
+        thirdScope.close();
+        thirdSpan.finish();
+
+        // Closing scope above multiple activated scope does not close it
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, ACTIVATE));
+        verifyNoMoreInteractions(profilingContext);
+        clearInvocations(profilingContext);
+
+        scope1.close();
+
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, ACTIVATE, CLOSE));
+    }
+
+    @Test
+    void closingAContinuedScopeOutOfOrderCancelsTheContinuation() throws Exception {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        ContextScope scope = tracer.activateSpan(span);
+        ContextContinuation continuation = Context.current().capture();
+        scope.close();
+        span.finish();
+
+        assertNull(scopeManager.active());
+        assertTrue(spanFinished(span));
+        assertTrue(writer.isEmpty());
+
+        ContextScope continuedScope = continuation.resume();
+
+        AgentSpan secondSpan = tracer.buildSpan("test", "test2").start();
+        ContextScope secondScope = (ContinuableScope) tracer.activateSpan(secondSpan);
+
+        assertSame(secondScope, scopeManager.active());
+
+        continuedScope.close();
+
+        assertSame(secondScope, scopeManager.active());
+        assertTrue(writer.isEmpty());
+
+        secondScope.close();
+        secondSpan.finish();
+        writer.waitForTraces(1);
+
+        assertEquals(1, writer.size());
+        assertTrue(writer.get(0).containsAll(Arrays.asList(secondSpan, span)));
+    }
+
+    @Test
+    void exceptionThrownInTraceInterceptorDoesNotLeaveScopeManagerInBadState() throws Exception {
+        ExceptionThrowingInterceptor interceptor = new ExceptionThrowingInterceptor();
+        tracer.addTraceInterceptor(interceptor);
+
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        ContextScope scope = tracer.activateSpan(span);
+        scope.close();
+        span.finish();
+
+        // exception is thrown in same thread
+        assertTrue(interceptor.lastTrace.contains(span));
+
+        // scopeManager in good state
+        assertNull(scopeManager.active());
+        assertTrue(spanFinished(span));
+        assertEquals(0, scopeManager.scopeStack().depth());
+        assertEquals(1, writer.size());
+        assertSame(span, writer.get(0).get(0));
+
+        // completing another scope lifecycle
+        AgentSpan span2 = tracer.buildSpan("test", "test").start();
+        ContextScope scope2 = tracer.activateSpan(span2);
+
+        assertSame(scope2, scopeManager.active());
+
+        interceptor.shouldThrowException = false;
+        scope2.close();
+        span2.finish();
+        writer.waitForTraces(1);
+
+        // second lifecycle gets reported
+        assertNull(scopeManager.active());
+        assertTrue(spanFinished(span2));
+        assertEquals(0, scopeManager.scopeStack().depth());
+        assertEquals(2, writer.size());
+        assertSame(span2, writer.get(1).get(0));
+    }
 
-    // Since we can't rely on that nothing gets written to the tracer for verification,
-    // we only check for empty if we are faster than the flush interval
-    if (duration < sendDelayNanos) {
-      assertTrue(writer.isEmpty());
+    @Test
+    void exceptionThrownInTraceInterceptorDoesNotLeaveScopeManagerInBadStateWhenReportingThroughPendingTraceBuffer()
+            throws Exception {
+        ExceptionThrowingInterceptor interceptor = new ExceptionThrowingInterceptor();
+        tracer.addTraceInterceptor(interceptor);
+
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        ContextScope scope = tracer.activateSpan(span);
+        ContextContinuation continuation = Context.current().capture();
+        scope.close();
+        span.finish();
+
+        assertNotNull(continuation);
+        assertNull(scopeManager.active());
+        assertTrue(spanFinished(span));
+        assertEquals(0, scopeManager.scopeStack().depth());
+        assertTrue(writer.isEmpty());
+
+        // wait for root span to be reported from PendingTraceBuffer
+        writer.waitForTraces(1);
+
+        assertTrue(interceptor.lastTrace.contains(span));
+
+        // scopeManager in good state
+        assertNull(scopeManager.active());
+        assertTrue(spanFinished(span));
+        assertEquals(0, scopeManager.scopeStack().depth());
+        assertEquals(1, writer.size());
+        assertSame(span, writer.get(0).get(0));
+
+        // completing another async scope lifecycle
+        AgentSpan span2 = tracer.buildSpan("test", "test").start();
+        ContextScope scope2 = tracer.activateSpan(span2);
+        ContextContinuation continuation2 = Context.current().capture();
+
+        assertNotNull(continuation2);
+        assertSame(scope2, scopeManager.active());
+
+        interceptor.shouldThrowException = false;
+        scope2.close();
+        span2.finish();
+
+        writer.waitForTraces(2);
+
+        // second lifecycle gets reported as well
+        assertNull(scopeManager.active());
+        assertTrue(spanFinished(span2));
+        assertEquals(0, scopeManager.scopeStack().depth());
+        assertEquals(2, writer.size());
+        assertSame(span2, writer.get(1).get(0));
     }
 
-    continuation.get().release();
+    @Test
+    void continuationCanBeActivatedAndClosedInMultipleThreads() throws Throwable {
+        long sendDelayNanos = TimeUnit.MILLISECONDS.toNanos(500 - 100);
+
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        long start = System.nanoTime();
+        ContextScope scope = tracer.activateSpan(span);
+        AtomicReference<ContextContinuation> continuation =
+                new AtomicReference<>(Context.current().capture());
+        scope.close();
+        span.finish();
+
+        continuation.get().hold();
+
+        AtomicInteger iteration = new AtomicInteger(0);
+        ThreadUtils.runConcurrently(8, 512, () -> {
+            int iter = iteration.incrementAndGet();
+            if ((iter & 1) != 0) {
+                Thread.sleep(1);
+            }
+            ContextScope s = continuation.get().resume();
+            assertSame(s, scopeManager.active());
+            if ((iter & 2) != 0) {
+                Thread.sleep(1);
+            }
+            s.close();
+        });
 
-    assertEquals(1, writer.size());
-    assertSame(span, writer.get(0).get(0));
-  }
+        long duration = System.nanoTime() - start;
 
-  @Test
-  void scopeListenerShouldBeNotifiedAboutTheCurrentlyActiveScope() {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
+        // Since we can't rely on that nothing gets written to the tracer for verification,
+        // we only check for empty if we are faster than the flush interval
+        if (duration < sendDelayNanos) {
+            assertTrue(writer.isEmpty());
+        }
 
-    ContextScope scope = scopeManager.activateSpan(span);
+        continuation.get().release();
 
-    assertEvents(Arrays.asList(ACTIVATE));
+        assertEquals(1, writer.size());
+        assertSame(span, writer.get(0).get(0));
+    }
 
-    EventCountingListener listener = new EventCountingListener();
+    @Test
+    void scopeListenerShouldBeNotifiedAboutTheCurrentlyActiveScope() {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
 
-    assertEquals(0, listener.events.size());
+        ContextScope scope = scopeManager.activateSpan(span);
 
-    scopeManager.addScopeListener(listener);
+        assertEvents(Arrays.asList(ACTIVATE));
 
-    assertEquals(Arrays.asList(ACTIVATE), listener.events);
+        EventCountingListener listener = new EventCountingListener();
 
-    scope.close();
+        assertEquals(0, listener.events.size());
 
-    assertEvents(Arrays.asList(ACTIVATE, CLOSE));
-    assertEquals(Arrays.asList(ACTIVATE, CLOSE), listener.events);
-  }
+        scopeManager.addScopeListener(listener);
 
-  @Test
-  void extendedScopeListenerShouldBeNotifiedAboutTheCurrentlyActiveScope() {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
+        assertEquals(Arrays.asList(ACTIVATE), listener.events);
 
-    ContextScope scope = scopeManager.activateSpan(span);
+        scope.close();
+
+        assertEvents(Arrays.asList(ACTIVATE, CLOSE));
+        assertEquals(Arrays.asList(ACTIVATE, CLOSE), listener.events);
+    }
 
-    assertEvents(Arrays.asList(ACTIVATE));
+    @Test
+    void extendedScopeListenerShouldBeNotifiedAboutTheCurrentlyActiveScope() {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
 
-    EventCountingExtendedListener listener = new EventCountingExtendedListener();
+        ContextScope scope = scopeManager.activateSpan(span);
 
-    assertEquals(0, listener.events.size());
+        assertEvents(Arrays.asList(ACTIVATE));
 
-    scopeManager.addScopeListener(listener);
+        EventCountingExtendedListener listener = new EventCountingExtendedListener();
 
-    assertEquals(Arrays.asList(ACTIVATE), listener.events);
+        assertEquals(0, listener.events.size());
 
-    scope.close();
+        scopeManager.addScopeListener(listener);
 
-    assertEvents(Arrays.asList(ACTIVATE, CLOSE));
-    assertEquals(Arrays.asList(ACTIVATE, CLOSE), listener.events);
-  }
+        assertEquals(Arrays.asList(ACTIVATE), listener.events);
 
-  @Test
-  void scopeListenerShouldNotBeNotifiedWhenThereIsNoActiveScope() {
-    EventCountingListener listener = new EventCountingListener();
+        scope.close();
 
-    assertEquals(0, listener.events.size());
+        assertEvents(Arrays.asList(ACTIVATE, CLOSE));
+        assertEquals(Arrays.asList(ACTIVATE, CLOSE), listener.events);
+    }
 
-    scopeManager.addScopeListener(listener);
+    @Test
+    void scopeListenerShouldNotBeNotifiedWhenThereIsNoActiveScope() {
+        EventCountingListener listener = new EventCountingListener();
 
-    assertEquals(0, listener.events.size());
-  }
+        assertEquals(0, listener.events.size());
 
-  @TableTest({
-    "scenario           | activationException | closeException",
-    "no exceptions      | false               | false         ",
-    "close exception    | false               | true          ",
-    "activate exception | true                | false         ",
-    "both exceptions    | true                | true          "
-  })
-  void misbehavingScopeListenerShouldNotAffectOthers(
-      boolean activationException, boolean closeException) {
-    ExceptionThrowingScopeListener exceptionThrowingScopeListener =
-        new ExceptionThrowingScopeListener();
-    exceptionThrowingScopeListener.throwOnScopeActivated = activationException;
-    exceptionThrowingScopeListener.throwOnScopeClosed = closeException;
+        scopeManager.addScopeListener(listener);
 
-    EventCountingListener secondEventCountingListener = new EventCountingListener();
-    scopeManager.addScopeListener(exceptionThrowingScopeListener);
-    scopeManager.addScopeListener(secondEventCountingListener);
+        assertEquals(0, listener.events.size());
+    }
 
-    AgentSpan span = tracer.buildSpan("test", "foo").start();
-    ContextScope continuableScope = tracer.activateSpan(span);
+    @TableTest({
+      "scenario           | activationException | closeException",
+      "no exceptions      | false               | false         ",
+      "close exception    | false               | true          ",
+      "activate exception | true                | false         ",
+      "both exceptions    | true                | true          "
+    })
+    void misbehavingScopeListenerShouldNotAffectOthers(boolean activationException, boolean closeException) {
+        ExceptionThrowingScopeListener exceptionThrowingScopeListener = new ExceptionThrowingScopeListener();
+        exceptionThrowingScopeListener.throwOnScopeActivated = activationException;
+        exceptionThrowingScopeListener.throwOnScopeClosed = closeException;
 
-    assertEvents(Arrays.asList(ACTIVATE));
-    assertEquals(Arrays.asList(ACTIVATE), secondEventCountingListener.events);
+        EventCountingListener secondEventCountingListener = new EventCountingListener();
+        scopeManager.addScopeListener(exceptionThrowingScopeListener);
+        scopeManager.addScopeListener(secondEventCountingListener);
 
-    AgentSpan childSpan = tracer.buildSpan("test", "foo").start();
-    ContextScope childDDScope = tracer.activateSpan(childSpan);
+        AgentSpan span = tracer.buildSpan("test", "foo").start();
+        ContextScope continuableScope = tracer.activateSpan(span);
 
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE));
-    assertEquals(Arrays.asList(ACTIVATE, ACTIVATE), secondEventCountingListener.events);
+        assertEvents(Arrays.asList(ACTIVATE));
+        assertEquals(Arrays.asList(ACTIVATE), secondEventCountingListener.events);
 
-    childDDScope.close();
-    childSpan.finish();
+        AgentSpan childSpan = tracer.buildSpan("test", "foo").start();
+        ContextScope childDDScope = tracer.activateSpan(childSpan);
 
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, ACTIVATE));
-    assertEquals(
-        Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, ACTIVATE), secondEventCountingListener.events);
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE));
+        assertEquals(Arrays.asList(ACTIVATE, ACTIVATE), secondEventCountingListener.events);
 
-    continuableScope.close();
-    span.finish();
+        childDDScope.close();
+        childSpan.finish();
 
-    assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, ACTIVATE, CLOSE));
-    assertEquals(
-        Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, ACTIVATE, CLOSE),
-        secondEventCountingListener.events);
-  }
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, ACTIVATE));
+        assertEquals(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, ACTIVATE), secondEventCountingListener.events);
 
-  @Test
-  void contextThreadListenerNotifiedWhenScopeActivatedOnThreadForTheFirstTime() throws Exception {
-    int numThreads = 5;
-    int numTasks = 20;
-    ExecutorService executor = Executors.newFixedThreadPool(numThreads);
+        continuableScope.close();
+        span.finish();
 
-    // usage of an instrumented executor results in scopestack initialisation but not scope creation
-    executor.submit(() -> assertNull(scopeManager.active())).get();
-    // the listener is not notified
-    verify(profilingContext, never()).onAttach();
-    clearInvocations(profilingContext);
+        assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, ACTIVATE, CLOSE));
+        assertEquals(Arrays.asList(ACTIVATE, ACTIVATE, CLOSE, ACTIVATE, CLOSE), secondEventCountingListener.events);
+    }
 
-    // scopes activate on threads
-    AgentSpan span = tracer.buildSpan("test", "foo").start();
-    Future<?>[] futures = new Future[numTasks];
-    for (int i = 0; i < numTasks; i++) {
-      final int taskIndex = i;
-      futures[i] =
-          executor.submit(
-              () -> {
+    @Test
+    void contextThreadListenerNotifiedWhenScopeActivatedOnThreadForTheFirstTime() throws Exception {
+        int numThreads = 5;
+        int numTasks = 20;
+        ExecutorService executor = Executors.newFixedThreadPool(numThreads);
+
+        // usage of an instrumented executor results in scopestack initialisation but not scope creation
+        executor.submit(() -> assertNull(scopeManager.active())).get();
+        // the listener is not notified
+        verify(profilingContext, never()).onAttach();
+        clearInvocations(profilingContext);
+
+        // scopes activate on threads
+        AgentSpan span = tracer.buildSpan("test", "foo").start();
+        Future<?>[] futures = new Future[numTasks];
+        for (int i = 0; i < numTasks; i++) {
+            final int taskIndex = i;
+            futures[i] = executor.submit(() -> {
                 ContextScope scope = tracer.activateSpan(span);
                 AgentSpan child = tracer.buildSpan("test", "foo" + taskIndex).start();
                 ContextScope childScope = tracer.activateSpan(child);
                 try {
-                  Thread.sleep(100);
+                    Thread.sleep(100);
                 } catch (InterruptedException ignored) {
-                  Thread.currentThread().interrupt();
+                    Thread.currentThread().interrupt();
                 }
                 childScope.close();
                 scope.close();
-              });
+            });
+        }
+        for (Future<?> future : futures) {
+            future.get();
+        }
+
+        // the activation notifies the listener whenever the stack becomes non-empty
+        verify(profilingContext, times(numTasks)).onAttach();
+
+        executor.shutdown();
     }
-    for (Future<?> future : futures) {
-      future.get();
+
+    @Test
+    void activatingASpanMergesItWithExistingContext() {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        ContextKey<String> testKey = ContextKey.named("test");
+        Context context = Context.root().with(testKey, "test-value");
+        ContextScope contextScope = scopeManager.attach(context);
+
+        assertSame(contextScope, scopeManager.active());
+        assertEquals(context, scopeManager.currentContext());
+        assertNull(scopeManager.activeSpan());
+        assertEquals("test-value", scopeManager.currentContext().get(testKey));
+
+        ContextScope scope = tracer.activateSpan(span);
+
+        assertSame(scope, scopeManager.active());
+        assertNotEquals(context, scopeManager.currentContext());
+        assertSame(span, scopeManager.activeSpan());
+        assertEquals("test-value", scopeManager.currentContext().get(testKey));
+
+        scope.close();
+
+        assertSame(contextScope, scopeManager.active());
+        assertEquals(context, scopeManager.currentContext());
+        assertNull(scopeManager.activeSpan());
+        assertEquals("test-value", scopeManager.currentContext().get(testKey));
+
+        contextScope.close();
+
+        assertNull(scopeManager.active());
+        assertEquals(Context.root(), scopeManager.currentContext());
+        assertNull(scopeManager.activeSpan());
     }
 
-    // the activation notifies the listener whenever the stack becomes non-empty
-    verify(profilingContext, times(numTasks)).onAttach();
+    @Test
+    void capturingAndContinuingASpanMergesItWithExistingContext() {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        ContextKey<String> testKey = ContextKey.named("test");
+        Context context = Context.root().with(testKey, "test-value");
+        ContextScope contextScope = scopeManager.attach(context);
 
-    executor.shutdown();
-  }
+        assertSame(contextScope, scopeManager.active());
+        assertEquals(context, scopeManager.currentContext());
+        assertNull(scopeManager.activeSpan());
+        assertEquals("test-value", scopeManager.currentContext().get(testKey));
 
-  @Test
-  void activatingASpanMergesItWithExistingContext() {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    ContextKey<String> testKey = ContextKey.named("test");
-    Context context = Context.root().with(testKey, "test-value");
-    ContextScope contextScope = scopeManager.attach(context);
+        ContextScope scope = span.captureWithContext().resume();
 
-    assertSame(contextScope, scopeManager.active());
-    assertEquals(context, scopeManager.currentContext());
-    assertNull(scopeManager.activeSpan());
-    assertEquals("test-value", scopeManager.currentContext().get(testKey));
+        assertSame(scope, scopeManager.active());
+        assertNotEquals(context, scopeManager.currentContext());
+        assertSame(span, scopeManager.activeSpan());
+        assertEquals("test-value", scopeManager.currentContext().get(testKey));
 
-    ContextScope scope = tracer.activateSpan(span);
-
-    assertSame(scope, scopeManager.active());
-    assertNotEquals(context, scopeManager.currentContext());
-    assertSame(span, scopeManager.activeSpan());
-    assertEquals("test-value", scopeManager.currentContext().get(testKey));
-
-    scope.close();
-
-    assertSame(contextScope, scopeManager.active());
-    assertEquals(context, scopeManager.currentContext());
-    assertNull(scopeManager.activeSpan());
-    assertEquals("test-value", scopeManager.currentContext().get(testKey));
-
-    contextScope.close();
-
-    assertNull(scopeManager.active());
-    assertEquals(Context.root(), scopeManager.currentContext());
-    assertNull(scopeManager.activeSpan());
-  }
-
-  @Test
-  void capturingAndContinuingASpanMergesItWithExistingContext() {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    ContextKey<String> testKey = ContextKey.named("test");
-    Context context = Context.root().with(testKey, "test-value");
-    ContextScope contextScope = scopeManager.attach(context);
-
-    assertSame(contextScope, scopeManager.active());
-    assertEquals(context, scopeManager.currentContext());
-    assertNull(scopeManager.activeSpan());
-    assertEquals("test-value", scopeManager.currentContext().get(testKey));
-
-    ContextScope scope = span.captureWithContext().resume();
-
-    assertSame(scope, scopeManager.active());
-    assertNotEquals(context, scopeManager.currentContext());
-    assertSame(span, scopeManager.activeSpan());
-    assertEquals("test-value", scopeManager.currentContext().get(testKey));
-
-    scope.close();
-
-    assertSame(contextScope, scopeManager.active());
-    assertEquals(context, scopeManager.currentContext());
-    assertNull(scopeManager.activeSpan());
-    assertEquals("test-value", scopeManager.currentContext().get(testKey));
+        scope.close();
 
-    contextScope.close();
+        assertSame(contextScope, scopeManager.active());
+        assertEquals(context, scopeManager.currentContext());
+        assertNull(scopeManager.activeSpan());
+        assertEquals("test-value", scopeManager.currentContext().get(testKey));
 
-    assertNull(scopeManager.active());
-    assertEquals(Context.root(), scopeManager.currentContext());
-    assertNull(scopeManager.activeSpan());
-  }
+        contextScope.close();
 
-  @Test
-  void capturingAndContinuingTheActiveSpanMergesItWithExistingContext() {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    ContextKey<String> testKey = ContextKey.named("test");
-    Context context = Context.root().with(testKey, "test-value");
-    ContextScope contextScope = scopeManager.attach(context);
+        assertNull(scopeManager.active());
+        assertEquals(Context.root(), scopeManager.currentContext());
+        assertNull(scopeManager.activeSpan());
+    }
 
-    assertSame(contextScope, scopeManager.active());
-    assertEquals(context, scopeManager.currentContext());
-    assertNull(scopeManager.activeSpan());
-    assertEquals("test-value", scopeManager.currentContext().get(testKey));
+    @Test
+    void capturingAndContinuingTheActiveSpanMergesItWithExistingContext() {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        ContextKey<String> testKey = ContextKey.named("test");
+        Context context = Context.root().with(testKey, "test-value");
+        ContextScope contextScope = scopeManager.attach(context);
 
-    ContextScope innerScope = tracer.activateSpan(span);
-    ContextScope scope = tracer.activeSpan().captureWithContext().resume();
-    innerScope.close();
+        assertSame(contextScope, scopeManager.active());
+        assertEquals(context, scopeManager.currentContext());
+        assertNull(scopeManager.activeSpan());
+        assertEquals("test-value", scopeManager.currentContext().get(testKey));
 
-    assertSame(scope, scopeManager.active());
-    assertNotEquals(context, scopeManager.currentContext());
-    assertSame(span, scopeManager.activeSpan());
-    assertEquals("test-value", scopeManager.currentContext().get(testKey));
+        ContextScope innerScope = tracer.activateSpan(span);
+        ContextScope scope = tracer.activeSpan().captureWithContext().resume();
+        innerScope.close();
 
-    scope.close();
+        assertSame(scope, scopeManager.active());
+        assertNotEquals(context, scopeManager.currentContext());
+        assertSame(span, scopeManager.activeSpan());
+        assertEquals("test-value", scopeManager.currentContext().get(testKey));
 
-    assertSame(contextScope, scopeManager.active());
-    assertEquals(context, scopeManager.currentContext());
-    assertNull(scopeManager.activeSpan());
-    assertEquals("test-value", scopeManager.currentContext().get(testKey));
+        scope.close();
 
-    contextScope.close();
+        assertSame(contextScope, scopeManager.active());
+        assertEquals(context, scopeManager.currentContext());
+        assertNull(scopeManager.activeSpan());
+        assertEquals("test-value", scopeManager.currentContext().get(testKey));
 
-    assertNull(scopeManager.active());
-    assertEquals(Context.root(), scopeManager.currentContext());
-    assertNull(scopeManager.activeSpan());
-  }
+        contextScope.close();
 
-  @Test
-  void rollbackStopsAtMostRecentCheckpoint() {
-    AgentSpan span1 = tracer.buildSpan("test1", "test1").start();
-    AgentSpan span2 = tracer.buildSpan("test2", "test2").start();
-    AgentSpan span3 = tracer.buildSpan("test3", "test3").start();
+        assertNull(scopeManager.active());
+        assertEquals(Context.root(), scopeManager.currentContext());
+        assertNull(scopeManager.activeSpan());
+    }
 
-    assertNull(scopeManager.activeSpan());
+    @Test
+    void rollbackStopsAtMostRecentCheckpoint() {
+        AgentSpan span1 = tracer.buildSpan("test1", "test1").start();
+        AgentSpan span2 = tracer.buildSpan("test2", "test2").start();
+        AgentSpan span3 = tracer.buildSpan("test3", "test3").start();
 
-    tracer.checkpointActiveForRollback();
-    tracer.activateSpan(span1);
-    tracer.checkpointActiveForRollback();
-    tracer.activateSpan(span2);
-    tracer.checkpointActiveForRollback();
-    tracer.activateSpan(span1);
-    tracer.checkpointActiveForRollback();
-    tracer.activateSpan(span2);
-    tracer.checkpointActiveForRollback();
-    tracer.activateSpan(span2);
-    tracer.checkpointActiveForRollback();
-    tracer.activateSpan(span1);
-    tracer.activateSpan(span2);
-    tracer.activateSpan(span3);
+        assertNull(scopeManager.activeSpan());
 
-    assertSame(span3, scopeManager.activeSpan());
+        tracer.checkpointActiveForRollback();
+        tracer.activateSpan(span1);
+        tracer.checkpointActiveForRollback();
+        tracer.activateSpan(span2);
+        tracer.checkpointActiveForRollback();
+        tracer.activateSpan(span1);
+        tracer.checkpointActiveForRollback();
+        tracer.activateSpan(span2);
+        tracer.checkpointActiveForRollback();
+        tracer.activateSpan(span2);
+        tracer.checkpointActiveForRollback();
+        tracer.activateSpan(span1);
+        tracer.activateSpan(span2);
+        tracer.activateSpan(span3);
 
-    tracer.rollbackActiveToCheckpoint();
-    assertSame(span2, scopeManager.activeSpan());
+        assertSame(span3, scopeManager.activeSpan());
 
-    tracer.rollbackActiveToCheckpoint();
-    assertSame(span2, scopeManager.activeSpan());
+        tracer.rollbackActiveToCheckpoint();
+        assertSame(span2, scopeManager.activeSpan());
 
-    tracer.rollbackActiveToCheckpoint();
-    assertSame(span1, scopeManager.activeSpan());
+        tracer.rollbackActiveToCheckpoint();
+        assertSame(span2, scopeManager.activeSpan());
 
-    tracer.rollbackActiveToCheckpoint();
-    assertSame(span2, scopeManager.activeSpan());
+        tracer.rollbackActiveToCheckpoint();
+        assertSame(span1, scopeManager.activeSpan());
 
-    tracer.rollbackActiveToCheckpoint();
-    assertSame(span1, scopeManager.activeSpan());
+        tracer.rollbackActiveToCheckpoint();
+        assertSame(span2, scopeManager.activeSpan());
 
-    tracer.rollbackActiveToCheckpoint();
-    assertNull(scopeManager.activeSpan());
-  }
+        tracer.rollbackActiveToCheckpoint();
+        assertSame(span1, scopeManager.activeSpan());
 
-  @Test
-  void contextsCanBeSwappedOutAndBack() {
-    ContextKey<String> testKey = ContextKey.named("test");
-    Context context1 = Context.root().with(testKey, "first-value");
-    Context context2 = context1.with(testKey, "second-value");
+        tracer.rollbackActiveToCheckpoint();
+        assertNull(scopeManager.activeSpan());
+    }
 
-    Context swappedOut = scopeManager.swap(Context.root());
+    @Test
+    void contextsCanBeSwappedOutAndBack() {
+        ContextKey<String> testKey = ContextKey.named("test");
+        Context context1 = Context.root().with(testKey, "first-value");
+        Context context2 = context1.with(testKey, "second-value");
 
-    assertNull(scopeManager.active());
-    assertEquals(Context.root(), scopeManager.currentContext());
-
-    scopeManager.swap(context1);
-
-    assertNotNull(scopeManager.active());
-    assertEquals(context1, scopeManager.currentContext());
-
-    scopeManager.swap(swappedOut);
-
-    assertNull(scopeManager.active());
-    assertEquals(Context.root(), scopeManager.currentContext());
-
-    ContextScope contextScope = scopeManager.attach(context1);
-
-    assertSame(contextScope, scopeManager.active());
-    assertEquals(context1, scopeManager.currentContext());
-
-    swappedOut = scopeManager.swap(context2);
+        Context swappedOut = scopeManager.swap(Context.root());
 
-    assertNotNull(scopeManager.active());
-    assertNotSame(contextScope, scopeManager.active());
-    assertEquals(context2, scopeManager.currentContext());
-    assertEquals("first-value", swappedOut.get(testKey));
+        assertNull(scopeManager.active());
+        assertEquals(Context.root(), scopeManager.currentContext());
 
-    Context context3 = swappedOut.with(testKey, "third-value");
-    scopeManager.swap(context3);
+        scopeManager.swap(context1);
 
-    assertNotNull(scopeManager.active());
-    assertNotSame(contextScope, scopeManager.active());
-    assertEquals(context3, scopeManager.currentContext());
+        assertNotNull(scopeManager.active());
+        assertEquals(context1, scopeManager.currentContext());
 
-    scopeManager.swap(swappedOut);
+        scopeManager.swap(swappedOut);
 
-    assertSame(contextScope, scopeManager.active());
-    assertEquals(context1, scopeManager.currentContext());
-
-    contextScope.close();
-
-    assertNull(scopeManager.active());
-    assertEquals(Context.root(), scopeManager.currentContext());
-  }
-
-  @Test
-  void captureViaContextContinuationAPIHoldsTrace() throws Exception {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    ContextScope scope = tracer.activateSpan(span);
+        assertNull(scopeManager.active());
+        assertEquals(Context.root(), scopeManager.currentContext());
 
-    // Context.current().capture() routes through ContinuableScopeManager.capture(Context)
-    ContextContinuation continuation = Context.current().capture();
-
-    scope.close();
-    span.finish();
-    assertTrue(writer.isEmpty()); // trace held pending continuation
-
-    continuation.release(); // delegates to cancel(), unblocks trace reporting
-    writer.waitForTraces(1);
-    assertFalse(writer.isEmpty());
-  }
+        ContextScope contextScope = scopeManager.attach(context1);
 
-  @Test
-  void continuationResumeActivatesSpan() throws Exception {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    ContextScope scope = tracer.activateSpan(span);
-    ContextContinuation continuation = Context.current().capture();
-    scope.close();
-    span.finish();
+        assertSame(contextScope, scopeManager.active());
+        assertEquals(context1, scopeManager.currentContext());
 
-    assertNull(scopeManager.active());
-    assertTrue(writer.isEmpty()); // trace held by continuation
+        swappedOut = scopeManager.swap(context2);
 
-    // resume() delegates to activate()
-    ContextScope resumedScope = continuation.resume();
-    assertSame(span, AgentSpan.fromScope(scopeManager.active()));
+        assertNotNull(scopeManager.active());
+        assertNotSame(contextScope, scopeManager.active());
+        assertEquals(context2, scopeManager.currentContext());
+        assertEquals("first-value", swappedOut.get(testKey));
 
-    resumedScope.close();
-    assertNull(scopeManager.active());
-    writer.waitForTraces(1);
-    assertFalse(writer.isEmpty());
-  }
+        Context context3 = swappedOut.with(testKey, "third-value");
+        scopeManager.swap(context3);
 
-  @Test
-  void continuationReleaseIsSameAsCancel() throws Exception {
-    AgentSpan span = tracer.buildSpan("test", "test").start();
-    ContextScope scope = tracer.activateSpan(span);
-    ContextContinuation continuation = Context.current().capture();
-    scope.close();
-    span.finish();
+        assertNotNull(scopeManager.active());
+        assertNotSame(contextScope, scopeManager.active());
+        assertEquals(context3, scopeManager.currentContext());
 
-    assertTrue(writer.isEmpty()); // trace held by continuation
+        scopeManager.swap(swappedOut);
 
-    continuation.release(); // delegates to cancel()
-    writer.waitForTraces(1);
-    assertFalse(writer.isEmpty());
-  }
+        assertSame(contextScope, scopeManager.active());
+        assertEquals(context1, scopeManager.currentContext());
 
-  @Test
-  void captureContextWithoutSpanUsesNoopTraceCollector() {
-    ContextKey<String> key = ContextKey.named("test-key");
-    Context ctx = Context.root().with(key, "value");
-    assertDoesNotThrow(
-        () -> {
-          // NoopAgentTraceCollector handles capture/release without throwing
-          try (ContextScope scope = ctx.attach()) {
-            Context.current().capture().release();
-          }
-        });
-  }
+        contextScope.close();
 
-  private boolean spanFinished(AgentSpan span) {
-    return span instanceof DDSpan && ((DDSpan) span).isFinished();
-  }
+        assertNull(scopeManager.active());
+        assertEquals(Context.root(), scopeManager.currentContext());
+    }
 
-  private void assertEvents(List<EVENT> events) {
-    assertEquals(events, eventCountingListener.events);
-    assertEquals(events, eventCountingExtendedListener.events);
-  }
+    @Test
+    void captureViaContextContinuationAPIHoldsTrace() throws Exception {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        ContextScope scope = tracer.activateSpan(span);
 
-  static class EventCountingListener implements ScopeListener {
-    public final List<EVENT> events = new ArrayList<>();
+        // Context.current().capture() routes through ContinuableScopeManager.capture(Context)
+        ContextContinuation continuation = Context.current().capture();
 
-    @Override
-    public void afterScopeActivated() {
-      synchronized (events) {
-        events.add(ACTIVATE);
-      }
+        scope.close();
+        span.finish();
+        assertTrue(writer.isEmpty()); // trace held pending continuation
+
+        continuation.release(); // delegates to cancel(), unblocks trace reporting
+        writer.waitForTraces(1);
+        assertFalse(writer.isEmpty());
     }
 
-    @Override
-    public void afterScopeClosed() {
-      synchronized (events) {
-        events.add(CLOSE);
-      }
+    @Test
+    void continuationResumeActivatesSpan() throws Exception {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        ContextScope scope = tracer.activateSpan(span);
+        ContextContinuation continuation = Context.current().capture();
+        scope.close();
+        span.finish();
+
+        assertNull(scopeManager.active());
+        assertTrue(writer.isEmpty()); // trace held by continuation
+
+        // resume() delegates to activate()
+        ContextScope resumedScope = continuation.resume();
+        assertSame(span, AgentSpan.fromScope(scopeManager.active()));
+
+        resumedScope.close();
+        assertNull(scopeManager.active());
+        writer.waitForTraces(1);
+        assertFalse(writer.isEmpty());
     }
-  }
 
-  static class EventCountingExtendedListener implements ExtendedScopeListener {
-    public final List<EVENT> events = new ArrayList<>();
+    @Test
+    void continuationReleaseIsSameAsCancel() throws Exception {
+        AgentSpan span = tracer.buildSpan("test", "test").start();
+        ContextScope scope = tracer.activateSpan(span);
+        ContextContinuation continuation = Context.current().capture();
+        scope.close();
+        span.finish();
 
-    @Override
-    public void afterScopeActivated() {
-      throw new IllegalArgumentException("This should not be called");
-    }
+        assertTrue(writer.isEmpty()); // trace held by continuation
 
-    @Override
-    public void afterScopeActivated(DDTraceId traceId, long spanId) {
-      synchronized (events) {
-        events.add(ACTIVATE);
-      }
+        continuation.release(); // delegates to cancel()
+        writer.waitForTraces(1);
+        assertFalse(writer.isEmpty());
     }
 
-    @Override
-    public void afterScopeClosed() {
-      synchronized (events) {
-        events.add(CLOSE);
-      }
+    @Test
+    void captureContextWithoutSpanUsesNoopTraceCollector() {
+        ContextKey<String> key = ContextKey.named("test-key");
+        Context ctx = Context.root().with(key, "value");
+        assertDoesNotThrow(() -> {
+            // NoopAgentTraceCollector handles capture/release without throwing
+            try (ContextScope scope = ctx.attach()) {
+                Context.current().capture().release();
+            }
+        });
     }
-  }
 
-  static class ExceptionThrowingScopeListener implements ScopeListener {
-    boolean throwOnScopeActivated = false;
-    boolean throwOnScopeClosed = false;
+    private boolean spanFinished(AgentSpan span) {
+        return span instanceof DDSpan && ((DDSpan) span).isFinished();
+    }
 
-    @Override
-    public void afterScopeActivated() {
-      if (throwOnScopeActivated) {
-        throw new RuntimeException("Exception on activated");
-      }
+    private void assertEvents(List<EVENT> events) {
+        assertEquals(events, eventCountingListener.events);
+        assertEquals(events, eventCountingExtendedListener.events);
     }
 
-    @Override
-    public void afterScopeClosed() {
-      if (throwOnScopeClosed) {
-        throw new RuntimeException("Exception on closed");
-      }
+    static class EventCountingListener implements ScopeListener {
+        public final List<EVENT> events = new ArrayList<>();
+
+        @Override
+        public void afterScopeActivated() {
+            synchronized (events) {
+                events.add(ACTIVATE);
+            }
+        }
+
+        @Override
+        public void afterScopeClosed() {
+            synchronized (events) {
+                events.add(CLOSE);
+            }
+        }
     }
-  }
 
-  static class ExceptionThrowingInterceptor implements TraceInterceptor {
-    boolean shouldThrowException = true;
-    Collection<? extends MutableSpan> lastTrace;
+    static class EventCountingExtendedListener implements ExtendedScopeListener {
+        public final List<EVENT> events = new ArrayList<>();
+
+        @Override
+        public void afterScopeActivated() {
+            throw new IllegalArgumentException("This should not be called");
+        }
+
+        @Override
+        public void afterScopeActivated(DDTraceId traceId, long spanId) {
+            synchronized (events) {
+                events.add(ACTIVATE);
+            }
+        }
+
+        @Override
+        public void afterScopeClosed() {
+            synchronized (events) {
+                events.add(CLOSE);
+            }
+        }
+    }
 
-    @Override
-    public Collection<? extends MutableSpan> onTraceComplete(
-        Collection<? extends MutableSpan> trace) {
-      lastTrace = trace;
-      if (shouldThrowException) {
-        throw new RuntimeException("Always throws exception");
-      } else {
-        return trace;
-      }
+    static class ExceptionThrowingScopeListener implements ScopeListener {
+        boolean throwOnScopeActivated = false;
+        boolean throwOnScopeClosed = false;
+
+        @Override
+        public void afterScopeActivated() {
+            if (throwOnScopeActivated) {
+                throw new RuntimeException("Exception on activated");
+            }
+        }
+
+        @Override
+        public void afterScopeClosed() {
+            if (throwOnScopeClosed) {
+                throw new RuntimeException("Exception on closed");
+            }
+        }
     }
 
-    @Override
-    public int priority() {
-      return 55;
+    static class ExceptionThrowingInterceptor implements TraceInterceptor {
+        boolean shouldThrowException = true;
+        Collection<? extends MutableSpan> lastTrace;
+
+        @Override
+        public Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
+            lastTrace = trace;
+            if (shouldThrowException) {
+                throw new RuntimeException("Always throws exception");
+            } else {
+                return trace;
+            }
+        }
+
+        @Override
+        public int priority() {
+            return 55;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/servicediscovery/ForeignMemoryWriterFactoryTest.java b/dd-trace-core/src/test/java/datadog/trace/core/servicediscovery/ForeignMemoryWriterFactoryTest.java
index ff41ce694ff..281ee883eeb 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/servicediscovery/ForeignMemoryWriterFactoryTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/servicediscovery/ForeignMemoryWriterFactoryTest.java
@@ -13,39 +13,32 @@
 
 class ForeignMemoryWriterFactoryTest {
 
-  @TableTest({
-    "scenario           | osType  | architecture | javaAtLeast22 | expectedClassFragment",
-    "macOS              | MACOS   | X64          | false         |                      ",
-    "Windows            | WINDOWS | X64          | false         |                      ",
-    "Linux unknown arch | LINUX   | UNKNOWN      | false         |                      ",
-    "Linux pre-Java22   | LINUX   | X64          | false         | JNA                  ",
-    "Linux Java22+      | LINUX   | X64          | true          | FFM                  "
-  })
-  void get(
-      String scenario,
-      String osType,
-      String architecture,
-      boolean javaAtLeast22,
-      String expectedClassFragment) {
-    // MemFDUnixWriterFFM uses java.lang.foreign and will fail to load on pre-22 JVMs
-    boolean realJavaAtLeast22 = JavaVirtualMachine.isJavaVersionAtLeast(22);
-    Assumptions.assumeTrue(!javaAtLeast22 || realJavaAtLeast22, "FFM writer requires Java 22+");
-    try (MockedStatic<OperatingSystem> osMock = mockStatic(OperatingSystem.class);
-        MockedStatic<JavaVirtualMachine> jvmMock = mockStatic(JavaVirtualMachine.class)) {
-      osMock.when(OperatingSystem::type).thenReturn(OperatingSystem.Type.valueOf(osType));
-      osMock
-          .when(OperatingSystem::architecture)
-          .thenReturn(OperatingSystem.Architecture.valueOf(architecture));
-      jvmMock.when(() -> JavaVirtualMachine.isJavaVersionAtLeast(22)).thenReturn(javaAtLeast22);
+    @TableTest({
+      "scenario           | osType  | architecture | javaAtLeast22 | expectedClassFragment",
+      "macOS              | MACOS   | X64          | false         |                      ",
+      "Windows            | WINDOWS | X64          | false         |                      ",
+      "Linux unknown arch | LINUX   | UNKNOWN      | false         |                      ",
+      "Linux pre-Java22   | LINUX   | X64          | false         | JNA                  ",
+      "Linux Java22+      | LINUX   | X64          | true          | FFM                  "
+    })
+    void get(String scenario, String osType, String architecture, boolean javaAtLeast22, String expectedClassFragment) {
+        // MemFDUnixWriterFFM uses java.lang.foreign and will fail to load on pre-22 JVMs
+        boolean realJavaAtLeast22 = JavaVirtualMachine.isJavaVersionAtLeast(22);
+        Assumptions.assumeTrue(!javaAtLeast22 || realJavaAtLeast22, "FFM writer requires Java 22+");
+        try (MockedStatic<OperatingSystem> osMock = mockStatic(OperatingSystem.class);
+                MockedStatic<JavaVirtualMachine> jvmMock = mockStatic(JavaVirtualMachine.class)) {
+            osMock.when(OperatingSystem::type).thenReturn(OperatingSystem.Type.valueOf(osType));
+            osMock.when(OperatingSystem::architecture).thenReturn(OperatingSystem.Architecture.valueOf(architecture));
+            jvmMock.when(() -> JavaVirtualMachine.isJavaVersionAtLeast(22)).thenReturn(javaAtLeast22);
 
-      ForeignMemoryWriter writer = new ForeignMemoryWriterFactory().get();
+            ForeignMemoryWriter writer = new ForeignMemoryWriterFactory().get();
 
-      if (expectedClassFragment == null) {
-        assertNull(writer, scenario);
-      } else {
-        assertNotNull(writer, scenario);
-        assertTrue(writer.getClass().getName().contains(expectedClassFragment), scenario);
-      }
+            if (expectedClassFragment == null) {
+                assertNull(writer, scenario);
+            } else {
+                assertNotNull(writer, scenario);
+                assertTrue(writer.getClass().getName().contains(expectedClassFragment), scenario);
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/servicediscovery/ServiceDiscoveryTest.java b/dd-trace-core/src/test/java/datadog/trace/core/servicediscovery/ServiceDiscoveryTest.java
index 68779317248..cdbde7975a1 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/servicediscovery/ServiceDiscoveryTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/servicediscovery/ServiceDiscoveryTest.java
@@ -13,59 +13,56 @@
 
 @Timeout(value = 10, unit = TimeUnit.SECONDS)
 class ServiceDiscoveryTest {
-  @Test
-  void encodePayloadWithAllOptionalFields() throws IOException {
-    String tracerVersion = "1.2.3";
-    String hostname = "test-host";
-    String runtimeID = "rid-123";
-    String service = "orders";
-    String env = "prod";
-    String serviceVersion = "1.1.1";
-    UTF8BytesString processTags = UTF8BytesString.create("key1:val1,key2:val2");
-    String containerID = "containerID";
-    boolean appLogsCollectionEnabled = true;
+    @Test
+    void encodePayloadWithAllOptionalFields() throws IOException {
+        String tracerVersion = "1.2.3";
+        String hostname = "test-host";
+        String runtimeID = "rid-123";
+        String service = "orders";
+        String env = "prod";
+        String serviceVersion = "1.1.1";
+        UTF8BytesString processTags = UTF8BytesString.create("key1:val1,key2:val2");
+        String containerID = "containerID";
+        boolean appLogsCollectionEnabled = true;
 
-    byte[] out =
-        ServiceDiscovery.encodePayload(
-            tracerVersion,
-            hostname,
-            appLogsCollectionEnabled,
-            runtimeID,
-            service,
-            env,
-            serviceVersion,
-            processTags,
-            containerID);
-    MapValue map = MessagePack.newDefaultUnpacker(out).unpackValue().asMapValue();
+        byte[] out = ServiceDiscovery.encodePayload(
+                tracerVersion,
+                hostname,
+                appLogsCollectionEnabled,
+                runtimeID,
+                service,
+                env,
+                serviceVersion,
+                processTags,
+                containerID);
+        MapValue map = MessagePack.newDefaultUnpacker(out).unpackValue().asMapValue();
 
-    assertEquals(11, map.size());
-    assertEquals(
-        "{\"schema_version\":2,\"tracer_language\":\"java\",\"tracer_version\":\"1.2.3\",\"hostname\":\"test-host\",\"logs_collected\":true,\"runtime_id\":\"rid-123\",\"service_name\":\"orders\",\"service_env\":\"prod\",\"service_version\":\"1.1.1\",\"process_tags\":\"key1:val1,key2:val2\",\"container_id\":\"containerID\"}",
-        map.toString());
-  }
+        assertEquals(11, map.size());
+        assertEquals(
+                "{\"schema_version\":2,\"tracer_language\":\"java\",\"tracer_version\":\"1.2.3\",\"hostname\":\"test-host\",\"logs_collected\":true,\"runtime_id\":\"rid-123\",\"service_name\":\"orders\",\"service_env\":\"prod\",\"service_version\":\"1.1.1\",\"process_tags\":\"key1:val1,key2:val2\",\"container_id\":\"containerID\"}",
+                map.toString());
+    }
 
-  @Test
-  void encodePayloadOnlyRequiredFields() throws IOException {
-    String tracerVersion = "1.2.3";
-    String hostname = "my_host";
+    @Test
+    void encodePayloadOnlyRequiredFields() throws IOException {
+        String tracerVersion = "1.2.3";
+        String hostname = "my_host";
 
-    byte[] out =
-        ServiceDiscovery.encodePayload(
-            tracerVersion, hostname, false, null, null, null, null, null, null);
-    MapValue map = MessagePack.newDefaultUnpacker(out).unpackValue().asMapValue();
+        byte[] out = ServiceDiscovery.encodePayload(tracerVersion, hostname, false, null, null, null, null, null, null);
+        MapValue map = MessagePack.newDefaultUnpacker(out).unpackValue().asMapValue();
 
-    assertEquals(5, map.size());
-    assertEquals(
-        "{\"schema_version\":2,\"tracer_language\":\"java\",\"tracer_version\":\"1.2.3\",\"hostname\":\"my_host\",\"logs_collected\":false}",
-        map.toString());
-  }
+        assertEquals(5, map.size());
+        assertEquals(
+                "{\"schema_version\":2,\"tracer_language\":\"java\",\"tracer_version\":\"1.2.3\",\"hostname\":\"my_host\",\"logs_collected\":false}",
+                map.toString());
+    }
 
-  @Test
-  void generateFileName() {
-    String name = ServiceDiscovery.generateFileName();
+    @Test
+    void generateFileName() {
+        String name = ServiceDiscovery.generateFileName();
 
-    String prefix = "datadog-tracer-info-";
-    assertTrue(name.startsWith(prefix));
-    assertEquals(prefix.length() + 8, name.length());
-  }
+        String prefix = "datadog-tracer-info-";
+        assertTrue(name.startsWith(prefix));
+        assertEquals(prefix.length() + 8, name.length());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/taginterceptor/TagInterceptorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/taginterceptor/TagInterceptorTest.java
index ae85244a729..81a4b9e2d55 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/taginterceptor/TagInterceptorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/taginterceptor/TagInterceptorTest.java
@@ -63,717 +63,667 @@
 @WithConfig(key = SPLIT_BY_TAGS, value = "sn.tag1,sn.tag2")
 class TagInterceptorTest extends DDCoreJavaSpecification {
 
-  @TableTest({
-    "scenario           | tag                   | name            | expected       ",
-    "service.name some  | 'DDTags.SERVICE_NAME' | 'some-service'  | 'new-service'  ",
-    "service.name other | 'DDTags.SERVICE_NAME' | 'other-service' | 'other-service'",
-    "service some       | 'service'             | 'some-service'  | 'new-service'  ",
-    "service other      | 'service'             | 'other-service' | 'other-service'",
-    "peer.service some  | 'Tags.PEER_SERVICE'   | 'some-service'  | 'new-service'  ",
-    "peer.service other | 'Tags.PEER_SERVICE'   | 'other-service' | 'other-service'",
-    "sn.tag1 some       | 'sn.tag1'             | 'some-service'  | 'new-service'  ",
-    "sn.tag1 other      | 'sn.tag1'             | 'other-service' | 'other-service'",
-    "sn.tag2 some       | 'sn.tag2'             | 'some-service'  | 'new-service'  ",
-    "sn.tag2 other      | 'sn.tag2'             | 'other-service' | 'other-service'"
-  })
-  @WithConfig(key = "dd.trace.PeerServiceTagInterceptor.enabled", value = "true", addPrefix = false)
-  void setServiceName(@ConvertWith(TagsConverter.class) String tag, String name, String expected) {
-    Map<String, String> mapping = singletonMap("some-service", "new-service");
-    CoreTracer tracer =
-        tracerBuilder()
-            .serviceName("wrong-service")
-            .writer(new LoggingWriter())
-            .sampler(new AllSampler())
-            .serviceNameMappings(mapping)
-            .build();
-
-    AgentSpan span = tracer.buildSpan("datadog", "some span").withTag(tag, name).start();
-    span.finish();
-
-    assertEquals(expected, span.getServiceName());
-  }
-
-  @ParameterizedTest
-  @MethodSource("defaultOrConfiguredServiceNameCanBeRemappedWithoutSettingTagArguments")
-  void defaultOrConfiguredServiceNameCanBeRemappedWithoutSettingTag(
-      String serviceName, String expected, Map<String, String> mapping) {
-    CoreTracer tracer =
-        tracerBuilder()
-            .serviceName(serviceName)
-            .writer(new LoggingWriter())
-            .sampler(new AllSampler())
-            .serviceNameMappings(mapping)
-            .build();
-    AgentSpan span = tracer.buildSpan("datadog", "some span").start();
-    span.finish();
-
-    assertEquals(expected, span.getServiceName());
-  }
-
-  static Stream<Arguments> defaultOrConfiguredServiceNameCanBeRemappedWithoutSettingTagArguments() {
-    return Stream.of(
-        // spotless:off
+    @TableTest({
+      "scenario           | tag                   | name            | expected       ",
+      "service.name some  | 'DDTags.SERVICE_NAME' | 'some-service'  | 'new-service'  ",
+      "service.name other | 'DDTags.SERVICE_NAME' | 'other-service' | 'other-service'",
+      "service some       | 'service'             | 'some-service'  | 'new-service'  ",
+      "service other      | 'service'             | 'other-service' | 'other-service'",
+      "peer.service some  | 'Tags.PEER_SERVICE'   | 'some-service'  | 'new-service'  ",
+      "peer.service other | 'Tags.PEER_SERVICE'   | 'other-service' | 'other-service'",
+      "sn.tag1 some       | 'sn.tag1'             | 'some-service'  | 'new-service'  ",
+      "sn.tag1 other      | 'sn.tag1'             | 'other-service' | 'other-service'",
+      "sn.tag2 some       | 'sn.tag2'             | 'some-service'  | 'new-service'  ",
+      "sn.tag2 other      | 'sn.tag2'             | 'other-service' | 'other-service'"
+    })
+    @WithConfig(key = "dd.trace.PeerServiceTagInterceptor.enabled", value = "true", addPrefix = false)
+    void setServiceName(@ConvertWith(TagsConverter.class) String tag, String name, String expected) {
+        Map<String, String> mapping = singletonMap("some-service", "new-service");
+        CoreTracer tracer = tracerBuilder()
+                .serviceName("wrong-service")
+                .writer(new LoggingWriter())
+                .sampler(new AllSampler())
+                .serviceNameMappings(mapping)
+                .build();
+
+        AgentSpan span =
+                tracer.buildSpan("datadog", "some span").withTag(tag, name).start();
+        span.finish();
+
+        assertEquals(expected, span.getServiceName());
+    }
+
+    @ParameterizedTest
+    @MethodSource("defaultOrConfiguredServiceNameCanBeRemappedWithoutSettingTagArguments")
+    void defaultOrConfiguredServiceNameCanBeRemappedWithoutSettingTag(
+            String serviceName, String expected, Map<String, String> mapping) {
+        CoreTracer tracer = tracerBuilder()
+                .serviceName(serviceName)
+                .writer(new LoggingWriter())
+                .sampler(new AllSampler())
+                .serviceNameMappings(mapping)
+                .build();
+        AgentSpan span = tracer.buildSpan("datadog", "some span").start();
+        span.finish();
+
+        assertEquals(expected, span.getServiceName());
+    }
+
+    static Stream<Arguments> defaultOrConfiguredServiceNameCanBeRemappedWithoutSettingTagArguments() {
+        return Stream.of(
+                // spotless:off
         arguments(DEFAULT_SERVICE_NAME, DEFAULT_SERVICE_NAME, singletonMap("other-service-name", "other-service")),
         arguments(DEFAULT_SERVICE_NAME, "new-service",        singletonMap(DEFAULT_SERVICE_NAME, "new-service")),
         arguments("other-service-name", "other-service",      singletonMap("other-service-name", "other-service"))
         // spotless:on
-        );
-  }
-
-  @TableTest({
-    "scenario                           | context         | serviceName                                 | expected                                   ",
-    "root context with default service  | '/'             | 'DEFAULT_SERVLET_ROOT_CONTEXT_SERVICE_NAME' | 'DEFAULT_SERVLET_ROOT_CONTEXT_SERVICE_NAME'",
-    "empty context with default service | ''              | 'DEFAULT_SERVICE_NAME'                      | 'DEFAULT_SERVICE_NAME'                     ",
-    "/some-context with default service | '/some-context' | 'DEFAULT_SERVICE_NAME'                      | 'some-context'                             ",
-    "other-context with default service | 'other-context' | 'DEFAULT_SERVICE_NAME'                      | 'other-context'                            ",
-    "root context with my-service       | '/'             | 'my-service'                                | 'my-service'                               ",
-    "empty context with my-service      | ''              | 'my-service'                                | 'my-service'                               ",
-    "/some-context with my-service      | '/some-context' | 'my-service'                                | 'my-service'                               ",
-    "other-context with my-service      | 'other-context' | 'my-service'                                | 'my-service'                               "
-  })
-  void setServiceNameFromServletContext(
-      String context,
-      @ConvertWith(ConfigDefaultsConverter.class) String serviceName,
-      @ConvertWith(ConfigDefaultsConverter.class) String expected) {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    AgentSpan span = tracer.buildSpan("datadog", "test").start();
-    span.setTag(DDTags.SERVICE_NAME, serviceName);
-    span.setTag("servlet.context", context);
-
-    assertEquals(expected, span.getServiceName());
-  }
-
-  @TableTest({
-    "scenario                        | context         | serviceName           ",
-    "root context / default service  | '/'             | 'DEFAULT_SERVICE_NAME'",
-    "empty context / default service | ''              | 'DEFAULT_SERVICE_NAME'",
-    "/some-context / default service | '/some-context' | 'DEFAULT_SERVICE_NAME'",
-    "other-context / default service | 'other-context' | 'DEFAULT_SERVICE_NAME'",
-    "root context / env service      | '/'             | 'ENV_SERVICE_NAME'    ",
-    "empty context / env service     | ''              | 'ENV_SERVICE_NAME'    ",
-    "/some-context / env service     | '/some-context' | 'ENV_SERVICE_NAME'    ",
-    "other-context / env service     | 'other-context' | 'ENV_SERVICE_NAME'    ",
-    "root context / my-service       | '/'             | 'my-service'          ",
-    "empty context / my-service      | ''              | 'my-service'          ",
-    "/some-context / my-service      | '/some-context' | 'my-service'          ",
-    "other-context / my-service      | 'other-context' | 'my-service'          "
-  })
-  void settingServiceNameAsPropertyDisablesServletContext(
-      String context, @ConvertWith(ConfigDefaultsConverter.class) String serviceName) {
-    if ("ENV_SERVICE_NAME".equals(serviceName)) {
-      serviceName = CapturedEnvironment.get().getProperties().get(SERVICE_NAME);
-    }
-    injectSysConfig("service", serviceName);
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    AgentSpan span = tracer.buildSpan("datadog", "test").start();
-    span.setTag("servlet.context", context);
-
-    assertEquals(serviceName, span.getServiceName());
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {DEFAULT_SERVICE_NAME, "my-service"})
-  void mappingCausesServletContextToNotChangeServiceName(String serviceName) {
-    Map<String, String> mapping = singletonMap(serviceName, "new-service");
-    CoreTracer tracer =
-        tracerBuilder()
-            .serviceName(serviceName)
-            .writer(new LoggingWriter())
-            .sampler(new AllSampler())
-            .serviceNameMappings(mapping)
-            .build();
-
-    AgentSpan span = tracer.buildSpan("datadog", "some span").start();
-    span.setTag("servlet.context", "/some-context");
-    span.finish();
-
-    assertEquals("new-service", span.getServiceName());
-  }
-
-  private CoreTracer createSplittingTracer(String tag) {
-    return tracerBuilder()
-        .serviceName("my-service")
-        .writer(new LoggingWriter())
-        .sampler(new AllSampler())
-        // equivalent to split-by-tags: tag
-        .tagInterceptor(
-            new TagInterceptor(
-                true, "my-service", Collections.singleton(tag), new RuleFlags(), false))
-        .build();
-  }
-
-  @TableTest({
-    "scenario     | expected       | jeeActive",
-    "jee inactive | 'some-context' | false    ",
-    "jee active   | 'my-service'   | true     "
-  })
-  void splitByTagsForServletContextAndExperimentalJeeSplitByDeployment(
-      String expected, boolean jeeActive) {
-    CoreTracer tracer =
-        tracerBuilder()
-            .serviceName("my-service")
-            .writer(new LoggingWriter())
-            .sampler(new AllSampler())
-            .tagInterceptor(
-                new TagInterceptor(false, "my-service", emptySet(), new RuleFlags(), jeeActive))
-            .build();
-
-    AgentSpan span = tracer.buildSpan("datadog", "some span").start();
-    span.setTag(InstrumentationTags.SERVLET_CONTEXT, "some-context");
-    span.finish();
-
-    assertEquals(expected, span.getServiceName());
-  }
-
-  @Test
-  void peerServiceThenSplitByTagsViaBuilder() {
-    CoreTracer tracer = createSplittingTracer(Tags.MESSAGE_BUS_DESTINATION);
-
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", "some span")
-            .withTag(Tags.PEER_SERVICE, "peer-service")
-            .withTag(Tags.MESSAGE_BUS_DESTINATION, "some-queue")
-            .start();
-    span.finish();
-
-    assertEquals("some-queue", span.getServiceName());
-  }
-
-  @Test
-  void peerServiceThenSplitByTagsViaSetTag() {
-    CoreTracer tracer = createSplittingTracer(Tags.MESSAGE_BUS_DESTINATION);
-
-    AgentSpan span = tracer.buildSpan("datadog", "some span").start();
-    span.setTag(Tags.PEER_SERVICE, "peer-service");
-    span.setTag(Tags.MESSAGE_BUS_DESTINATION, "some-queue");
-    span.finish();
-
-    assertEquals("some-queue", span.getServiceName());
-  }
-
-  @ParameterizedTest
-  @ValueSource(booleans = {true, false})
-  void splitByTagsThenPeerServiceViaBuilder(boolean enabled) {
-    injectSysConfig("dd.trace.PeerServiceTagInterceptor.enabled", String.valueOf(enabled), false);
-    CoreTracer tracer = createSplittingTracer(Tags.MESSAGE_BUS_DESTINATION);
-
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", "some span")
-            .withTag(Tags.MESSAGE_BUS_DESTINATION, "some-queue")
-            .withTag(Tags.PEER_SERVICE, "peer-service")
-            .start();
-    span.finish();
-
-    assertEquals(enabled, "peer-service".equals(span.getServiceName()));
-  }
-
-  @Test
-  @WithConfig(key = "dd.trace.PeerServiceTagInterceptor.enabled", value = "true", addPrefix = false)
-  void splitByTagsThenPeerServiceViaSetTag() {
-    CoreTracer tracer = createSplittingTracer(Tags.MESSAGE_BUS_DESTINATION);
-
-    AgentSpan span = tracer.buildSpan("datadog", "some span").start();
-    span.setTag(Tags.MESSAGE_BUS_DESTINATION, "some-queue");
-    span.setTag(Tags.PEER_SERVICE, "peer-service");
-    span.finish();
-
-    assertEquals("peer-service", span.getServiceName());
-  }
-
-  @Test
-  void setResourceName() throws Exception {
-    ListWriter writer = new ListWriter();
-    CoreTracer tracer = tracerBuilder().writer(writer).build();
-
-    String name = "my resource name";
-    AgentSpan span = tracer.buildSpan("datadog", "test").start();
-    span.setTag(DDTags.RESOURCE_NAME, name);
-    span.finish();
-    writer.waitForTraces(1);
-
-    assertEquals(name, span.getResourceName().toString());
-  }
-
-  @Test
-  void setResourceNameIgnoresNull() throws Exception {
-    ListWriter writer = new ListWriter();
-    CoreTracer tracer = tracerBuilder().writer(writer).build();
-
-    AgentSpan span = tracer.buildSpan("datadog", "test").withResourceName("keep").start();
-    span.setTag(DDTags.RESOURCE_NAME, (String) null);
-    span.finish();
-    writer.waitForTraces(1);
-
-    assertEquals("keep", span.getResourceName().toString());
-  }
-
-  @Test
-  void setSpanType() {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    AgentSpan span = tracer.buildSpan("datadog", "test").start();
-    String type = DDSpanTypes.HTTP_CLIENT;
-    span.setSpanType(type);
-    span.finish();
-
-    assertEquals(type, span.getSpanType());
-  }
-
-  @Test
-  void setSpanTypeWithTag() throws Exception {
-    ListWriter writer = new ListWriter();
-    CoreTracer tracer = tracerBuilder().writer(writer).build();
-    AgentSpan span = tracer.buildSpan("datadog", "test").start();
-    String type = DDSpanTypes.HTTP_CLIENT;
-    span.setTag(DDTags.SPAN_TYPE, type);
-    span.finish();
-    writer.waitForTraces(1);
-
-    assertEquals(type, span.getSpanType());
-  }
-
-  static Stream<Arguments> spanMetricsStartsEmptyButAddedWithRateLimitingValueArguments() {
-    return Stream.of(
-        arguments("int 0", 0, 0),
-        arguments("int 1", 1, 1),
-        arguments("float 0", 0f, 0f),
-        arguments("float 1", 1f, 1f),
-        arguments("double 0.1", 0.1, 0.1),
-        arguments("double 1.1", 1.1, 1.1),
-        arguments("int -1", -1, -1),
-        arguments("int 10", 10, 10),
-        arguments("string '00'", "00", 0.0),
-        arguments("string '1'", "1", 1.0),
-        arguments("string '1.0'", "1.0", 1.0),
-        arguments("string '0'", "0", 0.0),
-        arguments("string '0.1'", "0.1", 0.1),
-        arguments("string '1.1'", "1.1", 1.1),
-        arguments("string '-1'", "-1", -1.0),
-        arguments("string 'str'", "str", null));
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("spanMetricsStartsEmptyButAddedWithRateLimitingValueArguments")
-  void spanMetricsStartsEmptyButAddedWithRateLimitingValue(
-      String scenario, Object rate, Object result) throws Exception {
-    ListWriter writer = new ListWriter();
-    CoreTracer tracer = tracerBuilder().writer(writer).build();
-    AgentSpan span = tracer.buildSpan("datadog", "test").start();
-
-    assertNull(span.getTag(ANALYTICS_SAMPLE_RATE));
-
-    span.setTag(ANALYTICS_SAMPLE_RATE, rate);
-    span.finish();
-    writer.waitForTraces(1);
-
-    assertEquals(result, span.getTag(ANALYTICS_SAMPLE_RATE));
-  }
-
-  static Stream<Arguments> setPrioritySamplingViaTagArguments() {
-    return Stream.of(
-        arguments("manual.keep / true", DDTags.MANUAL_KEEP, true, (int) PrioritySampling.USER_KEEP),
-        arguments("manual.keep / false", DDTags.MANUAL_KEEP, false, null),
-        arguments(
-            "manual.keep / 'true'", DDTags.MANUAL_KEEP, "true", (int) PrioritySampling.USER_KEEP),
-        arguments("manual.keep / 'false'", DDTags.MANUAL_KEEP, "false", null),
-        arguments("manual.keep / 'asdf'", DDTags.MANUAL_KEEP, "asdf", null),
-        arguments("manual.drop / true", DDTags.MANUAL_DROP, true, (int) PrioritySampling.USER_DROP),
-        arguments("manual.drop / false", DDTags.MANUAL_DROP, false, null),
-        arguments(
-            "manual.drop / 'true'", DDTags.MANUAL_DROP, "true", (int) PrioritySampling.USER_DROP),
-        arguments("manual.drop / 'false'", DDTags.MANUAL_DROP, "false", null),
-        arguments("manual.drop / 'asdf'", DDTags.MANUAL_DROP, "asdf", null),
-        arguments("asm.keep / true", Tags.ASM_KEEP, true, (int) PrioritySampling.USER_KEEP),
-        arguments("asm.keep / false", Tags.ASM_KEEP, false, null),
-        arguments("asm.keep / 'true'", Tags.ASM_KEEP, "true", (int) PrioritySampling.USER_KEEP),
-        arguments("asm.keep / 'false'", Tags.ASM_KEEP, "false", null),
-        arguments("asm.keep / 'asdf'", Tags.ASM_KEEP, "asdf", null),
-        arguments(
-            "ai_guard.keep / true", Tags.AI_GUARD_KEEP, true, (int) PrioritySampling.USER_KEEP),
-        arguments("ai_guard.keep / false", Tags.AI_GUARD_KEEP, false, null),
-        arguments(
-            "ai_guard.keep / 'true'", Tags.AI_GUARD_KEEP, "true", (int) PrioritySampling.USER_KEEP),
-        arguments("ai_guard.keep / 'false'", Tags.AI_GUARD_KEEP, "false", null),
-        arguments("ai_guard.keep / 'asdf'", Tags.AI_GUARD_KEEP, "asdf", null),
-        arguments(
-            "sampling.priority / -1", Tags.SAMPLING_PRIORITY, -1, (int) PrioritySampling.USER_DROP),
-        arguments(
-            "sampling.priority / 0", Tags.SAMPLING_PRIORITY, 0, (int) PrioritySampling.USER_DROP),
-        arguments(
-            "sampling.priority / 1", Tags.SAMPLING_PRIORITY, 1, (int) PrioritySampling.USER_KEEP),
-        arguments(
-            "sampling.priority / 2", Tags.SAMPLING_PRIORITY, 2, (int) PrioritySampling.USER_KEEP),
-        arguments(
-            "sampling.priority / '-1'",
-            Tags.SAMPLING_PRIORITY,
-            "-1",
-            (int) PrioritySampling.USER_DROP),
-        arguments(
-            "sampling.priority / '0'",
-            Tags.SAMPLING_PRIORITY,
-            "0",
-            (int) PrioritySampling.USER_DROP),
-        arguments(
-            "sampling.priority / '1'",
-            Tags.SAMPLING_PRIORITY,
-            "1",
-            (int) PrioritySampling.USER_KEEP),
-        arguments(
-            "sampling.priority / '2'",
-            Tags.SAMPLING_PRIORITY,
-            "2",
-            (int) PrioritySampling.USER_KEEP),
-        arguments("sampling.priority / 'asdf'", Tags.SAMPLING_PRIORITY, "asdf", null));
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("setPrioritySamplingViaTagArguments")
-  void setPrioritySamplingViaTag(String scenario, String tag, Object value, Integer expected) {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    AgentSpan span = tracer.buildSpan("datadog", "test").start();
-    span.setTag(tag, value);
-
-    assertEquals(expected, span.getSamplingPriority());
-  }
-
-  @Test
-  void samplingPriorityPositiveTagOverridesLockedPriority() {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    AgentSpan span = tracer.buildSpan("datadog", "test").start();
-
-    // Simulate upstream propagation of x-datadog-sampling-priority: -1 (USER_DROP)
-    span.setSamplingPriority(PrioritySampling.USER_DROP, SamplingMechanism.UNKNOWN);
-    assertEquals((int) PrioritySampling.USER_DROP, span.getSamplingPriority());
-
-    // positive sampling.priority overrides the propagated locked priority
-    span.setTag(Tags.SAMPLING_PRIORITY, 2);
-    assertEquals((int) PrioritySampling.USER_KEEP, span.getSamplingPriority());
-  }
-
-  @Test
-  void samplingPriorityNonPositiveTagDoesNotOverrideLockedPriority() {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    AgentSpan span = tracer.buildSpan("datadog", "test").start();
-
-    // Simulate upstream propagation of x-datadog-sampling-priority: 2 (USER_KEEP)
-    span.setSamplingPriority(PrioritySampling.USER_KEEP, SamplingMechanism.UNKNOWN);
-    assertEquals((int) PrioritySampling.USER_KEEP, span.getSamplingPriority());
-
-    // non-positive sampling.priority respects the propagated locked priority
-    span.setTag(Tags.SAMPLING_PRIORITY, 0);
-    assertEquals((int) PrioritySampling.USER_KEEP, span.getSamplingPriority());
-  }
-
-  @Test
-  void samplingPriorityPositiveTagOverridesDecisionMakerFromUpstreamPropagation() {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    // Upstream service dropped with LOCAL_USER_RULE and propagated _dd.p.dm=-3
-    PropagationTags propagationTags =
-        PropagationTags.factory()
-            .fromHeaderValue(PropagationTags.HeaderType.DATADOG, "_dd.p.dm=-3");
-    AgentSpanContext extracted =
-        new ExtractedContext(
-            DDTraceId.from(123), 456L, PrioritySampling.USER_DROP, null, propagationTags, DATADOG);
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "test").asChildOf(extracted).start();
-
-    // positive sampling.priority overrides locked priority and sets _dd.p.dm to MANUAL
-    span.setTag(Tags.SAMPLING_PRIORITY, 2);
-
-    assertEquals((int) PrioritySampling.USER_KEEP, span.getSamplingPriority());
-    assertEquals(
-        "_dd.p.dm=-4",
-        span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG));
-  }
-
-  @ParameterizedTest
-  @ValueSource(booleans = {true, false})
-  void setErrorFlagWhenErrorTagReported(boolean error) throws Exception {
-    ListWriter writer = new ListWriter();
-    CoreTracer tracer = tracerBuilder().writer(writer).build();
-    AgentSpan span = tracer.buildSpan("datadog", "test").start();
-    span.setTag(Tags.ERROR, error);
-    span.finish();
-    writer.waitForTraces(1);
-
-    assertEquals(error, span.isError());
-  }
-
-  static Stream<Arguments> interceptorsApplyToBuilderTooArguments() {
-    return Stream.of(
-        arguments(
-            "serviceName",
-            DDTags.SERVICE_NAME,
-            "my-service",
-            (Function<DDSpanContext, Object>) DDSpanContext::getServiceName),
-        arguments(
-            "resourceName",
-            DDTags.RESOURCE_NAME,
-            "my-resource",
-            (Function<DDSpanContext, Object>) ctx -> ctx.getResourceName().toString()),
-        arguments(
-            "spanType",
-            DDTags.SPAN_TYPE,
-            "my-span-type",
-            (Function<DDSpanContext, Object>) DDSpanContext::getSpanType));
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("interceptorsApplyToBuilderTooArguments")
-  void interceptorsApplyToBuilderToo(
-      String attribute, String name, String value, Function<DDSpanContext, Object> getter)
-      throws Exception {
-    ListWriter writer = new ListWriter();
-    CoreTracer tracer = tracerBuilder().writer(writer).build();
-
-    AgentSpan span = tracer.buildSpan("datadog", "interceptor.test").withTag(name, value).start();
-    span.finish();
-    writer.waitForTraces(1);
-
-    assertEquals(value, getter.apply((DDSpanContext) span.spanContext()));
-  }
-
-  @Test
-  void decoratorsApplyToBuilderToo() throws Exception {
-    ListWriter writer = new ListWriter();
-    CoreTracer tracer = tracerBuilder().writer(writer).build();
-
-    AgentSpan span =
-        tracer.buildSpan("datadog", "decorator.test").withTag("sn.tag1", "some val").start();
-    span.finish();
-    writer.waitForTraces(1);
-    assertEquals("some val", span.getServiceName());
-
-    span =
-        tracer
-            .buildSpan("datadog", "decorator.test")
-            .withTag("servlet.context", "/my-servlet")
-            .start();
-    assertEquals("my-servlet", span.getServiceName());
-
-    span = tracer.buildSpan("datadog", "decorator.test").withTag("error", "true").start();
-    span.finish();
-    writer.waitForTraces(2);
-    assertTrue(span.isError());
-
-    span =
-        tracer
-            .buildSpan("datadog", "decorator.test")
-            .withTag(Tags.DB_STATEMENT, "some-statement")
-            .start();
-    span.finish();
-    writer.waitForTraces(3);
-    assertEquals("some-statement", span.getResourceName().toString());
-  }
-
-  @TableTest({
-    "scenario           | decorator                   | enabled",
-    "lowercase enabled  | 'servicenametaginterceptor' | true   ",
-    "camelCase enabled  | 'ServiceNameTagInterceptor' | true   ",
-    "lowercase disabled | 'servicenametaginterceptor' | false  ",
-    "camelCase disabled | 'ServiceNameTagInterceptor' | false  "
-  })
-  void disableDecoratorViaConfig(String decorator, boolean enabled) {
-    injectSysConfig("dd.trace." + decorator + ".enabled", String.valueOf(enabled), false);
-
-    CoreTracer tracer =
-        tracerBuilder()
-            .serviceName("some-service")
-            .writer(new LoggingWriter())
-            .sampler(new AllSampler())
-            .build();
-
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", "some span")
-            .withTag(DDTags.SERVICE_NAME, "other-service")
-            .start();
-    span.finish();
-
-    assertEquals(enabled ? "other-service" : "some-service", span.getServiceName());
-  }
-
-  @TableTest({
-    "scenario     | tag                   | name          | expected      ",
-    "service.name | 'DDTags.SERVICE_NAME' | 'new-service' | 'some-service'",
-    "service      | 'service'             | 'new-service' | 'some-service'",
-    "sn.tag1      | 'sn.tag1'             | 'new-service' | 'new-service' "
-  })
-  void disablingServiceDecoratorDoesNotDisableSplitByTags(
-      @ConvertWith(TagsConverter.class) String tag, String name, String expected) {
-    injectSysConfig("dd.trace.ServiceNameTagInterceptor.enabled", "false", false);
-
-    CoreTracer tracer =
-        tracerBuilder()
-            .serviceName("some-service")
-            .writer(new LoggingWriter())
-            .sampler(new AllSampler())
-            .build();
-
-    AgentSpan span = tracer.buildSpan("datadog", "some span").withTag(tag, name).start();
-    span.finish();
-
-    assertEquals(expected, span.getServiceName());
-  }
-
-  @Test
-  void changeTopLevelStatusWhenChangingServiceName() {
-    CoreTracer tracer =
-        tracerBuilder()
-            .serviceName("some-service")
-            .writer(new LoggingWriter())
-            .sampler(new AllSampler())
-            .build();
-
-    AgentSpan parent = tracer.buildSpan("datadog", "parent").withServiceName("parent").start();
-
-    // the service name doesn't match the parent
-    AgentSpan child =
-        tracer.buildSpan("datadog", "child").withServiceName("child").asChildOf(parent).start();
-    assertTrue(((CoreSpan<?>) child).isTopLevel());
-
-    // the service name is changed to match the parent
-    child.setTag(DDTags.SERVICE_NAME, "parent");
-    assertFalse(((CoreSpan<?>) child).isTopLevel());
-
-    // the service name is changed to no longer match the parent
-    child.setTag(DDTags.SERVICE_NAME, "foo");
-    assertTrue(((CoreSpan<?>) child).isTopLevel());
-  }
-
-  static Stream<Arguments> treat1ValueAsTrueForBooleanTagValuesArguments() {
-    return Stream.of(
-        arguments("manual.drop / true", DDTags.MANUAL_DROP, true, (int) PrioritySampling.USER_DROP),
-        arguments("manual.drop / '1'", DDTags.MANUAL_DROP, "1", (int) PrioritySampling.USER_DROP),
-        arguments("manual.drop / false", DDTags.MANUAL_DROP, false, null),
-        arguments("manual.drop / '0'", DDTags.MANUAL_DROP, "0", null),
-        arguments("manual.keep / true", DDTags.MANUAL_KEEP, true, (int) PrioritySampling.USER_KEEP),
-        arguments("manual.keep / '1'", DDTags.MANUAL_KEEP, "1", (int) PrioritySampling.USER_KEEP),
-        arguments("manual.keep / false", DDTags.MANUAL_KEEP, false, null),
-        arguments("manual.keep / '0'", DDTags.MANUAL_KEEP, "0", null));
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("treat1ValueAsTrueForBooleanTagValuesArguments")
-  void treat1ValueAsTrueForBooleanTagValues(
-      String scenario, String tag, Object value, Integer samplingPriority) {
-    CoreTracer tracer =
-        tracerBuilder()
-            .serviceName("some-service")
-            .writer(new LoggingWriter())
-            .sampler(new AllSampler())
-            .build();
-
-    AgentSpan span = tracer.buildSpan("datadog", "test").start();
-    assertNull(span.getSamplingPriority());
-
-    span.setTag(tag, value);
-    assertEquals(samplingPriority, span.getSamplingPriority());
-  }
-
-  @TableTest({
-    "scenario     | URL                         | tags | expectedResourceName",
-    "null url     |                             |      | 'fakeOperation'     ",
-    "space url    | ' '                         |      | '/'                 ",
-    "tab url      | '\t'                        |      | '/'                 ",
-    "simple path  | '/path'                     |      | '/path'             ",
-    "complex path | '/ABC/a-1/b_2/c.3/d4d/5f/6' |      | '/ABC/?/?/?/?/?/?'  "
-  })
-  @ParameterizedTest
-  @MethodSource("urlAsResourceNameRuleSetsTheResourceNameArguments")
-  void urlAsResourceNameRuleSetsTheResourceName(
-      String url, Map<String, String> tags, String expectedResourceName) {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    AgentSpan span = tracer.buildSpan("datadog", "fakeOperation").start();
-    span.setTag(HTTP_URL, url);
-    if (tags != null) {
-      tags.forEach(span::setTag);
-    }
-
-    try {
-      assertEquals(expectedResourceName, span.getResourceName().toString());
-    } finally {
-      span.finish();
-    }
-  }
-
-  static Stream<Arguments> urlAsResourceNameRuleSetsTheResourceNameArguments() {
-    return Stream.of(
-        // spotless:off
+                );
+    }
+
+    @TableTest({
+      "scenario                           | context         | serviceName                                 | expected                                   ",
+      "root context with default service  | '/'             | 'DEFAULT_SERVLET_ROOT_CONTEXT_SERVICE_NAME' | 'DEFAULT_SERVLET_ROOT_CONTEXT_SERVICE_NAME'",
+      "empty context with default service | ''              | 'DEFAULT_SERVICE_NAME'                      | 'DEFAULT_SERVICE_NAME'                     ",
+      "/some-context with default service | '/some-context' | 'DEFAULT_SERVICE_NAME'                      | 'some-context'                             ",
+      "other-context with default service | 'other-context' | 'DEFAULT_SERVICE_NAME'                      | 'other-context'                            ",
+      "root context with my-service       | '/'             | 'my-service'                                | 'my-service'                               ",
+      "empty context with my-service      | ''              | 'my-service'                                | 'my-service'                               ",
+      "/some-context with my-service      | '/some-context' | 'my-service'                                | 'my-service'                               ",
+      "other-context with my-service      | 'other-context' | 'my-service'                                | 'my-service'                               "
+    })
+    void setServiceNameFromServletContext(
+            String context,
+            @ConvertWith(ConfigDefaultsConverter.class) String serviceName,
+            @ConvertWith(ConfigDefaultsConverter.class) String expected) {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        AgentSpan span = tracer.buildSpan("datadog", "test").start();
+        span.setTag(DDTags.SERVICE_NAME, serviceName);
+        span.setTag("servlet.context", context);
+
+        assertEquals(expected, span.getServiceName());
+    }
+
+    @TableTest({
+      "scenario                        | context         | serviceName           ",
+      "root context / default service  | '/'             | 'DEFAULT_SERVICE_NAME'",
+      "empty context / default service | ''              | 'DEFAULT_SERVICE_NAME'",
+      "/some-context / default service | '/some-context' | 'DEFAULT_SERVICE_NAME'",
+      "other-context / default service | 'other-context' | 'DEFAULT_SERVICE_NAME'",
+      "root context / env service      | '/'             | 'ENV_SERVICE_NAME'    ",
+      "empty context / env service     | ''              | 'ENV_SERVICE_NAME'    ",
+      "/some-context / env service     | '/some-context' | 'ENV_SERVICE_NAME'    ",
+      "other-context / env service     | 'other-context' | 'ENV_SERVICE_NAME'    ",
+      "root context / my-service       | '/'             | 'my-service'          ",
+      "empty context / my-service      | ''              | 'my-service'          ",
+      "/some-context / my-service      | '/some-context' | 'my-service'          ",
+      "other-context / my-service      | 'other-context' | 'my-service'          "
+    })
+    void settingServiceNameAsPropertyDisablesServletContext(
+            String context, @ConvertWith(ConfigDefaultsConverter.class) String serviceName) {
+        if ("ENV_SERVICE_NAME".equals(serviceName)) {
+            serviceName = CapturedEnvironment.get().getProperties().get(SERVICE_NAME);
+        }
+        injectSysConfig("service", serviceName);
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        AgentSpan span = tracer.buildSpan("datadog", "test").start();
+        span.setTag("servlet.context", context);
+
+        assertEquals(serviceName, span.getServiceName());
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {DEFAULT_SERVICE_NAME, "my-service"})
+    void mappingCausesServletContextToNotChangeServiceName(String serviceName) {
+        Map<String, String> mapping = singletonMap(serviceName, "new-service");
+        CoreTracer tracer = tracerBuilder()
+                .serviceName(serviceName)
+                .writer(new LoggingWriter())
+                .sampler(new AllSampler())
+                .serviceNameMappings(mapping)
+                .build();
+
+        AgentSpan span = tracer.buildSpan("datadog", "some span").start();
+        span.setTag("servlet.context", "/some-context");
+        span.finish();
+
+        assertEquals("new-service", span.getServiceName());
+    }
+
+    private CoreTracer createSplittingTracer(String tag) {
+        return tracerBuilder()
+                .serviceName("my-service")
+                .writer(new LoggingWriter())
+                .sampler(new AllSampler())
+                // equivalent to split-by-tags: tag
+                .tagInterceptor(
+                        new TagInterceptor(true, "my-service", Collections.singleton(tag), new RuleFlags(), false))
+                .build();
+    }
+
+    @TableTest({
+      "scenario     | expected       | jeeActive",
+      "jee inactive | 'some-context' | false    ",
+      "jee active   | 'my-service'   | true     "
+    })
+    void splitByTagsForServletContextAndExperimentalJeeSplitByDeployment(String expected, boolean jeeActive) {
+        CoreTracer tracer = tracerBuilder()
+                .serviceName("my-service")
+                .writer(new LoggingWriter())
+                .sampler(new AllSampler())
+                .tagInterceptor(new TagInterceptor(false, "my-service", emptySet(), new RuleFlags(), jeeActive))
+                .build();
+
+        AgentSpan span = tracer.buildSpan("datadog", "some span").start();
+        span.setTag(InstrumentationTags.SERVLET_CONTEXT, "some-context");
+        span.finish();
+
+        assertEquals(expected, span.getServiceName());
+    }
+
+    @Test
+    void peerServiceThenSplitByTagsViaBuilder() {
+        CoreTracer tracer = createSplittingTracer(Tags.MESSAGE_BUS_DESTINATION);
+
+        AgentSpan span = tracer.buildSpan("datadog", "some span")
+                .withTag(Tags.PEER_SERVICE, "peer-service")
+                .withTag(Tags.MESSAGE_BUS_DESTINATION, "some-queue")
+                .start();
+        span.finish();
+
+        assertEquals("some-queue", span.getServiceName());
+    }
+
+    @Test
+    void peerServiceThenSplitByTagsViaSetTag() {
+        CoreTracer tracer = createSplittingTracer(Tags.MESSAGE_BUS_DESTINATION);
+
+        AgentSpan span = tracer.buildSpan("datadog", "some span").start();
+        span.setTag(Tags.PEER_SERVICE, "peer-service");
+        span.setTag(Tags.MESSAGE_BUS_DESTINATION, "some-queue");
+        span.finish();
+
+        assertEquals("some-queue", span.getServiceName());
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void splitByTagsThenPeerServiceViaBuilder(boolean enabled) {
+        injectSysConfig("dd.trace.PeerServiceTagInterceptor.enabled", String.valueOf(enabled), false);
+        CoreTracer tracer = createSplittingTracer(Tags.MESSAGE_BUS_DESTINATION);
+
+        AgentSpan span = tracer.buildSpan("datadog", "some span")
+                .withTag(Tags.MESSAGE_BUS_DESTINATION, "some-queue")
+                .withTag(Tags.PEER_SERVICE, "peer-service")
+                .start();
+        span.finish();
+
+        assertEquals(enabled, "peer-service".equals(span.getServiceName()));
+    }
+
+    @Test
+    @WithConfig(key = "dd.trace.PeerServiceTagInterceptor.enabled", value = "true", addPrefix = false)
+    void splitByTagsThenPeerServiceViaSetTag() {
+        CoreTracer tracer = createSplittingTracer(Tags.MESSAGE_BUS_DESTINATION);
+
+        AgentSpan span = tracer.buildSpan("datadog", "some span").start();
+        span.setTag(Tags.MESSAGE_BUS_DESTINATION, "some-queue");
+        span.setTag(Tags.PEER_SERVICE, "peer-service");
+        span.finish();
+
+        assertEquals("peer-service", span.getServiceName());
+    }
+
+    @Test
+    void setResourceName() throws Exception {
+        ListWriter writer = new ListWriter();
+        CoreTracer tracer = tracerBuilder().writer(writer).build();
+
+        String name = "my resource name";
+        AgentSpan span = tracer.buildSpan("datadog", "test").start();
+        span.setTag(DDTags.RESOURCE_NAME, name);
+        span.finish();
+        writer.waitForTraces(1);
+
+        assertEquals(name, span.getResourceName().toString());
+    }
+
+    @Test
+    void setResourceNameIgnoresNull() throws Exception {
+        ListWriter writer = new ListWriter();
+        CoreTracer tracer = tracerBuilder().writer(writer).build();
+
+        AgentSpan span =
+                tracer.buildSpan("datadog", "test").withResourceName("keep").start();
+        span.setTag(DDTags.RESOURCE_NAME, (String) null);
+        span.finish();
+        writer.waitForTraces(1);
+
+        assertEquals("keep", span.getResourceName().toString());
+    }
+
+    @Test
+    void setSpanType() {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        AgentSpan span = tracer.buildSpan("datadog", "test").start();
+        String type = DDSpanTypes.HTTP_CLIENT;
+        span.setSpanType(type);
+        span.finish();
+
+        assertEquals(type, span.getSpanType());
+    }
+
+    @Test
+    void setSpanTypeWithTag() throws Exception {
+        ListWriter writer = new ListWriter();
+        CoreTracer tracer = tracerBuilder().writer(writer).build();
+        AgentSpan span = tracer.buildSpan("datadog", "test").start();
+        String type = DDSpanTypes.HTTP_CLIENT;
+        span.setTag(DDTags.SPAN_TYPE, type);
+        span.finish();
+        writer.waitForTraces(1);
+
+        assertEquals(type, span.getSpanType());
+    }
+
+    static Stream<Arguments> spanMetricsStartsEmptyButAddedWithRateLimitingValueArguments() {
+        return Stream.of(
+                arguments("int 0", 0, 0),
+                arguments("int 1", 1, 1),
+                arguments("float 0", 0f, 0f),
+                arguments("float 1", 1f, 1f),
+                arguments("double 0.1", 0.1, 0.1),
+                arguments("double 1.1", 1.1, 1.1),
+                arguments("int -1", -1, -1),
+                arguments("int 10", 10, 10),
+                arguments("string '00'", "00", 0.0),
+                arguments("string '1'", "1", 1.0),
+                arguments("string '1.0'", "1.0", 1.0),
+                arguments("string '0'", "0", 0.0),
+                arguments("string '0.1'", "0.1", 0.1),
+                arguments("string '1.1'", "1.1", 1.1),
+                arguments("string '-1'", "-1", -1.0),
+                arguments("string 'str'", "str", null));
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("spanMetricsStartsEmptyButAddedWithRateLimitingValueArguments")
+    void spanMetricsStartsEmptyButAddedWithRateLimitingValue(String scenario, Object rate, Object result)
+            throws Exception {
+        ListWriter writer = new ListWriter();
+        CoreTracer tracer = tracerBuilder().writer(writer).build();
+        AgentSpan span = tracer.buildSpan("datadog", "test").start();
+
+        assertNull(span.getTag(ANALYTICS_SAMPLE_RATE));
+
+        span.setTag(ANALYTICS_SAMPLE_RATE, rate);
+        span.finish();
+        writer.waitForTraces(1);
+
+        assertEquals(result, span.getTag(ANALYTICS_SAMPLE_RATE));
+    }
+
+    static Stream<Arguments> setPrioritySamplingViaTagArguments() {
+        return Stream.of(
+                arguments("manual.keep / true", DDTags.MANUAL_KEEP, true, (int) PrioritySampling.USER_KEEP),
+                arguments("manual.keep / false", DDTags.MANUAL_KEEP, false, null),
+                arguments("manual.keep / 'true'", DDTags.MANUAL_KEEP, "true", (int) PrioritySampling.USER_KEEP),
+                arguments("manual.keep / 'false'", DDTags.MANUAL_KEEP, "false", null),
+                arguments("manual.keep / 'asdf'", DDTags.MANUAL_KEEP, "asdf", null),
+                arguments("manual.drop / true", DDTags.MANUAL_DROP, true, (int) PrioritySampling.USER_DROP),
+                arguments("manual.drop / false", DDTags.MANUAL_DROP, false, null),
+                arguments("manual.drop / 'true'", DDTags.MANUAL_DROP, "true", (int) PrioritySampling.USER_DROP),
+                arguments("manual.drop / 'false'", DDTags.MANUAL_DROP, "false", null),
+                arguments("manual.drop / 'asdf'", DDTags.MANUAL_DROP, "asdf", null),
+                arguments("asm.keep / true", Tags.ASM_KEEP, true, (int) PrioritySampling.USER_KEEP),
+                arguments("asm.keep / false", Tags.ASM_KEEP, false, null),
+                arguments("asm.keep / 'true'", Tags.ASM_KEEP, "true", (int) PrioritySampling.USER_KEEP),
+                arguments("asm.keep / 'false'", Tags.ASM_KEEP, "false", null),
+                arguments("asm.keep / 'asdf'", Tags.ASM_KEEP, "asdf", null),
+                arguments("ai_guard.keep / true", Tags.AI_GUARD_KEEP, true, (int) PrioritySampling.USER_KEEP),
+                arguments("ai_guard.keep / false", Tags.AI_GUARD_KEEP, false, null),
+                arguments("ai_guard.keep / 'true'", Tags.AI_GUARD_KEEP, "true", (int) PrioritySampling.USER_KEEP),
+                arguments("ai_guard.keep / 'false'", Tags.AI_GUARD_KEEP, "false", null),
+                arguments("ai_guard.keep / 'asdf'", Tags.AI_GUARD_KEEP, "asdf", null),
+                arguments("sampling.priority / -1", Tags.SAMPLING_PRIORITY, -1, (int) PrioritySampling.USER_DROP),
+                arguments("sampling.priority / 0", Tags.SAMPLING_PRIORITY, 0, (int) PrioritySampling.USER_DROP),
+                arguments("sampling.priority / 1", Tags.SAMPLING_PRIORITY, 1, (int) PrioritySampling.USER_KEEP),
+                arguments("sampling.priority / 2", Tags.SAMPLING_PRIORITY, 2, (int) PrioritySampling.USER_KEEP),
+                arguments("sampling.priority / '-1'", Tags.SAMPLING_PRIORITY, "-1", (int) PrioritySampling.USER_DROP),
+                arguments("sampling.priority / '0'", Tags.SAMPLING_PRIORITY, "0", (int) PrioritySampling.USER_DROP),
+                arguments("sampling.priority / '1'", Tags.SAMPLING_PRIORITY, "1", (int) PrioritySampling.USER_KEEP),
+                arguments("sampling.priority / '2'", Tags.SAMPLING_PRIORITY, "2", (int) PrioritySampling.USER_KEEP),
+                arguments("sampling.priority / 'asdf'", Tags.SAMPLING_PRIORITY, "asdf", null));
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("setPrioritySamplingViaTagArguments")
+    void setPrioritySamplingViaTag(String scenario, String tag, Object value, Integer expected) {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        AgentSpan span = tracer.buildSpan("datadog", "test").start();
+        span.setTag(tag, value);
+
+        assertEquals(expected, span.getSamplingPriority());
+    }
+
+    @Test
+    void samplingPriorityPositiveTagOverridesLockedPriority() {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        AgentSpan span = tracer.buildSpan("datadog", "test").start();
+
+        // Simulate upstream propagation of x-datadog-sampling-priority: -1 (USER_DROP)
+        span.setSamplingPriority(PrioritySampling.USER_DROP, SamplingMechanism.UNKNOWN);
+        assertEquals((int) PrioritySampling.USER_DROP, span.getSamplingPriority());
+
+        // positive sampling.priority overrides the propagated locked priority
+        span.setTag(Tags.SAMPLING_PRIORITY, 2);
+        assertEquals((int) PrioritySampling.USER_KEEP, span.getSamplingPriority());
+    }
+
+    @Test
+    void samplingPriorityNonPositiveTagDoesNotOverrideLockedPriority() {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        AgentSpan span = tracer.buildSpan("datadog", "test").start();
+
+        // Simulate upstream propagation of x-datadog-sampling-priority: 2 (USER_KEEP)
+        span.setSamplingPriority(PrioritySampling.USER_KEEP, SamplingMechanism.UNKNOWN);
+        assertEquals((int) PrioritySampling.USER_KEEP, span.getSamplingPriority());
+
+        // non-positive sampling.priority respects the propagated locked priority
+        span.setTag(Tags.SAMPLING_PRIORITY, 0);
+        assertEquals((int) PrioritySampling.USER_KEEP, span.getSamplingPriority());
+    }
+
+    @Test
+    void samplingPriorityPositiveTagOverridesDecisionMakerFromUpstreamPropagation() {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        // Upstream service dropped with LOCAL_USER_RULE and propagated _dd.p.dm=-3
+        PropagationTags propagationTags =
+                PropagationTags.factory().fromHeaderValue(PropagationTags.HeaderType.DATADOG, "_dd.p.dm=-3");
+        AgentSpanContext extracted = new ExtractedContext(
+                DDTraceId.from(123), 456L, PrioritySampling.USER_DROP, null, propagationTags, DATADOG);
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("datadog", "test").asChildOf(extracted).start();
+
+        // positive sampling.priority overrides locked priority and sets _dd.p.dm to MANUAL
+        span.setTag(Tags.SAMPLING_PRIORITY, 2);
+
+        assertEquals((int) PrioritySampling.USER_KEEP, span.getSamplingPriority());
+        assertEquals(
+                "_dd.p.dm=-4", span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG));
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void setErrorFlagWhenErrorTagReported(boolean error) throws Exception {
+        ListWriter writer = new ListWriter();
+        CoreTracer tracer = tracerBuilder().writer(writer).build();
+        AgentSpan span = tracer.buildSpan("datadog", "test").start();
+        span.setTag(Tags.ERROR, error);
+        span.finish();
+        writer.waitForTraces(1);
+
+        assertEquals(error, span.isError());
+    }
+
+    static Stream<Arguments> interceptorsApplyToBuilderTooArguments() {
+        return Stream.of(
+                arguments("serviceName", DDTags.SERVICE_NAME, "my-service", (Function<DDSpanContext, Object>)
+                        DDSpanContext::getServiceName),
+                arguments("resourceName", DDTags.RESOURCE_NAME, "my-resource", (Function<DDSpanContext, Object>)
+                        ctx -> ctx.getResourceName().toString()),
+                arguments("spanType", DDTags.SPAN_TYPE, "my-span-type", (Function<DDSpanContext, Object>)
+                        DDSpanContext::getSpanType));
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("interceptorsApplyToBuilderTooArguments")
+    void interceptorsApplyToBuilderToo(
+            String attribute, String name, String value, Function<DDSpanContext, Object> getter) throws Exception {
+        ListWriter writer = new ListWriter();
+        CoreTracer tracer = tracerBuilder().writer(writer).build();
+
+        AgentSpan span = tracer.buildSpan("datadog", "interceptor.test")
+                .withTag(name, value)
+                .start();
+        span.finish();
+        writer.waitForTraces(1);
+
+        assertEquals(value, getter.apply((DDSpanContext) span.spanContext()));
+    }
+
+    @Test
+    void decoratorsApplyToBuilderToo() throws Exception {
+        ListWriter writer = new ListWriter();
+        CoreTracer tracer = tracerBuilder().writer(writer).build();
+
+        AgentSpan span = tracer.buildSpan("datadog", "decorator.test")
+                .withTag("sn.tag1", "some val")
+                .start();
+        span.finish();
+        writer.waitForTraces(1);
+        assertEquals("some val", span.getServiceName());
+
+        span = tracer.buildSpan("datadog", "decorator.test")
+                .withTag("servlet.context", "/my-servlet")
+                .start();
+        assertEquals("my-servlet", span.getServiceName());
+
+        span = tracer.buildSpan("datadog", "decorator.test")
+                .withTag("error", "true")
+                .start();
+        span.finish();
+        writer.waitForTraces(2);
+        assertTrue(span.isError());
+
+        span = tracer.buildSpan("datadog", "decorator.test")
+                .withTag(Tags.DB_STATEMENT, "some-statement")
+                .start();
+        span.finish();
+        writer.waitForTraces(3);
+        assertEquals("some-statement", span.getResourceName().toString());
+    }
+
+    @TableTest({
+      "scenario           | decorator                   | enabled",
+      "lowercase enabled  | 'servicenametaginterceptor' | true   ",
+      "camelCase enabled  | 'ServiceNameTagInterceptor' | true   ",
+      "lowercase disabled | 'servicenametaginterceptor' | false  ",
+      "camelCase disabled | 'ServiceNameTagInterceptor' | false  "
+    })
+    void disableDecoratorViaConfig(String decorator, boolean enabled) {
+        injectSysConfig("dd.trace." + decorator + ".enabled", String.valueOf(enabled), false);
+
+        CoreTracer tracer = tracerBuilder()
+                .serviceName("some-service")
+                .writer(new LoggingWriter())
+                .sampler(new AllSampler())
+                .build();
+
+        AgentSpan span = tracer.buildSpan("datadog", "some span")
+                .withTag(DDTags.SERVICE_NAME, "other-service")
+                .start();
+        span.finish();
+
+        assertEquals(enabled ? "other-service" : "some-service", span.getServiceName());
+    }
+
+    @TableTest({
+      "scenario     | tag                   | name          | expected      ",
+      "service.name | 'DDTags.SERVICE_NAME' | 'new-service' | 'some-service'",
+      "service      | 'service'             | 'new-service' | 'some-service'",
+      "sn.tag1      | 'sn.tag1'             | 'new-service' | 'new-service' "
+    })
+    void disablingServiceDecoratorDoesNotDisableSplitByTags(
+            @ConvertWith(TagsConverter.class) String tag, String name, String expected) {
+        injectSysConfig("dd.trace.ServiceNameTagInterceptor.enabled", "false", false);
+
+        CoreTracer tracer = tracerBuilder()
+                .serviceName("some-service")
+                .writer(new LoggingWriter())
+                .sampler(new AllSampler())
+                .build();
+
+        AgentSpan span =
+                tracer.buildSpan("datadog", "some span").withTag(tag, name).start();
+        span.finish();
+
+        assertEquals(expected, span.getServiceName());
+    }
+
+    @Test
+    void changeTopLevelStatusWhenChangingServiceName() {
+        CoreTracer tracer = tracerBuilder()
+                .serviceName("some-service")
+                .writer(new LoggingWriter())
+                .sampler(new AllSampler())
+                .build();
+
+        AgentSpan parent =
+                tracer.buildSpan("datadog", "parent").withServiceName("parent").start();
+
+        // the service name doesn't match the parent
+        AgentSpan child = tracer.buildSpan("datadog", "child")
+                .withServiceName("child")
+                .asChildOf(parent)
+                .start();
+        assertTrue(((CoreSpan<?>) child).isTopLevel());
+
+        // the service name is changed to match the parent
+        child.setTag(DDTags.SERVICE_NAME, "parent");
+        assertFalse(((CoreSpan<?>) child).isTopLevel());
+
+        // the service name is changed to no longer match the parent
+        child.setTag(DDTags.SERVICE_NAME, "foo");
+        assertTrue(((CoreSpan<?>) child).isTopLevel());
+    }
+
+    static Stream<Arguments> treat1ValueAsTrueForBooleanTagValuesArguments() {
+        return Stream.of(
+                arguments("manual.drop / true", DDTags.MANUAL_DROP, true, (int) PrioritySampling.USER_DROP),
+                arguments("manual.drop / '1'", DDTags.MANUAL_DROP, "1", (int) PrioritySampling.USER_DROP),
+                arguments("manual.drop / false", DDTags.MANUAL_DROP, false, null),
+                arguments("manual.drop / '0'", DDTags.MANUAL_DROP, "0", null),
+                arguments("manual.keep / true", DDTags.MANUAL_KEEP, true, (int) PrioritySampling.USER_KEEP),
+                arguments("manual.keep / '1'", DDTags.MANUAL_KEEP, "1", (int) PrioritySampling.USER_KEEP),
+                arguments("manual.keep / false", DDTags.MANUAL_KEEP, false, null),
+                arguments("manual.keep / '0'", DDTags.MANUAL_KEEP, "0", null));
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("treat1ValueAsTrueForBooleanTagValuesArguments")
+    void treat1ValueAsTrueForBooleanTagValues(String scenario, String tag, Object value, Integer samplingPriority) {
+        CoreTracer tracer = tracerBuilder()
+                .serviceName("some-service")
+                .writer(new LoggingWriter())
+                .sampler(new AllSampler())
+                .build();
+
+        AgentSpan span = tracer.buildSpan("datadog", "test").start();
+        assertNull(span.getSamplingPriority());
+
+        span.setTag(tag, value);
+        assertEquals(samplingPriority, span.getSamplingPriority());
+    }
+
+    @TableTest({
+      "scenario     | URL                         | tags | expectedResourceName",
+      "null url     |                             |      | 'fakeOperation'     ",
+      "space url    | ' '                         |      | '/'                 ",
+      "tab url      | '\t'                        |      | '/'                 ",
+      "simple path  | '/path'                     |      | '/path'             ",
+      "complex path | '/ABC/a-1/b_2/c.3/d4d/5f/6' |      | '/ABC/?/?/?/?/?/?'  "
+    })
+    @ParameterizedTest
+    @MethodSource("urlAsResourceNameRuleSetsTheResourceNameArguments")
+    void urlAsResourceNameRuleSetsTheResourceName(String url, Map<String, String> tags, String expectedResourceName) {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        AgentSpan span = tracer.buildSpan("datadog", "fakeOperation").start();
+        span.setTag(HTTP_URL, url);
+        if (tags != null) {
+            tags.forEach(span::setTag);
+        }
+
+        try {
+            assertEquals(expectedResourceName, span.getResourceName().toString());
+        } finally {
+            span.finish();
+        }
+    }
+
+    static Stream<Arguments> urlAsResourceNameRuleSetsTheResourceNameArguments() {
+        return Stream.of(
+                // spotless:off
           arguments("/not-found", singletonMap(HTTP_STATUS, "404"), "404"),
           arguments("/with-method", singletonMap(HTTP_METHOD, "Post"), "POST /with-method")
         // spotless:on
-        );
-  }
-
-  @Test
-  void whenUserSetsPeerServiceTheSourceShouldBePeerService() {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    AgentSpan span = tracer.buildSpan("datadog", "fakeOperation").start();
-    try {
-      span.setTag(Tags.PEER_SERVICE, "test");
-      assertEquals("peer.service", span.getTag(DDTags.PEER_SERVICE_SOURCE));
-    } finally {
-      span.finish();
-    }
-  }
-
-  @Test
-  void whenInterceptServiceNameExtraServiceProviderIsCalled() {
-    ServiceNameCollector origServiceNameCollector = ServiceNameCollector.get();
-    ServiceNameCollector extraServiceProvider = mock(ServiceNameCollector.class);
-    ServiceNameCollectorTestBridge.setInstance(extraServiceProvider);
-    try {
-      RuleFlags ruleFlags = mock(RuleFlags.class);
-      when(ruleFlags.isEnabled(any())).thenReturn(true);
-      TagInterceptor interceptor =
-          new TagInterceptor(
-              true, "my-service", Collections.singleton(DDTags.SERVICE_NAME), ruleFlags, false);
-
-      interceptor.interceptServiceName(null, mock(DDSpanContext.class), "some-service");
-
-      verify(extraServiceProvider, times(1)).addService("some-service");
-    } finally {
-      ServiceNameCollectorTestBridge.setInstance(origServiceNameCollector);
-    }
-  }
-
-  @TableTest({
-    "scenario     | value   | expected      ",
-    "root context | '/'     | 'root-servlet'",
-    "/test path   | '/test' | 'test'        ",
-    "test path    | 'test'  | 'test'        "
-  })
-  void whenInterceptServletContextExtraServiceProviderIsCalled(String value, String expected) {
-    ServiceNameCollector origServiceNameCollector = ServiceNameCollector.get();
-    ServiceNameCollector extraServiceProvider = mock(ServiceNameCollector.class);
-    ServiceNameCollectorTestBridge.setInstance(extraServiceProvider);
-    try {
-      RuleFlags ruleFlags = mock(RuleFlags.class);
-      when(ruleFlags.isEnabled(any())).thenReturn(true);
-      TagInterceptor interceptor =
-          new TagInterceptor(
-              true, "my-service", Collections.singleton("servlet.context"), ruleFlags, false);
-
-      interceptor.interceptServletContext(mock(DDSpanContext.class), value);
-
-      verify(extraServiceProvider, times(1)).addService(expected);
-    } finally {
-      ServiceNameCollectorTestBridge.setInstance(origServiceNameCollector);
-    }
-  }
-
-  @Test
-  void whenInterceptsProductTraceSourcePropagationTagUpdatePropagatedTraceSourceIsCalled() {
-    RuleFlags ruleFlags = mock(RuleFlags.class);
-    when(ruleFlags.isEnabled(any())).thenReturn(true);
-    TagInterceptor interceptor = new TagInterceptor(ruleFlags);
-    DDSpanContext context = mock(DDSpanContext.class);
-
-    interceptor.interceptTag(context, Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
-
-    verify(context, times(1)).addPropagatedTraceSource(ProductTraceSource.ASM);
-  }
+                );
+    }
+
+    @Test
+    void whenUserSetsPeerServiceTheSourceShouldBePeerService() {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        AgentSpan span = tracer.buildSpan("datadog", "fakeOperation").start();
+        try {
+            span.setTag(Tags.PEER_SERVICE, "test");
+            assertEquals("peer.service", span.getTag(DDTags.PEER_SERVICE_SOURCE));
+        } finally {
+            span.finish();
+        }
+    }
+
+    @Test
+    void whenInterceptServiceNameExtraServiceProviderIsCalled() {
+        ServiceNameCollector origServiceNameCollector = ServiceNameCollector.get();
+        ServiceNameCollector extraServiceProvider = mock(ServiceNameCollector.class);
+        ServiceNameCollectorTestBridge.setInstance(extraServiceProvider);
+        try {
+            RuleFlags ruleFlags = mock(RuleFlags.class);
+            when(ruleFlags.isEnabled(any())).thenReturn(true);
+            TagInterceptor interceptor = new TagInterceptor(
+                    true, "my-service", Collections.singleton(DDTags.SERVICE_NAME), ruleFlags, false);
+
+            interceptor.interceptServiceName(null, mock(DDSpanContext.class), "some-service");
+
+            verify(extraServiceProvider, times(1)).addService("some-service");
+        } finally {
+            ServiceNameCollectorTestBridge.setInstance(origServiceNameCollector);
+        }
+    }
+
+    @TableTest({
+      "scenario     | value   | expected      ",
+      "root context | '/'     | 'root-servlet'",
+      "/test path   | '/test' | 'test'        ",
+      "test path    | 'test'  | 'test'        "
+    })
+    void whenInterceptServletContextExtraServiceProviderIsCalled(String value, String expected) {
+        ServiceNameCollector origServiceNameCollector = ServiceNameCollector.get();
+        ServiceNameCollector extraServiceProvider = mock(ServiceNameCollector.class);
+        ServiceNameCollectorTestBridge.setInstance(extraServiceProvider);
+        try {
+            RuleFlags ruleFlags = mock(RuleFlags.class);
+            when(ruleFlags.isEnabled(any())).thenReturn(true);
+            TagInterceptor interceptor =
+                    new TagInterceptor(true, "my-service", Collections.singleton("servlet.context"), ruleFlags, false);
+
+            interceptor.interceptServletContext(mock(DDSpanContext.class), value);
+
+            verify(extraServiceProvider, times(1)).addService(expected);
+        } finally {
+            ServiceNameCollectorTestBridge.setInstance(origServiceNameCollector);
+        }
+    }
+
+    @Test
+    void whenInterceptsProductTraceSourcePropagationTagUpdatePropagatedTraceSourceIsCalled() {
+        RuleFlags ruleFlags = mock(RuleFlags.class);
+        when(ruleFlags.isEnabled(any())).thenReturn(true);
+        TagInterceptor interceptor = new TagInterceptor(ruleFlags);
+        DDSpanContext context = mock(DDSpanContext.class);
+
+        interceptor.interceptTag(context, Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
+
+        verify(context, times(1)).addPropagatedTraceSource(ProductTraceSource.ASM);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/HttpEndpointPostProcessorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/HttpEndpointPostProcessorTest.java
index e12c1a0dfa6..e6f5b60ebc3 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/HttpEndpointPostProcessorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/HttpEndpointPostProcessorTest.java
@@ -22,83 +22,86 @@
 @ExtendWith(MockitoExtension.class)
 class HttpEndpointPostProcessorTest {
 
-  @Mock DDSpanContext mockContext;
-  @Mock AppendableSpanLinks mockSpanLinks;
-
-  @Test
-  void shouldNotOverwriteResourceNameWhenHttpRouteIsAvailableAndEligible() {
-    EndpointResolver endpointResolver = new EndpointResolver(true, false);
-    HttpEndpointPostProcessor processor = new HttpEndpointPostProcessor(endpointResolver);
-    Map<String, String> tagInput = new HashMap<>();
-    tagInput.put(Tags.HTTP_METHOD, "GET");
-    tagInput.put(Tags.HTTP_ROUTE, "/greeting");
-    tagInput.put(Tags.HTTP_URL, "http://localhost:8080/greeting");
-    TagMap tags = TagMap.fromMap(tagInput);
-
-    processor.processTags(tags, mockContext, mockSpanLinks);
-
-    verify(mockContext, never()).setResourceName(any(CharSequence.class), anyByte());
-    assertFalse(tags.containsKey(Tags.HTTP_ENDPOINT));
-  }
-
-  @Test
-  void shouldComputeAndTagHttpEndpointFromUrlWhenRouteIsInvalidWithoutTouchingResourceName() {
-    EndpointResolver endpointResolver = new EndpointResolver(true, false);
-    HttpEndpointPostProcessor processor = new HttpEndpointPostProcessor(endpointResolver);
-    Map<String, String> tagInput = new HashMap<>();
-    tagInput.put(Tags.HTTP_METHOD, "GET");
-    tagInput.put(Tags.HTTP_ROUTE, "*"); // catch-all — ineligible per RFC-1051
-    tagInput.put(Tags.HTTP_URL, "http://localhost:8080/users/123/orders/456");
-    TagMap tags = TagMap.fromMap(tagInput);
-
-    processor.processTags(tags, mockContext, mockSpanLinks);
-
-    verify(mockContext, never()).setResourceName(any(CharSequence.class), anyByte());
-    assertEquals("/users/{param:int}/orders/{param:int}", tags.get(Tags.HTTP_ENDPOINT));
-  }
-
-  @Test
-  void shouldSkipNonHttpSpans() {
-    EndpointResolver endpointResolver = new EndpointResolver(true, false);
-    HttpEndpointPostProcessor processor = new HttpEndpointPostProcessor(endpointResolver);
-    Map<String, String> tagInput = new HashMap<>();
-    tagInput.put("db.statement", "SELECT * FROM users");
-    TagMap tags = TagMap.fromMap(tagInput);
-
-    processor.processTags(tags, mockContext, mockSpanLinks);
-
-    verify(mockContext, never()).setResourceName(any(CharSequence.class), anyByte());
-    assertFalse(tags.containsKey(Tags.HTTP_ENDPOINT));
-  }
-
-  @Test
-  void shouldNotProcessWhenResourceRenamingIsDisabled() {
-    EndpointResolver endpointResolver = new EndpointResolver(false, false);
-    HttpEndpointPostProcessor processor = new HttpEndpointPostProcessor(endpointResolver);
-    Map<String, String> tagInput = new HashMap<>();
-    tagInput.put(Tags.HTTP_METHOD, "GET");
-    tagInput.put(Tags.HTTP_ROUTE, "/greeting");
-    TagMap tags = TagMap.fromMap(tagInput);
-
-    processor.processTags(tags, mockContext, mockSpanLinks);
-
-    verify(mockContext, never()).setResourceName(any(CharSequence.class), anyByte());
-    assertFalse(tags.containsKey(Tags.HTTP_ENDPOINT));
-  }
-
-  @Test
-  void shouldTagHttpEndpointFromUrlEvenWhenAlwaysSimplifiedIsTrueWithoutTouchingResourceName() {
-    EndpointResolver endpointResolver = new EndpointResolver(true, true);
-    HttpEndpointPostProcessor processor = new HttpEndpointPostProcessor(endpointResolver);
-    Map<String, String> tagInput = new HashMap<>();
-    tagInput.put(Tags.HTTP_METHOD, "GET");
-    tagInput.put(Tags.HTTP_ROUTE, "/greeting");
-    tagInput.put(Tags.HTTP_URL, "http://localhost:8080/users/123");
-    TagMap tags = TagMap.fromMap(tagInput);
-
-    processor.processTags(tags, mockContext, mockSpanLinks);
-
-    verify(mockContext, never()).setResourceName(any(CharSequence.class), anyByte());
-    assertEquals("/users/{param:int}", tags.get(Tags.HTTP_ENDPOINT));
-  }
+    @Mock
+    DDSpanContext mockContext;
+
+    @Mock
+    AppendableSpanLinks mockSpanLinks;
+
+    @Test
+    void shouldNotOverwriteResourceNameWhenHttpRouteIsAvailableAndEligible() {
+        EndpointResolver endpointResolver = new EndpointResolver(true, false);
+        HttpEndpointPostProcessor processor = new HttpEndpointPostProcessor(endpointResolver);
+        Map<String, String> tagInput = new HashMap<>();
+        tagInput.put(Tags.HTTP_METHOD, "GET");
+        tagInput.put(Tags.HTTP_ROUTE, "/greeting");
+        tagInput.put(Tags.HTTP_URL, "http://localhost:8080/greeting");
+        TagMap tags = TagMap.fromMap(tagInput);
+
+        processor.processTags(tags, mockContext, mockSpanLinks);
+
+        verify(mockContext, never()).setResourceName(any(CharSequence.class), anyByte());
+        assertFalse(tags.containsKey(Tags.HTTP_ENDPOINT));
+    }
+
+    @Test
+    void shouldComputeAndTagHttpEndpointFromUrlWhenRouteIsInvalidWithoutTouchingResourceName() {
+        EndpointResolver endpointResolver = new EndpointResolver(true, false);
+        HttpEndpointPostProcessor processor = new HttpEndpointPostProcessor(endpointResolver);
+        Map<String, String> tagInput = new HashMap<>();
+        tagInput.put(Tags.HTTP_METHOD, "GET");
+        tagInput.put(Tags.HTTP_ROUTE, "*"); // catch-all — ineligible per RFC-1051
+        tagInput.put(Tags.HTTP_URL, "http://localhost:8080/users/123/orders/456");
+        TagMap tags = TagMap.fromMap(tagInput);
+
+        processor.processTags(tags, mockContext, mockSpanLinks);
+
+        verify(mockContext, never()).setResourceName(any(CharSequence.class), anyByte());
+        assertEquals("/users/{param:int}/orders/{param:int}", tags.get(Tags.HTTP_ENDPOINT));
+    }
+
+    @Test
+    void shouldSkipNonHttpSpans() {
+        EndpointResolver endpointResolver = new EndpointResolver(true, false);
+        HttpEndpointPostProcessor processor = new HttpEndpointPostProcessor(endpointResolver);
+        Map<String, String> tagInput = new HashMap<>();
+        tagInput.put("db.statement", "SELECT * FROM users");
+        TagMap tags = TagMap.fromMap(tagInput);
+
+        processor.processTags(tags, mockContext, mockSpanLinks);
+
+        verify(mockContext, never()).setResourceName(any(CharSequence.class), anyByte());
+        assertFalse(tags.containsKey(Tags.HTTP_ENDPOINT));
+    }
+
+    @Test
+    void shouldNotProcessWhenResourceRenamingIsDisabled() {
+        EndpointResolver endpointResolver = new EndpointResolver(false, false);
+        HttpEndpointPostProcessor processor = new HttpEndpointPostProcessor(endpointResolver);
+        Map<String, String> tagInput = new HashMap<>();
+        tagInput.put(Tags.HTTP_METHOD, "GET");
+        tagInput.put(Tags.HTTP_ROUTE, "/greeting");
+        TagMap tags = TagMap.fromMap(tagInput);
+
+        processor.processTags(tags, mockContext, mockSpanLinks);
+
+        verify(mockContext, never()).setResourceName(any(CharSequence.class), anyByte());
+        assertFalse(tags.containsKey(Tags.HTTP_ENDPOINT));
+    }
+
+    @Test
+    void shouldTagHttpEndpointFromUrlEvenWhenAlwaysSimplifiedIsTrueWithoutTouchingResourceName() {
+        EndpointResolver endpointResolver = new EndpointResolver(true, true);
+        HttpEndpointPostProcessor processor = new HttpEndpointPostProcessor(endpointResolver);
+        Map<String, String> tagInput = new HashMap<>();
+        tagInput.put(Tags.HTTP_METHOD, "GET");
+        tagInput.put(Tags.HTTP_ROUTE, "/greeting");
+        tagInput.put(Tags.HTTP_URL, "http://localhost:8080/users/123");
+        TagMap tags = TagMap.fromMap(tagInput);
+
+        processor.processTags(tags, mockContext, mockSpanLinks);
+
+        verify(mockContext, never()).setResourceName(any(CharSequence.class), anyByte());
+        assertEquals("/users/{param:int}", tags.get(Tags.HTTP_ENDPOINT));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/IntegrationAdderTest.java b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/IntegrationAdderTest.java
index 8b6aa9cedae..28b68fa59c7 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/IntegrationAdderTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/IntegrationAdderTest.java
@@ -16,23 +16,22 @@
 
 class IntegrationAdderTest extends DDJavaSpecification {
 
-  @ValueSource(booleans = {true, false})
-  @ParameterizedTest(
-      name = "should add or remove _dd.integration when set ({0}) on the span context")
-  void shouldAddOrRemoveDdIntegrationWhenSetOnTheSpanContext(boolean isSet) {
-    IntegrationAdder calculator = new IntegrationAdder();
-    DDSpanContext spanContext = mock(DDSpanContext.class);
-    when(spanContext.getIntegrationName()).thenReturn(isSet ? "test" : null);
+    @ValueSource(booleans = {true, false})
+    @ParameterizedTest(name = "should add or remove _dd.integration when set ({0}) on the span context")
+    void shouldAddOrRemoveDdIntegrationWhenSetOnTheSpanContext(boolean isSet) {
+        IntegrationAdder calculator = new IntegrationAdder();
+        DDSpanContext spanContext = mock(DDSpanContext.class);
+        when(spanContext.getIntegrationName()).thenReturn(isSet ? "test" : null);
 
-    TagMap unsafeTags = TagMap.fromMap(Collections.singletonMap("_dd.integration", "bad"));
-    calculator.processTags(unsafeTags, spanContext, link -> {});
+        TagMap unsafeTags = TagMap.fromMap(Collections.singletonMap("_dd.integration", "bad"));
+        calculator.processTags(unsafeTags, spanContext, link -> {});
 
-    verify(spanContext, times(1)).getIntegrationName();
+        verify(spanContext, times(1)).getIntegrationName();
 
-    if (isSet) {
-      assertEquals(Collections.singletonMap("_dd.integration", "test"), unsafeTags);
-    } else {
-      assertTrue(unsafeTags.isEmpty());
+        if (isSet) {
+            assertEquals(Collections.singletonMap("_dd.integration", "test"), unsafeTags);
+        } else {
+            assertTrue(unsafeTags.isEmpty());
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/InternalTagsAdderTest.java b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/InternalTagsAdderTest.java
index ea3798a4427..4d8d1d00eb8 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/InternalTagsAdderTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/InternalTagsAdderTest.java
@@ -18,53 +18,49 @@
 
 class InternalTagsAdderTest extends DDJavaSpecification {
 
-  @TableTest({
-    "scenario          | serviceName | expectsBaseService",
-    "different service | anotherOne  | true              ",
-    "exact match       | test        | false             ",
-    "case insensitive  | TeSt        | false             "
-  })
-  void shouldAddBaseServiceWhenServiceDiffersToDdService(
-      String serviceName, boolean expectsBaseService) {
-    InternalTagsAdder calculator = new InternalTagsAdder("test", null);
-    DDSpanContext spanContext = mock(DDSpanContext.class);
-    when(spanContext.getServiceName()).thenReturn(serviceName);
+    @TableTest({
+      "scenario          | serviceName | expectsBaseService",
+      "different service | anotherOne  | true              ",
+      "exact match       | test        | false             ",
+      "case insensitive  | TeSt        | false             "
+    })
+    void shouldAddBaseServiceWhenServiceDiffersToDdService(String serviceName, boolean expectsBaseService) {
+        InternalTagsAdder calculator = new InternalTagsAdder("test", null);
+        DDSpanContext spanContext = mock(DDSpanContext.class);
+        when(spanContext.getServiceName()).thenReturn(serviceName);
 
-    TagMap unsafeTags = TagMap.fromMap(Collections.emptyMap());
-    calculator.processTags(unsafeTags, spanContext, link -> {});
+        TagMap unsafeTags = TagMap.fromMap(Collections.emptyMap());
+        calculator.processTags(unsafeTags, spanContext, link -> {});
 
-    verify(spanContext, times(1)).getServiceName();
+        verify(spanContext, times(1)).getServiceName();
 
-    if (expectsBaseService) {
-      assertEquals(UTF8BytesString.create("test"), unsafeTags.get("_dd.base_service"));
-    } else {
-      assertTrue(unsafeTags.isEmpty());
+        if (expectsBaseService) {
+            assertEquals(UTF8BytesString.create("test"), unsafeTags.get("_dd.base_service"));
+        } else {
+            assertTrue(unsafeTags.isEmpty());
+        }
     }
-  }
 
-  @TableTest({
-    "scenario                          | serviceName | ddVersion | initialVersion | expected",
-    "same service, no version          | same        |           |                |         ",
-    "different service with ddVersion  | different   | 1.0       |                |         ",
-    "different service, manual version | different   | 1.0       | 2.0            | 2.0     ",
-    "same service, no ddVersion        | same        |           | 2.0            | 2.0     ",
-    "same service, both versions       | same        | 1.0       | 2.0            | 2.0     ",
-    "same service, only ddVersion      | same        | 1.0       |                | 1.0     "
-  })
-  void shouldAddVersionWhenDdServiceEqualsServiceNameAndVersionSet(
-      String serviceName, String ddVersion, String initialVersion, String expected) {
-    InternalTagsAdder calculator = new InternalTagsAdder("same", ddVersion);
-    DDSpanContext spanContext = mock(DDSpanContext.class);
-    when(spanContext.getServiceName()).thenReturn(serviceName);
+    @TableTest({
+      "scenario                          | serviceName | ddVersion | initialVersion | expected",
+      "same service, no version          | same        |           |                |         ",
+      "different service with ddVersion  | different   | 1.0       |                |         ",
+      "different service, manual version | different   | 1.0       | 2.0            | 2.0     ",
+      "same service, no ddVersion        | same        |           | 2.0            | 2.0     ",
+      "same service, both versions       | same        | 1.0       | 2.0            | 2.0     ",
+      "same service, only ddVersion      | same        | 1.0       |                | 1.0     "
+    })
+    void shouldAddVersionWhenDdServiceEqualsServiceNameAndVersionSet(
+            String serviceName, String ddVersion, String initialVersion, String expected) {
+        InternalTagsAdder calculator = new InternalTagsAdder("same", ddVersion);
+        DDSpanContext spanContext = mock(DDSpanContext.class);
+        when(spanContext.getServiceName()).thenReturn(serviceName);
 
-    TagMap unsafeTags =
-        TagMap.fromMap(
-            initialVersion != null
-                ? Collections.singletonMap("version", initialVersion)
-                : Collections.emptyMap());
-    calculator.processTags(unsafeTags, spanContext, link -> {});
+        TagMap unsafeTags = TagMap.fromMap(
+                initialVersion != null ? Collections.singletonMap("version", initialVersion) : Collections.emptyMap());
+        calculator.processTags(unsafeTags, spanContext, link -> {});
 
-    verify(spanContext, times(1)).getServiceName();
-    assertEquals(expected, Objects.toString(unsafeTags.get(VERSION), null));
-  }
+        verify(spanContext, times(1)).getServiceName();
+        assertEquals(expected, Objects.toString(unsafeTags.get(VERSION), null));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/PayloadTagsProcessorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/PayloadTagsProcessorTest.java
index 1405c6329ae..97aead8ebc4 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/PayloadTagsProcessorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/PayloadTagsProcessorTest.java
@@ -32,460 +32,437 @@
 
 class PayloadTagsProcessorTest extends DDJavaSpecification {
 
-  private static PathCursor pc() {
-    return new PathCursor(10);
-  }
-
-  private static PathAndValue pv(PathCursor path, Object value) {
-    return new PathAndValue(path.toPath(), value);
-  }
-
-  private static PayloadTagsData payloadData(PathAndValue... pvs) {
-    return new PayloadTagsData(pvs);
-  }
-
-  private static Map<String, Object> spanTags(String tagPrefix, PathAndValue... pvs) {
-    Map<String, Object> map = new LinkedHashMap<>();
-    map.put(tagPrefix, payloadData(pvs));
-    return map;
-  }
-
-  private static PayloadTagsProcessor tagsProcessor(
-      String tagPrefix, List<String> redactionRules, int maxDepth, int maxTags) {
-    PayloadTagsProcessor.RedactionRules rules =
-        new PayloadTagsProcessor.RedactionRules.Builder()
-            .addRedactionJsonPaths(redactionRules)
-            .build();
-    Map<String, PayloadTagsProcessor.RedactionRules> rulesMap = new HashMap<>();
-    rulesMap.put(tagPrefix, rules);
-    return new PayloadTagsProcessor(rulesMap, maxDepth, maxTags);
-  }
-
-  /** Builds a LinkedHashMap from alternating key-value pairs; supports null values. */
-  @SafeVarargs
-  private static <V> Map<String, V> mapOf(Object... pairs) {
-    Map<String, V> result = new LinkedHashMap<>();
-    for (int i = 0; i < pairs.length; i += 2) {
-      @SuppressWarnings("unchecked")
-      V val = (V) pairs[i + 1];
-      result.put((String) pairs[i], val);
+    private static PathCursor pc() {
+        return new PathCursor(10);
     }
-    return result;
-  }
-
-  @Test
-  void disabledByDefault() {
-    assertNull(PayloadTagsProcessor.create(Config.get()));
-  }
-
-  static Stream<Arguments> enabledWithDefaultsWhenConfiguredArguments() {
-    return Stream.of(
-        Arguments.arguments("all", "all", "aws.request.body", pc().push("phoneNumber")),
-        Arguments.arguments("all", "$[33].baz", "aws.request.body", pc().push("AWSAccountId")),
-        Arguments.arguments(
-            "$.bar",
-            "all",
-            "aws.response.body",
-            pc().push("Endpoints").push("foobar").push("Token")),
-        Arguments.arguments("$.foo.bar", "$..bar.*", "aws.request.body", pc().push("phoneNumber")),
-        Arguments.arguments(null, "all", "aws.response.body", pc().push("phoneNumbers").push(5)),
-        Arguments.arguments(
-            "all", null, "aws.request.body", pc().push("Attributes").push("KmsMasterKeyId")));
-  }
-
-  @ParameterizedTest(name = "enabled with defaults when configured req {0} resp {1}")
-  @MethodSource("enabledWithDefaultsWhenConfiguredArguments")
-  void enabledWithDefaultsWhenConfigured(
-      String requestPayloadTagging,
-      String responsePayloadTagging,
-      String tagPrefix,
-      PathCursor pathMatchingDefaultRules) {
-    if (requestPayloadTagging != null) {
-      WithConfigExtension.injectSysConfig(
-          "trace.cloud.request.payload.tagging", requestPayloadTagging);
+
+    private static PathAndValue pv(PathCursor path, Object value) {
+        return new PathAndValue(path.toPath(), value);
+    }
+
+    private static PayloadTagsData payloadData(PathAndValue... pvs) {
+        return new PayloadTagsData(pvs);
+    }
+
+    private static Map<String, Object> spanTags(String tagPrefix, PathAndValue... pvs) {
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put(tagPrefix, payloadData(pvs));
+        return map;
+    }
+
+    private static PayloadTagsProcessor tagsProcessor(
+            String tagPrefix, List<String> redactionRules, int maxDepth, int maxTags) {
+        PayloadTagsProcessor.RedactionRules rules = new PayloadTagsProcessor.RedactionRules.Builder()
+                .addRedactionJsonPaths(redactionRules)
+                .build();
+        Map<String, PayloadTagsProcessor.RedactionRules> rulesMap = new HashMap<>();
+        rulesMap.put(tagPrefix, rules);
+        return new PayloadTagsProcessor(rulesMap, maxDepth, maxTags);
     }
-    if (responsePayloadTagging != null) {
-      WithConfigExtension.injectSysConfig(
-          "trace.cloud.response.payload.tagging", responsePayloadTagging);
+
+    /** Builds a LinkedHashMap from alternating key-value pairs; supports null values. */
+    @SafeVarargs
+    private static <V> Map<String, V> mapOf(Object... pairs) {
+        Map<String, V> result = new LinkedHashMap<>();
+        for (int i = 0; i < pairs.length; i += 2) {
+            @SuppressWarnings("unchecked")
+            V val = (V) pairs[i + 1];
+            result.put((String) pairs[i], val);
+        }
+        return result;
+    }
+
+    @Test
+    void disabledByDefault() {
+        assertNull(PayloadTagsProcessor.create(Config.get()));
+    }
+
+    static Stream<Arguments> enabledWithDefaultsWhenConfiguredArguments() {
+        return Stream.of(
+                Arguments.arguments("all", "all", "aws.request.body", pc().push("phoneNumber")),
+                Arguments.arguments("all", "$[33].baz", "aws.request.body", pc().push("AWSAccountId")),
+                Arguments.arguments(
+                        "$.bar",
+                        "all",
+                        "aws.response.body",
+                        pc().push("Endpoints").push("foobar").push("Token")),
+                Arguments.arguments("$.foo.bar", "$..bar.*", "aws.request.body", pc().push("phoneNumber")),
+                Arguments.arguments(
+                        null,
+                        "all",
+                        "aws.response.body",
+                        pc().push("phoneNumbers").push(5)),
+                Arguments.arguments(
+                        "all", null, "aws.request.body", pc().push("Attributes").push("KmsMasterKeyId")));
+    }
+
+    @ParameterizedTest(name = "enabled with defaults when configured req {0} resp {1}")
+    @MethodSource("enabledWithDefaultsWhenConfiguredArguments")
+    void enabledWithDefaultsWhenConfigured(
+            String requestPayloadTagging,
+            String responsePayloadTagging,
+            String tagPrefix,
+            PathCursor pathMatchingDefaultRules) {
+        if (requestPayloadTagging != null) {
+            WithConfigExtension.injectSysConfig("trace.cloud.request.payload.tagging", requestPayloadTagging);
+        }
+        if (responsePayloadTagging != null) {
+            WithConfigExtension.injectSysConfig("trace.cloud.response.payload.tagging", responsePayloadTagging);
+        }
+
+        PayloadTagsProcessor ptp = PayloadTagsProcessor.create(Config.get());
+
+        assertNotNull(ptp);
+        assertEquals(10, ptp.maxDepth);
+        assertEquals(758, ptp.maxTags);
+        assertNotNull(ptp.redactionRulesByTagPrefix.get(tagPrefix).findMatching(pathMatchingDefaultRules));
+        assertNull(ptp.redactionRulesByTagPrefix.get(tagPrefix).findMatching(pc().push("non-matching-path")));
     }
 
-    PayloadTagsProcessor ptp = PayloadTagsProcessor.create(Config.get());
-
-    assertNotNull(ptp);
-    assertEquals(10, ptp.maxDepth);
-    assertEquals(758, ptp.maxTags);
-    assertNotNull(
-        ptp.redactionRulesByTagPrefix.get(tagPrefix).findMatching(pathMatchingDefaultRules));
-    assertNull(
-        ptp.redactionRulesByTagPrefix.get(tagPrefix).findMatching(pc().push("non-matching-path")));
-  }
-
-  @TableTest({
-    "scenario               | requestPayloadTagging | responsePayloadTagging | maxDepth | maxTags",
-    "both req and resp all  | all                   | all                    | 10       | 10     ",
-    "req filter, no resp    | $.bar                 |                        | 7        | 42     ",
-    "req all, resp wildcard | all                   | $.*                    | 12       | 50     ",
-    "no req, resp all       |                       | all                    | 8        | 33     "
-  })
-  void enabledWithCustomLimits(
-      String requestPayloadTagging, String responsePayloadTagging, int maxDepth, int maxTags) {
-    if (requestPayloadTagging != null) {
-      WithConfigExtension.injectSysConfig(
-          "trace.cloud.request.payload.tagging", requestPayloadTagging);
+    @TableTest({
+      "scenario               | requestPayloadTagging | responsePayloadTagging | maxDepth | maxTags",
+      "both req and resp all  | all                   | all                    | 10       | 10     ",
+      "req filter, no resp    | $.bar                 |                        | 7        | 42     ",
+      "req all, resp wildcard | all                   | $.*                    | 12       | 50     ",
+      "no req, resp all       |                       | all                    | 8        | 33     "
+    })
+    void enabledWithCustomLimits(
+            String requestPayloadTagging, String responsePayloadTagging, int maxDepth, int maxTags) {
+        if (requestPayloadTagging != null) {
+            WithConfigExtension.injectSysConfig("trace.cloud.request.payload.tagging", requestPayloadTagging);
+        }
+        if (responsePayloadTagging != null) {
+            WithConfigExtension.injectSysConfig("trace.cloud.response.payload.tagging", responsePayloadTagging);
+        }
+        WithConfigExtension.injectSysConfig("trace.cloud.payload.tagging.max-depth", String.valueOf(maxDepth));
+        WithConfigExtension.injectSysConfig("trace.cloud.payload.tagging.max-tags", String.valueOf(maxTags));
+
+        PayloadTagsProcessor ptp = PayloadTagsProcessor.create(Config.get());
+
+        assertEquals(maxDepth, ptp.maxDepth);
+        assertEquals(maxTags, ptp.maxTags);
     }
-    if (responsePayloadTagging != null) {
-      WithConfigExtension.injectSysConfig(
-          "trace.cloud.response.payload.tagging", responsePayloadTagging);
+
+    @Test
+    void preserveAllSpanTagsExceptForPayloadData() {
+        PayloadTagsProcessor ptp = tagsProcessor("payload", Collections.emptyList(), 10, 758);
+        Map<String, Object> spanTags = new LinkedHashMap<>();
+        spanTags.put("foo", "bar");
+        spanTags.put("tag1", 1);
+        spanTags.put("payload", new PayloadTagsData(new PathAndValue[0]));
+
+        TagMap unsafeTags = TagMap.fromMap(spanTags);
+        ptp.processTags(unsafeTags, null, link -> {});
+
+        assertEquals(mapOf("foo", "bar", "tag1", 1), unsafeTags);
+    }
+
+    @Test
+    void expandPayloadToTags() {
+        PayloadTagsProcessor ptp = tagsProcessor("payload", Collections.emptyList(), 10, 758);
+        Map<String, Object> spanTags = new LinkedHashMap<>();
+        spanTags.put("foo", "bar");
+        spanTags.put("tag1", 1);
+        spanTags.put("payload", payloadData(pv(pc().push("tag1"), 0)));
+
+        TagMap unsafeTags = TagMap.fromMap(spanTags);
+        ptp.processTags(unsafeTags, null, link -> {});
+
+        assertEquals(mapOf("foo", "bar", "tag1", 1, "payload.tag1", 0), unsafeTags);
+    }
+
+    @Test
+    void expandPreservingTagTypes() {
+        PayloadTagsProcessor ptp = tagsProcessor("payload", Collections.emptyList(), 10, 758);
+
+        Map<String, Object> st = spanTags(
+                "payload",
+                pv(pc().push("tag1"), 11),
+                pv(pc().push("tag2").push("Value"), 2342L),
+                pv(pc().push("tag3").push(0), 3.14d),
+                pv(pc().push("tag4").push("Value").push(0), "string"),
+                pv(pc().push("tag5"), null),
+                pv(pc().push("tag6"), false));
+
+        TagMap unsafeTags = TagMap.fromMap(st);
+        ptp.processTags(unsafeTags, null, link -> {});
+
+        Map<String, Object> expected = mapOf(
+                "payload.tag1",
+                11,
+                "payload.tag2.Value",
+                2342L,
+                "payload.tag3.0",
+                3.14d,
+                "payload.tag4.Value.0",
+                "string",
+                "payload.tag5",
+                null,
+                "payload.tag6",
+                false);
+        assertEquals(expected, unsafeTags);
+    }
+
+    @Test
+    void expandUnknownTagValuesToString() {
+        PayloadTagsProcessor ptp = tagsProcessor("payload", Collections.emptyList(), 10, 758);
+        Instant unknownValue = Instant.now();
+
+        Map<String, Object> st = spanTags("payload", pv(pc().push("tag7"), unknownValue));
+
+        TagMap unsafeTags = TagMap.fromMap(st);
+        ptp.processTags(unsafeTags, null, link -> {});
+
+        assertEquals(mapOf("payload.tag7", unknownValue.toString()), unsafeTags);
+    }
+
+    @Test
+    void expandStringifiedJsonTags() {
+        PayloadTagsProcessor ptp = tagsProcessor("p", Collections.emptyList(), 10, 758);
+
+        Map<String, Object> st = spanTags(
+                "p",
+                pv(pc().push("j1"), "{}"),
+                pv(pc().push("j2"), "[]"),
+                pv(pc().push("j3"), "['1', 2, 3.14, null, true]"),
+                pv(pc().push("j4"), "{'foo': 'bar', 'baz': 42}"));
+
+        TagMap unsafeTags = TagMap.fromMap(st);
+        ptp.processTags(unsafeTags, null, link -> {});
+
+        Map<String, Object> expected = mapOf(
+                "p.j3.0",
+                "1",
+                "p.j3.1",
+                2,
+                "p.j3.2",
+                3.14d,
+                "p.j3.3",
+                null,
+                "p.j3.4",
+                true,
+                "p.j4.foo",
+                "bar",
+                "p.j4.baz",
+                42);
+        assertEquals(expected, unsafeTags);
+    }
+
+    @Test
+    void expandSerializedEscapedInnerJsonWithinInnerJson() throws IOException {
+        Buffer b0 = new Buffer();
+        JsonWriter.of(b0)
+                .beginObject()
+                .name("a")
+                .value(1.15)
+                .name("password")
+                .value("my-secret-password")
+                .endObject()
+                .close();
+
+        Buffer b1 = new Buffer();
+        JsonWriter.of(b1)
+                .beginObject()
+                .name("id")
+                .value(45)
+                .name("user")
+                .value(b0.readUtf8())
+                .endObject()
+                .close();
+
+        Buffer b2 = new Buffer();
+        JsonWriter.of(b2)
+                .beginObject()
+                .name("a")
+                .value(33)
+                .name("Message")
+                .value(b1.readUtf8())
+                .name("b")
+                .value(true)
+                .endObject()
+                .close();
+
+        String json = b2.readUtf8();
+
+        PayloadTagsProcessor ptp = tagsProcessor("dd", Collections.emptyList(), 10, 758);
+        Map<String, Object> st = spanTags("dd", pv(pc(), json));
+
+        TagMap unsafeTags = TagMap.fromMap(st);
+        ptp.processTags(unsafeTags, null, link -> {});
+
+        assertEquals(
+                mapOf(
+                        "dd.a",
+                        33,
+                        "dd.Message.id",
+                        45,
+                        "dd.Message.user.a",
+                        1.15d,
+                        "dd.Message.user.password",
+                        "my-secret-password",
+                        "dd.b",
+                        true),
+                unsafeTags);
+    }
+
+    @ValueSource(strings = {"{'foo: 'bar'", "[1, 2", "[1, 2] ", " [1, 2]", "{'foo: 'bar'} ", " {'foo: 'bar'}"})
+    @ParameterizedTest
+    void keepFailedToParseJsonAsIs(String invalidJson) {
+        PayloadTagsProcessor ptp = tagsProcessor("p", Collections.emptyList(), 10, 758);
+        Map<String, Object> st = spanTags("p", pv(pc().push("key"), invalidJson));
+
+        TagMap unsafeTags = TagMap.fromMap(st);
+        ptp.processTags(unsafeTags, null, link -> {});
+
+        assertEquals(mapOf("p.key", invalidJson), unsafeTags);
+    }
+
+    @Test
+    void expandBinaryIfJson() {
+        PayloadTagsProcessor ptp = tagsProcessor("p", Collections.emptyList(), 10, 758);
+
+        Map<String, Object> st = spanTags(
+                "p",
+                pv(pc().push("j0"), new ByteArrayInputStream("{}".getBytes())),
+                pv(pc().push("j1"), new ByteArrayInputStream("{'foo': 'bar'}".getBytes())),
+                pv(pc().push("j2"), new ByteArrayInputStream("[1, true]".getBytes())));
+
+        TagMap unsafeTags = TagMap.fromMap(st);
+        ptp.processTags(unsafeTags, null, link -> {});
+
+        assertEquals(mapOf("p.j1.foo", "bar", "p.j2.0", 1, "p.j2.1", true), unsafeTags);
+    }
+
+    @ParameterizedTest
+    @ValueSource(
+            strings = {
+                // standard JSON
+                "{ \"a\": 1.15, \"password\": \"my-secret-password\" }",
+                // JSON wrapped in double quotes (string-quoted)
+                "\"{ 'a': 1.15, 'password': 'my-secret-password' }\"",
+                // JSON with escaped quotes, wrapped in double quotes
+                "\"{ \\\"a\\\": 1.15, \\\"password\\\": \\\"my-secret-password\\\" }\"",
+                // JSON wrapped in single quotes
+                "'{ \"a\": 1.15, \"password\": \"my-secret-password\" }'",
+                // same as case 3, alternate source representation
+                "\"{ \\\"a\\\": 1.15, \\\"password\\\": \\\"my-secret-password\\\" }\""
+            })
+    void expandBinaryEscapedJsonTags(String innerJson) {
+        PayloadTagsProcessor ptp = tagsProcessor("p", Collections.emptyList(), 10, 758);
+        Map<String, Object> st = spanTags(
+                "p", pv(pc().push("v"), new ByteArrayInputStream(("{ \"inner\": " + innerJson + "}").getBytes())));
+
+        TagMap unsafeTags = TagMap.fromMap(st);
+        ptp.processTags(unsafeTags, null, link -> {});
+
+        assertEquals(mapOf("p.v.inner.a", 1.15d, "p.v.inner.password", "my-secret-password"), unsafeTags);
+    }
+
+    @ValueSource(strings = {" [1]", " {'foo': 'bar'}", "invalid:"})
+    @ParameterizedTest
+    void useBinaryValueIfNotJsonOrCouldntBeParsed(String invalidJson) {
+        PayloadTagsProcessor ptp = tagsProcessor("p", Collections.emptyList(), 10, 758);
+        Map<String, Object> st = spanTags("p", pv(pc().push("key"), new ByteArrayInputStream(invalidJson.getBytes())));
+
+        TagMap unsafeTags = TagMap.fromMap(st);
+        ptp.processTags(unsafeTags, null, link -> {});
+
+        assertEquals(mapOf("p.key", "<binary>"), unsafeTags);
+    }
+
+    @Test
+    void applyRedactionRules() {
+        PayloadTagsProcessor ptp = tagsProcessor("p", Arrays.asList("$.j3[0]", "$.j4.baz"), 10, 758);
+
+        Map<String, Object> st = spanTags(
+                "p",
+                pv(pc().push("j1"), "{}"),
+                pv(pc().push("j2"), "[]"),
+                pv(pc().push("j3"), "['1', 2, 3.14, null, true]"),
+                pv(pc().push("j4"), "{'foo': 'bar', 'baz': 42}"));
+
+        TagMap unsafeTags = TagMap.fromMap(st);
+        ptp.processTags(unsafeTags, null, link -> {});
+
+        Map<String, Object> expected = mapOf(
+                "p.j3.0",
+                "redacted",
+                "p.j3.1",
+                2,
+                "p.j3.2",
+                3.14d,
+                "p.j3.3",
+                null,
+                "p.j3.4",
+                true,
+                "p.j4.foo",
+                "bar",
+                "p.j4.baz",
+                "redacted");
+        assertEquals(expected, unsafeTags);
+    }
+
+    @Test
+    void respectMaxTagsLimit() {
+        PayloadTagsProcessor ptp = tagsProcessor("p", Arrays.asList("$.j3[0]", "$.j4.baz"), 10, 4);
+
+        Map<String, Object> st = spanTags(
+                "p",
+                pv(pc().push("j1"), "{}"),
+                pv(pc().push("j2"), "[]"),
+                pv(pc().push("j3"), "['1', 2, 3.14, null, true]"),
+                pv(pc().push("j4"), "{'foo': 'bar', 'baz': 42}"));
+
+        TagMap unsafeTags = TagMap.fromMap(st);
+        ptp.processTags(unsafeTags, null, link -> {});
+
+        assertEquals(
+                mapOf(
+                        "p.j3.0",
+                        "redacted",
+                        "p.j3.1",
+                        2,
+                        "p.j3.2",
+                        3.14d,
+                        "p.j3.3",
+                        null,
+                        "_dd.payload_tags_incomplete",
+                        true),
+                unsafeTags);
+    }
+
+    @Test
+    void respectMaxDepthLimit() {
+        PayloadTagsProcessor ptp = tagsProcessor("p", Arrays.asList("$.j3[0]", "$.j4.baz"), 3, 800);
+
+        Map<String, Object> st = spanTags(
+                "p",
+                pv(pc().push("j3"), "['1', 2, 3.14, null, true, [ 1, [ 2, 3 ] ]]"),
+                pv(pc().push("j4"), "{'foo': 'bar', 'baz': 42, 'nested': { 'a': 1, 'b': { 'c': 2 } } }"));
+
+        TagMap unsafeTags = TagMap.fromMap(st);
+        ptp.processTags(unsafeTags, null, link -> {});
+
+        assertEquals(
+                mapOf(
+                        "p.j3.0",
+                        "redacted",
+                        "p.j3.1",
+                        2,
+                        "p.j3.2",
+                        3.14d,
+                        "p.j3.3",
+                        null,
+                        "p.j3.4",
+                        true,
+                        "p.j3.5.0",
+                        1,
+                        "p.j4.foo",
+                        "bar",
+                        "p.j4.baz",
+                        "redacted",
+                        "p.j4.nested.a",
+                        1),
+                unsafeTags);
     }
-    WithConfigExtension.injectSysConfig(
-        "trace.cloud.payload.tagging.max-depth", String.valueOf(maxDepth));
-    WithConfigExtension.injectSysConfig(
-        "trace.cloud.payload.tagging.max-tags", String.valueOf(maxTags));
-
-    PayloadTagsProcessor ptp = PayloadTagsProcessor.create(Config.get());
-
-    assertEquals(maxDepth, ptp.maxDepth);
-    assertEquals(maxTags, ptp.maxTags);
-  }
-
-  @Test
-  void preserveAllSpanTagsExceptForPayloadData() {
-    PayloadTagsProcessor ptp = tagsProcessor("payload", Collections.emptyList(), 10, 758);
-    Map<String, Object> spanTags = new LinkedHashMap<>();
-    spanTags.put("foo", "bar");
-    spanTags.put("tag1", 1);
-    spanTags.put("payload", new PayloadTagsData(new PathAndValue[0]));
-
-    TagMap unsafeTags = TagMap.fromMap(spanTags);
-    ptp.processTags(unsafeTags, null, link -> {});
-
-    assertEquals(mapOf("foo", "bar", "tag1", 1), unsafeTags);
-  }
-
-  @Test
-  void expandPayloadToTags() {
-    PayloadTagsProcessor ptp = tagsProcessor("payload", Collections.emptyList(), 10, 758);
-    Map<String, Object> spanTags = new LinkedHashMap<>();
-    spanTags.put("foo", "bar");
-    spanTags.put("tag1", 1);
-    spanTags.put("payload", payloadData(pv(pc().push("tag1"), 0)));
-
-    TagMap unsafeTags = TagMap.fromMap(spanTags);
-    ptp.processTags(unsafeTags, null, link -> {});
-
-    assertEquals(mapOf("foo", "bar", "tag1", 1, "payload.tag1", 0), unsafeTags);
-  }
-
-  @Test
-  void expandPreservingTagTypes() {
-    PayloadTagsProcessor ptp = tagsProcessor("payload", Collections.emptyList(), 10, 758);
-
-    Map<String, Object> st =
-        spanTags(
-            "payload",
-            pv(pc().push("tag1"), 11),
-            pv(pc().push("tag2").push("Value"), 2342L),
-            pv(pc().push("tag3").push(0), 3.14d),
-            pv(pc().push("tag4").push("Value").push(0), "string"),
-            pv(pc().push("tag5"), null),
-            pv(pc().push("tag6"), false));
-
-    TagMap unsafeTags = TagMap.fromMap(st);
-    ptp.processTags(unsafeTags, null, link -> {});
-
-    Map<String, Object> expected =
-        mapOf(
-            "payload.tag1",
-            11,
-            "payload.tag2.Value",
-            2342L,
-            "payload.tag3.0",
-            3.14d,
-            "payload.tag4.Value.0",
-            "string",
-            "payload.tag5",
-            null,
-            "payload.tag6",
-            false);
-    assertEquals(expected, unsafeTags);
-  }
-
-  @Test
-  void expandUnknownTagValuesToString() {
-    PayloadTagsProcessor ptp = tagsProcessor("payload", Collections.emptyList(), 10, 758);
-    Instant unknownValue = Instant.now();
-
-    Map<String, Object> st = spanTags("payload", pv(pc().push("tag7"), unknownValue));
-
-    TagMap unsafeTags = TagMap.fromMap(st);
-    ptp.processTags(unsafeTags, null, link -> {});
-
-    assertEquals(mapOf("payload.tag7", unknownValue.toString()), unsafeTags);
-  }
-
-  @Test
-  void expandStringifiedJsonTags() {
-    PayloadTagsProcessor ptp = tagsProcessor("p", Collections.emptyList(), 10, 758);
-
-    Map<String, Object> st =
-        spanTags(
-            "p",
-            pv(pc().push("j1"), "{}"),
-            pv(pc().push("j2"), "[]"),
-            pv(pc().push("j3"), "['1', 2, 3.14, null, true]"),
-            pv(pc().push("j4"), "{'foo': 'bar', 'baz': 42}"));
-
-    TagMap unsafeTags = TagMap.fromMap(st);
-    ptp.processTags(unsafeTags, null, link -> {});
-
-    Map<String, Object> expected =
-        mapOf(
-            "p.j3.0",
-            "1",
-            "p.j3.1",
-            2,
-            "p.j3.2",
-            3.14d,
-            "p.j3.3",
-            null,
-            "p.j3.4",
-            true,
-            "p.j4.foo",
-            "bar",
-            "p.j4.baz",
-            42);
-    assertEquals(expected, unsafeTags);
-  }
-
-  @Test
-  void expandSerializedEscapedInnerJsonWithinInnerJson() throws IOException {
-    Buffer b0 = new Buffer();
-    JsonWriter.of(b0)
-        .beginObject()
-        .name("a")
-        .value(1.15)
-        .name("password")
-        .value("my-secret-password")
-        .endObject()
-        .close();
-
-    Buffer b1 = new Buffer();
-    JsonWriter.of(b1)
-        .beginObject()
-        .name("id")
-        .value(45)
-        .name("user")
-        .value(b0.readUtf8())
-        .endObject()
-        .close();
-
-    Buffer b2 = new Buffer();
-    JsonWriter.of(b2)
-        .beginObject()
-        .name("a")
-        .value(33)
-        .name("Message")
-        .value(b1.readUtf8())
-        .name("b")
-        .value(true)
-        .endObject()
-        .close();
-
-    String json = b2.readUtf8();
-
-    PayloadTagsProcessor ptp = tagsProcessor("dd", Collections.emptyList(), 10, 758);
-    Map<String, Object> st = spanTags("dd", pv(pc(), json));
-
-    TagMap unsafeTags = TagMap.fromMap(st);
-    ptp.processTags(unsafeTags, null, link -> {});
-
-    assertEquals(
-        mapOf(
-            "dd.a",
-            33,
-            "dd.Message.id",
-            45,
-            "dd.Message.user.a",
-            1.15d,
-            "dd.Message.user.password",
-            "my-secret-password",
-            "dd.b",
-            true),
-        unsafeTags);
-  }
-
-  @ValueSource(
-      strings = {"{'foo: 'bar'", "[1, 2", "[1, 2] ", " [1, 2]", "{'foo: 'bar'} ", " {'foo: 'bar'}"})
-  @ParameterizedTest
-  void keepFailedToParseJsonAsIs(String invalidJson) {
-    PayloadTagsProcessor ptp = tagsProcessor("p", Collections.emptyList(), 10, 758);
-    Map<String, Object> st = spanTags("p", pv(pc().push("key"), invalidJson));
-
-    TagMap unsafeTags = TagMap.fromMap(st);
-    ptp.processTags(unsafeTags, null, link -> {});
-
-    assertEquals(mapOf("p.key", invalidJson), unsafeTags);
-  }
-
-  @Test
-  void expandBinaryIfJson() {
-    PayloadTagsProcessor ptp = tagsProcessor("p", Collections.emptyList(), 10, 758);
-
-    Map<String, Object> st =
-        spanTags(
-            "p",
-            pv(pc().push("j0"), new ByteArrayInputStream("{}".getBytes())),
-            pv(pc().push("j1"), new ByteArrayInputStream("{'foo': 'bar'}".getBytes())),
-            pv(pc().push("j2"), new ByteArrayInputStream("[1, true]".getBytes())));
-
-    TagMap unsafeTags = TagMap.fromMap(st);
-    ptp.processTags(unsafeTags, null, link -> {});
-
-    assertEquals(mapOf("p.j1.foo", "bar", "p.j2.0", 1, "p.j2.1", true), unsafeTags);
-  }
-
-  @ParameterizedTest
-  @ValueSource(
-      strings = {
-        // standard JSON
-        "{ \"a\": 1.15, \"password\": \"my-secret-password\" }",
-        // JSON wrapped in double quotes (string-quoted)
-        "\"{ 'a': 1.15, 'password': 'my-secret-password' }\"",
-        // JSON with escaped quotes, wrapped in double quotes
-        "\"{ \\\"a\\\": 1.15, \\\"password\\\": \\\"my-secret-password\\\" }\"",
-        // JSON wrapped in single quotes
-        "'{ \"a\": 1.15, \"password\": \"my-secret-password\" }'",
-        // same as case 3, alternate source representation
-        "\"{ \\\"a\\\": 1.15, \\\"password\\\": \\\"my-secret-password\\\" }\""
-      })
-  void expandBinaryEscapedJsonTags(String innerJson) {
-    PayloadTagsProcessor ptp = tagsProcessor("p", Collections.emptyList(), 10, 758);
-    Map<String, Object> st =
-        spanTags(
-            "p",
-            pv(
-                pc().push("v"),
-                new ByteArrayInputStream(("{ \"inner\": " + innerJson + "}").getBytes())));
-
-    TagMap unsafeTags = TagMap.fromMap(st);
-    ptp.processTags(unsafeTags, null, link -> {});
-
-    assertEquals(
-        mapOf("p.v.inner.a", 1.15d, "p.v.inner.password", "my-secret-password"), unsafeTags);
-  }
-
-  @ValueSource(strings = {" [1]", " {'foo': 'bar'}", "invalid:"})
-  @ParameterizedTest
-  void useBinaryValueIfNotJsonOrCouldntBeParsed(String invalidJson) {
-    PayloadTagsProcessor ptp = tagsProcessor("p", Collections.emptyList(), 10, 758);
-    Map<String, Object> st =
-        spanTags("p", pv(pc().push("key"), new ByteArrayInputStream(invalidJson.getBytes())));
-
-    TagMap unsafeTags = TagMap.fromMap(st);
-    ptp.processTags(unsafeTags, null, link -> {});
-
-    assertEquals(mapOf("p.key", "<binary>"), unsafeTags);
-  }
-
-  @Test
-  void applyRedactionRules() {
-    PayloadTagsProcessor ptp = tagsProcessor("p", Arrays.asList("$.j3[0]", "$.j4.baz"), 10, 758);
-
-    Map<String, Object> st =
-        spanTags(
-            "p",
-            pv(pc().push("j1"), "{}"),
-            pv(pc().push("j2"), "[]"),
-            pv(pc().push("j3"), "['1', 2, 3.14, null, true]"),
-            pv(pc().push("j4"), "{'foo': 'bar', 'baz': 42}"));
-
-    TagMap unsafeTags = TagMap.fromMap(st);
-    ptp.processTags(unsafeTags, null, link -> {});
-
-    Map<String, Object> expected =
-        mapOf(
-            "p.j3.0",
-            "redacted",
-            "p.j3.1",
-            2,
-            "p.j3.2",
-            3.14d,
-            "p.j3.3",
-            null,
-            "p.j3.4",
-            true,
-            "p.j4.foo",
-            "bar",
-            "p.j4.baz",
-            "redacted");
-    assertEquals(expected, unsafeTags);
-  }
-
-  @Test
-  void respectMaxTagsLimit() {
-    PayloadTagsProcessor ptp = tagsProcessor("p", Arrays.asList("$.j3[0]", "$.j4.baz"), 10, 4);
-
-    Map<String, Object> st =
-        spanTags(
-            "p",
-            pv(pc().push("j1"), "{}"),
-            pv(pc().push("j2"), "[]"),
-            pv(pc().push("j3"), "['1', 2, 3.14, null, true]"),
-            pv(pc().push("j4"), "{'foo': 'bar', 'baz': 42}"));
-
-    TagMap unsafeTags = TagMap.fromMap(st);
-    ptp.processTags(unsafeTags, null, link -> {});
-
-    assertEquals(
-        mapOf(
-            "p.j3.0",
-            "redacted",
-            "p.j3.1",
-            2,
-            "p.j3.2",
-            3.14d,
-            "p.j3.3",
-            null,
-            "_dd.payload_tags_incomplete",
-            true),
-        unsafeTags);
-  }
-
-  @Test
-  void respectMaxDepthLimit() {
-    PayloadTagsProcessor ptp = tagsProcessor("p", Arrays.asList("$.j3[0]", "$.j4.baz"), 3, 800);
-
-    Map<String, Object> st =
-        spanTags(
-            "p",
-            pv(pc().push("j3"), "['1', 2, 3.14, null, true, [ 1, [ 2, 3 ] ]]"),
-            pv(
-                pc().push("j4"),
-                "{'foo': 'bar', 'baz': 42, 'nested': { 'a': 1, 'b': { 'c': 2 } } }"));
-
-    TagMap unsafeTags = TagMap.fromMap(st);
-    ptp.processTags(unsafeTags, null, link -> {});
-
-    assertEquals(
-        mapOf(
-            "p.j3.0",
-            "redacted",
-            "p.j3.1",
-            2,
-            "p.j3.2",
-            3.14d,
-            "p.j3.3",
-            null,
-            "p.j3.4",
-            true,
-            "p.j3.5.0",
-            1,
-            "p.j4.foo",
-            "bar",
-            "p.j4.baz",
-            "redacted",
-            "p.j4.nested.a",
-            1),
-        unsafeTags);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/PeerServiceCalculatorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/PeerServiceCalculatorTest.java
index d9707fc0caf..76b192487e6 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/PeerServiceCalculatorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/PeerServiceCalculatorTest.java
@@ -18,129 +18,123 @@
 
 class PeerServiceCalculatorTest extends DDJavaSpecification {
 
-  private static LinkedHashMap<String, Object> linkedMap(Object... pairs) {
-    LinkedHashMap<String, Object> map = new LinkedHashMap<>();
-    for (int i = 0; i < pairs.length; i += 2) {
-      map.put((String) pairs[i], pairs[i + 1]);
+    private static LinkedHashMap<String, Object> linkedMap(Object... pairs) {
+        LinkedHashMap<String, Object> map = new LinkedHashMap<>();
+        for (int i = 0; i < pairs.length; i += 2) {
+            map.put((String) pairs[i], pairs[i + 1]);
+        }
+        return map;
+    }
+
+    @TableTest({
+      "scenario                    | tags                                                ",
+      "empty                       | [:]                                                 ",
+      "hostname only               | ['peer.hostname': 'test']                           ",
+      "hostname and db instance    | ['peer.hostname': 'test', 'db.instance': 'instance']",
+      "db instance before hostname | ['db.instance': 'instance', 'peer.hostname': 'test']",
+      "hostname and rpc service    | ['peer.hostname': 'test', 'rpc.service': 'svc']     ",
+      "rpc service before hostname | ['rpc.service': 'svc', 'peer.hostname': 'test']     "
+    })
+    void schemaV0PeerServiceIsNotCalculatedByDefault(Map<String, Object> tags) {
+        PeerServiceCalculator calculator =
+                new PeerServiceCalculator(new NamingSchemaV0().peerService(), Collections.emptyMap());
+
+        TagMap unsafeTags = TagMap.fromMap(tags);
+        calculator.processTags(unsafeTags, null, link -> {});
+
+        // tags are not modified
+        assertEquals(tags, unsafeTags);
+    }
+
+    @TableTest({
+      "scenario                              | tags                                                                        | provenance    | peerService",
+      "empty                                 | [:]                                                                         |               |            ",
+      "hostname only (1)                     | ['peer.hostname': 'test']                                                   | peer.hostname | test       ",
+      "hostname only (2)                     | ['peer.hostname': 'test']                                                   | peer.hostname | test       ",
+      "hostname and db instance              | ['peer.hostname': 'test', 'db.instance': 'instance']                        | db.instance   | instance   ",
+      "db instance before hostname           | ['db.instance': 'instance', 'peer.hostname': 'test']                        | db.instance   | instance   ",
+      "hostname, rpc service, grpc component | ['peer.hostname': 'test', 'rpc.service': 'svc', 'component': 'grpc-client'] | rpc.service   | svc        ",
+      "rpc service before hostname           | ['rpc.service': 'svc', 'peer.hostname': 'test', 'component': 'grpc-client'] | rpc.service   | svc        ",
+      "hostname and peer service             | ['peer.hostname': 'test', 'peer.service': 'userService']                    |               | userService"
+    })
+    void schemaV1TestPeerServiceDefaultLogicAndPrecursors(
+            Map<String, Object> tags, String provenance, String peerService) {
+        PeerServiceCalculator calculator =
+                new PeerServiceCalculator(new NamingSchemaV1().peerService(), Collections.emptyMap());
+
+        Map<String, Object> tagsWithSpanKind = new LinkedHashMap<>(tags);
+        tagsWithSpanKind.put(Tags.SPAN_KIND, Tags.SPAN_KIND_CLIENT);
+
+        TagMap unsafeTags = TagMap.fromMap(tagsWithSpanKind);
+        calculator.processTags(unsafeTags, null, link -> {});
+
+        assertEquals(provenance, unsafeTags.get(DDTags.PEER_SERVICE_SOURCE));
+        assertEquals(peerService, unsafeTags.get(Tags.PEER_SERVICE));
+    }
+
+    @WithConfig(key = "trace.peer.service.defaults.enabled", value = "true")
+    @Test
+    void schemaV0ShouldCalculateDefaultsIfEnabled() {
+        PeerServiceCalculator calculator =
+                new PeerServiceCalculator(new NamingSchemaV0().peerService(), Collections.emptyMap());
+
+        TagMap unsafeTags = TagMap.fromMap(linkedMap("span.kind", "client", "peer.hostname", "test"));
+        calculator.processTags(unsafeTags, null, link -> {});
+
+        assertEquals("test", unsafeTags.get(Tags.PEER_SERVICE));
+    }
+
+    @TableTest({
+      "scenario | kind     | calculate",
+      "client   | client   | true     ",
+      "producer | producer | true     ",
+      "server   | server   | false    "
+    })
+    void calculateOnlyForSpanKindClientOrProducer(String kind, boolean calculate) {
+        PeerServiceCalculator calculator =
+                new PeerServiceCalculator(new NamingSchemaV1().peerService(), Collections.emptyMap());
+
+        Map<String, Object> tags = linkedMap("span.kind", kind, "peer.hostname", "test");
+        TagMap unsafeTags = TagMap.fromMap(tags);
+        calculator.processTags(unsafeTags, null, link -> {});
+
+        assertEquals(calculate, unsafeTags.containsKey(Tags.PEER_SERVICE));
+    }
+
+    @WithConfig(key = "trace.peer.service.mapping", value = "service1:best_service,userService:my_service")
+    @WithConfig(key = "trace.peer.service.defaults.enabled", value = "true")
+    @TableTest({
+      "scenario                         | tags                                                   | expected     | original   ",
+      "peer service remapped            | ['peer.service': 'userService']                        | my_service   | userService",
+      "hostname client, no remap        | ['peer.hostname': 'test', 'span.kind': 'client']       | test         |            ",
+      "hostname producer, remap service | ['peer.hostname': 'service1', 'span.kind': 'producer'] | best_service | service1   "
+    })
+    void shouldApplyPeerServiceMappingsIfConfigured(Map<String, Object> tags, String expected, String original) {
+        PeerServiceCalculator calculator = new PeerServiceCalculator(
+                new NamingSchemaV0().peerService(), Config.get().getPeerServiceMapping());
+
+        TagMap unsafeTags = TagMap.fromMap(tags);
+        calculator.processTags(unsafeTags, null, link -> {});
+
+        assertEquals(expected, unsafeTags.get(Tags.PEER_SERVICE));
+        assertEquals(original, unsafeTags.get(DDTags.PEER_SERVICE_REMAPPED_FROM));
+    }
+
+    @WithConfig(key = "trace.peer.service.component.overrides", value = "java-couchbase:couchbase")
+    @WithConfig(key = "trace.peer.service.defaults.enabled", value = "true")
+    @TableTest({
+      "scenario                    | tags                                                                             | expected  | source             ",
+      "component override applies  | ['component': 'java-couchbase', 'span.kind': 'client']                           | couchbase | _component_override",
+      "hostname wins over override | ['peer.hostname': 'host1', 'span.kind': 'client', 'component': 'my-http-client'] | host1     | peer.hostname      "
+    })
+    void shouldOverridePeerServiceValuesIfConfigured(Map<String, Object> tags, String expected, String source) {
+        PeerServiceCalculator calculator = new PeerServiceCalculator(
+                new NamingSchemaV0().peerService(), Config.get().getPeerServiceComponentOverrides());
+
+        TagMap unsafeTags = TagMap.fromMap(tags);
+        calculator.processTags(unsafeTags, null, link -> {});
+
+        assertEquals(expected, unsafeTags.get(Tags.PEER_SERVICE));
+        assertEquals(source, unsafeTags.get(DDTags.PEER_SERVICE_SOURCE));
     }
-    return map;
-  }
-
-  @TableTest({
-    "scenario                    | tags                                                ",
-    "empty                       | [:]                                                 ",
-    "hostname only               | ['peer.hostname': 'test']                           ",
-    "hostname and db instance    | ['peer.hostname': 'test', 'db.instance': 'instance']",
-    "db instance before hostname | ['db.instance': 'instance', 'peer.hostname': 'test']",
-    "hostname and rpc service    | ['peer.hostname': 'test', 'rpc.service': 'svc']     ",
-    "rpc service before hostname | ['rpc.service': 'svc', 'peer.hostname': 'test']     "
-  })
-  void schemaV0PeerServiceIsNotCalculatedByDefault(Map<String, Object> tags) {
-    PeerServiceCalculator calculator =
-        new PeerServiceCalculator(new NamingSchemaV0().peerService(), Collections.emptyMap());
-
-    TagMap unsafeTags = TagMap.fromMap(tags);
-    calculator.processTags(unsafeTags, null, link -> {});
-
-    // tags are not modified
-    assertEquals(tags, unsafeTags);
-  }
-
-  @TableTest({
-    "scenario                              | tags                                                                        | provenance    | peerService",
-    "empty                                 | [:]                                                                         |               |            ",
-    "hostname only (1)                     | ['peer.hostname': 'test']                                                   | peer.hostname | test       ",
-    "hostname only (2)                     | ['peer.hostname': 'test']                                                   | peer.hostname | test       ",
-    "hostname and db instance              | ['peer.hostname': 'test', 'db.instance': 'instance']                        | db.instance   | instance   ",
-    "db instance before hostname           | ['db.instance': 'instance', 'peer.hostname': 'test']                        | db.instance   | instance   ",
-    "hostname, rpc service, grpc component | ['peer.hostname': 'test', 'rpc.service': 'svc', 'component': 'grpc-client'] | rpc.service   | svc        ",
-    "rpc service before hostname           | ['rpc.service': 'svc', 'peer.hostname': 'test', 'component': 'grpc-client'] | rpc.service   | svc        ",
-    "hostname and peer service             | ['peer.hostname': 'test', 'peer.service': 'userService']                    |               | userService"
-  })
-  void schemaV1TestPeerServiceDefaultLogicAndPrecursors(
-      Map<String, Object> tags, String provenance, String peerService) {
-    PeerServiceCalculator calculator =
-        new PeerServiceCalculator(new NamingSchemaV1().peerService(), Collections.emptyMap());
-
-    Map<String, Object> tagsWithSpanKind = new LinkedHashMap<>(tags);
-    tagsWithSpanKind.put(Tags.SPAN_KIND, Tags.SPAN_KIND_CLIENT);
-
-    TagMap unsafeTags = TagMap.fromMap(tagsWithSpanKind);
-    calculator.processTags(unsafeTags, null, link -> {});
-
-    assertEquals(provenance, unsafeTags.get(DDTags.PEER_SERVICE_SOURCE));
-    assertEquals(peerService, unsafeTags.get(Tags.PEER_SERVICE));
-  }
-
-  @WithConfig(key = "trace.peer.service.defaults.enabled", value = "true")
-  @Test
-  void schemaV0ShouldCalculateDefaultsIfEnabled() {
-    PeerServiceCalculator calculator =
-        new PeerServiceCalculator(new NamingSchemaV0().peerService(), Collections.emptyMap());
-
-    TagMap unsafeTags = TagMap.fromMap(linkedMap("span.kind", "client", "peer.hostname", "test"));
-    calculator.processTags(unsafeTags, null, link -> {});
-
-    assertEquals("test", unsafeTags.get(Tags.PEER_SERVICE));
-  }
-
-  @TableTest({
-    "scenario | kind     | calculate",
-    "client   | client   | true     ",
-    "producer | producer | true     ",
-    "server   | server   | false    "
-  })
-  void calculateOnlyForSpanKindClientOrProducer(String kind, boolean calculate) {
-    PeerServiceCalculator calculator =
-        new PeerServiceCalculator(new NamingSchemaV1().peerService(), Collections.emptyMap());
-
-    Map<String, Object> tags = linkedMap("span.kind", kind, "peer.hostname", "test");
-    TagMap unsafeTags = TagMap.fromMap(tags);
-    calculator.processTags(unsafeTags, null, link -> {});
-
-    assertEquals(calculate, unsafeTags.containsKey(Tags.PEER_SERVICE));
-  }
-
-  @WithConfig(
-      key = "trace.peer.service.mapping",
-      value = "service1:best_service,userService:my_service")
-  @WithConfig(key = "trace.peer.service.defaults.enabled", value = "true")
-  @TableTest({
-    "scenario                         | tags                                                   | expected     | original   ",
-    "peer service remapped            | ['peer.service': 'userService']                        | my_service   | userService",
-    "hostname client, no remap        | ['peer.hostname': 'test', 'span.kind': 'client']       | test         |            ",
-    "hostname producer, remap service | ['peer.hostname': 'service1', 'span.kind': 'producer'] | best_service | service1   "
-  })
-  void shouldApplyPeerServiceMappingsIfConfigured(
-      Map<String, Object> tags, String expected, String original) {
-    PeerServiceCalculator calculator =
-        new PeerServiceCalculator(
-            new NamingSchemaV0().peerService(), Config.get().getPeerServiceMapping());
-
-    TagMap unsafeTags = TagMap.fromMap(tags);
-    calculator.processTags(unsafeTags, null, link -> {});
-
-    assertEquals(expected, unsafeTags.get(Tags.PEER_SERVICE));
-    assertEquals(original, unsafeTags.get(DDTags.PEER_SERVICE_REMAPPED_FROM));
-  }
-
-  @WithConfig(key = "trace.peer.service.component.overrides", value = "java-couchbase:couchbase")
-  @WithConfig(key = "trace.peer.service.defaults.enabled", value = "true")
-  @TableTest({
-    "scenario                    | tags                                                                             | expected  | source             ",
-    "component override applies  | ['component': 'java-couchbase', 'span.kind': 'client']                           | couchbase | _component_override",
-    "hostname wins over override | ['peer.hostname': 'host1', 'span.kind': 'client', 'component': 'my-http-client'] | host1     | peer.hostname      "
-  })
-  void shouldOverridePeerServiceValuesIfConfigured(
-      Map<String, Object> tags, String expected, String source) {
-    PeerServiceCalculator calculator =
-        new PeerServiceCalculator(
-            new NamingSchemaV0().peerService(), Config.get().getPeerServiceComponentOverrides());
-
-    TagMap unsafeTags = TagMap.fromMap(tags);
-    calculator.processTags(unsafeTags, null, link -> {});
-
-    assertEquals(expected, unsafeTags.get(Tags.PEER_SERVICE));
-    assertEquals(source, unsafeTags.get(DDTags.PEER_SERVICE_SOURCE));
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/PostProcessorChainTest.java b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/PostProcessorChainTest.java
index e1b49cfd5b8..0c6eef6b0fa 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/PostProcessorChainTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/PostProcessorChainTest.java
@@ -15,77 +15,68 @@
 
 class PostProcessorChainTest extends DDJavaSpecification {
 
-  @Test
-  void chainWorks() {
-    TagsPostProcessor processor1 =
-        new TagsPostProcessor() {
-          @Override
-          public void processTags(
-              TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
-            unsafeTags.put("key1", "processor1");
-            unsafeTags.put("key2", "processor1");
-          }
+    @Test
+    void chainWorks() {
+        TagsPostProcessor processor1 = new TagsPostProcessor() {
+            @Override
+            public void processTags(TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
+                unsafeTags.put("key1", "processor1");
+                unsafeTags.put("key2", "processor1");
+            }
         };
-    TagsPostProcessor processor2 =
-        new TagsPostProcessor() {
-          @Override
-          public void processTags(
-              TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
-            unsafeTags.put("key1", "processor2");
-          }
+        TagsPostProcessor processor2 = new TagsPostProcessor() {
+            @Override
+            public void processTags(TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
+                unsafeTags.put("key1", "processor2");
+            }
         };
 
-    PostProcessorChain chain = new PostProcessorChain(processor1, processor2);
+        PostProcessorChain chain = new PostProcessorChain(processor1, processor2);
 
-    List<Object> links = new ArrayList<>();
-    TagMap tags = TagMap.fromMap(linkedMap("key1", "overwrite", "key3", "unchanged"));
+        List<Object> links = new ArrayList<>();
+        TagMap tags = TagMap.fromMap(linkedMap("key1", "overwrite", "key3", "unchanged"));
 
-    chain.processTags(tags, null, link -> links.add(link));
+        chain.processTags(tags, null, link -> links.add(link));
 
-    Map<String, Object> expected =
-        linkedMap("key1", "processor2", "key2", "processor1", "key3", "unchanged");
-    assertEquals(expected, tags);
-    assertTrue(links.isEmpty());
-  }
+        Map<String, Object> expected = linkedMap("key1", "processor2", "key2", "processor1", "key3", "unchanged");
+        assertEquals(expected, tags);
+        assertTrue(links.isEmpty());
+    }
 
-  @Test
-  void processorCanHideTagsToNextOne() {
-    TagsPostProcessor processor1 =
-        new TagsPostProcessor() {
-          @Override
-          public void processTags(
-              TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
-            unsafeTags.clear();
-            unsafeTags.put("my", "tag");
-          }
+    @Test
+    void processorCanHideTagsToNextOne() {
+        TagsPostProcessor processor1 = new TagsPostProcessor() {
+            @Override
+            public void processTags(TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
+                unsafeTags.clear();
+                unsafeTags.put("my", "tag");
+            }
         };
-    TagsPostProcessor processor2 =
-        new TagsPostProcessor() {
-          @Override
-          public void processTags(
-              TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
-            if (unsafeTags.containsKey("test")) {
-              unsafeTags.put("found", "true");
+        TagsPostProcessor processor2 = new TagsPostProcessor() {
+            @Override
+            public void processTags(TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
+                if (unsafeTags.containsKey("test")) {
+                    unsafeTags.put("found", "true");
+                }
             }
-          }
         };
 
-    PostProcessorChain chain = new PostProcessorChain(processor1, processor2);
+        PostProcessorChain chain = new PostProcessorChain(processor1, processor2);
 
-    List<Object> links = new ArrayList<>();
-    TagMap tags = TagMap.fromMap(linkedMap("test", "test"));
+        List<Object> links = new ArrayList<>();
+        TagMap tags = TagMap.fromMap(linkedMap("test", "test"));
 
-    chain.processTags(tags, null, link -> links.add(link));
+        chain.processTags(tags, null, link -> links.add(link));
 
-    assertEquals(linkedMap("my", "tag"), tags);
-    assertTrue(links.isEmpty());
-  }
+        assertEquals(linkedMap("my", "tag"), tags);
+        assertTrue(links.isEmpty());
+    }
 
-  private static LinkedHashMap<String, Object> linkedMap(Object... pairs) {
-    LinkedHashMap<String, Object> map = new LinkedHashMap<>();
-    for (int i = 0; i < pairs.length; i += 2) {
-      map.put((String) pairs[i], pairs[i + 1]);
+    private static LinkedHashMap<String, Object> linkedMap(Object... pairs) {
+        LinkedHashMap<String, Object> map = new LinkedHashMap<>();
+        for (int i = 0; i < pairs.length; i += 2) {
+            map.put((String) pairs[i], pairs[i + 1]);
+        }
+        return map;
     }
-    return map;
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/QueryObfuscatorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/QueryObfuscatorTest.java
index 59ce3696844..8c8c7ee4354 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/QueryObfuscatorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/QueryObfuscatorTest.java
@@ -12,47 +12,47 @@
 
 class QueryObfuscatorTest extends DDJavaSpecification {
 
-  // Default pattern extended with 'email' to match the custom regexp test
-  private static final String CUSTOM_OBFUSCATION_PATTERN =
-      "(?i)(?:(?:\"|%22)?)(?:(?:old[-_]?|new[-_]?)?p(?:ass)?w(?:or)?d(?:1|2)?|pass(?:[-_]?phrase)?|email|secret|(?:api[-_]?|private[-_]?|public[-_]?|access[-_]?|secret[-_]?|app(?:lication)?[-_]?)key(?:[-_]?id)?|token|consumer[-_]?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)(?:(?:\\s|%20)*(?:=|%3D)[^&]+|(?:\"|%22)(?:\\s|%20)*(?::|%3A)(?:\\s|%20)*(?:\"|%22)(?:%2[^2]|%[^2]|[^\"%])+(?:\"|%22))|(?:bearer(?:\\s|%20)+[a-z0-9._\\-]+|token(?::|%3A)[a-z0-9]{13}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L](?:[\\w=-]|%3D)+\\.ey[I-L](?:[\\w=-]|%3D)+(?:\\.(?:[\\w.+/=-]|%3D|%2F|%2B)+)?|-{5}BEGIN(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY-{5}[^\\-]+-{5}END(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY(?:-{5})?(?:\\n|%0A)?|(?:ssh-(?:rsa|dss)|ecdsa-[a-z0-9]+-[a-z0-9]+)(?:\\s|%20|%09)+(?:[a-z0-9/.+]|%2F|%5C|%2B){100,}(?:=|%3D)*(?:(?:\\s|%20|%09)+[a-z0-9._-]+)?)";
-
-  @TableTest({
-    "scenario | query                                                          | expectedQuery                   ",
-    "token    | key1=val1&token=a0b21ce2-006f-4cc6-95d5-d7b550698482&key2=val2 | 'key1=val1&<redacted>&key2=val2'",
-    "app keys | app_key=1111&application_key=2222                              | '<redacted>&<redacted>'         ",
-    "email    | email=foo@bar.com                                              | email=foo@bar.com               "
-  })
-  void tagsProcessing(String query, String expectedQuery) {
-    QueryObfuscator obfuscator = new QueryObfuscator(null);
-
-    Map<String, Object> tags = new LinkedHashMap<>();
-    tags.put(Tags.HTTP_URL, "http://site.com/index");
-    tags.put(DDTags.HTTP_QUERY, query);
-
-    TagMap unsafeTags = TagMap.fromMap(tags);
-    obfuscator.processTags(unsafeTags, null, link -> {});
-
-    assertEquals(expectedQuery, unsafeTags.get(DDTags.HTTP_QUERY));
-    assertEquals("http://site.com/index?" + expectedQuery, unsafeTags.get(Tags.HTTP_URL));
-  }
-
-  @TableTest({
-    "scenario | query                                                          | expectedQuery                   ",
-    "token    | key1=val1&token=a0b21ce2-006f-4cc6-95d5-d7b550698482&key2=val2 | 'key1=val1&<redacted>&key2=val2'",
-    "app keys | app_key=1111&application_key=2222                              | '<redacted>&<redacted>'         ",
-    "email    | email=foo@bar.com                                              | '<redacted>'                    "
-  })
-  void tagsProcessingWithCustomRegexpForEmail(String query, String expectedQuery) {
-    QueryObfuscator obfuscator = new QueryObfuscator(CUSTOM_OBFUSCATION_PATTERN);
-
-    Map<String, Object> tags = new LinkedHashMap<>();
-    tags.put(Tags.HTTP_URL, "http://site.com/index");
-    tags.put(DDTags.HTTP_QUERY, query);
-
-    TagMap unsafeTags = TagMap.fromMap(tags);
-    obfuscator.processTags(unsafeTags, null, link -> {});
-
-    assertEquals(expectedQuery, unsafeTags.get(DDTags.HTTP_QUERY));
-    assertEquals("http://site.com/index?" + expectedQuery, unsafeTags.get(Tags.HTTP_URL));
-  }
+    // Default pattern extended with 'email' to match the custom regexp test
+    private static final String CUSTOM_OBFUSCATION_PATTERN =
+            "(?i)(?:(?:\"|%22)?)(?:(?:old[-_]?|new[-_]?)?p(?:ass)?w(?:or)?d(?:1|2)?|pass(?:[-_]?phrase)?|email|secret|(?:api[-_]?|private[-_]?|public[-_]?|access[-_]?|secret[-_]?|app(?:lication)?[-_]?)key(?:[-_]?id)?|token|consumer[-_]?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)(?:(?:\\s|%20)*(?:=|%3D)[^&]+|(?:\"|%22)(?:\\s|%20)*(?::|%3A)(?:\\s|%20)*(?:\"|%22)(?:%2[^2]|%[^2]|[^\"%])+(?:\"|%22))|(?:bearer(?:\\s|%20)+[a-z0-9._\\-]+|token(?::|%3A)[a-z0-9]{13}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L](?:[\\w=-]|%3D)+\\.ey[I-L](?:[\\w=-]|%3D)+(?:\\.(?:[\\w.+/=-]|%3D|%2F|%2B)+)?|-{5}BEGIN(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY-{5}[^\\-]+-{5}END(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY(?:-{5})?(?:\\n|%0A)?|(?:ssh-(?:rsa|dss)|ecdsa-[a-z0-9]+-[a-z0-9]+)(?:\\s|%20|%09)+(?:[a-z0-9/.+]|%2F|%5C|%2B){100,}(?:=|%3D)*(?:(?:\\s|%20|%09)+[a-z0-9._-]+)?)";
+
+    @TableTest({
+      "scenario | query                                                          | expectedQuery                   ",
+      "token    | key1=val1&token=a0b21ce2-006f-4cc6-95d5-d7b550698482&key2=val2 | 'key1=val1&<redacted>&key2=val2'",
+      "app keys | app_key=1111&application_key=2222                              | '<redacted>&<redacted>'         ",
+      "email    | email=foo@bar.com                                              | email=foo@bar.com               "
+    })
+    void tagsProcessing(String query, String expectedQuery) {
+        QueryObfuscator obfuscator = new QueryObfuscator(null);
+
+        Map<String, Object> tags = new LinkedHashMap<>();
+        tags.put(Tags.HTTP_URL, "http://site.com/index");
+        tags.put(DDTags.HTTP_QUERY, query);
+
+        TagMap unsafeTags = TagMap.fromMap(tags);
+        obfuscator.processTags(unsafeTags, null, link -> {});
+
+        assertEquals(expectedQuery, unsafeTags.get(DDTags.HTTP_QUERY));
+        assertEquals("http://site.com/index?" + expectedQuery, unsafeTags.get(Tags.HTTP_URL));
+    }
+
+    @TableTest({
+      "scenario | query                                                          | expectedQuery                   ",
+      "token    | key1=val1&token=a0b21ce2-006f-4cc6-95d5-d7b550698482&key2=val2 | 'key1=val1&<redacted>&key2=val2'",
+      "app keys | app_key=1111&application_key=2222                              | '<redacted>&<redacted>'         ",
+      "email    | email=foo@bar.com                                              | '<redacted>'                    "
+    })
+    void tagsProcessingWithCustomRegexpForEmail(String query, String expectedQuery) {
+        QueryObfuscator obfuscator = new QueryObfuscator(CUSTOM_OBFUSCATION_PATTERN);
+
+        Map<String, Object> tags = new LinkedHashMap<>();
+        tags.put(Tags.HTTP_URL, "http://site.com/index");
+        tags.put(DDTags.HTTP_QUERY, query);
+
+        TagMap unsafeTags = TagMap.fromMap(tags);
+        obfuscator.processTags(unsafeTags, null, link -> {});
+
+        assertEquals(expectedQuery, unsafeTags.get(DDTags.HTTP_QUERY));
+        assertEquals("http://site.com/index?" + expectedQuery, unsafeTags.get(Tags.HTTP_URL));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/SpanPointersProcessorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/SpanPointersProcessorTest.java
index 05092261200..6b8fa07697a 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/SpanPointersProcessorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/SpanPointersProcessorTest.java
@@ -21,39 +21,41 @@
 
 class SpanPointersProcessorTest extends DDJavaSpecification {
 
-  @TableTest({
-    "scenario       | objectKey     | eTag       | expectedHash                    ",
-    "basic values   | some-key.data | ab12ef34   | e721375466d4116ab551213fdea08413",
-    "non-ascii key  | some-key.你好 | ab12ef34   | d1333a04b9928ab462b5c6cadfa401f4",
-    "multipart etag | some-key.data | ab12ef34-5 | 2b90dffc37ebc7bc610152c3dc72af9f"
-  })
-  void spanPointersProcessorAddsCorrectLink(String objectKey, String eTag, String expectedHash) {
-    SpanPointersProcessor processor = new SpanPointersProcessor();
-
-    Map<String, Object> tagMap = new LinkedHashMap<>();
-    tagMap.put(InstrumentationTags.AWS_BUCKET_NAME, "some-bucket");
-    tagMap.put(InstrumentationTags.AWS_OBJECT_KEY, objectKey);
-    tagMap.put("s3.eTag", eTag);
-
-    TagMap unsafeTags = TagMap.fromMap(tagMap);
-    DDSpanContext spanContext = mock(DDSpanContext.class);
-    List<AgentSpanLink> spanLinks = new ArrayList<>();
-
-    // Process the tags; the processor should remove 's3.eTag' and add one link
-    processor.processTags(unsafeTags, spanContext, link -> spanLinks.add(link));
-
-    // 1. s3.eTag was removed
-    assertFalse(unsafeTags.containsKey("s3.eTag"));
-    // 2. Exactly one link was added
-    assertEquals(1, spanLinks.size());
-    // 3. Check link
-    AgentSpanLink link = spanLinks.get(0);
-    assertInstanceOf(SpanLink.class, link);
-    assertEquals(DDTraceId.ZERO, link.traceId());
-    assertEquals(DDSpanId.ZERO, link.spanId());
-    assertEquals(SpanPointersProcessor.S3_PTR_KIND, link.attributes().asMap().get("ptr.kind"));
-    assertEquals(SpanPointersProcessor.DOWN_DIRECTION, link.attributes().asMap().get("ptr.dir"));
-    assertEquals(expectedHash, link.attributes().asMap().get("ptr.hash"));
-    assertEquals(SpanPointersProcessor.LINK_KIND, link.attributes().asMap().get("link.kind"));
-  }
+    @TableTest({
+      "scenario       | objectKey     | eTag       | expectedHash                    ",
+      "basic values   | some-key.data | ab12ef34   | e721375466d4116ab551213fdea08413",
+      "non-ascii key  | some-key.你好 | ab12ef34   | d1333a04b9928ab462b5c6cadfa401f4",
+      "multipart etag | some-key.data | ab12ef34-5 | 2b90dffc37ebc7bc610152c3dc72af9f"
+    })
+    void spanPointersProcessorAddsCorrectLink(String objectKey, String eTag, String expectedHash) {
+        SpanPointersProcessor processor = new SpanPointersProcessor();
+
+        Map<String, Object> tagMap = new LinkedHashMap<>();
+        tagMap.put(InstrumentationTags.AWS_BUCKET_NAME, "some-bucket");
+        tagMap.put(InstrumentationTags.AWS_OBJECT_KEY, objectKey);
+        tagMap.put("s3.eTag", eTag);
+
+        TagMap unsafeTags = TagMap.fromMap(tagMap);
+        DDSpanContext spanContext = mock(DDSpanContext.class);
+        List<AgentSpanLink> spanLinks = new ArrayList<>();
+
+        // Process the tags; the processor should remove 's3.eTag' and add one link
+        processor.processTags(unsafeTags, spanContext, link -> spanLinks.add(link));
+
+        // 1. s3.eTag was removed
+        assertFalse(unsafeTags.containsKey("s3.eTag"));
+        // 2. Exactly one link was added
+        assertEquals(1, spanLinks.size());
+        // 3. Check link
+        AgentSpanLink link = spanLinks.get(0);
+        assertInstanceOf(SpanLink.class, link);
+        assertEquals(DDTraceId.ZERO, link.traceId());
+        assertEquals(DDSpanId.ZERO, link.spanId());
+        assertEquals(
+                SpanPointersProcessor.S3_PTR_KIND, link.attributes().asMap().get("ptr.kind"));
+        assertEquals(
+                SpanPointersProcessor.DOWN_DIRECTION, link.attributes().asMap().get("ptr.dir"));
+        assertEquals(expectedHash, link.attributes().asMap().get("ptr.hash"));
+        assertEquals(SpanPointersProcessor.LINK_KIND, link.attributes().asMap().get("link.kind"));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/TagsPostProcessorFactoryTest.java b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/TagsPostProcessorFactoryTest.java
index 16726c0544d..9be4103fcd7 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/TagsPostProcessorFactoryTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/tagprocessor/TagsPostProcessorFactoryTest.java
@@ -24,38 +24,36 @@
  */
 class TagsPostProcessorFactoryTest extends DDJavaSpecification {
 
-  @AfterEach
-  void restoreDefaults() {
-    TagsPostProcessorFactory.reset();
-  }
+    @AfterEach
+    void restoreDefaults() {
+        TagsPostProcessorFactory.reset();
+    }
 
-  @Test
-  void resetRebuildsTheCachedEagerProcessorChain() {
-    TagsPostProcessor before = TagsPostProcessorFactory.eagerProcessor();
+    @Test
+    void resetRebuildsTheCachedEagerProcessorChain() {
+        TagsPostProcessor before = TagsPostProcessorFactory.eagerProcessor();
 
-    TagsPostProcessorFactory.reset();
+        TagsPostProcessorFactory.reset();
 
-    TagsPostProcessor after = TagsPostProcessorFactory.eagerProcessor();
+        TagsPostProcessor after = TagsPostProcessorFactory.eagerProcessor();
 
-    assertNotSame(
-        before,
-        after,
-        "reset() must rebuild the cached eager processor chain (including InternalTagsAdder,"
-            + " which stamps _dd.base_service) from the current Config, or the native-image"
-            + " base_service staleness fix (APMS-20492) silently regresses into a no-op");
-  }
+        assertNotSame(
+                before,
+                after,
+                "reset() must rebuild the cached eager processor chain (including InternalTagsAdder,"
+                        + " which stamps _dd.base_service) from the current Config, or the native-image"
+                        + " base_service staleness fix (APMS-20492) silently regresses into a no-op");
+    }
 
-  @Test
-  void resetRebuildsTheCachedLazyProcessorChain() {
-    TagsPostProcessor before = TagsPostProcessorFactory.lazyProcessor();
+    @Test
+    void resetRebuildsTheCachedLazyProcessorChain() {
+        TagsPostProcessor before = TagsPostProcessorFactory.lazyProcessor();
 
-    TagsPostProcessorFactory.reset();
+        TagsPostProcessorFactory.reset();
 
-    TagsPostProcessor after = TagsPostProcessorFactory.lazyProcessor();
+        TagsPostProcessor after = TagsPostProcessorFactory.lazyProcessor();
 
-    assertNotSame(
-        before,
-        after,
-        "reset() must also rebuild the cached lazy processor chain from the current Config");
-  }
+        assertNotSame(
+                before, after, "reset() must also rebuild the cached lazy processor chain from the current Config");
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.java
index 2fccfe2672d..09201d23d6d 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.java
@@ -18,38 +18,39 @@
 @Timeout(value = 10, unit = TimeUnit.SECONDS)
 class LatencyTraceInterceptorTest extends DDCoreJavaSpecification {
 
-  @TableTest({
-    "scenario                                  | partialFlushEnabled | latencyThreshold | priorityTag          | minDuration | expected",
-    "partial flush / keep / under threshold    | 'true'              | '200'            | 'DDTags.MANUAL_KEEP' | 10          | 2       ",
-    "partial flush / drop / under threshold    | 'true'              | '200'            | 'DDTags.MANUAL_DROP' | 10          | -1      ",
-    "partial flush / keep / over threshold     | 'true'              | '200'            | 'DDTags.MANUAL_KEEP' | 300         | 2       ",
-    "partial flush / drop / over threshold     | 'true'              | '200'            | 'DDTags.MANUAL_DROP' | 300         | -1      ",
-    "no partial flush / keep / under threshold | 'false'             | '200'            | 'DDTags.MANUAL_KEEP' | 10          | 2       ",
-    "no partial flush / drop / under threshold | 'false'             | '200'            | 'DDTags.MANUAL_DROP' | 10          | -1      ",
-    "no partial flush / keep / over threshold  | 'false'             | '200'            | 'DDTags.MANUAL_KEEP' | 300         | 2       ",
-    "no partial flush / drop / over threshold  | 'false'             | '200'            | 'DDTags.MANUAL_DROP' | 300         | 2       "
-  })
-  void testSetSamplingPriorityAccordingToLatency(
-      String partialFlushEnabled,
-      String latencyThreshold,
-      @ConvertWith(TagsConverter.class) String priorityTag,
-      long minDuration,
-      int expected)
-      throws InterruptedException {
-    injectSysConfig("trace.partial.flush.enabled", partialFlushEnabled);
-    injectSysConfig("trace.experimental.keep.latency.threshold.ms", latencyThreshold);
+    @TableTest({
+      "scenario                                  | partialFlushEnabled | latencyThreshold | priorityTag          | minDuration | expected",
+      "partial flush / keep / under threshold    | 'true'              | '200'            | 'DDTags.MANUAL_KEEP' | 10          | 2       ",
+      "partial flush / drop / under threshold    | 'true'              | '200'            | 'DDTags.MANUAL_DROP' | 10          | -1      ",
+      "partial flush / keep / over threshold     | 'true'              | '200'            | 'DDTags.MANUAL_KEEP' | 300         | 2       ",
+      "partial flush / drop / over threshold     | 'true'              | '200'            | 'DDTags.MANUAL_DROP' | 300         | -1      ",
+      "no partial flush / keep / under threshold | 'false'             | '200'            | 'DDTags.MANUAL_KEEP' | 10          | 2       ",
+      "no partial flush / drop / under threshold | 'false'             | '200'            | 'DDTags.MANUAL_DROP' | 10          | -1      ",
+      "no partial flush / keep / over threshold  | 'false'             | '200'            | 'DDTags.MANUAL_KEEP' | 300         | 2       ",
+      "no partial flush / drop / over threshold  | 'false'             | '200'            | 'DDTags.MANUAL_DROP' | 300         | 2       "
+    })
+    void testSetSamplingPriorityAccordingToLatency(
+            String partialFlushEnabled,
+            String latencyThreshold,
+            @ConvertWith(TagsConverter.class) String priorityTag,
+            long minDuration,
+            int expected)
+            throws InterruptedException {
+        injectSysConfig("trace.partial.flush.enabled", partialFlushEnabled);
+        injectSysConfig("trace.experimental.keep.latency.threshold.ms", latencyThreshold);
 
-    ListWriter writer = new ListWriter();
-    CoreTracer tracer = tracerBuilder().writer(writer).build();
+        ListWriter writer = new ListWriter();
+        CoreTracer tracer = tracerBuilder().writer(writer).build();
 
-    AgentSpan spanSetup =
-        tracer.buildSpan("test", "my_operation_name").withTag(priorityTag, true).start();
-    Thread.sleep(minDuration);
-    spanSetup.finish();
+        AgentSpan spanSetup = tracer.buildSpan("test", "my_operation_name")
+                .withTag(priorityTag, true)
+                .start();
+        Thread.sleep(minDuration);
+        spanSetup.finish();
 
-    List<DDSpan> trace = writer.firstTrace();
-    assertEquals(1, trace.size());
-    DDSpan span = trace.get(0);
-    assertEquals(expected, span.spanContext().getSamplingPriority());
-  }
+        List<DDSpan> trace = writer.firstTrace();
+        assertEquals(1, trace.size());
+        DDSpan span = trace.get(0);
+        assertEquals(expected, span.spanContext().getSamplingPriority());
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/util/GlobPatternTest.java b/dd-trace-core/src/test/java/datadog/trace/core/util/GlobPatternTest.java
index 19c92700940..535203aeac2 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/util/GlobPatternTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/util/GlobPatternTest.java
@@ -6,18 +6,18 @@
 
 class GlobPatternTest {
 
-  @TableTest({
-    "scenario             | globPattern | expectedRegex",
-    "star alone           | '*'         | '^.*$'       ",
-    "question alone       | '?'         | '^.$'        ",
-    "two questions        | '??'        | '^..$'       ",
-    "prefix star          | 'Foo*'      | '^Foo.*$'    ",
-    "literal abc          | 'abc'       | '^abc$'      ",
-    "question alone (dup) | '?'         | '^.$'        ",
-    "single char          | 'F?o'       | '^F.o$'      ",
-    "Bar prefix           | 'Bar*'      | '^Bar.*$'    "
-  })
-  void convertGlobPatternToRegex(String globPattern, String expectedRegex) {
-    assertEquals(expectedRegex, GlobPattern.globToRegex(globPattern));
-  }
+    @TableTest({
+      "scenario             | globPattern | expectedRegex",
+      "star alone           | '*'         | '^.*$'       ",
+      "question alone       | '?'         | '^.$'        ",
+      "two questions        | '??'        | '^..$'       ",
+      "prefix star          | 'Foo*'      | '^Foo.*$'    ",
+      "literal abc          | 'abc'       | '^abc$'      ",
+      "question alone (dup) | '?'         | '^.$'        ",
+      "single char          | 'F?o'       | '^F.o$'      ",
+      "Bar prefix           | 'Bar*'      | '^Bar.*$'    "
+    })
+    void convertGlobPatternToRegex(String globPattern, String expectedRegex) {
+        assertEquals(expectedRegex, GlobPattern.globToRegex(globPattern));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/util/LRUCacheTest.java b/dd-trace-core/src/test/java/datadog/trace/core/util/LRUCacheTest.java
index 43daa3620ce..923019baafd 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/util/LRUCacheTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/util/LRUCacheTest.java
@@ -10,39 +10,39 @@
 
 class LRUCacheTest {
 
-  @Test
-  void shouldEjectLeastRecentlyUsedElement() {
-    LRUCache<Integer, String> lruCache = new LRUCache<>(5);
-    for (int i = 1; i <= 5; i++) {
-      lruCache.put(i, String.valueOf(i));
+    @Test
+    void shouldEjectLeastRecentlyUsedElement() {
+        LRUCache<Integer, String> lruCache = new LRUCache<>(5);
+        for (int i = 1; i <= 5; i++) {
+            lruCache.put(i, String.valueOf(i));
+        }
+        // now look at 2 values
+        lruCache.get(1);
+        lruCache.get(3);
+        // now insert 2 new values
+        lruCache.put(6, "6");
+        lruCache.put(7, "7");
+
+        assertEquals(5, lruCache.size());
+        assertTrue(lruCache.values().containsAll(Arrays.asList("1", "3", "5", "6", "7")));
     }
-    // now look at 2 values
-    lruCache.get(1);
-    lruCache.get(3);
-    // now insert 2 new values
-    lruCache.put(6, "6");
-    lruCache.put(7, "7");
-
-    assertEquals(5, lruCache.size());
-    assertTrue(lruCache.values().containsAll(Arrays.asList("1", "3", "5", "6", "7")));
-  }
-
-  @Test
-  void shouldNotifyListenerWhenEjectingLeastRecentlyUsedElement() {
-    List<Integer> ejected = new ArrayList<>();
-    LRUCache.ExpiryListener<Integer, String> listener = entry -> ejected.add(entry.getKey());
-
-    LRUCache<Integer, String> lruCache = new LRUCache<>(listener, 10, 0.75f, 5);
-    for (int i = 1; i <= 5; i++) {
-      lruCache.put(i, String.valueOf(i));
+
+    @Test
+    void shouldNotifyListenerWhenEjectingLeastRecentlyUsedElement() {
+        List<Integer> ejected = new ArrayList<>();
+        LRUCache.ExpiryListener<Integer, String> listener = entry -> ejected.add(entry.getKey());
+
+        LRUCache<Integer, String> lruCache = new LRUCache<>(listener, 10, 0.75f, 5);
+        for (int i = 1; i <= 5; i++) {
+            lruCache.put(i, String.valueOf(i));
+        }
+        // now look at 2 values
+        lruCache.get(1);
+        lruCache.get(3);
+        // now insert 2 new values
+        lruCache.put(6, "6");
+        lruCache.put(7, "7");
+
+        assertEquals(Arrays.asList(2, 4), ejected);
     }
-    // now look at 2 values
-    lruCache.get(1);
-    lruCache.get(3);
-    // now insert 2 new values
-    lruCache.put(6, "6");
-    lruCache.put(7, "7");
-
-    assertEquals(Arrays.asList(2, 4), ejected);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/util/MatchersTest.java b/dd-trace-core/src/test/java/datadog/trace/core/util/MatchersTest.java
index e7a0c96bc35..f4b6ac96251 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/util/MatchersTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/util/MatchersTest.java
@@ -17,156 +17,156 @@
 
 class MatchersTest {
 
-  @ParameterizedTest
-  @NullSource
-  @ValueSource(strings = {"*", "**"})
-  void matchAllScenariosMustReturnAnAnyMatcher(String glob) {
-    assertInstanceOf(Matchers.AnyMatcher.class, Matchers.compileGlob(glob));
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"a", "ogre", "bcoho34e2"})
-  void patternWithoutStarOrQuestionMustBeAnEqualsMatcher(String glob) {
-    assertInstanceOf(Matchers.InsensitiveEqualsMatcher.class, Matchers.compileGlob(glob));
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"?", "foo*", "*bar", "F?oB?r", "F?o*", "?*", "*?"})
-  void patternWithEitherStarOrQuestionMustBeAPatternMatcher(String glob) {
-    assertInstanceOf(Matchers.PatternMatcher.class, Matchers.compileGlob(glob));
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"", "a", "abc", "cde"})
-  void anExactMatcherIsSelfMatching(String pattern) {
-    assertTrue(Matchers.compileGlob(pattern).matches(pattern));
-  }
-
-  static Stream<Arguments> aPatternMatcherTestArguments() {
-    return Stream.of(
-        arguments("fo? matches Foo", "fo?", "Foo", true),
-        arguments("Fo? matches Foo", "Fo?", "Foo", true),
-        arguments("Fo? matches StringBuilder Foo", "Fo?", new StringBuilder("Foo"), true),
-        arguments("Fo? matches StringBuilder foo", "Fo?", new StringBuilder("foo"), true),
-        arguments("Foo matches StringBuilder foo", "Foo", new StringBuilder("foo"), true),
-        arguments("bar does not match StringBuilder Baz", "bar", new StringBuilder("Baz"), false),
-        arguments("Fo? does not match Fooo", "Fo?", "Fooo", false),
-        arguments("Fo* matches Fo", "Fo*", "Fo", true),
-        arguments("Fo* does not match Fa", "Fo*", "Fa", false),
-        arguments("F*B?r matches FooBar", "F*B?r", "FooBar", true),
-        arguments("F*B?r does not match FooFar", "F*B?r", "FooFar", false),
-        arguments("f*b?r matches FooBar", "f*b?r", "FooBar", true),
-        arguments("* matches true", "*", true, true),
-        arguments("true matches true", "true", true, true),
-        arguments("false matches false", "false", false, true),
-        arguments("TRUE matches true", "TRUE", true, true),
-        arguments("FALSE matches false", "FALSE", false, true),
-        arguments("True matches true", "True", true, true),
-        arguments("False matches false", "False", false, true),
-        arguments("T* matches true", "T*", true, true),
-        arguments("F* matches false", "F*", false, true),
-        arguments("empty matches empty", "", "", true),
-        arguments("empty does not match non-empty", "", "non-empty", false),
-        arguments("* matches foo", "*", "foo", true),
-        arguments("** matches foo", "**", "foo", true),
-        arguments("??? matches foo", "???", "foo", true),
-        arguments("* matches int 20", "*", 20, true),
-        arguments("20 matches int 20", "20", 20, true),
-        arguments("-20 matches int -20", "-20", -20, true),
-        arguments("* matches byte 20", "*", (byte) 20, true),
-        arguments("20 matches byte 20", "20", (byte) 20, true),
-        arguments("* matches short 20", "*", (short) 20, true),
-        arguments("20 matches short 20", "20", (short) 20, true),
-        arguments("* matches long 20", "*", 20L, true),
-        arguments("20 matches long 20", "20", 20L, true),
-        arguments("* matches float 20", "*", 20F, true),
-        arguments("20 matches float 20", "20", 20F, true),
-        arguments("* matches double 20", "*", 20D, true),
-        arguments("20 matches double 20", "20", 20D, true),
-        arguments("20 matches BigInteger 20", "20", new BigInteger("20"), true),
-        arguments("20 matches BigDecimal 20", "20", new BigDecimal("20"), true),
-        arguments("2* does not match float 20.1", "2*", 20.1F, false),
-        arguments("2* does not match double 20.1", "2*", 20.1D, false),
-        arguments("2* does not match BigDecimal 20.1", "2*", new BigDecimal("20.1"), false),
-        arguments("* matches arbitrary Object", "*", new Object(), true),
-        arguments("** matches arbitrary Object", "**", new Object(), true),
-        arguments("? does not match arbitrary Object", "?", new Object(), false),
-        arguments("* matches null", "*", null, true),
-        arguments("? does not match null", "?", null, false),
-        arguments("[a-z] matches [a-z]", "[a-z]", "[a-z]", true),
-        arguments("[a-z] does not match a", "[a-z]", "a", false),
-        arguments("[abc] matches [abc]", "[abc]", "[abc]", true),
-        arguments("[AbC] matches [abc]", "[AbC]", "[abc]", true),
-        arguments("[Ab] matches StringBuffer [ab]", "[Ab]", new StringBuffer("[ab]"), true),
-        arguments("[abc] does not match a", "[abc]", "a", false),
-        arguments("[!ab] matches [!ab]", "[!ab]", "[!ab]", true),
-        arguments("[!ab] does not match c", "[!ab]", "c", false),
-        arguments("^ matches ^", "^", "^", true),
-        arguments("() matches ()", "()", "()", true),
-        arguments("(*) matches (-)", "(*)", "(-)", true),
-        arguments("$ matches $", "$", "$", true));
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("aPatternMatcherTestArguments")
-  void aPatternMatcherTest(String scenario, String pattern, Object value, boolean matches) {
-    Matcher matcher = Matchers.compileGlob(pattern);
-
-    assertEquals(matches, matcher.matches(value));
-  }
-
-  @Test
-  void anyMatcherMatchesString() {
-    assertTrue(Matchers.ANY.matches("hello"));
-  }
-
-  @Test
-  void anyMatcherMatchesCharSequence() {
-    assertTrue(Matchers.ANY.matches((CharSequence) new StringBuilder("world")));
-  }
-
-  @Test
-  void anyMatcherMatchesBoolean() {
-    assertTrue(Matchers.ANY.matches(true));
-  }
-
-  @Test
-  void anyMatcherMatchesByte() {
-    assertTrue(Matchers.ANY.matches((byte) 1));
-  }
-
-  @Test
-  void anyMatcherMatchesShort() {
-    assertTrue(Matchers.ANY.matches((short) 2));
-  }
-
-  @Test
-  void anyMatcherMatchesInt() {
-    assertTrue(Matchers.ANY.matches(42));
-  }
-
-  @Test
-  void anyMatcherMatchesLong() {
-    assertTrue(Matchers.ANY.matches(100L));
-  }
-
-  @Test
-  void anyMatcherMatchesFloat() {
-    assertTrue(Matchers.ANY.matches(1.5f));
-  }
-
-  @Test
-  void anyMatcherMatchesDouble() {
-    assertTrue(Matchers.ANY.matches(3.14));
-  }
-
-  @Test
-  void anyMatcherMatchesBigInteger() {
-    assertTrue(Matchers.ANY.matches(new BigInteger("123")));
-  }
-
-  @Test
-  void anyMatcherMatchesBigDecimal() {
-    assertTrue(Matchers.ANY.matches(new BigDecimal("1.23")));
-  }
+    @ParameterizedTest
+    @NullSource
+    @ValueSource(strings = {"*", "**"})
+    void matchAllScenariosMustReturnAnAnyMatcher(String glob) {
+        assertInstanceOf(Matchers.AnyMatcher.class, Matchers.compileGlob(glob));
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "ogre", "bcoho34e2"})
+    void patternWithoutStarOrQuestionMustBeAnEqualsMatcher(String glob) {
+        assertInstanceOf(Matchers.InsensitiveEqualsMatcher.class, Matchers.compileGlob(glob));
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"?", "foo*", "*bar", "F?oB?r", "F?o*", "?*", "*?"})
+    void patternWithEitherStarOrQuestionMustBeAPatternMatcher(String glob) {
+        assertInstanceOf(Matchers.PatternMatcher.class, Matchers.compileGlob(glob));
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"", "a", "abc", "cde"})
+    void anExactMatcherIsSelfMatching(String pattern) {
+        assertTrue(Matchers.compileGlob(pattern).matches(pattern));
+    }
+
+    static Stream<Arguments> aPatternMatcherTestArguments() {
+        return Stream.of(
+                arguments("fo? matches Foo", "fo?", "Foo", true),
+                arguments("Fo? matches Foo", "Fo?", "Foo", true),
+                arguments("Fo? matches StringBuilder Foo", "Fo?", new StringBuilder("Foo"), true),
+                arguments("Fo? matches StringBuilder foo", "Fo?", new StringBuilder("foo"), true),
+                arguments("Foo matches StringBuilder foo", "Foo", new StringBuilder("foo"), true),
+                arguments("bar does not match StringBuilder Baz", "bar", new StringBuilder("Baz"), false),
+                arguments("Fo? does not match Fooo", "Fo?", "Fooo", false),
+                arguments("Fo* matches Fo", "Fo*", "Fo", true),
+                arguments("Fo* does not match Fa", "Fo*", "Fa", false),
+                arguments("F*B?r matches FooBar", "F*B?r", "FooBar", true),
+                arguments("F*B?r does not match FooFar", "F*B?r", "FooFar", false),
+                arguments("f*b?r matches FooBar", "f*b?r", "FooBar", true),
+                arguments("* matches true", "*", true, true),
+                arguments("true matches true", "true", true, true),
+                arguments("false matches false", "false", false, true),
+                arguments("TRUE matches true", "TRUE", true, true),
+                arguments("FALSE matches false", "FALSE", false, true),
+                arguments("True matches true", "True", true, true),
+                arguments("False matches false", "False", false, true),
+                arguments("T* matches true", "T*", true, true),
+                arguments("F* matches false", "F*", false, true),
+                arguments("empty matches empty", "", "", true),
+                arguments("empty does not match non-empty", "", "non-empty", false),
+                arguments("* matches foo", "*", "foo", true),
+                arguments("** matches foo", "**", "foo", true),
+                arguments("??? matches foo", "???", "foo", true),
+                arguments("* matches int 20", "*", 20, true),
+                arguments("20 matches int 20", "20", 20, true),
+                arguments("-20 matches int -20", "-20", -20, true),
+                arguments("* matches byte 20", "*", (byte) 20, true),
+                arguments("20 matches byte 20", "20", (byte) 20, true),
+                arguments("* matches short 20", "*", (short) 20, true),
+                arguments("20 matches short 20", "20", (short) 20, true),
+                arguments("* matches long 20", "*", 20L, true),
+                arguments("20 matches long 20", "20", 20L, true),
+                arguments("* matches float 20", "*", 20F, true),
+                arguments("20 matches float 20", "20", 20F, true),
+                arguments("* matches double 20", "*", 20D, true),
+                arguments("20 matches double 20", "20", 20D, true),
+                arguments("20 matches BigInteger 20", "20", new BigInteger("20"), true),
+                arguments("20 matches BigDecimal 20", "20", new BigDecimal("20"), true),
+                arguments("2* does not match float 20.1", "2*", 20.1F, false),
+                arguments("2* does not match double 20.1", "2*", 20.1D, false),
+                arguments("2* does not match BigDecimal 20.1", "2*", new BigDecimal("20.1"), false),
+                arguments("* matches arbitrary Object", "*", new Object(), true),
+                arguments("** matches arbitrary Object", "**", new Object(), true),
+                arguments("? does not match arbitrary Object", "?", new Object(), false),
+                arguments("* matches null", "*", null, true),
+                arguments("? does not match null", "?", null, false),
+                arguments("[a-z] matches [a-z]", "[a-z]", "[a-z]", true),
+                arguments("[a-z] does not match a", "[a-z]", "a", false),
+                arguments("[abc] matches [abc]", "[abc]", "[abc]", true),
+                arguments("[AbC] matches [abc]", "[AbC]", "[abc]", true),
+                arguments("[Ab] matches StringBuffer [ab]", "[Ab]", new StringBuffer("[ab]"), true),
+                arguments("[abc] does not match a", "[abc]", "a", false),
+                arguments("[!ab] matches [!ab]", "[!ab]", "[!ab]", true),
+                arguments("[!ab] does not match c", "[!ab]", "c", false),
+                arguments("^ matches ^", "^", "^", true),
+                arguments("() matches ()", "()", "()", true),
+                arguments("(*) matches (-)", "(*)", "(-)", true),
+                arguments("$ matches $", "$", "$", true));
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("aPatternMatcherTestArguments")
+    void aPatternMatcherTest(String scenario, String pattern, Object value, boolean matches) {
+        Matcher matcher = Matchers.compileGlob(pattern);
+
+        assertEquals(matches, matcher.matches(value));
+    }
+
+    @Test
+    void anyMatcherMatchesString() {
+        assertTrue(Matchers.ANY.matches("hello"));
+    }
+
+    @Test
+    void anyMatcherMatchesCharSequence() {
+        assertTrue(Matchers.ANY.matches((CharSequence) new StringBuilder("world")));
+    }
+
+    @Test
+    void anyMatcherMatchesBoolean() {
+        assertTrue(Matchers.ANY.matches(true));
+    }
+
+    @Test
+    void anyMatcherMatchesByte() {
+        assertTrue(Matchers.ANY.matches((byte) 1));
+    }
+
+    @Test
+    void anyMatcherMatchesShort() {
+        assertTrue(Matchers.ANY.matches((short) 2));
+    }
+
+    @Test
+    void anyMatcherMatchesInt() {
+        assertTrue(Matchers.ANY.matches(42));
+    }
+
+    @Test
+    void anyMatcherMatchesLong() {
+        assertTrue(Matchers.ANY.matches(100L));
+    }
+
+    @Test
+    void anyMatcherMatchesFloat() {
+        assertTrue(Matchers.ANY.matches(1.5f));
+    }
+
+    @Test
+    void anyMatcherMatchesDouble() {
+        assertTrue(Matchers.ANY.matches(3.14));
+    }
+
+    @Test
+    void anyMatcherMatchesBigInteger() {
+        assertTrue(Matchers.ANY.matches(new BigInteger("123")));
+    }
+
+    @Test
+    void anyMatcherMatchesBigDecimal() {
+        assertTrue(Matchers.ANY.matches(new BigDecimal("1.23")));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/util/PercentEscaperTest.java b/dd-trace-core/src/test/java/datadog/trace/core/util/PercentEscaperTest.java
index 54114ab561f..fd01c62897e 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/util/PercentEscaperTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/util/PercentEscaperTest.java
@@ -10,65 +10,64 @@
 
 class PercentEscaperTest {
 
-  private final PercentEscaper escaper = PercentEscaper.create();
+    private final PercentEscaper escaper = PercentEscaper.create();
 
-  @TableTest({
-    "scenario                        | value        | expected                       ",
-    "safe ascii is untouched         | 'plainvalue' | 'plainvalue'                   ",
-    "unsafe ascii is escaped         | 'a,b'        | 'a%2Cb'                        ",
-    "non-ascii at the start          | '你好'       | '%E4%BD%A0%E5%A5%BD'           ",
-    "non-ascii after an escaped char | 'a,b中'      | 'a%2Cb%E4%B8%AD'               ",
-    "non-ascii interleaved with safe | '中a中a中'   | '%E4%B8%ADa%E4%B8%ADa%E4%B8%AD'",
-    "two byte non-ascii              | 'café crème' | 'caf%C3%A9%20cr%C3%A8me'       ",
-    "four byte supplementary         | 'a,b😀'      | 'a%2Cb%F0%9F%98%80'            ",
-    "percent is escaped              | '50%'        | '50%25'                        ",
-    "percent-like sequence preserved | 'a%20b'      | 'a%2520b'                      "
-  })
-  void escapeValueEncodesEveryNonAsciiCharacter(String value, String expected) {
-    assertEquals(expected, this.escaper.escapeValue(value).data);
-  }
+    @TableTest({
+      "scenario                        | value        | expected                       ",
+      "safe ascii is untouched         | 'plainvalue' | 'plainvalue'                   ",
+      "unsafe ascii is escaped         | 'a,b'        | 'a%2Cb'                        ",
+      "non-ascii at the start          | '你好'       | '%E4%BD%A0%E5%A5%BD'           ",
+      "non-ascii after an escaped char | 'a,b中'      | 'a%2Cb%E4%B8%AD'               ",
+      "non-ascii interleaved with safe | '中a中a中'   | '%E4%B8%ADa%E4%B8%ADa%E4%B8%AD'",
+      "two byte non-ascii              | 'café crème' | 'caf%C3%A9%20cr%C3%A8me'       ",
+      "four byte supplementary         | 'a,b😀'      | 'a%2Cb%F0%9F%98%80'            ",
+      "percent is escaped              | '50%'        | '50%25'                        ",
+      "percent-like sequence preserved | 'a%20b'      | 'a%2520b'                      "
+    })
+    void escapeValueEncodesEveryNonAsciiCharacter(String value, String expected) {
+        assertEquals(expected, this.escaper.escapeValue(value).data);
+    }
 
-  /** Keys use a separate, longer octet table than values, so cover that path too. */
-  @TableTest({
-    "scenario                        | key     | expected            ",
-    "non-ascii at the start          | '你好'  | '%E4%BD%A0%E5%A5%BD'",
-    "non-ascii after an escaped char | 'a/b中' | 'a%2Fb%E4%B8%AD'    "
-  })
-  void escapeKeyEncodesEveryNonAsciiCharacter(String key, String expected) {
-    assertEquals(expected, this.escaper.escapeKey(key).data);
-  }
+    /** Keys use a separate, longer octet table than values, so cover that path too. */
+    @TableTest({
+      "scenario                        | key     | expected            ",
+      "non-ascii at the start          | '你好'  | '%E4%BD%A0%E5%A5%BD'",
+      "non-ascii after an escaped char | 'a/b中' | 'a%2Fb%E4%B8%AD'    "
+    })
+    void escapeKeyEncodesEveryNonAsciiCharacter(String key, String expected) {
+        assertEquals(expected, this.escaper.escapeKey(key).data);
+    }
 
-  /**
-   * Independently verifies the escaped bytes are correct, rather than relying on the hand-written
-   * expectations above, and that nothing non-ASCII reaches the header.
-   */
-  @TableTest({
-    "scenario                | value       ",
-    "three byte non-ascii    | '你好世界'  ",
-    "two byte non-ascii      | 'café crème'",
-    "four byte supplementary | '😀🎉'      ",
-    "percent sign            | 'a%20b%'    "
-  })
-  void escapedValueIsAsciiOnlyAndDecodesBackToTheInput(String value)
-      throws UnsupportedEncodingException {
-    String escaped = this.escaper.escapeValue(value).data;
-    for (int i = 0; i < escaped.length(); i++) {
-      char c = escaped.charAt(i);
-      assertTrue(c <= '~', "expected pure ASCII output but got '" + c + "' in " + escaped);
+    /**
+     * Independently verifies the escaped bytes are correct, rather than relying on the hand-written
+     * expectations above, and that nothing non-ASCII reaches the header.
+     */
+    @TableTest({
+      "scenario                | value       ",
+      "three byte non-ascii    | '你好世界'  ",
+      "two byte non-ascii      | 'café crème'",
+      "four byte supplementary | '😀🎉'      ",
+      "percent sign            | 'a%20b%'    "
+    })
+    void escapedValueIsAsciiOnlyAndDecodesBackToTheInput(String value) throws UnsupportedEncodingException {
+        String escaped = this.escaper.escapeValue(value).data;
+        for (int i = 0; i < escaped.length(); i++) {
+            char c = escaped.charAt(i);
+            assertTrue(c <= '~', "expected pure ASCII output but got '" + c + "' in " + escaped);
+        }
+        assertEquals(value, URLDecoder.decode(escaped, "UTF-8"));
     }
-    assertEquals(value, URLDecoder.decode(escaped, "UTF-8"));
-  }
 
-  @Test
-  void escapeValueEncodesControlCharacters() {
-    assertEquals("a%0Ab", this.escaper.escapeValue("a\nb").data);
-    assertEquals("a%09b", this.escaper.escapeValue("a\tb").data);
-    assertEquals("a%0D%0Ab", this.escaper.escapeValue("a\r\nb").data);
-    assertEquals("a%2Cb%0A", this.escaper.escapeValue("a,b\n").data);
-  }
+    @Test
+    void escapeValueEncodesControlCharacters() {
+        assertEquals("a%0Ab", this.escaper.escapeValue("a\nb").data);
+        assertEquals("a%09b", this.escaper.escapeValue("a\tb").data);
+        assertEquals("a%0D%0Ab", this.escaper.escapeValue("a\r\nb").data);
+        assertEquals("a%2Cb%0A", this.escaper.escapeValue("a,b\n").data);
+    }
 
-  @Test
-  void escapeKeyEncodesControlCharacters() {
-    assertEquals("a%0Ab", this.escaper.escapeKey("a\nb").data);
-  }
+    @Test
+    void escapeKeyEncodesControlCharacters() {
+        assertEquals("a%0Ab", this.escaper.escapeKey("a\nb").data);
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/util/SimpleRateLimiterTest.java b/dd-trace-core/src/test/java/datadog/trace/core/util/SimpleRateLimiterTest.java
index 4ab8c9a2c4b..d2de01b3727 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/util/SimpleRateLimiterTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/util/SimpleRateLimiterTest.java
@@ -10,52 +10,52 @@
 
 class SimpleRateLimiterTest {
 
-  @ParameterizedTest
-  @ValueSource(ints = {10, 100, 1000})
-  void initialRateAvailableAtCreation(int rate) {
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    SimpleRateLimiter limiter = new SimpleRateLimiter(rate, timeSource);
-
-    for (int i = 0; i < rate; i++) {
-      assertTrue(limiter.tryAcquire(), "failed for " + i);
+    @ParameterizedTest
+    @ValueSource(ints = {10, 100, 1000})
+    void initialRateAvailableAtCreation(int rate) {
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        SimpleRateLimiter limiter = new SimpleRateLimiter(rate, timeSource);
+
+        for (int i = 0; i < rate; i++) {
+            assertTrue(limiter.tryAcquire(), "failed for " + i);
+        }
+
+        assertFalse(limiter.tryAcquire());
     }
 
-    assertFalse(limiter.tryAcquire());
-  }
+    @ParameterizedTest
+    @ValueSource(ints = {10, 100, 1000})
+    void tokensNeverGoBeyondRate(int rate) {
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        SimpleRateLimiter limiter = new SimpleRateLimiter(rate, timeSource);
 
-  @ParameterizedTest
-  @ValueSource(ints = {10, 100, 1000})
-  void tokensNeverGoBeyondRate(int rate) {
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    SimpleRateLimiter limiter = new SimpleRateLimiter(rate, timeSource);
+        timeSource.advance(TimeUnit.SECONDS.toNanos(5));
+        for (int i = 0; i < rate; i++) {
+            assertTrue(limiter.tryAcquire(), "failed for " + i);
+        }
 
-    timeSource.advance(TimeUnit.SECONDS.toNanos(5));
-    for (int i = 0; i < rate; i++) {
-      assertTrue(limiter.tryAcquire(), "failed for " + i);
+        assertFalse(limiter.tryAcquire());
     }
 
-    assertFalse(limiter.tryAcquire());
-  }
+    @ParameterizedTest
+    @ValueSource(ints = {10, 100, 1000})
+    void tokensAreConsumedAndReplenished(int rate) {
+        ControllableTimeSource timeSource = new ControllableTimeSource();
+        SimpleRateLimiter limiter = new SimpleRateLimiter(rate, timeSource);
+        long nanosIncrement = TimeUnit.SECONDS.toNanos(1) / (rate + 1) + 1;
 
-  @ParameterizedTest
-  @ValueSource(ints = {10, 100, 1000})
-  void tokensAreConsumedAndReplenished(int rate) {
-    ControllableTimeSource timeSource = new ControllableTimeSource();
-    SimpleRateLimiter limiter = new SimpleRateLimiter(rate, timeSource);
-    long nanosIncrement = TimeUnit.SECONDS.toNanos(1) / (rate + 1) + 1;
+        for (int i = 0; i < rate; i++) {
+            timeSource.advance(nanosIncrement);
+            assertTrue(limiter.tryAcquire(), "failed for " + i);
+        }
 
-    for (int i = 0; i < rate; i++) {
-      timeSource.advance(nanosIncrement);
-      assertTrue(limiter.tryAcquire(), "failed for " + i);
-    }
+        assertFalse(limiter.tryAcquire());
 
-    assertFalse(limiter.tryAcquire());
+        for (int i = 0; i < rate; i++) {
+            timeSource.advance(nanosIncrement);
+            assertTrue(limiter.tryAcquire(), "failed for " + i);
+        }
 
-    for (int i = 0; i < rate; i++) {
-      timeSource.advance(nanosIncrement);
-      assertTrue(limiter.tryAcquire(), "failed for " + i);
+        assertFalse(limiter.tryAcquire());
     }
-
-    assertFalse(limiter.tryAcquire());
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/util/StackTracesTest.java b/dd-trace-core/src/test/java/datadog/trace/core/util/StackTracesTest.java
index d7d9b045735..7edd3a9d717 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/util/StackTracesTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/util/StackTracesTest.java
@@ -13,235 +13,229 @@
 
 class StackTracesTest {
 
-  private static final String TRACE =
-      "\n"
-          + "Exception in thread \"main\" com.example.app.MainException: Unexpected application failure\n"
-          + "    at com.example.app.Application$Runner.run(Application.java:102)\n"
-          + "    at com.example.app.Application.lambda$start$0(Application.java:75)\n"
-          + "    at java.base/java.util.Optional.ifPresent(Optional.java:178)\n"
-          + "    at com.example.app.Application.start(Application.java:74)\n"
-          + "    at com.example.app.Main.main(Main.java:21)\n"
-          + "    at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n"
-          + "    at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n"
-          + "    at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n"
-          + "    at java.base/java.lang.reflect.Method.invoke(Method.java:566)\n"
-          + "    at com.example.launcher.Bootstrap.run(Bootstrap.java:39)\n"
-          + "    at com.example.launcher.Bootstrap.main(Bootstrap.java:25)\n"
-          + "    at com.example.internal.$Proxy1.start(Unknown Source)\n"
-          + "    at com.example.internal.Initializer$1.run(Initializer.java:47)\n"
-          + "    at com.example.internal.Initializer.lambda$init$0(Initializer.java:38)\n"
-          + "    at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515)\n"
-          + "    at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)\n"
-          + "    at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)\n"
-          + "    at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)\n"
-          + "    at java.base/java.lang.Thread.run(Thread.java:834)\n"
-          + "    at com.example.synthetic.Helper.access$100(Helper.java:14)\n"
-          + "Caused by: com.example.db.DatabaseException: Failed to load user data\n"
-          + "    at com.example.db.UserDao.findUser(UserDao.java:88)\n"
-          + "    at com.example.db.UserDao.lambda$cacheLookup$1(UserDao.java:64)\n"
-          + "    at com.example.cache.Cache$Entry.computeIfAbsent(Cache.java:111)\n"
-          + "    at com.example.cache.Cache.get(Cache.java:65)\n"
-          + "    at com.example.service.UserService.loadUser(UserService.java:42)\n"
-          + "    at com.example.service.UserService.lambda$loadUserAsync$0(UserService.java:36)\n"
-          + "    at com.example.util.SafeRunner.run(SafeRunner.java:27)\n"
-          + "    at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515)\n"
-          + "    at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)\n"
-          + "    at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)\n"
-          + "    at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)\n"
-          + "    at java.base/java.lang.Thread.run(Thread.java:834)\n"
-          + "    at com.example.synthetic.UserDao$1.run(UserDao.java:94)\n"
-          + "    at com.example.synthetic.UserDao$1.run(UserDao.java:94)\n"
-          + "    at com.example.db.ConnectionManager.getConnection(ConnectionManager.java:55)\n"
-          + "Suppressed: java.io.IOException: Resource cleanup failed\n"
-          + "    at com.example.util.ResourceManager.close(ResourceManager.java:23)\n"
-          + "    at com.example.service.UserService.lambda$loadUserAsync$0(UserService.java:38)\n"
-          + "    ... 3 more\n"
-          + "Caused by: java.nio.file.AccessDeniedException: /data/user/config.json\n"
-          + "    at java.base/sun.nio.fs.UnixException.translateToIOException(UnixException.java:90)\n"
-          + "    at java.base/sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:111)\n"
-          + "    at java.base/sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:116)\n"
-          + "    at java.base/sun.nio.fs.UnixFileSystemProvider.newByteChannel(UnixFileSystemProvider.java:219)\n"
-          + "    at java.base/java.nio.file.Files.newByteChannel(Files.java:375)\n"
-          + "    at java.base/java.nio.file.Files.newInputStream(Files.java:489)\n"
-          + "    at com.example.util.FileUtils.readFile(FileUtils.java:22)\n"
-          + "    at com.example.util.ResourceManager.close(ResourceManager.java:21)\n"
-          + "    ... 3 more\n";
-
-  // --- safeGetMessage ---
-
-  @Test
-  void safeGetMessageReturnsFallbackWhenGetMessageThrows() {
-    String message = StackTraces.safeGetMessage(TestThrowables.throwingGetMessage());
-    assertTrue(
-        message.contains("Exception message unavailable"), "must indicate message is unavailable");
-    assertTrue(
-        message.contains("IllegalArgumentException"), "must include secondary exception type");
-  }
-
-  @Test
-  void safeGetMessageReturnsNullForNullInput() {
-    assertNull(StackTraces.safeGetMessage(null));
-  }
-
-  @Test
-  void getStackTraceFallsBackWhenPrintStackTraceThrowsStackOverflowError() {
-    String trace =
-        StackTraces.getStackTrace(TestThrowables.throwingStackOverflowOnPrintStackTrace(), 1000);
-    assertTrue(trace.contains("TestThrowables"), "must fall back to a locatable trace");
-  }
-
-  @Test
-  void getStackTraceFallsBackToClassNameAndMessageWhenEverythingElseThrows() {
-    String trace =
-        StackTraces.getStackTrace(
-            TestThrowables.throwingStackOverflowEverywhereExceptGetMessage(), 1000);
-    assertTrue(trace.contains("TestThrowables"), "must include the throwable's class name");
-    assertTrue(trace.contains("still readable"), "must include the throwable's message");
-  }
-
-  @Test
-  void getStackTraceFallsBackToClassNameWhenGetMessageAlsoThrows() {
-    String trace =
-        StackTraces.getStackTrace(TestThrowables.throwingStackOverflowEverywhere(), 1000);
-    assertEquals(trace, TestThrowables.throwingStackOverflowEverywhere().getClass().getName());
-  }
-
-  // --- getStackTrace with broken getMessage ---
-
-  @ParameterizedTest(name = "truncation limit {0}")
-  @MethodSource("testTruncateArguments")
-  void testTruncate(int limit, String expected) {
-    assertEquals(expected, StackTraces.truncate(TRACE, limit));
-  }
-
-  static Stream<Arguments> testTruncateArguments() {
-    return Stream.of(
-        arguments(1000, expected1000()),
-        arguments(2500, expected2500()),
-        arguments(3000, expected3000()));
-  }
-
-  private static String expected1000() {
-    return "\n"
-        + "Exception in thread \"main\" com.example.app.MainException: Unexpected application failure\n"
-        + "\tat c.e.a.Application$Runner.run(Application.java:102)\n"
-        + "\tat c.e.a.Application.lambda$start$0(Application.java:75)\n"
-        + "\tat j.b.u.Optional.ifPresent(Optional.java:178)\n"
-        + "\tat c.e.a.Application.start(Application.java:74)\n"
-        + "\tat c.e.a.Main.main(Main.java:21)\n"
-        + "\tat s.r.NativeMethodAccessorImpl.invoke0(Native Method)\n"
-        + "\tat s.r.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n"
-        + "\tat s.r.Delegat\n"
-        + "\t... trace centre-cut to 1000 chars ...\n"
-        + "ToIOException(UnixException.java:90)\n"
-        + "\tat j.b.n.f.UnixException.rethrowAsIOException(UnixException.java:111)\n"
-        + "\tat j.b.n.f.UnixException.rethrowAsIOException(UnixException.java:116)\n"
-        + "\tat j.b.n.f.UnixFileSystemProvider.newByteChannel(UnixFileSystemProvider.java:219)\n"
-        + "\tat j.b.n.f.Files.newByteChannel(Files.java:375)\n"
-        + "\tat j.b.n.f.Files.newInputStream(Files.java:489)\n"
-        + "\tat c.e.u.FileUtils.readFile(FileUtils.java:22)\n"
-        + "\tat c.e.u.ResourceManager.close(ResourceManager.java:21)\n"
-        + "    ... 3 more\n";
-  }
-
-  private static String expected2500() {
-    return "\n"
-        + "Exception in thread \"main\" com.example.app.MainException: Unexpected application failure\n"
-        + "\tat c.e.a.Application$Runner.run(Application.java:102)\n"
-        + "\tat c.e.a.Application.lambda$start$0(Application.java:75)\n"
-        + "\tat j.b.u.Optional.ifPresent(Optional.java:178)\n"
-        + "\tat c.e.a.Application.start(Application.java:74)\n"
-        + "\tat c.e.a.Main.main(Main.java:21)\n"
-        + "\tat s.r.NativeMethodAccessorImpl.invoke0(Native Method)\n"
-        + "\tat s.r.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n"
-        + "\tat s.r.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n"
-        + "\t... 8 trimmed ...\n"
-        + "\tat j.b.u.c.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)\n"
-        + "\tat j.b.u.c.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)\n"
-        + "\tat j.b.l.Thread.run(Thread.java:834)\n"
-        + "\tat c.e.s.Helper.access$100(Helper.java:14)\n"
-        + "Caused by: com.example.db.DatabaseException: Failed to load user data\n"
-        + "\tat c.e.d.UserDao.findUser(UserDao.java:88)\n"
-        + "\tat c.e.d.UserDao.lambda$cacheLookup$1(UserDao.java:64)\n"
-        + "\tat c.e.c.Cache$Entry.computeIfAbsent(Cache.java:111)\n"
-        + "\tat c.e.c.Cache.get(Cache.java:65)\n"
-        + "\tat c.e.s.UserService.loadUser(UserService.java:42)\n"
-        + "\tat c.e.s.UserService.lambda$loadUserAsync$0(UserService.java:36)\n"
-        + "\tat c.e.u.SafeRunner.run(SafeRunner.java:27)\n"
-        + "\tat j.b.u.c.Executors$RunnableAdapter.call(Executors.java:515)\n"
-        + "\t... 3 trimmed ...\n"
-        + "\tat j.b.l.Thread.run(Thread.java:834)\n"
-        + "\tat c.e.s.UserDao$1.run(UserDao.java:94)\n"
-        + "\tat c.e.s.UserDao$1.run(UserDao.java:94)\n"
-        + "\tat c.e.d.ConnectionManager.getConnection(ConnectionManager.java:55)\n"
-        + "Suppressed: java.io.IOException: Resource cleanup failed\n"
-        + "\tat c.e.u.ResourceManager.close(ResourceManager.java:23)\n"
-        + "\tat c.e.s.UserService.lambda$loadUserAsync$0(UserService.java:38)\n"
-        + "    ... 3 more\n"
-        + "Caused by: java.nio.file.AccessDeniedException: /data/user/config.json\n"
-        + "\tat j.b.n.f.UnixException.translateToIOException(UnixException.java:90)\n"
-        + "\tat j.b.n.f.UnixException.rethrowAsIOException(UnixException.java:111)\n"
-        + "\tat j.b.n.f.UnixException.rethrowAsIOException(UnixException.java:116)\n"
-        + "\tat j.b.n.f.UnixFileSystemProvider.newByteChannel(UnixFileSystemProvider.java:219)\n"
-        + "\tat j.b.n.f.Files.newByteChannel(Files.java:375)\n"
-        + "\tat j.b.n.f.Files.newInputStream(Files.java:489)\n"
-        + "\tat c.e.u.FileUtils.readFile(FileUtils.java:22)\n"
-        + "\tat c.e.u.ResourceManager.close(ResourceManager.java:21)\n"
-        + "    ... 3 more\n";
-  }
-
-  private static String expected3000() {
-    return "\n"
-        + "Exception in thread \"main\" com.example.app.MainException: Unexpected application failure\n"
-        + "\tat c.e.a.Application$Runner.run(Application.java:102)\n"
-        + "\tat c.e.a.Application.lambda$start$0(Application.java:75)\n"
-        + "\tat j.b.u.Optional.ifPresent(Optional.java:178)\n"
-        + "\tat c.e.a.Application.start(Application.java:74)\n"
-        + "\tat c.e.a.Main.main(Main.java:21)\n"
-        + "\tat s.r.NativeMethodAccessorImpl.invoke0(Native Method)\n"
-        + "\tat s.r.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n"
-        + "\tat s.r.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n"
-        + "\tat j.b.l.r.Method.invoke(Method.java:566)\n"
-        + "\tat c.e.l.Bootstrap.run(Bootstrap.java:39)\n"
-        + "\tat c.e.l.Bootstrap.main(Bootstrap.java:25)\n"
-        + "\tat c.e.i.$Proxy1.start(Unknown Source)\n"
-        + "\tat c.e.i.Initializer$1.run(Initializer.java:47)\n"
-        + "\tat c.e.i.Initializer.lambda$init$0(Initializer.java:38)\n"
-        + "\tat j.b.u.c.Executors$RunnableAdapter.call(Executors.java:515)\n"
-        + "\tat j.b.u.c.FutureTask.run(FutureTask.java:264)\n"
-        + "\tat j.b.u.c.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)\n"
-        + "\tat j.b.u.c.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)\n"
-        + "\tat j.b.l.Thread.run(Thread.java:834)\n"
-        + "\tat c.e.s.Helper.access$100(Helper.java:14)\n"
-        + "Caused by: com.example.db.DatabaseException: Failed to load user data\n"
-        + "\tat c.e.d.UserDao.findUser(UserDao.java:88)\n"
-        + "\tat c.e.d.UserDao.lambda$cacheLookup$1(UserDao.java:64)\n"
-        + "\tat c.e.c.Cache$Entry.computeIfAbsent(Cache.java:111)\n"
-        + "\tat c.e.c.Cache.get(Cache.java:65)\n"
-        + "\tat c.e.s.UserService.loadUser(UserService.java:42)\n"
-        + "\tat c.e.s.UserService.lambda$loadUserAsync$0(UserService.java:36)\n"
-        + "\tat c.e.u.SafeRunner.run(SafeRunner.java:27)\n"
-        + "\tat j.b.u.c.Executors$RunnableAdapter.call(Executors.java:515)\n"
-        + "\tat j.b.u.c.FutureTask.run(FutureTask.java:264)\n"
-        + "\tat j.b.u.c.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)\n"
-        + "\tat j.b.u.c.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)\n"
-        + "\tat j.b.l.Thread.run(Thread.java:834)\n"
-        + "\tat c.e.s.UserDao$1.run(UserDao.java:94)\n"
-        + "\tat c.e.s.UserDao$1.run(UserDao.java:94)\n"
-        + "\tat c.e.d.ConnectionManager.getConnection(ConnectionManager.java:55)\n"
-        + "Suppressed: java.io.IOException: Resource cleanup failed\n"
-        + "\tat c.e.u.ResourceManager.close(ResourceManager.java:23)\n"
-        + "\tat c.e.s.UserService.lambda$loadUserAsync$0(UserService.java:38)\n"
-        + "    ... 3 more\n"
-        + "Caused by: java.nio.file.AccessDeniedException: /data/user/config.json\n"
-        + "\tat j.b.n.f.UnixException.translateToIOException(UnixException.java:90)\n"
-        + "\tat j.b.n.f.UnixException.rethrowAsIOException(UnixException.java:111)\n"
-        + "\tat j.b.n.f.UnixException.rethrowAsIOException(UnixException.java:116)\n"
-        + "\tat j.b.n.f.UnixFileSystemProvider.newByteChannel(UnixFileSystemProvider.java:219)\n"
-        + "\tat j.b.n.f.Files.newByteChannel(Files.java:375)\n"
-        + "\tat j.b.n.f.Files.newInputStream(Files.java:489)\n"
-        + "\tat c.e.u.FileUtils.readFile(FileUtils.java:22)\n"
-        + "\tat c.e.u.ResourceManager.close(ResourceManager.java:21)\n"
-        + "    ... 3 more\n";
-  }
+    private static final String TRACE = "\n"
+            + "Exception in thread \"main\" com.example.app.MainException: Unexpected application failure\n"
+            + "    at com.example.app.Application$Runner.run(Application.java:102)\n"
+            + "    at com.example.app.Application.lambda$start$0(Application.java:75)\n"
+            + "    at java.base/java.util.Optional.ifPresent(Optional.java:178)\n"
+            + "    at com.example.app.Application.start(Application.java:74)\n"
+            + "    at com.example.app.Main.main(Main.java:21)\n"
+            + "    at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n"
+            + "    at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n"
+            + "    at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n"
+            + "    at java.base/java.lang.reflect.Method.invoke(Method.java:566)\n"
+            + "    at com.example.launcher.Bootstrap.run(Bootstrap.java:39)\n"
+            + "    at com.example.launcher.Bootstrap.main(Bootstrap.java:25)\n"
+            + "    at com.example.internal.$Proxy1.start(Unknown Source)\n"
+            + "    at com.example.internal.Initializer$1.run(Initializer.java:47)\n"
+            + "    at com.example.internal.Initializer.lambda$init$0(Initializer.java:38)\n"
+            + "    at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515)\n"
+            + "    at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)\n"
+            + "    at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)\n"
+            + "    at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)\n"
+            + "    at java.base/java.lang.Thread.run(Thread.java:834)\n"
+            + "    at com.example.synthetic.Helper.access$100(Helper.java:14)\n"
+            + "Caused by: com.example.db.DatabaseException: Failed to load user data\n"
+            + "    at com.example.db.UserDao.findUser(UserDao.java:88)\n"
+            + "    at com.example.db.UserDao.lambda$cacheLookup$1(UserDao.java:64)\n"
+            + "    at com.example.cache.Cache$Entry.computeIfAbsent(Cache.java:111)\n"
+            + "    at com.example.cache.Cache.get(Cache.java:65)\n"
+            + "    at com.example.service.UserService.loadUser(UserService.java:42)\n"
+            + "    at com.example.service.UserService.lambda$loadUserAsync$0(UserService.java:36)\n"
+            + "    at com.example.util.SafeRunner.run(SafeRunner.java:27)\n"
+            + "    at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515)\n"
+            + "    at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)\n"
+            + "    at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)\n"
+            + "    at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)\n"
+            + "    at java.base/java.lang.Thread.run(Thread.java:834)\n"
+            + "    at com.example.synthetic.UserDao$1.run(UserDao.java:94)\n"
+            + "    at com.example.synthetic.UserDao$1.run(UserDao.java:94)\n"
+            + "    at com.example.db.ConnectionManager.getConnection(ConnectionManager.java:55)\n"
+            + "Suppressed: java.io.IOException: Resource cleanup failed\n"
+            + "    at com.example.util.ResourceManager.close(ResourceManager.java:23)\n"
+            + "    at com.example.service.UserService.lambda$loadUserAsync$0(UserService.java:38)\n"
+            + "    ... 3 more\n"
+            + "Caused by: java.nio.file.AccessDeniedException: /data/user/config.json\n"
+            + "    at java.base/sun.nio.fs.UnixException.translateToIOException(UnixException.java:90)\n"
+            + "    at java.base/sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:111)\n"
+            + "    at java.base/sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:116)\n"
+            + "    at java.base/sun.nio.fs.UnixFileSystemProvider.newByteChannel(UnixFileSystemProvider.java:219)\n"
+            + "    at java.base/java.nio.file.Files.newByteChannel(Files.java:375)\n"
+            + "    at java.base/java.nio.file.Files.newInputStream(Files.java:489)\n"
+            + "    at com.example.util.FileUtils.readFile(FileUtils.java:22)\n"
+            + "    at com.example.util.ResourceManager.close(ResourceManager.java:21)\n"
+            + "    ... 3 more\n";
+
+    // --- safeGetMessage ---
+
+    @Test
+    void safeGetMessageReturnsFallbackWhenGetMessageThrows() {
+        String message = StackTraces.safeGetMessage(TestThrowables.throwingGetMessage());
+        assertTrue(message.contains("Exception message unavailable"), "must indicate message is unavailable");
+        assertTrue(message.contains("IllegalArgumentException"), "must include secondary exception type");
+    }
+
+    @Test
+    void safeGetMessageReturnsNullForNullInput() {
+        assertNull(StackTraces.safeGetMessage(null));
+    }
+
+    @Test
+    void getStackTraceFallsBackWhenPrintStackTraceThrowsStackOverflowError() {
+        String trace = StackTraces.getStackTrace(TestThrowables.throwingStackOverflowOnPrintStackTrace(), 1000);
+        assertTrue(trace.contains("TestThrowables"), "must fall back to a locatable trace");
+    }
+
+    @Test
+    void getStackTraceFallsBackToClassNameAndMessageWhenEverythingElseThrows() {
+        String trace =
+                StackTraces.getStackTrace(TestThrowables.throwingStackOverflowEverywhereExceptGetMessage(), 1000);
+        assertTrue(trace.contains("TestThrowables"), "must include the throwable's class name");
+        assertTrue(trace.contains("still readable"), "must include the throwable's message");
+    }
+
+    @Test
+    void getStackTraceFallsBackToClassNameWhenGetMessageAlsoThrows() {
+        String trace = StackTraces.getStackTrace(TestThrowables.throwingStackOverflowEverywhere(), 1000);
+        assertEquals(
+                trace,
+                TestThrowables.throwingStackOverflowEverywhere().getClass().getName());
+    }
+
+    // --- getStackTrace with broken getMessage ---
+
+    @ParameterizedTest(name = "truncation limit {0}")
+    @MethodSource("testTruncateArguments")
+    void testTruncate(int limit, String expected) {
+        assertEquals(expected, StackTraces.truncate(TRACE, limit));
+    }
+
+    static Stream<Arguments> testTruncateArguments() {
+        return Stream.of(
+                arguments(1000, expected1000()), arguments(2500, expected2500()), arguments(3000, expected3000()));
+    }
+
+    private static String expected1000() {
+        return "\n"
+                + "Exception in thread \"main\" com.example.app.MainException: Unexpected application failure\n"
+                + "\tat c.e.a.Application$Runner.run(Application.java:102)\n"
+                + "\tat c.e.a.Application.lambda$start$0(Application.java:75)\n"
+                + "\tat j.b.u.Optional.ifPresent(Optional.java:178)\n"
+                + "\tat c.e.a.Application.start(Application.java:74)\n"
+                + "\tat c.e.a.Main.main(Main.java:21)\n"
+                + "\tat s.r.NativeMethodAccessorImpl.invoke0(Native Method)\n"
+                + "\tat s.r.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n"
+                + "\tat s.r.Delegat\n"
+                + "\t... trace centre-cut to 1000 chars ...\n"
+                + "ToIOException(UnixException.java:90)\n"
+                + "\tat j.b.n.f.UnixException.rethrowAsIOException(UnixException.java:111)\n"
+                + "\tat j.b.n.f.UnixException.rethrowAsIOException(UnixException.java:116)\n"
+                + "\tat j.b.n.f.UnixFileSystemProvider.newByteChannel(UnixFileSystemProvider.java:219)\n"
+                + "\tat j.b.n.f.Files.newByteChannel(Files.java:375)\n"
+                + "\tat j.b.n.f.Files.newInputStream(Files.java:489)\n"
+                + "\tat c.e.u.FileUtils.readFile(FileUtils.java:22)\n"
+                + "\tat c.e.u.ResourceManager.close(ResourceManager.java:21)\n"
+                + "    ... 3 more\n";
+    }
+
+    private static String expected2500() {
+        return "\n"
+                + "Exception in thread \"main\" com.example.app.MainException: Unexpected application failure\n"
+                + "\tat c.e.a.Application$Runner.run(Application.java:102)\n"
+                + "\tat c.e.a.Application.lambda$start$0(Application.java:75)\n"
+                + "\tat j.b.u.Optional.ifPresent(Optional.java:178)\n"
+                + "\tat c.e.a.Application.start(Application.java:74)\n"
+                + "\tat c.e.a.Main.main(Main.java:21)\n"
+                + "\tat s.r.NativeMethodAccessorImpl.invoke0(Native Method)\n"
+                + "\tat s.r.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n"
+                + "\tat s.r.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n"
+                + "\t... 8 trimmed ...\n"
+                + "\tat j.b.u.c.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)\n"
+                + "\tat j.b.u.c.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)\n"
+                + "\tat j.b.l.Thread.run(Thread.java:834)\n"
+                + "\tat c.e.s.Helper.access$100(Helper.java:14)\n"
+                + "Caused by: com.example.db.DatabaseException: Failed to load user data\n"
+                + "\tat c.e.d.UserDao.findUser(UserDao.java:88)\n"
+                + "\tat c.e.d.UserDao.lambda$cacheLookup$1(UserDao.java:64)\n"
+                + "\tat c.e.c.Cache$Entry.computeIfAbsent(Cache.java:111)\n"
+                + "\tat c.e.c.Cache.get(Cache.java:65)\n"
+                + "\tat c.e.s.UserService.loadUser(UserService.java:42)\n"
+                + "\tat c.e.s.UserService.lambda$loadUserAsync$0(UserService.java:36)\n"
+                + "\tat c.e.u.SafeRunner.run(SafeRunner.java:27)\n"
+                + "\tat j.b.u.c.Executors$RunnableAdapter.call(Executors.java:515)\n"
+                + "\t... 3 trimmed ...\n"
+                + "\tat j.b.l.Thread.run(Thread.java:834)\n"
+                + "\tat c.e.s.UserDao$1.run(UserDao.java:94)\n"
+                + "\tat c.e.s.UserDao$1.run(UserDao.java:94)\n"
+                + "\tat c.e.d.ConnectionManager.getConnection(ConnectionManager.java:55)\n"
+                + "Suppressed: java.io.IOException: Resource cleanup failed\n"
+                + "\tat c.e.u.ResourceManager.close(ResourceManager.java:23)\n"
+                + "\tat c.e.s.UserService.lambda$loadUserAsync$0(UserService.java:38)\n"
+                + "    ... 3 more\n"
+                + "Caused by: java.nio.file.AccessDeniedException: /data/user/config.json\n"
+                + "\tat j.b.n.f.UnixException.translateToIOException(UnixException.java:90)\n"
+                + "\tat j.b.n.f.UnixException.rethrowAsIOException(UnixException.java:111)\n"
+                + "\tat j.b.n.f.UnixException.rethrowAsIOException(UnixException.java:116)\n"
+                + "\tat j.b.n.f.UnixFileSystemProvider.newByteChannel(UnixFileSystemProvider.java:219)\n"
+                + "\tat j.b.n.f.Files.newByteChannel(Files.java:375)\n"
+                + "\tat j.b.n.f.Files.newInputStream(Files.java:489)\n"
+                + "\tat c.e.u.FileUtils.readFile(FileUtils.java:22)\n"
+                + "\tat c.e.u.ResourceManager.close(ResourceManager.java:21)\n"
+                + "    ... 3 more\n";
+    }
+
+    private static String expected3000() {
+        return "\n"
+                + "Exception in thread \"main\" com.example.app.MainException: Unexpected application failure\n"
+                + "\tat c.e.a.Application$Runner.run(Application.java:102)\n"
+                + "\tat c.e.a.Application.lambda$start$0(Application.java:75)\n"
+                + "\tat j.b.u.Optional.ifPresent(Optional.java:178)\n"
+                + "\tat c.e.a.Application.start(Application.java:74)\n"
+                + "\tat c.e.a.Main.main(Main.java:21)\n"
+                + "\tat s.r.NativeMethodAccessorImpl.invoke0(Native Method)\n"
+                + "\tat s.r.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n"
+                + "\tat s.r.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n"
+                + "\tat j.b.l.r.Method.invoke(Method.java:566)\n"
+                + "\tat c.e.l.Bootstrap.run(Bootstrap.java:39)\n"
+                + "\tat c.e.l.Bootstrap.main(Bootstrap.java:25)\n"
+                + "\tat c.e.i.$Proxy1.start(Unknown Source)\n"
+                + "\tat c.e.i.Initializer$1.run(Initializer.java:47)\n"
+                + "\tat c.e.i.Initializer.lambda$init$0(Initializer.java:38)\n"
+                + "\tat j.b.u.c.Executors$RunnableAdapter.call(Executors.java:515)\n"
+                + "\tat j.b.u.c.FutureTask.run(FutureTask.java:264)\n"
+                + "\tat j.b.u.c.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)\n"
+                + "\tat j.b.u.c.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)\n"
+                + "\tat j.b.l.Thread.run(Thread.java:834)\n"
+                + "\tat c.e.s.Helper.access$100(Helper.java:14)\n"
+                + "Caused by: com.example.db.DatabaseException: Failed to load user data\n"
+                + "\tat c.e.d.UserDao.findUser(UserDao.java:88)\n"
+                + "\tat c.e.d.UserDao.lambda$cacheLookup$1(UserDao.java:64)\n"
+                + "\tat c.e.c.Cache$Entry.computeIfAbsent(Cache.java:111)\n"
+                + "\tat c.e.c.Cache.get(Cache.java:65)\n"
+                + "\tat c.e.s.UserService.loadUser(UserService.java:42)\n"
+                + "\tat c.e.s.UserService.lambda$loadUserAsync$0(UserService.java:36)\n"
+                + "\tat c.e.u.SafeRunner.run(SafeRunner.java:27)\n"
+                + "\tat j.b.u.c.Executors$RunnableAdapter.call(Executors.java:515)\n"
+                + "\tat j.b.u.c.FutureTask.run(FutureTask.java:264)\n"
+                + "\tat j.b.u.c.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)\n"
+                + "\tat j.b.u.c.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)\n"
+                + "\tat j.b.l.Thread.run(Thread.java:834)\n"
+                + "\tat c.e.s.UserDao$1.run(UserDao.java:94)\n"
+                + "\tat c.e.s.UserDao$1.run(UserDao.java:94)\n"
+                + "\tat c.e.d.ConnectionManager.getConnection(ConnectionManager.java:55)\n"
+                + "Suppressed: java.io.IOException: Resource cleanup failed\n"
+                + "\tat c.e.u.ResourceManager.close(ResourceManager.java:23)\n"
+                + "\tat c.e.s.UserService.lambda$loadUserAsync$0(UserService.java:38)\n"
+                + "    ... 3 more\n"
+                + "Caused by: java.nio.file.AccessDeniedException: /data/user/config.json\n"
+                + "\tat j.b.n.f.UnixException.translateToIOException(UnixException.java:90)\n"
+                + "\tat j.b.n.f.UnixException.rethrowAsIOException(UnixException.java:111)\n"
+                + "\tat j.b.n.f.UnixException.rethrowAsIOException(UnixException.java:116)\n"
+                + "\tat j.b.n.f.UnixFileSystemProvider.newByteChannel(UnixFileSystemProvider.java:219)\n"
+                + "\tat j.b.n.f.Files.newByteChannel(Files.java:375)\n"
+                + "\tat j.b.n.f.Files.newInputStream(Files.java:489)\n"
+                + "\tat c.e.u.FileUtils.readFile(FileUtils.java:22)\n"
+                + "\tat c.e.u.ResourceManager.close(ResourceManager.java:21)\n"
+                + "    ... 3 more\n";
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/util/SystemAccessTest.java b/dd-trace-core/src/test/java/datadog/trace/core/util/SystemAccessTest.java
index 0f549c07cea..5d45d14f4cf 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/util/SystemAccessTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/util/SystemAccessTest.java
@@ -13,53 +13,50 @@
 
 class SystemAccessTest extends DDJavaSpecification {
 
-  @AfterEach
-  void cleanupJmx() {
-    SystemAccess.disableJmx();
-  }
-
-  @TableTest({
-    "scenario                               | providerEnabled | profilingEnabled | healthMetricsEnabled | hasCpuTime",
-    "all disabled                           | false           | false            | false                | false     ",
-    "health metrics only                    | false           | false            | true                 | false     ",
-    "profiling only                         | false           | true             | false                | false     ",
-    "profiling and health metrics           | false           | true             | true                 | false     ",
-    "provider only                          | true            | false            | false                | false     ",
-    "provider and health metrics            | true            | false            | true                 | true      ",
-    "provider and profiling                 | true            | true             | false                | true      ",
-    "provider, profiling and health metrics | true            | true             | true                 | true      "
-  })
-  void testCpuTime(
-      boolean providerEnabled,
-      boolean profilingEnabled,
-      boolean healthMetricsEnabled,
-      boolean hasCpuTime) {
-    injectSysConfig(PROFILING_ENABLED, String.valueOf(profilingEnabled));
-    injectSysConfig(HEALTH_METRICS_ENABLED, String.valueOf(healthMetricsEnabled));
-
-    if (providerEnabled) {
-      SystemAccess.enableJmx();
-    } else {
-      SystemAccess.disableJmx();
+    @AfterEach
+    void cleanupJmx() {
+        SystemAccess.disableJmx();
     }
 
-    long threadCpuTime1 = SystemAccess.getCurrentThreadCpuTime();
-    // burn some cpu
-    int sum = 0;
-    for (int i = 0; i < 10_000; i++) {
-      sum += i;
-    }
-    long threadCpuTime2 = SystemAccess.getCurrentThreadCpuTime();
-
-    assertTrue(sum > 0);
-
-    if (hasCpuTime) {
-      assertNotEquals(Long.MIN_VALUE, threadCpuTime1);
-      assertNotEquals(Long.MIN_VALUE, threadCpuTime2);
-      assertTrue(threadCpuTime2 > threadCpuTime1);
-    } else {
-      assertEquals(Long.MIN_VALUE, threadCpuTime1);
-      assertEquals(Long.MIN_VALUE, threadCpuTime2);
+    @TableTest({
+      "scenario                               | providerEnabled | profilingEnabled | healthMetricsEnabled | hasCpuTime",
+      "all disabled                           | false           | false            | false                | false     ",
+      "health metrics only                    | false           | false            | true                 | false     ",
+      "profiling only                         | false           | true             | false                | false     ",
+      "profiling and health metrics           | false           | true             | true                 | false     ",
+      "provider only                          | true            | false            | false                | false     ",
+      "provider and health metrics            | true            | false            | true                 | true      ",
+      "provider and profiling                 | true            | true             | false                | true      ",
+      "provider, profiling and health metrics | true            | true             | true                 | true      "
+    })
+    void testCpuTime(
+            boolean providerEnabled, boolean profilingEnabled, boolean healthMetricsEnabled, boolean hasCpuTime) {
+        injectSysConfig(PROFILING_ENABLED, String.valueOf(profilingEnabled));
+        injectSysConfig(HEALTH_METRICS_ENABLED, String.valueOf(healthMetricsEnabled));
+
+        if (providerEnabled) {
+            SystemAccess.enableJmx();
+        } else {
+            SystemAccess.disableJmx();
+        }
+
+        long threadCpuTime1 = SystemAccess.getCurrentThreadCpuTime();
+        // burn some cpu
+        int sum = 0;
+        for (int i = 0; i < 10_000; i++) {
+            sum += i;
+        }
+        long threadCpuTime2 = SystemAccess.getCurrentThreadCpuTime();
+
+        assertTrue(sum > 0);
+
+        if (hasCpuTime) {
+            assertNotEquals(Long.MIN_VALUE, threadCpuTime1);
+            assertNotEquals(Long.MIN_VALUE, threadCpuTime2);
+            assertTrue(threadCpuTime2 > threadCpuTime1);
+        } else {
+            assertEquals(Long.MIN_VALUE, threadCpuTime1);
+            assertEquals(Long.MIN_VALUE, threadCpuTime2);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/core/util/TestThrowables.java b/dd-trace-core/src/test/java/datadog/trace/core/util/TestThrowables.java
index c18ac746940..3af20035fd6 100644
--- a/dd-trace-core/src/test/java/datadog/trace/core/util/TestThrowables.java
+++ b/dd-trace-core/src/test/java/datadog/trace/core/util/TestThrowables.java
@@ -4,80 +4,80 @@
 
 /** Test helpers for throwables with non-standard {@code getMessage()} behaviour. */
 public final class TestThrowables {
-  private TestThrowables() {}
+    private TestThrowables() {}
 
-  /**
-   * Returns a {@link RuntimeException} whose {@link Throwable#getMessage()} throws {@link
-   * IllegalArgumentException} via {@link MessageFormat} with non-integer placeholders — simulating
-   * the third-party exception that triggered the production bug in {@code DDSpan.addThrowable}.
-   */
-  public static RuntimeException throwingGetMessage() {
-    return new RuntimeException() {
-      @Override
-      public String getMessage() {
-        return MessageFormat.format(
-            "Timeout after {TotalMilliseconds}ms matching pattern {Pattern}", "arg0", "arg1");
-      }
-    };
-  }
+    /**
+     * Returns a {@link RuntimeException} whose {@link Throwable#getMessage()} throws {@link
+     * IllegalArgumentException} via {@link MessageFormat} with non-integer placeholders — simulating
+     * the third-party exception that triggered the production bug in {@code DDSpan.addThrowable}.
+     */
+    public static RuntimeException throwingGetMessage() {
+        return new RuntimeException() {
+            @Override
+            public String getMessage() {
+                return MessageFormat.format(
+                        "Timeout after {TotalMilliseconds}ms matching pattern {Pattern}", "arg0", "arg1");
+            }
+        };
+    }
 
-  /**
-   * Returns a {@link RuntimeException} whose {@link Throwable#printStackTrace(java.io.PrintWriter)}
-   * throws a {@link StackOverflowError} — simulating a second overflow while formatting a throwable
-   * that was itself caught with little remaining stack margin.
-   */
-  public static RuntimeException throwingStackOverflowOnPrintStackTrace() {
-    return new RuntimeException() {
-      @Override
-      public void printStackTrace(java.io.PrintWriter s) {
-        throw new StackOverflowError();
-      }
-    };
-  }
+    /**
+     * Returns a {@link RuntimeException} whose {@link Throwable#printStackTrace(java.io.PrintWriter)}
+     * throws a {@link StackOverflowError} — simulating a second overflow while formatting a throwable
+     * that was itself caught with little remaining stack margin.
+     */
+    public static RuntimeException throwingStackOverflowOnPrintStackTrace() {
+        return new RuntimeException() {
+            @Override
+            public void printStackTrace(java.io.PrintWriter s) {
+                throw new StackOverflowError();
+            }
+        };
+    }
 
-  /**
-   * Returns a {@link RuntimeException} whose {@link Throwable#printStackTrace(java.io.PrintWriter)}
-   * and {@link Throwable#getStackTrace()} both throw {@link StackOverflowError} — simulating a
-   * throwable caught with essentially no remaining stack margin, where even the array-based
-   * fallback in {@link StackTraces#getStackTrace} fails and only {@link Throwable#getMessage()}
-   * remains callable.
-   */
-  public static RuntimeException throwingStackOverflowEverywhereExceptGetMessage() {
-    return new RuntimeException("still readable") {
-      @Override
-      public void printStackTrace(java.io.PrintWriter s) {
-        throw new StackOverflowError();
-      }
+    /**
+     * Returns a {@link RuntimeException} whose {@link Throwable#printStackTrace(java.io.PrintWriter)}
+     * and {@link Throwable#getStackTrace()} both throw {@link StackOverflowError} — simulating a
+     * throwable caught with essentially no remaining stack margin, where even the array-based
+     * fallback in {@link StackTraces#getStackTrace} fails and only {@link Throwable#getMessage()}
+     * remains callable.
+     */
+    public static RuntimeException throwingStackOverflowEverywhereExceptGetMessage() {
+        return new RuntimeException("still readable") {
+            @Override
+            public void printStackTrace(java.io.PrintWriter s) {
+                throw new StackOverflowError();
+            }
 
-      @Override
-      public StackTraceElement[] getStackTrace() {
-        throw new StackOverflowError();
-      }
-    };
-  }
+            @Override
+            public StackTraceElement[] getStackTrace() {
+                throw new StackOverflowError();
+            }
+        };
+    }
 
-  /**
-   * Returns a {@link RuntimeException} whose {@link
-   * Throwable#printStackTrace(java.io.PrintWriter)}, {@link Throwable#getStackTrace()}, and {@link
-   * Throwable#getMessage()} all throw {@link StackOverflowError} — the worst case, where {@link
-   * StackTraces#getStackTrace} must fall back to just the throwable's class name.
-   */
-  public static RuntimeException throwingStackOverflowEverywhere() {
-    return new RuntimeException() {
-      @Override
-      public void printStackTrace(java.io.PrintWriter s) {
-        throw new StackOverflowError();
-      }
+    /**
+     * Returns a {@link RuntimeException} whose {@link
+     * Throwable#printStackTrace(java.io.PrintWriter)}, {@link Throwable#getStackTrace()}, and {@link
+     * Throwable#getMessage()} all throw {@link StackOverflowError} — the worst case, where {@link
+     * StackTraces#getStackTrace} must fall back to just the throwable's class name.
+     */
+    public static RuntimeException throwingStackOverflowEverywhere() {
+        return new RuntimeException() {
+            @Override
+            public void printStackTrace(java.io.PrintWriter s) {
+                throw new StackOverflowError();
+            }
 
-      @Override
-      public StackTraceElement[] getStackTrace() {
-        throw new StackOverflowError();
-      }
+            @Override
+            public StackTraceElement[] getStackTrace() {
+                throw new StackOverflowError();
+            }
 
-      @Override
-      public String getMessage() {
-        throw new StackOverflowError();
-      }
-    };
-  }
+            @Override
+            public String getMessage() {
+                throw new StackOverflowError();
+            }
+        };
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/lambda/ContentTypeBodyParserTest.java b/dd-trace-core/src/test/java/datadog/trace/lambda/ContentTypeBodyParserTest.java
index 3c281c49636..556ba927b8e 100644
--- a/dd-trace-core/src/test/java/datadog/trace/lambda/ContentTypeBodyParserTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/lambda/ContentTypeBodyParserTest.java
@@ -20,508 +20,495 @@
 
 class ContentTypeBodyParserTest {
 
-  private static final String MULTIPART = "multipart/form-data; boundary=outer";
-  private static final String URL_ENCODED = "application/x-www-form-urlencoded";
-
-  @ParameterizedTest(name = "[{index}] {1} -> {2}")
-  @CsvSource(
-      delimiter = '|',
-      value = {
-        // content type absent or blank: best-effort JSON, as before content-type dispatch existed
-        "{\"a\":1}          |                                   | MAP",
-        "not json           |                                   | STRING",
-        // a header holding nothing but parameters declares no type either
-        "{\"a\":1}          | '; charset=utf-8'                 | MAP",
-        // JSON, including suffixed subtypes and parameters
-        "{\"a\":1}          | application/json                  | MAP",
-        "{\"a\":1}          | application/json; charset=utf-8   | MAP",
-        "{\"a\":1}          | APPLICATION/JSON                  | MAP",
-        "{\"a\":1}          | application/vnd.api+json          | MAP",
-        "{\"a\":1           | application/json                  | STRING",
-        // JSON-ish vendor types: no +json suffix, but the payload is JSON
-        "{\"a\":1}          | application/x-amz-json-1.1        | MAP",
-        "{\"a\":1}          | application/javascript            | MAP",
-        // urlencoded
-        "a=1                | application/x-www-form-urlencoded | MAP",
-        // a multipart body whose boundary happens to contain "json" must still reach the multipart
-        // parser rather than being handed to the JSON parser
-        "not multipart      | multipart/x; boundary=--json      | STRING",
-        // a json-ish subtype wins over the multipart branch, whatever the type says
-        "{\"a\":1}          | multipart/json                    | MAP",
-        // text/*: never structured, even when it holds JSON. A JSON parse of "12345" would yield a
-        // Double, which no string rule can match
-        "{\"a\":1}          | text/plain                        | STRING",
-        "12345              | text/plain                        | STRING",
-        // anything else
-        "{\"a\":1}          | application/xml                   | STRING",
-        "{\"a\":1}          | garbage                           | STRING",
-        // a slashless header declares a type but no subtype, so it is not JSON-ish
-        "{\"a\":1}          | json                              | STRING",
-      })
-  void dispatchesOnContentType(String body, String contentType, String expectedKind) {
-    Object parsed = parseBody(body, contentType);
-
-    if ("MAP".equals(expectedKind)) {
-      assertInstanceOf(Map.class, parsed);
-    } else {
-      assertEquals(body, parsed);
-    }
-  }
-
-  @Test
-  void returnsNullForNullBody() {
-    assertNull(parseBody(null, "application/json"));
-  }
-
-  @Test
-  void keepsEmptyBodyAsEmptyString() {
-    assertEquals("", parseBody("", "application/json"));
-    assertEquals("", parseBody("", "application/x-www-form-urlencoded"));
-  }
-
-  @Test
-  void keepsRawStringOnceMaxDepthIsReached() {
-    String body = "{\"a\":1}";
-
-    assertEquals(body, dispatch(body, "application/json", MAX_DEPTH, new ParseContext()));
-    assertInstanceOf(
-        Map.class, dispatch(body, "application/json", MAX_DEPTH - 1, new ParseContext()));
-  }
-
-  @Test
-  void parsesUrlEncodedIntoAMultimap() {
-    Map<?, ?> parsed = urlEncoded("user=admin&role=root");
-
-    assertEquals(singletonList("admin"), parsed.get("user"));
-    assertEquals(singletonList("root"), parsed.get("role"));
-    assertEquals(2, parsed.size());
-  }
-
-  @Test
-  void groupsRepeatedUrlEncodedKeysIntoOneList() {
-    assertEquals(asList("a", "b", "c"), urlEncoded("x=a&x=b&x=c").get("x"));
-  }
-
-  @Test
-  void decodesUrlEncodedPercentEscapesAndPluses() {
-    Map<?, ?> parsed = urlEncoded("na+me=hello+world&q=%7B%22a%22%3A1%7D");
-
-    assertEquals(singletonList("hello world"), parsed.get("na me"));
-    assertEquals(singletonList("{\"a\":1}"), parsed.get("q"));
-  }
-
-  @Test
-  void keepsUndecodableUrlEncodedTokensAsIs() {
-    Map<?, ?> parsed = urlEncoded("a=%&%=b");
-
-    assertEquals(singletonList("%"), parsed.get("a"));
-    assertEquals(singletonList("b"), parsed.get("%"));
-  }
-
-  @Test
-  void treatsValuelessUrlEncodedPairsAsEmptyValues() {
-    Map<?, ?> parsed = urlEncoded("flag&other=&last");
-
-    assertEquals(singletonList(""), parsed.get("flag"));
-    assertEquals(singletonList(""), parsed.get("other"));
-    assertEquals(singletonList(""), parsed.get("last"));
-  }
-
-  @ParameterizedTest(name = "[{index}] {0} -> {1}")
-  @CsvSource(
-      delimiter = '|',
-      value = {
-        // %E9 is é in Latin-1 and an invalid sequence in UTF-8: the WAF has to see whichever one
-        // the handler will read, so the declared charset decides
-        "application/x-www-form-urlencoded; charset=iso-8859-1   | café",
-        "application/x-www-form-urlencoded; charset=ISO-8859-1   | café",
-        "application/x-www-form-urlencoded; charset=\"iso-8859-1\" | café",
-        // a parameter after the charset must not be read as part of its name
-        "application/x-www-form-urlencoded; charset=iso-8859-1; q=1 | café",
-        // RFC 7230 optional whitespace around the "="
-        "application/x-www-form-urlencoded; charset =iso-8859-1  | café",
-        // absent, empty, or not a charset this JVM has: UTF-8, which cannot decode %E9
-        "application/x-www-form-urlencoded                       | caf�",
-        "application/x-www-form-urlencoded; charset=              | caf�",
-        "application/x-www-form-urlencoded; charset=utf-42        | caf�",
-        "application/x-www-form-urlencoded; charset=not a charset | caf�",
-        // a parameter that merely ends in "charset" is not one
-        "application/x-www-form-urlencoded; xcharset=iso-8859-1   | caf�",
-        // nor is a "charset=" that only occurs inside another parameter's quoted value
-        "application/x-www-form-urlencoded; q=\"; charset=iso-8859-1\" | caf�",
-      })
-  void decodesFormValuesWithTheDeclaredCharset(String contentType, String expected) {
-    Map<?, ?> parsed = asMap(parseBody("q=caf%E9", contentType));
-
-    assertEquals(singletonList(expected), parsed.get("q"));
-  }
-
-  @Test
-  void decodesFormNamesWithTheDeclaredCharsetToo() {
-    Map<?, ?> parsed =
-        asMap(parseBody("caf%E9=1", "application/x-www-form-urlencoded; charset=iso-8859-1"));
-
-    assertEquals(singletonList("1"), parsed.get("café"));
-  }
-
-  @Test
-  void keepsAsciiFormValuesIdenticalWhateverTheCharset() {
-    // The payloads rules actually target are ASCII, and percent-decode the same under either
-    assertEquals(
-        asMap(parseBody("q=%3Cscript%3E", URL_ENCODED)),
-        asMap(
-            parseBody("q=%3Cscript%3E", "application/x-www-form-urlencoded; charset=iso-8859-1")));
-  }
-
-  @Test
-  void skipsEmptyUrlEncodedPairsButKeepsEmptyNames() {
-    Map<?, ?> parsed = urlEncoded("&&=orphan&&a=1&&");
-
-    assertEquals(singletonList("1"), parsed.get("a"));
-    // A pair with no name still carries a value the handler decodes, so the WAF must see it
-    assertEquals(singletonList("orphan"), parsed.get(""));
-    assertEquals(2, parsed.size());
-  }
-
-  @Test
-  void splitsUrlEncodedValuesAtTheFirstEqualsOnly() {
-    assertEquals(singletonList("b=c=d"), urlEncoded("a=b=c=d").get("a"));
-  }
-
-  @Test
-  void doesNotSeparateUrlEncodedPairsOnSemicolons() {
-    assertEquals(singletonList("1;b=2"), urlEncoded("a=1;b=2").get("a"));
-  }
-
-  @Test
-  void keepsUrlEncodedBodyOverThePartAllowanceAsRawString() {
-    StringBuilder body = new StringBuilder();
-    for (int i = 0; i < MAX_PARTS; i++) {
-      body.append('k').append(i).append("=v&");
-    }
-    body.append("attack=payload");
-    String raw = body.toString();
-
-    // Truncating would hide the trailing parameter from every WAF rule, so the whole body is kept
-    // as a string instead — still matchable, just unstructured
-    assertEquals(raw, parseBody(raw, "application/x-www-form-urlencoded"));
-  }
-
-  @Test
-  void keepsUnparseableUrlEncodedBodyAsRawString() {
-    // Nothing but separators: no parameter survives, so the raw body is kept
-    assertEquals("&&&", parseBody("&&&", "application/x-www-form-urlencoded"));
-  }
-
-  @Test
-  void parsesMultipartFieldsIntoAMap() {
-    Map<?, ?> fields = multipart(field("user", "admin"), field("role", "root"));
-
-    assertEquals("admin", fields.get("user"));
-    assertEquals("root", fields.get("role"));
-    assertEquals(2, fields.size());
-  }
-
-  @Test
-  void skipsMultipartPartsWithoutAName() {
-    // No name parameter at all, in either part: nothing is a field, so the raw string is kept
-    String body = outer(part("form-data", "novalue"), part("form-data; charset=utf-8", "other"));
-
-    assertEquals(body, parseBody(body, MULTIPART));
-  }
-
-  @Test
-  void treatsABareNameParameterAsAnEmptyName() {
-    // "name=" is present but empty, which the handler decodes as a field named ""
-    Map<?, ?> parsed = multipart(part("form-data; name=", "payload"));
-
-    assertEquals(singletonMap("", "payload"), parsed);
-  }
-
-  @Test
-  void skipsMultipartPartsWithoutAContentDisposition() {
-    Map<?, ?> fields = multipart(field("user", "admin"), part(null, "orphan"));
-
-    assertEquals(1, fields.size());
-  }
-
-  @Test
-  void dispatchesOnEachMultipartPartsOwnContentType() {
-    Map<?, ?> fields =
-        multipart(
-            part("form-data; name=payload", "application/json", "{\"a\":1}"),
-            part("form-data; name=plain", "text/plain", "12345"),
-            part("form-data; name=form", "application/x-www-form-urlencoded", "k=v"));
-
-    assertInstanceOf(Map.class, fields.get("payload"));
-    assertEquals("12345", fields.get("plain"));
-    assertEquals(singletonList("v"), ((Map<?, ?>) fields.get("form")).get("k"));
-  }
-
-  @Test
-  void keepsMultipartPartsWithoutAUsableContentTypeAsRawStrings() {
-    // A part with no Content-Type is text/plain per RFC 7578, section 4.4, not a body of unknown
-    // type: a JSON parse would hand the WAF a Double no string rule can match. An empty header
-    // reads the same way, and is the only other spelling to reach here — MultipartSplitter trims.
-    Map<?, ?> fields =
-        multipart(
-            field("amount", "12345"),
-            field("json", "{\"a\":1}"),
-            part("form-data; name=\"empty\"", "", "12345"));
-
-    assertEquals("12345", fields.get("amount"));
-    assertEquals("{\"a\":1}", fields.get("json"));
-    assertEquals("12345", fields.get("empty"));
-  }
-
-  @Test
-  void promotesRepeatedMultipartFieldNamesToAList() {
-    Map<?, ?> fields = multipart(field("x", "a"), field("x", "b"), field("x", "c"));
-
-    assertEquals(asList("a", "b", "c"), fields.get("x"));
-  }
-
-  @Test
-  void nestsARepeatedJsonArrayPartValueRatherThanFlatteningIt() {
-    // The first value is itself a List, so appending to it would flatten two values into one
-    Map<?, ?> fields =
-        multipart(part("form-data; name=x", "application/json", "[1,2]"), field("x", "b"));
-
-    assertEquals(asList(asList(1.0, 2.0), "b"), fields.get("x"));
-  }
-
-  @Test
-  void doesNotTakeAFieldNameThatForgesAFilenameForAFilePart() {
-    Map<?, ?> fields = multipart(part("form-data; name=\"; filename=x\"", "payload"));
-
-    assertEquals("payload", fields.get("; filename=x"));
-  }
-
-  @Test
-  void parsesNestedMultipartBodiesAndReportsTheirFilePartsByNameOnly() {
-    String inner = body("inner", field("nested", "value"), file("upload", "f.txt", "data"));
-    String nesting = outer(part("form-data; name=group", "multipart/mixed; boundary=inner", inner));
-
-    Map<?, ?> fields = asMap(parseBody(nesting, MULTIPART));
-
-    assertEquals(singletonMap("nested", "value"), fields.get("group"));
-    assertEquals(singletonList("f.txt"), filenamesOf(nesting));
-  }
-
-  @Test
-  void sharesThePartAllowanceBetweenUrlEncodedParametersAndMultipartParts() {
-    // Two thirds of the allowance each: the second only fails if both draw from one allowance
-    String urlEncoded = urlEncodedPairs(MAX_PARTS * 2 / 3);
-    Map<?, ?> fields =
-        multipart(
-            part("form-data; name=first", URL_ENCODED, urlEncoded),
-            part("form-data; name=second", URL_ENCODED, urlEncoded));
-
-    assertInstanceOf(Map.class, fields.get("first"));
-    assertEquals(urlEncoded, fields.get("second"));
-  }
-
-  private static String urlEncodedPairs(int count) {
-    StringBuilder body = new StringBuilder();
-    for (int i = 0; i < count; i++) {
-      body.append(i == 0 ? "" : "&").append('k').append(i).append("=v");
-    }
-    return body.toString();
-  }
-
-  @Test
-  void parsesMultipartPartsUpToThePartAllowance() {
-    assertEquals(MAX_PARTS, multipart(fieldParts(MAX_PARTS)).size());
-  }
-
-  @Test
-  void keepsMultipartBodyOverThePartAllowanceAsRawString() {
-    // One part over the allowance degrades the whole body, as an urlencoded body over it does
-    String body = outer(fieldParts(MAX_PARTS + 1));
-
-    assertEquals(body, parseBody(body, MULTIPART));
-  }
-
-  @Test
-  void sharesThePartAllowanceAcrossNestingLevels() {
-    // The inner body fits the allowance on its own, but the outer part it sits in has spent one
-    String inner = body("inner", fieldParts(MAX_PARTS));
-    Map<?, ?> fields =
-        multipart(part("form-data; name=group", "multipart/mixed; boundary=inner", inner));
-
-    assertEquals(inner, fields.get("group"));
-  }
-
-  private static String[] fieldParts(int count) {
-    String[] parts = new String[count];
-    for (int i = 0; i < count; i++) {
-      parts[i] = field("k" + i, "v");
-    }
-    return parts;
-  }
-
-  @Test
-  void keepsMultipartBodyAsRawStringWithoutAUsableBoundary() {
-    String body = outer(field("user", "admin"));
-
-    assertEquals(body, parseBody(body, "multipart/form-data"));
-    assertEquals(body, parseBody(body, "multipart/form-data; boundary="));
-  }
-
-  @Test
-  void keepsUnsplittableMultipartBodyAsRawString() {
-    assertEquals("no parts here", parseBody("no parts here", MULTIPART));
-  }
-
-  @Test
-  void keepsABodyTheByteAllowanceCannotCoverAsRawString() {
-    String body = outer(field("user", "admin"));
-
-    assertInstanceOf(Map.class, parseBody(body, MULTIPART, new ParseContext(body.length())));
-    assertEquals(body, parseBody(body, MULTIPART, new ParseContext(body.length() - 1)));
-  }
-
-  @Test
-  void sharesTheByteAllowanceAcrossNestingLevels() {
-    // Unshared, a nested body is re-measured at every level: MAX_DEPTH times its size to copy
-    String inner = body("inner", field("deep", "v"));
-    String nested = outer(part("form-data; name=\"n\"", "multipart/mixed; boundary=inner", inner));
-
-    // enough for the outer body alone, one character short of also covering the nested one
-    ParseContext exhausted = new ParseContext(nested.length() + inner.length() - 1);
-    Map<?, ?> fields = asMap(parseBody(nested, MULTIPART, exhausted));
-    assertEquals(inner, fields.get("n"));
-
-    ParseContext sufficient = new ParseContext(nested.length() + inner.length());
-    Map<?, ?> parsed = asMap(parseBody(nested, MULTIPART, sufficient));
-    assertEquals("v", ((Map<?, ?>) parsed.get("n")).get("deep"));
-  }
-
-  @Test
-  void reportsTheFilenamesOfFileParts() {
-    String body =
-        outer(
-            field("user", "admin"),
-            file("avatar", "cat.png", "bytes"),
-            file("doc", "report.pdf", "bytes"));
-
-    assertEquals(asList("cat.png", "report.pdf"), filenamesOf(body));
-    // The file parts are not fields, so only the field survives into the body map
-    assertEquals(singletonMap("user", "admin"), multipartBody(body));
-  }
-
-  @Test
-  void keepsAMultipartFieldWithAnEmptyName() {
-    // The handler decodes this part like any other, so dropping it would hide its value from the
-    // WAF. Only a part with no name parameter at all is not a field.
-    String body = outer(field("", "payload"), part("form-data", "unnamed"), field("a", "1"));
-
-    Map<?, ?> parsed = multipartBody(body);
-
-    assertEquals("payload", parsed.get(""));
-    assertEquals("1", parsed.get("a"));
-    assertEquals(2, parsed.size());
-  }
-
-  @Test
-  void marksAFilePartWithoutReportingAnEmptyFilename() {
-    // Browsers send filename="" for an untouched file input: the part is still a file, but the
-    // empty name gives a rule nothing to match
-    String body = outer(file("avatar", "", "bytes"), field("user", "admin"));
-
-    assertEquals(emptyList(), filenamesOf(body));
-    assertEquals(singletonMap("user", "admin"), multipartBody(body));
-  }
-
-  @Test
-  void reportsFilenamesEvenWhenTheBodyDegradesToARawString() {
-    // Nothing but file parts, so there is no field to report: an empty map would tell the WAF the
-    // body was empty, so the raw string is kept and the filenames reported alongside it
-    String body = outer(file("avatar", "cat.png", "bytes"));
-
-    assertEquals(body, parseBody(body, MULTIPART));
-    assertEquals(singletonList("cat.png"), filenamesOf(body));
-  }
-
-  @Test
-  void reportsNoFilenameWhenTheMultipartBodyIsNotParsed() {
-    String body = outer(file("avatar", "cat.png", "bytes"));
-
-    ParseContext sizeCapped = new ParseContext(body.length() - 1);
-    assertEquals(body, parseBody(body, MULTIPART, sizeCapped));
-    assertEquals(emptyList(), sizeCapped.filenames());
-
-    ParseContext noBoundary = new ParseContext();
-    assertEquals(body, parseBody(body, "multipart/form-data", noBoundary));
-    assertEquals(emptyList(), noBoundary.filenames());
-  }
-
-  private static List<String> filenamesOf(String body) {
-    ParseContext context = new ParseContext();
-    parseBody(body, MULTIPART, context);
-    return context.filenames();
-  }
-
-  private static Object parseBody(String body, String contentType) {
-    return parseBody(body, contentType, new ParseContext());
-  }
-
-  private static Object parseBody(String body, String contentType, ParseContext context) {
-    return ContentTypeBodyParser.parseBody(body, contentType, context);
-  }
-
-  /** Wraps the parts in a body with the default boundary and parses it. */
-  private static Map<?, ?> multipart(String... parts) {
-    return multipartBody(outer(parts));
-  }
-
-  /** Distinct from {@link #multipart}, whose varargs would otherwise swallow a whole body. */
-  private static Map<?, ?> multipartBody(String body) {
-    return asMap(parseBody(body, MULTIPART));
-  }
-
-  private static Map<?, ?> urlEncoded(String body) {
-    return asMap(parseBody(body, URL_ENCODED));
-  }
-
-  private static Map<?, ?> asMap(Object parsed) {
-    assertInstanceOf(Map.class, parsed);
-    return (Map<?, ?>) parsed;
-  }
-
-  /** Joins the parts with CRLF and appends the close delimiter, using the default boundary. */
-  private static String outer(String... parts) {
-    return body("outer", parts);
-  }
-
-  private static String body(String boundary, String... parts) {
-    StringBuilder body = new StringBuilder();
-    for (String part : parts) {
-      body.append("--").append(boundary).append("\r\n").append(part).append("\r\n");
-    }
-    return body.append("--").append(boundary).append("--\r\n").toString();
-  }
-
-  private static String field(String name, String value) {
-    return part("form-data; name=\"" + name + "\"", value);
-  }
-
-  private static String file(String name, String filename, String value) {
-    return part("form-data; name=\"" + name + "\"; filename=\"" + filename + "\"", value);
-  }
-
-  private static String part(String disposition, String value) {
-    return part(disposition, null, value);
-  }
-
-  private static String part(String disposition, String contentType, String value) {
-    StringBuilder part = new StringBuilder();
-    if (disposition != null) {
-      part.append("Content-Disposition: ").append(disposition).append("\r\n");
-    }
-    if (contentType != null) {
-      part.append("Content-Type: ").append(contentType).append("\r\n");
-    }
-    return part.append("\r\n").append(value).toString();
-  }
+    private static final String MULTIPART = "multipart/form-data; boundary=outer";
+    private static final String URL_ENCODED = "application/x-www-form-urlencoded";
+
+    @ParameterizedTest(name = "[{index}] {1} -> {2}")
+    @CsvSource(
+            delimiter = '|',
+            value = {
+                // content type absent or blank: best-effort JSON, as before content-type dispatch existed
+                "{\"a\":1}          |                                   | MAP",
+                "not json           |                                   | STRING",
+                // a header holding nothing but parameters declares no type either
+                "{\"a\":1}          | '; charset=utf-8'                 | MAP",
+                // JSON, including suffixed subtypes and parameters
+                "{\"a\":1}          | application/json                  | MAP",
+                "{\"a\":1}          | application/json; charset=utf-8   | MAP",
+                "{\"a\":1}          | APPLICATION/JSON                  | MAP",
+                "{\"a\":1}          | application/vnd.api+json          | MAP",
+                "{\"a\":1           | application/json                  | STRING",
+                // JSON-ish vendor types: no +json suffix, but the payload is JSON
+                "{\"a\":1}          | application/x-amz-json-1.1        | MAP",
+                "{\"a\":1}          | application/javascript            | MAP",
+                // urlencoded
+                "a=1                | application/x-www-form-urlencoded | MAP",
+                // a multipart body whose boundary happens to contain "json" must still reach the multipart
+                // parser rather than being handed to the JSON parser
+                "not multipart      | multipart/x; boundary=--json      | STRING",
+                // a json-ish subtype wins over the multipart branch, whatever the type says
+                "{\"a\":1}          | multipart/json                    | MAP",
+                // text/*: never structured, even when it holds JSON. A JSON parse of "12345" would yield a
+                // Double, which no string rule can match
+                "{\"a\":1}          | text/plain                        | STRING",
+                "12345              | text/plain                        | STRING",
+                // anything else
+                "{\"a\":1}          | application/xml                   | STRING",
+                "{\"a\":1}          | garbage                           | STRING",
+                // a slashless header declares a type but no subtype, so it is not JSON-ish
+                "{\"a\":1}          | json                              | STRING",
+            })
+    void dispatchesOnContentType(String body, String contentType, String expectedKind) {
+        Object parsed = parseBody(body, contentType);
+
+        if ("MAP".equals(expectedKind)) {
+            assertInstanceOf(Map.class, parsed);
+        } else {
+            assertEquals(body, parsed);
+        }
+    }
+
+    @Test
+    void returnsNullForNullBody() {
+        assertNull(parseBody(null, "application/json"));
+    }
+
+    @Test
+    void keepsEmptyBodyAsEmptyString() {
+        assertEquals("", parseBody("", "application/json"));
+        assertEquals("", parseBody("", "application/x-www-form-urlencoded"));
+    }
+
+    @Test
+    void keepsRawStringOnceMaxDepthIsReached() {
+        String body = "{\"a\":1}";
+
+        assertEquals(body, dispatch(body, "application/json", MAX_DEPTH, new ParseContext()));
+        assertInstanceOf(Map.class, dispatch(body, "application/json", MAX_DEPTH - 1, new ParseContext()));
+    }
+
+    @Test
+    void parsesUrlEncodedIntoAMultimap() {
+        Map<?, ?> parsed = urlEncoded("user=admin&role=root");
+
+        assertEquals(singletonList("admin"), parsed.get("user"));
+        assertEquals(singletonList("root"), parsed.get("role"));
+        assertEquals(2, parsed.size());
+    }
+
+    @Test
+    void groupsRepeatedUrlEncodedKeysIntoOneList() {
+        assertEquals(asList("a", "b", "c"), urlEncoded("x=a&x=b&x=c").get("x"));
+    }
+
+    @Test
+    void decodesUrlEncodedPercentEscapesAndPluses() {
+        Map<?, ?> parsed = urlEncoded("na+me=hello+world&q=%7B%22a%22%3A1%7D");
+
+        assertEquals(singletonList("hello world"), parsed.get("na me"));
+        assertEquals(singletonList("{\"a\":1}"), parsed.get("q"));
+    }
+
+    @Test
+    void keepsUndecodableUrlEncodedTokensAsIs() {
+        Map<?, ?> parsed = urlEncoded("a=%&%=b");
+
+        assertEquals(singletonList("%"), parsed.get("a"));
+        assertEquals(singletonList("b"), parsed.get("%"));
+    }
+
+    @Test
+    void treatsValuelessUrlEncodedPairsAsEmptyValues() {
+        Map<?, ?> parsed = urlEncoded("flag&other=&last");
+
+        assertEquals(singletonList(""), parsed.get("flag"));
+        assertEquals(singletonList(""), parsed.get("other"));
+        assertEquals(singletonList(""), parsed.get("last"));
+    }
+
+    @ParameterizedTest(name = "[{index}] {0} -> {1}")
+    @CsvSource(
+            delimiter = '|',
+            value = {
+                // %E9 is é in Latin-1 and an invalid sequence in UTF-8: the WAF has to see whichever one
+                // the handler will read, so the declared charset decides
+                "application/x-www-form-urlencoded; charset=iso-8859-1   | café",
+                "application/x-www-form-urlencoded; charset=ISO-8859-1   | café",
+                "application/x-www-form-urlencoded; charset=\"iso-8859-1\" | café",
+                // a parameter after the charset must not be read as part of its name
+                "application/x-www-form-urlencoded; charset=iso-8859-1; q=1 | café",
+                // RFC 7230 optional whitespace around the "="
+                "application/x-www-form-urlencoded; charset =iso-8859-1  | café",
+                // absent, empty, or not a charset this JVM has: UTF-8, which cannot decode %E9
+                "application/x-www-form-urlencoded                       | caf�",
+                "application/x-www-form-urlencoded; charset=              | caf�",
+                "application/x-www-form-urlencoded; charset=utf-42        | caf�",
+                "application/x-www-form-urlencoded; charset=not a charset | caf�",
+                // a parameter that merely ends in "charset" is not one
+                "application/x-www-form-urlencoded; xcharset=iso-8859-1   | caf�",
+                // nor is a "charset=" that only occurs inside another parameter's quoted value
+                "application/x-www-form-urlencoded; q=\"; charset=iso-8859-1\" | caf�",
+            })
+    void decodesFormValuesWithTheDeclaredCharset(String contentType, String expected) {
+        Map<?, ?> parsed = asMap(parseBody("q=caf%E9", contentType));
+
+        assertEquals(singletonList(expected), parsed.get("q"));
+    }
+
+    @Test
+    void decodesFormNamesWithTheDeclaredCharsetToo() {
+        Map<?, ?> parsed = asMap(parseBody("caf%E9=1", "application/x-www-form-urlencoded; charset=iso-8859-1"));
+
+        assertEquals(singletonList("1"), parsed.get("café"));
+    }
+
+    @Test
+    void keepsAsciiFormValuesIdenticalWhateverTheCharset() {
+        // The payloads rules actually target are ASCII, and percent-decode the same under either
+        assertEquals(
+                asMap(parseBody("q=%3Cscript%3E", URL_ENCODED)),
+                asMap(parseBody("q=%3Cscript%3E", "application/x-www-form-urlencoded; charset=iso-8859-1")));
+    }
+
+    @Test
+    void skipsEmptyUrlEncodedPairsButKeepsEmptyNames() {
+        Map<?, ?> parsed = urlEncoded("&&=orphan&&a=1&&");
+
+        assertEquals(singletonList("1"), parsed.get("a"));
+        // A pair with no name still carries a value the handler decodes, so the WAF must see it
+        assertEquals(singletonList("orphan"), parsed.get(""));
+        assertEquals(2, parsed.size());
+    }
+
+    @Test
+    void splitsUrlEncodedValuesAtTheFirstEqualsOnly() {
+        assertEquals(singletonList("b=c=d"), urlEncoded("a=b=c=d").get("a"));
+    }
+
+    @Test
+    void doesNotSeparateUrlEncodedPairsOnSemicolons() {
+        assertEquals(singletonList("1;b=2"), urlEncoded("a=1;b=2").get("a"));
+    }
+
+    @Test
+    void keepsUrlEncodedBodyOverThePartAllowanceAsRawString() {
+        StringBuilder body = new StringBuilder();
+        for (int i = 0; i < MAX_PARTS; i++) {
+            body.append('k').append(i).append("=v&");
+        }
+        body.append("attack=payload");
+        String raw = body.toString();
+
+        // Truncating would hide the trailing parameter from every WAF rule, so the whole body is kept
+        // as a string instead — still matchable, just unstructured
+        assertEquals(raw, parseBody(raw, "application/x-www-form-urlencoded"));
+    }
+
+    @Test
+    void keepsUnparseableUrlEncodedBodyAsRawString() {
+        // Nothing but separators: no parameter survives, so the raw body is kept
+        assertEquals("&&&", parseBody("&&&", "application/x-www-form-urlencoded"));
+    }
+
+    @Test
+    void parsesMultipartFieldsIntoAMap() {
+        Map<?, ?> fields = multipart(field("user", "admin"), field("role", "root"));
+
+        assertEquals("admin", fields.get("user"));
+        assertEquals("root", fields.get("role"));
+        assertEquals(2, fields.size());
+    }
+
+    @Test
+    void skipsMultipartPartsWithoutAName() {
+        // No name parameter at all, in either part: nothing is a field, so the raw string is kept
+        String body = outer(part("form-data", "novalue"), part("form-data; charset=utf-8", "other"));
+
+        assertEquals(body, parseBody(body, MULTIPART));
+    }
+
+    @Test
+    void treatsABareNameParameterAsAnEmptyName() {
+        // "name=" is present but empty, which the handler decodes as a field named ""
+        Map<?, ?> parsed = multipart(part("form-data; name=", "payload"));
+
+        assertEquals(singletonMap("", "payload"), parsed);
+    }
+
+    @Test
+    void skipsMultipartPartsWithoutAContentDisposition() {
+        Map<?, ?> fields = multipart(field("user", "admin"), part(null, "orphan"));
+
+        assertEquals(1, fields.size());
+    }
+
+    @Test
+    void dispatchesOnEachMultipartPartsOwnContentType() {
+        Map<?, ?> fields = multipart(
+                part("form-data; name=payload", "application/json", "{\"a\":1}"),
+                part("form-data; name=plain", "text/plain", "12345"),
+                part("form-data; name=form", "application/x-www-form-urlencoded", "k=v"));
+
+        assertInstanceOf(Map.class, fields.get("payload"));
+        assertEquals("12345", fields.get("plain"));
+        assertEquals(singletonList("v"), ((Map<?, ?>) fields.get("form")).get("k"));
+    }
+
+    @Test
+    void keepsMultipartPartsWithoutAUsableContentTypeAsRawStrings() {
+        // A part with no Content-Type is text/plain per RFC 7578, section 4.4, not a body of unknown
+        // type: a JSON parse would hand the WAF a Double no string rule can match. An empty header
+        // reads the same way, and is the only other spelling to reach here — MultipartSplitter trims.
+        Map<?, ?> fields = multipart(
+                field("amount", "12345"), field("json", "{\"a\":1}"), part("form-data; name=\"empty\"", "", "12345"));
+
+        assertEquals("12345", fields.get("amount"));
+        assertEquals("{\"a\":1}", fields.get("json"));
+        assertEquals("12345", fields.get("empty"));
+    }
+
+    @Test
+    void promotesRepeatedMultipartFieldNamesToAList() {
+        Map<?, ?> fields = multipart(field("x", "a"), field("x", "b"), field("x", "c"));
+
+        assertEquals(asList("a", "b", "c"), fields.get("x"));
+    }
+
+    @Test
+    void nestsARepeatedJsonArrayPartValueRatherThanFlatteningIt() {
+        // The first value is itself a List, so appending to it would flatten two values into one
+        Map<?, ?> fields = multipart(part("form-data; name=x", "application/json", "[1,2]"), field("x", "b"));
+
+        assertEquals(asList(asList(1.0, 2.0), "b"), fields.get("x"));
+    }
+
+    @Test
+    void doesNotTakeAFieldNameThatForgesAFilenameForAFilePart() {
+        Map<?, ?> fields = multipart(part("form-data; name=\"; filename=x\"", "payload"));
+
+        assertEquals("payload", fields.get("; filename=x"));
+    }
+
+    @Test
+    void parsesNestedMultipartBodiesAndReportsTheirFilePartsByNameOnly() {
+        String inner = body("inner", field("nested", "value"), file("upload", "f.txt", "data"));
+        String nesting = outer(part("form-data; name=group", "multipart/mixed; boundary=inner", inner));
+
+        Map<?, ?> fields = asMap(parseBody(nesting, MULTIPART));
+
+        assertEquals(singletonMap("nested", "value"), fields.get("group"));
+        assertEquals(singletonList("f.txt"), filenamesOf(nesting));
+    }
+
+    @Test
+    void sharesThePartAllowanceBetweenUrlEncodedParametersAndMultipartParts() {
+        // Two thirds of the allowance each: the second only fails if both draw from one allowance
+        String urlEncoded = urlEncodedPairs(MAX_PARTS * 2 / 3);
+        Map<?, ?> fields = multipart(
+                part("form-data; name=first", URL_ENCODED, urlEncoded),
+                part("form-data; name=second", URL_ENCODED, urlEncoded));
+
+        assertInstanceOf(Map.class, fields.get("first"));
+        assertEquals(urlEncoded, fields.get("second"));
+    }
+
+    private static String urlEncodedPairs(int count) {
+        StringBuilder body = new StringBuilder();
+        for (int i = 0; i < count; i++) {
+            body.append(i == 0 ? "" : "&").append('k').append(i).append("=v");
+        }
+        return body.toString();
+    }
+
+    @Test
+    void parsesMultipartPartsUpToThePartAllowance() {
+        assertEquals(MAX_PARTS, multipart(fieldParts(MAX_PARTS)).size());
+    }
+
+    @Test
+    void keepsMultipartBodyOverThePartAllowanceAsRawString() {
+        // One part over the allowance degrades the whole body, as an urlencoded body over it does
+        String body = outer(fieldParts(MAX_PARTS + 1));
+
+        assertEquals(body, parseBody(body, MULTIPART));
+    }
+
+    @Test
+    void sharesThePartAllowanceAcrossNestingLevels() {
+        // The inner body fits the allowance on its own, but the outer part it sits in has spent one
+        String inner = body("inner", fieldParts(MAX_PARTS));
+        Map<?, ?> fields = multipart(part("form-data; name=group", "multipart/mixed; boundary=inner", inner));
+
+        assertEquals(inner, fields.get("group"));
+    }
+
+    private static String[] fieldParts(int count) {
+        String[] parts = new String[count];
+        for (int i = 0; i < count; i++) {
+            parts[i] = field("k" + i, "v");
+        }
+        return parts;
+    }
+
+    @Test
+    void keepsMultipartBodyAsRawStringWithoutAUsableBoundary() {
+        String body = outer(field("user", "admin"));
+
+        assertEquals(body, parseBody(body, "multipart/form-data"));
+        assertEquals(body, parseBody(body, "multipart/form-data; boundary="));
+    }
+
+    @Test
+    void keepsUnsplittableMultipartBodyAsRawString() {
+        assertEquals("no parts here", parseBody("no parts here", MULTIPART));
+    }
+
+    @Test
+    void keepsABodyTheByteAllowanceCannotCoverAsRawString() {
+        String body = outer(field("user", "admin"));
+
+        assertInstanceOf(Map.class, parseBody(body, MULTIPART, new ParseContext(body.length())));
+        assertEquals(body, parseBody(body, MULTIPART, new ParseContext(body.length() - 1)));
+    }
+
+    @Test
+    void sharesTheByteAllowanceAcrossNestingLevels() {
+        // Unshared, a nested body is re-measured at every level: MAX_DEPTH times its size to copy
+        String inner = body("inner", field("deep", "v"));
+        String nested = outer(part("form-data; name=\"n\"", "multipart/mixed; boundary=inner", inner));
+
+        // enough for the outer body alone, one character short of also covering the nested one
+        ParseContext exhausted = new ParseContext(nested.length() + inner.length() - 1);
+        Map<?, ?> fields = asMap(parseBody(nested, MULTIPART, exhausted));
+        assertEquals(inner, fields.get("n"));
+
+        ParseContext sufficient = new ParseContext(nested.length() + inner.length());
+        Map<?, ?> parsed = asMap(parseBody(nested, MULTIPART, sufficient));
+        assertEquals("v", ((Map<?, ?>) parsed.get("n")).get("deep"));
+    }
+
+    @Test
+    void reportsTheFilenamesOfFileParts() {
+        String body =
+                outer(field("user", "admin"), file("avatar", "cat.png", "bytes"), file("doc", "report.pdf", "bytes"));
+
+        assertEquals(asList("cat.png", "report.pdf"), filenamesOf(body));
+        // The file parts are not fields, so only the field survives into the body map
+        assertEquals(singletonMap("user", "admin"), multipartBody(body));
+    }
+
+    @Test
+    void keepsAMultipartFieldWithAnEmptyName() {
+        // The handler decodes this part like any other, so dropping it would hide its value from the
+        // WAF. Only a part with no name parameter at all is not a field.
+        String body = outer(field("", "payload"), part("form-data", "unnamed"), field("a", "1"));
+
+        Map<?, ?> parsed = multipartBody(body);
+
+        assertEquals("payload", parsed.get(""));
+        assertEquals("1", parsed.get("a"));
+        assertEquals(2, parsed.size());
+    }
+
+    @Test
+    void marksAFilePartWithoutReportingAnEmptyFilename() {
+        // Browsers send filename="" for an untouched file input: the part is still a file, but the
+        // empty name gives a rule nothing to match
+        String body = outer(file("avatar", "", "bytes"), field("user", "admin"));
+
+        assertEquals(emptyList(), filenamesOf(body));
+        assertEquals(singletonMap("user", "admin"), multipartBody(body));
+    }
+
+    @Test
+    void reportsFilenamesEvenWhenTheBodyDegradesToARawString() {
+        // Nothing but file parts, so there is no field to report: an empty map would tell the WAF the
+        // body was empty, so the raw string is kept and the filenames reported alongside it
+        String body = outer(file("avatar", "cat.png", "bytes"));
+
+        assertEquals(body, parseBody(body, MULTIPART));
+        assertEquals(singletonList("cat.png"), filenamesOf(body));
+    }
+
+    @Test
+    void reportsNoFilenameWhenTheMultipartBodyIsNotParsed() {
+        String body = outer(file("avatar", "cat.png", "bytes"));
+
+        ParseContext sizeCapped = new ParseContext(body.length() - 1);
+        assertEquals(body, parseBody(body, MULTIPART, sizeCapped));
+        assertEquals(emptyList(), sizeCapped.filenames());
+
+        ParseContext noBoundary = new ParseContext();
+        assertEquals(body, parseBody(body, "multipart/form-data", noBoundary));
+        assertEquals(emptyList(), noBoundary.filenames());
+    }
+
+    private static List<String> filenamesOf(String body) {
+        ParseContext context = new ParseContext();
+        parseBody(body, MULTIPART, context);
+        return context.filenames();
+    }
+
+    private static Object parseBody(String body, String contentType) {
+        return parseBody(body, contentType, new ParseContext());
+    }
+
+    private static Object parseBody(String body, String contentType, ParseContext context) {
+        return ContentTypeBodyParser.parseBody(body, contentType, context);
+    }
+
+    /** Wraps the parts in a body with the default boundary and parses it. */
+    private static Map<?, ?> multipart(String... parts) {
+        return multipartBody(outer(parts));
+    }
+
+    /** Distinct from {@link #multipart}, whose varargs would otherwise swallow a whole body. */
+    private static Map<?, ?> multipartBody(String body) {
+        return asMap(parseBody(body, MULTIPART));
+    }
+
+    private static Map<?, ?> urlEncoded(String body) {
+        return asMap(parseBody(body, URL_ENCODED));
+    }
+
+    private static Map<?, ?> asMap(Object parsed) {
+        assertInstanceOf(Map.class, parsed);
+        return (Map<?, ?>) parsed;
+    }
+
+    /** Joins the parts with CRLF and appends the close delimiter, using the default boundary. */
+    private static String outer(String... parts) {
+        return body("outer", parts);
+    }
+
+    private static String body(String boundary, String... parts) {
+        StringBuilder body = new StringBuilder();
+        for (String part : parts) {
+            body.append("--").append(boundary).append("\r\n").append(part).append("\r\n");
+        }
+        return body.append("--").append(boundary).append("--\r\n").toString();
+    }
+
+    private static String field(String name, String value) {
+        return part("form-data; name=\"" + name + "\"", value);
+    }
+
+    private static String file(String name, String filename, String value) {
+        return part("form-data; name=\"" + name + "\"; filename=\"" + filename + "\"", value);
+    }
+
+    private static String part(String disposition, String value) {
+        return part(disposition, null, value);
+    }
+
+    private static String part(String disposition, String contentType, String value) {
+        StringBuilder part = new StringBuilder();
+        if (disposition != null) {
+            part.append("Content-Disposition: ").append(disposition).append("\r\n");
+        }
+        if (contentType != null) {
+            part.append("Content-Type: ").append(contentType).append("\r\n");
+        }
+        return part.append("\r\n").append(value).toString();
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/lambda/LambdaAppSecHandlerTest.java b/dd-trace-core/src/test/java/datadog/trace/lambda/LambdaAppSecHandlerTest.java
index f51ec9e4e78..3a71d756acb 100644
--- a/dd-trace-core/src/test/java/datadog/trace/lambda/LambdaAppSecHandlerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/lambda/LambdaAppSecHandlerTest.java
@@ -80,2954 +80,2737 @@
 
 class LambdaAppSecHandlerTest extends DDCoreJavaSpecification {
 
-  static boolean originalAppSecActive;
-  static AgentTracer.TracerAPI originalTracer;
-
-  @BeforeAll
-  static void saveState() {
-    originalAppSecActive = ActiveSubsystems.APPSEC_ACTIVE;
-    originalTracer = AgentTracer.get();
-  }
-
-  @AfterAll
-  static void restoreAppSecState() {
-    ActiveSubsystems.APPSEC_ACTIVE = originalAppSecActive;
-  }
-
-  @BeforeEach
-  void enableAppSec() {
-    ActiveSubsystems.APPSEC_ACTIVE = true;
-  }
-
-  @AfterEach
-  void resetTracer() {
-    AgentTracer.forceRegister(originalTracer);
-    LambdaAppSecHandler.setCurrentTriggerType(null);
-  }
-
-  // ============================================================================
-  // processRequestStart — guard tests
-  // ============================================================================
-
-  @Test
-  void processRequestStartReturnsNullWhenAppSecIsDisabled() {
-    ActiveSubsystems.APPSEC_ACTIVE = false;
-    ByteArrayInputStream event = createInputStream("{\"test\": \"data\"}");
-    assertNull(LambdaAppSecHandler.processRequestStart(event));
-  }
-
-  @Test
-  void processRequestStartReturnsNullForNonByteArrayInputStream() {
-    assertNull(LambdaAppSecHandler.processRequestStart("not a stream"));
-  }
-
-  @Test
-  void processRequestStartReturnsNullForNullEvent() {
-    assertNull(LambdaAppSecHandler.processRequestStart(null));
-  }
-
-  @Test
-  void processRequestStartReturnsNullForOversizedEvent() {
-    int maxSize = Config.get().getAppSecBodyParsingSizeLimit();
-    char[] chars = new char[maxSize + 1];
-    java.util.Arrays.fill(chars, 'x');
-    ByteArrayInputStream event = createInputStream(new String(chars));
-    assertNull(LambdaAppSecHandler.processRequestStart(event));
-  }
-
-  @Test
-  void processRequestStartReturnsNullForZeroSizeEvent() {
-    ByteArrayInputStream event = createInputStream("");
-    assertNull(LambdaAppSecHandler.processRequestStart(event));
-  }
-
-  @Test
-  void processRequestStartReturnsNullForMalformedJson() {
-    ByteArrayInputStream event = createInputStream("{invalid json");
-    assertNull(LambdaAppSecHandler.processRequestStart(event));
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void processRequestStartSkipsAppSecForNonHttpTrigger() {
-    String sqsEvent =
-        "{\"Records\": [{\"eventSource\": \"aws:sqs\", \"body\": \"hello\","
-            + " \"messageAttributes\": {}}]}";
-    ByteArrayInputStream event = createInputStream(sqsEvent);
-
-    Supplier<Flow<Object>> requestStartedCallback = mock(Supplier.class);
-    CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
-    when(mockCallbackProvider.getCallback(EVENTS.requestStarted()))
-        .thenReturn(requestStartedCallback);
-    AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
-    when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC))
-        .thenReturn(mockCallbackProvider);
-    AgentTracer.forceRegister(mockTracer);
-
-    assertNull(LambdaAppSecHandler.processRequestStart(event));
-    verifyNoInteractions(requestStartedCallback);
-  }
-
-  @Test
-  void streamCanBeReadMultipleTimesAfterProcessing() throws IOException {
-    String jsonData = "{\"test\": \"data\", \"requestContext\": {\"httpMethod\": \"GET\"}}";
-    ByteArrayInputStream event = createInputStream(jsonData);
-    LambdaAppSecHandler.processRequestStart(event);
-    event.reset();
-    byte[] bytes = new byte[event.available()];
-    event.read(bytes);
-    String content = new String(bytes, StandardCharsets.UTF_8);
-    assertEquals(jsonData, content);
-  }
-
-  // ============================================================================
-  // Trigger Type Detection Tests
-  // ============================================================================
-
-  @Test
-  void detectsApiGatewayV1RestTriggerType() {
-    Map<String, Object> event =
-        mapOf("requestContext", mapOf("httpMethod", "GET", "requestId", "abc123"));
-
-    LambdaTriggerType triggerType = detectTriggerType(event);
-
-    assertEquals(LambdaTriggerType.API_GATEWAY_V1_REST, triggerType);
-  }
-
-  @Test
-  void detectsApiGatewayV2HttpTriggerType() {
-    Map<String, Object> event =
-        mapOf(
-            "requestContext",
-            mapOf(
-                "http", mapOf("method", "POST", "path", "/api"), "domainName", "api.example.com"));
-
-    LambdaTriggerType triggerType = detectTriggerType(event);
-
-    assertEquals(LambdaTriggerType.API_GATEWAY_V2_HTTP, triggerType);
-  }
-
-  @Test
-  void detectsLambdaFunctionUrlTriggerType() {
-    Map<String, Object> event =
-        mapOf(
-            "requestContext",
-            mapOf(
-                "http",
-                mapOf("method", "GET", "path", "/"),
-                "domainName",
-                "xyz123.lambda-url.us-east-1.on.aws"));
-
-    LambdaTriggerType triggerType = detectTriggerType(event);
-
-    assertEquals(LambdaTriggerType.LAMBDA_URL, triggerType);
-  }
-
-  @Test
-  void detectsAlbTriggerTypeWithoutMultiValueHeaders() {
-    Map<String, Object> event =
-        mapOf(
-            "httpMethod",
-            "GET",
-            "path",
-            "/",
-            "requestContext",
-            mapOf("elb", mapOf("targetGroupArn", "arn:aws:...")));
-
-    LambdaTriggerType triggerType = detectTriggerType(event);
-
-    assertEquals(LambdaTriggerType.ALB, triggerType);
-  }
-
-  @Test
-  void detectsAlbTriggerTypeWithMultiValueHeaders() {
-    Map<String, Object> event =
-        mapOf(
-            "httpMethod",
-            "GET",
-            "path",
-            "/",
-            "multiValueHeaders",
-            mapOf("accept", Arrays.asList("text/html", "application/json")),
-            "requestContext",
-            mapOf("elb", mapOf("targetGroupArn", "arn:aws:...")));
-
-    LambdaTriggerType triggerType = detectTriggerType(event);
-
-    assertEquals(LambdaTriggerType.ALB_MULTI_VALUE, triggerType);
-  }
-
-  @Test
-  void detectsWebSocketTriggerTypeWithRouteKey() {
-    Map<String, Object> event =
-        mapOf("requestContext", mapOf("connectionId", "conn-123", "routeKey", "$connect"));
-
-    LambdaTriggerType triggerType = detectTriggerType(event);
-
-    assertEquals(LambdaTriggerType.API_GATEWAY_V2_WEBSOCKET, triggerType);
-  }
-
-  @Test
-  void detectsWebSocketTriggerTypeWithEventType() {
-    Map<String, Object> event =
-        mapOf("requestContext", mapOf("connectionId", "conn-456", "eventType", "CONNECT"));
-
-    LambdaTriggerType triggerType = detectTriggerType(event);
-
-    assertEquals(LambdaTriggerType.API_GATEWAY_V2_WEBSOCKET, triggerType);
-  }
-
-  @Test
-  void detectsUnknownTriggerTypeForUnrecognizedEvents() {
-    Map<String, Object> event = mapOf("someUnknownField", "value");
-
-    LambdaTriggerType triggerType = detectTriggerType(event);
-
-    assertEquals(LambdaTriggerType.UNKNOWN, triggerType);
-  }
-
-  @Test
-  void detectsUnknownTriggerTypeForEmptyRequestContext() {
-    Map<String, Object> event = mapOf("requestContext", mapOf());
-
-    LambdaTriggerType triggerType = detectTriggerType(event);
-
-    assertEquals(LambdaTriggerType.UNKNOWN, triggerType);
-  }
-
-  @Test
-  void detectsLambdaUrlWhenHttpPresentButNoDomainName() {
-    Map<String, Object> event =
-        mapOf("requestContext", mapOf("http", mapOf("method", "GET", "path", "/ambiguous")));
-
-    LambdaTriggerType triggerType = detectTriggerType(event);
-
-    assertEquals(LambdaTriggerType.LAMBDA_URL, triggerType);
-  }
-
-  // ============================================================================
-  // Data Extraction Tests with Mocked Callbacks
-  // ============================================================================
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void extractsApiGatewayV1RestDataCorrectly() {
-    String eventJson =
-        "{"
-            + "\"path\": \"/api/users/123\","
-            + "\"httpMethod\": \"POST\","
-            + "\"headers\": {\"Content-Type\": \"application/json\", \"Authorization\": \"Bearer token123\"},"
-            + "\"pathParameters\": {\"userId\": \"123\"},"
-            + "\"body\": \"{\\\"name\\\": \\\"John\\\"}\","
-            + "\"requestContext\": {"
-            + "  \"httpMethod\": \"POST\","
-            + "  \"requestId\": \"req-123\","
-            + "  \"identity\": {\"sourceIp\": \"192.168.1.100\"}"
-            + "}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    String[] capturedMethod = {null};
-    String[] capturedPath = {null};
-    Map<String, String> capturedHeaders = new HashMap<>();
-    String[] capturedSourceIp = {null};
-    int[] capturedSourcePort = {-1};
-    Map[] capturedPathParams = {null};
-    Object[] capturedBody = {null};
-
-    setupMockCallbacks(
-        new Callbacks()
-            .onMethodUri(
-                (method, uri) -> {
-                  capturedMethod[0] = method;
-                  capturedPath[0] = uri.path();
+    static boolean originalAppSecActive;
+    static AgentTracer.TracerAPI originalTracer;
+
+    @BeforeAll
+    static void saveState() {
+        originalAppSecActive = ActiveSubsystems.APPSEC_ACTIVE;
+        originalTracer = AgentTracer.get();
+    }
+
+    @AfterAll
+    static void restoreAppSecState() {
+        ActiveSubsystems.APPSEC_ACTIVE = originalAppSecActive;
+    }
+
+    @BeforeEach
+    void enableAppSec() {
+        ActiveSubsystems.APPSEC_ACTIVE = true;
+    }
+
+    @AfterEach
+    void resetTracer() {
+        AgentTracer.forceRegister(originalTracer);
+        LambdaAppSecHandler.setCurrentTriggerType(null);
+    }
+
+    // ============================================================================
+    // processRequestStart — guard tests
+    // ============================================================================
+
+    @Test
+    void processRequestStartReturnsNullWhenAppSecIsDisabled() {
+        ActiveSubsystems.APPSEC_ACTIVE = false;
+        ByteArrayInputStream event = createInputStream("{\"test\": \"data\"}");
+        assertNull(LambdaAppSecHandler.processRequestStart(event));
+    }
+
+    @Test
+    void processRequestStartReturnsNullForNonByteArrayInputStream() {
+        assertNull(LambdaAppSecHandler.processRequestStart("not a stream"));
+    }
+
+    @Test
+    void processRequestStartReturnsNullForNullEvent() {
+        assertNull(LambdaAppSecHandler.processRequestStart(null));
+    }
+
+    @Test
+    void processRequestStartReturnsNullForOversizedEvent() {
+        int maxSize = Config.get().getAppSecBodyParsingSizeLimit();
+        char[] chars = new char[maxSize + 1];
+        java.util.Arrays.fill(chars, 'x');
+        ByteArrayInputStream event = createInputStream(new String(chars));
+        assertNull(LambdaAppSecHandler.processRequestStart(event));
+    }
+
+    @Test
+    void processRequestStartReturnsNullForZeroSizeEvent() {
+        ByteArrayInputStream event = createInputStream("");
+        assertNull(LambdaAppSecHandler.processRequestStart(event));
+    }
+
+    @Test
+    void processRequestStartReturnsNullForMalformedJson() {
+        ByteArrayInputStream event = createInputStream("{invalid json");
+        assertNull(LambdaAppSecHandler.processRequestStart(event));
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void processRequestStartSkipsAppSecForNonHttpTrigger() {
+        String sqsEvent =
+                "{\"Records\": [{\"eventSource\": \"aws:sqs\", \"body\": \"hello\"," + " \"messageAttributes\": {}}]}";
+        ByteArrayInputStream event = createInputStream(sqsEvent);
+
+        Supplier<Flow<Object>> requestStartedCallback = mock(Supplier.class);
+        CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
+        when(mockCallbackProvider.getCallback(EVENTS.requestStarted())).thenReturn(requestStartedCallback);
+        AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
+        when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(mockCallbackProvider);
+        AgentTracer.forceRegister(mockTracer);
+
+        assertNull(LambdaAppSecHandler.processRequestStart(event));
+        verifyNoInteractions(requestStartedCallback);
+    }
+
+    @Test
+    void streamCanBeReadMultipleTimesAfterProcessing() throws IOException {
+        String jsonData = "{\"test\": \"data\", \"requestContext\": {\"httpMethod\": \"GET\"}}";
+        ByteArrayInputStream event = createInputStream(jsonData);
+        LambdaAppSecHandler.processRequestStart(event);
+        event.reset();
+        byte[] bytes = new byte[event.available()];
+        event.read(bytes);
+        String content = new String(bytes, StandardCharsets.UTF_8);
+        assertEquals(jsonData, content);
+    }
+
+    // ============================================================================
+    // Trigger Type Detection Tests
+    // ============================================================================
+
+    @Test
+    void detectsApiGatewayV1RestTriggerType() {
+        Map<String, Object> event = mapOf("requestContext", mapOf("httpMethod", "GET", "requestId", "abc123"));
+
+        LambdaTriggerType triggerType = detectTriggerType(event);
+
+        assertEquals(LambdaTriggerType.API_GATEWAY_V1_REST, triggerType);
+    }
+
+    @Test
+    void detectsApiGatewayV2HttpTriggerType() {
+        Map<String, Object> event = mapOf(
+                "requestContext",
+                mapOf("http", mapOf("method", "POST", "path", "/api"), "domainName", "api.example.com"));
+
+        LambdaTriggerType triggerType = detectTriggerType(event);
+
+        assertEquals(LambdaTriggerType.API_GATEWAY_V2_HTTP, triggerType);
+    }
+
+    @Test
+    void detectsLambdaFunctionUrlTriggerType() {
+        Map<String, Object> event = mapOf(
+                "requestContext",
+                mapOf("http", mapOf("method", "GET", "path", "/"), "domainName", "xyz123.lambda-url.us-east-1.on.aws"));
+
+        LambdaTriggerType triggerType = detectTriggerType(event);
+
+        assertEquals(LambdaTriggerType.LAMBDA_URL, triggerType);
+    }
+
+    @Test
+    void detectsAlbTriggerTypeWithoutMultiValueHeaders() {
+        Map<String, Object> event = mapOf(
+                "httpMethod",
+                "GET",
+                "path",
+                "/",
+                "requestContext",
+                mapOf("elb", mapOf("targetGroupArn", "arn:aws:...")));
+
+        LambdaTriggerType triggerType = detectTriggerType(event);
+
+        assertEquals(LambdaTriggerType.ALB, triggerType);
+    }
+
+    @Test
+    void detectsAlbTriggerTypeWithMultiValueHeaders() {
+        Map<String, Object> event = mapOf(
+                "httpMethod",
+                "GET",
+                "path",
+                "/",
+                "multiValueHeaders",
+                mapOf("accept", Arrays.asList("text/html", "application/json")),
+                "requestContext",
+                mapOf("elb", mapOf("targetGroupArn", "arn:aws:...")));
+
+        LambdaTriggerType triggerType = detectTriggerType(event);
+
+        assertEquals(LambdaTriggerType.ALB_MULTI_VALUE, triggerType);
+    }
+
+    @Test
+    void detectsWebSocketTriggerTypeWithRouteKey() {
+        Map<String, Object> event = mapOf("requestContext", mapOf("connectionId", "conn-123", "routeKey", "$connect"));
+
+        LambdaTriggerType triggerType = detectTriggerType(event);
+
+        assertEquals(LambdaTriggerType.API_GATEWAY_V2_WEBSOCKET, triggerType);
+    }
+
+    @Test
+    void detectsWebSocketTriggerTypeWithEventType() {
+        Map<String, Object> event = mapOf("requestContext", mapOf("connectionId", "conn-456", "eventType", "CONNECT"));
+
+        LambdaTriggerType triggerType = detectTriggerType(event);
+
+        assertEquals(LambdaTriggerType.API_GATEWAY_V2_WEBSOCKET, triggerType);
+    }
+
+    @Test
+    void detectsUnknownTriggerTypeForUnrecognizedEvents() {
+        Map<String, Object> event = mapOf("someUnknownField", "value");
+
+        LambdaTriggerType triggerType = detectTriggerType(event);
+
+        assertEquals(LambdaTriggerType.UNKNOWN, triggerType);
+    }
+
+    @Test
+    void detectsUnknownTriggerTypeForEmptyRequestContext() {
+        Map<String, Object> event = mapOf("requestContext", mapOf());
+
+        LambdaTriggerType triggerType = detectTriggerType(event);
+
+        assertEquals(LambdaTriggerType.UNKNOWN, triggerType);
+    }
+
+    @Test
+    void detectsLambdaUrlWhenHttpPresentButNoDomainName() {
+        Map<String, Object> event =
+                mapOf("requestContext", mapOf("http", mapOf("method", "GET", "path", "/ambiguous")));
+
+        LambdaTriggerType triggerType = detectTriggerType(event);
+
+        assertEquals(LambdaTriggerType.LAMBDA_URL, triggerType);
+    }
+
+    // ============================================================================
+    // Data Extraction Tests with Mocked Callbacks
+    // ============================================================================
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void extractsApiGatewayV1RestDataCorrectly() {
+        String eventJson = "{"
+                + "\"path\": \"/api/users/123\","
+                + "\"httpMethod\": \"POST\","
+                + "\"headers\": {\"Content-Type\": \"application/json\", \"Authorization\": \"Bearer token123\"},"
+                + "\"pathParameters\": {\"userId\": \"123\"},"
+                + "\"body\": \"{\\\"name\\\": \\\"John\\\"}\","
+                + "\"requestContext\": {"
+                + "  \"httpMethod\": \"POST\","
+                + "  \"requestId\": \"req-123\","
+                + "  \"identity\": {\"sourceIp\": \"192.168.1.100\"}"
+                + "}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        String[] capturedMethod = {null};
+        String[] capturedPath = {null};
+        Map<String, String> capturedHeaders = new HashMap<>();
+        String[] capturedSourceIp = {null};
+        int[] capturedSourcePort = {-1};
+        Map[] capturedPathParams = {null};
+        Object[] capturedBody = {null};
+
+        setupMockCallbacks(new Callbacks()
+                .onMethodUri((method, uri) -> {
+                    capturedMethod[0] = method;
+                    capturedPath[0] = uri.path();
                 })
-            .onHeader(capturedHeaders::put)
-            .onSocketAddress(
-                (ip, port) -> {
-                  capturedSourceIp[0] = ip;
-                  capturedSourcePort[0] = port;
+                .onHeader(capturedHeaders::put)
+                .onSocketAddress((ip, port) -> {
+                    capturedSourceIp[0] = ip;
+                    capturedSourcePort[0] = port;
                 })
-            .onPathParams(params -> capturedPathParams[0] = params)
-            .onBody(body -> capturedBody[0] = body));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertInstanceOf(TagContext.class, result);
-    assertEquals("POST", capturedMethod[0]);
-    assertEquals("/api/users/123", capturedPath[0]);
-    // The event capitalises these; the parser lowercases header names on the way in, as AppSec
-    // itself does in AppSecRequestContext.addRequestHeader
-    assertEquals("application/json", capturedHeaders.get("content-type"));
-    assertEquals("Bearer token123", capturedHeaders.get("authorization"));
-    assertEquals("192.168.1.100", capturedSourceIp[0]);
-    assertEquals(0, capturedSourcePort[0]);
-    assertNotNull(capturedPathParams[0]);
-    assertEquals("123", capturedPathParams[0].get("userId"));
-    assertInstanceOf(Map.class, capturedBody[0]);
-    assertEquals("John", ((Map<?, ?>) capturedBody[0]).get("name"));
-  }
-
-  @Test
-  void extractsApiGatewayV2HttpDataCorrectly() {
-    String eventJson =
-        "{"
-            + "\"version\": \"2.0\","
-            + "\"headers\": {\"content-type\": \"application/json\", \"x-custom-header\": \"custom-value\"},"
-            + "\"cookies\": [\"session=abc123\", \"user=john\"],"
-            + "\"pathParameters\": {\"id\": \"456\"},"
-            + "\"body\": \"test body\","
-            + "\"requestContext\": {"
-            + "  \"http\": {\"method\": \"PUT\", \"path\": \"/api/items/456\", \"sourceIp\": \"10.0.0.50\", \"sourcePort\": 54321},"
-            + "  \"domainName\": \"api.example.com\""
-            + "}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    String[] capturedMethod = {null};
-    String[] capturedPath = {null};
-    Map<String, String> capturedHeaders = new HashMap<>();
-    String[] capturedSourceIp = {null};
-    int[] capturedSourcePort = {-1};
-    Map[] capturedPathParams = {null};
-
-    setupMockCallbacks(
-        new Callbacks()
-            .onMethodUri(
-                (method, uri) -> {
-                  capturedMethod[0] = method;
-                  capturedPath[0] = uri.path();
+                .onPathParams(params -> capturedPathParams[0] = params)
+                .onBody(body -> capturedBody[0] = body));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertInstanceOf(TagContext.class, result);
+        assertEquals("POST", capturedMethod[0]);
+        assertEquals("/api/users/123", capturedPath[0]);
+        // The event capitalises these; the parser lowercases header names on the way in, as AppSec
+        // itself does in AppSecRequestContext.addRequestHeader
+        assertEquals("application/json", capturedHeaders.get("content-type"));
+        assertEquals("Bearer token123", capturedHeaders.get("authorization"));
+        assertEquals("192.168.1.100", capturedSourceIp[0]);
+        assertEquals(0, capturedSourcePort[0]);
+        assertNotNull(capturedPathParams[0]);
+        assertEquals("123", capturedPathParams[0].get("userId"));
+        assertInstanceOf(Map.class, capturedBody[0]);
+        assertEquals("John", ((Map<?, ?>) capturedBody[0]).get("name"));
+    }
+
+    @Test
+    void extractsApiGatewayV2HttpDataCorrectly() {
+        String eventJson = "{"
+                + "\"version\": \"2.0\","
+                + "\"headers\": {\"content-type\": \"application/json\", \"x-custom-header\": \"custom-value\"},"
+                + "\"cookies\": [\"session=abc123\", \"user=john\"],"
+                + "\"pathParameters\": {\"id\": \"456\"},"
+                + "\"body\": \"test body\","
+                + "\"requestContext\": {"
+                + "  \"http\": {\"method\": \"PUT\", \"path\": \"/api/items/456\", \"sourceIp\": \"10.0.0.50\", \"sourcePort\": 54321},"
+                + "  \"domainName\": \"api.example.com\""
+                + "}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        String[] capturedMethod = {null};
+        String[] capturedPath = {null};
+        Map<String, String> capturedHeaders = new HashMap<>();
+        String[] capturedSourceIp = {null};
+        int[] capturedSourcePort = {-1};
+        Map[] capturedPathParams = {null};
+
+        setupMockCallbacks(new Callbacks()
+                .onMethodUri((method, uri) -> {
+                    capturedMethod[0] = method;
+                    capturedPath[0] = uri.path();
                 })
-            .onHeader(capturedHeaders::put)
-            .onSocketAddress(
-                (ip, port) -> {
-                  capturedSourceIp[0] = ip;
-                  capturedSourcePort[0] = port;
+                .onHeader(capturedHeaders::put)
+                .onSocketAddress((ip, port) -> {
+                    capturedSourceIp[0] = ip;
+                    capturedSourcePort[0] = port;
                 })
-            .onPathParams(params -> capturedPathParams[0] = params));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("PUT", capturedMethod[0]);
-    assertEquals("/api/items/456", capturedPath[0]);
-    assertEquals("application/json", capturedHeaders.get("content-type"));
-    assertEquals("custom-value", capturedHeaders.get("x-custom-header"));
-    assertEquals("session=abc123; user=john", capturedHeaders.get("cookie"));
-    assertEquals("10.0.0.50", capturedSourceIp[0]);
-    assertEquals(54321, capturedSourcePort[0]);
-    assertNotNull(capturedPathParams[0]);
-    assertEquals("456", capturedPathParams[0].get("id"));
-  }
-
-  @Test
-  void extractsLambdaFunctionUrlDataCorrectly() {
-    String eventJson =
-        "{"
-            + "\"version\": \"2.0\","
-            + "\"headers\": {\"host\": \"xyz.lambda-url.us-east-1.on.aws\"},"
-            + "\"requestContext\": {"
-            + "  \"http\": {\"method\": \"GET\", \"path\": \"/function/path\", \"sourceIp\": \"1.2.3.4\"},"
-            + "  \"domainName\": \"xyz.lambda-url.us-east-1.on.aws\""
-            + "}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    String[] capturedMethod = {null};
-    String[] capturedPath = {null};
-
-    setupMockCallbacks(
-        new Callbacks()
-            .onMethodUri(
-                (method, uri) -> {
-                  capturedMethod[0] = method;
-                  capturedPath[0] = uri.path();
-                }));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("GET", capturedMethod[0]);
-    assertEquals("/function/path", capturedPath[0]);
-  }
-
-  @Test
-  void extractsAlbDataCorrectly() {
-    String eventJson =
-        "{"
-            + "\"path\": \"/alb/test\","
-            + "\"httpMethod\": \"DELETE\","
-            + "\"headers\": {\"x-forwarded-for\": \"203.0.113.42\", \"user-agent\": \"curl/7.64.1\"},"
-            + "\"requestContext\": {"
-            + "  \"elb\": {\"targetGroupArn\": \"arn:aws:elasticloadbalancing:us-east-1:123456789012:targetgroup/tg/50dc6c495c0c9188\"}"
-            + "}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    String[] capturedMethod = {null};
-    String[] capturedPath = {null};
-    String[] capturedSourceIp = {null};
-
-    setupMockCallbacks(
-        new Callbacks()
-            .onMethodUri(
-                (method, uri) -> {
-                  capturedMethod[0] = method;
-                  capturedPath[0] = uri.path();
+                .onPathParams(params -> capturedPathParams[0] = params));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("PUT", capturedMethod[0]);
+        assertEquals("/api/items/456", capturedPath[0]);
+        assertEquals("application/json", capturedHeaders.get("content-type"));
+        assertEquals("custom-value", capturedHeaders.get("x-custom-header"));
+        assertEquals("session=abc123; user=john", capturedHeaders.get("cookie"));
+        assertEquals("10.0.0.50", capturedSourceIp[0]);
+        assertEquals(54321, capturedSourcePort[0]);
+        assertNotNull(capturedPathParams[0]);
+        assertEquals("456", capturedPathParams[0].get("id"));
+    }
+
+    @Test
+    void extractsLambdaFunctionUrlDataCorrectly() {
+        String eventJson = "{"
+                + "\"version\": \"2.0\","
+                + "\"headers\": {\"host\": \"xyz.lambda-url.us-east-1.on.aws\"},"
+                + "\"requestContext\": {"
+                + "  \"http\": {\"method\": \"GET\", \"path\": \"/function/path\", \"sourceIp\": \"1.2.3.4\"},"
+                + "  \"domainName\": \"xyz.lambda-url.us-east-1.on.aws\""
+                + "}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        String[] capturedMethod = {null};
+        String[] capturedPath = {null};
+
+        setupMockCallbacks(new Callbacks().onMethodUri((method, uri) -> {
+            capturedMethod[0] = method;
+            capturedPath[0] = uri.path();
+        }));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("GET", capturedMethod[0]);
+        assertEquals("/function/path", capturedPath[0]);
+    }
+
+    @Test
+    void extractsAlbDataCorrectly() {
+        String eventJson = "{"
+                + "\"path\": \"/alb/test\","
+                + "\"httpMethod\": \"DELETE\","
+                + "\"headers\": {\"x-forwarded-for\": \"203.0.113.42\", \"user-agent\": \"curl/7.64.1\"},"
+                + "\"requestContext\": {"
+                + "  \"elb\": {\"targetGroupArn\": \"arn:aws:elasticloadbalancing:us-east-1:123456789012:targetgroup/tg/50dc6c495c0c9188\"}"
+                + "}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        String[] capturedMethod = {null};
+        String[] capturedPath = {null};
+        String[] capturedSourceIp = {null};
+
+        setupMockCallbacks(new Callbacks()
+                .onMethodUri((method, uri) -> {
+                    capturedMethod[0] = method;
+                    capturedPath[0] = uri.path();
                 })
-            .onSocketAddress((ip, port) -> capturedSourceIp[0] = ip));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("DELETE", capturedMethod[0]);
-    assertEquals("/alb/test", capturedPath[0]);
-    assertEquals("203.0.113.42", capturedSourceIp[0]);
-  }
-
-  @Test
-  void mergesApiGatewayV1MultiValueHeadersOverSingleValueOnes() {
-    // A REST proxy event carries both maps; "accept" is repeated, and the single-value map keeps
-    // only one of its values, so the merged reading is the one the WAF must see
-    String eventJson =
-        "{"
-            + "\"path\": \"/test\","
-            + "\"httpMethod\": \"GET\","
-            + "\"headers\": {\"Accept\": \"application/json\", \"X-Only-Single\": \"kept\"},"
-            + "\"multiValueHeaders\": {\"Accept\": [\"text/html\", \"application/json\"]},"
-            + "\"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"r1\"}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Map<String, String> capturedHeaders = new HashMap<>();
-
-    setupMockCallbacks(new Callbacks().onHeader(capturedHeaders::put));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("text/html, application/json", capturedHeaders.get("accept"));
-    // A header only the single-value map holds survives the merge
-    assertEquals("kept", capturedHeaders.get("x-only-single"));
-  }
-
-  @Test
-  void joinsRepeatedCookieHeadersWithASemicolon() {
-    // HTTP/2 lets a client split Cookie across field lines, so a REST event may hold several. A
-    // cookie value may itself hold a comma, so joining with ", " would swallow the second cookie's
-    // name into the first one's value and hide it from the cookie rules.
-    String eventJson =
-        "{"
-            + "\"path\": \"/test\","
-            + "\"httpMethod\": \"GET\","
-            + "\"headers\": {\"Cookie\": \"sess=xyz\"},"
-            + "\"multiValueHeaders\": {\"Cookie\": [\"sess=xyz\", \"tracking=' OR 1=1 --\"]},"
-            + "\"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"r1\"}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Map<String, String> capturedHeaders = new HashMap<>();
-
-    setupMockCallbacks(new Callbacks().onHeader(capturedHeaders::put));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("sess=xyz; tracking=' OR 1=1 --", capturedHeaders.get("cookie"));
-  }
-
-  @Test
-  void keepsApiGatewayV1SingleValueHeadersWhenThereAreNoMultiValueOnes() {
-    String eventJson =
-        "{"
-            + "\"path\": \"/test\","
-            + "\"httpMethod\": \"GET\","
-            + "\"headers\": {\"Accept\": \"application/json\"},"
-            + "\"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"r1\"}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Map<String, String> capturedHeaders = new HashMap<>();
-
-    setupMockCallbacks(new Callbacks().onHeader(capturedHeaders::put));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("application/json", capturedHeaders.get("accept"));
-  }
-
-  @Test
-  void dispatchesAnApiGatewayV1BodyOnAContentTypeOnlyInMultiValueHeaders() {
-    String eventJson =
-        "{"
-            + "\"path\": \"/test\","
-            + "\"httpMethod\": \"POST\","
-            + "\"headers\": {},"
-            + "\"multiValueHeaders\": {\"Content-Type\": [\"application/x-www-form-urlencoded\"]},"
-            + "\"body\": \"name=John\","
-            + "\"requestContext\": {\"httpMethod\": \"POST\", \"requestId\": \"r1\"}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Object[] capturedBody = {null};
-
-    setupMockCallbacks(new Callbacks().onBody(body -> capturedBody[0] = body));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertInstanceOf(Map.class, capturedBody[0]);
-    assertEquals(singletonList("John"), ((Map<?, ?>) capturedBody[0]).get("name"));
-  }
-
-  @Test
-  void extractsAlbMultiValueHeadersCorrectly() {
-    String eventJson =
-        "{"
-            + "\"path\": \"/test\","
-            + "\"httpMethod\": \"GET\","
-            + "\"multiValueHeaders\": {\"accept\": [\"text/html\", \"application/json\"], \"x-custom\": [\"value1\", \"value2\"]},"
-            + "\"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn:aws:...\"}}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Map<String, String> capturedHeaders = new HashMap<>();
-
-    setupMockCallbacks(new Callbacks().onHeader(capturedHeaders::put));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("text/html, application/json", capturedHeaders.get("accept"));
-    assertEquals("value1, value2", capturedHeaders.get("x-custom"));
-  }
-
-  @Test
-  void albMultiValueQueryParamsHandlesListValues() {
-    String eventJson =
-        "{"
-            + "\"path\": \"/test\","
-            + "\"httpMethod\": \"GET\","
-            + "\"multiValueHeaders\": {\"accept\": [\"text/html\"]},"
-            + "\"multiValueQueryStringParameters\": {\"foo\": [\"bar\", \"baz\"], \"x\": [null, \"val\"]},"
-            + "\"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn:aws:...\"}}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    String[] capturedQuery = {null};
-
-    setupMockCallbacks(
-        new Callbacks()
-            .onMethodUri(
-                (method, uri) -> {
-                  capturedQuery[0] = uri.query();
-                }));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertNotNull(capturedQuery[0]);
-    assertTrue(capturedQuery[0].contains("foo=bar") || capturedQuery[0].contains("foo=baz"));
-    assertTrue(capturedQuery[0].contains("x=val"));
-  }
-
-  @Test
-  void albMultiValueHeadersHandlesNonListValue() {
-    String eventJson =
-        "{"
-            + "\"path\": \"/test\","
-            + "\"httpMethod\": \"GET\","
-            + "\"multiValueHeaders\": {\"content-type\": \"text/plain\", \"accept\": [\"application/json\"]},"
-            + "\"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn:aws:...\"}}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Map<String, String> capturedHeaders = new HashMap<>();
-
-    setupMockCallbacks(new Callbacks().onHeader(capturedHeaders::put));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("text/plain", capturedHeaders.get("content-type"));
-    assertEquals("application/json", capturedHeaders.get("accept"));
-  }
-
-  @Test
-  void nullJsonEventReturnsEmpty() {
-    // MAP_ADAPTER.fromJson("null") returns null, triggering LambdaRequestData.EMPTY path
-    ByteArrayInputStream event = createInputStream("null");
-
-    setupMockCallbacks(new Callbacks());
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNull(result);
-  }
-
-  @Test
-  void albMultiValueQueryParamsHandlesNonListValue() {
-    String eventJson =
-        "{"
-            + "\"path\": \"/test\","
-            + "\"httpMethod\": \"GET\","
-            + "\"multiValueHeaders\": {\"accept\": [\"text/html\"]},"
-            + "\"multiValueQueryStringParameters\": {\"foo\": \"plain-string\"},"
-            + "\"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn:aws:...\"}}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    String[] capturedQuery = {null};
-
-    setupMockCallbacks(
-        new Callbacks()
-            .onMethodUri(
-                (method, uri) -> {
-                  capturedQuery[0] = uri.query();
-                }));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertNotNull(capturedQuery[0]);
-    assertTrue(capturedQuery[0].contains("foo=plain-string"));
-  }
-
-  @Test
-  void handlesMultiValueHeadersWithEmptyList() {
-    String eventJson =
-        "{"
-            + "\"path\": \"/test\","
-            + "\"httpMethod\": \"GET\","
-            + "\"multiValueHeaders\": {\"accept\": [], \"x-custom\": [\"value1\"]},"
-            + "\"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn:aws:...\"}}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Map<String, String> capturedHeaders = new HashMap<>();
-
-    setupMockCallbacks(new Callbacks().onHeader(capturedHeaders::put));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("", capturedHeaders.get("accept"));
-    assertEquals("value1", capturedHeaders.get("x-custom"));
-  }
-
-  @Test
-  void extractsWebSocketDataCorrectly() {
-    String eventJson =
-        "{"
-            + "\"requestContext\": {"
-            + "  \"routeKey\": \"$connect\","
-            + "  \"connectionId\": \"conn-abc123\","
-            + "  \"identity\": {\"sourceIp\": \"192.168.0.100\"}"
-            + "}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    String[] capturedMethod = {null};
-    String[] capturedPath = {null};
-    String[] capturedSourceIp = {null};
-
-    setupMockCallbacks(
-        new Callbacks()
-            .onMethodUri(
-                (method, uri) -> {
-                  capturedMethod[0] = method;
-                  capturedPath[0] = uri.path();
+                .onSocketAddress((ip, port) -> capturedSourceIp[0] = ip));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("DELETE", capturedMethod[0]);
+        assertEquals("/alb/test", capturedPath[0]);
+        assertEquals("203.0.113.42", capturedSourceIp[0]);
+    }
+
+    @Test
+    void mergesApiGatewayV1MultiValueHeadersOverSingleValueOnes() {
+        // A REST proxy event carries both maps; "accept" is repeated, and the single-value map keeps
+        // only one of its values, so the merged reading is the one the WAF must see
+        String eventJson = "{"
+                + "\"path\": \"/test\","
+                + "\"httpMethod\": \"GET\","
+                + "\"headers\": {\"Accept\": \"application/json\", \"X-Only-Single\": \"kept\"},"
+                + "\"multiValueHeaders\": {\"Accept\": [\"text/html\", \"application/json\"]},"
+                + "\"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"r1\"}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Map<String, String> capturedHeaders = new HashMap<>();
+
+        setupMockCallbacks(new Callbacks().onHeader(capturedHeaders::put));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("text/html, application/json", capturedHeaders.get("accept"));
+        // A header only the single-value map holds survives the merge
+        assertEquals("kept", capturedHeaders.get("x-only-single"));
+    }
+
+    @Test
+    void joinsRepeatedCookieHeadersWithASemicolon() {
+        // HTTP/2 lets a client split Cookie across field lines, so a REST event may hold several. A
+        // cookie value may itself hold a comma, so joining with ", " would swallow the second cookie's
+        // name into the first one's value and hide it from the cookie rules.
+        String eventJson = "{"
+                + "\"path\": \"/test\","
+                + "\"httpMethod\": \"GET\","
+                + "\"headers\": {\"Cookie\": \"sess=xyz\"},"
+                + "\"multiValueHeaders\": {\"Cookie\": [\"sess=xyz\", \"tracking=' OR 1=1 --\"]},"
+                + "\"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"r1\"}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Map<String, String> capturedHeaders = new HashMap<>();
+
+        setupMockCallbacks(new Callbacks().onHeader(capturedHeaders::put));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("sess=xyz; tracking=' OR 1=1 --", capturedHeaders.get("cookie"));
+    }
+
+    @Test
+    void keepsApiGatewayV1SingleValueHeadersWhenThereAreNoMultiValueOnes() {
+        String eventJson = "{"
+                + "\"path\": \"/test\","
+                + "\"httpMethod\": \"GET\","
+                + "\"headers\": {\"Accept\": \"application/json\"},"
+                + "\"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"r1\"}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Map<String, String> capturedHeaders = new HashMap<>();
+
+        setupMockCallbacks(new Callbacks().onHeader(capturedHeaders::put));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("application/json", capturedHeaders.get("accept"));
+    }
+
+    @Test
+    void dispatchesAnApiGatewayV1BodyOnAContentTypeOnlyInMultiValueHeaders() {
+        String eventJson = "{"
+                + "\"path\": \"/test\","
+                + "\"httpMethod\": \"POST\","
+                + "\"headers\": {},"
+                + "\"multiValueHeaders\": {\"Content-Type\": [\"application/x-www-form-urlencoded\"]},"
+                + "\"body\": \"name=John\","
+                + "\"requestContext\": {\"httpMethod\": \"POST\", \"requestId\": \"r1\"}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Object[] capturedBody = {null};
+
+        setupMockCallbacks(new Callbacks().onBody(body -> capturedBody[0] = body));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertInstanceOf(Map.class, capturedBody[0]);
+        assertEquals(singletonList("John"), ((Map<?, ?>) capturedBody[0]).get("name"));
+    }
+
+    @Test
+    void extractsAlbMultiValueHeadersCorrectly() {
+        String eventJson = "{"
+                + "\"path\": \"/test\","
+                + "\"httpMethod\": \"GET\","
+                + "\"multiValueHeaders\": {\"accept\": [\"text/html\", \"application/json\"], \"x-custom\": [\"value1\", \"value2\"]},"
+                + "\"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn:aws:...\"}}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Map<String, String> capturedHeaders = new HashMap<>();
+
+        setupMockCallbacks(new Callbacks().onHeader(capturedHeaders::put));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("text/html, application/json", capturedHeaders.get("accept"));
+        assertEquals("value1, value2", capturedHeaders.get("x-custom"));
+    }
+
+    @Test
+    void albMultiValueQueryParamsHandlesListValues() {
+        String eventJson = "{"
+                + "\"path\": \"/test\","
+                + "\"httpMethod\": \"GET\","
+                + "\"multiValueHeaders\": {\"accept\": [\"text/html\"]},"
+                + "\"multiValueQueryStringParameters\": {\"foo\": [\"bar\", \"baz\"], \"x\": [null, \"val\"]},"
+                + "\"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn:aws:...\"}}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        String[] capturedQuery = {null};
+
+        setupMockCallbacks(new Callbacks().onMethodUri((method, uri) -> {
+            capturedQuery[0] = uri.query();
+        }));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertNotNull(capturedQuery[0]);
+        assertTrue(capturedQuery[0].contains("foo=bar") || capturedQuery[0].contains("foo=baz"));
+        assertTrue(capturedQuery[0].contains("x=val"));
+    }
+
+    @Test
+    void albMultiValueHeadersHandlesNonListValue() {
+        String eventJson = "{"
+                + "\"path\": \"/test\","
+                + "\"httpMethod\": \"GET\","
+                + "\"multiValueHeaders\": {\"content-type\": \"text/plain\", \"accept\": [\"application/json\"]},"
+                + "\"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn:aws:...\"}}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Map<String, String> capturedHeaders = new HashMap<>();
+
+        setupMockCallbacks(new Callbacks().onHeader(capturedHeaders::put));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("text/plain", capturedHeaders.get("content-type"));
+        assertEquals("application/json", capturedHeaders.get("accept"));
+    }
+
+    @Test
+    void nullJsonEventReturnsEmpty() {
+        // MAP_ADAPTER.fromJson("null") returns null, triggering LambdaRequestData.EMPTY path
+        ByteArrayInputStream event = createInputStream("null");
+
+        setupMockCallbacks(new Callbacks());
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNull(result);
+    }
+
+    @Test
+    void albMultiValueQueryParamsHandlesNonListValue() {
+        String eventJson = "{"
+                + "\"path\": \"/test\","
+                + "\"httpMethod\": \"GET\","
+                + "\"multiValueHeaders\": {\"accept\": [\"text/html\"]},"
+                + "\"multiValueQueryStringParameters\": {\"foo\": \"plain-string\"},"
+                + "\"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn:aws:...\"}}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        String[] capturedQuery = {null};
+
+        setupMockCallbacks(new Callbacks().onMethodUri((method, uri) -> {
+            capturedQuery[0] = uri.query();
+        }));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertNotNull(capturedQuery[0]);
+        assertTrue(capturedQuery[0].contains("foo=plain-string"));
+    }
+
+    @Test
+    void handlesMultiValueHeadersWithEmptyList() {
+        String eventJson = "{"
+                + "\"path\": \"/test\","
+                + "\"httpMethod\": \"GET\","
+                + "\"multiValueHeaders\": {\"accept\": [], \"x-custom\": [\"value1\"]},"
+                + "\"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn:aws:...\"}}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Map<String, String> capturedHeaders = new HashMap<>();
+
+        setupMockCallbacks(new Callbacks().onHeader(capturedHeaders::put));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("", capturedHeaders.get("accept"));
+        assertEquals("value1", capturedHeaders.get("x-custom"));
+    }
+
+    @Test
+    void extractsWebSocketDataCorrectly() {
+        String eventJson = "{"
+                + "\"requestContext\": {"
+                + "  \"routeKey\": \"$connect\","
+                + "  \"connectionId\": \"conn-abc123\","
+                + "  \"identity\": {\"sourceIp\": \"192.168.0.100\"}"
+                + "}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        String[] capturedMethod = {null};
+        String[] capturedPath = {null};
+        String[] capturedSourceIp = {null};
+
+        setupMockCallbacks(new Callbacks()
+                .onMethodUri((method, uri) -> {
+                    capturedMethod[0] = method;
+                    capturedPath[0] = uri.path();
                 })
-            .onSocketAddress((ip, port) -> capturedSourceIp[0] = ip));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("WEBSOCKET", capturedMethod[0]);
-    assertEquals("$connect", capturedPath[0]);
-    assertEquals("192.168.0.100", capturedSourceIp[0]);
-  }
-
-  @Test
-  void handlesBase64EncodedBodyCorrectly() {
-    String originalBody = "This is test data";
-    String base64Body = Base64.getEncoder().encodeToString(originalBody.getBytes());
-    String eventJson =
-        "{"
-            + "\"body\": \""
-            + base64Body
-            + "\","
-            + "\"isBase64Encoded\": true,"
-            + "\"requestContext\": {\"httpMethod\": \"POST\"}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Object[] capturedBody = {null};
-
-    setupMockCallbacks(new Callbacks().onBody(body -> capturedBody[0] = body));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals(originalBody, capturedBody[0]);
-  }
-
-  @Test
-  void handlesNullBodyCorrectly() {
-    ByteArrayInputStream event =
-        createInputStream("{\"body\": null, \"requestContext\": {\"httpMethod\": \"GET\"}}");
-
-    String[] capturedBody = {"NOT_CALLED"};
-
-    setupMockCallbacks(new Callbacks().onBody(body -> capturedBody[0] = String.valueOf(body)));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("NOT_CALLED", capturedBody[0]);
-  }
-
-  @Test
-  void handlesEmptyBodyCorrectly() {
-    ByteArrayInputStream event =
-        createInputStream("{\"body\": \"\", \"requestContext\": {\"httpMethod\": \"POST\"}}");
-
-    Object[] capturedBody = {null};
-
-    setupMockCallbacks(new Callbacks().onBody(body -> capturedBody[0] = body));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("", capturedBody[0]);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void reportsMultipartFilenamesToTheWaf() {
-    String eventJson =
-        "{"
-            + "\"body\": \"--xy\\r\\nContent-Disposition: form-data; name=\\\"user\\\"\\r\\n\\r\\nadmin"
-            + "\\r\\n--xy\\r\\nContent-Disposition: form-data; name=\\\"avatar\\\";"
-            + " filename=\\\"cat.png\\\"\\r\\n\\r\\nbytes"
-            + "\\r\\n--xy--\","
-            + "\"headers\": {\"Content-Type\": \"multipart/form-data; boundary=xy\"},"
-            + "\"requestContext\": {\"httpMethod\": \"POST\"}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Object[] capturedBody = {null};
-    Object[] capturedFilenames = {null};
-
-    setupMockCallbacks(
-        new Callbacks()
-            .onBody(body -> capturedBody[0] = body)
-            .onFilenames(filenames -> capturedFilenames[0] = filenames));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals(Arrays.asList("cat.png"), capturedFilenames[0]);
-    // The file part is reported by name only: it is not a field, and its content is left out
-    Map<String, Object> fields = (Map<String, Object>) capturedBody[0];
-    assertEquals("admin", fields.get("user"));
-    assertNull(fields.get("avatar"));
-  }
-
-  @Test
-  void doesNotReportFilenamesForAMultipartBodyWithoutFileParts() {
-    String eventJson =
-        "{"
-            + "\"body\": \"--xy\\r\\nContent-Disposition: form-data; name=\\\"user\\\"\\r\\n\\r\\nadmin"
-            + "\\r\\n--xy--\","
-            + "\"headers\": {\"Content-Type\": \"multipart/form-data; boundary=xy\"},"
-            + "\"requestContext\": {\"httpMethod\": \"POST\"}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Object[] capturedFilenames = {null};
-
-    setupMockCallbacks(new Callbacks().onFilenames(filenames -> capturedFilenames[0] = filenames));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertNull(capturedFilenames[0]);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void appliesContentTypeDispatchToBase64DecodedBodies() {
-    String base64Body =
-        Base64.getEncoder().encodeToString("user=admin".getBytes(StandardCharsets.UTF_8));
-    String eventJson =
-        "{"
-            + "\"body\": \""
-            + base64Body
-            + "\","
-            + "\"isBase64Encoded\": true,"
-            + "\"headers\": {\"Content-Type\": \"application/x-www-form-urlencoded\"},"
-            + "\"requestContext\": {\"httpMethod\": \"POST\"}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Object[] capturedBody = {null};
-
-    setupMockCallbacks(new Callbacks().onBody(body -> capturedBody[0] = body));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertInstanceOf(Map.class, capturedBody[0]);
-    assertEquals(Arrays.asList("admin"), ((Map<String, List<String>>) capturedBody[0]).get("user"));
-  }
-
-  @Test
-  void handlesPathWithQueryStringCorrectly() {
-    String eventJson =
-        "{"
-            + "\"path\": \"/api/users?id=123&filter=active\","
-            + "\"requestContext\": {\"httpMethod\": \"GET\"}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    String[] capturedPath = {null};
-    String[] capturedQuery = {null};
-
-    setupMockCallbacks(
-        new Callbacks()
-            .onMethodUri(
-                (method, uri) -> {
-                  capturedPath[0] = uri.path();
-                  capturedQuery[0] = uri.query();
-                }));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("/api/users", capturedPath[0]);
-    assertEquals("id=123&filter=active", capturedQuery[0]);
-  }
-
-  @Test
-  void extractsQueryStringParametersAndBuildsFullUri() {
-    String eventJson =
-        "{"
-            + "\"path\": \"/api/items\","
-            + "\"queryStringParameters\": {\"page\": \"2\", \"sort\": \"asc\"},"
-            + "\"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"req-456\"}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    String[] capturedPath = {null};
-    String[] capturedQuery = {null};
-    String[] capturedRawPath = {null};
-    String[] capturedRawQuery = {null};
-    String[] capturedHost = {"NOT_CALLED"};
-    String[] capturedFragment = {"NOT_CALLED"};
-
-    setupMockCallbacks(
-        new Callbacks()
-            .onMethodUri(
-                (method, uri) -> {
-                  capturedPath[0] = uri.path();
-                  capturedQuery[0] = uri.query();
-                  capturedRawPath[0] = uri.rawPath();
-                  capturedRawQuery[0] = uri.rawQuery();
-                  capturedHost[0] = uri.host();
-                  capturedFragment[0] = uri.fragment();
-                }));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("/api/items", capturedPath[0]);
-    assertNotNull(capturedQuery[0]);
-    assertTrue(capturedQuery[0].contains("page=2"));
-    assertTrue(capturedQuery[0].contains("sort=asc"));
-    assertEquals("/api/items", capturedRawPath[0]);
-    assertEquals(capturedQuery[0], capturedRawQuery[0]);
-    assertNull(capturedHost[0]);
-    assertNull(capturedFragment[0]);
-  }
-
-  @Test
-  void extractQueryParametersFiltersNullEntries() {
-    String eventJson =
-        "{"
-            + "\"path\": \"/filter-test\","
-            + "\"queryStringParameters\": {\"valid\": \"keep\", \"nullval\": null},"
-            + "\"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"req-789\"}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    String[] capturedQuery = {null};
-
-    setupMockCallbacks(
-        new Callbacks()
-            .onMethodUri(
-                (method, uri) -> {
-                  capturedQuery[0] = uri.query();
-                }));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertNotNull(capturedQuery[0]);
-    assertTrue(capturedQuery[0].contains("valid=keep"));
-    assertFalse(capturedQuery[0].contains("nullval"));
-  }
-
-  @Test
-  void buildFullPathEncodesSpecialCharactersInQueryParams() {
-    // Keys/values containing '&', '=', and spaces must be percent-encoded so they are not
-    // misinterpreted as query string delimiters when AppSec parses the raw query string.
-    String eventJson =
-        "{"
-            + "\"path\": \"/search\","
-            + "\"queryStringParameters\": {\"q\": \"hello world\", \"filter\": \"a&b\", \"eq\": \"x=y\"},"
-            + "\"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"req-special\"}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    String[] capturedQuery = {null};
-
-    setupMockCallbacks(
-        new Callbacks()
-            .onMethodUri(
-                (method, uri) -> {
-                  capturedQuery[0] = uri.query();
-                }));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertNotNull(capturedQuery[0]);
-    // spaces encoded as '+' or '%20', '&' as '%26', '=' as '%3D'
-    assertFalse(capturedQuery[0].contains("hello world"), "space must be encoded");
-    assertFalse(capturedQuery[0].contains("a&b"), "'&' in value must be encoded");
-    assertFalse(capturedQuery[0].contains("x=y"), "'=' in value must be encoded");
-    assertTrue(
-        capturedQuery[0].contains("hello+world") || capturedQuery[0].contains("hello%20world"),
-        "space should be encoded as '+' or '%20'");
-    assertTrue(capturedQuery[0].contains("a%26b"), "'&' should be encoded as '%26'");
-    assertTrue(capturedQuery[0].contains("x%3Dy"), "'=' should be encoded as '%3D'");
-  }
-
-  @Test
-  void handlesInvalidXForwardedPortGracefully() {
-    String eventJson =
-        "{"
-            + "\"path\": \"/api/test\","
-            + "\"headers\": {\"x-forwarded-proto\": \"https\", \"x-forwarded-port\": \"not-a-number\"},"
-            + "\"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"req-123\"}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    String[] capturedScheme = {null};
-    int[] capturedPort = {-1};
-
-    setupMockCallbacks(
-        new Callbacks()
-            .onMethodUri(
-                (method, uri) -> {
-                  capturedScheme[0] = uri.scheme();
-                  capturedPort[0] = uri.port();
-                }));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("https", capturedScheme[0]);
-    assertEquals(443, capturedPort[0]);
-  }
-
-  @Test
-  void handlesInvalidBase64BodyGracefully() {
-    String eventJson =
-        "{"
-            + "\"body\": \"not-valid-base64\","
-            + "\"isBase64Encoded\": true,"
-            + "\"requestContext\": {\"httpMethod\": \"POST\"}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    String[] capturedBody = {"NOT_CALLED"};
-
-    setupMockCallbacks(new Callbacks().onBody(body -> capturedBody[0] = String.valueOf(body)));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("NOT_CALLED", capturedBody[0]);
-  }
-
-  @Test
-  void handlesBase64DecodedEmptyStringBody() {
-    String base64Empty = Base64.getEncoder().encodeToString("".getBytes());
-    String eventJson =
-        "{"
-            + "\"body\": \""
-            + base64Empty
-            + "\","
-            + "\"isBase64Encoded\": true,"
-            + "\"requestContext\": {\"httpMethod\": \"POST\"}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Object[] capturedBody = {null};
-
-    setupMockCallbacks(new Callbacks().onBody(body -> capturedBody[0] = body));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("", capturedBody[0]);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void handlesBodyWithSpecialCharacters() {
-    String eventJson =
-        "{"
-            + "\"body\": \"{\\\"text\\\": \\\"Hello \\u4e16\\u754c \\uD83C\\uDF0D\\\"}\","
-            + "\"requestContext\": {\"httpMethod\": \"POST\"}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Object[] capturedBody = {null};
-
-    setupMockCallbacks(new Callbacks().onBody(body -> capturedBody[0] = body));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertInstanceOf(Map.class, capturedBody[0]);
-    assertEquals("Hello 世界 🌍", ((Map<?, ?>) capturedBody[0]).get("text"));
-  }
-
-  // ============================================================================
-  // Partial Payload Extraction Tests
-  // ============================================================================
-
-  @Test
-  void extractsDataFromLambdaUrlWithHttpInRequestContext() {
-    String eventJson =
-        "{"
-            + "\"requestContext\": {"
-            + "  \"http\": {\"method\": \"OPTIONS\", \"path\": \"/options/path\", \"sourceIp\": \"198.51.100.50\"}"
-            + "}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    String[] capturedMethod = {null};
-    String[] capturedPath = {null};
-    String[] capturedSourceIp = {null};
-
-    setupMockCallbacks(
-        new Callbacks()
-            .onMethodUri(
-                (method, uri) -> {
-                  capturedMethod[0] = method;
-                  capturedPath[0] = uri.path();
+                .onSocketAddress((ip, port) -> capturedSourceIp[0] = ip));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("WEBSOCKET", capturedMethod[0]);
+        assertEquals("$connect", capturedPath[0]);
+        assertEquals("192.168.0.100", capturedSourceIp[0]);
+    }
+
+    @Test
+    void handlesBase64EncodedBodyCorrectly() {
+        String originalBody = "This is test data";
+        String base64Body = Base64.getEncoder().encodeToString(originalBody.getBytes());
+        String eventJson = "{"
+                + "\"body\": \""
+                + base64Body
+                + "\","
+                + "\"isBase64Encoded\": true,"
+                + "\"requestContext\": {\"httpMethod\": \"POST\"}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Object[] capturedBody = {null};
+
+        setupMockCallbacks(new Callbacks().onBody(body -> capturedBody[0] = body));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals(originalBody, capturedBody[0]);
+    }
+
+    @Test
+    void handlesNullBodyCorrectly() {
+        ByteArrayInputStream event =
+                createInputStream("{\"body\": null, \"requestContext\": {\"httpMethod\": \"GET\"}}");
+
+        String[] capturedBody = {"NOT_CALLED"};
+
+        setupMockCallbacks(new Callbacks().onBody(body -> capturedBody[0] = String.valueOf(body)));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("NOT_CALLED", capturedBody[0]);
+    }
+
+    @Test
+    void handlesEmptyBodyCorrectly() {
+        ByteArrayInputStream event =
+                createInputStream("{\"body\": \"\", \"requestContext\": {\"httpMethod\": \"POST\"}}");
+
+        Object[] capturedBody = {null};
+
+        setupMockCallbacks(new Callbacks().onBody(body -> capturedBody[0] = body));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("", capturedBody[0]);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void reportsMultipartFilenamesToTheWaf() {
+        String eventJson = "{"
+                + "\"body\": \"--xy\\r\\nContent-Disposition: form-data; name=\\\"user\\\"\\r\\n\\r\\nadmin"
+                + "\\r\\n--xy\\r\\nContent-Disposition: form-data; name=\\\"avatar\\\";"
+                + " filename=\\\"cat.png\\\"\\r\\n\\r\\nbytes"
+                + "\\r\\n--xy--\","
+                + "\"headers\": {\"Content-Type\": \"multipart/form-data; boundary=xy\"},"
+                + "\"requestContext\": {\"httpMethod\": \"POST\"}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Object[] capturedBody = {null};
+        Object[] capturedFilenames = {null};
+
+        setupMockCallbacks(new Callbacks()
+                .onBody(body -> capturedBody[0] = body)
+                .onFilenames(filenames -> capturedFilenames[0] = filenames));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals(Arrays.asList("cat.png"), capturedFilenames[0]);
+        // The file part is reported by name only: it is not a field, and its content is left out
+        Map<String, Object> fields = (Map<String, Object>) capturedBody[0];
+        assertEquals("admin", fields.get("user"));
+        assertNull(fields.get("avatar"));
+    }
+
+    @Test
+    void doesNotReportFilenamesForAMultipartBodyWithoutFileParts() {
+        String eventJson = "{"
+                + "\"body\": \"--xy\\r\\nContent-Disposition: form-data; name=\\\"user\\\"\\r\\n\\r\\nadmin"
+                + "\\r\\n--xy--\","
+                + "\"headers\": {\"Content-Type\": \"multipart/form-data; boundary=xy\"},"
+                + "\"requestContext\": {\"httpMethod\": \"POST\"}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Object[] capturedFilenames = {null};
+
+        setupMockCallbacks(new Callbacks().onFilenames(filenames -> capturedFilenames[0] = filenames));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertNull(capturedFilenames[0]);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void appliesContentTypeDispatchToBase64DecodedBodies() {
+        String base64Body = Base64.getEncoder().encodeToString("user=admin".getBytes(StandardCharsets.UTF_8));
+        String eventJson = "{"
+                + "\"body\": \""
+                + base64Body
+                + "\","
+                + "\"isBase64Encoded\": true,"
+                + "\"headers\": {\"Content-Type\": \"application/x-www-form-urlencoded\"},"
+                + "\"requestContext\": {\"httpMethod\": \"POST\"}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Object[] capturedBody = {null};
+
+        setupMockCallbacks(new Callbacks().onBody(body -> capturedBody[0] = body));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertInstanceOf(Map.class, capturedBody[0]);
+        assertEquals(Arrays.asList("admin"), ((Map<String, List<String>>) capturedBody[0]).get("user"));
+    }
+
+    @Test
+    void handlesPathWithQueryStringCorrectly() {
+        String eventJson = "{"
+                + "\"path\": \"/api/users?id=123&filter=active\","
+                + "\"requestContext\": {\"httpMethod\": \"GET\"}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        String[] capturedPath = {null};
+        String[] capturedQuery = {null};
+
+        setupMockCallbacks(new Callbacks().onMethodUri((method, uri) -> {
+            capturedPath[0] = uri.path();
+            capturedQuery[0] = uri.query();
+        }));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("/api/users", capturedPath[0]);
+        assertEquals("id=123&filter=active", capturedQuery[0]);
+    }
+
+    @Test
+    void extractsQueryStringParametersAndBuildsFullUri() {
+        String eventJson = "{"
+                + "\"path\": \"/api/items\","
+                + "\"queryStringParameters\": {\"page\": \"2\", \"sort\": \"asc\"},"
+                + "\"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"req-456\"}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        String[] capturedPath = {null};
+        String[] capturedQuery = {null};
+        String[] capturedRawPath = {null};
+        String[] capturedRawQuery = {null};
+        String[] capturedHost = {"NOT_CALLED"};
+        String[] capturedFragment = {"NOT_CALLED"};
+
+        setupMockCallbacks(new Callbacks().onMethodUri((method, uri) -> {
+            capturedPath[0] = uri.path();
+            capturedQuery[0] = uri.query();
+            capturedRawPath[0] = uri.rawPath();
+            capturedRawQuery[0] = uri.rawQuery();
+            capturedHost[0] = uri.host();
+            capturedFragment[0] = uri.fragment();
+        }));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("/api/items", capturedPath[0]);
+        assertNotNull(capturedQuery[0]);
+        assertTrue(capturedQuery[0].contains("page=2"));
+        assertTrue(capturedQuery[0].contains("sort=asc"));
+        assertEquals("/api/items", capturedRawPath[0]);
+        assertEquals(capturedQuery[0], capturedRawQuery[0]);
+        assertNull(capturedHost[0]);
+        assertNull(capturedFragment[0]);
+    }
+
+    @Test
+    void extractQueryParametersFiltersNullEntries() {
+        String eventJson = "{"
+                + "\"path\": \"/filter-test\","
+                + "\"queryStringParameters\": {\"valid\": \"keep\", \"nullval\": null},"
+                + "\"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"req-789\"}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        String[] capturedQuery = {null};
+
+        setupMockCallbacks(new Callbacks().onMethodUri((method, uri) -> {
+            capturedQuery[0] = uri.query();
+        }));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertNotNull(capturedQuery[0]);
+        assertTrue(capturedQuery[0].contains("valid=keep"));
+        assertFalse(capturedQuery[0].contains("nullval"));
+    }
+
+    @Test
+    void buildFullPathEncodesSpecialCharactersInQueryParams() {
+        // Keys/values containing '&', '=', and spaces must be percent-encoded so they are not
+        // misinterpreted as query string delimiters when AppSec parses the raw query string.
+        String eventJson = "{"
+                + "\"path\": \"/search\","
+                + "\"queryStringParameters\": {\"q\": \"hello world\", \"filter\": \"a&b\", \"eq\": \"x=y\"},"
+                + "\"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"req-special\"}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        String[] capturedQuery = {null};
+
+        setupMockCallbacks(new Callbacks().onMethodUri((method, uri) -> {
+            capturedQuery[0] = uri.query();
+        }));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertNotNull(capturedQuery[0]);
+        // spaces encoded as '+' or '%20', '&' as '%26', '=' as '%3D'
+        assertFalse(capturedQuery[0].contains("hello world"), "space must be encoded");
+        assertFalse(capturedQuery[0].contains("a&b"), "'&' in value must be encoded");
+        assertFalse(capturedQuery[0].contains("x=y"), "'=' in value must be encoded");
+        assertTrue(
+                capturedQuery[0].contains("hello+world") || capturedQuery[0].contains("hello%20world"),
+                "space should be encoded as '+' or '%20'");
+        assertTrue(capturedQuery[0].contains("a%26b"), "'&' should be encoded as '%26'");
+        assertTrue(capturedQuery[0].contains("x%3Dy"), "'=' should be encoded as '%3D'");
+    }
+
+    @Test
+    void handlesInvalidXForwardedPortGracefully() {
+        String eventJson = "{"
+                + "\"path\": \"/api/test\","
+                + "\"headers\": {\"x-forwarded-proto\": \"https\", \"x-forwarded-port\": \"not-a-number\"},"
+                + "\"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"req-123\"}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        String[] capturedScheme = {null};
+        int[] capturedPort = {-1};
+
+        setupMockCallbacks(new Callbacks().onMethodUri((method, uri) -> {
+            capturedScheme[0] = uri.scheme();
+            capturedPort[0] = uri.port();
+        }));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("https", capturedScheme[0]);
+        assertEquals(443, capturedPort[0]);
+    }
+
+    @Test
+    void handlesInvalidBase64BodyGracefully() {
+        String eventJson = "{"
+                + "\"body\": \"not-valid-base64\","
+                + "\"isBase64Encoded\": true,"
+                + "\"requestContext\": {\"httpMethod\": \"POST\"}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        String[] capturedBody = {"NOT_CALLED"};
+
+        setupMockCallbacks(new Callbacks().onBody(body -> capturedBody[0] = String.valueOf(body)));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("NOT_CALLED", capturedBody[0]);
+    }
+
+    @Test
+    void handlesBase64DecodedEmptyStringBody() {
+        String base64Empty = Base64.getEncoder().encodeToString("".getBytes());
+        String eventJson = "{"
+                + "\"body\": \""
+                + base64Empty
+                + "\","
+                + "\"isBase64Encoded\": true,"
+                + "\"requestContext\": {\"httpMethod\": \"POST\"}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Object[] capturedBody = {null};
+
+        setupMockCallbacks(new Callbacks().onBody(body -> capturedBody[0] = body));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("", capturedBody[0]);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void handlesBodyWithSpecialCharacters() {
+        String eventJson = "{"
+                + "\"body\": \"{\\\"text\\\": \\\"Hello \\u4e16\\u754c \\uD83C\\uDF0D\\\"}\","
+                + "\"requestContext\": {\"httpMethod\": \"POST\"}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Object[] capturedBody = {null};
+
+        setupMockCallbacks(new Callbacks().onBody(body -> capturedBody[0] = body));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertInstanceOf(Map.class, capturedBody[0]);
+        assertEquals("Hello 世界 🌍", ((Map<?, ?>) capturedBody[0]).get("text"));
+    }
+
+    // ============================================================================
+    // Partial Payload Extraction Tests
+    // ============================================================================
+
+    @Test
+    void extractsDataFromLambdaUrlWithHttpInRequestContext() {
+        String eventJson = "{"
+                + "\"requestContext\": {"
+                + "  \"http\": {\"method\": \"OPTIONS\", \"path\": \"/options/path\", \"sourceIp\": \"198.51.100.50\"}"
+                + "}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        String[] capturedMethod = {null};
+        String[] capturedPath = {null};
+        String[] capturedSourceIp = {null};
+
+        setupMockCallbacks(new Callbacks()
+                .onMethodUri((method, uri) -> {
+                    capturedMethod[0] = method;
+                    capturedPath[0] = uri.path();
                 })
-            .onSocketAddress((ip, port) -> capturedSourceIp[0] = ip));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("OPTIONS", capturedMethod[0]);
-    assertEquals("/options/path", capturedPath[0]);
-    assertEquals("198.51.100.50", capturedSourceIp[0]);
-  }
-
-  @Test
-  void extractsHttpMethodFromRequestContextOfApiGatewayV1Payload() {
-    String eventJson =
-        "{\"path\": \"/ctx-method\", \"requestContext\": {\"httpMethod\": \"DELETE\"}}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    String[] capturedMethod = {null};
-    String[] capturedPath = {null};
-
-    setupMockCallbacks(
-        new Callbacks()
-            .onMethodUri(
-                (method, uri) -> {
-                  capturedMethod[0] = method;
-                  capturedPath[0] = uri.path();
-                }));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("DELETE", capturedMethod[0]);
-    assertEquals("/ctx-method", capturedPath[0]);
-  }
-
-  @Test
-  void handlesCookiesMergingWithExistingCookieHeader() {
-    String eventJson =
-        "{"
-            + "\"headers\": {\"cookie\": \"existing=value\"},"
-            + "\"cookies\": [\"new=cookie1\", \"another=cookie2\"],"
-            + "\"requestContext\": {\"http\": {\"method\": \"GET\", \"path\": \"/\"}}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Map<String, String> capturedHeaders = new HashMap<>();
-
-    setupMockCallbacks(new Callbacks().onHeader(capturedHeaders::put));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertEquals("existing=value; new=cookie1; another=cookie2", capturedHeaders.get("cookie"));
-  }
-
-  @Test
-  void handlesEmptyCookiesArrayCorrectly() {
-    String eventJson =
-        "{"
-            + "\"headers\": {\"content-type\": \"application/json\"},"
-            + "\"cookies\": [],"
-            + "\"requestContext\": {\"http\": {\"method\": \"GET\", \"path\": \"/\"}}"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Map<String, String> capturedHeaders = new HashMap<>();
-
-    setupMockCallbacks(new Callbacks().onHeader(capturedHeaders::put));
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertFalse(capturedHeaders.containsKey("cookie"));
-  }
-
-  // ============================================================================
-  // processRequestEnd Tests
-  // ============================================================================
-
-  @Test
-  void processRequestEndDoesNothingWhenSpanIsNull() {
-    LambdaAppSecHandler.processRequestEnd(null);
-    // no exception expected
-  }
-
-  @Test
-  void processRequestEndDoesNothingWhenAppSecIsDisabled() {
-    ActiveSubsystems.APPSEC_ACTIVE = false;
-    AgentSpan span = mock(AgentSpan.class);
-
-    LambdaAppSecHandler.processRequestEnd(span);
-
-    verifyNoInteractions(span);
-  }
-
-  @Test
-  void processRequestEndDoesNothingWhenSpanHasNoRequestContext() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    AgentSpan span = mock(AgentSpan.class);
-    when(span.getRequestContext()).thenReturn(null);
-    LambdaAppSecHandler.processRequestEnd(span);
-    // no exception expected
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void processRequestEndInvokesCallbackAndSkipsAsmTagsWhenNotManuallyKept() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    AppSecContext mockAppSecContext = mock(AppSecContext.class);
-    when(mockAppSecContext.isManuallyKept()).thenReturn(false);
-    TraceSegment mockTraceSegment = mock(TraceSegment.class);
-    RequestContext mockRequestContext = mock(RequestContext.class);
-    when(mockRequestContext.getData(RequestContextSlot.APPSEC)).thenReturn(mockAppSecContext);
-    when(mockRequestContext.getTraceSegment()).thenReturn(mockTraceSegment);
-    AgentSpan span = mock(AgentSpan.class);
-    when(span.getRequestContext()).thenReturn(mockRequestContext);
-
-    BiFunction<RequestContext, IGSpanInfo, Flow<Void>> requestEndedCallback =
-        mock(BiFunction.class);
-    when(requestEndedCallback.apply(any(), any())).thenReturn(new Flow.ResultFlow<>(null));
-
-    CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
-    when(mockCallbackProvider.getCallback(EVENTS.requestEnded())).thenReturn(requestEndedCallback);
-
-    AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
-    when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC))
-        .thenReturn(mockCallbackProvider);
-    AgentTracer.forceRegister(mockTracer);
-
-    LambdaAppSecHandler.processRequestEnd(span);
-
-    verify(requestEndedCallback).apply(mockRequestContext, span);
-    verify(mockTraceSegment, never()).setTagTop(any(), any());
-  }
-
-  @Test
-  void processRequestEndHandlesNullRequestEndedCallbackGracefully() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    RequestContext mockRequestContext = mock(RequestContext.class);
-    when(mockRequestContext.getData(RequestContextSlot.APPSEC)).thenReturn(new Object());
-    AgentSpan span = mock(AgentSpan.class);
-    when(span.getRequestContext()).thenReturn(mockRequestContext);
-
-    CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
-    when(mockCallbackProvider.getCallback(EVENTS.requestEnded())).thenReturn(null);
-
-    AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
-    when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC))
-        .thenReturn(mockCallbackProvider);
-    AgentTracer.forceRegister(mockTracer);
-
-    assertDoesNotThrow(() -> LambdaAppSecHandler.processRequestEnd(span));
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void processRequestEndSetsAsmKeepTagWhenAppSecContextIsManuallyKept() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    AppSecContext manuallyKeptCtx = mock(AppSecContext.class);
-    when(manuallyKeptCtx.isManuallyKept()).thenReturn(true);
-
-    TraceSegment mockTraceSegment = mock(TraceSegment.class);
-    RequestContext mockRequestContext = mock(RequestContext.class);
-    when(mockRequestContext.getData(RequestContextSlot.APPSEC)).thenReturn(manuallyKeptCtx);
-    when(mockRequestContext.getTraceSegment()).thenReturn(mockTraceSegment);
-
-    AgentSpan span = mock(AgentSpan.class);
-    when(span.getRequestContext()).thenReturn(mockRequestContext);
-
-    BiFunction<RequestContext, IGSpanInfo, Flow<Void>> requestEndedCallback =
-        mock(BiFunction.class);
-    when(requestEndedCallback.apply(any(), any())).thenReturn(new Flow.ResultFlow<>(null));
-
-    CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
-    when(mockCallbackProvider.getCallback(EVENTS.requestEnded())).thenReturn(requestEndedCallback);
-
-    AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
-    when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC))
-        .thenReturn(mockCallbackProvider);
-    AgentTracer.forceRegister(mockTracer);
-
-    LambdaAppSecHandler.processRequestEnd(span);
-
-    verify(requestEndedCallback).apply(mockRequestContext, span);
-    verify(mockTraceSegment).setTagTop(Tags.ASM_KEEP, true);
-    verify(mockTraceSegment).setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
-  }
-
-  @Test
-  void processRequestEndSetsUnsupportedEventTypeMetricForNonHttpTrigger() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.UNKNOWN);
-    AgentSpan span = mock(AgentSpan.class);
-
-    LambdaAppSecHandler.processRequestEnd(span);
-
-    verify(span).setMetric("_dd.appsec.unsupported_event_type", 1);
-    verifyNoMoreInteractions(span);
-  }
-
-  @Test
-  void processRequestEndSetsNoUnsupportedEventTypeMetricWhenNoTriggerTypeWasRecorded() {
-    // AppSec was inactive at request start and enabled mid-invocation
-    AgentSpan span = mock(AgentSpan.class);
-
-    LambdaAppSecHandler.processRequestEnd(span);
-
-    verifyNoInteractions(span);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void processRequestEndSetsNoUnsupportedEventTypeMetricForHttpTrigger() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    RequestContext mockRequestContext = mock(RequestContext.class);
-    when(mockRequestContext.getData(RequestContextSlot.APPSEC)).thenReturn(new Object());
-    when(mockRequestContext.getTraceSegment()).thenReturn(mock(TraceSegment.class));
-    AgentSpan span = mock(AgentSpan.class);
-    when(span.getRequestContext()).thenReturn(mockRequestContext);
-
-    BiFunction<RequestContext, IGSpanInfo, Flow<Void>> requestEndedCallback =
-        mock(BiFunction.class);
-    when(requestEndedCallback.apply(any(), any())).thenReturn(new Flow.ResultFlow<>(null));
-    CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
-    when(mockCallbackProvider.getCallback(EVENTS.requestEnded())).thenReturn(requestEndedCallback);
-    AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
-    when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC))
-        .thenReturn(mockCallbackProvider);
-    AgentTracer.forceRegister(mockTracer);
-
-    LambdaAppSecHandler.processRequestEnd(span);
-
-    verify(requestEndedCallback).apply(mockRequestContext, span);
-    verify(span, never()).setMetric(anyString(), anyInt());
-  }
-
-  @Test
-  void processRequestEndDoesNotReportHttpTriggerWithoutAttachedAppSecContextAsUnsupported() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    RequestContext requestContext = mock(RequestContext.class);
-    AgentSpan span = mock(AgentSpan.class);
-    when(span.getRequestContext()).thenReturn(requestContext);
-
-    LambdaAppSecHandler.processRequestEnd(span);
-
-    verify(span, never()).setMetric(anyString(), anyInt());
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void processRequestEndClearsTriggerAfterSuccessfulFinalization() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    RequestContext requestContext = mock(RequestContext.class);
-    when(requestContext.getData(RequestContextSlot.APPSEC)).thenReturn(new Object());
-    AgentSpan span = mock(AgentSpan.class);
-    when(span.getRequestContext()).thenReturn(requestContext);
-
-    BiFunction<RequestContext, IGSpanInfo, Flow<Void>> requestEndedCallback =
-        mock(BiFunction.class);
-    when(requestEndedCallback.apply(any(), any())).thenReturn(Flow.ResultFlow.empty());
-    CallbackProvider callbackProvider = mock(CallbackProvider.class);
-    when(callbackProvider.getCallback(EVENTS.requestEnded())).thenReturn(requestEndedCallback);
-    AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
-    when(tracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(callbackProvider);
-    AgentTracer.forceRegister(tracer);
-
-    LambdaAppSecHandler.processRequestEnd(span);
-
-    AgentSpan nextSpan = mock(AgentSpan.class);
-    LambdaAppSecHandler.processRequestEnd(nextSpan);
-    verify(requestEndedCallback).apply(requestContext, span);
-    verify(nextSpan, never()).setMetric(anyString(), anyInt());
-  }
-
-  @Test
-  void processRequestEndSetsUnsupportedEventTypeMetricAfterAnUnparseablePayload() {
-    ByteArrayInputStream event = createInputStream("{invalid json");
-    assertNull(LambdaAppSecHandler.processRequestStart(event));
-
-    AgentSpan span = mock(AgentSpan.class);
-    LambdaAppSecHandler.processRequestEnd(span);
-
-    verify(span).setMetric("_dd.appsec.unsupported_event_type", 1);
-    verifyNoMoreInteractions(span);
-  }
-
-  // ============================================================================
-  // mergeContexts Tests
-  // ============================================================================
-
-  @Test
-  void mergeContextsReturnsNullWhenBothContextsAreNull() {
-    assertNull(LambdaAppSecHandler.mergeContexts(null, null));
-  }
-
-  @Test
-  void mergeContextsReturnsExtensionContextWhenAppSecContextIsNull() {
-    TagContext extensionContext = mock(TagContext.class);
-    assertEquals(extensionContext, LambdaAppSecHandler.mergeContexts(extensionContext, null));
-  }
-
-  @Test
-  void mergeContextsReturnsAppSecContextWhenExtensionContextIsNull() {
-    TagContext appSecContext = mock(TagContext.class);
-    assertEquals(appSecContext, LambdaAppSecHandler.mergeContexts(null, appSecContext));
-  }
-
-  @Test
-  void mergeContextsMergesAppSecDataIntoTagContext() {
-    Object appSecData = new Object();
-    TagContext appSecContext = new TagContext();
-    appSecContext.withRequestContextDataAppSec(appSecData);
-    TagContext extensionContext = new TagContext();
-
-    AgentSpanContext result = LambdaAppSecHandler.mergeContexts(extensionContext, appSecContext);
-
-    assertEquals(extensionContext, result);
-    assertEquals(appSecData, ((TagContext) result).getRequestContextDataAppSec());
-  }
-
-  @Test
-  void mergeContextsReturnsExtensionContextWhenAppSecContextIsNotTagContext() {
-    TagContext extensionContext = mock(TagContext.class);
-    AgentSpanContext appSecContext = mock(AgentSpanContext.class);
-    assertEquals(
-        extensionContext, LambdaAppSecHandler.mergeContexts(extensionContext, appSecContext));
-  }
-
-  @Test
-  void mergeContextsReturnsExtensionContextWhenItIsNotTagContext() {
-    AgentSpanContext extensionContext = mock(AgentSpanContext.class);
-    TagContext appSecContext = mock(TagContext.class);
-    assertEquals(
-        extensionContext, LambdaAppSecHandler.mergeContexts(extensionContext, appSecContext));
-  }
-
-  // ============================================================================
-  // Error Handling and Null Callback Tests
-  // ============================================================================
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void processRequestStartHandlesNullRequestStartedCallbackGracefully() {
-    String eventJson = "{\"requestContext\": {\"httpMethod\": \"GET\"}}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
-    when(mockCallbackProvider.getCallback(EVENTS.requestStarted())).thenReturn(null);
-
-    AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
-    when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC))
-        .thenReturn(mockCallbackProvider);
-    AgentTracer.forceRegister(mockTracer);
-
-    assertNull(LambdaAppSecHandler.processRequestStart(event));
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void processRequestStartHandlesNullMethodUriCallbackGracefully() {
-    String eventJson = "{\"path\": \"/test\", \"requestContext\": {\"httpMethod\": \"GET\"}}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Object mockAppSecContext = new Object();
-    Supplier<Flow<Object>> requestStartedCallback = mock(Supplier.class);
-    when(requestStartedCallback.get()).thenReturn(new Flow.ResultFlow<>(mockAppSecContext));
-
-    CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
-    when(mockCallbackProvider.getCallback(EVENTS.requestStarted()))
-        .thenReturn(requestStartedCallback);
-    when(mockCallbackProvider.getCallback(EVENTS.requestMethodUriRaw())).thenReturn(null);
-    when(mockCallbackProvider.getCallback(EVENTS.requestHeader())).thenReturn(null);
-    when(mockCallbackProvider.getCallback(EVENTS.requestClientSocketAddress())).thenReturn(null);
-    Function<RequestContext, Flow<Void>> headerDoneCallback = mock(Function.class);
-    when(headerDoneCallback.apply(any())).thenReturn(new Flow.ResultFlow<>(null));
-    when(mockCallbackProvider.getCallback(EVENTS.requestHeaderDone()))
-        .thenReturn(headerDoneCallback);
-    when(mockCallbackProvider.getCallback(EVENTS.requestPathParams())).thenReturn(null);
-    when(mockCallbackProvider.getCallback(EVENTS.requestBodyProcessed())).thenReturn(null);
-
-    AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
-    when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC))
-        .thenReturn(mockCallbackProvider);
-    AgentTracer.forceRegister(mockTracer);
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertInstanceOf(TagContext.class, result);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void processRequestStartHandlesNullHeaderDoneCallbackGracefully() {
-    String eventJson = "{\"path\": \"/test\", \"requestContext\": {\"httpMethod\": \"GET\"}}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Object mockAppSecContext = new Object();
-    Supplier<Flow<Object>> requestStartedCallback = mock(Supplier.class);
-    when(requestStartedCallback.get()).thenReturn(new Flow.ResultFlow<>(mockAppSecContext));
-
-    CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
-    when(mockCallbackProvider.getCallback(EVENTS.requestStarted()))
-        .thenReturn(requestStartedCallback);
-    when(mockCallbackProvider.getCallback(EVENTS.requestMethodUriRaw())).thenReturn(null);
-    when(mockCallbackProvider.getCallback(EVENTS.requestHeader())).thenReturn(null);
-    when(mockCallbackProvider.getCallback(EVENTS.requestClientSocketAddress())).thenReturn(null);
-    when(mockCallbackProvider.getCallback(EVENTS.requestHeaderDone())).thenReturn(null);
-    when(mockCallbackProvider.getCallback(EVENTS.requestPathParams())).thenReturn(null);
-    when(mockCallbackProvider.getCallback(EVENTS.requestBodyProcessed())).thenReturn(null);
-
-    AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
-    when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC))
-        .thenReturn(mockCallbackProvider);
-    AgentTracer.forceRegister(mockTracer);
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertInstanceOf(TagContext.class, result);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void processRequestStartHandlesNullPathParamsCallbackGracefully() {
-    String eventJson =
-        "{\"path\": \"/test\", \"pathParameters\": {\"id\": \"42\"}, \"requestContext\": {\"httpMethod\": \"GET\"}}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    Object mockAppSecContext = new Object();
-    Supplier<Flow<Object>> requestStartedCallback = mock(Supplier.class);
-    when(requestStartedCallback.get()).thenReturn(new Flow.ResultFlow<>(mockAppSecContext));
-
-    Function<RequestContext, Flow<Void>> headerDoneCallback = mock(Function.class);
-    when(headerDoneCallback.apply(any())).thenReturn(new Flow.ResultFlow<>(null));
-
-    CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
-    when(mockCallbackProvider.getCallback(EVENTS.requestStarted()))
-        .thenReturn(requestStartedCallback);
-    when(mockCallbackProvider.getCallback(EVENTS.requestMethodUriRaw())).thenReturn(null);
-    when(mockCallbackProvider.getCallback(EVENTS.requestHeader())).thenReturn(null);
-    when(mockCallbackProvider.getCallback(EVENTS.requestClientSocketAddress())).thenReturn(null);
-    when(mockCallbackProvider.getCallback(EVENTS.requestHeaderDone()))
-        .thenReturn(headerDoneCallback);
-    when(mockCallbackProvider.getCallback(EVENTS.requestPathParams())).thenReturn(null);
-    when(mockCallbackProvider.getCallback(EVENTS.requestBodyProcessed())).thenReturn(null);
-
-    AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
-    when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC))
-        .thenReturn(mockCallbackProvider);
-    AgentTracer.forceRegister(mockTracer);
-
-    AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
-
-    assertNotNull(result);
-    assertInstanceOf(TagContext.class, result);
-  }
-
-  @Test
-  void processRequestStartHandlesExceptionDuringStreamReading() {
-    ByteArrayInputStream mockStream =
-        new ByteArrayInputStream("data".getBytes()) {
-          @Override
-          public synchronized int available() {
-            throw new RuntimeException("Stream error");
-          }
+                .onSocketAddress((ip, port) -> capturedSourceIp[0] = ip));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("OPTIONS", capturedMethod[0]);
+        assertEquals("/options/path", capturedPath[0]);
+        assertEquals("198.51.100.50", capturedSourceIp[0]);
+    }
+
+    @Test
+    void extractsHttpMethodFromRequestContextOfApiGatewayV1Payload() {
+        String eventJson = "{\"path\": \"/ctx-method\", \"requestContext\": {\"httpMethod\": \"DELETE\"}}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        String[] capturedMethod = {null};
+        String[] capturedPath = {null};
+
+        setupMockCallbacks(new Callbacks().onMethodUri((method, uri) -> {
+            capturedMethod[0] = method;
+            capturedPath[0] = uri.path();
+        }));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("DELETE", capturedMethod[0]);
+        assertEquals("/ctx-method", capturedPath[0]);
+    }
+
+    @Test
+    void handlesCookiesMergingWithExistingCookieHeader() {
+        String eventJson = "{"
+                + "\"headers\": {\"cookie\": \"existing=value\"},"
+                + "\"cookies\": [\"new=cookie1\", \"another=cookie2\"],"
+                + "\"requestContext\": {\"http\": {\"method\": \"GET\", \"path\": \"/\"}}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Map<String, String> capturedHeaders = new HashMap<>();
+
+        setupMockCallbacks(new Callbacks().onHeader(capturedHeaders::put));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertEquals("existing=value; new=cookie1; another=cookie2", capturedHeaders.get("cookie"));
+    }
+
+    @Test
+    void handlesEmptyCookiesArrayCorrectly() {
+        String eventJson = "{"
+                + "\"headers\": {\"content-type\": \"application/json\"},"
+                + "\"cookies\": [],"
+                + "\"requestContext\": {\"http\": {\"method\": \"GET\", \"path\": \"/\"}}"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Map<String, String> capturedHeaders = new HashMap<>();
+
+        setupMockCallbacks(new Callbacks().onHeader(capturedHeaders::put));
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertFalse(capturedHeaders.containsKey("cookie"));
+    }
+
+    // ============================================================================
+    // processRequestEnd Tests
+    // ============================================================================
+
+    @Test
+    void processRequestEndDoesNothingWhenSpanIsNull() {
+        LambdaAppSecHandler.processRequestEnd(null);
+        // no exception expected
+    }
+
+    @Test
+    void processRequestEndDoesNothingWhenAppSecIsDisabled() {
+        ActiveSubsystems.APPSEC_ACTIVE = false;
+        AgentSpan span = mock(AgentSpan.class);
+
+        LambdaAppSecHandler.processRequestEnd(span);
+
+        verifyNoInteractions(span);
+    }
+
+    @Test
+    void processRequestEndDoesNothingWhenSpanHasNoRequestContext() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        AgentSpan span = mock(AgentSpan.class);
+        when(span.getRequestContext()).thenReturn(null);
+        LambdaAppSecHandler.processRequestEnd(span);
+        // no exception expected
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void processRequestEndInvokesCallbackAndSkipsAsmTagsWhenNotManuallyKept() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        AppSecContext mockAppSecContext = mock(AppSecContext.class);
+        when(mockAppSecContext.isManuallyKept()).thenReturn(false);
+        TraceSegment mockTraceSegment = mock(TraceSegment.class);
+        RequestContext mockRequestContext = mock(RequestContext.class);
+        when(mockRequestContext.getData(RequestContextSlot.APPSEC)).thenReturn(mockAppSecContext);
+        when(mockRequestContext.getTraceSegment()).thenReturn(mockTraceSegment);
+        AgentSpan span = mock(AgentSpan.class);
+        when(span.getRequestContext()).thenReturn(mockRequestContext);
+
+        BiFunction<RequestContext, IGSpanInfo, Flow<Void>> requestEndedCallback = mock(BiFunction.class);
+        when(requestEndedCallback.apply(any(), any())).thenReturn(new Flow.ResultFlow<>(null));
+
+        CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
+        when(mockCallbackProvider.getCallback(EVENTS.requestEnded())).thenReturn(requestEndedCallback);
+
+        AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
+        when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(mockCallbackProvider);
+        AgentTracer.forceRegister(mockTracer);
+
+        LambdaAppSecHandler.processRequestEnd(span);
+
+        verify(requestEndedCallback).apply(mockRequestContext, span);
+        verify(mockTraceSegment, never()).setTagTop(any(), any());
+    }
+
+    @Test
+    void processRequestEndHandlesNullRequestEndedCallbackGracefully() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        RequestContext mockRequestContext = mock(RequestContext.class);
+        when(mockRequestContext.getData(RequestContextSlot.APPSEC)).thenReturn(new Object());
+        AgentSpan span = mock(AgentSpan.class);
+        when(span.getRequestContext()).thenReturn(mockRequestContext);
+
+        CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
+        when(mockCallbackProvider.getCallback(EVENTS.requestEnded())).thenReturn(null);
+
+        AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
+        when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(mockCallbackProvider);
+        AgentTracer.forceRegister(mockTracer);
+
+        assertDoesNotThrow(() -> LambdaAppSecHandler.processRequestEnd(span));
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void processRequestEndSetsAsmKeepTagWhenAppSecContextIsManuallyKept() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        AppSecContext manuallyKeptCtx = mock(AppSecContext.class);
+        when(manuallyKeptCtx.isManuallyKept()).thenReturn(true);
+
+        TraceSegment mockTraceSegment = mock(TraceSegment.class);
+        RequestContext mockRequestContext = mock(RequestContext.class);
+        when(mockRequestContext.getData(RequestContextSlot.APPSEC)).thenReturn(manuallyKeptCtx);
+        when(mockRequestContext.getTraceSegment()).thenReturn(mockTraceSegment);
+
+        AgentSpan span = mock(AgentSpan.class);
+        when(span.getRequestContext()).thenReturn(mockRequestContext);
+
+        BiFunction<RequestContext, IGSpanInfo, Flow<Void>> requestEndedCallback = mock(BiFunction.class);
+        when(requestEndedCallback.apply(any(), any())).thenReturn(new Flow.ResultFlow<>(null));
+
+        CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
+        when(mockCallbackProvider.getCallback(EVENTS.requestEnded())).thenReturn(requestEndedCallback);
+
+        AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
+        when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(mockCallbackProvider);
+        AgentTracer.forceRegister(mockTracer);
+
+        LambdaAppSecHandler.processRequestEnd(span);
+
+        verify(requestEndedCallback).apply(mockRequestContext, span);
+        verify(mockTraceSegment).setTagTop(Tags.ASM_KEEP, true);
+        verify(mockTraceSegment).setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
+    }
+
+    @Test
+    void processRequestEndSetsUnsupportedEventTypeMetricForNonHttpTrigger() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.UNKNOWN);
+        AgentSpan span = mock(AgentSpan.class);
+
+        LambdaAppSecHandler.processRequestEnd(span);
+
+        verify(span).setMetric("_dd.appsec.unsupported_event_type", 1);
+        verifyNoMoreInteractions(span);
+    }
+
+    @Test
+    void processRequestEndSetsNoUnsupportedEventTypeMetricWhenNoTriggerTypeWasRecorded() {
+        // AppSec was inactive at request start and enabled mid-invocation
+        AgentSpan span = mock(AgentSpan.class);
+
+        LambdaAppSecHandler.processRequestEnd(span);
+
+        verifyNoInteractions(span);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void processRequestEndSetsNoUnsupportedEventTypeMetricForHttpTrigger() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        RequestContext mockRequestContext = mock(RequestContext.class);
+        when(mockRequestContext.getData(RequestContextSlot.APPSEC)).thenReturn(new Object());
+        when(mockRequestContext.getTraceSegment()).thenReturn(mock(TraceSegment.class));
+        AgentSpan span = mock(AgentSpan.class);
+        when(span.getRequestContext()).thenReturn(mockRequestContext);
+
+        BiFunction<RequestContext, IGSpanInfo, Flow<Void>> requestEndedCallback = mock(BiFunction.class);
+        when(requestEndedCallback.apply(any(), any())).thenReturn(new Flow.ResultFlow<>(null));
+        CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
+        when(mockCallbackProvider.getCallback(EVENTS.requestEnded())).thenReturn(requestEndedCallback);
+        AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
+        when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(mockCallbackProvider);
+        AgentTracer.forceRegister(mockTracer);
+
+        LambdaAppSecHandler.processRequestEnd(span);
+
+        verify(requestEndedCallback).apply(mockRequestContext, span);
+        verify(span, never()).setMetric(anyString(), anyInt());
+    }
+
+    @Test
+    void processRequestEndDoesNotReportHttpTriggerWithoutAttachedAppSecContextAsUnsupported() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        RequestContext requestContext = mock(RequestContext.class);
+        AgentSpan span = mock(AgentSpan.class);
+        when(span.getRequestContext()).thenReturn(requestContext);
+
+        LambdaAppSecHandler.processRequestEnd(span);
+
+        verify(span, never()).setMetric(anyString(), anyInt());
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void processRequestEndClearsTriggerAfterSuccessfulFinalization() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        RequestContext requestContext = mock(RequestContext.class);
+        when(requestContext.getData(RequestContextSlot.APPSEC)).thenReturn(new Object());
+        AgentSpan span = mock(AgentSpan.class);
+        when(span.getRequestContext()).thenReturn(requestContext);
+
+        BiFunction<RequestContext, IGSpanInfo, Flow<Void>> requestEndedCallback = mock(BiFunction.class);
+        when(requestEndedCallback.apply(any(), any())).thenReturn(Flow.ResultFlow.empty());
+        CallbackProvider callbackProvider = mock(CallbackProvider.class);
+        when(callbackProvider.getCallback(EVENTS.requestEnded())).thenReturn(requestEndedCallback);
+        AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
+        when(tracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(callbackProvider);
+        AgentTracer.forceRegister(tracer);
+
+        LambdaAppSecHandler.processRequestEnd(span);
+
+        AgentSpan nextSpan = mock(AgentSpan.class);
+        LambdaAppSecHandler.processRequestEnd(nextSpan);
+        verify(requestEndedCallback).apply(requestContext, span);
+        verify(nextSpan, never()).setMetric(anyString(), anyInt());
+    }
+
+    @Test
+    void processRequestEndSetsUnsupportedEventTypeMetricAfterAnUnparseablePayload() {
+        ByteArrayInputStream event = createInputStream("{invalid json");
+        assertNull(LambdaAppSecHandler.processRequestStart(event));
+
+        AgentSpan span = mock(AgentSpan.class);
+        LambdaAppSecHandler.processRequestEnd(span);
+
+        verify(span).setMetric("_dd.appsec.unsupported_event_type", 1);
+        verifyNoMoreInteractions(span);
+    }
+
+    // ============================================================================
+    // mergeContexts Tests
+    // ============================================================================
+
+    @Test
+    void mergeContextsReturnsNullWhenBothContextsAreNull() {
+        assertNull(LambdaAppSecHandler.mergeContexts(null, null));
+    }
+
+    @Test
+    void mergeContextsReturnsExtensionContextWhenAppSecContextIsNull() {
+        TagContext extensionContext = mock(TagContext.class);
+        assertEquals(extensionContext, LambdaAppSecHandler.mergeContexts(extensionContext, null));
+    }
+
+    @Test
+    void mergeContextsReturnsAppSecContextWhenExtensionContextIsNull() {
+        TagContext appSecContext = mock(TagContext.class);
+        assertEquals(appSecContext, LambdaAppSecHandler.mergeContexts(null, appSecContext));
+    }
+
+    @Test
+    void mergeContextsMergesAppSecDataIntoTagContext() {
+        Object appSecData = new Object();
+        TagContext appSecContext = new TagContext();
+        appSecContext.withRequestContextDataAppSec(appSecData);
+        TagContext extensionContext = new TagContext();
+
+        AgentSpanContext result = LambdaAppSecHandler.mergeContexts(extensionContext, appSecContext);
+
+        assertEquals(extensionContext, result);
+        assertEquals(appSecData, ((TagContext) result).getRequestContextDataAppSec());
+    }
+
+    @Test
+    void mergeContextsReturnsExtensionContextWhenAppSecContextIsNotTagContext() {
+        TagContext extensionContext = mock(TagContext.class);
+        AgentSpanContext appSecContext = mock(AgentSpanContext.class);
+        assertEquals(extensionContext, LambdaAppSecHandler.mergeContexts(extensionContext, appSecContext));
+    }
+
+    @Test
+    void mergeContextsReturnsExtensionContextWhenItIsNotTagContext() {
+        AgentSpanContext extensionContext = mock(AgentSpanContext.class);
+        TagContext appSecContext = mock(TagContext.class);
+        assertEquals(extensionContext, LambdaAppSecHandler.mergeContexts(extensionContext, appSecContext));
+    }
+
+    // ============================================================================
+    // Error Handling and Null Callback Tests
+    // ============================================================================
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void processRequestStartHandlesNullRequestStartedCallbackGracefully() {
+        String eventJson = "{\"requestContext\": {\"httpMethod\": \"GET\"}}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
+        when(mockCallbackProvider.getCallback(EVENTS.requestStarted())).thenReturn(null);
+
+        AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
+        when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(mockCallbackProvider);
+        AgentTracer.forceRegister(mockTracer);
+
+        assertNull(LambdaAppSecHandler.processRequestStart(event));
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void processRequestStartHandlesNullMethodUriCallbackGracefully() {
+        String eventJson = "{\"path\": \"/test\", \"requestContext\": {\"httpMethod\": \"GET\"}}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Object mockAppSecContext = new Object();
+        Supplier<Flow<Object>> requestStartedCallback = mock(Supplier.class);
+        when(requestStartedCallback.get()).thenReturn(new Flow.ResultFlow<>(mockAppSecContext));
+
+        CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
+        when(mockCallbackProvider.getCallback(EVENTS.requestStarted())).thenReturn(requestStartedCallback);
+        when(mockCallbackProvider.getCallback(EVENTS.requestMethodUriRaw())).thenReturn(null);
+        when(mockCallbackProvider.getCallback(EVENTS.requestHeader())).thenReturn(null);
+        when(mockCallbackProvider.getCallback(EVENTS.requestClientSocketAddress()))
+                .thenReturn(null);
+        Function<RequestContext, Flow<Void>> headerDoneCallback = mock(Function.class);
+        when(headerDoneCallback.apply(any())).thenReturn(new Flow.ResultFlow<>(null));
+        when(mockCallbackProvider.getCallback(EVENTS.requestHeaderDone())).thenReturn(headerDoneCallback);
+        when(mockCallbackProvider.getCallback(EVENTS.requestPathParams())).thenReturn(null);
+        when(mockCallbackProvider.getCallback(EVENTS.requestBodyProcessed())).thenReturn(null);
+
+        AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
+        when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(mockCallbackProvider);
+        AgentTracer.forceRegister(mockTracer);
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertInstanceOf(TagContext.class, result);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void processRequestStartHandlesNullHeaderDoneCallbackGracefully() {
+        String eventJson = "{\"path\": \"/test\", \"requestContext\": {\"httpMethod\": \"GET\"}}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Object mockAppSecContext = new Object();
+        Supplier<Flow<Object>> requestStartedCallback = mock(Supplier.class);
+        when(requestStartedCallback.get()).thenReturn(new Flow.ResultFlow<>(mockAppSecContext));
+
+        CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
+        when(mockCallbackProvider.getCallback(EVENTS.requestStarted())).thenReturn(requestStartedCallback);
+        when(mockCallbackProvider.getCallback(EVENTS.requestMethodUriRaw())).thenReturn(null);
+        when(mockCallbackProvider.getCallback(EVENTS.requestHeader())).thenReturn(null);
+        when(mockCallbackProvider.getCallback(EVENTS.requestClientSocketAddress()))
+                .thenReturn(null);
+        when(mockCallbackProvider.getCallback(EVENTS.requestHeaderDone())).thenReturn(null);
+        when(mockCallbackProvider.getCallback(EVENTS.requestPathParams())).thenReturn(null);
+        when(mockCallbackProvider.getCallback(EVENTS.requestBodyProcessed())).thenReturn(null);
+
+        AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
+        when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(mockCallbackProvider);
+        AgentTracer.forceRegister(mockTracer);
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertInstanceOf(TagContext.class, result);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void processRequestStartHandlesNullPathParamsCallbackGracefully() {
+        String eventJson =
+                "{\"path\": \"/test\", \"pathParameters\": {\"id\": \"42\"}, \"requestContext\": {\"httpMethod\": \"GET\"}}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        Object mockAppSecContext = new Object();
+        Supplier<Flow<Object>> requestStartedCallback = mock(Supplier.class);
+        when(requestStartedCallback.get()).thenReturn(new Flow.ResultFlow<>(mockAppSecContext));
+
+        Function<RequestContext, Flow<Void>> headerDoneCallback = mock(Function.class);
+        when(headerDoneCallback.apply(any())).thenReturn(new Flow.ResultFlow<>(null));
+
+        CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
+        when(mockCallbackProvider.getCallback(EVENTS.requestStarted())).thenReturn(requestStartedCallback);
+        when(mockCallbackProvider.getCallback(EVENTS.requestMethodUriRaw())).thenReturn(null);
+        when(mockCallbackProvider.getCallback(EVENTS.requestHeader())).thenReturn(null);
+        when(mockCallbackProvider.getCallback(EVENTS.requestClientSocketAddress()))
+                .thenReturn(null);
+        when(mockCallbackProvider.getCallback(EVENTS.requestHeaderDone())).thenReturn(headerDoneCallback);
+        when(mockCallbackProvider.getCallback(EVENTS.requestPathParams())).thenReturn(null);
+        when(mockCallbackProvider.getCallback(EVENTS.requestBodyProcessed())).thenReturn(null);
+
+        AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
+        when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(mockCallbackProvider);
+        AgentTracer.forceRegister(mockTracer);
+
+        AgentSpanContext result = LambdaAppSecHandler.processRequestStart(event);
+
+        assertNotNull(result);
+        assertInstanceOf(TagContext.class, result);
+    }
+
+    @Test
+    void processRequestStartHandlesExceptionDuringStreamReading() {
+        ByteArrayInputStream mockStream = new ByteArrayInputStream("data".getBytes()) {
+            @Override
+            public synchronized int available() {
+                throw new RuntimeException("Stream error");
+            }
         };
-    assertNull(LambdaAppSecHandler.processRequestStart(mockStream));
-  }
-
-  // ============================================================================
-  // TemporaryRequestContext Tests
-  // ============================================================================
-
-  @Test
-  void temporaryRequestContextProvidesAppSecDataViaGetData() {
-    Object mockAppSecContext = new Object();
-    RequestContext ctx = captureTemporaryRequestContext(mockAppSecContext);
-
-    assertNotNull(ctx);
-    assertEquals(mockAppSecContext, ctx.getData(RequestContextSlot.APPSEC));
-    assertNull(ctx.getData(RequestContextSlot.CI_VISIBILITY));
-    assertNull(ctx.getData(RequestContextSlot.IAST));
-  }
-
-  @Test
-  void temporaryRequestContextIsNotCreatedWhenAppSecContextIsNull() {
-    assertNull(captureTemporaryRequestContext(null));
-  }
-
-  @Test
-  void temporaryRequestContextNoOpMethodsReturnExpectedDefaults() {
-    RequestContext ctx = captureTemporaryRequestContext(new Object());
-
-    assertNotNull(ctx);
-    assertEquals(TraceSegment.NoOp.INSTANCE, ctx.getTraceSegment());
-    assertNull(ctx.getBlockResponseFunction());
-    assertNull(ctx.getOrCreateMetaStructTop("key", k -> new Object()));
-    assertNull(ctx.getClientIpAddressData());
-    assertDoesNotThrow(() -> ctx.setBlockResponseFunction(mock(BlockResponseFunction.class)));
-    assertDoesNotThrow(() -> ctx.setClientIpAddressData(mock(ClientIpAddressData.class)));
-    assertDoesNotThrow(ctx::close);
-  }
-
-  private RequestContext captureTemporaryRequestContext(Object appSecContext) {
-    String eventJson =
-        "{\n"
-            + "  \"path\": \"/test\",\n"
-            + "  \"requestContext\": {\n"
-            + "    \"httpMethod\": \"GET\"\n"
-            + "  }\n"
-            + "}";
-    ByteArrayInputStream event = createInputStream(eventJson);
-
-    RequestContext[] captured = {null};
-
-    Supplier<Flow<Object>> requestStartedCallback = mock(Supplier.class);
-    when(requestStartedCallback.get()).thenReturn(new Flow.ResultFlow<>(appSecContext));
-
-    TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>> methodUriCallback =
-        mock(TriFunction.class);
-    doAnswer(
-            inv -> {
-              captured[0] = inv.getArgument(0);
-              return new Flow.ResultFlow<>(null);
-            })
-        .when(methodUriCallback)
-        .apply(any(), any(), any());
-
-    Function<RequestContext, Flow<Void>> headerDoneCallback = mock(Function.class);
-    when(headerDoneCallback.apply(any())).thenReturn(new Flow.ResultFlow<>(null));
-
-    CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
-    when(mockCallbackProvider.getCallback(EVENTS.requestStarted()))
-        .thenReturn(requestStartedCallback);
-    when(mockCallbackProvider.getCallback(EVENTS.requestMethodUriRaw()))
-        .thenReturn(methodUriCallback);
-    when(mockCallbackProvider.getCallback(EVENTS.requestHeader())).thenReturn(null);
-    when(mockCallbackProvider.getCallback(EVENTS.requestClientSocketAddress())).thenReturn(null);
-    when(mockCallbackProvider.getCallback(EVENTS.requestHeaderDone()))
-        .thenReturn(headerDoneCallback);
-    when(mockCallbackProvider.getCallback(EVENTS.requestPathParams())).thenReturn(null);
-    when(mockCallbackProvider.getCallback(EVENTS.requestBodyProcessed())).thenReturn(null);
-
-    AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
-    when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC))
-        .thenReturn(mockCallbackProvider);
-    AgentTracer.forceRegister(mockTracer);
-
-    LambdaAppSecHandler.processRequestStart(event);
-    return captured[0];
-  }
-
-  // ============================================================================
-  // processResponseData Tests — guard conditions
-  // ============================================================================
-
-  @Test
-  void processResponseDataDoesNothingWhenAppSecIsDisabled() {
-    ActiveSubsystems.APPSEC_ACTIVE = false;
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    AgentSpan span = mock(AgentSpan.class);
-
-    LambdaAppSecHandler.processResponseData(
-        span, createOutputStream("{\"statusCode\": 200, \"body\": \"ok\"}"));
-
-    verifyNoInteractions(span);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void notifyAppSecEndFinalizesRequestWhenResponseProcessingThrows() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    RequestContext requestContext = mock(RequestContext.class);
-    when(requestContext.getData(RequestContextSlot.APPSEC)).thenReturn(new Object());
-    AgentSpan span = mock(AgentSpan.class);
-    when(span.getRequestContext()).thenReturn(requestContext);
-
-    BiFunction<RequestContext, IGSpanInfo, Flow<Void>> requestEndedCallback =
-        mock(BiFunction.class);
-    when(requestEndedCallback.apply(any(), any())).thenReturn(Flow.ResultFlow.empty());
-    CallbackProvider callbackProvider = mock(CallbackProvider.class);
-    when(callbackProvider.getCallback(EVENTS.requestEnded())).thenReturn(requestEndedCallback);
-    AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
-    when(tracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(callbackProvider);
-    AgentTracer.forceRegister(tracer);
-
-    ByteArrayOutputStream result =
-        new ByteArrayOutputStream() {
-          @Override
-          public synchronized byte[] toByteArray() {
-            throw new AssertionError("response processing failed");
-          }
+        assertNull(LambdaAppSecHandler.processRequestStart(mockStream));
+    }
+
+    // ============================================================================
+    // TemporaryRequestContext Tests
+    // ============================================================================
+
+    @Test
+    void temporaryRequestContextProvidesAppSecDataViaGetData() {
+        Object mockAppSecContext = new Object();
+        RequestContext ctx = captureTemporaryRequestContext(mockAppSecContext);
+
+        assertNotNull(ctx);
+        assertEquals(mockAppSecContext, ctx.getData(RequestContextSlot.APPSEC));
+        assertNull(ctx.getData(RequestContextSlot.CI_VISIBILITY));
+        assertNull(ctx.getData(RequestContextSlot.IAST));
+    }
+
+    @Test
+    void temporaryRequestContextIsNotCreatedWhenAppSecContextIsNull() {
+        assertNull(captureTemporaryRequestContext(null));
+    }
+
+    @Test
+    void temporaryRequestContextNoOpMethodsReturnExpectedDefaults() {
+        RequestContext ctx = captureTemporaryRequestContext(new Object());
+
+        assertNotNull(ctx);
+        assertEquals(TraceSegment.NoOp.INSTANCE, ctx.getTraceSegment());
+        assertNull(ctx.getBlockResponseFunction());
+        assertNull(ctx.getOrCreateMetaStructTop("key", k -> new Object()));
+        assertNull(ctx.getClientIpAddressData());
+        assertDoesNotThrow(() -> ctx.setBlockResponseFunction(mock(BlockResponseFunction.class)));
+        assertDoesNotThrow(() -> ctx.setClientIpAddressData(mock(ClientIpAddressData.class)));
+        assertDoesNotThrow(ctx::close);
+    }
+
+    private RequestContext captureTemporaryRequestContext(Object appSecContext) {
+        String eventJson = "{\n"
+                + "  \"path\": \"/test\",\n"
+                + "  \"requestContext\": {\n"
+                + "    \"httpMethod\": \"GET\"\n"
+                + "  }\n"
+                + "}";
+        ByteArrayInputStream event = createInputStream(eventJson);
+
+        RequestContext[] captured = {null};
+
+        Supplier<Flow<Object>> requestStartedCallback = mock(Supplier.class);
+        when(requestStartedCallback.get()).thenReturn(new Flow.ResultFlow<>(appSecContext));
+
+        TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>> methodUriCallback = mock(TriFunction.class);
+        doAnswer(inv -> {
+                    captured[0] = inv.getArgument(0);
+                    return new Flow.ResultFlow<>(null);
+                })
+                .when(methodUriCallback)
+                .apply(any(), any(), any());
+
+        Function<RequestContext, Flow<Void>> headerDoneCallback = mock(Function.class);
+        when(headerDoneCallback.apply(any())).thenReturn(new Flow.ResultFlow<>(null));
+
+        CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
+        when(mockCallbackProvider.getCallback(EVENTS.requestStarted())).thenReturn(requestStartedCallback);
+        when(mockCallbackProvider.getCallback(EVENTS.requestMethodUriRaw())).thenReturn(methodUriCallback);
+        when(mockCallbackProvider.getCallback(EVENTS.requestHeader())).thenReturn(null);
+        when(mockCallbackProvider.getCallback(EVENTS.requestClientSocketAddress()))
+                .thenReturn(null);
+        when(mockCallbackProvider.getCallback(EVENTS.requestHeaderDone())).thenReturn(headerDoneCallback);
+        when(mockCallbackProvider.getCallback(EVENTS.requestPathParams())).thenReturn(null);
+        when(mockCallbackProvider.getCallback(EVENTS.requestBodyProcessed())).thenReturn(null);
+
+        AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
+        when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(mockCallbackProvider);
+        AgentTracer.forceRegister(mockTracer);
+
+        LambdaAppSecHandler.processRequestStart(event);
+        return captured[0];
+    }
+
+    // ============================================================================
+    // processResponseData Tests — guard conditions
+    // ============================================================================
+
+    @Test
+    void processResponseDataDoesNothingWhenAppSecIsDisabled() {
+        ActiveSubsystems.APPSEC_ACTIVE = false;
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        AgentSpan span = mock(AgentSpan.class);
+
+        LambdaAppSecHandler.processResponseData(span, createOutputStream("{\"statusCode\": 200, \"body\": \"ok\"}"));
+
+        verifyNoInteractions(span);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void notifyAppSecEndFinalizesRequestWhenResponseProcessingThrows() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        RequestContext requestContext = mock(RequestContext.class);
+        when(requestContext.getData(RequestContextSlot.APPSEC)).thenReturn(new Object());
+        AgentSpan span = mock(AgentSpan.class);
+        when(span.getRequestContext()).thenReturn(requestContext);
+
+        BiFunction<RequestContext, IGSpanInfo, Flow<Void>> requestEndedCallback = mock(BiFunction.class);
+        when(requestEndedCallback.apply(any(), any())).thenReturn(Flow.ResultFlow.empty());
+        CallbackProvider callbackProvider = mock(CallbackProvider.class);
+        when(callbackProvider.getCallback(EVENTS.requestEnded())).thenReturn(requestEndedCallback);
+        AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
+        when(tracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(callbackProvider);
+        AgentTracer.forceRegister(tracer);
+
+        ByteArrayOutputStream result = new ByteArrayOutputStream() {
+            @Override
+            public synchronized byte[] toByteArray() {
+                throw new AssertionError("response processing failed");
+            }
         };
 
-    CoreTracer coreTracer = tracerBuilder().build();
-    assertThrows(AssertionError.class, () -> coreTracer.notifyAppSecEnd(span, result));
-    verify(requestEndedCallback).apply(requestContext, span);
-  }
-
-  @Test
-  void processResponseDataDoesNothingForNullSpan() {
-    ByteArrayOutputStream result = createOutputStream("{\"statusCode\": 200}");
-    LambdaAppSecHandler.processResponseData(null, result);
-    // no exception expected
-  }
-
-  @Test
-  void processResponseDataDoesNothingForNonByteArrayOutputStreamResult() {
-    AgentSpan span = mock(AgentSpan.class);
-    LambdaAppSecHandler.processResponseData(span, "string result");
-    verify(span, never()).getRequestContext();
-  }
-
-  @Test
-  void processResponseDataDoesNothingForNullResult() {
-    AgentSpan span = mock(AgentSpan.class);
-    LambdaAppSecHandler.processResponseData(span, null);
-    verify(span, never()).getRequestContext();
-  }
-
-  @Test
-  void processResponseDataPublishesStatusButNoWafEventsWhenSpanHasNoRequestContext() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    AgentSpan span = mock(AgentSpan.class);
-    when(span.getRequestContext()).thenReturn(null);
-    AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
-    AgentTracer.forceRegister(tracer);
-
-    LambdaAppSecHandler.processResponseData(span, createOutputStream("{\"statusCode\": 200}"));
-
-    verify(span).setHttpStatusCode(200);
-    verify(tracer, never()).getCallbackProvider(RequestContextSlot.APPSEC);
-  }
-
-  @Test
-  void processResponseDataStillPublishesStatusWhenSpanHasNoAppSecContext() {
-    // An exception inside processRequestStart leaves an HTTP trigger type recorded but no AppSec
-    // context on the span. http.status_code is a tracing tag and must survive that.
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    RequestContext requestContext = mock(RequestContext.class);
-    AgentSpan span = mock(AgentSpan.class);
-    when(span.getRequestContext()).thenReturn(requestContext);
-    AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
-    AgentTracer.forceRegister(tracer);
-
-    LambdaAppSecHandler.processResponseData(
-        span, createOutputStream("{\"statusCode\": 503, \"body\": \"boom\"}"));
-
-    verify(span).setHttpStatusCode(503);
-    verify(tracer, never()).getCallbackProvider(RequestContextSlot.APPSEC);
-  }
-
-  @Test
-  void processResponseDataDoesNothingForOversizedResponse() {
-    int maxSize = Config.get().getAppSecBodyParsingSizeLimit();
-    char[] chars = new char[maxSize + 1];
-    java.util.Arrays.fill(chars, 'x');
-    ByteArrayOutputStream result = createOutputStream(new String(chars));
-    Integer[] capturedStatus = {null};
-    AgentSpan span =
-        setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertNull(capturedStatus[0]);
-  }
-
-  @Test
-  void processResponseDataDoesNothingForEmptyByteArrayOutputStream() {
-    ByteArrayOutputStream result = new ByteArrayOutputStream();
-    Integer[] capturedStatus = {null};
-    AgentSpan span =
-        setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertNull(capturedStatus[0]);
-  }
-
-  // --- Trigger type gating and fallback ---
-
-  @Test
-  void processResponseDataSkipsNonApiGwResponseWhenTriggerTypeIsUnknown() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.UNKNOWN);
-    ByteArrayOutputStream result = createOutputStream("{\"result\": \"hello\"}");
-    Integer[] capturedStatus = {null};
-    boolean[] headerDoneCalled = {false};
-    AgentSpan span =
-        setupMockResponseCallbacks(
-            status -> capturedStatus[0] = status, null, () -> headerDoneCalled[0] = true, null);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertNull(capturedStatus[0]);
-    assertFalse(headerDoneCalled[0]);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void processResponseDataInfersSuccessForFunctionUrlPlainJsonResponse() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.LAMBDA_URL);
-    ByteArrayOutputStream result = createOutputStream("{\"result\": \"hello\"}");
-    Integer[] capturedStatus = {null};
-    Map<String, String> capturedHeaders = new HashMap<>();
-    boolean[] headerDoneCalled = {false};
-    Object[] capturedBody = {null};
-    AgentSpan span =
-        setupMockResponseCallbacks(
-            status -> capturedStatus[0] = status,
-            capturedHeaders::put,
-            () -> headerDoneCalled[0] = true,
-            body -> capturedBody[0] = body);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertEquals(200, capturedStatus[0]);
-    verify(span).setHttpStatusCode(200);
-    verify(span).setError(false, ErrorPriorities.HTTP_SERVER_DECORATOR);
-    assertEquals("application/json", capturedHeaders.get("content-type"));
-    assertTrue(headerDoneCalled[0]);
-    assertInstanceOf(Map.class, capturedBody[0]);
-    assertEquals("hello", ((Map<?, ?>) capturedBody[0]).get("result"));
-  }
-
-  @Test
-  void processResponseDataInfersSuccessForHttpApiV2JsonStringResponse() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V2_HTTP);
-    ByteArrayOutputStream result = createOutputStream("\"Hello World!\"");
-    Integer[] capturedStatus = {null};
-    Object[] capturedBody = {null};
-    AgentSpan span =
-        setupMockResponseCallbacks(
-            status -> capturedStatus[0] = status, null, null, body -> capturedBody[0] = body);
-
-    LambdaAppSecHandler.processResponseData(span, result);
-
-    assertEquals(200, capturedStatus[0]);
-    assertEquals("Hello World!", capturedBody[0]);
-  }
-
-  @ParameterizedTest
-  @ValueSource(ints = {0, -1})
-  @SuppressWarnings("unchecked")
-  void processResponseDataKeepsParsedDataWithoutStartingNonPositiveStatus(int statusCode) {
-    // An explicit non-positive status with headers/body should use the parsed data without
-    // publishing the unusable status.
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V2_HTTP);
-    ByteArrayOutputStream result =
-        createOutputStream(
-            "{\"statusCode\": "
+        CoreTracer coreTracer = tracerBuilder().build();
+        assertThrows(AssertionError.class, () -> coreTracer.notifyAppSecEnd(span, result));
+        verify(requestEndedCallback).apply(requestContext, span);
+    }
+
+    @Test
+    void processResponseDataDoesNothingForNullSpan() {
+        ByteArrayOutputStream result = createOutputStream("{\"statusCode\": 200}");
+        LambdaAppSecHandler.processResponseData(null, result);
+        // no exception expected
+    }
+
+    @Test
+    void processResponseDataDoesNothingForNonByteArrayOutputStreamResult() {
+        AgentSpan span = mock(AgentSpan.class);
+        LambdaAppSecHandler.processResponseData(span, "string result");
+        verify(span, never()).getRequestContext();
+    }
+
+    @Test
+    void processResponseDataDoesNothingForNullResult() {
+        AgentSpan span = mock(AgentSpan.class);
+        LambdaAppSecHandler.processResponseData(span, null);
+        verify(span, never()).getRequestContext();
+    }
+
+    @Test
+    void processResponseDataPublishesStatusButNoWafEventsWhenSpanHasNoRequestContext() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        AgentSpan span = mock(AgentSpan.class);
+        when(span.getRequestContext()).thenReturn(null);
+        AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
+        AgentTracer.forceRegister(tracer);
+
+        LambdaAppSecHandler.processResponseData(span, createOutputStream("{\"statusCode\": 200}"));
+
+        verify(span).setHttpStatusCode(200);
+        verify(tracer, never()).getCallbackProvider(RequestContextSlot.APPSEC);
+    }
+
+    @Test
+    void processResponseDataStillPublishesStatusWhenSpanHasNoAppSecContext() {
+        // An exception inside processRequestStart leaves an HTTP trigger type recorded but no AppSec
+        // context on the span. http.status_code is a tracing tag and must survive that.
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        RequestContext requestContext = mock(RequestContext.class);
+        AgentSpan span = mock(AgentSpan.class);
+        when(span.getRequestContext()).thenReturn(requestContext);
+        AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class);
+        AgentTracer.forceRegister(tracer);
+
+        LambdaAppSecHandler.processResponseData(span, createOutputStream("{\"statusCode\": 503, \"body\": \"boom\"}"));
+
+        verify(span).setHttpStatusCode(503);
+        verify(tracer, never()).getCallbackProvider(RequestContextSlot.APPSEC);
+    }
+
+    @Test
+    void processResponseDataDoesNothingForOversizedResponse() {
+        int maxSize = Config.get().getAppSecBodyParsingSizeLimit();
+        char[] chars = new char[maxSize + 1];
+        java.util.Arrays.fill(chars, 'x');
+        ByteArrayOutputStream result = createOutputStream(new String(chars));
+        Integer[] capturedStatus = {null};
+        AgentSpan span = setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertNull(capturedStatus[0]);
+    }
+
+    @Test
+    void processResponseDataDoesNothingForEmptyByteArrayOutputStream() {
+        ByteArrayOutputStream result = new ByteArrayOutputStream();
+        Integer[] capturedStatus = {null};
+        AgentSpan span = setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertNull(capturedStatus[0]);
+    }
+
+    // --- Trigger type gating and fallback ---
+
+    @Test
+    void processResponseDataSkipsNonApiGwResponseWhenTriggerTypeIsUnknown() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.UNKNOWN);
+        ByteArrayOutputStream result = createOutputStream("{\"result\": \"hello\"}");
+        Integer[] capturedStatus = {null};
+        boolean[] headerDoneCalled = {false};
+        AgentSpan span = setupMockResponseCallbacks(
+                status -> capturedStatus[0] = status, null, () -> headerDoneCalled[0] = true, null);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertNull(capturedStatus[0]);
+        assertFalse(headerDoneCalled[0]);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void processResponseDataInfersSuccessForFunctionUrlPlainJsonResponse() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.LAMBDA_URL);
+        ByteArrayOutputStream result = createOutputStream("{\"result\": \"hello\"}");
+        Integer[] capturedStatus = {null};
+        Map<String, String> capturedHeaders = new HashMap<>();
+        boolean[] headerDoneCalled = {false};
+        Object[] capturedBody = {null};
+        AgentSpan span = setupMockResponseCallbacks(
+                status -> capturedStatus[0] = status,
+                capturedHeaders::put,
+                () -> headerDoneCalled[0] = true,
+                body -> capturedBody[0] = body);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertEquals(200, capturedStatus[0]);
+        verify(span).setHttpStatusCode(200);
+        verify(span).setError(false, ErrorPriorities.HTTP_SERVER_DECORATOR);
+        assertEquals("application/json", capturedHeaders.get("content-type"));
+        assertTrue(headerDoneCalled[0]);
+        assertInstanceOf(Map.class, capturedBody[0]);
+        assertEquals("hello", ((Map<?, ?>) capturedBody[0]).get("result"));
+    }
+
+    @Test
+    void processResponseDataInfersSuccessForHttpApiV2JsonStringResponse() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V2_HTTP);
+        ByteArrayOutputStream result = createOutputStream("\"Hello World!\"");
+        Integer[] capturedStatus = {null};
+        Object[] capturedBody = {null};
+        AgentSpan span = setupMockResponseCallbacks(
+                status -> capturedStatus[0] = status, null, null, body -> capturedBody[0] = body);
+
+        LambdaAppSecHandler.processResponseData(span, result);
+
+        assertEquals(200, capturedStatus[0]);
+        assertEquals("Hello World!", capturedBody[0]);
+    }
+
+    @ParameterizedTest
+    @ValueSource(ints = {0, -1})
+    @SuppressWarnings("unchecked")
+    void processResponseDataKeepsParsedDataWithoutStartingNonPositiveStatus(int statusCode) {
+        // An explicit non-positive status with headers/body should use the parsed data without
+        // publishing the unusable status.
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V2_HTTP);
+        ByteArrayOutputStream result = createOutputStream("{\"statusCode\": "
                 + statusCode
                 + ", \"headers\": {\"content-type\": \"text/plain\"}, \"body\": \"hello\"}");
-    Integer[] capturedStatus = {null};
-    Map<String, String> capturedHeaders = new HashMap<>();
-    boolean[] headerDoneCalled = {false};
-    Object[] capturedBody = {null};
-    AgentSpan span =
-        setupMockResponseCallbacks(
-            status -> capturedStatus[0] = status,
-            capturedHeaders::put,
-            () -> headerDoneCalled[0] = true,
-            body -> capturedBody[0] = body);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertNull(capturedStatus[0]);
-    verify(span, never()).setHttpStatusCode(anyInt());
-    assertEquals("text/plain", capturedHeaders.get("content-type")); // parsed header kept
-    assertTrue(headerDoneCalled[0]);
-    assertEquals("hello", capturedBody[0]); // parsed body kept, not the whole envelope
-  }
-
-  @ParameterizedTest
-  @EnumSource(
-      value = LambdaTriggerType.class,
-      names = {"API_GATEWAY_V2_HTTP", "LAMBDA_URL"})
-  void processResponseDataTreatsProxyShapedResponseWithoutStatusCodeAsImplicitSuccess(
-      LambdaTriggerType triggerType) {
-    // Without a statusCode key the gateway does not interpret headers/body/isBase64Encoded at all:
-    // it serialises the whole object as the body of a 200 response with content-type
-    // application/json, so the declared text/html and the base64 encoding never reach the client.
-    LambdaAppSecHandler.setCurrentTriggerType(triggerType);
-    ByteArrayOutputStream result =
-        createOutputStream(
-            "{\"headers\": {\"content-type\": \"text/html\"}, \"body\": \"PGgxPmhpPC9oMT4=\", \"isBase64Encoded\": true}");
-    Integer[] capturedStatus = {null};
-    Map<String, String> capturedHeaders = new HashMap<>();
-    Object[] capturedBody = {null};
-    AgentSpan span =
-        setupMockResponseCallbacks(
-            status -> capturedStatus[0] = status,
-            capturedHeaders::put,
-            null,
-            body -> capturedBody[0] = body);
-
-    LambdaAppSecHandler.processResponseData(span, result);
-
-    assertEquals(200, capturedStatus[0]);
-    verify(span).setHttpStatusCode(200);
-    assertEquals(1, capturedHeaders.size());
-    assertEquals("application/json", capturedHeaders.get("content-type"));
-    assertInstanceOf(Map.class, capturedBody[0]);
-    Map<?, ?> envelope = (Map<?, ?>) capturedBody[0];
-    // the whole envelope is the body, and its body field stays base64-encoded
-    assertEquals("PGgxPmhpPC9oMT4=", envelope.get("body"));
-    assertInstanceOf(Map.class, envelope.get("headers"));
-  }
-
-  @ParameterizedTest
-  @EnumSource(
-      value = LambdaTriggerType.class,
-      names = {"API_GATEWAY_V1_REST", "ALB", "ALB_MULTI_VALUE", "API_GATEWAY_V2_WEBSOCKET"})
-  void processResponseDataHonoursAnEnvelopeWithoutStatusCodeOnProxyTriggers(
-      LambdaTriggerType triggerType) {
-    // The mirror of the implicit-success case: these triggers never infer a 200, so the envelope
-    // is still interpreted — the declared content type and the decoded body are what the client
-    // gets — and only the status stays unknown.
-    LambdaAppSecHandler.setCurrentTriggerType(triggerType);
-    ByteArrayOutputStream result =
-        createOutputStream(
-            "{\"headers\": {\"content-type\": \"text/html\"}, \"body\": \"PGgxPmhpPC9oMT4=\", \"isBase64Encoded\": true}");
-    Integer[] capturedStatus = {null};
-    Map<String, String> capturedHeaders = new HashMap<>();
-    Object[] capturedBody = {null};
-    AgentSpan span =
-        setupMockResponseCallbacks(
-            status -> capturedStatus[0] = status,
-            capturedHeaders::put,
-            null,
-            body -> capturedBody[0] = body);
-
-    LambdaAppSecHandler.processResponseData(span, result);
-
-    assertNull(capturedStatus[0]);
-    verify(span, never()).setHttpStatusCode(anyInt());
-    assertEquals("text/html", capturedHeaders.get("content-type"));
-    assertEquals("<h1>hi</h1>", capturedBody[0]);
-  }
-
-  @Test
-  void processResponseDataAppliesFallbackForHttpTriggerWithNonJsonStringResponse() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    // JSON-encoded string (as returned by a RequestHandler<I, String>)
-    ByteArrayOutputStream result = createOutputStream("\"Hello World!\"");
-    Integer[] capturedStatus = {null};
-    boolean[] headerDoneCalled = {false};
-    Object[] capturedBody = {null};
-    AgentSpan span =
-        setupMockResponseCallbacks(
-            status -> capturedStatus[0] = status,
-            null,
-            () -> headerDoneCalled[0] = true,
-            body -> capturedBody[0] = body);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertNull(capturedStatus[0]);
-    assertTrue(headerDoneCalled[0]);
-    assertEquals("Hello World!", capturedBody[0]);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void processResponseDataWebSocketWithStatusCodeFiresResponseStarted() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V2_WEBSOCKET);
-    // $connect handler returning a proper statusCode — should be treated like any API-GW response
-    ByteArrayOutputStream result = createOutputStream("{\"statusCode\": 200}");
-    Integer[] capturedStatus = {null};
-    boolean[] headerDoneCalled = {false};
-    AgentSpan span =
-        setupMockResponseCallbacks(
-            status -> capturedStatus[0] = status, null, () -> headerDoneCalled[0] = true, null);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertEquals(200, capturedStatus[0]);
-    assertTrue(headerDoneCalled[0]);
-  }
-
-  @Test
-  void processResponseDataWebSocketWithoutStatusCodeUsesFallbackWithNoStatus() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V2_WEBSOCKET);
-    // Message-route handler returning arbitrary data — no statusCode, fallback path
-    ByteArrayOutputStream result = createOutputStream("{\"message\": \"hello\"}");
-    Integer[] capturedStatus = {null};
-    boolean[] headerDoneCalled = {false};
-    Object[] capturedBody = {null};
-    AgentSpan span =
-        setupMockResponseCallbacks(
-            status -> capturedStatus[0] = status,
-            null,
-            () -> headerDoneCalled[0] = true,
-            body -> capturedBody[0] = body);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertNull(capturedStatus[0]); // no responseStarted for status-less WebSocket messages
-    assertTrue(headerDoneCalled[0]);
-    assertInstanceOf(Map.class, capturedBody[0]);
-  }
-
-  @Test
-  void processResponseDataSkipsNonApiGwResponseWhenTriggerTypeIsNull() {
-    // No processRequestStart called — thread-local is null — behaves like unknown
-    ByteArrayOutputStream result = createOutputStream("{\"result\": \"hello\"}");
-    Integer[] capturedStatus = {null};
-    AgentSpan span =
-        setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertNull(capturedStatus[0]);
-  }
-
-  // --- Status code extraction ---
-
-  @Test
-  void processResponseDataExtractsStatusCodeCorrectly() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    ByteArrayOutputStream result = createOutputStream("{\"statusCode\": 200, \"body\": \"ok\"}");
-    Integer[] capturedStatus = {null};
-    AgentSpan span =
-        setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertEquals(200, capturedStatus[0]);
-  }
-
-  @Test
-  void processResponseDataExtractsStatusCodeAsIntegerFromDouble() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    ByteArrayOutputStream result =
-        createOutputStream("{\"statusCode\": 404.0, \"body\": \"not found\"}");
-    Integer[] capturedStatus = {null};
-    AgentSpan span =
-        setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertEquals(404, capturedStatus[0]);
-  }
-
-  @ParameterizedTest
-  @EnumSource(
-      value = LambdaTriggerType.class,
-      names = {"API_GATEWAY_V1_REST", "API_GATEWAY_V2_WEBSOCKET", "ALB", "ALB_MULTI_VALUE"})
-  void processResponseDataDoesNotInferStatusForProxyTriggers(LambdaTriggerType triggerType) {
-    LambdaAppSecHandler.setCurrentTriggerType(triggerType);
-    ByteArrayOutputStream result = createOutputStream("{\"body\": \"ok\"}");
-    Integer[] capturedStatus = {null};
-    AgentSpan span =
-        setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertNull(capturedStatus[0]);
-  }
-
-  @Test
-  void processResponseDataHandlesNonNumericStatusCode() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V2_HTTP);
-    ByteArrayOutputStream result =
-        createOutputStream("{\"statusCode\": \"bad\", \"body\": \"ok\"}");
-    Integer[] capturedStatus = {null};
-    AgentSpan span =
-        setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertNull(capturedStatus[0]);
-    verify(span, never()).setHttpStatusCode(anyInt());
-  }
-
-  // --- Header extraction ---
-
-  @Test
-  void processResponseDataForwardsAllResponseHeaders() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    String json =
-        "{\"statusCode\": 200, \"headers\": {\"content-type\": \"application/json\", \"x-custom\": \"val\", \"content-length\": \"42\", \"set-cookie\": \"a=1\"}}";
-    ByteArrayOutputStream result = createOutputStream(json);
-    Map<String, String> capturedHeaders = new HashMap<>();
-    AgentSpan span = setupMockResponseCallbacks(null, capturedHeaders::put, null, null);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertEquals(4, capturedHeaders.size());
-    assertEquals("application/json", capturedHeaders.get("content-type"));
-    assertEquals("val", capturedHeaders.get("x-custom"));
-    assertEquals("42", capturedHeaders.get("content-length"));
-    assertEquals("a=1", capturedHeaders.get("set-cookie"));
-  }
-
-  @Test
-  void processResponseDataLowercasesHeaderKeys() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    String json =
-        "{\"statusCode\": 200, \"headers\": {\"Content-Type\": \"text/html\", \"CONTENT-LENGTH\": \"10\"}}";
-    ByteArrayOutputStream result = createOutputStream(json);
-    Map<String, String> capturedHeaders = new HashMap<>();
-    AgentSpan span = setupMockResponseCallbacks(null, capturedHeaders::put, null, null);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertEquals("text/html", capturedHeaders.get("content-type"));
-    assertEquals("10", capturedHeaders.get("content-length"));
-  }
-
-  @Test
-  void processResponseDataMergesMultiValueHeadersWithSingleValueHeaders() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    String json =
-        "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/html\"}, \"multiValueHeaders\": {\"content-encoding\": [\"gzip\", \"br\"]}}";
-    ByteArrayOutputStream result = createOutputStream(json);
-    Map<String, String> capturedHeaders = new HashMap<>();
-    AgentSpan span = setupMockResponseCallbacks(null, capturedHeaders::put, null, null);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertEquals("text/html", capturedHeaders.get("content-type"));
-    assertEquals("gzip, br", capturedHeaders.get("content-encoding"));
-  }
-
-  @Test
-  void processResponseDataHandlesEmptyHeaders() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    ByteArrayOutputStream result = createOutputStream("{\"statusCode\": 200}");
-    Map<String, String> capturedHeaders = new HashMap<>();
-    boolean[] headerDoneCalled = {false};
-    AgentSpan span =
-        setupMockResponseCallbacks(
-            null, capturedHeaders::put, () -> headerDoneCalled[0] = true, null);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertTrue(capturedHeaders.isEmpty());
-    assertTrue(headerDoneCalled[0]);
-  }
-
-  // --- Body extraction ---
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void processResponseDataParsesJsonBody() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    String json =
-        "{\"statusCode\": 200, \"headers\": {\"content-type\": \"application/json\"}, \"body\": \"{\\\"key\\\": \\\"value\\\"}\"}";
-    ByteArrayOutputStream result = createOutputStream(json);
-    Object[] capturedBody = {null};
-    AgentSpan span = setupMockResponseCallbacks(null, null, null, body -> capturedBody[0] = body);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertInstanceOf(Map.class, capturedBody[0]);
-    assertEquals("value", ((Map<?, ?>) capturedBody[0]).get("key"));
-  }
-
-  @Test
-  void processResponseDataHandlesNonJsonBodyAsRawString() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    String json =
-        "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/plain\"}, \"body\": \"plain text\"}";
-    ByteArrayOutputStream result = createOutputStream(json);
-    Object[] capturedBody = {null};
-    AgentSpan span = setupMockResponseCallbacks(null, null, null, body -> capturedBody[0] = body);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertEquals("plain text", capturedBody[0]);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void processResponseDataHandlesBase64EncodedBody() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    String originalBody = "{\"decoded\": \"content\"}";
-    String base64Body =
-        Base64.getEncoder().encodeToString(originalBody.getBytes(StandardCharsets.UTF_8));
-    String json =
-        "{\"statusCode\": 200, \"body\": \"" + base64Body + "\", \"isBase64Encoded\": true}";
-    ByteArrayOutputStream result = createOutputStream(json);
-    Object[] capturedBody = {null};
-    AgentSpan span = setupMockResponseCallbacks(null, null, null, body -> capturedBody[0] = body);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertInstanceOf(Map.class, capturedBody[0]);
-    assertEquals("content", ((Map<?, ?>) capturedBody[0]).get("decoded"));
-  }
-
-  @Test
-  void processResponseDataHandlesNullBody() {
-    ByteArrayOutputStream result = createOutputStream("{\"statusCode\": 200, \"body\": null}");
-    String[] capturedBody = {"NOT_CALLED"};
-    AgentSpan span =
-        setupMockResponseCallbacks(
-            null, null, null, body -> capturedBody[0] = String.valueOf(body));
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertEquals("NOT_CALLED", capturedBody[0]);
-  }
-
-  @Test
-  void processResponseDataHandlesMissingBodyField() {
-    ByteArrayOutputStream result = createOutputStream("{\"statusCode\": 200}");
-    String[] capturedBody = {"NOT_CALLED"};
-    AgentSpan span =
-        setupMockResponseCallbacks(
-            null, null, null, body -> capturedBody[0] = String.valueOf(body));
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertEquals("NOT_CALLED", capturedBody[0]);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void processResponseDataAttemptsJsonParseWhenNoContentType() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    ByteArrayOutputStream result =
-        createOutputStream("{\"statusCode\": 200, \"body\": \"{\\\"a\\\": 1}\"}");
-    Object[] capturedBody = {null};
-    AgentSpan span = setupMockResponseCallbacks(null, null, null, body -> capturedBody[0] = body);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertInstanceOf(Map.class, capturedBody[0]);
-    assertEquals(1.0d, ((Map<?, ?>) capturedBody[0]).get("a"));
-  }
-
-  @Test
-  void processResponseDataFallsBackToRawStringWhenJsonParseFails() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    ByteArrayOutputStream result =
-        createOutputStream("{\"statusCode\": 200, \"body\": \"not json {\"}");
-    Object[] capturedBody = {null};
-    AgentSpan span = setupMockResponseCallbacks(null, null, null, body -> capturedBody[0] = body);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertEquals("not json {", capturedBody[0]);
-  }
-
-  // --- Event ordering ---
-
-  @Test
-  void processResponseDataFiresEventsInCorrectOrder() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    String json =
-        "{\"statusCode\": 200, \"headers\": {\"content-type\": \"application/json\"}, \"body\": \"{\\\"k\\\": \\\"v\\\"}\"}";
-    ByteArrayOutputStream result = createOutputStream(json);
-    List<String> order = new ArrayList<>();
-
-    AgentSpan span =
-        setupMockResponseCallbacks(
-            status -> order.add("responseStarted"),
-            (name, value) -> order.add("responseHeader"),
-            () -> order.add("responseHeaderDone"),
-            body -> order.add("responseBody"));
-
-    LambdaAppSecHandler.processResponseData(span, result);
-
-    assertEquals("responseStarted", order.get(0));
-    assertTrue(order.stream().filter("responseHeader"::equals).count() >= 1);
-    int headerDoneIdx = order.indexOf("responseHeaderDone");
-    int lastHeaderIdx = order.lastIndexOf("responseHeader");
-    assertTrue(headerDoneIdx > lastHeaderIdx);
-    assertEquals("responseBody", order.get(order.size() - 1));
-  }
-
-  @Test
-  void processResponseDataHandlesInvalidBase64ResponseBodyGracefully() {
-    String json =
-        "{\"statusCode\": 200, \"body\": \"not-valid-base64!!!\", \"isBase64Encoded\": true}";
-    ByteArrayOutputStream result = createOutputStream(json);
-    String[] capturedBody = {"NOT_CALLED"};
-    AgentSpan span =
-        setupMockResponseCallbacks(
-            null, null, null, body -> capturedBody[0] = String.valueOf(body));
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertEquals("NOT_CALLED", capturedBody[0]);
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void processResponseDataParsesBodyAsJsonForJavascriptContentType() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    String json =
-        "{\"statusCode\": 200, \"headers\": {\"content-type\": \"application/javascript\"}, \"body\": \"{\\\"key\\\": \\\"val\\\"}\"}";
-    ByteArrayOutputStream result = createOutputStream(json);
-    Object[] capturedBody = {null};
-    AgentSpan span = setupMockResponseCallbacks(null, null, null, body -> capturedBody[0] = body);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertInstanceOf(Map.class, capturedBody[0]);
-    assertEquals("val", ((Map<?, ?>) capturedBody[0]).get("key"));
-  }
-
-  @Test
-  void processResponseDataKeepsMultiValueHeadersEntryWithNonListValue() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    String json =
-        "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/html\"}, \"multiValueHeaders\": {\"x-scalar\": \"not-a-list\", \"x-valid\": [\"v1\", \"v2\"]}}";
-    ByteArrayOutputStream result = createOutputStream(json);
-    Map<String, String> capturedHeaders = new HashMap<>();
-    AgentSpan span = setupMockResponseCallbacks(null, capturedHeaders::put, null, null);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertEquals("text/html", capturedHeaders.get("content-type"));
-    assertEquals("v1, v2", capturedHeaders.get("x-valid"));
-    // Not a shape AWS sends, but the runtime would still deliver the header, so it is reported
-    assertEquals("not-a-list", capturedHeaders.get("x-scalar"));
-  }
-
-  @Test
-  void processResponseDataMultiValueHeadersOverrideSingleValueHeaders() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    String json =
-        "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/html\"}, \"multiValueHeaders\": {\"content-type\": [\"application/json\", \"charset=utf-8\"]}}";
-    ByteArrayOutputStream result = createOutputStream(json);
-    Map<String, String> capturedHeaders = new HashMap<>();
-    AgentSpan span = setupMockResponseCallbacks(null, capturedHeaders::put, null, null);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertEquals("application/json, charset=utf-8", capturedHeaders.get("content-type"));
-  }
-
-  // --- Error handling ---
-
-  @Test
-  void processResponseDataHandlesMalformedJsonResponse() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V2_HTTP);
-    ByteArrayOutputStream result = createOutputStream("{not valid json");
-    Integer[] capturedStatus = {null};
-    AgentSpan span =
-        setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null);
-    LambdaAppSecHandler.processResponseData(span, result);
-    assertNull(capturedStatus[0]);
-  }
-
-  // ============================================================================
-  // processResponseData — null individual callback handling
-  // ============================================================================
-
-  @Test
-  void processResponseDataHandlesNullResponseHeaderDoneCallbackGracefully() {
-    String json =
-        "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/plain\"}, \"body\": \"ok\"}";
-    ByteArrayOutputStream result = createOutputStream(json);
-
-    RequestContext mockRequestContext = mock(RequestContext.class);
-    AgentSpan span = mock(AgentSpan.class);
-    when(span.getRequestContext()).thenReturn(mockRequestContext);
-
-    CallbackProvider cbp = mock(CallbackProvider.class);
-    when(cbp.getCallback(EVENTS.responseStarted())).thenReturn(null);
-    when(cbp.getCallback(EVENTS.responseHeader())).thenReturn(null);
-    when(cbp.getCallback(EVENTS.responseHeaderDone())).thenReturn(null);
-    when(cbp.getCallback(EVENTS.responseBody())).thenReturn(null);
-
-    AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
-    when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(cbp);
-    AgentTracer.forceRegister(mockTracer);
-
-    LambdaAppSecHandler.processResponseData(span, result);
-    // no exception expected — all null callbacks must be silently skipped
-  }
-
-  @Test
-  void processResponseDataSkipsResponseStartedWhenCallbackIsNull() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    String json = "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/plain\"}}";
-    ByteArrayOutputStream result = createOutputStream(json);
-    Map<String, String> capturedHeaders = new HashMap<>();
-    boolean[] headerDoneCalled = {false};
-    AgentSpan span =
-        setupMockResponseCallbacks(
-            null, capturedHeaders::put, () -> headerDoneCalled[0] = true, null);
-    assertDoesNotThrow(() -> LambdaAppSecHandler.processResponseData(span, result));
-    assertTrue(headerDoneCalled[0]);
-  }
-
-  @Test
-  void processResponseDataSkipsResponseHeaderWhenCallbackIsNull() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    String json = "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/plain\"}}";
-    ByteArrayOutputStream result = createOutputStream(json);
-    Integer[] capturedStatus = {null};
-    boolean[] headerDoneCalled = {false};
-    AgentSpan span =
-        setupMockResponseCallbacks(
-            status -> capturedStatus[0] = status, null, () -> headerDoneCalled[0] = true, null);
-    assertDoesNotThrow(() -> LambdaAppSecHandler.processResponseData(span, result));
-    assertEquals(200, capturedStatus[0]);
-    assertTrue(headerDoneCalled[0]);
-  }
-
-  // ============================================================================
-  // extractResponseData Unit Tests
-  // ============================================================================
-
-  @ParameterizedTest(name = "[{index}] {0}")
-  @ValueSource(strings = {"{bad json", ""})
-  void reportsUnparseablePayloadAsTextWithoutAStatus(String json) {
-    // The payload is not JSON at all, so it is not a valid response for any HTTP trigger: the
-    // gateway substitutes its own error and the status is not knowable here.
-    LambdaResponseData response = parseResponse(json, LambdaTriggerType.API_GATEWAY_V1_REST);
-
-    assertNull(response.statusCode);
-    assertEquals(singletonMap("content-type", "text/plain"), response.headers);
-    assertEquals(json, response.body);
-  }
-
-  @Test
-  void extractResponseDataPreservesJsonNullAsAValidPlainResponse() {
-    LambdaResponseData response = parseResponse("null", LambdaTriggerType.API_GATEWAY_V1_REST);
-
-    assertNull(response.statusCode);
-    assertEquals(singletonMap("content-type", "application/json"), response.headers);
-    assertNull(response.body);
-  }
-
-  @ParameterizedTest(name = "[{index}] content-type {0}")
-  @ValueSource(strings = {"", "application/json"})
-  void parsesAResponseBodyAsJsonWhenTheContentTypeIsBlankOrJson(String contentType) {
-    // A blank content type says nothing about the body, so it gets the same best-effort JSON parse
-    // as an absent one, matching the request path.
-    LambdaResponseData response =
-        parseResponse(
-            "{\"statusCode\": 200, \"headers\": {\"content-type\": \""
-                + contentType
-                + "\"}, \"body\": \"{\\\"a\\\":1}\"}",
-            LambdaTriggerType.API_GATEWAY_V1_REST);
-
-    assertEquals(singletonMap("a", 1.0), response.body);
-  }
-
-  @Test
-  void keepsAResponseBodyRawWhenTheContentTypeIsNotJson() {
-    LambdaResponseData response =
-        parseResponse(
-            "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/plain\"},"
-                + " \"body\": \"{\\\"a\\\":1}\"}",
-            LambdaTriggerType.API_GATEWAY_V1_REST);
-
-    assertEquals("{\"a\":1}", response.body);
-  }
-
-  @Test
-  void distinguishesAbsentStatusCodeFromExplicitZero() {
-    // Absent: the gateway serialises the whole value as the body of a 200. Present: the payload is
-    // an envelope, so the status is kept as received and never defaulted.
-    LambdaResponseData absent =
-        parseResponse("{\"body\":\"ok\"}", LambdaTriggerType.API_GATEWAY_V2_HTTP);
-    LambdaResponseData explicitZero =
-        parseResponse("{\"statusCode\":0,\"body\":\"ok\"}", LambdaTriggerType.API_GATEWAY_V2_HTTP);
-
-    assertEquals(200, absent.statusCode);
-    assertEquals(singletonMap("body", "ok"), absent.body);
-    assertEquals(0, explicitZero.statusCode);
-    assertEquals("ok", explicitZero.body);
-  }
-
-  // ============================================================================
-  // HTTP span tags
-  // ============================================================================
-
-  @Test
-  void appliesHttpTagsForRestApiEvent() {
-    setupMockCallbacks(new Callbacks());
-    AgentSpanContext context =
-        LambdaAppSecHandler.processRequestStart(
-            createInputStream(
-                "{\"resource\": \"/users/{id}\", \"path\": \"/users/42\", \"httpMethod\":"
-                    + " \"GET\", \"queryStringParameters\": {\"q\": \"hello\"}, \"headers\":"
-                    + " {\"Host\": \"api.example.com\", \"User-Agent\": \"curl/8.1\","
-                    + " \"X-Forwarded-Proto\": \"https\", \"X-Forwarded-Port\": \"443\"},"
-                    + " \"requestContext\": {\"httpMethod\": \"GET\", \"domainName\":"
-                    + " \"api.example.com\"}}"));
-
-    Map<String, Object> tags = tagsOf(context);
-    assertEquals("aws-lambda", tags.get(Tags.COMPONENT));
-    assertEquals("GET", tags.get(Tags.HTTP_METHOD));
-    assertEquals("https://api.example.com/users/42", tags.get(Tags.HTTP_URL));
-    assertEquals("q=hello", tags.get(DDTags.HTTP_QUERY));
-    assertEquals("curl/8.1", tags.get(Tags.HTTP_USER_AGENT));
-    assertEquals("/users/{id}", tags.get(Tags.HTTP_ROUTE));
-    assertEquals("api.example.com", tags.get(Tags.HTTP_HOSTNAME));
-  }
-
-  @Test
-  void appliesHttpTagsWithForwardedSchemeAndPort() {
-    setupMockCallbacks(new Callbacks());
-    AgentSpanContext context =
-        LambdaAppSecHandler.processRequestStart(
-            createInputStream(
-                "{\"headers\": {\"host\": \"api.example.com\", \"x-forwarded-proto\": \"http\","
-                    + " \"x-forwarded-port\": \"8080\"}, \"requestContext\": {\"domainName\":"
-                    + " \"api.example.com\", \"routeKey\": \"POST /orders\", \"http\":"
-                    + " {\"method\": \"POST\", \"path\": \"/orders\"}}}"));
-
-    Map<String, Object> tags = tagsOf(context);
-    assertEquals("POST", tags.get(Tags.HTTP_METHOD));
-    assertEquals("http://api.example.com:8080/orders", tags.get(Tags.HTTP_URL));
-    assertEquals("/orders", tags.get(Tags.HTTP_ROUTE));
-    assertNull(tags.get(DDTags.HTTP_QUERY));
-  }
-
-  @Test
-  void omitsDefaultPortForForwardedHttpScheme() {
-    setupMockCallbacks(new Callbacks());
-    AgentSpanContext context =
-        LambdaAppSecHandler.processRequestStart(
-            createInputStream(
-                "{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
-                    + " \"lb.example.com\", \"x-forwarded-proto\": \"http\"}, \"requestContext\":"
-                    + " {\"elb\": {\"targetGroupArn\": \"arn\"}}}"));
-
-    // No x-forwarded-port: the default must follow the scheme, or ":443" leaks into the URL
-    assertEquals("http://lb.example.com/alb", tagsOf(context).get(Tags.HTTP_URL));
-  }
-
-  @Test
-  void ignoresEmptyForwardedPort() {
-    setupMockCallbacks(new Callbacks());
-    AgentSpanContext context =
-        LambdaAppSecHandler.processRequestStart(
-            createInputStream(
-                "{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
-                    + " \"lb.example.com\", \"x-forwarded-proto\": \"http\","
-                    + " \"x-forwarded-port\": \"\"}, \"requestContext\": {\"elb\":"
-                    + " {\"targetGroupArn\": \"arn\"}}}"));
-
-    // An empty header value takes the same path as a missing one rather than reaching parseInt
-    assertEquals("http://lb.example.com/alb", tagsOf(context).get(Tags.HTTP_URL));
-  }
-
-  @Test
-  void normalisesForwardedSchemeCasing() {
-    setupMockCallbacks(new Callbacks());
-    AgentSpanContext context =
-        LambdaAppSecHandler.processRequestStart(
-            createInputStream(
-                "{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
-                    + " \"lb.example.com\", \"x-forwarded-proto\": \"HTTP\"}, \"requestContext\":"
-                    + " {\"elb\": {\"targetGroupArn\": \"arn\"}}}"));
-
-    // Lowercased before use, or the port default and URIUtils.buildURL both miss and ":443" leaks
-    assertEquals("http://lb.example.com/alb", tagsOf(context).get(Tags.HTTP_URL));
-  }
-
-  @Test
-  void fallsBackToHttpsForUnrecognisedForwardedScheme() {
-    setupMockCallbacks(new Callbacks());
-    AgentSpanContext context =
-        LambdaAppSecHandler.processRequestStart(
-            createInputStream(
-                "{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
-                    + " \"lb.example.com\", \"x-forwarded-proto\": \"https, http\"},"
-                    + " \"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn\"}}}"));
-
-    // Lambda comma-joins duplicate request headers, so a client-supplied X-Forwarded-Proto arrives
-    // appended to the real one: taken verbatim it would yield "https, http://lb.example.com/alb"
-    assertEquals("https://lb.example.com/alb", tagsOf(context).get(Tags.HTTP_URL));
-  }
-
-  @Test
-  void keepsRepeatedQueryKeysFromTheV2RawQueryString() {
-    setupMockCallbacks(new Callbacks());
-    AgentSpanContext context =
-        LambdaAppSecHandler.processRequestStart(
-            createInputStream(
-                "{\"rawPath\": \"/orders\", \"rawQueryString\": \"a=1&a=2\","
-                    + " \"queryStringParameters\": {\"a\": \"1,2\"}, \"requestContext\":"
-                    + " {\"domainName\": \"api.example.com\", \"http\": {\"method\": \"GET\","
-                    + " \"path\": \"/orders\"}}}"));
-
-    // API Gateway comma-joins repeats into queryStringParameters, so rebuilding from that map
-    // would report a=1%2C2
-    assertEquals("a=1&a=2", tagsOf(context).get(DDTags.HTTP_QUERY));
-  }
-
-  @Test
-  void keepsRepeatedQueryKeysFromTheV1MultiValueParameters() {
-    setupMockCallbacks(new Callbacks());
-    AgentSpanContext context =
-        LambdaAppSecHandler.processRequestStart(
-            createInputStream(
-                "{\"path\": \"/orders\", \"queryStringParameters\": {\"a\": \"2\"},"
-                    + " \"multiValueQueryStringParameters\": {\"a\": [\"1\", \"2\"]},"
-                    + " \"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"r-1\","
-                    + " \"domainName\": \"api.example.com\"}}"));
-
-    // REST APIs keep only the last value in queryStringParameters, unlike v2 which comma-joins
-    assertEquals("a=1&a=2", tagsOf(context).get(DDTags.HTTP_QUERY));
-  }
-
-  @Test
-  void keepsPercentEncodingFromTheV2RawPath() {
-    setupMockCallbacks(new Callbacks());
-    AgentSpanContext context =
-        LambdaAppSecHandler.processRequestStart(
-            createInputStream(
-                "{\"rawPath\": \"/orders/a%20b\", \"rawQueryString\": \"\", \"requestContext\":"
-                    + " {\"domainName\": \"api.example.com\", \"http\": {\"method\": \"GET\","
-                    + " \"path\": \"/orders/a b\"}}}"));
-
-    Map<String, Object> tags = tagsOf(context);
-    assertEquals("https://api.example.com/orders/a%20b", tags.get(Tags.HTTP_URL));
-    // An empty rawQueryString means no query string at all
-    assertNull(tags.get(DDTags.HTTP_QUERY));
-  }
-
-  @Test
-  void doesNotDuplicateAPortAlreadyInTheHostHeader() {
-    setupMockCallbacks(new Callbacks());
-    AgentSpanContext context =
-        LambdaAppSecHandler.processRequestStart(
-            createInputStream(
-                "{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
-                    + " \"lb.example.com:8080\", \"x-forwarded-proto\": \"http\","
-                    + " \"x-forwarded-port\": \"8080\"}, \"requestContext\": {\"elb\":"
-                    + " {\"targetGroupArn\": \"arn\"}}}"));
-
-    // An ALB listener off 80/443 puts the port in Host as well, and buildURL appends it again
-    assertEquals("http://lb.example.com:8080/alb", tagsOf(context).get(Tags.HTTP_URL));
-  }
-
-  @Test
-  void doesNotDuplicateAPortAlreadyInABracketedIpv6Host() {
-    setupMockCallbacks(new Callbacks());
-    AgentSpanContext context =
-        LambdaAppSecHandler.processRequestStart(
-            createInputStream(
-                "{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
-                    + " \"[2001:db8::1]:8080\", \"x-forwarded-proto\": \"http\","
-                    + " \"x-forwarded-port\": \"8080\"}, \"requestContext\": {\"elb\":"
-                    + " {\"targetGroupArn\": \"arn\"}}}"));
-
-    assertEquals("http://[2001:db8::1]:8080/alb", tagsOf(context).get(Tags.HTTP_URL));
-  }
-
-  @Test
-  void hostnameTagPrefersForwardedHostOverUrlHost() {
-    setupMockCallbacks(new Callbacks());
-    AgentSpanContext context =
-        LambdaAppSecHandler.processRequestStart(
-            createInputStream(
-                "{\"headers\": {\"host\": \"api.example.com\", \"x-forwarded-host\":"
-                    + " \"public.example.com\"}, \"requestContext\": {\"domainName\":"
-                    + " \"api.example.com\", \"http\": {\"method\": \"GET\", \"path\":"
-                    + " \"/orders\"}}}"));
-
-    Map<String, Object> tags = tagsOf(context);
-    assertEquals("https://api.example.com/orders", tags.get(Tags.HTTP_URL));
-    assertEquals("public.example.com", tags.get(Tags.HTTP_HOSTNAME));
-  }
-
-  @Test
-  void resolvesHeadersRegardlessOfEventCasing() {
-    setupMockCallbacks(new Callbacks());
-    // API Gateway v1 capitalises header names where v2 and ALB send them lowercase
-    AgentSpanContext context =
-        LambdaAppSecHandler.processRequestStart(
-            createInputStream(
-                "{\"resource\": \"/users/{id}\", \"path\": \"/users/42\", \"httpMethod\": \"GET\","
-                    + " \"headers\": {\"Host\": \"api.example.com\", \"User-Agent\":"
-                    + " \"curl/8.1\", \"X-Forwarded-Proto\": \"http\", \"X-Forwarded-Host\":"
-                    + " \"public.example.com\"}, \"requestContext\": {\"httpMethod\": \"GET\"}}"));
-
-    Map<String, Object> tags = tagsOf(context);
-    assertEquals("http://api.example.com/users/42", tags.get(Tags.HTTP_URL));
-    assertEquals("curl/8.1", tags.get(Tags.HTTP_USER_AGENT));
-    assertEquals("public.example.com", tags.get(Tags.HTTP_HOSTNAME));
-  }
-
-  @Test
-  void omitsMethodTagWhenTheEventCarriesNoMethod() {
-    setupMockCallbacks(new Callbacks());
-    // Typed as a REST event by requestContext.requestId alone, so no httpMethod is available
-    AgentSpanContext context =
-        LambdaAppSecHandler.processRequestStart(
-            createInputStream(
-                "{\"path\": \"/users/42\", \"headers\": {\"host\": \"api.example.com\"},"
-                    + " \"requestContext\": {\"requestId\": \"req-1\", \"domainName\":"
-                    + " \"api.example.com\"}}"));
-
-    Map<String, Object> tags = tagsOf(context);
-    assertNull(tags.get(Tags.HTTP_METHOD));
-    // The remaining tags are unaffected: only the method is derived from the missing field
-    assertEquals("https://api.example.com/users/42", tags.get(Tags.HTTP_URL));
-    assertEquals("api.example.com", tags.get(Tags.HTTP_HOSTNAME));
-  }
-
-  @Test
-  void omitsMethodTagForWebSocketEvent() {
-    setupMockCallbacks(new Callbacks());
-    AgentSpanContext context =
-        LambdaAppSecHandler.processRequestStart(
-            createInputStream(
-                "{\"requestContext\": {\"connectionId\": \"c1\", \"eventType\": \"MESSAGE\","
-                    + " \"routeKey\": \"sendMessage\", \"domainName\": \"ws.example.com\"}}"));
-
-    Map<String, Object> tags = tagsOf(context);
-    assertNull(tags.get(Tags.HTTP_METHOD));
-    assertEquals("sendMessage", tags.get(Tags.HTTP_ROUTE));
-    assertEquals("https://ws.example.com/sendMessage", tags.get(Tags.HTTP_URL));
-  }
-
-  @Test
-  void omitsRouteTagForAlbEvent() {
-    setupMockCallbacks(new Callbacks());
-    AgentSpanContext context =
-        LambdaAppSecHandler.processRequestStart(
-            createInputStream(
-                "{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
-                    + " \"lb-123.eu-west-1.elb.amazonaws.com\", \"user-agent\": \"alb-agent\"},"
-                    + " \"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn\"}}}"));
-
-    Map<String, Object> tags = tagsOf(context);
-    assertNull(tags.get(Tags.HTTP_ROUTE));
-    assertEquals("GET", tags.get(Tags.HTTP_METHOD));
-    assertEquals("https://lb-123.eu-west-1.elb.amazonaws.com/alb", tags.get(Tags.HTTP_URL));
-    assertEquals("alb-agent", tags.get(Tags.HTTP_USER_AGENT));
-  }
-
-  @Test
-  void mergeContextsCopiesHttpTagsIntoExtensionContext() {
-    TagContext appSecContext = new TagContext();
-    appSecContext.putTag(Tags.COMPONENT, "aws-lambda");
-    appSecContext.putTag(Tags.HTTP_URL, "https://api.example.com/users/42");
-    appSecContext.putTag(Tags.HTTP_ROUTE, "/users/{id}");
-    TagContext extensionContext = new TagContext();
-
-    AgentSpanContext merged = LambdaAppSecHandler.mergeContexts(extensionContext, appSecContext);
-
-    assertSame(extensionContext, merged);
-    Map<String, Object> tags = tagsOf(merged);
-    assertEquals("aws-lambda", tags.get(Tags.COMPONENT));
-    assertEquals("https://api.example.com/users/42", tags.get(Tags.HTTP_URL));
-    assertEquals("/users/{id}", tags.get(Tags.HTTP_ROUTE));
-
-    ((TagContext) merged).putTag(Tags.COMPONENT, "spring-web-controller");
-    assertEquals("spring-web-controller", tagsOf(merged).get(Tags.COMPONENT));
-  }
-
-  @Test
-  void processResponseDataSetsHttpStatusCode() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    AgentSpan span = setupMockResponseCallbacks(null, null, null, null);
-    LambdaAppSecHandler.processResponseData(
-        span, createOutputStream("{\"statusCode\": 201, \"body\": \"created\"}"));
-
-    verify(span).setHttpStatusCode(201);
-    verify(span).setError(false, ErrorPriorities.HTTP_SERVER_DECORATOR);
-  }
-
-  @Test
-  void processResponseDataFlagsServerErrorStatusAsError() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    AgentSpan span = setupMockResponseCallbacks(null, null, null, null);
-    LambdaAppSecHandler.processResponseData(
-        span, createOutputStream("{\"statusCode\": 500, \"body\": \"boom\"}"));
-
-    verify(span).setHttpStatusCode(500);
-    verify(span).setError(true, ErrorPriorities.HTTP_SERVER_DECORATOR);
-  }
-
-  @Test
-  void processResponseDataDoesNotFlagClientErrorStatusAsError() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    AgentSpan span = setupMockResponseCallbacks(null, null, null, null);
-    LambdaAppSecHandler.processResponseData(
-        span, createOutputStream("{\"statusCode\": 404, \"body\": \"nope\"}"));
-
-    verify(span).setHttpStatusCode(404);
-    verify(span).setError(false, ErrorPriorities.HTTP_SERVER_DECORATOR);
-  }
-
-  @Test
-  void processResponseDataLeavesHttpStatusCodeUnsetForRestResponseWithoutStatus() {
-    LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
-    AgentSpan span = setupMockResponseCallbacks(null, null, null, null);
-    LambdaAppSecHandler.processResponseData(span, createOutputStream("{\"result\": \"hello\"}"));
-
-    verify(span, never()).setHttpStatusCode(anyInt());
-    verify(span, never()).setError(anyBoolean(), anyByte());
-  }
-
-  // ============================================================================
-  // Helper Methods
-  // ============================================================================
-
-  private static Map<String, Object> tagsOf(AgentSpanContext context) {
-    assertInstanceOf(TagContext.class, context);
-    return new HashMap<>(((TagContext) context).getTags());
-  }
-
-  private static ByteArrayInputStream createInputStream(String json) {
-    return new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8));
-  }
-
-  private static ByteArrayOutputStream createOutputStream(String json) {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    try {
-      baos.write(json.getBytes(StandardCharsets.UTF_8));
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-    return baos;
-  }
-
-  private static class Callbacks {
-    BiConsumer<String, URIDataAdapter> onMethodUri;
-    BiConsumer<String, String> onHeader;
-    BiConsumer<String, Integer> onSocketAddress;
-    Consumer<Map<String, Object>> onPathParams;
-    Consumer<Object> onBody;
-    Consumer<List<String>> onFilenames;
-
-    Callbacks onMethodUri(BiConsumer<String, URIDataAdapter> cb) {
-      this.onMethodUri = cb;
-      return this;
-    }
-
-    Callbacks onHeader(BiConsumer<String, String> cb) {
-      this.onHeader = cb;
-      return this;
-    }
-
-    Callbacks onSocketAddress(BiConsumer<String, Integer> cb) {
-      this.onSocketAddress = cb;
-      return this;
-    }
-
-    Callbacks onPathParams(Consumer<Map<String, Object>> cb) {
-      this.onPathParams = cb;
-      return this;
-    }
-
-    Callbacks onBody(Consumer<Object> cb) {
-      this.onBody = cb;
-      return this;
-    }
-
-    Callbacks onFilenames(Consumer<List<String>> cb) {
-      this.onFilenames = cb;
-      return this;
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  private void setupMockCallbacks(Callbacks callbacks) {
-    Object mockAppSecContext = new Object();
-    Supplier<Flow<Object>> requestStartedCallback = mock(Supplier.class);
-    when(requestStartedCallback.get()).thenReturn(new Flow.ResultFlow<>(mockAppSecContext));
-
-    TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>> methodUriCallback = null;
-    if (callbacks.onMethodUri != null) {
-      methodUriCallback = mock(TriFunction.class);
-      BiConsumer<String, URIDataAdapter> capture = callbacks.onMethodUri;
-      doAnswer(
-              inv -> {
-                capture.accept(inv.getArgument(1), inv.getArgument(2));
-                return Flow.ResultFlow.empty();
-              })
-          .when(methodUriCallback)
-          .apply(any(), anyString(), any(URIDataAdapter.class));
-    }
-
-    TriConsumer<RequestContext, String, String> headerCallback = null;
-    if (callbacks.onHeader != null) {
-      headerCallback = mock(TriConsumer.class);
-      BiConsumer<String, String> capture = callbacks.onHeader;
-      doAnswer(
-              inv -> {
-                capture.accept(inv.getArgument(1), inv.getArgument(2));
-                return null;
-              })
-          .when(headerCallback)
-          .accept(any(), anyString(), anyString());
-    }
-
-    TriFunction<RequestContext, String, Integer, Flow<Void>> socketAddressCallback = null;
-    if (callbacks.onSocketAddress != null) {
-      socketAddressCallback = mock(TriFunction.class);
-      BiConsumer<String, Integer> capture = callbacks.onSocketAddress;
-      doAnswer(
-              inv -> {
-                capture.accept(inv.getArgument(1), (Integer) inv.getArgument(2));
-                return Flow.ResultFlow.empty();
-              })
-          .when(socketAddressCallback)
-          .apply(any(), anyString(), anyInt());
-    }
-
-    Function<RequestContext, Flow<Void>> headerDoneCallback = mock(Function.class);
-    when(headerDoneCallback.apply(any())).thenReturn(Flow.ResultFlow.empty());
-
-    BiFunction<RequestContext, Map<String, ?>, Flow<Void>> pathParamsCallback = null;
-    if (callbacks.onPathParams != null) {
-      pathParamsCallback = mock(BiFunction.class);
-      Consumer<Map<String, Object>> capture = callbacks.onPathParams;
-      doAnswer(
-              inv -> {
-                capture.accept(inv.getArgument(1));
-                return Flow.ResultFlow.empty();
-              })
-          .when(pathParamsCallback)
-          .apply(any(), any(Map.class));
-    }
-
-    BiFunction<RequestContext, Object, Flow<Void>> bodyCallback = null;
-    if (callbacks.onBody != null) {
-      bodyCallback = mock(BiFunction.class);
-      Consumer<Object> capture = callbacks.onBody;
-      doAnswer(
-              inv -> {
-                capture.accept(inv.getArgument(1));
-                return Flow.ResultFlow.empty();
-              })
-          .when(bodyCallback)
-          .apply(any(), any());
-    }
-
-    BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCallback = null;
-    if (callbacks.onFilenames != null) {
-      filenamesCallback = mock(BiFunction.class);
-      Consumer<List<String>> capture = callbacks.onFilenames;
-      doAnswer(
-              inv -> {
-                capture.accept(inv.getArgument(1));
-                return Flow.ResultFlow.empty();
-              })
-          .when(filenamesCallback)
-          .apply(any(), any());
-    }
-
-    CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
-    when(mockCallbackProvider.getCallback(EVENTS.requestStarted()))
-        .thenReturn(requestStartedCallback);
-    when(mockCallbackProvider.getCallback(EVENTS.requestMethodUriRaw()))
-        .thenReturn(methodUriCallback);
-    when(mockCallbackProvider.getCallback(EVENTS.requestHeader())).thenReturn(headerCallback);
-    when(mockCallbackProvider.getCallback(EVENTS.requestClientSocketAddress()))
-        .thenReturn(socketAddressCallback);
-    when(mockCallbackProvider.getCallback(EVENTS.requestHeaderDone()))
-        .thenReturn(headerDoneCallback);
-    when(mockCallbackProvider.getCallback(EVENTS.requestPathParams()))
-        .thenReturn(pathParamsCallback);
-    when(mockCallbackProvider.getCallback(EVENTS.requestBodyProcessed())).thenReturn(bodyCallback);
-    when(mockCallbackProvider.getCallback(EVENTS.requestFilesFilenames()))
-        .thenReturn(filenamesCallback);
-
-    AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
-    when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC))
-        .thenReturn(mockCallbackProvider);
-    AgentTracer.forceRegister(mockTracer);
-  }
-
-  private static Map<String, Object> mapOf(Object... keysAndValues) {
-    Map<String, Object> map = new LinkedHashMap<>();
-    for (int i = 0; i < keysAndValues.length; i += 2) {
-      map.put((String) keysAndValues[i], keysAndValues[i + 1]);
-    }
-    return map;
-  }
-
-  @SuppressWarnings("unchecked")
-  private AgentSpan setupMockResponseCallbacks(
-      Consumer<Integer> onResponseStarted,
-      BiConsumer<String, String> onResponseHeader,
-      Runnable onResponseHeaderDone,
-      Consumer<Object> onResponseBody) {
-
-    RequestContext mockRequestContext = mock(RequestContext.class);
-    when(mockRequestContext.getData(RequestContextSlot.APPSEC)).thenReturn(new Object());
-    AgentSpan mockSpan = mock(AgentSpan.class);
-    when(mockSpan.getRequestContext()).thenReturn(mockRequestContext);
-
-    BiFunction<RequestContext, Integer, Flow<Void>> responseStartedCb = null;
-    if (onResponseStarted != null) {
-      responseStartedCb = mock(BiFunction.class);
-      Consumer<Integer> capture = onResponseStarted;
-      doAnswer(
-              inv -> {
-                capture.accept(inv.getArgument(1));
-                return new Flow.ResultFlow<>(null);
-              })
-          .when(responseStartedCb)
-          .apply(any(RequestContext.class), anyInt());
-    }
-
-    TriConsumer<RequestContext, String, String> responseHeaderCb = null;
-    if (onResponseHeader != null) {
-      responseHeaderCb = mock(TriConsumer.class);
-      BiConsumer<String, String> capture = onResponseHeader;
-      doAnswer(
-              inv -> {
-                capture.accept(inv.getArgument(1), inv.getArgument(2));
-                return null;
-              })
-          .when(responseHeaderCb)
-          .accept(any(), anyString(), anyString());
-    }
-
-    Function<RequestContext, Flow<Void>> responseHeaderDoneCb = mock(Function.class);
-    if (onResponseHeaderDone != null) {
-      Runnable capture = onResponseHeaderDone;
-      doAnswer(
-              inv -> {
-                capture.run();
-                return new Flow.ResultFlow<>(null);
-              })
-          .when(responseHeaderDoneCb)
-          .apply(any(RequestContext.class));
-    } else {
-      when(responseHeaderDoneCb.apply(any())).thenReturn(new Flow.ResultFlow<>(null));
-    }
-
-    BiFunction<RequestContext, Object, Flow<Void>> responseBodyCb = null;
-    if (onResponseBody != null) {
-      responseBodyCb = mock(BiFunction.class);
-      Consumer<Object> capture = onResponseBody;
-      doAnswer(
-              inv -> {
-                capture.accept(inv.getArgument(1));
-                return new Flow.ResultFlow<>(null);
-              })
-          .when(responseBodyCb)
-          .apply(any(RequestContext.class), any());
-    }
-
-    CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
-    when(mockCallbackProvider.getCallback(EVENTS.responseStarted())).thenReturn(responseStartedCb);
-    when(mockCallbackProvider.getCallback(EVENTS.responseHeader())).thenReturn(responseHeaderCb);
-    when(mockCallbackProvider.getCallback(EVENTS.responseHeaderDone()))
-        .thenReturn(responseHeaderDoneCb);
-    when(mockCallbackProvider.getCallback(EVENTS.responseBody())).thenReturn(responseBodyCb);
-
-    AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
-    when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC))
-        .thenReturn(mockCallbackProvider);
-    AgentTracer.forceRegister(mockTracer);
-
-    return mockSpan;
-  }
+        Integer[] capturedStatus = {null};
+        Map<String, String> capturedHeaders = new HashMap<>();
+        boolean[] headerDoneCalled = {false};
+        Object[] capturedBody = {null};
+        AgentSpan span = setupMockResponseCallbacks(
+                status -> capturedStatus[0] = status,
+                capturedHeaders::put,
+                () -> headerDoneCalled[0] = true,
+                body -> capturedBody[0] = body);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertNull(capturedStatus[0]);
+        verify(span, never()).setHttpStatusCode(anyInt());
+        assertEquals("text/plain", capturedHeaders.get("content-type")); // parsed header kept
+        assertTrue(headerDoneCalled[0]);
+        assertEquals("hello", capturedBody[0]); // parsed body kept, not the whole envelope
+    }
+
+    @ParameterizedTest
+    @EnumSource(
+            value = LambdaTriggerType.class,
+            names = {"API_GATEWAY_V2_HTTP", "LAMBDA_URL"})
+    void processResponseDataTreatsProxyShapedResponseWithoutStatusCodeAsImplicitSuccess(LambdaTriggerType triggerType) {
+        // Without a statusCode key the gateway does not interpret headers/body/isBase64Encoded at all:
+        // it serialises the whole object as the body of a 200 response with content-type
+        // application/json, so the declared text/html and the base64 encoding never reach the client.
+        LambdaAppSecHandler.setCurrentTriggerType(triggerType);
+        ByteArrayOutputStream result = createOutputStream(
+                "{\"headers\": {\"content-type\": \"text/html\"}, \"body\": \"PGgxPmhpPC9oMT4=\", \"isBase64Encoded\": true}");
+        Integer[] capturedStatus = {null};
+        Map<String, String> capturedHeaders = new HashMap<>();
+        Object[] capturedBody = {null};
+        AgentSpan span = setupMockResponseCallbacks(
+                status -> capturedStatus[0] = status, capturedHeaders::put, null, body -> capturedBody[0] = body);
+
+        LambdaAppSecHandler.processResponseData(span, result);
+
+        assertEquals(200, capturedStatus[0]);
+        verify(span).setHttpStatusCode(200);
+        assertEquals(1, capturedHeaders.size());
+        assertEquals("application/json", capturedHeaders.get("content-type"));
+        assertInstanceOf(Map.class, capturedBody[0]);
+        Map<?, ?> envelope = (Map<?, ?>) capturedBody[0];
+        // the whole envelope is the body, and its body field stays base64-encoded
+        assertEquals("PGgxPmhpPC9oMT4=", envelope.get("body"));
+        assertInstanceOf(Map.class, envelope.get("headers"));
+    }
+
+    @ParameterizedTest
+    @EnumSource(
+            value = LambdaTriggerType.class,
+            names = {"API_GATEWAY_V1_REST", "ALB", "ALB_MULTI_VALUE", "API_GATEWAY_V2_WEBSOCKET"})
+    void processResponseDataHonoursAnEnvelopeWithoutStatusCodeOnProxyTriggers(LambdaTriggerType triggerType) {
+        // The mirror of the implicit-success case: these triggers never infer a 200, so the envelope
+        // is still interpreted — the declared content type and the decoded body are what the client
+        // gets — and only the status stays unknown.
+        LambdaAppSecHandler.setCurrentTriggerType(triggerType);
+        ByteArrayOutputStream result = createOutputStream(
+                "{\"headers\": {\"content-type\": \"text/html\"}, \"body\": \"PGgxPmhpPC9oMT4=\", \"isBase64Encoded\": true}");
+        Integer[] capturedStatus = {null};
+        Map<String, String> capturedHeaders = new HashMap<>();
+        Object[] capturedBody = {null};
+        AgentSpan span = setupMockResponseCallbacks(
+                status -> capturedStatus[0] = status, capturedHeaders::put, null, body -> capturedBody[0] = body);
+
+        LambdaAppSecHandler.processResponseData(span, result);
+
+        assertNull(capturedStatus[0]);
+        verify(span, never()).setHttpStatusCode(anyInt());
+        assertEquals("text/html", capturedHeaders.get("content-type"));
+        assertEquals("<h1>hi</h1>", capturedBody[0]);
+    }
+
+    @Test
+    void processResponseDataAppliesFallbackForHttpTriggerWithNonJsonStringResponse() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        // JSON-encoded string (as returned by a RequestHandler<I, String>)
+        ByteArrayOutputStream result = createOutputStream("\"Hello World!\"");
+        Integer[] capturedStatus = {null};
+        boolean[] headerDoneCalled = {false};
+        Object[] capturedBody = {null};
+        AgentSpan span = setupMockResponseCallbacks(
+                status -> capturedStatus[0] = status,
+                null,
+                () -> headerDoneCalled[0] = true,
+                body -> capturedBody[0] = body);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertNull(capturedStatus[0]);
+        assertTrue(headerDoneCalled[0]);
+        assertEquals("Hello World!", capturedBody[0]);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void processResponseDataWebSocketWithStatusCodeFiresResponseStarted() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V2_WEBSOCKET);
+        // $connect handler returning a proper statusCode — should be treated like any API-GW response
+        ByteArrayOutputStream result = createOutputStream("{\"statusCode\": 200}");
+        Integer[] capturedStatus = {null};
+        boolean[] headerDoneCalled = {false};
+        AgentSpan span = setupMockResponseCallbacks(
+                status -> capturedStatus[0] = status, null, () -> headerDoneCalled[0] = true, null);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertEquals(200, capturedStatus[0]);
+        assertTrue(headerDoneCalled[0]);
+    }
+
+    @Test
+    void processResponseDataWebSocketWithoutStatusCodeUsesFallbackWithNoStatus() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V2_WEBSOCKET);
+        // Message-route handler returning arbitrary data — no statusCode, fallback path
+        ByteArrayOutputStream result = createOutputStream("{\"message\": \"hello\"}");
+        Integer[] capturedStatus = {null};
+        boolean[] headerDoneCalled = {false};
+        Object[] capturedBody = {null};
+        AgentSpan span = setupMockResponseCallbacks(
+                status -> capturedStatus[0] = status,
+                null,
+                () -> headerDoneCalled[0] = true,
+                body -> capturedBody[0] = body);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertNull(capturedStatus[0]); // no responseStarted for status-less WebSocket messages
+        assertTrue(headerDoneCalled[0]);
+        assertInstanceOf(Map.class, capturedBody[0]);
+    }
+
+    @Test
+    void processResponseDataSkipsNonApiGwResponseWhenTriggerTypeIsNull() {
+        // No processRequestStart called — thread-local is null — behaves like unknown
+        ByteArrayOutputStream result = createOutputStream("{\"result\": \"hello\"}");
+        Integer[] capturedStatus = {null};
+        AgentSpan span = setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertNull(capturedStatus[0]);
+    }
+
+    // --- Status code extraction ---
+
+    @Test
+    void processResponseDataExtractsStatusCodeCorrectly() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        ByteArrayOutputStream result = createOutputStream("{\"statusCode\": 200, \"body\": \"ok\"}");
+        Integer[] capturedStatus = {null};
+        AgentSpan span = setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertEquals(200, capturedStatus[0]);
+    }
+
+    @Test
+    void processResponseDataExtractsStatusCodeAsIntegerFromDouble() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        ByteArrayOutputStream result = createOutputStream("{\"statusCode\": 404.0, \"body\": \"not found\"}");
+        Integer[] capturedStatus = {null};
+        AgentSpan span = setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertEquals(404, capturedStatus[0]);
+    }
+
+    @ParameterizedTest
+    @EnumSource(
+            value = LambdaTriggerType.class,
+            names = {"API_GATEWAY_V1_REST", "API_GATEWAY_V2_WEBSOCKET", "ALB", "ALB_MULTI_VALUE"})
+    void processResponseDataDoesNotInferStatusForProxyTriggers(LambdaTriggerType triggerType) {
+        LambdaAppSecHandler.setCurrentTriggerType(triggerType);
+        ByteArrayOutputStream result = createOutputStream("{\"body\": \"ok\"}");
+        Integer[] capturedStatus = {null};
+        AgentSpan span = setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertNull(capturedStatus[0]);
+    }
+
+    @Test
+    void processResponseDataHandlesNonNumericStatusCode() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V2_HTTP);
+        ByteArrayOutputStream result = createOutputStream("{\"statusCode\": \"bad\", \"body\": \"ok\"}");
+        Integer[] capturedStatus = {null};
+        AgentSpan span = setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertNull(capturedStatus[0]);
+        verify(span, never()).setHttpStatusCode(anyInt());
+    }
+
+    // --- Header extraction ---
+
+    @Test
+    void processResponseDataForwardsAllResponseHeaders() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        String json =
+                "{\"statusCode\": 200, \"headers\": {\"content-type\": \"application/json\", \"x-custom\": \"val\", \"content-length\": \"42\", \"set-cookie\": \"a=1\"}}";
+        ByteArrayOutputStream result = createOutputStream(json);
+        Map<String, String> capturedHeaders = new HashMap<>();
+        AgentSpan span = setupMockResponseCallbacks(null, capturedHeaders::put, null, null);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertEquals(4, capturedHeaders.size());
+        assertEquals("application/json", capturedHeaders.get("content-type"));
+        assertEquals("val", capturedHeaders.get("x-custom"));
+        assertEquals("42", capturedHeaders.get("content-length"));
+        assertEquals("a=1", capturedHeaders.get("set-cookie"));
+    }
+
+    @Test
+    void processResponseDataLowercasesHeaderKeys() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        String json =
+                "{\"statusCode\": 200, \"headers\": {\"Content-Type\": \"text/html\", \"CONTENT-LENGTH\": \"10\"}}";
+        ByteArrayOutputStream result = createOutputStream(json);
+        Map<String, String> capturedHeaders = new HashMap<>();
+        AgentSpan span = setupMockResponseCallbacks(null, capturedHeaders::put, null, null);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertEquals("text/html", capturedHeaders.get("content-type"));
+        assertEquals("10", capturedHeaders.get("content-length"));
+    }
+
+    @Test
+    void processResponseDataMergesMultiValueHeadersWithSingleValueHeaders() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        String json =
+                "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/html\"}, \"multiValueHeaders\": {\"content-encoding\": [\"gzip\", \"br\"]}}";
+        ByteArrayOutputStream result = createOutputStream(json);
+        Map<String, String> capturedHeaders = new HashMap<>();
+        AgentSpan span = setupMockResponseCallbacks(null, capturedHeaders::put, null, null);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertEquals("text/html", capturedHeaders.get("content-type"));
+        assertEquals("gzip, br", capturedHeaders.get("content-encoding"));
+    }
+
+    @Test
+    void processResponseDataHandlesEmptyHeaders() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        ByteArrayOutputStream result = createOutputStream("{\"statusCode\": 200}");
+        Map<String, String> capturedHeaders = new HashMap<>();
+        boolean[] headerDoneCalled = {false};
+        AgentSpan span = setupMockResponseCallbacks(null, capturedHeaders::put, () -> headerDoneCalled[0] = true, null);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertTrue(capturedHeaders.isEmpty());
+        assertTrue(headerDoneCalled[0]);
+    }
+
+    // --- Body extraction ---
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void processResponseDataParsesJsonBody() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        String json =
+                "{\"statusCode\": 200, \"headers\": {\"content-type\": \"application/json\"}, \"body\": \"{\\\"key\\\": \\\"value\\\"}\"}";
+        ByteArrayOutputStream result = createOutputStream(json);
+        Object[] capturedBody = {null};
+        AgentSpan span = setupMockResponseCallbacks(null, null, null, body -> capturedBody[0] = body);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertInstanceOf(Map.class, capturedBody[0]);
+        assertEquals("value", ((Map<?, ?>) capturedBody[0]).get("key"));
+    }
+
+    @Test
+    void processResponseDataHandlesNonJsonBodyAsRawString() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        String json =
+                "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/plain\"}, \"body\": \"plain text\"}";
+        ByteArrayOutputStream result = createOutputStream(json);
+        Object[] capturedBody = {null};
+        AgentSpan span = setupMockResponseCallbacks(null, null, null, body -> capturedBody[0] = body);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertEquals("plain text", capturedBody[0]);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void processResponseDataHandlesBase64EncodedBody() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        String originalBody = "{\"decoded\": \"content\"}";
+        String base64Body = Base64.getEncoder().encodeToString(originalBody.getBytes(StandardCharsets.UTF_8));
+        String json = "{\"statusCode\": 200, \"body\": \"" + base64Body + "\", \"isBase64Encoded\": true}";
+        ByteArrayOutputStream result = createOutputStream(json);
+        Object[] capturedBody = {null};
+        AgentSpan span = setupMockResponseCallbacks(null, null, null, body -> capturedBody[0] = body);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertInstanceOf(Map.class, capturedBody[0]);
+        assertEquals("content", ((Map<?, ?>) capturedBody[0]).get("decoded"));
+    }
+
+    @Test
+    void processResponseDataHandlesNullBody() {
+        ByteArrayOutputStream result = createOutputStream("{\"statusCode\": 200, \"body\": null}");
+        String[] capturedBody = {"NOT_CALLED"};
+        AgentSpan span = setupMockResponseCallbacks(null, null, null, body -> capturedBody[0] = String.valueOf(body));
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertEquals("NOT_CALLED", capturedBody[0]);
+    }
+
+    @Test
+    void processResponseDataHandlesMissingBodyField() {
+        ByteArrayOutputStream result = createOutputStream("{\"statusCode\": 200}");
+        String[] capturedBody = {"NOT_CALLED"};
+        AgentSpan span = setupMockResponseCallbacks(null, null, null, body -> capturedBody[0] = String.valueOf(body));
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertEquals("NOT_CALLED", capturedBody[0]);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void processResponseDataAttemptsJsonParseWhenNoContentType() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        ByteArrayOutputStream result = createOutputStream("{\"statusCode\": 200, \"body\": \"{\\\"a\\\": 1}\"}");
+        Object[] capturedBody = {null};
+        AgentSpan span = setupMockResponseCallbacks(null, null, null, body -> capturedBody[0] = body);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertInstanceOf(Map.class, capturedBody[0]);
+        assertEquals(1.0d, ((Map<?, ?>) capturedBody[0]).get("a"));
+    }
+
+    @Test
+    void processResponseDataFallsBackToRawStringWhenJsonParseFails() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        ByteArrayOutputStream result = createOutputStream("{\"statusCode\": 200, \"body\": \"not json {\"}");
+        Object[] capturedBody = {null};
+        AgentSpan span = setupMockResponseCallbacks(null, null, null, body -> capturedBody[0] = body);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertEquals("not json {", capturedBody[0]);
+    }
+
+    // --- Event ordering ---
+
+    @Test
+    void processResponseDataFiresEventsInCorrectOrder() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        String json =
+                "{\"statusCode\": 200, \"headers\": {\"content-type\": \"application/json\"}, \"body\": \"{\\\"k\\\": \\\"v\\\"}\"}";
+        ByteArrayOutputStream result = createOutputStream(json);
+        List<String> order = new ArrayList<>();
+
+        AgentSpan span = setupMockResponseCallbacks(
+                status -> order.add("responseStarted"),
+                (name, value) -> order.add("responseHeader"),
+                () -> order.add("responseHeaderDone"),
+                body -> order.add("responseBody"));
+
+        LambdaAppSecHandler.processResponseData(span, result);
+
+        assertEquals("responseStarted", order.get(0));
+        assertTrue(order.stream().filter("responseHeader"::equals).count() >= 1);
+        int headerDoneIdx = order.indexOf("responseHeaderDone");
+        int lastHeaderIdx = order.lastIndexOf("responseHeader");
+        assertTrue(headerDoneIdx > lastHeaderIdx);
+        assertEquals("responseBody", order.get(order.size() - 1));
+    }
+
+    @Test
+    void processResponseDataHandlesInvalidBase64ResponseBodyGracefully() {
+        String json = "{\"statusCode\": 200, \"body\": \"not-valid-base64!!!\", \"isBase64Encoded\": true}";
+        ByteArrayOutputStream result = createOutputStream(json);
+        String[] capturedBody = {"NOT_CALLED"};
+        AgentSpan span = setupMockResponseCallbacks(null, null, null, body -> capturedBody[0] = String.valueOf(body));
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertEquals("NOT_CALLED", capturedBody[0]);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void processResponseDataParsesBodyAsJsonForJavascriptContentType() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        String json =
+                "{\"statusCode\": 200, \"headers\": {\"content-type\": \"application/javascript\"}, \"body\": \"{\\\"key\\\": \\\"val\\\"}\"}";
+        ByteArrayOutputStream result = createOutputStream(json);
+        Object[] capturedBody = {null};
+        AgentSpan span = setupMockResponseCallbacks(null, null, null, body -> capturedBody[0] = body);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertInstanceOf(Map.class, capturedBody[0]);
+        assertEquals("val", ((Map<?, ?>) capturedBody[0]).get("key"));
+    }
+
+    @Test
+    void processResponseDataKeepsMultiValueHeadersEntryWithNonListValue() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        String json =
+                "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/html\"}, \"multiValueHeaders\": {\"x-scalar\": \"not-a-list\", \"x-valid\": [\"v1\", \"v2\"]}}";
+        ByteArrayOutputStream result = createOutputStream(json);
+        Map<String, String> capturedHeaders = new HashMap<>();
+        AgentSpan span = setupMockResponseCallbacks(null, capturedHeaders::put, null, null);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertEquals("text/html", capturedHeaders.get("content-type"));
+        assertEquals("v1, v2", capturedHeaders.get("x-valid"));
+        // Not a shape AWS sends, but the runtime would still deliver the header, so it is reported
+        assertEquals("not-a-list", capturedHeaders.get("x-scalar"));
+    }
+
+    @Test
+    void processResponseDataMultiValueHeadersOverrideSingleValueHeaders() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        String json =
+                "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/html\"}, \"multiValueHeaders\": {\"content-type\": [\"application/json\", \"charset=utf-8\"]}}";
+        ByteArrayOutputStream result = createOutputStream(json);
+        Map<String, String> capturedHeaders = new HashMap<>();
+        AgentSpan span = setupMockResponseCallbacks(null, capturedHeaders::put, null, null);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertEquals("application/json, charset=utf-8", capturedHeaders.get("content-type"));
+    }
+
+    // --- Error handling ---
+
+    @Test
+    void processResponseDataHandlesMalformedJsonResponse() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V2_HTTP);
+        ByteArrayOutputStream result = createOutputStream("{not valid json");
+        Integer[] capturedStatus = {null};
+        AgentSpan span = setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null);
+        LambdaAppSecHandler.processResponseData(span, result);
+        assertNull(capturedStatus[0]);
+    }
+
+    // ============================================================================
+    // processResponseData — null individual callback handling
+    // ============================================================================
+
+    @Test
+    void processResponseDataHandlesNullResponseHeaderDoneCallbackGracefully() {
+        String json = "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/plain\"}, \"body\": \"ok\"}";
+        ByteArrayOutputStream result = createOutputStream(json);
+
+        RequestContext mockRequestContext = mock(RequestContext.class);
+        AgentSpan span = mock(AgentSpan.class);
+        when(span.getRequestContext()).thenReturn(mockRequestContext);
+
+        CallbackProvider cbp = mock(CallbackProvider.class);
+        when(cbp.getCallback(EVENTS.responseStarted())).thenReturn(null);
+        when(cbp.getCallback(EVENTS.responseHeader())).thenReturn(null);
+        when(cbp.getCallback(EVENTS.responseHeaderDone())).thenReturn(null);
+        when(cbp.getCallback(EVENTS.responseBody())).thenReturn(null);
+
+        AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
+        when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(cbp);
+        AgentTracer.forceRegister(mockTracer);
+
+        LambdaAppSecHandler.processResponseData(span, result);
+        // no exception expected — all null callbacks must be silently skipped
+    }
+
+    @Test
+    void processResponseDataSkipsResponseStartedWhenCallbackIsNull() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        String json = "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/plain\"}}";
+        ByteArrayOutputStream result = createOutputStream(json);
+        Map<String, String> capturedHeaders = new HashMap<>();
+        boolean[] headerDoneCalled = {false};
+        AgentSpan span = setupMockResponseCallbacks(null, capturedHeaders::put, () -> headerDoneCalled[0] = true, null);
+        assertDoesNotThrow(() -> LambdaAppSecHandler.processResponseData(span, result));
+        assertTrue(headerDoneCalled[0]);
+    }
+
+    @Test
+    void processResponseDataSkipsResponseHeaderWhenCallbackIsNull() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        String json = "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/plain\"}}";
+        ByteArrayOutputStream result = createOutputStream(json);
+        Integer[] capturedStatus = {null};
+        boolean[] headerDoneCalled = {false};
+        AgentSpan span = setupMockResponseCallbacks(
+                status -> capturedStatus[0] = status, null, () -> headerDoneCalled[0] = true, null);
+        assertDoesNotThrow(() -> LambdaAppSecHandler.processResponseData(span, result));
+        assertEquals(200, capturedStatus[0]);
+        assertTrue(headerDoneCalled[0]);
+    }
+
+    // ============================================================================
+    // extractResponseData Unit Tests
+    // ============================================================================
+
+    @ParameterizedTest(name = "[{index}] {0}")
+    @ValueSource(strings = {"{bad json", ""})
+    void reportsUnparseablePayloadAsTextWithoutAStatus(String json) {
+        // The payload is not JSON at all, so it is not a valid response for any HTTP trigger: the
+        // gateway substitutes its own error and the status is not knowable here.
+        LambdaResponseData response = parseResponse(json, LambdaTriggerType.API_GATEWAY_V1_REST);
+
+        assertNull(response.statusCode);
+        assertEquals(singletonMap("content-type", "text/plain"), response.headers);
+        assertEquals(json, response.body);
+    }
+
+    @Test
+    void extractResponseDataPreservesJsonNullAsAValidPlainResponse() {
+        LambdaResponseData response = parseResponse("null", LambdaTriggerType.API_GATEWAY_V1_REST);
+
+        assertNull(response.statusCode);
+        assertEquals(singletonMap("content-type", "application/json"), response.headers);
+        assertNull(response.body);
+    }
+
+    @ParameterizedTest(name = "[{index}] content-type {0}")
+    @ValueSource(strings = {"", "application/json"})
+    void parsesAResponseBodyAsJsonWhenTheContentTypeIsBlankOrJson(String contentType) {
+        // A blank content type says nothing about the body, so it gets the same best-effort JSON parse
+        // as an absent one, matching the request path.
+        LambdaResponseData response = parseResponse(
+                "{\"statusCode\": 200, \"headers\": {\"content-type\": \""
+                        + contentType
+                        + "\"}, \"body\": \"{\\\"a\\\":1}\"}",
+                LambdaTriggerType.API_GATEWAY_V1_REST);
+
+        assertEquals(singletonMap("a", 1.0), response.body);
+    }
+
+    @Test
+    void keepsAResponseBodyRawWhenTheContentTypeIsNotJson() {
+        LambdaResponseData response = parseResponse(
+                "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/plain\"},"
+                        + " \"body\": \"{\\\"a\\\":1}\"}",
+                LambdaTriggerType.API_GATEWAY_V1_REST);
+
+        assertEquals("{\"a\":1}", response.body);
+    }
+
+    @Test
+    void distinguishesAbsentStatusCodeFromExplicitZero() {
+        // Absent: the gateway serialises the whole value as the body of a 200. Present: the payload is
+        // an envelope, so the status is kept as received and never defaulted.
+        LambdaResponseData absent = parseResponse("{\"body\":\"ok\"}", LambdaTriggerType.API_GATEWAY_V2_HTTP);
+        LambdaResponseData explicitZero =
+                parseResponse("{\"statusCode\":0,\"body\":\"ok\"}", LambdaTriggerType.API_GATEWAY_V2_HTTP);
+
+        assertEquals(200, absent.statusCode);
+        assertEquals(singletonMap("body", "ok"), absent.body);
+        assertEquals(0, explicitZero.statusCode);
+        assertEquals("ok", explicitZero.body);
+    }
+
+    // ============================================================================
+    // HTTP span tags
+    // ============================================================================
+
+    @Test
+    void appliesHttpTagsForRestApiEvent() {
+        setupMockCallbacks(new Callbacks());
+        AgentSpanContext context = LambdaAppSecHandler.processRequestStart(
+                createInputStream("{\"resource\": \"/users/{id}\", \"path\": \"/users/42\", \"httpMethod\":"
+                        + " \"GET\", \"queryStringParameters\": {\"q\": \"hello\"}, \"headers\":"
+                        + " {\"Host\": \"api.example.com\", \"User-Agent\": \"curl/8.1\","
+                        + " \"X-Forwarded-Proto\": \"https\", \"X-Forwarded-Port\": \"443\"},"
+                        + " \"requestContext\": {\"httpMethod\": \"GET\", \"domainName\":"
+                        + " \"api.example.com\"}}"));
+
+        Map<String, Object> tags = tagsOf(context);
+        assertEquals("aws-lambda", tags.get(Tags.COMPONENT));
+        assertEquals("GET", tags.get(Tags.HTTP_METHOD));
+        assertEquals("https://api.example.com/users/42", tags.get(Tags.HTTP_URL));
+        assertEquals("q=hello", tags.get(DDTags.HTTP_QUERY));
+        assertEquals("curl/8.1", tags.get(Tags.HTTP_USER_AGENT));
+        assertEquals("/users/{id}", tags.get(Tags.HTTP_ROUTE));
+        assertEquals("api.example.com", tags.get(Tags.HTTP_HOSTNAME));
+    }
+
+    @Test
+    void appliesHttpTagsWithForwardedSchemeAndPort() {
+        setupMockCallbacks(new Callbacks());
+        AgentSpanContext context = LambdaAppSecHandler.processRequestStart(
+                createInputStream("{\"headers\": {\"host\": \"api.example.com\", \"x-forwarded-proto\": \"http\","
+                        + " \"x-forwarded-port\": \"8080\"}, \"requestContext\": {\"domainName\":"
+                        + " \"api.example.com\", \"routeKey\": \"POST /orders\", \"http\":"
+                        + " {\"method\": \"POST\", \"path\": \"/orders\"}}}"));
+
+        Map<String, Object> tags = tagsOf(context);
+        assertEquals("POST", tags.get(Tags.HTTP_METHOD));
+        assertEquals("http://api.example.com:8080/orders", tags.get(Tags.HTTP_URL));
+        assertEquals("/orders", tags.get(Tags.HTTP_ROUTE));
+        assertNull(tags.get(DDTags.HTTP_QUERY));
+    }
+
+    @Test
+    void omitsDefaultPortForForwardedHttpScheme() {
+        setupMockCallbacks(new Callbacks());
+        AgentSpanContext context = LambdaAppSecHandler.processRequestStart(
+                createInputStream("{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
+                        + " \"lb.example.com\", \"x-forwarded-proto\": \"http\"}, \"requestContext\":"
+                        + " {\"elb\": {\"targetGroupArn\": \"arn\"}}}"));
+
+        // No x-forwarded-port: the default must follow the scheme, or ":443" leaks into the URL
+        assertEquals("http://lb.example.com/alb", tagsOf(context).get(Tags.HTTP_URL));
+    }
+
+    @Test
+    void ignoresEmptyForwardedPort() {
+        setupMockCallbacks(new Callbacks());
+        AgentSpanContext context = LambdaAppSecHandler.processRequestStart(
+                createInputStream("{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
+                        + " \"lb.example.com\", \"x-forwarded-proto\": \"http\","
+                        + " \"x-forwarded-port\": \"\"}, \"requestContext\": {\"elb\":"
+                        + " {\"targetGroupArn\": \"arn\"}}}"));
+
+        // An empty header value takes the same path as a missing one rather than reaching parseInt
+        assertEquals("http://lb.example.com/alb", tagsOf(context).get(Tags.HTTP_URL));
+    }
+
+    @Test
+    void normalisesForwardedSchemeCasing() {
+        setupMockCallbacks(new Callbacks());
+        AgentSpanContext context = LambdaAppSecHandler.processRequestStart(
+                createInputStream("{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
+                        + " \"lb.example.com\", \"x-forwarded-proto\": \"HTTP\"}, \"requestContext\":"
+                        + " {\"elb\": {\"targetGroupArn\": \"arn\"}}}"));
+
+        // Lowercased before use, or the port default and URIUtils.buildURL both miss and ":443" leaks
+        assertEquals("http://lb.example.com/alb", tagsOf(context).get(Tags.HTTP_URL));
+    }
+
+    @Test
+    void fallsBackToHttpsForUnrecognisedForwardedScheme() {
+        setupMockCallbacks(new Callbacks());
+        AgentSpanContext context = LambdaAppSecHandler.processRequestStart(
+                createInputStream("{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
+                        + " \"lb.example.com\", \"x-forwarded-proto\": \"https, http\"},"
+                        + " \"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn\"}}}"));
+
+        // Lambda comma-joins duplicate request headers, so a client-supplied X-Forwarded-Proto arrives
+        // appended to the real one: taken verbatim it would yield "https, http://lb.example.com/alb"
+        assertEquals("https://lb.example.com/alb", tagsOf(context).get(Tags.HTTP_URL));
+    }
+
+    @Test
+    void keepsRepeatedQueryKeysFromTheV2RawQueryString() {
+        setupMockCallbacks(new Callbacks());
+        AgentSpanContext context = LambdaAppSecHandler.processRequestStart(
+                createInputStream("{\"rawPath\": \"/orders\", \"rawQueryString\": \"a=1&a=2\","
+                        + " \"queryStringParameters\": {\"a\": \"1,2\"}, \"requestContext\":"
+                        + " {\"domainName\": \"api.example.com\", \"http\": {\"method\": \"GET\","
+                        + " \"path\": \"/orders\"}}}"));
+
+        // API Gateway comma-joins repeats into queryStringParameters, so rebuilding from that map
+        // would report a=1%2C2
+        assertEquals("a=1&a=2", tagsOf(context).get(DDTags.HTTP_QUERY));
+    }
+
+    @Test
+    void keepsRepeatedQueryKeysFromTheV1MultiValueParameters() {
+        setupMockCallbacks(new Callbacks());
+        AgentSpanContext context = LambdaAppSecHandler.processRequestStart(
+                createInputStream("{\"path\": \"/orders\", \"queryStringParameters\": {\"a\": \"2\"},"
+                        + " \"multiValueQueryStringParameters\": {\"a\": [\"1\", \"2\"]},"
+                        + " \"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"r-1\","
+                        + " \"domainName\": \"api.example.com\"}}"));
+
+        // REST APIs keep only the last value in queryStringParameters, unlike v2 which comma-joins
+        assertEquals("a=1&a=2", tagsOf(context).get(DDTags.HTTP_QUERY));
+    }
+
+    @Test
+    void keepsPercentEncodingFromTheV2RawPath() {
+        setupMockCallbacks(new Callbacks());
+        AgentSpanContext context = LambdaAppSecHandler.processRequestStart(
+                createInputStream("{\"rawPath\": \"/orders/a%20b\", \"rawQueryString\": \"\", \"requestContext\":"
+                        + " {\"domainName\": \"api.example.com\", \"http\": {\"method\": \"GET\","
+                        + " \"path\": \"/orders/a b\"}}}"));
+
+        Map<String, Object> tags = tagsOf(context);
+        assertEquals("https://api.example.com/orders/a%20b", tags.get(Tags.HTTP_URL));
+        // An empty rawQueryString means no query string at all
+        assertNull(tags.get(DDTags.HTTP_QUERY));
+    }
+
+    @Test
+    void doesNotDuplicateAPortAlreadyInTheHostHeader() {
+        setupMockCallbacks(new Callbacks());
+        AgentSpanContext context = LambdaAppSecHandler.processRequestStart(
+                createInputStream("{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
+                        + " \"lb.example.com:8080\", \"x-forwarded-proto\": \"http\","
+                        + " \"x-forwarded-port\": \"8080\"}, \"requestContext\": {\"elb\":"
+                        + " {\"targetGroupArn\": \"arn\"}}}"));
+
+        // An ALB listener off 80/443 puts the port in Host as well, and buildURL appends it again
+        assertEquals("http://lb.example.com:8080/alb", tagsOf(context).get(Tags.HTTP_URL));
+    }
+
+    @Test
+    void doesNotDuplicateAPortAlreadyInABracketedIpv6Host() {
+        setupMockCallbacks(new Callbacks());
+        AgentSpanContext context = LambdaAppSecHandler.processRequestStart(
+                createInputStream("{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
+                        + " \"[2001:db8::1]:8080\", \"x-forwarded-proto\": \"http\","
+                        + " \"x-forwarded-port\": \"8080\"}, \"requestContext\": {\"elb\":"
+                        + " {\"targetGroupArn\": \"arn\"}}}"));
+
+        assertEquals("http://[2001:db8::1]:8080/alb", tagsOf(context).get(Tags.HTTP_URL));
+    }
+
+    @Test
+    void hostnameTagPrefersForwardedHostOverUrlHost() {
+        setupMockCallbacks(new Callbacks());
+        AgentSpanContext context = LambdaAppSecHandler.processRequestStart(
+                createInputStream("{\"headers\": {\"host\": \"api.example.com\", \"x-forwarded-host\":"
+                        + " \"public.example.com\"}, \"requestContext\": {\"domainName\":"
+                        + " \"api.example.com\", \"http\": {\"method\": \"GET\", \"path\":"
+                        + " \"/orders\"}}}"));
+
+        Map<String, Object> tags = tagsOf(context);
+        assertEquals("https://api.example.com/orders", tags.get(Tags.HTTP_URL));
+        assertEquals("public.example.com", tags.get(Tags.HTTP_HOSTNAME));
+    }
+
+    @Test
+    void resolvesHeadersRegardlessOfEventCasing() {
+        setupMockCallbacks(new Callbacks());
+        // API Gateway v1 capitalises header names where v2 and ALB send them lowercase
+        AgentSpanContext context = LambdaAppSecHandler.processRequestStart(
+                createInputStream("{\"resource\": \"/users/{id}\", \"path\": \"/users/42\", \"httpMethod\": \"GET\","
+                        + " \"headers\": {\"Host\": \"api.example.com\", \"User-Agent\":"
+                        + " \"curl/8.1\", \"X-Forwarded-Proto\": \"http\", \"X-Forwarded-Host\":"
+                        + " \"public.example.com\"}, \"requestContext\": {\"httpMethod\": \"GET\"}}"));
+
+        Map<String, Object> tags = tagsOf(context);
+        assertEquals("http://api.example.com/users/42", tags.get(Tags.HTTP_URL));
+        assertEquals("curl/8.1", tags.get(Tags.HTTP_USER_AGENT));
+        assertEquals("public.example.com", tags.get(Tags.HTTP_HOSTNAME));
+    }
+
+    @Test
+    void omitsMethodTagWhenTheEventCarriesNoMethod() {
+        setupMockCallbacks(new Callbacks());
+        // Typed as a REST event by requestContext.requestId alone, so no httpMethod is available
+        AgentSpanContext context = LambdaAppSecHandler.processRequestStart(
+                createInputStream("{\"path\": \"/users/42\", \"headers\": {\"host\": \"api.example.com\"},"
+                        + " \"requestContext\": {\"requestId\": \"req-1\", \"domainName\":"
+                        + " \"api.example.com\"}}"));
+
+        Map<String, Object> tags = tagsOf(context);
+        assertNull(tags.get(Tags.HTTP_METHOD));
+        // The remaining tags are unaffected: only the method is derived from the missing field
+        assertEquals("https://api.example.com/users/42", tags.get(Tags.HTTP_URL));
+        assertEquals("api.example.com", tags.get(Tags.HTTP_HOSTNAME));
+    }
+
+    @Test
+    void omitsMethodTagForWebSocketEvent() {
+        setupMockCallbacks(new Callbacks());
+        AgentSpanContext context = LambdaAppSecHandler.processRequestStart(
+                createInputStream("{\"requestContext\": {\"connectionId\": \"c1\", \"eventType\": \"MESSAGE\","
+                        + " \"routeKey\": \"sendMessage\", \"domainName\": \"ws.example.com\"}}"));
+
+        Map<String, Object> tags = tagsOf(context);
+        assertNull(tags.get(Tags.HTTP_METHOD));
+        assertEquals("sendMessage", tags.get(Tags.HTTP_ROUTE));
+        assertEquals("https://ws.example.com/sendMessage", tags.get(Tags.HTTP_URL));
+    }
+
+    @Test
+    void omitsRouteTagForAlbEvent() {
+        setupMockCallbacks(new Callbacks());
+        AgentSpanContext context = LambdaAppSecHandler.processRequestStart(
+                createInputStream("{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
+                        + " \"lb-123.eu-west-1.elb.amazonaws.com\", \"user-agent\": \"alb-agent\"},"
+                        + " \"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn\"}}}"));
+
+        Map<String, Object> tags = tagsOf(context);
+        assertNull(tags.get(Tags.HTTP_ROUTE));
+        assertEquals("GET", tags.get(Tags.HTTP_METHOD));
+        assertEquals("https://lb-123.eu-west-1.elb.amazonaws.com/alb", tags.get(Tags.HTTP_URL));
+        assertEquals("alb-agent", tags.get(Tags.HTTP_USER_AGENT));
+    }
+
+    @Test
+    void mergeContextsCopiesHttpTagsIntoExtensionContext() {
+        TagContext appSecContext = new TagContext();
+        appSecContext.putTag(Tags.COMPONENT, "aws-lambda");
+        appSecContext.putTag(Tags.HTTP_URL, "https://api.example.com/users/42");
+        appSecContext.putTag(Tags.HTTP_ROUTE, "/users/{id}");
+        TagContext extensionContext = new TagContext();
+
+        AgentSpanContext merged = LambdaAppSecHandler.mergeContexts(extensionContext, appSecContext);
+
+        assertSame(extensionContext, merged);
+        Map<String, Object> tags = tagsOf(merged);
+        assertEquals("aws-lambda", tags.get(Tags.COMPONENT));
+        assertEquals("https://api.example.com/users/42", tags.get(Tags.HTTP_URL));
+        assertEquals("/users/{id}", tags.get(Tags.HTTP_ROUTE));
+
+        ((TagContext) merged).putTag(Tags.COMPONENT, "spring-web-controller");
+        assertEquals("spring-web-controller", tagsOf(merged).get(Tags.COMPONENT));
+    }
+
+    @Test
+    void processResponseDataSetsHttpStatusCode() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        AgentSpan span = setupMockResponseCallbacks(null, null, null, null);
+        LambdaAppSecHandler.processResponseData(
+                span, createOutputStream("{\"statusCode\": 201, \"body\": \"created\"}"));
+
+        verify(span).setHttpStatusCode(201);
+        verify(span).setError(false, ErrorPriorities.HTTP_SERVER_DECORATOR);
+    }
+
+    @Test
+    void processResponseDataFlagsServerErrorStatusAsError() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        AgentSpan span = setupMockResponseCallbacks(null, null, null, null);
+        LambdaAppSecHandler.processResponseData(span, createOutputStream("{\"statusCode\": 500, \"body\": \"boom\"}"));
+
+        verify(span).setHttpStatusCode(500);
+        verify(span).setError(true, ErrorPriorities.HTTP_SERVER_DECORATOR);
+    }
+
+    @Test
+    void processResponseDataDoesNotFlagClientErrorStatusAsError() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        AgentSpan span = setupMockResponseCallbacks(null, null, null, null);
+        LambdaAppSecHandler.processResponseData(span, createOutputStream("{\"statusCode\": 404, \"body\": \"nope\"}"));
+
+        verify(span).setHttpStatusCode(404);
+        verify(span).setError(false, ErrorPriorities.HTTP_SERVER_DECORATOR);
+    }
+
+    @Test
+    void processResponseDataLeavesHttpStatusCodeUnsetForRestResponseWithoutStatus() {
+        LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST);
+        AgentSpan span = setupMockResponseCallbacks(null, null, null, null);
+        LambdaAppSecHandler.processResponseData(span, createOutputStream("{\"result\": \"hello\"}"));
+
+        verify(span, never()).setHttpStatusCode(anyInt());
+        verify(span, never()).setError(anyBoolean(), anyByte());
+    }
+
+    // ============================================================================
+    // Helper Methods
+    // ============================================================================
+
+    private static Map<String, Object> tagsOf(AgentSpanContext context) {
+        assertInstanceOf(TagContext.class, context);
+        return new HashMap<>(((TagContext) context).getTags());
+    }
+
+    private static ByteArrayInputStream createInputStream(String json) {
+        return new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8));
+    }
+
+    private static ByteArrayOutputStream createOutputStream(String json) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try {
+            baos.write(json.getBytes(StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return baos;
+    }
+
+    private static class Callbacks {
+        BiConsumer<String, URIDataAdapter> onMethodUri;
+        BiConsumer<String, String> onHeader;
+        BiConsumer<String, Integer> onSocketAddress;
+        Consumer<Map<String, Object>> onPathParams;
+        Consumer<Object> onBody;
+        Consumer<List<String>> onFilenames;
+
+        Callbacks onMethodUri(BiConsumer<String, URIDataAdapter> cb) {
+            this.onMethodUri = cb;
+            return this;
+        }
+
+        Callbacks onHeader(BiConsumer<String, String> cb) {
+            this.onHeader = cb;
+            return this;
+        }
+
+        Callbacks onSocketAddress(BiConsumer<String, Integer> cb) {
+            this.onSocketAddress = cb;
+            return this;
+        }
+
+        Callbacks onPathParams(Consumer<Map<String, Object>> cb) {
+            this.onPathParams = cb;
+            return this;
+        }
+
+        Callbacks onBody(Consumer<Object> cb) {
+            this.onBody = cb;
+            return this;
+        }
+
+        Callbacks onFilenames(Consumer<List<String>> cb) {
+            this.onFilenames = cb;
+            return this;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private void setupMockCallbacks(Callbacks callbacks) {
+        Object mockAppSecContext = new Object();
+        Supplier<Flow<Object>> requestStartedCallback = mock(Supplier.class);
+        when(requestStartedCallback.get()).thenReturn(new Flow.ResultFlow<>(mockAppSecContext));
+
+        TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>> methodUriCallback = null;
+        if (callbacks.onMethodUri != null) {
+            methodUriCallback = mock(TriFunction.class);
+            BiConsumer<String, URIDataAdapter> capture = callbacks.onMethodUri;
+            doAnswer(inv -> {
+                        capture.accept(inv.getArgument(1), inv.getArgument(2));
+                        return Flow.ResultFlow.empty();
+                    })
+                    .when(methodUriCallback)
+                    .apply(any(), anyString(), any(URIDataAdapter.class));
+        }
+
+        TriConsumer<RequestContext, String, String> headerCallback = null;
+        if (callbacks.onHeader != null) {
+            headerCallback = mock(TriConsumer.class);
+            BiConsumer<String, String> capture = callbacks.onHeader;
+            doAnswer(inv -> {
+                        capture.accept(inv.getArgument(1), inv.getArgument(2));
+                        return null;
+                    })
+                    .when(headerCallback)
+                    .accept(any(), anyString(), anyString());
+        }
+
+        TriFunction<RequestContext, String, Integer, Flow<Void>> socketAddressCallback = null;
+        if (callbacks.onSocketAddress != null) {
+            socketAddressCallback = mock(TriFunction.class);
+            BiConsumer<String, Integer> capture = callbacks.onSocketAddress;
+            doAnswer(inv -> {
+                        capture.accept(inv.getArgument(1), (Integer) inv.getArgument(2));
+                        return Flow.ResultFlow.empty();
+                    })
+                    .when(socketAddressCallback)
+                    .apply(any(), anyString(), anyInt());
+        }
+
+        Function<RequestContext, Flow<Void>> headerDoneCallback = mock(Function.class);
+        when(headerDoneCallback.apply(any())).thenReturn(Flow.ResultFlow.empty());
+
+        BiFunction<RequestContext, Map<String, ?>, Flow<Void>> pathParamsCallback = null;
+        if (callbacks.onPathParams != null) {
+            pathParamsCallback = mock(BiFunction.class);
+            Consumer<Map<String, Object>> capture = callbacks.onPathParams;
+            doAnswer(inv -> {
+                        capture.accept(inv.getArgument(1));
+                        return Flow.ResultFlow.empty();
+                    })
+                    .when(pathParamsCallback)
+                    .apply(any(), any(Map.class));
+        }
+
+        BiFunction<RequestContext, Object, Flow<Void>> bodyCallback = null;
+        if (callbacks.onBody != null) {
+            bodyCallback = mock(BiFunction.class);
+            Consumer<Object> capture = callbacks.onBody;
+            doAnswer(inv -> {
+                        capture.accept(inv.getArgument(1));
+                        return Flow.ResultFlow.empty();
+                    })
+                    .when(bodyCallback)
+                    .apply(any(), any());
+        }
+
+        BiFunction<RequestContext, List<String>, Flow<Void>> filenamesCallback = null;
+        if (callbacks.onFilenames != null) {
+            filenamesCallback = mock(BiFunction.class);
+            Consumer<List<String>> capture = callbacks.onFilenames;
+            doAnswer(inv -> {
+                        capture.accept(inv.getArgument(1));
+                        return Flow.ResultFlow.empty();
+                    })
+                    .when(filenamesCallback)
+                    .apply(any(), any());
+        }
+
+        CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
+        when(mockCallbackProvider.getCallback(EVENTS.requestStarted())).thenReturn(requestStartedCallback);
+        when(mockCallbackProvider.getCallback(EVENTS.requestMethodUriRaw())).thenReturn(methodUriCallback);
+        when(mockCallbackProvider.getCallback(EVENTS.requestHeader())).thenReturn(headerCallback);
+        when(mockCallbackProvider.getCallback(EVENTS.requestClientSocketAddress()))
+                .thenReturn(socketAddressCallback);
+        when(mockCallbackProvider.getCallback(EVENTS.requestHeaderDone())).thenReturn(headerDoneCallback);
+        when(mockCallbackProvider.getCallback(EVENTS.requestPathParams())).thenReturn(pathParamsCallback);
+        when(mockCallbackProvider.getCallback(EVENTS.requestBodyProcessed())).thenReturn(bodyCallback);
+        when(mockCallbackProvider.getCallback(EVENTS.requestFilesFilenames())).thenReturn(filenamesCallback);
+
+        AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
+        when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(mockCallbackProvider);
+        AgentTracer.forceRegister(mockTracer);
+    }
+
+    private static Map<String, Object> mapOf(Object... keysAndValues) {
+        Map<String, Object> map = new LinkedHashMap<>();
+        for (int i = 0; i < keysAndValues.length; i += 2) {
+            map.put((String) keysAndValues[i], keysAndValues[i + 1]);
+        }
+        return map;
+    }
+
+    @SuppressWarnings("unchecked")
+    private AgentSpan setupMockResponseCallbacks(
+            Consumer<Integer> onResponseStarted,
+            BiConsumer<String, String> onResponseHeader,
+            Runnable onResponseHeaderDone,
+            Consumer<Object> onResponseBody) {
+
+        RequestContext mockRequestContext = mock(RequestContext.class);
+        when(mockRequestContext.getData(RequestContextSlot.APPSEC)).thenReturn(new Object());
+        AgentSpan mockSpan = mock(AgentSpan.class);
+        when(mockSpan.getRequestContext()).thenReturn(mockRequestContext);
+
+        BiFunction<RequestContext, Integer, Flow<Void>> responseStartedCb = null;
+        if (onResponseStarted != null) {
+            responseStartedCb = mock(BiFunction.class);
+            Consumer<Integer> capture = onResponseStarted;
+            doAnswer(inv -> {
+                        capture.accept(inv.getArgument(1));
+                        return new Flow.ResultFlow<>(null);
+                    })
+                    .when(responseStartedCb)
+                    .apply(any(RequestContext.class), anyInt());
+        }
+
+        TriConsumer<RequestContext, String, String> responseHeaderCb = null;
+        if (onResponseHeader != null) {
+            responseHeaderCb = mock(TriConsumer.class);
+            BiConsumer<String, String> capture = onResponseHeader;
+            doAnswer(inv -> {
+                        capture.accept(inv.getArgument(1), inv.getArgument(2));
+                        return null;
+                    })
+                    .when(responseHeaderCb)
+                    .accept(any(), anyString(), anyString());
+        }
+
+        Function<RequestContext, Flow<Void>> responseHeaderDoneCb = mock(Function.class);
+        if (onResponseHeaderDone != null) {
+            Runnable capture = onResponseHeaderDone;
+            doAnswer(inv -> {
+                        capture.run();
+                        return new Flow.ResultFlow<>(null);
+                    })
+                    .when(responseHeaderDoneCb)
+                    .apply(any(RequestContext.class));
+        } else {
+            when(responseHeaderDoneCb.apply(any())).thenReturn(new Flow.ResultFlow<>(null));
+        }
+
+        BiFunction<RequestContext, Object, Flow<Void>> responseBodyCb = null;
+        if (onResponseBody != null) {
+            responseBodyCb = mock(BiFunction.class);
+            Consumer<Object> capture = onResponseBody;
+            doAnswer(inv -> {
+                        capture.accept(inv.getArgument(1));
+                        return new Flow.ResultFlow<>(null);
+                    })
+                    .when(responseBodyCb)
+                    .apply(any(RequestContext.class), any());
+        }
+
+        CallbackProvider mockCallbackProvider = mock(CallbackProvider.class);
+        when(mockCallbackProvider.getCallback(EVENTS.responseStarted())).thenReturn(responseStartedCb);
+        when(mockCallbackProvider.getCallback(EVENTS.responseHeader())).thenReturn(responseHeaderCb);
+        when(mockCallbackProvider.getCallback(EVENTS.responseHeaderDone())).thenReturn(responseHeaderDoneCb);
+        when(mockCallbackProvider.getCallback(EVENTS.responseBody())).thenReturn(responseBodyCb);
+
+        AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class);
+        when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC)).thenReturn(mockCallbackProvider);
+        AgentTracer.forceRegister(mockTracer);
+
+        return mockSpan;
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/lambda/LambdaEventParserTest.java b/dd-trace-core/src/test/java/datadog/trace/lambda/LambdaEventParserTest.java
index 7811ab23c97..f17ef3b7b34 100644
--- a/dd-trace-core/src/test/java/datadog/trace/lambda/LambdaEventParserTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/lambda/LambdaEventParserTest.java
@@ -19,316 +19,282 @@
 /** Unit tests for the host and route extraction that feeds the HTTP span tags. */
 class LambdaEventParserTest {
 
-  // ============================================================================
-  // API Gateway v1 (REST)
-  // ============================================================================
-
-  @Test
-  void restApiPrefersDomainNameOverHostHeader() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"resource\": \"/users/{id}\", \"path\": \"/users/42\", \"httpMethod\": \"GET\","
-                + " \"headers\": {\"Host\": \"header.example.com\"},"
-                + " \"requestContext\": {\"httpMethod\": \"GET\", \"domainName\":"
-                + " \"context.example.com\"}}");
-
-    assertEquals(LambdaTriggerType.API_GATEWAY_V1_REST, data.triggerType);
-    assertEquals("context.example.com", data.host);
-  }
-
-  @Test
-  void restApiFallsBackToCapitalisedHostHeader() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"path\": \"/users/42\", \"httpMethod\": \"GET\", \"headers\": {\"Host\":"
+    // ============================================================================
+    // API Gateway v1 (REST)
+    // ============================================================================
+
+    @Test
+    void restApiPrefersDomainNameOverHostHeader() {
+        LambdaRequestData data =
+                parseEvent("{\"resource\": \"/users/{id}\", \"path\": \"/users/42\", \"httpMethod\": \"GET\","
+                        + " \"headers\": {\"Host\": \"header.example.com\"},"
+                        + " \"requestContext\": {\"httpMethod\": \"GET\", \"domainName\":"
+                        + " \"context.example.com\"}}");
+
+        assertEquals(LambdaTriggerType.API_GATEWAY_V1_REST, data.triggerType);
+        assertEquals("context.example.com", data.host);
+    }
+
+    @Test
+    void restApiFallsBackToCapitalisedHostHeader() {
+        LambdaRequestData data = parseEvent("{\"path\": \"/users/42\", \"httpMethod\": \"GET\", \"headers\": {\"Host\":"
                 + " \"abc123.execute-api.eu-west-1.amazonaws.com\"}, \"requestContext\":"
                 + " {\"httpMethod\": \"GET\"}}");
 
-    assertEquals("abc123.execute-api.eu-west-1.amazonaws.com", data.host);
-  }
+        assertEquals("abc123.execute-api.eu-west-1.amazonaws.com", data.host);
+    }
 
-  @Test
-  void restApiRouteIsTheResource() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"resource\": \"/users/{id}\", \"path\": \"/users/42\", \"httpMethod\": \"GET\","
-                + " \"requestContext\": {\"httpMethod\": \"GET\"}}");
+    @Test
+    void restApiRouteIsTheResource() {
+        LambdaRequestData data =
+                parseEvent("{\"resource\": \"/users/{id}\", \"path\": \"/users/42\", \"httpMethod\": \"GET\","
+                        + " \"requestContext\": {\"httpMethod\": \"GET\"}}");
 
-    assertEquals("/users/{id}", data.route);
-  }
+        assertEquals("/users/{id}", data.route);
+    }
 
-  @Test
-  void restApiHasNoRouteWhenResourceIsMissing() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"path\": \"/users/42\", \"httpMethod\": \"GET\", \"requestContext\":"
+    @Test
+    void restApiHasNoRouteWhenResourceIsMissing() {
+        LambdaRequestData data = parseEvent("{\"path\": \"/users/42\", \"httpMethod\": \"GET\", \"requestContext\":"
                 + " {\"httpMethod\": \"GET\"}}");
 
-    assertNull(data.route);
-  }
-
-  // ============================================================================
-  // API Gateway v2 (HTTP) and Lambda Function URL
-  // ============================================================================
-
-  @Test
-  void httpApiStripsTheMethodFromTheRouteKey() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"headers\": {\"host\": \"api.example.com\"}, \"requestContext\": {\"domainName\":"
-                + " \"api.example.com\", \"routeKey\": \"GET /users/{id}\", \"http\": {\"method\":"
-                + " \"GET\", \"path\": \"/users/42\"}}}");
-
-    assertEquals(LambdaTriggerType.API_GATEWAY_V2_HTTP, data.triggerType);
-    assertEquals("api.example.com", data.host);
-    assertEquals("/users/{id}", data.route);
-  }
-
-  @Test
-  void httpApiDropsTheDefaultRouteKey() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"requestContext\": {\"domainName\": \"api.example.com\", \"routeKey\":"
+        assertNull(data.route);
+    }
+
+    // ============================================================================
+    // API Gateway v2 (HTTP) and Lambda Function URL
+    // ============================================================================
+
+    @Test
+    void httpApiStripsTheMethodFromTheRouteKey() {
+        LambdaRequestData data =
+                parseEvent("{\"headers\": {\"host\": \"api.example.com\"}, \"requestContext\": {\"domainName\":"
+                        + " \"api.example.com\", \"routeKey\": \"GET /users/{id}\", \"http\": {\"method\":"
+                        + " \"GET\", \"path\": \"/users/42\"}}}");
+
+        assertEquals(LambdaTriggerType.API_GATEWAY_V2_HTTP, data.triggerType);
+        assertEquals("api.example.com", data.host);
+        assertEquals("/users/{id}", data.route);
+    }
+
+    @Test
+    void httpApiDropsTheDefaultRouteKey() {
+        LambdaRequestData data = parseEvent("{\"requestContext\": {\"domainName\": \"api.example.com\", \"routeKey\":"
                 + " \"$default\", \"http\": {\"method\": \"GET\", \"path\": \"/\"}}}");
 
-    assertNull(data.route);
-  }
+        assertNull(data.route);
+    }
 
-  @Test
-  void functionUrlHasNoRouteAndTakesHostFromDomainName() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"requestContext\": {\"domainName\":"
+    @Test
+    void functionUrlHasNoRouteAndTakesHostFromDomainName() {
+        LambdaRequestData data = parseEvent("{\"requestContext\": {\"domainName\":"
                 + " \"abc.lambda-url.eu-west-1.on.aws\", \"routeKey\": \"$default\", \"http\":"
                 + " {\"method\": \"POST\", \"path\": \"/\"}}}");
 
-    assertEquals(LambdaTriggerType.LAMBDA_URL, data.triggerType);
-    assertEquals("abc.lambda-url.eu-west-1.on.aws", data.host);
-    assertNull(data.route);
-  }
-
-  @Test
-  void httpApiExposesTheRawRequestLine() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"rawPath\": \"/users/42\", \"rawQueryString\": \"a=1&a=2\", \"requestContext\":"
-                + " {\"domainName\": \"api.example.com\", \"http\": {\"method\": \"GET\","
-                + " \"path\": \"/users/42\"}}}");
-
-    assertEquals("/users/42?a=1&a=2", data.rawUri);
-  }
-
-  @Test
-  void restApiPrefersTheMultiValueQueryParameters() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"path\": \"/users\", \"queryStringParameters\": {\"a\": \"2\"},"
+        assertEquals(LambdaTriggerType.LAMBDA_URL, data.triggerType);
+        assertEquals("abc.lambda-url.eu-west-1.on.aws", data.host);
+        assertNull(data.route);
+    }
+
+    @Test
+    void httpApiExposesTheRawRequestLine() {
+        LambdaRequestData data =
+                parseEvent("{\"rawPath\": \"/users/42\", \"rawQueryString\": \"a=1&a=2\", \"requestContext\":"
+                        + " {\"domainName\": \"api.example.com\", \"http\": {\"method\": \"GET\","
+                        + " \"path\": \"/users/42\"}}}");
+
+        assertEquals("/users/42?a=1&a=2", data.rawUri);
+    }
+
+    @Test
+    void restApiPrefersTheMultiValueQueryParameters() {
+        LambdaRequestData data = parseEvent("{\"path\": \"/users\", \"queryStringParameters\": {\"a\": \"2\"},"
                 + " \"multiValueQueryStringParameters\": {\"a\": [\"1\", \"2\"]},"
                 + " \"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"r-1\"}}");
 
-    assertEquals(singletonMap("a", asList("1", "2")), data.queryParameters);
-  }
+        assertEquals(singletonMap("a", asList("1", "2")), data.queryParameters);
+    }
 
-  @Test
-  void restApiFallsBackToTheSingleValueQueryParameters() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"path\": \"/users\", \"queryStringParameters\": {\"a\": \"2\"},"
+    @Test
+    void restApiFallsBackToTheSingleValueQueryParameters() {
+        LambdaRequestData data = parseEvent("{\"path\": \"/users\", \"queryStringParameters\": {\"a\": \"2\"},"
                 + " \"requestContext\": {\"httpMethod\": \"GET\", \"requestId\": \"r-1\"}}");
 
-    assertEquals(singletonMap("a", singletonList("2")), data.queryParameters);
-  }
+        assertEquals(singletonMap("a", singletonList("2")), data.queryParameters);
+    }
 
-  @Test
-  void restApiExposesNoRawRequestLine() {
-    // Only v2 payloads carry rawPath/rawQueryString; v1 has to be rebuilt from its parameter map
-    LambdaRequestData data =
-        parseEvent(
-            "{\"path\": \"/users/42\", \"httpMethod\": \"GET\", \"requestContext\":"
+    @Test
+    void restApiExposesNoRawRequestLine() {
+        // Only v2 payloads carry rawPath/rawQueryString; v1 has to be rebuilt from its parameter map
+        LambdaRequestData data = parseEvent("{\"path\": \"/users/42\", \"httpMethod\": \"GET\", \"requestContext\":"
                 + " {\"httpMethod\": \"GET\"}}");
 
-    assertNull(data.rawUri);
-  }
-
-  // ============================================================================
-  // API Gateway v2 (WebSocket)
-  // ============================================================================
-
-  @Test
-  void webSocketRouteIsTheRawRouteKey() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"requestContext\": {\"connectionId\": \"c1\", \"eventType\": \"CONNECT\","
-                + " \"routeKey\": \"$connect\", \"domainName\": \"ws.example.com\"}}");
-
-    assertEquals(LambdaTriggerType.API_GATEWAY_V2_WEBSOCKET, data.triggerType);
-    assertEquals("ws.example.com", data.host);
-    assertEquals("$connect", data.route);
-  }
-
-  // ============================================================================
-  // ALB
-  // ============================================================================
-
-  @Test
-  void albTakesHostFromHeaderAndHasNoRoute() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
+        assertNull(data.rawUri);
+    }
+
+    // ============================================================================
+    // API Gateway v2 (WebSocket)
+    // ============================================================================
+
+    @Test
+    void webSocketRouteIsTheRawRouteKey() {
+        LambdaRequestData data =
+                parseEvent("{\"requestContext\": {\"connectionId\": \"c1\", \"eventType\": \"CONNECT\","
+                        + " \"routeKey\": \"$connect\", \"domainName\": \"ws.example.com\"}}");
+
+        assertEquals(LambdaTriggerType.API_GATEWAY_V2_WEBSOCKET, data.triggerType);
+        assertEquals("ws.example.com", data.host);
+        assertEquals("$connect", data.route);
+    }
+
+    // ============================================================================
+    // ALB
+    // ============================================================================
+
+    @Test
+    void albTakesHostFromHeaderAndHasNoRoute() {
+        LambdaRequestData data = parseEvent("{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
                 + " \"lb-123.eu-west-1.elb.amazonaws.com\"}, \"requestContext\": {\"elb\":"
                 + " {\"targetGroupArn\": \"arn\"}}}");
 
-    assertEquals(LambdaTriggerType.ALB, data.triggerType);
-    assertEquals("lb-123.eu-west-1.elb.amazonaws.com", data.host);
-    assertNull(data.route);
-  }
+        assertEquals(LambdaTriggerType.ALB, data.triggerType);
+        assertEquals("lb-123.eu-west-1.elb.amazonaws.com", data.host);
+        assertNull(data.route);
+    }
 
-  @Test
-  void albStripsThePortFromTheHostHeader() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
+    @Test
+    void albStripsThePortFromTheHostHeader() {
+        LambdaRequestData data = parseEvent("{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
                 + " \"lb.example.com:8080\"}, \"requestContext\": {\"elb\": {\"targetGroupArn\":"
                 + " \"arn\"}}}");
 
-    // The port is carried separately, by x-forwarded-port
-    assertEquals("lb.example.com", data.host);
-  }
+        // The port is carried separately, by x-forwarded-port
+        assertEquals("lb.example.com", data.host);
+    }
 
-  @Test
-  void albKeepsAnIpv6HostIntact() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\": \"[::1]\"},"
-                + " \"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn\"}}}");
+    @Test
+    void albKeepsAnIpv6HostIntact() {
+        LambdaRequestData data =
+                parseEvent("{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\": \"[::1]\"},"
+                        + " \"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn\"}}}");
 
-    assertEquals("[::1]", data.host);
-  }
+        assertEquals("[::1]", data.host);
+    }
 
-  @Test
-  void albStripsThePortFromABracketedIpv6Host() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
+    @Test
+    void albStripsThePortFromABracketedIpv6Host() {
+        LambdaRequestData data = parseEvent("{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"headers\": {\"host\":"
                 + " \"[2001:db8::1]:8080\"}, \"requestContext\": {\"elb\": {\"targetGroupArn\":"
                 + " \"arn\"}}}");
 
-    assertEquals("[2001:db8::1]", data.host);
-  }
+        assertEquals("[2001:db8::1]", data.host);
+    }
 
-  @Test
-  void albMultiValueTakesHostFromMultiValueHeaders() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"multiValueHeaders\": {\"host\":"
-                + " [\"lb-123.eu-west-1.elb.amazonaws.com\"]}, \"requestContext\": {\"elb\":"
-                + " {\"targetGroupArn\": \"arn\"}}}");
+    @Test
+    void albMultiValueTakesHostFromMultiValueHeaders() {
+        LambdaRequestData data =
+                parseEvent("{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"multiValueHeaders\": {\"host\":"
+                        + " [\"lb-123.eu-west-1.elb.amazonaws.com\"]}, \"requestContext\": {\"elb\":"
+                        + " {\"targetGroupArn\": \"arn\"}}}");
 
-    assertEquals(LambdaTriggerType.ALB_MULTI_VALUE, data.triggerType);
-    assertEquals("lb-123.eu-west-1.elb.amazonaws.com", data.host);
-  }
+        assertEquals(LambdaTriggerType.ALB_MULTI_VALUE, data.triggerType);
+        assertEquals("lb-123.eu-west-1.elb.amazonaws.com", data.host);
+    }
 
-  @Test
-  void albMultiValueFallsBackToSingleValueHeaders() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"multiValueHeaders\":"
+    @Test
+    void albMultiValueFallsBackToSingleValueHeaders() {
+        LambdaRequestData data = parseEvent("{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"multiValueHeaders\":"
                 + " \"not-a-map\", \"headers\": {\"host\": \"fallback.example.com\"},"
                 + " \"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn\"}}}");
 
-    assertEquals(LambdaTriggerType.ALB_MULTI_VALUE, data.triggerType);
-    assertEquals("fallback.example.com", data.host);
-  }
-
-  @Test
-  void albMultiValueFallsBackToSingleValueQueryParameters() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"multiValueHeaders\": {\"host\":"
-                + " [\"lb.example.com\"]}, \"queryStringParameters\": {\"q\": \"hello\"},"
-                + " \"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn\"}}}");
-
-    assertEquals(LambdaTriggerType.ALB_MULTI_VALUE, data.triggerType);
-    assertEquals(singletonList("hello"), data.queryParameters.get("q"));
-  }
-
-  @Test
-  void queryParametersKeepEventOrder() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"resource\": \"/items\", \"path\": \"/items\", \"queryStringParameters\": {\"z\":"
-                + " \"1\", \"a\": \"2\", \"m\": \"3\"}, \"requestContext\": {\"httpMethod\":"
-                + " \"GET\", \"domainName\": \"api.example.com\"}}");
-
-    // Order drives the rebuilt query string, so it must follow the event, not a hash order
-    assertEquals(asList("z", "a", "m"), new ArrayList<>(data.queryParameters.keySet()));
-    assertEquals("/items?z=1&a=2&m=3", buildFullPath(data.path, data.queryParameters));
-  }
-
-  // ============================================================================
-  // Non-HTTP and malformed payloads
-  // ============================================================================
-
-  @Test
-  void nonHttpEventIsNotExtracted() {
-    // AppSec skips non-HTTP triggers entirely, so nothing is extracted from their payload
-    assertSame(
-        LambdaRequestData.EMPTY,
-        parseEvent("{\"Records\": [{\"eventSource\": \"aws:sqs\", \"body\": \"hello\"}]}"));
-  }
-
-  @Test
-  void malformedPayloadReturnsEmpty() {
-    assertSame(LambdaRequestData.EMPTY, parseEvent("{not json"));
-  }
-
-  // ============================================================================
-  // Header casing
-  // ============================================================================
-
-  @Test
-  void headerKeysAreLowercasedAtExtraction() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"resource\": \"/users/{id}\", \"path\": \"/users/42\", \"httpMethod\": \"GET\","
-                + " \"headers\": {\"Host\": \"api.example.com\", \"User-Agent\": \"curl/8.1\"},"
-                + " \"requestContext\": {\"httpMethod\": \"GET\"}}");
-
-    // findHeader is an exact lookup, so a match proves the keys were lowercased on the way in
-    assertEquals("api.example.com", findHeader(data.headers, "host"));
-    assertEquals("curl/8.1", findHeader(data.headers, "user-agent"));
-    assertEquals(2, data.headers.size());
-  }
-
-  @Test
-  void albMultiValueHeaderKeysAreLowercasedAtExtraction() {
-    LambdaRequestData data =
-        parseEvent(
-            "{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"multiValueHeaders\": {\"Host\":"
-                + " [\"lb.example.com\"], \"User-Agent\": [\"curl/8.1\"]}, \"requestContext\":"
-                + " {\"elb\": {\"targetGroupArn\": \"arn\"}}}");
-
-    assertEquals("lb.example.com", findHeader(data.headers, "host"));
-    assertEquals("curl/8.1", findHeader(data.headers, "user-agent"));
-  }
-
-  @Test
-  void capitalisedCookieHeaderIsMergedWithTheV2CookiesArray() {
-    // The merge in extractHeadersWithCookies looks up "cookie", which only matches once keys are
-    // lowercased at extraction — an API Gateway v1 style "Cookie" used to be left as a second entry
-    LambdaRequestData data =
-        parseEvent(
-            "{\"headers\": {\"Cookie\": \"a=1\"}, \"cookies\": [\"b=2\"], \"requestContext\":"
-                + " {\"domainName\": \"api.example.com\", \"http\": {\"method\": \"GET\","
-                + " \"path\": \"/\"}}}");
-
-    assertEquals("a=1; b=2", findHeader(data.headers, "cookie"));
-    assertEquals(1, data.headers.size());
-  }
-
-  @Test
-  void findHeaderIsNullSafe() {
-    assertNull(findHeader(null, "user-agent"));
-    assertNull(findHeader(new HashMap<>(), "user-agent"));
-  }
+        assertEquals(LambdaTriggerType.ALB_MULTI_VALUE, data.triggerType);
+        assertEquals("fallback.example.com", data.host);
+    }
+
+    @Test
+    void albMultiValueFallsBackToSingleValueQueryParameters() {
+        LambdaRequestData data =
+                parseEvent("{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"multiValueHeaders\": {\"host\":"
+                        + " [\"lb.example.com\"]}, \"queryStringParameters\": {\"q\": \"hello\"},"
+                        + " \"requestContext\": {\"elb\": {\"targetGroupArn\": \"arn\"}}}");
+
+        assertEquals(LambdaTriggerType.ALB_MULTI_VALUE, data.triggerType);
+        assertEquals(singletonList("hello"), data.queryParameters.get("q"));
+    }
+
+    @Test
+    void queryParametersKeepEventOrder() {
+        LambdaRequestData data =
+                parseEvent("{\"resource\": \"/items\", \"path\": \"/items\", \"queryStringParameters\": {\"z\":"
+                        + " \"1\", \"a\": \"2\", \"m\": \"3\"}, \"requestContext\": {\"httpMethod\":"
+                        + " \"GET\", \"domainName\": \"api.example.com\"}}");
+
+        // Order drives the rebuilt query string, so it must follow the event, not a hash order
+        assertEquals(asList("z", "a", "m"), new ArrayList<>(data.queryParameters.keySet()));
+        assertEquals("/items?z=1&a=2&m=3", buildFullPath(data.path, data.queryParameters));
+    }
+
+    // ============================================================================
+    // Non-HTTP and malformed payloads
+    // ============================================================================
+
+    @Test
+    void nonHttpEventIsNotExtracted() {
+        // AppSec skips non-HTTP triggers entirely, so nothing is extracted from their payload
+        assertSame(
+                LambdaRequestData.EMPTY,
+                parseEvent("{\"Records\": [{\"eventSource\": \"aws:sqs\", \"body\": \"hello\"}]}"));
+    }
+
+    @Test
+    void malformedPayloadReturnsEmpty() {
+        assertSame(LambdaRequestData.EMPTY, parseEvent("{not json"));
+    }
+
+    // ============================================================================
+    // Header casing
+    // ============================================================================
+
+    @Test
+    void headerKeysAreLowercasedAtExtraction() {
+        LambdaRequestData data =
+                parseEvent("{\"resource\": \"/users/{id}\", \"path\": \"/users/42\", \"httpMethod\": \"GET\","
+                        + " \"headers\": {\"Host\": \"api.example.com\", \"User-Agent\": \"curl/8.1\"},"
+                        + " \"requestContext\": {\"httpMethod\": \"GET\"}}");
+
+        // findHeader is an exact lookup, so a match proves the keys were lowercased on the way in
+        assertEquals("api.example.com", findHeader(data.headers, "host"));
+        assertEquals("curl/8.1", findHeader(data.headers, "user-agent"));
+        assertEquals(2, data.headers.size());
+    }
+
+    @Test
+    void albMultiValueHeaderKeysAreLowercasedAtExtraction() {
+        LambdaRequestData data =
+                parseEvent("{\"httpMethod\": \"GET\", \"path\": \"/alb\", \"multiValueHeaders\": {\"Host\":"
+                        + " [\"lb.example.com\"], \"User-Agent\": [\"curl/8.1\"]}, \"requestContext\":"
+                        + " {\"elb\": {\"targetGroupArn\": \"arn\"}}}");
+
+        assertEquals("lb.example.com", findHeader(data.headers, "host"));
+        assertEquals("curl/8.1", findHeader(data.headers, "user-agent"));
+    }
+
+    @Test
+    void capitalisedCookieHeaderIsMergedWithTheV2CookiesArray() {
+        // The merge in extractHeadersWithCookies looks up "cookie", which only matches once keys are
+        // lowercased at extraction — an API Gateway v1 style "Cookie" used to be left as a second entry
+        LambdaRequestData data =
+                parseEvent("{\"headers\": {\"Cookie\": \"a=1\"}, \"cookies\": [\"b=2\"], \"requestContext\":"
+                        + " {\"domainName\": \"api.example.com\", \"http\": {\"method\": \"GET\","
+                        + " \"path\": \"/\"}}}");
+
+        assertEquals("a=1; b=2", findHeader(data.headers, "cookie"));
+        assertEquals(1, data.headers.size());
+    }
+
+    @Test
+    void findHeaderIsNullSafe() {
+        assertNull(findHeader(null, "user-agent"));
+        assertNull(findHeader(new HashMap<>(), "user-agent"));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/lambda/LambdaHandlerTest.java b/dd-trace-core/src/test/java/datadog/trace/lambda/LambdaHandlerTest.java
index 6eeefd1d19a..c8f158750ab 100644
--- a/dd-trace-core/src/test/java/datadog/trace/lambda/LambdaHandlerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/lambda/LambdaHandlerTest.java
@@ -28,306 +28,251 @@
 @SuppressWarnings({"unchecked", "rawtypes"})
 public class LambdaHandlerTest extends DDCoreJavaSpecification {
 
-  static class TestObject {
-    public String field1;
-    public boolean field2;
+    static class TestObject {
+        public String field1;
+        public boolean field2;
+
+        TestObject() {
+            this.field1 = "toto";
+            this.field2 = true;
+        }
+
+        @Override
+        public String toString() {
+            return field1 + " / " + field2 + "}";
+        }
+    }
+
+    @Test
+    void testStartInvocationSuccess() {
+        CoreTracer ct = tracerBuilder().build();
+
+        JavaTestHttpServer server = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.post(
+                "/lambda/start-invocation",
+                api -> api.getResponse()
+                        .status(200)
+                        .addHeader("x-datadog-trace-id", "1234")
+                        .addHeader("x-datadog-sampling-priority", "2")
+                        .send())));
+        LambdaHandler.setExtensionBaseUrl(server.getAddress().toString());
+
+        AgentSpanContext objTest = LambdaHandler.notifyStartInvocation(new TestObject(), "lambda-request-123");
+
+        assertEquals("1234", objTest.getTraceId().toString());
+        assertEquals(2, objTest.getSamplingPriority());
+        assertEquals("lambda-request-123", server.getLastRequest().getHeader("lambda-runtime-aws-request-id"));
+
+        server.close();
+        ct.close();
+    }
+
+    @Test
+    void testStartInvocationWith128BitTraceId() {
+        CoreTracer ct = tracerBuilder().build();
+
+        JavaTestHttpServer server = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.post(
+                "/lambda/start-invocation",
+                api -> api.getResponse()
+                        .status(200)
+                        .addHeader("x-datadog-trace-id", "5744042798732701615")
+                        .addHeader("x-datadog-sampling-priority", "2")
+                        .addHeader("x-datadog-tags", "_dd.p.tid=1914fe7789eb32be")
+                        .send())));
+        LambdaHandler.setExtensionBaseUrl(server.getAddress().toString());
+
+        AgentSpanContext objTest = LambdaHandler.notifyStartInvocation(new TestObject(), "lambda-request-123");
+
+        assertEquals("1914fe7789eb32be4fb6f07e011a6faf", objTest.getTraceId().toHexString());
+        assertEquals(2, objTest.getSamplingPriority());
+        assertEquals("lambda-request-123", server.getLastRequest().getHeader("lambda-runtime-aws-request-id"));
+
+        server.close();
+        ct.close();
+    }
+
+    @Test
+    void testStartInvocationFailure() {
+        CoreTracer ct = tracerBuilder().build();
+
+        JavaTestHttpServer server = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.post(
+                "/lambda/start-invocation", api -> api.getResponse().status(500).send())));
+        LambdaHandler.setExtensionBaseUrl(server.getAddress().toString());
+
+        AgentSpanContext objTest = LambdaHandler.notifyStartInvocation(new TestObject(), "my-lambda-request");
+
+        assertNull(objTest);
+        assertEquals("my-lambda-request", server.getLastRequest().getHeader("lambda-runtime-aws-request-id"));
+
+        server.close();
+        ct.close();
+    }
+
+    @TableTest(
+            value = {
+      "scenario                     | expected | eHeaderValue | tIdHeaderValue | sIdHeaderValue | sPIdHeaderValue | lambdaResult | boolValue | lambdaReqIdHeaderValue",
+      "error with non-string result | true     | 'true'       | '1234'         | '5678'         | 2               |              | true      | 'request123'          ",
+      "success with string result   | true     |              | '1234'         | '5678'         | 2               | '12345 '     | false     | 'request456'          "
+    })
+    void testEndInvocationSuccess(
+            boolean expected,
+            String eHeaderValue,
+            String tIdHeaderValue,
+            String sIdHeaderValue,
+            String sPIdHeaderValue,
+            Object lambdaResult,
+            boolean boolValue,
+            String lambdaReqIdHeaderValue) {
+        JavaTestHttpServer server = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.post(
+                "/lambda/end-invocation", api -> api.getResponse().status(200).send())));
+        LambdaHandler.setExtensionBaseUrl(server.getAddress().toString());
+
+        DDSpan span = mock(DDSpan.class);
+        when(span.getTraceId()).thenReturn(DDTraceId.from("1234"));
+        when(span.getSpanId()).thenReturn(DDSpanId.from("5678"));
+        when(span.getSamplingPriority()).thenReturn(2);
+
+        boolean result = LambdaHandler.notifyEndInvocation(span, lambdaResult, boolValue, lambdaReqIdHeaderValue);
+
+        assertEquals(eHeaderValue, server.getLastRequest().getHeader("x-datadog-invocation-error"));
+        assertEquals(tIdHeaderValue, server.getLastRequest().getHeader("x-datadog-trace-id"));
+        assertEquals(sIdHeaderValue, server.getLastRequest().getHeader("x-datadog-span-id"));
+        assertEquals(sPIdHeaderValue, server.getLastRequest().getHeader("x-datadog-sampling-priority"));
+        assertEquals(lambdaReqIdHeaderValue, server.getLastRequest().getHeader("lambda-runtime-aws-request-id"));
+        assertEquals(expected, result);
+
+        server.close();
+    }
+
+    @TableTest(
+            value = {
+      "scenario                     | expected | headerValue | lambdaResult | boolValue | lambdaReqIdHeaderValue",
+      "error with non-string result | false    | 'true'      |              | true      | 'request123'          ",
+      "success with string result   | false    |             | '12345'      | false     | 'request456'          "
+    })
+    void testEndInvocationFailure(
+            boolean expected,
+            String headerValue,
+            Object lambdaResult,
+            boolean boolValue,
+            String lambdaReqIdHeaderValue) {
+        JavaTestHttpServer server = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.post(
+                "/lambda/end-invocation", api -> api.getResponse().status(500).send())));
+        LambdaHandler.setExtensionBaseUrl(server.getAddress().toString());
+
+        DDSpan span = mock(DDSpan.class);
+        when(span.getTraceId()).thenReturn(DDTraceId.from("1234"));
+        when(span.getSpanId()).thenReturn(DDSpanId.from("5678"));
+        when(span.getSamplingPriority()).thenReturn(2);
+
+        boolean result = LambdaHandler.notifyEndInvocation(span, lambdaResult, boolValue, lambdaReqIdHeaderValue);
+
+        assertEquals(expected, result);
+        assertEquals(headerValue, server.getLastRequest().getHeader("x-datadog-invocation-error"));
+        assertEquals(lambdaReqIdHeaderValue, server.getLastRequest().getHeader("lambda-runtime-aws-request-id"));
+
+        server.close();
+    }
 
-    TestObject() {
-      this.field1 = "toto";
-      this.field2 = true;
+    @Test
+    void testEndInvocationSuccessWithErrorMetadata() {
+        JavaTestHttpServer server = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.post(
+                "/lambda/end-invocation", api -> api.getResponse().status(200).send())));
+        LambdaHandler.setExtensionBaseUrl(server.getAddress().toString());
+
+        DDSpan span = mock(DDSpan.class);
+        when(span.getTraceId()).thenReturn(DDTraceId.from("1234"));
+        when(span.getSpanId()).thenReturn(DDSpanId.from("5678"));
+        when(span.getSamplingPriority()).thenReturn(2);
+        when(span.getTag(DDTags.ERROR_MSG)).thenReturn("custom error message");
+        when(span.getTag(DDTags.ERROR_TYPE)).thenReturn("java.lang.Throwable");
+        when(span.getTag(DDTags.ERROR_STACK)).thenReturn("errorStack\n \ttest");
+
+        LambdaHandler.notifyEndInvocation(span, new Object(), true, "lambda-request-123");
+
+        assertEquals("true", server.getLastRequest().getHeader("x-datadog-invocation-error"));
+        assertEquals("custom error message", server.getLastRequest().getHeader("x-datadog-invocation-error-msg"));
+        assertEquals("java.lang.Throwable", server.getLastRequest().getHeader("x-datadog-invocation-error-type"));
+        assertEquals("ZXJyb3JTdGFjawogCXRlc3Q=", server.getLastRequest().getHeader("x-datadog-invocation-error-stack"));
+        assertEquals("lambda-request-123", server.getLastRequest().getHeader("lambda-runtime-aws-request-id"));
+
+        server.close();
     }
 
-    @Override
-    public String toString() {
-      return field1 + " / " + field2 + "}";
+    @Test
+    void testMoshiToJsonSQSEvent() {
+        SQSEvent myEvent = new SQSEvent();
+        List<SQSEvent.SQSMessage> records = new ArrayList<>();
+        SQSEvent.SQSMessage message = new SQSEvent.SQSMessage();
+        message.setMessageId("myId");
+        message.setAwsRegion("myRegion");
+        records.add(message);
+        myEvent.setRecords(records);
+
+        String result = LambdaHandler.writeValueAsString(myEvent);
+
+        assertEquals("{\"records\":[{\"awsRegion\":\"myRegion\",\"messageId\":\"myId\"}]}", result);
+    }
+
+    @Test
+    void testMoshiToJsonS3Event() {
+        List<S3EventNotification.S3EventNotificationRecord> list = new ArrayList<>();
+        S3EventNotification.S3EventNotificationRecord item0 = new S3EventNotification.S3EventNotificationRecord(
+                "region", "eventName", "mySource", null, "3.4", null, null, null, null);
+        list.add(item0);
+        S3Event myEvent = new S3Event(list);
+
+        String result = LambdaHandler.writeValueAsString(myEvent);
+
+        assertEquals(
+                "{\"records\":[{\"awsRegion\":\"region\",\"eventName\":\"eventName\",\"eventSource\":\"mySource\",\"eventVersion\":\"3.4\"}]}",
+                result);
+    }
+
+    @Test
+    void testMoshiToJsonSNSEvent() {
+        SNSEvent myEvent = new SNSEvent();
+        List<SNSEvent.SNSRecord> records = new ArrayList<>();
+        SNSEvent.SNSRecord message = new SNSEvent.SNSRecord();
+        message.setEventSource("mySource");
+        message.setEventVersion("myVersion");
+        records.add(message);
+        myEvent.setRecords(records);
+
+        String result = LambdaHandler.writeValueAsString(myEvent);
+
+        assertEquals("{\"records\":[{\"eventSource\":\"mySource\",\"eventVersion\":\"myVersion\"}]}", result);
+    }
+
+    @Test
+    void testMoshiToJsonAPIGatewayProxyRequestEvent() {
+        APIGatewayProxyRequestEvent myEvent = new APIGatewayProxyRequestEvent();
+        myEvent.setBody("bababango");
+        myEvent.setHttpMethod("POST");
+
+        String result = LambdaHandler.writeValueAsString(myEvent);
+
+        assertEquals("{\"body\":\"bababango\",\"httpMethod\":\"POST\"}", result);
+    }
+
+    @Test
+    void testMoshiToJsonInputStream() {
+        String body = "{\"body\":\"bababango\",\"httpMethod\":\"POST\"}";
+        ByteArrayInputStream myEvent = new ByteArrayInputStream(body.getBytes());
+
+        String result = LambdaHandler.writeValueAsString(myEvent);
+
+        assertEquals(body, result);
+    }
+
+    @Test
+    void testMoshiToJsonOutputStream() {
+        String body = "{\"body\":\"bababango\",\"statusCode\":\"200\"}";
+        ByteArrayOutputStream myEvent = new ByteArrayOutputStream();
+        byte[] bodyBytes = body.getBytes();
+        myEvent.write(bodyBytes, 0, bodyBytes.length);
+
+        String result = LambdaHandler.writeValueAsString(myEvent);
+
+        assertEquals(body, result);
     }
-  }
-
-  @Test
-  void testStartInvocationSuccess() {
-    CoreTracer ct = tracerBuilder().build();
-
-    JavaTestHttpServer server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.post(
-                            "/lambda/start-invocation",
-                            api ->
-                                api.getResponse()
-                                    .status(200)
-                                    .addHeader("x-datadog-trace-id", "1234")
-                                    .addHeader("x-datadog-sampling-priority", "2")
-                                    .send())));
-    LambdaHandler.setExtensionBaseUrl(server.getAddress().toString());
-
-    AgentSpanContext objTest =
-        LambdaHandler.notifyStartInvocation(new TestObject(), "lambda-request-123");
-
-    assertEquals("1234", objTest.getTraceId().toString());
-    assertEquals(2, objTest.getSamplingPriority());
-    assertEquals(
-        "lambda-request-123", server.getLastRequest().getHeader("lambda-runtime-aws-request-id"));
-
-    server.close();
-    ct.close();
-  }
-
-  @Test
-  void testStartInvocationWith128BitTraceId() {
-    CoreTracer ct = tracerBuilder().build();
-
-    JavaTestHttpServer server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.post(
-                            "/lambda/start-invocation",
-                            api ->
-                                api.getResponse()
-                                    .status(200)
-                                    .addHeader("x-datadog-trace-id", "5744042798732701615")
-                                    .addHeader("x-datadog-sampling-priority", "2")
-                                    .addHeader("x-datadog-tags", "_dd.p.tid=1914fe7789eb32be")
-                                    .send())));
-    LambdaHandler.setExtensionBaseUrl(server.getAddress().toString());
-
-    AgentSpanContext objTest =
-        LambdaHandler.notifyStartInvocation(new TestObject(), "lambda-request-123");
-
-    assertEquals("1914fe7789eb32be4fb6f07e011a6faf", objTest.getTraceId().toHexString());
-    assertEquals(2, objTest.getSamplingPriority());
-    assertEquals(
-        "lambda-request-123", server.getLastRequest().getHeader("lambda-runtime-aws-request-id"));
-
-    server.close();
-    ct.close();
-  }
-
-  @Test
-  void testStartInvocationFailure() {
-    CoreTracer ct = tracerBuilder().build();
-
-    JavaTestHttpServer server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.post(
-                            "/lambda/start-invocation",
-                            api -> api.getResponse().status(500).send())));
-    LambdaHandler.setExtensionBaseUrl(server.getAddress().toString());
-
-    AgentSpanContext objTest =
-        LambdaHandler.notifyStartInvocation(new TestObject(), "my-lambda-request");
-
-    assertNull(objTest);
-    assertEquals(
-        "my-lambda-request", server.getLastRequest().getHeader("lambda-runtime-aws-request-id"));
-
-    server.close();
-    ct.close();
-  }
-
-  @TableTest(
-      value = {
-    "scenario                     | expected | eHeaderValue | tIdHeaderValue | sIdHeaderValue | sPIdHeaderValue | lambdaResult | boolValue | lambdaReqIdHeaderValue",
-    "error with non-string result | true     | 'true'       | '1234'         | '5678'         | 2               |              | true      | 'request123'          ",
-    "success with string result   | true     |              | '1234'         | '5678'         | 2               | '12345 '     | false     | 'request456'          "
-  })
-  void testEndInvocationSuccess(
-      boolean expected,
-      String eHeaderValue,
-      String tIdHeaderValue,
-      String sIdHeaderValue,
-      String sPIdHeaderValue,
-      Object lambdaResult,
-      boolean boolValue,
-      String lambdaReqIdHeaderValue) {
-    JavaTestHttpServer server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.post(
-                            "/lambda/end-invocation",
-                            api -> api.getResponse().status(200).send())));
-    LambdaHandler.setExtensionBaseUrl(server.getAddress().toString());
-
-    DDSpan span = mock(DDSpan.class);
-    when(span.getTraceId()).thenReturn(DDTraceId.from("1234"));
-    when(span.getSpanId()).thenReturn(DDSpanId.from("5678"));
-    when(span.getSamplingPriority()).thenReturn(2);
-
-    boolean result =
-        LambdaHandler.notifyEndInvocation(span, lambdaResult, boolValue, lambdaReqIdHeaderValue);
-
-    assertEquals(eHeaderValue, server.getLastRequest().getHeader("x-datadog-invocation-error"));
-    assertEquals(tIdHeaderValue, server.getLastRequest().getHeader("x-datadog-trace-id"));
-    assertEquals(sIdHeaderValue, server.getLastRequest().getHeader("x-datadog-span-id"));
-    assertEquals(sPIdHeaderValue, server.getLastRequest().getHeader("x-datadog-sampling-priority"));
-    assertEquals(
-        lambdaReqIdHeaderValue, server.getLastRequest().getHeader("lambda-runtime-aws-request-id"));
-    assertEquals(expected, result);
-
-    server.close();
-  }
-
-  @TableTest(
-      value = {
-    "scenario                     | expected | headerValue | lambdaResult | boolValue | lambdaReqIdHeaderValue",
-    "error with non-string result | false    | 'true'      |              | true      | 'request123'          ",
-    "success with string result   | false    |             | '12345'      | false     | 'request456'          "
-  })
-  void testEndInvocationFailure(
-      boolean expected,
-      String headerValue,
-      Object lambdaResult,
-      boolean boolValue,
-      String lambdaReqIdHeaderValue) {
-    JavaTestHttpServer server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.post(
-                            "/lambda/end-invocation",
-                            api -> api.getResponse().status(500).send())));
-    LambdaHandler.setExtensionBaseUrl(server.getAddress().toString());
-
-    DDSpan span = mock(DDSpan.class);
-    when(span.getTraceId()).thenReturn(DDTraceId.from("1234"));
-    when(span.getSpanId()).thenReturn(DDSpanId.from("5678"));
-    when(span.getSamplingPriority()).thenReturn(2);
-
-    boolean result =
-        LambdaHandler.notifyEndInvocation(span, lambdaResult, boolValue, lambdaReqIdHeaderValue);
-
-    assertEquals(expected, result);
-    assertEquals(headerValue, server.getLastRequest().getHeader("x-datadog-invocation-error"));
-    assertEquals(
-        lambdaReqIdHeaderValue, server.getLastRequest().getHeader("lambda-runtime-aws-request-id"));
-
-    server.close();
-  }
-
-  @Test
-  void testEndInvocationSuccessWithErrorMetadata() {
-    JavaTestHttpServer server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.post(
-                            "/lambda/end-invocation",
-                            api -> api.getResponse().status(200).send())));
-    LambdaHandler.setExtensionBaseUrl(server.getAddress().toString());
-
-    DDSpan span = mock(DDSpan.class);
-    when(span.getTraceId()).thenReturn(DDTraceId.from("1234"));
-    when(span.getSpanId()).thenReturn(DDSpanId.from("5678"));
-    when(span.getSamplingPriority()).thenReturn(2);
-    when(span.getTag(DDTags.ERROR_MSG)).thenReturn("custom error message");
-    when(span.getTag(DDTags.ERROR_TYPE)).thenReturn("java.lang.Throwable");
-    when(span.getTag(DDTags.ERROR_STACK)).thenReturn("errorStack\n \ttest");
-
-    LambdaHandler.notifyEndInvocation(span, new Object(), true, "lambda-request-123");
-
-    assertEquals("true", server.getLastRequest().getHeader("x-datadog-invocation-error"));
-    assertEquals(
-        "custom error message",
-        server.getLastRequest().getHeader("x-datadog-invocation-error-msg"));
-    assertEquals(
-        "java.lang.Throwable",
-        server.getLastRequest().getHeader("x-datadog-invocation-error-type"));
-    assertEquals(
-        "ZXJyb3JTdGFjawogCXRlc3Q=",
-        server.getLastRequest().getHeader("x-datadog-invocation-error-stack"));
-    assertEquals(
-        "lambda-request-123", server.getLastRequest().getHeader("lambda-runtime-aws-request-id"));
-
-    server.close();
-  }
-
-  @Test
-  void testMoshiToJsonSQSEvent() {
-    SQSEvent myEvent = new SQSEvent();
-    List<SQSEvent.SQSMessage> records = new ArrayList<>();
-    SQSEvent.SQSMessage message = new SQSEvent.SQSMessage();
-    message.setMessageId("myId");
-    message.setAwsRegion("myRegion");
-    records.add(message);
-    myEvent.setRecords(records);
-
-    String result = LambdaHandler.writeValueAsString(myEvent);
-
-    assertEquals("{\"records\":[{\"awsRegion\":\"myRegion\",\"messageId\":\"myId\"}]}", result);
-  }
-
-  @Test
-  void testMoshiToJsonS3Event() {
-    List<S3EventNotification.S3EventNotificationRecord> list = new ArrayList<>();
-    S3EventNotification.S3EventNotificationRecord item0 =
-        new S3EventNotification.S3EventNotificationRecord(
-            "region", "eventName", "mySource", null, "3.4", null, null, null, null);
-    list.add(item0);
-    S3Event myEvent = new S3Event(list);
-
-    String result = LambdaHandler.writeValueAsString(myEvent);
-
-    assertEquals(
-        "{\"records\":[{\"awsRegion\":\"region\",\"eventName\":\"eventName\",\"eventSource\":\"mySource\",\"eventVersion\":\"3.4\"}]}",
-        result);
-  }
-
-  @Test
-  void testMoshiToJsonSNSEvent() {
-    SNSEvent myEvent = new SNSEvent();
-    List<SNSEvent.SNSRecord> records = new ArrayList<>();
-    SNSEvent.SNSRecord message = new SNSEvent.SNSRecord();
-    message.setEventSource("mySource");
-    message.setEventVersion("myVersion");
-    records.add(message);
-    myEvent.setRecords(records);
-
-    String result = LambdaHandler.writeValueAsString(myEvent);
-
-    assertEquals(
-        "{\"records\":[{\"eventSource\":\"mySource\",\"eventVersion\":\"myVersion\"}]}", result);
-  }
-
-  @Test
-  void testMoshiToJsonAPIGatewayProxyRequestEvent() {
-    APIGatewayProxyRequestEvent myEvent = new APIGatewayProxyRequestEvent();
-    myEvent.setBody("bababango");
-    myEvent.setHttpMethod("POST");
-
-    String result = LambdaHandler.writeValueAsString(myEvent);
-
-    assertEquals("{\"body\":\"bababango\",\"httpMethod\":\"POST\"}", result);
-  }
-
-  @Test
-  void testMoshiToJsonInputStream() {
-    String body = "{\"body\":\"bababango\",\"httpMethod\":\"POST\"}";
-    ByteArrayInputStream myEvent = new ByteArrayInputStream(body.getBytes());
-
-    String result = LambdaHandler.writeValueAsString(myEvent);
-
-    assertEquals(body, result);
-  }
-
-  @Test
-  void testMoshiToJsonOutputStream() {
-    String body = "{\"body\":\"bababango\",\"statusCode\":\"200\"}";
-    ByteArrayOutputStream myEvent = new ByteArrayOutputStream();
-    byte[] bodyBytes = body.getBytes();
-    myEvent.write(bodyBytes, 0, bodyBytes.length);
-
-    String result = LambdaHandler.writeValueAsString(myEvent);
-
-    assertEquals(body, result);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/lambda/MultipartSplitterTest.java b/dd-trace-core/src/test/java/datadog/trace/lambda/MultipartSplitterTest.java
index 46cb58acdaf..5b4a16709ad 100644
--- a/dd-trace-core/src/test/java/datadog/trace/lambda/MultipartSplitterTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/lambda/MultipartSplitterTest.java
@@ -17,251 +17,245 @@
 
 class MultipartSplitterTest {
 
-  private static final int NO_PART_BUDGET_LIMIT = 256;
-
-  @ParameterizedTest(name = "[{index}] {0} -> {1}")
-  @CsvSource(
-      delimiter = '|',
-      nullValues = "NULL",
-      value = {
-        // case is preserved: the boundary is matched byte-for-byte against the body
-        "multipart/form-data; boundary=AbC123        | AbC123",
-        // the parameter name is not
-        "multipart/form-data; BOUNDARY=xy            | xy",
-        // quoted values may hold separators
-        "multipart/form-data; boundary=\"a;b c\"     | a;b c",
-        // position among the other parameters does not matter
-        "multipart/form-data; boundary=xy; charset=x | xy",
-        // a parameter that merely ends in "boundary" is not one
-        "multipart/form-data; xboundary=xy           | NULL",
-        "multipart/form-data                         | NULL",
-        "multipart/form-data; boundary=              | NULL",
-        "NULL                                        | NULL",
-      })
-  void extractsTheBoundary(String contentType, String expected) {
-    assertEquals(expected, extractBoundary(contentType));
-  }
-
-  @Test
-  void rejectsABoundaryOverSeventyCharacters() {
-    String maximum = repeat('a', 70);
-
-    assertEquals(maximum, extractBoundary("multipart/form-data; boundary=" + maximum));
-    assertNull(extractBoundary("multipart/form-data; boundary=" + maximum + "a"));
-  }
-
-  @ParameterizedTest(name = "[{index}] {1} of {0} -> {2}")
-  @CsvSource(
-      delimiter = '|',
-      nullValues = "NULL",
-      value = {
-        "form-data; name=user               | name     | user",
-        "form-data; name=\"user\"           | name     | user",
-        "form-data; name=\"a;b\"            | name     | a;b",
-        "form-data; NAME=user               | name     | user",
-        "form-data; name=user; charset=utf-8| name     | user",
-        // "filename" must not answer a lookup for "name": the match has to start at a parameter
-        "form-data; filename=\"f\"; name=u  | name     | u",
-        // present but empty, which is what browsers send for an untouched file input
-        "form-data; filename=\"\"           | filename | ''",
-        "form-data; filename=               | filename | ''",
-        "form-data; name=user               | filename | NULL",
-        "NULL                               | name     | NULL",
-        // a quoted value cannot forge a parameter boundary: the quoted span is skipped whole, so
-        // this field is not mistaken for a file part and dropped
-        "form-data; name=\"; filename=x\"   | filename | NULL",
-        "form-data; name=\"; filename=x\"   | name     | '; filename=x'",
-        // and the same aliasing the other way round does not rename the field
-        "form-data; filename=\"; name=y\"   | name     | NULL",
-        // RFC 7230 optional whitespace is tolerated on both sides of the "="
-        "form-data; name =user             | name     | user",
-        // a bare parameter name is not a parameter
-        "form-data; name                    | name     | NULL",
-      })
-  void readsParameters(String headerValue, String paramName, String expected) {
-    assertEquals(expected, parameter(headerValue, paramName));
-  }
-
-  @Test
-  void unescapesQuotedParameterValues() {
-    assertEquals("a\"b", parameter("form-data; name=\"a\\\"b\"", "name"));
-  }
-
-  @Test
-  void toleratesTabsAroundTheParameterEquals() {
-    assertEquals("user", parameter("form-data;\tname\t=\tuser", "name"));
-  }
-
-  @Test
-  void keepsWhatWasReadOfAnUnterminatedQuotedValue() {
-    assertEquals("abc", parameter("form-data; name=\"abc", "name"));
-    assertEquals("a\"", parameter("form-data; name=\"a\\\"", "name"));
-  }
-
-  @ParameterizedTest(name = "[{index}] {0} -> {2} part(s)")
-  @CsvSource(
-      delimiter = '|',
-      value = {
-        "happy path                | --x@A: b@@v@--x--          | 1",
-        "two parts                 | --x@@a@--x@@b@--x--        | 2",
-        "preamble is discarded     | junk@--x@@v@--x--          | 1",
-        // The preamble is discarded even when a line in it looks like a delimiter: RFC 2046
-        // requires it to be ignored, so the fields after it are the ones the app receives
-        "preamble looks like one   | --x--not-a-close@--x@@v@--x-- | 1",
-        "epilogue is discarded     | --x@@v@--x--@junk          | 1",
-        // A delimiter at the very start of a part's content has no line break of its own, so it
-        // reads as content, not as a delimiter — and the part that follows is absorbed with it
-        "delimiter at content start| --x@@--x@@v@--x--         | 1",
-        // a truncated body still yields its last part
-        "truncated last delimiter  | --x@A: b@@v                | 1",
-        "truncated in the headers  | --x@A: b                   | 0",
-        // A part truncated inside its headers voids the parts before it too: its own headers are
-        // content the WAF would otherwise never see
-        "truncated after a part    | --x@@v@--x@A: b            | 0",
-        "no line break at all      | --x                        | 0",
-        "close delimiter only      | --x--                      | 0",
-        "empty part content        | --x@A: b@@                 | 1",
-        "part without headers      | --x@@v@--x--               | 1",
-        "unrelated delimiter       | --y@@v@--y--               | 0",
-        // RFC 2046 transport padding between the delimiter and its line break
-        "padded delimiter          | --x  @@v@--x--             | 1",
-      })
-  void splitsBodies(String name, String template, int expectedParts) {
-    assertEquals(
-        expectedParts, split(template.replace("@", "\r\n"), "x", NO_PART_BUDGET_LIMIT).size());
-  }
-
-  @Test
-  void toleratesBareLineFeeds() {
-    String body = "--x\nContent-Disposition: form-data; name=a\n\nvalue\n--x--\n";
-
-    List<Part> parts = split(body, "x", NO_PART_BUDGET_LIMIT);
-
-    assertEquals(1, parts.size());
-    assertEquals("value", content(body, parts.get(0)));
-  }
-
-  @Test
-  void readsADelimiterAtAContentStartAsContent() {
-    // The close delimiter here shares the line break that terminated the headers, so it has none of
-    // its own. Commons FileUpload reads it as the field's content and so must we: reporting an
-    // empty field would hide the payload behind it from the WAF.
-    String body =
-        "--x\r\nContent-Disposition: form-data; name=a\r\n\r\n--x--\r\n' OR 1=1 --\r\n--x--";
-
-    List<Part> parts = split(body, "x", NO_PART_BUDGET_LIMIT);
-
-    assertEquals(1, parts.size());
-    assertEquals("--x--\r\n' OR 1=1 --", content(body, parts.get(0)));
-  }
-
-  @Test
-  void readsADelimiterWithItsOwnLineBreakAsADelimiter() {
-    // One line break more than the body above, which is enough to make the delimiter unambiguous:
-    // every parser reads the field as empty and the rest as the epilogue.
-    String body =
-        "--x\r\nContent-Disposition: form-data; name=a\r\n\r\n\r\n--x--\r\n' OR 1=1 --\r\n--x--";
-
-    List<Part> parts = split(body, "x", NO_PART_BUDGET_LIMIT);
-
-    assertEquals(1, parts.size());
-    assertEquals("", content(body, parts.get(0)));
-  }
-
-  @Test
-  void stopsAtThePartBudget() {
-    String body = ("--x\r\n\r\na\r\n--x\r\n\r\nb\r\n--x\r\n\r\nc\r\n--x--");
-
-    assertEquals(2, split(body, "x", 2).size());
-    assertEquals(0, split(body, "x", 0).size());
-  }
-
-  @Test
-  void delimitsContentExactly() {
-    // Dashes, line breaks, a replacement character and a multi-byte character all inside the
-    // content, plus lines that start with the part and close delimiters without being either: the
-    // reported range must not be thrown off by a near miss on the line-feed anchor, on the
-    // delimiter itself, or on its trailing dashes
-    String content = "--not-a-boundary\r\n--x-not-a-boundary\r\n--x--not-a-close\r\n-x\nlast�é";
-    String body =
-        "--x\r\nContent-Disposition: form-data; name=a\r\n\r\n" + content + "\r\n--x--\r\n";
-
-    List<Part> parts = split(body, "x", NO_PART_BUDGET_LIMIT);
-
-    assertEquals(1, parts.size());
-    assertEquals(content, content(body, parts.get(0)));
-    assertEquals("form-data; name=a", parts.get(0).contentDisposition);
-  }
-
-  @Test
-  void reportsNothingForAPartWhoseHeadersRunIntoTheNextDelimiter() {
-    // The first part's headers are not followed by a blank line, which no conforming parser
-    // accepts. Reporting the second part alone would show the WAF less than the app receives.
-    String body =
-        "--x\r\nX-First: 1\r\n"
-            + "--x\r\nContent-Disposition: form-data; name=\"b\"\r\n\r\nsecond\r\n--x--";
-
-    assertTrue(split(body, "x", NO_PART_BUDGET_LIMIT).isEmpty());
-  }
-
-  @Test
-  void matchesHeaderNamesCaseInsensitivelyAndTrimsValues() {
-    String body =
-        "--x\r\nCONTENT-Disposition:  form-data; name=a \r\n"
-            + "content-type \t:\ttext/plain \r\n\r\nv\r\n"
-            + "--x\r\nContent-Type:\r\n\r\nv\r\n--x--";
-
-    List<Part> parts = split(body, "x", NO_PART_BUDGET_LIMIT);
-
-    assertEquals("form-data; name=a", parts.get(0).contentDisposition);
-    assertEquals("text/plain", parts.get(0).contentType);
-    // A header present but empty is reported as "", distinct from the null of an absent one
-    assertEquals("", parts.get(1).contentType);
-    assertNull(parts.get(1).contentDisposition);
-  }
-
-  @Test
-  @Timeout(value = 10, unit = SECONDS)
-  void returnsPromptlyOnAnAdversarialBoundary() {
-    // Dashes are legal boundary characters, so a scan seeded on '-' would be quadratic here.
-    // Anchored on the mandatory line feed, of which this body has none, the scan is linear.
-    String boundary = repeat('-', 69) + "X";
-    String body = repeat('-', 1_000_000);
-
-    assertTrue(split(body, boundary, NO_PART_BUDGET_LIMIT).isEmpty());
-  }
-
-  @Test
-  @Timeout(value = 30, unit = SECONDS)
-  void neverThrowsOnAMutatedBody() {
-    String body =
-        "preamble\r\n--x\r\nContent-Disposition: form-data; name=\"a\"\r\n"
-            + "Content-Type: application/json\r\n\r\n{\"k\":1}\r\n"
-            + "--x\r\nContent-Disposition: form-data; name=b; filename=\"f\"\r\n\r\nfile\r\n"
-            + "--x--\r\nepilogue";
-    // Fixed positions rather than a random seed, so a failure is reproducible
-    char[] substitutes = {'-', '\r', '\n', ':', ';', '"', '\\', '=', '\0', '�'};
-
-    for (int i = 0; i <= body.length(); i++) {
-      split(body.substring(0, i), "x", NO_PART_BUDGET_LIMIT);
-      for (char substitute : substitutes) {
-        if (i < body.length()) {
-          split(
-              body.substring(0, i) + substitute + body.substring(i + 1), "x", NO_PART_BUDGET_LIMIT);
+    private static final int NO_PART_BUDGET_LIMIT = 256;
+
+    @ParameterizedTest(name = "[{index}] {0} -> {1}")
+    @CsvSource(
+            delimiter = '|',
+            nullValues = "NULL",
+            value = {
+                // case is preserved: the boundary is matched byte-for-byte against the body
+                "multipart/form-data; boundary=AbC123        | AbC123",
+                // the parameter name is not
+                "multipart/form-data; BOUNDARY=xy            | xy",
+                // quoted values may hold separators
+                "multipart/form-data; boundary=\"a;b c\"     | a;b c",
+                // position among the other parameters does not matter
+                "multipart/form-data; boundary=xy; charset=x | xy",
+                // a parameter that merely ends in "boundary" is not one
+                "multipart/form-data; xboundary=xy           | NULL",
+                "multipart/form-data                         | NULL",
+                "multipart/form-data; boundary=              | NULL",
+                "NULL                                        | NULL",
+            })
+    void extractsTheBoundary(String contentType, String expected) {
+        assertEquals(expected, extractBoundary(contentType));
+    }
+
+    @Test
+    void rejectsABoundaryOverSeventyCharacters() {
+        String maximum = repeat('a', 70);
+
+        assertEquals(maximum, extractBoundary("multipart/form-data; boundary=" + maximum));
+        assertNull(extractBoundary("multipart/form-data; boundary=" + maximum + "a"));
+    }
+
+    @ParameterizedTest(name = "[{index}] {1} of {0} -> {2}")
+    @CsvSource(
+            delimiter = '|',
+            nullValues = "NULL",
+            value = {
+                "form-data; name=user               | name     | user",
+                "form-data; name=\"user\"           | name     | user",
+                "form-data; name=\"a;b\"            | name     | a;b",
+                "form-data; NAME=user               | name     | user",
+                "form-data; name=user; charset=utf-8| name     | user",
+                // "filename" must not answer a lookup for "name": the match has to start at a parameter
+                "form-data; filename=\"f\"; name=u  | name     | u",
+                // present but empty, which is what browsers send for an untouched file input
+                "form-data; filename=\"\"           | filename | ''",
+                "form-data; filename=               | filename | ''",
+                "form-data; name=user               | filename | NULL",
+                "NULL                               | name     | NULL",
+                // a quoted value cannot forge a parameter boundary: the quoted span is skipped whole, so
+                // this field is not mistaken for a file part and dropped
+                "form-data; name=\"; filename=x\"   | filename | NULL",
+                "form-data; name=\"; filename=x\"   | name     | '; filename=x'",
+                // and the same aliasing the other way round does not rename the field
+                "form-data; filename=\"; name=y\"   | name     | NULL",
+                // RFC 7230 optional whitespace is tolerated on both sides of the "="
+                "form-data; name =user             | name     | user",
+                // a bare parameter name is not a parameter
+                "form-data; name                    | name     | NULL",
+            })
+    void readsParameters(String headerValue, String paramName, String expected) {
+        assertEquals(expected, parameter(headerValue, paramName));
+    }
+
+    @Test
+    void unescapesQuotedParameterValues() {
+        assertEquals("a\"b", parameter("form-data; name=\"a\\\"b\"", "name"));
+    }
+
+    @Test
+    void toleratesTabsAroundTheParameterEquals() {
+        assertEquals("user", parameter("form-data;\tname\t=\tuser", "name"));
+    }
+
+    @Test
+    void keepsWhatWasReadOfAnUnterminatedQuotedValue() {
+        assertEquals("abc", parameter("form-data; name=\"abc", "name"));
+        assertEquals("a\"", parameter("form-data; name=\"a\\\"", "name"));
+    }
+
+    @ParameterizedTest(name = "[{index}] {0} -> {2} part(s)")
+    @CsvSource(
+            delimiter = '|',
+            value = {
+                "happy path                | --x@A: b@@v@--x--          | 1",
+                "two parts                 | --x@@a@--x@@b@--x--        | 2",
+                "preamble is discarded     | junk@--x@@v@--x--          | 1",
+                // The preamble is discarded even when a line in it looks like a delimiter: RFC 2046
+                // requires it to be ignored, so the fields after it are the ones the app receives
+                "preamble looks like one   | --x--not-a-close@--x@@v@--x-- | 1",
+                "epilogue is discarded     | --x@@v@--x--@junk          | 1",
+                // A delimiter at the very start of a part's content has no line break of its own, so it
+                // reads as content, not as a delimiter — and the part that follows is absorbed with it
+                "delimiter at content start| --x@@--x@@v@--x--         | 1",
+                // a truncated body still yields its last part
+                "truncated last delimiter  | --x@A: b@@v                | 1",
+                "truncated in the headers  | --x@A: b                   | 0",
+                // A part truncated inside its headers voids the parts before it too: its own headers are
+                // content the WAF would otherwise never see
+                "truncated after a part    | --x@@v@--x@A: b            | 0",
+                "no line break at all      | --x                        | 0",
+                "close delimiter only      | --x--                      | 0",
+                "empty part content        | --x@A: b@@                 | 1",
+                "part without headers      | --x@@v@--x--               | 1",
+                "unrelated delimiter       | --y@@v@--y--               | 0",
+                // RFC 2046 transport padding between the delimiter and its line break
+                "padded delimiter          | --x  @@v@--x--             | 1",
+            })
+    void splitsBodies(String name, String template, int expectedParts) {
+        assertEquals(
+                expectedParts,
+                split(template.replace("@", "\r\n"), "x", NO_PART_BUDGET_LIMIT).size());
+    }
+
+    @Test
+    void toleratesBareLineFeeds() {
+        String body = "--x\nContent-Disposition: form-data; name=a\n\nvalue\n--x--\n";
+
+        List<Part> parts = split(body, "x", NO_PART_BUDGET_LIMIT);
+
+        assertEquals(1, parts.size());
+        assertEquals("value", content(body, parts.get(0)));
+    }
+
+    @Test
+    void readsADelimiterAtAContentStartAsContent() {
+        // The close delimiter here shares the line break that terminated the headers, so it has none of
+        // its own. Commons FileUpload reads it as the field's content and so must we: reporting an
+        // empty field would hide the payload behind it from the WAF.
+        String body = "--x\r\nContent-Disposition: form-data; name=a\r\n\r\n--x--\r\n' OR 1=1 --\r\n--x--";
+
+        List<Part> parts = split(body, "x", NO_PART_BUDGET_LIMIT);
+
+        assertEquals(1, parts.size());
+        assertEquals("--x--\r\n' OR 1=1 --", content(body, parts.get(0)));
+    }
+
+    @Test
+    void readsADelimiterWithItsOwnLineBreakAsADelimiter() {
+        // One line break more than the body above, which is enough to make the delimiter unambiguous:
+        // every parser reads the field as empty and the rest as the epilogue.
+        String body = "--x\r\nContent-Disposition: form-data; name=a\r\n\r\n\r\n--x--\r\n' OR 1=1 --\r\n--x--";
+
+        List<Part> parts = split(body, "x", NO_PART_BUDGET_LIMIT);
+
+        assertEquals(1, parts.size());
+        assertEquals("", content(body, parts.get(0)));
+    }
+
+    @Test
+    void stopsAtThePartBudget() {
+        String body = ("--x\r\n\r\na\r\n--x\r\n\r\nb\r\n--x\r\n\r\nc\r\n--x--");
+
+        assertEquals(2, split(body, "x", 2).size());
+        assertEquals(0, split(body, "x", 0).size());
+    }
+
+    @Test
+    void delimitsContentExactly() {
+        // Dashes, line breaks, a replacement character and a multi-byte character all inside the
+        // content, plus lines that start with the part and close delimiters without being either: the
+        // reported range must not be thrown off by a near miss on the line-feed anchor, on the
+        // delimiter itself, or on its trailing dashes
+        String content = "--not-a-boundary\r\n--x-not-a-boundary\r\n--x--not-a-close\r\n-x\nlast�é";
+        String body = "--x\r\nContent-Disposition: form-data; name=a\r\n\r\n" + content + "\r\n--x--\r\n";
+
+        List<Part> parts = split(body, "x", NO_PART_BUDGET_LIMIT);
+
+        assertEquals(1, parts.size());
+        assertEquals(content, content(body, parts.get(0)));
+        assertEquals("form-data; name=a", parts.get(0).contentDisposition);
+    }
+
+    @Test
+    void reportsNothingForAPartWhoseHeadersRunIntoTheNextDelimiter() {
+        // The first part's headers are not followed by a blank line, which no conforming parser
+        // accepts. Reporting the second part alone would show the WAF less than the app receives.
+        String body =
+                "--x\r\nX-First: 1\r\n" + "--x\r\nContent-Disposition: form-data; name=\"b\"\r\n\r\nsecond\r\n--x--";
+
+        assertTrue(split(body, "x", NO_PART_BUDGET_LIMIT).isEmpty());
+    }
+
+    @Test
+    void matchesHeaderNamesCaseInsensitivelyAndTrimsValues() {
+        String body = "--x\r\nCONTENT-Disposition:  form-data; name=a \r\n"
+                + "content-type \t:\ttext/plain \r\n\r\nv\r\n"
+                + "--x\r\nContent-Type:\r\n\r\nv\r\n--x--";
+
+        List<Part> parts = split(body, "x", NO_PART_BUDGET_LIMIT);
+
+        assertEquals("form-data; name=a", parts.get(0).contentDisposition);
+        assertEquals("text/plain", parts.get(0).contentType);
+        // A header present but empty is reported as "", distinct from the null of an absent one
+        assertEquals("", parts.get(1).contentType);
+        assertNull(parts.get(1).contentDisposition);
+    }
+
+    @Test
+    @Timeout(value = 10, unit = SECONDS)
+    void returnsPromptlyOnAnAdversarialBoundary() {
+        // Dashes are legal boundary characters, so a scan seeded on '-' would be quadratic here.
+        // Anchored on the mandatory line feed, of which this body has none, the scan is linear.
+        String boundary = repeat('-', 69) + "X";
+        String body = repeat('-', 1_000_000);
+
+        assertTrue(split(body, boundary, NO_PART_BUDGET_LIMIT).isEmpty());
+    }
+
+    @Test
+    @Timeout(value = 30, unit = SECONDS)
+    void neverThrowsOnAMutatedBody() {
+        String body = "preamble\r\n--x\r\nContent-Disposition: form-data; name=\"a\"\r\n"
+                + "Content-Type: application/json\r\n\r\n{\"k\":1}\r\n"
+                + "--x\r\nContent-Disposition: form-data; name=b; filename=\"f\"\r\n\r\nfile\r\n"
+                + "--x--\r\nepilogue";
+        // Fixed positions rather than a random seed, so a failure is reproducible
+        char[] substitutes = {'-', '\r', '\n', ':', ';', '"', '\\', '=', '\0', '�'};
+
+        for (int i = 0; i <= body.length(); i++) {
+            split(body.substring(0, i), "x", NO_PART_BUDGET_LIMIT);
+            for (char substitute : substitutes) {
+                if (i < body.length()) {
+                    split(body.substring(0, i) + substitute + body.substring(i + 1), "x", NO_PART_BUDGET_LIMIT);
+                }
+            }
         }
-      }
     }
-  }
 
-  private static String content(String body, Part part) {
-    return body.substring(part.contentStart, part.contentEnd);
-  }
+    private static String content(String body, Part part) {
+        return body.substring(part.contentStart, part.contentEnd);
+    }
 
-  private static String repeat(char c, int count) {
-    StringBuilder builder = new StringBuilder(count);
-    for (int i = 0; i < count; i++) {
-      builder.append(c);
+    private static String repeat(char c, int count) {
+        StringBuilder builder = new StringBuilder(count);
+        for (int i = 0; i < count; i++) {
+            builder.append(c);
+        }
+        return builder.toString();
     }
-    return builder.toString();
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/lambda/SkipUnhandledTypeJsonSerializerTest.java b/dd-trace-core/src/test/java/datadog/trace/lambda/SkipUnhandledTypeJsonSerializerTest.java
index 588a05ca329..0b864ed96e4 100644
--- a/dd-trace-core/src/test/java/datadog/trace/lambda/SkipUnhandledTypeJsonSerializerTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/lambda/SkipUnhandledTypeJsonSerializerTest.java
@@ -18,156 +18,154 @@
 import org.junit.jupiter.api.Test;
 
 abstract class AbstractSerialize {
-  public String randomString;
+    public String randomString;
 }
 
 class SubClass extends AbstractSerialize {
-  SubClass() {
-    this.randomString = "tutu";
-  }
+    SubClass() {
+        this.randomString = "tutu";
+    }
 }
 
 interface ApiRequestPath {}
 
 class LambdaRequest {
-  public boolean testBool;
-  public String emptyStr;
-  public Map<String, String> emptyHeaders;
+    public boolean testBool;
+    public String emptyStr;
+    public Map<String, String> emptyHeaders;
 }
 
 class CustomRequest<P extends ApiRequestPath, B> extends LambdaRequest {
-  public P path;
-  public B body;
+    public P path;
+    public B body;
 }
 
 public class SkipUnhandledTypeJsonSerializerTest extends DDCoreJavaSpecification {
 
-  static class TestJsonObject {
-    public String field1;
-    public boolean field2;
-    public AbstractSerialize field3;
-    public NestedJsonObject field4;
-    public ByteArrayInputStream field5;
-
-    TestJsonObject() {
-      this.field1 = "toto";
-      this.field2 = true;
-      this.field3 = new SubClass();
-      this.field4 = new NestedJsonObject();
-      this.field5 = new ByteArrayInputStream(new byte[0]);
+    static class TestJsonObject {
+        public String field1;
+        public boolean field2;
+        public AbstractSerialize field3;
+        public NestedJsonObject field4;
+        public ByteArrayInputStream field5;
+
+        TestJsonObject() {
+            this.field1 = "toto";
+            this.field2 = true;
+            this.field3 = new SubClass();
+            this.field4 = new NestedJsonObject();
+            this.field5 = new ByteArrayInputStream(new byte[0]);
+        }
+    }
+
+    static class NestedJsonObject {
+        public AbstractSerialize field;
+
+        NestedJsonObject() {
+            this.field = new SubClass();
+        }
     }
-  }
 
-  static class NestedJsonObject {
-    public AbstractSerialize field;
+    private static JsonAdapter<Object> buildAdapter() {
+        return new Moshi.Builder()
+                .add(SkipUnsupportedTypeJsonAdapter.newFactory())
+                .build()
+                .adapter(Object.class);
+    }
+
+    @Test
+    void testStringSerialization() {
+        JsonAdapter<Object> adapter = buildAdapter();
+
+        String result = adapter.toJson(new TestJsonObject());
+
+        assertEquals(
+                "{\"field1\":\"toto\",\"field2\":true,\"field3\":{},\"field4\":{\"field\":{}},\"field5\":{}}", result);
+    }
+
+    @Test
+    void testSimpleCase() {
+        JsonAdapter<Object> adapter = buildAdapter();
+
+        LinkedHashMap<String, String> list = new LinkedHashMap<>();
+        list.put("key0", "item0");
+        list.put("key1", "item1");
+        list.put("key2", "item2");
+        String result = adapter.toJson(list);
+
+        assertEquals("{\"key0\":\"item0\",\"key1\":\"item1\",\"key2\":\"item2\"}", result);
+    }
+
+    @Test
+    void testSQSEvent() {
+        JsonAdapter<Object> adapter = buildAdapter();
+
+        SQSEvent myEvent = new SQSEvent();
+        List<SQSEvent.SQSMessage> records = new ArrayList<>();
+        SQSEvent.SQSMessage message = new SQSEvent.SQSMessage();
+        message.setMessageId("myId");
+        message.setAwsRegion("myRegion");
+        records.add(message);
+        myEvent.setRecords(records);
+        String result = adapter.toJson(myEvent);
+
+        assertEquals("{\"records\":[{\"awsRegion\":\"myRegion\",\"messageId\":\"myId\"}]}", result);
+    }
+
+    @Test
+    void testSNSEvent() {
+        JsonAdapter<Object> adapter = buildAdapter();
+
+        SNSEvent myEvent = new SNSEvent();
+        List<SNSEvent.SNSRecord> records = new ArrayList<>();
+        SNSEvent.SNSRecord message = new SNSEvent.SNSRecord();
+        message.setEventSource("mySource");
+        message.setEventVersion("myVersion");
+        records.add(message);
+        myEvent.setRecords(records);
+        String result = adapter.toJson(myEvent);
+
+        assertEquals("{\"records\":[{\"eventSource\":\"mySource\",\"eventVersion\":\"myVersion\"}]}", result);
+    }
+
+    @Test
+    void testAPIGatewayProxyRequestEvent() {
+        JsonAdapter<Object> adapter = buildAdapter();
+
+        APIGatewayProxyRequestEvent myEvent = new APIGatewayProxyRequestEvent();
+        myEvent.setBody("bababango");
+        myEvent.setHttpMethod("POST");
+        String result = adapter.toJson(myEvent);
+
+        assertEquals("{\"body\":\"bababango\",\"httpMethod\":\"POST\"}", result);
+    }
+
+    @Test
+    void testMapStringObjectEvent() {
+        JsonAdapter<Object> adapter = buildAdapter();
+
+        HashMap<String, Object> myEvent = new HashMap<>();
+        HashMap<String, Object> myNestedEvent = new HashMap<>();
+        myNestedEvent.put("nestedKey0", "nestedValue1");
+        myNestedEvent.put("nestedKey1", true);
+        myNestedEvent.put("nestedKey2", Arrays.asList("aaa", "bbb", "ccc", "dddd"));
+        myEvent.put("firstKey", new TestJsonObject());
+        myEvent.put("secondKey", myNestedEvent);
+        String result = adapter.toJson(myEvent);
+
+        assertEquals(
+                "{\"firstKey\":{\"field1\":\"toto\",\"field2\":true,\"field3\":{},\"field4\":{\"field\":{}},\"field5\":{}},\"secondKey\":{\"nestedKey2\":[\"aaa\",\"bbb\",\"ccc\",\"dddd\"],\"nestedKey0\":\"nestedValue1\",\"nestedKey1\":true}}",
+                result);
+    }
+
+    @Test
+    @SuppressWarnings("rawtypes")
+    void testCustomPayload() {
+        JsonAdapter<Object> adapter = buildAdapter();
+
+        CustomRequest customPayload = new CustomRequest();
+        String result = adapter.toJson(customPayload);
 
-    NestedJsonObject() {
-      this.field = new SubClass();
+        assertEquals("{\"body\":{},\"path\":{},\"testBool\":false}", result);
     }
-  }
-
-  private static JsonAdapter<Object> buildAdapter() {
-    return new Moshi.Builder()
-        .add(SkipUnsupportedTypeJsonAdapter.newFactory())
-        .build()
-        .adapter(Object.class);
-  }
-
-  @Test
-  void testStringSerialization() {
-    JsonAdapter<Object> adapter = buildAdapter();
-
-    String result = adapter.toJson(new TestJsonObject());
-
-    assertEquals(
-        "{\"field1\":\"toto\",\"field2\":true,\"field3\":{},\"field4\":{\"field\":{}},\"field5\":{}}",
-        result);
-  }
-
-  @Test
-  void testSimpleCase() {
-    JsonAdapter<Object> adapter = buildAdapter();
-
-    LinkedHashMap<String, String> list = new LinkedHashMap<>();
-    list.put("key0", "item0");
-    list.put("key1", "item1");
-    list.put("key2", "item2");
-    String result = adapter.toJson(list);
-
-    assertEquals("{\"key0\":\"item0\",\"key1\":\"item1\",\"key2\":\"item2\"}", result);
-  }
-
-  @Test
-  void testSQSEvent() {
-    JsonAdapter<Object> adapter = buildAdapter();
-
-    SQSEvent myEvent = new SQSEvent();
-    List<SQSEvent.SQSMessage> records = new ArrayList<>();
-    SQSEvent.SQSMessage message = new SQSEvent.SQSMessage();
-    message.setMessageId("myId");
-    message.setAwsRegion("myRegion");
-    records.add(message);
-    myEvent.setRecords(records);
-    String result = adapter.toJson(myEvent);
-
-    assertEquals("{\"records\":[{\"awsRegion\":\"myRegion\",\"messageId\":\"myId\"}]}", result);
-  }
-
-  @Test
-  void testSNSEvent() {
-    JsonAdapter<Object> adapter = buildAdapter();
-
-    SNSEvent myEvent = new SNSEvent();
-    List<SNSEvent.SNSRecord> records = new ArrayList<>();
-    SNSEvent.SNSRecord message = new SNSEvent.SNSRecord();
-    message.setEventSource("mySource");
-    message.setEventVersion("myVersion");
-    records.add(message);
-    myEvent.setRecords(records);
-    String result = adapter.toJson(myEvent);
-
-    assertEquals(
-        "{\"records\":[{\"eventSource\":\"mySource\",\"eventVersion\":\"myVersion\"}]}", result);
-  }
-
-  @Test
-  void testAPIGatewayProxyRequestEvent() {
-    JsonAdapter<Object> adapter = buildAdapter();
-
-    APIGatewayProxyRequestEvent myEvent = new APIGatewayProxyRequestEvent();
-    myEvent.setBody("bababango");
-    myEvent.setHttpMethod("POST");
-    String result = adapter.toJson(myEvent);
-
-    assertEquals("{\"body\":\"bababango\",\"httpMethod\":\"POST\"}", result);
-  }
-
-  @Test
-  void testMapStringObjectEvent() {
-    JsonAdapter<Object> adapter = buildAdapter();
-
-    HashMap<String, Object> myEvent = new HashMap<>();
-    HashMap<String, Object> myNestedEvent = new HashMap<>();
-    myNestedEvent.put("nestedKey0", "nestedValue1");
-    myNestedEvent.put("nestedKey1", true);
-    myNestedEvent.put("nestedKey2", Arrays.asList("aaa", "bbb", "ccc", "dddd"));
-    myEvent.put("firstKey", new TestJsonObject());
-    myEvent.put("secondKey", myNestedEvent);
-    String result = adapter.toJson(myEvent);
-
-    assertEquals(
-        "{\"firstKey\":{\"field1\":\"toto\",\"field2\":true,\"field3\":{},\"field4\":{\"field\":{}},\"field5\":{}},\"secondKey\":{\"nestedKey2\":[\"aaa\",\"bbb\",\"ccc\",\"dddd\"],\"nestedKey0\":\"nestedValue1\",\"nestedKey1\":true}}",
-        result);
-  }
-
-  @Test
-  @SuppressWarnings("rawtypes")
-  void testCustomPayload() {
-    JsonAdapter<Object> adapter = buildAdapter();
-
-    CustomRequest customPayload = new CustomRequest();
-    String result = adapter.toJson(customPayload);
-
-    assertEquals("{\"body\":{},\"path\":{},\"testBool\":false}", result);
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanDataAdapterTest.java b/dd-trace-core/src/test/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanDataAdapterTest.java
index 7839cb17d01..1f15ad85132 100644
--- a/dd-trace-core/src/test/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanDataAdapterTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanDataAdapterTest.java
@@ -21,174 +21,170 @@
 import org.mockito.ArgumentCaptor;
 
 class LLMObsSpanDataAdapterTest {
-  private static final String INPUT_TAG = "_ml_obs_tag.input";
-  private static final String OUTPUT_TAG = "_ml_obs_tag.output";
-  private static final String SPAN_KIND_TAG = "_ml_obs_tag.span.kind";
-
-  @Test
-  void convertsAndAppliesEmbeddingDocumentsAndValueOutput() {
-    CoreSpan<?> span = mock(CoreSpan.class);
-    when(span.getTag(SPAN_KIND_TAG)).thenReturn(Tags.LLMOBS_EMBEDDING_SPAN_KIND);
-    when(span.getTag(INPUT_TAG))
-        .thenReturn(
-            Collections.singletonList(
-                LLMObs.Document.from("original document", "source.txt", "doc-123", 0.75)));
-    when(span.getTag(OUTPUT_TAG)).thenReturn("original output");
-
-    LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
-
-    assertEquals(Tags.LLMOBS_EMBEDDING_SPAN_KIND, adapter.getKind());
-    assertEquals("original document", adapter.getInput().get(0).getContent());
-    assertEquals("original output", adapter.getOutput().get(0).getContent());
-
-    adapter.setInput(Collections.singletonList(LLMObs.LLMMessage.from("", "processed document")));
-    adapter.setOutput(Collections.singletonList(LLMObs.LLMMessage.from("", "processed output")));
-    adapter.apply(adapter);
-
-    ArgumentCaptor<Object> inputCaptor = ArgumentCaptor.forClass(Object.class);
-    verify(span).setTag(eq(INPUT_TAG), inputCaptor.capture());
-    List<?> documents = (List<?>) inputCaptor.getValue();
-    LLMObs.Document document = (LLMObs.Document) documents.get(0);
-    assertEquals("processed document", document.getText());
-    assertEquals("source.txt", document.getName());
-    assertEquals("doc-123", document.getId());
-    assertEquals(Double.valueOf(0.75), document.getScore());
-    verify(span).setTag(OUTPUT_TAG, "processed output");
-  }
-
-  @Test
-  void convertsAndAppliesRetrievalOutputDocuments() {
-    CoreSpan<?> span = mock(CoreSpan.class);
-    when(span.getTag(SPAN_KIND_TAG)).thenReturn(Tags.LLMOBS_RETRIEVAL_SPAN_KIND);
-    when(span.getTag(OUTPUT_TAG))
-        .thenReturn(
-            Collections.singletonList(
-                LLMObs.Document.from("original document", "result.txt", "doc-456", 0.9)));
-
-    LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
-
-    assertEquals("original document", adapter.getOutput().get(0).getContent());
-
-    adapter.setOutput(Collections.singletonList(LLMObs.LLMMessage.from("", "processed document")));
-    adapter.apply(adapter);
-
-    ArgumentCaptor<Object> outputCaptor = ArgumentCaptor.forClass(Object.class);
-    verify(span).setTag(eq(OUTPUT_TAG), outputCaptor.capture());
-    List<?> documents = (List<?>) outputCaptor.getValue();
-    LLMObs.Document document = (LLMObs.Document) documents.get(0);
-    assertEquals("processed document", document.getText());
-    assertEquals("result.txt", document.getName());
-    assertEquals("doc-456", document.getId());
-    assertEquals(Double.valueOf(0.9), document.getScore());
-  }
-
-  @Test
-  void appliesInPlaceClearToMessageInputAndOutput() {
-    CoreSpan<?> span = mock(CoreSpan.class);
-    Map<String, Object> input = new LinkedHashMap<>();
-    input.put("messages", Collections.singletonList(LLMObs.LLMMessage.from("user", "input")));
-    when(span.getTag(SPAN_KIND_TAG)).thenReturn(Tags.LLMOBS_LLM_SPAN_KIND);
-    when(span.getTag(INPUT_TAG)).thenReturn(input);
-    when(span.getTag(OUTPUT_TAG))
-        .thenReturn(Collections.singletonList(LLMObs.LLMMessage.from("assistant", "output")));
-
-    LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
-    adapter.getInput().clear();
-    adapter.getOutput().clear();
-    adapter.apply(adapter);
-
-    verify(span).removeTag(INPUT_TAG);
-    verify(span).removeTag(OUTPUT_TAG);
-  }
-
-  @Test
-  void ignoresMalformedLlmIo() {
-    CoreSpan<?> span = mock(CoreSpan.class);
-    List<String> invalidMessages = Collections.singletonList("not a message");
-    when(span.getTag(SPAN_KIND_TAG)).thenReturn(Tags.LLMOBS_LLM_SPAN_KIND);
-    when(span.getTag(INPUT_TAG)).thenReturn(invalidMessages);
-    when(span.getTag(OUTPUT_TAG)).thenReturn(Collections.singletonMap("messages", invalidMessages));
-
-    LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
-
-    assertEquals(Collections.emptyList(), adapter.getInput());
-    assertEquals(Collections.emptyList(), adapter.getOutput());
-    adapter.apply(adapter);
-  }
-
-  @Test
-  void addsMissingInputAndOutput() {
-    CoreSpan<?> span = mock(CoreSpan.class);
-    when(span.getTag(SPAN_KIND_TAG)).thenReturn(Tags.LLMOBS_LLM_SPAN_KIND);
-
-    LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
-    List<LLMObs.LLMMessage> input =
-        Collections.singletonList(LLMObs.LLMMessage.from("user", "input"));
-    List<LLMObs.LLMMessage> output =
-        Collections.singletonList(LLMObs.LLMMessage.from("assistant", "output"));
-    adapter.setInput(input);
-    adapter.setOutput(output);
-    adapter.apply(adapter);
-
-    verify(span).setTag(INPUT_TAG, input);
-    verify(span).setTag(OUTPUT_TAG, output);
-  }
-
-  @Test
-  void addsMessagesToPromptOnlyInput() {
-    CoreSpan<?> span = mock(CoreSpan.class);
-    Map<String, Object> prompt = Collections.singletonMap("id", "prompt-id");
-    when(span.getTag(SPAN_KIND_TAG)).thenReturn(Tags.LLMOBS_LLM_SPAN_KIND);
-    when(span.getTag(INPUT_TAG)).thenReturn(Collections.singletonMap("prompt", prompt));
-
-    LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
-    adapter.setInput(Collections.singletonList(LLMObs.LLMMessage.from("user", "input")));
-    adapter.apply(adapter);
-
-    ArgumentCaptor<Object> inputCaptor = ArgumentCaptor.forClass(Object.class);
-    verify(span).setTag(eq(INPUT_TAG), inputCaptor.capture());
-    Map<?, ?> input = (Map<?, ?>) inputCaptor.getValue();
-    assertEquals(prompt, input.get("prompt"));
-    assertEquals(adapter.getInput(), input.get("messages"));
-  }
-
-  @Test
-  void preservesIoWhenProcessorDoesNotModifyIt() {
-    CoreSpan<?> span = mock(CoreSpan.class);
-    Map<String, Object> input = Collections.singletonMap("key", "input");
-    List<String> output = Collections.singletonList("output");
-    when(span.getTag(INPUT_TAG)).thenReturn(input);
-    when(span.getTag(OUTPUT_TAG)).thenReturn(output);
-
-    LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
-    clearInvocations(span);
-    adapter.apply(adapter);
-
-    verifyNoInteractions(span);
-  }
-
-  @Test
-  void readsPublicAndErrorTags() {
-    CoreSpan<?> span = mock(CoreSpan.class);
-    when(span.getTag("_ml_obs_tag.custom")).thenReturn(123);
-    when(span.getError()).thenReturn(1);
-    when(span.getTag(DDTags.ERROR_TYPE)).thenReturn("java.lang.IllegalStateException");
-
-    LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
-
-    assertEquals("unknown", adapter.getKind());
-    assertEquals("123", adapter.getTag("custom"));
-    assertEquals("1", adapter.getTag("error"));
-    assertEquals("java.lang.IllegalStateException", adapter.getTag("error_type"));
-    assertNull(adapter.getTag("missing"));
-  }
-
-  @Test
-  void returnsNullForAbsentErrorTag() {
-    CoreSpan<?> span = mock(CoreSpan.class);
-
-    LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
-
-    assertNull(adapter.getTag("error"));
-  }
+    private static final String INPUT_TAG = "_ml_obs_tag.input";
+    private static final String OUTPUT_TAG = "_ml_obs_tag.output";
+    private static final String SPAN_KIND_TAG = "_ml_obs_tag.span.kind";
+
+    @Test
+    void convertsAndAppliesEmbeddingDocumentsAndValueOutput() {
+        CoreSpan<?> span = mock(CoreSpan.class);
+        when(span.getTag(SPAN_KIND_TAG)).thenReturn(Tags.LLMOBS_EMBEDDING_SPAN_KIND);
+        when(span.getTag(INPUT_TAG))
+                .thenReturn(Collections.singletonList(
+                        LLMObs.Document.from("original document", "source.txt", "doc-123", 0.75)));
+        when(span.getTag(OUTPUT_TAG)).thenReturn("original output");
+
+        LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
+
+        assertEquals(Tags.LLMOBS_EMBEDDING_SPAN_KIND, adapter.getKind());
+        assertEquals("original document", adapter.getInput().get(0).getContent());
+        assertEquals("original output", adapter.getOutput().get(0).getContent());
+
+        adapter.setInput(Collections.singletonList(LLMObs.LLMMessage.from("", "processed document")));
+        adapter.setOutput(Collections.singletonList(LLMObs.LLMMessage.from("", "processed output")));
+        adapter.apply(adapter);
+
+        ArgumentCaptor<Object> inputCaptor = ArgumentCaptor.forClass(Object.class);
+        verify(span).setTag(eq(INPUT_TAG), inputCaptor.capture());
+        List<?> documents = (List<?>) inputCaptor.getValue();
+        LLMObs.Document document = (LLMObs.Document) documents.get(0);
+        assertEquals("processed document", document.getText());
+        assertEquals("source.txt", document.getName());
+        assertEquals("doc-123", document.getId());
+        assertEquals(Double.valueOf(0.75), document.getScore());
+        verify(span).setTag(OUTPUT_TAG, "processed output");
+    }
+
+    @Test
+    void convertsAndAppliesRetrievalOutputDocuments() {
+        CoreSpan<?> span = mock(CoreSpan.class);
+        when(span.getTag(SPAN_KIND_TAG)).thenReturn(Tags.LLMOBS_RETRIEVAL_SPAN_KIND);
+        when(span.getTag(OUTPUT_TAG))
+                .thenReturn(Collections.singletonList(
+                        LLMObs.Document.from("original document", "result.txt", "doc-456", 0.9)));
+
+        LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
+
+        assertEquals("original document", adapter.getOutput().get(0).getContent());
+
+        adapter.setOutput(Collections.singletonList(LLMObs.LLMMessage.from("", "processed document")));
+        adapter.apply(adapter);
+
+        ArgumentCaptor<Object> outputCaptor = ArgumentCaptor.forClass(Object.class);
+        verify(span).setTag(eq(OUTPUT_TAG), outputCaptor.capture());
+        List<?> documents = (List<?>) outputCaptor.getValue();
+        LLMObs.Document document = (LLMObs.Document) documents.get(0);
+        assertEquals("processed document", document.getText());
+        assertEquals("result.txt", document.getName());
+        assertEquals("doc-456", document.getId());
+        assertEquals(Double.valueOf(0.9), document.getScore());
+    }
+
+    @Test
+    void appliesInPlaceClearToMessageInputAndOutput() {
+        CoreSpan<?> span = mock(CoreSpan.class);
+        Map<String, Object> input = new LinkedHashMap<>();
+        input.put("messages", Collections.singletonList(LLMObs.LLMMessage.from("user", "input")));
+        when(span.getTag(SPAN_KIND_TAG)).thenReturn(Tags.LLMOBS_LLM_SPAN_KIND);
+        when(span.getTag(INPUT_TAG)).thenReturn(input);
+        when(span.getTag(OUTPUT_TAG))
+                .thenReturn(Collections.singletonList(LLMObs.LLMMessage.from("assistant", "output")));
+
+        LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
+        adapter.getInput().clear();
+        adapter.getOutput().clear();
+        adapter.apply(adapter);
+
+        verify(span).removeTag(INPUT_TAG);
+        verify(span).removeTag(OUTPUT_TAG);
+    }
+
+    @Test
+    void ignoresMalformedLlmIo() {
+        CoreSpan<?> span = mock(CoreSpan.class);
+        List<String> invalidMessages = Collections.singletonList("not a message");
+        when(span.getTag(SPAN_KIND_TAG)).thenReturn(Tags.LLMOBS_LLM_SPAN_KIND);
+        when(span.getTag(INPUT_TAG)).thenReturn(invalidMessages);
+        when(span.getTag(OUTPUT_TAG)).thenReturn(Collections.singletonMap("messages", invalidMessages));
+
+        LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
+
+        assertEquals(Collections.emptyList(), adapter.getInput());
+        assertEquals(Collections.emptyList(), adapter.getOutput());
+        adapter.apply(adapter);
+    }
+
+    @Test
+    void addsMissingInputAndOutput() {
+        CoreSpan<?> span = mock(CoreSpan.class);
+        when(span.getTag(SPAN_KIND_TAG)).thenReturn(Tags.LLMOBS_LLM_SPAN_KIND);
+
+        LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
+        List<LLMObs.LLMMessage> input = Collections.singletonList(LLMObs.LLMMessage.from("user", "input"));
+        List<LLMObs.LLMMessage> output = Collections.singletonList(LLMObs.LLMMessage.from("assistant", "output"));
+        adapter.setInput(input);
+        adapter.setOutput(output);
+        adapter.apply(adapter);
+
+        verify(span).setTag(INPUT_TAG, input);
+        verify(span).setTag(OUTPUT_TAG, output);
+    }
+
+    @Test
+    void addsMessagesToPromptOnlyInput() {
+        CoreSpan<?> span = mock(CoreSpan.class);
+        Map<String, Object> prompt = Collections.singletonMap("id", "prompt-id");
+        when(span.getTag(SPAN_KIND_TAG)).thenReturn(Tags.LLMOBS_LLM_SPAN_KIND);
+        when(span.getTag(INPUT_TAG)).thenReturn(Collections.singletonMap("prompt", prompt));
+
+        LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
+        adapter.setInput(Collections.singletonList(LLMObs.LLMMessage.from("user", "input")));
+        adapter.apply(adapter);
+
+        ArgumentCaptor<Object> inputCaptor = ArgumentCaptor.forClass(Object.class);
+        verify(span).setTag(eq(INPUT_TAG), inputCaptor.capture());
+        Map<?, ?> input = (Map<?, ?>) inputCaptor.getValue();
+        assertEquals(prompt, input.get("prompt"));
+        assertEquals(adapter.getInput(), input.get("messages"));
+    }
+
+    @Test
+    void preservesIoWhenProcessorDoesNotModifyIt() {
+        CoreSpan<?> span = mock(CoreSpan.class);
+        Map<String, Object> input = Collections.singletonMap("key", "input");
+        List<String> output = Collections.singletonList("output");
+        when(span.getTag(INPUT_TAG)).thenReturn(input);
+        when(span.getTag(OUTPUT_TAG)).thenReturn(output);
+
+        LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
+        clearInvocations(span);
+        adapter.apply(adapter);
+
+        verifyNoInteractions(span);
+    }
+
+    @Test
+    void readsPublicAndErrorTags() {
+        CoreSpan<?> span = mock(CoreSpan.class);
+        when(span.getTag("_ml_obs_tag.custom")).thenReturn(123);
+        when(span.getError()).thenReturn(1);
+        when(span.getTag(DDTags.ERROR_TYPE)).thenReturn("java.lang.IllegalStateException");
+
+        LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
+
+        assertEquals("unknown", adapter.getKind());
+        assertEquals("123", adapter.getTag("custom"));
+        assertEquals("1", adapter.getTag("error"));
+        assertEquals("java.lang.IllegalStateException", adapter.getTag("error_type"));
+        assertNull(adapter.getTag("missing"));
+    }
+
+    @Test
+    void returnsNullForAbsentErrorTag() {
+        CoreSpan<?> span = mock(CoreSpan.class);
+
+        LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter(span);
+
+        assertNull(adapter.getTag("error"));
+    }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapperTest.java b/dd-trace-core/src/test/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapperTest.java
index 116ab73a7ad..a843dccd390 100644
--- a/dd-trace-core/src/test/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapperTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapperTest.java
@@ -39,1105 +39,1024 @@
 @SuppressWarnings("unchecked")
 public class LLMObsSpanMapperTest extends DDCoreJavaSpecification {
 
-  private static final ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory());
-
-  @Test
-  void testLLMObsSpanMapperSerialization() throws Exception {
-    LLMObsSpanMapper mapper = new LLMObsSpanMapper();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    // Create a real LLMObs span using the tracer
-    AgentSpan llmSpan =
-        tracer
-            .buildSpan("datadog", "openai.request")
-            .withResourceName("createCompletion")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
-            .withTag("_ml_obs_tag.model_name", "gpt-4")
-            .withTag("_ml_obs_tag.model_provider", "openai")
-            .withTag("_ml_obs_metric.input_tokens", 50)
-            .withTag("_ml_obs_metric.output_tokens", 25)
-            .withTag("_ml_obs_metric.total_tokens", 75)
-            .withTag("_ml_obs_tag.session_id", "abc-123-session")
-            .start();
-
-    llmSpan.setSpanType(InternalSpanTypes.LLMOBS);
-
-    Map<String, Object> toolCallArgs = Collections.singletonMap("location", "San Francisco");
-    LLMObs.ToolCall toolCall =
-        LLMObs.ToolCall.from("get_weather", "function_call", "call_123", toolCallArgs);
-    LLMObs.ToolResult toolResult =
-        LLMObs.ToolResult.from(
-            "get_weather", "function_call_output", "call_123", "{\"temperature\":\"72F\"}");
-    List<LLMObs.LLMMessage> inputMessages =
-        Arrays.asList(
-            LLMObs.LLMMessage.from("user", "Hello, what's the weather like?"),
-            LLMObs.LLMMessage.from(
-                "assistant",
-                null,
-                Collections.singletonList(toolCall),
-                Collections.singletonList(toolResult)));
-    List<LLMObs.LLMMessage> outputMessages =
-        Collections.singletonList(
-            LLMObs.LLMMessage.from("assistant", "I'll help you check the weather."));
-
-    Map<String, Object> chatTemplateEntry = new LinkedHashMap<>();
-    chatTemplateEntry.put("role", "user");
-    chatTemplateEntry.put("content", "Hello, what's the weather like in {{city}}?");
-    Map<String, Object> prompt = new LinkedHashMap<>();
-    prompt.put("id", "prompt_123");
-    prompt.put("version", "1");
-    prompt.put("variables", Collections.singletonMap("city", "San Francisco"));
-    prompt.put("chat_template", Collections.singletonList(chatTemplateEntry));
-
-    llmSpan.setTag("_ml_obs_tag.input", inputMessages);
-    llmSpan.setTag("_ml_obs_tag.input_prompt", prompt);
-    llmSpan.setTag("_ml_obs_tag.output", outputMessages);
-
-    Map<String, Object> metadataMap = new LinkedHashMap<>();
-    metadataMap.put("temperature", 0.7);
-    metadataMap.put("max_tokens", 100);
-    llmSpan.setTag("_ml_obs_tag.metadata", metadataMap);
-
-    Map<String, Object> cityProp = Collections.singletonMap("type", "string");
-    Map<String, Object> properties = Collections.singletonMap("city", cityProp);
-    Map<String, Object> schema = new LinkedHashMap<>();
-    schema.put("type", "object");
-    schema.put("properties", properties);
-    LLMObs.ToolDefinition toolDefinition =
-        LLMObs.ToolDefinition.from("get_weather", "Get weather by city", schema, "1.2.3");
-    llmSpan.setTag(
-        "_ml_obs_tag.tool_definitions",
-        Arrays.asList(toolDefinition, LLMObs.ToolDefinition.from("get_time")));
-
-    llmSpan.setError(true);
-    llmSpan.setTag(DDTags.ERROR_MSG, "boom");
-    llmSpan.setTag(DDTags.ERROR_TYPE, "java.lang.IllegalStateException");
-    llmSpan.setTag(DDTags.ERROR_STACK, "stacktrace");
-
-    llmSpan.finish();
-
-    List<DDSpan> trace = Collections.singletonList((DDSpan) llmSpan);
-    CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
-    // Keep all formatted spans in a single flush for this assertion.
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(16 * 1024, sink));
-
-    packer.format(trace, mapper);
-    packer.flush();
-
-    assertNotNull(sink.captured);
-    datadog.trace.common.writer.Payload payload = mapper.newPayload();
-    payload.withBody(1, sink.captured);
-
-    // Capture the size before the buffer is written and the body buffer is emptied.
-    int sizeInBytes = payload.sizeInBytes();
-
-    byte[] bytesWritten = writeTo(payload);
-    assertEquals(sizeInBytes, bytesWritten.length);
-    Map<String, Object> result = objectMapper.readValue(bytesWritten, Map.class);
-
-    assertTrue(result.containsKey("event_type"));
-    assertEquals("span", result.get("event_type"));
-    assertTrue(result.containsKey("_dd.stage"));
-    assertEquals("raw", result.get("_dd.stage"));
-    assertTrue(result.containsKey("spans"));
-    assertNotNull(result.get("spans"));
-    List<Map<String, Object>> spans = (List<Map<String, Object>>) result.get("spans");
-    assertTrue(spans instanceof List);
-    assertEquals(1, spans.size());
-
-    Map<String, Object> spanData = spans.get(0);
-    assertEquals("OpenAI.createCompletion", spanData.get("name"));
-    assertTrue(spanData.containsKey("span_id"));
-    assertTrue(spanData.containsKey("trace_id"));
-    assertTrue(spanData.containsKey("start_ns"));
-    assertTrue(spanData.containsKey("duration"));
-    assertTrue(spanData.containsKey("_dd"));
-    Map<String, Object> dd = (Map<String, Object>) spanData.get("_dd");
-    assertEquals(dd.get("span_id"), spanData.get("span_id"));
-    assertEquals(dd.get("trace_id"), spanData.get("trace_id"));
-    assertEquals(dd.get("apm_trace_id"), spanData.get("trace_id"));
-
-    // Top-level session_id field — what the LLM Trace Explorer's Sessions filter queries.
-    assertTrue(spanData.containsKey("session_id"));
-    assertEquals("abc-123-session", spanData.get("session_id"));
-
-    assertTrue(spanData.containsKey("meta"));
-    Map<String, Object> meta = (Map<String, Object>) spanData.get("meta");
-    assertEquals("llm", meta.get("span.kind"));
-    assertTrue(meta.containsKey("error"));
-    Map<String, Object> error = (Map<String, Object>) meta.get("error");
-    assertEquals("boom", error.get("message"));
-    assertEquals("java.lang.IllegalStateException", error.get("type"));
-    assertEquals("stacktrace", error.get("stack"));
-    assertTrue(meta.containsKey("input"));
-    Map<String, Object> inputResult = (Map<String, Object>) meta.get("input");
-    assertTrue(inputResult.containsKey("messages"));
-    List<Map<String, Object>> inputMsgs = (List<Map<String, Object>>) inputResult.get("messages");
-    assertTrue(inputMsgs.get(0).containsKey("content"));
-    assertEquals("Hello, what's the weather like?", inputMsgs.get(0).get("content"));
-    assertTrue(inputMsgs.get(0).containsKey("role"));
-    assertEquals("user", inputMsgs.get(0).get("role"));
-    assertEquals("assistant", inputMsgs.get(1).get("role"));
-    assertFalse(inputMsgs.get(1).containsKey("content"));
-    List<Map<String, Object>> toolCalls =
-        (List<Map<String, Object>>) inputMsgs.get(1).get("tool_calls");
-    assertEquals("get_weather", toolCalls.get(0).get("name"));
-    assertEquals("function_call", toolCalls.get(0).get("type"));
-    assertEquals("call_123", toolCalls.get(0).get("tool_id"));
-    assertEquals(
-        Collections.singletonMap("location", "San Francisco"), toolCalls.get(0).get("arguments"));
-    List<Map<String, Object>> toolResults =
-        (List<Map<String, Object>>) inputMsgs.get(1).get("tool_results");
-    assertEquals("get_weather", toolResults.get(0).get("name"));
-    assertEquals("function_call_output", toolResults.get(0).get("type"));
-    assertEquals("call_123", toolResults.get(0).get("tool_id"));
-    assertEquals("{\"temperature\":\"72F\"}", toolResults.get(0).get("result"));
-    Map<String, Object> promptResult = (Map<String, Object>) inputResult.get("prompt");
-    assertEquals("prompt_123", promptResult.get("id"));
-    assertEquals("1", promptResult.get("version"));
-    assertEquals(Collections.singletonMap("city", "San Francisco"), promptResult.get("variables"));
-    assertEquals(Collections.singletonList(chatTemplateEntry), promptResult.get("chat_template"));
-    assertTrue(meta.containsKey("output"));
-    Map<String, Object> outputResult = (Map<String, Object>) meta.get("output");
-    assertTrue(outputResult.containsKey("messages"));
-    assertFalse(outputResult.containsKey("prompt"));
-    List<Map<String, Object>> outputMsgs = (List<Map<String, Object>>) outputResult.get("messages");
-    assertTrue(outputMsgs.get(0).containsKey("content"));
-    assertEquals("I'll help you check the weather.", outputMsgs.get(0).get("content"));
-    assertTrue(outputMsgs.get(0).containsKey("role"));
-    assertEquals("assistant", outputMsgs.get(0).get("role"));
-    List<Map<String, Object>> toolDefsResult =
-        (List<Map<String, Object>>) meta.get("tool_definitions");
-    assertEquals(2, toolDefsResult.size());
-    assertEquals("get_weather", toolDefsResult.get(0).get("name"));
-    assertEquals("Get weather by city", toolDefsResult.get(0).get("description"));
-    assertEquals(schema, toolDefsResult.get(0).get("schema"));
-    assertEquals("1.2.3", toolDefsResult.get(0).get("version"));
-    assertEquals(Collections.singletonMap("name", "get_time"), toolDefsResult.get(1));
-    assertTrue(meta.containsKey("metadata"));
-
-    assertTrue(spanData.containsKey("metrics"));
-    Map<String, Object> metrics = (Map<String, Object>) spanData.get("metrics");
-    assertEquals(50.0, ((Number) metrics.get("input_tokens")).doubleValue(), 0.0);
-    assertEquals(25.0, ((Number) metrics.get("output_tokens")).doubleValue(), 0.0);
-    assertEquals(75.0, ((Number) metrics.get("total_tokens")).doubleValue(), 0.0);
-
-    assertTrue(spanData.containsKey("tags"));
-    List<String> tags = (List<String>) spanData.get("tags");
-    assertTrue(tags.contains("language:jvm"));
-    assertTrue(tags.contains("session_id:abc-123-session"));
-    assertFalse(tags.stream().anyMatch(tag -> tag.startsWith("input_prompt:")));
-
-    tracer.close();
-  }
-
-  @Test
-  void testLLMObsSpanMapperSerializesPromptWithoutInputMessages() throws Exception {
-    LLMObsSpanMapper mapper = new LLMObsSpanMapper();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    Map<String, Object> prompt = new LinkedHashMap<>();
-    prompt.put("id", "prompt_123");
-    prompt.put("template", "Hello {{name}}");
-    prompt.put("variables", Collections.singletonMap("name", "Sam"));
-
-    AgentSpan llmSpan =
-        tracer
-            .buildSpan("datadog", "chat-completion")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
-            .withTag("_ml_obs_tag.input_prompt", prompt)
-            .start();
-    llmSpan.setSpanType(InternalSpanTypes.LLMOBS);
-    llmSpan.finish();
-
-    Map<String, Object> spanData = serializeSingleSpan(mapper, llmSpan);
-    Map<String, Object> meta = (Map<String, Object>) spanData.get("meta");
-    Map<String, Object> input = (Map<String, Object>) meta.get("input");
-
-    assertEquals(Collections.singletonMap("prompt", prompt), input);
-    List<String> tags = (List<String>) spanData.get("tags");
-    assertFalse(tags.stream().anyMatch(tag -> tag.startsWith("input_prompt:")));
-
-    tracer.close();
-  }
-
-  @Test
-  void testLLMObsSpanMapperPreservesNestedPromptInputCompatibility() throws Exception {
-    LLMObsSpanMapper mapper = new LLMObsSpanMapper();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    Map<String, Object> prompt = Collections.singletonMap("id", "legacy_prompt");
-    Map<String, Object> input = new LinkedHashMap<>();
-    input.put("messages", Collections.singletonList(LLMObs.LLMMessage.from("user", "Hello")));
-    input.put("prompt", prompt);
-
-    AgentSpan llmSpan =
-        tracer
-            .buildSpan("datadog", "chat-completion")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
-            .withTag("_ml_obs_tag.input", input)
-            .start();
-    llmSpan.setSpanType(InternalSpanTypes.LLMOBS);
-    llmSpan.finish();
-
-    Map<String, Object> spanData = serializeSingleSpan(mapper, llmSpan);
-    Map<String, Object> meta = (Map<String, Object>) spanData.get("meta");
-    Map<String, Object> serializedInput = (Map<String, Object>) meta.get("input");
-
-    assertEquals(prompt, serializedInput.get("prompt"));
-    assertTrue(serializedInput.containsKey("messages"));
-
-    tracer.close();
-  }
-
-  @Test
-  void testLLMObsSpanMapperWritesNoSpansWhenNoneAreLLMObsSpans() {
-    LLMObsSpanMapper mapper = new LLMObsSpanMapper();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    AgentSpan regularSpan1 =
-        tracer
-            .buildSpan("datadog", "http.request")
-            .withResourceName("GET /api/users")
-            .withTag("http.method", "GET")
-            .withTag("http.url", "https://example.com/api/users")
-            .start();
-    regularSpan1.finish();
-
-    AgentSpan regularSpan2 =
-        tracer
-            .buildSpan("datadog", "database.query")
-            .withResourceName("SELECT * FROM users")
-            .withTag("db.type", "postgresql")
-            .start();
-    regularSpan2.finish();
-
-    List<DDSpan> trace = Arrays.asList((DDSpan) regularSpan1, (DDSpan) regularSpan2);
-    CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
-    // Keep all formatted spans in a single flush for this assertion.
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(16 * 1024, sink));
-
-    packer.format(trace, mapper);
-    packer.flush();
-
-    assertFalse(sink.captured != null);
-
-    tracer.close();
-  }
-
-  @Test
-  void testConsecutivePackerFormatCallsAccumulateSpansFromMultipleTraces() throws Exception {
-    LLMObsSpanMapper mapper = new LLMObsSpanMapper();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    // First trace with 2 LLMObs spans
-    AgentSpan llmSpan1 =
-        tracer
-            .buildSpan("datadog", "chat-completion-1")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
-            .withTag("_ml_obs_tag.model_name", "gpt-4")
-            .withTag("_ml_obs_tag.model_provider", "openai")
-            .start();
-    llmSpan1.setSpanType(InternalSpanTypes.LLMOBS);
-    llmSpan1.finish();
-
-    AgentSpan llmSpan2 =
-        tracer
-            .buildSpan("datadog", "chat-completion-2")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
-            .withTag("_ml_obs_tag.model_name", "gpt-3.5")
-            .withTag("_ml_obs_tag.model_provider", "openai")
-            .start();
-    llmSpan2.setSpanType(InternalSpanTypes.LLMOBS);
-    llmSpan2.finish();
-
-    // Second trace with 1 LLMObs span
-    AgentSpan llmSpan3 =
-        tracer
-            .buildSpan("datadog", "chat-completion-3")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
-            .withTag("_ml_obs_tag.model_name", "claude-3")
-            .withTag("_ml_obs_tag.model_provider", "anthropic")
-            .start();
-    llmSpan3.setSpanType(InternalSpanTypes.LLMOBS);
-    llmSpan3.finish();
-
-    List<DDSpan> trace1 = Arrays.asList((DDSpan) llmSpan1, (DDSpan) llmSpan2);
-    List<DDSpan> trace2 = Collections.singletonList((DDSpan) llmSpan3);
-    CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
-    // Keep all formatted spans in a single flush for this assertion.
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(16 * 1024, sink));
-
-    packer.format(trace1, mapper);
-    packer.format(trace2, mapper);
-    packer.flush();
-
-    assertNotNull(sink.captured);
-    datadog.trace.common.writer.Payload payload = mapper.newPayload();
-    payload.withBody(3, sink.captured);
-
-    // Capture the size before the buffer is written and the body buffer is emptied.
-    int sizeInBytes = payload.sizeInBytes();
-
-    byte[] bytesWritten = writeTo(payload);
-    assertEquals(sizeInBytes, bytesWritten.length);
-    Map<String, Object> result = objectMapper.readValue(bytesWritten, Map.class);
-
-    assertTrue(result.containsKey("event_type"));
-    assertEquals("span", result.get("event_type"));
-    assertTrue(result.containsKey("_dd.stage"));
-    assertEquals("raw", result.get("_dd.stage"));
-    assertTrue(result.containsKey("spans"));
-    List<Map<String, Object>> spans = (List<Map<String, Object>>) result.get("spans");
-    assertTrue(spans instanceof List);
-    assertEquals(3, spans.size());
-
-    List<Object> spanNames = new ArrayList<>();
-    for (Map<String, Object> span : spans) {
-      spanNames.add(span.get("name"));
+    private static final ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory());
+
+    @Test
+    void testLLMObsSpanMapperSerialization() throws Exception {
+        LLMObsSpanMapper mapper = new LLMObsSpanMapper();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        // Create a real LLMObs span using the tracer
+        AgentSpan llmSpan = tracer.buildSpan("datadog", "openai.request")
+                .withResourceName("createCompletion")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
+                .withTag("_ml_obs_tag.model_name", "gpt-4")
+                .withTag("_ml_obs_tag.model_provider", "openai")
+                .withTag("_ml_obs_metric.input_tokens", 50)
+                .withTag("_ml_obs_metric.output_tokens", 25)
+                .withTag("_ml_obs_metric.total_tokens", 75)
+                .withTag("_ml_obs_tag.session_id", "abc-123-session")
+                .start();
+
+        llmSpan.setSpanType(InternalSpanTypes.LLMOBS);
+
+        Map<String, Object> toolCallArgs = Collections.singletonMap("location", "San Francisco");
+        LLMObs.ToolCall toolCall = LLMObs.ToolCall.from("get_weather", "function_call", "call_123", toolCallArgs);
+        LLMObs.ToolResult toolResult =
+                LLMObs.ToolResult.from("get_weather", "function_call_output", "call_123", "{\"temperature\":\"72F\"}");
+        List<LLMObs.LLMMessage> inputMessages = Arrays.asList(
+                LLMObs.LLMMessage.from("user", "Hello, what's the weather like?"),
+                LLMObs.LLMMessage.from(
+                        "assistant", null, Collections.singletonList(toolCall), Collections.singletonList(toolResult)));
+        List<LLMObs.LLMMessage> outputMessages =
+                Collections.singletonList(LLMObs.LLMMessage.from("assistant", "I'll help you check the weather."));
+
+        Map<String, Object> chatTemplateEntry = new LinkedHashMap<>();
+        chatTemplateEntry.put("role", "user");
+        chatTemplateEntry.put("content", "Hello, what's the weather like in {{city}}?");
+        Map<String, Object> prompt = new LinkedHashMap<>();
+        prompt.put("id", "prompt_123");
+        prompt.put("version", "1");
+        prompt.put("variables", Collections.singletonMap("city", "San Francisco"));
+        prompt.put("chat_template", Collections.singletonList(chatTemplateEntry));
+
+        llmSpan.setTag("_ml_obs_tag.input", inputMessages);
+        llmSpan.setTag("_ml_obs_tag.input_prompt", prompt);
+        llmSpan.setTag("_ml_obs_tag.output", outputMessages);
+
+        Map<String, Object> metadataMap = new LinkedHashMap<>();
+        metadataMap.put("temperature", 0.7);
+        metadataMap.put("max_tokens", 100);
+        llmSpan.setTag("_ml_obs_tag.metadata", metadataMap);
+
+        Map<String, Object> cityProp = Collections.singletonMap("type", "string");
+        Map<String, Object> properties = Collections.singletonMap("city", cityProp);
+        Map<String, Object> schema = new LinkedHashMap<>();
+        schema.put("type", "object");
+        schema.put("properties", properties);
+        LLMObs.ToolDefinition toolDefinition =
+                LLMObs.ToolDefinition.from("get_weather", "Get weather by city", schema, "1.2.3");
+        llmSpan.setTag(
+                "_ml_obs_tag.tool_definitions", Arrays.asList(toolDefinition, LLMObs.ToolDefinition.from("get_time")));
+
+        llmSpan.setError(true);
+        llmSpan.setTag(DDTags.ERROR_MSG, "boom");
+        llmSpan.setTag(DDTags.ERROR_TYPE, "java.lang.IllegalStateException");
+        llmSpan.setTag(DDTags.ERROR_STACK, "stacktrace");
+
+        llmSpan.finish();
+
+        List<DDSpan> trace = Collections.singletonList((DDSpan) llmSpan);
+        CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
+        // Keep all formatted spans in a single flush for this assertion.
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(16 * 1024, sink));
+
+        packer.format(trace, mapper);
+        packer.flush();
+
+        assertNotNull(sink.captured);
+        datadog.trace.common.writer.Payload payload = mapper.newPayload();
+        payload.withBody(1, sink.captured);
+
+        // Capture the size before the buffer is written and the body buffer is emptied.
+        int sizeInBytes = payload.sizeInBytes();
+
+        byte[] bytesWritten = writeTo(payload);
+        assertEquals(sizeInBytes, bytesWritten.length);
+        Map<String, Object> result = objectMapper.readValue(bytesWritten, Map.class);
+
+        assertTrue(result.containsKey("event_type"));
+        assertEquals("span", result.get("event_type"));
+        assertTrue(result.containsKey("_dd.stage"));
+        assertEquals("raw", result.get("_dd.stage"));
+        assertTrue(result.containsKey("spans"));
+        assertNotNull(result.get("spans"));
+        List<Map<String, Object>> spans = (List<Map<String, Object>>) result.get("spans");
+        assertTrue(spans instanceof List);
+        assertEquals(1, spans.size());
+
+        Map<String, Object> spanData = spans.get(0);
+        assertEquals("OpenAI.createCompletion", spanData.get("name"));
+        assertTrue(spanData.containsKey("span_id"));
+        assertTrue(spanData.containsKey("trace_id"));
+        assertTrue(spanData.containsKey("start_ns"));
+        assertTrue(spanData.containsKey("duration"));
+        assertTrue(spanData.containsKey("_dd"));
+        Map<String, Object> dd = (Map<String, Object>) spanData.get("_dd");
+        assertEquals(dd.get("span_id"), spanData.get("span_id"));
+        assertEquals(dd.get("trace_id"), spanData.get("trace_id"));
+        assertEquals(dd.get("apm_trace_id"), spanData.get("trace_id"));
+
+        // Top-level session_id field — what the LLM Trace Explorer's Sessions filter queries.
+        assertTrue(spanData.containsKey("session_id"));
+        assertEquals("abc-123-session", spanData.get("session_id"));
+
+        assertTrue(spanData.containsKey("meta"));
+        Map<String, Object> meta = (Map<String, Object>) spanData.get("meta");
+        assertEquals("llm", meta.get("span.kind"));
+        assertTrue(meta.containsKey("error"));
+        Map<String, Object> error = (Map<String, Object>) meta.get("error");
+        assertEquals("boom", error.get("message"));
+        assertEquals("java.lang.IllegalStateException", error.get("type"));
+        assertEquals("stacktrace", error.get("stack"));
+        assertTrue(meta.containsKey("input"));
+        Map<String, Object> inputResult = (Map<String, Object>) meta.get("input");
+        assertTrue(inputResult.containsKey("messages"));
+        List<Map<String, Object>> inputMsgs = (List<Map<String, Object>>) inputResult.get("messages");
+        assertTrue(inputMsgs.get(0).containsKey("content"));
+        assertEquals("Hello, what's the weather like?", inputMsgs.get(0).get("content"));
+        assertTrue(inputMsgs.get(0).containsKey("role"));
+        assertEquals("user", inputMsgs.get(0).get("role"));
+        assertEquals("assistant", inputMsgs.get(1).get("role"));
+        assertFalse(inputMsgs.get(1).containsKey("content"));
+        List<Map<String, Object>> toolCalls =
+                (List<Map<String, Object>>) inputMsgs.get(1).get("tool_calls");
+        assertEquals("get_weather", toolCalls.get(0).get("name"));
+        assertEquals("function_call", toolCalls.get(0).get("type"));
+        assertEquals("call_123", toolCalls.get(0).get("tool_id"));
+        assertEquals(
+                Collections.singletonMap("location", "San Francisco"),
+                toolCalls.get(0).get("arguments"));
+        List<Map<String, Object>> toolResults =
+                (List<Map<String, Object>>) inputMsgs.get(1).get("tool_results");
+        assertEquals("get_weather", toolResults.get(0).get("name"));
+        assertEquals("function_call_output", toolResults.get(0).get("type"));
+        assertEquals("call_123", toolResults.get(0).get("tool_id"));
+        assertEquals("{\"temperature\":\"72F\"}", toolResults.get(0).get("result"));
+        Map<String, Object> promptResult = (Map<String, Object>) inputResult.get("prompt");
+        assertEquals("prompt_123", promptResult.get("id"));
+        assertEquals("1", promptResult.get("version"));
+        assertEquals(Collections.singletonMap("city", "San Francisco"), promptResult.get("variables"));
+        assertEquals(Collections.singletonList(chatTemplateEntry), promptResult.get("chat_template"));
+        assertTrue(meta.containsKey("output"));
+        Map<String, Object> outputResult = (Map<String, Object>) meta.get("output");
+        assertTrue(outputResult.containsKey("messages"));
+        assertFalse(outputResult.containsKey("prompt"));
+        List<Map<String, Object>> outputMsgs = (List<Map<String, Object>>) outputResult.get("messages");
+        assertTrue(outputMsgs.get(0).containsKey("content"));
+        assertEquals("I'll help you check the weather.", outputMsgs.get(0).get("content"));
+        assertTrue(outputMsgs.get(0).containsKey("role"));
+        assertEquals("assistant", outputMsgs.get(0).get("role"));
+        List<Map<String, Object>> toolDefsResult = (List<Map<String, Object>>) meta.get("tool_definitions");
+        assertEquals(2, toolDefsResult.size());
+        assertEquals("get_weather", toolDefsResult.get(0).get("name"));
+        assertEquals("Get weather by city", toolDefsResult.get(0).get("description"));
+        assertEquals(schema, toolDefsResult.get(0).get("schema"));
+        assertEquals("1.2.3", toolDefsResult.get(0).get("version"));
+        assertEquals(Collections.singletonMap("name", "get_time"), toolDefsResult.get(1));
+        assertTrue(meta.containsKey("metadata"));
+
+        assertTrue(spanData.containsKey("metrics"));
+        Map<String, Object> metrics = (Map<String, Object>) spanData.get("metrics");
+        assertEquals(50.0, ((Number) metrics.get("input_tokens")).doubleValue(), 0.0);
+        assertEquals(25.0, ((Number) metrics.get("output_tokens")).doubleValue(), 0.0);
+        assertEquals(75.0, ((Number) metrics.get("total_tokens")).doubleValue(), 0.0);
+
+        assertTrue(spanData.containsKey("tags"));
+        List<String> tags = (List<String>) spanData.get("tags");
+        assertTrue(tags.contains("language:jvm"));
+        assertTrue(tags.contains("session_id:abc-123-session"));
+        assertFalse(tags.stream().anyMatch(tag -> tag.startsWith("input_prompt:")));
+
+        tracer.close();
     }
-    assertTrue(spanNames.contains("chat-completion-1"));
-    assertTrue(spanNames.contains("chat-completion-2"));
-    assertTrue(spanNames.contains("chat-completion-3"));
-
-    tracer.close();
-  }
-
-  @Test
-  void testLLMObsSpanMapperOmitsTopLevelSessionIdWhenNotSet() throws Exception {
-    LLMObsSpanMapper mapper = new LLMObsSpanMapper();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    AgentSpan llmSpan =
-        tracer
-            .buildSpan("datadog", "openai.request")
-            .withResourceName("createCompletion")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
-            .withTag("_ml_obs_tag.model_name", "gpt-4")
-            .withTag("_ml_obs_tag.model_provider", "openai")
-            .start();
-    llmSpan.setSpanType(InternalSpanTypes.LLMOBS);
-    llmSpan.finish();
-
-    List<DDSpan> trace = Collections.singletonList((DDSpan) llmSpan);
-    CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(16 * 1024, sink));
-
-    packer.format(trace, mapper);
-    packer.flush();
-
-    assertNotNull(sink.captured);
-    datadog.trace.common.writer.Payload payload = mapper.newPayload();
-    payload.withBody(1, sink.captured);
-
-    byte[] bytesWritten = writeTo(payload);
-    Map<String, Object> result = objectMapper.readValue(bytesWritten, Map.class);
-    List<Map<String, Object>> spans = (List<Map<String, Object>>) result.get("spans");
-    Map<String, Object> spanData = spans.get(0);
-
-    // No top-level session_id field when the tag was never set.
-    assertFalse(spanData.containsKey("session_id"));
-
-    // And no session_id entry leaks into tags[] either.
-    List<String> tags = (List<String>) spanData.get("tags");
-    for (String tag : tags) {
-      assertFalse(
-          tag.startsWith("session_id:"), "tag should not start with session_id: but got: " + tag);
+
+    @Test
+    void testLLMObsSpanMapperSerializesPromptWithoutInputMessages() throws Exception {
+        LLMObsSpanMapper mapper = new LLMObsSpanMapper();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        Map<String, Object> prompt = new LinkedHashMap<>();
+        prompt.put("id", "prompt_123");
+        prompt.put("template", "Hello {{name}}");
+        prompt.put("variables", Collections.singletonMap("name", "Sam"));
+
+        AgentSpan llmSpan = tracer.buildSpan("datadog", "chat-completion")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
+                .withTag("_ml_obs_tag.input_prompt", prompt)
+                .start();
+        llmSpan.setSpanType(InternalSpanTypes.LLMOBS);
+        llmSpan.finish();
+
+        Map<String, Object> spanData = serializeSingleSpan(mapper, llmSpan);
+        Map<String, Object> meta = (Map<String, Object>) spanData.get("meta");
+        Map<String, Object> input = (Map<String, Object>) meta.get("input");
+
+        assertEquals(Collections.singletonMap("prompt", prompt), input);
+        List<String> tags = (List<String>) spanData.get("tags");
+        assertFalse(tags.stream().anyMatch(tag -> tag.startsWith("input_prompt:")));
+
+        tracer.close();
     }
 
-    tracer.close();
-  }
-
-  @Test
-  void testLLMObsSpanProcessorModifiesInputAndOutput() throws Exception {
-    LLMObs.registerProcessor(
-        span -> {
-          assertEquals(Tags.LLMOBS_LLM_SPAN_KIND, span.getKind());
-          assertEquals("true", span.getTag("redact"));
-          assertEquals("secret input", span.getInput().get(0).getContent());
-          span.setInput(Collections.singletonList(LLMObs.LLMMessage.from("user", "[REDACTED]")));
-          span.setOutput(Collections.emptyList());
-          return span;
+    @Test
+    void testLLMObsSpanMapperPreservesNestedPromptInputCompatibility() throws Exception {
+        LLMObsSpanMapper mapper = new LLMObsSpanMapper();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        Map<String, Object> prompt = Collections.singletonMap("id", "legacy_prompt");
+        Map<String, Object> input = new LinkedHashMap<>();
+        input.put("messages", Collections.singletonList(LLMObs.LLMMessage.from("user", "Hello")));
+        input.put("prompt", prompt);
+
+        AgentSpan llmSpan = tracer.buildSpan("datadog", "chat-completion")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
+                .withTag("_ml_obs_tag.input", input)
+                .start();
+        llmSpan.setSpanType(InternalSpanTypes.LLMOBS);
+        llmSpan.finish();
+
+        Map<String, Object> spanData = serializeSingleSpan(mapper, llmSpan);
+        Map<String, Object> meta = (Map<String, Object>) spanData.get("meta");
+        Map<String, Object> serializedInput = (Map<String, Object>) meta.get("input");
+
+        assertEquals(prompt, serializedInput.get("prompt"));
+        assertTrue(serializedInput.containsKey("messages"));
+
+        tracer.close();
+    }
+
+    @Test
+    void testLLMObsSpanMapperWritesNoSpansWhenNoneAreLLMObsSpans() {
+        LLMObsSpanMapper mapper = new LLMObsSpanMapper();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        AgentSpan regularSpan1 = tracer.buildSpan("datadog", "http.request")
+                .withResourceName("GET /api/users")
+                .withTag("http.method", "GET")
+                .withTag("http.url", "https://example.com/api/users")
+                .start();
+        regularSpan1.finish();
+
+        AgentSpan regularSpan2 = tracer.buildSpan("datadog", "database.query")
+                .withResourceName("SELECT * FROM users")
+                .withTag("db.type", "postgresql")
+                .start();
+        regularSpan2.finish();
+
+        List<DDSpan> trace = Arrays.asList((DDSpan) regularSpan1, (DDSpan) regularSpan2);
+        CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
+        // Keep all formatted spans in a single flush for this assertion.
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(16 * 1024, sink));
+
+        packer.format(trace, mapper);
+        packer.flush();
+
+        assertFalse(sink.captured != null);
+
+        tracer.close();
+    }
+
+    @Test
+    void testConsecutivePackerFormatCallsAccumulateSpansFromMultipleTraces() throws Exception {
+        LLMObsSpanMapper mapper = new LLMObsSpanMapper();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        // First trace with 2 LLMObs spans
+        AgentSpan llmSpan1 = tracer.buildSpan("datadog", "chat-completion-1")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
+                .withTag("_ml_obs_tag.model_name", "gpt-4")
+                .withTag("_ml_obs_tag.model_provider", "openai")
+                .start();
+        llmSpan1.setSpanType(InternalSpanTypes.LLMOBS);
+        llmSpan1.finish();
+
+        AgentSpan llmSpan2 = tracer.buildSpan("datadog", "chat-completion-2")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
+                .withTag("_ml_obs_tag.model_name", "gpt-3.5")
+                .withTag("_ml_obs_tag.model_provider", "openai")
+                .start();
+        llmSpan2.setSpanType(InternalSpanTypes.LLMOBS);
+        llmSpan2.finish();
+
+        // Second trace with 1 LLMObs span
+        AgentSpan llmSpan3 = tracer.buildSpan("datadog", "chat-completion-3")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
+                .withTag("_ml_obs_tag.model_name", "claude-3")
+                .withTag("_ml_obs_tag.model_provider", "anthropic")
+                .start();
+        llmSpan3.setSpanType(InternalSpanTypes.LLMOBS);
+        llmSpan3.finish();
+
+        List<DDSpan> trace1 = Arrays.asList((DDSpan) llmSpan1, (DDSpan) llmSpan2);
+        List<DDSpan> trace2 = Collections.singletonList((DDSpan) llmSpan3);
+        CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
+        // Keep all formatted spans in a single flush for this assertion.
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(16 * 1024, sink));
+
+        packer.format(trace1, mapper);
+        packer.format(trace2, mapper);
+        packer.flush();
+
+        assertNotNull(sink.captured);
+        datadog.trace.common.writer.Payload payload = mapper.newPayload();
+        payload.withBody(3, sink.captured);
+
+        // Capture the size before the buffer is written and the body buffer is emptied.
+        int sizeInBytes = payload.sizeInBytes();
+
+        byte[] bytesWritten = writeTo(payload);
+        assertEquals(sizeInBytes, bytesWritten.length);
+        Map<String, Object> result = objectMapper.readValue(bytesWritten, Map.class);
+
+        assertTrue(result.containsKey("event_type"));
+        assertEquals("span", result.get("event_type"));
+        assertTrue(result.containsKey("_dd.stage"));
+        assertEquals("raw", result.get("_dd.stage"));
+        assertTrue(result.containsKey("spans"));
+        List<Map<String, Object>> spans = (List<Map<String, Object>>) result.get("spans");
+        assertTrue(spans instanceof List);
+        assertEquals(3, spans.size());
+
+        List<Object> spanNames = new ArrayList<>();
+        for (Map<String, Object> span : spans) {
+            spanNames.add(span.get("name"));
+        }
+        assertTrue(spanNames.contains("chat-completion-1"));
+        assertTrue(spanNames.contains("chat-completion-2"));
+        assertTrue(spanNames.contains("chat-completion-3"));
+
+        tracer.close();
+    }
+
+    @Test
+    void testLLMObsSpanMapperOmitsTopLevelSessionIdWhenNotSet() throws Exception {
+        LLMObsSpanMapper mapper = new LLMObsSpanMapper();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        AgentSpan llmSpan = tracer.buildSpan("datadog", "openai.request")
+                .withResourceName("createCompletion")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
+                .withTag("_ml_obs_tag.model_name", "gpt-4")
+                .withTag("_ml_obs_tag.model_provider", "openai")
+                .start();
+        llmSpan.setSpanType(InternalSpanTypes.LLMOBS);
+        llmSpan.finish();
+
+        List<DDSpan> trace = Collections.singletonList((DDSpan) llmSpan);
+        CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(16 * 1024, sink));
+
+        packer.format(trace, mapper);
+        packer.flush();
+
+        assertNotNull(sink.captured);
+        datadog.trace.common.writer.Payload payload = mapper.newPayload();
+        payload.withBody(1, sink.captured);
+
+        byte[] bytesWritten = writeTo(payload);
+        Map<String, Object> result = objectMapper.readValue(bytesWritten, Map.class);
+        List<Map<String, Object>> spans = (List<Map<String, Object>>) result.get("spans");
+        Map<String, Object> spanData = spans.get(0);
+
+        // No top-level session_id field when the tag was never set.
+        assertFalse(spanData.containsKey("session_id"));
+
+        // And no session_id entry leaks into tags[] either.
+        List<String> tags = (List<String>) spanData.get("tags");
+        for (String tag : tags) {
+            assertFalse(tag.startsWith("session_id:"), "tag should not start with session_id: but got: " + tag);
+        }
+
+        tracer.close();
+    }
+
+    @Test
+    void testLLMObsSpanProcessorModifiesInputAndOutput() throws Exception {
+        LLMObs.registerProcessor(span -> {
+            assertEquals(Tags.LLMOBS_LLM_SPAN_KIND, span.getKind());
+            assertEquals("true", span.getTag("redact"));
+            assertEquals("secret input", span.getInput().get(0).getContent());
+            span.setInput(Collections.singletonList(LLMObs.LLMMessage.from("user", "[REDACTED]")));
+            span.setOutput(Collections.emptyList());
+            return span;
         });
 
-    try {
-      CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-      Map<String, Object> originalInput = new LinkedHashMap<>();
-      originalInput.put(
-          "messages", Collections.singletonList(LLMObs.LLMMessage.from("user", "secret input")));
-      originalInput.put("prompt", Collections.singletonMap("id", "prompt-id"));
-      AgentSpan llmSpan =
-          tracer
-              .buildSpan("datadog", "processed")
-              .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
-              .withTag("_ml_obs_tag.input", originalInput)
-              .withTag(
-                  "_ml_obs_tag.output",
-                  Collections.singletonList(LLMObs.LLMMessage.from("assistant", "secret output")))
-              .withTag("_ml_obs_tag.redact", true)
-              .start();
-      llmSpan.setSpanType(InternalSpanTypes.LLMOBS);
-      llmSpan.finish();
-
-      List<Map<String, Object>> spans =
-          serialize(Collections.singletonList((DDSpan) llmSpan), new LLMObsSpanMapper());
-      Map<String, Object> meta = (Map<String, Object>) spans.get(0).get("meta");
-      Map<String, Object> input = (Map<String, Object>) meta.get("input");
-      List<Map<String, Object>> messages = (List<Map<String, Object>>) input.get("messages");
-
-      assertEquals("[REDACTED]", messages.get(0).get("content"));
-      assertEquals(Collections.singletonMap("id", "prompt-id"), input.get("prompt"));
-      assertFalse(meta.containsKey("output"));
-      tracer.close();
-    } finally {
-      LLMObs.deregisterProcessor();
+        try {
+            CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+            Map<String, Object> originalInput = new LinkedHashMap<>();
+            originalInput.put("messages", Collections.singletonList(LLMObs.LLMMessage.from("user", "secret input")));
+            originalInput.put("prompt", Collections.singletonMap("id", "prompt-id"));
+            AgentSpan llmSpan = tracer.buildSpan("datadog", "processed")
+                    .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
+                    .withTag("_ml_obs_tag.input", originalInput)
+                    .withTag(
+                            "_ml_obs_tag.output",
+                            Collections.singletonList(LLMObs.LLMMessage.from("assistant", "secret output")))
+                    .withTag("_ml_obs_tag.redact", true)
+                    .start();
+            llmSpan.setSpanType(InternalSpanTypes.LLMOBS);
+            llmSpan.finish();
+
+            List<Map<String, Object>> spans =
+                    serialize(Collections.singletonList((DDSpan) llmSpan), new LLMObsSpanMapper());
+            Map<String, Object> meta = (Map<String, Object>) spans.get(0).get("meta");
+            Map<String, Object> input = (Map<String, Object>) meta.get("input");
+            List<Map<String, Object>> messages = (List<Map<String, Object>>) input.get("messages");
+
+            assertEquals("[REDACTED]", messages.get(0).get("content"));
+            assertEquals(Collections.singletonMap("id", "prompt-id"), input.get("prompt"));
+            assertFalse(meta.containsKey("output"));
+            tracer.close();
+        } finally {
+            LLMObs.deregisterProcessor();
+        }
     }
-  }
-
-  @Test
-  void testLLMObsSpanProcessorAddsMissingInputAndOutput() throws Exception {
-    LLMObs.registerProcessor(
-        span -> {
-          span.setInput(Collections.singletonList(LLMObs.LLMMessage.from("user", "added input")));
-          span.setOutput(
-              Collections.singletonList(LLMObs.LLMMessage.from("assistant", "added output")));
-          return span;
+
+    @Test
+    void testLLMObsSpanProcessorAddsMissingInputAndOutput() throws Exception {
+        LLMObs.registerProcessor(span -> {
+            span.setInput(Collections.singletonList(LLMObs.LLMMessage.from("user", "added input")));
+            span.setOutput(Collections.singletonList(LLMObs.LLMMessage.from("assistant", "added output")));
+            return span;
         });
 
-    try {
-      CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-      AgentSpan llmSpan = newLlmObsSpan(tracer, "processed", false);
-
-      List<Map<String, Object>> spans =
-          serialize(Collections.singletonList((DDSpan) llmSpan), new LLMObsSpanMapper());
-      Map<String, Object> meta = (Map<String, Object>) spans.get(0).get("meta");
-      Map<String, Object> input = (Map<String, Object>) meta.get("input");
-      Map<String, Object> output = (Map<String, Object>) meta.get("output");
-      List<Map<String, Object>> inputMessages = (List<Map<String, Object>>) input.get("messages");
-      List<Map<String, Object>> outputMessages = (List<Map<String, Object>>) output.get("messages");
-
-      assertEquals("added input", inputMessages.get(0).get("content"));
-      assertEquals("added output", outputMessages.get(0).get("content"));
-      tracer.close();
-    } finally {
-      LLMObs.deregisterProcessor();
+        try {
+            CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+            AgentSpan llmSpan = newLlmObsSpan(tracer, "processed", false);
+
+            List<Map<String, Object>> spans =
+                    serialize(Collections.singletonList((DDSpan) llmSpan), new LLMObsSpanMapper());
+            Map<String, Object> meta = (Map<String, Object>) spans.get(0).get("meta");
+            Map<String, Object> input = (Map<String, Object>) meta.get("input");
+            Map<String, Object> output = (Map<String, Object>) meta.get("output");
+            List<Map<String, Object>> inputMessages = (List<Map<String, Object>>) input.get("messages");
+            List<Map<String, Object>> outputMessages = (List<Map<String, Object>>) output.get("messages");
+
+            assertEquals("added input", inputMessages.get(0).get("content"));
+            assertEquals("added output", outputMessages.get(0).get("content"));
+            tracer.close();
+        } finally {
+            LLMObs.deregisterProcessor();
+        }
     }
-  }
-
-  @Test
-  void testLLMObsSpanProcessorModifiesRetrievalOutputDocuments() throws Exception {
-    LLMObs.registerProcessor(
-        span -> {
-          span.setOutput(
-              Collections.singletonList(LLMObs.LLMMessage.from("", "processed document")));
-          return span;
+
+    @Test
+    void testLLMObsSpanProcessorModifiesRetrievalOutputDocuments() throws Exception {
+        LLMObs.registerProcessor(span -> {
+            span.setOutput(Collections.singletonList(LLMObs.LLMMessage.from("", "processed document")));
+            return span;
         });
 
-    try {
-      CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-      AgentSpan retrievalSpan =
-          tracer
-              .buildSpan("datadog", "retrieval")
-              .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_RETRIEVAL_SPAN_KIND)
-              .withTag(
-                  "_ml_obs_tag.output",
-                  Collections.singletonList(
-                      LLMObs.Document.from("original document", "result.txt", "doc-456", 0.9)))
-              .start();
-      retrievalSpan.setSpanType(InternalSpanTypes.LLMOBS);
-      retrievalSpan.finish();
-
-      List<Map<String, Object>> spans =
-          serialize(Collections.singletonList((DDSpan) retrievalSpan), new LLMObsSpanMapper());
-      Map<String, Object> meta = (Map<String, Object>) spans.get(0).get("meta");
-      Map<String, Object> output = (Map<String, Object>) meta.get("output");
-      List<Map<String, Object>> documents = (List<Map<String, Object>>) output.get("documents");
-
-      assertEquals("processed document", documents.get(0).get("text"));
-      assertEquals("result.txt", documents.get(0).get("name"));
-      assertEquals("doc-456", documents.get(0).get("id"));
-      assertEquals(0.9, documents.get(0).get("score"));
-      tracer.close();
-    } finally {
-      LLMObs.deregisterProcessor();
+        try {
+            CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+            AgentSpan retrievalSpan = tracer.buildSpan("datadog", "retrieval")
+                    .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_RETRIEVAL_SPAN_KIND)
+                    .withTag(
+                            "_ml_obs_tag.output",
+                            Collections.singletonList(
+                                    LLMObs.Document.from("original document", "result.txt", "doc-456", 0.9)))
+                    .start();
+            retrievalSpan.setSpanType(InternalSpanTypes.LLMOBS);
+            retrievalSpan.finish();
+
+            List<Map<String, Object>> spans =
+                    serialize(Collections.singletonList((DDSpan) retrievalSpan), new LLMObsSpanMapper());
+            Map<String, Object> meta = (Map<String, Object>) spans.get(0).get("meta");
+            Map<String, Object> output = (Map<String, Object>) meta.get("output");
+            List<Map<String, Object>> documents = (List<Map<String, Object>>) output.get("documents");
+
+            assertEquals("processed document", documents.get(0).get("text"));
+            assertEquals("result.txt", documents.get(0).get("name"));
+            assertEquals("doc-456", documents.get(0).get("id"));
+            assertEquals(0.9, documents.get(0).get("score"));
+            tracer.close();
+        } finally {
+            LLMObs.deregisterProcessor();
+        }
+    }
+
+    @Test
+    void testLLMObsSpanMapperSerializesDocumentIO() throws Exception {
+        LLMObsSpanMapper mapper = new LLMObsSpanMapper();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        AgentSpan embeddingSpan = tracer.buildSpan("datadog", "embedding")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_EMBEDDING_SPAN_KIND)
+                .withTag(
+                        "_ml_obs_tag.input",
+                        Arrays.asList(
+                                LLMObs.Document.from("embedding input", "embedding.txt", "embedding-1", 0.75),
+                                LLMObs.Document.from("embedding text only")))
+                .start();
+        embeddingSpan.setSpanType(InternalSpanTypes.LLMOBS);
+        embeddingSpan.finish();
+
+        AgentSpan retrievalSpan = tracer.buildSpan("datadog", "retrieval")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_RETRIEVAL_SPAN_KIND)
+                .withTag(
+                        "_ml_obs_tag.output",
+                        Collections.singletonList(
+                                LLMObs.Document.from("retrieval output", "retrieval.txt", "retrieval-1", 0.9)))
+                .start();
+        retrievalSpan.setSpanType(InternalSpanTypes.LLMOBS);
+        retrievalSpan.finish();
+
+        List<String> nonDocumentInput = Arrays.asList("first raw input", "second raw input");
+        AgentSpan embeddingWithNonDocumentInput = tracer.buildSpan("datadog", "embedding")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_EMBEDDING_SPAN_KIND)
+                .withTag("_ml_obs_tag.input", nonDocumentInput)
+                .start();
+        embeddingWithNonDocumentInput.setSpanType(InternalSpanTypes.LLMOBS);
+        embeddingWithNonDocumentInput.finish();
+
+        List<String> nonDocumentOutput = Arrays.asList("first raw result", "second raw result");
+        AgentSpan retrievalWithNonDocumentOutput = tracer.buildSpan("datadog", "retrieval")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_RETRIEVAL_SPAN_KIND)
+                .withTag("_ml_obs_tag.output", nonDocumentOutput)
+                .start();
+        retrievalWithNonDocumentOutput.setSpanType(InternalSpanTypes.LLMOBS);
+        retrievalWithNonDocumentOutput.finish();
+
+        List<DDSpan> trace = Arrays.asList(
+                (DDSpan) embeddingSpan, (DDSpan) retrievalSpan, (DDSpan) embeddingWithNonDocumentInput, (DDSpan)
+                        retrievalWithNonDocumentOutput);
+        CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(16 * 1024, sink));
+        packer.format(trace, mapper);
+        packer.flush();
+
+        datadog.trace.common.writer.Payload payload = mapper.newPayload();
+        payload.withBody(trace.size(), sink.captured);
+        Map<String, Object> result = objectMapper.readValue(writeTo(payload), Map.class);
+        List<Map<String, Object>> spans = (List<Map<String, Object>>) result.get("spans");
+
+        Map<String, Object> embeddingMeta = (Map<String, Object>) spans.get(0).get("meta");
+        Map<String, Object> embeddingInput = (Map<String, Object>) embeddingMeta.get("input");
+        List<Map<String, Object>> embeddingDocuments = (List<Map<String, Object>>) embeddingInput.get("documents");
+        assertEquals("embedding input", embeddingDocuments.get(0).get("text"));
+        assertEquals("embedding.txt", embeddingDocuments.get(0).get("name"));
+        assertEquals("embedding-1", embeddingDocuments.get(0).get("id"));
+        assertEquals(0.75, embeddingDocuments.get(0).get("score"));
+        assertEquals("embedding text only", embeddingDocuments.get(1).get("text"));
+        assertFalse(embeddingDocuments.get(1).containsKey("name"));
+        assertFalse(embeddingDocuments.get(1).containsKey("id"));
+        assertFalse(embeddingDocuments.get(1).containsKey("score"));
+        assertFalse(embeddingInput.containsKey("value"));
+
+        Map<String, Object> retrievalMeta = (Map<String, Object>) spans.get(1).get("meta");
+        Map<String, Object> retrievalOutput = (Map<String, Object>) retrievalMeta.get("output");
+        List<Map<String, Object>> retrievalDocuments = (List<Map<String, Object>>) retrievalOutput.get("documents");
+        assertEquals("retrieval output", retrievalDocuments.get(0).get("text"));
+        assertEquals("retrieval.txt", retrievalDocuments.get(0).get("name"));
+        assertEquals("retrieval-1", retrievalDocuments.get(0).get("id"));
+        assertEquals(0.9, retrievalDocuments.get(0).get("score"));
+        assertFalse(retrievalOutput.containsKey("value"));
+
+        Map<String, Object> fallbackEmbeddingMeta =
+                (Map<String, Object>) spans.get(2).get("meta");
+        Map<String, Object> fallbackInput = (Map<String, Object>) fallbackEmbeddingMeta.get("input");
+        assertEquals(nonDocumentInput, fallbackInput.get("value"));
+        assertFalse(fallbackInput.containsKey("documents"));
+
+        Map<String, Object> fallbackRetrievalMeta =
+                (Map<String, Object>) spans.get(3).get("meta");
+        Map<String, Object> fallbackOutput = (Map<String, Object>) fallbackRetrievalMeta.get("output");
+        assertEquals(nonDocumentOutput, fallbackOutput.get("value"));
+        assertFalse(fallbackOutput.containsKey("documents"));
+
+        tracer.close();
+    }
+
+    @Test
+    void testLLMObsSpanMapperPreservesStringRetrievalOutput() throws Exception {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        AgentSpan retrievalSpan = tracer.buildSpan("datadog", "retrieval")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_RETRIEVAL_SPAN_KIND)
+                .withTag("_ml_obs_tag.output", "retrieval output")
+                .start();
+        retrievalSpan.setSpanType(InternalSpanTypes.LLMOBS);
+        retrievalSpan.finish();
+
+        List<Map<String, Object>> spans =
+                serialize(Collections.singletonList((DDSpan) retrievalSpan), new LLMObsSpanMapper());
+        Map<String, Object> meta = (Map<String, Object>) spans.get(0).get("meta");
+        Map<String, Object> output = (Map<String, Object>) meta.get("output");
+
+        assertEquals("retrieval output", output.get("value"));
+        tracer.close();
+    }
+
+    @Test
+    void testAgentAttributionEmittedWithBothFields() throws Exception {
+        LLMObsSpanMapper mapper = new LLMObsSpanMapper();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        AgentSpan agentSpan = tracer.buildSpan("datadog", "my.agent")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_AGENT_SPAN_KIND)
+                .withTag("_ml_obs_tag.pagent_span_id", "abc123")
+                .withTag("_ml_obs_tag.pagent_name", "my-orchestrator")
+                .start();
+        agentSpan.setSpanType(InternalSpanTypes.LLMOBS);
+        agentSpan.finish();
+
+        Map<String, Object> spanData = serializeSingleSpan(mapper, agentSpan);
+        Map<String, Object> meta = (Map<String, Object>) spanData.get("meta");
+
+        assertTrue(meta.containsKey("agent_attribution"));
+        Map<String, Object> attribution = (Map<String, Object>) meta.get("agent_attribution");
+        assertEquals("abc123", attribution.get("pagent_span_id"));
+        assertEquals("my-orchestrator", attribution.get("pagent_name"));
+        tracer.close();
     }
-  }
-
-  @Test
-  void testLLMObsSpanMapperSerializesDocumentIO() throws Exception {
-    LLMObsSpanMapper mapper = new LLMObsSpanMapper();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    AgentSpan embeddingSpan =
-        tracer
-            .buildSpan("datadog", "embedding")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_EMBEDDING_SPAN_KIND)
-            .withTag(
-                "_ml_obs_tag.input",
-                Arrays.asList(
-                    LLMObs.Document.from("embedding input", "embedding.txt", "embedding-1", 0.75),
-                    LLMObs.Document.from("embedding text only")))
-            .start();
-    embeddingSpan.setSpanType(InternalSpanTypes.LLMOBS);
-    embeddingSpan.finish();
-
-    AgentSpan retrievalSpan =
-        tracer
-            .buildSpan("datadog", "retrieval")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_RETRIEVAL_SPAN_KIND)
-            .withTag(
-                "_ml_obs_tag.output",
-                Collections.singletonList(
-                    LLMObs.Document.from("retrieval output", "retrieval.txt", "retrieval-1", 0.9)))
-            .start();
-    retrievalSpan.setSpanType(InternalSpanTypes.LLMOBS);
-    retrievalSpan.finish();
-
-    List<String> nonDocumentInput = Arrays.asList("first raw input", "second raw input");
-    AgentSpan embeddingWithNonDocumentInput =
-        tracer
-            .buildSpan("datadog", "embedding")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_EMBEDDING_SPAN_KIND)
-            .withTag("_ml_obs_tag.input", nonDocumentInput)
-            .start();
-    embeddingWithNonDocumentInput.setSpanType(InternalSpanTypes.LLMOBS);
-    embeddingWithNonDocumentInput.finish();
-
-    List<String> nonDocumentOutput = Arrays.asList("first raw result", "second raw result");
-    AgentSpan retrievalWithNonDocumentOutput =
-        tracer
-            .buildSpan("datadog", "retrieval")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_RETRIEVAL_SPAN_KIND)
-            .withTag("_ml_obs_tag.output", nonDocumentOutput)
-            .start();
-    retrievalWithNonDocumentOutput.setSpanType(InternalSpanTypes.LLMOBS);
-    retrievalWithNonDocumentOutput.finish();
-
-    List<DDSpan> trace =
-        Arrays.asList(
-            (DDSpan) embeddingSpan,
-            (DDSpan) retrievalSpan,
-            (DDSpan) embeddingWithNonDocumentInput,
-            (DDSpan) retrievalWithNonDocumentOutput);
-    CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(16 * 1024, sink));
-    packer.format(trace, mapper);
-    packer.flush();
-
-    datadog.trace.common.writer.Payload payload = mapper.newPayload();
-    payload.withBody(trace.size(), sink.captured);
-    Map<String, Object> result = objectMapper.readValue(writeTo(payload), Map.class);
-    List<Map<String, Object>> spans = (List<Map<String, Object>>) result.get("spans");
-
-    Map<String, Object> embeddingMeta = (Map<String, Object>) spans.get(0).get("meta");
-    Map<String, Object> embeddingInput = (Map<String, Object>) embeddingMeta.get("input");
-    List<Map<String, Object>> embeddingDocuments =
-        (List<Map<String, Object>>) embeddingInput.get("documents");
-    assertEquals("embedding input", embeddingDocuments.get(0).get("text"));
-    assertEquals("embedding.txt", embeddingDocuments.get(0).get("name"));
-    assertEquals("embedding-1", embeddingDocuments.get(0).get("id"));
-    assertEquals(0.75, embeddingDocuments.get(0).get("score"));
-    assertEquals("embedding text only", embeddingDocuments.get(1).get("text"));
-    assertFalse(embeddingDocuments.get(1).containsKey("name"));
-    assertFalse(embeddingDocuments.get(1).containsKey("id"));
-    assertFalse(embeddingDocuments.get(1).containsKey("score"));
-    assertFalse(embeddingInput.containsKey("value"));
-
-    Map<String, Object> retrievalMeta = (Map<String, Object>) spans.get(1).get("meta");
-    Map<String, Object> retrievalOutput = (Map<String, Object>) retrievalMeta.get("output");
-    List<Map<String, Object>> retrievalDocuments =
-        (List<Map<String, Object>>) retrievalOutput.get("documents");
-    assertEquals("retrieval output", retrievalDocuments.get(0).get("text"));
-    assertEquals("retrieval.txt", retrievalDocuments.get(0).get("name"));
-    assertEquals("retrieval-1", retrievalDocuments.get(0).get("id"));
-    assertEquals(0.9, retrievalDocuments.get(0).get("score"));
-    assertFalse(retrievalOutput.containsKey("value"));
-
-    Map<String, Object> fallbackEmbeddingMeta = (Map<String, Object>) spans.get(2).get("meta");
-    Map<String, Object> fallbackInput = (Map<String, Object>) fallbackEmbeddingMeta.get("input");
-    assertEquals(nonDocumentInput, fallbackInput.get("value"));
-    assertFalse(fallbackInput.containsKey("documents"));
-
-    Map<String, Object> fallbackRetrievalMeta = (Map<String, Object>) spans.get(3).get("meta");
-    Map<String, Object> fallbackOutput = (Map<String, Object>) fallbackRetrievalMeta.get("output");
-    assertEquals(nonDocumentOutput, fallbackOutput.get("value"));
-    assertFalse(fallbackOutput.containsKey("documents"));
-
-    tracer.close();
-  }
-
-  @Test
-  void testLLMObsSpanMapperPreservesStringRetrievalOutput() throws Exception {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    AgentSpan retrievalSpan =
-        tracer
-            .buildSpan("datadog", "retrieval")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_RETRIEVAL_SPAN_KIND)
-            .withTag("_ml_obs_tag.output", "retrieval output")
-            .start();
-    retrievalSpan.setSpanType(InternalSpanTypes.LLMOBS);
-    retrievalSpan.finish();
-
-    List<Map<String, Object>> spans =
-        serialize(Collections.singletonList((DDSpan) retrievalSpan), new LLMObsSpanMapper());
-    Map<String, Object> meta = (Map<String, Object>) spans.get(0).get("meta");
-    Map<String, Object> output = (Map<String, Object>) meta.get("output");
-
-    assertEquals("retrieval output", output.get("value"));
-    tracer.close();
-  }
-
-  @Test
-  void testAgentAttributionEmittedWithBothFields() throws Exception {
-    LLMObsSpanMapper mapper = new LLMObsSpanMapper();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    AgentSpan agentSpan =
-        tracer
-            .buildSpan("datadog", "my.agent")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_AGENT_SPAN_KIND)
-            .withTag("_ml_obs_tag.pagent_span_id", "abc123")
-            .withTag("_ml_obs_tag.pagent_name", "my-orchestrator")
-            .start();
-    agentSpan.setSpanType(InternalSpanTypes.LLMOBS);
-    agentSpan.finish();
-
-    Map<String, Object> spanData = serializeSingleSpan(mapper, agentSpan);
-    Map<String, Object> meta = (Map<String, Object>) spanData.get("meta");
-
-    assertTrue(meta.containsKey("agent_attribution"));
-    Map<String, Object> attribution = (Map<String, Object>) meta.get("agent_attribution");
-    assertEquals("abc123", attribution.get("pagent_span_id"));
-    assertEquals("my-orchestrator", attribution.get("pagent_name"));
-    tracer.close();
-  }
-
-  @Test
-  void testLLMObsSpanProcessorCanDropSpan() throws Exception {
-    LLMObs.registerProcessor(span -> "true".equals(span.getTag("drop")) ? null : span);
-
-    try {
-      CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-      AgentSpan dropped = newLlmObsSpan(tracer, "dropped", true);
-      AgentSpan retained = newLlmObsSpan(tracer, "retained", false);
-
-      List<Map<String, Object>> spans =
-          serialize(Arrays.asList((DDSpan) dropped, (DDSpan) retained), new LLMObsSpanMapper());
-
-      assertEquals(1, spans.size());
-      assertEquals("retained", spans.get(0).get("name"));
-      tracer.close();
-    } finally {
-      LLMObs.deregisterProcessor();
+
+    @Test
+    void testLLMObsSpanProcessorCanDropSpan() throws Exception {
+        LLMObs.registerProcessor(span -> "true".equals(span.getTag("drop")) ? null : span);
+
+        try {
+            CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+            AgentSpan dropped = newLlmObsSpan(tracer, "dropped", true);
+            AgentSpan retained = newLlmObsSpan(tracer, "retained", false);
+
+            List<Map<String, Object>> spans =
+                    serialize(Arrays.asList((DDSpan) dropped, (DDSpan) retained), new LLMObsSpanMapper());
+
+            assertEquals(1, spans.size());
+            assertEquals("retained", spans.get(0).get("name"));
+            tracer.close();
+        } finally {
+            LLMObs.deregisterProcessor();
+        }
     }
-  }
-
-  @Test
-  void testLLMObsSpanProcessorExceptionDropsSpan() throws Exception {
-    LLMObs.registerProcessor(
-        span -> {
-          if ("true".equals(span.getTag("drop"))) {
-            throw new IllegalStateException("processor failure");
-          }
-          return span;
+
+    @Test
+    void testLLMObsSpanProcessorExceptionDropsSpan() throws Exception {
+        LLMObs.registerProcessor(span -> {
+            if ("true".equals(span.getTag("drop"))) {
+                throw new IllegalStateException("processor failure");
+            }
+            return span;
         });
 
-    try {
-      CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-      AgentSpan dropped = newLlmObsSpan(tracer, "dropped", true);
-      AgentSpan retained = newLlmObsSpan(tracer, "retained", false);
+        try {
+            CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+            AgentSpan dropped = newLlmObsSpan(tracer, "dropped", true);
+            AgentSpan retained = newLlmObsSpan(tracer, "retained", false);
 
-      List<Map<String, Object>> spans =
-          serialize(Arrays.asList((DDSpan) dropped, (DDSpan) retained), new LLMObsSpanMapper());
+            List<Map<String, Object>> spans =
+                    serialize(Arrays.asList((DDSpan) dropped, (DDSpan) retained), new LLMObsSpanMapper());
 
-      assertEquals(1, spans.size());
-      assertEquals("retained", spans.get(0).get("name"));
-      tracer.close();
-    } finally {
-      LLMObs.deregisterProcessor();
+            assertEquals(1, spans.size());
+            assertEquals("retained", spans.get(0).get("name"));
+            tracer.close();
+        } finally {
+            LLMObs.deregisterProcessor();
+        }
     }
-  }
-
-  @Test
-  void testLLMObsSpanProcessorErrorDropsSpan() throws Exception {
-    LLMObs.registerProcessor(
-        span -> {
-          if ("true".equals(span.getTag("drop"))) {
-            throw new AssertionError("processor failure");
-          }
-          return span;
+
+    @Test
+    void testLLMObsSpanProcessorErrorDropsSpan() throws Exception {
+        LLMObs.registerProcessor(span -> {
+            if ("true".equals(span.getTag("drop"))) {
+                throw new AssertionError("processor failure");
+            }
+            return span;
         });
 
-    try {
-      CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-      AgentSpan dropped = newLlmObsSpan(tracer, "dropped", true);
-      AgentSpan retained = newLlmObsSpan(tracer, "retained", false);
+        try {
+            CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+            AgentSpan dropped = newLlmObsSpan(tracer, "dropped", true);
+            AgentSpan retained = newLlmObsSpan(tracer, "retained", false);
 
-      List<Map<String, Object>> spans =
-          serialize(Arrays.asList((DDSpan) dropped, (DDSpan) retained), new LLMObsSpanMapper());
+            List<Map<String, Object>> spans =
+                    serialize(Arrays.asList((DDSpan) dropped, (DDSpan) retained), new LLMObsSpanMapper());
 
-      assertEquals(1, spans.size());
-      assertEquals("retained", spans.get(0).get("name"));
-      tracer.close();
-    } finally {
-      LLMObs.deregisterProcessor();
+            assertEquals(1, spans.size());
+            assertEquals("retained", spans.get(0).get("name"));
+            tracer.close();
+        } finally {
+            LLMObs.deregisterProcessor();
+        }
     }
-  }
-
-  @Test
-  void testLLMObsSpanProcessorRunsOnceWhenSerializationRetries() {
-    AtomicInteger calls = new AtomicInteger();
-    LLMObsMetricCollector.get().drain();
-    LLMObs.registerProcessor(
-        span -> {
-          calls.incrementAndGet();
-          return "true".equals(span.getTag("drop")) ? null : span;
+
+    @Test
+    void testLLMObsSpanProcessorRunsOnceWhenSerializationRetries() {
+        AtomicInteger calls = new AtomicInteger();
+        LLMObsMetricCollector.get().drain();
+        LLMObs.registerProcessor(span -> {
+            calls.incrementAndGet();
+            return "true".equals(span.getTag("drop")) ? null : span;
         });
 
-    try {
-      CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-      AgentSpan first = newLlmObsSpan(tracer, "first", false);
-      AgentSpan dropped = newLlmObsSpan(tracer, "dropped", true);
-      AgentSpan retained = newLlmObsSpan(tracer, "retained", false);
-      String largeInput = String.join("", Collections.nCopies(600, "x"));
-      first.setTag(
-          "_ml_obs_tag.input",
-          Collections.singletonList(LLMObs.LLMMessage.from("user", largeInput)));
-      dropped.setTag(
-          "_ml_obs_tag.input",
-          Collections.singletonList(LLMObs.LLMMessage.from("user", largeInput)));
-      retained.setTag(
-          "_ml_obs_tag.input",
-          Collections.singletonList(LLMObs.LLMMessage.from("user", largeInput)));
-
-      LLMObsSpanMapper mapper = new LLMObsSpanMapper();
-      CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
-      MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, sink));
-
-      assertTrue(packer.format(Collections.singletonList((DDSpan) first), mapper));
-      assertTrue(packer.format(Arrays.asList((DDSpan) dropped, (DDSpan) retained), mapper));
-      assertEquals(1, sink.accepts);
-      assertEquals(3, calls.get());
-      assertEquals(
-          3,
-          LLMObsMetricCollector.get().drain().stream()
-              .filter(
-                  metric ->
-                      LLMObsMetricCollector.USER_PROCESSOR_CALLED_METRIC.equals(metric.metricName))
-              .count());
-      tracer.close();
-    } finally {
-      LLMObs.deregisterProcessor();
-      LLMObsMetricCollector.get().drain();
+        try {
+            CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+            AgentSpan first = newLlmObsSpan(tracer, "first", false);
+            AgentSpan dropped = newLlmObsSpan(tracer, "dropped", true);
+            AgentSpan retained = newLlmObsSpan(tracer, "retained", false);
+            String largeInput = String.join("", Collections.nCopies(600, "x"));
+            first.setTag("_ml_obs_tag.input", Collections.singletonList(LLMObs.LLMMessage.from("user", largeInput)));
+            dropped.setTag("_ml_obs_tag.input", Collections.singletonList(LLMObs.LLMMessage.from("user", largeInput)));
+            retained.setTag("_ml_obs_tag.input", Collections.singletonList(LLMObs.LLMMessage.from("user", largeInput)));
+
+            LLMObsSpanMapper mapper = new LLMObsSpanMapper();
+            CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
+            MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, sink));
+
+            assertTrue(packer.format(Collections.singletonList((DDSpan) first), mapper));
+            assertTrue(packer.format(Arrays.asList((DDSpan) dropped, (DDSpan) retained), mapper));
+            assertEquals(1, sink.accepts);
+            assertEquals(3, calls.get());
+            assertEquals(
+                    3,
+                    LLMObsMetricCollector.get().drain().stream()
+                            .filter(metric ->
+                                    LLMObsMetricCollector.USER_PROCESSOR_CALLED_METRIC.equals(metric.metricName))
+                            .count());
+            tracer.close();
+        } finally {
+            LLMObs.deregisterProcessor();
+            LLMObsMetricCollector.get().drain();
+        }
+    }
+
+    @Test
+    void testLLMObsSpanProcessorInputAndOutputRejectNull() {
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+        LLMObsSpanDataAdapter adapter = new LLMObsSpanDataAdapter((DDSpan) newLlmObsSpan(tracer, "processed", false));
+
+        assertThrows(NullPointerException.class, () -> adapter.setInput(null));
+        assertThrows(NullPointerException.class, () -> adapter.setOutput(null));
+        tracer.close();
+    }
+
+    @Test
+    void testLLMObsSpanMapperSerializesNestedMetadata() throws Exception {
+        LLMObsSpanMapper mapper = new LLMObsSpanMapper();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        // The agent manifest reaches the mapper nested inside the metadata tag, under the reserved
+        // _dd namespace (see DDLLMObsSpan#annotateAgentManifest), and must survive as-is.
+        Map<String, Object> modelSettings = new LinkedHashMap<>();
+        modelSettings.put("temperature", 0.7);
+        Map<String, Object> tool = new LinkedHashMap<>();
+        tool.put("name", "get_weather");
+        tool.put("description", "Look up the weather.");
+
+        Map<String, Object> manifest = new LinkedHashMap<>();
+        manifest.put("name", "travel_desk");
+        manifest.put("instructions", "Book travel.");
+        manifest.put("model", "gpt-4o");
+        manifest.put("framework", "manual");
+        manifest.put("model_settings", modelSettings);
+        manifest.put("tools", Collections.singletonList(tool));
+
+        Map<String, Object> dd = new LinkedHashMap<>();
+        dd.put("agent_manifest", manifest);
+        Map<String, Object> metadataTag = new LinkedHashMap<>();
+        metadataTag.put("tenant", "acme");
+        metadataTag.put("_dd", dd);
+
+        AgentSpan agentSpan = tracer.buildSpan("datadog", "my-agent")
+                .withTag("_ml_obs_tag.span.kind", "agent")
+                .withTag("_ml_obs_tag.metadata", metadataTag)
+                .start();
+        agentSpan.setSpanType(InternalSpanTypes.LLMOBS);
+        agentSpan.finish();
+
+        Map<String, Object> spanData = serializeSingleSpan(mapper, agentSpan);
+        Map<String, Object> meta = (Map<String, Object>) spanData.get("meta");
+
+        // Never a top-level meta key, and never leaked into the tags array.
+        assertFalse(meta.containsKey("agent_manifest"));
+        List<String> tags = (List<String>) spanData.get("tags");
+        assertFalse(tags.stream().anyMatch(t -> t.contains("agent_manifest")));
+
+        Map<String, Object> metadata = (Map<String, Object>) meta.get("metadata");
+        assertEquals("acme", metadata.get("tenant"));
+        Map<String, Object> gotDd = (Map<String, Object>) metadata.get("_dd");
+        Map<String, Object> gotManifest = (Map<String, Object>) gotDd.get("agent_manifest");
+        assertEquals("travel_desk", gotManifest.get("name"));
+        assertEquals("Book travel.", gotManifest.get("instructions"));
+        assertEquals("gpt-4o", gotManifest.get("model"));
+        assertEquals("manual", gotManifest.get("framework"));
+        assertEquals(modelSettings, gotManifest.get("model_settings"));
+        assertInstanceOf(Double.class, ((Map<?, ?>) gotManifest.get("model_settings")).get("temperature"));
+        assertEquals(Collections.singletonList(tool), gotManifest.get("tools"));
+
+        tracer.close();
+    }
+
+    private static AgentSpan newLlmObsSpan(CoreTracer tracer, String name, boolean drop) {
+        AgentSpan span = tracer.buildSpan("datadog", name)
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
+                .withTag("_ml_obs_tag.drop", drop)
+                .start();
+        span.setSpanType(InternalSpanTypes.LLMOBS);
+        span.finish();
+        return span;
     }
-  }
-
-  @Test
-  void testLLMObsSpanProcessorInputAndOutputRejectNull() {
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-    LLMObsSpanDataAdapter adapter =
-        new LLMObsSpanDataAdapter((DDSpan) newLlmObsSpan(tracer, "processed", false));
-
-    assertThrows(NullPointerException.class, () -> adapter.setInput(null));
-    assertThrows(NullPointerException.class, () -> adapter.setOutput(null));
-    tracer.close();
-  }
-
-  @Test
-  void testLLMObsSpanMapperSerializesNestedMetadata() throws Exception {
-    LLMObsSpanMapper mapper = new LLMObsSpanMapper();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    // The agent manifest reaches the mapper nested inside the metadata tag, under the reserved
-    // _dd namespace (see DDLLMObsSpan#annotateAgentManifest), and must survive as-is.
-    Map<String, Object> modelSettings = new LinkedHashMap<>();
-    modelSettings.put("temperature", 0.7);
-    Map<String, Object> tool = new LinkedHashMap<>();
-    tool.put("name", "get_weather");
-    tool.put("description", "Look up the weather.");
-
-    Map<String, Object> manifest = new LinkedHashMap<>();
-    manifest.put("name", "travel_desk");
-    manifest.put("instructions", "Book travel.");
-    manifest.put("model", "gpt-4o");
-    manifest.put("framework", "manual");
-    manifest.put("model_settings", modelSettings);
-    manifest.put("tools", Collections.singletonList(tool));
-
-    Map<String, Object> dd = new LinkedHashMap<>();
-    dd.put("agent_manifest", manifest);
-    Map<String, Object> metadataTag = new LinkedHashMap<>();
-    metadataTag.put("tenant", "acme");
-    metadataTag.put("_dd", dd);
-
-    AgentSpan agentSpan =
-        tracer
-            .buildSpan("datadog", "my-agent")
-            .withTag("_ml_obs_tag.span.kind", "agent")
-            .withTag("_ml_obs_tag.metadata", metadataTag)
-            .start();
-    agentSpan.setSpanType(InternalSpanTypes.LLMOBS);
-    agentSpan.finish();
-
-    Map<String, Object> spanData = serializeSingleSpan(mapper, agentSpan);
-    Map<String, Object> meta = (Map<String, Object>) spanData.get("meta");
-
-    // Never a top-level meta key, and never leaked into the tags array.
-    assertFalse(meta.containsKey("agent_manifest"));
-    List<String> tags = (List<String>) spanData.get("tags");
-    assertFalse(tags.stream().anyMatch(t -> t.contains("agent_manifest")));
-
-    Map<String, Object> metadata = (Map<String, Object>) meta.get("metadata");
-    assertEquals("acme", metadata.get("tenant"));
-    Map<String, Object> gotDd = (Map<String, Object>) metadata.get("_dd");
-    Map<String, Object> gotManifest = (Map<String, Object>) gotDd.get("agent_manifest");
-    assertEquals("travel_desk", gotManifest.get("name"));
-    assertEquals("Book travel.", gotManifest.get("instructions"));
-    assertEquals("gpt-4o", gotManifest.get("model"));
-    assertEquals("manual", gotManifest.get("framework"));
-    assertEquals(modelSettings, gotManifest.get("model_settings"));
-    assertInstanceOf(
-        Double.class, ((Map<?, ?>) gotManifest.get("model_settings")).get("temperature"));
-    assertEquals(Collections.singletonList(tool), gotManifest.get("tools"));
-
-    tracer.close();
-  }
-
-  private static AgentSpan newLlmObsSpan(CoreTracer tracer, String name, boolean drop) {
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", name)
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
-            .withTag("_ml_obs_tag.drop", drop)
-            .start();
-    span.setSpanType(InternalSpanTypes.LLMOBS);
-    span.finish();
-    return span;
-  }
-
-  private static List<Map<String, Object>> serialize(List<DDSpan> trace, LLMObsSpanMapper mapper)
-      throws Exception {
-    CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(16 * 1024, sink));
-
-    packer.format(trace, mapper);
-    packer.flush();
-
-    assertNotNull(sink.captured);
-    datadog.trace.common.writer.Payload payload = mapper.newPayload();
-    payload.withBody(trace.size(), sink.captured);
-    Map<String, Object> result = objectMapper.readValue(writeTo(payload), Map.class);
-    return (List<Map<String, Object>>) result.get("spans");
-  }
-
-  @Test
-  void testAgentAttributionEmitsExplicitNullNameWhenAbsent() throws Exception {
-    LLMObsSpanMapper mapper = new LLMObsSpanMapper();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    // Only pagent_span_id is set — pagent_name tag is absent
-    AgentSpan agentSpan =
-        tracer
-            .buildSpan("datadog", "my.agent")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_AGENT_SPAN_KIND)
-            .withTag("_ml_obs_tag.pagent_span_id", "abc123")
-            .start();
-    agentSpan.setSpanType(InternalSpanTypes.LLMOBS);
-    agentSpan.finish();
-
-    Map<String, Object> spanData = serializeSingleSpan(mapper, agentSpan);
-    Map<String, Object> meta = (Map<String, Object>) spanData.get("meta");
-
-    assertTrue(meta.containsKey("agent_attribution"));
-    Map<String, Object> attribution = (Map<String, Object>) meta.get("agent_attribution");
-    assertEquals("abc123", attribution.get("pagent_span_id"));
-    // pagent_name key must be present with an explicit null (not absent)
-    assertTrue(attribution.containsKey("pagent_name"));
-    assertNull(attribution.get("pagent_name"));
-
-    tracer.close();
-  }
-
-  @Test
-  void testNoAgentAttributionBlockWhenParentAgentSpanIdAbsent() throws Exception {
-    LLMObsSpanMapper mapper = new LLMObsSpanMapper();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    AgentSpan llmSpan =
-        tracer
-            .buildSpan("datadog", "openai.chat")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
-            .start();
-    llmSpan.setSpanType(InternalSpanTypes.LLMOBS);
-    llmSpan.finish();
-
-    Map<String, Object> spanData = serializeSingleSpan(mapper, llmSpan);
-    Map<String, Object> meta = (Map<String, Object>) spanData.get("meta");
-
-    assertFalse(meta.containsKey("agent_attribution"));
-
-    tracer.close();
-  }
-
-  private static byte[] writeTo(datadog.trace.common.writer.Payload payload) throws IOException {
-    ByteArrayOutputStream channel = new ByteArrayOutputStream();
-    payload.writeTo(
-        new WritableByteChannel() {
-          @Override
-          public int write(ByteBuffer src) throws IOException {
-            byte[] bytes = new byte[src.remaining()];
-            src.get(bytes);
-            channel.write(bytes);
-            return bytes.length;
-          }
-
-          @Override
-          public boolean isOpen() {
-            return true;
-          }
-
-          @Override
-          public void close() throws IOException {}
+
+    private static List<Map<String, Object>> serialize(List<DDSpan> trace, LLMObsSpanMapper mapper) throws Exception {
+        CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(16 * 1024, sink));
+
+        packer.format(trace, mapper);
+        packer.flush();
+
+        assertNotNull(sink.captured);
+        datadog.trace.common.writer.Payload payload = mapper.newPayload();
+        payload.withBody(trace.size(), sink.captured);
+        Map<String, Object> result = objectMapper.readValue(writeTo(payload), Map.class);
+        return (List<Map<String, Object>>) result.get("spans");
+    }
+
+    @Test
+    void testAgentAttributionEmitsExplicitNullNameWhenAbsent() throws Exception {
+        LLMObsSpanMapper mapper = new LLMObsSpanMapper();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        // Only pagent_span_id is set — pagent_name tag is absent
+        AgentSpan agentSpan = tracer.buildSpan("datadog", "my.agent")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_AGENT_SPAN_KIND)
+                .withTag("_ml_obs_tag.pagent_span_id", "abc123")
+                .start();
+        agentSpan.setSpanType(InternalSpanTypes.LLMOBS);
+        agentSpan.finish();
+
+        Map<String, Object> spanData = serializeSingleSpan(mapper, agentSpan);
+        Map<String, Object> meta = (Map<String, Object>) spanData.get("meta");
+
+        assertTrue(meta.containsKey("agent_attribution"));
+        Map<String, Object> attribution = (Map<String, Object>) meta.get("agent_attribution");
+        assertEquals("abc123", attribution.get("pagent_span_id"));
+        // pagent_name key must be present with an explicit null (not absent)
+        assertTrue(attribution.containsKey("pagent_name"));
+        assertNull(attribution.get("pagent_name"));
+
+        tracer.close();
+    }
+
+    @Test
+    void testNoAgentAttributionBlockWhenParentAgentSpanIdAbsent() throws Exception {
+        LLMObsSpanMapper mapper = new LLMObsSpanMapper();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        AgentSpan llmSpan = tracer.buildSpan("datadog", "openai.chat")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
+                .start();
+        llmSpan.setSpanType(InternalSpanTypes.LLMOBS);
+        llmSpan.finish();
+
+        Map<String, Object> spanData = serializeSingleSpan(mapper, llmSpan);
+        Map<String, Object> meta = (Map<String, Object>) spanData.get("meta");
+
+        assertFalse(meta.containsKey("agent_attribution"));
+
+        tracer.close();
+    }
+
+    private static byte[] writeTo(datadog.trace.common.writer.Payload payload) throws IOException {
+        ByteArrayOutputStream channel = new ByteArrayOutputStream();
+        payload.writeTo(new WritableByteChannel() {
+            @Override
+            public int write(ByteBuffer src) throws IOException {
+                byte[] bytes = new byte[src.remaining()];
+                src.get(bytes);
+                channel.write(bytes);
+                return bytes.length;
+            }
+
+            @Override
+            public boolean isOpen() {
+                return true;
+            }
+
+            @Override
+            public void close() throws IOException {}
         });
-    return channel.toByteArray();
-  }
-
-  private static Map<String, Object> serializeSingleSpan(LLMObsSpanMapper mapper, AgentSpan span)
-      throws IOException {
-    CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(16 * 1024, sink));
-    packer.format(Collections.singletonList((DDSpan) span), mapper);
-    packer.flush();
-
-    assertNotNull(sink.captured);
-    datadog.trace.common.writer.Payload payload = mapper.newPayload();
-    payload.withBody(1, sink.captured);
-    Map<String, Object> result = objectMapper.readValue(writeTo(payload), Map.class);
-    List<Map<String, Object>> spans = (List<Map<String, Object>>) result.get("spans");
-    return spans.get(0);
-  }
-
-  @Test
-  void testSamplingFieldsDefaultToRetainWhenTheSpanCarriesNoDecision() throws Exception {
-    LLMObsSpanMapper mapper = new LLMObsSpanMapper();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    // Both span producers stamp these tags, so this exercises the mapper's fallback branch.
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", "chat-completion")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
-            .start();
-    span.setSpanType(InternalSpanTypes.LLMOBS);
-    span.finish();
-
-    Map<String, Object> spanData = serializeSingleSpan(mapper, span);
-    Map<String, Object> dd = (Map<String, Object>) spanData.get("_dd");
-    assertEquals(5, dd.size());
-    assertEquals("1", dd.get("sampling_decision"));
-    assertEquals("1", dd.get("sample_rate"));
-
-    tracer.close();
-  }
-
-  @Test
-  void testSamplingFieldsAreEmittedAndDoNotLeakIntoTags() throws Exception {
-    LLMObsSpanMapper mapper = new LLMObsSpanMapper();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", "chat-completion")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
-            .withTag("_ml_obs_tag.sampling_decision", "0")
-            .withTag("_ml_obs_tag.sample_rate", "0.1")
-            .start();
-    span.setSpanType(InternalSpanTypes.LLMOBS);
-    span.finish();
-
-    Map<String, Object> spanData = serializeSingleSpan(mapper, span);
-    Map<String, Object> dd = (Map<String, Object>) spanData.get("_dd");
-    assertEquals(5, dd.size());
-    assertEquals("0", dd.get("sampling_decision"));
-    assertEquals("0.1", dd.get("sample_rate"));
-
-    // The mapper writes these as dedicated _dd fields and skips them elsewhere, so they must not
-    // also appear in tags[].
-    List<String> tags = (List<String>) spanData.get("tags");
-    assertFalse(tags.stream().anyMatch(tag -> tag.startsWith("sampling_decision:")));
-    assertFalse(tags.stream().anyMatch(tag -> tag.startsWith("sample_rate:")));
-    assertFalse(tags.stream().anyMatch(tag -> tag.startsWith("parent_id:")));
-    assertFalse(tags.stream().anyMatch(tag -> tag.startsWith("span.kind:")));
-
-    tracer.close();
-  }
-
-  @Test
-  void testTopLevelFieldsSurviveASerializationRetry() throws Exception {
-    LLMObsSpanMapper mapper = new LLMObsSpanMapper();
-    CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
-
-    AgentSpan span =
-        tracer
-            .buildSpan("datadog", "chat-completion")
-            .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
-            .withTag("_ml_obs_tag.parent_id", "9876543210")
-            .withTag("_ml_obs_tag.sampling_decision", "0")
-            .withTag("_ml_obs_tag.sample_rate", "0.1")
-            .start();
-    span.setSpanType(InternalSpanTypes.LLMOBS);
-    span.finish();
-    List<DDSpan> trace = Collections.singletonList((DDSpan) span);
-
-    // On a BufferOverflowException, MsgPackWriter.format discards the partial write and re-invokes
-    // map(..., retry = true) on the same span instances. Model that contract directly: an attempt
-    // whose output is thrown away, then the retry. A mapper that consumed tags off the span while
-    // writing would emit different — and wrong — values the second time: a dropped span would
-    // come back as retained, and parent_id and span.kind would be lost.
-    mapWithRetryFlag(mapper, trace, false);
-    mapper.reset();
-    Map<String, Object> retried = mapWithRetryFlag(mapper, trace, true);
-
-    Map<String, Object> dd = (Map<String, Object>) retried.get("_dd");
-    assertEquals("0", dd.get("sampling_decision"));
-    assertEquals("0.1", dd.get("sample_rate"));
-    assertEquals("9876543210", retried.get("parent_id"));
-    assertEquals("llm", ((Map<String, Object>) retried.get("meta")).get("span.kind"));
-
-    tracer.close();
-  }
-
-  /**
-   * Invokes {@link LLMObsSpanMapper#map(List, datadog.communication.serialization.Writable,
-   * boolean)} directly, bypassing {@code MsgPackWriter.format} so the retry flag can be set
-   * explicitly, and returns the single serialized span.
-   */
-  private static Map<String, Object> mapWithRetryFlag(
-      LLMObsSpanMapper mapper, List<DDSpan> trace, boolean retry) throws IOException {
-    CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
-    FlushingBuffer buffer = new FlushingBuffer(16 * 1024, sink);
-    MsgPackWriter packer = new MsgPackWriter(buffer);
-    mapper.map(trace, packer, retry);
-    // format() marks the message complete after a successful map; flush() emits nothing without it.
-    buffer.mark();
-    packer.flush();
-
-    assertNotNull(sink.captured);
-    datadog.trace.common.writer.Payload payload = mapper.newPayload();
-    payload.withBody(trace.size(), sink.captured);
-    Map<String, Object> result = objectMapper.readValue(writeTo(payload), Map.class);
-    return ((List<Map<String, Object>>) result.get("spans")).get(0);
-  }
-
-  static class CapturingByteBufferConsumer implements ByteBufferConsumer {
-
-    ByteBuffer captured;
-    int accepts;
-
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {
-      captured = buffer;
-      accepts++;
+        return channel.toByteArray();
+    }
+
+    private static Map<String, Object> serializeSingleSpan(LLMObsSpanMapper mapper, AgentSpan span) throws IOException {
+        CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(16 * 1024, sink));
+        packer.format(Collections.singletonList((DDSpan) span), mapper);
+        packer.flush();
+
+        assertNotNull(sink.captured);
+        datadog.trace.common.writer.Payload payload = mapper.newPayload();
+        payload.withBody(1, sink.captured);
+        Map<String, Object> result = objectMapper.readValue(writeTo(payload), Map.class);
+        List<Map<String, Object>> spans = (List<Map<String, Object>>) result.get("spans");
+        return spans.get(0);
+    }
+
+    @Test
+    void testSamplingFieldsDefaultToRetainWhenTheSpanCarriesNoDecision() throws Exception {
+        LLMObsSpanMapper mapper = new LLMObsSpanMapper();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        // Both span producers stamp these tags, so this exercises the mapper's fallback branch.
+        AgentSpan span = tracer.buildSpan("datadog", "chat-completion")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
+                .start();
+        span.setSpanType(InternalSpanTypes.LLMOBS);
+        span.finish();
+
+        Map<String, Object> spanData = serializeSingleSpan(mapper, span);
+        Map<String, Object> dd = (Map<String, Object>) spanData.get("_dd");
+        assertEquals(5, dd.size());
+        assertEquals("1", dd.get("sampling_decision"));
+        assertEquals("1", dd.get("sample_rate"));
+
+        tracer.close();
+    }
+
+    @Test
+    void testSamplingFieldsAreEmittedAndDoNotLeakIntoTags() throws Exception {
+        LLMObsSpanMapper mapper = new LLMObsSpanMapper();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        AgentSpan span = tracer.buildSpan("datadog", "chat-completion")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
+                .withTag("_ml_obs_tag.sampling_decision", "0")
+                .withTag("_ml_obs_tag.sample_rate", "0.1")
+                .start();
+        span.setSpanType(InternalSpanTypes.LLMOBS);
+        span.finish();
+
+        Map<String, Object> spanData = serializeSingleSpan(mapper, span);
+        Map<String, Object> dd = (Map<String, Object>) spanData.get("_dd");
+        assertEquals(5, dd.size());
+        assertEquals("0", dd.get("sampling_decision"));
+        assertEquals("0.1", dd.get("sample_rate"));
+
+        // The mapper writes these as dedicated _dd fields and skips them elsewhere, so they must not
+        // also appear in tags[].
+        List<String> tags = (List<String>) spanData.get("tags");
+        assertFalse(tags.stream().anyMatch(tag -> tag.startsWith("sampling_decision:")));
+        assertFalse(tags.stream().anyMatch(tag -> tag.startsWith("sample_rate:")));
+        assertFalse(tags.stream().anyMatch(tag -> tag.startsWith("parent_id:")));
+        assertFalse(tags.stream().anyMatch(tag -> tag.startsWith("span.kind:")));
+
+        tracer.close();
+    }
+
+    @Test
+    void testTopLevelFieldsSurviveASerializationRetry() throws Exception {
+        LLMObsSpanMapper mapper = new LLMObsSpanMapper();
+        CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build();
+
+        AgentSpan span = tracer.buildSpan("datadog", "chat-completion")
+                .withTag("_ml_obs_tag.span.kind", Tags.LLMOBS_LLM_SPAN_KIND)
+                .withTag("_ml_obs_tag.parent_id", "9876543210")
+                .withTag("_ml_obs_tag.sampling_decision", "0")
+                .withTag("_ml_obs_tag.sample_rate", "0.1")
+                .start();
+        span.setSpanType(InternalSpanTypes.LLMOBS);
+        span.finish();
+        List<DDSpan> trace = Collections.singletonList((DDSpan) span);
+
+        // On a BufferOverflowException, MsgPackWriter.format discards the partial write and re-invokes
+        // map(..., retry = true) on the same span instances. Model that contract directly: an attempt
+        // whose output is thrown away, then the retry. A mapper that consumed tags off the span while
+        // writing would emit different — and wrong — values the second time: a dropped span would
+        // come back as retained, and parent_id and span.kind would be lost.
+        mapWithRetryFlag(mapper, trace, false);
+        mapper.reset();
+        Map<String, Object> retried = mapWithRetryFlag(mapper, trace, true);
+
+        Map<String, Object> dd = (Map<String, Object>) retried.get("_dd");
+        assertEquals("0", dd.get("sampling_decision"));
+        assertEquals("0.1", dd.get("sample_rate"));
+        assertEquals("9876543210", retried.get("parent_id"));
+        assertEquals("llm", ((Map<String, Object>) retried.get("meta")).get("span.kind"));
+
+        tracer.close();
+    }
+
+    /**
+     * Invokes {@link LLMObsSpanMapper#map(List, datadog.communication.serialization.Writable,
+     * boolean)} directly, bypassing {@code MsgPackWriter.format} so the retry flag can be set
+     * explicitly, and returns the single serialized span.
+     */
+    private static Map<String, Object> mapWithRetryFlag(LLMObsSpanMapper mapper, List<DDSpan> trace, boolean retry)
+            throws IOException {
+        CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer();
+        FlushingBuffer buffer = new FlushingBuffer(16 * 1024, sink);
+        MsgPackWriter packer = new MsgPackWriter(buffer);
+        mapper.map(trace, packer, retry);
+        // format() marks the message complete after a successful map; flush() emits nothing without it.
+        buffer.mark();
+        packer.flush();
+
+        assertNotNull(sink.captured);
+        datadog.trace.common.writer.Payload payload = mapper.newPayload();
+        payload.withBody(trace.size(), sink.captured);
+        Map<String, Object> result = objectMapper.readValue(writeTo(payload), Map.class);
+        return ((List<Map<String, Object>>) result.get("spans")).get(0);
+    }
+
+    static class CapturingByteBufferConsumer implements ByteBufferConsumer {
+
+        ByteBuffer captured;
+        int accepts;
+
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {
+            captured = buffer;
+            accepts++;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/test/java/datadog/trace/payloadtags/RedactionRulesExtractor.java b/dd-trace-core/src/test/java/datadog/trace/payloadtags/RedactionRulesExtractor.java
index a2715a05216..cef15a2a185 100644
--- a/dd-trace-core/src/test/java/datadog/trace/payloadtags/RedactionRulesExtractor.java
+++ b/dd-trace-core/src/test/java/datadog/trace/payloadtags/RedactionRulesExtractor.java
@@ -19,135 +19,131 @@
  */
 public class RedactionRulesExtractor {
 
-  public static void main(String[] args) throws IOException {
-    if (args.length == 0) {
-      System.out.println("Usage: RedactionRulesExtractor <service-2.json>");
-      return;
+    public static void main(String[] args) throws IOException {
+        if (args.length == 0) {
+            System.out.println("Usage: RedactionRulesExtractor <service-2.json>");
+            return;
+        }
+
+        String service2json = args[0];
+
+        File jsonFile = new File(service2json);
+
+        if (!jsonFile.exists()) {
+            System.out.println("File not found: " + service2json);
+            return;
+        }
+
+        String json = new String(Files.readAllBytes(jsonFile.toPath()));
+
+        JsonAdapter<Map<String, Object>> adapter =
+                new Moshi.Builder().build().adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
+
+        Map<String, Object> map = adapter.fromJson(json);
+
+        if (!"2.0".equals(map.get("version"))) {
+            System.out.println("$.version != 2.0");
+        }
+
+        Map<String, Object> allShapes = (Map<String, Object>) map.get("shapes");
+        Map<String, Object> operations = (Map<String, Object>) map.get("operations");
+
+        Set<String> requestSensitivePaths = new LinkedHashSet<>();
+        Set<String> responseSensitivePaths = new LinkedHashSet<>();
+        Set<String> errorsSensitivePaths = new LinkedHashSet<>();
+
+        // traverse operations and for each check its input/output allShapes
+        for (Map.Entry<String, Object> operation : operations.entrySet()) {
+            String operationName = operation.getKey();
+            Map<String, Object> operationObject = (Map<String, Object>) operation.getValue();
+
+            // input shape
+            Map<String, Object> inputObject = (Map<String, Object>) operationObject.get("input");
+            if (inputObject != null) {
+                String inputShape = (String) inputObject.get("shape");
+                collectSensitivePaths(
+                        operationName,
+                        (Map<String, Object>) allShapes.get(inputShape),
+                        allShapes,
+                        "$",
+                        requestSensitivePaths);
+            }
+
+            // output shape
+            Map<String, Object> outputObject = (Map<String, Object>) operationObject.get("output");
+            if (outputObject != null) {
+                String outputShape = (String) outputObject.get("shape");
+                collectSensitivePaths(
+                        operationName,
+                        (Map<String, Object>) allShapes.get(outputShape),
+                        allShapes,
+                        "$",
+                        responseSensitivePaths);
+            }
+
+            List<Map<String, Object>> errors =
+                    (List<Map<String, Object>>) operationObject.getOrDefault("errors", Collections.emptyList());
+            for (Map<String, Object> error : errors) {
+                String errorShape = (String) error.get("shape");
+                collectSensitivePaths(
+                        operationName,
+                        (Map<String, Object>) allShapes.get(errorShape),
+                        allShapes,
+                        "$",
+                        errorsSensitivePaths);
+            }
+        }
+
+        LinkedHashSet<String> commonSensitivePaths = new LinkedHashSet<>();
+        commonSensitivePaths.addAll(requestSensitivePaths);
+        commonSensitivePaths.retainAll(responseSensitivePaths);
+        requestSensitivePaths.removeAll(commonSensitivePaths);
+        responseSensitivePaths.removeAll(commonSensitivePaths);
+
+        System.out.println("\nCommon sensitive paths:\n" + String.join("\n", commonSensitivePaths));
+        System.out.println("\nRequest sensitive paths:\n" + String.join("\n", requestSensitivePaths));
+        System.out.println("\nResponse sensitive paths:\n" + String.join("\n", responseSensitivePaths));
+        System.out.println("\nErrors sensitive paths:\n" + String.join("\n", errorsSensitivePaths));
+        Map<String, Object> metadata = (Map<String, Object>) map.get("metadata");
+        System.out.println("serviceId: " + metadata.get("serviceId"));
+        System.out.println("uid: " + metadata.get("uid"));
     }
 
-    String service2json = args[0];
-
-    File jsonFile = new File(service2json);
-
-    if (!jsonFile.exists()) {
-      System.out.println("File not found: " + service2json);
-      return;
-    }
-
-    String json = new String(Files.readAllBytes(jsonFile.toPath()));
-
-    JsonAdapter<Map<String, Object>> adapter =
-        new Moshi.Builder()
-            .build()
-            .adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
-
-    Map<String, Object> map = adapter.fromJson(json);
-
-    if (!"2.0".equals(map.get("version"))) {
-      System.out.println("$.version != 2.0");
-    }
-
-    Map<String, Object> allShapes = (Map<String, Object>) map.get("shapes");
-    Map<String, Object> operations = (Map<String, Object>) map.get("operations");
-
-    Set<String> requestSensitivePaths = new LinkedHashSet<>();
-    Set<String> responseSensitivePaths = new LinkedHashSet<>();
-    Set<String> errorsSensitivePaths = new LinkedHashSet<>();
-
-    // traverse operations and for each check its input/output allShapes
-    for (Map.Entry<String, Object> operation : operations.entrySet()) {
-      String operationName = operation.getKey();
-      Map<String, Object> operationObject = (Map<String, Object>) operation.getValue();
-
-      // input shape
-      Map<String, Object> inputObject = (Map<String, Object>) operationObject.get("input");
-      if (inputObject != null) {
-        String inputShape = (String) inputObject.get("shape");
-        collectSensitivePaths(
-            operationName,
-            (Map<String, Object>) allShapes.get(inputShape),
-            allShapes,
-            "$",
-            requestSensitivePaths);
-      }
-
-      // output shape
-      Map<String, Object> outputObject = (Map<String, Object>) operationObject.get("output");
-      if (outputObject != null) {
-        String outputShape = (String) outputObject.get("shape");
-        collectSensitivePaths(
-            operationName,
-            (Map<String, Object>) allShapes.get(outputShape),
-            allShapes,
-            "$",
-            responseSensitivePaths);
-      }
-
-      List<Map<String, Object>> errors =
-          (List<Map<String, Object>>)
-              operationObject.getOrDefault("errors", Collections.emptyList());
-      for (Map<String, Object> error : errors) {
-        String errorShape = (String) error.get("shape");
-        collectSensitivePaths(
-            operationName,
-            (Map<String, Object>) allShapes.get(errorShape),
-            allShapes,
-            "$",
-            errorsSensitivePaths);
-      }
-    }
-
-    LinkedHashSet<String> commonSensitivePaths = new LinkedHashSet<>();
-    commonSensitivePaths.addAll(requestSensitivePaths);
-    commonSensitivePaths.retainAll(responseSensitivePaths);
-    requestSensitivePaths.removeAll(commonSensitivePaths);
-    responseSensitivePaths.removeAll(commonSensitivePaths);
-
-    System.out.println("\nCommon sensitive paths:\n" + String.join("\n", commonSensitivePaths));
-    System.out.println("\nRequest sensitive paths:\n" + String.join("\n", requestSensitivePaths));
-    System.out.println("\nResponse sensitive paths:\n" + String.join("\n", responseSensitivePaths));
-    System.out.println("\nErrors sensitive paths:\n" + String.join("\n", errorsSensitivePaths));
-    Map<String, Object> metadata = (Map<String, Object>) map.get("metadata");
-    System.out.println("serviceId: " + metadata.get("serviceId"));
-    System.out.println("uid: " + metadata.get("uid"));
-  }
-
-  private static void collectSensitivePaths(
-      String operationName,
-      Map<String, Object> shape,
-      Map<String, Object> allShapes,
-      String path,
-      Set<String> sensitivePathsOut) {
-    if ((boolean) shape.getOrDefault("sensitive", false)) {
-      sensitivePathsOut.add(path);
-      return;
-    }
-
-    Object shapeType = shape.get("type");
-
-    if ("structure".equals(shapeType)) {
-      Map<String, Object> members =
-          (Map<String, Object>) shape.getOrDefault("members", Collections.emptyMap());
-      for (Map.Entry<String, Object> member : members.entrySet()) {
-        String memberName = member.getKey();
-        Map<String, Object> memberObject = (Map<String, Object>) member.getValue();
-        String memberShape = (String) memberObject.get("shape");
-        collectSensitivePaths(
-            operationName,
-            (Map<String, Object>) allShapes.get(memberShape),
-            allShapes,
-            path + "." + memberName,
-            sensitivePathsOut);
-      }
-    } else if ("list".equals(shapeType)) {
-      Map<String, Object> member = (Map<String, Object>) shape.get("member");
-      String memberShape = (String) member.get("shape");
-      collectSensitivePaths(
-          operationName,
-          (Map<String, Object>) allShapes.get(memberShape),
-          allShapes,
-          path + "[*]",
-          sensitivePathsOut);
+    private static void collectSensitivePaths(
+            String operationName,
+            Map<String, Object> shape,
+            Map<String, Object> allShapes,
+            String path,
+            Set<String> sensitivePathsOut) {
+        if ((boolean) shape.getOrDefault("sensitive", false)) {
+            sensitivePathsOut.add(path);
+            return;
+        }
+
+        Object shapeType = shape.get("type");
+
+        if ("structure".equals(shapeType)) {
+            Map<String, Object> members = (Map<String, Object>) shape.getOrDefault("members", Collections.emptyMap());
+            for (Map.Entry<String, Object> member : members.entrySet()) {
+                String memberName = member.getKey();
+                Map<String, Object> memberObject = (Map<String, Object>) member.getValue();
+                String memberShape = (String) memberObject.get("shape");
+                collectSensitivePaths(
+                        operationName,
+                        (Map<String, Object>) allShapes.get(memberShape),
+                        allShapes,
+                        path + "." + memberName,
+                        sensitivePathsOut);
+            }
+        } else if ("list".equals(shapeType)) {
+            Map<String, Object> member = (Map<String, Object>) shape.get("member");
+            String memberShape = (String) member.get("shape");
+            collectSensitivePaths(
+                    operationName,
+                    (Map<String, Object>) allShapes.get(memberShape),
+                    allShapes,
+                    path + "[*]",
+                    sensitivePathsOut);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/traceAgentTest/java/AbstractTraceAgentTest.java b/dd-trace-core/src/traceAgentTest/java/AbstractTraceAgentTest.java
index d7885d6b0dd..ce5cb195e26 100644
--- a/dd-trace-core/src/traceAgentTest/java/AbstractTraceAgentTest.java
+++ b/dd-trace-core/src/traceAgentTest/java/AbstractTraceAgentTest.java
@@ -16,62 +16,60 @@
 
 abstract class AbstractTraceAgentTest extends DDJavaSpecification {
 
-  private static GenericContainer<?> agentContainer;
+    private static GenericContainer<?> agentContainer;
 
-  @BeforeAll
-  static void setupSpec() {
-    // CI will provide us with agent container running along side our build.
-    // When building locally, however, we need to take matters into our own hands
-    // and we use 'testcontainers' for this.
-    if (!"true".equals(System.getenv("CI"))) {
-      Map<String, String> env = new HashMap<>();
-      env.put("DD_APM_ENABLED", "true");
-      env.put("DD_BIND_HOST", "0.0.0.0");
-      env.put("DD_API_KEY", "invalid_key_but_this_is_fine");
-      env.put("DD_HOSTNAME", "doesnotexist");
-      env.put("DD_LOGS_STDOUT", "yes");
-      agentContainer =
-          new GenericContainer<>(
-                  DockerImageName.parse(System.getProperty("test.datadog.agent.image")))
-              .withEnv(env)
-              .withExposedPorts(DEFAULT_TRACE_AGENT_PORT)
-              .withStartupTimeout(Duration.ofSeconds(120))
-              // Apparently we need to sleep for a bit so agent's response
-              // `{"service:,env:":1}` in rate_by_service.
-              // This is clearly a race-condition and maybe we should avoid verifying complete
-              // response
-              .withStartupCheckStrategy(
-                  new MinimumDurationRunningStartupCheckStrategy(Duration.ofSeconds(10)));
-      agentContainer.start();
+    @BeforeAll
+    static void setupSpec() {
+        // CI will provide us with agent container running along side our build.
+        // When building locally, however, we need to take matters into our own hands
+        // and we use 'testcontainers' for this.
+        if (!"true".equals(System.getenv("CI"))) {
+            Map<String, String> env = new HashMap<>();
+            env.put("DD_APM_ENABLED", "true");
+            env.put("DD_BIND_HOST", "0.0.0.0");
+            env.put("DD_API_KEY", "invalid_key_but_this_is_fine");
+            env.put("DD_HOSTNAME", "doesnotexist");
+            env.put("DD_LOGS_STDOUT", "yes");
+            agentContainer = new GenericContainer<>(
+                            DockerImageName.parse(System.getProperty("test.datadog.agent.image")))
+                    .withEnv(env)
+                    .withExposedPorts(DEFAULT_TRACE_AGENT_PORT)
+                    .withStartupTimeout(Duration.ofSeconds(120))
+                    // Apparently we need to sleep for a bit so agent's response
+                    // `{"service:,env:":1}` in rate_by_service.
+                    // This is clearly a race-condition and maybe we should avoid verifying complete
+                    // response
+                    .withStartupCheckStrategy(new MinimumDurationRunningStartupCheckStrategy(Duration.ofSeconds(10)));
+            agentContainer.start();
+        }
     }
-  }
 
-  @BeforeEach
-  void setup() {
-    injectSysConfig(AGENT_HOST, getAgentContainerHost());
-    injectSysConfig(TRACE_AGENT_PORT, getAgentContainerPort());
-  }
-
-  static String getAgentContainerHost() {
-    if (agentContainer != null) {
-      return agentContainer.getHost();
+    @BeforeEach
+    void setup() {
+        injectSysConfig(AGENT_HOST, getAgentContainerHost());
+        injectSysConfig(TRACE_AGENT_PORT, getAgentContainerPort());
     }
 
-    return System.getenv("CI_AGENT_HOST");
-  }
+    static String getAgentContainerHost() {
+        if (agentContainer != null) {
+            return agentContainer.getHost();
+        }
 
-  static String getAgentContainerPort() {
-    if (agentContainer != null) {
-      return String.valueOf(agentContainer.getMappedPort(DEFAULT_TRACE_AGENT_PORT));
+        return System.getenv("CI_AGENT_HOST");
     }
 
-    return String.valueOf(DEFAULT_TRACE_AGENT_PORT);
-  }
+    static String getAgentContainerPort() {
+        if (agentContainer != null) {
+            return String.valueOf(agentContainer.getMappedPort(DEFAULT_TRACE_AGENT_PORT));
+        }
+
+        return String.valueOf(DEFAULT_TRACE_AGENT_PORT);
+    }
 
-  @AfterAll
-  static void cleanupSpec() {
-    if (agentContainer != null) {
-      agentContainer.stop();
+    @AfterAll
+    static void cleanupSpec() {
+        if (agentContainer != null) {
+            agentContainer.stop();
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/traceAgentTest/java/DDApiIntegrationTest.java b/dd-trace-core/src/traceAgentTest/java/DDApiIntegrationTest.java
index 9518bcd0024..1056743090b 100644
--- a/dd-trace-core/src/traceAgentTest/java/DDApiIntegrationTest.java
+++ b/dd-trace-core/src/traceAgentTest/java/DDApiIntegrationTest.java
@@ -48,206 +48,197 @@
 
 class DDApiIntegrationTest extends AbstractTraceAgentTest {
 
-  // Looks like okHttp needs to resolve this, even for connection over socket
-  static final String SOMEHOST = "datadoghq.com";
-  static final int SOMEPORT = 123;
+    // Looks like okHttp needs to resolve this, even for connection over socket
+    static final String SOMEHOST = "datadoghq.com";
+    static final int SOMEPORT = 123;
 
-  static Process process;
-  static File socketPath;
+    static Process process;
+    static File socketPath;
 
-  CoreTracer tracer;
-  DDSpan span;
+    CoreTracer tracer;
+    DDSpan span;
 
-  DDAgentFeaturesDiscovery discovery;
-  DDAgentFeaturesDiscovery udsDiscovery;
-  DDAgentApi api;
-  DDAgentApi unixDomainSocketApi;
-  TraceMapper mapper;
-  String traceEndpoint;
+    DDAgentFeaturesDiscovery discovery;
+    DDAgentFeaturesDiscovery udsDiscovery;
+    DDAgentApi api;
+    DDAgentApi unixDomainSocketApi;
+    TraceMapper mapper;
+    String traceEndpoint;
 
-  AtomicReference<String> endpoint = new AtomicReference<>(null);
-  AtomicReference<Map<String, Map<String, Number>>> agentResponse = new AtomicReference<>(null);
+    AtomicReference<String> endpoint = new AtomicReference<>(null);
+    AtomicReference<Map<String, Map<String, Number>>> agentResponse = new AtomicReference<>(null);
 
-  RemoteResponseListener responseListener =
-      (receivedEndpoint, responseJson) -> {
+    RemoteResponseListener responseListener = (receivedEndpoint, responseJson) -> {
         endpoint.set(receivedEndpoint);
         agentResponse.set(responseJson);
-      };
-
-  @BeforeAll
-  static void startSocatProxy() throws IOException {
-    File tmpDir = Files.createTempDirectory("dd-api-integration-test").toFile();
-    tmpDir.deleteOnExit();
-    socketPath = new File(tmpDir, "socket");
-    System.out.println(
-        "!!!socat UNIX-LISTEN:"
-            + socketPath
-            + ",reuseaddr,fork TCP-CONNECT:"
-            + getAgentContainerHost()
-            + ":"
-            + getAgentContainerPort());
-    process =
-        Runtime.getRuntime()
-            .exec(
-                "socat UNIX-LISTEN:"
-                    + socketPath
-                    + ",reuseaddr,fork TCP-CONNECT:"
-                    + getAgentContainerHost()
-                    + ":"
-                    + getAgentContainerPort());
-  }
-
-  @BeforeEach
-  void initTracer() throws InterruptedException {
-    tracer = CoreTracer.builder().writer(new ListWriter()).build();
-    span = (DDSpan) tracer.buildSpan("datadog", "fakeOperation").start();
-    Thread.sleep(1);
-    span.finish();
-  }
-
-  @AfterEach
-  void cleanup() {
-    if (tracer != null) {
-      tracer.close();
+    };
+
+    @BeforeAll
+    static void startSocatProxy() throws IOException {
+        File tmpDir = Files.createTempDirectory("dd-api-integration-test").toFile();
+        tmpDir.deleteOnExit();
+        socketPath = new File(tmpDir, "socket");
+        System.out.println("!!!socat UNIX-LISTEN:"
+                + socketPath
+                + ",reuseaddr,fork TCP-CONNECT:"
+                + getAgentContainerHost()
+                + ":"
+                + getAgentContainerPort());
+        process = Runtime.getRuntime()
+                .exec("socat UNIX-LISTEN:"
+                        + socketPath
+                        + ",reuseaddr,fork TCP-CONNECT:"
+                        + getAgentContainerHost()
+                        + ":"
+                        + getAgentContainerPort());
     }
-  }
 
-  @AfterAll
-  static void stopSocatProxy() {
-    if (process != null) {
-      process.destroy();
+    @BeforeEach
+    void initTracer() throws InterruptedException {
+        tracer = CoreTracer.builder().writer(new ListWriter()).build();
+        span = (DDSpan) tracer.buildSpan("datadog", "fakeOperation").start();
+        Thread.sleep(1);
+        span.finish();
     }
-  }
-
-  void beforeTest(ProtocolVersion protocol) {
-    MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
-    HttpUrl agentUrl = HttpUrl.get(Config.get().getAgentUrl());
-    OkHttpClient httpClient = OkHttpUtils.buildHttpClient(agentUrl, 5000);
-    discovery =
-        new DDAgentFeaturesDiscovery(httpClient, monitoring, agentUrl, protocol, true, false);
-    api = new DDAgentApi(httpClient, agentUrl, discovery, monitoring, false);
-    api.addResponseListener(responseListener);
-    HttpUrl udsAgentUrl = HttpUrl.get(String.format("http://%s:%d", SOMEHOST, SOMEPORT));
-    OkHttpClient udsClient = OkHttpUtils.buildHttpClient(true, socketPath.toString(), null, 5000);
-    udsDiscovery =
-        new DDAgentFeaturesDiscovery(udsClient, monitoring, agentUrl, protocol, true, false);
-    unixDomainSocketApi = new DDAgentApi(udsClient, udsAgentUrl, udsDiscovery, monitoring, false);
-    unixDomainSocketApi.addResponseListener(responseListener);
-    if (protocol == V1_0) {
-      mapper = new TraceMapperV1();
-    } else if (protocol == V0_5) {
-      mapper = new TraceMapperV0_5();
-    } else {
-      mapper = new TraceMapperV0_4();
+
+    @AfterEach
+    void cleanup() {
+        if (tracer != null) {
+            tracer.close();
+        }
+    }
+
+    @AfterAll
+    static void stopSocatProxy() {
+        if (process != null) {
+            process.destroy();
+        }
+    }
+
+    void beforeTest(ProtocolVersion protocol) {
+        MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
+        HttpUrl agentUrl = HttpUrl.get(Config.get().getAgentUrl());
+        OkHttpClient httpClient = OkHttpUtils.buildHttpClient(agentUrl, 5000);
+        discovery = new DDAgentFeaturesDiscovery(httpClient, monitoring, agentUrl, protocol, true, false);
+        api = new DDAgentApi(httpClient, agentUrl, discovery, monitoring, false);
+        api.addResponseListener(responseListener);
+        HttpUrl udsAgentUrl = HttpUrl.get(String.format("http://%s:%d", SOMEHOST, SOMEPORT));
+        OkHttpClient udsClient = OkHttpUtils.buildHttpClient(true, socketPath.toString(), null, 5000);
+        udsDiscovery = new DDAgentFeaturesDiscovery(udsClient, monitoring, agentUrl, protocol, true, false);
+        unixDomainSocketApi = new DDAgentApi(udsClient, udsAgentUrl, udsDiscovery, monitoring, false);
+        unixDomainSocketApi.addResponseListener(responseListener);
+        if (protocol == V1_0) {
+            mapper = new TraceMapperV1();
+        } else if (protocol == V0_5) {
+            mapper = new TraceMapperV0_5();
+        } else {
+            mapper = new TraceMapperV0_4();
+        }
+        traceEndpoint = protocol.endpoint();
+    }
+
+    @TableTest({
+      "scenario        | traceCount | protocol",
+      "empty traces    | 0          | V0_5    ",
+      "16 empty traces | 16         | V0_5    ",
+      "empty traces    | 0          | V0_4    ",
+      "16 empty traces | 16         | V0_4    "
+    })
+    void sendingEmptyTracesSucceeds(int traceCount, ProtocolVersion protocol) throws IOException {
+        beforeTest(protocol);
+
+        RemoteApi.Response response = api.sendSerializedTraces(prepareRequest(emptyTraces(traceCount), mapper));
+        assertFalse(response.response().isEmpty());
+        assertFalse(response.exception().isPresent());
+        assertTrue(response.status().isPresent());
+        assertEquals(200, response.status().getAsInt());
+        assertTrue(response.success());
+        assertEquals(traceEndpoint, discovery.getTraceEndpoint());
+        assertEquals(Config.get().getAgentUrl() + "/" + traceEndpoint, endpoint.get());
+        assertInstanceOf(Map.class, agentResponse.get().get("rate_by_service"));
+    }
+
+    @TableTest({
+      "scenario | protocol",
+      "V0_5     | V0_5    ",
+      "V0_4     | V0_4    "
+    })
+    void sendingTracesSucceeds(ProtocolVersion protocol) throws IOException {
+        beforeTest(protocol);
+
+        RemoteApi.Response response =
+                api.sendSerializedTraces(prepareRequest(singletonList(singletonList(span)), mapper));
+        assertFalse(response.response().isEmpty());
+        assertFalse(response.exception().isPresent());
+        assertTrue(response.status().isPresent());
+        assertEquals(200, response.status().getAsInt());
+        assertTrue(response.success());
+        assertEquals(traceEndpoint, discovery.getTraceEndpoint());
+        assertEquals(Config.get().getAgentUrl() + "/" + traceEndpoint, endpoint.get());
+        assertInstanceOf(Map.class, agentResponse.get().get("rate_by_service"));
     }
-    traceEndpoint = protocol.endpoint();
-  }
-
-  @TableTest({
-    "scenario        | traceCount | protocol",
-    "empty traces    | 0          | V0_5    ",
-    "16 empty traces | 16         | V0_5    ",
-    "empty traces    | 0          | V0_4    ",
-    "16 empty traces | 16         | V0_4    "
-  })
-  void sendingEmptyTracesSucceeds(int traceCount, ProtocolVersion protocol) throws IOException {
-    beforeTest(protocol);
-
-    RemoteApi.Response response =
-        api.sendSerializedTraces(prepareRequest(emptyTraces(traceCount), mapper));
-    assertFalse(response.response().isEmpty());
-    assertFalse(response.exception().isPresent());
-    assertTrue(response.status().isPresent());
-    assertEquals(200, response.status().getAsInt());
-    assertTrue(response.success());
-    assertEquals(traceEndpoint, discovery.getTraceEndpoint());
-    assertEquals(Config.get().getAgentUrl() + "/" + traceEndpoint, endpoint.get());
-    assertInstanceOf(Map.class, agentResponse.get().get("rate_by_service"));
-  }
-
-  @TableTest({
-    "scenario | protocol",
-    "V0_5     | V0_5    ",
-    "V0_4     | V0_4    "
-  })
-  void sendingTracesSucceeds(ProtocolVersion protocol) throws IOException {
-    beforeTest(protocol);
-
-    RemoteApi.Response response =
-        api.sendSerializedTraces(prepareRequest(singletonList(singletonList(span)), mapper));
-    assertFalse(response.response().isEmpty());
-    assertFalse(response.exception().isPresent());
-    assertTrue(response.status().isPresent());
-    assertEquals(200, response.status().getAsInt());
-    assertTrue(response.success());
-    assertEquals(traceEndpoint, discovery.getTraceEndpoint());
-    assertEquals(Config.get().getAgentUrl() + "/" + traceEndpoint, endpoint.get());
-    assertInstanceOf(Map.class, agentResponse.get().get("rate_by_service"));
-  }
-
-  @TableTest({
-    "scenario     | protocol",
-    "empty traces | V0_5    ",
-    "empty traces | V0_4    "
-  })
-  void sendingEmptyTracesToUnixDomainSocketSucceeds(ProtocolVersion protocol) throws IOException {
-    beforeTest(protocol);
-
-    RemoteApi.Response response =
-        unixDomainSocketApi.sendSerializedTraces(prepareRequest(emptyList(), mapper));
-    assertFalse(response.response().isEmpty());
-    assertFalse(response.exception().isPresent());
-    assertTrue(response.status().isPresent());
-    assertEquals(200, response.status().getAsInt());
-    assertTrue(response.success());
-    assertEquals(traceEndpoint, udsDiscovery.getTraceEndpoint());
-    assertEquals("http://" + SOMEHOST + ":" + SOMEPORT + "/" + traceEndpoint, endpoint.get());
-    assertInstanceOf(Map.class, agentResponse.get().get("rate_by_service"));
-  }
-
-  @TableTest({
-    "scenario | protocol",
-    "V0_5     | V0_5    ",
-    "V0_4     | V0_4    "
-  })
-  void sendingTracesToUnixDomainSocketSucceeds(ProtocolVersion protocol) throws IOException {
-    beforeTest(protocol);
-
-    RemoteApi.Response response =
-        unixDomainSocketApi.sendSerializedTraces(
-            prepareRequest(singletonList(singletonList(span)), mapper));
-    assertFalse(response.response().isEmpty());
-    assertFalse(response.exception().isPresent());
-    assertTrue(response.status().isPresent());
-    assertEquals(200, response.status().getAsInt());
-    assertTrue(response.success());
-    assertEquals(traceEndpoint, udsDiscovery.getTraceEndpoint());
-    assertEquals("http://" + SOMEHOST + ":" + SOMEPORT + "/" + traceEndpoint, endpoint.get());
-    assertInstanceOf(Map.class, agentResponse.get().get("rate_by_service"));
-  }
-
-  private static List<List<DDSpan>> emptyTraces(int count) {
-    return Stream.generate(Collections::<DDSpan>emptyList).limit(count).collect(toList());
-  }
-
-  Payload prepareRequest(List<List<DDSpan>> traces, TraceMapper traceMapper) throws IOException {
-    Traces traceCapture = new Traces();
-    MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1 << 10, traceCapture));
-    for (List<DDSpan> trace : traces) {
-      packer.format(trace, traceMapper);
+
+    @TableTest({
+      "scenario     | protocol",
+      "empty traces | V0_5    ",
+      "empty traces | V0_4    "
+    })
+    void sendingEmptyTracesToUnixDomainSocketSucceeds(ProtocolVersion protocol) throws IOException {
+        beforeTest(protocol);
+
+        RemoteApi.Response response = unixDomainSocketApi.sendSerializedTraces(prepareRequest(emptyList(), mapper));
+        assertFalse(response.response().isEmpty());
+        assertFalse(response.exception().isPresent());
+        assertTrue(response.status().isPresent());
+        assertEquals(200, response.status().getAsInt());
+        assertTrue(response.success());
+        assertEquals(traceEndpoint, udsDiscovery.getTraceEndpoint());
+        assertEquals("http://" + SOMEHOST + ":" + SOMEPORT + "/" + traceEndpoint, endpoint.get());
+        assertInstanceOf(Map.class, agentResponse.get().get("rate_by_service"));
+    }
+
+    @TableTest({
+      "scenario | protocol",
+      "V0_5     | V0_5    ",
+      "V0_4     | V0_4    "
+    })
+    void sendingTracesToUnixDomainSocketSucceeds(ProtocolVersion protocol) throws IOException {
+        beforeTest(protocol);
+
+        RemoteApi.Response response =
+                unixDomainSocketApi.sendSerializedTraces(prepareRequest(singletonList(singletonList(span)), mapper));
+        assertFalse(response.response().isEmpty());
+        assertFalse(response.exception().isPresent());
+        assertTrue(response.status().isPresent());
+        assertEquals(200, response.status().getAsInt());
+        assertTrue(response.success());
+        assertEquals(traceEndpoint, udsDiscovery.getTraceEndpoint());
+        assertEquals("http://" + SOMEHOST + ":" + SOMEPORT + "/" + traceEndpoint, endpoint.get());
+        assertInstanceOf(Map.class, agentResponse.get().get("rate_by_service"));
+    }
+
+    private static List<List<DDSpan>> emptyTraces(int count) {
+        return Stream.generate(Collections::<DDSpan>emptyList).limit(count).collect(toList());
     }
-    packer.flush();
-    return traceMapper.newPayload().withBody(traceCapture.traceCount, traceCapture.buffer);
-  }
-
-  static class Traces implements ByteBufferConsumer {
-    int traceCount;
-    ByteBuffer buffer;
-
-    @Override
-    public void accept(int messageCount, ByteBuffer buffer) {
-      this.buffer = buffer;
-      this.traceCount = messageCount;
+
+    Payload prepareRequest(List<List<DDSpan>> traces, TraceMapper traceMapper) throws IOException {
+        Traces traceCapture = new Traces();
+        MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1 << 10, traceCapture));
+        for (List<DDSpan> trace : traces) {
+            packer.format(trace, traceMapper);
+        }
+        packer.flush();
+        return traceMapper.newPayload().withBody(traceCapture.traceCount, traceCapture.buffer);
+    }
+
+    static class Traces implements ByteBufferConsumer {
+        int traceCount;
+        ByteBuffer buffer;
+
+        @Override
+        public void accept(int messageCount, ByteBuffer buffer) {
+            this.buffer = buffer;
+            this.traceCount = messageCount;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/traceAgentTest/java/DataStreamsIntegrationTest.java b/dd-trace-core/src/traceAgentTest/java/DataStreamsIntegrationTest.java
index 3af2c6332fb..6a379c3b591 100644
--- a/dd-trace-core/src/traceAgentTest/java/DataStreamsIntegrationTest.java
+++ b/dd-trace-core/src/traceAgentTest/java/DataStreamsIntegrationTest.java
@@ -22,72 +22,66 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-@Disabled(
-    "The agent in CI doesn't have a valid API key. Unlike metrics and traces, data streams fails in this case")
+@Disabled("The agent in CI doesn't have a valid API key. Unlike metrics and traces, data streams fails in this case")
 class DataStreamsIntegrationTest extends AbstractTraceAgentTest {
 
-  @Test
-  void sendingStatsBucketToAgentShouldNotifyWithOkEvent() throws ReflectiveOperationException {
-    SharedCommunicationObjects sharedCommunicationObjects = new SharedCommunicationObjects();
-    sharedCommunicationObjects.createRemaining(Config.get());
+    @Test
+    void sendingStatsBucketToAgentShouldNotifyWithOkEvent() throws ReflectiveOperationException {
+        SharedCommunicationObjects sharedCommunicationObjects = new SharedCommunicationObjects();
+        sharedCommunicationObjects.createRemaining(Config.get());
 
-    OkHttpSink sink =
-        new OkHttpSink(
-            OkHttpUtils.buildHttpClient(HttpUrl.parse(Config.get().getAgentUrl()), 5000L),
-            Config.get().getAgentUrl(),
-            DDAgentFeaturesDiscovery.V01_DATASTREAMS_ENDPOINT,
-            false,
-            true,
-            Collections.emptyMap());
+        OkHttpSink sink = new OkHttpSink(
+                OkHttpUtils.buildHttpClient(HttpUrl.parse(Config.get().getAgentUrl()), 5000L),
+                Config.get().getAgentUrl(),
+                DDAgentFeaturesDiscovery.V01_DATASTREAMS_ENDPOINT,
+                false,
+                true,
+                Collections.emptyMap());
 
-    BlockingListener listener = new BlockingListener();
-    sink.register(listener);
+        BlockingListener listener = new BlockingListener();
+        sink.register(listener);
 
-    ControllableTimeSource timeSource = new ControllableTimeSource();
+        ControllableTimeSource timeSource = new ControllableTimeSource();
 
-    TraceConfig traceConfig = mock(TraceConfig.class);
-    when(traceConfig.isDataStreamsEnabled()).thenReturn(true);
+        TraceConfig traceConfig = mock(TraceConfig.class);
+        when(traceConfig.isDataStreamsEnabled()).thenReturn(true);
 
-    DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery =
-        sharedCommunicationObjects.featuresDiscovery(Config.get());
-    try (DefaultDataStreamsMonitoring dataStreams =
-        new DefaultDataStreamsMonitoring(
-            sink, ddAgentFeaturesDiscovery, timeSource, () -> traceConfig, Config.get())) {
+        DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery = sharedCommunicationObjects.featuresDiscovery(Config.get());
+        try (DefaultDataStreamsMonitoring dataStreams = new DefaultDataStreamsMonitoring(
+                sink, ddAgentFeaturesDiscovery, timeSource, () -> traceConfig, Config.get())) {
 
-      dataStreams.start();
-      DataStreamsTags tags =
-          DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
-      dataStreams.add(
-          new StatsPoint(tags, 1, 2, 5, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
-      timeSource.advance(Config.get().getDataStreamsBucketDurationNanoseconds());
-      dataStreams.report();
-      dataStreams.report();
+            dataStreams.start();
+            DataStreamsTags tags = DataStreamsTags.create("testType", null, "testTopic", "testGroup", null);
+            dataStreams.add(new StatsPoint(tags, 1, 2, 5, timeSource.getCurrentTimeNanos(), 0, 0, 0, null));
+            timeSource.advance(Config.get().getDataStreamsBucketDurationNanoseconds());
+            dataStreams.report();
+            dataStreams.report();
 
-      assertTrue(ddAgentFeaturesDiscovery.supportsDataStreams());
-      waitForEvents(listener, 1);
-      assertEquals(OK, listener.events.get(0));
+            assertTrue(ddAgentFeaturesDiscovery.supportsDataStreams());
+            waitForEvents(listener, 1);
+            assertEquals(OK, listener.events.get(0));
+        }
     }
-  }
 
-  private static void waitForEvents(BlockingListener listener, int expectedCount) {
-    long deadline = System.currentTimeMillis() + 1000;
-    while (System.currentTimeMillis() < deadline && listener.events.size() < expectedCount) {
-      try {
-        Thread.sleep(50);
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-        break;
-      }
+    private static void waitForEvents(BlockingListener listener, int expectedCount) {
+        long deadline = System.currentTimeMillis() + 1000;
+        while (System.currentTimeMillis() < deadline && listener.events.size() < expectedCount) {
+            try {
+                Thread.sleep(50);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                break;
+            }
+        }
+        assertEquals(expectedCount, listener.events.size());
     }
-    assertEquals(expectedCount, listener.events.size());
-  }
 
-  static class BlockingListener implements EventListener {
-    List<EventType> events = new CopyOnWriteArrayList<>();
+    static class BlockingListener implements EventListener {
+        List<EventType> events = new CopyOnWriteArrayList<>();
 
-    @Override
-    public void onEvent(EventType eventType, String message) {
-      events.add(eventType);
+        @Override
+        public void onEvent(EventType eventType, String message) {
+            events.add(eventType);
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/traceAgentTest/java/TraceGenerator.java b/dd-trace-core/src/traceAgentTest/java/TraceGenerator.java
index da0911022e9..547ff1235f4 100644
--- a/dd-trace-core/src/traceAgentTest/java/TraceGenerator.java
+++ b/dd-trace-core/src/traceAgentTest/java/TraceGenerator.java
@@ -29,432 +29,430 @@
 
 class TraceGenerator {
 
-  static List<List<CoreSpan>> generateRandomTraces(int howMany, boolean lowCardinality) {
-    List<List<CoreSpan>> traces = new ArrayList<>(howMany);
-    for (int i = 0; i < howMany; ++i) {
-      int traceSize = ThreadLocalRandom.current().nextInt(2, 20);
-      traces.add(generateRandomTrace(traceSize, lowCardinality));
-    }
-    return traces;
-  }
-
-  private static List<CoreSpan> generateRandomTrace(int size, boolean lowCardinality) {
-    List<CoreSpan> trace = new ArrayList<>(size);
-    long traceId = ThreadLocalRandom.current().nextLong(1, Long.MAX_VALUE);
-    for (int i = 0; i < size; ++i) {
-      trace.add(randomSpan(traceId, lowCardinality));
-    }
-    return trace;
-  }
-
-  private static final IdGenerationStrategy ID_GENERATION_STRATEGY =
-      IdGenerationStrategy.fromName("RANDOM");
-
-  private static CoreSpan randomSpan(long traceId, boolean lowCardinality) {
-    ThreadLocalRandom random = ThreadLocalRandom.current();
-    Map<String, String> baggage = new HashMap<>();
-    if (random.nextBoolean()) {
-      baggage.put("baggage-key", lowCardinality ? "x" : randomString(100));
-      if (random.nextBoolean()) {
-        baggage.put("tag.1", "bar");
-        baggage.put("tag.2", "qux");
-      }
-    }
-    Map<String, Object> tags = new HashMap<>();
-    int tagCount = random.nextInt(0, 20);
-    for (int i = 0; i < tagCount; ++i) {
-      tags.put("tag." + i, random.nextBoolean() ? "foo" : randomString(2000));
-      tags.put("tag.1." + i, lowCardinality ? "y" : UUID.randomUUID());
-      switch (random.nextInt(8)) {
-        case 0:
-          tags.put("tag.3." + i, BigDecimal.valueOf(random.nextDouble()));
-          break;
-        case 1:
-          tags.put("tag.3." + i, BigInteger.valueOf(random.nextLong()));
-          break;
-        default:
-          break;
-      }
-    }
-    int metricCount = random.nextInt(0, 20);
-    for (int i = 0; i < metricCount; ++i) {
-      String name = "metric." + i;
-      Number metric = null;
-      switch (random.nextInt(4)) {
-        case 0:
-          metric = random.nextInt();
-          break;
-        case 1:
-          metric = random.nextLong();
-          break;
-        case 2:
-          metric = random.nextFloat();
-          break;
-        case 3:
-          metric = random.nextDouble();
-          break;
-      }
-      tags.put(name, metric);
-    }
-    return new PojoSpan(
-        "service-" + random.nextInt(lowCardinality ? 1 : 10),
-        "operation-" + random.nextInt(lowCardinality ? 1 : 100),
-        UTF8BytesString.create("resource-" + random.nextInt(lowCardinality ? 1 : 100)),
-        DDTraceId.from(traceId),
-        ID_GENERATION_STRATEGY.generateSpanId(),
-        DDSpanId.ZERO,
-        TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis()),
-        random.nextLong(500, 10_000_000),
-        random.nextInt(2),
-        baggage,
-        tags,
-        "type-" + random.nextInt(lowCardinality ? 1 : 100),
-        random.nextBoolean());
-  }
-
-  private static String randomString(int maxLength) {
-    char[] chars = new char[ThreadLocalRandom.current().nextInt(maxLength)];
-    for (int i = 0; i < chars.length; ++i) {
-      char next = (char) ThreadLocalRandom.current().nextInt((int) Character.MAX_VALUE);
-      if (Character.isSurrogate(next)) {
-        if (i < chars.length - 1) {
-          chars[i++] = '\uD801';
-          chars[i] = '\uDC01';
-        } else {
-          chars[i] = 'a';
-        }
-      } else {
-        chars[i] = next;
-      }
-    }
-    return new String(chars);
-  }
-
-  static class PojoSpan implements CoreSpan<PojoSpan> {
-
-    private final CharSequence serviceName;
-    private final CharSequence operationName;
-    private final CharSequence resourceName;
-    private final DDTraceId traceId;
-    private final long spanId;
-    private final long parentId;
-    private final long start;
-    private final long duration;
-    private final int error;
-    private final String type;
-    private final boolean measured;
-    private final Metadata metadata;
-
-    PojoSpan(
-        String serviceName,
-        String operationName,
-        CharSequence resourceName,
-        DDTraceId traceId,
-        long spanId,
-        long parentId,
-        long start,
-        long duration,
-        int error,
-        Map<String, String> baggage,
-        Map<String, Object> tags,
-        String type,
-        boolean measured) {
-      this.serviceName = UTF8BytesString.create(serviceName);
-      this.operationName = UTF8BytesString.create(operationName);
-      this.resourceName = UTF8BytesString.create(resourceName);
-      this.traceId = traceId;
-      this.spanId = spanId;
-      this.parentId = parentId;
-      this.start = start;
-      this.duration = duration;
-      this.error = error;
-      this.type = type;
-      this.measured = measured;
-      this.metadata =
-          new Metadata(
-              currentThread().getId(),
-              UTF8BytesString.create(currentThread().getName()),
-              fromMap(tags),
-              baggage,
-              UNSET,
-              measured,
-              isTopLevel(),
-              0,
-              null,
-              0,
-              getTagsForSerialization(),
-              UTF8BytesString.create(String.valueOf(Config.get().isOtlpTracesExportEnabled())),
-              emptyList());
+    static List<List<CoreSpan>> generateRandomTraces(int howMany, boolean lowCardinality) {
+        List<List<CoreSpan>> traces = new ArrayList<>(howMany);
+        for (int i = 0; i < howMany; ++i) {
+            int traceSize = ThreadLocalRandom.current().nextInt(2, 20);
+            traces.add(generateRandomTrace(traceSize, lowCardinality));
+        }
+        return traces;
     }
 
-    @Override
-    public PojoSpan getLocalRootSpan() {
-      return this;
+    private static List<CoreSpan> generateRandomTrace(int size, boolean lowCardinality) {
+        List<CoreSpan> trace = new ArrayList<>(size);
+        long traceId = ThreadLocalRandom.current().nextLong(1, Long.MAX_VALUE);
+        for (int i = 0; i < size; ++i) {
+            trace.add(randomSpan(traceId, lowCardinality));
+        }
+        return trace;
     }
 
-    @Override
-    public String getServiceName() {
-      return serviceName.toString();
-    }
+    private static final IdGenerationStrategy ID_GENERATION_STRATEGY = IdGenerationStrategy.fromName("RANDOM");
 
-    @Override
-    public CharSequence getServiceNameSource() {
-      return null;
-    }
+    private static CoreSpan randomSpan(long traceId, boolean lowCardinality) {
+        ThreadLocalRandom random = ThreadLocalRandom.current();
+        Map<String, String> baggage = new HashMap<>();
+        if (random.nextBoolean()) {
+            baggage.put("baggage-key", lowCardinality ? "x" : randomString(100));
+            if (random.nextBoolean()) {
+                baggage.put("tag.1", "bar");
+                baggage.put("tag.2", "qux");
+            }
+        }
+        Map<String, Object> tags = new HashMap<>();
+        int tagCount = random.nextInt(0, 20);
+        for (int i = 0; i < tagCount; ++i) {
+            tags.put("tag." + i, random.nextBoolean() ? "foo" : randomString(2000));
+            tags.put("tag.1." + i, lowCardinality ? "y" : UUID.randomUUID());
+            switch (random.nextInt(8)) {
+                case 0:
+                    tags.put("tag.3." + i, BigDecimal.valueOf(random.nextDouble()));
+                    break;
+                case 1:
+                    tags.put("tag.3." + i, BigInteger.valueOf(random.nextLong()));
+                    break;
+                default:
+                    break;
+            }
+        }
+        int metricCount = random.nextInt(0, 20);
+        for (int i = 0; i < metricCount; ++i) {
+            String name = "metric." + i;
+            Number metric = null;
+            switch (random.nextInt(4)) {
+                case 0:
+                    metric = random.nextInt();
+                    break;
+                case 1:
+                    metric = random.nextLong();
+                    break;
+                case 2:
+                    metric = random.nextFloat();
+                    break;
+                case 3:
+                    metric = random.nextDouble();
+                    break;
+            }
+            tags.put(name, metric);
+        }
+        return new PojoSpan(
+                "service-" + random.nextInt(lowCardinality ? 1 : 10),
+                "operation-" + random.nextInt(lowCardinality ? 1 : 100),
+                UTF8BytesString.create("resource-" + random.nextInt(lowCardinality ? 1 : 100)),
+                DDTraceId.from(traceId),
+                ID_GENERATION_STRATEGY.generateSpanId(),
+                DDSpanId.ZERO,
+                TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis()),
+                random.nextLong(500, 10_000_000),
+                random.nextInt(2),
+                baggage,
+                tags,
+                "type-" + random.nextInt(lowCardinality ? 1 : 100),
+                random.nextBoolean());
+    }
+
+    private static String randomString(int maxLength) {
+        char[] chars = new char[ThreadLocalRandom.current().nextInt(maxLength)];
+        for (int i = 0; i < chars.length; ++i) {
+            char next = (char) ThreadLocalRandom.current().nextInt((int) Character.MAX_VALUE);
+            if (Character.isSurrogate(next)) {
+                if (i < chars.length - 1) {
+                    chars[i++] = '\uD801';
+                    chars[i] = '\uDC01';
+                } else {
+                    chars[i] = 'a';
+                }
+            } else {
+                chars[i] = next;
+            }
+        }
+        return new String(chars);
+    }
+
+    static class PojoSpan implements CoreSpan<PojoSpan> {
+
+        private final CharSequence serviceName;
+        private final CharSequence operationName;
+        private final CharSequence resourceName;
+        private final DDTraceId traceId;
+        private final long spanId;
+        private final long parentId;
+        private final long start;
+        private final long duration;
+        private final int error;
+        private final String type;
+        private final boolean measured;
+        private final Metadata metadata;
+
+        PojoSpan(
+                String serviceName,
+                String operationName,
+                CharSequence resourceName,
+                DDTraceId traceId,
+                long spanId,
+                long parentId,
+                long start,
+                long duration,
+                int error,
+                Map<String, String> baggage,
+                Map<String, Object> tags,
+                String type,
+                boolean measured) {
+            this.serviceName = UTF8BytesString.create(serviceName);
+            this.operationName = UTF8BytesString.create(operationName);
+            this.resourceName = UTF8BytesString.create(resourceName);
+            this.traceId = traceId;
+            this.spanId = spanId;
+            this.parentId = parentId;
+            this.start = start;
+            this.duration = duration;
+            this.error = error;
+            this.type = type;
+            this.measured = measured;
+            this.metadata = new Metadata(
+                    currentThread().getId(),
+                    UTF8BytesString.create(currentThread().getName()),
+                    fromMap(tags),
+                    baggage,
+                    UNSET,
+                    measured,
+                    isTopLevel(),
+                    0,
+                    null,
+                    0,
+                    getTagsForSerialization(),
+                    UTF8BytesString.create(String.valueOf(Config.get().isOtlpTracesExportEnabled())),
+                    emptyList());
+        }
 
-    @Override
-    public CharSequence getOperationName() {
-      return operationName;
-    }
+        @Override
+        public PojoSpan getLocalRootSpan() {
+            return this;
+        }
 
-    @Override
-    public CharSequence getResourceName() {
-      return resourceName;
-    }
+        @Override
+        public String getServiceName() {
+            return serviceName.toString();
+        }
 
-    @Override
-    public DDTraceId getTraceId() {
-      return traceId;
-    }
+        @Override
+        public CharSequence getServiceNameSource() {
+            return null;
+        }
 
-    @Override
-    public long getSpanId() {
-      return spanId;
-    }
+        @Override
+        public CharSequence getOperationName() {
+            return operationName;
+        }
 
-    @Override
-    public long getParentId() {
-      return parentId;
-    }
+        @Override
+        public CharSequence getResourceName() {
+            return resourceName;
+        }
 
-    @Override
-    public long getStartTime() {
-      return start;
-    }
+        @Override
+        public DDTraceId getTraceId() {
+            return traceId;
+        }
 
-    @Override
-    public long getDurationNano() {
-      return duration;
-    }
+        @Override
+        public long getSpanId() {
+            return spanId;
+        }
 
-    @Override
-    public int getError() {
-      return error;
-    }
+        @Override
+        public long getParentId() {
+            return parentId;
+        }
 
-    @Override
-    public short getHttpStatusCode() {
-      return 0;
-    }
+        @Override
+        public long getStartTime() {
+            return start;
+        }
 
-    @Override
-    public CharSequence getOrigin() {
-      return null;
-    }
+        @Override
+        public long getDurationNano() {
+            return duration;
+        }
 
-    @Override
-    public PojoSpan setMeasured(boolean measured) {
-      return this;
-    }
+        @Override
+        public int getError() {
+            return error;
+        }
 
-    @Override
-    public PojoSpan setErrorMessage(String errorMessage) {
-      return this;
-    }
+        @Override
+        public short getHttpStatusCode() {
+            return 0;
+        }
 
-    @Override
-    public PojoSpan addThrowable(Throwable error) {
-      return this;
-    }
+        @Override
+        public CharSequence getOrigin() {
+            return null;
+        }
 
-    @Override
-    public PojoSpan setTag(String tag, String value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setMeasured(boolean measured) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setTag(String tag, boolean value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setErrorMessage(String errorMessage) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setTag(String tag, int value) {
-      return this;
-    }
+        @Override
+        public PojoSpan addThrowable(Throwable error) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setTag(String tag, long value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setTag(String tag, String value) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setTag(String tag, double value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setTag(String tag, boolean value) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setTag(String tag, Number value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setTag(String tag, int value) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setTag(String tag, CharSequence value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setTag(String tag, long value) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setTag(String tag, Object value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setTag(String tag, double value) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan removeTag(String tag) {
-      return this;
-    }
+        @Override
+        public PojoSpan setTag(String tag, Number value) {
+            return this;
+        }
 
-    @Override
-    public boolean isMeasured() {
-      return measured;
-    }
+        @Override
+        public PojoSpan setTag(String tag, CharSequence value) {
+            return this;
+        }
 
-    @Override
-    public boolean isTopLevel() {
-      return false;
-    }
+        @Override
+        public PojoSpan setTag(String tag, Object value) {
+            return this;
+        }
 
-    @Override
-    public boolean isForceKeep() {
-      return false;
-    }
+        @Override
+        public PojoSpan removeTag(String tag) {
+            return this;
+        }
 
-    @Override
-    public boolean isKind(SpanKindFilter filter) {
-      Object kind = unsafeGetTag(SPAN_KIND);
-      return filter.matches(kind == null ? null : kind.toString());
-    }
+        @Override
+        public boolean isMeasured() {
+            return measured;
+        }
 
-    Map<String, String> getBaggage() {
-      return metadata.getBaggage();
-    }
+        @Override
+        public boolean isTopLevel() {
+            return false;
+        }
 
-    TagMap getTags() {
-      return metadata.getTags();
-    }
+        @Override
+        public boolean isForceKeep() {
+            return false;
+        }
 
-    @Override
-    public String getType() {
-      return type;
-    }
+        @Override
+        public boolean isKind(SpanKindFilter filter) {
+            Object kind = unsafeGetTag(SPAN_KIND);
+            return filter.matches(kind == null ? null : kind.toString());
+        }
 
-    @Override
-    public void processServiceTags() {}
+        Map<String, String> getBaggage() {
+            return metadata.getBaggage();
+        }
 
-    @Override
-    public void processTagsAndBaggage(MetadataConsumer consumer) {
-      consumer.accept(metadata);
-    }
+        TagMap getTags() {
+            return metadata.getTags();
+        }
 
-    @Override
-    public PojoSpan setSamplingPriority(int samplingPriority, int samplingMechanism) {
-      return this;
-    }
+        @Override
+        public String getType() {
+            return type;
+        }
 
-    @Override
-    public PojoSpan setSamplingPriority(
-        int samplingPriority, CharSequence rate, double sampleRate, int samplingMechanism) {
-      return this;
-    }
+        @Override
+        public void processServiceTags() {}
 
-    @Override
-    public PojoSpan setSpanSamplingPriority(double rate, int limit) {
-      return this;
-    }
+        @Override
+        public void processTagsAndBaggage(MetadataConsumer consumer) {
+            consumer.accept(metadata);
+        }
 
-    @Override
-    public PojoSpan setMetric(CharSequence name, int value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setSamplingPriority(int samplingPriority, int samplingMechanism) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setMetric(CharSequence name, long value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setSamplingPriority(
+                int samplingPriority, CharSequence rate, double sampleRate, int samplingMechanism) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setMetric(CharSequence name, float value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setSpanSamplingPriority(double rate, int limit) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setMetric(CharSequence name, double value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setMetric(CharSequence name, int value) {
+            return this;
+        }
 
-    @Override
-    public PojoSpan setFlag(CharSequence name, boolean value) {
-      return this;
-    }
+        @Override
+        public PojoSpan setMetric(CharSequence name, long value) {
+            return this;
+        }
 
-    @Override
-    public int samplingPriority() {
-      return UNSET;
-    }
+        @Override
+        public PojoSpan setMetric(CharSequence name, float value) {
+            return this;
+        }
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public <U> U getTag(CharSequence name, U defaultValue) {
-      U value = getTag(name);
-      return null == value ? defaultValue : value;
-    }
+        @Override
+        public PojoSpan setMetric(CharSequence name, double value) {
+            return this;
+        }
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public <U> U getTag(CharSequence name) {
-      // replicate logic here because DDSpanContext has to pretend some of its
-      // fields are elements of a map for backward compatibility reasons
-      String tag = String.valueOf(name);
-      Object value;
-      switch (tag) {
-        case DDTags.THREAD_ID:
-          value = metadata.getThreadId();
-          break;
-        case DDTags.THREAD_NAME:
-          value = metadata.getThreadName();
-          break;
-        default:
-          value = getTags().get(tag);
-      }
-      return (U) value;
-    }
+        @Override
+        public PojoSpan setFlag(CharSequence name, boolean value) {
+            return this;
+        }
 
-    @Override
-    public <U> U unsafeGetTag(CharSequence name, U defaultValue) {
-      return getTag(name, defaultValue);
-    }
+        @Override
+        public int samplingPriority() {
+            return UNSET;
+        }
 
-    @Override
-    public <U> U unsafeGetTag(CharSequence name) {
-      return getTag(name);
-    }
+        @Override
+        @SuppressWarnings("unchecked")
+        public <U> U getTag(CharSequence name, U defaultValue) {
+            U value = getTag(name);
+            return null == value ? defaultValue : value;
+        }
 
-    @Override
-    public boolean hasSamplingPriority() {
-      return false;
-    }
+        @Override
+        @SuppressWarnings("unchecked")
+        public <U> U getTag(CharSequence name) {
+            // replicate logic here because DDSpanContext has to pretend some of its
+            // fields are elements of a map for backward compatibility reasons
+            String tag = String.valueOf(name);
+            Object value;
+            switch (tag) {
+                case DDTags.THREAD_ID:
+                    value = metadata.getThreadId();
+                    break;
+                case DDTags.THREAD_NAME:
+                    value = metadata.getThreadName();
+                    break;
+                default:
+                    value = getTags().get(tag);
+            }
+            return (U) value;
+        }
 
-    @Override
-    public Map<String, Object> getMetaStruct() {
-      return emptyMap();
-    }
+        @Override
+        public <U> U unsafeGetTag(CharSequence name, U defaultValue) {
+            return getTag(name, defaultValue);
+        }
 
-    @Override
-    public PojoSpan setMetaStruct(String field, Object value) {
-      return this;
-    }
+        @Override
+        public <U> U unsafeGetTag(CharSequence name) {
+            return getTag(name);
+        }
 
-    @Override
-    public int getLongRunningVersion() {
-      return 0;
+        @Override
+        public boolean hasSamplingPriority() {
+            return false;
+        }
+
+        @Override
+        public Map<String, Object> getMetaStruct() {
+            return emptyMap();
+        }
+
+        @Override
+        public PojoSpan setMetaStruct(String field, Object value) {
+            return this;
+        }
+
+        @Override
+        public int getLongRunningVersion() {
+            return 0;
+        }
     }
-  }
 }
diff --git a/dd-trace-core/src/traceAgentTest/java/TraceMapperRealAgentTest.java b/dd-trace-core/src/traceAgentTest/java/TraceMapperRealAgentTest.java
index cedea2c8002..ef03d8c0a29 100644
--- a/dd-trace-core/src/traceAgentTest/java/TraceMapperRealAgentTest.java
+++ b/dd-trace-core/src/traceAgentTest/java/TraceMapperRealAgentTest.java
@@ -26,93 +26,92 @@
 
 class TraceMapperRealAgentTest extends AbstractTraceAgentTest {
 
-  HttpUrl agentUrl;
-  OkHttpClient client;
-  MonitoringImpl monitoring;
+    HttpUrl agentUrl;
+    OkHttpClient client;
+    MonitoringImpl monitoring;
 
-  @BeforeEach
-  void setUpClient() {
-    agentUrl = HttpUrl.parse(Config.get().getAgentUrl());
-    client = OkHttpUtils.buildHttpClient(agentUrl, 30_000);
-    monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
-  }
+    @BeforeEach
+    void setUpClient() {
+        agentUrl = HttpUrl.parse(Config.get().getAgentUrl());
+        client = OkHttpUtils.buildHttpClient(agentUrl, 30_000);
+        monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
+    }
 
-  /**
-   * The KiB figures in the scenario labels come from the {@code bufferSize} column of the original
-   * Groovy data table. That column was never read by the test body, so the sizes distinguish the
-   * rows in reports but do not change what is exercised.
-   */
-  @TableTest({
-    "scenario                                    | traceCount | lowCardinality | protocol",
-    "V1_0, 10 KiB, no traces, low cardinality    | 0          | true           | V1_0    ",
-    "V1_0, 10 KiB, 1 trace, low cardinality      | 1          | true           | V1_0    ",
-    "V1_0, 30 KiB, 1 trace, low cardinality      | 1          | true           | V1_0    ",
-    "V1_0, 30 KiB, 2 traces, low cardinality     | 2          | true           | V1_0    ",
-    "V1_0, 10 KiB, no traces, high cardinality   | 0          | false          | V1_0    ",
-    "V1_0, 10 KiB, 1 trace, high cardinality     | 1          | false          | V1_0    ",
-    "V1_0, 30 KiB, 1 trace, high cardinality     | 1          | false          | V1_0    ",
-    "V1_0, 30 KiB, 2 traces, high cardinality    | 2          | false          | V1_0    ",
-    "V1_0, 100 KiB, no traces, low cardinality   | 0          | true           | V1_0    ",
-    "V1_0, 100 KiB, 1 trace, low cardinality     | 1          | true           | V1_0    ",
-    "V1_0, 100 KiB, 10 traces, low cardinality   | 10         | true           | V1_0    ",
-    "V1_0, 100 KiB, 100 traces, low cardinality  | 100        | true           | V1_0    ",
-    "V1_0, 100 KiB, no traces, high cardinality  | 0          | false          | V1_0    ",
-    "V1_0, 100 KiB, 1 trace, high cardinality    | 1          | false          | V1_0    ",
-    "V1_0, 100 KiB, 10 traces, high cardinality  | 10         | false          | V1_0    ",
-    "V1_0, 100 KiB, 100 traces, high cardinality | 100        | false          | V1_0    ",
-    "V0_5, 10 KiB, no traces, low cardinality    | 0          | true           | V0_5    ",
-    "V0_5, 10 KiB, 1 trace, low cardinality      | 1          | true           | V0_5    ",
-    "V0_5, 30 KiB, 1 trace, low cardinality      | 1          | true           | V0_5    ",
-    "V0_5, 30 KiB, 2 traces, low cardinality     | 2          | true           | V0_5    ",
-    "V0_5, 10 KiB, no traces, high cardinality   | 0          | false          | V0_5    ",
-    "V0_5, 10 KiB, 1 trace, high cardinality     | 1          | false          | V0_5    ",
-    "V0_5, 30 KiB, 1 trace, high cardinality     | 1          | false          | V0_5    ",
-    "V0_5, 30 KiB, 2 traces, high cardinality    | 2          | false          | V0_5    ",
-    "V0_5, 100 KiB, no traces, low cardinality   | 0          | true           | V0_5    ",
-    "V0_5, 100 KiB, 1 trace, low cardinality     | 1          | true           | V0_5    ",
-    "V0_5, 100 KiB, 10 traces, low cardinality   | 10         | true           | V0_5    ",
-    "V0_5, 100 KiB, 100 traces, low cardinality  | 100        | true           | V0_5    ",
-    "V0_5, 100 KiB, no traces, high cardinality  | 0          | false          | V0_5    ",
-    "V0_5, 100 KiB, 1 trace, high cardinality    | 1          | false          | V0_5    ",
-    "V0_5, 100 KiB, 10 traces, high cardinality  | 10         | false          | V0_5    ",
-    "V0_5, 100 KiB, 100 traces, high cardinality | 100        | false          | V0_5    ",
-    "V0_4, 10 KiB, no traces, low cardinality    | 0          | true           | V0_4    ",
-    "V0_4, 10 KiB, 1 trace, low cardinality      | 1          | true           | V0_4    ",
-    "V0_4, 30 KiB, 1 trace, low cardinality      | 1          | true           | V0_4    ",
-    "V0_4, 30 KiB, 2 traces, low cardinality     | 2          | true           | V0_4    ",
-    "V0_4, 10 KiB, no traces, high cardinality   | 0          | false          | V0_4    ",
-    "V0_4, 10 KiB, 1 trace, high cardinality     | 1          | false          | V0_4    ",
-    "V0_4, 30 KiB, 1 trace, high cardinality     | 1          | false          | V0_4    ",
-    "V0_4, 30 KiB, 2 traces, high cardinality    | 2          | false          | V0_4    ",
-    "V0_4, 100 KiB, no traces, low cardinality   | 0          | true           | V0_4    ",
-    "V0_4, 100 KiB, 1 trace, low cardinality     | 1          | true           | V0_4    ",
-    "V0_4, 100 KiB, 10 traces, low cardinality   | 10         | true           | V0_4    ",
-    "V0_4, 100 KiB, 100 traces, low cardinality  | 100        | true           | V0_4    ",
-    "V0_4, 100 KiB, no traces, high cardinality  | 0          | false          | V0_4    ",
-    "V0_4, 100 KiB, 1 trace, high cardinality    | 1          | false          | V0_4    ",
-    "V0_4, 100 KiB, 10 traces, high cardinality  | 10         | false          | V0_4    ",
-    "V0_4, 100 KiB, 100 traces, high cardinality | 100        | false          | V0_4    "
-  })
-  void sendRandomTraces(int traceCount, boolean lowCardinality, ProtocolVersion protocol) {
-    HealthMetrics healthMetrics = mock(HealthMetrics.class);
-    DDAgentFeaturesDiscovery discovery =
-        new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, protocol, true, false);
-    DDAgentApi api = new DDAgentApi(client, agentUrl, discovery, monitoring, false);
-    PayloadDispatcherImpl dispatcher =
-        new PayloadDispatcherImpl(
-            new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring);
-    List<List<CoreSpan>> traces = TraceGenerator.generateRandomTraces(traceCount, lowCardinality);
+    /**
+     * The KiB figures in the scenario labels come from the {@code bufferSize} column of the original
+     * Groovy data table. That column was never read by the test body, so the sizes distinguish the
+     * rows in reports but do not change what is exercised.
+     */
+    @TableTest({
+      "scenario                                    | traceCount | lowCardinality | protocol",
+      "V1_0, 10 KiB, no traces, low cardinality    | 0          | true           | V1_0    ",
+      "V1_0, 10 KiB, 1 trace, low cardinality      | 1          | true           | V1_0    ",
+      "V1_0, 30 KiB, 1 trace, low cardinality      | 1          | true           | V1_0    ",
+      "V1_0, 30 KiB, 2 traces, low cardinality     | 2          | true           | V1_0    ",
+      "V1_0, 10 KiB, no traces, high cardinality   | 0          | false          | V1_0    ",
+      "V1_0, 10 KiB, 1 trace, high cardinality     | 1          | false          | V1_0    ",
+      "V1_0, 30 KiB, 1 trace, high cardinality     | 1          | false          | V1_0    ",
+      "V1_0, 30 KiB, 2 traces, high cardinality    | 2          | false          | V1_0    ",
+      "V1_0, 100 KiB, no traces, low cardinality   | 0          | true           | V1_0    ",
+      "V1_0, 100 KiB, 1 trace, low cardinality     | 1          | true           | V1_0    ",
+      "V1_0, 100 KiB, 10 traces, low cardinality   | 10         | true           | V1_0    ",
+      "V1_0, 100 KiB, 100 traces, low cardinality  | 100        | true           | V1_0    ",
+      "V1_0, 100 KiB, no traces, high cardinality  | 0          | false          | V1_0    ",
+      "V1_0, 100 KiB, 1 trace, high cardinality    | 1          | false          | V1_0    ",
+      "V1_0, 100 KiB, 10 traces, high cardinality  | 10         | false          | V1_0    ",
+      "V1_0, 100 KiB, 100 traces, high cardinality | 100        | false          | V1_0    ",
+      "V0_5, 10 KiB, no traces, low cardinality    | 0          | true           | V0_5    ",
+      "V0_5, 10 KiB, 1 trace, low cardinality      | 1          | true           | V0_5    ",
+      "V0_5, 30 KiB, 1 trace, low cardinality      | 1          | true           | V0_5    ",
+      "V0_5, 30 KiB, 2 traces, low cardinality     | 2          | true           | V0_5    ",
+      "V0_5, 10 KiB, no traces, high cardinality   | 0          | false          | V0_5    ",
+      "V0_5, 10 KiB, 1 trace, high cardinality     | 1          | false          | V0_5    ",
+      "V0_5, 30 KiB, 1 trace, high cardinality     | 1          | false          | V0_5    ",
+      "V0_5, 30 KiB, 2 traces, high cardinality    | 2          | false          | V0_5    ",
+      "V0_5, 100 KiB, no traces, low cardinality   | 0          | true           | V0_5    ",
+      "V0_5, 100 KiB, 1 trace, low cardinality     | 1          | true           | V0_5    ",
+      "V0_5, 100 KiB, 10 traces, low cardinality   | 10         | true           | V0_5    ",
+      "V0_5, 100 KiB, 100 traces, low cardinality  | 100        | true           | V0_5    ",
+      "V0_5, 100 KiB, no traces, high cardinality  | 0          | false          | V0_5    ",
+      "V0_5, 100 KiB, 1 trace, high cardinality    | 1          | false          | V0_5    ",
+      "V0_5, 100 KiB, 10 traces, high cardinality  | 10         | false          | V0_5    ",
+      "V0_5, 100 KiB, 100 traces, high cardinality | 100        | false          | V0_5    ",
+      "V0_4, 10 KiB, no traces, low cardinality    | 0          | true           | V0_4    ",
+      "V0_4, 10 KiB, 1 trace, low cardinality      | 1          | true           | V0_4    ",
+      "V0_4, 30 KiB, 1 trace, low cardinality      | 1          | true           | V0_4    ",
+      "V0_4, 30 KiB, 2 traces, low cardinality     | 2          | true           | V0_4    ",
+      "V0_4, 10 KiB, no traces, high cardinality   | 0          | false          | V0_4    ",
+      "V0_4, 10 KiB, 1 trace, high cardinality     | 1          | false          | V0_4    ",
+      "V0_4, 30 KiB, 1 trace, high cardinality     | 1          | false          | V0_4    ",
+      "V0_4, 30 KiB, 2 traces, high cardinality    | 2          | false          | V0_4    ",
+      "V0_4, 100 KiB, no traces, low cardinality   | 0          | true           | V0_4    ",
+      "V0_4, 100 KiB, 1 trace, low cardinality     | 1          | true           | V0_4    ",
+      "V0_4, 100 KiB, 10 traces, low cardinality   | 10         | true           | V0_4    ",
+      "V0_4, 100 KiB, 100 traces, low cardinality  | 100        | true           | V0_4    ",
+      "V0_4, 100 KiB, no traces, high cardinality  | 0          | false          | V0_4    ",
+      "V0_4, 100 KiB, 1 trace, high cardinality    | 1          | false          | V0_4    ",
+      "V0_4, 100 KiB, 10 traces, high cardinality  | 10         | false          | V0_4    ",
+      "V0_4, 100 KiB, 100 traces, high cardinality | 100        | false          | V0_4    "
+    })
+    void sendRandomTraces(int traceCount, boolean lowCardinality, ProtocolVersion protocol) {
+        HealthMetrics healthMetrics = mock(HealthMetrics.class);
+        DDAgentFeaturesDiscovery discovery =
+                new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, protocol, true, false);
+        DDAgentApi api = new DDAgentApi(client, agentUrl, discovery, monitoring, false);
+        PayloadDispatcherImpl dispatcher =
+                new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring);
+        List<List<CoreSpan>> traces = TraceGenerator.generateRandomTraces(traceCount, lowCardinality);
 
-    for (List<CoreSpan> trace : traces) {
-      dispatcher.addTrace((List<? extends CoreSpan<?>>) (List<?>) trace);
-    }
-    dispatcher.flush();
+        for (List<CoreSpan> trace : traces) {
+            dispatcher.addTrace((List<? extends CoreSpan<?>>) (List<?>) trace);
+        }
+        dispatcher.flush();
 
-    verify(healthMetrics, never()).onFailedSerialize(any(), any());
-    verify(healthMetrics, never()).onFailedSend(anyInt(), anyInt(), any());
-    verify(healthMetrics, atLeast(0)).onSend(anyInt(), anyInt(), any());
-    verify(healthMetrics, atLeast(0)).onSerialize(anyInt());
-    verify(healthMetrics, never()).onFailedPublish(anyInt(), anyInt());
-    verifyNoMoreInteractions(healthMetrics);
-  }
+        verify(healthMetrics, never()).onFailedSerialize(any(), any());
+        verify(healthMetrics, never()).onFailedSend(anyInt(), anyInt(), any());
+        verify(healthMetrics, atLeast(0)).onSend(anyInt(), anyInt(), any());
+        verify(healthMetrics, atLeast(0)).onSerialize(anyInt());
+        verify(healthMetrics, never()).onFailedPublish(anyInt(), anyInt());
+        verifyNoMoreInteractions(healthMetrics);
+    }
 }
diff --git a/dd-trace-core/src/traceAgentTest/java/datadog/trace/common/metrics/MetricsIntegrationTest.java b/dd-trace-core/src/traceAgentTest/java/datadog/trace/common/metrics/MetricsIntegrationTest.java
index 537de40bfb7..8290482a0c6 100644
--- a/dd-trace-core/src/traceAgentTest/java/datadog/trace/common/metrics/MetricsIntegrationTest.java
+++ b/dd-trace-core/src/traceAgentTest/java/datadog/trace/common/metrics/MetricsIntegrationTest.java
@@ -37,154 +37,147 @@
 @ExtendWith(WithConfigExtension.class)
 class MetricsIntegrationTest {
 
-  // CI runs an agent container alongside the build (reached via CI_AGENT_HOST); when building
-  // locally we start one ourselves with testcontainers.
-  private static final boolean RUNNING_IN_CI = "true".equals(System.getenv("CI"));
-  private static GenericContainer<?> agentContainer;
-
-  @BeforeAll
-  static void setupSpec() {
-    // recordOneDuration -> Histogram.accept needs the metrics meter / histogram factory registered.
-    MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
-    AgentMeter.registerIfAbsent(StatsDClient.NO_OP, monitoring, DDSketchHistograms.FACTORY);
-
-    if (!RUNNING_IN_CI) {
-      Map<String, String> env = new HashMap<>();
-      env.put("DD_APM_ENABLED", "true");
-      env.put("DD_BIND_HOST", "0.0.0.0");
-      env.put("DD_API_KEY", "invalid_key_but_this_is_fine");
-      env.put("DD_HOSTNAME", "doesnotexist");
-      env.put("DD_LOGS_STDOUT", "yes");
-      agentContainer =
-          new GenericContainer<>(
-                  DockerImageName.parse(System.getProperty("test.datadog.agent.image")))
-              .withEnv(env)
-              .withExposedPorts(ConfigDefaults.DEFAULT_TRACE_AGENT_PORT)
-              .withStartupTimeout(Duration.ofSeconds(120))
-              // Sleep for a bit so the agent's rate_by_service response is populated -- mirrors the
-              // race-condition workaround from the original Spock base.
-              .withStartupCheckStrategy(
-                  new MinimumDurationRunningStartupCheckStrategy(Duration.ofSeconds(10)));
-      agentContainer.start();
+    // CI runs an agent container alongside the build (reached via CI_AGENT_HOST); when building
+    // locally we start one ourselves with testcontainers.
+    private static final boolean RUNNING_IN_CI = "true".equals(System.getenv("CI"));
+    private static GenericContainer<?> agentContainer;
+
+    @BeforeAll
+    static void setupSpec() {
+        // recordOneDuration -> Histogram.accept needs the metrics meter / histogram factory registered.
+        MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS);
+        AgentMeter.registerIfAbsent(StatsDClient.NO_OP, monitoring, DDSketchHistograms.FACTORY);
+
+        if (!RUNNING_IN_CI) {
+            Map<String, String> env = new HashMap<>();
+            env.put("DD_APM_ENABLED", "true");
+            env.put("DD_BIND_HOST", "0.0.0.0");
+            env.put("DD_API_KEY", "invalid_key_but_this_is_fine");
+            env.put("DD_HOSTNAME", "doesnotexist");
+            env.put("DD_LOGS_STDOUT", "yes");
+            agentContainer = new GenericContainer<>(
+                            DockerImageName.parse(System.getProperty("test.datadog.agent.image")))
+                    .withEnv(env)
+                    .withExposedPorts(ConfigDefaults.DEFAULT_TRACE_AGENT_PORT)
+                    .withStartupTimeout(Duration.ofSeconds(120))
+                    // Sleep for a bit so the agent's rate_by_service response is populated -- mirrors the
+                    // race-condition workaround from the original Spock base.
+                    .withStartupCheckStrategy(new MinimumDurationRunningStartupCheckStrategy(Duration.ofSeconds(10)));
+            agentContainer.start();
+        }
     }
-  }
 
-  @AfterAll
-  static void cleanupSpec() {
-    if (agentContainer != null) {
-      agentContainer.stop();
+    @AfterAll
+    static void cleanupSpec() {
+        if (agentContainer != null) {
+            agentContainer.stop();
+        }
     }
-  }
-
-  @BeforeEach
-  void setup() {
-    injectSysConfig(TracerConfig.AGENT_HOST, agentHost());
-    injectSysConfig(TracerConfig.TRACE_AGENT_PORT, agentPort());
-  }
-
-  private static String agentHost() {
-    return agentContainer != null ? agentContainer.getHost() : System.getenv("CI_AGENT_HOST");
-  }
-
-  private static String agentPort() {
-    return agentContainer != null
-        ? String.valueOf(agentContainer.getMappedPort(ConfigDefaults.DEFAULT_TRACE_AGENT_PORT))
-        : String.valueOf(ConfigDefaults.DEFAULT_TRACE_AGENT_PORT);
-  }
-
-  @Test
-  void sendMetricsToTraceAgentShouldNotifyWithOkEvent() throws InterruptedException {
-    // setup
-    CountDownLatch latch = new CountDownLatch(1);
-    BlockingListener listener = new BlockingListener(latch);
-    String agentUrl = Config.get().getAgentUrl();
-    OkHttpSink sink =
-        new OkHttpSink(
-            OkHttpUtils.buildHttpClient(HttpUrl.parse(agentUrl), 5000L),
-            agentUrl,
-            V06_METRICS_ENDPOINT,
-            true,
-            false,
-            Collections.emptyMap());
-    sink.register(listener);
-
-    // when
-    SerializingMetricWriter writer =
-        new SerializingMetricWriter(
-            new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language"),
-            sink);
-    writer.startBucket(2, System.nanoTime(), SECONDS.toNanos(10));
-    // Build entries through the production AggregateTable.findOrInsert path (canonicalizes the
-    // snapshot and creates/looks up the entry). Both entries use one peer tag (grault:quux) and no
-    // additional tags -> schema names=["grault"], values=["quux"].
-    AggregateTable table = new AggregateTable(8);
-    PeerTagSchema schema = new PeerTagSchema(new String[] {"grault"}, PeerTagSchema.NO_STATE);
-    SpanSnapshot snap1 =
-        new SpanSnapshot(
-            "resource1",
-            "service1",
-            "operation1",
-            null,
-            "sql",
-            (short) 0,
-            false,
-            true,
-            "xyzzy",
-            schema,
-            new String[] {"quux"},
-            null,
-            null,
-            null,
-            null,
-            0L);
-    AggregateEntry entry1 = table.findOrInsert(snap1);
-    for (long duration : new long[] {2, 1, 2, 250, 4}) {
-      entry1.recordOneDuration(duration);
-    }
-    writer.add(entry1);
-    SpanSnapshot snap2 =
-        new SpanSnapshot(
-            "resource2",
-            "service2",
-            "operation2",
-            null,
-            "web",
-            (short) 200,
-            false,
-            true,
-            "xyzzy",
-            schema,
-            new String[] {"quux"},
-            null,
-            null,
-            null,
-            null,
-            0L);
-    AggregateEntry entry2 = table.findOrInsert(snap2);
-    for (long duration : new long[] {1, 1, 200, 2, 3, 4, 5, 6, 7, 8}) {
-      entry2.recordOneDuration(duration);
+
+    @BeforeEach
+    void setup() {
+        injectSysConfig(TracerConfig.AGENT_HOST, agentHost());
+        injectSysConfig(TracerConfig.TRACE_AGENT_PORT, agentPort());
     }
-    writer.add(entry2);
-    writer.finishBucket();
 
-    // then
-    assertTrue(latch.await(5, SECONDS));
-    assertEquals(1, listener.events.size());
-    assertEquals(EventListener.EventType.OK, listener.events.get(0));
-  }
+    private static String agentHost() {
+        return agentContainer != null ? agentContainer.getHost() : System.getenv("CI_AGENT_HOST");
+    }
 
-  static class BlockingListener implements EventListener {
-    final List<EventListener.EventType> events = new CopyOnWriteArrayList<>();
-    final CountDownLatch latch;
+    private static String agentPort() {
+        return agentContainer != null
+                ? String.valueOf(agentContainer.getMappedPort(ConfigDefaults.DEFAULT_TRACE_AGENT_PORT))
+                : String.valueOf(ConfigDefaults.DEFAULT_TRACE_AGENT_PORT);
+    }
 
-    BlockingListener(CountDownLatch latch) {
-      this.latch = latch;
+    @Test
+    void sendMetricsToTraceAgentShouldNotifyWithOkEvent() throws InterruptedException {
+        // setup
+        CountDownLatch latch = new CountDownLatch(1);
+        BlockingListener listener = new BlockingListener(latch);
+        String agentUrl = Config.get().getAgentUrl();
+        OkHttpSink sink = new OkHttpSink(
+                OkHttpUtils.buildHttpClient(HttpUrl.parse(agentUrl), 5000L),
+                agentUrl,
+                V06_METRICS_ENDPOINT,
+                true,
+                false,
+                Collections.emptyMap());
+        sink.register(listener);
+
+        // when
+        SerializingMetricWriter writer = new SerializingMetricWriter(
+                new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language"), sink);
+        writer.startBucket(2, System.nanoTime(), SECONDS.toNanos(10));
+        // Build entries through the production AggregateTable.findOrInsert path (canonicalizes the
+        // snapshot and creates/looks up the entry). Both entries use one peer tag (grault:quux) and no
+        // additional tags -> schema names=["grault"], values=["quux"].
+        AggregateTable table = new AggregateTable(8);
+        PeerTagSchema schema = new PeerTagSchema(new String[] {"grault"}, PeerTagSchema.NO_STATE);
+        SpanSnapshot snap1 = new SpanSnapshot(
+                "resource1",
+                "service1",
+                "operation1",
+                null,
+                "sql",
+                (short) 0,
+                false,
+                true,
+                "xyzzy",
+                schema,
+                new String[] {"quux"},
+                null,
+                null,
+                null,
+                null,
+                0L);
+        AggregateEntry entry1 = table.findOrInsert(snap1);
+        for (long duration : new long[] {2, 1, 2, 250, 4}) {
+            entry1.recordOneDuration(duration);
+        }
+        writer.add(entry1);
+        SpanSnapshot snap2 = new SpanSnapshot(
+                "resource2",
+                "service2",
+                "operation2",
+                null,
+                "web",
+                (short) 200,
+                false,
+                true,
+                "xyzzy",
+                schema,
+                new String[] {"quux"},
+                null,
+                null,
+                null,
+                null,
+                0L);
+        AggregateEntry entry2 = table.findOrInsert(snap2);
+        for (long duration : new long[] {1, 1, 200, 2, 3, 4, 5, 6, 7, 8}) {
+            entry2.recordOneDuration(duration);
+        }
+        writer.add(entry2);
+        writer.finishBucket();
+
+        // then
+        assertTrue(latch.await(5, SECONDS));
+        assertEquals(1, listener.events.size());
+        assertEquals(EventListener.EventType.OK, listener.events.get(0));
     }
 
-    @Override
-    public void onEvent(EventListener.EventType eventType, String message) {
-      events.add(eventType);
-      latch.countDown();
+    static class BlockingListener implements EventListener {
+        final List<EventListener.EventType> events = new CopyOnWriteArrayList<>();
+        final CountDownLatch latch;
+
+        BlockingListener(CountDownLatch latch) {
+            this.latch = latch;
+        }
+
+        @Override
+        public void onEvent(EventListener.EventType eventType, String message) {
+            events.add(eventType);
+            latch.countDown();
+        }
     }
-  }
 }
diff --git a/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/AbstractCorrelationIdInjector.java b/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/AbstractCorrelationIdInjector.java
index e32bdc34b7f..9662ff6c7de 100644
--- a/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/AbstractCorrelationIdInjector.java
+++ b/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/AbstractCorrelationIdInjector.java
@@ -3,11 +3,11 @@
 import datadog.trace.api.internal.InternalTracer;
 
 abstract class AbstractCorrelationIdInjector {
-  AbstractCorrelationIdInjector(InternalTracer tracer) {
-    tracer.addScopeListener(this::afterScopeActivatedCallback, this::afterScopeClosedCallback);
-  }
+    AbstractCorrelationIdInjector(InternalTracer tracer) {
+        tracer.addScopeListener(this::afterScopeActivatedCallback, this::afterScopeClosedCallback);
+    }
 
-  protected abstract void afterScopeActivatedCallback();
+    protected abstract void afterScopeActivatedCallback();
 
-  protected abstract void afterScopeClosedCallback();
+    protected abstract void afterScopeClosedCallback();
 }
diff --git a/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/CorrelationIdInjectors.java b/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/CorrelationIdInjectors.java
index 2e293006f64..d3b3f4a361c 100644
--- a/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/CorrelationIdInjectors.java
+++ b/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/CorrelationIdInjectors.java
@@ -7,60 +7,58 @@
 
 /** Helper class to enable correlation identifier injection. */
 public final class CorrelationIdInjectors {
-  private static final Logger log = LoggerFactory.getLogger(CorrelationIdInjectors.class);
+    private static final Logger log = LoggerFactory.getLogger(CorrelationIdInjectors.class);
 
-  private CorrelationIdInjectors() {}
+    private CorrelationIdInjectors() {}
 
-  /**
-   * Register any applicable correlation identifier injectors.
-   *
-   * @param tracer The tracer to register the injectors to.
-   */
-  public static void register(InternalTracer tracer) {
-    for (InjectorType type : InjectorType.values()) {
-      type.register(tracer);
+    /**
+     * Register any applicable correlation identifier injectors.
+     *
+     * @param tracer The tracer to register the injectors to.
+     */
+    public static void register(InternalTracer tracer) {
+        for (InjectorType type : InjectorType.values()) {
+            type.register(tracer);
+        }
     }
-  }
 
-  @SuppressForbidden
-  private static boolean isClassPresent(String className) {
-    try {
-      Class.forName(className);
-      return true;
-    } catch (ClassNotFoundException ignored) {
-      return false;
+    @SuppressForbidden
+    private static boolean isClassPresent(String className) {
+        try {
+            Class.forName(className);
+            return true;
+        } catch (ClassNotFoundException ignored) {
+            return false;
+        }
     }
-  }
 
-  @SuppressForbidden
-  private static void enableInjector(String className, InternalTracer tracer) {
-    try {
-      Class<?> injectorClass = Class.forName(className);
-      injectorClass.getConstructor(InternalTracer.class).newInstance(tracer);
-    } catch (ReflectiveOperationException e) {
-      log.warn("Failed to enable injector {}.", className, e);
+    @SuppressForbidden
+    private static void enableInjector(String className, InternalTracer tracer) {
+        try {
+            Class<?> injectorClass = Class.forName(className);
+            injectorClass.getConstructor(InternalTracer.class).newInstance(tracer);
+        } catch (ReflectiveOperationException e) {
+            log.warn("Failed to enable injector {}.", className, e);
+        }
     }
-  }
 
-  private enum InjectorType {
-    LOG4J("org.apache.log4j.MDC", "datadog.trace.correlation.Log4jCorrelationIdInjector"),
-    LOG4J2(
-        "org.apache.logging.log4j.ThreadContext",
-        "datadog.trace.correlation.Log4j2CorrelationIdInjector"),
-    SLF4J_AND_LOGBACK("org.slf4j.MDC", "datadog.trace.correlation.Slf4jCorrelationIdInjector");
+    private enum InjectorType {
+        LOG4J("org.apache.log4j.MDC", "datadog.trace.correlation.Log4jCorrelationIdInjector"),
+        LOG4J2("org.apache.logging.log4j.ThreadContext", "datadog.trace.correlation.Log4j2CorrelationIdInjector"),
+        SLF4J_AND_LOGBACK("org.slf4j.MDC", "datadog.trace.correlation.Slf4jCorrelationIdInjector");
 
-    private final String mdcClassName;
-    private final String injectorClassName;
+        private final String mdcClassName;
+        private final String injectorClassName;
 
-    InjectorType(String mdcClassName, String injectorClassName) {
-      this.mdcClassName = mdcClassName;
-      this.injectorClassName = injectorClassName;
-    }
+        InjectorType(String mdcClassName, String injectorClassName) {
+            this.mdcClassName = mdcClassName;
+            this.injectorClassName = injectorClassName;
+        }
 
-    void register(InternalTracer tracer) {
-      if (isClassPresent(this.mdcClassName)) {
-        enableInjector(this.injectorClassName, tracer);
-      }
+        void register(InternalTracer tracer) {
+            if (isClassPresent(this.mdcClassName)) {
+                enableInjector(this.injectorClassName, tracer);
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/Log4j2CorrelationIdInjector.java b/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/Log4j2CorrelationIdInjector.java
index f32a171d9e3..c603c81ba79 100644
--- a/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/Log4j2CorrelationIdInjector.java
+++ b/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/Log4j2CorrelationIdInjector.java
@@ -7,19 +7,19 @@
 /** Inject trace and span identifiers using Log4j2 ThreadContext. */
 @SuppressWarnings("unused")
 class Log4j2CorrelationIdInjector extends AbstractCorrelationIdInjector {
-  public Log4j2CorrelationIdInjector(InternalTracer tracer) {
-    super(tracer);
-  }
+    public Log4j2CorrelationIdInjector(InternalTracer tracer) {
+        super(tracer);
+    }
 
-  @Override
-  protected void afterScopeActivatedCallback() {
-    ThreadContext.put(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
-    ThreadContext.put(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
-  }
+    @Override
+    protected void afterScopeActivatedCallback() {
+        ThreadContext.put(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+        ThreadContext.put(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+    }
 
-  @Override
-  protected void afterScopeClosedCallback() {
-    ThreadContext.remove(CorrelationIdentifier.getTraceIdKey());
-    ThreadContext.remove(CorrelationIdentifier.getSpanIdKey());
-  }
+    @Override
+    protected void afterScopeClosedCallback() {
+        ThreadContext.remove(CorrelationIdentifier.getTraceIdKey());
+        ThreadContext.remove(CorrelationIdentifier.getSpanIdKey());
+    }
 }
diff --git a/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/Log4jCorrelationIdInjector.java b/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/Log4jCorrelationIdInjector.java
index 2fd249c9a53..7430b8d9e2e 100644
--- a/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/Log4jCorrelationIdInjector.java
+++ b/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/Log4jCorrelationIdInjector.java
@@ -11,19 +11,19 @@
  */
 @SuppressWarnings("unused")
 class Log4jCorrelationIdInjector extends AbstractCorrelationIdInjector {
-  public Log4jCorrelationIdInjector(InternalTracer tracer) {
-    super(tracer);
-  }
+    public Log4jCorrelationIdInjector(InternalTracer tracer) {
+        super(tracer);
+    }
 
-  @Override
-  protected void afterScopeActivatedCallback() {
-    MDC.put(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
-    MDC.put(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
-  }
+    @Override
+    protected void afterScopeActivatedCallback() {
+        MDC.put(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+        MDC.put(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+    }
 
-  @Override
-  protected void afterScopeClosedCallback() {
-    MDC.remove(CorrelationIdentifier.getTraceIdKey());
-    MDC.remove(CorrelationIdentifier.getSpanIdKey());
-  }
+    @Override
+    protected void afterScopeClosedCallback() {
+        MDC.remove(CorrelationIdentifier.getTraceIdKey());
+        MDC.remove(CorrelationIdentifier.getSpanIdKey());
+    }
 }
diff --git a/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/Slf4jCorrelationIdInjector.java b/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/Slf4jCorrelationIdInjector.java
index 8bdd5119fbd..f6887411f07 100644
--- a/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/Slf4jCorrelationIdInjector.java
+++ b/dd-trace-ot/correlation-id-injection/src/main/java/datadog/trace/correlation/Slf4jCorrelationIdInjector.java
@@ -10,19 +10,19 @@
  */
 @SuppressWarnings("unused")
 class Slf4jCorrelationIdInjector extends AbstractCorrelationIdInjector {
-  public Slf4jCorrelationIdInjector(InternalTracer tracer) {
-    super(tracer);
-  }
+    public Slf4jCorrelationIdInjector(InternalTracer tracer) {
+        super(tracer);
+    }
 
-  @Override
-  protected void afterScopeActivatedCallback() {
-    MDC.put(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
-    MDC.put(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
-  }
+    @Override
+    protected void afterScopeActivatedCallback() {
+        MDC.put(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+        MDC.put(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+    }
 
-  @Override
-  protected void afterScopeClosedCallback() {
-    MDC.remove(CorrelationIdentifier.getTraceIdKey());
-    MDC.remove(CorrelationIdentifier.getSpanIdKey());
-  }
+    @Override
+    protected void afterScopeClosedCallback() {
+        MDC.remove(CorrelationIdentifier.getTraceIdKey());
+        MDC.remove(CorrelationIdentifier.getSpanIdKey());
+    }
 }
diff --git a/dd-trace-ot/correlation-id-injection/src/test/java/CorrelationIdInjectorTest.java b/dd-trace-ot/correlation-id-injection/src/test/java/CorrelationIdInjectorTest.java
index a3228a7094c..559b78aeab1 100644
--- a/dd-trace-ot/correlation-id-injection/src/test/java/CorrelationIdInjectorTest.java
+++ b/dd-trace-ot/correlation-id-injection/src/test/java/CorrelationIdInjectorTest.java
@@ -10,71 +10,70 @@
 
 abstract class CorrelationIdInjectorTest extends DDJavaSpecification {
 
-  protected static final String LOG_PATTERN =
-      "TRACE_ID=%X{"
-          + CorrelationIdentifier.getTraceIdKey()
-          + "} SPAN_ID=%X{"
-          + CorrelationIdentifier.getSpanIdKey()
-          + "} %m";
+    protected static final String LOG_PATTERN = "TRACE_ID=%X{"
+            + CorrelationIdentifier.getTraceIdKey()
+            + "} SPAN_ID=%X{"
+            + CorrelationIdentifier.getSpanIdKey()
+            + "} %m";
 
-  @Test
-  void testCorrelationIdInjection() throws Exception {
-    DDTracer tracer = buildTracer();
-    LogJournal journal = buildJournal();
-    TestLogger logger = buildLogger();
+    @Test
+    void testCorrelationIdInjection() throws Exception {
+        DDTracer tracer = buildTracer();
+        LogJournal journal = buildJournal();
+        TestLogger logger = buildLogger();
 
-    logger.log("Event without context");
+        logger.log("Event without context");
 
-    assertEquals("TRACE_ID= SPAN_ID= Event without context", journal.nextLog());
+        assertEquals("TRACE_ID= SPAN_ID= Event without context", journal.nextLog());
 
-    Span rootSpan = tracer.buildSpan("operation1").start();
-    Scope rootScope = tracer.activateSpan(rootSpan);
-    logger.log("Event with root span context");
+        Span rootSpan = tracer.buildSpan("operation1").start();
+        Scope rootScope = tracer.activateSpan(rootSpan);
+        logger.log("Event with root span context");
 
-    assertEquals(expectedLog("Event with root span context"), journal.nextLog());
+        assertEquals(expectedLog("Event with root span context"), journal.nextLog());
 
-    Span childSpan = tracer.buildSpan("operation1").asChildOf(rootSpan).start();
-    Scope childScope = tracer.activateSpan(childSpan);
-    logger.log("Event with child span context");
+        Span childSpan = tracer.buildSpan("operation1").asChildOf(rootSpan).start();
+        Scope childScope = tracer.activateSpan(childSpan);
+        logger.log("Event with child span context");
 
-    assertEquals(expectedLog("Event with child span context"), journal.nextLog());
+        assertEquals(expectedLog("Event with child span context"), journal.nextLog());
 
-    childScope.close();
-    childSpan.finish();
-    logger.log("Event with root span context");
+        childScope.close();
+        childSpan.finish();
+        logger.log("Event with root span context");
 
-    assertEquals(expectedLog("Event with root span context"), journal.nextLog());
+        assertEquals(expectedLog("Event with root span context"), journal.nextLog());
 
-    rootScope.close();
-    rootSpan.finish();
-    logger.log("Event without context");
+        rootScope.close();
+        rootSpan.finish();
+        logger.log("Event without context");
 
-    assertEquals("TRACE_ID= SPAN_ID= Event without context", journal.nextLog());
+        assertEquals("TRACE_ID= SPAN_ID= Event without context", journal.nextLog());
 
-    tracer.close();
-  }
+        tracer.close();
+    }
 
-  private static String expectedLog(String message) {
-    return String.format(
-        "TRACE_ID=%s SPAN_ID=%s %s",
-        CorrelationIdentifier.getTraceId(), CorrelationIdentifier.getSpanId(), message);
-  }
+    private static String expectedLog(String message) {
+        return String.format(
+                "TRACE_ID=%s SPAN_ID=%s %s",
+                CorrelationIdentifier.getTraceId(), CorrelationIdentifier.getSpanId(), message);
+    }
 
-  DDTracer buildTracer() {
-    DDTracer tracer = new DDTracer.DDTracerBuilder().build();
-    GlobalTracer.registerIfAbsent(tracer);
-    return tracer;
-  }
+    DDTracer buildTracer() {
+        DDTracer tracer = new DDTracer.DDTracerBuilder().build();
+        GlobalTracer.registerIfAbsent(tracer);
+        return tracer;
+    }
 
-  abstract LogJournal buildJournal();
+    abstract LogJournal buildJournal();
 
-  abstract TestLogger buildLogger();
+    abstract TestLogger buildLogger();
 
-  interface LogJournal {
-    String nextLog();
-  }
+    interface LogJournal {
+        String nextLog();
+    }
 
-  interface TestLogger {
-    void log(String message);
-  }
+    interface TestLogger {
+        void log(String message);
+    }
 }
diff --git a/dd-trace-ot/correlation-id-injection/src/test/java/Log4j2CorrelationIdInjectorTest.java b/dd-trace-ot/correlation-id-injection/src/test/java/Log4j2CorrelationIdInjectorTest.java
index e6bf85b9b18..3898b603e34 100644
--- a/dd-trace-ot/correlation-id-injection/src/test/java/Log4j2CorrelationIdInjectorTest.java
+++ b/dd-trace-ot/correlation-id-injection/src/test/java/Log4j2CorrelationIdInjectorTest.java
@@ -14,57 +14,56 @@
 
 class Log4j2CorrelationIdInjectorTest extends CorrelationIdInjectorTest {
 
-  @Override
-  LogJournal buildJournal() {
-    LoggerContext context = LoggerContext.getContext(false);
-    Configuration config = context.getConfiguration();
+    @Override
+    LogJournal buildJournal() {
+        LoggerContext context = LoggerContext.getContext(false);
+        Configuration config = context.getConfiguration();
 
-    TestAppender appender =
-        new TestAppender(PatternLayout.newBuilder().withPattern(LOG_PATTERN).build());
-    appender.start();
-    config.addAppender(appender);
-    updateLoggers(appender, config);
-    return appender;
-  }
+        TestAppender appender = new TestAppender(
+                PatternLayout.newBuilder().withPattern(LOG_PATTERN).build());
+        appender.start();
+        config.addAppender(appender);
+        updateLoggers(appender, config);
+        return appender;
+    }
 
-  @Override
-  TestLogger buildLogger() {
-    Logger logger = LogManager.getLogger("TestLogger");
-    return message -> logger.error(message);
-  }
+    @Override
+    TestLogger buildLogger() {
+        Logger logger = LogManager.getLogger("TestLogger");
+        return message -> logger.error(message);
+    }
 
-  private static void updateLoggers(Appender appender, Configuration config) {
-    Level level = null;
-    Filter filter = null;
-    for (LoggerConfig loggerConfig : config.getLoggers().values()) {
-      loggerConfig.addAppender(appender, level, filter);
+    private static void updateLoggers(Appender appender, Configuration config) {
+        Level level = null;
+        Filter filter = null;
+        for (LoggerConfig loggerConfig : config.getLoggers().values()) {
+            loggerConfig.addAppender(appender, level, filter);
+        }
+        config.getRootLogger().addAppender(appender, level, filter);
     }
-    config.getRootLogger().addAppender(appender, level, filter);
-  }
 
-  static class TestAppender extends AbstractAppender
-      implements CorrelationIdInjectorTest.LogJournal {
-    List<String> events;
-    int read;
+    static class TestAppender extends AbstractAppender implements CorrelationIdInjectorTest.LogJournal {
+        List<String> events;
+        int read;
 
-    protected TestAppender(PatternLayout patternLayout) {
-      super("TestAppender", null, patternLayout, false, null);
-      events = new ArrayList<>();
-      read = 0;
-    }
+        protected TestAppender(PatternLayout patternLayout) {
+            super("TestAppender", null, patternLayout, false, null);
+            events = new ArrayList<>();
+            read = 0;
+        }
 
-    @Override
-    public void append(LogEvent event) {
-      String log = ((PatternLayout) getLayout()).toSerializable(event);
-      events.add(log);
-    }
+        @Override
+        public void append(LogEvent event) {
+            String log = ((PatternLayout) getLayout()).toSerializable(event);
+            events.add(log);
+        }
 
-    @Override
-    public String nextLog() {
-      if (events.size() <= read) {
-        return null;
-      }
-      return events.get(read++);
+        @Override
+        public String nextLog() {
+            if (events.size() <= read) {
+                return null;
+            }
+            return events.get(read++);
+        }
     }
-  }
 }
diff --git a/dd-trace-ot/correlation-id-injection/src/test/java/Slf4jCorrelationIdInjectorTest.java b/dd-trace-ot/correlation-id-injection/src/test/java/Slf4jCorrelationIdInjectorTest.java
index f6254708ad9..54bbd16acc2 100644
--- a/dd-trace-ot/correlation-id-injection/src/test/java/Slf4jCorrelationIdInjectorTest.java
+++ b/dd-trace-ot/correlation-id-injection/src/test/java/Slf4jCorrelationIdInjectorTest.java
@@ -9,58 +9,57 @@
 
 class Slf4jCorrelationIdInjectorTest extends CorrelationIdInjectorTest {
 
-  ch.qos.logback.classic.Logger logger;
-
-  @Override
-  LogJournal buildJournal() {
-    LoggerContext logCtx = (LoggerContext) LoggerFactory.getILoggerFactory();
-    ch.qos.logback.classic.Logger log = logCtx.getLogger("TestLogger");
-    this.logger = log;
-    TestAppender testAppender = new TestAppender(logCtx);
-    testAppender.start();
-    log.addAppender(testAppender);
-    return testAppender;
-  }
-
-  @Override
-  TestLogger buildLogger() {
-    Logger log = LoggerFactory.getLogger("TestLogger");
-    return message -> log.error(message);
-  }
-
-  class TestAppender extends AppenderBase<ILoggingEvent>
-      implements CorrelationIdInjectorTest.LogJournal {
-    private final List<String> events;
-    int read;
-    private final PatternLayoutEncoder encoder;
-
-    TestAppender(LoggerContext logCtx) {
-      name = "TestAppender";
-      encoder = new PatternLayoutEncoder();
-      encoder.setContext(logCtx);
-      encoder.setPattern(LOG_PATTERN);
-      events = new ArrayList<>();
-      read = 0;
-    }
+    ch.qos.logback.classic.Logger logger;
 
     @Override
-    public void start() {
-      encoder.start();
-      super.start();
+    LogJournal buildJournal() {
+        LoggerContext logCtx = (LoggerContext) LoggerFactory.getILoggerFactory();
+        ch.qos.logback.classic.Logger log = logCtx.getLogger("TestLogger");
+        this.logger = log;
+        TestAppender testAppender = new TestAppender(logCtx);
+        testAppender.start();
+        log.addAppender(testAppender);
+        return testAppender;
     }
 
     @Override
-    protected void append(ILoggingEvent event) {
-      String log = this.encoder.getLayout().doLayout(event);
-      events.add(log);
+    TestLogger buildLogger() {
+        Logger log = LoggerFactory.getLogger("TestLogger");
+        return message -> log.error(message);
     }
 
-    @Override
-    public String nextLog() {
-      if (events.size() <= read) {
-        return null;
-      }
-      return events.get(read++);
+    class TestAppender extends AppenderBase<ILoggingEvent> implements CorrelationIdInjectorTest.LogJournal {
+        private final List<String> events;
+        int read;
+        private final PatternLayoutEncoder encoder;
+
+        TestAppender(LoggerContext logCtx) {
+            name = "TestAppender";
+            encoder = new PatternLayoutEncoder();
+            encoder.setContext(logCtx);
+            encoder.setPattern(LOG_PATTERN);
+            events = new ArrayList<>();
+            read = 0;
+        }
+
+        @Override
+        public void start() {
+            encoder.start();
+            super.start();
+        }
+
+        @Override
+        protected void append(ILoggingEvent event) {
+            String log = this.encoder.getLayout().doLayout(event);
+            events.add(log);
+        }
+
+        @Override
+        public String nextLog() {
+            if (events.size() <= read) {
+                return null;
+            }
+            return events.get(read++);
+        }
     }
-  }
 }
diff --git a/dd-trace-ot/src/jmh/java/datadog/trace/DDTraceBenchmark.java b/dd-trace-ot/src/jmh/java/datadog/trace/DDTraceBenchmark.java
index 73aa44ff6a1..be2c5b193f4 100644
--- a/dd-trace-ot/src/jmh/java/datadog/trace/DDTraceBenchmark.java
+++ b/dd-trace-ot/src/jmh/java/datadog/trace/DDTraceBenchmark.java
@@ -8,42 +8,42 @@
 import org.openjdk.jmh.annotations.State;
 
 public class DDTraceBenchmark {
-  public static String SPAN_NAME = "span-benchmark";
-
-  @State(org.openjdk.jmh.annotations.Scope.Thread)
-  public static class TraceState {
-    public ListWriter traceCollector = new ListWriter();
-    public Tracer tracer = DDTracer.builder().writer(traceCollector).build();
-    // TODO: this will need to be fixed if we want backwards compatibility for older versions...
-    public io.opentracing.Scope scope = tracer.buildSpan(SPAN_NAME).startActive(true);
-  }
-
-  @Benchmark
-  public Object testBuildSpan(final TraceState state) {
-    return state.tracer.buildSpan(SPAN_NAME);
-  }
-
-  @Benchmark
-  public Object testBuildStartSpan(final TraceState state) {
-    return state.tracer.buildSpan(SPAN_NAME).start();
-  }
-
-  @Benchmark
-  public Object testFullSpan(final TraceState state) {
-    final Span span = state.tracer.buildSpan(SPAN_NAME).start();
-    span.finish();
-    return span;
-  }
-
-  @Benchmark
-  public Object testBuildStartSpanActive(final TraceState state) {
-    return state.tracer.buildSpan(SPAN_NAME).startActive(true);
-  }
-
-  @Benchmark
-  public Object testFullActiveSpan(final TraceState state) {
-    final io.opentracing.Scope scope = state.tracer.buildSpan(SPAN_NAME).startActive(true);
-    scope.close();
-    return scope;
-  }
+    public static String SPAN_NAME = "span-benchmark";
+
+    @State(org.openjdk.jmh.annotations.Scope.Thread)
+    public static class TraceState {
+        public ListWriter traceCollector = new ListWriter();
+        public Tracer tracer = DDTracer.builder().writer(traceCollector).build();
+        // TODO: this will need to be fixed if we want backwards compatibility for older versions...
+        public io.opentracing.Scope scope = tracer.buildSpan(SPAN_NAME).startActive(true);
+    }
+
+    @Benchmark
+    public Object testBuildSpan(final TraceState state) {
+        return state.tracer.buildSpan(SPAN_NAME);
+    }
+
+    @Benchmark
+    public Object testBuildStartSpan(final TraceState state) {
+        return state.tracer.buildSpan(SPAN_NAME).start();
+    }
+
+    @Benchmark
+    public Object testFullSpan(final TraceState state) {
+        final Span span = state.tracer.buildSpan(SPAN_NAME).start();
+        span.finish();
+        return span;
+    }
+
+    @Benchmark
+    public Object testBuildStartSpanActive(final TraceState state) {
+        return state.tracer.buildSpan(SPAN_NAME).startActive(true);
+    }
+
+    @Benchmark
+    public Object testFullActiveSpan(final TraceState state) {
+        final io.opentracing.Scope scope = state.tracer.buildSpan(SPAN_NAME).startActive(true);
+        scope.close();
+        return scope;
+    }
 }
diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java
index 9494c772aee..ddb2660f98f 100644
--- a/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java
+++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java
@@ -49,655 +49,652 @@
  * traces and spans to Datadog using the OpenTracing API.
  */
 public class DDTracer implements Tracer, datadog.trace.api.Tracer, InternalTracer {
-  private static final String INSTRUMENTATION_NAME = "opentracing";
-  private static final Logger log = LoggerFactory.getLogger(DDTracer.class);
-
-  static {
-    ClassLoader classLoader = DDTracer.class.getClassLoader();
-    if (classLoader == null) {
-      log.error("dd-trace-ot should not be on the bootstrap classpath.");
-    } else {
-      try {
-        Class<?> bootstrapClass =
-            Class.forName("datadog.trace.bootstrap.AgentBootstrap", false, classLoader);
-        if (bootstrapClass.getClassLoader() == null) {
-          log.error("dd-trace-ot should not be used with dd-java-agent.");
+    private static final String INSTRUMENTATION_NAME = "opentracing";
+    private static final Logger log = LoggerFactory.getLogger(DDTracer.class);
+
+    static {
+        ClassLoader classLoader = DDTracer.class.getClassLoader();
+        if (classLoader == null) {
+            log.error("dd-trace-ot should not be on the bootstrap classpath.");
         } else {
-          log.error("dd-java-agent should not be on the classpath.");
+            try {
+                Class<?> bootstrapClass = Class.forName("datadog.trace.bootstrap.AgentBootstrap", false, classLoader);
+                if (bootstrapClass.getClassLoader() == null) {
+                    log.error("dd-trace-ot should not be used with dd-java-agent.");
+                } else {
+                    log.error("dd-java-agent should not be on the classpath.");
+                }
+            } catch (ClassNotFoundException expected) {
+                // ignore
+            }
         }
-      } catch (ClassNotFoundException expected) {
-        // ignore
-      }
     }
-  }
 
-  public static DDTracerBuilder builder() {
-    return new DDTracerBuilder();
-  }
+    public static DDTracerBuilder builder() {
+        return new DDTracerBuilder();
+    }
 
-  private final TypeConverter converter;
-  private final AgentTracer.TracerAPI tracer;
+    private final TypeConverter converter;
+    private final AgentTracer.TracerAPI tracer;
 
-  // FIXME [API] There's an unfortunate cycle between OTScopeManager and CoreTracer where they
-  // each depend on each other so scopeManager can't be final
-  // Perhaps the api can change so that CoreTracer doesn't need to implement scope methods directly
-  private ScopeManager scopeManager;
+    // FIXME [API] There's an unfortunate cycle between OTScopeManager and CoreTracer where they
+    // each depend on each other so scopeManager can't be final
+    // Perhaps the api can change so that CoreTracer doesn't need to implement scope methods directly
+    private ScopeManager scopeManager;
+
+    public static class DDTracerBuilder {
+
+        private Config config;
+        private String serviceName;
+        private Writer writer;
+        private Sampler sampler;
+        private HttpCodec.Injector injector;
+        private HttpCodec.Extractor extractor;
+        private Map<String, String> localRootSpanTags;
+        private Map<String, String> defaultSpanTags;
+        private Map<String, String> serviceNameMappings;
+        private Map<String, String> taggedHeaders;
+        private int partialFlushMinSpans;
+        private LogHandler logHandler;
+        private StatsDClient statsDClient;
+
+        public DDTracerBuilder config(Config config) {
+            this.config = config;
+            return this;
+        }
 
-  public static class DDTracerBuilder {
+        public DDTracerBuilder serviceName(String serviceName) {
+            this.serviceName = serviceName;
+            return this;
+        }
 
-    private Config config;
-    private String serviceName;
-    private Writer writer;
-    private Sampler sampler;
-    private HttpCodec.Injector injector;
-    private HttpCodec.Extractor extractor;
-    private Map<String, String> localRootSpanTags;
-    private Map<String, String> defaultSpanTags;
-    private Map<String, String> serviceNameMappings;
-    private Map<String, String> taggedHeaders;
-    private int partialFlushMinSpans;
-    private LogHandler logHandler;
-    private StatsDClient statsDClient;
+        public DDTracerBuilder writer(Writer writer) {
+            this.writer = writer;
+            return this;
+        }
 
-    public DDTracerBuilder config(Config config) {
-      this.config = config;
-      return this;
-    }
+        public DDTracerBuilder sampler(Sampler sampler) {
+            this.sampler = sampler;
+            return this;
+        }
 
-    public DDTracerBuilder serviceName(String serviceName) {
-      this.serviceName = serviceName;
-      return this;
-    }
+        public DDTracerBuilder injector(HttpCodec.Injector injector) {
+            this.injector = injector;
+            return this;
+        }
 
-    public DDTracerBuilder writer(Writer writer) {
-      this.writer = writer;
-      return this;
-    }
+        public DDTracerBuilder extractor(HttpCodec.Extractor extractor) {
+            this.extractor = extractor;
+            return this;
+        }
 
-    public DDTracerBuilder sampler(Sampler sampler) {
-      this.sampler = sampler;
-      return this;
-    }
+        @Deprecated
+        public DDTracerBuilder scopeManager(ScopeManager scopeManager) {
+            log.warn("Custom ScopeManagers are not supported");
+            return this;
+        }
 
-    public DDTracerBuilder injector(HttpCodec.Injector injector) {
-      this.injector = injector;
-      return this;
-    }
+        public DDTracerBuilder localRootSpanTags(Map<String, String> localRootSpanTags) {
+            this.localRootSpanTags = localRootSpanTags;
+            return this;
+        }
+
+        public DDTracerBuilder defaultSpanTags(Map<String, String> defaultSpanTags) {
+            this.defaultSpanTags = defaultSpanTags;
+            return this;
+        }
+
+        public DDTracerBuilder serviceNameMappings(Map<String, String> serviceNameMappings) {
+            this.serviceNameMappings = serviceNameMappings;
+            return this;
+        }
+
+        public DDTracerBuilder taggedHeaders(Map<String, String> taggedHeaders) {
+            this.taggedHeaders = taggedHeaders;
+            return this;
+        }
+
+        public DDTracerBuilder partialFlushMinSpans(int partialFlushMinSpans) {
+            this.partialFlushMinSpans = partialFlushMinSpans;
+            return this;
+        }
+
+        public DDTracerBuilder logHandler(LogHandler logHandler) {
+            this.logHandler = logHandler;
+            return this;
+        }
 
-    public DDTracerBuilder extractor(HttpCodec.Extractor extractor) {
-      this.extractor = extractor;
-      return this;
+        public DDTracerBuilder statsDClient(StatsDClient statsDClient) {
+            this.statsDClient = statsDClient;
+            return this;
+        }
+
+        public DDTracerBuilder withProperties(final Properties properties) {
+            return config(Config.get(properties));
+        }
+
+        public DDTracer build() {
+            return new DDTracer(
+                    config,
+                    serviceName,
+                    writer,
+                    sampler,
+                    injector,
+                    extractor,
+                    localRootSpanTags,
+                    defaultSpanTags,
+                    serviceNameMappings,
+                    taggedHeaders,
+                    partialFlushMinSpans,
+                    logHandler,
+                    statsDClient);
+        }
     }
 
     @Deprecated
-    public DDTracerBuilder scopeManager(ScopeManager scopeManager) {
-      log.warn("Custom ScopeManagers are not supported");
-      return this;
+    public DDTracer() {
+        this(CoreTracer.builder().build());
     }
 
-    public DDTracerBuilder localRootSpanTags(Map<String, String> localRootSpanTags) {
-      this.localRootSpanTags = localRootSpanTags;
-      return this;
+    @Deprecated
+    public DDTracer(final String serviceName) {
+        this(CoreTracer.builder().serviceName(serviceName).build());
     }
 
-    public DDTracerBuilder defaultSpanTags(Map<String, String> defaultSpanTags) {
-      this.defaultSpanTags = defaultSpanTags;
-      return this;
+    @Deprecated
+    public DDTracer(final Properties properties) {
+        this(CoreTracer.builder().withProperties(properties).build());
     }
 
-    public DDTracerBuilder serviceNameMappings(Map<String, String> serviceNameMappings) {
-      this.serviceNameMappings = serviceNameMappings;
-      return this;
-    }
-
-    public DDTracerBuilder taggedHeaders(Map<String, String> taggedHeaders) {
-      this.taggedHeaders = taggedHeaders;
-      return this;
-    }
-
-    public DDTracerBuilder partialFlushMinSpans(int partialFlushMinSpans) {
-      this.partialFlushMinSpans = partialFlushMinSpans;
-      return this;
-    }
-
-    public DDTracerBuilder logHandler(LogHandler logHandler) {
-      this.logHandler = logHandler;
-      return this;
-    }
-
-    public DDTracerBuilder statsDClient(StatsDClient statsDClient) {
-      this.statsDClient = statsDClient;
-      return this;
-    }
-
-    public DDTracerBuilder withProperties(final Properties properties) {
-      return config(Config.get(properties));
-    }
-
-    public DDTracer build() {
-      return new DDTracer(
-          config,
-          serviceName,
-          writer,
-          sampler,
-          injector,
-          extractor,
-          localRootSpanTags,
-          defaultSpanTags,
-          serviceNameMappings,
-          taggedHeaders,
-          partialFlushMinSpans,
-          logHandler,
-          statsDClient);
-    }
-  }
-
-  @Deprecated
-  public DDTracer() {
-    this(CoreTracer.builder().build());
-  }
-
-  @Deprecated
-  public DDTracer(final String serviceName) {
-    this(CoreTracer.builder().serviceName(serviceName).build());
-  }
-
-  @Deprecated
-  public DDTracer(final Properties properties) {
-    this(CoreTracer.builder().withProperties(properties).build());
-  }
-
-  @Deprecated
-  public DDTracer(final Config config) {
-    this(CoreTracer.builder().config(config).build());
-  }
-
-  // This constructor is already used in the wild, so we have to keep it inside this API for now.
-  @Deprecated
-  public DDTracer(final String serviceName, final Writer writer, final Sampler sampler) {
-    this(CoreTracer.builder().serviceName(serviceName).writer(writer).sampler(sampler).build());
-  }
-
-  @Deprecated
-  DDTracer(
-      final String serviceName,
-      final Writer writer,
-      final Sampler sampler,
-      final Map<String, String> runtimeTags) {
-    this(
-        CoreTracer.builder()
-            .serviceName(serviceName)
-            .writer(writer)
-            .sampler(sampler)
-            .localRootSpanTags(runtimeTags)
-            .build());
-  }
-
-  @Deprecated
-  public DDTracer(final Writer writer) {
-    this(CoreTracer.builder().writer(writer).build());
-  }
-
-  @Deprecated
-  public DDTracer(final Config config, final Writer writer) {
-    this(CoreTracer.builder().config(config).writer(writer).build());
-  }
-
-  @Deprecated
-  public DDTracer(
-      final String serviceName,
-      final Writer writer,
-      final Sampler sampler,
-      final String runtimeId,
-      final Map<String, String> localRootSpanTags,
-      final Map<String, String> defaultSpanTags,
-      final Map<String, String> serviceNameMappings,
-      final Map<String, String> taggedHeaders) {
-    this(
-        CoreTracer.builder()
-            .serviceName(serviceName)
-            .writer(writer)
-            .sampler(sampler)
-            .localRootSpanTags(customRuntimeTags(runtimeId, localRootSpanTags))
-            .defaultSpanTags(defaultSpanTags)
-            .serviceNameMappings(serviceNameMappings)
-            .taggedHeaders(taggedHeaders)
-            .build());
-  }
-
-  @Deprecated
-  public DDTracer(
-      final String serviceName,
-      final Writer writer,
-      final Sampler sampler,
-      final Map<String, String> localRootSpanTags,
-      final Map<String, String> defaultSpanTags,
-      final Map<String, String> serviceNameMappings,
-      final Map<String, String> taggedHeaders) {
-
-    this(
-        CoreTracer.builder()
-            .serviceName(serviceName)
-            .writer(writer)
-            .sampler(sampler)
-            .localRootSpanTags(localRootSpanTags)
-            .defaultSpanTags(defaultSpanTags)
-            .serviceNameMappings(serviceNameMappings)
-            .taggedHeaders(taggedHeaders)
-            .build());
-  }
-
-  @Deprecated
-  public DDTracer(
-      final String serviceName,
-      final Writer writer,
-      final Sampler sampler,
-      final Map<String, String> localRootSpanTags,
-      final Map<String, String> defaultSpanTags,
-      final Map<String, String> serviceNameMappings,
-      final Map<String, String> taggedHeaders,
-      final int partialFlushMinSpans) {
-
-    this(
-        CoreTracer.builder()
-            .serviceName(serviceName)
-            .writer(writer)
-            .sampler(sampler)
-            .localRootSpanTags(localRootSpanTags)
-            .defaultSpanTags(defaultSpanTags)
-            .serviceNameMappings(serviceNameMappings)
-            .taggedHeaders(taggedHeaders)
-            .partialFlushMinSpans(partialFlushMinSpans)
-            .build());
-  }
-
-  // Should only be used internally by TracerInstaller
-  @Deprecated
-  public DDTracer(final AgentTracer.TracerAPI tracer) {
-    this.tracer = tracer;
-    converter = new TypeConverter(new DefaultLogHandler());
-    scopeManager = new OTScopeManager(tracer, converter);
-  }
-
-  private DDTracer(
-      @Deprecated final Config config,
-      final String serviceName,
-      final Writer writer,
-      final Sampler sampler,
-      final HttpCodec.Injector injector,
-      final HttpCodec.Extractor extractor,
-      final Map<String, String> localRootSpanTags,
-      final Map<String, String> defaultSpanTags,
-      final Map<String, String> serviceNameMappings,
-      final Map<String, String> taggedHeaders,
-      final int partialFlushMinSpans,
-      final LogHandler logHandler,
-      final StatsDClient statsDClient) {
-
-    // Check if the tracer is already installed by the agent
-    // Unable to use "instanceof" because of class renaming
-    String expectedName =
-        "avoid_rewrite.datadog.trace.agent.core.CoreTracer".substring("avoid_rewrite.".length());
-    if (GlobalTracer.get().getClass().getName().equals(expectedName)) {
-      log.error(
-          "Datadog Tracer already installed by `dd-java-agent`. NOTE: Manually creating the tracer while using `dd-java-agent` is not supported");
-      throw new IllegalStateException("Datadog Tracer already installed");
-    }
-
-    if (logHandler != null) {
-      converter = new TypeConverter(logHandler);
-    } else {
-      converter = new TypeConverter(new DefaultLogHandler());
-    }
-
-    // Each of these are only overridden if set
-    // Otherwise, the values retrieved from config will be overridden with null
-    CoreTracer.CoreTracerBuilder builder = CoreTracer.builder();
-
-    if (config != null) {
-      builder = builder.config(config);
+    @Deprecated
+    public DDTracer(final Config config) {
+        this(CoreTracer.builder().config(config).build());
     }
 
-    if (serviceName != null) {
-      builder = builder.serviceName(serviceName);
+    // This constructor is already used in the wild, so we have to keep it inside this API for now.
+    @Deprecated
+    public DDTracer(final String serviceName, final Writer writer, final Sampler sampler) {
+        this(CoreTracer.builder()
+                .serviceName(serviceName)
+                .writer(writer)
+                .sampler(sampler)
+                .build());
     }
 
-    if (writer != null) {
-      builder = builder.writer(writer);
+    @Deprecated
+    DDTracer(
+            final String serviceName,
+            final Writer writer,
+            final Sampler sampler,
+            final Map<String, String> runtimeTags) {
+        this(CoreTracer.builder()
+                .serviceName(serviceName)
+                .writer(writer)
+                .sampler(sampler)
+                .localRootSpanTags(runtimeTags)
+                .build());
     }
 
-    if (sampler != null) {
-      builder = builder.sampler(sampler);
+    @Deprecated
+    public DDTracer(final Writer writer) {
+        this(CoreTracer.builder().writer(writer).build());
     }
 
-    if (injector != null) {
-      builder = builder.injector(injector);
+    @Deprecated
+    public DDTracer(final Config config, final Writer writer) {
+        this(CoreTracer.builder().config(config).writer(writer).build());
     }
 
-    if (extractor != null) {
-      builder = builder.extractor(extractor);
+    @Deprecated
+    public DDTracer(
+            final String serviceName,
+            final Writer writer,
+            final Sampler sampler,
+            final String runtimeId,
+            final Map<String, String> localRootSpanTags,
+            final Map<String, String> defaultSpanTags,
+            final Map<String, String> serviceNameMappings,
+            final Map<String, String> taggedHeaders) {
+        this(CoreTracer.builder()
+                .serviceName(serviceName)
+                .writer(writer)
+                .sampler(sampler)
+                .localRootSpanTags(customRuntimeTags(runtimeId, localRootSpanTags))
+                .defaultSpanTags(defaultSpanTags)
+                .serviceNameMappings(serviceNameMappings)
+                .taggedHeaders(taggedHeaders)
+                .build());
     }
 
-    if (localRootSpanTags != null) {
-      builder = builder.localRootSpanTags(localRootSpanTags);
+    @Deprecated
+    public DDTracer(
+            final String serviceName,
+            final Writer writer,
+            final Sampler sampler,
+            final Map<String, String> localRootSpanTags,
+            final Map<String, String> defaultSpanTags,
+            final Map<String, String> serviceNameMappings,
+            final Map<String, String> taggedHeaders) {
+
+        this(CoreTracer.builder()
+                .serviceName(serviceName)
+                .writer(writer)
+                .sampler(sampler)
+                .localRootSpanTags(localRootSpanTags)
+                .defaultSpanTags(defaultSpanTags)
+                .serviceNameMappings(serviceNameMappings)
+                .taggedHeaders(taggedHeaders)
+                .build());
     }
 
-    if (defaultSpanTags != null) {
-      builder = builder.defaultSpanTags(defaultSpanTags);
-    }
+    @Deprecated
+    public DDTracer(
+            final String serviceName,
+            final Writer writer,
+            final Sampler sampler,
+            final Map<String, String> localRootSpanTags,
+            final Map<String, String> defaultSpanTags,
+            final Map<String, String> serviceNameMappings,
+            final Map<String, String> taggedHeaders,
+            final int partialFlushMinSpans) {
+
+        this(CoreTracer.builder()
+                .serviceName(serviceName)
+                .writer(writer)
+                .sampler(sampler)
+                .localRootSpanTags(localRootSpanTags)
+                .defaultSpanTags(defaultSpanTags)
+                .serviceNameMappings(serviceNameMappings)
+                .taggedHeaders(taggedHeaders)
+                .partialFlushMinSpans(partialFlushMinSpans)
+                .build());
+    }
+
+    // Should only be used internally by TracerInstaller
+    @Deprecated
+    public DDTracer(final AgentTracer.TracerAPI tracer) {
+        this.tracer = tracer;
+        converter = new TypeConverter(new DefaultLogHandler());
+        scopeManager = new OTScopeManager(tracer, converter);
+    }
+
+    private DDTracer(
+            @Deprecated final Config config,
+            final String serviceName,
+            final Writer writer,
+            final Sampler sampler,
+            final HttpCodec.Injector injector,
+            final HttpCodec.Extractor extractor,
+            final Map<String, String> localRootSpanTags,
+            final Map<String, String> defaultSpanTags,
+            final Map<String, String> serviceNameMappings,
+            final Map<String, String> taggedHeaders,
+            final int partialFlushMinSpans,
+            final LogHandler logHandler,
+            final StatsDClient statsDClient) {
+
+        // Check if the tracer is already installed by the agent
+        // Unable to use "instanceof" because of class renaming
+        String expectedName = "avoid_rewrite.datadog.trace.agent.core.CoreTracer".substring("avoid_rewrite.".length());
+        if (GlobalTracer.get().getClass().getName().equals(expectedName)) {
+            log.error(
+                    "Datadog Tracer already installed by `dd-java-agent`. NOTE: Manually creating the tracer while using `dd-java-agent` is not supported");
+            throw new IllegalStateException("Datadog Tracer already installed");
+        }
 
-    if (serviceNameMappings != null) {
-      builder = builder.serviceNameMappings(serviceNameMappings);
-    }
+        if (logHandler != null) {
+            converter = new TypeConverter(logHandler);
+        } else {
+            converter = new TypeConverter(new DefaultLogHandler());
+        }
+
+        // Each of these are only overridden if set
+        // Otherwise, the values retrieved from config will be overridden with null
+        CoreTracer.CoreTracerBuilder builder = CoreTracer.builder();
+
+        if (config != null) {
+            builder = builder.config(config);
+        }
+
+        if (serviceName != null) {
+            builder = builder.serviceName(serviceName);
+        }
+
+        if (writer != null) {
+            builder = builder.writer(writer);
+        }
+
+        if (sampler != null) {
+            builder = builder.sampler(sampler);
+        }
+
+        if (injector != null) {
+            builder = builder.injector(injector);
+        }
+
+        if (extractor != null) {
+            builder = builder.extractor(extractor);
+        }
+
+        if (localRootSpanTags != null) {
+            builder = builder.localRootSpanTags(localRootSpanTags);
+        }
+
+        if (defaultSpanTags != null) {
+            builder = builder.defaultSpanTags(defaultSpanTags);
+        }
+
+        if (serviceNameMappings != null) {
+            builder = builder.serviceNameMappings(serviceNameMappings);
+        }
+
+        if (taggedHeaders != null) {
+            builder = builder.taggedHeaders(taggedHeaders);
+        }
+
+        if (partialFlushMinSpans != 0) {
+            builder = builder.partialFlushMinSpans(partialFlushMinSpans);
+        }
+
+        if (statsDClient != null) {
+            builder = builder.statsDClient(statsDClient);
+        }
 
-    if (taggedHeaders != null) {
-      builder = builder.taggedHeaders(taggedHeaders);
+        tracer = builder.build();
+
+        // FIXME [API] There's an unfortunate cycle between OTScopeManager and CoreTracer where they
+        // depend on each other so CoreTracer
+        // Perhaps api can change so that CoreTracer doesn't need to implement scope methods directly
+        this.scopeManager = new OTScopeManager(tracer, converter);
+
+        if ((config != null && config.isLogsInjectionEnabled())
+                || (config == null && Config.get().isLogsInjectionEnabled())) {
+            CorrelationIdInjectors.register(this);
+        }
     }
 
-    if (partialFlushMinSpans != 0) {
-      builder = builder.partialFlushMinSpans(partialFlushMinSpans);
+    private static Map<String, String> customRuntimeTags(
+            final String runtimeId, final Map<String, String> applicationRootSpanTags) {
+        final Map<String, String> runtimeTags = new HashMap<>(applicationRootSpanTags);
+        runtimeTags.put(DDTags.RUNTIME_ID_TAG, runtimeId);
+        return Collections.unmodifiableMap(runtimeTags);
     }
 
-    if (statsDClient != null) {
-      builder = builder.statsDClient(statsDClient);
+    @Override
+    public String getTraceId() {
+        return tracer.getTraceId();
     }
 
-    tracer = builder.build();
+    @Override
+    public String getSpanId() {
+        return tracer.getSpanId();
+    }
 
-    // FIXME [API] There's an unfortunate cycle between OTScopeManager and CoreTracer where they
-    // depend on each other so CoreTracer
-    // Perhaps api can change so that CoreTracer doesn't need to implement scope methods directly
-    this.scopeManager = new OTScopeManager(tracer, converter);
-
-    if ((config != null && config.isLogsInjectionEnabled())
-        || (config == null && Config.get().isLogsInjectionEnabled())) {
-      CorrelationIdInjectors.register(this);
-    }
-  }
-
-  private static Map<String, String> customRuntimeTags(
-      final String runtimeId, final Map<String, String> applicationRootSpanTags) {
-    final Map<String, String> runtimeTags = new HashMap<>(applicationRootSpanTags);
-    runtimeTags.put(DDTags.RUNTIME_ID_TAG, runtimeId);
-    return Collections.unmodifiableMap(runtimeTags);
-  }
-
-  @Override
-  public String getTraceId() {
-    return tracer.getTraceId();
-  }
-
-  @Override
-  public String getSpanId() {
-    return tracer.getSpanId();
-  }
-
-  @Override
-  public boolean addTraceInterceptor(final TraceInterceptor traceInterceptor) {
-    return tracer.addTraceInterceptor(traceInterceptor);
-  }
-
-  @Override
-  public TraceScope muteTracing() {
-    return tracer.muteTracing();
-  }
-
-  @Override
-  public TraceScope.Continuation captureActiveSpan() {
-    return tracer.captureActiveSpan();
-  }
-
-  @Override
-  public boolean isAsyncPropagationEnabled() {
-    return tracer.isAsyncPropagationEnabled();
-  }
-
-  @Override
-  public void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) {
-    tracer.setAsyncPropagationEnabled(asyncPropagationEnabled);
-  }
-
-  @Override
-  public DataStreamsCheckpointer getDataStreamsCheckpointer() {
-    return tracer.getDataStreamsCheckpointer();
-  }
-
-  @Override
-  public ScopeManager scopeManager() {
-    return scopeManager;
-  }
-
-  @Override
-  public Span activeSpan() {
-    return scopeManager.activeSpan();
-  }
-
-  @Override
-  public Scope activateSpan(final Span span) {
-    return scopeManager.activate(span);
-  }
-
-  @Override
-  public DDSpanBuilder buildSpan(final String operationName) {
-    return new DDSpanBuilder(operationName);
-  }
-
-  @Override
-  public <C> void inject(final SpanContext spanContext, final Format<C> format, final C carrier) {
-    if (carrier instanceof TextMap) {
-      final AgentSpanContext convertedSpanContext = converter.toContext(spanContext);
-      AgentSpan span = fromSpanContext(convertedSpanContext);
-      defaultPropagator().inject(span, (TextMap) carrier, TextMapSetter.INSTANCE);
-    } else {
-      log.debug("Unsupported format for propagation - {}", format.getClass().getName());
-    }
-  }
-
-  @Override
-  public <C> SpanContext extract(final Format<C> format, final C carrier) {
-    if (carrier instanceof TextMap) {
-      final AgentSpanContext tagContext =
-          extractContextAndGetSpanContext((TextMap) carrier, new TextMapGetter((TextMap) carrier));
-
-      return converter.toSpanContext(tagContext);
-    } else {
-      log.debug("Unsupported format for propagation - {}", format.getClass().getName());
-      return null;
-    }
-  }
-
-  @Override
-  public void addScopeListener(
-      Runnable afterScopeActivatedCallback, Runnable afterScopeClosedCallback) {
-    tracer.addScopeListener(afterScopeActivatedCallback, afterScopeClosedCallback);
-  }
-
-  @Override
-  public void flush() {
-    tracer.flush();
-  }
-
-  @Override
-  public void flushMetrics() {
-    tracer.flushMetrics();
-  }
-
-  @Override
-  public void flushLogs() {
-    tracer.flushLogs();
-  }
-
-  @Override
-  public Profiling getProfilingContext() {
-    return tracer != null ? tracer.getProfilingContext() : Profiling.NoOp.INSTANCE;
-  }
-
-  @Override
-  public TraceSegment getTraceSegment() {
-    AgentSpanContext spanContext = tracer.activeSpan().spanContext();
-    if (spanContext instanceof DDSpanContext) {
-      return ((DDSpanContext) spanContext).getTraceSegment();
-    }
-    return null;
-  }
-
-  @Override
-  public void close() {
-    tracer.close();
-  }
-
-  @VisibleForTesting
-  AgentTracer.TracerAPI getInternalTracer() {
-    return tracer;
-  }
-
-  private static class TextMapSetter implements CarrierSetter<TextMap> {
-    static final TextMapSetter INSTANCE = new TextMapSetter();
+    @Override
+    public boolean addTraceInterceptor(final TraceInterceptor traceInterceptor) {
+        return tracer.addTraceInterceptor(traceInterceptor);
+    }
 
     @Override
-    public void set(final TextMap carrier, final String key, final String value) {
-      carrier.put(key, value);
+    public TraceScope muteTracing() {
+        return tracer.muteTracing();
     }
-  }
 
-  private static class TextMapGetter implements AgentPropagation.ContextVisitor<TextMap> {
-    private final TextMap carrier;
+    @Override
+    public TraceScope.Continuation captureActiveSpan() {
+        return tracer.captureActiveSpan();
+    }
 
-    private TextMapGetter(final TextMap carrier) {
-      this.carrier = carrier;
+    @Override
+    public boolean isAsyncPropagationEnabled() {
+        return tracer.isAsyncPropagationEnabled();
     }
 
     @Override
-    public void forEachKey(final TextMap ignored, final AgentPropagation.KeyClassifier classifier) {
-      for (final Entry<String, String> entry : carrier) {
-        if (!classifier.accept(entry.getKey(), entry.getValue())) {
-          return;
-        }
-      }
+    public void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) {
+        tracer.setAsyncPropagationEnabled(asyncPropagationEnabled);
     }
-  }
 
-  public class DDSpanBuilder implements SpanBuilder {
-    private final AgentTracer.SpanBuilder delegate;
+    @Override
+    public DataStreamsCheckpointer getDataStreamsCheckpointer() {
+        return tracer.getDataStreamsCheckpointer();
+    }
 
-    public DDSpanBuilder(final String operationName) {
-      delegate = tracer.buildSpan(INSTRUMENTATION_NAME, operationName);
+    @Override
+    public ScopeManager scopeManager() {
+        return scopeManager;
     }
 
     @Override
-    public DDSpanBuilder asChildOf(final SpanContext parent) {
-      delegate.asChildOf(converter.toContext(parent));
-      return this;
+    public Span activeSpan() {
+        return scopeManager.activeSpan();
     }
 
     @Override
-    public DDSpanBuilder asChildOf(final Span parent) {
-      if (parent != null) {
-        delegate.asChildOf(converter.toAgentSpan(parent).spanContext());
-      }
-      return this;
+    public Scope activateSpan(final Span span) {
+        return scopeManager.activate(span);
     }
 
     @Override
-    public DDSpanBuilder addReference(
-        final String referenceType, final SpanContext referencedSpanContext) {
-      if (referencedSpanContext == null) {
-        return this;
-      }
-
-      final AgentSpanContext spanContext = converter.toContext(referencedSpanContext);
-      if (!(spanContext instanceof ExtractedContext) && !(spanContext instanceof DDSpanContext)) {
-        log.debug(
-            "Expected to have a DDSpanContext or ExtractedContext but got {}",
-            spanContext.getClass().getName());
-        return this;
-      }
-
-      if (References.CHILD_OF.equals(referenceType)
-          || References.FOLLOWS_FROM.equals(referenceType)) {
-        delegate.asChildOf(spanContext);
-      } else {
-        log.debug("Only support reference type of CHILD_OF and FOLLOWS_FROM");
-      }
-
-      return this;
+    public DDSpanBuilder buildSpan(final String operationName) {
+        return new DDSpanBuilder(operationName);
     }
 
     @Override
-    public DDSpanBuilder ignoreActiveSpan() {
-      delegate.ignoreActiveSpan();
-      return this;
+    public <C> void inject(final SpanContext spanContext, final Format<C> format, final C carrier) {
+        if (carrier instanceof TextMap) {
+            final AgentSpanContext convertedSpanContext = converter.toContext(spanContext);
+            AgentSpan span = fromSpanContext(convertedSpanContext);
+            defaultPropagator().inject(span, (TextMap) carrier, TextMapSetter.INSTANCE);
+        } else {
+            log.debug(
+                    "Unsupported format for propagation - {}", format.getClass().getName());
+        }
     }
 
     @Override
-    public DDSpanBuilder withTag(final String key, final String value) {
-      delegate.withTag(key, value);
-      return this;
+    public <C> SpanContext extract(final Format<C> format, final C carrier) {
+        if (carrier instanceof TextMap) {
+            final AgentSpanContext tagContext =
+                    extractContextAndGetSpanContext((TextMap) carrier, new TextMapGetter((TextMap) carrier));
+
+            return converter.toSpanContext(tagContext);
+        } else {
+            log.debug(
+                    "Unsupported format for propagation - {}", format.getClass().getName());
+            return null;
+        }
     }
 
     @Override
-    public DDSpanBuilder withTag(final String key, final boolean value) {
-      delegate.withTag(key, value);
-      return this;
+    public void addScopeListener(Runnable afterScopeActivatedCallback, Runnable afterScopeClosedCallback) {
+        tracer.addScopeListener(afterScopeActivatedCallback, afterScopeClosedCallback);
     }
 
     @Override
-    public DDSpanBuilder withTag(final String key, final Number value) {
-      delegate.withTag(key, value);
-      return this;
+    public void flush() {
+        tracer.flush();
     }
 
     @Override
-    public <T> DDSpanBuilder withTag(final Tag<T> tag, final T value) {
-      delegate.withTag(tag.getKey(), value);
-      return this;
+    public void flushMetrics() {
+        tracer.flushMetrics();
     }
 
     @Override
-    public DDSpanBuilder withStartTimestamp(final long microseconds) {
-      delegate.withStartTimestamp(microseconds);
-      return this;
+    public void flushLogs() {
+        tracer.flushLogs();
     }
 
     @Override
-    public Span startManual() {
-      return start();
+    public Profiling getProfilingContext() {
+        return tracer != null ? tracer.getProfilingContext() : Profiling.NoOp.INSTANCE;
     }
 
     @Override
-    public Span start() {
-      final AgentSpan agentSpan = delegate.start();
-      agentSpan.spanContext().setIntegrationName("opentracing");
-      return converter.toSpan(agentSpan);
+    public TraceSegment getTraceSegment() {
+        AgentSpanContext spanContext = tracer.activeSpan().spanContext();
+        if (spanContext instanceof DDSpanContext) {
+            return ((DDSpanContext) spanContext).getTraceSegment();
+        }
+        return null;
     }
 
-    /**
-     * @deprecated use {@link #start()} instead.
-     */
-    @Deprecated
     @Override
-    public Scope startActive(final boolean finishSpanOnClose) {
-      return scopeManager.activate(start(), finishSpanOnClose);
+    public void close() {
+        tracer.close();
     }
 
-    public DDSpanBuilder withServiceName(final String serviceName) {
-      delegate.withServiceName(serviceName);
-      return this;
+    @VisibleForTesting
+    AgentTracer.TracerAPI getInternalTracer() {
+        return tracer;
     }
 
-    public DDSpanBuilder withResourceName(final String resourceName) {
-      delegate.withResourceName(resourceName);
-      return this;
+    private static class TextMapSetter implements CarrierSetter<TextMap> {
+        static final TextMapSetter INSTANCE = new TextMapSetter();
+
+        @Override
+        public void set(final TextMap carrier, final String key, final String value) {
+            carrier.put(key, value);
+        }
     }
 
-    public DDSpanBuilder withErrorFlag() {
-      delegate.withErrorFlag();
-      return this;
+    private static class TextMapGetter implements AgentPropagation.ContextVisitor<TextMap> {
+        private final TextMap carrier;
+
+        private TextMapGetter(final TextMap carrier) {
+            this.carrier = carrier;
+        }
+
+        @Override
+        public void forEachKey(final TextMap ignored, final AgentPropagation.KeyClassifier classifier) {
+            for (final Entry<String, String> entry : carrier) {
+                if (!classifier.accept(entry.getKey(), entry.getValue())) {
+                    return;
+                }
+            }
+        }
     }
 
-    public DDSpanBuilder withSpanType(final String spanType) {
-      delegate.withSpanType(spanType);
-      return this;
+    public class DDSpanBuilder implements SpanBuilder {
+        private final AgentTracer.SpanBuilder delegate;
+
+        public DDSpanBuilder(final String operationName) {
+            delegate = tracer.buildSpan(INSTRUMENTATION_NAME, operationName);
+        }
+
+        @Override
+        public DDSpanBuilder asChildOf(final SpanContext parent) {
+            delegate.asChildOf(converter.toContext(parent));
+            return this;
+        }
+
+        @Override
+        public DDSpanBuilder asChildOf(final Span parent) {
+            if (parent != null) {
+                delegate.asChildOf(converter.toAgentSpan(parent).spanContext());
+            }
+            return this;
+        }
+
+        @Override
+        public DDSpanBuilder addReference(final String referenceType, final SpanContext referencedSpanContext) {
+            if (referencedSpanContext == null) {
+                return this;
+            }
+
+            final AgentSpanContext spanContext = converter.toContext(referencedSpanContext);
+            if (!(spanContext instanceof ExtractedContext) && !(spanContext instanceof DDSpanContext)) {
+                log.debug(
+                        "Expected to have a DDSpanContext or ExtractedContext but got {}",
+                        spanContext.getClass().getName());
+                return this;
+            }
+
+            if (References.CHILD_OF.equals(referenceType) || References.FOLLOWS_FROM.equals(referenceType)) {
+                delegate.asChildOf(spanContext);
+            } else {
+                log.debug("Only support reference type of CHILD_OF and FOLLOWS_FROM");
+            }
+
+            return this;
+        }
+
+        @Override
+        public DDSpanBuilder ignoreActiveSpan() {
+            delegate.ignoreActiveSpan();
+            return this;
+        }
+
+        @Override
+        public DDSpanBuilder withTag(final String key, final String value) {
+            delegate.withTag(key, value);
+            return this;
+        }
+
+        @Override
+        public DDSpanBuilder withTag(final String key, final boolean value) {
+            delegate.withTag(key, value);
+            return this;
+        }
+
+        @Override
+        public DDSpanBuilder withTag(final String key, final Number value) {
+            delegate.withTag(key, value);
+            return this;
+        }
+
+        @Override
+        public <T> DDSpanBuilder withTag(final Tag<T> tag, final T value) {
+            delegate.withTag(tag.getKey(), value);
+            return this;
+        }
+
+        @Override
+        public DDSpanBuilder withStartTimestamp(final long microseconds) {
+            delegate.withStartTimestamp(microseconds);
+            return this;
+        }
+
+        @Override
+        public Span startManual() {
+            return start();
+        }
+
+        @Override
+        public Span start() {
+            final AgentSpan agentSpan = delegate.start();
+            agentSpan.spanContext().setIntegrationName("opentracing");
+            return converter.toSpan(agentSpan);
+        }
+
+        /**
+         * @deprecated use {@link #start()} instead.
+         */
+        @Deprecated
+        @Override
+        public Scope startActive(final boolean finishSpanOnClose) {
+            return scopeManager.activate(start(), finishSpanOnClose);
+        }
+
+        public DDSpanBuilder withServiceName(final String serviceName) {
+            delegate.withServiceName(serviceName);
+            return this;
+        }
+
+        public DDSpanBuilder withResourceName(final String resourceName) {
+            delegate.withResourceName(resourceName);
+            return this;
+        }
+
+        public DDSpanBuilder withErrorFlag() {
+            delegate.withErrorFlag();
+            return this;
+        }
+
+        public DDSpanBuilder withSpanType(final String spanType) {
+            delegate.withSpanType(spanType);
+            return this;
+        }
     }
-  }
 }
diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/DefaultLogHandler.java b/dd-trace-ot/src/main/java/datadog/opentracing/DefaultLogHandler.java
index 7de7bd407e1..a7e9c8aa864 100644
--- a/dd-trace-ot/src/main/java/datadog/opentracing/DefaultLogHandler.java
+++ b/dd-trace-ot/src/main/java/datadog/opentracing/DefaultLogHandler.java
@@ -13,40 +13,39 @@
 /** The default implementation of the LogHandler. */
 public class DefaultLogHandler implements LogHandler {
 
-  private static final Logger log = LoggerFactory.getLogger(DefaultLogHandler.class);
-
-  @Override
-  public void log(final Map<String, ?> fields, final AgentSpan span) {
-    extractError(fields, span);
-  }
-
-  @Override
-  public void log(
-      final long timestampMicroseconds, final Map<String, ?> fields, final AgentSpan span) {
-    extractError(fields, span);
-  }
-
-  @Override
-  public void log(final String event, final AgentSpan span) {
-    log.debug("`log` method is not implemented. Provided log: {}", event);
-  }
-
-  @Override
-  public void log(final long timestampMicroseconds, final String event, final AgentSpan span) {
-    log.debug("`log` method is not implemented. Provided log: {}", event);
-  }
-
-  private boolean isErrorSpan(final Map<String, ?> map, final AgentSpan span) {
-    final String event = map.get(EVENT) instanceof String ? (String) map.get(EVENT) : "";
-    return span.isError() || event.equalsIgnoreCase("error");
-  }
-
-  private void extractError(final Map<String, ?> map, final AgentSpan span) {
-    if (map.get(ERROR_OBJECT) instanceof Throwable) {
-      final Throwable error = (Throwable) map.get(ERROR_OBJECT);
-      span.addThrowable(error);
-    } else if (isErrorSpan(map, span) && map.get(MESSAGE) instanceof String) {
-      span.setTag(ERROR_MSG, (String) map.get(MESSAGE));
+    private static final Logger log = LoggerFactory.getLogger(DefaultLogHandler.class);
+
+    @Override
+    public void log(final Map<String, ?> fields, final AgentSpan span) {
+        extractError(fields, span);
+    }
+
+    @Override
+    public void log(final long timestampMicroseconds, final Map<String, ?> fields, final AgentSpan span) {
+        extractError(fields, span);
+    }
+
+    @Override
+    public void log(final String event, final AgentSpan span) {
+        log.debug("`log` method is not implemented. Provided log: {}", event);
+    }
+
+    @Override
+    public void log(final long timestampMicroseconds, final String event, final AgentSpan span) {
+        log.debug("`log` method is not implemented. Provided log: {}", event);
+    }
+
+    private boolean isErrorSpan(final Map<String, ?> map, final AgentSpan span) {
+        final String event = map.get(EVENT) instanceof String ? (String) map.get(EVENT) : "";
+        return span.isError() || event.equalsIgnoreCase("error");
+    }
+
+    private void extractError(final Map<String, ?> map, final AgentSpan span) {
+        if (map.get(ERROR_OBJECT) instanceof Throwable) {
+            final Throwable error = (Throwable) map.get(ERROR_OBJECT);
+            span.addThrowable(error);
+        } else if (isErrorSpan(map, span) && map.get(MESSAGE) instanceof String) {
+            span.setTag(ERROR_MSG, (String) map.get(MESSAGE));
+        }
     }
-  }
 }
diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/LogHandler.java b/dd-trace-ot/src/main/java/datadog/opentracing/LogHandler.java
index 8454059cf31..4902e9488a6 100644
--- a/dd-trace-ot/src/main/java/datadog/opentracing/LogHandler.java
+++ b/dd-trace-ot/src/main/java/datadog/opentracing/LogHandler.java
@@ -5,40 +5,40 @@
 
 public interface LogHandler {
 
-  /**
-   * Handles the log implementation in the Span.
-   *
-   * @param fields key:value log fields. Tracer implementations should support String, numeric, and
-   *     boolean values; some may also support arbitrary Objects.
-   * @param span from which the call was made
-   */
-  void log(Map<String, ?> fields, AgentSpan span);
+    /**
+     * Handles the log implementation in the Span.
+     *
+     * @param fields key:value log fields. Tracer implementations should support String, numeric, and
+     *     boolean values; some may also support arbitrary Objects.
+     * @param span from which the call was made
+     */
+    void log(Map<String, ?> fields, AgentSpan span);
 
-  /**
-   * Handles the log implementation in the Span.
-   *
-   * @param timestampMicroseconds The explicit timestamp for the log record. Must be greater than or
-   *     equal to the Span's start timestamp.
-   * @param fields key:value log fields. Tracer implementations should support String, numeric, and
-   * @param span from which the call was made
-   */
-  void log(long timestampMicroseconds, Map<String, ?> fields, AgentSpan span);
+    /**
+     * Handles the log implementation in the Span.
+     *
+     * @param timestampMicroseconds The explicit timestamp for the log record. Must be greater than or
+     *     equal to the Span's start timestamp.
+     * @param fields key:value log fields. Tracer implementations should support String, numeric, and
+     * @param span from which the call was made
+     */
+    void log(long timestampMicroseconds, Map<String, ?> fields, AgentSpan span);
 
-  /**
-   * Handles the log implementation in the Span..
-   *
-   * @param event the event value; often a stable identifier for a moment in the Span lifecycle
-   * @param span from which the call was made
-   */
-  void log(String event, AgentSpan span);
+    /**
+     * Handles the log implementation in the Span..
+     *
+     * @param event the event value; often a stable identifier for a moment in the Span lifecycle
+     * @param span from which the call was made
+     */
+    void log(String event, AgentSpan span);
 
-  /**
-   * Handles the log implementation in the Span.
-   *
-   * @param timestampMicroseconds The explicit timestamp for the log record. Must be greater than or
-   *     equal to the Span's start timestamp.
-   * @param event the event value; often a stable identifier for a moment in the Span lifecycle
-   * @param span from which the call was made
-   */
-  void log(long timestampMicroseconds, String event, AgentSpan span);
+    /**
+     * Handles the log implementation in the Span.
+     *
+     * @param timestampMicroseconds The explicit timestamp for the log record. Must be greater than or
+     *     equal to the Span's start timestamp.
+     * @param event the event value; often a stable identifier for a moment in the Span lifecycle
+     * @param span from which the call was made
+     */
+    void log(long timestampMicroseconds, String event, AgentSpan span);
 }
diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/OTScopeManager.java b/dd-trace-ot/src/main/java/datadog/opentracing/OTScopeManager.java
index 0aba3ac4c42..ea1f7c6b545 100644
--- a/dd-trace-ot/src/main/java/datadog/opentracing/OTScopeManager.java
+++ b/dd-trace-ot/src/main/java/datadog/opentracing/OTScopeManager.java
@@ -14,120 +14,117 @@
 
 /** One of the two possible scope managers. See CustomScopeManagerWrapper */
 class OTScopeManager implements ScopeManager {
-  static final Logger log = LoggerFactory.getLogger(OTScopeManager.class);
+    static final Logger log = LoggerFactory.getLogger(OTScopeManager.class);
 
-  private final TypeConverter converter;
-  private final AgentTracer.TracerAPI tracer;
-
-  OTScopeManager(final AgentTracer.TracerAPI tracer, final TypeConverter converter) {
-    this.tracer = tracer;
-    this.converter = converter;
-  }
-
-  @Override
-  public Scope activate(final Span span) {
-    return activate(span, false);
-  }
-
-  @Override
-  public Scope activate(final Span span, final boolean finishSpanOnClose) {
-    if (null == span) {
-      return null;
-    }
-
-    final AgentSpan agentSpan = converter.toAgentSpan(span);
-    final ContextScope agentScope = tracer.activateManualSpan(agentSpan);
-
-    return converter.toScope(agentScope, finishSpanOnClose);
-  }
-
-  @Deprecated
-  @Override
-  public Scope active() {
-    AgentSpan agentSpan = tracer.activeSpan();
-    if (null == agentSpan) {
-      return null;
-    }
-    // WARNING... Making an assumption about finishSpanOnClose
-    return new OTScope(new FakeScope(agentSpan), false, converter);
-  }
-
-  @Override
-  public Span activeSpan() {
-    return converter.toSpan(tracer.activeSpan());
-  }
-
-  static class OTScope implements Scope, TraceScope {
-    private final ContextScope delegate;
-    private final boolean finishSpanOnClose;
     private final TypeConverter converter;
+    private final AgentTracer.TracerAPI tracer;
 
-    OTScope(
-        final ContextScope delegate,
-        final boolean finishSpanOnClose,
-        final TypeConverter converter) {
-      this.delegate = delegate;
-      this.finishSpanOnClose = finishSpanOnClose;
-      this.converter = converter;
+    OTScopeManager(final AgentTracer.TracerAPI tracer, final TypeConverter converter) {
+        this.tracer = tracer;
+        this.converter = converter;
     }
 
     @Override
-    public void close() {
-      delegate.close();
-
-      if (finishSpanOnClose) {
-        AgentSpan.fromScope(delegate).finish();
-      }
+    public Scope activate(final Span span) {
+        return activate(span, false);
     }
 
     @Override
-    public Span span() {
-      return converter.toSpan(AgentSpan.fromScope(delegate));
-    }
+    public Scope activate(final Span span, final boolean finishSpanOnClose) {
+        if (null == span) {
+            return null;
+        }
 
-    @Override
-    public boolean equals(final Object o) {
-      if (this == o) {
-        return true;
-      }
-      if (!(o instanceof OTScope)) {
-        return false;
-      }
-      final OTScope otScope = (OTScope) o;
-      return AgentSpan.fromScope(delegate).equals(AgentSpan.fromScope(otScope.delegate));
-    }
+        final AgentSpan agentSpan = converter.toAgentSpan(span);
+        final ContextScope agentScope = tracer.activateManualSpan(agentSpan);
 
-    @Override
-    public int hashCode() {
-      return AgentSpan.fromScope(delegate).hashCode();
+        return converter.toScope(agentScope, finishSpanOnClose);
     }
 
-    boolean isFinishSpanOnClose() {
-      return finishSpanOnClose;
+    @Deprecated
+    @Override
+    public Scope active() {
+        AgentSpan agentSpan = tracer.activeSpan();
+        if (null == agentSpan) {
+            return null;
+        }
+        // WARNING... Making an assumption about finishSpanOnClose
+        return new OTScope(new FakeScope(agentSpan), false, converter);
     }
-  }
 
-  private final class FakeScope implements ContextScope {
-    private final AgentSpan agentSpan;
-
-    FakeScope(AgentSpan agentSpan) {
-      this.agentSpan = agentSpan;
+    @Override
+    public Span activeSpan() {
+        return converter.toSpan(tracer.activeSpan());
     }
 
-    @Override
-    public Context context() {
-      return agentSpan;
+    static class OTScope implements Scope, TraceScope {
+        private final ContextScope delegate;
+        private final boolean finishSpanOnClose;
+        private final TypeConverter converter;
+
+        OTScope(final ContextScope delegate, final boolean finishSpanOnClose, final TypeConverter converter) {
+            this.delegate = delegate;
+            this.finishSpanOnClose = finishSpanOnClose;
+            this.converter = converter;
+        }
+
+        @Override
+        public void close() {
+            delegate.close();
+
+            if (finishSpanOnClose) {
+                AgentSpan.fromScope(delegate).finish();
+            }
+        }
+
+        @Override
+        public Span span() {
+            return converter.toSpan(AgentSpan.fromScope(delegate));
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (!(o instanceof OTScope)) {
+                return false;
+            }
+            final OTScope otScope = (OTScope) o;
+            return AgentSpan.fromScope(delegate).equals(AgentSpan.fromScope(otScope.delegate));
+        }
+
+        @Override
+        public int hashCode() {
+            return AgentSpan.fromScope(delegate).hashCode();
+        }
+
+        boolean isFinishSpanOnClose() {
+            return finishSpanOnClose;
+        }
     }
 
-    @Override
-    public void close() {
-      if (agentSpan == tracer.activeSpan()) {
-        tracer.closeActive();
-      } else if (Config.get().isScopeStrictMode()) {
-        throw new RuntimeException("Tried to close " + agentSpan + " scope when not on top");
-      } else {
-        log.warn("Tried to close {} scope when not on top", agentSpan);
-      }
+    private final class FakeScope implements ContextScope {
+        private final AgentSpan agentSpan;
+
+        FakeScope(AgentSpan agentSpan) {
+            this.agentSpan = agentSpan;
+        }
+
+        @Override
+        public Context context() {
+            return agentSpan;
+        }
+
+        @Override
+        public void close() {
+            if (agentSpan == tracer.activeSpan()) {
+                tracer.closeActive();
+            } else if (Config.get().isScopeStrictMode()) {
+                throw new RuntimeException("Tried to close " + agentSpan + " scope when not on top");
+            } else {
+                log.warn("Tried to close {} scope when not on top", agentSpan);
+            }
+        }
     }
-  }
 }
diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/OTSpan.java b/dd-trace-ot/src/main/java/datadog/opentracing/OTSpan.java
index 419cf3e4e68..087e99715b2 100644
--- a/dd-trace-ot/src/main/java/datadog/opentracing/OTSpan.java
+++ b/dd-trace-ot/src/main/java/datadog/opentracing/OTSpan.java
@@ -18,240 +18,240 @@
  * interact with non-ot parts of our API.
  */
 class OTSpan implements Span, MutableSpan, WithAgentSpan, SpanWrapper {
-  private final AgentSpan delegate;
-  private final TypeConverter converter;
-  private final LogHandler logHandler;
-
-  OTSpan(final AgentSpan delegate, final TypeConverter converter, final LogHandler logHandler) {
-    this.delegate = delegate;
-    this.converter = converter;
-    this.logHandler = logHandler;
-  }
-
-  @Override
-  public SpanContext context() {
-    return converter.toSpanContext(delegate.spanContext());
-  }
-
-  @Override
-  public OTSpan setTag(final String key, final String value) {
-    delegate.setTag(key, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setTag(final String key, final boolean value) {
-    delegate.setTag(key, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setTag(final String key, final Number value) {
-    delegate.setTag(key, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setMetric(final CharSequence metric, final int value) {
-    delegate.setMetric(metric, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setMetric(final CharSequence metric, final long value) {
-    delegate.setMetric(metric, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setMetric(final CharSequence metric, final float value) {
-    delegate.setMetric(metric, value);
-    return this;
-  }
-
-  @Override
-  public OTSpan setMetric(final CharSequence metric, final double value) {
-    delegate.setMetric(metric, value);
-    return this;
-  }
-
-  @Override
-  public boolean isError() {
-    return delegate.isError();
-  }
-
-  @Override
-  public OTSpan setError(final boolean value) {
-    delegate.setError(value, ErrorPriorities.MANUAL_INSTRUMENTATION);
-    return this;
-  }
-
-  @Override
-  public OTSpan getRootSpan() {
-    return getLocalRootSpan();
-  }
-
-  @Override
-  public OTSpan getLocalRootSpan() {
-    return converter.toSpan(delegate.getLocalRootSpan());
-  }
-
-  @Override
-  public <T> Span setTag(final Tag<T> tag, final T value) {
-    delegate.setTag(tag.getKey(), value);
-    return this;
-  }
-
-  @Override
-  public OTSpan log(final Map<String, ?> fields) {
-    logHandler.log(fields, delegate);
-    return this;
-  }
-
-  @Override
-  public OTSpan log(final long timestampMicroseconds, final Map<String, ?> fields) {
-    logHandler.log(timestampMicroseconds, fields, delegate);
-    return this;
-  }
-
-  @Override
-  public OTSpan log(final String event) {
-    logHandler.log(event, delegate);
-    return this;
-  }
-
-  @Override
-  public OTSpan log(final long timestampMicroseconds, final String event) {
-    logHandler.log(timestampMicroseconds, event, delegate);
-    return this;
-  }
-
-  @Override
-  public OTSpan setBaggageItem(final String key, final String value) {
-    delegate.setBaggageItem(key, value);
-    return this;
-  }
-
-  @Override
-  public String getBaggageItem(final String key) {
-    return delegate.getBaggageItem(key);
-  }
-
-  @Override
-  public long getStartTime() {
-    return delegate.getStartTime();
-  }
-
-  @Override
-  public long getDurationNano() {
-    return delegate.getDurationNano();
-  }
-
-  @Override
-  public CharSequence getOperationName() {
-    return delegate.getOperationName();
-  }
-
-  @Override
-  public OTSpan setOperationName(final CharSequence operationName) {
-    delegate.setOperationName(operationName);
-    return this;
-  }
-
-  @Override
-  public OTSpan setOperationName(final String operationName) {
-    delegate.setOperationName(UTF8BytesString.create(operationName));
-    return this;
-  }
-
-  @Override
-  public String getServiceName() {
-    return delegate.getServiceName();
-  }
-
-  @Override
-  public OTSpan setServiceName(final String serviceName) {
-    delegate.setServiceName(serviceName);
-    return this;
-  }
-
-  @Override
-  public CharSequence getResourceName() {
-    return delegate.getResourceName();
-  }
-
-  @Override
-  public OTSpan setResourceName(final CharSequence resourceName) {
-    delegate.setResourceName(resourceName, ResourceNamePriorities.MANUAL_INSTRUMENTATION);
-    return this;
-  }
-
-  @Override
-  public Integer getSamplingPriority() {
-    return delegate.getSamplingPriority();
-  }
-
-  @Override
-  public OTSpan setSamplingPriority(final int newPriority) {
-    delegate.setSamplingPriority(newPriority);
-    return this;
-  }
-
-  @Override
-  public String getSpanType() {
-    return delegate.getSpanType();
-  }
-
-  @Override
-  public OTSpan setSpanType(final CharSequence type) {
-    delegate.setSpanType(type);
-    return this;
-  }
-
-  @Override
-  public Map<String, Object> getTags() {
-    return delegate.getTags();
-  }
-
-  @Override
-  public Object getTag(String key) {
-    return delegate.getTag(key);
-  }
-
-  @Override
-  public void finish() {
-    delegate.finish();
-  }
-
-  @Override
-  public void finish(final long finishMicros) {
-    delegate.finish(finishMicros);
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    final OTSpan otSpan = (OTSpan) o;
-    return delegate.equals(otSpan.delegate);
-  }
-
-  @Override
-  public int hashCode() {
-    return delegate.hashCode();
-  }
-
-  @Override
-  public AgentSpan asAgentSpan() {
-    return delegate;
-  }
-
-  @VisibleForTesting
-  AgentSpan getDelegate() {
-    return delegate;
-  }
+    private final AgentSpan delegate;
+    private final TypeConverter converter;
+    private final LogHandler logHandler;
+
+    OTSpan(final AgentSpan delegate, final TypeConverter converter, final LogHandler logHandler) {
+        this.delegate = delegate;
+        this.converter = converter;
+        this.logHandler = logHandler;
+    }
+
+    @Override
+    public SpanContext context() {
+        return converter.toSpanContext(delegate.spanContext());
+    }
+
+    @Override
+    public OTSpan setTag(final String key, final String value) {
+        delegate.setTag(key, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setTag(final String key, final boolean value) {
+        delegate.setTag(key, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setTag(final String key, final Number value) {
+        delegate.setTag(key, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setMetric(final CharSequence metric, final int value) {
+        delegate.setMetric(metric, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setMetric(final CharSequence metric, final long value) {
+        delegate.setMetric(metric, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setMetric(final CharSequence metric, final float value) {
+        delegate.setMetric(metric, value);
+        return this;
+    }
+
+    @Override
+    public OTSpan setMetric(final CharSequence metric, final double value) {
+        delegate.setMetric(metric, value);
+        return this;
+    }
+
+    @Override
+    public boolean isError() {
+        return delegate.isError();
+    }
+
+    @Override
+    public OTSpan setError(final boolean value) {
+        delegate.setError(value, ErrorPriorities.MANUAL_INSTRUMENTATION);
+        return this;
+    }
+
+    @Override
+    public OTSpan getRootSpan() {
+        return getLocalRootSpan();
+    }
+
+    @Override
+    public OTSpan getLocalRootSpan() {
+        return converter.toSpan(delegate.getLocalRootSpan());
+    }
+
+    @Override
+    public <T> Span setTag(final Tag<T> tag, final T value) {
+        delegate.setTag(tag.getKey(), value);
+        return this;
+    }
+
+    @Override
+    public OTSpan log(final Map<String, ?> fields) {
+        logHandler.log(fields, delegate);
+        return this;
+    }
+
+    @Override
+    public OTSpan log(final long timestampMicroseconds, final Map<String, ?> fields) {
+        logHandler.log(timestampMicroseconds, fields, delegate);
+        return this;
+    }
+
+    @Override
+    public OTSpan log(final String event) {
+        logHandler.log(event, delegate);
+        return this;
+    }
+
+    @Override
+    public OTSpan log(final long timestampMicroseconds, final String event) {
+        logHandler.log(timestampMicroseconds, event, delegate);
+        return this;
+    }
+
+    @Override
+    public OTSpan setBaggageItem(final String key, final String value) {
+        delegate.setBaggageItem(key, value);
+        return this;
+    }
+
+    @Override
+    public String getBaggageItem(final String key) {
+        return delegate.getBaggageItem(key);
+    }
+
+    @Override
+    public long getStartTime() {
+        return delegate.getStartTime();
+    }
+
+    @Override
+    public long getDurationNano() {
+        return delegate.getDurationNano();
+    }
+
+    @Override
+    public CharSequence getOperationName() {
+        return delegate.getOperationName();
+    }
+
+    @Override
+    public OTSpan setOperationName(final CharSequence operationName) {
+        delegate.setOperationName(operationName);
+        return this;
+    }
+
+    @Override
+    public OTSpan setOperationName(final String operationName) {
+        delegate.setOperationName(UTF8BytesString.create(operationName));
+        return this;
+    }
+
+    @Override
+    public String getServiceName() {
+        return delegate.getServiceName();
+    }
+
+    @Override
+    public OTSpan setServiceName(final String serviceName) {
+        delegate.setServiceName(serviceName);
+        return this;
+    }
+
+    @Override
+    public CharSequence getResourceName() {
+        return delegate.getResourceName();
+    }
+
+    @Override
+    public OTSpan setResourceName(final CharSequence resourceName) {
+        delegate.setResourceName(resourceName, ResourceNamePriorities.MANUAL_INSTRUMENTATION);
+        return this;
+    }
+
+    @Override
+    public Integer getSamplingPriority() {
+        return delegate.getSamplingPriority();
+    }
+
+    @Override
+    public OTSpan setSamplingPriority(final int newPriority) {
+        delegate.setSamplingPriority(newPriority);
+        return this;
+    }
+
+    @Override
+    public String getSpanType() {
+        return delegate.getSpanType();
+    }
+
+    @Override
+    public OTSpan setSpanType(final CharSequence type) {
+        delegate.setSpanType(type);
+        return this;
+    }
+
+    @Override
+    public Map<String, Object> getTags() {
+        return delegate.getTags();
+    }
+
+    @Override
+    public Object getTag(String key) {
+        return delegate.getTag(key);
+    }
+
+    @Override
+    public void finish() {
+        delegate.finish();
+    }
+
+    @Override
+    public void finish(final long finishMicros) {
+        delegate.finish(finishMicros);
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final OTSpan otSpan = (OTSpan) o;
+        return delegate.equals(otSpan.delegate);
+    }
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+
+    @Override
+    public AgentSpan asAgentSpan() {
+        return delegate;
+    }
+
+    @VisibleForTesting
+    AgentSpan getDelegate() {
+        return delegate;
+    }
 }
diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/OTSpanContext.java b/dd-trace-ot/src/main/java/datadog/opentracing/OTSpanContext.java
index 9f84c075cb2..123f8a96e58 100644
--- a/dd-trace-ot/src/main/java/datadog/opentracing/OTSpanContext.java
+++ b/dd-trace-ot/src/main/java/datadog/opentracing/OTSpanContext.java
@@ -6,45 +6,45 @@
 import java.util.Map;
 
 class OTSpanContext implements SpanContext {
-  private final AgentSpanContext delegate;
-
-  OTSpanContext(final AgentSpanContext delegate) {
-    this.delegate = delegate;
-  }
-
-  @Override
-  public String toTraceId() {
-    return delegate.getTraceId().toString();
-  }
-
-  @Override
-  public String toSpanId() {
-    return DDSpanId.toString(delegate.getSpanId());
-  }
-
-  @Override
-  public Iterable<Map.Entry<String, String>> baggageItems() {
-    return delegate.baggageItems();
-  }
-
-  AgentSpanContext getDelegate() {
-    return delegate;
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) {
-      return true;
+    private final AgentSpanContext delegate;
+
+    OTSpanContext(final AgentSpanContext delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public String toTraceId() {
+        return delegate.getTraceId().toString();
+    }
+
+    @Override
+    public String toSpanId() {
+        return DDSpanId.toString(delegate.getSpanId());
+    }
+
+    @Override
+    public Iterable<Map.Entry<String, String>> baggageItems() {
+        return delegate.baggageItems();
+    }
+
+    AgentSpanContext getDelegate() {
+        return delegate;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final OTSpanContext that = (OTSpanContext) o;
+        return delegate.equals(that.delegate);
+    }
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
     }
-    final OTSpanContext that = (OTSpanContext) o;
-    return delegate.equals(that.delegate);
-  }
-
-  @Override
-  public int hashCode() {
-    return delegate.hashCode();
-  }
 }
diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/TypeConverter.java b/dd-trace-ot/src/main/java/datadog/opentracing/TypeConverter.java
index 67e0f050b62..9ba5e09fda0 100644
--- a/dd-trace-ot/src/main/java/datadog/opentracing/TypeConverter.java
+++ b/dd-trace-ot/src/main/java/datadog/opentracing/TypeConverter.java
@@ -13,72 +13,72 @@
 
 // Centralized place to do conversions
 class TypeConverter {
-  private final LogHandler logHandler;
-  private final OTSpan noopSpanWrapper;
-  private final OTSpanContext noopContextWrapper;
+    private final LogHandler logHandler;
+    private final OTSpan noopSpanWrapper;
+    private final OTSpanContext noopContextWrapper;
 
-  public TypeConverter(final LogHandler logHandler) {
-    this.logHandler = logHandler;
-    noopSpanWrapper = new OTSpan(noopSpan(), this, logHandler);
-    noopContextWrapper = new OTSpanContext(noopSpanContext());
-  }
-
-  public AgentSpan toAgentSpan(final Span span) {
-    if (span == null) {
-      return null;
-    } else if (span instanceof OTSpan) {
-      return ((OTSpan) span).asAgentSpan();
-    } else {
-      // NOOP Span
-      return noopSpan();
+    public TypeConverter(final LogHandler logHandler) {
+        this.logHandler = logHandler;
+        noopSpanWrapper = new OTSpan(noopSpan(), this, logHandler);
+        noopContextWrapper = new OTSpanContext(noopSpanContext());
     }
-  }
 
-  public OTSpan toSpan(final AgentSpan agentSpan) {
-    if (agentSpan == null) {
-      return null;
-    }
-    if (agentSpan instanceof AttachableWrapper) {
-      AttachableWrapper attachableSpanWrapper = (AttachableWrapper) agentSpan;
-      Object wrapper = attachableSpanWrapper.getWrapper();
-      if (wrapper instanceof OTSpan) {
-        return (OTSpan) wrapper;
-      }
-      OTSpan spanWrapper = new OTSpan(agentSpan, this, logHandler);
-      attachableSpanWrapper.attachWrapper(spanWrapper);
-      return spanWrapper;
+    public AgentSpan toAgentSpan(final Span span) {
+        if (span == null) {
+            return null;
+        } else if (span instanceof OTSpan) {
+            return ((OTSpan) span).asAgentSpan();
+        } else {
+            // NOOP Span
+            return noopSpan();
+        }
     }
-    if (agentSpan == noopSpan()) {
-      return noopSpanWrapper;
-    }
-    return new OTSpan(agentSpan, this, logHandler);
-  }
 
-  public Scope toScope(final ContextScope scope, final boolean finishSpanOnClose) {
-    if (scope == null) {
-      return null;
+    public OTSpan toSpan(final AgentSpan agentSpan) {
+        if (agentSpan == null) {
+            return null;
+        }
+        if (agentSpan instanceof AttachableWrapper) {
+            AttachableWrapper attachableSpanWrapper = (AttachableWrapper) agentSpan;
+            Object wrapper = attachableSpanWrapper.getWrapper();
+            if (wrapper instanceof OTSpan) {
+                return (OTSpan) wrapper;
+            }
+            OTSpan spanWrapper = new OTSpan(agentSpan, this, logHandler);
+            attachableSpanWrapper.attachWrapper(spanWrapper);
+            return spanWrapper;
+        }
+        if (agentSpan == noopSpan()) {
+            return noopSpanWrapper;
+        }
+        return new OTSpan(agentSpan, this, logHandler);
     }
-    return new OTScopeManager.OTScope(scope, finishSpanOnClose, this);
-  }
 
-  public SpanContext toSpanContext(final AgentSpanContext context) {
-    if (context == null) {
-      return null;
+    public Scope toScope(final ContextScope scope, final boolean finishSpanOnClose) {
+        if (scope == null) {
+            return null;
+        }
+        return new OTScopeManager.OTScope(scope, finishSpanOnClose, this);
     }
-    // avoid a new SpanContext wrapper allocation for the noop context
-    if (context == noopSpanContext()) {
-      return noopContextWrapper;
+
+    public SpanContext toSpanContext(final AgentSpanContext context) {
+        if (context == null) {
+            return null;
+        }
+        // avoid a new SpanContext wrapper allocation for the noop context
+        if (context == noopSpanContext()) {
+            return noopContextWrapper;
+        }
+        return new OTSpanContext(context);
     }
-    return new OTSpanContext(context);
-  }
 
-  public AgentSpanContext toContext(final SpanContext spanContext) {
-    if (spanContext == null) {
-      return null;
-    } else if (spanContext instanceof OTSpanContext) {
-      return ((OTSpanContext) spanContext).getDelegate();
-    } else {
-      return noopSpanContext();
+    public AgentSpanContext toContext(final SpanContext spanContext) {
+        if (spanContext == null) {
+            return null;
+        } else if (spanContext instanceof OTSpanContext) {
+            return ((OTSpanContext) spanContext).getDelegate();
+        } else {
+            return noopSpanContext();
+        }
     }
-  }
 }
diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/resolver/DDTracerFactory.java b/dd-trace-ot/src/main/java/datadog/opentracing/resolver/DDTracerFactory.java
index 9bd70fc18d2..a40a1666e2a 100644
--- a/dd-trace-ot/src/main/java/datadog/opentracing/resolver/DDTracerFactory.java
+++ b/dd-trace-ot/src/main/java/datadog/opentracing/resolver/DDTracerFactory.java
@@ -11,16 +11,16 @@
 @AutoService(TracerFactory.class)
 public class DDTracerFactory implements TracerFactory {
 
-  private static final Logger log = LoggerFactory.getLogger(DDTracerFactory.class);
+    private static final Logger log = LoggerFactory.getLogger(DDTracerFactory.class);
 
-  @Override
-  public Tracer getTracer() {
-    if (Config.get().isTraceResolverEnabled()) {
-      log.info("Creating DDTracer with DDTracerFactory");
-      return DDTracer.builder().build();
-    } else {
-      log.info("DDTracerFactory disabled");
-      return null;
+    @Override
+    public Tracer getTracer() {
+        if (Config.get().isTraceResolverEnabled()) {
+            log.info("Creating DDTracer with DDTracerFactory");
+            return DDTracer.builder().build();
+        } else {
+            log.info("DDTracerFactory disabled");
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/resolver/DDTracerResolver.java b/dd-trace-ot/src/main/java/datadog/opentracing/resolver/DDTracerResolver.java
index d62bbe39043..a62802f8df1 100644
--- a/dd-trace-ot/src/main/java/datadog/opentracing/resolver/DDTracerResolver.java
+++ b/dd-trace-ot/src/main/java/datadog/opentracing/resolver/DDTracerResolver.java
@@ -11,16 +11,16 @@
 @AutoService(TracerResolver.class)
 public class DDTracerResolver extends TracerResolver {
 
-  private static final Logger log = LoggerFactory.getLogger(DDTracerResolver.class);
+    private static final Logger log = LoggerFactory.getLogger(DDTracerResolver.class);
 
-  @Override
-  protected Tracer resolve() {
-    if (Config.get().isTraceResolverEnabled()) {
-      log.info("Creating DDTracer with DDTracerResolver");
-      return DDTracer.builder().build();
-    } else {
-      log.info("DDTracerResolver disabled");
-      return null;
+    @Override
+    protected Tracer resolve() {
+        if (Config.get().isTraceResolverEnabled()) {
+            log.info("Creating DDTracer with DDTracerResolver");
+            return DDTracer.builder().build();
+        } else {
+            log.info("DDTracerResolver disabled");
+            return null;
+        }
     }
-  }
 }
diff --git a/dd-trace-ot/src/ot31CompatibilityTest/java/datadog/opentracing/OT31ApiTest.java b/dd-trace-ot/src/ot31CompatibilityTest/java/datadog/opentracing/OT31ApiTest.java
index 9f184b1c5fe..ed0596decc4 100644
--- a/dd-trace-ot/src/ot31CompatibilityTest/java/datadog/opentracing/OT31ApiTest.java
+++ b/dd-trace-ot/src/ot31CompatibilityTest/java/datadog/opentracing/OT31ApiTest.java
@@ -32,152 +32,149 @@
 // This test focuses on things that are different between OpenTracing API 0.31.0 and 0.32.0
 class OT31ApiTest extends DDJavaSpecification {
 
-  private final ListWriter writer = new ListWriter();
-  private final Tracer tracer = DDTracer.builder().writer(writer).build();
-
-  @AfterEach
-  void cleanup() throws Exception {
-    if (tracer != null) {
-      ((DDTracer) tracer).close();
-    }
-  }
-
-  @ParameterizedTest
-  @TableTest({
-    "scenario     | finishSpan",
-    "finish=true  | true      ",
-    "finish=false | false     "
-  })
-  void testStartActive(String scenario, boolean finishSpan) {
-    Scope scope = tracer.buildSpan("some name").startActive(finishSpan);
-    scope.close();
-    assertEquals(finishSpan, ((DDSpan) ((OTSpan) scope.span()).getDelegate()).isFinished());
-  }
-
-  @Test
-  void testStartManual() throws Exception {
-    tracer.buildSpan("some name").startManual().finish();
-
-    writer.waitForTraces(1);
-    assertEquals(1, writer.size());
-    assertEquals(1, writer.get(0).size());
-    assertEquals("some name", writer.get(0).get(0).getOperationName());
-  }
-
-  @ParameterizedTest
-  @TableTest({
-    "scenario     | finishSpan",
-    "finish=true  | true      ",
-    "finish=false | false     "
-  })
-  void testScopeManager(String scenario, boolean finishSpan) {
-    io.opentracing.Span span = tracer.buildSpan("some name").start();
-    Scope scope = tracer.scopeManager().activate(span, finishSpan);
-
-    assertNotNull(scope);
-    assertEquals(span, tracer.scopeManager().active().span());
-
-    // attempting to close via active() doesn't work because we lost the 'finishSpan' reference
-    tracer.scopeManager().active().close();
-    assertTrue(!((DDSpan) ((OTSpan) span).getDelegate()).isFinished());
-
-    scope.close();
-    assertEquals(finishSpan, ((DDSpan) ((OTSpan) span).getDelegate()).isFinished());
-  }
-
-  @ParameterizedTest
-  @TableTest({
-    "scenario     | contextPriority               | samplingMechanism         | propagatedPriority           ",
-    "sampler drop | PrioritySampling.SAMPLER_DROP | SamplingMechanism.DEFAULT | PrioritySampling.SAMPLER_DROP",
-    "sampler keep | PrioritySampling.SAMPLER_KEEP | SamplingMechanism.DEFAULT | PrioritySampling.SAMPLER_KEEP",
-    "unset        | PrioritySampling.UNSET        | SamplingMechanism.DEFAULT | PrioritySampling.SAMPLER_KEEP",
-    "user keep    | PrioritySampling.USER_KEEP    | SamplingMechanism.MANUAL  | PrioritySampling.USER_KEEP   ",
-    "user drop    | PrioritySampling.USER_DROP    | SamplingMechanism.MANUAL  | PrioritySampling.USER_DROP   "
-  })
-  void testInjectExtract(
-      String scenario,
-      @ConvertWith(PrioritySamplingConverter.class) byte contextPriority,
-      @ConvertWith(SamplingMechanismConverter.class) byte samplingMechanism,
-      @ConvertWith(PrioritySamplingConverter.class) byte propagatedPriority)
-      throws Exception {
-    io.opentracing.Span span = tracer.buildSpan("some name").start();
-    io.opentracing.SpanContext context = span.context();
-    Map<String, String> map = new HashMap<>();
-    LocalTextMapAdapter adapter = new LocalTextMapAdapter(map);
-
-    DDSpanContext ddContext = (DDSpanContext) ((OTSpanContext) context).getDelegate();
-    ddContext.setSamplingPriority(contextPriority, samplingMechanism);
-    tracer.inject(context, Format.Builtin.TEXT_MAP, adapter);
-
-    DDTraceId traceId = ((OTSpan) span).getDelegate().spanContext().getTraceId();
-    long spanId = ((OTSpan) span).getDelegate().spanContext().getSpanId();
-    String expectedTraceparent =
-        "00-"
-            + traceId.toHexStringPadded(32)
-            + "-"
-            + DDSpanId.toHexStringPadded(spanId)
-            + "-"
-            + (propagatedPriority > 0 ? "01" : "00");
-    int effectiveSamplingMechanism = contextPriority == UNSET ? AGENT_RATE : samplingMechanism;
-    String expectedTracestate =
-        "dd=s:"
-            + propagatedPriority
-            + ";p:"
-            + DDSpanId.toHexStringPadded(spanId)
-            + (propagatedPriority > 0 ? ";t.dm:-" + effectiveSamplingMechanism : "")
-            + ";t.tid:"
-            + traceId.toHexStringPadded(32).substring(0, 16)
-            + (contextPriority == UNSET ? ";t.ksr:1,ot=rv:[0-9a-f]{14};th:0" : "");
-
-    Map<String, String> expectedTextMap = new HashMap<>();
-    OTSpanContext otContext = (OTSpanContext) context;
-    expectedTextMap.put("x-datadog-trace-id", otContext.toTraceId());
-    expectedTextMap.put("x-datadog-parent-id", otContext.toSpanId());
-    expectedTextMap.put("x-datadog-sampling-priority", String.valueOf(propagatedPriority));
-    expectedTextMap.put("traceparent", expectedTraceparent);
-    Map<String, String> actualTextMap = new HashMap<>(map);
-    String actualTracestate = actualTextMap.remove("tracestate");
-    assertNotNull(actualTracestate);
-    assertTrue(actualTracestate.matches(expectedTracestate), actualTracestate);
-
-    ArrayList<String> datadogTags = new ArrayList<>();
-    if (propagatedPriority > 0) {
-      datadogTags.add("_dd.p.dm=-" + effectiveSamplingMechanism);
-    }
-    if (traceId.toHighOrderLong() != 0) {
-      datadogTags.add(
-          "_dd.p.tid=" + LongStringUtils.toHexStringPadded(traceId.toHighOrderLong(), 16));
-    }
-    if (contextPriority == UNSET) {
-      datadogTags.add("_dd.p.ksr=1");
-    }
-    if (!datadogTags.isEmpty()) {
-      expectedTextMap.put("x-datadog-tags", String.join(",", datadogTags));
+    private final ListWriter writer = new ListWriter();
+    private final Tracer tracer = DDTracer.builder().writer(writer).build();
+
+    @AfterEach
+    void cleanup() throws Exception {
+        if (tracer != null) {
+            ((DDTracer) tracer).close();
+        }
     }
 
-    assertEquals(expectedTextMap, actualTextMap);
+    @ParameterizedTest
+    @TableTest({
+      "scenario     | finishSpan",
+      "finish=true  | true      ",
+      "finish=false | false     "
+    })
+    void testStartActive(String scenario, boolean finishSpan) {
+        Scope scope = tracer.buildSpan("some name").startActive(finishSpan);
+        scope.close();
+        assertEquals(finishSpan, ((DDSpan) ((OTSpan) scope.span()).getDelegate()).isFinished());
+    }
 
-    OTSpanContext extract = (OTSpanContext) tracer.extract(Format.Builtin.TEXT_MAP, adapter);
-    assertEquals(otContext.toTraceId(), extract.toTraceId());
-    assertEquals(otContext.toSpanId(), extract.toSpanId());
-    assertEquals(propagatedPriority, extract.getDelegate().getSamplingPriority());
-  }
+    @Test
+    void testStartManual() throws Exception {
+        tracer.buildSpan("some name").startManual().finish();
 
-  static class LocalTextMapAdapter implements TextMap {
-    private final Map<String, String> map;
+        writer.waitForTraces(1);
+        assertEquals(1, writer.size());
+        assertEquals(1, writer.get(0).size());
+        assertEquals("some name", writer.get(0).get(0).getOperationName());
+    }
 
-    LocalTextMapAdapter(Map<String, String> map) {
-      this.map = map;
+    @ParameterizedTest
+    @TableTest({
+      "scenario     | finishSpan",
+      "finish=true  | true      ",
+      "finish=false | false     "
+    })
+    void testScopeManager(String scenario, boolean finishSpan) {
+        io.opentracing.Span span = tracer.buildSpan("some name").start();
+        Scope scope = tracer.scopeManager().activate(span, finishSpan);
+
+        assertNotNull(scope);
+        assertEquals(span, tracer.scopeManager().active().span());
+
+        // attempting to close via active() doesn't work because we lost the 'finishSpan' reference
+        tracer.scopeManager().active().close();
+        assertTrue(!((DDSpan) ((OTSpan) span).getDelegate()).isFinished());
+
+        scope.close();
+        assertEquals(finishSpan, ((DDSpan) ((OTSpan) span).getDelegate()).isFinished());
     }
 
-    @Override
-    public Iterator<Map.Entry<String, String>> iterator() {
-      return map.entrySet().iterator();
+    @ParameterizedTest
+    @TableTest({
+      "scenario     | contextPriority               | samplingMechanism         | propagatedPriority           ",
+      "sampler drop | PrioritySampling.SAMPLER_DROP | SamplingMechanism.DEFAULT | PrioritySampling.SAMPLER_DROP",
+      "sampler keep | PrioritySampling.SAMPLER_KEEP | SamplingMechanism.DEFAULT | PrioritySampling.SAMPLER_KEEP",
+      "unset        | PrioritySampling.UNSET        | SamplingMechanism.DEFAULT | PrioritySampling.SAMPLER_KEEP",
+      "user keep    | PrioritySampling.USER_KEEP    | SamplingMechanism.MANUAL  | PrioritySampling.USER_KEEP   ",
+      "user drop    | PrioritySampling.USER_DROP    | SamplingMechanism.MANUAL  | PrioritySampling.USER_DROP   "
+    })
+    void testInjectExtract(
+            String scenario,
+            @ConvertWith(PrioritySamplingConverter.class) byte contextPriority,
+            @ConvertWith(SamplingMechanismConverter.class) byte samplingMechanism,
+            @ConvertWith(PrioritySamplingConverter.class) byte propagatedPriority)
+            throws Exception {
+        io.opentracing.Span span = tracer.buildSpan("some name").start();
+        io.opentracing.SpanContext context = span.context();
+        Map<String, String> map = new HashMap<>();
+        LocalTextMapAdapter adapter = new LocalTextMapAdapter(map);
+
+        DDSpanContext ddContext = (DDSpanContext) ((OTSpanContext) context).getDelegate();
+        ddContext.setSamplingPriority(contextPriority, samplingMechanism);
+        tracer.inject(context, Format.Builtin.TEXT_MAP, adapter);
+
+        DDTraceId traceId = ((OTSpan) span).getDelegate().spanContext().getTraceId();
+        long spanId = ((OTSpan) span).getDelegate().spanContext().getSpanId();
+        String expectedTraceparent = "00-"
+                + traceId.toHexStringPadded(32)
+                + "-"
+                + DDSpanId.toHexStringPadded(spanId)
+                + "-"
+                + (propagatedPriority > 0 ? "01" : "00");
+        int effectiveSamplingMechanism = contextPriority == UNSET ? AGENT_RATE : samplingMechanism;
+        String expectedTracestate = "dd=s:"
+                + propagatedPriority
+                + ";p:"
+                + DDSpanId.toHexStringPadded(spanId)
+                + (propagatedPriority > 0 ? ";t.dm:-" + effectiveSamplingMechanism : "")
+                + ";t.tid:"
+                + traceId.toHexStringPadded(32).substring(0, 16)
+                + (contextPriority == UNSET ? ";t.ksr:1,ot=rv:[0-9a-f]{14};th:0" : "");
+
+        Map<String, String> expectedTextMap = new HashMap<>();
+        OTSpanContext otContext = (OTSpanContext) context;
+        expectedTextMap.put("x-datadog-trace-id", otContext.toTraceId());
+        expectedTextMap.put("x-datadog-parent-id", otContext.toSpanId());
+        expectedTextMap.put("x-datadog-sampling-priority", String.valueOf(propagatedPriority));
+        expectedTextMap.put("traceparent", expectedTraceparent);
+        Map<String, String> actualTextMap = new HashMap<>(map);
+        String actualTracestate = actualTextMap.remove("tracestate");
+        assertNotNull(actualTracestate);
+        assertTrue(actualTracestate.matches(expectedTracestate), actualTracestate);
+
+        ArrayList<String> datadogTags = new ArrayList<>();
+        if (propagatedPriority > 0) {
+            datadogTags.add("_dd.p.dm=-" + effectiveSamplingMechanism);
+        }
+        if (traceId.toHighOrderLong() != 0) {
+            datadogTags.add("_dd.p.tid=" + LongStringUtils.toHexStringPadded(traceId.toHighOrderLong(), 16));
+        }
+        if (contextPriority == UNSET) {
+            datadogTags.add("_dd.p.ksr=1");
+        }
+        if (!datadogTags.isEmpty()) {
+            expectedTextMap.put("x-datadog-tags", String.join(",", datadogTags));
+        }
+
+        assertEquals(expectedTextMap, actualTextMap);
+
+        OTSpanContext extract = (OTSpanContext) tracer.extract(Format.Builtin.TEXT_MAP, adapter);
+        assertEquals(otContext.toTraceId(), extract.toTraceId());
+        assertEquals(otContext.toSpanId(), extract.toSpanId());
+        assertEquals(propagatedPriority, extract.getDelegate().getSamplingPriority());
     }
 
-    @Override
-    public void put(String key, String value) {
-      map.put(key, value);
+    static class LocalTextMapAdapter implements TextMap {
+        private final Map<String, String> map;
+
+        LocalTextMapAdapter(Map<String, String> map) {
+            this.map = map;
+        }
+
+        @Override
+        public Iterator<Map.Entry<String, String>> iterator() {
+            return map.entrySet().iterator();
+        }
+
+        @Override
+        public void put(String key, String value) {
+            map.put(key, value);
+        }
     }
-  }
 }
diff --git a/dd-trace-ot/src/ot33CompatibilityTest/java/datadog/opentracing/OT33ApiTest.java b/dd-trace-ot/src/ot33CompatibilityTest/java/datadog/opentracing/OT33ApiTest.java
index 5575e0c47e1..96cad24017f 100644
--- a/dd-trace-ot/src/ot33CompatibilityTest/java/datadog/opentracing/OT33ApiTest.java
+++ b/dd-trace-ot/src/ot33CompatibilityTest/java/datadog/opentracing/OT33ApiTest.java
@@ -32,139 +32,136 @@
 // This test focuses on things that are different between OpenTracing API 0.32.0 and 0.33.0
 class OT33ApiTest extends DDJavaSpecification {
 
-  private final ListWriter writer = new ListWriter();
-  private final Tracer tracer = DDTracer.builder().writer(writer).build();
-
-  @AfterEach
-  void cleanup() throws Exception {
-    if (tracer != null) {
-      ((DDTracer) tracer).close();
-    }
-  }
-
-  @Test
-  void testStart() throws Exception {
-    io.opentracing.Span span = tracer.buildSpan("some name").start();
-    Scope scope = tracer.activateSpan(span);
-    scope.close();
-
-    assertFalse(((datadog.trace.core.DDSpan) ((OTSpan) span).getDelegate()).isFinished());
-    assertEquals(0, writer.size());
-
-    span.finish();
-
-    writer.waitForTraces(1);
-    assertEquals(1, writer.size());
-    assertEquals("some name", writer.get(0).get(0).getOperationName());
-  }
-
-  @Test
-  void testScopeManager() {
-    datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI coreTracer =
-        ((DDTracer) tracer).getInternalTracer();
-
-    io.opentracing.Span span = tracer.buildSpan("some name").start();
-    Scope scope = tracer.scopeManager().activate(span);
-
-    assertEquals(span, tracer.activeSpan());
-    assertEquals(((OTSpan) span).getDelegate(), coreTracer.activeSpan());
-
-    scope.close();
-    span.finish();
-  }
-
-  @ParameterizedTest
-  @TableTest({
-    "scenario     | contextPriority               | samplingMechanism         | propagatedPriority           ",
-    "sampler drop | PrioritySampling.SAMPLER_DROP | SamplingMechanism.DEFAULT | PrioritySampling.SAMPLER_DROP",
-    "sampler keep | PrioritySampling.SAMPLER_KEEP | SamplingMechanism.DEFAULT | PrioritySampling.SAMPLER_KEEP",
-    "unset        | PrioritySampling.UNSET        | SamplingMechanism.DEFAULT | PrioritySampling.SAMPLER_KEEP",
-    "user keep    | PrioritySampling.USER_KEEP    | SamplingMechanism.MANUAL  | PrioritySampling.USER_KEEP   ",
-    "user drop    | PrioritySampling.USER_DROP    | SamplingMechanism.MANUAL  | PrioritySampling.USER_DROP   "
-  })
-  void testInjectExtract(
-      String scenario,
-      @ConvertWith(PrioritySamplingConverter.class) byte contextPriority,
-      @ConvertWith(SamplingMechanismConverter.class) byte samplingMechanism,
-      @ConvertWith(PrioritySamplingConverter.class) byte propagatedPriority)
-      throws Exception {
-    io.opentracing.Span span = tracer.buildSpan("some name").start();
-    io.opentracing.SpanContext context = span.context();
-    Map<String, String> map = new HashMap<>();
-    LocalTextMapAdapter adapter = new LocalTextMapAdapter(map);
-
-    DDSpanContext ddContext = (DDSpanContext) ((OTSpanContext) context).getDelegate();
-    ddContext.setSamplingPriority(contextPriority, samplingMechanism);
-    tracer.inject(context, Format.Builtin.TEXT_MAP, adapter);
-
-    DDTraceId traceId = ((OTSpan) span).getDelegate().spanContext().getTraceId();
-    long spanId = ((OTSpan) span).getDelegate().spanContext().getSpanId();
-    String expectedTraceparent =
-        "00-"
-            + traceId.toHexStringPadded(32)
-            + "-"
-            + DDSpanId.toHexStringPadded(spanId)
-            + "-"
-            + (propagatedPriority > 0 ? "01" : "00");
-    int effectiveSamplingMechanism = contextPriority == UNSET ? AGENT_RATE : samplingMechanism;
-    String expectedTracestate =
-        "dd=s:"
-            + propagatedPriority
-            + ";p:"
-            + DDSpanId.toHexStringPadded(spanId)
-            + (propagatedPriority > 0 ? ";t.dm:-" + effectiveSamplingMechanism : "")
-            + ";t.tid:"
-            + traceId.toHexStringPadded(32).substring(0, 16)
-            + (contextPriority == UNSET ? ";t.ksr:1,ot=rv:[0-9a-f]{14};th:0" : "");
-
-    Map<String, String> expectedTextMap = new HashMap<>();
-    expectedTextMap.put("x-datadog-trace-id", context.toTraceId());
-    expectedTextMap.put("x-datadog-parent-id", context.toSpanId());
-    expectedTextMap.put("x-datadog-sampling-priority", String.valueOf(propagatedPriority));
-    expectedTextMap.put("traceparent", expectedTraceparent);
-    Map<String, String> actualTextMap = new HashMap<>(map);
-    String actualTracestate = actualTextMap.remove("tracestate");
-    assertNotNull(actualTracestate);
-    assertTrue(actualTracestate.matches(expectedTracestate), actualTracestate);
-
-    ArrayList<String> datadogTags = new ArrayList<>();
-    if (propagatedPriority > 0) {
-      datadogTags.add("_dd.p.dm=-" + effectiveSamplingMechanism);
-    }
-    if (traceId.toHighOrderLong() != 0) {
-      datadogTags.add(
-          "_dd.p.tid=" + LongStringUtils.toHexStringPadded(traceId.toHighOrderLong(), 16));
+    private final ListWriter writer = new ListWriter();
+    private final Tracer tracer = DDTracer.builder().writer(writer).build();
+
+    @AfterEach
+    void cleanup() throws Exception {
+        if (tracer != null) {
+            ((DDTracer) tracer).close();
+        }
     }
-    if (contextPriority == UNSET) {
-      datadogTags.add("_dd.p.ksr=1");
-    }
-    if (!datadogTags.isEmpty()) {
-      expectedTextMap.put("x-datadog-tags", String.join(",", datadogTags));
+
+    @Test
+    void testStart() throws Exception {
+        io.opentracing.Span span = tracer.buildSpan("some name").start();
+        Scope scope = tracer.activateSpan(span);
+        scope.close();
+
+        assertFalse(((datadog.trace.core.DDSpan) ((OTSpan) span).getDelegate()).isFinished());
+        assertEquals(0, writer.size());
+
+        span.finish();
+
+        writer.waitForTraces(1);
+        assertEquals(1, writer.size());
+        assertEquals("some name", writer.get(0).get(0).getOperationName());
     }
 
-    assertEquals(expectedTextMap, actualTextMap);
+    @Test
+    void testScopeManager() {
+        datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI coreTracer =
+                ((DDTracer) tracer).getInternalTracer();
 
-    io.opentracing.SpanContext extract = tracer.extract(Format.Builtin.TEXT_MAP, adapter);
-    assertEquals(context.toTraceId(), extract.toTraceId());
-    assertEquals(context.toSpanId(), extract.toSpanId());
-    assertEquals(propagatedPriority, ((OTSpanContext) extract).getDelegate().getSamplingPriority());
-  }
+        io.opentracing.Span span = tracer.buildSpan("some name").start();
+        Scope scope = tracer.scopeManager().activate(span);
 
-  static class LocalTextMapAdapter implements TextMap {
-    private final Map<String, String> map;
+        assertEquals(span, tracer.activeSpan());
+        assertEquals(((OTSpan) span).getDelegate(), coreTracer.activeSpan());
 
-    LocalTextMapAdapter(Map<String, String> map) {
-      this.map = map;
+        scope.close();
+        span.finish();
     }
 
-    @Override
-    public Iterator<Map.Entry<String, String>> iterator() {
-      return map.entrySet().iterator();
+    @ParameterizedTest
+    @TableTest({
+      "scenario     | contextPriority               | samplingMechanism         | propagatedPriority           ",
+      "sampler drop | PrioritySampling.SAMPLER_DROP | SamplingMechanism.DEFAULT | PrioritySampling.SAMPLER_DROP",
+      "sampler keep | PrioritySampling.SAMPLER_KEEP | SamplingMechanism.DEFAULT | PrioritySampling.SAMPLER_KEEP",
+      "unset        | PrioritySampling.UNSET        | SamplingMechanism.DEFAULT | PrioritySampling.SAMPLER_KEEP",
+      "user keep    | PrioritySampling.USER_KEEP    | SamplingMechanism.MANUAL  | PrioritySampling.USER_KEEP   ",
+      "user drop    | PrioritySampling.USER_DROP    | SamplingMechanism.MANUAL  | PrioritySampling.USER_DROP   "
+    })
+    void testInjectExtract(
+            String scenario,
+            @ConvertWith(PrioritySamplingConverter.class) byte contextPriority,
+            @ConvertWith(SamplingMechanismConverter.class) byte samplingMechanism,
+            @ConvertWith(PrioritySamplingConverter.class) byte propagatedPriority)
+            throws Exception {
+        io.opentracing.Span span = tracer.buildSpan("some name").start();
+        io.opentracing.SpanContext context = span.context();
+        Map<String, String> map = new HashMap<>();
+        LocalTextMapAdapter adapter = new LocalTextMapAdapter(map);
+
+        DDSpanContext ddContext = (DDSpanContext) ((OTSpanContext) context).getDelegate();
+        ddContext.setSamplingPriority(contextPriority, samplingMechanism);
+        tracer.inject(context, Format.Builtin.TEXT_MAP, adapter);
+
+        DDTraceId traceId = ((OTSpan) span).getDelegate().spanContext().getTraceId();
+        long spanId = ((OTSpan) span).getDelegate().spanContext().getSpanId();
+        String expectedTraceparent = "00-"
+                + traceId.toHexStringPadded(32)
+                + "-"
+                + DDSpanId.toHexStringPadded(spanId)
+                + "-"
+                + (propagatedPriority > 0 ? "01" : "00");
+        int effectiveSamplingMechanism = contextPriority == UNSET ? AGENT_RATE : samplingMechanism;
+        String expectedTracestate = "dd=s:"
+                + propagatedPriority
+                + ";p:"
+                + DDSpanId.toHexStringPadded(spanId)
+                + (propagatedPriority > 0 ? ";t.dm:-" + effectiveSamplingMechanism : "")
+                + ";t.tid:"
+                + traceId.toHexStringPadded(32).substring(0, 16)
+                + (contextPriority == UNSET ? ";t.ksr:1,ot=rv:[0-9a-f]{14};th:0" : "");
+
+        Map<String, String> expectedTextMap = new HashMap<>();
+        expectedTextMap.put("x-datadog-trace-id", context.toTraceId());
+        expectedTextMap.put("x-datadog-parent-id", context.toSpanId());
+        expectedTextMap.put("x-datadog-sampling-priority", String.valueOf(propagatedPriority));
+        expectedTextMap.put("traceparent", expectedTraceparent);
+        Map<String, String> actualTextMap = new HashMap<>(map);
+        String actualTracestate = actualTextMap.remove("tracestate");
+        assertNotNull(actualTracestate);
+        assertTrue(actualTracestate.matches(expectedTracestate), actualTracestate);
+
+        ArrayList<String> datadogTags = new ArrayList<>();
+        if (propagatedPriority > 0) {
+            datadogTags.add("_dd.p.dm=-" + effectiveSamplingMechanism);
+        }
+        if (traceId.toHighOrderLong() != 0) {
+            datadogTags.add("_dd.p.tid=" + LongStringUtils.toHexStringPadded(traceId.toHighOrderLong(), 16));
+        }
+        if (contextPriority == UNSET) {
+            datadogTags.add("_dd.p.ksr=1");
+        }
+        if (!datadogTags.isEmpty()) {
+            expectedTextMap.put("x-datadog-tags", String.join(",", datadogTags));
+        }
+
+        assertEquals(expectedTextMap, actualTextMap);
+
+        io.opentracing.SpanContext extract = tracer.extract(Format.Builtin.TEXT_MAP, adapter);
+        assertEquals(context.toTraceId(), extract.toTraceId());
+        assertEquals(context.toSpanId(), extract.toSpanId());
+        assertEquals(propagatedPriority, ((OTSpanContext) extract).getDelegate().getSamplingPriority());
     }
 
-    @Override
-    public void put(String key, String value) {
-      map.put(key, value);
+    static class LocalTextMapAdapter implements TextMap {
+        private final Map<String, String> map;
+
+        LocalTextMapAdapter(Map<String, String> map) {
+            this.map = map;
+        }
+
+        @Override
+        public Iterator<Map.Entry<String, String>> iterator() {
+            return map.entrySet().iterator();
+        }
+
+        @Override
+        public void put(String key, String value) {
+            map.put(key, value);
+        }
     }
-  }
 }
diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerAPITest.java b/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerAPITest.java
index a15dd3ae44f..ab796584f49 100644
--- a/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerAPITest.java
+++ b/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerAPITest.java
@@ -19,44 +19,46 @@
 
 class DDTracerAPITest extends DDJavaSpecification {
 
-  @Test
-  void verifySamplerWriterConstructor() throws Exception {
-    ListWriter writer = new ListWriter();
-    RateByServiceTraceSampler sampler = new RateByServiceTraceSampler();
-    DDTracer tracerOT = new DDTracer(DEFAULT_SERVICE_NAME, writer, sampler);
-    try {
-      AgentTracer.TracerAPI tracerAPI = tracerOT.getInternalTracer();
-      CoreTracer tracer = (CoreTracer) tracerAPI;
+    @Test
+    void verifySamplerWriterConstructor() throws Exception {
+        ListWriter writer = new ListWriter();
+        RateByServiceTraceSampler sampler = new RateByServiceTraceSampler();
+        DDTracer tracerOT = new DDTracer(DEFAULT_SERVICE_NAME, writer, sampler);
+        try {
+            AgentTracer.TracerAPI tracerAPI = tracerOT.getInternalTracer();
+            CoreTracer tracer = (CoreTracer) tracerAPI;
 
-      assertEquals(DEFAULT_SERVICE_NAME, getField(tracer, "serviceName"));
-      assertSame(sampler, getField(tracer, "initialSampler"));
-      assertSame(writer, getField(tracer, "writer"));
+            assertEquals(DEFAULT_SERVICE_NAME, getField(tracer, "serviceName"));
+            assertSame(sampler, getField(tracer, "initialSampler"));
+            assertSame(writer, getField(tracer, "writer"));
 
-      Object localRootSpanTagsHolder = getField(tracer, "localRootSpanTags");
-      Object localRootSpanTags = getField(localRootSpanTagsHolder, "tags");
-      assertNotNull(localRootSpanTags.toString());
-      // Verify runtime-id and language tags are populated
-      assertTrue(
-          ((java.util.Map<?, ?>) localRootSpanTags).get(RUNTIME_ID_TAG).toString().length() > 0);
-      assertEquals(
-          LANGUAGE_TAG_VALUE, ((java.util.Map<?, ?>) localRootSpanTags).get(LANGUAGE_TAG_KEY));
-    } finally {
-      tracerOT.close();
+            Object localRootSpanTagsHolder = getField(tracer, "localRootSpanTags");
+            Object localRootSpanTags = getField(localRootSpanTagsHolder, "tags");
+            assertNotNull(localRootSpanTags.toString());
+            // Verify runtime-id and language tags are populated
+            assertTrue(((java.util.Map<?, ?>) localRootSpanTags)
+                            .get(RUNTIME_ID_TAG)
+                            .toString()
+                            .length()
+                    > 0);
+            assertEquals(LANGUAGE_TAG_VALUE, ((java.util.Map<?, ?>) localRootSpanTags).get(LANGUAGE_TAG_KEY));
+        } finally {
+            tracerOT.close();
+        }
     }
-  }
 
-  @SuppressWarnings("unchecked")
-  private static <T> T getField(Object obj, String fieldName) throws Exception {
-    Class<?> cls = obj.getClass();
-    while (cls != null) {
-      try {
-        Field field = cls.getDeclaredField(fieldName);
-        field.setAccessible(true);
-        return (T) field.get(obj);
-      } catch (NoSuchFieldException ignored) {
-        cls = cls.getSuperclass();
-      }
+    @SuppressWarnings("unchecked")
+    private static <T> T getField(Object obj, String fieldName) throws Exception {
+        Class<?> cls = obj.getClass();
+        while (cls != null) {
+            try {
+                Field field = cls.getDeclaredField(fieldName);
+                field.setAccessible(true);
+                return (T) field.get(obj);
+            } catch (NoSuchFieldException ignored) {
+                cls = cls.getSuperclass();
+            }
+        }
+        throw new NoSuchFieldException("Field " + fieldName + " not found on " + obj.getClass());
     }
-    throw new NoSuchFieldException("Field " + fieldName + " not found on " + obj.getClass());
-  }
 }
diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java
index ff8704e305e..441f59fbd80 100644
--- a/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java
+++ b/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java
@@ -16,81 +16,82 @@
 
 class DDTracerTest extends DDJavaSpecification {
 
-  @Test
-  void testTracerBuilder() throws Exception {
-    DDTracer tracer = DDTracer.builder().build();
-    assertNotNull(tracer);
-    tracer.close();
-  }
-
-  @Test
-  void testDeprecatedTracerConstructor() throws Exception {
-    DDTracer tracer1 = new DDTracer();
-    DDTracer tracer2 = new DDTracer("serviceName");
-    DDTracer tracer3 = new DDTracer("serviceName", mock(Writer.class), mock(Sampler.class));
-    DDTracer tracer4 =
-        new DDTracer("serviceName", mock(Writer.class), mock(Sampler.class), new HashMap<>());
-    DDTracer tracer5 = new DDTracer(mock(Writer.class));
+    @Test
+    void testTracerBuilder() throws Exception {
+        DDTracer tracer = DDTracer.builder().build();
+        assertNotNull(tracer);
+        tracer.close();
+    }
 
-    assertNotNull(tracer1);
-    assertNotNull(tracer2);
-    assertNotNull(tracer3);
-    assertNotNull(tracer4);
-    assertNotNull(tracer5);
+    @Test
+    void testDeprecatedTracerConstructor() throws Exception {
+        DDTracer tracer1 = new DDTracer();
+        DDTracer tracer2 = new DDTracer("serviceName");
+        DDTracer tracer3 = new DDTracer("serviceName", mock(Writer.class), mock(Sampler.class));
+        DDTracer tracer4 = new DDTracer("serviceName", mock(Writer.class), mock(Sampler.class), new HashMap<>());
+        DDTracer tracer5 = new DDTracer(mock(Writer.class));
 
-    tracer1.close();
-    tracer2.close();
-    tracer3.close();
-    tracer4.close();
-    tracer5.close();
-  }
+        assertNotNull(tracer1);
+        assertNotNull(tracer2);
+        assertNotNull(tracer3);
+        assertNotNull(tracer4);
+        assertNotNull(tracer5);
 
-  @Test
-  void testTracerBuilderWithDefaultWriter() throws Exception {
-    DDTracer tracer = DDTracer.builder().writer(DDAgentWriter.builder().build()).build();
-    assertNotNull(tracer);
-    tracer.close();
-  }
+        tracer1.close();
+        tracer2.close();
+        tracer3.close();
+        tracer4.close();
+        tracer5.close();
+    }
 
-  @Test
-  void testAccessToTraceSegment() throws Exception {
-    DDTracer tracer = DDTracer.builder().writer(DDAgentWriter.builder().build()).build();
-    OTSpan span = (OTSpan) tracer.buildSpan("some name").start();
-    try (Scope scope = tracer.scopeManager().activate(span)) {
-      assertNotNull(tracer);
-      assertEquals(span, tracer.activeSpan());
-      assertNotNull(tracer.getTraceSegment());
+    @Test
+    void testTracerBuilderWithDefaultWriter() throws Exception {
+        DDTracer tracer =
+                DDTracer.builder().writer(DDAgentWriter.builder().build()).build();
+        assertNotNull(tracer);
+        tracer.close();
     }
 
-    tracer.close();
-  }
+    @Test
+    void testAccessToTraceSegment() throws Exception {
+        DDTracer tracer =
+                DDTracer.builder().writer(DDAgentWriter.builder().build()).build();
+        OTSpan span = (OTSpan) tracer.buildSpan("some name").start();
+        try (Scope scope = tracer.scopeManager().activate(span)) {
+            assertNotNull(tracer);
+            assertEquals(span, tracer.activeSpan());
+            assertNotNull(tracer.getTraceSegment());
+        }
 
-  @Test
-  void shouldProduceBlackholeScopes() throws Exception {
-    ListWriter writer = new ListWriter();
-    DDTracer tracer = DDTracer.builder().writer(writer).build();
+        tracer.close();
+    }
+
+    @Test
+    void shouldProduceBlackholeScopes() throws Exception {
+        ListWriter writer = new ListWriter();
+        DDTracer tracer = DDTracer.builder().writer(writer).build();
 
-    OTSpan span = (OTSpan) tracer.buildSpan("some name").start();
-    Scope scope = tracer.scopeManager().activate(span);
-    TraceScope muteScope = tracer.muteTracing();
-    io.opentracing.Span blackholed = tracer.buildSpan("hidden span").start();
-    blackholed.finish();
-    muteScope.close();
-    io.opentracing.Span visibleSpan = tracer.buildSpan("visible span").start();
-    visibleSpan.finish();
-    scope.close();
-    span.finish();
+        OTSpan span = (OTSpan) tracer.buildSpan("some name").start();
+        Scope scope = tracer.scopeManager().activate(span);
+        TraceScope muteScope = tracer.muteTracing();
+        io.opentracing.Span blackholed = tracer.buildSpan("hidden span").start();
+        blackholed.finish();
+        muteScope.close();
+        io.opentracing.Span visibleSpan = tracer.buildSpan("visible span").start();
+        visibleSpan.finish();
+        scope.close();
+        span.finish();
 
-    writer.waitForTraces(1);
-    assertEquals(1, writer.size());
-    assertEquals(2, writer.firstTrace().size());
-    assertEquals(
-        Long.toString(writer.firstTrace().get(0).spanContext().getSpanId()),
-        span.context().toSpanId());
-    assertEquals(
-        Long.toString(writer.firstTrace().get(1).spanContext().getSpanId()),
-        visibleSpan.context().toSpanId());
+        writer.waitForTraces(1);
+        assertEquals(1, writer.size());
+        assertEquals(2, writer.firstTrace().size());
+        assertEquals(
+                Long.toString(writer.firstTrace().get(0).spanContext().getSpanId()),
+                span.context().toSpanId());
+        assertEquals(
+                Long.toString(writer.firstTrace().get(1).spanContext().getSpanId()),
+                visibleSpan.context().toSpanId());
 
-    tracer.close();
-  }
+        tracer.close();
+    }
 }
diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/DefaultLogHandlerTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/DefaultLogHandlerTest.java
index 3959d8b9af0..882ef9a1203 100644
--- a/dd-trace-ot/src/test/java/datadog/opentracing/DefaultLogHandlerTest.java
+++ b/dd-trace-ot/src/test/java/datadog/opentracing/DefaultLogHandlerTest.java
@@ -18,246 +18,263 @@
 
 class DefaultLogHandlerTest extends DDJavaSpecification {
 
-  private final ListWriter writer = new ListWriter();
-  private final CoreTracer tracer = CoreTracer.builder().writer(writer).build();
+    private final ListWriter writer = new ListWriter();
+    private final CoreTracer tracer = CoreTracer.builder().writer(writer).build();
+
+    @AfterEach
+    void cleanup() throws Exception {
+        if (tracer != null) {
+            tracer.close();
+        }
+    }
 
-  @AfterEach
-  void cleanup() throws Exception {
-    if (tracer != null) {
-      tracer.close();
+    @Test
+    void handlesCorrectlyTheErrorPassedInTheFields() {
+        LogHandler underTest = new DefaultLogHandler();
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("datadog", "op name").withServiceName("foo").start();
+        String errorMessage = "errorMessage";
+        String differentMessage = "differentMessage";
+        Throwable error = new Throwable(errorMessage);
+        Map<String, Object> fields = new HashMap<>();
+        fields.put(Fields.ERROR_OBJECT, error);
+        fields.put(Fields.MESSAGE, differentMessage);
+
+        underTest.log(fields, span);
+
+        assertEquals(error.getMessage(), span.getTags().get(DDTags.ERROR_MSG));
+        assertEquals(error.getClass().getName(), span.getTags().get(DDTags.ERROR_TYPE));
     }
-  }
-
-  @Test
-  void handlesCorrectlyTheErrorPassedInTheFields() {
-    LogHandler underTest = new DefaultLogHandler();
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "op name").withServiceName("foo").start();
-    String errorMessage = "errorMessage";
-    String differentMessage = "differentMessage";
-    Throwable error = new Throwable(errorMessage);
-    Map<String, Object> fields = new HashMap<>();
-    fields.put(Fields.ERROR_OBJECT, error);
-    fields.put(Fields.MESSAGE, differentMessage);
-
-    underTest.log(fields, span);
-
-    assertEquals(error.getMessage(), span.getTags().get(DDTags.ERROR_MSG));
-    assertEquals(error.getClass().getName(), span.getTags().get(DDTags.ERROR_TYPE));
-  }
-
-  @Test
-  void handlesCorrectlyTheErrorPassedInTheFieldsWhenCalledWithTimestamp() {
-    LogHandler underTest = new DefaultLogHandler();
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "op name").withServiceName("foo").start();
-    String errorMessage = "errorMessage";
-    String differentMessage = "differentMessage";
-    Throwable error = new Throwable(errorMessage);
-    Map<String, Object> fields = new HashMap<>();
-    fields.put(Fields.ERROR_OBJECT, error);
-    fields.put(Fields.MESSAGE, differentMessage);
-
-    underTest.log(System.currentTimeMillis(), fields, span);
-
-    assertEquals(error.getMessage(), span.getTags().get(DDTags.ERROR_MSG));
-    assertEquals(error.getClass().getName(), span.getTags().get(DDTags.ERROR_TYPE));
-  }
-
-  @Test
-  void handlesCorrectlyTheMessageInTheFieldsButSpanIsNotAnError() {
-    LogHandler underTest = new DefaultLogHandler();
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "op name").withServiceName("foo").start();
-    String errorMessage = "errorMessage";
-    Map<String, Object> fields = new HashMap<>();
-    fields.put(Fields.MESSAGE, errorMessage);
-
-    underTest.log(fields, span);
-
-    assertNull(span.getTags().get(DDTags.ERROR_MSG));
-  }
-
-  @Test
-  void handlesCorrectlyTheMessageInTheFieldsCalledWithTimestampButSpanIsNotAnError() {
-    LogHandler underTest = new DefaultLogHandler();
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "op name").withServiceName("foo").start();
-    String errorMessage = "errorMessage";
-    Map<String, Object> fields = new HashMap<>();
-    fields.put(Fields.MESSAGE, errorMessage);
-
-    underTest.log(System.currentTimeMillis(), fields, span);
-
-    assertNull(span.getTags().get(DDTags.ERROR_MSG));
-  }
-
-  @Test
-  void handlesCorrectlyTheMessageInTheFieldsWhenSpanIsError() {
-    LogHandler underTest = new DefaultLogHandler();
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "op name").withServiceName("foo").start();
-    String errorMessage = "errorMessage";
-    Map<String, Object> fields = new HashMap<>();
-    span.setError(true);
-    fields.put(Fields.MESSAGE, errorMessage);
-
-    underTest.log(fields, span);
-
-    assertEquals(errorMessage, span.getTags().get(DDTags.ERROR_MSG));
-  }
-
-  @Test
-  void handlesCorrectlyTheMessageInTheFieldsCalledWithTimestampWhenSpanIsError() {
-    LogHandler underTest = new DefaultLogHandler();
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "op name").withServiceName("foo").start();
-    String errorMessage = "errorMessage";
-    Map<String, Object> fields = new HashMap<>();
-    span.setError(true);
-    fields.put(Fields.MESSAGE, errorMessage);
-
-    underTest.log(System.currentTimeMillis(), fields, span);
-
-    assertEquals(errorMessage, span.getTags().get(DDTags.ERROR_MSG));
-  }
-
-  @Test
-  void handlesCorrectlyTheMessageInTheFieldsWhenEventIsError() {
-    LogHandler underTest = new DefaultLogHandler();
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "op name").withServiceName("foo").start();
-    String errorMessage = "errorMessage";
-    Map<String, Object> fields = new HashMap<>();
-    fields.put(Fields.EVENT, "error");
-    fields.put(Fields.MESSAGE, errorMessage);
-
-    underTest.log(fields, span);
-
-    assertEquals(errorMessage, span.getTags().get(DDTags.ERROR_MSG));
-  }
-
-  @Test
-  void handlesCorrectlyTheMessageInTheFieldsCalledWithTimestampWhenEventIsError() {
-    LogHandler underTest = new DefaultLogHandler();
-    DDSpan span = (DDSpan) tracer.buildSpan("datadog", "op name").withServiceName("foo").start();
-    String errorMessage = "errorMessage";
-    Map<String, Object> fields = new HashMap<>();
-    fields.put(Fields.EVENT, "error");
-    fields.put(Fields.MESSAGE, errorMessage);
-
-    underTest.log(System.currentTimeMillis(), fields, span);
-
-    assertEquals(errorMessage, span.getTags().get(DDTags.ERROR_MSG));
-  }
-
-  @Test
-  void sanityTestWithLoghandlerNotSet() throws Exception {
-    String expectedName = "fakeName";
-    String expectedLogEvent = "fakeEvent";
-    long timeStamp = System.currentTimeMillis();
-    Map<String, String> fieldsMap = new HashMap<>();
-
-    DDTracer loggingTracer = DDTracer.builder().writer(writer).build();
-    try {
-      io.opentracing.Span span =
-          loggingTracer.buildSpan(expectedName).withServiceName("foo").start();
-
-      span.log(expectedLogEvent);
-      span.log(timeStamp, expectedLogEvent);
-      span.log(fieldsMap);
-      span.log(timeStamp, fieldsMap);
-      // no exception thrown
-    } finally {
-      loggingTracer.close();
+
+    @Test
+    void handlesCorrectlyTheErrorPassedInTheFieldsWhenCalledWithTimestamp() {
+        LogHandler underTest = new DefaultLogHandler();
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("datadog", "op name").withServiceName("foo").start();
+        String errorMessage = "errorMessage";
+        String differentMessage = "differentMessage";
+        Throwable error = new Throwable(errorMessage);
+        Map<String, Object> fields = new HashMap<>();
+        fields.put(Fields.ERROR_OBJECT, error);
+        fields.put(Fields.MESSAGE, differentMessage);
+
+        underTest.log(System.currentTimeMillis(), fields, span);
+
+        assertEquals(error.getMessage(), span.getTags().get(DDTags.ERROR_MSG));
+        assertEquals(error.getClass().getName(), span.getTags().get(DDTags.ERROR_TYPE));
     }
-  }
-
-  @Test
-  void sanityTestWhenPassedLogHandlerIsNull() throws Exception {
-    String expectedName = "fakeName";
-    String expectedLogEvent = "fakeEvent";
-    long timeStamp = System.currentTimeMillis();
-    Map<String, String> fieldsMap = new HashMap<>();
-
-    DDTracer loggingTracer = DDTracer.builder().writer(writer).logHandler(null).build();
-    try {
-      io.opentracing.Span span = loggingTracer.buildSpan(expectedName).start();
-
-      span.log(expectedLogEvent);
-      span.log(timeStamp, expectedLogEvent);
-      span.log(fieldsMap);
-      span.log(timeStamp, fieldsMap);
-      // no exception thrown
-    } finally {
-      loggingTracer.close();
+
+    @Test
+    void handlesCorrectlyTheMessageInTheFieldsButSpanIsNotAnError() {
+        LogHandler underTest = new DefaultLogHandler();
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("datadog", "op name").withServiceName("foo").start();
+        String errorMessage = "errorMessage";
+        Map<String, Object> fields = new HashMap<>();
+        fields.put(Fields.MESSAGE, errorMessage);
+
+        underTest.log(fields, span);
+
+        assertNull(span.getTags().get(DDTags.ERROR_MSG));
     }
-  }
 
-  @Test
-  void shouldDelegateSimpleLogsToLogHandler() throws Exception {
-    LogHandler logHandler = mock(LogHandler.class);
-    String expectedName = "fakeName";
-    String expectedLogEvent = "fakeEvent";
-    long timeStamp = System.currentTimeMillis();
+    @Test
+    void handlesCorrectlyTheMessageInTheFieldsCalledWithTimestampButSpanIsNotAnError() {
+        LogHandler underTest = new DefaultLogHandler();
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("datadog", "op name").withServiceName("foo").start();
+        String errorMessage = "errorMessage";
+        Map<String, Object> fields = new HashMap<>();
+        fields.put(Fields.MESSAGE, errorMessage);
+
+        underTest.log(System.currentTimeMillis(), fields, span);
 
-    DDTracer loggingTracer = DDTracer.builder().writer(writer).logHandler(logHandler).build();
-    try {
-      OTSpan span = (OTSpan) loggingTracer.buildSpan(expectedName).withServiceName("foo").start();
+        assertNull(span.getTags().get(DDTags.ERROR_MSG));
+    }
+
+    @Test
+    void handlesCorrectlyTheMessageInTheFieldsWhenSpanIsError() {
+        LogHandler underTest = new DefaultLogHandler();
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("datadog", "op name").withServiceName("foo").start();
+        String errorMessage = "errorMessage";
+        Map<String, Object> fields = new HashMap<>();
+        span.setError(true);
+        fields.put(Fields.MESSAGE, errorMessage);
 
-      span.log(timeStamp, expectedLogEvent);
+        underTest.log(fields, span);
 
-      verify(logHandler).log(timeStamp, expectedLogEvent, span.getDelegate());
-    } finally {
-      loggingTracer.close();
+        assertEquals(errorMessage, span.getTags().get(DDTags.ERROR_MSG));
     }
-  }
 
-  @Test
-  void shouldDelegateSimpleLogsWithTimestampToLogHandler() throws Exception {
-    LogHandler logHandler = mock(LogHandler.class);
-    String expectedName = "fakeName";
-    String expectedLogEvent = "fakeEvent";
+    @Test
+    void handlesCorrectlyTheMessageInTheFieldsCalledWithTimestampWhenSpanIsError() {
+        LogHandler underTest = new DefaultLogHandler();
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("datadog", "op name").withServiceName("foo").start();
+        String errorMessage = "errorMessage";
+        Map<String, Object> fields = new HashMap<>();
+        span.setError(true);
+        fields.put(Fields.MESSAGE, errorMessage);
+
+        underTest.log(System.currentTimeMillis(), fields, span);
 
-    DDTracer loggingTracer = DDTracer.builder().writer(writer).logHandler(logHandler).build();
-    try {
-      OTSpan span = (OTSpan) loggingTracer.buildSpan(expectedName).withServiceName("foo").start();
+        assertEquals(errorMessage, span.getTags().get(DDTags.ERROR_MSG));
+    }
+
+    @Test
+    void handlesCorrectlyTheMessageInTheFieldsWhenEventIsError() {
+        LogHandler underTest = new DefaultLogHandler();
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("datadog", "op name").withServiceName("foo").start();
+        String errorMessage = "errorMessage";
+        Map<String, Object> fields = new HashMap<>();
+        fields.put(Fields.EVENT, "error");
+        fields.put(Fields.MESSAGE, errorMessage);
 
-      span.log(expectedLogEvent);
+        underTest.log(fields, span);
 
-      verify(logHandler).log(expectedLogEvent, span.getDelegate());
-    } finally {
-      loggingTracer.close();
+        assertEquals(errorMessage, span.getTags().get(DDTags.ERROR_MSG));
     }
-  }
 
-  @Test
-  void shouldDelegateLogsWithFieldsToLogHandler() throws Exception {
-    LogHandler logHandler = mock(LogHandler.class);
-    String expectedName = "fakeName";
-    Map<String, String> fieldsMap = new HashMap<>();
+    @Test
+    void handlesCorrectlyTheMessageInTheFieldsCalledWithTimestampWhenEventIsError() {
+        LogHandler underTest = new DefaultLogHandler();
+        DDSpan span = (DDSpan)
+                tracer.buildSpan("datadog", "op name").withServiceName("foo").start();
+        String errorMessage = "errorMessage";
+        Map<String, Object> fields = new HashMap<>();
+        fields.put(Fields.EVENT, "error");
+        fields.put(Fields.MESSAGE, errorMessage);
 
-    DDTracer loggingTracer = DDTracer.builder().writer(writer).logHandler(logHandler).build();
-    try {
-      OTSpan span = (OTSpan) loggingTracer.buildSpan(expectedName).withServiceName("foo").start();
+        underTest.log(System.currentTimeMillis(), fields, span);
 
-      span.log(fieldsMap);
+        assertEquals(errorMessage, span.getTags().get(DDTags.ERROR_MSG));
+    }
 
-      verify(logHandler).log(fieldsMap, span.getDelegate());
-    } finally {
-      loggingTracer.close();
+    @Test
+    void sanityTestWithLoghandlerNotSet() throws Exception {
+        String expectedName = "fakeName";
+        String expectedLogEvent = "fakeEvent";
+        long timeStamp = System.currentTimeMillis();
+        Map<String, String> fieldsMap = new HashMap<>();
+
+        DDTracer loggingTracer = DDTracer.builder().writer(writer).build();
+        try {
+            io.opentracing.Span span =
+                    loggingTracer.buildSpan(expectedName).withServiceName("foo").start();
+
+            span.log(expectedLogEvent);
+            span.log(timeStamp, expectedLogEvent);
+            span.log(fieldsMap);
+            span.log(timeStamp, fieldsMap);
+            // no exception thrown
+        } finally {
+            loggingTracer.close();
+        }
     }
-  }
 
-  @Test
-  void shouldDelegateLogsWithFieldsAndTimestampToLogHandler() throws Exception {
-    LogHandler logHandler = mock(LogHandler.class);
-    String expectedName = "fakeName";
-    Map<String, String> fieldsMap = new HashMap<>();
-    long timeStamp = System.currentTimeMillis();
+    @Test
+    void sanityTestWhenPassedLogHandlerIsNull() throws Exception {
+        String expectedName = "fakeName";
+        String expectedLogEvent = "fakeEvent";
+        long timeStamp = System.currentTimeMillis();
+        Map<String, String> fieldsMap = new HashMap<>();
+
+        DDTracer loggingTracer =
+                DDTracer.builder().writer(writer).logHandler(null).build();
+        try {
+            io.opentracing.Span span = loggingTracer.buildSpan(expectedName).start();
+
+            span.log(expectedLogEvent);
+            span.log(timeStamp, expectedLogEvent);
+            span.log(fieldsMap);
+            span.log(timeStamp, fieldsMap);
+            // no exception thrown
+        } finally {
+            loggingTracer.close();
+        }
+    }
+
+    @Test
+    void shouldDelegateSimpleLogsToLogHandler() throws Exception {
+        LogHandler logHandler = mock(LogHandler.class);
+        String expectedName = "fakeName";
+        String expectedLogEvent = "fakeEvent";
+        long timeStamp = System.currentTimeMillis();
+
+        DDTracer loggingTracer =
+                DDTracer.builder().writer(writer).logHandler(logHandler).build();
+        try {
+            OTSpan span = (OTSpan)
+                    loggingTracer.buildSpan(expectedName).withServiceName("foo").start();
+
+            span.log(timeStamp, expectedLogEvent);
+
+            verify(logHandler).log(timeStamp, expectedLogEvent, span.getDelegate());
+        } finally {
+            loggingTracer.close();
+        }
+    }
 
-    DDTracer loggingTracer = DDTracer.builder().writer(writer).logHandler(logHandler).build();
-    try {
-      OTSpan span = (OTSpan) loggingTracer.buildSpan(expectedName).withServiceName("foo").start();
+    @Test
+    void shouldDelegateSimpleLogsWithTimestampToLogHandler() throws Exception {
+        LogHandler logHandler = mock(LogHandler.class);
+        String expectedName = "fakeName";
+        String expectedLogEvent = "fakeEvent";
 
-      span.log(timeStamp, fieldsMap);
+        DDTracer loggingTracer =
+                DDTracer.builder().writer(writer).logHandler(logHandler).build();
+        try {
+            OTSpan span = (OTSpan)
+                    loggingTracer.buildSpan(expectedName).withServiceName("foo").start();
+
+            span.log(expectedLogEvent);
+
+            verify(logHandler).log(expectedLogEvent, span.getDelegate());
+        } finally {
+            loggingTracer.close();
+        }
+    }
+
+    @Test
+    void shouldDelegateLogsWithFieldsToLogHandler() throws Exception {
+        LogHandler logHandler = mock(LogHandler.class);
+        String expectedName = "fakeName";
+        Map<String, String> fieldsMap = new HashMap<>();
+
+        DDTracer loggingTracer =
+                DDTracer.builder().writer(writer).logHandler(logHandler).build();
+        try {
+            OTSpan span = (OTSpan)
+                    loggingTracer.buildSpan(expectedName).withServiceName("foo").start();
+
+            span.log(fieldsMap);
+
+            verify(logHandler).log(fieldsMap, span.getDelegate());
+        } finally {
+            loggingTracer.close();
+        }
+    }
 
-      verify(logHandler).log(timeStamp, fieldsMap, span.getDelegate());
-    } finally {
-      loggingTracer.close();
+    @Test
+    void shouldDelegateLogsWithFieldsAndTimestampToLogHandler() throws Exception {
+        LogHandler logHandler = mock(LogHandler.class);
+        String expectedName = "fakeName";
+        Map<String, String> fieldsMap = new HashMap<>();
+        long timeStamp = System.currentTimeMillis();
+
+        DDTracer loggingTracer =
+                DDTracer.builder().writer(writer).logHandler(logHandler).build();
+        try {
+            OTSpan span = (OTSpan)
+                    loggingTracer.buildSpan(expectedName).withServiceName("foo").start();
+
+            span.log(timeStamp, fieldsMap);
+
+            verify(logHandler).log(timeStamp, fieldsMap, span.getDelegate());
+        } finally {
+            loggingTracer.close();
+        }
     }
-  }
 }
diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/IterationSpansForkedTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/IterationSpansForkedTest.java
index 80a37398567..7dd78c29e62 100644
--- a/dd-trace-ot/src/test/java/datadog/opentracing/IterationSpansForkedTest.java
+++ b/dd-trace-ot/src/test/java/datadog/opentracing/IterationSpansForkedTest.java
@@ -24,173 +24,173 @@
 @WithConfig(key = "trace.scope.iteration.keep.alive", value = "1")
 class IterationSpansForkedTest extends DDJavaSpecification {
 
-  ListWriter writer;
-  DDTracer tracer;
-  ScopeManager scopeManager;
-  StatsDClient statsDClient;
-  CoreTracer coreTracer;
-
-  @BeforeEach
-  void setup() {
-    writer = new ListWriter();
-    statsDClient = mock(StatsDClient.class);
-    tracer = DDTracer.builder().writer(writer).statsDClient(statsDClient).build();
-    scopeManager = tracer.scopeManager();
-    coreTracer = (CoreTracer) tracer.getInternalTracer();
-  }
-
-  @AfterEach
-  void cleanup() throws Exception {
-    coreTracer.close();
-  }
-
-  @Test
-  void rootIterationScopeLifecycle() throws Exception {
-    coreTracer.closePrevious(true);
-    AgentSpan span1 = coreTracer.buildSpan("datadog", "next1").start();
-    ContextScope scope1 = coreTracer.activateNext(span1);
-
-    assertTrue(writer.isEmpty());
-    assertSame(span1, AgentSpan.fromScope(scope1));
-    assertSame(span1, ((OTSpan) tracer.activeSpan()).getDelegate());
-    assertFalse(spanFinished(span1));
-
-    coreTracer.closePrevious(true);
-    AgentSpan span2 = coreTracer.buildSpan("datadog", "next2").start();
-    ContextScope scope2 = coreTracer.activateNext(span2);
-
-    assertTrue(spanFinished(span1));
-    assertEquals(1, writer.size());
-    assertSame(span1, writer.get(0).get(0));
-    assertSame(span2, AgentSpan.fromScope(scope2));
-    assertSame(span2, ((OTSpan) tracer.activeSpan()).getDelegate());
-    assertFalse(spanFinished(span2));
-
-    coreTracer.closePrevious(true);
-    AgentSpan span3 = coreTracer.buildSpan("datadog", "next3").start();
-    ContextScope scope3 = coreTracer.activateNext(span3);
-    writer.waitForTraces(2);
-
-    assertTrue(spanFinished(span2));
-    assertEquals(2, writer.size());
-    assertSame(span3, AgentSpan.fromScope(scope3));
-    assertSame(span3, ((OTSpan) tracer.activeSpan()).getDelegate());
-    assertFalse(spanFinished(span3));
-
-    // 'next3' should time out & finish after 1s
-    writer.waitForTraces(3);
-
-    assertTrue(spanFinished(span3));
-    assertEquals(3, writer.size());
-  }
-
-  @Test
-  void nonRootIterationScopeLifecycle() throws Exception {
-    AgentSpan span0 = coreTracer.buildSpan("datadog", "parent").start();
-    ContextScope scope0 = coreTracer.activateSpan(span0);
-
-    coreTracer.closePrevious(true);
-    AgentSpan span1 = coreTracer.buildSpan("datadog", "next1").start();
-    ContextScope scope1 = coreTracer.activateNext(span1);
-
-    assertTrue(writer.isEmpty());
-    assertSame(span1, AgentSpan.fromScope(scope1));
-    assertSame(span1, ((OTSpan) tracer.activeSpan()).getDelegate());
-    assertFalse(spanFinished(span1));
-
-    coreTracer.closePrevious(true);
-    AgentSpan span2 = coreTracer.buildSpan("datadog", "next2").start();
-    ContextScope scope2 = coreTracer.activateNext(span2);
-
-    assertTrue(spanFinished(span1));
-    assertTrue(writer.isEmpty());
-    assertSame(span2, AgentSpan.fromScope(scope2));
-    assertSame(span2, ((OTSpan) tracer.activeSpan()).getDelegate());
-    assertFalse(spanFinished(span2));
-
-    coreTracer.closePrevious(true);
-    AgentSpan span3 = coreTracer.buildSpan("datadog", "next3").start();
-    ContextScope scope3 = coreTracer.activateNext(span3);
-
-    assertTrue(spanFinished(span2));
-    assertTrue(writer.isEmpty());
-    assertSame(span3, AgentSpan.fromScope(scope3));
-    assertSame(span3, ((OTSpan) tracer.activeSpan()).getDelegate());
-    assertFalse(spanFinished(span3));
-
-    // close and finish the surrounding (non-iteration) span to complete the trace
-    scope0.close();
-    span0.finish();
-    writer.waitForTraces(1);
-
-    assertTrue(spanFinished(span3));
-    assertTrue(spanFinished(span0));
-    sortSpansByStart();
-    List<DDSpan> trace = writer.get(0);
-    assertEquals(4, trace.size());
-    assertSame(span0, trace.get(0));
-    assertSame(span1, trace.get(1));
-    assertSame(span2, trace.get(2));
-    assertSame(span3, trace.get(3));
-  }
-
-  @Test
-  void nestedIterationScopeLifecycle() throws Exception {
-    coreTracer.closePrevious(true);
-    AgentSpan span1 = coreTracer.buildSpan("datadog", "next1").start();
-    ContextScope scope1 = coreTracer.activateNext(span1);
-
-    assertTrue(writer.isEmpty());
-    assertSame(span1, AgentSpan.fromScope(scope1));
-    assertSame(span1, ((OTSpan) tracer.activeSpan()).getDelegate());
-    assertFalse(spanFinished(span1));
-
-    AgentSpan span1A = coreTracer.buildSpan("datadog", "methodA").start();
-    ContextScope scope1A = coreTracer.activateSpan(span1A);
-
-    coreTracer.closePrevious(true);
-    AgentSpan span1A1 = coreTracer.buildSpan("datadog", "next1A1").start();
-    ContextScope scope1A1 = coreTracer.activateNext(span1A1);
-
-    assertFalse(spanFinished(span1));
-    assertTrue(writer.isEmpty());
-    assertSame(span1A1, AgentSpan.fromScope(scope1A1));
-    assertSame(span1A1, ((OTSpan) tracer.activeSpan()).getDelegate());
-    assertFalse(spanFinished(span1A1));
-
-    coreTracer.closePrevious(true);
-    AgentSpan span1A2 = coreTracer.buildSpan("datadog", "next1A2").start();
-    ContextScope scope1A2 = coreTracer.activateNext(span1A2);
-
-    assertTrue(spanFinished(span1A1));
-    assertTrue(writer.isEmpty());
-    assertSame(span1A2, AgentSpan.fromScope(scope1A2));
-    assertSame(span1A2, ((OTSpan) tracer.activeSpan()).getDelegate());
-    assertFalse(spanFinished(span1A2));
-
-    // close and finish the intermediate (non-iteration) span
-    scope1A.close();
-    span1A.finish();
-    // 'next1' (and 'next1A2') should time out & finish after 1s to complete the trace
-    writer.waitForTraces(1);
-
-    assertTrue(spanFinished(span1A2));
-    assertTrue(spanFinished(span1A));
-    assertTrue(spanFinished(span1));
-    sortSpansByStart();
-    List<DDSpan> trace = writer.get(0);
-    assertEquals(4, trace.size());
-    assertSame(span1, trace.get(0));
-    assertSame(span1A, trace.get(1));
-    assertSame(span1A1, trace.get(2));
-    assertSame(span1A2, trace.get(3));
-  }
-
-  private boolean spanFinished(AgentSpan span) {
-    return span instanceof DDSpan && ((DDSpan) span).isFinished();
-  }
-
-  private void sortSpansByStart() {
-    writer.firstTrace().sort(Comparator.comparingLong(DDSpan::getStartTime));
-  }
+    ListWriter writer;
+    DDTracer tracer;
+    ScopeManager scopeManager;
+    StatsDClient statsDClient;
+    CoreTracer coreTracer;
+
+    @BeforeEach
+    void setup() {
+        writer = new ListWriter();
+        statsDClient = mock(StatsDClient.class);
+        tracer = DDTracer.builder().writer(writer).statsDClient(statsDClient).build();
+        scopeManager = tracer.scopeManager();
+        coreTracer = (CoreTracer) tracer.getInternalTracer();
+    }
+
+    @AfterEach
+    void cleanup() throws Exception {
+        coreTracer.close();
+    }
+
+    @Test
+    void rootIterationScopeLifecycle() throws Exception {
+        coreTracer.closePrevious(true);
+        AgentSpan span1 = coreTracer.buildSpan("datadog", "next1").start();
+        ContextScope scope1 = coreTracer.activateNext(span1);
+
+        assertTrue(writer.isEmpty());
+        assertSame(span1, AgentSpan.fromScope(scope1));
+        assertSame(span1, ((OTSpan) tracer.activeSpan()).getDelegate());
+        assertFalse(spanFinished(span1));
+
+        coreTracer.closePrevious(true);
+        AgentSpan span2 = coreTracer.buildSpan("datadog", "next2").start();
+        ContextScope scope2 = coreTracer.activateNext(span2);
+
+        assertTrue(spanFinished(span1));
+        assertEquals(1, writer.size());
+        assertSame(span1, writer.get(0).get(0));
+        assertSame(span2, AgentSpan.fromScope(scope2));
+        assertSame(span2, ((OTSpan) tracer.activeSpan()).getDelegate());
+        assertFalse(spanFinished(span2));
+
+        coreTracer.closePrevious(true);
+        AgentSpan span3 = coreTracer.buildSpan("datadog", "next3").start();
+        ContextScope scope3 = coreTracer.activateNext(span3);
+        writer.waitForTraces(2);
+
+        assertTrue(spanFinished(span2));
+        assertEquals(2, writer.size());
+        assertSame(span3, AgentSpan.fromScope(scope3));
+        assertSame(span3, ((OTSpan) tracer.activeSpan()).getDelegate());
+        assertFalse(spanFinished(span3));
+
+        // 'next3' should time out & finish after 1s
+        writer.waitForTraces(3);
+
+        assertTrue(spanFinished(span3));
+        assertEquals(3, writer.size());
+    }
+
+    @Test
+    void nonRootIterationScopeLifecycle() throws Exception {
+        AgentSpan span0 = coreTracer.buildSpan("datadog", "parent").start();
+        ContextScope scope0 = coreTracer.activateSpan(span0);
+
+        coreTracer.closePrevious(true);
+        AgentSpan span1 = coreTracer.buildSpan("datadog", "next1").start();
+        ContextScope scope1 = coreTracer.activateNext(span1);
+
+        assertTrue(writer.isEmpty());
+        assertSame(span1, AgentSpan.fromScope(scope1));
+        assertSame(span1, ((OTSpan) tracer.activeSpan()).getDelegate());
+        assertFalse(spanFinished(span1));
+
+        coreTracer.closePrevious(true);
+        AgentSpan span2 = coreTracer.buildSpan("datadog", "next2").start();
+        ContextScope scope2 = coreTracer.activateNext(span2);
+
+        assertTrue(spanFinished(span1));
+        assertTrue(writer.isEmpty());
+        assertSame(span2, AgentSpan.fromScope(scope2));
+        assertSame(span2, ((OTSpan) tracer.activeSpan()).getDelegate());
+        assertFalse(spanFinished(span2));
+
+        coreTracer.closePrevious(true);
+        AgentSpan span3 = coreTracer.buildSpan("datadog", "next3").start();
+        ContextScope scope3 = coreTracer.activateNext(span3);
+
+        assertTrue(spanFinished(span2));
+        assertTrue(writer.isEmpty());
+        assertSame(span3, AgentSpan.fromScope(scope3));
+        assertSame(span3, ((OTSpan) tracer.activeSpan()).getDelegate());
+        assertFalse(spanFinished(span3));
+
+        // close and finish the surrounding (non-iteration) span to complete the trace
+        scope0.close();
+        span0.finish();
+        writer.waitForTraces(1);
+
+        assertTrue(spanFinished(span3));
+        assertTrue(spanFinished(span0));
+        sortSpansByStart();
+        List<DDSpan> trace = writer.get(0);
+        assertEquals(4, trace.size());
+        assertSame(span0, trace.get(0));
+        assertSame(span1, trace.get(1));
+        assertSame(span2, trace.get(2));
+        assertSame(span3, trace.get(3));
+    }
+
+    @Test
+    void nestedIterationScopeLifecycle() throws Exception {
+        coreTracer.closePrevious(true);
+        AgentSpan span1 = coreTracer.buildSpan("datadog", "next1").start();
+        ContextScope scope1 = coreTracer.activateNext(span1);
+
+        assertTrue(writer.isEmpty());
+        assertSame(span1, AgentSpan.fromScope(scope1));
+        assertSame(span1, ((OTSpan) tracer.activeSpan()).getDelegate());
+        assertFalse(spanFinished(span1));
+
+        AgentSpan span1A = coreTracer.buildSpan("datadog", "methodA").start();
+        ContextScope scope1A = coreTracer.activateSpan(span1A);
+
+        coreTracer.closePrevious(true);
+        AgentSpan span1A1 = coreTracer.buildSpan("datadog", "next1A1").start();
+        ContextScope scope1A1 = coreTracer.activateNext(span1A1);
+
+        assertFalse(spanFinished(span1));
+        assertTrue(writer.isEmpty());
+        assertSame(span1A1, AgentSpan.fromScope(scope1A1));
+        assertSame(span1A1, ((OTSpan) tracer.activeSpan()).getDelegate());
+        assertFalse(spanFinished(span1A1));
+
+        coreTracer.closePrevious(true);
+        AgentSpan span1A2 = coreTracer.buildSpan("datadog", "next1A2").start();
+        ContextScope scope1A2 = coreTracer.activateNext(span1A2);
+
+        assertTrue(spanFinished(span1A1));
+        assertTrue(writer.isEmpty());
+        assertSame(span1A2, AgentSpan.fromScope(scope1A2));
+        assertSame(span1A2, ((OTSpan) tracer.activeSpan()).getDelegate());
+        assertFalse(spanFinished(span1A2));
+
+        // close and finish the intermediate (non-iteration) span
+        scope1A.close();
+        span1A.finish();
+        // 'next1' (and 'next1A2') should time out & finish after 1s to complete the trace
+        writer.waitForTraces(1);
+
+        assertTrue(spanFinished(span1A2));
+        assertTrue(spanFinished(span1A));
+        assertTrue(spanFinished(span1));
+        sortSpansByStart();
+        List<DDSpan> trace = writer.get(0);
+        assertEquals(4, trace.size());
+        assertSame(span1, trace.get(0));
+        assertSame(span1A, trace.get(1));
+        assertSame(span1A1, trace.get(2));
+        assertSame(span1A2, trace.get(3));
+    }
+
+    private boolean spanFinished(AgentSpan span) {
+        return span instanceof DDSpan && ((DDSpan) span).isFinished();
+    }
+
+    private void sortSpansByStart() {
+        writer.firstTrace().sort(Comparator.comparingLong(DDSpan::getStartTime));
+    }
 }
diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/OTSpanTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/OTSpanTest.java
index de4b33fa919..6660c51a8b0 100644
--- a/dd-trace-ot/src/test/java/datadog/opentracing/OTSpanTest.java
+++ b/dd-trace-ot/src/test/java/datadog/opentracing/OTSpanTest.java
@@ -13,43 +13,42 @@
 
 class OTSpanTest extends DDJavaSpecification {
 
-  static DDTracer tracer;
+    static DDTracer tracer;
 
-  @BeforeAll
-  static void setUpClass() {
-    tracer = DDTracer.builder().build();
-  }
+    @BeforeAll
+    static void setUpClass() {
+        tracer = DDTracer.builder().build();
+    }
 
-  @AfterAll
-  static void tearDownClass() throws Exception {
-    if (tracer != null) {
-      tracer.close();
+    @AfterAll
+    static void tearDownClass() throws Exception {
+        if (tracer != null) {
+            tracer.close();
+        }
     }
-  }
 
-  @Test
-  void testResourceNameAssignmentThroughMutableSpanCasting() {
-    OTSpan testSpan = (OTSpan) tracer.buildSpan("parent").withResourceName("test-resource").start();
-    OTScopeManager.OTScope testScope = (OTScopeManager.OTScope) tracer.activateSpan(testSpan);
+    @Test
+    void testResourceNameAssignmentThroughMutableSpanCasting() {
+        OTSpan testSpan = (OTSpan)
+                tracer.buildSpan("parent").withResourceName("test-resource").start();
+        OTScopeManager.OTScope testScope = (OTScopeManager.OTScope) tracer.activateSpan(testSpan);
 
-    Span active = tracer.activeSpan();
-    Span child = tracer.buildSpan("child").asChildOf(active).start();
-    Scope scope = tracer.activateSpan(child);
+        Span active = tracer.activeSpan();
+        Span child = tracer.buildSpan("child").asChildOf(active).start();
+        Scope scope = tracer.activateSpan(child);
 
-    MutableSpan localRootSpan = ((MutableSpan) child).getLocalRootSpan();
-    localRootSpan.setResourceName("correct-resource");
+        MutableSpan localRootSpan = ((MutableSpan) child).getLocalRootSpan();
+        localRootSpan.setResourceName("correct-resource");
 
-    assertEquals("correct-resource", testSpan.getResourceName());
+        assertEquals("correct-resource", testSpan.getResourceName());
 
-    testSpan
-        .getDelegate()
-        .setResourceName("should-be-ignored", ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE);
+        testSpan.getDelegate().setResourceName("should-be-ignored", ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE);
 
-    assertEquals("correct-resource", testSpan.getResourceName());
+        assertEquals("correct-resource", testSpan.getResourceName());
 
-    scope.close();
-    child.finish();
-    testScope.close();
-    testSpan.finish();
-  }
+        scope.close();
+        child.finish();
+        testScope.close();
+        testSpan.finish();
+    }
 }
diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java b/dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java
index 72632f84565..9ae99951f02 100644
--- a/dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java
+++ b/dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java
@@ -38,442 +38,439 @@
 
 class OpenTracingAPITest extends DDJavaSpecification {
 
-  ListWriter writer = new ListWriter();
-  DDTracer tracer = DDTracer.builder().writer(writer).build();
-  TraceInterceptor traceInterceptor = mock(TraceInterceptor.class);
-  ScopeListener scopeListener = mock(ScopeListener.class);
-
-  @BeforeEach
-  void setup() {
-    assertNull(tracer.scopeManager().active());
-    tracer.addTraceInterceptor(traceInterceptor);
-    tracer.getInternalTracer().addScopeListener(scopeListener);
-    // stub onTraceComplete to pass traces through (return first argument)
-    when(traceInterceptor.onTraceComplete(any())).thenAnswer(inv -> inv.getArgument(0));
-    // clear interactions from setup (e.g. priority() called during addTraceInterceptor)
-    clearInvocations(traceInterceptor, scopeListener);
-  }
-
-  @AfterEach
-  void tearDown() throws Exception {
-    tracer.close();
-  }
-
-  @Test
-  void tracerScopeManagerReturnsNullForNoActiveSpan() {
-    assertNull(tracer.activeSpan());
-    assertNull(tracer.scopeManager().active());
-    assertNull(tracer.scopeManager().activeSpan());
-  }
-
-  @Test
-  void singleSpan() throws Exception {
-    Scope scope = null;
-    try {
-      scope = tracer.buildSpan("someOperation").startActive(true);
-      scope.span().setTag(DDTags.SERVICE_NAME, "someService");
-    } finally {
-      if (scope != null) scope.close();
+    ListWriter writer = new ListWriter();
+    DDTracer tracer = DDTracer.builder().writer(writer).build();
+    TraceInterceptor traceInterceptor = mock(TraceInterceptor.class);
+    ScopeListener scopeListener = mock(ScopeListener.class);
+
+    @BeforeEach
+    void setup() {
+        assertNull(tracer.scopeManager().active());
+        tracer.addTraceInterceptor(traceInterceptor);
+        tracer.getInternalTracer().addScopeListener(scopeListener);
+        // stub onTraceComplete to pass traces through (return first argument)
+        when(traceInterceptor.onTraceComplete(any())).thenAnswer(inv -> inv.getArgument(0));
+        // clear interactions from setup (e.g. priority() called during addTraceInterceptor)
+        clearInvocations(traceInterceptor, scopeListener);
     }
-    writer.waitForTraces(1);
-
-    verify(traceInterceptor).onTraceComplete(any());
-
-    assertEquals(1, writer.size());
-    List<DDSpan> trace = writer.get(0);
-    assertEquals(1, trace.size());
-    DDSpan span = trace.get(0);
-    assertEquals("someService", span.getServiceName());
-    assertEquals("someOperation", span.getOperationName().toString());
-    assertEquals("someOperation", span.getResourceName().toString());
-    assertEquals("opentracing", span.getTags().get(DDTags.DD_INTEGRATION));
-  }
-
-  @Test
-  void spanWithBuilder() throws Exception {
-    Span testSpan =
-        tracer
-            .buildSpan("someOperation")
-            .withTag(Tags.COMPONENT, "opentracing")
-            .withTag("someBoolean", true)
-            .withTag("someNumber", 1)
-            .withTag(DDTags.SERVICE_NAME, "someService")
-            .start();
-
-    Scope scope = null;
-    try {
-      scope = tracer.activateSpan(testSpan);
-      testSpan.finish();
-    } finally {
-      if (scope != null) scope.close();
+
+    @AfterEach
+    void tearDown() throws Exception {
+        tracer.close();
+    }
+
+    @Test
+    void tracerScopeManagerReturnsNullForNoActiveSpan() {
+        assertNull(tracer.activeSpan());
+        assertNull(tracer.scopeManager().active());
+        assertNull(tracer.scopeManager().activeSpan());
+    }
+
+    @Test
+    void singleSpan() throws Exception {
+        Scope scope = null;
+        try {
+            scope = tracer.buildSpan("someOperation").startActive(true);
+            scope.span().setTag(DDTags.SERVICE_NAME, "someService");
+        } finally {
+            if (scope != null) scope.close();
+        }
+        writer.waitForTraces(1);
+
+        verify(traceInterceptor).onTraceComplete(any());
+
+        assertEquals(1, writer.size());
+        List<DDSpan> trace = writer.get(0);
+        assertEquals(1, trace.size());
+        DDSpan span = trace.get(0);
+        assertEquals("someService", span.getServiceName());
+        assertEquals("someOperation", span.getOperationName().toString());
+        assertEquals("someOperation", span.getResourceName().toString());
+        assertEquals("opentracing", span.getTags().get(DDTags.DD_INTEGRATION));
     }
-    writer.waitForTraces(1);
-
-    verify(traceInterceptor).onTraceComplete(any());
-    assertTrue(testSpan instanceof MutableSpan);
-
-    assertEquals(1, writer.size());
-    List<DDSpan> trace = writer.get(0);
-    assertEquals(1, trace.size());
-    DDSpan span = trace.get(0);
-    assertEquals("someService", span.getServiceName());
-    assertEquals("someOperation", span.getOperationName().toString());
-    assertEquals("someOperation", span.getResourceName().toString());
-    assertEquals("opentracing", span.getTags().get(Tags.COMPONENT.getKey()));
-    assertEquals("opentracing", span.getTags().get(DDTags.DD_INTEGRATION));
-    assertEquals(true, span.getTags().get("someBoolean"));
-    assertEquals(1, span.getTags().get("someNumber"));
-  }
-
-  @Test
-  void singleSpanWithManualStartFinish() throws Exception {
-    Span testSpan = tracer.buildSpan("someOperation").start();
-    Scope scope = tracer.activateSpan(testSpan);
-
-    verify(scopeListener).afterScopeActivated();
-    assertTrue(testSpan instanceof MutableSpan);
-    assertTrue(scope.span() instanceof MutableSpan);
-
-    testSpan.setTag(DDTags.SERVICE_NAME, "someService");
-    testSpan.setTag(Tags.COMPONENT, "opentracing");
-    testSpan.setTag("someBoolean", true);
-    testSpan.setTag("someNumber", 1);
-    testSpan.setOperationName("someOtherOperation");
-    scope.close();
-    testSpan.finish();
-    writer.waitForTraces(1);
-
-    verify(traceInterceptor).onTraceComplete(any());
-    verify(scopeListener).afterScopeClosed();
-
-    assertEquals(1, writer.size());
-    List<DDSpan> trace = writer.get(0);
-    assertEquals(1, trace.size());
-    DDSpan span = trace.get(0);
-    assertEquals("someService", span.getServiceName());
-    assertEquals("someOtherOperation", span.getOperationName().toString());
-    assertEquals("someOtherOperation", span.getResourceName().toString());
-    assertEquals("opentracing", span.getTags().get(Tags.COMPONENT.getKey()));
-    assertEquals("opentracing", span.getTags().get(DDTags.DD_INTEGRATION));
-    assertEquals(true, span.getTags().get("someBoolean"));
-    assertEquals(1, span.getTags().get("someNumber"));
-  }
-
-  @Test
-  void spansAndScopesAllEqual() throws Exception {
-    Span testSpan = tracer.buildSpan("someOperation").start();
-    Scope testScope = tracer.activateSpan(testSpan);
-
-    Span traceActiveSpan = tracer.activeSpan();
-    Span scopeManagerActiveSpan = tracer.scopeManager().activeSpan();
-    Span scopeActiveSpan = testScope.span();
-
-    Scope scopeManagerActiveScope = tracer.scopeManager().active();
-    testScope.close();
-    testSpan.finish();
-    writer.waitForTraces(1);
-
-    verify(traceInterceptor).onTraceComplete(any());
-    assertEquals(testSpan, traceActiveSpan);
-    assertEquals(testSpan.hashCode(), traceActiveSpan.hashCode());
-    assertEquals(testSpan, scopeManagerActiveSpan);
-    assertEquals(testSpan.hashCode(), scopeManagerActiveSpan.hashCode());
-    assertEquals(testSpan, scopeActiveSpan);
-    assertEquals(testSpan.hashCode(), scopeActiveSpan.hashCode());
-    assertEquals(testScope, scopeManagerActiveScope);
-    assertEquals(testScope.hashCode(), scopeManagerActiveScope.hashCode());
-  }
-
-  @Test
-  void nestedSpans() throws Exception {
-    Scope scope = null;
-    try {
-      scope = tracer.buildSpan("someOperation").startActive(true);
-      scope.span().setTag(DDTags.SERVICE_NAME, "someService");
-
-      Scope scope2 = null;
-      try {
-        scope2 = tracer.buildSpan("someOperation2").startActive(true);
-      } finally {
-        if (scope2 != null) scope2.close();
-      }
-    } finally {
-      if (scope != null) scope.close();
+
+    @Test
+    void spanWithBuilder() throws Exception {
+        Span testSpan = tracer.buildSpan("someOperation")
+                .withTag(Tags.COMPONENT, "opentracing")
+                .withTag("someBoolean", true)
+                .withTag("someNumber", 1)
+                .withTag(DDTags.SERVICE_NAME, "someService")
+                .start();
+
+        Scope scope = null;
+        try {
+            scope = tracer.activateSpan(testSpan);
+            testSpan.finish();
+        } finally {
+            if (scope != null) scope.close();
+        }
+        writer.waitForTraces(1);
+
+        verify(traceInterceptor).onTraceComplete(any());
+        assertTrue(testSpan instanceof MutableSpan);
+
+        assertEquals(1, writer.size());
+        List<DDSpan> trace = writer.get(0);
+        assertEquals(1, trace.size());
+        DDSpan span = trace.get(0);
+        assertEquals("someService", span.getServiceName());
+        assertEquals("someOperation", span.getOperationName().toString());
+        assertEquals("someOperation", span.getResourceName().toString());
+        assertEquals("opentracing", span.getTags().get(Tags.COMPONENT.getKey()));
+        assertEquals("opentracing", span.getTags().get(DDTags.DD_INTEGRATION));
+        assertEquals(true, span.getTags().get("someBoolean"));
+        assertEquals(1, span.getTags().get("someNumber"));
     }
-    writer.waitForTraces(1);
-
-    verify(traceInterceptor).onTraceComplete(any());
-
-    assertEquals(1, writer.size());
-    List<DDSpan> trace = writer.get(0);
-    assertEquals(2, trace.size());
-    DDSpan parentSpan = trace.get(0);
-    DDSpan childSpan = trace.get(1);
-    assertEquals("someService", parentSpan.getServiceName());
-    assertEquals("someOperation", parentSpan.getOperationName().toString());
-    assertEquals("someOperation", parentSpan.getResourceName().toString());
-    assertEquals("someService", childSpan.getServiceName());
-    assertEquals("someOperation2", childSpan.getOperationName().toString());
-    assertEquals("someOperation2", childSpan.getResourceName().toString());
-    assertEquals(parentSpan.getSpanId(), childSpan.getParentId());
-  }
-
-  @Test
-  void spanWithAsyncPropagation() throws Exception {
-    AgentTracer.TracerAPI internalTracer = tracer.getInternalTracer();
-
-    Scope scope =
-        tracer
-            .buildSpan("someOperation")
-            .withTag(DDTags.SERVICE_NAME, "someService")
-            .startActive(true);
-    internalTracer.setAsyncPropagationEnabled(false);
-
-    assertTrue(scope instanceof TraceScope);
-    assertTrue(!internalTracer.isAsyncPropagationEnabled());
-
-    internalTracer.setAsyncPropagationEnabled(true);
-    TraceScope.Continuation continuation = ((TraceScope) scope).capture();
-
-    assertTrue(internalTracer.isAsyncPropagationEnabled());
-    assertNotNull(continuation);
-
-    continuation.cancel();
-    scope.close();
-    writer.waitForTraces(1);
-
-    verify(traceInterceptor).onTraceComplete(any());
-
-    assertEquals(1, writer.size());
-    List<DDSpan> trace = writer.get(0);
-    assertEquals(1, trace.size());
-    DDSpan span = trace.get(0);
-    assertEquals("someService", span.getServiceName());
-    assertEquals("someOperation", span.getOperationName().toString());
-    assertEquals("someOperation", span.getResourceName().toString());
-  }
-
-  @Test
-  void spanInheritsAsyncPropagation() throws Exception {
-    AgentTracer.TracerAPI internalTracer = tracer.getInternalTracer();
-
-    Scope outer =
-        tracer
-            .buildSpan("someOperation")
-            .withTag(DDTags.SERVICE_NAME, "someService")
-            .startActive(true);
-    internalTracer.setAsyncPropagationEnabled(false);
-
-    assertTrue(!internalTracer.isAsyncPropagationEnabled());
-
-    internalTracer.setAsyncPropagationEnabled(true);
-    Scope inner =
-        tracer
-            .buildSpan("otherOperation")
-            .withTag(DDTags.SERVICE_NAME, "otherService")
-            .startActive(true);
-
-    assertTrue(internalTracer.isAsyncPropagationEnabled());
-
-    inner.close();
-    outer.close();
-    writer.waitForTraces(1);
-
-    verify(traceInterceptor).onTraceComplete(any());
-
-    assertEquals(1, writer.size());
-    List<DDSpan> trace = writer.get(0);
-    assertEquals(2, trace.size());
-    DDSpan outerSpan = trace.get(0);
-    DDSpan innerSpan = trace.get(1);
-    assertEquals("someService", outerSpan.getServiceName());
-    assertEquals("someOperation", outerSpan.getOperationName().toString());
-    assertEquals("someOperation", outerSpan.getResourceName().toString());
-    assertEquals("otherService", innerSpan.getServiceName());
-    assertEquals("otherOperation", innerSpan.getOperationName().toString());
-    assertEquals("otherOperation", innerSpan.getResourceName().toString());
-  }
-
-  @Test
-  void spanContextIdsEqualTracerIds() throws Exception {
-    Span testSpan = tracer.buildSpan("someOperation").withServiceName("someService").start();
-    Scope scope = tracer.activateSpan(testSpan);
-
-    verify(scopeListener).afterScopeActivated();
-
-    assertEquals(testSpan.context().toSpanId(), tracer.getSpanId());
-    assertEquals(
-        testSpan.context().toTraceId(),
-        tracer.getInternalTracer().activeSpan().spanContext().getTraceId().toString());
-
-    scope.close();
-    testSpan.finish();
-    writer.waitForTraces(1);
-
-    verify(traceInterceptor).onTraceComplete(any());
-    verify(scopeListener).afterScopeClosed();
-
-    assertEquals(1, writer.size());
-    List<DDSpan> trace = writer.get(0);
-    assertEquals(1, trace.size());
-    DDSpan span = trace.get(0);
-    assertEquals("someService", span.getServiceName());
-    assertEquals("someOperation", span.getOperationName().toString());
-    assertEquals("someOperation", span.getResourceName().toString());
-  }
-
-  @Test
-  void closingScopeWhenNotOnTop() throws Exception {
-    Span firstSpan = tracer.buildSpan("someOperation").start();
-    Scope firstScope = tracer.activateSpan(firstSpan);
-    Span secondSpan = tracer.buildSpan("someOperation").start();
-    Scope secondScope = tracer.activateSpan(secondSpan);
-    firstSpan.finish();
-    firstScope.close();
-
-    // then: 2 * scopeListener.afterScopeActivated(), 0 * _
-    verify(scopeListener, times(2)).afterScopeActivated();
-    verifyNoMoreInteractions(scopeListener, traceInterceptor);
-    clearInvocations(scopeListener, traceInterceptor);
-
-    secondSpan.finish();
-    secondScope.close();
-    writer.waitForTraces(1);
-
-    // then: 2 * scopeListener.afterScopeClosed(), 1 * traceInterceptor.onTraceComplete(...)
-    verify(scopeListener, times(2)).afterScopeClosed();
-    verify(traceInterceptor).onTraceComplete(any());
-    assertEquals(1, writer.size());
-    assertEquals(2, writer.get(0).size());
-    verifyNoMoreInteractions(scopeListener, traceInterceptor);
-    clearInvocations(scopeListener, traceInterceptor);
-
-    firstScope.close();
-
-    // then: 0 * _
-    verifyNoMoreInteractions(scopeListener, traceInterceptor);
-  }
-
-  @Test
-  @WithConfig(key = "trace.scope.strict.mode", value = "true")
-  void closingScopeWhenNotOnTopInStrictMode() throws Exception {
-    DDTracer strictTracer = DDTracer.builder().writer(writer).build();
-    strictTracer.addTraceInterceptor(traceInterceptor);
-    strictTracer.getInternalTracer().addScopeListener(scopeListener);
-    // clear priority() interaction from addTraceInterceptor
-    clearInvocations(traceInterceptor, scopeListener);
-
-    Span firstSpan = strictTracer.buildSpan("someOperation").start();
-    Scope firstScope = strictTracer.activateSpan(firstSpan);
-    Span secondSpan = strictTracer.buildSpan("someOperation").start();
-    Scope secondScope = strictTracer.activateSpan(secondSpan);
-
-    // then: 2 * scopeListener.afterScopeActivated(), 0 * _
-    verify(scopeListener, times(2)).afterScopeActivated();
-    verifyNoMoreInteractions(scopeListener, traceInterceptor);
-    clearInvocations(scopeListener, traceInterceptor);
-
-    firstSpan.finish();
-    assertThrows(RuntimeException.class, firstScope::close);
-
-    // then: thrown(RuntimeException), 0 * _
-    verifyNoMoreInteractions(scopeListener, traceInterceptor);
-    clearInvocations(scopeListener, traceInterceptor);
-
-    secondSpan.finish();
-    secondScope.close();
-    writer.waitForTraces(1);
-
-    // then: 1 * scopeListener.afterScopeClosed(), 1 * traceInterceptor.onTraceComplete(...)
-    // 1 * scopeListener.afterScopeActivated() (scope restoration after strict mode exception)
-    verify(scopeListener).afterScopeClosed();
-    verify(traceInterceptor).onTraceComplete(any());
-    assertEquals(1, writer.size());
-    assertEquals(2, writer.get(0).size());
-    verify(scopeListener).afterScopeActivated();
-    verifyNoMoreInteractions(scopeListener, traceInterceptor);
-    clearInvocations(scopeListener, traceInterceptor);
-
-    firstScope.close();
-
-    verify(scopeListener).afterScopeClosed();
-    verifyNoMoreInteractions(scopeListener, traceInterceptor);
-
-    strictTracer.close();
-  }
-
-  @Test
-  void injectAndExtractContext() throws Exception {
-    TextMapAdapter textMap = new TextMapAdapter(new HashMap<String, String>());
-
-    Span testSpan =
-        tracer.buildSpan("clientOperation").withServiceName("someClientService").start();
-    Scope scope = tracer.activateSpan(testSpan);
-
-    tracer.inject(testSpan.context(), Format.Builtin.HTTP_HEADERS, textMap);
-
-    SpanContext extractedContext = tracer.extract(Format.Builtin.HTTP_HEADERS, textMap);
-    Span serverSpan =
-        tracer
-            .buildSpan("serverOperation")
-            .withServiceName("someService")
-            .asChildOf(extractedContext)
-            .start();
-    tracer.activateSpan(serverSpan).close();
-    serverSpan.finish();
-
-    scope.close();
-    testSpan.finish();
-    writer.waitForTraces(2);
-
-    verify(traceInterceptor, times(2)).onTraceComplete(any());
-    assertEquals(extractedContext.toTraceId(), testSpan.context().toTraceId());
-    assertEquals(extractedContext.toSpanId(), testSpan.context().toSpanId());
-
-    assertEquals(2, writer.size());
-    // sort traces by start time to get deterministic order (client started first)
-    List<List<DDSpan>> sortedTraces = new java.util.ArrayList<>(writer);
-    sortedTraces.sort(Comparator.comparingLong(t -> t.get(0).getStartTime()));
-    DDSpan clientSpan = sortedTraces.get(0).get(0);
-    DDSpan serverSpanDD = sortedTraces.get(1).get(0);
-    assertEquals("someClientService", clientSpan.getServiceName());
-    assertEquals("clientOperation", clientSpan.getOperationName().toString());
-    assertEquals("clientOperation", clientSpan.getResourceName().toString());
-    assertEquals("someService", serverSpanDD.getServiceName());
-    assertEquals("serverOperation", serverSpanDD.getOperationName().toString());
-    assertEquals("serverOperation", serverSpanDD.getResourceName().toString());
-    assertEquals(clientSpan.spanContext().getSpanId(), serverSpanDD.getParentId());
-  }
-
-  @Test
-  void tolerateNullSpanActivation() throws Exception {
-    try {
-      Scope s = tracer.scopeManager().activate(null);
-      if (s != null) s.close();
-    } catch (Exception ignored) {
+
+    @Test
+    void singleSpanWithManualStartFinish() throws Exception {
+        Span testSpan = tracer.buildSpan("someOperation").start();
+        Scope scope = tracer.activateSpan(testSpan);
+
+        verify(scopeListener).afterScopeActivated();
+        assertTrue(testSpan instanceof MutableSpan);
+        assertTrue(scope.span() instanceof MutableSpan);
+
+        testSpan.setTag(DDTags.SERVICE_NAME, "someService");
+        testSpan.setTag(Tags.COMPONENT, "opentracing");
+        testSpan.setTag("someBoolean", true);
+        testSpan.setTag("someNumber", 1);
+        testSpan.setOperationName("someOtherOperation");
+        scope.close();
+        testSpan.finish();
+        writer.waitForTraces(1);
+
+        verify(traceInterceptor).onTraceComplete(any());
+        verify(scopeListener).afterScopeClosed();
+
+        assertEquals(1, writer.size());
+        List<DDSpan> trace = writer.get(0);
+        assertEquals(1, trace.size());
+        DDSpan span = trace.get(0);
+        assertEquals("someService", span.getServiceName());
+        assertEquals("someOtherOperation", span.getOperationName().toString());
+        assertEquals("someOtherOperation", span.getResourceName().toString());
+        assertEquals("opentracing", span.getTags().get(Tags.COMPONENT.getKey()));
+        assertEquals("opentracing", span.getTags().get(DDTags.DD_INTEGRATION));
+        assertEquals(true, span.getTags().get("someBoolean"));
+        assertEquals(1, span.getTags().get("someNumber"));
     }
 
-    try {
-      Scope s = tracer.activateSpan(null);
-      if (s != null) s.close();
-    } catch (Exception ignored) {
+    @Test
+    void spansAndScopesAllEqual() throws Exception {
+        Span testSpan = tracer.buildSpan("someOperation").start();
+        Scope testScope = tracer.activateSpan(testSpan);
+
+        Span traceActiveSpan = tracer.activeSpan();
+        Span scopeManagerActiveSpan = tracer.scopeManager().activeSpan();
+        Span scopeActiveSpan = testScope.span();
+
+        Scope scopeManagerActiveScope = tracer.scopeManager().active();
+        testScope.close();
+        testSpan.finish();
+        writer.waitForTraces(1);
+
+        verify(traceInterceptor).onTraceComplete(any());
+        assertEquals(testSpan, traceActiveSpan);
+        assertEquals(testSpan.hashCode(), traceActiveSpan.hashCode());
+        assertEquals(testSpan, scopeManagerActiveSpan);
+        assertEquals(testSpan.hashCode(), scopeManagerActiveSpan.hashCode());
+        assertEquals(testSpan, scopeActiveSpan);
+        assertEquals(testSpan.hashCode(), scopeActiveSpan.hashCode());
+        assertEquals(testScope, scopeManagerActiveScope);
+        assertEquals(testScope.hashCode(), scopeManagerActiveScope.hashCode());
     }
 
-    // make sure scope stack has been left in a valid state
-    Span testSpan = tracer.buildSpan("someOperation").withServiceName("someService").start();
-    Scope testScope = tracer.scopeManager().activate(testSpan);
-    testSpan.finish();
-    testScope.close();
-    writer.waitForTraces(1);
-
-    verify(traceInterceptor).onTraceComplete(any());
-
-    assertEquals(1, writer.size());
-    List<DDSpan> trace = writer.get(0);
-    assertEquals(1, trace.size());
-    DDSpan span = trace.get(0);
-    assertEquals("someService", span.getServiceName());
-    assertEquals("someOperation", span.getOperationName().toString());
-    assertEquals("someOperation", span.getResourceName().toString());
-  }
+    @Test
+    void nestedSpans() throws Exception {
+        Scope scope = null;
+        try {
+            scope = tracer.buildSpan("someOperation").startActive(true);
+            scope.span().setTag(DDTags.SERVICE_NAME, "someService");
+
+            Scope scope2 = null;
+            try {
+                scope2 = tracer.buildSpan("someOperation2").startActive(true);
+            } finally {
+                if (scope2 != null) scope2.close();
+            }
+        } finally {
+            if (scope != null) scope.close();
+        }
+        writer.waitForTraces(1);
+
+        verify(traceInterceptor).onTraceComplete(any());
+
+        assertEquals(1, writer.size());
+        List<DDSpan> trace = writer.get(0);
+        assertEquals(2, trace.size());
+        DDSpan parentSpan = trace.get(0);
+        DDSpan childSpan = trace.get(1);
+        assertEquals("someService", parentSpan.getServiceName());
+        assertEquals("someOperation", parentSpan.getOperationName().toString());
+        assertEquals("someOperation", parentSpan.getResourceName().toString());
+        assertEquals("someService", childSpan.getServiceName());
+        assertEquals("someOperation2", childSpan.getOperationName().toString());
+        assertEquals("someOperation2", childSpan.getResourceName().toString());
+        assertEquals(parentSpan.getSpanId(), childSpan.getParentId());
+    }
+
+    @Test
+    void spanWithAsyncPropagation() throws Exception {
+        AgentTracer.TracerAPI internalTracer = tracer.getInternalTracer();
+
+        Scope scope = tracer.buildSpan("someOperation")
+                .withTag(DDTags.SERVICE_NAME, "someService")
+                .startActive(true);
+        internalTracer.setAsyncPropagationEnabled(false);
+
+        assertTrue(scope instanceof TraceScope);
+        assertTrue(!internalTracer.isAsyncPropagationEnabled());
+
+        internalTracer.setAsyncPropagationEnabled(true);
+        TraceScope.Continuation continuation = ((TraceScope) scope).capture();
+
+        assertTrue(internalTracer.isAsyncPropagationEnabled());
+        assertNotNull(continuation);
+
+        continuation.cancel();
+        scope.close();
+        writer.waitForTraces(1);
+
+        verify(traceInterceptor).onTraceComplete(any());
+
+        assertEquals(1, writer.size());
+        List<DDSpan> trace = writer.get(0);
+        assertEquals(1, trace.size());
+        DDSpan span = trace.get(0);
+        assertEquals("someService", span.getServiceName());
+        assertEquals("someOperation", span.getOperationName().toString());
+        assertEquals("someOperation", span.getResourceName().toString());
+    }
+
+    @Test
+    void spanInheritsAsyncPropagation() throws Exception {
+        AgentTracer.TracerAPI internalTracer = tracer.getInternalTracer();
+
+        Scope outer = tracer.buildSpan("someOperation")
+                .withTag(DDTags.SERVICE_NAME, "someService")
+                .startActive(true);
+        internalTracer.setAsyncPropagationEnabled(false);
+
+        assertTrue(!internalTracer.isAsyncPropagationEnabled());
+
+        internalTracer.setAsyncPropagationEnabled(true);
+        Scope inner = tracer.buildSpan("otherOperation")
+                .withTag(DDTags.SERVICE_NAME, "otherService")
+                .startActive(true);
+
+        assertTrue(internalTracer.isAsyncPropagationEnabled());
+
+        inner.close();
+        outer.close();
+        writer.waitForTraces(1);
+
+        verify(traceInterceptor).onTraceComplete(any());
+
+        assertEquals(1, writer.size());
+        List<DDSpan> trace = writer.get(0);
+        assertEquals(2, trace.size());
+        DDSpan outerSpan = trace.get(0);
+        DDSpan innerSpan = trace.get(1);
+        assertEquals("someService", outerSpan.getServiceName());
+        assertEquals("someOperation", outerSpan.getOperationName().toString());
+        assertEquals("someOperation", outerSpan.getResourceName().toString());
+        assertEquals("otherService", innerSpan.getServiceName());
+        assertEquals("otherOperation", innerSpan.getOperationName().toString());
+        assertEquals("otherOperation", innerSpan.getResourceName().toString());
+    }
+
+    @Test
+    void spanContextIdsEqualTracerIds() throws Exception {
+        Span testSpan =
+                tracer.buildSpan("someOperation").withServiceName("someService").start();
+        Scope scope = tracer.activateSpan(testSpan);
+
+        verify(scopeListener).afterScopeActivated();
+
+        assertEquals(testSpan.context().toSpanId(), tracer.getSpanId());
+        assertEquals(
+                testSpan.context().toTraceId(),
+                tracer.getInternalTracer()
+                        .activeSpan()
+                        .spanContext()
+                        .getTraceId()
+                        .toString());
+
+        scope.close();
+        testSpan.finish();
+        writer.waitForTraces(1);
+
+        verify(traceInterceptor).onTraceComplete(any());
+        verify(scopeListener).afterScopeClosed();
+
+        assertEquals(1, writer.size());
+        List<DDSpan> trace = writer.get(0);
+        assertEquals(1, trace.size());
+        DDSpan span = trace.get(0);
+        assertEquals("someService", span.getServiceName());
+        assertEquals("someOperation", span.getOperationName().toString());
+        assertEquals("someOperation", span.getResourceName().toString());
+    }
+
+    @Test
+    void closingScopeWhenNotOnTop() throws Exception {
+        Span firstSpan = tracer.buildSpan("someOperation").start();
+        Scope firstScope = tracer.activateSpan(firstSpan);
+        Span secondSpan = tracer.buildSpan("someOperation").start();
+        Scope secondScope = tracer.activateSpan(secondSpan);
+        firstSpan.finish();
+        firstScope.close();
+
+        // then: 2 * scopeListener.afterScopeActivated(), 0 * _
+        verify(scopeListener, times(2)).afterScopeActivated();
+        verifyNoMoreInteractions(scopeListener, traceInterceptor);
+        clearInvocations(scopeListener, traceInterceptor);
+
+        secondSpan.finish();
+        secondScope.close();
+        writer.waitForTraces(1);
+
+        // then: 2 * scopeListener.afterScopeClosed(), 1 * traceInterceptor.onTraceComplete(...)
+        verify(scopeListener, times(2)).afterScopeClosed();
+        verify(traceInterceptor).onTraceComplete(any());
+        assertEquals(1, writer.size());
+        assertEquals(2, writer.get(0).size());
+        verifyNoMoreInteractions(scopeListener, traceInterceptor);
+        clearInvocations(scopeListener, traceInterceptor);
+
+        firstScope.close();
+
+        // then: 0 * _
+        verifyNoMoreInteractions(scopeListener, traceInterceptor);
+    }
+
+    @Test
+    @WithConfig(key = "trace.scope.strict.mode", value = "true")
+    void closingScopeWhenNotOnTopInStrictMode() throws Exception {
+        DDTracer strictTracer = DDTracer.builder().writer(writer).build();
+        strictTracer.addTraceInterceptor(traceInterceptor);
+        strictTracer.getInternalTracer().addScopeListener(scopeListener);
+        // clear priority() interaction from addTraceInterceptor
+        clearInvocations(traceInterceptor, scopeListener);
+
+        Span firstSpan = strictTracer.buildSpan("someOperation").start();
+        Scope firstScope = strictTracer.activateSpan(firstSpan);
+        Span secondSpan = strictTracer.buildSpan("someOperation").start();
+        Scope secondScope = strictTracer.activateSpan(secondSpan);
+
+        // then: 2 * scopeListener.afterScopeActivated(), 0 * _
+        verify(scopeListener, times(2)).afterScopeActivated();
+        verifyNoMoreInteractions(scopeListener, traceInterceptor);
+        clearInvocations(scopeListener, traceInterceptor);
+
+        firstSpan.finish();
+        assertThrows(RuntimeException.class, firstScope::close);
+
+        // then: thrown(RuntimeException), 0 * _
+        verifyNoMoreInteractions(scopeListener, traceInterceptor);
+        clearInvocations(scopeListener, traceInterceptor);
+
+        secondSpan.finish();
+        secondScope.close();
+        writer.waitForTraces(1);
+
+        // then: 1 * scopeListener.afterScopeClosed(), 1 * traceInterceptor.onTraceComplete(...)
+        // 1 * scopeListener.afterScopeActivated() (scope restoration after strict mode exception)
+        verify(scopeListener).afterScopeClosed();
+        verify(traceInterceptor).onTraceComplete(any());
+        assertEquals(1, writer.size());
+        assertEquals(2, writer.get(0).size());
+        verify(scopeListener).afterScopeActivated();
+        verifyNoMoreInteractions(scopeListener, traceInterceptor);
+        clearInvocations(scopeListener, traceInterceptor);
+
+        firstScope.close();
+
+        verify(scopeListener).afterScopeClosed();
+        verifyNoMoreInteractions(scopeListener, traceInterceptor);
+
+        strictTracer.close();
+    }
+
+    @Test
+    void injectAndExtractContext() throws Exception {
+        TextMapAdapter textMap = new TextMapAdapter(new HashMap<String, String>());
+
+        Span testSpan = tracer.buildSpan("clientOperation")
+                .withServiceName("someClientService")
+                .start();
+        Scope scope = tracer.activateSpan(testSpan);
+
+        tracer.inject(testSpan.context(), Format.Builtin.HTTP_HEADERS, textMap);
+
+        SpanContext extractedContext = tracer.extract(Format.Builtin.HTTP_HEADERS, textMap);
+        Span serverSpan = tracer.buildSpan("serverOperation")
+                .withServiceName("someService")
+                .asChildOf(extractedContext)
+                .start();
+        tracer.activateSpan(serverSpan).close();
+        serverSpan.finish();
+
+        scope.close();
+        testSpan.finish();
+        writer.waitForTraces(2);
+
+        verify(traceInterceptor, times(2)).onTraceComplete(any());
+        assertEquals(extractedContext.toTraceId(), testSpan.context().toTraceId());
+        assertEquals(extractedContext.toSpanId(), testSpan.context().toSpanId());
+
+        assertEquals(2, writer.size());
+        // sort traces by start time to get deterministic order (client started first)
+        List<List<DDSpan>> sortedTraces = new java.util.ArrayList<>(writer);
+        sortedTraces.sort(Comparator.comparingLong(t -> t.get(0).getStartTime()));
+        DDSpan clientSpan = sortedTraces.get(0).get(0);
+        DDSpan serverSpanDD = sortedTraces.get(1).get(0);
+        assertEquals("someClientService", clientSpan.getServiceName());
+        assertEquals("clientOperation", clientSpan.getOperationName().toString());
+        assertEquals("clientOperation", clientSpan.getResourceName().toString());
+        assertEquals("someService", serverSpanDD.getServiceName());
+        assertEquals("serverOperation", serverSpanDD.getOperationName().toString());
+        assertEquals("serverOperation", serverSpanDD.getResourceName().toString());
+        assertEquals(clientSpan.spanContext().getSpanId(), serverSpanDD.getParentId());
+    }
+
+    @Test
+    void tolerateNullSpanActivation() throws Exception {
+        try {
+            Scope s = tracer.scopeManager().activate(null);
+            if (s != null) s.close();
+        } catch (Exception ignored) {
+        }
+
+        try {
+            Scope s = tracer.activateSpan(null);
+            if (s != null) s.close();
+        } catch (Exception ignored) {
+        }
+
+        // make sure scope stack has been left in a valid state
+        Span testSpan =
+                tracer.buildSpan("someOperation").withServiceName("someService").start();
+        Scope testScope = tracer.scopeManager().activate(testSpan);
+        testSpan.finish();
+        testScope.close();
+        writer.waitForTraces(1);
+
+        verify(traceInterceptor).onTraceComplete(any());
+
+        assertEquals(1, writer.size());
+        List<DDSpan> trace = writer.get(0);
+        assertEquals(1, trace.size());
+        DDSpan span = trace.get(0);
+        assertEquals("someService", span.getServiceName());
+        assertEquals("someOperation", span.getOperationName().toString());
+        assertEquals("someOperation", span.getResourceName().toString());
+    }
 }
diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/SpanBuilderTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/SpanBuilderTest.java
index 47800466751..943c43b4693 100644
--- a/dd-trace-ot/src/test/java/datadog/opentracing/SpanBuilderTest.java
+++ b/dd-trace-ot/src/test/java/datadog/opentracing/SpanBuilderTest.java
@@ -11,145 +11,121 @@
 import org.junit.jupiter.api.Test;
 
 class SpanBuilderTest extends DDJavaSpecification {
-  // TODO more io.opentracing.SpanBuilder specific tests
+    // TODO more io.opentracing.SpanBuilder specific tests
 
-  ListWriter writer = new ListWriter();
-  DDTracer tracer = DDTracer.builder().writer(writer).build();
+    ListWriter writer = new ListWriter();
+    DDTracer tracer = DDTracer.builder().writer(writer).build();
 
-  @AfterEach
-  void cleanup() throws Exception {
-    if (tracer != null) {
-      tracer.close();
+    @AfterEach
+    void cleanup() throws Exception {
+        if (tracer != null) {
+            tracer.close();
+        }
     }
-  }
-
-  @Test
-  void shouldInheritDDParentAttributesAddReferenceChildOf() {
-    String expectedName = "fakeName";
-    String expectedParentServiceName = "fakeServiceName";
-    String expectedParentResourceName = "fakeResourceName";
-    String expectedParentType = "fakeType";
-    String expectedChildServiceName = "fakeServiceName-child";
-    String expectedChildResourceName = "fakeResourceName-child";
-    String expectedChildType = "fakeType-child";
-    String expectedBaggageItemKey = "fakeKey";
-    String expectedBaggageItemValue = "fakeValue";
-
-    Span parent =
-        tracer
-            .buildSpan(expectedName)
-            .withServiceName("foo")
-            .withResourceName(expectedParentResourceName)
-            .withSpanType(expectedParentType)
-            .start();
-
-    parent.setBaggageItem(expectedBaggageItemKey, expectedBaggageItemValue);
-
-    // ServiceName and SpanType are always set by the parent if they are not present in the child
-    OTSpan span =
-        (OTSpan)
-            tracer
-                .buildSpan(expectedName)
+
+    @Test
+    void shouldInheritDDParentAttributesAddReferenceChildOf() {
+        String expectedName = "fakeName";
+        String expectedParentServiceName = "fakeServiceName";
+        String expectedParentResourceName = "fakeResourceName";
+        String expectedParentType = "fakeType";
+        String expectedChildServiceName = "fakeServiceName-child";
+        String expectedChildResourceName = "fakeResourceName-child";
+        String expectedChildType = "fakeType-child";
+        String expectedBaggageItemKey = "fakeKey";
+        String expectedBaggageItemValue = "fakeValue";
+
+        Span parent = tracer.buildSpan(expectedName)
+                .withServiceName("foo")
+                .withResourceName(expectedParentResourceName)
+                .withSpanType(expectedParentType)
+                .start();
+
+        parent.setBaggageItem(expectedBaggageItemKey, expectedBaggageItemValue);
+
+        // ServiceName and SpanType are always set by the parent if they are not present in the child
+        OTSpan span = (OTSpan) tracer.buildSpan(expectedName)
                 .withServiceName(expectedParentServiceName)
                 .addReference("child_of", parent.context())
                 .start();
 
-    assertEquals(expectedName, span.getDelegate().getOperationName());
-    assertEquals(expectedBaggageItemValue, span.getBaggageItem(expectedBaggageItemKey));
-    assertEquals(
-        expectedParentServiceName,
-        ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getServiceName());
-    assertEquals(
-        expectedName,
-        ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getResourceName());
-    assertNull(((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getSpanType());
-
-    // ServiceName and SpanType are always overwritten by the child if they are present
-    span =
-        (OTSpan)
-            tracer
-                .buildSpan(expectedName)
+        assertEquals(expectedName, span.getDelegate().getOperationName());
+        assertEquals(expectedBaggageItemValue, span.getBaggageItem(expectedBaggageItemKey));
+        assertEquals(
+                expectedParentServiceName,
+                ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getServiceName());
+        assertEquals(expectedName, ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getResourceName());
+        assertNull(((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getSpanType());
+
+        // ServiceName and SpanType are always overwritten by the child if they are present
+        span = (OTSpan) tracer.buildSpan(expectedName)
                 .withServiceName(expectedChildServiceName)
                 .withResourceName(expectedChildResourceName)
                 .withSpanType(expectedChildType)
                 .addReference("child_of", parent.context())
                 .start();
 
-    assertEquals(expectedName, span.getDelegate().getOperationName());
-    assertEquals(expectedBaggageItemValue, span.getBaggageItem(expectedBaggageItemKey));
-    assertEquals(
-        expectedChildServiceName,
-        ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getServiceName());
-    assertEquals(
-        expectedChildResourceName,
-        ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getResourceName());
-    assertEquals(
-        expectedChildType,
-        ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getSpanType());
-  }
-
-  @Test
-  void shouldInheritDDParentAttributesAddReferenceFollowsFrom() {
-    String expectedName = "fakeName";
-    String expectedParentServiceName = "fakeServiceName";
-    String expectedParentResourceName = "fakeResourceName";
-    String expectedParentType = "fakeType";
-    String expectedChildServiceName = "fakeServiceName-child";
-    String expectedChildResourceName = "fakeResourceName-child";
-    String expectedChildType = "fakeType-child";
-    String expectedBaggageItemKey = "fakeKey";
-    String expectedBaggageItemValue = "fakeValue";
-
-    Span parent =
-        tracer
-            .buildSpan(expectedName)
-            .withServiceName("foo")
-            .withResourceName(expectedParentResourceName)
-            .withSpanType(expectedParentType)
-            .start();
-
-    parent.setBaggageItem(expectedBaggageItemKey, expectedBaggageItemValue);
-
-    // ServiceName and SpanType are always set by the parent if they are not present in the child
-    OTSpan span =
-        (OTSpan)
-            tracer
-                .buildSpan(expectedName)
+        assertEquals(expectedName, span.getDelegate().getOperationName());
+        assertEquals(expectedBaggageItemValue, span.getBaggageItem(expectedBaggageItemKey));
+        assertEquals(
+                expectedChildServiceName,
+                ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getServiceName());
+        assertEquals(
+                expectedChildResourceName,
+                ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getResourceName());
+        assertEquals(expectedChildType, ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getSpanType());
+    }
+
+    @Test
+    void shouldInheritDDParentAttributesAddReferenceFollowsFrom() {
+        String expectedName = "fakeName";
+        String expectedParentServiceName = "fakeServiceName";
+        String expectedParentResourceName = "fakeResourceName";
+        String expectedParentType = "fakeType";
+        String expectedChildServiceName = "fakeServiceName-child";
+        String expectedChildResourceName = "fakeResourceName-child";
+        String expectedChildType = "fakeType-child";
+        String expectedBaggageItemKey = "fakeKey";
+        String expectedBaggageItemValue = "fakeValue";
+
+        Span parent = tracer.buildSpan(expectedName)
+                .withServiceName("foo")
+                .withResourceName(expectedParentResourceName)
+                .withSpanType(expectedParentType)
+                .start();
+
+        parent.setBaggageItem(expectedBaggageItemKey, expectedBaggageItemValue);
+
+        // ServiceName and SpanType are always set by the parent if they are not present in the child
+        OTSpan span = (OTSpan) tracer.buildSpan(expectedName)
                 .withServiceName(expectedParentServiceName)
                 .addReference("follows_from", parent.context())
                 .start();
 
-    assertEquals(expectedName, span.getDelegate().getOperationName());
-    assertEquals(expectedBaggageItemValue, span.getBaggageItem(expectedBaggageItemKey));
-    assertEquals(
-        expectedParentServiceName,
-        ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getServiceName());
-    assertEquals(
-        expectedName,
-        ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getResourceName());
-    assertNull(((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getSpanType());
-
-    // ServiceName and SpanType are always overwritten by the child if they are present
-    span =
-        (OTSpan)
-            tracer
-                .buildSpan(expectedName)
+        assertEquals(expectedName, span.getDelegate().getOperationName());
+        assertEquals(expectedBaggageItemValue, span.getBaggageItem(expectedBaggageItemKey));
+        assertEquals(
+                expectedParentServiceName,
+                ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getServiceName());
+        assertEquals(expectedName, ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getResourceName());
+        assertNull(((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getSpanType());
+
+        // ServiceName and SpanType are always overwritten by the child if they are present
+        span = (OTSpan) tracer.buildSpan(expectedName)
                 .withServiceName(expectedChildServiceName)
                 .withResourceName(expectedChildResourceName)
                 .withSpanType(expectedChildType)
                 .addReference("follows_from", parent.context())
                 .start();
 
-    assertEquals(expectedName, span.getDelegate().getOperationName());
-    assertEquals(expectedBaggageItemValue, span.getBaggageItem(expectedBaggageItemKey));
-    assertEquals(
-        expectedChildServiceName,
-        ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getServiceName());
-    assertEquals(
-        expectedChildResourceName,
-        ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getResourceName());
-    assertEquals(
-        expectedChildType,
-        ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getSpanType());
-  }
+        assertEquals(expectedName, span.getDelegate().getOperationName());
+        assertEquals(expectedBaggageItemValue, span.getBaggageItem(expectedBaggageItemKey));
+        assertEquals(
+                expectedChildServiceName,
+                ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getServiceName());
+        assertEquals(
+                expectedChildResourceName,
+                ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getResourceName());
+        assertEquals(expectedChildType, ((DDSpanContext) ((OTSpanContext) span.context()).getDelegate()).getSpanType());
+    }
 }
diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/TypeConverterTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/TypeConverterTest.java
index 7268378f451..a9ed854c9c1 100644
--- a/dd-trace-ot/src/test/java/datadog/opentracing/TypeConverterTest.java
+++ b/dd-trace-ot/src/test/java/datadog/opentracing/TypeConverterTest.java
@@ -16,42 +16,42 @@
 
 class TypeConverterTest extends DDJavaSpecification {
 
-  TypeConverter typeConverter = new TypeConverter(new DefaultLogHandler());
-
-  @Test
-  void shouldAvoidTheNoopSpanWrapperAllocation() {
-    AgentSpan noopAgentSpan = noopSpan();
-    assertSame(typeConverter.toSpan(noopAgentSpan), typeConverter.toSpan(noopAgentSpan));
-  }
-
-  @Test
-  void shouldAvoidExtraAllocationForASpanWrapper() throws Exception {
-    CoreTracer testTracer = CoreTracer.builder().writer(new ListWriter()).build();
-    try {
-      AgentSpan span1 = testTracer.buildSpan("datadog", "test").start();
-      AgentSpan span2 = testTracer.buildSpan("datadog", "test").start();
-
-      // return the same wrapper for the same span
-      assertSame(typeConverter.toSpan(span1), typeConverter.toSpan(span1));
-      // return a distinct wrapper for another span
-      assertNotSame(typeConverter.toSpan(span1), typeConverter.toSpan(span2));
-    } finally {
-      testTracer.close();
+    TypeConverter typeConverter = new TypeConverter(new DefaultLogHandler());
+
+    @Test
+    void shouldAvoidTheNoopSpanWrapperAllocation() {
+        AgentSpan noopAgentSpan = noopSpan();
+        assertSame(typeConverter.toSpan(noopAgentSpan), typeConverter.toSpan(noopAgentSpan));
+    }
+
+    @Test
+    void shouldAvoidExtraAllocationForASpanWrapper() throws Exception {
+        CoreTracer testTracer = CoreTracer.builder().writer(new ListWriter()).build();
+        try {
+            AgentSpan span1 = testTracer.buildSpan("datadog", "test").start();
+            AgentSpan span2 = testTracer.buildSpan("datadog", "test").start();
+
+            // return the same wrapper for the same span
+            assertSame(typeConverter.toSpan(span1), typeConverter.toSpan(span1));
+            // return a distinct wrapper for another span
+            assertNotSame(typeConverter.toSpan(span1), typeConverter.toSpan(span2));
+        } finally {
+            testTracer.close();
+        }
+    }
+
+    @Test
+    void shouldAvoidTheNoopContextWrapperAllocation() {
+        datadog.trace.bootstrap.instrumentation.api.AgentSpanContext noopContext = noopSpanContext();
+        assertSame(typeConverter.toSpanContext(noopContext), typeConverter.toSpanContext(noopContext));
+    }
+
+    @Test
+    void shouldReuseNoopSpanWrapperViaScope() {
+        ContextScope noopScope = mock(ContextScope.class);
+        when(noopScope.context()).thenReturn(noopSpan());
+        OTSpan noopSpanWrapper = typeConverter.toSpan(noopSpan());
+        assertSame(typeConverter.toScope(noopScope, true).span(), noopSpanWrapper);
+        assertSame(typeConverter.toScope(noopScope, false).span(), noopSpanWrapper);
     }
-  }
-
-  @Test
-  void shouldAvoidTheNoopContextWrapperAllocation() {
-    datadog.trace.bootstrap.instrumentation.api.AgentSpanContext noopContext = noopSpanContext();
-    assertSame(typeConverter.toSpanContext(noopContext), typeConverter.toSpanContext(noopContext));
-  }
-
-  @Test
-  void shouldReuseNoopSpanWrapperViaScope() {
-    ContextScope noopScope = mock(ContextScope.class);
-    when(noopScope.context()).thenReturn(noopSpan());
-    OTSpan noopSpanWrapper = typeConverter.toSpan(noopSpan());
-    assertSame(typeConverter.toScope(noopScope, true).span(), noopSpanWrapper);
-    assertSame(typeConverter.toScope(noopScope, false).span(), noopSpanWrapper);
-  }
 }
diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/resolver/DDTracerResolverTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/resolver/DDTracerResolverTest.java
index b49838baf53..13b5b5aa849 100644
--- a/dd-trace-ot/src/test/java/datadog/opentracing/resolver/DDTracerResolverTest.java
+++ b/dd-trace-ot/src/test/java/datadog/opentracing/resolver/DDTracerResolverTest.java
@@ -11,18 +11,18 @@
 
 class DDTracerResolverTest extends DDJavaSpecification {
 
-  private final DDTracerResolver resolver = new DDTracerResolver();
+    private final DDTracerResolver resolver = new DDTracerResolver();
 
-  @Test
-  void testResolveTracer() throws Exception {
-    io.opentracing.Tracer tracer = TracerResolver.resolveTracer();
-    assertInstanceOf(DDTracer.class, tracer);
-    tracer.close();
-  }
+    @Test
+    void testResolveTracer() throws Exception {
+        io.opentracing.Tracer tracer = TracerResolver.resolveTracer();
+        assertInstanceOf(DDTracer.class, tracer);
+        tracer.close();
+    }
 
-  @Test
-  @WithConfig(key = "trace.resolver.enabled", value = "false")
-  void testDisableDDTracerResolver() {
-    assertNull(resolver.resolve());
-  }
+    @Test
+    @WithConfig(key = "trace.resolver.enabled", value = "false")
+    void testDisableDDTracerResolver() {
+        assertNull(resolver.resolve());
+    }
 }
diff --git a/internal-api/internal-api-9/src/jmh/java/datadog/trace/util/stacktrace/JDK9StackWalkerBenchmark.java b/internal-api/internal-api-9/src/jmh/java/datadog/trace/util/stacktrace/JDK9StackWalkerBenchmark.java
index cec9f4625df..4bf0e655b25 100644
--- a/internal-api/internal-api-9/src/jmh/java/datadog/trace/util/stacktrace/JDK9StackWalkerBenchmark.java
+++ b/internal-api/internal-api-9/src/jmh/java/datadog/trace/util/stacktrace/JDK9StackWalkerBenchmark.java
@@ -29,51 +29,50 @@
 @State(Scope.Benchmark)
 public class JDK9StackWalkerBenchmark {
 
-  private JDK9StackWalker jdk9StackWalker;
+    private JDK9StackWalker jdk9StackWalker;
 
-  private DefaultStackWalker defaultStackWalker;
+    private DefaultStackWalker defaultStackWalker;
 
-  @Param({"1", "3", "10"})
-  int limit;
+    @Param({"1", "3", "10"})
+    int limit;
 
-  @Param({"10", "50", "100"})
-  int deep;
+    @Param({"10", "50", "100"})
+    int deep;
 
-  @Setup(Level.Trial)
-  public void setup() {
-    jdk9StackWalker = new JDK9StackWalker();
-    defaultStackWalker = new DefaultStackWalker();
-  }
+    @Setup(Level.Trial)
+    public void setup() {
+        jdk9StackWalker = new JDK9StackWalker();
+        defaultStackWalker = new DefaultStackWalker();
+    }
 
-  @Benchmark
-  public void JDK9StackWalkerWalk() {
-    generateStack(jdk9StackWalker);
-  }
+    @Benchmark
+    public void JDK9StackWalkerWalk() {
+        generateStack(jdk9StackWalker);
+    }
 
-  @Benchmark
-  public void defaultStackWalkerWalk() {
-    generateStack(defaultStackWalker);
-  }
+    @Benchmark
+    public void defaultStackWalkerWalk() {
+        generateStack(defaultStackWalker);
+    }
 
-  private List<StackTraceElement> toLimitedList(final Stream<StackTraceElement> stack) {
-    return stack.limit(limit).collect(Collectors.toList());
-  }
+    private List<StackTraceElement> toLimitedList(final Stream<StackTraceElement> stack) {
+        return stack.limit(limit).collect(Collectors.toList());
+    }
 
-  private void generateStack(final StackWalker stackWalker) {
+    private void generateStack(final StackWalker stackWalker) {
 
-    Runnable runnable =
-        new Runnable() {
-          @Override
-          public void run() {
-            stackWalker.walk(this::toLimitedList);
-          }
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                stackWalker.walk(this::toLimitedList);
+            }
 
-          private List<StackTraceElement> toLimitedList(final Stream<StackTraceElement> stack) {
-            return stack.limit(limit).collect(Collectors.toList());
-          }
+            private List<StackTraceElement> toLimitedList(final Stream<StackTraceElement> stack) {
+                return stack.limit(limit).collect(Collectors.toList());
+            }
         };
 
-    RecursiveRunner runner = new RecursiveRunner(deep, runnable);
-    runner.run();
-  }
+        RecursiveRunner runner = new RecursiveRunner(deep, runnable);
+        runner.run();
+    }
 }
diff --git a/internal-api/internal-api-9/src/main/java/datadog/trace/util/JDK9ExecutableSupplier.java b/internal-api/internal-api-9/src/main/java/datadog/trace/util/JDK9ExecutableSupplier.java
index 7bf49cb5d19..86496ab2084 100644
--- a/internal-api/internal-api-9/src/main/java/datadog/trace/util/JDK9ExecutableSupplier.java
+++ b/internal-api/internal-api-9/src/main/java/datadog/trace/util/JDK9ExecutableSupplier.java
@@ -3,11 +3,11 @@
 import java.util.function.Supplier;
 
 public final class JDK9ExecutableSupplier implements Supplier<String> {
-  @Override
-  public String get() {
-    return ProcessHandle.current()
-        .info()
-        .command()
-        .orElseThrow(() -> new UnsupportedOperationException("Executable path is not available"));
-  }
+    @Override
+    public String get() {
+        return ProcessHandle.current()
+                .info()
+                .command()
+                .orElseThrow(() -> new UnsupportedOperationException("Executable path is not available"));
+    }
 }
diff --git a/internal-api/internal-api-9/src/main/java/datadog/trace/util/JDK9ModuleAccess.java b/internal-api/internal-api-9/src/main/java/datadog/trace/util/JDK9ModuleAccess.java
index f292862e029..773e85726af 100644
--- a/internal-api/internal-api-9/src/main/java/datadog/trace/util/JDK9ModuleAccess.java
+++ b/internal-api/internal-api-9/src/main/java/datadog/trace/util/JDK9ModuleAccess.java
@@ -14,50 +14,41 @@
 @SuppressWarnings("Since15")
 public final class JDK9ModuleAccess {
 
-  /** Retrieves a class-loader's unnamed module. */
-  public static AnnotatedElement getUnnamedModule(ClassLoader cl) {
-    return cl.getUnnamedModule();
-  }
-
-  /** Returns {@code true} if the first module can read the second module. */
-  public static boolean canRead(AnnotatedElement module, AnnotatedElement anotherModule) {
-    return ((java.lang.Module) module).canRead((java.lang.Module) anotherModule);
-  }
-
-  /** Adds extra module reads to the given module. */
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  public static void addModuleReads(
-      Instrumentation inst, AnnotatedElement module, Set<AnnotatedElement> extraReads) {
-    inst.redefineModule(
-        (java.lang.Module) module,
-        (Set) extraReads,
-        emptyMap(),
-        emptyMap(),
-        emptySet(),
-        emptyMap());
-  }
-
-  /** Exports specific packages of a named module to a classloader's unnamed module. */
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  public static void exportModuleToUnnamedModule(
-      Instrumentation inst,
-      String moduleName,
-      String[] packageNames,
-      ClassLoader targetClassLoader) {
-    java.util.Optional<java.lang.Module> optModule =
-        java.lang.ModuleLayer.boot().findModule(moduleName);
-    if (!optModule.isPresent()) {
-      return;
+    /** Retrieves a class-loader's unnamed module. */
+    public static AnnotatedElement getUnnamedModule(ClassLoader cl) {
+        return cl.getUnnamedModule();
     }
-    java.lang.Module module = optModule.get();
-    java.lang.Module unnamedModule = targetClassLoader.getUnnamedModule();
 
-    Set<java.lang.Module> target = Collections.singleton(unnamedModule);
-    Map<String, Set<java.lang.Module>> extraExports = new HashMap<>();
-    for (String packageName : packageNames) {
-      extraExports.put(packageName, target);
+    /** Returns {@code true} if the first module can read the second module. */
+    public static boolean canRead(AnnotatedElement module, AnnotatedElement anotherModule) {
+        return ((java.lang.Module) module).canRead((java.lang.Module) anotherModule);
     }
 
-    inst.redefineModule(module, emptySet(), extraExports, emptyMap(), emptySet(), emptyMap());
-  }
+    /** Adds extra module reads to the given module. */
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public static void addModuleReads(Instrumentation inst, AnnotatedElement module, Set<AnnotatedElement> extraReads) {
+        inst.redefineModule(
+                (java.lang.Module) module, (Set) extraReads, emptyMap(), emptyMap(), emptySet(), emptyMap());
+    }
+
+    /** Exports specific packages of a named module to a classloader's unnamed module. */
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public static void exportModuleToUnnamedModule(
+            Instrumentation inst, String moduleName, String[] packageNames, ClassLoader targetClassLoader) {
+        java.util.Optional<java.lang.Module> optModule =
+                java.lang.ModuleLayer.boot().findModule(moduleName);
+        if (!optModule.isPresent()) {
+            return;
+        }
+        java.lang.Module module = optModule.get();
+        java.lang.Module unnamedModule = targetClassLoader.getUnnamedModule();
+
+        Set<java.lang.Module> target = Collections.singleton(unnamedModule);
+        Map<String, Set<java.lang.Module>> extraExports = new HashMap<>();
+        for (String packageName : packageNames) {
+            extraExports.put(packageName, target);
+        }
+
+        inst.redefineModule(module, emptySet(), extraExports, emptyMap(), emptySet(), emptyMap());
+    }
 }
diff --git a/internal-api/internal-api-9/src/main/java/datadog/trace/util/JDK9PidSupplier.java b/internal-api/internal-api-9/src/main/java/datadog/trace/util/JDK9PidSupplier.java
index 9d6e4ad3a4e..69239d03d09 100644
--- a/internal-api/internal-api-9/src/main/java/datadog/trace/util/JDK9PidSupplier.java
+++ b/internal-api/internal-api-9/src/main/java/datadog/trace/util/JDK9PidSupplier.java
@@ -6,15 +6,15 @@
 
 /** Use standard API to retrieve PID on Java9+. */
 public final class JDK9PidSupplier implements Supplier<String> {
-  private static final Logger log = LoggerFactory.getLogger(JDK9PidSupplier.class);
+    private static final Logger log = LoggerFactory.getLogger(JDK9PidSupplier.class);
 
-  @Override
-  public String get() {
-    try {
-      return Long.toString(ProcessHandle.current().pid());
-    } catch (Throwable e) {
-      log.debug("Cannot get PID through JVM API", e);
-      return "";
+    @Override
+    public String get() {
+        try {
+            return Long.toString(ProcessHandle.current().pid());
+        } catch (Throwable e) {
+            log.debug("Cannot get PID through JVM API", e);
+            return "";
+        }
     }
-  }
 }
diff --git a/internal-api/internal-api-9/src/main/java/datadog/trace/util/stacktrace/JDK9StackWalker.java b/internal-api/internal-api-9/src/main/java/datadog/trace/util/stacktrace/JDK9StackWalker.java
index afb02b97b7c..8f39508220e 100644
--- a/internal-api/internal-api-9/src/main/java/datadog/trace/util/stacktrace/JDK9StackWalker.java
+++ b/internal-api/internal-api-9/src/main/java/datadog/trace/util/stacktrace/JDK9StackWalker.java
@@ -8,53 +8,52 @@
 @SuppressForbidden
 public class JDK9StackWalker extends AbstractStackWalker {
 
-  private static final java.lang.StackWalker walker;
-  private static final StackMapper mapper;
-
-  static {
-    walker = newStackWalker();
-    mapper = findMapper();
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return walker != null && mapper != null;
-  }
-
-  @Override
-  <T> T doGetStack(final Function<Stream<StackTraceElement>, T> consumer) {
-    return walker.walk(stack -> consumer.apply(stack.map(mapper)));
-  }
-
-  /**
-   * IBM J9 v.0.26.0-release was segfaulting when calling StackFrame::toStackTraceElement(), newer
-   * versions are OK
-   */
-  private static StackTraceElement mapFrameForJ9(final java.lang.StackWalker.StackFrame frame) {
-    return new StackTraceElement(
-        frame.getClassName(), frame.getMethodName(), frame.getFileName(), frame.getLineNumber());
-  }
-
-  private static java.lang.StackWalker newStackWalker() {
-    try {
-      return java.lang.StackWalker.getInstance();
-    } catch (final Throwable e) {
-      // Nothing to do
-      return null;
+    private static final java.lang.StackWalker walker;
+    private static final StackMapper mapper;
+
+    static {
+        walker = newStackWalker();
+        mapper = findMapper();
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return walker != null && mapper != null;
+    }
+
+    @Override
+    <T> T doGetStack(final Function<Stream<StackTraceElement>, T> consumer) {
+        return walker.walk(stack -> consumer.apply(stack.map(mapper)));
     }
-  }
-
-  private static StackMapper findMapper() {
-    try {
-      return JavaVirtualMachine.isJ9()
-          ? JDK9StackWalker::mapFrameForJ9
-          : java.lang.StackWalker.StackFrame::toStackTraceElement;
-    } catch (final Throwable e) {
-      // Nothing to do
-      return null;
+
+    /**
+     * IBM J9 v.0.26.0-release was segfaulting when calling StackFrame::toStackTraceElement(), newer
+     * versions are OK
+     */
+    private static StackTraceElement mapFrameForJ9(final java.lang.StackWalker.StackFrame frame) {
+        return new StackTraceElement(
+                frame.getClassName(), frame.getMethodName(), frame.getFileName(), frame.getLineNumber());
+    }
+
+    private static java.lang.StackWalker newStackWalker() {
+        try {
+            return java.lang.StackWalker.getInstance();
+        } catch (final Throwable e) {
+            // Nothing to do
+            return null;
+        }
+    }
+
+    private static StackMapper findMapper() {
+        try {
+            return JavaVirtualMachine.isJ9()
+                    ? JDK9StackWalker::mapFrameForJ9
+                    : java.lang.StackWalker.StackFrame::toStackTraceElement;
+        } catch (final Throwable e) {
+            // Nothing to do
+            return null;
+        }
     }
-  }
 
-  private interface StackMapper
-      extends Function<java.lang.StackWalker.StackFrame, StackTraceElement> {}
+    private interface StackMapper extends Function<java.lang.StackWalker.StackFrame, StackTraceElement> {}
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/api/SpanPrototypeBenchmark.java b/internal-api/src/jmh/java/datadog/trace/api/SpanPrototypeBenchmark.java
index c75e9eefa94..e496c50dc07 100644
--- a/internal-api/src/jmh/java/datadog/trace/api/SpanPrototypeBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/api/SpanPrototypeBenchmark.java
@@ -48,49 +48,46 @@
 @Threads(8)
 public class SpanPrototypeBenchmark {
 
-  // The constant set a typical server span carries, as cached entries (the shared-Entry
-  // hand-optimization the decorators use today).
-  private static final TagMap.Entry COMPONENT = TagMap.Entry.create(Tags.COMPONENT, "netty");
-  private static final TagMap.Entry KIND =
-      TagMap.Entry.create(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER);
-  private static final TagMap.Entry LANGUAGE =
-      TagMap.Entry.create(DDTags.LANGUAGE_TAG_KEY, DDTags.LANGUAGE_TAG_VALUE);
-  private static final TagMap.Entry ANALYTICS =
-      TagMap.Entry.create(DDTags.ANALYTICS_SAMPLE_RATE, 1.0d);
+    // The constant set a typical server span carries, as cached entries (the shared-Entry
+    // hand-optimization the decorators use today).
+    private static final TagMap.Entry COMPONENT = TagMap.Entry.create(Tags.COMPONENT, "netty");
+    private static final TagMap.Entry KIND = TagMap.Entry.create(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER);
+    private static final TagMap.Entry LANGUAGE =
+            TagMap.Entry.create(DDTags.LANGUAGE_TAG_KEY, DDTags.LANGUAGE_TAG_VALUE);
+    private static final TagMap.Entry ANALYTICS = TagMap.Entry.create(DDTags.ANALYTICS_SAMPLE_RATE, 1.0d);
 
-  private SpanPrototype prototype;
+    private SpanPrototype prototype;
 
-  @Setup(Level.Trial)
-  public void setUp() {
-    // Baked once — the same constants, composed through the builder.
-    prototype =
-        SpanPrototype.builder()
-            .initComponentOnly("netty")
-            .initKind(Tags.SPAN_KIND_SERVER)
-            .initTag(DDTags.LANGUAGE_TAG_KEY, DDTags.LANGUAGE_TAG_VALUE)
-            .initTag(ANALYTICS)
-            .build();
-  }
+    @Setup(Level.Trial)
+    public void setUp() {
+        // Baked once — the same constants, composed through the builder.
+        prototype = SpanPrototype.builder()
+                .initComponentOnly("netty")
+                .initKind(Tags.SPAN_KIND_SERVER)
+                .initTag(DDTags.LANGUAGE_TAG_KEY, DDTags.LANGUAGE_TAG_VALUE)
+                .initTag(ANALYTICS)
+                .build();
+    }
 
-  @Benchmark
-  public TagMap oldPerSpanStamps() {
-    TagMap tags = TagMap.create();
-    tags.set(COMPONENT);
-    tags.set(KIND);
-    tags.set(LANGUAGE);
-    tags.set(ANALYTICS);
-    return tags;
-  }
+    @Benchmark
+    public TagMap oldPerSpanStamps() {
+        TagMap tags = TagMap.create();
+        tags.set(COMPONENT);
+        tags.set(KIND);
+        tags.set(LANGUAGE);
+        tags.set(ANALYTICS);
+        return tags;
+    }
 
-  @Benchmark
-  public TagMap newBulkApply() {
-    TagMap tags = TagMap.create();
-    tags.putAll(prototype.tags());
-    return tags;
-  }
+    @Benchmark
+    public TagMap newBulkApply() {
+        TagMap tags = TagMap.create();
+        tags.putAll(prototype.tags());
+        return tags;
+    }
 
-  @Benchmark
-  public TagMap newConstructionSeed() {
-    return prototype.tags().copy();
-  }
+    @Benchmark
+    public TagMap newConstructionSeed() {
+        return prototype.tags().copy();
+    }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/api/TagMapAccessBenchmark.java b/internal-api/src/jmh/java/datadog/trace/api/TagMapAccessBenchmark.java
index de33c957e9a..c88534bc6ab 100644
--- a/internal-api/src/jmh/java/datadog/trace/api/TagMapAccessBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/api/TagMapAccessBenchmark.java
@@ -65,104 +65,104 @@
 @Threads(8)
 @State(Scope.Benchmark)
 public class TagMapAccessBenchmark {
-  // a representative HTTP-server-ish tag set (immutable -> safe to share across threads)
-  static final String[] NAMES = {
-    "http.request.method",
-    "http.response.status_code",
-    "http.route",
-    "url.path",
-    "url.scheme",
-    "server.address",
-    "server.port",
-    "client.address",
-    "network.protocol.version",
-    "user_agent.original",
-    "span.kind",
-    "component",
-    "language",
-    "error",
-    "resource.name",
-    "service.name",
-    "operation.name",
-    "env",
-  };
+    // a representative HTTP-server-ish tag set (immutable -> safe to share across threads)
+    static final String[] NAMES = {
+        "http.request.method",
+        "http.response.status_code",
+        "http.route",
+        "url.path",
+        "url.scheme",
+        "server.address",
+        "server.port",
+        "client.address",
+        "network.protocol.version",
+        "user_agent.original",
+        "span.kind",
+        "component",
+        "language",
+        "error",
+        "resource.name",
+        "service.name",
+        "operation.name",
+        "env",
+    };
 
-  static final Object[] VALUES = new Object[NAMES.length];
+    static final Object[] VALUES = new Object[NAMES.length];
 
-  static {
-    for (int i = 0; i < NAMES.length; ++i) {
-      VALUES[i] = "value-" + i;
+    static {
+        for (int i = 0; i < NAMES.length; ++i) {
+            VALUES[i] = "value-" + i;
+        }
     }
-  }
 
-  /**
-   * Pre-populated read map, PER-THREAD ({@code Scope.Thread}): each thread owns its own map so
-   * reads don't contend on shared mutable state under {@code @Threads(8)}.
-   */
-  @State(Scope.Thread)
-  public static class ReadMap {
-    TagMap map;
+    /**
+     * Pre-populated read map, PER-THREAD ({@code Scope.Thread}): each thread owns its own map so
+     * reads don't contend on shared mutable state under {@code @Threads(8)}.
+     */
+    @State(Scope.Thread)
+    public static class ReadMap {
+        TagMap map;
 
-    @Setup(Level.Trial)
-    public void build() {
-      this.map = TagMap.create();
-      for (int i = 0; i < NAMES.length; ++i) {
-        this.map.set(NAMES[i], VALUES[i]);
-      }
+        @Setup(Level.Trial)
+        public void build() {
+            this.map = TagMap.create();
+            for (int i = 0; i < NAMES.length; ++i) {
+                this.map.set(NAMES[i], VALUES[i]);
+            }
+        }
     }
-  }
 
-  @Benchmark
-  public TagMap insert() {
-    TagMap map = TagMap.create();
-    for (int i = 0; i < NAMES.length; ++i) {
-      map.set(NAMES[i], VALUES[i]);
+    @Benchmark
+    public TagMap insert() {
+        TagMap map = TagMap.create();
+        for (int i = 0; i < NAMES.length; ++i) {
+            map.set(NAMES[i], VALUES[i]);
+        }
+        return map;
     }
-    return map;
-  }
 
-  @Benchmark
-  public TagMap insert_via_ledger() {
-    TagMap.Ledger ledger = TagMap.ledger();
-    for (int i = 0; i < NAMES.length; ++i) {
-      ledger.set(NAMES[i], VALUES[i]);
+    @Benchmark
+    public TagMap insert_via_ledger() {
+        TagMap.Ledger ledger = TagMap.ledger();
+        for (int i = 0; i < NAMES.length; ++i) {
+            ledger.set(NAMES[i], VALUES[i]);
+        }
+        return ledger.build();
     }
-    return ledger.build();
-  }
 
-  @Benchmark
-  public Map<String, Object> insert_hashMap() {
-    HashMap<String, Object> map = new HashMap<>();
-    for (int i = 0; i < NAMES.length; ++i) {
-      map.put(NAMES[i], VALUES[i]);
+    @Benchmark
+    public Map<String, Object> insert_hashMap() {
+        HashMap<String, Object> map = new HashMap<>();
+        for (int i = 0; i < NAMES.length; ++i) {
+            map.put(NAMES[i], VALUES[i]);
+        }
+        return map;
     }
-    return map;
-  }
 
-  /**
-   * Models the builder idiom for HashMap: accumulate into a staging map, then defensively copy. Two
-   * allocations, two fill passes — the honest cost of a HashMap-based builder pattern.
-   */
-  @Benchmark
-  public Map<String, Object> insert_hashMap_builderStyle() {
-    HashMap<String, Object> staging = new HashMap<>();
-    for (int i = 0; i < NAMES.length; ++i) {
-      staging.put(NAMES[i], VALUES[i]);
+    /**
+     * Models the builder idiom for HashMap: accumulate into a staging map, then defensively copy. Two
+     * allocations, two fill passes — the honest cost of a HashMap-based builder pattern.
+     */
+    @Benchmark
+    public Map<String, Object> insert_hashMap_builderStyle() {
+        HashMap<String, Object> staging = new HashMap<>();
+        for (int i = 0; i < NAMES.length; ++i) {
+            staging.put(NAMES[i], VALUES[i]);
+        }
+        return new HashMap<>(staging);
     }
-    return new HashMap<>(staging);
-  }
 
-  @Benchmark
-  public void getObject(ReadMap rm, Blackhole bh) {
-    for (int i = 0; i < NAMES.length; ++i) {
-      bh.consume(rm.map.getObject(NAMES[i]));
+    @Benchmark
+    public void getObject(ReadMap rm, Blackhole bh) {
+        for (int i = 0; i < NAMES.length; ++i) {
+            bh.consume(rm.map.getObject(NAMES[i]));
+        }
     }
-  }
 
-  @Benchmark
-  public void getEntry(ReadMap rm, Blackhole bh) {
-    for (int i = 0; i < NAMES.length; ++i) {
-      bh.consume(rm.map.getEntry(NAMES[i]).objectValue());
+    @Benchmark
+    public void getEntry(ReadMap rm, Blackhole bh) {
+        for (int i = 0; i < NAMES.length; ++i) {
+            bh.consume(rm.map.getEntry(NAMES[i]).objectValue());
+        }
     }
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/api/sampling/AdaptiveSamplerBenchmark.java b/internal-api/src/jmh/java/datadog/trace/api/sampling/AdaptiveSamplerBenchmark.java
index a425c813f69..d6004b38a67 100644
--- a/internal-api/src/jmh/java/datadog/trace/api/sampling/AdaptiveSamplerBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/api/sampling/AdaptiveSamplerBenchmark.java
@@ -25,37 +25,36 @@
 @State(Scope.Benchmark)
 public class AdaptiveSamplerBenchmark {
 
-  public static final int ITERATION_TIME_MILLIS = 1000;
-  public static final int BUDGET_LOOKBACK = 16;
-
-  @Param("5000")
-  int samplesPerWindow;
-
-  @Param("500")
-  long durationWindowMillis;
-
-  private AdaptiveSampler sampler;
-
-  @Setup(Level.Iteration)
-  public void setup() {
-    int averageLookback = (int) (ITERATION_TIME_MILLIS / durationWindowMillis);
-    sampler =
-        new AdaptiveSampler(
-            Duration.of(durationWindowMillis, ChronoUnit.MILLIS),
-            samplesPerWindow,
-            averageLookback,
-            BUDGET_LOOKBACK,
-            true);
-  }
-
-  @Threads(4)
-  @Benchmark
-  public boolean sample(SamplerCounters counters) {
-    boolean sampled = sampler.sample();
-    if (sampled) {
-      ++counters.sampled;
+    public static final int ITERATION_TIME_MILLIS = 1000;
+    public static final int BUDGET_LOOKBACK = 16;
+
+    @Param("5000")
+    int samplesPerWindow;
+
+    @Param("500")
+    long durationWindowMillis;
+
+    private AdaptiveSampler sampler;
+
+    @Setup(Level.Iteration)
+    public void setup() {
+        int averageLookback = (int) (ITERATION_TIME_MILLIS / durationWindowMillis);
+        sampler = new AdaptiveSampler(
+                Duration.of(durationWindowMillis, ChronoUnit.MILLIS),
+                samplesPerWindow,
+                averageLookback,
+                BUDGET_LOOKBACK,
+                true);
+    }
+
+    @Threads(4)
+    @Benchmark
+    public boolean sample(SamplerCounters counters) {
+        boolean sampled = sampler.sample();
+        if (sampled) {
+            ++counters.sampled;
+        }
+        ++counters.tests;
+        return sampled;
     }
-    ++counters.tests;
-    return sampled;
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/api/sampling/SamplerCounters.java b/internal-api/src/jmh/java/datadog/trace/api/sampling/SamplerCounters.java
index a59741a5e6a..a7eba3652fe 100644
--- a/internal-api/src/jmh/java/datadog/trace/api/sampling/SamplerCounters.java
+++ b/internal-api/src/jmh/java/datadog/trace/api/sampling/SamplerCounters.java
@@ -10,24 +10,24 @@
 @AuxCounters(AuxCounters.Type.EVENTS)
 public class SamplerCounters {
 
-  long tests;
-  long sampled;
+    long tests;
+    long sampled;
 
-  public long tests() {
-    return tests;
-  }
+    public long tests() {
+        return tests;
+    }
 
-  public long sampled() {
-    return sampled;
-  }
+    public long sampled() {
+        return sampled;
+    }
 
-  public double sampleRate() {
-    return (double) sampled / tests;
-  }
+    public double sampleRate() {
+        return (double) sampled / tests;
+    }
 
-  @Setup(Level.Iteration)
-  public void reset() {
-    tests = 0;
-    sampled = 0;
-  }
+    @Setup(Level.Iteration)
+    public void reset() {
+        tests = 0;
+        sampled = 0;
+    }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/api/telemetry/LogCollectorBenchmark.java b/internal-api/src/jmh/java/datadog/trace/api/telemetry/LogCollectorBenchmark.java
index 3754ee33fde..21126f3b504 100644
--- a/internal-api/src/jmh/java/datadog/trace/api/telemetry/LogCollectorBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/api/telemetry/LogCollectorBenchmark.java
@@ -15,92 +15,92 @@
 @Measurement(iterations = 5)
 @Threads(8)
 public class LogCollectorBenchmark {
-  @State(Scope.Benchmark)
-  public static class CollectorState {
-    LogCollector collector;
+    @State(Scope.Benchmark)
+    public static class CollectorState {
+        LogCollector collector;
 
-    @Setup(Level.Iteration)
-    public void setup() {
-      collector = new LogCollector(4);
-      collector.addLogMessage("error", "ugh!", null);
+        @Setup(Level.Iteration)
+        public void setup() {
+            collector = new LogCollector(4);
+            collector.addLogMessage("error", "ugh!", null);
+        }
     }
-  }
 
-  @Benchmark
-  public void duplicateWithoutException(CollectorState state) {
-    state.collector.addLogMessage("error", "ugh!", null);
-  }
+    @Benchmark
+    public void duplicateWithoutException(CollectorState state) {
+        state.collector.addLogMessage("error", "ugh!", null);
+    }
 
-  static final Object NULL = null;
+    static final Object NULL = null;
 
-  @Benchmark
-  public void nullPointerException(CollectorState state) {
-    // Represents the fast throw case where the JVM switches to using
-    // a single Exception instance to handle a hot throw location
-    // of NullPointerException, ArrayIndexOutOfBoundsException, etc.
-    // In this case, the stacktrace of the exception will not be available.
-    try {
-      NULL.hashCode();
-    } catch (Throwable t) {
-      state.collector.addLogMessage("error", "npe", t);
+    @Benchmark
+    public void nullPointerException(CollectorState state) {
+        // Represents the fast throw case where the JVM switches to using
+        // a single Exception instance to handle a hot throw location
+        // of NullPointerException, ArrayIndexOutOfBoundsException, etc.
+        // In this case, the stacktrace of the exception will not be available.
+        try {
+            NULL.hashCode();
+        } catch (Throwable t) {
+            state.collector.addLogMessage("error", "npe", t);
+        }
     }
-  }
 
-  @Benchmark
-  public void unsupportedOperationException(CollectorState state) {
-    // Represents the common case where stack trace is preserved
-    // despite hot throw
-    try {
-      unsupportedOperation();
-    } catch (Throwable t) {
-      state.collector.addLogMessage("error", "unsupported", t);
+    @Benchmark
+    public void unsupportedOperationException(CollectorState state) {
+        // Represents the common case where stack trace is preserved
+        // despite hot throw
+        try {
+            unsupportedOperation();
+        } catch (Throwable t) {
+            state.collector.addLogMessage("error", "unsupported", t);
+        }
     }
-  }
 
-  static void unsupportedOperation() {
-    throw new UnsupportedOperationException();
-  }
+    static void unsupportedOperation() {
+        throw new UnsupportedOperationException();
+    }
 
-  /**
-   * Exercises the near-capacity path the other benchmarks skip: capacity is well below the number
-   * of distinct keys in play, so once warmed up the table stays full and most calls miss {@code
-   * find()}'s lock-free scan and fall through to {@code tryReserve} -- including its locked recheck
-   * for a concurrent duplicate. {@link #duplicateWithoutException} and friends only ever hit the
-   * lock-free fast path, so they don't touch that code at all.
-   */
-  @State(Scope.Benchmark)
-  public static class ContendedCollectorState {
-    static final int N_KEYS = 32;
-    static final String[] MESSAGES = new String[N_KEYS];
+    /**
+     * Exercises the near-capacity path the other benchmarks skip: capacity is well below the number
+     * of distinct keys in play, so once warmed up the table stays full and most calls miss {@code
+     * find()}'s lock-free scan and fall through to {@code tryReserve} -- including its locked recheck
+     * for a concurrent duplicate. {@link #duplicateWithoutException} and friends only ever hit the
+     * lock-free fast path, so they don't touch that code at all.
+     */
+    @State(Scope.Benchmark)
+    public static class ContendedCollectorState {
+        static final int N_KEYS = 32;
+        static final String[] MESSAGES = new String[N_KEYS];
 
-    static {
-      for (int i = 0; i < N_KEYS; i++) {
-        MESSAGES[i] = "message-" + i;
-      }
-    }
+        static {
+            for (int i = 0; i < N_KEYS; i++) {
+                MESSAGES[i] = "message-" + i;
+            }
+        }
 
-    LogCollector collector;
+        LogCollector collector;
 
-    @Setup(Level.Iteration)
-    public void setup() {
-      // Capacity well below N_KEYS keeps the table full/near-full once warmed up.
-      collector = new LogCollector(8);
+        @Setup(Level.Iteration)
+        public void setup() {
+            // Capacity well below N_KEYS keeps the table full/near-full once warmed up.
+            collector = new LogCollector(8);
+        }
     }
-  }
 
-  @State(Scope.Thread)
-  public static class KeyCursorState {
-    int cursor;
+    @State(Scope.Thread)
+    public static class KeyCursorState {
+        int cursor;
 
-    int next() {
-      int i = cursor;
-      cursor = (i + 1) % ContendedCollectorState.N_KEYS;
-      return i;
+        int next() {
+            int i = cursor;
+            cursor = (i + 1) % ContendedCollectorState.N_KEYS;
+            return i;
+        }
     }
-  }
 
-  @Benchmark
-  public void variedKeysNearCapacity(ContendedCollectorState state, KeyCursorState cursor) {
-    state.collector.addLogMessage("error", ContendedCollectorState.MESSAGES[cursor.next()], null);
-  }
+    @Benchmark
+    public void variedKeysNearCapacity(ContendedCollectorState state, KeyCursorState cursor) {
+        state.collector.addLogMessage("error", ContendedCollectorState.MESSAGES[cursor.next()], null);
+    }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/bootstrap/instrumentation/api/URIUtilsDecode.java b/internal-api/src/jmh/java/datadog/trace/bootstrap/instrumentation/api/URIUtilsDecode.java
index b03339fbdb6..ad79f908d53 100644
--- a/internal-api/src/jmh/java/datadog/trace/bootstrap/instrumentation/api/URIUtilsDecode.java
+++ b/internal-api/src/jmh/java/datadog/trace/bootstrap/instrumentation/api/URIUtilsDecode.java
@@ -9,11 +9,11 @@
 @State(Scope.Benchmark)
 public class URIUtilsDecode {
 
-  @Param({"/some/relatively/long/unencoded/path", "/n%C3%A5gon/relativt/l%C3%A5ng/kodad/v%C3%A4g"})
-  String encoded;
+    @Param({"/some/relatively/long/unencoded/path", "/n%C3%A5gon/relativt/l%C3%A5ng/kodad/v%C3%A4g"})
+    String encoded;
 
-  @Benchmark
-  public void decode(Blackhole blackhole) {
-    blackhole.consume(URIUtils.decode(encoded));
-  }
+    @Benchmark
+    public void decode(Blackhole blackhole) {
+        blackhole.consume(URIUtils.decode(encoded));
+    }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/AtomicsBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/AtomicsBenchmark.java
index b1a7f0d26c1..897706d60cd 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/AtomicsBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/AtomicsBenchmark.java
@@ -60,113 +60,109 @@
 @Measurement(iterations = 3)
 @Threads(8)
 public class AtomicsBenchmark {
-  static int SIZE = 32;
+    static int SIZE = 32;
 
-  static final class AtomicHolder {
-    final AtomicInteger atomic;
+    static final class AtomicHolder {
+        final AtomicInteger atomic;
 
-    AtomicHolder(int num) {
-      this.atomic = new AtomicInteger(num);
+        AtomicHolder(int num) {
+            this.atomic = new AtomicInteger(num);
+        }
+
+        int get() {
+            return this.atomic.get();
+        }
+
+        int incrementAndGet() {
+            return this.atomic.incrementAndGet();
+        }
     }
 
-    int get() {
-      return this.atomic.get();
+    static final class FieldHolder {
+        static final AtomicIntegerFieldUpdater<FieldHolder> AFU_FIELD =
+                AtomicIntegerFieldUpdater.newUpdater(FieldHolder.class, "field");
+
+        volatile int field;
+
+        FieldHolder(int num) {
+            this.field = num;
+        }
+
+        int getVolatile() {
+            return this.field;
+        }
+
+        int get() {
+            return AFU_FIELD.get(this);
+        }
+
+        int incrementAndGet() {
+            return AFU_FIELD.incrementAndGet(this);
+        }
     }
 
-    int incrementAndGet() {
-      return this.atomic.incrementAndGet();
+    static final AtomicHolder[] atomicHolders = init(() -> {
+        AtomicHolder[] holders = new AtomicHolder[SIZE];
+        for (int i = 0; i < holders.length; ++i) {
+            holders[i] = new AtomicHolder(i * 2);
+        }
+        return holders;
+    });
+
+    static final FieldHolder[] fieldHolders = init(() -> {
+        FieldHolder[] holders = new FieldHolder[SIZE];
+        for (int i = 0; i < holders.length; ++i) {
+            holders[i] = new FieldHolder(i * 2);
+        }
+        return holders;
+    });
+
+    static final <T> T init(Supplier<T> supplier) {
+        return supplier.get();
     }
-  }
 
-  static final class FieldHolder {
-    static final AtomicIntegerFieldUpdater<FieldHolder> AFU_FIELD =
-        AtomicIntegerFieldUpdater.newUpdater(FieldHolder.class, "field");
+    @State(Scope.Thread)
+    public static class BenchmarkState {
+        int index = 0;
 
-    volatile int field;
+        <T> T next(T[] holders) {
+            if (++index >= holders.length) index = 0;
+            return holders[index];
+        }
+    }
+
+    @Benchmark
+    public Object atomic_construction() {
+        return new AtomicHolder(0);
+    }
 
-    FieldHolder(int num) {
-      this.field = num;
+    @Benchmark
+    public int atomic_incrementAndGet(BenchmarkState state) {
+        return state.next(atomicHolders).incrementAndGet();
     }
 
-    int getVolatile() {
-      return this.field;
+    @Benchmark
+    public Object atomic_read(BenchmarkState state) {
+        return state.next(atomicHolders).get();
     }
 
-    int get() {
-      return AFU_FIELD.get(this);
+    @Benchmark
+    public Object atomicFieldUpdater_construction() {
+        return new FieldHolder(0);
     }
 
-    int incrementAndGet() {
-      return AFU_FIELD.incrementAndGet(this);
+    @Benchmark
+    public Object atomicFieldUpdater_getVolatile(BenchmarkState state) {
+        return state.next(fieldHolders).getVolatile();
     }
-  }
-
-  static final AtomicHolder[] atomicHolders =
-      init(
-          () -> {
-            AtomicHolder[] holders = new AtomicHolder[SIZE];
-            for (int i = 0; i < holders.length; ++i) {
-              holders[i] = new AtomicHolder(i * 2);
-            }
-            return holders;
-          });
-
-  static final FieldHolder[] fieldHolders =
-      init(
-          () -> {
-            FieldHolder[] holders = new FieldHolder[SIZE];
-            for (int i = 0; i < holders.length; ++i) {
-              holders[i] = new FieldHolder(i * 2);
-            }
-            return holders;
-          });
-
-  static final <T> T init(Supplier<T> supplier) {
-    return supplier.get();
-  }
-
-  @State(Scope.Thread)
-  public static class BenchmarkState {
-    int index = 0;
-
-    <T> T next(T[] holders) {
-      if (++index >= holders.length) index = 0;
-      return holders[index];
+
+    @Benchmark
+    public Object atomicFieldUpdater_get(BenchmarkState state) {
+        return state.next(fieldHolders).get();
+    }
+
+    @Benchmark
+    public int atomicFieldUpdater_incrementAndGet(BenchmarkState state) {
+        return state.next(fieldHolders).incrementAndGet();
     }
-  }
-
-  @Benchmark
-  public Object atomic_construction() {
-    return new AtomicHolder(0);
-  }
-
-  @Benchmark
-  public int atomic_incrementAndGet(BenchmarkState state) {
-    return state.next(atomicHolders).incrementAndGet();
-  }
-
-  @Benchmark
-  public Object atomic_read(BenchmarkState state) {
-    return state.next(atomicHolders).get();
-  }
-
-  @Benchmark
-  public Object atomicFieldUpdater_construction() {
-    return new FieldHolder(0);
-  }
-
-  @Benchmark
-  public Object atomicFieldUpdater_getVolatile(BenchmarkState state) {
-    return state.next(fieldHolders).getVolatile();
-  }
-
-  @Benchmark
-  public Object atomicFieldUpdater_get(BenchmarkState state) {
-    return state.next(fieldHolders).get();
-  }
-
-  @Benchmark
-  public int atomicFieldUpdater_incrementAndGet(BenchmarkState state) {
-    return state.next(fieldHolders).incrementAndGet();
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/BenchmarkUtils.java b/internal-api/src/jmh/java/datadog/trace/util/BenchmarkUtils.java
index 4aa5ea7556a..add0aba248e 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/BenchmarkUtils.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/BenchmarkUtils.java
@@ -6,54 +6,52 @@
 
 /** Shared setup helpers for JMH benchmarks in this module. */
 public final class BenchmarkUtils {
-  private BenchmarkUtils() {}
-
-  private static final Object[] DEFAULT_DECOY_KEYS = {
-    "decoy", 1, 1L, 1.0d, Boolean.TRUE, new Object()
-  };
-
-  /**
-   * Makes the internal {@code hashCode()} and {@code equals()} call sites of common hash-based
-   * collections megamorphic before measurement.
-   *
-   * <p>HotSpot records receiver classes at each virtual call site. A benchmark using only {@code
-   * String} keys leaves the sites inside these shared implementations monomorphic, allowing C2 to
-   * devirtualize and inline them. Production uses many key types, so the same sites are often
-   * megamorphic and retain virtual dispatch. Exercising several key classes avoids reporting
-   * unrealistically fast collection lookups.
-   */
-  public static void polluteHashDispatch() {
-    polluteHashDispatch(DEFAULT_DECOY_KEYS);
-  }
-
-  public static void polluteHashDispatch(Object... decoyKeys) {
-    populateTypeProfileMutable(new HashSet<>(), decoyKeys);
-    populateTypeProfile(CollectionUtils.tryMakeImmutableSet(Arrays.asList(decoyKeys)), decoyKeys);
-  }
-
-  /**
-   * Exercises {@code contains()} with the default decoy keys.
-   *
-   * <p>Use the collection implementation under test; the instance itself may be a scratch object.
-   * HotSpot stores receiver-type profiles at bytecode call sites, so every instance executing that
-   * implementation contributes to the same internal {@code hashCode()} and {@code equals()}
-   * profiles. The collection may be mutable or immutable.
-   */
-  public static void populateTypeProfile(Collection<Object> populated) {
-    populateTypeProfile(populated, DEFAULT_DECOY_KEYS);
-  }
-
-  public static void populateTypeProfile(Collection<Object> populated, Object... decoyKeys) {
-    for (Object key : decoyKeys) {
-      populated.contains(key);
+    private BenchmarkUtils() {}
+
+    private static final Object[] DEFAULT_DECOY_KEYS = {"decoy", 1, 1L, 1.0d, Boolean.TRUE, new Object()};
+
+    /**
+     * Makes the internal {@code hashCode()} and {@code equals()} call sites of common hash-based
+     * collections megamorphic before measurement.
+     *
+     * <p>HotSpot records receiver classes at each virtual call site. A benchmark using only {@code
+     * String} keys leaves the sites inside these shared implementations monomorphic, allowing C2 to
+     * devirtualize and inline them. Production uses many key types, so the same sites are often
+     * megamorphic and retain virtual dispatch. Exercising several key classes avoids reporting
+     * unrealistically fast collection lookups.
+     */
+    public static void polluteHashDispatch() {
+        polluteHashDispatch(DEFAULT_DECOY_KEYS);
     }
-  }
 
-  /** Exercises {@code add()} and {@code contains()} on a mutable collection. */
-  public static void populateTypeProfileMutable(Collection<Object> scratch, Object... decoyKeys) {
-    for (Object key : decoyKeys) {
-      scratch.add(key);
-      scratch.contains(key);
+    public static void polluteHashDispatch(Object... decoyKeys) {
+        populateTypeProfileMutable(new HashSet<>(), decoyKeys);
+        populateTypeProfile(CollectionUtils.tryMakeImmutableSet(Arrays.asList(decoyKeys)), decoyKeys);
+    }
+
+    /**
+     * Exercises {@code contains()} with the default decoy keys.
+     *
+     * <p>Use the collection implementation under test; the instance itself may be a scratch object.
+     * HotSpot stores receiver-type profiles at bytecode call sites, so every instance executing that
+     * implementation contributes to the same internal {@code hashCode()} and {@code equals()}
+     * profiles. The collection may be mutable or immutable.
+     */
+    public static void populateTypeProfile(Collection<Object> populated) {
+        populateTypeProfile(populated, DEFAULT_DECOY_KEYS);
+    }
+
+    public static void populateTypeProfile(Collection<Object> populated, Object... decoyKeys) {
+        for (Object key : decoyKeys) {
+            populated.contains(key);
+        }
+    }
+
+    /** Exercises {@code add()} and {@code contains()} on a mutable collection. */
+    public static void populateTypeProfileMutable(Collection<Object> scratch, Object... decoyKeys) {
+        for (Object key : decoyKeys) {
+            scratch.add(key);
+            scratch.contains(key);
+        }
     }
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/CaseInsensitiveMapBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/CaseInsensitiveMapBenchmark.java
index 27ffba35fd5..eae7ab11f19 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/CaseInsensitiveMapBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/CaseInsensitiveMapBenchmark.java
@@ -59,267 +59,257 @@
 @Threads(8)
 @State(Scope.Thread)
 public class CaseInsensitiveMapBenchmark {
-  static final String[] PREFIXES = {"foo", "bar", "baz", "quux"};
+    static final String[] PREFIXES = {"foo", "bar", "baz", "quux"};
 
-  static final int NUM_SUFFIXES = 4;
+    static final int NUM_SUFFIXES = 4;
 
-  static <T> T init(Supplier<T> supplier) {
-    return supplier.get();
-  }
+    static <T> T init(Supplier<T> supplier) {
+        return supplier.get();
+    }
+
+    static final String[] UPPER_PREFIXES = init(() -> {
+        String[] upperPrefixes = new String[PREFIXES.length];
+        for (int i = 0; i < PREFIXES.length; ++i) {
+            upperPrefixes[i] = PREFIXES[i].toUpperCase();
+        }
+        return upperPrefixes;
+    });
+
+    static final String[] LOOKUP_KEYS = init(() -> {
+        ThreadLocalRandom curRandom = ThreadLocalRandom.current();
+
+        String[] keys = new String[32];
+        for (int i = 0; i < keys.length; ++i) {
+            int prefixIndex = curRandom.nextInt(PREFIXES.length);
+            boolean toUpper = curRandom.nextBoolean();
+            int suffixIndex = curRandom.nextInt(NUM_SUFFIXES + 1);
+
+            String key = PREFIXES[prefixIndex] + "-" + suffixIndex;
+            keys[i] = toUpper ? key.toUpperCase() : key.toLowerCase();
+        }
+        return keys;
+    });
+
+    // Per-thread (@State(Scope.Thread)) so cycling the lookup key doesn't contend a shared counter.
+    // The maps stay static/shared (read-only after class-init); only the index is per-thread. A
+    // shared
+    // counter's cache-line ping-pong would floor the fastest lookups (the flat probe) at @Threads(8),
+    // masking exactly the differences this benchmark compares.
+    int lookupIndex = 0;
+
+    String nextLookupKey() {
+        int localIndex = ++lookupIndex;
+        if (localIndex >= LOOKUP_KEYS.length) {
+            lookupIndex = localIndex = 0;
+        }
+        return LOOKUP_KEYS[localIndex];
+    }
 
-  static final String[] UPPER_PREFIXES =
-      init(
-          () -> {
-            String[] upperPrefixes = new String[PREFIXES.length];
-            for (int i = 0; i < PREFIXES.length; ++i) {
-              upperPrefixes[i] = PREFIXES[i].toUpperCase();
+    @Benchmark
+    public void create_baseline(Blackhole blackhole) {
+        for (int suffix = 0; suffix < NUM_SUFFIXES; ++suffix) {
+            for (String prefix : PREFIXES) {
+                blackhole.consume(prefix + "-" + suffix);
+                blackhole.consume(Integer.valueOf(suffix));
             }
-            return upperPrefixes;
-          });
-
-  static final String[] LOOKUP_KEYS =
-      init(
-          () -> {
-            ThreadLocalRandom curRandom = ThreadLocalRandom.current();
-
-            String[] keys = new String[32];
-            for (int i = 0; i < keys.length; ++i) {
-              int prefixIndex = curRandom.nextInt(PREFIXES.length);
-              boolean toUpper = curRandom.nextBoolean();
-              int suffixIndex = curRandom.nextInt(NUM_SUFFIXES + 1);
-
-              String key = PREFIXES[prefixIndex] + "-" + suffixIndex;
-              keys[i] = toUpper ? key.toUpperCase() : key.toLowerCase();
+        }
+        for (int suffix = 0; suffix < NUM_SUFFIXES; suffix += 2) {
+            for (String prefix : UPPER_PREFIXES) {
+                blackhole.consume(prefix + "-" + suffix);
+                blackhole.consume(Integer.valueOf(suffix + 1));
             }
-            return keys;
-          });
-
-  // Per-thread (@State(Scope.Thread)) so cycling the lookup key doesn't contend a shared counter.
-  // The maps stay static/shared (read-only after class-init); only the index is per-thread. A
-  // shared
-  // counter's cache-line ping-pong would floor the fastest lookups (the flat probe) at @Threads(8),
-  // masking exactly the differences this benchmark compares.
-  int lookupIndex = 0;
-
-  String nextLookupKey() {
-    int localIndex = ++lookupIndex;
-    if (localIndex >= LOOKUP_KEYS.length) {
-      lookupIndex = localIndex = 0;
-    }
-    return LOOKUP_KEYS[localIndex];
-  }
-
-  @Benchmark
-  public void create_baseline(Blackhole blackhole) {
-    for (int suffix = 0; suffix < NUM_SUFFIXES; ++suffix) {
-      for (String prefix : PREFIXES) {
-        blackhole.consume(prefix + "-" + suffix);
-        blackhole.consume(Integer.valueOf(suffix));
-      }
+        }
     }
-    for (int suffix = 0; suffix < NUM_SUFFIXES; suffix += 2) {
-      for (String prefix : UPPER_PREFIXES) {
-        blackhole.consume(prefix + "-" + suffix);
-        blackhole.consume(Integer.valueOf(suffix + 1));
-      }
-    }
-  }
-
-  @Benchmark
-  public void lookup_baseline(Blackhole blackhole) {
-    blackhole.consume(nextLookupKey());
-  }
-
-  @Benchmark
-  public HashMap<String, Integer> create_hashMap() {
-    return _create_hashMap();
-  }
-
-  static HashMap<String, Integer> _create_hashMap() {
-    HashMap<String, Integer> map = new HashMap<>();
-    for (int suffix = 0; suffix < NUM_SUFFIXES; ++suffix) {
-      for (String prefix : PREFIXES) {
-        map.put(
-            (prefix + "-" + suffix).toLowerCase(),
-            suffix); // arguable, but real caller probably doesn't know the case ahead-of-time
-      }
+
+    @Benchmark
+    public void lookup_baseline(Blackhole blackhole) {
+        blackhole.consume(nextLookupKey());
     }
-    for (int suffix = 0; suffix < NUM_SUFFIXES; suffix += 2) {
-      for (String prefix : UPPER_PREFIXES) {
-        map.put((prefix + "-" + suffix).toLowerCase(), suffix + 1);
-      }
+
+    @Benchmark
+    public HashMap<String, Integer> create_hashMap() {
+        return _create_hashMap();
     }
-    return map;
-  }
-
-  static final HashMap<String, Integer> HASH_MAP = _create_hashMap();
-
-  @Benchmark
-  public Integer lookup_hashMap() {
-    // This benchmark is still "correct" in multi-threaded context,
-    // Map is populated under the class initialization lock and not changed thereafter
-    return HASH_MAP.get(nextLookupKey().toLowerCase());
-  }
-
-  @Benchmark
-  public TreeMap<String, Integer> create_treeMap() {
-    return _create_treeMap();
-  }
-
-  static TreeMap<String, Integer> _create_treeMap() {
-    TreeMap<String, Integer> map = new TreeMap<>(String::compareToIgnoreCase);
-    for (int suffix = 0; suffix < NUM_SUFFIXES; ++suffix) {
-      for (String prefix : PREFIXES) {
-        map.put(prefix + "-" + suffix, suffix);
-      }
+
+    static HashMap<String, Integer> _create_hashMap() {
+        HashMap<String, Integer> map = new HashMap<>();
+        for (int suffix = 0; suffix < NUM_SUFFIXES; ++suffix) {
+            for (String prefix : PREFIXES) {
+                map.put(
+                        (prefix + "-" + suffix).toLowerCase(),
+                        suffix); // arguable, but real caller probably doesn't know the case ahead-of-time
+            }
+        }
+        for (int suffix = 0; suffix < NUM_SUFFIXES; suffix += 2) {
+            for (String prefix : UPPER_PREFIXES) {
+                map.put((prefix + "-" + suffix).toLowerCase(), suffix + 1);
+            }
+        }
+        return map;
     }
-    for (int suffix = 0; suffix < NUM_SUFFIXES; suffix += 2) {
-      for (String prefix : UPPER_PREFIXES) {
-        map.put(prefix + "-" + suffix, suffix + 1);
-      }
+
+    static final HashMap<String, Integer> HASH_MAP = _create_hashMap();
+
+    @Benchmark
+    public Integer lookup_hashMap() {
+        // This benchmark is still "correct" in multi-threaded context,
+        // Map is populated under the class initialization lock and not changed thereafter
+        return HASH_MAP.get(nextLookupKey().toLowerCase());
     }
-    return map;
-  }
-
-  static final TreeMap<String, Integer> TREE_MAP = _create_treeMap();
-
-  @Benchmark
-  public Integer lookup_treeMap() {
-    // This benchmark is still "correct" in multi-threaded context,
-    // Map is populated under the initial class initialization lock and not changed thereafter
-    return TREE_MAP.get(nextLookupKey());
-  }
-
-  // FlatHashtable with a case-insensitive KeyStrategy: the strategy folds case inside hash/matches,
-  // so lookups are O(1) (single probe) AND allocation-free (no String::to<X>Case) — TreeMap's zero-
-  // alloc property without TreeMap's O(log n) comparison walk. Value is stored unboxed. Read-only
-  // after build, so reads are lock-free (see FlatHashtable / ThreadSafeMapBenchmark).
-  static final class CIEntry extends FlatHashtable.Entry {
-    final String key; // original case preserved
-    int value; // mutable: the collision loop below overwrites it on a hit, mirroring put()
-
-    CIEntry(String key, long hash, int value) {
-      super(hash); // cache the (char-by-char) case-insensitive hash
-      this.key = key;
-      this.value = value;
+
+    @Benchmark
+    public TreeMap<String, Integer> create_treeMap() {
+        return _create_treeMap();
     }
-  }
 
-  // Dogfoods the shared toolbox pieces: the CI hash is Strings.caseInsensitiveHashCode (sealed by
-  // CaseInsensitiveStringStrategy), the table owns the spread. Only matches/hashOf are bespoke.
-  static final class CaseInsensitiveKeyStrategy
-      extends FlatHashtable.CaseInsensitiveStringStrategy<CIEntry> {
-    static final CaseInsensitiveKeyStrategy INSTANCE = new CaseInsensitiveKeyStrategy();
+    static TreeMap<String, Integer> _create_treeMap() {
+        TreeMap<String, Integer> map = new TreeMap<>(String::compareToIgnoreCase);
+        for (int suffix = 0; suffix < NUM_SUFFIXES; ++suffix) {
+            for (String prefix : PREFIXES) {
+                map.put(prefix + "-" + suffix, suffix);
+            }
+        }
+        for (int suffix = 0; suffix < NUM_SUFFIXES; suffix += 2) {
+            for (String prefix : UPPER_PREFIXES) {
+                map.put(prefix + "-" + suffix, suffix + 1);
+            }
+        }
+        return map;
+    }
 
-    private CaseInsensitiveKeyStrategy() {}
+    static final TreeMap<String, Integer> TREE_MAP = _create_treeMap();
 
-    @Override
-    public boolean matches(CIEntry entry, String key) {
-      return key.equalsIgnoreCase(entry.key); // case-folded, allocation-free
+    @Benchmark
+    public Integer lookup_treeMap() {
+        // This benchmark is still "correct" in multi-threaded context,
+        // Map is populated under the initial class initialization lock and not changed thereafter
+        return TREE_MAP.get(nextLookupKey());
     }
 
-    @Override
-    public long hashOf(CIEntry entry) {
-      return entry.hash; // CIEntry caches its (raw, case-insensitive) hash
+    // FlatHashtable with a case-insensitive KeyStrategy: the strategy folds case inside hash/matches,
+    // so lookups are O(1) (single probe) AND allocation-free (no String::to<X>Case) — TreeMap's zero-
+    // alloc property without TreeMap's O(log n) comparison walk. Value is stored unboxed. Read-only
+    // after build, so reads are lock-free (see FlatHashtable / ThreadSafeMapBenchmark).
+    static final class CIEntry extends FlatHashtable.Entry {
+        final String key; // original case preserved
+        int value; // mutable: the collision loop below overwrites it on a hit, mirroring put()
+
+        CIEntry(String key, long hash, int value) {
+            super(hash); // cache the (char-by-char) case-insensitive hash
+            this.key = key;
+            this.value = value;
+        }
     }
-  }
-
-  // Never fires here (the mirror loop below only hits already-present keys), so it neither
-  // allocates nor captures; the value is unused. Kept static/non-capturing to avoid per-call cost.
-  static final FlatHashtable.CreateStrategy<CIEntry, String> CI_CREATE =
-      key -> new CIEntry(key, CaseInsensitiveKeyStrategy.INSTANCE.hashKey(key), 0);
-
-  // Unused decoys, loaded only so CaseInsensitiveStringStrategy<CIEntry> has a second concrete
-  // subtype by the time lookup_flatHashtable warms up -- otherwise CaseInsensitiveKeyStrategy is
-  // the *only* implementor ever loaded, and C2 devirtualizes matches()/hashOf() off a CHA
-  // dependency (abstract_with_unique_concrete_subtype) rather than the exact-type propagation the
-  // benchmark is meant to be exercising. Mirrors the CHA_DEFEAT pattern in
-  // SingleThreadedMapBenchmark. Each decoy overrides a different method so both call sites lose
-  // their CHA guarantee.
-  static final class DecoyMatchStrategy
-      extends FlatHashtable.CaseInsensitiveStringStrategy<CIEntry> {
-    static final DecoyMatchStrategy INSTANCE = new DecoyMatchStrategy();
-
-    @Override
-    public boolean matches(CIEntry entry, String key) {
-      return false;
+
+    // Dogfoods the shared toolbox pieces: the CI hash is Strings.caseInsensitiveHashCode (sealed by
+    // CaseInsensitiveStringStrategy), the table owns the spread. Only matches/hashOf are bespoke.
+    static final class CaseInsensitiveKeyStrategy extends FlatHashtable.CaseInsensitiveStringStrategy<CIEntry> {
+        static final CaseInsensitiveKeyStrategy INSTANCE = new CaseInsensitiveKeyStrategy();
+
+        private CaseInsensitiveKeyStrategy() {}
+
+        @Override
+        public boolean matches(CIEntry entry, String key) {
+            return key.equalsIgnoreCase(entry.key); // case-folded, allocation-free
+        }
+
+        @Override
+        public long hashOf(CIEntry entry) {
+            return entry.hash; // CIEntry caches its (raw, case-insensitive) hash
+        }
     }
 
-    @Override
-    public long hashOf(CIEntry entry) {
-      return entry.hash;
+    // Never fires here (the mirror loop below only hits already-present keys), so it neither
+    // allocates nor captures; the value is unused. Kept static/non-capturing to avoid per-call cost.
+    static final FlatHashtable.CreateStrategy<CIEntry, String> CI_CREATE =
+            key -> new CIEntry(key, CaseInsensitiveKeyStrategy.INSTANCE.hashKey(key), 0);
+
+    // Unused decoys, loaded only so CaseInsensitiveStringStrategy<CIEntry> has a second concrete
+    // subtype by the time lookup_flatHashtable warms up -- otherwise CaseInsensitiveKeyStrategy is
+    // the *only* implementor ever loaded, and C2 devirtualizes matches()/hashOf() off a CHA
+    // dependency (abstract_with_unique_concrete_subtype) rather than the exact-type propagation the
+    // benchmark is meant to be exercising. Mirrors the CHA_DEFEAT pattern in
+    // SingleThreadedMapBenchmark. Each decoy overrides a different method so both call sites lose
+    // their CHA guarantee.
+    static final class DecoyMatchStrategy extends FlatHashtable.CaseInsensitiveStringStrategy<CIEntry> {
+        static final DecoyMatchStrategy INSTANCE = new DecoyMatchStrategy();
+
+        @Override
+        public boolean matches(CIEntry entry, String key) {
+            return false;
+        }
+
+        @Override
+        public long hashOf(CIEntry entry) {
+            return entry.hash;
+        }
     }
-  }
 
-  static final class DecoyHashStrategy
-      extends FlatHashtable.CaseInsensitiveStringStrategy<CIEntry> {
-    static final DecoyHashStrategy INSTANCE = new DecoyHashStrategy();
+    static final class DecoyHashStrategy extends FlatHashtable.CaseInsensitiveStringStrategy<CIEntry> {
+        static final DecoyHashStrategy INSTANCE = new DecoyHashStrategy();
+
+        @Override
+        public boolean matches(CIEntry entry, String key) {
+            return key.equalsIgnoreCase(entry.key);
+        }
+
+        @Override
+        public long hashOf(CIEntry entry) {
+            return 0L;
+        }
+    }
 
-    @Override
-    public boolean matches(CIEntry entry, String key) {
-      return key.equalsIgnoreCase(entry.key);
+    static final Object[] CHA_DEFEAT = {
+        CaseInsensitiveKeyStrategy.INSTANCE, DecoyMatchStrategy.INSTANCE, DecoyHashStrategy.INSTANCE
+    };
+
+    static CIEntry[] _create_flat(float loadFactor) {
+        // 16 distinct case-insensitive keys (foo-0..quux-3).
+        CIEntry[] table = FlatHashtable.create(CIEntry.class, PREFIXES.length * NUM_SUFFIXES, loadFactor);
+        for (int suffix = 0; suffix < NUM_SUFFIXES; ++suffix) {
+            for (String prefix : PREFIXES) {
+                String key = prefix + "-" + suffix;
+                long hash = CaseInsensitiveKeyStrategy.INSTANCE.hashKey(key);
+                FlatHashtable.insert(table, new CIEntry(key, hash, suffix), CaseInsensitiveKeyStrategy.INSTANCE);
+            }
+        }
+        // Mirror the HashMap/TreeMap builds' second loop (UPPER_PREFIXES, suffix 0 & 2): 8 case-
+        // insensitive collisions. getOrCreate finds the already-present lower-case entry (a hit -> the
+        // create never fires, nothing allocates) and then the value is overwritten explicitly -- getOr-
+        // Create itself never updates an existing entry, so without this the FlatHashtable arm would do
+        // less work (and end up with different final values) than the maps' overwriting put(), a false
+        // performance advantage. With the overwrite, all three create arms perform the same 24
+        // operations and end up with the same final values.
+        for (int suffix = 0; suffix < NUM_SUFFIXES; suffix += 2) {
+            for (String prefix : UPPER_PREFIXES) {
+                String key = prefix + "-" + suffix;
+                CIEntry entry = FlatHashtable.getOrCreate(table, key, CaseInsensitiveKeyStrategy.INSTANCE, CI_CREATE);
+                entry.value = suffix + 1;
+            }
+        }
+        return table;
     }
 
-    @Override
-    public long hashOf(CIEntry entry) {
-      return 0L;
+    @Benchmark
+    public CIEntry[] create_flatHashtable() {
+        return _create_flat(FlatHashtable.DEFAULT_LOAD_FACTOR);
     }
-  }
-
-  static final Object[] CHA_DEFEAT = {
-    CaseInsensitiveKeyStrategy.INSTANCE, DecoyMatchStrategy.INSTANCE, DecoyHashStrategy.INSTANCE
-  };
-
-  static CIEntry[] _create_flat(float loadFactor) {
-    // 16 distinct case-insensitive keys (foo-0..quux-3).
-    CIEntry[] table =
-        FlatHashtable.create(CIEntry.class, PREFIXES.length * NUM_SUFFIXES, loadFactor);
-    for (int suffix = 0; suffix < NUM_SUFFIXES; ++suffix) {
-      for (String prefix : PREFIXES) {
-        String key = prefix + "-" + suffix;
-        long hash = CaseInsensitiveKeyStrategy.INSTANCE.hashKey(key);
-        FlatHashtable.insert(
-            table, new CIEntry(key, hash, suffix), CaseInsensitiveKeyStrategy.INSTANCE);
-      }
+
+    static final CIEntry[] FLAT_TABLE = _create_flat(FlatHashtable.DEFAULT_LOAD_FACTOR);
+    static final CIEntry[] FLAT_TABLE_LOW = _create_flat(FlatHashtable.LOW_LOAD_FACTOR);
+
+    @Benchmark
+    public CIEntry lookup_flatHashtable() {
+        // Lock-free, allocation-free, single-probe case-insensitive lookup.
+        return FlatHashtable.get(FLAT_TABLE, nextLookupKey(), CaseInsensitiveKeyStrategy.INSTANCE);
     }
-    // Mirror the HashMap/TreeMap builds' second loop (UPPER_PREFIXES, suffix 0 & 2): 8 case-
-    // insensitive collisions. getOrCreate finds the already-present lower-case entry (a hit -> the
-    // create never fires, nothing allocates) and then the value is overwritten explicitly -- getOr-
-    // Create itself never updates an existing entry, so without this the FlatHashtable arm would do
-    // less work (and end up with different final values) than the maps' overwriting put(), a false
-    // performance advantage. With the overwrite, all three create arms perform the same 24
-    // operations and end up with the same final values.
-    for (int suffix = 0; suffix < NUM_SUFFIXES; suffix += 2) {
-      for (String prefix : UPPER_PREFIXES) {
-        String key = prefix + "-" + suffix;
-        CIEntry entry =
-            FlatHashtable.getOrCreate(table, key, CaseInsensitiveKeyStrategy.INSTANCE, CI_CREATE);
-        entry.value = suffix + 1;
-      }
+
+    @Benchmark
+    public CIEntry lookup_flatHashtable_lowLoad() {
+        // Same, but at LOW_LOAD_FACTOR (4x): does the sparser table shave probes for the (mostly
+        // hash-fold-dominated) CI lookup, or is it a wash? — see the delta to lookup_flatHashtable.
+        return FlatHashtable.get(FLAT_TABLE_LOW, nextLookupKey(), CaseInsensitiveKeyStrategy.INSTANCE);
     }
-    return table;
-  }
-
-  @Benchmark
-  public CIEntry[] create_flatHashtable() {
-    return _create_flat(FlatHashtable.DEFAULT_LOAD_FACTOR);
-  }
-
-  static final CIEntry[] FLAT_TABLE = _create_flat(FlatHashtable.DEFAULT_LOAD_FACTOR);
-  static final CIEntry[] FLAT_TABLE_LOW = _create_flat(FlatHashtable.LOW_LOAD_FACTOR);
-
-  @Benchmark
-  public CIEntry lookup_flatHashtable() {
-    // Lock-free, allocation-free, single-probe case-insensitive lookup.
-    return FlatHashtable.get(FLAT_TABLE, nextLookupKey(), CaseInsensitiveKeyStrategy.INSTANCE);
-  }
-
-  @Benchmark
-  public CIEntry lookup_flatHashtable_lowLoad() {
-    // Same, but at LOW_LOAD_FACTOR (4x): does the sparser table shave probes for the (mostly
-    // hash-fold-dominated) CI lookup, or is it a wash? — see the delta to lookup_flatHashtable.
-    return FlatHashtable.get(FLAT_TABLE_LOW, nextLookupKey(), CaseInsensitiveKeyStrategy.INSTANCE);
-  }
-
-  // TODO: Add ConcurrentSkipListMap & synchronized HashMap & TreeMap
+
+    // TODO: Add ConcurrentSkipListMap & synchronized HashMap & TreeMap
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/ConcurrentHashtableDrainBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/ConcurrentHashtableDrainBenchmark.java
index 97ee0914e34..de96085cbdb 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/ConcurrentHashtableDrainBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/ConcurrentHashtableDrainBenchmark.java
@@ -58,116 +58,114 @@
 @OutputTimeUnit(MICROSECONDS)
 public class ConcurrentHashtableDrainBenchmark {
 
-  static final int N_KEYS = 32;
-  static final int CAPACITY = 64;
+    static final int N_KEYS = 32;
+    static final int CAPACITY = 64;
 
-  static final long[] KEY_HASHES = new long[N_KEYS];
+    static final long[] KEY_HASHES = new long[N_KEYS];
 
-  static {
-    for (int i = 0; i < N_KEYS; ++i) {
-      KEY_HASHES[i] = LongHashingUtils.hash("key-" + i);
+    static {
+        for (int i = 0; i < N_KEYS; ++i) {
+            KEY_HASHES[i] = LongHashingUtils.hash("key-" + i);
+        }
     }
-  }
 
-  static final class DrainEntry extends ConcurrentHashtable.Entry<DrainEntry> {
-    DrainEntry(long keyHash) {
-      super(keyHash);
-    }
+    static final class DrainEntry extends ConcurrentHashtable.Entry<DrainEntry> {
+        DrainEntry(long keyHash) {
+            super(keyHash);
+        }
 
-    @Override
-    public boolean matches(@Nonnull DrainEntry other) {
-      // hashIterator already filters candidates by keyHash equality before yielding them.
-      return true;
+        @Override
+        public boolean matches(@Nonnull DrainEntry other) {
+            // hashIterator already filters candidates by keyHash equality before yielding them.
+            return true;
+        }
     }
-  }
-
-  /**
-   * The pre-PR strategy: one lock acquisition held for the entire bucket-array sweep, still
-   * releasing capacity per-entry (only lock granularity differs from the current {@code drain()}).
-   */
-  private static <TEntry extends ConcurrentHashtable.Entry<TEntry>> void drainWholeSweepLock(
-      @Nonnull ConcurrentHashtable.State<TEntry> state,
-      @Nonnull Consumer<? super TEntry> drainedEntryConsumer) {
-    ReentrantLock lock = ConcurrentHashtable.getTableWriteLock(state);
-    AtomicReferenceArray<TEntry> buckets = state.buckets;
-    lock.lock();
-    try {
-      for (int i = 0; i < buckets.length(); i++) {
-        TEntry head = buckets.get(i);
-        if (head == null) {
-          continue;
+
+    /**
+     * The pre-PR strategy: one lock acquisition held for the entire bucket-array sweep, still
+     * releasing capacity per-entry (only lock granularity differs from the current {@code drain()}).
+     */
+    private static <TEntry extends ConcurrentHashtable.Entry<TEntry>> void drainWholeSweepLock(
+            @Nonnull ConcurrentHashtable.State<TEntry> state, @Nonnull Consumer<? super TEntry> drainedEntryConsumer) {
+        ReentrantLock lock = ConcurrentHashtable.getTableWriteLock(state);
+        AtomicReferenceArray<TEntry> buckets = state.buckets;
+        lock.lock();
+        try {
+            for (int i = 0; i < buckets.length(); i++) {
+                TEntry head = buckets.get(i);
+                if (head == null) {
+                    continue;
+                }
+                buckets.set(i, null);
+                for (TEntry e = head; e != null; e = e.next()) {
+                    state.sizeManager.decrement();
+                    drainedEntryConsumer.accept(e);
+                }
+            }
+            state.sizeManager.release(0); // full sweep: reset the scan position
+        } finally {
+            lock.unlock();
         }
-        buckets.set(i, null);
-        for (TEntry e = head; e != null; e = e.next()) {
-          state.sizeManager.decrement();
-          drainedEntryConsumer.accept(e);
+    }
+
+    @State(Scope.Benchmark)
+    public static class SharedState {
+        ConcurrentHashtable.State<DrainEntry> table;
+
+        @Setup(Level.Iteration)
+        public void setUp() {
+            table = ConcurrentHashtable.createBounded(DrainEntry.class, CAPACITY);
         }
-      }
-      state.sizeManager.release(0); // full sweep: reset the scan position
-    } finally {
-      lock.unlock();
     }
-  }
 
-  @State(Scope.Benchmark)
-  public static class SharedState {
-    ConcurrentHashtable.State<DrainEntry> table;
+    @State(Scope.Thread)
+    public static class WriterState {
+        int cursor;
 
-    @Setup(Level.Iteration)
-    public void setUp() {
-      table = ConcurrentHashtable.createBounded(DrainEntry.class, CAPACITY);
+        int next() {
+            int i = cursor;
+            cursor = (i + 1) & (N_KEYS - 1);
+            return i;
+        }
     }
-  }
 
-  @State(Scope.Thread)
-  public static class WriterState {
-    int cursor;
+    private static void write(ConcurrentHashtable.State<DrainEntry> table, WriterState w) {
+        long keyHash = KEY_HASHES[w.next()];
+        for (DrainEntry entry : ConcurrentHashtable.hashIterable(table, keyHash)) {
+            return; // lock-free hit, mirroring LogCollector.find()
+        }
+        try (ConcurrentHashtable.Reservation<DrainEntry> r = ConcurrentHashtable.tryReserve(table, keyHash)) {
+            if (r.isReserved()) {
+                r.tryGetOrInsertOrNull(new DrainEntry(keyHash));
+            }
+        }
+    }
 
-    int next() {
-      int i = cursor;
-      cursor = (i + 1) & (N_KEYS - 1);
-      return i;
+    @Benchmark
+    @Group("perBucketLock")
+    @GroupThreads(1)
+    public void perBucketLockDrainer(SharedState s) {
+        ConcurrentHashtable.drain(s.table, entry -> {});
     }
-  }
 
-  private static void write(ConcurrentHashtable.State<DrainEntry> table, WriterState w) {
-    long keyHash = KEY_HASHES[w.next()];
-    for (DrainEntry entry : ConcurrentHashtable.hashIterable(table, keyHash)) {
-      return; // lock-free hit, mirroring LogCollector.find()
+    @Benchmark
+    @Group("perBucketLock")
+    @GroupThreads(3)
+    public void perBucketLockWriter(SharedState s, WriterState w) {
+        write(s.table, w);
     }
-    try (ConcurrentHashtable.Reservation<DrainEntry> r =
-        ConcurrentHashtable.tryReserve(table, keyHash)) {
-      if (r.isReserved()) {
-        r.tryGetOrInsertOrNull(new DrainEntry(keyHash));
-      }
+
+    @Benchmark
+    @Group("wholeSweepLock")
+    @GroupThreads(1)
+    public void wholeSweepLockDrainer(SharedState s) {
+        drainWholeSweepLock(s.table, entry -> {});
+    }
+
+    @Benchmark
+    @Group("wholeSweepLock")
+    @GroupThreads(3)
+    public void wholeSweepLockWriter(SharedState s, WriterState w) {
+        write(s.table, w);
     }
-  }
-
-  @Benchmark
-  @Group("perBucketLock")
-  @GroupThreads(1)
-  public void perBucketLockDrainer(SharedState s) {
-    ConcurrentHashtable.drain(s.table, entry -> {});
-  }
-
-  @Benchmark
-  @Group("perBucketLock")
-  @GroupThreads(3)
-  public void perBucketLockWriter(SharedState s, WriterState w) {
-    write(s.table, w);
-  }
-
-  @Benchmark
-  @Group("wholeSweepLock")
-  @GroupThreads(1)
-  public void wholeSweepLockDrainer(SharedState s) {
-    drainWholeSweepLock(s.table, entry -> {});
-  }
-
-  @Benchmark
-  @Group("wholeSweepLock")
-  @GroupThreads(3)
-  public void wholeSweepLockWriter(SharedState s, WriterState w) {
-    write(s.table, w);
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/ConcurrentHashtableFindBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/ConcurrentHashtableFindBenchmark.java
index bae8709d41d..c0eb6e1769f 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/ConcurrentHashtableFindBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/ConcurrentHashtableFindBenchmark.java
@@ -37,68 +37,68 @@
 @Threads(8)
 public class ConcurrentHashtableFindBenchmark {
 
-  static final int N_KEYS = 64;
-  static final int CAPACITY = 128;
+    static final int N_KEYS = 64;
+    static final int CAPACITY = 128;
 
-  static final long[] KEY_HASHES = new long[N_KEYS];
+    static final long[] KEY_HASHES = new long[N_KEYS];
 
-  static {
-    for (int i = 0; i < N_KEYS; ++i) {
-      KEY_HASHES[i] = LongHashingUtils.hash("key-" + i);
+    static {
+        for (int i = 0; i < N_KEYS; ++i) {
+            KEY_HASHES[i] = LongHashingUtils.hash("key-" + i);
+        }
     }
-  }
 
-  /** Mirrors {@code LogCollector.RawLogMessage}: a keyHash plus a payload compared on match. */
-  static final class FindEntry extends ConcurrentHashtable.Entry<FindEntry> {
-    final int payload;
+    /** Mirrors {@code LogCollector.RawLogMessage}: a keyHash plus a payload compared on match. */
+    static final class FindEntry extends ConcurrentHashtable.Entry<FindEntry> {
+        final int payload;
 
-    FindEntry(long keyHash, int payload) {
-      super(keyHash);
-      this.payload = payload;
-    }
+        FindEntry(long keyHash, int payload) {
+            super(keyHash);
+            this.payload = payload;
+        }
 
-    @Override
-    public boolean matches(@Nonnull FindEntry other) {
-      return payload == other.payload;
+        @Override
+        public boolean matches(@Nonnull FindEntry other) {
+            return payload == other.payload;
+        }
     }
-  }
 
-  @State(Scope.Benchmark)
-  public static class SharedState {
-    ConcurrentHashtable.State<FindEntry> table;
+    @State(Scope.Benchmark)
+    public static class SharedState {
+        ConcurrentHashtable.State<FindEntry> table;
 
-    @Setup(Level.Iteration)
-    public void setUp() {
-      table = ConcurrentHashtable.createBounded(FindEntry.class, CAPACITY);
-      for (int i = 0; i < N_KEYS; ++i) {
-        try (ConcurrentHashtable.Reservation<FindEntry> reservation =
-            ConcurrentHashtable.tryReserve(table, KEY_HASHES[i])) {
-          reservation.tryGetOrInsertOrNull(new FindEntry(KEY_HASHES[i], i));
+        @Setup(Level.Iteration)
+        public void setUp() {
+            table = ConcurrentHashtable.createBounded(FindEntry.class, CAPACITY);
+            for (int i = 0; i < N_KEYS; ++i) {
+                try (ConcurrentHashtable.Reservation<FindEntry> reservation =
+                        ConcurrentHashtable.tryReserve(table, KEY_HASHES[i])) {
+                    reservation.tryGetOrInsertOrNull(new FindEntry(KEY_HASHES[i], i));
+                }
+            }
         }
-      }
     }
-  }
 
-  @State(Scope.Thread)
-  public static class ThreadState {
-    int cursor;
+    @State(Scope.Thread)
+    public static class ThreadState {
+        int cursor;
 
-    int next() {
-      int i = cursor;
-      cursor = (i + 1) & (N_KEYS - 1);
-      return i;
+        int next() {
+            int i = cursor;
+            cursor = (i + 1) & (N_KEYS - 1);
+            return i;
+        }
     }
-  }
 
-  /** Same loop shape as {@code LogCollector.find}: scan candidates for a keyHash, match, return. */
-  @Benchmark
-  public FindEntry find(SharedState s, ThreadState t) {
-    int i = t.next();
-    for (FindEntry entry : ConcurrentHashtable.hashIterable(s.table, KEY_HASHES[i])) {
-      if (entry.payload == i) {
-        return entry;
-      }
+    /** Same loop shape as {@code LogCollector.find}: scan candidates for a keyHash, match, return. */
+    @Benchmark
+    public FindEntry find(SharedState s, ThreadState t) {
+        int i = t.next();
+        for (FindEntry entry : ConcurrentHashtable.hashIterable(s.table, KEY_HASHES[i])) {
+            if (entry.payload == i) {
+                return entry;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/FlatHashtableIteratorBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/FlatHashtableIteratorBenchmark.java
index 43d928176b1..cb4ae96793c 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/FlatHashtableIteratorBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/FlatHashtableIteratorBenchmark.java
@@ -36,146 +36,142 @@
 @Threads(1)
 @State(Scope.Thread)
 public class FlatHashtableIteratorBenchmark {
-  // All entries share this hash -> one contiguous probe-run "bucket" the iterator walks.
-  static final long BUCKET_HASH = 0x123456789ABCDEF0L;
-  static final int BUCKET_SIZE = 16;
+    // All entries share this hash -> one contiguous probe-run "bucket" the iterator walks.
+    static final long BUCKET_HASH = 0x123456789ABCDEF0L;
+    static final int BUCKET_SIZE = 16;
 
-  static final class ItEntry extends FlatHashtable.Entry {
-    final int value;
+    static final class ItEntry extends FlatHashtable.Entry {
+        final int value;
 
-    ItEntry(long hash, int value) {
-      super(hash);
-      this.value = value;
+        ItEntry(long hash, int value) {
+            super(hash);
+            this.value = value;
+        }
     }
-  }
-
-  // Four DISTINCT hashOf implementors, all reading entry.hash (identical behavior, different
-  // types).
-  // Loading them defeats CHA; driving all four through the shared traversal in setUp poisons the
-  // hashOf profile to megamorphic, so type-profile can't cleanly devirtualize it for the general
-  // path — the case the Entry-specialized iterator is immune to.
-  //
-  // Measured (MacBook M1, Zulu 21, F5, poisoned profile): iterate_general 18.06M ±0.18 vs
-  // iterate_specialized 37.88M ±0.16 ops/s (2.10x, tight non-overlapping CIs). Unpoisoned, the two
-  // tie (~37.8M) — type-profile does the general path's devirt then; the poisoning is what
-  // type-profile can't survive and the constant can.
-  static final class ItHashStrategyA implements FlatHashtable.HashStrategy<ItEntry> {
-    static final ItHashStrategyA INSTANCE = new ItHashStrategyA();
-
-    private ItHashStrategyA() {}
-
-    @Override
-    public long hashOf(ItEntry entry) {
-      return entry.hash;
+
+    // Four DISTINCT hashOf implementors, all reading entry.hash (identical behavior, different
+    // types).
+    // Loading them defeats CHA; driving all four through the shared traversal in setUp poisons the
+    // hashOf profile to megamorphic, so type-profile can't cleanly devirtualize it for the general
+    // path — the case the Entry-specialized iterator is immune to.
+    //
+    // Measured (MacBook M1, Zulu 21, F5, poisoned profile): iterate_general 18.06M ±0.18 vs
+    // iterate_specialized 37.88M ±0.16 ops/s (2.10x, tight non-overlapping CIs). Unpoisoned, the two
+    // tie (~37.8M) — type-profile does the general path's devirt then; the poisoning is what
+    // type-profile can't survive and the constant can.
+    static final class ItHashStrategyA implements FlatHashtable.HashStrategy<ItEntry> {
+        static final ItHashStrategyA INSTANCE = new ItHashStrategyA();
+
+        private ItHashStrategyA() {}
+
+        @Override
+        public long hashOf(ItEntry entry) {
+            return entry.hash;
+        }
     }
-  }
 
-  static final class ItHashStrategyB implements FlatHashtable.HashStrategy<ItEntry> {
-    static final ItHashStrategyB INSTANCE = new ItHashStrategyB();
+    static final class ItHashStrategyB implements FlatHashtable.HashStrategy<ItEntry> {
+        static final ItHashStrategyB INSTANCE = new ItHashStrategyB();
 
-    private ItHashStrategyB() {}
+        private ItHashStrategyB() {}
 
-    @Override
-    public long hashOf(ItEntry entry) {
-      return entry.hash;
+        @Override
+        public long hashOf(ItEntry entry) {
+            return entry.hash;
+        }
     }
-  }
 
-  static final class ItHashStrategyC implements FlatHashtable.HashStrategy<ItEntry> {
-    static final ItHashStrategyC INSTANCE = new ItHashStrategyC();
+    static final class ItHashStrategyC implements FlatHashtable.HashStrategy<ItEntry> {
+        static final ItHashStrategyC INSTANCE = new ItHashStrategyC();
 
-    private ItHashStrategyC() {}
+        private ItHashStrategyC() {}
 
-    @Override
-    public long hashOf(ItEntry entry) {
-      return entry.hash;
+        @Override
+        public long hashOf(ItEntry entry) {
+            return entry.hash;
+        }
     }
-  }
 
-  static final class ItHashStrategyD implements FlatHashtable.HashStrategy<ItEntry> {
-    static final ItHashStrategyD INSTANCE = new ItHashStrategyD();
+    static final class ItHashStrategyD implements FlatHashtable.HashStrategy<ItEntry> {
+        static final ItHashStrategyD INSTANCE = new ItHashStrategyD();
 
-    private ItHashStrategyD() {}
+        private ItHashStrategyD() {}
 
-    @Override
-    public long hashOf(ItEntry entry) {
-      return entry.hash;
-    }
-  }
-
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  static final FlatHashtable.HashStrategy<ItEntry>[] STRATEGIES =
-      new FlatHashtable.HashStrategy[] {
-        ItHashStrategyA.INSTANCE,
-        ItHashStrategyB.INSTANCE,
-        ItHashStrategyC.INSTANCE,
-        ItHashStrategyD.INSTANCE,
-      };
-
-  ItEntry[] table;
-
-  // Kept live so the profile-poisoning loop below can't be dead-code-eliminated.
-  static long POISON_SINK;
-
-  @Setup(Level.Trial)
-  public void setUp() {
-    // Sparse so the bucket is one contiguous run with a clean terminating empty slot.
-    table = FlatHashtable.create(ItEntry.class, BUCKET_SIZE, FlatHashtable.LOW_LOAD_FACTOR);
-    for (int i = 0; i < BUCKET_SIZE; ++i) {
-      FlatHashtable.insert(table, new ItEntry(BUCKET_HASH, i)); // all share the hash => one bucket
+        @Override
+        public long hashOf(ItEntry entry) {
+            return entry.hash;
+        }
     }
-    // Poison the shared HashIterator.advanceWith hashOf profile: drive the GENERAL iterator with
-    // four distinct strategy types, hot enough that C2 records the site as megamorphic. HotSpot
-    // keeps one per-bci profile shared across all inlining contexts (no context-sensitive profiling
-    // — tried in Zing, never robust), so those unrelated callers permanently pollute the profile.
-    long sink = 0;
-    for (int r = 0; r < 200_000; ++r) {
-      sink += poison();
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    static final FlatHashtable.HashStrategy<ItEntry>[] STRATEGIES = new FlatHashtable.HashStrategy[] {
+        ItHashStrategyA.INSTANCE, ItHashStrategyB.INSTANCE, ItHashStrategyC.INSTANCE, ItHashStrategyD.INSTANCE,
+    };
+
+    ItEntry[] table;
+
+    // Kept live so the profile-poisoning loop below can't be dead-code-eliminated.
+    static long POISON_SINK;
+
+    @Setup(Level.Trial)
+    public void setUp() {
+        // Sparse so the bucket is one contiguous run with a clean terminating empty slot.
+        table = FlatHashtable.create(ItEntry.class, BUCKET_SIZE, FlatHashtable.LOW_LOAD_FACTOR);
+        for (int i = 0; i < BUCKET_SIZE; ++i) {
+            FlatHashtable.insert(table, new ItEntry(BUCKET_HASH, i)); // all share the hash => one bucket
+        }
+        // Poison the shared HashIterator.advanceWith hashOf profile: drive the GENERAL iterator with
+        // four distinct strategy types, hot enough that C2 records the site as megamorphic. HotSpot
+        // keeps one per-bci profile shared across all inlining contexts (no context-sensitive profiling
+        // — tried in Zing, never robust), so those unrelated callers permanently pollute the profile.
+        long sink = 0;
+        for (int r = 0; r < 200_000; ++r) {
+            sink += poison();
+        }
+        POISON_SINK = sink;
     }
-    POISON_SINK = sink;
-  }
-
-  /** Drives the general iterator once per distinct strategy type — the profile poisoner. */
-  private long poison() {
-    long sink = 0;
-    for (FlatHashtable.HashStrategy<ItEntry> s : STRATEGIES) {
-      Iterator<ItEntry> it = FlatHashtable.iterator(table, BUCKET_HASH, s);
-      while (it.hasNext()) {
-        sink += it.next().value;
-      }
+
+    /** Drives the general iterator once per distinct strategy type — the profile poisoner. */
+    private long poison() {
+        long sink = 0;
+        for (FlatHashtable.HashStrategy<ItEntry> s : STRATEGIES) {
+            Iterator<ItEntry> it = FlatHashtable.iterator(table, BUCKET_HASH, s);
+            while (it.hasNext()) {
+                sink += it.next().value;
+            }
+        }
+        return sink;
     }
-    return sink;
-  }
-
-  /**
-   * General iterator with a SINGLE strategy — looks monomorphic, but its {@code hashOf} still
-   * dispatches virtually because {@code setUp} already poisoned the shared profile with other
-   * strategy types. This is the cross-caller pollution failure mode: a caller degraded by callers
-   * it has nothing to do with. (Unpoisoned, this ties {@code iterate_specialized} — type-profile
-   * then devirtualizes it; the poisoning is what type-profile can't survive and the constant can.)
-   */
-  @Benchmark
-  public long iterate_general() {
-    long sum = 0;
-    Iterator<ItEntry> it = FlatHashtable.iterator(table, BUCKET_HASH, ItHashStrategyA.INSTANCE);
-    while (it.hasNext()) {
-      sum += it.next().value;
+
+    /**
+     * General iterator with a SINGLE strategy — looks monomorphic, but its {@code hashOf} still
+     * dispatches virtually because {@code setUp} already poisoned the shared profile with other
+     * strategy types. This is the cross-caller pollution failure mode: a caller degraded by callers
+     * it has nothing to do with. (Unpoisoned, this ties {@code iterate_specialized} — type-profile
+     * then devirtualizes it; the poisoning is what type-profile can't survive and the constant can.)
+     */
+    @Benchmark
+    public long iterate_general() {
+        long sum = 0;
+        Iterator<ItEntry> it = FlatHashtable.iterator(table, BUCKET_HASH, ItHashStrategyA.INSTANCE);
+        while (it.hasNext()) {
+            sum += it.next().value;
+        }
+        return sum;
     }
-    return sum;
-  }
-
-  /**
-   * Entry-specialized iterator: feeds the constant Entry-hash strategy into the shared template, so
-   * {@code hashOf} inlines to {@code entry.hash} <b>structurally</b> (constant type-flow, not
-   * profile) — immune to the poisoned profile that sinks {@code iterate_general}.
-   */
-  @Benchmark
-  public long iterate_specialized() {
-    long sum = 0;
-    Iterator<ItEntry> it = FlatHashtable.iterator(table, BUCKET_HASH); // Entry overload
-    while (it.hasNext()) {
-      sum += it.next().value; // hashOf inlined to entry.hash via the constant strategy
+
+    /**
+     * Entry-specialized iterator: feeds the constant Entry-hash strategy into the shared template, so
+     * {@code hashOf} inlines to {@code entry.hash} <b>structurally</b> (constant type-flow, not
+     * profile) — immune to the poisoned profile that sinks {@code iterate_general}.
+     */
+    @Benchmark
+    public long iterate_specialized() {
+        long sum = 0;
+        Iterator<ItEntry> it = FlatHashtable.iterator(table, BUCKET_HASH); // Entry overload
+        while (it.hasNext()) {
+            sum += it.next().value; // hashOf inlined to entry.hash via the constant strategy
+        }
+        return sum;
     }
-    return sum;
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/HashingBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/HashingBenchmark.java
index 9dc6faf5f6d..2ad5c2e28a3 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/HashingBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/HashingBenchmark.java
@@ -59,84 +59,80 @@
 @Measurement(iterations = 3)
 @Threads(8)
 public class HashingBenchmark {
-  static <T> T init(Supplier<T> supplier) {
-    return supplier.get();
-  }
+    static <T> T init(Supplier<T> supplier) {
+        return supplier.get();
+    }
 
-  // strings used in hashing are set up ahead of time, so that the only allocation is from var-args
-  static String[] TEST_STRINGS =
-      init(
-          () -> {
-            ThreadLocalRandom random = ThreadLocalRandom.current();
+    // strings used in hashing are set up ahead of time, so that the only allocation is from var-args
+    static String[] TEST_STRINGS = init(() -> {
+        ThreadLocalRandom random = ThreadLocalRandom.current();
 
-            String[] strings = new String[1024];
-            for (int i = 0; i < strings.length; ++i) {
-              strings[i] = Double.toString(random.nextDouble());
-            }
-            return strings;
-          });
+        String[] strings = new String[1024];
+        for (int i = 0; i < strings.length; ++i) {
+            strings[i] = Double.toString(random.nextDouble());
+        }
+        return strings;
+    });
 
-  static {
-    Thread updaterThread =
-        new Thread(
-            () -> {
-              ThreadLocalRandom random = ThreadLocalRandom.current();
+    static {
+        Thread updaterThread = new Thread(() -> {
+            ThreadLocalRandom random = ThreadLocalRandom.current();
 
-              while (!Thread.interrupted()) {
+            while (!Thread.interrupted()) {
                 str0 = TEST_STRINGS[random.nextInt(0, TEST_STRINGS.length)];
                 str1 = TEST_STRINGS[random.nextInt(0, TEST_STRINGS.length)];
                 str2 = TEST_STRINGS[random.nextInt(0, TEST_STRINGS.length)];
                 str3 = TEST_STRINGS[random.nextInt(0, TEST_STRINGS.length)];
                 str4 = TEST_STRINGS[random.nextInt(0, TEST_STRINGS.length)];
-              }
-            });
-    updaterThread.setDaemon(true);
-    updaterThread.start();
-  }
+            }
+        });
+        updaterThread.setDaemon(true);
+        updaterThread.start();
+    }
 
-  static String str0;
-  static String str1;
-  static String str2;
-  static String str3;
-  static String str4;
+    static String str0;
+    static String str1;
+    static String str2;
+    static String str3;
+    static String str4;
 
-  @Benchmark
-  public int hash2() {
-    return datadog.trace.util.HashingUtils.hash(str0, str1);
-  }
+    @Benchmark
+    public int hash2() {
+        return datadog.trace.util.HashingUtils.hash(str0, str1);
+    }
 
-  @Benchmark
-  public int hash2_varargs() {
-    return java.util.Objects.hash(str0, str1);
-  }
+    @Benchmark
+    public int hash2_varargs() {
+        return java.util.Objects.hash(str0, str1);
+    }
 
-  @Benchmark
-  public int hash3() {
-    return datadog.trace.util.HashingUtils.hash(str0, str1, str2);
-  }
+    @Benchmark
+    public int hash3() {
+        return datadog.trace.util.HashingUtils.hash(str0, str1, str2);
+    }
 
-  @Benchmark
-  public int hash3_varags() {
-    return java.util.Objects.hash(str0, str1, str2);
-  }
+    @Benchmark
+    public int hash3_varags() {
+        return java.util.Objects.hash(str0, str1, str2);
+    }
 
-  @Benchmark
-  public int hash4() {
-    return datadog.trace.util.HashingUtils.hash(str0, str1, str2, str3);
-  }
+    @Benchmark
+    public int hash4() {
+        return datadog.trace.util.HashingUtils.hash(str0, str1, str2, str3);
+    }
 
-  @Benchmark
-  public int hash4_varargs() {
-    return java.util.Objects.hash(str0, str1, str2, str3);
-  }
+    @Benchmark
+    public int hash4_varargs() {
+        return java.util.Objects.hash(str0, str1, str2, str3);
+    }
 
-  @Benchmark
-  public int hash5() {
-    return datadog.trace.util.HashingUtils.hash(str0, str1, str2, str3, str4);
-  }
+    @Benchmark
+    public int hash5() {
+        return datadog.trace.util.HashingUtils.hash(str0, str1, str2, str3, str4);
+    }
 
-  @Benchmark
-  public int hash5_varargs() {
-    return java.util.Objects.hash(str0, str1, str2, str3, str4);
-  }
+    @Benchmark
+    public int hash5_varargs() {
+        return java.util.Objects.hash(str0, str1, str2, str3, str4);
+    }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/HashtableD1Benchmark.java b/internal-api/src/jmh/java/datadog/trace/util/HashtableD1Benchmark.java
index f8ba7177e88..68184eb194e 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/HashtableD1Benchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/HashtableD1Benchmark.java
@@ -63,107 +63,107 @@
 @Threads(8)
 public class HashtableD1Benchmark {
 
-  static final int N_KEYS = 64;
-  static final int CAPACITY = 128;
+    static final int N_KEYS = 64;
+    static final int CAPACITY = 128;
 
-  static final String[] SOURCE_KEYS = new String[N_KEYS];
+    static final String[] SOURCE_KEYS = new String[N_KEYS];
 
-  static {
-    for (int i = 0; i < N_KEYS; ++i) {
-      SOURCE_KEYS[i] = "key-" + i;
+    static {
+        for (int i = 0; i < N_KEYS; ++i) {
+            SOURCE_KEYS[i] = "key-" + i;
+        }
     }
-  }
 
-  static final class D1Counter extends Hashtable.D1.Entry<String> {
-    long count;
+    static final class D1Counter extends Hashtable.D1.Entry<String> {
+        long count;
 
-    D1Counter(String key) {
-      super(key);
+        D1Counter(String key) {
+            super(key);
+        }
     }
-  }
 
-  /** Reusable iteration consumer — avoids per-call lambda capture allocation. */
-  static final class BhD1Consumer implements Consumer<D1Counter> {
-    Blackhole bh;
+    /** Reusable iteration consumer — avoids per-call lambda capture allocation. */
+    static final class BhD1Consumer implements Consumer<D1Counter> {
+        Blackhole bh;
 
-    @Override
-    public void accept(D1Counter e) {
-      bh.consume(e.key);
-      bh.consume(e.count);
+        @Override
+        public void accept(D1Counter e) {
+            bh.consume(e.key);
+            bh.consume(e.count);
+        }
     }
-  }
-
-  @State(Scope.Thread)
-  public static class D1State {
-    Hashtable.D1<String, D1Counter> table;
-    HashMap<String, Long> hashMap;
-    String[] keys;
-    int cursor;
-    final BhD1Consumer consumer = new BhD1Consumer();
-
-    @Setup(Level.Iteration)
-    public void setUp() {
-      table = new Hashtable.D1<>(CAPACITY);
-      hashMap = new HashMap<>(CAPACITY);
-      keys = SOURCE_KEYS;
-      for (int i = 0; i < N_KEYS; ++i) {
-        table.insert(new D1Counter(keys[i]));
-        hashMap.put(keys[i], 0L);
-      }
-      cursor = 0;
+
+    @State(Scope.Thread)
+    public static class D1State {
+        Hashtable.D1<String, D1Counter> table;
+        HashMap<String, Long> hashMap;
+        String[] keys;
+        int cursor;
+        final BhD1Consumer consumer = new BhD1Consumer();
+
+        @Setup(Level.Iteration)
+        public void setUp() {
+            table = new Hashtable.D1<>(CAPACITY);
+            hashMap = new HashMap<>(CAPACITY);
+            keys = SOURCE_KEYS;
+            for (int i = 0; i < N_KEYS; ++i) {
+                table.insert(new D1Counter(keys[i]));
+                hashMap.put(keys[i], 0L);
+            }
+            cursor = 0;
+        }
+
+        String nextKey() {
+            int i = cursor;
+            cursor = (i + 1) & (N_KEYS - 1);
+            return keys[i];
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(N_KEYS)
+    public void add_hashtable(D1State s) {
+        Hashtable.D1<String, D1Counter> t = s.table;
+        String[] keys = s.keys;
+        t.clear();
+        for (int i = 0; i < N_KEYS; ++i) {
+            t.insert(new D1Counter(keys[i]));
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(N_KEYS)
+    public void add_hashMap(D1State s) {
+        HashMap<String, Long> m = s.hashMap;
+        String[] keys = s.keys;
+        m.clear();
+        for (int i = 0; i < N_KEYS; ++i) {
+            m.put(keys[i], (long) i);
+        }
     }
 
-    String nextKey() {
-      int i = cursor;
-      cursor = (i + 1) & (N_KEYS - 1);
-      return keys[i];
+    @Benchmark
+    public long update_hashtable(D1State s) {
+        D1Counter e = s.table.get(s.nextKey());
+        return ++e.count;
     }
-  }
-
-  @Benchmark
-  @OperationsPerInvocation(N_KEYS)
-  public void add_hashtable(D1State s) {
-    Hashtable.D1<String, D1Counter> t = s.table;
-    String[] keys = s.keys;
-    t.clear();
-    for (int i = 0; i < N_KEYS; ++i) {
-      t.insert(new D1Counter(keys[i]));
+
+    @Benchmark
+    public Long update_hashMap(D1State s) {
+        return s.hashMap.merge(s.nextKey(), 1L, Long::sum);
     }
-  }
-
-  @Benchmark
-  @OperationsPerInvocation(N_KEYS)
-  public void add_hashMap(D1State s) {
-    HashMap<String, Long> m = s.hashMap;
-    String[] keys = s.keys;
-    m.clear();
-    for (int i = 0; i < N_KEYS; ++i) {
-      m.put(keys[i], (long) i);
+
+    @Benchmark
+    public void iterate_hashtable(D1State s, Blackhole bh) {
+        s.consumer.bh = bh;
+        s.table.forEach(s.consumer);
     }
-  }
-
-  @Benchmark
-  public long update_hashtable(D1State s) {
-    D1Counter e = s.table.get(s.nextKey());
-    return ++e.count;
-  }
-
-  @Benchmark
-  public Long update_hashMap(D1State s) {
-    return s.hashMap.merge(s.nextKey(), 1L, Long::sum);
-  }
-
-  @Benchmark
-  public void iterate_hashtable(D1State s, Blackhole bh) {
-    s.consumer.bh = bh;
-    s.table.forEach(s.consumer);
-  }
-
-  @Benchmark
-  public void iterate_hashMap(D1State s, Blackhole bh) {
-    for (Map.Entry<String, Long> entry : s.hashMap.entrySet()) {
-      bh.consume(entry.getKey());
-      bh.consume(entry.getValue());
+
+    @Benchmark
+    public void iterate_hashMap(D1State s, Blackhole bh) {
+        for (Map.Entry<String, Long> entry : s.hashMap.entrySet()) {
+            bh.consume(entry.getKey());
+            bh.consume(entry.getValue());
+        }
     }
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/HashtableD2Benchmark.java b/internal-api/src/jmh/java/datadog/trace/util/HashtableD2Benchmark.java
index 6f46a702005..19c9f109160 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/HashtableD2Benchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/HashtableD2Benchmark.java
@@ -67,143 +67,143 @@
 @Threads(8)
 public class HashtableD2Benchmark {
 
-  static final int N_KEYS = 64;
-  static final int CAPACITY = 128;
+    static final int N_KEYS = 64;
+    static final int CAPACITY = 128;
 
-  static final String[] SOURCE_K1 = new String[N_KEYS];
-  static final Integer[] SOURCE_K2 = new Integer[N_KEYS];
+    static final String[] SOURCE_K1 = new String[N_KEYS];
+    static final Integer[] SOURCE_K2 = new Integer[N_KEYS];
 
-  static {
-    for (int i = 0; i < N_KEYS; ++i) {
-      SOURCE_K1[i] = "key-" + i;
-      SOURCE_K2[i] = i * 31 + 17;
+    static {
+        for (int i = 0; i < N_KEYS; ++i) {
+            SOURCE_K1[i] = "key-" + i;
+            SOURCE_K2[i] = i * 31 + 17;
+        }
     }
-  }
 
-  static final class D2Counter extends Hashtable.D2.Entry<String, Integer> {
-    long count;
+    static final class D2Counter extends Hashtable.D2.Entry<String, Integer> {
+        long count;
 
-    D2Counter(String k1, Integer k2) {
-      super(k1, k2);
-    }
-  }
-
-  /** Composite key for the HashMap baseline against D2. */
-  static final class Key2 {
-    final String k1;
-    final Integer k2;
-    final int hash;
-
-    Key2(String k1, Integer k2) {
-      this.k1 = k1;
-      this.k2 = k2;
-      this.hash = Objects.hash(k1, k2);
+        D2Counter(String k1, Integer k2) {
+            super(k1, k2);
+        }
     }
 
-    @Override
-    public boolean equals(Object o) {
-      if (!(o instanceof Key2)) {
-        return false;
-      }
-      Key2 other = (Key2) o;
-      return Objects.equals(k1, other.k1) && Objects.equals(k2, other.k2);
+    /** Composite key for the HashMap baseline against D2. */
+    static final class Key2 {
+        final String k1;
+        final Integer k2;
+        final int hash;
+
+        Key2(String k1, Integer k2) {
+            this.k1 = k1;
+            this.k2 = k2;
+            this.hash = Objects.hash(k1, k2);
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof Key2)) {
+                return false;
+            }
+            Key2 other = (Key2) o;
+            return Objects.equals(k1, other.k1) && Objects.equals(k2, other.k2);
+        }
+
+        @Override
+        public int hashCode() {
+            return hash;
+        }
     }
 
-    @Override
-    public int hashCode() {
-      return hash;
+    /** Reusable iteration consumer — avoids per-call lambda capture allocation. */
+    static final class BhD2Consumer implements Consumer<D2Counter> {
+        Blackhole bh;
+
+        @Override
+        public void accept(D2Counter e) {
+            bh.consume(e.key1);
+            bh.consume(e.key2);
+            bh.consume(e.count);
+        }
     }
-  }
 
-  /** Reusable iteration consumer — avoids per-call lambda capture allocation. */
-  static final class BhD2Consumer implements Consumer<D2Counter> {
-    Blackhole bh;
+    @State(Scope.Thread)
+    public static class D2State {
+        Hashtable.D2<String, Integer, D2Counter> table;
+        HashMap<Key2, Long> hashMap;
+        String[] k1s;
+        Integer[] k2s;
+        int cursor;
+        final BhD2Consumer consumer = new BhD2Consumer();
+
+        @Setup(Level.Iteration)
+        public void setUp() {
+            table = new Hashtable.D2<>(CAPACITY);
+            hashMap = new HashMap<>(CAPACITY);
+            k1s = SOURCE_K1;
+            k2s = SOURCE_K2;
+            for (int i = 0; i < N_KEYS; ++i) {
+                table.insert(new D2Counter(k1s[i], k2s[i]));
+                hashMap.put(new Key2(k1s[i], k2s[i]), 0L);
+            }
+            cursor = 0;
+        }
+
+        int nextIndex() {
+            int i = cursor;
+            cursor = (i + 1) & (N_KEYS - 1);
+            return i;
+        }
+    }
 
-    @Override
-    public void accept(D2Counter e) {
-      bh.consume(e.key1);
-      bh.consume(e.key2);
-      bh.consume(e.count);
+    @Benchmark
+    @OperationsPerInvocation(N_KEYS)
+    public void add_hashtable(D2State s) {
+        Hashtable.D2<String, Integer, D2Counter> t = s.table;
+        String[] k1s = s.k1s;
+        Integer[] k2s = s.k2s;
+        t.clear();
+        for (int i = 0; i < N_KEYS; ++i) {
+            t.insert(new D2Counter(k1s[i], k2s[i]));
+        }
     }
-  }
-
-  @State(Scope.Thread)
-  public static class D2State {
-    Hashtable.D2<String, Integer, D2Counter> table;
-    HashMap<Key2, Long> hashMap;
-    String[] k1s;
-    Integer[] k2s;
-    int cursor;
-    final BhD2Consumer consumer = new BhD2Consumer();
-
-    @Setup(Level.Iteration)
-    public void setUp() {
-      table = new Hashtable.D2<>(CAPACITY);
-      hashMap = new HashMap<>(CAPACITY);
-      k1s = SOURCE_K1;
-      k2s = SOURCE_K2;
-      for (int i = 0; i < N_KEYS; ++i) {
-        table.insert(new D2Counter(k1s[i], k2s[i]));
-        hashMap.put(new Key2(k1s[i], k2s[i]), 0L);
-      }
-      cursor = 0;
+
+    @Benchmark
+    @OperationsPerInvocation(N_KEYS)
+    public void add_hashMap(D2State s) {
+        HashMap<Key2, Long> m = s.hashMap;
+        String[] k1s = s.k1s;
+        Integer[] k2s = s.k2s;
+        m.clear();
+        for (int i = 0; i < N_KEYS; ++i) {
+            m.put(new Key2(k1s[i], k2s[i]), (long) i);
+        }
     }
 
-    int nextIndex() {
-      int i = cursor;
-      cursor = (i + 1) & (N_KEYS - 1);
-      return i;
+    @Benchmark
+    public long update_hashtable(D2State s) {
+        int i = s.nextIndex();
+        D2Counter e = s.table.get(s.k1s[i], s.k2s[i]);
+        return ++e.count;
     }
-  }
-
-  @Benchmark
-  @OperationsPerInvocation(N_KEYS)
-  public void add_hashtable(D2State s) {
-    Hashtable.D2<String, Integer, D2Counter> t = s.table;
-    String[] k1s = s.k1s;
-    Integer[] k2s = s.k2s;
-    t.clear();
-    for (int i = 0; i < N_KEYS; ++i) {
-      t.insert(new D2Counter(k1s[i], k2s[i]));
+
+    @Benchmark
+    public Long update_hashMap(D2State s) {
+        int i = s.nextIndex();
+        return s.hashMap.merge(new Key2(s.k1s[i], s.k2s[i]), 1L, Long::sum);
     }
-  }
-
-  @Benchmark
-  @OperationsPerInvocation(N_KEYS)
-  public void add_hashMap(D2State s) {
-    HashMap<Key2, Long> m = s.hashMap;
-    String[] k1s = s.k1s;
-    Integer[] k2s = s.k2s;
-    m.clear();
-    for (int i = 0; i < N_KEYS; ++i) {
-      m.put(new Key2(k1s[i], k2s[i]), (long) i);
+
+    @Benchmark
+    public void iterate_hashtable(D2State s, Blackhole bh) {
+        s.consumer.bh = bh;
+        s.table.forEach(s.consumer);
     }
-  }
-
-  @Benchmark
-  public long update_hashtable(D2State s) {
-    int i = s.nextIndex();
-    D2Counter e = s.table.get(s.k1s[i], s.k2s[i]);
-    return ++e.count;
-  }
-
-  @Benchmark
-  public Long update_hashMap(D2State s) {
-    int i = s.nextIndex();
-    return s.hashMap.merge(new Key2(s.k1s[i], s.k2s[i]), 1L, Long::sum);
-  }
-
-  @Benchmark
-  public void iterate_hashtable(D2State s, Blackhole bh) {
-    s.consumer.bh = bh;
-    s.table.forEach(s.consumer);
-  }
-
-  @Benchmark
-  public void iterate_hashMap(D2State s, Blackhole bh) {
-    for (Map.Entry<Key2, Long> entry : s.hashMap.entrySet()) {
-      bh.consume(entry.getKey());
-      bh.consume(entry.getValue());
+
+    @Benchmark
+    public void iterate_hashMap(D2State s, Blackhole bh) {
+        for (Map.Entry<Key2, Long> entry : s.hashMap.entrySet()) {
+            bh.consume(entry.getKey());
+            bh.consume(entry.getValue());
+        }
     }
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/ImmutableMapBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/ImmutableMapBenchmark.java
index 7f21e08656f..a0183b74cf1 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/ImmutableMapBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/ImmutableMapBenchmark.java
@@ -88,198 +88,195 @@
 @Threads(8)
 @State(Scope.Benchmark)
 public class ImmutableMapBenchmark {
-  static final String[] INSERTION_KEYS = {
-    "foo", "bar", "baz", "quux", "foobar", "foobaz", "key0", "key1", "key2", "key3"
-  };
+    static final String[] INSERTION_KEYS = {
+        "foo", "bar", "baz", "quux", "foobar", "foobaz", "key0", "key1", "key2", "key3"
+    };
 
-  // Distinct String instances (not the literals used to build the maps) so lookups exercise
-  // equals(), not identity -- the realistic case for keys arriving from parsing/decoding.
-  static final String[] EQUAL_KEYS = newEqualKeys();
+    // Distinct String instances (not the literals used to build the maps) so lookups exercise
+    // equals(), not identity -- the realistic case for keys arriving from parsing/decoding.
+    static final String[] EQUAL_KEYS = newEqualKeys();
 
-  static String[] newEqualKeys() {
-    String[] keys = new String[INSERTION_KEYS.length];
-    for (int i = 0; i < INSERTION_KEYS.length; ++i) {
-      keys[i] = new String(INSERTION_KEYS[i]);
+    static String[] newEqualKeys() {
+        String[] keys = new String[INSERTION_KEYS.length];
+        for (int i = 0; i < INSERTION_KEYS.length; ++i) {
+            keys[i] = new String(INSERTION_KEYS[i]);
+        }
+        return keys;
     }
-    return keys;
-  }
 
-  static void fill(Map<String, Integer> map) {
-    for (int i = 0; i < INSERTION_KEYS.length; ++i) {
-      map.put(INSERTION_KEYS[i], i);
+    static void fill(Map<String, Integer> map) {
+        for (int i = 0; i < INSERTION_KEYS.length; ++i) {
+            map.put(INSERTION_KEYS[i], i);
+        }
     }
-  }
 
-  // StringIndex as a string->int map: an open-addressed index plus a slot-aligned int[] of values
-  // (VALUES[indexOf(key)]). stringIndex_embedded_* reads via static final arrays (JIT folds the
-  // refs to constants); stringIndex_* goes through the instance wrapper. Both share one placement
-  // -- StringIndex.of and EmbeddingSupport.create place identically -- so SI_VALUES aligns with
-  // either.
-  static final int[] SI_HASHES;
-  static final String[] SI_NAMES;
-  static final int[] SI_VALUES;
+    // StringIndex as a string->int map: an open-addressed index plus a slot-aligned int[] of values
+    // (VALUES[indexOf(key)]). stringIndex_embedded_* reads via static final arrays (JIT folds the
+    // refs to constants); stringIndex_* goes through the instance wrapper. Both share one placement
+    // -- StringIndex.of and EmbeddingSupport.create place identically -- so SI_VALUES aligns with
+    // either.
+    static final int[] SI_HASHES;
+    static final String[] SI_NAMES;
+    static final int[] SI_VALUES;
 
-  static {
-    StringIndex.Data data = StringIndex.EmbeddingSupport.create(INSERTION_KEYS);
-    SI_HASHES = data.hashes;
-    SI_NAMES = data.names;
-    SI_VALUES = new int[SI_HASHES.length];
-    for (int i = 0; i < INSERTION_KEYS.length; ++i) {
-      SI_VALUES[StringIndex.EmbeddingSupport.indexOf(SI_HASHES, SI_NAMES, INSERTION_KEYS[i])] = i;
+    static {
+        StringIndex.Data data = StringIndex.EmbeddingSupport.create(INSERTION_KEYS);
+        SI_HASHES = data.hashes;
+        SI_NAMES = data.names;
+        SI_VALUES = new int[SI_HASHES.length];
+        for (int i = 0; i < INSERTION_KEYS.length; ++i) {
+            SI_VALUES[StringIndex.EmbeddingSupport.indexOf(SI_HASHES, SI_NAMES, INSERTION_KEYS[i])] = i;
+        }
     }
-  }
 
-  // Built once, never mutated -- safe to share across the reader threads.
-  HashMap<String, Integer> hashMap;
-  LinkedHashMap<String, Integer> linkedHashMap;
-  TreeMap<String, Integer> treeMap;
-  TagMap tagMap;
-  Map<String, Integer> tracerImmutableMap;
-  StringIndex stringIndex;
+    // Built once, never mutated -- safe to share across the reader threads.
+    HashMap<String, Integer> hashMap;
+    LinkedHashMap<String, Integer> linkedHashMap;
+    TreeMap<String, Integer> treeMap;
+    TagMap tagMap;
+    Map<String, Integer> tracerImmutableMap;
+    StringIndex stringIndex;
 
-  @Setup(Level.Trial)
-  public void setUp() {
-    BenchmarkUtils.polluteHashDispatch();
+    @Setup(Level.Trial)
+    public void setUp() {
+        BenchmarkUtils.polluteHashDispatch();
 
-    hashMap = new HashMap<>();
-    fill(hashMap);
-    linkedHashMap = new LinkedHashMap<>();
-    fill(linkedHashMap);
-    treeMap = new TreeMap<>();
-    fill(treeMap);
-    tagMap = TagMap.create();
-    for (int i = 0; i < INSERTION_KEYS.length; ++i) {
-      tagMap.set(INSERTION_KEYS[i], i); // primitive support
+        hashMap = new HashMap<>();
+        fill(hashMap);
+        linkedHashMap = new LinkedHashMap<>();
+        fill(linkedHashMap);
+        treeMap = new TreeMap<>();
+        fill(treeMap);
+        tagMap = TagMap.create();
+        for (int i = 0; i < INSERTION_KEYS.length; ++i) {
+            tagMap.set(INSERTION_KEYS[i], i); // primitive support
+        }
+        // JDK compact immutable map (MapN on Java 10+); the agent's actual fixed-map representation.
+        tracerImmutableMap = CollectionUtils.tryMakeImmutableMap(hashMap);
+        stringIndex = StringIndex.of(INSERTION_KEYS);
     }
-    // JDK compact immutable map (MapN on Java 10+); the agent's actual fixed-map representation.
-    tracerImmutableMap = CollectionUtils.tryMakeImmutableMap(hashMap);
-    stringIndex = StringIndex.of(INSERTION_KEYS);
-  }
 
-  /** Per-thread lookup cursor so each reader thread cycles keys independently. */
-  @State(Scope.Thread)
-  public static class Cursor {
-    int index = 0;
+    /** Per-thread lookup cursor so each reader thread cycles keys independently. */
+    @State(Scope.Thread)
+    public static class Cursor {
+        int index = 0;
 
-    String nextKey() {
-      return nextKey(EQUAL_KEYS);
-    }
+        String nextKey() {
+            return nextKey(EQUAL_KEYS);
+        }
 
-    String nextKey(String[] keys) {
-      if (++index >= keys.length) index = 0;
-      return keys[index];
+        String nextKey(String[] keys) {
+            if (++index >= keys.length) index = 0;
+            return keys[index];
+        }
     }
-  }
 
-  @Benchmark
-  public Integer get_hashMap(Cursor cursor) {
-    return hashMap.get(cursor.nextKey());
-  }
+    @Benchmark
+    public Integer get_hashMap(Cursor cursor) {
+        return hashMap.get(cursor.nextKey());
+    }
 
-  @Benchmark
-  public Integer get_hashMap_sameKey(Cursor cursor) {
-    return hashMap.get(cursor.nextKey(INSERTION_KEYS));
-  }
+    @Benchmark
+    public Integer get_hashMap_sameKey(Cursor cursor) {
+        return hashMap.get(cursor.nextKey(INSERTION_KEYS));
+    }
 
-  @Benchmark
-  public void iterate_hashMap(Blackhole blackhole) {
-    for (Map.Entry<String, Integer> entry : hashMap.entrySet()) {
-      blackhole.consume(entry.getKey());
-      blackhole.consume(entry.getValue());
+    @Benchmark
+    public void iterate_hashMap(Blackhole blackhole) {
+        for (Map.Entry<String, Integer> entry : hashMap.entrySet()) {
+            blackhole.consume(entry.getKey());
+            blackhole.consume(entry.getValue());
+        }
     }
-  }
 
-  @Benchmark
-  public Integer get_linkedHashMap(Cursor cursor) {
-    return linkedHashMap.get(cursor.nextKey());
-  }
+    @Benchmark
+    public Integer get_linkedHashMap(Cursor cursor) {
+        return linkedHashMap.get(cursor.nextKey());
+    }
 
-  @Benchmark
-  public void iterate_linkedHashMap(Blackhole blackhole) {
-    for (Map.Entry<String, Integer> entry : linkedHashMap.entrySet()) {
-      blackhole.consume(entry.getKey());
-      blackhole.consume(entry.getValue());
+    @Benchmark
+    public void iterate_linkedHashMap(Blackhole blackhole) {
+        for (Map.Entry<String, Integer> entry : linkedHashMap.entrySet()) {
+            blackhole.consume(entry.getKey());
+            blackhole.consume(entry.getValue());
+        }
     }
-  }
 
-  @Benchmark
-  public Integer get_treeMap(Cursor cursor) {
-    return treeMap.get(cursor.nextKey());
-  }
+    @Benchmark
+    public Integer get_treeMap(Cursor cursor) {
+        return treeMap.get(cursor.nextKey());
+    }
 
-  @Benchmark
-  public void iterate_treeMap(Blackhole blackhole) {
-    for (Map.Entry<String, Integer> entry : treeMap.entrySet()) {
-      blackhole.consume(entry.getKey());
-      blackhole.consume(entry.getValue());
+    @Benchmark
+    public void iterate_treeMap(Blackhole blackhole) {
+        for (Map.Entry<String, Integer> entry : treeMap.entrySet()) {
+            blackhole.consume(entry.getKey());
+            blackhole.consume(entry.getValue());
+        }
     }
-  }
 
-  @Benchmark
-  public int get_tagMap(Cursor cursor) {
-    return tagMap.getInt(cursor.nextKey());
-  }
+    @Benchmark
+    public int get_tagMap(Cursor cursor) {
+        return tagMap.getInt(cursor.nextKey());
+    }
 
-  @Benchmark
-  public int get_tagMap_sameKey(Cursor cursor) {
-    return tagMap.getInt(cursor.nextKey(INSERTION_KEYS));
-  }
+    @Benchmark
+    public int get_tagMap_sameKey(Cursor cursor) {
+        return tagMap.getInt(cursor.nextKey(INSERTION_KEYS));
+    }
 
-  @Benchmark
-  public void iterate_tagMap(Blackhole blackhole) {
-    for (TagMap.EntryReader entry : tagMap) {
-      blackhole.consume(entry.tag());
-      blackhole.consume(entry.intValue());
+    @Benchmark
+    public void iterate_tagMap(Blackhole blackhole) {
+        for (TagMap.EntryReader entry : tagMap) {
+            blackhole.consume(entry.tag());
+            blackhole.consume(entry.intValue());
+        }
     }
-  }
 
-  @Benchmark
-  public void iterate_tagMap_forEach(Blackhole blackhole) {
-    // Taking advantage of passthrough of contextObj to avoid capturing lambda
-    tagMap.forEach(
-        blackhole,
-        (bh, entry) -> {
-          bh.consume(entry.tag());
-          bh.consume(entry.intValue());
+    @Benchmark
+    public void iterate_tagMap_forEach(Blackhole blackhole) {
+        // Taking advantage of passthrough of contextObj to avoid capturing lambda
+        tagMap.forEach(blackhole, (bh, entry) -> {
+            bh.consume(entry.tag());
+            bh.consume(entry.intValue());
         });
-  }
+    }
 
-  @Benchmark
-  public Integer get_tracerImmutableMap(Cursor cursor) {
-    return tracerImmutableMap.get(cursor.nextKey());
-  }
+    @Benchmark
+    public Integer get_tracerImmutableMap(Cursor cursor) {
+        return tracerImmutableMap.get(cursor.nextKey());
+    }
 
-  @Benchmark
-  public Integer get_tracerImmutableMap_sameKey(Cursor cursor) {
-    return tracerImmutableMap.get(cursor.nextKey(INSERTION_KEYS));
-  }
+    @Benchmark
+    public Integer get_tracerImmutableMap_sameKey(Cursor cursor) {
+        return tracerImmutableMap.get(cursor.nextKey(INSERTION_KEYS));
+    }
 
-  @Benchmark
-  public void iterate_tracerImmutableMap(Blackhole blackhole) {
-    for (Map.Entry<String, Integer> entry : tracerImmutableMap.entrySet()) {
-      blackhole.consume(entry.getKey());
-      blackhole.consume(entry.getValue());
+    @Benchmark
+    public void iterate_tracerImmutableMap(Blackhole blackhole) {
+        for (Map.Entry<String, Integer> entry : tracerImmutableMap.entrySet()) {
+            blackhole.consume(entry.getKey());
+            blackhole.consume(entry.getValue());
+        }
     }
-  }
 
-  @Benchmark
-  public int stringIndex_get(Cursor cursor) {
-    return SI_VALUES[stringIndex.indexOf(cursor.nextKey())];
-  }
+    @Benchmark
+    public int stringIndex_get(Cursor cursor) {
+        return SI_VALUES[stringIndex.indexOf(cursor.nextKey())];
+    }
 
-  @Benchmark
-  public int stringIndex_get_sameKey(Cursor cursor) {
-    return SI_VALUES[stringIndex.indexOf(cursor.nextKey(INSERTION_KEYS))];
-  }
+    @Benchmark
+    public int stringIndex_get_sameKey(Cursor cursor) {
+        return SI_VALUES[stringIndex.indexOf(cursor.nextKey(INSERTION_KEYS))];
+    }
 
-  @Benchmark
-  public int stringIndex_embedded_get(Cursor cursor) {
-    return SI_VALUES[StringIndex.EmbeddingSupport.indexOf(SI_HASHES, SI_NAMES, cursor.nextKey())];
-  }
+    @Benchmark
+    public int stringIndex_embedded_get(Cursor cursor) {
+        return SI_VALUES[StringIndex.EmbeddingSupport.indexOf(SI_HASHES, SI_NAMES, cursor.nextKey())];
+    }
 
-  @Benchmark
-  public int stringIndex_embedded_get_sameKey(Cursor cursor) {
-    return SI_VALUES[
-        StringIndex.EmbeddingSupport.indexOf(SI_HASHES, SI_NAMES, cursor.nextKey(INSERTION_KEYS))];
-  }
+    @Benchmark
+    public int stringIndex_embedded_get_sameKey(Cursor cursor) {
+        return SI_VALUES[StringIndex.EmbeddingSupport.indexOf(SI_HASHES, SI_NAMES, cursor.nextKey(INSERTION_KEYS))];
+    }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/ImmutableSetBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/ImmutableSetBenchmark.java
index b0977dc5ecb..966d6d523a3 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/ImmutableSetBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/ImmutableSetBenchmark.java
@@ -96,199 +96,199 @@
 @Threads(8)
 @State(Scope.Benchmark)
 public class ImmutableSetBenchmark {
-  static final String[] STRINGS = {
-    "foo", "bar", "baz", "quux", "hello", "world",
-    "service", "queryString", "lorem", "ipsum", "dolem", "sit"
-  };
+    static final String[] STRINGS = {
+        "foo", "bar", "baz", "quux", "hello", "world",
+        "service", "queryString", "lorem", "ipsum", "dolem", "sit"
+    };
+
+    /** Distinct String instances that are never present, for the miss path. */
+    static final String[] MISSES = newMisses();
+
+    /** Equal, non-interned copies of {@link #STRINGS} used to exercise equality. */
+    static final String[] FRESH_STRINGS = newFreshStrings();
+
+    static String[] newFreshStrings() {
+        String[] fresh = new String[STRINGS.length];
+        for (int i = 0; i < STRINGS.length; ++i) {
+            fresh[i] = new String(STRINGS[i]);
+        }
+        return fresh;
+    }
+
+    static String[] newMisses() {
+        String[] misses = new String[STRINGS.length * 4];
+        for (int i = 0; i < misses.length; ++i) {
+            misses[i] = "dne-" + i;
+        }
+        return misses;
+    }
+
+    // StringIndex static-EmbeddingSupport mode: the placed arrays pulled into static final fields, so
+    // the JIT folds the refs to constants and EmbeddingSupport.indexOf has nothing to dereference
+    // (the hot path the StringIndex class Javadoc recommends). Contrast stringIndex_embedded_*
+    // (these) with stringIndex_* (the instance wrapper, one field load) to see the indirection cost.
+    static final int[] SI_HASHES;
+    static final String[] SI_NAMES;
+
+    static {
+        StringIndex.Data data = StringIndex.EmbeddingSupport.create(STRINGS);
+        SI_HASHES = data.hashes;
+        SI_NAMES = data.names;
+    }
+
+    // Built once, never mutated -- safe to share across the reader threads.
+    String[] array;
+    String[] sortedArray;
+    HashSet<String> hashSet;
+    TreeSet<String> treeSet;
+    Set<String> tracerImmutableSet;
+    StringIndex stringIndex;
+
+    @Setup(Level.Trial)
+    public void setUp() {
+        BenchmarkUtils.polluteHashDispatch();
+
+        array = STRINGS;
+        sortedArray = Arrays.copyOf(STRINGS, STRINGS.length);
+        Arrays.sort(sortedArray);
+        hashSet = new HashSet<>(Arrays.asList(STRINGS));
+        treeSet = new TreeSet<>(Arrays.asList(STRINGS));
+        tracerImmutableSet = CollectionUtils.tryMakeImmutableSet(Arrays.asList(STRINGS));
+        stringIndex = StringIndex.of(STRINGS);
+    }
+
+    /** Per-thread lookup cursor so each reader thread cycles keys independently. */
+    @State(Scope.Thread)
+    public static class Cursor {
+        int hitIndex = 0;
+        int hitFreshIndex = 0;
+        int missIndex = 0;
+
+        String nextHit() {
+            int i = hitIndex + 1;
+            if (i >= STRINGS.length) {
+                i = 0;
+            }
+            hitIndex = i;
+            return STRINGS[i];
+        }
+
+        /** See {@code hitFresh} in the class javadoc. */
+        String nextHitFresh() {
+            int i = hitFreshIndex + 1;
+            if (i >= FRESH_STRINGS.length) {
+                i = 0;
+            }
+            hitFreshIndex = i;
+            return FRESH_STRINGS[i];
+        }
+
+        String nextMiss() {
+            int i = missIndex + 1;
+            if (i >= MISSES.length) {
+                i = 0;
+            }
+            missIndex = i;
+            return MISSES[i];
+        }
+    }
+
+    static boolean arrayContains(String[] array, String needle) {
+        for (String s : array) {
+            if (needle.equals(s)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Benchmark
+    public boolean array_hit(Cursor cursor) {
+        return arrayContains(array, cursor.nextHit());
+    }
+
+    @Benchmark
+    public boolean array_miss(Cursor cursor) {
+        return arrayContains(array, cursor.nextMiss());
+    }
+
+    @Benchmark
+    public boolean sortedArray_hit(Cursor cursor) {
+        return Arrays.binarySearch(sortedArray, cursor.nextHit()) >= 0;
+    }
 
-  /** Distinct String instances that are never present, for the miss path. */
-  static final String[] MISSES = newMisses();
+    @Benchmark
+    public boolean sortedArray_miss(Cursor cursor) {
+        return Arrays.binarySearch(sortedArray, cursor.nextMiss()) >= 0;
+    }
 
-  /** Equal, non-interned copies of {@link #STRINGS} used to exercise equality. */
-  static final String[] FRESH_STRINGS = newFreshStrings();
+    @Benchmark
+    public boolean hashSet_hit(Cursor cursor) {
+        return hashSet.contains(cursor.nextHit());
+    }
 
-  static String[] newFreshStrings() {
-    String[] fresh = new String[STRINGS.length];
-    for (int i = 0; i < STRINGS.length; ++i) {
-      fresh[i] = new String(STRINGS[i]);
+    @Benchmark
+    public boolean hashSet_hitFresh(Cursor cursor) {
+        return hashSet.contains(cursor.nextHitFresh());
     }
-    return fresh;
-  }
 
-  static String[] newMisses() {
-    String[] misses = new String[STRINGS.length * 4];
-    for (int i = 0; i < misses.length; ++i) {
-      misses[i] = "dne-" + i;
+    @Benchmark
+    public boolean hashSet_miss(Cursor cursor) {
+        return hashSet.contains(cursor.nextMiss());
     }
-    return misses;
-  }
-
-  // StringIndex static-EmbeddingSupport mode: the placed arrays pulled into static final fields, so
-  // the JIT folds the refs to constants and EmbeddingSupport.indexOf has nothing to dereference
-  // (the hot path the StringIndex class Javadoc recommends). Contrast stringIndex_embedded_*
-  // (these) with stringIndex_* (the instance wrapper, one field load) to see the indirection cost.
-  static final int[] SI_HASHES;
-  static final String[] SI_NAMES;
-
-  static {
-    StringIndex.Data data = StringIndex.EmbeddingSupport.create(STRINGS);
-    SI_HASHES = data.hashes;
-    SI_NAMES = data.names;
-  }
-
-  // Built once, never mutated -- safe to share across the reader threads.
-  String[] array;
-  String[] sortedArray;
-  HashSet<String> hashSet;
-  TreeSet<String> treeSet;
-  Set<String> tracerImmutableSet;
-  StringIndex stringIndex;
-
-  @Setup(Level.Trial)
-  public void setUp() {
-    BenchmarkUtils.polluteHashDispatch();
-
-    array = STRINGS;
-    sortedArray = Arrays.copyOf(STRINGS, STRINGS.length);
-    Arrays.sort(sortedArray);
-    hashSet = new HashSet<>(Arrays.asList(STRINGS));
-    treeSet = new TreeSet<>(Arrays.asList(STRINGS));
-    tracerImmutableSet = CollectionUtils.tryMakeImmutableSet(Arrays.asList(STRINGS));
-    stringIndex = StringIndex.of(STRINGS);
-  }
-
-  /** Per-thread lookup cursor so each reader thread cycles keys independently. */
-  @State(Scope.Thread)
-  public static class Cursor {
-    int hitIndex = 0;
-    int hitFreshIndex = 0;
-    int missIndex = 0;
-
-    String nextHit() {
-      int i = hitIndex + 1;
-      if (i >= STRINGS.length) {
-        i = 0;
-      }
-      hitIndex = i;
-      return STRINGS[i];
+
+    @Benchmark
+    public boolean treeSet_hit(Cursor cursor) {
+        return treeSet.contains(cursor.nextHit());
+    }
+
+    @Benchmark
+    public boolean treeSet_miss(Cursor cursor) {
+        return treeSet.contains(cursor.nextMiss());
+    }
+
+    @Benchmark
+    public boolean tracerImmutableSet_hit(Cursor cursor) {
+        return tracerImmutableSet.contains(cursor.nextHit());
+    }
+
+    @Benchmark
+    public boolean tracerImmutableSet_hitFresh(Cursor cursor) {
+        return tracerImmutableSet.contains(cursor.nextHitFresh());
+    }
+
+    @Benchmark
+    public boolean tracerImmutableSet_miss(Cursor cursor) {
+        return tracerImmutableSet.contains(cursor.nextMiss());
+    }
+
+    @Benchmark
+    public boolean stringIndex_hit(Cursor cursor) {
+        return stringIndex.contains(cursor.nextHit());
+    }
+
+    @Benchmark
+    public boolean stringIndex_hitFresh(Cursor cursor) {
+        return stringIndex.contains(cursor.nextHitFresh());
+    }
+
+    @Benchmark
+    public boolean stringIndex_miss(Cursor cursor) {
+        return stringIndex.contains(cursor.nextMiss());
     }
 
-    /** See {@code hitFresh} in the class javadoc. */
-    String nextHitFresh() {
-      int i = hitFreshIndex + 1;
-      if (i >= FRESH_STRINGS.length) {
-        i = 0;
-      }
-      hitFreshIndex = i;
-      return FRESH_STRINGS[i];
+    @Benchmark
+    public boolean stringIndex_embedded_hit(Cursor cursor) {
+        return StringIndex.EmbeddingSupport.contains(SI_HASHES, SI_NAMES, cursor.nextHit());
     }
 
-    String nextMiss() {
-      int i = missIndex + 1;
-      if (i >= MISSES.length) {
-        i = 0;
-      }
-      missIndex = i;
-      return MISSES[i];
+    @Benchmark
+    public boolean stringIndex_embedded_hitFresh(Cursor cursor) {
+        return StringIndex.EmbeddingSupport.contains(SI_HASHES, SI_NAMES, cursor.nextHitFresh());
     }
-  }
 
-  static boolean arrayContains(String[] array, String needle) {
-    for (String s : array) {
-      if (needle.equals(s)) {
-        return true;
-      }
+    @Benchmark
+    public boolean stringIndex_embedded_miss(Cursor cursor) {
+        return StringIndex.EmbeddingSupport.contains(SI_HASHES, SI_NAMES, cursor.nextMiss());
     }
-    return false;
-  }
-
-  @Benchmark
-  public boolean array_hit(Cursor cursor) {
-    return arrayContains(array, cursor.nextHit());
-  }
-
-  @Benchmark
-  public boolean array_miss(Cursor cursor) {
-    return arrayContains(array, cursor.nextMiss());
-  }
-
-  @Benchmark
-  public boolean sortedArray_hit(Cursor cursor) {
-    return Arrays.binarySearch(sortedArray, cursor.nextHit()) >= 0;
-  }
-
-  @Benchmark
-  public boolean sortedArray_miss(Cursor cursor) {
-    return Arrays.binarySearch(sortedArray, cursor.nextMiss()) >= 0;
-  }
-
-  @Benchmark
-  public boolean hashSet_hit(Cursor cursor) {
-    return hashSet.contains(cursor.nextHit());
-  }
-
-  @Benchmark
-  public boolean hashSet_hitFresh(Cursor cursor) {
-    return hashSet.contains(cursor.nextHitFresh());
-  }
-
-  @Benchmark
-  public boolean hashSet_miss(Cursor cursor) {
-    return hashSet.contains(cursor.nextMiss());
-  }
-
-  @Benchmark
-  public boolean treeSet_hit(Cursor cursor) {
-    return treeSet.contains(cursor.nextHit());
-  }
-
-  @Benchmark
-  public boolean treeSet_miss(Cursor cursor) {
-    return treeSet.contains(cursor.nextMiss());
-  }
-
-  @Benchmark
-  public boolean tracerImmutableSet_hit(Cursor cursor) {
-    return tracerImmutableSet.contains(cursor.nextHit());
-  }
-
-  @Benchmark
-  public boolean tracerImmutableSet_hitFresh(Cursor cursor) {
-    return tracerImmutableSet.contains(cursor.nextHitFresh());
-  }
-
-  @Benchmark
-  public boolean tracerImmutableSet_miss(Cursor cursor) {
-    return tracerImmutableSet.contains(cursor.nextMiss());
-  }
-
-  @Benchmark
-  public boolean stringIndex_hit(Cursor cursor) {
-    return stringIndex.contains(cursor.nextHit());
-  }
-
-  @Benchmark
-  public boolean stringIndex_hitFresh(Cursor cursor) {
-    return stringIndex.contains(cursor.nextHitFresh());
-  }
-
-  @Benchmark
-  public boolean stringIndex_miss(Cursor cursor) {
-    return stringIndex.contains(cursor.nextMiss());
-  }
-
-  @Benchmark
-  public boolean stringIndex_embedded_hit(Cursor cursor) {
-    return StringIndex.EmbeddingSupport.contains(SI_HASHES, SI_NAMES, cursor.nextHit());
-  }
-
-  @Benchmark
-  public boolean stringIndex_embedded_hitFresh(Cursor cursor) {
-    return StringIndex.EmbeddingSupport.contains(SI_HASHES, SI_NAMES, cursor.nextHitFresh());
-  }
-
-  @Benchmark
-  public boolean stringIndex_embedded_miss(Cursor cursor) {
-    return StringIndex.EmbeddingSupport.contains(SI_HASHES, SI_NAMES, cursor.nextMiss());
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/ListIterationBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/ListIterationBenchmark.java
index 30580f44719..10b76e8e749 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/ListIterationBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/ListIterationBenchmark.java
@@ -69,136 +69,137 @@
 @Threads(8)
 @State(Scope.Thread)
 public class ListIterationBenchmark {
-  public static final class Element {
-    int num = 0;
-
-    @CompilerControl(Mode.INLINE)
-    void manipulate_inline() {
-      this.num += 1;
+    public static final class Element {
+        int num = 0;
+
+        @CompilerControl(Mode.INLINE)
+        void manipulate_inline() {
+            this.num += 1;
+        }
+
+        @CompilerControl(Mode.DONT_INLINE)
+        void manipulate_dont_inline() {
+            this.num += 1;
+        }
     }
 
-    @CompilerControl(Mode.DONT_INLINE)
-    void manipulate_dont_inline() {
-      this.num += 1;
+    static ArrayList<Element> newArrayList(int size) {
+        ArrayList<Element> newList = new ArrayList<>(size);
+        for (int i = 0; i < size; ++i) {
+            newList.add(new Element());
+        }
+        return newList;
     }
-  }
 
-  static ArrayList<Element> newArrayList(int size) {
-    ArrayList<Element> newList = new ArrayList<>(size);
-    for (int i = 0; i < size; ++i) {
-      newList.add(new Element());
+    /**
+     * Describes the list under test as a factory rather than a prebuilt instance. Each benchmark
+     * thread builds its own list (with its own {@link Element}s) in {@link #setUp()}, so the {@code
+     * manipulate_*} mutations stay thread-local — otherwise, with {@code @Threads(8)} sharing one
+     * list held in an enum constant, the benchmark would measure cross-thread contention on {@code
+     * Element.num} rather than iteration cost.
+     */
+    public enum ListSpec {
+        COLLECTIONS_EMPTY_LIST(Collections::emptyList),
+        EMPTY_ARRAY_LIST(ArrayList::new),
+        SINGLETON_LIST(() -> Collections.singletonList(new Element())),
+        ARRAY_LIST_1(() -> newArrayList(1)),
+        ARRAY_LIST_5(() -> newArrayList(5)),
+        ARRAY_LIST_10(() -> newArrayList(10)),
+        ARRAY_LIST_100(() -> newArrayList(100));
+
+        private final Supplier<List<Element>> factory;
+
+        ListSpec(Supplier<List<Element>> factory) {
+            this.factory = factory;
+        }
+
+        List<Element> build() {
+            return factory.get();
+        }
     }
-    return newList;
-  }
 
-  /**
-   * Describes the list under test as a factory rather than a prebuilt instance. Each benchmark
-   * thread builds its own list (with its own {@link Element}s) in {@link #setUp()}, so the {@code
-   * manipulate_*} mutations stay thread-local — otherwise, with {@code @Threads(8)} sharing one
-   * list held in an enum constant, the benchmark would measure cross-thread contention on {@code
-   * Element.num} rather than iteration cost.
-   */
-  public enum ListSpec {
-    COLLECTIONS_EMPTY_LIST(Collections::emptyList),
-    EMPTY_ARRAY_LIST(ArrayList::new),
-    SINGLETON_LIST(() -> Collections.singletonList(new Element())),
-    ARRAY_LIST_1(() -> newArrayList(1)),
-    ARRAY_LIST_5(() -> newArrayList(5)),
-    ARRAY_LIST_10(() -> newArrayList(10)),
-    ARRAY_LIST_100(() -> newArrayList(100));
+    @Param
+    ListSpec listSpec;
 
-    private final Supplier<List<Element>> factory;
+    List<Element> list;
 
-    ListSpec(Supplier<List<Element>> factory) {
-      this.factory = factory;
+    @Setup(Level.Trial)
+    public void setUp() {
+        // Built per thread (the class is @State(Scope.Thread)) so each thread owns its own Elements.
+        this.list = this.listSpec.build();
     }
 
-    List<Element> build() {
-      return factory.get();
+    @Benchmark
+    public void forEach_inline() {
+        this.list.forEach(Element::manipulate_inline);
     }
-  }
-
-  @Param ListSpec listSpec;
 
-  List<Element> list;
-
-  @Setup(Level.Trial)
-  public void setUp() {
-    // Built per thread (the class is @State(Scope.Thread)) so each thread owns its own Elements.
-    this.list = this.listSpec.build();
-  }
+    @Benchmark
+    public void forEach_dont_inline() {
+        this.list.forEach(Element::manipulate_dont_inline);
+    }
 
-  @Benchmark
-  public void forEach_inline() {
-    this.list.forEach(Element::manipulate_inline);
-  }
+    @Benchmark
+    public void enhancedFor_inline() {
+        // Enhanced for-loop is just syntax sugar for an Iterator
+        for (Element e : this.list) {
+            e.manipulate_inline();
+        }
+    }
 
-  @Benchmark
-  public void forEach_dont_inline() {
-    this.list.forEach(Element::manipulate_dont_inline);
-  }
+    @Benchmark
+    public void enhancedFor_dont_inline() {
+        // Enhanced for-loop is just syntax sugar for an Iterator
+        for (Element e : this.list) {
+            e.manipulate_dont_inline();
+        }
+    }
 
-  @Benchmark
-  public void enhancedFor_inline() {
-    // Enhanced for-loop is just syntax sugar for an Iterator
-    for (Element e : this.list) {
-      e.manipulate_inline();
+    @Benchmark
+    public void iterator_inline() {
+        for (Iterator<Element> iter = this.list.iterator(); iter.hasNext(); ) {
+            iter.next().manipulate_inline();
+        }
     }
-  }
 
-  @Benchmark
-  public void enhancedFor_dont_inline() {
-    // Enhanced for-loop is just syntax sugar for an Iterator
-    for (Element e : this.list) {
-      e.manipulate_dont_inline();
+    @Benchmark
+    public void iterator_dont_inline() {
+        for (Iterator<Element> iter = this.list.iterator(); iter.hasNext(); ) {
+            iter.next().manipulate_dont_inline();
+        }
     }
-  }
 
-  @Benchmark
-  public void iterator_inline() {
-    for (Iterator<Element> iter = this.list.iterator(); iter.hasNext(); ) {
-      iter.next().manipulate_inline();
+    @Benchmark
+    public void cstyleFor_inline() {
+        for (int i = 0; i < this.list.size(); ++i) {
+            this.list.get(i).manipulate_inline();
+        }
     }
-  }
 
-  @Benchmark
-  public void iterator_dont_inline() {
-    for (Iterator<Element> iter = this.list.iterator(); iter.hasNext(); ) {
-      iter.next().manipulate_dont_inline();
+    @Benchmark
+    public void cstyleFor_dont_inline() {
+        for (int i = 0; i < this.list.size(); ++i) {
+            this.list.get(i).manipulate_dont_inline();
+        }
     }
-  }
 
-  @Benchmark
-  public void cstyleFor_inline() {
-    for (int i = 0; i < this.list.size(); ++i) {
-      this.list.get(i).manipulate_inline();
+    @Benchmark
+    public void streams_inline() {
+        this.list.stream().forEach(Element::manipulate_inline);
     }
-  }
 
-  @Benchmark
-  public void cstyleFor_dont_inline() {
-    for (int i = 0; i < this.list.size(); ++i) {
-      this.list.get(i).manipulate_dont_inline();
+    @Benchmark
+    public void streams_dont_inline() {
+        this.list.stream().forEach(Element::manipulate_dont_inline);
     }
-  }
-
-  @Benchmark
-  public void streams_inline() {
-    this.list.stream().forEach(Element::manipulate_inline);
-  }
 
-  @Benchmark
-  public void streams_dont_inline() {
-    this.list.stream().forEach(Element::manipulate_dont_inline);
-  }
-
-  @Benchmark
-  public void parallelStreams_inline() {
-    this.list.parallelStream().forEach(Element::manipulate_inline);
-  }
+    @Benchmark
+    public void parallelStreams_inline() {
+        this.list.parallelStream().forEach(Element::manipulate_inline);
+    }
 
-  @Benchmark
-  public void parallelStreams_dont_inline() {
-    this.list.parallelStream().forEach(Element::manipulate_dont_inline);
-  }
+    @Benchmark
+    public void parallelStreams_dont_inline() {
+        this.list.parallelStream().forEach(Element::manipulate_dont_inline);
+    }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/MaybeUsagePatternsBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/MaybeUsagePatternsBenchmark.java
index 78ee062e1ec..9011c5012cd 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/MaybeUsagePatternsBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/MaybeUsagePatternsBenchmark.java
@@ -48,10 +48,10 @@
  * the {@code Maybe} wrapper itself becomes a real allocation for either overload.
  */
 @Fork(
-    value = 2,
-    jvmArgsAppend = {
-      "-XX:CompileCommand=dontinline,datadog.trace.util.MaybeUsagePatternsBenchmark$UninlinedBoxedAdder::accept"
-    })
+        value = 2,
+        jvmArgsAppend = {
+            "-XX:CompileCommand=dontinline,datadog.trace.util.MaybeUsagePatternsBenchmark$UninlinedBoxedAdder::accept"
+        })
 @Warmup(iterations = 3, time = 1)
 @Measurement(iterations = 5, time = 1)
 @Threads(1)
@@ -60,132 +60,132 @@
 @State(Scope.Thread)
 public class MaybeUsagePatternsBenchmark {
 
-  static final class Widget {
-    long count;
-  }
-
-  /** A non-capturing updater, as {@link Maybe#update(long, ObjLongConsumer)} expects. */
-  static final ObjLongConsumer<Widget> ADD_PRIMITIVE = (w, delta) -> w.count += delta;
-
-  /**
-   * The same update expressed through the generic-context overload instead. {@code Long} is not
-   * assignable from {@code long} without boxing, so calling {@link Maybe#update(Object,
-   * BiConsumer)} with a {@code long} argument boxes it every time — the exact per-call allocation
-   * {@link Maybe#update(long, ObjLongConsumer)} exists to avoid. Kept as a {@code
-   * BiConsumer<Widget, Long>} rather than inlined at the call site so the two arms below differ
-   * only in which overload is selected, not in lambda shape.
-   */
-  static final BiConsumer<Widget, Long> ADD_BOXED_INLINED = (w, delta) -> w.count += delta;
-
-  /**
-   * Same logic as {@link #ADD_BOXED_INLINED}, but as a named class rather than a lambda so {@code
-   * -XX:CompileCommand=dontinline} (see this class's {@link Fork} annotation) has a concrete method
-   * to target -- kept out of line the same way {@code EscapeShapeBenchmark}'s {@code
-   * UninlinedStrategy} is, by the {@code CompileCommand} rather than {@code CompilerControl}, since
-   * JMH's processor only reads that annotation from {@code @Benchmark} methods.
-   */
-  static final class UninlinedBoxedAdder implements BiConsumer<Widget, Long> {
-    @Override
-    public void accept(Widget w, Long delta) {
-      w.count += delta;
+    static final class Widget {
+        long count;
     }
-  }
-
-  static final BiConsumer<Widget, Long> ADD_BOXED_UNINLINED = new UninlinedBoxedAdder();
-
-  /**
-   * Deliberately outside {@code Long}'s [-128, 127] cache range -- a cached delta like {@code 1L}
-   * would make {@link #badBoxedContextUpdateUninlined} read 0 B/op too, for a reason with nothing
-   * to do with which overload got picked.
-   */
-  static final long DELTA = 1_000L;
-
-  private final Widget[] table = new Widget[8];
-  private int counter;
-
-  public MaybeUsagePatternsBenchmark() {
-    for (int i = 0; i < table.length; i++) {
-      // Half the slots stay null so every arm below actually exercises the refused/empty path,
-      // not just the present one -- see EscapeShapeBenchmark's `alternate()` javadoc for why an
-      // always-taken branch would quietly turn these into single-site arms and lie.
-      if ((i & 1) == 0) {
-        table[i] = new Widget();
-      }
+
+    /** A non-capturing updater, as {@link Maybe#update(long, ObjLongConsumer)} expects. */
+    static final ObjLongConsumer<Widget> ADD_PRIMITIVE = (w, delta) -> w.count += delta;
+
+    /**
+     * The same update expressed through the generic-context overload instead. {@code Long} is not
+     * assignable from {@code long} without boxing, so calling {@link Maybe#update(Object,
+     * BiConsumer)} with a {@code long} argument boxes it every time — the exact per-call allocation
+     * {@link Maybe#update(long, ObjLongConsumer)} exists to avoid. Kept as a {@code
+     * BiConsumer<Widget, Long>} rather than inlined at the call site so the two arms below differ
+     * only in which overload is selected, not in lambda shape.
+     */
+    static final BiConsumer<Widget, Long> ADD_BOXED_INLINED = (w, delta) -> w.count += delta;
+
+    /**
+     * Same logic as {@link #ADD_BOXED_INLINED}, but as a named class rather than a lambda so {@code
+     * -XX:CompileCommand=dontinline} (see this class's {@link Fork} annotation) has a concrete method
+     * to target -- kept out of line the same way {@code EscapeShapeBenchmark}'s {@code
+     * UninlinedStrategy} is, by the {@code CompileCommand} rather than {@code CompilerControl}, since
+     * JMH's processor only reads that annotation from {@code @Benchmark} methods.
+     */
+    static final class UninlinedBoxedAdder implements BiConsumer<Widget, Long> {
+        @Override
+        public void accept(Widget w, Long delta) {
+            w.count += delta;
+        }
+    }
+
+    static final BiConsumer<Widget, Long> ADD_BOXED_UNINLINED = new UninlinedBoxedAdder();
+
+    /**
+     * Deliberately outside {@code Long}'s [-128, 127] cache range -- a cached delta like {@code 1L}
+     * would make {@link #badBoxedContextUpdateUninlined} read 0 B/op too, for a reason with nothing
+     * to do with which overload got picked.
+     */
+    static final long DELTA = 1_000L;
+
+    private final Widget[] table = new Widget[8];
+    private int counter;
+
+    public MaybeUsagePatternsBenchmark() {
+        for (int i = 0; i < table.length; i++) {
+            // Half the slots stay null so every arm below actually exercises the refused/empty path,
+            // not just the present one -- see EscapeShapeBenchmark's `alternate()` javadoc for why an
+            // always-taken branch would quietly turn these into single-site arms and lie.
+            if ((i & 1) == 0) {
+                table[i] = new Widget();
+            }
+        }
+    }
+
+    private int nextKey() {
+        return (counter++) & (table.length - 1);
+    }
+
+    @Nullable
+    private Widget lookup(int key) {
+        return table[key];
+    }
+
+    /**
+     * GOOD: exactly one {@code Maybe.of(...)} call site, fed by delegating to the existing nullable
+     * method. See {@link Maybe}'s class javadoc for why this is the recommended shape.
+     */
+    private Maybe<Widget> tryLookupDelegating(int key) {
+        return Maybe.of(lookup(key));
+    }
+
+    /**
+     * BAD: a {@code Maybe.of(...)} call site per branch. Both branches return the same wrapper type,
+     * so this looks equivalent to {@link #tryLookupDelegating} at every call site that uses it — the
+     * difference only shows up here, in the allocation profile of the method that builds the {@code
+     * Maybe}, which is exactly why it is easy to introduce by accident.
+     */
+    private Maybe<Widget> tryLookupMultiSite(int key) {
+        Widget w = lookup(key);
+        if (w != null) {
+            return Maybe.of(w);
+        } else {
+            return Maybe.<Widget>of(null);
+        }
+    }
+
+    @Benchmark
+    public void goodSingleConstructionSite(Blackhole bh) {
+        Maybe<Widget> t = tryLookupDelegating(nextKey());
+        bh.consume(t.isPresent());
+    }
+
+    @Benchmark
+    public void badMultiConstructionSite(Blackhole bh) {
+        Maybe<Widget> t = tryLookupMultiSite(nextKey());
+        bh.consume(t.isPresent());
     }
-  }
-
-  private int nextKey() {
-    return (counter++) & (table.length - 1);
-  }
-
-  @Nullable
-  private Widget lookup(int key) {
-    return table[key];
-  }
-
-  /**
-   * GOOD: exactly one {@code Maybe.of(...)} call site, fed by delegating to the existing nullable
-   * method. See {@link Maybe}'s class javadoc for why this is the recommended shape.
-   */
-  private Maybe<Widget> tryLookupDelegating(int key) {
-    return Maybe.of(lookup(key));
-  }
-
-  /**
-   * BAD: a {@code Maybe.of(...)} call site per branch. Both branches return the same wrapper type,
-   * so this looks equivalent to {@link #tryLookupDelegating} at every call site that uses it — the
-   * difference only shows up here, in the allocation profile of the method that builds the {@code
-   * Maybe}, which is exactly why it is easy to introduce by accident.
-   */
-  private Maybe<Widget> tryLookupMultiSite(int key) {
-    Widget w = lookup(key);
-    if (w != null) {
-      return Maybe.of(w);
-    } else {
-      return Maybe.<Widget>of(null);
+
+    @Benchmark
+    public void goodPrimitiveContextUpdate(Blackhole bh) {
+        Maybe<Widget> t = tryLookupDelegating(nextKey());
+        t.update(DELTA, ADD_PRIMITIVE);
+        bh.consume(t.isPresent());
+    }
+
+    /**
+     * Reads 0 B/op here despite boxing {@link #DELTA} on every call -- this call site stays inlined,
+     * so C2 scalar-replaces the {@code Long} the same as any other non-escaping object. See {@link
+     * #badBoxedContextUpdateUninlined} for what that 0 is actually contingent on.
+     */
+    @Benchmark
+    public void badBoxedContextUpdateInlined(Blackhole bh) {
+        Maybe<Widget> t = tryLookupDelegating(nextKey());
+        t.update(DELTA, ADD_BOXED_INLINED);
+        bh.consume(t.isPresent());
+    }
+
+    /**
+     * The same boxing, with only the inlining taken away (via {@link UninlinedBoxedAdder} and this
+     * class's {@code CompileCommand}). Whatever this costs above {@link #goodPrimitiveContextUpdate}
+     * is the box {@link #badBoxedContextUpdateInlined} was quietly relying on EA to remove.
+     */
+    @Benchmark
+    public void badBoxedContextUpdateUninlined(Blackhole bh) {
+        Maybe<Widget> t = tryLookupDelegating(nextKey());
+        t.update(DELTA, ADD_BOXED_UNINLINED);
+        bh.consume(t.isPresent());
     }
-  }
-
-  @Benchmark
-  public void goodSingleConstructionSite(Blackhole bh) {
-    Maybe<Widget> t = tryLookupDelegating(nextKey());
-    bh.consume(t.isPresent());
-  }
-
-  @Benchmark
-  public void badMultiConstructionSite(Blackhole bh) {
-    Maybe<Widget> t = tryLookupMultiSite(nextKey());
-    bh.consume(t.isPresent());
-  }
-
-  @Benchmark
-  public void goodPrimitiveContextUpdate(Blackhole bh) {
-    Maybe<Widget> t = tryLookupDelegating(nextKey());
-    t.update(DELTA, ADD_PRIMITIVE);
-    bh.consume(t.isPresent());
-  }
-
-  /**
-   * Reads 0 B/op here despite boxing {@link #DELTA} on every call -- this call site stays inlined,
-   * so C2 scalar-replaces the {@code Long} the same as any other non-escaping object. See {@link
-   * #badBoxedContextUpdateUninlined} for what that 0 is actually contingent on.
-   */
-  @Benchmark
-  public void badBoxedContextUpdateInlined(Blackhole bh) {
-    Maybe<Widget> t = tryLookupDelegating(nextKey());
-    t.update(DELTA, ADD_BOXED_INLINED);
-    bh.consume(t.isPresent());
-  }
-
-  /**
-   * The same boxing, with only the inlining taken away (via {@link UninlinedBoxedAdder} and this
-   * class's {@code CompileCommand}). Whatever this costs above {@link #goodPrimitiveContextUpdate}
-   * is the box {@link #badBoxedContextUpdateInlined} was quietly relying on EA to remove.
-   */
-  @Benchmark
-  public void badBoxedContextUpdateUninlined(Blackhole bh) {
-    Maybe<Widget> t = tryLookupDelegating(nextKey());
-    t.update(DELTA, ADD_BOXED_UNINLINED);
-    bh.consume(t.isPresent());
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/SingleThreadedMapBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/SingleThreadedMapBenchmark.java
index cb792cc1ca9..346e7420ca7 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/SingleThreadedMapBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/SingleThreadedMapBenchmark.java
@@ -57,289 +57,286 @@
 @Threads(8)
 @State(Scope.Thread)
 public class SingleThreadedMapBenchmark {
-  static final String[] INSERTION_KEYS = {
-    "foo", "bar", "baz", "quux", "foobar", "foobaz", "key0", "key1", "key2", "key3"
-  };
+    static final String[] INSERTION_KEYS = {
+        "foo", "bar", "baz", "quux", "foobar", "foobaz", "key0", "key1", "key2", "key3"
+    };
+
+    // Distinct String instances so lookups exercise equals(), not identity.
+    static final String[] EQUAL_KEYS = newEqualKeys();
+
+    static String[] newEqualKeys() {
+        String[] keys = new String[INSERTION_KEYS.length];
+        for (int i = 0; i < INSERTION_KEYS.length; ++i) {
+            keys[i] = new String(INSERTION_KEYS[i]);
+        }
+        return keys;
+    }
+
+    static void fill(Map<String, Integer> map) {
+        for (int i = 0; i < INSERTION_KEYS.length; ++i) {
+            map.put(INSERTION_KEYS[i], i);
+        }
+    }
+
+    static TagMap fillTagMap(TagMap map) {
+        for (int i = 0; i < INSERTION_KEYS.length; ++i) {
+            map.set(INSERTION_KEYS[i], i); // primitive support
+        }
+        return map;
+    }
+
+    // FlatHashtable is a find-or-create table over self-contained entries — no arbitrary put/remove,
+    // so only the comparable ops appear here: build (via the comparison-free insert of distinct
+    // keys),
+    // get, and iterate. Its entry carries the value UNBOXED (no Integer), one object per key.
+    static final class IntEntry {
+        final String key;
+        final int value;
+
+        IntEntry(String key, int value) {
+            this.key = key;
+            this.value = value;
+        }
+    }
+
+    static final class IntEntryKeyStrategy extends FlatHashtable.EntryStrategy<IntEntry, String> {
+        // Canonical exact-typed singleton: one instance, private ctor => the static-poly discipline is
+        // enforced by the class, not left to each caller to declare correctly.
+        static final IntEntryKeyStrategy INSTANCE = new IntEntryKeyStrategy();
+
+        private IntEntryKeyStrategy() {}
+
+        @Override
+        public boolean matches(IntEntry entry, String key) {
+            return key.equals(entry.key);
+        }
+
+        @Override
+        public long hashOf(IntEntry entry) {
+            return entry.key.hashCode(); // consistent with the default hashKey
+        }
+    }
+
+    // --- CHA-defeat decoys ---------------------------------------------------------------------
+    // Never used to build a table; loaded (in setUp) only so MatchingStrategy.matches and .hashKey
+    // each have >=2 concrete implementors. That denies C2 the single-implementor CHA devirtualization
+    // of matchStrat.hashKey/matches inside get(). If the strategy calls still inline afterward, the
+    // win is structural (the constant INSTANCE's exact type propagated through the inlined get), not
+    // a
+    // CHA bet that would deopt when a second subclass loads.
+
+    // Second matches impl -> MatchingStrategy.matches is polymorphic.
+    static final class DecoyMatchStrategy extends FlatHashtable.EntryStrategy<IntEntry, String> {
+        static final DecoyMatchStrategy INSTANCE = new DecoyMatchStrategy();
+
+        private DecoyMatchStrategy() {}
+
+        @Override
+        public boolean matches(IntEntry entry, String key) {
+            return key == entry.key; // deliberately different body from IntEntryKeyStrategy
+        }
+
+        @Override
+        public long hashOf(IntEntry entry) {
+            return entry.key.hashCode();
+        }
+    }
+
+    // Overrides hashKey -> MatchingStrategy.hashKey is polymorphic too (default + this override).
+    static final class DecoyHashKeyStrategy extends FlatHashtable.EntryStrategy<IntEntry, String> {
+        static final DecoyHashKeyStrategy INSTANCE = new DecoyHashKeyStrategy();
+
+        private DecoyHashKeyStrategy() {}
+
+        @Override
+        public long hashKey(String key) {
+            return key.length();
+        }
 
-  // Distinct String instances so lookups exercise equals(), not identity.
-  static final String[] EQUAL_KEYS = newEqualKeys();
+        @Override
+        public boolean matches(IntEntry entry, String key) {
+            return key.equals(entry.key);
+        }
 
-  static String[] newEqualKeys() {
-    String[] keys = new String[INSERTION_KEYS.length];
-    for (int i = 0; i < INSERTION_KEYS.length; ++i) {
-      keys[i] = new String(INSERTION_KEYS[i]);
+        @Override
+        public long hashOf(IntEntry entry) {
+            return entry.key.length();
+        }
     }
-    return keys;
-  }
 
-  static void fill(Map<String, Integer> map) {
-    for (int i = 0; i < INSERTION_KEYS.length; ++i) {
-      map.put(INSERTION_KEYS[i], i);
+    // Referenced only so these three concrete implementors load at benchmark class-init, before the
+    // hot method compiles — see the CHA-defeat note above.
+    @SuppressWarnings("unused")
+    static final Object[] CHA_DEFEAT = {
+        IntEntryKeyStrategy.INSTANCE, DecoyMatchStrategy.INSTANCE, DecoyHashKeyStrategy.INSTANCE
+    };
+
+    static IntEntry[] newFilledFlat() {
+        // Sized to the key count (FlatHashtable is fixed-capacity, no resize): load factor <= 0.5.
+        IntEntry[] table = FlatHashtable.create(IntEntry.class, INSERTION_KEYS.length);
+        for (int i = 0; i < INSERTION_KEYS.length; ++i) {
+            FlatHashtable.insert(table, new IntEntry(INSERTION_KEYS[i], i), IntEntryKeyStrategy.INSTANCE);
+        }
+        return table;
     }
-  }
 
-  static TagMap fillTagMap(TagMap map) {
-    for (int i = 0; i < INSERTION_KEYS.length; ++i) {
-      map.set(INSERTION_KEYS[i], i); // primitive support
+    // Per-thread prebuilt maps for the read + clone benchmarks (built once per trial, per thread).
+    HashMap<String, Integer> hashMap;
+    Map<String, Integer> synchronizedHashMap;
+    TreeMap<String, Integer> treeMap;
+    LinkedHashMap<String, Integer> linkedHashMap;
+    TagMap tagMap;
+    IntEntry[] flatTable;
+    int index = 0;
+
+    @Setup(Level.Trial)
+    public void setUp() {
+        hashMap = new HashMap<>();
+        fill(hashMap);
+        synchronizedHashMap = Collections.synchronizedMap(new HashMap<>(hashMap));
+        treeMap = new TreeMap<>();
+        fill(treeMap);
+        linkedHashMap = new LinkedHashMap<>();
+        fill(linkedHashMap);
+        tagMap = fillTagMap(TagMap.create());
+        flatTable = newFilledFlat();
     }
-    return map;
-  }
-
-  // FlatHashtable is a find-or-create table over self-contained entries — no arbitrary put/remove,
-  // so only the comparable ops appear here: build (via the comparison-free insert of distinct
-  // keys),
-  // get, and iterate. Its entry carries the value UNBOXED (no Integer), one object per key.
-  static final class IntEntry {
-    final String key;
-    final int value;
-
-    IntEntry(String key, int value) {
-      this.key = key;
-      this.value = value;
+
+    String nextLookupKey() {
+        if (++index >= EQUAL_KEYS.length) index = 0;
+        return EQUAL_KEYS[index];
     }
-  }
 
-  static final class IntEntryKeyStrategy extends FlatHashtable.EntryStrategy<IntEntry, String> {
-    // Canonical exact-typed singleton: one instance, private ctor => the static-poly discipline is
-    // enforced by the class, not left to each caller to declare correctly.
-    static final IntEntryKeyStrategy INSTANCE = new IntEntryKeyStrategy();
+    // ---- construction: build cost + allocation ----
 
-    private IntEntryKeyStrategy() {}
+    @Benchmark
+    public Map<String, Integer> create_hashMap() {
+        HashMap<String, Integer> map = new HashMap<>();
+        fill(map);
+        return map;
+    }
 
-    @Override
-    public boolean matches(IntEntry entry, String key) {
-      return key.equals(entry.key);
+    @Benchmark
+    public Map<String, Integer> create_hashMap_sized() {
+        // Sizing is preferable for large maps, but in practice most of our maps fall within the
+        // default.
+        HashMap<String, Integer> map = new HashMap<>(INSERTION_KEYS.length);
+        fill(map);
+        return map;
     }
 
-    @Override
-    public long hashOf(IntEntry entry) {
-      return entry.key.hashCode(); // consistent with the default hashKey
+    @Benchmark
+    public Map<String, Integer> create_synchronizedHashMap() {
+        Map<String, Integer> map = Collections.synchronizedMap(new HashMap<>());
+        fill(map);
+        return map;
     }
-  }
 
-  // --- CHA-defeat decoys ---------------------------------------------------------------------
-  // Never used to build a table; loaded (in setUp) only so MatchingStrategy.matches and .hashKey
-  // each have >=2 concrete implementors. That denies C2 the single-implementor CHA devirtualization
-  // of matchStrat.hashKey/matches inside get(). If the strategy calls still inline afterward, the
-  // win is structural (the constant INSTANCE's exact type propagated through the inlined get), not
-  // a
-  // CHA bet that would deopt when a second subclass loads.
+    @Benchmark
+    public TreeMap<String, Integer> create_treeMap() {
+        TreeMap<String, Integer> map = new TreeMap<>();
+        fill(map);
+        return map;
+    }
 
-  // Second matches impl -> MatchingStrategy.matches is polymorphic.
-  static final class DecoyMatchStrategy extends FlatHashtable.EntryStrategy<IntEntry, String> {
-    static final DecoyMatchStrategy INSTANCE = new DecoyMatchStrategy();
+    @Benchmark
+    public LinkedHashMap<String, Integer> create_linkedHashMap() {
+        LinkedHashMap<String, Integer> map = new LinkedHashMap<>();
+        fill(map);
+        return map;
+    }
 
-    private DecoyMatchStrategy() {}
+    @Benchmark
+    public TagMap create_tagMap() {
+        return fillTagMap(TagMap.create());
+    }
 
-    @Override
-    public boolean matches(IntEntry entry, String key) {
-      return key == entry.key; // deliberately different body from IntEntryKeyStrategy
+    @Benchmark
+    public TagMap create_tagMap_via_ledger() {
+        TagMap.Ledger ledger = TagMap.ledger();
+        for (int i = 0; i < INSERTION_KEYS.length; ++i) {
+            ledger.set(INSERTION_KEYS[i], i); // primitive support
+        }
+        return ledger.build();
     }
 
-    @Override
-    public long hashOf(IntEntry entry) {
-      return entry.key.hashCode();
+    @Benchmark
+    public IntEntry[] create_flatHashtable() {
+        return newFilledFlat();
     }
-  }
 
-  // Overrides hashKey -> MatchingStrategy.hashKey is polymorphic too (default + this override).
-  static final class DecoyHashKeyStrategy extends FlatHashtable.EntryStrategy<IntEntry, String> {
-    static final DecoyHashKeyStrategy INSTANCE = new DecoyHashKeyStrategy();
+    // ---- copy ----
 
-    private DecoyHashKeyStrategy() {}
+    @Benchmark
+    public Map<String, Integer> clone_hashMap() {
+        return new HashMap<>(hashMap);
+    }
 
-    @Override
-    public long hashKey(String key) {
-      return key.length();
+    @Benchmark
+    public Map<String, Integer> clone_synchronizedHashMap() {
+        return Collections.synchronizedMap(new HashMap<>(synchronizedHashMap));
     }
 
-    @Override
-    public boolean matches(IntEntry entry, String key) {
-      return key.equals(entry.key);
+    @Benchmark
+    public TreeMap<String, Integer> clone_treeMap() {
+        TreeMap<String, Integer> map = new TreeMap<>();
+        map.putAll(treeMap);
+        return map;
     }
 
-    @Override
-    public long hashOf(IntEntry entry) {
-      return entry.key.length();
+    @Benchmark
+    public LinkedHashMap<String, Integer> clone_linkedHashMap() {
+        return new LinkedHashMap<>(linkedHashMap);
     }
-  }
-
-  // Referenced only so these three concrete implementors load at benchmark class-init, before the
-  // hot method compiles — see the CHA-defeat note above.
-  @SuppressWarnings("unused")
-  static final Object[] CHA_DEFEAT = {
-    IntEntryKeyStrategy.INSTANCE, DecoyMatchStrategy.INSTANCE, DecoyHashKeyStrategy.INSTANCE
-  };
-
-  static IntEntry[] newFilledFlat() {
-    // Sized to the key count (FlatHashtable is fixed-capacity, no resize): load factor <= 0.5.
-    IntEntry[] table = FlatHashtable.create(IntEntry.class, INSERTION_KEYS.length);
-    for (int i = 0; i < INSERTION_KEYS.length; ++i) {
-      FlatHashtable.insert(table, new IntEntry(INSERTION_KEYS[i], i), IntEntryKeyStrategy.INSTANCE);
+
+    @Benchmark
+    public TagMap clone_tagMap() {
+        return tagMap.copy();
     }
-    return table;
-  }
-
-  // Per-thread prebuilt maps for the read + clone benchmarks (built once per trial, per thread).
-  HashMap<String, Integer> hashMap;
-  Map<String, Integer> synchronizedHashMap;
-  TreeMap<String, Integer> treeMap;
-  LinkedHashMap<String, Integer> linkedHashMap;
-  TagMap tagMap;
-  IntEntry[] flatTable;
-  int index = 0;
-
-  @Setup(Level.Trial)
-  public void setUp() {
-    hashMap = new HashMap<>();
-    fill(hashMap);
-    synchronizedHashMap = Collections.synchronizedMap(new HashMap<>(hashMap));
-    treeMap = new TreeMap<>();
-    fill(treeMap);
-    linkedHashMap = new LinkedHashMap<>();
-    fill(linkedHashMap);
-    tagMap = fillTagMap(TagMap.create());
-    flatTable = newFilledFlat();
-  }
-
-  String nextLookupKey() {
-    if (++index >= EQUAL_KEYS.length) index = 0;
-    return EQUAL_KEYS[index];
-  }
-
-  // ---- construction: build cost + allocation ----
-
-  @Benchmark
-  public Map<String, Integer> create_hashMap() {
-    HashMap<String, Integer> map = new HashMap<>();
-    fill(map);
-    return map;
-  }
-
-  @Benchmark
-  public Map<String, Integer> create_hashMap_sized() {
-    // Sizing is preferable for large maps, but in practice most of our maps fall within the
-    // default.
-    HashMap<String, Integer> map = new HashMap<>(INSERTION_KEYS.length);
-    fill(map);
-    return map;
-  }
-
-  @Benchmark
-  public Map<String, Integer> create_synchronizedHashMap() {
-    Map<String, Integer> map = Collections.synchronizedMap(new HashMap<>());
-    fill(map);
-    return map;
-  }
-
-  @Benchmark
-  public TreeMap<String, Integer> create_treeMap() {
-    TreeMap<String, Integer> map = new TreeMap<>();
-    fill(map);
-    return map;
-  }
-
-  @Benchmark
-  public LinkedHashMap<String, Integer> create_linkedHashMap() {
-    LinkedHashMap<String, Integer> map = new LinkedHashMap<>();
-    fill(map);
-    return map;
-  }
-
-  @Benchmark
-  public TagMap create_tagMap() {
-    return fillTagMap(TagMap.create());
-  }
-
-  @Benchmark
-  public TagMap create_tagMap_via_ledger() {
-    TagMap.Ledger ledger = TagMap.ledger();
-    for (int i = 0; i < INSERTION_KEYS.length; ++i) {
-      ledger.set(INSERTION_KEYS[i], i); // primitive support
+
+    // ---- read: unsynchronized baseline vs uncontended synchronized (biased-locking story) ----
+
+    @Benchmark
+    public Integer get_hashMap() {
+        return hashMap.get(nextLookupKey());
     }
-    return ledger.build();
-  }
-
-  @Benchmark
-  public IntEntry[] create_flatHashtable() {
-    return newFilledFlat();
-  }
-
-  // ---- copy ----
-
-  @Benchmark
-  public Map<String, Integer> clone_hashMap() {
-    return new HashMap<>(hashMap);
-  }
-
-  @Benchmark
-  public Map<String, Integer> clone_synchronizedHashMap() {
-    return Collections.synchronizedMap(new HashMap<>(synchronizedHashMap));
-  }
-
-  @Benchmark
-  public TreeMap<String, Integer> clone_treeMap() {
-    TreeMap<String, Integer> map = new TreeMap<>();
-    map.putAll(treeMap);
-    return map;
-  }
-
-  @Benchmark
-  public LinkedHashMap<String, Integer> clone_linkedHashMap() {
-    return new LinkedHashMap<>(linkedHashMap);
-  }
-
-  @Benchmark
-  public TagMap clone_tagMap() {
-    return tagMap.copy();
-  }
-
-  // ---- read: unsynchronized baseline vs uncontended synchronized (biased-locking story) ----
-
-  @Benchmark
-  public Integer get_hashMap() {
-    return hashMap.get(nextLookupKey());
-  }
-
-  @Benchmark
-  public Integer get_synchronizedHashMap() {
-    return synchronizedHashMap.get(nextLookupKey());
-  }
-
-  @Benchmark
-  public IntEntry get_flatHashtable() {
-    return FlatHashtable.get(flatTable, nextLookupKey(), IntEntryKeyStrategy.INSTANCE);
-  }
-
-  @Benchmark
-  public void iterate_hashMap(Blackhole blackhole) {
-    for (Map.Entry<String, Integer> entry : hashMap.entrySet()) {
-      blackhole.consume(entry.getKey());
-      blackhole.consume(entry.getValue());
+
+    @Benchmark
+    public Integer get_synchronizedHashMap() {
+        return synchronizedHashMap.get(nextLookupKey());
+    }
+
+    @Benchmark
+    public IntEntry get_flatHashtable() {
+        return FlatHashtable.get(flatTable, nextLookupKey(), IntEntryKeyStrategy.INSTANCE);
+    }
+
+    @Benchmark
+    public void iterate_hashMap(Blackhole blackhole) {
+        for (Map.Entry<String, Integer> entry : hashMap.entrySet()) {
+            blackhole.consume(entry.getKey());
+            blackhole.consume(entry.getValue());
+        }
     }
-  }
-
-  @Benchmark
-  public void iterate_synchronizedHashMap(Blackhole blackhole) {
-    // Collections.synchronizedMap requires the caller to synchronize during iteration; this is the
-    // correct usage and measures one (uncontended) monitor acquire around the traversal.
-    synchronized (synchronizedHashMap) {
-      for (Map.Entry<String, Integer> entry : synchronizedHashMap.entrySet()) {
-        blackhole.consume(entry.getKey());
-        blackhole.consume(entry.getValue());
-      }
+
+    @Benchmark
+    public void iterate_synchronizedHashMap(Blackhole blackhole) {
+        // Collections.synchronizedMap requires the caller to synchronize during iteration; this is the
+        // correct usage and measures one (uncontended) monitor acquire around the traversal.
+        synchronized (synchronizedHashMap) {
+            for (Map.Entry<String, Integer> entry : synchronizedHashMap.entrySet()) {
+                blackhole.consume(entry.getKey());
+                blackhole.consume(entry.getValue());
+            }
+        }
     }
-  }
-
-  @Benchmark
-  public void iterate_flatHashtable(Blackhole blackhole) {
-    // Context-passing forEach: blackhole rides through as context, so the lambda doesn't capture.
-    FlatHashtable.forEach(
-        flatTable,
-        blackhole,
-        (bh, e) -> {
-          bh.consume(e.key);
-          bh.consume(e.value);
+
+    @Benchmark
+    public void iterate_flatHashtable(Blackhole blackhole) {
+        // Context-passing forEach: blackhole rides through as context, so the lambda doesn't capture.
+        FlatHashtable.forEach(flatTable, blackhole, (bh, e) -> {
+            bh.consume(e.key);
+            bh.consume(e.value);
         });
-  }
+    }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/SingleThreadedSetBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/SingleThreadedSetBenchmark.java
index e145e6bbe8b..2eba926ec6a 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/SingleThreadedSetBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/SingleThreadedSetBenchmark.java
@@ -63,136 +63,136 @@
 @Threads(8)
 @State(Scope.Thread)
 public class SingleThreadedSetBenchmark {
-  static final String[] ELEMENTS = {
-    "foo", "bar", "baz", "quux", "hello", "world",
-    "service", "queryString", "lorem", "ipsum", "dolem", "sit"
-  };
-
-  // Distinct String instances so lookups exercise equals(), not identity.
-  static final String[] EQUAL_ELEMENTS = newEqualElements();
-
-  static String[] newEqualElements() {
-    String[] copies = new String[ELEMENTS.length];
-    for (int i = 0; i < ELEMENTS.length; ++i) {
-      copies[i] = new String(ELEMENTS[i]);
-    }
-    return copies;
-  }
-
-  static void fill(Set<String> set) {
-    for (String s : ELEMENTS) {
-      set.add(s);
-    }
-  }
-
-  // Per-thread prebuilt sets for the read + clone benchmarks (built once per trial, per thread).
-  HashSet<String> hashSet;
-  Set<String> synchronizedSet;
-  TreeSet<String> treeSet;
-  LinkedHashSet<String> linkedHashSet;
-  int index = 0;
-
-  @Setup(Level.Trial)
-  public void setUp() {
-    hashSet = new HashSet<>(Arrays.asList(ELEMENTS));
-    synchronizedSet = Collections.synchronizedSet(new HashSet<>(hashSet));
-    treeSet = new TreeSet<>(Arrays.asList(ELEMENTS));
-    linkedHashSet = new LinkedHashSet<>(Arrays.asList(ELEMENTS));
-  }
-
-  String nextLookup() {
-    if (++index >= EQUAL_ELEMENTS.length) {
-      index = 0;
-    }
-    return EQUAL_ELEMENTS[index];
-  }
-
-  // ---- construction: build cost + allocation ----
-
-  @Benchmark
-  public Set<String> create_hashSet() {
-    HashSet<String> set = new HashSet<>();
-    fill(set);
-    return set;
-  }
-
-  @Benchmark
-  public Set<String> create_hashSet_sized() {
-    HashSet<String> set = new HashSet<>(ELEMENTS.length);
-    fill(set);
-    return set;
-  }
-
-  @Benchmark
-  public Set<String> create_synchronizedSet() {
-    Set<String> set = Collections.synchronizedSet(new HashSet<>());
-    fill(set);
-    return set;
-  }
-
-  @Benchmark
-  public Set<String> create_treeSet() {
-    TreeSet<String> set = new TreeSet<>();
-    fill(set);
-    return set;
-  }
-
-  @Benchmark
-  public Set<String> create_linkedHashSet() {
-    LinkedHashSet<String> set = new LinkedHashSet<>();
-    fill(set);
-    return set;
-  }
-
-  // ---- copy ----
-
-  @Benchmark
-  public Set<String> clone_hashSet() {
-    return new HashSet<>(hashSet);
-  }
-
-  @Benchmark
-  public Set<String> clone_synchronizedSet() {
-    return Collections.synchronizedSet(new HashSet<>(synchronizedSet));
-  }
-
-  @Benchmark
-  public Set<String> clone_treeSet() {
-    return new TreeSet<>(treeSet);
-  }
-
-  @Benchmark
-  public Set<String> clone_linkedHashSet() {
-    return new LinkedHashSet<>(linkedHashSet);
-  }
-
-  // ---- read: unsynchronized baseline vs uncontended synchronized (biased-locking story) ----
-
-  @Benchmark
-  public boolean contains_hashSet() {
-    return hashSet.contains(nextLookup());
-  }
-
-  @Benchmark
-  public boolean contains_synchronizedSet() {
-    return synchronizedSet.contains(nextLookup());
-  }
-
-  @Benchmark
-  public void iterate_hashSet(Blackhole blackhole) {
-    for (String s : hashSet) {
-      blackhole.consume(s);
-    }
-  }
-
-  @Benchmark
-  public void iterate_synchronizedSet(Blackhole blackhole) {
-    // Collections.synchronizedSet requires the caller to synchronize during iteration; this is the
-    // correct usage and measures one (uncontended) monitor acquire around the traversal.
-    synchronized (synchronizedSet) {
-      for (String s : synchronizedSet) {
-        blackhole.consume(s);
-      }
-    }
-  }
+    static final String[] ELEMENTS = {
+        "foo", "bar", "baz", "quux", "hello", "world",
+        "service", "queryString", "lorem", "ipsum", "dolem", "sit"
+    };
+
+    // Distinct String instances so lookups exercise equals(), not identity.
+    static final String[] EQUAL_ELEMENTS = newEqualElements();
+
+    static String[] newEqualElements() {
+        String[] copies = new String[ELEMENTS.length];
+        for (int i = 0; i < ELEMENTS.length; ++i) {
+            copies[i] = new String(ELEMENTS[i]);
+        }
+        return copies;
+    }
+
+    static void fill(Set<String> set) {
+        for (String s : ELEMENTS) {
+            set.add(s);
+        }
+    }
+
+    // Per-thread prebuilt sets for the read + clone benchmarks (built once per trial, per thread).
+    HashSet<String> hashSet;
+    Set<String> synchronizedSet;
+    TreeSet<String> treeSet;
+    LinkedHashSet<String> linkedHashSet;
+    int index = 0;
+
+    @Setup(Level.Trial)
+    public void setUp() {
+        hashSet = new HashSet<>(Arrays.asList(ELEMENTS));
+        synchronizedSet = Collections.synchronizedSet(new HashSet<>(hashSet));
+        treeSet = new TreeSet<>(Arrays.asList(ELEMENTS));
+        linkedHashSet = new LinkedHashSet<>(Arrays.asList(ELEMENTS));
+    }
+
+    String nextLookup() {
+        if (++index >= EQUAL_ELEMENTS.length) {
+            index = 0;
+        }
+        return EQUAL_ELEMENTS[index];
+    }
+
+    // ---- construction: build cost + allocation ----
+
+    @Benchmark
+    public Set<String> create_hashSet() {
+        HashSet<String> set = new HashSet<>();
+        fill(set);
+        return set;
+    }
+
+    @Benchmark
+    public Set<String> create_hashSet_sized() {
+        HashSet<String> set = new HashSet<>(ELEMENTS.length);
+        fill(set);
+        return set;
+    }
+
+    @Benchmark
+    public Set<String> create_synchronizedSet() {
+        Set<String> set = Collections.synchronizedSet(new HashSet<>());
+        fill(set);
+        return set;
+    }
+
+    @Benchmark
+    public Set<String> create_treeSet() {
+        TreeSet<String> set = new TreeSet<>();
+        fill(set);
+        return set;
+    }
+
+    @Benchmark
+    public Set<String> create_linkedHashSet() {
+        LinkedHashSet<String> set = new LinkedHashSet<>();
+        fill(set);
+        return set;
+    }
+
+    // ---- copy ----
+
+    @Benchmark
+    public Set<String> clone_hashSet() {
+        return new HashSet<>(hashSet);
+    }
+
+    @Benchmark
+    public Set<String> clone_synchronizedSet() {
+        return Collections.synchronizedSet(new HashSet<>(synchronizedSet));
+    }
+
+    @Benchmark
+    public Set<String> clone_treeSet() {
+        return new TreeSet<>(treeSet);
+    }
+
+    @Benchmark
+    public Set<String> clone_linkedHashSet() {
+        return new LinkedHashSet<>(linkedHashSet);
+    }
+
+    // ---- read: unsynchronized baseline vs uncontended synchronized (biased-locking story) ----
+
+    @Benchmark
+    public boolean contains_hashSet() {
+        return hashSet.contains(nextLookup());
+    }
+
+    @Benchmark
+    public boolean contains_synchronizedSet() {
+        return synchronizedSet.contains(nextLookup());
+    }
+
+    @Benchmark
+    public void iterate_hashSet(Blackhole blackhole) {
+        for (String s : hashSet) {
+            blackhole.consume(s);
+        }
+    }
+
+    @Benchmark
+    public void iterate_synchronizedSet(Blackhole blackhole) {
+        // Collections.synchronizedSet requires the caller to synchronize during iteration; this is the
+        // correct usage and measures one (uncontended) monitor acquire around the traversal.
+        synchronized (synchronizedSet) {
+            for (String s : synchronizedSet) {
+                blackhole.consume(s);
+            }
+        }
+    }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/StringIndexSwitchBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/StringIndexSwitchBenchmark.java
index c527cb21a54..d849624772d 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/StringIndexSwitchBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/StringIndexSwitchBenchmark.java
@@ -75,226 +75,225 @@
 @Threads(8)
 @State(Scope.Benchmark)
 public class StringIndexSwitchBenchmark {
-  static final String[] KEYS = {
-    "alpha", "bravo", "charlie", "delta", "echo", "foxtrot", "golf", "hotel",
-    "india", "juliet", "kilo", "lima", "mike", "november", "oscar", "papa"
-  };
+    static final String[] KEYS = {
+        "alpha", "bravo", "charlie", "delta", "echo", "foxtrot", "golf", "hotel",
+        "india", "juliet", "kilo", "lima", "mike", "november", "oscar", "papa"
+    };
 
-  // A compile-time-constant hit key. javac inlines it, so the JIT can constant-propagate it into an
-  // inlined switch and fold the whole switch away -- the switch's theoretical ceiling. The const_*
-  // arms pair this with INLINE vs DONT_INLINE to show that ceiling only materializes when the call
-  // ALSO inlines: across a DONT_INLINE boundary the constant can't propagate in, so the switch runs
-  // in full. TagInterceptor's real regime is a runtime tag through a non-inlined call -- neither
-  // holds -- which is why StringIndex wins where it counts.
-  static final String CONST_KEY = "mike";
+    // A compile-time-constant hit key. javac inlines it, so the JIT can constant-propagate it into an
+    // inlined switch and fold the whole switch away -- the switch's theoretical ceiling. The const_*
+    // arms pair this with INLINE vs DONT_INLINE to show that ceiling only materializes when the call
+    // ALSO inlines: across a DONT_INLINE boundary the constant can't propagate in, so the switch runs
+    // in full. TagInterceptor's real regime is a runtime tag through a non-inlined call -- neither
+    // holds -- which is why StringIndex wins where it counts.
+    static final String CONST_KEY = "mike";
 
-  /** Distinct String instances that are never present, for the miss path. */
-  static final String[] MISSES = newMisses();
+    /** Distinct String instances that are never present, for the miss path. */
+    static final String[] MISSES = newMisses();
 
-  static String[] newMisses() {
-    String[] misses = new String[KEYS.length * 2];
-    for (int i = 0; i < misses.length; ++i) {
-      misses[i] = "dne-" + i;
+    static String[] newMisses() {
+        String[] misses = new String[KEYS.length * 2];
+        for (int i = 0; i < misses.length; ++i) {
+            misses[i] = "dne-" + i;
+        }
+        return misses;
     }
-    return misses;
-  }
 
-  // StringIndex placed arrays + slot-aligned ids, pulled into static final fields so the JIT folds
-  // the refs to constants (the hot path StringIndex recommends). IDS[slot] is the 1-based id;
-  // empty slots stay 0, which doubles as the "not found" sentinel.
-  static final int[] HASHES;
-  static final String[] NAMES;
-  static final int[] IDS;
+    // StringIndex placed arrays + slot-aligned ids, pulled into static final fields so the JIT folds
+    // the refs to constants (the hot path StringIndex recommends). IDS[slot] is the 1-based id;
+    // empty slots stay 0, which doubles as the "not found" sentinel.
+    static final int[] HASHES;
+    static final String[] NAMES;
+    static final int[] IDS;
 
-  static {
-    StringIndex.Data data = StringIndex.EmbeddingSupport.create(KEYS);
-    HASHES = data.hashes;
-    NAMES = data.names;
-    IDS = new int[HASHES.length];
-    for (int i = 0; i < KEYS.length; ++i) {
-      IDS[StringIndex.EmbeddingSupport.indexOf(HASHES, NAMES, KEYS[i])] =
-          i + 1; // 1-based; 0 = not found
+    static {
+        StringIndex.Data data = StringIndex.EmbeddingSupport.create(KEYS);
+        HASHES = data.hashes;
+        NAMES = data.names;
+        IDS = new int[HASHES.length];
+        for (int i = 0; i < KEYS.length; ++i) {
+            IDS[StringIndex.EmbeddingSupport.indexOf(HASHES, NAMES, KEYS[i])] = i + 1; // 1-based; 0 = not found
+        }
     }
-  }
 
-  /** Per-thread cursors so threads don't contend on a shared index under {@code @Threads(8)}. */
-  @State(Scope.Thread)
-  public static class Cursor {
-    int hit = 0;
-    int miss = 0;
+    /** Per-thread cursors so threads don't contend on a shared index under {@code @Threads(8)}. */
+    @State(Scope.Thread)
+    public static class Cursor {
+        int hit = 0;
+        int miss = 0;
 
-    String nextHit() {
-      int i = hit + 1;
-      if (i >= KEYS.length) {
-        i = 0;
-      }
-      hit = i;
-      return KEYS[i];
-    }
+        String nextHit() {
+            int i = hit + 1;
+            if (i >= KEYS.length) {
+                i = 0;
+            }
+            hit = i;
+            return KEYS[i];
+        }
 
-    String nextMiss() {
-      int i = miss + 1;
-      if (i >= MISSES.length) {
-        i = 0;
-      }
-      miss = i;
-      return MISSES[i];
+        String nextMiss() {
+            int i = miss + 1;
+            if (i >= MISSES.length) {
+                i = 0;
+            }
+            miss = i;
+            return MISSES[i];
+        }
     }
-  }
 
-  @CompilerControl(CompilerControl.Mode.INLINE)
-  static int switchInline(String key) {
-    switch (key) {
-      case "alpha":
-        return 1;
-      case "bravo":
-        return 2;
-      case "charlie":
-        return 3;
-      case "delta":
-        return 4;
-      case "echo":
-        return 5;
-      case "foxtrot":
-        return 6;
-      case "golf":
-        return 7;
-      case "hotel":
-        return 8;
-      case "india":
-        return 9;
-      case "juliet":
-        return 10;
-      case "kilo":
-        return 11;
-      case "lima":
-        return 12;
-      case "mike":
-        return 13;
-      case "november":
-        return 14;
-      case "oscar":
-        return 15;
-      case "papa":
-        return 16;
-      default:
-        return 0;
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    static int switchInline(String key) {
+        switch (key) {
+            case "alpha":
+                return 1;
+            case "bravo":
+                return 2;
+            case "charlie":
+                return 3;
+            case "delta":
+                return 4;
+            case "echo":
+                return 5;
+            case "foxtrot":
+                return 6;
+            case "golf":
+                return 7;
+            case "hotel":
+                return 8;
+            case "india":
+                return 9;
+            case "juliet":
+                return 10;
+            case "kilo":
+                return 11;
+            case "lima":
+                return 12;
+            case "mike":
+                return 13;
+            case "november":
+                return 14;
+            case "oscar":
+                return 15;
+            case "papa":
+                return 16;
+            default:
+                return 0;
+        }
     }
-  }
 
-  // Duplicate body, pinned non-inlinable -- TagInterceptor's actual call regime.
-  @CompilerControl(CompilerControl.Mode.DONT_INLINE)
-  static int switchNoInline(String key) {
-    switch (key) {
-      case "alpha":
-        return 1;
-      case "bravo":
-        return 2;
-      case "charlie":
-        return 3;
-      case "delta":
-        return 4;
-      case "echo":
-        return 5;
-      case "foxtrot":
-        return 6;
-      case "golf":
-        return 7;
-      case "hotel":
-        return 8;
-      case "india":
-        return 9;
-      case "juliet":
-        return 10;
-      case "kilo":
-        return 11;
-      case "lima":
-        return 12;
-      case "mike":
-        return 13;
-      case "november":
-        return 14;
-      case "oscar":
-        return 15;
-      case "papa":
-        return 16;
-      default:
-        return 0;
+    // Duplicate body, pinned non-inlinable -- TagInterceptor's actual call regime.
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    static int switchNoInline(String key) {
+        switch (key) {
+            case "alpha":
+                return 1;
+            case "bravo":
+                return 2;
+            case "charlie":
+                return 3;
+            case "delta":
+                return 4;
+            case "echo":
+                return 5;
+            case "foxtrot":
+                return 6;
+            case "golf":
+                return 7;
+            case "hotel":
+                return 8;
+            case "india":
+                return 9;
+            case "juliet":
+                return 10;
+            case "kilo":
+                return 11;
+            case "lima":
+                return 12;
+            case "mike":
+                return 13;
+            case "november":
+                return 14;
+            case "oscar":
+                return 15;
+            case "papa":
+                return 16;
+            default:
+                return 0;
+        }
     }
-  }
 
-  @CompilerControl(CompilerControl.Mode.INLINE)
-  static int indexInline(String key) {
-    int slot = StringIndex.EmbeddingSupport.indexOf(HASHES, NAMES, key);
-    return slot >= 0 ? IDS[slot] : 0;
-  }
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    static int indexInline(String key) {
+        int slot = StringIndex.EmbeddingSupport.indexOf(HASHES, NAMES, key);
+        return slot >= 0 ? IDS[slot] : 0;
+    }
 
-  @CompilerControl(CompilerControl.Mode.DONT_INLINE)
-  static int indexNoInline(String key) {
-    int slot = StringIndex.EmbeddingSupport.indexOf(HASHES, NAMES, key);
-    return slot >= 0 ? IDS[slot] : 0;
-  }
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    static int indexNoInline(String key) {
+        int slot = StringIndex.EmbeddingSupport.indexOf(HASHES, NAMES, key);
+        return slot >= 0 ? IDS[slot] : 0;
+    }
 
-  @Benchmark
-  public int switch_hit_inlined(Cursor cursor) {
-    return switchInline(cursor.nextHit());
-  }
+    @Benchmark
+    public int switch_hit_inlined(Cursor cursor) {
+        return switchInline(cursor.nextHit());
+    }
 
-  @Benchmark
-  public int switch_miss_inlined(Cursor cursor) {
-    return switchInline(cursor.nextMiss());
-  }
+    @Benchmark
+    public int switch_miss_inlined(Cursor cursor) {
+        return switchInline(cursor.nextMiss());
+    }
 
-  @Benchmark
-  public int switch_hit_noinline(Cursor cursor) {
-    return switchNoInline(cursor.nextHit());
-  }
+    @Benchmark
+    public int switch_hit_noinline(Cursor cursor) {
+        return switchNoInline(cursor.nextHit());
+    }
 
-  @Benchmark
-  public int switch_miss_noinline(Cursor cursor) {
-    return switchNoInline(cursor.nextMiss());
-  }
+    @Benchmark
+    public int switch_miss_noinline(Cursor cursor) {
+        return switchNoInline(cursor.nextMiss());
+    }
 
-  @Benchmark
-  public int stringIndex_hit_inlined(Cursor cursor) {
-    return indexInline(cursor.nextHit());
-  }
+    @Benchmark
+    public int stringIndex_hit_inlined(Cursor cursor) {
+        return indexInline(cursor.nextHit());
+    }
 
-  @Benchmark
-  public int stringIndex_miss_inlined(Cursor cursor) {
-    return indexInline(cursor.nextMiss());
-  }
+    @Benchmark
+    public int stringIndex_miss_inlined(Cursor cursor) {
+        return indexInline(cursor.nextMiss());
+    }
 
-  @Benchmark
-  public int stringIndex_hit_noinline(Cursor cursor) {
-    return indexNoInline(cursor.nextHit());
-  }
+    @Benchmark
+    public int stringIndex_hit_noinline(Cursor cursor) {
+        return indexNoInline(cursor.nextHit());
+    }
 
-  @Benchmark
-  public int stringIndex_miss_noinline(Cursor cursor) {
-    return indexNoInline(cursor.nextMiss());
-  }
+    @Benchmark
+    public int stringIndex_miss_noinline(Cursor cursor) {
+        return indexNoInline(cursor.nextMiss());
+    }
 
-  // --- constant key: the switch's best case (const-propagated). Inlined -> folds away; not-inlined
-  // -> the constant can't cross the boundary, so the switch runs in full. ---
+    // --- constant key: the switch's best case (const-propagated). Inlined -> folds away; not-inlined
+    // -> the constant can't cross the boundary, so the switch runs in full. ---
 
-  @Benchmark
-  public int switch_const_inlined() {
-    return switchInline(CONST_KEY);
-  }
+    @Benchmark
+    public int switch_const_inlined() {
+        return switchInline(CONST_KEY);
+    }
 
-  @Benchmark
-  public int switch_const_noinline() {
-    return switchNoInline(CONST_KEY);
-  }
+    @Benchmark
+    public int switch_const_noinline() {
+        return switchNoInline(CONST_KEY);
+    }
 
-  @Benchmark
-  public int stringIndex_const_inlined() {
-    return indexInline(CONST_KEY);
-  }
+    @Benchmark
+    public int stringIndex_const_inlined() {
+        return indexInline(CONST_KEY);
+    }
 
-  @Benchmark
-  public int stringIndex_const_noinline() {
-    return indexNoInline(CONST_KEY);
-  }
+    @Benchmark
+    public int stringIndex_const_noinline() {
+        return indexNoInline(CONST_KEY);
+    }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/StringReplaceAllBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/StringReplaceAllBenchmark.java
index 492b56bb654..df78cbd286e 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/StringReplaceAllBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/StringReplaceAllBenchmark.java
@@ -46,64 +46,56 @@
 @Threads(8)
 @SuppressForbidden
 public class StringReplaceAllBenchmark {
-  static final String[] INPUTS = {
-    "foo",
-    "baz",
-    "foobar",
-    "foobaz",
-    "foo=baz",
-    "bar=foo",
-    "foo=foo&bar=foo",
-    "lorem ipsum",
-    "datadog"
-  };
+    static final String[] INPUTS = {
+        "foo", "baz", "foobar", "foobaz", "foo=baz", "bar=foo", "foo=foo&bar=foo", "lorem ipsum", "datadog"
+    };
 
-  static int sharedInputIndex = 0;
+    static int sharedInputIndex = 0;
 
-  static String nextInput() {
-    int localIndex = ++sharedInputIndex;
-    if (localIndex >= INPUTS.length) {
-      sharedInputIndex = localIndex = 0;
+    static String nextInput() {
+        int localIndex = ++sharedInputIndex;
+        if (localIndex >= INPUTS.length) {
+            sharedInputIndex = localIndex = 0;
+        }
+        return INPUTS[localIndex];
     }
-    return INPUTS[localIndex];
-  }
 
-  @Benchmark
-  public String string_replaceAll() {
-    return _string_replaceAll(nextInput());
-  }
+    @Benchmark
+    public String string_replaceAll() {
+        return _string_replaceAll(nextInput());
+    }
 
-  static String _string_replaceAll(String input) {
-    // Underneath, this does Pattern.compile("foo").matcher(str).replaceAll()
-    return input.replaceAll("foo", "*redacted*");
-  }
+    static String _string_replaceAll(String input) {
+        // Underneath, this does Pattern.compile("foo").matcher(str).replaceAll()
+        return input.replaceAll("foo", "*redacted*");
+    }
 
-  @Benchmark
-  public String string_replace() {
-    return _string_replace(nextInput());
-  }
+    @Benchmark
+    public String string_replace() {
+        return _string_replace(nextInput());
+    }
 
-  static String _string_replace(String input) {
-    return input.replace("foo", "*redacted*");
-  }
+    static String _string_replace(String input) {
+        return input.replace("foo", "*redacted*");
+    }
 
-  static final Pattern REGEX_COMPILED = Pattern.compile("foo");
+    static final Pattern REGEX_COMPILED = Pattern.compile("foo");
 
-  @Benchmark
-  public String regex_replaceAll() {
-    return _regex_replaceAll(nextInput());
-  }
+    @Benchmark
+    public String regex_replaceAll() {
+        return _regex_replaceAll(nextInput());
+    }
 
-  static String _regex_replaceAll(String input) {
-    return REGEX_COMPILED.matcher(input).replaceAll("*redcated*");
-  }
+    static String _regex_replaceAll(String input) {
+        return REGEX_COMPILED.matcher(input).replaceAll("*redcated*");
+    }
 
-  @Benchmark
-  public String strings_replaceAll() {
-    return _strings_replaceAll(nextInput());
-  }
+    @Benchmark
+    public String strings_replaceAll() {
+        return _strings_replaceAll(nextInput());
+    }
 
-  static String _strings_replaceAll(String input) {
-    return Strings.replaceAll(input, "foo", "*redacted*");
-  }
+    static String _strings_replaceAll(String input) {
+        return Strings.replaceAll(input, "foo", "*redacted*");
+    }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/StringSplitBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/StringSplitBenchmark.java
index 584c375cdea..ae6cb70effe 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/StringSplitBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/StringSplitBenchmark.java
@@ -44,51 +44,52 @@
 @State(Scope.Benchmark)
 @SuppressForbidden
 public class StringSplitBenchmark {
-  public enum TestString {
-    EMPTY(""),
-    TRIVIAL("app_key=1111"),
-    SMALL("app_key=1111&foo=bar&baz=quux"),
-    MEDIUM(repeat("app_key=1111", '&', 100)),
-    LARGE(repeat("app_key=1111&application_key=2222&token=0894-4832", '&', 4096));
+    public enum TestString {
+        EMPTY(""),
+        TRIVIAL("app_key=1111"),
+        SMALL("app_key=1111&foo=bar&baz=quux"),
+        MEDIUM(repeat("app_key=1111", '&', 100)),
+        LARGE(repeat("app_key=1111&application_key=2222&token=0894-4832", '&', 4096));
 
-    final String str;
+        final String str;
 
-    TestString(String str) {
-      this.str = str;
-    }
-  };
+        TestString(String str) {
+            this.str = str;
+        }
+    };
 
-  @Param TestString testStr;
+    @Param
+    TestString testStr;
 
-  static final String repeat(String repeat, char separator, int length) {
-    StringBuilder builder = new StringBuilder(length);
-    builder.append(repeat);
-    while (builder.length() + repeat.length() + 1 < length) {
-      builder.append(separator).append(repeat);
+    static final String repeat(String repeat, char separator, int length) {
+        StringBuilder builder = new StringBuilder(length);
+        builder.append(repeat);
+        while (builder.length() + repeat.length() + 1 < length) {
+            builder.append(separator).append(repeat);
+        }
+        return builder.toString();
     }
-    return builder.toString();
-  }
 
-  @Benchmark
-  public void string_split(Blackhole bh) {
-    for (String substr : this.testStr.str.split("\\&")) {
-      bh.consume(substr);
+    @Benchmark
+    public void string_split(Blackhole bh) {
+        for (String substr : this.testStr.str.split("\\&")) {
+            bh.consume(substr);
+        }
     }
-  }
 
-  static final Pattern PATTERN = Pattern.compile("\\&");
+    static final Pattern PATTERN = Pattern.compile("\\&");
 
-  @Benchmark
-  public void pattern_split(Blackhole bh) {
-    for (String str : PATTERN.split(this.testStr.str)) {
-      bh.consume(str);
+    @Benchmark
+    public void pattern_split(Blackhole bh) {
+        for (String str : PATTERN.split(this.testStr.str)) {
+            bh.consume(str);
+        }
     }
-  }
 
-  @Benchmark
-  public void strings_split(Blackhole bh) {
-    for (SubSequence subSeq : Strings.split(this.testStr.str, '&')) {
-      bh.consume(subSeq);
+    @Benchmark
+    public void strings_split(Blackhole bh) {
+        for (SubSequence subSeq : Strings.split(this.testStr.str, '&')) {
+            bh.consume(subSeq);
+        }
     }
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/StringSubSequenceBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/StringSubSequenceBenchmark.java
index d24755e950b..4b412764e25 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/StringSubSequenceBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/StringSubSequenceBenchmark.java
@@ -29,36 +29,36 @@
 @Measurement(iterations = 3)
 @Threads(8)
 public class StringSubSequenceBenchmark {
-  static final String LOREM_IPSUM =
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+    static final String LOREM_IPSUM =
+            "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
 
-  @Benchmark
-  public void string_substring(Blackhole bh) {
-    String str = LOREM_IPSUM;
-    int len = str.length();
+    @Benchmark
+    public void string_substring(Blackhole bh) {
+        String str = LOREM_IPSUM;
+        int len = str.length();
 
-    for (int i = 0; i < str.length(); i += 100) {
-      bh.consume(str.substring(i, Math.min(i + 100, len)));
+        for (int i = 0; i < str.length(); i += 100) {
+            bh.consume(str.substring(i, Math.min(i + 100, len)));
+        }
     }
-  }
 
-  @Benchmark
-  public void string_subSequence(Blackhole bh) {
-    String str = LOREM_IPSUM;
-    int len = str.length();
+    @Benchmark
+    public void string_subSequence(Blackhole bh) {
+        String str = LOREM_IPSUM;
+        int len = str.length();
 
-    for (int i = 0; i < str.length(); i += 100) {
-      bh.consume(str.subSequence(i, Math.min(i + 100, len)));
+        for (int i = 0; i < str.length(); i += 100) {
+            bh.consume(str.subSequence(i, Math.min(i + 100, len)));
+        }
     }
-  }
 
-  @Benchmark
-  public void subSequence(Blackhole bh) {
-    String str = LOREM_IPSUM;
-    int len = str.length();
+    @Benchmark
+    public void subSequence(Blackhole bh) {
+        String str = LOREM_IPSUM;
+        int len = str.length();
 
-    for (int i = 0; i < str.length(); i += 100) {
-      bh.consume(SubSequence.of(str, i, Math.min(i + 100, len)));
+        for (int i = 0; i < str.length(); i += 100) {
+            bh.consume(SubSequence.of(str, i, Math.min(i + 100, len)));
+        }
     }
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/TagMapReadThroughBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/TagMapReadThroughBenchmark.java
index ed8768ef1cf..7906fbf1690 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/TagMapReadThroughBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/TagMapReadThroughBenchmark.java
@@ -44,41 +44,41 @@
 @Threads(8)
 public class TagMapReadThroughBenchmark {
 
-  @Param({"3", "7", "15"})
-  int traceTagCount;
+    @Param({"3", "7", "15"})
+    int traceTagCount;
 
-  private TagMap traceTags;
+    private TagMap traceTags;
 
-  @Setup(Level.Trial)
-  public void setup() {
-    TagMap m = TagMap.create(Math.max(16, traceTagCount * 2));
-    for (int i = 0; i < traceTagCount; i++) {
-      m.set("_dd.trace.tag." + i, "trace-value-" + i);
+    @Setup(Level.Trial)
+    public void setup() {
+        TagMap m = TagMap.create(Math.max(16, traceTagCount * 2));
+        for (int i = 0; i < traceTagCount; i++) {
+            m.set("_dd.trace.tag." + i, "trace-value-" + i);
+        }
+        this.traceTags = m.freeze();
     }
-    this.traceTags = m.freeze();
-  }
 
-  @Benchmark
-  public TagMap copyDown() {
-    TagMap m = TagMap.create(16);
-    m.putAll(traceTags); // putAll-into-empty: shares frozen entries, clones BucketGroups
-    setSpanTags(m);
-    return m;
-  }
+    @Benchmark
+    public TagMap copyDown() {
+        TagMap m = TagMap.create(16);
+        m.putAll(traceTags); // putAll-into-empty: shares frozen entries, clones BucketGroups
+        setSpanTags(m);
+        return m;
+    }
 
-  @Benchmark
-  public TagMap readThrough() {
-    // no copy; trace tags read through the shared frozen parent (fixed at construction)
-    TagMap m = TagMap.createFromParent(traceTags);
-    setSpanTags(m);
-    return m;
-  }
+    @Benchmark
+    public TagMap readThrough() {
+        // no copy; trace tags read through the shared frozen parent (fixed at construction)
+        TagMap m = TagMap.createFromParent(traceTags);
+        setSpanTags(m);
+        return m;
+    }
 
-  private static void setSpanTags(TagMap m) {
-    m.set("http.method", "GET");
-    m.set("http.url", "/api/checkout/cart");
-    m.set("component", "spring-web-controller");
-    m.set("span.kind", "server");
-    m.set("http.status_code", 200);
-  }
+    private static void setSpanTags(TagMap m) {
+        m.set("http.method", "GET");
+        m.set("http.url", "/api/checkout/cart");
+        m.set("component", "spring-web-controller");
+        m.set("span.kind", "server");
+        m.set("http.status_code", 200);
+    }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/ThreadSafeMapCounterBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/ThreadSafeMapCounterBenchmark.java
index bc8bc07b9f5..57269fec326 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/ThreadSafeMapCounterBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/ThreadSafeMapCounterBenchmark.java
@@ -62,79 +62,79 @@
 @Threads(8)
 public class ThreadSafeMapCounterBenchmark {
 
-  static final int N_KEYS = 64;
-  static final int CAPACITY = 128;
+    static final int N_KEYS = 64;
+    static final int CAPACITY = 128;
 
-  static final String[] KEYS = new String[N_KEYS];
+    static final String[] KEYS = new String[N_KEYS];
 
-  static {
-    for (int i = 0; i < N_KEYS; ++i) {
-      KEYS[i] = "key-" + i;
+    static {
+        for (int i = 0; i < N_KEYS; ++i) {
+            KEYS[i] = "key-" + i;
+        }
     }
-  }
 
-  static final class CounterEntry extends ConcurrentHashtable.D1.Entry<String> {
-    private static final AtomicLongFieldUpdater<CounterEntry> COUNT =
-        AtomicLongFieldUpdater.newUpdater(CounterEntry.class, "count");
+    static final class CounterEntry extends ConcurrentHashtable.D1.Entry<String> {
+        private static final AtomicLongFieldUpdater<CounterEntry> COUNT =
+                AtomicLongFieldUpdater.newUpdater(CounterEntry.class, "count");
 
-    volatile long count;
+        volatile long count;
 
-    CounterEntry(String key) {
-      super(key);
+        CounterEntry(String key) {
+            super(key);
+        }
+
+        long increment() {
+            return COUNT.incrementAndGet(this);
+        }
+    }
+
+    /**
+     * Shared state ({@link Scope#Benchmark}): one instance of each map across all threads, modelling
+     * a shared instrumentation counter table.
+     */
+    @State(Scope.Benchmark)
+    public static class SharedState {
+        ConcurrentHashtable.D1<String, CounterEntry> table;
+        ConcurrentHashMap<String, AtomicLong> atomicLongMap;
+        ConcurrentHashMap<String, LongAdder> longAdderMap;
+
+        @Setup(Level.Iteration)
+        public void setUp() {
+            table = ConcurrentHashtable.D1.createBounded(CounterEntry.class, CAPACITY);
+            atomicLongMap = new ConcurrentHashMap<>(CAPACITY);
+            longAdderMap = new ConcurrentHashMap<>(CAPACITY);
+            for (int i = 0; i < N_KEYS; ++i) {
+                table.tryGetOrCreateOrNull(KEYS[i], CounterEntry::new);
+                atomicLongMap.put(KEYS[i], new AtomicLong());
+                longAdderMap.put(KEYS[i], new LongAdder());
+            }
+        }
     }
 
-    long increment() {
-      return COUNT.incrementAndGet(this);
+    /** Per-thread cursor so each thread cycles through keys independently. */
+    @State(Scope.Thread)
+    public static class ThreadState {
+        int cursor;
+
+        int next() {
+            int i = cursor;
+            cursor = (i + 1) & (N_KEYS - 1);
+            return i;
+        }
     }
-  }
-
-  /**
-   * Shared state ({@link Scope#Benchmark}): one instance of each map across all threads, modelling
-   * a shared instrumentation counter table.
-   */
-  @State(Scope.Benchmark)
-  public static class SharedState {
-    ConcurrentHashtable.D1<String, CounterEntry> table;
-    ConcurrentHashMap<String, AtomicLong> atomicLongMap;
-    ConcurrentHashMap<String, LongAdder> longAdderMap;
-
-    @Setup(Level.Iteration)
-    public void setUp() {
-      table = ConcurrentHashtable.D1.createBounded(CounterEntry.class, CAPACITY);
-      atomicLongMap = new ConcurrentHashMap<>(CAPACITY);
-      longAdderMap = new ConcurrentHashMap<>(CAPACITY);
-      for (int i = 0; i < N_KEYS; ++i) {
-        table.tryGetOrCreateOrNull(KEYS[i], CounterEntry::new);
-        atomicLongMap.put(KEYS[i], new AtomicLong());
-        longAdderMap.put(KEYS[i], new LongAdder());
-      }
+
+    @Benchmark
+    public long increment_concurrentHashtable(SharedState s, ThreadState t) {
+        return s.table.get(KEYS[t.next()]).increment();
     }
-  }
 
-  /** Per-thread cursor so each thread cycles through keys independently. */
-  @State(Scope.Thread)
-  public static class ThreadState {
-    int cursor;
+    @Benchmark
+    public long increment_atomicLong(SharedState s, ThreadState t) {
+        return s.atomicLongMap.get(KEYS[t.next()]).incrementAndGet();
+    }
 
-    int next() {
-      int i = cursor;
-      cursor = (i + 1) & (N_KEYS - 1);
-      return i;
+    @Benchmark
+    public void increment_longAdder(SharedState s, ThreadState t) {
+        s.longAdderMap.get(KEYS[t.next()]).increment();
     }
-  }
-
-  @Benchmark
-  public long increment_concurrentHashtable(SharedState s, ThreadState t) {
-    return s.table.get(KEYS[t.next()]).increment();
-  }
-
-  @Benchmark
-  public long increment_atomicLong(SharedState s, ThreadState t) {
-    return s.atomicLongMap.get(KEYS[t.next()]).incrementAndGet();
-  }
-
-  @Benchmark
-  public void increment_longAdder(SharedState s, ThreadState t) {
-    s.longAdderMap.get(KEYS[t.next()]).increment();
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/ThreadSafeMapD1Benchmark.java b/internal-api/src/jmh/java/datadog/trace/util/ThreadSafeMapD1Benchmark.java
index 43d9b849f48..8a020d087ab 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/ThreadSafeMapD1Benchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/ThreadSafeMapD1Benchmark.java
@@ -72,115 +72,115 @@
 @Threads(8)
 public class ThreadSafeMapD1Benchmark {
 
-  static final int N_KEYS = 64;
-  static final int CAPACITY = 128;
+    static final int N_KEYS = 64;
+    static final int CAPACITY = 128;
 
-  static final String[] KEYS = new String[N_KEYS];
+    static final String[] KEYS = new String[N_KEYS];
 
-  static {
-    for (int i = 0; i < N_KEYS; ++i) {
-      KEYS[i] = "key-" + i;
+    static {
+        for (int i = 0; i < N_KEYS; ++i) {
+            KEYS[i] = "key-" + i;
+        }
     }
-  }
 
-  static final class D1Entry extends ConcurrentHashtable.D1.Entry<String> {
-    volatile long value;
+    static final class D1Entry extends ConcurrentHashtable.D1.Entry<String> {
+        volatile long value;
 
-    D1Entry(String key) {
-      super(key);
+        D1Entry(String key) {
+            super(key);
+        }
     }
-  }
-
-  /**
-   * Shared state ({@link Scope#Benchmark}): one instance of each map across all threads, modelling
-   * a shared instrumentation cache.
-   */
-  @State(Scope.Benchmark)
-  public static class SharedState {
-    ConcurrentHashtable.D1<String, D1Entry> table;
-    ConcurrentHashMap<String, Long> concurrentHashMap;
-    ConcurrentSkipListMap<String, Long> skipListMap;
-    Map<String, Long> synchronizedHashMap;
-
-    @Setup(Level.Iteration)
-    public void setUp() {
-      table = ConcurrentHashtable.D1.createBounded(D1Entry.class, CAPACITY);
-      concurrentHashMap = new ConcurrentHashMap<>(CAPACITY);
-      skipListMap = new ConcurrentSkipListMap<>();
-      synchronizedHashMap = Collections.synchronizedMap(new HashMap<>(CAPACITY));
-      for (int i = 0; i < N_KEYS; ++i) {
-        table.tryGetOrCreateOrNull(KEYS[i], D1Entry::new).value = i;
-        concurrentHashMap.put(KEYS[i], (long) i);
-        skipListMap.put(KEYS[i], (long) i);
-        synchronizedHashMap.put(KEYS[i], (long) i);
-      }
+
+    /**
+     * Shared state ({@link Scope#Benchmark}): one instance of each map across all threads, modelling
+     * a shared instrumentation cache.
+     */
+    @State(Scope.Benchmark)
+    public static class SharedState {
+        ConcurrentHashtable.D1<String, D1Entry> table;
+        ConcurrentHashMap<String, Long> concurrentHashMap;
+        ConcurrentSkipListMap<String, Long> skipListMap;
+        Map<String, Long> synchronizedHashMap;
+
+        @Setup(Level.Iteration)
+        public void setUp() {
+            table = ConcurrentHashtable.D1.createBounded(D1Entry.class, CAPACITY);
+            concurrentHashMap = new ConcurrentHashMap<>(CAPACITY);
+            skipListMap = new ConcurrentSkipListMap<>();
+            synchronizedHashMap = Collections.synchronizedMap(new HashMap<>(CAPACITY));
+            for (int i = 0; i < N_KEYS; ++i) {
+                table.tryGetOrCreateOrNull(KEYS[i], D1Entry::new).value = i;
+                concurrentHashMap.put(KEYS[i], (long) i);
+                skipListMap.put(KEYS[i], (long) i);
+                synchronizedHashMap.put(KEYS[i], (long) i);
+            }
+        }
+    }
+
+    /** Per-thread cursor so each thread cycles through keys independently. */
+    @State(Scope.Thread)
+    public static class ThreadState {
+        int cursor;
+
+        int next() {
+            int i = cursor;
+            cursor = (i + 1) & (N_KEYS - 1);
+            return i;
+        }
+    }
+
+    @Benchmark
+    public D1Entry get_concurrentHashtable(SharedState s, ThreadState t) {
+        return s.table.get(KEYS[t.next()]);
     }
-  }
 
-  /** Per-thread cursor so each thread cycles through keys independently. */
-  @State(Scope.Thread)
-  public static class ThreadState {
-    int cursor;
+    @Benchmark
+    public Long get_concurrentHashMap(SharedState s, ThreadState t) {
+        return s.concurrentHashMap.get(KEYS[t.next()]);
+    }
+
+    @Benchmark
+    public Long get_concurrentSkipListMap(SharedState s, ThreadState t) {
+        return s.skipListMap.get(KEYS[t.next()]);
+    }
 
-    int next() {
-      int i = cursor;
-      cursor = (i + 1) & (N_KEYS - 1);
-      return i;
+    @Benchmark
+    public Long get_synchronizedHashMap(SharedState s, ThreadState t) {
+        return s.synchronizedHashMap.get(KEYS[t.next()]);
     }
-  }
-
-  @Benchmark
-  public D1Entry get_concurrentHashtable(SharedState s, ThreadState t) {
-    return s.table.get(KEYS[t.next()]);
-  }
-
-  @Benchmark
-  public Long get_concurrentHashMap(SharedState s, ThreadState t) {
-    return s.concurrentHashMap.get(KEYS[t.next()]);
-  }
-
-  @Benchmark
-  public Long get_concurrentSkipListMap(SharedState s, ThreadState t) {
-    return s.skipListMap.get(KEYS[t.next()]);
-  }
-
-  @Benchmark
-  public Long get_synchronizedHashMap(SharedState s, ThreadState t) {
-    return s.synchronizedHashMap.get(KEYS[t.next()]);
-  }
-
-  @Benchmark
-  public D1Entry getOrCreate_concurrentHashtable(SharedState s, ThreadState t) {
-    return s.table.tryGetOrCreateOrNull(KEYS[t.next()], D1Entry::new);
-  }
-
-  /**
-   * get-first pattern for CHM — the idiomatic equivalent of D1.getOrCreate on a mostly-populated
-   * table.
-   */
-  @Benchmark
-  public Long getOrCreate_concurrentHashMap(SharedState s, ThreadState t) {
-    String key = KEYS[t.next()];
-    Long existing = s.concurrentHashMap.get(key);
-    if (existing != null) {
-      return existing;
+
+    @Benchmark
+    public D1Entry getOrCreate_concurrentHashtable(SharedState s, ThreadState t) {
+        return s.table.tryGetOrCreateOrNull(KEYS[t.next()], D1Entry::new);
     }
-    return s.concurrentHashMap.computeIfAbsent(key, k -> 0L);
-  }
-
-  /**
-   * get-first pattern for synchronized HashMap. On hit: one lock acquire/release for get. On miss:
-   * a second synchronized block for the double-checked put.
-   */
-  @Benchmark
-  public Long getOrCreate_synchronizedHashMap(SharedState s, ThreadState t) {
-    String key = KEYS[t.next()];
-    Long existing = s.synchronizedHashMap.get(key);
-    if (existing != null) {
-      return existing;
+
+    /**
+     * get-first pattern for CHM — the idiomatic equivalent of D1.getOrCreate on a mostly-populated
+     * table.
+     */
+    @Benchmark
+    public Long getOrCreate_concurrentHashMap(SharedState s, ThreadState t) {
+        String key = KEYS[t.next()];
+        Long existing = s.concurrentHashMap.get(key);
+        if (existing != null) {
+            return existing;
+        }
+        return s.concurrentHashMap.computeIfAbsent(key, k -> 0L);
     }
-    synchronized (s.synchronizedHashMap) {
-      return s.synchronizedHashMap.computeIfAbsent(key, k -> 0L);
+
+    /**
+     * get-first pattern for synchronized HashMap. On hit: one lock acquire/release for get. On miss:
+     * a second synchronized block for the double-checked put.
+     */
+    @Benchmark
+    public Long getOrCreate_synchronizedHashMap(SharedState s, ThreadState t) {
+        String key = KEYS[t.next()];
+        Long existing = s.synchronizedHashMap.get(key);
+        if (existing != null) {
+            return existing;
+        }
+        synchronized (s.synchronizedHashMap) {
+            return s.synchronizedHashMap.computeIfAbsent(key, k -> 0L);
+        }
     }
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/ThreadSafeMapD2Benchmark.java b/internal-api/src/jmh/java/datadog/trace/util/ThreadSafeMapD2Benchmark.java
index 57506a12230..dc0b014b97f 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/ThreadSafeMapD2Benchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/ThreadSafeMapD2Benchmark.java
@@ -80,262 +80,256 @@
 @Threads(8)
 public class ThreadSafeMapD2Benchmark {
 
-  static final int N_KEYS = 64;
-  static final int CAPACITY = 128;
-
-  static final String[] SOURCE_K1 = new String[N_KEYS];
-  static final Integer[] SOURCE_K2 = new Integer[N_KEYS];
-  static final int[] SOURCE_K2_INT = new int[N_KEYS];
-
-  static {
-    for (int i = 0; i < N_KEYS; ++i) {
-      SOURCE_K1[i] = "key-" + i;
-      SOURCE_K2_INT[i] = i * 31 + 17;
-      SOURCE_K2[i] = SOURCE_K2_INT[i];
+    static final int N_KEYS = 64;
+    static final int CAPACITY = 128;
+
+    static final String[] SOURCE_K1 = new String[N_KEYS];
+    static final Integer[] SOURCE_K2 = new Integer[N_KEYS];
+    static final int[] SOURCE_K2_INT = new int[N_KEYS];
+
+    static {
+        for (int i = 0; i < N_KEYS; ++i) {
+            SOURCE_K1[i] = "key-" + i;
+            SOURCE_K2_INT[i] = i * 31 + 17;
+            SOURCE_K2[i] = SOURCE_K2_INT[i];
+        }
     }
-  }
 
-  static final class D2Entry extends ConcurrentHashtable.D2.Entry<String, Integer> {
-    final long value;
+    static final class D2Entry extends ConcurrentHashtable.D2.Entry<String, Integer> {
+        final long value;
 
-    D2Entry(String k1, Integer k2) {
-      super(k1, k2);
-      this.value = 1L;
-    }
-  }
-
-  /**
-   * Entry used with the static helpers. Its primitive second key keeps storage and lookup unboxed,
-   * independently of {@link Integer} caching or JVM escape analysis.
-   */
-  static final class SupportEntry extends ConcurrentHashtable.Entry<SupportEntry> {
-    final String k1;
-    final int k2;
-    final long value;
-
-    SupportEntry(String k1, int k2) {
-      super(hash(k1, k2));
-      this.k1 = k1;
-      this.k2 = k2;
-      this.value = 1L;
+        D2Entry(String k1, Integer k2) {
+            super(k1, k2);
+            this.value = 1L;
+        }
     }
 
-    static long hash(String k1, int k2) {
-      return LongHashingUtils.hash(k1.hashCode(), Integer.hashCode(k2));
-    }
+    /**
+     * Entry used with the static helpers. Its primitive second key keeps storage and lookup unboxed,
+     * independently of {@link Integer} caching or JVM escape analysis.
+     */
+    static final class SupportEntry extends ConcurrentHashtable.Entry<SupportEntry> {
+        final String k1;
+        final int k2;
+        final long value;
+
+        SupportEntry(String k1, int k2) {
+            super(hash(k1, k2));
+            this.k1 = k1;
+            this.k2 = k2;
+            this.value = 1L;
+        }
 
-    boolean matches(String k1, int k2) {
-      return this.k2 == k2 && this.k1.equals(k1);
-    }
+        static long hash(String k1, int k2) {
+            return LongHashingUtils.hash(k1.hashCode(), Integer.hashCode(k2));
+        }
 
-    @Override
-    public boolean matches(SupportEntry other) {
-      return matches(other.k1, other.k2);
+        boolean matches(String k1, int k2) {
+            return this.k2 == k2 && this.k1.equals(k1);
+        }
+
+        @Override
+        public boolean matches(SupportEntry other) {
+            return matches(other.k1, other.k2);
+        }
     }
-  }
-
-  /** Composite key for map-based baselines. */
-  static final class Key2 implements Comparable<Key2> {
-    final String k1;
-    final Integer k2;
-    final int hash;
-
-    Key2(String k1, Integer k2) {
-      this.k1 = k1;
-      this.k2 = k2;
-      // Varargs-free hash: Objects.hash(k1, k2) would allocate an Object[] per key, penalizing the
-      // map baselines with an allocation the wrapper itself doesn't need and overstating the
-      // ConcurrentHashtable advantage this benchmark measures.
-      this.hash = 31 * k1.hashCode() + k2.hashCode();
+
+    /** Composite key for map-based baselines. */
+    static final class Key2 implements Comparable<Key2> {
+        final String k1;
+        final Integer k2;
+        final int hash;
+
+        Key2(String k1, Integer k2) {
+            this.k1 = k1;
+            this.k2 = k2;
+            // Varargs-free hash: Objects.hash(k1, k2) would allocate an Object[] per key, penalizing the
+            // map baselines with an allocation the wrapper itself doesn't need and overstating the
+            // ConcurrentHashtable advantage this benchmark measures.
+            this.hash = 31 * k1.hashCode() + k2.hashCode();
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof Key2)) {
+                return false;
+            }
+            Key2 other = (Key2) o;
+            return Objects.equals(k1, other.k1) && Objects.equals(k2, other.k2);
+        }
+
+        @Override
+        public int hashCode() {
+            return hash;
+        }
+
+        @Override
+        public int compareTo(Key2 other) {
+            int c = k1.compareTo(other.k1);
+            return c != 0 ? c : k2.compareTo(other.k2);
+        }
     }
 
-    @Override
-    public boolean equals(Object o) {
-      if (!(o instanceof Key2)) {
-        return false;
-      }
-      Key2 other = (Key2) o;
-      return Objects.equals(k1, other.k1) && Objects.equals(k2, other.k2);
+    /**
+     * Shared state ({@link Scope#Benchmark}): one instance of each map across all threads, modelling
+     * a shared instrumentation cache.
+     */
+    @State(Scope.Benchmark)
+    public static class SharedState {
+        ConcurrentHashtable.D2<String, Integer, D2Entry> table;
+        java.util.concurrent.atomic.AtomicReferenceArray<SupportEntry> supportBuckets;
+        ConcurrentHashMap<Key2, Long> concurrentHashMap;
+        ConcurrentSkipListMap<Key2, Long> skipListMap;
+        Map<Key2, Long> synchronizedHashMap;
+
+        @Setup(Level.Iteration)
+        public void setUp() {
+            table = ConcurrentHashtable.D2.createBounded(D2Entry.class, CAPACITY);
+            supportBuckets = ConcurrentHashtable.createFixedBuckets(SupportEntry.class, CAPACITY);
+            concurrentHashMap = new ConcurrentHashMap<>(CAPACITY);
+            skipListMap = new ConcurrentSkipListMap<>();
+            synchronizedHashMap = Collections.synchronizedMap(new HashMap<>(CAPACITY));
+            for (int i = 0; i < N_KEYS; ++i) {
+                int k2 = SOURCE_K2[i];
+                table.tryGetOrCreateOrNull(SOURCE_K1[i], SOURCE_K2[i], D2Entry::new);
+                // populate support table
+                SupportEntry se = new SupportEntry(SOURCE_K1[i], k2);
+                synchronized (ConcurrentHashtable.getWriteLock(supportBuckets, se.keyHash)) {
+                    ConcurrentHashtable.insertHeadEntryFor(supportBuckets, se.keyHash, se);
+                }
+                Key2 key = new Key2(SOURCE_K1[i], SOURCE_K2[i]);
+                concurrentHashMap.put(key, (long) i);
+                skipListMap.put(key, (long) i);
+                synchronizedHashMap.put(key, (long) i);
+            }
+        }
     }
 
-    @Override
-    public int hashCode() {
-      return hash;
+    /** Per-thread cursor so each thread cycles through keys independently. */
+    @State(Scope.Thread)
+    public static class ThreadState {
+        int cursor;
+
+        int next() {
+            int i = cursor;
+            cursor = (i + 1) & (N_KEYS - 1);
+            return i;
+        }
     }
 
-    @Override
-    public int compareTo(Key2 other) {
-      int c = k1.compareTo(other.k1);
-      return c != 0 ? c : k2.compareTo(other.k2);
+    @Benchmark
+    public D2Entry get_concurrentHashtable(SharedState s, ThreadState t) {
+        int i = t.next();
+        return s.table.get(SOURCE_K1[i], SOURCE_K2[i]);
     }
-  }
-
-  /**
-   * Shared state ({@link Scope#Benchmark}): one instance of each map across all threads, modelling
-   * a shared instrumentation cache.
-   */
-  @State(Scope.Benchmark)
-  public static class SharedState {
-    ConcurrentHashtable.D2<String, Integer, D2Entry> table;
-    java.util.concurrent.atomic.AtomicReferenceArray<SupportEntry> supportBuckets;
-    ConcurrentHashMap<Key2, Long> concurrentHashMap;
-    ConcurrentSkipListMap<Key2, Long> skipListMap;
-    Map<Key2, Long> synchronizedHashMap;
-
-    @Setup(Level.Iteration)
-    public void setUp() {
-      table = ConcurrentHashtable.D2.createBounded(D2Entry.class, CAPACITY);
-      supportBuckets = ConcurrentHashtable.createFixedBuckets(SupportEntry.class, CAPACITY);
-      concurrentHashMap = new ConcurrentHashMap<>(CAPACITY);
-      skipListMap = new ConcurrentSkipListMap<>();
-      synchronizedHashMap = Collections.synchronizedMap(new HashMap<>(CAPACITY));
-      for (int i = 0; i < N_KEYS; ++i) {
-        int k2 = SOURCE_K2[i];
-        table.tryGetOrCreateOrNull(SOURCE_K1[i], SOURCE_K2[i], D2Entry::new);
-        // populate support table
-        SupportEntry se = new SupportEntry(SOURCE_K1[i], k2);
-        synchronized (ConcurrentHashtable.getWriteLock(supportBuckets, se.keyHash)) {
-          ConcurrentHashtable.insertHeadEntryFor(supportBuckets, se.keyHash, se);
+
+    @Benchmark
+    public SupportEntry get_support(SharedState s, ThreadState t) {
+        int i = t.next();
+        String k1 = SOURCE_K1[i];
+        int k2 = SOURCE_K2_INT[i];
+        long keyHash = SupportEntry.hash(k1, k2);
+        for (SupportEntry e = ConcurrentHashtable.bucketFor(s.supportBuckets, keyHash); e != null; e = e.next()) {
+            if (e.keyHash == keyHash && e.matches(k1, k2)) {
+                return e;
+            }
         }
-        Key2 key = new Key2(SOURCE_K1[i], SOURCE_K2[i]);
-        concurrentHashMap.put(key, (long) i);
-        skipListMap.put(key, (long) i);
-        synchronizedHashMap.put(key, (long) i);
-      }
+        return null;
     }
-  }
 
-  /** Per-thread cursor so each thread cycles through keys independently. */
-  @State(Scope.Thread)
-  public static class ThreadState {
-    int cursor;
+    @Benchmark
+    public Long get_concurrentHashMap(SharedState s, ThreadState t) {
+        int i = t.next();
+        return s.concurrentHashMap.get(new Key2(SOURCE_K1[i], SOURCE_K2[i]));
+    }
 
-    int next() {
-      int i = cursor;
-      cursor = (i + 1) & (N_KEYS - 1);
-      return i;
+    @Benchmark
+    public Long get_concurrentSkipListMap(SharedState s, ThreadState t) {
+        int i = t.next();
+        return s.skipListMap.get(new Key2(SOURCE_K1[i], SOURCE_K2[i]));
     }
-  }
-
-  @Benchmark
-  public D2Entry get_concurrentHashtable(SharedState s, ThreadState t) {
-    int i = t.next();
-    return s.table.get(SOURCE_K1[i], SOURCE_K2[i]);
-  }
-
-  @Benchmark
-  public SupportEntry get_support(SharedState s, ThreadState t) {
-    int i = t.next();
-    String k1 = SOURCE_K1[i];
-    int k2 = SOURCE_K2_INT[i];
-    long keyHash = SupportEntry.hash(k1, k2);
-    for (SupportEntry e = ConcurrentHashtable.bucketFor(s.supportBuckets, keyHash);
-        e != null;
-        e = e.next()) {
-      if (e.keyHash == keyHash && e.matches(k1, k2)) {
-        return e;
-      }
+
+    @Benchmark
+    public Long get_synchronizedHashMap(SharedState s, ThreadState t) {
+        int i = t.next();
+        return s.synchronizedHashMap.get(new Key2(SOURCE_K1[i], SOURCE_K2[i]));
     }
-    return null;
-  }
-
-  @Benchmark
-  public Long get_concurrentHashMap(SharedState s, ThreadState t) {
-    int i = t.next();
-    return s.concurrentHashMap.get(new Key2(SOURCE_K1[i], SOURCE_K2[i]));
-  }
-
-  @Benchmark
-  public Long get_concurrentSkipListMap(SharedState s, ThreadState t) {
-    int i = t.next();
-    return s.skipListMap.get(new Key2(SOURCE_K1[i], SOURCE_K2[i]));
-  }
-
-  @Benchmark
-  public Long get_synchronizedHashMap(SharedState s, ThreadState t) {
-    int i = t.next();
-    return s.synchronizedHashMap.get(new Key2(SOURCE_K1[i], SOURCE_K2[i]));
-  }
-
-  @Benchmark
-  public D2Entry getOrCreate_concurrentHashtable(SharedState s, ThreadState t) {
-    int i = t.next();
-    return s.table.tryGetOrCreateOrNull(SOURCE_K1[i], SOURCE_K2[i], D2Entry::new);
-  }
-
-  @Benchmark
-  public SupportEntry getOrCreate_support(SharedState s, ThreadState t) {
-    int i = t.next();
-    String k1 = SOURCE_K1[i];
-    int k2 = SOURCE_K2_INT[i];
-    long keyHash = SupportEntry.hash(k1, k2);
-    int index = ConcurrentHashtable.bucketIndex(s.supportBuckets, keyHash);
-    for (SupportEntry e = ConcurrentHashtable.bucketAt(s.supportBuckets, index);
-        e != null;
-        e = e.next()) {
-      if (e.keyHash == keyHash && e.matches(k1, k2)) {
-        return e;
-      }
+
+    @Benchmark
+    public D2Entry getOrCreate_concurrentHashtable(SharedState s, ThreadState t) {
+        int i = t.next();
+        return s.table.tryGetOrCreateOrNull(SOURCE_K1[i], SOURCE_K2[i], D2Entry::new);
     }
-    synchronized (ConcurrentHashtable.getWriteLockAt(s.supportBuckets, index)) {
-      for (SupportEntry e = ConcurrentHashtable.bucketAt(s.supportBuckets, index);
-          e != null;
-          e = e.next()) {
-        if (e.keyHash == keyHash && e.matches(k1, k2)) {
-          return e;
+
+    @Benchmark
+    public SupportEntry getOrCreate_support(SharedState s, ThreadState t) {
+        int i = t.next();
+        String k1 = SOURCE_K1[i];
+        int k2 = SOURCE_K2_INT[i];
+        long keyHash = SupportEntry.hash(k1, k2);
+        int index = ConcurrentHashtable.bucketIndex(s.supportBuckets, keyHash);
+        for (SupportEntry e = ConcurrentHashtable.bucketAt(s.supportBuckets, index); e != null; e = e.next()) {
+            if (e.keyHash == keyHash && e.matches(k1, k2)) {
+                return e;
+            }
+        }
+        synchronized (ConcurrentHashtable.getWriteLockAt(s.supportBuckets, index)) {
+            for (SupportEntry e = ConcurrentHashtable.bucketAt(s.supportBuckets, index); e != null; e = e.next()) {
+                if (e.keyHash == keyHash && e.matches(k1, k2)) {
+                    return e;
+                }
+            }
+            SupportEntry newEntry = new SupportEntry(k1, k2);
+            ConcurrentHashtable.insertHeadEntryAt(s.supportBuckets, index, newEntry);
+            return newEntry;
         }
-      }
-      SupportEntry newEntry = new SupportEntry(k1, k2);
-      ConcurrentHashtable.insertHeadEntryAt(s.supportBuckets, index, newEntry);
-      return newEntry;
-    }
-  }
-
-  /**
-   * get-first pattern for CHM to avoid capturing-lambda allocation on hits — the idiomatic
-   * equivalent of D2.getOrCreate on a mostly-populated table.
-   */
-  @Benchmark
-  public Long getOrCreate_concurrentHashMap(SharedState s, ThreadState t) {
-    int i = t.next();
-    Key2 key = new Key2(SOURCE_K1[i], SOURCE_K2[i]);
-    Long existing = s.concurrentHashMap.get(key);
-    if (existing != null) {
-      return existing;
     }
-    return s.concurrentHashMap.computeIfAbsent(key, k -> 0L);
-  }
-
-  /**
-   * get-first pattern for ConcurrentSkipListMap — manual get-then-putIfAbsent since CSLM has no
-   * computeIfAbsent. Two traversals on miss; one on hit.
-   */
-  @Benchmark
-  public Long getOrCreate_concurrentSkipListMap(SharedState s, ThreadState t) {
-    int i = t.next();
-    Key2 key = new Key2(SOURCE_K1[i], SOURCE_K2[i]);
-    Long existing = s.skipListMap.get(key);
-    if (existing != null) {
-      return existing;
+
+    /**
+     * get-first pattern for CHM to avoid capturing-lambda allocation on hits — the idiomatic
+     * equivalent of D2.getOrCreate on a mostly-populated table.
+     */
+    @Benchmark
+    public Long getOrCreate_concurrentHashMap(SharedState s, ThreadState t) {
+        int i = t.next();
+        Key2 key = new Key2(SOURCE_K1[i], SOURCE_K2[i]);
+        Long existing = s.concurrentHashMap.get(key);
+        if (existing != null) {
+            return existing;
+        }
+        return s.concurrentHashMap.computeIfAbsent(key, k -> 0L);
     }
-    Long prev = s.skipListMap.putIfAbsent(key, 0L);
-    return prev != null ? prev : 0L;
-  }
-
-  /**
-   * get-first pattern for synchronized HashMap. On hit: one lock acquire/release for get. On miss:
-   * a second synchronized block for the double-checked put.
-   */
-  @Benchmark
-  public Long getOrCreate_synchronizedHashMap(SharedState s, ThreadState t) {
-    int i = t.next();
-    Key2 key = new Key2(SOURCE_K1[i], SOURCE_K2[i]);
-    Long existing = s.synchronizedHashMap.get(key);
-    if (existing != null) {
-      return existing;
+
+    /**
+     * get-first pattern for ConcurrentSkipListMap — manual get-then-putIfAbsent since CSLM has no
+     * computeIfAbsent. Two traversals on miss; one on hit.
+     */
+    @Benchmark
+    public Long getOrCreate_concurrentSkipListMap(SharedState s, ThreadState t) {
+        int i = t.next();
+        Key2 key = new Key2(SOURCE_K1[i], SOURCE_K2[i]);
+        Long existing = s.skipListMap.get(key);
+        if (existing != null) {
+            return existing;
+        }
+        Long prev = s.skipListMap.putIfAbsent(key, 0L);
+        return prev != null ? prev : 0L;
     }
-    synchronized (s.synchronizedHashMap) {
-      return s.synchronizedHashMap.computeIfAbsent(key, k -> 0L);
+
+    /**
+     * get-first pattern for synchronized HashMap. On hit: one lock acquire/release for get. On miss:
+     * a second synchronized block for the double-checked put.
+     */
+    @Benchmark
+    public Long getOrCreate_synchronizedHashMap(SharedState s, ThreadState t) {
+        int i = t.next();
+        Key2 key = new Key2(SOURCE_K1[i], SOURCE_K2[i]);
+        Long existing = s.synchronizedHashMap.get(key);
+        if (existing != null) {
+            return existing;
+        }
+        synchronized (s.synchronizedHashMap) {
+            return s.synchronizedHashMap.computeIfAbsent(key, k -> 0L);
+        }
     }
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/escape/EscapeShapeBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/escape/EscapeShapeBenchmark.java
index 8f9ab1c63fe..88eabbe06bd 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/escape/EscapeShapeBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/escape/EscapeShapeBenchmark.java
@@ -100,10 +100,10 @@
  * </ul>
  */
 @Fork(
-    value = 2,
-    jvmArgsAppend = {
-      "-XX:CompileCommand=dontinline,datadog.trace.util.escape.EscapeShapeBenchmark$UninlinedStrategy::apply"
-    })
+        value = 2,
+        jvmArgsAppend = {
+            "-XX:CompileCommand=dontinline,datadog.trace.util.escape.EscapeShapeBenchmark$UninlinedStrategy::apply"
+        })
 @Warmup(iterations = 3, time = 1)
 @Measurement(iterations = 5, time = 1)
 @Threads(1)
@@ -112,293 +112,292 @@
 @State(Scope.Thread)
 public class EscapeShapeBenchmark {
 
-  /**
-   * Minimal two-method interface -- a value to read and a close to call -- standing in for any
-   * short-lived object more complex than a single field.
-   */
-  interface Outcome {
-    int value();
+    /**
+     * Minimal two-method interface -- a value to read and a close to call -- standing in for any
+     * short-lived object more complex than a single field.
+     */
+    interface Outcome {
+        int value();
 
-    void close();
-  }
+        void close();
+    }
+
+    static final class SingleAllocation implements Outcome {
+        private final int seed;
+
+        SingleAllocation(int seed) {
+            this.seed = seed;
+        }
 
-  static final class SingleAllocation implements Outcome {
-    private final int seed;
+        @Override
+        public int value() {
+            return seed + 1;
+        }
 
-    SingleAllocation(int seed) {
-      this.seed = seed;
+        @Override
+        public void close() {}
     }
 
-    @Override
-    public int value() {
-      return seed + 1;
+    /** A second allocation site, for the merge that C2 has some chance with. */
+    static final class AlternateAllocation implements Outcome {
+        private final int seed;
+
+        AlternateAllocation(int seed) {
+            this.seed = seed;
+        }
+
+        @Override
+        public int value() {
+            return seed + 2;
+        }
+
+        @Override
+        public void close() {}
     }
 
-    @Override
-    public void close() {}
-  }
+    /** The absent outcome, reachable from a static, so the merge it takes part in is not local. */
+    static final Outcome STATIC_SINGLETON = new Outcome() {
+        @Override
+        public int value() {
+            return 0;
+        }
+
+        @Override
+        public void close() {}
+    };
 
-  /** A second allocation site, for the merge that C2 has some chance with. */
-  static final class AlternateAllocation implements Outcome {
-    private final int seed;
+    /** One allocation site carrying the outcome in a field: the shape that survives. */
+    static final class FlaggedAllocation {
+        private final boolean present;
+        private final int seed;
 
-    AlternateAllocation(int seed) {
-      this.seed = seed;
+        FlaggedAllocation(boolean present, int seed) {
+            this.present = present;
+            this.seed = seed;
+        }
+
+        int value() {
+            return present ? seed + 1 : 0;
+        }
+
+        void close() {}
     }
 
-    @Override
-    public int value() {
-      return seed + 2;
+    /**
+     * A non-capturing strategy held in a static final field of concrete type, as {@code @Strategy}
+     * requires.
+     */
+    interface OutcomeStrategy {
+        int apply(FlaggedAllocation cell);
     }
 
-    @Override
-    public void close() {}
-  }
+    static final OutcomeStrategy INLINED = FlaggedAllocation::value;
 
-  /** The absent outcome, reachable from a static, so the merge it takes part in is not local. */
-  static final Outcome STATIC_SINGLETON =
-      new Outcome() {
+    /**
+     * Kept out of line by the {@code CompileCommand} in {@link Fork}, not by {@link CompilerControl}:
+     * JMH's processor only collects that annotation from {@code @Benchmark} methods, so putting it
+     * here emits no hint at all and the arm silently becomes a duplicate of the inlined one. Check
+     * the timing against {@code passedToInlinedStrategy} before believing this row — a call that
+     * really did not inline cannot cost the same as no call.
+     */
+    static final class UninlinedStrategy implements OutcomeStrategy {
         @Override
-        public int value() {
-          return 0;
+        public int apply(FlaggedAllocation cell) {
+            return cell.value();
+        }
+    }
+
+    static final OutcomeStrategy UNINLINED = new UninlinedStrategy();
+
+    /**
+     * The template-method shape: a final method on a base type calling out to an abstract one, with
+     * the object under test riding along as the argument. How many concrete subclasses are loaded is
+     * the whole experiment — C2 inlines a monomorphic call outright and a bimorphic one behind a type
+     * guard, but gives up at three, and a call it does not inline turns its argument into an escape.
+     */
+    abstract static class Backing {
+        final int admit(FlaggedAllocation cell) {
+            return store(cell);
         }
 
+        abstract int store(FlaggedAllocation cell);
+    }
+
+    static final class ArrayBacking extends Backing {
         @Override
-        public void close() {}
-      };
+        int store(FlaggedAllocation cell) {
+            return cell.value();
+        }
+    }
 
-  /** One allocation site carrying the outcome in a field: the shape that survives. */
-  static final class FlaggedAllocation {
-    private final boolean present;
-    private final int seed;
+    static final class LinkedBacking extends Backing {
+        @Override
+        int store(FlaggedAllocation cell) {
+            return cell.value() + 1;
+        }
+    }
 
-    FlaggedAllocation(boolean present, int seed) {
-      this.present = present;
-      this.seed = seed;
+    static final class ThirdBacking extends Backing {
+        @Override
+        int store(FlaggedAllocation cell) {
+            return cell.value() + 2;
+        }
     }
 
-    int value() {
-      return present ? seed + 1 : 0;
+    // All three the same length, so the index arithmetic and the bounds check are identical and the
+    // only difference between the arms is how many types reach the call site.
+    //
+    // Unexplained: the monomorphic arm times slower than the bimorphic one (2.14 against 1.26 ns on
+    // 17), and equalising the lengths did not change it, so it is not the index arithmetic. Both
+    // eliminate their allocation, which is what this matrix is for, so the timing oddity does not
+    // touch any conclusion drawn here — but do not quote these two timings against each other until
+    // someone has read the assembly.
+    private final Backing[] one = {new ArrayBacking(), new ArrayBacking(), new ArrayBacking()};
+    private final Backing[] two = {new ArrayBacking(), new LinkedBacking(), new ArrayBacking()};
+    private final Backing[] three = {new ArrayBacking(), new LinkedBacking(), new ThirdBacking()};
+
+    // The three arms below are deliberately copy-pasted rather than sharing a helper. A shared helper
+    // would carry one profile for all three call sites, so the megamorphic arm would poison the other
+    // two and the matrix would report the same answer three times.
+
+    @Benchmark
+    public void backingMonomorphic(Blackhole bh) {
+        Backing backing = one[(counter++ & 0x7fffffff) % one.length];
+        FlaggedAllocation cell = new FlaggedAllocation(true, counter);
+        bh.consume(backing.admit(cell));
     }
 
-    void close() {}
-  }
-
-  /**
-   * A non-capturing strategy held in a static final field of concrete type, as {@code @Strategy}
-   * requires.
-   */
-  interface OutcomeStrategy {
-    int apply(FlaggedAllocation cell);
-  }
-
-  static final OutcomeStrategy INLINED = FlaggedAllocation::value;
-
-  /**
-   * Kept out of line by the {@code CompileCommand} in {@link Fork}, not by {@link CompilerControl}:
-   * JMH's processor only collects that annotation from {@code @Benchmark} methods, so putting it
-   * here emits no hint at all and the arm silently becomes a duplicate of the inlined one. Check
-   * the timing against {@code passedToInlinedStrategy} before believing this row — a call that
-   * really did not inline cannot cost the same as no call.
-   */
-  static final class UninlinedStrategy implements OutcomeStrategy {
-    @Override
-    public int apply(FlaggedAllocation cell) {
-      return cell.value();
+    @Benchmark
+    public void backingBimorphic(Blackhole bh) {
+        Backing backing = two[(counter++ & 0x7fffffff) % two.length];
+        FlaggedAllocation cell = new FlaggedAllocation(true, counter);
+        bh.consume(backing.admit(cell));
     }
-  }
-
-  static final OutcomeStrategy UNINLINED = new UninlinedStrategy();
-
-  /**
-   * The template-method shape: a final method on a base type calling out to an abstract one, with
-   * the object under test riding along as the argument. How many concrete subclasses are loaded is
-   * the whole experiment — C2 inlines a monomorphic call outright and a bimorphic one behind a type
-   * guard, but gives up at three, and a call it does not inline turns its argument into an escape.
-   */
-  abstract static class Backing {
-    final int admit(FlaggedAllocation cell) {
-      return store(cell);
+
+    @Benchmark
+    public void backingMegamorphic(Blackhole bh) {
+        Backing backing = three[(counter++ & 0x7fffffff) % three.length];
+        FlaggedAllocation cell = new FlaggedAllocation(true, counter);
+        bh.consume(backing.admit(cell));
     }
 
-    abstract int store(FlaggedAllocation cell);
-  }
+    /**
+     * Alternates so both sides of every branch are taken and the profile is honest. A branch C2 never
+     * sees taken becomes an uncommon trap, which would quietly turn the merge arms into single-site
+     * arms and make the whole matrix a lie.
+     */
+    private int counter;
 
-  static final class ArrayBacking extends Backing {
-    @Override
-    int store(FlaggedAllocation cell) {
-      return cell.value();
+    private boolean alternate() {
+        return (counter++ & 1) == 0;
     }
-  }
 
-  static final class LinkedBacking extends Backing {
-    @Override
-    int store(FlaggedAllocation cell) {
-      return cell.value() + 1;
+    @Benchmark
+    public void singleSite(Blackhole bh) {
+        SingleAllocation cell = new SingleAllocation(counter++);
+        bh.consume(cell.value());
     }
-  }
 
-  static final class ThirdBacking extends Backing {
-    @Override
-    int store(FlaggedAllocation cell) {
-      return cell.value() + 2;
+    @Benchmark
+    public void mergeOfTwoAllocations(Blackhole bh) {
+        Outcome cell = alternate() ? new SingleAllocation(counter) : new AlternateAllocation(counter);
+        bh.consume(cell.value());
     }
-  }
-
-  // All three the same length, so the index arithmetic and the bounds check are identical and the
-  // only difference between the arms is how many types reach the call site.
-  //
-  // Unexplained: the monomorphic arm times slower than the bimorphic one (2.14 against 1.26 ns on
-  // 17), and equalising the lengths did not change it, so it is not the index arithmetic. Both
-  // eliminate their allocation, which is what this matrix is for, so the timing oddity does not
-  // touch any conclusion drawn here — but do not quote these two timings against each other until
-  // someone has read the assembly.
-  private final Backing[] one = {new ArrayBacking(), new ArrayBacking(), new ArrayBacking()};
-  private final Backing[] two = {new ArrayBacking(), new LinkedBacking(), new ArrayBacking()};
-  private final Backing[] three = {new ArrayBacking(), new LinkedBacking(), new ThirdBacking()};
-
-  // The three arms below are deliberately copy-pasted rather than sharing a helper. A shared helper
-  // would carry one profile for all three call sites, so the megamorphic arm would poison the other
-  // two and the matrix would report the same answer three times.
-
-  @Benchmark
-  public void backingMonomorphic(Blackhole bh) {
-    Backing backing = one[(counter++ & 0x7fffffff) % one.length];
-    FlaggedAllocation cell = new FlaggedAllocation(true, counter);
-    bh.consume(backing.admit(cell));
-  }
-
-  @Benchmark
-  public void backingBimorphic(Blackhole bh) {
-    Backing backing = two[(counter++ & 0x7fffffff) % two.length];
-    FlaggedAllocation cell = new FlaggedAllocation(true, counter);
-    bh.consume(backing.admit(cell));
-  }
-
-  @Benchmark
-  public void backingMegamorphic(Blackhole bh) {
-    Backing backing = three[(counter++ & 0x7fffffff) % three.length];
-    FlaggedAllocation cell = new FlaggedAllocation(true, counter);
-    bh.consume(backing.admit(cell));
-  }
-
-  /**
-   * Alternates so both sides of every branch are taken and the profile is honest. A branch C2 never
-   * sees taken becomes an uncommon trap, which would quietly turn the merge arms into single-site
-   * arms and make the whole matrix a lie.
-   */
-  private int counter;
-
-  private boolean alternate() {
-    return (counter++ & 1) == 0;
-  }
-
-  @Benchmark
-  public void singleSite(Blackhole bh) {
-    SingleAllocation cell = new SingleAllocation(counter++);
-    bh.consume(cell.value());
-  }
-
-  @Benchmark
-  public void mergeOfTwoAllocations(Blackhole bh) {
-    Outcome cell = alternate() ? new SingleAllocation(counter) : new AlternateAllocation(counter);
-    bh.consume(cell.value());
-  }
-
-  @Benchmark
-  public void mergeWithStatic(Blackhole bh) {
-    Outcome cell = alternate() ? new SingleAllocation(counter) : STATIC_SINGLETON;
-    bh.consume(cell.value());
-  }
-
-  @Benchmark
-  public void mergeWithNull(Blackhole bh) {
-    SingleAllocation cell = alternate() ? new SingleAllocation(counter) : null;
-    bh.consume(cell == null ? 0 : cell.value());
-  }
-
-  @Benchmark
-  public void flagOnOneAllocation(Blackhole bh) {
-    FlaggedAllocation cell = new FlaggedAllocation(alternate(), counter);
-    bh.consume(cell.value());
-  }
-
-  @Benchmark
-  public void closedInFinally(Blackhole bh) {
-    SingleAllocation cell = new SingleAllocation(counter++);
-    try {
-      bh.consume(cell.value());
-    } finally {
-      cell.close();
+
+    @Benchmark
+    public void mergeWithStatic(Blackhole bh) {
+        Outcome cell = alternate() ? new SingleAllocation(counter) : STATIC_SINGLETON;
+        bh.consume(cell.value());
     }
-  }
 
-  /** Preallocated and stackless, so the arm measures control flow rather than fillInStackTrace. */
-  static final class Failure extends RuntimeException {
-    static final Failure INSTANCE = new Failure();
+    @Benchmark
+    public void mergeWithNull(Blackhole bh) {
+        SingleAllocation cell = alternate() ? new SingleAllocation(counter) : null;
+        bh.consume(cell == null ? 0 : cell.value());
+    }
 
-    private Failure() {
-      super("failure", null, false, false);
+    @Benchmark
+    public void flagOnOneAllocation(Blackhole bh) {
+        FlaggedAllocation cell = new FlaggedAllocation(alternate(), counter);
+        bh.consume(cell.value());
     }
-  }
-
-  /**
-   * The same try/finally, with the handler actually taken often enough to be compiled rather than
-   * left as an uncommon trap. This is the case {@link #closedInFinally} does not cover: there, C2
-   * has never seen the exception path, so there is no code for the object to be live into.
-   */
-  @Benchmark
-  public void closedInFinallyWithThrow(Blackhole bh) {
-    SingleAllocation cell = new SingleAllocation(counter++);
-    try {
-      if ((counter & 15) == 0) {
-        throw Failure.INSTANCE;
-      }
-      bh.consume(cell.value());
-    } catch (Failure failure) {
-      bh.consume(cell.value() + 1);
-    } finally {
-      cell.close();
+
+    @Benchmark
+    public void closedInFinally(Blackhole bh) {
+        SingleAllocation cell = new SingleAllocation(counter++);
+        try {
+            bh.consume(cell.value());
+        } finally {
+            cell.close();
+        }
     }
-  }
-
-  /** The Optional-style shape, whole: a singleton for one outcome, under try/finally. */
-  @Benchmark
-  public void mergeWithStaticClosedInFinally(Blackhole bh) {
-    Outcome cell = alternate() ? new SingleAllocation(counter) : STATIC_SINGLETON;
-    try {
-      bh.consume(cell.value());
-    } finally {
-      cell.close();
+
+    /** Preallocated and stackless, so the arm measures control flow rather than fillInStackTrace. */
+    static final class Failure extends RuntimeException {
+        static final Failure INSTANCE = new Failure();
+
+        private Failure() {
+            super("failure", null, false, false);
+        }
+    }
+
+    /**
+     * The same try/finally, with the handler actually taken often enough to be compiled rather than
+     * left as an uncommon trap. This is the case {@link #closedInFinally} does not cover: there, C2
+     * has never seen the exception path, so there is no code for the object to be live into.
+     */
+    @Benchmark
+    public void closedInFinallyWithThrow(Blackhole bh) {
+        SingleAllocation cell = new SingleAllocation(counter++);
+        try {
+            if ((counter & 15) == 0) {
+                throw Failure.INSTANCE;
+            }
+            bh.consume(cell.value());
+        } catch (Failure failure) {
+            bh.consume(cell.value() + 1);
+        } finally {
+            cell.close();
+        }
     }
-  }
-
-  /** The single-site shape, whole: one allocation carrying a flag, under try/finally. */
-  @Benchmark
-  public void flagOnOneAllocationClosedInFinally(Blackhole bh) {
-    FlaggedAllocation cell = new FlaggedAllocation(alternate(), counter);
-    try {
-      bh.consume(cell.value());
-    } finally {
-      cell.close();
+
+    /** The Optional-style shape, whole: a singleton for one outcome, under try/finally. */
+    @Benchmark
+    public void mergeWithStaticClosedInFinally(Blackhole bh) {
+        Outcome cell = alternate() ? new SingleAllocation(counter) : STATIC_SINGLETON;
+        try {
+            bh.consume(cell.value());
+        } finally {
+            cell.close();
+        }
+    }
+
+    /** The single-site shape, whole: one allocation carrying a flag, under try/finally. */
+    @Benchmark
+    public void flagOnOneAllocationClosedInFinally(Blackhole bh) {
+        FlaggedAllocation cell = new FlaggedAllocation(alternate(), counter);
+        try {
+            bh.consume(cell.value());
+        } finally {
+            cell.close();
+        }
+    }
+
+    /**
+     * A non-escaping object handed across a call boundary the strategy discipline keeps inlinable.
+     */
+    @Benchmark
+    public void passedToInlinedStrategy(Blackhole bh) {
+        FlaggedAllocation cell = new FlaggedAllocation(alternate(), counter);
+        bh.consume(INLINED.apply(cell));
+    }
+
+    /**
+     * The same, with only the inlining taken away. Whatever this costs is what the discipline buys.
+     */
+    @Benchmark
+    public void passedToUninlinedStrategy(Blackhole bh) {
+        FlaggedAllocation cell = new FlaggedAllocation(alternate(), counter);
+        bh.consume(UNINLINED.apply(cell));
     }
-  }
-
-  /**
-   * A non-escaping object handed across a call boundary the strategy discipline keeps inlinable.
-   */
-  @Benchmark
-  public void passedToInlinedStrategy(Blackhole bh) {
-    FlaggedAllocation cell = new FlaggedAllocation(alternate(), counter);
-    bh.consume(INLINED.apply(cell));
-  }
-
-  /**
-   * The same, with only the inlining taken away. Whatever this costs is what the discipline buys.
-   */
-  @Benchmark
-  public void passedToUninlinedStrategy(Blackhole bh) {
-    FlaggedAllocation cell = new FlaggedAllocation(alternate(), counter);
-    bh.consume(UNINLINED.apply(cell));
-  }
 }
diff --git a/internal-api/src/jmh/java/datadog/trace/util/stacktrace/HotSpotStackWalkerBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/stacktrace/HotSpotStackWalkerBenchmark.java
index e511e9eb186..fce03fe5707 100644
--- a/internal-api/src/jmh/java/datadog/trace/util/stacktrace/HotSpotStackWalkerBenchmark.java
+++ b/internal-api/src/jmh/java/datadog/trace/util/stacktrace/HotSpotStackWalkerBenchmark.java
@@ -30,47 +30,46 @@
 @State(Scope.Benchmark)
 public class HotSpotStackWalkerBenchmark {
 
-  private HotSpotStackWalker hotSpotStackWalker;
+    private HotSpotStackWalker hotSpotStackWalker;
 
-  private DefaultStackWalker defaultStackWalker;
+    private DefaultStackWalker defaultStackWalker;
 
-  @Param({"1", "3", "10"})
-  int limit;
+    @Param({"1", "3", "10"})
+    int limit;
 
-  @Param({"10", "50", "100"})
-  int deep;
+    @Param({"10", "50", "100"})
+    int deep;
 
-  @Setup(Level.Trial)
-  public void setup() {
-    hotSpotStackWalker = new HotSpotStackWalker();
-    defaultStackWalker = new DefaultStackWalker();
-  }
+    @Setup(Level.Trial)
+    public void setup() {
+        hotSpotStackWalker = new HotSpotStackWalker();
+        defaultStackWalker = new DefaultStackWalker();
+    }
 
-  @Benchmark
-  public void hotSpotStackWalkerWalk() {
-    generateStack(hotSpotStackWalker);
-  }
+    @Benchmark
+    public void hotSpotStackWalkerWalk() {
+        generateStack(hotSpotStackWalker);
+    }
 
-  @Benchmark
-  public void defaultStackWalkerWalk() {
-    generateStack(defaultStackWalker);
-  }
+    @Benchmark
+    public void defaultStackWalkerWalk() {
+        generateStack(defaultStackWalker);
+    }
 
-  private void generateStack(final StackWalker stackWalker) {
+    private void generateStack(final StackWalker stackWalker) {
 
-    Runnable runnable =
-        new Runnable() {
-          @SuppressForbidden
-          @Override
-          public void run() {
-            stackWalker.walk(this::toLimitedList).forEach(System.out::println);
-          }
+        Runnable runnable = new Runnable() {
+            @SuppressForbidden
+            @Override
+            public void run() {
+                stackWalker.walk(this::toLimitedList).forEach(System.out::println);
+            }
 
-          private List<StackTraceElement> toLimitedList(final Stream<StackTraceElement> stack) {
-            return stack.limit(limit).collect(Collectors.toList());
-          }
+            private List<StackTraceElement> toLimitedList(final Stream<StackTraceElement> stack) {
+                return stack.limit(limit).collect(Collectors.toList());
+            }
         };
 
-    RecursiveRunner runner = new RecursiveRunner(deep, runnable);
-  }
+        RecursiveRunner runner = new RecursiveRunner(deep, runnable);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/perfcontract/SuppressPerfContract.java b/internal-api/src/main/java/datadog/perfcontract/SuppressPerfContract.java
index 1c255854c20..eea2cec14bf 100644
--- a/internal-api/src/main/java/datadog/perfcontract/SuppressPerfContract.java
+++ b/internal-api/src/main/java/datadog/perfcontract/SuppressPerfContract.java
@@ -39,18 +39,18 @@
 @Documented
 @Retention(RetentionPolicy.CLASS)
 @Target({
-  ElementType.TYPE,
-  ElementType.FIELD,
-  ElementType.METHOD,
-  ElementType.CONSTRUCTOR,
-  ElementType.PARAMETER,
-  ElementType.ANNOTATION_TYPE
+    ElementType.TYPE,
+    ElementType.FIELD,
+    ElementType.METHOD,
+    ElementType.CONSTRUCTOR,
+    ElementType.PARAMETER,
+    ElementType.ANNOTATION_TYPE
 })
 public @interface SuppressPerfContract {
 
-  /** The perf-contract marker(s) being suppressed, by class reference. */
-  Class<? extends Annotation>[] value();
+    /** The perf-contract marker(s) being suppressed, by class reference. */
+    Class<? extends Annotation>[] value();
 
-  /** Why this exception is deliberate and reviewed, not an oversight. */
-  String reason();
+    /** Why this exception is deliberate and reviewed, not an oversight. */
+    String reason();
 }
diff --git a/internal-api/src/main/java/datadog/trace/advice/RequiresRequestContext.java b/internal-api/src/main/java/datadog/trace/advice/RequiresRequestContext.java
index f1eafc013c8..8c0ec0a196b 100644
--- a/internal-api/src/main/java/datadog/trace/advice/RequiresRequestContext.java
+++ b/internal-api/src/main/java/datadog/trace/advice/RequiresRequestContext.java
@@ -14,5 +14,5 @@
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.TYPE)
 public @interface RequiresRequestContext {
-  RequestContextSlot value();
+    RequestContextSlot value();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/BaseHash.java b/internal-api/src/main/java/datadog/trace/api/BaseHash.java
index 8aa17c4a0ff..9fd306c09ea 100644
--- a/internal-api/src/main/java/datadog/trace/api/BaseHash.java
+++ b/internal-api/src/main/java/datadog/trace/api/BaseHash.java
@@ -3,58 +3,58 @@
 import datadog.trace.util.FNV64Hash;
 
 public final class BaseHash {
-  private static volatile long baseHash;
-  private static volatile String baseHashStr;
-  private static volatile String lastContainerTagsHash;
-
-  private BaseHash() {}
-
-  public static void recalcBaseHash(String containerTagsHash) {
-    lastContainerTagsHash = containerTagsHash;
-    updateBaseHash(calc(containerTagsHash));
-  }
-
-  static void recalcBaseHash() {
-    updateBaseHash(calc(lastContainerTagsHash));
-  }
-
-  public static void updateBaseHash(long hash) {
-    baseHash = hash;
-    baseHashStr = Long.toString(hash);
-  }
-
-  public static long getBaseHash() {
-    return baseHash;
-  }
-
-  public static String getBaseHashStr() {
-    return baseHashStr;
-  }
-
-  public static long calc(String containerTagsHash) {
-    return calc(
-        Config.get().getServiceName(),
-        Config.get().getEnv(),
-        Config.get().getPrimaryTag(),
-        ProcessTags.getTagsForSerialization(),
-        containerTagsHash);
-  }
-
-  private static long calc(
-      CharSequence serviceName,
-      CharSequence env,
-      String primaryTag,
-      CharSequence processTags,
-      String containerTagsHash) {
-    long hash = FNV64Hash.generateHash(serviceName.toString(), FNV64Hash.Version.v1);
-    hash = FNV64Hash.continueHash(hash, env.toString(), FNV64Hash.Version.v1);
-    if (primaryTag != null) hash = FNV64Hash.continueHash(hash, primaryTag, FNV64Hash.Version.v1);
-    if (processTags != null) {
-      hash = FNV64Hash.continueHash(hash, processTags.toString(), FNV64Hash.Version.v1);
-      if (containerTagsHash != null && !containerTagsHash.isEmpty()) {
-        hash = FNV64Hash.continueHash(hash, containerTagsHash, FNV64Hash.Version.v1);
-      }
+    private static volatile long baseHash;
+    private static volatile String baseHashStr;
+    private static volatile String lastContainerTagsHash;
+
+    private BaseHash() {}
+
+    public static void recalcBaseHash(String containerTagsHash) {
+        lastContainerTagsHash = containerTagsHash;
+        updateBaseHash(calc(containerTagsHash));
+    }
+
+    static void recalcBaseHash() {
+        updateBaseHash(calc(lastContainerTagsHash));
+    }
+
+    public static void updateBaseHash(long hash) {
+        baseHash = hash;
+        baseHashStr = Long.toString(hash);
+    }
+
+    public static long getBaseHash() {
+        return baseHash;
+    }
+
+    public static String getBaseHashStr() {
+        return baseHashStr;
+    }
+
+    public static long calc(String containerTagsHash) {
+        return calc(
+                Config.get().getServiceName(),
+                Config.get().getEnv(),
+                Config.get().getPrimaryTag(),
+                ProcessTags.getTagsForSerialization(),
+                containerTagsHash);
+    }
+
+    private static long calc(
+            CharSequence serviceName,
+            CharSequence env,
+            String primaryTag,
+            CharSequence processTags,
+            String containerTagsHash) {
+        long hash = FNV64Hash.generateHash(serviceName.toString(), FNV64Hash.Version.v1);
+        hash = FNV64Hash.continueHash(hash, env.toString(), FNV64Hash.Version.v1);
+        if (primaryTag != null) hash = FNV64Hash.continueHash(hash, primaryTag, FNV64Hash.Version.v1);
+        if (processTags != null) {
+            hash = FNV64Hash.continueHash(hash, processTags.toString(), FNV64Hash.Version.v1);
+            if (containerTagsHash != null && !containerTagsHash.isEmpty()) {
+                hash = FNV64Hash.continueHash(hash, containerTagsHash, FNV64Hash.Version.v1);
+            }
+        }
+        return hash;
     }
-    return hash;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/ClassloaderConfigurationOverrides.java b/internal-api/src/main/java/datadog/trace/api/ClassloaderConfigurationOverrides.java
index ae10a7fac5d..a461e7b0ced 100644
--- a/internal-api/src/main/java/datadog/trace/api/ClassloaderConfigurationOverrides.java
+++ b/internal-api/src/main/java/datadog/trace/api/ClassloaderConfigurationOverrides.java
@@ -17,136 +17,133 @@
 import javax.annotation.Nullable;
 
 public class ClassloaderConfigurationOverrides {
-  public static final String DATADOG_TAGS_PREFIX = "datadog/tags/";
-  public static final String DATADOG_TAGS_JNDI_PREFIX = "java:comp/env/" + DATADOG_TAGS_PREFIX;
-  // not final for testing purposes
-  static boolean CAN_SPLIT_SERVICE_NAME_BY_DEPLOYMENT =
-      Config.get().isJeeSplitByDeployment() && !Config.get().isServiceNameSetByUser();
-
-  static class Lazy {
-    static final ClassloaderConfigurationOverrides INSTANCE =
-        new ClassloaderConfigurationOverrides();
-  }
-
-  public static class ContextualInfo {
-    private final String serviceName;
-    private final CharSequence serviceNameSource;
-    private final Map<String, Object> tags = new HashMap<>();
-
-    public ContextualInfo(String serviceName, CharSequence source) {
-      this.serviceName = serviceName;
-      this.serviceNameSource = source;
+    public static final String DATADOG_TAGS_PREFIX = "datadog/tags/";
+    public static final String DATADOG_TAGS_JNDI_PREFIX = "java:comp/env/" + DATADOG_TAGS_PREFIX;
+    // not final for testing purposes
+    static boolean CAN_SPLIT_SERVICE_NAME_BY_DEPLOYMENT =
+            Config.get().isJeeSplitByDeployment() && !Config.get().isServiceNameSetByUser();
+
+    static class Lazy {
+        static final ClassloaderConfigurationOverrides INSTANCE = new ClassloaderConfigurationOverrides();
     }
 
-    public String getServiceName() {
-      return serviceName;
-    }
+    public static class ContextualInfo {
+        private final String serviceName;
+        private final CharSequence serviceNameSource;
+        private final Map<String, Object> tags = new HashMap<>();
 
-    public CharSequence getServiceNameSource() {
-      return serviceNameSource;
-    }
+        public ContextualInfo(String serviceName, CharSequence source) {
+            this.serviceName = serviceName;
+            this.serviceNameSource = source;
+        }
 
-    public void addTag(String name, Object value) {
-      tags.put(name, value);
-    }
+        public String getServiceName() {
+            return serviceName;
+        }
+
+        public CharSequence getServiceNameSource() {
+            return serviceNameSource;
+        }
+
+        public void addTag(String name, Object value) {
+            tags.put(name, value);
+        }
 
-    public Map<String, Object> getTags() {
-      return Collections.unmodifiableMap(tags);
+        public Map<String, Object> getTags() {
+            return Collections.unmodifiableMap(tags);
+        }
     }
-  }
 
-  private static final Function<ClassLoader, ContextualInfo> EMPTY_CONTEXTUAL_INFO_ADDER =
-      ignored -> new ContextualInfo(null, null);
+    private static final Function<ClassLoader, ContextualInfo> EMPTY_CONTEXTUAL_INFO_ADDER =
+            ignored -> new ContextualInfo(null, null);
 
-  private final WeakHashMap<ClassLoader, ContextualInfo> weakCache = new WeakHashMap<>();
-  private final String inferredServiceName =
-      CapturedEnvironment.get().getProperties().get(GeneralConfig.SERVICE_NAME);
+    private final WeakHashMap<ClassLoader, ContextualInfo> weakCache = new WeakHashMap<>();
+    private final String inferredServiceName =
+            CapturedEnvironment.get().getProperties().get(GeneralConfig.SERVICE_NAME);
 
-  private static volatile boolean atLeastOneEntry;
-  private static final Lock lock = new ReentrantLock();
+    private static volatile boolean atLeastOneEntry;
+    private static final Lock lock = new ReentrantLock();
 
-  private ClassloaderConfigurationOverrides() {}
+    private ClassloaderConfigurationOverrides() {}
 
-  public static void addContextualInfo(ClassLoader classLoader, ContextualInfo contextualInfo) {
-    try {
-      lock.lock();
-      Lazy.INSTANCE.weakCache.put(classLoader, contextualInfo);
-      atLeastOneEntry = true;
-    } finally {
-      lock.unlock();
+    public static void addContextualInfo(ClassLoader classLoader, ContextualInfo contextualInfo) {
+        try {
+            lock.lock();
+            Lazy.INSTANCE.weakCache.put(classLoader, contextualInfo);
+            atLeastOneEntry = true;
+        } finally {
+            lock.unlock();
+        }
     }
-  }
-
-  public static ContextualInfo maybeCreateContextualInfo(ClassLoader classLoader) {
-    try {
-      lock.lock();
-      final ContextualInfo ret =
-          Lazy.INSTANCE.weakCache.computeIfAbsent(classLoader, EMPTY_CONTEXTUAL_INFO_ADDER);
-      atLeastOneEntry = true;
-      return ret;
-    } finally {
-      lock.unlock();
-    }
-  }
 
-  @Nullable
-  public static ContextualInfo withPinnedServiceName(ClassLoader classLoader, String serviceName) {
-    if (!CAN_SPLIT_SERVICE_NAME_BY_DEPLOYMENT) {
-      return null;
+    public static ContextualInfo maybeCreateContextualInfo(ClassLoader classLoader) {
+        try {
+            lock.lock();
+            final ContextualInfo ret =
+                    Lazy.INSTANCE.weakCache.computeIfAbsent(classLoader, EMPTY_CONTEXTUAL_INFO_ADDER);
+            atLeastOneEntry = true;
+            return ret;
+        } finally {
+            lock.unlock();
+        }
     }
-    final ContextualInfo contextualInfo = new ContextualInfo(serviceName, JEE_SPLIT_BY_DEPLOYMENT);
-    addContextualInfo(classLoader, contextualInfo);
-    return contextualInfo;
-  }
-
-  @Nullable
-  public static ContextualInfo maybeGetContextualInfo(ClassLoader classLoader) {
-    if (atLeastOneEntry) {
-      return Lazy.INSTANCE.weakCache.get(classLoader);
+
+    @Nullable
+    public static ContextualInfo withPinnedServiceName(ClassLoader classLoader, String serviceName) {
+        if (!CAN_SPLIT_SERVICE_NAME_BY_DEPLOYMENT) {
+            return null;
+        }
+        final ContextualInfo contextualInfo = new ContextualInfo(serviceName, JEE_SPLIT_BY_DEPLOYMENT);
+        addContextualInfo(classLoader, contextualInfo);
+        return contextualInfo;
     }
-    return null;
-  }
-
-  /**
-   * Fetches the contextual information linked to the current thread's context classloader.
-   *
-   * @return a nullable service name.
-   */
-  @Nullable
-  public static ContextualInfo maybeGetContextualInfo() {
-    if (atLeastOneEntry) {
-      return maybeGetContextualInfo(Thread.currentThread().getContextClassLoader());
+
+    @Nullable
+    public static ContextualInfo maybeGetContextualInfo(ClassLoader classLoader) {
+        if (atLeastOneEntry) {
+            return Lazy.INSTANCE.weakCache.get(classLoader);
+        }
+        return null;
     }
-    return null;
-  }
-
-  /**
-   * Enriches the provided spans according to the service name and tags linked to the current
-   * thread's classloader contextual information.
-   *
-   * @param span a nonnull span
-   */
-  public static void maybeEnrichSpan(@Nonnull final AgentSpan span) {
-    if (atLeastOneEntry) {
-      maybeEnrichSpan(span, Thread.currentThread().getContextClassLoader());
+
+    /**
+     * Fetches the contextual information linked to the current thread's context classloader.
+     *
+     * @return a nullable service name.
+     */
+    @Nullable
+    public static ContextualInfo maybeGetContextualInfo() {
+        if (atLeastOneEntry) {
+            return maybeGetContextualInfo(Thread.currentThread().getContextClassLoader());
+        }
+        return null;
     }
-  }
 
-  public static void maybeEnrichSpan(
-      @Nonnull final AgentSpan span, @Nonnull final ClassLoader classLoader) {
-    final ContextualInfo contextualInfo = maybeGetContextualInfo(classLoader);
-    if (contextualInfo == null) {
-      return;
+    /**
+     * Enriches the provided spans according to the service name and tags linked to the current
+     * thread's classloader contextual information.
+     *
+     * @param span a nonnull span
+     */
+    public static void maybeEnrichSpan(@Nonnull final AgentSpan span) {
+        if (atLeastOneEntry) {
+            maybeEnrichSpan(span, Thread.currentThread().getContextClassLoader());
+        }
     }
-    final String serviceName = contextualInfo.getServiceName();
-    if (CAN_SPLIT_SERVICE_NAME_BY_DEPLOYMENT && serviceName != null && !serviceName.isEmpty()) {
-      final String currentServiceName = span.getServiceName();
-      if (currentServiceName == null
-          || currentServiceName.equals(Lazy.INSTANCE.inferredServiceName)) {
-        span.setServiceName(serviceName, contextualInfo.getServiceNameSource());
-        ServiceNameCollector.get().addService(serviceName);
-      }
+
+    public static void maybeEnrichSpan(@Nonnull final AgentSpan span, @Nonnull final ClassLoader classLoader) {
+        final ContextualInfo contextualInfo = maybeGetContextualInfo(classLoader);
+        if (contextualInfo == null) {
+            return;
+        }
+        final String serviceName = contextualInfo.getServiceName();
+        if (CAN_SPLIT_SERVICE_NAME_BY_DEPLOYMENT && serviceName != null && !serviceName.isEmpty()) {
+            final String currentServiceName = span.getServiceName();
+            if (currentServiceName == null || currentServiceName.equals(Lazy.INSTANCE.inferredServiceName)) {
+                span.setServiceName(serviceName, contextualInfo.getServiceNameSource());
+                ServiceNameCollector.get().addService(serviceName);
+            }
+        }
+        contextualInfo.getTags().forEach(span::setTag);
     }
-    contextualInfo.getTags().forEach(span::setTag);
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java
index b1707b77a71..0869a2fe8fc 100644
--- a/internal-api/src/main/java/datadog/trace/api/Config.java
+++ b/internal-api/src/main/java/datadog/trace/api/Config.java
@@ -852,6381 +852,5948 @@
  */
 public class Config {
 
-  private static final Logger log = LoggerFactory.getLogger(Config.class);
-  private static final int MAX_CODE_COVERAGE_FLAGS = 32;
-  private static final int DYNAMIC_ATR_BUCKET_COUNT = 5;
-  private static final int MAX_DYNAMIC_ATR_RETRIES_PER_BUCKET = 20;
-
-  private static final Pattern COLON = Pattern.compile(":");
-  private static final Pattern COMMA = Pattern.compile(",");
-
-  // Historical conflating-Batch size; used to translate TRACER_METRICS_MAX_PENDING (configured in
-  // legacy batch units) into the new per-SpanSnapshot inbox capacity.
-  private static final int LEGACY_BATCH_SIZE = 64;
-
-  // Practical upper bound on Object[] allocations. Sits a few bytes below Integer.MAX_VALUE
-  // because the JVM reserves header slack on array allocations; matches the JDK's own
-  // {@code java.util.ArraysSupport.SOFT_MAX_ARRAY_LENGTH} convention. Used to clamp computed
-  // capacities that feed into array-backed collections.
-  private static final int MAX_SAFE_ARRAY_SIZE = Integer.MAX_VALUE - 8;
-
-  private final InstrumenterConfig instrumenterConfig;
-
-  private final long startTimeMillis = System.currentTimeMillis();
-  private final boolean timelineEventsEnabled;
-
-  /**
-   * this is a random UUID that gets generated on JVM start up and is attached to every root span
-   * and every JMX metric that is sent out.
-   */
-  static class RuntimeIdHolder {
-    static final String runtimeId = RandomUtils.randomUUID().toString();
-    static final String rootSessionId = initRootSessionId();
-
-    private static String initRootSessionId() {
-      String inherited = ConfigHelper.env("_DD_ROOT_JAVA_SESSION_ID");
-      return inherited != null ? inherited : runtimeId;
-    }
-  }
-
-  static class HostNameHolder {
-    static final String hostName = initHostName();
-
-    public static String getHostName() {
-      return hostName;
-    }
-  }
-
-  private final boolean runtimeIdEnabled;
-
-  /** This is the version of the runtime, ex: 1.8.0_332, 11.0.15, 17.0.3 */
-  private final String runtimeVersion;
-
-  private final String applicationKey;
-
-  /**
-   * Note: this has effect only on profiling site. Traces are sent to Datadog agent and are not
-   * affected by this setting. If CI Visibility is used with agentless mode, api key is used when
-   * sending data (including traces) to backend
-   */
-  private final String apiKey;
-
-  /**
-   * Note: this has effect only on profiling site. Traces are sent to Datadog agent and are not
-   * affected by this setting.
-   */
-  private final String site;
-
-  private final String serviceName;
-  private final boolean serviceNameSetByUser;
-  private final String rootContextServiceName;
-  private final boolean integrationSynapseLegacyOperationName;
-  private final String writerType;
-  private final boolean injectBaggageAsTagsEnabled;
-  private final boolean traceBuilderTagsPrecedenceEnabled;
-  private final boolean injectLinksAsTagsEnabled;
-  private final boolean agentConfiguredUsingDefault;
-  private final String agentUrl;
-  private final String agentHost;
-  private final int agentPort;
-  private final String agentUnixDomainSocket;
-  private final String agentNamedPipe;
-  private final int agentTimeout;
-
-  /** Should be set to {@code true} when running in agentless mode in a JVM without TLS */
-  private final boolean forceClearTextHttpForIntakeClient;
-
-  private final Set<String> noProxyHosts;
-  private final boolean prioritySamplingEnabled;
-  private final String prioritySamplingForce;
-  private final boolean traceResolverEnabled;
-  private final int spanAttributeSchemaVersion;
-  private final boolean peerHostNameEnabled;
-  private final boolean peerServiceDefaultsEnabled;
-  private final Map<String, String> peerServiceComponentOverrides;
-  private final boolean removeIntegrationServiceNamesEnabled;
-  private final boolean experimentalPropagateProcessTagsEnabled;
-  private final Map<String, String> processTagsMapping;
-  private final Map<String, String> peerServiceMapping;
-  private final Map<String, String> serviceMapping;
-  private final Map<String, String> tags;
-  private final Map<String, String> spanTags;
-  private final Map<String, String> jmxTags;
-  private final Map<String, String> requestHeaderTags;
-  private final Map<String, String> responseHeaderTags;
-  private final Map<String, String> baggageMapping;
-  private final boolean requestHeaderTagsCommaAllowed;
-  private final BitSet httpServerErrorStatuses;
-  private final BitSet httpClientErrorStatuses;
-  private final boolean httpServerTagQueryString;
-  private final boolean httpServerRawQueryString;
-  private final boolean httpServerRawResource;
-  private final boolean httpServerDecodedResourcePreserveSpaces;
-  private final boolean httpServerRouteBasedNaming;
-  private final Map<String, String> httpServerPathResourceNameMapping;
-  private final Map<String, String> httpClientPathResourceNameMapping;
-  private final boolean httpResourceRemoveTrailingSlash;
-  private final boolean httpClientTagQueryString;
-  private final boolean httpClientTagHeaders;
-  private final boolean httpClientSplitByDomain;
-  private final boolean dbClientSplitByInstance;
-  private final boolean dbClientSplitByInstanceTypeSuffix;
-  private final boolean dbClientSplitByHost;
-  private final Set<String> splitByTags;
-  private final Set<String> traceStatsAdditionalTags;
-  private final boolean jeeSplitByDeployment;
-  private final int scopeDepthLimit;
-  private final boolean scopeStrictMode;
-  private final int scopeIterationKeepAlive;
-  private final int partialFlushMinSpans;
-  private final int traceKeepLatencyThreshold;
-  private final boolean traceKeepLatencyThresholdEnabled;
-  private final boolean traceStrictWritesEnabled;
-  private final boolean logExtractHeaderNames;
-  private final Set<PropagationStyle> propagationStylesToExtract;
-  private final Set<PropagationStyle> propagationStylesToInject;
-  private final boolean tracePropagationStyleB3PaddingEnabled;
-  private final Set<TracePropagationStyle> tracePropagationStylesToExtract;
-  private final Set<TracePropagationStyle> tracePropagationStylesToInject;
-  private final TracePropagationBehaviorExtract tracePropagationBehaviorExtract;
-  private final boolean tracePropagationExtractFirst;
-  private final boolean traceOrgGuardEnabled;
-  private final boolean traceOrgGuardStrict;
-  private final Set<String> traceOrgGuardTrustedOpms;
-  private final int traceBaggageMaxItems;
-  private final int traceBaggageMaxBytes;
-  private final List<String> traceBaggageTagKeys;
-  private final boolean traceInferredProxyEnabled;
-  private final int clockSyncPeriod;
-  private final boolean logsInjectionEnabled;
-  private final boolean appLogsCollectionEnabled;
-
-  private final String dogStatsDNamedPipe;
-  private final int dogStatsDStartDelay;
-
-  private final Integer statsDClientQueueSize;
-  private final Integer statsDClientSocketBuffer;
-  private final Integer statsDClientSocketTimeout;
-
-  private final boolean runtimeMetricsEnabled;
-  private final boolean jmxFetchEnabled;
-  private final String jmxFetchConfigDir;
-  private final List<String> jmxFetchConfigs;
-  @Deprecated private final List<String> jmxFetchMetricsConfigs;
-  private final Integer jmxFetchCheckPeriod;
-  private final Integer jmxFetchInitialRefreshBeansPeriod;
-  private final Integer jmxFetchRefreshBeansPeriod;
-  private final String jmxFetchStatsdHost;
-  private final Integer jmxFetchStatsdPort;
-  private final boolean jmxFetchMultipleRuntimeServicesEnabled;
-  private final int jmxFetchMultipleRuntimeServicesLimit;
-
-  private final String logsOtelExporter;
-  private final int logsOtelInterval;
-  private final int logsOtelTimeout;
-  private final int logsOtelQueueSize;
-  private final int logsOtelBatchSize;
-  private final String otlpLogsEndpoint;
-  private final Map<String, String> otlpLogsHeaders;
-  private final OtlpConfig.Protocol otlpLogsProtocol;
-  private final OtlpConfig.Compression otlpLogsCompression;
-  private final int otlpLogsTimeout;
-
-  private final String metricsOtelExporter;
-  private final int metricsOtelInterval;
-  private final int metricsOtelTimeout;
-  private final int metricsOtelCardinalityLimit;
-  private final boolean metricsOtelExperimentalEnabled;
-  private final String otlpMetricsEndpoint;
-  private final Map<String, String> otlpMetricsHeaders;
-  private final OtlpConfig.Protocol otlpMetricsProtocol;
-  private final OtlpConfig.Compression otlpMetricsCompression;
-  private final int otlpMetricsTimeout;
-  private final OtlpConfig.Temporality otlpMetricsTemporalityPreference;
-
-  private final boolean otelTracesSpanMetricsEnabled;
-  private final boolean traceOtelSemanticsEnabled;
-
-  private final String traceOtelExporter;
-  private final String otlpTracesEndpoint;
-  private final Map<String, String> otlpTracesHeaders;
-  private final OtlpConfig.Protocol otlpTracesProtocol;
-  private final OtlpConfig.Compression otlpTracesCompression;
-  private final int otlpTracesTimeout;
-
-  // These values are default-ed to those of jmx fetch values as needed
-  private final boolean healthMetricsEnabled;
-  private final String healthMetricsStatsdHost;
-  private final Integer healthMetricsStatsdPort;
-  private final boolean perfMetricsEnabled;
-
-  private final boolean tracerMetricsEnabled;
-  private final boolean tracerMetricsIgnoreAgentVersion;
-  private final boolean tracerMetricsBufferingEnabled;
-  private final int tracerMetricsMaxAggregates;
-  private final int tracerMetricsMaxPending;
-  private final int traceStatsInterval;
-
-  private final boolean reportHostName;
-
-  private final boolean traceAnalyticsEnabled;
-  private final String traceClientIpHeader;
-  private final boolean traceClientIpResolverEnabled;
-
-  private final boolean traceGitMetadataEnabled;
-
-  private final boolean ssiInjectionForce;
-  private final String ssiInjectionEnabled;
-  private final String instrumentationSource;
-
-  private final Map<String, String> traceSamplingServiceRules;
-  private final Map<String, String> traceSamplingOperationRules;
-  private final String traceSamplingRules;
-  private final Double traceSampleRate;
-  private final int traceRateLimit;
-  private final String spanSamplingRules;
-  private final String spanSamplingRulesFile;
-
-  private final ProfilingEnablement profilingEnabled;
-  private final boolean profilingAgentless;
-  private final boolean isDatadogProfilerSafeAndConfigured;
-  private final boolean otelThreadContextEnabled;
-  @Deprecated private final String profilingUrl;
-  private final Map<String, String> profilingTags;
-  private final int profilingStartDelay;
-  private final boolean profilingStartForceFirst;
-  private final int profilingUploadPeriod;
-  private final String profilingTemplateOverrideFile;
-  private final int profilingUploadTimeout;
-  private final String profilingUploadCompression;
-  private final String profilingProxyHost;
-  private final int profilingProxyPort;
-  private final String profilingProxyUsername;
-  private final String profilingProxyPassword;
-  private final int profilingExceptionSampleLimit;
-  private final int profilingBackPressureSampleLimit;
-  private final boolean profilingBackPressureEnabled;
-  private final int profilingDirectAllocationSampleLimit;
-  private final int profilingExceptionHistogramTopItems;
-  private final int profilingExceptionHistogramMaxCollectionSize;
-  private final boolean profilingExcludeAgentThreads;
-  private final boolean profilingUploadSummaryOn413Enabled;
-  private final boolean profilingRecordExceptionMessage;
-
-  private final boolean crashTrackingAgentless;
-  private final Map<String, String> crashTrackingTags;
-  private final boolean crashTrackingErrorsIntakeEnabled;
-  private final boolean crashTrackingExtendedInfoEnabled;
-
-  private final boolean clientIpEnabled;
-
-  private final String appSecRulesFile;
-  private final int appSecTraceRateLimit;
-  private final boolean appSecWafMetrics;
-  private final int appSecWafTimeout;
-  private final String appSecAgenticOnboarding;
-  private final String appSecObfuscationParameterKeyRegexp;
-  private final String appSecObfuscationParameterValueRegexp;
-  private final String appSecHttpBlockedTemplateHtml;
-  private final String appSecHttpBlockedTemplateJson;
-  private final UserIdCollectionMode appSecUserIdCollectionMode;
-  private final Boolean appSecScaEnabled;
-  private final int appSecScaMaxTrackedDependencies;
-  private final boolean appSecStackTraceEnabled;
-  private final int appSecMaxStackTraces;
-  private final int appSecMaxStackTraceDepth;
-  private final int appSecBodyParsingSizeLimit;
-  private final int appSecMaxFileContentBytes;
-  private final int appSecMaxFileContentCount;
-  private final boolean apiSecurityEnabled;
-  private final float apiSecuritySampleDelay;
-  private final int apiSecurityEndpointCollectionMessageLimit;
-  private final int apiSecurityMaxDownstreamRequestBodyAnalysis;
-  private final double apiSecurityDownstreamRequestBodyAnalysisSampleRate;
-
-  private final boolean traceResourceRenamingEnabled;
-  private final boolean traceResourceRenamingAlwaysSimplifiedEndpoint;
-
-  private final IastDetectionMode iastDetectionMode;
-  private final int iastMaxConcurrentRequests;
-  private final int iastVulnerabilitiesPerRequest;
-  private final float iastRequestSampling;
-  private final boolean iastDebugEnabled;
-  private final Verbosity iastTelemetryVerbosity;
-  private final boolean iastRedactionEnabled;
-  private final String iastRedactionNamePattern;
-  private final String iastRedactionValuePattern;
-  private final int iastMaxRangeCount;
-  private final int iastTruncationMaxValueLength;
-  private final boolean iastStacktraceLeakSuppress;
-  private final IastContext.Mode iastContextMode;
-  private final boolean iastHardcodedSecretEnabled;
-  private final boolean iastAnonymousClassesEnabled;
-  private final boolean iastSourceMappingEnabled;
-  private final int iastSourceMappingMaxSize;
-  private final boolean iastStackTraceEnabled;
-  private final boolean iastExperimentalPropagationEnabled;
-  private final String iastSecurityControlsConfiguration;
-  private final int iastDbRowsToTaint;
-
-  private final boolean llmObsAgentlessEnabled;
-  private final String llmObsAgentlessUrl;
-  private final String llmObsMlApp;
-  private final double llmObsSampleRate;
-
-  private final boolean ciVisibilityTraceSanitationEnabled;
-  private final boolean ciVisibilityAgentlessEnabled;
-  private final String ciVisibilityAgentlessUrl;
-  private final String ciVisibilityIntakeAgentlessUrl;
-
-  private final boolean ciVisibilitySourceDataEnabled;
-  private final boolean ciVisibilityBuildInstrumentationEnabled;
-  private final String ciVisibilityAgentJarUri;
-  private final boolean ciVisibilityAutoConfigurationEnabled;
-  private final String ciVisibilityAdditionalChildProcessJvmArgs;
-  private final boolean ciVisibilityCompilerPluginAutoConfigurationEnabled;
-  private final boolean ciVisibilityGradleDependencyVerificationEnabled;
-  private final boolean ciVisibilityCodeCoverageEnabled;
-  private final Boolean ciVisibilityCoverageLinesEnabled;
-  private final String ciVisibilityCodeCoverageReportDumpDir;
-  private final List<String> codeCoverageFlags;
-  private final String ciVisibilityCompilerPluginVersion;
-  private final String ciVisibilityJacocoPluginVersion;
-  private final boolean ciVisibilityJacocoPluginVersionProvided;
-  private final List<String> ciVisibilityCodeCoverageIncludes;
-  private final List<String> ciVisibilityCodeCoverageExcludes;
-  private final String[] ciVisibilityCodeCoverageIncludedPackages;
-  private final String[] ciVisibilityCodeCoverageExcludedPackages;
-  private final List<String> ciVisibilityJacocoGradleSourceSets;
-  private final boolean ciVisibilityCodeCoverageReportUploadEnabled;
-  private final Integer ciVisibilityDebugPort;
-  private final boolean ciVisibilityGitClientEnabled;
-  private final boolean ciVisibilityGitUploadEnabled;
-  private final boolean ciVisibilityGitUnshallowEnabled;
-  private final boolean ciVisibilityGitUnshallowDefer;
-  private final long ciVisibilityGitCommandTimeoutMillis;
-  private final String ciVisibilityGitRemoteName;
-  private final long ciVisibilityBackendApiTimeoutMillis;
-  private final long ciVisibilityGitUploadTimeoutMillis;
-  private final String ciVisibilitySignalServerHost;
-  private final int ciVisibilitySignalServerPort;
-  private final int ciVisibilitySignalClientTimeoutMillis;
-  private final boolean ciVisibilityItrEnabled;
-  private final boolean ciVisibilityTestSkippingEnabled;
-  private final boolean ciVisibilityCiProviderIntegrationEnabled;
-  private final boolean ciVisibilityRepoIndexDuplicateKeyCheckEnabled;
-  private final boolean ciVisibilityRepoIndexFollowSymlinks;
-  private final int ciVisibilityExecutionSettingsCacheSize;
-  private final int ciVisibilityJvmInfoCacheSize;
-  private final int ciVisibilityCoverageRootPackagesLimit;
-  private final String ciVisibilityInjectedTracerVersion;
-  private final List<String> ciVisibilityResourceFolderNames;
-  private final boolean ciVisibilityFlakyRetryEnabled;
-  private final boolean ciVisibilityImpactedTestsDetectionEnabled;
-  private final boolean ciVisibilityKnownTestsRequestEnabled;
-  private final boolean ciVisibilityFlakyRetryOnlyKnownFlakes;
-  private final int ciVisibilityFlakyRetryCount;
-  private final int ciVisibilityTotalFlakyRetryCount;
-  private final boolean ciVisibilityDynamicAtrEnabled;
-  private final List<Integer> ciVisibilityDynamicAtrBuckets;
-  private final boolean ciVisibilityEarlyFlakeDetectionEnabled;
-  private final int ciVisibilityEarlyFlakeDetectionLowerLimit;
-  private final String ciVisibilitySessionName;
-  private final String ciVisibilityModuleName;
-  private final String ciVisibilityTestCommand;
-  private final boolean ciVisibilityTelemetryEnabled;
-  private final long ciVisibilityRumFlushWaitMillis;
-  private final boolean ciVisibilityAutoInjected;
-  private final String ciVisibilityTestOrder;
-  private final boolean ciVisibilityTestManagementEnabled;
-  private final Integer ciVisibilityTestManagementAttemptToFixRetries;
-  private final boolean ciVisibilityScalatestForkMonitorEnabled;
-  private final String gitPullRequestBaseBranch;
-  private final String gitPullRequestBaseBranchSha;
-  private final String gitCommitHeadSha;
-  private final boolean ciVisibilityFailedTestReplayEnabled;
-  private final String testOptimizationManifestFile;
-  private final boolean testOptimizationPayloadsInFiles;
-
-  private final boolean remoteConfigEnabled;
-  private final boolean remoteConfigIntegrityCheckEnabled;
-  private final String remoteConfigUrl;
-  private final float remoteConfigPollIntervalSeconds;
-  private final long remoteConfigMaxPayloadSize;
-  private final String remoteConfigTargetsKeyId;
-  private final String remoteConfigTargetsKey;
-
-  private final int remoteConfigMaxExtraServices;
-
-  private final boolean featureFlaggingProviderEnabled;
-  private final String featureFlaggingConfigurationSource;
-  private final String featureFlaggingConfigurationSourceAgentlessBaseUrl;
-  private final int featureFlaggingConfigurationSourcePollIntervalSeconds;
-  private final int featureFlaggingConfigurationSourceRequestTimeoutSeconds;
-
-  private final boolean dbmInjectSqlBaseHash;
-  private final String dbmPropagationMode;
-  private final boolean dbmPropagationOracleActionOnlyEnabled;
-  private final boolean dbmTracePreparedStatements;
-  private final boolean dbmAlwaysAppendSqlComment;
-  private final boolean dbMetadataFetchingOnQuery;
-  private final boolean dbMetadataFetchingOnConnect;
-
-  private final boolean dynamicInstrumentationEnabled;
-  private final String dynamicInstrumentationSnapshotUrl;
-  private final int dynamicInstrumentationUploadTimeout;
-  private final int dynamicInstrumentationUploadFlushInterval;
-  private final boolean dynamicInstrumentationClassFileDumpEnabled;
-  private final int dynamicInstrumentationPollInterval;
-  private final int dynamicInstrumentationDiagnosticsInterval;
-  private final boolean dynamicInstrumentationMetricEnabled;
-  private final String dynamicInstrumentationProbeFile;
-  private final int dynamicInstrumentationUploadBatchSize;
-  private final long dynamicInstrumentationMaxPayloadSize;
-  private final boolean dynamicInstrumentationVerifyByteCode;
-  private final String dynamicInstrumentationInstrumentTheWorld;
-  private final String dynamicInstrumentationExcludeFiles;
-  private final String dynamicInstrumentationIncludeFiles;
-  private final String dynamicInstrumentationTimeoutCheckerMode;
-  private final int dynamicInstrumentationCaptureTimeout;
-  private final int dynamicInstrumentationEvaluationTimeout;
-  private final String dynamicInstrumentationRedactedIdentifiers;
-  private final Set<String> dynamicInstrumentationRedactionExcludedIdentifiers;
-  private final String dynamicInstrumentationRedactedTypes;
-  private final int dynamicInstrumentationLocalVarHoistingLevel;
-  private final boolean symbolDatabaseEnabled;
-  private final boolean symbolDatabaseForceUpload;
-  private final int symbolDatabaseFlushThreshold;
-  private final boolean symbolDatabaseCompressed;
-  private final boolean debuggerExceptionEnabled;
-  private final int debuggerMaxExceptionPerSecond;
-  @Deprecated private final boolean debuggerExceptionOnlyLocalRoot;
-  private final boolean debuggerExceptionCaptureIntermediateSpansEnabled;
-  private final int debuggerExceptionMaxCapturedFrames;
-  private final int debuggerExceptionCaptureInterval;
-  private final boolean debuggerCodeOriginEnabled;
-  private final int debuggerCodeOriginMaxUserFrames;
-  private final boolean distributedDebuggerEnabled;
-  private final boolean debuggerSourceFileTrackingEnabled;
-  private final boolean debuggerSynchronousSourceFileTrackingEnabled;
-
-  private final Set<String> debuggerThirdPartyIncludes;
-  private final Set<String> debuggerThirdPartyExcludes;
-  private final Set<String> debuggerShadingIdentifiers;
-
-  private final boolean awsPropagationEnabled;
-  private final boolean sqsPropagationEnabled;
-  private final boolean sqsBodyPropagationEnabled;
-
-  private final boolean kafkaClientPropagationEnabled;
-  private final Set<String> kafkaClientPropagationDisabledTopics;
-  private final boolean kafkaClientBase64DecodingEnabled;
-
-  private final boolean jmsPropagationEnabled;
-  private final Set<String> jmsPropagationDisabledTopics;
-  private final Set<String> jmsPropagationDisabledQueues;
-  private final int jmsUnacknowledgedMaxAge;
-
-  private final boolean rabbitPropagationEnabled;
-  private final Set<String> rabbitPropagationDisabledQueues;
-  private final Set<String> rabbitPropagationDisabledExchanges;
-
-  private final boolean rabbitIncludeRoutingKeyInResource;
-
-  private final boolean messageBrokerSplitByDestination;
-
-  private final boolean hystrixTagsEnabled;
-  private final boolean hystrixMeasuredEnabled;
-
-  private final boolean springSchedulingMeasuredEnabled;
-
-  private final boolean resilience4jMeasuredEnabled;
-  private final boolean resilience4jTagMetricsEnabled;
-
-  private final boolean igniteCacheIncludeKeys;
-
-  private final String obfuscationQueryRegexp;
-
-  // TODO: remove at a future point.
-  private final boolean playReportHttpStatus;
-
-  private final boolean servletPrincipalEnabled;
-  private final boolean servletAsyncTimeoutError;
-
-  private final boolean springDataRepositoryInterfaceResourceName;
-
-  private final int xDatadogTagsMaxLength;
-
-  private final ProtocolVersion protocolVersion;
-
-  private final String logLevel;
-  private final boolean debugEnabled;
-  private final boolean triageEnabled;
-  private final String triageReportTrigger;
-  private final String triageReportDir;
-
-  private final boolean startupLogsEnabled;
-  private final String configFileStatus;
-
-  private final IdGenerationStrategy idGenerationStrategy;
-
-  private final boolean secureRandom;
-
-  private final boolean lambdaSnapStartClockResyncEnabled;
-
-  private final boolean trace128bitTraceIdGenerationEnabled;
-  private final boolean logs128bitTraceIdEnabled;
-
-  private final Set<String> grpcIgnoredInboundMethods;
-  private final Set<String> grpcIgnoredOutboundMethods;
-  private final boolean grpcServerTrimPackageResource;
-  private final BitSet grpcServerErrorStatuses;
-  private final BitSet grpcClientErrorStatuses;
-
-  private final boolean cwsEnabled;
-  private final int cwsTlsRefresh;
-
-  private final boolean dataJobsOpenLineageEnabled;
-  private final boolean dataJobsOpenLineageTimeoutEnabled;
-  private final boolean dataJobsParseSparkPlanEnabled;
-  private final boolean dataJobsExperimentalFeaturesEnabled;
-
-  private final boolean dataStreamsEnabled;
-  private final float dataStreamsBucketDurationSeconds;
-  private final String dataStreamsTransactionExtractors;
-
-  private final boolean serviceDiscoveryEnabled;
+    private static final Logger log = LoggerFactory.getLogger(Config.class);
+    private static final int MAX_CODE_COVERAGE_FLAGS = 32;
+    private static final int DYNAMIC_ATR_BUCKET_COUNT = 5;
+    private static final int MAX_DYNAMIC_ATR_RETRIES_PER_BUCKET = 20;
 
-  private final Set<String> iastWeakHashAlgorithms;
+    private static final Pattern COLON = Pattern.compile(":");
+    private static final Pattern COMMA = Pattern.compile(",");
 
-  private final Pattern iastWeakCipherAlgorithms;
+    // Historical conflating-Batch size; used to translate TRACER_METRICS_MAX_PENDING (configured in
+    // legacy batch units) into the new per-SpanSnapshot inbox capacity.
+    private static final int LEGACY_BATCH_SIZE = 64;
 
-  private final boolean iastDeduplicationEnabled;
+    // Practical upper bound on Object[] allocations. Sits a few bytes below Integer.MAX_VALUE
+    // because the JVM reserves header slack on array allocations; matches the JDK's own
+    // {@code java.util.ArraysSupport.SOFT_MAX_ARRAY_LENGTH} convention. Used to clamp computed
+    // capacities that feed into array-backed collections.
+    private static final int MAX_SAFE_ARRAY_SIZE = Integer.MAX_VALUE - 8;
 
-  private final float telemetryHeartbeatInterval;
-  private final long telemetryExtendedHeartbeatInterval;
-  private final float telemetryMetricsInterval;
-  private final boolean isTelemetryDependencyServiceEnabled;
-  private final boolean telemetryMetricsEnabled;
-  private final boolean isTelemetryLogCollectionEnabled;
-  private final int telemetryDependencyResolutionQueueSize;
+    private final InstrumenterConfig instrumenterConfig;
 
-  private final boolean azureAppServices;
-  private final boolean azureFunctions;
-  private final boolean awsServerless;
-  private final String traceAgentPath;
-  private final String testAgentSessionToken;
-  private final List<String> traceAgentArgs;
-  private final String dogStatsDPath;
-  private final List<String> dogStatsDArgs;
-  private final int dogStatsDPort;
-
-  private String env;
-  private String version;
-  private final String primaryTag;
-
-  private final ConfigProvider configProvider;
+    private final long startTimeMillis = System.currentTimeMillis();
+    private final boolean timelineEventsEnabled;
 
-  private final boolean longRunningTraceEnabled;
-  private final long longRunningTraceInitialFlushInterval;
-  private final long longRunningTraceFlushInterval;
-
-  private final boolean cassandraKeyspaceStatementExtractionEnabled;
-  private final boolean couchbaseInternalSpansEnabled;
-  private final boolean elasticsearchBodyEnabled;
-  private final boolean elasticsearchParamsEnabled;
-  private final boolean elasticsearchBodyAndParamsEnabled;
-  private final boolean sparkTaskHistogramEnabled;
-  private final boolean sparkAppNameAsService;
-  private final boolean jaxRsExceptionAsErrorsEnabled;
-  private final boolean websocketMessagesInheritSampling;
-  private final boolean websocketMessagesSeparateTraces;
-  private final boolean websocketTagSessionId;
-  private final boolean axisPromoteResourceName;
-  private final float traceFlushIntervalSeconds;
-  private final long tracePostProcessingTimeout;
-
-  private final boolean telemetryDebugRequestsEnabled;
-
-  private final int agentlessLogSubmissionQueueSize;
-  private final String agentlessLogSubmissionLevel;
-  private final String agentlessLogSubmissionUrl;
-  private final String agentlessLogSubmissionProduct;
-
-  private final Set<String> cloudPayloadTaggingServices;
-  @Nullable private final List<JsonPath> cloudRequestPayloadTagging;
-  @Nullable private final List<JsonPath> cloudResponsePayloadTagging;
-  private final int cloudPayloadTaggingMaxDepth;
-  private final int cloudPayloadTaggingMaxTags;
-
-  private final long dependecyResolutionPeriodMillis;
-
-  private final boolean apmTracingEnabled;
-  private final Set<String> experimentalFeaturesEnabled;
-
-  private final boolean jdkSocketEnabled;
-
-  private final boolean spanBuilderReuseEnabled;
-  private final int tagNameUtf8CacheSize;
-  private final int tagValueUtf8CacheSize;
-  private final int stackTraceLengthLimit;
-
-  private final boolean sfnInjectDatadogAttributeEnabled;
-  private final boolean sqsInjectDatadogAttributeEnabled;
-  private final boolean snsInjectDatadogAttributeEnabled;
-  private final boolean eventbridgeInjectDatadogAttributeEnabled;
-
-  private final RumInjectorConfig rumInjectorConfig;
-
-  private final boolean aiGuardEnabled;
-  private final String aiGuardEndpoint;
-  private final int aiGuardTimeout;
-  private final int aiGuardMaxMessagesLength;
-  private final int aiGuardMaxContentSize;
-  private final boolean aiGuardRedactionEnabled;
-
-  static {
-    // Bind telemetry collector to config module before initializing ConfigProvider
-    OtelEnvMetricCollectorProvider.register(OtelEnvMetricCollectorImpl.getInstance());
-    ConfigInversionMetricCollectorProvider.register(
-        ConfigInversionMetricCollectorImpl.getInstance());
-  }
-
-  // Read order: System Properties -> Env Variables, [-> properties file], [-> default value]
-  private Config() {
-    this(ConfigProvider.createDefault());
-  }
-
-  private Config(final ConfigProvider configProvider) {
-    this(configProvider, new InstrumenterConfig(configProvider));
-  }
-
-  private Config(final ConfigProvider configProvider, final InstrumenterConfig instrumenterConfig) {
-    this.configProvider = configProvider;
-    this.instrumenterConfig = instrumenterConfig;
-    configFileStatus = configProvider.getConfigFileStatus();
-    runtimeIdEnabled =
-        configProvider.getBoolean(RUNTIME_ID_ENABLED, true, RUNTIME_METRICS_RUNTIME_ID_ENABLED);
-    runtimeVersion = SystemProperties.getOrDefault("java.version", "unknown");
-
-    // Note: We do not want APiKey to be loaded from property for security reasons
-    // Note: we do not use defined default here
-    // FIXME: We should use better authentication mechanism
-    final String apiKeyFile = configProvider.getString(API_KEY_FILE);
-    String tmpApiKey =
-        configProvider.getStringExcludingSource(API_KEY, null, SystemPropertiesConfigSource.class);
-    if (apiKeyFile != null) {
-      try {
-        tmpApiKey =
-            new String(Files.readAllBytes(Paths.get(apiKeyFile)), StandardCharsets.UTF_8).trim();
-      } catch (final IOException e) {
-        log.error(
-            "Cannot read API key from file {}, skipping. Exception {}", apiKeyFile, e.getMessage());
-      }
-    }
-    site = configProvider.getString(SITE, DEFAULT_SITE);
-
-    String tmpApplicationKey =
-        configProvider.getStringExcludingSource(
-            APPLICATION_KEY, null, SystemPropertiesConfigSource.class, APP_KEY);
-    String applicationKeyFile = configProvider.getString(APPLICATION_KEY_FILE);
-    if (applicationKeyFile != null) {
-      try {
-        tmpApplicationKey =
-            new String(Files.readAllBytes(Paths.get(applicationKeyFile)), StandardCharsets.UTF_8)
-                .trim();
-      } catch (final IOException e) {
-        log.error("Cannot read API key from file {}, skipping", applicationKeyFile, e);
-      }
-    }
-    applicationKey = tmpApplicationKey;
-
-    String userProvidedServiceName =
-        configProvider.getStringExcludingSource(
-            SERVICE, null, CapturedEnvironmentConfigSource.class, SERVICE_NAME);
-
-    if (userProvidedServiceName == null) {
-      serviceNameSetByUser = false;
-      serviceName = configProvider.getString(SERVICE, DEFAULT_SERVICE_NAME, SERVICE_NAME);
-    } else {
-      // might be an auto-detected name propagated from instrumented parent process
-      serviceNameSetByUser = configProvider.getBoolean(SERVICE_NAME_SET_BY_USER, true);
-      serviceName = userProvidedServiceName;
-    }
-
-    rootContextServiceName =
-        configProvider.getString(
-            SERVLET_ROOT_CONTEXT_SERVICE_NAME, DEFAULT_SERVLET_ROOT_CONTEXT_SERVICE_NAME);
-
-    experimentalFeaturesEnabled =
-        configProvider.getString(TRACE_EXPERIMENTAL_FEATURES_ENABLED, "").equals("all")
-            ? DEFAULT_TRACE_EXPERIMENTAL_FEATURES_ENABLED
-            : configProvider.getSet(TRACE_EXPERIMENTAL_FEATURES_ENABLED, new HashSet<>());
-
-    integrationSynapseLegacyOperationName =
-        configProvider.getBoolean(INTEGRATION_SYNAPSE_LEGACY_OPERATION_NAME, false);
-    traceOtelExporter = configProvider.getString(TRACE_OTEL_EXPORTER);
-    boolean otlpTracesExporter = isTraceOtlpExporterEnabled();
-    writerType =
-        configProvider.getString(
-            WRITER_TYPE, otlpTracesExporter ? OTLP_WRITER_TYPE : DEFAULT_AGENT_WRITER_TYPE);
-    boolean isDatadogTraceWriter = !otlpTracesExporter;
-    injectBaggageAsTagsEnabled =
-        configProvider.getBoolean(WRITER_BAGGAGE_INJECT, isDatadogTraceWriter);
-    injectLinksAsTagsEnabled = configProvider.getBoolean(WRITER_LINKS_INJECT, isDatadogTraceWriter);
-    traceBuilderTagsPrecedenceEnabled =
-        configProvider.getBoolean(TRACE_BUILDER_TAGS_PRECEDENCE_ENABLED, false);
-    String lambdaInitType = getEnv("AWS_LAMBDA_INITIALIZATION_TYPE");
-    String lambdaMicrovmImageArn = ConfigHelper.env("AWS_LAMBDA_MICROVM_IMAGE_ARN");
-    if ((lambdaInitType != null && lambdaInitType.equals("snap-start"))
-        || (lambdaMicrovmImageArn != null && !lambdaMicrovmImageArn.isEmpty())) {
-      secureRandom = true;
-    } else {
-      secureRandom = configProvider.getBoolean(SECURE_RANDOM, DEFAULT_SECURE_RANDOM);
-    }
-    lambdaSnapStartClockResyncEnabled =
-        configProvider.getBoolean(
-            TRACE_LAMBDA_SNAPSTART_CLOCK_RESYNC_ENABLED,
-            DEFAULT_TRACE_LAMBDA_SNAPSTART_CLOCK_RESYNC_ENABLED);
-    cassandraKeyspaceStatementExtractionEnabled =
-        configProvider.getBoolean(
-            CASSANDRA_KEYSPACE_STATEMENT_EXTRACTION_ENABLED,
-            DEFAULT_CASSANDRA_KEYSPACE_STATEMENT_EXTRACTION_ENABLED);
-    couchbaseInternalSpansEnabled =
-        configProvider.getBoolean(
-            COUCHBASE_INTERNAL_SPANS_ENABLED, DEFAULT_COUCHBASE_INTERNAL_SPANS_ENABLED);
-    elasticsearchBodyEnabled =
-        configProvider.getBoolean(ELASTICSEARCH_BODY_ENABLED, DEFAULT_ELASTICSEARCH_BODY_ENABLED);
-    elasticsearchParamsEnabled =
-        configProvider.getBoolean(
-            ELASTICSEARCH_PARAMS_ENABLED, DEFAULT_ELASTICSEARCH_PARAMS_ENABLED);
-    elasticsearchBodyAndParamsEnabled =
-        configProvider.getBoolean(
-            ELASTICSEARCH_BODY_AND_PARAMS_ENABLED, DEFAULT_ELASTICSEARCH_BODY_AND_PARAMS_ENABLED);
-    String strategyName = configProvider.getString(ID_GENERATION_STRATEGY);
-    trace128bitTraceIdGenerationEnabled =
-        configProvider.getBoolean(
-            TRACE_128_BIT_TRACEID_GENERATION_ENABLED,
-            DEFAULT_TRACE_128_BIT_TRACEID_GENERATION_ENABLED);
-
-    logs128bitTraceIdEnabled =
-        configProvider.getBoolean(
-            TRACE_128_BIT_TRACEID_LOGGING_ENABLED, DEFAULT_TRACE_128_BIT_TRACEID_LOGGING_ENABLED);
-
-    if (secureRandom) {
-      strategyName = "SECURE_RANDOM";
-    }
-    if (strategyName == null) {
-      strategyName = "RANDOM";
-    }
-    IdGenerationStrategy strategy =
-        IdGenerationStrategy.fromName(strategyName, trace128bitTraceIdGenerationEnabled);
-    if (strategy == null) {
-      log.warn(
-          "*** you are trying to use an unknown id generation strategy {} - falling back to RANDOM",
-          strategyName);
-      strategyName = "RANDOM";
-      strategy = IdGenerationStrategy.fromName(strategyName, trace128bitTraceIdGenerationEnabled);
-    }
-    if (!strategyName.equals("RANDOM") && !strategyName.equals("SECURE_RANDOM")) {
-      log.warn(
-          "*** you are using an unsupported id generation strategy {} - this can impact correctness of traces",
-          strategyName);
-    }
-    idGenerationStrategy = strategy;
-
-    String agentHostFromEnvironment = null;
-    int agentPortFromEnvironment = -1;
-    String unixSocketFromEnvironment = null;
-    boolean rebuildAgentUrl = false;
-
-    final String agentUrlFromEnvironment = configProvider.getString(TRACE_AGENT_URL);
-    if (agentUrlFromEnvironment != null) {
-      try {
-        final URI parsedAgentUrl = new URI(agentUrlFromEnvironment);
-        agentHostFromEnvironment = parsedAgentUrl.getHost();
-        agentPortFromEnvironment = parsedAgentUrl.getPort();
-        if ("unix".equals(parsedAgentUrl.getScheme())) {
-          unixSocketFromEnvironment = parsedAgentUrl.getPath();
+    /**
+     * this is a random UUID that gets generated on JVM start up and is attached to every root span
+     * and every JMX metric that is sent out.
+     */
+    static class RuntimeIdHolder {
+        static final String runtimeId = RandomUtils.randomUUID().toString();
+        static final String rootSessionId = initRootSessionId();
+
+        private static String initRootSessionId() {
+            String inherited = ConfigHelper.env("_DD_ROOT_JAVA_SESSION_ID");
+            return inherited != null ? inherited : runtimeId;
+        }
+    }
+
+    static class HostNameHolder {
+        static final String hostName = initHostName();
+
+        public static String getHostName() {
+            return hostName;
+        }
+    }
+
+    private final boolean runtimeIdEnabled;
+
+    /** This is the version of the runtime, ex: 1.8.0_332, 11.0.15, 17.0.3 */
+    private final String runtimeVersion;
+
+    private final String applicationKey;
+
+    /**
+     * Note: this has effect only on profiling site. Traces are sent to Datadog agent and are not
+     * affected by this setting. If CI Visibility is used with agentless mode, api key is used when
+     * sending data (including traces) to backend
+     */
+    private final String apiKey;
+
+    /**
+     * Note: this has effect only on profiling site. Traces are sent to Datadog agent and are not
+     * affected by this setting.
+     */
+    private final String site;
+
+    private final String serviceName;
+    private final boolean serviceNameSetByUser;
+    private final String rootContextServiceName;
+    private final boolean integrationSynapseLegacyOperationName;
+    private final String writerType;
+    private final boolean injectBaggageAsTagsEnabled;
+    private final boolean traceBuilderTagsPrecedenceEnabled;
+    private final boolean injectLinksAsTagsEnabled;
+    private final boolean agentConfiguredUsingDefault;
+    private final String agentUrl;
+    private final String agentHost;
+    private final int agentPort;
+    private final String agentUnixDomainSocket;
+    private final String agentNamedPipe;
+    private final int agentTimeout;
+
+    /** Should be set to {@code true} when running in agentless mode in a JVM without TLS */
+    private final boolean forceClearTextHttpForIntakeClient;
+
+    private final Set<String> noProxyHosts;
+    private final boolean prioritySamplingEnabled;
+    private final String prioritySamplingForce;
+    private final boolean traceResolverEnabled;
+    private final int spanAttributeSchemaVersion;
+    private final boolean peerHostNameEnabled;
+    private final boolean peerServiceDefaultsEnabled;
+    private final Map<String, String> peerServiceComponentOverrides;
+    private final boolean removeIntegrationServiceNamesEnabled;
+    private final boolean experimentalPropagateProcessTagsEnabled;
+    private final Map<String, String> processTagsMapping;
+    private final Map<String, String> peerServiceMapping;
+    private final Map<String, String> serviceMapping;
+    private final Map<String, String> tags;
+    private final Map<String, String> spanTags;
+    private final Map<String, String> jmxTags;
+    private final Map<String, String> requestHeaderTags;
+    private final Map<String, String> responseHeaderTags;
+    private final Map<String, String> baggageMapping;
+    private final boolean requestHeaderTagsCommaAllowed;
+    private final BitSet httpServerErrorStatuses;
+    private final BitSet httpClientErrorStatuses;
+    private final boolean httpServerTagQueryString;
+    private final boolean httpServerRawQueryString;
+    private final boolean httpServerRawResource;
+    private final boolean httpServerDecodedResourcePreserveSpaces;
+    private final boolean httpServerRouteBasedNaming;
+    private final Map<String, String> httpServerPathResourceNameMapping;
+    private final Map<String, String> httpClientPathResourceNameMapping;
+    private final boolean httpResourceRemoveTrailingSlash;
+    private final boolean httpClientTagQueryString;
+    private final boolean httpClientTagHeaders;
+    private final boolean httpClientSplitByDomain;
+    private final boolean dbClientSplitByInstance;
+    private final boolean dbClientSplitByInstanceTypeSuffix;
+    private final boolean dbClientSplitByHost;
+    private final Set<String> splitByTags;
+    private final Set<String> traceStatsAdditionalTags;
+    private final boolean jeeSplitByDeployment;
+    private final int scopeDepthLimit;
+    private final boolean scopeStrictMode;
+    private final int scopeIterationKeepAlive;
+    private final int partialFlushMinSpans;
+    private final int traceKeepLatencyThreshold;
+    private final boolean traceKeepLatencyThresholdEnabled;
+    private final boolean traceStrictWritesEnabled;
+    private final boolean logExtractHeaderNames;
+    private final Set<PropagationStyle> propagationStylesToExtract;
+    private final Set<PropagationStyle> propagationStylesToInject;
+    private final boolean tracePropagationStyleB3PaddingEnabled;
+    private final Set<TracePropagationStyle> tracePropagationStylesToExtract;
+    private final Set<TracePropagationStyle> tracePropagationStylesToInject;
+    private final TracePropagationBehaviorExtract tracePropagationBehaviorExtract;
+    private final boolean tracePropagationExtractFirst;
+    private final boolean traceOrgGuardEnabled;
+    private final boolean traceOrgGuardStrict;
+    private final Set<String> traceOrgGuardTrustedOpms;
+    private final int traceBaggageMaxItems;
+    private final int traceBaggageMaxBytes;
+    private final List<String> traceBaggageTagKeys;
+    private final boolean traceInferredProxyEnabled;
+    private final int clockSyncPeriod;
+    private final boolean logsInjectionEnabled;
+    private final boolean appLogsCollectionEnabled;
+
+    private final String dogStatsDNamedPipe;
+    private final int dogStatsDStartDelay;
+
+    private final Integer statsDClientQueueSize;
+    private final Integer statsDClientSocketBuffer;
+    private final Integer statsDClientSocketTimeout;
+
+    private final boolean runtimeMetricsEnabled;
+    private final boolean jmxFetchEnabled;
+    private final String jmxFetchConfigDir;
+    private final List<String> jmxFetchConfigs;
+
+    @Deprecated
+    private final List<String> jmxFetchMetricsConfigs;
+
+    private final Integer jmxFetchCheckPeriod;
+    private final Integer jmxFetchInitialRefreshBeansPeriod;
+    private final Integer jmxFetchRefreshBeansPeriod;
+    private final String jmxFetchStatsdHost;
+    private final Integer jmxFetchStatsdPort;
+    private final boolean jmxFetchMultipleRuntimeServicesEnabled;
+    private final int jmxFetchMultipleRuntimeServicesLimit;
+
+    private final String logsOtelExporter;
+    private final int logsOtelInterval;
+    private final int logsOtelTimeout;
+    private final int logsOtelQueueSize;
+    private final int logsOtelBatchSize;
+    private final String otlpLogsEndpoint;
+    private final Map<String, String> otlpLogsHeaders;
+    private final OtlpConfig.Protocol otlpLogsProtocol;
+    private final OtlpConfig.Compression otlpLogsCompression;
+    private final int otlpLogsTimeout;
+
+    private final String metricsOtelExporter;
+    private final int metricsOtelInterval;
+    private final int metricsOtelTimeout;
+    private final int metricsOtelCardinalityLimit;
+    private final boolean metricsOtelExperimentalEnabled;
+    private final String otlpMetricsEndpoint;
+    private final Map<String, String> otlpMetricsHeaders;
+    private final OtlpConfig.Protocol otlpMetricsProtocol;
+    private final OtlpConfig.Compression otlpMetricsCompression;
+    private final int otlpMetricsTimeout;
+    private final OtlpConfig.Temporality otlpMetricsTemporalityPreference;
+
+    private final boolean otelTracesSpanMetricsEnabled;
+    private final boolean traceOtelSemanticsEnabled;
+
+    private final String traceOtelExporter;
+    private final String otlpTracesEndpoint;
+    private final Map<String, String> otlpTracesHeaders;
+    private final OtlpConfig.Protocol otlpTracesProtocol;
+    private final OtlpConfig.Compression otlpTracesCompression;
+    private final int otlpTracesTimeout;
+
+    // These values are default-ed to those of jmx fetch values as needed
+    private final boolean healthMetricsEnabled;
+    private final String healthMetricsStatsdHost;
+    private final Integer healthMetricsStatsdPort;
+    private final boolean perfMetricsEnabled;
+
+    private final boolean tracerMetricsEnabled;
+    private final boolean tracerMetricsIgnoreAgentVersion;
+    private final boolean tracerMetricsBufferingEnabled;
+    private final int tracerMetricsMaxAggregates;
+    private final int tracerMetricsMaxPending;
+    private final int traceStatsInterval;
+
+    private final boolean reportHostName;
+
+    private final boolean traceAnalyticsEnabled;
+    private final String traceClientIpHeader;
+    private final boolean traceClientIpResolverEnabled;
+
+    private final boolean traceGitMetadataEnabled;
+
+    private final boolean ssiInjectionForce;
+    private final String ssiInjectionEnabled;
+    private final String instrumentationSource;
+
+    private final Map<String, String> traceSamplingServiceRules;
+    private final Map<String, String> traceSamplingOperationRules;
+    private final String traceSamplingRules;
+    private final Double traceSampleRate;
+    private final int traceRateLimit;
+    private final String spanSamplingRules;
+    private final String spanSamplingRulesFile;
+
+    private final ProfilingEnablement profilingEnabled;
+    private final boolean profilingAgentless;
+    private final boolean isDatadogProfilerSafeAndConfigured;
+    private final boolean otelThreadContextEnabled;
+
+    @Deprecated
+    private final String profilingUrl;
+
+    private final Map<String, String> profilingTags;
+    private final int profilingStartDelay;
+    private final boolean profilingStartForceFirst;
+    private final int profilingUploadPeriod;
+    private final String profilingTemplateOverrideFile;
+    private final int profilingUploadTimeout;
+    private final String profilingUploadCompression;
+    private final String profilingProxyHost;
+    private final int profilingProxyPort;
+    private final String profilingProxyUsername;
+    private final String profilingProxyPassword;
+    private final int profilingExceptionSampleLimit;
+    private final int profilingBackPressureSampleLimit;
+    private final boolean profilingBackPressureEnabled;
+    private final int profilingDirectAllocationSampleLimit;
+    private final int profilingExceptionHistogramTopItems;
+    private final int profilingExceptionHistogramMaxCollectionSize;
+    private final boolean profilingExcludeAgentThreads;
+    private final boolean profilingUploadSummaryOn413Enabled;
+    private final boolean profilingRecordExceptionMessage;
+
+    private final boolean crashTrackingAgentless;
+    private final Map<String, String> crashTrackingTags;
+    private final boolean crashTrackingErrorsIntakeEnabled;
+    private final boolean crashTrackingExtendedInfoEnabled;
+
+    private final boolean clientIpEnabled;
+
+    private final String appSecRulesFile;
+    private final int appSecTraceRateLimit;
+    private final boolean appSecWafMetrics;
+    private final int appSecWafTimeout;
+    private final String appSecAgenticOnboarding;
+    private final String appSecObfuscationParameterKeyRegexp;
+    private final String appSecObfuscationParameterValueRegexp;
+    private final String appSecHttpBlockedTemplateHtml;
+    private final String appSecHttpBlockedTemplateJson;
+    private final UserIdCollectionMode appSecUserIdCollectionMode;
+    private final Boolean appSecScaEnabled;
+    private final int appSecScaMaxTrackedDependencies;
+    private final boolean appSecStackTraceEnabled;
+    private final int appSecMaxStackTraces;
+    private final int appSecMaxStackTraceDepth;
+    private final int appSecBodyParsingSizeLimit;
+    private final int appSecMaxFileContentBytes;
+    private final int appSecMaxFileContentCount;
+    private final boolean apiSecurityEnabled;
+    private final float apiSecuritySampleDelay;
+    private final int apiSecurityEndpointCollectionMessageLimit;
+    private final int apiSecurityMaxDownstreamRequestBodyAnalysis;
+    private final double apiSecurityDownstreamRequestBodyAnalysisSampleRate;
+
+    private final boolean traceResourceRenamingEnabled;
+    private final boolean traceResourceRenamingAlwaysSimplifiedEndpoint;
+
+    private final IastDetectionMode iastDetectionMode;
+    private final int iastMaxConcurrentRequests;
+    private final int iastVulnerabilitiesPerRequest;
+    private final float iastRequestSampling;
+    private final boolean iastDebugEnabled;
+    private final Verbosity iastTelemetryVerbosity;
+    private final boolean iastRedactionEnabled;
+    private final String iastRedactionNamePattern;
+    private final String iastRedactionValuePattern;
+    private final int iastMaxRangeCount;
+    private final int iastTruncationMaxValueLength;
+    private final boolean iastStacktraceLeakSuppress;
+    private final IastContext.Mode iastContextMode;
+    private final boolean iastHardcodedSecretEnabled;
+    private final boolean iastAnonymousClassesEnabled;
+    private final boolean iastSourceMappingEnabled;
+    private final int iastSourceMappingMaxSize;
+    private final boolean iastStackTraceEnabled;
+    private final boolean iastExperimentalPropagationEnabled;
+    private final String iastSecurityControlsConfiguration;
+    private final int iastDbRowsToTaint;
+
+    private final boolean llmObsAgentlessEnabled;
+    private final String llmObsAgentlessUrl;
+    private final String llmObsMlApp;
+    private final double llmObsSampleRate;
+
+    private final boolean ciVisibilityTraceSanitationEnabled;
+    private final boolean ciVisibilityAgentlessEnabled;
+    private final String ciVisibilityAgentlessUrl;
+    private final String ciVisibilityIntakeAgentlessUrl;
+
+    private final boolean ciVisibilitySourceDataEnabled;
+    private final boolean ciVisibilityBuildInstrumentationEnabled;
+    private final String ciVisibilityAgentJarUri;
+    private final boolean ciVisibilityAutoConfigurationEnabled;
+    private final String ciVisibilityAdditionalChildProcessJvmArgs;
+    private final boolean ciVisibilityCompilerPluginAutoConfigurationEnabled;
+    private final boolean ciVisibilityGradleDependencyVerificationEnabled;
+    private final boolean ciVisibilityCodeCoverageEnabled;
+    private final Boolean ciVisibilityCoverageLinesEnabled;
+    private final String ciVisibilityCodeCoverageReportDumpDir;
+    private final List<String> codeCoverageFlags;
+    private final String ciVisibilityCompilerPluginVersion;
+    private final String ciVisibilityJacocoPluginVersion;
+    private final boolean ciVisibilityJacocoPluginVersionProvided;
+    private final List<String> ciVisibilityCodeCoverageIncludes;
+    private final List<String> ciVisibilityCodeCoverageExcludes;
+    private final String[] ciVisibilityCodeCoverageIncludedPackages;
+    private final String[] ciVisibilityCodeCoverageExcludedPackages;
+    private final List<String> ciVisibilityJacocoGradleSourceSets;
+    private final boolean ciVisibilityCodeCoverageReportUploadEnabled;
+    private final Integer ciVisibilityDebugPort;
+    private final boolean ciVisibilityGitClientEnabled;
+    private final boolean ciVisibilityGitUploadEnabled;
+    private final boolean ciVisibilityGitUnshallowEnabled;
+    private final boolean ciVisibilityGitUnshallowDefer;
+    private final long ciVisibilityGitCommandTimeoutMillis;
+    private final String ciVisibilityGitRemoteName;
+    private final long ciVisibilityBackendApiTimeoutMillis;
+    private final long ciVisibilityGitUploadTimeoutMillis;
+    private final String ciVisibilitySignalServerHost;
+    private final int ciVisibilitySignalServerPort;
+    private final int ciVisibilitySignalClientTimeoutMillis;
+    private final boolean ciVisibilityItrEnabled;
+    private final boolean ciVisibilityTestSkippingEnabled;
+    private final boolean ciVisibilityCiProviderIntegrationEnabled;
+    private final boolean ciVisibilityRepoIndexDuplicateKeyCheckEnabled;
+    private final boolean ciVisibilityRepoIndexFollowSymlinks;
+    private final int ciVisibilityExecutionSettingsCacheSize;
+    private final int ciVisibilityJvmInfoCacheSize;
+    private final int ciVisibilityCoverageRootPackagesLimit;
+    private final String ciVisibilityInjectedTracerVersion;
+    private final List<String> ciVisibilityResourceFolderNames;
+    private final boolean ciVisibilityFlakyRetryEnabled;
+    private final boolean ciVisibilityImpactedTestsDetectionEnabled;
+    private final boolean ciVisibilityKnownTestsRequestEnabled;
+    private final boolean ciVisibilityFlakyRetryOnlyKnownFlakes;
+    private final int ciVisibilityFlakyRetryCount;
+    private final int ciVisibilityTotalFlakyRetryCount;
+    private final boolean ciVisibilityDynamicAtrEnabled;
+    private final List<Integer> ciVisibilityDynamicAtrBuckets;
+    private final boolean ciVisibilityEarlyFlakeDetectionEnabled;
+    private final int ciVisibilityEarlyFlakeDetectionLowerLimit;
+    private final String ciVisibilitySessionName;
+    private final String ciVisibilityModuleName;
+    private final String ciVisibilityTestCommand;
+    private final boolean ciVisibilityTelemetryEnabled;
+    private final long ciVisibilityRumFlushWaitMillis;
+    private final boolean ciVisibilityAutoInjected;
+    private final String ciVisibilityTestOrder;
+    private final boolean ciVisibilityTestManagementEnabled;
+    private final Integer ciVisibilityTestManagementAttemptToFixRetries;
+    private final boolean ciVisibilityScalatestForkMonitorEnabled;
+    private final String gitPullRequestBaseBranch;
+    private final String gitPullRequestBaseBranchSha;
+    private final String gitCommitHeadSha;
+    private final boolean ciVisibilityFailedTestReplayEnabled;
+    private final String testOptimizationManifestFile;
+    private final boolean testOptimizationPayloadsInFiles;
+
+    private final boolean remoteConfigEnabled;
+    private final boolean remoteConfigIntegrityCheckEnabled;
+    private final String remoteConfigUrl;
+    private final float remoteConfigPollIntervalSeconds;
+    private final long remoteConfigMaxPayloadSize;
+    private final String remoteConfigTargetsKeyId;
+    private final String remoteConfigTargetsKey;
+
+    private final int remoteConfigMaxExtraServices;
+
+    private final boolean featureFlaggingProviderEnabled;
+    private final String featureFlaggingConfigurationSource;
+    private final String featureFlaggingConfigurationSourceAgentlessBaseUrl;
+    private final int featureFlaggingConfigurationSourcePollIntervalSeconds;
+    private final int featureFlaggingConfigurationSourceRequestTimeoutSeconds;
+
+    private final boolean dbmInjectSqlBaseHash;
+    private final String dbmPropagationMode;
+    private final boolean dbmPropagationOracleActionOnlyEnabled;
+    private final boolean dbmTracePreparedStatements;
+    private final boolean dbmAlwaysAppendSqlComment;
+    private final boolean dbMetadataFetchingOnQuery;
+    private final boolean dbMetadataFetchingOnConnect;
+
+    private final boolean dynamicInstrumentationEnabled;
+    private final String dynamicInstrumentationSnapshotUrl;
+    private final int dynamicInstrumentationUploadTimeout;
+    private final int dynamicInstrumentationUploadFlushInterval;
+    private final boolean dynamicInstrumentationClassFileDumpEnabled;
+    private final int dynamicInstrumentationPollInterval;
+    private final int dynamicInstrumentationDiagnosticsInterval;
+    private final boolean dynamicInstrumentationMetricEnabled;
+    private final String dynamicInstrumentationProbeFile;
+    private final int dynamicInstrumentationUploadBatchSize;
+    private final long dynamicInstrumentationMaxPayloadSize;
+    private final boolean dynamicInstrumentationVerifyByteCode;
+    private final String dynamicInstrumentationInstrumentTheWorld;
+    private final String dynamicInstrumentationExcludeFiles;
+    private final String dynamicInstrumentationIncludeFiles;
+    private final String dynamicInstrumentationTimeoutCheckerMode;
+    private final int dynamicInstrumentationCaptureTimeout;
+    private final int dynamicInstrumentationEvaluationTimeout;
+    private final String dynamicInstrumentationRedactedIdentifiers;
+    private final Set<String> dynamicInstrumentationRedactionExcludedIdentifiers;
+    private final String dynamicInstrumentationRedactedTypes;
+    private final int dynamicInstrumentationLocalVarHoistingLevel;
+    private final boolean symbolDatabaseEnabled;
+    private final boolean symbolDatabaseForceUpload;
+    private final int symbolDatabaseFlushThreshold;
+    private final boolean symbolDatabaseCompressed;
+    private final boolean debuggerExceptionEnabled;
+    private final int debuggerMaxExceptionPerSecond;
+
+    @Deprecated
+    private final boolean debuggerExceptionOnlyLocalRoot;
+
+    private final boolean debuggerExceptionCaptureIntermediateSpansEnabled;
+    private final int debuggerExceptionMaxCapturedFrames;
+    private final int debuggerExceptionCaptureInterval;
+    private final boolean debuggerCodeOriginEnabled;
+    private final int debuggerCodeOriginMaxUserFrames;
+    private final boolean distributedDebuggerEnabled;
+    private final boolean debuggerSourceFileTrackingEnabled;
+    private final boolean debuggerSynchronousSourceFileTrackingEnabled;
+
+    private final Set<String> debuggerThirdPartyIncludes;
+    private final Set<String> debuggerThirdPartyExcludes;
+    private final Set<String> debuggerShadingIdentifiers;
+
+    private final boolean awsPropagationEnabled;
+    private final boolean sqsPropagationEnabled;
+    private final boolean sqsBodyPropagationEnabled;
+
+    private final boolean kafkaClientPropagationEnabled;
+    private final Set<String> kafkaClientPropagationDisabledTopics;
+    private final boolean kafkaClientBase64DecodingEnabled;
+
+    private final boolean jmsPropagationEnabled;
+    private final Set<String> jmsPropagationDisabledTopics;
+    private final Set<String> jmsPropagationDisabledQueues;
+    private final int jmsUnacknowledgedMaxAge;
+
+    private final boolean rabbitPropagationEnabled;
+    private final Set<String> rabbitPropagationDisabledQueues;
+    private final Set<String> rabbitPropagationDisabledExchanges;
+
+    private final boolean rabbitIncludeRoutingKeyInResource;
+
+    private final boolean messageBrokerSplitByDestination;
+
+    private final boolean hystrixTagsEnabled;
+    private final boolean hystrixMeasuredEnabled;
+
+    private final boolean springSchedulingMeasuredEnabled;
+
+    private final boolean resilience4jMeasuredEnabled;
+    private final boolean resilience4jTagMetricsEnabled;
+
+    private final boolean igniteCacheIncludeKeys;
+
+    private final String obfuscationQueryRegexp;
+
+    // TODO: remove at a future point.
+    private final boolean playReportHttpStatus;
+
+    private final boolean servletPrincipalEnabled;
+    private final boolean servletAsyncTimeoutError;
+
+    private final boolean springDataRepositoryInterfaceResourceName;
+
+    private final int xDatadogTagsMaxLength;
+
+    private final ProtocolVersion protocolVersion;
+
+    private final String logLevel;
+    private final boolean debugEnabled;
+    private final boolean triageEnabled;
+    private final String triageReportTrigger;
+    private final String triageReportDir;
+
+    private final boolean startupLogsEnabled;
+    private final String configFileStatus;
+
+    private final IdGenerationStrategy idGenerationStrategy;
+
+    private final boolean secureRandom;
+
+    private final boolean lambdaSnapStartClockResyncEnabled;
+
+    private final boolean trace128bitTraceIdGenerationEnabled;
+    private final boolean logs128bitTraceIdEnabled;
+
+    private final Set<String> grpcIgnoredInboundMethods;
+    private final Set<String> grpcIgnoredOutboundMethods;
+    private final boolean grpcServerTrimPackageResource;
+    private final BitSet grpcServerErrorStatuses;
+    private final BitSet grpcClientErrorStatuses;
+
+    private final boolean cwsEnabled;
+    private final int cwsTlsRefresh;
+
+    private final boolean dataJobsOpenLineageEnabled;
+    private final boolean dataJobsOpenLineageTimeoutEnabled;
+    private final boolean dataJobsParseSparkPlanEnabled;
+    private final boolean dataJobsExperimentalFeaturesEnabled;
+
+    private final boolean dataStreamsEnabled;
+    private final float dataStreamsBucketDurationSeconds;
+    private final String dataStreamsTransactionExtractors;
+
+    private final boolean serviceDiscoveryEnabled;
+
+    private final Set<String> iastWeakHashAlgorithms;
+
+    private final Pattern iastWeakCipherAlgorithms;
+
+    private final boolean iastDeduplicationEnabled;
+
+    private final float telemetryHeartbeatInterval;
+    private final long telemetryExtendedHeartbeatInterval;
+    private final float telemetryMetricsInterval;
+    private final boolean isTelemetryDependencyServiceEnabled;
+    private final boolean telemetryMetricsEnabled;
+    private final boolean isTelemetryLogCollectionEnabled;
+    private final int telemetryDependencyResolutionQueueSize;
+
+    private final boolean azureAppServices;
+    private final boolean azureFunctions;
+    private final boolean awsServerless;
+    private final String traceAgentPath;
+    private final String testAgentSessionToken;
+    private final List<String> traceAgentArgs;
+    private final String dogStatsDPath;
+    private final List<String> dogStatsDArgs;
+    private final int dogStatsDPort;
+
+    private String env;
+    private String version;
+    private final String primaryTag;
+
+    private final ConfigProvider configProvider;
+
+    private final boolean longRunningTraceEnabled;
+    private final long longRunningTraceInitialFlushInterval;
+    private final long longRunningTraceFlushInterval;
+
+    private final boolean cassandraKeyspaceStatementExtractionEnabled;
+    private final boolean couchbaseInternalSpansEnabled;
+    private final boolean elasticsearchBodyEnabled;
+    private final boolean elasticsearchParamsEnabled;
+    private final boolean elasticsearchBodyAndParamsEnabled;
+    private final boolean sparkTaskHistogramEnabled;
+    private final boolean sparkAppNameAsService;
+    private final boolean jaxRsExceptionAsErrorsEnabled;
+    private final boolean websocketMessagesInheritSampling;
+    private final boolean websocketMessagesSeparateTraces;
+    private final boolean websocketTagSessionId;
+    private final boolean axisPromoteResourceName;
+    private final float traceFlushIntervalSeconds;
+    private final long tracePostProcessingTimeout;
+
+    private final boolean telemetryDebugRequestsEnabled;
+
+    private final int agentlessLogSubmissionQueueSize;
+    private final String agentlessLogSubmissionLevel;
+    private final String agentlessLogSubmissionUrl;
+    private final String agentlessLogSubmissionProduct;
+
+    private final Set<String> cloudPayloadTaggingServices;
+
+    @Nullable
+    private final List<JsonPath> cloudRequestPayloadTagging;
+
+    @Nullable
+    private final List<JsonPath> cloudResponsePayloadTagging;
+
+    private final int cloudPayloadTaggingMaxDepth;
+    private final int cloudPayloadTaggingMaxTags;
+
+    private final long dependecyResolutionPeriodMillis;
+
+    private final boolean apmTracingEnabled;
+    private final Set<String> experimentalFeaturesEnabled;
+
+    private final boolean jdkSocketEnabled;
+
+    private final boolean spanBuilderReuseEnabled;
+    private final int tagNameUtf8CacheSize;
+    private final int tagValueUtf8CacheSize;
+    private final int stackTraceLengthLimit;
+
+    private final boolean sfnInjectDatadogAttributeEnabled;
+    private final boolean sqsInjectDatadogAttributeEnabled;
+    private final boolean snsInjectDatadogAttributeEnabled;
+    private final boolean eventbridgeInjectDatadogAttributeEnabled;
+
+    private final RumInjectorConfig rumInjectorConfig;
+
+    private final boolean aiGuardEnabled;
+    private final String aiGuardEndpoint;
+    private final int aiGuardTimeout;
+    private final int aiGuardMaxMessagesLength;
+    private final int aiGuardMaxContentSize;
+    private final boolean aiGuardRedactionEnabled;
+
+    static {
+        // Bind telemetry collector to config module before initializing ConfigProvider
+        OtelEnvMetricCollectorProvider.register(OtelEnvMetricCollectorImpl.getInstance());
+        ConfigInversionMetricCollectorProvider.register(ConfigInversionMetricCollectorImpl.getInstance());
+    }
+
+    // Read order: System Properties -> Env Variables, [-> properties file], [-> default value]
+    private Config() {
+        this(ConfigProvider.createDefault());
+    }
+
+    private Config(final ConfigProvider configProvider) {
+        this(configProvider, new InstrumenterConfig(configProvider));
+    }
+
+    private Config(final ConfigProvider configProvider, final InstrumenterConfig instrumenterConfig) {
+        this.configProvider = configProvider;
+        this.instrumenterConfig = instrumenterConfig;
+        configFileStatus = configProvider.getConfigFileStatus();
+        runtimeIdEnabled = configProvider.getBoolean(RUNTIME_ID_ENABLED, true, RUNTIME_METRICS_RUNTIME_ID_ENABLED);
+        runtimeVersion = SystemProperties.getOrDefault("java.version", "unknown");
+
+        // Note: We do not want APiKey to be loaded from property for security reasons
+        // Note: we do not use defined default here
+        // FIXME: We should use better authentication mechanism
+        final String apiKeyFile = configProvider.getString(API_KEY_FILE);
+        String tmpApiKey = configProvider.getStringExcludingSource(API_KEY, null, SystemPropertiesConfigSource.class);
+        if (apiKeyFile != null) {
+            try {
+                tmpApiKey = new String(Files.readAllBytes(Paths.get(apiKeyFile)), StandardCharsets.UTF_8).trim();
+            } catch (final IOException e) {
+                log.error("Cannot read API key from file {}, skipping. Exception {}", apiKeyFile, e.getMessage());
+            }
+        }
+        site = configProvider.getString(SITE, DEFAULT_SITE);
+
+        String tmpApplicationKey = configProvider.getStringExcludingSource(
+                APPLICATION_KEY, null, SystemPropertiesConfigSource.class, APP_KEY);
+        String applicationKeyFile = configProvider.getString(APPLICATION_KEY_FILE);
+        if (applicationKeyFile != null) {
+            try {
+                tmpApplicationKey =
+                        new String(Files.readAllBytes(Paths.get(applicationKeyFile)), StandardCharsets.UTF_8).trim();
+            } catch (final IOException e) {
+                log.error("Cannot read API key from file {}, skipping", applicationKeyFile, e);
+            }
+        }
+        applicationKey = tmpApplicationKey;
+
+        String userProvidedServiceName = configProvider.getStringExcludingSource(
+                SERVICE, null, CapturedEnvironmentConfigSource.class, SERVICE_NAME);
+
+        if (userProvidedServiceName == null) {
+            serviceNameSetByUser = false;
+            serviceName = configProvider.getString(SERVICE, DEFAULT_SERVICE_NAME, SERVICE_NAME);
+        } else {
+            // might be an auto-detected name propagated from instrumented parent process
+            serviceNameSetByUser = configProvider.getBoolean(SERVICE_NAME_SET_BY_USER, true);
+            serviceName = userProvidedServiceName;
+        }
+
+        rootContextServiceName =
+                configProvider.getString(SERVLET_ROOT_CONTEXT_SERVICE_NAME, DEFAULT_SERVLET_ROOT_CONTEXT_SERVICE_NAME);
+
+        experimentalFeaturesEnabled = configProvider
+                        .getString(TRACE_EXPERIMENTAL_FEATURES_ENABLED, "")
+                        .equals("all")
+                ? DEFAULT_TRACE_EXPERIMENTAL_FEATURES_ENABLED
+                : configProvider.getSet(TRACE_EXPERIMENTAL_FEATURES_ENABLED, new HashSet<>());
+
+        integrationSynapseLegacyOperationName =
+                configProvider.getBoolean(INTEGRATION_SYNAPSE_LEGACY_OPERATION_NAME, false);
+        traceOtelExporter = configProvider.getString(TRACE_OTEL_EXPORTER);
+        boolean otlpTracesExporter = isTraceOtlpExporterEnabled();
+        writerType = configProvider.getString(
+                WRITER_TYPE, otlpTracesExporter ? OTLP_WRITER_TYPE : DEFAULT_AGENT_WRITER_TYPE);
+        boolean isDatadogTraceWriter = !otlpTracesExporter;
+        injectBaggageAsTagsEnabled = configProvider.getBoolean(WRITER_BAGGAGE_INJECT, isDatadogTraceWriter);
+        injectLinksAsTagsEnabled = configProvider.getBoolean(WRITER_LINKS_INJECT, isDatadogTraceWriter);
+        traceBuilderTagsPrecedenceEnabled = configProvider.getBoolean(TRACE_BUILDER_TAGS_PRECEDENCE_ENABLED, false);
+        String lambdaInitType = getEnv("AWS_LAMBDA_INITIALIZATION_TYPE");
+        String lambdaMicrovmImageArn = ConfigHelper.env("AWS_LAMBDA_MICROVM_IMAGE_ARN");
+        if ((lambdaInitType != null && lambdaInitType.equals("snap-start"))
+                || (lambdaMicrovmImageArn != null && !lambdaMicrovmImageArn.isEmpty())) {
+            secureRandom = true;
+        } else {
+            secureRandom = configProvider.getBoolean(SECURE_RANDOM, DEFAULT_SECURE_RANDOM);
+        }
+        lambdaSnapStartClockResyncEnabled = configProvider.getBoolean(
+                TRACE_LAMBDA_SNAPSTART_CLOCK_RESYNC_ENABLED, DEFAULT_TRACE_LAMBDA_SNAPSTART_CLOCK_RESYNC_ENABLED);
+        cassandraKeyspaceStatementExtractionEnabled = configProvider.getBoolean(
+                CASSANDRA_KEYSPACE_STATEMENT_EXTRACTION_ENABLED,
+                DEFAULT_CASSANDRA_KEYSPACE_STATEMENT_EXTRACTION_ENABLED);
+        couchbaseInternalSpansEnabled =
+                configProvider.getBoolean(COUCHBASE_INTERNAL_SPANS_ENABLED, DEFAULT_COUCHBASE_INTERNAL_SPANS_ENABLED);
+        elasticsearchBodyEnabled =
+                configProvider.getBoolean(ELASTICSEARCH_BODY_ENABLED, DEFAULT_ELASTICSEARCH_BODY_ENABLED);
+        elasticsearchParamsEnabled =
+                configProvider.getBoolean(ELASTICSEARCH_PARAMS_ENABLED, DEFAULT_ELASTICSEARCH_PARAMS_ENABLED);
+        elasticsearchBodyAndParamsEnabled = configProvider.getBoolean(
+                ELASTICSEARCH_BODY_AND_PARAMS_ENABLED, DEFAULT_ELASTICSEARCH_BODY_AND_PARAMS_ENABLED);
+        String strategyName = configProvider.getString(ID_GENERATION_STRATEGY);
+        trace128bitTraceIdGenerationEnabled = configProvider.getBoolean(
+                TRACE_128_BIT_TRACEID_GENERATION_ENABLED, DEFAULT_TRACE_128_BIT_TRACEID_GENERATION_ENABLED);
+
+        logs128bitTraceIdEnabled = configProvider.getBoolean(
+                TRACE_128_BIT_TRACEID_LOGGING_ENABLED, DEFAULT_TRACE_128_BIT_TRACEID_LOGGING_ENABLED);
+
+        if (secureRandom) {
+            strategyName = "SECURE_RANDOM";
+        }
+        if (strategyName == null) {
+            strategyName = "RANDOM";
+        }
+        IdGenerationStrategy strategy =
+                IdGenerationStrategy.fromName(strategyName, trace128bitTraceIdGenerationEnabled);
+        if (strategy == null) {
+            log.warn(
+                    "*** you are trying to use an unknown id generation strategy {} - falling back to RANDOM",
+                    strategyName);
+            strategyName = "RANDOM";
+            strategy = IdGenerationStrategy.fromName(strategyName, trace128bitTraceIdGenerationEnabled);
+        }
+        if (!strategyName.equals("RANDOM") && !strategyName.equals("SECURE_RANDOM")) {
+            log.warn(
+                    "*** you are using an unsupported id generation strategy {} - this can impact correctness of traces",
+                    strategyName);
+        }
+        idGenerationStrategy = strategy;
+
+        String agentHostFromEnvironment = null;
+        int agentPortFromEnvironment = -1;
+        String unixSocketFromEnvironment = null;
+        boolean rebuildAgentUrl = false;
+
+        final String agentUrlFromEnvironment = configProvider.getString(TRACE_AGENT_URL);
+        if (agentUrlFromEnvironment != null) {
+            try {
+                final URI parsedAgentUrl = new URI(agentUrlFromEnvironment);
+                agentHostFromEnvironment = parsedAgentUrl.getHost();
+                agentPortFromEnvironment = parsedAgentUrl.getPort();
+                if ("unix".equals(parsedAgentUrl.getScheme())) {
+                    unixSocketFromEnvironment = parsedAgentUrl.getPath();
+                }
+            } catch (URISyntaxException e) {
+                log.warn("{} not configured correctly: {}. Ignoring", TRACE_AGENT_URL, e.getMessage());
+            }
+        }
+
+        // avoid merging in supplementary host/port settings when dealing with unix: URLs
+        if (unixSocketFromEnvironment == null) {
+            if (agentHostFromEnvironment == null) {
+                agentHostFromEnvironment = configProvider.getString(AGENT_HOST);
+                rebuildAgentUrl = true;
+            }
+            if (agentPortFromEnvironment < 0) {
+                agentPortFromEnvironment = configProvider.getInteger(TRACE_AGENT_PORT, -1, AGENT_PORT_LEGACY);
+                rebuildAgentUrl = true;
+            }
+        }
+
+        if (agentHostFromEnvironment == null || agentHostFromEnvironment.isEmpty()) {
+            agentHost = DEFAULT_AGENT_HOST;
+        } else if (agentHostFromEnvironment.charAt(0) == '[') {
+            agentHost = agentHostFromEnvironment.substring(1, agentHostFromEnvironment.length() - 1);
+        } else {
+            agentHost = agentHostFromEnvironment;
+        }
+
+        if (agentPortFromEnvironment < 0) {
+            agentPort = DEFAULT_TRACE_AGENT_PORT;
+        } else {
+            agentPort = agentPortFromEnvironment;
+        }
+
+        if (rebuildAgentUrl) { // check if agenthost contains ':'
+            if (agentHost.indexOf(':') != -1) { // Checking to see whether host address is IPv6 vs IPv4
+                agentUrl = "http://[" + agentHost + "]:" + agentPort;
+            } else {
+                agentUrl = "http://" + agentHost + ":" + agentPort;
+            }
+        } else {
+            agentUrl = agentUrlFromEnvironment;
+        }
+
+        if (unixSocketFromEnvironment == null) {
+            unixSocketFromEnvironment = configProvider.getString(AGENT_UNIX_DOMAIN_SOCKET);
+            String unixPrefix = "unix://";
+            // handle situation where someone passes us a unix:// URL instead of a socket path
+            if (unixSocketFromEnvironment != null && unixSocketFromEnvironment.startsWith(unixPrefix)) {
+                unixSocketFromEnvironment = unixSocketFromEnvironment.substring(unixPrefix.length());
+            }
+        }
+
+        agentUnixDomainSocket = unixSocketFromEnvironment;
+
+        agentNamedPipe = configProvider.getString(AGENT_NAMED_PIPE);
+
+        agentConfiguredUsingDefault = agentHostFromEnvironment == null
+                && agentPortFromEnvironment < 0
+                && unixSocketFromEnvironment == null
+                && agentNamedPipe == null;
+
+        agentTimeout = configProvider.getInteger(AGENT_TIMEOUT, DEFAULT_AGENT_TIMEOUT);
+
+        forceClearTextHttpForIntakeClient = configProvider.getBoolean(FORCE_CLEAR_TEXT_HTTP_FOR_INTAKE_CLIENT, false);
+
+        // DD_PROXY_NO_PROXY is specified as a space-separated list of hosts
+        noProxyHosts = tryMakeImmutableSet(configProvider.getSpacedList(PROXY_NO_PROXY));
+
+        prioritySamplingEnabled = configProvider.getBoolean(PRIORITY_SAMPLING, DEFAULT_PRIORITY_SAMPLING_ENABLED);
+        prioritySamplingForce = configProvider.getString(PRIORITY_SAMPLING_FORCE, DEFAULT_PRIORITY_SAMPLING_FORCE);
+
+        traceResolverEnabled = configProvider.getBoolean(TRACE_RESOLVER_ENABLED, DEFAULT_TRACE_RESOLVER_ENABLED);
+        serviceMapping = configProvider.getMergedMap(SERVICE_MAPPING);
+
+        {
+            final Map<String, String> tags = new HashMap<>(configProvider.getMergedMap(GLOBAL_TAGS));
+            if (experimentalFeaturesEnabled.contains("DD_TAGS")) {
+                tags.putAll(configProvider.getMergedTagsMap(TRACE_TAGS, TAGS));
+            } else {
+                tags.putAll(configProvider.getMergedMap(TRACE_TAGS, TAGS));
+            }
+            if (serviceNameSetByUser) { // prioritize service name set by DD_SERVICE over DD_TAGS config
+                tags.remove("service");
+            }
+            this.tags = getMapWithPropertiesDefinedByEnvironment(tags, ENV, VERSION);
+        }
+
+        spanTags = configProvider.getMergedMap(SPAN_TAGS);
+        jmxTags = configProvider.getMergedMap(JMX_TAGS);
+
+        primaryTag = configProvider.getString(PRIMARY_TAG);
+
+        if (isEnabled(false, HEADER_TAGS, ".legacy.parsing.enabled")) {
+            requestHeaderTags = configProvider.getMergedMap(HEADER_TAGS);
+            responseHeaderTags = Collections.emptyMap();
+            if (configProvider.isSet(REQUEST_HEADER_TAGS)) {
+                logIgnoredSettingWarning(REQUEST_HEADER_TAGS, HEADER_TAGS, ".legacy.parsing.enabled");
+            }
+            if (configProvider.isSet(RESPONSE_HEADER_TAGS)) {
+                logIgnoredSettingWarning(RESPONSE_HEADER_TAGS, HEADER_TAGS, ".legacy.parsing.enabled");
+            }
+        } else {
+            requestHeaderTags = configProvider.getMergedMapWithOptionalMappings(
+                    "http.request.headers.", true, HEADER_TAGS, REQUEST_HEADER_TAGS);
+            responseHeaderTags = configProvider.getMergedMapWithOptionalMappings(
+                    "http.response.headers.", true, HEADER_TAGS, RESPONSE_HEADER_TAGS);
+        }
+        requestHeaderTagsCommaAllowed = configProvider.getBoolean(REQUEST_HEADER_TAGS_COMMA_ALLOWED, true);
+
+        baggageMapping = configProvider.getMergedMapWithOptionalMappings(null, true, BAGGAGE_MAPPING);
+
+        azureFunctions = getEnv("FUNCTIONS_WORKER_RUNTIME") != null && getEnv("FUNCTIONS_EXTENSION_VERSION") != null;
+
+        awsServerless = getEnv("AWS_LAMBDA_FUNCTION_NAME") != null
+                && !getEnv("AWS_LAMBDA_FUNCTION_NAME").isEmpty();
+
+        sfnInjectDatadogAttributeEnabled = isInjectDatadogAttributeEnabled(DEFAULT_INJECT_DATADOG_ATTRIBUTE, "sfn");
+        eventbridgeInjectDatadogAttributeEnabled =
+                isInjectDatadogAttributeEnabled(DEFAULT_INJECT_DATADOG_ATTRIBUTE, "eventbridge");
+        snsInjectDatadogAttributeEnabled = isInjectDatadogAttributeEnabled(DEFAULT_INJECT_DATADOG_ATTRIBUTE, "sns");
+        sqsInjectDatadogAttributeEnabled = isInjectDatadogAttributeEnabled(DEFAULT_INJECT_DATADOG_ATTRIBUTE, "sqs");
+
+        spanAttributeSchemaVersion = schemaVersionFromConfig();
+
+        peerHostNameEnabled = configProvider.getBoolean(TRACE_PEER_HOSTNAME_ENABLED, true);
+
+        // following two only used in v0.
+        // in v1+ defaults are always calculated regardless this feature flag
+        peerServiceDefaultsEnabled = configProvider.getBoolean(TRACE_PEER_SERVICE_DEFAULTS_ENABLED, false);
+        peerServiceComponentOverrides = configProvider.getMergedMap(TRACE_PEER_SERVICE_COMPONENT_OVERRIDES);
+        // feature flag to remove fake services in v0
+        removeIntegrationServiceNamesEnabled =
+                configProvider.getBoolean(TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED, false);
+        experimentalPropagateProcessTagsEnabled =
+                configProvider.getBoolean(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, true);
+        processTagsMapping = configProvider.getMergedMap(PROCESS_TAGS_MAPPING);
+
+        peerServiceMapping = configProvider.getMergedMap(TRACE_PEER_SERVICE_MAPPING);
+
+        httpServerPathResourceNameMapping = configProvider.getOrderedMap(TRACE_HTTP_SERVER_PATH_RESOURCE_NAME_MAPPING);
+
+        httpClientPathResourceNameMapping = configProvider.getOrderedMap(TRACE_HTTP_CLIENT_PATH_RESOURCE_NAME_MAPPING);
+
+        httpResourceRemoveTrailingSlash = configProvider.getBoolean(
+                TRACE_HTTP_RESOURCE_REMOVE_TRAILING_SLASH, DEFAULT_TRACE_HTTP_RESOURCE_REMOVE_TRAILING_SLASH);
+
+        httpServerErrorStatuses = configProvider.getIntegerRange(
+                TRACE_HTTP_SERVER_ERROR_STATUSES, DEFAULT_HTTP_SERVER_ERROR_STATUSES, HTTP_SERVER_ERROR_STATUSES);
+
+        httpClientErrorStatuses = configProvider.getIntegerRange(
+                TRACE_HTTP_CLIENT_ERROR_STATUSES, DEFAULT_HTTP_CLIENT_ERROR_STATUSES, HTTP_CLIENT_ERROR_STATUSES);
+
+        httpServerTagQueryString =
+                configProvider.getBoolean(HTTP_SERVER_TAG_QUERY_STRING, DEFAULT_HTTP_SERVER_TAG_QUERY_STRING);
+
+        httpServerRawQueryString = configProvider.getBoolean(HTTP_SERVER_RAW_QUERY_STRING, true);
+
+        httpServerRawResource = configProvider.getBoolean(HTTP_SERVER_RAW_RESOURCE, false);
+
+        httpServerDecodedResourcePreserveSpaces =
+                configProvider.getBoolean(HTTP_SERVER_DECODED_RESOURCE_PRESERVE_SPACES, true);
+
+        httpServerRouteBasedNaming =
+                configProvider.getBoolean(HTTP_SERVER_ROUTE_BASED_NAMING, DEFAULT_HTTP_SERVER_ROUTE_BASED_NAMING);
+
+        httpClientTagQueryString = configProvider.getBoolean(
+                TRACE_HTTP_CLIENT_TAG_QUERY_STRING, DEFAULT_HTTP_CLIENT_TAG_QUERY_STRING, HTTP_CLIENT_TAG_QUERY_STRING);
+
+        httpClientTagHeaders = configProvider.getBoolean(HTTP_CLIENT_TAG_HEADERS, true);
+
+        httpClientSplitByDomain =
+                configProvider.getBoolean(HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN, DEFAULT_HTTP_CLIENT_SPLIT_BY_DOMAIN);
+
+        dbClientSplitByInstance =
+                configProvider.getBoolean(DB_CLIENT_HOST_SPLIT_BY_INSTANCE, DEFAULT_DB_CLIENT_HOST_SPLIT_BY_INSTANCE);
+
+        dbClientSplitByInstanceTypeSuffix = configProvider.getBoolean(
+                DB_CLIENT_HOST_SPLIT_BY_INSTANCE_TYPE_SUFFIX, DEFAULT_DB_CLIENT_HOST_SPLIT_BY_INSTANCE_TYPE_SUFFIX);
+
+        dbMetadataFetchingOnQuery = configProvider.getBoolean(DB_METADATA_FETCHING_ON_QUERY, true);
+        dbMetadataFetchingOnConnect = configProvider.getBoolean(DB_METADATA_FETCHING_ON_CONNECT, true);
+
+        dbClientSplitByHost =
+                configProvider.getBoolean(DB_CLIENT_HOST_SPLIT_BY_HOST, DEFAULT_DB_CLIENT_HOST_SPLIT_BY_HOST);
+
+        dbmPropagationMode =
+                configProvider.getString(DB_DBM_PROPAGATION_MODE_MODE, DEFAULT_DB_DBM_PROPAGATION_MODE_MODE);
+
+        dbmPropagationOracleActionOnlyEnabled = configProvider.getBoolean(
+                DB_DBM_PROPAGATION_ORACLE_ACTION_ONLY_ENABLED, DEFAULT_DB_DBM_PROPAGATION_ORACLE_ACTION_ONLY_ENABLED);
+
+        dbmTracePreparedStatements =
+                configProvider.getBoolean(DB_DBM_TRACE_PREPARED_STATEMENTS, DEFAULT_DB_DBM_TRACE_PREPARED_STATEMENTS);
+
+        dbmAlwaysAppendSqlComment =
+                configProvider.getBoolean(DB_DBM_ALWAYS_APPEND_SQL_COMMENT, DEFAULT_DB_DBM_ALWAYS_APPEND_SQL_COMMENT);
+
+        dbmInjectSqlBaseHash = configProvider.getBoolean(DB_DBM_INJECT_SQL_BASEHASH, false)
+                || DBM_PROPAGATION_MODE_DYNAMIC_SERVICE.equals(dbmPropagationMode);
+
+        splitByTags = tryMakeImmutableSet(configProvider.getList(SPLIT_BY_TAGS));
+
+        traceStatsAdditionalTags =
+                experimentalFeaturesEnabled.contains(propertyNameToEnvironmentVariableName(TRACE_STATS_ADDITIONAL_TAGS))
+                        ? tryMakeImmutableSet(configProvider.getList(TRACE_STATS_ADDITIONAL_TAGS))
+                        : Collections.emptySet();
+
+        jeeSplitByDeployment = configProvider.getBoolean(
+                EXPERIMENTATAL_JEE_SPLIT_BY_DEPLOYMENT, DEFAULT_EXPERIMENTATAL_JEE_SPLIT_BY_DEPLOYMENT);
+
+        springDataRepositoryInterfaceResourceName =
+                configProvider.getBoolean(SPRING_DATA_REPOSITORY_INTERFACE_RESOURCE_NAME, true);
+
+        scopeDepthLimit = configProvider.getInteger(SCOPE_DEPTH_LIMIT, DEFAULT_SCOPE_DEPTH_LIMIT);
+
+        scopeStrictMode = configProvider.getBoolean(SCOPE_STRICT_MODE, false);
+
+        scopeIterationKeepAlive =
+                configProvider.getInteger(SCOPE_ITERATION_KEEP_ALIVE, DEFAULT_SCOPE_ITERATION_KEEP_ALIVE);
+
+        boolean partialFlushEnabled = configProvider.getBoolean(PARTIAL_FLUSH_ENABLED, true);
+        partialFlushMinSpans = !partialFlushEnabled
+                ? 0
+                : configProvider.getInteger(PARTIAL_FLUSH_MIN_SPANS, DEFAULT_PARTIAL_FLUSH_MIN_SPANS);
+
+        traceKeepLatencyThreshold =
+                configProvider.getInteger(TRACE_KEEP_LATENCY_THRESHOLD_MS, DEFAULT_TRACE_KEEP_LATENCY_THRESHOLD_MS);
+
+        traceKeepLatencyThresholdEnabled = !partialFlushEnabled && (traceKeepLatencyThreshold > 0);
+
+        traceStrictWritesEnabled = configProvider.getBoolean(TRACE_STRICT_WRITES_ENABLED, false);
+
+        logExtractHeaderNames = configProvider.getBoolean(
+                PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED, DEFAULT_PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED);
+
+        tracePropagationStyleB3PaddingEnabled =
+                isEnabled(DEFAULT_PROPAGATION_B3_PADDING_ENABLED, TRACE_PROPAGATION_STYLE, ".b3.padding.enabled");
+
+        TracePropagationBehaviorExtract tmpTracePropagationBehaviorExtract;
+        try {
+            tmpTracePropagationBehaviorExtract = TracePropagationBehaviorExtract.valueOf(configProvider
+                    .getString(
+                            TRACE_PROPAGATION_BEHAVIOR_EXTRACT, DEFAULT_TRACE_PROPAGATION_BEHAVIOR_EXTRACT.toString())
+                    .toUpperCase(Locale.ROOT));
+        } catch (IllegalArgumentException e) {
+            tmpTracePropagationBehaviorExtract = TracePropagationBehaviorExtract.CONTINUE;
+            log.warn("Error while parsing TRACE_PROPAGATION_BEHAVIOR_EXTRACT, defaulting to `continue`");
+        }
+        tracePropagationBehaviorExtract = tmpTracePropagationBehaviorExtract;
+
+        {
+            // The dd.propagation.style.(extract|inject) settings have been deprecated in
+            // favor of dd.trace.propagation.style(|.extract|.inject) settings.
+            // The different propagation settings when set will be applied in the following order of
+            // precedence, and warnings will be logged for both deprecation and overrides.
+            // * dd.trace.propagation.style.(extract|inject)
+            // * dd.trace.propagation.style
+            // * dd.propagation.style.(extract|inject)
+            Set<PropagationStyle> deprecatedExtract =
+                    getSettingsSetFromEnvironment(PROPAGATION_STYLE_EXTRACT, PropagationStyle::valueOfConfigName, true);
+            Set<PropagationStyle> deprecatedInject =
+                    getSettingsSetFromEnvironment(PROPAGATION_STYLE_INJECT, PropagationStyle::valueOfConfigName, true);
+            Set<TracePropagationStyle> common = getSettingsSetFromEnvironment(
+                    TRACE_PROPAGATION_STYLE, TracePropagationStyle::valueOfDisplayName, false);
+            Set<TracePropagationStyle> extract = getSettingsSetFromEnvironment(
+                    TRACE_PROPAGATION_STYLE_EXTRACT, TracePropagationStyle::valueOfDisplayName, false);
+            Set<TracePropagationStyle> inject = getSettingsSetFromEnvironment(
+                    TRACE_PROPAGATION_STYLE_INJECT, TracePropagationStyle::valueOfDisplayName, false);
+            String extractOrigin = TRACE_PROPAGATION_STYLE_EXTRACT;
+            String injectOrigin = TRACE_PROPAGATION_STYLE_INJECT;
+            // Check if we should use the common setting for extraction
+            if (extract.isEmpty()) {
+                extract = common;
+                extractOrigin = TRACE_PROPAGATION_STYLE;
+            } else if (!common.isEmpty()) {
+                // The more specific settings will override the common setting, so log a warning
+                logOverriddenSettingWarning(TRACE_PROPAGATION_STYLE, TRACE_PROPAGATION_STYLE_EXTRACT, extract);
+            }
+            // Check if we should use the common setting for injection
+            if (inject.isEmpty()) {
+                inject = common;
+                injectOrigin = TRACE_PROPAGATION_STYLE;
+            } else if (!common.isEmpty()) {
+                // The more specific settings will override the common setting, so log a warning
+                logOverriddenSettingWarning(TRACE_PROPAGATION_STYLE, TRACE_PROPAGATION_STYLE_INJECT, inject);
+            }
+            // Check if we should use the deprecated setting for extraction
+            if (extract.isEmpty()) {
+                // If we don't have a new setting, we convert the deprecated one
+                extract = convertSettingsSet(deprecatedExtract, PropagationStyle::getNewStyles);
+                if (!extract.isEmpty()) {
+                    logDeprecatedConvertedSetting(
+                            PROPAGATION_STYLE_EXTRACT, deprecatedExtract, TRACE_PROPAGATION_STYLE_EXTRACT, extract);
+                }
+            } else if (!deprecatedExtract.isEmpty()) {
+                // If we have a new setting, we log a warning
+                logOverriddenDeprecatedSettingWarning(PROPAGATION_STYLE_EXTRACT, extractOrigin, extract);
+            }
+            // Check if we should use the deprecated setting for injection
+            if (inject.isEmpty()) {
+                // If we don't have a new setting, we convert the deprecated one
+                inject = convertSettingsSet(deprecatedInject, PropagationStyle::getNewStyles);
+                if (!inject.isEmpty()) {
+                    logDeprecatedConvertedSetting(
+                            PROPAGATION_STYLE_INJECT, deprecatedInject, TRACE_PROPAGATION_STYLE_INJECT, inject);
+                }
+            } else if (!deprecatedInject.isEmpty()) {
+                // If we have a new setting, we log a warning
+                logOverriddenDeprecatedSettingWarning(PROPAGATION_STYLE_INJECT, injectOrigin, inject);
+            }
+
+            // Parse the baggage tag keys configuration
+            traceBaggageTagKeys = configProvider.getList(TRACE_BAGGAGE_TAG_KEYS, DEFAULT_TRACE_BAGGAGE_TAG_KEYS);
+
+            // Now we can check if we should pick the default injection/extraction
+
+            tracePropagationStylesToExtract = extract.isEmpty() ? DEFAULT_TRACE_PROPAGATION_STYLE : extract;
+
+            tracePropagationStylesToInject = inject.isEmpty() ? DEFAULT_TRACE_PROPAGATION_STYLE : inject;
+
+            traceBaggageMaxItems = nonNegativeBaggageLimit(
+                    TRACE_BAGGAGE_MAX_ITEMS,
+                    configProvider.getInteger(TRACE_BAGGAGE_MAX_ITEMS, DEFAULT_TRACE_BAGGAGE_MAX_ITEMS));
+            traceBaggageMaxBytes = nonNegativeBaggageLimit(
+                    TRACE_BAGGAGE_MAX_BYTES,
+                    configProvider.getInteger(TRACE_BAGGAGE_MAX_BYTES, DEFAULT_TRACE_BAGGAGE_MAX_BYTES));
+
+            // These setting are here for backwards compatibility until they can be removed in a major
+            // release of the tracer
+            propagationStylesToExtract = deprecatedExtract.isEmpty() ? DEFAULT_PROPAGATION_STYLE : deprecatedExtract;
+            propagationStylesToInject = deprecatedInject.isEmpty() ? DEFAULT_PROPAGATION_STYLE : deprecatedInject;
+        }
+
+        tracePropagationExtractFirst =
+                configProvider.getBoolean(TRACE_PROPAGATION_EXTRACT_FIRST, DEFAULT_TRACE_PROPAGATION_EXTRACT_FIRST);
+        traceOrgGuardEnabled = configProvider.getBoolean(TRACE_ORG_GUARD_ENABLED, false);
+        traceOrgGuardStrict = configProvider.getBoolean(TRACE_ORG_GUARD_STRICT, false);
+        traceOrgGuardTrustedOpms = configProvider.getSet(TRACE_ORG_GUARD_TRUSTED_OPMS, Collections.emptySet());
+        traceInferredProxyEnabled = configProvider.getBoolean(TRACE_INFERRED_PROXY_SERVICES_ENABLED, false);
+
+        clockSyncPeriod = configProvider.getInteger(CLOCK_SYNC_PERIOD, DEFAULT_CLOCK_SYNC_PERIOD);
+
+        if (experimentalFeaturesEnabled.contains(propertyNameToEnvironmentVariableName(LOGS_INJECTION))) {
+            logsInjectionEnabled = configProvider.getBoolean(LOGS_INJECTION_ENABLED, false, LOGS_INJECTION);
+        } else {
+            logsInjectionEnabled =
+                    configProvider.getBoolean(LOGS_INJECTION_ENABLED, DEFAULT_LOGS_INJECTION_ENABLED, LOGS_INJECTION);
+        }
+        appLogsCollectionEnabled =
+                configProvider.getBoolean(APP_LOGS_COLLECTION_ENABLED, DEFAULT_APP_LOGS_COLLECTION_ENABLED);
+
+        dogStatsDNamedPipe = configProvider.getString(DOGSTATSD_NAMED_PIPE);
+
+        dogStatsDStartDelay =
+                configProvider.getInteger(DOGSTATSD_START_DELAY, DEFAULT_DOGSTATSD_START_DELAY, JMX_FETCH_START_DELAY);
+
+        dogStatsDPort = configProvider.getInteger(DOGSTATSD_PORT, DEFAULT_DOGSTATSD_PORT);
+
+        statsDClientQueueSize = configProvider.getInteger(STATSD_CLIENT_QUEUE_SIZE);
+        statsDClientSocketBuffer = configProvider.getInteger(STATSD_CLIENT_SOCKET_BUFFER);
+        statsDClientSocketTimeout = configProvider.getInteger(STATSD_CLIENT_SOCKET_TIMEOUT);
+
+        logsOtelExporter = configProvider.getString(LOGS_OTEL_EXPORTER);
+
+        int otelInterval = configProvider.getInteger(LOGS_OTEL_INTERVAL, DEFAULT_LOGS_OTEL_INTERVAL);
+        if (otelInterval < 0) {
+            log.warn("Invalid OTel logs interval: {}. The value must be positive", otelInterval);
+            otelInterval = DEFAULT_LOGS_OTEL_INTERVAL;
+        }
+        logsOtelInterval = otelInterval;
+
+        int otelTimeout = configProvider.getInteger(LOGS_OTEL_TIMEOUT, DEFAULT_LOGS_OTEL_TIMEOUT);
+        if (otelTimeout < 0) {
+            log.warn("Invalid OTel logs timeout: {}. The value must be positive", otelTimeout);
+            otelTimeout = DEFAULT_LOGS_OTEL_TIMEOUT;
+        }
+        logsOtelTimeout = otelTimeout;
+
+        int otelQueueSize = configProvider.getInteger(LOGS_OTEL_QUEUE_SIZE, DEFAULT_LOGS_OTEL_QUEUE_SIZE);
+        if (otelQueueSize <= 0) {
+            log.warn("Invalid OTel logs queue size: {}. The value must be positive", otelQueueSize);
+            otelQueueSize = DEFAULT_LOGS_OTEL_QUEUE_SIZE;
+        }
+        logsOtelQueueSize = otelQueueSize;
+
+        int otelBatchSize = configProvider.getInteger(LOGS_OTEL_BATCH_SIZE, DEFAULT_LOGS_OTEL_BATCH_SIZE);
+        if (otelBatchSize <= 0) {
+            log.warn("Invalid OTel logs batch size: {}. The value must be positive", otelBatchSize);
+            otelBatchSize = DEFAULT_LOGS_OTEL_BATCH_SIZE;
+        }
+        logsOtelBatchSize = otelBatchSize;
+
+        // keep OTLP default timeout below the overall export timeout
+        int defaultOtlpLogsTimeout = Math.min(logsOtelTimeout, DEFAULT_LOGS_OTEL_TIMEOUT);
+        int otlpTimeout = configProvider.getInteger(OTLP_LOGS_TIMEOUT, defaultOtlpLogsTimeout);
+        if (otlpTimeout < 0) {
+            log.warn("Invalid OTLP logs timeout: {}. The value must be positive", otlpTimeout);
+            otlpTimeout = defaultOtlpLogsTimeout;
+        }
+        otlpLogsTimeout = otlpTimeout;
+
+        otlpLogsHeaders = configProvider.getMergedMap(OTLP_LOGS_HEADERS, '=');
+        otlpLogsProtocol = configProvider.getEnum(
+                OTLP_LOGS_PROTOCOL, OtlpConfig.Protocol.class, OtlpConfig.Protocol.HTTP_PROTOBUF);
+        otlpLogsCompression = configProvider.getEnum(
+                OTLP_LOGS_COMPRESSION, OtlpConfig.Compression.class, OtlpConfig.Compression.NONE);
+
+        String otlpLogsEndpointFromEnvironment = configProvider.getString(OTLP_LOGS_ENDPOINT);
+        if (otlpLogsEndpointFromEnvironment == null) {
+            if (otlpLogsProtocol == OtlpConfig.Protocol.GRPC) {
+                otlpLogsEndpointFromEnvironment = "http://" + agentHost + ':' + DEFAULT_OTLP_GRPC_PORT;
+            } else {
+                otlpLogsEndpointFromEnvironment =
+                        "http://" + agentHost + ':' + DEFAULT_OTLP_HTTP_PORT + '/' + DEFAULT_OTLP_HTTP_LOGS_ENDPOINT;
+            }
+        }
+        otlpLogsEndpoint = otlpLogsEndpointFromEnvironment;
+
+        metricsOtelExporter = configProvider.getString(METRICS_OTEL_EXPORTER);
+
+        int cardinalityLimit =
+                configProvider.getInteger(METRICS_OTEL_CARDINALITY_LIMIT, DEFAULT_METRICS_OTEL_CARDINALITY_LIMIT);
+        if (cardinalityLimit < 0) {
+            log.warn("Invalid OTel metrics cardinality limit: {}. The value must be positive", cardinalityLimit);
+            cardinalityLimit = DEFAULT_METRICS_OTEL_CARDINALITY_LIMIT;
+        }
+        metricsOtelCardinalityLimit = cardinalityLimit;
+
+        otelInterval = configProvider.getInteger(METRICS_OTEL_INTERVAL, DEFAULT_METRICS_OTEL_INTERVAL);
+        if (otelInterval < 0) {
+            log.warn("Invalid OTel metrics interval: {}. The value must be positive", otelInterval);
+            otelInterval = DEFAULT_METRICS_OTEL_INTERVAL;
+        }
+        metricsOtelInterval = otelInterval;
+
+        otelTimeout = configProvider.getInteger(METRICS_OTEL_TIMEOUT, DEFAULT_METRICS_OTEL_TIMEOUT);
+        if (otelTimeout < 0) {
+            log.warn("Invalid OTel metrics timeout: {}. The value must be positive", otelTimeout);
+            otelTimeout = DEFAULT_METRICS_OTEL_TIMEOUT;
+        }
+        metricsOtelTimeout = otelTimeout;
+
+        metricsOtelExperimentalEnabled =
+                configProvider.getBoolean(METRICS_OTEL_EXPERIMENTAL_ENABLED, DEFAULT_METRICS_OTEL_EXPERIMENTAL_ENABLED);
+
+        // keep OTLP default timeout below the overall export timeout
+        int defaultOtlpMetricsTimeout = Math.min(metricsOtelTimeout, DEFAULT_METRICS_OTEL_TIMEOUT);
+        otlpTimeout = configProvider.getInteger(OTLP_METRICS_TIMEOUT, defaultOtlpMetricsTimeout);
+        if (otlpTimeout < 0) {
+            log.warn("Invalid OTLP metrics timeout: {}. The value must be positive", otlpTimeout);
+            otlpTimeout = defaultOtlpMetricsTimeout;
+        }
+        otlpMetricsTimeout = otlpTimeout;
+
+        otlpMetricsHeaders = configProvider.getMergedMap(OTLP_METRICS_HEADERS, '=');
+        otlpMetricsProtocol = configProvider.getEnum(
+                OTLP_METRICS_PROTOCOL, OtlpConfig.Protocol.class, OtlpConfig.Protocol.HTTP_PROTOBUF);
+        otlpMetricsCompression = configProvider.getEnum(
+                OTLP_METRICS_COMPRESSION, OtlpConfig.Compression.class, OtlpConfig.Compression.NONE);
+
+        String otlpMetricsEndpointFromEnvironment = configProvider.getString(OTLP_METRICS_ENDPOINT);
+        if (otlpMetricsEndpointFromEnvironment == null) {
+            if (otlpMetricsProtocol == OtlpConfig.Protocol.GRPC) {
+                otlpMetricsEndpointFromEnvironment = "http://" + agentHost + ':' + DEFAULT_OTLP_GRPC_PORT;
+            } else {
+                otlpMetricsEndpointFromEnvironment =
+                        "http://" + agentHost + ':' + DEFAULT_OTLP_HTTP_PORT + '/' + DEFAULT_OTLP_HTTP_METRICS_ENDPOINT;
+            }
+        }
+        otlpMetricsEndpoint = otlpMetricsEndpointFromEnvironment;
+
+        otlpMetricsTemporalityPreference = configProvider.getEnum(
+                OTLP_METRICS_TEMPORALITY_PREFERENCE, OtlpConfig.Temporality.class, OtlpConfig.Temporality.DELTA);
+
+        traceOtelSemanticsEnabled = configProvider.getBoolean(TRACE_OTEL_SEMANTICS_ENABLED, false);
+        // Tri-state default: when unset, SDK-computed OTLP span metrics are emitted iff OTLP trace
+        // export and OTLP metrics export are both enabled.
+        otelTracesSpanMetricsEnabled = configProvider.getBoolean(
+                OTEL_TRACES_SPAN_METRICS_ENABLED,
+                isTraceOtlpExporterEnabled() && isMetricsOtelEnabled() && isMetricsOtlpExporterEnabled());
+
+        otlpTimeout = configProvider.getInteger(OTLP_TRACES_TIMEOUT, DEFAULT_OTLP_TRACES_TIMEOUT);
+        if (otlpTimeout < 0) {
+            log.warn("Invalid OTLP traces timeout: {}. The value must be positive", otlpTimeout);
+            otlpTimeout = DEFAULT_OTLP_TRACES_TIMEOUT;
+        }
+        otlpTracesTimeout = otlpTimeout;
+
+        otlpTracesHeaders = configProvider.getMergedMap(OTLP_TRACES_HEADERS, '=');
+        otlpTracesProtocol = configProvider.getEnum(
+                OTLP_TRACES_PROTOCOL, OtlpConfig.Protocol.class, OtlpConfig.Protocol.HTTP_PROTOBUF);
+        otlpTracesCompression = configProvider.getEnum(
+                OTLP_TRACES_COMPRESSION, OtlpConfig.Compression.class, OtlpConfig.Compression.NONE);
+
+        String otlpTracesEndpointFromEnvironment = configProvider.getString(OTLP_TRACES_ENDPOINT);
+        if (otlpTracesEndpointFromEnvironment == null) {
+            if (otlpTracesProtocol == OtlpConfig.Protocol.GRPC) {
+                otlpTracesEndpointFromEnvironment = "http://" + agentHost + ':' + DEFAULT_OTLP_GRPC_PORT;
+            } else {
+                otlpTracesEndpointFromEnvironment =
+                        "http://" + agentHost + ':' + DEFAULT_OTLP_HTTP_PORT + '/' + DEFAULT_OTLP_HTTP_TRACES_ENDPOINT;
+            }
+        }
+        otlpTracesEndpoint = otlpTracesEndpointFromEnvironment;
+
+        // Runtime metrics are disabled if Otel metrics are enabled and the metrics exporter is none
+        runtimeMetricsEnabled = configProvider.getBoolean(RUNTIME_METRICS_ENABLED, true);
+
+        jmxFetchEnabled =
+                runtimeMetricsEnabled && configProvider.getBoolean(JMX_FETCH_ENABLED, DEFAULT_JMX_FETCH_ENABLED);
+        jmxFetchConfigDir = configProvider.getString(JMX_FETCH_CONFIG_DIR);
+        jmxFetchConfigs = tryMakeImmutableList(configProvider.getList(JMX_FETCH_CONFIG));
+        jmxFetchMetricsConfigs = tryMakeImmutableList(configProvider.getList(JMX_FETCH_METRICS_CONFIGS));
+        jmxFetchCheckPeriod = configProvider.getInteger(JMX_FETCH_CHECK_PERIOD);
+        jmxFetchInitialRefreshBeansPeriod = configProvider.getInteger(JMX_FETCH_INITIAL_REFRESH_BEANS_PERIOD);
+        jmxFetchRefreshBeansPeriod = configProvider.getInteger(JMX_FETCH_REFRESH_BEANS_PERIOD);
+
+        jmxFetchStatsdPort = configProvider.getInteger(JMX_FETCH_STATSD_PORT, DOGSTATSD_PORT);
+        jmxFetchStatsdHost = configProvider.getString(
+                JMX_FETCH_STATSD_HOST,
+                // default to agent host if an explicit port has been set
+                null != jmxFetchStatsdPort && jmxFetchStatsdPort > 0 ? agentHost : null,
+                DOGSTATSD_HOST);
+
+        jmxFetchMultipleRuntimeServicesEnabled = configProvider.getBoolean(
+                JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_ENABLED, DEFAULT_JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_ENABLED);
+        jmxFetchMultipleRuntimeServicesLimit = configProvider.getInteger(
+                JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_LIMIT, DEFAULT_JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_LIMIT);
+
+        // Writer.Builder createMonitor will use the values of the JMX fetch & agent to fill-in defaults
+        healthMetricsEnabled = runtimeMetricsEnabled
+                && configProvider.getBoolean(HEALTH_METRICS_ENABLED, DEFAULT_HEALTH_METRICS_ENABLED);
+        healthMetricsStatsdHost = configProvider.getString(HEALTH_METRICS_STATSD_HOST);
+        healthMetricsStatsdPort = configProvider.getInteger(HEALTH_METRICS_STATSD_PORT);
+        perfMetricsEnabled =
+                runtimeMetricsEnabled && configProvider.getBoolean(PERF_METRICS_ENABLED, DEFAULT_PERF_METRICS_ENABLED);
+
+        tracerMetricsEnabled = configProvider.getBoolean(TRACE_STATS_COMPUTATION_ENABLED, true, TRACER_METRICS_ENABLED);
+        tracerMetricsIgnoreAgentVersion =
+                configProvider.getBoolean(TRACE_STATS_COMPUTATION_IGNORE_AGENT_VERSION, false);
+        tracerMetricsBufferingEnabled = configProvider.getBoolean(TRACER_METRICS_BUFFERING_ENABLED, false);
+        // Internal, test-only override of the stats flush interval. Read directly from the
+        // underscore-prefixed env var so it bypasses config-inversion validation and telemetry.
+        int statsInterval = DEFAULT_TRACE_STATS_INTERVAL;
+        String statsIntervalOverride = ConfigHelper.env("_DD_TRACE_STATS_INTERVAL");
+        if (statsIntervalOverride != null) {
+            try {
+                statsInterval = Integer.parseInt(statsIntervalOverride);
+            } catch (NumberFormatException ignored) {
+                // fall back to the default
+            }
+        }
+        traceStatsInterval = statsInterval;
+        // The metrics inbox is an MpscArrayQueue<SpanSnapshot>; each saturated slot holds one
+        // ~120 B SpanSnapshot. The historical default TRACER_METRICS_MAX_PENDING=2048 (logical) *
+        // LEGACY_BATCH_SIZE=64 = 131072 slots was sized for the prior conflating-Batch model where
+        // slot memory was only realized under burst; with one snapshot per slot, the worst-case
+        // in-flight footprint is ~15 MB. At Xmx <= ~128 MB the G1 survivor region is too small to
+        // absorb that footprint when the aggregator stalls -- observed catastrophically at Xmx64m
+        // petclinic where SpanSnapshots overflow young gen and trigger To-space Exhausted -> Full
+        // GC storms (0 r/s in the worst case).
+        //
+        // Cut the default accordingly:
+        //   - normal heap: 128 logical * 64 = 8192 slots, ~1 MB worst-case in-flight. ~0.8 s of
+        //     buffer at 10K spans/s, well above typical GC pause windows.
+        //   - tight heap (Xmx < 128 MB): 64 logical * 64 = 4096 slots, ~500 KB worst case.
+        //
+        // Customers who explicitly configured TRACER_METRICS_MAX_PENDING keep their value (the
+        // LEGACY_BATCH_SIZE multiplier still applies to it) -- only the implicit default shrinks.
+        final boolean tightHeap = Runtime.getRuntime().maxMemory() < 128L * 1024 * 1024;
+        final int defaultMaxAggregates = tightHeap ? 256 : 2048;
+        final int defaultMaxPending = tightHeap ? 64 : 128;
+
+        tracerMetricsMaxAggregates = configProvider.getInteger(
+                TRACE_STATS_CARDINALITY_LIMIT, defaultMaxAggregates, TRACER_METRICS_MAX_AGGREGATES);
+        /*
+         * TRACER_METRICS_MAX_PENDING historically counted conflating Batch slots (~64 spans per batch
+         * via Batch.MAX_BATCH_SIZE). The inbox now holds 1 SpanSnapshot per metrics-eligible span, so
+         * we multiply the configured value by the legacy batch size to preserve the effective
+         * span-throughput capacity for any existing customer override (e.g. a configured 4096 still
+         * means "~262144 spans before drops", same as before).
+         *
+         * Long-promote the multiplication and clamp to MAX_SAFE_ARRAY_SIZE so an absurd customer
+         * override (>= ~33M) can't silently wrap to a negative int. MAX_SAFE_ARRAY_SIZE sits a few
+         * bytes below Integer.MAX_VALUE because the JVM reserves header slack on array allocations;
+         * see java.util.ArraysSupport.SOFT_MAX_ARRAY_LENGTH for the same convention.
+         */
+        long requestedMaxPending =
+                (long) configProvider.getInteger(TRACER_METRICS_MAX_PENDING, defaultMaxPending) * LEGACY_BATCH_SIZE;
+        tracerMetricsMaxPending = (int) Math.min(requestedMaxPending, MAX_SAFE_ARRAY_SIZE);
+        reportHostName = configProvider.getBoolean(TRACE_REPORT_HOSTNAME, DEFAULT_TRACE_REPORT_HOSTNAME);
+
+        ProtocolVersion protocol = ProtocolVersion.fromConfigValue(
+                configProvider.getString(TRACE_AGENT_PROTOCOL_VERSION, DEFAULT_TRACE_AGENT_PROTOCOL_VERSION));
+
+        // Check if we need to fall back to legacy flag of `0.5` protocol.
+        if (protocol != ProtocolVersion.V1_0 && configProvider.getBoolean(ENABLE_TRACE_AGENT_V05, false)) {
+            protocol = ProtocolVersion.V0_5;
+        }
+
+        protocolVersion = protocol;
+
+        traceAnalyticsEnabled = configProvider.getBoolean(TRACE_ANALYTICS_ENABLED, DEFAULT_TRACE_ANALYTICS_ENABLED);
+
+        String traceClientIpHeader = configProvider.getString(TRACE_CLIENT_IP_HEADER);
+        if (traceClientIpHeader == null) {
+            traceClientIpHeader = configProvider.getString(APPSEC_IP_ADDR_HEADER);
+        }
+        if (traceClientIpHeader != null) {
+            traceClientIpHeader = traceClientIpHeader.toLowerCase(Locale.ROOT);
+        }
+        this.traceClientIpHeader = traceClientIpHeader;
+
+        traceClientIpResolverEnabled = configProvider.getBoolean(TRACE_CLIENT_IP_RESOLVER_ENABLED, true);
+
+        traceGitMetadataEnabled = configProvider.getBoolean(TRACE_GIT_METADATA_ENABLED, true);
+
+        traceSamplingServiceRules = configProvider.getMergedMap(TRACE_SAMPLING_SERVICE_RULES);
+        traceSamplingOperationRules = configProvider.getMergedMap(TRACE_SAMPLING_OPERATION_RULES);
+        traceSamplingRules = configProvider.getString(TRACE_SAMPLING_RULES);
+        traceSampleRate = configProvider.getDouble(TRACE_SAMPLE_RATE);
+        traceRateLimit = configProvider.getInteger(TRACE_RATE_LIMIT, DEFAULT_TRACE_RATE_LIMIT);
+        spanSamplingRules = configProvider.getString(SPAN_SAMPLING_RULES);
+        spanSamplingRulesFile = configProvider.getString(SPAN_SAMPLING_RULES_FILE);
+
+        // For the native image 'instrumenterConfig.isProfilingEnabled()' value will be 'baked-in' based
+        // on whether
+        // the profiler was enabled at build time or not.
+        // Otherwise just do the standard config lookup by key.
+        // An extra step is needed to properly handle the 'auto' value for profiling enablement via SSI.
+        String value = configProvider.getString(
+                ProfilingConfig.PROFILING_ENABLED, String.valueOf(instrumenterConfig.isProfilingEnabled()));
+        // Run a validator that will emit a warning if the value is not a valid ProfilingEnablement
+        // We don't want it to run in each call to ProfilingEnablement.of(value) not to flood the logs
+        ProfilingEnablement.validate(value);
+        profilingEnabled = ProfilingEnablement.of(value);
+        profilingAgentless = configProvider.getBoolean(PROFILING_AGENTLESS, PROFILING_AGENTLESS_DEFAULT);
+        isDatadogProfilerSafeAndConfigured = !isDatadogProfilerEnablementOverridden()
+                && configProvider.getBoolean(
+                        PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
+                && !(Platform.isNativeImageBuilder() || Platform.isNativeImage());
+        profilingUrl = configProvider.getString(PROFILING_URL);
+
+        if (tmpApiKey == null) {
+            final String oldProfilingApiKeyFile = configProvider.getString(PROFILING_API_KEY_FILE_OLD);
+            tmpApiKey = getEnv(propertyNameToEnvironmentVariableName(PROFILING_API_KEY_OLD));
+            if (oldProfilingApiKeyFile != null) {
+                try {
+                    tmpApiKey = new String(
+                                    Files.readAllBytes(Paths.get(oldProfilingApiKeyFile)), StandardCharsets.UTF_8)
+                            .trim();
+                } catch (final IOException e) {
+                    log.error("Cannot read API key from file {}, skipping", oldProfilingApiKeyFile, e);
+                }
+            }
+        }
+        if (tmpApiKey == null) {
+            final String veryOldProfilingApiKeyFile = configProvider.getString(PROFILING_API_KEY_FILE_VERY_OLD);
+            tmpApiKey = getEnv(propertyNameToEnvironmentVariableName(PROFILING_API_KEY_VERY_OLD));
+            if (veryOldProfilingApiKeyFile != null) {
+                try {
+                    tmpApiKey = new String(
+                                    Files.readAllBytes(Paths.get(veryOldProfilingApiKeyFile)), StandardCharsets.UTF_8)
+                            .trim();
+                } catch (final IOException e) {
+                    log.error("Cannot read API key from file {}, skipping", veryOldProfilingApiKeyFile, e);
+                }
+            }
+        }
+
+        profilingTags = configProvider.getMergedMap(PROFILING_TAGS);
+        int profilingStartDelayValue = configProvider.getInteger(PROFILING_START_DELAY, PROFILING_START_DELAY_DEFAULT);
+        boolean profilingStartForceFirstValue =
+                configProvider.getBoolean(PROFILING_START_FORCE_FIRST, PROFILING_START_FORCE_FIRST_DEFAULT);
+        if (profilingEnabled == ProfilingEnablement.AUTO || profilingEnabled == ProfilingEnablement.INJECTED) {
+            if (profilingStartDelayValue != PROFILING_START_DELAY_DEFAULT) {
+                log.info(
+                        "Profiling start delay is set to {}s, but profiling enablement is set to auto. Using the default delay of {}s.",
+                        profilingStartDelayValue,
+                        PROFILING_START_DELAY_DEFAULT);
+            }
+            if (profilingStartForceFirstValue != PROFILING_START_FORCE_FIRST_DEFAULT) {
+                log.info(
+                        "Profiling is requested to start immediately, but profiling enablement is set to auto. Profiling will be started with delay of {}s.",
+                        PROFILING_START_DELAY_DEFAULT);
+            }
+            profilingStartDelayValue = PROFILING_START_DELAY_DEFAULT;
+            profilingStartForceFirstValue = PROFILING_START_FORCE_FIRST_DEFAULT;
+        }
+        profilingStartDelay = profilingStartDelayValue;
+        profilingStartForceFirst = profilingStartForceFirstValue;
+        profilingUploadPeriod = configProvider.getInteger(PROFILING_UPLOAD_PERIOD, PROFILING_UPLOAD_PERIOD_DEFAULT);
+        profilingTemplateOverrideFile = configProvider.getString(PROFILING_TEMPLATE_OVERRIDE_FILE);
+        profilingUploadTimeout = configProvider.getInteger(PROFILING_UPLOAD_TIMEOUT, PROFILING_UPLOAD_TIMEOUT_DEFAULT);
+        profilingUploadCompression = configProvider.getString(
+                PROFILING_DEBUG_UPLOAD_COMPRESSION,
+                PROFILING_DEBUG_UPLOAD_COMPRESSION_DEFAULT,
+                PROFILING_UPLOAD_COMPRESSION);
+        profilingProxyHost = configProvider.getString(PROFILING_PROXY_HOST);
+        profilingProxyPort = configProvider.getInteger(PROFILING_PROXY_PORT, PROFILING_PROXY_PORT_DEFAULT);
+        profilingProxyUsername = configProvider.getString(PROFILING_PROXY_USERNAME);
+        profilingProxyPassword = configProvider.getString(PROFILING_PROXY_PASSWORD);
+
+        profilingExceptionSampleLimit =
+                configProvider.getInteger(PROFILING_EXCEPTION_SAMPLE_LIMIT, PROFILING_EXCEPTION_SAMPLE_LIMIT_DEFAULT);
+        profilingBackPressureSampleLimit = configProvider.getInteger(
+                PROFILING_EXCEPTION_SAMPLE_LIMIT, PROFILING_BACKPRESSURE_SAMPLE_LIMIT_DEFAULT);
+        profilingBackPressureEnabled = configProvider.getBoolean(
+                PROFILING_BACKPRESSURE_SAMPLING_ENABLED, PROFILING_BACKPRESSURE_SAMPLING_ENABLED_DEFAULT);
+        profilingDirectAllocationSampleLimit = configProvider.getInteger(
+                PROFILING_DIRECT_ALLOCATION_SAMPLE_LIMIT, PROFILING_DIRECT_ALLOCATION_SAMPLE_LIMIT_DEFAULT);
+        profilingExceptionHistogramTopItems = configProvider.getInteger(
+                PROFILING_EXCEPTION_HISTOGRAM_TOP_ITEMS, PROFILING_EXCEPTION_HISTOGRAM_TOP_ITEMS_DEFAULT);
+        profilingExceptionHistogramMaxCollectionSize = configProvider.getInteger(
+                PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE,
+                PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE_DEFAULT);
+
+        profilingExcludeAgentThreads = configProvider.getBoolean(PROFILING_EXCLUDE_AGENT_THREADS, true);
+
+        profilingRecordExceptionMessage = configProvider.getBoolean(
+                PROFILING_EXCEPTION_RECORD_MESSAGE, PROFILING_EXCEPTION_RECORD_MESSAGE_DEFAULT);
+
+        profilingUploadSummaryOn413Enabled =
+                configProvider.getBoolean(PROFILING_UPLOAD_SUMMARY_ON_413, PROFILING_UPLOAD_SUMMARY_ON_413_DEFAULT);
+
+        crashTrackingAgentless = configProvider.getBoolean(CRASH_TRACKING_AGENTLESS, CRASH_TRACKING_AGENTLESS_DEFAULT);
+        crashTrackingTags = configProvider.getMergedMap(CRASH_TRACKING_TAGS);
+        crashTrackingErrorsIntakeEnabled = configProvider.getBoolean(
+                CRASH_TRACKING_ERRORS_INTAKE_ENABLED, CRASH_TRACKING_ERRORS_INTAKE_ENABLED_DEFAULT);
+        crashTrackingExtendedInfoEnabled = configProvider.getBoolean(
+                CRASH_TRACKING_EXTENDED_INFO_ENABLED, CRASH_TRACKING_EXTENDED_INFO_ENABLED_DEFAULT);
+
+        float telemetryInterval =
+                configProvider.getFloat(TELEMETRY_HEARTBEAT_INTERVAL, DEFAULT_TELEMETRY_HEARTBEAT_INTERVAL);
+        if (telemetryInterval < 0.1 || telemetryInterval > 3600) {
+            log.warn(
+                    "Invalid Telemetry heartbeat interval: {}. The value must be in range 0.1-3600", telemetryInterval);
+            telemetryInterval = DEFAULT_TELEMETRY_HEARTBEAT_INTERVAL;
+        }
+        telemetryHeartbeatInterval = telemetryInterval;
+
+        telemetryExtendedHeartbeatInterval = configProvider.getLong(
+                TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL, DEFAULT_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL);
+
+        telemetryInterval = configProvider.getFloat(TELEMETRY_METRICS_INTERVAL, DEFAULT_TELEMETRY_METRICS_INTERVAL);
+        if (telemetryInterval < 0.1 || telemetryInterval > 3600) {
+            log.warn("Invalid Telemetry metrics interval: {}. The value must be in range 0.1-3600", telemetryInterval);
+            telemetryInterval = DEFAULT_TELEMETRY_METRICS_INTERVAL;
+        }
+        telemetryMetricsInterval = telemetryInterval;
+
+        telemetryMetricsEnabled = configProvider.getBoolean(TELEMETRY_METRICS_ENABLED, true);
+
+        isTelemetryLogCollectionEnabled = instrumenterConfig.isTelemetryEnabled()
+                && configProvider.getBoolean(
+                        TELEMETRY_LOG_COLLECTION_ENABLED, DEFAULT_TELEMETRY_LOG_COLLECTION_ENABLED);
+
+        isTelemetryDependencyServiceEnabled = configProvider.getBoolean(
+                TELEMETRY_DEPENDENCY_COLLECTION_ENABLED, DEFAULT_TELEMETRY_DEPENDENCY_COLLECTION_ENABLED);
+        telemetryDependencyResolutionQueueSize = configProvider.getInteger(
+                TELEMETRY_DEPENDENCY_RESOLUTION_QUEUE_SIZE, DEFAULT_TELEMETRY_DEPENDENCY_RESOLUTION_QUEUE_SIZE);
+        clientIpEnabled = configProvider.getBoolean(CLIENT_IP_ENABLED, DEFAULT_CLIENT_IP_ENABLED);
+
+        appSecRulesFile = configProvider.getString(APPSEC_RULES_FILE, null);
+
+        appSecTraceRateLimit = configProvider.getInteger(APPSEC_TRACE_RATE_LIMIT, DEFAULT_APPSEC_TRACE_RATE_LIMIT);
+
+        appSecWafMetrics = configProvider.getBoolean(APPSEC_WAF_METRICS, DEFAULT_APPSEC_WAF_METRICS);
+
+        appSecWafTimeout = configProvider.getInteger(APPSEC_WAF_TIMEOUT, DEFAULT_APPSEC_WAF_TIMEOUT);
+
+        // RFC-1113: reported verbatim in configuration telemetry; always emitted (empty when unset).
+        appSecAgenticOnboarding =
+                configProvider.getString(APPSEC_AGENTIC_ONBOARDING, DEFAULT_APPSEC_AGENTIC_ONBOARDING);
+
+        appSecObfuscationParameterKeyRegexp = configProvider.getString(APPSEC_OBFUSCATION_PARAMETER_KEY_REGEXP, null);
+        appSecObfuscationParameterValueRegexp =
+                configProvider.getString(APPSEC_OBFUSCATION_PARAMETER_VALUE_REGEXP, null);
+
+        appSecHttpBlockedTemplateHtml = configProvider.getString(APPSEC_HTTP_BLOCKED_TEMPLATE_HTML, null);
+        appSecHttpBlockedTemplateJson = configProvider.getString(APPSEC_HTTP_BLOCKED_TEMPLATE_JSON, null);
+        appSecUserIdCollectionMode = UserIdCollectionMode.fromString(
+                configProvider.getStringNotEmpty(APPSEC_AUTO_USER_INSTRUMENTATION_MODE, null),
+                configProvider.getStringNotEmpty(APPSEC_AUTOMATED_USER_EVENTS_TRACKING, null));
+        appSecScaEnabled = configProvider.getBoolean(APPSEC_SCA_ENABLED);
+        appSecScaMaxTrackedDependencies = configProvider.getInteger(
+                APPSEC_SCA_MAX_TRACKED_DEPENDENCIES, DEFAULT_APPSEC_SCA_MAX_TRACKED_DEPENDENCIES);
+        appSecStackTraceEnabled = configProvider.getBoolean(
+                APPSEC_STACK_TRACE_ENABLED, DEFAULT_APPSEC_STACK_TRACE_ENABLED, APPSEC_STACKTRACE_ENABLED_DEPRECATED);
+        appSecMaxStackTraces = configProvider.getInteger(
+                APPSEC_MAX_STACK_TRACES, DEFAULT_APPSEC_MAX_STACK_TRACES, APPSEC_MAX_STACKTRACES_DEPRECATED);
+        appSecMaxStackTraceDepth = configProvider.getInteger(
+                APPSEC_MAX_STACK_TRACE_DEPTH,
+                DEFAULT_APPSEC_MAX_STACK_TRACE_DEPTH,
+                APPSEC_MAX_STACKTRACE_DEPTH_DEPRECATED);
+        appSecBodyParsingSizeLimit =
+                configProvider.getInteger(APPSEC_BODY_PARSING_SIZE_LIMIT, DEFAULT_APPSEC_BODY_PARSING_SIZE_LIMIT);
+        appSecMaxFileContentBytes =
+                configProvider.getInteger(APPSEC_MAX_FILE_CONTENT_BYTES, DEFAULT_APPSEC_MAX_FILE_CONTENT_BYTES);
+        appSecMaxFileContentCount =
+                configProvider.getInteger(APPSEC_MAX_FILE_CONTENT_COUNT, DEFAULT_APPSEC_MAX_FILE_CONTENT_COUNT);
+        apiSecurityEnabled = configProvider.getBoolean(
+                API_SECURITY_ENABLED, DEFAULT_API_SECURITY_ENABLED, API_SECURITY_ENABLED_EXPERIMENTAL);
+        apiSecuritySampleDelay = configProvider.getFloat(API_SECURITY_SAMPLE_DELAY, DEFAULT_API_SECURITY_SAMPLE_DELAY);
+        apiSecurityEndpointCollectionMessageLimit = configProvider.getInteger(
+                API_SECURITY_ENDPOINT_COLLECTION_MESSAGE_LIMIT, DEFAULT_API_SECURITY_ENDPOINT_COLLECTION_MESSAGE_LIMIT);
+        apiSecurityMaxDownstreamRequestBodyAnalysis = configProvider.getInteger(
+                API_SECURITY_MAX_DOWNSTREAM_REQUEST_BODY_ANALYSIS,
+                DEFAULT_API_SECURITY_MAX_DOWNSTREAM_REQUEST_BODY_ANALYSIS);
+        apiSecurityDownstreamRequestBodyAnalysisSampleRate = configProvider.getDouble(
+                API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE,
+                DEFAULT_API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE,
+                API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE,
+                API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE);
+
+        // Trace Resource Renaming (Endpoint Inference) configuration
+        // Default: enabled if AppSec is enabled, otherwise disabled
+        // Can be explicitly overridden by setting DD_TRACE_RESOURCE_RENAMING_ENABLED
+        Boolean traceResourceRenamingExplicit = configProvider.getBoolean(TRACE_RESOURCE_RENAMING_ENABLED);
+        this.traceResourceRenamingEnabled = traceResourceRenamingExplicit != null
+                ? traceResourceRenamingExplicit
+                : instrumenterConfig.getAppSecActivation() == ProductActivation.FULLY_ENABLED;
+
+        // No dedicated flag: kill switch is DD_PROFILING_ENABLED / DD_APPSEC_ENABLED.
+        this.otelThreadContextEnabled = isDatadogProfilerSafeAndConfigured()
+                && (isProfilingEnabled()
+                        || instrumenterConfig.getAppSecActivation() == ProductActivation.FULLY_ENABLED);
+
+        this.traceResourceRenamingAlwaysSimplifiedEndpoint =
+                configProvider.getBoolean(TRACE_RESOURCE_RENAMING_ALWAYS_SIMPLIFIED_ENDPOINT, false);
+
+        iastDebugEnabled = configProvider.getBoolean(IAST_DEBUG_ENABLED, DEFAULT_IAST_DEBUG_ENABLED);
+
+        iastContextMode = configProvider.getEnum(IAST_CONTEXT_MODE, IastContext.Mode.class, IastContext.Mode.REQUEST);
+        iastDetectionMode =
+                configProvider.getEnum(IAST_DETECTION_MODE, IastDetectionMode.class, IastDetectionMode.DEFAULT);
+        iastMaxConcurrentRequests = iastDetectionMode.getIastMaxConcurrentRequests(configProvider);
+        iastVulnerabilitiesPerRequest = iastDetectionMode.getIastVulnerabilitiesPerRequest(configProvider);
+        iastRequestSampling = iastDetectionMode.getIastRequestSampling(configProvider);
+        iastDeduplicationEnabled = iastDetectionMode.isIastDeduplicationEnabled(configProvider);
+        iastWeakHashAlgorithms = tryMakeImmutableSet(
+                configProvider.getSet(IAST_WEAK_HASH_ALGORITHMS, DEFAULT_IAST_WEAK_HASH_ALGORITHMS));
+        iastWeakCipherAlgorithms =
+                getPattern(DEFAULT_IAST_WEAK_CIPHER_ALGORITHMS, configProvider.getString(IAST_WEAK_CIPHER_ALGORITHMS));
+        iastTelemetryVerbosity =
+                configProvider.getEnum(IAST_TELEMETRY_VERBOSITY, Verbosity.class, Verbosity.INFORMATION);
+        iastRedactionEnabled = configProvider.getBoolean(IAST_REDACTION_ENABLED, DEFAULT_IAST_REDACTION_ENABLED);
+        iastRedactionNamePattern =
+                configProvider.getString(IAST_REDACTION_NAME_PATTERN, DEFAULT_IAST_REDACTION_NAME_PATTERN);
+        iastRedactionValuePattern =
+                configProvider.getString(IAST_REDACTION_VALUE_PATTERN, DEFAULT_IAST_REDACTION_VALUE_PATTERN);
+        iastTruncationMaxValueLength =
+                configProvider.getInteger(IAST_TRUNCATION_MAX_VALUE_LENGTH, DEFAULT_IAST_TRUNCATION_MAX_VALUE_LENGTH);
+        iastMaxRangeCount = iastDetectionMode.getIastMaxRangeCount(configProvider);
+        iastStacktraceLeakSuppress = configProvider.getBoolean(
+                IAST_STACK_TRACE_LEAK_SUPPRESS,
+                DEFAULT_IAST_STACKTRACE_LEAK_SUPPRESS,
+                IAST_STACKTRACE_LEAK_SUPPRESS_DEPRECATED);
+        iastHardcodedSecretEnabled =
+                configProvider.getBoolean(IAST_HARDCODED_SECRET_ENABLED, DEFAULT_IAST_HARDCODED_SECRET_ENABLED);
+        iastAnonymousClassesEnabled =
+                configProvider.getBoolean(IAST_ANONYMOUS_CLASSES_ENABLED, DEFAULT_IAST_ANONYMOUS_CLASSES_ENABLED);
+        iastSourceMappingEnabled = configProvider.getBoolean(IAST_SOURCE_MAPPING_ENABLED, false);
+        iastSourceMappingMaxSize = configProvider.getInteger(IAST_SOURCE_MAPPING_MAX_SIZE, 1000);
+        iastStackTraceEnabled = configProvider.getBoolean(
+                IAST_STACK_TRACE_ENABLED, DEFAULT_IAST_STACK_TRACE_ENABLED, IAST_STACKTRACE_ENABLED_DEPRECATED);
+        iastExperimentalPropagationEnabled = configProvider.getBoolean(IAST_EXPERIMENTAL_PROPAGATION_ENABLED, false);
+        iastSecurityControlsConfiguration = configProvider.getString(IAST_SECURITY_CONTROLS_CONFIGURATION, null);
+        iastDbRowsToTaint = configProvider.getInteger(IAST_DB_ROWS_TO_TAINT, DEFAULT_IAST_DB_ROWS_TO_TAINT);
+
+        llmObsAgentlessEnabled = configProvider.getBoolean(LLMOBS_AGENTLESS_ENABLED, DEFAULT_LLM_OBS_AGENTLESS_ENABLED);
+        final String tempLlmObsMlApp = configProvider.getString(LLMOBS_ML_APP);
+        llmObsMlApp = tempLlmObsMlApp == null || tempLlmObsMlApp.isEmpty() ? serviceName : tempLlmObsMlApp;
+        // Fall back to "sample everything" rather than clamping
+        final double configuredLlmObsSampleRate =
+                configProvider.getDouble(LLMOBS_SAMPLE_RATE, DEFAULT_LLM_OBS_SAMPLE_RATE);
+        if (configuredLlmObsSampleRate >= 0.0 && configuredLlmObsSampleRate <= 1.0) {
+            llmObsSampleRate = configuredLlmObsSampleRate;
+        } else {
+            log.warn(
+                    "Invalid value {} for {}: expected a rate between 0.0 and 1.0, falling back to 1.0.",
+                    configuredLlmObsSampleRate,
+                    LLMOBS_SAMPLE_RATE);
+            llmObsSampleRate = 1.0;
+        }
+
+        final String llmObsAgentlessUrlStr = getFinalLLMObsUrl();
+        URI parsedLLMObsUri = null;
+        if (llmObsAgentlessUrlStr != null && !llmObsAgentlessUrlStr.isEmpty()) {
+            try {
+                parsedLLMObsUri = new URL(llmObsAgentlessUrlStr).toURI();
+            } catch (MalformedURLException | URISyntaxException ex) {
+                log.error("Cannot parse LLM Observability agentless URL '{}', skipping", llmObsAgentlessUrlStr);
+            }
+        }
+        if (parsedLLMObsUri != null) {
+            llmObsAgentlessUrl = llmObsAgentlessUrlStr;
+        } else {
+            llmObsAgentlessUrl = null;
+        }
+
+        ciVisibilityTraceSanitationEnabled = configProvider.getBoolean(CIVISIBILITY_TRACE_SANITATION_ENABLED, true);
+
+        ciVisibilityAgentlessEnabled =
+                configProvider.getBoolean(CIVISIBILITY_AGENTLESS_ENABLED, DEFAULT_CIVISIBILITY_AGENTLESS_ENABLED);
+
+        ciVisibilitySourceDataEnabled =
+                configProvider.getBoolean(CIVISIBILITY_SOURCE_DATA_ENABLED, DEFAULT_CIVISIBILITY_SOURCE_DATA_ENABLED);
+
+        ciVisibilityBuildInstrumentationEnabled = configProvider.getBoolean(
+                CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED, DEFAULT_CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED);
+
+        final String ciVisibilityAgentlessUrlStr = configProvider.getString(CIVISIBILITY_AGENTLESS_URL);
+        ciVisibilityAgentlessUrl = isValidUrl(ciVisibilityAgentlessUrlStr) ? ciVisibilityAgentlessUrlStr : null;
+
+        final String ciVisibilityIntakeAgentlessUrlStr = configProvider.getString(CIVISIBILITY_INTAKE_AGENTLESS_URL);
+        ciVisibilityIntakeAgentlessUrl =
+                isValidUrl(ciVisibilityIntakeAgentlessUrlStr) ? ciVisibilityIntakeAgentlessUrlStr : null;
+
+        ciVisibilityAgentJarUri = configProvider.getString(CIVISIBILITY_AGENT_JAR_URI);
+        ciVisibilityAutoConfigurationEnabled = configProvider.getBoolean(
+                CIVISIBILITY_AUTO_CONFIGURATION_ENABLED, DEFAULT_CIVISIBILITY_AUTO_CONFIGURATION_ENABLED);
+        ciVisibilityAdditionalChildProcessJvmArgs =
+                configProvider.getString(CIVISIBILITY_ADDITIONAL_CHILD_PROCESS_JVM_ARGS);
+        ciVisibilityCompilerPluginAutoConfigurationEnabled = configProvider.getBoolean(
+                CIVISIBILITY_COMPILER_PLUGIN_AUTO_CONFIGURATION_ENABLED,
+                DEFAULT_CIVISIBILITY_COMPILER_PLUGIN_AUTO_CONFIGURATION_ENABLED);
+        ciVisibilityGradleDependencyVerificationEnabled = configProvider.getBoolean(
+                CIVISIBILITY_GRADLE_DEPENDENCY_VERIFICATION_ENABLED,
+                DEFAULT_CIVISIBILITY_GRADLE_DEPENDENCY_VERIFICATION_ENABLED);
+        ciVisibilityCodeCoverageEnabled = configProvider.getBoolean(CIVISIBILITY_CODE_COVERAGE_ENABLED, true);
+        ciVisibilityCoverageLinesEnabled = configProvider.getBoolean(CIVISIBILITY_CODE_COVERAGE_LINES_ENABLED);
+        ciVisibilityCodeCoverageReportDumpDir = configProvider.getString(CIVISIBILITY_CODE_COVERAGE_REPORT_DUMP_DIR);
+        codeCoverageFlags = parseCodeCoverageFlags(configProvider.getList(CODE_COVERAGE_FLAGS));
+        ciVisibilityCompilerPluginVersion = configProvider.getString(
+                CIVISIBILITY_COMPILER_PLUGIN_VERSION, DEFAULT_CIVISIBILITY_COMPILER_PLUGIN_VERSION);
+        ciVisibilityJacocoPluginVersion = configProvider.getString(
+                CIVISIBILITY_JACOCO_PLUGIN_VERSION, DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_VERSION);
+        ciVisibilityJacocoPluginVersionProvided = configProvider.getString(CIVISIBILITY_JACOCO_PLUGIN_VERSION) != null;
+        ciVisibilityCodeCoverageIncludes =
+                Arrays.asList(COLON.split(configProvider.getString(CIVISIBILITY_CODE_COVERAGE_INCLUDES, ":")));
+        ciVisibilityCodeCoverageExcludes = Arrays.asList(COLON.split(configProvider.getString(
+                CIVISIBILITY_CODE_COVERAGE_EXCLUDES, DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_EXCLUDES)));
+        ciVisibilityCodeCoverageIncludedPackages =
+                convertJacocoExclusionFormatToPackagePrefixes(ciVisibilityCodeCoverageIncludes);
+        ciVisibilityCodeCoverageExcludedPackages =
+                convertJacocoExclusionFormatToPackagePrefixes(ciVisibilityCodeCoverageExcludes);
+        ciVisibilityJacocoGradleSourceSets =
+                configProvider.getList(CIVISIBILITY_GRADLE_SOURCE_SETS, Arrays.asList("main", "test"));
+        ciVisibilityCodeCoverageReportUploadEnabled =
+                configProvider.getBoolean(CIVISIBILITY_CODE_COVERAGE_REPORT_UPLOAD_ENABLED, true);
+        ciVisibilityDebugPort = configProvider.getInteger(CIVISIBILITY_DEBUG_PORT);
+        ciVisibilityGitClientEnabled = configProvider.getBoolean(CIVISIBILITY_GIT_CLIENT_ENABLED, true);
+        ciVisibilityGitUploadEnabled =
+                configProvider.getBoolean(CIVISIBILITY_GIT_UPLOAD_ENABLED, DEFAULT_CIVISIBILITY_GIT_UPLOAD_ENABLED);
+        ciVisibilityGitUnshallowEnabled = configProvider.getBoolean(
+                CIVISIBILITY_GIT_UNSHALLOW_ENABLED, DEFAULT_CIVISIBILITY_GIT_UNSHALLOW_ENABLED);
+        ciVisibilityGitUnshallowDefer = configProvider.getBoolean(CIVISIBILITY_GIT_UNSHALLOW_DEFER, true);
+        ciVisibilityGitCommandTimeoutMillis = configProvider.getLong(
+                CIVISIBILITY_GIT_COMMAND_TIMEOUT_MILLIS, DEFAULT_CIVISIBILITY_GIT_COMMAND_TIMEOUT_MILLIS);
+        ciVisibilityBackendApiTimeoutMillis = configProvider.getLong(
+                CIVISIBILITY_BACKEND_API_TIMEOUT_MILLIS, DEFAULT_CIVISIBILITY_BACKEND_API_TIMEOUT_MILLIS);
+        ciVisibilityGitUploadTimeoutMillis = configProvider.getLong(
+                CIVISIBILITY_GIT_UPLOAD_TIMEOUT_MILLIS, DEFAULT_CIVISIBILITY_GIT_UPLOAD_TIMEOUT_MILLIS);
+        ciVisibilityGitRemoteName =
+                configProvider.getString(CIVISIBILITY_GIT_REMOTE_NAME, DEFAULT_CIVISIBILITY_GIT_REMOTE_NAME);
+        ciVisibilitySignalServerHost =
+                configProvider.getString(CIVISIBILITY_SIGNAL_SERVER_HOST, DEFAULT_CIVISIBILITY_SIGNAL_SERVER_HOST);
+        ciVisibilitySignalServerPort =
+                configProvider.getInteger(CIVISIBILITY_SIGNAL_SERVER_PORT, DEFAULT_CIVISIBILITY_SIGNAL_SERVER_PORT);
+        ciVisibilitySignalClientTimeoutMillis =
+                configProvider.getInteger(CIVISIBILITY_SIGNAL_CLIENT_TIMEOUT_MILLIS, 10_000);
+        ciVisibilityItrEnabled = configProvider.getBoolean(CIVISIBILITY_ITR_ENABLED, true);
+        ciVisibilityTestSkippingEnabled = configProvider.getBoolean(CIVISIBILITY_TEST_SKIPPING_ENABLED, true);
+        ciVisibilityCiProviderIntegrationEnabled =
+                configProvider.getBoolean(CIVISIBILITY_CIPROVIDER_INTEGRATION_ENABLED, true);
+        ciVisibilityRepoIndexDuplicateKeyCheckEnabled =
+                configProvider.getBoolean(CIVISIBILITY_REPO_INDEX_DUPLICATE_KEY_CHECK_ENABLED, true);
+        ciVisibilityRepoIndexFollowSymlinks = configProvider.getBoolean(CIVISIBILITY_REPO_INDEX_FOLLOW_SYMLINKS, false);
+        ciVisibilityExecutionSettingsCacheSize =
+                configProvider.getInteger(CIVISIBILITY_EXECUTION_SETTINGS_CACHE_SIZE, 16);
+        ciVisibilityJvmInfoCacheSize = configProvider.getInteger(CIVISIBILITY_JVM_INFO_CACHE_SIZE, 8);
+        ciVisibilityCoverageRootPackagesLimit =
+                configProvider.getInteger(CIVISIBILITY_CODE_COVERAGE_ROOT_PACKAGES_LIMIT, 50);
+        ciVisibilityInjectedTracerVersion = configProvider.getString(CIVISIBILITY_INJECTED_TRACER_VERSION);
+        ciVisibilityResourceFolderNames =
+                configProvider.getList(CIVISIBILITY_RESOURCE_FOLDER_NAMES, DEFAULT_CIVISIBILITY_RESOURCE_FOLDER_NAMES);
+        ciVisibilityFlakyRetryEnabled = configProvider.getBoolean(CIVISIBILITY_FLAKY_RETRY_ENABLED, true);
+        ciVisibilityImpactedTestsDetectionEnabled =
+                configProvider.getBoolean(CIVISIBILITY_IMPACTED_TESTS_DETECTION_ENABLED, true);
+        ciVisibilityKnownTestsRequestEnabled =
+                configProvider.getBoolean(CIVISIBILITY_KNOWN_TESTS_REQUEST_ENABLED, true);
+        ciVisibilityFlakyRetryOnlyKnownFlakes =
+                configProvider.getBoolean(CIVISIBILITY_FLAKY_RETRY_ONLY_KNOWN_FLAKES, false);
+        ciVisibilityEarlyFlakeDetectionEnabled =
+                configProvider.getBoolean(CIVISIBILITY_EARLY_FLAKE_DETECTION_ENABLED, true);
+        ciVisibilityEarlyFlakeDetectionLowerLimit =
+                configProvider.getInteger(CIVISIBILITY_EARLY_FLAKE_DETECTION_LOWER_LIMIT, 30);
+        ciVisibilityFlakyRetryCount = configProvider.getInteger(CIVISIBILITY_FLAKY_RETRY_COUNT, 5);
+        ciVisibilityTotalFlakyRetryCount = configProvider.getInteger(CIVISIBILITY_TOTAL_FLAKY_RETRY_COUNT, 1000);
+        ciVisibilityDynamicAtrEnabled = configProvider.getBoolean(CIVISIBILITY_DYNAMIC_ATR_ENABLED, false);
+        ciVisibilityDynamicAtrBuckets = ciVisibilityDynamicAtrEnabled
+                ? parseDynamicAtrBuckets(configProvider.getString(CIVISIBILITY_DYNAMIC_ATR_BUCKETS))
+                : null;
+        ciVisibilitySessionName = configProvider.getString(TEST_SESSION_NAME);
+        ciVisibilityModuleName = configProvider.getString(CIVISIBILITY_MODULE_NAME);
+        ciVisibilityTestCommand = configProvider.getString(CIVISIBILITY_TEST_COMMAND);
+        ciVisibilityTelemetryEnabled = configProvider.getBoolean(CIVISIBILITY_TELEMETRY_ENABLED, true);
+        ciVisibilityRumFlushWaitMillis = configProvider.getLong(CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS, 500);
+        ciVisibilityAutoInjected =
+                Strings.isNotBlank(configProvider.getString(CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER));
+        ciVisibilityTestOrder = configProvider.getString(CIVISIBILITY_TEST_ORDER);
+        ciVisibilityTestManagementEnabled = configProvider.getBoolean(TEST_MANAGEMENT_ENABLED, true);
+        ciVisibilityTestManagementAttemptToFixRetries =
+                configProvider.getInteger(TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES);
+        ciVisibilityScalatestForkMonitorEnabled =
+                configProvider.getBoolean(CIVISIBILITY_SCALATEST_FORK_MONITOR_ENABLED, false);
+        gitPullRequestBaseBranch = configProvider.getString(GIT_PULL_REQUEST_BASE_BRANCH);
+        gitPullRequestBaseBranchSha = configProvider.getString(GIT_PULL_REQUEST_BASE_BRANCH_SHA);
+        gitCommitHeadSha = configProvider.getString(GIT_COMMIT_HEAD_SHA);
+        ciVisibilityFailedTestReplayEnabled = configProvider.getBoolean(TEST_FAILED_TEST_REPLAY_ENABLED, true);
+
+        testOptimizationManifestFile = configProvider.getString(TEST_OPTIMIZATION_MANIFEST_FILE);
+        testOptimizationPayloadsInFiles = configProvider.getBoolean(TEST_OPTIMIZATION_PAYLOADS_IN_FILES, false);
+
+        remoteConfigEnabled = configProvider.getBoolean(
+                REMOTE_CONFIGURATION_ENABLED, DEFAULT_REMOTE_CONFIG_ENABLED, REMOTE_CONFIG_ENABLED);
+        remoteConfigIntegrityCheckEnabled = configProvider.getBoolean(
+                REMOTE_CONFIG_INTEGRITY_CHECK_ENABLED, DEFAULT_REMOTE_CONFIG_INTEGRITY_CHECK_ENABLED);
+        remoteConfigUrl = configProvider.getString(REMOTE_CONFIG_URL);
+        remoteConfigPollIntervalSeconds = configProvider.getFloat(
+                REMOTE_CONFIG_POLL_INTERVAL_SECONDS, DEFAULT_REMOTE_CONFIG_POLL_INTERVAL_SECONDS);
+        remoteConfigMaxPayloadSize =
+                configProvider.getInteger(REMOTE_CONFIG_MAX_PAYLOAD_SIZE, DEFAULT_REMOTE_CONFIG_MAX_PAYLOAD_SIZE)
+                        * 1024L;
+        remoteConfigTargetsKeyId =
+                configProvider.getString(REMOTE_CONFIG_TARGETS_KEY_ID, DEFAULT_REMOTE_CONFIG_TARGETS_KEY_ID);
+        remoteConfigTargetsKey = configProvider.getString(REMOTE_CONFIG_TARGETS_KEY, DEFAULT_REMOTE_CONFIG_TARGETS_KEY);
+
+        remoteConfigMaxExtraServices =
+                configProvider.getInteger(REMOTE_CONFIG_MAX_EXTRA_SERVICES, DEFAULT_REMOTE_CONFIG_MAX_EXTRA_SERVICES);
+
+        final Boolean configuredFeatureFlaggingProviderEnabled = configProvider.getBoolean(FEATURE_FLAGS_ENABLED);
+        final Boolean legacyFeatureFlaggingProviderEnabled =
+                configProvider.getBoolean(EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED);
+        final String configuredFeatureFlaggingConfigurationSource =
+                configProvider.isSet(FEATURE_FLAGS_CONFIGURATION_SOURCE)
+                        ? configProvider.getString(FEATURE_FLAGS_CONFIGURATION_SOURCE)
+                        : null;
+        final FeatureFlaggingConfig.Resolution resolvedFeatureFlaggingConfiguration = resolveConfiguration(
+                configuredFeatureFlaggingProviderEnabled,
+                configuredFeatureFlaggingConfigurationSource,
+                legacyFeatureFlaggingProviderEnabled);
+        if (legacyFeatureFlaggingProviderEnabled != null) {
+            log.warn(
+                    "Setting {} is deprecated. Use {} and {} instead.",
+                    EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED,
+                    FEATURE_FLAGS_ENABLED,
+                    FEATURE_FLAGS_CONFIGURATION_SOURCE);
+        }
+        if (!isSupportedConfigurationSource(configuredFeatureFlaggingConfigurationSource)) {
+            log.warn(
+                    "Unsupported Feature Flagging configuration source; provider disabled: '{}'",
+                    resolvedFeatureFlaggingConfiguration.getSource());
+        }
+        featureFlaggingProviderEnabled = resolvedFeatureFlaggingConfiguration.isEnabled();
+        featureFlaggingConfigurationSource = resolvedFeatureFlaggingConfiguration.getSource();
+        featureFlaggingConfigurationSourceAgentlessBaseUrl =
+                configProvider.getStringNotEmpty(FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL, null);
+        int configuredFeatureFlaggingPollIntervalSeconds = configProvider.getInteger(
+                FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS,
+                DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_POLL_INTERVAL_SECONDS);
+        if (configuredFeatureFlaggingPollIntervalSeconds <= 0) {
+            log.warn(
+                    "Invalid Feature Flagging agentless poll interval: {}. The value must be positive",
+                    configuredFeatureFlaggingPollIntervalSeconds);
+            configuredFeatureFlaggingPollIntervalSeconds =
+                    DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_POLL_INTERVAL_SECONDS;
+        }
+        featureFlaggingConfigurationSourcePollIntervalSeconds = configuredFeatureFlaggingPollIntervalSeconds;
+        int configuredFeatureFlaggingRequestTimeoutSeconds = configProvider.getInteger(
+                FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS,
+                DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_REQUEST_TIMEOUT_SECONDS);
+        if (configuredFeatureFlaggingRequestTimeoutSeconds <= 0) {
+            log.warn(
+                    "Invalid Feature Flagging agentless request timeout: {}. The value must be positive",
+                    configuredFeatureFlaggingRequestTimeoutSeconds);
+            configuredFeatureFlaggingRequestTimeoutSeconds =
+                    DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_REQUEST_TIMEOUT_SECONDS;
+        }
+        featureFlaggingConfigurationSourceRequestTimeoutSeconds = configuredFeatureFlaggingRequestTimeoutSeconds;
+
+        dynamicInstrumentationEnabled =
+                configProvider.getBoolean(DYNAMIC_INSTRUMENTATION_ENABLED, DEFAULT_DYNAMIC_INSTRUMENTATION_ENABLED);
+        dynamicInstrumentationSnapshotUrl = configProvider.getString(DYNAMIC_INSTRUMENTATION_SNAPSHOT_URL);
+        distributedDebuggerEnabled =
+                configProvider.getBoolean(DISTRIBUTED_DEBUGGER_ENABLED, DEFAULT_DISTRIBUTED_DEBUGGER_ENABLED);
+        dynamicInstrumentationUploadTimeout = configProvider.getInteger(
+                DYNAMIC_INSTRUMENTATION_UPLOAD_TIMEOUT, DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_TIMEOUT);
+        if (configProvider.isSet(DYNAMIC_INSTRUMENTATION_UPLOAD_INTERVAL_SECONDS)) {
+            dynamicInstrumentationUploadFlushInterval = (int) (configProvider.getFloat(
+                            DYNAMIC_INSTRUMENTATION_UPLOAD_INTERVAL_SECONDS,
+                            DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL)
+                    * 1000);
+        } else {
+            dynamicInstrumentationUploadFlushInterval = configProvider.getInteger(
+                    DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL,
+                    DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL);
+        }
+        dynamicInstrumentationClassFileDumpEnabled = configProvider.getBoolean(
+                DYNAMIC_INSTRUMENTATION_CLASSFILE_DUMP_ENABLED, DEFAULT_DYNAMIC_INSTRUMENTATION_CLASSFILE_DUMP_ENABLED);
+        dynamicInstrumentationPollInterval = configProvider.getInteger(
+                DYNAMIC_INSTRUMENTATION_POLL_INTERVAL, DEFAULT_DYNAMIC_INSTRUMENTATION_POLL_INTERVAL);
+        dynamicInstrumentationDiagnosticsInterval = configProvider.getInteger(
+                DYNAMIC_INSTRUMENTATION_DIAGNOSTICS_INTERVAL, DEFAULT_DYNAMIC_INSTRUMENTATION_DIAGNOSTICS_INTERVAL);
+        dynamicInstrumentationMetricEnabled = runtimeMetricsEnabled
+                && configProvider.getBoolean(
+                        DYNAMIC_INSTRUMENTATION_METRICS_ENABLED, DEFAULT_DYNAMIC_INSTRUMENTATION_METRICS_ENABLED);
+        dynamicInstrumentationProbeFile = configProvider.getString(DYNAMIC_INSTRUMENTATION_PROBE_FILE);
+        dynamicInstrumentationUploadBatchSize = configProvider.getInteger(
+                DYNAMIC_INSTRUMENTATION_UPLOAD_BATCH_SIZE, DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_BATCH_SIZE);
+        dynamicInstrumentationMaxPayloadSize = configProvider.getInteger(
+                        DYNAMIC_INSTRUMENTATION_MAX_PAYLOAD_SIZE, DEFAULT_DYNAMIC_INSTRUMENTATION_MAX_PAYLOAD_SIZE)
+                * 1024L;
+        dynamicInstrumentationVerifyByteCode = configProvider.getBoolean(
+                DYNAMIC_INSTRUMENTATION_VERIFY_BYTECODE, DEFAULT_DYNAMIC_INSTRUMENTATION_VERIFY_BYTECODE);
+        dynamicInstrumentationInstrumentTheWorld =
+                configProvider.getString(DYNAMIC_INSTRUMENTATION_INSTRUMENT_THE_WORLD);
+        dynamicInstrumentationExcludeFiles = configProvider.getString(DYNAMIC_INSTRUMENTATION_EXCLUDE_FILES);
+        dynamicInstrumentationIncludeFiles = configProvider.getString(DYNAMIC_INSTRUMENTATION_INCLUDE_FILES);
+        dynamicInstrumentationTimeoutCheckerMode = configProvider.getString(
+                DYNAMIC_INSTRUMENTATION_TIMEOUT_CHECKER_MODE, DEFAULT_DYNAMIC_INSTRUMENTATION_TIMEOUT_CHECKER_MODE);
+        dynamicInstrumentationCaptureTimeout = configProvider.getInteger(
+                DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT,
+                DEFAULT_DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT,
+                DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT_MS);
+        dynamicInstrumentationEvaluationTimeout = configProvider.getInteger(
+                DYNAMIC_INSTRUMENTATION_EVAL_TIMEOUT_MS, DEFAULT_DYNAMIC_INSTRUMENTATION_EVAL_TIMEOUT);
+        dynamicInstrumentationRedactedIdentifiers =
+                configProvider.getString(DYNAMIC_INSTRUMENTATION_REDACTED_IDENTIFIERS, null);
+        dynamicInstrumentationRedactionExcludedIdentifiers =
+                tryMakeImmutableSet(configProvider.getList(DYNAMIC_INSTRUMENTATION_REDACTION_EXCLUDED_IDENTIFIERS));
+        dynamicInstrumentationRedactedTypes = configProvider.getString(DYNAMIC_INSTRUMENTATION_REDACTED_TYPES, null);
+        dynamicInstrumentationLocalVarHoistingLevel = configProvider.getInteger(
+                DYNAMIC_INSTRUMENTATION_LOCALVAR_HOISTING_LEVEL,
+                DEFAULT_DYNAMIC_INSTRUMENTATION_LOCALVAR_HOISTING_LEVEL);
+        symbolDatabaseEnabled = configProvider.getBoolean(SYMBOL_DATABASE_ENABLED, DEFAULT_SYMBOL_DATABASE_ENABLED);
+        symbolDatabaseForceUpload =
+                configProvider.getBoolean(SYMBOL_DATABASE_FORCE_UPLOAD, DEFAULT_SYMBOL_DATABASE_FORCE_UPLOAD);
+        symbolDatabaseFlushThreshold =
+                configProvider.getInteger(SYMBOL_DATABASE_FLUSH_THRESHOLD, DEFAULT_SYMBOL_DATABASE_FLUSH_THRESHOLD);
+        symbolDatabaseCompressed =
+                configProvider.getBoolean(SYMBOL_DATABASE_COMPRESSED, DEFAULT_SYMBOL_DATABASE_COMPRESSED);
+        debuggerExceptionEnabled = configProvider.getBoolean(
+                DEBUGGER_EXCEPTION_ENABLED, DEFAULT_DEBUGGER_EXCEPTION_ENABLED, EXCEPTION_REPLAY_ENABLED);
+        debuggerCodeOriginEnabled = configProvider.getBoolean(
+                CODE_ORIGIN_FOR_SPANS_ENABLED, InstrumenterConfig.getDefaultCodeOriginForSpanEnabled());
+        debuggerCodeOriginMaxUserFrames =
+                configProvider.getInteger(CODE_ORIGIN_MAX_USER_FRAMES, DEFAULT_CODE_ORIGIN_MAX_USER_FRAMES);
+        debuggerMaxExceptionPerSecond =
+                configProvider.getInteger(DEBUGGER_MAX_EXCEPTION_PER_SECOND, DEFAULT_DEBUGGER_MAX_EXCEPTION_PER_SECOND);
+        debuggerExceptionOnlyLocalRoot = configProvider.getBoolean(
+                DEBUGGER_EXCEPTION_ONLY_LOCAL_ROOT, DEFAULT_DEBUGGER_EXCEPTION_ONLY_LOCAL_ROOT);
+        debuggerExceptionCaptureIntermediateSpansEnabled = configProvider.getBoolean(
+                DEBUGGER_EXCEPTION_CAPTURE_INTERMEDIATE_SPANS_ENABLED,
+                DEFAULT_DEBUGGER_EXCEPTION_CAPTURE_INTERMEDIATE_SPANS_ENABLED);
+        debuggerExceptionMaxCapturedFrames = configProvider.getInteger(
+                DEBUGGER_EXCEPTION_MAX_CAPTURED_FRAMES,
+                DEFAULT_DEBUGGER_EXCEPTION_MAX_CAPTURED_FRAMES,
+                DEBUGGER_EXCEPTION_CAPTURE_MAX_FRAMES);
+        debuggerExceptionCaptureInterval = configProvider.getInteger(
+                DEBUGGER_EXCEPTION_CAPTURE_INTERVAL_SECONDS, DEFAULT_DEBUGGER_EXCEPTION_CAPTURE_INTERVAL_SECONDS);
+        debuggerSourceFileTrackingEnabled = configProvider.getBoolean(
+                DEBUGGER_SOURCE_FILE_TRACKING_ENABLED, DEFAULT_DEBUGGER_SOURCE_FILE_TRACKING_ENABLED);
+        debuggerSynchronousSourceFileTrackingEnabled =
+                configProvider.getBoolean(DEBUGGER_SYNCHRONOUS_SOURCE_FILE_TRACKING_ENABLED, false);
+
+        debuggerThirdPartyIncludes = tryMakeImmutableSet(
+                configProvider.getList(THIRD_PARTY_INCLUDES, Collections.emptyList(), THIRD_PARTY_DETECTION_INCLUDES));
+        debuggerThirdPartyExcludes = tryMakeImmutableSet(
+                configProvider.getList(THIRD_PARTY_EXCLUDES, Collections.emptyList(), THIRD_PARTY_DETECTION_EXCLUDES));
+        debuggerShadingIdentifiers = tryMakeImmutableSet(configProvider.getList(THIRD_PARTY_SHADING_IDENTIFIERS));
+
+        awsPropagationEnabled = isPropagationEnabled(true, "aws", "aws-sdk");
+        sqsPropagationEnabled = isPropagationEnabled(true, "sqs");
+        sqsBodyPropagationEnabled = configProvider.getBoolean(SQS_BODY_PROPAGATION_ENABLED, false);
+
+        kafkaClientPropagationEnabled = isPropagationEnabled(true, "kafka", "kafka.client");
+        kafkaClientPropagationDisabledTopics =
+                tryMakeImmutableSet(configProvider.getList(KAFKA_CLIENT_PROPAGATION_DISABLED_TOPICS));
+        kafkaClientBase64DecodingEnabled = configProvider.getBoolean(KAFKA_CLIENT_BASE64_DECODING_ENABLED, false);
+        jmsPropagationEnabled = isPropagationEnabled(true, "jms");
+        jmsPropagationDisabledTopics = tryMakeImmutableSet(configProvider.getList(JMS_PROPAGATION_DISABLED_TOPICS));
+        jmsPropagationDisabledQueues = tryMakeImmutableSet(configProvider.getList(JMS_PROPAGATION_DISABLED_QUEUES));
+        jmsUnacknowledgedMaxAge = configProvider.getInteger(JMS_UNACKNOWLEDGED_MAX_AGE, 3600);
+
+        rabbitPropagationEnabled = isPropagationEnabled(true, "rabbit", "rabbitmq");
+        rabbitPropagationDisabledQueues =
+                tryMakeImmutableSet(configProvider.getList(RABBIT_PROPAGATION_DISABLED_QUEUES));
+        rabbitPropagationDisabledExchanges =
+                tryMakeImmutableSet(configProvider.getList(RABBIT_PROPAGATION_DISABLED_EXCHANGES));
+        rabbitIncludeRoutingKeyInResource = configProvider.getBoolean(RABBIT_INCLUDE_ROUTINGKEY_IN_RESOURCE, true);
+
+        messageBrokerSplitByDestination = configProvider.getBoolean(MESSAGE_BROKER_SPLIT_BY_DESTINATION, false);
+
+        grpcIgnoredInboundMethods = tryMakeImmutableSet(configProvider.getList(GRPC_IGNORED_INBOUND_METHODS));
+        final List<String> tmpGrpcIgnoredOutboundMethods = new ArrayList<>();
+        tmpGrpcIgnoredOutboundMethods.addAll(configProvider.getList(GRPC_IGNORED_OUTBOUND_METHODS));
+        // When tracing shadowing will be possible we can instrument the stubs to silent tracing
+        // starting from interception points
+        if (InstrumenterConfig.get().isIntegrationEnabled(Collections.singleton("google-pubsub"), true)) {
+            tmpGrpcIgnoredOutboundMethods.addAll(configProvider.getList(
+                    GOOGLE_PUBSUB_IGNORED_GRPC_METHODS,
+                    Arrays.asList(
+                            "google.pubsub.v1.Subscriber/ModifyAckDeadline",
+                            "google.pubsub.v1.Subscriber/Acknowledge",
+                            "google.pubsub.v1.Subscriber/Pull",
+                            "google.pubsub.v1.Subscriber/StreamingPull",
+                            "google.pubsub.v1.Publisher/Publish")));
+        }
+        grpcIgnoredOutboundMethods = tryMakeImmutableSet(tmpGrpcIgnoredOutboundMethods);
+        grpcServerTrimPackageResource = configProvider.getBoolean(GRPC_SERVER_TRIM_PACKAGE_RESOURCE, false);
+        grpcServerErrorStatuses =
+                configProvider.getIntegerRange(GRPC_SERVER_ERROR_STATUSES, DEFAULT_GRPC_SERVER_ERROR_STATUSES);
+        grpcClientErrorStatuses =
+                configProvider.getIntegerRange(GRPC_CLIENT_ERROR_STATUSES, DEFAULT_GRPC_CLIENT_ERROR_STATUSES);
+
+        hystrixTagsEnabled = configProvider.getBoolean(HYSTRIX_TAGS_ENABLED, false);
+        hystrixMeasuredEnabled = configProvider.getBoolean(HYSTRIX_MEASURED_ENABLED, false);
+
+        springSchedulingMeasuredEnabled = configProvider.getBoolean(SPRING_SCHEDULING_MEASURED_ENABLED, false);
+
+        resilience4jMeasuredEnabled = configProvider.getBoolean(RESILIENCE4J_MEASURED_ENABLED, false);
+        resilience4jTagMetricsEnabled = configProvider.getBoolean(RESILIENCE4J_TAG_METRICS_ENABLED, false);
+
+        igniteCacheIncludeKeys = configProvider.getBoolean(IGNITE_CACHE_INCLUDE_KEYS, false);
+
+        obfuscationQueryRegexp =
+                configProvider.getString(OBFUSCATION_QUERY_STRING_REGEXP, null, "obfuscation.query.string.regexp");
+
+        playReportHttpStatus = configProvider.getBoolean(PLAY_REPORT_HTTP_STATUS, false);
+
+        servletPrincipalEnabled = configProvider.getBoolean(SERVLET_PRINCIPAL_ENABLED, false);
+
+        xDatadogTagsMaxLength =
+                configProvider.getInteger(TRACE_X_DATADOG_TAGS_MAX_LENGTH, DEFAULT_TRACE_X_DATADOG_TAGS_MAX_LENGTH);
+
+        servletAsyncTimeoutError = configProvider.getBoolean(SERVLET_ASYNC_TIMEOUT_ERROR, true);
+
+        logLevel = configProvider.getString(TRACE_LOG_LEVEL, null, LOG_LEVEL);
+        debugEnabled = configProvider.getBoolean(TRACE_DEBUG, false);
+        triageEnabled = configProvider.getBoolean(TRACE_TRIAGE, instrumenterConfig.isTriageEnabled());
+        triageReportTrigger = configProvider.getString(TRIAGE_REPORT_TRIGGER);
+        if (null != triageReportTrigger) {
+            triageReportDir = configProvider.getString(TRIAGE_REPORT_DIR, getProp("java.io.tmpdir"));
+        } else {
+            triageReportDir = null;
+        }
+
+        startupLogsEnabled = configProvider.getBoolean(STARTUP_LOGS_ENABLED, DEFAULT_STARTUP_LOGS_ENABLED);
+
+        cwsEnabled = configProvider.getBoolean(CWS_ENABLED, DEFAULT_CWS_ENABLED);
+        cwsTlsRefresh = configProvider.getInteger(CWS_TLS_REFRESH, DEFAULT_CWS_TLS_REFRESH);
+
+        dataJobsOpenLineageEnabled =
+                configProvider.getBoolean(DATA_JOBS_OPENLINEAGE_ENABLED, DEFAULT_DATA_JOBS_OPENLINEAGE_ENABLED);
+        dataJobsOpenLineageTimeoutEnabled = configProvider.getBoolean(
+                DATA_JOBS_OPENLINEAGE_TIMEOUT_ENABLED, DEFAULT_DATA_JOBS_OPENLINEAGE_TIMEOUT_ENABLED);
+        dataJobsParseSparkPlanEnabled = configProvider.getBoolean(
+                DATA_JOBS_PARSE_SPARK_PLAN_ENABLED, DEFAULT_DATA_JOBS_PARSE_SPARK_PLAN_ENABLED);
+        dataJobsExperimentalFeaturesEnabled = configProvider.getBoolean(
+                DATA_JOBS_EXPERIMENTAL_FEATURES_ENABLED, DEFAULT_DATA_JOBS_EXPERIMENTAL_FEATURES_ENABLED);
+
+        dataStreamsEnabled = configProvider.getBoolean(DATA_STREAMS_ENABLED, DEFAULT_DATA_STREAMS_ENABLED);
+        dataStreamsBucketDurationSeconds =
+                configProvider.getFloat(DATA_STREAMS_BUCKET_DURATION_SECONDS, DEFAULT_DATA_STREAMS_BUCKET_DURATION);
+        dataStreamsTransactionExtractors = configProvider.getString(DATA_STREAMS_TRANSACTION_EXTRACTORS);
+
+        azureAppServices = configProvider.getBoolean(AZURE_APP_SERVICES, false);
+        traceAgentPath = configProvider.getString(TRACE_AGENT_PATH);
+        testAgentSessionToken = configProvider.getString(TEST_AGENT_SESSION_TOKEN);
+        String traceAgentArgsString = configProvider.getString(TRACE_AGENT_ARGS);
+        if (traceAgentArgsString == null) {
+            traceAgentArgs = Collections.emptyList();
+        } else {
+            traceAgentArgs = Collections.unmodifiableList(
+                    new ArrayList<>(parseStringIntoSetOfNonEmptyStrings(traceAgentArgsString)));
+        }
+
+        dogStatsDPath = configProvider.getString(DOGSTATSD_PATH);
+        String dogStatsDArgsString = configProvider.getString(DOGSTATSD_ARGS);
+        if (dogStatsDArgsString == null) {
+            dogStatsDArgs = Collections.emptyList();
+        } else {
+            dogStatsDArgs = Collections.unmodifiableList(
+                    new ArrayList<>(parseStringIntoSetOfNonEmptyStrings(dogStatsDArgsString)));
+        }
+
+        // Setting this last because we have a few places where this can come from
+        apiKey = tmpApiKey;
+
+        boolean longRunningEnabled =
+                configProvider.getBoolean(TRACE_LONG_RUNNING_ENABLED, DEFAULT_TRACE_LONG_RUNNING_ENABLED);
+        long longRunningTraceInitialFlushInterval = configProvider.getLong(
+                TRACE_LONG_RUNNING_INITIAL_FLUSH_INTERVAL, DEFAULT_TRACE_LONG_RUNNING_INITIAL_FLUSH_INTERVAL);
+        long longRunningTraceFlushInterval =
+                configProvider.getLong(TRACE_LONG_RUNNING_FLUSH_INTERVAL, DEFAULT_TRACE_LONG_RUNNING_FLUSH_INTERVAL);
+        serviceDiscoveryEnabled =
+                configProvider.getBoolean(TRACE_SERVICE_DISCOVERY_ENABLED, DEFAULT_SERVICE_DISCOVERY_ENABLED);
+
+        if (longRunningEnabled
+                && (longRunningTraceInitialFlushInterval < 10 || longRunningTraceInitialFlushInterval > 450)) {
+            log.warn(
+                    "Provided long running trace initial flush interval of {} seconds. It should be between 10 seconds and 7.5 minutes."
+                            + "Setting the flush interval to the default value of {} seconds .",
+                    longRunningTraceInitialFlushInterval,
+                    DEFAULT_TRACE_LONG_RUNNING_INITIAL_FLUSH_INTERVAL);
+            longRunningTraceInitialFlushInterval = DEFAULT_TRACE_LONG_RUNNING_INITIAL_FLUSH_INTERVAL;
+        }
+        if (longRunningEnabled && (longRunningTraceFlushInterval < 20 || longRunningTraceFlushInterval > 450)) {
+            log.warn(
+                    "Provided long running trace flush interval of {} seconds. It should be between 20 seconds and 7.5 minutes."
+                            + "Setting the flush interval to the default value of {} seconds .",
+                    longRunningTraceFlushInterval,
+                    DEFAULT_TRACE_LONG_RUNNING_FLUSH_INTERVAL);
+            longRunningTraceFlushInterval = DEFAULT_TRACE_LONG_RUNNING_FLUSH_INTERVAL;
+        }
+        this.longRunningTraceEnabled = longRunningEnabled;
+        this.longRunningTraceInitialFlushInterval = longRunningTraceInitialFlushInterval;
+        this.longRunningTraceFlushInterval = longRunningTraceFlushInterval;
+
+        this.sparkTaskHistogramEnabled =
+                configProvider.getBoolean(SPARK_TASK_HISTOGRAM_ENABLED, DEFAULT_SPARK_TASK_HISTOGRAM_ENABLED);
+
+        this.sparkAppNameAsService =
+                configProvider.getBoolean(SPARK_APP_NAME_AS_SERVICE, DEFAULT_SPARK_APP_NAME_AS_SERVICE);
+
+        this.jaxRsExceptionAsErrorsEnabled =
+                configProvider.getBoolean(JAX_RS_EXCEPTION_AS_ERROR_ENABLED, DEFAULT_JAX_RS_EXCEPTION_AS_ERROR_ENABLED);
+
+        axisPromoteResourceName = configProvider.getBoolean(AXIS_PROMOTE_RESOURCE_NAME, false);
+
+        websocketMessagesInheritSampling = configProvider.getBoolean(
+                TRACE_WEBSOCKET_MESSAGES_INHERIT_SAMPLING, DEFAULT_WEBSOCKET_MESSAGES_INHERIT_SAMPLING);
+        websocketMessagesSeparateTraces = configProvider.getBoolean(
+                TRACE_WEBSOCKET_MESSAGES_SEPARATE_TRACES, DEFAULT_WEBSOCKET_MESSAGES_SEPARATE_TRACES);
+        websocketTagSessionId =
+                configProvider.getBoolean(TRACE_WEBSOCKET_TAG_SESSION_ID, DEFAULT_WEBSOCKET_TAG_SESSION_ID);
+
+        this.traceFlushIntervalSeconds =
+                configProvider.getFloat(TracerConfig.TRACE_FLUSH_INTERVAL, ConfigDefaults.DEFAULT_TRACE_FLUSH_INTERVAL);
+
+        this.tracePostProcessingTimeout =
+                configProvider.getLong(TRACE_POST_PROCESSING_TIMEOUT, DEFAULT_TRACE_POST_PROCESSING_TIMEOUT);
+
+        if (isLlmObsEnabled()) {
+            log.debug(
+                    "LLM Observability enabled for ML app {}, agentless mode {}", llmObsMlApp, llmObsAgentlessEnabled);
+        }
+
+        // if API key is not provided, check if any products are using agentless mode and require it
+        if (apiKey == null || apiKey.isEmpty()) {
+            // CI Visibility (skip validation in manifest/payloads-in-files mode - no network needed)
+            if (isCiVisibilityEnabled()
+                    && ciVisibilityAgentlessEnabled
+                    && testOptimizationManifestFile == null
+                    && !testOptimizationPayloadsInFiles) {
+                throw new FatalAgentMisconfigurationError(
+                        "Attempt to start in CI Visibility in Agentless mode without API key. "
+                                + "Please ensure that either an API key is configured, or the tracer is set up to work with the Agent");
+            }
+
+            // Profiling
+            if (profilingAgentless) {
+                log.warn("Agentless profiling activated but no api key provided. Profile uploading will likely fail");
+            }
+
+            // LLM Observability
+            if (isLlmObsEnabled() && llmObsAgentlessEnabled) {
+                throw new FatalAgentMisconfigurationError(
+                        "Attempt to start LLM Observability in Agentless mode without API key. "
+                                + "Please ensure that either an API key is configured, or the tracer is set up to work with the Agent");
+            }
+        }
+
+        this.telemetryDebugRequestsEnabled =
+                configProvider.getBoolean(TELEMETRY_DEBUG_REQUESTS_ENABLED, DEFAULT_TELEMETRY_DEBUG_REQUESTS_ENABLED);
+
+        this.agentlessLogSubmissionQueueSize = configProvider.getInteger(AGENTLESS_LOG_SUBMISSION_QUEUE_SIZE, 1024);
+        this.agentlessLogSubmissionLevel = configProvider.getString(AGENTLESS_LOG_SUBMISSION_LEVEL, "INFO");
+        this.agentlessLogSubmissionUrl = configProvider.getString(AGENTLESS_LOG_SUBMISSION_URL);
+        this.agentlessLogSubmissionProduct = isCiVisibilityEnabled() ? "citest" : "apm";
+
+        this.cloudPayloadTaggingServices = configProvider.getSet(
+                TRACE_CLOUD_PAYLOAD_TAGGING_SERVICES, DEFAULT_TRACE_CLOUD_PAYLOAD_TAGGING_SERVICES);
+
+        List<String> cloudReqPayloadTaggingConf = configProvider.getList(TRACE_CLOUD_REQUEST_PAYLOAD_TAGGING, null);
+        if (null == cloudReqPayloadTaggingConf) {
+            // if no configuration is provided, disable payload tagging
+            this.cloudRequestPayloadTagging = null;
+        } else if (cloudReqPayloadTaggingConf.size() == 1
+                && cloudReqPayloadTaggingConf.get(0).equalsIgnoreCase("all")) {
+            // if "all" is specified enable all JSON paths
+            this.cloudRequestPayloadTagging = Collections.emptyList();
+        } else {
+            // parse and validate JSON paths. if none are valid, disable payload tagging
+            List<JsonPath> validRequestJsonPaths = parseJsonPaths(cloudReqPayloadTaggingConf);
+            this.cloudRequestPayloadTagging = validRequestJsonPaths.isEmpty() ? null : validRequestJsonPaths;
+        }
+
+        List<String> cloudRespPayloadTaggingConf = configProvider.getList(TRACE_CLOUD_RESPONSE_PAYLOAD_TAGGING, null);
+        if (null == cloudRespPayloadTaggingConf) {
+            // if no configuration is provided, disable payload tagging
+            this.cloudResponsePayloadTagging = null;
+        } else if (cloudRespPayloadTaggingConf.size() == 1
+                && cloudRespPayloadTaggingConf.get(0).equalsIgnoreCase("all")) {
+            // if "all" is specified enable all JSON paths
+            this.cloudResponsePayloadTagging = Collections.emptyList();
+        } else {
+            // parse and validate JSON paths. if none are valid, disable payload tagging
+            List<JsonPath> validResponseJsonPaths = parseJsonPaths(cloudRespPayloadTaggingConf);
+            this.cloudResponsePayloadTagging = validResponseJsonPaths.isEmpty() ? null : validResponseJsonPaths;
+        }
+
+        this.cloudPayloadTaggingMaxDepth = configProvider.getInteger(TRACE_CLOUD_PAYLOAD_TAGGING_MAX_DEPTH, 10);
+        this.cloudPayloadTaggingMaxTags = configProvider.getInteger(TRACE_CLOUD_PAYLOAD_TAGGING_MAX_TAGS, 758);
+
+        this.dependecyResolutionPeriodMillis = configProvider.getLong(
+                GeneralConfig.TELEMETRY_DEPENDENCY_RESOLUTION_PERIOD_MILLIS, 1000); // 1 second by default
+
+        timelineEventsEnabled =
+                configProvider.getBoolean(PROFILING_TIMELINE_EVENTS_ENABLED, PROFILING_TIMELINE_EVENTS_ENABLED_DEFAULT);
+
+        if (appSecScaEnabled != null
+                && appSecScaEnabled
+                && (!isTelemetryEnabled() || !isTelemetryDependencyServiceEnabled())) {
+            log.warn(SEND_TELEMETRY, "AppSec SCA is enabled but telemetry is disabled. AppSec SCA will not work.");
+        }
+
+        // Used to report telemetry on SSI injection
+        this.ssiInjectionEnabled = configProvider.getString(SSI_INJECTION_ENABLED);
+        this.ssiInjectionForce = configProvider.getBoolean(SSI_INJECTION_FORCE, DEFAULT_SSI_INJECTION_FORCE);
+        this.instrumentationSource = configProvider.getString(INSTRUMENTATION_SOURCE, DEFAULT_INSTRUMENTATION_SOURCE);
+
+        this.apmTracingEnabled = configProvider.getBoolean(GeneralConfig.APM_TRACING_ENABLED, true);
+
+        this.jdkSocketEnabled = configProvider.getBoolean(JDK_SOCKET_ENABLED, true);
+
+        this.spanBuilderReuseEnabled = configProvider.getBoolean(GeneralConfig.SPAN_BUILDER_REUSE_ENABLED, true);
+        this.tagNameUtf8CacheSize = Math.max(configProvider.getInteger(GeneralConfig.TAG_NAME_UTF8_CACHE_SIZE, 128), 0);
+        this.tagValueUtf8CacheSize =
+                Math.max(configProvider.getInteger(GeneralConfig.TAG_VALUE_UTF8_CACHE_SIZE, 384), 0);
+
+        int defaultStackTraceLengthLimit = instrumenterConfig.isCiVisibilityEnabled()
+                ? CIConstants.MAX_META_STRING_VALUE_LENGTH // EVP limit
+                : Integer.MAX_VALUE; // no effective limit (old behavior)
+        this.stackTraceLengthLimit = configProvider.getInteger(STACK_TRACE_LENGTH_LIMIT, defaultStackTraceLengthLimit);
+
+        this.rumInjectorConfig = parseRumConfig(configProvider);
+
+        this.aiGuardEnabled = configProvider.getBoolean(AI_GUARD_ENABLED, DEFAULT_AI_GUARD_ENABLED);
+        this.aiGuardEndpoint = configProvider.getString(AI_GUARD_ENDPOINT);
+        this.aiGuardTimeout = configProvider.getInteger(AI_GUARD_TIMEOUT, DEFAULT_AI_GUARD_TIMEOUT);
+        this.aiGuardMaxContentSize =
+                configProvider.getInteger(AI_GUARD_MAX_CONTENT_SIZE, DEFAULT_AI_GUARD_MAX_CONTENT_SIZE);
+        this.aiGuardMaxMessagesLength =
+                configProvider.getInteger(AI_GUARD_MAX_MESSAGES_LENGTH, DEFAULT_AI_GUARD_MAX_MESSAGES_LENGTH);
+        this.aiGuardRedactionEnabled =
+                configProvider.getBoolean(AI_GUARD_REDACTION_ENABLED, DEFAULT_AI_GUARD_REDACTION_ENABLED);
+
+        log.debug("New instance: {}", this);
+    }
+
+    private static int nonNegativeBaggageLimit(String setting, int value) {
+        if (value < 0) {
+            log.warn("Invalid {}: {}. The value must not be negative. Disabling baggage", setting, value);
+            return 0;
+        }
+        return value;
+    }
+
+    private static boolean isValidUrl(String url) {
+        if (url == null || url.isEmpty()) {
+            return false;
+        }
+        try {
+            new URL(url).toURI();
+            return true;
+        } catch (MalformedURLException | URISyntaxException ex) {
+            log.error("Cannot parse URL '{}', skipping", url);
+            return false;
+        }
+    }
+
+    private RumInjectorConfig parseRumConfig(ConfigProvider configProvider) {
+        if (!instrumenterConfig.isRumEnabled()) {
+            return null;
+        }
+        try {
+            return new RumInjectorConfig(
+                    configProvider.getString(RUM_APPLICATION_ID),
+                    configProvider.getString(RUM_CLIENT_TOKEN),
+                    configProvider.getString(RUM_SITE),
+                    configProvider.getString(RUM_SERVICE),
+                    configProvider.getString(RUM_ENVIRONMENT),
+                    configProvider.getInteger(RUM_MAJOR_VERSION, DEFAULT_RUM_MAJOR_VERSION),
+                    configProvider.getString(RUM_VERSION),
+                    configProvider.getBoolean(RUM_TRACK_USER_INTERACTION),
+                    configProvider.getBoolean(RUM_TRACK_RESOURCES),
+                    configProvider.getBoolean(RUM_TRACK_LONG_TASKS),
+                    configProvider.getEnum(RUM_DEFAULT_PRIVACY_LEVEL, PrivacyLevel.class, null),
+                    configProvider.getFloat(RUM_SESSION_SAMPLE_RATE),
+                    configProvider.getFloat(RUM_SESSION_REPLAY_SAMPLE_RATE),
+                    configProvider.getString(RUM_REMOTE_CONFIGURATION_ID));
+        } catch (IllegalArgumentException e) {
+            log.warn("Unable to configure RUM injection", e);
+            return null;
+        }
+    }
+
+    /**
+     * Converts a list of packages in Jacoco exclusion format ({@code
+     * my.package.*,my.other.package.*}) to list of package prefixes suitable for use with ASM ({@code
+     * my/package/,my/other/package/})
+     */
+    public static String[] convertJacocoExclusionFormatToPackagePrefixes(List<String> packages) {
+        return packages.stream()
+                .map(s -> (s.endsWith("*") ? s.substring(0, s.length() - 1) : s).replace('.', '/'))
+                .toArray(String[]::new);
+    }
+
+    public ConfigProvider configProvider() {
+        return configProvider;
+    }
+
+    public long getStartTimeMillis() {
+        return startTimeMillis;
+    }
+
+    public String getRuntimeId() {
+        return runtimeIdEnabled ? RuntimeIdHolder.runtimeId : "";
+    }
+
+    public String getRootSessionId() {
+        return runtimeIdEnabled ? RuntimeIdHolder.rootSessionId : "";
+    }
+
+    public Long getProcessId() {
+        return PidHelper.getPidAsLong();
+    }
+
+    public String getRuntimeVersion() {
+        return runtimeVersion;
+    }
+
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public String getApplicationKey() {
+        return applicationKey;
+    }
+
+    public String getSite() {
+        return site;
+    }
+
+    public String getHostName() {
+        return HostNameHolder.hostName;
+    }
+
+    public Supplier<String> getHostNameSupplier() {
+        return HostNameHolder::getHostName;
+    }
+
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    public boolean isServiceNameSetByUser() {
+        return serviceNameSetByUser;
+    }
+
+    public String getRootContextServiceName() {
+        return rootContextServiceName;
+    }
+
+    public Set<String> getExperimentalFeaturesEnabled() {
+        return experimentalFeaturesEnabled;
+    }
+
+    public boolean isExperimentalPropagateProcessTagsEnabled() {
+        return experimentalPropagateProcessTagsEnabled;
+    }
+
+    public Map<String, String> getProcessTagsMapping() {
+        return processTagsMapping;
+    }
+
+    public boolean isTraceEnabled() {
+        return instrumenterConfig.isTraceEnabled();
+    }
+
+    public boolean isServiceDiscoveryEnabled() {
+        return serviceDiscoveryEnabled;
+    }
+
+    public boolean isLongRunningTraceEnabled() {
+        return longRunningTraceEnabled;
+    }
+
+    public long getLongRunningTraceInitialFlushInterval() {
+        return longRunningTraceInitialFlushInterval;
+    }
+
+    public long getLongRunningTraceFlushInterval() {
+        return longRunningTraceFlushInterval;
+    }
+
+    public float getTraceFlushIntervalSeconds() {
+        return traceFlushIntervalSeconds;
+    }
+
+    public long getTracePostProcessingTimeout() {
+        return tracePostProcessingTimeout;
+    }
+
+    public boolean isIntegrationSynapseLegacyOperationName() {
+        return integrationSynapseLegacyOperationName;
+    }
+
+    public String getWriterType() {
+        return writerType;
+    }
+
+    public boolean isInjectBaggageAsTagsEnabled() {
+        return injectBaggageAsTagsEnabled;
+    }
+
+    public boolean isTraceBuilderTagsPrecedenceEnabled() {
+        return traceBuilderTagsPrecedenceEnabled;
+    }
+
+    public boolean isInjectLinksAsTagsEnabled() {
+        return injectLinksAsTagsEnabled;
+    }
+
+    public boolean isAgentConfiguredUsingDefault() {
+        return agentConfiguredUsingDefault;
+    }
+
+    public String getAgentUrl() {
+        return agentUrl;
+    }
+
+    public String getAgentHost() {
+        return agentHost;
+    }
+
+    public int getAgentPort() {
+        return agentPort;
+    }
+
+    public String getAgentUnixDomainSocket() {
+        return agentUnixDomainSocket;
+    }
+
+    public String getAgentNamedPipe() {
+        return agentNamedPipe;
+    }
+
+    public int getAgentTimeout() {
+        return agentTimeout;
+    }
+
+    public boolean isForceClearTextHttpForIntakeClient() {
+        return forceClearTextHttpForIntakeClient;
+    }
+
+    public Set<String> getNoProxyHosts() {
+        return noProxyHosts;
+    }
+
+    public boolean isPrioritySamplingEnabled() {
+        return prioritySamplingEnabled;
+    }
+
+    public String getPrioritySamplingForce() {
+        return prioritySamplingForce;
+    }
+
+    public boolean isTraceResolverEnabled() {
+        return traceResolverEnabled;
+    }
+
+    public Set<String> getIastWeakHashAlgorithms() {
+        return iastWeakHashAlgorithms;
+    }
+
+    public Pattern getIastWeakCipherAlgorithms() {
+        return iastWeakCipherAlgorithms;
+    }
+
+    public boolean isIastDeduplicationEnabled() {
+        return iastDeduplicationEnabled;
+    }
+
+    public int getSpanAttributeSchemaVersion() {
+        return spanAttributeSchemaVersion;
+    }
+
+    public boolean isPeerHostNameEnabled() {
+        return peerHostNameEnabled;
+    }
+
+    public boolean isPeerServiceDefaultsEnabled() {
+        return peerServiceDefaultsEnabled;
+    }
+
+    public Map<String, String> getPeerServiceComponentOverrides() {
+        return peerServiceComponentOverrides;
+    }
+
+    public boolean isRemoveIntegrationServiceNamesEnabled() {
+        return removeIntegrationServiceNamesEnabled;
+    }
+
+    public Map<String, String> getPeerServiceMapping() {
+        return peerServiceMapping;
+    }
+
+    public Map<String, String> getServiceMapping() {
+        return serviceMapping;
+    }
+
+    public Map<String, String> getRequestHeaderTags() {
+        return requestHeaderTags;
+    }
+
+    public Map<String, String> getResponseHeaderTags() {
+        return responseHeaderTags;
+    }
+
+    public boolean isRequestHeaderTagsCommaAllowed() {
+        return requestHeaderTagsCommaAllowed;
+    }
+
+    public Map<String, String> getBaggageMapping() {
+        return baggageMapping;
+    }
+
+    public List<String> getTraceBaggageTagKeys() {
+        return traceBaggageTagKeys;
+    }
+
+    public Map<String, String> getHttpServerPathResourceNameMapping() {
+        return httpServerPathResourceNameMapping;
+    }
+
+    public Map<String, String> getHttpClientPathResourceNameMapping() {
+        return httpClientPathResourceNameMapping;
+    }
+
+    public boolean getHttpResourceRemoveTrailingSlash() {
+        return httpResourceRemoveTrailingSlash;
+    }
+
+    public BitSet getHttpServerErrorStatuses() {
+        return httpServerErrorStatuses;
+    }
+
+    public BitSet getHttpClientErrorStatuses() {
+        return httpClientErrorStatuses;
+    }
+
+    public boolean isHttpServerTagQueryString() {
+        return httpServerTagQueryString;
+    }
+
+    public boolean isHttpServerRawQueryString() {
+        return httpServerRawQueryString;
+    }
+
+    public boolean isHttpServerRawResource() {
+        return httpServerRawResource;
+    }
+
+    public boolean isHttpServerDecodedResourcePreserveSpaces() {
+        return httpServerDecodedResourcePreserveSpaces;
+    }
+
+    public boolean isHttpServerRouteBasedNaming() {
+        return httpServerRouteBasedNaming;
+    }
+
+    public boolean isHttpClientTagQueryString() {
+        return httpClientTagQueryString;
+    }
+
+    public boolean isHttpClientTagHeaders() {
+        return httpClientTagHeaders;
+    }
+
+    public boolean isHttpClientSplitByDomain() {
+        return httpClientSplitByDomain;
+    }
+
+    public boolean isDbClientSplitByInstance() {
+        return dbClientSplitByInstance;
+    }
+
+    public boolean isDbClientSplitByInstanceTypeSuffix() {
+        return dbClientSplitByInstanceTypeSuffix;
+    }
+
+    public boolean isDbClientSplitByHost() {
+        return dbClientSplitByHost;
+    }
+
+    public boolean isDbMetadataFetchingOnQueryEnabled() {
+        return dbMetadataFetchingOnQuery;
+    }
+
+    public boolean isDbMetadataFetchingOnConnectEnabled() {
+        return dbMetadataFetchingOnConnect;
+    }
+
+    public Set<String> getSplitByTags() {
+        return splitByTags;
+    }
+
+    public boolean isJeeSplitByDeployment() {
+        return jeeSplitByDeployment;
+    }
+
+    public int getScopeDepthLimit() {
+        return scopeDepthLimit;
+    }
+
+    public boolean isScopeStrictMode() {
+        return scopeStrictMode;
+    }
+
+    public int getScopeIterationKeepAlive() {
+        return scopeIterationKeepAlive;
+    }
+
+    public int getPartialFlushMinSpans() {
+        return partialFlushMinSpans;
+    }
+
+    public int getTraceKeepLatencyThreshold() {
+        return traceKeepLatencyThreshold;
+    }
+
+    public boolean isTraceKeepLatencyThresholdEnabled() {
+        return traceKeepLatencyThresholdEnabled;
+    }
+
+    public boolean isTraceStrictWritesEnabled() {
+        return traceStrictWritesEnabled;
+    }
+
+    public boolean isLogExtractHeaderNames() {
+        return logExtractHeaderNames;
+    }
+
+    @Deprecated
+    public Set<PropagationStyle> getPropagationStylesToExtract() {
+        return propagationStylesToExtract;
+    }
+
+    @Deprecated
+    public Set<PropagationStyle> getPropagationStylesToInject() {
+        return propagationStylesToInject;
+    }
+
+    public boolean isTracePropagationStyleB3PaddingEnabled() {
+        return tracePropagationStyleB3PaddingEnabled;
+    }
+
+    public Set<TracePropagationStyle> getTracePropagationStylesToExtract() {
+        return tracePropagationStylesToExtract;
+    }
+
+    public Set<TracePropagationStyle> getTracePropagationStylesToInject() {
+        return tracePropagationStylesToInject;
+    }
+
+    public TracePropagationBehaviorExtract getTracePropagationBehaviorExtract() {
+        return tracePropagationBehaviorExtract;
+    }
+
+    public boolean isTracePropagationExtractFirst() {
+        return tracePropagationExtractFirst;
+    }
+
+    public boolean isTraceOrgGuardEnabled() {
+        return traceOrgGuardEnabled;
+    }
+
+    public boolean isTraceOrgGuardStrict() {
+        return traceOrgGuardStrict;
+    }
+
+    public Set<String> getTraceOrgGuardTrustedOpms() {
+        return traceOrgGuardTrustedOpms;
+    }
+
+    public boolean isInferredProxyPropagationEnabled() {
+        return traceInferredProxyEnabled;
+    }
+
+    public boolean isBaggageExtract() {
+        return tracePropagationStylesToExtract.contains(TracePropagationStyle.BAGGAGE);
+    }
+
+    public boolean isBaggageInject() {
+        return tracePropagationStylesToInject.contains(TracePropagationStyle.BAGGAGE);
+    }
+
+    public boolean isBaggagePropagationEnabled() {
+        return isBaggageInject() || isBaggageExtract();
+    }
+
+    public int getTraceBaggageMaxItems() {
+        return traceBaggageMaxItems;
+    }
+
+    public int getTraceBaggageMaxBytes() {
+        return traceBaggageMaxBytes;
+    }
+
+    public int getClockSyncPeriod() {
+        return clockSyncPeriod;
+    }
+
+    public String getDogStatsDNamedPipe() {
+        return dogStatsDNamedPipe;
+    }
+
+    public int getDogStatsDStartDelay() {
+        return dogStatsDStartDelay;
+    }
+
+    public Integer getStatsDClientQueueSize() {
+        return statsDClientQueueSize;
+    }
+
+    public Integer getStatsDClientSocketBuffer() {
+        return statsDClientSocketBuffer;
+    }
+
+    public Integer getStatsDClientSocketTimeout() {
+        return statsDClientSocketTimeout;
+    }
+
+    public boolean isRuntimeMetricsEnabled() {
+        return runtimeMetricsEnabled;
+    }
+
+    public boolean isJmxFetchEnabled() {
+        return jmxFetchEnabled;
+    }
+
+    public String getJmxFetchConfigDir() {
+        return jmxFetchConfigDir;
+    }
+
+    public List<String> getJmxFetchConfigs() {
+        return jmxFetchConfigs;
+    }
+
+    public List<String> getJmxFetchMetricsConfigs() {
+        return jmxFetchMetricsConfigs;
+    }
+
+    public Integer getJmxFetchCheckPeriod() {
+        return jmxFetchCheckPeriod;
+    }
+
+    public Integer getJmxFetchRefreshBeansPeriod() {
+        return jmxFetchRefreshBeansPeriod;
+    }
+
+    public Integer getJmxFetchInitialRefreshBeansPeriod() {
+        return jmxFetchInitialRefreshBeansPeriod;
+    }
+
+    public String getJmxFetchStatsdHost() {
+        return jmxFetchStatsdHost;
+    }
+
+    public Integer getJmxFetchStatsdPort() {
+        return jmxFetchStatsdPort;
+    }
+
+    public boolean isJmxFetchMultipleRuntimeServicesEnabled() {
+        return jmxFetchMultipleRuntimeServicesEnabled;
+    }
+
+    public int getJmxFetchMultipleRuntimeServicesLimit() {
+        return jmxFetchMultipleRuntimeServicesLimit;
+    }
+
+    public boolean isHealthMetricsEnabled() {
+        return healthMetricsEnabled;
+    }
+
+    public String getHealthMetricsStatsdHost() {
+        return healthMetricsStatsdHost;
+    }
+
+    public Integer getHealthMetricsStatsdPort() {
+        return healthMetricsStatsdPort;
+    }
+
+    public boolean isPerfMetricsEnabled() {
+        return perfMetricsEnabled;
+    }
+
+    public boolean isTracerMetricsEnabled() {
+        // When ASM Standalone Billing is enabled metrics should be disabled
+        return tracerMetricsEnabled && isApmTracingEnabled();
+    }
+
+    public boolean isTracerMetricsIgnoreAgentVersion() {
+        return tracerMetricsIgnoreAgentVersion;
+    }
+
+    public boolean isTracerMetricsBufferingEnabled() {
+        return tracerMetricsBufferingEnabled;
+    }
+
+    public int getTracerMetricsMaxAggregates() {
+        return tracerMetricsMaxAggregates;
+    }
+
+    public int getTracerMetricsMaxPending() {
+        return tracerMetricsMaxPending;
+    }
+
+    public int getTraceStatsInterval() {
+        return traceStatsInterval;
+    }
+
+    /**
+     * Upper bound for a configured stats cardinality limit. Each limit sizes a {@code
+     * TagCardinalityHandler} that eagerly allocates four reference arrays of {@code nextPow2(limit *
+     * 2)} slots, so an unbounded value (e.g. a mis-set env var) can exhaust the heap while the
+     * aggregator is constructed, before the tracer finishes starting. {@code 1 << 16} caps a single
+     * handler near ~2 MB while staying far above any useful setting -- the highest built-in default
+     * is 1024, and the aggregate table itself caps at a few thousand rows, so a larger per-key budget
+     * cannot produce more aggregate rows anyway.
+     */
+    private static final int MAX_TRACE_STATS_CARDINALITY_LIMIT = 1 << 16;
+
+    /**
+     * Returns the per-cycle cardinality limit for the named stats field, following the RFC naming
+     * pattern {@code DD_TRACE_STATS_{tagName}_CARDINALITY_LIMIT} (e.g. {@code
+     * DD_TRACE_STATS_RESOURCE_CARDINALITY_LIMIT}). The caller supplies the default from {@code
+     * MetricCardinalityLimits} so per-field rationale stays co-located with the defaults.
+     *
+     * <p>A non-positive configured value is invalid -- each limit sizes a fixed-capacity handler
+     * table that requires a positive size -- so it falls back to {@code defaultLimit}, logged at
+     * debug. A value above {@link #MAX_TRACE_STATS_CARDINALITY_LIMIT} would eagerly allocate handler
+     * tables large enough to exhaust the heap at startup, so it likewise falls back to {@code
+     * defaultLimit}, logged at warn.
+     */
+    public int getTraceStatsCardinalityLimit(String tagName, int defaultLimit) {
+        int limit = configProvider.getInteger("trace.stats." + tagName + ".cardinality.limit", defaultLimit);
+        if (limit <= 0) {
+            log.debug(
+                    "Invalid trace.stats.{}.cardinality.limit={}; must be positive. Using default {}.",
+                    tagName,
+                    limit,
+                    defaultLimit);
+            return defaultLimit;
+        }
+        if (limit > MAX_TRACE_STATS_CARDINALITY_LIMIT) {
+            log.warn(
+                    "trace.stats.{}.cardinality.limit={} exceeds the maximum of {}; using default {} to avoid excessive memory use.",
+                    tagName,
+                    limit,
+                    MAX_TRACE_STATS_CARDINALITY_LIMIT,
+                    defaultLimit);
+            return defaultLimit;
+        }
+        return limit;
+    }
+
+    public boolean isLogsInjectionEnabled() {
+        return logsInjectionEnabled;
+    }
+
+    public boolean isAppLogsCollectionEnabled() {
+        return appLogsCollectionEnabled;
+    }
+
+    public boolean isReportHostName() {
+        return reportHostName;
+    }
+
+    public boolean isTraceAnalyticsEnabled() {
+        return traceAnalyticsEnabled;
+    }
+
+    public String getTraceClientIpHeader() {
+        return traceClientIpHeader;
+    }
+
+    // whether to collect headers and run the client ip resolution (also requires appsec to be enabled
+    // or clientIpEnabled)
+    public boolean isTraceClientIpResolverEnabled() {
+        return traceClientIpResolverEnabled;
+    }
+
+    public boolean isTraceGitMetadataEnabled() {
+        return traceGitMetadataEnabled;
+    }
+
+    public Map<String, String> getTraceSamplingServiceRules() {
+        return traceSamplingServiceRules;
+    }
+
+    public Map<String, String> getTraceSamplingOperationRules() {
+        return traceSamplingOperationRules;
+    }
+
+    public String getTraceSamplingRules() {
+        return traceSamplingRules;
+    }
+
+    public Double getTraceSampleRate() {
+        return traceSampleRate;
+    }
+
+    public int getTraceRateLimit() {
+        return traceRateLimit;
+    }
+
+    public String getSpanSamplingRules() {
+        return spanSamplingRules;
+    }
+
+    public String getSpanSamplingRulesFile() {
+        return spanSamplingRulesFile;
+    }
+
+    public boolean isProfilingEnabled() {
+        if (Platform.isNativeImage()) {
+            if (!instrumenterConfig.isProfilingEnabled() && profilingEnabled.isActive()) {
+                log.warn("Profiling was not enabled during the native image build. "
+                        + "Please set DD_PROFILING_ENABLED=true in your native image build configuration if you want"
+                        + "to use profiling.");
+            }
+        }
+        return profilingEnabled.isActive() && instrumenterConfig.isProfilingEnabled();
+    }
+
+    public boolean isProfilingTimelineEventsEnabled() {
+        return timelineEventsEnabled;
+    }
+
+    public boolean isProfilingAgentless() {
+        return profilingAgentless;
+    }
+
+    public int getProfilingStartDelay() {
+        return profilingStartDelay;
+    }
+
+    public boolean isProfilingStartForceFirst() {
+        return profilingStartForceFirst;
+    }
+
+    public int getProfilingUploadPeriod() {
+        return profilingUploadPeriod;
+    }
+
+    public String getProfilingTemplateOverrideFile() {
+        return profilingTemplateOverrideFile;
+    }
+
+    public int getProfilingUploadTimeout() {
+        return profilingUploadTimeout;
+    }
+
+    public String getProfilingUploadCompression() {
+        return profilingUploadCompression;
+    }
+
+    public String getProfilingProxyHost() {
+        return profilingProxyHost;
+    }
+
+    public int getProfilingProxyPort() {
+        return profilingProxyPort;
+    }
+
+    public String getProfilingProxyUsername() {
+        return profilingProxyUsername;
+    }
+
+    public String getProfilingProxyPassword() {
+        return profilingProxyPassword;
+    }
+
+    public int getProfilingExceptionSampleLimit() {
+        return profilingExceptionSampleLimit;
+    }
+
+    public int getProfilingDirectAllocationSampleLimit() {
+        return profilingDirectAllocationSampleLimit;
+    }
+
+    public int getProfilingBackPressureSampleLimit() {
+        return profilingBackPressureSampleLimit;
+    }
+
+    public boolean isProfilingBackPressureSamplingEnabled() {
+        return profilingBackPressureEnabled;
+    }
+
+    public int getProfilingExceptionHistogramTopItems() {
+        return profilingExceptionHistogramTopItems;
+    }
+
+    public int getProfilingExceptionHistogramMaxCollectionSize() {
+        return profilingExceptionHistogramMaxCollectionSize;
+    }
+
+    public boolean isProfilingExcludeAgentThreads() {
+        return profilingExcludeAgentThreads;
+    }
+
+    public boolean isProfilingUploadSummaryOn413Enabled() {
+        return profilingUploadSummaryOn413Enabled;
+    }
+
+    public boolean isProfilingRecordExceptionMessage() {
+        return profilingRecordExceptionMessage;
+    }
+
+    /**
+     * Means "profiling is enabled AND the ddprof engine is allowed to run", not "currently
+     * recording".
+     */
+    public boolean isDatadogProfilerEnabled() {
+        return isProfilingEnabled() && isDatadogProfilerSafeAndConfigured;
+    }
+
+    /**
+     * The raw ddprof env-safety/explicit-flag predicate, without the {@link #isProfilingEnabled()}
+     * AND-prefix: reused by {@link #isOtelThreadContextEnabled()}.
+     */
+    public boolean isDatadogProfilerSafeAndConfigured() {
+        return isDatadogProfilerSafeAndConfigured;
+    }
+
+    /**
+     * Whether the OTel thread/process context should be exposed through the Datadog profiler native
+     * library for external consumers such as eBPF/CWS.
+     */
+    public boolean isOtelThreadContextEnabled() {
+        return otelThreadContextEnabled;
+    }
+
+    public static boolean isDatadogProfilerEnablementOverridden() {
+        // old non-LTS versions without important backports
+        // also, we have no windows binaries
+        return OperatingSystem.isWindows()
+                || isJavaVersion(18)
+                || isJavaVersion(16)
+                || isJavaVersion(15)
+                || isJavaVersion(14)
+                || isJavaVersion(13)
+                || isJavaVersion(12)
+                || isJavaVersion(10)
+                || isJavaVersion(9);
+    }
+
+    public static boolean isDatadogProfilerSafeInCurrentEnvironment() {
+        // don't want to put this logic (which will evolve) in the public ProfilingConfig, and can't
+        // access Platform there
+        if (!JavaVirtualMachine.isJ9() && isJavaVersion(8)) {
+            String arch = SystemProperties.get("os.arch");
+            if ("aarch64".equalsIgnoreCase(arch) || "arm64".equalsIgnoreCase(arch)) {
+                return false;
+            }
+        }
+        if (JavaVirtualMachine.isGraalVM()) {
+            // let's be conservative about GraalVM and require opt-in from the users
+            return false;
+        }
+        boolean result = false;
+        if (JavaVirtualMachine.isJ9()) {
+            // OpenJ9 will activate only JVMTI GetAllStackTraces based profiling which is safe
+            result = true;
+        } else {
+            // JDK 18 is missing ASGCT fixes, so we can't use it
+            if (!isJavaVersion(18)) {
+                result = isJavaVersionAtLeast(17, 0, 5)
+                        || (isJavaVersion(11) && isJavaVersionAtLeast(11, 0, 17))
+                        || (isJavaVersion(8) && isJavaVersionAtLeast(8, 0, 352));
+            }
+        }
+        return result;
+    }
+
+    public boolean isCrashTrackingAgentless() {
+        return crashTrackingAgentless;
+    }
+
+    public boolean isCrashTrackingErrorsIntakeEnabled() {
+        return crashTrackingErrorsIntakeEnabled;
+    }
+
+    public boolean isCrashTrackingExtendedInfoEnabled() {
+        return crashTrackingExtendedInfoEnabled;
+    }
+
+    public boolean isTelemetryEnabled() {
+        return instrumenterConfig.isTelemetryEnabled();
+    }
+
+    public float getTelemetryHeartbeatInterval() {
+        return telemetryHeartbeatInterval;
+    }
+
+    public long getTelemetryExtendedHeartbeatInterval() {
+        return telemetryExtendedHeartbeatInterval;
+    }
+
+    public float getTelemetryMetricsInterval() {
+        return telemetryMetricsInterval;
+    }
+
+    public boolean isTelemetryDependencyServiceEnabled() {
+        return isTelemetryDependencyServiceEnabled;
+    }
+
+    public boolean isTelemetryMetricsEnabled() {
+        return telemetryMetricsEnabled;
+    }
+
+    public boolean isTelemetryLogCollectionEnabled() {
+        return isTelemetryLogCollectionEnabled;
+    }
+
+    public int getTelemetryDependencyResolutionQueueSize() {
+        return telemetryDependencyResolutionQueueSize;
+    }
+
+    public boolean isClientIpEnabled() {
+        return clientIpEnabled;
+    }
+
+    public ProductActivation getAppSecActivation() {
+        return instrumenterConfig.getAppSecActivation();
+    }
+
+    public int getAppSecTraceRateLimit() {
+        return appSecTraceRateLimit;
+    }
+
+    public boolean isAppSecWafMetrics() {
+        return appSecWafMetrics;
+    }
+
+    // in microseconds
+    public int getAppSecWafTimeout() {
+        return appSecWafTimeout;
+    }
+
+    public String getAppSecObfuscationParameterKeyRegexp() {
+        return appSecObfuscationParameterKeyRegexp;
+    }
+
+    public String getAppSecObfuscationParameterValueRegexp() {
+        return appSecObfuscationParameterValueRegexp;
+    }
+
+    public String getAppSecHttpBlockedTemplateHtml() {
+        return appSecHttpBlockedTemplateHtml;
+    }
+
+    public String getAppSecHttpBlockedTemplateJson() {
+        return appSecHttpBlockedTemplateJson;
+    }
+
+    public UserIdCollectionMode getAppSecUserIdCollectionMode() {
+        return appSecUserIdCollectionMode;
+    }
+
+    public boolean isApiSecurityEnabled() {
+        return apiSecurityEnabled;
+    }
+
+    public float getApiSecuritySampleDelay() {
+        return apiSecuritySampleDelay;
+    }
+
+    public int getApiSecurityEndpointCollectionMessageLimit() {
+        return apiSecurityEndpointCollectionMessageLimit;
+    }
+
+    public int getApiSecurityMaxDownstreamRequestBodyAnalysis() {
+        return apiSecurityMaxDownstreamRequestBodyAnalysis;
+    }
+
+    public double getApiSecurityDownstreamRequestBodyAnalysisSampleRate() {
+        return apiSecurityDownstreamRequestBodyAnalysisSampleRate;
+    }
+
+    public boolean isApiSecurityEndpointCollectionEnabled() {
+        return instrumenterConfig.isApiSecurityEndpointCollectionEnabled();
+    }
+
+    public boolean isTraceResourceRenamingEnabled() {
+        return traceResourceRenamingEnabled;
+    }
+
+    public boolean isTraceResourceRenamingAlwaysSimplifiedEndpoint() {
+        return traceResourceRenamingAlwaysSimplifiedEndpoint;
+    }
+
+    public ProductActivation getIastActivation() {
+        return instrumenterConfig.getIastActivation();
+    }
+
+    public boolean isIastDebugEnabled() {
+        return iastDebugEnabled;
+    }
+
+    public int getIastMaxConcurrentRequests() {
+        return iastMaxConcurrentRequests;
+    }
+
+    public int getIastVulnerabilitiesPerRequest() {
+        return iastVulnerabilitiesPerRequest;
+    }
+
+    public float getIastRequestSampling() {
+        return iastRequestSampling;
+    }
+
+    public Verbosity getIastTelemetryVerbosity() {
+        return isTelemetryEnabled() ? iastTelemetryVerbosity : Verbosity.OFF;
+    }
+
+    public boolean isIastRedactionEnabled() {
+        return iastRedactionEnabled;
+    }
+
+    public String getIastRedactionNamePattern() {
+        return iastRedactionNamePattern;
+    }
+
+    public String getIastRedactionValuePattern() {
+        return iastRedactionValuePattern;
+    }
+
+    public int getIastTruncationMaxValueLength() {
+        return iastTruncationMaxValueLength;
+    }
+
+    public int getIastMaxRangeCount() {
+        return iastMaxRangeCount;
+    }
+
+    public boolean isIastStacktraceLeakSuppress() {
+        return iastStacktraceLeakSuppress;
+    }
+
+    public IastContext.Mode getIastContextMode() {
+        return iastContextMode;
+    }
+
+    public boolean isIastHardcodedSecretEnabled() {
+        return iastHardcodedSecretEnabled;
+    }
+
+    public boolean isIastSourceMappingEnabled() {
+        return iastSourceMappingEnabled;
+    }
+
+    public int getIastSourceMappingMaxSize() {
+        return iastSourceMappingMaxSize;
+    }
+
+    public IastDetectionMode getIastDetectionMode() {
+        return iastDetectionMode;
+    }
+
+    public boolean isIastAnonymousClassesEnabled() {
+        return iastAnonymousClassesEnabled;
+    }
+
+    public boolean isIastStackTraceEnabled() {
+        return iastStackTraceEnabled;
+    }
+
+    public boolean isIastExperimentalPropagationEnabled() {
+        return iastExperimentalPropagationEnabled;
+    }
+
+    public String getIastSecurityControlsConfiguration() {
+        return iastSecurityControlsConfiguration;
+    }
+
+    public int getIastDbRowsToTaint() {
+        return iastDbRowsToTaint;
+    }
+
+    public boolean isLlmObsEnabled() {
+        return instrumenterConfig.isLlmObsEnabled();
+    }
+
+    public boolean isLlmObsAgentlessEnabled() {
+        return llmObsAgentlessEnabled;
+    }
+
+    public String getLlMObsAgentlessUrl() {
+        return llmObsAgentlessUrl;
+    }
+
+    public String getLlmObsMlApp() {
+        return llmObsMlApp;
+    }
+
+    /**
+     * The fraction of LLM Observability traces retained by the backend, in {@code [0.0, 1.0]}.
+     *
+     * <p>Independent of APM sampling: the decision made with this rate never affects an APM sampling
+     * priority, and an APM decision never affects it.
+     */
+    public double getLlmObsSampleRate() {
+        return llmObsSampleRate;
+    }
+
+    public boolean isCiVisibilityEnabled() {
+        return instrumenterConfig.isCiVisibilityEnabled();
+    }
+
+    public boolean isUsmEnabled() {
+        return instrumenterConfig.isUsmEnabled();
+    }
+
+    public boolean isCiVisibilityTraceSanitationEnabled() {
+        return ciVisibilityTraceSanitationEnabled;
+    }
+
+    public boolean isCiVisibilityAgentlessEnabled() {
+        return ciVisibilityAgentlessEnabled;
+    }
+
+    public String getCiVisibilityAgentlessUrl() {
+        return ciVisibilityAgentlessUrl;
+    }
+
+    public String getCiVisibilityIntakeAgentlessUrl() {
+        return ciVisibilityIntakeAgentlessUrl;
+    }
+
+    public boolean isCiVisibilitySourceDataEnabled() {
+        return ciVisibilitySourceDataEnabled;
+    }
+
+    public boolean isCiVisibilityBuildInstrumentationEnabled() {
+        return ciVisibilityBuildInstrumentationEnabled;
+    }
+
+    public String getCiVisibilityAgentJarUri() {
+        return ciVisibilityAgentJarUri;
+    }
+
+    public File getCiVisibilityAgentJarFile() {
+        if (ciVisibilityAgentJarUri == null || ciVisibilityAgentJarUri.isEmpty()) {
+            throw new IllegalArgumentException("Agent JAR URI is not set in config");
+        }
+
+        try {
+            URI agentJarUri = new URI(ciVisibilityAgentJarUri);
+            return new File(agentJarUri);
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException("Malformed agent JAR URI: " + ciVisibilityAgentJarUri, e);
+        }
+    }
+
+    public boolean isCiVisibilityAutoConfigurationEnabled() {
+        return ciVisibilityAutoConfigurationEnabled;
+    }
+
+    public String getCiVisibilityAdditionalChildProcessJvmArgs() {
+        return ciVisibilityAdditionalChildProcessJvmArgs;
+    }
+
+    public boolean isCiVisibilityCompilerPluginAutoConfigurationEnabled() {
+        return ciVisibilityCompilerPluginAutoConfigurationEnabled;
+    }
+
+    public boolean isCiVisibilityCodeCoverageEnabled() {
+        return ciVisibilityCodeCoverageEnabled;
+    }
+
+    /**
+     * @return {@code true} if code coverage line-granularity is explicitly enabled
+     */
+    public boolean isCiVisibilityCoverageLinesEnabled() {
+        return ciVisibilityCoverageLinesEnabled != null && ciVisibilityCoverageLinesEnabled;
+    }
+
+    /**
+     * @return {@code true} if code coverage line-granularity is explicitly disabled
+     */
+    public boolean isCiVisibilityCoverageLinesDisabled() {
+        return ciVisibilityCoverageLinesEnabled != null && !ciVisibilityCoverageLinesEnabled;
+    }
+
+    public String getCiVisibilityCodeCoverageReportDumpDir() {
+        return ciVisibilityCodeCoverageReportDumpDir;
+    }
+
+    public List<String> getCodeCoverageFlags() {
+        return codeCoverageFlags;
+    }
+
+    public String getCiVisibilityCompilerPluginVersion() {
+        return ciVisibilityCompilerPluginVersion;
+    }
+
+    public String getCiVisibilityJacocoPluginVersion() {
+        return ciVisibilityJacocoPluginVersion;
+    }
+
+    public boolean isCiVisibilityJacocoPluginVersionProvided() {
+        return ciVisibilityJacocoPluginVersionProvided;
+    }
+
+    public List<String> getCiVisibilityCodeCoverageIncludes() {
+        return ciVisibilityCodeCoverageIncludes;
+    }
+
+    public List<String> getCiVisibilityCodeCoverageExcludes() {
+        return ciVisibilityCodeCoverageExcludes;
+    }
+
+    public String[] getCiVisibilityCodeCoverageIncludedPackages() {
+        return Arrays.copyOf(ciVisibilityCodeCoverageIncludedPackages, ciVisibilityCodeCoverageIncludedPackages.length);
+    }
+
+    public String[] getCiVisibilityCodeCoverageExcludedPackages() {
+        return Arrays.copyOf(ciVisibilityCodeCoverageExcludedPackages, ciVisibilityCodeCoverageExcludedPackages.length);
+    }
+
+    public List<String> getCiVisibilityJacocoGradleSourceSets() {
+        return ciVisibilityJacocoGradleSourceSets;
+    }
+
+    public boolean isCiVisibilityGradleDependencyVerificationEnabled() {
+        return ciVisibilityGradleDependencyVerificationEnabled;
+    }
+
+    public boolean isCiVisibilityCodeCoverageReportUploadEnabled() {
+        return ciVisibilityCodeCoverageReportUploadEnabled;
+    }
+
+    public Integer getCiVisibilityDebugPort() {
+        return ciVisibilityDebugPort;
+    }
+
+    public boolean isCiVisibilityGitClientEnabled() {
+        return ciVisibilityGitClientEnabled;
+    }
+
+    public boolean isCiVisibilityGitUploadEnabled() {
+        return ciVisibilityGitUploadEnabled;
+    }
+
+    public boolean isCiVisibilityGitUnshallowEnabled() {
+        return ciVisibilityGitUnshallowEnabled;
+    }
+
+    public boolean isCiVisibilityGitUnshallowDefer() {
+        return ciVisibilityGitUnshallowDefer;
+    }
+
+    public long getCiVisibilityGitCommandTimeoutMillis() {
+        return ciVisibilityGitCommandTimeoutMillis;
+    }
+
+    public long getCiVisibilityBackendApiTimeoutMillis() {
+        return ciVisibilityBackendApiTimeoutMillis;
+    }
+
+    public long getCiVisibilityGitUploadTimeoutMillis() {
+        return ciVisibilityGitUploadTimeoutMillis;
+    }
+
+    public String getCiVisibilityGitRemoteName() {
+        return ciVisibilityGitRemoteName;
+    }
+
+    public int getCiVisibilitySignalServerPort() {
+        return ciVisibilitySignalServerPort;
+    }
+
+    public int getCiVisibilitySignalClientTimeoutMillis() {
+        return ciVisibilitySignalClientTimeoutMillis;
+    }
+
+    public String getCiVisibilitySignalServerHost() {
+        return ciVisibilitySignalServerHost;
+    }
+
+    public boolean isCiVisibilityItrEnabled() {
+        return ciVisibilityItrEnabled;
+    }
+
+    public boolean isCiVisibilityTestSkippingEnabled() {
+        return ciVisibilityTestSkippingEnabled;
+    }
+
+    public boolean isCiVisibilityCiProviderIntegrationEnabled() {
+        return ciVisibilityCiProviderIntegrationEnabled;
+    }
+
+    public boolean isCiVisibilityRepoIndexDuplicateKeyCheckEnabled() {
+        return ciVisibilityRepoIndexDuplicateKeyCheckEnabled;
+    }
+
+    public boolean isCiVisibilityRepoIndexFollowSymlinks() {
+        return ciVisibilityRepoIndexFollowSymlinks;
+    }
+
+    public int getCiVisibilityExecutionSettingsCacheSize() {
+        return ciVisibilityExecutionSettingsCacheSize;
+    }
+
+    public int getCiVisibilityJvmInfoCacheSize() {
+        return ciVisibilityJvmInfoCacheSize;
+    }
+
+    public int getCiVisibilityCoverageRootPackagesLimit() {
+        return ciVisibilityCoverageRootPackagesLimit;
+    }
+
+    public String getCiVisibilityInjectedTracerVersion() {
+        return ciVisibilityInjectedTracerVersion;
+    }
+
+    public List<String> getCiVisibilityResourceFolderNames() {
+        return ciVisibilityResourceFolderNames;
+    }
+
+    public boolean isCiVisibilityFlakyRetryEnabled() {
+        return ciVisibilityFlakyRetryEnabled;
+    }
+
+    public boolean isCiVisibilityImpactedTestsDetectionEnabled() {
+        return ciVisibilityImpactedTestsDetectionEnabled;
+    }
+
+    public boolean isCiVisibilityKnownTestsRequestEnabled() {
+        return ciVisibilityKnownTestsRequestEnabled;
+    }
+
+    public boolean isCiVisibilityFlakyRetryOnlyKnownFlakes() {
+        return ciVisibilityFlakyRetryOnlyKnownFlakes;
+    }
+
+    public boolean isCiVisibilityEarlyFlakeDetectionEnabled() {
+        return ciVisibilityEarlyFlakeDetectionEnabled;
+    }
+
+    public int getCiVisibilityEarlyFlakeDetectionLowerLimit() {
+        return ciVisibilityEarlyFlakeDetectionLowerLimit;
+    }
+
+    /**
+     * @return {@code true} if any of the features that require CI Visibility execution policies are
+     *     enabled. This is used to enable corresponding instrumentations only when they're needed,
+     *     avoiding unnecessary overhead.
+     */
+    public boolean isCiVisibilityExecutionPoliciesEnabled() {
+        return ciVisibilityFlakyRetryEnabled
+                || ciVisibilityEarlyFlakeDetectionEnabled
+                || ciVisibilityTestManagementEnabled;
+    }
+
+    public boolean isCiVisibilityScalatestForkMonitorEnabled() {
+        return ciVisibilityScalatestForkMonitorEnabled;
+    }
+
+    public int getCiVisibilityFlakyRetryCount() {
+        return ciVisibilityFlakyRetryCount;
+    }
+
+    public int getCiVisibilityTotalFlakyRetryCount() {
+        return ciVisibilityTotalFlakyRetryCount;
+    }
+
+    public boolean isCiVisibilityDynamicAtrEnabled() {
+        return ciVisibilityDynamicAtrEnabled;
+    }
+
+    public List<Integer> getCiVisibilityDynamicAtrBuckets() {
+        return ciVisibilityDynamicAtrBuckets;
+    }
+
+    public String getCiVisibilitySessionName() {
+        return ciVisibilitySessionName;
+    }
+
+    public String getCiVisibilityModuleName() {
+        return ciVisibilityModuleName;
+    }
+
+    public String getCiVisibilityTestCommand() {
+        return ciVisibilityTestCommand;
+    }
+
+    public boolean isCiVisibilityTelemetryEnabled() {
+        return ciVisibilityTelemetryEnabled;
+    }
+
+    public long getCiVisibilityRumFlushWaitMillis() {
+        return ciVisibilityRumFlushWaitMillis;
+    }
+
+    public boolean isCiVisibilityAutoInjected() {
+        return ciVisibilityAutoInjected;
+    }
+
+    public String getCiVisibilityTestOrder() {
+        return ciVisibilityTestOrder;
+    }
+
+    public boolean isCiVisibilityTestManagementEnabled() {
+        return ciVisibilityTestManagementEnabled;
+    }
+
+    public Integer getCiVisibilityTestManagementAttemptToFixRetries() {
+        return ciVisibilityTestManagementAttemptToFixRetries;
+    }
+
+    public boolean isCiVisibilityFailedTestReplayEnabled() {
+        return ciVisibilityFailedTestReplayEnabled;
+    }
+
+    public String getTestOptimizationManifestFile() {
+        return testOptimizationManifestFile;
+    }
+
+    public boolean isTestOptimizationPayloadsInFiles() {
+        return testOptimizationPayloadsInFiles;
+    }
+
+    public String getGitPullRequestBaseBranch() {
+        return gitPullRequestBaseBranch;
+    }
+
+    public String getGitPullRequestBaseBranchSha() {
+        return gitPullRequestBaseBranchSha;
+    }
+
+    public String getGitCommitHeadSha() {
+        return gitCommitHeadSha;
+    }
+
+    public String getAppSecRulesFile() {
+        return appSecRulesFile;
+    }
+
+    public long getRemoteConfigMaxPayloadSizeBytes() {
+        return remoteConfigMaxPayloadSize;
+    }
+
+    public boolean isRemoteConfigEnabled() {
+        return remoteConfigEnabled;
+    }
+
+    public boolean isRemoteConfigIntegrityCheckEnabled() {
+        return remoteConfigIntegrityCheckEnabled;
+    }
+
+    public String getFinalRemoteConfigUrl() {
+        return remoteConfigUrl;
+    }
+
+    public float getRemoteConfigPollIntervalSeconds() {
+        return remoteConfigPollIntervalSeconds;
+    }
+
+    public String getRemoteConfigTargetsKeyId() {
+        return remoteConfigTargetsKeyId;
+    }
+
+    public String getRemoteConfigTargetsKey() {
+        return remoteConfigTargetsKey;
+    }
+
+    public int getRemoteConfigMaxExtraServices() {
+        return remoteConfigMaxExtraServices;
+    }
+
+    public boolean isFeatureFlaggingProviderEnabled() {
+        return featureFlaggingProviderEnabled;
+    }
+
+    public String getFeatureFlaggingConfigurationSource() {
+        return featureFlaggingConfigurationSource;
+    }
+
+    public String getFeatureFlaggingConfigurationSourceAgentlessBaseUrl() {
+        return featureFlaggingConfigurationSourceAgentlessBaseUrl;
+    }
+
+    public int getFeatureFlaggingConfigurationSourcePollIntervalSeconds() {
+        return featureFlaggingConfigurationSourcePollIntervalSeconds;
+    }
+
+    public int getFeatureFlaggingConfigurationSourceRequestTimeoutSeconds() {
+        return featureFlaggingConfigurationSourceRequestTimeoutSeconds;
+    }
+
+    public boolean isDynamicInstrumentationEnabled() {
+        return dynamicInstrumentationEnabled;
+    }
+
+    public int getDynamicInstrumentationUploadTimeout() {
+        return dynamicInstrumentationUploadTimeout;
+    }
+
+    public int getDynamicInstrumentationUploadFlushInterval() {
+        return dynamicInstrumentationUploadFlushInterval;
+    }
+
+    public boolean isDynamicInstrumentationClassFileDumpEnabled() {
+        return dynamicInstrumentationClassFileDumpEnabled;
+    }
+
+    public int getDynamicInstrumentationPollInterval() {
+        return dynamicInstrumentationPollInterval;
+    }
+
+    public int getDynamicInstrumentationDiagnosticsInterval() {
+        return dynamicInstrumentationDiagnosticsInterval;
+    }
+
+    public boolean isDynamicInstrumentationMetricsEnabled() {
+        return dynamicInstrumentationMetricEnabled;
+    }
+
+    public int getDynamicInstrumentationUploadBatchSize() {
+        return dynamicInstrumentationUploadBatchSize;
+    }
+
+    public long getDynamicInstrumentationMaxPayloadSize() {
+        return dynamicInstrumentationMaxPayloadSize;
+    }
+
+    public boolean isDynamicInstrumentationVerifyByteCode() {
+        return dynamicInstrumentationVerifyByteCode;
+    }
+
+    public String getDynamicInstrumentationInstrumentTheWorld() {
+        return dynamicInstrumentationInstrumentTheWorld;
+    }
+
+    public String getDynamicInstrumentationExcludeFiles() {
+        return dynamicInstrumentationExcludeFiles;
+    }
+
+    public String getDynamicInstrumentationIncludeFiles() {
+        return dynamicInstrumentationIncludeFiles;
+    }
+
+    public String getDynamicInstrumentationTimeoutCheckerMode() {
+        return dynamicInstrumentationTimeoutCheckerMode;
+    }
+
+    public int getDynamicInstrumentationCaptureTimeout() {
+        return dynamicInstrumentationCaptureTimeout;
+    }
+
+    public int getDynamicInstrumentationEvalTimeout() {
+        return dynamicInstrumentationEvaluationTimeout;
+    }
+
+    public boolean isSymbolDatabaseEnabled() {
+        return symbolDatabaseEnabled;
+    }
+
+    public boolean isSymbolDatabaseForceUpload() {
+        return symbolDatabaseForceUpload;
+    }
+
+    public int getSymbolDatabaseFlushThreshold() {
+        return symbolDatabaseFlushThreshold;
+    }
+
+    public boolean isSymbolDatabaseCompressed() {
+        return symbolDatabaseCompressed;
+    }
+
+    public boolean isDebuggerExceptionEnabled() {
+        return debuggerExceptionEnabled;
+    }
+
+    public int getDebuggerMaxExceptionPerSecond() {
+        return debuggerMaxExceptionPerSecond;
+    }
+
+    public boolean isDebuggerExceptionOnlyLocalRoot() {
+        return debuggerExceptionOnlyLocalRoot;
+    }
+
+    public boolean isDebuggerExceptionCaptureIntermediateSpansEnabled() {
+        return debuggerExceptionCaptureIntermediateSpansEnabled;
+    }
+
+    public int getDebuggerExceptionMaxCapturedFrames() {
+        return debuggerExceptionMaxCapturedFrames;
+    }
+
+    public int getDebuggerExceptionCaptureInterval() {
+        return debuggerExceptionCaptureInterval;
+    }
+
+    public boolean isDebuggerCodeOriginEnabled() {
+        return debuggerCodeOriginEnabled;
+    }
+
+    public int getDebuggerCodeOriginMaxUserFrames() {
+        return debuggerCodeOriginMaxUserFrames;
+    }
+
+    public boolean isDistributedDebuggerEnabled() {
+        return distributedDebuggerEnabled;
+    }
+
+    public boolean isDebuggerSourceFileTrackingEnabled() {
+        return debuggerSourceFileTrackingEnabled;
+    }
+
+    public boolean isDebuggerSynchronousSourceFileTrackingEnabled() {
+        return debuggerSynchronousSourceFileTrackingEnabled;
+    }
+
+    public Set<String> getThirdPartyIncludes() {
+        return debuggerThirdPartyIncludes;
+    }
+
+    public Set<String> getThirdPartyExcludes() {
+        return debuggerThirdPartyExcludes;
+    }
+
+    public Set<String> getThirdPartyShadingIdentifiers() {
+        return debuggerShadingIdentifiers;
+    }
+
+    private String getFinalDebuggerBaseUrl() {
+        if (agentUrl.startsWith("unix:")) {
+            // provide placeholder agent URL, in practice we'll be tunnelling over UDS
+            return "http://" + agentHost + ":" + agentPort;
+        } else {
+            return agentUrl;
         }
-      } catch (URISyntaxException e) {
-        log.warn("{} not configured correctly: {}. Ignoring", TRACE_AGENT_URL, e.getMessage());
-      }
-    }
-
-    // avoid merging in supplementary host/port settings when dealing with unix: URLs
-    if (unixSocketFromEnvironment == null) {
-      if (agentHostFromEnvironment == null) {
-        agentHostFromEnvironment = configProvider.getString(AGENT_HOST);
-        rebuildAgentUrl = true;
-      }
-      if (agentPortFromEnvironment < 0) {
-        agentPortFromEnvironment =
-            configProvider.getInteger(TRACE_AGENT_PORT, -1, AGENT_PORT_LEGACY);
-        rebuildAgentUrl = true;
-      }
-    }
-
-    if (agentHostFromEnvironment == null || agentHostFromEnvironment.isEmpty()) {
-      agentHost = DEFAULT_AGENT_HOST;
-    } else if (agentHostFromEnvironment.charAt(0) == '[') {
-      agentHost = agentHostFromEnvironment.substring(1, agentHostFromEnvironment.length() - 1);
-    } else {
-      agentHost = agentHostFromEnvironment;
-    }
-
-    if (agentPortFromEnvironment < 0) {
-      agentPort = DEFAULT_TRACE_AGENT_PORT;
-    } else {
-      agentPort = agentPortFromEnvironment;
-    }
-
-    if (rebuildAgentUrl) { // check if agenthost contains ':'
-      if (agentHost.indexOf(':') != -1) { // Checking to see whether host address is IPv6 vs IPv4
-        agentUrl = "http://[" + agentHost + "]:" + agentPort;
-      } else {
-        agentUrl = "http://" + agentHost + ":" + agentPort;
-      }
-    } else {
-      agentUrl = agentUrlFromEnvironment;
-    }
-
-    if (unixSocketFromEnvironment == null) {
-      unixSocketFromEnvironment = configProvider.getString(AGENT_UNIX_DOMAIN_SOCKET);
-      String unixPrefix = "unix://";
-      // handle situation where someone passes us a unix:// URL instead of a socket path
-      if (unixSocketFromEnvironment != null && unixSocketFromEnvironment.startsWith(unixPrefix)) {
-        unixSocketFromEnvironment = unixSocketFromEnvironment.substring(unixPrefix.length());
-      }
-    }
-
-    agentUnixDomainSocket = unixSocketFromEnvironment;
-
-    agentNamedPipe = configProvider.getString(AGENT_NAMED_PIPE);
-
-    agentConfiguredUsingDefault =
-        agentHostFromEnvironment == null
-            && agentPortFromEnvironment < 0
-            && unixSocketFromEnvironment == null
-            && agentNamedPipe == null;
-
-    agentTimeout = configProvider.getInteger(AGENT_TIMEOUT, DEFAULT_AGENT_TIMEOUT);
-
-    forceClearTextHttpForIntakeClient =
-        configProvider.getBoolean(FORCE_CLEAR_TEXT_HTTP_FOR_INTAKE_CLIENT, false);
-
-    // DD_PROXY_NO_PROXY is specified as a space-separated list of hosts
-    noProxyHosts = tryMakeImmutableSet(configProvider.getSpacedList(PROXY_NO_PROXY));
-
-    prioritySamplingEnabled =
-        configProvider.getBoolean(PRIORITY_SAMPLING, DEFAULT_PRIORITY_SAMPLING_ENABLED);
-    prioritySamplingForce =
-        configProvider.getString(PRIORITY_SAMPLING_FORCE, DEFAULT_PRIORITY_SAMPLING_FORCE);
-
-    traceResolverEnabled =
-        configProvider.getBoolean(TRACE_RESOLVER_ENABLED, DEFAULT_TRACE_RESOLVER_ENABLED);
-    serviceMapping = configProvider.getMergedMap(SERVICE_MAPPING);
-
-    {
-      final Map<String, String> tags = new HashMap<>(configProvider.getMergedMap(GLOBAL_TAGS));
-      if (experimentalFeaturesEnabled.contains("DD_TAGS")) {
-        tags.putAll(configProvider.getMergedTagsMap(TRACE_TAGS, TAGS));
-      } else {
-        tags.putAll(configProvider.getMergedMap(TRACE_TAGS, TAGS));
-      }
-      if (serviceNameSetByUser) { // prioritize service name set by DD_SERVICE over DD_TAGS config
-        tags.remove("service");
-      }
-      this.tags = getMapWithPropertiesDefinedByEnvironment(tags, ENV, VERSION);
-    }
-
-    spanTags = configProvider.getMergedMap(SPAN_TAGS);
-    jmxTags = configProvider.getMergedMap(JMX_TAGS);
-
-    primaryTag = configProvider.getString(PRIMARY_TAG);
-
-    if (isEnabled(false, HEADER_TAGS, ".legacy.parsing.enabled")) {
-      requestHeaderTags = configProvider.getMergedMap(HEADER_TAGS);
-      responseHeaderTags = Collections.emptyMap();
-      if (configProvider.isSet(REQUEST_HEADER_TAGS)) {
-        logIgnoredSettingWarning(REQUEST_HEADER_TAGS, HEADER_TAGS, ".legacy.parsing.enabled");
-      }
-      if (configProvider.isSet(RESPONSE_HEADER_TAGS)) {
-        logIgnoredSettingWarning(RESPONSE_HEADER_TAGS, HEADER_TAGS, ".legacy.parsing.enabled");
-      }
-    } else {
-      requestHeaderTags =
-          configProvider.getMergedMapWithOptionalMappings(
-              "http.request.headers.", true, HEADER_TAGS, REQUEST_HEADER_TAGS);
-      responseHeaderTags =
-          configProvider.getMergedMapWithOptionalMappings(
-              "http.response.headers.", true, HEADER_TAGS, RESPONSE_HEADER_TAGS);
-    }
-    requestHeaderTagsCommaAllowed =
-        configProvider.getBoolean(REQUEST_HEADER_TAGS_COMMA_ALLOWED, true);
-
-    baggageMapping = configProvider.getMergedMapWithOptionalMappings(null, true, BAGGAGE_MAPPING);
-
-    azureFunctions =
-        getEnv("FUNCTIONS_WORKER_RUNTIME") != null && getEnv("FUNCTIONS_EXTENSION_VERSION") != null;
-
-    awsServerless =
-        getEnv("AWS_LAMBDA_FUNCTION_NAME") != null && !getEnv("AWS_LAMBDA_FUNCTION_NAME").isEmpty();
-
-    sfnInjectDatadogAttributeEnabled =
-        isInjectDatadogAttributeEnabled(DEFAULT_INJECT_DATADOG_ATTRIBUTE, "sfn");
-    eventbridgeInjectDatadogAttributeEnabled =
-        isInjectDatadogAttributeEnabled(DEFAULT_INJECT_DATADOG_ATTRIBUTE, "eventbridge");
-    snsInjectDatadogAttributeEnabled =
-        isInjectDatadogAttributeEnabled(DEFAULT_INJECT_DATADOG_ATTRIBUTE, "sns");
-    sqsInjectDatadogAttributeEnabled =
-        isInjectDatadogAttributeEnabled(DEFAULT_INJECT_DATADOG_ATTRIBUTE, "sqs");
-
-    spanAttributeSchemaVersion = schemaVersionFromConfig();
-
-    peerHostNameEnabled = configProvider.getBoolean(TRACE_PEER_HOSTNAME_ENABLED, true);
-
-    // following two only used in v0.
-    // in v1+ defaults are always calculated regardless this feature flag
-    peerServiceDefaultsEnabled =
-        configProvider.getBoolean(TRACE_PEER_SERVICE_DEFAULTS_ENABLED, false);
-    peerServiceComponentOverrides =
-        configProvider.getMergedMap(TRACE_PEER_SERVICE_COMPONENT_OVERRIDES);
-    // feature flag to remove fake services in v0
-    removeIntegrationServiceNamesEnabled =
-        configProvider.getBoolean(TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED, false);
-    experimentalPropagateProcessTagsEnabled =
-        configProvider.getBoolean(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, true);
-    processTagsMapping = configProvider.getMergedMap(PROCESS_TAGS_MAPPING);
-
-    peerServiceMapping = configProvider.getMergedMap(TRACE_PEER_SERVICE_MAPPING);
-
-    httpServerPathResourceNameMapping =
-        configProvider.getOrderedMap(TRACE_HTTP_SERVER_PATH_RESOURCE_NAME_MAPPING);
-
-    httpClientPathResourceNameMapping =
-        configProvider.getOrderedMap(TRACE_HTTP_CLIENT_PATH_RESOURCE_NAME_MAPPING);
-
-    httpResourceRemoveTrailingSlash =
-        configProvider.getBoolean(
-            TRACE_HTTP_RESOURCE_REMOVE_TRAILING_SLASH,
-            DEFAULT_TRACE_HTTP_RESOURCE_REMOVE_TRAILING_SLASH);
-
-    httpServerErrorStatuses =
-        configProvider.getIntegerRange(
-            TRACE_HTTP_SERVER_ERROR_STATUSES,
-            DEFAULT_HTTP_SERVER_ERROR_STATUSES,
-            HTTP_SERVER_ERROR_STATUSES);
-
-    httpClientErrorStatuses =
-        configProvider.getIntegerRange(
-            TRACE_HTTP_CLIENT_ERROR_STATUSES,
-            DEFAULT_HTTP_CLIENT_ERROR_STATUSES,
-            HTTP_CLIENT_ERROR_STATUSES);
-
-    httpServerTagQueryString =
-        configProvider.getBoolean(
-            HTTP_SERVER_TAG_QUERY_STRING, DEFAULT_HTTP_SERVER_TAG_QUERY_STRING);
-
-    httpServerRawQueryString = configProvider.getBoolean(HTTP_SERVER_RAW_QUERY_STRING, true);
-
-    httpServerRawResource = configProvider.getBoolean(HTTP_SERVER_RAW_RESOURCE, false);
-
-    httpServerDecodedResourcePreserveSpaces =
-        configProvider.getBoolean(HTTP_SERVER_DECODED_RESOURCE_PRESERVE_SPACES, true);
-
-    httpServerRouteBasedNaming =
-        configProvider.getBoolean(
-            HTTP_SERVER_ROUTE_BASED_NAMING, DEFAULT_HTTP_SERVER_ROUTE_BASED_NAMING);
-
-    httpClientTagQueryString =
-        configProvider.getBoolean(
-            TRACE_HTTP_CLIENT_TAG_QUERY_STRING,
-            DEFAULT_HTTP_CLIENT_TAG_QUERY_STRING,
-            HTTP_CLIENT_TAG_QUERY_STRING);
-
-    httpClientTagHeaders = configProvider.getBoolean(HTTP_CLIENT_TAG_HEADERS, true);
-
-    httpClientSplitByDomain =
-        configProvider.getBoolean(
-            HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN, DEFAULT_HTTP_CLIENT_SPLIT_BY_DOMAIN);
-
-    dbClientSplitByInstance =
-        configProvider.getBoolean(
-            DB_CLIENT_HOST_SPLIT_BY_INSTANCE, DEFAULT_DB_CLIENT_HOST_SPLIT_BY_INSTANCE);
-
-    dbClientSplitByInstanceTypeSuffix =
-        configProvider.getBoolean(
-            DB_CLIENT_HOST_SPLIT_BY_INSTANCE_TYPE_SUFFIX,
-            DEFAULT_DB_CLIENT_HOST_SPLIT_BY_INSTANCE_TYPE_SUFFIX);
-
-    dbMetadataFetchingOnQuery = configProvider.getBoolean(DB_METADATA_FETCHING_ON_QUERY, true);
-    dbMetadataFetchingOnConnect = configProvider.getBoolean(DB_METADATA_FETCHING_ON_CONNECT, true);
-
-    dbClientSplitByHost =
-        configProvider.getBoolean(
-            DB_CLIENT_HOST_SPLIT_BY_HOST, DEFAULT_DB_CLIENT_HOST_SPLIT_BY_HOST);
-
-    dbmPropagationMode =
-        configProvider.getString(
-            DB_DBM_PROPAGATION_MODE_MODE, DEFAULT_DB_DBM_PROPAGATION_MODE_MODE);
-
-    dbmPropagationOracleActionOnlyEnabled =
-        configProvider.getBoolean(
-            DB_DBM_PROPAGATION_ORACLE_ACTION_ONLY_ENABLED,
-            DEFAULT_DB_DBM_PROPAGATION_ORACLE_ACTION_ONLY_ENABLED);
-
-    dbmTracePreparedStatements =
-        configProvider.getBoolean(
-            DB_DBM_TRACE_PREPARED_STATEMENTS, DEFAULT_DB_DBM_TRACE_PREPARED_STATEMENTS);
-
-    dbmAlwaysAppendSqlComment =
-        configProvider.getBoolean(
-            DB_DBM_ALWAYS_APPEND_SQL_COMMENT, DEFAULT_DB_DBM_ALWAYS_APPEND_SQL_COMMENT);
-
-    dbmInjectSqlBaseHash =
-        configProvider.getBoolean(DB_DBM_INJECT_SQL_BASEHASH, false)
-            || DBM_PROPAGATION_MODE_DYNAMIC_SERVICE.equals(dbmPropagationMode);
-
-    splitByTags = tryMakeImmutableSet(configProvider.getList(SPLIT_BY_TAGS));
-
-    traceStatsAdditionalTags =
-        experimentalFeaturesEnabled.contains(
-                propertyNameToEnvironmentVariableName(TRACE_STATS_ADDITIONAL_TAGS))
-            ? tryMakeImmutableSet(configProvider.getList(TRACE_STATS_ADDITIONAL_TAGS))
-            : Collections.emptySet();
-
-    jeeSplitByDeployment =
-        configProvider.getBoolean(
-            EXPERIMENTATAL_JEE_SPLIT_BY_DEPLOYMENT, DEFAULT_EXPERIMENTATAL_JEE_SPLIT_BY_DEPLOYMENT);
-
-    springDataRepositoryInterfaceResourceName =
-        configProvider.getBoolean(SPRING_DATA_REPOSITORY_INTERFACE_RESOURCE_NAME, true);
-
-    scopeDepthLimit = configProvider.getInteger(SCOPE_DEPTH_LIMIT, DEFAULT_SCOPE_DEPTH_LIMIT);
-
-    scopeStrictMode = configProvider.getBoolean(SCOPE_STRICT_MODE, false);
-
-    scopeIterationKeepAlive =
-        configProvider.getInteger(SCOPE_ITERATION_KEEP_ALIVE, DEFAULT_SCOPE_ITERATION_KEEP_ALIVE);
-
-    boolean partialFlushEnabled = configProvider.getBoolean(PARTIAL_FLUSH_ENABLED, true);
-    partialFlushMinSpans =
-        !partialFlushEnabled
-            ? 0
-            : configProvider.getInteger(PARTIAL_FLUSH_MIN_SPANS, DEFAULT_PARTIAL_FLUSH_MIN_SPANS);
-
-    traceKeepLatencyThreshold =
-        configProvider.getInteger(
-            TRACE_KEEP_LATENCY_THRESHOLD_MS, DEFAULT_TRACE_KEEP_LATENCY_THRESHOLD_MS);
-
-    traceKeepLatencyThresholdEnabled = !partialFlushEnabled && (traceKeepLatencyThreshold > 0);
-
-    traceStrictWritesEnabled = configProvider.getBoolean(TRACE_STRICT_WRITES_ENABLED, false);
-
-    logExtractHeaderNames =
-        configProvider.getBoolean(
-            PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED,
-            DEFAULT_PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED);
-
-    tracePropagationStyleB3PaddingEnabled =
-        isEnabled(
-            DEFAULT_PROPAGATION_B3_PADDING_ENABLED, TRACE_PROPAGATION_STYLE, ".b3.padding.enabled");
-
-    TracePropagationBehaviorExtract tmpTracePropagationBehaviorExtract;
-    try {
-      tmpTracePropagationBehaviorExtract =
-          TracePropagationBehaviorExtract.valueOf(
-              configProvider
-                  .getString(
-                      TRACE_PROPAGATION_BEHAVIOR_EXTRACT,
-                      DEFAULT_TRACE_PROPAGATION_BEHAVIOR_EXTRACT.toString())
-                  .toUpperCase(Locale.ROOT));
-    } catch (IllegalArgumentException e) {
-      tmpTracePropagationBehaviorExtract = TracePropagationBehaviorExtract.CONTINUE;
-      log.warn("Error while parsing TRACE_PROPAGATION_BEHAVIOR_EXTRACT, defaulting to `continue`");
-    }
-    tracePropagationBehaviorExtract = tmpTracePropagationBehaviorExtract;
-
-    {
-      // The dd.propagation.style.(extract|inject) settings have been deprecated in
-      // favor of dd.trace.propagation.style(|.extract|.inject) settings.
-      // The different propagation settings when set will be applied in the following order of
-      // precedence, and warnings will be logged for both deprecation and overrides.
-      // * dd.trace.propagation.style.(extract|inject)
-      // * dd.trace.propagation.style
-      // * dd.propagation.style.(extract|inject)
-      Set<PropagationStyle> deprecatedExtract =
-          getSettingsSetFromEnvironment(
-              PROPAGATION_STYLE_EXTRACT, PropagationStyle::valueOfConfigName, true);
-      Set<PropagationStyle> deprecatedInject =
-          getSettingsSetFromEnvironment(
-              PROPAGATION_STYLE_INJECT, PropagationStyle::valueOfConfigName, true);
-      Set<TracePropagationStyle> common =
-          getSettingsSetFromEnvironment(
-              TRACE_PROPAGATION_STYLE, TracePropagationStyle::valueOfDisplayName, false);
-      Set<TracePropagationStyle> extract =
-          getSettingsSetFromEnvironment(
-              TRACE_PROPAGATION_STYLE_EXTRACT, TracePropagationStyle::valueOfDisplayName, false);
-      Set<TracePropagationStyle> inject =
-          getSettingsSetFromEnvironment(
-              TRACE_PROPAGATION_STYLE_INJECT, TracePropagationStyle::valueOfDisplayName, false);
-      String extractOrigin = TRACE_PROPAGATION_STYLE_EXTRACT;
-      String injectOrigin = TRACE_PROPAGATION_STYLE_INJECT;
-      // Check if we should use the common setting for extraction
-      if (extract.isEmpty()) {
-        extract = common;
-        extractOrigin = TRACE_PROPAGATION_STYLE;
-      } else if (!common.isEmpty()) {
-        // The more specific settings will override the common setting, so log a warning
-        logOverriddenSettingWarning(
-            TRACE_PROPAGATION_STYLE, TRACE_PROPAGATION_STYLE_EXTRACT, extract);
-      }
-      // Check if we should use the common setting for injection
-      if (inject.isEmpty()) {
-        inject = common;
-        injectOrigin = TRACE_PROPAGATION_STYLE;
-      } else if (!common.isEmpty()) {
-        // The more specific settings will override the common setting, so log a warning
-        logOverriddenSettingWarning(
-            TRACE_PROPAGATION_STYLE, TRACE_PROPAGATION_STYLE_INJECT, inject);
-      }
-      // Check if we should use the deprecated setting for extraction
-      if (extract.isEmpty()) {
-        // If we don't have a new setting, we convert the deprecated one
-        extract = convertSettingsSet(deprecatedExtract, PropagationStyle::getNewStyles);
-        if (!extract.isEmpty()) {
-          logDeprecatedConvertedSetting(
-              PROPAGATION_STYLE_EXTRACT,
-              deprecatedExtract,
-              TRACE_PROPAGATION_STYLE_EXTRACT,
-              extract);
+    }
+
+    public String getFinalDebuggerSnapshotUrl() {
+        if (Strings.isNotBlank(dynamicInstrumentationSnapshotUrl)) {
+            return dynamicInstrumentationSnapshotUrl;
+        } else if (isCiVisibilityAgentlessEnabled()) {
+            return Intake.LOGS.getAgentlessUrl(this) + "logs";
+        } else {
+            return getFinalDebuggerBaseUrl() + "/debugger/v1/diagnostics";
         }
-      } else if (!deprecatedExtract.isEmpty()) {
-        // If we have a new setting, we log a warning
-        logOverriddenDeprecatedSettingWarning(PROPAGATION_STYLE_EXTRACT, extractOrigin, extract);
-      }
-      // Check if we should use the deprecated setting for injection
-      if (inject.isEmpty()) {
-        // If we don't have a new setting, we convert the deprecated one
-        inject = convertSettingsSet(deprecatedInject, PropagationStyle::getNewStyles);
-        if (!inject.isEmpty()) {
-          logDeprecatedConvertedSetting(
-              PROPAGATION_STYLE_INJECT, deprecatedInject, TRACE_PROPAGATION_STYLE_INJECT, inject);
+    }
+
+    public String getFinalDebuggerSymDBUrl() {
+        if (isCiVisibilityAgentlessEnabled()) {
+            return Intake.LOGS.getAgentlessUrl(this) + "logs";
+        } else {
+            return getFinalDebuggerBaseUrl() + "/symdb/v1/input";
         }
-      } else if (!deprecatedInject.isEmpty()) {
-        // If we have a new setting, we log a warning
-        logOverriddenDeprecatedSettingWarning(PROPAGATION_STYLE_INJECT, injectOrigin, inject);
-      }
-
-      // Parse the baggage tag keys configuration
-      traceBaggageTagKeys =
-          configProvider.getList(TRACE_BAGGAGE_TAG_KEYS, DEFAULT_TRACE_BAGGAGE_TAG_KEYS);
-
-      // Now we can check if we should pick the default injection/extraction
+    }
+
+    public String getDynamicInstrumentationProbeFile() {
+        return dynamicInstrumentationProbeFile;
+    }
+
+    public String getDynamicInstrumentationRedactedIdentifiers() {
+        return dynamicInstrumentationRedactedIdentifiers;
+    }
+
+    public Set<String> getDynamicInstrumentationRedactionExcludedIdentifiers() {
+        return dynamicInstrumentationRedactionExcludedIdentifiers;
+    }
+
+    public String getDynamicInstrumentationRedactedTypes() {
+        return dynamicInstrumentationRedactedTypes;
+    }
+
+    public int getDynamicInstrumentationLocalVarHoistingLevel() {
+        return dynamicInstrumentationLocalVarHoistingLevel;
+    }
+
+    public boolean isAwsPropagationEnabled() {
+        return awsPropagationEnabled;
+    }
+
+    public boolean isSqsPropagationEnabled() {
+        return sqsPropagationEnabled;
+    }
+
+    public boolean isSqsBodyPropagationEnabled() {
+        return sqsBodyPropagationEnabled;
+    }
+
+    public boolean isKafkaClientPropagationEnabled() {
+        return kafkaClientPropagationEnabled;
+    }
+
+    public boolean isKafkaClientPropagationDisabledForTopic(String topic) {
+        return null != topic && kafkaClientPropagationDisabledTopics.contains(topic);
+    }
+
+    public boolean isJmsPropagationEnabled() {
+        return jmsPropagationEnabled;
+    }
+
+    public boolean isJmsPropagationDisabledForDestination(final String queueOrTopic) {
+        return null != queueOrTopic
+                && (jmsPropagationDisabledQueues.contains(queueOrTopic)
+                        || jmsPropagationDisabledTopics.contains(queueOrTopic));
+    }
+
+    public int getJmsUnacknowledgedMaxAge() {
+        return jmsUnacknowledgedMaxAge;
+    }
+
+    public boolean isKafkaClientBase64DecodingEnabled() {
+        return kafkaClientBase64DecodingEnabled;
+    }
+
+    public boolean isRabbitPropagationEnabled() {
+        return rabbitPropagationEnabled;
+    }
+
+    public boolean isRabbitPropagationDisabledForDestination(final String queueOrExchange) {
+        return null != queueOrExchange
+                && (rabbitPropagationDisabledQueues.contains(queueOrExchange)
+                        || rabbitPropagationDisabledExchanges.contains(queueOrExchange));
+    }
+
+    public boolean isRabbitIncludeRoutingKeyInResource() {
+        return rabbitIncludeRoutingKeyInResource;
+    }
+
+    public boolean isMessageBrokerSplitByDestination() {
+        return messageBrokerSplitByDestination;
+    }
+
+    public boolean isHystrixTagsEnabled() {
+        return hystrixTagsEnabled;
+    }
+
+    public boolean isHystrixMeasuredEnabled() {
+        return hystrixMeasuredEnabled;
+    }
+
+    public boolean isResilience4jMeasuredEnabled() {
+        return resilience4jMeasuredEnabled;
+    }
+
+    public boolean isSpringSchedulingMeasuredEnabled() {
+        return springSchedulingMeasuredEnabled;
+    }
+
+    public boolean isResilience4jTagMetricsEnabled() {
+        return resilience4jTagMetricsEnabled;
+    }
+
+    public boolean isIgniteCacheIncludeKeys() {
+        return igniteCacheIncludeKeys;
+    }
+
+    public String getObfuscationQueryRegexp() {
+        return obfuscationQueryRegexp;
+    }
+
+    public boolean getPlayReportHttpStatus() {
+        return playReportHttpStatus;
+    }
+
+    public boolean isServletPrincipalEnabled() {
+        return servletPrincipalEnabled;
+    }
+
+    public boolean isSpringDataRepositoryInterfaceResourceName() {
+        return springDataRepositoryInterfaceResourceName;
+    }
+
+    public int getxDatadogTagsMaxLength() {
+        return xDatadogTagsMaxLength;
+    }
+
+    public boolean isServletAsyncTimeoutError() {
+        return servletAsyncTimeoutError;
+    }
+
+    public ProtocolVersion getProtocolVersion() {
+        return protocolVersion;
+    }
+
+    public String getLogLevel() {
+        return logLevel;
+    }
+
+    public boolean isDebugEnabled() {
+        return debugEnabled;
+    }
+
+    public boolean isTriageEnabled() {
+        return triageEnabled;
+    }
+
+    public String getTriageReportTrigger() {
+        return triageReportTrigger;
+    }
+
+    public String getTriageReportDir() {
+        return triageReportDir;
+    }
+
+    public boolean isStartupLogsEnabled() {
+        return startupLogsEnabled;
+    }
+
+    public boolean isCwsEnabled() {
+        return cwsEnabled;
+    }
+
+    public int getCwsTlsRefresh() {
+        return cwsTlsRefresh;
+    }
+
+    public boolean isAzureAppServices() {
+        return azureAppServices;
+    }
+
+    public boolean isAwsServerless() {
+        return awsServerless;
+    }
+
+    public boolean isLambdaSnapStartClockResyncEnabled() {
+        return lambdaSnapStartClockResyncEnabled;
+    }
+
+    public boolean isDataStreamsEnabled() {
+        return dataStreamsEnabled;
+    }
+
+    public float getDataStreamsBucketDurationSeconds() {
+        return dataStreamsBucketDurationSeconds;
+    }
+
+    public String getDataStreamsTransactionExtractors() {
+        return dataStreamsTransactionExtractors;
+    }
+
+    public long getDataStreamsBucketDurationNanoseconds() {
+        // Rounds to the nearest millisecond before converting to nanos
+        int milliseconds = Math.round(dataStreamsBucketDurationSeconds * 1000);
+        return TimeUnit.MILLISECONDS.toNanos(milliseconds);
+    }
+
+    public String getTraceAgentPath() {
+        return traceAgentPath;
+    }
+
+    public String getTestAgentSessionToken() {
+        return testAgentSessionToken;
+    }
+
+    public List<String> getTraceAgentArgs() {
+        return traceAgentArgs;
+    }
+
+    public String getDogStatsDPath() {
+        return dogStatsDPath;
+    }
+
+    public List<String> getDogStatsDArgs() {
+        return dogStatsDArgs;
+    }
+
+    public int getDogsStatsDPort() {
+        return dogStatsDPort;
+    }
+
+    public String getConfigFileStatus() {
+        return configFileStatus;
+    }
+
+    public IdGenerationStrategy getIdGenerationStrategy() {
+        return idGenerationStrategy;
+    }
+
+    public boolean isTrace128bitTraceIdGenerationEnabled() {
+        return trace128bitTraceIdGenerationEnabled;
+    }
+
+    public boolean isLogs128bitTraceIdEnabled() {
+        return logs128bitTraceIdEnabled;
+    }
+
+    public Set<String> getGrpcIgnoredInboundMethods() {
+        return grpcIgnoredInboundMethods;
+    }
+
+    public Set<String> getGrpcIgnoredOutboundMethods() {
+        return grpcIgnoredOutboundMethods;
+    }
+
+    public boolean isGrpcServerTrimPackageResource() {
+        return grpcServerTrimPackageResource;
+    }
+
+    public BitSet getGrpcServerErrorStatuses() {
+        return grpcServerErrorStatuses;
+    }
+
+    public BitSet getGrpcClientErrorStatuses() {
+        return grpcClientErrorStatuses;
+    }
+
+    public boolean isCassandraKeyspaceStatementExtractionEnabled() {
+        return cassandraKeyspaceStatementExtractionEnabled;
+    }
+
+    public boolean isCouchbaseInternalSpansEnabled() {
+        return couchbaseInternalSpansEnabled;
+    }
+
+    public boolean isElasticsearchBodyEnabled() {
+        return elasticsearchBodyEnabled;
+    }
+
+    public boolean isElasticsearchParamsEnabled() {
+        return elasticsearchParamsEnabled;
+    }
+
+    public boolean isElasticsearchBodyAndParamsEnabled() {
+        return elasticsearchBodyAndParamsEnabled;
+    }
+
+    public boolean isSparkTaskHistogramEnabled() {
+        return sparkTaskHistogramEnabled;
+    }
+
+    public boolean useSparkAppNameAsService() {
+        return sparkAppNameAsService;
+    }
+
+    public boolean isJaxRsExceptionAsErrorEnabled() {
+        return jaxRsExceptionAsErrorsEnabled;
+    }
+
+    public boolean isAxisPromoteResourceName() {
+        return axisPromoteResourceName;
+    }
+
+    public boolean isWebsocketMessagesInheritSampling() {
+        return websocketMessagesInheritSampling;
+    }
+
+    public boolean isWebsocketMessagesSeparateTraces() {
+        return websocketMessagesSeparateTraces;
+    }
+
+    public boolean isWebsocketTagSessionId() {
+        return websocketTagSessionId;
+    }
+
+    public boolean isDataJobsEnabled() {
+        return instrumenterConfig.isDataJobsEnabled();
+    }
+
+    public boolean isDataJobsOpenLineageEnabled() {
+        return dataJobsOpenLineageEnabled;
+    }
+
+    public boolean isDataJobsOpenLineageTimeoutEnabled() {
+        return dataJobsOpenLineageTimeoutEnabled;
+    }
+
+    public boolean isDataJobsParseSparkPlanEnabled() {
+        return dataJobsParseSparkPlanEnabled;
+    }
+
+    public boolean isDataJobsExperimentalFeaturesEnabled() {
+        return dataJobsExperimentalFeaturesEnabled;
+    }
+
+    public boolean isApmTracingEnabled() {
+        return apmTracingEnabled;
+    }
+
+    public boolean isJdkSocketEnabled() {
+        return jdkSocketEnabled;
+    }
+
+    public boolean isSpanBuilderReuseEnabled() {
+        return spanBuilderReuseEnabled;
+    }
+
+    public int getTagNameUtf8CacheSize() {
+        return tagNameUtf8CacheSize;
+    }
+
+    public int getTagValueUtf8CacheSize() {
+        return tagValueUtf8CacheSize;
+    }
 
-      tracePropagationStylesToExtract =
-          extract.isEmpty() ? DEFAULT_TRACE_PROPAGATION_STYLE : extract;
-
-      tracePropagationStylesToInject = inject.isEmpty() ? DEFAULT_TRACE_PROPAGATION_STYLE : inject;
-
-      traceBaggageMaxItems =
-          nonNegativeBaggageLimit(
-              TRACE_BAGGAGE_MAX_ITEMS,
-              configProvider.getInteger(TRACE_BAGGAGE_MAX_ITEMS, DEFAULT_TRACE_BAGGAGE_MAX_ITEMS));
-      traceBaggageMaxBytes =
-          nonNegativeBaggageLimit(
-              TRACE_BAGGAGE_MAX_BYTES,
-              configProvider.getInteger(TRACE_BAGGAGE_MAX_BYTES, DEFAULT_TRACE_BAGGAGE_MAX_BYTES));
-
-      // These setting are here for backwards compatibility until they can be removed in a major
-      // release of the tracer
-      propagationStylesToExtract =
-          deprecatedExtract.isEmpty() ? DEFAULT_PROPAGATION_STYLE : deprecatedExtract;
-      propagationStylesToInject =
-          deprecatedInject.isEmpty() ? DEFAULT_PROPAGATION_STYLE : deprecatedInject;
-    }
-
-    tracePropagationExtractFirst =
-        configProvider.getBoolean(
-            TRACE_PROPAGATION_EXTRACT_FIRST, DEFAULT_TRACE_PROPAGATION_EXTRACT_FIRST);
-    traceOrgGuardEnabled = configProvider.getBoolean(TRACE_ORG_GUARD_ENABLED, false);
-    traceOrgGuardStrict = configProvider.getBoolean(TRACE_ORG_GUARD_STRICT, false);
-    traceOrgGuardTrustedOpms =
-        configProvider.getSet(TRACE_ORG_GUARD_TRUSTED_OPMS, Collections.emptySet());
-    traceInferredProxyEnabled =
-        configProvider.getBoolean(TRACE_INFERRED_PROXY_SERVICES_ENABLED, false);
-
-    clockSyncPeriod = configProvider.getInteger(CLOCK_SYNC_PERIOD, DEFAULT_CLOCK_SYNC_PERIOD);
-
-    if (experimentalFeaturesEnabled.contains(
-        propertyNameToEnvironmentVariableName(LOGS_INJECTION))) {
-      logsInjectionEnabled =
-          configProvider.getBoolean(LOGS_INJECTION_ENABLED, false, LOGS_INJECTION);
-    } else {
-      logsInjectionEnabled =
-          configProvider.getBoolean(
-              LOGS_INJECTION_ENABLED, DEFAULT_LOGS_INJECTION_ENABLED, LOGS_INJECTION);
-    }
-    appLogsCollectionEnabled =
-        configProvider.getBoolean(APP_LOGS_COLLECTION_ENABLED, DEFAULT_APP_LOGS_COLLECTION_ENABLED);
-
-    dogStatsDNamedPipe = configProvider.getString(DOGSTATSD_NAMED_PIPE);
-
-    dogStatsDStartDelay =
-        configProvider.getInteger(
-            DOGSTATSD_START_DELAY, DEFAULT_DOGSTATSD_START_DELAY, JMX_FETCH_START_DELAY);
-
-    dogStatsDPort = configProvider.getInteger(DOGSTATSD_PORT, DEFAULT_DOGSTATSD_PORT);
-
-    statsDClientQueueSize = configProvider.getInteger(STATSD_CLIENT_QUEUE_SIZE);
-    statsDClientSocketBuffer = configProvider.getInteger(STATSD_CLIENT_SOCKET_BUFFER);
-    statsDClientSocketTimeout = configProvider.getInteger(STATSD_CLIENT_SOCKET_TIMEOUT);
-
-    logsOtelExporter = configProvider.getString(LOGS_OTEL_EXPORTER);
-
-    int otelInterval = configProvider.getInteger(LOGS_OTEL_INTERVAL, DEFAULT_LOGS_OTEL_INTERVAL);
-    if (otelInterval < 0) {
-      log.warn("Invalid OTel logs interval: {}. The value must be positive", otelInterval);
-      otelInterval = DEFAULT_LOGS_OTEL_INTERVAL;
-    }
-    logsOtelInterval = otelInterval;
-
-    int otelTimeout = configProvider.getInteger(LOGS_OTEL_TIMEOUT, DEFAULT_LOGS_OTEL_TIMEOUT);
-    if (otelTimeout < 0) {
-      log.warn("Invalid OTel logs timeout: {}. The value must be positive", otelTimeout);
-      otelTimeout = DEFAULT_LOGS_OTEL_TIMEOUT;
-    }
-    logsOtelTimeout = otelTimeout;
-
-    int otelQueueSize =
-        configProvider.getInteger(LOGS_OTEL_QUEUE_SIZE, DEFAULT_LOGS_OTEL_QUEUE_SIZE);
-    if (otelQueueSize <= 0) {
-      log.warn("Invalid OTel logs queue size: {}. The value must be positive", otelQueueSize);
-      otelQueueSize = DEFAULT_LOGS_OTEL_QUEUE_SIZE;
-    }
-    logsOtelQueueSize = otelQueueSize;
-
-    int otelBatchSize =
-        configProvider.getInteger(LOGS_OTEL_BATCH_SIZE, DEFAULT_LOGS_OTEL_BATCH_SIZE);
-    if (otelBatchSize <= 0) {
-      log.warn("Invalid OTel logs batch size: {}. The value must be positive", otelBatchSize);
-      otelBatchSize = DEFAULT_LOGS_OTEL_BATCH_SIZE;
-    }
-    logsOtelBatchSize = otelBatchSize;
-
-    // keep OTLP default timeout below the overall export timeout
-    int defaultOtlpLogsTimeout = Math.min(logsOtelTimeout, DEFAULT_LOGS_OTEL_TIMEOUT);
-    int otlpTimeout = configProvider.getInteger(OTLP_LOGS_TIMEOUT, defaultOtlpLogsTimeout);
-    if (otlpTimeout < 0) {
-      log.warn("Invalid OTLP logs timeout: {}. The value must be positive", otlpTimeout);
-      otlpTimeout = defaultOtlpLogsTimeout;
-    }
-    otlpLogsTimeout = otlpTimeout;
-
-    otlpLogsHeaders = configProvider.getMergedMap(OTLP_LOGS_HEADERS, '=');
-    otlpLogsProtocol =
-        configProvider.getEnum(
-            OTLP_LOGS_PROTOCOL, OtlpConfig.Protocol.class, OtlpConfig.Protocol.HTTP_PROTOBUF);
-    otlpLogsCompression =
-        configProvider.getEnum(
-            OTLP_LOGS_COMPRESSION, OtlpConfig.Compression.class, OtlpConfig.Compression.NONE);
-
-    String otlpLogsEndpointFromEnvironment = configProvider.getString(OTLP_LOGS_ENDPOINT);
-    if (otlpLogsEndpointFromEnvironment == null) {
-      if (otlpLogsProtocol == OtlpConfig.Protocol.GRPC) {
-        otlpLogsEndpointFromEnvironment = "http://" + agentHost + ':' + DEFAULT_OTLP_GRPC_PORT;
-      } else {
-        otlpLogsEndpointFromEnvironment =
-            "http://"
-                + agentHost
-                + ':'
-                + DEFAULT_OTLP_HTTP_PORT
-                + '/'
-                + DEFAULT_OTLP_HTTP_LOGS_ENDPOINT;
-      }
-    }
-    otlpLogsEndpoint = otlpLogsEndpointFromEnvironment;
-
-    metricsOtelExporter = configProvider.getString(METRICS_OTEL_EXPORTER);
-
-    int cardinalityLimit =
-        configProvider.getInteger(
-            METRICS_OTEL_CARDINALITY_LIMIT, DEFAULT_METRICS_OTEL_CARDINALITY_LIMIT);
-    if (cardinalityLimit < 0) {
-      log.warn(
-          "Invalid OTel metrics cardinality limit: {}. The value must be positive",
-          cardinalityLimit);
-      cardinalityLimit = DEFAULT_METRICS_OTEL_CARDINALITY_LIMIT;
-    }
-    metricsOtelCardinalityLimit = cardinalityLimit;
-
-    otelInterval = configProvider.getInteger(METRICS_OTEL_INTERVAL, DEFAULT_METRICS_OTEL_INTERVAL);
-    if (otelInterval < 0) {
-      log.warn("Invalid OTel metrics interval: {}. The value must be positive", otelInterval);
-      otelInterval = DEFAULT_METRICS_OTEL_INTERVAL;
-    }
-    metricsOtelInterval = otelInterval;
-
-    otelTimeout = configProvider.getInteger(METRICS_OTEL_TIMEOUT, DEFAULT_METRICS_OTEL_TIMEOUT);
-    if (otelTimeout < 0) {
-      log.warn("Invalid OTel metrics timeout: {}. The value must be positive", otelTimeout);
-      otelTimeout = DEFAULT_METRICS_OTEL_TIMEOUT;
-    }
-    metricsOtelTimeout = otelTimeout;
-
-    metricsOtelExperimentalEnabled =
-        configProvider.getBoolean(
-            METRICS_OTEL_EXPERIMENTAL_ENABLED, DEFAULT_METRICS_OTEL_EXPERIMENTAL_ENABLED);
-
-    // keep OTLP default timeout below the overall export timeout
-    int defaultOtlpMetricsTimeout = Math.min(metricsOtelTimeout, DEFAULT_METRICS_OTEL_TIMEOUT);
-    otlpTimeout = configProvider.getInteger(OTLP_METRICS_TIMEOUT, defaultOtlpMetricsTimeout);
-    if (otlpTimeout < 0) {
-      log.warn("Invalid OTLP metrics timeout: {}. The value must be positive", otlpTimeout);
-      otlpTimeout = defaultOtlpMetricsTimeout;
-    }
-    otlpMetricsTimeout = otlpTimeout;
-
-    otlpMetricsHeaders = configProvider.getMergedMap(OTLP_METRICS_HEADERS, '=');
-    otlpMetricsProtocol =
-        configProvider.getEnum(
-            OTLP_METRICS_PROTOCOL, OtlpConfig.Protocol.class, OtlpConfig.Protocol.HTTP_PROTOBUF);
-    otlpMetricsCompression =
-        configProvider.getEnum(
-            OTLP_METRICS_COMPRESSION, OtlpConfig.Compression.class, OtlpConfig.Compression.NONE);
-
-    String otlpMetricsEndpointFromEnvironment = configProvider.getString(OTLP_METRICS_ENDPOINT);
-    if (otlpMetricsEndpointFromEnvironment == null) {
-      if (otlpMetricsProtocol == OtlpConfig.Protocol.GRPC) {
-        otlpMetricsEndpointFromEnvironment = "http://" + agentHost + ':' + DEFAULT_OTLP_GRPC_PORT;
-      } else {
-        otlpMetricsEndpointFromEnvironment =
-            "http://"
-                + agentHost
-                + ':'
-                + DEFAULT_OTLP_HTTP_PORT
-                + '/'
-                + DEFAULT_OTLP_HTTP_METRICS_ENDPOINT;
-      }
-    }
-    otlpMetricsEndpoint = otlpMetricsEndpointFromEnvironment;
-
-    otlpMetricsTemporalityPreference =
-        configProvider.getEnum(
-            OTLP_METRICS_TEMPORALITY_PREFERENCE,
-            OtlpConfig.Temporality.class,
-            OtlpConfig.Temporality.DELTA);
-
-    traceOtelSemanticsEnabled = configProvider.getBoolean(TRACE_OTEL_SEMANTICS_ENABLED, false);
-    // Tri-state default: when unset, SDK-computed OTLP span metrics are emitted iff OTLP trace
-    // export and OTLP metrics export are both enabled.
-    otelTracesSpanMetricsEnabled =
-        configProvider.getBoolean(
-            OTEL_TRACES_SPAN_METRICS_ENABLED,
-            isTraceOtlpExporterEnabled()
-                && isMetricsOtelEnabled()
-                && isMetricsOtlpExporterEnabled());
-
-    otlpTimeout = configProvider.getInteger(OTLP_TRACES_TIMEOUT, DEFAULT_OTLP_TRACES_TIMEOUT);
-    if (otlpTimeout < 0) {
-      log.warn("Invalid OTLP traces timeout: {}. The value must be positive", otlpTimeout);
-      otlpTimeout = DEFAULT_OTLP_TRACES_TIMEOUT;
-    }
-    otlpTracesTimeout = otlpTimeout;
-
-    otlpTracesHeaders = configProvider.getMergedMap(OTLP_TRACES_HEADERS, '=');
-    otlpTracesProtocol =
-        configProvider.getEnum(
-            OTLP_TRACES_PROTOCOL, OtlpConfig.Protocol.class, OtlpConfig.Protocol.HTTP_PROTOBUF);
-    otlpTracesCompression =
-        configProvider.getEnum(
-            OTLP_TRACES_COMPRESSION, OtlpConfig.Compression.class, OtlpConfig.Compression.NONE);
-
-    String otlpTracesEndpointFromEnvironment = configProvider.getString(OTLP_TRACES_ENDPOINT);
-    if (otlpTracesEndpointFromEnvironment == null) {
-      if (otlpTracesProtocol == OtlpConfig.Protocol.GRPC) {
-        otlpTracesEndpointFromEnvironment = "http://" + agentHost + ':' + DEFAULT_OTLP_GRPC_PORT;
-      } else {
-        otlpTracesEndpointFromEnvironment =
-            "http://"
-                + agentHost
-                + ':'
-                + DEFAULT_OTLP_HTTP_PORT
-                + '/'
-                + DEFAULT_OTLP_HTTP_TRACES_ENDPOINT;
-      }
-    }
-    otlpTracesEndpoint = otlpTracesEndpointFromEnvironment;
-
-    // Runtime metrics are disabled if Otel metrics are enabled and the metrics exporter is none
-    runtimeMetricsEnabled = configProvider.getBoolean(RUNTIME_METRICS_ENABLED, true);
-
-    jmxFetchEnabled =
-        runtimeMetricsEnabled
-            && configProvider.getBoolean(JMX_FETCH_ENABLED, DEFAULT_JMX_FETCH_ENABLED);
-    jmxFetchConfigDir = configProvider.getString(JMX_FETCH_CONFIG_DIR);
-    jmxFetchConfigs = tryMakeImmutableList(configProvider.getList(JMX_FETCH_CONFIG));
-    jmxFetchMetricsConfigs =
-        tryMakeImmutableList(configProvider.getList(JMX_FETCH_METRICS_CONFIGS));
-    jmxFetchCheckPeriod = configProvider.getInteger(JMX_FETCH_CHECK_PERIOD);
-    jmxFetchInitialRefreshBeansPeriod =
-        configProvider.getInteger(JMX_FETCH_INITIAL_REFRESH_BEANS_PERIOD);
-    jmxFetchRefreshBeansPeriod = configProvider.getInteger(JMX_FETCH_REFRESH_BEANS_PERIOD);
-
-    jmxFetchStatsdPort = configProvider.getInteger(JMX_FETCH_STATSD_PORT, DOGSTATSD_PORT);
-    jmxFetchStatsdHost =
-        configProvider.getString(
-            JMX_FETCH_STATSD_HOST,
-            // default to agent host if an explicit port has been set
-            null != jmxFetchStatsdPort && jmxFetchStatsdPort > 0 ? agentHost : null,
-            DOGSTATSD_HOST);
-
-    jmxFetchMultipleRuntimeServicesEnabled =
-        configProvider.getBoolean(
-            JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_ENABLED,
-            DEFAULT_JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_ENABLED);
-    jmxFetchMultipleRuntimeServicesLimit =
-        configProvider.getInteger(
-            JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_LIMIT,
-            DEFAULT_JMX_FETCH_MULTIPLE_RUNTIME_SERVICES_LIMIT);
-
-    // Writer.Builder createMonitor will use the values of the JMX fetch & agent to fill-in defaults
-    healthMetricsEnabled =
-        runtimeMetricsEnabled
-            && configProvider.getBoolean(HEALTH_METRICS_ENABLED, DEFAULT_HEALTH_METRICS_ENABLED);
-    healthMetricsStatsdHost = configProvider.getString(HEALTH_METRICS_STATSD_HOST);
-    healthMetricsStatsdPort = configProvider.getInteger(HEALTH_METRICS_STATSD_PORT);
-    perfMetricsEnabled =
-        runtimeMetricsEnabled
-            && configProvider.getBoolean(PERF_METRICS_ENABLED, DEFAULT_PERF_METRICS_ENABLED);
-
-    tracerMetricsEnabled =
-        configProvider.getBoolean(TRACE_STATS_COMPUTATION_ENABLED, true, TRACER_METRICS_ENABLED);
-    tracerMetricsIgnoreAgentVersion =
-        configProvider.getBoolean(TRACE_STATS_COMPUTATION_IGNORE_AGENT_VERSION, false);
-    tracerMetricsBufferingEnabled =
-        configProvider.getBoolean(TRACER_METRICS_BUFFERING_ENABLED, false);
-    // Internal, test-only override of the stats flush interval. Read directly from the
-    // underscore-prefixed env var so it bypasses config-inversion validation and telemetry.
-    int statsInterval = DEFAULT_TRACE_STATS_INTERVAL;
-    String statsIntervalOverride = ConfigHelper.env("_DD_TRACE_STATS_INTERVAL");
-    if (statsIntervalOverride != null) {
-      try {
-        statsInterval = Integer.parseInt(statsIntervalOverride);
-      } catch (NumberFormatException ignored) {
-        // fall back to the default
-      }
-    }
-    traceStatsInterval = statsInterval;
-    // The metrics inbox is an MpscArrayQueue<SpanSnapshot>; each saturated slot holds one
-    // ~120 B SpanSnapshot. The historical default TRACER_METRICS_MAX_PENDING=2048 (logical) *
-    // LEGACY_BATCH_SIZE=64 = 131072 slots was sized for the prior conflating-Batch model where
-    // slot memory was only realized under burst; with one snapshot per slot, the worst-case
-    // in-flight footprint is ~15 MB. At Xmx <= ~128 MB the G1 survivor region is too small to
-    // absorb that footprint when the aggregator stalls -- observed catastrophically at Xmx64m
-    // petclinic where SpanSnapshots overflow young gen and trigger To-space Exhausted -> Full
-    // GC storms (0 r/s in the worst case).
-    //
-    // Cut the default accordingly:
-    //   - normal heap: 128 logical * 64 = 8192 slots, ~1 MB worst-case in-flight. ~0.8 s of
-    //     buffer at 10K spans/s, well above typical GC pause windows.
-    //   - tight heap (Xmx < 128 MB): 64 logical * 64 = 4096 slots, ~500 KB worst case.
-    //
-    // Customers who explicitly configured TRACER_METRICS_MAX_PENDING keep their value (the
-    // LEGACY_BATCH_SIZE multiplier still applies to it) -- only the implicit default shrinks.
-    final boolean tightHeap = Runtime.getRuntime().maxMemory() < 128L * 1024 * 1024;
-    final int defaultMaxAggregates = tightHeap ? 256 : 2048;
-    final int defaultMaxPending = tightHeap ? 64 : 128;
-
-    tracerMetricsMaxAggregates =
-        configProvider.getInteger(
-            TRACE_STATS_CARDINALITY_LIMIT, defaultMaxAggregates, TRACER_METRICS_MAX_AGGREGATES);
-    /*
-     * TRACER_METRICS_MAX_PENDING historically counted conflating Batch slots (~64 spans per batch
-     * via Batch.MAX_BATCH_SIZE). The inbox now holds 1 SpanSnapshot per metrics-eligible span, so
-     * we multiply the configured value by the legacy batch size to preserve the effective
-     * span-throughput capacity for any existing customer override (e.g. a configured 4096 still
-     * means "~262144 spans before drops", same as before).
-     *
-     * Long-promote the multiplication and clamp to MAX_SAFE_ARRAY_SIZE so an absurd customer
-     * override (>= ~33M) can't silently wrap to a negative int. MAX_SAFE_ARRAY_SIZE sits a few
-     * bytes below Integer.MAX_VALUE because the JVM reserves header slack on array allocations;
-     * see java.util.ArraysSupport.SOFT_MAX_ARRAY_LENGTH for the same convention.
+    public int getStackTraceLengthLimit() {
+        return stackTraceLengthLimit;
+    }
+
+    public boolean isSqsInjectDatadogAttributeEnabled() {
+        return sqsInjectDatadogAttributeEnabled;
+    }
+
+    public boolean isSnsInjectDatadogAttributeEnabled() {
+        return snsInjectDatadogAttributeEnabled;
+    }
+
+    public boolean isEventbridgeInjectDatadogAttributeEnabled() {
+        return eventbridgeInjectDatadogAttributeEnabled;
+    }
+
+    public boolean isSfnInjectDatadogAttributeEnabled() {
+        return sfnInjectDatadogAttributeEnabled;
+    }
+
+    /**
+     * @return A map of tags to be applied only to the local application root span.
      */
-    long requestedMaxPending =
-        (long) configProvider.getInteger(TRACER_METRICS_MAX_PENDING, defaultMaxPending)
-            * LEGACY_BATCH_SIZE;
-    tracerMetricsMaxPending = (int) Math.min(requestedMaxPending, MAX_SAFE_ARRAY_SIZE);
-    reportHostName =
-        configProvider.getBoolean(TRACE_REPORT_HOSTNAME, DEFAULT_TRACE_REPORT_HOSTNAME);
-
-    ProtocolVersion protocol =
-        ProtocolVersion.fromConfigValue(
-            configProvider.getString(
-                TRACE_AGENT_PROTOCOL_VERSION, DEFAULT_TRACE_AGENT_PROTOCOL_VERSION));
-
-    // Check if we need to fall back to legacy flag of `0.5` protocol.
-    if (protocol != ProtocolVersion.V1_0
-        && configProvider.getBoolean(ENABLE_TRACE_AGENT_V05, false)) {
-      protocol = ProtocolVersion.V0_5;
-    }
-
-    protocolVersion = protocol;
-
-    traceAnalyticsEnabled =
-        configProvider.getBoolean(TRACE_ANALYTICS_ENABLED, DEFAULT_TRACE_ANALYTICS_ENABLED);
-
-    String traceClientIpHeader = configProvider.getString(TRACE_CLIENT_IP_HEADER);
-    if (traceClientIpHeader == null) {
-      traceClientIpHeader = configProvider.getString(APPSEC_IP_ADDR_HEADER);
-    }
-    if (traceClientIpHeader != null) {
-      traceClientIpHeader = traceClientIpHeader.toLowerCase(Locale.ROOT);
-    }
-    this.traceClientIpHeader = traceClientIpHeader;
-
-    traceClientIpResolverEnabled =
-        configProvider.getBoolean(TRACE_CLIENT_IP_RESOLVER_ENABLED, true);
-
-    traceGitMetadataEnabled = configProvider.getBoolean(TRACE_GIT_METADATA_ENABLED, true);
-
-    traceSamplingServiceRules = configProvider.getMergedMap(TRACE_SAMPLING_SERVICE_RULES);
-    traceSamplingOperationRules = configProvider.getMergedMap(TRACE_SAMPLING_OPERATION_RULES);
-    traceSamplingRules = configProvider.getString(TRACE_SAMPLING_RULES);
-    traceSampleRate = configProvider.getDouble(TRACE_SAMPLE_RATE);
-    traceRateLimit = configProvider.getInteger(TRACE_RATE_LIMIT, DEFAULT_TRACE_RATE_LIMIT);
-    spanSamplingRules = configProvider.getString(SPAN_SAMPLING_RULES);
-    spanSamplingRulesFile = configProvider.getString(SPAN_SAMPLING_RULES_FILE);
-
-    // For the native image 'instrumenterConfig.isProfilingEnabled()' value will be 'baked-in' based
-    // on whether
-    // the profiler was enabled at build time or not.
-    // Otherwise just do the standard config lookup by key.
-    // An extra step is needed to properly handle the 'auto' value for profiling enablement via SSI.
-    String value =
-        configProvider.getString(
-            ProfilingConfig.PROFILING_ENABLED,
-            String.valueOf(instrumenterConfig.isProfilingEnabled()));
-    // Run a validator that will emit a warning if the value is not a valid ProfilingEnablement
-    // We don't want it to run in each call to ProfilingEnablement.of(value) not to flood the logs
-    ProfilingEnablement.validate(value);
-    profilingEnabled = ProfilingEnablement.of(value);
-    profilingAgentless =
-        configProvider.getBoolean(PROFILING_AGENTLESS, PROFILING_AGENTLESS_DEFAULT);
-    isDatadogProfilerSafeAndConfigured =
-        !isDatadogProfilerEnablementOverridden()
-            && configProvider.getBoolean(
-                PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
-            && !(Platform.isNativeImageBuilder() || Platform.isNativeImage());
-    profilingUrl = configProvider.getString(PROFILING_URL);
-
-    if (tmpApiKey == null) {
-      final String oldProfilingApiKeyFile = configProvider.getString(PROFILING_API_KEY_FILE_OLD);
-      tmpApiKey = getEnv(propertyNameToEnvironmentVariableName(PROFILING_API_KEY_OLD));
-      if (oldProfilingApiKeyFile != null) {
-        try {
-          tmpApiKey =
-              new String(
-                      Files.readAllBytes(Paths.get(oldProfilingApiKeyFile)), StandardCharsets.UTF_8)
-                  .trim();
-        } catch (final IOException e) {
-          log.error("Cannot read API key from file {}, skipping", oldProfilingApiKeyFile, e);
+    public TagMap getLocalRootSpanTags() {
+        final Map<String, String> runtimeTags = getRuntimeTags();
+
+        final TagMap result = TagMap.fromMap(runtimeTags);
+        result.put(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE);
+        result.put(SCHEMA_VERSION_TAG_KEY, SpanNaming.instance().version());
+        result.put(DDTags.PROFILING_ENABLED, isProfilingEnabled() ? 1 : 0);
+        // The _dd.apm.enabled:0 billing marker is intentionally NOT set here. When APM tracing is
+        // disabled it is stamped on every span of each exported chunk (see CoreTracer.write), so that
+        // chunks flushed without their local root span (e.g. a late child span) still opt out of APM
+        // host billing.
+
+        if (reportHostName) {
+            final String hostName = getHostName();
+            if (null != hostName && !hostName.isEmpty()) {
+                result.put(INTERNAL_HOST_NAME, hostName);
+            }
         }
-      }
+
+        if (azureAppServices) {
+            result.putAll(getAzureAppServicesTags());
+        }
+
+        result.putAll(getProcessIdTag());
+
+        return result.freeze();
     }
-    if (tmpApiKey == null) {
-      final String veryOldProfilingApiKeyFile =
-          configProvider.getString(PROFILING_API_KEY_FILE_VERY_OLD);
-      tmpApiKey = getEnv(propertyNameToEnvironmentVariableName(PROFILING_API_KEY_VERY_OLD));
-      if (veryOldProfilingApiKeyFile != null) {
-        try {
-          tmpApiKey =
-              new String(
-                      Files.readAllBytes(Paths.get(veryOldProfilingApiKeyFile)),
-                      StandardCharsets.UTF_8)
-                  .trim();
-        } catch (final IOException e) {
-          log.error("Cannot read API key from file {}, skipping", veryOldProfilingApiKeyFile, e);
+
+    public WellKnownTags getWellKnownTags() {
+        return new WellKnownTags(
+                getRuntimeId(),
+                reportHostName ? getHostName() : "",
+                getEnv(),
+                serviceName,
+                getVersion(),
+                LANGUAGE_TAG_VALUE);
+    }
+
+    public CiVisibilityWellKnownTags getCiVisibilityWellKnownTags() {
+        return new CiVisibilityWellKnownTags(
+                getRuntimeId(),
+                getEnv(),
+                LANGUAGE_TAG_VALUE,
+                SystemProperties.get("java.runtime.name"),
+                SystemProperties.get("java.version"),
+                SystemProperties.get("java.vendor"),
+                SystemProperties.get("os.arch"),
+                SystemProperties.get("os.name"),
+                SystemProperties.get("os.version"),
+                isServiceNameSetByUser() ? "true" : "false");
+    }
+
+    public String getPrimaryTag() {
+        return primaryTag;
+    }
+
+    public Set<String> getMetricsIgnoredResources() {
+        return tryMakeImmutableSet(configProvider.getList(TRACER_METRICS_IGNORED_RESOURCES));
+    }
+
+    public Set<String> getTraceStatsAdditionalTags() {
+        return traceStatsAdditionalTags;
+    }
+
+    public String getEnv() {
+        // intentionally not thread safe
+        if (env == null) {
+            env = getMergedSpanTags().get("env");
+            if (env == null) {
+                env = "";
+            }
         }
-      }
-    }
-
-    profilingTags = configProvider.getMergedMap(PROFILING_TAGS);
-    int profilingStartDelayValue =
-        configProvider.getInteger(PROFILING_START_DELAY, PROFILING_START_DELAY_DEFAULT);
-    boolean profilingStartForceFirstValue =
-        configProvider.getBoolean(PROFILING_START_FORCE_FIRST, PROFILING_START_FORCE_FIRST_DEFAULT);
-    if (profilingEnabled == ProfilingEnablement.AUTO
-        || profilingEnabled == ProfilingEnablement.INJECTED) {
-      if (profilingStartDelayValue != PROFILING_START_DELAY_DEFAULT) {
-        log.info(
-            "Profiling start delay is set to {}s, but profiling enablement is set to auto. Using the default delay of {}s.",
-            profilingStartDelayValue,
-            PROFILING_START_DELAY_DEFAULT);
-      }
-      if (profilingStartForceFirstValue != PROFILING_START_FORCE_FIRST_DEFAULT) {
-        log.info(
-            "Profiling is requested to start immediately, but profiling enablement is set to auto. Profiling will be started with delay of {}s.",
-            PROFILING_START_DELAY_DEFAULT);
-      }
-      profilingStartDelayValue = PROFILING_START_DELAY_DEFAULT;
-      profilingStartForceFirstValue = PROFILING_START_FORCE_FIRST_DEFAULT;
-    }
-    profilingStartDelay = profilingStartDelayValue;
-    profilingStartForceFirst = profilingStartForceFirstValue;
-    profilingUploadPeriod =
-        configProvider.getInteger(PROFILING_UPLOAD_PERIOD, PROFILING_UPLOAD_PERIOD_DEFAULT);
-    profilingTemplateOverrideFile = configProvider.getString(PROFILING_TEMPLATE_OVERRIDE_FILE);
-    profilingUploadTimeout =
-        configProvider.getInteger(PROFILING_UPLOAD_TIMEOUT, PROFILING_UPLOAD_TIMEOUT_DEFAULT);
-    profilingUploadCompression =
-        configProvider.getString(
-            PROFILING_DEBUG_UPLOAD_COMPRESSION,
-            PROFILING_DEBUG_UPLOAD_COMPRESSION_DEFAULT,
-            PROFILING_UPLOAD_COMPRESSION);
-    profilingProxyHost = configProvider.getString(PROFILING_PROXY_HOST);
-    profilingProxyPort =
-        configProvider.getInteger(PROFILING_PROXY_PORT, PROFILING_PROXY_PORT_DEFAULT);
-    profilingProxyUsername = configProvider.getString(PROFILING_PROXY_USERNAME);
-    profilingProxyPassword = configProvider.getString(PROFILING_PROXY_PASSWORD);
-
-    profilingExceptionSampleLimit =
-        configProvider.getInteger(
-            PROFILING_EXCEPTION_SAMPLE_LIMIT, PROFILING_EXCEPTION_SAMPLE_LIMIT_DEFAULT);
-    profilingBackPressureSampleLimit =
-        configProvider.getInteger(
-            PROFILING_EXCEPTION_SAMPLE_LIMIT, PROFILING_BACKPRESSURE_SAMPLE_LIMIT_DEFAULT);
-    profilingBackPressureEnabled =
-        configProvider.getBoolean(
-            PROFILING_BACKPRESSURE_SAMPLING_ENABLED,
-            PROFILING_BACKPRESSURE_SAMPLING_ENABLED_DEFAULT);
-    profilingDirectAllocationSampleLimit =
-        configProvider.getInteger(
-            PROFILING_DIRECT_ALLOCATION_SAMPLE_LIMIT,
-            PROFILING_DIRECT_ALLOCATION_SAMPLE_LIMIT_DEFAULT);
-    profilingExceptionHistogramTopItems =
-        configProvider.getInteger(
-            PROFILING_EXCEPTION_HISTOGRAM_TOP_ITEMS,
-            PROFILING_EXCEPTION_HISTOGRAM_TOP_ITEMS_DEFAULT);
-    profilingExceptionHistogramMaxCollectionSize =
-        configProvider.getInteger(
-            PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE,
-            PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE_DEFAULT);
-
-    profilingExcludeAgentThreads = configProvider.getBoolean(PROFILING_EXCLUDE_AGENT_THREADS, true);
-
-    profilingRecordExceptionMessage =
-        configProvider.getBoolean(
-            PROFILING_EXCEPTION_RECORD_MESSAGE, PROFILING_EXCEPTION_RECORD_MESSAGE_DEFAULT);
-
-    profilingUploadSummaryOn413Enabled =
-        configProvider.getBoolean(
-            PROFILING_UPLOAD_SUMMARY_ON_413, PROFILING_UPLOAD_SUMMARY_ON_413_DEFAULT);
-
-    crashTrackingAgentless =
-        configProvider.getBoolean(CRASH_TRACKING_AGENTLESS, CRASH_TRACKING_AGENTLESS_DEFAULT);
-    crashTrackingTags = configProvider.getMergedMap(CRASH_TRACKING_TAGS);
-    crashTrackingErrorsIntakeEnabled =
-        configProvider.getBoolean(
-            CRASH_TRACKING_ERRORS_INTAKE_ENABLED, CRASH_TRACKING_ERRORS_INTAKE_ENABLED_DEFAULT);
-    crashTrackingExtendedInfoEnabled =
-        configProvider.getBoolean(
-            CRASH_TRACKING_EXTENDED_INFO_ENABLED, CRASH_TRACKING_EXTENDED_INFO_ENABLED_DEFAULT);
-
-    float telemetryInterval =
-        configProvider.getFloat(TELEMETRY_HEARTBEAT_INTERVAL, DEFAULT_TELEMETRY_HEARTBEAT_INTERVAL);
-    if (telemetryInterval < 0.1 || telemetryInterval > 3600) {
-      log.warn(
-          "Invalid Telemetry heartbeat interval: {}. The value must be in range 0.1-3600",
-          telemetryInterval);
-      telemetryInterval = DEFAULT_TELEMETRY_HEARTBEAT_INTERVAL;
-    }
-    telemetryHeartbeatInterval = telemetryInterval;
-
-    telemetryExtendedHeartbeatInterval =
-        configProvider.getLong(
-            TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL, DEFAULT_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL);
-
-    telemetryInterval =
-        configProvider.getFloat(TELEMETRY_METRICS_INTERVAL, DEFAULT_TELEMETRY_METRICS_INTERVAL);
-    if (telemetryInterval < 0.1 || telemetryInterval > 3600) {
-      log.warn(
-          "Invalid Telemetry metrics interval: {}. The value must be in range 0.1-3600",
-          telemetryInterval);
-      telemetryInterval = DEFAULT_TELEMETRY_METRICS_INTERVAL;
-    }
-    telemetryMetricsInterval = telemetryInterval;
-
-    telemetryMetricsEnabled = configProvider.getBoolean(TELEMETRY_METRICS_ENABLED, true);
-
-    isTelemetryLogCollectionEnabled =
-        instrumenterConfig.isTelemetryEnabled()
-            && configProvider.getBoolean(
-                TELEMETRY_LOG_COLLECTION_ENABLED, DEFAULT_TELEMETRY_LOG_COLLECTION_ENABLED);
-
-    isTelemetryDependencyServiceEnabled =
-        configProvider.getBoolean(
-            TELEMETRY_DEPENDENCY_COLLECTION_ENABLED,
-            DEFAULT_TELEMETRY_DEPENDENCY_COLLECTION_ENABLED);
-    telemetryDependencyResolutionQueueSize =
-        configProvider.getInteger(
-            TELEMETRY_DEPENDENCY_RESOLUTION_QUEUE_SIZE,
-            DEFAULT_TELEMETRY_DEPENDENCY_RESOLUTION_QUEUE_SIZE);
-    clientIpEnabled = configProvider.getBoolean(CLIENT_IP_ENABLED, DEFAULT_CLIENT_IP_ENABLED);
-
-    appSecRulesFile = configProvider.getString(APPSEC_RULES_FILE, null);
-
-    appSecTraceRateLimit =
-        configProvider.getInteger(APPSEC_TRACE_RATE_LIMIT, DEFAULT_APPSEC_TRACE_RATE_LIMIT);
-
-    appSecWafMetrics = configProvider.getBoolean(APPSEC_WAF_METRICS, DEFAULT_APPSEC_WAF_METRICS);
-
-    appSecWafTimeout = configProvider.getInteger(APPSEC_WAF_TIMEOUT, DEFAULT_APPSEC_WAF_TIMEOUT);
-
-    // RFC-1113: reported verbatim in configuration telemetry; always emitted (empty when unset).
-    appSecAgenticOnboarding =
-        configProvider.getString(APPSEC_AGENTIC_ONBOARDING, DEFAULT_APPSEC_AGENTIC_ONBOARDING);
-
-    appSecObfuscationParameterKeyRegexp =
-        configProvider.getString(APPSEC_OBFUSCATION_PARAMETER_KEY_REGEXP, null);
-    appSecObfuscationParameterValueRegexp =
-        configProvider.getString(APPSEC_OBFUSCATION_PARAMETER_VALUE_REGEXP, null);
-
-    appSecHttpBlockedTemplateHtml =
-        configProvider.getString(APPSEC_HTTP_BLOCKED_TEMPLATE_HTML, null);
-    appSecHttpBlockedTemplateJson =
-        configProvider.getString(APPSEC_HTTP_BLOCKED_TEMPLATE_JSON, null);
-    appSecUserIdCollectionMode =
-        UserIdCollectionMode.fromString(
-            configProvider.getStringNotEmpty(APPSEC_AUTO_USER_INSTRUMENTATION_MODE, null),
-            configProvider.getStringNotEmpty(APPSEC_AUTOMATED_USER_EVENTS_TRACKING, null));
-    appSecScaEnabled = configProvider.getBoolean(APPSEC_SCA_ENABLED);
-    appSecScaMaxTrackedDependencies =
-        configProvider.getInteger(
-            APPSEC_SCA_MAX_TRACKED_DEPENDENCIES, DEFAULT_APPSEC_SCA_MAX_TRACKED_DEPENDENCIES);
-    appSecStackTraceEnabled =
-        configProvider.getBoolean(
-            APPSEC_STACK_TRACE_ENABLED,
-            DEFAULT_APPSEC_STACK_TRACE_ENABLED,
-            APPSEC_STACKTRACE_ENABLED_DEPRECATED);
-    appSecMaxStackTraces =
-        configProvider.getInteger(
-            APPSEC_MAX_STACK_TRACES,
-            DEFAULT_APPSEC_MAX_STACK_TRACES,
-            APPSEC_MAX_STACKTRACES_DEPRECATED);
-    appSecMaxStackTraceDepth =
-        configProvider.getInteger(
-            APPSEC_MAX_STACK_TRACE_DEPTH,
-            DEFAULT_APPSEC_MAX_STACK_TRACE_DEPTH,
-            APPSEC_MAX_STACKTRACE_DEPTH_DEPRECATED);
-    appSecBodyParsingSizeLimit =
-        configProvider.getInteger(
-            APPSEC_BODY_PARSING_SIZE_LIMIT, DEFAULT_APPSEC_BODY_PARSING_SIZE_LIMIT);
-    appSecMaxFileContentBytes =
-        configProvider.getInteger(
-            APPSEC_MAX_FILE_CONTENT_BYTES, DEFAULT_APPSEC_MAX_FILE_CONTENT_BYTES);
-    appSecMaxFileContentCount =
-        configProvider.getInteger(
-            APPSEC_MAX_FILE_CONTENT_COUNT, DEFAULT_APPSEC_MAX_FILE_CONTENT_COUNT);
-    apiSecurityEnabled =
-        configProvider.getBoolean(
-            API_SECURITY_ENABLED, DEFAULT_API_SECURITY_ENABLED, API_SECURITY_ENABLED_EXPERIMENTAL);
-    apiSecuritySampleDelay =
-        configProvider.getFloat(API_SECURITY_SAMPLE_DELAY, DEFAULT_API_SECURITY_SAMPLE_DELAY);
-    apiSecurityEndpointCollectionMessageLimit =
-        configProvider.getInteger(
-            API_SECURITY_ENDPOINT_COLLECTION_MESSAGE_LIMIT,
-            DEFAULT_API_SECURITY_ENDPOINT_COLLECTION_MESSAGE_LIMIT);
-    apiSecurityMaxDownstreamRequestBodyAnalysis =
-        configProvider.getInteger(
-            API_SECURITY_MAX_DOWNSTREAM_REQUEST_BODY_ANALYSIS,
-            DEFAULT_API_SECURITY_MAX_DOWNSTREAM_REQUEST_BODY_ANALYSIS);
-    apiSecurityDownstreamRequestBodyAnalysisSampleRate =
-        configProvider.getDouble(
-            API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE,
-            DEFAULT_API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE,
-            API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE,
-            API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE);
-
-    // Trace Resource Renaming (Endpoint Inference) configuration
-    // Default: enabled if AppSec is enabled, otherwise disabled
-    // Can be explicitly overridden by setting DD_TRACE_RESOURCE_RENAMING_ENABLED
-    Boolean traceResourceRenamingExplicit =
-        configProvider.getBoolean(TRACE_RESOURCE_RENAMING_ENABLED);
-    this.traceResourceRenamingEnabled =
-        traceResourceRenamingExplicit != null
-            ? traceResourceRenamingExplicit
-            : instrumenterConfig.getAppSecActivation() == ProductActivation.FULLY_ENABLED;
-
-    // No dedicated flag: kill switch is DD_PROFILING_ENABLED / DD_APPSEC_ENABLED.
-    this.otelThreadContextEnabled =
-        isDatadogProfilerSafeAndConfigured()
-            && (isProfilingEnabled()
-                || instrumenterConfig.getAppSecActivation() == ProductActivation.FULLY_ENABLED);
-
-    this.traceResourceRenamingAlwaysSimplifiedEndpoint =
-        configProvider.getBoolean(TRACE_RESOURCE_RENAMING_ALWAYS_SIMPLIFIED_ENDPOINT, false);
-
-    iastDebugEnabled = configProvider.getBoolean(IAST_DEBUG_ENABLED, DEFAULT_IAST_DEBUG_ENABLED);
-
-    iastContextMode =
-        configProvider.getEnum(IAST_CONTEXT_MODE, IastContext.Mode.class, IastContext.Mode.REQUEST);
-    iastDetectionMode =
-        configProvider.getEnum(
-            IAST_DETECTION_MODE, IastDetectionMode.class, IastDetectionMode.DEFAULT);
-    iastMaxConcurrentRequests = iastDetectionMode.getIastMaxConcurrentRequests(configProvider);
-    iastVulnerabilitiesPerRequest =
-        iastDetectionMode.getIastVulnerabilitiesPerRequest(configProvider);
-    iastRequestSampling = iastDetectionMode.getIastRequestSampling(configProvider);
-    iastDeduplicationEnabled = iastDetectionMode.isIastDeduplicationEnabled(configProvider);
-    iastWeakHashAlgorithms =
-        tryMakeImmutableSet(
-            configProvider.getSet(IAST_WEAK_HASH_ALGORITHMS, DEFAULT_IAST_WEAK_HASH_ALGORITHMS));
-    iastWeakCipherAlgorithms =
-        getPattern(
-            DEFAULT_IAST_WEAK_CIPHER_ALGORITHMS,
-            configProvider.getString(IAST_WEAK_CIPHER_ALGORITHMS));
-    iastTelemetryVerbosity =
-        configProvider.getEnum(IAST_TELEMETRY_VERBOSITY, Verbosity.class, Verbosity.INFORMATION);
-    iastRedactionEnabled =
-        configProvider.getBoolean(IAST_REDACTION_ENABLED, DEFAULT_IAST_REDACTION_ENABLED);
-    iastRedactionNamePattern =
-        configProvider.getString(IAST_REDACTION_NAME_PATTERN, DEFAULT_IAST_REDACTION_NAME_PATTERN);
-    iastRedactionValuePattern =
-        configProvider.getString(
-            IAST_REDACTION_VALUE_PATTERN, DEFAULT_IAST_REDACTION_VALUE_PATTERN);
-    iastTruncationMaxValueLength =
-        configProvider.getInteger(
-            IAST_TRUNCATION_MAX_VALUE_LENGTH, DEFAULT_IAST_TRUNCATION_MAX_VALUE_LENGTH);
-    iastMaxRangeCount = iastDetectionMode.getIastMaxRangeCount(configProvider);
-    iastStacktraceLeakSuppress =
-        configProvider.getBoolean(
-            IAST_STACK_TRACE_LEAK_SUPPRESS,
-            DEFAULT_IAST_STACKTRACE_LEAK_SUPPRESS,
-            IAST_STACKTRACE_LEAK_SUPPRESS_DEPRECATED);
-    iastHardcodedSecretEnabled =
-        configProvider.getBoolean(
-            IAST_HARDCODED_SECRET_ENABLED, DEFAULT_IAST_HARDCODED_SECRET_ENABLED);
-    iastAnonymousClassesEnabled =
-        configProvider.getBoolean(
-            IAST_ANONYMOUS_CLASSES_ENABLED, DEFAULT_IAST_ANONYMOUS_CLASSES_ENABLED);
-    iastSourceMappingEnabled = configProvider.getBoolean(IAST_SOURCE_MAPPING_ENABLED, false);
-    iastSourceMappingMaxSize = configProvider.getInteger(IAST_SOURCE_MAPPING_MAX_SIZE, 1000);
-    iastStackTraceEnabled =
-        configProvider.getBoolean(
-            IAST_STACK_TRACE_ENABLED,
-            DEFAULT_IAST_STACK_TRACE_ENABLED,
-            IAST_STACKTRACE_ENABLED_DEPRECATED);
-    iastExperimentalPropagationEnabled =
-        configProvider.getBoolean(IAST_EXPERIMENTAL_PROPAGATION_ENABLED, false);
-    iastSecurityControlsConfiguration =
-        configProvider.getString(IAST_SECURITY_CONTROLS_CONFIGURATION, null);
-    iastDbRowsToTaint =
-        configProvider.getInteger(IAST_DB_ROWS_TO_TAINT, DEFAULT_IAST_DB_ROWS_TO_TAINT);
-
-    llmObsAgentlessEnabled =
-        configProvider.getBoolean(LLMOBS_AGENTLESS_ENABLED, DEFAULT_LLM_OBS_AGENTLESS_ENABLED);
-    final String tempLlmObsMlApp = configProvider.getString(LLMOBS_ML_APP);
-    llmObsMlApp =
-        tempLlmObsMlApp == null || tempLlmObsMlApp.isEmpty() ? serviceName : tempLlmObsMlApp;
-    // Fall back to "sample everything" rather than clamping
-    final double configuredLlmObsSampleRate =
-        configProvider.getDouble(LLMOBS_SAMPLE_RATE, DEFAULT_LLM_OBS_SAMPLE_RATE);
-    if (configuredLlmObsSampleRate >= 0.0 && configuredLlmObsSampleRate <= 1.0) {
-      llmObsSampleRate = configuredLlmObsSampleRate;
-    } else {
-      log.warn(
-          "Invalid value {} for {}: expected a rate between 0.0 and 1.0, falling back to 1.0.",
-          configuredLlmObsSampleRate,
-          LLMOBS_SAMPLE_RATE);
-      llmObsSampleRate = 1.0;
-    }
-
-    final String llmObsAgentlessUrlStr = getFinalLLMObsUrl();
-    URI parsedLLMObsUri = null;
-    if (llmObsAgentlessUrlStr != null && !llmObsAgentlessUrlStr.isEmpty()) {
-      try {
-        parsedLLMObsUri = new URL(llmObsAgentlessUrlStr).toURI();
-      } catch (MalformedURLException | URISyntaxException ex) {
-        log.error(
-            "Cannot parse LLM Observability agentless URL '{}', skipping", llmObsAgentlessUrlStr);
-      }
-    }
-    if (parsedLLMObsUri != null) {
-      llmObsAgentlessUrl = llmObsAgentlessUrlStr;
-    } else {
-      llmObsAgentlessUrl = null;
-    }
-
-    ciVisibilityTraceSanitationEnabled =
-        configProvider.getBoolean(CIVISIBILITY_TRACE_SANITATION_ENABLED, true);
-
-    ciVisibilityAgentlessEnabled =
-        configProvider.getBoolean(
-            CIVISIBILITY_AGENTLESS_ENABLED, DEFAULT_CIVISIBILITY_AGENTLESS_ENABLED);
-
-    ciVisibilitySourceDataEnabled =
-        configProvider.getBoolean(
-            CIVISIBILITY_SOURCE_DATA_ENABLED, DEFAULT_CIVISIBILITY_SOURCE_DATA_ENABLED);
-
-    ciVisibilityBuildInstrumentationEnabled =
-        configProvider.getBoolean(
-            CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED,
-            DEFAULT_CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED);
-
-    final String ciVisibilityAgentlessUrlStr = configProvider.getString(CIVISIBILITY_AGENTLESS_URL);
-    ciVisibilityAgentlessUrl =
-        isValidUrl(ciVisibilityAgentlessUrlStr) ? ciVisibilityAgentlessUrlStr : null;
-
-    final String ciVisibilityIntakeAgentlessUrlStr =
-        configProvider.getString(CIVISIBILITY_INTAKE_AGENTLESS_URL);
-    ciVisibilityIntakeAgentlessUrl =
-        isValidUrl(ciVisibilityIntakeAgentlessUrlStr) ? ciVisibilityIntakeAgentlessUrlStr : null;
-
-    ciVisibilityAgentJarUri = configProvider.getString(CIVISIBILITY_AGENT_JAR_URI);
-    ciVisibilityAutoConfigurationEnabled =
-        configProvider.getBoolean(
-            CIVISIBILITY_AUTO_CONFIGURATION_ENABLED,
-            DEFAULT_CIVISIBILITY_AUTO_CONFIGURATION_ENABLED);
-    ciVisibilityAdditionalChildProcessJvmArgs =
-        configProvider.getString(CIVISIBILITY_ADDITIONAL_CHILD_PROCESS_JVM_ARGS);
-    ciVisibilityCompilerPluginAutoConfigurationEnabled =
-        configProvider.getBoolean(
-            CIVISIBILITY_COMPILER_PLUGIN_AUTO_CONFIGURATION_ENABLED,
-            DEFAULT_CIVISIBILITY_COMPILER_PLUGIN_AUTO_CONFIGURATION_ENABLED);
-    ciVisibilityGradleDependencyVerificationEnabled =
-        configProvider.getBoolean(
-            CIVISIBILITY_GRADLE_DEPENDENCY_VERIFICATION_ENABLED,
-            DEFAULT_CIVISIBILITY_GRADLE_DEPENDENCY_VERIFICATION_ENABLED);
-    ciVisibilityCodeCoverageEnabled =
-        configProvider.getBoolean(CIVISIBILITY_CODE_COVERAGE_ENABLED, true);
-    ciVisibilityCoverageLinesEnabled =
-        configProvider.getBoolean(CIVISIBILITY_CODE_COVERAGE_LINES_ENABLED);
-    ciVisibilityCodeCoverageReportDumpDir =
-        configProvider.getString(CIVISIBILITY_CODE_COVERAGE_REPORT_DUMP_DIR);
-    codeCoverageFlags = parseCodeCoverageFlags(configProvider.getList(CODE_COVERAGE_FLAGS));
-    ciVisibilityCompilerPluginVersion =
-        configProvider.getString(
-            CIVISIBILITY_COMPILER_PLUGIN_VERSION, DEFAULT_CIVISIBILITY_COMPILER_PLUGIN_VERSION);
-    ciVisibilityJacocoPluginVersion =
-        configProvider.getString(
-            CIVISIBILITY_JACOCO_PLUGIN_VERSION, DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_VERSION);
-    ciVisibilityJacocoPluginVersionProvided =
-        configProvider.getString(CIVISIBILITY_JACOCO_PLUGIN_VERSION) != null;
-    ciVisibilityCodeCoverageIncludes =
-        Arrays.asList(
-            COLON.split(configProvider.getString(CIVISIBILITY_CODE_COVERAGE_INCLUDES, ":")));
-    ciVisibilityCodeCoverageExcludes =
-        Arrays.asList(
-            COLON.split(
-                configProvider.getString(
-                    CIVISIBILITY_CODE_COVERAGE_EXCLUDES,
-                    DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_EXCLUDES)));
-    ciVisibilityCodeCoverageIncludedPackages =
-        convertJacocoExclusionFormatToPackagePrefixes(ciVisibilityCodeCoverageIncludes);
-    ciVisibilityCodeCoverageExcludedPackages =
-        convertJacocoExclusionFormatToPackagePrefixes(ciVisibilityCodeCoverageExcludes);
-    ciVisibilityJacocoGradleSourceSets =
-        configProvider.getList(CIVISIBILITY_GRADLE_SOURCE_SETS, Arrays.asList("main", "test"));
-    ciVisibilityCodeCoverageReportUploadEnabled =
-        configProvider.getBoolean(CIVISIBILITY_CODE_COVERAGE_REPORT_UPLOAD_ENABLED, true);
-    ciVisibilityDebugPort = configProvider.getInteger(CIVISIBILITY_DEBUG_PORT);
-    ciVisibilityGitClientEnabled = configProvider.getBoolean(CIVISIBILITY_GIT_CLIENT_ENABLED, true);
-    ciVisibilityGitUploadEnabled =
-        configProvider.getBoolean(
-            CIVISIBILITY_GIT_UPLOAD_ENABLED, DEFAULT_CIVISIBILITY_GIT_UPLOAD_ENABLED);
-    ciVisibilityGitUnshallowEnabled =
-        configProvider.getBoolean(
-            CIVISIBILITY_GIT_UNSHALLOW_ENABLED, DEFAULT_CIVISIBILITY_GIT_UNSHALLOW_ENABLED);
-    ciVisibilityGitUnshallowDefer =
-        configProvider.getBoolean(CIVISIBILITY_GIT_UNSHALLOW_DEFER, true);
-    ciVisibilityGitCommandTimeoutMillis =
-        configProvider.getLong(
-            CIVISIBILITY_GIT_COMMAND_TIMEOUT_MILLIS,
-            DEFAULT_CIVISIBILITY_GIT_COMMAND_TIMEOUT_MILLIS);
-    ciVisibilityBackendApiTimeoutMillis =
-        configProvider.getLong(
-            CIVISIBILITY_BACKEND_API_TIMEOUT_MILLIS,
-            DEFAULT_CIVISIBILITY_BACKEND_API_TIMEOUT_MILLIS);
-    ciVisibilityGitUploadTimeoutMillis =
-        configProvider.getLong(
-            CIVISIBILITY_GIT_UPLOAD_TIMEOUT_MILLIS, DEFAULT_CIVISIBILITY_GIT_UPLOAD_TIMEOUT_MILLIS);
-    ciVisibilityGitRemoteName =
-        configProvider.getString(
-            CIVISIBILITY_GIT_REMOTE_NAME, DEFAULT_CIVISIBILITY_GIT_REMOTE_NAME);
-    ciVisibilitySignalServerHost =
-        configProvider.getString(
-            CIVISIBILITY_SIGNAL_SERVER_HOST, DEFAULT_CIVISIBILITY_SIGNAL_SERVER_HOST);
-    ciVisibilitySignalServerPort =
-        configProvider.getInteger(
-            CIVISIBILITY_SIGNAL_SERVER_PORT, DEFAULT_CIVISIBILITY_SIGNAL_SERVER_PORT);
-    ciVisibilitySignalClientTimeoutMillis =
-        configProvider.getInteger(CIVISIBILITY_SIGNAL_CLIENT_TIMEOUT_MILLIS, 10_000);
-    ciVisibilityItrEnabled = configProvider.getBoolean(CIVISIBILITY_ITR_ENABLED, true);
-    ciVisibilityTestSkippingEnabled =
-        configProvider.getBoolean(CIVISIBILITY_TEST_SKIPPING_ENABLED, true);
-    ciVisibilityCiProviderIntegrationEnabled =
-        configProvider.getBoolean(CIVISIBILITY_CIPROVIDER_INTEGRATION_ENABLED, true);
-    ciVisibilityRepoIndexDuplicateKeyCheckEnabled =
-        configProvider.getBoolean(CIVISIBILITY_REPO_INDEX_DUPLICATE_KEY_CHECK_ENABLED, true);
-    ciVisibilityRepoIndexFollowSymlinks =
-        configProvider.getBoolean(CIVISIBILITY_REPO_INDEX_FOLLOW_SYMLINKS, false);
-    ciVisibilityExecutionSettingsCacheSize =
-        configProvider.getInteger(CIVISIBILITY_EXECUTION_SETTINGS_CACHE_SIZE, 16);
-    ciVisibilityJvmInfoCacheSize = configProvider.getInteger(CIVISIBILITY_JVM_INFO_CACHE_SIZE, 8);
-    ciVisibilityCoverageRootPackagesLimit =
-        configProvider.getInteger(CIVISIBILITY_CODE_COVERAGE_ROOT_PACKAGES_LIMIT, 50);
-    ciVisibilityInjectedTracerVersion =
-        configProvider.getString(CIVISIBILITY_INJECTED_TRACER_VERSION);
-    ciVisibilityResourceFolderNames =
-        configProvider.getList(
-            CIVISIBILITY_RESOURCE_FOLDER_NAMES, DEFAULT_CIVISIBILITY_RESOURCE_FOLDER_NAMES);
-    ciVisibilityFlakyRetryEnabled =
-        configProvider.getBoolean(CIVISIBILITY_FLAKY_RETRY_ENABLED, true);
-    ciVisibilityImpactedTestsDetectionEnabled =
-        configProvider.getBoolean(CIVISIBILITY_IMPACTED_TESTS_DETECTION_ENABLED, true);
-    ciVisibilityKnownTestsRequestEnabled =
-        configProvider.getBoolean(CIVISIBILITY_KNOWN_TESTS_REQUEST_ENABLED, true);
-    ciVisibilityFlakyRetryOnlyKnownFlakes =
-        configProvider.getBoolean(CIVISIBILITY_FLAKY_RETRY_ONLY_KNOWN_FLAKES, false);
-    ciVisibilityEarlyFlakeDetectionEnabled =
-        configProvider.getBoolean(CIVISIBILITY_EARLY_FLAKE_DETECTION_ENABLED, true);
-    ciVisibilityEarlyFlakeDetectionLowerLimit =
-        configProvider.getInteger(CIVISIBILITY_EARLY_FLAKE_DETECTION_LOWER_LIMIT, 30);
-    ciVisibilityFlakyRetryCount = configProvider.getInteger(CIVISIBILITY_FLAKY_RETRY_COUNT, 5);
-    ciVisibilityTotalFlakyRetryCount =
-        configProvider.getInteger(CIVISIBILITY_TOTAL_FLAKY_RETRY_COUNT, 1000);
-    ciVisibilityDynamicAtrEnabled =
-        configProvider.getBoolean(CIVISIBILITY_DYNAMIC_ATR_ENABLED, false);
-    ciVisibilityDynamicAtrBuckets =
-        ciVisibilityDynamicAtrEnabled
-            ? parseDynamicAtrBuckets(configProvider.getString(CIVISIBILITY_DYNAMIC_ATR_BUCKETS))
-            : null;
-    ciVisibilitySessionName = configProvider.getString(TEST_SESSION_NAME);
-    ciVisibilityModuleName = configProvider.getString(CIVISIBILITY_MODULE_NAME);
-    ciVisibilityTestCommand = configProvider.getString(CIVISIBILITY_TEST_COMMAND);
-    ciVisibilityTelemetryEnabled = configProvider.getBoolean(CIVISIBILITY_TELEMETRY_ENABLED, true);
-    ciVisibilityRumFlushWaitMillis =
-        configProvider.getLong(CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS, 500);
-    ciVisibilityAutoInjected =
-        Strings.isNotBlank(configProvider.getString(CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER));
-    ciVisibilityTestOrder = configProvider.getString(CIVISIBILITY_TEST_ORDER);
-    ciVisibilityTestManagementEnabled = configProvider.getBoolean(TEST_MANAGEMENT_ENABLED, true);
-    ciVisibilityTestManagementAttemptToFixRetries =
-        configProvider.getInteger(TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES);
-    ciVisibilityScalatestForkMonitorEnabled =
-        configProvider.getBoolean(CIVISIBILITY_SCALATEST_FORK_MONITOR_ENABLED, false);
-    gitPullRequestBaseBranch = configProvider.getString(GIT_PULL_REQUEST_BASE_BRANCH);
-    gitPullRequestBaseBranchSha = configProvider.getString(GIT_PULL_REQUEST_BASE_BRANCH_SHA);
-    gitCommitHeadSha = configProvider.getString(GIT_COMMIT_HEAD_SHA);
-    ciVisibilityFailedTestReplayEnabled =
-        configProvider.getBoolean(TEST_FAILED_TEST_REPLAY_ENABLED, true);
-
-    testOptimizationManifestFile = configProvider.getString(TEST_OPTIMIZATION_MANIFEST_FILE);
-    testOptimizationPayloadsInFiles =
-        configProvider.getBoolean(TEST_OPTIMIZATION_PAYLOADS_IN_FILES, false);
-
-    remoteConfigEnabled =
-        configProvider.getBoolean(
-            REMOTE_CONFIGURATION_ENABLED, DEFAULT_REMOTE_CONFIG_ENABLED, REMOTE_CONFIG_ENABLED);
-    remoteConfigIntegrityCheckEnabled =
-        configProvider.getBoolean(
-            REMOTE_CONFIG_INTEGRITY_CHECK_ENABLED, DEFAULT_REMOTE_CONFIG_INTEGRITY_CHECK_ENABLED);
-    remoteConfigUrl = configProvider.getString(REMOTE_CONFIG_URL);
-    remoteConfigPollIntervalSeconds =
-        configProvider.getFloat(
-            REMOTE_CONFIG_POLL_INTERVAL_SECONDS, DEFAULT_REMOTE_CONFIG_POLL_INTERVAL_SECONDS);
-    remoteConfigMaxPayloadSize =
-        configProvider.getInteger(
-                REMOTE_CONFIG_MAX_PAYLOAD_SIZE, DEFAULT_REMOTE_CONFIG_MAX_PAYLOAD_SIZE)
-            * 1024L;
-    remoteConfigTargetsKeyId =
-        configProvider.getString(
-            REMOTE_CONFIG_TARGETS_KEY_ID, DEFAULT_REMOTE_CONFIG_TARGETS_KEY_ID);
-    remoteConfigTargetsKey =
-        configProvider.getString(REMOTE_CONFIG_TARGETS_KEY, DEFAULT_REMOTE_CONFIG_TARGETS_KEY);
-
-    remoteConfigMaxExtraServices =
-        configProvider.getInteger(
-            REMOTE_CONFIG_MAX_EXTRA_SERVICES, DEFAULT_REMOTE_CONFIG_MAX_EXTRA_SERVICES);
-
-    final Boolean configuredFeatureFlaggingProviderEnabled =
-        configProvider.getBoolean(FEATURE_FLAGS_ENABLED);
-    final Boolean legacyFeatureFlaggingProviderEnabled =
-        configProvider.getBoolean(EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED);
-    final String configuredFeatureFlaggingConfigurationSource =
-        configProvider.isSet(FEATURE_FLAGS_CONFIGURATION_SOURCE)
-            ? configProvider.getString(FEATURE_FLAGS_CONFIGURATION_SOURCE)
-            : null;
-    final FeatureFlaggingConfig.Resolution resolvedFeatureFlaggingConfiguration =
-        resolveConfiguration(
-            configuredFeatureFlaggingProviderEnabled,
-            configuredFeatureFlaggingConfigurationSource,
-            legacyFeatureFlaggingProviderEnabled);
-    if (legacyFeatureFlaggingProviderEnabled != null) {
-      log.warn(
-          "Setting {} is deprecated. Use {} and {} instead.",
-          EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED,
-          FEATURE_FLAGS_ENABLED,
-          FEATURE_FLAGS_CONFIGURATION_SOURCE);
-    }
-    if (!isSupportedConfigurationSource(configuredFeatureFlaggingConfigurationSource)) {
-      log.warn(
-          "Unsupported Feature Flagging configuration source; provider disabled: '{}'",
-          resolvedFeatureFlaggingConfiguration.getSource());
-    }
-    featureFlaggingProviderEnabled = resolvedFeatureFlaggingConfiguration.isEnabled();
-    featureFlaggingConfigurationSource = resolvedFeatureFlaggingConfiguration.getSource();
-    featureFlaggingConfigurationSourceAgentlessBaseUrl =
-        configProvider.getStringNotEmpty(
-            FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL, null);
-    int configuredFeatureFlaggingPollIntervalSeconds =
-        configProvider.getInteger(
-            FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS,
-            DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_POLL_INTERVAL_SECONDS);
-    if (configuredFeatureFlaggingPollIntervalSeconds <= 0) {
-      log.warn(
-          "Invalid Feature Flagging agentless poll interval: {}. The value must be positive",
-          configuredFeatureFlaggingPollIntervalSeconds);
-      configuredFeatureFlaggingPollIntervalSeconds =
-          DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_POLL_INTERVAL_SECONDS;
-    }
-    featureFlaggingConfigurationSourcePollIntervalSeconds =
-        configuredFeatureFlaggingPollIntervalSeconds;
-    int configuredFeatureFlaggingRequestTimeoutSeconds =
-        configProvider.getInteger(
-            FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS,
-            DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_REQUEST_TIMEOUT_SECONDS);
-    if (configuredFeatureFlaggingRequestTimeoutSeconds <= 0) {
-      log.warn(
-          "Invalid Feature Flagging agentless request timeout: {}. The value must be positive",
-          configuredFeatureFlaggingRequestTimeoutSeconds);
-      configuredFeatureFlaggingRequestTimeoutSeconds =
-          DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_REQUEST_TIMEOUT_SECONDS;
-    }
-    featureFlaggingConfigurationSourceRequestTimeoutSeconds =
-        configuredFeatureFlaggingRequestTimeoutSeconds;
-
-    dynamicInstrumentationEnabled =
-        configProvider.getBoolean(
-            DYNAMIC_INSTRUMENTATION_ENABLED, DEFAULT_DYNAMIC_INSTRUMENTATION_ENABLED);
-    dynamicInstrumentationSnapshotUrl =
-        configProvider.getString(DYNAMIC_INSTRUMENTATION_SNAPSHOT_URL);
-    distributedDebuggerEnabled =
-        configProvider.getBoolean(
-            DISTRIBUTED_DEBUGGER_ENABLED, DEFAULT_DISTRIBUTED_DEBUGGER_ENABLED);
-    dynamicInstrumentationUploadTimeout =
-        configProvider.getInteger(
-            DYNAMIC_INSTRUMENTATION_UPLOAD_TIMEOUT, DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_TIMEOUT);
-    if (configProvider.isSet(DYNAMIC_INSTRUMENTATION_UPLOAD_INTERVAL_SECONDS)) {
-      dynamicInstrumentationUploadFlushInterval =
-          (int)
-              (configProvider.getFloat(
-                      DYNAMIC_INSTRUMENTATION_UPLOAD_INTERVAL_SECONDS,
-                      DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL)
-                  * 1000);
-    } else {
-      dynamicInstrumentationUploadFlushInterval =
-          configProvider.getInteger(
-              DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL,
-              DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL);
-    }
-    dynamicInstrumentationClassFileDumpEnabled =
-        configProvider.getBoolean(
-            DYNAMIC_INSTRUMENTATION_CLASSFILE_DUMP_ENABLED,
-            DEFAULT_DYNAMIC_INSTRUMENTATION_CLASSFILE_DUMP_ENABLED);
-    dynamicInstrumentationPollInterval =
-        configProvider.getInteger(
-            DYNAMIC_INSTRUMENTATION_POLL_INTERVAL, DEFAULT_DYNAMIC_INSTRUMENTATION_POLL_INTERVAL);
-    dynamicInstrumentationDiagnosticsInterval =
-        configProvider.getInteger(
-            DYNAMIC_INSTRUMENTATION_DIAGNOSTICS_INTERVAL,
-            DEFAULT_DYNAMIC_INSTRUMENTATION_DIAGNOSTICS_INTERVAL);
-    dynamicInstrumentationMetricEnabled =
-        runtimeMetricsEnabled
-            && configProvider.getBoolean(
-                DYNAMIC_INSTRUMENTATION_METRICS_ENABLED,
-                DEFAULT_DYNAMIC_INSTRUMENTATION_METRICS_ENABLED);
-    dynamicInstrumentationProbeFile = configProvider.getString(DYNAMIC_INSTRUMENTATION_PROBE_FILE);
-    dynamicInstrumentationUploadBatchSize =
-        configProvider.getInteger(
-            DYNAMIC_INSTRUMENTATION_UPLOAD_BATCH_SIZE,
-            DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_BATCH_SIZE);
-    dynamicInstrumentationMaxPayloadSize =
-        configProvider.getInteger(
-                DYNAMIC_INSTRUMENTATION_MAX_PAYLOAD_SIZE,
-                DEFAULT_DYNAMIC_INSTRUMENTATION_MAX_PAYLOAD_SIZE)
-            * 1024L;
-    dynamicInstrumentationVerifyByteCode =
-        configProvider.getBoolean(
-            DYNAMIC_INSTRUMENTATION_VERIFY_BYTECODE,
-            DEFAULT_DYNAMIC_INSTRUMENTATION_VERIFY_BYTECODE);
-    dynamicInstrumentationInstrumentTheWorld =
-        configProvider.getString(DYNAMIC_INSTRUMENTATION_INSTRUMENT_THE_WORLD);
-    dynamicInstrumentationExcludeFiles =
-        configProvider.getString(DYNAMIC_INSTRUMENTATION_EXCLUDE_FILES);
-    dynamicInstrumentationIncludeFiles =
-        configProvider.getString(DYNAMIC_INSTRUMENTATION_INCLUDE_FILES);
-    dynamicInstrumentationTimeoutCheckerMode =
-        configProvider.getString(
-            DYNAMIC_INSTRUMENTATION_TIMEOUT_CHECKER_MODE,
-            DEFAULT_DYNAMIC_INSTRUMENTATION_TIMEOUT_CHECKER_MODE);
-    dynamicInstrumentationCaptureTimeout =
-        configProvider.getInteger(
-            DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT,
-            DEFAULT_DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT,
-            DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT_MS);
-    dynamicInstrumentationEvaluationTimeout =
-        configProvider.getInteger(
-            DYNAMIC_INSTRUMENTATION_EVAL_TIMEOUT_MS, DEFAULT_DYNAMIC_INSTRUMENTATION_EVAL_TIMEOUT);
-    dynamicInstrumentationRedactedIdentifiers =
-        configProvider.getString(DYNAMIC_INSTRUMENTATION_REDACTED_IDENTIFIERS, null);
-    dynamicInstrumentationRedactionExcludedIdentifiers =
-        tryMakeImmutableSet(
-            configProvider.getList(DYNAMIC_INSTRUMENTATION_REDACTION_EXCLUDED_IDENTIFIERS));
-    dynamicInstrumentationRedactedTypes =
-        configProvider.getString(DYNAMIC_INSTRUMENTATION_REDACTED_TYPES, null);
-    dynamicInstrumentationLocalVarHoistingLevel =
-        configProvider.getInteger(
-            DYNAMIC_INSTRUMENTATION_LOCALVAR_HOISTING_LEVEL,
-            DEFAULT_DYNAMIC_INSTRUMENTATION_LOCALVAR_HOISTING_LEVEL);
-    symbolDatabaseEnabled =
-        configProvider.getBoolean(SYMBOL_DATABASE_ENABLED, DEFAULT_SYMBOL_DATABASE_ENABLED);
-    symbolDatabaseForceUpload =
-        configProvider.getBoolean(
-            SYMBOL_DATABASE_FORCE_UPLOAD, DEFAULT_SYMBOL_DATABASE_FORCE_UPLOAD);
-    symbolDatabaseFlushThreshold =
-        configProvider.getInteger(
-            SYMBOL_DATABASE_FLUSH_THRESHOLD, DEFAULT_SYMBOL_DATABASE_FLUSH_THRESHOLD);
-    symbolDatabaseCompressed =
-        configProvider.getBoolean(SYMBOL_DATABASE_COMPRESSED, DEFAULT_SYMBOL_DATABASE_COMPRESSED);
-    debuggerExceptionEnabled =
-        configProvider.getBoolean(
-            DEBUGGER_EXCEPTION_ENABLED,
-            DEFAULT_DEBUGGER_EXCEPTION_ENABLED,
-            EXCEPTION_REPLAY_ENABLED);
-    debuggerCodeOriginEnabled =
-        configProvider.getBoolean(
-            CODE_ORIGIN_FOR_SPANS_ENABLED, InstrumenterConfig.getDefaultCodeOriginForSpanEnabled());
-    debuggerCodeOriginMaxUserFrames =
-        configProvider.getInteger(CODE_ORIGIN_MAX_USER_FRAMES, DEFAULT_CODE_ORIGIN_MAX_USER_FRAMES);
-    debuggerMaxExceptionPerSecond =
-        configProvider.getInteger(
-            DEBUGGER_MAX_EXCEPTION_PER_SECOND, DEFAULT_DEBUGGER_MAX_EXCEPTION_PER_SECOND);
-    debuggerExceptionOnlyLocalRoot =
-        configProvider.getBoolean(
-            DEBUGGER_EXCEPTION_ONLY_LOCAL_ROOT, DEFAULT_DEBUGGER_EXCEPTION_ONLY_LOCAL_ROOT);
-    debuggerExceptionCaptureIntermediateSpansEnabled =
-        configProvider.getBoolean(
-            DEBUGGER_EXCEPTION_CAPTURE_INTERMEDIATE_SPANS_ENABLED,
-            DEFAULT_DEBUGGER_EXCEPTION_CAPTURE_INTERMEDIATE_SPANS_ENABLED);
-    debuggerExceptionMaxCapturedFrames =
-        configProvider.getInteger(
-            DEBUGGER_EXCEPTION_MAX_CAPTURED_FRAMES,
-            DEFAULT_DEBUGGER_EXCEPTION_MAX_CAPTURED_FRAMES,
-            DEBUGGER_EXCEPTION_CAPTURE_MAX_FRAMES);
-    debuggerExceptionCaptureInterval =
-        configProvider.getInteger(
-            DEBUGGER_EXCEPTION_CAPTURE_INTERVAL_SECONDS,
-            DEFAULT_DEBUGGER_EXCEPTION_CAPTURE_INTERVAL_SECONDS);
-    debuggerSourceFileTrackingEnabled =
-        configProvider.getBoolean(
-            DEBUGGER_SOURCE_FILE_TRACKING_ENABLED, DEFAULT_DEBUGGER_SOURCE_FILE_TRACKING_ENABLED);
-    debuggerSynchronousSourceFileTrackingEnabled =
-        configProvider.getBoolean(DEBUGGER_SYNCHRONOUS_SOURCE_FILE_TRACKING_ENABLED, false);
-
-    debuggerThirdPartyIncludes =
-        tryMakeImmutableSet(
-            configProvider.getList(
-                THIRD_PARTY_INCLUDES, Collections.emptyList(), THIRD_PARTY_DETECTION_INCLUDES));
-    debuggerThirdPartyExcludes =
-        tryMakeImmutableSet(
-            configProvider.getList(
-                THIRD_PARTY_EXCLUDES, Collections.emptyList(), THIRD_PARTY_DETECTION_EXCLUDES));
-    debuggerShadingIdentifiers =
-        tryMakeImmutableSet(configProvider.getList(THIRD_PARTY_SHADING_IDENTIFIERS));
-
-    awsPropagationEnabled = isPropagationEnabled(true, "aws", "aws-sdk");
-    sqsPropagationEnabled = isPropagationEnabled(true, "sqs");
-    sqsBodyPropagationEnabled = configProvider.getBoolean(SQS_BODY_PROPAGATION_ENABLED, false);
-
-    kafkaClientPropagationEnabled = isPropagationEnabled(true, "kafka", "kafka.client");
-    kafkaClientPropagationDisabledTopics =
-        tryMakeImmutableSet(configProvider.getList(KAFKA_CLIENT_PROPAGATION_DISABLED_TOPICS));
-    kafkaClientBase64DecodingEnabled =
-        configProvider.getBoolean(KAFKA_CLIENT_BASE64_DECODING_ENABLED, false);
-    jmsPropagationEnabled = isPropagationEnabled(true, "jms");
-    jmsPropagationDisabledTopics =
-        tryMakeImmutableSet(configProvider.getList(JMS_PROPAGATION_DISABLED_TOPICS));
-    jmsPropagationDisabledQueues =
-        tryMakeImmutableSet(configProvider.getList(JMS_PROPAGATION_DISABLED_QUEUES));
-    jmsUnacknowledgedMaxAge = configProvider.getInteger(JMS_UNACKNOWLEDGED_MAX_AGE, 3600);
-
-    rabbitPropagationEnabled = isPropagationEnabled(true, "rabbit", "rabbitmq");
-    rabbitPropagationDisabledQueues =
-        tryMakeImmutableSet(configProvider.getList(RABBIT_PROPAGATION_DISABLED_QUEUES));
-    rabbitPropagationDisabledExchanges =
-        tryMakeImmutableSet(configProvider.getList(RABBIT_PROPAGATION_DISABLED_EXCHANGES));
-    rabbitIncludeRoutingKeyInResource =
-        configProvider.getBoolean(RABBIT_INCLUDE_ROUTINGKEY_IN_RESOURCE, true);
-
-    messageBrokerSplitByDestination =
-        configProvider.getBoolean(MESSAGE_BROKER_SPLIT_BY_DESTINATION, false);
-
-    grpcIgnoredInboundMethods =
-        tryMakeImmutableSet(configProvider.getList(GRPC_IGNORED_INBOUND_METHODS));
-    final List<String> tmpGrpcIgnoredOutboundMethods = new ArrayList<>();
-    tmpGrpcIgnoredOutboundMethods.addAll(configProvider.getList(GRPC_IGNORED_OUTBOUND_METHODS));
-    // When tracing shadowing will be possible we can instrument the stubs to silent tracing
-    // starting from interception points
-    if (InstrumenterConfig.get()
-        .isIntegrationEnabled(Collections.singleton("google-pubsub"), true)) {
-      tmpGrpcIgnoredOutboundMethods.addAll(
-          configProvider.getList(
-              GOOGLE_PUBSUB_IGNORED_GRPC_METHODS,
-              Arrays.asList(
-                  "google.pubsub.v1.Subscriber/ModifyAckDeadline",
-                  "google.pubsub.v1.Subscriber/Acknowledge",
-                  "google.pubsub.v1.Subscriber/Pull",
-                  "google.pubsub.v1.Subscriber/StreamingPull",
-                  "google.pubsub.v1.Publisher/Publish")));
-    }
-    grpcIgnoredOutboundMethods = tryMakeImmutableSet(tmpGrpcIgnoredOutboundMethods);
-    grpcServerTrimPackageResource =
-        configProvider.getBoolean(GRPC_SERVER_TRIM_PACKAGE_RESOURCE, false);
-    grpcServerErrorStatuses =
-        configProvider.getIntegerRange(
-            GRPC_SERVER_ERROR_STATUSES, DEFAULT_GRPC_SERVER_ERROR_STATUSES);
-    grpcClientErrorStatuses =
-        configProvider.getIntegerRange(
-            GRPC_CLIENT_ERROR_STATUSES, DEFAULT_GRPC_CLIENT_ERROR_STATUSES);
-
-    hystrixTagsEnabled = configProvider.getBoolean(HYSTRIX_TAGS_ENABLED, false);
-    hystrixMeasuredEnabled = configProvider.getBoolean(HYSTRIX_MEASURED_ENABLED, false);
-
-    springSchedulingMeasuredEnabled =
-        configProvider.getBoolean(SPRING_SCHEDULING_MEASURED_ENABLED, false);
-
-    resilience4jMeasuredEnabled = configProvider.getBoolean(RESILIENCE4J_MEASURED_ENABLED, false);
-    resilience4jTagMetricsEnabled =
-        configProvider.getBoolean(RESILIENCE4J_TAG_METRICS_ENABLED, false);
-
-    igniteCacheIncludeKeys = configProvider.getBoolean(IGNITE_CACHE_INCLUDE_KEYS, false);
-
-    obfuscationQueryRegexp =
-        configProvider.getString(
-            OBFUSCATION_QUERY_STRING_REGEXP, null, "obfuscation.query.string.regexp");
-
-    playReportHttpStatus = configProvider.getBoolean(PLAY_REPORT_HTTP_STATUS, false);
-
-    servletPrincipalEnabled = configProvider.getBoolean(SERVLET_PRINCIPAL_ENABLED, false);
-
-    xDatadogTagsMaxLength =
-        configProvider.getInteger(
-            TRACE_X_DATADOG_TAGS_MAX_LENGTH, DEFAULT_TRACE_X_DATADOG_TAGS_MAX_LENGTH);
-
-    servletAsyncTimeoutError = configProvider.getBoolean(SERVLET_ASYNC_TIMEOUT_ERROR, true);
-
-    logLevel = configProvider.getString(TRACE_LOG_LEVEL, null, LOG_LEVEL);
-    debugEnabled = configProvider.getBoolean(TRACE_DEBUG, false);
-    triageEnabled = configProvider.getBoolean(TRACE_TRIAGE, instrumenterConfig.isTriageEnabled());
-    triageReportTrigger = configProvider.getString(TRIAGE_REPORT_TRIGGER);
-    if (null != triageReportTrigger) {
-      triageReportDir = configProvider.getString(TRIAGE_REPORT_DIR, getProp("java.io.tmpdir"));
-    } else {
-      triageReportDir = null;
-    }
-
-    startupLogsEnabled =
-        configProvider.getBoolean(STARTUP_LOGS_ENABLED, DEFAULT_STARTUP_LOGS_ENABLED);
-
-    cwsEnabled = configProvider.getBoolean(CWS_ENABLED, DEFAULT_CWS_ENABLED);
-    cwsTlsRefresh = configProvider.getInteger(CWS_TLS_REFRESH, DEFAULT_CWS_TLS_REFRESH);
-
-    dataJobsOpenLineageEnabled =
-        configProvider.getBoolean(
-            DATA_JOBS_OPENLINEAGE_ENABLED, DEFAULT_DATA_JOBS_OPENLINEAGE_ENABLED);
-    dataJobsOpenLineageTimeoutEnabled =
-        configProvider.getBoolean(
-            DATA_JOBS_OPENLINEAGE_TIMEOUT_ENABLED, DEFAULT_DATA_JOBS_OPENLINEAGE_TIMEOUT_ENABLED);
-    dataJobsParseSparkPlanEnabled =
-        configProvider.getBoolean(
-            DATA_JOBS_PARSE_SPARK_PLAN_ENABLED, DEFAULT_DATA_JOBS_PARSE_SPARK_PLAN_ENABLED);
-    dataJobsExperimentalFeaturesEnabled =
-        configProvider.getBoolean(
-            DATA_JOBS_EXPERIMENTAL_FEATURES_ENABLED,
-            DEFAULT_DATA_JOBS_EXPERIMENTAL_FEATURES_ENABLED);
-
-    dataStreamsEnabled =
-        configProvider.getBoolean(DATA_STREAMS_ENABLED, DEFAULT_DATA_STREAMS_ENABLED);
-    dataStreamsBucketDurationSeconds =
-        configProvider.getFloat(
-            DATA_STREAMS_BUCKET_DURATION_SECONDS, DEFAULT_DATA_STREAMS_BUCKET_DURATION);
-    dataStreamsTransactionExtractors =
-        configProvider.getString(DATA_STREAMS_TRANSACTION_EXTRACTORS);
-
-    azureAppServices = configProvider.getBoolean(AZURE_APP_SERVICES, false);
-    traceAgentPath = configProvider.getString(TRACE_AGENT_PATH);
-    testAgentSessionToken = configProvider.getString(TEST_AGENT_SESSION_TOKEN);
-    String traceAgentArgsString = configProvider.getString(TRACE_AGENT_ARGS);
-    if (traceAgentArgsString == null) {
-      traceAgentArgs = Collections.emptyList();
-    } else {
-      traceAgentArgs =
-          Collections.unmodifiableList(
-              new ArrayList<>(parseStringIntoSetOfNonEmptyStrings(traceAgentArgsString)));
-    }
-
-    dogStatsDPath = configProvider.getString(DOGSTATSD_PATH);
-    String dogStatsDArgsString = configProvider.getString(DOGSTATSD_ARGS);
-    if (dogStatsDArgsString == null) {
-      dogStatsDArgs = Collections.emptyList();
-    } else {
-      dogStatsDArgs =
-          Collections.unmodifiableList(
-              new ArrayList<>(parseStringIntoSetOfNonEmptyStrings(dogStatsDArgsString)));
-    }
-
-    // Setting this last because we have a few places where this can come from
-    apiKey = tmpApiKey;
-
-    boolean longRunningEnabled =
-        configProvider.getBoolean(TRACE_LONG_RUNNING_ENABLED, DEFAULT_TRACE_LONG_RUNNING_ENABLED);
-    long longRunningTraceInitialFlushInterval =
-        configProvider.getLong(
-            TRACE_LONG_RUNNING_INITIAL_FLUSH_INTERVAL,
-            DEFAULT_TRACE_LONG_RUNNING_INITIAL_FLUSH_INTERVAL);
-    long longRunningTraceFlushInterval =
-        configProvider.getLong(
-            TRACE_LONG_RUNNING_FLUSH_INTERVAL, DEFAULT_TRACE_LONG_RUNNING_FLUSH_INTERVAL);
-    serviceDiscoveryEnabled =
-        configProvider.getBoolean(
-            TRACE_SERVICE_DISCOVERY_ENABLED, DEFAULT_SERVICE_DISCOVERY_ENABLED);
-
-    if (longRunningEnabled
-        && (longRunningTraceInitialFlushInterval < 10
-            || longRunningTraceInitialFlushInterval > 450)) {
-      log.warn(
-          "Provided long running trace initial flush interval of {} seconds. It should be between 10 seconds and 7.5 minutes."
-              + "Setting the flush interval to the default value of {} seconds .",
-          longRunningTraceInitialFlushInterval,
-          DEFAULT_TRACE_LONG_RUNNING_INITIAL_FLUSH_INTERVAL);
-      longRunningTraceInitialFlushInterval = DEFAULT_TRACE_LONG_RUNNING_INITIAL_FLUSH_INTERVAL;
-    }
-    if (longRunningEnabled
-        && (longRunningTraceFlushInterval < 20 || longRunningTraceFlushInterval > 450)) {
-      log.warn(
-          "Provided long running trace flush interval of {} seconds. It should be between 20 seconds and 7.5 minutes."
-              + "Setting the flush interval to the default value of {} seconds .",
-          longRunningTraceFlushInterval,
-          DEFAULT_TRACE_LONG_RUNNING_FLUSH_INTERVAL);
-      longRunningTraceFlushInterval = DEFAULT_TRACE_LONG_RUNNING_FLUSH_INTERVAL;
-    }
-    this.longRunningTraceEnabled = longRunningEnabled;
-    this.longRunningTraceInitialFlushInterval = longRunningTraceInitialFlushInterval;
-    this.longRunningTraceFlushInterval = longRunningTraceFlushInterval;
-
-    this.sparkTaskHistogramEnabled =
-        configProvider.getBoolean(
-            SPARK_TASK_HISTOGRAM_ENABLED, DEFAULT_SPARK_TASK_HISTOGRAM_ENABLED);
-
-    this.sparkAppNameAsService =
-        configProvider.getBoolean(SPARK_APP_NAME_AS_SERVICE, DEFAULT_SPARK_APP_NAME_AS_SERVICE);
-
-    this.jaxRsExceptionAsErrorsEnabled =
-        configProvider.getBoolean(
-            JAX_RS_EXCEPTION_AS_ERROR_ENABLED, DEFAULT_JAX_RS_EXCEPTION_AS_ERROR_ENABLED);
-
-    axisPromoteResourceName = configProvider.getBoolean(AXIS_PROMOTE_RESOURCE_NAME, false);
-
-    websocketMessagesInheritSampling =
-        configProvider.getBoolean(
-            TRACE_WEBSOCKET_MESSAGES_INHERIT_SAMPLING, DEFAULT_WEBSOCKET_MESSAGES_INHERIT_SAMPLING);
-    websocketMessagesSeparateTraces =
-        configProvider.getBoolean(
-            TRACE_WEBSOCKET_MESSAGES_SEPARATE_TRACES, DEFAULT_WEBSOCKET_MESSAGES_SEPARATE_TRACES);
-    websocketTagSessionId =
-        configProvider.getBoolean(TRACE_WEBSOCKET_TAG_SESSION_ID, DEFAULT_WEBSOCKET_TAG_SESSION_ID);
-
-    this.traceFlushIntervalSeconds =
-        configProvider.getFloat(
-            TracerConfig.TRACE_FLUSH_INTERVAL, ConfigDefaults.DEFAULT_TRACE_FLUSH_INTERVAL);
-
-    this.tracePostProcessingTimeout =
-        configProvider.getLong(
-            TRACE_POST_PROCESSING_TIMEOUT, DEFAULT_TRACE_POST_PROCESSING_TIMEOUT);
-
-    if (isLlmObsEnabled()) {
-      log.debug(
-          "LLM Observability enabled for ML app {}, agentless mode {}",
-          llmObsMlApp,
-          llmObsAgentlessEnabled);
-    }
-
-    // if API key is not provided, check if any products are using agentless mode and require it
-    if (apiKey == null || apiKey.isEmpty()) {
-      // CI Visibility (skip validation in manifest/payloads-in-files mode - no network needed)
-      if (isCiVisibilityEnabled()
-          && ciVisibilityAgentlessEnabled
-          && testOptimizationManifestFile == null
-          && !testOptimizationPayloadsInFiles) {
-        throw new FatalAgentMisconfigurationError(
-            "Attempt to start in CI Visibility in Agentless mode without API key. "
-                + "Please ensure that either an API key is configured, or the tracer is set up to work with the Agent");
-      }
-
-      // Profiling
-      if (profilingAgentless) {
-        log.warn(
-            "Agentless profiling activated but no api key provided. Profile uploading will likely fail");
-      }
-
-      // LLM Observability
-      if (isLlmObsEnabled() && llmObsAgentlessEnabled) {
-        throw new FatalAgentMisconfigurationError(
-            "Attempt to start LLM Observability in Agentless mode without API key. "
-                + "Please ensure that either an API key is configured, or the tracer is set up to work with the Agent");
-      }
-    }
-
-    this.telemetryDebugRequestsEnabled =
-        configProvider.getBoolean(
-            TELEMETRY_DEBUG_REQUESTS_ENABLED, DEFAULT_TELEMETRY_DEBUG_REQUESTS_ENABLED);
-
-    this.agentlessLogSubmissionQueueSize =
-        configProvider.getInteger(AGENTLESS_LOG_SUBMISSION_QUEUE_SIZE, 1024);
-    this.agentlessLogSubmissionLevel =
-        configProvider.getString(AGENTLESS_LOG_SUBMISSION_LEVEL, "INFO");
-    this.agentlessLogSubmissionUrl = configProvider.getString(AGENTLESS_LOG_SUBMISSION_URL);
-    this.agentlessLogSubmissionProduct = isCiVisibilityEnabled() ? "citest" : "apm";
-
-    this.cloudPayloadTaggingServices =
-        configProvider.getSet(
-            TRACE_CLOUD_PAYLOAD_TAGGING_SERVICES, DEFAULT_TRACE_CLOUD_PAYLOAD_TAGGING_SERVICES);
-
-    List<String> cloudReqPayloadTaggingConf =
-        configProvider.getList(TRACE_CLOUD_REQUEST_PAYLOAD_TAGGING, null);
-    if (null == cloudReqPayloadTaggingConf) {
-      // if no configuration is provided, disable payload tagging
-      this.cloudRequestPayloadTagging = null;
-    } else if (cloudReqPayloadTaggingConf.size() == 1
-        && cloudReqPayloadTaggingConf.get(0).equalsIgnoreCase("all")) {
-      // if "all" is specified enable all JSON paths
-      this.cloudRequestPayloadTagging = Collections.emptyList();
-    } else {
-      // parse and validate JSON paths. if none are valid, disable payload tagging
-      List<JsonPath> validRequestJsonPaths = parseJsonPaths(cloudReqPayloadTaggingConf);
-      this.cloudRequestPayloadTagging =
-          validRequestJsonPaths.isEmpty() ? null : validRequestJsonPaths;
-    }
-
-    List<String> cloudRespPayloadTaggingConf =
-        configProvider.getList(TRACE_CLOUD_RESPONSE_PAYLOAD_TAGGING, null);
-    if (null == cloudRespPayloadTaggingConf) {
-      // if no configuration is provided, disable payload tagging
-      this.cloudResponsePayloadTagging = null;
-    } else if (cloudRespPayloadTaggingConf.size() == 1
-        && cloudRespPayloadTaggingConf.get(0).equalsIgnoreCase("all")) {
-      // if "all" is specified enable all JSON paths
-      this.cloudResponsePayloadTagging = Collections.emptyList();
-    } else {
-      // parse and validate JSON paths. if none are valid, disable payload tagging
-      List<JsonPath> validResponseJsonPaths = parseJsonPaths(cloudRespPayloadTaggingConf);
-      this.cloudResponsePayloadTagging =
-          validResponseJsonPaths.isEmpty() ? null : validResponseJsonPaths;
-    }
-
-    this.cloudPayloadTaggingMaxDepth =
-        configProvider.getInteger(TRACE_CLOUD_PAYLOAD_TAGGING_MAX_DEPTH, 10);
-    this.cloudPayloadTaggingMaxTags =
-        configProvider.getInteger(TRACE_CLOUD_PAYLOAD_TAGGING_MAX_TAGS, 758);
-
-    this.dependecyResolutionPeriodMillis =
-        configProvider.getLong(
-            GeneralConfig.TELEMETRY_DEPENDENCY_RESOLUTION_PERIOD_MILLIS,
-            1000); // 1 second by default
-
-    timelineEventsEnabled =
-        configProvider.getBoolean(
-            PROFILING_TIMELINE_EVENTS_ENABLED, PROFILING_TIMELINE_EVENTS_ENABLED_DEFAULT);
-
-    if (appSecScaEnabled != null
-        && appSecScaEnabled
-        && (!isTelemetryEnabled() || !isTelemetryDependencyServiceEnabled())) {
-      log.warn(
-          SEND_TELEMETRY,
-          "AppSec SCA is enabled but telemetry is disabled. AppSec SCA will not work.");
-    }
-
-    // Used to report telemetry on SSI injection
-    this.ssiInjectionEnabled = configProvider.getString(SSI_INJECTION_ENABLED);
-    this.ssiInjectionForce =
-        configProvider.getBoolean(SSI_INJECTION_FORCE, DEFAULT_SSI_INJECTION_FORCE);
-    this.instrumentationSource =
-        configProvider.getString(INSTRUMENTATION_SOURCE, DEFAULT_INSTRUMENTATION_SOURCE);
-
-    this.apmTracingEnabled = configProvider.getBoolean(GeneralConfig.APM_TRACING_ENABLED, true);
-
-    this.jdkSocketEnabled = configProvider.getBoolean(JDK_SOCKET_ENABLED, true);
-
-    this.spanBuilderReuseEnabled =
-        configProvider.getBoolean(GeneralConfig.SPAN_BUILDER_REUSE_ENABLED, true);
-    this.tagNameUtf8CacheSize =
-        Math.max(configProvider.getInteger(GeneralConfig.TAG_NAME_UTF8_CACHE_SIZE, 128), 0);
-    this.tagValueUtf8CacheSize =
-        Math.max(configProvider.getInteger(GeneralConfig.TAG_VALUE_UTF8_CACHE_SIZE, 384), 0);
-
-    int defaultStackTraceLengthLimit =
-        instrumenterConfig.isCiVisibilityEnabled()
-            ? CIConstants.MAX_META_STRING_VALUE_LENGTH // EVP limit
-            : Integer.MAX_VALUE; // no effective limit (old behavior)
-    this.stackTraceLengthLimit =
-        configProvider.getInteger(STACK_TRACE_LENGTH_LIMIT, defaultStackTraceLengthLimit);
-
-    this.rumInjectorConfig = parseRumConfig(configProvider);
-
-    this.aiGuardEnabled = configProvider.getBoolean(AI_GUARD_ENABLED, DEFAULT_AI_GUARD_ENABLED);
-    this.aiGuardEndpoint = configProvider.getString(AI_GUARD_ENDPOINT);
-    this.aiGuardTimeout = configProvider.getInteger(AI_GUARD_TIMEOUT, DEFAULT_AI_GUARD_TIMEOUT);
-    this.aiGuardMaxContentSize =
-        configProvider.getInteger(AI_GUARD_MAX_CONTENT_SIZE, DEFAULT_AI_GUARD_MAX_CONTENT_SIZE);
-    this.aiGuardMaxMessagesLength =
-        configProvider.getInteger(
-            AI_GUARD_MAX_MESSAGES_LENGTH, DEFAULT_AI_GUARD_MAX_MESSAGES_LENGTH);
-    this.aiGuardRedactionEnabled =
-        configProvider.getBoolean(AI_GUARD_REDACTION_ENABLED, DEFAULT_AI_GUARD_REDACTION_ENABLED);
-
-    log.debug("New instance: {}", this);
-  }
-
-  private static int nonNegativeBaggageLimit(String setting, int value) {
-    if (value < 0) {
-      log.warn("Invalid {}: {}. The value must not be negative. Disabling baggage", setting, value);
-      return 0;
-    }
-    return value;
-  }
-
-  private static boolean isValidUrl(String url) {
-    if (url == null || url.isEmpty()) {
-      return false;
-    }
-    try {
-      new URL(url).toURI();
-      return true;
-    } catch (MalformedURLException | URISyntaxException ex) {
-      log.error("Cannot parse URL '{}', skipping", url);
-      return false;
-    }
-  }
-
-  private RumInjectorConfig parseRumConfig(ConfigProvider configProvider) {
-    if (!instrumenterConfig.isRumEnabled()) {
-      return null;
-    }
-    try {
-      return new RumInjectorConfig(
-          configProvider.getString(RUM_APPLICATION_ID),
-          configProvider.getString(RUM_CLIENT_TOKEN),
-          configProvider.getString(RUM_SITE),
-          configProvider.getString(RUM_SERVICE),
-          configProvider.getString(RUM_ENVIRONMENT),
-          configProvider.getInteger(RUM_MAJOR_VERSION, DEFAULT_RUM_MAJOR_VERSION),
-          configProvider.getString(RUM_VERSION),
-          configProvider.getBoolean(RUM_TRACK_USER_INTERACTION),
-          configProvider.getBoolean(RUM_TRACK_RESOURCES),
-          configProvider.getBoolean(RUM_TRACK_LONG_TASKS),
-          configProvider.getEnum(RUM_DEFAULT_PRIVACY_LEVEL, PrivacyLevel.class, null),
-          configProvider.getFloat(RUM_SESSION_SAMPLE_RATE),
-          configProvider.getFloat(RUM_SESSION_REPLAY_SAMPLE_RATE),
-          configProvider.getString(RUM_REMOTE_CONFIGURATION_ID));
-    } catch (IllegalArgumentException e) {
-      log.warn("Unable to configure RUM injection", e);
-      return null;
-    }
-  }
-
-  /**
-   * Converts a list of packages in Jacoco exclusion format ({@code
-   * my.package.*,my.other.package.*}) to list of package prefixes suitable for use with ASM ({@code
-   * my/package/,my/other/package/})
-   */
-  public static String[] convertJacocoExclusionFormatToPackagePrefixes(List<String> packages) {
-    return packages.stream()
-        .map(s -> (s.endsWith("*") ? s.substring(0, s.length() - 1) : s).replace('.', '/'))
-        .toArray(String[]::new);
-  }
-
-  public ConfigProvider configProvider() {
-    return configProvider;
-  }
-
-  public long getStartTimeMillis() {
-    return startTimeMillis;
-  }
-
-  public String getRuntimeId() {
-    return runtimeIdEnabled ? RuntimeIdHolder.runtimeId : "";
-  }
-
-  public String getRootSessionId() {
-    return runtimeIdEnabled ? RuntimeIdHolder.rootSessionId : "";
-  }
-
-  public Long getProcessId() {
-    return PidHelper.getPidAsLong();
-  }
-
-  public String getRuntimeVersion() {
-    return runtimeVersion;
-  }
-
-  public String getApiKey() {
-    return apiKey;
-  }
-
-  public String getApplicationKey() {
-    return applicationKey;
-  }
-
-  public String getSite() {
-    return site;
-  }
-
-  public String getHostName() {
-    return HostNameHolder.hostName;
-  }
-
-  public Supplier<String> getHostNameSupplier() {
-    return HostNameHolder::getHostName;
-  }
-
-  public String getServiceName() {
-    return serviceName;
-  }
-
-  public boolean isServiceNameSetByUser() {
-    return serviceNameSetByUser;
-  }
-
-  public String getRootContextServiceName() {
-    return rootContextServiceName;
-  }
-
-  public Set<String> getExperimentalFeaturesEnabled() {
-    return experimentalFeaturesEnabled;
-  }
-
-  public boolean isExperimentalPropagateProcessTagsEnabled() {
-    return experimentalPropagateProcessTagsEnabled;
-  }
-
-  public Map<String, String> getProcessTagsMapping() {
-    return processTagsMapping;
-  }
-
-  public boolean isTraceEnabled() {
-    return instrumenterConfig.isTraceEnabled();
-  }
-
-  public boolean isServiceDiscoveryEnabled() {
-    return serviceDiscoveryEnabled;
-  }
-
-  public boolean isLongRunningTraceEnabled() {
-    return longRunningTraceEnabled;
-  }
-
-  public long getLongRunningTraceInitialFlushInterval() {
-    return longRunningTraceInitialFlushInterval;
-  }
-
-  public long getLongRunningTraceFlushInterval() {
-    return longRunningTraceFlushInterval;
-  }
-
-  public float getTraceFlushIntervalSeconds() {
-    return traceFlushIntervalSeconds;
-  }
-
-  public long getTracePostProcessingTimeout() {
-    return tracePostProcessingTimeout;
-  }
 
-  public boolean isIntegrationSynapseLegacyOperationName() {
-    return integrationSynapseLegacyOperationName;
-  }
+        return env;
+    }
 
-  public String getWriterType() {
-    return writerType;
-  }
+    public String getVersion() {
+        // intentionally not thread safe
+        if (version == null) {
+            version = getMergedSpanTags().get("version");
+            if (version == null) {
+                version = "";
+            }
+        }
 
-  public boolean isInjectBaggageAsTagsEnabled() {
-    return injectBaggageAsTagsEnabled;
-  }
+        return version;
+    }
 
-  public boolean isTraceBuilderTagsPrecedenceEnabled() {
-    return traceBuilderTagsPrecedenceEnabled;
-  }
+    public Map<String, String> getMergedSpanTags() {
+        // Do not include runtimeId into span tags: we only want that added to the root span
+        final Map<String, String> result = newHashMap(getGlobalTags().size() + spanTags.size());
+        result.putAll(getGlobalTags());
+        result.putAll(spanTags);
+        return Collections.unmodifiableMap(result);
+    }
 
-  public boolean isInjectLinksAsTagsEnabled() {
-    return injectLinksAsTagsEnabled;
-  }
+    public Map<String, String> getMergedJmxTags() {
+        final Map<String, String> runtimeTags = getRuntimeTags();
+        final Map<String, String> result =
+                newHashMap(getGlobalTags().size() + jmxTags.size() + runtimeTags.size() + 1 /* for serviceName */);
+        result.putAll(getGlobalTags());
+        result.putAll(jmxTags);
+        result.putAll(runtimeTags);
+        // service name set here instead of getRuntimeTags because apm already manages the service tag
+        // and may chose to override it.
+        // Additionally, infra/JMX metrics require `service` rather than APM's `service.name` tag
+        result.put(SERVICE_TAG, serviceName);
+        return Collections.unmodifiableMap(result);
+    }
 
-  public boolean isAgentConfiguredUsingDefault() {
-    return agentConfiguredUsingDefault;
-  }
+    public Map<String, String> getMergedProfilingTags() {
+        final Map<String, String> runtimeTags = getRuntimeTags();
+        final String host = getHostName();
+        final Map<String, String> result = newHashMap(getGlobalTags().size()
+                + profilingTags.size()
+                + runtimeTags.size()
+                + 4 /* for serviceName and host and language and runtime_version */);
+        result.put(HOST_TAG, host); // Host goes first to allow to override it
+        result.putAll(getGlobalTags());
+        result.putAll(profilingTags);
+        result.putAll(runtimeTags);
+        // service name set here instead of getRuntimeTags because apm already manages the service tag
+        // and may chose to override it.
+        result.put(SERVICE_TAG, serviceName);
+        result.put(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE);
+        result.put(RUNTIME_VERSION_TAG, runtimeVersion);
+        if (azureAppServices) {
+            result.putAll(getAzureAppServicesTags());
+        }
+        return Collections.unmodifiableMap(result);
+    }
 
-  public String getAgentUrl() {
-    return agentUrl;
-  }
+    public Map<String, String> getMergedCrashTrackingTags() {
+        final Map<String, String> runtimeTags = getRuntimeTags();
+        final String host = getHostName();
+        final Map<String, String> result = newHashMap(getGlobalTags().size()
+                + crashTrackingTags.size()
+                + jmxTags.size()
+                + runtimeTags.size()
+                + 5 /* for serviceName and host and language and env and version */);
+        result.put(HOST_TAG, host); // Host goes first to allow to override it
+        result.putAll(getGlobalTags());
+        result.putAll(jmxTags);
+        result.putAll(crashTrackingTags);
+        result.putAll(runtimeTags);
+        // service name set here instead of getRuntimeTags because apm already manages the service tag
+        // and may chose to override it.
+        result.put(SERVICE_TAG, serviceName);
+        result.put(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE);
+        result.put(VERSION, getVersion());
+        result.put(ENV, getEnv());
+        return Collections.unmodifiableMap(result);
+    }
 
-  public String getAgentHost() {
-    return agentHost;
-  }
+    public String getDefaultTelemetryUrl() {
+        String site = getSite();
+        String prefix = "";
+        if (site.endsWith("datad0g.com")) {
+            prefix = "all-http-intake.logs.";
+        } else if (site.endsWith("datadoghq.com") || site.endsWith("datadoghq.eu")) {
+            prefix = "instrumentation-telemetry-intake.";
+        }
+        return "https://" + prefix + site + "/api/v2/apmtelemetry";
+    }
 
-  public int getAgentPort() {
-    return agentPort;
-  }
+    /**
+     * Returns the sample rate for the specified instrumentation or {@link
+     * ConfigDefaults#DEFAULT_ANALYTICS_SAMPLE_RATE} if none specified.
+     */
+    public float getInstrumentationAnalyticsSampleRate(final String... aliases) {
+        for (final String alias : aliases) {
+            final String configKey = alias + ".analytics.sample-rate";
+            final Float rate = configProvider.getFloat("trace." + configKey, configKey);
+            if (null != rate) {
+                return rate;
+            }
+        }
+        return DEFAULT_ANALYTICS_SAMPLE_RATE;
+    }
 
-  public String getAgentUnixDomainSocket() {
-    return agentUnixDomainSocket;
-  }
+    /**
+     * Provide 'global' tags, i.e. tags set everywhere. We have to support old (dd.trace.global.tags)
+     * version of this setting if new (dd.tags) version has not been specified.
+     */
+    public Map<String, String> getGlobalTags() {
+        return tags;
+    }
 
-  public String getAgentNamedPipe() {
-    return agentNamedPipe;
-  }
+    /**
+     * Return a map of tags required by the datadog backend to link runtime metrics (i.e. jmx) and
+     * traces.
+     *
+     * <p>These tags must be applied to every runtime metrics and placed on the root span of every
+     * trace.
+     *
+     * @return A map of tag-name -> tag-value
+     */
+    private Map<String, String> getRuntimeTags() {
+        return Collections.singletonMap(RUNTIME_ID_TAG, getRuntimeId());
+    }
 
-  public int getAgentTimeout() {
-    return agentTimeout;
-  }
+    private Map<String, Long> getProcessIdTag() {
+        return Collections.singletonMap(PID_TAG, getProcessId());
+    }
 
-  public boolean isForceClearTextHttpForIntakeClient() {
-    return forceClearTextHttpForIntakeClient;
-  }
+    private Map<String, String> getAzureAppServicesTags() {
+        // These variable names and derivations are copied from the dotnet tracer
+        // See
+        // https://github.com/DataDog/dd-trace-dotnet/blob/master/tracer/src/Datadog.Trace/PlatformHelpers/AzureAppServices.cs
+        // and
+        // https://github.com/DataDog/dd-trace-dotnet/blob/master/tracer/src/Datadog.Trace/TraceContext.cs#L207
+        Map<String, String> aasTags = new HashMap<>();
+
+        /// The site name of the site instance in Azure where the traced application is running.
+        String siteName = getEnv("WEBSITE_SITE_NAME");
+        if (siteName != null) {
+            aasTags.put("aas.site.name", siteName);
+        }
 
-  public Set<String> getNoProxyHosts() {
-    return noProxyHosts;
-  }
+        // The kind of application instance running in Azure.
+        // Possible values: app, api, mobileapp, app_linux, app_linux_container, functionapp,
+        // functionapp_linux, functionapp_linux_container
+
+        // The type of application instance running in Azure.
+        // Possible values: app, function
+        if (getEnv("FUNCTIONS_WORKER_RUNTIME") != null || getEnv("FUNCTIONS_EXTENSIONS_VERSION") != null) {
+            aasTags.put("aas.site.kind", "functionapp");
+            aasTags.put("aas.site.type", "function");
+        } else {
+            aasTags.put("aas.site.kind", "app");
+            aasTags.put("aas.site.type", "app");
+        }
 
-  public boolean isPrioritySamplingEnabled() {
-    return prioritySamplingEnabled;
-  }
+        //  The resource group of the site instance in Azure App Services
+        String resourceGroup = getEnv("WEBSITE_RESOURCE_GROUP");
+        if (resourceGroup != null) {
+            aasTags.put("aas.resource.group", resourceGroup);
+        }
 
-  public String getPrioritySamplingForce() {
-    return prioritySamplingForce;
-  }
+        // Example: 8c500027-5f00-400e-8f00-60000000000f+apm-dotnet-EastUSwebspace
+        // Format: {subscriptionId}+{planResourceGroup}-{hostedInRegion}
+        String websiteOwner = getEnv("WEBSITE_OWNER_NAME");
+        int plusIndex = websiteOwner == null ? -1 : websiteOwner.indexOf('+');
 
-  public boolean isTraceResolverEnabled() {
-    return traceResolverEnabled;
-  }
+        // The subscription ID of the site instance in Azure App Services
+        String subscriptionId = null;
+        if (plusIndex > 0) {
+            subscriptionId = websiteOwner.substring(0, plusIndex);
+            aasTags.put("aas.subscription.id", subscriptionId);
+        }
 
-  public Set<String> getIastWeakHashAlgorithms() {
-    return iastWeakHashAlgorithms;
-  }
+        if (subscriptionId != null && siteName != null && resourceGroup != null) {
+            // The resource ID of the site instance in Azure App Services
+            String resourceId = "/subscriptions/"
+                    + subscriptionId
+                    + "/resourcegroups/"
+                    + resourceGroup
+                    + "/providers/microsoft.web/sites/"
+                    + siteName;
+            resourceId = resourceId.toLowerCase(Locale.ROOT);
+            aasTags.put("aas.resource.id", resourceId);
+        } else {
+            log.warn(
+                    "Unable to generate resource id subscription id: {}, site name: {}, resource group {}",
+                    subscriptionId,
+                    siteName,
+                    resourceGroup);
+        }
 
-  public Pattern getIastWeakCipherAlgorithms() {
-    return iastWeakCipherAlgorithms;
-  }
+        // The instance ID in Azure
+        String instanceId = getEnv("WEBSITE_INSTANCE_ID");
+        instanceId = instanceId == null ? "unknown" : instanceId;
+        aasTags.put("aas.environment.instance_id", instanceId);
 
-  public boolean isIastDeduplicationEnabled() {
-    return iastDeduplicationEnabled;
-  }
+        // The instance name in Azure
+        String instanceName = getEnv("COMPUTERNAME");
+        instanceName = instanceName == null ? "unknown" : instanceName;
+        aasTags.put("aas.environment.instance_name", instanceName);
 
-  public int getSpanAttributeSchemaVersion() {
-    return spanAttributeSchemaVersion;
-  }
+        // The operating system in Azure
+        String operatingSystem = getEnv("WEBSITE_OS");
+        operatingSystem = operatingSystem == null ? "unknown" : operatingSystem;
+        aasTags.put("aas.environment.os", operatingSystem);
 
-  public boolean isPeerHostNameEnabled() {
-    return peerHostNameEnabled;
-  }
+        // The version of the extension installed
+        String siteExtensionVersion = getEnv("DD_AAS_JAVA_EXTENSION_VERSION");
+        siteExtensionVersion = siteExtensionVersion == null ? "unknown" : siteExtensionVersion;
+        aasTags.put("aas.environment.extension_version", siteExtensionVersion);
 
-  public boolean isPeerServiceDefaultsEnabled() {
-    return peerServiceDefaultsEnabled;
-  }
+        aasTags.put("aas.environment.runtime", getProp("java.vm.name", "unknown"));
 
-  public Map<String, String> getPeerServiceComponentOverrides() {
-    return peerServiceComponentOverrides;
-  }
+        return aasTags;
+    }
 
-  public boolean isRemoveIntegrationServiceNamesEnabled() {
-    return removeIntegrationServiceNamesEnabled;
-  }
+    private int schemaVersionFromConfig() {
+        String defaultVersion;
+        // use v1 so Azure Functions operation name is consistent with that of other tracers
+        if (azureFunctions) {
+            defaultVersion = "v1";
+        } else {
+            defaultVersion = "v" + SpanNaming.SCHEMA_MIN_VERSION;
+        }
+        String versionStr = configProvider.getString(TRACE_SPAN_ATTRIBUTE_SCHEMA, defaultVersion);
+        Matcher matcher = Pattern.compile("^v?(0|[1-9]\\d*)$").matcher(versionStr);
+        int parsedVersion = -1;
+        if (matcher.matches()) {
+            parsedVersion = Integer.parseInt(matcher.group(1));
+        }
+        if (parsedVersion < SpanNaming.SCHEMA_MIN_VERSION || parsedVersion > SpanNaming.SCHEMA_MAX_VERSION) {
+            log.warn(
+                    "Invalid attribute schema version {} invalid or out of range [v{}, v{}]. Defaulting to v{}",
+                    versionStr,
+                    SpanNaming.SCHEMA_MIN_VERSION,
+                    SpanNaming.SCHEMA_MAX_VERSION,
+                    SpanNaming.SCHEMA_MIN_VERSION);
+            parsedVersion = SpanNaming.SCHEMA_MIN_VERSION;
+        }
+        return parsedVersion;
+    }
 
-  public Map<String, String> getPeerServiceMapping() {
-    return peerServiceMapping;
-  }
+    public String getFinalProfilingUrl() {
+        if (profilingUrl != null) {
+            // when profilingUrl is set we use it regardless of apiKey/agentless config
+            return profilingUrl;
+        } else if (profilingAgentless) {
+            // when agentless profiling is turned on we send directly to our intake
+            return "https://intake.profile." + site + "/api/v2/profile";
+        } else {
+            // When profilingUrl and agentless are not set we send to the dd trace agent running locally
+            // However, there are two gotchas:
+            // - the agentHost, agentPort split will trip on IPv6 addresses because of the colon -> we
+            // need to use the agentUrl
+            // - but the agentUrl can be unix socket and OKHttp doesn't support that so we fall back to
+            // http
+            //
+            // There is some magic behind the scenes where the http url will be converted to UDS if the
+            // target is a unix socket only
+            String baseUrl = agentUrl.startsWith("unix:") ? "http://" + agentHost + ":" + agentPort : agentUrl;
+            return baseUrl + "/profiling/v1/input";
+        }
+    }
 
-  public Map<String, String> getServiceMapping() {
-    return serviceMapping;
-  }
+    public String getFinalLLMObsUrl() {
+        if (llmObsAgentlessEnabled) {
+            return "https://llmobs-intake." + site + "/api/v2/llmobs";
+        }
+        return null;
+    }
 
-  public Map<String, String> getRequestHeaderTags() {
-    return requestHeaderTags;
-  }
+    public String getFinalCrashTrackingTelemetryUrl() {
+        if (crashTrackingAgentless) {
+            // when agentless crashTracking is turned on we send directly to our intake
+            return getDefaultTelemetryUrl();
+        } else {
+            // when agentless are not set we send to the dd trace agent running locally
+            return "http://" + agentHost + ":" + agentPort + "/telemetry/proxy/api/v2/apmtelemetry";
+        }
+    }
 
-  public Map<String, String> getResponseHeaderTags() {
-    return responseHeaderTags;
-  }
+    public String getFinalCrashTrackingErrorTrackingUrl() {
+        if (crashTrackingAgentless) {
+            // when agentless crashTracking is turned on we send directly to our intake
+            return "https://error-tracking-intake." + site + "/api/v2/errorsintake";
+        } else {
+            // when agentless are not set we send to the dd trace agent running locally
+            return "http://" + agentHost + ":" + agentPort + "/evp_proxy/v4/api/v2/errorsintake";
+        }
+    }
 
-  public boolean isRequestHeaderTagsCommaAllowed() {
-    return requestHeaderTagsCommaAllowed;
-  }
+    public boolean isJmxFetchIntegrationEnabled(final Iterable<String> integrationNames, final boolean defaultEnabled) {
+        return configProvider.isEnabled(integrationNames, "jmxfetch.", ".enabled", defaultEnabled);
+    }
 
-  public Map<String, String> getBaggageMapping() {
-    return baggageMapping;
-  }
+    public boolean isLogsOtelEnabled() {
+        return instrumenterConfig.isLogsOtelEnabled();
+    }
 
-  public List<String> getTraceBaggageTagKeys() {
-    return traceBaggageTagKeys;
-  }
+    public boolean isLogsOtlpExporterEnabled() {
+        return "otlp".equalsIgnoreCase(logsOtelExporter);
+    }
 
-  public Map<String, String> getHttpServerPathResourceNameMapping() {
-    return httpServerPathResourceNameMapping;
-  }
+    public boolean isOtlpLogsExportEnabled() {
+        return isLogsOtelEnabled() && isLogsOtlpExporterEnabled();
+    }
 
-  public Map<String, String> getHttpClientPathResourceNameMapping() {
-    return httpClientPathResourceNameMapping;
-  }
+    public int getLogsOtelInterval() {
+        return logsOtelInterval;
+    }
 
-  public boolean getHttpResourceRemoveTrailingSlash() {
-    return httpResourceRemoveTrailingSlash;
-  }
+    public int getLogsOtelTimeout() {
+        return logsOtelTimeout;
+    }
 
-  public BitSet getHttpServerErrorStatuses() {
-    return httpServerErrorStatuses;
-  }
+    public int getLogsOtelQueueSize() {
+        return logsOtelQueueSize;
+    }
 
-  public BitSet getHttpClientErrorStatuses() {
-    return httpClientErrorStatuses;
-  }
+    public int getLogsOtelBatchSize() {
+        return logsOtelBatchSize;
+    }
 
-  public boolean isHttpServerTagQueryString() {
-    return httpServerTagQueryString;
-  }
+    public String getOtlpLogsEndpoint() {
+        return otlpLogsEndpoint;
+    }
 
-  public boolean isHttpServerRawQueryString() {
-    return httpServerRawQueryString;
-  }
+    public Map<String, String> getOtlpLogsHeaders() {
+        return otlpLogsHeaders;
+    }
 
-  public boolean isHttpServerRawResource() {
-    return httpServerRawResource;
-  }
+    public OtlpConfig.Protocol getOtlpLogsProtocol() {
+        return otlpLogsProtocol;
+    }
 
-  public boolean isHttpServerDecodedResourcePreserveSpaces() {
-    return httpServerDecodedResourcePreserveSpaces;
-  }
+    public OtlpConfig.Compression getOtlpLogsCompression() {
+        return otlpLogsCompression;
+    }
 
-  public boolean isHttpServerRouteBasedNaming() {
-    return httpServerRouteBasedNaming;
-  }
+    public int getOtlpLogsTimeout() {
+        return otlpLogsTimeout;
+    }
 
-  public boolean isHttpClientTagQueryString() {
-    return httpClientTagQueryString;
-  }
+    public boolean isMetricsOtelEnabled() {
+        return instrumenterConfig.isMetricsOtelEnabled();
+    }
 
-  public boolean isHttpClientTagHeaders() {
-    return httpClientTagHeaders;
-  }
+    public boolean isMetricsOtlpExporterEnabled() {
+        return "otlp".equalsIgnoreCase(metricsOtelExporter);
+    }
 
-  public boolean isHttpClientSplitByDomain() {
-    return httpClientSplitByDomain;
-  }
+    public boolean isOtlpMetricsExportEnabled() {
+        return (isMetricsOtelEnabled() && isMetricsOtlpExporterEnabled()) || isOtelTracesSpanMetricsEnabled();
+    }
 
-  public boolean isDbClientSplitByInstance() {
-    return dbClientSplitByInstance;
-  }
+    public boolean isMetricsOtelExperimentalEnabled() {
+        return metricsOtelExperimentalEnabled;
+    }
 
-  public boolean isDbClientSplitByInstanceTypeSuffix() {
-    return dbClientSplitByInstanceTypeSuffix;
-  }
+    public int getMetricsOtelCardinalityLimit() {
+        return metricsOtelCardinalityLimit;
+    }
 
-  public boolean isDbClientSplitByHost() {
-    return dbClientSplitByHost;
-  }
+    public int getMetricsOtelInterval() {
+        return metricsOtelInterval;
+    }
 
-  public boolean isDbMetadataFetchingOnQueryEnabled() {
-    return dbMetadataFetchingOnQuery;
-  }
+    public int getMetricsOtelTimeout() {
+        return metricsOtelTimeout;
+    }
 
-  public boolean isDbMetadataFetchingOnConnectEnabled() {
-    return dbMetadataFetchingOnConnect;
-  }
+    public String getOtlpMetricsEndpoint() {
+        return otlpMetricsEndpoint;
+    }
 
-  public Set<String> getSplitByTags() {
-    return splitByTags;
-  }
+    public Map<String, String> getOtlpMetricsHeaders() {
+        return otlpMetricsHeaders;
+    }
 
-  public boolean isJeeSplitByDeployment() {
-    return jeeSplitByDeployment;
-  }
+    public OtlpConfig.Protocol getOtlpMetricsProtocol() {
+        return otlpMetricsProtocol;
+    }
 
-  public int getScopeDepthLimit() {
-    return scopeDepthLimit;
-  }
+    public OtlpConfig.Compression getOtlpMetricsCompression() {
+        return otlpMetricsCompression;
+    }
 
-  public boolean isScopeStrictMode() {
-    return scopeStrictMode;
-  }
+    public int getOtlpMetricsTimeout() {
+        return otlpMetricsTimeout;
+    }
 
-  public int getScopeIterationKeepAlive() {
-    return scopeIterationKeepAlive;
-  }
+    public OtlpConfig.Temporality getOtlpMetricsTemporalityPreference() {
+        return otlpMetricsTemporalityPreference;
+    }
 
-  public int getPartialFlushMinSpans() {
-    return partialFlushMinSpans;
-  }
+    public boolean isOtelTracesSpanMetricsEnabled() {
+        return otelTracesSpanMetricsEnabled;
+    }
 
-  public int getTraceKeepLatencyThreshold() {
-    return traceKeepLatencyThreshold;
-  }
+    public boolean isTraceOtelSemanticsEnabled() {
+        return traceOtelSemanticsEnabled;
+    }
 
-  public boolean isTraceKeepLatencyThresholdEnabled() {
-    return traceKeepLatencyThresholdEnabled;
-  }
+    public boolean isTraceOtelEnabled() {
+        return instrumenterConfig.isTraceOtelEnabled();
+    }
 
-  public boolean isTraceStrictWritesEnabled() {
-    return traceStrictWritesEnabled;
-  }
+    public boolean isTraceOtlpExporterEnabled() {
+        return "otlp".equalsIgnoreCase(traceOtelExporter);
+    }
 
-  public boolean isLogExtractHeaderNames() {
-    return logExtractHeaderNames;
-  }
+    public boolean isOtlpTracesExportEnabled() {
+        if (!writerType.startsWith(MULTI_WRITER_TYPE)) {
+            return OTLP_WRITER_TYPE.equals(writerType);
+        }
+        String multiWriterConfig = writerType.substring(MULTI_WRITER_TYPE.length() + 1);
+        for (CharSequence subWriterType : Strings.split(multiWriterConfig, ',')) {
+            if (OTLP_WRITER_TYPE.contentEquals(subWriterType)) {
+                return true;
+            }
+        }
+        return false;
+    }
 
-  @Deprecated
-  public Set<PropagationStyle> getPropagationStylesToExtract() {
-    return propagationStylesToExtract;
-  }
-
-  @Deprecated
-  public Set<PropagationStyle> getPropagationStylesToInject() {
-    return propagationStylesToInject;
-  }
+    public String getOtlpTracesEndpoint() {
+        return otlpTracesEndpoint;
+    }
 
-  public boolean isTracePropagationStyleB3PaddingEnabled() {
-    return tracePropagationStyleB3PaddingEnabled;
-  }
+    public Map<String, String> getOtlpTracesHeaders() {
+        return otlpTracesHeaders;
+    }
 
-  public Set<TracePropagationStyle> getTracePropagationStylesToExtract() {
-    return tracePropagationStylesToExtract;
-  }
+    public OtlpConfig.Protocol getOtlpTracesProtocol() {
+        return otlpTracesProtocol;
+    }
 
-  public Set<TracePropagationStyle> getTracePropagationStylesToInject() {
-    return tracePropagationStylesToInject;
-  }
+    public OtlpConfig.Compression getOtlpTracesCompression() {
+        return otlpTracesCompression;
+    }
 
-  public TracePropagationBehaviorExtract getTracePropagationBehaviorExtract() {
-    return tracePropagationBehaviorExtract;
-  }
+    public int getOtlpTracesTimeout() {
+        return otlpTracesTimeout;
+    }
 
-  public boolean isTracePropagationExtractFirst() {
-    return tracePropagationExtractFirst;
-  }
+    public boolean isRuleEnabled(final String name) {
+        return isRuleEnabled(name, true);
+    }
 
-  public boolean isTraceOrgGuardEnabled() {
-    return traceOrgGuardEnabled;
-  }
+    public boolean isRuleEnabled(final String name, boolean defaultEnabled) {
+        boolean enabled = configProvider.getBoolean("trace." + name + ".enabled", defaultEnabled);
+        boolean lowerEnabled =
+                configProvider.getBoolean("trace." + name.toLowerCase(Locale.ROOT) + ".enabled", defaultEnabled);
+        return defaultEnabled ? enabled && lowerEnabled : enabled || lowerEnabled;
+    }
 
-  public boolean isTraceOrgGuardStrict() {
-    return traceOrgGuardStrict;
-  }
+    /**
+     * @param integrationNames the integration names to check
+     * @param defaultEnabled the value to return when no integration name is configured
+     * @return {@code true} if the JMX fetch integration is enabled
+     * @deprecated This method should only be used internally. Use the instance getter instead {@link
+     *     #isJmxFetchIntegrationEnabled(Iterable, boolean)}.
+     */
+    public static boolean jmxFetchIntegrationEnabled(
+            final SortedSet<String> integrationNames, final boolean defaultEnabled) {
+        return Config.get().isJmxFetchIntegrationEnabled(integrationNames, defaultEnabled);
+    }
 
-  public Set<String> getTraceOrgGuardTrustedOpms() {
-    return traceOrgGuardTrustedOpms;
-  }
+    public boolean isEndToEndDurationEnabled(final boolean defaultEnabled, final String... integrationNames) {
+        return configProvider.isEnabled(Arrays.asList(integrationNames), "", ".e2e.duration.enabled", defaultEnabled);
+    }
 
-  public boolean isInferredProxyPropagationEnabled() {
-    return traceInferredProxyEnabled;
-  }
+    public boolean isPropagationEnabled(final boolean defaultEnabled, final String... integrationNames) {
+        return configProvider.isEnabled(Arrays.asList(integrationNames), "", ".propagation.enabled", defaultEnabled);
+    }
 
-  public boolean isBaggageExtract() {
-    return tracePropagationStylesToExtract.contains(TracePropagationStyle.BAGGAGE);
-  }
+    public boolean isInjectDatadogAttributeEnabled(final boolean defaultEnabled, final String... integrationNames) {
+        return configProvider.isEnabled(
+                Arrays.asList(integrationNames), "", ".inject.datadog.attribute.enabled", defaultEnabled);
+    }
 
-  public boolean isBaggageInject() {
-    return tracePropagationStylesToInject.contains(TracePropagationStyle.BAGGAGE);
-  }
+    public boolean isLegacyTracingEnabled(final boolean defaultEnabled, final String... integrationNames) {
+        return configProvider.isEnabled(Arrays.asList(integrationNames), "", ".legacy.tracing.enabled", defaultEnabled);
+    }
 
-  public boolean isBaggagePropagationEnabled() {
-    return isBaggageInject() || isBaggageExtract();
-  }
-
-  public int getTraceBaggageMaxItems() {
-    return traceBaggageMaxItems;
-  }
-
-  public int getTraceBaggageMaxBytes() {
-    return traceBaggageMaxBytes;
-  }
-
-  public int getClockSyncPeriod() {
-    return clockSyncPeriod;
-  }
-
-  public String getDogStatsDNamedPipe() {
-    return dogStatsDNamedPipe;
-  }
-
-  public int getDogStatsDStartDelay() {
-    return dogStatsDStartDelay;
-  }
-
-  public Integer getStatsDClientQueueSize() {
-    return statsDClientQueueSize;
-  }
-
-  public Integer getStatsDClientSocketBuffer() {
-    return statsDClientSocketBuffer;
-  }
-
-  public Integer getStatsDClientSocketTimeout() {
-    return statsDClientSocketTimeout;
-  }
-
-  public boolean isRuntimeMetricsEnabled() {
-    return runtimeMetricsEnabled;
-  }
-
-  public boolean isJmxFetchEnabled() {
-    return jmxFetchEnabled;
-  }
-
-  public String getJmxFetchConfigDir() {
-    return jmxFetchConfigDir;
-  }
-
-  public List<String> getJmxFetchConfigs() {
-    return jmxFetchConfigs;
-  }
-
-  public List<String> getJmxFetchMetricsConfigs() {
-    return jmxFetchMetricsConfigs;
-  }
-
-  public Integer getJmxFetchCheckPeriod() {
-    return jmxFetchCheckPeriod;
-  }
-
-  public Integer getJmxFetchRefreshBeansPeriod() {
-    return jmxFetchRefreshBeansPeriod;
-  }
-
-  public Integer getJmxFetchInitialRefreshBeansPeriod() {
-    return jmxFetchInitialRefreshBeansPeriod;
-  }
-
-  public String getJmxFetchStatsdHost() {
-    return jmxFetchStatsdHost;
-  }
-
-  public Integer getJmxFetchStatsdPort() {
-    return jmxFetchStatsdPort;
-  }
-
-  public boolean isJmxFetchMultipleRuntimeServicesEnabled() {
-    return jmxFetchMultipleRuntimeServicesEnabled;
-  }
-
-  public int getJmxFetchMultipleRuntimeServicesLimit() {
-    return jmxFetchMultipleRuntimeServicesLimit;
-  }
-
-  public boolean isHealthMetricsEnabled() {
-    return healthMetricsEnabled;
-  }
-
-  public String getHealthMetricsStatsdHost() {
-    return healthMetricsStatsdHost;
-  }
-
-  public Integer getHealthMetricsStatsdPort() {
-    return healthMetricsStatsdPort;
-  }
-
-  public boolean isPerfMetricsEnabled() {
-    return perfMetricsEnabled;
-  }
-
-  public boolean isTracerMetricsEnabled() {
-    // When ASM Standalone Billing is enabled metrics should be disabled
-    return tracerMetricsEnabled && isApmTracingEnabled();
-  }
-
-  public boolean isTracerMetricsIgnoreAgentVersion() {
-    return tracerMetricsIgnoreAgentVersion;
-  }
-
-  public boolean isTracerMetricsBufferingEnabled() {
-    return tracerMetricsBufferingEnabled;
-  }
-
-  public int getTracerMetricsMaxAggregates() {
-    return tracerMetricsMaxAggregates;
-  }
-
-  public int getTracerMetricsMaxPending() {
-    return tracerMetricsMaxPending;
-  }
-
-  public int getTraceStatsInterval() {
-    return traceStatsInterval;
-  }
-
-  /**
-   * Upper bound for a configured stats cardinality limit. Each limit sizes a {@code
-   * TagCardinalityHandler} that eagerly allocates four reference arrays of {@code nextPow2(limit *
-   * 2)} slots, so an unbounded value (e.g. a mis-set env var) can exhaust the heap while the
-   * aggregator is constructed, before the tracer finishes starting. {@code 1 << 16} caps a single
-   * handler near ~2 MB while staying far above any useful setting -- the highest built-in default
-   * is 1024, and the aggregate table itself caps at a few thousand rows, so a larger per-key budget
-   * cannot produce more aggregate rows anyway.
-   */
-  private static final int MAX_TRACE_STATS_CARDINALITY_LIMIT = 1 << 16;
-
-  /**
-   * Returns the per-cycle cardinality limit for the named stats field, following the RFC naming
-   * pattern {@code DD_TRACE_STATS_{tagName}_CARDINALITY_LIMIT} (e.g. {@code
-   * DD_TRACE_STATS_RESOURCE_CARDINALITY_LIMIT}). The caller supplies the default from {@code
-   * MetricCardinalityLimits} so per-field rationale stays co-located with the defaults.
-   *
-   * <p>A non-positive configured value is invalid -- each limit sizes a fixed-capacity handler
-   * table that requires a positive size -- so it falls back to {@code defaultLimit}, logged at
-   * debug. A value above {@link #MAX_TRACE_STATS_CARDINALITY_LIMIT} would eagerly allocate handler
-   * tables large enough to exhaust the heap at startup, so it likewise falls back to {@code
-   * defaultLimit}, logged at warn.
-   */
-  public int getTraceStatsCardinalityLimit(String tagName, int defaultLimit) {
-    int limit =
-        configProvider.getInteger("trace.stats." + tagName + ".cardinality.limit", defaultLimit);
-    if (limit <= 0) {
-      log.debug(
-          "Invalid trace.stats.{}.cardinality.limit={}; must be positive. Using default {}.",
-          tagName,
-          limit,
-          defaultLimit);
-      return defaultLimit;
-    }
-    if (limit > MAX_TRACE_STATS_CARDINALITY_LIMIT) {
-      log.warn(
-          "trace.stats.{}.cardinality.limit={} exceeds the maximum of {}; using default {} to avoid excessive memory use.",
-          tagName,
-          limit,
-          MAX_TRACE_STATS_CARDINALITY_LIMIT,
-          defaultLimit);
-      return defaultLimit;
-    }
-    return limit;
-  }
-
-  public boolean isLogsInjectionEnabled() {
-    return logsInjectionEnabled;
-  }
-
-  public boolean isAppLogsCollectionEnabled() {
-    return appLogsCollectionEnabled;
-  }
-
-  public boolean isReportHostName() {
-    return reportHostName;
-  }
-
-  public boolean isTraceAnalyticsEnabled() {
-    return traceAnalyticsEnabled;
-  }
-
-  public String getTraceClientIpHeader() {
-    return traceClientIpHeader;
-  }
-
-  // whether to collect headers and run the client ip resolution (also requires appsec to be enabled
-  // or clientIpEnabled)
-  public boolean isTraceClientIpResolverEnabled() {
-    return traceClientIpResolverEnabled;
-  }
-
-  public boolean isTraceGitMetadataEnabled() {
-    return traceGitMetadataEnabled;
-  }
-
-  public Map<String, String> getTraceSamplingServiceRules() {
-    return traceSamplingServiceRules;
-  }
-
-  public Map<String, String> getTraceSamplingOperationRules() {
-    return traceSamplingOperationRules;
-  }
-
-  public String getTraceSamplingRules() {
-    return traceSamplingRules;
-  }
-
-  public Double getTraceSampleRate() {
-    return traceSampleRate;
-  }
-
-  public int getTraceRateLimit() {
-    return traceRateLimit;
-  }
-
-  public String getSpanSamplingRules() {
-    return spanSamplingRules;
-  }
-
-  public String getSpanSamplingRulesFile() {
-    return spanSamplingRulesFile;
-  }
-
-  public boolean isProfilingEnabled() {
-    if (Platform.isNativeImage()) {
-      if (!instrumenterConfig.isProfilingEnabled() && profilingEnabled.isActive()) {
-        log.warn(
-            "Profiling was not enabled during the native image build. "
-                + "Please set DD_PROFILING_ENABLED=true in your native image build configuration if you want"
-                + "to use profiling.");
-      }
-    }
-    return profilingEnabled.isActive() && instrumenterConfig.isProfilingEnabled();
-  }
-
-  public boolean isProfilingTimelineEventsEnabled() {
-    return timelineEventsEnabled;
-  }
-
-  public boolean isProfilingAgentless() {
-    return profilingAgentless;
-  }
-
-  public int getProfilingStartDelay() {
-    return profilingStartDelay;
-  }
-
-  public boolean isProfilingStartForceFirst() {
-    return profilingStartForceFirst;
-  }
-
-  public int getProfilingUploadPeriod() {
-    return profilingUploadPeriod;
-  }
-
-  public String getProfilingTemplateOverrideFile() {
-    return profilingTemplateOverrideFile;
-  }
-
-  public int getProfilingUploadTimeout() {
-    return profilingUploadTimeout;
-  }
-
-  public String getProfilingUploadCompression() {
-    return profilingUploadCompression;
-  }
-
-  public String getProfilingProxyHost() {
-    return profilingProxyHost;
-  }
-
-  public int getProfilingProxyPort() {
-    return profilingProxyPort;
-  }
-
-  public String getProfilingProxyUsername() {
-    return profilingProxyUsername;
-  }
-
-  public String getProfilingProxyPassword() {
-    return profilingProxyPassword;
-  }
-
-  public int getProfilingExceptionSampleLimit() {
-    return profilingExceptionSampleLimit;
-  }
-
-  public int getProfilingDirectAllocationSampleLimit() {
-    return profilingDirectAllocationSampleLimit;
-  }
-
-  public int getProfilingBackPressureSampleLimit() {
-    return profilingBackPressureSampleLimit;
-  }
-
-  public boolean isProfilingBackPressureSamplingEnabled() {
-    return profilingBackPressureEnabled;
-  }
-
-  public int getProfilingExceptionHistogramTopItems() {
-    return profilingExceptionHistogramTopItems;
-  }
-
-  public int getProfilingExceptionHistogramMaxCollectionSize() {
-    return profilingExceptionHistogramMaxCollectionSize;
-  }
-
-  public boolean isProfilingExcludeAgentThreads() {
-    return profilingExcludeAgentThreads;
-  }
-
-  public boolean isProfilingUploadSummaryOn413Enabled() {
-    return profilingUploadSummaryOn413Enabled;
-  }
-
-  public boolean isProfilingRecordExceptionMessage() {
-    return profilingRecordExceptionMessage;
-  }
-
-  /**
-   * Means "profiling is enabled AND the ddprof engine is allowed to run", not "currently
-   * recording".
-   */
-  public boolean isDatadogProfilerEnabled() {
-    return isProfilingEnabled() && isDatadogProfilerSafeAndConfigured;
-  }
-
-  /**
-   * The raw ddprof env-safety/explicit-flag predicate, without the {@link #isProfilingEnabled()}
-   * AND-prefix: reused by {@link #isOtelThreadContextEnabled()}.
-   */
-  public boolean isDatadogProfilerSafeAndConfigured() {
-    return isDatadogProfilerSafeAndConfigured;
-  }
-
-  /**
-   * Whether the OTel thread/process context should be exposed through the Datadog profiler native
-   * library for external consumers such as eBPF/CWS.
-   */
-  public boolean isOtelThreadContextEnabled() {
-    return otelThreadContextEnabled;
-  }
-
-  public static boolean isDatadogProfilerEnablementOverridden() {
-    // old non-LTS versions without important backports
-    // also, we have no windows binaries
-    return OperatingSystem.isWindows()
-        || isJavaVersion(18)
-        || isJavaVersion(16)
-        || isJavaVersion(15)
-        || isJavaVersion(14)
-        || isJavaVersion(13)
-        || isJavaVersion(12)
-        || isJavaVersion(10)
-        || isJavaVersion(9);
-  }
-
-  public static boolean isDatadogProfilerSafeInCurrentEnvironment() {
-    // don't want to put this logic (which will evolve) in the public ProfilingConfig, and can't
-    // access Platform there
-    if (!JavaVirtualMachine.isJ9() && isJavaVersion(8)) {
-      String arch = SystemProperties.get("os.arch");
-      if ("aarch64".equalsIgnoreCase(arch) || "arm64".equalsIgnoreCase(arch)) {
-        return false;
-      }
-    }
-    if (JavaVirtualMachine.isGraalVM()) {
-      // let's be conservative about GraalVM and require opt-in from the users
-      return false;
-    }
-    boolean result = false;
-    if (JavaVirtualMachine.isJ9()) {
-      // OpenJ9 will activate only JVMTI GetAllStackTraces based profiling which is safe
-      result = true;
-    } else {
-      // JDK 18 is missing ASGCT fixes, so we can't use it
-      if (!isJavaVersion(18)) {
-        result =
-            isJavaVersionAtLeast(17, 0, 5)
-                || (isJavaVersion(11) && isJavaVersionAtLeast(11, 0, 17))
-                || (isJavaVersion(8) && isJavaVersionAtLeast(8, 0, 352));
-      }
-    }
-    return result;
-  }
-
-  public boolean isCrashTrackingAgentless() {
-    return crashTrackingAgentless;
-  }
-
-  public boolean isCrashTrackingErrorsIntakeEnabled() {
-    return crashTrackingErrorsIntakeEnabled;
-  }
-
-  public boolean isCrashTrackingExtendedInfoEnabled() {
-    return crashTrackingExtendedInfoEnabled;
-  }
-
-  public boolean isTelemetryEnabled() {
-    return instrumenterConfig.isTelemetryEnabled();
-  }
-
-  public float getTelemetryHeartbeatInterval() {
-    return telemetryHeartbeatInterval;
-  }
-
-  public long getTelemetryExtendedHeartbeatInterval() {
-    return telemetryExtendedHeartbeatInterval;
-  }
-
-  public float getTelemetryMetricsInterval() {
-    return telemetryMetricsInterval;
-  }
-
-  public boolean isTelemetryDependencyServiceEnabled() {
-    return isTelemetryDependencyServiceEnabled;
-  }
-
-  public boolean isTelemetryMetricsEnabled() {
-    return telemetryMetricsEnabled;
-  }
-
-  public boolean isTelemetryLogCollectionEnabled() {
-    return isTelemetryLogCollectionEnabled;
-  }
-
-  public int getTelemetryDependencyResolutionQueueSize() {
-    return telemetryDependencyResolutionQueueSize;
-  }
-
-  public boolean isClientIpEnabled() {
-    return clientIpEnabled;
-  }
-
-  public ProductActivation getAppSecActivation() {
-    return instrumenterConfig.getAppSecActivation();
-  }
-
-  public int getAppSecTraceRateLimit() {
-    return appSecTraceRateLimit;
-  }
-
-  public boolean isAppSecWafMetrics() {
-    return appSecWafMetrics;
-  }
-
-  // in microseconds
-  public int getAppSecWafTimeout() {
-    return appSecWafTimeout;
-  }
-
-  public String getAppSecObfuscationParameterKeyRegexp() {
-    return appSecObfuscationParameterKeyRegexp;
-  }
-
-  public String getAppSecObfuscationParameterValueRegexp() {
-    return appSecObfuscationParameterValueRegexp;
-  }
-
-  public String getAppSecHttpBlockedTemplateHtml() {
-    return appSecHttpBlockedTemplateHtml;
-  }
-
-  public String getAppSecHttpBlockedTemplateJson() {
-    return appSecHttpBlockedTemplateJson;
-  }
-
-  public UserIdCollectionMode getAppSecUserIdCollectionMode() {
-    return appSecUserIdCollectionMode;
-  }
-
-  public boolean isApiSecurityEnabled() {
-    return apiSecurityEnabled;
-  }
-
-  public float getApiSecuritySampleDelay() {
-    return apiSecuritySampleDelay;
-  }
+    public boolean isSqsLegacyTracingEnabled() {
+        return SpanNaming.instance().namingSchema().allowInferredServices() && isLegacyTracingEnabled(true, "sqs");
+    }
 
-  public int getApiSecurityEndpointCollectionMessageLimit() {
-    return apiSecurityEndpointCollectionMessageLimit;
-  }
+    public boolean isAwsLegacyTracingEnabled() {
+        return SpanNaming.instance().namingSchema().allowInferredServices() && isLegacyTracingEnabled(false, "aws-sdk");
+    }
+
+    public boolean isJmsLegacyTracingEnabled() {
+        return SpanNaming.instance().namingSchema().allowInferredServices() && isLegacyTracingEnabled(true, "jms");
+    }
 
-  public int getApiSecurityMaxDownstreamRequestBodyAnalysis() {
-    return apiSecurityMaxDownstreamRequestBodyAnalysis;
-  }
+    public boolean isKafkaLegacyTracingEnabled() {
+        return SpanNaming.instance().namingSchema().allowInferredServices() && isLegacyTracingEnabled(true, "kafka");
+    }
 
-  public double getApiSecurityDownstreamRequestBodyAnalysisSampleRate() {
-    return apiSecurityDownstreamRequestBodyAnalysisSampleRate;
-  }
+    public boolean isGooglePubSubLegacyTracingEnabled() {
+        return SpanNaming.instance().namingSchema().allowInferredServices()
+                && isLegacyTracingEnabled(true, "google-pubsub");
+    }
 
-  public boolean isApiSecurityEndpointCollectionEnabled() {
-    return instrumenterConfig.isApiSecurityEndpointCollectionEnabled();
-  }
+    public boolean isTimeInQueueEnabled(final boolean defaultEnabled, final String... integrationNames) {
+        return SpanNaming.instance().namingSchema().allowInferredServices()
+                && configProvider.isEnabled(
+                        Arrays.asList(integrationNames), "", ".time-in-queue.enabled", defaultEnabled);
+    }
 
-  public boolean isTraceResourceRenamingEnabled() {
-    return traceResourceRenamingEnabled;
-  }
+    public boolean isAddSpanPointers(final String integrationName) {
+        return configProvider.isEnabled(Arrays.asList(integrationName), "", "add.span.pointers", true);
+    }
 
-  public boolean isTraceResourceRenamingAlwaysSimplifiedEndpoint() {
-    return traceResourceRenamingAlwaysSimplifiedEndpoint;
-  }
+    public boolean isEnabled(final boolean defaultEnabled, final String settingName, String settingSuffix) {
+        return configProvider.isEnabled(Collections.singletonList(settingName), "", settingSuffix, defaultEnabled);
+    }
 
-  public ProductActivation getIastActivation() {
-    return instrumenterConfig.getIastActivation();
-  }
+    public long getDependecyResolutionPeriodMillis() {
+        return dependecyResolutionPeriodMillis;
+    }
 
-  public boolean isIastDebugEnabled() {
-    return iastDebugEnabled;
-  }
-
-  public int getIastMaxConcurrentRequests() {
-    return iastMaxConcurrentRequests;
-  }
-
-  public int getIastVulnerabilitiesPerRequest() {
-    return iastVulnerabilitiesPerRequest;
-  }
-
-  public float getIastRequestSampling() {
-    return iastRequestSampling;
-  }
-
-  public Verbosity getIastTelemetryVerbosity() {
-    return isTelemetryEnabled() ? iastTelemetryVerbosity : Verbosity.OFF;
-  }
-
-  public boolean isIastRedactionEnabled() {
-    return iastRedactionEnabled;
-  }
-
-  public String getIastRedactionNamePattern() {
-    return iastRedactionNamePattern;
-  }
-
-  public String getIastRedactionValuePattern() {
-    return iastRedactionValuePattern;
-  }
-
-  public int getIastTruncationMaxValueLength() {
-    return iastTruncationMaxValueLength;
-  }
-
-  public int getIastMaxRangeCount() {
-    return iastMaxRangeCount;
-  }
-
-  public boolean isIastStacktraceLeakSuppress() {
-    return iastStacktraceLeakSuppress;
-  }
-
-  public IastContext.Mode getIastContextMode() {
-    return iastContextMode;
-  }
-
-  public boolean isIastHardcodedSecretEnabled() {
-    return iastHardcodedSecretEnabled;
-  }
+    public boolean isDbmInjectSqlBaseHash() {
+        return dbmInjectSqlBaseHash;
+    }
 
-  public boolean isIastSourceMappingEnabled() {
-    return iastSourceMappingEnabled;
-  }
-
-  public int getIastSourceMappingMaxSize() {
-    return iastSourceMappingMaxSize;
-  }
+    public boolean isDbmTracePreparedStatements() {
+        return dbmTracePreparedStatements;
+    }
 
-  public IastDetectionMode getIastDetectionMode() {
-    return iastDetectionMode;
-  }
+    public boolean isDbmAlwaysAppendSqlComment() {
+        return dbmAlwaysAppendSqlComment;
+    }
 
-  public boolean isIastAnonymousClassesEnabled() {
-    return iastAnonymousClassesEnabled;
-  }
+    public String getDbmPropagationMode() {
+        return dbmPropagationMode;
+    }
 
-  public boolean isIastStackTraceEnabled() {
-    return iastStackTraceEnabled;
-  }
+    public boolean isDbmPropagationOracleActionOnlyEnabled() {
+        return dbmPropagationOracleActionOnlyEnabled;
+    }
 
-  public boolean isIastExperimentalPropagationEnabled() {
-    return iastExperimentalPropagationEnabled;
-  }
+    // Database monitoring propagation mode constants
+    public static final String DBM_PROPAGATION_MODE_STATIC = "service";
+    public static final String DBM_PROPAGATION_MODE_FULL = "full";
+    public static final String DBM_PROPAGATION_MODE_DYNAMIC_SERVICE = "dynamic_service";
 
-  public String getIastSecurityControlsConfiguration() {
-    return iastSecurityControlsConfiguration;
-  }
-
-  public int getIastDbRowsToTaint() {
-    return iastDbRowsToTaint;
-  }
-
-  public boolean isLlmObsEnabled() {
-    return instrumenterConfig.isLlmObsEnabled();
-  }
-
-  public boolean isLlmObsAgentlessEnabled() {
-    return llmObsAgentlessEnabled;
-  }
-
-  public String getLlMObsAgentlessUrl() {
-    return llmObsAgentlessUrl;
-  }
-
-  public String getLlmObsMlApp() {
-    return llmObsMlApp;
-  }
-
-  /**
-   * The fraction of LLM Observability traces retained by the backend, in {@code [0.0, 1.0]}.
-   *
-   * <p>Independent of APM sampling: the decision made with this rate never affects an APM sampling
-   * priority, and an APM decision never affects it.
-   */
-  public double getLlmObsSampleRate() {
-    return llmObsSampleRate;
-  }
-
-  public boolean isCiVisibilityEnabled() {
-    return instrumenterConfig.isCiVisibilityEnabled();
-  }
-
-  public boolean isUsmEnabled() {
-    return instrumenterConfig.isUsmEnabled();
-  }
-
-  public boolean isCiVisibilityTraceSanitationEnabled() {
-    return ciVisibilityTraceSanitationEnabled;
-  }
-
-  public boolean isCiVisibilityAgentlessEnabled() {
-    return ciVisibilityAgentlessEnabled;
-  }
-
-  public String getCiVisibilityAgentlessUrl() {
-    return ciVisibilityAgentlessUrl;
-  }
-
-  public String getCiVisibilityIntakeAgentlessUrl() {
-    return ciVisibilityIntakeAgentlessUrl;
-  }
-
-  public boolean isCiVisibilitySourceDataEnabled() {
-    return ciVisibilitySourceDataEnabled;
-  }
-
-  public boolean isCiVisibilityBuildInstrumentationEnabled() {
-    return ciVisibilityBuildInstrumentationEnabled;
-  }
-
-  public String getCiVisibilityAgentJarUri() {
-    return ciVisibilityAgentJarUri;
-  }
-
-  public File getCiVisibilityAgentJarFile() {
-    if (ciVisibilityAgentJarUri == null || ciVisibilityAgentJarUri.isEmpty()) {
-      throw new IllegalArgumentException("Agent JAR URI is not set in config");
-    }
-
-    try {
-      URI agentJarUri = new URI(ciVisibilityAgentJarUri);
-      return new File(agentJarUri);
-    } catch (URISyntaxException e) {
-      throw new IllegalArgumentException("Malformed agent JAR URI: " + ciVisibilityAgentJarUri, e);
-    }
-  }
-
-  public boolean isCiVisibilityAutoConfigurationEnabled() {
-    return ciVisibilityAutoConfigurationEnabled;
-  }
-
-  public String getCiVisibilityAdditionalChildProcessJvmArgs() {
-    return ciVisibilityAdditionalChildProcessJvmArgs;
-  }
-
-  public boolean isCiVisibilityCompilerPluginAutoConfigurationEnabled() {
-    return ciVisibilityCompilerPluginAutoConfigurationEnabled;
-  }
-
-  public boolean isCiVisibilityCodeCoverageEnabled() {
-    return ciVisibilityCodeCoverageEnabled;
-  }
-
-  /**
-   * @return {@code true} if code coverage line-granularity is explicitly enabled
-   */
-  public boolean isCiVisibilityCoverageLinesEnabled() {
-    return ciVisibilityCoverageLinesEnabled != null && ciVisibilityCoverageLinesEnabled;
-  }
-
-  /**
-   * @return {@code true} if code coverage line-granularity is explicitly disabled
-   */
-  public boolean isCiVisibilityCoverageLinesDisabled() {
-    return ciVisibilityCoverageLinesEnabled != null && !ciVisibilityCoverageLinesEnabled;
-  }
-
-  public String getCiVisibilityCodeCoverageReportDumpDir() {
-    return ciVisibilityCodeCoverageReportDumpDir;
-  }
-
-  public List<String> getCodeCoverageFlags() {
-    return codeCoverageFlags;
-  }
-
-  public String getCiVisibilityCompilerPluginVersion() {
-    return ciVisibilityCompilerPluginVersion;
-  }
-
-  public String getCiVisibilityJacocoPluginVersion() {
-    return ciVisibilityJacocoPluginVersion;
-  }
-
-  public boolean isCiVisibilityJacocoPluginVersionProvided() {
-    return ciVisibilityJacocoPluginVersionProvided;
-  }
-
-  public List<String> getCiVisibilityCodeCoverageIncludes() {
-    return ciVisibilityCodeCoverageIncludes;
-  }
-
-  public List<String> getCiVisibilityCodeCoverageExcludes() {
-    return ciVisibilityCodeCoverageExcludes;
-  }
-
-  public String[] getCiVisibilityCodeCoverageIncludedPackages() {
-    return Arrays.copyOf(
-        ciVisibilityCodeCoverageIncludedPackages, ciVisibilityCodeCoverageIncludedPackages.length);
-  }
-
-  public String[] getCiVisibilityCodeCoverageExcludedPackages() {
-    return Arrays.copyOf(
-        ciVisibilityCodeCoverageExcludedPackages, ciVisibilityCodeCoverageExcludedPackages.length);
-  }
-
-  public List<String> getCiVisibilityJacocoGradleSourceSets() {
-    return ciVisibilityJacocoGradleSourceSets;
-  }
-
-  public boolean isCiVisibilityGradleDependencyVerificationEnabled() {
-    return ciVisibilityGradleDependencyVerificationEnabled;
-  }
-
-  public boolean isCiVisibilityCodeCoverageReportUploadEnabled() {
-    return ciVisibilityCodeCoverageReportUploadEnabled;
-  }
-
-  public Integer getCiVisibilityDebugPort() {
-    return ciVisibilityDebugPort;
-  }
-
-  public boolean isCiVisibilityGitClientEnabled() {
-    return ciVisibilityGitClientEnabled;
-  }
-
-  public boolean isCiVisibilityGitUploadEnabled() {
-    return ciVisibilityGitUploadEnabled;
-  }
-
-  public boolean isCiVisibilityGitUnshallowEnabled() {
-    return ciVisibilityGitUnshallowEnabled;
-  }
-
-  public boolean isCiVisibilityGitUnshallowDefer() {
-    return ciVisibilityGitUnshallowDefer;
-  }
-
-  public long getCiVisibilityGitCommandTimeoutMillis() {
-    return ciVisibilityGitCommandTimeoutMillis;
-  }
-
-  public long getCiVisibilityBackendApiTimeoutMillis() {
-    return ciVisibilityBackendApiTimeoutMillis;
-  }
-
-  public long getCiVisibilityGitUploadTimeoutMillis() {
-    return ciVisibilityGitUploadTimeoutMillis;
-  }
-
-  public String getCiVisibilityGitRemoteName() {
-    return ciVisibilityGitRemoteName;
-  }
-
-  public int getCiVisibilitySignalServerPort() {
-    return ciVisibilitySignalServerPort;
-  }
-
-  public int getCiVisibilitySignalClientTimeoutMillis() {
-    return ciVisibilitySignalClientTimeoutMillis;
-  }
-
-  public String getCiVisibilitySignalServerHost() {
-    return ciVisibilitySignalServerHost;
-  }
-
-  public boolean isCiVisibilityItrEnabled() {
-    return ciVisibilityItrEnabled;
-  }
-
-  public boolean isCiVisibilityTestSkippingEnabled() {
-    return ciVisibilityTestSkippingEnabled;
-  }
-
-  public boolean isCiVisibilityCiProviderIntegrationEnabled() {
-    return ciVisibilityCiProviderIntegrationEnabled;
-  }
-
-  public boolean isCiVisibilityRepoIndexDuplicateKeyCheckEnabled() {
-    return ciVisibilityRepoIndexDuplicateKeyCheckEnabled;
-  }
-
-  public boolean isCiVisibilityRepoIndexFollowSymlinks() {
-    return ciVisibilityRepoIndexFollowSymlinks;
-  }
-
-  public int getCiVisibilityExecutionSettingsCacheSize() {
-    return ciVisibilityExecutionSettingsCacheSize;
-  }
-
-  public int getCiVisibilityJvmInfoCacheSize() {
-    return ciVisibilityJvmInfoCacheSize;
-  }
-
-  public int getCiVisibilityCoverageRootPackagesLimit() {
-    return ciVisibilityCoverageRootPackagesLimit;
-  }
-
-  public String getCiVisibilityInjectedTracerVersion() {
-    return ciVisibilityInjectedTracerVersion;
-  }
-
-  public List<String> getCiVisibilityResourceFolderNames() {
-    return ciVisibilityResourceFolderNames;
-  }
-
-  public boolean isCiVisibilityFlakyRetryEnabled() {
-    return ciVisibilityFlakyRetryEnabled;
-  }
-
-  public boolean isCiVisibilityImpactedTestsDetectionEnabled() {
-    return ciVisibilityImpactedTestsDetectionEnabled;
-  }
-
-  public boolean isCiVisibilityKnownTestsRequestEnabled() {
-    return ciVisibilityKnownTestsRequestEnabled;
-  }
-
-  public boolean isCiVisibilityFlakyRetryOnlyKnownFlakes() {
-    return ciVisibilityFlakyRetryOnlyKnownFlakes;
-  }
-
-  public boolean isCiVisibilityEarlyFlakeDetectionEnabled() {
-    return ciVisibilityEarlyFlakeDetectionEnabled;
-  }
-
-  public int getCiVisibilityEarlyFlakeDetectionLowerLimit() {
-    return ciVisibilityEarlyFlakeDetectionLowerLimit;
-  }
-
-  /**
-   * @return {@code true} if any of the features that require CI Visibility execution policies are
-   *     enabled. This is used to enable corresponding instrumentations only when they're needed,
-   *     avoiding unnecessary overhead.
-   */
-  public boolean isCiVisibilityExecutionPoliciesEnabled() {
-    return ciVisibilityFlakyRetryEnabled
-        || ciVisibilityEarlyFlakeDetectionEnabled
-        || ciVisibilityTestManagementEnabled;
-  }
-
-  public boolean isCiVisibilityScalatestForkMonitorEnabled() {
-    return ciVisibilityScalatestForkMonitorEnabled;
-  }
-
-  public int getCiVisibilityFlakyRetryCount() {
-    return ciVisibilityFlakyRetryCount;
-  }
-
-  public int getCiVisibilityTotalFlakyRetryCount() {
-    return ciVisibilityTotalFlakyRetryCount;
-  }
-
-  public boolean isCiVisibilityDynamicAtrEnabled() {
-    return ciVisibilityDynamicAtrEnabled;
-  }
-
-  public List<Integer> getCiVisibilityDynamicAtrBuckets() {
-    return ciVisibilityDynamicAtrBuckets;
-  }
-
-  public String getCiVisibilitySessionName() {
-    return ciVisibilitySessionName;
-  }
-
-  public String getCiVisibilityModuleName() {
-    return ciVisibilityModuleName;
-  }
-
-  public String getCiVisibilityTestCommand() {
-    return ciVisibilityTestCommand;
-  }
-
-  public boolean isCiVisibilityTelemetryEnabled() {
-    return ciVisibilityTelemetryEnabled;
-  }
-
-  public long getCiVisibilityRumFlushWaitMillis() {
-    return ciVisibilityRumFlushWaitMillis;
-  }
-
-  public boolean isCiVisibilityAutoInjected() {
-    return ciVisibilityAutoInjected;
-  }
-
-  public String getCiVisibilityTestOrder() {
-    return ciVisibilityTestOrder;
-  }
-
-  public boolean isCiVisibilityTestManagementEnabled() {
-    return ciVisibilityTestManagementEnabled;
-  }
-
-  public Integer getCiVisibilityTestManagementAttemptToFixRetries() {
-    return ciVisibilityTestManagementAttemptToFixRetries;
-  }
-
-  public boolean isCiVisibilityFailedTestReplayEnabled() {
-    return ciVisibilityFailedTestReplayEnabled;
-  }
-
-  public String getTestOptimizationManifestFile() {
-    return testOptimizationManifestFile;
-  }
-
-  public boolean isTestOptimizationPayloadsInFiles() {
-    return testOptimizationPayloadsInFiles;
-  }
-
-  public String getGitPullRequestBaseBranch() {
-    return gitPullRequestBaseBranch;
-  }
-
-  public String getGitPullRequestBaseBranchSha() {
-    return gitPullRequestBaseBranchSha;
-  }
-
-  public String getGitCommitHeadSha() {
-    return gitCommitHeadSha;
-  }
-
-  public String getAppSecRulesFile() {
-    return appSecRulesFile;
-  }
-
-  public long getRemoteConfigMaxPayloadSizeBytes() {
-    return remoteConfigMaxPayloadSize;
-  }
-
-  public boolean isRemoteConfigEnabled() {
-    return remoteConfigEnabled;
-  }
-
-  public boolean isRemoteConfigIntegrityCheckEnabled() {
-    return remoteConfigIntegrityCheckEnabled;
-  }
+    // Helper method to check if comment injection is enabled
+    public boolean isDbmCommentInjectionEnabled() {
+        if (dbmPropagationMode == null) {
+            return false;
+        }
+        return dbmPropagationMode.equals(DBM_PROPAGATION_MODE_FULL)
+                || dbmPropagationMode.equals(DBM_PROPAGATION_MODE_STATIC)
+                || dbmPropagationMode.equals(DBM_PROPAGATION_MODE_DYNAMIC_SERVICE);
+    }
 
-  public String getFinalRemoteConfigUrl() {
-    return remoteConfigUrl;
-  }
+    private void logIgnoredSettingWarning(String setting, String overridingSetting, String overridingSuffix) {
+        log.warn(
+                "Setting {} ignored since {}{} is enabled.",
+                propertyNameToSystemPropertyName(setting),
+                propertyNameToSystemPropertyName(overridingSetting),
+                overridingSuffix);
+    }
 
-  public float getRemoteConfigPollIntervalSeconds() {
-    return remoteConfigPollIntervalSeconds;
-  }
+    private void logOverriddenSettingWarning(String setting, String overridingSetting, Object value) {
+        log.warn(
+                "Setting {} is overridden by setting {} with value {}.",
+                propertyNameToSystemPropertyName(setting),
+                propertyNameToSystemPropertyName(overridingSetting),
+                value);
+    }
 
-  public String getRemoteConfigTargetsKeyId() {
-    return remoteConfigTargetsKeyId;
-  }
+    private void logOverriddenDeprecatedSettingWarning(String setting, String overridingSetting, Object value) {
+        log.warn(
+                "Setting {} is deprecated and overridden by setting {} with value {}.",
+                propertyNameToSystemPropertyName(setting),
+                propertyNameToSystemPropertyName(overridingSetting),
+                value);
+    }
 
-  public String getRemoteConfigTargetsKey() {
-    return remoteConfigTargetsKey;
-  }
+    private void logDeprecatedConvertedSetting(
+            String deprecatedSetting, Object oldValue, String newSetting, Object newValue) {
+        log.warn(
+                "Setting {} is deprecated and the value {} has been converted to {} for setting {}.",
+                propertyNameToSystemPropertyName(deprecatedSetting),
+                oldValue,
+                newValue,
+                propertyNameToSystemPropertyName(newSetting));
+    }
 
-  public int getRemoteConfigMaxExtraServices() {
-    return remoteConfigMaxExtraServices;
-  }
+    public boolean isTraceAnalyticsIntegrationEnabled(
+            final SortedSet<String> integrationNames, final boolean defaultEnabled) {
+        return configProvider.isEnabled(integrationNames, "", ".analytics.enabled", defaultEnabled);
+    }
 
-  public boolean isFeatureFlaggingProviderEnabled() {
-    return featureFlaggingProviderEnabled;
-  }
+    public boolean isTraceAnalyticsIntegrationEnabled(final boolean defaultEnabled, final String... integrationNames) {
+        return configProvider.isEnabled(Arrays.asList(integrationNames), "", ".analytics.enabled", defaultEnabled);
+    }
 
-  public String getFeatureFlaggingConfigurationSource() {
-    return featureFlaggingConfigurationSource;
-  }
+    public boolean isSamplingMechanismValidationDisabled() {
+        return configProvider.getBoolean(SAMPLING_MECHANISM_VALIDATION_DISABLED, false);
+    }
 
-  public String getFeatureFlaggingConfigurationSourceAgentlessBaseUrl() {
-    return featureFlaggingConfigurationSourceAgentlessBaseUrl;
-  }
+    public <T extends Enum<T>> T getEnumValue(final String name, final Class<T> type, final T defaultValue) {
+        return configProvider.getEnum(name, type, defaultValue);
+    }
 
-  public int getFeatureFlaggingConfigurationSourcePollIntervalSeconds() {
-    return featureFlaggingConfigurationSourcePollIntervalSeconds;
-  }
+    /**
+     * @param integrationNames the integration names to check
+     * @param defaultEnabled the value to return when no integration name is configured
+     * @return {@code true} if the trace analytics integration is enabled
+     * @deprecated This method should only be used internally. Use the instance getter instead {@link
+     *     #isTraceAnalyticsIntegrationEnabled(SortedSet, boolean)}.
+     */
+    public static boolean traceAnalyticsIntegrationEnabled(
+            final SortedSet<String> integrationNames, final boolean defaultEnabled) {
+        return Config.get().isTraceAnalyticsIntegrationEnabled(integrationNames, defaultEnabled);
+    }
 
-  public int getFeatureFlaggingConfigurationSourceRequestTimeoutSeconds() {
-    return featureFlaggingConfigurationSourceRequestTimeoutSeconds;
-  }
+    public boolean isTelemetryDebugRequestsEnabled() {
+        return telemetryDebugRequestsEnabled;
+    }
 
-  public boolean isDynamicInstrumentationEnabled() {
-    return dynamicInstrumentationEnabled;
-  }
+    public boolean isAgentlessLogSubmissionEnabled() {
+        return instrumenterConfig.isAgentlessLogSubmissionEnabled();
+    }
 
-  public int getDynamicInstrumentationUploadTimeout() {
-    return dynamicInstrumentationUploadTimeout;
-  }
+    public int getAgentlessLogSubmissionQueueSize() {
+        return agentlessLogSubmissionQueueSize;
+    }
 
-  public int getDynamicInstrumentationUploadFlushInterval() {
-    return dynamicInstrumentationUploadFlushInterval;
-  }
+    public String getAgentlessLogSubmissionLevel() {
+        return agentlessLogSubmissionLevel;
+    }
 
-  public boolean isDynamicInstrumentationClassFileDumpEnabled() {
-    return dynamicInstrumentationClassFileDumpEnabled;
-  }
+    public String getAgentlessLogSubmissionUrl() {
+        return agentlessLogSubmissionUrl;
+    }
 
-  public int getDynamicInstrumentationPollInterval() {
-    return dynamicInstrumentationPollInterval;
-  }
+    public String getAgentlessLogSubmissionProduct() {
+        return agentlessLogSubmissionProduct;
+    }
 
-  public int getDynamicInstrumentationDiagnosticsInterval() {
-    return dynamicInstrumentationDiagnosticsInterval;
-  }
+    public boolean isAppSecScaEnabled() {
+        return appSecScaEnabled != null && appSecScaEnabled;
+    }
 
-  public boolean isDynamicInstrumentationMetricsEnabled() {
-    return dynamicInstrumentationMetricEnabled;
-  }
+    public int getAppSecScaMaxTrackedDependencies() {
+        return appSecScaMaxTrackedDependencies;
+    }
 
-  public int getDynamicInstrumentationUploadBatchSize() {
-    return dynamicInstrumentationUploadBatchSize;
-  }
+    public boolean isAppSecRaspEnabled() {
+        return instrumenterConfig.isAppSecRaspEnabled();
+    }
 
-  public long getDynamicInstrumentationMaxPayloadSize() {
-    return dynamicInstrumentationMaxPayloadSize;
-  }
+    public boolean isAppSecStackTraceEnabled() {
+        return appSecStackTraceEnabled;
+    }
 
-  public boolean isDynamicInstrumentationVerifyByteCode() {
-    return dynamicInstrumentationVerifyByteCode;
-  }
+    public int getAppSecMaxStackTraces() {
+        return appSecMaxStackTraces;
+    }
 
-  public String getDynamicInstrumentationInstrumentTheWorld() {
-    return dynamicInstrumentationInstrumentTheWorld;
-  }
+    public int getAppSecMaxStackTraceDepth() {
+        return appSecMaxStackTraceDepth;
+    }
 
-  public String getDynamicInstrumentationExcludeFiles() {
-    return dynamicInstrumentationExcludeFiles;
-  }
+    public int getAppSecBodyParsingSizeLimit() {
+        return appSecBodyParsingSizeLimit;
+    }
 
-  public String getDynamicInstrumentationIncludeFiles() {
-    return dynamicInstrumentationIncludeFiles;
-  }
-
-  public String getDynamicInstrumentationTimeoutCheckerMode() {
-    return dynamicInstrumentationTimeoutCheckerMode;
-  }
+    public int getAppSecMaxFileContentBytes() {
+        return appSecMaxFileContentBytes;
+    }
 
-  public int getDynamicInstrumentationCaptureTimeout() {
-    return dynamicInstrumentationCaptureTimeout;
-  }
-
-  public int getDynamicInstrumentationEvalTimeout() {
-    return dynamicInstrumentationEvaluationTimeout;
-  }
+    public int getAppSecMaxFileContentCount() {
+        return appSecMaxFileContentCount;
+    }
 
-  public boolean isSymbolDatabaseEnabled() {
-    return symbolDatabaseEnabled;
-  }
+    public boolean isCloudPayloadTaggingEnabledFor(String serviceName) {
+        return cloudPayloadTaggingServices.contains(serviceName);
+    }
 
-  public boolean isSymbolDatabaseForceUpload() {
-    return symbolDatabaseForceUpload;
-  }
+    public boolean isCloudPayloadTaggingEnabled() {
+        return isCloudRequestPayloadTaggingEnabled() || isCloudResponsePayloadTaggingEnabled();
+    }
 
-  public int getSymbolDatabaseFlushThreshold() {
-    return symbolDatabaseFlushThreshold;
-  }
+    public List<JsonPath> getCloudRequestPayloadTagging() {
+        return cloudRequestPayloadTagging == null ? Collections.emptyList() : cloudRequestPayloadTagging;
+    }
 
-  public boolean isSymbolDatabaseCompressed() {
-    return symbolDatabaseCompressed;
-  }
+    public boolean isCloudRequestPayloadTaggingEnabled() {
+        return cloudRequestPayloadTagging != null;
+    }
 
-  public boolean isDebuggerExceptionEnabled() {
-    return debuggerExceptionEnabled;
-  }
+    public List<JsonPath> getCloudResponsePayloadTagging() {
+        return cloudResponsePayloadTagging == null ? Collections.emptyList() : cloudResponsePayloadTagging;
+    }
 
-  public int getDebuggerMaxExceptionPerSecond() {
-    return debuggerMaxExceptionPerSecond;
-  }
+    public boolean isCloudResponsePayloadTaggingEnabled() {
+        return cloudResponsePayloadTagging != null;
+    }
 
-  public boolean isDebuggerExceptionOnlyLocalRoot() {
-    return debuggerExceptionOnlyLocalRoot;
-  }
+    public int getCloudPayloadTaggingMaxDepth() {
+        return cloudPayloadTaggingMaxDepth;
+    }
 
-  public boolean isDebuggerExceptionCaptureIntermediateSpansEnabled() {
-    return debuggerExceptionCaptureIntermediateSpansEnabled;
-  }
+    public int getCloudPayloadTaggingMaxTags() {
+        return cloudPayloadTaggingMaxTags;
+    }
 
-  public int getDebuggerExceptionMaxCapturedFrames() {
-    return debuggerExceptionMaxCapturedFrames;
-  }
+    public RumInjectorConfig getRumInjectorConfig() {
+        return this.rumInjectorConfig;
+    }
 
-  public int getDebuggerExceptionCaptureInterval() {
-    return debuggerExceptionCaptureInterval;
-  }
+    public boolean isAiGuardEnabled() {
+        return aiGuardEnabled;
+    }
 
-  public boolean isDebuggerCodeOriginEnabled() {
-    return debuggerCodeOriginEnabled;
-  }
+    public String getAiGuardEndpoint() {
+        return aiGuardEndpoint;
+    }
 
-  public int getDebuggerCodeOriginMaxUserFrames() {
-    return debuggerCodeOriginMaxUserFrames;
-  }
-
-  public boolean isDistributedDebuggerEnabled() {
-    return distributedDebuggerEnabled;
-  }
-
-  public boolean isDebuggerSourceFileTrackingEnabled() {
-    return debuggerSourceFileTrackingEnabled;
-  }
-
-  public boolean isDebuggerSynchronousSourceFileTrackingEnabled() {
-    return debuggerSynchronousSourceFileTrackingEnabled;
-  }
-
-  public Set<String> getThirdPartyIncludes() {
-    return debuggerThirdPartyIncludes;
-  }
-
-  public Set<String> getThirdPartyExcludes() {
-    return debuggerThirdPartyExcludes;
-  }
-
-  public Set<String> getThirdPartyShadingIdentifiers() {
-    return debuggerShadingIdentifiers;
-  }
-
-  private String getFinalDebuggerBaseUrl() {
-    if (agentUrl.startsWith("unix:")) {
-      // provide placeholder agent URL, in practice we'll be tunnelling over UDS
-      return "http://" + agentHost + ":" + agentPort;
-    } else {
-      return agentUrl;
-    }
-  }
-
-  public String getFinalDebuggerSnapshotUrl() {
-    if (Strings.isNotBlank(dynamicInstrumentationSnapshotUrl)) {
-      return dynamicInstrumentationSnapshotUrl;
-    } else if (isCiVisibilityAgentlessEnabled()) {
-      return Intake.LOGS.getAgentlessUrl(this) + "logs";
-    } else {
-      return getFinalDebuggerBaseUrl() + "/debugger/v1/diagnostics";
-    }
-  }
-
-  public String getFinalDebuggerSymDBUrl() {
-    if (isCiVisibilityAgentlessEnabled()) {
-      return Intake.LOGS.getAgentlessUrl(this) + "logs";
-    } else {
-      return getFinalDebuggerBaseUrl() + "/symdb/v1/input";
-    }
-  }
-
-  public String getDynamicInstrumentationProbeFile() {
-    return dynamicInstrumentationProbeFile;
-  }
-
-  public String getDynamicInstrumentationRedactedIdentifiers() {
-    return dynamicInstrumentationRedactedIdentifiers;
-  }
-
-  public Set<String> getDynamicInstrumentationRedactionExcludedIdentifiers() {
-    return dynamicInstrumentationRedactionExcludedIdentifiers;
-  }
-
-  public String getDynamicInstrumentationRedactedTypes() {
-    return dynamicInstrumentationRedactedTypes;
-  }
-
-  public int getDynamicInstrumentationLocalVarHoistingLevel() {
-    return dynamicInstrumentationLocalVarHoistingLevel;
-  }
-
-  public boolean isAwsPropagationEnabled() {
-    return awsPropagationEnabled;
-  }
-
-  public boolean isSqsPropagationEnabled() {
-    return sqsPropagationEnabled;
-  }
-
-  public boolean isSqsBodyPropagationEnabled() {
-    return sqsBodyPropagationEnabled;
-  }
-
-  public boolean isKafkaClientPropagationEnabled() {
-    return kafkaClientPropagationEnabled;
-  }
-
-  public boolean isKafkaClientPropagationDisabledForTopic(String topic) {
-    return null != topic && kafkaClientPropagationDisabledTopics.contains(topic);
-  }
-
-  public boolean isJmsPropagationEnabled() {
-    return jmsPropagationEnabled;
-  }
-
-  public boolean isJmsPropagationDisabledForDestination(final String queueOrTopic) {
-    return null != queueOrTopic
-        && (jmsPropagationDisabledQueues.contains(queueOrTopic)
-            || jmsPropagationDisabledTopics.contains(queueOrTopic));
-  }
-
-  public int getJmsUnacknowledgedMaxAge() {
-    return jmsUnacknowledgedMaxAge;
-  }
-
-  public boolean isKafkaClientBase64DecodingEnabled() {
-    return kafkaClientBase64DecodingEnabled;
-  }
-
-  public boolean isRabbitPropagationEnabled() {
-    return rabbitPropagationEnabled;
-  }
-
-  public boolean isRabbitPropagationDisabledForDestination(final String queueOrExchange) {
-    return null != queueOrExchange
-        && (rabbitPropagationDisabledQueues.contains(queueOrExchange)
-            || rabbitPropagationDisabledExchanges.contains(queueOrExchange));
-  }
-
-  public boolean isRabbitIncludeRoutingKeyInResource() {
-    return rabbitIncludeRoutingKeyInResource;
-  }
-
-  public boolean isMessageBrokerSplitByDestination() {
-    return messageBrokerSplitByDestination;
-  }
-
-  public boolean isHystrixTagsEnabled() {
-    return hystrixTagsEnabled;
-  }
+    public int getAiGuardMaxContentSize() {
+        return aiGuardMaxContentSize;
+    }
 
-  public boolean isHystrixMeasuredEnabled() {
-    return hystrixMeasuredEnabled;
-  }
-
-  public boolean isResilience4jMeasuredEnabled() {
-    return resilience4jMeasuredEnabled;
-  }
-
-  public boolean isSpringSchedulingMeasuredEnabled() {
-    return springSchedulingMeasuredEnabled;
-  }
-
-  public boolean isResilience4jTagMetricsEnabled() {
-    return resilience4jTagMetricsEnabled;
-  }
-
-  public boolean isIgniteCacheIncludeKeys() {
-    return igniteCacheIncludeKeys;
-  }
-
-  public String getObfuscationQueryRegexp() {
-    return obfuscationQueryRegexp;
-  }
-
-  public boolean getPlayReportHttpStatus() {
-    return playReportHttpStatus;
-  }
-
-  public boolean isServletPrincipalEnabled() {
-    return servletPrincipalEnabled;
-  }
-
-  public boolean isSpringDataRepositoryInterfaceResourceName() {
-    return springDataRepositoryInterfaceResourceName;
-  }
-
-  public int getxDatadogTagsMaxLength() {
-    return xDatadogTagsMaxLength;
-  }
-
-  public boolean isServletAsyncTimeoutError() {
-    return servletAsyncTimeoutError;
-  }
-
-  public ProtocolVersion getProtocolVersion() {
-    return protocolVersion;
-  }
-
-  public String getLogLevel() {
-    return logLevel;
-  }
-
-  public boolean isDebugEnabled() {
-    return debugEnabled;
-  }
-
-  public boolean isTriageEnabled() {
-    return triageEnabled;
-  }
-
-  public String getTriageReportTrigger() {
-    return triageReportTrigger;
-  }
-
-  public String getTriageReportDir() {
-    return triageReportDir;
-  }
-
-  public boolean isStartupLogsEnabled() {
-    return startupLogsEnabled;
-  }
-
-  public boolean isCwsEnabled() {
-    return cwsEnabled;
-  }
-
-  public int getCwsTlsRefresh() {
-    return cwsTlsRefresh;
-  }
-
-  public boolean isAzureAppServices() {
-    return azureAppServices;
-  }
-
-  public boolean isAwsServerless() {
-    return awsServerless;
-  }
+    public int getAiGuardMaxMessagesLength() {
+        return aiGuardMaxMessagesLength;
+    }
 
-  public boolean isLambdaSnapStartClockResyncEnabled() {
-    return lambdaSnapStartClockResyncEnabled;
-  }
+    public int getAiGuardTimeout() {
+        return aiGuardTimeout;
+    }
 
-  public boolean isDataStreamsEnabled() {
-    return dataStreamsEnabled;
-  }
+    /**
+     * Global kill-switch for AI Guard sensitive data redaction. When {@code false}, the tracer never
+     * applies the redaction requested by the AI Guard service, even when the evaluation response asks
+     * for it.
+     */
+    public boolean isAiGuardRedactionEnabled() {
+        return aiGuardRedactionEnabled;
+    }
 
-  public float getDataStreamsBucketDurationSeconds() {
-    return dataStreamsBucketDurationSeconds;
-  }
+    private <T> Set<T> getSettingsSetFromEnvironment(String name, Function<String, T> mapper, boolean splitOnWS) {
+        final String value = configProvider.getString(name, "");
+        return convertStringSetToSet(name, parseStringIntoSetOfNonEmptyStrings(value, splitOnWS), mapper);
+    }
 
-  public String getDataStreamsTransactionExtractors() {
-    return dataStreamsTransactionExtractors;
-  }
+    private <F, T> Set<T> convertSettingsSet(Set<F> fromSet, Function<F, Iterable<T>> mapper) {
+        if (fromSet.isEmpty()) {
+            return Collections.emptySet();
+        }
+        Set<T> result = new LinkedHashSet<>(fromSet.size());
+        for (F from : fromSet) {
+            for (T to : mapper.apply(from)) {
+                result.add(to);
+            }
+        }
+        return Collections.unmodifiableSet(result);
+    }
 
-  public long getDataStreamsBucketDurationNanoseconds() {
-    // Rounds to the nearest millisecond before converting to nanos
-    int milliseconds = Math.round(dataStreamsBucketDurationSeconds * 1000);
-    return TimeUnit.MILLISECONDS.toNanos(milliseconds);
-  }
+    public static final String PREFIX = "dd.";
 
-  public String getTraceAgentPath() {
-    return traceAgentPath;
-  }
+    /**
+     * Converts the property name, e.g. 'service.name' into a public system property name, e.g.
+     * `dd.service.name`.
+     *
+     * @param setting The setting name, e.g. `service.name`
+     * @return The public facing system property name
+     */
+    @Nonnull
+    private static String propertyNameToSystemPropertyName(final String setting) {
+        return PREFIX + setting;
+    }
 
-  public String getTestAgentSessionToken() {
-    return testAgentSessionToken;
-  }
+    @Nonnull
+    private static Map<String, String> newHashMap(final int size) {
+        return new HashMap<>(size + 1, 1f);
+    }
 
-  public List<String> getTraceAgentArgs() {
-    return traceAgentArgs;
-  }
+    /**
+     * @param map
+     * @param propNames
+     * @return new unmodifiable copy of {@param map} where properties are overwritten from environment
+     */
+    @Nonnull
+    private Map<String, String> getMapWithPropertiesDefinedByEnvironment(
+            @Nonnull final Map<String, String> map, @Nonnull final String... propNames) {
+        final Map<String, String> res = new HashMap<>(map);
+        for (final String propName : propNames) {
+            final String val = configProvider.getString(propName);
+            if (val != null) {
+                res.put(propName, val);
+            }
+        }
+        return Collections.unmodifiableMap(res);
+    }
 
-  public String getDogStatsDPath() {
-    return dogStatsDPath;
-  }
+    @Nonnull
+    private static Set<String> parseStringIntoSetOfNonEmptyStrings(final String str) {
+        return parseStringIntoSetOfNonEmptyStrings(str, true);
+    }
 
-  public List<String> getDogStatsDArgs() {
-    return dogStatsDArgs;
-  }
+    @Nonnull
+    private static Set<String> parseStringIntoSetOfNonEmptyStrings(final String str, boolean splitOnWS) {
+        // Using LinkedHashSet to preserve original string order
+        final Set<String> result = new LinkedHashSet<>();
+        // Java returns single value when splitting an empty string. We do not need that value, so
+        // we need to throw it out.
+        int start = 0;
+        int i = 0;
+        for (; i < str.length(); ++i) {
+            char c = str.charAt(i);
+            if (c == ',' || (splitOnWS && Character.isWhitespace(c))) {
+                if (i - start - 1 > 0) {
+                    result.add(str.substring(start, i));
+                }
+                start = i + 1;
+            }
+        }
+        if (i - start - 1 > 0) {
+            result.add(str.substring(start));
+        }
+        return Collections.unmodifiableSet(result);
+    }
 
-  public int getDogsStatsDPort() {
-    return dogStatsDPort;
-  }
+    private static List<Integer> parseDynamicAtrBuckets(String configuredBuckets) {
+        if (configuredBuckets == null || configuredBuckets.isEmpty()) {
+            return null;
+        }
 
-  public String getConfigFileStatus() {
-    return configFileStatus;
-  }
+        String[] values = COMMA.split(configuredBuckets, -1);
+        if (values.length != DYNAMIC_ATR_BUCKET_COUNT) {
+            logInvalidDynamicAtrBuckets(configuredBuckets);
+            return null;
+        }
 
-  public IdGenerationStrategy getIdGenerationStrategy() {
-    return idGenerationStrategy;
-  }
+        List<Integer> buckets = new ArrayList<>(values.length);
+        try {
+            for (String value : values) {
+                int retries = Integer.parseInt(value.trim());
+                if (retries < 1 || retries > MAX_DYNAMIC_ATR_RETRIES_PER_BUCKET) {
+                    logInvalidDynamicAtrBuckets(configuredBuckets);
+                    return null;
+                }
+                buckets.add(retries);
+            }
+            return Collections.unmodifiableList(buckets);
+
+        } catch (NumberFormatException e) {
+            logInvalidDynamicAtrBuckets(configuredBuckets);
+            return null;
+        }
+    }
 
-  public boolean isTrace128bitTraceIdGenerationEnabled() {
-    return trace128bitTraceIdGenerationEnabled;
-  }
+    private static void logInvalidDynamicAtrBuckets(String configuredBuckets) {
+        log.warn(
+                "Invalid {} value '{}'; expected five comma-separated integers in [1, {}]",
+                propertyNameToEnvironmentVariableName(CIVISIBILITY_DYNAMIC_ATR_BUCKETS),
+                configuredBuckets,
+                MAX_DYNAMIC_ATR_RETRIES_PER_BUCKET);
+    }
 
-  public boolean isLogs128bitTraceIdEnabled() {
-    return logs128bitTraceIdEnabled;
-  }
+    private static List<String> parseCodeCoverageFlags(List<String> configuredFlags) {
+        if (configuredFlags.isEmpty()) {
+            return Collections.emptyList();
+        }
 
-  public Set<String> getGrpcIgnoredInboundMethods() {
-    return grpcIgnoredInboundMethods;
-  }
+        List<String> flags = new ArrayList<>(configuredFlags.size());
+        for (String configuredFlag : configuredFlags) {
+            if (!configuredFlag.isEmpty()) {
+                flags.add(configuredFlag);
+            }
+        }
 
-  public Set<String> getGrpcIgnoredOutboundMethods() {
-    return grpcIgnoredOutboundMethods;
-  }
+        if (flags.size() > MAX_CODE_COVERAGE_FLAGS) {
+            log.warn(
+                    "Cannot apply {} code coverage report flags: the maximum supported number is {}. The report will be uploaded without flags.",
+                    flags.size(),
+                    MAX_CODE_COVERAGE_FLAGS);
+            return Collections.emptyList();
+        }
 
-  public boolean isGrpcServerTrimPackageResource() {
-    return grpcServerTrimPackageResource;
-  }
+        return Collections.unmodifiableList(flags);
+    }
 
-  public BitSet getGrpcServerErrorStatuses() {
-    return grpcServerErrorStatuses;
-  }
+    private static <T> Set<T> convertStringSetToSet(
+            String setting, final Set<String> input, Function<String, T> mapper) {
+        if (input.isEmpty()) {
+            return Collections.emptySet();
+        }
+        // Using LinkedHashSet to preserve original string order
+        final Set<T> result = new LinkedHashSet<>();
+        for (final String value : input) {
+            try {
+                result.add(mapper.apply(value));
+            } catch (final IllegalArgumentException e) {
+                log.warn(
+                        "Cannot recognize config string value {} for setting {}",
+                        value,
+                        propertyNameToSystemPropertyName(setting));
+            }
+        }
+        return Collections.unmodifiableSet(result);
+    }
 
-  public BitSet getGrpcClientErrorStatuses() {
-    return grpcClientErrorStatuses;
-  }
+    /** Returns the detected hostname. First tries locally, then using DNS */
+    static String initHostName() {
+        String possibleHostname;
 
-  public boolean isCassandraKeyspaceStatementExtractionEnabled() {
-    return cassandraKeyspaceStatementExtractionEnabled;
-  }
+        // Try environment variable.  This works in almost all environments
+        if (isWindowsOS()) {
+            possibleHostname = getEnv("COMPUTERNAME");
+        } else {
+            possibleHostname = getEnv("HOSTNAME");
+        }
 
-  public boolean isCouchbaseInternalSpansEnabled() {
-    return couchbaseInternalSpansEnabled;
-  }
+        if (possibleHostname != null && !possibleHostname.isEmpty()) {
+            log.debug("Determined hostname from environment variable");
+            return possibleHostname.trim();
+        }
 
-  public boolean isElasticsearchBodyEnabled() {
-    return elasticsearchBodyEnabled;
-  }
-
-  public boolean isElasticsearchParamsEnabled() {
-    return elasticsearchParamsEnabled;
-  }
-
-  public boolean isElasticsearchBodyAndParamsEnabled() {
-    return elasticsearchBodyAndParamsEnabled;
-  }
-
-  public boolean isSparkTaskHistogramEnabled() {
-    return sparkTaskHistogramEnabled;
-  }
-
-  public boolean useSparkAppNameAsService() {
-    return sparkAppNameAsService;
-  }
-
-  public boolean isJaxRsExceptionAsErrorEnabled() {
-    return jaxRsExceptionAsErrorsEnabled;
-  }
-
-  public boolean isAxisPromoteResourceName() {
-    return axisPromoteResourceName;
-  }
+        // Try hostname files
+        final String[] hostNameFiles = new String[] {"/proc/sys/kernel/hostname", "/etc/hostname"};
+        for (final String hostNameFile : hostNameFiles) {
+            try {
+                final Path hostNamePath = FileSystems.getDefault().getPath(hostNameFile);
+                if (Files.isRegularFile(hostNamePath)) {
+                    byte[] bytes = Files.readAllBytes(hostNamePath);
+                    possibleHostname = new String(bytes, StandardCharsets.ISO_8859_1);
+                }
+            } catch (Throwable t) {
+                // Ignore
+            }
+            possibleHostname = ConfigStrings.trim(possibleHostname);
+            if (!possibleHostname.isEmpty()) {
+                log.debug("Determined hostname from file {}", hostNameFile);
+                return possibleHostname;
+            }
+        }
 
-  public boolean isWebsocketMessagesInheritSampling() {
-    return websocketMessagesInheritSampling;
-  }
+        // Try hostname command
+        try (final TraceScope scope = AgentTracer.get().muteTracing();
+                final BufferedReader reader = new BufferedReader(new InputStreamReader(
+                        Runtime.getRuntime().exec("hostname").getInputStream()))) {
+            possibleHostname = reader.readLine();
+        } catch (final Throwable ignore) {
+            // Ignore.  Hostname command is not always available
+        }
 
-  public boolean isWebsocketMessagesSeparateTraces() {
-    return websocketMessagesSeparateTraces;
-  }
+        if (possibleHostname != null && !possibleHostname.isEmpty()) {
+            log.debug("Determined hostname from hostname command");
+            return possibleHostname.trim();
+        }
 
-  public boolean isWebsocketTagSessionId() {
-    return websocketTagSessionId;
-  }
-
-  public boolean isDataJobsEnabled() {
-    return instrumenterConfig.isDataJobsEnabled();
-  }
-
-  public boolean isDataJobsOpenLineageEnabled() {
-    return dataJobsOpenLineageEnabled;
-  }
-
-  public boolean isDataJobsOpenLineageTimeoutEnabled() {
-    return dataJobsOpenLineageTimeoutEnabled;
-  }
-
-  public boolean isDataJobsParseSparkPlanEnabled() {
-    return dataJobsParseSparkPlanEnabled;
-  }
-
-  public boolean isDataJobsExperimentalFeaturesEnabled() {
-    return dataJobsExperimentalFeaturesEnabled;
-  }
-
-  public boolean isApmTracingEnabled() {
-    return apmTracingEnabled;
-  }
-
-  public boolean isJdkSocketEnabled() {
-    return jdkSocketEnabled;
-  }
-
-  public boolean isSpanBuilderReuseEnabled() {
-    return spanBuilderReuseEnabled;
-  }
-
-  public int getTagNameUtf8CacheSize() {
-    return tagNameUtf8CacheSize;
-  }
-
-  public int getTagValueUtf8CacheSize() {
-    return tagValueUtf8CacheSize;
-  }
-
-  public int getStackTraceLengthLimit() {
-    return stackTraceLengthLimit;
-  }
-
-  public boolean isSqsInjectDatadogAttributeEnabled() {
-    return sqsInjectDatadogAttributeEnabled;
-  }
-
-  public boolean isSnsInjectDatadogAttributeEnabled() {
-    return snsInjectDatadogAttributeEnabled;
-  }
-
-  public boolean isEventbridgeInjectDatadogAttributeEnabled() {
-    return eventbridgeInjectDatadogAttributeEnabled;
-  }
-
-  public boolean isSfnInjectDatadogAttributeEnabled() {
-    return sfnInjectDatadogAttributeEnabled;
-  }
-
-  /**
-   * @return A map of tags to be applied only to the local application root span.
-   */
-  public TagMap getLocalRootSpanTags() {
-    final Map<String, String> runtimeTags = getRuntimeTags();
-
-    final TagMap result = TagMap.fromMap(runtimeTags);
-    result.put(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE);
-    result.put(SCHEMA_VERSION_TAG_KEY, SpanNaming.instance().version());
-    result.put(DDTags.PROFILING_ENABLED, isProfilingEnabled() ? 1 : 0);
-    // The _dd.apm.enabled:0 billing marker is intentionally NOT set here. When APM tracing is
-    // disabled it is stamped on every span of each exported chunk (see CoreTracer.write), so that
-    // chunks flushed without their local root span (e.g. a late child span) still opt out of APM
-    // host billing.
-
-    if (reportHostName) {
-      final String hostName = getHostName();
-      if (null != hostName && !hostName.isEmpty()) {
-        result.put(INTERNAL_HOST_NAME, hostName);
-      }
-    }
-
-    if (azureAppServices) {
-      result.putAll(getAzureAppServicesTags());
-    }
-
-    result.putAll(getProcessIdTag());
-
-    return result.freeze();
-  }
-
-  public WellKnownTags getWellKnownTags() {
-    return new WellKnownTags(
-        getRuntimeId(),
-        reportHostName ? getHostName() : "",
-        getEnv(),
-        serviceName,
-        getVersion(),
-        LANGUAGE_TAG_VALUE);
-  }
-
-  public CiVisibilityWellKnownTags getCiVisibilityWellKnownTags() {
-    return new CiVisibilityWellKnownTags(
-        getRuntimeId(),
-        getEnv(),
-        LANGUAGE_TAG_VALUE,
-        SystemProperties.get("java.runtime.name"),
-        SystemProperties.get("java.version"),
-        SystemProperties.get("java.vendor"),
-        SystemProperties.get("os.arch"),
-        SystemProperties.get("os.name"),
-        SystemProperties.get("os.version"),
-        isServiceNameSetByUser() ? "true" : "false");
-  }
-
-  public String getPrimaryTag() {
-    return primaryTag;
-  }
-
-  public Set<String> getMetricsIgnoredResources() {
-    return tryMakeImmutableSet(configProvider.getList(TRACER_METRICS_IGNORED_RESOURCES));
-  }
-
-  public Set<String> getTraceStatsAdditionalTags() {
-    return traceStatsAdditionalTags;
-  }
-
-  public String getEnv() {
-    // intentionally not thread safe
-    if (env == null) {
-      env = getMergedSpanTags().get("env");
-      if (env == null) {
-        env = "";
-      }
-    }
-
-    return env;
-  }
-
-  public String getVersion() {
-    // intentionally not thread safe
-    if (version == null) {
-      version = getMergedSpanTags().get("version");
-      if (version == null) {
-        version = "";
-      }
-    }
-
-    return version;
-  }
-
-  public Map<String, String> getMergedSpanTags() {
-    // Do not include runtimeId into span tags: we only want that added to the root span
-    final Map<String, String> result = newHashMap(getGlobalTags().size() + spanTags.size());
-    result.putAll(getGlobalTags());
-    result.putAll(spanTags);
-    return Collections.unmodifiableMap(result);
-  }
-
-  public Map<String, String> getMergedJmxTags() {
-    final Map<String, String> runtimeTags = getRuntimeTags();
-    final Map<String, String> result =
-        newHashMap(
-            getGlobalTags().size() + jmxTags.size() + runtimeTags.size() + 1 /* for serviceName */);
-    result.putAll(getGlobalTags());
-    result.putAll(jmxTags);
-    result.putAll(runtimeTags);
-    // service name set here instead of getRuntimeTags because apm already manages the service tag
-    // and may chose to override it.
-    // Additionally, infra/JMX metrics require `service` rather than APM's `service.name` tag
-    result.put(SERVICE_TAG, serviceName);
-    return Collections.unmodifiableMap(result);
-  }
-
-  public Map<String, String> getMergedProfilingTags() {
-    final Map<String, String> runtimeTags = getRuntimeTags();
-    final String host = getHostName();
-    final Map<String, String> result =
-        newHashMap(
-            getGlobalTags().size()
-                + profilingTags.size()
-                + runtimeTags.size()
-                + 4 /* for serviceName and host and language and runtime_version */);
-    result.put(HOST_TAG, host); // Host goes first to allow to override it
-    result.putAll(getGlobalTags());
-    result.putAll(profilingTags);
-    result.putAll(runtimeTags);
-    // service name set here instead of getRuntimeTags because apm already manages the service tag
-    // and may chose to override it.
-    result.put(SERVICE_TAG, serviceName);
-    result.put(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE);
-    result.put(RUNTIME_VERSION_TAG, runtimeVersion);
-    if (azureAppServices) {
-      result.putAll(getAzureAppServicesTags());
-    }
-    return Collections.unmodifiableMap(result);
-  }
-
-  public Map<String, String> getMergedCrashTrackingTags() {
-    final Map<String, String> runtimeTags = getRuntimeTags();
-    final String host = getHostName();
-    final Map<String, String> result =
-        newHashMap(
-            getGlobalTags().size()
-                + crashTrackingTags.size()
-                + jmxTags.size()
-                + runtimeTags.size()
-                + 5 /* for serviceName and host and language and env and version */);
-    result.put(HOST_TAG, host); // Host goes first to allow to override it
-    result.putAll(getGlobalTags());
-    result.putAll(jmxTags);
-    result.putAll(crashTrackingTags);
-    result.putAll(runtimeTags);
-    // service name set here instead of getRuntimeTags because apm already manages the service tag
-    // and may chose to override it.
-    result.put(SERVICE_TAG, serviceName);
-    result.put(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE);
-    result.put(VERSION, getVersion());
-    result.put(ENV, getEnv());
-    return Collections.unmodifiableMap(result);
-  }
-
-  public String getDefaultTelemetryUrl() {
-    String site = getSite();
-    String prefix = "";
-    if (site.endsWith("datad0g.com")) {
-      prefix = "all-http-intake.logs.";
-    } else if (site.endsWith("datadoghq.com") || site.endsWith("datadoghq.eu")) {
-      prefix = "instrumentation-telemetry-intake.";
-    }
-    return "https://" + prefix + site + "/api/v2/apmtelemetry";
-  }
-
-  /**
-   * Returns the sample rate for the specified instrumentation or {@link
-   * ConfigDefaults#DEFAULT_ANALYTICS_SAMPLE_RATE} if none specified.
-   */
-  public float getInstrumentationAnalyticsSampleRate(final String... aliases) {
-    for (final String alias : aliases) {
-      final String configKey = alias + ".analytics.sample-rate";
-      final Float rate = configProvider.getFloat("trace." + configKey, configKey);
-      if (null != rate) {
-        return rate;
-      }
-    }
-    return DEFAULT_ANALYTICS_SAMPLE_RATE;
-  }
-
-  /**
-   * Provide 'global' tags, i.e. tags set everywhere. We have to support old (dd.trace.global.tags)
-   * version of this setting if new (dd.tags) version has not been specified.
-   */
-  public Map<String, String> getGlobalTags() {
-    return tags;
-  }
-
-  /**
-   * Return a map of tags required by the datadog backend to link runtime metrics (i.e. jmx) and
-   * traces.
-   *
-   * <p>These tags must be applied to every runtime metrics and placed on the root span of every
-   * trace.
-   *
-   * @return A map of tag-name -> tag-value
-   */
-  private Map<String, String> getRuntimeTags() {
-    return Collections.singletonMap(RUNTIME_ID_TAG, getRuntimeId());
-  }
-
-  private Map<String, Long> getProcessIdTag() {
-    return Collections.singletonMap(PID_TAG, getProcessId());
-  }
-
-  private Map<String, String> getAzureAppServicesTags() {
-    // These variable names and derivations are copied from the dotnet tracer
-    // See
-    // https://github.com/DataDog/dd-trace-dotnet/blob/master/tracer/src/Datadog.Trace/PlatformHelpers/AzureAppServices.cs
-    // and
-    // https://github.com/DataDog/dd-trace-dotnet/blob/master/tracer/src/Datadog.Trace/TraceContext.cs#L207
-    Map<String, String> aasTags = new HashMap<>();
-
-    /// The site name of the site instance in Azure where the traced application is running.
-    String siteName = getEnv("WEBSITE_SITE_NAME");
-    if (siteName != null) {
-      aasTags.put("aas.site.name", siteName);
-    }
-
-    // The kind of application instance running in Azure.
-    // Possible values: app, api, mobileapp, app_linux, app_linux_container, functionapp,
-    // functionapp_linux, functionapp_linux_container
-
-    // The type of application instance running in Azure.
-    // Possible values: app, function
-    if (getEnv("FUNCTIONS_WORKER_RUNTIME") != null
-        || getEnv("FUNCTIONS_EXTENSIONS_VERSION") != null) {
-      aasTags.put("aas.site.kind", "functionapp");
-      aasTags.put("aas.site.type", "function");
-    } else {
-      aasTags.put("aas.site.kind", "app");
-      aasTags.put("aas.site.type", "app");
-    }
-
-    //  The resource group of the site instance in Azure App Services
-    String resourceGroup = getEnv("WEBSITE_RESOURCE_GROUP");
-    if (resourceGroup != null) {
-      aasTags.put("aas.resource.group", resourceGroup);
-    }
-
-    // Example: 8c500027-5f00-400e-8f00-60000000000f+apm-dotnet-EastUSwebspace
-    // Format: {subscriptionId}+{planResourceGroup}-{hostedInRegion}
-    String websiteOwner = getEnv("WEBSITE_OWNER_NAME");
-    int plusIndex = websiteOwner == null ? -1 : websiteOwner.indexOf('+');
-
-    // The subscription ID of the site instance in Azure App Services
-    String subscriptionId = null;
-    if (plusIndex > 0) {
-      subscriptionId = websiteOwner.substring(0, plusIndex);
-      aasTags.put("aas.subscription.id", subscriptionId);
-    }
-
-    if (subscriptionId != null && siteName != null && resourceGroup != null) {
-      // The resource ID of the site instance in Azure App Services
-      String resourceId =
-          "/subscriptions/"
-              + subscriptionId
-              + "/resourcegroups/"
-              + resourceGroup
-              + "/providers/microsoft.web/sites/"
-              + siteName;
-      resourceId = resourceId.toLowerCase(Locale.ROOT);
-      aasTags.put("aas.resource.id", resourceId);
-    } else {
-      log.warn(
-          "Unable to generate resource id subscription id: {}, site name: {}, resource group {}",
-          subscriptionId,
-          siteName,
-          resourceGroup);
-    }
-
-    // The instance ID in Azure
-    String instanceId = getEnv("WEBSITE_INSTANCE_ID");
-    instanceId = instanceId == null ? "unknown" : instanceId;
-    aasTags.put("aas.environment.instance_id", instanceId);
-
-    // The instance name in Azure
-    String instanceName = getEnv("COMPUTERNAME");
-    instanceName = instanceName == null ? "unknown" : instanceName;
-    aasTags.put("aas.environment.instance_name", instanceName);
-
-    // The operating system in Azure
-    String operatingSystem = getEnv("WEBSITE_OS");
-    operatingSystem = operatingSystem == null ? "unknown" : operatingSystem;
-    aasTags.put("aas.environment.os", operatingSystem);
-
-    // The version of the extension installed
-    String siteExtensionVersion = getEnv("DD_AAS_JAVA_EXTENSION_VERSION");
-    siteExtensionVersion = siteExtensionVersion == null ? "unknown" : siteExtensionVersion;
-    aasTags.put("aas.environment.extension_version", siteExtensionVersion);
-
-    aasTags.put("aas.environment.runtime", getProp("java.vm.name", "unknown"));
-
-    return aasTags;
-  }
-
-  private int schemaVersionFromConfig() {
-    String defaultVersion;
-    // use v1 so Azure Functions operation name is consistent with that of other tracers
-    if (azureFunctions) {
-      defaultVersion = "v1";
-    } else {
-      defaultVersion = "v" + SpanNaming.SCHEMA_MIN_VERSION;
-    }
-    String versionStr = configProvider.getString(TRACE_SPAN_ATTRIBUTE_SCHEMA, defaultVersion);
-    Matcher matcher = Pattern.compile("^v?(0|[1-9]\\d*)$").matcher(versionStr);
-    int parsedVersion = -1;
-    if (matcher.matches()) {
-      parsedVersion = Integer.parseInt(matcher.group(1));
-    }
-    if (parsedVersion < SpanNaming.SCHEMA_MIN_VERSION
-        || parsedVersion > SpanNaming.SCHEMA_MAX_VERSION) {
-      log.warn(
-          "Invalid attribute schema version {} invalid or out of range [v{}, v{}]. Defaulting to v{}",
-          versionStr,
-          SpanNaming.SCHEMA_MIN_VERSION,
-          SpanNaming.SCHEMA_MAX_VERSION,
-          SpanNaming.SCHEMA_MIN_VERSION);
-      parsedVersion = SpanNaming.SCHEMA_MIN_VERSION;
-    }
-    return parsedVersion;
-  }
-
-  public String getFinalProfilingUrl() {
-    if (profilingUrl != null) {
-      // when profilingUrl is set we use it regardless of apiKey/agentless config
-      return profilingUrl;
-    } else if (profilingAgentless) {
-      // when agentless profiling is turned on we send directly to our intake
-      return "https://intake.profile." + site + "/api/v2/profile";
-    } else {
-      // When profilingUrl and agentless are not set we send to the dd trace agent running locally
-      // However, there are two gotchas:
-      // - the agentHost, agentPort split will trip on IPv6 addresses because of the colon -> we
-      // need to use the agentUrl
-      // - but the agentUrl can be unix socket and OKHttp doesn't support that so we fall back to
-      // http
-      //
-      // There is some magic behind the scenes where the http url will be converted to UDS if the
-      // target is a unix socket only
-      String baseUrl =
-          agentUrl.startsWith("unix:") ? "http://" + agentHost + ":" + agentPort : agentUrl;
-      return baseUrl + "/profiling/v1/input";
-    }
-  }
-
-  public String getFinalLLMObsUrl() {
-    if (llmObsAgentlessEnabled) {
-      return "https://llmobs-intake." + site + "/api/v2/llmobs";
-    }
-    return null;
-  }
-
-  public String getFinalCrashTrackingTelemetryUrl() {
-    if (crashTrackingAgentless) {
-      // when agentless crashTracking is turned on we send directly to our intake
-      return getDefaultTelemetryUrl();
-    } else {
-      // when agentless are not set we send to the dd trace agent running locally
-      return "http://" + agentHost + ":" + agentPort + "/telemetry/proxy/api/v2/apmtelemetry";
-    }
-  }
-
-  public String getFinalCrashTrackingErrorTrackingUrl() {
-    if (crashTrackingAgentless) {
-      // when agentless crashTracking is turned on we send directly to our intake
-      return "https://error-tracking-intake." + site + "/api/v2/errorsintake";
-    } else {
-      // when agentless are not set we send to the dd trace agent running locally
-      return "http://" + agentHost + ":" + agentPort + "/evp_proxy/v4/api/v2/errorsintake";
-    }
-  }
-
-  public boolean isJmxFetchIntegrationEnabled(
-      final Iterable<String> integrationNames, final boolean defaultEnabled) {
-    return configProvider.isEnabled(integrationNames, "jmxfetch.", ".enabled", defaultEnabled);
-  }
-
-  public boolean isLogsOtelEnabled() {
-    return instrumenterConfig.isLogsOtelEnabled();
-  }
-
-  public boolean isLogsOtlpExporterEnabled() {
-    return "otlp".equalsIgnoreCase(logsOtelExporter);
-  }
-
-  public boolean isOtlpLogsExportEnabled() {
-    return isLogsOtelEnabled() && isLogsOtlpExporterEnabled();
-  }
-
-  public int getLogsOtelInterval() {
-    return logsOtelInterval;
-  }
-
-  public int getLogsOtelTimeout() {
-    return logsOtelTimeout;
-  }
-
-  public int getLogsOtelQueueSize() {
-    return logsOtelQueueSize;
-  }
-
-  public int getLogsOtelBatchSize() {
-    return logsOtelBatchSize;
-  }
-
-  public String getOtlpLogsEndpoint() {
-    return otlpLogsEndpoint;
-  }
-
-  public Map<String, String> getOtlpLogsHeaders() {
-    return otlpLogsHeaders;
-  }
-
-  public OtlpConfig.Protocol getOtlpLogsProtocol() {
-    return otlpLogsProtocol;
-  }
-
-  public OtlpConfig.Compression getOtlpLogsCompression() {
-    return otlpLogsCompression;
-  }
-
-  public int getOtlpLogsTimeout() {
-    return otlpLogsTimeout;
-  }
-
-  public boolean isMetricsOtelEnabled() {
-    return instrumenterConfig.isMetricsOtelEnabled();
-  }
-
-  public boolean isMetricsOtlpExporterEnabled() {
-    return "otlp".equalsIgnoreCase(metricsOtelExporter);
-  }
-
-  public boolean isOtlpMetricsExportEnabled() {
-    return (isMetricsOtelEnabled() && isMetricsOtlpExporterEnabled())
-        || isOtelTracesSpanMetricsEnabled();
-  }
-
-  public boolean isMetricsOtelExperimentalEnabled() {
-    return metricsOtelExperimentalEnabled;
-  }
-
-  public int getMetricsOtelCardinalityLimit() {
-    return metricsOtelCardinalityLimit;
-  }
-
-  public int getMetricsOtelInterval() {
-    return metricsOtelInterval;
-  }
-
-  public int getMetricsOtelTimeout() {
-    return metricsOtelTimeout;
-  }
-
-  public String getOtlpMetricsEndpoint() {
-    return otlpMetricsEndpoint;
-  }
-
-  public Map<String, String> getOtlpMetricsHeaders() {
-    return otlpMetricsHeaders;
-  }
-
-  public OtlpConfig.Protocol getOtlpMetricsProtocol() {
-    return otlpMetricsProtocol;
-  }
-
-  public OtlpConfig.Compression getOtlpMetricsCompression() {
-    return otlpMetricsCompression;
-  }
-
-  public int getOtlpMetricsTimeout() {
-    return otlpMetricsTimeout;
-  }
-
-  public OtlpConfig.Temporality getOtlpMetricsTemporalityPreference() {
-    return otlpMetricsTemporalityPreference;
-  }
-
-  public boolean isOtelTracesSpanMetricsEnabled() {
-    return otelTracesSpanMetricsEnabled;
-  }
-
-  public boolean isTraceOtelSemanticsEnabled() {
-    return traceOtelSemanticsEnabled;
-  }
-
-  public boolean isTraceOtelEnabled() {
-    return instrumenterConfig.isTraceOtelEnabled();
-  }
-
-  public boolean isTraceOtlpExporterEnabled() {
-    return "otlp".equalsIgnoreCase(traceOtelExporter);
-  }
-
-  public boolean isOtlpTracesExportEnabled() {
-    if (!writerType.startsWith(MULTI_WRITER_TYPE)) {
-      return OTLP_WRITER_TYPE.equals(writerType);
-    }
-    String multiWriterConfig = writerType.substring(MULTI_WRITER_TYPE.length() + 1);
-    for (CharSequence subWriterType : Strings.split(multiWriterConfig, ',')) {
-      if (OTLP_WRITER_TYPE.contentEquals(subWriterType)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  public String getOtlpTracesEndpoint() {
-    return otlpTracesEndpoint;
-  }
-
-  public Map<String, String> getOtlpTracesHeaders() {
-    return otlpTracesHeaders;
-  }
-
-  public OtlpConfig.Protocol getOtlpTracesProtocol() {
-    return otlpTracesProtocol;
-  }
-
-  public OtlpConfig.Compression getOtlpTracesCompression() {
-    return otlpTracesCompression;
-  }
-
-  public int getOtlpTracesTimeout() {
-    return otlpTracesTimeout;
-  }
-
-  public boolean isRuleEnabled(final String name) {
-    return isRuleEnabled(name, true);
-  }
-
-  public boolean isRuleEnabled(final String name, boolean defaultEnabled) {
-    boolean enabled = configProvider.getBoolean("trace." + name + ".enabled", defaultEnabled);
-    boolean lowerEnabled =
-        configProvider.getBoolean(
-            "trace." + name.toLowerCase(Locale.ROOT) + ".enabled", defaultEnabled);
-    return defaultEnabled ? enabled && lowerEnabled : enabled || lowerEnabled;
-  }
-
-  /**
-   * @param integrationNames the integration names to check
-   * @param defaultEnabled the value to return when no integration name is configured
-   * @return {@code true} if the JMX fetch integration is enabled
-   * @deprecated This method should only be used internally. Use the instance getter instead {@link
-   *     #isJmxFetchIntegrationEnabled(Iterable, boolean)}.
-   */
-  public static boolean jmxFetchIntegrationEnabled(
-      final SortedSet<String> integrationNames, final boolean defaultEnabled) {
-    return Config.get().isJmxFetchIntegrationEnabled(integrationNames, defaultEnabled);
-  }
-
-  public boolean isEndToEndDurationEnabled(
-      final boolean defaultEnabled, final String... integrationNames) {
-    return configProvider.isEnabled(
-        Arrays.asList(integrationNames), "", ".e2e.duration.enabled", defaultEnabled);
-  }
-
-  public boolean isPropagationEnabled(
-      final boolean defaultEnabled, final String... integrationNames) {
-    return configProvider.isEnabled(
-        Arrays.asList(integrationNames), "", ".propagation.enabled", defaultEnabled);
-  }
-
-  public boolean isInjectDatadogAttributeEnabled(
-      final boolean defaultEnabled, final String... integrationNames) {
-    return configProvider.isEnabled(
-        Arrays.asList(integrationNames), "", ".inject.datadog.attribute.enabled", defaultEnabled);
-  }
-
-  public boolean isLegacyTracingEnabled(
-      final boolean defaultEnabled, final String... integrationNames) {
-    return configProvider.isEnabled(
-        Arrays.asList(integrationNames), "", ".legacy.tracing.enabled", defaultEnabled);
-  }
-
-  public boolean isSqsLegacyTracingEnabled() {
-    return SpanNaming.instance().namingSchema().allowInferredServices()
-        && isLegacyTracingEnabled(true, "sqs");
-  }
-
-  public boolean isAwsLegacyTracingEnabled() {
-    return SpanNaming.instance().namingSchema().allowInferredServices()
-        && isLegacyTracingEnabled(false, "aws-sdk");
-  }
-
-  public boolean isJmsLegacyTracingEnabled() {
-    return SpanNaming.instance().namingSchema().allowInferredServices()
-        && isLegacyTracingEnabled(true, "jms");
-  }
-
-  public boolean isKafkaLegacyTracingEnabled() {
-    return SpanNaming.instance().namingSchema().allowInferredServices()
-        && isLegacyTracingEnabled(true, "kafka");
-  }
-
-  public boolean isGooglePubSubLegacyTracingEnabled() {
-    return SpanNaming.instance().namingSchema().allowInferredServices()
-        && isLegacyTracingEnabled(true, "google-pubsub");
-  }
-
-  public boolean isTimeInQueueEnabled(
-      final boolean defaultEnabled, final String... integrationNames) {
-    return SpanNaming.instance().namingSchema().allowInferredServices()
-        && configProvider.isEnabled(
-            Arrays.asList(integrationNames), "", ".time-in-queue.enabled", defaultEnabled);
-  }
-
-  public boolean isAddSpanPointers(final String integrationName) {
-    return configProvider.isEnabled(Arrays.asList(integrationName), "", "add.span.pointers", true);
-  }
-
-  public boolean isEnabled(
-      final boolean defaultEnabled, final String settingName, String settingSuffix) {
-    return configProvider.isEnabled(
-        Collections.singletonList(settingName), "", settingSuffix, defaultEnabled);
-  }
-
-  public long getDependecyResolutionPeriodMillis() {
-    return dependecyResolutionPeriodMillis;
-  }
-
-  public boolean isDbmInjectSqlBaseHash() {
-    return dbmInjectSqlBaseHash;
-  }
-
-  public boolean isDbmTracePreparedStatements() {
-    return dbmTracePreparedStatements;
-  }
-
-  public boolean isDbmAlwaysAppendSqlComment() {
-    return dbmAlwaysAppendSqlComment;
-  }
-
-  public String getDbmPropagationMode() {
-    return dbmPropagationMode;
-  }
-
-  public boolean isDbmPropagationOracleActionOnlyEnabled() {
-    return dbmPropagationOracleActionOnlyEnabled;
-  }
-
-  // Database monitoring propagation mode constants
-  public static final String DBM_PROPAGATION_MODE_STATIC = "service";
-  public static final String DBM_PROPAGATION_MODE_FULL = "full";
-  public static final String DBM_PROPAGATION_MODE_DYNAMIC_SERVICE = "dynamic_service";
-
-  // Helper method to check if comment injection is enabled
-  public boolean isDbmCommentInjectionEnabled() {
-    if (dbmPropagationMode == null) {
-      return false;
-    }
-    return dbmPropagationMode.equals(DBM_PROPAGATION_MODE_FULL)
-        || dbmPropagationMode.equals(DBM_PROPAGATION_MODE_STATIC)
-        || dbmPropagationMode.equals(DBM_PROPAGATION_MODE_DYNAMIC_SERVICE);
-  }
-
-  private void logIgnoredSettingWarning(
-      String setting, String overridingSetting, String overridingSuffix) {
-    log.warn(
-        "Setting {} ignored since {}{} is enabled.",
-        propertyNameToSystemPropertyName(setting),
-        propertyNameToSystemPropertyName(overridingSetting),
-        overridingSuffix);
-  }
-
-  private void logOverriddenSettingWarning(String setting, String overridingSetting, Object value) {
-    log.warn(
-        "Setting {} is overridden by setting {} with value {}.",
-        propertyNameToSystemPropertyName(setting),
-        propertyNameToSystemPropertyName(overridingSetting),
-        value);
-  }
-
-  private void logOverriddenDeprecatedSettingWarning(
-      String setting, String overridingSetting, Object value) {
-    log.warn(
-        "Setting {} is deprecated and overridden by setting {} with value {}.",
-        propertyNameToSystemPropertyName(setting),
-        propertyNameToSystemPropertyName(overridingSetting),
-        value);
-  }
-
-  private void logDeprecatedConvertedSetting(
-      String deprecatedSetting, Object oldValue, String newSetting, Object newValue) {
-    log.warn(
-        "Setting {} is deprecated and the value {} has been converted to {} for setting {}.",
-        propertyNameToSystemPropertyName(deprecatedSetting),
-        oldValue,
-        newValue,
-        propertyNameToSystemPropertyName(newSetting));
-  }
-
-  public boolean isTraceAnalyticsIntegrationEnabled(
-      final SortedSet<String> integrationNames, final boolean defaultEnabled) {
-    return configProvider.isEnabled(integrationNames, "", ".analytics.enabled", defaultEnabled);
-  }
-
-  public boolean isTraceAnalyticsIntegrationEnabled(
-      final boolean defaultEnabled, final String... integrationNames) {
-    return configProvider.isEnabled(
-        Arrays.asList(integrationNames), "", ".analytics.enabled", defaultEnabled);
-  }
-
-  public boolean isSamplingMechanismValidationDisabled() {
-    return configProvider.getBoolean(SAMPLING_MECHANISM_VALIDATION_DISABLED, false);
-  }
-
-  public <T extends Enum<T>> T getEnumValue(
-      final String name, final Class<T> type, final T defaultValue) {
-    return configProvider.getEnum(name, type, defaultValue);
-  }
-
-  /**
-   * @param integrationNames the integration names to check
-   * @param defaultEnabled the value to return when no integration name is configured
-   * @return {@code true} if the trace analytics integration is enabled
-   * @deprecated This method should only be used internally. Use the instance getter instead {@link
-   *     #isTraceAnalyticsIntegrationEnabled(SortedSet, boolean)}.
-   */
-  public static boolean traceAnalyticsIntegrationEnabled(
-      final SortedSet<String> integrationNames, final boolean defaultEnabled) {
-    return Config.get().isTraceAnalyticsIntegrationEnabled(integrationNames, defaultEnabled);
-  }
-
-  public boolean isTelemetryDebugRequestsEnabled() {
-    return telemetryDebugRequestsEnabled;
-  }
-
-  public boolean isAgentlessLogSubmissionEnabled() {
-    return instrumenterConfig.isAgentlessLogSubmissionEnabled();
-  }
-
-  public int getAgentlessLogSubmissionQueueSize() {
-    return agentlessLogSubmissionQueueSize;
-  }
-
-  public String getAgentlessLogSubmissionLevel() {
-    return agentlessLogSubmissionLevel;
-  }
-
-  public String getAgentlessLogSubmissionUrl() {
-    return agentlessLogSubmissionUrl;
-  }
-
-  public String getAgentlessLogSubmissionProduct() {
-    return agentlessLogSubmissionProduct;
-  }
-
-  public boolean isAppSecScaEnabled() {
-    return appSecScaEnabled != null && appSecScaEnabled;
-  }
-
-  public int getAppSecScaMaxTrackedDependencies() {
-    return appSecScaMaxTrackedDependencies;
-  }
-
-  public boolean isAppSecRaspEnabled() {
-    return instrumenterConfig.isAppSecRaspEnabled();
-  }
-
-  public boolean isAppSecStackTraceEnabled() {
-    return appSecStackTraceEnabled;
-  }
-
-  public int getAppSecMaxStackTraces() {
-    return appSecMaxStackTraces;
-  }
-
-  public int getAppSecMaxStackTraceDepth() {
-    return appSecMaxStackTraceDepth;
-  }
-
-  public int getAppSecBodyParsingSizeLimit() {
-    return appSecBodyParsingSizeLimit;
-  }
-
-  public int getAppSecMaxFileContentBytes() {
-    return appSecMaxFileContentBytes;
-  }
-
-  public int getAppSecMaxFileContentCount() {
-    return appSecMaxFileContentCount;
-  }
-
-  public boolean isCloudPayloadTaggingEnabledFor(String serviceName) {
-    return cloudPayloadTaggingServices.contains(serviceName);
-  }
-
-  public boolean isCloudPayloadTaggingEnabled() {
-    return isCloudRequestPayloadTaggingEnabled() || isCloudResponsePayloadTaggingEnabled();
-  }
-
-  public List<JsonPath> getCloudRequestPayloadTagging() {
-    return cloudRequestPayloadTagging == null
-        ? Collections.emptyList()
-        : cloudRequestPayloadTagging;
-  }
-
-  public boolean isCloudRequestPayloadTaggingEnabled() {
-    return cloudRequestPayloadTagging != null;
-  }
-
-  public List<JsonPath> getCloudResponsePayloadTagging() {
-    return cloudResponsePayloadTagging == null
-        ? Collections.emptyList()
-        : cloudResponsePayloadTagging;
-  }
-
-  public boolean isCloudResponsePayloadTaggingEnabled() {
-    return cloudResponsePayloadTagging != null;
-  }
-
-  public int getCloudPayloadTaggingMaxDepth() {
-    return cloudPayloadTaggingMaxDepth;
-  }
-
-  public int getCloudPayloadTaggingMaxTags() {
-    return cloudPayloadTaggingMaxTags;
-  }
-
-  public RumInjectorConfig getRumInjectorConfig() {
-    return this.rumInjectorConfig;
-  }
-
-  public boolean isAiGuardEnabled() {
-    return aiGuardEnabled;
-  }
-
-  public String getAiGuardEndpoint() {
-    return aiGuardEndpoint;
-  }
-
-  public int getAiGuardMaxContentSize() {
-    return aiGuardMaxContentSize;
-  }
-
-  public int getAiGuardMaxMessagesLength() {
-    return aiGuardMaxMessagesLength;
-  }
-
-  public int getAiGuardTimeout() {
-    return aiGuardTimeout;
-  }
-
-  /**
-   * Global kill-switch for AI Guard sensitive data redaction. When {@code false}, the tracer never
-   * applies the redaction requested by the AI Guard service, even when the evaluation response asks
-   * for it.
-   */
-  public boolean isAiGuardRedactionEnabled() {
-    return aiGuardRedactionEnabled;
-  }
-
-  private <T> Set<T> getSettingsSetFromEnvironment(
-      String name, Function<String, T> mapper, boolean splitOnWS) {
-    final String value = configProvider.getString(name, "");
-    return convertStringSetToSet(
-        name, parseStringIntoSetOfNonEmptyStrings(value, splitOnWS), mapper);
-  }
-
-  private <F, T> Set<T> convertSettingsSet(Set<F> fromSet, Function<F, Iterable<T>> mapper) {
-    if (fromSet.isEmpty()) {
-      return Collections.emptySet();
-    }
-    Set<T> result = new LinkedHashSet<>(fromSet.size());
-    for (F from : fromSet) {
-      for (T to : mapper.apply(from)) {
-        result.add(to);
-      }
-    }
-    return Collections.unmodifiableSet(result);
-  }
-
-  public static final String PREFIX = "dd.";
-
-  /**
-   * Converts the property name, e.g. 'service.name' into a public system property name, e.g.
-   * `dd.service.name`.
-   *
-   * @param setting The setting name, e.g. `service.name`
-   * @return The public facing system property name
-   */
-  @Nonnull
-  private static String propertyNameToSystemPropertyName(final String setting) {
-    return PREFIX + setting;
-  }
-
-  @Nonnull
-  private static Map<String, String> newHashMap(final int size) {
-    return new HashMap<>(size + 1, 1f);
-  }
-
-  /**
-   * @param map
-   * @param propNames
-   * @return new unmodifiable copy of {@param map} where properties are overwritten from environment
-   */
-  @Nonnull
-  private Map<String, String> getMapWithPropertiesDefinedByEnvironment(
-      @Nonnull final Map<String, String> map, @Nonnull final String... propNames) {
-    final Map<String, String> res = new HashMap<>(map);
-    for (final String propName : propNames) {
-      final String val = configProvider.getString(propName);
-      if (val != null) {
-        res.put(propName, val);
-      }
-    }
-    return Collections.unmodifiableMap(res);
-  }
-
-  @Nonnull
-  private static Set<String> parseStringIntoSetOfNonEmptyStrings(final String str) {
-    return parseStringIntoSetOfNonEmptyStrings(str, true);
-  }
-
-  @Nonnull
-  private static Set<String> parseStringIntoSetOfNonEmptyStrings(
-      final String str, boolean splitOnWS) {
-    // Using LinkedHashSet to preserve original string order
-    final Set<String> result = new LinkedHashSet<>();
-    // Java returns single value when splitting an empty string. We do not need that value, so
-    // we need to throw it out.
-    int start = 0;
-    int i = 0;
-    for (; i < str.length(); ++i) {
-      char c = str.charAt(i);
-      if (c == ',' || (splitOnWS && Character.isWhitespace(c))) {
-        if (i - start - 1 > 0) {
-          result.add(str.substring(start, i));
+        // From DNS
+        try {
+            return InetAddress.getLocalHost().getHostName();
+        } catch (final UnknownHostException e) {
+            // If we are not able to detect the hostname we do not throw an exception.
         }
-        start = i + 1;
-      }
+
+        return null;
+    }
+
+    private static boolean isWindowsOS() {
+        return getProp("os.name").startsWith("Windows");
     }
-    if (i - start - 1 > 0) {
-      result.add(str.substring(start));
+
+    private static String getEnv(String name) {
+        String value = ConfigHelper.env(name);
+        if (value != null) {
+            // Report non-default sequence id for consistency
+            ConfigCollector.get().put(name, value, ConfigOrigin.ENV, NON_DEFAULT_SEQ_ID);
+        }
+        return value;
     }
-    return Collections.unmodifiableSet(result);
-  }
 
-  private static List<Integer> parseDynamicAtrBuckets(String configuredBuckets) {
-    if (configuredBuckets == null || configuredBuckets.isEmpty()) {
-      return null;
+    private static Pattern getPattern(String defaultValue, String userValue) {
+        try {
+            if (userValue != null) {
+                return Pattern.compile(userValue);
+            }
+        } catch (Exception e) {
+            log.debug("Cannot create pattern from user value {}", userValue);
+        }
+        return Pattern.compile(defaultValue);
     }
 
-    String[] values = COMMA.split(configuredBuckets, -1);
-    if (values.length != DYNAMIC_ATR_BUCKET_COUNT) {
-      logInvalidDynamicAtrBuckets(configuredBuckets);
-      return null;
+    private static String getProp(String name) {
+        return getProp(name, null);
     }
 
-    List<Integer> buckets = new ArrayList<>(values.length);
-    try {
-      for (String value : values) {
-        int retries = Integer.parseInt(value.trim());
-        if (retries < 1 || retries > MAX_DYNAMIC_ATR_RETRIES_PER_BUCKET) {
-          logInvalidDynamicAtrBuckets(configuredBuckets);
-          return null;
+    private static String getProp(String name, String def) {
+        String value = SystemProperties.getOrDefault(name, def);
+        if (value != null) {
+            // Report non-default sequence id for consistency
+            ConfigCollector.get().put(name, value, ConfigOrigin.JVM_PROP, NON_DEFAULT_SEQ_ID);
         }
-        buckets.add(retries);
-      }
-      return Collections.unmodifiableList(buckets);
-
-    } catch (NumberFormatException e) {
-      logInvalidDynamicAtrBuckets(configuredBuckets);
-      return null;
-    }
-  }
-
-  private static void logInvalidDynamicAtrBuckets(String configuredBuckets) {
-    log.warn(
-        "Invalid {} value '{}'; expected five comma-separated integers in [1, {}]",
-        propertyNameToEnvironmentVariableName(CIVISIBILITY_DYNAMIC_ATR_BUCKETS),
-        configuredBuckets,
-        MAX_DYNAMIC_ATR_RETRIES_PER_BUCKET);
-  }
-
-  private static List<String> parseCodeCoverageFlags(List<String> configuredFlags) {
-    if (configuredFlags.isEmpty()) {
-      return Collections.emptyList();
-    }
-
-    List<String> flags = new ArrayList<>(configuredFlags.size());
-    for (String configuredFlag : configuredFlags) {
-      if (!configuredFlag.isEmpty()) {
-        flags.add(configuredFlag);
-      }
-    }
-
-    if (flags.size() > MAX_CODE_COVERAGE_FLAGS) {
-      log.warn(
-          "Cannot apply {} code coverage report flags: the maximum supported number is {}. The report will be uploaded without flags.",
-          flags.size(),
-          MAX_CODE_COVERAGE_FLAGS);
-      return Collections.emptyList();
-    }
-
-    return Collections.unmodifiableList(flags);
-  }
-
-  private static <T> Set<T> convertStringSetToSet(
-      String setting, final Set<String> input, Function<String, T> mapper) {
-    if (input.isEmpty()) {
-      return Collections.emptySet();
-    }
-    // Using LinkedHashSet to preserve original string order
-    final Set<T> result = new LinkedHashSet<>();
-    for (final String value : input) {
-      try {
-        result.add(mapper.apply(value));
-      } catch (final IllegalArgumentException e) {
-        log.warn(
-            "Cannot recognize config string value {} for setting {}",
-            value,
-            propertyNameToSystemPropertyName(setting));
-      }
-    }
-    return Collections.unmodifiableSet(result);
-  }
-
-  /** Returns the detected hostname. First tries locally, then using DNS */
-  static String initHostName() {
-    String possibleHostname;
-
-    // Try environment variable.  This works in almost all environments
-    if (isWindowsOS()) {
-      possibleHostname = getEnv("COMPUTERNAME");
-    } else {
-      possibleHostname = getEnv("HOSTNAME");
-    }
-
-    if (possibleHostname != null && !possibleHostname.isEmpty()) {
-      log.debug("Determined hostname from environment variable");
-      return possibleHostname.trim();
-    }
-
-    // Try hostname files
-    final String[] hostNameFiles = new String[] {"/proc/sys/kernel/hostname", "/etc/hostname"};
-    for (final String hostNameFile : hostNameFiles) {
-      try {
-        final Path hostNamePath = FileSystems.getDefault().getPath(hostNameFile);
-        if (Files.isRegularFile(hostNamePath)) {
-          byte[] bytes = Files.readAllBytes(hostNamePath);
-          possibleHostname = new String(bytes, StandardCharsets.ISO_8859_1);
+        return value;
+    }
+
+    // This has to be placed after all other static fields to give them a chance to initialize
+    private static final Config INSTANCE = new Config(
+            Platform.isNativeImageBuilder() ? ConfigProvider.withoutCollector() : ConfigProvider.getInstance(),
+            InstrumenterConfig.get());
+
+    public static Config get() {
+        return INSTANCE;
+    }
+
+    public static boolean isExplicitlyDisabled(String booleanKey) {
+        return Config.get().configProvider().isSet(booleanKey)
+                && !Config.get().configProvider().getBoolean(booleanKey);
+    }
+
+    /**
+     * This method is deprecated since the method of configuration will be changed in the future. The
+     * properties instance should instead be passed directly into the DDTracer builder:
+     *
+     * <pre>
+     *   DDTracer.builder().withProperties(new Properties()).build()
+     * </pre>
+     *
+     * <p>Config keys for use in Properties instance construction can be found in {@link
+     * GeneralConfig} and {@link TracerConfig}.
+     *
+     * @deprecated
+     */
+    @Deprecated
+    public static Config get(final Properties properties) {
+        if (properties == null || properties.isEmpty()) {
+            return INSTANCE;
+        } else {
+            return new Config(ConfigProvider.withPropertiesOverride(properties));
         }
-      } catch (Throwable t) {
-        // Ignore
-      }
-      possibleHostname = ConfigStrings.trim(possibleHostname);
-      if (!possibleHostname.isEmpty()) {
-        log.debug("Determined hostname from file {}", hostNameFile);
-        return possibleHostname;
-      }
-    }
-
-    // Try hostname command
-    try (final TraceScope scope = AgentTracer.get().muteTracing();
-        final BufferedReader reader =
-            new BufferedReader(
-                new InputStreamReader(Runtime.getRuntime().exec("hostname").getInputStream()))) {
-      possibleHostname = reader.readLine();
-    } catch (final Throwable ignore) {
-      // Ignore.  Hostname command is not always available
-    }
-
-    if (possibleHostname != null && !possibleHostname.isEmpty()) {
-      log.debug("Determined hostname from hostname command");
-      return possibleHostname.trim();
-    }
-
-    // From DNS
-    try {
-      return InetAddress.getLocalHost().getHostName();
-    } catch (final UnknownHostException e) {
-      // If we are not able to detect the hostname we do not throw an exception.
-    }
-
-    return null;
-  }
-
-  private static boolean isWindowsOS() {
-    return getProp("os.name").startsWith("Windows");
-  }
-
-  private static String getEnv(String name) {
-    String value = ConfigHelper.env(name);
-    if (value != null) {
-      // Report non-default sequence id for consistency
-      ConfigCollector.get().put(name, value, ConfigOrigin.ENV, NON_DEFAULT_SEQ_ID);
-    }
-    return value;
-  }
-
-  private static Pattern getPattern(String defaultValue, String userValue) {
-    try {
-      if (userValue != null) {
-        return Pattern.compile(userValue);
-      }
-    } catch (Exception e) {
-      log.debug("Cannot create pattern from user value {}", userValue);
-    }
-    return Pattern.compile(defaultValue);
-  }
-
-  private static String getProp(String name) {
-    return getProp(name, null);
-  }
-
-  private static String getProp(String name, String def) {
-    String value = SystemProperties.getOrDefault(name, def);
-    if (value != null) {
-      // Report non-default sequence id for consistency
-      ConfigCollector.get().put(name, value, ConfigOrigin.JVM_PROP, NON_DEFAULT_SEQ_ID);
-    }
-    return value;
-  }
-
-  // This has to be placed after all other static fields to give them a chance to initialize
-  private static final Config INSTANCE =
-      new Config(
-          Platform.isNativeImageBuilder()
-              ? ConfigProvider.withoutCollector()
-              : ConfigProvider.getInstance(),
-          InstrumenterConfig.get());
-
-  public static Config get() {
-    return INSTANCE;
-  }
-
-  public static boolean isExplicitlyDisabled(String booleanKey) {
-    return Config.get().configProvider().isSet(booleanKey)
-        && !Config.get().configProvider().getBoolean(booleanKey);
-  }
-
-  /**
-   * This method is deprecated since the method of configuration will be changed in the future. The
-   * properties instance should instead be passed directly into the DDTracer builder:
-   *
-   * <pre>
-   *   DDTracer.builder().withProperties(new Properties()).build()
-   * </pre>
-   *
-   * <p>Config keys for use in Properties instance construction can be found in {@link
-   * GeneralConfig} and {@link TracerConfig}.
-   *
-   * @deprecated
-   */
-  @Deprecated
-  public static Config get(final Properties properties) {
-    if (properties == null || properties.isEmpty()) {
-      return INSTANCE;
-    } else {
-      return new Config(ConfigProvider.withPropertiesOverride(properties));
-    }
-  }
-
-  @Override
-  public String toString() {
-    return "Config{"
-        + "instrumenterConfig="
-        + instrumenterConfig
-        + ", runtimeId='"
-        + getRuntimeId()
-        + '\''
-        + ", rootSessionId='"
-        + getRootSessionId()
-        + '\''
-        + ", runtimeVersion='"
-        + runtimeVersion
-        + ", apiKey="
-        + (apiKey == null ? "null" : "****")
-        + ", site='"
-        + site
-        + '\''
-        + ", hostName='"
-        + getHostName()
-        + '\''
-        + ", serviceName='"
-        + serviceName
-        + '\''
-        + ", serviceNameSetByUser="
-        + serviceNameSetByUser
-        + ", rootContextServiceName="
-        + rootContextServiceName
-        + ", experimentalFeaturesEnabled="
-        + experimentalFeaturesEnabled
-        + ", integrationSynapseLegacyOperationName="
-        + integrationSynapseLegacyOperationName
-        + ", codeCoverageFlags="
-        + codeCoverageFlags
-        + ", writerType='"
-        + writerType
-        + '\''
-        + ", agentConfiguredUsingDefault="
-        + agentConfiguredUsingDefault
-        + ", agentUrl='"
-        + agentUrl
-        + '\''
-        + ", agentHost='"
-        + agentHost
-        + '\''
-        + ", agentPort="
-        + agentPort
-        + ", agentUnixDomainSocket='"
-        + agentUnixDomainSocket
-        + '\''
-        + ", agentTimeout="
-        + agentTimeout
-        + ", noProxyHosts="
-        + noProxyHosts
-        + ", prioritySamplingEnabled="
-        + prioritySamplingEnabled
-        + ", prioritySamplingForce='"
-        + prioritySamplingForce
-        + '\''
-        + ", traceResolverEnabled="
-        + traceResolverEnabled
-        + ", serviceMapping="
-        + serviceMapping
-        + ", tags="
-        + tags
-        + ", spanTags="
-        + spanTags
-        + ", jmxTags="
-        + jmxTags
-        + ", requestHeaderTags="
-        + requestHeaderTags
-        + ", responseHeaderTags="
-        + responseHeaderTags
-        + ", baggageMapping="
-        + baggageMapping
-        + ", httpServerErrorStatuses="
-        + httpServerErrorStatuses
-        + ", httpClientErrorStatuses="
-        + httpClientErrorStatuses
-        + ", httpServerTagQueryString="
-        + httpServerTagQueryString
-        + ", httpServerRawQueryString="
-        + httpServerRawQueryString
-        + ", httpServerRawResource="
-        + httpServerRawResource
-        + ", httpServerRouteBasedNaming="
-        + httpServerRouteBasedNaming
-        + ", httpServerPathResourceNameMapping="
-        + httpServerPathResourceNameMapping
-        + ", httpClientPathResourceNameMapping="
-        + httpClientPathResourceNameMapping
-        + ", httpClientTagQueryString="
-        + httpClientTagQueryString
-        + ", httpClientSplitByDomain="
-        + httpClientSplitByDomain
-        + ", httpResourceRemoveTrailingSlash="
-        + httpResourceRemoveTrailingSlash
-        + ", dbClientSplitByInstance="
-        + dbClientSplitByInstance
-        + ", dbClientSplitByInstanceTypeSuffix="
-        + dbClientSplitByInstanceTypeSuffix
-        + ", dbClientSplitByHost="
-        + dbClientSplitByHost
-        + ", dbMetadataFetchingEnabled="
-        + dbMetadataFetchingOnQuery
-        + ", dbMetadataFetchingOnConnect="
-        + dbMetadataFetchingOnConnect
-        + ", dbmInjectSqlBaseHash="
-        + dbmInjectSqlBaseHash
-        + ", dbmPropagationMode="
-        + dbmPropagationMode
-        + ", dbmPropagationOracleActionOnlyEnabled="
-        + dbmPropagationOracleActionOnlyEnabled
-        + ", dbmTracePreparedStatements="
-        + dbmTracePreparedStatements
-        + ", splitByTags="
-        + splitByTags
-        + ", traceStatsAdditionalTags="
-        + traceStatsAdditionalTags
-        + ", jeeSplitByDeployment="
-        + jeeSplitByDeployment
-        + ", scopeDepthLimit="
-        + scopeDepthLimit
-        + ", scopeStrictMode="
-        + scopeStrictMode
-        + ", scopeIterationKeepAlive="
-        + scopeIterationKeepAlive
-        + ", partialFlushMinSpans="
-        + partialFlushMinSpans
-        + ", traceKeepLatencyThresholdEnabled="
-        + traceKeepLatencyThresholdEnabled
-        + ", traceKeepLatencyThreshold="
-        + traceKeepLatencyThreshold
-        + ", traceStrictWritesEnabled="
-        + traceStrictWritesEnabled
-        + ", traceBaggageTagKeys="
-        + traceBaggageTagKeys
-        + ", tracePropagationStylesToExtract="
-        + tracePropagationStylesToExtract
-        + ", tracePropagationStylesToInject="
-        + tracePropagationStylesToInject
-        + ", tracePropagationBehaviorExtract="
-        + tracePropagationBehaviorExtract
-        + ", tracePropagationExtractFirst="
-        + tracePropagationExtractFirst
-        + ", traceInferredProxyEnabled="
-        + traceInferredProxyEnabled
-        + ", clockSyncPeriod="
-        + clockSyncPeriod
-        + ", jmxFetchEnabled="
-        + jmxFetchEnabled
-        + ", dogStatsDStartDelay="
-        + dogStatsDStartDelay
-        + ", jmxFetchConfigDir='"
-        + jmxFetchConfigDir
-        + '\''
-        + ", jmxFetchConfigs="
-        + jmxFetchConfigs
-        + ", jmxFetchMetricsConfigs="
-        + jmxFetchMetricsConfigs
-        + ", jmxFetchCheckPeriod="
-        + jmxFetchCheckPeriod
-        + ", jmxFetchInitialRefreshBeansPeriod="
-        + jmxFetchInitialRefreshBeansPeriod
-        + ", jmxFetchRefreshBeansPeriod="
-        + jmxFetchRefreshBeansPeriod
-        + ", jmxFetchStatsdHost='"
-        + jmxFetchStatsdHost
-        + '\''
-        + ", jmxFetchStatsdPort="
-        + jmxFetchStatsdPort
-        + ", jmxFetchMultipleRuntimeServicesEnabled="
-        + jmxFetchMultipleRuntimeServicesEnabled
-        + ", jmxFetchMultipleRuntimeServicesLimit="
-        + jmxFetchMultipleRuntimeServicesLimit
-        + ", healthMetricsEnabled="
-        + healthMetricsEnabled
-        + ", healthMetricsStatsdHost='"
-        + healthMetricsStatsdHost
-        + '\''
-        + ", healthMetricsStatsdPort="
-        + healthMetricsStatsdPort
-        + ", perfMetricsEnabled="
-        + perfMetricsEnabled
-        + ", tracerMetricsEnabled="
-        + tracerMetricsEnabled
-        + ", tracerMetricsIgnoreAgentVersion="
-        + tracerMetricsIgnoreAgentVersion
-        + ", tracerMetricsBufferingEnabled="
-        + tracerMetricsBufferingEnabled
-        + ", tracerMetricsMaxAggregates="
-        + tracerMetricsMaxAggregates
-        + ", tracerMetricsMaxPending="
-        + tracerMetricsMaxPending
-        + ", reportHostName="
-        + reportHostName
-        + ", traceAnalyticsEnabled="
-        + traceAnalyticsEnabled
-        + ", traceSamplingServiceRules="
-        + traceSamplingServiceRules
-        + ", traceSamplingOperationRules="
-        + traceSamplingOperationRules
-        + ", traceSamplingJsonRules="
-        + traceSamplingRules
-        + ", traceSampleRate="
-        + traceSampleRate
-        + ", traceRateLimit="
-        + traceRateLimit
-        + ", spanSamplingRules="
-        + spanSamplingRules
-        + ", spanSamplingRulesFile="
-        + spanSamplingRulesFile
-        + ", profilingAgentless="
-        + profilingAgentless
-        + ", profilingUrl='"
-        + profilingUrl
-        + '\''
-        + ", profilingTags="
-        + profilingTags
-        + ", profilingStartDelay="
-        + profilingStartDelay
-        + ", profilingStartForceFirst="
-        + profilingStartForceFirst
-        + ", profilingUploadPeriod="
-        + profilingUploadPeriod
-        + ", profilingTemplateOverrideFile='"
-        + profilingTemplateOverrideFile
-        + '\''
-        + ", profilingUploadTimeout="
-        + profilingUploadTimeout
-        + ", profilingUploadCompression='"
-        + profilingUploadCompression
-        + '\''
-        + ", profilingProxyHost='"
-        + profilingProxyHost
-        + '\''
-        + ", profilingProxyPort="
-        + profilingProxyPort
-        + ", profilingProxyUsername='"
-        + profilingProxyUsername
-        + '\''
-        + ", profilingProxyPassword="
-        + (profilingProxyPassword == null ? "null" : "****")
-        + ", profilingExceptionSampleLimit="
-        + profilingExceptionSampleLimit
-        + ", profilingExceptionHistogramTopItems="
-        + profilingExceptionHistogramTopItems
-        + ", profilingExceptionHistogramMaxCollectionSize="
-        + profilingExceptionHistogramMaxCollectionSize
-        + ", profilingExcludeAgentThreads="
-        + profilingExcludeAgentThreads
-        + ", otelThreadContextEnabled="
-        + otelThreadContextEnabled
-        + ", crashTrackingTags="
-        + crashTrackingTags
-        + ", crashTrackingAgentless="
-        + crashTrackingAgentless
-        + ", crashTrackingErrorsIntakeEnabled="
-        + crashTrackingErrorsIntakeEnabled
-        + ", crashTrackingExtendedInfoEnabled="
-        + crashTrackingExtendedInfoEnabled
-        + ", remoteConfigEnabled="
-        + remoteConfigEnabled
-        + ", remoteConfigUrl="
-        + remoteConfigUrl
-        + ", remoteConfigPollIntervalSeconds="
-        + remoteConfigPollIntervalSeconds
-        + ", remoteConfigMaxPayloadSize="
-        + remoteConfigMaxPayloadSize
-        + ", remoteConfigIntegrityCheckEnabled="
-        + remoteConfigIntegrityCheckEnabled
-        + ", featureFlaggingProviderEnabled="
-        + featureFlaggingProviderEnabled
-        + ", featureFlaggingConfigurationSource="
-        + featureFlaggingConfigurationSource
-        + ", featureFlaggingConfigurationSourceAgentlessBaseUrl="
-        + featureFlaggingConfigurationSourceAgentlessBaseUrl
-        + ", featureFlaggingConfigurationSourcePollIntervalSeconds="
-        + featureFlaggingConfigurationSourcePollIntervalSeconds
-        + ", featureFlaggingConfigurationSourceRequestTimeoutSeconds="
-        + featureFlaggingConfigurationSourceRequestTimeoutSeconds
-        + ", debuggerEnabled="
-        + dynamicInstrumentationEnabled
-        + ", debuggerUploadTimeout="
-        + dynamicInstrumentationUploadTimeout
-        + ", debuggerUploadFlushInterval="
-        + dynamicInstrumentationUploadFlushInterval
-        + ", debuggerClassFileDumpEnabled="
-        + dynamicInstrumentationClassFileDumpEnabled
-        + ", debuggerPollInterval="
-        + dynamicInstrumentationPollInterval
-        + ", debuggerDiagnosticsInterval="
-        + dynamicInstrumentationDiagnosticsInterval
-        + ", debuggerMetricEnabled="
-        + dynamicInstrumentationMetricEnabled
-        + ", debuggerProbeFileLocation="
-        + dynamicInstrumentationProbeFile
-        + ", debuggerUploadBatchSize="
-        + dynamicInstrumentationUploadBatchSize
-        + ", debuggerMaxPayloadSize="
-        + dynamicInstrumentationMaxPayloadSize
-        + ", debuggerVerifyByteCode="
-        + dynamicInstrumentationVerifyByteCode
-        + ", debuggerInstrumentTheWorld="
-        + dynamicInstrumentationInstrumentTheWorld
-        + ", debuggerExcludeFiles="
-        + dynamicInstrumentationExcludeFiles
-        + ", debuggerIncludeFiles="
-        + dynamicInstrumentationIncludeFiles
-        + ", debuggerCaptureTimeout="
-        + dynamicInstrumentationCaptureTimeout
-        + ", debuggerRedactIdentifiers="
-        + dynamicInstrumentationRedactedIdentifiers
-        + ", debuggerRedactTypes="
-        + dynamicInstrumentationRedactedTypes
-        + ", debuggerSymbolEnabled="
-        + symbolDatabaseEnabled
-        + ", debuggerSymbolForceUpload="
-        + symbolDatabaseForceUpload
-        + ", debuggerSymbolFlushThreshold="
-        + symbolDatabaseFlushThreshold
-        + ", thirdPartyIncludes="
-        + debuggerThirdPartyIncludes
-        + ", thirdPartyExcludes="
-        + debuggerThirdPartyExcludes
-        + ", debuggerExceptionEnabled="
-        + debuggerExceptionEnabled
-        + ", debuggerCodeOriginEnabled="
-        + debuggerCodeOriginEnabled
-        + ", awsPropagationEnabled="
-        + awsPropagationEnabled
-        + ", sqsPropagationEnabled="
-        + sqsPropagationEnabled
-        + ", kafkaClientPropagationEnabled="
-        + kafkaClientPropagationEnabled
-        + ", kafkaClientPropagationDisabledTopics="
-        + kafkaClientPropagationDisabledTopics
-        + ", kafkaClientBase64DecodingEnabled="
-        + kafkaClientBase64DecodingEnabled
-        + ", jmsPropagationEnabled="
-        + jmsPropagationEnabled
-        + ", jmsPropagationDisabledTopics="
-        + jmsPropagationDisabledTopics
-        + ", jmsPropagationDisabledQueues="
-        + jmsPropagationDisabledQueues
-        + ", rabbitPropagationEnabled="
-        + rabbitPropagationEnabled
-        + ", rabbitPropagationDisabledQueues="
-        + rabbitPropagationDisabledQueues
-        + ", rabbitPropagationDisabledExchanges="
-        + rabbitPropagationDisabledExchanges
-        + ", messageBrokerSplitByDestination="
-        + messageBrokerSplitByDestination
-        + ", hystrixTagsEnabled="
-        + hystrixTagsEnabled
-        + ", hystrixMeasuredEnabled="
-        + hystrixMeasuredEnabled
-        + ", springSchedulingMeasuredEnabled="
-        + springSchedulingMeasuredEnabled
-        + ", resilience4jMeasuredEnable="
-        + resilience4jMeasuredEnabled
-        + ", resilience4jTagMetricsEnabled="
-        + resilience4jTagMetricsEnabled
-        + ", igniteCacheIncludeKeys="
-        + igniteCacheIncludeKeys
-        + ", servletPrincipalEnabled="
-        + servletPrincipalEnabled
-        + ", servletAsyncTimeoutError="
-        + servletAsyncTimeoutError
-        + ", datadogTagsLimit="
-        + xDatadogTagsMaxLength
-        + ", traceAgentProtocolVersion="
-        + protocolVersion.asConfigValue()
-        + ", logLevel="
-        + logLevel
-        + ", debugEnabled="
-        + debugEnabled
-        + ", triageEnabled="
-        + triageEnabled
-        + ", triageReportDir="
-        + triageReportDir
-        + ", startLogsEnabled="
-        + startupLogsEnabled
-        + ", configFile='"
-        + configFileStatus
-        + '\''
-        + ", idGenerationStrategy="
-        + idGenerationStrategy
-        + ", trace128bitTraceIdGenerationEnabled="
-        + trace128bitTraceIdGenerationEnabled
-        + ", logs128bitTraceIdEnabled="
-        + logs128bitTraceIdEnabled
-        + ", grpcIgnoredInboundMethods="
-        + grpcIgnoredInboundMethods
-        + ", grpcIgnoredOutboundMethods="
-        + grpcIgnoredOutboundMethods
-        + ", grpcServerErrorStatuses="
-        + grpcServerErrorStatuses
-        + ", grpcClientErrorStatuses="
-        + grpcClientErrorStatuses
-        + ", clientIpEnabled="
-        + clientIpEnabled
-        + ", appSecRulesFile='"
-        + appSecRulesFile
-        + "'"
-        + ", appSecHttpBlockedTemplateHtml="
-        + appSecHttpBlockedTemplateHtml
-        + ", appSecWafTimeout="
-        + appSecWafTimeout
-        + " us, appSecAgenticOnboarding="
-        + appSecAgenticOnboarding
-        + ", appSecHttpBlockedTemplateJson="
-        + appSecHttpBlockedTemplateJson
-        + ", apiSecurityEnabled="
-        + apiSecurityEnabled
-        + ", apiSecurityEndpointCollectionMessageLimit="
-        + apiSecurityEndpointCollectionMessageLimit
-        + ", cwsEnabled="
-        + cwsEnabled
-        + ", cwsTlsRefresh="
-        + cwsTlsRefresh
-        + ", longRunningTraceEnabled="
-        + longRunningTraceEnabled
-        + ", longRunningTraceInitialFlushInterval="
-        + longRunningTraceInitialFlushInterval
-        + ", longRunningTraceFlushInterval="
-        + longRunningTraceFlushInterval
-        + ", cassandraKeyspaceStatementExtractionEnabled="
-        + cassandraKeyspaceStatementExtractionEnabled
-        + ", couchbaseInternalSpansEnabled="
-        + couchbaseInternalSpansEnabled
-        + ", elasticsearchBodyEnabled="
-        + elasticsearchBodyEnabled
-        + ", elasticsearchParamsEnabled="
-        + elasticsearchParamsEnabled
-        + ", elasticsearchBodyAndParamsEnabled="
-        + elasticsearchBodyAndParamsEnabled
-        + ", traceFlushInterval="
-        + traceFlushIntervalSeconds
-        + ", injectBaggageAsTagsEnabled="
-        + injectBaggageAsTagsEnabled
-        + ", traceBuilderTagsPrecedenceEnabled="
-        + traceBuilderTagsPrecedenceEnabled
-        + ", injectLinksAsTagsEnabled="
-        + injectLinksAsTagsEnabled
-        + ", logsInjectionEnabled="
-        + logsInjectionEnabled
-        + ", appLogsCollectionEnabled="
-        + appLogsCollectionEnabled
-        + ", sparkTaskHistogramEnabled="
-        + sparkTaskHistogramEnabled
-        + ", sparkAppNameAsService="
-        + sparkAppNameAsService
-        + ", jaxRsExceptionAsErrorsEnabled="
-        + jaxRsExceptionAsErrorsEnabled
-        + ", axisPromoteResourceName="
-        + axisPromoteResourceName
-        + ", peerHostNameEnabled="
-        + peerHostNameEnabled
-        + ", peerServiceDefaultsEnabled="
-        + peerServiceDefaultsEnabled
-        + ", peerServiceComponentOverrides="
-        + peerServiceComponentOverrides
-        + ", removeIntegrationServiceNamesEnabled="
-        + removeIntegrationServiceNamesEnabled
-        + ", spanAttributeSchemaVersion="
-        + spanAttributeSchemaVersion
-        + ", telemetryDebugRequestsEnabled="
-        + telemetryDebugRequestsEnabled
-        + ", telemetryMetricsEnabled="
-        + telemetryMetricsEnabled
-        + ", appSecScaEnabled="
-        + appSecScaEnabled
-        + ", appSecScaMaxTrackedDependencies="
-        + appSecScaMaxTrackedDependencies
-        + ", appSecRaspEnabled="
-        + isAppSecRaspEnabled()
-        + ", dataJobsOpenLineageEnabled="
-        + dataJobsOpenLineageEnabled
-        + ", dataJobsOpenLineageTimeoutEnabled="
-        + dataJobsOpenLineageTimeoutEnabled
-        + ", dataJobsParseSparkPlanEnabled="
-        + dataJobsParseSparkPlanEnabled
-        + ", dataJobsExperimentalFeaturesEnabled="
-        + dataJobsExperimentalFeaturesEnabled
-        + ", apmTracingEnabled="
-        + apmTracingEnabled
-        + ", jdkSocketEnabled="
-        + jdkSocketEnabled
-        + ", cloudPayloadTaggingServices="
-        + cloudPayloadTaggingServices
-        + ", cloudRequestPayloadTagging="
-        + cloudRequestPayloadTagging
-        + ", cloudResponsePayloadTagging="
-        + cloudResponsePayloadTagging
-        + ", experimentalPropagateProcessTagsEnabled="
-        + experimentalPropagateProcessTagsEnabled
-        + ", processTagsMapping="
-        + processTagsMapping
-        + ", rumInjectorConfig="
-        + (rumInjectorConfig == null ? "null" : rumInjectorConfig.jsonPayload())
-        + ", aiGuardEnabled="
-        + aiGuardEnabled
-        + ", aiGuardEndpoint="
-        + aiGuardEndpoint
-        + ", aiGuardRedactionEnabled="
-        + aiGuardRedactionEnabled
-        + ", logsOtelExporter="
-        + logsOtelExporter
-        + ", logsOtelInterval="
-        + logsOtelInterval
-        + ", logsOtelTimeout="
-        + logsOtelTimeout
-        + ", logsOtelQueueSize="
-        + logsOtelQueueSize
-        + ", logsOtelBatchSize="
-        + logsOtelBatchSize
-        + ", otlpLogsEndpoint="
-        + otlpLogsEndpoint
-        + ", otlpLogsHeaders="
-        + otlpLogsHeaders
-        + ", otlpLogsProtocol="
-        + otlpLogsProtocol
-        + ", otlpLogsCompression="
-        + otlpLogsCompression
-        + ", otlpLogsTimeout="
-        + otlpLogsTimeout
-        + ", metricsOtelExporter="
-        + metricsOtelExporter
-        + ", metricsOtelInterval="
-        + metricsOtelInterval
-        + ", metricsOtelTimeout="
-        + metricsOtelTimeout
-        + ", metricsOtelCardinalityLimit="
-        + metricsOtelCardinalityLimit
-        + ", metricsOtelExperimentalEnabled="
-        + metricsOtelExperimentalEnabled
-        + ", otlpMetricsEndpoint="
-        + otlpMetricsEndpoint
-        + ", otlpMetricsHeaders="
-        + otlpMetricsHeaders
-        + ", otlpMetricsProtocol="
-        + otlpMetricsProtocol
-        + ", otlpMetricsCompression="
-        + otlpMetricsCompression
-        + ", otlpMetricsTimeout="
-        + otlpMetricsTimeout
-        + ", otlpMetricsTemporalityPreference="
-        + otlpMetricsTemporalityPreference
-        + ", otelTracesSpanMetricsEnabled="
-        + otelTracesSpanMetricsEnabled
-        + ", traceOtelSemanticsEnabled="
-        + traceOtelSemanticsEnabled
-        + ", traceStatsInterval="
-        + traceStatsInterval
-        + ", traceOtelExporter="
-        + traceOtelExporter
-        + ", otlpTracesEndpoint="
-        + otlpTracesEndpoint
-        + ", otlpTracesHeaders="
-        + otlpTracesHeaders
-        + ", otlpTracesProtocol="
-        + otlpTracesProtocol
-        + ", otlpTracesCompression="
-        + otlpTracesCompression
-        + ", otlpTracesTimeout="
-        + otlpTracesTimeout
-        + ", ciVisibilityGradleDependencyVerificationEnabled="
-        + ciVisibilityGradleDependencyVerificationEnabled
-        + ", ciVisibilityDynamicAtrEnabled="
-        + ciVisibilityDynamicAtrEnabled
-        + ", ciVisibilityDynamicAtrBuckets="
-        + ciVisibilityDynamicAtrBuckets
-        + ", serviceDiscoveryEnabled="
-        + serviceDiscoveryEnabled
-        + ", sfnInjectDatadogAttributeEnabled="
-        + sfnInjectDatadogAttributeEnabled
-        + ", eventbridgeInjectDatadogAttributeEnabled="
-        + eventbridgeInjectDatadogAttributeEnabled
-        + ", sqsInjectDatadogAttributeEnabled="
-        + sqsInjectDatadogAttributeEnabled
-        + ", snsInjectDatadogAttributeEnabled="
-        + snsInjectDatadogAttributeEnabled
-        + '}';
-  }
+    }
+
+    @Override
+    public String toString() {
+        return "Config{"
+                + "instrumenterConfig="
+                + instrumenterConfig
+                + ", runtimeId='"
+                + getRuntimeId()
+                + '\''
+                + ", rootSessionId='"
+                + getRootSessionId()
+                + '\''
+                + ", runtimeVersion='"
+                + runtimeVersion
+                + ", apiKey="
+                + (apiKey == null ? "null" : "****")
+                + ", site='"
+                + site
+                + '\''
+                + ", hostName='"
+                + getHostName()
+                + '\''
+                + ", serviceName='"
+                + serviceName
+                + '\''
+                + ", serviceNameSetByUser="
+                + serviceNameSetByUser
+                + ", rootContextServiceName="
+                + rootContextServiceName
+                + ", experimentalFeaturesEnabled="
+                + experimentalFeaturesEnabled
+                + ", integrationSynapseLegacyOperationName="
+                + integrationSynapseLegacyOperationName
+                + ", codeCoverageFlags="
+                + codeCoverageFlags
+                + ", writerType='"
+                + writerType
+                + '\''
+                + ", agentConfiguredUsingDefault="
+                + agentConfiguredUsingDefault
+                + ", agentUrl='"
+                + agentUrl
+                + '\''
+                + ", agentHost='"
+                + agentHost
+                + '\''
+                + ", agentPort="
+                + agentPort
+                + ", agentUnixDomainSocket='"
+                + agentUnixDomainSocket
+                + '\''
+                + ", agentTimeout="
+                + agentTimeout
+                + ", noProxyHosts="
+                + noProxyHosts
+                + ", prioritySamplingEnabled="
+                + prioritySamplingEnabled
+                + ", prioritySamplingForce='"
+                + prioritySamplingForce
+                + '\''
+                + ", traceResolverEnabled="
+                + traceResolverEnabled
+                + ", serviceMapping="
+                + serviceMapping
+                + ", tags="
+                + tags
+                + ", spanTags="
+                + spanTags
+                + ", jmxTags="
+                + jmxTags
+                + ", requestHeaderTags="
+                + requestHeaderTags
+                + ", responseHeaderTags="
+                + responseHeaderTags
+                + ", baggageMapping="
+                + baggageMapping
+                + ", httpServerErrorStatuses="
+                + httpServerErrorStatuses
+                + ", httpClientErrorStatuses="
+                + httpClientErrorStatuses
+                + ", httpServerTagQueryString="
+                + httpServerTagQueryString
+                + ", httpServerRawQueryString="
+                + httpServerRawQueryString
+                + ", httpServerRawResource="
+                + httpServerRawResource
+                + ", httpServerRouteBasedNaming="
+                + httpServerRouteBasedNaming
+                + ", httpServerPathResourceNameMapping="
+                + httpServerPathResourceNameMapping
+                + ", httpClientPathResourceNameMapping="
+                + httpClientPathResourceNameMapping
+                + ", httpClientTagQueryString="
+                + httpClientTagQueryString
+                + ", httpClientSplitByDomain="
+                + httpClientSplitByDomain
+                + ", httpResourceRemoveTrailingSlash="
+                + httpResourceRemoveTrailingSlash
+                + ", dbClientSplitByInstance="
+                + dbClientSplitByInstance
+                + ", dbClientSplitByInstanceTypeSuffix="
+                + dbClientSplitByInstanceTypeSuffix
+                + ", dbClientSplitByHost="
+                + dbClientSplitByHost
+                + ", dbMetadataFetchingEnabled="
+                + dbMetadataFetchingOnQuery
+                + ", dbMetadataFetchingOnConnect="
+                + dbMetadataFetchingOnConnect
+                + ", dbmInjectSqlBaseHash="
+                + dbmInjectSqlBaseHash
+                + ", dbmPropagationMode="
+                + dbmPropagationMode
+                + ", dbmPropagationOracleActionOnlyEnabled="
+                + dbmPropagationOracleActionOnlyEnabled
+                + ", dbmTracePreparedStatements="
+                + dbmTracePreparedStatements
+                + ", splitByTags="
+                + splitByTags
+                + ", traceStatsAdditionalTags="
+                + traceStatsAdditionalTags
+                + ", jeeSplitByDeployment="
+                + jeeSplitByDeployment
+                + ", scopeDepthLimit="
+                + scopeDepthLimit
+                + ", scopeStrictMode="
+                + scopeStrictMode
+                + ", scopeIterationKeepAlive="
+                + scopeIterationKeepAlive
+                + ", partialFlushMinSpans="
+                + partialFlushMinSpans
+                + ", traceKeepLatencyThresholdEnabled="
+                + traceKeepLatencyThresholdEnabled
+                + ", traceKeepLatencyThreshold="
+                + traceKeepLatencyThreshold
+                + ", traceStrictWritesEnabled="
+                + traceStrictWritesEnabled
+                + ", traceBaggageTagKeys="
+                + traceBaggageTagKeys
+                + ", tracePropagationStylesToExtract="
+                + tracePropagationStylesToExtract
+                + ", tracePropagationStylesToInject="
+                + tracePropagationStylesToInject
+                + ", tracePropagationBehaviorExtract="
+                + tracePropagationBehaviorExtract
+                + ", tracePropagationExtractFirst="
+                + tracePropagationExtractFirst
+                + ", traceInferredProxyEnabled="
+                + traceInferredProxyEnabled
+                + ", clockSyncPeriod="
+                + clockSyncPeriod
+                + ", jmxFetchEnabled="
+                + jmxFetchEnabled
+                + ", dogStatsDStartDelay="
+                + dogStatsDStartDelay
+                + ", jmxFetchConfigDir='"
+                + jmxFetchConfigDir
+                + '\''
+                + ", jmxFetchConfigs="
+                + jmxFetchConfigs
+                + ", jmxFetchMetricsConfigs="
+                + jmxFetchMetricsConfigs
+                + ", jmxFetchCheckPeriod="
+                + jmxFetchCheckPeriod
+                + ", jmxFetchInitialRefreshBeansPeriod="
+                + jmxFetchInitialRefreshBeansPeriod
+                + ", jmxFetchRefreshBeansPeriod="
+                + jmxFetchRefreshBeansPeriod
+                + ", jmxFetchStatsdHost='"
+                + jmxFetchStatsdHost
+                + '\''
+                + ", jmxFetchStatsdPort="
+                + jmxFetchStatsdPort
+                + ", jmxFetchMultipleRuntimeServicesEnabled="
+                + jmxFetchMultipleRuntimeServicesEnabled
+                + ", jmxFetchMultipleRuntimeServicesLimit="
+                + jmxFetchMultipleRuntimeServicesLimit
+                + ", healthMetricsEnabled="
+                + healthMetricsEnabled
+                + ", healthMetricsStatsdHost='"
+                + healthMetricsStatsdHost
+                + '\''
+                + ", healthMetricsStatsdPort="
+                + healthMetricsStatsdPort
+                + ", perfMetricsEnabled="
+                + perfMetricsEnabled
+                + ", tracerMetricsEnabled="
+                + tracerMetricsEnabled
+                + ", tracerMetricsIgnoreAgentVersion="
+                + tracerMetricsIgnoreAgentVersion
+                + ", tracerMetricsBufferingEnabled="
+                + tracerMetricsBufferingEnabled
+                + ", tracerMetricsMaxAggregates="
+                + tracerMetricsMaxAggregates
+                + ", tracerMetricsMaxPending="
+                + tracerMetricsMaxPending
+                + ", reportHostName="
+                + reportHostName
+                + ", traceAnalyticsEnabled="
+                + traceAnalyticsEnabled
+                + ", traceSamplingServiceRules="
+                + traceSamplingServiceRules
+                + ", traceSamplingOperationRules="
+                + traceSamplingOperationRules
+                + ", traceSamplingJsonRules="
+                + traceSamplingRules
+                + ", traceSampleRate="
+                + traceSampleRate
+                + ", traceRateLimit="
+                + traceRateLimit
+                + ", spanSamplingRules="
+                + spanSamplingRules
+                + ", spanSamplingRulesFile="
+                + spanSamplingRulesFile
+                + ", profilingAgentless="
+                + profilingAgentless
+                + ", profilingUrl='"
+                + profilingUrl
+                + '\''
+                + ", profilingTags="
+                + profilingTags
+                + ", profilingStartDelay="
+                + profilingStartDelay
+                + ", profilingStartForceFirst="
+                + profilingStartForceFirst
+                + ", profilingUploadPeriod="
+                + profilingUploadPeriod
+                + ", profilingTemplateOverrideFile='"
+                + profilingTemplateOverrideFile
+                + '\''
+                + ", profilingUploadTimeout="
+                + profilingUploadTimeout
+                + ", profilingUploadCompression='"
+                + profilingUploadCompression
+                + '\''
+                + ", profilingProxyHost='"
+                + profilingProxyHost
+                + '\''
+                + ", profilingProxyPort="
+                + profilingProxyPort
+                + ", profilingProxyUsername='"
+                + profilingProxyUsername
+                + '\''
+                + ", profilingProxyPassword="
+                + (profilingProxyPassword == null ? "null" : "****")
+                + ", profilingExceptionSampleLimit="
+                + profilingExceptionSampleLimit
+                + ", profilingExceptionHistogramTopItems="
+                + profilingExceptionHistogramTopItems
+                + ", profilingExceptionHistogramMaxCollectionSize="
+                + profilingExceptionHistogramMaxCollectionSize
+                + ", profilingExcludeAgentThreads="
+                + profilingExcludeAgentThreads
+                + ", otelThreadContextEnabled="
+                + otelThreadContextEnabled
+                + ", crashTrackingTags="
+                + crashTrackingTags
+                + ", crashTrackingAgentless="
+                + crashTrackingAgentless
+                + ", crashTrackingErrorsIntakeEnabled="
+                + crashTrackingErrorsIntakeEnabled
+                + ", crashTrackingExtendedInfoEnabled="
+                + crashTrackingExtendedInfoEnabled
+                + ", remoteConfigEnabled="
+                + remoteConfigEnabled
+                + ", remoteConfigUrl="
+                + remoteConfigUrl
+                + ", remoteConfigPollIntervalSeconds="
+                + remoteConfigPollIntervalSeconds
+                + ", remoteConfigMaxPayloadSize="
+                + remoteConfigMaxPayloadSize
+                + ", remoteConfigIntegrityCheckEnabled="
+                + remoteConfigIntegrityCheckEnabled
+                + ", featureFlaggingProviderEnabled="
+                + featureFlaggingProviderEnabled
+                + ", featureFlaggingConfigurationSource="
+                + featureFlaggingConfigurationSource
+                + ", featureFlaggingConfigurationSourceAgentlessBaseUrl="
+                + featureFlaggingConfigurationSourceAgentlessBaseUrl
+                + ", featureFlaggingConfigurationSourcePollIntervalSeconds="
+                + featureFlaggingConfigurationSourcePollIntervalSeconds
+                + ", featureFlaggingConfigurationSourceRequestTimeoutSeconds="
+                + featureFlaggingConfigurationSourceRequestTimeoutSeconds
+                + ", debuggerEnabled="
+                + dynamicInstrumentationEnabled
+                + ", debuggerUploadTimeout="
+                + dynamicInstrumentationUploadTimeout
+                + ", debuggerUploadFlushInterval="
+                + dynamicInstrumentationUploadFlushInterval
+                + ", debuggerClassFileDumpEnabled="
+                + dynamicInstrumentationClassFileDumpEnabled
+                + ", debuggerPollInterval="
+                + dynamicInstrumentationPollInterval
+                + ", debuggerDiagnosticsInterval="
+                + dynamicInstrumentationDiagnosticsInterval
+                + ", debuggerMetricEnabled="
+                + dynamicInstrumentationMetricEnabled
+                + ", debuggerProbeFileLocation="
+                + dynamicInstrumentationProbeFile
+                + ", debuggerUploadBatchSize="
+                + dynamicInstrumentationUploadBatchSize
+                + ", debuggerMaxPayloadSize="
+                + dynamicInstrumentationMaxPayloadSize
+                + ", debuggerVerifyByteCode="
+                + dynamicInstrumentationVerifyByteCode
+                + ", debuggerInstrumentTheWorld="
+                + dynamicInstrumentationInstrumentTheWorld
+                + ", debuggerExcludeFiles="
+                + dynamicInstrumentationExcludeFiles
+                + ", debuggerIncludeFiles="
+                + dynamicInstrumentationIncludeFiles
+                + ", debuggerCaptureTimeout="
+                + dynamicInstrumentationCaptureTimeout
+                + ", debuggerRedactIdentifiers="
+                + dynamicInstrumentationRedactedIdentifiers
+                + ", debuggerRedactTypes="
+                + dynamicInstrumentationRedactedTypes
+                + ", debuggerSymbolEnabled="
+                + symbolDatabaseEnabled
+                + ", debuggerSymbolForceUpload="
+                + symbolDatabaseForceUpload
+                + ", debuggerSymbolFlushThreshold="
+                + symbolDatabaseFlushThreshold
+                + ", thirdPartyIncludes="
+                + debuggerThirdPartyIncludes
+                + ", thirdPartyExcludes="
+                + debuggerThirdPartyExcludes
+                + ", debuggerExceptionEnabled="
+                + debuggerExceptionEnabled
+                + ", debuggerCodeOriginEnabled="
+                + debuggerCodeOriginEnabled
+                + ", awsPropagationEnabled="
+                + awsPropagationEnabled
+                + ", sqsPropagationEnabled="
+                + sqsPropagationEnabled
+                + ", kafkaClientPropagationEnabled="
+                + kafkaClientPropagationEnabled
+                + ", kafkaClientPropagationDisabledTopics="
+                + kafkaClientPropagationDisabledTopics
+                + ", kafkaClientBase64DecodingEnabled="
+                + kafkaClientBase64DecodingEnabled
+                + ", jmsPropagationEnabled="
+                + jmsPropagationEnabled
+                + ", jmsPropagationDisabledTopics="
+                + jmsPropagationDisabledTopics
+                + ", jmsPropagationDisabledQueues="
+                + jmsPropagationDisabledQueues
+                + ", rabbitPropagationEnabled="
+                + rabbitPropagationEnabled
+                + ", rabbitPropagationDisabledQueues="
+                + rabbitPropagationDisabledQueues
+                + ", rabbitPropagationDisabledExchanges="
+                + rabbitPropagationDisabledExchanges
+                + ", messageBrokerSplitByDestination="
+                + messageBrokerSplitByDestination
+                + ", hystrixTagsEnabled="
+                + hystrixTagsEnabled
+                + ", hystrixMeasuredEnabled="
+                + hystrixMeasuredEnabled
+                + ", springSchedulingMeasuredEnabled="
+                + springSchedulingMeasuredEnabled
+                + ", resilience4jMeasuredEnable="
+                + resilience4jMeasuredEnabled
+                + ", resilience4jTagMetricsEnabled="
+                + resilience4jTagMetricsEnabled
+                + ", igniteCacheIncludeKeys="
+                + igniteCacheIncludeKeys
+                + ", servletPrincipalEnabled="
+                + servletPrincipalEnabled
+                + ", servletAsyncTimeoutError="
+                + servletAsyncTimeoutError
+                + ", datadogTagsLimit="
+                + xDatadogTagsMaxLength
+                + ", traceAgentProtocolVersion="
+                + protocolVersion.asConfigValue()
+                + ", logLevel="
+                + logLevel
+                + ", debugEnabled="
+                + debugEnabled
+                + ", triageEnabled="
+                + triageEnabled
+                + ", triageReportDir="
+                + triageReportDir
+                + ", startLogsEnabled="
+                + startupLogsEnabled
+                + ", configFile='"
+                + configFileStatus
+                + '\''
+                + ", idGenerationStrategy="
+                + idGenerationStrategy
+                + ", trace128bitTraceIdGenerationEnabled="
+                + trace128bitTraceIdGenerationEnabled
+                + ", logs128bitTraceIdEnabled="
+                + logs128bitTraceIdEnabled
+                + ", grpcIgnoredInboundMethods="
+                + grpcIgnoredInboundMethods
+                + ", grpcIgnoredOutboundMethods="
+                + grpcIgnoredOutboundMethods
+                + ", grpcServerErrorStatuses="
+                + grpcServerErrorStatuses
+                + ", grpcClientErrorStatuses="
+                + grpcClientErrorStatuses
+                + ", clientIpEnabled="
+                + clientIpEnabled
+                + ", appSecRulesFile='"
+                + appSecRulesFile
+                + "'"
+                + ", appSecHttpBlockedTemplateHtml="
+                + appSecHttpBlockedTemplateHtml
+                + ", appSecWafTimeout="
+                + appSecWafTimeout
+                + " us, appSecAgenticOnboarding="
+                + appSecAgenticOnboarding
+                + ", appSecHttpBlockedTemplateJson="
+                + appSecHttpBlockedTemplateJson
+                + ", apiSecurityEnabled="
+                + apiSecurityEnabled
+                + ", apiSecurityEndpointCollectionMessageLimit="
+                + apiSecurityEndpointCollectionMessageLimit
+                + ", cwsEnabled="
+                + cwsEnabled
+                + ", cwsTlsRefresh="
+                + cwsTlsRefresh
+                + ", longRunningTraceEnabled="
+                + longRunningTraceEnabled
+                + ", longRunningTraceInitialFlushInterval="
+                + longRunningTraceInitialFlushInterval
+                + ", longRunningTraceFlushInterval="
+                + longRunningTraceFlushInterval
+                + ", cassandraKeyspaceStatementExtractionEnabled="
+                + cassandraKeyspaceStatementExtractionEnabled
+                + ", couchbaseInternalSpansEnabled="
+                + couchbaseInternalSpansEnabled
+                + ", elasticsearchBodyEnabled="
+                + elasticsearchBodyEnabled
+                + ", elasticsearchParamsEnabled="
+                + elasticsearchParamsEnabled
+                + ", elasticsearchBodyAndParamsEnabled="
+                + elasticsearchBodyAndParamsEnabled
+                + ", traceFlushInterval="
+                + traceFlushIntervalSeconds
+                + ", injectBaggageAsTagsEnabled="
+                + injectBaggageAsTagsEnabled
+                + ", traceBuilderTagsPrecedenceEnabled="
+                + traceBuilderTagsPrecedenceEnabled
+                + ", injectLinksAsTagsEnabled="
+                + injectLinksAsTagsEnabled
+                + ", logsInjectionEnabled="
+                + logsInjectionEnabled
+                + ", appLogsCollectionEnabled="
+                + appLogsCollectionEnabled
+                + ", sparkTaskHistogramEnabled="
+                + sparkTaskHistogramEnabled
+                + ", sparkAppNameAsService="
+                + sparkAppNameAsService
+                + ", jaxRsExceptionAsErrorsEnabled="
+                + jaxRsExceptionAsErrorsEnabled
+                + ", axisPromoteResourceName="
+                + axisPromoteResourceName
+                + ", peerHostNameEnabled="
+                + peerHostNameEnabled
+                + ", peerServiceDefaultsEnabled="
+                + peerServiceDefaultsEnabled
+                + ", peerServiceComponentOverrides="
+                + peerServiceComponentOverrides
+                + ", removeIntegrationServiceNamesEnabled="
+                + removeIntegrationServiceNamesEnabled
+                + ", spanAttributeSchemaVersion="
+                + spanAttributeSchemaVersion
+                + ", telemetryDebugRequestsEnabled="
+                + telemetryDebugRequestsEnabled
+                + ", telemetryMetricsEnabled="
+                + telemetryMetricsEnabled
+                + ", appSecScaEnabled="
+                + appSecScaEnabled
+                + ", appSecScaMaxTrackedDependencies="
+                + appSecScaMaxTrackedDependencies
+                + ", appSecRaspEnabled="
+                + isAppSecRaspEnabled()
+                + ", dataJobsOpenLineageEnabled="
+                + dataJobsOpenLineageEnabled
+                + ", dataJobsOpenLineageTimeoutEnabled="
+                + dataJobsOpenLineageTimeoutEnabled
+                + ", dataJobsParseSparkPlanEnabled="
+                + dataJobsParseSparkPlanEnabled
+                + ", dataJobsExperimentalFeaturesEnabled="
+                + dataJobsExperimentalFeaturesEnabled
+                + ", apmTracingEnabled="
+                + apmTracingEnabled
+                + ", jdkSocketEnabled="
+                + jdkSocketEnabled
+                + ", cloudPayloadTaggingServices="
+                + cloudPayloadTaggingServices
+                + ", cloudRequestPayloadTagging="
+                + cloudRequestPayloadTagging
+                + ", cloudResponsePayloadTagging="
+                + cloudResponsePayloadTagging
+                + ", experimentalPropagateProcessTagsEnabled="
+                + experimentalPropagateProcessTagsEnabled
+                + ", processTagsMapping="
+                + processTagsMapping
+                + ", rumInjectorConfig="
+                + (rumInjectorConfig == null ? "null" : rumInjectorConfig.jsonPayload())
+                + ", aiGuardEnabled="
+                + aiGuardEnabled
+                + ", aiGuardEndpoint="
+                + aiGuardEndpoint
+                + ", aiGuardRedactionEnabled="
+                + aiGuardRedactionEnabled
+                + ", logsOtelExporter="
+                + logsOtelExporter
+                + ", logsOtelInterval="
+                + logsOtelInterval
+                + ", logsOtelTimeout="
+                + logsOtelTimeout
+                + ", logsOtelQueueSize="
+                + logsOtelQueueSize
+                + ", logsOtelBatchSize="
+                + logsOtelBatchSize
+                + ", otlpLogsEndpoint="
+                + otlpLogsEndpoint
+                + ", otlpLogsHeaders="
+                + otlpLogsHeaders
+                + ", otlpLogsProtocol="
+                + otlpLogsProtocol
+                + ", otlpLogsCompression="
+                + otlpLogsCompression
+                + ", otlpLogsTimeout="
+                + otlpLogsTimeout
+                + ", metricsOtelExporter="
+                + metricsOtelExporter
+                + ", metricsOtelInterval="
+                + metricsOtelInterval
+                + ", metricsOtelTimeout="
+                + metricsOtelTimeout
+                + ", metricsOtelCardinalityLimit="
+                + metricsOtelCardinalityLimit
+                + ", metricsOtelExperimentalEnabled="
+                + metricsOtelExperimentalEnabled
+                + ", otlpMetricsEndpoint="
+                + otlpMetricsEndpoint
+                + ", otlpMetricsHeaders="
+                + otlpMetricsHeaders
+                + ", otlpMetricsProtocol="
+                + otlpMetricsProtocol
+                + ", otlpMetricsCompression="
+                + otlpMetricsCompression
+                + ", otlpMetricsTimeout="
+                + otlpMetricsTimeout
+                + ", otlpMetricsTemporalityPreference="
+                + otlpMetricsTemporalityPreference
+                + ", otelTracesSpanMetricsEnabled="
+                + otelTracesSpanMetricsEnabled
+                + ", traceOtelSemanticsEnabled="
+                + traceOtelSemanticsEnabled
+                + ", traceStatsInterval="
+                + traceStatsInterval
+                + ", traceOtelExporter="
+                + traceOtelExporter
+                + ", otlpTracesEndpoint="
+                + otlpTracesEndpoint
+                + ", otlpTracesHeaders="
+                + otlpTracesHeaders
+                + ", otlpTracesProtocol="
+                + otlpTracesProtocol
+                + ", otlpTracesCompression="
+                + otlpTracesCompression
+                + ", otlpTracesTimeout="
+                + otlpTracesTimeout
+                + ", ciVisibilityGradleDependencyVerificationEnabled="
+                + ciVisibilityGradleDependencyVerificationEnabled
+                + ", ciVisibilityDynamicAtrEnabled="
+                + ciVisibilityDynamicAtrEnabled
+                + ", ciVisibilityDynamicAtrBuckets="
+                + ciVisibilityDynamicAtrBuckets
+                + ", serviceDiscoveryEnabled="
+                + serviceDiscoveryEnabled
+                + ", sfnInjectDatadogAttributeEnabled="
+                + sfnInjectDatadogAttributeEnabled
+                + ", eventbridgeInjectDatadogAttributeEnabled="
+                + eventbridgeInjectDatadogAttributeEnabled
+                + ", sqsInjectDatadogAttributeEnabled="
+                + sqsInjectDatadogAttributeEnabled
+                + ", snsInjectDatadogAttributeEnabled="
+                + snsInjectDatadogAttributeEnabled
+                + '}';
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/DynamicConfig.java b/internal-api/src/main/java/datadog/trace/api/DynamicConfig.java
index 19a1ca84abf..a78d00ca6ef 100644
--- a/internal-api/src/main/java/datadog/trace/api/DynamicConfig.java
+++ b/internal-api/src/main/java/datadog/trace/api/DynamicConfig.java
@@ -39,434 +39,430 @@
  * @see Config for other configurations
  */
 public final class DynamicConfig<S extends DynamicConfig.Snapshot> {
-  static final Logger rootLogger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
-
-  static final Function<Map.Entry<String, String>, String> KEY = DynamicConfig::key;
-  static final Function<Map.Entry<String, String>, String> VALUE = DynamicConfig::value;
-  static final Function<Map.Entry<String, String>, String> LOWER_KEY = DynamicConfig::lowerKey;
-  static final Function<Map.Entry<String, String>, String> REQUEST_TAG = DynamicConfig::requestTag;
-  static final Function<Map.Entry<String, String>, String> RESPONSE_TAG =
-      DynamicConfig::responseTag;
-
-  BiFunction<Builder, S, S> snapshotFactory;
-
-  S initialSnapshot;
-  volatile S currentSnapshot;
-
-  private DynamicConfig(BiFunction<Builder, S, S> snapshotFactory) {
-    this.snapshotFactory = snapshotFactory;
-  }
-
-  /** Dynamic configuration that uses the default snapshot type. */
-  public static DynamicConfig<Snapshot>.Builder create() {
-    return new DynamicConfig<>(Snapshot::new).new Builder();
-  }
-
-  /** Dynamic configuration that wants to add its own state to the snapshot. */
-  public static <S extends DynamicConfig.Snapshot> DynamicConfig<S>.Builder create(
-      BiFunction<DynamicConfig<S>.Builder, S, S> snapshotFactory) {
-    return new DynamicConfig<S>(snapshotFactory).new Builder();
-  }
-
-  /** Captures a snapshot of the configuration at the start of a trace. */
-  public S captureTraceConfig() {
-    return currentSnapshot;
-  }
-
-  /** Start building a new configuration based on its initial state. */
-  public Builder initial() {
-    return new Builder(initialSnapshot);
-  }
-
-  /** Start building a new configuration based on its current state. */
-  public Builder current() {
-    return new Builder(currentSnapshot);
-  }
-
-  /** Reset the configuration to its initial state. */
-  public void resetTraceConfig() {
-    currentSnapshot = initialSnapshot;
-    reportConfigChange(initialSnapshot);
-  }
-
-  @Override
-  public String toString() {
-    return currentSnapshot.toString();
-  }
-
-  public final class Builder {
-    boolean tracingEnabled;
-    boolean runtimeMetricsEnabled;
-    boolean logsInjectionEnabled;
-    boolean dataStreamsEnabled;
-
-    Map<String, String> serviceMapping;
-    Map<String, String> requestHeaderTags;
-    Map<String, String> responseHeaderTags;
-    Map<String, String> tracingTags;
-    Map<String, String> baggageMapping;
-
-    List<? extends SpanSamplingRule> spanSamplingRules;
-    List<? extends TraceSamplingRule> traceSamplingRules;
-    String traceSamplingRulesJson;
-    Double traceSampleRate;
-
-    Pair<String, CharSequence> preferredServiceNameAndSource;
-    List<DataStreamsTransactionExtractor> dataStreamsTransactionExtractors;
-
-    Builder() {}
-
-    Builder(Snapshot snapshot) {
-
-      this.tracingEnabled = snapshot.tracingEnabled;
-      this.runtimeMetricsEnabled = snapshot.runtimeMetricsEnabled;
-      this.logsInjectionEnabled = snapshot.logsInjectionEnabled;
-      this.dataStreamsEnabled = snapshot.dataStreamsEnabled;
-
-      this.serviceMapping = snapshot.serviceMapping;
-      this.requestHeaderTags = snapshot.requestHeaderTags;
-      this.responseHeaderTags = snapshot.responseHeaderTags;
-      this.baggageMapping = snapshot.baggageMapping;
-
-      this.spanSamplingRules = snapshot.spanSamplingRules;
-      this.traceSamplingRules = snapshot.traceSamplingRules;
-      this.traceSamplingRulesJson = snapshot.traceSamplingRulesJson;
-      this.traceSampleRate = snapshot.traceSampleRate;
-
-      this.tracingTags = snapshot.tracingTags;
-
-      this.preferredServiceNameAndSource = snapshot.preferredServiceNameAndSource;
-      this.dataStreamsTransactionExtractors = snapshot.dataStreamsTransactionExtractors;
-    }
-
-    public Builder setRuntimeMetricsEnabled(boolean runtimeMetricsEnabled) {
-      this.runtimeMetricsEnabled = runtimeMetricsEnabled;
-      return this;
-    }
-
-    public Builder setLogsInjectionEnabled(boolean logsInjectionEnabled) {
-      this.logsInjectionEnabled = logsInjectionEnabled;
-      return this;
-    }
-
-    public Builder setDataStreamsEnabled(boolean dataStreamsEnabled) {
-      this.dataStreamsEnabled = dataStreamsEnabled;
-      return this;
-    }
-
-    public Builder setDataStreamsTransactionExtractors(
-        List<DataStreamsTransactionExtractor> dataStreamsTransactionExtractors) {
-      this.dataStreamsTransactionExtractors = dataStreamsTransactionExtractors;
-      return this;
-    }
-
-    public Builder setServiceMapping(Map<String, String> serviceMapping) {
-      return setServiceMapping(serviceMapping.entrySet());
-    }
-
-    @SuppressWarnings("deprecation")
-    public Builder setHeaderTags(Map<String, String> headerTags) {
-      if (Config.get().getRequestHeaderTags().equals(headerTags)
-          && !Config.get().getResponseHeaderTags().equals(headerTags)) {
-        // using static config; don't override separate static config for response header tags
-        this.requestHeaderTags = Config.get().getRequestHeaderTags();
-        this.responseHeaderTags = Config.get().getResponseHeaderTags();
-        return this;
-      } else {
-        return setHeaderTags(headerTags.entrySet());
-      }
-    }
-
-    public Builder setBaggageMapping(Map<String, String> baggageMapping) {
-      return setBaggageMapping(baggageMapping.entrySet());
-    }
-
-    public Builder setServiceMapping(
-        Collection<? extends Map.Entry<String, String>> serviceMapping) {
-      this.serviceMapping = cleanMapping(serviceMapping, KEY, VALUE);
-      return this;
-    }
-
-    public Builder setHeaderTags(Collection<? extends Map.Entry<String, String>> headerTags) {
-      this.requestHeaderTags = cleanMapping(headerTags, LOWER_KEY, REQUEST_TAG);
-      this.responseHeaderTags = cleanMapping(headerTags, LOWER_KEY, RESPONSE_TAG);
-      return this;
-    }
-
-    public Builder setBaggageMapping(
-        Collection<? extends Map.Entry<String, String>> baggageMapping) {
-      this.baggageMapping = cleanMapping(baggageMapping, LOWER_KEY, VALUE);
-      return this;
-    }
-
-    public Builder setTraceSampleRate(Double traceSampleRate) {
-      this.traceSampleRate = traceSampleRate;
-      return this;
-    }
-
-    public Builder setSpanSamplingRules(List<? extends SpanSamplingRule> spanSamplingRules) {
-      this.spanSamplingRules = spanSamplingRules;
-      return this;
-    }
-
-    public Builder setTraceSamplingRules(
-        List<? extends TraceSamplingRule> traceSamplingRules, String traceSamplingRulesJson) {
-      this.traceSamplingRules = traceSamplingRules;
-      this.traceSamplingRulesJson = traceSamplingRulesJson;
-      return this;
-    }
-
-    public Builder setTracingTags(Map<String, String> tracingTags) {
-      this.tracingTags = tracingTags;
-      return this;
-    }
-
-    public Builder setTracingEnabled(boolean tracingEnabled) {
-      this.tracingEnabled = tracingEnabled;
-      return this;
-    }
-
-    public Builder setPreferredServiceNameAndSource(
-        String preferredServiceName, CharSequence source) {
-      this.preferredServiceNameAndSource = Pair.of(preferredServiceName, source);
-      return this;
-    }
-
-    /** Overwrites the current configuration with a new snapshot. */
-    public DynamicConfig<S> apply() {
-      S oldSnapshot = currentSnapshot;
-      S newSnapshot = snapshotFactory.apply(this, oldSnapshot);
-      if (null == oldSnapshot) {
-        initialSnapshot = newSnapshot; // captured when constructing the dynamic config
-        currentSnapshot = newSnapshot;
-      } else {
-        currentSnapshot = newSnapshot;
-        reportConfigChange(newSnapshot);
-      }
-      return DynamicConfig.this;
-    }
-  }
-
-  static Map<String, String> cleanMapping(
-      Collection<? extends Map.Entry<String, String>> mapping,
-      Function<Map.Entry<String, String>, String> keyMapper,
-      Function<Map.Entry<String, String>, String> valueMapper) {
-    final Map<String, String> cleanedMapping = new HashMap<>(mapping.size() * 4 / 3);
-    for (Map.Entry<String, String> association : mapping) {
-      cleanedMapping.put(keyMapper.apply(association), valueMapper.apply(association));
-    }
-    return tryMakeImmutableMap(cleanedMapping);
-  }
-
-  static String key(Map.Entry<String, String> association) {
-    return trim(association.getKey());
-  }
-
-  static String value(Map.Entry<String, String> association) {
-    return trim(association.getValue());
-  }
-
-  static String lowerKey(Map.Entry<String, String> association) {
-    return key(association).toLowerCase(Locale.ROOT);
-  }
-
-  static String requestTag(Map.Entry<String, String> association) {
-    String requestTag = value(association);
-    if (requestTag.isEmpty()) {
-      // normalization is only applied when generating default tag names; see ConfigConverter
-      requestTag = "http.request.headers." + normalizedHeaderTag(association.getKey());
-    }
-    return requestTag;
-  }
-
-  static String responseTag(Map.Entry<String, String> association) {
-    String responseTag = value(association);
-    if (responseTag.isEmpty()) {
-      // normalization is only applied when generating default tag names; see ConfigConverter
-      responseTag = "http.response.headers." + normalizedHeaderTag(association.getKey());
-    }
-    return responseTag;
-  }
-
-  static void reportConfigChange(Snapshot newSnapshot) {
-    Map<String, Object> update = new HashMap<>();
-
-    update.put(TRACE_DEBUG, rootLogger.isDebugEnabled());
-    update.put(RUNTIME_METRICS_ENABLED, newSnapshot.runtimeMetricsEnabled);
-    update.put(LOGS_INJECTION_ENABLED, newSnapshot.logsInjectionEnabled);
-    update.put(DATA_STREAMS_ENABLED, newSnapshot.dataStreamsEnabled);
-
-    update.put(SERVICE_MAPPING, newSnapshot.serviceMapping);
-    update.put(REQUEST_HEADER_TAGS, newSnapshot.requestHeaderTags);
-    update.put(RESPONSE_HEADER_TAGS, newSnapshot.responseHeaderTags);
-    update.put(BAGGAGE_MAPPING, newSnapshot.baggageMapping);
-
-    update.put(TRACE_SAMPLING_RULES, newSnapshot.traceSamplingRulesJson);
-    maybePut(update, TRACE_SAMPLE_RATE, newSnapshot.traceSampleRate);
-
-    ConfigCollector.get().putRemote(update);
-  }
+    static final Logger rootLogger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
 
-  @SuppressWarnings("SameParameterValue")
-  private static void maybePut(Map<String, Object> update, String key, Object value) {
-    if (null != value) {
-      update.put(key, value);
-    }
-  }
-
-  /** Immutable snapshot of the configuration. */
-  public static class Snapshot implements TraceConfig {
-    final boolean tracingEnabled;
-    final boolean runtimeMetricsEnabled;
-    final boolean logsInjectionEnabled;
-    final boolean dataStreamsEnabled;
-
-    final Map<String, String> serviceMapping;
-    final Map<String, String> requestHeaderTags;
-    final Map<String, String> responseHeaderTags;
-    final Map<String, String> baggageMapping;
-
-    final List<? extends SpanSamplingRule> spanSamplingRules;
-    final List<? extends TraceSamplingRule> traceSamplingRules;
-    final String traceSamplingRulesJson;
-
-    final Double traceSampleRate;
-    final Map<String, String> tracingTags;
-
-    final Pair<String, CharSequence> preferredServiceNameAndSource;
-    final List<DataStreamsTransactionExtractor> dataStreamsTransactionExtractors;
-
-    protected Snapshot(DynamicConfig<?>.Builder builder, Snapshot oldSnapshot) {
-
-      this.tracingEnabled = builder.tracingEnabled;
-      this.runtimeMetricsEnabled = builder.runtimeMetricsEnabled;
-      this.logsInjectionEnabled = builder.logsInjectionEnabled;
-      this.dataStreamsEnabled = builder.dataStreamsEnabled;
-
-      this.serviceMapping = nullToEmpty(builder.serviceMapping);
-      this.requestHeaderTags = nullToEmpty(builder.requestHeaderTags);
-      this.responseHeaderTags = nullToEmpty(builder.responseHeaderTags);
-      this.baggageMapping = nullToEmpty(builder.baggageMapping);
-
-      this.spanSamplingRules = nullToEmpty(builder.spanSamplingRules);
-      this.traceSamplingRules = nullToEmpty(builder.traceSamplingRules);
-      this.traceSamplingRulesJson = builder.traceSamplingRulesJson;
-      this.traceSampleRate = builder.traceSampleRate;
-
-      this.tracingTags = nullToEmpty(builder.tracingTags);
+    static final Function<Map.Entry<String, String>, String> KEY = DynamicConfig::key;
+    static final Function<Map.Entry<String, String>, String> VALUE = DynamicConfig::value;
+    static final Function<Map.Entry<String, String>, String> LOWER_KEY = DynamicConfig::lowerKey;
+    static final Function<Map.Entry<String, String>, String> REQUEST_TAG = DynamicConfig::requestTag;
+    static final Function<Map.Entry<String, String>, String> RESPONSE_TAG = DynamicConfig::responseTag;
 
-      this.preferredServiceNameAndSource = builder.preferredServiceNameAndSource;
-      this.dataStreamsTransactionExtractors = builder.dataStreamsTransactionExtractors;
-    }
+    BiFunction<Builder, S, S> snapshotFactory;
 
-    private static <K, V> Map<K, V> nullToEmpty(Map<K, V> mapping) {
-      return null != mapping ? mapping : Collections.emptyMap();
-    }
+    S initialSnapshot;
+    volatile S currentSnapshot;
 
-    private static <V> List<V> nullToEmpty(List<V> list) {
-      return null != list ? list : Collections.emptyList();
+    private DynamicConfig(BiFunction<Builder, S, S> snapshotFactory) {
+        this.snapshotFactory = snapshotFactory;
     }
 
-    @Override
-    public boolean isTraceEnabled() {
-      return tracingEnabled;
+    /** Dynamic configuration that uses the default snapshot type. */
+    public static DynamicConfig<Snapshot>.Builder create() {
+        return new DynamicConfig<>(Snapshot::new).new Builder();
     }
 
-    @Override
-    public boolean isRuntimeMetricsEnabled() {
-      return runtimeMetricsEnabled;
+    /** Dynamic configuration that wants to add its own state to the snapshot. */
+    public static <S extends DynamicConfig.Snapshot> DynamicConfig<S>.Builder create(
+            BiFunction<DynamicConfig<S>.Builder, S, S> snapshotFactory) {
+        return new DynamicConfig<S>(snapshotFactory).new Builder();
     }
 
-    @Override
-    public boolean isLogsInjectionEnabled() {
-      return logsInjectionEnabled;
+    /** Captures a snapshot of the configuration at the start of a trace. */
+    public S captureTraceConfig() {
+        return currentSnapshot;
     }
 
-    @Override
-    public boolean isDataStreamsEnabled() {
-      return dataStreamsEnabled;
+    /** Start building a new configuration based on its initial state. */
+    public Builder initial() {
+        return new Builder(initialSnapshot);
     }
 
-    @Override
-    public Map<String, String> getServiceMapping() {
-      return serviceMapping;
+    /** Start building a new configuration based on its current state. */
+    public Builder current() {
+        return new Builder(currentSnapshot);
     }
 
-    @Override
-    public Map<String, String> getRequestHeaderTags() {
-      return requestHeaderTags;
-    }
-
-    @Override
-    public Map<String, String> getResponseHeaderTags() {
-      return responseHeaderTags;
-    }
-
-    @Override
-    public Map<String, String> getBaggageMapping() {
-      return baggageMapping;
-    }
-
-    @Override
-    public Double getTraceSampleRate() {
-      return traceSampleRate;
-    }
-
-    @Override
-    public Pair<String, CharSequence> getPreferredServiceNameAndSource() {
-      return preferredServiceNameAndSource;
-    }
-
-    @Override
-    public List<? extends SpanSamplingRule> getSpanSamplingRules() {
-      return spanSamplingRules;
-    }
-
-    @Override
-    public List<? extends TraceSamplingRule> getTraceSamplingRules() {
-      return traceSamplingRules;
-    }
-
-    @Override
-    public List<DataStreamsTransactionExtractor> getDataStreamsTransactionExtractors() {
-      return dataStreamsTransactionExtractors;
-    }
-
-    @Override
-    public Map<String, String> getTracingTags() {
-      return tracingTags;
+    /** Reset the configuration to its initial state. */
+    public void resetTraceConfig() {
+        currentSnapshot = initialSnapshot;
+        reportConfigChange(initialSnapshot);
     }
 
     @Override
     public String toString() {
-      return "DynamicConfig{"
-          + "debugEnabled="
-          + rootLogger.isDebugEnabled()
-          + ", runtimeMetricsEnabled="
-          + runtimeMetricsEnabled
-          + ", logsInjectionEnabled="
-          + logsInjectionEnabled
-          + ", dataStreamsEnabled="
-          + dataStreamsEnabled
-          + ", serviceMapping="
-          + serviceMapping
-          + ", requestHeaderTags="
-          + requestHeaderTags
-          + ", responseHeaderTags="
-          + responseHeaderTags
-          + ", baggageMapping="
-          + baggageMapping
-          + ", spanSamplingRules="
-          + spanSamplingRules
-          + ", traceSamplingRules="
-          + traceSamplingRulesJson
-          + ", traceSampleRate="
-          + traceSampleRate
-          + ", tracingTags="
-          + tracingTags
-          + ", preferredServiceNameAndSource="
-          + preferredServiceNameAndSource
-          + '}';
+        return currentSnapshot.toString();
+    }
+
+    public final class Builder {
+        boolean tracingEnabled;
+        boolean runtimeMetricsEnabled;
+        boolean logsInjectionEnabled;
+        boolean dataStreamsEnabled;
+
+        Map<String, String> serviceMapping;
+        Map<String, String> requestHeaderTags;
+        Map<String, String> responseHeaderTags;
+        Map<String, String> tracingTags;
+        Map<String, String> baggageMapping;
+
+        List<? extends SpanSamplingRule> spanSamplingRules;
+        List<? extends TraceSamplingRule> traceSamplingRules;
+        String traceSamplingRulesJson;
+        Double traceSampleRate;
+
+        Pair<String, CharSequence> preferredServiceNameAndSource;
+        List<DataStreamsTransactionExtractor> dataStreamsTransactionExtractors;
+
+        Builder() {}
+
+        Builder(Snapshot snapshot) {
+
+            this.tracingEnabled = snapshot.tracingEnabled;
+            this.runtimeMetricsEnabled = snapshot.runtimeMetricsEnabled;
+            this.logsInjectionEnabled = snapshot.logsInjectionEnabled;
+            this.dataStreamsEnabled = snapshot.dataStreamsEnabled;
+
+            this.serviceMapping = snapshot.serviceMapping;
+            this.requestHeaderTags = snapshot.requestHeaderTags;
+            this.responseHeaderTags = snapshot.responseHeaderTags;
+            this.baggageMapping = snapshot.baggageMapping;
+
+            this.spanSamplingRules = snapshot.spanSamplingRules;
+            this.traceSamplingRules = snapshot.traceSamplingRules;
+            this.traceSamplingRulesJson = snapshot.traceSamplingRulesJson;
+            this.traceSampleRate = snapshot.traceSampleRate;
+
+            this.tracingTags = snapshot.tracingTags;
+
+            this.preferredServiceNameAndSource = snapshot.preferredServiceNameAndSource;
+            this.dataStreamsTransactionExtractors = snapshot.dataStreamsTransactionExtractors;
+        }
+
+        public Builder setRuntimeMetricsEnabled(boolean runtimeMetricsEnabled) {
+            this.runtimeMetricsEnabled = runtimeMetricsEnabled;
+            return this;
+        }
+
+        public Builder setLogsInjectionEnabled(boolean logsInjectionEnabled) {
+            this.logsInjectionEnabled = logsInjectionEnabled;
+            return this;
+        }
+
+        public Builder setDataStreamsEnabled(boolean dataStreamsEnabled) {
+            this.dataStreamsEnabled = dataStreamsEnabled;
+            return this;
+        }
+
+        public Builder setDataStreamsTransactionExtractors(
+                List<DataStreamsTransactionExtractor> dataStreamsTransactionExtractors) {
+            this.dataStreamsTransactionExtractors = dataStreamsTransactionExtractors;
+            return this;
+        }
+
+        public Builder setServiceMapping(Map<String, String> serviceMapping) {
+            return setServiceMapping(serviceMapping.entrySet());
+        }
+
+        @SuppressWarnings("deprecation")
+        public Builder setHeaderTags(Map<String, String> headerTags) {
+            if (Config.get().getRequestHeaderTags().equals(headerTags)
+                    && !Config.get().getResponseHeaderTags().equals(headerTags)) {
+                // using static config; don't override separate static config for response header tags
+                this.requestHeaderTags = Config.get().getRequestHeaderTags();
+                this.responseHeaderTags = Config.get().getResponseHeaderTags();
+                return this;
+            } else {
+                return setHeaderTags(headerTags.entrySet());
+            }
+        }
+
+        public Builder setBaggageMapping(Map<String, String> baggageMapping) {
+            return setBaggageMapping(baggageMapping.entrySet());
+        }
+
+        public Builder setServiceMapping(Collection<? extends Map.Entry<String, String>> serviceMapping) {
+            this.serviceMapping = cleanMapping(serviceMapping, KEY, VALUE);
+            return this;
+        }
+
+        public Builder setHeaderTags(Collection<? extends Map.Entry<String, String>> headerTags) {
+            this.requestHeaderTags = cleanMapping(headerTags, LOWER_KEY, REQUEST_TAG);
+            this.responseHeaderTags = cleanMapping(headerTags, LOWER_KEY, RESPONSE_TAG);
+            return this;
+        }
+
+        public Builder setBaggageMapping(Collection<? extends Map.Entry<String, String>> baggageMapping) {
+            this.baggageMapping = cleanMapping(baggageMapping, LOWER_KEY, VALUE);
+            return this;
+        }
+
+        public Builder setTraceSampleRate(Double traceSampleRate) {
+            this.traceSampleRate = traceSampleRate;
+            return this;
+        }
+
+        public Builder setSpanSamplingRules(List<? extends SpanSamplingRule> spanSamplingRules) {
+            this.spanSamplingRules = spanSamplingRules;
+            return this;
+        }
+
+        public Builder setTraceSamplingRules(
+                List<? extends TraceSamplingRule> traceSamplingRules, String traceSamplingRulesJson) {
+            this.traceSamplingRules = traceSamplingRules;
+            this.traceSamplingRulesJson = traceSamplingRulesJson;
+            return this;
+        }
+
+        public Builder setTracingTags(Map<String, String> tracingTags) {
+            this.tracingTags = tracingTags;
+            return this;
+        }
+
+        public Builder setTracingEnabled(boolean tracingEnabled) {
+            this.tracingEnabled = tracingEnabled;
+            return this;
+        }
+
+        public Builder setPreferredServiceNameAndSource(String preferredServiceName, CharSequence source) {
+            this.preferredServiceNameAndSource = Pair.of(preferredServiceName, source);
+            return this;
+        }
+
+        /** Overwrites the current configuration with a new snapshot. */
+        public DynamicConfig<S> apply() {
+            S oldSnapshot = currentSnapshot;
+            S newSnapshot = snapshotFactory.apply(this, oldSnapshot);
+            if (null == oldSnapshot) {
+                initialSnapshot = newSnapshot; // captured when constructing the dynamic config
+                currentSnapshot = newSnapshot;
+            } else {
+                currentSnapshot = newSnapshot;
+                reportConfigChange(newSnapshot);
+            }
+            return DynamicConfig.this;
+        }
+    }
+
+    static Map<String, String> cleanMapping(
+            Collection<? extends Map.Entry<String, String>> mapping,
+            Function<Map.Entry<String, String>, String> keyMapper,
+            Function<Map.Entry<String, String>, String> valueMapper) {
+        final Map<String, String> cleanedMapping = new HashMap<>(mapping.size() * 4 / 3);
+        for (Map.Entry<String, String> association : mapping) {
+            cleanedMapping.put(keyMapper.apply(association), valueMapper.apply(association));
+        }
+        return tryMakeImmutableMap(cleanedMapping);
+    }
+
+    static String key(Map.Entry<String, String> association) {
+        return trim(association.getKey());
+    }
+
+    static String value(Map.Entry<String, String> association) {
+        return trim(association.getValue());
+    }
+
+    static String lowerKey(Map.Entry<String, String> association) {
+        return key(association).toLowerCase(Locale.ROOT);
+    }
+
+    static String requestTag(Map.Entry<String, String> association) {
+        String requestTag = value(association);
+        if (requestTag.isEmpty()) {
+            // normalization is only applied when generating default tag names; see ConfigConverter
+            requestTag = "http.request.headers." + normalizedHeaderTag(association.getKey());
+        }
+        return requestTag;
+    }
+
+    static String responseTag(Map.Entry<String, String> association) {
+        String responseTag = value(association);
+        if (responseTag.isEmpty()) {
+            // normalization is only applied when generating default tag names; see ConfigConverter
+            responseTag = "http.response.headers." + normalizedHeaderTag(association.getKey());
+        }
+        return responseTag;
+    }
+
+    static void reportConfigChange(Snapshot newSnapshot) {
+        Map<String, Object> update = new HashMap<>();
+
+        update.put(TRACE_DEBUG, rootLogger.isDebugEnabled());
+        update.put(RUNTIME_METRICS_ENABLED, newSnapshot.runtimeMetricsEnabled);
+        update.put(LOGS_INJECTION_ENABLED, newSnapshot.logsInjectionEnabled);
+        update.put(DATA_STREAMS_ENABLED, newSnapshot.dataStreamsEnabled);
+
+        update.put(SERVICE_MAPPING, newSnapshot.serviceMapping);
+        update.put(REQUEST_HEADER_TAGS, newSnapshot.requestHeaderTags);
+        update.put(RESPONSE_HEADER_TAGS, newSnapshot.responseHeaderTags);
+        update.put(BAGGAGE_MAPPING, newSnapshot.baggageMapping);
+
+        update.put(TRACE_SAMPLING_RULES, newSnapshot.traceSamplingRulesJson);
+        maybePut(update, TRACE_SAMPLE_RATE, newSnapshot.traceSampleRate);
+
+        ConfigCollector.get().putRemote(update);
+    }
+
+    @SuppressWarnings("SameParameterValue")
+    private static void maybePut(Map<String, Object> update, String key, Object value) {
+        if (null != value) {
+            update.put(key, value);
+        }
+    }
+
+    /** Immutable snapshot of the configuration. */
+    public static class Snapshot implements TraceConfig {
+        final boolean tracingEnabled;
+        final boolean runtimeMetricsEnabled;
+        final boolean logsInjectionEnabled;
+        final boolean dataStreamsEnabled;
+
+        final Map<String, String> serviceMapping;
+        final Map<String, String> requestHeaderTags;
+        final Map<String, String> responseHeaderTags;
+        final Map<String, String> baggageMapping;
+
+        final List<? extends SpanSamplingRule> spanSamplingRules;
+        final List<? extends TraceSamplingRule> traceSamplingRules;
+        final String traceSamplingRulesJson;
+
+        final Double traceSampleRate;
+        final Map<String, String> tracingTags;
+
+        final Pair<String, CharSequence> preferredServiceNameAndSource;
+        final List<DataStreamsTransactionExtractor> dataStreamsTransactionExtractors;
+
+        protected Snapshot(DynamicConfig<?>.Builder builder, Snapshot oldSnapshot) {
+
+            this.tracingEnabled = builder.tracingEnabled;
+            this.runtimeMetricsEnabled = builder.runtimeMetricsEnabled;
+            this.logsInjectionEnabled = builder.logsInjectionEnabled;
+            this.dataStreamsEnabled = builder.dataStreamsEnabled;
+
+            this.serviceMapping = nullToEmpty(builder.serviceMapping);
+            this.requestHeaderTags = nullToEmpty(builder.requestHeaderTags);
+            this.responseHeaderTags = nullToEmpty(builder.responseHeaderTags);
+            this.baggageMapping = nullToEmpty(builder.baggageMapping);
+
+            this.spanSamplingRules = nullToEmpty(builder.spanSamplingRules);
+            this.traceSamplingRules = nullToEmpty(builder.traceSamplingRules);
+            this.traceSamplingRulesJson = builder.traceSamplingRulesJson;
+            this.traceSampleRate = builder.traceSampleRate;
+
+            this.tracingTags = nullToEmpty(builder.tracingTags);
+
+            this.preferredServiceNameAndSource = builder.preferredServiceNameAndSource;
+            this.dataStreamsTransactionExtractors = builder.dataStreamsTransactionExtractors;
+        }
+
+        private static <K, V> Map<K, V> nullToEmpty(Map<K, V> mapping) {
+            return null != mapping ? mapping : Collections.emptyMap();
+        }
+
+        private static <V> List<V> nullToEmpty(List<V> list) {
+            return null != list ? list : Collections.emptyList();
+        }
+
+        @Override
+        public boolean isTraceEnabled() {
+            return tracingEnabled;
+        }
+
+        @Override
+        public boolean isRuntimeMetricsEnabled() {
+            return runtimeMetricsEnabled;
+        }
+
+        @Override
+        public boolean isLogsInjectionEnabled() {
+            return logsInjectionEnabled;
+        }
+
+        @Override
+        public boolean isDataStreamsEnabled() {
+            return dataStreamsEnabled;
+        }
+
+        @Override
+        public Map<String, String> getServiceMapping() {
+            return serviceMapping;
+        }
+
+        @Override
+        public Map<String, String> getRequestHeaderTags() {
+            return requestHeaderTags;
+        }
+
+        @Override
+        public Map<String, String> getResponseHeaderTags() {
+            return responseHeaderTags;
+        }
+
+        @Override
+        public Map<String, String> getBaggageMapping() {
+            return baggageMapping;
+        }
+
+        @Override
+        public Double getTraceSampleRate() {
+            return traceSampleRate;
+        }
+
+        @Override
+        public Pair<String, CharSequence> getPreferredServiceNameAndSource() {
+            return preferredServiceNameAndSource;
+        }
+
+        @Override
+        public List<? extends SpanSamplingRule> getSpanSamplingRules() {
+            return spanSamplingRules;
+        }
+
+        @Override
+        public List<? extends TraceSamplingRule> getTraceSamplingRules() {
+            return traceSamplingRules;
+        }
+
+        @Override
+        public List<DataStreamsTransactionExtractor> getDataStreamsTransactionExtractors() {
+            return dataStreamsTransactionExtractors;
+        }
+
+        @Override
+        public Map<String, String> getTracingTags() {
+            return tracingTags;
+        }
+
+        @Override
+        public String toString() {
+            return "DynamicConfig{"
+                    + "debugEnabled="
+                    + rootLogger.isDebugEnabled()
+                    + ", runtimeMetricsEnabled="
+                    + runtimeMetricsEnabled
+                    + ", logsInjectionEnabled="
+                    + logsInjectionEnabled
+                    + ", dataStreamsEnabled="
+                    + dataStreamsEnabled
+                    + ", serviceMapping="
+                    + serviceMapping
+                    + ", requestHeaderTags="
+                    + requestHeaderTags
+                    + ", responseHeaderTags="
+                    + responseHeaderTags
+                    + ", baggageMapping="
+                    + baggageMapping
+                    + ", spanSamplingRules="
+                    + spanSamplingRules
+                    + ", traceSamplingRules="
+                    + traceSamplingRulesJson
+                    + ", traceSampleRate="
+                    + traceSampleRate
+                    + ", tracingTags="
+                    + tracingTags
+                    + ", preferredServiceNameAndSource="
+                    + preferredServiceNameAndSource
+                    + '}';
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/EndpointCheckpointer.java b/internal-api/src/main/java/datadog/trace/api/EndpointCheckpointer.java
index de980eab600..77e43ece6b9 100644
--- a/internal-api/src/main/java/datadog/trace/api/EndpointCheckpointer.java
+++ b/internal-api/src/main/java/datadog/trace/api/EndpointCheckpointer.java
@@ -3,21 +3,21 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 
 public interface EndpointCheckpointer {
-  /**
-   * Callback to be called when a root span is finished (together with the trace). With partial
-   * flushes, this may be called multiple times when any of the root span's children are finished
-   * even if the root span is not.
-   *
-   * @param rootSpan the local root span of the trace
-   * @param tracker the endpoint tracker
-   */
-  void onRootSpanFinished(AgentSpan rootSpan, EndpointTracker tracker);
+    /**
+     * Callback to be called when a root span is finished (together with the trace). With partial
+     * flushes, this may be called multiple times when any of the root span's children are finished
+     * even if the root span is not.
+     *
+     * @param rootSpan the local root span of the trace
+     * @param tracker the endpoint tracker
+     */
+    void onRootSpanFinished(AgentSpan rootSpan, EndpointTracker tracker);
 
-  /**
-   * Callback to be called when a root span is started
-   *
-   * @param rootSpan the local root span of the trace
-   * @return an endpoint tracker
-   */
-  EndpointTracker onRootSpanStarted(AgentSpan rootSpan);
+    /**
+     * Callback to be called when a root span is started
+     *
+     * @param rootSpan the local root span of the trace
+     * @return an endpoint tracker
+     */
+    EndpointTracker onRootSpanStarted(AgentSpan rootSpan);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/EndpointTracker.java b/internal-api/src/main/java/datadog/trace/api/EndpointTracker.java
index 1f1eec82e38..3af9e74047b 100644
--- a/internal-api/src/main/java/datadog/trace/api/EndpointTracker.java
+++ b/internal-api/src/main/java/datadog/trace/api/EndpointTracker.java
@@ -5,12 +5,12 @@
 /** A simple listener-like interface for tracking the end-point writes */
 public interface EndpointTracker {
 
-  EndpointTracker NO_OP = span -> {};
+    EndpointTracker NO_OP = span -> {};
 
-  /**
-   * Called when a local root span (associated with an end-point) is written
-   *
-   * @param span the local root span
-   */
-  void endpointWritten(AgentSpan span);
+    /**
+     * Called when a local root span (associated with an end-point) is written
+     *
+     * @param span the local root span
+     */
+    void endpointWritten(AgentSpan span);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/Functions.java b/internal-api/src/main/java/datadog/trace/api/Functions.java
index 731cd711a9a..26b9d2f99a9 100644
--- a/internal-api/src/main/java/datadog/trace/api/Functions.java
+++ b/internal-api/src/main/java/datadog/trace/api/Functions.java
@@ -14,178 +14,170 @@
 
 public final class Functions {
 
-  private Functions() {}
+    private Functions() {}
 
-  public abstract static class Concatenate {
+    public abstract static class Concatenate {
 
-    public CharSequence concatenate(CharSequence left, CharSequence right) {
-      return UTF8BytesString.create(String.valueOf(left) + right);
+        public CharSequence concatenate(CharSequence left, CharSequence right) {
+            return UTF8BytesString.create(String.valueOf(left) + right);
+        }
     }
-  }
 
-  public static final class Suffix extends Concatenate
-      implements Function<CharSequence, CharSequence> {
-    private final CharSequence suffix;
-    private final Function<CharSequence, CharSequence> transformer;
+    public static final class Suffix extends Concatenate implements Function<CharSequence, CharSequence> {
+        private final CharSequence suffix;
+        private final Function<CharSequence, CharSequence> transformer;
 
-    public Suffix(CharSequence suffix, Function<CharSequence, CharSequence> transformer) {
-      this.suffix = suffix;
-      this.transformer = transformer;
-    }
+        public Suffix(CharSequence suffix, Function<CharSequence, CharSequence> transformer) {
+            this.suffix = suffix;
+            this.transformer = transformer;
+        }
 
-    public Suffix(String suffix) {
-      this(suffix, identity());
-    }
+        public Suffix(String suffix) {
+            this(suffix, identity());
+        }
 
-    @Override
-    public CharSequence apply(CharSequence key) {
-      return concatenate(transformer.apply(key), suffix);
+        @Override
+        public CharSequence apply(CharSequence key) {
+            return concatenate(transformer.apply(key), suffix);
+        }
     }
-  }
 
-  public static final class Prefix extends Concatenate
-      implements Function<CharSequence, CharSequence> {
-    private final CharSequence prefix;
-    private final Function<CharSequence, CharSequence> transformer;
+    public static final class Prefix extends Concatenate implements Function<CharSequence, CharSequence> {
+        private final CharSequence prefix;
+        private final Function<CharSequence, CharSequence> transformer;
 
-    public Prefix(CharSequence prefix, Function<CharSequence, CharSequence> transformer) {
-      this.prefix = prefix;
-      this.transformer = transformer;
-    }
+        public Prefix(CharSequence prefix, Function<CharSequence, CharSequence> transformer) {
+            this.prefix = prefix;
+            this.transformer = transformer;
+        }
 
-    public Prefix(CharSequence prefix) {
-      this(prefix, identity());
-    }
+        public Prefix(CharSequence prefix) {
+            this(prefix, identity());
+        }
 
-    @Override
-    public CharSequence apply(CharSequence key) {
-      return concatenate(prefix, transformer.apply(key));
+        @Override
+        public CharSequence apply(CharSequence key) {
+            return concatenate(prefix, transformer.apply(key));
+        }
     }
-  }
 
-  public abstract static class Join
-      implements BiFunction<CharSequence, CharSequence, CharSequence> {
-    protected final CharSequence joiner;
-    protected final Function<CharSequence, CharSequence> transformer;
+    public abstract static class Join implements BiFunction<CharSequence, CharSequence, CharSequence> {
+        protected final CharSequence joiner;
+        protected final Function<CharSequence, CharSequence> transformer;
 
-    protected Join(CharSequence joiner, Function<CharSequence, CharSequence> transformer) {
-      this.joiner = joiner;
-      this.transformer = transformer;
-    }
+        protected Join(CharSequence joiner, Function<CharSequence, CharSequence> transformer) {
+            this.joiner = joiner;
+            this.transformer = transformer;
+        }
 
-    @Override
-    public CharSequence apply(CharSequence left, CharSequence right) {
-      return UTF8BytesString.create(String.valueOf(left) + joiner + right);
+        @Override
+        public CharSequence apply(CharSequence left, CharSequence right) {
+            return UTF8BytesString.create(String.valueOf(left) + joiner + right);
+        }
+
+        public abstract Function<CharSequence, CharSequence> curry(CharSequence specialisation);
     }
 
-    public abstract Function<CharSequence, CharSequence> curry(CharSequence specialisation);
-  }
+    public static class PrefixJoin extends Join {
 
-  public static class PrefixJoin extends Join {
+        public PrefixJoin(CharSequence joiner, Function<CharSequence, CharSequence> transformer) {
+            super(joiner, transformer);
+        }
 
-    public PrefixJoin(CharSequence joiner, Function<CharSequence, CharSequence> transformer) {
-      super(joiner, transformer);
-    }
+        @Override
+        public Function<CharSequence, CharSequence> curry(CharSequence specialisation) {
+            return new Prefix(String.valueOf(specialisation) + joiner, transformer);
+        }
 
-    @Override
-    public Function<CharSequence, CharSequence> curry(CharSequence specialisation) {
-      return new Prefix(String.valueOf(specialisation) + joiner, transformer);
-    }
+        public static PrefixJoin of(CharSequence joiner, Function<CharSequence, CharSequence> transformer) {
+            return new PrefixJoin(joiner, transformer);
+        }
 
-    public static PrefixJoin of(
-        CharSequence joiner, Function<CharSequence, CharSequence> transformer) {
-      return new PrefixJoin(joiner, transformer);
-    }
+        public static PrefixJoin of(String joiner) {
+            return of(joiner, identity());
+        }
 
-    public static PrefixJoin of(String joiner) {
-      return of(joiner, identity());
+        public static final PrefixJoin ZERO = of("");
     }
 
-    public static final PrefixJoin ZERO = of("");
-  }
+    public static class SuffixJoin extends Join {
 
-  public static class SuffixJoin extends Join {
+        public SuffixJoin(CharSequence joiner, Function<CharSequence, CharSequence> transformer) {
+            super(joiner, transformer);
+        }
 
-    public SuffixJoin(CharSequence joiner, Function<CharSequence, CharSequence> transformer) {
-      super(joiner, transformer);
-    }
+        @Override
+        public Function<CharSequence, CharSequence> curry(CharSequence specialisation) {
+            return new Suffix(String.valueOf(joiner) + specialisation, transformer);
+        }
 
-    @Override
-    public Function<CharSequence, CharSequence> curry(CharSequence specialisation) {
-      return new Suffix(String.valueOf(joiner) + specialisation, transformer);
-    }
+        public static SuffixJoin of(CharSequence joiner, Function<CharSequence, CharSequence> transformer) {
+            return new SuffixJoin(joiner, transformer);
+        }
 
-    public static SuffixJoin of(
-        CharSequence joiner, Function<CharSequence, CharSequence> transformer) {
-      return new SuffixJoin(joiner, transformer);
-    }
+        public static SuffixJoin of(CharSequence joiner) {
+            return of(joiner, identity());
+        }
 
-    public static SuffixJoin of(CharSequence joiner) {
-      return of(joiner, identity());
+        public static final SuffixJoin ZERO = of("");
     }
 
-    public static final SuffixJoin ZERO = of("");
-  }
-
-  public static final Function<String, UTF8BytesString> UTF8_ENCODE = UTF8BytesString::create;
+    public static final Function<String, UTF8BytesString> UTF8_ENCODE = UTF8BytesString::create;
 
-  public static final class LowerCase implements Function<String, String> {
+    public static final class LowerCase implements Function<String, String> {
 
-    public static final LowerCase INSTANCE = new LowerCase();
+        public static final LowerCase INSTANCE = new LowerCase();
 
-    @Override
-    public String apply(String key) {
-      return key.toLowerCase(Locale.ROOT);
+        @Override
+        public String apply(String key) {
+            return key.toLowerCase(Locale.ROOT);
+        }
     }
-  }
 
-  public static final class ToString<T> implements Function<T, String> {
+    public static final class ToString<T> implements Function<T, String> {
 
-    @Override
-    public String apply(T key) {
-      return key.toString();
+        @Override
+        public String apply(T key) {
+            return key.toString();
+        }
     }
-  }
 
-  public static <T> Function<?, T> newInstanceOf(Class<T> clazz) {
-    return new NewInstance<>(clazz);
-  }
+    public static <T> Function<?, T> newInstanceOf(Class<T> clazz) {
+        return new NewInstance<>(clazz);
+    }
 
-  @SuppressWarnings("unchecked")
-  private static final class NewInstance<Object, T> implements Function<Object, T> {
+    @SuppressWarnings("unchecked")
+    private static final class NewInstance<Object, T> implements Function<Object, T> {
 
-    private final MethodHandle methodHandle;
+        private final MethodHandle methodHandle;
 
-    private NewInstance(Class<T> type) {
-      try {
-        this.methodHandle =
-            MethodHandles.lookup().findConstructor(type, MethodType.methodType(void.class));
-      } catch (NoSuchMethodException | IllegalAccessException e) {
-        throw new IllegalStateException(e);
-      }
-    }
+        private NewInstance(Class<T> type) {
+            try {
+                this.methodHandle = MethodHandles.lookup().findConstructor(type, MethodType.methodType(void.class));
+            } catch (NoSuchMethodException | IllegalAccessException e) {
+                throw new IllegalStateException(e);
+            }
+        }
 
-    @Override
-    public T apply(Object input) {
-      try {
-        // can't invokeExact because the return type is Object
-        // in this context
-        return (T) methodHandle.invoke();
-      } catch (Throwable throwable) {
-        return null;
-      }
+        @Override
+        public T apply(Object input) {
+            try {
+                // can't invokeExact because the return type is Object
+                // in this context
+                return (T) methodHandle.invoke();
+            } catch (Throwable throwable) {
+                return null;
+            }
+        }
     }
-  }
 
-  public static final Function<byte[], String> UTF8_BYTES_TO_STRING =
-      bytes -> new String(bytes, UTF_8);
+    public static final Function<byte[], String> UTF8_BYTES_TO_STRING = bytes -> new String(bytes, UTF_8);
 
-  public static final Function<byte[], String> BASE64_DECODE =
-      bytes -> {
+    public static final Function<byte[], String> BASE64_DECODE = bytes -> {
         try {
-          return new String(Base64.getDecoder().decode(bytes), UTF_8);
+            return new String(Base64.getDecoder().decode(bytes), UTF_8);
         } catch (final Exception ignored) {
-          return null;
+            return null;
         }
-      };
+    };
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/GenericClassValue.java b/internal-api/src/main/java/datadog/trace/api/GenericClassValue.java
index db401e8f329..8f20d23a91e 100644
--- a/internal-api/src/main/java/datadog/trace/api/GenericClassValue.java
+++ b/internal-api/src/main/java/datadog/trace/api/GenericClassValue.java
@@ -4,23 +4,23 @@
 
 public final class GenericClassValue<T> extends ClassValue<T> {
 
-  @SuppressWarnings("unchecked")
-  public static <T> ClassValue<T> constructing(Class<?> type) {
-    return new GenericClassValue<>((Function<Class<?>, T>) Functions.newInstanceOf(type));
-  }
+    @SuppressWarnings("unchecked")
+    public static <T> ClassValue<T> constructing(Class<?> type) {
+        return new GenericClassValue<>((Function<Class<?>, T>) Functions.newInstanceOf(type));
+    }
 
-  public static <T> ClassValue<T> of(Function<Class<?>, T> function) {
-    return new GenericClassValue<>(function);
-  }
+    public static <T> ClassValue<T> of(Function<Class<?>, T> function) {
+        return new GenericClassValue<>(function);
+    }
 
-  private final Function<Class<?>, T> function;
+    private final Function<Class<?>, T> function;
 
-  private GenericClassValue(Function<Class<?>, T> function) {
-    this.function = function;
-  }
+    private GenericClassValue(Function<Class<?>, T> function) {
+        this.function = function;
+    }
 
-  @Override
-  protected final T computeValue(Class<?> type) {
-    return function.apply(type);
-  }
+    @Override
+    protected final T computeValue(Class<?> type) {
+        return function.apply(type);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java b/internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java
index 84b407a6836..dc3932f57e2 100644
--- a/internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java
+++ b/internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java
@@ -132,756 +132,719 @@
  * @see Config for other configurations
  */
 @SuppressFBWarnings(
-    value = "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR",
-    justification = "Instance also created in Config")
+        value = "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR",
+        justification = "Instance also created in Config")
 public class InstrumenterConfig {
-  static {
-    // skip registration when building native-images as telemetry is not available
-    if (!Platform.isNativeImageBuilder()) {
-      ConfigInversionMetricCollectorProvider.register(
-          ConfigInversionMetricCollectorImpl.getInstance());
+    static {
+        // skip registration when building native-images as telemetry is not available
+        if (!Platform.isNativeImageBuilder()) {
+            ConfigInversionMetricCollectorProvider.register(ConfigInversionMetricCollectorImpl.getInstance());
+        }
     }
-  }
-
-  private final ConfigProvider configProvider;
 
-  private final boolean triageEnabled;
-
-  private final boolean integrationsEnabled;
-  private final boolean detailedInstrumentationErrors;
-
-  private final boolean codeOriginEnabled;
-  private final boolean codeOriginInterfaceSupport;
-  private final boolean traceEnabled;
-  private final boolean traceOtelEnabled;
-  private final boolean metricsOtelEnabled;
-  private final boolean logsOtelEnabled;
-  private final ProfilingEnablement profilingEnabled;
-  private final boolean ciVisibilityEnabled;
-  private final ProductActivation appSecActivation;
-  private final ProductActivation iastActivation;
-  private final boolean appSecRaspEnabled;
-  private final boolean iastFullyDisabled;
-  private final boolean usmEnabled;
-  private final boolean telemetryEnabled;
-  private final boolean llmObsEnabled;
-
-  private final String traceExtensionsPath;
-
-  private final boolean traceExecutorsAll;
-  private final List<String> traceExecutors;
-  private final Set<String> traceThreadPoolExecutorsExclude;
-
-  private final String jdbcPreparedStatementClassName;
-  private final String jdbcConnectionClassName;
-  private final boolean jdbcPoolWaitingEnabled;
-
-  private final String httpURLConnectionClassName;
-  private final String axisTransportClassName;
-  private final boolean websocketTracingEnabled;
-  private final boolean pekkoSchedulerEnabled;
-
-  private final String akkaForkJoinTaskName;
-  private final String akkaForkJoinExecutorTaskName;
-  private final String akkaForkJoinPoolName;
-
-  private final boolean directAllocationProfilingEnabled;
-
-  private final String instrumentationConfigId;
-
-  private final List<String> excludedClasses;
-  private final String excludedClassesFile;
-  private final Set<String> excludedClassLoaders;
-  private final List<String> excludedCodeSources;
-  private final Set<String> deferredClassLoaders;
-
-  private final String deferIntegrationsUntil;
-
-  private final ResolverCacheConfig resolverCacheConfig;
-  private final String resolverCacheDir;
-  private final boolean resolverNamesAreUnique;
-  private final boolean resolverSimpleMethodGraph;
-  private final boolean resolverUseLoadClass;
-  private final Boolean resolverUseUrlCaches;
-  private final int resolverResetInterval;
-  private final boolean visitorClassParsing;
-
-  private final boolean unsafeClassInjection;
-
-  private final boolean runtimeContextFieldInjection;
-  private final boolean serialVersionUIDFieldInjection;
-  private final boolean runtimeContextMapPerStore;
-
-  private final String traceAnnotations;
-  private final boolean traceAnnotationAsync;
-  private final Map<String, Set<String>> traceMethods;
-  private final Map<String, Set<String>> traceNativeMethods;
-  private final Map<String, Set<String>> measureMethods;
-  private final Map<String, Set<String>> measureNativeMethods;
-
-  private final boolean internalExitOnFailure;
-
-  private final Collection<String> additionalJaxRsAnnotations;
-
-  private final boolean rumEnabled;
-  private final boolean dataJobsEnabled;
-
-  private final boolean agentlessLogSubmissionEnabled;
-  private final boolean apiSecurityEndpointCollectionEnabled;
-
-  private final boolean appLogsCollectionEnabled;
-  private final boolean legacyContextManagerEnabled;
-
-  static {
-    // Bind telemetry collector to config module before initializing ConfigProvider
-    OtelEnvMetricCollectorProvider.register(OtelEnvMetricCollectorImpl.getInstance());
-  }
-
-  private InstrumenterConfig() {
-    this(ConfigProvider.createDefault());
-  }
-
-  InstrumenterConfig(ConfigProvider configProvider) {
-    this.configProvider = configProvider;
-
-    if (null != configProvider.getString(TRIAGE_REPORT_TRIGGER)) {
-      triageEnabled = true; // explicitly setting a trigger implies triage mode
-    } else {
-      // default to same state as debug mode, unless explicitly overridden
-      boolean debugEnabled = configProvider.getBoolean(TRACE_DEBUG, false);
-      triageEnabled = configProvider.getBoolean(TRACE_TRIAGE, debugEnabled);
-    }
-
-    integrationsEnabled =
-        configProvider.getBoolean(INTEGRATIONS_ENABLED, DEFAULT_INTEGRATIONS_ENABLED);
-    detailedInstrumentationErrors =
-        configProvider.getBoolean(DETAILED_INSTRUMENTATION_ERRORS, false);
-
-    codeOriginEnabled =
-        configProvider.getBoolean(
-            CODE_ORIGIN_FOR_SPANS_ENABLED, getDefaultCodeOriginForSpanEnabled());
-    codeOriginInterfaceSupport =
-        configProvider.getBoolean(
-            CODE_ORIGIN_FOR_SPANS_INTERFACE_SUPPORT,
-            DEFAULT_CODE_ORIGIN_FOR_SPANS_INTERFACE_SUPPORT);
-    traceEnabled = configProvider.getBoolean(TRACE_ENABLED, DEFAULT_TRACE_ENABLED);
-    traceOtelEnabled = configProvider.getBoolean(TRACE_OTEL_ENABLED, DEFAULT_TRACE_OTEL_ENABLED);
-    metricsOtelEnabled =
-        configProvider.getBoolean(METRICS_OTEL_ENABLED, DEFAULT_METRICS_OTEL_ENABLED);
-    logsOtelEnabled = configProvider.getBoolean(LOGS_OTEL_ENABLED, DEFAULT_LOGS_OTEL_ENABLED);
-
-    profilingEnabled =
-        ProfilingEnablement.of(
-            configProvider.getString(PROFILING_ENABLED, String.valueOf(PROFILING_ENABLED_DEFAULT)));
-    rumEnabled = configProvider.getBoolean(RUM_ENABLED, DEFAULT_RUM_ENABLED);
-    dataJobsEnabled = configProvider.getBoolean(DATA_JOBS_ENABLED, DEFAULT_DATA_JOBS_ENABLED);
-
-    appSecRaspEnabled = configProvider.getBoolean(APPSEC_RASP_ENABLED, DEFAULT_APPSEC_RASP_ENABLED);
-
-    if (!Platform.isNativeImageBuilder()) {
-      ciVisibilityEnabled =
-          configProvider.getBoolean(CIVISIBILITY_ENABLED, DEFAULT_CIVISIBILITY_ENABLED);
-      appSecActivation =
-          ProductActivation.fromString(
-              configProvider.getStringNotEmpty(APPSEC_ENABLED, DEFAULT_APPSEC_ENABLED));
-      iastActivation =
-          ProductActivation.fromString(
-              configProvider.getStringNotEmpty(IAST_ENABLED, DEFAULT_IAST_ENABLED));
-      final Boolean iastEnabled = configProvider.getBoolean(IAST_ENABLED);
-      iastFullyDisabled = iastEnabled != null && !iastEnabled;
-      usmEnabled = configProvider.getBoolean(USM_ENABLED, DEFAULT_USM_ENABLED);
-      telemetryEnabled = configProvider.getBoolean(TELEMETRY_ENABLED, DEFAULT_TELEMETRY_ENABLED);
-      llmObsEnabled = configProvider.getBoolean(LLMOBS_ENABLED, DEFAULT_LLM_OBS_ENABLED);
-    } else {
-      // disable these features in native-image
-      ciVisibilityEnabled = false;
-      appSecActivation = ProductActivation.FULLY_DISABLED;
-      iastActivation = ProductActivation.FULLY_DISABLED;
-      iastFullyDisabled = true;
-      telemetryEnabled = false;
-      usmEnabled = false;
-      llmObsEnabled = false;
-    }
-
-    traceExtensionsPath = configProvider.getString(TRACE_EXTENSIONS_PATH);
-
-    traceExecutorsAll = configProvider.getBoolean(TRACE_EXECUTORS_ALL, DEFAULT_TRACE_EXECUTORS_ALL);
-    traceExecutors = tryMakeImmutableList(configProvider.getList(TRACE_EXECUTORS));
-    traceThreadPoolExecutorsExclude =
-        tryMakeImmutableSet(configProvider.getList(TRACE_THREAD_POOL_EXECUTORS_EXCLUDE));
-
-    jdbcPreparedStatementClassName =
-        configProvider.getString(JDBC_PREPARED_STATEMENT_CLASS_NAME, "");
-    jdbcConnectionClassName = configProvider.getString(JDBC_CONNECTION_CLASS_NAME, "");
-    jdbcPoolWaitingEnabled = configProvider.getBoolean(JDBC_POOL_WAITING_ENABLED, false);
-
-    httpURLConnectionClassName = configProvider.getString(HTTP_URL_CONNECTION_CLASS_NAME, "");
-    axisTransportClassName = configProvider.getString(AXIS_TRANSPORT_CLASS_NAME, "");
-
-    akkaForkJoinTaskName = configProvider.getString(AKKA_FORK_JOIN_TASK_NAME, "");
-    akkaForkJoinExecutorTaskName = configProvider.getString(AKKA_FORK_JOIN_EXECUTOR_TASK_NAME, "");
-    akkaForkJoinPoolName = configProvider.getString(AKKA_FORK_JOIN_POOL_NAME, "");
-
-    directAllocationProfilingEnabled =
-        configProvider.getBoolean(
-            PROFILING_DIRECT_ALLOCATION_ENABLED, PROFILING_DIRECT_ALLOCATION_ENABLED_DEFAULT);
-
-    excludedClasses = tryMakeImmutableList(configProvider.getList(TRACE_CLASSES_EXCLUDE));
-    excludedClassesFile = configProvider.getString(TRACE_CLASSES_EXCLUDE_FILE);
-    excludedClassLoaders = tryMakeImmutableSet(configProvider.getList(TRACE_CLASSLOADERS_EXCLUDE));
-    excludedCodeSources = tryMakeImmutableList(configProvider.getList(TRACE_CODESOURCES_EXCLUDE));
-    deferredClassLoaders = tryMakeImmutableSet(configProvider.getList(TRACE_CLASSLOADERS_DEFER));
-
-    deferIntegrationsUntil = configProvider.getString(EXPERIMENTAL_DEFER_INTEGRATIONS_UNTIL);
-
-    resolverCacheConfig =
-        configProvider.getEnum(
-            RESOLVER_CACHE_CONFIG, ResolverCacheConfig.class, ResolverCacheConfig.MEMOS);
-    resolverCacheDir = configProvider.getString(RESOLVER_CACHE_DIR);
-    resolverNamesAreUnique = configProvider.getBoolean(RESOLVER_NAMES_ARE_UNIQUE, false);
-    resolverSimpleMethodGraph =
-        // use simpler approach everywhere except GraalVM, where it affects reachability analysis
-        configProvider.getBoolean(RESOLVER_SIMPLE_METHOD_GRAPH, !Platform.isNativeImageBuilder());
-    resolverUseLoadClass = configProvider.getBoolean(RESOLVER_USE_LOADCLASS, true);
-    resolverUseUrlCaches = configProvider.getBoolean(RESOLVER_USE_URL_CACHES);
-    resolverResetInterval =
-        Platform.isNativeImageBuilder()
-            ? 0
-            : configProvider.getInteger(RESOLVER_RESET_INTERVAL, DEFAULT_RESOLVER_RESET_INTERVAL);
-
-    unsafeClassInjection = configProvider.getBoolean(UNSAFE_CLASS_INJECTION, false);
-    visitorClassParsing = configProvider.getBoolean(VISITOR_CLASS_PARSING, false);
-
-    runtimeContextFieldInjection =
-        configProvider.getBoolean(
-            RUNTIME_CONTEXT_FIELD_INJECTION, DEFAULT_RUNTIME_CONTEXT_FIELD_INJECTION);
-    serialVersionUIDFieldInjection =
-        configProvider.getBoolean(
-            SERIALVERSIONUID_FIELD_INJECTION, DEFAULT_SERIALVERSIONUID_FIELD_INJECTION);
-    runtimeContextMapPerStore =
-        configProvider.getBoolean(
-            RUNTIME_CONTEXT_MAP_PER_STORE, DEFAULT_RUNTIME_CONTEXT_MAP_PER_STORE);
-
-    instrumentationConfigId = configProvider.getString(INSTRUMENTATION_CONFIG_ID, "");
-
-    traceAnnotations = configProvider.getString(TRACE_ANNOTATIONS, DEFAULT_TRACE_ANNOTATIONS);
-    traceAnnotationAsync =
-        configProvider.getBoolean(TRACE_ANNOTATION_ASYNC, DEFAULT_TRACE_ANNOTATION_ASYNC);
-    traceMethods =
-        MethodFilterConfigParser.parse(
-            configProvider.getString(TRACE_METHODS, DEFAULT_TRACE_METHODS));
-    traceNativeMethods =
-        MethodFilterConfigParser.parse(
-            configProvider.getString(TRACE_NATIVE_METHODS, DEFAULT_TRACE_NATIVE_METHODS));
-    measureMethods =
-        MethodFilterConfigParser.parse(
-            configProvider.getString(MEASURE_METHODS, DEFAULT_MEASURE_METHODS));
-    measureNativeMethods =
-        MethodFilterConfigParser.parse(
-            configProvider.getString(MEASURE_NATIVE_METHODS, DEFAULT_MEASURE_NATIVE_METHODS));
-    internalExitOnFailure = configProvider.getBoolean(INTERNAL_EXIT_ON_FAILURE, false);
-
-    this.additionalJaxRsAnnotations =
-        tryMakeImmutableSet(configProvider.getList(JAX_RS_ADDITIONAL_ANNOTATIONS));
-    this.websocketTracingEnabled =
-        configProvider.getBoolean(
-            TRACE_WEBSOCKET_MESSAGES_ENABLED, DEFAULT_WEBSOCKET_MESSAGES_ENABLED);
-    this.pekkoSchedulerEnabled = configProvider.getBoolean(TRACE_PEKKO_SCHEDULER_ENABLED, false);
-
-    agentlessLogSubmissionEnabled =
-        configProvider.getBoolean(AGENTLESS_LOG_SUBMISSION_ENABLED, false);
-
-    apiSecurityEndpointCollectionEnabled =
-        configProvider.getBoolean(
-            API_SECURITY_ENDPOINT_COLLECTION_ENABLED,
-            DEFAULT_API_SECURITY_ENDPOINT_COLLECTION_ENABLED);
-
-    appLogsCollectionEnabled =
-        configProvider.getBoolean(APP_LOGS_COLLECTION_ENABLED, DEFAULT_APP_LOGS_COLLECTION_ENABLED);
-
-    legacyContextManagerEnabled = configProvider.getBoolean(LEGACY_CONTEXT_MANAGER_ENABLED, true);
-  }
-
-  public boolean isCodeOriginEnabled() {
-    return codeOriginEnabled;
-  }
-
-  public boolean isCodeOriginInterfaceSupport() {
-    return codeOriginInterfaceSupport;
-  }
-
-  public boolean isTriageEnabled() {
-    return triageEnabled;
-  }
-
-  public boolean isIntegrationsEnabled() {
-    return integrationsEnabled;
-  }
-
-  public boolean isDetailedInstrumentationErrors() {
-    return detailedInstrumentationErrors;
-  }
-
-  /**
-   * isIntegrationEnabled determines whether an integration under the specified name(s) is enabled
-   * according to the following list of configurations, from highest to lowest precedence:
-   * trace.name.enabled, trace.integration.name.enabled, integration.name.enabled. If none of these
-   * configurations is set, the defaultEnabled value is used. All system properties take precedence
-   * over all env vars.
-   *
-   * @param integrationNames the name(s) that represent(s) the integration
-   * @param defaultEnabled true if enabled by default, else false
-   * @return boolean on whether the integration is enabled
-   */
-  public boolean isIntegrationEnabled(
-      final Iterable<String> integrationNames, final boolean defaultEnabled) {
-    // If default is enabled, we want to disable individually.
-    // If default is disabled, we want to enable individually.
-    boolean anyEnabled = defaultEnabled;
-    for (final String name : integrationNames) {
-      final String primaryKey = "trace." + name + ".enabled";
-      final String[] aliases = {
-        "trace.integration." + name + ".enabled", "integration." + name + ".enabled"
-      }; // listed in order of precedence
-      final boolean configEnabled = configProvider.getBoolean(primaryKey, defaultEnabled, aliases);
-      if (defaultEnabled) {
-        anyEnabled &= configEnabled;
-      } else {
-        anyEnabled |= configEnabled;
-      }
-    }
-    return anyEnabled;
-  }
-
-  public boolean isIntegrationShortcutMatchingEnabled(
-      final Iterable<String> integrationNames, final boolean defaultEnabled) {
-    return configProvider.isEnabled(
-        integrationNames, "integration.", ".matching.shortcut.enabled", defaultEnabled);
-  }
-
-  public boolean isTraceEnabled() {
-    return traceEnabled;
-  }
-
-  public boolean isTraceOtelEnabled() {
-    return traceOtelEnabled;
-  }
-
-  public boolean isMetricsOtelEnabled() {
-    return metricsOtelEnabled;
-  }
-
-  public boolean isLogsOtelEnabled() {
-    return logsOtelEnabled;
-  }
-
-  public boolean isProfilingEnabled() {
-    return profilingEnabled.isActive();
-  }
-
-  public boolean isCiVisibilityEnabled() {
-    return ciVisibilityEnabled;
-  }
-
-  public boolean isRaspEnabled() {
-    return getAppSecActivation() == ProductActivation.FULLY_ENABLED && isAppSecRaspEnabled();
-  }
-
-  public boolean isAppSecRaspEnabled() {
-    return appSecRaspEnabled;
-  }
-
-  public ProductActivation getAppSecActivation() {
-    return appSecActivation;
-  }
-
-  public ProductActivation getIastActivation() {
-    return iastActivation;
-  }
-
-  public boolean isIastFullyDisabled() {
-    return iastFullyDisabled;
-  }
-
-  public boolean isLlmObsEnabled() {
-    return llmObsEnabled;
-  }
-
-  public boolean isUsmEnabled() {
-    return usmEnabled;
-  }
-
-  public boolean isTelemetryEnabled() {
-    return telemetryEnabled;
-  }
-
-  public String getTraceExtensionsPath() {
-    return traceExtensionsPath;
-  }
-
-  public boolean isTraceExecutorsAll() {
-    return traceExecutorsAll;
-  }
-
-  public List<String> getTraceExecutors() {
-    return traceExecutors;
-  }
-
-  public Set<String> getTraceThreadPoolExecutorsExclude() {
-    return traceThreadPoolExecutorsExclude;
-  }
-
-  public String getJdbcPreparedStatementClassName() {
-    return jdbcPreparedStatementClassName;
-  }
-
-  public String getJdbcConnectionClassName() {
-    return jdbcConnectionClassName;
-  }
-
-  public boolean isJdbcPoolWaitingEnabled() {
-    return jdbcPoolWaitingEnabled;
-  }
-
-  public String getHttpURLConnectionClassName() {
-    return httpURLConnectionClassName;
-  }
+    private final ConfigProvider configProvider;
 
-  public String getAxisTransportClassName() {
-    return axisTransportClassName;
-  }
+    private final boolean triageEnabled;
 
-  public String getAkkaForkJoinTaskName() {
-    return akkaForkJoinTaskName;
-  }
+    private final boolean integrationsEnabled;
+    private final boolean detailedInstrumentationErrors;
 
-  public String getAkkaForkJoinExecutorTaskName() {
-    return akkaForkJoinExecutorTaskName;
-  }
+    private final boolean codeOriginEnabled;
+    private final boolean codeOriginInterfaceSupport;
+    private final boolean traceEnabled;
+    private final boolean traceOtelEnabled;
+    private final boolean metricsOtelEnabled;
+    private final boolean logsOtelEnabled;
+    private final ProfilingEnablement profilingEnabled;
+    private final boolean ciVisibilityEnabled;
+    private final ProductActivation appSecActivation;
+    private final ProductActivation iastActivation;
+    private final boolean appSecRaspEnabled;
+    private final boolean iastFullyDisabled;
+    private final boolean usmEnabled;
+    private final boolean telemetryEnabled;
+    private final boolean llmObsEnabled;
 
-  public String getAkkaForkJoinPoolName() {
-    return akkaForkJoinPoolName;
-  }
+    private final String traceExtensionsPath;
 
-  public boolean isDirectAllocationProfilingEnabled() {
-    return directAllocationProfilingEnabled;
-  }
+    private final boolean traceExecutorsAll;
+    private final List<String> traceExecutors;
+    private final Set<String> traceThreadPoolExecutorsExclude;
 
-  public List<String> getExcludedClasses() {
-    return excludedClasses;
-  }
+    private final String jdbcPreparedStatementClassName;
+    private final String jdbcConnectionClassName;
+    private final boolean jdbcPoolWaitingEnabled;
 
-  public String getExcludedClassesFile() {
-    return excludedClassesFile;
-  }
+    private final String httpURLConnectionClassName;
+    private final String axisTransportClassName;
+    private final boolean websocketTracingEnabled;
+    private final boolean pekkoSchedulerEnabled;
 
-  public Set<String> getExcludedClassLoaders() {
-    return excludedClassLoaders;
-  }
+    private final String akkaForkJoinTaskName;
+    private final String akkaForkJoinExecutorTaskName;
+    private final String akkaForkJoinPoolName;
 
-  public List<String> getExcludedCodeSources() {
-    return excludedCodeSources;
-  }
+    private final boolean directAllocationProfilingEnabled;
 
-  public Set<String> getDeferredClassLoaders() {
-    return deferredClassLoaders;
-  }
+    private final String instrumentationConfigId;
 
-  public String deferIntegrationsUntil() {
-    return deferIntegrationsUntil;
-  }
-
-  public int getResolverNoMatchesSize() {
-    return resolverCacheConfig.noMatchesSize();
-  }
-
-  public int getResolverVisibilitySize() {
-    return resolverCacheConfig.visibilitySize();
-  }
-
-  public boolean isResolverMemoizingEnabled() {
-    return resolverCacheConfig.memoPoolSize() > 0;
-  }
-
-  public int getResolverMemoPoolSize() {
-    return resolverCacheConfig.memoPoolSize();
-  }
-
-  public boolean isResolverOutliningEnabled() {
-    return resolverCacheConfig.outlinePoolSize() > 0;
-  }
-
-  public int getResolverOutlinePoolSize() {
-    return resolverCacheConfig.outlinePoolSize();
-  }
-
-  public int getResolverTypePoolSize() {
-    return resolverCacheConfig.typePoolSize();
-  }
-
-  public String getResolverCacheDir() {
-    return resolverCacheDir;
-  }
-
-  public boolean isUnsafeClassInjection() {
-    return unsafeClassInjection;
-  }
-
-  public boolean isVisitorClassParsing() {
-    return visitorClassParsing;
-  }
-
-  public String getInstrumentationConfigId() {
-    return instrumentationConfigId;
-  }
-
-  public boolean isResolverNamesAreUnique() {
-    return resolverNamesAreUnique;
-  }
-
-  public boolean isResolverSimpleMethodGraph() {
-    return resolverSimpleMethodGraph;
-  }
-
-  public boolean isResolverUseLoadClass() {
-    return resolverUseLoadClass;
-  }
-
-  public Boolean isResolverUseUrlCaches() {
-    return resolverUseUrlCaches;
-  }
-
-  public int getResolverResetInterval() {
-    return resolverResetInterval;
-  }
-
-  public boolean isRuntimeContextFieldInjection() {
-    return runtimeContextFieldInjection;
-  }
-
-  public boolean isSerialVersionUIDFieldInjection() {
-    return serialVersionUIDFieldInjection;
-  }
-
-  public boolean isRuntimeContextMapPerStore() {
-    return runtimeContextMapPerStore;
-  }
-
-  public String getTraceAnnotations() {
-    return traceAnnotations;
-  }
-
-  public Collection<String> getAdditionalJaxRsAnnotations() {
-    return additionalJaxRsAnnotations;
-  }
-
-  public boolean isWebsocketTracingEnabled() {
-    return websocketTracingEnabled;
-  }
-
-  public boolean isPekkoSchedulerEnabled() {
-    return pekkoSchedulerEnabled;
-  }
-
-  /**
-   * Check whether asynchronous result types are supported with @Trace annotation.
-   *
-   * @return {@code true} if supported, {@code false} otherwise.
-   */
-  public boolean isTraceAnnotationAsync() {
-    return traceAnnotationAsync;
-  }
-
-  public Map<String, Set<String>> getTraceMethods() {
-    return traceMethods;
-  }
-
-  public Map<String, Set<String>> getTraceNativeMethods() {
-    return traceNativeMethods;
-  }
-
-  public Map<String, Set<String>> getMeasureMethods() {
-    return measureMethods;
-  }
-
-  public Map<String, Set<String>> getMeasureNativeMethods() {
-    return measureNativeMethods;
-  }
-
-  public boolean isMethodMeasured(Method method) {
-    if (this.measureMethods.isEmpty()) {
-      return false;
-    }
-    String clazz = method.getDeclaringClass().getName();
-    Set<String> methods = this.measureMethods.get(clazz);
-    return methods != null && (methods.contains(method.getName()) || methods.contains("*"));
-  }
-
-  public boolean isInternalExitOnFailure() {
-    return internalExitOnFailure;
-  }
-
-  public boolean isLegacyInstrumentationEnabled(
-      final boolean defaultEnabled, final String... integrationNames) {
-    return configProvider.isEnabled(
-        Arrays.asList(integrationNames), "", ".legacy.tracing.enabled", defaultEnabled);
-  }
-
-  public boolean isRumEnabled() {
-    return rumEnabled;
-  }
-
-  public boolean isDataJobsEnabled() {
-    return dataJobsEnabled;
-  }
-
-  public boolean isAgentlessLogSubmissionEnabled() {
-    return agentlessLogSubmissionEnabled;
-  }
-
-  public boolean isApiSecurityEndpointCollectionEnabled() {
-    return apiSecurityEndpointCollectionEnabled;
-  }
-
-  public boolean isAppLogsCollectionEnabled() {
-    return appLogsCollectionEnabled;
-  }
-
-  public boolean isLegacyContextManagerEnabled() {
-    return legacyContextManagerEnabled;
-  }
-
-  // This has to be placed after all other static fields to give them a chance to initialize
-  private static final InstrumenterConfig INSTANCE =
-      new InstrumenterConfig(
-          Platform.isNativeImageBuilder()
-              ? ConfigProvider.withoutCollector()
-              : ConfigProvider.getInstance());
-
-  public static boolean getDefaultCodeOriginForSpanEnabled() {
-    if (JavaVirtualMachine.isJavaVersionAtLeast(21)) {
-      // activate by default Code Origin only for JDK21+
-      return true;
-    }
-    return false;
-  }
-
-  public static InstrumenterConfig get() {
-    return INSTANCE;
-  }
-
-  @Override
-  public String toString() {
-    return "InstrumenterConfig{"
-        + "integrationsEnabled="
-        + integrationsEnabled
-        + ", traceEnabled="
-        + traceEnabled
-        + ", traceOtelEnabled="
-        + traceOtelEnabled
-        + ", metricsOtelEnabled="
-        + metricsOtelEnabled
-        + ", logsOtelEnabled="
-        + logsOtelEnabled
-        + ", profilingEnabled="
-        + profilingEnabled
-        + ", ciVisibilityEnabled="
-        + ciVisibilityEnabled
-        + ", appSecActivation="
-        + appSecActivation
-        + ", iastActivation="
-        + iastActivation
-        + ", usmEnabled="
-        + usmEnabled
-        + ", telemetryEnabled="
-        + telemetryEnabled
-        + ", traceExtensionsPath="
-        + traceExtensionsPath
-        + ", traceExecutorsAll="
-        + traceExecutorsAll
-        + ", traceExecutors="
-        + traceExecutors
-        + ", jdbcPreparedStatementClassName='"
-        + jdbcPreparedStatementClassName
-        + '\''
-        + ", jdbcConnectionClassName='"
-        + jdbcConnectionClassName
-        + '\''
-        + ", jdbcPoolWaitingEnabled="
-        + jdbcPoolWaitingEnabled
-        + ", httpURLConnectionClassName='"
-        + httpURLConnectionClassName
-        + '\''
-        + ", axisTransportClassName='"
-        + axisTransportClassName
-        + '\''
-        + ", excludedClasses="
-        + excludedClasses
-        + ", excludedClassesFile="
-        + excludedClassesFile
-        + ", excludedClassLoaders="
-        + excludedClassLoaders
-        + ", excludedCodeSources="
-        + excludedCodeSources
-        + ", deferredClassLoaders="
-        + deferredClassLoaders
-        + ", deferIntegrationsUntil="
-        + deferIntegrationsUntil
-        + ", resolverCacheConfig="
-        + resolverCacheConfig
-        + ", resolverCacheDir="
-        + resolverCacheDir
-        + ", resolverNamesAreUnique="
-        + resolverNamesAreUnique
-        + ", resolverSimpleMethodGraph="
-        + resolverSimpleMethodGraph
-        + ", resolverUseLoadClass="
-        + resolverUseLoadClass
-        + ", resolverUseUrlCaches="
-        + resolverUseUrlCaches
-        + ", resolverResetInterval="
-        + resolverResetInterval
-        + ", runtimeContextFieldInjection="
-        + runtimeContextFieldInjection
-        + ", serialVersionUIDFieldInjection="
-        + serialVersionUIDFieldInjection
-        + ", runtimeContextMapPerStore="
-        + runtimeContextMapPerStore
-        + ", codeOriginEnabled="
-        + codeOriginEnabled
-        + ", traceAnnotations='"
-        + traceAnnotations
-        + '\''
-        + ", traceAnnotationAsync="
-        + traceAnnotationAsync
-        + ", traceMethods='"
-        + traceMethods
-        + '\''
-        + ", traceNativeMethods='"
-        + traceNativeMethods
-        + '\''
-        + ", measureMethods= '"
-        + measureMethods
-        + '\''
-        + ", measureNativeMethods= '"
-        + measureNativeMethods
-        + '\''
-        + ", internalExitOnFailure="
-        + internalExitOnFailure
-        + ", additionalJaxRsAnnotations="
-        + additionalJaxRsAnnotations
-        + ", websocketTracingEnabled="
-        + websocketTracingEnabled
-        + ", pekkoSchedulerEnabled="
-        + pekkoSchedulerEnabled
-        + ", rumEnabled="
-        + rumEnabled
-        + ", dataJobsEnabled="
-        + dataJobsEnabled
-        + ", apiSecurityEndpointCollectionEnabled="
-        + apiSecurityEndpointCollectionEnabled
-        + ", legacyContextManagerEnabled="
-        + legacyContextManagerEnabled
-        + '}';
-  }
+    private final List<String> excludedClasses;
+    private final String excludedClassesFile;
+    private final Set<String> excludedClassLoaders;
+    private final List<String> excludedCodeSources;
+    private final Set<String> deferredClassLoaders;
+
+    private final String deferIntegrationsUntil;
+
+    private final ResolverCacheConfig resolverCacheConfig;
+    private final String resolverCacheDir;
+    private final boolean resolverNamesAreUnique;
+    private final boolean resolverSimpleMethodGraph;
+    private final boolean resolverUseLoadClass;
+    private final Boolean resolverUseUrlCaches;
+    private final int resolverResetInterval;
+    private final boolean visitorClassParsing;
+
+    private final boolean unsafeClassInjection;
+
+    private final boolean runtimeContextFieldInjection;
+    private final boolean serialVersionUIDFieldInjection;
+    private final boolean runtimeContextMapPerStore;
+
+    private final String traceAnnotations;
+    private final boolean traceAnnotationAsync;
+    private final Map<String, Set<String>> traceMethods;
+    private final Map<String, Set<String>> traceNativeMethods;
+    private final Map<String, Set<String>> measureMethods;
+    private final Map<String, Set<String>> measureNativeMethods;
+
+    private final boolean internalExitOnFailure;
+
+    private final Collection<String> additionalJaxRsAnnotations;
+
+    private final boolean rumEnabled;
+    private final boolean dataJobsEnabled;
+
+    private final boolean agentlessLogSubmissionEnabled;
+    private final boolean apiSecurityEndpointCollectionEnabled;
+
+    private final boolean appLogsCollectionEnabled;
+    private final boolean legacyContextManagerEnabled;
+
+    static {
+        // Bind telemetry collector to config module before initializing ConfigProvider
+        OtelEnvMetricCollectorProvider.register(OtelEnvMetricCollectorImpl.getInstance());
+    }
+
+    private InstrumenterConfig() {
+        this(ConfigProvider.createDefault());
+    }
+
+    InstrumenterConfig(ConfigProvider configProvider) {
+        this.configProvider = configProvider;
+
+        if (null != configProvider.getString(TRIAGE_REPORT_TRIGGER)) {
+            triageEnabled = true; // explicitly setting a trigger implies triage mode
+        } else {
+            // default to same state as debug mode, unless explicitly overridden
+            boolean debugEnabled = configProvider.getBoolean(TRACE_DEBUG, false);
+            triageEnabled = configProvider.getBoolean(TRACE_TRIAGE, debugEnabled);
+        }
+
+        integrationsEnabled = configProvider.getBoolean(INTEGRATIONS_ENABLED, DEFAULT_INTEGRATIONS_ENABLED);
+        detailedInstrumentationErrors = configProvider.getBoolean(DETAILED_INSTRUMENTATION_ERRORS, false);
+
+        codeOriginEnabled =
+                configProvider.getBoolean(CODE_ORIGIN_FOR_SPANS_ENABLED, getDefaultCodeOriginForSpanEnabled());
+        codeOriginInterfaceSupport = configProvider.getBoolean(
+                CODE_ORIGIN_FOR_SPANS_INTERFACE_SUPPORT, DEFAULT_CODE_ORIGIN_FOR_SPANS_INTERFACE_SUPPORT);
+        traceEnabled = configProvider.getBoolean(TRACE_ENABLED, DEFAULT_TRACE_ENABLED);
+        traceOtelEnabled = configProvider.getBoolean(TRACE_OTEL_ENABLED, DEFAULT_TRACE_OTEL_ENABLED);
+        metricsOtelEnabled = configProvider.getBoolean(METRICS_OTEL_ENABLED, DEFAULT_METRICS_OTEL_ENABLED);
+        logsOtelEnabled = configProvider.getBoolean(LOGS_OTEL_ENABLED, DEFAULT_LOGS_OTEL_ENABLED);
+
+        profilingEnabled = ProfilingEnablement.of(
+                configProvider.getString(PROFILING_ENABLED, String.valueOf(PROFILING_ENABLED_DEFAULT)));
+        rumEnabled = configProvider.getBoolean(RUM_ENABLED, DEFAULT_RUM_ENABLED);
+        dataJobsEnabled = configProvider.getBoolean(DATA_JOBS_ENABLED, DEFAULT_DATA_JOBS_ENABLED);
+
+        appSecRaspEnabled = configProvider.getBoolean(APPSEC_RASP_ENABLED, DEFAULT_APPSEC_RASP_ENABLED);
+
+        if (!Platform.isNativeImageBuilder()) {
+            ciVisibilityEnabled = configProvider.getBoolean(CIVISIBILITY_ENABLED, DEFAULT_CIVISIBILITY_ENABLED);
+            appSecActivation = ProductActivation.fromString(
+                    configProvider.getStringNotEmpty(APPSEC_ENABLED, DEFAULT_APPSEC_ENABLED));
+            iastActivation =
+                    ProductActivation.fromString(configProvider.getStringNotEmpty(IAST_ENABLED, DEFAULT_IAST_ENABLED));
+            final Boolean iastEnabled = configProvider.getBoolean(IAST_ENABLED);
+            iastFullyDisabled = iastEnabled != null && !iastEnabled;
+            usmEnabled = configProvider.getBoolean(USM_ENABLED, DEFAULT_USM_ENABLED);
+            telemetryEnabled = configProvider.getBoolean(TELEMETRY_ENABLED, DEFAULT_TELEMETRY_ENABLED);
+            llmObsEnabled = configProvider.getBoolean(LLMOBS_ENABLED, DEFAULT_LLM_OBS_ENABLED);
+        } else {
+            // disable these features in native-image
+            ciVisibilityEnabled = false;
+            appSecActivation = ProductActivation.FULLY_DISABLED;
+            iastActivation = ProductActivation.FULLY_DISABLED;
+            iastFullyDisabled = true;
+            telemetryEnabled = false;
+            usmEnabled = false;
+            llmObsEnabled = false;
+        }
+
+        traceExtensionsPath = configProvider.getString(TRACE_EXTENSIONS_PATH);
+
+        traceExecutorsAll = configProvider.getBoolean(TRACE_EXECUTORS_ALL, DEFAULT_TRACE_EXECUTORS_ALL);
+        traceExecutors = tryMakeImmutableList(configProvider.getList(TRACE_EXECUTORS));
+        traceThreadPoolExecutorsExclude =
+                tryMakeImmutableSet(configProvider.getList(TRACE_THREAD_POOL_EXECUTORS_EXCLUDE));
+
+        jdbcPreparedStatementClassName = configProvider.getString(JDBC_PREPARED_STATEMENT_CLASS_NAME, "");
+        jdbcConnectionClassName = configProvider.getString(JDBC_CONNECTION_CLASS_NAME, "");
+        jdbcPoolWaitingEnabled = configProvider.getBoolean(JDBC_POOL_WAITING_ENABLED, false);
+
+        httpURLConnectionClassName = configProvider.getString(HTTP_URL_CONNECTION_CLASS_NAME, "");
+        axisTransportClassName = configProvider.getString(AXIS_TRANSPORT_CLASS_NAME, "");
+
+        akkaForkJoinTaskName = configProvider.getString(AKKA_FORK_JOIN_TASK_NAME, "");
+        akkaForkJoinExecutorTaskName = configProvider.getString(AKKA_FORK_JOIN_EXECUTOR_TASK_NAME, "");
+        akkaForkJoinPoolName = configProvider.getString(AKKA_FORK_JOIN_POOL_NAME, "");
+
+        directAllocationProfilingEnabled = configProvider.getBoolean(
+                PROFILING_DIRECT_ALLOCATION_ENABLED, PROFILING_DIRECT_ALLOCATION_ENABLED_DEFAULT);
+
+        excludedClasses = tryMakeImmutableList(configProvider.getList(TRACE_CLASSES_EXCLUDE));
+        excludedClassesFile = configProvider.getString(TRACE_CLASSES_EXCLUDE_FILE);
+        excludedClassLoaders = tryMakeImmutableSet(configProvider.getList(TRACE_CLASSLOADERS_EXCLUDE));
+        excludedCodeSources = tryMakeImmutableList(configProvider.getList(TRACE_CODESOURCES_EXCLUDE));
+        deferredClassLoaders = tryMakeImmutableSet(configProvider.getList(TRACE_CLASSLOADERS_DEFER));
+
+        deferIntegrationsUntil = configProvider.getString(EXPERIMENTAL_DEFER_INTEGRATIONS_UNTIL);
+
+        resolverCacheConfig =
+                configProvider.getEnum(RESOLVER_CACHE_CONFIG, ResolverCacheConfig.class, ResolverCacheConfig.MEMOS);
+        resolverCacheDir = configProvider.getString(RESOLVER_CACHE_DIR);
+        resolverNamesAreUnique = configProvider.getBoolean(RESOLVER_NAMES_ARE_UNIQUE, false);
+        resolverSimpleMethodGraph =
+                // use simpler approach everywhere except GraalVM, where it affects reachability analysis
+                configProvider.getBoolean(RESOLVER_SIMPLE_METHOD_GRAPH, !Platform.isNativeImageBuilder());
+        resolverUseLoadClass = configProvider.getBoolean(RESOLVER_USE_LOADCLASS, true);
+        resolverUseUrlCaches = configProvider.getBoolean(RESOLVER_USE_URL_CACHES);
+        resolverResetInterval = Platform.isNativeImageBuilder()
+                ? 0
+                : configProvider.getInteger(RESOLVER_RESET_INTERVAL, DEFAULT_RESOLVER_RESET_INTERVAL);
+
+        unsafeClassInjection = configProvider.getBoolean(UNSAFE_CLASS_INJECTION, false);
+        visitorClassParsing = configProvider.getBoolean(VISITOR_CLASS_PARSING, false);
+
+        runtimeContextFieldInjection =
+                configProvider.getBoolean(RUNTIME_CONTEXT_FIELD_INJECTION, DEFAULT_RUNTIME_CONTEXT_FIELD_INJECTION);
+        serialVersionUIDFieldInjection =
+                configProvider.getBoolean(SERIALVERSIONUID_FIELD_INJECTION, DEFAULT_SERIALVERSIONUID_FIELD_INJECTION);
+        runtimeContextMapPerStore =
+                configProvider.getBoolean(RUNTIME_CONTEXT_MAP_PER_STORE, DEFAULT_RUNTIME_CONTEXT_MAP_PER_STORE);
+
+        instrumentationConfigId = configProvider.getString(INSTRUMENTATION_CONFIG_ID, "");
+
+        traceAnnotations = configProvider.getString(TRACE_ANNOTATIONS, DEFAULT_TRACE_ANNOTATIONS);
+        traceAnnotationAsync = configProvider.getBoolean(TRACE_ANNOTATION_ASYNC, DEFAULT_TRACE_ANNOTATION_ASYNC);
+        traceMethods = MethodFilterConfigParser.parse(configProvider.getString(TRACE_METHODS, DEFAULT_TRACE_METHODS));
+        traceNativeMethods = MethodFilterConfigParser.parse(
+                configProvider.getString(TRACE_NATIVE_METHODS, DEFAULT_TRACE_NATIVE_METHODS));
+        measureMethods =
+                MethodFilterConfigParser.parse(configProvider.getString(MEASURE_METHODS, DEFAULT_MEASURE_METHODS));
+        measureNativeMethods = MethodFilterConfigParser.parse(
+                configProvider.getString(MEASURE_NATIVE_METHODS, DEFAULT_MEASURE_NATIVE_METHODS));
+        internalExitOnFailure = configProvider.getBoolean(INTERNAL_EXIT_ON_FAILURE, false);
+
+        this.additionalJaxRsAnnotations = tryMakeImmutableSet(configProvider.getList(JAX_RS_ADDITIONAL_ANNOTATIONS));
+        this.websocketTracingEnabled =
+                configProvider.getBoolean(TRACE_WEBSOCKET_MESSAGES_ENABLED, DEFAULT_WEBSOCKET_MESSAGES_ENABLED);
+        this.pekkoSchedulerEnabled = configProvider.getBoolean(TRACE_PEKKO_SCHEDULER_ENABLED, false);
+
+        agentlessLogSubmissionEnabled = configProvider.getBoolean(AGENTLESS_LOG_SUBMISSION_ENABLED, false);
+
+        apiSecurityEndpointCollectionEnabled = configProvider.getBoolean(
+                API_SECURITY_ENDPOINT_COLLECTION_ENABLED, DEFAULT_API_SECURITY_ENDPOINT_COLLECTION_ENABLED);
+
+        appLogsCollectionEnabled =
+                configProvider.getBoolean(APP_LOGS_COLLECTION_ENABLED, DEFAULT_APP_LOGS_COLLECTION_ENABLED);
+
+        legacyContextManagerEnabled = configProvider.getBoolean(LEGACY_CONTEXT_MANAGER_ENABLED, true);
+    }
+
+    public boolean isCodeOriginEnabled() {
+        return codeOriginEnabled;
+    }
+
+    public boolean isCodeOriginInterfaceSupport() {
+        return codeOriginInterfaceSupport;
+    }
+
+    public boolean isTriageEnabled() {
+        return triageEnabled;
+    }
+
+    public boolean isIntegrationsEnabled() {
+        return integrationsEnabled;
+    }
+
+    public boolean isDetailedInstrumentationErrors() {
+        return detailedInstrumentationErrors;
+    }
+
+    /**
+     * isIntegrationEnabled determines whether an integration under the specified name(s) is enabled
+     * according to the following list of configurations, from highest to lowest precedence:
+     * trace.name.enabled, trace.integration.name.enabled, integration.name.enabled. If none of these
+     * configurations is set, the defaultEnabled value is used. All system properties take precedence
+     * over all env vars.
+     *
+     * @param integrationNames the name(s) that represent(s) the integration
+     * @param defaultEnabled true if enabled by default, else false
+     * @return boolean on whether the integration is enabled
+     */
+    public boolean isIntegrationEnabled(final Iterable<String> integrationNames, final boolean defaultEnabled) {
+        // If default is enabled, we want to disable individually.
+        // If default is disabled, we want to enable individually.
+        boolean anyEnabled = defaultEnabled;
+        for (final String name : integrationNames) {
+            final String primaryKey = "trace." + name + ".enabled";
+            final String[] aliases = {"trace.integration." + name + ".enabled", "integration." + name + ".enabled"
+            }; // listed in order of precedence
+            final boolean configEnabled = configProvider.getBoolean(primaryKey, defaultEnabled, aliases);
+            if (defaultEnabled) {
+                anyEnabled &= configEnabled;
+            } else {
+                anyEnabled |= configEnabled;
+            }
+        }
+        return anyEnabled;
+    }
+
+    public boolean isIntegrationShortcutMatchingEnabled(
+            final Iterable<String> integrationNames, final boolean defaultEnabled) {
+        return configProvider.isEnabled(integrationNames, "integration.", ".matching.shortcut.enabled", defaultEnabled);
+    }
+
+    public boolean isTraceEnabled() {
+        return traceEnabled;
+    }
+
+    public boolean isTraceOtelEnabled() {
+        return traceOtelEnabled;
+    }
+
+    public boolean isMetricsOtelEnabled() {
+        return metricsOtelEnabled;
+    }
+
+    public boolean isLogsOtelEnabled() {
+        return logsOtelEnabled;
+    }
+
+    public boolean isProfilingEnabled() {
+        return profilingEnabled.isActive();
+    }
+
+    public boolean isCiVisibilityEnabled() {
+        return ciVisibilityEnabled;
+    }
+
+    public boolean isRaspEnabled() {
+        return getAppSecActivation() == ProductActivation.FULLY_ENABLED && isAppSecRaspEnabled();
+    }
+
+    public boolean isAppSecRaspEnabled() {
+        return appSecRaspEnabled;
+    }
+
+    public ProductActivation getAppSecActivation() {
+        return appSecActivation;
+    }
+
+    public ProductActivation getIastActivation() {
+        return iastActivation;
+    }
+
+    public boolean isIastFullyDisabled() {
+        return iastFullyDisabled;
+    }
+
+    public boolean isLlmObsEnabled() {
+        return llmObsEnabled;
+    }
+
+    public boolean isUsmEnabled() {
+        return usmEnabled;
+    }
+
+    public boolean isTelemetryEnabled() {
+        return telemetryEnabled;
+    }
+
+    public String getTraceExtensionsPath() {
+        return traceExtensionsPath;
+    }
+
+    public boolean isTraceExecutorsAll() {
+        return traceExecutorsAll;
+    }
+
+    public List<String> getTraceExecutors() {
+        return traceExecutors;
+    }
+
+    public Set<String> getTraceThreadPoolExecutorsExclude() {
+        return traceThreadPoolExecutorsExclude;
+    }
+
+    public String getJdbcPreparedStatementClassName() {
+        return jdbcPreparedStatementClassName;
+    }
+
+    public String getJdbcConnectionClassName() {
+        return jdbcConnectionClassName;
+    }
+
+    public boolean isJdbcPoolWaitingEnabled() {
+        return jdbcPoolWaitingEnabled;
+    }
+
+    public String getHttpURLConnectionClassName() {
+        return httpURLConnectionClassName;
+    }
+
+    public String getAxisTransportClassName() {
+        return axisTransportClassName;
+    }
+
+    public String getAkkaForkJoinTaskName() {
+        return akkaForkJoinTaskName;
+    }
+
+    public String getAkkaForkJoinExecutorTaskName() {
+        return akkaForkJoinExecutorTaskName;
+    }
+
+    public String getAkkaForkJoinPoolName() {
+        return akkaForkJoinPoolName;
+    }
+
+    public boolean isDirectAllocationProfilingEnabled() {
+        return directAllocationProfilingEnabled;
+    }
+
+    public List<String> getExcludedClasses() {
+        return excludedClasses;
+    }
+
+    public String getExcludedClassesFile() {
+        return excludedClassesFile;
+    }
+
+    public Set<String> getExcludedClassLoaders() {
+        return excludedClassLoaders;
+    }
+
+    public List<String> getExcludedCodeSources() {
+        return excludedCodeSources;
+    }
+
+    public Set<String> getDeferredClassLoaders() {
+        return deferredClassLoaders;
+    }
+
+    public String deferIntegrationsUntil() {
+        return deferIntegrationsUntil;
+    }
+
+    public int getResolverNoMatchesSize() {
+        return resolverCacheConfig.noMatchesSize();
+    }
+
+    public int getResolverVisibilitySize() {
+        return resolverCacheConfig.visibilitySize();
+    }
+
+    public boolean isResolverMemoizingEnabled() {
+        return resolverCacheConfig.memoPoolSize() > 0;
+    }
+
+    public int getResolverMemoPoolSize() {
+        return resolverCacheConfig.memoPoolSize();
+    }
+
+    public boolean isResolverOutliningEnabled() {
+        return resolverCacheConfig.outlinePoolSize() > 0;
+    }
+
+    public int getResolverOutlinePoolSize() {
+        return resolverCacheConfig.outlinePoolSize();
+    }
+
+    public int getResolverTypePoolSize() {
+        return resolverCacheConfig.typePoolSize();
+    }
+
+    public String getResolverCacheDir() {
+        return resolverCacheDir;
+    }
+
+    public boolean isUnsafeClassInjection() {
+        return unsafeClassInjection;
+    }
+
+    public boolean isVisitorClassParsing() {
+        return visitorClassParsing;
+    }
+
+    public String getInstrumentationConfigId() {
+        return instrumentationConfigId;
+    }
+
+    public boolean isResolverNamesAreUnique() {
+        return resolverNamesAreUnique;
+    }
+
+    public boolean isResolverSimpleMethodGraph() {
+        return resolverSimpleMethodGraph;
+    }
+
+    public boolean isResolverUseLoadClass() {
+        return resolverUseLoadClass;
+    }
+
+    public Boolean isResolverUseUrlCaches() {
+        return resolverUseUrlCaches;
+    }
+
+    public int getResolverResetInterval() {
+        return resolverResetInterval;
+    }
+
+    public boolean isRuntimeContextFieldInjection() {
+        return runtimeContextFieldInjection;
+    }
+
+    public boolean isSerialVersionUIDFieldInjection() {
+        return serialVersionUIDFieldInjection;
+    }
+
+    public boolean isRuntimeContextMapPerStore() {
+        return runtimeContextMapPerStore;
+    }
+
+    public String getTraceAnnotations() {
+        return traceAnnotations;
+    }
+
+    public Collection<String> getAdditionalJaxRsAnnotations() {
+        return additionalJaxRsAnnotations;
+    }
+
+    public boolean isWebsocketTracingEnabled() {
+        return websocketTracingEnabled;
+    }
+
+    public boolean isPekkoSchedulerEnabled() {
+        return pekkoSchedulerEnabled;
+    }
+
+    /**
+     * Check whether asynchronous result types are supported with @Trace annotation.
+     *
+     * @return {@code true} if supported, {@code false} otherwise.
+     */
+    public boolean isTraceAnnotationAsync() {
+        return traceAnnotationAsync;
+    }
+
+    public Map<String, Set<String>> getTraceMethods() {
+        return traceMethods;
+    }
+
+    public Map<String, Set<String>> getTraceNativeMethods() {
+        return traceNativeMethods;
+    }
+
+    public Map<String, Set<String>> getMeasureMethods() {
+        return measureMethods;
+    }
+
+    public Map<String, Set<String>> getMeasureNativeMethods() {
+        return measureNativeMethods;
+    }
+
+    public boolean isMethodMeasured(Method method) {
+        if (this.measureMethods.isEmpty()) {
+            return false;
+        }
+        String clazz = method.getDeclaringClass().getName();
+        Set<String> methods = this.measureMethods.get(clazz);
+        return methods != null && (methods.contains(method.getName()) || methods.contains("*"));
+    }
+
+    public boolean isInternalExitOnFailure() {
+        return internalExitOnFailure;
+    }
+
+    public boolean isLegacyInstrumentationEnabled(final boolean defaultEnabled, final String... integrationNames) {
+        return configProvider.isEnabled(Arrays.asList(integrationNames), "", ".legacy.tracing.enabled", defaultEnabled);
+    }
+
+    public boolean isRumEnabled() {
+        return rumEnabled;
+    }
+
+    public boolean isDataJobsEnabled() {
+        return dataJobsEnabled;
+    }
+
+    public boolean isAgentlessLogSubmissionEnabled() {
+        return agentlessLogSubmissionEnabled;
+    }
+
+    public boolean isApiSecurityEndpointCollectionEnabled() {
+        return apiSecurityEndpointCollectionEnabled;
+    }
+
+    public boolean isAppLogsCollectionEnabled() {
+        return appLogsCollectionEnabled;
+    }
+
+    public boolean isLegacyContextManagerEnabled() {
+        return legacyContextManagerEnabled;
+    }
+
+    // This has to be placed after all other static fields to give them a chance to initialize
+    private static final InstrumenterConfig INSTANCE = new InstrumenterConfig(
+            Platform.isNativeImageBuilder() ? ConfigProvider.withoutCollector() : ConfigProvider.getInstance());
+
+    public static boolean getDefaultCodeOriginForSpanEnabled() {
+        if (JavaVirtualMachine.isJavaVersionAtLeast(21)) {
+            // activate by default Code Origin only for JDK21+
+            return true;
+        }
+        return false;
+    }
+
+    public static InstrumenterConfig get() {
+        return INSTANCE;
+    }
+
+    @Override
+    public String toString() {
+        return "InstrumenterConfig{"
+                + "integrationsEnabled="
+                + integrationsEnabled
+                + ", traceEnabled="
+                + traceEnabled
+                + ", traceOtelEnabled="
+                + traceOtelEnabled
+                + ", metricsOtelEnabled="
+                + metricsOtelEnabled
+                + ", logsOtelEnabled="
+                + logsOtelEnabled
+                + ", profilingEnabled="
+                + profilingEnabled
+                + ", ciVisibilityEnabled="
+                + ciVisibilityEnabled
+                + ", appSecActivation="
+                + appSecActivation
+                + ", iastActivation="
+                + iastActivation
+                + ", usmEnabled="
+                + usmEnabled
+                + ", telemetryEnabled="
+                + telemetryEnabled
+                + ", traceExtensionsPath="
+                + traceExtensionsPath
+                + ", traceExecutorsAll="
+                + traceExecutorsAll
+                + ", traceExecutors="
+                + traceExecutors
+                + ", jdbcPreparedStatementClassName='"
+                + jdbcPreparedStatementClassName
+                + '\''
+                + ", jdbcConnectionClassName='"
+                + jdbcConnectionClassName
+                + '\''
+                + ", jdbcPoolWaitingEnabled="
+                + jdbcPoolWaitingEnabled
+                + ", httpURLConnectionClassName='"
+                + httpURLConnectionClassName
+                + '\''
+                + ", axisTransportClassName='"
+                + axisTransportClassName
+                + '\''
+                + ", excludedClasses="
+                + excludedClasses
+                + ", excludedClassesFile="
+                + excludedClassesFile
+                + ", excludedClassLoaders="
+                + excludedClassLoaders
+                + ", excludedCodeSources="
+                + excludedCodeSources
+                + ", deferredClassLoaders="
+                + deferredClassLoaders
+                + ", deferIntegrationsUntil="
+                + deferIntegrationsUntil
+                + ", resolverCacheConfig="
+                + resolverCacheConfig
+                + ", resolverCacheDir="
+                + resolverCacheDir
+                + ", resolverNamesAreUnique="
+                + resolverNamesAreUnique
+                + ", resolverSimpleMethodGraph="
+                + resolverSimpleMethodGraph
+                + ", resolverUseLoadClass="
+                + resolverUseLoadClass
+                + ", resolverUseUrlCaches="
+                + resolverUseUrlCaches
+                + ", resolverResetInterval="
+                + resolverResetInterval
+                + ", runtimeContextFieldInjection="
+                + runtimeContextFieldInjection
+                + ", serialVersionUIDFieldInjection="
+                + serialVersionUIDFieldInjection
+                + ", runtimeContextMapPerStore="
+                + runtimeContextMapPerStore
+                + ", codeOriginEnabled="
+                + codeOriginEnabled
+                + ", traceAnnotations='"
+                + traceAnnotations
+                + '\''
+                + ", traceAnnotationAsync="
+                + traceAnnotationAsync
+                + ", traceMethods='"
+                + traceMethods
+                + '\''
+                + ", traceNativeMethods='"
+                + traceNativeMethods
+                + '\''
+                + ", measureMethods= '"
+                + measureMethods
+                + '\''
+                + ", measureNativeMethods= '"
+                + measureNativeMethods
+                + '\''
+                + ", internalExitOnFailure="
+                + internalExitOnFailure
+                + ", additionalJaxRsAnnotations="
+                + additionalJaxRsAnnotations
+                + ", websocketTracingEnabled="
+                + websocketTracingEnabled
+                + ", pekkoSchedulerEnabled="
+                + pekkoSchedulerEnabled
+                + ", rumEnabled="
+                + rumEnabled
+                + ", dataJobsEnabled="
+                + dataJobsEnabled
+                + ", apiSecurityEndpointCollectionEnabled="
+                + apiSecurityEndpointCollectionEnabled
+                + ", legacyContextManagerEnabled="
+                + legacyContextManagerEnabled
+                + '}';
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/MethodFilterConfigParser.java b/internal-api/src/main/java/datadog/trace/api/MethodFilterConfigParser.java
index 00e55e4f2ff..bff200c0546 100644
--- a/internal-api/src/main/java/datadog/trace/api/MethodFilterConfigParser.java
+++ b/internal-api/src/main/java/datadog/trace/api/MethodFilterConfigParser.java
@@ -10,133 +10,136 @@
 import org.slf4j.LoggerFactory;
 
 public final class MethodFilterConfigParser {
-  private static final Logger log = LoggerFactory.getLogger(MethodFilterConfigParser.class);
+    private static final Logger log = LoggerFactory.getLogger(MethodFilterConfigParser.class);
 
-  private static Map<String, Set<String>> logWarn(
-      String message, int start, int end, String configString) {
-    String part = configString.substring(start, end).trim();
-    log.warn(
-        "Invalid trace method config {} in part '{}'. Must match 'package.Class$Name[method1,method2];?' or 'package.Class$Name[*];?'. Config string: '{}'",
-        message,
-        part,
-        configString);
-    return Collections.emptyMap();
-  }
+    private static Map<String, Set<String>> logWarn(String message, int start, int end, String configString) {
+        String part = configString.substring(start, end).trim();
+        log.warn(
+                "Invalid trace method config {} in part '{}'. Must match 'package.Class$Name[method1,method2];?' or 'package.Class$Name[*];?'. Config string: '{}'",
+                message,
+                part,
+                configString);
+        return Collections.emptyMap();
+    }
 
-  private static boolean hasIllegalCharacters(String string) {
-    for (int i = 0; i < string.length(); i++) {
-      char c = string.charAt(i);
-      if (c == '*' || c == '[' || c == ']' || c == ',') {
-        return true;
-      }
+    private static boolean hasIllegalCharacters(String string) {
+        for (int i = 0; i < string.length(); i++) {
+            char c = string.charAt(i);
+            if (c == '*' || c == '[' || c == ']' || c == ',') {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 
-  private static boolean isIllegalClassName(String string) {
-    return hasIllegalCharacters(string);
-  }
+    private static boolean isIllegalClassName(String string) {
+        return hasIllegalCharacters(string);
+    }
 
-  private static boolean isIllegalMethodName(String string) {
-    return !string.equals("*") && hasIllegalCharacters(string);
-  }
+    private static boolean isIllegalMethodName(String string) {
+        return !string.equals("*") && hasIllegalCharacters(string);
+    }
 
-  @SuppressForbidden
-  public static Map<String, Set<String>> parse(String configString) {
-    Map<String, Set<String>> classMethodsToTrace;
-    if (configString == null || configString.trim().isEmpty()) {
-      classMethodsToTrace = Collections.emptyMap();
-    } else {
-      Map<String, Set<String>> toTrace = new HashMap<>();
-      int start = 0;
-      do {
-        int next = configString.indexOf(';', start + 1);
-        int end = next == -1 ? configString.length() : next;
-        if (end > start + 1) {
-          int methodsStart = configString.indexOf('[', start);
-          if (methodsStart == -1) {
-            if (!configString.substring(start).trim().isEmpty()) {
-              // this had other things than trailing whitespace after the ';' which is illegal
-              toTrace = logWarn("with incomplete definition", start, end, configString);
-            }
-            break;
-          } else if (methodsStart >= end) {
-            // this part didn't contain a '[' or ended in a '[' which is illegal
-            toTrace = logWarn("with incomplete method definition", start, end, configString);
-            break;
-          }
-          int methodsEnd = configString.indexOf(']', methodsStart);
-          if (methodsEnd == -1 || methodsEnd > end) {
-            // this part didn't contain a ']' which is illegal
-            toTrace = logWarn("does not contain a ']'", start, end, configString);
-            break;
-          } else if (methodsEnd < end
-              && !configString.substring(methodsEnd + 1, end).trim().isEmpty()) {
-            // this had other things than trailing whitespace after the ']'
-            toTrace = logWarn("with extra characters after ']'", start, end, configString);
-            break;
-          }
-          String className = configString.substring(start, methodsStart).trim();
-          if (className.isEmpty() || isIllegalClassName(className)) {
-            toTrace = logWarn("with illegal class name", start, end, configString);
-            break;
-          }
-          Set<String> methodNames = toTrace.get(className);
-          if (null == methodNames) {
-            methodNames = new HashSet<>();
-            toTrace.put(className, methodNames);
-          }
-          int methods = 0;
-          int emptyMethods = 0;
-          boolean hasStar = false;
-          for (int methodStart = methodsStart + 1; methodStart < methodsEnd; ) {
-            int nextComma = configString.indexOf(',', methodStart);
-            int methodEnd = nextComma == -1 || nextComma >= methodsEnd ? methodsEnd : nextComma;
-            String method = configString.substring(methodStart, methodEnd).trim();
-            if (isIllegalMethodName(method)) {
-              toTrace = logWarn("with illegal method name", start, end, configString);
-              methods++; // don't log empty method warning at end
-              next = -1;
-              break;
-            } else if (method.isEmpty()) {
-              emptyMethods++;
-              if (emptyMethods > 1) {
-                // we can't have multiple empty methods
-                toTrace = logWarn("with multiple emtpy method names", start, end, configString);
-                methods++; // don't log empty method warning at end
-                next = -1;
-                break;
-              }
-            } else {
-              methods++;
-              if (emptyMethods > 0) {
-                // the empty method name was not the last one, which makes it illegal
-                toTrace =
-                    logWarn("with method name and emtpy method name", start, end, configString);
-                next = -1;
-                break;
-              }
-              hasStar |= method.indexOf('*') != -1;
-              if (hasStar && methods > 1) {
-                // having both a method and a '*' is illegal
-                toTrace = logWarn("with both method name and '*'", start, end, configString);
-                next = -1;
-                break;
-              }
-              methodNames.add(method);
-            }
-            methodStart = methodEnd + 1;
-          }
-          if (methods == 0) {
-            // empty method description is illegal
-            toTrace = logWarn("with empty method definition", start, end, configString);
-            break;
-          }
+    @SuppressForbidden
+    public static Map<String, Set<String>> parse(String configString) {
+        Map<String, Set<String>> classMethodsToTrace;
+        if (configString == null || configString.trim().isEmpty()) {
+            classMethodsToTrace = Collections.emptyMap();
+        } else {
+            Map<String, Set<String>> toTrace = new HashMap<>();
+            int start = 0;
+            do {
+                int next = configString.indexOf(';', start + 1);
+                int end = next == -1 ? configString.length() : next;
+                if (end > start + 1) {
+                    int methodsStart = configString.indexOf('[', start);
+                    if (methodsStart == -1) {
+                        if (!configString.substring(start).trim().isEmpty()) {
+                            // this had other things than trailing whitespace after the ';' which is illegal
+                            toTrace = logWarn("with incomplete definition", start, end, configString);
+                        }
+                        break;
+                    } else if (methodsStart >= end) {
+                        // this part didn't contain a '[' or ended in a '[' which is illegal
+                        toTrace = logWarn("with incomplete method definition", start, end, configString);
+                        break;
+                    }
+                    int methodsEnd = configString.indexOf(']', methodsStart);
+                    if (methodsEnd == -1 || methodsEnd > end) {
+                        // this part didn't contain a ']' which is illegal
+                        toTrace = logWarn("does not contain a ']'", start, end, configString);
+                        break;
+                    } else if (methodsEnd < end
+                            && !configString
+                                    .substring(methodsEnd + 1, end)
+                                    .trim()
+                                    .isEmpty()) {
+                        // this had other things than trailing whitespace after the ']'
+                        toTrace = logWarn("with extra characters after ']'", start, end, configString);
+                        break;
+                    }
+                    String className =
+                            configString.substring(start, methodsStart).trim();
+                    if (className.isEmpty() || isIllegalClassName(className)) {
+                        toTrace = logWarn("with illegal class name", start, end, configString);
+                        break;
+                    }
+                    Set<String> methodNames = toTrace.get(className);
+                    if (null == methodNames) {
+                        methodNames = new HashSet<>();
+                        toTrace.put(className, methodNames);
+                    }
+                    int methods = 0;
+                    int emptyMethods = 0;
+                    boolean hasStar = false;
+                    for (int methodStart = methodsStart + 1; methodStart < methodsEnd; ) {
+                        int nextComma = configString.indexOf(',', methodStart);
+                        int methodEnd = nextComma == -1 || nextComma >= methodsEnd ? methodsEnd : nextComma;
+                        String method =
+                                configString.substring(methodStart, methodEnd).trim();
+                        if (isIllegalMethodName(method)) {
+                            toTrace = logWarn("with illegal method name", start, end, configString);
+                            methods++; // don't log empty method warning at end
+                            next = -1;
+                            break;
+                        } else if (method.isEmpty()) {
+                            emptyMethods++;
+                            if (emptyMethods > 1) {
+                                // we can't have multiple empty methods
+                                toTrace = logWarn("with multiple emtpy method names", start, end, configString);
+                                methods++; // don't log empty method warning at end
+                                next = -1;
+                                break;
+                            }
+                        } else {
+                            methods++;
+                            if (emptyMethods > 0) {
+                                // the empty method name was not the last one, which makes it illegal
+                                toTrace = logWarn("with method name and emtpy method name", start, end, configString);
+                                next = -1;
+                                break;
+                            }
+                            hasStar |= method.indexOf('*') != -1;
+                            if (hasStar && methods > 1) {
+                                // having both a method and a '*' is illegal
+                                toTrace = logWarn("with both method name and '*'", start, end, configString);
+                                next = -1;
+                                break;
+                            }
+                            methodNames.add(method);
+                        }
+                        methodStart = methodEnd + 1;
+                    }
+                    if (methods == 0) {
+                        // empty method description is illegal
+                        toTrace = logWarn("with empty method definition", start, end, configString);
+                        break;
+                    }
+                }
+                start = next + 1;
+            } while (start != 0);
+            classMethodsToTrace = Collections.unmodifiableMap(toTrace);
         }
-        start = next + 1;
-      } while (start != 0);
-      classMethodsToTrace = Collections.unmodifiableMap(toTrace);
+        return classMethodsToTrace;
     }
-    return classMethodsToTrace;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/Pair.java b/internal-api/src/main/java/datadog/trace/api/Pair.java
index b70ec9e011f..0bb7d4284bb 100644
--- a/internal-api/src/main/java/datadog/trace/api/Pair.java
+++ b/internal-api/src/main/java/datadog/trace/api/Pair.java
@@ -5,48 +5,48 @@
 
 public final class Pair<T, U> {
 
-  public static <T, U> Pair<T, U> of(T left, U right) {
-    return new Pair<>(left, right);
-  }
-
-  private final T left;
-  private final U right;
-
-  Pair(@Nullable T left, @Nullable U right) {
-    this.left = left;
-    this.right = right;
-  }
-
-  @Nullable
-  public T getLeft() {
-    return left;
-  }
-
-  @Nullable
-  public U getRight() {
-    return right;
-  }
-
-  public boolean hasLeft() {
-    return null != left;
-  }
-
-  public boolean hasRight() {
-    return null != right;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o instanceof Pair) {
-      Pair<?, ?> pair = (Pair<?, ?>) o;
-      return Objects.equals(left, pair.left) && Objects.equals(right, pair.right);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    return 31 * (null == left ? 0 : left.hashCode()) + (null == right ? 0 : right.hashCode());
-  }
+    public static <T, U> Pair<T, U> of(T left, U right) {
+        return new Pair<>(left, right);
+    }
+
+    private final T left;
+    private final U right;
+
+    Pair(@Nullable T left, @Nullable U right) {
+        this.left = left;
+        this.right = right;
+    }
+
+    @Nullable
+    public T getLeft() {
+        return left;
+    }
+
+    @Nullable
+    public U getRight() {
+        return right;
+    }
+
+    public boolean hasLeft() {
+        return null != left;
+    }
+
+    public boolean hasRight() {
+        return null != right;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o instanceof Pair) {
+            Pair<?, ?> pair = (Pair<?, ?>) o;
+            return Objects.equals(left, pair.left) && Objects.equals(right, pair.right);
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return 31 * (null == left ? 0 : left.hashCode()) + (null == right ? 0 : right.hashCode());
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/Platform.java b/internal-api/src/main/java/datadog/trace/api/Platform.java
index f8293f654ba..71cbf3da7c3 100644
--- a/internal-api/src/main/java/datadog/trace/api/Platform.java
+++ b/internal-api/src/main/java/datadog/trace/api/Platform.java
@@ -12,50 +12,50 @@
  * they trigger early loading/binding.
  */
 public final class Platform {
-  // A helper class to capture whether the executable is a native image or not.
-  // This class needs to be iniatlized at build only during the AOT compilation and build.
-  private static class Captured {
-    public static final boolean isNativeImage = checkForNativeImageBuilder();
-  }
-
-  private static final boolean HAS_JFR = checkForJfr();
-  private static final boolean IS_NATIVE_IMAGE_BUILDER = checkForNativeImageBuilder();
-  private static final boolean IS_NATIVE_IMAGE = Captured.isNativeImage;
-
-  public static boolean hasJfr() {
-    return HAS_JFR;
-  }
-
-  public static boolean isNativeImageBuilder() {
-    return IS_NATIVE_IMAGE_BUILDER;
-  }
-
-  public static boolean isNativeImage() {
-    return IS_NATIVE_IMAGE;
-  }
-
-  private static boolean checkForJfr() {
-    try {
-      /* Check only for the open-sources JFR implementation.
-       * If it is ever needed to support also the closed sourced JDK 8 version the check should be
-       * enhanced.
-       * Note: we need to hardcode the good-known-versions instead of probing for JFR classes to
-       *       make this work with GraalVM native image.
-       * Note: as of version 0.49.0 of J9 the JVM contains JFR classes, but it is not fully functional
-       */
-      return ((isJavaVersion(8) && isJavaVersionAtLeast(8, 0, 272) || (isJavaVersionAtLeast(11))))
-          && !isJ9()
-          && !isOracleJDK8();
-    } catch (Throwable e) {
-      return false;
+    // A helper class to capture whether the executable is a native image or not.
+    // This class needs to be iniatlized at build only during the AOT compilation and build.
+    private static class Captured {
+        public static final boolean isNativeImage = checkForNativeImageBuilder();
     }
-  }
 
-  private static boolean checkForNativeImageBuilder() {
-    try {
-      return "org.graalvm.nativeimage.builder".equals(SystemProperties.get("jdk.module.main"));
-    } catch (Throwable e) {
-      return false;
+    private static final boolean HAS_JFR = checkForJfr();
+    private static final boolean IS_NATIVE_IMAGE_BUILDER = checkForNativeImageBuilder();
+    private static final boolean IS_NATIVE_IMAGE = Captured.isNativeImage;
+
+    public static boolean hasJfr() {
+        return HAS_JFR;
+    }
+
+    public static boolean isNativeImageBuilder() {
+        return IS_NATIVE_IMAGE_BUILDER;
+    }
+
+    public static boolean isNativeImage() {
+        return IS_NATIVE_IMAGE;
+    }
+
+    private static boolean checkForJfr() {
+        try {
+            /* Check only for the open-sources JFR implementation.
+             * If it is ever needed to support also the closed sourced JDK 8 version the check should be
+             * enhanced.
+             * Note: we need to hardcode the good-known-versions instead of probing for JFR classes to
+             *       make this work with GraalVM native image.
+             * Note: as of version 0.49.0 of J9 the JVM contains JFR classes, but it is not fully functional
+             */
+            return ((isJavaVersion(8) && isJavaVersionAtLeast(8, 0, 272) || (isJavaVersionAtLeast(11))))
+                    && !isJ9()
+                    && !isOracleJDK8();
+        } catch (Throwable e) {
+            return false;
+        }
+    }
+
+    private static boolean checkForNativeImageBuilder() {
+        try {
+            return "org.graalvm.nativeimage.builder".equals(SystemProperties.get("jdk.module.main"));
+        } catch (Throwable e) {
+            return false;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/ProcessTags.java b/internal-api/src/main/java/datadog/trace/api/ProcessTags.java
index 460238f3cf5..ebd3fca8c94 100644
--- a/internal-api/src/main/java/datadog/trace/api/ProcessTags.java
+++ b/internal-api/src/main/java/datadog/trace/api/ProcessTags.java
@@ -23,279 +23,265 @@
 import org.slf4j.LoggerFactory;
 
 public class ProcessTags {
-  private static final Logger LOGGER = LoggerFactory.getLogger(ProcessTags.class);
-  private static boolean enabled = Config.get().isExperimentalPropagateProcessTagsEnabled();
-  public static final String CLUSTER_NAME = "cluster.name";
-  public static final String SERVER_NAME = "server.name";
-  public static final String SERVER_TYPE = "server.type";
-  public static final String ENTRYPOINT_NAME = "entrypoint.name";
-  public static final String ENTRYPOINT_BASEDIR = "entrypoint.basedir";
-  public static final String ENTRYPOINT_WORKDIR = "entrypoint.workdir";
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProcessTags.class);
+    private static boolean enabled = Config.get().isExperimentalPropagateProcessTagsEnabled();
+    public static final String CLUSTER_NAME = "cluster.name";
+    public static final String SERVER_NAME = "server.name";
+    public static final String SERVER_TYPE = "server.type";
+    public static final String ENTRYPOINT_NAME = "entrypoint.name";
+    public static final String ENTRYPOINT_BASEDIR = "entrypoint.basedir";
+    public static final String ENTRYPOINT_WORKDIR = "entrypoint.workdir";
 
-  @VisibleForTesting static Function<String, String> envGetter = EnvironmentVariables::get;
+    @VisibleForTesting
+    static Function<String, String> envGetter = EnvironmentVariables::get;
 
-  private static class Lazy {
-    // the tags are used to compute a hash for dsm hence that map must be sorted.
-    static final SortedMap<String, String> TAGS = loadTags(Config.get());
-    static volatile UTF8BytesString serializedForm;
-    static volatile List<UTF8BytesString> utf8ListForm;
-    static volatile List<String> stringListForm;
+    private static class Lazy {
+        // the tags are used to compute a hash for dsm hence that map must be sorted.
+        static final SortedMap<String, String> TAGS = loadTags(Config.get());
+        static volatile UTF8BytesString serializedForm;
+        static volatile List<UTF8BytesString> utf8ListForm;
+        static volatile List<String> stringListForm;
 
-    private static SortedMap<String, String> loadTags(final Config config) {
-      SortedMap<String, String> tags = new TreeMap<>();
-      if (enabled) {
-        try {
-          fillBaseTags(tags);
-          fillServiceNameTags(tags, config);
-          fillJeeTags(tags);
-        } catch (Throwable t) {
-          LOGGER.debug("Unable to calculate default process tags", t);
+        private static SortedMap<String, String> loadTags(final Config config) {
+            SortedMap<String, String> tags = new TreeMap<>();
+            if (enabled) {
+                try {
+                    fillBaseTags(tags);
+                    fillServiceNameTags(tags, config);
+                    fillJeeTags(tags);
+                } catch (Throwable t) {
+                    LOGGER.debug("Unable to calculate default process tags", t);
+                }
+                fillMappingTags(tags, config.getProcessTagsMapping());
+            }
+            return tags;
         }
-        fillMappingTags(tags, config.getProcessTagsMapping());
-      }
-      return tags;
-    }
 
-    private static void fillMappingTags(
-        SortedMap<String, String> tags, Map<String, String> mappings) {
-      if (mappings.isEmpty()) {
-        return;
-      }
-      final Pattern mappingKeyPattern = Pattern.compile("^\\{(\\w+)}(\\S+)$");
-      for (Map.Entry<String, String> entry : mappings.entrySet()) {
-        parseMappingEntry(tags, mappingKeyPattern, entry.getKey(), entry.getValue());
-      }
-    }
+        private static void fillMappingTags(SortedMap<String, String> tags, Map<String, String> mappings) {
+            if (mappings.isEmpty()) {
+                return;
+            }
+            final Pattern mappingKeyPattern = Pattern.compile("^\\{(\\w+)}(\\S+)$");
+            for (Map.Entry<String, String> entry : mappings.entrySet()) {
+                parseMappingEntry(tags, mappingKeyPattern, entry.getKey(), entry.getValue());
+            }
+        }
 
-    private static void parseMappingEntry(
-        SortedMap<String, String> tags,
-        Pattern mappingKeyPattern,
-        String sourceAndKey,
-        String processTagKey) {
-      // sourceAndKey format: {source}config_key (colon-split already done by getMergedMap)
-      final Matcher matcher = mappingKeyPattern.matcher(sourceAndKey != null ? sourceAndKey : "");
-      if (!matcher.matches()) {
-        LOGGER.warn("Malformed process.tags.mapping key: '{}'", sourceAndKey);
-        return;
-      }
-      String source = matcher.group(1);
-      String configKey = matcher.group(2);
-      String value;
-      if ("env".equals(source)) {
-        value = envGetter.apply(configKey);
-      } else if ("prop".equals(source)) {
-        value = SystemProperties.get(configKey);
-      } else {
-        LOGGER.warn(
-            "Unsupported source '{}' in process.tags.mapping for key: '{}' (supported sources: 'env', 'prop' — lowercase only)",
-            source,
-            sourceAndKey);
-        return;
-      }
-      if (value == null || value.isEmpty()) {
-        LOGGER.debug(
-            "No value for key '{}' from source '{}' in process.tags.mapping", configKey, source);
-        return;
-      }
-      tags.put(TraceUtils.normalizeTagValue(processTagKey), value);
-    }
+        private static void parseMappingEntry(
+                SortedMap<String, String> tags, Pattern mappingKeyPattern, String sourceAndKey, String processTagKey) {
+            // sourceAndKey format: {source}config_key (colon-split already done by getMergedMap)
+            final Matcher matcher = mappingKeyPattern.matcher(sourceAndKey != null ? sourceAndKey : "");
+            if (!matcher.matches()) {
+                LOGGER.warn("Malformed process.tags.mapping key: '{}'", sourceAndKey);
+                return;
+            }
+            String source = matcher.group(1);
+            String configKey = matcher.group(2);
+            String value;
+            if ("env".equals(source)) {
+                value = envGetter.apply(configKey);
+            } else if ("prop".equals(source)) {
+                value = SystemProperties.get(configKey);
+            } else {
+                LOGGER.warn(
+                        "Unsupported source '{}' in process.tags.mapping for key: '{}' (supported sources: 'env', 'prop' — lowercase only)",
+                        source,
+                        sourceAndKey);
+                return;
+            }
+            if (value == null || value.isEmpty()) {
+                LOGGER.debug("No value for key '{}' from source '{}' in process.tags.mapping", configKey, source);
+                return;
+            }
+            tags.put(TraceUtils.normalizeTagValue(processTagKey), value);
+        }
 
-    private static void fillJeeTags(SortedMap<String, String> tags) {
-      if (fillJbossTags(tags)) {
-        return;
-      }
-      fillWebsphereTags(tags);
-    }
+        private static void fillJeeTags(SortedMap<String, String> tags) {
+            if (fillJbossTags(tags)) {
+                return;
+            }
+            fillWebsphereTags(tags);
+        }
 
-    private static void insertTagFromSysPropIfPresent(
-        Map<String, String> tags, String propKey, String tagKey) {
-      String value = SystemProperties.get(propKey);
-      if (value != null) {
-        tags.put(tagKey, value);
-      }
-    }
+        private static void insertTagFromSysPropIfPresent(Map<String, String> tags, String propKey, String tagKey) {
+            String value = SystemProperties.get(propKey);
+            if (value != null) {
+                tags.put(tagKey, value);
+            }
+        }
 
-    private static boolean insertTagFromEnvIfPresent(
-        Map<String, String> tags, String envKey, String tagKey) {
-      try {
-        String value = envGetter.apply(envKey);
-        if (value != null) {
-          tags.put(tagKey, value);
-          return true;
+        private static boolean insertTagFromEnvIfPresent(Map<String, String> tags, String envKey, String tagKey) {
+            try {
+                String value = envGetter.apply(envKey);
+                if (value != null) {
+                    tags.put(tagKey, value);
+                    return true;
+                }
+            } catch (Throwable ignored) {
+            }
+            return false;
         }
-      } catch (Throwable ignored) {
-      }
-      return false;
-    }
 
-    private static boolean insertLastPathSegmentIfPresent(
-        Map<String, String> tags, String path, String tagKey) {
-      if (path == null || path.isEmpty()) {
-        return false;
-      }
-      try {
-        final Path p = Paths.get(path).getFileName();
-        if (p != null) {
-          tags.put(tagKey, p.toString());
-          return true;
+        private static boolean insertLastPathSegmentIfPresent(Map<String, String> tags, String path, String tagKey) {
+            if (path == null || path.isEmpty()) {
+                return false;
+            }
+            try {
+                final Path p = Paths.get(path).getFileName();
+                if (p != null) {
+                    tags.put(tagKey, p.toString());
+                    return true;
+                }
+            } catch (Throwable ignored) {
+            }
+            return false;
         }
-      } catch (Throwable ignored) {
-      }
-      return false;
-    }
 
-    private static boolean hasSystemProperty(String propKey) {
-      return SystemProperties.get(propKey) != null;
-    }
+        private static boolean hasSystemProperty(String propKey) {
+            return SystemProperties.get(propKey) != null;
+        }
 
-    private static void fillBaseTags(Map<String, String> tags) {
-      final CapturedEnvironment.ProcessInfo processInfo =
-          CapturedEnvironment.get().getProcessInfo();
-      if (processInfo.mainClass != null) {
-        tags.put(ENTRYPOINT_NAME, processInfo.mainClass);
-        tags.put("entrypoint.type", "class");
-      }
-      if (processInfo.jarFile != null) {
-        final String jarName = processInfo.jarFile.getName();
-        tags.put(ENTRYPOINT_NAME, jarName.substring(0, jarName.length() - 4)); // strip .jar
-        tags.put("entrypoint.type", "jar");
-        insertLastPathSegmentIfPresent(tags, processInfo.jarFile.getParent(), ENTRYPOINT_BASEDIR);
-      }
-      insertLastPathSegmentIfPresent(tags, SystemProperties.get("user.dir"), ENTRYPOINT_WORKDIR);
-    }
+        private static void fillBaseTags(Map<String, String> tags) {
+            final CapturedEnvironment.ProcessInfo processInfo =
+                    CapturedEnvironment.get().getProcessInfo();
+            if (processInfo.mainClass != null) {
+                tags.put(ENTRYPOINT_NAME, processInfo.mainClass);
+                tags.put("entrypoint.type", "class");
+            }
+            if (processInfo.jarFile != null) {
+                final String jarName = processInfo.jarFile.getName();
+                tags.put(ENTRYPOINT_NAME, jarName.substring(0, jarName.length() - 4)); // strip .jar
+                tags.put("entrypoint.type", "jar");
+                insertLastPathSegmentIfPresent(tags, processInfo.jarFile.getParent(), ENTRYPOINT_BASEDIR);
+            }
+            insertLastPathSegmentIfPresent(tags, SystemProperties.get("user.dir"), ENTRYPOINT_WORKDIR);
+        }
 
-    private static void fillServiceNameTags(final Map<String, String> tags, final Config config) {
-      if (config.isServiceNameSetByUser()) {
-        tags.put("svc.user", "true");
-      } else {
-        tags.put("svc.auto", config.getServiceName());
-      }
-    }
+        private static void fillServiceNameTags(final Map<String, String> tags, final Config config) {
+            if (config.isServiceNameSetByUser()) {
+                tags.put("svc.user", "true");
+            } else {
+                tags.put("svc.auto", config.getServiceName());
+            }
+        }
 
-    private static boolean fillJbossTags(Map<String, String> tags) {
-      if (insertLastPathSegmentIfPresent(
-          tags, SystemProperties.get("jboss.home.dir"), "jboss.home")) {
-        insertTagFromSysPropIfPresent(tags, "jboss.server.name", SERVER_NAME);
-        tags.put("jboss.mode", hasSystemProperty("[Standalone]") ? "standalone" : "domain");
-        tags.put(SERVER_TYPE, "jboss");
-        return true;
-      }
-      return false;
-    }
+        private static boolean fillJbossTags(Map<String, String> tags) {
+            if (insertLastPathSegmentIfPresent(tags, SystemProperties.get("jboss.home.dir"), "jboss.home")) {
+                insertTagFromSysPropIfPresent(tags, "jboss.server.name", SERVER_NAME);
+                tags.put("jboss.mode", hasSystemProperty("[Standalone]") ? "standalone" : "domain");
+                tags.put(SERVER_TYPE, "jboss");
+                return true;
+            }
+            return false;
+        }
 
-    private static boolean fillWebsphereTags(Map<String, String> tags) {
-      if (insertTagFromEnvIfPresent(tags, "WAS_CELL", CLUSTER_NAME)) {
-        insertTagFromEnvIfPresent(tags, "SERVER_NAME", SERVER_NAME);
-        tags.put(SERVER_TYPE, "websphere");
-        return true;
-      }
-      return false;
-    }
+        private static boolean fillWebsphereTags(Map<String, String> tags) {
+            if (insertTagFromEnvIfPresent(tags, "WAS_CELL", CLUSTER_NAME)) {
+                insertTagFromEnvIfPresent(tags, "SERVER_NAME", SERVER_NAME);
+                tags.put(SERVER_TYPE, "websphere");
+                return true;
+            }
+            return false;
+        }
 
-    @SuppressFBWarnings(
-        value = "USO_UNSAFE_OBJECT_SYNCHRONIZATION",
-        justification =
-            "TAGS is private to this holder and never escapes; the same monitor guards every traversal and mutation.")
-    static void calculate() {
-      if (serializedForm != null || TAGS.isEmpty()) {
-        return;
-      }
-      synchronized (Lazy.TAGS) {
-        final Stream<UTF8BytesString> tagStream =
-            TAGS.entrySet().stream()
-                .map(
-                    entry ->
-                        UTF8BytesString.create(
-                            entry.getKey()
+        @SuppressFBWarnings(
+                value = "USO_UNSAFE_OBJECT_SYNCHRONIZATION",
+                justification =
+                        "TAGS is private to this holder and never escapes; the same monitor guards every traversal and mutation.")
+        static void calculate() {
+            if (serializedForm != null || TAGS.isEmpty()) {
+                return;
+            }
+            synchronized (Lazy.TAGS) {
+                final Stream<UTF8BytesString> tagStream = TAGS.entrySet().stream()
+                        .map(entry -> UTF8BytesString.create(entry.getKey()
                                 + ":"
-                                + TraceUtils.normalizeTagValue(
-                                    entry.getValue().replace(':', '_'))));
-        utf8ListForm = Collections.unmodifiableList(tagStream.collect(Collectors.toList()));
-        stringListForm =
-            Collections.unmodifiableList(
-                utf8ListForm.stream().map(UTF8BytesString::toString).collect(Collectors.toList()));
-        serializedForm = UTF8BytesString.create(String.join(",", utf8ListForm));
-      }
+                                + TraceUtils.normalizeTagValue(entry.getValue().replace(':', '_'))));
+                utf8ListForm = Collections.unmodifiableList(tagStream.collect(Collectors.toList()));
+                stringListForm = Collections.unmodifiableList(
+                        utf8ListForm.stream().map(UTF8BytesString::toString).collect(Collectors.toList()));
+                serializedForm = UTF8BytesString.create(String.join(",", utf8ListForm));
+            }
+        }
     }
-  }
-
-  private ProcessTags() {}
 
-  public static boolean isEnabled() {
-    return enabled;
-  }
+    private ProcessTags() {}
 
-  // need to be synchronized on writing. As optimization, it does not need to be sync on read.
-  public static void addTag(String key, String value) {
-    if (enabled) {
-      synchronized (Lazy.TAGS) {
-        Lazy.TAGS.put(key, value);
-        Lazy.serializedForm = null;
-        Lazy.stringListForm = null;
-        Lazy.utf8ListForm = null;
-      }
-      BaseHash.recalcBaseHash();
+    public static boolean isEnabled() {
+        return enabled;
     }
-  }
 
-  public static List<UTF8BytesString> getTagsAsUTF8ByteStringList() {
-    if (!enabled) {
-      return null;
-    }
-    final List<UTF8BytesString> listForm = Lazy.utf8ListForm;
-    if (listForm != null) {
-      return listForm;
+    // need to be synchronized on writing. As optimization, it does not need to be sync on read.
+    public static void addTag(String key, String value) {
+        if (enabled) {
+            synchronized (Lazy.TAGS) {
+                Lazy.TAGS.put(key, value);
+                Lazy.serializedForm = null;
+                Lazy.stringListForm = null;
+                Lazy.utf8ListForm = null;
+            }
+            BaseHash.recalcBaseHash();
+        }
     }
-    Lazy.calculate();
-    return Lazy.utf8ListForm;
-  }
 
-  public static List<String> getTagsAsStringList() {
-    if (!enabled) {
-      return null;
-    }
-    final List<String> listForm = Lazy.stringListForm;
-    if (listForm != null) {
-      return listForm;
+    public static List<UTF8BytesString> getTagsAsUTF8ByteStringList() {
+        if (!enabled) {
+            return null;
+        }
+        final List<UTF8BytesString> listForm = Lazy.utf8ListForm;
+        if (listForm != null) {
+            return listForm;
+        }
+        Lazy.calculate();
+        return Lazy.utf8ListForm;
     }
-    Lazy.calculate();
-    return Lazy.stringListForm;
-  }
 
-  public static UTF8BytesString getTagsForSerialization() {
-    if (!enabled) {
-      return null;
+    public static List<String> getTagsAsStringList() {
+        if (!enabled) {
+            return null;
+        }
+        final List<String> listForm = Lazy.stringListForm;
+        if (listForm != null) {
+            return listForm;
+        }
+        Lazy.calculate();
+        return Lazy.stringListForm;
     }
-    final UTF8BytesString serializedForm = Lazy.serializedForm;
-    if (serializedForm != null) {
-      return serializedForm;
+
+    public static UTF8BytesString getTagsForSerialization() {
+        if (!enabled) {
+            return null;
+        }
+        final UTF8BytesString serializedForm = Lazy.serializedForm;
+        if (serializedForm != null) {
+            return serializedForm;
+        }
+        Lazy.calculate();
+        return Lazy.serializedForm;
     }
-    Lazy.calculate();
-    return Lazy.serializedForm;
-  }
 
-  @VisibleForTesting
-  static void empty() {
-    synchronized (Lazy.TAGS) {
-      Lazy.TAGS.clear();
-      Lazy.serializedForm = null;
-      Lazy.stringListForm = null;
-      Lazy.utf8ListForm = null;
+    @VisibleForTesting
+    static void empty() {
+        synchronized (Lazy.TAGS) {
+            Lazy.TAGS.clear();
+            Lazy.serializedForm = null;
+            Lazy.stringListForm = null;
+            Lazy.utf8ListForm = null;
+        }
     }
-  }
 
-  @VisibleForTesting
-  static void reset() {
-    reset(Config.get());
-  }
+    @VisibleForTesting
+    static void reset() {
+        reset(Config.get());
+    }
 
-  @VisibleForTesting
-  public static void reset(Config config) {
-    synchronized (Lazy.TAGS) {
-      empty();
-      enabled = config.isExperimentalPropagateProcessTagsEnabled();
-      Lazy.TAGS.putAll(Lazy.loadTags(config));
-      BaseHash.recalcBaseHash();
+    @VisibleForTesting
+    public static void reset(Config config) {
+        synchronized (Lazy.TAGS) {
+            empty();
+            enabled = config.isExperimentalPropagateProcessTagsEnabled();
+            Lazy.TAGS.putAll(Lazy.loadTags(config));
+            BaseHash.recalcBaseHash();
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/ProductActivation.java b/internal-api/src/main/java/datadog/trace/api/ProductActivation.java
index 834afb815cc..81a1b6e264c 100644
--- a/internal-api/src/main/java/datadog/trace/api/ProductActivation.java
+++ b/internal-api/src/main/java/datadog/trace/api/ProductActivation.java
@@ -1,29 +1,29 @@
 package datadog.trace.api;
 
 public enum ProductActivation {
-  /**
-   * The product is initialized, its instrumentation is applied and the logic in the instrumentation
-   * advice is applied. It cannot be disabled at runtime.
-   */
-  FULLY_ENABLED,
-  /**
-   * Completely disabled. The product is not initialized in any way. It cannot be enabled at
-   * runtime.
-   */
-  FULLY_DISABLED,
-  /**
-   * The product is initialized, its instrumentation applied, but its logic is disabled to the
-   * greatest extent possible. It can be enabled and disabled at runtime through remote config.
-   */
-  ENABLED_INACTIVE;
+    /**
+     * The product is initialized, its instrumentation is applied and the logic in the instrumentation
+     * advice is applied. It cannot be disabled at runtime.
+     */
+    FULLY_ENABLED,
+    /**
+     * Completely disabled. The product is not initialized in any way. It cannot be enabled at
+     * runtime.
+     */
+    FULLY_DISABLED,
+    /**
+     * The product is initialized, its instrumentation applied, but its logic is disabled to the
+     * greatest extent possible. It can be enabled and disabled at runtime through remote config.
+     */
+    ENABLED_INACTIVE;
 
-  public static ProductActivation fromString(String s) {
-    if ("true".equalsIgnoreCase(s) || "1".equals(s)) {
-      return FULLY_ENABLED;
+    public static ProductActivation fromString(String s) {
+        if ("true".equalsIgnoreCase(s) || "1".equals(s)) {
+            return FULLY_ENABLED;
+        }
+        if ("inactive".equalsIgnoreCase(s)) {
+            return ENABLED_INACTIVE;
+        }
+        return FULLY_DISABLED;
     }
-    if ("inactive".equalsIgnoreCase(s)) {
-      return ENABLED_INACTIVE;
-    }
-    return FULLY_DISABLED;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/ProductTraceSource.java b/internal-api/src/main/java/datadog/trace/api/ProductTraceSource.java
index 976623cbd7d..2c51d6199e2 100644
--- a/internal-api/src/main/java/datadog/trace/api/ProductTraceSource.java
+++ b/internal-api/src/main/java/datadog/trace/api/ProductTraceSource.java
@@ -15,52 +15,52 @@
  */
 public class ProductTraceSource {
 
-  public static final int UNSET = 0;
+    public static final int UNSET = 0;
 
-  public static final int APM = 0x01;
-  public static final int ASM = 0x02;
-  public static final int DSM = 0x04;
-  public static final int DJM = 0x08;
-  public static final int DBM = 0x10;
-  public static final int AI_GUARD = 0x20;
+    public static final int APM = 0x01;
+    public static final int ASM = 0x02;
+    public static final int DSM = 0x04;
+    public static final int DJM = 0x08;
+    public static final int DBM = 0x10;
+    public static final int AI_GUARD = 0x20;
 
-  /** Updates the bitfield by setting the bit corresponding to a specific product. */
-  public static int updateProduct(int bitfield, int product) {
-    return bitfield |= product; // Set the bit for the given product
-  }
+    /** Updates the bitfield by setting the bit corresponding to a specific product. */
+    public static int updateProduct(int bitfield, int product) {
+        return bitfield |= product; // Set the bit for the given product
+    }
 
-  /** Checks if the bitfield is marked for a specific product. */
-  public static boolean isProductMarked(final int bitfield, int product) {
-    return (bitfield & product) != 0;
-  }
+    /** Checks if the bitfield is marked for a specific product. */
+    public static boolean isProductMarked(final int bitfield, int product) {
+        return (bitfield & product) != 0;
+    }
 
-  /** Checks if the bitfield is marked for either of the two given products. */
-  public static boolean isProductMarked(final int bitfield, int productA, int productB) {
-    return (bitfield & (productA | productB)) != 0;
-  }
+    /** Checks if the bitfield is marked for either of the two given products. */
+    public static boolean isProductMarked(final int bitfield, int productA, int productB) {
+        return (bitfield & (productA | productB)) != 0;
+    }
 
-  /**
-   * Converts the current bitfield to a two-character hexadecimal string.
-   *
-   * <p>This method ensures the output follows the **00 to FF** format, padding with leading zeros
-   * if necessary.
-   */
-  public static String getBitfieldHex(final int bitfield) {
-    String hex = Integer.toHexString(bitfield & 0xFF);
-    return hex.length() == 1 ? "0" + hex : hex; // Ensure two characters
-  }
+    /**
+     * Converts the current bitfield to a two-character hexadecimal string.
+     *
+     * <p>This method ensures the output follows the **00 to FF** format, padding with leading zeros
+     * if necessary.
+     */
+    public static String getBitfieldHex(final int bitfield) {
+        String hex = Integer.toHexString(bitfield & 0xFF);
+        return hex.length() == 1 ? "0" + hex : hex; // Ensure two characters
+    }
 
-  /**
-   * Parses a hexadecimal string back into an integer bitfield.
-   *
-   * <p>This method allows for **at least 32-bit parsing**, ensuring forward compatibility with
-   * potential future expansions.
-   */
-  public static int parseBitfieldHex(final String hexString) {
-    if (hexString == null || hexString.isEmpty()) {
-      return 0; // Return 0 if the string is empty
+    /**
+     * Parses a hexadecimal string back into an integer bitfield.
+     *
+     * <p>This method allows for **at least 32-bit parsing**, ensuring forward compatibility with
+     * potential future expansions.
+     */
+    public static int parseBitfieldHex(final String hexString) {
+        if (hexString == null || hexString.isEmpty()) {
+            return 0; // Return 0 if the string is empty
+        }
+        // Need to support unsigned parsing
+        return (int) Long.parseUnsignedLong(hexString, 16); // Parse the string as a base-16 number
     }
-    // Need to support unsigned parsing
-    return (int) Long.parseUnsignedLong(hexString, 16); // Parse the string as a base-16 number
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/ResolverCacheConfig.java b/internal-api/src/main/java/datadog/trace/api/ResolverCacheConfig.java
index 96a5a98cc04..986292e0261 100644
--- a/internal-api/src/main/java/datadog/trace/api/ResolverCacheConfig.java
+++ b/internal-api/src/main/java/datadog/trace/api/ResolverCacheConfig.java
@@ -3,153 +3,153 @@
 /** Named presets to help configure various caches inside the type resolver/matcher. */
 public enum ResolverCacheConfig {
 
-  /** Memoizing and outlining for large enterprise apps. */
-  LARGE {
-    @Override
-    public int noMatchesSize() {
-      return 65536;
-    }
-
-    @Override
-    public int visibilitySize() {
-      return 4096;
-    }
-
-    @Override
-    public int memoPoolSize() {
-      return 4096;
-    }
-
-    @Override
-    public int outlinePoolSize() {
-      return 256;
-    }
-
-    @Override
-    public int typePoolSize() {
-      return 64;
-    }
-  },
-
-  /** Memoizing and outlining for the average sized app. */
-  MEMOS {
-    @Override
-    public int noMatchesSize() {
-      return 16384;
-    }
-
-    @Override
-    public int visibilitySize() {
-      return 1024;
-    }
-
-    @Override
-    public int memoPoolSize() {
-      return 2048;
-    }
-
-    @Override
-    public int outlinePoolSize() {
-      return 128;
-    }
-
-    @Override
-    public int typePoolSize() {
-      return 32;
-    }
-  },
-
-  /** Outlining only for the average sized app, no memoizing. */
-  NO_MEMOS {
-    @Override
-    public int noMatchesSize() {
-      return 0;
-    }
-
-    @Override
-    public int visibilitySize() {
-      return 0;
-    }
-
-    @Override
-    public int memoPoolSize() {
-      return 0;
-    }
-
-    @Override
-    public int outlinePoolSize() {
-      return 256;
-    }
-
-    @Override
-    public int typePoolSize() {
-      return 32;
-    }
-  },
-
-  /** Outlining only for small microservice apps. */
-  SMALL {
-    @Override
-    public int noMatchesSize() {
-      return 0;
-    }
-
-    @Override
-    public int visibilitySize() {
-      return 0;
-    }
-
-    @Override
-    public int memoPoolSize() {
-      return 0;
-    }
-
-    @Override
-    public int outlinePoolSize() {
-      return 32;
-    }
-
-    @Override
-    public int typePoolSize() {
-      return 16;
-    }
-  },
-
-  /** No outlining or memoizing. */
-  LEGACY {
-    @Override
-    public int noMatchesSize() {
-      return 0;
-    }
-
-    @Override
-    public int visibilitySize() {
-      return 0;
-    }
-
-    @Override
-    public int memoPoolSize() {
-      return 0;
-    }
-
-    @Override
-    public int outlinePoolSize() {
-      return 0;
-    }
-
-    @Override
-    public int typePoolSize() {
-      return 64;
-    }
-  };
-
-  public abstract int noMatchesSize();
-
-  public abstract int visibilitySize();
-
-  public abstract int memoPoolSize();
-
-  public abstract int outlinePoolSize();
-
-  public abstract int typePoolSize();
+    /** Memoizing and outlining for large enterprise apps. */
+    LARGE {
+        @Override
+        public int noMatchesSize() {
+            return 65536;
+        }
+
+        @Override
+        public int visibilitySize() {
+            return 4096;
+        }
+
+        @Override
+        public int memoPoolSize() {
+            return 4096;
+        }
+
+        @Override
+        public int outlinePoolSize() {
+            return 256;
+        }
+
+        @Override
+        public int typePoolSize() {
+            return 64;
+        }
+    },
+
+    /** Memoizing and outlining for the average sized app. */
+    MEMOS {
+        @Override
+        public int noMatchesSize() {
+            return 16384;
+        }
+
+        @Override
+        public int visibilitySize() {
+            return 1024;
+        }
+
+        @Override
+        public int memoPoolSize() {
+            return 2048;
+        }
+
+        @Override
+        public int outlinePoolSize() {
+            return 128;
+        }
+
+        @Override
+        public int typePoolSize() {
+            return 32;
+        }
+    },
+
+    /** Outlining only for the average sized app, no memoizing. */
+    NO_MEMOS {
+        @Override
+        public int noMatchesSize() {
+            return 0;
+        }
+
+        @Override
+        public int visibilitySize() {
+            return 0;
+        }
+
+        @Override
+        public int memoPoolSize() {
+            return 0;
+        }
+
+        @Override
+        public int outlinePoolSize() {
+            return 256;
+        }
+
+        @Override
+        public int typePoolSize() {
+            return 32;
+        }
+    },
+
+    /** Outlining only for small microservice apps. */
+    SMALL {
+        @Override
+        public int noMatchesSize() {
+            return 0;
+        }
+
+        @Override
+        public int visibilitySize() {
+            return 0;
+        }
+
+        @Override
+        public int memoPoolSize() {
+            return 0;
+        }
+
+        @Override
+        public int outlinePoolSize() {
+            return 32;
+        }
+
+        @Override
+        public int typePoolSize() {
+            return 16;
+        }
+    },
+
+    /** No outlining or memoizing. */
+    LEGACY {
+        @Override
+        public int noMatchesSize() {
+            return 0;
+        }
+
+        @Override
+        public int visibilitySize() {
+            return 0;
+        }
+
+        @Override
+        public int memoPoolSize() {
+            return 0;
+        }
+
+        @Override
+        public int outlinePoolSize() {
+            return 0;
+        }
+
+        @Override
+        public int typePoolSize() {
+            return 64;
+        }
+    };
+
+    public abstract int noMatchesSize();
+
+    public abstract int visibilitySize();
+
+    public abstract int memoPoolSize();
+
+    public abstract int outlinePoolSize();
+
+    public abstract int typePoolSize();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/Stateful.java b/internal-api/src/main/java/datadog/trace/api/Stateful.java
index b9532ca6af3..58f03ca86bd 100644
--- a/internal-api/src/main/java/datadog/trace/api/Stateful.java
+++ b/internal-api/src/main/java/datadog/trace/api/Stateful.java
@@ -2,17 +2,16 @@
 
 public interface Stateful extends AutoCloseable {
 
-  Stateful DEFAULT =
-      new Stateful() {
+    Stateful DEFAULT = new Stateful() {
         @Override
         public void close() {}
 
         @Override
         public void activate(Object context) {}
-      };
+    };
 
-  @Override
-  void close();
+    @Override
+    void close();
 
-  void activate(Object context);
+    void activate(Object context);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/TagMap.java b/internal-api/src/main/java/datadog/trace/api/TagMap.java
index 2f2423d5239..afb117bf785 100644
--- a/internal-api/src/main/java/datadog/trace/api/TagMap.java
+++ b/internal-api/src/main/java/datadog/trace/api/TagMap.java
@@ -47,3064 +47,3033 @@
  * </ul>
  */
 public final class TagMap implements Map<String, Object>, Iterable<TagMap.EntryReader> {
-  /** Immutable empty TagMap - similar to {@link Collections#emptyMap()} */
-  // Frozen view over a length-1 array: bucket masking needs a power-of-two array length (size 0
-  // would fail with ArrayIndexOutOfBoundsException, size 1 works), and the private constructor
-  // reads no statics, so this is safe to build directly during TagMap's <clinit>.
-  public static final TagMap EMPTY = new TagMap(new Object[1], 0);
-
-  /** Creates a new mutable TagMap that contains the contents of <code>map</code> */
-  public static final TagMap fromMap(@Nonnull Map<String, ?> map) {
-    TagMap tagMap = TagMap.create(map.size());
-    tagMap.putAll(map);
-    return tagMap;
-  }
-
-  /** Creates a new immutable TagMap that contains the contents of <code>map</code> */
-  public static final TagMap fromMapImmutable(@Nonnull Map<String, ?> map) {
-    if (map.isEmpty()) {
-      return TagMap.EMPTY;
-    } else {
-      return fromMap(map).freeze();
-    }
-  }
-
-  public static final TagMap create() {
-    return new TagMap();
-  }
-
-  public static final TagMap create(int size) {
-    return new TagMap();
-  }
-
-  /**
-   * Creates a fresh, mutable TagMap that reads through to {@code parent} on local misses. The
-   * parent must be frozen and is fixed for the life of the returned map (no re-parenting), so
-   * read-through relies on a stable parent rather than an unenforced convention. Level-split phase
-   * 1.
-   *
-   * <p>Parents may themselves have parents: reads and the bulk/union views both walk the full
-   * ancestor chain, nearest-level-wins, so a multi-level chain (e.g. baggage over trace tags) is a
-   * supported layering, not just a single frozen parent.
-   *
-   * <p>An empty parent is dropped (treated as no parent): it contributes nothing to read through,
-   * and — being frozen — never will, so attaching it would only add read-through cost to every
-   * local miss/removal for no benefit.
-   */
-  public static final TagMap createFromParent(TagMap parent) {
-    if (parent != null) {
-      if (!parent.frozen) {
-        throw new IllegalStateException("read-through parent must be frozen");
-      }
-      // Exact, not isDefinitelyEmpty(): a multi-level parent can be observationally empty while a
-      // local level still holds entries (all of them tombstoned by a nearer level). Dropping such a
-      // parent keeps isEmpty()'s no-tombstone fast path valid -- an attached parent always
-      // contributes at least one visible entry.
-      if (parent.isEmpty()) {
-        parent = null;
-      }
-    }
-    return new TagMap(parent);
-  }
-
-  /** Creates a new TagMap.Ledger */
-  public static final Ledger ledger() {
-    return new Ledger();
-  }
-
-  /** Creates a new TagMap.Ledger which handles <code>size</code> modifications before expansion */
-  public static final Ledger ledger(int size) {
-    return new Ledger(size);
-  }
-
-  public abstract static class EntryChange {
-    public static final EntryRemoval newRemoval(String tag) {
-      return new EntryRemoval(tag);
-    }
-
-    final String tag;
-
-    EntryChange(String tag) {
-      this.tag = tag;
-    }
-
-    public final String tag() {
-      return this.tag;
-    }
-
-    public final boolean matches(String tag) {
-      return (this.tag == tag) || this.tag.equals(tag);
-    }
-
-    public abstract boolean isRemoval();
-  }
-
-  public static final class EntryRemoval extends EntryChange {
-    EntryRemoval(String tag) {
-      super(tag);
+    /** Immutable empty TagMap - similar to {@link Collections#emptyMap()} */
+    // Frozen view over a length-1 array: bucket masking needs a power-of-two array length (size 0
+    // would fail with ArrayIndexOutOfBoundsException, size 1 works), and the private constructor
+    // reads no statics, so this is safe to build directly during TagMap's <clinit>.
+    public static final TagMap EMPTY = new TagMap(new Object[1], 0);
+
+    /** Creates a new mutable TagMap that contains the contents of <code>map</code> */
+    public static final TagMap fromMap(@Nonnull Map<String, ?> map) {
+        TagMap tagMap = TagMap.create(map.size());
+        tagMap.putAll(map);
+        return tagMap;
+    }
+
+    /** Creates a new immutable TagMap that contains the contents of <code>map</code> */
+    public static final TagMap fromMapImmutable(@Nonnull Map<String, ?> map) {
+        if (map.isEmpty()) {
+            return TagMap.EMPTY;
+        } else {
+            return fromMap(map).freeze();
+        }
     }
 
-    @Override
-    public boolean isRemoval() {
-      return true;
+    public static final TagMap create() {
+        return new TagMap();
     }
-  }
 
-  public interface EntryReader {
-    public static final byte OBJECT = 1;
+    public static final TagMap create(int size) {
+        return new TagMap();
+    }
 
-    /*
-     * Non-numeric primitive types
+    /**
+     * Creates a fresh, mutable TagMap that reads through to {@code parent} on local misses. The
+     * parent must be frozen and is fixed for the life of the returned map (no re-parenting), so
+     * read-through relies on a stable parent rather than an unenforced convention. Level-split phase
+     * 1.
+     *
+     * <p>Parents may themselves have parents: reads and the bulk/union views both walk the full
+     * ancestor chain, nearest-level-wins, so a multi-level chain (e.g. baggage over trace tags) is a
+     * supported layering, not just a single frozen parent.
+     *
+     * <p>An empty parent is dropped (treated as no parent): it contributes nothing to read through,
+     * and — being frozen — never will, so attaching it would only add read-through cost to every
+     * local miss/removal for no benefit.
      */
-    public static final byte BOOLEAN = 2;
-    static final byte CHAR_RESERVED = 3;
+    public static final TagMap createFromParent(TagMap parent) {
+        if (parent != null) {
+            if (!parent.frozen) {
+                throw new IllegalStateException("read-through parent must be frozen");
+            }
+            // Exact, not isDefinitelyEmpty(): a multi-level parent can be observationally empty while a
+            // local level still holds entries (all of them tombstoned by a nearer level). Dropping such a
+            // parent keeps isEmpty()'s no-tombstone fast path valid -- an attached parent always
+            // contributes at least one visible entry.
+            if (parent.isEmpty()) {
+                parent = null;
+            }
+        }
+        return new TagMap(parent);
+    }
+
+    /** Creates a new TagMap.Ledger */
+    public static final Ledger ledger() {
+        return new Ledger();
+    }
+
+    /** Creates a new TagMap.Ledger which handles <code>size</code> modifications before expansion */
+    public static final Ledger ledger(int size) {
+        return new Ledger(size);
+    }
+
+    public abstract static class EntryChange {
+        public static final EntryRemoval newRemoval(String tag) {
+            return new EntryRemoval(tag);
+        }
+
+        final String tag;
+
+        EntryChange(String tag) {
+            this.tag = tag;
+        }
+
+        public final String tag() {
+            return this.tag;
+        }
+
+        public final boolean matches(String tag) {
+            return (this.tag == tag) || this.tag.equals(tag);
+        }
+
+        public abstract boolean isRemoval();
+    }
+
+    public static final class EntryRemoval extends EntryChange {
+        EntryRemoval(String tag) {
+            super(tag);
+        }
+
+        @Override
+        public boolean isRemoval() {
+            return true;
+        }
+    }
+
+    public interface EntryReader {
+        public static final byte OBJECT = 1;
+
+        /*
+         * Non-numeric primitive types
+         */
+        public static final byte BOOLEAN = 2;
+        static final byte CHAR_RESERVED = 3;
+
+        /*
+         * Numeric constants - deliberately arranged to allow for checking by using type >= BYTE
+         */
+        static final byte BYTE_RESERVED = 4;
+        static final byte SHORT_RESERVED = 5;
+        public static final byte INT = 6;
+        public static final byte LONG = 7;
+        public static final byte FLOAT = 8;
+        public static final byte DOUBLE = 9;
+
+        String tag();
+
+        byte type();
+
+        boolean is(byte type);
+
+        boolean isNumericPrimitive();
+
+        boolean isNumber();
+
+        boolean isObject();
+
+        Object objectValue();
+
+        String stringValue();
+
+        boolean booleanValue();
+
+        int intValue();
+
+        long longValue();
+
+        float floatValue();
+
+        double doubleValue();
+
+        Map.Entry<String, Object> mapEntry();
+
+        Entry entry();
+    }
+
+    public static final class Entry extends EntryChange implements Map.Entry<String, Object>, EntryReader {
+        /*
+         * Special value used for Objects that haven't been type checked yet.
+         * These objects might be primitive box objects.
+         */
+        static final byte ANY = 0;
+
+        /**
+         * Whether {@code value} is treated as "no tag" — a null, or an empty {@link CharSequence}. Set
+         * paths that honor the tag-filtering contract (e.g. {@code AgentSpan.setTag}, {@link
+         * SpanPrototype}) can gate on this without constructing an Entry — which matters once a dense
+         * store makes per-tag Entry allocation the wrong path.
+         */
+        public static boolean isEmptyValue(Object value) {
+            return value == null || (value instanceof CharSequence && ((CharSequence) value).length() == 0);
+        }
+
+        /**
+         * Entry for {@code (tag, value)}, or null when {@code value} is null or an empty {@code
+         * CharSequence} -- checked by runtime type, so an empty String passed as {@code Object} skips
+         * the same as via the {@link #create(String, CharSequence)} overload.
+         */
+        @Nullable
+        public static final Entry create(@Nonnull String tag, Object value) {
+            return isEmptyValue(value) ? null : TagMap.Entry.newAnyEntry(tag, value);
+        }
+
+        /** If value is non-null, returns a new TagMap.Entry If value is null or empty, returns null */
+        @Nullable
+        public static final Entry create(@Nonnull String tag, CharSequence value) {
+            // NOTE: From the static typing, we know that value is not a primitive box
+            return isEmptyValue(value) ? null : TagMap.Entry.newObjectEntry(tag, value);
+        }
+
+        public static final Entry create(@Nonnull String tag, boolean value) {
+            return TagMap.Entry.newBooleanEntry(tag, value);
+        }
+
+        public static final Entry create(@Nonnull String tag, int value) {
+            return TagMap.Entry.newIntEntry(tag, value);
+        }
+
+        public static final Entry create(@Nonnull String tag, long value) {
+            return TagMap.Entry.newLongEntry(tag, value);
+        }
+
+        public static final Entry create(@Nonnull String tag, float value) {
+            return TagMap.Entry.newFloatEntry(tag, value);
+        }
+
+        public static final Entry create(@Nonnull String tag, double value) {
+            return TagMap.Entry.newDoubleEntry(tag, value);
+        }
+
+        static Entry newAnyEntry(Map.Entry<? extends String, ? extends Object> entry) {
+            return newAnyEntry(entry.getKey(), entry.getValue());
+        }
+
+        static Entry newAnyEntry(String tag, Object value) {
+            // DQH - To keep entry creation (e.g. map changes) as fast as possible,
+            // the entry construction is kept as simple as possible.
+
+            // Prior versions of this code did type detection on value to
+            // recognize box types but that proved expensive.  So now,
+            // the type is recorded as an ANY which is an indicator to do
+            // type detection later if need be.
+            return new Entry(tag, ANY, 0L, value);
+        }
+
+        static Entry newObjectEntry(String tag, Object value) {
+            return new Entry(tag, OBJECT, 0, value);
+        }
+
+        static Entry newBooleanEntry(String tag, boolean value) {
+            return new Entry(tag, BOOLEAN, boolean2Prim(value), Boolean.valueOf(value));
+        }
+
+        static Entry newBooleanEntry(String tag, Boolean box) {
+            return new Entry(tag, BOOLEAN, boolean2Prim(box.booleanValue()), box);
+        }
+
+        static Entry newIntEntry(String tag, int value) {
+            return new Entry(tag, INT, int2Prim(value), null);
+        }
+
+        static Entry newIntEntry(String tag, Integer box) {
+            return new Entry(tag, INT, int2Prim(box.intValue()), box);
+        }
+
+        static Entry newLongEntry(String tag, long value) {
+            return new Entry(tag, LONG, long2Prim(value), null);
+        }
+
+        static Entry newLongEntry(String tag, Long box) {
+            return new Entry(tag, LONG, long2Prim(box.longValue()), box);
+        }
+
+        static Entry newFloatEntry(String tag, float value) {
+            return new Entry(tag, FLOAT, float2Prim(value), null);
+        }
+
+        static Entry newFloatEntry(String tag, Float box) {
+            return new Entry(tag, FLOAT, float2Prim(box.floatValue()), box);
+        }
+
+        static Entry newDoubleEntry(String tag, double value) {
+            return new Entry(tag, DOUBLE, double2Prim(value), null);
+        }
+
+        static Entry newDoubleEntry(String tag, Double box) {
+            return new Entry(tag, DOUBLE, double2Prim(box.doubleValue()), box);
+        }
+
+        /*
+         * hash is stored in line for fast handling of Entry-s coming from another TagMap
+         * However, hash is lazily computed using the same trick as {@link java.lang.String}.
+         */
+        int lazyTagHash;
+
+        // To optimize construction of Entry around boxed primitives and Object entries,
+        // no type checks are done during construction.
+        // Any Object entries are initially marked as type ANY, prim set to 0, and the Object put into
+        // obj
+        // If an ANY entry is later type checked or requested as a primitive, then the ANY will be
+        // resolved
+        // to the correct type.
+
+        // From the outside perspective, this object remains functionally immutable.
+        // However, internally, it is important to remember that this type must be thread safe.
+        // That includes multiple threads racing to resolve an ANY entry at the same time.
+
+        // Type and prim cannot use the same trick as hash because during ANY resolution the order of
+        // writes is important
+        volatile byte rawType;
+        volatile long rawPrim;
+        volatile Object rawObj;
+
+        volatile String strCache = null;
+
+        private Entry(String tag, byte type, long prim, Object obj) {
+            super(tag);
+            this.lazyTagHash = 0; // lazily computed
+
+            this.rawType = type;
+            this.rawPrim = prim;
+            this.rawObj = obj;
+        }
+
+        int hash() {
+            // If value of hash read in this thread is zero, then hash is computed.
+            // hash is not held as a volatile, since this computation can safely be repeated as any time
+            int hash = this.lazyTagHash;
+            if (hash != 0) return hash;
+
+            hash = _hash(this.tag);
+            this.lazyTagHash = hash;
+            return hash;
+        }
+
+        @Override
+        public Entry entry() {
+            return this;
+        }
+
+        @Override
+        public java.util.Map.Entry<String, Object> mapEntry() {
+            return this;
+        }
+
+        @Override
+        public byte type() {
+            return this.resolveAny();
+        }
+
+        @Override
+        public boolean is(byte type) {
+            byte curType = this.rawType;
+            if (curType == type) {
+                return true;
+            } else if (curType != ANY) {
+                return false;
+            } else {
+                return (this.resolveAny() == type);
+            }
+        }
+
+        @Override
+        public boolean isNumericPrimitive() {
+            byte curType = this.rawType;
+            if (_isNumericPrimitive(curType)) {
+                return true;
+            } else if (curType != ANY) {
+                return false;
+            } else {
+                return _isNumericPrimitive(this.resolveAny());
+            }
+        }
+
+        @Override
+        public boolean isNumber() {
+            byte curType = this.rawType;
+            return _isNumericPrimitive(curType) || (this.rawObj instanceof Number);
+        }
+
+        static boolean _isNumericPrimitive(byte type) {
+            return (type >= BYTE_RESERVED);
+        }
+
+        private byte resolveAny() {
+            byte curType = this.rawType;
+            if (curType != ANY) return curType;
+
+            Object value = this.rawObj;
+            long prim;
+            byte resolvedType;
+
+            if (value instanceof Boolean) {
+                Boolean boolValue = (Boolean) value;
+                prim = boolean2Prim(boolValue);
+                resolvedType = BOOLEAN;
+            } else if (value instanceof Integer) {
+                Integer intValue = (Integer) value;
+                prim = int2Prim(intValue);
+                resolvedType = INT;
+            } else if (value instanceof Long) {
+                Long longValue = (Long) value;
+                prim = long2Prim(longValue);
+                resolvedType = LONG;
+            } else if (value instanceof Float) {
+                Float floatValue = (Float) value;
+                prim = float2Prim(floatValue);
+                resolvedType = FLOAT;
+            } else if (value instanceof Double) {
+                Double doubleValue = (Double) value;
+                prim = double2Prim(doubleValue);
+                resolvedType = DOUBLE;
+            } else {
+                prim = 0;
+                resolvedType = OBJECT;
+            }
+
+            this._setPrim(resolvedType, prim);
+
+            return resolvedType;
+        }
+
+        private void _setPrim(byte type, long prim) {
+            // Order is important here, the contract is that prim must be set properly *before*
+            // type is set to a non-object type
+
+            this.rawPrim = prim;
+            this.rawType = type;
+        }
+
+        @Override
+        public boolean isObject() {
+            return this.is(OBJECT);
+        }
+
+        public boolean isRemoval() {
+            return false;
+        }
+
+        @Override
+        public Object objectValue() {
+            if (this.rawObj != null) {
+                return this.rawObj;
+            }
+
+            // This code doesn't need to handle ANY-s.
+            // An entry that starts as an ANY will always have this.obj set
+            switch (this.rawType) {
+                case BOOLEAN:
+                    this.rawObj = prim2Boolean(this.rawPrim);
+                    break;
+
+                case INT:
+                    // Maybe use a wider cache that handles response code???
+                    this.rawObj = prim2Int(this.rawPrim);
+                    break;
+
+                case LONG:
+                    this.rawObj = prim2Long(this.rawPrim);
+                    break;
+
+                case FLOAT:
+                    this.rawObj = prim2Float(this.rawPrim);
+                    break;
+
+                case DOUBLE:
+                    this.rawObj = prim2Double(this.rawPrim);
+                    break;
+
+                default:
+                    // DQH - satisfy spot bugs
+                    break;
+            }
+
+            return this.rawObj;
+        }
+
+        @Override
+        public boolean booleanValue() {
+            byte type = this.rawType;
+
+            if (type == BOOLEAN) {
+                return prim2Boolean(this.rawPrim);
+            } else if (type == ANY && this.rawObj instanceof Boolean) {
+                boolean boolValue = (Boolean) this.rawObj;
+                this._setPrim(BOOLEAN, boolean2Prim(boolValue));
+                return boolValue;
+            }
+
+            // resolution will set prim if necessary
+            byte resolvedType = this.resolveAny();
+            long prim = this.rawPrim;
+
+            switch (resolvedType) {
+                case INT:
+                    return prim2Int(prim) != 0;
+
+                case LONG:
+                    return prim2Long(prim) != 0L;
+
+                case FLOAT:
+                    return prim2Float(prim) != 0F;
+
+                case DOUBLE:
+                    return prim2Double(prim) != 0D;
+
+                case OBJECT:
+                    return (this.rawObj != null);
+            }
+
+            return false;
+        }
+
+        @Override
+        public int intValue() {
+            byte type = this.rawType;
+
+            if (type == INT) {
+                return prim2Int(this.rawPrim);
+            } else if (type == ANY && this.rawObj instanceof Integer) {
+                int intValue = (Integer) this.rawObj;
+                this._setPrim(INT, int2Prim(intValue));
+                return intValue;
+            }
+
+            // resolution will set prim if necessary
+            byte resolvedType = this.resolveAny();
+            long prim = this.rawPrim;
+
+            switch (resolvedType) {
+                case BOOLEAN:
+                    return prim2Boolean(prim) ? 1 : 0;
+
+                case LONG:
+                    return (int) prim2Long(prim);
+
+                case FLOAT:
+                    return (int) prim2Float(prim);
+
+                case DOUBLE:
+                    return (int) prim2Double(prim);
+
+                case OBJECT:
+                    return 0;
+            }
+
+            return 0;
+        }
+
+        @Override
+        public long longValue() {
+            byte type = this.rawType;
+
+            if (type == LONG) {
+                return prim2Long(this.rawPrim);
+            } else if (type == ANY && this.rawObj instanceof Long) {
+                long longValue = (Long) this.rawObj;
+                this._setPrim(LONG, long2Prim(longValue));
+                return longValue;
+            }
+
+            // resolution will set prim if necessary
+            byte resolvedType = this.resolveAny();
+            long prim = this.rawPrim;
+
+            switch (resolvedType) {
+                case BOOLEAN:
+                    return prim2Boolean(prim) ? 1L : 0L;
+
+                case INT:
+                    return prim2Int(prim);
+
+                case FLOAT:
+                    return (long) prim2Float(prim);
+
+                case DOUBLE:
+                    return (long) prim2Double(prim);
+
+                case OBJECT:
+                    return 0;
+            }
+
+            return 0;
+        }
+
+        @Override
+        public float floatValue() {
+            byte type = this.rawType;
+
+            if (type == FLOAT) {
+                return prim2Float(this.rawPrim);
+            } else if (type == ANY && this.rawObj instanceof Float) {
+                float floatValue = (Float) this.rawObj;
+                this._setPrim(FLOAT, float2Prim(floatValue));
+                return floatValue;
+            }
+
+            // resolution will set prim if necessary
+            byte resolvedType = this.resolveAny();
+            long prim = this.rawPrim;
+
+            switch (resolvedType) {
+                case BOOLEAN:
+                    return prim2Boolean(prim) ? 1F : 0F;
+
+                case INT:
+                    return (float) prim2Int(prim);
+
+                case LONG:
+                    return (float) prim2Long(prim);
+
+                case DOUBLE:
+                    return (float) prim2Double(prim);
+
+                case OBJECT:
+                    return 0F;
+            }
+
+            return 0F;
+        }
+
+        @Override
+        public double doubleValue() {
+            byte type = this.rawType;
+
+            if (type == DOUBLE) {
+                return prim2Double(this.rawPrim);
+            } else if (type == ANY && this.rawObj instanceof Double) {
+                double doubleValue = (Double) this.rawObj;
+                this._setPrim(DOUBLE, double2Prim(doubleValue));
+                return doubleValue;
+            }
+
+            // resolution will set prim if necessary
+            byte resolvedType = this.resolveAny();
+            long prim = this.rawPrim;
+
+            switch (resolvedType) {
+                case BOOLEAN:
+                    return prim2Boolean(prim) ? 1D : 0D;
+
+                case INT:
+                    return prim2Int(prim);
+
+                case LONG:
+                    return (double) prim2Long(prim);
+
+                case FLOAT:
+                    return prim2Float(prim);
+
+                case OBJECT:
+                    return 0D;
+            }
+
+            return 0D;
+        }
+
+        @Override
+        public String stringValue() {
+            String strCache = this.strCache;
+            if (strCache != null) {
+                return strCache;
+            }
+
+            String computeStr = this.computeStringValue();
+            this.strCache = computeStr;
+            return computeStr;
+        }
+
+        private String computeStringValue() {
+            // Could do type resolution here,
+            // but decided to just fallback to this.obj.toString() for ANY case
+            switch (this.rawType) {
+                case BOOLEAN:
+                    return Boolean.toString(prim2Boolean(this.rawPrim));
+
+                case INT:
+                    return Integer.toString(prim2Int(this.rawPrim));
+
+                case LONG:
+                    return Long.toString(prim2Long(this.rawPrim));
+
+                case FLOAT:
+                    return Float.toString(prim2Float(this.rawPrim));
+
+                case DOUBLE:
+                    return Double.toString(prim2Double(this.rawPrim));
+
+                case OBJECT:
+                case ANY:
+                    return this.rawObj.toString();
+            }
+
+            return null;
+        }
+
+        @Override
+        public String toString() {
+            return this.tag() + '=' + this.stringValue();
+        }
+
+        /** Deprecated in favor of{@link Entry#tag()} */
+        @Deprecated
+        @Override
+        public String getKey() {
+            return this.tag();
+        }
+
+        /**
+         * Deprecated in favor of typed getters like...
+         *
+         * <ul>
+         *   <li>{@link Entry#objectValue()}
+         *   <li>{@link Entry#stringValue()}
+         *   <li>{@link Entry#booleanValue()}
+         *   <li>...
+         * </ul>
+         */
+        @Deprecated
+        @Override
+        public Object getValue() {
+            return this.objectValue();
+        }
+
+        @Deprecated
+        @Override
+        public Object setValue(Object value) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public int hashCode() {
+            return this.hash();
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (!(obj instanceof TagMap.Entry)) return false;
+
+            TagMap.Entry that = (TagMap.Entry) obj;
+            return this.tag.equals(that.tag) && this.objectValue().equals(that.objectValue());
+        }
+
+        private static long boolean2Prim(boolean value) {
+            return value ? 1L : 0L;
+        }
+
+        private static boolean prim2Boolean(long prim) {
+            return (prim != 0L);
+        }
+
+        private static long int2Prim(int value) {
+            return value;
+        }
+
+        private static int prim2Int(long prim) {
+            return (int) prim;
+        }
+
+        private static long long2Prim(long value) {
+            return value;
+        }
+
+        private static long prim2Long(long prim) {
+            return prim;
+        }
+
+        private static long float2Prim(float value) {
+            return Float.floatToIntBits(value);
+        }
+
+        private static float prim2Float(long prim) {
+            return Float.intBitsToFloat((int) prim);
+        }
+
+        private static long double2Prim(double value) {
+            return Double.doubleToRawLongBits(value);
+        }
+
+        private static double prim2Double(long prim) {
+            return Double.longBitsToDouble(prim);
+        }
+
+        static int _hash(String tag) {
+            int hash = tag.hashCode();
+            return hash == 0 ? 0xDD06 : hash ^ (hash >>> 16);
+        }
+    }
 
     /*
-     * Numeric constants - deliberately arranged to allow for checking by using type >= BYTE
+     * An in-order ledger of changes to be made to a TagMap.
+     * Ledger can also serves as a builder for TagMap-s via build & buildImmutable.
      */
-    static final byte BYTE_RESERVED = 4;
-    static final byte SHORT_RESERVED = 5;
-    public static final byte INT = 6;
-    public static final byte LONG = 7;
-    public static final byte FLOAT = 8;
-    public static final byte DOUBLE = 9;
+    public static final class Ledger implements Iterable<EntryChange> {
+        EntryChange[] entryChanges;
+        int nextPos = 0;
+        boolean containsRemovals = false;
+
+        private Ledger() {
+            this(8);
+        }
+
+        private Ledger(int size) {
+            this.entryChanges = new EntryChange[size];
+        }
+
+        public boolean isDefinitelyEmpty() {
+            return (this.nextPos == 0);
+        }
+
+        /**
+         * Provides the estimated size of the map created by the ledger Doesn't account for overwritten
+         * entries or entry removal
+         *
+         * @return the estimated size of the map created by the ledger
+         */
+        public int estimateSize() {
+            return this.nextPos;
+        }
+
+        public boolean containsRemovals() {
+            return this.containsRemovals;
+        }
+
+        public Ledger set(String tag, Object value) {
+            return this.recordEntry(Entry.newAnyEntry(tag, value));
+        }
+
+        public Ledger set(String tag, CharSequence value) {
+            return this.recordEntry(Entry.newObjectEntry(tag, value));
+        }
+
+        public Ledger set(String tag, boolean value) {
+            return this.recordEntry(Entry.newBooleanEntry(tag, value));
+        }
+
+        public Ledger set(String tag, int value) {
+            return this.recordEntry(Entry.newIntEntry(tag, value));
+        }
+
+        public Ledger set(String tag, long value) {
+            return this.recordEntry(Entry.newLongEntry(tag, value));
+        }
+
+        public Ledger set(String tag, float value) {
+            return this.recordEntry(Entry.newFloatEntry(tag, value));
+        }
+
+        public Ledger set(String tag, double value) {
+            return this.recordEntry(Entry.newDoubleEntry(tag, value));
+        }
 
-    String tag();
+        public Ledger set(Entry entry) {
+            return this.recordEntry(entry);
+        }
 
-    byte type();
+        public Ledger remove(String tag) {
+            return this.recordRemoval(EntryChange.newRemoval(tag));
+        }
 
-    boolean is(byte type);
+        private Ledger recordEntry(Entry entry) {
+            this.recordChange(entry);
+            return this;
+        }
 
-    boolean isNumericPrimitive();
+        private Ledger recordRemoval(EntryRemoval entry) {
+            this.recordChange(entry);
+            this.containsRemovals = true;
 
-    boolean isNumber();
+            return this;
+        }
 
-    boolean isObject();
+        private void recordChange(EntryChange entryChange) {
+            if (this.nextPos >= this.entryChanges.length) {
+                this.entryChanges = Arrays.copyOf(this.entryChanges, this.entryChanges.length << 1);
+            }
 
-    Object objectValue();
+            this.entryChanges[this.nextPos++] = entryChange;
+        }
 
-    String stringValue();
+        public Ledger smartRemove(String tag) {
+            if (this.contains(tag)) {
+                this.remove(tag);
+            }
+            return this;
+        }
 
-    boolean booleanValue();
+        private boolean contains(String tag) {
+            EntryChange[] thisChanges = this.entryChanges;
 
-    int intValue();
+            // min is to clamp, so bounds check elimination optimization works
+            int lenClamp = Math.min(this.nextPos, thisChanges.length);
+            for (int i = 0; i < lenClamp; ++i) {
+                if (thisChanges[i].matches(tag)) return true;
+            }
+            return false;
+        }
 
-    long longValue();
+        /*
+         * Just for testing
+         */
+        Entry findLastEntry(String tag) {
+            EntryChange[] thisChanges = this.entryChanges;
+
+            // min is to clamp, so ArrayBoundsCheckElimination optimization works
+            int clampLen = Math.min(this.nextPos, thisChanges.length) - 1;
+            for (int i = clampLen; i >= 0; --i) {
+                EntryChange thisChange = thisChanges[i];
+                if (!thisChange.isRemoval() && thisChange.matches(tag)) return (Entry) thisChange;
+            }
+            return null;
+        }
 
-    float floatValue();
+        public void reset() {
+            Arrays.fill(this.entryChanges, null);
+            this.nextPos = 0;
+            this.containsRemovals = false;
+        }
 
-    double doubleValue();
+        @Override
+        public Iterator<EntryChange> iterator() {
+            return new IteratorImpl(this.entryChanges, this.nextPos);
+        }
 
-    Map.Entry<String, Object> mapEntry();
+        public TagMap build() {
+            TagMap map = TagMap.create(this.estimateSize());
+            fill(map);
+            return map;
+        }
 
-    Entry entry();
-  }
+        void fill(TagMap map) {
+            EntryChange[] entryChanges = this.entryChanges;
+            int size = this.nextPos;
+            for (int i = 0; i < size && i < entryChanges.length; ++i) {
+                EntryChange change = entryChanges[i];
+
+                if (change.isRemoval()) {
+                    map.remove(change.tag());
+                } else {
+                    map.set((Entry) change);
+                }
+            }
+        }
+
+        public TagMap buildImmutable() {
+            if (this.nextPos == 0) {
+                return TagMap.EMPTY;
+            } else {
+                return this.build().freeze();
+            }
+        }
+
+        static final class IteratorImpl implements Iterator<EntryChange> {
+            private final EntryChange[] entryChanges;
+            private final int size;
+
+            private int pos;
+
+            IteratorImpl(EntryChange[] entryChanges, int size) {
+                this.entryChanges = entryChanges;
+                this.size = size;
+
+                this.pos = -1;
+            }
+
+            @Override
+            public boolean hasNext() {
+                return (this.pos + 1 < this.size);
+            }
+
+            @Override
+            public EntryChange next() {
+                if (!this.hasNext()) throw new NoSuchElementException("no next");
+
+                return this.entryChanges[++this.pos];
+            }
+        }
+    }
 
-  public static final class Entry extends EntryChange
-      implements Map.Entry<String, Object>, EntryReader {
     /*
-     * Special value used for Objects that haven't been type checked yet.
-     * These objects might be primitive box objects.
+     * For memory efficiency, TagMap uses a rather complicated bucket system.
+     * <p>
+     * When there is only a single Entry in a particular bucket, the Entry is stored into the bucket directly.
+     * <p>
+     * Because the Entry objects can be shared between multiple TagMaps, the Entry objects cannot
+     * directly form a linked list to handle collisions.
+     * <p>
+     * Instead when multiple entries collide in the same bucket, a BucketGroup is formed to hold multiple entries.
+     * But a BucketGroup is only formed when a collision occurs to keep allocation low in the common case of no collisions.
+     * <p>
+     * For efficiency, BucketGroups are a fixed size, so when a BucketGroup fills up another BucketGroup is formed
+     * to hold the additional Entry-s.  And the BucketGroup-s are connected via a linked list instead of the Entry-s.
+     * <p>
+     * This does introduce some inefficiencies when Entry-s are removed.
+     * The assumption is that removals are rare, so BucketGroups are never consolidated.
+     * However as a precaution if a BucketGroup becomes completely empty, then that BucketGroup will be
+     * removed from the collision chain.
      */
-    static final byte ANY = 0;
+
+    private final Object[] buckets;
+    private int size;
+    private boolean frozen;
 
     /**
-     * Whether {@code value} is treated as "no tag" — a null, or an empty {@link CharSequence}. Set
-     * paths that honor the tag-filtering contract (e.g. {@code AgentSpan.setTag}, {@link
-     * SpanPrototype}) can gate on this without constructing an Entry — which matters once a dense
-     * store makes per-tag Entry allocation the wrong path.
+     * Optional frozen parent for read-through. When non-null, reads that miss the local buckets fall
+     * through to the parent chain, nearest-level-wins (a local entry shadows the parent's, a nearer
+     * ancestor shadows a farther one). Parents may themselves have parents, so this is a chain (e.g.
+     * baggage layered over trace tags). Must be frozen when attached, so it is safely shareable. Not
+     * final only so {@link #clear()} can detach it (to null); it is otherwise fixed at construction
+     * and never re-pointed. Package-visible so same-package tests can assert attach/detach directly.
      */
-    public static boolean isEmptyValue(Object value) {
-      return value == null
-          || (value instanceof CharSequence && ((CharSequence) value).length() == 0);
-    }
+    @VisibleForTesting
+    TagMap parent;
 
     /**
-     * Entry for {@code (tag, value)}, or null when {@code value} is null or an empty {@code
-     * CharSequence} -- checked by runtime type, so an empty String passed as {@code Object} skips
-     * the same as via the {@link #create(String, CharSequence)} overload.
+     * Parent keys removed locally (read-through tombstones). Lazily allocated on the first such
+     * removal; {@code null} both means "no tombstones" and serves as the gate that keeps the hot
+     * paths untouched. Only meaningful when {@link #parent} != null. A tombstone stops read-through
+     * fall-through for its key, so a key removed from a child no longer reads through to the parent.
+     * Kept off the bucket structure deliberately — it is shape-agnostic (bare-Entry vs BucketGroup)
+     * and rare, so it costs a lazy allocation on removal rather than complicating the hot bucket
+     * code.
      */
-    @Nullable
-    public static final Entry create(@Nonnull String tag, Object value) {
-      return isEmptyValue(value) ? null : TagMap.Entry.newAnyEntry(tag, value);
+    private Set<String> removedFromParent;
+
+    public TagMap() {
+        this((TagMap) null);
     }
 
-    /** If value is non-null, returns a new TagMap.Entry If value is null or empty, returns null */
-    @Nullable
-    public static final Entry create(@Nonnull String tag, CharSequence value) {
-      // NOTE: From the static typing, we know that value is not a primitive box
-      return isEmptyValue(value) ? null : TagMap.Entry.newObjectEntry(tag, value);
+    /**
+     * Fresh mutable map that reads through to {@code parent} (may be null). The parent is set here at
+     * construction and never re-pointed (only detached to null by {@link #clear()}), so read-through
+     * optimizations can treat it as fixed.
+     */
+    private TagMap(TagMap parent) {
+        // needs to be a power of 2 for bucket masking calculation to work as intended
+        this.buckets = new Object[1 << 4];
+        this.size = 0;
+        this.frozen = false;
+        this.parent = parent;
     }
 
-    public static final Entry create(@Nonnull String tag, boolean value) {
-      return TagMap.Entry.newBooleanEntry(tag, value);
+    /** Used for inexpensive immutable */
+    private TagMap(Object[] buckets, int size) {
+        this.buckets = buckets;
+        this.size = size;
+        this.frozen = true;
+        this.parent = null;
     }
 
-    public static final Entry create(@Nonnull String tag, int value) {
-      return TagMap.Entry.newIntEntry(tag, value);
+    @Override
+    public int size() {
+        // Exact (Map contract). Under read-through resolves the union; prefer estimateSize() for hints.
+        TagMap parent = this.parent;
+        return parent == null ? this.size : this.size + this.visibleParentCount();
     }
 
-    public static final Entry create(@Nonnull String tag, long value) {
-      return TagMap.Entry.newLongEntry(tag, value);
+    /**
+     * Exact count of ancestor entries not shadowed by a nearer level or tombstoned (the read-through
+     * addition). Walks the ancestor chain iteratively, nearest-level-wins.
+     */
+    private int visibleParentCount() {
+        int count = 0;
+        for (TagMap ancestor = this.parent; ancestor != null; ancestor = ancestor.parent) {
+            Object[] parentBuckets = ancestor.buckets;
+            for (int i = 0; i < parentBuckets.length; ++i) {
+                Object parentBucket = parentBuckets[i];
+                if (parentBucket instanceof Entry) {
+                    if (parentEntryVisible((Entry) parentBucket, ancestor)) count++;
+                } else if (parentBucket instanceof BucketGroup) {
+                    for (BucketGroup curGroup = (BucketGroup) parentBucket;
+                            curGroup != null;
+                            curGroup = curGroup.prev) {
+                        for (int j = 0; j < BucketGroup.LEN; ++j) {
+                            Entry parentEntry = curGroup._entryAt(j);
+                            if (parentEntry != null && parentEntryVisible(parentEntry, ancestor)) count++;
+                        }
+                    }
+                }
+            }
+        }
+        return count;
     }
 
-    public static final Entry create(@Nonnull String tag, float value) {
-      return TagMap.Entry.newFloatEntry(tag, value);
+    @Override
+    public boolean isEmpty() {
+        // Exact (Map contract). Under read-through resolves the parent; prefer isDefinitelyEmpty().
+        if (this.size != 0) {
+            return false;
+        }
+        TagMap parent = this.parent;
+        if (parent == null) {
+            return true;
+        }
+        if (this.removedFromParent == null) {
+            // A live parent is never definitely-empty: createFromParent drops an empty parent (and copy()
+            // only forwards an already-vetted parent), and the parent is frozen so it can't become empty.
+            // So with no local entries and no tombstones, the parent contributes at least one visible
+            // entry -> this map is non-empty.
+            return false;
+        }
+        // size == 0 with tombstones (rare): empty iff every visible ancestor entry is tombstoned
+        return this.visibleParentCount() == 0;
     }
 
-    public static final Entry create(@Nonnull String tag, double value) {
-      return TagMap.Entry.newDoubleEntry(tag, value);
+    public boolean isDefinitelyEmpty() {
+        // Cheap: empty iff no level in the chain holds a local entry (ignores shadowing/tombstones).
+        for (TagMap level = this; level != null; level = level.parent) {
+            if (level.size != 0) {
+                return false;
+            }
+        }
+        return true;
     }
 
-    static Entry newAnyEntry(Map.Entry<? extends String, ? extends Object> entry) {
-      return newAnyEntry(entry.getKey(), entry.getValue());
+    public int estimateSize() {
+        // Upper bound: sum of every level's local size, ignoring read-through shadowing/removals.
+        int total = 0;
+        for (TagMap level = this; level != null; level = level.parent) {
+            total += level.size;
+        }
+        return total;
     }
 
-    static Entry newAnyEntry(String tag, Object value) {
-      // DQH - To keep entry creation (e.g. map changes) as fast as possible,
-      // the entry construction is kept as simple as possible.
+    @Deprecated
+    @Override
+    public Object get(Object tag) {
+        if (!(tag instanceof String)) return null;
 
-      // Prior versions of this code did type detection on value to
-      // recognize box types but that proved expensive.  So now,
-      // the type is recorded as an ANY which is an indicator to do
-      // type detection later if need be.
-      return new Entry(tag, ANY, 0L, value);
+        return this.getObject((String) tag);
     }
 
-    static Entry newObjectEntry(String tag, Object value) {
-      return new Entry(tag, OBJECT, 0, value);
+    /** Provides the corresponding entry value as an Object - boxing if necessary */
+    public Object getObject(String tag) {
+        Entry entry = this.getEntry(tag);
+        return entry == null ? null : entry.objectValue();
     }
 
-    static Entry newBooleanEntry(String tag, boolean value) {
-      return new Entry(tag, BOOLEAN, boolean2Prim(value), Boolean.valueOf(value));
+    /** Provides the corresponding entry value as a String - calling toString if necessary */
+    public String getString(String tag) {
+        Entry entry = this.getEntry(tag);
+        return entry == null ? null : entry.stringValue();
     }
 
-    static Entry newBooleanEntry(String tag, Boolean box) {
-      return new Entry(tag, BOOLEAN, boolean2Prim(box.booleanValue()), box);
+    public boolean getBoolean(String tag) {
+        return this.getBooleanOrDefault(tag, false);
     }
 
-    static Entry newIntEntry(String tag, int value) {
-      return new Entry(tag, INT, int2Prim(value), null);
+    public boolean getBooleanOrDefault(String tag, boolean defaultValue) {
+        Entry entry = this.getEntry(tag);
+        return entry == null ? defaultValue : entry.booleanValue();
     }
 
-    static Entry newIntEntry(String tag, Integer box) {
-      return new Entry(tag, INT, int2Prim(box.intValue()), box);
+    public int getInt(String tag) {
+        return getIntOrDefault(tag, 0);
     }
 
-    static Entry newLongEntry(String tag, long value) {
-      return new Entry(tag, LONG, long2Prim(value), null);
+    public int getIntOrDefault(String tag, int defaultValue) {
+        Entry entry = this.getEntry(tag);
+        return entry == null ? defaultValue : entry.intValue();
     }
 
-    static Entry newLongEntry(String tag, Long box) {
-      return new Entry(tag, LONG, long2Prim(box.longValue()), box);
+    public long getLong(String tag) {
+        return this.getLongOrDefault(tag, 0L);
     }
 
-    static Entry newFloatEntry(String tag, float value) {
-      return new Entry(tag, FLOAT, float2Prim(value), null);
+    public long getLongOrDefault(String tag, long defaultValue) {
+        Entry entry = this.getEntry(tag);
+        return entry == null ? defaultValue : entry.longValue();
     }
 
-    static Entry newFloatEntry(String tag, Float box) {
-      return new Entry(tag, FLOAT, float2Prim(box.floatValue()), box);
+    public float getFloat(String tag) {
+        return this.getFloatOrDefault(tag, 0F);
     }
 
-    static Entry newDoubleEntry(String tag, double value) {
-      return new Entry(tag, DOUBLE, double2Prim(value), null);
+    public float getFloatOrDefault(String tag, float defaultValue) {
+        Entry entry = this.getEntry(tag);
+        return entry == null ? defaultValue : entry.floatValue();
     }
 
-    static Entry newDoubleEntry(String tag, Double box) {
-      return new Entry(tag, DOUBLE, double2Prim(box.doubleValue()), box);
+    public double getDouble(String tag) {
+        return this.getDoubleOrDefault(tag, 0D);
     }
 
-    /*
-     * hash is stored in line for fast handling of Entry-s coming from another TagMap
-     * However, hash is lazily computed using the same trick as {@link java.lang.String}.
-     */
-    int lazyTagHash;
-
-    // To optimize construction of Entry around boxed primitives and Object entries,
-    // no type checks are done during construction.
-    // Any Object entries are initially marked as type ANY, prim set to 0, and the Object put into
-    // obj
-    // If an ANY entry is later type checked or requested as a primitive, then the ANY will be
-    // resolved
-    // to the correct type.
-
-    // From the outside perspective, this object remains functionally immutable.
-    // However, internally, it is important to remember that this type must be thread safe.
-    // That includes multiple threads racing to resolve an ANY entry at the same time.
-
-    // Type and prim cannot use the same trick as hash because during ANY resolution the order of
-    // writes is important
-    volatile byte rawType;
-    volatile long rawPrim;
-    volatile Object rawObj;
-
-    volatile String strCache = null;
-
-    private Entry(String tag, byte type, long prim, Object obj) {
-      super(tag);
-      this.lazyTagHash = 0; // lazily computed
-
-      this.rawType = type;
-      this.rawPrim = prim;
-      this.rawObj = obj;
+    public double getDoubleOrDefault(String tag, double defaultValue) {
+        Entry entry = this.getEntry(tag);
+        return entry == null ? defaultValue : entry.doubleValue();
     }
 
-    int hash() {
-      // If value of hash read in this thread is zero, then hash is computed.
-      // hash is not held as a volatile, since this computation can safely be repeated as any time
-      int hash = this.lazyTagHash;
-      if (hash != 0) return hash;
+    @Override
+    public boolean containsKey(Object key) {
+        if (!(key instanceof String)) return false;
 
-      hash = _hash(this.tag);
-      this.lazyTagHash = hash;
-      return hash;
+        return (this.getEntry((String) key) != null);
     }
 
     @Override
-    public Entry entry() {
-      return this;
+    public boolean containsValue(Object value) {
+        // This could be optimized - but probably isn't called enough to be worth it
+        for (EntryReader entryReader : this) {
+            if (entryReader.objectValue().equals(value)) return true;
+        }
+        return false;
     }
 
     @Override
-    public java.util.Map.Entry<String, Object> mapEntry() {
-      return this;
+    public Set<String> keySet() {
+        return new Keys(this);
     }
 
-    @Override
-    public byte type() {
-      return this.resolveAny();
+    public Iterator<String> tagIterator() {
+        return new KeysIterator(this);
     }
 
     @Override
-    public boolean is(byte type) {
-      byte curType = this.rawType;
-      if (curType == type) {
-        return true;
-      } else if (curType != ANY) {
-        return false;
-      } else {
-        return (this.resolveAny() == type);
-      }
+    public Collection<Object> values() {
+        return new Values(this);
     }
 
-    @Override
-    public boolean isNumericPrimitive() {
-      byte curType = this.rawType;
-      if (_isNumericPrimitive(curType)) {
-        return true;
-      } else if (curType != ANY) {
-        return false;
-      } else {
-        return _isNumericPrimitive(this.resolveAny());
-      }
+    public Iterator<Object> valueIterator() {
+        return new ValuesIterator(this);
     }
 
     @Override
-    public boolean isNumber() {
-      byte curType = this.rawType;
-      return _isNumericPrimitive(curType) || (this.rawObj instanceof Number);
+    public Set<java.util.Map.Entry<String, Object>> entrySet() {
+        return new Entries(this);
     }
 
-    static boolean _isNumericPrimitive(byte type) {
-      return (type >= BYTE_RESERVED);
+    public Entry getEntry(String tag) {
+        Entry local = this.getLocalEntry(tag);
+        if (local != null) {
+            // Local entry shadows the parent (local-wins) — unchanged hot path.
+            return local;
+        }
+        // Read-through: miss locally, defer to the frozen parent. Single-parent in phase 1.
+        // The tombstone check lives only here, on the cold miss+parent path — the hot local hit above
+        // never touches it.
+        TagMap parent = this.parent;
+        if (parent == null) {
+            return null;
+        }
+        if (this.removedFromParent != null && this.removedFromParent.contains(tag)) {
+            return null; // tombstoned: removed locally, do not read through
+        }
+        return parent.getEntry(tag);
     }
 
-    private byte resolveAny() {
-      byte curType = this.rawType;
-      if (curType != ANY) return curType;
-
-      Object value = this.rawObj;
-      long prim;
-      byte resolvedType;
-
-      if (value instanceof Boolean) {
-        Boolean boolValue = (Boolean) value;
-        prim = boolean2Prim(boolValue);
-        resolvedType = BOOLEAN;
-      } else if (value instanceof Integer) {
-        Integer intValue = (Integer) value;
-        prim = int2Prim(intValue);
-        resolvedType = INT;
-      } else if (value instanceof Long) {
-        Long longValue = (Long) value;
-        prim = long2Prim(longValue);
-        resolvedType = LONG;
-      } else if (value instanceof Float) {
-        Float floatValue = (Float) value;
-        prim = float2Prim(floatValue);
-        resolvedType = FLOAT;
-      } else if (value instanceof Double) {
-        Double doubleValue = (Double) value;
-        prim = double2Prim(doubleValue);
-        resolvedType = DOUBLE;
-      } else {
-        prim = 0;
-        resolvedType = OBJECT;
-      }
-
-      this._setPrim(resolvedType, prim);
-
-      return resolvedType;
+    /** Looks up an entry in this map's own buckets only — no read-through to the parent. */
+    private Entry getLocalEntry(String tag) {
+        Object[] thisBuckets = this.buckets;
+        int hash = TagMap.Entry._hash(tag);
+        return findInBucket(thisBuckets[hash & (thisBuckets.length - 1)], hash, tag);
     }
 
-    private void _setPrim(byte type, long prim) {
-      // Order is important here, the contract is that prim must be set properly *before*
-      // type is set to a non-object type
+    /**
+     * Finds an entry by hash/tag within a single bucket object (Entry | BucketGroup chain | null).
+     */
+    private static Entry findInBucket(Object bucket, int hash, String tag) {
+        if (bucket instanceof Entry) {
+            Entry tagEntry = (Entry) bucket;
+            return tagEntry.matches(tag) ? tagEntry : null;
+        } else if (bucket instanceof BucketGroup) {
+            return ((BucketGroup) bucket).findInChain(hash, tag);
+        }
+        return null;
+    }
 
-      this.rawPrim = prim;
-      this.rawType = type;
+    /**
+     * Whether an entry that lives at ancestor level {@code fromAncestor} is visible through this
+     * leaf: not shadowed and not tombstoned by any nearer level (the leaf, or a closer ancestor).
+     * Nearest-level-wins. This mirrors what {@link #getEntry(String)}'s recursion applies as it
+     * descends -- each nearer level contributes both its own local entries (shadowing) and its own
+     * read-through removals (tombstones). A non-leaf level can carry tombstones too: a map may remove
+     * an inherited key and then itself be frozen and reused as a parent. Exploits universal hashing —
+     * by {@code _hash} the only local entry that could shadow {@code parentEntry} at a level is in
+     * that level's same-index bucket, so each nearer level is probed at one bucket using {@code
+     * parentEntry}'s cached hash (no re-hash, no full-map probe).
+     */
+    private boolean parentEntryVisible(Entry parentEntry, TagMap fromAncestor) {
+        int hash = parentEntry.hash();
+        String tag = parentEntry.tag;
+        for (TagMap nearer = this; nearer != fromAncestor; nearer = nearer.parent) {
+            // tombstoned by a nearer level (its own read-through removal hides the deeper entry)
+            if (nearer.removedFromParent != null && nearer.removedFromParent.contains(tag)) {
+                return false;
+            }
+            // shadowed by a nearer level's local entry
+            Object[] nearerBuckets = nearer.buckets;
+            Object nearerBucket = nearerBuckets[hash & (nearerBuckets.length - 1)];
+            if (findInBucket(nearerBucket, hash, tag) != null) {
+                return false;
+            }
+        }
+        return true;
     }
 
+    @Deprecated
     @Override
-    public boolean isObject() {
-      return this.is(OBJECT);
+    public Object put(@Nonnull String tag, Object value) {
+        TagMap.Entry entry = this.getAndSet(Entry.newAnyEntry(tag, value));
+        return entry == null ? null : entry.objectValue();
     }
 
-    public boolean isRemoval() {
-      return false;
+    /** A null reader (or a reader with no entry) is a no-op. */
+    public void set(@Nullable TagMap.EntryReader newEntryReader) {
+        if (newEntryReader == null) {
+            return;
+        }
+        Entry entry = newEntryReader.entry();
+        if (entry != null) {
+            this.putEntry(entry);
+        }
     }
 
-    @Override
-    public Object objectValue() {
-      if (this.rawObj != null) {
-        return this.rawObj;
-      }
-
-      // This code doesn't need to handle ANY-s.
-      // An entry that starts as an ANY will always have this.obj set
-      switch (this.rawType) {
-        case BOOLEAN:
-          this.rawObj = prim2Boolean(this.rawPrim);
-          break;
-
-        case INT:
-          // Maybe use a wider cache that handles response code???
-          this.rawObj = prim2Int(this.rawPrim);
-          break;
-
-        case LONG:
-          this.rawObj = prim2Long(this.rawPrim);
-          break;
-
-        case FLOAT:
-          this.rawObj = prim2Float(this.rawPrim);
-          break;
-
-        case DOUBLE:
-          this.rawObj = prim2Double(this.rawPrim);
-          break;
-
-        default:
-          // DQH - satisfy spot bugs
-          break;
-      }
-
-      return this.rawObj;
+    public void set(@Nonnull String tag, @Nonnull Object value) {
+        this.putEntry(Entry.newAnyEntry(tag, value));
     }
 
-    @Override
-    public boolean booleanValue() {
-      byte type = this.rawType;
-
-      if (type == BOOLEAN) {
-        return prim2Boolean(this.rawPrim);
-      } else if (type == ANY && this.rawObj instanceof Boolean) {
-        boolean boolValue = (Boolean) this.rawObj;
-        this._setPrim(BOOLEAN, boolean2Prim(boolValue));
-        return boolValue;
-      }
+    public void set(@Nonnull String tag, @Nonnull CharSequence value) {
+        this.putEntry(Entry.newObjectEntry(tag, value));
+    }
 
-      // resolution will set prim if necessary
-      byte resolvedType = this.resolveAny();
-      long prim = this.rawPrim;
+    public void set(@Nonnull String tag, boolean value) {
+        this.putEntry(Entry.newBooleanEntry(tag, value));
+    }
 
-      switch (resolvedType) {
-        case INT:
-          return prim2Int(prim) != 0;
+    public void set(@Nonnull String tag, int value) {
+        this.putEntry(Entry.newIntEntry(tag, value));
+    }
 
-        case LONG:
-          return prim2Long(prim) != 0L;
+    public void set(@Nonnull String tag, long value) {
+        this.putEntry(Entry.newLongEntry(tag, value));
+    }
 
-        case FLOAT:
-          return prim2Float(prim) != 0F;
+    public void set(@Nonnull String tag, float value) {
+        this.putEntry(Entry.newFloatEntry(tag, value));
+    }
 
-        case DOUBLE:
-          return prim2Double(prim) != 0D;
+    public void set(@Nonnull String tag, double value) {
+        this.putEntry(Entry.newDoubleEntry(tag, value));
+    }
 
-        case OBJECT:
-          return (this.rawObj != null);
-      }
+    /**
+     * Places an Entry directly into the map, avoiding a new Entry allocation. Null-tolerant: a null
+     * {@code newEntry} is a no-op returning null, so an Entry producer (e.g. {@link
+     * Entry#create(String, Object)} for a null/empty value) can emit "no tag" without the caller
+     * filtering. Contrast the strict {@link Nonnull} {@code set(String, value)} setters.
+     */
+    public Entry getAndSet(@Nullable Entry newEntry) {
+        if (newEntry == null) {
+            return null;
+        }
+        // Capture whether the key was tombstoned BEFORE putEntry clears it: a tombstoned key had no
+        // visible prior value (it was removed), so getAndSet must report null rather than the parent's.
+        boolean wasTombstoned = this.removedFromParent != null && this.removedFromParent.contains(newEntry.tag);
 
-      return false;
+        Entry priorLocal = this.putEntry(newEntry);
+        if (priorLocal != null) {
+            return priorLocal; // replaced a local entry -> that is the prior value
+        }
+        // No local entry was replaced. The prior visible value, if any, was the parent's -- unless the
+        // key was tombstoned (then it was not visible). set(...) skips this via putEntry (no prior).
+        if (wasTombstoned || this.parent == null) {
+            return null;
+        }
+        return this.parent.getEntry(newEntry.tag);
     }
 
-    @Override
-    public int intValue() {
-      byte type = this.rawType;
+    /**
+     * Inserts or replaces a local entry, returning the replaced local Entry (or null if none). Does
+     * NOT consult the read-through parent -- the {@code set(...)} methods use this so they never pay
+     * for a prior-value lookup they discard; {@link #getAndSet(Entry)} layers the parent fallback on
+     * top.
+     */
+    private Entry putEntry(@Nonnull Entry newEntry) {
+        this.checkWriteAccess();
 
-      if (type == INT) {
-        return prim2Int(this.rawPrim);
-      } else if (type == ANY && this.rawObj instanceof Integer) {
-        int intValue = (Integer) this.rawObj;
-        this._setPrim(INT, int2Prim(intValue));
-        return intValue;
-      }
+        // Re-setting a key clears any read-through tombstone for it (the new value overrides the
+        // removal). Gated on the lazy field, so this is a no-op for the common no-tombstone case.
+        if (this.removedFromParent != null) {
+            this.removedFromParent.remove(newEntry.tag);
+        }
 
-      // resolution will set prim if necessary
-      byte resolvedType = this.resolveAny();
-      long prim = this.rawPrim;
+        Object[] thisBuckets = this.buckets;
 
-      switch (resolvedType) {
-        case BOOLEAN:
-          return prim2Boolean(prim) ? 1 : 0;
+        int newHash = newEntry.hash();
+        int bucketIndex = newHash & (thisBuckets.length - 1);
 
-        case LONG:
-          return (int) prim2Long(prim);
+        Object bucket = thisBuckets[bucketIndex];
+        if (bucket == null) {
+            thisBuckets[bucketIndex] = newEntry;
 
-        case FLOAT:
-          return (int) prim2Float(prim);
+            this.size += 1;
+            return null;
+        } else if (bucket instanceof Entry) {
+            Entry existingEntry = (Entry) bucket;
+            if (existingEntry.matches(newEntry.tag)) {
+                thisBuckets[bucketIndex] = newEntry;
+
+                // replaced existing entry - no size change
+                return existingEntry;
+            } else {
+                thisBuckets[bucketIndex] = new BucketGroup(existingEntry.hash(), existingEntry, newHash, newEntry);
+
+                this.size += 1;
+                return null;
+            }
+        } else if (bucket instanceof BucketGroup) {
+            BucketGroup lastGroup = (BucketGroup) bucket;
 
-        case DOUBLE:
-          return (int) prim2Double(prim);
+            BucketGroup containingGroup = lastGroup.findContainingGroupInChain(newHash, newEntry.tag);
+            if (containingGroup != null) {
+                // replaced existing entry - no size change
+                return containingGroup._replace(newHash, newEntry);
+            }
 
-        case OBJECT:
-          return 0;
-      }
+            if (!lastGroup.insertInChain(newHash, newEntry)) {
+                thisBuckets[bucketIndex] = new BucketGroup(newHash, newEntry, lastGroup);
+            }
+            this.size += 1;
+            return null;
+        }
 
-      return 0;
+        // unreachable
+        return null;
     }
 
-    @Override
-    public long longValue() {
-      byte type = this.rawType;
+    public Entry getAndSet(@Nonnull String tag, Object value) {
+        return this.getAndSet(Entry.newAnyEntry(tag, value));
+    }
 
-      if (type == LONG) {
-        return prim2Long(this.rawPrim);
-      } else if (type == ANY && this.rawObj instanceof Long) {
-        long longValue = (Long) this.rawObj;
-        this._setPrim(LONG, long2Prim(longValue));
-        return longValue;
-      }
+    public Entry getAndSet(@Nonnull String tag, CharSequence value) {
+        return this.getAndSet(Entry.newObjectEntry(tag, value));
+    }
 
-      // resolution will set prim if necessary
-      byte resolvedType = this.resolveAny();
-      long prim = this.rawPrim;
+    public TagMap.Entry getAndSet(@Nonnull String tag, boolean value) {
+        return this.getAndSet(Entry.newBooleanEntry(tag, value));
+    }
 
-      switch (resolvedType) {
-        case BOOLEAN:
-          return prim2Boolean(prim) ? 1L : 0L;
+    public TagMap.Entry getAndSet(@Nonnull String tag, int value) {
+        return this.getAndSet(Entry.newIntEntry(tag, value));
+    }
 
-        case INT:
-          return prim2Int(prim);
+    public TagMap.Entry getAndSet(@Nonnull String tag, long value) {
+        return this.getAndSet(Entry.newLongEntry(tag, value));
+    }
 
-        case FLOAT:
-          return (long) prim2Float(prim);
+    public TagMap.Entry getAndSet(@Nonnull String tag, float value) {
+        return this.getAndSet(Entry.newFloatEntry(tag, value));
+    }
 
-        case DOUBLE:
-          return (long) prim2Double(prim);
+    public TagMap.Entry getAndSet(@Nonnull String tag, double value) {
+        return this.getAndSet(Entry.newDoubleEntry(tag, value));
+    }
 
-        case OBJECT:
-          return 0;
-      }
+    public void putAll(Map<? extends String, ? extends Object> map) {
+        this.checkWriteAccess();
 
-      return 0;
+        if (map instanceof TagMap) {
+            this.putAllOptimizedMap((TagMap) map);
+        } else {
+            this.putAllUnoptimizedMap(map);
+        }
     }
 
-    @Override
-    public float floatValue() {
-      byte type = this.rawType;
+    private void putAllUnoptimizedMap(Map<? extends String, ? extends Object> that) {
+        for (Map.Entry<? extends String, ?> entry : that.entrySet()) {
+            // use set which returns a prior Entry rather put which may box a prior primitive value
+            this.set(entry.getKey(), entry.getValue());
+        }
+    }
 
-      if (type == FLOAT) {
-        return prim2Float(this.rawPrim);
-      } else if (type == ANY && this.rawObj instanceof Float) {
-        float floatValue = (Float) this.rawObj;
-        this._setPrim(FLOAT, float2Prim(floatValue));
-        return floatValue;
-      }
+    /**
+     * Similar to {@link Map#putAll(Map)} but optimized to quickly copy from one TagMap to another
+     *
+     * <p>For optimized TagMaps, this method takes advantage of the consistent TagMap layout to
+     * quickly handle each bucket. And similar to {@link TagMap#getAndSet(Entry)} this method shares
+     * Entry objects from the source TagMap
+     */
+    public void putAll(TagMap that) {
+        this.checkWriteAccess();
 
-      // resolution will set prim if necessary
-      byte resolvedType = this.resolveAny();
-      long prim = this.rawPrim;
+        this.putAllOptimizedMap(that);
+    }
 
-      switch (resolvedType) {
-        case BOOLEAN:
-          return prim2Boolean(prim) ? 1F : 0F;
+    private void putAllOptimizedMap(TagMap that) {
+        if (that.parent != null) {
+            // read-through source: the bucket-copy paths below only see that's local entries, so they
+            // would drop entries visible only through that's ancestor chain (and ignore its tombstones).
+            // Union-copy the full visible set instead -- still shares the source Entry objects.
+            that.forEach(this, (self, entry) -> self.set(entry));
+            return;
+        }
+        if (this.size == 0) {
+            this.putAllIntoEmptyMap(that);
+        } else {
+            this.putAllMerge(that);
+        }
+    }
 
-        case INT:
-          return (float) prim2Int(prim);
+    private void putAllMerge(TagMap that) {
+        Object[] thisBuckets = this.buckets;
+        Object[] thatBuckets = that.buckets;
+
+        // Since TagMap-s don't support expansion, buckets are perfectly aligned
+        // Check against both thisBuckets.length && thatBuckets.length is to help the JIT do bound check
+        // elimination
+        for (int i = 0; i < thisBuckets.length && i < thatBuckets.length; ++i) {
+            Object thatBucket = thatBuckets[i];
+
+            // if nothing incoming, nothing to do
+            if (thatBucket == null) continue;
+
+            Object thisBucket = thisBuckets[i];
+            if (thisBucket == null) {
+                // This bucket is null, easy case
+                // Either copy over the sole entry or clone the BucketGroup chain
+
+                if (thatBucket instanceof Entry) {
+                    thisBuckets[i] = thatBucket;
+                    this.size += 1;
+                } else if (thatBucket instanceof BucketGroup) {
+                    BucketGroup thatGroup = (BucketGroup) thatBucket;
+
+                    BucketGroup thisNewGroup = thatGroup.cloneChain();
+                    thisBuckets[i] = thisNewGroup;
+                    this.size += thisNewGroup.sizeInChain();
+                }
+            } else if (thisBucket instanceof Entry) {
+                // This bucket is a single entry, medium complexity case
+                // If other side is an Entry - just merge the entries into a bucket
+                // If other side is a BucketGroup - then clone the group and insert the entry normally into
+                // the cloned group
+
+                Entry thisEntry = (Entry) thisBucket;
+                int thisHash = thisEntry.hash();
+
+                if (thatBucket instanceof Entry) {
+                    Entry thatEntry = (Entry) thatBucket;
+                    int thatHash = thatEntry.hash();
+
+                    if (thisHash == thatHash && thisEntry.matches(thatEntry.tag())) {
+                        thisBuckets[i] = thatEntry;
+                        // replacing entry, no size change
+                    } else {
+                        thisBuckets[i] = new BucketGroup(
+                                thisHash, thisEntry,
+                                thatHash, thatEntry);
+                        this.size += 1;
+                    }
+                } else if (thatBucket instanceof BucketGroup) {
+                    BucketGroup thatGroup = (BucketGroup) thatBucket;
+
+                    // Clone the other group, then place this entry into that group
+                    BucketGroup thisNewGroup = thatGroup.cloneChain();
+                    int thisNewGroupSize = thisNewGroup.sizeInChain();
+
+                    Entry incomingEntry = thisNewGroup.findInChain(thisHash, thisEntry.tag());
+                    if (incomingEntry != null) {
+                        // there's already an entry w/ the same tag from the incoming TagMap
+                        // incoming entry clobbers the existing try, so we're done
+                        thisBuckets[i] = thisNewGroup;
+
+                        // overlapping group - subtract one for clobbered existing entry
+                        this.size += thisNewGroupSize - 1;
+                    } else if (thisNewGroup.insertInChain(thisHash, thisEntry)) {
+                        // able to add thisEntry into the existing groups
+                        thisBuckets[i] = thisNewGroup;
+
+                        // non overlapping group - existing entry already accounted for in this.size
+                        this.size += thisNewGroupSize;
+                    } else {
+                        // unable to add into the existing groups
+                        thisBuckets[i] = new BucketGroup(thisHash, thisEntry, thisNewGroup);
+
+                        // non overlapping group - existing entry already accounted for in this.size
+                        this.size += thisNewGroupSize;
+                    }
+                }
+            } else if (thisBucket instanceof BucketGroup) {
+                // This bucket is a BucketGroup, medium to hard case
+                // If the other side is an entry, just normal insertion procedure - no cloning required
+                BucketGroup thisGroup = (BucketGroup) thisBucket;
+
+                if (thatBucket instanceof Entry) {
+                    Entry thatEntry = (Entry) thatBucket;
+                    int thatHash = thatEntry.hash();
+
+                    if (thisGroup.replaceInChain(thatHash, thatEntry) != null) {
+                        // replaced existing entry no size change
+                    } else if (thisGroup.insertInChain(thatHash, thatEntry)) {
+                        this.size += 1;
+                    } else {
+                        thisBuckets[i] = new BucketGroup(thatHash, thatEntry, thisGroup);
+                        this.size += 1;
+                    }
+                } else if (thatBucket instanceof BucketGroup) {
+                    // Most complicated case - need to walk that bucket group chain and update this chain
+                    BucketGroup thatGroup = (BucketGroup) thatBucket;
+
+                    // Taking the easy / expensive way out for updating size
+                    int thisPrevGroupSize = thisGroup.sizeInChain();
+
+                    BucketGroup thisNewGroup = thisGroup.replaceOrInsertAllInChain(thatGroup);
+                    int thisNewGroupSize = thisNewGroup.sizeInChain();
+
+                    thisBuckets[i] = thisNewGroup;
+                    this.size += (thisNewGroupSize - thisPrevGroupSize);
+                }
+            }
+        }
+    }
 
-        case LONG:
-          return (float) prim2Long(prim);
+    /*
+     * Specially optimized version of putAll for the common case of destination map being empty
+     */
+    private void putAllIntoEmptyMap(TagMap that) {
+        Object[] thisBuckets = this.buckets;
+        Object[] thatBuckets = that.buckets;
+
+        // Check against both thisBuckets.length && thatBuckets.length is to help the JIT do bound check
+        // elimination
+        for (int i = 0; i < thisBuckets.length && i < thatBuckets.length; ++i) {
+            Object thatBucket = thatBuckets[i];
+
+            // faster to explicitly null check first, then do instanceof
+            if (thatBucket == null) {
+                // do nothing
+            } else if (thatBucket instanceof BucketGroup) {
+                // if it is a BucketGroup, then need to clone
+                BucketGroup thatGroup = (BucketGroup) thatBucket;
+
+                thisBuckets[i] = thatGroup.cloneChain();
+            } else { // if ( thatBucket instanceof Entry )
+                thisBuckets[i] = thatBucket;
+            }
+        }
+        this.size = that.size;
+    }
 
-        case DOUBLE:
-          return (float) prim2Double(prim);
+    public void fillMap(Map<? super String, Object> map) {
+        if (this.parent != null) {
+            // read-through source: the bucket-only loop below sees just local entries, so it would drop
+            // tags visible only through the parent chain (and ignore shadowing/tombstones). Walk the full
+            // visible union instead -- mirrors putAllOptimizedMap.
+            this.forEach(map, (m, entry) -> m.put(entry.tag(), entry.objectValue()));
+            return;
+        }
 
-        case OBJECT:
-          return 0F;
-      }
+        Object[] thisBuckets = this.buckets;
 
-      return 0F;
-    }
+        for (int i = 0; i < thisBuckets.length; ++i) {
+            Object thisBucket = thisBuckets[i];
 
-    @Override
-    public double doubleValue() {
-      byte type = this.rawType;
+            if (thisBucket instanceof Entry) {
+                Entry thisEntry = (Entry) thisBucket;
 
-      if (type == DOUBLE) {
-        return prim2Double(this.rawPrim);
-      } else if (type == ANY && this.rawObj instanceof Double) {
-        double doubleValue = (Double) this.rawObj;
-        this._setPrim(DOUBLE, double2Prim(doubleValue));
-        return doubleValue;
-      }
+                map.put(thisEntry.tag, thisEntry.objectValue());
+            } else if (thisBucket instanceof BucketGroup) {
+                BucketGroup thisGroup = (BucketGroup) thisBucket;
 
-      // resolution will set prim if necessary
-      byte resolvedType = this.resolveAny();
-      long prim = this.rawPrim;
+                thisGroup.fillMapFromChain(map);
+            }
+        }
+    }
 
-      switch (resolvedType) {
-        case BOOLEAN:
-          return prim2Boolean(prim) ? 1D : 0D;
+    public void fillStringMap(Map<? super String, ? super String> stringMap) {
+        if (this.parent != null) {
+            // read-through source: walk the visible union so parent-only tags aren't dropped -- see
+            // fillMap.
+            this.forEach(stringMap, (m, entry) -> m.put(entry.tag(), entry.stringValue()));
+            return;
+        }
 
-        case INT:
-          return prim2Int(prim);
+        Object[] thisBuckets = this.buckets;
 
-        case LONG:
-          return (double) prim2Long(prim);
+        for (int i = 0; i < thisBuckets.length; ++i) {
+            Object thisBucket = thisBuckets[i];
 
-        case FLOAT:
-          return prim2Float(prim);
+            if (thisBucket instanceof Entry) {
+                Entry thisEntry = (Entry) thisBucket;
 
-        case OBJECT:
-          return 0D;
-      }
+                stringMap.put(thisEntry.tag, thisEntry.stringValue());
+            } else if (thisBucket instanceof BucketGroup) {
+                BucketGroup thisGroup = (BucketGroup) thisBucket;
 
-      return 0D;
+                thisGroup.fillStringMapFromChain(stringMap);
+            }
+        }
     }
 
     @Override
-    public String stringValue() {
-      String strCache = this.strCache;
-      if (strCache != null) {
-        return strCache;
-      }
-
-      String computeStr = this.computeStringValue();
-      this.strCache = computeStr;
-      return computeStr;
+    public Object remove(Object tag) {
+        if (!(tag instanceof String)) return null;
+
+        Entry entry = this.getAndRemove((String) tag);
+        return entry == null ? null : entry.objectValue();
+    }
+
+    public boolean remove(String tag) {
+        return (this.getAndRemove(tag) != null);
+    }
+
+    public Entry getAndRemove(String tag) {
+        this.checkWriteAccess();
+
+        Entry localRemoved = this.removeLocal(tag);
+
+        TagMap parent = this.parent;
+        if (parent != null) {
+            // Read-through: if the parent still exposes this key, removing it must also hide it from
+            // fall-through — install a tombstone. The prior *visible* value (Map.remove contract) is the
+            // local entry if there was one, otherwise the parent's (which we now hide). Single-parent in
+            // phase 1; rare path (only when removing a parent-exposed key).
+            boolean alreadyTombstoned = this.removedFromParent != null && this.removedFromParent.contains(tag);
+            if (!alreadyTombstoned) {
+                Entry parentEntry = parent.getEntry(tag);
+                if (parentEntry != null) {
+                    if (this.removedFromParent == null) {
+                        // Small initial capacity: this set is rare and almost always holds only a handful of
+                        // tombstoned keys, so the default 16-bucket HashSet table would be wasteful.
+                        this.removedFromParent = new HashSet<>(4);
+                    }
+                    this.removedFromParent.add(tag);
+                    return localRemoved != null ? localRemoved : parentEntry;
+                }
+            }
+        }
+        return localRemoved;
     }
 
-    private String computeStringValue() {
-      // Could do type resolution here,
-      // but decided to just fallback to this.obj.toString() for ANY case
-      switch (this.rawType) {
-        case BOOLEAN:
-          return Boolean.toString(prim2Boolean(this.rawPrim));
+    /** Removes an entry from this map's own buckets only — no parent/tombstone handling. */
+    private Entry removeLocal(String tag) {
+        Object[] thisBuckets = this.buckets;
 
-        case INT:
-          return Integer.toString(prim2Int(this.rawPrim));
+        int hash = TagMap.Entry._hash(tag);
+        int bucketIndex = hash & (thisBuckets.length - 1);
 
-        case LONG:
-          return Long.toString(prim2Long(this.rawPrim));
+        Object bucket = thisBuckets[bucketIndex];
+        // null bucket case - do nothing
+        if (bucket instanceof Entry) {
+            Entry existingEntry = (Entry) bucket;
+            if (existingEntry.matches(tag)) {
+                thisBuckets[bucketIndex] = null;
 
-        case FLOAT:
-          return Float.toString(prim2Float(this.rawPrim));
+                this.size -= 1;
+                return existingEntry;
+            } else {
+                return null;
+            }
+        } else if (bucket instanceof BucketGroup) {
+            BucketGroup lastGroup = (BucketGroup) bucket;
 
-        case DOUBLE:
-          return Double.toString(prim2Double(this.rawPrim));
+            BucketGroup containingGroup = lastGroup.findContainingGroupInChain(hash, tag);
+            if (containingGroup == null) {
+                return null;
+            }
 
-        case OBJECT:
-        case ANY:
-          return this.rawObj.toString();
-      }
+            Entry existingEntry = containingGroup._remove(hash, tag);
+            if (containingGroup._isEmpty()) {
+                this.buckets[bucketIndex] = lastGroup.removeGroupInChain(containingGroup);
+            }
 
-      return null;
+            this.size -= 1;
+            return existingEntry;
+        }
+        return null;
     }
 
-    @Override
-    public String toString() {
-      return this.tag() + '=' + this.stringValue();
+    public TagMap copy() {
+        // Construct with the same (frozen, shared) parent up front — the parent is fixed at
+        // construction. putAll then clones this map's own (local) buckets + size. The copy stays
+        // independently mutable (writes land on its local buckets, never the shared parent).
+        TagMap copy = new TagMap(this.parent);
+        copy.putAllIntoEmptyMap(this);
+        if (this.removedFromParent != null) {
+            copy.removedFromParent = new HashSet<>(this.removedFromParent);
+        }
+        return copy;
     }
 
-    /** Deprecated in favor of{@link Entry#tag()} */
-    @Deprecated
-    @Override
-    public String getKey() {
-      return this.tag();
+    public TagMap immutableCopy() {
+        if (this.frozen) {
+            return this;
+        } else {
+            return this.copy().freeze();
+        }
     }
 
-    /**
-     * Deprecated in favor of typed getters like...
-     *
-     * <ul>
-     *   <li>{@link Entry#objectValue()}
-     *   <li>{@link Entry#stringValue()}
-     *   <li>{@link Entry#booleanValue()}
-     *   <li>...
-     * </ul>
-     */
-    @Deprecated
     @Override
-    public Object getValue() {
-      return this.objectValue();
+    public Iterator<EntryReader> iterator() {
+        return new EntryReaderIterator(this);
     }
 
-    @Deprecated
-    @Override
-    public Object setValue(Object value) {
-      throw new UnsupportedOperationException();
+    public Stream<EntryReader> stream() {
+        return StreamSupport.stream(spliterator(), false);
     }
 
     @Override
-    public int hashCode() {
-      return this.hash();
-    }
+    public void forEach(Consumer<? super TagMap.EntryReader> consumer) {
+        Object[] thisBuckets = this.buckets;
 
-    @Override
-    public boolean equals(Object obj) {
-      if (!(obj instanceof TagMap.Entry)) return false;
+        for (int i = 0; i < thisBuckets.length; ++i) {
+            Object thisBucket = thisBuckets[i];
 
-      TagMap.Entry that = (TagMap.Entry) obj;
-      return this.tag.equals(that.tag) && this.objectValue().equals(that.objectValue());
-    }
+            if (thisBucket instanceof Entry) {
+                Entry thisEntry = (Entry) thisBucket;
 
-    private static long boolean2Prim(boolean value) {
-      return value ? 1L : 0L;
-    }
+                consumer.accept(thisEntry);
+            } else if (thisBucket instanceof BucketGroup) {
+                BucketGroup thisGroup = (BucketGroup) thisBucket;
 
-    private static boolean prim2Boolean(long prim) {
-      return (prim != 0L);
-    }
+                thisGroup.forEachInChain(consumer);
+            }
+        }
 
-    private static long int2Prim(int value) {
-      return value;
+        // read-through: parent entries not shadowed locally or tombstoned. Kept out of line so the
+        // common parent == null path stays byte-identical to before (small / inlinable).
+        if (this.parent != null) {
+            this.forEachParent(consumer);
+        }
     }
 
-    private static int prim2Int(long prim) {
-      return (int) prim;
+    private void forEachParent(Consumer<? super TagMap.EntryReader> consumer) {
+        // Walk the ancestor chain, nearest first. Each entry is emitted once, by the nearest level that
+        // defines its key, when not shadowed by a nearer level and not tombstoned.
+        for (TagMap ancestor = this.parent; ancestor != null; ancestor = ancestor.parent) {
+            Object[] parentBuckets = ancestor.buckets;
+            for (int i = 0; i < parentBuckets.length; ++i) {
+                Object parentBucket = parentBuckets[i];
+                if (parentBucket instanceof Entry) {
+                    Entry parentEntry = (Entry) parentBucket;
+                    if (parentEntryVisible(parentEntry, ancestor)) consumer.accept(parentEntry);
+                } else if (parentBucket instanceof BucketGroup) {
+                    for (BucketGroup curGroup = (BucketGroup) parentBucket;
+                            curGroup != null;
+                            curGroup = curGroup.prev) {
+                        for (int j = 0; j < BucketGroup.LEN; ++j) {
+                            Entry parentEntry = curGroup._entryAt(j);
+                            if (parentEntry != null && parentEntryVisible(parentEntry, ancestor))
+                                consumer.accept(parentEntry);
+                        }
+                    }
+                }
+            }
+        }
     }
 
-    private static long long2Prim(long value) {
-      return value;
-    }
+    public <T> void forEach(T thisObj, BiConsumer<T, ? super TagMap.EntryReader> consumer) {
+        Object[] thisBuckets = this.buckets;
 
-    private static long prim2Long(long prim) {
-      return prim;
-    }
+        for (int i = 0; i < thisBuckets.length; ++i) {
+            Object thisBucket = thisBuckets[i];
 
-    private static long float2Prim(float value) {
-      return Float.floatToIntBits(value);
-    }
+            if (thisBucket instanceof Entry) {
+                Entry thisEntry = (Entry) thisBucket;
 
-    private static float prim2Float(long prim) {
-      return Float.intBitsToFloat((int) prim);
-    }
+                consumer.accept(thisObj, thisEntry);
+            } else if (thisBucket instanceof BucketGroup) {
+                BucketGroup thisGroup = (BucketGroup) thisBucket;
 
-    private static long double2Prim(double value) {
-      return Double.doubleToRawLongBits(value);
-    }
+                thisGroup.forEachInChain(thisObj, consumer);
+            }
+        }
 
-    private static double prim2Double(long prim) {
-      return Double.longBitsToDouble(prim);
+        // read-through: parent entries not shadowed locally or tombstoned (kept out of line).
+        if (this.parent != null) {
+            this.forEachParent(thisObj, consumer);
+        }
     }
 
-    static int _hash(String tag) {
-      int hash = tag.hashCode();
-      return hash == 0 ? 0xDD06 : hash ^ (hash >>> 16);
+    private <T> void forEachParent(T thisObj, BiConsumer<T, ? super TagMap.EntryReader> consumer) {
+        for (TagMap ancestor = this.parent; ancestor != null; ancestor = ancestor.parent) {
+            Object[] parentBuckets = ancestor.buckets;
+            for (int i = 0; i < parentBuckets.length; ++i) {
+                Object parentBucket = parentBuckets[i];
+                if (parentBucket instanceof Entry) {
+                    Entry parentEntry = (Entry) parentBucket;
+                    if (parentEntryVisible(parentEntry, ancestor)) consumer.accept(thisObj, parentEntry);
+                } else if (parentBucket instanceof BucketGroup) {
+                    for (BucketGroup curGroup = (BucketGroup) parentBucket;
+                            curGroup != null;
+                            curGroup = curGroup.prev) {
+                        for (int j = 0; j < BucketGroup.LEN; ++j) {
+                            Entry parentEntry = curGroup._entryAt(j);
+                            if (parentEntry != null && parentEntryVisible(parentEntry, ancestor)) {
+                                consumer.accept(thisObj, parentEntry);
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
-  }
 
-  /*
-   * An in-order ledger of changes to be made to a TagMap.
-   * Ledger can also serves as a builder for TagMap-s via build & buildImmutable.
-   */
-  public static final class Ledger implements Iterable<EntryChange> {
-    EntryChange[] entryChanges;
-    int nextPos = 0;
-    boolean containsRemovals = false;
+    public <T, U> void forEach(T thisObj, U otherObj, TriConsumer<T, U, ? super TagMap.EntryReader> consumer) {
+        Object[] thisBuckets = this.buckets;
 
-    private Ledger() {
-      this(8);
-    }
+        for (int i = 0; i < thisBuckets.length; ++i) {
+            Object thisBucket = thisBuckets[i];
 
-    private Ledger(int size) {
-      this.entryChanges = new EntryChange[size];
-    }
+            if (thisBucket instanceof Entry) {
+                Entry thisEntry = (Entry) thisBucket;
 
-    public boolean isDefinitelyEmpty() {
-      return (this.nextPos == 0);
-    }
+                consumer.accept(thisObj, otherObj, thisEntry);
+            } else if (thisBucket instanceof BucketGroup) {
+                BucketGroup thisGroup = (BucketGroup) thisBucket;
 
-    /**
-     * Provides the estimated size of the map created by the ledger Doesn't account for overwritten
-     * entries or entry removal
-     *
-     * @return the estimated size of the map created by the ledger
-     */
-    public int estimateSize() {
-      return this.nextPos;
+                thisGroup.forEachInChain(thisObj, otherObj, consumer);
+            }
+        }
+
+        // read-through: parent entries not shadowed locally or tombstoned (kept out of line).
+        if (this.parent != null) {
+            this.forEachParent(thisObj, otherObj, consumer);
+        }
     }
 
-    public boolean containsRemovals() {
-      return this.containsRemovals;
+    private <T, U> void forEachParent(T thisObj, U otherObj, TriConsumer<T, U, ? super TagMap.EntryReader> consumer) {
+        for (TagMap ancestor = this.parent; ancestor != null; ancestor = ancestor.parent) {
+            Object[] parentBuckets = ancestor.buckets;
+            for (int i = 0; i < parentBuckets.length; ++i) {
+                Object parentBucket = parentBuckets[i];
+                if (parentBucket instanceof Entry) {
+                    Entry parentEntry = (Entry) parentBucket;
+                    if (parentEntryVisible(parentEntry, ancestor)) consumer.accept(thisObj, otherObj, parentEntry);
+                } else if (parentBucket instanceof BucketGroup) {
+                    for (BucketGroup curGroup = (BucketGroup) parentBucket;
+                            curGroup != null;
+                            curGroup = curGroup.prev) {
+                        for (int j = 0; j < BucketGroup.LEN; ++j) {
+                            Entry parentEntry = curGroup._entryAt(j);
+                            if (parentEntry != null && parentEntryVisible(parentEntry, ancestor)) {
+                                consumer.accept(thisObj, otherObj, parentEntry);
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 
-    public Ledger set(String tag, Object value) {
-      return this.recordEntry(Entry.newAnyEntry(tag, value));
-    }
+    public void clear() {
+        this.checkWriteAccess();
 
-    public Ledger set(String tag, CharSequence value) {
-      return this.recordEntry(Entry.newObjectEntry(tag, value));
+        Arrays.fill(this.buckets, null);
+        this.size = 0;
+        // clear() removes ALL mappings, including any inherited through read-through. Detaching the
+        // parent (rather than tombstoning every inherited key) is simpler and cheaper, and leaves an
+        // empty, parent-less map. Detach is one-way -- the parent is never re-pointed.
+        this.parent = null;
+        this.removedFromParent = null;
     }
 
-    public Ledger set(String tag, boolean value) {
-      return this.recordEntry(Entry.newBooleanEntry(tag, value));
-    }
+    public TagMap freeze() {
+        this.frozen = true;
 
-    public Ledger set(String tag, int value) {
-      return this.recordEntry(Entry.newIntEntry(tag, value));
+        return this;
     }
 
-    public Ledger set(String tag, long value) {
-      return this.recordEntry(Entry.newLongEntry(tag, value));
+    public boolean isFrozen() {
+        return this.frozen;
     }
 
-    public Ledger set(String tag, float value) {
-      return this.recordEntry(Entry.newFloatEntry(tag, value));
+    public void checkWriteAccess() {
+        if (this.frozen) throw new IllegalStateException("TagMap frozen");
     }
 
-    public Ledger set(String tag, double value) {
-      return this.recordEntry(Entry.newDoubleEntry(tag, value));
-    }
+    void checkIntegrity() {
+        // Decided to use if ( cond ) throw new IllegalStateException rather than assert
+        // That was done to avoid the extra static initialization needed for an assertion
+        // While that's probably an unnecessary optimization, this method is only called in tests
 
-    public Ledger set(Entry entry) {
-      return this.recordEntry(entry);
-    }
+        Object[] thisBuckets = this.buckets;
 
-    public Ledger remove(String tag) {
-      return this.recordRemoval(EntryChange.newRemoval(tag));
-    }
+        for (int i = 0; i < thisBuckets.length; ++i) {
+            Object thisBucket = thisBuckets[i];
 
-    private Ledger recordEntry(Entry entry) {
-      this.recordChange(entry);
-      return this;
-    }
+            if (thisBucket instanceof Entry) {
+                Entry thisEntry = (Entry) thisBucket;
+                int thisHash = thisEntry.hash();
 
-    private Ledger recordRemoval(EntryRemoval entry) {
-      this.recordChange(entry);
-      this.containsRemovals = true;
+                int expectedBucket = thisHash & (thisBuckets.length - 1);
+                if (expectedBucket != i) {
+                    throw new IllegalStateException("incorrect bucket");
+                }
+            } else if (thisBucket instanceof BucketGroup) {
+                BucketGroup thisGroup = (BucketGroup) thisBucket;
 
-      return this;
-    }
+                for (BucketGroup curGroup = thisGroup; curGroup != null; curGroup = curGroup.prev) {
+                    for (int j = 0; j < BucketGroup.LEN; ++j) {
+                        Entry thisEntry = curGroup._entryAt(i);
+                        if (thisEntry == null) continue;
+
+                        int thisHash = thisEntry.hash();
+                        assert curGroup._hashAt(i) == thisHash;
 
-    private void recordChange(EntryChange entryChange) {
-      if (this.nextPos >= this.entryChanges.length) {
-        this.entryChanges = Arrays.copyOf(this.entryChanges, this.entryChanges.length << 1);
-      }
+                        int expectedBucket = thisHash & (thisBuckets.length - 1);
+                        if (expectedBucket != i) {
+                            throw new IllegalStateException("incorrect bucket");
+                        }
+                    }
+                }
+            }
+        }
 
-      this.entryChanges[this.nextPos++] = entryChange;
+        if (this.size != this.computeSize()) {
+            throw new IllegalStateException("incorrect size");
+        }
+        // Local-structure invariant: the size counter's emptiness must match the local buckets. Uses
+        // the local (this.size == 0), NOT isEmpty(), which under read-through resolves the parent too.
+        if ((this.size == 0) != this.checkIfEmpty()) {
+            throw new IllegalStateException("incorrect empty status");
+        }
     }
 
-    public Ledger smartRemove(String tag) {
-      if (this.contains(tag)) {
-        this.remove(tag);
-      }
-      return this;
+    int computeSize() {
+        Object[] thisBuckets = this.buckets;
+
+        int size = 0;
+        for (int i = 0; i < thisBuckets.length; ++i) {
+            Object curBucket = thisBuckets[i];
+
+            if (curBucket instanceof Entry) {
+                size += 1;
+            } else if (curBucket instanceof BucketGroup) {
+                BucketGroup curGroup = (BucketGroup) curBucket;
+                size += curGroup.sizeInChain();
+            }
+        }
+        return size;
     }
 
-    private boolean contains(String tag) {
-      EntryChange[] thisChanges = this.entryChanges;
+    boolean checkIfEmpty() {
+        Object[] thisBuckets = this.buckets;
+
+        for (int i = 0; i < thisBuckets.length; ++i) {
+            Object curBucket = thisBuckets[i];
+
+            if (curBucket instanceof Entry) {
+                return false;
+            } else if (curBucket instanceof BucketGroup) {
+                BucketGroup curGroup = (BucketGroup) curBucket;
+                if (!curGroup.isEmptyChain()) return false;
+            }
+        }
 
-      // min is to clamp, so bounds check elimination optimization works
-      int lenClamp = Math.min(this.nextPos, thisChanges.length);
-      for (int i = 0; i < lenClamp; ++i) {
-        if (thisChanges[i].matches(tag)) return true;
-      }
-      return false;
+        return true;
     }
 
-    /*
-     * Just for testing
-     */
-    Entry findLastEntry(String tag) {
-      EntryChange[] thisChanges = this.entryChanges;
+    @Override
+    public Object compute(String key, BiFunction<? super String, ? super Object, ? extends Object> remappingFunction) {
+        this.checkWriteAccess();
 
-      // min is to clamp, so ArrayBoundsCheckElimination optimization works
-      int clampLen = Math.min(this.nextPos, thisChanges.length) - 1;
-      for (int i = clampLen; i >= 0; --i) {
-        EntryChange thisChange = thisChanges[i];
-        if (!thisChange.isRemoval() && thisChange.matches(tag)) return (Entry) thisChange;
-      }
-      return null;
+        return Map.super.compute(key, remappingFunction);
     }
 
-    public void reset() {
-      Arrays.fill(this.entryChanges, null);
-      this.nextPos = 0;
-      this.containsRemovals = false;
+    @Override
+    public Object computeIfAbsent(String key, Function<? super String, ? extends Object> mappingFunction) {
+        this.checkWriteAccess();
+
+        return Map.super.computeIfAbsent(key, mappingFunction);
     }
 
     @Override
-    public Iterator<EntryChange> iterator() {
-      return new IteratorImpl(this.entryChanges, this.nextPos);
+    public Object computeIfPresent(
+            String key, BiFunction<? super String, ? super Object, ? extends Object> remappingFunction) {
+        this.checkWriteAccess();
+
+        return Map.super.computeIfPresent(key, remappingFunction);
     }
 
-    public TagMap build() {
-      TagMap map = TagMap.create(this.estimateSize());
-      fill(map);
-      return map;
+    @Override
+    public String toString() {
+        return toPrettyString();
     }
 
-    void fill(TagMap map) {
-      EntryChange[] entryChanges = this.entryChanges;
-      int size = this.nextPos;
-      for (int i = 0; i < size && i < entryChanges.length; ++i) {
-        EntryChange change = entryChanges[i];
+    /**
+     * Standard toString implementation - output is similar to {@link java.util.HashMap#toString()}
+     */
+    String toPrettyString() {
+        boolean first = true;
+
+        StringBuilder ledger = new StringBuilder(128);
+        ledger.append('{');
+        for (EntryReader entry : this) {
+            if (first) {
+                first = false;
+            } else {
+                ledger.append(", ");
+            }
 
-        if (change.isRemoval()) {
-          map.remove(change.tag());
-        } else {
-          map.set((Entry) change);
+            ledger.append(entry.tag()).append('=').append(entry.stringValue());
         }
-      }
+        ledger.append('}');
+        return ledger.toString();
     }
 
-    public TagMap buildImmutable() {
-      if (this.nextPos == 0) {
-        return TagMap.EMPTY;
-      } else {
-        return this.build().freeze();
-      }
+    /**
+     * toString that more visibility into the internal structure of TagMap - primarily for deep
+     * debugging
+     */
+    String toInternalString() {
+        Object[] thisBuckets = this.buckets;
+
+        StringBuilder ledger = new StringBuilder(128);
+        for (int i = 0; i < thisBuckets.length; ++i) {
+            ledger.append('[').append(i).append("] = ");
+
+            Object thisBucket = thisBuckets[i];
+            if (thisBucket == null) {
+                ledger.append("null");
+            } else if (thisBucket instanceof Entry) {
+                ledger.append('{').append(thisBucket).append('}');
+            } else if (thisBucket instanceof BucketGroup) {
+                for (BucketGroup curGroup = (BucketGroup) thisBucket; curGroup != null; curGroup = curGroup.prev) {
+                    ledger.append(curGroup).append(" -> ");
+                }
+            }
+            ledger.append('\n');
+        }
+        return ledger.toString();
     }
 
-    static final class IteratorImpl implements Iterator<EntryChange> {
-      private final EntryChange[] entryChanges;
-      private final int size;
-
-      private int pos;
+    abstract static class IteratorBase {
+        private final TagMap map;
 
-      IteratorImpl(EntryChange[] entryChanges, int size) {
-        this.entryChanges = entryChanges;
-        this.size = size;
+        // the level whose buckets are currently being walked: the leaf (map) first, then each ancestor
+        // in turn (read-through union). map == level means we're on the leaf's own entries.
+        private TagMap level;
+        private Object[] buckets;
 
-        this.pos = -1;
-      }
-
-      @Override
-      public boolean hasNext() {
-        return (this.pos + 1 < this.size);
-      }
-
-      @Override
-      public EntryChange next() {
-        if (!this.hasNext()) throw new NoSuchElementException("no next");
-
-        return this.entryChanges[++this.pos];
-      }
-    }
-  }
-
-  /*
-   * For memory efficiency, TagMap uses a rather complicated bucket system.
-   * <p>
-   * When there is only a single Entry in a particular bucket, the Entry is stored into the bucket directly.
-   * <p>
-   * Because the Entry objects can be shared between multiple TagMaps, the Entry objects cannot
-   * directly form a linked list to handle collisions.
-   * <p>
-   * Instead when multiple entries collide in the same bucket, a BucketGroup is formed to hold multiple entries.
-   * But a BucketGroup is only formed when a collision occurs to keep allocation low in the common case of no collisions.
-   * <p>
-   * For efficiency, BucketGroups are a fixed size, so when a BucketGroup fills up another BucketGroup is formed
-   * to hold the additional Entry-s.  And the BucketGroup-s are connected via a linked list instead of the Entry-s.
-   * <p>
-   * This does introduce some inefficiencies when Entry-s are removed.
-   * The assumption is that removals are rare, so BucketGroups are never consolidated.
-   * However as a precaution if a BucketGroup becomes completely empty, then that BucketGroup will be
-   * removed from the collision chain.
-   */
-
-  private final Object[] buckets;
-  private int size;
-  private boolean frozen;
-
-  /**
-   * Optional frozen parent for read-through. When non-null, reads that miss the local buckets fall
-   * through to the parent chain, nearest-level-wins (a local entry shadows the parent's, a nearer
-   * ancestor shadows a farther one). Parents may themselves have parents, so this is a chain (e.g.
-   * baggage layered over trace tags). Must be frozen when attached, so it is safely shareable. Not
-   * final only so {@link #clear()} can detach it (to null); it is otherwise fixed at construction
-   * and never re-pointed. Package-visible so same-package tests can assert attach/detach directly.
-   */
-  @VisibleForTesting TagMap parent;
-
-  /**
-   * Parent keys removed locally (read-through tombstones). Lazily allocated on the first such
-   * removal; {@code null} both means "no tombstones" and serves as the gate that keeps the hot
-   * paths untouched. Only meaningful when {@link #parent} != null. A tombstone stops read-through
-   * fall-through for its key, so a key removed from a child no longer reads through to the parent.
-   * Kept off the bucket structure deliberately — it is shape-agnostic (bare-Entry vs BucketGroup)
-   * and rare, so it costs a lazy allocation on removal rather than complicating the hot bucket
-   * code.
-   */
-  private Set<String> removedFromParent;
-
-  public TagMap() {
-    this((TagMap) null);
-  }
-
-  /**
-   * Fresh mutable map that reads through to {@code parent} (may be null). The parent is set here at
-   * construction and never re-pointed (only detached to null by {@link #clear()}), so read-through
-   * optimizations can treat it as fixed.
-   */
-  private TagMap(TagMap parent) {
-    // needs to be a power of 2 for bucket masking calculation to work as intended
-    this.buckets = new Object[1 << 4];
-    this.size = 0;
-    this.frozen = false;
-    this.parent = parent;
-  }
-
-  /** Used for inexpensive immutable */
-  private TagMap(Object[] buckets, int size) {
-    this.buckets = buckets;
-    this.size = size;
-    this.frozen = true;
-    this.parent = null;
-  }
-
-  @Override
-  public int size() {
-    // Exact (Map contract). Under read-through resolves the union; prefer estimateSize() for hints.
-    TagMap parent = this.parent;
-    return parent == null ? this.size : this.size + this.visibleParentCount();
-  }
-
-  /**
-   * Exact count of ancestor entries not shadowed by a nearer level or tombstoned (the read-through
-   * addition). Walks the ancestor chain iteratively, nearest-level-wins.
-   */
-  private int visibleParentCount() {
-    int count = 0;
-    for (TagMap ancestor = this.parent; ancestor != null; ancestor = ancestor.parent) {
-      Object[] parentBuckets = ancestor.buckets;
-      for (int i = 0; i < parentBuckets.length; ++i) {
-        Object parentBucket = parentBuckets[i];
-        if (parentBucket instanceof Entry) {
-          if (parentEntryVisible((Entry) parentBucket, ancestor)) count++;
-        } else if (parentBucket instanceof BucketGroup) {
-          for (BucketGroup curGroup = (BucketGroup) parentBucket;
-              curGroup != null;
-              curGroup = curGroup.prev) {
-            for (int j = 0; j < BucketGroup.LEN; ++j) {
-              Entry parentEntry = curGroup._entryAt(j);
-              if (parentEntry != null && parentEntryVisible(parentEntry, ancestor)) count++;
-            }
-          }
-        }
-      }
-    }
-    return count;
-  }
-
-  @Override
-  public boolean isEmpty() {
-    // Exact (Map contract). Under read-through resolves the parent; prefer isDefinitelyEmpty().
-    if (this.size != 0) {
-      return false;
-    }
-    TagMap parent = this.parent;
-    if (parent == null) {
-      return true;
-    }
-    if (this.removedFromParent == null) {
-      // A live parent is never definitely-empty: createFromParent drops an empty parent (and copy()
-      // only forwards an already-vetted parent), and the parent is frozen so it can't become empty.
-      // So with no local entries and no tombstones, the parent contributes at least one visible
-      // entry -> this map is non-empty.
-      return false;
-    }
-    // size == 0 with tombstones (rare): empty iff every visible ancestor entry is tombstoned
-    return this.visibleParentCount() == 0;
-  }
-
-  public boolean isDefinitelyEmpty() {
-    // Cheap: empty iff no level in the chain holds a local entry (ignores shadowing/tombstones).
-    for (TagMap level = this; level != null; level = level.parent) {
-      if (level.size != 0) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  public int estimateSize() {
-    // Upper bound: sum of every level's local size, ignoring read-through shadowing/removals.
-    int total = 0;
-    for (TagMap level = this; level != null; level = level.parent) {
-      total += level.size;
-    }
-    return total;
-  }
-
-  @Deprecated
-  @Override
-  public Object get(Object tag) {
-    if (!(tag instanceof String)) return null;
-
-    return this.getObject((String) tag);
-  }
-
-  /** Provides the corresponding entry value as an Object - boxing if necessary */
-  public Object getObject(String tag) {
-    Entry entry = this.getEntry(tag);
-    return entry == null ? null : entry.objectValue();
-  }
-
-  /** Provides the corresponding entry value as a String - calling toString if necessary */
-  public String getString(String tag) {
-    Entry entry = this.getEntry(tag);
-    return entry == null ? null : entry.stringValue();
-  }
-
-  public boolean getBoolean(String tag) {
-    return this.getBooleanOrDefault(tag, false);
-  }
-
-  public boolean getBooleanOrDefault(String tag, boolean defaultValue) {
-    Entry entry = this.getEntry(tag);
-    return entry == null ? defaultValue : entry.booleanValue();
-  }
-
-  public int getInt(String tag) {
-    return getIntOrDefault(tag, 0);
-  }
-
-  public int getIntOrDefault(String tag, int defaultValue) {
-    Entry entry = this.getEntry(tag);
-    return entry == null ? defaultValue : entry.intValue();
-  }
-
-  public long getLong(String tag) {
-    return this.getLongOrDefault(tag, 0L);
-  }
-
-  public long getLongOrDefault(String tag, long defaultValue) {
-    Entry entry = this.getEntry(tag);
-    return entry == null ? defaultValue : entry.longValue();
-  }
-
-  public float getFloat(String tag) {
-    return this.getFloatOrDefault(tag, 0F);
-  }
-
-  public float getFloatOrDefault(String tag, float defaultValue) {
-    Entry entry = this.getEntry(tag);
-    return entry == null ? defaultValue : entry.floatValue();
-  }
-
-  public double getDouble(String tag) {
-    return this.getDoubleOrDefault(tag, 0D);
-  }
-
-  public double getDoubleOrDefault(String tag, double defaultValue) {
-    Entry entry = this.getEntry(tag);
-    return entry == null ? defaultValue : entry.doubleValue();
-  }
-
-  @Override
-  public boolean containsKey(Object key) {
-    if (!(key instanceof String)) return false;
-
-    return (this.getEntry((String) key) != null);
-  }
-
-  @Override
-  public boolean containsValue(Object value) {
-    // This could be optimized - but probably isn't called enough to be worth it
-    for (EntryReader entryReader : this) {
-      if (entryReader.objectValue().equals(value)) return true;
-    }
-    return false;
-  }
-
-  @Override
-  public Set<String> keySet() {
-    return new Keys(this);
-  }
-
-  public Iterator<String> tagIterator() {
-    return new KeysIterator(this);
-  }
-
-  @Override
-  public Collection<Object> values() {
-    return new Values(this);
-  }
-
-  public Iterator<Object> valueIterator() {
-    return new ValuesIterator(this);
-  }
-
-  @Override
-  public Set<java.util.Map.Entry<String, Object>> entrySet() {
-    return new Entries(this);
-  }
-
-  public Entry getEntry(String tag) {
-    Entry local = this.getLocalEntry(tag);
-    if (local != null) {
-      // Local entry shadows the parent (local-wins) — unchanged hot path.
-      return local;
-    }
-    // Read-through: miss locally, defer to the frozen parent. Single-parent in phase 1.
-    // The tombstone check lives only here, on the cold miss+parent path — the hot local hit above
-    // never touches it.
-    TagMap parent = this.parent;
-    if (parent == null) {
-      return null;
-    }
-    if (this.removedFromParent != null && this.removedFromParent.contains(tag)) {
-      return null; // tombstoned: removed locally, do not read through
-    }
-    return parent.getEntry(tag);
-  }
-
-  /** Looks up an entry in this map's own buckets only — no read-through to the parent. */
-  private Entry getLocalEntry(String tag) {
-    Object[] thisBuckets = this.buckets;
-    int hash = TagMap.Entry._hash(tag);
-    return findInBucket(thisBuckets[hash & (thisBuckets.length - 1)], hash, tag);
-  }
-
-  /**
-   * Finds an entry by hash/tag within a single bucket object (Entry | BucketGroup chain | null).
-   */
-  private static Entry findInBucket(Object bucket, int hash, String tag) {
-    if (bucket instanceof Entry) {
-      Entry tagEntry = (Entry) bucket;
-      return tagEntry.matches(tag) ? tagEntry : null;
-    } else if (bucket instanceof BucketGroup) {
-      return ((BucketGroup) bucket).findInChain(hash, tag);
-    }
-    return null;
-  }
-
-  /**
-   * Whether an entry that lives at ancestor level {@code fromAncestor} is visible through this
-   * leaf: not shadowed and not tombstoned by any nearer level (the leaf, or a closer ancestor).
-   * Nearest-level-wins. This mirrors what {@link #getEntry(String)}'s recursion applies as it
-   * descends -- each nearer level contributes both its own local entries (shadowing) and its own
-   * read-through removals (tombstones). A non-leaf level can carry tombstones too: a map may remove
-   * an inherited key and then itself be frozen and reused as a parent. Exploits universal hashing —
-   * by {@code _hash} the only local entry that could shadow {@code parentEntry} at a level is in
-   * that level's same-index bucket, so each nearer level is probed at one bucket using {@code
-   * parentEntry}'s cached hash (no re-hash, no full-map probe).
-   */
-  private boolean parentEntryVisible(Entry parentEntry, TagMap fromAncestor) {
-    int hash = parentEntry.hash();
-    String tag = parentEntry.tag;
-    for (TagMap nearer = this; nearer != fromAncestor; nearer = nearer.parent) {
-      // tombstoned by a nearer level (its own read-through removal hides the deeper entry)
-      if (nearer.removedFromParent != null && nearer.removedFromParent.contains(tag)) {
-        return false;
-      }
-      // shadowed by a nearer level's local entry
-      Object[] nearerBuckets = nearer.buckets;
-      Object nearerBucket = nearerBuckets[hash & (nearerBuckets.length - 1)];
-      if (findInBucket(nearerBucket, hash, tag) != null) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  @Deprecated
-  @Override
-  public Object put(@Nonnull String tag, Object value) {
-    TagMap.Entry entry = this.getAndSet(Entry.newAnyEntry(tag, value));
-    return entry == null ? null : entry.objectValue();
-  }
-
-  /** A null reader (or a reader with no entry) is a no-op. */
-  public void set(@Nullable TagMap.EntryReader newEntryReader) {
-    if (newEntryReader == null) {
-      return;
-    }
-    Entry entry = newEntryReader.entry();
-    if (entry != null) {
-      this.putEntry(entry);
-    }
-  }
-
-  public void set(@Nonnull String tag, @Nonnull Object value) {
-    this.putEntry(Entry.newAnyEntry(tag, value));
-  }
-
-  public void set(@Nonnull String tag, @Nonnull CharSequence value) {
-    this.putEntry(Entry.newObjectEntry(tag, value));
-  }
-
-  public void set(@Nonnull String tag, boolean value) {
-    this.putEntry(Entry.newBooleanEntry(tag, value));
-  }
-
-  public void set(@Nonnull String tag, int value) {
-    this.putEntry(Entry.newIntEntry(tag, value));
-  }
-
-  public void set(@Nonnull String tag, long value) {
-    this.putEntry(Entry.newLongEntry(tag, value));
-  }
-
-  public void set(@Nonnull String tag, float value) {
-    this.putEntry(Entry.newFloatEntry(tag, value));
-  }
-
-  public void set(@Nonnull String tag, double value) {
-    this.putEntry(Entry.newDoubleEntry(tag, value));
-  }
-
-  /**
-   * Places an Entry directly into the map, avoiding a new Entry allocation. Null-tolerant: a null
-   * {@code newEntry} is a no-op returning null, so an Entry producer (e.g. {@link
-   * Entry#create(String, Object)} for a null/empty value) can emit "no tag" without the caller
-   * filtering. Contrast the strict {@link Nonnull} {@code set(String, value)} setters.
-   */
-  public Entry getAndSet(@Nullable Entry newEntry) {
-    if (newEntry == null) {
-      return null;
-    }
-    // Capture whether the key was tombstoned BEFORE putEntry clears it: a tombstoned key had no
-    // visible prior value (it was removed), so getAndSet must report null rather than the parent's.
-    boolean wasTombstoned =
-        this.removedFromParent != null && this.removedFromParent.contains(newEntry.tag);
-
-    Entry priorLocal = this.putEntry(newEntry);
-    if (priorLocal != null) {
-      return priorLocal; // replaced a local entry -> that is the prior value
-    }
-    // No local entry was replaced. The prior visible value, if any, was the parent's -- unless the
-    // key was tombstoned (then it was not visible). set(...) skips this via putEntry (no prior).
-    if (wasTombstoned || this.parent == null) {
-      return null;
-    }
-    return this.parent.getEntry(newEntry.tag);
-  }
-
-  /**
-   * Inserts or replaces a local entry, returning the replaced local Entry (or null if none). Does
-   * NOT consult the read-through parent -- the {@code set(...)} methods use this so they never pay
-   * for a prior-value lookup they discard; {@link #getAndSet(Entry)} layers the parent fallback on
-   * top.
-   */
-  private Entry putEntry(@Nonnull Entry newEntry) {
-    this.checkWriteAccess();
-
-    // Re-setting a key clears any read-through tombstone for it (the new value overrides the
-    // removal). Gated on the lazy field, so this is a no-op for the common no-tombstone case.
-    if (this.removedFromParent != null) {
-      this.removedFromParent.remove(newEntry.tag);
-    }
-
-    Object[] thisBuckets = this.buckets;
-
-    int newHash = newEntry.hash();
-    int bucketIndex = newHash & (thisBuckets.length - 1);
-
-    Object bucket = thisBuckets[bucketIndex];
-    if (bucket == null) {
-      thisBuckets[bucketIndex] = newEntry;
-
-      this.size += 1;
-      return null;
-    } else if (bucket instanceof Entry) {
-      Entry existingEntry = (Entry) bucket;
-      if (existingEntry.matches(newEntry.tag)) {
-        thisBuckets[bucketIndex] = newEntry;
-
-        // replaced existing entry - no size change
-        return existingEntry;
-      } else {
-        thisBuckets[bucketIndex] =
-            new BucketGroup(existingEntry.hash(), existingEntry, newHash, newEntry);
-
-        this.size += 1;
-        return null;
-      }
-    } else if (bucket instanceof BucketGroup) {
-      BucketGroup lastGroup = (BucketGroup) bucket;
-
-      BucketGroup containingGroup = lastGroup.findContainingGroupInChain(newHash, newEntry.tag);
-      if (containingGroup != null) {
-        // replaced existing entry - no size change
-        return containingGroup._replace(newHash, newEntry);
-      }
-
-      if (!lastGroup.insertInChain(newHash, newEntry)) {
-        thisBuckets[bucketIndex] = new BucketGroup(newHash, newEntry, lastGroup);
-      }
-      this.size += 1;
-      return null;
-    }
-
-    // unreachable
-    return null;
-  }
-
-  public Entry getAndSet(@Nonnull String tag, Object value) {
-    return this.getAndSet(Entry.newAnyEntry(tag, value));
-  }
-
-  public Entry getAndSet(@Nonnull String tag, CharSequence value) {
-    return this.getAndSet(Entry.newObjectEntry(tag, value));
-  }
-
-  public TagMap.Entry getAndSet(@Nonnull String tag, boolean value) {
-    return this.getAndSet(Entry.newBooleanEntry(tag, value));
-  }
-
-  public TagMap.Entry getAndSet(@Nonnull String tag, int value) {
-    return this.getAndSet(Entry.newIntEntry(tag, value));
-  }
-
-  public TagMap.Entry getAndSet(@Nonnull String tag, long value) {
-    return this.getAndSet(Entry.newLongEntry(tag, value));
-  }
-
-  public TagMap.Entry getAndSet(@Nonnull String tag, float value) {
-    return this.getAndSet(Entry.newFloatEntry(tag, value));
-  }
-
-  public TagMap.Entry getAndSet(@Nonnull String tag, double value) {
-    return this.getAndSet(Entry.newDoubleEntry(tag, value));
-  }
-
-  public void putAll(Map<? extends String, ? extends Object> map) {
-    this.checkWriteAccess();
-
-    if (map instanceof TagMap) {
-      this.putAllOptimizedMap((TagMap) map);
-    } else {
-      this.putAllUnoptimizedMap(map);
-    }
-  }
-
-  private void putAllUnoptimizedMap(Map<? extends String, ? extends Object> that) {
-    for (Map.Entry<? extends String, ?> entry : that.entrySet()) {
-      // use set which returns a prior Entry rather put which may box a prior primitive value
-      this.set(entry.getKey(), entry.getValue());
-    }
-  }
-
-  /**
-   * Similar to {@link Map#putAll(Map)} but optimized to quickly copy from one TagMap to another
-   *
-   * <p>For optimized TagMaps, this method takes advantage of the consistent TagMap layout to
-   * quickly handle each bucket. And similar to {@link TagMap#getAndSet(Entry)} this method shares
-   * Entry objects from the source TagMap
-   */
-  public void putAll(TagMap that) {
-    this.checkWriteAccess();
-
-    this.putAllOptimizedMap(that);
-  }
-
-  private void putAllOptimizedMap(TagMap that) {
-    if (that.parent != null) {
-      // read-through source: the bucket-copy paths below only see that's local entries, so they
-      // would drop entries visible only through that's ancestor chain (and ignore its tombstones).
-      // Union-copy the full visible set instead -- still shares the source Entry objects.
-      that.forEach(this, (self, entry) -> self.set(entry));
-      return;
-    }
-    if (this.size == 0) {
-      this.putAllIntoEmptyMap(that);
-    } else {
-      this.putAllMerge(that);
-    }
-  }
-
-  private void putAllMerge(TagMap that) {
-    Object[] thisBuckets = this.buckets;
-    Object[] thatBuckets = that.buckets;
-
-    // Since TagMap-s don't support expansion, buckets are perfectly aligned
-    // Check against both thisBuckets.length && thatBuckets.length is to help the JIT do bound check
-    // elimination
-    for (int i = 0; i < thisBuckets.length && i < thatBuckets.length; ++i) {
-      Object thatBucket = thatBuckets[i];
-
-      // if nothing incoming, nothing to do
-      if (thatBucket == null) continue;
-
-      Object thisBucket = thisBuckets[i];
-      if (thisBucket == null) {
-        // This bucket is null, easy case
-        // Either copy over the sole entry or clone the BucketGroup chain
-
-        if (thatBucket instanceof Entry) {
-          thisBuckets[i] = thatBucket;
-          this.size += 1;
-        } else if (thatBucket instanceof BucketGroup) {
-          BucketGroup thatGroup = (BucketGroup) thatBucket;
-
-          BucketGroup thisNewGroup = thatGroup.cloneChain();
-          thisBuckets[i] = thisNewGroup;
-          this.size += thisNewGroup.sizeInChain();
-        }
-      } else if (thisBucket instanceof Entry) {
-        // This bucket is a single entry, medium complexity case
-        // If other side is an Entry - just merge the entries into a bucket
-        // If other side is a BucketGroup - then clone the group and insert the entry normally into
-        // the cloned group
-
-        Entry thisEntry = (Entry) thisBucket;
-        int thisHash = thisEntry.hash();
-
-        if (thatBucket instanceof Entry) {
-          Entry thatEntry = (Entry) thatBucket;
-          int thatHash = thatEntry.hash();
-
-          if (thisHash == thatHash && thisEntry.matches(thatEntry.tag())) {
-            thisBuckets[i] = thatEntry;
-            // replacing entry, no size change
-          } else {
-            thisBuckets[i] =
-                new BucketGroup(
-                    thisHash, thisEntry,
-                    thatHash, thatEntry);
-            this.size += 1;
-          }
-        } else if (thatBucket instanceof BucketGroup) {
-          BucketGroup thatGroup = (BucketGroup) thatBucket;
-
-          // Clone the other group, then place this entry into that group
-          BucketGroup thisNewGroup = thatGroup.cloneChain();
-          int thisNewGroupSize = thisNewGroup.sizeInChain();
-
-          Entry incomingEntry = thisNewGroup.findInChain(thisHash, thisEntry.tag());
-          if (incomingEntry != null) {
-            // there's already an entry w/ the same tag from the incoming TagMap
-            // incoming entry clobbers the existing try, so we're done
-            thisBuckets[i] = thisNewGroup;
-
-            // overlapping group - subtract one for clobbered existing entry
-            this.size += thisNewGroupSize - 1;
-          } else if (thisNewGroup.insertInChain(thisHash, thisEntry)) {
-            // able to add thisEntry into the existing groups
-            thisBuckets[i] = thisNewGroup;
-
-            // non overlapping group - existing entry already accounted for in this.size
-            this.size += thisNewGroupSize;
-          } else {
-            // unable to add into the existing groups
-            thisBuckets[i] = new BucketGroup(thisHash, thisEntry, thisNewGroup);
-
-            // non overlapping group - existing entry already accounted for in this.size
-            this.size += thisNewGroupSize;
-          }
-        }
-      } else if (thisBucket instanceof BucketGroup) {
-        // This bucket is a BucketGroup, medium to hard case
-        // If the other side is an entry, just normal insertion procedure - no cloning required
-        BucketGroup thisGroup = (BucketGroup) thisBucket;
-
-        if (thatBucket instanceof Entry) {
-          Entry thatEntry = (Entry) thatBucket;
-          int thatHash = thatEntry.hash();
-
-          if (thisGroup.replaceInChain(thatHash, thatEntry) != null) {
-            // replaced existing entry no size change
-          } else if (thisGroup.insertInChain(thatHash, thatEntry)) {
-            this.size += 1;
-          } else {
-            thisBuckets[i] = new BucketGroup(thatHash, thatEntry, thisGroup);
-            this.size += 1;
-          }
-        } else if (thatBucket instanceof BucketGroup) {
-          // Most complicated case - need to walk that bucket group chain and update this chain
-          BucketGroup thatGroup = (BucketGroup) thatBucket;
+        private Entry nextEntry;
 
-          // Taking the easy / expensive way out for updating size
-          int thisPrevGroupSize = thisGroup.sizeInChain();
+        private int bucketIndex = -1;
 
-          BucketGroup thisNewGroup = thisGroup.replaceOrInsertAllInChain(thatGroup);
-          int thisNewGroupSize = thisNewGroup.sizeInChain();
+        private BucketGroup group = null;
+        private int groupIndex = 0;
 
-          thisBuckets[i] = thisNewGroup;
-          this.size += (thisNewGroupSize - thisPrevGroupSize);
+        IteratorBase(TagMap map) {
+            this.map = map;
+            this.level = map;
+            this.buckets = map.buckets;
         }
-      }
-    }
-  }
-
-  /*
-   * Specially optimized version of putAll for the common case of destination map being empty
-   */
-  private void putAllIntoEmptyMap(TagMap that) {
-    Object[] thisBuckets = this.buckets;
-    Object[] thatBuckets = that.buckets;
 
-    // Check against both thisBuckets.length && thatBuckets.length is to help the JIT do bound check
-    // elimination
-    for (int i = 0; i < thisBuckets.length && i < thatBuckets.length; ++i) {
-      Object thatBucket = thatBuckets[i];
+        public final boolean hasNext() {
+            if (this.nextEntry != null) return true;
 
-      // faster to explicitly null check first, then do instanceof
-      if (thatBucket == null) {
-        // do nothing
-      } else if (thatBucket instanceof BucketGroup) {
-        // if it is a BucketGroup, then need to clone
-        BucketGroup thatGroup = (BucketGroup) thatBucket;
-
-        thisBuckets[i] = thatGroup.cloneChain();
-      } else { // if ( thatBucket instanceof Entry )
-        thisBuckets[i] = thatBucket;
-      }
-    }
-    this.size = that.size;
-  }
+            this.nextEntry = this.advance();
+            return this.nextEntry != null;
+        }
 
-  public void fillMap(Map<? super String, Object> map) {
-    if (this.parent != null) {
-      // read-through source: the bucket-only loop below sees just local entries, so it would drop
-      // tags visible only through the parent chain (and ignore shadowing/tombstones). Walk the full
-      // visible union instead -- mirrors putAllOptimizedMap.
-      this.forEach(map, (m, entry) -> m.put(entry.tag(), entry.objectValue()));
-      return;
-    }
+        final Entry nextEntryOrThrowNoSuchElement() {
+            if (this.nextEntry != null) {
+                Entry nextEntry = this.nextEntry;
+                this.nextEntry = null;
+                return nextEntry;
+            }
 
-    Object[] thisBuckets = this.buckets;
+            if (this.hasNext()) {
+                return this.nextEntry;
+            } else {
+                throw new NoSuchElementException();
+            }
+        }
 
-    for (int i = 0; i < thisBuckets.length; ++i) {
-      Object thisBucket = thisBuckets[i];
+        final Entry nextEntryOrNull() {
+            if (this.nextEntry != null) {
+                Entry nextEntry = this.nextEntry;
+                this.nextEntry = null;
+                return nextEntry;
+            }
 
-      if (thisBucket instanceof Entry) {
-        Entry thisEntry = (Entry) thisBucket;
+            return this.hasNext() ? this.nextEntry : null;
+        }
 
-        map.put(thisEntry.tag, thisEntry.objectValue());
-      } else if (thisBucket instanceof BucketGroup) {
-        BucketGroup thisGroup = (BucketGroup) thisBucket;
+        private final Entry advance() {
+            while (true) {
+                Entry tagEntry = this.rawAdvance();
+                if (tagEntry != null) {
+                    // leaf entries emit as-is; ancestor entries only if visible from the leaf -- not shadowed
+                    // by a nearer level and not tombstoned. (parentEntryVisible walks the nearer levels.)
+                    if (this.level == this.map || this.map.parentEntryVisible(tagEntry, this.level)) {
+                        return tagEntry;
+                    }
+                    continue; // ancestor entry shadowed/tombstoned -> skip
+                }
+
+                // current level exhausted; advance to the next ancestor's buckets (read-through union)
+                if (this.level.parent != null) {
+                    this.level = this.level.parent;
+                    this.buckets = this.level.buckets;
+                    this.bucketIndex = -1;
+                    this.group = null;
+                    this.groupIndex = 0;
+                    continue;
+                }
+                return null;
+            }
+        }
 
-        thisGroup.fillMapFromChain(map);
-      }
-    }
-  }
+        /** Next raw entry in the current bucket array, ignoring shadowing/tombstones. */
+        private final Entry rawAdvance() {
+            while (this.bucketIndex < this.buckets.length) {
+                if (this.group != null) {
+                    for (++this.groupIndex; this.groupIndex < BucketGroup.LEN; ++this.groupIndex) {
+                        Entry tagEntry = this.group._entryAt(this.groupIndex);
+                        if (tagEntry != null) return tagEntry;
+                    }
+
+                    // done processing - that group, go to next group
+                    this.group = this.group.prev;
+                    this.groupIndex = -1;
+                }
+
+                // if the group is null, then we've finished the current bucket - so advance the bucket
+                if (this.group == null) {
+                    for (++this.bucketIndex; this.bucketIndex < this.buckets.length; ++this.bucketIndex) {
+                        Object bucket = this.buckets[this.bucketIndex];
+
+                        if (bucket instanceof Entry) {
+                            return (Entry) bucket;
+                        } else if (bucket instanceof BucketGroup) {
+                            this.group = (BucketGroup) bucket;
+                            this.groupIndex = -1;
+
+                            break;
+                        }
+                    }
+                }
+            }
 
-  public void fillStringMap(Map<? super String, ? super String> stringMap) {
-    if (this.parent != null) {
-      // read-through source: walk the visible union so parent-only tags aren't dropped -- see
-      // fillMap.
-      this.forEach(stringMap, (m, entry) -> m.put(entry.tag(), entry.stringValue()));
-      return;
+            return null;
+        }
     }
 
-    Object[] thisBuckets = this.buckets;
-
-    for (int i = 0; i < thisBuckets.length; ++i) {
-      Object thisBucket = thisBuckets[i];
-
-      if (thisBucket instanceof Entry) {
-        Entry thisEntry = (Entry) thisBucket;
-
-        stringMap.put(thisEntry.tag, thisEntry.stringValue());
-      } else if (thisBucket instanceof BucketGroup) {
-        BucketGroup thisGroup = (BucketGroup) thisBucket;
+    static final class EntryReaderIterator extends IteratorBase implements Iterator<EntryReader> {
+        EntryReaderIterator(TagMap map) {
+            super(map);
+        }
 
-        thisGroup.fillStringMapFromChain(stringMap);
-      }
+        @Override
+        public EntryReader next() {
+            return this.nextEntryOrThrowNoSuchElement();
+        }
     }
-  }
 
-  @Override
-  public Object remove(Object tag) {
-    if (!(tag instanceof String)) return null;
+    /**
+     * BucketGroup is a compromise for performance over a linked list or array
+     *
+     * <ul>
+     *   <li>linked list - would prevent TagEntry-s from being immutable and would limit sharing
+     *       opportunities
+     *   <li>arrays - wouldn't be able to store hashes close together
+     *   <li>parallel arrays (one for hashes & another for entries) would require more allocation
+     * </ul>
+     */
+    static final class BucketGroup {
+        static final int LEN = 4;
+
+        /*
+         * To make search operations on BucketGroups fast, the hashes for each entry are held inside
+         * the BucketGroup.  This avoids pointer chasing to inspect each Entry object.
+         * <p>
+         * As a further optimization, the hashes are deliberately placed next to each other.
+         * The intention is that the hashes will all end up in the same cache line, so loading
+         * one hash effectively loads the others for free.
+         * <p>
+         * A hash of zero indicates an available slot, the hashes passed to BucketGroup must be "adjusted"
+         * hashes which can never be zero.  The zero handling is done by TagMap#_hash.
+         */
+        int hash0 = 0;
+        int hash1 = 0;
+        int hash2 = 0;
+        int hash3 = 0;
+
+        Entry entry0 = null;
+        Entry entry1 = null;
+        Entry entry2 = null;
+        Entry entry3 = null;
+
+        BucketGroup prev = null;
+
+        BucketGroup() {}
+
+        /** New group with an entry pointing to existing BucketGroup */
+        BucketGroup(int hash0, Entry entry0, BucketGroup prev) {
+            this.hash0 = hash0;
+            this.entry0 = entry0;
+
+            this.prev = prev;
+        }
+
+        /** New group composed of two entries */
+        BucketGroup(int hash0, Entry entry0, int hash1, Entry entry1) {
+            this.hash0 = hash0;
+            this.entry0 = entry0;
 
-    Entry entry = this.getAndRemove((String) tag);
-    return entry == null ? null : entry.objectValue();
-  }
+            this.hash1 = hash1;
+            this.entry1 = entry1;
+        }
 
-  public boolean remove(String tag) {
-    return (this.getAndRemove(tag) != null);
-  }
+        /** New group composed of 4 entries - used for cloning */
+        BucketGroup(
+                int hash0, Entry entry0, int hash1, Entry entry1, int hash2, Entry entry2, int hash3, Entry entry3) {
+            this.hash0 = hash0;
+            this.entry0 = entry0;
 
-  public Entry getAndRemove(String tag) {
-    this.checkWriteAccess();
+            this.hash1 = hash1;
+            this.entry1 = entry1;
 
-    Entry localRemoved = this.removeLocal(tag);
+            this.hash2 = hash2;
+            this.entry2 = entry2;
 
-    TagMap parent = this.parent;
-    if (parent != null) {
-      // Read-through: if the parent still exposes this key, removing it must also hide it from
-      // fall-through — install a tombstone. The prior *visible* value (Map.remove contract) is the
-      // local entry if there was one, otherwise the parent's (which we now hide). Single-parent in
-      // phase 1; rare path (only when removing a parent-exposed key).
-      boolean alreadyTombstoned =
-          this.removedFromParent != null && this.removedFromParent.contains(tag);
-      if (!alreadyTombstoned) {
-        Entry parentEntry = parent.getEntry(tag);
-        if (parentEntry != null) {
-          if (this.removedFromParent == null) {
-            // Small initial capacity: this set is rare and almost always holds only a handful of
-            // tombstoned keys, so the default 16-bucket HashSet table would be wasteful.
-            this.removedFromParent = new HashSet<>(4);
-          }
-          this.removedFromParent.add(tag);
-          return localRemoved != null ? localRemoved : parentEntry;
+            this.hash3 = hash3;
+            this.entry3 = entry3;
         }
-      }
-    }
-    return localRemoved;
-  }
 
-  /** Removes an entry from this map's own buckets only — no parent/tombstone handling. */
-  private Entry removeLocal(String tag) {
-    Object[] thisBuckets = this.buckets;
+        Entry _entryAt(int index) {
+            switch (index) {
+                case 0:
+                    return this.entry0;
 
-    int hash = TagMap.Entry._hash(tag);
-    int bucketIndex = hash & (thisBuckets.length - 1);
+                case 1:
+                    return this.entry1;
 
-    Object bucket = thisBuckets[bucketIndex];
-    // null bucket case - do nothing
-    if (bucket instanceof Entry) {
-      Entry existingEntry = (Entry) bucket;
-      if (existingEntry.matches(tag)) {
-        thisBuckets[bucketIndex] = null;
+                case 2:
+                    return this.entry2;
 
-        this.size -= 1;
-        return existingEntry;
-      } else {
-        return null;
-      }
-    } else if (bucket instanceof BucketGroup) {
-      BucketGroup lastGroup = (BucketGroup) bucket;
+                case 3:
+                    return this.entry3;
 
-      BucketGroup containingGroup = lastGroup.findContainingGroupInChain(hash, tag);
-      if (containingGroup == null) {
-        return null;
-      }
+                // Do not use default case, that creates a 5% cost on entry handling
+            }
 
-      Entry existingEntry = containingGroup._remove(hash, tag);
-      if (containingGroup._isEmpty()) {
-        this.buckets[bucketIndex] = lastGroup.removeGroupInChain(containingGroup);
-      }
+            return null;
+        }
 
-      this.size -= 1;
-      return existingEntry;
-    }
-    return null;
-  }
+        int _hashAt(int index) {
+            switch (index) {
+                case 0:
+                    return this.hash0;
 
-  public TagMap copy() {
-    // Construct with the same (frozen, shared) parent up front — the parent is fixed at
-    // construction. putAll then clones this map's own (local) buckets + size. The copy stays
-    // independently mutable (writes land on its local buckets, never the shared parent).
-    TagMap copy = new TagMap(this.parent);
-    copy.putAllIntoEmptyMap(this);
-    if (this.removedFromParent != null) {
-      copy.removedFromParent = new HashSet<>(this.removedFromParent);
-    }
-    return copy;
-  }
-
-  public TagMap immutableCopy() {
-    if (this.frozen) {
-      return this;
-    } else {
-      return this.copy().freeze();
-    }
-  }
-
-  @Override
-  public Iterator<EntryReader> iterator() {
-    return new EntryReaderIterator(this);
-  }
-
-  public Stream<EntryReader> stream() {
-    return StreamSupport.stream(spliterator(), false);
-  }
-
-  @Override
-  public void forEach(Consumer<? super TagMap.EntryReader> consumer) {
-    Object[] thisBuckets = this.buckets;
+                case 1:
+                    return this.hash1;
 
-    for (int i = 0; i < thisBuckets.length; ++i) {
-      Object thisBucket = thisBuckets[i];
+                case 2:
+                    return this.hash2;
 
-      if (thisBucket instanceof Entry) {
-        Entry thisEntry = (Entry) thisBucket;
-
-        consumer.accept(thisEntry);
-      } else if (thisBucket instanceof BucketGroup) {
-        BucketGroup thisGroup = (BucketGroup) thisBucket;
+                case 3:
+                    return this.hash3;
 
-        thisGroup.forEachInChain(consumer);
-      }
-    }
+                // Do not use default case, that creates a 5% cost on entry handling
+            }
 
-    // read-through: parent entries not shadowed locally or tombstoned. Kept out of line so the
-    // common parent == null path stays byte-identical to before (small / inlinable).
-    if (this.parent != null) {
-      this.forEachParent(consumer);
-    }
-  }
+            return 0;
+        }
 
-  private void forEachParent(Consumer<? super TagMap.EntryReader> consumer) {
-    // Walk the ancestor chain, nearest first. Each entry is emitted once, by the nearest level that
-    // defines its key, when not shadowed by a nearer level and not tombstoned.
-    for (TagMap ancestor = this.parent; ancestor != null; ancestor = ancestor.parent) {
-      Object[] parentBuckets = ancestor.buckets;
-      for (int i = 0; i < parentBuckets.length; ++i) {
-        Object parentBucket = parentBuckets[i];
-        if (parentBucket instanceof Entry) {
-          Entry parentEntry = (Entry) parentBucket;
-          if (parentEntryVisible(parentEntry, ancestor)) consumer.accept(parentEntry);
-        } else if (parentBucket instanceof BucketGroup) {
-          for (BucketGroup curGroup = (BucketGroup) parentBucket;
-              curGroup != null;
-              curGroup = curGroup.prev) {
-            for (int j = 0; j < BucketGroup.LEN; ++j) {
-              Entry parentEntry = curGroup._entryAt(j);
-              if (parentEntry != null && parentEntryVisible(parentEntry, ancestor))
-                consumer.accept(parentEntry);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  public <T> void forEach(T thisObj, BiConsumer<T, ? super TagMap.EntryReader> consumer) {
-    Object[] thisBuckets = this.buckets;
-
-    for (int i = 0; i < thisBuckets.length; ++i) {
-      Object thisBucket = thisBuckets[i];
-
-      if (thisBucket instanceof Entry) {
-        Entry thisEntry = (Entry) thisBucket;
-
-        consumer.accept(thisObj, thisEntry);
-      } else if (thisBucket instanceof BucketGroup) {
-        BucketGroup thisGroup = (BucketGroup) thisBucket;
-
-        thisGroup.forEachInChain(thisObj, consumer);
-      }
-    }
-
-    // read-through: parent entries not shadowed locally or tombstoned (kept out of line).
-    if (this.parent != null) {
-      this.forEachParent(thisObj, consumer);
-    }
-  }
-
-  private <T> void forEachParent(T thisObj, BiConsumer<T, ? super TagMap.EntryReader> consumer) {
-    for (TagMap ancestor = this.parent; ancestor != null; ancestor = ancestor.parent) {
-      Object[] parentBuckets = ancestor.buckets;
-      for (int i = 0; i < parentBuckets.length; ++i) {
-        Object parentBucket = parentBuckets[i];
-        if (parentBucket instanceof Entry) {
-          Entry parentEntry = (Entry) parentBucket;
-          if (parentEntryVisible(parentEntry, ancestor)) consumer.accept(thisObj, parentEntry);
-        } else if (parentBucket instanceof BucketGroup) {
-          for (BucketGroup curGroup = (BucketGroup) parentBucket;
-              curGroup != null;
-              curGroup = curGroup.prev) {
-            for (int j = 0; j < BucketGroup.LEN; ++j) {
-              Entry parentEntry = curGroup._entryAt(j);
-              if (parentEntry != null && parentEntryVisible(parentEntry, ancestor)) {
-                consumer.accept(thisObj, parentEntry);
-              }
+        int sizeInChain() {
+            int size = 0;
+            for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
+                size += curGroup._size();
             }
-          }
-        }
-      }
-    }
-  }
-
-  public <T, U> void forEach(
-      T thisObj, U otherObj, TriConsumer<T, U, ? super TagMap.EntryReader> consumer) {
-    Object[] thisBuckets = this.buckets;
-
-    for (int i = 0; i < thisBuckets.length; ++i) {
-      Object thisBucket = thisBuckets[i];
+            return size;
+        }
 
-      if (thisBucket instanceof Entry) {
-        Entry thisEntry = (Entry) thisBucket;
+        int _size() {
+            return (this.hash0 == 0 ? 0 : 1)
+                    + (this.hash1 == 0 ? 0 : 1)
+                    + (this.hash2 == 0 ? 0 : 1)
+                    + (this.hash3 == 0 ? 0 : 1);
+        }
 
-        consumer.accept(thisObj, otherObj, thisEntry);
-      } else if (thisBucket instanceof BucketGroup) {
-        BucketGroup thisGroup = (BucketGroup) thisBucket;
+        boolean isEmptyChain() {
+            for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
+                if (!curGroup._isEmpty()) return false;
+            }
+            return true;
+        }
 
-        thisGroup.forEachInChain(thisObj, otherObj, consumer);
-      }
-    }
+        boolean _isEmpty() {
+            return (this.hash0 | this.hash1 | this.hash2 | this.hash3) == 0;
+        }
 
-    // read-through: parent entries not shadowed locally or tombstoned (kept out of line).
-    if (this.parent != null) {
-      this.forEachParent(thisObj, otherObj, consumer);
-    }
-  }
+        BucketGroup findContainingGroupInChain(int hash, String tag) {
+            for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
+                if (curGroup._find(hash, tag) != null) return curGroup;
+            }
+            return null;
+        }
 
-  private <T, U> void forEachParent(
-      T thisObj, U otherObj, TriConsumer<T, U, ? super TagMap.EntryReader> consumer) {
-    for (TagMap ancestor = this.parent; ancestor != null; ancestor = ancestor.parent) {
-      Object[] parentBuckets = ancestor.buckets;
-      for (int i = 0; i < parentBuckets.length; ++i) {
-        Object parentBucket = parentBuckets[i];
-        if (parentBucket instanceof Entry) {
-          Entry parentEntry = (Entry) parentBucket;
-          if (parentEntryVisible(parentEntry, ancestor))
-            consumer.accept(thisObj, otherObj, parentEntry);
-        } else if (parentBucket instanceof BucketGroup) {
-          for (BucketGroup curGroup = (BucketGroup) parentBucket;
-              curGroup != null;
-              curGroup = curGroup.prev) {
-            for (int j = 0; j < BucketGroup.LEN; ++j) {
-              Entry parentEntry = curGroup._entryAt(j);
-              if (parentEntry != null && parentEntryVisible(parentEntry, ancestor)) {
-                consumer.accept(thisObj, otherObj, parentEntry);
-              }
+        Entry findInChain(int hash, String tag) {
+            for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
+                Entry curEntry = curGroup._find(hash, tag);
+                if (curEntry != null) return curEntry;
             }
-          }
+            return null;
+        }
+
+        Entry _find(int hash, String tag) {
+            // if ( this._mayContain(hash) ) return null;
+
+            if (this.hash0 == hash && this.entry0.matches(tag)) {
+                return this.entry0;
+            } else if (this.hash1 == hash && this.entry1.matches(tag)) {
+                return this.entry1;
+            } else if (this.hash2 == hash && this.entry2.matches(tag)) {
+                return this.entry2;
+            } else if (this.hash3 == hash && this.entry3.matches(tag)) {
+                return this.entry3;
+            }
+            return null;
         }
-      }
-    }
-  }
 
-  public void clear() {
-    this.checkWriteAccess();
+        BucketGroup replaceOrInsertAllInChain(BucketGroup thatHeadGroup) {
+            BucketGroup thisOrigHeadGroup = this;
+            BucketGroup thisNewestHeadGroup = thisOrigHeadGroup;
+
+            for (BucketGroup thatCurGroup = thatHeadGroup; thatCurGroup != null; thatCurGroup = thatCurGroup.prev) {
+                // First phase - tries to replace or insert each entry in the existing bucket chain
+                // Only need to search the original groups for replacements
+                // The whole chain is eligible for insertions
+                boolean handled0 = (thatCurGroup.hash0 == 0)
+                        || (thisOrigHeadGroup.replaceInChain(thatCurGroup.hash0, thatCurGroup.entry0) != null)
+                        || thisNewestHeadGroup.insertInChain(thatCurGroup.hash0, thatCurGroup.entry0);
+
+                boolean handled1 = (thatCurGroup.hash1 == 0)
+                        || (thisOrigHeadGroup.replaceInChain(thatCurGroup.hash1, thatCurGroup.entry1) != null)
+                        || thisNewestHeadGroup.insertInChain(thatCurGroup.hash1, thatCurGroup.entry1);
+
+                boolean handled2 = (thatCurGroup.hash2 == 0)
+                        || (thisOrigHeadGroup.replaceInChain(thatCurGroup.hash2, thatCurGroup.entry2) != null)
+                        || thisNewestHeadGroup.insertInChain(thatCurGroup.hash2, thatCurGroup.entry2);
+
+                boolean handled3 = (thatCurGroup.hash3 == 0)
+                        || (thisOrigHeadGroup.replaceInChain(thatCurGroup.hash3, thatCurGroup.entry3) != null)
+                        || thisNewestHeadGroup.insertInChain(thatCurGroup.hash3, thatCurGroup.entry3);
+
+                // Second phase - takes any entries that weren't handled by phase 1 and puts them
+                // into a new BucketGroup.  Since BucketGroups are fixed size, we know that the
+                // left over entries from one BucketGroup will fit in the new BucketGroup.
+                if (!handled0 || !handled1 || !handled2 || !handled3) {
+                    // Rather than calling insert one time per entry
+                    // Exploiting the fact that the new group is known to be empty
+                    // And that BucketGroups are allowed to have holes in them (to allow for removal),
+                    // so each unhandled entry from the source group is simply placed in
+                    // the same slot in the new group
+                    BucketGroup thisNewHashGroup = new BucketGroup();
+                    if (!handled0) {
+                        thisNewHashGroup.hash0 = thatCurGroup.hash0;
+                        thisNewHashGroup.entry0 = thatCurGroup.entry0;
+                    }
+                    if (!handled1) {
+                        thisNewHashGroup.hash1 = thatCurGroup.hash1;
+                        thisNewHashGroup.entry1 = thatCurGroup.entry1;
+                    }
+                    if (!handled2) {
+                        thisNewHashGroup.hash2 = thatCurGroup.hash2;
+                        thisNewHashGroup.entry2 = thatCurGroup.entry2;
+                    }
+                    if (!handled3) {
+                        thisNewHashGroup.hash3 = thatCurGroup.hash3;
+                        thisNewHashGroup.entry3 = thatCurGroup.entry3;
+                    }
+                    thisNewHashGroup.prev = thisNewestHeadGroup;
+
+                    thisNewestHeadGroup = thisNewHashGroup;
+                }
+            }
 
-    Arrays.fill(this.buckets, null);
-    this.size = 0;
-    // clear() removes ALL mappings, including any inherited through read-through. Detaching the
-    // parent (rather than tombstoning every inherited key) is simpler and cheaper, and leaves an
-    // empty, parent-less map. Detach is one-way -- the parent is never re-pointed.
-    this.parent = null;
-    this.removedFromParent = null;
-  }
+            return thisNewestHeadGroup;
+        }
 
-  public TagMap freeze() {
-    this.frozen = true;
+        Entry replaceInChain(int hash, Entry entry) {
+            for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
+                Entry prevEntry = curGroup._replace(hash, entry);
+                if (prevEntry != null) return prevEntry;
+            }
+            return null;
+        }
 
-    return this;
-  }
+        Entry _replace(int hash, Entry entry) {
+            // if ( this._mayContain(hash) ) return null;
+
+            // first check to see if the item is already present
+            Entry prevEntry = null;
+            if (this.hash0 == hash && this.entry0.matches(entry.tag)) {
+                prevEntry = this.entry0;
+                this.entry0 = entry;
+            } else if (this.hash1 == hash && this.entry1.matches(entry.tag)) {
+                prevEntry = this.entry1;
+                this.entry1 = entry;
+            } else if (this.hash2 == hash && this.entry2.matches(entry.tag)) {
+                prevEntry = this.entry2;
+                this.entry2 = entry;
+            } else if (this.hash3 == hash && this.entry3.matches(entry.tag)) {
+                prevEntry = this.entry3;
+                this.entry3 = entry;
+            }
 
-  public boolean isFrozen() {
-    return this.frozen;
-  }
+            return prevEntry;
+        }
 
-  public void checkWriteAccess() {
-    if (this.frozen) throw new IllegalStateException("TagMap frozen");
-  }
+        boolean insertInChain(int hash, Entry entry) {
+            for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
+                if (curGroup._insert(hash, entry)) return true;
+            }
+            return false;
+        }
 
-  void checkIntegrity() {
-    // Decided to use if ( cond ) throw new IllegalStateException rather than assert
-    // That was done to avoid the extra static initialization needed for an assertion
-    // While that's probably an unnecessary optimization, this method is only called in tests
+        boolean _insert(int hash, Entry entry) {
+            boolean inserted = false;
+            if (this.hash0 == 0) {
+                this.hash0 = hash;
+                this.entry0 = entry;
 
-    Object[] thisBuckets = this.buckets;
+                inserted = true;
+            } else if (this.hash1 == 0) {
+                this.hash1 = hash;
+                this.entry1 = entry;
 
-    for (int i = 0; i < thisBuckets.length; ++i) {
-      Object thisBucket = thisBuckets[i];
+                inserted = true;
+            } else if (this.hash2 == 0) {
+                this.hash2 = hash;
+                this.entry2 = entry;
 
-      if (thisBucket instanceof Entry) {
-        Entry thisEntry = (Entry) thisBucket;
-        int thisHash = thisEntry.hash();
+                inserted = true;
+            } else if (this.hash3 == 0) {
+                this.hash3 = hash;
+                this.entry3 = entry;
 
-        int expectedBucket = thisHash & (thisBuckets.length - 1);
-        if (expectedBucket != i) {
-          throw new IllegalStateException("incorrect bucket");
+                inserted = true;
+            }
+            return inserted;
         }
-      } else if (thisBucket instanceof BucketGroup) {
-        BucketGroup thisGroup = (BucketGroup) thisBucket;
-
-        for (BucketGroup curGroup = thisGroup; curGroup != null; curGroup = curGroup.prev) {
-          for (int j = 0; j < BucketGroup.LEN; ++j) {
-            Entry thisEntry = curGroup._entryAt(i);
-            if (thisEntry == null) continue;
 
-            int thisHash = thisEntry.hash();
-            assert curGroup._hashAt(i) == thisHash;
+        BucketGroup removeGroupInChain(BucketGroup removeGroup) {
+            BucketGroup firstGroup = this;
+            if (firstGroup == removeGroup) {
+                return firstGroup.prev;
+            }
 
-            int expectedBucket = thisHash & (thisBuckets.length - 1);
-            if (expectedBucket != i) {
-              throw new IllegalStateException("incorrect bucket");
+            for (BucketGroup priorGroup = firstGroup, curGroup = priorGroup.prev;
+                    curGroup != null;
+                    priorGroup = curGroup, curGroup = priorGroup.prev) {
+                if (curGroup == removeGroup) {
+                    priorGroup.prev = curGroup.prev;
+                }
             }
-          }
+            return firstGroup;
         }
-      }
-    }
-
-    if (this.size != this.computeSize()) {
-      throw new IllegalStateException("incorrect size");
-    }
-    // Local-structure invariant: the size counter's emptiness must match the local buckets. Uses
-    // the local (this.size == 0), NOT isEmpty(), which under read-through resolves the parent too.
-    if ((this.size == 0) != this.checkIfEmpty()) {
-      throw new IllegalStateException("incorrect empty status");
-    }
-  }
 
-  int computeSize() {
-    Object[] thisBuckets = this.buckets;
+        Entry _remove(int hash, String tag) {
+            Entry existingEntry = null;
+            if (this.hash0 == hash && this.entry0.matches(tag)) {
+                existingEntry = this.entry0;
 
-    int size = 0;
-    for (int i = 0; i < thisBuckets.length; ++i) {
-      Object curBucket = thisBuckets[i];
+                this.hash0 = 0;
+                this.entry0 = null;
+            } else if (this.hash1 == hash && this.entry1.matches(tag)) {
+                existingEntry = this.entry1;
 
-      if (curBucket instanceof Entry) {
-        size += 1;
-      } else if (curBucket instanceof BucketGroup) {
-        BucketGroup curGroup = (BucketGroup) curBucket;
-        size += curGroup.sizeInChain();
-      }
-    }
-    return size;
-  }
+                this.hash1 = 0;
+                this.entry1 = null;
+            } else if (this.hash2 == hash && this.entry2.matches(tag)) {
+                existingEntry = this.entry2;
 
-  boolean checkIfEmpty() {
-    Object[] thisBuckets = this.buckets;
+                this.hash2 = 0;
+                this.entry2 = null;
+            } else if (this.hash3 == hash && this.entry3.matches(tag)) {
+                existingEntry = this.entry3;
 
-    for (int i = 0; i < thisBuckets.length; ++i) {
-      Object curBucket = thisBuckets[i];
+                this.hash3 = 0;
+                this.entry3 = null;
+            }
+            return existingEntry;
+        }
 
-      if (curBucket instanceof Entry) {
-        return false;
-      } else if (curBucket instanceof BucketGroup) {
-        BucketGroup curGroup = (BucketGroup) curBucket;
-        if (!curGroup.isEmptyChain()) return false;
-      }
-    }
-
-    return true;
-  }
-
-  @Override
-  public Object compute(
-      String key, BiFunction<? super String, ? super Object, ? extends Object> remappingFunction) {
-    this.checkWriteAccess();
+        void forEachInChain(Consumer<? super EntryReader> consumer) {
+            for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
+                curGroup._forEach(consumer);
+            }
+        }
 
-    return Map.super.compute(key, remappingFunction);
-  }
+        void _forEach(Consumer<? super EntryReader> consumer) {
+            if (this.entry0 != null) consumer.accept(this.entry0);
+            if (this.entry1 != null) consumer.accept(this.entry1);
+            if (this.entry2 != null) consumer.accept(this.entry2);
+            if (this.entry3 != null) consumer.accept(this.entry3);
+        }
 
-  @Override
-  public Object computeIfAbsent(
-      String key, Function<? super String, ? extends Object> mappingFunction) {
-    this.checkWriteAccess();
+        <T> void forEachInChain(T thisObj, BiConsumer<T, ? super EntryReader> consumer) {
+            for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
+                curGroup._forEach(thisObj, consumer);
+            }
+        }
 
-    return Map.super.computeIfAbsent(key, mappingFunction);
-  }
-
-  @Override
-  public Object computeIfPresent(
-      String key, BiFunction<? super String, ? super Object, ? extends Object> remappingFunction) {
-    this.checkWriteAccess();
+        <T> void _forEach(T thisObj, BiConsumer<T, ? super EntryReader> consumer) {
+            if (this.entry0 != null) consumer.accept(thisObj, this.entry0);
+            if (this.entry1 != null) consumer.accept(thisObj, this.entry1);
+            if (this.entry2 != null) consumer.accept(thisObj, this.entry2);
+            if (this.entry3 != null) consumer.accept(thisObj, this.entry3);
+        }
 
-    return Map.super.computeIfPresent(key, remappingFunction);
-  }
-
-  @Override
-  public String toString() {
-    return toPrettyString();
-  }
+        <T, U> void forEachInChain(T thisObj, U otherObj, TriConsumer<T, U, ? super EntryReader> consumer) {
+            for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
+                curGroup._forEach(thisObj, otherObj, consumer);
+            }
+        }
 
-  /**
-   * Standard toString implementation - output is similar to {@link java.util.HashMap#toString()}
-   */
-  String toPrettyString() {
-    boolean first = true;
-
-    StringBuilder ledger = new StringBuilder(128);
-    ledger.append('{');
-    for (EntryReader entry : this) {
-      if (first) {
-        first = false;
-      } else {
-        ledger.append(", ");
-      }
-
-      ledger.append(entry.tag()).append('=').append(entry.stringValue());
-    }
-    ledger.append('}');
-    return ledger.toString();
-  }
-
-  /**
-   * toString that more visibility into the internal structure of TagMap - primarily for deep
-   * debugging
-   */
-  String toInternalString() {
-    Object[] thisBuckets = this.buckets;
-
-    StringBuilder ledger = new StringBuilder(128);
-    for (int i = 0; i < thisBuckets.length; ++i) {
-      ledger.append('[').append(i).append("] = ");
-
-      Object thisBucket = thisBuckets[i];
-      if (thisBucket == null) {
-        ledger.append("null");
-      } else if (thisBucket instanceof Entry) {
-        ledger.append('{').append(thisBucket).append('}');
-      } else if (thisBucket instanceof BucketGroup) {
-        for (BucketGroup curGroup = (BucketGroup) thisBucket;
-            curGroup != null;
-            curGroup = curGroup.prev) {
-          ledger.append(curGroup).append(" -> ");
-        }
-      }
-      ledger.append('\n');
-    }
-    return ledger.toString();
-  }
-
-  abstract static class IteratorBase {
-    private final TagMap map;
-
-    // the level whose buckets are currently being walked: the leaf (map) first, then each ancestor
-    // in turn (read-through union). map == level means we're on the leaf's own entries.
-    private TagMap level;
-    private Object[] buckets;
-
-    private Entry nextEntry;
-
-    private int bucketIndex = -1;
-
-    private BucketGroup group = null;
-    private int groupIndex = 0;
-
-    IteratorBase(TagMap map) {
-      this.map = map;
-      this.level = map;
-      this.buckets = map.buckets;
-    }
-
-    public final boolean hasNext() {
-      if (this.nextEntry != null) return true;
-
-      this.nextEntry = this.advance();
-      return this.nextEntry != null;
-    }
-
-    final Entry nextEntryOrThrowNoSuchElement() {
-      if (this.nextEntry != null) {
-        Entry nextEntry = this.nextEntry;
-        this.nextEntry = null;
-        return nextEntry;
-      }
-
-      if (this.hasNext()) {
-        return this.nextEntry;
-      } else {
-        throw new NoSuchElementException();
-      }
-    }
-
-    final Entry nextEntryOrNull() {
-      if (this.nextEntry != null) {
-        Entry nextEntry = this.nextEntry;
-        this.nextEntry = null;
-        return nextEntry;
-      }
-
-      return this.hasNext() ? this.nextEntry : null;
-    }
-
-    private final Entry advance() {
-      while (true) {
-        Entry tagEntry = this.rawAdvance();
-        if (tagEntry != null) {
-          // leaf entries emit as-is; ancestor entries only if visible from the leaf -- not shadowed
-          // by a nearer level and not tombstoned. (parentEntryVisible walks the nearer levels.)
-          if (this.level == this.map || this.map.parentEntryVisible(tagEntry, this.level)) {
-            return tagEntry;
-          }
-          continue; // ancestor entry shadowed/tombstoned -> skip
+        <T, U> void _forEach(T thisObj, U otherObj, TriConsumer<T, U, ? super EntryReader> consumer) {
+            if (this.entry0 != null) consumer.accept(thisObj, otherObj, this.entry0);
+            if (this.entry1 != null) consumer.accept(thisObj, otherObj, this.entry1);
+            if (this.entry2 != null) consumer.accept(thisObj, otherObj, this.entry2);
+            if (this.entry3 != null) consumer.accept(thisObj, otherObj, this.entry3);
         }
 
-        // current level exhausted; advance to the next ancestor's buckets (read-through union)
-        if (this.level.parent != null) {
-          this.level = this.level.parent;
-          this.buckets = this.level.buckets;
-          this.bucketIndex = -1;
-          this.group = null;
-          this.groupIndex = 0;
-          continue;
+        void fillMapFromChain(Map<? super String, ? super Object> map) {
+            for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
+                curGroup._fillMap(map);
+            }
         }
-        return null;
-      }
-    }
 
-    /** Next raw entry in the current bucket array, ignoring shadowing/tombstones. */
-    private final Entry rawAdvance() {
-      while (this.bucketIndex < this.buckets.length) {
-        if (this.group != null) {
-          for (++this.groupIndex; this.groupIndex < BucketGroup.LEN; ++this.groupIndex) {
-            Entry tagEntry = this.group._entryAt(this.groupIndex);
-            if (tagEntry != null) return tagEntry;
-          }
+        void _fillMap(Map<? super String, ? super Object> map) {
+            Entry entry0 = this.entry0;
+            if (entry0 != null) map.put(entry0.tag, entry0.objectValue());
 
-          // done processing - that group, go to next group
-          this.group = this.group.prev;
-          this.groupIndex = -1;
-        }
+            Entry entry1 = this.entry1;
+            if (entry1 != null) map.put(entry1.tag, entry1.objectValue());
 
-        // if the group is null, then we've finished the current bucket - so advance the bucket
-        if (this.group == null) {
-          for (++this.bucketIndex; this.bucketIndex < this.buckets.length; ++this.bucketIndex) {
-            Object bucket = this.buckets[this.bucketIndex];
+            Entry entry2 = this.entry2;
+            if (entry2 != null) map.put(entry2.tag, entry2.objectValue());
 
-            if (bucket instanceof Entry) {
-              return (Entry) bucket;
-            } else if (bucket instanceof BucketGroup) {
-              this.group = (BucketGroup) bucket;
-              this.groupIndex = -1;
+            Entry entry3 = this.entry3;
+            if (entry3 != null) map.put(entry3.tag, entry3.objectValue());
+        }
 
-              break;
+        void fillStringMapFromChain(Map<? super String, ? super String> map) {
+            for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
+                curGroup._fillStringMap(map);
             }
-          }
         }
-      }
 
-      return null;
-    }
-  }
+        void _fillStringMap(Map<? super String, ? super String> map) {
+            Entry entry0 = this.entry0;
+            if (entry0 != null) map.put(entry0.tag, entry0.stringValue());
 
-  static final class EntryReaderIterator extends IteratorBase implements Iterator<EntryReader> {
-    EntryReaderIterator(TagMap map) {
-      super(map);
-    }
+            Entry entry1 = this.entry1;
+            if (entry1 != null) map.put(entry1.tag, entry1.stringValue());
 
-    @Override
-    public EntryReader next() {
-      return this.nextEntryOrThrowNoSuchElement();
-    }
-  }
-
-  /**
-   * BucketGroup is a compromise for performance over a linked list or array
-   *
-   * <ul>
-   *   <li>linked list - would prevent TagEntry-s from being immutable and would limit sharing
-   *       opportunities
-   *   <li>arrays - wouldn't be able to store hashes close together
-   *   <li>parallel arrays (one for hashes & another for entries) would require more allocation
-   * </ul>
-   */
-  static final class BucketGroup {
-    static final int LEN = 4;
+            Entry entry2 = this.entry2;
+            if (entry2 != null) map.put(entry2.tag, entry2.stringValue());
 
-    /*
-     * To make search operations on BucketGroups fast, the hashes for each entry are held inside
-     * the BucketGroup.  This avoids pointer chasing to inspect each Entry object.
-     * <p>
-     * As a further optimization, the hashes are deliberately placed next to each other.
-     * The intention is that the hashes will all end up in the same cache line, so loading
-     * one hash effectively loads the others for free.
-     * <p>
-     * A hash of zero indicates an available slot, the hashes passed to BucketGroup must be "adjusted"
-     * hashes which can never be zero.  The zero handling is done by TagMap#_hash.
-     */
-    int hash0 = 0;
-    int hash1 = 0;
-    int hash2 = 0;
-    int hash3 = 0;
+            Entry entry3 = this.entry3;
+            if (entry3 != null) map.put(entry3.tag, entry3.stringValue());
+        }
 
-    Entry entry0 = null;
-    Entry entry1 = null;
-    Entry entry2 = null;
-    Entry entry3 = null;
+        BucketGroup cloneChain() {
+            BucketGroup thisClone = this._cloneEntries();
 
-    BucketGroup prev = null;
+            BucketGroup thisPriorClone = thisClone;
+            for (BucketGroup curGroup = this.prev; curGroup != null; curGroup = curGroup.prev) {
+                BucketGroup newClone = curGroup._cloneEntries();
+                thisPriorClone.prev = newClone;
 
-    BucketGroup() {}
+                thisPriorClone = newClone;
+            }
 
-    /** New group with an entry pointing to existing BucketGroup */
-    BucketGroup(int hash0, Entry entry0, BucketGroup prev) {
-      this.hash0 = hash0;
-      this.entry0 = entry0;
+            return thisClone;
+        }
 
-      this.prev = prev;
-    }
+        BucketGroup _cloneEntries() {
+            return new BucketGroup(
+                    this.hash0, this.entry0,
+                    this.hash1, this.entry1,
+                    this.hash2, this.entry2,
+                    this.hash3, this.entry3);
+        }
 
-    /** New group composed of two entries */
-    BucketGroup(int hash0, Entry entry0, int hash1, Entry entry1) {
-      this.hash0 = hash0;
-      this.entry0 = entry0;
+        @Override
+        public String toString() {
+            StringBuilder ledger = new StringBuilder(32);
+            ledger.append('[');
+            for (int i = 0; i < BucketGroup.LEN; ++i) {
+                if (i != 0) ledger.append(", ");
 
-      this.hash1 = hash1;
-      this.entry1 = entry1;
+                ledger.append(this._entryAt(i));
+            }
+            ledger.append(']');
+            return ledger.toString();
+        }
     }
 
-    /** New group composed of 4 entries - used for cloning */
-    BucketGroup(
-        int hash0,
-        Entry entry0,
-        int hash1,
-        Entry entry1,
-        int hash2,
-        Entry entry2,
-        int hash3,
-        Entry entry3) {
-      this.hash0 = hash0;
-      this.entry0 = entry0;
+    static final class Entries extends AbstractSet<Map.Entry<String, Object>> {
+        private final TagMap map;
 
-      this.hash1 = hash1;
-      this.entry1 = entry1;
+        Entries(TagMap map) {
+            this.map = map;
+        }
+
+        @Override
+        public int size() {
+            return this.map.size();
+        }
 
-      this.hash2 = hash2;
-      this.entry2 = entry2;
+        @Override
+        public boolean isEmpty() {
+            return this.map.isEmpty();
+        }
 
-      this.hash3 = hash3;
-      this.entry3 = entry3;
+        @Override
+        public Iterator<Map.Entry<String, Object>> iterator() {
+            @SuppressWarnings({"rawtypes", "unchecked"})
+            Iterator<Map.Entry<String, Object>> iter = (Iterator) this.map.iterator();
+            return iter;
+        }
     }
 
-    Entry _entryAt(int index) {
-      switch (index) {
-        case 0:
-          return this.entry0;
+    static final class Keys extends AbstractSet<String> {
+        final TagMap map;
 
-        case 1:
-          return this.entry1;
+        Keys(TagMap map) {
+            this.map = map;
+        }
 
-        case 2:
-          return this.entry2;
+        @Override
+        public int size() {
+            return this.map.size();
+        }
 
-        case 3:
-          return this.entry3;
+        @Override
+        public boolean isEmpty() {
+            return this.map.isEmpty();
+        }
 
-          // Do not use default case, that creates a 5% cost on entry handling
-      }
+        @Override
+        public boolean contains(Object o) {
+            return this.map.containsKey(o);
+        }
 
-      return null;
+        @Override
+        public Iterator<String> iterator() {
+            return new KeysIterator(this.map);
+        }
     }
 
-    int _hashAt(int index) {
-      switch (index) {
-        case 0:
-          return this.hash0;
+    static final class KeysIterator extends IteratorBase implements Iterator<String> {
+        KeysIterator(TagMap map) {
+            super(map);
+        }
+
+        @Override
+        public String next() {
+            return this.nextEntryOrThrowNoSuchElement().tag();
+        }
+    }
 
-        case 1:
-          return this.hash1;
+    static final class Values extends AbstractCollection<Object> {
+        final TagMap map;
 
-        case 2:
-          return this.hash2;
+        Values(TagMap map) {
+            this.map = map;
+        }
 
-        case 3:
-          return this.hash3;
+        @Override
+        public int size() {
+            return this.map.size();
+        }
 
-          // Do not use default case, that creates a 5% cost on entry handling
-      }
+        @Override
+        public boolean isEmpty() {
+            return this.map.isEmpty();
+        }
 
-      return 0;
-    }
+        @Override
+        public boolean contains(Object o) {
+            return this.map.containsValue(o);
+        }
 
-    int sizeInChain() {
-      int size = 0;
-      for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
-        size += curGroup._size();
-      }
-      return size;
-    }
-
-    int _size() {
-      return (this.hash0 == 0 ? 0 : 1)
-          + (this.hash1 == 0 ? 0 : 1)
-          + (this.hash2 == 0 ? 0 : 1)
-          + (this.hash3 == 0 ? 0 : 1);
-    }
-
-    boolean isEmptyChain() {
-      for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
-        if (!curGroup._isEmpty()) return false;
-      }
-      return true;
-    }
-
-    boolean _isEmpty() {
-      return (this.hash0 | this.hash1 | this.hash2 | this.hash3) == 0;
-    }
-
-    BucketGroup findContainingGroupInChain(int hash, String tag) {
-      for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
-        if (curGroup._find(hash, tag) != null) return curGroup;
-      }
-      return null;
-    }
-
-    Entry findInChain(int hash, String tag) {
-      for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
-        Entry curEntry = curGroup._find(hash, tag);
-        if (curEntry != null) return curEntry;
-      }
-      return null;
-    }
-
-    Entry _find(int hash, String tag) {
-      // if ( this._mayContain(hash) ) return null;
-
-      if (this.hash0 == hash && this.entry0.matches(tag)) {
-        return this.entry0;
-      } else if (this.hash1 == hash && this.entry1.matches(tag)) {
-        return this.entry1;
-      } else if (this.hash2 == hash && this.entry2.matches(tag)) {
-        return this.entry2;
-      } else if (this.hash3 == hash && this.entry3.matches(tag)) {
-        return this.entry3;
-      }
-      return null;
-    }
-
-    BucketGroup replaceOrInsertAllInChain(BucketGroup thatHeadGroup) {
-      BucketGroup thisOrigHeadGroup = this;
-      BucketGroup thisNewestHeadGroup = thisOrigHeadGroup;
-
-      for (BucketGroup thatCurGroup = thatHeadGroup;
-          thatCurGroup != null;
-          thatCurGroup = thatCurGroup.prev) {
-        // First phase - tries to replace or insert each entry in the existing bucket chain
-        // Only need to search the original groups for replacements
-        // The whole chain is eligible for insertions
-        boolean handled0 =
-            (thatCurGroup.hash0 == 0)
-                || (thisOrigHeadGroup.replaceInChain(thatCurGroup.hash0, thatCurGroup.entry0)
-                    != null)
-                || thisNewestHeadGroup.insertInChain(thatCurGroup.hash0, thatCurGroup.entry0);
-
-        boolean handled1 =
-            (thatCurGroup.hash1 == 0)
-                || (thisOrigHeadGroup.replaceInChain(thatCurGroup.hash1, thatCurGroup.entry1)
-                    != null)
-                || thisNewestHeadGroup.insertInChain(thatCurGroup.hash1, thatCurGroup.entry1);
-
-        boolean handled2 =
-            (thatCurGroup.hash2 == 0)
-                || (thisOrigHeadGroup.replaceInChain(thatCurGroup.hash2, thatCurGroup.entry2)
-                    != null)
-                || thisNewestHeadGroup.insertInChain(thatCurGroup.hash2, thatCurGroup.entry2);
-
-        boolean handled3 =
-            (thatCurGroup.hash3 == 0)
-                || (thisOrigHeadGroup.replaceInChain(thatCurGroup.hash3, thatCurGroup.entry3)
-                    != null)
-                || thisNewestHeadGroup.insertInChain(thatCurGroup.hash3, thatCurGroup.entry3);
-
-        // Second phase - takes any entries that weren't handled by phase 1 and puts them
-        // into a new BucketGroup.  Since BucketGroups are fixed size, we know that the
-        // left over entries from one BucketGroup will fit in the new BucketGroup.
-        if (!handled0 || !handled1 || !handled2 || !handled3) {
-          // Rather than calling insert one time per entry
-          // Exploiting the fact that the new group is known to be empty
-          // And that BucketGroups are allowed to have holes in them (to allow for removal),
-          // so each unhandled entry from the source group is simply placed in
-          // the same slot in the new group
-          BucketGroup thisNewHashGroup = new BucketGroup();
-          if (!handled0) {
-            thisNewHashGroup.hash0 = thatCurGroup.hash0;
-            thisNewHashGroup.entry0 = thatCurGroup.entry0;
-          }
-          if (!handled1) {
-            thisNewHashGroup.hash1 = thatCurGroup.hash1;
-            thisNewHashGroup.entry1 = thatCurGroup.entry1;
-          }
-          if (!handled2) {
-            thisNewHashGroup.hash2 = thatCurGroup.hash2;
-            thisNewHashGroup.entry2 = thatCurGroup.entry2;
-          }
-          if (!handled3) {
-            thisNewHashGroup.hash3 = thatCurGroup.hash3;
-            thisNewHashGroup.entry3 = thatCurGroup.entry3;
-          }
-          thisNewHashGroup.prev = thisNewestHeadGroup;
-
-          thisNewestHeadGroup = thisNewHashGroup;
-        }
-      }
-
-      return thisNewestHeadGroup;
-    }
-
-    Entry replaceInChain(int hash, Entry entry) {
-      for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
-        Entry prevEntry = curGroup._replace(hash, entry);
-        if (prevEntry != null) return prevEntry;
-      }
-      return null;
-    }
-
-    Entry _replace(int hash, Entry entry) {
-      // if ( this._mayContain(hash) ) return null;
-
-      // first check to see if the item is already present
-      Entry prevEntry = null;
-      if (this.hash0 == hash && this.entry0.matches(entry.tag)) {
-        prevEntry = this.entry0;
-        this.entry0 = entry;
-      } else if (this.hash1 == hash && this.entry1.matches(entry.tag)) {
-        prevEntry = this.entry1;
-        this.entry1 = entry;
-      } else if (this.hash2 == hash && this.entry2.matches(entry.tag)) {
-        prevEntry = this.entry2;
-        this.entry2 = entry;
-      } else if (this.hash3 == hash && this.entry3.matches(entry.tag)) {
-        prevEntry = this.entry3;
-        this.entry3 = entry;
-      }
-
-      return prevEntry;
-    }
-
-    boolean insertInChain(int hash, Entry entry) {
-      for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
-        if (curGroup._insert(hash, entry)) return true;
-      }
-      return false;
-    }
-
-    boolean _insert(int hash, Entry entry) {
-      boolean inserted = false;
-      if (this.hash0 == 0) {
-        this.hash0 = hash;
-        this.entry0 = entry;
-
-        inserted = true;
-      } else if (this.hash1 == 0) {
-        this.hash1 = hash;
-        this.entry1 = entry;
-
-        inserted = true;
-      } else if (this.hash2 == 0) {
-        this.hash2 = hash;
-        this.entry2 = entry;
-
-        inserted = true;
-      } else if (this.hash3 == 0) {
-        this.hash3 = hash;
-        this.entry3 = entry;
-
-        inserted = true;
-      }
-      return inserted;
-    }
-
-    BucketGroup removeGroupInChain(BucketGroup removeGroup) {
-      BucketGroup firstGroup = this;
-      if (firstGroup == removeGroup) {
-        return firstGroup.prev;
-      }
-
-      for (BucketGroup priorGroup = firstGroup, curGroup = priorGroup.prev;
-          curGroup != null;
-          priorGroup = curGroup, curGroup = priorGroup.prev) {
-        if (curGroup == removeGroup) {
-          priorGroup.prev = curGroup.prev;
+        @Override
+        public Iterator<Object> iterator() {
+            return new ValuesIterator(this.map);
         }
-      }
-      return firstGroup;
     }
 
-    Entry _remove(int hash, String tag) {
-      Entry existingEntry = null;
-      if (this.hash0 == hash && this.entry0.matches(tag)) {
-        existingEntry = this.entry0;
-
-        this.hash0 = 0;
-        this.entry0 = null;
-      } else if (this.hash1 == hash && this.entry1.matches(tag)) {
-        existingEntry = this.entry1;
+    static final class ValuesIterator extends IteratorBase implements Iterator<Object> {
+        ValuesIterator(TagMap map) {
+            super(map);
+        }
 
-        this.hash1 = 0;
-        this.entry1 = null;
-      } else if (this.hash2 == hash && this.entry2.matches(tag)) {
-        existingEntry = this.entry2;
+        @Override
+        public Object next() {
+            return this.nextEntryOrThrowNoSuchElement().objectValue();
+        }
+    }
+}
 
-        this.hash2 = 0;
-        this.entry2 = null;
-      } else if (this.hash3 == hash && this.entry3.matches(tag)) {
-        existingEntry = this.entry3;
+final class EntryReadingHelper implements TagMap.EntryReader {
+    private Map.Entry<String, Object> mapEntry;
+    private String tag;
+    private Object value;
 
-        this.hash3 = 0;
-        this.entry3 = null;
-      }
-      return existingEntry;
+    void set(String tag, Object value) {
+        this.mapEntry = null;
+        this.tag = tag;
+        this.value = value;
     }
 
-    void forEachInChain(Consumer<? super EntryReader> consumer) {
-      for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
-        curGroup._forEach(consumer);
-      }
+    void set(Map.Entry<String, Object> mapEntry) {
+        this.mapEntry = mapEntry;
+        this.tag = mapEntry.getKey();
+        this.value = mapEntry.getValue();
     }
 
-    void _forEach(Consumer<? super EntryReader> consumer) {
-      if (this.entry0 != null) consumer.accept(this.entry0);
-      if (this.entry1 != null) consumer.accept(this.entry1);
-      if (this.entry2 != null) consumer.accept(this.entry2);
-      if (this.entry3 != null) consumer.accept(this.entry3);
+    @Override
+    public String tag() {
+        return this.tag;
     }
 
-    <T> void forEachInChain(T thisObj, BiConsumer<T, ? super EntryReader> consumer) {
-      for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
-        curGroup._forEach(thisObj, consumer);
-      }
+    @Override
+    public byte type() {
+        return TagValueConversions.typeOf(this.value);
     }
 
-    <T> void _forEach(T thisObj, BiConsumer<T, ? super EntryReader> consumer) {
-      if (this.entry0 != null) consumer.accept(thisObj, this.entry0);
-      if (this.entry1 != null) consumer.accept(thisObj, this.entry1);
-      if (this.entry2 != null) consumer.accept(thisObj, this.entry2);
-      if (this.entry3 != null) consumer.accept(thisObj, this.entry3);
+    @Override
+    public boolean is(byte type) {
+        return TagValueConversions.isA(this.value, type);
     }
 
-    <T, U> void forEachInChain(
-        T thisObj, U otherObj, TriConsumer<T, U, ? super EntryReader> consumer) {
-      for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
-        curGroup._forEach(thisObj, otherObj, consumer);
-      }
+    @Override
+    public boolean isNumber() {
+        return TagValueConversions.isNumber(this.value);
     }
 
-    <T, U> void _forEach(T thisObj, U otherObj, TriConsumer<T, U, ? super EntryReader> consumer) {
-      if (this.entry0 != null) consumer.accept(thisObj, otherObj, this.entry0);
-      if (this.entry1 != null) consumer.accept(thisObj, otherObj, this.entry1);
-      if (this.entry2 != null) consumer.accept(thisObj, otherObj, this.entry2);
-      if (this.entry3 != null) consumer.accept(thisObj, otherObj, this.entry3);
+    @Override
+    public boolean isNumericPrimitive() {
+        return TagValueConversions.isNumericPrimitive(this.value);
     }
 
-    void fillMapFromChain(Map<? super String, ? super Object> map) {
-      for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
-        curGroup._fillMap(map);
-      }
+    @Override
+    public boolean isObject() {
+        return TagValueConversions.isObject(this.value);
     }
 
-    void _fillMap(Map<? super String, ? super Object> map) {
-      Entry entry0 = this.entry0;
-      if (entry0 != null) map.put(entry0.tag, entry0.objectValue());
-
-      Entry entry1 = this.entry1;
-      if (entry1 != null) map.put(entry1.tag, entry1.objectValue());
-
-      Entry entry2 = this.entry2;
-      if (entry2 != null) map.put(entry2.tag, entry2.objectValue());
-
-      Entry entry3 = this.entry3;
-      if (entry3 != null) map.put(entry3.tag, entry3.objectValue());
+    @Override
+    public boolean booleanValue() {
+        return TagValueConversions.toBoolean(this.value);
     }
 
-    void fillStringMapFromChain(Map<? super String, ? super String> map) {
-      for (BucketGroup curGroup = this; curGroup != null; curGroup = curGroup.prev) {
-        curGroup._fillStringMap(map);
-      }
+    @Override
+    public int intValue() {
+        return TagValueConversions.toInt(this.value);
     }
 
-    void _fillStringMap(Map<? super String, ? super String> map) {
-      Entry entry0 = this.entry0;
-      if (entry0 != null) map.put(entry0.tag, entry0.stringValue());
-
-      Entry entry1 = this.entry1;
-      if (entry1 != null) map.put(entry1.tag, entry1.stringValue());
-
-      Entry entry2 = this.entry2;
-      if (entry2 != null) map.put(entry2.tag, entry2.stringValue());
-
-      Entry entry3 = this.entry3;
-      if (entry3 != null) map.put(entry3.tag, entry3.stringValue());
+    @Override
+    public long longValue() {
+        return TagValueConversions.toLong(this.value);
     }
 
-    BucketGroup cloneChain() {
-      BucketGroup thisClone = this._cloneEntries();
-
-      BucketGroup thisPriorClone = thisClone;
-      for (BucketGroup curGroup = this.prev; curGroup != null; curGroup = curGroup.prev) {
-        BucketGroup newClone = curGroup._cloneEntries();
-        thisPriorClone.prev = newClone;
-
-        thisPriorClone = newClone;
-      }
-
-      return thisClone;
+    @Override
+    public float floatValue() {
+        return TagValueConversions.toFloat(this.value);
     }
 
-    BucketGroup _cloneEntries() {
-      return new BucketGroup(
-          this.hash0, this.entry0,
-          this.hash1, this.entry1,
-          this.hash2, this.entry2,
-          this.hash3, this.entry3);
+    @Override
+    public double doubleValue() {
+        return TagValueConversions.toDouble(this.value);
     }
 
     @Override
-    public String toString() {
-      StringBuilder ledger = new StringBuilder(32);
-      ledger.append('[');
-      for (int i = 0; i < BucketGroup.LEN; ++i) {
-        if (i != 0) ledger.append(", ");
-
-        ledger.append(this._entryAt(i));
-      }
-      ledger.append(']');
-      return ledger.toString();
+    public String stringValue() {
+        return TagValueConversions.toString(this.value);
     }
-  }
-
-  static final class Entries extends AbstractSet<Map.Entry<String, Object>> {
-    private final TagMap map;
 
-    Entries(TagMap map) {
-      this.map = map;
+    @Override
+    public Object objectValue() {
+        return this.value;
     }
 
     @Override
-    public int size() {
-      return this.map.size();
+    public TagMap.Entry entry() {
+        return TagMap.Entry.newAnyEntry(this.tag, this.value);
     }
 
     @Override
-    public boolean isEmpty() {
-      return this.map.isEmpty();
+    public Map.Entry<String, Object> mapEntry() {
+        Map.Entry<String, Object> mapEntry = this.mapEntry;
+        return (mapEntry != null) ? mapEntry : this.entry();
     }
+}
 
-    @Override
-    public Iterator<Map.Entry<String, Object>> iterator() {
-      @SuppressWarnings({"rawtypes", "unchecked"})
-      Iterator<Map.Entry<String, Object>> iter = (Iterator) this.map.iterator();
-      return iter;
+final class TagValueConversions {
+    TagValueConversions() {}
+
+    static byte typeOf(Object value) {
+        if (value instanceof Integer) {
+            return TagMap.EntryReader.INT;
+        } else if (value instanceof Long) {
+            return TagMap.EntryReader.LONG;
+        } else if (value instanceof Double) {
+            return TagMap.EntryReader.DOUBLE;
+        } else if (value instanceof Float) {
+            return TagMap.EntryReader.FLOAT;
+        } else if (value instanceof Boolean) {
+            return TagMap.EntryReader.BOOLEAN;
+        } else if (value instanceof Short) {
+            return TagMap.EntryReader.INT;
+        } else if (value instanceof Byte) {
+            return TagMap.EntryReader.INT;
+        } else {
+            // NOTE: Character is currently deliberately treated as OBJECT
+            return TagMap.EntryReader.OBJECT;
+        }
     }
-  }
 
-  static final class Keys extends AbstractSet<String> {
-    final TagMap map;
+    static boolean isA(Object value, byte type) {
+        switch (type) {
+            case TagMap.EntryReader.BOOLEAN:
+                return (value instanceof Boolean);
 
-    Keys(TagMap map) {
-      this.map = map;
-    }
+            case TagMap.EntryReader.INT:
+                return (value instanceof Integer) || (value instanceof Short) || (value instanceof Byte);
 
-    @Override
-    public int size() {
-      return this.map.size();
-    }
+            case TagMap.EntryReader.LONG:
+                return (value instanceof Long);
 
-    @Override
-    public boolean isEmpty() {
-      return this.map.isEmpty();
+            case TagMap.EntryReader.FLOAT:
+                return (value instanceof Float);
+
+            case TagMap.EntryReader.DOUBLE:
+                return (value instanceof Double);
+
+            case TagMap.EntryReader.OBJECT:
+                return true;
+
+            default:
+                return false;
+        }
     }
 
-    @Override
-    public boolean contains(Object o) {
-      return this.map.containsKey(o);
+    static boolean isNumber(Object value) {
+        return (value instanceof Number);
     }
 
-    @Override
-    public Iterator<String> iterator() {
-      return new KeysIterator(this.map);
+    static boolean isNumericPrimitive(Object value) {
+        return (value instanceof Integer)
+                || (value instanceof Long)
+                || (value instanceof Double)
+                || (value instanceof Float)
+                || (value instanceof Short)
+                || (value instanceof Byte);
     }
-  }
 
-  static final class KeysIterator extends IteratorBase implements Iterator<String> {
-    KeysIterator(TagMap map) {
-      super(map);
+    static boolean isObject(Object value) {
+        boolean isSupportedPrimitive = (value instanceof Integer)
+                || (value instanceof Long)
+                || (value instanceof Double)
+                || (value instanceof Float)
+                || (value instanceof Boolean)
+                || (value instanceof Short)
+                || (value instanceof Byte);
+
+        // NOTE: Character is just treated as Object
+        return !isSupportedPrimitive;
     }
 
-    @Override
-    public String next() {
-      return this.nextEntryOrThrowNoSuchElement().tag();
+    static boolean toBooleanOrDefault(Object value, boolean defaultValue) {
+        return (value == null) ? defaultValue : toBoolean(value);
     }
-  }
 
-  static final class Values extends AbstractCollection<Object> {
-    final TagMap map;
+    static boolean toBoolean(Object value) {
+        if (value instanceof Boolean) {
+            return (Boolean) value;
+        } else if (value instanceof Number) {
+            // NOTE: This cannot be intValue() because intValue of larger types is 0 when
+            // the actual value would be less than Integer.MIN_VALUE or for floating point
+            // types is very close to zero, so using doubleValue instead.
 
-    Values(TagMap map) {
-      this.map = map;
+            // While this is a bit ugly, coerced toBoolean is uncommon
+            return ((Number) value).doubleValue() != 0D;
+        } else {
+            return false;
+        }
     }
 
-    @Override
-    public int size() {
-      return this.map.size();
+    static int toIntOrDefault(Object value, int defaultValue) {
+        return (value == null) ? defaultValue : toInt(value);
     }
 
-    @Override
-    public boolean isEmpty() {
-      return this.map.isEmpty();
+    static int toInt(Object value) {
+        if (value instanceof Integer) {
+            return (Integer) value;
+        } else if (value instanceof Number) {
+            return ((Number) value).intValue();
+        } else if (value instanceof Boolean) {
+            return (Boolean) value ? 1 : 0;
+        } else {
+            return 0;
+        }
     }
 
-    @Override
-    public boolean contains(Object o) {
-      return this.map.containsValue(o);
+    static long toLong(Object value) {
+        if (value instanceof Long) {
+            return (Long) value;
+        } else if (value instanceof Number) {
+            return ((Number) value).longValue();
+        } else if (value instanceof Boolean) {
+            return (Boolean) value ? 1L : 0L;
+        } else {
+            return 0L;
+        }
     }
 
-    @Override
-    public Iterator<Object> iterator() {
-      return new ValuesIterator(this.map);
+    static long toLongOrDefault(Object value, long defaultValue) {
+        return (value == null) ? defaultValue : toLong(value);
     }
-  }
 
-  static final class ValuesIterator extends IteratorBase implements Iterator<Object> {
-    ValuesIterator(TagMap map) {
-      super(map);
+    static float toFloat(Object value) {
+        if (value instanceof Float) {
+            return (Float) value;
+        } else if (value instanceof Number) {
+            return ((Number) value).floatValue();
+        } else if (value instanceof Boolean) {
+            return (Boolean) value ? 1F : 0F;
+        } else {
+            return 0F;
+        }
     }
 
-    @Override
-    public Object next() {
-      return this.nextEntryOrThrowNoSuchElement().objectValue();
+    static float toFloatOrDefault(Object value, float defaultValue) {
+        return (value == null) ? defaultValue : toFloat(value);
     }
-  }
-}
 
-final class EntryReadingHelper implements TagMap.EntryReader {
-  private Map.Entry<String, Object> mapEntry;
-  private String tag;
-  private Object value;
-
-  void set(String tag, Object value) {
-    this.mapEntry = null;
-    this.tag = tag;
-    this.value = value;
-  }
-
-  void set(Map.Entry<String, Object> mapEntry) {
-    this.mapEntry = mapEntry;
-    this.tag = mapEntry.getKey();
-    this.value = mapEntry.getValue();
-  }
-
-  @Override
-  public String tag() {
-    return this.tag;
-  }
-
-  @Override
-  public byte type() {
-    return TagValueConversions.typeOf(this.value);
-  }
-
-  @Override
-  public boolean is(byte type) {
-    return TagValueConversions.isA(this.value, type);
-  }
-
-  @Override
-  public boolean isNumber() {
-    return TagValueConversions.isNumber(this.value);
-  }
-
-  @Override
-  public boolean isNumericPrimitive() {
-    return TagValueConversions.isNumericPrimitive(this.value);
-  }
-
-  @Override
-  public boolean isObject() {
-    return TagValueConversions.isObject(this.value);
-  }
-
-  @Override
-  public boolean booleanValue() {
-    return TagValueConversions.toBoolean(this.value);
-  }
-
-  @Override
-  public int intValue() {
-    return TagValueConversions.toInt(this.value);
-  }
-
-  @Override
-  public long longValue() {
-    return TagValueConversions.toLong(this.value);
-  }
-
-  @Override
-  public float floatValue() {
-    return TagValueConversions.toFloat(this.value);
-  }
-
-  @Override
-  public double doubleValue() {
-    return TagValueConversions.toDouble(this.value);
-  }
-
-  @Override
-  public String stringValue() {
-    return TagValueConversions.toString(this.value);
-  }
-
-  @Override
-  public Object objectValue() {
-    return this.value;
-  }
-
-  @Override
-  public TagMap.Entry entry() {
-    return TagMap.Entry.newAnyEntry(this.tag, this.value);
-  }
-
-  @Override
-  public Map.Entry<String, Object> mapEntry() {
-    Map.Entry<String, Object> mapEntry = this.mapEntry;
-    return (mapEntry != null) ? mapEntry : this.entry();
-  }
-}
+    static double toDouble(Object value) {
+        if (value instanceof Double) {
+            return (Double) value;
+        } else if (value instanceof Number) {
+            return ((Number) value).doubleValue();
+        } else if (value instanceof Boolean) {
+            return (Boolean) value ? 1D : 0D;
+        } else {
+            return 0D;
+        }
+    }
 
-final class TagValueConversions {
-  TagValueConversions() {}
-
-  static byte typeOf(Object value) {
-    if (value instanceof Integer) {
-      return TagMap.EntryReader.INT;
-    } else if (value instanceof Long) {
-      return TagMap.EntryReader.LONG;
-    } else if (value instanceof Double) {
-      return TagMap.EntryReader.DOUBLE;
-    } else if (value instanceof Float) {
-      return TagMap.EntryReader.FLOAT;
-    } else if (value instanceof Boolean) {
-      return TagMap.EntryReader.BOOLEAN;
-    } else if (value instanceof Short) {
-      return TagMap.EntryReader.INT;
-    } else if (value instanceof Byte) {
-      return TagMap.EntryReader.INT;
-    } else {
-      // NOTE: Character is currently deliberately treated as OBJECT
-      return TagMap.EntryReader.OBJECT;
-    }
-  }
-
-  static boolean isA(Object value, byte type) {
-    switch (type) {
-      case TagMap.EntryReader.BOOLEAN:
-        return (value instanceof Boolean);
-
-      case TagMap.EntryReader.INT:
-        return (value instanceof Integer) || (value instanceof Short) || (value instanceof Byte);
-
-      case TagMap.EntryReader.LONG:
-        return (value instanceof Long);
-
-      case TagMap.EntryReader.FLOAT:
-        return (value instanceof Float);
-
-      case TagMap.EntryReader.DOUBLE:
-        return (value instanceof Double);
-
-      case TagMap.EntryReader.OBJECT:
-        return true;
+    static double toDoubleOrDefault(Object value, double defaultValue) {
+        return (value == null) ? defaultValue : toDouble(value);
+    }
 
-      default:
-        return false;
+    static String toString(Object value) {
+        return value.toString();
     }
-  }
-
-  static boolean isNumber(Object value) {
-    return (value instanceof Number);
-  }
-
-  static boolean isNumericPrimitive(Object value) {
-    return (value instanceof Integer)
-        || (value instanceof Long)
-        || (value instanceof Double)
-        || (value instanceof Float)
-        || (value instanceof Short)
-        || (value instanceof Byte);
-  }
-
-  static boolean isObject(Object value) {
-    boolean isSupportedPrimitive =
-        (value instanceof Integer)
-            || (value instanceof Long)
-            || (value instanceof Double)
-            || (value instanceof Float)
-            || (value instanceof Boolean)
-            || (value instanceof Short)
-            || (value instanceof Byte);
-
-    // NOTE: Character is just treated as Object
-    return !isSupportedPrimitive;
-  }
-
-  static boolean toBooleanOrDefault(Object value, boolean defaultValue) {
-    return (value == null) ? defaultValue : toBoolean(value);
-  }
-
-  static boolean toBoolean(Object value) {
-    if (value instanceof Boolean) {
-      return (Boolean) value;
-    } else if (value instanceof Number) {
-      // NOTE: This cannot be intValue() because intValue of larger types is 0 when
-      // the actual value would be less than Integer.MIN_VALUE or for floating point
-      // types is very close to zero, so using doubleValue instead.
-
-      // While this is a bit ugly, coerced toBoolean is uncommon
-      return ((Number) value).doubleValue() != 0D;
-    } else {
-      return false;
-    }
-  }
-
-  static int toIntOrDefault(Object value, int defaultValue) {
-    return (value == null) ? defaultValue : toInt(value);
-  }
-
-  static int toInt(Object value) {
-    if (value instanceof Integer) {
-      return (Integer) value;
-    } else if (value instanceof Number) {
-      return ((Number) value).intValue();
-    } else if (value instanceof Boolean) {
-      return (Boolean) value ? 1 : 0;
-    } else {
-      return 0;
-    }
-  }
-
-  static long toLong(Object value) {
-    if (value instanceof Long) {
-      return (Long) value;
-    } else if (value instanceof Number) {
-      return ((Number) value).longValue();
-    } else if (value instanceof Boolean) {
-      return (Boolean) value ? 1L : 0L;
-    } else {
-      return 0L;
-    }
-  }
-
-  static long toLongOrDefault(Object value, long defaultValue) {
-    return (value == null) ? defaultValue : toLong(value);
-  }
-
-  static float toFloat(Object value) {
-    if (value instanceof Float) {
-      return (Float) value;
-    } else if (value instanceof Number) {
-      return ((Number) value).floatValue();
-    } else if (value instanceof Boolean) {
-      return (Boolean) value ? 1F : 0F;
-    } else {
-      return 0F;
-    }
-  }
-
-  static float toFloatOrDefault(Object value, float defaultValue) {
-    return (value == null) ? defaultValue : toFloat(value);
-  }
-
-  static double toDouble(Object value) {
-    if (value instanceof Double) {
-      return (Double) value;
-    } else if (value instanceof Number) {
-      return ((Number) value).doubleValue();
-    } else if (value instanceof Boolean) {
-      return (Boolean) value ? 1D : 0D;
-    } else {
-      return 0D;
-    }
-  }
-
-  static double toDoubleOrDefault(Object value, double defaultValue) {
-    return (value == null) ? defaultValue : toDouble(value);
-  }
-
-  static String toString(Object value) {
-    return value.toString();
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/TraceConfig.java b/internal-api/src/main/java/datadog/trace/api/TraceConfig.java
index 801e8e516b4..42e277c43b6 100644
--- a/internal-api/src/main/java/datadog/trace/api/TraceConfig.java
+++ b/internal-api/src/main/java/datadog/trace/api/TraceConfig.java
@@ -8,51 +8,51 @@
 
 /** Snapshot of dynamic configuration; valid for the duration of a trace. */
 public interface TraceConfig {
-  boolean isTraceEnabled();
+    boolean isTraceEnabled();
 
-  boolean isRuntimeMetricsEnabled();
+    boolean isRuntimeMetricsEnabled();
 
-  boolean isLogsInjectionEnabled();
+    boolean isLogsInjectionEnabled();
 
-  boolean isDataStreamsEnabled();
+    boolean isDataStreamsEnabled();
 
-  Map<String, String> getServiceMapping();
+    Map<String, String> getServiceMapping();
 
-  Map<String, String> getRequestHeaderTags();
+    Map<String, String> getRequestHeaderTags();
 
-  Map<String, String> getResponseHeaderTags();
+    Map<String, String> getResponseHeaderTags();
 
-  Map<String, String> getBaggageMapping();
+    Map<String, String> getBaggageMapping();
 
-  Double getTraceSampleRate();
+    Double getTraceSampleRate();
 
-  Map<String, String> getTracingTags();
+    Map<String, String> getTracingTags();
 
-  /**
-   * The preferred service name and the source which set it to be used for tracing.
-   *
-   * @return null if not set (will use tracing default one)
-   */
-  Pair<String, CharSequence> getPreferredServiceNameAndSource();
+    /**
+     * The preferred service name and the source which set it to be used for tracing.
+     *
+     * @return null if not set (will use tracing default one)
+     */
+    Pair<String, CharSequence> getPreferredServiceNameAndSource();
 
-  /**
-   * Get the tracer sampler Span Sampling Rules.
-   *
-   * @return The tracer sampler Span Sampling Rules, or an empty collection if no rule is defined.
-   */
-  List<? extends SpanSamplingRule> getSpanSamplingRules();
+    /**
+     * Get the tracer sampler Span Sampling Rules.
+     *
+     * @return The tracer sampler Span Sampling Rules, or an empty collection if no rule is defined.
+     */
+    List<? extends SpanSamplingRule> getSpanSamplingRules();
 
-  /**
-   * Get the tracer sampler Trace Sampling Rules.
-   *
-   * @return The tracer sampler Trace Sampling Rules, or an empty collection if no rule is defined.
-   */
-  List<? extends TraceSamplingRule> getTraceSamplingRules();
+    /**
+     * Get the tracer sampler Trace Sampling Rules.
+     *
+     * @return The tracer sampler Trace Sampling Rules, or an empty collection if no rule is defined.
+     */
+    List<? extends TraceSamplingRule> getTraceSamplingRules();
 
-  /**
-   * Get DSM transaction extractors.
-   *
-   * @return List of Data Streams Transactions extractors.
-   */
-  List<DataStreamsTransactionExtractor> getDataStreamsTransactionExtractors();
+    /**
+     * Get DSM transaction extractors.
+     *
+     * @return List of Data Streams Transactions extractors.
+     */
+    List<DataStreamsTransactionExtractor> getDataStreamsTransactionExtractors();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/UserEventTrackingMode.java b/internal-api/src/main/java/datadog/trace/api/UserEventTrackingMode.java
index 070bbe76a61..0b84625d330 100644
--- a/internal-api/src/main/java/datadog/trace/api/UserEventTrackingMode.java
+++ b/internal-api/src/main/java/datadog/trace/api/UserEventTrackingMode.java
@@ -1,39 +1,39 @@
 package datadog.trace.api;
 
 public enum UserEventTrackingMode {
-  DISABLED("disabled"),
-  SAFE("safe", "true", "1"),
-  EXTENDED("extended");
+    DISABLED("disabled"),
+    SAFE("safe", "true", "1"),
+    EXTENDED("extended");
 
-  private final String value;
-  private final String[] modes;
+    private final String value;
+    private final String[] modes;
 
-  UserEventTrackingMode(final String... modes) {
-    value = modes[0];
-    this.modes = modes;
-  }
-
-  private boolean matches(final String mode) {
-    for (final String value : modes) {
-      if (value.equalsIgnoreCase(mode)) {
-        return true;
-      }
+    UserEventTrackingMode(final String... modes) {
+        value = modes[0];
+        this.modes = modes;
     }
-    return false;
-  }
 
-  public static UserEventTrackingMode fromString(String s) {
-    if (SAFE.matches(s)) {
-      return SAFE;
+    private boolean matches(final String mode) {
+        for (final String value : modes) {
+            if (value.equalsIgnoreCase(mode)) {
+                return true;
+            }
+        }
+        return false;
     }
-    if (EXTENDED.matches(s)) {
-      return EXTENDED;
+
+    public static UserEventTrackingMode fromString(String s) {
+        if (SAFE.matches(s)) {
+            return SAFE;
+        }
+        if (EXTENDED.matches(s)) {
+            return EXTENDED;
+        }
+        return DISABLED;
     }
-    return DISABLED;
-  }
 
-  @Override
-  public String toString() {
-    return value;
-  }
+    @Override
+    public String toString() {
+        return value;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/UserIdCollectionMode.java b/internal-api/src/main/java/datadog/trace/api/UserIdCollectionMode.java
index cf2651405cd..0b50ae0eb07 100644
--- a/internal-api/src/main/java/datadog/trace/api/UserIdCollectionMode.java
+++ b/internal-api/src/main/java/datadog/trace/api/UserIdCollectionMode.java
@@ -3,81 +3,78 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 public enum UserIdCollectionMode {
-  IDENTIFICATION("identification", "ident"),
-  ANONYMIZATION("anonymization", "anon"),
-  DISABLED("disabled"),
-  SDK("sdk");
+    IDENTIFICATION("identification", "ident"),
+    ANONYMIZATION("anonymization", "anon"),
+    DISABLED("disabled"),
+    SDK("sdk");
 
-  private static final AtomicReference<UserIdCollectionMode> CURRENT_MODE =
-      new AtomicReference<>(IDENTIFICATION);
+    private static final AtomicReference<UserIdCollectionMode> CURRENT_MODE = new AtomicReference<>(IDENTIFICATION);
 
-  private final String[] values;
+    private final String[] values;
 
-  UserIdCollectionMode(final String... values) {
-    this.values = values;
-  }
+    UserIdCollectionMode(final String... values) {
+        this.values = values;
+    }
 
-  public static UserIdCollectionMode fromString(String collectionMode, String trackingMode) {
-    return CURRENT_MODE.updateAndGet(
-        current -> {
-          if (collectionMode == null && trackingMode != null) {
-            return fromTracking(trackingMode);
-          } else {
-            return fromMode(collectionMode);
-          }
+    public static UserIdCollectionMode fromString(String collectionMode, String trackingMode) {
+        return CURRENT_MODE.updateAndGet(current -> {
+            if (collectionMode == null && trackingMode != null) {
+                return fromTracking(trackingMode);
+            } else {
+                return fromMode(collectionMode);
+            }
         });
-  }
+    }
 
-  public static UserIdCollectionMode fromRemoteConfig(final String mode) {
-    return CURRENT_MODE.updateAndGet(
-        current -> {
-          if (mode == null) {
-            // use locally configured value
-            return Config.get().getAppSecUserIdCollectionMode();
-          } else {
-            return fromMode(mode);
-          }
+    public static UserIdCollectionMode fromRemoteConfig(final String mode) {
+        return CURRENT_MODE.updateAndGet(current -> {
+            if (mode == null) {
+                // use locally configured value
+                return Config.get().getAppSecUserIdCollectionMode();
+            } else {
+                return fromMode(mode);
+            }
         });
-  }
-
-  private static UserIdCollectionMode fromMode(String mode) {
-    if (mode == null || IDENTIFICATION.matches(mode)) {
-      return IDENTIFICATION;
-    } else if (ANONYMIZATION.matches(mode)) {
-      return ANONYMIZATION;
     }
-    return DISABLED;
-  }
 
-  private static UserIdCollectionMode fromTracking(String tracking) {
-    switch (UserEventTrackingMode.fromString(tracking)) {
-      case SAFE:
-        return ANONYMIZATION;
-      case EXTENDED:
-        return IDENTIFICATION;
-      default:
+    private static UserIdCollectionMode fromMode(String mode) {
+        if (mode == null || IDENTIFICATION.matches(mode)) {
+            return IDENTIFICATION;
+        } else if (ANONYMIZATION.matches(mode)) {
+            return ANONYMIZATION;
+        }
         return DISABLED;
     }
-  }
 
-  private boolean matches(final String mode) {
-    for (String value : values) {
-      if (value.equalsIgnoreCase(mode)) {
-        return true;
-      }
+    private static UserIdCollectionMode fromTracking(String tracking) {
+        switch (UserEventTrackingMode.fromString(tracking)) {
+            case SAFE:
+                return ANONYMIZATION;
+            case EXTENDED:
+                return IDENTIFICATION;
+            default:
+                return DISABLED;
+        }
+    }
+
+    private boolean matches(final String mode) {
+        for (String value : values) {
+            if (value.equalsIgnoreCase(mode)) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 
-  public String fullName() {
-    return values[0];
-  }
+    public String fullName() {
+        return values[0];
+    }
 
-  public String shortName() {
-    return values[values.length - 1];
-  }
+    public String shortName() {
+        return values[values.length - 1];
+    }
 
-  public static UserIdCollectionMode get() {
-    return CURRENT_MODE.get();
-  }
+    public static UserIdCollectionMode get() {
+        return CURRENT_MODE.get();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/WellKnownTags.java b/internal-api/src/main/java/datadog/trace/api/WellKnownTags.java
index fa00fea11cb..46c36a2e733 100644
--- a/internal-api/src/main/java/datadog/trace/api/WellKnownTags.java
+++ b/internal-api/src/main/java/datadog/trace/api/WellKnownTags.java
@@ -4,66 +4,66 @@
 
 public class WellKnownTags {
 
-  private final UTF8BytesString runtimeId;
-  private final UTF8BytesString hostname;
-  private final UTF8BytesString env;
-  private final UTF8BytesString service;
-  private final UTF8BytesString version;
-  private final UTF8BytesString language;
+    private final UTF8BytesString runtimeId;
+    private final UTF8BytesString hostname;
+    private final UTF8BytesString env;
+    private final UTF8BytesString service;
+    private final UTF8BytesString version;
+    private final UTF8BytesString language;
 
-  public WellKnownTags(
-      CharSequence runtimeId,
-      CharSequence hostname,
-      CharSequence env,
-      CharSequence service,
-      CharSequence version,
-      CharSequence language) {
-    this.runtimeId = UTF8BytesString.create(runtimeId);
-    this.hostname = UTF8BytesString.create(hostname);
-    this.env = UTF8BytesString.create(env);
-    this.service = UTF8BytesString.create(service);
-    this.version = UTF8BytesString.create(version);
-    this.language = UTF8BytesString.create(language);
-  }
+    public WellKnownTags(
+            CharSequence runtimeId,
+            CharSequence hostname,
+            CharSequence env,
+            CharSequence service,
+            CharSequence version,
+            CharSequence language) {
+        this.runtimeId = UTF8BytesString.create(runtimeId);
+        this.hostname = UTF8BytesString.create(hostname);
+        this.env = UTF8BytesString.create(env);
+        this.service = UTF8BytesString.create(service);
+        this.version = UTF8BytesString.create(version);
+        this.language = UTF8BytesString.create(language);
+    }
 
-  public UTF8BytesString getRuntimeId() {
-    return runtimeId;
-  }
+    public UTF8BytesString getRuntimeId() {
+        return runtimeId;
+    }
 
-  public UTF8BytesString getHostname() {
-    return hostname;
-  }
+    public UTF8BytesString getHostname() {
+        return hostname;
+    }
 
-  public UTF8BytesString getEnv() {
-    return env;
-  }
+    public UTF8BytesString getEnv() {
+        return env;
+    }
 
-  public UTF8BytesString getService() {
-    return service;
-  }
+    public UTF8BytesString getService() {
+        return service;
+    }
 
-  public UTF8BytesString getVersion() {
-    return version;
-  }
+    public UTF8BytesString getVersion() {
+        return version;
+    }
 
-  public UTF8BytesString getLanguage() {
-    return language;
-  }
+    public UTF8BytesString getLanguage() {
+        return language;
+    }
 
-  public String toString() {
-    return "WellKnownTags{"
-        + "runtimeId="
-        + runtimeId
-        + ", hostname="
-        + hostname
-        + ", env="
-        + env
-        + ", service="
-        + service
-        + ", version="
-        + version
-        + ", language="
-        + language
-        + "}";
-  }
+    public String toString() {
+        return "WellKnownTags{"
+                + "runtimeId="
+                + runtimeId
+                + ", hostname="
+                + hostname
+                + ", env="
+                + env
+                + ", service="
+                + service
+                + ", version="
+                + version
+                + ", language="
+                + language
+                + "}";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/WithGlobalTracer.java b/internal-api/src/main/java/datadog/trace/api/WithGlobalTracer.java
index 6e11d5d7b65..fa9e96cf0a7 100644
--- a/internal-api/src/main/java/datadog/trace/api/WithGlobalTracer.java
+++ b/internal-api/src/main/java/datadog/trace/api/WithGlobalTracer.java
@@ -13,29 +13,28 @@
  * writing the only code doing it is the various MDC log injection instrumentations.
  */
 public class WithGlobalTracer {
-  private static final Logger log = LoggerFactory.getLogger(WithGlobalTracer.class);
+    private static final Logger log = LoggerFactory.getLogger(WithGlobalTracer.class);
 
-  private WithGlobalTracer() {}
+    private WithGlobalTracer() {}
 
-  /**
-   * Register a callback to be run when the global tracer is installed, or execute it right now if
-   * the tracer is already installed.
-   */
-  public static void registerOrExecute(final Callback callback) {
-    GlobalTracer.registerInstallationCallback(
-        new GlobalTracer.Callback() {
-          @Override
-          public void installed(Tracer tracer) {
-            if (tracer instanceof TracerAPI) {
-              callback.withTracer((TracerAPI) tracer);
-            } else {
-              log.warn("Unsupported tracer type {}", tracer.getClass().getName());
+    /**
+     * Register a callback to be run when the global tracer is installed, or execute it right now if
+     * the tracer is already installed.
+     */
+    public static void registerOrExecute(final Callback callback) {
+        GlobalTracer.registerInstallationCallback(new GlobalTracer.Callback() {
+            @Override
+            public void installed(Tracer tracer) {
+                if (tracer instanceof TracerAPI) {
+                    callback.withTracer((TracerAPI) tracer);
+                } else {
+                    log.warn("Unsupported tracer type {}", tracer.getClass().getName());
+                }
             }
-          }
         });
-  }
+    }
 
-  public interface Callback {
-    void withTracer(TracerAPI tracer);
-  }
+    public interface Callback {
+        void withTracer(TracerAPI tracer);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/appsec/AppSecContext.java b/internal-api/src/main/java/datadog/trace/api/appsec/AppSecContext.java
index 8d45f83d413..eca56cfe83f 100644
--- a/internal-api/src/main/java/datadog/trace/api/appsec/AppSecContext.java
+++ b/internal-api/src/main/java/datadog/trace/api/appsec/AppSecContext.java
@@ -2,8 +2,8 @@
 
 /** Minimal view of the AppSec request context accessible across module boundaries. */
 public interface AppSecContext {
-  boolean isManuallyKept();
+    boolean isManuallyKept();
 
-  /** Reports that an attempted AppSec block could not be committed or enforced. */
-  void reportBlockFailure();
+    /** Reports that an attempted AppSec block could not be committed or enforced. */
+    void reportBlockFailure();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/appsec/AppSecEventTracker.java b/internal-api/src/main/java/datadog/trace/api/appsec/AppSecEventTracker.java
index 8fb38b7cebb..425c714a6c7 100644
--- a/internal-api/src/main/java/datadog/trace/api/appsec/AppSecEventTracker.java
+++ b/internal-api/src/main/java/datadog/trace/api/appsec/AppSecEventTracker.java
@@ -45,382 +45,375 @@
 
 public class AppSecEventTracker extends EventTracker implements UserService {
 
-  private static final int HASH_SIZE_BYTES = 16; // 128 bits
-  private static final String ANON_PREFIX = "anon_";
-
-  private static final Map<String, LoginEvent> EVENT_MAPPING;
-
-  private static final String LOGIN_SUCCESS_EVENT = "users.login.success";
-  private static final String LOGIN_FAILURE_EVENT = "users.login.failure";
-  private static final String SIGNUP_EVENT = "users.signup";
-
-  static {
-    EVENT_MAPPING = new HashMap<>();
-    EVENT_MAPPING.put(LOGIN_SUCCESS_EVENT, LOGIN_SUCCESS);
-    EVENT_MAPPING.put(LOGIN_FAILURE_EVENT, LoginEvent.LOGIN_FAILURE);
-    EVENT_MAPPING.put(SIGNUP_EVENT, LoginEvent.SIGN_UP);
-  }
-
-  private static final String COLLECTION_MODE = "_dd.appsec.user.collection_mode";
-
-  public static void install() {
-    final AppSecEventTracker tracker = new AppSecEventTracker();
-    GlobalTracer.setEventTracker(tracker);
-    EventTrackerV2.setEventTrackerService(tracker.v2Service);
-    User.setUserService(tracker);
-  }
-
-  /**
-   * The v2 SDK surface, kept separate from the v1 {@link EventTracker} surface this class extends.
-   * {@code trackCustomEvent} has an identical signature on both APIs, so a single implementation
-   * cannot tell which one the caller used; routing v2 calls through this adapter lets each API
-   * report its own version to telemetry.
-   */
-  private final EventTrackerService v2Service =
-      new EventTrackerService() {
+    private static final int HASH_SIZE_BYTES = 16; // 128 bits
+    private static final String ANON_PREFIX = "anon_";
+
+    private static final Map<String, LoginEvent> EVENT_MAPPING;
+
+    private static final String LOGIN_SUCCESS_EVENT = "users.login.success";
+    private static final String LOGIN_FAILURE_EVENT = "users.login.failure";
+    private static final String SIGNUP_EVENT = "users.signup";
+
+    static {
+        EVENT_MAPPING = new HashMap<>();
+        EVENT_MAPPING.put(LOGIN_SUCCESS_EVENT, LOGIN_SUCCESS);
+        EVENT_MAPPING.put(LOGIN_FAILURE_EVENT, LoginEvent.LOGIN_FAILURE);
+        EVENT_MAPPING.put(SIGNUP_EVENT, LoginEvent.SIGN_UP);
+    }
+
+    private static final String COLLECTION_MODE = "_dd.appsec.user.collection_mode";
+
+    public static void install() {
+        final AppSecEventTracker tracker = new AppSecEventTracker();
+        GlobalTracer.setEventTracker(tracker);
+        EventTrackerV2.setEventTrackerService(tracker.v2Service);
+        User.setUserService(tracker);
+    }
+
+    /**
+     * The v2 SDK surface, kept separate from the v1 {@link EventTracker} surface this class extends.
+     * {@code trackCustomEvent} has an identical signature on both APIs, so a single implementation
+     * cannot tell which one the caller used; routing v2 calls through this adapter lets each API
+     * report its own version to telemetry.
+     */
+    private final EventTrackerService v2Service = new EventTrackerService() {
         @Override
-        public void trackUserLoginSuccess(
-            final String login, final String userId, final Map<String, String> metadata) {
-          if (login == null || login.isEmpty()) {
-            throw new IllegalArgumentException("login is null or empty");
-          }
-          WafMetricCollector.get().appSecSdkEvent(LOGIN_SUCCESS, V2);
-          if (handleLoginEvent(V2, LOGIN_SUCCESS_EVENT, SDK, login, userId, null, metadata)) {
-            throw new BlockingException("Blocked request (for login success)");
-          }
+        public void trackUserLoginSuccess(final String login, final String userId, final Map<String, String> metadata) {
+            if (login == null || login.isEmpty()) {
+                throw new IllegalArgumentException("login is null or empty");
+            }
+            WafMetricCollector.get().appSecSdkEvent(LOGIN_SUCCESS, V2);
+            if (handleLoginEvent(V2, LOGIN_SUCCESS_EVENT, SDK, login, userId, null, metadata)) {
+                throw new BlockingException("Blocked request (for login success)");
+            }
         }
 
         @Override
         public void trackUserLoginFailure(
-            final String login, final boolean exists, final Map<String, String> metadata) {
-          if (login == null || login.isEmpty()) {
-            throw new IllegalArgumentException("login is null or empty");
-          }
-          WafMetricCollector.get().appSecSdkEvent(LOGIN_FAILURE, V2);
-          if (handleLoginEvent(V2, LOGIN_FAILURE_EVENT, SDK, login, null, exists, metadata)) {
-            throw new BlockingException("Blocked request (for login failure)");
-          }
+                final String login, final boolean exists, final Map<String, String> metadata) {
+            if (login == null || login.isEmpty()) {
+                throw new IllegalArgumentException("login is null or empty");
+            }
+            WafMetricCollector.get().appSecSdkEvent(LOGIN_FAILURE, V2);
+            if (handleLoginEvent(V2, LOGIN_FAILURE_EVENT, SDK, login, null, exists, metadata)) {
+                throw new BlockingException("Blocked request (for login failure)");
+            }
         }
 
         @Override
         public void trackCustomEvent(final String eventName, final Map<String, String> metadata) {
-          AppSecEventTracker.this.trackCustomEvent(eventName, metadata, V2);
+            AppSecEventTracker.this.trackCustomEvent(eventName, metadata, V2);
         }
-      };
-
-  /** Returns the v2 SDK implementation to register with {@link EventTrackerV2}. */
-  public final EventTrackerService v2EventTrackerService() {
-    return v2Service;
-  }
+    };
 
-  @Override
-  public final void trackLoginSuccessEvent(String userId, Map<String, String> metadata) {
-    if (userId == null || userId.isEmpty()) {
-      throw new IllegalArgumentException("userId is null or empty");
+    /** Returns the v2 SDK implementation to register with {@link EventTrackerV2}. */
+    public final EventTrackerService v2EventTrackerService() {
+        return v2Service;
     }
-    WafMetricCollector.get().appSecSdkEvent(LOGIN_SUCCESS, V1);
-    if (handleLoginEvent(V1, LOGIN_SUCCESS_EVENT, SDK, userId, userId, null, metadata)) {
-      throw new BlockingException("Blocked request (for login success)");
-    }
-  }
 
-  @Override
-  public final void trackLoginFailureEvent(
-      String userId, boolean exists, Map<String, String> metadata) {
-    if (userId == null || userId.isEmpty()) {
-      throw new IllegalArgumentException("userId is null or empty");
-    }
-    WafMetricCollector.get().appSecSdkEvent(LOGIN_FAILURE, V1);
-    if (handleLoginEvent(V1, LOGIN_FAILURE_EVENT, SDK, userId, userId, exists, metadata)) {
-      throw new BlockingException("Blocked request (for login failure)");
-    }
-  }
-
-  @SuppressWarnings("deprecation")
-  @Override
-  public final void trackCustomEvent(String eventName, Map<String, String> metadata) {
-    trackCustomEvent(eventName, metadata, V1);
-  }
-
-  private void trackCustomEvent(
-      final String eventName, final Map<String, String> metadata, final LoginVersion version) {
-    if (eventName == null || eventName.isEmpty()) {
-      throw new IllegalArgumentException("eventName is null or empty");
-    }
-    WafMetricCollector.get().appSecSdkEvent(CUSTOM, version);
-    if (handleLoginEvent(version, eventName, SDK, null, null, null, metadata)) {
-      throw new BlockingException("Blocked request (for custom event)");
+    @Override
+    public final void trackLoginSuccessEvent(String userId, Map<String, String> metadata) {
+        if (userId == null || userId.isEmpty()) {
+            throw new IllegalArgumentException("userId is null or empty");
+        }
+        WafMetricCollector.get().appSecSdkEvent(LOGIN_SUCCESS, V1);
+        if (handleLoginEvent(V1, LOGIN_SUCCESS_EVENT, SDK, userId, userId, null, metadata)) {
+            throw new BlockingException("Blocked request (for login success)");
+        }
     }
-  }
 
-  @Override
-  public void trackUserEvent(final String userId, final Map<String, String> metadata) {
-    if (userId == null || userId.isEmpty()) {
-      throw new IllegalArgumentException("userId is null or empty");
-    }
-    if (handleUser(SDK, userId, metadata)) {
-      throw new BlockingException("Blocked request (for user)");
+    @Override
+    public final void trackLoginFailureEvent(String userId, boolean exists, Map<String, String> metadata) {
+        if (userId == null || userId.isEmpty()) {
+            throw new IllegalArgumentException("userId is null or empty");
+        }
+        WafMetricCollector.get().appSecSdkEvent(LOGIN_FAILURE, V1);
+        if (handleLoginEvent(V1, LOGIN_FAILURE_EVENT, SDK, userId, userId, exists, metadata)) {
+            throw new BlockingException("Blocked request (for login failure)");
+        }
     }
-  }
 
-  public void onUserEvent(final UserIdCollectionMode mode, final String userId) {
-    onUserEvent(mode, userId, emptyMap());
-  }
-
-  public void onUserEvent(
-      final UserIdCollectionMode mode, final String userId, final Map<String, String> metadata) {
-    if (handleUser(mode, userId, metadata)) {
-      throw new BlockingException("Blocked request (for user)");
+    @SuppressWarnings("deprecation")
+    @Override
+    public final void trackCustomEvent(String eventName, Map<String, String> metadata) {
+        trackCustomEvent(eventName, metadata, V1);
     }
-  }
 
-  public void onUserNotFound(final UserIdCollectionMode mode) {
-    if (handleLoginEvent(AUTO, LOGIN_FAILURE_EVENT, mode, null, null, false, null)) {
-      throw new BlockingException("Blocked request (for user not found)");
-    }
-  }
-
-  public void onSignupEvent(
-      final UserIdCollectionMode mode, final String login, final Map<String, String> metadata) {
-    onSignupEvent(mode, login, null, metadata);
-  }
-
-  public void onSignupEvent(
-      final UserIdCollectionMode mode,
-      final String login,
-      final String userId,
-      final Map<String, String> metadata) {
-    if (handleLoginEvent(AUTO, SIGNUP_EVENT, mode, login, userId, null, metadata)) {
-      throw new BlockingException("Blocked request (for signup)");
-    }
-  }
-
-  public void onLoginSuccessEvent(
-      final UserIdCollectionMode mode, final String login, final Map<String, String> metadata) {
-    onLoginSuccessEvent(mode, login, null, metadata);
-  }
-
-  public void onLoginSuccessEvent(
-      final UserIdCollectionMode mode,
-      final String login,
-      final String user,
-      final Map<String, String> metadata) {
-    if (handleLoginEvent(AUTO, LOGIN_SUCCESS_EVENT, mode, login, user, null, metadata)) {
-      throw new BlockingException("Blocked request (for login success)");
-    }
-  }
-
-  public void onLoginFailureEvent(
-      final UserIdCollectionMode mode,
-      final String login,
-      final Boolean exists,
-      final Map<String, String> metadata) {
-    if (handleLoginEvent(AUTO, LOGIN_FAILURE_EVENT, mode, login, null, exists, metadata)) {
-      throw new BlockingException("Blocked request (for login failure)");
-    }
-  }
-
-  /**
-   * Takes care of the logged-in user and returns {@code true} if execution must be halted due to a
-   * blocking action
-   */
-  private boolean handleUser(
-      final UserIdCollectionMode mode, final String userId, final Map<String, String> metadata) {
-    if (!isEnabled(mode)) {
-      return false;
-    }
-    final AgentTracer.TracerAPI tracer = tracer();
-    if (tracer == null) {
-      return false;
-    }
-    final TraceSegment segment = tracer.getTraceSegment();
-    if (segment == null) {
-      return false;
+    private void trackCustomEvent(
+            final String eventName, final Map<String, String> metadata, final LoginVersion version) {
+        if (eventName == null || eventName.isEmpty()) {
+            throw new IllegalArgumentException("eventName is null or empty");
+        }
+        WafMetricCollector.get().appSecSdkEvent(CUSTOM, version);
+        if (handleLoginEvent(version, eventName, SDK, null, null, null, metadata)) {
+            throw new BlockingException("Blocked request (for custom event)");
+        }
     }
-    final String finalUserId = anonymize(mode, userId);
-    if (finalUserId == null) {
-      return false; // could not anonymize the user
+
+    @Override
+    public void trackUserEvent(final String userId, final Map<String, String> metadata) {
+        if (userId == null || userId.isEmpty()) {
+            throw new IllegalArgumentException("userId is null or empty");
+        }
+        if (handleUser(SDK, userId, metadata)) {
+            throw new BlockingException("Blocked request (for user)");
+        }
     }
-    if (mode != SDK) {
-      segment.setTagTop("_dd.appsec.usr.id", finalUserId);
+
+    public void onUserEvent(final UserIdCollectionMode mode, final String userId) {
+        onUserEvent(mode, userId, emptyMap());
     }
-    if (isNewUser(mode, segment)) {
-      segment.setTagTop("usr.id", finalUserId);
-      if (metadata != null && !metadata.isEmpty()) {
-        segment.setTagTop("usr", metadata);
-      }
-      segment.setTagTop(COLLECTION_MODE, mode.fullName());
-      segment.setTagTop(Tags.ASM_KEEP, true);
-      segment.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
-      return dispatch(tracer, EVENTS.user(), (ctx, cb) -> cb.apply(ctx, finalUserId));
+
+    public void onUserEvent(final UserIdCollectionMode mode, final String userId, final Map<String, String> metadata) {
+        if (handleUser(mode, userId, metadata)) {
+            throw new BlockingException("Blocked request (for user)");
+        }
     }
-    return false;
-  }
-
-  /**
-   * Takes care of a login event and returns {@code true} if execution must be halted due to a
-   * blocking action
-   */
-  private boolean handleLoginEvent(
-      final LoginVersion version,
-      final String eventName,
-      final UserIdCollectionMode mode,
-      final String login,
-      final String userId,
-      final Boolean exists,
-      final Map<String, String> metadata) {
-    if (!isEnabled(mode)) {
-      return false;
+
+    public void onUserNotFound(final UserIdCollectionMode mode) {
+        if (handleLoginEvent(AUTO, LOGIN_FAILURE_EVENT, mode, null, null, false, null)) {
+            throw new BlockingException("Blocked request (for user not found)");
+        }
     }
-    final AgentTracer.TracerAPI tracer = tracer();
-    if (tracer == null) {
-      return false;
+
+    public void onSignupEvent(final UserIdCollectionMode mode, final String login, final Map<String, String> metadata) {
+        onSignupEvent(mode, login, null, metadata);
     }
-    final TraceSegment segment = tracer.getTraceSegment();
-    if (segment == null) {
-      return false;
+
+    public void onSignupEvent(
+            final UserIdCollectionMode mode,
+            final String login,
+            final String userId,
+            final Map<String, String> metadata) {
+        if (handleLoginEvent(AUTO, SIGNUP_EVENT, mode, login, userId, null, metadata)) {
+            throw new BlockingException("Blocked request (for signup)");
+        }
     }
-    boolean block = false;
-    final String finalLogin = anonymize(mode, login);
-    if (finalLogin == null && login != null) {
-      return false; // could not anonymize the login
+
+    public void onLoginSuccessEvent(
+            final UserIdCollectionMode mode, final String login, final Map<String, String> metadata) {
+        onLoginSuccessEvent(mode, login, null, metadata);
     }
-    if (mode == SDK) {
-      segment.setTagTop("_dd.appsec.events." + eventName + ".sdk", true, true);
-    } else {
-      if (finalLogin != null) {
-        segment.setTagTop("_dd.appsec.usr.login", finalLogin);
-      }
-      segment.setTagTop("_dd.appsec.events." + eventName + ".auto.mode", mode.fullName(), true);
+
+    public void onLoginSuccessEvent(
+            final UserIdCollectionMode mode,
+            final String login,
+            final String user,
+            final Map<String, String> metadata) {
+        if (handleLoginEvent(AUTO, LOGIN_SUCCESS_EVENT, mode, login, user, null, metadata)) {
+            throw new BlockingException("Blocked request (for login success)");
+        }
     }
-    final LoginEvent event = EVENT_MAPPING.get(eventName);
-    if (isNewLoginEvent(mode, segment, eventName)) {
-      if (finalLogin != null) {
-        segment.setTagTop("appsec.events." + eventName + ".usr.login", finalLogin, true);
-      }
-      if (metadata != null && !metadata.isEmpty()) {
-        segment.setTagTop("appsec.events." + eventName, metadata, true);
-      }
-      if (exists != null) {
-        segment.setTagTop("appsec.events." + eventName + ".usr.exists", exists, true);
-      }
-      segment.setTagTop("appsec.events." + eventName + ".track", true, true);
-      segment.setTagTop(Tags.ASM_KEEP, true);
-      segment.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
-
-      if (finalLogin != null && event != null) {
-        block =
-            dispatch(tracer, EVENTS.loginEvent(), (ctx, cb) -> cb.apply(ctx, event, finalLogin));
-      }
+
+    public void onLoginFailureEvent(
+            final UserIdCollectionMode mode,
+            final String login,
+            final Boolean exists,
+            final Map<String, String> metadata) {
+        if (handleLoginEvent(AUTO, LOGIN_FAILURE_EVENT, mode, login, null, exists, metadata)) {
+            throw new BlockingException("Blocked request (for login failure)");
+        }
     }
-    if (userId != null) {
-      boolean blockUser;
-      if (version == V2) {
-        segment.setTagTop("appsec.events." + eventName + ".usr.id", userId, true);
-        if (metadata != null && !metadata.isEmpty()) {
-          segment.setTagTop("appsec.events." + eventName + ".usr", metadata, true);
-        }
-        blockUser = handleUser(mode, userId, metadata);
-      } else {
-        if (event == LOGIN_SUCCESS) {
-          segment.setTagTop("usr.id", userId);
+
+    /**
+     * Takes care of the logged-in user and returns {@code true} if execution must be halted due to a
+     * blocking action
+     */
+    private boolean handleUser(
+            final UserIdCollectionMode mode, final String userId, final Map<String, String> metadata) {
+        if (!isEnabled(mode)) {
+            return false;
+        }
+        final AgentTracer.TracerAPI tracer = tracer();
+        if (tracer == null) {
+            return false;
+        }
+        final TraceSegment segment = tracer.getTraceSegment();
+        if (segment == null) {
+            return false;
+        }
+        final String finalUserId = anonymize(mode, userId);
+        if (finalUserId == null) {
+            return false; // could not anonymize the user
+        }
+        if (mode != SDK) {
+            segment.setTagTop("_dd.appsec.usr.id", finalUserId);
+        }
+        if (isNewUser(mode, segment)) {
+            segment.setTagTop("usr.id", finalUserId);
+            if (metadata != null && !metadata.isEmpty()) {
+                segment.setTagTop("usr", metadata);
+            }
+            segment.setTagTop(COLLECTION_MODE, mode.fullName());
+            segment.setTagTop(Tags.ASM_KEEP, true);
+            segment.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
+            return dispatch(tracer, EVENTS.user(), (ctx, cb) -> cb.apply(ctx, finalUserId));
+        }
+        return false;
+    }
+
+    /**
+     * Takes care of a login event and returns {@code true} if execution must be halted due to a
+     * blocking action
+     */
+    private boolean handleLoginEvent(
+            final LoginVersion version,
+            final String eventName,
+            final UserIdCollectionMode mode,
+            final String login,
+            final String userId,
+            final Boolean exists,
+            final Map<String, String> metadata) {
+        if (!isEnabled(mode)) {
+            return false;
+        }
+        final AgentTracer.TracerAPI tracer = tracer();
+        if (tracer == null) {
+            return false;
+        }
+        final TraceSegment segment = tracer.getTraceSegment();
+        if (segment == null) {
+            return false;
+        }
+        boolean block = false;
+        final String finalLogin = anonymize(mode, login);
+        if (finalLogin == null && login != null) {
+            return false; // could not anonymize the login
+        }
+        if (mode == SDK) {
+            segment.setTagTop("_dd.appsec.events." + eventName + ".sdk", true, true);
         } else {
-          segment.setTagTop("appsec.events." + eventName + ".usr.id", userId, true);
+            if (finalLogin != null) {
+                segment.setTagTop("_dd.appsec.usr.login", finalLogin);
+            }
+            segment.setTagTop("_dd.appsec.events." + eventName + ".auto.mode", mode.fullName(), true);
+        }
+        final LoginEvent event = EVENT_MAPPING.get(eventName);
+        if (isNewLoginEvent(mode, segment, eventName)) {
+            if (finalLogin != null) {
+                segment.setTagTop("appsec.events." + eventName + ".usr.login", finalLogin, true);
+            }
+            if (metadata != null && !metadata.isEmpty()) {
+                segment.setTagTop("appsec.events." + eventName, metadata, true);
+            }
+            if (exists != null) {
+                segment.setTagTop("appsec.events." + eventName + ".usr.exists", exists, true);
+            }
+            segment.setTagTop("appsec.events." + eventName + ".track", true, true);
+            segment.setTagTop(Tags.ASM_KEEP, true);
+            segment.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
+
+            if (finalLogin != null && event != null) {
+                block = dispatch(tracer, EVENTS.loginEvent(), (ctx, cb) -> cb.apply(ctx, event, finalLogin));
+            }
+        }
+        if (userId != null) {
+            boolean blockUser;
+            if (version == V2) {
+                segment.setTagTop("appsec.events." + eventName + ".usr.id", userId, true);
+                if (metadata != null && !metadata.isEmpty()) {
+                    segment.setTagTop("appsec.events." + eventName + ".usr", metadata, true);
+                }
+                blockUser = handleUser(mode, userId, metadata);
+            } else {
+                if (event == LOGIN_SUCCESS) {
+                    segment.setTagTop("usr.id", userId);
+                } else {
+                    segment.setTagTop("appsec.events." + eventName + ".usr.id", userId, true);
+                }
+                blockUser = dispatch(tracer, EVENTS.user(), (ctx, cb) -> cb.apply(ctx, userId));
+            }
+            block |= blockUser;
         }
-        blockUser = dispatch(tracer, EVENTS.user(), (ctx, cb) -> cb.apply(ctx, userId));
-      }
-      block |= blockUser;
+        return block;
     }
-    return block;
-  }
 
-  private boolean isNewLoginEvent(
-      final UserIdCollectionMode mode, final TraceSegment segment, final String event) {
-    if (mode == SDK) {
-      return true;
+    private boolean isNewLoginEvent(final UserIdCollectionMode mode, final TraceSegment segment, final String event) {
+        if (mode == SDK) {
+            return true;
+        }
+        return segment.getTagTop("_dd.appsec.events." + event + ".sdk") == null;
     }
-    return segment.getTagTop("_dd.appsec.events." + event + ".sdk") == null;
-  }
 
-  private boolean isNewUser(final UserIdCollectionMode mode, final TraceSegment segment) {
-    if (mode == SDK) {
-      return true;
-    }
-    final Object value = segment.getTagTop(COLLECTION_MODE);
-    return value == null || !"sdk".equalsIgnoreCase(value.toString());
-  }
-
-  /**
-   * Dispatch the selected event and return {@code true} if the execution must be halted due to a
-   * block action
-   */
-  private <T> boolean dispatch(
-      final AgentTracer.TracerAPI tracer,
-      final EventType<T> event,
-      final BiFunction<RequestContext, T, Flow<Void>> consumer) {
-    if (tracer == null) {
-      return false;
-    }
-    final CallbackProvider cbp = tracer.getCallbackProvider(RequestContextSlot.APPSEC);
-    if (cbp == null) {
-      return false;
-    }
-    final AgentSpan span = tracer.activeSpan();
-    if (span == null) {
-      return false;
-    }
-    final RequestContext ctx = span.getRequestContext();
-    if (ctx == null) {
-      return false;
-    }
-    final T callback = cbp.getCallback(event);
-    if (callback == null) {
-      return false;
-    }
-    final Flow<Void> flow = consumer.apply(ctx, callback);
-    if (flow == null) {
-      return false;
-    }
-    final Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      final BlockResponseFunction brf = ctx.getBlockResponseFunction();
-      if (brf != null) {
-        Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-        brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
-      }
-      return true;
+    private boolean isNewUser(final UserIdCollectionMode mode, final TraceSegment segment) {
+        if (mode == SDK) {
+            return true;
+        }
+        final Object value = segment.getTagTop(COLLECTION_MODE);
+        return value == null || !"sdk".equalsIgnoreCase(value.toString());
+    }
+
+    /**
+     * Dispatch the selected event and return {@code true} if the execution must be halted due to a
+     * block action
+     */
+    private <T> boolean dispatch(
+            final AgentTracer.TracerAPI tracer,
+            final EventType<T> event,
+            final BiFunction<RequestContext, T, Flow<Void>> consumer) {
+        if (tracer == null) {
+            return false;
+        }
+        final CallbackProvider cbp = tracer.getCallbackProvider(RequestContextSlot.APPSEC);
+        if (cbp == null) {
+            return false;
+        }
+        final AgentSpan span = tracer.activeSpan();
+        if (span == null) {
+            return false;
+        }
+        final RequestContext ctx = span.getRequestContext();
+        if (ctx == null) {
+            return false;
+        }
+        final T callback = cbp.getCallback(event);
+        if (callback == null) {
+            return false;
+        }
+        final Flow<Void> flow = consumer.apply(ctx, callback);
+        if (flow == null) {
+            return false;
+        }
+        final Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            final BlockResponseFunction brf = ctx.getBlockResponseFunction();
+            if (brf != null) {
+                Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
+            }
+            return true;
+        }
+        return false;
     }
-    return false;
-  }
 
-  protected static String anonymize(final UserIdCollectionMode mode, final String userId) {
-    if (mode != ANONYMIZATION || userId == null) {
-      return userId;
-    }
-    MessageDigest digest;
-    try {
-      // A new instance is needed each time for thread safety.
-      // Per micro-benchmarks, the overhead of getInstance() is negligible.
-      digest = MessageDigest.getInstance("SHA-256");
-    } catch (NoSuchAlgorithmException e) {
-      return null;
-    }
-    digest.update(userId.getBytes(StandardCharsets.UTF_8));
-    byte[] hash = digest.digest();
-    if (hash.length > HASH_SIZE_BYTES) {
-      byte[] temp = new byte[HASH_SIZE_BYTES];
-      System.arraycopy(hash, 0, temp, 0, temp.length);
-      hash = temp;
+    protected static String anonymize(final UserIdCollectionMode mode, final String userId) {
+        if (mode != ANONYMIZATION || userId == null) {
+            return userId;
+        }
+        MessageDigest digest;
+        try {
+            // A new instance is needed each time for thread safety.
+            // Per micro-benchmarks, the overhead of getInstance() is negligible.
+            digest = MessageDigest.getInstance("SHA-256");
+        } catch (NoSuchAlgorithmException e) {
+            return null;
+        }
+        digest.update(userId.getBytes(StandardCharsets.UTF_8));
+        byte[] hash = digest.digest();
+        if (hash.length > HASH_SIZE_BYTES) {
+            byte[] temp = new byte[HASH_SIZE_BYTES];
+            System.arraycopy(hash, 0, temp, 0, temp.length);
+            hash = temp;
+        }
+        return ANON_PREFIX + toHexString(hash);
     }
-    return ANON_PREFIX + toHexString(hash);
-  }
 
-  protected boolean isEnabled(final UserIdCollectionMode mode) {
-    return mode == SDK || (ActiveSubsystems.APPSEC_ACTIVE && mode != DISABLED);
-  }
+    protected boolean isEnabled(final UserIdCollectionMode mode) {
+        return mode == SDK || (ActiveSubsystems.APPSEC_ACTIVE && mode != DISABLED);
+    }
 
-  // Extract this to allow for easier testing
-  protected AgentTracer.TracerAPI tracer() {
-    return AgentTracer.get();
-  }
+    // Extract this to allow for easier testing
+    protected AgentTracer.TracerAPI tracer() {
+        return AgentTracer.get();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/appsec/HttpClientPayload.java b/internal-api/src/main/java/datadog/trace/api/appsec/HttpClientPayload.java
index 9be785a1037..1c3fe90c365 100644
--- a/internal-api/src/main/java/datadog/trace/api/appsec/HttpClientPayload.java
+++ b/internal-api/src/main/java/datadog/trace/api/appsec/HttpClientPayload.java
@@ -6,34 +6,34 @@
 
 public abstract class HttpClientPayload {
 
-  private final long requestId;
-  private final Map<String, List<String>> headers;
-  private MediaType contentType;
-  private InputStream body;
-
-  protected HttpClientPayload(final long requestId, final Map<String, List<String>> headers) {
-    this.requestId = requestId;
-    this.headers = headers;
-  }
-
-  public long getRequestId() {
-    return requestId;
-  }
-
-  public MediaType getContentType() {
-    return contentType;
-  }
-
-  public Map<String, List<String>> getHeaders() {
-    return headers;
-  }
-
-  public InputStream getBody() {
-    return body;
-  }
-
-  public void setBody(MediaType contentType, InputStream body) {
-    this.contentType = contentType;
-    this.body = body;
-  }
+    private final long requestId;
+    private final Map<String, List<String>> headers;
+    private MediaType contentType;
+    private InputStream body;
+
+    protected HttpClientPayload(final long requestId, final Map<String, List<String>> headers) {
+        this.requestId = requestId;
+        this.headers = headers;
+    }
+
+    public long getRequestId() {
+        return requestId;
+    }
+
+    public MediaType getContentType() {
+        return contentType;
+    }
+
+    public Map<String, List<String>> getHeaders() {
+        return headers;
+    }
+
+    public InputStream getBody() {
+        return body;
+    }
+
+    public void setBody(MediaType contentType, InputStream body) {
+        this.contentType = contentType;
+        this.body = body;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/appsec/HttpClientRequest.java b/internal-api/src/main/java/datadog/trace/api/appsec/HttpClientRequest.java
index 3ba862be58f..2c6c0077349 100644
--- a/internal-api/src/main/java/datadog/trace/api/appsec/HttpClientRequest.java
+++ b/internal-api/src/main/java/datadog/trace/api/appsec/HttpClientRequest.java
@@ -5,28 +5,25 @@
 
 public class HttpClientRequest extends HttpClientPayload {
 
-  private final String url;
-  private final String method;
+    private final String url;
+    private final String method;
 
-  public HttpClientRequest(final long id, final String url) {
-    this(id, url, null, null);
-  }
+    public HttpClientRequest(final long id, final String url) {
+        this(id, url, null, null);
+    }
 
-  public HttpClientRequest(
-      final long id,
-      final String url,
-      final String method,
-      final Map<String, List<String>> headers) {
-    super(id, headers);
-    this.url = url;
-    this.method = method;
-  }
+    public HttpClientRequest(
+            final long id, final String url, final String method, final Map<String, List<String>> headers) {
+        super(id, headers);
+        this.url = url;
+        this.method = method;
+    }
 
-  public String getUrl() {
-    return url;
-  }
+    public String getUrl() {
+        return url;
+    }
 
-  public String getMethod() {
-    return method;
-  }
+    public String getMethod() {
+        return method;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/appsec/HttpClientResponse.java b/internal-api/src/main/java/datadog/trace/api/appsec/HttpClientResponse.java
index 0c26b96402a..0bfce650a34 100644
--- a/internal-api/src/main/java/datadog/trace/api/appsec/HttpClientResponse.java
+++ b/internal-api/src/main/java/datadog/trace/api/appsec/HttpClientResponse.java
@@ -5,15 +5,14 @@
 
 public class HttpClientResponse extends HttpClientPayload {
 
-  private final int status;
+    private final int status;
 
-  public HttpClientResponse(
-      final long requestId, final int status, final Map<String, List<String>> headers) {
-    super(requestId, headers);
-    this.status = status;
-  }
+    public HttpClientResponse(final long requestId, final int status, final Map<String, List<String>> headers) {
+        super(requestId, headers);
+        this.status = status;
+    }
 
-  public int getStatus() {
-    return status;
-  }
+    public int getStatus() {
+        return status;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/appsec/MediaType.java b/internal-api/src/main/java/datadog/trace/api/appsec/MediaType.java
index 979562160c8..871b6858775 100644
--- a/internal-api/src/main/java/datadog/trace/api/appsec/MediaType.java
+++ b/internal-api/src/main/java/datadog/trace/api/appsec/MediaType.java
@@ -4,84 +4,84 @@
 
 public class MediaType {
 
-  public static final MediaType UNKNOWN = new MediaType(null, null, null);
+    public static final MediaType UNKNOWN = new MediaType(null, null, null);
 
-  private final String type;
-  private final String subtype;
-  private final String charset;
+    private final String type;
+    private final String subtype;
+    private final String charset;
 
-  private MediaType(final String type, final String subtype, final String charset) {
-    this.type = type;
-    this.subtype = subtype;
-    this.charset = charset;
-  }
-
-  public String getType() {
-    return type;
-  }
-
-  public String getSubtype() {
-    return subtype;
-  }
+    private MediaType(final String type, final String subtype, final String charset) {
+        this.type = type;
+        this.subtype = subtype;
+        this.charset = charset;
+    }
 
-  public String getCharset() {
-    return charset;
-  }
+    public String getType() {
+        return type;
+    }
 
-  public boolean isJson() {
-    return subtype != null && ("json".equals(subtype) || subtype.endsWith("+json"));
-  }
+    public String getSubtype() {
+        return subtype;
+    }
 
-  public boolean isDeserializable() {
-    // TODO add other supported types
-    return isJson();
-  }
+    public String getCharset() {
+        return charset;
+    }
 
-  @Override
-  public String toString() {
-    String contentType = type + "/" + subtype;
-    if (charset != null) {
-      contentType += "; charset=" + charset;
+    public boolean isJson() {
+        return subtype != null && ("json".equals(subtype) || subtype.endsWith("+json"));
     }
-    return contentType;
-  }
 
-  public static MediaType parse(final String header) {
-    if (header == null) {
-      return UNKNOWN;
+    public boolean isDeserializable() {
+        // TODO add other supported types
+        return isJson();
     }
-    final String mediaType = header.trim().toLowerCase(Locale.ROOT);
-    final int semicolonIndex = mediaType.indexOf(';');
-    String contentType, charset = null;
-    if (semicolonIndex != -1) {
-      contentType = mediaType.substring(0, semicolonIndex);
-      final String parameter = mediaType.substring(semicolonIndex + 1);
-      final int charsetIndex = parameter.indexOf("charset=");
-      if (charsetIndex != -1) {
-        charset = parameter.substring(charsetIndex + 8);
-      }
-    } else {
-      contentType = mediaType;
+
+    @Override
+    public String toString() {
+        String contentType = type + "/" + subtype;
+        if (charset != null) {
+            contentType += "; charset=" + charset;
+        }
+        return contentType;
     }
-    final int slashIndex = contentType.indexOf('/');
-    if (slashIndex != -1) {
-      final String type = contentType.substring(0, slashIndex);
-      final String subtype = contentType.substring(slashIndex + 1);
-      return create(type, subtype, charset);
-    } else {
-      return create(contentType, null, charset);
+
+    public static MediaType parse(final String header) {
+        if (header == null) {
+            return UNKNOWN;
+        }
+        final String mediaType = header.trim().toLowerCase(Locale.ROOT);
+        final int semicolonIndex = mediaType.indexOf(';');
+        String contentType, charset = null;
+        if (semicolonIndex != -1) {
+            contentType = mediaType.substring(0, semicolonIndex);
+            final String parameter = mediaType.substring(semicolonIndex + 1);
+            final int charsetIndex = parameter.indexOf("charset=");
+            if (charsetIndex != -1) {
+                charset = parameter.substring(charsetIndex + 8);
+            }
+        } else {
+            contentType = mediaType;
+        }
+        final int slashIndex = contentType.indexOf('/');
+        if (slashIndex != -1) {
+            final String type = contentType.substring(0, slashIndex);
+            final String subtype = contentType.substring(slashIndex + 1);
+            return create(type, subtype, charset);
+        } else {
+            return create(contentType, null, charset);
+        }
     }
-  }
 
-  public static MediaType create(final String type, final String subtype, final String charset) {
-    return new MediaType(trimValue(type), trimValue(subtype), trimValue(charset));
-  }
+    public static MediaType create(final String type, final String subtype, final String charset) {
+        return new MediaType(trimValue(type), trimValue(subtype), trimValue(charset));
+    }
 
-  public static String trimValue(String value) {
-    if (value == null) {
-      return null;
+    public static String trimValue(String value) {
+        if (value == null) {
+            return null;
+        }
+        value = value.trim();
+        return value.isEmpty() ? null : value;
     }
-    value = value.trim();
-    return value.isEmpty() ? null : value;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/cache/CHMCache.java b/internal-api/src/main/java/datadog/trace/api/cache/CHMCache.java
index 7ac2dd98750..1d034560f05 100644
--- a/internal-api/src/main/java/datadog/trace/api/cache/CHMCache.java
+++ b/internal-api/src/main/java/datadog/trace/api/cache/CHMCache.java
@@ -7,37 +7,37 @@
 
 final class CHMCache<K, V> implements DDCache<K, V> {
 
-  private final ConcurrentHashMap<K, V> chm;
+    private final ConcurrentHashMap<K, V> chm;
 
-  public CHMCache(final int initialCapacity) {
-    this.chm = new ConcurrentHashMap<>(initialCapacity);
-  }
-
-  @Override
-  public V computeIfAbsent(K key, Function<K, ? extends V> producer) {
-    if (null == key) {
-      return null;
+    public CHMCache(final int initialCapacity) {
+        this.chm = new ConcurrentHashMap<>(initialCapacity);
     }
-    V value = chm.get(key);
-    if (null == value) {
-      value = producer.apply(key);
-      V winner = chm.putIfAbsent(key, value);
-      if (null != winner) {
-        value = winner;
-      }
+
+    @Override
+    public V computeIfAbsent(K key, Function<K, ? extends V> producer) {
+        if (null == key) {
+            return null;
+        }
+        V value = chm.get(key);
+        if (null == value) {
+            value = producer.apply(key);
+            V winner = chm.putIfAbsent(key, value);
+            if (null != winner) {
+                value = winner;
+            }
+        }
+        return value;
     }
-    return value;
-  }
 
-  @Override
-  public void clear() {
-    chm.clear();
-  }
+    @Override
+    public void clear() {
+        chm.clear();
+    }
 
-  @Override
-  public void visit(BiConsumer<K, V> consumer) {
-    for (Map.Entry<K, V> e : chm.entrySet()) {
-      consumer.accept(e.getKey(), e.getValue());
+    @Override
+    public void visit(BiConsumer<K, V> consumer) {
+        for (Map.Entry<K, V> e : chm.entrySet()) {
+            consumer.accept(e.getKey(), e.getValue());
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/cache/DDCache.java b/internal-api/src/main/java/datadog/trace/api/cache/DDCache.java
index d1cd8024847..016deb27fb0 100644
--- a/internal-api/src/main/java/datadog/trace/api/cache/DDCache.java
+++ b/internal-api/src/main/java/datadog/trace/api/cache/DDCache.java
@@ -4,18 +4,18 @@
 import java.util.function.Function;
 
 public interface DDCache<K, V> {
-  /**
-   * Look up or create and store a value in the cache.
-   *
-   * @param key the key to look up
-   * @param producer how to create a cached value base on the key if the lookup fails
-   * @return the cached or created and stored value
-   */
-  V computeIfAbsent(final K key, Function<K, ? extends V> producer);
+    /**
+     * Look up or create and store a value in the cache.
+     *
+     * @param key the key to look up
+     * @param producer how to create a cached value base on the key if the lookup fails
+     * @return the cached or created and stored value
+     */
+    V computeIfAbsent(final K key, Function<K, ? extends V> producer);
 
-  /** Clear the cache. */
-  void clear();
+    /** Clear the cache. */
+    void clear();
 
-  /** Visits elements currently in the cache; for debugging/triage purposes. */
-  void visit(BiConsumer<K, V> consumer);
+    /** Visits elements currently in the cache; for debugging/triage purposes. */
+    void visit(BiConsumer<K, V> consumer);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/cache/DDCaches.java b/internal-api/src/main/java/datadog/trace/api/cache/DDCaches.java
index 65d7b2f6970..c5b2bad42bf 100644
--- a/internal-api/src/main/java/datadog/trace/api/cache/DDCaches.java
+++ b/internal-api/src/main/java/datadog/trace/api/cache/DDCaches.java
@@ -4,82 +4,82 @@
 
 public final class DDCaches {
 
-  private DDCaches() {}
+    private DDCaches() {}
 
-  /**
-   * Creates a cache which cannot grow beyond a fixed capacity. Useful for caching relationships
-   * between low cardinality but potentially unbounded keys with values, without risking using
-   * unbounded space.
-   *
-   * <p>When using immutable array keys prefer {@link #newFixedSizeArrayKeyCache(int)}.
-   *
-   * @param capacity the cache's fixed capacity
-   * @param <K> the key type
-   * @param <V> the value type
-   */
-  public static <K, V> DDCache<K, V> newFixedSizeCache(final int capacity) {
-    return new FixedSizeCache.ObjectHash<>(capacity);
-  }
+    /**
+     * Creates a cache which cannot grow beyond a fixed capacity. Useful for caching relationships
+     * between low cardinality but potentially unbounded keys with values, without risking using
+     * unbounded space.
+     *
+     * <p>When using immutable array keys prefer {@link #newFixedSizeArrayKeyCache(int)}.
+     *
+     * @param capacity the cache's fixed capacity
+     * @param <K> the key type
+     * @param <V> the value type
+     */
+    public static <K, V> DDCache<K, V> newFixedSizeCache(final int capacity) {
+        return new FixedSizeCache.ObjectHash<>(capacity);
+    }
 
-  /**
-   * Specialized fixed-size cache that uses {@link System#identityHashCode} for key hashing and
-   * equality.
-   *
-   * @see #newFixedSizeCache(int)
-   */
-  public static <K, V> DDCache<K, V> newFixedSizeIdentityCache(final int capacity) {
-    return new FixedSizeCache.IdentityHash<>(capacity);
-  }
+    /**
+     * Specialized fixed-size cache that uses {@link System#identityHashCode} for key hashing and
+     * equality.
+     *
+     * @see #newFixedSizeCache(int)
+     */
+    public static <K, V> DDCache<K, V> newFixedSizeIdentityCache(final int capacity) {
+        return new FixedSizeCache.IdentityHash<>(capacity);
+    }
 
-  /**
-   * Specialized fixed-size cache that uses {@link java.util.Arrays} for key hashing and equality.
-   *
-   * @see #newFixedSizeCache(int)
-   */
-  public static <K, V> DDCache<K[], V> newFixedSizeArrayKeyCache(final int capacity) {
-    return new FixedSizeCache.ArrayHash<>(capacity);
-  }
+    /**
+     * Specialized fixed-size cache that uses {@link java.util.Arrays} for key hashing and equality.
+     *
+     * @see #newFixedSizeCache(int)
+     */
+    public static <K, V> DDCache<K[], V> newFixedSizeArrayKeyCache(final int capacity) {
+        return new FixedSizeCache.ArrayHash<>(capacity);
+    }
 
-  /**
-   * Specialized fixed-size cache whose keys are weakly referenced. Uses {@link
-   * System#identityHashCode} for key hashing and equality.
-   *
-   * @see #newFixedSizeCache(int)
-   */
-  public static <K, V> DDCache<K, V> newFixedSizeWeakKeyCache(final int capacity) {
-    return new FixedSizeWeakKeyCache<>(capacity);
-  }
+    /**
+     * Specialized fixed-size cache whose keys are weakly referenced. Uses {@link
+     * System#identityHashCode} for key hashing and equality.
+     *
+     * @see #newFixedSizeCache(int)
+     */
+    public static <K, V> DDCache<K, V> newFixedSizeWeakKeyCache(final int capacity) {
+        return new FixedSizeWeakKeyCache<>(capacity);
+    }
 
-  /**
-   * Specialized fixed-size cache which also tracks the overall weight of cached elements.
-   *
-   * @param capacity the cache's fixed capacity
-   * @param weigher the weighing function used to weigh elements in the cache
-   * @param maxWeight the maximum combined weight of all elements in the cache
-   * @param <K> the key type
-   * @param <V> the value type
-   */
-  public static <K, V> DDCache<K, V> newFixedSizeWeightedCache(
-      final int capacity, final ToIntFunction<V> weigher, final int maxWeight) {
-    return new FixedSizeWeightedCache<>(capacity, weigher, maxWeight);
-  }
+    /**
+     * Specialized fixed-size cache which also tracks the overall weight of cached elements.
+     *
+     * @param capacity the cache's fixed capacity
+     * @param weigher the weighing function used to weigh elements in the cache
+     * @param maxWeight the maximum combined weight of all elements in the cache
+     * @param <K> the key type
+     * @param <V> the value type
+     */
+    public static <K, V> DDCache<K, V> newFixedSizeWeightedCache(
+            final int capacity, final ToIntFunction<V> weigher, final int maxWeight) {
+        return new FixedSizeWeightedCache<>(capacity, weigher, maxWeight);
+    }
 
-  /**
-   * Creates a memoization of an association. Useful for creating an association between an
-   * implicitly bounded set of keys and values, where the nature of the keys prevents unbounded
-   * space usage.
-   *
-   * @param initialCapacity the initial capacity. To avoid resizing, should be larger than the total
-   *     number of keys.
-   * @param <K> the key type
-   * @param <V> the value type
-   * @return the value associated with the key
-   */
-  public static <K, V> DDCache<K, V> newUnboundedCache(final int initialCapacity) {
-    return new CHMCache<>(initialCapacity);
-  }
+    /**
+     * Creates a memoization of an association. Useful for creating an association between an
+     * implicitly bounded set of keys and values, where the nature of the keys prevents unbounded
+     * space usage.
+     *
+     * @param initialCapacity the initial capacity. To avoid resizing, should be larger than the total
+     *     number of keys.
+     * @param <K> the key type
+     * @param <V> the value type
+     * @return the value associated with the key
+     */
+    public static <K, V> DDCache<K, V> newUnboundedCache(final int initialCapacity) {
+        return new CHMCache<>(initialCapacity);
+    }
 
-  public static <K, V> DDPartialKeyCache<K, V> newFixedSizePartialKeyCache(final int capacity) {
-    return new FixedSizePartialKeyCache<>(capacity);
-  }
+    public static <K, V> DDPartialKeyCache<K, V> newFixedSizePartialKeyCache(final int capacity) {
+        return new FixedSizePartialKeyCache<>(capacity);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/cache/DDPartialKeyCache.java b/internal-api/src/main/java/datadog/trace/api/cache/DDPartialKeyCache.java
index 68eb730bb74..0523b7c5aab 100644
--- a/internal-api/src/main/java/datadog/trace/api/cache/DDPartialKeyCache.java
+++ b/internal-api/src/main/java/datadog/trace/api/cache/DDPartialKeyCache.java
@@ -10,40 +10,40 @@
  * @param <V> value type
  */
 public interface DDPartialKeyCache<K, V> {
-  /**
-   * Look up or create and store a value in the cache.
-   *
-   * @param key the key to look up
-   * @param m extra parameter that is passed along with the key
-   * @param n extra parameter that is passed along with the key
-   * @param hasher how to compute the hash using key, m, and n
-   * @param comparator how to compare the key, m, n, and value
-   * @param producer how to create a cached value base on the key, m, and n if the lookup fails
-   * @return the cached or created and stored value
-   */
-  V computeIfAbsent(
-      final K key,
-      int m,
-      int n,
-      Hasher<K> hasher,
-      Comparator<K, V> comparator,
-      Producer<K, ? extends V> producer);
+    /**
+     * Look up or create and store a value in the cache.
+     *
+     * @param key the key to look up
+     * @param m extra parameter that is passed along with the key
+     * @param n extra parameter that is passed along with the key
+     * @param hasher how to compute the hash using key, m, and n
+     * @param comparator how to compare the key, m, n, and value
+     * @param producer how to create a cached value base on the key, m, and n if the lookup fails
+     * @return the cached or created and stored value
+     */
+    V computeIfAbsent(
+            final K key,
+            int m,
+            int n,
+            Hasher<K> hasher,
+            Comparator<K, V> comparator,
+            Producer<K, ? extends V> producer);
 
-  /** Clear the cache. */
-  void clear();
+    /** Clear the cache. */
+    void clear();
 
-  @FunctionalInterface
-  interface Hasher<T> {
-    int apply(T t, int m, int n);
-  }
+    @FunctionalInterface
+    interface Hasher<T> {
+        int apply(T t, int m, int n);
+    }
 
-  @FunctionalInterface
-  interface Comparator<T, U> {
-    boolean test(T t, int m, int n, U u);
-  }
+    @FunctionalInterface
+    interface Comparator<T, U> {
+        boolean test(T t, int m, int n, U u);
+    }
 
-  @FunctionalInterface
-  interface Producer<T, R> {
-    R apply(T t, int h, int m, int n);
-  }
+    @FunctionalInterface
+    interface Producer<T, R> {
+        R apply(T t, int h, int m, int n);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/cache/FixedSizeCache.java b/internal-api/src/main/java/datadog/trace/api/cache/FixedSizeCache.java
index a8f5fc5f3fa..01b77f72a02 100644
--- a/internal-api/src/main/java/datadog/trace/api/cache/FixedSizeCache.java
+++ b/internal-api/src/main/java/datadog/trace/api/cache/FixedSizeCache.java
@@ -21,154 +21,154 @@
  */
 abstract class FixedSizeCache<K, V> implements DDCache<K, V> {
 
-  static final int MAXIMUM_CAPACITY = 1 << 30;
-
-  private final int mask;
-  // This is a cache, so there is no need for volatile, atomics or synchronized.
-  // All race conditions here are benign since you always read or write a full
-  // Element that can not be modified, and eventually other threads will see it
-  // or write the same information at that position, or other information in the
-  // case of a collision.
-  private final Pair<K, V>[] elements;
-
-  /**
-   * Creates a <code>FixedSizeCache</code> that can hold up to <code>capacity</code> elements, if
-   * the key hash function has perfect spread.
-   *
-   * @param capacity the maximum number of elements that the cache can hold
-   */
-  @SuppressWarnings("unchecked")
-  FixedSizeCache(int capacity) {
-    int size = calculateSize(capacity);
-    this.elements = new Pair[size];
-    this.mask = size - 1;
-  }
-
-  static int calculateSize(int capacity) {
-    if (capacity <= 0) {
-      throw new IllegalArgumentException("Cache capacity must be > 0");
-    }
-    if (capacity > MAXIMUM_CAPACITY) {
-      capacity = MAXIMUM_CAPACITY;
-    }
-    // compute a power of two size for the given capacity
-    int n = -1 >>> Integer.numberOfLeadingZeros(capacity - 1);
-    return (n < 0) ? 1 : (n >= MAXIMUM_CAPACITY) ? MAXIMUM_CAPACITY : n + 1;
-  }
-
-  /**
-   * Look up or create and store a value in the cache.
-   *
-   * <p>If there is a hash collision, the method uses double hashing two more times to try to find a
-   * match or an unused slot. If there is no match or empty slot, the first slot is overwritten.
-   *
-   * @param key the key to look up
-   * @param producer how to create a cached value base on the key if the lookup fails
-   * @return the cached or created and stored value
-   */
-  @Override
-  public final V computeIfAbsent(K key, Function<K, ? extends V> producer) {
-    if (key == null) {
-      return null;
+    static final int MAXIMUM_CAPACITY = 1 << 30;
+
+    private final int mask;
+    // This is a cache, so there is no need for volatile, atomics or synchronized.
+    // All race conditions here are benign since you always read or write a full
+    // Element that can not be modified, and eventually other threads will see it
+    // or write the same information at that position, or other information in the
+    // case of a collision.
+    private final Pair<K, V>[] elements;
+
+    /**
+     * Creates a <code>FixedSizeCache</code> that can hold up to <code>capacity</code> elements, if
+     * the key hash function has perfect spread.
+     *
+     * @param capacity the maximum number of elements that the cache can hold
+     */
+    @SuppressWarnings("unchecked")
+    FixedSizeCache(int capacity) {
+        int size = calculateSize(capacity);
+        this.elements = new Pair[size];
+        this.mask = size - 1;
     }
 
-    int h = hash(key);
-    int firstPos = h & mask;
-    V value;
-
-    // try to find a slot or a match 3 times
-    for (int i = 1; true; i++) {
-      int pos = h & mask;
-      Pair<K, V> current = elements[pos];
-      if (current == null) {
-        // we found an empty slot, so store the value there
-        value = produceAndStoreValue(key, producer, pos);
-        break;
-      } else if (equals(key, current)) {
-        // we found a cached key, so use that value
-        value = current.getRight();
-        break;
-      } else if (i == 3) {
-        // all 3 slots have been taken, so overwrite the first one
-        value = produceAndStoreValue(key, producer, firstPos);
-        break;
-      }
-      // slot was occupied by someone else, so try another slot
-      h = rehash(h);
+    static int calculateSize(int capacity) {
+        if (capacity <= 0) {
+            throw new IllegalArgumentException("Cache capacity must be > 0");
+        }
+        if (capacity > MAXIMUM_CAPACITY) {
+            capacity = MAXIMUM_CAPACITY;
+        }
+        // compute a power of two size for the given capacity
+        int n = -1 >>> Integer.numberOfLeadingZeros(capacity - 1);
+        return (n < 0) ? 1 : (n >= MAXIMUM_CAPACITY) ? MAXIMUM_CAPACITY : n + 1;
     }
-    return value;
-  }
-
-  @Override
-  public void clear() {
-    Arrays.fill(elements, null);
-  }
-
-  @Override
-  public void visit(BiConsumer<K, V> consumer) {
-    for (Pair<K, V> e : elements) {
-      if (null != e) {
-        consumer.accept(e.getLeft(), e.getRight());
-      }
+
+    /**
+     * Look up or create and store a value in the cache.
+     *
+     * <p>If there is a hash collision, the method uses double hashing two more times to try to find a
+     * match or an unused slot. If there is no match or empty slot, the first slot is overwritten.
+     *
+     * @param key the key to look up
+     * @param producer how to create a cached value base on the key if the lookup fails
+     * @return the cached or created and stored value
+     */
+    @Override
+    public final V computeIfAbsent(K key, Function<K, ? extends V> producer) {
+        if (key == null) {
+            return null;
+        }
+
+        int h = hash(key);
+        int firstPos = h & mask;
+        V value;
+
+        // try to find a slot or a match 3 times
+        for (int i = 1; true; i++) {
+            int pos = h & mask;
+            Pair<K, V> current = elements[pos];
+            if (current == null) {
+                // we found an empty slot, so store the value there
+                value = produceAndStoreValue(key, producer, pos);
+                break;
+            } else if (equals(key, current)) {
+                // we found a cached key, so use that value
+                value = current.getRight();
+                break;
+            } else if (i == 3) {
+                // all 3 slots have been taken, so overwrite the first one
+                value = produceAndStoreValue(key, producer, firstPos);
+                break;
+            }
+            // slot was occupied by someone else, so try another slot
+            h = rehash(h);
+        }
+        return value;
     }
-  }
 
-  abstract int hash(K key);
+    @Override
+    public void clear() {
+        Arrays.fill(elements, null);
+    }
 
-  abstract boolean equals(K key, Pair<K, V> current);
+    @Override
+    public void visit(BiConsumer<K, V> consumer) {
+        for (Pair<K, V> e : elements) {
+            if (null != e) {
+                consumer.accept(e.getLeft(), e.getRight());
+            }
+        }
+    }
 
-  private V produceAndStoreValue(K key, Function<K, ? extends V> producer, int pos) {
-    V value = producer.apply(key);
-    elements[pos] = Pair.of(key, value);
-    return value;
-  }
+    abstract int hash(K key);
 
-  static int rehash(int v) {
-    int h = v * 0x9e3775cd;
-    h = Integer.reverseBytes(h);
-    return h * 0x9e3775cd;
-  }
+    abstract boolean equals(K key, Pair<K, V> current);
 
-  static final class ObjectHash<K, V> extends FixedSizeCache<K, V> {
-    ObjectHash(int capacity) {
-      super(capacity);
+    private V produceAndStoreValue(K key, Function<K, ? extends V> producer, int pos) {
+        V value = producer.apply(key);
+        elements[pos] = Pair.of(key, value);
+        return value;
     }
 
-    int hash(K key) {
-      return key.hashCode();
+    static int rehash(int v) {
+        int h = v * 0x9e3775cd;
+        h = Integer.reverseBytes(h);
+        return h * 0x9e3775cd;
     }
 
-    boolean equals(K key, Pair<K, V> current) {
-      return key.equals(current.getLeft());
-    }
-  }
+    static final class ObjectHash<K, V> extends FixedSizeCache<K, V> {
+        ObjectHash(int capacity) {
+            super(capacity);
+        }
 
-  static final class IdentityHash<K, V> extends FixedSizeCache<K, V> {
-    IdentityHash(int capacity) {
-      super(capacity);
-    }
+        int hash(K key) {
+            return key.hashCode();
+        }
 
-    int hash(K key) {
-      int hash = System.identityHashCode(key);
-      return hash - (hash << 7); // multiply by -127 to improve identityHashCode spread
+        boolean equals(K key, Pair<K, V> current) {
+            return key.equals(current.getLeft());
+        }
     }
 
-    boolean equals(K key, Pair<K, V> current) {
-      return key == current.getLeft();
-    }
-  }
+    static final class IdentityHash<K, V> extends FixedSizeCache<K, V> {
+        IdentityHash(int capacity) {
+            super(capacity);
+        }
 
-  static final class ArrayHash<K, V> extends FixedSizeCache<K[], V> {
-    ArrayHash(int capacity) {
-      super(capacity);
-    }
+        int hash(K key) {
+            int hash = System.identityHashCode(key);
+            return hash - (hash << 7); // multiply by -127 to improve identityHashCode spread
+        }
 
-    int hash(K[] key) {
-      return Arrays.hashCode(key);
+        boolean equals(K key, Pair<K, V> current) {
+            return key == current.getLeft();
+        }
     }
 
-    boolean equals(K[] key, Pair<K[], V> current) {
-      return Arrays.equals(key, current.getLeft());
+    static final class ArrayHash<K, V> extends FixedSizeCache<K[], V> {
+        ArrayHash(int capacity) {
+            super(capacity);
+        }
+
+        int hash(K[] key) {
+            return Arrays.hashCode(key);
+        }
+
+        boolean equals(K[] key, Pair<K[], V> current) {
+            return Arrays.equals(key, current.getLeft());
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/cache/FixedSizePartialKeyCache.java b/internal-api/src/main/java/datadog/trace/api/cache/FixedSizePartialKeyCache.java
index 4a2a75dfd55..a2264b584a2 100644
--- a/internal-api/src/main/java/datadog/trace/api/cache/FixedSizePartialKeyCache.java
+++ b/internal-api/src/main/java/datadog/trace/api/cache/FixedSizePartialKeyCache.java
@@ -22,101 +22,95 @@
  */
 final class FixedSizePartialKeyCache<K, V> implements DDPartialKeyCache<K, V> {
 
-  private final int mask;
-  // This is a cache, so there is no need for volatile, atomics or synchronized.
-  // All race conditions here are benign since you always read or write a full
-  // Element that can not be modified, and eventually other threads will see it
-  // or write the same information at that position, or other information in the
-  // case of a collision.
-  private final HVElement<V>[] elements;
+    private final int mask;
+    // This is a cache, so there is no need for volatile, atomics or synchronized.
+    // All race conditions here are benign since you always read or write a full
+    // Element that can not be modified, and eventually other threads will see it
+    // or write the same information at that position, or other information in the
+    // case of a collision.
+    private final HVElement<V>[] elements;
 
-  /**
-   * Creates a <code>FixedSizePartialKeyCache</code> that can hold up to <code>capacity</code>
-   * elements, if the key hash function has perfect spread.
-   *
-   * @param capacity the maximum number of elements that the cache can hold
-   */
-  @SuppressWarnings("unchecked")
-  FixedSizePartialKeyCache(int capacity) {
-    int size = calculateSize(capacity);
-    this.elements = new HVElement[size];
-    this.mask = size - 1;
-  }
-
-  /**
-   * Look up or create and store a value in the cache.
-   *
-   * <p>If there is a hash collision, the method uses double hashing two more times to try to find a
-   * match or an unused slot. If there is no match or empty slot, the first slot is overwritten.
-   *
-   * @param key the key to look up
-   * @param m extra parameter that is passed along with the key
-   * @param n extra parameter that is passed along with the key
-   * @param hasher how to compute the hash using key, m, and n
-   * @param comparator how to compare the key, m, n, and value
-   * @param producer how to create a cached value base on the key, m, and n if the lookup fails
-   * @return the cached or created and stored value
-   */
-  @Override
-  public V computeIfAbsent(
-      K key,
-      int m,
-      int n,
-      Hasher<K> hasher,
-      Comparator<K, V> comparator,
-      Producer<K, ? extends V> producer) {
-    if (key == null) {
-      return null;
+    /**
+     * Creates a <code>FixedSizePartialKeyCache</code> that can hold up to <code>capacity</code>
+     * elements, if the key hash function has perfect spread.
+     *
+     * @param capacity the maximum number of elements that the cache can hold
+     */
+    @SuppressWarnings("unchecked")
+    FixedSizePartialKeyCache(int capacity) {
+        int size = calculateSize(capacity);
+        this.elements = new HVElement[size];
+        this.mask = size - 1;
     }
 
-    int hash = hasher.apply(key, m, n);
+    /**
+     * Look up or create and store a value in the cache.
+     *
+     * <p>If there is a hash collision, the method uses double hashing two more times to try to find a
+     * match or an unused slot. If there is no match or empty slot, the first slot is overwritten.
+     *
+     * @param key the key to look up
+     * @param m extra parameter that is passed along with the key
+     * @param n extra parameter that is passed along with the key
+     * @param hasher how to compute the hash using key, m, and n
+     * @param comparator how to compare the key, m, n, and value
+     * @param producer how to create a cached value base on the key, m, and n if the lookup fails
+     * @return the cached or created and stored value
+     */
+    @Override
+    public V computeIfAbsent(
+            K key, int m, int n, Hasher<K> hasher, Comparator<K, V> comparator, Producer<K, ? extends V> producer) {
+        if (key == null) {
+            return null;
+        }
+
+        int hash = hasher.apply(key, m, n);
 
-    int h = hash;
-    int firstPos = h & mask;
-    V value;
+        int h = hash;
+        int firstPos = h & mask;
+        V value;
 
-    // try to find a slot or a match 3 times
-    for (int i = 1; true; i++) {
-      int pos = h & mask;
-      HVElement<V> current = elements[pos];
-      if (current == null) {
-        // we found an empty slot, so store the value there
-        value = produceAndStoreValue(producer, hash, key, m, n, pos);
-        break;
-      } else if (hash == current.hash && comparator.test(key, m, n, current.value)) {
-        // we found a cached key, so use that value
-        value = current.value;
-        break;
-      } else if (i == 3) {
-        // all 3 slots have been taken, so overwrite the first one
-        value = produceAndStoreValue(producer, hash, key, m, n, firstPos);
-        break;
-      }
-      // slot was occupied by someone else, so try another slot
-      h = rehash(h);
+        // try to find a slot or a match 3 times
+        for (int i = 1; true; i++) {
+            int pos = h & mask;
+            HVElement<V> current = elements[pos];
+            if (current == null) {
+                // we found an empty slot, so store the value there
+                value = produceAndStoreValue(producer, hash, key, m, n, pos);
+                break;
+            } else if (hash == current.hash && comparator.test(key, m, n, current.value)) {
+                // we found a cached key, so use that value
+                value = current.value;
+                break;
+            } else if (i == 3) {
+                // all 3 slots have been taken, so overwrite the first one
+                value = produceAndStoreValue(producer, hash, key, m, n, firstPos);
+                break;
+            }
+            // slot was occupied by someone else, so try another slot
+            h = rehash(h);
+        }
+        return value;
     }
-    return value;
-  }
 
-  @Override
-  public void clear() {
-    Arrays.fill(elements, null);
-  }
+    @Override
+    public void clear() {
+        Arrays.fill(elements, null);
+    }
 
-  private V produceAndStoreValue(
-      Producer<K, ? extends V> producer, int hash, K key, int m, int n, int pos) {
-    V value = producer.apply(key, hash, m, n);
-    elements[pos] = new HVElement<>(hash, value);
-    return value;
-  }
+    private V produceAndStoreValue(Producer<K, ? extends V> producer, int hash, K key, int m, int n, int pos) {
+        V value = producer.apply(key, hash, m, n);
+        elements[pos] = new HVElement<>(hash, value);
+        return value;
+    }
 
-  static final class HVElement<U> {
-    final int hash;
-    final U value;
+    static final class HVElement<U> {
+        final int hash;
+        final U value;
 
-    HVElement(int hash, @Nullable U value) {
-      this.hash = hash;
-      this.value = value;
+        HVElement(int hash, @Nullable U value) {
+            this.hash = hash;
+            this.value = value;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/cache/FixedSizeWeakKeyCache.java b/internal-api/src/main/java/datadog/trace/api/cache/FixedSizeWeakKeyCache.java
index 9204756964f..4ff50cea4c2 100644
--- a/internal-api/src/main/java/datadog/trace/api/cache/FixedSizeWeakKeyCache.java
+++ b/internal-api/src/main/java/datadog/trace/api/cache/FixedSizeWeakKeyCache.java
@@ -26,103 +26,103 @@
  */
 final class FixedSizeWeakKeyCache<K, V> implements DDCache<K, V> {
 
-  private final int mask;
-  // This is a cache, so there is no need for volatile, atomics or synchronized.
-  // All race conditions here are benign since you always read or write a full
-  // Element that can not be modified, and eventually other threads will see it
-  // or write the same information at that position, or other information in the
-  // case of a collision.
-  private final WeakPair<K, V>[] elements;
+    private final int mask;
+    // This is a cache, so there is no need for volatile, atomics or synchronized.
+    // All race conditions here are benign since you always read or write a full
+    // Element that can not be modified, and eventually other threads will see it
+    // or write the same information at that position, or other information in the
+    // case of a collision.
+    private final WeakPair<K, V>[] elements;
 
-  /**
-   * Creates a <code>FixedSizeWeakKeyCache</code> that can hold up to <code>capacity</code>
-   * elements, if the key hash function has perfect spread.
-   *
-   * @param capacity the maximum number of elements that the cache can hold
-   */
-  @SuppressWarnings("unchecked")
-  FixedSizeWeakKeyCache(int capacity) {
-    int size = calculateSize(capacity);
-    this.elements = new WeakPair[size];
-    this.mask = size - 1;
-  }
-
-  /**
-   * Look up or create and store a value in the cache.
-   *
-   * <p>If there is a hash collision, the method uses double hashing two more times to try to find a
-   * match or an unused slot. If there is no match or empty slot, the first slot is overwritten.
-   *
-   * @param key the key to look up
-   * @param producer how to create a cached value base on the key if the lookup fails
-   * @return the cached or created and stored value
-   */
-  @Override
-  public final V computeIfAbsent(K key, Function<K, ? extends V> producer) {
-    if (key == null) {
-      return null;
+    /**
+     * Creates a <code>FixedSizeWeakKeyCache</code> that can hold up to <code>capacity</code>
+     * elements, if the key hash function has perfect spread.
+     *
+     * @param capacity the maximum number of elements that the cache can hold
+     */
+    @SuppressWarnings("unchecked")
+    FixedSizeWeakKeyCache(int capacity) {
+        int size = calculateSize(capacity);
+        this.elements = new WeakPair[size];
+        this.mask = size - 1;
     }
 
-    int hash = System.identityHashCode(key);
+    /**
+     * Look up or create and store a value in the cache.
+     *
+     * <p>If there is a hash collision, the method uses double hashing two more times to try to find a
+     * match or an unused slot. If there is no match or empty slot, the first slot is overwritten.
+     *
+     * @param key the key to look up
+     * @param producer how to create a cached value base on the key if the lookup fails
+     * @return the cached or created and stored value
+     */
+    @Override
+    public final V computeIfAbsent(K key, Function<K, ? extends V> producer) {
+        if (key == null) {
+            return null;
+        }
+
+        int hash = System.identityHashCode(key);
 
-    int h = hash - (hash << 7); // multiply by -127 to improve identityHashCode spread
-    int firstPos = h & mask;
-    V value;
+        int h = hash - (hash << 7); // multiply by -127 to improve identityHashCode spread
+        int firstPos = h & mask;
+        V value;
 
-    // try to find a slot or a match 3 times
-    for (int i = 1; true; i++) {
-      int pos = h & mask;
-      WeakPair<K, V> current = elements[pos];
-      if (current == null || null == current.get()) {
-        // we found an empty slot, so store the value there
-        value = produceAndStoreValue(producer, hash, key, pos);
-        break;
-      } else if (hash == current.hash && key.equals(current.get())) {
-        // we found a cached key, so use that value
-        value = current.value;
-        break;
-      } else if (i == 3) {
-        // all 3 slots have been taken, so overwrite the first one
-        value = produceAndStoreValue(producer, hash, key, firstPos);
-        break;
-      }
-      // slot was occupied by someone else, so try another slot
-      h = rehash(h);
+        // try to find a slot or a match 3 times
+        for (int i = 1; true; i++) {
+            int pos = h & mask;
+            WeakPair<K, V> current = elements[pos];
+            if (current == null || null == current.get()) {
+                // we found an empty slot, so store the value there
+                value = produceAndStoreValue(producer, hash, key, pos);
+                break;
+            } else if (hash == current.hash && key.equals(current.get())) {
+                // we found a cached key, so use that value
+                value = current.value;
+                break;
+            } else if (i == 3) {
+                // all 3 slots have been taken, so overwrite the first one
+                value = produceAndStoreValue(producer, hash, key, firstPos);
+                break;
+            }
+            // slot was occupied by someone else, so try another slot
+            h = rehash(h);
+        }
+        return value;
     }
-    return value;
-  }
 
-  @Override
-  public void clear() {
-    Arrays.fill(elements, null);
-  }
+    @Override
+    public void clear() {
+        Arrays.fill(elements, null);
+    }
 
-  @Override
-  public void visit(BiConsumer<K, V> consumer) {
-    for (WeakPair<K, V> e : elements) {
-      if (null != e) {
-        K key = e.get();
-        if (null != key) {
-          consumer.accept(key, e.value);
+    @Override
+    public void visit(BiConsumer<K, V> consumer) {
+        for (WeakPair<K, V> e : elements) {
+            if (null != e) {
+                K key = e.get();
+                if (null != key) {
+                    consumer.accept(key, e.value);
+                }
+            }
         }
-      }
     }
-  }
 
-  private V produceAndStoreValue(Function<K, ? extends V> producer, int hash, K key, int pos) {
-    V value = producer.apply(key);
-    elements[pos] = new WeakPair<>(key, hash, value);
-    return value;
-  }
+    private V produceAndStoreValue(Function<K, ? extends V> producer, int hash, K key, int pos) {
+        V value = producer.apply(key);
+        elements[pos] = new WeakPair<>(key, hash, value);
+        return value;
+    }
 
-  static final class WeakPair<K, V> extends WeakReference<K> {
-    final int hash;
-    final V value;
+    static final class WeakPair<K, V> extends WeakReference<K> {
+        final int hash;
+        final V value;
 
-    WeakPair(K key, int hash, @Nullable V value) {
-      super(key);
-      this.hash = hash;
-      this.value = value;
+        WeakPair(K key, int hash, @Nullable V value) {
+            super(key);
+            this.hash = hash;
+            this.value = value;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/cache/FixedSizeWeightedCache.java b/internal-api/src/main/java/datadog/trace/api/cache/FixedSizeWeightedCache.java
index 85295b39bbe..6742f221e56 100644
--- a/internal-api/src/main/java/datadog/trace/api/cache/FixedSizeWeightedCache.java
+++ b/internal-api/src/main/java/datadog/trace/api/cache/FixedSizeWeightedCache.java
@@ -28,165 +28,164 @@
  */
 final class FixedSizeWeightedCache<K, V> implements DDCache<K, V> {
 
-  private final int mask;
-  // This is a cache, so there is no need for volatile, atomics or synchronized.
-  // All race conditions here are benign since you always read or write a full
-  // Element that can not be modified, and eventually other threads will see it
-  // or write the same information at that position, or other information in the
-  // case of a collision.
-  private final Weighed<K, V>[] elements;
-  private final ToIntFunction<V> weigher;
-  private final int totalWeightLimit;
-  private final int totalWeightTarget;
-
-  // only used as a hint, so it doesn't need to be 100% accurate
-  private volatile int totalWeightEstimate;
-
-  private static final AtomicIntegerFieldUpdater<FixedSizeWeightedCache>
-      TOTAL_WEIGHT_ESTIMATE_UPDATER =
-          AtomicIntegerFieldUpdater.newUpdater(FixedSizeWeightedCache.class, "totalWeightEstimate");
-
-  private static final Weighed EVICTED = new Weighed<>(null, null, 0);
-
-  /**
-   * Creates a <code>FixedSizeWeightedCache</code> that can hold up to <code>capacity</code>
-   * elements, if the key hash function has perfect spread.
-   *
-   * @param capacity the maximum number of elements that the cache can hold
-   * @param weigher the function used to weigh elements before they are cached
-   * @param totalWeightLimit the maximum combined weight of cached elements
-   */
-  @SuppressWarnings("unchecked")
-  FixedSizeWeightedCache(int capacity, ToIntFunction<V> weigher, int totalWeightLimit) {
-    int size = calculateSize(capacity);
-    this.elements = new Weighed[size];
-    this.mask = size - 1;
-    this.weigher = weigher;
-    this.totalWeightLimit = totalWeightLimit;
-    this.totalWeightTarget = (int) (0.5 + totalWeightLimit * 0.9); // target 90% of limit
-  }
-
-  /**
-   * Look up or create and store a value in the cache.
-   *
-   * <p>If there is a hash collision, the method uses double hashing two more times to try to find a
-   * match or an unused slot. If there is no match or empty slot, the first slot is overwritten.
-   *
-   * @param key the key to look up
-   * @param producer how to create a cached value base on the key if the lookup fails
-   * @return the cached or created and stored value
-   */
-  @Override
-  public V computeIfAbsent(K key, Function<K, ? extends V> producer) {
-    if (key == null) {
-      return null;
+    private final int mask;
+    // This is a cache, so there is no need for volatile, atomics or synchronized.
+    // All race conditions here are benign since you always read or write a full
+    // Element that can not be modified, and eventually other threads will see it
+    // or write the same information at that position, or other information in the
+    // case of a collision.
+    private final Weighed<K, V>[] elements;
+    private final ToIntFunction<V> weigher;
+    private final int totalWeightLimit;
+    private final int totalWeightTarget;
+
+    // only used as a hint, so it doesn't need to be 100% accurate
+    private volatile int totalWeightEstimate;
+
+    private static final AtomicIntegerFieldUpdater<FixedSizeWeightedCache> TOTAL_WEIGHT_ESTIMATE_UPDATER =
+            AtomicIntegerFieldUpdater.newUpdater(FixedSizeWeightedCache.class, "totalWeightEstimate");
+
+    private static final Weighed EVICTED = new Weighed<>(null, null, 0);
+
+    /**
+     * Creates a <code>FixedSizeWeightedCache</code> that can hold up to <code>capacity</code>
+     * elements, if the key hash function has perfect spread.
+     *
+     * @param capacity the maximum number of elements that the cache can hold
+     * @param weigher the function used to weigh elements before they are cached
+     * @param totalWeightLimit the maximum combined weight of cached elements
+     */
+    @SuppressWarnings("unchecked")
+    FixedSizeWeightedCache(int capacity, ToIntFunction<V> weigher, int totalWeightLimit) {
+        int size = calculateSize(capacity);
+        this.elements = new Weighed[size];
+        this.mask = size - 1;
+        this.weigher = weigher;
+        this.totalWeightLimit = totalWeightLimit;
+        this.totalWeightTarget = (int) (0.5 + totalWeightLimit * 0.9); // target 90% of limit
     }
 
-    int h = key.hashCode();
-    int oldPos = h & mask;
-    Weighed<K, V> old = elements[oldPos];
-    V value;
-
-    int pos = oldPos;
-    Weighed<K, V> current = old;
-
-    // try to find a slot or a match 3 times
-    for (int i = 1; true; i++) {
-      if (current == null) {
-        // we found an empty slot, so store the value there
-        value = produceAndStoreValue(key, producer, pos, 0);
-        break;
-      } else if (current == EVICTED) {
-        // use evicted slot instead of first if we can't find a match
-        if (old != EVICTED) {
-          oldPos = pos;
-          old = current;
+    /**
+     * Look up or create and store a value in the cache.
+     *
+     * <p>If there is a hash collision, the method uses double hashing two more times to try to find a
+     * match or an unused slot. If there is no match or empty slot, the first slot is overwritten.
+     *
+     * @param key the key to look up
+     * @param producer how to create a cached value base on the key if the lookup fails
+     * @return the cached or created and stored value
+     */
+    @Override
+    public V computeIfAbsent(K key, Function<K, ? extends V> producer) {
+        if (key == null) {
+            return null;
         }
-        // continue search in case our key appears in a later slot
-      } else if (key.equals(current.key)) {
-        // we found a cached key, so use that value
-        value = current.value;
-        break;
-      }
-      if (i == 3) {
-        // we've searched all 3 slots, overwrite the first/evicted slot
-        value = produceAndStoreValue(key, producer, oldPos, old.weight);
-        break;
-      }
-      // try another slot
-      h = rehash(h);
-      pos = h & mask;
-      current = elements[pos];
+
+        int h = key.hashCode();
+        int oldPos = h & mask;
+        Weighed<K, V> old = elements[oldPos];
+        V value;
+
+        int pos = oldPos;
+        Weighed<K, V> current = old;
+
+        // try to find a slot or a match 3 times
+        for (int i = 1; true; i++) {
+            if (current == null) {
+                // we found an empty slot, so store the value there
+                value = produceAndStoreValue(key, producer, pos, 0);
+                break;
+            } else if (current == EVICTED) {
+                // use evicted slot instead of first if we can't find a match
+                if (old != EVICTED) {
+                    oldPos = pos;
+                    old = current;
+                }
+                // continue search in case our key appears in a later slot
+            } else if (key.equals(current.key)) {
+                // we found a cached key, so use that value
+                value = current.value;
+                break;
+            }
+            if (i == 3) {
+                // we've searched all 3 slots, overwrite the first/evicted slot
+                value = produceAndStoreValue(key, producer, oldPos, old.weight);
+                break;
+            }
+            // try another slot
+            h = rehash(h);
+            pos = h & mask;
+            current = elements[pos];
+        }
+        return value;
     }
-    return value;
-  }
-
-  @Override
-  public void clear() {
-    Arrays.fill(elements, null);
-    totalWeightEstimate = 0;
-  }
-
-  @Override
-  public void visit(BiConsumer<K, V> consumer) {
-    for (Weighed<K, V> e : elements) {
-      if (null != e) {
-        consumer.accept(e.key, e.value);
-      }
+
+    @Override
+    public void clear() {
+        Arrays.fill(elements, null);
+        totalWeightEstimate = 0;
     }
-  }
 
-  private V produceAndStoreValue(K key, Function<K, ? extends V> producer, int pos, int oldWeight) {
-    V value = producer.apply(key);
-    int weight = weigher.applyAsInt(value);
-    if (weight > totalWeightLimit) {
-      return value; // too big to cache
+    @Override
+    public void visit(BiConsumer<K, V> consumer) {
+        for (Weighed<K, V> e : elements) {
+            if (null != e) {
+                consumer.accept(e.key, e.value);
+            }
+        }
     }
-    int oldEstimate;
-    while ((oldEstimate = totalWeightEstimate) <= totalWeightLimit) {
-      int newEstimate = oldEstimate + (weight - oldWeight); // estimate may go up or down
-      if (TOTAL_WEIGHT_ESTIMATE_UPDATER.compareAndSet(this, oldEstimate, newEstimate)) {
-        elements[pos] = new Weighed<>(key, value, weight);
-        if (newEstimate > totalWeightLimit) {
-          // totalWeightEstimate is now above the limit, making the cache read-only to others.
-          // As we sweep the cache we evict elements to move the estimate back below the limit.
-          // When we publish the reduced estimate, the cache becomes writable again.
-          beginSweep(pos, weight);
+
+    private V produceAndStoreValue(K key, Function<K, ? extends V> producer, int pos, int oldWeight) {
+        V value = producer.apply(key);
+        int weight = weigher.applyAsInt(value);
+        if (weight > totalWeightLimit) {
+            return value; // too big to cache
         }
-        break;
-      }
+        int oldEstimate;
+        while ((oldEstimate = totalWeightEstimate) <= totalWeightLimit) {
+            int newEstimate = oldEstimate + (weight - oldWeight); // estimate may go up or down
+            if (TOTAL_WEIGHT_ESTIMATE_UPDATER.compareAndSet(this, oldEstimate, newEstimate)) {
+                elements[pos] = new Weighed<>(key, value, weight);
+                if (newEstimate > totalWeightLimit) {
+                    // totalWeightEstimate is now above the limit, making the cache read-only to others.
+                    // As we sweep the cache we evict elements to move the estimate back below the limit.
+                    // When we publish the reduced estimate, the cache becomes writable again.
+                    beginSweep(pos, weight);
+                }
+                break;
+            }
+        }
+        return value;
     }
-    return value;
-  }
-
-  /**
-   * Sweeps the cache re-calculating the total weight, evicting any elements that would tip it over.
-   */
-  private void beginSweep(int startPos, int startWeight) {
-    // sweep forward from updated position, wrapping round to cover all other slots in the cache
-    int totalWeight = startWeight;
-    for (int i = (startPos + 1) & mask; i != startPos; i = (i + 1) & mask) {
-      Weighed<K, V> element = elements[i];
-      if (element != null && element != EVICTED) {
-        totalWeight += element.weight;
-        if (totalWeight > totalWeightTarget) {
-          totalWeight -= element.weight;
-          elements[i] = EVICTED;
+
+    /**
+     * Sweeps the cache re-calculating the total weight, evicting any elements that would tip it over.
+     */
+    private void beginSweep(int startPos, int startWeight) {
+        // sweep forward from updated position, wrapping round to cover all other slots in the cache
+        int totalWeight = startWeight;
+        for (int i = (startPos + 1) & mask; i != startPos; i = (i + 1) & mask) {
+            Weighed<K, V> element = elements[i];
+            if (element != null && element != EVICTED) {
+                totalWeight += element.weight;
+                if (totalWeight > totalWeightTarget) {
+                    totalWeight -= element.weight;
+                    elements[i] = EVICTED;
+                }
+            }
         }
-      }
+        totalWeightEstimate = totalWeight;
     }
-    totalWeightEstimate = totalWeight;
-  }
-
-  static final class Weighed<K, V> {
-    final K key;
-    final V value;
-    final int weight;
-
-    Weighed(K key, V value, int weight) {
-      this.key = key;
-      this.value = value;
-      this.weight = weight;
+
+    static final class Weighed<K, V> {
+        final K key;
+        final V value;
+        final int weight;
+
+        Weighed(K key, V value, int weight) {
+            this.key = key;
+            this.value = value;
+            this.weight = weight;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/cache/QualifiedClassNameCache.java b/internal-api/src/main/java/datadog/trace/api/cache/QualifiedClassNameCache.java
index 6e17760f45e..e05d7371b3a 100644
--- a/internal-api/src/main/java/datadog/trace/api/cache/QualifiedClassNameCache.java
+++ b/internal-api/src/main/java/datadog/trace/api/cache/QualifiedClassNameCache.java
@@ -5,56 +5,54 @@
 
 public final class QualifiedClassNameCache extends ClassValue<QualifiedClassNameCache.Leaf> {
 
-  private final Function<Class<?>, CharSequence> formatter;
-  private final Functions.Join joiner;
-  private final int leafSize;
-
-  public QualifiedClassNameCache(
-      Function<Class<?>, CharSequence> formatter, Functions.Join joiner) {
-    this(formatter, joiner, 16);
-  }
-
-  public QualifiedClassNameCache(
-      Function<Class<?>, CharSequence> formatter, Functions.Join joiner, int leafSize) {
-    this.formatter = formatter;
-    this.joiner = joiner;
-    this.leafSize = leafSize;
-  }
-
-  @Override
-  protected Leaf computeValue(Class<?> type) {
-    return new Leaf(formatter.apply(type), joiner, leafSize);
-  }
-
-  static final class Leaf {
-
-    private final CharSequence name;
-
-    private final DDCache<CharSequence, CharSequence> cache;
-    private final Function<CharSequence, CharSequence> joiner;
-
-    private Leaf(CharSequence name, Functions.Join joiner, int leafSize) {
-      this.name = name;
-      // the class provides a natural bound on the number of elements
-      // (e.g. the number of methods)
-      this.cache = DDCaches.newUnboundedCache(leafSize);
-      this.joiner = joiner.curry(name);
+    private final Function<Class<?>, CharSequence> formatter;
+    private final Functions.Join joiner;
+    private final int leafSize;
+
+    public QualifiedClassNameCache(Function<Class<?>, CharSequence> formatter, Functions.Join joiner) {
+        this(formatter, joiner, 16);
+    }
+
+    public QualifiedClassNameCache(Function<Class<?>, CharSequence> formatter, Functions.Join joiner, int leafSize) {
+        this.formatter = formatter;
+        this.joiner = joiner;
+        this.leafSize = leafSize;
     }
 
-    CharSequence get(CharSequence name) {
-      return cache.computeIfAbsent(name, joiner);
+    @Override
+    protected Leaf computeValue(Class<?> type) {
+        return new Leaf(formatter.apply(type), joiner, leafSize);
     }
 
-    CharSequence getName() {
-      return name;
+    static final class Leaf {
+
+        private final CharSequence name;
+
+        private final DDCache<CharSequence, CharSequence> cache;
+        private final Function<CharSequence, CharSequence> joiner;
+
+        private Leaf(CharSequence name, Functions.Join joiner, int leafSize) {
+            this.name = name;
+            // the class provides a natural bound on the number of elements
+            // (e.g. the number of methods)
+            this.cache = DDCaches.newUnboundedCache(leafSize);
+            this.joiner = joiner.curry(name);
+        }
+
+        CharSequence get(CharSequence name) {
+            return cache.computeIfAbsent(name, joiner);
+        }
+
+        CharSequence getName() {
+            return name;
+        }
     }
-  }
 
-  public CharSequence getClassName(Class<?> klass) {
-    return get(klass).getName();
-  }
+    public CharSequence getClassName(Class<?> klass) {
+        return get(klass).getName();
+    }
 
-  public CharSequence getQualifiedName(Class<?> klass, String qualifier) {
-    return get(klass).get(qualifier);
-  }
+    public CharSequence getQualifiedName(Class<?> klass, String qualifier) {
+        return get(klass).get(qualifier);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/cache/RadixTreeCache.java b/internal-api/src/main/java/datadog/trace/api/cache/RadixTreeCache.java
index 5156e0c56ae..711f1b49839 100644
--- a/internal-api/src/main/java/datadog/trace/api/cache/RadixTreeCache.java
+++ b/internal-api/src/main/java/datadog/trace/api/cache/RadixTreeCache.java
@@ -5,57 +5,56 @@
 
 /** Sparse cache of values associated with a small integer */
 public final class RadixTreeCache<T> {
-  private static final IntFunction<UTF8BytesString> TO_STRING =
-      value -> UTF8BytesString.create(Integer.toString(value));
-
-  public static final int UNSET_STATUS = 0;
-  // should cover range [0, 512) to cover all standard HTTP statuses
-  // 16 pages of 32 should keep the tree sparse with typical pages
-  // covering ranges [192, 224), [288, 320), [384, 416), [480, 512)
-  public static final RadixTreeCache<UTF8BytesString> HTTP_STATUSES =
-      new RadixTreeCache<>(
-          16, 32, TO_STRING, 200, 201, 301, 307, 400, 401, 403, 404, 500, 502, 503);
-
-  private final int level1;
-  private final int level2;
-  private final int shift;
-  private final int mask;
-
-  private final Object[][] tree;
-  private final IntFunction<T> mapper;
-
-  public RadixTreeCache(int level1, int level2, IntFunction<T> mapper, int... commonValues) {
-    this.tree = new Object[level1][];
-    this.mapper = mapper;
-    this.level1 = level1;
-    this.level2 = level2;
-    this.mask = level2 - 1;
-    this.shift = Integer.bitCount(mask);
-    for (int commonValue : commonValues) {
-      get(commonValue);
+    private static final IntFunction<UTF8BytesString> TO_STRING =
+            value -> UTF8BytesString.create(Integer.toString(value));
+
+    public static final int UNSET_STATUS = 0;
+    // should cover range [0, 512) to cover all standard HTTP statuses
+    // 16 pages of 32 should keep the tree sparse with typical pages
+    // covering ranges [192, 224), [288, 320), [384, 416), [480, 512)
+    public static final RadixTreeCache<UTF8BytesString> HTTP_STATUSES =
+            new RadixTreeCache<>(16, 32, TO_STRING, 200, 201, 301, 307, 400, 401, 403, 404, 500, 502, 503);
+
+    private final int level1;
+    private final int level2;
+    private final int shift;
+    private final int mask;
+
+    private final Object[][] tree;
+    private final IntFunction<T> mapper;
+
+    public RadixTreeCache(int level1, int level2, IntFunction<T> mapper, int... commonValues) {
+        this.tree = new Object[level1][];
+        this.mapper = mapper;
+        this.level1 = level1;
+        this.level2 = level2;
+        this.mask = level2 - 1;
+        this.shift = Integer.bitCount(mask);
+        for (int commonValue : commonValues) {
+            get(commonValue);
+        }
     }
-  }
 
-  public T get(int primitive) {
-    int prefix = primitive >>> shift;
-    // bounds check both ends with one check
-    if (prefix >= level1) {
-      return mapper.apply(primitive);
+    public T get(int primitive) {
+        int prefix = primitive >>> shift;
+        // bounds check both ends with one check
+        if (prefix >= level1) {
+            return mapper.apply(primitive);
+        }
+        return computeIfAbsent(prefix, primitive);
     }
-    return computeIfAbsent(prefix, primitive);
-  }
-
-  @SuppressWarnings("unchecked")
-  private T computeIfAbsent(int prefix, int primitive) {
-    Object[] page = tree[prefix];
-    if (page == null) {
-      page = tree[prefix] = new Object[level2]; // tolerate race to cache sub-array
-    }
-    int suffix = primitive & mask;
-    Object cached = page[suffix];
-    if (cached == null) {
-      cached = page[suffix] = mapper.apply(primitive); // tolerate race to cache value
+
+    @SuppressWarnings("unchecked")
+    private T computeIfAbsent(int prefix, int primitive) {
+        Object[] page = tree[prefix];
+        if (page == null) {
+            page = tree[prefix] = new Object[level2]; // tolerate race to cache sub-array
+        }
+        int suffix = primitive & mask;
+        Object cached = page[suffix];
+        if (cached == null) {
+            cached = page[suffix] = mapper.apply(primitive); // tolerate race to cache value
+        }
+        return (T) cached;
     }
-    return (T) cached;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/CIConstants.java b/internal-api/src/main/java/datadog/trace/api/civisibility/CIConstants.java
index 648d2cd15c5..a42628850a2 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/CIConstants.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/CIConstants.java
@@ -2,21 +2,21 @@
 
 public interface CIConstants {
 
-  /**
-   * Maximum length (in characters) of a meta string value sent to the CI Visibility intake; longer
-   * values are truncated. Matches the Event Platform (EVP) per-tag-value limit.
-   */
-  int MAX_META_STRING_VALUE_LENGTH = 5000;
+    /**
+     * Maximum length (in characters) of a meta string value sent to the CI Visibility intake; longer
+     * values are truncated. Matches the Event Platform (EVP) per-tag-value limit.
+     */
+    int MAX_META_STRING_VALUE_LENGTH = 5000;
 
-  String SELENIUM_BROWSER_DRIVER = "selenium";
+    String SELENIUM_BROWSER_DRIVER = "selenium";
 
-  String FAIL_FAST_TEST_ORDER = "FAILFAST";
+    String FAIL_FAST_TEST_ORDER = "FAILFAST";
 
-  String CIAPP_TEST_ORIGIN = "ciapp-test";
+    String CIAPP_TEST_ORIGIN = "ciapp-test";
 
-  /** Tags that change the behaviour of CI Vis features when applied to a test case. */
-  interface Tags {
-    String ITR_UNSKIPPABLE_TAG = "datadog_itr_unskippable";
-    String EFD_DISABLE_TAG = "datadog_efd_disable";
-  }
+    /** Tags that change the behaviour of CI Vis features when applied to a test case. */
+    interface Tags {
+        String ITR_UNSKIPPABLE_TAG = "datadog_itr_unskippable";
+        String EFD_DISABLE_TAG = "datadog_efd_disable";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/CiVisibilityWellKnownTags.java b/internal-api/src/main/java/datadog/trace/api/civisibility/CiVisibilityWellKnownTags.java
index 5edbd908e91..8cf41b33ce3 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/CiVisibilityWellKnownTags.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/CiVisibilityWellKnownTags.java
@@ -5,86 +5,85 @@
 
 public class CiVisibilityWellKnownTags {
 
-  private final UTF8BytesString runtimeId;
-  private final UTF8BytesString env;
-  private final UTF8BytesString language;
-  private final UTF8BytesString runtimeName;
-  private final UTF8BytesString runtimeVersion;
-  private final UTF8BytesString runtimeVendor;
-  private final UTF8BytesString osArch;
-  private final UTF8BytesString osPlatform;
-  private final UTF8BytesString osVersion;
-  private final UTF8BytesString isUserProvidedService;
+    private final UTF8BytesString runtimeId;
+    private final UTF8BytesString env;
+    private final UTF8BytesString language;
+    private final UTF8BytesString runtimeName;
+    private final UTF8BytesString runtimeVersion;
+    private final UTF8BytesString runtimeVendor;
+    private final UTF8BytesString osArch;
+    private final UTF8BytesString osPlatform;
+    private final UTF8BytesString osVersion;
+    private final UTF8BytesString isUserProvidedService;
 
-  public CiVisibilityWellKnownTags(
-      CharSequence runtimeId,
-      CharSequence env,
-      CharSequence language,
-      CharSequence runtimeName,
-      CharSequence runtimeVersion,
-      CharSequence runtimeVendor,
-      CharSequence osArch,
-      CharSequence osPlatform,
-      CharSequence osVersion,
-      CharSequence isUserProvidedService) {
-    this.runtimeId = truncated(runtimeId);
-    this.env = truncated(env);
-    this.language = truncated(language);
-    this.runtimeName = truncated(runtimeName);
-    this.runtimeVersion = truncated(runtimeVersion);
-    this.runtimeVendor = truncated(runtimeVendor);
-    this.osArch = truncated(osArch);
-    this.osPlatform = truncated(osPlatform);
-    this.osVersion = truncated(osVersion);
-    this.isUserProvidedService = truncated(isUserProvidedService);
-  }
+    public CiVisibilityWellKnownTags(
+            CharSequence runtimeId,
+            CharSequence env,
+            CharSequence language,
+            CharSequence runtimeName,
+            CharSequence runtimeVersion,
+            CharSequence runtimeVendor,
+            CharSequence osArch,
+            CharSequence osPlatform,
+            CharSequence osVersion,
+            CharSequence isUserProvidedService) {
+        this.runtimeId = truncated(runtimeId);
+        this.env = truncated(env);
+        this.language = truncated(language);
+        this.runtimeName = truncated(runtimeName);
+        this.runtimeVersion = truncated(runtimeVersion);
+        this.runtimeVendor = truncated(runtimeVendor);
+        this.osArch = truncated(osArch);
+        this.osPlatform = truncated(osPlatform);
+        this.osVersion = truncated(osVersion);
+        this.isUserProvidedService = truncated(isUserProvidedService);
+    }
 
-  /**
-   * Truncates a well-known tag value to the EVP per-value limit once, up front, and stores it
-   * pre-encoded so the intake serializers can marshal it as-is on every payload without truncating.
-   */
-  private static UTF8BytesString truncated(CharSequence value) {
-    return UTF8BytesString.create(
-        Strings.truncate(value, CIConstants.MAX_META_STRING_VALUE_LENGTH));
-  }
+    /**
+     * Truncates a well-known tag value to the EVP per-value limit once, up front, and stores it
+     * pre-encoded so the intake serializers can marshal it as-is on every payload without truncating.
+     */
+    private static UTF8BytesString truncated(CharSequence value) {
+        return UTF8BytesString.create(Strings.truncate(value, CIConstants.MAX_META_STRING_VALUE_LENGTH));
+    }
 
-  public UTF8BytesString getEnv() {
-    return env;
-  }
+    public UTF8BytesString getEnv() {
+        return env;
+    }
 
-  public UTF8BytesString getLanguage() {
-    return language;
-  }
+    public UTF8BytesString getLanguage() {
+        return language;
+    }
 
-  public UTF8BytesString getOsArch() {
-    return osArch;
-  }
+    public UTF8BytesString getOsArch() {
+        return osArch;
+    }
 
-  public UTF8BytesString getOsPlatform() {
-    return osPlatform;
-  }
+    public UTF8BytesString getOsPlatform() {
+        return osPlatform;
+    }
 
-  public UTF8BytesString getOsVersion() {
-    return osVersion;
-  }
+    public UTF8BytesString getOsVersion() {
+        return osVersion;
+    }
 
-  public UTF8BytesString getRuntimeId() {
-    return runtimeId;
-  }
+    public UTF8BytesString getRuntimeId() {
+        return runtimeId;
+    }
 
-  public UTF8BytesString getRuntimeName() {
-    return runtimeName;
-  }
+    public UTF8BytesString getRuntimeName() {
+        return runtimeName;
+    }
 
-  public UTF8BytesString getRuntimeVersion() {
-    return runtimeVersion;
-  }
+    public UTF8BytesString getRuntimeVersion() {
+        return runtimeVersion;
+    }
 
-  public UTF8BytesString getRuntimeVendor() {
-    return runtimeVendor;
-  }
+    public UTF8BytesString getRuntimeVendor() {
+        return runtimeVendor;
+    }
 
-  public UTF8BytesString getIsUserProvidedService() {
-    return isUserProvidedService;
-  }
+    public UTF8BytesString getIsUserProvidedService() {
+        return isUserProvidedService;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationBridge.java b/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationBridge.java
index ee3b1d51e19..30fef56f5ec 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationBridge.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationBridge.java
@@ -10,38 +10,35 @@
 
 public abstract class InstrumentationBridge {
 
-  private static volatile TestEventsHandler.Factory TEST_EVENTS_HANDLER_FACTORY;
-  private static volatile BuildEventsHandler.Factory BUILD_EVENTS_HANDLER_FACTORY;
-  private static volatile CiVisibilityMetricCollector METRIC_COLLECTOR =
-      NoOpMetricCollector.INSTANCE;
-
-  public static void registerTestEventsHandlerFactory(
-      TestEventsHandler.Factory testEventsHandlerFactory) {
-    TEST_EVENTS_HANDLER_FACTORY = testEventsHandlerFactory;
-  }
-
-  public static <SuiteKey, TestKey> TestEventsHandler<SuiteKey, TestKey> createTestEventsHandler(
-      String component,
-      ContextStore<SuiteKey, DDTestSuite> suiteStore,
-      ContextStore<TestKey, DDTest> testStore,
-      Collection<LibraryCapability> capabilities) {
-    return TEST_EVENTS_HANDLER_FACTORY.create(component, suiteStore, testStore, capabilities);
-  }
-
-  public static void registerBuildEventsHandlerFactory(
-      BuildEventsHandler.Factory buildEventsHandlerFactory) {
-    BUILD_EVENTS_HANDLER_FACTORY = buildEventsHandlerFactory;
-  }
-
-  public static <U> BuildEventsHandler<U> createBuildEventsHandler() {
-    return BUILD_EVENTS_HANDLER_FACTORY.create();
-  }
-
-  public static void registerMetricCollector(CiVisibilityMetricCollector metricCollector) {
-    METRIC_COLLECTOR = metricCollector;
-  }
-
-  public static CiVisibilityMetricCollector getMetricCollector() {
-    return METRIC_COLLECTOR;
-  }
+    private static volatile TestEventsHandler.Factory TEST_EVENTS_HANDLER_FACTORY;
+    private static volatile BuildEventsHandler.Factory BUILD_EVENTS_HANDLER_FACTORY;
+    private static volatile CiVisibilityMetricCollector METRIC_COLLECTOR = NoOpMetricCollector.INSTANCE;
+
+    public static void registerTestEventsHandlerFactory(TestEventsHandler.Factory testEventsHandlerFactory) {
+        TEST_EVENTS_HANDLER_FACTORY = testEventsHandlerFactory;
+    }
+
+    public static <SuiteKey, TestKey> TestEventsHandler<SuiteKey, TestKey> createTestEventsHandler(
+            String component,
+            ContextStore<SuiteKey, DDTestSuite> suiteStore,
+            ContextStore<TestKey, DDTest> testStore,
+            Collection<LibraryCapability> capabilities) {
+        return TEST_EVENTS_HANDLER_FACTORY.create(component, suiteStore, testStore, capabilities);
+    }
+
+    public static void registerBuildEventsHandlerFactory(BuildEventsHandler.Factory buildEventsHandlerFactory) {
+        BUILD_EVENTS_HANDLER_FACTORY = buildEventsHandlerFactory;
+    }
+
+    public static <U> BuildEventsHandler<U> createBuildEventsHandler() {
+        return BUILD_EVENTS_HANDLER_FACTORY.create();
+    }
+
+    public static void registerMetricCollector(CiVisibilityMetricCollector metricCollector) {
+        METRIC_COLLECTOR = metricCollector;
+    }
+
+    public static CiVisibilityMetricCollector getMetricCollector() {
+        return METRIC_COLLECTOR;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationTestBridge.java b/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationTestBridge.java
index 084cc1a2926..2b3510bb8c4 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationTestBridge.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationTestBridge.java
@@ -14,35 +14,34 @@
  */
 public abstract class InstrumentationTestBridge {
 
-  private static final CopyOnWriteArrayList<TestListener> TEST_LISTENERS =
-      new CopyOnWriteArrayList<>();
-
-  private InstrumentationTestBridge() {}
-
-  @Nullable
-  public static TestContext getCurrentTestContext() {
-    AgentSpan span = activeSpan();
-    if (span == null) {
-      return null;
-    }
-    RequestContext requestContext = span.getRequestContext();
-    if (requestContext == null) {
-      return null;
+    private static final CopyOnWriteArrayList<TestListener> TEST_LISTENERS = new CopyOnWriteArrayList<>();
+
+    private InstrumentationTestBridge() {}
+
+    @Nullable
+    public static TestContext getCurrentTestContext() {
+        AgentSpan span = activeSpan();
+        if (span == null) {
+            return null;
+        }
+        RequestContext requestContext = span.getRequestContext();
+        if (requestContext == null) {
+            return null;
+        }
+        return requestContext.getData(RequestContextSlot.CI_VISIBILITY);
     }
-    return requestContext.getData(RequestContextSlot.CI_VISIBILITY);
-  }
 
-  public static void fireBeforeTestEnd(TestContext testContext) {
-    for (TestListener testListener : TEST_LISTENERS) {
-      testListener.beforeTestEnd(testContext);
+    public static void fireBeforeTestEnd(TestContext testContext) {
+        for (TestListener testListener : TEST_LISTENERS) {
+            testListener.beforeTestEnd(testContext);
+        }
     }
-  }
 
-  public static void registerListener(TestListener listener) {
-    TEST_LISTENERS.addIfAbsent(listener);
-  }
+    public static void registerListener(TestListener listener) {
+        TEST_LISTENERS.addIfAbsent(listener);
+    }
 
-  public interface TestListener {
-    void beforeTestEnd(TestContext testContext);
-  }
+    public interface TestListener {
+        void beforeTestEnd(TestContext testContext);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/BazelMode.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/BazelMode.java
index 56698fe7085..05973a162ca 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/BazelMode.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/BazelMode.java
@@ -17,323 +17,322 @@
 
 public class BazelMode {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(BazelMode.class);
-
-  private static volatile BazelMode INSTANCE;
-
-  private static final int SUPPORTED_MANIFEST_VERSION = 1;
-
-  private static final String SETTINGS_FILE = "cache/http/settings.json";
-  private static final String FLAKY_TESTS_FILE = "cache/http/flaky_tests.json";
-  private static final String KNOWN_TESTS_FILE = "cache/http/known_tests.json";
-  private static final String TEST_MANAGEMENT_FILE = "cache/http/test_management.json";
-
-  /* manifestModeEnabled reports whether a supported manifest was found and can be used for config cache */
-  private final boolean manifestModeEnabled;
-  /* manifestPath is the resolved absolute path to the Bazel manifest while in manifest mode */
-  @Nullable private final String manifestPath;
-  /* manifestDir is the directory containing the resolved manifest and the cached config files */
-  @Nullable private final String manifestDir;
-  /* payloadFilesEnabled reports whether Bazel payload-in-file mode is enabled */
-  private final boolean payloadFilesEnabled;
-  /* payloadsDir is the root directory containing payload output directories */
-  @Nullable private final String payloadsDir;
-  /* repoRoot is the absolute path to the runfiles workspace dir, used as a virtual repo root */
-  @Nullable private final String repoRoot;
-
-  public static BazelMode get() {
-    if (INSTANCE == null) {
-      synchronized (BazelMode.class) {
+    private static final Logger LOGGER = LoggerFactory.getLogger(BazelMode.class);
+
+    private static volatile BazelMode INSTANCE;
+
+    private static final int SUPPORTED_MANIFEST_VERSION = 1;
+
+    private static final String SETTINGS_FILE = "cache/http/settings.json";
+    private static final String FLAKY_TESTS_FILE = "cache/http/flaky_tests.json";
+    private static final String KNOWN_TESTS_FILE = "cache/http/known_tests.json";
+    private static final String TEST_MANAGEMENT_FILE = "cache/http/test_management.json";
+
+    /* manifestModeEnabled reports whether a supported manifest was found and can be used for config cache */
+    private final boolean manifestModeEnabled;
+    /* manifestPath is the resolved absolute path to the Bazel manifest while in manifest mode */
+    @Nullable
+    private final String manifestPath;
+    /* manifestDir is the directory containing the resolved manifest and the cached config files */
+    @Nullable
+    private final String manifestDir;
+    /* payloadFilesEnabled reports whether Bazel payload-in-file mode is enabled */
+    private final boolean payloadFilesEnabled;
+    /* payloadsDir is the root directory containing payload output directories */
+    @Nullable
+    private final String payloadsDir;
+    /* repoRoot is the absolute path to the runfiles workspace dir, used as a virtual repo root */
+    @Nullable
+    private final String repoRoot;
+
+    public static BazelMode get() {
         if (INSTANCE == null) {
-          INSTANCE = new BazelMode(Config.get());
+            synchronized (BazelMode.class) {
+                if (INSTANCE == null) {
+                    INSTANCE = new BazelMode(Config.get());
+                }
+            }
         }
-      }
+        return INSTANCE;
     }
-    return INSTANCE;
-  }
-
-  @VisibleForTesting
-  BazelMode(Config config) {
-    String manifestRloc = config.getTestOptimizationManifestFile();
-    if (Strings.isNotBlank(manifestRloc)) {
-      LOGGER.debug("[bazel mode] Resolving manifest path from '{}'", manifestRloc);
-      manifestPath = resolveRlocation(manifestRloc);
-      if (manifestPath != null) {
-        manifestDir = new File(manifestPath).getParent();
-        manifestModeEnabled = isManifestCompatible(manifestPath);
-        LOGGER.info(
-            "[bazel mode] Manifest file resolved (path: '{}', enabled: {})",
-            manifestPath,
-            manifestModeEnabled);
-      } else {
-        manifestModeEnabled = false;
-        manifestDir = null;
-        LOGGER.warn(
-            "[bazel mode] Could not resolve manifest file '{}', disabling manifest mode",
-            manifestRloc);
-      }
-    } else {
-      manifestModeEnabled = false;
-      manifestPath = null;
-      manifestDir = null;
+
+    @VisibleForTesting
+    BazelMode(Config config) {
+        String manifestRloc = config.getTestOptimizationManifestFile();
+        if (Strings.isNotBlank(manifestRloc)) {
+            LOGGER.debug("[bazel mode] Resolving manifest path from '{}'", manifestRloc);
+            manifestPath = resolveRlocation(manifestRloc);
+            if (manifestPath != null) {
+                manifestDir = new File(manifestPath).getParent();
+                manifestModeEnabled = isManifestCompatible(manifestPath);
+                LOGGER.info(
+                        "[bazel mode] Manifest file resolved (path: '{}', enabled: {})",
+                        manifestPath,
+                        manifestModeEnabled);
+            } else {
+                manifestModeEnabled = false;
+                manifestDir = null;
+                LOGGER.warn("[bazel mode] Could not resolve manifest file '{}', disabling manifest mode", manifestRloc);
+            }
+        } else {
+            manifestModeEnabled = false;
+            manifestPath = null;
+            manifestDir = null;
+        }
+
+        // TEST_UNDECLARED_OUTPUTS_DIR is a Bazel-provided env var, not a DD configuration
+        String undeclaredOutputsDir = ConfigHelper.env("TEST_UNDECLARED_OUTPUTS_DIR");
+        if (config.isTestOptimizationPayloadsInFiles() && Strings.isNotBlank(undeclaredOutputsDir)) {
+            payloadsDir = undeclaredOutputsDir + File.separator + "payloads";
+            payloadFilesEnabled = true;
+            LOGGER.info("[bazel mode] Payload-in-files mode enabled with payload directory {}", payloadsDir);
+        } else {
+            payloadsDir = null;
+            payloadFilesEnabled = false;
+            if (config.isTestOptimizationPayloadsInFiles()) {
+                LOGGER.warn(
+                        "[bazel mode] Payload-in-files mode requested but no payload directory was provided; disabling");
+            }
+        }
+
+        repoRoot = resolveRepoRoot();
+        if (repoRoot != null) {
+            LOGGER.info("[bazel mode] Repo root resolved to runfiles workspace dir {}", repoRoot);
+        }
+
+        LOGGER.debug("[bazel mode] Resolved mode {}", this);
+    }
+
+    /**
+     * Resolves the runfiles workspace dir to use as a virtual repo root for source-path resolution.
+     * Returns {@code null} if the runfiles layout cannot be determined.
+     */
+    @Nullable
+    private static String resolveRepoRoot() {
+        String workspace = ConfigHelper.env("TEST_WORKSPACE");
+        if (Strings.isBlank(workspace)) {
+            return null;
+        }
+
+        String testSrcDir = ConfigHelper.env("TEST_SRCDIR");
+        if (Strings.isNotBlank(testSrcDir)) {
+            File candidate = new File(testSrcDir, workspace);
+            if (candidate.isDirectory()) {
+                return candidate.getAbsolutePath();
+            }
+        }
+
+        String runfilesDir = ConfigHelper.env("RUNFILES_DIR");
+        if (Strings.isNotBlank(runfilesDir)) {
+            File candidate = new File(runfilesDir, workspace);
+            if (candidate.isDirectory()) {
+                return candidate.getAbsolutePath();
+            }
+        }
+
+        return null;
     }
 
-    // TEST_UNDECLARED_OUTPUTS_DIR is a Bazel-provided env var, not a DD configuration
-    String undeclaredOutputsDir = ConfigHelper.env("TEST_UNDECLARED_OUTPUTS_DIR");
-    if (config.isTestOptimizationPayloadsInFiles() && Strings.isNotBlank(undeclaredOutputsDir)) {
-      payloadsDir = undeclaredOutputsDir + File.separator + "payloads";
-      payloadFilesEnabled = true;
-      LOGGER.info(
-          "[bazel mode] Payload-in-files mode enabled with payload directory {}", payloadsDir);
-    } else {
-      payloadsDir = null;
-      payloadFilesEnabled = false;
-      if (config.isTestOptimizationPayloadsInFiles()) {
-        LOGGER.warn(
-            "[bazel mode] Payload-in-files mode requested but no payload directory was provided; disabling");
-      }
+    @Override
+    public String toString() {
+        return "BazelMode{"
+                + "manifestModeEnabled="
+                + manifestModeEnabled
+                + ", manifestPath="
+                + manifestPath
+                + ", manifestDir="
+                + manifestDir
+                + ", payloadFilesEnabled="
+                + payloadFilesEnabled
+                + ", payloadsDir="
+                + payloadsDir
+                + ", repoRoot="
+                + repoRoot
+                + '}';
     }
 
-    repoRoot = resolveRepoRoot();
-    if (repoRoot != null) {
-      LOGGER.info("[bazel mode] Repo root resolved to runfiles workspace dir {}", repoRoot);
+    /** Returns {@code true} if either manifest mode or payloads-in-files mode is active. */
+    public boolean isEnabled() {
+        return manifestModeEnabled || payloadFilesEnabled;
     }
 
-    LOGGER.debug("[bazel mode] Resolved mode {}", this);
-  }
-
-  /**
-   * Resolves the runfiles workspace dir to use as a virtual repo root for source-path resolution.
-   * Returns {@code null} if the runfiles layout cannot be determined.
-   */
-  @Nullable
-  private static String resolveRepoRoot() {
-    String workspace = ConfigHelper.env("TEST_WORKSPACE");
-    if (Strings.isBlank(workspace)) {
-      return null;
+    public boolean isManifestModeEnabled() {
+        return manifestModeEnabled;
     }
 
-    String testSrcDir = ConfigHelper.env("TEST_SRCDIR");
-    if (Strings.isNotBlank(testSrcDir)) {
-      File candidate = new File(testSrcDir, workspace);
-      if (candidate.isDirectory()) {
-        return candidate.getAbsolutePath();
-      }
+    public boolean isPayloadFilesEnabled() {
+        return payloadFilesEnabled;
     }
 
-    String runfilesDir = ConfigHelper.env("RUNFILES_DIR");
-    if (Strings.isNotBlank(runfilesDir)) {
-      File candidate = new File(runfilesDir, workspace);
-      if (candidate.isDirectory()) {
-        return candidate.getAbsolutePath();
-      }
+    @Nullable
+    public String getPayloadsDir() {
+        return payloadsDir;
     }
 
-    return null;
-  }
-
-  @Override
-  public String toString() {
-    return "BazelMode{"
-        + "manifestModeEnabled="
-        + manifestModeEnabled
-        + ", manifestPath="
-        + manifestPath
-        + ", manifestDir="
-        + manifestDir
-        + ", payloadFilesEnabled="
-        + payloadFilesEnabled
-        + ", payloadsDir="
-        + payloadsDir
-        + ", repoRoot="
-        + repoRoot
-        + '}';
-  }
-
-  /** Returns {@code true} if either manifest mode or payloads-in-files mode is active. */
-  public boolean isEnabled() {
-    return manifestModeEnabled || payloadFilesEnabled;
-  }
-
-  public boolean isManifestModeEnabled() {
-    return manifestModeEnabled;
-  }
-
-  public boolean isPayloadFilesEnabled() {
-    return payloadFilesEnabled;
-  }
-
-  @Nullable
-  public String getPayloadsDir() {
-    return payloadsDir;
-  }
-
-  @Nullable
-  public String getTestPayloadsDir() {
-    return payloadsDir != null ? payloadsDir + File.separator + "tests" : null;
-  }
-
-  @Nullable
-  public String getCoveragePayloadsDir() {
-    return payloadsDir != null ? payloadsDir + File.separator + "coverage" : null;
-  }
-
-  @Nullable
-  public String getTelemetryPayloadsDir() {
-    return payloadsDir != null ? payloadsDir + File.separator + "telemetry" : null;
-  }
-
-  /**
-   * Returns the absolute path of the runfiles workspace dir, suitable for use as a virtual repo
-   * root by the source-path resolver. {@code null} when the runfiles layout cannot be determined.
-   */
-  @Nullable
-  public String getRepoRoot() {
-    return repoRoot;
-  }
-
-  @Nullable
-  public String getSettingsPath() {
-    return resolveToptFile(SETTINGS_FILE);
-  }
-
-  @Nullable
-  public String getFlakyTestsPath() {
-    return resolveToptFile(FLAKY_TESTS_FILE);
-  }
-
-  @Nullable
-  public String getKnownTestsPath() {
-    return resolveToptFile(KNOWN_TESTS_FILE);
-  }
-
-  @Nullable
-  public String getTestManagementPath() {
-    return resolveToptFile(TEST_MANAGEMENT_FILE);
-  }
-
-  @Nullable
-  private String resolveToptFile(String relativePath) {
-    if (manifestDir == null) {
-      return null;
+    @Nullable
+    public String getTestPayloadsDir() {
+        return payloadsDir != null ? payloadsDir + File.separator + "tests" : null;
     }
-    File file = new File(manifestDir, relativePath);
-    return file.exists() ? file.getAbsolutePath() : null;
-  }
-
-  private static boolean isManifestCompatible(String manifestPath) {
-    try (BufferedReader reader =
-        new BufferedReader(new InputStreamReader(new FileInputStream(manifestPath), UTF_8))) {
-      String firstLine = reader.readLine();
-      if (firstLine == null) {
-        LOGGER.warn("[bazel mode] Manifest file is empty: {}", manifestPath);
-        return false;
-      }
-      // manifest.txt first line has the shape `version=<int>`
-      String trimmed = firstLine.trim();
-      int separatorIdx = trimmed.indexOf('=');
-      if (separatorIdx < 0 || !"version".equals(trimmed.substring(0, separatorIdx).trim())) {
-        LOGGER.warn("[bazel mode] Could not parse manifest version from line: '{}'", trimmed);
-        return false;
-      }
-      String versionValue = trimmed.substring(separatorIdx + 1).trim();
-      try {
-        int version = Integer.parseInt(versionValue);
-        if (version == SUPPORTED_MANIFEST_VERSION) {
-          return true;
-        }
-        LOGGER.warn(
-            "[bazel mode] Unsupported manifest version: {}, supported: {}",
-            version,
-            SUPPORTED_MANIFEST_VERSION);
-        return false;
-      } catch (NumberFormatException e) {
-        LOGGER.warn("[bazel mode] Could not parse manifest version from line: '{}'", trimmed);
-        return false;
-      }
-    } catch (IOException e) {
-      LOGGER.warn("[bazel mode] Error reading manifest file: {}", manifestPath, e);
-      return false;
+
+    @Nullable
+    public String getCoveragePayloadsDir() {
+        return payloadsDir != null ? payloadsDir + File.separator + "coverage" : null;
+    }
+
+    @Nullable
+    public String getTelemetryPayloadsDir() {
+        return payloadsDir != null ? payloadsDir + File.separator + "telemetry" : null;
+    }
+
+    /**
+     * Returns the absolute path of the runfiles workspace dir, suitable for use as a virtual repo
+     * root by the source-path resolver. {@code null} when the runfiles layout cannot be determined.
+     */
+    @Nullable
+    public String getRepoRoot() {
+        return repoRoot;
+    }
+
+    @Nullable
+    public String getSettingsPath() {
+        return resolveToptFile(SETTINGS_FILE);
+    }
+
+    @Nullable
+    public String getFlakyTestsPath() {
+        return resolveToptFile(FLAKY_TESTS_FILE);
     }
-  }
-
-  /**
-   * Resolves a Bazel runfile rlocation to an absolute path string. Implements the 4-step algorithm:
-   * direct path, $RUNFILES_DIR, $RUNFILES_MANIFEST_FILE, $TEST_SRCDIR.
-   */
-  @Nullable
-  private static String resolveRlocation(String rlocation) {
-    if (Strings.isBlank(rlocation)) {
-      return null;
+
+    @Nullable
+    public String getKnownTestsPath() {
+        return resolveToptFile(KNOWN_TESTS_FILE);
     }
 
-    File direct = new File(rlocation);
-    if (direct.exists()) {
-      LOGGER.debug("[bazel mode] Resolved manifest directly");
-      return direct.getAbsolutePath();
+    @Nullable
+    public String getTestManagementPath() {
+        return resolveToptFile(TEST_MANAGEMENT_FILE);
     }
 
-    String runfilesDir = ConfigHelper.env("RUNFILES_DIR");
-    if (Strings.isNotBlank(runfilesDir)) {
-      File candidate = new File(runfilesDir, rlocation);
-      if (candidate.exists()) {
-        LOGGER.debug(
-            "[bazel mode] Manifest resolved via RUNFILES_DIR (dir: {}, candidate: {})",
-            runfilesDir,
-            candidate);
-        return candidate.getAbsolutePath();
-      }
+    @Nullable
+    private String resolveToptFile(String relativePath) {
+        if (manifestDir == null) {
+            return null;
+        }
+        File file = new File(manifestDir, relativePath);
+        return file.exists() ? file.getAbsolutePath() : null;
     }
 
-    String manifestFile = ConfigHelper.env("RUNFILES_MANIFEST_FILE");
-    if (Strings.isNotBlank(manifestFile)) {
-      String resolved = lookupInRunfilesManifest(manifestFile, rlocation);
-      if (resolved != null) {
-        LOGGER.debug(
-            "[bazel mode] Manifest resolved via RUNFILES_MANIFEST_FILE (candidate: {})", resolved);
-        return resolved;
-      }
+    private static boolean isManifestCompatible(String manifestPath) {
+        try (BufferedReader reader =
+                new BufferedReader(new InputStreamReader(new FileInputStream(manifestPath), UTF_8))) {
+            String firstLine = reader.readLine();
+            if (firstLine == null) {
+                LOGGER.warn("[bazel mode] Manifest file is empty: {}", manifestPath);
+                return false;
+            }
+            // manifest.txt first line has the shape `version=<int>`
+            String trimmed = firstLine.trim();
+            int separatorIdx = trimmed.indexOf('=');
+            if (separatorIdx < 0
+                    || !"version".equals(trimmed.substring(0, separatorIdx).trim())) {
+                LOGGER.warn("[bazel mode] Could not parse manifest version from line: '{}'", trimmed);
+                return false;
+            }
+            String versionValue = trimmed.substring(separatorIdx + 1).trim();
+            try {
+                int version = Integer.parseInt(versionValue);
+                if (version == SUPPORTED_MANIFEST_VERSION) {
+                    return true;
+                }
+                LOGGER.warn(
+                        "[bazel mode] Unsupported manifest version: {}, supported: {}",
+                        version,
+                        SUPPORTED_MANIFEST_VERSION);
+                return false;
+            } catch (NumberFormatException e) {
+                LOGGER.warn("[bazel mode] Could not parse manifest version from line: '{}'", trimmed);
+                return false;
+            }
+        } catch (IOException e) {
+            LOGGER.warn("[bazel mode] Error reading manifest file: {}", manifestPath, e);
+            return false;
+        }
     }
 
-    String testSrcDir = ConfigHelper.env("TEST_SRCDIR");
-    if (Strings.isNotBlank(testSrcDir)) {
-      File candidate = new File(testSrcDir, rlocation);
-      if (candidate.exists()) {
-        LOGGER.debug(
-            "[bazel mode] Manifest resolved via TEST_SRCDIR (dir: {}, candidate: {})",
-            testSrcDir,
-            candidate);
-        return candidate.getAbsolutePath();
-      }
+    /**
+     * Resolves a Bazel runfile rlocation to an absolute path string. Implements the 4-step algorithm:
+     * direct path, $RUNFILES_DIR, $RUNFILES_MANIFEST_FILE, $TEST_SRCDIR.
+     */
+    @Nullable
+    private static String resolveRlocation(String rlocation) {
+        if (Strings.isBlank(rlocation)) {
+            return null;
+        }
+
+        File direct = new File(rlocation);
+        if (direct.exists()) {
+            LOGGER.debug("[bazel mode] Resolved manifest directly");
+            return direct.getAbsolutePath();
+        }
+
+        String runfilesDir = ConfigHelper.env("RUNFILES_DIR");
+        if (Strings.isNotBlank(runfilesDir)) {
+            File candidate = new File(runfilesDir, rlocation);
+            if (candidate.exists()) {
+                LOGGER.debug(
+                        "[bazel mode] Manifest resolved via RUNFILES_DIR (dir: {}, candidate: {})",
+                        runfilesDir,
+                        candidate);
+                return candidate.getAbsolutePath();
+            }
+        }
+
+        String manifestFile = ConfigHelper.env("RUNFILES_MANIFEST_FILE");
+        if (Strings.isNotBlank(manifestFile)) {
+            String resolved = lookupInRunfilesManifest(manifestFile, rlocation);
+            if (resolved != null) {
+                LOGGER.debug("[bazel mode] Manifest resolved via RUNFILES_MANIFEST_FILE (candidate: {})", resolved);
+                return resolved;
+            }
+        }
+
+        String testSrcDir = ConfigHelper.env("TEST_SRCDIR");
+        if (Strings.isNotBlank(testSrcDir)) {
+            File candidate = new File(testSrcDir, rlocation);
+            if (candidate.exists()) {
+                LOGGER.debug(
+                        "[bazel mode] Manifest resolved via TEST_SRCDIR (dir: {}, candidate: {})",
+                        testSrcDir,
+                        candidate);
+                return candidate.getAbsolutePath();
+            }
+        }
+
+        return null;
     }
 
-    return null;
-  }
-
-  @Nullable
-  private static String lookupInRunfilesManifest(String manifestFile, String rlocation) {
-    LOGGER.debug(
-        "[bazel mode] Reading runfiles manifest {} for rlocation {}", manifestFile, rlocation);
-    try (BufferedReader reader =
-        new BufferedReader(new InputStreamReader(new FileInputStream(manifestFile), UTF_8))) {
-      String line;
-      while ((line = reader.readLine()) != null) {
-        int spaceIdx = line.indexOf(' ');
-        if (spaceIdx > 0 && line.substring(0, spaceIdx).equals(rlocation)) {
-          return line.substring(spaceIdx + 1);
+    @Nullable
+    private static String lookupInRunfilesManifest(String manifestFile, String rlocation) {
+        LOGGER.debug("[bazel mode] Reading runfiles manifest {} for rlocation {}", manifestFile, rlocation);
+        try (BufferedReader reader =
+                new BufferedReader(new InputStreamReader(new FileInputStream(manifestFile), UTF_8))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                int spaceIdx = line.indexOf(' ');
+                if (spaceIdx > 0 && line.substring(0, spaceIdx).equals(rlocation)) {
+                    return line.substring(spaceIdx + 1);
+                }
+            }
+        } catch (IOException e) {
+            LOGGER.debug("[bazel mode] Error reading runfiles manifest: {}", manifestFile, e);
+            return null;
         }
-      }
-    } catch (IOException e) {
-      LOGGER.debug("[bazel mode] Error reading runfiles manifest: {}", manifestFile, e);
-      return null;
+        LOGGER.debug("[bazel mode] Runfiles manifest {} did not contain rlocation {}", manifestFile, rlocation);
+        return null;
+    }
+
+    @VisibleForTesting
+    static void reset() {
+        INSTANCE = null;
     }
-    LOGGER.debug(
-        "[bazel mode] Runfiles manifest {} did not contain rlocation {}", manifestFile, rlocation);
-    return null;
-  }
-
-  @VisibleForTesting
-  static void reset() {
-    INSTANCE = null;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/Configurations.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/Configurations.java
index 9a87fdd630e..e76b1288b8c 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/Configurations.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/Configurations.java
@@ -5,137 +5,137 @@
 import java.util.Objects;
 
 public final class Configurations {
-  private final String osPlatform;
-  private final String osArchitecture;
-  private final String osVersion;
-  private final String runtimeName;
-  private final String runtimeVersion;
-  private final String runtimeVendor;
-  private final String runtimeArchitecture;
-  private final String testBundle;
-  private final Map<String, String> custom;
+    private final String osPlatform;
+    private final String osArchitecture;
+    private final String osVersion;
+    private final String runtimeName;
+    private final String runtimeVersion;
+    private final String runtimeVendor;
+    private final String runtimeArchitecture;
+    private final String testBundle;
+    private final Map<String, String> custom;
 
-  public Configurations(
-      String osPlatform,
-      String osArchitecture,
-      String osVersion,
-      String runtimeName,
-      String runtimeVersion,
-      String runtimeVendor,
-      String runtimeArchitecture,
-      String testBundle,
-      Map<String, String> custom) {
-    this.osPlatform = osPlatform;
-    this.osArchitecture = osArchitecture;
-    this.osVersion = osVersion;
-    this.runtimeName = runtimeName;
-    this.runtimeVersion = runtimeVersion;
-    this.runtimeVendor = runtimeVendor;
-    this.runtimeArchitecture = runtimeArchitecture;
-    this.testBundle = testBundle;
-    this.custom = custom;
-  }
-
-  public String getOsPlatform() {
-    return osPlatform;
-  }
+    public Configurations(
+            String osPlatform,
+            String osArchitecture,
+            String osVersion,
+            String runtimeName,
+            String runtimeVersion,
+            String runtimeVendor,
+            String runtimeArchitecture,
+            String testBundle,
+            Map<String, String> custom) {
+        this.osPlatform = osPlatform;
+        this.osArchitecture = osArchitecture;
+        this.osVersion = osVersion;
+        this.runtimeName = runtimeName;
+        this.runtimeVersion = runtimeVersion;
+        this.runtimeVendor = runtimeVendor;
+        this.runtimeArchitecture = runtimeArchitecture;
+        this.testBundle = testBundle;
+        this.custom = custom;
+    }
 
-  public String getOsArchitecture() {
-    return osArchitecture;
-  }
+    public String getOsPlatform() {
+        return osPlatform;
+    }
 
-  public String getOsVersion() {
-    return osVersion;
-  }
+    public String getOsArchitecture() {
+        return osArchitecture;
+    }
 
-  public String getRuntimeName() {
-    return runtimeName;
-  }
+    public String getOsVersion() {
+        return osVersion;
+    }
 
-  public String getRuntimeVersion() {
-    return runtimeVersion;
-  }
+    public String getRuntimeName() {
+        return runtimeName;
+    }
 
-  public String getRuntimeVendor() {
-    return runtimeVendor;
-  }
+    public String getRuntimeVersion() {
+        return runtimeVersion;
+    }
 
-  public String getRuntimeArchitecture() {
-    return runtimeArchitecture;
-  }
+    public String getRuntimeVendor() {
+        return runtimeVendor;
+    }
 
-  public String getTestBundle() {
-    return testBundle;
-  }
+    public String getRuntimeArchitecture() {
+        return runtimeArchitecture;
+    }
 
-  public Map<String, String> getCustom() {
-    return custom;
-  }
+    public String getTestBundle() {
+        return testBundle;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public Map<String, String> getCustom() {
+        return custom;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Configurations that = (Configurations) o;
+        return Objects.equals(osPlatform, that.osPlatform)
+                && Objects.equals(osArchitecture, that.osArchitecture)
+                && Objects.equals(osVersion, that.osVersion)
+                && Objects.equals(runtimeName, that.runtimeName)
+                && Objects.equals(runtimeVersion, that.runtimeVersion)
+                && Objects.equals(runtimeVendor, that.runtimeVendor)
+                && Objects.equals(runtimeArchitecture, that.runtimeArchitecture)
+                && Objects.equals(testBundle, that.testBundle)
+                && Objects.equals(custom, that.custom);
     }
-    Configurations that = (Configurations) o;
-    return Objects.equals(osPlatform, that.osPlatform)
-        && Objects.equals(osArchitecture, that.osArchitecture)
-        && Objects.equals(osVersion, that.osVersion)
-        && Objects.equals(runtimeName, that.runtimeName)
-        && Objects.equals(runtimeVersion, that.runtimeVersion)
-        && Objects.equals(runtimeVendor, that.runtimeVendor)
-        && Objects.equals(runtimeArchitecture, that.runtimeArchitecture)
-        && Objects.equals(testBundle, that.testBundle)
-        && Objects.equals(custom, that.custom);
-  }
 
-  @Override
-  public int hashCode() {
-    int hash = 0;
-    hash = HashingUtils.addToHash(hash, osPlatform);
-    hash = HashingUtils.addToHash(hash, osArchitecture);
-    hash = HashingUtils.addToHash(hash, osVersion);
-    hash = HashingUtils.addToHash(hash, runtimeName);
-    hash = HashingUtils.addToHash(hash, runtimeVersion);
-    hash = HashingUtils.addToHash(hash, runtimeVendor);
-    hash = HashingUtils.addToHash(hash, runtimeArchitecture);
-    hash = HashingUtils.addToHash(hash, testBundle);
-    hash = HashingUtils.addToHash(hash, custom);
-    return hash;
-  }
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash = HashingUtils.addToHash(hash, osPlatform);
+        hash = HashingUtils.addToHash(hash, osArchitecture);
+        hash = HashingUtils.addToHash(hash, osVersion);
+        hash = HashingUtils.addToHash(hash, runtimeName);
+        hash = HashingUtils.addToHash(hash, runtimeVersion);
+        hash = HashingUtils.addToHash(hash, runtimeVendor);
+        hash = HashingUtils.addToHash(hash, runtimeArchitecture);
+        hash = HashingUtils.addToHash(hash, testBundle);
+        hash = HashingUtils.addToHash(hash, custom);
+        return hash;
+    }
 
-  @Override
-  public String toString() {
-    return "Configurations{"
-        + "osPlatform='"
-        + osPlatform
-        + '\''
-        + ", osArchitecture='"
-        + osArchitecture
-        + '\''
-        + ", osVersion='"
-        + osVersion
-        + '\''
-        + ", runtimeName='"
-        + runtimeName
-        + '\''
-        + ", runtimeVersion='"
-        + runtimeVersion
-        + '\''
-        + ", runtimeVendor='"
-        + runtimeVendor
-        + '\''
-        + ", runtimeArchitecture='"
-        + runtimeArchitecture
-        + '\''
-        + ", testBundle='"
-        + testBundle
-        + '\''
-        + ", custom="
-        + custom
-        + '}';
-  }
+    @Override
+    public String toString() {
+        return "Configurations{"
+                + "osPlatform='"
+                + osPlatform
+                + '\''
+                + ", osArchitecture='"
+                + osArchitecture
+                + '\''
+                + ", osVersion='"
+                + osVersion
+                + '\''
+                + ", runtimeName='"
+                + runtimeName
+                + '\''
+                + ", runtimeVersion='"
+                + runtimeVersion
+                + '\''
+                + ", runtimeVendor='"
+                + runtimeVendor
+                + '\''
+                + ", runtimeArchitecture='"
+                + runtimeArchitecture
+                + '\''
+                + ", testBundle='"
+                + testBundle
+                + '\''
+                + ", custom="
+                + custom
+                + '}';
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java
index 486e18844bd..d1d958bf0a5 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java
@@ -1,30 +1,30 @@
 package datadog.trace.api.civisibility.config;
 
 public enum LibraryCapability {
-  TIA("test_impact_analysis", "1"),
-  EFD("early_flake_detection", "1"),
-  ATR("auto_test_retries", "1"),
-  IMPACTED("impacted_tests", "1"),
-  FAIL_FAST("fail_fast_test_order", "1"),
-  FTR("failed_test_replay", "1"),
-  QUARANTINE("test_management.quarantine", "1"),
-  DISABLED("test_management.disable", "1"),
-  ATTEMPT_TO_FIX("test_management.attempt_to_fix", "5"),
-  COV_REPORT_UPLOAD("coverage_report_upload", "1");
+    TIA("test_impact_analysis", "1"),
+    EFD("early_flake_detection", "1"),
+    ATR("auto_test_retries", "1"),
+    IMPACTED("impacted_tests", "1"),
+    FAIL_FAST("fail_fast_test_order", "1"),
+    FTR("failed_test_replay", "1"),
+    QUARANTINE("test_management.quarantine", "1"),
+    DISABLED("test_management.disable", "1"),
+    ATTEMPT_TO_FIX("test_management.attempt_to_fix", "5"),
+    COV_REPORT_UPLOAD("coverage_report_upload", "1");
 
-  private final String tag;
-  private final String version;
+    private final String tag;
+    private final String version;
 
-  LibraryCapability(String tag, String version) {
-    this.tag = tag;
-    this.version = version;
-  }
+    LibraryCapability(String tag, String version) {
+        this.tag = tag;
+        this.version = version;
+    }
 
-  public String asTag() {
-    return "_dd.library_capabilities." + tag;
-  }
+    public String asTag() {
+        return "_dd.library_capabilities." + tag;
+    }
 
-  public String getVersion() {
-    return version;
-  }
+    public String getVersion() {
+        return version;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestFQN.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestFQN.java
index bb976b4a454..b3fcd4cf64f 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestFQN.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestFQN.java
@@ -8,41 +8,41 @@
  * executions of the same test case (for example when retries are done) will have the same FQN.
  */
 public class TestFQN {
-  private final String suite;
-  private final String name;
-
-  public TestFQN(String suite, String name) {
-    this.suite = suite;
-    this.name = name;
-  }
-
-  public String getSuite() {
-    return suite;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    private final String suite;
+    private final String name;
+
+    public TestFQN(String suite, String name) {
+        this.suite = suite;
+        this.name = name;
+    }
+
+    public String getSuite() {
+        return suite;
+    }
+
+    public String getName() {
+        return name;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        TestFQN that = (TestFQN) o;
+        return Objects.equals(suite, that.suite) && Objects.equals(name, that.name);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashingUtils.hash(suite, name);
+    }
+
+    @Override
+    public String toString() {
+        return "TestFQN{" + "suite='" + suite + '\'' + ", name='" + name + '\'' + '}';
     }
-    TestFQN that = (TestFQN) o;
-    return Objects.equals(suite, that.suite) && Objects.equals(name, that.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return HashingUtils.hash(suite, name);
-  }
-
-  @Override
-  public String toString() {
-    return "TestFQN{" + "suite='" + suite + '\'' + ", name='" + name + '\'' + '}';
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestIdentifier.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestIdentifier.java
index 0c80446622e..7a5395c0f5d 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestIdentifier.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestIdentifier.java
@@ -7,61 +7,61 @@
 
 /** Uniquely identifies a test case with FQN and parameters. */
 public class TestIdentifier {
-  private final TestFQN fqn;
+    private final TestFQN fqn;
 
-  /**
-   * Some API endpoints do not return parameters data. If this field is {@code null} then either
-   * corresponding test case is not parameterized, or this identifier refers to <strong>all</strong>
-   * parameter variations.
-   */
-  private @Nullable final String parameters;
+    /**
+     * Some API endpoints do not return parameters data. If this field is {@code null} then either
+     * corresponding test case is not parameterized, or this identifier refers to <strong>all</strong>
+     * parameter variations.
+     */
+    private @Nullable final String parameters;
 
-  public TestIdentifier(String suite, String name, @Nullable String parameters) {
-    this.fqn = new TestFQN(suite, name);
-    this.parameters = Strings.isNotBlank(parameters) ? parameters : null;
-  }
-
-  public TestIdentifier(TestFQN testFQN, @Nullable String parameters) {
-    this.fqn = testFQN;
-    this.parameters = Strings.isNotBlank(parameters) ? parameters : null;
-  }
+    public TestIdentifier(String suite, String name, @Nullable String parameters) {
+        this.fqn = new TestFQN(suite, name);
+        this.parameters = Strings.isNotBlank(parameters) ? parameters : null;
+    }
 
-  public String getSuite() {
-    return fqn.getSuite();
-  }
+    public TestIdentifier(TestFQN testFQN, @Nullable String parameters) {
+        this.fqn = testFQN;
+        this.parameters = Strings.isNotBlank(parameters) ? parameters : null;
+    }
 
-  public String getName() {
-    return fqn.getName();
-  }
+    public String getSuite() {
+        return fqn.getSuite();
+    }
 
-  @Nullable
-  public String getParameters() {
-    return parameters;
-  }
+    public String getName() {
+        return fqn.getName();
+    }
 
-  public TestFQN toFQN() {
-    return fqn;
-  }
+    @Nullable
+    public String getParameters() {
+        return parameters;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public TestFQN toFQN() {
+        return fqn;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        TestIdentifier that = (TestIdentifier) o;
+        return Objects.equals(fqn, that.fqn) && Objects.equals(parameters, that.parameters);
     }
-    TestIdentifier that = (TestIdentifier) o;
-    return Objects.equals(fqn, that.fqn) && Objects.equals(parameters, that.parameters);
-  }
 
-  @Override
-  public int hashCode() {
-    return HashingUtils.hash(fqn, parameters);
-  }
+    @Override
+    public int hashCode() {
+        return HashingUtils.hash(fqn, parameters);
+    }
 
-  @Override
-  public String toString() {
-    return "TestIdentifier{" + "fqn=" + fqn + ", parameters='" + parameters + '\'' + '}';
-  }
+    @Override
+    public String toString() {
+        return "TestIdentifier{" + "fqn=" + fqn + ", parameters='" + parameters + '\'' + '}';
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestMetadata.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestMetadata.java
index 28c7d7799f4..db4c1ea8ac7 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestMetadata.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestMetadata.java
@@ -5,30 +5,30 @@
 /** Additional test metadata returned by the backend. */
 public class TestMetadata {
 
-  private final boolean missingLineCodeCoverage;
+    private final boolean missingLineCodeCoverage;
 
-  public TestMetadata(boolean missingLineCodeCoverage) {
-    this.missingLineCodeCoverage = missingLineCodeCoverage;
-  }
-
-  public boolean isMissingLineCodeCoverage() {
-    return missingLineCodeCoverage;
-  }
+    public TestMetadata(boolean missingLineCodeCoverage) {
+        this.missingLineCodeCoverage = missingLineCodeCoverage;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public boolean isMissingLineCodeCoverage() {
+        return missingLineCodeCoverage;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        TestMetadata that = (TestMetadata) o;
+        return missingLineCodeCoverage == that.missingLineCodeCoverage;
     }
-    TestMetadata that = (TestMetadata) o;
-    return missingLineCodeCoverage == that.missingLineCodeCoverage;
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hashCode(missingLineCodeCoverage);
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(missingLineCodeCoverage);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestSourceData.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestSourceData.java
index c14bf647ea9..eb7af550bbf 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestSourceData.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestSourceData.java
@@ -8,78 +8,80 @@
 /** Data needed to identify test definition source. */
 public class TestSourceData {
 
-  public static final TestSourceData UNKNOWN = new TestSourceData(null, null);
+    public static final TestSourceData UNKNOWN = new TestSourceData(null, null);
 
-  @Nullable private final Class<?> testClass;
+    @Nullable
+    private final Class<?> testClass;
 
-  @Nullable private final Method testMethod;
+    @Nullable
+    private final Method testMethod;
 
-  /**
-   * The name of the test method. May not correspond to {@code testMethod.getName()} (for instance,
-   * in Spock the testMethod is generated at compile time and has a name that is different from the
-   * source code method name)
-   */
-  @Nullable private final String testMethodName;
+    /**
+     * The name of the test method. May not correspond to {@code testMethod.getName()} (for instance,
+     * in Spock the testMethod is generated at compile time and has a name that is different from the
+     * source code method name)
+     */
+    @Nullable
+    private final String testMethodName;
 
-  public TestSourceData(@Nullable Class<?> testClass, @Nullable Method testMethod) {
-    this(testClass, testMethod, testMethod != null ? testMethod.getName() : null);
-  }
-
-  public TestSourceData(
-      @Nullable Class<?> testClass, @Nullable Method testMethod, @Nullable String testMethodName) {
-    this.testClass = testClass;
-    this.testMethod = testMethod;
-    this.testMethodName = testMethodName;
-  }
+    public TestSourceData(@Nullable Class<?> testClass, @Nullable Method testMethod) {
+        this(testClass, testMethod, testMethod != null ? testMethod.getName() : null);
+    }
 
-  @Nullable
-  public Class<?> getTestClass() {
-    return testClass;
-  }
+    public TestSourceData(@Nullable Class<?> testClass, @Nullable Method testMethod, @Nullable String testMethodName) {
+        this.testClass = testClass;
+        this.testMethod = testMethod;
+        this.testMethodName = testMethodName;
+    }
 
-  @Nullable
-  public Method getTestMethod() {
-    return testMethod;
-  }
+    @Nullable
+    public Class<?> getTestClass() {
+        return testClass;
+    }
 
-  /**
-   * Returns the name of the test method. May not correspond to {@code testMethod.getName()} (for
-   * instance, in Spock the testMethod is generated at compile time and has a name that is different
-   * from the source code method name)
-   */
-  @Nullable
-  public String getTestMethodName() {
-    return testMethodName;
-  }
+    @Nullable
+    public Method getTestMethod() {
+        return testMethod;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Returns the name of the test method. May not correspond to {@code testMethod.getName()} (for
+     * instance, in Spock the testMethod is generated at compile time and has a name that is different
+     * from the source code method name)
+     */
+    @Nullable
+    public String getTestMethodName() {
+        return testMethodName;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        TestSourceData that = (TestSourceData) o;
+        return Objects.equals(testClass, that.testClass)
+                && Objects.equals(testMethod, that.testMethod)
+                && Objects.equals(testMethodName, that.testMethodName);
     }
-    TestSourceData that = (TestSourceData) o;
-    return Objects.equals(testClass, that.testClass)
-        && Objects.equals(testMethod, that.testMethod)
-        && Objects.equals(testMethodName, that.testMethodName);
-  }
 
-  @Override
-  public int hashCode() {
-    return HashingUtils.hash(testClass, testMethod, testMethodName);
-  }
+    @Override
+    public int hashCode() {
+        return HashingUtils.hash(testClass, testMethod, testMethodName);
+    }
 
-  @Override
-  public String toString() {
-    return "TestSourceData{"
-        + "testClass="
-        + testClass
-        + ", testMethod="
-        + testMethod
-        + ", testMethodName="
-        + testMethodName
-        + '}';
-  }
+    @Override
+    public String toString() {
+        return "TestSourceData{"
+                + "testClass="
+                + testClass
+                + ", testMethod="
+                + testMethod
+                + ", testMethodName="
+                + testMethodName
+                + '}';
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoveragePerTestBridge.java b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoveragePerTestBridge.java
index c8f52293eec..8e9102f46e1 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoveragePerTestBridge.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoveragePerTestBridge.java
@@ -9,105 +9,104 @@
 
 public abstract class CoveragePerTestBridge {
 
-  private static final ThreadLocal<CoverageProbes> COVERAGE_PROBES = new ThreadLocal<>();
-
-  private static volatile CoverageStore.Registry COVERAGE_STORE_REGISTRY;
-  private static final Object COVERAGE_STORE_REGISTRY_LOCK = new Object();
-
-  @GuardedBy("COVERAGE_STORE_REGISTRY_LOCK")
-  private static final Queue<TotalProbeCount> DEFERRED_PROBE_COUNTS = new ArrayDeque<>();
-
-  public static void registerCoverageStoreRegistry(
-      @Nonnull CoverageStore.Registry coverageStoreRegistry) {
-    synchronized (COVERAGE_STORE_REGISTRY_LOCK) {
-      while (!DEFERRED_PROBE_COUNTS.isEmpty()) {
-        TotalProbeCount c = DEFERRED_PROBE_COUNTS.poll();
-        coverageStoreRegistry.setTotalProbeCount(c.className, c.count);
-      }
-      COVERAGE_STORE_REGISTRY = coverageStoreRegistry;
+    private static final ThreadLocal<CoverageProbes> COVERAGE_PROBES = new ThreadLocal<>();
+
+    private static volatile CoverageStore.Registry COVERAGE_STORE_REGISTRY;
+    private static final Object COVERAGE_STORE_REGISTRY_LOCK = new Object();
+
+    @GuardedBy("COVERAGE_STORE_REGISTRY_LOCK")
+    private static final Queue<TotalProbeCount> DEFERRED_PROBE_COUNTS = new ArrayDeque<>();
+
+    public static void registerCoverageStoreRegistry(@Nonnull CoverageStore.Registry coverageStoreRegistry) {
+        synchronized (COVERAGE_STORE_REGISTRY_LOCK) {
+            while (!DEFERRED_PROBE_COUNTS.isEmpty()) {
+                TotalProbeCount c = DEFERRED_PROBE_COUNTS.poll();
+                coverageStoreRegistry.setTotalProbeCount(c.className, c.count);
+            }
+            COVERAGE_STORE_REGISTRY = coverageStoreRegistry;
+        }
     }
-  }
-
-  /**
-   * {@link #COVERAGE_STORE_REGISTRY} is set when CI Visibility is initialized. It is possible, that
-   * core/internal JDK classes are loaded and transformed by Jacoco before this happens. As the
-   * result this method may be called when {@link #COVERAGE_STORE_REGISTRY} is still {@code null}.
-   *
-   * <p>While instrumenting core/internal JDK classes with Jacoco makes little sense, we do not
-   * always have the control over the users' Jacoco {@code includes} setting, therefore we have to
-   * account for this case and support it.
-   *
-   * <p>If this method finds {@link #COVERAGE_STORE_REGISTRY} to be {@code null}, the probe counts
-   * are saved in {@link #DEFERRED_PROBE_COUNTS} to be processed when {@link
-   * #COVERAGE_STORE_REGISTRY} is set.
-   */
-  public static void setTotalProbeCount(String className, int totalProbeCount) {
-    if (COVERAGE_STORE_REGISTRY != null) {
-      COVERAGE_STORE_REGISTRY.setTotalProbeCount(className, totalProbeCount);
-      return;
+
+    /**
+     * {@link #COVERAGE_STORE_REGISTRY} is set when CI Visibility is initialized. It is possible, that
+     * core/internal JDK classes are loaded and transformed by Jacoco before this happens. As the
+     * result this method may be called when {@link #COVERAGE_STORE_REGISTRY} is still {@code null}.
+     *
+     * <p>While instrumenting core/internal JDK classes with Jacoco makes little sense, we do not
+     * always have the control over the users' Jacoco {@code includes} setting, therefore we have to
+     * account for this case and support it.
+     *
+     * <p>If this method finds {@link #COVERAGE_STORE_REGISTRY} to be {@code null}, the probe counts
+     * are saved in {@link #DEFERRED_PROBE_COUNTS} to be processed when {@link
+     * #COVERAGE_STORE_REGISTRY} is set.
+     */
+    public static void setTotalProbeCount(String className, int totalProbeCount) {
+        if (COVERAGE_STORE_REGISTRY != null) {
+            COVERAGE_STORE_REGISTRY.setTotalProbeCount(className, totalProbeCount);
+            return;
+        }
+
+        synchronized (COVERAGE_STORE_REGISTRY_LOCK) {
+            if (COVERAGE_STORE_REGISTRY != null) {
+                COVERAGE_STORE_REGISTRY.setTotalProbeCount(className, totalProbeCount);
+            } else {
+                DEFERRED_PROBE_COUNTS.offer(new TotalProbeCount(className, totalProbeCount));
+            }
+        }
     }
 
-    synchronized (COVERAGE_STORE_REGISTRY_LOCK) {
-      if (COVERAGE_STORE_REGISTRY != null) {
-        COVERAGE_STORE_REGISTRY.setTotalProbeCount(className, totalProbeCount);
-      } else {
-        DEFERRED_PROBE_COUNTS.offer(new TotalProbeCount(className, totalProbeCount));
-      }
+    private static final class TotalProbeCount {
+        private final String className;
+        private final int count;
+
+        private TotalProbeCount(String className, int count) {
+            this.className = className;
+            this.count = count;
+        }
     }
-  }
 
-  private static final class TotalProbeCount {
-    private final String className;
-    private final int count;
+    /* This method is referenced by name in bytecode added in jacoco instrumentation module (see datadog.trace.instrumentation.jacoco.ProbeInserterInstrumentation.InsertProbeAdvice) */
+    public static void recordCoverage(Class<?> clazz, long classId, int probeId) {
+        getCurrentCoverageProbes().record(clazz, classId, probeId);
+    }
 
-    private TotalProbeCount(String className, int count) {
-      this.className = className;
-      this.count = count;
+    /* This method is referenced by name in bytecode added by coverage probes (see datadog.trace.civisibility.coverage.instrumentation.CoverageUtils#insertCoverageProbe) */
+    public static void recordCoverage(Class<?> clazz) {
+        getCurrentCoverageProbes().record(clazz);
     }
-  }
-
-  /* This method is referenced by name in bytecode added in jacoco instrumentation module (see datadog.trace.instrumentation.jacoco.ProbeInserterInstrumentation.InsertProbeAdvice) */
-  public static void recordCoverage(Class<?> clazz, long classId, int probeId) {
-    getCurrentCoverageProbes().record(clazz, classId, probeId);
-  }
-
-  /* This method is referenced by name in bytecode added by coverage probes (see datadog.trace.civisibility.coverage.instrumentation.CoverageUtils#insertCoverageProbe) */
-  public static void recordCoverage(Class<?> clazz) {
-    getCurrentCoverageProbes().record(clazz);
-  }
-
-  public static void recordCoverage(String absolutePath) {
-    getCurrentCoverageProbes().recordNonCodeResource(absolutePath);
-  }
-
-  private static CoverageProbes getCurrentCoverageProbes() {
-    /*
-     * While it is possible to use activeSpan() to get current coverage store, it adds a lot of overhead.
-     * The thread local is used as a shortcut for hot code paths.
-     */
-    CoverageProbes probes = COVERAGE_PROBES.get();
-    if (probes != null) {
-      return probes;
+
+    public static void recordCoverage(String absolutePath) {
+        getCurrentCoverageProbes().recordNonCodeResource(absolutePath);
     }
 
-    /*
-     * Get coverage probe store associated with the active span: a fallback method for cases
-     * when the probe store could not be retrieved from the thread local. This can happen if the span
-     * is propagated from the original test thread to another thread.
-     */
-    TestContext currentTest = InstrumentationTestBridge.getCurrentTestContext();
-    if (currentTest != null) {
-      return currentTest.getCoverageStore().getProbes();
-    } else {
-      return NoOpProbes.INSTANCE;
+    private static CoverageProbes getCurrentCoverageProbes() {
+        /*
+         * While it is possible to use activeSpan() to get current coverage store, it adds a lot of overhead.
+         * The thread local is used as a shortcut for hot code paths.
+         */
+        CoverageProbes probes = COVERAGE_PROBES.get();
+        if (probes != null) {
+            return probes;
+        }
+
+        /*
+         * Get coverage probe store associated with the active span: a fallback method for cases
+         * when the probe store could not be retrieved from the thread local. This can happen if the span
+         * is propagated from the original test thread to another thread.
+         */
+        TestContext currentTest = InstrumentationTestBridge.getCurrentTestContext();
+        if (currentTest != null) {
+            return currentTest.getCoverageStore().getProbes();
+        } else {
+            return NoOpProbes.INSTANCE;
+        }
     }
-  }
 
-  public static void setThreadLocalCoverageProbes(CoverageProbes probes) {
-    COVERAGE_PROBES.set(probes);
-  }
+    public static void setThreadLocalCoverageProbes(CoverageProbes probes) {
+        COVERAGE_PROBES.set(probes);
+    }
 
-  public static void removeThreadLocalCoverageProbes() {
-    COVERAGE_PROBES.remove();
-  }
+    public static void removeThreadLocalCoverageProbes() {
+        COVERAGE_PROBES.remove();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoveragePercentageBridge.java b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoveragePercentageBridge.java
index 1b4727e3e49..fc521cec98a 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoveragePercentageBridge.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoveragePercentageBridge.java
@@ -5,14 +5,14 @@
 
 public abstract class CoveragePercentageBridge {
 
-  private static volatile Supplier<byte[]> JACOCO_COVERAGE_DATA_SUPPLIER;
+    private static volatile Supplier<byte[]> JACOCO_COVERAGE_DATA_SUPPLIER;
 
-  public static void registerCoverageDataSupplier(Supplier<byte[]> jacocoCoverageDataSupplier) {
-    JACOCO_COVERAGE_DATA_SUPPLIER = jacocoCoverageDataSupplier;
-  }
+    public static void registerCoverageDataSupplier(Supplier<byte[]> jacocoCoverageDataSupplier) {
+        JACOCO_COVERAGE_DATA_SUPPLIER = jacocoCoverageDataSupplier;
+    }
 
-  @Nullable
-  public static byte[] getJacocoCoverageData() {
-    return JACOCO_COVERAGE_DATA_SUPPLIER != null ? JACOCO_COVERAGE_DATA_SUPPLIER.get() : null;
-  }
+    @Nullable
+    public static byte[] getJacocoCoverageData() {
+        return JACOCO_COVERAGE_DATA_SUPPLIER != null ? JACOCO_COVERAGE_DATA_SUPPLIER.get() : null;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoverageProbes.java b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoverageProbes.java
index 2bdb5ca2371..f3672cd689c 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoverageProbes.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoverageProbes.java
@@ -1,9 +1,9 @@
 package datadog.trace.api.civisibility.coverage;
 
 public interface CoverageProbes {
-  void record(Class<?> clazz);
+    void record(Class<?> clazz);
 
-  void record(Class<?> clazz, long classId, int probeId);
+    void record(Class<?> clazz, long classId, int probeId);
 
-  void recordNonCodeResource(String absolutePath);
+    void recordNonCodeResource(String absolutePath);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoverageStore.java b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoverageStore.java
index a779c699281..c4a636b7a55 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoverageStore.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/CoverageStore.java
@@ -6,18 +6,18 @@
 
 public interface CoverageStore extends TestReportHolder {
 
-  CoverageProbes getProbes();
+    CoverageProbes getProbes();
 
-  /**
-   * @return {@code true} if coverage was gathered successfully
-   */
-  boolean report(DDTraceId testSessionId, Long testSuiteId, long testSpanId);
+    /**
+     * @return {@code true} if coverage was gathered successfully
+     */
+    boolean report(DDTraceId testSessionId, Long testSuiteId, long testSpanId);
 
-  interface Factory extends Registry {
-    CoverageStore create(@Nullable TestIdentifier testIdentifier);
-  }
+    interface Factory extends Registry {
+        CoverageStore create(@Nullable TestIdentifier testIdentifier);
+    }
 
-  interface Registry {
-    void setTotalProbeCount(String className, int totalProbeCount);
-  }
+    interface Registry {
+        void setTotalProbeCount(String className, int totalProbeCount);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/NoOpCoverageStore.java b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/NoOpCoverageStore.java
index c2b677f416f..fa168c4a8c0 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/NoOpCoverageStore.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/NoOpCoverageStore.java
@@ -6,35 +6,35 @@
 
 public class NoOpCoverageStore implements CoverageStore {
 
-  public static final NoOpCoverageStore INSTANCE = new NoOpCoverageStore();
+    public static final NoOpCoverageStore INSTANCE = new NoOpCoverageStore();
 
-  private NoOpCoverageStore() {}
+    private NoOpCoverageStore() {}
 
-  @Override
-  public CoverageProbes getProbes() {
-    return NoOpProbes.INSTANCE;
-  }
-
-  @Override
-  public boolean report(DDTraceId testSessionId, Long testSuiteId, long testSpanId) {
-    return true;
-  }
-
-  @Nullable
-  @Override
-  public TestReport getReport() {
-    return null;
-  }
+    @Override
+    public CoverageProbes getProbes() {
+        return NoOpProbes.INSTANCE;
+    }
 
-  public static final class Factory implements CoverageStore.Factory {
     @Override
-    public CoverageStore create(@Nullable TestIdentifier testIdentifier) {
-      return INSTANCE;
+    public boolean report(DDTraceId testSessionId, Long testSuiteId, long testSpanId) {
+        return true;
     }
 
+    @Nullable
     @Override
-    public void setTotalProbeCount(String className, int totalProbeCount) {
-      // no op
+    public TestReport getReport() {
+        return null;
+    }
+
+    public static final class Factory implements CoverageStore.Factory {
+        @Override
+        public CoverageStore create(@Nullable TestIdentifier testIdentifier) {
+            return INSTANCE;
+        }
+
+        @Override
+        public void setTotalProbeCount(String className, int totalProbeCount) {
+            // no op
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/NoOpProbes.java b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/NoOpProbes.java
index cdc2142e398..1b03f902263 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/NoOpProbes.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/NoOpProbes.java
@@ -1,16 +1,16 @@
 package datadog.trace.api.civisibility.coverage;
 
 public class NoOpProbes implements CoverageProbes {
-  public static final NoOpProbes INSTANCE = new NoOpProbes();
+    public static final NoOpProbes INSTANCE = new NoOpProbes();
 
-  private NoOpProbes() {}
+    private NoOpProbes() {}
 
-  @Override
-  public void record(Class<?> clazz) {}
+    @Override
+    public void record(Class<?> clazz) {}
 
-  @Override
-  public void record(Class<?> clazz, long classId, int probeId) {}
+    @Override
+    public void record(Class<?> clazz, long classId, int probeId) {}
 
-  @Override
-  public void recordNonCodeResource(String absolutePath) {}
+    @Override
+    public void recordNonCodeResource(String absolutePath) {}
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/TestReport.java b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/TestReport.java
index 3030989a1d2..633c16cbd30 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/TestReport.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/TestReport.java
@@ -6,40 +6,40 @@
 
 public class TestReport {
 
-  private final DDTraceId testSessionId;
-  private final Long testSuiteId;
-  private final long spanId;
-  private final Collection<TestReportFileEntry> testReportFileEntries;
-
-  public TestReport(
-      DDTraceId testSessionId,
-      Long testSuiteId,
-      long spanId,
-      @Nonnull Collection<TestReportFileEntry> testReportFileEntries) {
-    this.testSessionId = testSessionId;
-    this.testSuiteId = testSuiteId;
-    this.spanId = spanId;
-    this.testReportFileEntries = testReportFileEntries;
-  }
-
-  public DDTraceId getTestSessionId() {
-    return testSessionId;
-  }
-
-  public Long getTestSuiteId() {
-    return testSuiteId;
-  }
-
-  public long getSpanId() {
-    return spanId;
-  }
-
-  @Nonnull
-  public Collection<TestReportFileEntry> getTestReportFileEntries() {
-    return testReportFileEntries;
-  }
-
-  public boolean isNotEmpty() {
-    return !testReportFileEntries.isEmpty();
-  }
+    private final DDTraceId testSessionId;
+    private final Long testSuiteId;
+    private final long spanId;
+    private final Collection<TestReportFileEntry> testReportFileEntries;
+
+    public TestReport(
+            DDTraceId testSessionId,
+            Long testSuiteId,
+            long spanId,
+            @Nonnull Collection<TestReportFileEntry> testReportFileEntries) {
+        this.testSessionId = testSessionId;
+        this.testSuiteId = testSuiteId;
+        this.spanId = spanId;
+        this.testReportFileEntries = testReportFileEntries;
+    }
+
+    public DDTraceId getTestSessionId() {
+        return testSessionId;
+    }
+
+    public Long getTestSuiteId() {
+        return testSuiteId;
+    }
+
+    public long getSpanId() {
+        return spanId;
+    }
+
+    @Nonnull
+    public Collection<TestReportFileEntry> getTestReportFileEntries() {
+        return testReportFileEntries;
+    }
+
+    public boolean isNotEmpty() {
+        return !testReportFileEntries.isEmpty();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/TestReportFileEntry.java b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/TestReportFileEntry.java
index f5bda589b3e..2216064fa9b 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/TestReportFileEntry.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/TestReportFileEntry.java
@@ -4,30 +4,25 @@
 import javax.annotation.Nullable;
 
 public class TestReportFileEntry {
-  private final String sourceFileName;
-  private final @Nullable BitSet coveredLines;
+    private final String sourceFileName;
+    private final @Nullable BitSet coveredLines;
 
-  public TestReportFileEntry(String sourceFileName, @Nullable BitSet coveredLines) {
-    this.sourceFileName = sourceFileName;
-    this.coveredLines = coveredLines;
-  }
+    public TestReportFileEntry(String sourceFileName, @Nullable BitSet coveredLines) {
+        this.sourceFileName = sourceFileName;
+        this.coveredLines = coveredLines;
+    }
 
-  public String getSourceFileName() {
-    return sourceFileName;
-  }
+    public String getSourceFileName() {
+        return sourceFileName;
+    }
 
-  @Nullable
-  public BitSet getCoveredLines() {
-    return coveredLines;
-  }
+    @Nullable
+    public BitSet getCoveredLines() {
+        return coveredLines;
+    }
 
-  @Override
-  public String toString() {
-    return "TestReportFileEntry{"
-        + "sourceFileName='"
-        + sourceFileName
-        + "', lines=["
-        + coveredLines
-        + "]}";
-  }
+    @Override
+    public String toString() {
+        return "TestReportFileEntry{" + "sourceFileName='" + sourceFileName + "', lines=[" + coveredLines + "]}";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/TestReportHolder.java b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/TestReportHolder.java
index 94f9ff605fe..299aef14192 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/TestReportHolder.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/coverage/TestReportHolder.java
@@ -3,6 +3,6 @@
 import javax.annotation.Nullable;
 
 public interface TestReportHolder {
-  @Nullable
-  TestReport getReport();
+    @Nullable
+    TestReport getReport();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/domain/BuildModuleLayout.java b/internal-api/src/main/java/datadog/trace/api/civisibility/domain/BuildModuleLayout.java
index c3b8d21ed05..fff20b351fb 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/domain/BuildModuleLayout.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/domain/BuildModuleLayout.java
@@ -9,14 +9,14 @@
 
 public class BuildModuleLayout implements Serializable {
 
-  private final List<SourceSet> sourceSets;
+    private final List<SourceSet> sourceSets;
 
-  public BuildModuleLayout(@Nonnull Collection<SourceSet> sourceSets) {
-    this.sourceSets = sourceSets.stream().filter(Objects::nonNull).collect(Collectors.toList());
-  }
+    public BuildModuleLayout(@Nonnull Collection<SourceSet> sourceSets) {
+        this.sourceSets = sourceSets.stream().filter(Objects::nonNull).collect(Collectors.toList());
+    }
 
-  @Nonnull
-  public List<SourceSet> getSourceSets() {
-    return sourceSets;
-  }
+    @Nonnull
+    public List<SourceSet> getSourceSets() {
+        return sourceSets;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/domain/BuildModuleSettings.java b/internal-api/src/main/java/datadog/trace/api/civisibility/domain/BuildModuleSettings.java
index 5f0a36d96d6..4caf883301d 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/domain/BuildModuleSettings.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/domain/BuildModuleSettings.java
@@ -4,13 +4,13 @@
 
 public class BuildModuleSettings {
 
-  private final Map<String, String> systemProperties;
+    private final Map<String, String> systemProperties;
 
-  public BuildModuleSettings(Map<String, String> systemProperties) {
-    this.systemProperties = systemProperties;
-  }
+    public BuildModuleSettings(Map<String, String> systemProperties) {
+        this.systemProperties = systemProperties;
+    }
 
-  public Map<String, String> getSystemProperties() {
-    return systemProperties;
-  }
+    public Map<String, String> getSystemProperties() {
+        return systemProperties;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/domain/BuildSessionSettings.java b/internal-api/src/main/java/datadog/trace/api/civisibility/domain/BuildSessionSettings.java
index 76d6c33a7ed..4e7c3d41b93 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/domain/BuildSessionSettings.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/domain/BuildSessionSettings.java
@@ -4,28 +4,28 @@
 
 public class BuildSessionSettings {
 
-  private final boolean coverageReportUploadEnabled;
-  private final List<String> coverageIncludedPackages;
-  private final List<String> coverageExcludedPackages;
+    private final boolean coverageReportUploadEnabled;
+    private final List<String> coverageIncludedPackages;
+    private final List<String> coverageExcludedPackages;
 
-  public BuildSessionSettings(
-      boolean coverageReportUploadEnabled,
-      List<String> coverageIncludedPackages,
-      List<String> coverageExcludedPackages) {
-    this.coverageReportUploadEnabled = coverageReportUploadEnabled;
-    this.coverageIncludedPackages = coverageIncludedPackages;
-    this.coverageExcludedPackages = coverageExcludedPackages;
-  }
+    public BuildSessionSettings(
+            boolean coverageReportUploadEnabled,
+            List<String> coverageIncludedPackages,
+            List<String> coverageExcludedPackages) {
+        this.coverageReportUploadEnabled = coverageReportUploadEnabled;
+        this.coverageIncludedPackages = coverageIncludedPackages;
+        this.coverageExcludedPackages = coverageExcludedPackages;
+    }
 
-  public boolean isCoverageReportUploadEnabled() {
-    return coverageReportUploadEnabled;
-  }
+    public boolean isCoverageReportUploadEnabled() {
+        return coverageReportUploadEnabled;
+    }
 
-  public List<String> getCoverageIncludedPackages() {
-    return coverageIncludedPackages;
-  }
+    public List<String> getCoverageIncludedPackages() {
+        return coverageIncludedPackages;
+    }
 
-  public List<String> getCoverageExcludedPackages() {
-    return coverageExcludedPackages;
-  }
+    public List<String> getCoverageExcludedPackages() {
+        return coverageExcludedPackages;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/domain/JavaAgent.java b/internal-api/src/main/java/datadog/trace/api/civisibility/domain/JavaAgent.java
index a93f44f7f1f..84dd19f1ab9 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/domain/JavaAgent.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/domain/JavaAgent.java
@@ -5,21 +5,22 @@
 
 public class JavaAgent implements Serializable {
 
-  private final String path;
+    private final String path;
 
-  @Nullable private final String arguments;
+    @Nullable
+    private final String arguments;
 
-  public JavaAgent(String path, @Nullable String arguments) {
-    this.path = path;
-    this.arguments = arguments;
-  }
+    public JavaAgent(String path, @Nullable String arguments) {
+        this.path = path;
+        this.arguments = arguments;
+    }
 
-  public String getPath() {
-    return path;
-  }
+    public String getPath() {
+        return path;
+    }
 
-  @Nullable
-  public String getArguments() {
-    return arguments;
-  }
+    @Nullable
+    public String getArguments() {
+        return arguments;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/domain/Language.java b/internal-api/src/main/java/datadog/trace/api/civisibility/domain/Language.java
index eb08f50c9eb..29c64d106cf 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/domain/Language.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/domain/Language.java
@@ -3,41 +3,41 @@
 import javax.annotation.Nullable;
 
 public enum Language {
-  JAVA(".java", false),
-  GROOVY(".groovy", false),
-  KOTLIN(".kt", false),
-  SCALA(".scala", false),
-  GHERKIN(".feature", true);
-
-  private static final Language[] UNIVERSE = Language.values();
-
-  private final String extension;
-  private final boolean nonCode;
-
-  Language(String extension, boolean nonCode) {
-    this.extension = extension;
-    this.nonCode = nonCode;
-  }
-
-  public String getExtension() {
-    return extension;
-  }
-
-  public boolean isNonCode() {
-    return nonCode;
-  }
-
-  @Nullable
-  public static Language getByFileName(String fileName) {
-    for (Language language : UNIVERSE) {
-      if (fileName.endsWith(language.extension)) {
-        return language;
-      }
+    JAVA(".java", false),
+    GROOVY(".groovy", false),
+    KOTLIN(".kt", false),
+    SCALA(".scala", false),
+    GHERKIN(".feature", true);
+
+    private static final Language[] UNIVERSE = Language.values();
+
+    private final String extension;
+    private final boolean nonCode;
+
+    Language(String extension, boolean nonCode) {
+        this.extension = extension;
+        this.nonCode = nonCode;
+    }
+
+    public String getExtension() {
+        return extension;
     }
-    return null;
-  }
 
-  public static Language getByOrdinal(int ordinal) {
-    return UNIVERSE[ordinal];
-  }
+    public boolean isNonCode() {
+        return nonCode;
+    }
+
+    @Nullable
+    public static Language getByFileName(String fileName) {
+        for (Language language : UNIVERSE) {
+            if (fileName.endsWith(language.extension)) {
+                return language;
+            }
+        }
+        return null;
+    }
+
+    public static Language getByOrdinal(int ordinal) {
+        return UNIVERSE[ordinal];
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/domain/SourceSet.java b/internal-api/src/main/java/datadog/trace/api/civisibility/domain/SourceSet.java
index dd5a3a45bdd..29a07b99cb0 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/domain/SourceSet.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/domain/SourceSet.java
@@ -7,33 +7,32 @@
 
 public class SourceSet implements Serializable {
 
-  public enum Type {
-    CODE,
-    TEST
-  }
-
-  private final Type type;
-  private final Collection<File> sources;
-  private final Collection<File> destinations;
-
-  public SourceSet(
-      Type type, @Nonnull Collection<File> sources, @Nonnull Collection<File> destinations) {
-    this.type = type;
-    this.sources = sources;
-    this.destinations = destinations;
-  }
-
-  public Type getType() {
-    return type;
-  }
-
-  @Nonnull
-  public Collection<File> getSources() {
-    return sources;
-  }
-
-  @Nonnull
-  public Collection<File> getDestinations() {
-    return destinations;
-  }
+    public enum Type {
+        CODE,
+        TEST
+    }
+
+    private final Type type;
+    private final Collection<File> sources;
+    private final Collection<File> destinations;
+
+    public SourceSet(Type type, @Nonnull Collection<File> sources, @Nonnull Collection<File> destinations) {
+        this.type = type;
+        this.sources = sources;
+        this.destinations = destinations;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    @Nonnull
+    public Collection<File> getSources() {
+        return sources;
+    }
+
+    @Nonnull
+    public Collection<File> getDestinations() {
+        return destinations;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/domain/TestContext.java b/internal-api/src/main/java/datadog/trace/api/civisibility/domain/TestContext.java
index 6017856ddab..c33e9c193e4 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/domain/TestContext.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/domain/TestContext.java
@@ -3,9 +3,9 @@
 import datadog.trace.api.civisibility.coverage.CoverageStore;
 
 public interface TestContext {
-  CoverageStore getCoverageStore();
+    CoverageStore getCoverageStore();
 
-  <T> void set(Class<T> key, T value);
+    <T> void set(Class<T> key, T value);
 
-  <T> T get(Class<T> key);
+    <T> T get(Class<T> key);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/events/BuildEventsHandler.java b/internal-api/src/main/java/datadog/trace/api/civisibility/events/BuildEventsHandler.java
index b77ea19fad6..0540573fa33 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/events/BuildEventsHandler.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/events/BuildEventsHandler.java
@@ -10,45 +10,45 @@
 import javax.annotation.Nullable;
 
 public interface BuildEventsHandler<SessionKey> {
-  void onTestSessionStart(
-      SessionKey sessionKey,
-      String projectName,
-      Path projectRoot,
-      String startCommand,
-      String buildSystemName,
-      String buildSystemVersion,
-      Map<String, Object> additionalTags);
+    void onTestSessionStart(
+            SessionKey sessionKey,
+            String projectName,
+            Path projectRoot,
+            String startCommand,
+            String buildSystemName,
+            String buildSystemVersion,
+            Map<String, Object> additionalTags);
 
-  void onTestSessionFail(SessionKey sessionKey, Throwable throwable);
+    void onTestSessionFail(SessionKey sessionKey, Throwable throwable);
 
-  void onTestSessionFinish(SessionKey sessionKey);
+    void onTestSessionFinish(SessionKey sessionKey);
 
-  void onBuildTaskStart(SessionKey sessionKey, String taskName, Map<String, Object> additionalTags);
+    void onBuildTaskStart(SessionKey sessionKey, String taskName, Map<String, Object> additionalTags);
 
-  void onBuildTaskFail(SessionKey sessionKey, String taskName, Throwable throwable);
+    void onBuildTaskFail(SessionKey sessionKey, String taskName, Throwable throwable);
 
-  void onBuildTaskFinish(SessionKey sessionKey, String taskName);
+    void onBuildTaskFinish(SessionKey sessionKey, String taskName);
 
-  BuildModuleSettings onTestModuleStart(
-      SessionKey sessionKey,
-      String moduleName,
-      BuildModuleLayout moduleLayout,
-      @Nullable Path jvmExecutable,
-      @Nullable Collection<Path> classpath,
-      @Nullable JavaAgent jacocoAgent,
-      @Nullable Map<String, Object> additionalTags);
+    BuildModuleSettings onTestModuleStart(
+            SessionKey sessionKey,
+            String moduleName,
+            BuildModuleLayout moduleLayout,
+            @Nullable Path jvmExecutable,
+            @Nullable Collection<Path> classpath,
+            @Nullable JavaAgent jacocoAgent,
+            @Nullable Map<String, Object> additionalTags);
 
-  void onTestModuleSkip(SessionKey sessionKey, String moduleName, String reason);
+    void onTestModuleSkip(SessionKey sessionKey, String moduleName, String reason);
 
-  void onTestModuleFail(SessionKey sessionKey, String moduleName, Throwable throwable);
+    void onTestModuleFail(SessionKey sessionKey, String moduleName, Throwable throwable);
 
-  void onTestModuleFinish(SessionKey sessionKey, String moduleName);
+    void onTestModuleFinish(SessionKey sessionKey, String moduleName);
 
-  BuildSessionSettings getSessionSettings(SessionKey sessionKey);
+    BuildSessionSettings getSessionSettings(SessionKey sessionKey);
 
-  BuildModuleSettings getModuleSettings(SessionKey sessionKey, String moduleName);
+    BuildModuleSettings getModuleSettings(SessionKey sessionKey, String moduleName);
 
-  interface Factory {
-    <U> BuildEventsHandler<U> create();
-  }
+    interface Factory {
+        <U> BuildEventsHandler<U> create();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestDescriptor.java b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestDescriptor.java
index 74f1afc0319..5cdae7bea1a 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestDescriptor.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestDescriptor.java
@@ -5,67 +5,67 @@
 import javax.annotation.Nullable;
 
 public final class TestDescriptor {
-  private final String testSuiteName;
-  private final @Nullable Class<?> testClass;
-  private final String testName;
-  private final @Nullable Object testParameters;
+    private final String testSuiteName;
+    private final @Nullable Class<?> testClass;
+    private final String testName;
+    private final @Nullable Object testParameters;
 
-  /**
-   * A test-framework-specific "tie-breaker" that helps to differentiate between tests that would
-   * otherwise be considered identical.
-   */
-  private final @Nullable Object testQualifier;
+    /**
+     * A test-framework-specific "tie-breaker" that helps to differentiate between tests that would
+     * otherwise be considered identical.
+     */
+    private final @Nullable Object testQualifier;
 
-  public TestDescriptor(
-      String testSuiteName,
-      @Nullable Class<?> testClass,
-      String testName,
-      @Nullable String testParameters,
-      @Nullable Object testQualifier) {
-    this.testSuiteName = testSuiteName;
-    this.testClass = testClass;
-    this.testName = testName;
-    this.testParameters = testParameters;
-    this.testQualifier = testQualifier;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public TestDescriptor(
+            String testSuiteName,
+            @Nullable Class<?> testClass,
+            String testName,
+            @Nullable String testParameters,
+            @Nullable Object testQualifier) {
+        this.testSuiteName = testSuiteName;
+        this.testClass = testClass;
+        this.testName = testName;
+        this.testParameters = testParameters;
+        this.testQualifier = testQualifier;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        TestDescriptor that = (TestDescriptor) o;
+        return Objects.equals(testSuiteName, that.testSuiteName)
+                && Objects.equals(testClass, that.testClass)
+                && Objects.equals(testName, that.testName)
+                && Objects.equals(testParameters, that.testParameters)
+                && Objects.equals(testQualifier, that.testQualifier);
     }
-    TestDescriptor that = (TestDescriptor) o;
-    return Objects.equals(testSuiteName, that.testSuiteName)
-        && Objects.equals(testClass, that.testClass)
-        && Objects.equals(testName, that.testName)
-        && Objects.equals(testParameters, that.testParameters)
-        && Objects.equals(testQualifier, that.testQualifier);
-  }
 
-  @Override
-  public int hashCode() {
-    return HashingUtils.hash(testSuiteName, testClass, testName, testParameters, testQualifier);
-  }
+    @Override
+    public int hashCode() {
+        return HashingUtils.hash(testSuiteName, testClass, testName, testParameters, testQualifier);
+    }
 
-  @Override
-  public String toString() {
-    return "TestDescriptor{"
-        + "testSuiteName='"
-        + testSuiteName
-        + '\''
-        + ", testClass="
-        + testClass
-        + ", testName='"
-        + testName
-        + '\''
-        + ", testParameters='"
-        + testParameters
-        + '\''
-        + ", testQualifier="
-        + testQualifier
-        + '}';
-  }
+    @Override
+    public String toString() {
+        return "TestDescriptor{"
+                + "testSuiteName='"
+                + testSuiteName
+                + '\''
+                + ", testClass="
+                + testClass
+                + ", testName='"
+                + testName
+                + '\''
+                + ", testParameters='"
+                + testParameters
+                + '\''
+                + ", testQualifier="
+                + testQualifier
+                + '}';
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java
index a6dee49fb00..74d73f754ef 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java
@@ -17,104 +17,100 @@
 
 public interface TestEventsHandler<SuiteKey, TestKey> extends Closeable {
 
-  /**
-   * @param testFramework Name of the testing framework that executes the suite.
-   * @param instrumentation Instrumentation that emits the event. Can differ from the testing
-   *     framework, because one instrumentation can support multiple frameworks. For example, there
-   *     are many testing frameworks based on JUnit 5. For some of those frameworks we have
-   *     dedicated instrumentations, while others are handled with "generic" JUnit 5 instrumentation
-   */
-  void onTestSuiteStart(
-      SuiteKey descriptor,
-      String testSuiteName,
-      @Nullable String testFramework,
-      @Nullable String testFrameworkVersion,
-      @Nullable Class<?> testClass,
-      @Nullable Collection<String> categories,
-      boolean parallelized,
-      TestFrameworkInstrumentation instrumentation,
-      @Nullable Long startTime);
-
-  void onTestSuiteSkip(SuiteKey descriptor, @Nullable String reason);
-
-  void onTestSuiteFailure(SuiteKey descriptor, @Nullable Throwable throwable);
-
-  void onTestSuiteFinish(SuiteKey descriptor, @Nullable Long endTime);
-
-  /**
-   * Reports a "test started" event
-   *
-   * @param suiteDescriptor a descriptor uniquely identifying the test's suite
-   * @param descriptor a descriptor uniquely identifying the test
-   * @param testName the name of the test case
-   * @param testFramework name of the testing framework used to run the test case
-   * @param testFrameworkVersion version of the testing framework used to run the test case
-   * @param testParameters test parameters (as stringified JSON) if this is a parameterized test
-   *     case
-   * @param categories test categories (or test tags) if the test case is marked with any
-   * @param testSourceData metadata for locating the source code for the test case
-   * @param startTime the timestamp of the test execution start ({@code null} for current timestamp)
-   */
-  void onTestStart(
-      SuiteKey suiteDescriptor,
-      TestKey descriptor,
-      String testName,
-      @Nullable String testFramework,
-      @Nullable String testFrameworkVersion,
-      @Nullable String testParameters,
-      @Nullable Collection<String> categories,
-      @Nonnull TestSourceData testSourceData,
-      @Nullable Long startTime,
-      @Nullable TestExecutionTracker testExecutionTracker);
-
-  void onTestSkip(TestKey descriptor, @Nullable String reason);
-
-  void onTestFailure(TestKey descriptor, @Nullable Throwable throwable);
-
-  void onTestFinish(
-      TestKey descriptor,
-      @Nullable Long endTime,
-      @Nullable TestExecutionTracker testExecutionTracker);
-
-  void onTestIgnore(
-      SuiteKey suiteDescriptor,
-      TestKey testDescriptor,
-      String testName,
-      @Nullable String testFramework,
-      @Nullable String testFrameworkVersion,
-      @Nullable String testParameters,
-      @Nullable Collection<String> categories,
-      @Nonnull TestSourceData testSourceData,
-      @Nullable String reason,
-      @Nullable TestExecutionTracker testExecutionTracker);
-
-  @Nonnull
-  TestExecutionPolicy executionPolicy(
-      TestIdentifier test, TestSourceData source, Collection<String> testTags);
-
-  /**
-   * Returns the priority of the test execution that can be used for ordering tests. The higher the
-   * value, the higher the priority, meaning that the test should be executed earlier.
-   */
-  int executionPriority(@Nullable TestIdentifier test, @Nonnull TestSourceData testSourceData);
-
-  /**
-   * Returns the reason for skipping a test IF it can be skipped.
-   *
-   * @param test Test to be checked
-   * @return skip reason, or {@code null} if the test cannot be skipped
-   */
-  @Nullable
-  SkipReason skipReason(TestIdentifier test);
-
-  @Override
-  void close();
-
-  interface Factory {
-    <SuiteKey, TestKey> TestEventsHandler<SuiteKey, TestKey> create(
-        String component,
-        @Nullable ContextStore<SuiteKey, DDTestSuite> suiteStore,
-        @Nullable ContextStore<TestKey, DDTest> testStore,
-        Collection<LibraryCapability> capabilities);
-  }
+    /**
+     * @param testFramework Name of the testing framework that executes the suite.
+     * @param instrumentation Instrumentation that emits the event. Can differ from the testing
+     *     framework, because one instrumentation can support multiple frameworks. For example, there
+     *     are many testing frameworks based on JUnit 5. For some of those frameworks we have
+     *     dedicated instrumentations, while others are handled with "generic" JUnit 5 instrumentation
+     */
+    void onTestSuiteStart(
+            SuiteKey descriptor,
+            String testSuiteName,
+            @Nullable String testFramework,
+            @Nullable String testFrameworkVersion,
+            @Nullable Class<?> testClass,
+            @Nullable Collection<String> categories,
+            boolean parallelized,
+            TestFrameworkInstrumentation instrumentation,
+            @Nullable Long startTime);
+
+    void onTestSuiteSkip(SuiteKey descriptor, @Nullable String reason);
+
+    void onTestSuiteFailure(SuiteKey descriptor, @Nullable Throwable throwable);
+
+    void onTestSuiteFinish(SuiteKey descriptor, @Nullable Long endTime);
+
+    /**
+     * Reports a "test started" event
+     *
+     * @param suiteDescriptor a descriptor uniquely identifying the test's suite
+     * @param descriptor a descriptor uniquely identifying the test
+     * @param testName the name of the test case
+     * @param testFramework name of the testing framework used to run the test case
+     * @param testFrameworkVersion version of the testing framework used to run the test case
+     * @param testParameters test parameters (as stringified JSON) if this is a parameterized test
+     *     case
+     * @param categories test categories (or test tags) if the test case is marked with any
+     * @param testSourceData metadata for locating the source code for the test case
+     * @param startTime the timestamp of the test execution start ({@code null} for current timestamp)
+     */
+    void onTestStart(
+            SuiteKey suiteDescriptor,
+            TestKey descriptor,
+            String testName,
+            @Nullable String testFramework,
+            @Nullable String testFrameworkVersion,
+            @Nullable String testParameters,
+            @Nullable Collection<String> categories,
+            @Nonnull TestSourceData testSourceData,
+            @Nullable Long startTime,
+            @Nullable TestExecutionTracker testExecutionTracker);
+
+    void onTestSkip(TestKey descriptor, @Nullable String reason);
+
+    void onTestFailure(TestKey descriptor, @Nullable Throwable throwable);
+
+    void onTestFinish(TestKey descriptor, @Nullable Long endTime, @Nullable TestExecutionTracker testExecutionTracker);
+
+    void onTestIgnore(
+            SuiteKey suiteDescriptor,
+            TestKey testDescriptor,
+            String testName,
+            @Nullable String testFramework,
+            @Nullable String testFrameworkVersion,
+            @Nullable String testParameters,
+            @Nullable Collection<String> categories,
+            @Nonnull TestSourceData testSourceData,
+            @Nullable String reason,
+            @Nullable TestExecutionTracker testExecutionTracker);
+
+    @Nonnull
+    TestExecutionPolicy executionPolicy(TestIdentifier test, TestSourceData source, Collection<String> testTags);
+
+    /**
+     * Returns the priority of the test execution that can be used for ordering tests. The higher the
+     * value, the higher the priority, meaning that the test should be executed earlier.
+     */
+    int executionPriority(@Nullable TestIdentifier test, @Nonnull TestSourceData testSourceData);
+
+    /**
+     * Returns the reason for skipping a test IF it can be skipped.
+     *
+     * @param test Test to be checked
+     * @return skip reason, or {@code null} if the test cannot be skipped
+     */
+    @Nullable
+    SkipReason skipReason(TestIdentifier test);
+
+    @Override
+    void close();
+
+    interface Factory {
+        <SuiteKey, TestKey> TestEventsHandler<SuiteKey, TestKey> create(
+                String component,
+                @Nullable ContextStore<SuiteKey, DDTestSuite> suiteStore,
+                @Nullable ContextStore<TestKey, DDTest> testStore,
+                Collection<LibraryCapability> capabilities);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestSuiteDescriptor.java b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestSuiteDescriptor.java
index 2d5ed960b6f..ff32bcef7b9 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestSuiteDescriptor.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestSuiteDescriptor.java
@@ -4,40 +4,33 @@
 import java.util.Objects;
 
 public final class TestSuiteDescriptor {
-  private final String testSuiteName;
-  private final Class<?> testClass;
+    private final String testSuiteName;
+    private final Class<?> testClass;
 
-  public TestSuiteDescriptor(String testSuiteName, Class<?> testClass) {
-    this.testSuiteName = testSuiteName;
-    this.testClass = testClass;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public TestSuiteDescriptor(String testSuiteName, Class<?> testClass) {
+        this.testSuiteName = testSuiteName;
+        this.testClass = testClass;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        TestSuiteDescriptor that = (TestSuiteDescriptor) o;
+        return Objects.equals(testSuiteName, that.testSuiteName) && Objects.equals(testClass, that.testClass);
     }
-    TestSuiteDescriptor that = (TestSuiteDescriptor) o;
-    return Objects.equals(testSuiteName, that.testSuiteName)
-        && Objects.equals(testClass, that.testClass);
-  }
 
-  @Override
-  public int hashCode() {
-    return HashingUtils.hash(testSuiteName, testClass);
-  }
+    @Override
+    public int hashCode() {
+        return HashingUtils.hash(testSuiteName, testClass);
+    }
 
-  @Override
-  public String toString() {
-    return "TestSuiteDescriptor{"
-        + "testSuiteName='"
-        + testSuiteName
-        + '\''
-        + ", testClass="
-        + testClass
-        + '}';
-  }
+    @Override
+    public String toString() {
+        return "TestSuiteDescriptor{" + "testSuiteName='" + testSuiteName + '\'' + ", testClass=" + testClass + '}';
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/execution/ExecutionAggregation.java b/internal-api/src/main/java/datadog/trace/api/civisibility/execution/ExecutionAggregation.java
index d5f5a037121..1c13b9408c9 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/execution/ExecutionAggregation.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/execution/ExecutionAggregation.java
@@ -2,25 +2,25 @@
 
 /** Tracks the aggregate result of test executions. */
 public enum ExecutionAggregation {
-  NONE,
-  ONLY_FAILED,
-  ONLY_PASSED,
-  MIXED;
+    NONE,
+    ONLY_FAILED,
+    ONLY_PASSED,
+    MIXED;
 
-  /** Returns the new state after registering an execution with the given status. */
-  public ExecutionAggregation withExecution(TestStatus status) {
-    boolean failed = (status == TestStatus.fail);
-    switch (this) {
-      case NONE:
-        return failed ? ONLY_FAILED : ONLY_PASSED;
-      case ONLY_FAILED:
-        return failed ? ONLY_FAILED : MIXED;
-      case ONLY_PASSED:
-        return failed ? MIXED : ONLY_PASSED;
-      case MIXED:
-        return MIXED;
-      default:
-        throw new IllegalStateException("Unknown state: " + this);
+    /** Returns the new state after registering an execution with the given status. */
+    public ExecutionAggregation withExecution(TestStatus status) {
+        boolean failed = (status == TestStatus.fail);
+        switch (this) {
+            case NONE:
+                return failed ? ONLY_FAILED : ONLY_PASSED;
+            case ONLY_FAILED:
+                return failed ? ONLY_FAILED : MIXED;
+            case ONLY_PASSED:
+                return failed ? MIXED : ONLY_PASSED;
+            case MIXED:
+                return MIXED;
+            default:
+                throw new IllegalStateException("Unknown state: " + this);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/execution/TestExecutionPolicy.java b/internal-api/src/main/java/datadog/trace/api/civisibility/execution/TestExecutionPolicy.java
index 0b8c27408e8..ba34eea3723 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/execution/TestExecutionPolicy.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/execution/TestExecutionPolicy.java
@@ -10,33 +10,33 @@
  */
 public interface TestExecutionPolicy extends TestExecutionTracker {
 
-  /**
-   * Must be called before the execution is registered by {@link
-   * TestExecutionTracker#registerExecution(TestStatus, long)}.
-   *
-   * @return {@code true} if the next execution of the test will be altered in any way. This method
-   *     is used to avoid unnecessary performance penalty: if it returns {@code false},
-   *     instrumentation code needed to alter test behavior will be skipped.
-   */
-  boolean applicable();
+    /**
+     * Must be called before the execution is registered by {@link
+     * TestExecutionTracker#registerExecution(TestStatus, long)}.
+     *
+     * @return {@code true} if the next execution of the test will be altered in any way. This method
+     *     is used to avoid unnecessary performance penalty: if it returns {@code false},
+     *     instrumentation code needed to alter test behavior will be skipped.
+     */
+    boolean applicable();
 
-  /**
-   * Must be called before the execution is registered by {@link
-   * TestExecutionTracker#registerExecution(TestStatus, long)}.
-   *
-   * @return {@code true} if failure of the next execution of the test should not affect build
-   *     result
-   */
-  boolean suppressFailures();
+    /**
+     * Must be called before the execution is registered by {@link
+     * TestExecutionTracker#registerExecution(TestStatus, long)}.
+     *
+     * @return {@code true} if failure of the next execution of the test should not affect build
+     *     result
+     */
+    boolean suppressFailures();
 
-  /**
-   * Must be called after the execution is registered by {@link
-   * TestExecutionTracker#registerExecution(TestStatus, long)}.
-   *
-   * @return {@code true} if a passing test result should be converted to failure because the
-   *     aggregated results indicate the test should fail the build
-   */
-  default boolean propagateFailure() {
-    return false;
-  }
+    /**
+     * Must be called after the execution is registered by {@link
+     * TestExecutionTracker#registerExecution(TestStatus, long)}.
+     *
+     * @return {@code true} if a passing test result should be converted to failure because the
+     *     aggregated results indicate the test should fail the build
+     */
+    default boolean propagateFailure() {
+        return false;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/execution/TestExecutionTracker.java b/internal-api/src/main/java/datadog/trace/api/civisibility/execution/TestExecutionTracker.java
index 88cea1929e5..7aa728261ae 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/execution/TestExecutionTracker.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/execution/TestExecutionTracker.java
@@ -17,48 +17,48 @@
  */
 public interface TestExecutionTracker {
 
-  /**
-   * Records the result of a test execution and returns the outcome.
-   *
-   * @param status result of the execution: pass, fail or skip
-   * @param durationMillis duration of current test execution in milliseconds
-   */
-  ExecutionOutcome registerExecution(TestStatus status, long durationMillis);
-
-  /**
-   * @return {@code true} if the test should be instrumented by FTR
-   */
-  boolean failedTestReplayApplicable();
-
-  interface ExecutionOutcome {
     /**
-     * @return {@code true} if this execution failed and the failure was suppressed
+     * Records the result of a test execution and returns the outcome.
+     *
+     * @param status result of the execution: pass, fail or skip
+     * @param durationMillis duration of current test execution in milliseconds
      */
-    boolean failureSuppressed();
+    ExecutionOutcome registerExecution(TestStatus status, long durationMillis);
 
     /**
-     * @return {@code true} if this execution is the last one (only for policies that allow multiple
-     *     retries)
+     * @return {@code true} if the test should be instrumented by FTR
      */
-    boolean lastExecution();
+    boolean failedTestReplayApplicable();
 
-    /**
-     * @return Aggregated results across all executions so far
-     */
-    ExecutionAggregation aggregation();
+    interface ExecutionOutcome {
+        /**
+         * @return {@code true} if this execution failed and the failure was suppressed
+         */
+        boolean failureSuppressed();
 
-    /**
-     * @return retry reason for current test execution ({@code null} if current execution is not a
-     *     retry)
-     */
-    @Nullable
-    RetryReason retryReason();
+        /**
+         * @return {@code true} if this execution is the last one (only for policies that allow multiple
+         *     retries)
+         */
+        boolean lastExecution();
 
-    /**
-     * @return Final status of the test as seen by the testing framework. Only applicable if {@code
-     *     lastExecution()} is true.
-     */
-    @Nullable
-    TestStatus finalStatus();
-  }
+        /**
+         * @return Aggregated results across all executions so far
+         */
+        ExecutionAggregation aggregation();
+
+        /**
+         * @return retry reason for current test execution ({@code null} if current execution is not a
+         *     retry)
+         */
+        @Nullable
+        RetryReason retryReason();
+
+        /**
+         * @return Final status of the test as seen by the testing framework. Only applicable if {@code
+         *     lastExecution()} is true.
+         */
+        @Nullable
+        TestStatus finalStatus();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/execution/TestStatus.java b/internal-api/src/main/java/datadog/trace/api/civisibility/execution/TestStatus.java
index 00fb5ddf904..e2626a4872f 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/execution/TestStatus.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/execution/TestStatus.java
@@ -1,7 +1,7 @@
 package datadog.trace.api.civisibility.execution;
 
 public enum TestStatus {
-  pass,
-  fail,
-  skip
+    pass,
+    fail,
+    skip
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityCountMetric.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityCountMetric.java
index 54f422e4cb4..b66a21b2688 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityCountMetric.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityCountMetric.java
@@ -48,250 +48,240 @@
 
 public enum CiVisibilityCountMetric {
 
-  /**
-   * The number of test sessions started. This metric is separate from event_created to avoid
-   * increasing the cardinality too much
-   */
-  TEST_SESSION(
-      "test_session",
-      Provider.class,
-      AutoInjected.class,
-      AgentlessLogSubmissionEnabled.class,
-      FailFastTestOrderEnabled.class),
-  /** The number of events created */
-  EVENT_CREATED(
-      "event_created",
-      TestFrameworkInstrumentation.class,
-      EventType.class,
-      IsHeadless.class,
-      HasCodeowner.class,
-      IsUnsupportedCI.class),
-  /** The number of events finished */
-  EVENT_FINISHED(
-      "event_finished",
-      TestFrameworkInstrumentation.class,
-      EventType.class,
-      IsHeadless.class,
-      HasCodeowner.class,
-      IsUnsupportedCI.class,
-      EarlyFlakeDetectionAbortReason.class,
-      FailedTestReplayEnabled.SessionMetric.class,
-      IsAndroid.class),
-  /** The number of test events finished */
-  TEST_EVENT_FINISHED(
-      "event_finished",
-      TestFrameworkInstrumentation.class,
-      EventType.class,
-      IsNew.class,
-      IsModified.class,
-      IsQuarantined.class,
-      IsDisabled.class,
-      IsAttemptToFix.class,
-      IsRetry.class,
-      HasFailedAllRetries.class,
-      RetryReason.class,
-      FailedTestReplayEnabled.TestMetric.class,
-      IsRum.class,
-      BrowserDriver.class,
-      IsAndroidEmulated.class),
-  /** The number of successfully collected code coverages that are empty */
-  CODE_COVERAGE_IS_EMPTY("code_coverage.is_empty"),
-  /** The number of errors while processing code coverage */
-  CODE_COVERAGE_ERRORS("code_coverage.errors", CoverageErrorType.class),
-  /** The number of events created using the manual API */
-  MANUAL_API_EVENTS("manual_api_events", EventType.class),
-  /** The number of events enqueued for serialization */
-  EVENTS_ENQUEUED_FOR_SERIALIZATION("events_enqueued_for_serialization"),
-  /** The number of requests sent to the endpoint, regardless of success */
-  ENDPOINT_PAYLOAD_REQUESTS("endpoint_payload.requests", Endpoint.class, RequestCompressed.class),
-  /** The number of requests sent to the endpoint that errored */
-  ENDPOINT_PAYLOAD_REQUESTS_ERRORS(
-      "endpoint_payload.requests_errors", Endpoint.class, ErrorType.class, StatusCode.class),
-  /** The number of payloads dropped after all retries */
-  ENDPOINT_PAYLOAD_DROPPED("endpoint_payload.dropped", Endpoint.class),
-  /** The number of git commands executed */
-  GIT_COMMAND("git.command", Command.class),
-  /** The number of git commands that errored */
-  GIT_COMMAND_ERRORS("git.command_errors", Command.class, ExitCode.class),
-  /** Number of commit sha comparisons and if they matched when building git info for a repo */
-  GIT_COMMIT_SHA_MATCH("git.commit_sha_match", GitShaMatch.class),
-  /** Number of sha mismatches when building git info for a repo */
-  GIT_COMMIT_SHA_DISCREPANCY(
-      "git.commit_sha_discrepancy",
-      GitProviderExpected.class,
-      GitProviderDiscrepant.class,
-      GitShaDiscrepancyType.class),
-  /** The number of requests sent to the search commit endpoint */
-  GIT_REQUESTS_SEARCH_COMMITS("git_requests.search_commits", RequestCompressed.class),
-  /** The number of search commit requests sent to the endpoint that errored */
-  GIT_REQUESTS_SEARCH_COMMITS_ERRORS(
-      "git_requests.search_commits_errors", ErrorType.class, StatusCode.class),
-  /** The number of requests sent to the git object pack endpoint */
-  GIT_REQUESTS_OBJECTS_PACK("git_requests.objects_pack", RequestCompressed.class),
-  /** The number of git object pack requests sent to the endpoint that errored */
-  GIT_REQUESTS_OBJECTS_PACK_ERRORS(
-      "git_requests.objects_pack_errors", ErrorType.class, StatusCode.class),
-  /** The number of requests sent to the settings endpoint, regardless of success */
-  GIT_REQUESTS_SETTINGS("git_requests.settings", RequestCompressed.class),
-  /** The number of settings requests sent to the endpoint that errored */
-  GIT_REQUESTS_SETTINGS_ERRORS("git_requests.settings_errors", ErrorType.class, StatusCode.class),
-  /** The number of settings responses from the endpoint */
-  GIT_REQUESTS_SETTINGS_RESPONSE(
-      "git_requests.settings_response",
-      ItrEnabled.class,
-      ItrSkipEnabled.class,
-      CoverageEnabled.class,
-      EarlyFlakeDetectionEnabled.class,
-      FlakyTestRetriesEnabled.class,
-      ImpactedTestsDetectionEnabled.class,
-      KnownTestsEnabled.class,
-      TestManagementEnabled.class,
-      FailedTestReplayEnabled.SettingsMetric.class,
-      RequireGit.class),
-  /** The number of requests sent to the itr skippable tests endpoint */
-  ITR_SKIPPABLE_TESTS_REQUEST("itr_skippable_tests.request", RequestCompressed.class),
-  /** The number of itr skippable tests requests sent to the endpoint that errored */
-  ITR_SKIPPABLE_TESTS_REQUEST_ERRORS(
-      "itr_skippable_tests.request_errors", ErrorType.class, StatusCode.class),
-  /** The number of tests to skip returned by the endpoint */
-  ITR_SKIPPABLE_TESTS_RESPONSE_TESTS("itr_skippable_tests.response_tests"),
-  /** The number of tests or test suites skipped */
-  ITR_SKIPPED("itr_skipped", EventType.class),
-  /** The number of tests or test suites that are seen as unskippable */
-  ITR_UNSKIPPABLE("itr_unskippable", EventType.class),
-  /**
-   * The number of tests or test suites that would've been skipped by ITR but were forced to run
-   * because of their unskippable status
-   */
-  ITR_FORCED_RUN("itr_forced_run", EventType.class),
-  /** The number of requests sent to the known tests endpoint */
-  KNOWN_TESTS_REQUEST("known_tests.request", RequestCompressed.class),
-  /** The number of known tests requests sent to the known tests endpoint that errored */
-  KNOWN_TESTS_REQUEST_ERRORS("known_tests.request_errors", ErrorType.class, StatusCode.class),
-  /** The number of requests sent to the flaky tests endpoint */
-  FLAKY_TESTS_REQUEST("flaky_tests.request", RequestCompressed.class),
-  /** The number of tests requests sent to the flaky tests endpoint that errored */
-  FLAKY_TESTS_REQUEST_ERRORS("flaky_tests.request_errors", ErrorType.class, StatusCode.class),
-  /** The number of requests sent to the test management tests endpoint */
-  TEST_MANAGEMENT_TESTS_REQUEST("test_management_tests.request", RequestCompressed.class),
-  /** The number of tests requests sent to the test management tests endpoint that errored */
-  TEST_MANAGEMENT_TESTS_REQUEST_ERRORS(
-      "test_management_tests.request_errors", ErrorType.class, StatusCode.class),
-  /** The number of coverage upload requests sent */
-  COVERAGE_UPLOAD_REQUEST("coverage_upload.request", RequestCompressed.class),
-  /** The number of coverage upload requests that errored */
-  COVERAGE_UPLOAD_REQUEST_ERRORS(
-      "coverage_upload.request_errors", ErrorType.class, StatusCode.class),
-  /** Recorded once per session when dynamic, duration-based ATR retries are enabled */
-  DYNAMIC_ATR_RETRIES_ENABLED("dynamic_atr_retries.enabled", HasCustomBuckets.class);
+    /**
+     * The number of test sessions started. This metric is separate from event_created to avoid
+     * increasing the cardinality too much
+     */
+    TEST_SESSION(
+            "test_session",
+            Provider.class,
+            AutoInjected.class,
+            AgentlessLogSubmissionEnabled.class,
+            FailFastTestOrderEnabled.class),
+    /** The number of events created */
+    EVENT_CREATED(
+            "event_created",
+            TestFrameworkInstrumentation.class,
+            EventType.class,
+            IsHeadless.class,
+            HasCodeowner.class,
+            IsUnsupportedCI.class),
+    /** The number of events finished */
+    EVENT_FINISHED(
+            "event_finished",
+            TestFrameworkInstrumentation.class,
+            EventType.class,
+            IsHeadless.class,
+            HasCodeowner.class,
+            IsUnsupportedCI.class,
+            EarlyFlakeDetectionAbortReason.class,
+            FailedTestReplayEnabled.SessionMetric.class,
+            IsAndroid.class),
+    /** The number of test events finished */
+    TEST_EVENT_FINISHED(
+            "event_finished",
+            TestFrameworkInstrumentation.class,
+            EventType.class,
+            IsNew.class,
+            IsModified.class,
+            IsQuarantined.class,
+            IsDisabled.class,
+            IsAttemptToFix.class,
+            IsRetry.class,
+            HasFailedAllRetries.class,
+            RetryReason.class,
+            FailedTestReplayEnabled.TestMetric.class,
+            IsRum.class,
+            BrowserDriver.class,
+            IsAndroidEmulated.class),
+    /** The number of successfully collected code coverages that are empty */
+    CODE_COVERAGE_IS_EMPTY("code_coverage.is_empty"),
+    /** The number of errors while processing code coverage */
+    CODE_COVERAGE_ERRORS("code_coverage.errors", CoverageErrorType.class),
+    /** The number of events created using the manual API */
+    MANUAL_API_EVENTS("manual_api_events", EventType.class),
+    /** The number of events enqueued for serialization */
+    EVENTS_ENQUEUED_FOR_SERIALIZATION("events_enqueued_for_serialization"),
+    /** The number of requests sent to the endpoint, regardless of success */
+    ENDPOINT_PAYLOAD_REQUESTS("endpoint_payload.requests", Endpoint.class, RequestCompressed.class),
+    /** The number of requests sent to the endpoint that errored */
+    ENDPOINT_PAYLOAD_REQUESTS_ERRORS(
+            "endpoint_payload.requests_errors", Endpoint.class, ErrorType.class, StatusCode.class),
+    /** The number of payloads dropped after all retries */
+    ENDPOINT_PAYLOAD_DROPPED("endpoint_payload.dropped", Endpoint.class),
+    /** The number of git commands executed */
+    GIT_COMMAND("git.command", Command.class),
+    /** The number of git commands that errored */
+    GIT_COMMAND_ERRORS("git.command_errors", Command.class, ExitCode.class),
+    /** Number of commit sha comparisons and if they matched when building git info for a repo */
+    GIT_COMMIT_SHA_MATCH("git.commit_sha_match", GitShaMatch.class),
+    /** Number of sha mismatches when building git info for a repo */
+    GIT_COMMIT_SHA_DISCREPANCY(
+            "git.commit_sha_discrepancy",
+            GitProviderExpected.class,
+            GitProviderDiscrepant.class,
+            GitShaDiscrepancyType.class),
+    /** The number of requests sent to the search commit endpoint */
+    GIT_REQUESTS_SEARCH_COMMITS("git_requests.search_commits", RequestCompressed.class),
+    /** The number of search commit requests sent to the endpoint that errored */
+    GIT_REQUESTS_SEARCH_COMMITS_ERRORS("git_requests.search_commits_errors", ErrorType.class, StatusCode.class),
+    /** The number of requests sent to the git object pack endpoint */
+    GIT_REQUESTS_OBJECTS_PACK("git_requests.objects_pack", RequestCompressed.class),
+    /** The number of git object pack requests sent to the endpoint that errored */
+    GIT_REQUESTS_OBJECTS_PACK_ERRORS("git_requests.objects_pack_errors", ErrorType.class, StatusCode.class),
+    /** The number of requests sent to the settings endpoint, regardless of success */
+    GIT_REQUESTS_SETTINGS("git_requests.settings", RequestCompressed.class),
+    /** The number of settings requests sent to the endpoint that errored */
+    GIT_REQUESTS_SETTINGS_ERRORS("git_requests.settings_errors", ErrorType.class, StatusCode.class),
+    /** The number of settings responses from the endpoint */
+    GIT_REQUESTS_SETTINGS_RESPONSE(
+            "git_requests.settings_response",
+            ItrEnabled.class,
+            ItrSkipEnabled.class,
+            CoverageEnabled.class,
+            EarlyFlakeDetectionEnabled.class,
+            FlakyTestRetriesEnabled.class,
+            ImpactedTestsDetectionEnabled.class,
+            KnownTestsEnabled.class,
+            TestManagementEnabled.class,
+            FailedTestReplayEnabled.SettingsMetric.class,
+            RequireGit.class),
+    /** The number of requests sent to the itr skippable tests endpoint */
+    ITR_SKIPPABLE_TESTS_REQUEST("itr_skippable_tests.request", RequestCompressed.class),
+    /** The number of itr skippable tests requests sent to the endpoint that errored */
+    ITR_SKIPPABLE_TESTS_REQUEST_ERRORS("itr_skippable_tests.request_errors", ErrorType.class, StatusCode.class),
+    /** The number of tests to skip returned by the endpoint */
+    ITR_SKIPPABLE_TESTS_RESPONSE_TESTS("itr_skippable_tests.response_tests"),
+    /** The number of tests or test suites skipped */
+    ITR_SKIPPED("itr_skipped", EventType.class),
+    /** The number of tests or test suites that are seen as unskippable */
+    ITR_UNSKIPPABLE("itr_unskippable", EventType.class),
+    /**
+     * The number of tests or test suites that would've been skipped by ITR but were forced to run
+     * because of their unskippable status
+     */
+    ITR_FORCED_RUN("itr_forced_run", EventType.class),
+    /** The number of requests sent to the known tests endpoint */
+    KNOWN_TESTS_REQUEST("known_tests.request", RequestCompressed.class),
+    /** The number of known tests requests sent to the known tests endpoint that errored */
+    KNOWN_TESTS_REQUEST_ERRORS("known_tests.request_errors", ErrorType.class, StatusCode.class),
+    /** The number of requests sent to the flaky tests endpoint */
+    FLAKY_TESTS_REQUEST("flaky_tests.request", RequestCompressed.class),
+    /** The number of tests requests sent to the flaky tests endpoint that errored */
+    FLAKY_TESTS_REQUEST_ERRORS("flaky_tests.request_errors", ErrorType.class, StatusCode.class),
+    /** The number of requests sent to the test management tests endpoint */
+    TEST_MANAGEMENT_TESTS_REQUEST("test_management_tests.request", RequestCompressed.class),
+    /** The number of tests requests sent to the test management tests endpoint that errored */
+    TEST_MANAGEMENT_TESTS_REQUEST_ERRORS("test_management_tests.request_errors", ErrorType.class, StatusCode.class),
+    /** The number of coverage upload requests sent */
+    COVERAGE_UPLOAD_REQUEST("coverage_upload.request", RequestCompressed.class),
+    /** The number of coverage upload requests that errored */
+    COVERAGE_UPLOAD_REQUEST_ERRORS("coverage_upload.request_errors", ErrorType.class, StatusCode.class),
+    /** Recorded once per session when dynamic, duration-based ATR retries are enabled */
+    DYNAMIC_ATR_RETRIES_ENABLED("dynamic_atr_retries.enabled", HasCustomBuckets.class);
 
-  // need a "holder" class, as accessing static fields from enum constructors is illegal
-  static class IndexHolder {
-    private static int INDEX = 0;
-  }
+    // need a "holder" class, as accessing static fields from enum constructors is illegal
+    static class IndexHolder {
+        private static int INDEX = 0;
+    }
 
-  private final String name;
-  private final int index;
-  private final Class<? extends TagValue>[] tags;
-  private final TagValue[][] tagValues;
-  private final int[] tagIdxMultipliers;
+    private final String name;
+    private final int index;
+    private final Class<? extends TagValue>[] tags;
+    private final TagValue[][] tagValues;
+    private final int[] tagIdxMultipliers;
 
-  @SafeVarargs
-  CiVisibilityCountMetric(String metricName, Class<? extends TagValue>... metricTags) {
-    name = metricName;
-    index = IndexHolder.INDEX;
-    tags = metricTags;
+    @SafeVarargs
+    CiVisibilityCountMetric(String metricName, Class<? extends TagValue>... metricTags) {
+        name = metricName;
+        index = IndexHolder.INDEX;
+        tags = metricTags;
 
-    tagValues = new TagValue[tags.length][];
-    for (int i = 0; i < tags.length; i++) {
-      // getEnumConstants() creates a new copy of the array each time it is called, so "caching" the
-      // results in a field
-      tagValues[i] = tags[i].getEnumConstants();
-    }
+        tagValues = new TagValue[tags.length][];
+        for (int i = 0; i < tags.length; i++) {
+            // getEnumConstants() creates a new copy of the array each time it is called, so "caching" the
+            // results in a field
+            tagValues[i] = tags[i].getEnumConstants();
+        }
 
-    tagIdxMultipliers = new int[tags.length];
-    if (tags.length != 0) {
-      tagIdxMultipliers[0] = 1;
-    }
-    for (int i = 1; i < tags.length; i++) {
-      tagIdxMultipliers[i] =
-          tagIdxMultipliers[i - 1]
-              * (tagValues[i - 1].length + 1); // +1 to account for "no value" (omitted tag)
-    }
+        tagIdxMultipliers = new int[tags.length];
+        if (tags.length != 0) {
+            tagIdxMultipliers[0] = 1;
+        }
+        for (int i = 1; i < tags.length; i++) {
+            tagIdxMultipliers[i] = tagIdxMultipliers[i - 1]
+                    * (tagValues[i - 1].length + 1); // +1 to account for "no value" (omitted tag)
+        }
 
-    IndexHolder.INDEX = getEndIndex();
-  }
+        IndexHolder.INDEX = getEndIndex();
+    }
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 
-  public Class<? extends TagValue>[] getTags() {
-    return tags;
-  }
+    public Class<? extends TagValue>[] getTags() {
+        return tags;
+    }
 
-  public int getEndIndex() {
-    int delta =
-        tagValues.length > 0
-            ? (tagIdxMultipliers[tagIdxMultipliers.length - 1]
-                * (tagValues[tagValues.length - 1].length + 1))
-            : 1;
-    return index + delta;
-  }
+    public int getEndIndex() {
+        int delta = tagValues.length > 0
+                ? (tagIdxMultipliers[tagIdxMultipliers.length - 1] * (tagValues[tagValues.length - 1].length + 1))
+                : 1;
+        return index + delta;
+    }
 
-  public CiVisibilityMetricData createData(long value, TagValue... tagValues) {
-    return new CiVisibilityMetricData(name, value, tagValues);
-  }
+    public CiVisibilityMetricData createData(long value, TagValue... tagValues) {
+        return new CiVisibilityMetricData(name, value, tagValues);
+    }
 
-  public int getIndex(TagValue... tagValues) {
-    int index = this.index;
-    for (TagValue tagValue : tagValues) {
-      if (tagValue == null) {
-        continue;
-      }
-      index += calculateIdxDelta(tagValue);
+    public int getIndex(TagValue... tagValues) {
+        int index = this.index;
+        for (TagValue tagValue : tagValues) {
+            if (tagValue == null) {
+                continue;
+            }
+            index += calculateIdxDelta(tagValue);
+        }
+        return index;
     }
-    return index;
-  }
 
-  private int calculateIdxDelta(TagValue tagValue) {
-    Class<? extends TagValue> tag = tagValue.getDeclaringClass();
-    for (int i = 0; i < tags.length; i++) {
-      if (tag == tags[i]) {
-        return tagIdxMultipliers[i]
-            * (tagValue.ordinal() + 1); // +1 to account for "no value" (omitted tag)
-      }
+    private int calculateIdxDelta(TagValue tagValue) {
+        Class<? extends TagValue> tag = tagValue.getDeclaringClass();
+        for (int i = 0; i < tags.length; i++) {
+            if (tag == tags[i]) {
+                return tagIdxMultipliers[i] * (tagValue.ordinal() + 1); // +1 to account for "no value" (omitted tag)
+            }
+        }
+        throw new IllegalArgumentException("Metric "
+                + name()
+                + " cannot be tagged with "
+                + tag.getSimpleName()
+                + ", allowed tags are "
+                + Arrays.toString(tags));
     }
-    throw new IllegalArgumentException(
-        "Metric "
-            + name()
-            + " cannot be tagged with "
-            + tag.getSimpleName()
-            + ", allowed tags are "
-            + Arrays.toString(tags));
-  }
 
-  public TagValue[] getTagValues(int index) {
-    int tagValueIdx = 0;
-    TagValue[] values = new TagValue[tags.length];
+    public TagValue[] getTagValues(int index) {
+        int tagValueIdx = 0;
+        TagValue[] values = new TagValue[tags.length];
 
-    index -= this.index;
-    for (int i = 0; i < tags.length; i++) {
-      TagValue[] possibleValues = tagValues[i];
-      int tagCardinality = possibleValues.length + 1; // +1 to account for "no value" (omitted tag)
-      int tagOrdinal = index % tagCardinality;
-      // we use 0 to show absence of tag
-      if (tagOrdinal != 0) {
-        tagOrdinal--; // going back from 1-based to 0-based
-        values[tagValueIdx++] = possibleValues[tagOrdinal];
-      }
-      index /= tagCardinality;
-    }
+        index -= this.index;
+        for (int i = 0; i < tags.length; i++) {
+            TagValue[] possibleValues = tagValues[i];
+            int tagCardinality = possibleValues.length + 1; // +1 to account for "no value" (omitted tag)
+            int tagOrdinal = index % tagCardinality;
+            // we use 0 to show absence of tag
+            if (tagOrdinal != 0) {
+                tagOrdinal--; // going back from 1-based to 0-based
+                values[tagValueIdx++] = possibleValues[tagOrdinal];
+            }
+            index /= tagCardinality;
+        }
 
-    return tagValueIdx == values.length ? values : Arrays.copyOf(values, tagValueIdx);
-  }
+        return tagValueIdx == values.length ? values : Arrays.copyOf(values, tagValueIdx);
+    }
 
-  public static int count() {
-    return IndexHolder.INDEX;
-  }
+    public static int count() {
+        return IndexHolder.INDEX;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityDistributionMetric.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityDistributionMetric.java
index 35679200e40..c9acd958eee 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityDistributionMetric.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityDistributionMetric.java
@@ -11,103 +11,99 @@
 
 public enum CiVisibilityDistributionMetric {
 
-  /** The size in bytes of the serialized payload */
-  ENDPOINT_PAYLOAD_BYTES("endpoint_payload.bytes", Endpoint.class),
-  /** The time it takes to send the payload sent to the endpoint in ms */
-  ENDPOINT_PAYLOAD_REQUESTS_MS("endpoint_payload.requests_ms", Endpoint.class),
-  /** The number of events included in the payload */
-  ENDPOINT_PAYLOAD_EVENTS_COUNT("endpoint_payload.events_count", Endpoint.class),
-  /** The time it takes to serialize the payload */
-  ENDPOINT_PAYLOAD_EVENTS_SERIALIZATION_MS(
-      "endpoint_payload.events_serialization_ms", Endpoint.class),
-  /** The time it takes to execute a git command */
-  GIT_COMMAND_MS("git.command_ms", Command.class),
-  /** The time it takes to get the response of the search commit request in ms */
-  GIT_REQUESTS_SEARCH_COMMITS_MS("git_requests.search_commits_ms"),
-  /** The time it takes to get the response of the git object pack request in ms */
-  GIT_REQUESTS_OBJECTS_PACK_MS("git_requests.objects_pack_ms"),
-  /** The sum of the sizes of the object pack files inside a single payload */
-  GIT_REQUESTS_OBJECTS_PACK_BYTES("git_requests.objects_pack_bytes"),
-  /** The number of pack files created in a test session */
-  GIT_REQUESTS_OBJECTS_PACK_FILES("git_requests.objects_pack_files"),
-  /** The time it takes to get the response of the settings endpoint request in ms */
-  GIT_REQUESTS_SETTINGS_MS("git_requests.settings_ms"),
-  /** The time it takes to get the response of the itr skippable tests endpoint request in ms */
-  ITR_SKIPPABLE_TESTS_REQUEST_MS("itr_skippable_tests.request_ms"),
-  /** The number of bytes received by the skippable tests endpoint */
-  ITR_SKIPPABLE_TESTS_RESPONSE_BYTES(
-      "itr_skippable_tests.response_bytes", ResponseCompressed.class),
-  /** The number of files covered inside a coverage payload */
-  CODE_COVERAGE_FILES("code_coverage.files"),
-  /** The time it takes to get the response of the known tests endpoint request in ms */
-  KNOWN_TESTS_REQUEST_MS("known_tests.request_ms"),
-  /** The number of bytes received by the known tests endpoint */
-  KNOWN_TESTS_RESPONSE_BYTES("known_tests.response_bytes", ResponseCompressed.class),
-  /** The number of tests received by the known tests endpoint */
-  KNOWN_TESTS_RESPONSE_TESTS("known_tests.response_tests"),
-  /** The time it takes to get the response of the flaky tests endpoint request in ms */
-  FLAKY_TESTS_REQUEST_MS("flaky_tests.request_ms"),
-  /** The number of bytes received by the flaky tests endpoint */
-  FLAKY_TESTS_RESPONSE_BYTES("flaky_tests.response_bytes", ResponseCompressed.class),
-  /** The number of tests received by the flaky tests endpoint */
-  FLAKY_TESTS_RESPONSE_TESTS("flaky_tests.response_tests"),
-  /** The time it takes to get the response of the test management tests endpoint request in ms */
-  TEST_MANAGEMENT_TESTS_REQUEST_MS("test_management_tests.request_ms"),
-  /** The number of bytes received by the test management tests endpoint */
-  TEST_MANAGEMENT_TESTS_RESPONSE_BYTES(
-      "test_management_tests.response_bytes", ResponseCompressed.class),
-  /** The number of tests received by the test management tests endpoint */
-  TEST_MANAGEMENT_TESTS_RESPONSE_TESTS("test_management_tests.response_tests"),
-  /** The time it takes to make a coverage upload request in ms */
-  COVERAGE_UPLOAD_REQUEST_MS("coverage_upload.request_ms"),
-  /** The size of a coverage upload request in bytes */
-  COVERAGE_UPLOAD_REQUEST_BYTES("coverage_upload.request_bytes", ResponseCompressed.class);
+    /** The size in bytes of the serialized payload */
+    ENDPOINT_PAYLOAD_BYTES("endpoint_payload.bytes", Endpoint.class),
+    /** The time it takes to send the payload sent to the endpoint in ms */
+    ENDPOINT_PAYLOAD_REQUESTS_MS("endpoint_payload.requests_ms", Endpoint.class),
+    /** The number of events included in the payload */
+    ENDPOINT_PAYLOAD_EVENTS_COUNT("endpoint_payload.events_count", Endpoint.class),
+    /** The time it takes to serialize the payload */
+    ENDPOINT_PAYLOAD_EVENTS_SERIALIZATION_MS("endpoint_payload.events_serialization_ms", Endpoint.class),
+    /** The time it takes to execute a git command */
+    GIT_COMMAND_MS("git.command_ms", Command.class),
+    /** The time it takes to get the response of the search commit request in ms */
+    GIT_REQUESTS_SEARCH_COMMITS_MS("git_requests.search_commits_ms"),
+    /** The time it takes to get the response of the git object pack request in ms */
+    GIT_REQUESTS_OBJECTS_PACK_MS("git_requests.objects_pack_ms"),
+    /** The sum of the sizes of the object pack files inside a single payload */
+    GIT_REQUESTS_OBJECTS_PACK_BYTES("git_requests.objects_pack_bytes"),
+    /** The number of pack files created in a test session */
+    GIT_REQUESTS_OBJECTS_PACK_FILES("git_requests.objects_pack_files"),
+    /** The time it takes to get the response of the settings endpoint request in ms */
+    GIT_REQUESTS_SETTINGS_MS("git_requests.settings_ms"),
+    /** The time it takes to get the response of the itr skippable tests endpoint request in ms */
+    ITR_SKIPPABLE_TESTS_REQUEST_MS("itr_skippable_tests.request_ms"),
+    /** The number of bytes received by the skippable tests endpoint */
+    ITR_SKIPPABLE_TESTS_RESPONSE_BYTES("itr_skippable_tests.response_bytes", ResponseCompressed.class),
+    /** The number of files covered inside a coverage payload */
+    CODE_COVERAGE_FILES("code_coverage.files"),
+    /** The time it takes to get the response of the known tests endpoint request in ms */
+    KNOWN_TESTS_REQUEST_MS("known_tests.request_ms"),
+    /** The number of bytes received by the known tests endpoint */
+    KNOWN_TESTS_RESPONSE_BYTES("known_tests.response_bytes", ResponseCompressed.class),
+    /** The number of tests received by the known tests endpoint */
+    KNOWN_TESTS_RESPONSE_TESTS("known_tests.response_tests"),
+    /** The time it takes to get the response of the flaky tests endpoint request in ms */
+    FLAKY_TESTS_REQUEST_MS("flaky_tests.request_ms"),
+    /** The number of bytes received by the flaky tests endpoint */
+    FLAKY_TESTS_RESPONSE_BYTES("flaky_tests.response_bytes", ResponseCompressed.class),
+    /** The number of tests received by the flaky tests endpoint */
+    FLAKY_TESTS_RESPONSE_TESTS("flaky_tests.response_tests"),
+    /** The time it takes to get the response of the test management tests endpoint request in ms */
+    TEST_MANAGEMENT_TESTS_REQUEST_MS("test_management_tests.request_ms"),
+    /** The number of bytes received by the test management tests endpoint */
+    TEST_MANAGEMENT_TESTS_RESPONSE_BYTES("test_management_tests.response_bytes", ResponseCompressed.class),
+    /** The number of tests received by the test management tests endpoint */
+    TEST_MANAGEMENT_TESTS_RESPONSE_TESTS("test_management_tests.response_tests"),
+    /** The time it takes to make a coverage upload request in ms */
+    COVERAGE_UPLOAD_REQUEST_MS("coverage_upload.request_ms"),
+    /** The size of a coverage upload request in bytes */
+    COVERAGE_UPLOAD_REQUEST_BYTES("coverage_upload.request_bytes", ResponseCompressed.class);
 
-  private static final String NAMESPACE = "civisibility";
+    private static final String NAMESPACE = "civisibility";
 
-  private final String name;
-  private final Class<? extends TagValue>[] tags;
+    private final String name;
+    private final Class<? extends TagValue>[] tags;
 
-  @SafeVarargs
-  CiVisibilityDistributionMetric(String metricName, Class<? extends TagValue>... metricTags) {
-    name = metricName;
-    tags = metricTags;
-  }
+    @SafeVarargs
+    CiVisibilityDistributionMetric(String metricName, Class<? extends TagValue>... metricTags) {
+        name = metricName;
+        tags = metricTags;
+    }
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 
-  public MetricCollector.DistributionSeriesPoint createDataPoint(int value, TagValue... tagValues) {
-    List<String> tags;
-    if (tagValues.length != 0) {
-      tags = new ArrayList<>(tagValues.length);
-      for (TagValue tagValue : tagValues) {
-        if (tagValue == null) {
-          continue;
+    public MetricCollector.DistributionSeriesPoint createDataPoint(int value, TagValue... tagValues) {
+        List<String> tags;
+        if (tagValues.length != 0) {
+            tags = new ArrayList<>(tagValues.length);
+            for (TagValue tagValue : tagValues) {
+                if (tagValue == null) {
+                    continue;
+                }
+                assertValid(tagValue);
+                tags.add(tagValue.asString());
+            }
+        } else {
+            tags = Collections.emptyList();
         }
-        assertValid(tagValue);
-        tags.add(tagValue.asString());
-      }
-    } else {
-      tags = Collections.emptyList();
+        return new MetricCollector.DistributionSeriesPoint(name, true, NAMESPACE, value, tags);
     }
-    return new MetricCollector.DistributionSeriesPoint(name, true, NAMESPACE, value, tags);
-  }
 
-  private void assertValid(TagValue tagValue) {
-    Class<? extends TagValue> tag = tagValue.getDeclaringClass();
-    for (Class<? extends TagValue> aClass : tags) {
-      if (tag == aClass) {
-        return;
-      }
+    private void assertValid(TagValue tagValue) {
+        Class<? extends TagValue> tag = tagValue.getDeclaringClass();
+        for (Class<? extends TagValue> aClass : tags) {
+            if (tag == aClass) {
+                return;
+            }
+        }
+        throw new IllegalArgumentException("Metric "
+                + name()
+                + " cannot be tagged with "
+                + tag.getSimpleName()
+                + ", allowed tags are "
+                + Arrays.toString(tags));
     }
-    throw new IllegalArgumentException(
-        "Metric "
-            + name()
-            + " cannot be tagged with "
-            + tag.getSimpleName()
-            + ", allowed tags are "
-            + Arrays.toString(tags));
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityMetricCollector.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityMetricCollector.java
index 00e09c2bead..a27caba8213 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityMetricCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityMetricCollector.java
@@ -4,7 +4,7 @@
 
 public interface CiVisibilityMetricCollector extends MetricCollector<CiVisibilityMetricData> {
 
-  void add(CiVisibilityDistributionMetric metric, int value, TagValue... tags);
+    void add(CiVisibilityDistributionMetric metric, int value, TagValue... tags);
 
-  void add(CiVisibilityCountMetric metric, long value, TagValue... tags);
+    void add(CiVisibilityCountMetric metric, long value, TagValue... tags);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityMetricData.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityMetricData.java
index 03336682bb6..5f62fbce15e 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityMetricData.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityMetricData.java
@@ -4,17 +4,17 @@
 
 public class CiVisibilityMetricData extends MetricCollector.Metric {
 
-  private static final String NAMESPACE = "civisibility";
+    private static final String NAMESPACE = "civisibility";
 
-  public CiVisibilityMetricData(String metricName, long counter, TagValue... tags) {
-    super(NAMESPACE, true, metricName, "count", counter, stringify(tags));
-  }
+    public CiVisibilityMetricData(String metricName, long counter, TagValue... tags) {
+        super(NAMESPACE, true, metricName, "count", counter, stringify(tags));
+    }
 
-  private static String[] stringify(TagValue... tags) {
-    String[] tagStrings = new String[tags.length];
-    for (int i = 0; i < tags.length; i++) {
-      tagStrings[i] = tags[i].asString();
+    private static String[] stringify(TagValue... tags) {
+        String[] tagStrings = new String[tags.length];
+        for (int i = 0; i < tags.length; i++) {
+            tagStrings[i] = tags[i].asString();
+        }
+        return tagStrings;
     }
-    return tagStrings;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/NoOpMetricCollector.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/NoOpMetricCollector.java
index 0fa50ed782b..468a1a4dc3d 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/NoOpMetricCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/NoOpMetricCollector.java
@@ -5,27 +5,27 @@
 
 public class NoOpMetricCollector implements CiVisibilityMetricCollector {
 
-  public static final CiVisibilityMetricCollector INSTANCE = new NoOpMetricCollector();
+    public static final CiVisibilityMetricCollector INSTANCE = new NoOpMetricCollector();
 
-  private NoOpMetricCollector() {}
+    private NoOpMetricCollector() {}
 
-  @Override
-  public void add(CiVisibilityDistributionMetric metric, int value, TagValue... tags) {
-    // do nothing
-  }
+    @Override
+    public void add(CiVisibilityDistributionMetric metric, int value, TagValue... tags) {
+        // do nothing
+    }
 
-  @Override
-  public void add(CiVisibilityCountMetric metric, long value, TagValue... tags) {
-    // do nothing
-  }
+    @Override
+    public void add(CiVisibilityCountMetric metric, long value, TagValue... tags) {
+        // do nothing
+    }
 
-  @Override
-  public void prepareMetrics() {
-    // do nothing
-  }
+    @Override
+    public void prepareMetrics() {
+        // do nothing
+    }
 
-  @Override
-  public Collection<CiVisibilityMetricData> drain() {
-    return Collections.emptySet();
-  }
+    @Override
+    public Collection<CiVisibilityMetricData> drain() {
+        return Collections.emptySet();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/TagValue.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/TagValue.java
index 8bbf591dbb6..8e8566c0d98 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/TagValue.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/TagValue.java
@@ -2,11 +2,11 @@
 
 public interface TagValue {
 
-  String asString();
+    String asString();
 
-  /** see {@link Enum#getDeclaringClass()} */
-  Class<? extends TagValue> getDeclaringClass();
+    /** see {@link Enum#getDeclaringClass()} */
+    Class<? extends TagValue> getDeclaringClass();
 
-  /** see {@link Enum#ordinal()} */
-  int ordinal();
+    /** see {@link Enum#ordinal()} */
+    int ordinal();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/AgentlessLogSubmissionEnabled.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/AgentlessLogSubmissionEnabled.java
index c82f10e7ee9..08733d5692a 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/AgentlessLogSubmissionEnabled.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/AgentlessLogSubmissionEnabled.java
@@ -3,10 +3,10 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum AgentlessLogSubmissionEnabled implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "agentless_log_submission_enabled:true";
-  }
+    @Override
+    public String asString() {
+        return "agentless_log_submission_enabled:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/AutoInjected.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/AutoInjected.java
index d09889e635a..8038d4480eb 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/AutoInjected.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/AutoInjected.java
@@ -4,10 +4,10 @@
 
 /** Whether the tracer was injected using CI-provider-specific auto-instrumentation. */
 public enum AutoInjected implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "auto_injected:true";
-  }
+    @Override
+    public String asString() {
+        return "auto_injected:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/BrowserDriver.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/BrowserDriver.java
index 6fe5680caa4..1ea99c4bcda 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/BrowserDriver.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/BrowserDriver.java
@@ -4,10 +4,10 @@
 
 /** What kind of driver a browser test case is using. */
 public enum BrowserDriver implements TagValue {
-  SELENIUM;
+    SELENIUM;
 
-  @Override
-  public String asString() {
-    return "browser_driver:selenium";
-  }
+    @Override
+    public String asString() {
+        return "browser_driver:selenium";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/Command.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/Command.java
index 5ea133cb7e3..e9439fc91b6 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/Command.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/Command.java
@@ -4,26 +4,26 @@
 
 /** The type of Git command that was executed. */
 public enum Command implements TagValue {
-  GET_REPOSITORY,
-  GET_BRANCH,
-  CHECK_SHALLOW,
-  UNSHALLOW,
-  GET_LOCAL_COMMITS,
-  GET_OBJECTS,
-  PACK_OBJECTS,
-  DIFF,
-  BASE_COMMIT_SHA,
-  FETCH_COMMIT,
-  OTHER;
+    GET_REPOSITORY,
+    GET_BRANCH,
+    CHECK_SHALLOW,
+    UNSHALLOW,
+    GET_LOCAL_COMMITS,
+    GET_OBJECTS,
+    PACK_OBJECTS,
+    DIFF,
+    BASE_COMMIT_SHA,
+    FETCH_COMMIT,
+    OTHER;
 
-  private final String s;
+    private final String s;
 
-  Command() {
-    s = "command:" + name().toLowerCase();
-  }
+    Command() {
+        s = "command:" + name().toLowerCase();
+    }
 
-  @Override
-  public String asString() {
-    return s;
-  }
+    @Override
+    public String asString() {
+        return s;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/CoverageEnabled.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/CoverageEnabled.java
index 7924ec5e9d3..82d9f686659 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/CoverageEnabled.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/CoverageEnabled.java
@@ -4,10 +4,10 @@
 
 /** Whether remote settings response has code coverage enabled */
 public enum CoverageEnabled implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "coverage_enabled:true";
-  }
+    @Override
+    public String asString() {
+        return "coverage_enabled:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/CoverageErrorType.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/CoverageErrorType.java
index 3f4bf6c17f2..162a5d04282 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/CoverageErrorType.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/CoverageErrorType.java
@@ -4,18 +4,18 @@
 
 /** The type of coverage collection error */
 public enum CoverageErrorType implements TagValue {
-  RECORD,
-  PATH,
-  CONCURRENCY;
+    RECORD,
+    PATH,
+    CONCURRENCY;
 
-  private final String s;
+    private final String s;
 
-  CoverageErrorType() {
-    s = "error_type:" + name().toLowerCase();
-  }
+    CoverageErrorType() {
+        s = "error_type:" + name().toLowerCase();
+    }
 
-  @Override
-  public String asString() {
-    return s;
-  }
+    @Override
+    public String asString() {
+        return s;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/EarlyFlakeDetectionAbortReason.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/EarlyFlakeDetectionAbortReason.java
index e47313ea206..a14f644dd0b 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/EarlyFlakeDetectionAbortReason.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/EarlyFlakeDetectionAbortReason.java
@@ -3,17 +3,17 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum EarlyFlakeDetectionAbortReason implements TagValue {
-  FAULTY,
-  SLOW;
+    FAULTY,
+    SLOW;
 
-  private final String s;
+    private final String s;
 
-  EarlyFlakeDetectionAbortReason() {
-    s = "early_flake_detection_abort_reason:" + name().toLowerCase();
-  }
+    EarlyFlakeDetectionAbortReason() {
+        s = "early_flake_detection_abort_reason:" + name().toLowerCase();
+    }
 
-  @Override
-  public String asString() {
-    return s;
-  }
+    @Override
+    public String asString() {
+        return s;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/EarlyFlakeDetectionEnabled.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/EarlyFlakeDetectionEnabled.java
index 4fad34fa766..b15c92a0744 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/EarlyFlakeDetectionEnabled.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/EarlyFlakeDetectionEnabled.java
@@ -3,10 +3,10 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum EarlyFlakeDetectionEnabled implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "early_flake_detection_enabled:true";
-  }
+    @Override
+    public String asString() {
+        return "early_flake_detection_enabled:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/Endpoint.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/Endpoint.java
index 529644493b2..160b638dd27 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/Endpoint.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/Endpoint.java
@@ -4,18 +4,18 @@
 
 /** The type of endpoint where a request is sent */
 public enum Endpoint implements TagValue {
-  TEST_CYCLE,
-  CODE_COVERAGE,
-  LLMOBS; // TODO this is probably not right, need to probably move this enum to a common package?
+    TEST_CYCLE,
+    CODE_COVERAGE,
+    LLMOBS; // TODO this is probably not right, need to probably move this enum to a common package?
 
-  private final String s;
+    private final String s;
 
-  Endpoint() {
-    s = "endpoint:" + name().toLowerCase();
-  }
+    Endpoint() {
+        s = "endpoint:" + name().toLowerCase();
+    }
 
-  @Override
-  public String asString() {
-    return s;
-  }
+    @Override
+    public String asString() {
+        return s;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ErrorType.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ErrorType.java
index cacbfa73705..c40e525fc3a 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ErrorType.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ErrorType.java
@@ -4,31 +4,31 @@
 
 /** The type of HTTP request error */
 public enum ErrorType implements TagValue {
-  TIMEOUT,
-  NETWORK,
-  STATUS_CODE_4XX_RESPONSE,
-  STATUS_CODE_5XX_RESPONSE;
+    TIMEOUT,
+    NETWORK,
+    STATUS_CODE_4XX_RESPONSE,
+    STATUS_CODE_5XX_RESPONSE;
 
-  private final String s;
+    private final String s;
 
-  ErrorType() {
-    s = "error_type:" + name().toLowerCase();
-  }
+    ErrorType() {
+        s = "error_type:" + name().toLowerCase();
+    }
 
-  @Override
-  public String asString() {
-    return s;
-  }
+    @Override
+    public String asString() {
+        return s;
+    }
 
-  public static ErrorType from(int responseCode) {
-    int category = (responseCode / 100) % 10;
-    switch (category) {
-      case 4:
-        return STATUS_CODE_4XX_RESPONSE;
-      case 5:
-        return STATUS_CODE_5XX_RESPONSE;
-      default:
-        return NETWORK;
+    public static ErrorType from(int responseCode) {
+        int category = (responseCode / 100) % 10;
+        switch (category) {
+            case 4:
+                return STATUS_CODE_4XX_RESPONSE;
+            case 5:
+                return STATUS_CODE_5XX_RESPONSE;
+            default:
+                return NETWORK;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/EventType.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/EventType.java
index 2e327c234e0..89b9f687a1b 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/EventType.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/EventType.java
@@ -4,19 +4,19 @@
 
 /** The type of test event */
 public enum EventType implements TagValue {
-  TEST,
-  SUITE,
-  MODULE,
-  SESSION;
+    TEST,
+    SUITE,
+    MODULE,
+    SESSION;
 
-  private final String s;
+    private final String s;
 
-  EventType() {
-    s = "event_type:" + name().toLowerCase();
-  }
+    EventType() {
+        s = "event_type:" + name().toLowerCase();
+    }
 
-  @Override
-  public String asString() {
-    return s;
-  }
+    @Override
+    public String asString() {
+        return s;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ExitCode.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ExitCode.java
index c0a88c65224..77ccb577065 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ExitCode.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ExitCode.java
@@ -5,43 +5,43 @@
 
 /** The exit code of a shell command execution */
 public enum ExitCode implements TagValue {
-  CODE_MINUS_1("-1"),
-  CODE_1("1"),
-  CODE_2("2"),
-  CODE_127("127"),
-  CODE_128("128"),
-  CODE_129("129"),
-  EXECUTABLE_MISSING("missing"),
-  CODE_UNKNOWN("unknown");
+    CODE_MINUS_1("-1"),
+    CODE_1("1"),
+    CODE_2("2"),
+    CODE_127("127"),
+    CODE_128("128"),
+    CODE_129("129"),
+    EXECUTABLE_MISSING("missing"),
+    CODE_UNKNOWN("unknown");
 
-  private final String s;
+    private final String s;
 
-  ExitCode(String code) {
-    s = "exit_code:" + code;
-  }
+    ExitCode(String code) {
+        s = "exit_code:" + code;
+    }
 
-  @Override
-  public String asString() {
-    return s;
-  }
+    @Override
+    public String asString() {
+        return s;
+    }
 
-  @Nonnull
-  public static ExitCode from(int exitCode) {
-    switch (exitCode) {
-      case -1:
-        return CODE_MINUS_1;
-      case 1:
-        return CODE_1;
-      case 2:
-        return CODE_2;
-      case 127:
-        return CODE_127;
-      case 128:
-        return CODE_128;
-      case 129:
-        return CODE_129;
-      default:
-        return CODE_UNKNOWN;
+    @Nonnull
+    public static ExitCode from(int exitCode) {
+        switch (exitCode) {
+            case -1:
+                return CODE_MINUS_1;
+            case 1:
+                return CODE_1;
+            case 2:
+                return CODE_2;
+            case 127:
+                return CODE_127;
+            case 128:
+                return CODE_128;
+            case 129:
+                return CODE_129;
+            default:
+                return CODE_UNKNOWN;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FailFastTestOrderEnabled.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FailFastTestOrderEnabled.java
index 2c66e7a0122..422e5cc259a 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FailFastTestOrderEnabled.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FailFastTestOrderEnabled.java
@@ -3,10 +3,10 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum FailFastTestOrderEnabled implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "fail_fast_test_order_enabled:true";
-  }
+    @Override
+    public String asString() {
+        return "fail_fast_test_order_enabled:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FailedTestReplayEnabled.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FailedTestReplayEnabled.java
index 3bca7092725..4681cec1277 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FailedTestReplayEnabled.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FailedTestReplayEnabled.java
@@ -3,30 +3,30 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public abstract class FailedTestReplayEnabled {
-  public enum SettingsMetric implements TagValue {
-    TRUE;
+    public enum SettingsMetric implements TagValue {
+        TRUE;
 
-    @Override
-    public String asString() {
-      return "failed_test_replay_enabled:true";
+        @Override
+        public String asString() {
+            return "failed_test_replay_enabled:true";
+        }
     }
-  }
 
-  public enum SessionMetric implements TagValue {
-    TRUE;
+    public enum SessionMetric implements TagValue {
+        TRUE;
 
-    @Override
-    public String asString() {
-      return "has_failed_test_replay:true";
+        @Override
+        public String asString() {
+            return "has_failed_test_replay:true";
+        }
     }
-  }
 
-  public enum TestMetric implements TagValue {
-    TRUE;
+    public enum TestMetric implements TagValue {
+        TRUE;
 
-    @Override
-    public String asString() {
-      return "is_failed_test_replay_enabled:true";
+        @Override
+        public String asString() {
+            return "is_failed_test_replay_enabled:true";
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FlakyTestRetriesEnabled.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FlakyTestRetriesEnabled.java
index b1008fe66a6..67ac9f2057d 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FlakyTestRetriesEnabled.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FlakyTestRetriesEnabled.java
@@ -3,10 +3,10 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum FlakyTestRetriesEnabled implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "flaky_test_retries_enabled:true";
-  }
+    @Override
+    public String asString() {
+        return "flaky_test_retries_enabled:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/GitProviderDiscrepant.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/GitProviderDiscrepant.java
index e356805a255..337e34a4f52 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/GitProviderDiscrepant.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/GitProviderDiscrepant.java
@@ -3,14 +3,14 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum GitProviderDiscrepant implements TagValue {
-  USER_SUPPLIED,
-  CI_PROVIDER,
-  LOCAL_GIT,
-  GIT_CLIENT,
-  EMBEDDED;
+    USER_SUPPLIED,
+    CI_PROVIDER,
+    LOCAL_GIT,
+    GIT_CLIENT,
+    EMBEDDED;
 
-  @Override
-  public String asString() {
-    return "discrepant_provider:" + name().toLowerCase();
-  }
+    @Override
+    public String asString() {
+        return "discrepant_provider:" + name().toLowerCase();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/GitProviderExpected.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/GitProviderExpected.java
index cf2c6e5b9f3..dfb36b8d5e5 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/GitProviderExpected.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/GitProviderExpected.java
@@ -3,14 +3,14 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum GitProviderExpected implements TagValue {
-  USER_SUPPLIED,
-  CI_PROVIDER,
-  LOCAL_GIT,
-  GIT_CLIENT,
-  EMBEDDED;
+    USER_SUPPLIED,
+    CI_PROVIDER,
+    LOCAL_GIT,
+    GIT_CLIENT,
+    EMBEDDED;
 
-  @Override
-  public String asString() {
-    return "expected_provider:" + name().toLowerCase();
-  }
+    @Override
+    public String asString() {
+        return "expected_provider:" + name().toLowerCase();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/GitShaDiscrepancyType.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/GitShaDiscrepancyType.java
index 2be69a41e08..fe4f3805fd4 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/GitShaDiscrepancyType.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/GitShaDiscrepancyType.java
@@ -3,11 +3,11 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum GitShaDiscrepancyType implements TagValue {
-  REPOSITORY_DISCREPANCY,
-  COMMIT_DISCREPANCY;
+    REPOSITORY_DISCREPANCY,
+    COMMIT_DISCREPANCY;
 
-  @Override
-  public String asString() {
-    return "type:" + name().toLowerCase();
-  }
+    @Override
+    public String asString() {
+        return "type:" + name().toLowerCase();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/GitShaMatch.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/GitShaMatch.java
index f5ea9b9a7f8..c5425c48e3d 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/GitShaMatch.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/GitShaMatch.java
@@ -3,11 +3,11 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum GitShaMatch implements TagValue {
-  TRUE,
-  FALSE;
+    TRUE,
+    FALSE;
 
-  @Override
-  public String asString() {
-    return "matched:" + name().toLowerCase();
-  }
+    @Override
+    public String asString() {
+        return "matched:" + name().toLowerCase();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/HasCodeowner.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/HasCodeowner.java
index f9d33aa8939..cffcad48f5c 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/HasCodeowner.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/HasCodeowner.java
@@ -4,10 +4,10 @@
 
 /** Whether CODEOWNERS file could be located when executing a test session */
 public enum HasCodeowner implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "has_codeowner:true";
-  }
+    @Override
+    public String asString() {
+        return "has_codeowner:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/HasCustomBuckets.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/HasCustomBuckets.java
index 68200870765..ceebae4673d 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/HasCustomBuckets.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/HasCustomBuckets.java
@@ -3,10 +3,10 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum HasCustomBuckets implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "has_custom_buckets:true";
-  }
+    @Override
+    public String asString() {
+        return "has_custom_buckets:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/HasFailedAllRetries.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/HasFailedAllRetries.java
index ca8e4f9a8fd..d286419f7e6 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/HasFailedAllRetries.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/HasFailedAllRetries.java
@@ -3,10 +3,10 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum HasFailedAllRetries implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "has_failed_all_retries:true";
-  }
+    @Override
+    public String asString() {
+        return "has_failed_all_retries:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ImpactedTestsDetectionEnabled.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ImpactedTestsDetectionEnabled.java
index 3d42030d7e0..315fe14e1cb 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ImpactedTestsDetectionEnabled.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ImpactedTestsDetectionEnabled.java
@@ -3,10 +3,10 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum ImpactedTestsDetectionEnabled implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "impacted_tests_detection_enabled:true";
-  }
+    @Override
+    public String asString() {
+        return "impacted_tests_detection_enabled:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsAndroid.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsAndroid.java
index bb079a24763..11747ed74cf 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsAndroid.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsAndroid.java
@@ -4,10 +4,10 @@
 
 /** Whether a test module/session belongs to an Android project. */
 public enum IsAndroid implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "is_android:true";
-  }
+    @Override
+    public String asString() {
+        return "is_android:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsAndroidEmulated.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsAndroidEmulated.java
index dbf61580911..23b296606b3 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsAndroidEmulated.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsAndroidEmulated.java
@@ -4,10 +4,10 @@
 
 /** Whether a test ran against an emulated Android SDK (e.g. under Robolectric). */
 public enum IsAndroidEmulated implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "is_android_emulated:true";
-  }
+    @Override
+    public String asString() {
+        return "is_android_emulated:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsAttemptToFix.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsAttemptToFix.java
index 3af2d35f403..11269ebba86 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsAttemptToFix.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsAttemptToFix.java
@@ -3,10 +3,10 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum IsAttemptToFix implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "is_attempt_to_fix:true";
-  }
+    @Override
+    public String asString() {
+        return "is_attempt_to_fix:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsDisabled.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsDisabled.java
index eff53a82b35..1b19d496249 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsDisabled.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsDisabled.java
@@ -3,10 +3,10 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum IsDisabled implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "is_disabled:true";
-  }
+    @Override
+    public String asString() {
+        return "is_disabled:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsHeadless.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsHeadless.java
index ebce157f3b0..51df8c80358 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsHeadless.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsHeadless.java
@@ -8,10 +8,10 @@
  * instrumented.
  */
 public enum IsHeadless implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "is_headless:true";
-  }
+    @Override
+    public String asString() {
+        return "is_headless:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsModified.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsModified.java
index a128bb28a3c..1ac295e6353 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsModified.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsModified.java
@@ -4,10 +4,10 @@
 
 /** Whether the definition of a test was modified. */
 public enum IsModified implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "is_modified:true";
-  }
+    @Override
+    public String asString() {
+        return "is_modified:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsNew.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsNew.java
index 7d82c9a2259..02baea670ec 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsNew.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsNew.java
@@ -4,10 +4,10 @@
 
 /** Whether a test case is a new one. */
 public enum IsNew implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "is_new:true";
-  }
+    @Override
+    public String asString() {
+        return "is_new:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsQuarantined.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsQuarantined.java
index b8122301e22..32c602c5528 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsQuarantined.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsQuarantined.java
@@ -3,10 +3,10 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum IsQuarantined implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "is_quarantined:true";
-  }
+    @Override
+    public String asString() {
+        return "is_quarantined:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsRetry.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsRetry.java
index f8139b0027d..19305fdfce3 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsRetry.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsRetry.java
@@ -4,10 +4,10 @@
 
 /** Whether a test case is a retry or not. */
 public enum IsRetry implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "is_retry:true";
-  }
+    @Override
+    public String asString() {
+        return "is_retry:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsRum.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsRum.java
index 32161fce408..c052094a809 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsRum.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsRum.java
@@ -4,10 +4,10 @@
 
 /** Whether a test is a RUM test case. */
 public enum IsRum implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "is_rum:true";
-  }
+    @Override
+    public String asString() {
+        return "is_rum:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsUnsupportedCI.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsUnsupportedCI.java
index 1218b5c2f32..30ae9a4694a 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsUnsupportedCI.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/IsUnsupportedCI.java
@@ -8,10 +8,10 @@
  * datadog.trace.civisibility.ci.CIProviderInfo} implementations for list of supported providers).
  */
 public enum IsUnsupportedCI implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "is_unsupported_ci:true";
-  }
+    @Override
+    public String asString() {
+        return "is_unsupported_ci:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ItrEnabled.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ItrEnabled.java
index ab89f225ac7..baa67bf8fa1 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ItrEnabled.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ItrEnabled.java
@@ -7,10 +7,10 @@
  * if we're running on a default branch)
  */
 public enum ItrEnabled implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "itr_enabled:true";
-  }
+    @Override
+    public String asString() {
+        return "itr_enabled:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ItrSkipEnabled.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ItrSkipEnabled.java
index d56eed10fcf..15a2f21e44c 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ItrSkipEnabled.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ItrSkipEnabled.java
@@ -4,10 +4,10 @@
 
 /** Whether remote settings response has ITR skipping enabled */
 public enum ItrSkipEnabled implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "itrskip_enabled:true";
-  }
+    @Override
+    public String asString() {
+        return "itrskip_enabled:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/KnownTestsEnabled.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/KnownTestsEnabled.java
index bb07ffc3dc7..2224cbfe3f1 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/KnownTestsEnabled.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/KnownTestsEnabled.java
@@ -3,10 +3,10 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum KnownTestsEnabled implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "known_tests_enabled:true";
-  }
+    @Override
+    public String asString() {
+        return "known_tests_enabled:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/Library.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/Library.java
index 62eca84ad1b..011a4672395 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/Library.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/Library.java
@@ -4,17 +4,17 @@
 
 /** The type of code-coverage library used */
 public enum Library implements TagValue {
-  CUSTOM,
-  JACOCO;
+    CUSTOM,
+    JACOCO;
 
-  private final String s;
+    private final String s;
 
-  Library() {
-    s = "library:" + name().toLowerCase();
-  }
+    Library() {
+        s = "library:" + name().toLowerCase();
+    }
 
-  @Override
-  public String asString() {
-    return s;
-  }
+    @Override
+    public String asString() {
+        return s;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/Provider.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/Provider.java
index ae71b1c2bd2..95d3a5efac6 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/Provider.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/Provider.java
@@ -4,32 +4,32 @@
 
 /** What kind of CI provider is running the test session. */
 public enum Provider implements TagValue {
-  APPVEYOR,
-  AWS,
-  AZP,
-  BAZEL,
-  BITBUCKET,
-  BITRISE,
-  BUILDKITE,
-  CIRCLECI,
-  CODEFRESH,
-  GITHUBACTIONS,
-  GITLAB,
-  JENKINS,
-  TEAMCITY,
-  TRAVISCI,
-  BUDDYCI,
-  DRONE,
-  UNSUPPORTED;
+    APPVEYOR,
+    AWS,
+    AZP,
+    BAZEL,
+    BITBUCKET,
+    BITRISE,
+    BUILDKITE,
+    CIRCLECI,
+    CODEFRESH,
+    GITHUBACTIONS,
+    GITLAB,
+    JENKINS,
+    TEAMCITY,
+    TRAVISCI,
+    BUDDYCI,
+    DRONE,
+    UNSUPPORTED;
 
-  private final String s;
+    private final String s;
 
-  Provider() {
-    s = "provider:" + name().toLowerCase();
-  }
+    Provider() {
+        s = "provider:" + name().toLowerCase();
+    }
 
-  @Override
-  public String asString() {
-    return s;
-  }
+    @Override
+    public String asString() {
+        return s;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/RequestCompressed.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/RequestCompressed.java
index 11bbb375d37..3c38886ab3f 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/RequestCompressed.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/RequestCompressed.java
@@ -4,10 +4,10 @@
 
 /** Whether request body is compressed. */
 public enum RequestCompressed implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "rq_compressed:true";
-  }
+    @Override
+    public String asString() {
+        return "rq_compressed:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/RequireGit.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/RequireGit.java
index fdf5e6aa20a..b1f49a38e62 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/RequireGit.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/RequireGit.java
@@ -4,10 +4,10 @@
 
 /** Whether remote settings response has "wait for Git upload to finish" flag enabled */
 public enum RequireGit implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "require_git:true";
-  }
+    @Override
+    public String asString() {
+        return "require_git:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ResponseCompressed.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ResponseCompressed.java
index bb0e1fa73fb..16d7440f935 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ResponseCompressed.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/ResponseCompressed.java
@@ -4,10 +4,10 @@
 
 /** Whether response body is compressed. */
 public enum ResponseCompressed implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "rs_compressed:true";
-  }
+    @Override
+    public String asString() {
+        return "rs_compressed:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/RetryReason.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/RetryReason.java
index d1c7cd304a0..139d21218a2 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/RetryReason.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/RetryReason.java
@@ -3,29 +3,29 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum RetryReason implements TagValue {
-  atr("Auto Test Retries", "auto_test_retry"),
-  efd("Early Flakiness Detection", "early_flake_detection"),
-  attemptToFix("Attempt to Fix", "attempt_to_fix");
+    atr("Auto Test Retries", "auto_test_retry"),
+    efd("Early Flakiness Detection", "early_flake_detection"),
+    attemptToFix("Attempt to Fix", "attempt_to_fix");
 
-  private final String value;
-  private final String description;
+    private final String value;
+    private final String description;
 
-  RetryReason(String description, String value) {
-    this.description = description;
-    this.value = value;
-  }
+    RetryReason(String description, String value) {
+        this.description = description;
+        this.value = value;
+    }
 
-  public String getDescription() {
-    return description;
-  }
+    public String getDescription() {
+        return description;
+    }
 
-  @Override
-  public String toString() {
-    return value;
-  }
+    @Override
+    public String toString() {
+        return value;
+    }
 
-  @Override
-  public String asString() {
-    return "retry_reason:" + value;
-  }
+    @Override
+    public String asString() {
+        return "retry_reason:" + value;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/SkipReason.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/SkipReason.java
index 0457b3a6067..d8920565768 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/SkipReason.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/SkipReason.java
@@ -3,23 +3,23 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum SkipReason implements TagValue {
-  ITR("Skipped by Datadog Test Impact Analysis"),
-  DISABLED("Flaky test is disabled by Datadog");
+    ITR("Skipped by Datadog Test Impact Analysis"),
+    DISABLED("Flaky test is disabled by Datadog");
 
-  private final String s;
-  private final String description;
+    private final String s;
+    private final String description;
 
-  SkipReason(String description) {
-    this.description = description;
-    this.s = "skip_reason:" + name().toLowerCase();
-  }
+    SkipReason(String description) {
+        this.description = description;
+        this.s = "skip_reason:" + name().toLowerCase();
+    }
 
-  public String getDescription() {
-    return description;
-  }
+    public String getDescription() {
+        return description;
+    }
 
-  @Override
-  public String asString() {
-    return s;
-  }
+    @Override
+    public String asString() {
+        return s;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/StatusCode.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/StatusCode.java
index 850b1be8d7f..4c8e2ae4498 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/StatusCode.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/StatusCode.java
@@ -5,41 +5,41 @@
 
 /** The type of HTTP request error */
 public enum StatusCode implements TagValue {
-  BAD_REQUEST(400),
-  UNAUTHORIZED(401),
-  FORBIDDEN(403),
-  NOT_FOUND(404),
-  REQUEST_TIMEOUT(408),
-  TOO_MANY_REQUESTS(429);
+    BAD_REQUEST(400),
+    UNAUTHORIZED(401),
+    FORBIDDEN(403),
+    NOT_FOUND(404),
+    REQUEST_TIMEOUT(408),
+    TOO_MANY_REQUESTS(429);
 
-  private final String s;
+    private final String s;
 
-  StatusCode(int code) {
-    s = "status_code:" + code;
-  }
+    StatusCode(int code) {
+        s = "status_code:" + code;
+    }
 
-  @Override
-  public String asString() {
-    return s;
-  }
+    @Override
+    public String asString() {
+        return s;
+    }
 
-  @Nullable
-  public static StatusCode from(int responseCode) {
-    switch (responseCode) {
-      case 400:
-        return BAD_REQUEST;
-      case 401:
-        return UNAUTHORIZED;
-      case 403:
-        return FORBIDDEN;
-      case 404:
-        return NOT_FOUND;
-      case 408:
-        return REQUEST_TIMEOUT;
-      case 429:
-        return TOO_MANY_REQUESTS;
-      default:
-        return null;
+    @Nullable
+    public static StatusCode from(int responseCode) {
+        switch (responseCode) {
+            case 400:
+                return BAD_REQUEST;
+            case 401:
+                return UNAUTHORIZED;
+            case 403:
+                return FORBIDDEN;
+            case 404:
+                return NOT_FOUND;
+            case 408:
+                return REQUEST_TIMEOUT;
+            case 429:
+                return TOO_MANY_REQUESTS;
+            default:
+                return null;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/TestFrameworkInstrumentation.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/TestFrameworkInstrumentation.java
index eedbaed7e80..14b08388c43 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/TestFrameworkInstrumentation.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/TestFrameworkInstrumentation.java
@@ -4,25 +4,25 @@
 
 /** The name of test framework instrumentation used */
 public enum TestFrameworkInstrumentation implements TagValue {
-  JUNIT4,
-  JUNIT5,
-  TESTNG,
-  SPOCK,
-  CUCUMBER,
-  MUNIT,
-  SCALATEST,
-  KARATE,
-  WEAVER,
-  OTHER;
+    JUNIT4,
+    JUNIT5,
+    TESTNG,
+    SPOCK,
+    CUCUMBER,
+    MUNIT,
+    SCALATEST,
+    KARATE,
+    WEAVER,
+    OTHER;
 
-  private final String s;
+    private final String s;
 
-  TestFrameworkInstrumentation() {
-    s = "test_framework:" + name().toLowerCase();
-  }
+    TestFrameworkInstrumentation() {
+        s = "test_framework:" + name().toLowerCase();
+    }
 
-  @Override
-  public String asString() {
-    return s;
-  }
+    @Override
+    public String asString() {
+        return s;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/TestManagementEnabled.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/TestManagementEnabled.java
index 79cc49c9fee..2741f585fb2 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/TestManagementEnabled.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/TestManagementEnabled.java
@@ -3,10 +3,10 @@
 import datadog.trace.api.civisibility.telemetry.TagValue;
 
 public enum TestManagementEnabled implements TagValue {
-  TRUE;
+    TRUE;
 
-  @Override
-  public String asString() {
-    return "test_management_enabled:true";
-  }
+    @Override
+    public String asString() {
+        return "test_management_enabled:true";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/datastreams/AgentDataStreamsMonitoring.java b/internal-api/src/main/java/datadog/trace/api/datastreams/AgentDataStreamsMonitoring.java
index 999822e5c97..495444f909f 100644
--- a/internal-api/src/main/java/datadog/trace/api/datastreams/AgentDataStreamsMonitoring.java
+++ b/internal-api/src/main/java/datadog/trace/api/datastreams/AgentDataStreamsMonitoring.java
@@ -4,69 +4,58 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import java.util.Map;
 
-public interface AgentDataStreamsMonitoring
-    extends DataStreamsCheckpointer, DataStreamsTransactionTracker {
-  void trackBacklog(DataStreamsTags tags, long value);
-
-  /**
-   * Reports Kafka producer or consumer configuration for Data Streams Monitoring. Each unique
-   * configuration is sent only once.
-   *
-   * @param type the client type, e.g. "kafka_producer" or "kafka_consumer"
-   * @param kafkaClusterId the Kafka cluster identifier, or empty string if not yet known
-   * @param consumerGroup the consumer group name, or empty string for producers
-   * @param config the configuration key-value pairs
-   */
-  void reportKafkaConfig(
-      String type, String kafkaClusterId, String consumerGroup, Map<String, String> config);
-
-  void reportKafkaConsumerGroupMember(
-      String kafkaClusterId,
-      String consumerGroup,
-      String memberId,
-      int generationId,
-      String memberProtocol);
-
-  /**
-   * Tracks Schema Registry usage for Data Streams Monitoring.
-   *
-   * @param topic Kafka topic name
-   * @param clusterId Kafka cluster ID (important: schema IDs are only unique per cluster)
-   * @param schemaId Schema ID from Schema Registry
-   * @param isSuccess Whether the schema operation succeeded
-   * @param isKey Whether this is for the key (true) or value (false)
-   * @param operation The operation type: "serialize" or "deserialize"
-   */
-  void reportSchemaRegistryUsage(
-      String topic,
-      String clusterId,
-      int schemaId,
-      boolean isSuccess,
-      boolean isKey,
-      String operation);
-
-  /**
-   * Sets data streams checkpoint, used for both produce and consume operations.
-   *
-   * @param span active span
-   * @param context the data streams context
-   */
-  void setCheckpoint(AgentSpan span, DataStreamsContext context);
-
-  PathwayContext newPathwayContext();
-
-  void add(StatsPoint statsPoint);
-
-  void setProduceCheckpoint(String type, String target);
-
-  /**
-   * setServiceNameOverride is used override service name for all DataStreams payloads produced
-   * within Thread.currentThread()
-   *
-   * @param serviceName new service name to use for DSM checkpoints.
-   */
-  void setThreadServiceName(String serviceName);
-
-  /** clearThreadServiceName clears up service name override for Thread.currentThread() */
-  void clearThreadServiceName();
+public interface AgentDataStreamsMonitoring extends DataStreamsCheckpointer, DataStreamsTransactionTracker {
+    void trackBacklog(DataStreamsTags tags, long value);
+
+    /**
+     * Reports Kafka producer or consumer configuration for Data Streams Monitoring. Each unique
+     * configuration is sent only once.
+     *
+     * @param type the client type, e.g. "kafka_producer" or "kafka_consumer"
+     * @param kafkaClusterId the Kafka cluster identifier, or empty string if not yet known
+     * @param consumerGroup the consumer group name, or empty string for producers
+     * @param config the configuration key-value pairs
+     */
+    void reportKafkaConfig(String type, String kafkaClusterId, String consumerGroup, Map<String, String> config);
+
+    void reportKafkaConsumerGroupMember(
+            String kafkaClusterId, String consumerGroup, String memberId, int generationId, String memberProtocol);
+
+    /**
+     * Tracks Schema Registry usage for Data Streams Monitoring.
+     *
+     * @param topic Kafka topic name
+     * @param clusterId Kafka cluster ID (important: schema IDs are only unique per cluster)
+     * @param schemaId Schema ID from Schema Registry
+     * @param isSuccess Whether the schema operation succeeded
+     * @param isKey Whether this is for the key (true) or value (false)
+     * @param operation The operation type: "serialize" or "deserialize"
+     */
+    void reportSchemaRegistryUsage(
+            String topic, String clusterId, int schemaId, boolean isSuccess, boolean isKey, String operation);
+
+    /**
+     * Sets data streams checkpoint, used for both produce and consume operations.
+     *
+     * @param span active span
+     * @param context the data streams context
+     */
+    void setCheckpoint(AgentSpan span, DataStreamsContext context);
+
+    PathwayContext newPathwayContext();
+
+    void add(StatsPoint statsPoint);
+
+    void setProduceCheckpoint(String type, String target);
+
+    /**
+     * setServiceNameOverride is used override service name for all DataStreams payloads produced
+     * within Thread.currentThread()
+     *
+     * @param serviceName new service name to use for DSM checkpoints.
+     */
+    void setThreadServiceName(String serviceName);
+
+    /** clearThreadServiceName clears up service name override for Thread.currentThread() */
+    void clearThreadServiceName();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/datastreams/Backlog.java b/internal-api/src/main/java/datadog/trace/api/datastreams/Backlog.java
index 8920e844d07..9427762bba4 100644
--- a/internal-api/src/main/java/datadog/trace/api/datastreams/Backlog.java
+++ b/internal-api/src/main/java/datadog/trace/api/datastreams/Backlog.java
@@ -4,32 +4,31 @@
 // the consumer and the producer,
 // we can get the size in bytes of a Kafka queue.
 public class Backlog implements InboxItem {
-  public DataStreamsTags getTags() {
-    return tags;
-  }
+    public DataStreamsTags getTags() {
+        return tags;
+    }
 
-  public long getValue() {
-    return value;
-  }
+    public long getValue() {
+        return value;
+    }
 
-  public long getTimestampNanos() {
-    return timestampNanos;
-  }
+    public long getTimestampNanos() {
+        return timestampNanos;
+    }
 
-  public String getServiceNameOverride() {
-    return serviceNameOverride;
-  }
+    public String getServiceNameOverride() {
+        return serviceNameOverride;
+    }
 
-  private final DataStreamsTags tags;
-  private final long value;
-  private final long timestampNanos;
-  private final String serviceNameOverride;
+    private final DataStreamsTags tags;
+    private final long value;
+    private final long timestampNanos;
+    private final String serviceNameOverride;
 
-  public Backlog(
-      DataStreamsTags tags, long value, long timestampNanos, String serviceNameOverride) {
-    this.tags = tags;
-    this.value = value;
-    this.timestampNanos = timestampNanos;
-    this.serviceNameOverride = serviceNameOverride;
-  }
+    public Backlog(DataStreamsTags tags, long value, long timestampNanos, String serviceNameOverride) {
+        this.tags = tags;
+        this.value = value;
+        this.timestampNanos = timestampNanos;
+        this.serviceNameOverride = serviceNameOverride;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsContext.java b/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsContext.java
index 0f8446a37f2..99e23a8a4f0 100644
--- a/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsContext.java
+++ b/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsContext.java
@@ -9,101 +9,99 @@
 import javax.annotation.Nonnull;
 
 public class DataStreamsContext implements ImplicitContextKeyed {
-  private static final ContextKey<DataStreamsContext> CONTEXT_KEY =
-      ContextKey.named("dsm-context-key");
-  private static final DataStreamsTags CLIENT_PATHWAY_EDGE_TAGS;
-  private static final DataStreamsTags SERVER_PATHWAY_EDGE_TAGS;
-
-  final DataStreamsTags tags;
-  final long defaultTimestamp;
-  final long payloadSizeBytes;
-  final boolean sendCheckpoint;
-
-  static {
-    CLIENT_PATHWAY_EDGE_TAGS = DataStreamsTags.create("http", OUTBOUND);
-    SERVER_PATHWAY_EDGE_TAGS = DataStreamsTags.create("http", INBOUND);
-  }
-
-  public static DataStreamsContext fromContext(Context context) {
-    return context.get(CONTEXT_KEY);
-  }
-
-  /**
-   * Gets default DSM context for HTTP clients.
-   *
-   * @return The default DSM context for HTTP clients.
-   */
-  public static DataStreamsContext forHttpClient() {
-    return fromTags(CLIENT_PATHWAY_EDGE_TAGS);
-  }
-
-  /**
-   * Gets default DSM context for HTTP servers.
-   *
-   * @return The default DSM context for HTTP servers.
-   */
-  public static DataStreamsContext forHttpServer() {
-    return fromTags(SERVER_PATHWAY_EDGE_TAGS);
-  }
-
-  /**
-   * Creates a DSM context.
-   *
-   * @param tags DataStreamsTags object
-   * @return the created context.
-   */
-  public static DataStreamsContext fromTags(DataStreamsTags tags) {
-    return new DataStreamsContext(tags, 0, 0, true);
-  }
-
-  /**
-   * Creates a DSM context.
-   *
-   * @param tags object
-   * @param defaultTimestamp unix timestamp to use as a start of the pathway if this is the first
-   *     checkpoint in the chain. Zero should be passed if we can't extract the timestamp from the
-   *     message / payload itself (for instance: produce operations; http produce / consume etc).
-   *     Value will be ignored for checkpoints happening not at the start of the pipeline.
-   * @param payloadSizeBytes size of the message (body + headers) in bytes. Zero should be passed if
-   *     the size cannot be evaluated.
-   * @return the created context.
-   */
-  public static DataStreamsContext create(
-      DataStreamsTags tags, long defaultTimestamp, long payloadSizeBytes) {
-    return new DataStreamsContext(tags, defaultTimestamp, payloadSizeBytes, true);
-  }
-
-  public static DataStreamsContext fromTagsWithoutCheckpoint(DataStreamsTags tags) {
-    return new DataStreamsContext(tags, 0, 0, false);
-  }
-
-  // That's basically a record for now
-  private DataStreamsContext(
-      DataStreamsTags tags, long defaultTimestamp, long payloadSizeBytes, boolean sendCheckpoint) {
-    this.tags = tags;
-    this.defaultTimestamp = defaultTimestamp;
-    this.payloadSizeBytes = payloadSizeBytes;
-    this.sendCheckpoint = sendCheckpoint;
-  }
-
-  public DataStreamsTags tags() {
-    return this.tags;
-  }
-
-  public long defaultTimestamp() {
-    return this.defaultTimestamp;
-  }
-
-  public long payloadSizeBytes() {
-    return this.payloadSizeBytes;
-  }
-
-  public boolean sendCheckpoint() {
-    return this.sendCheckpoint;
-  }
-
-  @Override
-  public Context storeInto(@Nonnull Context context) {
-    return context.with(CONTEXT_KEY, this);
-  }
+    private static final ContextKey<DataStreamsContext> CONTEXT_KEY = ContextKey.named("dsm-context-key");
+    private static final DataStreamsTags CLIENT_PATHWAY_EDGE_TAGS;
+    private static final DataStreamsTags SERVER_PATHWAY_EDGE_TAGS;
+
+    final DataStreamsTags tags;
+    final long defaultTimestamp;
+    final long payloadSizeBytes;
+    final boolean sendCheckpoint;
+
+    static {
+        CLIENT_PATHWAY_EDGE_TAGS = DataStreamsTags.create("http", OUTBOUND);
+        SERVER_PATHWAY_EDGE_TAGS = DataStreamsTags.create("http", INBOUND);
+    }
+
+    public static DataStreamsContext fromContext(Context context) {
+        return context.get(CONTEXT_KEY);
+    }
+
+    /**
+     * Gets default DSM context for HTTP clients.
+     *
+     * @return The default DSM context for HTTP clients.
+     */
+    public static DataStreamsContext forHttpClient() {
+        return fromTags(CLIENT_PATHWAY_EDGE_TAGS);
+    }
+
+    /**
+     * Gets default DSM context for HTTP servers.
+     *
+     * @return The default DSM context for HTTP servers.
+     */
+    public static DataStreamsContext forHttpServer() {
+        return fromTags(SERVER_PATHWAY_EDGE_TAGS);
+    }
+
+    /**
+     * Creates a DSM context.
+     *
+     * @param tags DataStreamsTags object
+     * @return the created context.
+     */
+    public static DataStreamsContext fromTags(DataStreamsTags tags) {
+        return new DataStreamsContext(tags, 0, 0, true);
+    }
+
+    /**
+     * Creates a DSM context.
+     *
+     * @param tags object
+     * @param defaultTimestamp unix timestamp to use as a start of the pathway if this is the first
+     *     checkpoint in the chain. Zero should be passed if we can't extract the timestamp from the
+     *     message / payload itself (for instance: produce operations; http produce / consume etc).
+     *     Value will be ignored for checkpoints happening not at the start of the pipeline.
+     * @param payloadSizeBytes size of the message (body + headers) in bytes. Zero should be passed if
+     *     the size cannot be evaluated.
+     * @return the created context.
+     */
+    public static DataStreamsContext create(DataStreamsTags tags, long defaultTimestamp, long payloadSizeBytes) {
+        return new DataStreamsContext(tags, defaultTimestamp, payloadSizeBytes, true);
+    }
+
+    public static DataStreamsContext fromTagsWithoutCheckpoint(DataStreamsTags tags) {
+        return new DataStreamsContext(tags, 0, 0, false);
+    }
+
+    // That's basically a record for now
+    private DataStreamsContext(
+            DataStreamsTags tags, long defaultTimestamp, long payloadSizeBytes, boolean sendCheckpoint) {
+        this.tags = tags;
+        this.defaultTimestamp = defaultTimestamp;
+        this.payloadSizeBytes = payloadSizeBytes;
+        this.sendCheckpoint = sendCheckpoint;
+    }
+
+    public DataStreamsTags tags() {
+        return this.tags;
+    }
+
+    public long defaultTimestamp() {
+        return this.defaultTimestamp;
+    }
+
+    public long payloadSizeBytes() {
+        return this.payloadSizeBytes;
+    }
+
+    public boolean sendCheckpoint() {
+        return this.sendCheckpoint;
+    }
+
+    @Override
+    public Context storeInto(@Nonnull Context context) {
+        return context.with(CONTEXT_KEY, this);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsTags.java b/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsTags.java
index df3eb214813..295bc3b8c12 100644
--- a/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsTags.java
+++ b/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsTags.java
@@ -5,530 +5,485 @@
 import java.util.Objects;
 
 public class DataStreamsTags {
-  public enum Direction {
-    UNKNOWN,
-    INBOUND,
-    OUTBOUND,
-  }
-
-  public static DataStreamsTags EMPTY = DataStreamsTags.create(null, null);
-
-  private long hash;
-  private long aggregationHash;
-  private long completeHash;
-  private int nonNullSize;
-
-  // hash tags
-  protected final String bus;
-  protected final String direction;
-  protected final Direction directionValue;
-  protected final String exchange;
-  protected final String topic;
-  protected final String type;
-  protected final String subscription;
-  // additional grouping tags
-  protected final String datasetName;
-  protected final String datasetNamespace;
-  protected final String isManual;
-  // informational tags
-  protected final String group;
-  protected final String consumerGroup;
-  protected final String hasRoutingKey;
-  protected final String kafkaClusterId;
-  protected final String partition;
-
-  public static final String MANUAL_TAG = "manual_checkpoint";
-  public static final String TYPE_TAG = "type";
-  public static final String DIRECTION_TAG = "direction";
-  public static final String TOPIC_TAG = "topic";
-  public static final String BUS_TAG = "bus";
-  public static final String PARTITION_TAG = "partition";
-  public static final String GROUP_TAG = "group";
-  public static final String CONSUMER_GROUP_TAG = "consumer_group";
-  public static final String SUBSCRIPTION_TAG = "subscription";
-  public static final String EXCHANGE_TAG = "exchange";
-  public static final String DATASET_NAME_TAG = "ds.name";
-  public static final String DATASET_NAMESPACE_TAG = "ds.namespace";
-  public static final String HAS_ROUTING_KEY_TAG = "has_routing_key";
-  public static final String KAFKA_CLUSTER_ID_TAG = "kafka_cluster_id";
-
-  private static volatile ThreadLocal<String> serviceNameOverride;
-
-  public static byte[] longToBytes(long val) {
-    return new byte[] {
-      (byte) (val >> 56),
-      (byte) (val >> 48),
-      (byte) (val >> 40),
-      (byte) (val >> 32),
-      (byte) (val >> 24),
-      (byte) (val >> 16),
-      (byte) (val >> 8),
-      (byte) val
-    };
-  }
-
-  public static DataStreamsTags create(String type, Direction direction) {
-    return DataStreamsTags.create(type, direction, null);
-  }
-
-  public static DataStreamsTags create(String type, Direction direction, String topic) {
-    return DataStreamsTags.createWithGroup(type, direction, topic, null);
-  }
-
-  public static DataStreamsTags createWithSubscription(
-      String type, Direction direction, String subscription) {
-    return new DataStreamsTags(
-        null,
-        direction,
-        null,
-        null,
-        type,
-        subscription,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null);
-  }
-
-  public static DataStreamsTags create(
-      String type, Direction direction, String topic, String group, String kafkaClusterId) {
-    return new DataStreamsTags(
-        null,
-        direction,
-        null,
-        topic,
-        type,
-        null,
-        null,
-        null,
-        null,
-        group,
-        null,
-        null,
-        kafkaClusterId,
-        null);
-  }
-
-  public static DataStreamsTags createManual(String type, Direction direction, String topic) {
-    return new DataStreamsTags(
-        null, direction, null, topic, type, null, null, null, true, null, null, null, null, null);
-  }
-
-  public static DataStreamsTags createWithBus(Direction direction, String bus) {
-    return new DataStreamsTags(
-        bus, direction, null, null, "bus", null, null, null, null, null, null, null, null, null);
-  }
-
-  public static DataStreamsTags createWithPartition(
-      String type, String topic, String partition, String kafkaClusterId, String consumerGroup) {
-    return new DataStreamsTags(
-        null,
-        null,
-        null,
-        topic,
-        type,
-        null,
-        null,
-        null,
-        null,
-        null,
-        consumerGroup,
-        null,
-        kafkaClusterId,
-        partition);
-  }
-
-  /// For usage in tests *only*
-  public Boolean hasAllTags(String[] tags) {
-    for (String tag : tags) {
-      if (tag.indexOf(':') == -1) {
-        return false;
-      }
-      String key = tag.substring(0, tag.indexOf(':'));
-      String value = tag.substring(tag.indexOf(':') + 1);
-      switch (key) {
-        case BUS_TAG:
-          if (!Objects.equals(this.bus, tag)) {
-            return false;
-          }
-          break;
-        case DIRECTION_TAG:
-          if (!Objects.equals(
-              this.directionValue,
-              Objects.equals(value, "out") ? Direction.OUTBOUND : Direction.INBOUND)) {
-            return false;
-          }
-          break;
-        case EXCHANGE_TAG:
-          if (!Objects.equals(this.exchange, tag)) {
-            return false;
-          }
-          break;
-        case TOPIC_TAG:
-          if (!Objects.equals(this.topic, tag)) {
-            return false;
-          }
-          break;
-        case TYPE_TAG:
-          if (!Objects.equals(this.type, tag)) {
-            return false;
-          }
-          break;
-        case SUBSCRIPTION_TAG:
-          if (!Objects.equals(this.subscription, tag)) {
-            return false;
-          }
-          break;
-        case DATASET_NAME_TAG:
-          if (!Objects.equals(this.datasetName, tag)) {
-            return false;
-          }
-          break;
-        case DATASET_NAMESPACE_TAG:
-          if (!Objects.equals(this.datasetNamespace, tag)) {
-            return false;
-          }
-          break;
-        case MANUAL_TAG:
-          if (!Objects.equals(this.isManual, tag)) {
-            return false;
-          }
-          break;
-        case GROUP_TAG:
-          if (!Objects.equals(this.group, tag)) {
-            return false;
-          }
-          break;
-        case CONSUMER_GROUP_TAG:
-          if (!Objects.equals(this.consumerGroup, tag)) {
-            return false;
-          }
-          break;
-        case HAS_ROUTING_KEY_TAG:
-          if (!Objects.equals(this.hasRoutingKey, tag)) {
-            return false;
-          }
-          break;
-        case KAFKA_CLUSTER_ID_TAG:
-          if (!Objects.equals(this.kafkaClusterId, tag)) {
-            return false;
-          }
-          break;
-        case PARTITION_TAG:
-          if (!Objects.equals(this.partition, tag)) {
-            return false;
-          }
-          break;
-        default:
-          return false;
-      }
-    }
-
-    return true;
-  }
-
-  public static DataStreamsTags createWithGroup(
-      String type, Direction direction, String topic, String group) {
-    return new DataStreamsTags(
-        null, direction, null, topic, type, null, null, null, null, group, null, null, null, null);
-  }
-
-  public static DataStreamsTags createWithDataset(
-      String type, Direction direction, String topic, String datasetName, String datasetNamespace) {
-    return new DataStreamsTags(
-        null,
-        direction,
-        null,
-        topic,
-        type,
-        null,
-        datasetName,
-        datasetNamespace,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null);
-  }
-
-  public static void setServiceNameOverride(ThreadLocal<String> serviceNameOverride) {
-    DataStreamsTags.serviceNameOverride = serviceNameOverride;
-  }
-
-  public static DataStreamsTags createWithClusterId(
-      String type, Direction direction, String topic, String clusterId) {
-    return new DataStreamsTags(
-        null, direction, null, topic, type, null, null, null, null, null, null, null, clusterId,
-        null);
-  }
-
-  public static DataStreamsTags createWithExchange(
-      String type, Direction direction, String exchange, Boolean hasRoutingKey) {
-    return new DataStreamsTags(
-        null,
-        direction,
-        exchange,
-        null,
-        type,
-        null,
-        null,
-        null,
-        false,
-        null,
-        null,
-        hasRoutingKey,
-        null,
-        null);
-  }
-
-  public DataStreamsTags(
-      String bus,
-      Direction direction,
-      String exchange,
-      String topic,
-      String type,
-      String subscription,
-      String datasetName,
-      String datasetNamespace,
-      Boolean isManual,
-      String group,
-      String consumerGroup,
-      Boolean hasRoutingKey,
-      String kafkaClusterId,
-      String partition) {
-    this.bus = bus != null ? BUS_TAG + ":" + bus : null;
-    this.directionValue = direction;
-    if (direction == Direction.INBOUND) {
-      this.direction = DIRECTION_TAG + ":in";
-    } else if (direction == Direction.OUTBOUND) {
-      this.direction = DIRECTION_TAG + ":out";
-    } else {
-      this.direction = null;
-    }
-    this.exchange = exchange != null ? EXCHANGE_TAG + ":" + exchange : null;
-    this.topic = topic != null ? TOPIC_TAG + ":" + topic : null;
-    this.type = type != null ? TYPE_TAG + ":" + type : null;
-    this.subscription = subscription != null ? SUBSCRIPTION_TAG + ":" + subscription : null;
-    this.datasetName = datasetName != null ? DATASET_NAME_TAG + ":" + datasetName : null;
-    this.datasetNamespace =
-        datasetNamespace != null ? DATASET_NAMESPACE_TAG + ":" + datasetNamespace : null;
-    this.isManual = isManual != null ? MANUAL_TAG + ":" + isManual : null;
-    this.group = group != null ? GROUP_TAG + ":" + group : null;
-    this.consumerGroup = consumerGroup != null ? CONSUMER_GROUP_TAG + ":" + consumerGroup : null;
-    this.hasRoutingKey = hasRoutingKey != null ? HAS_ROUTING_KEY_TAG + ":" + hasRoutingKey : null;
-    this.kafkaClusterId =
-        kafkaClusterId != null ? KAFKA_CLUSTER_ID_TAG + ":" + kafkaClusterId : null;
-    this.partition = partition != null ? PARTITION_TAG + ":" + partition : null;
-
-    this.hash = BaseHash.getBaseHash();
-
-    if (DataStreamsTags.serviceNameOverride != null) {
-      String val = DataStreamsTags.serviceNameOverride.get();
-      if (val != null) {
-        this.hash = FNV64Hash.continueHash(this.hash, val, FNV64Hash.Version.v1);
-      }
-    }
-
-    // hashable tags are 0-6: bus, direction, exchange, topic, type, subscription, kafkaClusterId
-    for (int i = 0; i < 7; i++) {
-      String tag = this.tagByIndex(i);
-      if (tag != null) {
-        this.nonNullSize++;
-        this.hash = FNV64Hash.continueHash(this.hash, tag, FNV64Hash.Version.v1);
-      }
-    }
-
-    // aggregation tags are 7-11: datasetName, datasetNamespace, isManual, group, consumerGroup
-    this.aggregationHash = this.hash;
-    for (int i = 7; i < 12; i++) {
-      String tag = this.tagByIndex(i);
-      if (tag != null) {
-        this.nonNullSize++;
-        this.aggregationHash =
-            FNV64Hash.continueHash(this.aggregationHash, tag, FNV64Hash.Version.v1);
-      }
-    }
-
-    // values are 12-13: partition, hasRoutingKey
-    this.completeHash = aggregationHash;
-    for (int i = 12; i < this.size(); i++) {
-      String tag = this.tagByIndex(i);
-      if (tag != null) {
-        this.nonNullSize++;
-        this.completeHash = FNV64Hash.continueHash(this.completeHash, tag, FNV64Hash.Version.v1);
-      }
-    }
-  }
-
-  public int size() {
-    // make sure it's in sync with tagByIndex logic
-    return 14;
-  }
-
-  // WARNING: DO NOT REORDER! Indices 0-6 are hash tags, 7-11 are aggregation tags, 12-13 are
-  // values. Reordering breaks hashing!
-  public String tagByIndex(int index) {
-    switch (index) {
-      case 0:
-        return this.bus;
-      case 1:
+    public enum Direction {
+        UNKNOWN,
+        INBOUND,
+        OUTBOUND,
+    }
+
+    public static DataStreamsTags EMPTY = DataStreamsTags.create(null, null);
+
+    private long hash;
+    private long aggregationHash;
+    private long completeHash;
+    private int nonNullSize;
+
+    // hash tags
+    protected final String bus;
+    protected final String direction;
+    protected final Direction directionValue;
+    protected final String exchange;
+    protected final String topic;
+    protected final String type;
+    protected final String subscription;
+    // additional grouping tags
+    protected final String datasetName;
+    protected final String datasetNamespace;
+    protected final String isManual;
+    // informational tags
+    protected final String group;
+    protected final String consumerGroup;
+    protected final String hasRoutingKey;
+    protected final String kafkaClusterId;
+    protected final String partition;
+
+    public static final String MANUAL_TAG = "manual_checkpoint";
+    public static final String TYPE_TAG = "type";
+    public static final String DIRECTION_TAG = "direction";
+    public static final String TOPIC_TAG = "topic";
+    public static final String BUS_TAG = "bus";
+    public static final String PARTITION_TAG = "partition";
+    public static final String GROUP_TAG = "group";
+    public static final String CONSUMER_GROUP_TAG = "consumer_group";
+    public static final String SUBSCRIPTION_TAG = "subscription";
+    public static final String EXCHANGE_TAG = "exchange";
+    public static final String DATASET_NAME_TAG = "ds.name";
+    public static final String DATASET_NAMESPACE_TAG = "ds.namespace";
+    public static final String HAS_ROUTING_KEY_TAG = "has_routing_key";
+    public static final String KAFKA_CLUSTER_ID_TAG = "kafka_cluster_id";
+
+    private static volatile ThreadLocal<String> serviceNameOverride;
+
+    public static byte[] longToBytes(long val) {
+        return new byte[] {
+            (byte) (val >> 56),
+            (byte) (val >> 48),
+            (byte) (val >> 40),
+            (byte) (val >> 32),
+            (byte) (val >> 24),
+            (byte) (val >> 16),
+            (byte) (val >> 8),
+            (byte) val
+        };
+    }
+
+    public static DataStreamsTags create(String type, Direction direction) {
+        return DataStreamsTags.create(type, direction, null);
+    }
+
+    public static DataStreamsTags create(String type, Direction direction, String topic) {
+        return DataStreamsTags.createWithGroup(type, direction, topic, null);
+    }
+
+    public static DataStreamsTags createWithSubscription(String type, Direction direction, String subscription) {
+        return new DataStreamsTags(
+                null, direction, null, null, type, subscription, null, null, null, null, null, null, null, null);
+    }
+
+    public static DataStreamsTags create(
+            String type, Direction direction, String topic, String group, String kafkaClusterId) {
+        return new DataStreamsTags(
+                null, direction, null, topic, type, null, null, null, null, group, null, null, kafkaClusterId, null);
+    }
+
+    public static DataStreamsTags createManual(String type, Direction direction, String topic) {
+        return new DataStreamsTags(
+                null, direction, null, topic, type, null, null, null, true, null, null, null, null, null);
+    }
+
+    public static DataStreamsTags createWithBus(Direction direction, String bus) {
+        return new DataStreamsTags(
+                bus, direction, null, null, "bus", null, null, null, null, null, null, null, null, null);
+    }
+
+    public static DataStreamsTags createWithPartition(
+            String type, String topic, String partition, String kafkaClusterId, String consumerGroup) {
+        return new DataStreamsTags(
+                null,
+                null,
+                null,
+                topic,
+                type,
+                null,
+                null,
+                null,
+                null,
+                null,
+                consumerGroup,
+                null,
+                kafkaClusterId,
+                partition);
+    }
+
+    /// For usage in tests *only*
+    public Boolean hasAllTags(String[] tags) {
+        for (String tag : tags) {
+            if (tag.indexOf(':') == -1) {
+                return false;
+            }
+            String key = tag.substring(0, tag.indexOf(':'));
+            String value = tag.substring(tag.indexOf(':') + 1);
+            switch (key) {
+                case BUS_TAG:
+                    if (!Objects.equals(this.bus, tag)) {
+                        return false;
+                    }
+                    break;
+                case DIRECTION_TAG:
+                    if (!Objects.equals(
+                            this.directionValue,
+                            Objects.equals(value, "out") ? Direction.OUTBOUND : Direction.INBOUND)) {
+                        return false;
+                    }
+                    break;
+                case EXCHANGE_TAG:
+                    if (!Objects.equals(this.exchange, tag)) {
+                        return false;
+                    }
+                    break;
+                case TOPIC_TAG:
+                    if (!Objects.equals(this.topic, tag)) {
+                        return false;
+                    }
+                    break;
+                case TYPE_TAG:
+                    if (!Objects.equals(this.type, tag)) {
+                        return false;
+                    }
+                    break;
+                case SUBSCRIPTION_TAG:
+                    if (!Objects.equals(this.subscription, tag)) {
+                        return false;
+                    }
+                    break;
+                case DATASET_NAME_TAG:
+                    if (!Objects.equals(this.datasetName, tag)) {
+                        return false;
+                    }
+                    break;
+                case DATASET_NAMESPACE_TAG:
+                    if (!Objects.equals(this.datasetNamespace, tag)) {
+                        return false;
+                    }
+                    break;
+                case MANUAL_TAG:
+                    if (!Objects.equals(this.isManual, tag)) {
+                        return false;
+                    }
+                    break;
+                case GROUP_TAG:
+                    if (!Objects.equals(this.group, tag)) {
+                        return false;
+                    }
+                    break;
+                case CONSUMER_GROUP_TAG:
+                    if (!Objects.equals(this.consumerGroup, tag)) {
+                        return false;
+                    }
+                    break;
+                case HAS_ROUTING_KEY_TAG:
+                    if (!Objects.equals(this.hasRoutingKey, tag)) {
+                        return false;
+                    }
+                    break;
+                case KAFKA_CLUSTER_ID_TAG:
+                    if (!Objects.equals(this.kafkaClusterId, tag)) {
+                        return false;
+                    }
+                    break;
+                case PARTITION_TAG:
+                    if (!Objects.equals(this.partition, tag)) {
+                        return false;
+                    }
+                    break;
+                default:
+                    return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static DataStreamsTags createWithGroup(String type, Direction direction, String topic, String group) {
+        return new DataStreamsTags(
+                null, direction, null, topic, type, null, null, null, null, group, null, null, null, null);
+    }
+
+    public static DataStreamsTags createWithDataset(
+            String type, Direction direction, String topic, String datasetName, String datasetNamespace) {
+        return new DataStreamsTags(
+                null,
+                direction,
+                null,
+                topic,
+                type,
+                null,
+                datasetName,
+                datasetNamespace,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null);
+    }
+
+    public static void setServiceNameOverride(ThreadLocal<String> serviceNameOverride) {
+        DataStreamsTags.serviceNameOverride = serviceNameOverride;
+    }
+
+    public static DataStreamsTags createWithClusterId(
+            String type, Direction direction, String topic, String clusterId) {
+        return new DataStreamsTags(
+                null, direction, null, topic, type, null, null, null, null, null, null, null, clusterId, null);
+    }
+
+    public static DataStreamsTags createWithExchange(
+            String type, Direction direction, String exchange, Boolean hasRoutingKey) {
+        return new DataStreamsTags(
+                null, direction, exchange, null, type, null, null, null, false, null, null, hasRoutingKey, null, null);
+    }
+
+    public DataStreamsTags(
+            String bus,
+            Direction direction,
+            String exchange,
+            String topic,
+            String type,
+            String subscription,
+            String datasetName,
+            String datasetNamespace,
+            Boolean isManual,
+            String group,
+            String consumerGroup,
+            Boolean hasRoutingKey,
+            String kafkaClusterId,
+            String partition) {
+        this.bus = bus != null ? BUS_TAG + ":" + bus : null;
+        this.directionValue = direction;
+        if (direction == Direction.INBOUND) {
+            this.direction = DIRECTION_TAG + ":in";
+        } else if (direction == Direction.OUTBOUND) {
+            this.direction = DIRECTION_TAG + ":out";
+        } else {
+            this.direction = null;
+        }
+        this.exchange = exchange != null ? EXCHANGE_TAG + ":" + exchange : null;
+        this.topic = topic != null ? TOPIC_TAG + ":" + topic : null;
+        this.type = type != null ? TYPE_TAG + ":" + type : null;
+        this.subscription = subscription != null ? SUBSCRIPTION_TAG + ":" + subscription : null;
+        this.datasetName = datasetName != null ? DATASET_NAME_TAG + ":" + datasetName : null;
+        this.datasetNamespace = datasetNamespace != null ? DATASET_NAMESPACE_TAG + ":" + datasetNamespace : null;
+        this.isManual = isManual != null ? MANUAL_TAG + ":" + isManual : null;
+        this.group = group != null ? GROUP_TAG + ":" + group : null;
+        this.consumerGroup = consumerGroup != null ? CONSUMER_GROUP_TAG + ":" + consumerGroup : null;
+        this.hasRoutingKey = hasRoutingKey != null ? HAS_ROUTING_KEY_TAG + ":" + hasRoutingKey : null;
+        this.kafkaClusterId = kafkaClusterId != null ? KAFKA_CLUSTER_ID_TAG + ":" + kafkaClusterId : null;
+        this.partition = partition != null ? PARTITION_TAG + ":" + partition : null;
+
+        this.hash = BaseHash.getBaseHash();
+
+        if (DataStreamsTags.serviceNameOverride != null) {
+            String val = DataStreamsTags.serviceNameOverride.get();
+            if (val != null) {
+                this.hash = FNV64Hash.continueHash(this.hash, val, FNV64Hash.Version.v1);
+            }
+        }
+
+        // hashable tags are 0-6: bus, direction, exchange, topic, type, subscription, kafkaClusterId
+        for (int i = 0; i < 7; i++) {
+            String tag = this.tagByIndex(i);
+            if (tag != null) {
+                this.nonNullSize++;
+                this.hash = FNV64Hash.continueHash(this.hash, tag, FNV64Hash.Version.v1);
+            }
+        }
+
+        // aggregation tags are 7-11: datasetName, datasetNamespace, isManual, group, consumerGroup
+        this.aggregationHash = this.hash;
+        for (int i = 7; i < 12; i++) {
+            String tag = this.tagByIndex(i);
+            if (tag != null) {
+                this.nonNullSize++;
+                this.aggregationHash = FNV64Hash.continueHash(this.aggregationHash, tag, FNV64Hash.Version.v1);
+            }
+        }
+
+        // values are 12-13: partition, hasRoutingKey
+        this.completeHash = aggregationHash;
+        for (int i = 12; i < this.size(); i++) {
+            String tag = this.tagByIndex(i);
+            if (tag != null) {
+                this.nonNullSize++;
+                this.completeHash = FNV64Hash.continueHash(this.completeHash, tag, FNV64Hash.Version.v1);
+            }
+        }
+    }
+
+    public int size() {
+        // make sure it's in sync with tagByIndex logic
+        return 14;
+    }
+
+    // WARNING: DO NOT REORDER! Indices 0-6 are hash tags, 7-11 are aggregation tags, 12-13 are
+    // values. Reordering breaks hashing!
+    public String tagByIndex(int index) {
+        switch (index) {
+            case 0:
+                return this.bus;
+            case 1:
+                return this.direction;
+            case 2:
+                return this.exchange;
+            case 3:
+                return this.topic;
+            case 4:
+                return this.type;
+            case 5:
+                return this.subscription;
+            case 6:
+                return this.kafkaClusterId;
+            case 7:
+                return this.datasetName;
+            case 8:
+                return this.datasetNamespace;
+            case 9:
+                return this.isManual;
+            case 10:
+                return this.group;
+            case 11:
+                return this.consumerGroup;
+            case 12:
+                return this.partition;
+            case 13:
+                return this.hasRoutingKey;
+            default:
+                return null;
+        }
+    }
+
+    public String getDirection() {
         return this.direction;
-      case 2:
-        return this.exchange;
-      case 3:
+    }
+
+    public String getTopic() {
         return this.topic;
-      case 4:
+    }
+
+    public String getType() {
         return this.type;
-      case 5:
+    }
+
+    public String getIsManual() {
+        return this.isManual;
+    }
+
+    public String getBus() {
+        return this.bus;
+    }
+
+    public String getExchange() {
+        return this.exchange;
+    }
+
+    public Direction getDirectionValue() {
+        return this.directionValue;
+    }
+
+    public String getSubscription() {
         return this.subscription;
-      case 6:
-        return this.kafkaClusterId;
-      case 7:
+    }
+
+    public String getDatasetName() {
         return this.datasetName;
-      case 8:
+    }
+
+    public String getDatasetNamespace() {
         return this.datasetNamespace;
-      case 9:
-        return this.isManual;
-      case 10:
+    }
+
+    public String getGroup() {
         return this.group;
-      case 11:
+    }
+
+    public String getConsumerGroup() {
         return this.consumerGroup;
-      case 12:
+    }
+
+    public String getPartition() {
         return this.partition;
-      case 13:
+    }
+
+    public String getKafkaClusterId() {
+        return this.kafkaClusterId;
+    }
+
+    public String getHasRoutingKey() {
         return this.hasRoutingKey;
-      default:
-        return null;
-    }
-  }
-
-  public String getDirection() {
-    return this.direction;
-  }
-
-  public String getTopic() {
-    return this.topic;
-  }
-
-  public String getType() {
-    return this.type;
-  }
-
-  public String getIsManual() {
-    return this.isManual;
-  }
-
-  public String getBus() {
-    return this.bus;
-  }
-
-  public String getExchange() {
-    return this.exchange;
-  }
-
-  public Direction getDirectionValue() {
-    return this.directionValue;
-  }
-
-  public String getSubscription() {
-    return this.subscription;
-  }
-
-  public String getDatasetName() {
-    return this.datasetName;
-  }
-
-  public String getDatasetNamespace() {
-    return this.datasetNamespace;
-  }
-
-  public String getGroup() {
-    return this.group;
-  }
-
-  public String getConsumerGroup() {
-    return this.consumerGroup;
-  }
-
-  public String getPartition() {
-    return this.partition;
-  }
-
-  public String getKafkaClusterId() {
-    return this.kafkaClusterId;
-  }
-
-  public String getHasRoutingKey() {
-    return this.hasRoutingKey;
-  }
-
-  public int nonNullSize() {
-    return this.nonNullSize;
-  }
-
-  public long getHash() {
-    return hash;
-  }
-
-  public long getAggregationHash() {
-    return aggregationHash;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    DataStreamsTags that = (DataStreamsTags) o;
-    return this.completeHash == that.completeHash;
-  }
-
-  @Override
-  public int hashCode() {
-    return Long.hashCode(this.completeHash);
-  }
-
-  @Override
-  public String toString() {
-    return "DataStreamsTags{"
-        + "bus='"
-        + this.bus
-        + "', direction='"
-        + this.direction
-        + "', exchange='"
-        + this.exchange
-        + "', topic='"
-        + this.topic
-        + "', type='"
-        + this.type
-        + "', subscription='"
-        + this.subscription
-        + "', datasetName='"
-        + this.datasetName
-        + "', datasetNamespace='"
-        + this.datasetNamespace
-        + "', isManual="
-        + this.isManual
-        + "', group='"
-        + this.group
-        + "', consumerGroup='"
-        + this.consumerGroup
-        + "', hasRoutingKey='"
-        + this.hasRoutingKey
-        + "', kafkaClusterId='"
-        + this.kafkaClusterId
-        + "', partition='"
-        + this.partition
-        + "', hash='"
-        + hash
-        + "', aggregationHash='"
-        + aggregationHash
-        + "', size='"
-        + size();
-  }
+    }
+
+    public int nonNullSize() {
+        return this.nonNullSize;
+    }
+
+    public long getHash() {
+        return hash;
+    }
+
+    public long getAggregationHash() {
+        return aggregationHash;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        DataStreamsTags that = (DataStreamsTags) o;
+        return this.completeHash == that.completeHash;
+    }
+
+    @Override
+    public int hashCode() {
+        return Long.hashCode(this.completeHash);
+    }
+
+    @Override
+    public String toString() {
+        return "DataStreamsTags{"
+                + "bus='"
+                + this.bus
+                + "', direction='"
+                + this.direction
+                + "', exchange='"
+                + this.exchange
+                + "', topic='"
+                + this.topic
+                + "', type='"
+                + this.type
+                + "', subscription='"
+                + this.subscription
+                + "', datasetName='"
+                + this.datasetName
+                + "', datasetNamespace='"
+                + this.datasetNamespace
+                + "', isManual="
+                + this.isManual
+                + "', group='"
+                + this.group
+                + "', consumerGroup='"
+                + this.consumerGroup
+                + "', hasRoutingKey='"
+                + this.hasRoutingKey
+                + "', kafkaClusterId='"
+                + this.kafkaClusterId
+                + "', partition='"
+                + this.partition
+                + "', hash='"
+                + hash
+                + "', aggregationHash='"
+                + aggregationHash
+                + "', size='"
+                + size();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsTransactionExtractor.java b/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsTransactionExtractor.java
index a8b314ff48f..0d68cdf5ffb 100644
--- a/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsTransactionExtractor.java
+++ b/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsTransactionExtractor.java
@@ -1,26 +1,26 @@
 package datadog.trace.api.datastreams;
 
 public interface DataStreamsTransactionExtractor {
-  int MAX_NUM_EXTRACTORS = 64;
+    int MAX_NUM_EXTRACTORS = 64;
 
-  enum Type {
-    UNKNOWN,
-    /** HTTP_OUT_HEADERS targets outgoing HTTP requests */
-    HTTP_OUT_HEADERS,
-    /** HTTP_IN_HEADERS targets incoming HTTP requests */
-    HTTP_IN_HEADERS,
-    /** KAFKA_CONSUME_HEADERS targets headers from consumed messages (after consume) */
-    KAFKA_CONSUME_HEADERS,
-    /** KAFKA_CONSUME_HEADERS targets headers from produced messages (before produce) */
-    KAFKA_PRODUCE_HEADERS
-  }
+    enum Type {
+        UNKNOWN,
+        /** HTTP_OUT_HEADERS targets outgoing HTTP requests */
+        HTTP_OUT_HEADERS,
+        /** HTTP_IN_HEADERS targets incoming HTTP requests */
+        HTTP_IN_HEADERS,
+        /** KAFKA_CONSUME_HEADERS targets headers from consumed messages (after consume) */
+        KAFKA_CONSUME_HEADERS,
+        /** KAFKA_CONSUME_HEADERS targets headers from produced messages (before produce) */
+        KAFKA_PRODUCE_HEADERS
+    }
 
-  /** getName returns transaction extractor name */
-  String getName();
+    /** getName returns transaction extractor name */
+    String getName();
 
-  /** getType returns transaction extractor type */
-  Type getType();
+    /** getType returns transaction extractor type */
+    Type getType();
 
-  /** getValue returns transaction extractor value */
-  String getValue();
+    /** getValue returns transaction extractor value */
+    String getValue();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsTransactionTracker.java b/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsTransactionTracker.java
index 4875c13f365..3da9f4c74a4 100644
--- a/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsTransactionTracker.java
+++ b/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsTransactionTracker.java
@@ -3,20 +3,20 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 
 public interface DataStreamsTransactionTracker {
-  interface TransactionSourceReader {
-    String readHeader(Object source, String headerName);
-  }
+    interface TransactionSourceReader {
+        String readHeader(Object source, String headerName);
+    }
 
-  /** trackTransaction used to emit "seen" event for transactions */
-  void trackTransaction(String transactionId, String checkpointName);
+    /** trackTransaction used to emit "seen" event for transactions */
+    void trackTransaction(String transactionId, String checkpointName);
 
-  /**
-   * trackTransaction which tries to extract / track transactions info using extractors of
-   * extractorType from the provided source using source reader
-   */
-  void trackTransaction(
-      AgentSpan span,
-      DataStreamsTransactionExtractor.Type extractorType,
-      Object source,
-      TransactionSourceReader sourceReader);
+    /**
+     * trackTransaction which tries to extract / track transactions info using extractors of
+     * extractorType from the provided source using source reader
+     */
+    void trackTransaction(
+            AgentSpan span,
+            DataStreamsTransactionExtractor.Type extractorType,
+            Object source,
+            TransactionSourceReader sourceReader);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/datastreams/KafkaConfigReport.java b/internal-api/src/main/java/datadog/trace/api/datastreams/KafkaConfigReport.java
index 64b9c052ec4..3ac8dcb9f55 100644
--- a/internal-api/src/main/java/datadog/trace/api/datastreams/KafkaConfigReport.java
+++ b/internal-api/src/main/java/datadog/trace/api/datastreams/KafkaConfigReport.java
@@ -9,117 +9,108 @@
  * Streams payload. Each unique configuration is sent only once.
  */
 public class KafkaConfigReport implements InboxItem {
-  private static final int NO_GENERATION = -1;
-
-  private final String type; // "kafka_producer" or "kafka_consumer"
-  private final String kafkaClusterId;
-  private final String consumerGroup;
-  private final String memberId;
-  private final int generationId;
-  private final String memberProtocol;
-  private final Map<String, String> config;
-  private final long timestampNanos;
-  private final String serviceNameOverride;
-
-  public KafkaConfigReport(
-      String type,
-      String kafkaClusterId,
-      String consumerGroup,
-      Map<String, String> config,
-      long timestampNanos,
-      String serviceNameOverride) {
-    this(
-        type,
-        kafkaClusterId,
-        consumerGroup,
-        "",
-        NO_GENERATION,
-        "",
-        config,
-        timestampNanos,
-        serviceNameOverride);
-  }
-
-  public KafkaConfigReport(
-      String type,
-      String kafkaClusterId,
-      String consumerGroup,
-      String memberId,
-      int generationId,
-      String memberProtocol,
-      Map<String, String> config,
-      long timestampNanos,
-      String serviceNameOverride) {
-    this.type = type;
-    this.kafkaClusterId = kafkaClusterId != null ? kafkaClusterId : "";
-    this.consumerGroup = consumerGroup != null ? consumerGroup : "";
-    this.memberId = memberId != null ? memberId : "";
-    this.generationId = generationId;
-    this.memberProtocol = memberProtocol != null ? memberProtocol : "";
-    this.config = config != null ? config : Collections.<String, String>emptyMap();
-    this.timestampNanos = timestampNanos;
-    this.serviceNameOverride = serviceNameOverride;
-  }
-
-  public String getType() {
-    return type;
-  }
-
-  public String getKafkaClusterId() {
-    return kafkaClusterId;
-  }
-
-  public String getConsumerGroup() {
-    return consumerGroup;
-  }
-
-  public String getMemberId() {
-    return memberId;
-  }
-
-  public int getGenerationId() {
-    return generationId;
-  }
-
-  public String getMemberProtocol() {
-    return memberProtocol;
-  }
-
-  public Map<String, String> getConfig() {
-    return config;
-  }
-
-  public long getTimestampNanos() {
-    return timestampNanos;
-  }
-
-  public String getServiceNameOverride() {
-    return serviceNameOverride;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    KafkaConfigReport that = (KafkaConfigReport) o;
-    return generationId == that.generationId
-        && Objects.equals(type, that.type)
-        && Objects.equals(kafkaClusterId, that.kafkaClusterId)
-        && Objects.equals(consumerGroup, that.consumerGroup)
-        && Objects.equals(memberId, that.memberId)
-        && Objects.equals(memberProtocol, that.memberProtocol)
-        && Objects.equals(config, that.config);
-  }
-
-  @Override
-  public int hashCode() {
-    int result = type != null ? type.hashCode() : 0;
-    result = 31 * result + (kafkaClusterId != null ? kafkaClusterId.hashCode() : 0);
-    result = 31 * result + (consumerGroup != null ? consumerGroup.hashCode() : 0);
-    result = 31 * result + (memberId != null ? memberId.hashCode() : 0);
-    result = 31 * result + generationId;
-    result = 31 * result + (memberProtocol != null ? memberProtocol.hashCode() : 0);
-    result = 31 * result + (config != null ? config.hashCode() : 0);
-    return result;
-  }
+    private static final int NO_GENERATION = -1;
+
+    private final String type; // "kafka_producer" or "kafka_consumer"
+    private final String kafkaClusterId;
+    private final String consumerGroup;
+    private final String memberId;
+    private final int generationId;
+    private final String memberProtocol;
+    private final Map<String, String> config;
+    private final long timestampNanos;
+    private final String serviceNameOverride;
+
+    public KafkaConfigReport(
+            String type,
+            String kafkaClusterId,
+            String consumerGroup,
+            Map<String, String> config,
+            long timestampNanos,
+            String serviceNameOverride) {
+        this(type, kafkaClusterId, consumerGroup, "", NO_GENERATION, "", config, timestampNanos, serviceNameOverride);
+    }
+
+    public KafkaConfigReport(
+            String type,
+            String kafkaClusterId,
+            String consumerGroup,
+            String memberId,
+            int generationId,
+            String memberProtocol,
+            Map<String, String> config,
+            long timestampNanos,
+            String serviceNameOverride) {
+        this.type = type;
+        this.kafkaClusterId = kafkaClusterId != null ? kafkaClusterId : "";
+        this.consumerGroup = consumerGroup != null ? consumerGroup : "";
+        this.memberId = memberId != null ? memberId : "";
+        this.generationId = generationId;
+        this.memberProtocol = memberProtocol != null ? memberProtocol : "";
+        this.config = config != null ? config : Collections.<String, String>emptyMap();
+        this.timestampNanos = timestampNanos;
+        this.serviceNameOverride = serviceNameOverride;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getKafkaClusterId() {
+        return kafkaClusterId;
+    }
+
+    public String getConsumerGroup() {
+        return consumerGroup;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public int getGenerationId() {
+        return generationId;
+    }
+
+    public String getMemberProtocol() {
+        return memberProtocol;
+    }
+
+    public Map<String, String> getConfig() {
+        return config;
+    }
+
+    public long getTimestampNanos() {
+        return timestampNanos;
+    }
+
+    public String getServiceNameOverride() {
+        return serviceNameOverride;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        KafkaConfigReport that = (KafkaConfigReport) o;
+        return generationId == that.generationId
+                && Objects.equals(type, that.type)
+                && Objects.equals(kafkaClusterId, that.kafkaClusterId)
+                && Objects.equals(consumerGroup, that.consumerGroup)
+                && Objects.equals(memberId, that.memberId)
+                && Objects.equals(memberProtocol, that.memberProtocol)
+                && Objects.equals(config, that.config);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = type != null ? type.hashCode() : 0;
+        result = 31 * result + (kafkaClusterId != null ? kafkaClusterId.hashCode() : 0);
+        result = 31 * result + (consumerGroup != null ? consumerGroup.hashCode() : 0);
+        result = 31 * result + (memberId != null ? memberId.hashCode() : 0);
+        result = 31 * result + generationId;
+        result = 31 * result + (memberProtocol != null ? memberProtocol.hashCode() : 0);
+        result = 31 * result + (config != null ? config.hashCode() : 0);
+        return result;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/datastreams/NoopDataStreamsMonitoring.java b/internal-api/src/main/java/datadog/trace/api/datastreams/NoopDataStreamsMonitoring.java
index d40c2bf7597..8f51bc2bbd3 100644
--- a/internal-api/src/main/java/datadog/trace/api/datastreams/NoopDataStreamsMonitoring.java
+++ b/internal-api/src/main/java/datadog/trace/api/datastreams/NoopDataStreamsMonitoring.java
@@ -5,65 +5,56 @@
 import java.util.Map;
 
 public class NoopDataStreamsMonitoring implements AgentDataStreamsMonitoring {
-  public static final NoopDataStreamsMonitoring INSTANCE = new NoopDataStreamsMonitoring();
-
-  @Override
-  public void trackBacklog(DataStreamsTags tags, long value) {}
-
-  @Override
-  public void reportSchemaRegistryUsage(
-      String topic,
-      String clusterId,
-      int schemaId,
-      boolean isSuccess,
-      boolean isKey,
-      String operation) {}
-
-  @Override
-  public void setCheckpoint(AgentSpan span, DataStreamsContext context) {}
-
-  @Override
-  public PathwayContext newPathwayContext() {
-    return NoopPathwayContext.INSTANCE;
-  }
-
-  @Override
-  public void add(StatsPoint statsPoint) {}
-
-  @Override
-  public void setProduceCheckpoint(String type, String target) {}
-
-  @Override
-  public void setThreadServiceName(String serviceName) {}
-
-  @Override
-  public void clearThreadServiceName() {}
-
-  @Override
-  public void trackTransaction(String transactionId, String checkpointName) {}
-
-  @Override
-  public void trackTransaction(
-      AgentSpan span,
-      DataStreamsTransactionExtractor.Type extractorType,
-      Object source,
-      TransactionSourceReader sourceReader) {}
-
-  @Override
-  public void reportKafkaConfig(
-      String type, String kafkaClusterId, String consumerGroup, Map<String, String> config) {}
-
-  @Override
-  public void reportKafkaConsumerGroupMember(
-      String kafkaClusterId,
-      String consumerGroup,
-      String memberId,
-      int generationId,
-      String memberProtocol) {}
-
-  @Override
-  public void setConsumeCheckpoint(String type, String source, DataStreamsContextCarrier carrier) {}
-
-  @Override
-  public void setProduceCheckpoint(String type, String target, DataStreamsContextCarrier carrier) {}
+    public static final NoopDataStreamsMonitoring INSTANCE = new NoopDataStreamsMonitoring();
+
+    @Override
+    public void trackBacklog(DataStreamsTags tags, long value) {}
+
+    @Override
+    public void reportSchemaRegistryUsage(
+            String topic, String clusterId, int schemaId, boolean isSuccess, boolean isKey, String operation) {}
+
+    @Override
+    public void setCheckpoint(AgentSpan span, DataStreamsContext context) {}
+
+    @Override
+    public PathwayContext newPathwayContext() {
+        return NoopPathwayContext.INSTANCE;
+    }
+
+    @Override
+    public void add(StatsPoint statsPoint) {}
+
+    @Override
+    public void setProduceCheckpoint(String type, String target) {}
+
+    @Override
+    public void setThreadServiceName(String serviceName) {}
+
+    @Override
+    public void clearThreadServiceName() {}
+
+    @Override
+    public void trackTransaction(String transactionId, String checkpointName) {}
+
+    @Override
+    public void trackTransaction(
+            AgentSpan span,
+            DataStreamsTransactionExtractor.Type extractorType,
+            Object source,
+            TransactionSourceReader sourceReader) {}
+
+    @Override
+    public void reportKafkaConfig(
+            String type, String kafkaClusterId, String consumerGroup, Map<String, String> config) {}
+
+    @Override
+    public void reportKafkaConsumerGroupMember(
+            String kafkaClusterId, String consumerGroup, String memberId, int generationId, String memberProtocol) {}
+
+    @Override
+    public void setConsumeCheckpoint(String type, String source, DataStreamsContextCarrier carrier) {}
+
+    @Override
+    public void setProduceCheckpoint(String type, String target, DataStreamsContextCarrier carrier) {}
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/datastreams/NoopPathwayContext.java b/internal-api/src/main/java/datadog/trace/api/datastreams/NoopPathwayContext.java
index 08e28ac83b0..f020d6f6581 100644
--- a/internal-api/src/main/java/datadog/trace/api/datastreams/NoopPathwayContext.java
+++ b/internal-api/src/main/java/datadog/trace/api/datastreams/NoopPathwayContext.java
@@ -3,31 +3,31 @@
 import java.util.function.Consumer;
 
 public class NoopPathwayContext implements PathwayContext {
-  public static final NoopPathwayContext INSTANCE = new NoopPathwayContext();
+    public static final NoopPathwayContext INSTANCE = new NoopPathwayContext();
 
-  @Override
-  public boolean isStarted() {
-    return false;
-  }
+    @Override
+    public boolean isStarted() {
+        return false;
+    }
 
-  @Override
-  public long getHash() {
-    return 0L;
-  }
+    @Override
+    public long getHash() {
+        return 0L;
+    }
 
-  @Override
-  public void setCheckpoint(DataStreamsContext context, Consumer<StatsPoint> pointConsumer) {}
+    @Override
+    public void setCheckpoint(DataStreamsContext context, Consumer<StatsPoint> pointConsumer) {}
 
-  @Override
-  public void saveStats(StatsPoint point) {}
+    @Override
+    public void saveStats(StatsPoint point) {}
 
-  @Override
-  public StatsPoint getSavedStats() {
-    return null;
-  }
+    @Override
+    public StatsPoint getSavedStats() {
+        return null;
+    }
 
-  @Override
-  public String encode() {
-    return null;
-  }
+    @Override
+    public String encode() {
+        return null;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/datastreams/PathwayContext.java b/internal-api/src/main/java/datadog/trace/api/datastreams/PathwayContext.java
index f5a373e70ec..e7c9179e7a7 100644
--- a/internal-api/src/main/java/datadog/trace/api/datastreams/PathwayContext.java
+++ b/internal-api/src/main/java/datadog/trace/api/datastreams/PathwayContext.java
@@ -4,18 +4,18 @@
 import java.util.function.Consumer;
 
 public interface PathwayContext {
-  String PROPAGATION_KEY_BASE64 = "dd-pathway-ctx-base64";
-  String DATADOG_KEY = "_datadog";
+    String PROPAGATION_KEY_BASE64 = "dd-pathway-ctx-base64";
+    String DATADOG_KEY = "_datadog";
 
-  boolean isStarted();
+    boolean isStarted();
 
-  long getHash();
+    long getHash();
 
-  void setCheckpoint(DataStreamsContext context, Consumer<StatsPoint> pointConsumer);
+    void setCheckpoint(DataStreamsContext context, Consumer<StatsPoint> pointConsumer);
 
-  void saveStats(StatsPoint point);
+    void saveStats(StatsPoint point);
 
-  StatsPoint getSavedStats();
+    StatsPoint getSavedStats();
 
-  String encode() throws IOException;
+    String encode() throws IOException;
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/datastreams/SchemaRegistryUsage.java b/internal-api/src/main/java/datadog/trace/api/datastreams/SchemaRegistryUsage.java
index 814f8a05f09..7f9e4b8852c 100644
--- a/internal-api/src/main/java/datadog/trace/api/datastreams/SchemaRegistryUsage.java
+++ b/internal-api/src/main/java/datadog/trace/api/datastreams/SchemaRegistryUsage.java
@@ -5,63 +5,63 @@
  * monitoring schema compatibility checks, registrations, and failures.
  */
 public class SchemaRegistryUsage implements InboxItem {
-  private final String topic;
-  private final String clusterId;
-  private final int schemaId;
-  private final boolean isSuccess;
-  private final boolean isKey;
-  private final String operation;
-  private final long timestampNanos;
-  private final String serviceNameOverride;
+    private final String topic;
+    private final String clusterId;
+    private final int schemaId;
+    private final boolean isSuccess;
+    private final boolean isKey;
+    private final String operation;
+    private final long timestampNanos;
+    private final String serviceNameOverride;
 
-  public SchemaRegistryUsage(
-      String topic,
-      String clusterId,
-      int schemaId,
-      boolean isSuccess,
-      boolean isKey,
-      String operation,
-      long timestampNanos,
-      String serviceNameOverride) {
-    this.topic = topic;
-    this.clusterId = clusterId;
-    this.schemaId = schemaId;
-    this.isSuccess = isSuccess;
-    this.isKey = isKey;
-    this.operation = operation;
-    this.timestampNanos = timestampNanos;
-    this.serviceNameOverride = serviceNameOverride;
-  }
+    public SchemaRegistryUsage(
+            String topic,
+            String clusterId,
+            int schemaId,
+            boolean isSuccess,
+            boolean isKey,
+            String operation,
+            long timestampNanos,
+            String serviceNameOverride) {
+        this.topic = topic;
+        this.clusterId = clusterId;
+        this.schemaId = schemaId;
+        this.isSuccess = isSuccess;
+        this.isKey = isKey;
+        this.operation = operation;
+        this.timestampNanos = timestampNanos;
+        this.serviceNameOverride = serviceNameOverride;
+    }
 
-  public String getTopic() {
-    return topic;
-  }
+    public String getTopic() {
+        return topic;
+    }
 
-  public String getClusterId() {
-    return clusterId;
-  }
+    public String getClusterId() {
+        return clusterId;
+    }
 
-  public int getSchemaId() {
-    return schemaId;
-  }
+    public int getSchemaId() {
+        return schemaId;
+    }
 
-  public boolean isSuccess() {
-    return isSuccess;
-  }
+    public boolean isSuccess() {
+        return isSuccess;
+    }
 
-  public boolean isKey() {
-    return isKey;
-  }
+    public boolean isKey() {
+        return isKey;
+    }
 
-  public String getOperation() {
-    return operation;
-  }
+    public String getOperation() {
+        return operation;
+    }
 
-  public long getTimestampNanos() {
-    return timestampNanos;
-  }
+    public long getTimestampNanos() {
+        return timestampNanos;
+    }
 
-  public String getServiceNameOverride() {
-    return serviceNameOverride;
-  }
+    public String getServiceNameOverride() {
+        return serviceNameOverride;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/datastreams/StatsPoint.java b/internal-api/src/main/java/datadog/trace/api/datastreams/StatsPoint.java
index 3e8f8aeab01..31ade6fab74 100644
--- a/internal-api/src/main/java/datadog/trace/api/datastreams/StatsPoint.java
+++ b/internal-api/src/main/java/datadog/trace/api/datastreams/StatsPoint.java
@@ -1,93 +1,93 @@
 package datadog.trace.api.datastreams;
 
 public class StatsPoint implements InboxItem {
-  private final DataStreamsTags tags;
-  private final long hash;
-  private final long parentHash;
-  private final long aggregationHash;
-  private final long timestampNanos;
-  private final long pathwayLatencyNano;
-  private final long edgeLatencyNano;
-  private final long payloadSizeBytes;
-  private final String serviceNameOverride;
+    private final DataStreamsTags tags;
+    private final long hash;
+    private final long parentHash;
+    private final long aggregationHash;
+    private final long timestampNanos;
+    private final long pathwayLatencyNano;
+    private final long edgeLatencyNano;
+    private final long payloadSizeBytes;
+    private final String serviceNameOverride;
 
-  public StatsPoint(
-      DataStreamsTags tags,
-      long hash,
-      long parentHash,
-      long aggregationHash,
-      long timestampNanos,
-      long pathwayLatencyNano,
-      long edgeLatencyNano,
-      long payloadSizeBytes,
-      String serviceNameOverride) {
-    this.tags = tags;
-    this.hash = hash;
-    this.parentHash = parentHash;
-    this.aggregationHash = aggregationHash;
-    this.timestampNanos = timestampNanos;
-    this.pathwayLatencyNano = pathwayLatencyNano;
-    this.edgeLatencyNano = edgeLatencyNano;
-    this.payloadSizeBytes = payloadSizeBytes;
-    this.serviceNameOverride = serviceNameOverride;
-  }
+    public StatsPoint(
+            DataStreamsTags tags,
+            long hash,
+            long parentHash,
+            long aggregationHash,
+            long timestampNanos,
+            long pathwayLatencyNano,
+            long edgeLatencyNano,
+            long payloadSizeBytes,
+            String serviceNameOverride) {
+        this.tags = tags;
+        this.hash = hash;
+        this.parentHash = parentHash;
+        this.aggregationHash = aggregationHash;
+        this.timestampNanos = timestampNanos;
+        this.pathwayLatencyNano = pathwayLatencyNano;
+        this.edgeLatencyNano = edgeLatencyNano;
+        this.payloadSizeBytes = payloadSizeBytes;
+        this.serviceNameOverride = serviceNameOverride;
+    }
 
-  public DataStreamsTags getTags() {
-    return tags;
-  }
+    public DataStreamsTags getTags() {
+        return tags;
+    }
 
-  public long getHash() {
-    return hash;
-  }
+    public long getHash() {
+        return hash;
+    }
 
-  public long getParentHash() {
-    return parentHash;
-  }
+    public long getParentHash() {
+        return parentHash;
+    }
 
-  public long getTimestampNanos() {
-    return timestampNanos;
-  }
+    public long getTimestampNanos() {
+        return timestampNanos;
+    }
 
-  public long getPathwayLatencyNano() {
-    return pathwayLatencyNano;
-  }
+    public long getPathwayLatencyNano() {
+        return pathwayLatencyNano;
+    }
 
-  public long getEdgeLatencyNano() {
-    return edgeLatencyNano;
-  }
+    public long getEdgeLatencyNano() {
+        return edgeLatencyNano;
+    }
 
-  public long getPayloadSizeBytes() {
-    return payloadSizeBytes;
-  }
+    public long getPayloadSizeBytes() {
+        return payloadSizeBytes;
+    }
 
-  public long getAggregationHash() {
-    return aggregationHash;
-  }
+    public long getAggregationHash() {
+        return aggregationHash;
+    }
 
-  public String getServiceNameOverride() {
-    return serviceNameOverride;
-  }
+    public String getServiceNameOverride() {
+        return serviceNameOverride;
+    }
 
-  @Override
-  public String toString() {
-    return "StatsPoint{"
-        + "tags='"
-        + tags
-        + '\''
-        + ", hash="
-        + hash
-        + ", parentHash="
-        + parentHash
-        + ", aggregationHash="
-        + aggregationHash
-        + ", timestampNanos="
-        + timestampNanos
-        + ", pathwayLatencyNano="
-        + pathwayLatencyNano
-        + ", edgeLatencyNano="
-        + edgeLatencyNano
-        + ", payloadSizeBytes="
-        + payloadSizeBytes
-        + '}';
-  }
+    @Override
+    public String toString() {
+        return "StatsPoint{"
+                + "tags='"
+                + tags
+                + '\''
+                + ", hash="
+                + hash
+                + ", parentHash="
+                + parentHash
+                + ", aggregationHash="
+                + aggregationHash
+                + ", timestampNanos="
+                + timestampNanos
+                + ", pathwayLatencyNano="
+                + pathwayLatencyNano
+                + ", edgeLatencyNano="
+                + edgeLatencyNano
+                + ", payloadSizeBytes="
+                + payloadSizeBytes
+                + '}';
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/datastreams/TransactionInfo.java b/internal-api/src/main/java/datadog/trace/api/datastreams/TransactionInfo.java
index b4755d58342..f2aa568b52d 100644
--- a/internal-api/src/main/java/datadog/trace/api/datastreams/TransactionInfo.java
+++ b/internal-api/src/main/java/datadog/trace/api/datastreams/TransactionInfo.java
@@ -9,80 +9,80 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 public final class TransactionInfo implements InboxItem {
-  private static final int MAX_ID_SIZE = 256;
-  private static final Map<String, Integer> CACHE = new ConcurrentHashMap<>();
-  private static volatile byte[] CACHE_BYTES = new byte[0];
-  private static final AtomicInteger ID_COUNTER = new AtomicInteger(1);
-
-  private final String id;
-  private final long timestamp;
-  private final int checkpointId;
-
-  public TransactionInfo(String id, long timestamp, String checkpoint) {
-    this.id = id;
-    this.timestamp = timestamp;
-    this.checkpointId = CACHE.computeIfAbsent(checkpoint, k -> generateCheckpointId(checkpoint));
-  }
-
-  public String getId() {
-    return id;
-  }
-
-  public long getTimestamp() {
-    return timestamp;
-  }
-
-  public int getCheckpointId() {
-    return checkpointId;
-  }
-
-  private int generateCheckpointId(String checkpoint) {
-    int id = ID_COUNTER.getAndIncrement();
-
-    // update cache bytes
-    byte[] checkpointBytes = checkpoint.getBytes(StandardCharsets.UTF_8);
-    byte[] bytesToAdd = new byte[checkpointBytes.length + 2];
-    bytesToAdd[0] = (byte) id;
-    bytesToAdd[1] = (byte) checkpointBytes.length;
-    System.arraycopy(checkpointBytes, 0, bytesToAdd, 2, checkpointBytes.length);
-    appendCacheBytes(bytesToAdd);
-
-    return id;
-  }
-
-  private static synchronized void appendCacheBytes(byte[] bytes) {
-    byte[] newCacheBytes = new byte[CACHE_BYTES.length + bytes.length];
-    System.arraycopy(CACHE_BYTES, 0, newCacheBytes, 0, CACHE_BYTES.length);
-    System.arraycopy(bytes, 0, newCacheBytes, CACHE_BYTES.length, bytes.length);
-    CACHE_BYTES = newCacheBytes;
-  }
-
-  public byte[] getBytes() {
-    byte[] idBytes = id.getBytes(StandardCharsets.UTF_8);
-
-    // long ids will be truncated
-    int idLen = Math.min(idBytes.length, MAX_ID_SIZE);
-    ByteBuffer buffer = ByteBuffer.allocate(1 + Long.BYTES + 1 + idLen).order(ByteOrder.BIG_ENDIAN);
-
-    buffer.put((byte) checkpointId);
-    buffer.putLong(timestamp);
-    buffer.put((byte) idLen);
-    buffer.put(idBytes, 0, idLen);
-
-    return buffer.array();
-  }
-
-  @VisibleForTesting
-  static synchronized void resetCache() {
-    CACHE.clear();
-    CACHE_BYTES = new byte[0];
-    ID_COUNTER.set(1);
-  }
-
-  public static byte[] getCheckpointIdCacheBytes() {
-    // CACHE_BYTES are never modified outside of this class, so it's safe to pass the
-    // value directly without cloning
-    // no-dd-sa:java-best-practices/return-internal-array
-    return CACHE_BYTES;
-  }
+    private static final int MAX_ID_SIZE = 256;
+    private static final Map<String, Integer> CACHE = new ConcurrentHashMap<>();
+    private static volatile byte[] CACHE_BYTES = new byte[0];
+    private static final AtomicInteger ID_COUNTER = new AtomicInteger(1);
+
+    private final String id;
+    private final long timestamp;
+    private final int checkpointId;
+
+    public TransactionInfo(String id, long timestamp, String checkpoint) {
+        this.id = id;
+        this.timestamp = timestamp;
+        this.checkpointId = CACHE.computeIfAbsent(checkpoint, k -> generateCheckpointId(checkpoint));
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public int getCheckpointId() {
+        return checkpointId;
+    }
+
+    private int generateCheckpointId(String checkpoint) {
+        int id = ID_COUNTER.getAndIncrement();
+
+        // update cache bytes
+        byte[] checkpointBytes = checkpoint.getBytes(StandardCharsets.UTF_8);
+        byte[] bytesToAdd = new byte[checkpointBytes.length + 2];
+        bytesToAdd[0] = (byte) id;
+        bytesToAdd[1] = (byte) checkpointBytes.length;
+        System.arraycopy(checkpointBytes, 0, bytesToAdd, 2, checkpointBytes.length);
+        appendCacheBytes(bytesToAdd);
+
+        return id;
+    }
+
+    private static synchronized void appendCacheBytes(byte[] bytes) {
+        byte[] newCacheBytes = new byte[CACHE_BYTES.length + bytes.length];
+        System.arraycopy(CACHE_BYTES, 0, newCacheBytes, 0, CACHE_BYTES.length);
+        System.arraycopy(bytes, 0, newCacheBytes, CACHE_BYTES.length, bytes.length);
+        CACHE_BYTES = newCacheBytes;
+    }
+
+    public byte[] getBytes() {
+        byte[] idBytes = id.getBytes(StandardCharsets.UTF_8);
+
+        // long ids will be truncated
+        int idLen = Math.min(idBytes.length, MAX_ID_SIZE);
+        ByteBuffer buffer = ByteBuffer.allocate(1 + Long.BYTES + 1 + idLen).order(ByteOrder.BIG_ENDIAN);
+
+        buffer.put((byte) checkpointId);
+        buffer.putLong(timestamp);
+        buffer.put((byte) idLen);
+        buffer.put(idBytes, 0, idLen);
+
+        return buffer.array();
+    }
+
+    @VisibleForTesting
+    static synchronized void resetCache() {
+        CACHE.clear();
+        CACHE_BYTES = new byte[0];
+        ID_COUNTER.set(1);
+    }
+
+    public static byte[] getCheckpointIdCacheBytes() {
+        // CACHE_BYTES are never modified outside of this class, so it's safe to pass the
+        // value directly without cloning
+        // no-dd-sa:java-best-practices/return-internal-array
+        return CACHE_BYTES;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/debugger/DebuggerConfigBridge.java b/internal-api/src/main/java/datadog/trace/api/debugger/DebuggerConfigBridge.java
index 12e3a86cf86..63bab9be2b0 100644
--- a/internal-api/src/main/java/datadog/trace/api/debugger/DebuggerConfigBridge.java
+++ b/internal-api/src/main/java/datadog/trace/api/debugger/DebuggerConfigBridge.java
@@ -7,75 +7,75 @@
 import org.slf4j.LoggerFactory;
 
 public final class DebuggerConfigBridge {
-  private static final Logger LOGGER = LoggerFactory.getLogger(DebuggerConfigBridge.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DebuggerConfigBridge.class);
 
-  private static DebuggerConfigUpdate DEFERRED_UPDATE;
-  private static volatile DebuggerConfigUpdater UPDATER;
+    private static DebuggerConfigUpdate DEFERRED_UPDATE;
+    private static volatile DebuggerConfigUpdater UPDATER;
 
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification = "Agent-internal static holder; class lock guards private static fields")
-  public static synchronized void updateConfig(DebuggerConfigUpdate update) {
-    if (!update.hasUpdates()) {
-      LOGGER.debug("No config update detected, skipping");
-      return;
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Agent-internal static holder; class lock guards private static fields")
+    public static synchronized void updateConfig(DebuggerConfigUpdate update) {
+        if (!update.hasUpdates()) {
+            LOGGER.debug("No config update detected, skipping");
+            return;
+        }
+        if (UPDATER != null) {
+            LOGGER.debug("DebuggerConfigUpdater available, performing update: {}", update);
+            UPDATER.updateConfig(update);
+        } else {
+            LOGGER.debug("DebuggerConfigUpdater not available, deferring update");
+            DEFERRED_UPDATE = DebuggerConfigUpdate.coalesce(DEFERRED_UPDATE, update);
+        }
     }
-    if (UPDATER != null) {
-      LOGGER.debug("DebuggerConfigUpdater available, performing update: {}", update);
-      UPDATER.updateConfig(update);
-    } else {
-      LOGGER.debug("DebuggerConfigUpdater not available, deferring update");
-      DEFERRED_UPDATE = DebuggerConfigUpdate.coalesce(DEFERRED_UPDATE, update);
-    }
-  }
 
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification = "Agent-internal static holder; class lock guards private static fields")
-  public static synchronized void setUpdater(@Nonnull DebuggerConfigUpdater updater) {
-    UPDATER = updater;
-    if (DEFERRED_UPDATE != null && DEFERRED_UPDATE.hasUpdates()) {
-      LOGGER.debug("Processing deferred update {}", DEFERRED_UPDATE);
-      updater.updateConfig(DEFERRED_UPDATE);
-      DEFERRED_UPDATE = null;
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Agent-internal static holder; class lock guards private static fields")
+    public static synchronized void setUpdater(@Nonnull DebuggerConfigUpdater updater) {
+        UPDATER = updater;
+        if (DEFERRED_UPDATE != null && DEFERRED_UPDATE.hasUpdates()) {
+            LOGGER.debug("Processing deferred update {}", DEFERRED_UPDATE);
+            updater.updateConfig(DEFERRED_UPDATE);
+            DEFERRED_UPDATE = null;
+        }
     }
-  }
 
-  // for testing purposes
-  static synchronized void reset() {
-    UPDATER = null;
-    DEFERRED_UPDATE = null;
-  }
+    // for testing purposes
+    static synchronized void reset() {
+        UPDATER = null;
+        DEFERRED_UPDATE = null;
+    }
 
-  public static boolean isDynamicInstrumentationEnabled() {
-    DebuggerConfigUpdater updater = UPDATER;
-    if (updater != null) {
-      return updater.isDynamicInstrumentationEnabled();
+    public static boolean isDynamicInstrumentationEnabled() {
+        DebuggerConfigUpdater updater = UPDATER;
+        if (updater != null) {
+            return updater.isDynamicInstrumentationEnabled();
+        }
+        return Config.get().isDynamicInstrumentationEnabled();
     }
-    return Config.get().isDynamicInstrumentationEnabled();
-  }
 
-  public static boolean isExceptionReplayEnabled() {
-    DebuggerConfigUpdater updater = UPDATER;
-    if (updater != null) {
-      return updater.isExceptionReplayEnabled();
+    public static boolean isExceptionReplayEnabled() {
+        DebuggerConfigUpdater updater = UPDATER;
+        if (updater != null) {
+            return updater.isExceptionReplayEnabled();
+        }
+        return Config.get().isDebuggerExceptionEnabled();
     }
-    return Config.get().isDebuggerExceptionEnabled();
-  }
 
-  public static boolean isCodeOriginEnabled() {
-    DebuggerConfigUpdater updater = UPDATER;
-    if (updater != null) {
-      return updater.isCodeOriginEnabled();
+    public static boolean isCodeOriginEnabled() {
+        DebuggerConfigUpdater updater = UPDATER;
+        if (updater != null) {
+            return updater.isCodeOriginEnabled();
+        }
+        return Config.get().isDebuggerCodeOriginEnabled();
     }
-    return Config.get().isDebuggerCodeOriginEnabled();
-  }
 
-  public static boolean isDistributedDebuggerEnabled() {
-    DebuggerConfigUpdater updater = UPDATER;
-    if (updater != null) {
-      return updater.isDistributedDebuggerEnabled();
+    public static boolean isDistributedDebuggerEnabled() {
+        DebuggerConfigUpdater updater = UPDATER;
+        if (updater != null) {
+            return updater.isDistributedDebuggerEnabled();
+        }
+        return Config.get().isDistributedDebuggerEnabled();
     }
-    return Config.get().isDistributedDebuggerEnabled();
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/debugger/DebuggerConfigUpdate.java b/internal-api/src/main/java/datadog/trace/api/debugger/DebuggerConfigUpdate.java
index 2e4f340d442..0b816f442d8 100644
--- a/internal-api/src/main/java/datadog/trace/api/debugger/DebuggerConfigUpdate.java
+++ b/internal-api/src/main/java/datadog/trace/api/debugger/DebuggerConfigUpdate.java
@@ -1,78 +1,76 @@
 package datadog.trace.api.debugger;
 
 public class DebuggerConfigUpdate {
-  private final Boolean dynamicInstrumentationEnabled;
-  private final Boolean exceptionReplayEnabled;
-  private final Boolean codeOriginEnabled;
-  private final Boolean distributedDebuggerEnabled;
+    private final Boolean dynamicInstrumentationEnabled;
+    private final Boolean exceptionReplayEnabled;
+    private final Boolean codeOriginEnabled;
+    private final Boolean distributedDebuggerEnabled;
 
-  public DebuggerConfigUpdate() {
-    this(null, null, null, null);
-  }
-
-  public DebuggerConfigUpdate(
-      Boolean dynamicInstrumentationEnabled,
-      Boolean exceptionReplayEnabled,
-      Boolean codeOriginEnabled,
-      Boolean distributedDebuggerEnabled) {
-    this.dynamicInstrumentationEnabled = dynamicInstrumentationEnabled;
-    this.exceptionReplayEnabled = exceptionReplayEnabled;
-    this.codeOriginEnabled = codeOriginEnabled;
-    this.distributedDebuggerEnabled = distributedDebuggerEnabled;
-  }
+    public DebuggerConfigUpdate() {
+        this(null, null, null, null);
+    }
 
-  public Boolean getDynamicInstrumentationEnabled() {
-    return dynamicInstrumentationEnabled;
-  }
+    public DebuggerConfigUpdate(
+            Boolean dynamicInstrumentationEnabled,
+            Boolean exceptionReplayEnabled,
+            Boolean codeOriginEnabled,
+            Boolean distributedDebuggerEnabled) {
+        this.dynamicInstrumentationEnabled = dynamicInstrumentationEnabled;
+        this.exceptionReplayEnabled = exceptionReplayEnabled;
+        this.codeOriginEnabled = codeOriginEnabled;
+        this.distributedDebuggerEnabled = distributedDebuggerEnabled;
+    }
 
-  public Boolean getExceptionReplayEnabled() {
-    return exceptionReplayEnabled;
-  }
+    public Boolean getDynamicInstrumentationEnabled() {
+        return dynamicInstrumentationEnabled;
+    }
 
-  public Boolean getCodeOriginEnabled() {
-    return codeOriginEnabled;
-  }
+    public Boolean getExceptionReplayEnabled() {
+        return exceptionReplayEnabled;
+    }
 
-  public Boolean getDistributedDebuggerEnabled() {
-    return distributedDebuggerEnabled;
-  }
+    public Boolean getCodeOriginEnabled() {
+        return codeOriginEnabled;
+    }
 
-  @Override
-  public String toString() {
-    return "DebuggerConfigUpdate{"
-        + "dynamicInstrumentationEnabled="
-        + dynamicInstrumentationEnabled
-        + ", exceptionReplayEnabled="
-        + exceptionReplayEnabled
-        + ", codeOriginEnabled="
-        + codeOriginEnabled
-        + ", distributedDebuggerEnabled="
-        + distributedDebuggerEnabled
-        + '}';
-  }
+    public Boolean getDistributedDebuggerEnabled() {
+        return distributedDebuggerEnabled;
+    }
 
-  public boolean hasUpdates() {
-    return dynamicInstrumentationEnabled != null
-        || exceptionReplayEnabled != null
-        || codeOriginEnabled != null
-        || distributedDebuggerEnabled != null;
-  }
+    @Override
+    public String toString() {
+        return "DebuggerConfigUpdate{"
+                + "dynamicInstrumentationEnabled="
+                + dynamicInstrumentationEnabled
+                + ", exceptionReplayEnabled="
+                + exceptionReplayEnabled
+                + ", codeOriginEnabled="
+                + codeOriginEnabled
+                + ", distributedDebuggerEnabled="
+                + distributedDebuggerEnabled
+                + '}';
+    }
 
-  public static DebuggerConfigUpdate coalesce(
-      DebuggerConfigUpdate existing, DebuggerConfigUpdate update) {
-    if (existing == null) {
-      return update;
+    public boolean hasUpdates() {
+        return dynamicInstrumentationEnabled != null
+                || exceptionReplayEnabled != null
+                || codeOriginEnabled != null
+                || distributedDebuggerEnabled != null;
     }
 
-    return new DebuggerConfigUpdate(
-        coalesceSetting(
-            existing.dynamicInstrumentationEnabled, update.dynamicInstrumentationEnabled),
-        coalesceSetting(existing.exceptionReplayEnabled, update.exceptionReplayEnabled),
-        coalesceSetting(existing.codeOriginEnabled, update.codeOriginEnabled),
-        coalesceSetting(existing.distributedDebuggerEnabled, update.distributedDebuggerEnabled));
-  }
+    public static DebuggerConfigUpdate coalesce(DebuggerConfigUpdate existing, DebuggerConfigUpdate update) {
+        if (existing == null) {
+            return update;
+        }
 
-  private static Boolean coalesceSetting(Boolean existing, Boolean update) {
-    return update != null ? update : existing;
-  }
+        return new DebuggerConfigUpdate(
+                coalesceSetting(existing.dynamicInstrumentationEnabled, update.dynamicInstrumentationEnabled),
+                coalesceSetting(existing.exceptionReplayEnabled, update.exceptionReplayEnabled),
+                coalesceSetting(existing.codeOriginEnabled, update.codeOriginEnabled),
+                coalesceSetting(existing.distributedDebuggerEnabled, update.distributedDebuggerEnabled));
+    }
+
+    private static Boolean coalesceSetting(Boolean existing, Boolean update) {
+        return update != null ? update : existing;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/debugger/DebuggerConfigUpdater.java b/internal-api/src/main/java/datadog/trace/api/debugger/DebuggerConfigUpdater.java
index beddc55fe4e..5985090210a 100644
--- a/internal-api/src/main/java/datadog/trace/api/debugger/DebuggerConfigUpdater.java
+++ b/internal-api/src/main/java/datadog/trace/api/debugger/DebuggerConfigUpdater.java
@@ -1,13 +1,13 @@
 package datadog.trace.api.debugger;
 
 public interface DebuggerConfigUpdater {
-  void updateConfig(DebuggerConfigUpdate update);
+    void updateConfig(DebuggerConfigUpdate update);
 
-  boolean isDynamicInstrumentationEnabled();
+    boolean isDynamicInstrumentationEnabled();
 
-  boolean isExceptionReplayEnabled();
+    boolean isExceptionReplayEnabled();
 
-  boolean isCodeOriginEnabled();
+    boolean isCodeOriginEnabled();
 
-  boolean isDistributedDebuggerEnabled();
+    boolean isDistributedDebuggerEnabled();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/debugger/DebuggerMetricCollector.java b/internal-api/src/main/java/datadog/trace/api/debugger/DebuggerMetricCollector.java
index 2f44eb5ea38..942b4977fcb 100644
--- a/internal-api/src/main/java/datadog/trace/api/debugger/DebuggerMetricCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/debugger/DebuggerMetricCollector.java
@@ -9,102 +9,97 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.atomic.AtomicLongArray;
 
-public class DebuggerMetricCollector
-    implements MetricCollector<DebuggerMetricCollector.DebuggerMetric> {
-  private static final DebuggerMetricCollector INSTANCE = new DebuggerMetricCollector();
+public class DebuggerMetricCollector implements MetricCollector<DebuggerMetricCollector.DebuggerMetric> {
+    private static final DebuggerMetricCollector INSTANCE = new DebuggerMetricCollector();
 
-  interface Reason {
-    String getTag();
-  }
+    interface Reason {
+        String getTag();
+    }
+
+    public enum DroppedReason implements Reason {
+        QUEUE_FULL("reason:queueFull"),
+        PAYLOAD_TOO_LARGE("reason:payloadTooLarge"),
+        ;
 
-  public enum DroppedReason implements Reason {
-    QUEUE_FULL("reason:queueFull"),
-    PAYLOAD_TOO_LARGE("reason:payloadTooLarge"),
-    ;
+        private final String tag;
 
-    private final String tag;
+        DroppedReason(String tag) {
+            this.tag = tag;
+        }
 
-    DroppedReason(String tag) {
-      this.tag = tag;
+        @Override
+        public String getTag() {
+            return tag;
+        }
     }
 
-    @Override
-    public String getTag() {
-      return tag;
+    public enum SkippedReason implements Reason {
+        RATE_LIMIT("reason:rateLimitProbe"),
+        EVALUATION_TIME_OUT("reason:evaluationTimeOut"),
+        ;
+
+        private final String tag;
+
+        SkippedReason(String tag) {
+            this.tag = tag;
+        }
+
+        @Override
+        public String getTag() {
+            return tag;
+        }
     }
-  }
 
-  public enum SkippedReason implements Reason {
-    RATE_LIMIT("reason:rateLimitProbe"),
-    EVALUATION_TIME_OUT("reason:evaluationTimeOut"),
-    ;
+    private final BlockingQueue<DebuggerMetric> metricsQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
+    private final AtomicLongArray eventDroppedCounters = new AtomicLongArray(DroppedReason.values().length);
+    private final AtomicLongArray eventSkippedCounters = new AtomicLongArray(SkippedReason.values().length);
 
-    private final String tag;
+    public static DebuggerMetricCollector get() {
+        return INSTANCE;
+    }
+
+    private DebuggerMetricCollector() {}
+
+    public void recordEventDropped(DroppedReason reason) {
+        eventDroppedCounters.incrementAndGet(reason.ordinal());
+    }
 
-    SkippedReason(String tag) {
-      this.tag = tag;
+    public void recordEventSkipped(SkippedReason reason) {
+        eventSkippedCounters.incrementAndGet(reason.ordinal());
     }
 
     @Override
-    public String getTag() {
-      return tag;
+    public void prepareMetrics() {
+        addCounterMetric(eventDroppedCounters, "events.dropped", DroppedReason.values());
+        addCounterMetric(eventSkippedCounters, "events.skipped", SkippedReason.values());
     }
-  }
-
-  private final BlockingQueue<DebuggerMetric> metricsQueue =
-      new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
-  private final AtomicLongArray eventDroppedCounters =
-      new AtomicLongArray(DroppedReason.values().length);
-  private final AtomicLongArray eventSkippedCounters =
-      new AtomicLongArray(SkippedReason.values().length);
-
-  public static DebuggerMetricCollector get() {
-    return INSTANCE;
-  }
-
-  private DebuggerMetricCollector() {}
-
-  public void recordEventDropped(DroppedReason reason) {
-    eventDroppedCounters.incrementAndGet(reason.ordinal());
-  }
-
-  public void recordEventSkipped(SkippedReason reason) {
-    eventSkippedCounters.incrementAndGet(reason.ordinal());
-  }
-
-  @Override
-  public void prepareMetrics() {
-    addCounterMetric(eventDroppedCounters, "events.dropped", DroppedReason.values());
-    addCounterMetric(eventSkippedCounters, "events.skipped", SkippedReason.values());
-  }
-
-  private <E extends Enum<E> & Reason> void addCounterMetric(
-      AtomicLongArray counters, String name, E[] enumValues) {
-    for (E enumValue : enumValues) {
-      // get and reset
-      long value = counters.getAndSet(enumValue.ordinal(), 0);
-      if (value > 0) {
-        metricsQueue.offer(new DebuggerMetric(name, value, enumValue.getTag()));
-      }
+
+    private <E extends Enum<E> & Reason> void addCounterMetric(AtomicLongArray counters, String name, E[] enumValues) {
+        for (E enumValue : enumValues) {
+            // get and reset
+            long value = counters.getAndSet(enumValue.ordinal(), 0);
+            if (value > 0) {
+                metricsQueue.offer(new DebuggerMetric(name, value, enumValue.getTag()));
+            }
+        }
     }
-  }
 
-  @Override
-  public Collection<DebuggerMetric> drain() {
-    if (metricsQueue.isEmpty()) {
-      return Collections.emptyList();
+    @Override
+    public Collection<DebuggerMetric> drain() {
+        if (metricsQueue.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<DebuggerMetric> metrics = new ArrayList<>();
+        metricsQueue.drainTo(metrics);
+        return metrics;
     }
-    List<DebuggerMetric> metrics = new ArrayList<>();
-    metricsQueue.drainTo(metrics);
-    return metrics;
-  }
 
-  public static class DebuggerMetric extends MetricCollector.Metric {
+    public static class DebuggerMetric extends MetricCollector.Metric {
 
-    private static final String NAMESPACE = "live_debugger";
+        private static final String NAMESPACE = "live_debugger";
 
-    public DebuggerMetric(String metricName, long value, String... tags) {
-      super(NAMESPACE, true, metricName, "count", value, tags);
+        public DebuggerMetric(String metricName, long value, String... tags) {
+            super(NAMESPACE, true, metricName, "count", value, tags);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/endpoint/EndpointResolver.java b/internal-api/src/main/java/datadog/trace/api/endpoint/EndpointResolver.java
index c5e47328734..174f7453660 100644
--- a/internal-api/src/main/java/datadog/trace/api/endpoint/EndpointResolver.java
+++ b/internal-api/src/main/java/datadog/trace/api/endpoint/EndpointResolver.java
@@ -14,129 +14,127 @@
  * renaming, including route eligibility checks and endpoint computation.
  */
 public class EndpointResolver {
-  private static final Logger log = LoggerFactory.getLogger(EndpointResolver.class);
-
-  private final boolean enabled;
-  private final boolean alwaysSimplifiedEndpoint;
-
-  /**
-   * Creates a new EndpointResolver with the given configuration.
-   *
-   * @param enabled whether endpoint inference is enabled
-   * @param alwaysSimplifiedEndpoint whether to always compute endpoint even when route exists
-   */
-  public EndpointResolver(boolean enabled, boolean alwaysSimplifiedEndpoint) {
-    this.enabled = enabled;
-    this.alwaysSimplifiedEndpoint = alwaysSimplifiedEndpoint;
-  }
-
-  /**
-   * Resolves the endpoint for a span and optionally tags it with http.endpoint.
-   *
-   * <p>Resolution logic:
-   *
-   * <ol>
-   *   <li>If disabled, return null
-   *   <li>If alwaysSimplifiedEndpoint=true, compute from URL and tag span
-   *   <li>If http.route exists and is eligible, use it (no tagging)
-   *   <li>Otherwise, compute from URL and tag span with http.endpoint
-   * </ol>
-   *
-   * @param unsafeTags unsafe tag map. Using at this point, when the span is finished and there
-   *     should not be anymore external interaction, should be considered safe
-   * @param httpRoute the http.route tag value (may be null)
-   * @param httpUrl the http.url tag value (may be null)
-   * @return the resolved endpoint, or null if resolution fails
-   */
-  @Nullable
-  public String resolveEndpoint(
-      java.util.Map<String, Object> unsafeTags,
-      @Nullable String httpRoute,
-      @Nullable String httpUrl) {
-    if (!enabled) {
-      return null;
+    private static final Logger log = LoggerFactory.getLogger(EndpointResolver.class);
+
+    private final boolean enabled;
+    private final boolean alwaysSimplifiedEndpoint;
+
+    /**
+     * Creates a new EndpointResolver with the given configuration.
+     *
+     * @param enabled whether endpoint inference is enabled
+     * @param alwaysSimplifiedEndpoint whether to always compute endpoint even when route exists
+     */
+    public EndpointResolver(boolean enabled, boolean alwaysSimplifiedEndpoint) {
+        this.enabled = enabled;
+        this.alwaysSimplifiedEndpoint = alwaysSimplifiedEndpoint;
     }
 
-    // If alwaysSimplifiedEndpoint is set, always compute and tag
-    if (alwaysSimplifiedEndpoint) {
-      String endpoint = computeEndpoint(httpUrl);
-      if (endpoint != null) {
-        unsafeTags.put(HTTP_ENDPOINT, endpoint);
-      }
-      return endpoint;
+    /**
+     * Resolves the endpoint for a span and optionally tags it with http.endpoint.
+     *
+     * <p>Resolution logic:
+     *
+     * <ol>
+     *   <li>If disabled, return null
+     *   <li>If alwaysSimplifiedEndpoint=true, compute from URL and tag span
+     *   <li>If http.route exists and is eligible, use it (no tagging)
+     *   <li>Otherwise, compute from URL and tag span with http.endpoint
+     * </ol>
+     *
+     * @param unsafeTags unsafe tag map. Using at this point, when the span is finished and there
+     *     should not be anymore external interaction, should be considered safe
+     * @param httpRoute the http.route tag value (may be null)
+     * @param httpUrl the http.url tag value (may be null)
+     * @return the resolved endpoint, or null if resolution fails
+     */
+    @Nullable
+    public String resolveEndpoint(
+            java.util.Map<String, Object> unsafeTags, @Nullable String httpRoute, @Nullable String httpUrl) {
+        if (!enabled) {
+            return null;
+        }
+
+        // If alwaysSimplifiedEndpoint is set, always compute and tag
+        if (alwaysSimplifiedEndpoint) {
+            String endpoint = computeEndpoint(httpUrl);
+            if (endpoint != null) {
+                unsafeTags.put(HTTP_ENDPOINT, endpoint);
+            }
+            return endpoint;
+        }
+
+        // If route exists and is eligible, use it
+        if (isRouteEligible(httpRoute)) {
+            return httpRoute;
+        }
+
+        // Compute endpoint from URL and tag the span
+        String endpoint = computeEndpoint(httpUrl);
+        if (endpoint != null) {
+            unsafeTags.put(HTTP_ENDPOINT, endpoint);
+        }
+        return endpoint;
     }
 
-    // If route exists and is eligible, use it
-    if (isRouteEligible(httpRoute)) {
-      return httpRoute;
+    /**
+     * Determines if an http.route is eligible for use as an endpoint.
+     *
+     * <p>A route is NOT eligible if it is null, empty, or a catch-all wildcard pattern. Catch-all
+     * patterns (single or double wildcards) indicate instrumentation problems rather than actual
+     * routes. Regex fallback patterns are considered eligible.
+     *
+     * @param route the http.route value to check
+     * @return true if the route can be used as an endpoint
+     */
+    public static boolean isRouteEligible(@Nullable String route) {
+        if (route == null || route.isEmpty()) {
+            return false;
+        }
+
+        // Discard catch-all routes that indicate instrumentation problems
+        if ("*".equals(route) || "*/*".equals(route)) {
+            return false;
+        }
+
+        return true;
     }
 
-    // Compute endpoint from URL and tag the span
-    String endpoint = computeEndpoint(httpUrl);
-    if (endpoint != null) {
-      unsafeTags.put(HTTP_ENDPOINT, endpoint);
-    }
-    return endpoint;
-  }
-
-  /**
-   * Determines if an http.route is eligible for use as an endpoint.
-   *
-   * <p>A route is NOT eligible if it is null, empty, or a catch-all wildcard pattern. Catch-all
-   * patterns (single or double wildcards) indicate instrumentation problems rather than actual
-   * routes. Regex fallback patterns are considered eligible.
-   *
-   * @param route the http.route value to check
-   * @return true if the route can be used as an endpoint
-   */
-  public static boolean isRouteEligible(@Nullable String route) {
-    if (route == null || route.isEmpty()) {
-      return false;
-    }
-
-    // Discard catch-all routes that indicate instrumentation problems
-    if ("*".equals(route) || "*/*".equals(route)) {
-      return false;
+    /**
+     * Computes an endpoint from a URL using the simplification algorithm.
+     *
+     * @param url the http.url tag value
+     * @return the computed endpoint, or null if URL is null/empty
+     */
+    @Nullable
+    public static String computeEndpoint(@Nullable String url) {
+        if (url == null || url.isEmpty()) {
+            return null;
+        }
+
+        try {
+            return EndpointSimplifier.simplifyUrl(url);
+        } catch (Exception e) {
+            log.debug("Failed to compute endpoint from URL: {}", url, e);
+            return null;
+        }
     }
 
-    return true;
-  }
-
-  /**
-   * Computes an endpoint from a URL using the simplification algorithm.
-   *
-   * @param url the http.url tag value
-   * @return the computed endpoint, or null if URL is null/empty
-   */
-  @Nullable
-  public static String computeEndpoint(@Nullable String url) {
-    if (url == null || url.isEmpty()) {
-      return null;
+    /**
+     * Returns whether endpoint inference is enabled.
+     *
+     * @return true if enabled
+     */
+    public boolean isEnabled() {
+        return enabled;
     }
 
-    try {
-      return EndpointSimplifier.simplifyUrl(url);
-    } catch (Exception e) {
-      log.debug("Failed to compute endpoint from URL: {}", url, e);
-      return null;
+    /**
+     * Returns whether simplified endpoint computation is always used.
+     *
+     * @return true if alwaysSimplifiedEndpoint is set
+     */
+    public boolean isAlwaysSimplifiedEndpoint() {
+        return alwaysSimplifiedEndpoint;
     }
-  }
-
-  /**
-   * Returns whether endpoint inference is enabled.
-   *
-   * @return true if enabled
-   */
-  public boolean isEnabled() {
-    return enabled;
-  }
-
-  /**
-   * Returns whether simplified endpoint computation is always used.
-   *
-   * @return true if alwaysSimplifiedEndpoint is set
-   */
-  public boolean isAlwaysSimplifiedEndpoint() {
-    return alwaysSimplifiedEndpoint;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/endpoint/EndpointSimplifier.java b/internal-api/src/main/java/datadog/trace/api/endpoint/EndpointSimplifier.java
index 7f3f1bd79fa..a0ccfcfcd8e 100644
--- a/internal-api/src/main/java/datadog/trace/api/endpoint/EndpointSimplifier.java
+++ b/internal-api/src/main/java/datadog/trace/api/endpoint/EndpointSimplifier.java
@@ -22,168 +22,168 @@
  * </pre>
  */
 public class EndpointSimplifier {
-  private static final Logger log = LoggerFactory.getLogger(EndpointSimplifier.class);
-
-  /**
-   * Regex to extract path from URL. Captures the path component between optional scheme+host and
-   * optional query string. Group "path" contains the extracted path.
-   */
-  private static final Pattern URL_PATH_PATTERN =
-      Pattern.compile("^(?:[a-z]+://(?:[^?/]+))?(?<path>/[^?]*)(?:(\\?).*)?$");
-
-  /**
-   * Maximum number of path segments to keep after simplification. Prevents cardinality explosion
-   * from very deep URLs.
-   */
-  private static final int MAX_SEGMENTS = 8;
-
-  /** Default endpoint when path is empty or cannot be processed. */
-  private static final String DEFAULT_ENDPOINT = "/";
-
-  /**
-   * Simplifies a full URL to an inferred endpoint.
-   *
-   * <p>Process:
-   *
-   * <ol>
-   *   <li>Extract path from URL
-   *   <li>Split path into segments
-   *   <li>Keep only first 8 non-empty segments
-   *   <li>Simplify each segment using pattern matching
-   *   <li>Reconstruct path with simplified segments
-   * </ol>
-   *
-   * @param url the full URL (e.g., "https://example.com/users/123?foo=bar")
-   * @return the simplified endpoint (e.g., "/users/{param:int}")
-   */
-  public static String simplifyUrl(@Nullable String url) {
-    if (url == null || url.isEmpty()) {
-      return DEFAULT_ENDPOINT;
-    }
+    private static final Logger log = LoggerFactory.getLogger(EndpointSimplifier.class);
+
+    /**
+     * Regex to extract path from URL. Captures the path component between optional scheme+host and
+     * optional query string. Group "path" contains the extracted path.
+     */
+    private static final Pattern URL_PATH_PATTERN =
+            Pattern.compile("^(?:[a-z]+://(?:[^?/]+))?(?<path>/[^?]*)(?:(\\?).*)?$");
+
+    /**
+     * Maximum number of path segments to keep after simplification. Prevents cardinality explosion
+     * from very deep URLs.
+     */
+    private static final int MAX_SEGMENTS = 8;
+
+    /** Default endpoint when path is empty or cannot be processed. */
+    private static final String DEFAULT_ENDPOINT = "/";
+
+    /**
+     * Simplifies a full URL to an inferred endpoint.
+     *
+     * <p>Process:
+     *
+     * <ol>
+     *   <li>Extract path from URL
+     *   <li>Split path into segments
+     *   <li>Keep only first 8 non-empty segments
+     *   <li>Simplify each segment using pattern matching
+     *   <li>Reconstruct path with simplified segments
+     * </ol>
+     *
+     * @param url the full URL (e.g., "https://example.com/users/123?foo=bar")
+     * @return the simplified endpoint (e.g., "/users/{param:int}")
+     */
+    public static String simplifyUrl(@Nullable String url) {
+        if (url == null || url.isEmpty()) {
+            return DEFAULT_ENDPOINT;
+        }
 
-    String path = extractPath(url);
-    if (path == null || path.isEmpty()) {
-      return DEFAULT_ENDPOINT;
-    }
+        String path = extractPath(url);
+        if (path == null || path.isEmpty()) {
+            return DEFAULT_ENDPOINT;
+        }
 
-    return simplifyPath(path);
-  }
-
-  /**
-   * Extracts the path component from a URL.
-   *
-   * <p>Handles various URL formats:
-   *
-   * <ul>
-   *   <li>Full URLs: "http://example.com/path" → "/path"
-   *   <li>Path-only: "/path" → "/path"
-   *   <li>With query: "/path?query" → "/path"
-   * </ul>
-   *
-   * @param url the URL to extract from
-   * @return the extracted path, or null if extraction fails
-   */
-  @Nullable
-  static String extractPath(String url) {
-    try {
-      Matcher matcher = URL_PATH_PATTERN.matcher(url);
-      if (matcher.matches()) {
-        return matcher.group("path");
-      }
-    } catch (Exception e) {
-      log.debug("Failed to extract path from URL: {}", url, e);
-    }
-    return null;
-  }
-
-  /**
-   * Simplifies a URL path by replacing segments with patterns.
-   *
-   * <p>Example:
-   *
-   * <pre>
-   *   /users/123/orders/abc-def-456 → /users/{param:int}/orders/{param:hex_id}
-   * </pre>
-   *
-   * @param path the URL path to simplify
-   * @return the simplified path
-   */
-  public static String simplifyPath(String path) {
-    if (path == null || path.isEmpty()) {
-      return DEFAULT_ENDPOINT;
+        return simplifyPath(path);
     }
 
-    // Special case: root path
-    if (path.equals("/")) {
-      return DEFAULT_ENDPOINT;
+    /**
+     * Extracts the path component from a URL.
+     *
+     * <p>Handles various URL formats:
+     *
+     * <ul>
+     *   <li>Full URLs: "http://example.com/path" → "/path"
+     *   <li>Path-only: "/path" → "/path"
+     *   <li>With query: "/path?query" → "/path"
+     * </ul>
+     *
+     * @param url the URL to extract from
+     * @return the extracted path, or null if extraction fails
+     */
+    @Nullable
+    static String extractPath(String url) {
+        try {
+            Matcher matcher = URL_PATH_PATTERN.matcher(url);
+            if (matcher.matches()) {
+                return matcher.group("path");
+            }
+        } catch (Exception e) {
+            log.debug("Failed to extract path from URL: {}", url, e);
+        }
+        return null;
     }
 
-    List<String> segments = splitAndLimitSegments(path, MAX_SEGMENTS);
+    /**
+     * Simplifies a URL path by replacing segments with patterns.
+     *
+     * <p>Example:
+     *
+     * <pre>
+     *   /users/123/orders/abc-def-456 → /users/{param:int}/orders/{param:hex_id}
+     * </pre>
+     *
+     * @param path the URL path to simplify
+     * @return the simplified path
+     */
+    public static String simplifyPath(String path) {
+        if (path == null || path.isEmpty()) {
+            return DEFAULT_ENDPOINT;
+        }
 
-    // If no segments remain after filtering, return root
-    if (segments.isEmpty()) {
-      return DEFAULT_ENDPOINT;
-    }
+        // Special case: root path
+        if (path.equals("/")) {
+            return DEFAULT_ENDPOINT;
+        }
 
-    // Simplify each segment and reconstruct path
-    StringBuilder result = new StringBuilder();
-    for (String segment : segments) {
-      result.append('/');
-      result.append(SegmentPattern.simplify(segment));
-    }
+        List<String> segments = splitAndLimitSegments(path, MAX_SEGMENTS);
+
+        // If no segments remain after filtering, return root
+        if (segments.isEmpty()) {
+            return DEFAULT_ENDPOINT;
+        }
 
-    return result.toString();
-  }
-
-  /**
-   * Splits a path into segments and limits to the first N non-empty segments.
-   *
-   * <p>Example:
-   *
-   * <pre>
-   *   "/users//123/orders" with limit 3 → ["users", "123", "orders"]
-   * </pre>
-   *
-   * @param path the path to split
-   * @param maxSegments maximum number of segments to keep
-   * @return list of non-empty segments (limited)
-   */
-  static List<String> splitAndLimitSegments(String path, int maxSegments) {
-    List<String> segments = new ArrayList<>(maxSegments);
-
-    // Manually split on '/' without regex to avoid forbidden API
-    int start = 0;
-    int length = path.length();
-
-    for (int i = 0; i < length; i++) {
-      if (path.charAt(i) == '/') {
-        if (i > start) {
-          // Found a non-empty segment
-          segments.add(path.substring(start, i));
-          if (segments.size() >= maxSegments) {
-            return segments;
-          }
+        // Simplify each segment and reconstruct path
+        StringBuilder result = new StringBuilder();
+        for (String segment : segments) {
+            result.append('/');
+            result.append(SegmentPattern.simplify(segment));
         }
-        start = i + 1;
-      }
+
+        return result.toString();
     }
 
-    // Add final segment if exists
-    if (start < length) {
-      segments.add(path.substring(start));
+    /**
+     * Splits a path into segments and limits to the first N non-empty segments.
+     *
+     * <p>Example:
+     *
+     * <pre>
+     *   "/users//123/orders" with limit 3 → ["users", "123", "orders"]
+     * </pre>
+     *
+     * @param path the path to split
+     * @param maxSegments maximum number of segments to keep
+     * @return list of non-empty segments (limited)
+     */
+    static List<String> splitAndLimitSegments(String path, int maxSegments) {
+        List<String> segments = new ArrayList<>(maxSegments);
+
+        // Manually split on '/' without regex to avoid forbidden API
+        int start = 0;
+        int length = path.length();
+
+        for (int i = 0; i < length; i++) {
+            if (path.charAt(i) == '/') {
+                if (i > start) {
+                    // Found a non-empty segment
+                    segments.add(path.substring(start, i));
+                    if (segments.size() >= maxSegments) {
+                        return segments;
+                    }
+                }
+                start = i + 1;
+            }
+        }
+
+        // Add final segment if exists
+        if (start < length) {
+            segments.add(path.substring(start));
+        }
+
+        return segments;
     }
 
-    return segments;
-  }
-
-  /**
-   * Simplifies a single path segment using pattern matching. This is a convenience method
-   * delegating to {@link SegmentPattern#simplify(String)}.
-   *
-   * @param segment the segment to simplify
-   * @return the simplified segment
-   */
-  public static String simplifySegment(String segment) {
-    return SegmentPattern.simplify(segment);
-  }
+    /**
+     * Simplifies a single path segment using pattern matching. This is a convenience method
+     * delegating to {@link SegmentPattern#simplify(String)}.
+     *
+     * @param segment the segment to simplify
+     * @return the simplified segment
+     */
+    public static String simplifySegment(String segment) {
+        return SegmentPattern.simplify(segment);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/endpoint/SegmentPattern.java b/internal-api/src/main/java/datadog/trace/api/endpoint/SegmentPattern.java
index 0bdf67d5443..46245baabaf 100644
--- a/internal-api/src/main/java/datadog/trace/api/endpoint/SegmentPattern.java
+++ b/internal-api/src/main/java/datadog/trace/api/endpoint/SegmentPattern.java
@@ -10,81 +10,81 @@
  * <p>Patterns are applied in order, and the first match wins.
  */
 public enum SegmentPattern {
-  /**
-   * Matches integers of size at least 2 digits. Examples: "123", "9876" Replacement: "{param:int}"
-   */
-  INTEGER(Pattern.compile("^[1-9][0-9]+$"), "{param:int}"),
+    /**
+     * Matches integers of size at least 2 digits. Examples: "123", "9876" Replacement: "{param:int}"
+     */
+    INTEGER(Pattern.compile("^[1-9][0-9]+$"), "{param:int}"),
 
-  /**
-   * Matches mixed strings with digits and delimiters (at least 3 chars). Must contain at least one
-   * digit. Examples: "user-123", "order_456", "item.789" Replacement: "{param:int_id}"
-   */
-  INT_ID(Pattern.compile("^(?=.*[0-9].*)[0-9._-]{3,}$"), "{param:int_id}"),
+    /**
+     * Matches mixed strings with digits and delimiters (at least 3 chars). Must contain at least one
+     * digit. Examples: "user-123", "order_456", "item.789" Replacement: "{param:int_id}"
+     */
+    INT_ID(Pattern.compile("^(?=.*[0-9].*)[0-9._-]{3,}$"), "{param:int_id}"),
 
-  /**
-   * Matches hexadecimal strings of size at least 6 chars. Must contain at least one decimal digit
-   * (0-9). Examples: "abc123", "deadbeef", "A1B2C3" Replacement: "{param:hex}"
-   */
-  HEX(Pattern.compile("^(?=.*[0-9].*)[A-Fa-f0-9]{6,}$"), "{param:hex}"),
+    /**
+     * Matches hexadecimal strings of size at least 6 chars. Must contain at least one decimal digit
+     * (0-9). Examples: "abc123", "deadbeef", "A1B2C3" Replacement: "{param:hex}"
+     */
+    HEX(Pattern.compile("^(?=.*[0-9].*)[A-Fa-f0-9]{6,}$"), "{param:hex}"),
 
-  /**
-   * Matches mixed strings with hex digits and delimiters (at least 6 chars). Must contain at least
-   * one decimal digit. Examples: "uuid-abc123", "token_def456" Replacement: "{param:hex_id}"
-   */
-  HEX_ID(Pattern.compile("^(?=.*[0-9].*)[A-Fa-f0-9._-]{6,}$"), "{param:hex_id}"),
+    /**
+     * Matches mixed strings with hex digits and delimiters (at least 6 chars). Must contain at least
+     * one decimal digit. Examples: "uuid-abc123", "token_def456" Replacement: "{param:hex_id}"
+     */
+    HEX_ID(Pattern.compile("^(?=.*[0-9].*)[A-Fa-f0-9._-]{6,}$"), "{param:hex_id}"),
 
-  /**
-   * Matches long strings (20+ chars) or strings with special characters. Special chars: % & ' ( ) *
-   * + , : = @ Examples: "very-long-string-with-many-characters", "param%20value",
-   * "user@example.com" Replacement: "{param:str}"
-   */
-  STRING(Pattern.compile("^(.{20,}|.*[%&'()*+,:=@].*)$"), "{param:str}");
+    /**
+     * Matches long strings (20+ chars) or strings with special characters. Special chars: % & ' ( ) *
+     * + , : = @ Examples: "very-long-string-with-many-characters", "param%20value",
+     * "user@example.com" Replacement: "{param:str}"
+     */
+    STRING(Pattern.compile("^(.{20,}|.*[%&'()*+,:=@].*)$"), "{param:str}");
 
-  private final Pattern pattern;
-  private final String replacement;
+    private final Pattern pattern;
+    private final String replacement;
 
-  SegmentPattern(Pattern pattern, String replacement) {
-    this.pattern = pattern;
-    this.replacement = replacement;
-  }
-
-  /**
-   * Tests if the given segment matches this pattern.
-   *
-   * @param segment the URL path segment to test
-   * @return true if the segment matches this pattern
-   */
-  public boolean matches(String segment) {
-    return pattern.matcher(segment).matches();
-  }
-
-  /**
-   * Gets the replacement string for this pattern.
-   *
-   * @return the replacement placeholder
-   */
-  public String getReplacement() {
-    return replacement;
-  }
+    SegmentPattern(Pattern pattern, String replacement) {
+        this.pattern = pattern;
+        this.replacement = replacement;
+    }
 
-  /**
-   * Attempts to simplify the given segment by matching against all patterns in order. If no pattern
-   * matches, returns the original segment unchanged.
-   *
-   * @param segment the URL path segment to simplify
-   * @return the simplified segment or the original if no pattern matches
-   */
-  public static String simplify(String segment) {
-    if (segment == null || segment.isEmpty()) {
-      return segment;
+    /**
+     * Tests if the given segment matches this pattern.
+     *
+     * @param segment the URL path segment to test
+     * @return true if the segment matches this pattern
+     */
+    public boolean matches(String segment) {
+        return pattern.matcher(segment).matches();
     }
 
-    for (SegmentPattern pattern : values()) {
-      if (pattern.matches(segment)) {
-        return pattern.getReplacement();
-      }
+    /**
+     * Gets the replacement string for this pattern.
+     *
+     * @return the replacement placeholder
+     */
+    public String getReplacement() {
+        return replacement;
     }
 
-    return segment;
-  }
+    /**
+     * Attempts to simplify the given segment by matching against all patterns in order. If no pattern
+     * matches, returns the original segment unchanged.
+     *
+     * @param segment the URL path segment to simplify
+     * @return the simplified segment or the original if no pattern matches
+     */
+    public static String simplify(String segment) {
+        if (segment == null || segment.isEmpty()) {
+            return segment;
+        }
+
+        for (SegmentPattern pattern : values()) {
+            if (pattern.matches(segment)) {
+                return pattern.getReplacement();
+            }
+        }
+
+        return segment;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/flare/TracerFlare.java b/internal-api/src/main/java/datadog/trace/api/flare/TracerFlare.java
index f2ba39041a4..c87ebe9d6e5 100644
--- a/internal-api/src/main/java/datadog/trace/api/flare/TracerFlare.java
+++ b/internal-api/src/main/java/datadog/trace/api/flare/TracerFlare.java
@@ -12,73 +12,72 @@
 
 public final class TracerFlare {
 
-  public interface Reporter {
-    default void prepareForFlare() {}
+    public interface Reporter {
+        default void prepareForFlare() {}
 
-    void addReportToFlare(ZipOutputStream zip) throws IOException;
+        void addReportToFlare(ZipOutputStream zip) throws IOException;
 
-    default void cleanupAfterFlare() {}
-  }
+        default void cleanupAfterFlare() {}
+    }
 
-  private static final Map<Class<?>, Reporter> reporters = new ConcurrentHashMap<>();
+    private static final Map<Class<?>, Reporter> reporters = new ConcurrentHashMap<>();
 
-  public static void prepareForFlare() {
-    for (Reporter reporter : reporters.values()) {
-      try {
-        reporter.prepareForFlare();
-      } catch (Throwable ignore) {
-      }
+    public static void prepareForFlare() {
+        for (Reporter reporter : reporters.values()) {
+            try {
+                reporter.prepareForFlare();
+            } catch (Throwable ignore) {
+            }
+        }
     }
-  }
 
-  public static void addReportsToFlare(ZipOutputStream zip) throws IOException {
-    List<Throwable> errors = null;
+    public static void addReportsToFlare(ZipOutputStream zip) throws IOException {
+        List<Throwable> errors = null;
 
-    for (Reporter reporter : reporters.values()) {
-      try {
-        reporter.addReportToFlare(zip);
-      } catch (Throwable e) {
-        if (null == errors) {
-          errors = new ArrayList<>();
+        for (Reporter reporter : reporters.values()) {
+            try {
+                reporter.addReportToFlare(zip);
+            } catch (Throwable e) {
+                if (null == errors) {
+                    errors = new ArrayList<>();
+                }
+                errors.add(e);
+            }
         }
-        errors.add(e);
-      }
-    }
 
-    if (null != errors) {
-      zip.putNextEntry(new ZipEntry("flare_errors.txt"));
-      for (Throwable e : errors) {
-        zip.write(e.toString().getBytes(UTF_8));
-        zip.write('\n');
-      }
+        if (null != errors) {
+            zip.putNextEntry(new ZipEntry("flare_errors.txt"));
+            for (Throwable e : errors) {
+                zip.write(e.toString().getBytes(UTF_8));
+                zip.write('\n');
+            }
+        }
     }
-  }
 
-  public static void cleanupAfterFlare() {
-    for (Reporter reporter : reporters.values()) {
-      try {
-        reporter.cleanupAfterFlare();
-      } catch (Throwable ignore) {
-      }
+    public static void cleanupAfterFlare() {
+        for (Reporter reporter : reporters.values()) {
+            try {
+                reporter.cleanupAfterFlare();
+            } catch (Throwable ignore) {
+            }
+        }
     }
-  }
 
-  public static void addReporter(Reporter reporter) {
-    reporters.put(reporter.getClass(), reporter);
-  }
+    public static void addReporter(Reporter reporter) {
+        reporters.put(reporter.getClass(), reporter);
+    }
 
-  public static void addText(ZipOutputStream zip, String section, String text) throws IOException {
-    zip.putNextEntry(new ZipEntry(section));
-    if (null != text) {
-      zip.write(text.getBytes(UTF_8));
+    public static void addText(ZipOutputStream zip, String section, String text) throws IOException {
+        zip.putNextEntry(new ZipEntry(section));
+        if (null != text) {
+            zip.write(text.getBytes(UTF_8));
+        }
     }
-  }
 
-  public static void addBinary(ZipOutputStream zip, String section, byte[] bytes)
-      throws IOException {
-    zip.putNextEntry(new ZipEntry(section));
-    if (null != bytes) {
-      zip.write(bytes);
+    public static void addBinary(ZipOutputStream zip, String section, byte[] bytes) throws IOException {
+        zip.putNextEntry(new ZipEntry(section));
+        if (null != bytes) {
+            zip.write(bytes);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/function/TriConsumer.java b/internal-api/src/main/java/datadog/trace/api/function/TriConsumer.java
index 10abca7b648..e0b1ede7cf4 100644
--- a/internal-api/src/main/java/datadog/trace/api/function/TriConsumer.java
+++ b/internal-api/src/main/java/datadog/trace/api/function/TriConsumer.java
@@ -1,5 +1,5 @@
 package datadog.trace.api.function;
 
 public interface TriConsumer<S, T, U> {
-  void accept(S s, T t, U u);
+    void accept(S s, T t, U u);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/function/TriFunction.java b/internal-api/src/main/java/datadog/trace/api/function/TriFunction.java
index 438793e712f..2af67415c8b 100644
--- a/internal-api/src/main/java/datadog/trace/api/function/TriFunction.java
+++ b/internal-api/src/main/java/datadog/trace/api/function/TriFunction.java
@@ -1,5 +1,5 @@
 package datadog.trace.api.function;
 
 public interface TriFunction<T, U, V, R> {
-  R apply(T t, U u, V v);
+    R apply(T t, U u, V v);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/BlockResponseFunction.java b/internal-api/src/main/java/datadog/trace/api/gateway/BlockResponseFunction.java
index a9c11618e11..61acc4707e2 100644
--- a/internal-api/src/main/java/datadog/trace/api/gateway/BlockResponseFunction.java
+++ b/internal-api/src/main/java/datadog/trace/api/gateway/BlockResponseFunction.java
@@ -6,67 +6,65 @@
 import java.util.Map;
 
 public interface BlockResponseFunction {
-  /**
-   * Commits blocking response.
-   *
-   * <p>It's responsible for calling {@link TraceSegment#effectivelyBlocked()} before the span is
-   * finished.
-   *
-   * @return true unless blocking could not be attempted
-   */
-  boolean tryCommitBlockingResponse(
-      TraceSegment segment,
-      int statusCode,
-      BlockingContentType templateType,
-      Map<String, String> extraHeaders,
-      String securityResponseId);
+    /**
+     * Commits blocking response.
+     *
+     * <p>It's responsible for calling {@link TraceSegment#effectivelyBlocked()} before the span is
+     * finished.
+     *
+     * @return true unless blocking could not be attempted
+     */
+    boolean tryCommitBlockingResponse(
+            TraceSegment segment,
+            int statusCode,
+            BlockingContentType templateType,
+            Map<String, String> extraHeaders,
+            String securityResponseId);
 
-  /**
-   * Commits blocking response using a RequestBlockingAction.
-   *
-   * <p>This method delegates to the parameter-based method by default, extracting individual fields
-   * from the RequestBlockingAction. Implementations can override this for more efficient
-   * processing.
-   *
-   * <p>It's responsible for calling {@link TraceSegment#effectivelyBlocked()} before the span is
-   * finished.
-   *
-   * @param segment the trace segment
-   * @param action the blocking action containing status code, content type, headers, and security
-   *     response ID
-   * @return true unless blocking could not be attempted
-   */
-  default boolean tryCommitBlockingResponse(
-      TraceSegment segment, Flow.Action.RequestBlockingAction action) {
-    return tryCommitBlockingResponse(
-        segment,
-        action.getStatusCode(),
-        action.getBlockingContentType(),
-        action.getExtraHeaders(),
-        action.getSecurityResponseId());
-  }
+    /**
+     * Commits blocking response using a RequestBlockingAction.
+     *
+     * <p>This method delegates to the parameter-based method by default, extracting individual fields
+     * from the RequestBlockingAction. Implementations can override this for more efficient
+     * processing.
+     *
+     * <p>It's responsible for calling {@link TraceSegment#effectivelyBlocked()} before the span is
+     * finished.
+     *
+     * @param segment the trace segment
+     * @param action the blocking action containing status code, content type, headers, and security
+     *     response ID
+     * @return true unless blocking could not be attempted
+     */
+    default boolean tryCommitBlockingResponse(TraceSegment segment, Flow.Action.RequestBlockingAction action) {
+        return tryCommitBlockingResponse(
+                segment,
+                action.getStatusCode(),
+                action.getBlockingContentType(),
+                action.getExtraHeaders(),
+                action.getSecurityResponseId());
+    }
 
-  /**
-   * Commits blocking response using a RequestBlockingAction, reporting to {@link
-   * AppSecContext#reportBlockFailure()} if the commit fails.
-   *
-   * <p>It's responsible for calling {@link TraceSegment#effectivelyBlocked()} before the span is
-   * finished.
-   *
-   * @param ctx the request context
-   * @param action the blocking action containing status code, content type, headers, and security
-   *     response ID
-   * @return true unless blocking could not be attempted
-   */
-  default boolean tryCommitBlockingResponse(
-      RequestContext ctx, Flow.Action.RequestBlockingAction action) {
-    boolean committed = tryCommitBlockingResponse(ctx.getTraceSegment(), action);
-    if (!committed) {
-      Object rawAppSecCtx = ctx.getData(RequestContextSlot.APPSEC);
-      if (rawAppSecCtx instanceof AppSecContext) {
-        ((AppSecContext) rawAppSecCtx).reportBlockFailure();
-      }
+    /**
+     * Commits blocking response using a RequestBlockingAction, reporting to {@link
+     * AppSecContext#reportBlockFailure()} if the commit fails.
+     *
+     * <p>It's responsible for calling {@link TraceSegment#effectivelyBlocked()} before the span is
+     * finished.
+     *
+     * @param ctx the request context
+     * @param action the blocking action containing status code, content type, headers, and security
+     *     response ID
+     * @return true unless blocking could not be attempted
+     */
+    default boolean tryCommitBlockingResponse(RequestContext ctx, Flow.Action.RequestBlockingAction action) {
+        boolean committed = tryCommitBlockingResponse(ctx.getTraceSegment(), action);
+        if (!committed) {
+            Object rawAppSecCtx = ctx.getData(RequestContextSlot.APPSEC);
+            if (rawAppSecCtx instanceof AppSecContext) {
+                ((AppSecContext) rawAppSecCtx).reportBlockFailure();
+            }
+        }
+        return committed;
     }
-    return committed;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/CallbackProvider.java b/internal-api/src/main/java/datadog/trace/api/gateway/CallbackProvider.java
index e4f07f963d2..496f02aa904 100644
--- a/internal-api/src/main/java/datadog/trace/api/gateway/CallbackProvider.java
+++ b/internal-api/src/main/java/datadog/trace/api/gateway/CallbackProvider.java
@@ -2,16 +2,16 @@
 
 /** The API used by the producers to retrieve callbacks. */
 public interface CallbackProvider {
-  <C> C getCallback(EventType<C> eventType);
+    <C> C getCallback(EventType<C> eventType);
 
-  class CallbackProviderNoop implements CallbackProvider {
-    public static final CallbackProvider INSTANCE = new CallbackProviderNoop();
+    class CallbackProviderNoop implements CallbackProvider {
+        public static final CallbackProvider INSTANCE = new CallbackProviderNoop();
 
-    private CallbackProviderNoop() {}
+        private CallbackProviderNoop() {}
 
-    @Override
-    public <C> C getCallback(EventType<C> eventType) {
-      return null;
+        @Override
+        public <C> C getCallback(EventType<C> eventType) {
+            return null;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/EventType.java b/internal-api/src/main/java/datadog/trace/api/gateway/EventType.java
index a14d2b5616c..5d7ce505458 100644
--- a/internal-api/src/main/java/datadog/trace/api/gateway/EventType.java
+++ b/internal-api/src/main/java/datadog/trace/api/gateway/EventType.java
@@ -6,24 +6,24 @@
  * @param <C> The type of the callback related to the {@code EventType}
  */
 public class EventType<C> {
-  private final String name;
-  private final int id;
+    private final String name;
+    private final int id;
 
-  protected EventType(final String name, final int id) {
-    this.name = name;
-    this.id = id;
-  }
+    protected EventType(final String name, final int id) {
+        this.name = name;
+        this.id = id;
+    }
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 
-  int getId() {
-    return id;
-  }
+    int getId() {
+        return id;
+    }
 
-  @Override
-  public String toString() {
-    return "EventType{" + "name='" + name + '\'' + '}';
-  }
+    @Override
+    public String toString() {
+        return "EventType{" + "name='" + name + '\'' + '}';
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/Events.java b/internal-api/src/main/java/datadog/trace/api/gateway/Events.java
index f2201f9d26d..087152244b1 100644
--- a/internal-api/src/main/java/datadog/trace/api/gateway/Events.java
+++ b/internal-api/src/main/java/datadog/trace/api/gateway/Events.java
@@ -17,427 +17,404 @@
 
 /** All known {@code EventType} that the {@code InstrumentationGateway} can handle. */
 public final class Events<D> {
-  private static final AtomicInteger nextId = new AtomicInteger(0);
+    private static final AtomicInteger nextId = new AtomicInteger(0);
 
-  // The IDs that we define here need to be compile time constants for Java
-  // to be able to do a switch statement, hence we can't use nextId in the
-  // definitions of them :(
-  // There is a double check in the ET constructor that makes sure that we
-  // assign the IDs correctly.
-
-  static final int REQUEST_STARTED_ID = 0;
+    // The IDs that we define here need to be compile time constants for Java
+    // to be able to do a switch statement, hence we can't use nextId in the
+    // definitions of them :(
+    // There is a double check in the ET constructor that makes sure that we
+    // assign the IDs correctly.
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType REQUEST_STARTED = new ET<>("request.started", REQUEST_STARTED_ID);
+    static final int REQUEST_STARTED_ID = 0;
 
-  /** A request started */
-  @SuppressWarnings("unchecked")
-  public EventType<Supplier<Flow<D>>> requestStarted() {
-    return (EventType<Supplier<Flow<D>>>) REQUEST_STARTED;
-  }
+    @SuppressWarnings("rawtypes")
+    private static final EventType REQUEST_STARTED = new ET<>("request.started", REQUEST_STARTED_ID);
 
-  static final int REQUEST_ENDED_ID = 1;
+    /** A request started */
+    @SuppressWarnings("unchecked")
+    public EventType<Supplier<Flow<D>>> requestStarted() {
+        return (EventType<Supplier<Flow<D>>>) REQUEST_STARTED;
+    }
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType REQUEST_ENDED = new ET<>("request.ended", REQUEST_ENDED_ID);
-
-  /** A request ended */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, IGSpanInfo, Flow<Void>>> requestEnded() {
-    return (EventType<BiFunction<RequestContext, IGSpanInfo, Flow<Void>>>) REQUEST_ENDED;
-  }
-
-  static final int REQUEST_HEADER_ID = 2;
-
-  @SuppressWarnings("rawtypes")
-  private static final EventType REQUEST_HEADER =
-      new ET<>("server.request.header", REQUEST_HEADER_ID);
-
-  /** A request header as a key and values separated by , */
-  @SuppressWarnings("unchecked")
-  public EventType<TriConsumer<RequestContext, String, String>> requestHeader() {
-    return (EventType<TriConsumer<RequestContext, String, String>>) REQUEST_HEADER;
-  }
-
-  static final int REQUEST_HEADER_DONE_ID = 3;
-
-  @SuppressWarnings("rawtypes")
-  private static final EventType REQUEST_HEADER_DONE =
-      new ET<>("server.request.header.done", REQUEST_HEADER_DONE_ID);
-
-  /** All request headers have been provided */
-  @SuppressWarnings("unchecked")
-  public EventType<Function<RequestContext, Flow<Void>>> requestHeaderDone() {
-    return (EventType<Function<RequestContext, Flow<Void>>>) REQUEST_HEADER_DONE;
-  }
-
-  static final int REQUEST_METHOD_URI_RAW_ID = 4;
-
-  @SuppressWarnings("rawtypes")
-  private static final EventType REQUEST_METHOD_URI_RAW =
-      new ET<>("server.request.method.uri.raw", REQUEST_METHOD_URI_RAW_ID);
-
-  /** The method (uppercase) and URIDataAdapter for the request. */
-  @SuppressWarnings("unchecked")
-  public EventType<TriFunction<RequestContext, String /* method */, URIDataAdapter, Flow<Void>>>
-      requestMethodUriRaw() {
-    return (EventType<TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>>>)
-        REQUEST_METHOD_URI_RAW;
-  }
-
-  static final int REQUEST_PATH_PARAMS_ID = 5;
+    static final int REQUEST_ENDED_ID = 1;
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType REQUEST_PATH_PARAMS =
-      new ET<>("server.request.method.uri.raw", REQUEST_PATH_PARAMS_ID);
+    @SuppressWarnings("rawtypes")
+    private static final EventType REQUEST_ENDED = new ET<>("request.ended", REQUEST_ENDED_ID);
 
-  /** The parameters the framework got from the request uri (but not the query string) */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, Map<String, ?>, Flow<Void>>> requestPathParams() {
-    return (EventType<BiFunction<RequestContext, Map<String, ?>, Flow<Void>>>) REQUEST_PATH_PARAMS;
-  }
-
-  static final int REQUEST_CLIENT_SOCKET_ADDRESS_ID = 6;
+    /** A request ended */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, IGSpanInfo, Flow<Void>>> requestEnded() {
+        return (EventType<BiFunction<RequestContext, IGSpanInfo, Flow<Void>>>) REQUEST_ENDED;
+    }
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType REQUEST_CLIENT_SOCKET_ADDRESS =
-      new ET<>("http.server.client_socket_address", REQUEST_CLIENT_SOCKET_ADDRESS_ID);
+    static final int REQUEST_HEADER_ID = 2;
 
-  /** The method (uppercase) and URIDataAdapter for the request. */
-  @SuppressWarnings("unchecked")
-  public EventType<TriFunction<RequestContext, String, Integer, Flow<Void>>>
-      requestClientSocketAddress() {
-    return (EventType<TriFunction<RequestContext, String, Integer, Flow<Void>>>)
-        REQUEST_CLIENT_SOCKET_ADDRESS;
-  }
+    @SuppressWarnings("rawtypes")
+    private static final EventType REQUEST_HEADER = new ET<>("server.request.header", REQUEST_HEADER_ID);
 
-  static final int REQUEST_INFERRED_CLIENT_ADDRESS_ID = 7;
-
-  @SuppressWarnings("rawtypes")
-  private static final EventType REQUEST_INFERRED_CLIENT_ADDRESS =
-      new ET<>("http.server.inferred_client_address", REQUEST_INFERRED_CLIENT_ADDRESS_ID);
-
-  /** The inferred client IP address. */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, String, Flow<Void>>> requestInferredClientAddress() {
-    return (EventType<BiFunction<RequestContext, String, Flow<Void>>>)
-        REQUEST_INFERRED_CLIENT_ADDRESS;
-  }
-
-  static final int REQUEST_BODY_START_ID = 8;
-
-  @SuppressWarnings("rawtypes")
-  private static final EventType REQUEST_BODY_START =
-      new ET<>("request.body.started", REQUEST_BODY_START_ID);
-
-  /** The request body has started being read */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, StoredBodySupplier, Void>> requestBodyStart() {
-    return (EventType<BiFunction<RequestContext, StoredBodySupplier, Void>>) REQUEST_BODY_START;
-  }
-
-  static final int REQUEST_BODY_DONE_ID = 9;
-
-  @SuppressWarnings("rawtypes")
-  private static final EventType REQUEST_BODY_DONE =
-      new ET<>("request.body.done", REQUEST_BODY_DONE_ID);
-
-  /** The request body is done being read */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, StoredBodySupplier, Flow<Void>>> requestBodyDone() {
-    return (EventType<BiFunction<RequestContext, StoredBodySupplier, Flow<Void>>>)
-        REQUEST_BODY_DONE;
-  }
-
-  static final int REQUEST_BODY_CONVERTED_ID = 10;
-
-  @SuppressWarnings("rawtypes")
-  private static final EventType REQUEST_BODY_CONVERTED =
-      new ET<>("request.body.converted", REQUEST_BODY_CONVERTED_ID);
-
-  /** The request body has been converted by the framework */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, Object, Flow<Void>>> requestBodyProcessed() {
-    return (EventType<BiFunction<RequestContext, Object, Flow<Void>>>) REQUEST_BODY_CONVERTED;
-  }
-
-  static final int RESPONSE_STARTED_ID = 11;
-
-  @SuppressWarnings("rawtypes")
-  private static final EventType RESPONSE_STARTED =
-      new ET<>("response.started", RESPONSE_STARTED_ID);
-
-  /** A response started */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, Integer, Flow<Void>>> responseStarted() {
-    return (EventType<BiFunction<RequestContext, Integer, Flow<Void>>>) RESPONSE_STARTED;
-  }
-
-  static final int RESPONSE_HEADER_ID = 12;
-
-  @SuppressWarnings("rawtypes")
-  private static final EventType RESPONSE_HEADER =
-      new ET<>("server.response.header", RESPONSE_HEADER_ID);
-
-  /** A response header as a key and values separated by , */
-  @SuppressWarnings("unchecked")
-  public EventType<TriConsumer<RequestContext, String, String>> responseHeader() {
-    return (EventType<TriConsumer<RequestContext, String, String>>) RESPONSE_HEADER;
-  }
+    /** A request header as a key and values separated by , */
+    @SuppressWarnings("unchecked")
+    public EventType<TriConsumer<RequestContext, String, String>> requestHeader() {
+        return (EventType<TriConsumer<RequestContext, String, String>>) REQUEST_HEADER;
+    }
 
-  static final int RESPONSE_HEADER_DONE_ID = 13;
+    static final int REQUEST_HEADER_DONE_ID = 3;
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType RESPONSE_HEADER_DONE =
-      new ET<>("server.response.header.done", RESPONSE_HEADER_DONE_ID);
-
-  /** All response headers have been provided */
-  @SuppressWarnings("unchecked")
-  public EventType<Function<RequestContext, Flow<Void>>> responseHeaderDone() {
-    return (EventType<Function<RequestContext, Flow<Void>>>) RESPONSE_HEADER_DONE;
-  }
+    @SuppressWarnings("rawtypes")
+    private static final EventType REQUEST_HEADER_DONE = new ET<>("server.request.header.done", REQUEST_HEADER_DONE_ID);
 
-  static final int GRPC_SERVER_REQUEST_MESSAGE_ID = 14;
+    /** All request headers have been provided */
+    @SuppressWarnings("unchecked")
+    public EventType<Function<RequestContext, Flow<Void>>> requestHeaderDone() {
+        return (EventType<Function<RequestContext, Flow<Void>>>) REQUEST_HEADER_DONE;
+    }
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType GRPC_SERVER_REQUEST_MESSAGE =
-      new ET<>("grpc.server.request.message", GRPC_SERVER_REQUEST_MESSAGE_ID);
-
-  /** All response headers have been provided */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, Object, Flow<Void>>> grpcServerRequestMessage() {
-    return (EventType<BiFunction<RequestContext, Object, Flow<Void>>>) GRPC_SERVER_REQUEST_MESSAGE;
-  }
+    static final int REQUEST_METHOD_URI_RAW_ID = 4;
 
-  static final int GRAPHQL_SERVER_REQUEST_MESSAGE_ID = 15;
+    @SuppressWarnings("rawtypes")
+    private static final EventType REQUEST_METHOD_URI_RAW =
+            new ET<>("server.request.method.uri.raw", REQUEST_METHOD_URI_RAW_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType GRAPHQL_SERVER_REQUEST_MESSAGE =
-      new ET<>("graphql.server.request.message", GRAPHQL_SERVER_REQUEST_MESSAGE_ID);
+    /** The method (uppercase) and URIDataAdapter for the request. */
+    @SuppressWarnings("unchecked")
+    public EventType<TriFunction<RequestContext, String /* method */, URIDataAdapter, Flow<Void>>>
+            requestMethodUriRaw() {
+        return (EventType<TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>>>) REQUEST_METHOD_URI_RAW;
+    }
 
-  /** Before resolver execution */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, Map<String, ?>, Flow<Void>>>
-      graphqlServerRequestMessage() {
-    return (EventType<BiFunction<RequestContext, Map<String, ?>, Flow<Void>>>)
-        GRAPHQL_SERVER_REQUEST_MESSAGE;
-  }
+    static final int REQUEST_PATH_PARAMS_ID = 5;
 
-  static final int DATABASE_CONNECTION_ID = 16;
+    @SuppressWarnings("rawtypes")
+    private static final EventType REQUEST_PATH_PARAMS =
+            new ET<>("server.request.method.uri.raw", REQUEST_PATH_PARAMS_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType DATABASE_CONNECTION =
-      new ET<>("database.connection", DATABASE_CONNECTION_ID);
+    /** The parameters the framework got from the request uri (but not the query string) */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, Map<String, ?>, Flow<Void>>> requestPathParams() {
+        return (EventType<BiFunction<RequestContext, Map<String, ?>, Flow<Void>>>) REQUEST_PATH_PARAMS;
+    }
 
-  /** A database connection */
-  @SuppressWarnings("unchecked")
-  public EventType<BiConsumer<RequestContext, String>> databaseConnection() {
-    return (EventType<BiConsumer<RequestContext, String>>) DATABASE_CONNECTION;
-  }
+    static final int REQUEST_CLIENT_SOCKET_ADDRESS_ID = 6;
 
-  static final int DATABASE_SQL_QUERY_ID = 17;
+    @SuppressWarnings("rawtypes")
+    private static final EventType REQUEST_CLIENT_SOCKET_ADDRESS =
+            new ET<>("http.server.client_socket_address", REQUEST_CLIENT_SOCKET_ADDRESS_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType DATABASE_SQL_QUERY =
-      new ET<>("database.query", DATABASE_SQL_QUERY_ID);
+    /** The method (uppercase) and URIDataAdapter for the request. */
+    @SuppressWarnings("unchecked")
+    public EventType<TriFunction<RequestContext, String, Integer, Flow<Void>>> requestClientSocketAddress() {
+        return (EventType<TriFunction<RequestContext, String, Integer, Flow<Void>>>) REQUEST_CLIENT_SOCKET_ADDRESS;
+    }
 
-  /** A database sql query */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, String, Flow<Void>>> databaseSqlQuery() {
-    return (EventType<BiFunction<RequestContext, String, Flow<Void>>>) DATABASE_SQL_QUERY;
-  }
+    static final int REQUEST_INFERRED_CLIENT_ADDRESS_ID = 7;
 
-  static final int GRPC_SERVER_METHOD_ID = 18;
+    @SuppressWarnings("rawtypes")
+    private static final EventType REQUEST_INFERRED_CLIENT_ADDRESS =
+            new ET<>("http.server.inferred_client_address", REQUEST_INFERRED_CLIENT_ADDRESS_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType GRPC_SERVER_METHOD =
-      new ET<>("grpc.server.method", GRPC_SERVER_METHOD_ID);
+    /** The inferred client IP address. */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, String, Flow<Void>>> requestInferredClientAddress() {
+        return (EventType<BiFunction<RequestContext, String, Flow<Void>>>) REQUEST_INFERRED_CLIENT_ADDRESS;
+    }
 
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, String, Flow<Void>>> grpcServerMethod() {
-    return (EventType<BiFunction<RequestContext, String, Flow<Void>>>) GRPC_SERVER_METHOD;
-  }
+    static final int REQUEST_BODY_START_ID = 8;
 
-  static final int HTTP_CLIENT_REQUEST_ID = 19;
+    @SuppressWarnings("rawtypes")
+    private static final EventType REQUEST_BODY_START = new ET<>("request.body.started", REQUEST_BODY_START_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType HTTP_CLIENT_REQUEST =
-      new ET<>("http.client.request", HTTP_CLIENT_REQUEST_ID);
+    /** The request body has started being read */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, StoredBodySupplier, Void>> requestBodyStart() {
+        return (EventType<BiFunction<RequestContext, StoredBodySupplier, Void>>) REQUEST_BODY_START;
+    }
 
-  /** An http downstream request */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, HttpClientRequest, Flow<Void>>> httpClientRequest() {
-    return (EventType<BiFunction<RequestContext, HttpClientRequest, Flow<Void>>>)
-        HTTP_CLIENT_REQUEST;
-  }
+    static final int REQUEST_BODY_DONE_ID = 9;
 
-  static final int FILE_LOADED_ID = 20;
+    @SuppressWarnings("rawtypes")
+    private static final EventType REQUEST_BODY_DONE = new ET<>("request.body.done", REQUEST_BODY_DONE_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType FILE_LOADED = new ET<>("file.loaded", FILE_LOADED_ID);
+    /** The request body is done being read */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, StoredBodySupplier, Flow<Void>>> requestBodyDone() {
+        return (EventType<BiFunction<RequestContext, StoredBodySupplier, Flow<Void>>>) REQUEST_BODY_DONE;
+    }
 
-  /** A I/O file loaded */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, String, Flow<Void>>> fileLoaded() {
-    return (EventType<BiFunction<RequestContext, String, Flow<Void>>>) FILE_LOADED;
-  }
+    static final int REQUEST_BODY_CONVERTED_ID = 10;
 
-  static final int REQUEST_SESSION_ID = 21;
+    @SuppressWarnings("rawtypes")
+    private static final EventType REQUEST_BODY_CONVERTED =
+            new ET<>("request.body.converted", REQUEST_BODY_CONVERTED_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType REQUEST_SESSION = new ET<>("request.session", REQUEST_SESSION_ID);
+    /** The request body has been converted by the framework */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, Object, Flow<Void>>> requestBodyProcessed() {
+        return (EventType<BiFunction<RequestContext, Object, Flow<Void>>>) REQUEST_BODY_CONVERTED;
+    }
 
-  /** The session id of a request */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, String, Flow<Void>>> requestSession() {
-    return (EventType<BiFunction<RequestContext, String, Flow<Void>>>) REQUEST_SESSION;
-  }
+    static final int RESPONSE_STARTED_ID = 11;
 
-  static final int USER_ID = 22;
+    @SuppressWarnings("rawtypes")
+    private static final EventType RESPONSE_STARTED = new ET<>("response.started", RESPONSE_STARTED_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType USER = new ET<>("user", USER_ID);
+    /** A response started */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, Integer, Flow<Void>>> responseStarted() {
+        return (EventType<BiFunction<RequestContext, Integer, Flow<Void>>>) RESPONSE_STARTED;
+    }
 
-  /** Triggered in every authenticated request to the application */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, String, Flow<Void>>> user() {
-    return (EventType<BiFunction<RequestContext, String, Flow<Void>>>) USER;
-  }
+    static final int RESPONSE_HEADER_ID = 12;
 
-  static final int LOGIN_EVENT_ID = 23;
+    @SuppressWarnings("rawtypes")
+    private static final EventType RESPONSE_HEADER = new ET<>("server.response.header", RESPONSE_HEADER_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType LOGIN_EVENT = new ET<>("login.event", LOGIN_EVENT_ID);
+    /** A response header as a key and values separated by , */
+    @SuppressWarnings("unchecked")
+    public EventType<TriConsumer<RequestContext, String, String>> responseHeader() {
+        return (EventType<TriConsumer<RequestContext, String, String>>) RESPONSE_HEADER;
+    }
 
-  @SuppressWarnings("unchecked")
-  public EventType<TriFunction<RequestContext, LoginEvent, String, Flow<Void>>> loginEvent() {
-    return (EventType<TriFunction<RequestContext, LoginEvent, String, Flow<Void>>>) LOGIN_EVENT;
-  }
+    static final int RESPONSE_HEADER_DONE_ID = 13;
 
-  static final int EXEC_CMD_ID = 24;
+    @SuppressWarnings("rawtypes")
+    private static final EventType RESPONSE_HEADER_DONE =
+            new ET<>("server.response.header.done", RESPONSE_HEADER_DONE_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType EXEC_CMD = new ET<>("exec.cmd", EXEC_CMD_ID);
+    /** All response headers have been provided */
+    @SuppressWarnings("unchecked")
+    public EventType<Function<RequestContext, Flow<Void>>> responseHeaderDone() {
+        return (EventType<Function<RequestContext, Flow<Void>>>) RESPONSE_HEADER_DONE;
+    }
 
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, String[], Flow<Void>>> execCmd() {
-    return (EventType<BiFunction<RequestContext, String[], Flow<Void>>>) EXEC_CMD;
-  }
+    static final int GRPC_SERVER_REQUEST_MESSAGE_ID = 14;
 
-  static final int SHELL_CMD_ID = 25;
+    @SuppressWarnings("rawtypes")
+    private static final EventType GRPC_SERVER_REQUEST_MESSAGE =
+            new ET<>("grpc.server.request.message", GRPC_SERVER_REQUEST_MESSAGE_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType SHELL_CMD = new ET<>("shell.cmd", SHELL_CMD_ID);
+    /** All response headers have been provided */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, Object, Flow<Void>>> grpcServerRequestMessage() {
+        return (EventType<BiFunction<RequestContext, Object, Flow<Void>>>) GRPC_SERVER_REQUEST_MESSAGE;
+    }
 
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, String, Flow<Void>>> shellCmd() {
-    return (EventType<BiFunction<RequestContext, String, Flow<Void>>>) SHELL_CMD;
-  }
+    static final int GRAPHQL_SERVER_REQUEST_MESSAGE_ID = 15;
 
-  static final int HTTP_ROUTE_ID = 26;
+    @SuppressWarnings("rawtypes")
+    private static final EventType GRAPHQL_SERVER_REQUEST_MESSAGE =
+            new ET<>("graphql.server.request.message", GRAPHQL_SERVER_REQUEST_MESSAGE_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType HTTP_ROUTE = new ET<>("http.route", HTTP_ROUTE_ID);
+    /** Before resolver execution */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, Map<String, ?>, Flow<Void>>> graphqlServerRequestMessage() {
+        return (EventType<BiFunction<RequestContext, Map<String, ?>, Flow<Void>>>) GRAPHQL_SERVER_REQUEST_MESSAGE;
+    }
 
-  @SuppressWarnings("unchecked")
-  public EventType<BiConsumer<RequestContext, String>> httpRoute() {
-    return (EventType<BiConsumer<RequestContext, String>>) HTTP_ROUTE;
-  }
+    static final int DATABASE_CONNECTION_ID = 16;
 
-  static final int RESPONSE_BODY_ID = 27;
+    @SuppressWarnings("rawtypes")
+    private static final EventType DATABASE_CONNECTION = new ET<>("database.connection", DATABASE_CONNECTION_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType RESPONSE_BODY = new ET<>("response.body", RESPONSE_BODY_ID);
+    /** A database connection */
+    @SuppressWarnings("unchecked")
+    public EventType<BiConsumer<RequestContext, String>> databaseConnection() {
+        return (EventType<BiConsumer<RequestContext, String>>) DATABASE_CONNECTION;
+    }
 
-  /**
-   * The original response body object used by the framework before being serialized to the response
-   */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, Object, Flow<Void>>> responseBody() {
-    return (EventType<BiFunction<RequestContext, Object, Flow<Void>>>) RESPONSE_BODY;
-  }
+    static final int DATABASE_SQL_QUERY_ID = 17;
 
-  static final int HTTP_CLIENT_RESPONSE_ID = 28;
+    @SuppressWarnings("rawtypes")
+    private static final EventType DATABASE_SQL_QUERY = new ET<>("database.query", DATABASE_SQL_QUERY_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType HTTP_CLIENT_RESPONSE =
-      new ET<>("http.client.response", HTTP_CLIENT_RESPONSE_ID);
+    /** A database sql query */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, String, Flow<Void>>> databaseSqlQuery() {
+        return (EventType<BiFunction<RequestContext, String, Flow<Void>>>) DATABASE_SQL_QUERY;
+    }
+
+    static final int GRPC_SERVER_METHOD_ID = 18;
+
+    @SuppressWarnings("rawtypes")
+    private static final EventType GRPC_SERVER_METHOD = new ET<>("grpc.server.method", GRPC_SERVER_METHOD_ID);
+
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, String, Flow<Void>>> grpcServerMethod() {
+        return (EventType<BiFunction<RequestContext, String, Flow<Void>>>) GRPC_SERVER_METHOD;
+    }
+
+    static final int HTTP_CLIENT_REQUEST_ID = 19;
+
+    @SuppressWarnings("rawtypes")
+    private static final EventType HTTP_CLIENT_REQUEST = new ET<>("http.client.request", HTTP_CLIENT_REQUEST_ID);
+
+    /** An http downstream request */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, HttpClientRequest, Flow<Void>>> httpClientRequest() {
+        return (EventType<BiFunction<RequestContext, HttpClientRequest, Flow<Void>>>) HTTP_CLIENT_REQUEST;
+    }
 
-  /** An http downstream response */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, HttpClientResponse, Flow<Void>>>
-      httpClientResponse() {
-    return (EventType<BiFunction<RequestContext, HttpClientResponse, Flow<Void>>>)
-        HTTP_CLIENT_RESPONSE;
-  }
+    static final int FILE_LOADED_ID = 20;
 
-  static final int HTTP_CLIENT_SAMPLING_ID = 29;
+    @SuppressWarnings("rawtypes")
+    private static final EventType FILE_LOADED = new ET<>("file.loaded", FILE_LOADED_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType HTTP_CLIENT_SAMPLING =
-      new ET<>("http.client.sampling", HTTP_CLIENT_SAMPLING_ID);
+    /** A I/O file loaded */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, String, Flow<Void>>> fileLoaded() {
+        return (EventType<BiFunction<RequestContext, String, Flow<Void>>>) FILE_LOADED;
+    }
 
-  /** Check sampling status for a downstream request */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, Long, Flow<Boolean>>> httpClientSampling() {
-    return (EventType<BiFunction<RequestContext, Long, Flow<Boolean>>>) HTTP_CLIENT_SAMPLING;
-  }
+    static final int REQUEST_SESSION_ID = 21;
 
-  static final int REQUEST_FILES_FILENAMES_ID = 30;
+    @SuppressWarnings("rawtypes")
+    private static final EventType REQUEST_SESSION = new ET<>("request.session", REQUEST_SESSION_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType REQUEST_FILES_FILENAMES =
-      new ET<>("request.body.filenames", REQUEST_FILES_FILENAMES_ID);
+    /** The session id of a request */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, String, Flow<Void>>> requestSession() {
+        return (EventType<BiFunction<RequestContext, String, Flow<Void>>>) REQUEST_SESSION;
+    }
 
-  /** Filenames of files uploaded in a multipart/form-data request */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, List<String>, Flow<Void>>> requestFilesFilenames() {
-    return (EventType<BiFunction<RequestContext, List<String>, Flow<Void>>>)
-        REQUEST_FILES_FILENAMES;
-  }
+    static final int USER_ID = 22;
 
-  static final int REQUEST_FILES_CONTENT_ID = 31;
+    @SuppressWarnings("rawtypes")
+    private static final EventType USER = new ET<>("user", USER_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType REQUEST_FILES_CONTENT =
-      new ET<>("request.body.files.content", REQUEST_FILES_CONTENT_ID);
+    /** Triggered in every authenticated request to the application */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, String, Flow<Void>>> user() {
+        return (EventType<BiFunction<RequestContext, String, Flow<Void>>>) USER;
+    }
 
-  /** Contents of files uploaded in a multipart/form-data request */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, List<String>, Flow<Void>>> requestFilesContent() {
-    return (EventType<BiFunction<RequestContext, List<String>, Flow<Void>>>) REQUEST_FILES_CONTENT;
-  }
+    static final int LOGIN_EVENT_ID = 23;
 
-  static final int FILE_WRITTEN_ID = 32;
+    @SuppressWarnings("rawtypes")
+    private static final EventType LOGIN_EVENT = new ET<>("login.event", LOGIN_EVENT_ID);
 
-  @SuppressWarnings("rawtypes")
-  private static final EventType FILE_WRITTEN = new ET<>("file.written", FILE_WRITTEN_ID);
+    @SuppressWarnings("unchecked")
+    public EventType<TriFunction<RequestContext, LoginEvent, String, Flow<Void>>> loginEvent() {
+        return (EventType<TriFunction<RequestContext, LoginEvent, String, Flow<Void>>>) LOGIN_EVENT;
+    }
 
-  /** An I/O file written */
-  @SuppressWarnings("unchecked")
-  public EventType<BiFunction<RequestContext, String, Flow<Void>>> fileWritten() {
-    return (EventType<BiFunction<RequestContext, String, Flow<Void>>>) FILE_WRITTEN;
-  }
+    static final int EXEC_CMD_ID = 24;
 
-  static final int MAX_EVENTS = nextId.get();
+    @SuppressWarnings("rawtypes")
+    private static final EventType EXEC_CMD = new ET<>("exec.cmd", EXEC_CMD_ID);
 
-  private static final class ET<T> extends EventType<T> {
-    public ET(String type, int id) {
-      super(type, id);
-      int expectedId = nextId.getAndIncrement();
-      if (id != expectedId) {
-        throw new IllegalArgumentException(
-            "Event " + type + " has broken id " + id + ", expected " + expectedId + ".");
-      }
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, String[], Flow<Void>>> execCmd() {
+        return (EventType<BiFunction<RequestContext, String[], Flow<Void>>>) EXEC_CMD;
     }
-  }
 
-  private Events() {}
+    static final int SHELL_CMD_ID = 25;
+
+    @SuppressWarnings("rawtypes")
+    private static final EventType SHELL_CMD = new ET<>("shell.cmd", SHELL_CMD_ID);
+
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, String, Flow<Void>>> shellCmd() {
+        return (EventType<BiFunction<RequestContext, String, Flow<Void>>>) SHELL_CMD;
+    }
 
-  public static final Events<Object> EVENTS = new Events<>();
+    static final int HTTP_ROUTE_ID = 26;
 
-  @SuppressWarnings("unchecked")
-  public static <D> Events<D> get() {
-    return (Events<D>) EVENTS;
-  }
+    @SuppressWarnings("rawtypes")
+    private static final EventType HTTP_ROUTE = new ET<>("http.route", HTTP_ROUTE_ID);
+
+    @SuppressWarnings("unchecked")
+    public EventType<BiConsumer<RequestContext, String>> httpRoute() {
+        return (EventType<BiConsumer<RequestContext, String>>) HTTP_ROUTE;
+    }
+
+    static final int RESPONSE_BODY_ID = 27;
+
+    @SuppressWarnings("rawtypes")
+    private static final EventType RESPONSE_BODY = new ET<>("response.body", RESPONSE_BODY_ID);
+
+    /**
+     * The original response body object used by the framework before being serialized to the response
+     */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, Object, Flow<Void>>> responseBody() {
+        return (EventType<BiFunction<RequestContext, Object, Flow<Void>>>) RESPONSE_BODY;
+    }
+
+    static final int HTTP_CLIENT_RESPONSE_ID = 28;
+
+    @SuppressWarnings("rawtypes")
+    private static final EventType HTTP_CLIENT_RESPONSE = new ET<>("http.client.response", HTTP_CLIENT_RESPONSE_ID);
+
+    /** An http downstream response */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, HttpClientResponse, Flow<Void>>> httpClientResponse() {
+        return (EventType<BiFunction<RequestContext, HttpClientResponse, Flow<Void>>>) HTTP_CLIENT_RESPONSE;
+    }
+
+    static final int HTTP_CLIENT_SAMPLING_ID = 29;
+
+    @SuppressWarnings("rawtypes")
+    private static final EventType HTTP_CLIENT_SAMPLING = new ET<>("http.client.sampling", HTTP_CLIENT_SAMPLING_ID);
+
+    /** Check sampling status for a downstream request */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, Long, Flow<Boolean>>> httpClientSampling() {
+        return (EventType<BiFunction<RequestContext, Long, Flow<Boolean>>>) HTTP_CLIENT_SAMPLING;
+    }
+
+    static final int REQUEST_FILES_FILENAMES_ID = 30;
+
+    @SuppressWarnings("rawtypes")
+    private static final EventType REQUEST_FILES_FILENAMES =
+            new ET<>("request.body.filenames", REQUEST_FILES_FILENAMES_ID);
+
+    /** Filenames of files uploaded in a multipart/form-data request */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, List<String>, Flow<Void>>> requestFilesFilenames() {
+        return (EventType<BiFunction<RequestContext, List<String>, Flow<Void>>>) REQUEST_FILES_FILENAMES;
+    }
+
+    static final int REQUEST_FILES_CONTENT_ID = 31;
+
+    @SuppressWarnings("rawtypes")
+    private static final EventType REQUEST_FILES_CONTENT =
+            new ET<>("request.body.files.content", REQUEST_FILES_CONTENT_ID);
+
+    /** Contents of files uploaded in a multipart/form-data request */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, List<String>, Flow<Void>>> requestFilesContent() {
+        return (EventType<BiFunction<RequestContext, List<String>, Flow<Void>>>) REQUEST_FILES_CONTENT;
+    }
+
+    static final int FILE_WRITTEN_ID = 32;
+
+    @SuppressWarnings("rawtypes")
+    private static final EventType FILE_WRITTEN = new ET<>("file.written", FILE_WRITTEN_ID);
+
+    /** An I/O file written */
+    @SuppressWarnings("unchecked")
+    public EventType<BiFunction<RequestContext, String, Flow<Void>>> fileWritten() {
+        return (EventType<BiFunction<RequestContext, String, Flow<Void>>>) FILE_WRITTEN;
+    }
+
+    static final int MAX_EVENTS = nextId.get();
+
+    private static final class ET<T> extends EventType<T> {
+        public ET(String type, int id) {
+            super(type, id);
+            int expectedId = nextId.getAndIncrement();
+            if (id != expectedId) {
+                throw new IllegalArgumentException(
+                        "Event " + type + " has broken id " + id + ", expected " + expectedId + ".");
+            }
+        }
+    }
+
+    private Events() {}
+
+    public static final Events<Object> EVENTS = new Events<>();
+
+    @SuppressWarnings("unchecked")
+    public static <D> Events<D> get() {
+        return (Events<D>) EVENTS;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/Flow.java b/internal-api/src/main/java/datadog/trace/api/gateway/Flow.java
index 1d6c1228723..260be43e861 100644
--- a/internal-api/src/main/java/datadog/trace/api/gateway/Flow.java
+++ b/internal-api/src/main/java/datadog/trace/api/gateway/Flow.java
@@ -11,113 +11,109 @@
  * @param <T> the type of the result
  */
 public interface Flow<T> {
-  Flow.Action getAction();
-
-  T getResult();
-
-  interface Action {
-    boolean isBlocking();
-
-    class Noop implements Action {
-      public static Action INSTANCE = new Noop();
-
-      private Noop() {}
-
-      public boolean isBlocking() {
-        return false;
-      }
+    Flow.Action getAction();
+
+    T getResult();
+
+    interface Action {
+        boolean isBlocking();
+
+        class Noop implements Action {
+            public static Action INSTANCE = new Noop();
+
+            private Noop() {}
+
+            public boolean isBlocking() {
+                return false;
+            }
+        }
+
+        class RequestBlockingAction implements Action {
+            private final int statusCode;
+            private final BlockingContentType blockingContentType;
+            private final Map<String, String> extraHeaders;
+            private final String securityResponseId;
+
+            public RequestBlockingAction(
+                    int statusCode, BlockingContentType blockingContentType, Map<String, String> extraHeaders) {
+                this(statusCode, blockingContentType, extraHeaders, null);
+            }
+
+            public RequestBlockingAction(
+                    int statusCode,
+                    BlockingContentType blockingContentType,
+                    Map<String, String> extraHeaders,
+                    String securityResponseId) {
+                this.statusCode = statusCode;
+                this.blockingContentType = blockingContentType;
+                this.extraHeaders = extraHeaders;
+                this.securityResponseId = securityResponseId;
+            }
+
+            public RequestBlockingAction(int statusCode, BlockingContentType blockingContentType) {
+                this(statusCode, blockingContentType, Collections.emptyMap(), null);
+            }
+
+            public static RequestBlockingAction forRedirect(int statusCode, String location) {
+                return forRedirect(statusCode, location, null);
+            }
+
+            public static RequestBlockingAction forRedirect(
+                    int statusCode, String location, String securityResponseId) {
+                return new RequestBlockingAction(
+                        statusCode,
+                        BlockingContentType.NONE,
+                        Collections.singletonMap("Location", location),
+                        securityResponseId);
+            }
+
+            @Override
+            public boolean isBlocking() {
+                return true;
+            }
+
+            public int getStatusCode() {
+                return statusCode;
+            }
+
+            public BlockingContentType getBlockingContentType() {
+                return blockingContentType;
+            }
+
+            public Map<String, String> getExtraHeaders() {
+                return extraHeaders;
+            }
+
+            public String getSecurityResponseId() {
+                return securityResponseId;
+            }
+        }
     }
 
-    class RequestBlockingAction implements Action {
-      private final int statusCode;
-      private final BlockingContentType blockingContentType;
-      private final Map<String, String> extraHeaders;
-      private final String securityResponseId;
-
-      public RequestBlockingAction(
-          int statusCode,
-          BlockingContentType blockingContentType,
-          Map<String, String> extraHeaders) {
-        this(statusCode, blockingContentType, extraHeaders, null);
-      }
-
-      public RequestBlockingAction(
-          int statusCode,
-          BlockingContentType blockingContentType,
-          Map<String, String> extraHeaders,
-          String securityResponseId) {
-        this.statusCode = statusCode;
-        this.blockingContentType = blockingContentType;
-        this.extraHeaders = extraHeaders;
-        this.securityResponseId = securityResponseId;
-      }
-
-      public RequestBlockingAction(int statusCode, BlockingContentType blockingContentType) {
-        this(statusCode, blockingContentType, Collections.emptyMap(), null);
-      }
-
-      public static RequestBlockingAction forRedirect(int statusCode, String location) {
-        return forRedirect(statusCode, location, null);
-      }
-
-      public static RequestBlockingAction forRedirect(
-          int statusCode, String location, String securityResponseId) {
-        return new RequestBlockingAction(
-            statusCode,
-            BlockingContentType.NONE,
-            Collections.singletonMap("Location", location),
-            securityResponseId);
-      }
-
-      @Override
-      public boolean isBlocking() {
-        return true;
-      }
-
-      public int getStatusCode() {
-        return statusCode;
-      }
-
-      public BlockingContentType getBlockingContentType() {
-        return blockingContentType;
-      }
-
-      public Map<String, String> getExtraHeaders() {
-        return extraHeaders;
-      }
-
-      public String getSecurityResponseId() {
-        return securityResponseId;
-      }
-    }
-  }
-
-  @SuppressFBWarnings(
-      value = "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR",
-      justification = "Not a singleton")
-  class ResultFlow<R> implements Flow<R> {
-    @SuppressWarnings("rawtypes")
-    private static final ResultFlow EMPTY = new ResultFlow<>(null);
-
-    @SuppressWarnings("unchecked")
-    public static <R> ResultFlow<R> empty() {
-      return (ResultFlow<R>) EMPTY;
-    }
+    @SuppressFBWarnings(value = "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR", justification = "Not a singleton")
+    class ResultFlow<R> implements Flow<R> {
+        @SuppressWarnings("rawtypes")
+        private static final ResultFlow EMPTY = new ResultFlow<>(null);
 
-    private final R result;
+        @SuppressWarnings("unchecked")
+        public static <R> ResultFlow<R> empty() {
+            return (ResultFlow<R>) EMPTY;
+        }
 
-    public ResultFlow(R result) {
-      this.result = result;
-    }
+        private final R result;
 
-    @Override
-    public Action getAction() {
-      return Action.Noop.INSTANCE;
-    }
+        public ResultFlow(R result) {
+            this.result = result;
+        }
+
+        @Override
+        public Action getAction() {
+            return Action.Noop.INSTANCE;
+        }
 
-    @Override
-    public R getResult() {
-      return result;
+        @Override
+        public R getResult() {
+            return result;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/IGSpanInfo.java b/internal-api/src/main/java/datadog/trace/api/gateway/IGSpanInfo.java
index 00c3b596af1..3644f45779d 100644
--- a/internal-api/src/main/java/datadog/trace/api/gateway/IGSpanInfo.java
+++ b/internal-api/src/main/java/datadog/trace/api/gateway/IGSpanInfo.java
@@ -5,15 +5,15 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 
 public interface IGSpanInfo {
-  DDTraceId getTraceId();
+    DDTraceId getTraceId();
 
-  long getSpanId();
+    long getSpanId();
 
-  TagMap getTags();
+    TagMap getTags();
 
-  AgentSpan setTag(String key, boolean value);
+    AgentSpan setTag(String key, boolean value);
 
-  void setRequestBlockingAction(Flow.Action.RequestBlockingAction rba);
+    void setRequestBlockingAction(Flow.Action.RequestBlockingAction rba);
 
-  Flow.Action.RequestBlockingAction getRequestBlockingAction();
+    Flow.Action.RequestBlockingAction getRequestBlockingAction();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java b/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java
index 3aa95465e68..e21969b1c34 100644
--- a/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java
+++ b/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java
@@ -28,291 +28,287 @@
 import javax.annotation.Nonnull;
 
 public class InferredProxySpan implements ImplicitContextKeyed {
-  private static final ContextKey<InferredProxySpan> CONTEXT_KEY = named("inferred-proxy-key");
-  static final String PROXY_SYSTEM = "x-dd-proxy";
-  static final String PROXY_START_TIME_MS = "x-dd-proxy-request-time-ms";
-  static final String PROXY_PATH = "x-dd-proxy-path";
-  static final String PROXY_RESOURCE_PATH = "x-dd-proxy-resource-path";
-  static final String PROXY_HTTP_METHOD = "x-dd-proxy-httpmethod";
-  static final String PROXY_DOMAIN_NAME = "x-dd-proxy-domain-name";
-  static final String STAGE = "x-dd-proxy-stage";
-  // Optional tags
-  static final String PROXY_ACCOUNT_ID = "x-dd-proxy-account-id";
-  static final String PROXY_API_ID = "x-dd-proxy-api-id";
-  static final String PROXY_REGION = "x-dd-proxy-region";
-  static final Map<String, String> SUPPORTED_PROXIES;
-  static final String INSTRUMENTATION_NAME = "inferred_proxy";
-
-  static {
-    SUPPORTED_PROXIES = new HashMap<>();
-    SUPPORTED_PROXIES.put("aws-apigateway", "aws.apigateway");
-    SUPPORTED_PROXIES.put("aws-httpapi", "aws.httpapi");
-    SUPPORTED_PROXIES.put("azure-apim", "azure.apim");
-  }
-
-  private final Map<String, String> headers;
-  @VisibleForTesting AgentSpan span;
-  // Service-entry span registered at startSpan() time; used to guard against premature finishing
-  // by child spans (e.g., Spring MVC handler spans) before the response status is known.
-  private AgentSpan registeredServiceEntrySpan;
-  private boolean phasedFinished;
-
-  public static InferredProxySpan fromHeaders(Map<String, String> values) {
-    return new InferredProxySpan(values);
-  }
-
-  public static InferredProxySpan fromContext(Context context) {
-    return context.get(CONTEXT_KEY);
-  }
-
-  private InferredProxySpan(Map<String, String> headers) {
-    this.headers = headers == null ? Collections.emptyMap() : headers;
-  }
-
-  public boolean isValid() {
-    String startTimeStr = header(PROXY_START_TIME_MS);
-    String proxySystem = header(PROXY_SYSTEM);
-    return startTimeStr != null
-        && proxySystem != null
-        && SUPPORTED_PROXIES.containsKey(proxySystem);
-  }
-
-  public AgentSpanContext start(AgentSpanContext extracted) {
-    if (this.span != null || !isValid()) {
-      return extracted;
+    private static final ContextKey<InferredProxySpan> CONTEXT_KEY = named("inferred-proxy-key");
+    static final String PROXY_SYSTEM = "x-dd-proxy";
+    static final String PROXY_START_TIME_MS = "x-dd-proxy-request-time-ms";
+    static final String PROXY_PATH = "x-dd-proxy-path";
+    static final String PROXY_RESOURCE_PATH = "x-dd-proxy-resource-path";
+    static final String PROXY_HTTP_METHOD = "x-dd-proxy-httpmethod";
+    static final String PROXY_DOMAIN_NAME = "x-dd-proxy-domain-name";
+    static final String STAGE = "x-dd-proxy-stage";
+    // Optional tags
+    static final String PROXY_ACCOUNT_ID = "x-dd-proxy-account-id";
+    static final String PROXY_API_ID = "x-dd-proxy-api-id";
+    static final String PROXY_REGION = "x-dd-proxy-region";
+    static final Map<String, String> SUPPORTED_PROXIES;
+    static final String INSTRUMENTATION_NAME = "inferred_proxy";
+
+    static {
+        SUPPORTED_PROXIES = new HashMap<>();
+        SUPPORTED_PROXIES.put("aws-apigateway", "aws.apigateway");
+        SUPPORTED_PROXIES.put("aws-httpapi", "aws.httpapi");
+        SUPPORTED_PROXIES.put("azure-apim", "azure.apim");
     }
 
-    long startTime;
-    try {
-      startTime = Long.parseLong(header(PROXY_START_TIME_MS)) * 1000; // Convert to microseconds
-    } catch (NumberFormatException e) {
-      return extracted; // Invalid timestamp
-    }
-
-    String proxySystem = header(PROXY_SYSTEM);
-    String proxy = SUPPORTED_PROXIES.get(proxySystem);
-    String httpMethod = header(PROXY_HTTP_METHOD);
-    String path = header(PROXY_PATH);
-    String resourcePath = header(PROXY_RESOURCE_PATH);
-    String domainName = header(PROXY_DOMAIN_NAME);
-
-    AgentSpan span = AgentTracer.get().startSpan(INSTRUMENTATION_NAME, proxy, extracted, startTime);
-
-    // Service: value of x-dd-proxy-domain-name or global config if not found
-    String serviceName =
-        domainName != null && !domainName.isEmpty() ? domainName : Config.get().getServiceName();
-    span.setServiceName(serviceName, INSTRUMENTATION_NAME);
-
-    // Component: aws-apigateway or aws-httpapi
-    span.setTag(COMPONENT, proxySystem);
-
-    // Span kind: server
-    span.setTag(SPAN_KIND, SPAN_KIND_SERVER);
-
-    // SpanType: web
-    span.setTag(SPAN_TYPE, "web");
-
-    // Http.method - value of x-dd-proxy-httpmethod
-    span.setTag(HTTP_METHOD, httpMethod);
-
-    // Http.url - https:// + x-dd-proxy-domain-name + x-dd-proxy-path
-    span.setTag(
-        HTTP_URL,
-        domainName != null && !domainName.isEmpty() ? "https://" + domainName + path : path);
+    private final Map<String, String> headers;
 
-    // Http.route - value of x-dd-proxy-resource-path (or x-dd-proxy-path as fallback)
-    span.setTag(HTTP_ROUTE, resourcePath != null && !resourcePath.isEmpty() ? resourcePath : path);
+    @VisibleForTesting
+    AgentSpan span;
+    // Service-entry span registered at startSpan() time; used to guard against premature finishing
+    // by child spans (e.g., Spring MVC handler spans) before the response status is known.
+    private AgentSpan registeredServiceEntrySpan;
+    private boolean phasedFinished;
 
-    // "stage" - value of x-dd-proxy-stage
-    span.setTag("stage", header(STAGE));
-
-    // Optional tags - only set if present
-    String accountId = header(PROXY_ACCOUNT_ID);
-    if (accountId != null && !accountId.isEmpty()) {
-      span.setTag("account_id", accountId);
-    }
-
-    String apiId = header(PROXY_API_ID);
-    if (apiId != null && !apiId.isEmpty()) {
-      span.setTag("apiid", apiId);
-    }
-
-    String region = header(PROXY_REGION);
-    if (region != null && !region.isEmpty()) {
-      span.setTag("region", region);
+    public static InferredProxySpan fromHeaders(Map<String, String> values) {
+        return new InferredProxySpan(values);
     }
 
-    // Compute and set dd_resource_key (ARN) if we have region and apiId
-    if (region != null && !region.isEmpty() && apiId != null && !apiId.isEmpty()) {
-      String arn = computeArn(proxySystem, region, apiId);
-      if (arn != null) {
-        span.setTag("dd_resource_key", arn);
-      }
+    public static InferredProxySpan fromContext(Context context) {
+        return context.get(CONTEXT_KEY);
     }
 
-    // _dd.inferred_span = 1 (indicates that this is an inferred span)
-    span.setTag("_dd.inferred_span", 1);
-
-    // Resource Name: <Method> <Route> when route available, else <Method> <Path>
-    // Prefer x-dd-proxy-resource-path (route) over x-dd-proxy-path (path)
-    // Use MANUAL_INSTRUMENTATION priority to prevent TagInterceptor from overriding
-    String routeOrPath = resourcePath != null && !resourcePath.isEmpty() ? resourcePath : path;
-    String resourceName =
-        httpMethod != null && routeOrPath != null ? httpMethod + " " + routeOrPath : null;
-    if (resourceName != null) {
-      span.setResourceName(resourceName, MANUAL_INSTRUMENTATION);
+    private InferredProxySpan(Map<String, String> headers) {
+        this.headers = headers == null ? Collections.emptyMap() : headers;
     }
 
-    // Free collected headers
-    this.headers.clear();
-    // Store inferred span
-    this.span = span;
-    // Return inferred span as new parent context
-    return this.span.spanContext();
-  }
-
-  private String header(String name) {
-    return this.headers.get(name);
-  }
-
-  /**
-   * Compute ARN for the API Gateway resource. Format for v1 REST:
-   * arn:aws:apigateway:{region}::/restapis/{api-id} Format for v2 HTTP:
-   * arn:aws:apigateway:{region}::/apis/{api-id}
-   */
-  @VisibleForTesting
-  String computeArn(String proxySystem, String region, String apiId) {
-    if (proxySystem == null || region == null || apiId == null) {
-      return null;
+    public boolean isValid() {
+        String startTimeStr = header(PROXY_START_TIME_MS);
+        String proxySystem = header(PROXY_SYSTEM);
+        return startTimeStr != null && proxySystem != null && SUPPORTED_PROXIES.containsKey(proxySystem);
     }
 
-    // Assume AWS partition (could be extended to support other partitions like aws-cn, aws-us-gov)
-    String partition = "aws";
-
-    // Determine resource type based on proxy system
-    String resourceType;
-    if ("aws-apigateway".equals(proxySystem)) {
-      resourceType = "restapis"; // v1 REST API
-    } else if ("aws-httpapi".equals(proxySystem)) {
-      resourceType = "apis"; // v2 HTTP API
-    } else {
-      return null; // Unknown proxy type
+    public AgentSpanContext start(AgentSpanContext extracted) {
+        if (this.span != null || !isValid()) {
+            return extracted;
+        }
+
+        long startTime;
+        try {
+            startTime = Long.parseLong(header(PROXY_START_TIME_MS)) * 1000; // Convert to microseconds
+        } catch (NumberFormatException e) {
+            return extracted; // Invalid timestamp
+        }
+
+        String proxySystem = header(PROXY_SYSTEM);
+        String proxy = SUPPORTED_PROXIES.get(proxySystem);
+        String httpMethod = header(PROXY_HTTP_METHOD);
+        String path = header(PROXY_PATH);
+        String resourcePath = header(PROXY_RESOURCE_PATH);
+        String domainName = header(PROXY_DOMAIN_NAME);
+
+        AgentSpan span = AgentTracer.get().startSpan(INSTRUMENTATION_NAME, proxy, extracted, startTime);
+
+        // Service: value of x-dd-proxy-domain-name or global config if not found
+        String serviceName = domainName != null && !domainName.isEmpty()
+                ? domainName
+                : Config.get().getServiceName();
+        span.setServiceName(serviceName, INSTRUMENTATION_NAME);
+
+        // Component: aws-apigateway or aws-httpapi
+        span.setTag(COMPONENT, proxySystem);
+
+        // Span kind: server
+        span.setTag(SPAN_KIND, SPAN_KIND_SERVER);
+
+        // SpanType: web
+        span.setTag(SPAN_TYPE, "web");
+
+        // Http.method - value of x-dd-proxy-httpmethod
+        span.setTag(HTTP_METHOD, httpMethod);
+
+        // Http.url - https:// + x-dd-proxy-domain-name + x-dd-proxy-path
+        span.setTag(HTTP_URL, domainName != null && !domainName.isEmpty() ? "https://" + domainName + path : path);
+
+        // Http.route - value of x-dd-proxy-resource-path (or x-dd-proxy-path as fallback)
+        span.setTag(HTTP_ROUTE, resourcePath != null && !resourcePath.isEmpty() ? resourcePath : path);
+
+        // "stage" - value of x-dd-proxy-stage
+        span.setTag("stage", header(STAGE));
+
+        // Optional tags - only set if present
+        String accountId = header(PROXY_ACCOUNT_ID);
+        if (accountId != null && !accountId.isEmpty()) {
+            span.setTag("account_id", accountId);
+        }
+
+        String apiId = header(PROXY_API_ID);
+        if (apiId != null && !apiId.isEmpty()) {
+            span.setTag("apiid", apiId);
+        }
+
+        String region = header(PROXY_REGION);
+        if (region != null && !region.isEmpty()) {
+            span.setTag("region", region);
+        }
+
+        // Compute and set dd_resource_key (ARN) if we have region and apiId
+        if (region != null && !region.isEmpty() && apiId != null && !apiId.isEmpty()) {
+            String arn = computeArn(proxySystem, region, apiId);
+            if (arn != null) {
+                span.setTag("dd_resource_key", arn);
+            }
+        }
+
+        // _dd.inferred_span = 1 (indicates that this is an inferred span)
+        span.setTag("_dd.inferred_span", 1);
+
+        // Resource Name: <Method> <Route> when route available, else <Method> <Path>
+        // Prefer x-dd-proxy-resource-path (route) over x-dd-proxy-path (path)
+        // Use MANUAL_INSTRUMENTATION priority to prevent TagInterceptor from overriding
+        String routeOrPath = resourcePath != null && !resourcePath.isEmpty() ? resourcePath : path;
+        String resourceName = httpMethod != null && routeOrPath != null ? httpMethod + " " + routeOrPath : null;
+        if (resourceName != null) {
+            span.setResourceName(resourceName, MANUAL_INSTRUMENTATION);
+        }
+
+        // Free collected headers
+        this.headers.clear();
+        // Store inferred span
+        this.span = span;
+        // Return inferred span as new parent context
+        return this.span.spanContext();
     }
 
-    return String.format("arn:%s:apigateway:%s::/%s/%s", partition, region, resourceType, apiId);
-  }
-
-  /**
-   * Registers the service-entry span for this inferred proxy span. This allows {@link
-   * #finish(AgentSpan)} to distinguish between premature finish calls from child handler spans
-   * (e.g., Spring MVC) and the final finish call from the service-entry span after the response is
-   * written.
-   */
-  public void registerServiceEntrySpan(AgentSpan serviceEntrySpan) {
-    this.registeredServiceEntrySpan = serviceEntrySpan;
-  }
-
-  public void finish() {
-    finish(null);
-  }
-
-  /**
-   * Finishes this inferred proxy span, copying relevant tags from the given span.
-   *
-   * <p>When a service-entry span is registered (via {@link #registerServiceEntrySpan}), this method
-   * distinguishes between two callers:
-   *
-   * <ul>
-   *   <li><b>Non-service-entry caller</b> (e.g., Spring MVC handler span): copies available tags
-   *       (AppSec) and calls {@link AgentSpan#phasedFinish()} to record duration without
-   *       publishing. The span stays alive so HTTP tags can be added later.
-   *   <li><b>Service-entry caller</b>: copies all tags including HTTP status/error/useragent, then
-   *       publishes the span (via {@link AgentSpan#publish()} if phasedFinished, or {@link
-   *       AgentSpan#finish()} otherwise).
-   * </ul>
-   *
-   * @param callerSpan the span calling finish, used to copy tags and determine caller type
-   */
-  public void finish(AgentSpan callerSpan) {
-    if (this.span == null) {
-      return;
+    private String header(String name) {
+        return this.headers.get(name);
     }
 
-    boolean isServiceEntryOrFallback =
-        registeredServiceEntrySpan == null
-            || callerSpan == null
-            || callerSpan == registeredServiceEntrySpan;
-
-    if (isServiceEntryOrFallback) {
-      // Final call: copy all tags (AppSec + HTTP status/error/useragent) and close the span
-      copyTagsFromServiceEntry(callerSpan);
-      if (phasedFinished) {
-        this.span.publish();
-      } else {
-        this.span.finish();
-      }
-      this.span = null;
-      this.registeredServiceEntrySpan = null;
-      this.phasedFinished = false;
-    } else if (!phasedFinished) {
-      // First non-service-entry call (e.g., Spring MVC handler span fires beforeFinish() before
-      // the response is written): copy available tags (AppSec) and phase-finish to record
-      // duration, but keep the span alive so the service-entry call can add HTTP tags later.
-      copyTagsFromServiceEntry(callerSpan);
-      this.span.phasedFinish();
-      this.phasedFinished = true;
-    }
-    // If already phasedFinished and caller is not service-entry: ignore duplicate calls
-  }
-
-  /**
-   * Copies relevant tags from the service-entry span to this inferred proxy span. This includes
-   * AppSec tags required by RFC-1081, plus HTTP tags that are only known after the request
-   * completes ({@code http.status_code}, {@code error}, {@code http.useragent}).
-   */
-  private void copyTagsFromServiceEntry(AgentSpan serviceEntrySpan) {
-    if (serviceEntrySpan == null || serviceEntrySpan == this.span) {
-      return;
+    /**
+     * Compute ARN for the API Gateway resource. Format for v1 REST:
+     * arn:aws:apigateway:{region}::/restapis/{api-id} Format for v2 HTTP:
+     * arn:aws:apigateway:{region}::/apis/{api-id}
+     */
+    @VisibleForTesting
+    String computeArn(String proxySystem, String region, String apiId) {
+        if (proxySystem == null || region == null || apiId == null) {
+            return null;
+        }
+
+        // Assume AWS partition (could be extended to support other partitions like aws-cn, aws-us-gov)
+        String partition = "aws";
+
+        // Determine resource type based on proxy system
+        String resourceType;
+        if ("aws-apigateway".equals(proxySystem)) {
+            resourceType = "restapis"; // v1 REST API
+        } else if ("aws-httpapi".equals(proxySystem)) {
+            resourceType = "apis"; // v2 HTTP API
+        } else {
+            return null; // Unknown proxy type
+        }
+
+        return String.format("arn:%s:apigateway:%s::/%s/%s", partition, region, resourceType, apiId);
     }
 
-    Object appsecEnabled = serviceEntrySpan.getTag("_dd.appsec.enabled");
-    if (appsecEnabled != null) {
-      this.span.setMetric("_dd.appsec.enabled", 1);
+    /**
+     * Registers the service-entry span for this inferred proxy span. This allows {@link
+     * #finish(AgentSpan)} to distinguish between premature finish calls from child handler spans
+     * (e.g., Spring MVC) and the final finish call from the service-entry span after the response is
+     * written.
+     */
+    public void registerServiceEntrySpan(AgentSpan serviceEntrySpan) {
+        this.registeredServiceEntrySpan = serviceEntrySpan;
     }
 
-    Object appsecJson = serviceEntrySpan.getTag("_dd.appsec.json");
-    if (appsecJson != null) {
-      this.span.setTag("_dd.appsec.json", appsecJson.toString());
+    public void finish() {
+        finish(null);
     }
 
-    short statusCode = serviceEntrySpan.getHttpStatusCode();
-    if (statusCode > 0) {
-      this.span.setHttpStatusCode(statusCode);
-      boolean isError = Config.get().getHttpServerErrorStatuses().get(statusCode);
-      this.span.setError(isError, HTTP_SERVER_DECORATOR);
+    /**
+     * Finishes this inferred proxy span, copying relevant tags from the given span.
+     *
+     * <p>When a service-entry span is registered (via {@link #registerServiceEntrySpan}), this method
+     * distinguishes between two callers:
+     *
+     * <ul>
+     *   <li><b>Non-service-entry caller</b> (e.g., Spring MVC handler span): copies available tags
+     *       (AppSec) and calls {@link AgentSpan#phasedFinish()} to record duration without
+     *       publishing. The span stays alive so HTTP tags can be added later.
+     *   <li><b>Service-entry caller</b>: copies all tags including HTTP status/error/useragent, then
+     *       publishes the span (via {@link AgentSpan#publish()} if phasedFinished, or {@link
+     *       AgentSpan#finish()} otherwise).
+     * </ul>
+     *
+     * @param callerSpan the span calling finish, used to copy tags and determine caller type
+     */
+    public void finish(AgentSpan callerSpan) {
+        if (this.span == null) {
+            return;
+        }
+
+        boolean isServiceEntryOrFallback =
+                registeredServiceEntrySpan == null || callerSpan == null || callerSpan == registeredServiceEntrySpan;
+
+        if (isServiceEntryOrFallback) {
+            // Final call: copy all tags (AppSec + HTTP status/error/useragent) and close the span
+            copyTagsFromServiceEntry(callerSpan);
+            if (phasedFinished) {
+                this.span.publish();
+            } else {
+                this.span.finish();
+            }
+            this.span = null;
+            this.registeredServiceEntrySpan = null;
+            this.phasedFinished = false;
+        } else if (!phasedFinished) {
+            // First non-service-entry call (e.g., Spring MVC handler span fires beforeFinish() before
+            // the response is written): copy available tags (AppSec) and phase-finish to record
+            // duration, but keep the span alive so the service-entry call can add HTTP tags later.
+            copyTagsFromServiceEntry(callerSpan);
+            this.span.phasedFinish();
+            this.phasedFinished = true;
+        }
+        // If already phasedFinished and caller is not service-entry: ignore duplicate calls
     }
 
-    Object userAgent = serviceEntrySpan.getTag(HTTP_USER_AGENT);
-    if (userAgent != null) {
-      this.span.setTag(HTTP_USER_AGENT, userAgent.toString());
+    /**
+     * Copies relevant tags from the service-entry span to this inferred proxy span. This includes
+     * AppSec tags required by RFC-1081, plus HTTP tags that are only known after the request
+     * completes ({@code http.status_code}, {@code error}, {@code http.useragent}).
+     */
+    private void copyTagsFromServiceEntry(AgentSpan serviceEntrySpan) {
+        if (serviceEntrySpan == null || serviceEntrySpan == this.span) {
+            return;
+        }
+
+        Object appsecEnabled = serviceEntrySpan.getTag("_dd.appsec.enabled");
+        if (appsecEnabled != null) {
+            this.span.setMetric("_dd.appsec.enabled", 1);
+        }
+
+        Object appsecJson = serviceEntrySpan.getTag("_dd.appsec.json");
+        if (appsecJson != null) {
+            this.span.setTag("_dd.appsec.json", appsecJson.toString());
+        }
+
+        short statusCode = serviceEntrySpan.getHttpStatusCode();
+        if (statusCode > 0) {
+            this.span.setHttpStatusCode(statusCode);
+            boolean isError = Config.get().getHttpServerErrorStatuses().get(statusCode);
+            this.span.setError(isError, HTTP_SERVER_DECORATOR);
+        }
+
+        Object userAgent = serviceEntrySpan.getTag(HTTP_USER_AGENT);
+        if (userAgent != null) {
+            this.span.setTag(HTTP_USER_AGENT, userAgent.toString());
+        }
+
+        // Forward the Datadog scan/test markers so the API endpoint reducer can keep
+        // scan/test traffic out of the inventory even when the local root is the inferred span.
+        // These markers are only tagged on the service-entry span (by HttpServerDecorator), so
+        // calls from non-service-entry handler spans during phasedFinish are no-ops here.
+        Object endpointScan = serviceEntrySpan.getTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN);
+        if (endpointScan != null) {
+            this.span.setTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN, endpointScan.toString());
+        }
+        Object securityTest = serviceEntrySpan.getTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST);
+        if (securityTest != null) {
+            this.span.setTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST, securityTest.toString());
+        }
     }
 
-    // Forward the Datadog scan/test markers so the API endpoint reducer can keep
-    // scan/test traffic out of the inventory even when the local root is the inferred span.
-    // These markers are only tagged on the service-entry span (by HttpServerDecorator), so
-    // calls from non-service-entry handler spans during phasedFinish are no-ops here.
-    Object endpointScan = serviceEntrySpan.getTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN);
-    if (endpointScan != null) {
-      this.span.setTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN, endpointScan.toString());
+    @Override
+    public Context storeInto(@Nonnull Context context) {
+        return context.with(CONTEXT_KEY, this);
     }
-    Object securityTest = serviceEntrySpan.getTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST);
-    if (securityTest != null) {
-      this.span.setTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST, securityTest.toString());
-    }
-  }
-
-  @Override
-  public Context storeInto(@Nonnull Context context) {
-    return context.with(CONTEXT_KEY, this);
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/InstrumentationGateway.java b/internal-api/src/main/java/datadog/trace/api/gateway/InstrumentationGateway.java
index 0de586969a4..1085b519659 100644
--- a/internal-api/src/main/java/datadog/trace/api/gateway/InstrumentationGateway.java
+++ b/internal-api/src/main/java/datadog/trace/api/gateway/InstrumentationGateway.java
@@ -52,535 +52,494 @@
 
 /** The implementation of the {@code CallbackProvider} and {@code SubscriptionService}. */
 public class InstrumentationGateway {
-  private static final Logger log = LoggerFactory.getLogger(InstrumentationGateway.class);
-
-  private final IGCallbackRegistry callbackRegistryAppSec;
-  private final IGCallbackRegistry callbackRegistryIast;
-  private final UniversalCallbackProvider universalCallbackProvider;
-
-  public InstrumentationGateway() {
-    this.callbackRegistryAppSec = new IGCallbackRegistry();
-    this.callbackRegistryIast = new IGCallbackRegistry();
-    this.universalCallbackProvider = new UniversalCallbackProvider();
-  }
-
-  public SubscriptionService getSubscriptionService(RequestContextSlot slot) {
-    if (slot == RequestContextSlot.APPSEC) {
-      return this.callbackRegistryAppSec;
-    } else if (slot == RequestContextSlot.IAST) {
-      return this.callbackRegistryIast;
-    } else {
-      return SubscriptionService.SubscriptionServiceNoop.INSTANCE;
-    }
-  }
-
-  public CallbackProvider getCallbackProvider(RequestContextSlot slot) {
-    if (slot == RequestContextSlot.APPSEC) {
-      return this.callbackRegistryAppSec;
-    } else if (slot == RequestContextSlot.IAST) {
-      return this.callbackRegistryIast;
-    } else {
-      return CallbackProvider.CallbackProviderNoop.INSTANCE;
-    }
-  }
-
-  // for tests
-  void reset() {
-    this.callbackRegistryAppSec.reset();
-    this.callbackRegistryIast.reset();
-    this.universalCallbackProvider.reset();
-  }
-
-  public CallbackProvider getUniversalCallbackProvider() {
-    return this.universalCallbackProvider;
-  }
-
-  private class UniversalCallbackProvider implements CallbackProvider {
-    final AtomicReferenceArray<Object> callbacks = new AtomicReferenceArray<>(MAX_EVENTS);
-
-    @Override
-    public <C> C getCallback(EventType<C> eventType) {
-      int id = eventType.getId();
-      C cb = (C) callbacks.get(id);
-      if (cb != null) {
-        return cb;
-      }
-
-      cb = universalCallback(eventType);
-      if (!callbacks.compareAndSet(id, null, cb)) {
-        return getCallback(eventType);
-      }
-      return cb;
+    private static final Logger log = LoggerFactory.getLogger(InstrumentationGateway.class);
+
+    private final IGCallbackRegistry callbackRegistryAppSec;
+    private final IGCallbackRegistry callbackRegistryIast;
+    private final UniversalCallbackProvider universalCallbackProvider;
+
+    public InstrumentationGateway() {
+        this.callbackRegistryAppSec = new IGCallbackRegistry();
+        this.callbackRegistryIast = new IGCallbackRegistry();
+        this.universalCallbackProvider = new UniversalCallbackProvider();
     }
 
-    void reset() {
-      for (int i = 0; i < callbacks.length(); i++) {
-        callbacks.set(i, null);
-      }
+    public SubscriptionService getSubscriptionService(RequestContextSlot slot) {
+        if (slot == RequestContextSlot.APPSEC) {
+            return this.callbackRegistryAppSec;
+        } else if (slot == RequestContextSlot.IAST) {
+            return this.callbackRegistryIast;
+        } else {
+            return SubscriptionService.SubscriptionServiceNoop.INSTANCE;
+        }
     }
-  }
 
-  private class IGCallbackRegistry implements CallbackProvider, SubscriptionService {
-    private final AtomicReferenceArray<Object> callbacks = new AtomicReferenceArray<>(MAX_EVENTS);
+    public CallbackProvider getCallbackProvider(RequestContextSlot slot) {
+        if (slot == RequestContextSlot.APPSEC) {
+            return this.callbackRegistryAppSec;
+        } else if (slot == RequestContextSlot.IAST) {
+            return this.callbackRegistryIast;
+        } else {
+            return CallbackProvider.CallbackProviderNoop.INSTANCE;
+        }
+    }
 
     // for tests
-    public void reset() {
-      for (int i = 0; i < callbacks.length(); i++) {
-        callbacks.set(i, null);
-      }
+    void reset() {
+        this.callbackRegistryAppSec.reset();
+        this.callbackRegistryIast.reset();
+        this.universalCallbackProvider.reset();
     }
 
-    void reset(EventType<?> et) {
-      callbacks.set(et.getId(), null);
+    public CallbackProvider getUniversalCallbackProvider() {
+        return this.universalCallbackProvider;
     }
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public <C> C getCallback(EventType<C> eventType) {
-      return (C) callbacks.get(eventType.getId());
-    }
+    private class UniversalCallbackProvider implements CallbackProvider {
+        final AtomicReferenceArray<Object> callbacks = new AtomicReferenceArray<>(MAX_EVENTS);
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public <C> Subscription registerCallback(final EventType<C> eventType, final C callback) {
-      final C wrapped = wrap(eventType, callback);
-      final int id = eventType.getId();
-      if (!callbacks.compareAndSet(id, null, wrapped)) {
-        C existing = (C) callbacks.get(id);
-        String message =
-            "Trying to overwrite existing callback " + existing + " for event type " + eventType;
-        log.warn(message);
-        throw new IllegalStateException(message);
-      }
-
-      universalCallbackProvider.callbacks.set(id, null);
-
-      return new Subscription() {
         @Override
-        public void cancel() {
-          if (!callbacks.compareAndSet(id, wrapped, null)) {
-            if (log.isDebugEnabled()) {
-              log.debug("Failed to unregister callback {} for event type {}", callback, eventType);
+        public <C> C getCallback(EventType<C> eventType) {
+            int id = eventType.getId();
+            C cb = (C) callbacks.get(id);
+            if (cb != null) {
+                return cb;
             }
-          }
+
+            cb = universalCallback(eventType);
+            if (!callbacks.compareAndSet(id, null, cb)) {
+                return getCallback(eventType);
+            }
+            return cb;
         }
-      };
-    }
-  }
-
-  /** Ensure that callbacks don't leak exceptions */
-  @SuppressWarnings({"unchecked", "DuplicateBranchesInSwitch"})
-  public static <C> C wrap(final EventType<C> eventType, final C callback) {
-    switch (eventType.getId()) {
-      case REQUEST_STARTED_ID:
-        return (C)
-            new Supplier<Flow<Object>>() {
-              @Override
-              public Flow<Object> get() {
-                try {
-                  return ((Supplier<Flow<Object>>) callback).get();
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
-                }
-              }
 
-              // Make testing easier by delegating equals
-              @Override
-              public boolean equals(Object obj) {
-                return callback.equals(obj);
-              }
-            };
-      case REQUEST_ENDED_ID:
-        return (C)
-            new BiFunction<RequestContext, IGSpanInfo, Flow<Void>>() {
-              @Override
-              public Flow<Void> apply(RequestContext ctx, IGSpanInfo agentSpan) {
-                try {
-                  return ((BiFunction<RequestContext, IGSpanInfo, Flow<Void>>) callback)
-                      .apply(ctx, agentSpan);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
-                }
-              }
+        void reset() {
+            for (int i = 0; i < callbacks.length(); i++) {
+                callbacks.set(i, null);
+            }
+        }
+    }
 
-              // Make testing easier by delegating equals
-              @Override
-              public boolean equals(Object obj) {
-                return callback.equals(obj);
-              }
-            };
-      case REQUEST_HEADER_DONE_ID:
-      case RESPONSE_HEADER_DONE_ID:
-        return (C)
-            new Function<RequestContext, Flow<Void>>() {
-              @Override
-              public Flow<Void> apply(RequestContext ctx) {
-                try {
-                  return ((Function<RequestContext, Flow<Void>>) callback).apply(ctx);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
-                }
-              }
+    private class IGCallbackRegistry implements CallbackProvider, SubscriptionService {
+        private final AtomicReferenceArray<Object> callbacks = new AtomicReferenceArray<>(MAX_EVENTS);
 
-              // Make testing easier by delegating equals
-              @Override
-              public boolean equals(Object obj) {
-                return callback.equals(obj);
-              }
-            };
-      case REQUEST_HEADER_ID:
-      case RESPONSE_HEADER_ID:
-        return (C)
-            new TriConsumer<RequestContext, String, String>() {
-              @Override
-              public void accept(RequestContext ctx, String key, String value) {
-                try {
-                  ((TriConsumer<RequestContext, String, String>) callback).accept(ctx, key, value);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                }
-              }
+        // for tests
+        public void reset() {
+            for (int i = 0; i < callbacks.length(); i++) {
+                callbacks.set(i, null);
+            }
+        }
 
-              // Make testing easier by delegating equals
-              @Override
-              public boolean equals(Object obj) {
-                return callback.equals(obj);
-              }
-            };
-      case REQUEST_METHOD_URI_RAW_ID:
-        return (C)
-            new TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>>() {
-              @Override
-              public Flow<Void> apply(RequestContext ctx, String method, URIDataAdapter adapter) {
-                try {
-                  return ((TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>>)
-                          callback)
-                      .apply(ctx, method, adapter);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
-                }
-              }
+        void reset(EventType<?> et) {
+            callbacks.set(et.getId(), null);
+        }
 
-              // Make testing easier by delegating equals
-              @Override
-              public boolean equals(Object obj) {
-                return callback.equals(obj);
-              }
-            };
-      case REQUEST_PATH_PARAMS_ID:
-        return (C)
-            new BiFunction<RequestContext, Map<String, Object>, Flow<Void>>() {
-              @Override
-              public Flow<Void> apply(RequestContext ctx, Map<String, Object> map) {
-                try {
-                  return ((BiFunction<RequestContext, Map<String, Object>, Flow<Void>>) callback)
-                      .apply(ctx, map);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
-                }
-              }
+        @Override
+        @SuppressWarnings("unchecked")
+        public <C> C getCallback(EventType<C> eventType) {
+            return (C) callbacks.get(eventType.getId());
+        }
 
-              // Make testing easier by delegating equals
-              @Override
-              public boolean equals(Object obj) {
-                return callback.equals(obj);
-              }
-            };
-      case REQUEST_CLIENT_SOCKET_ADDRESS_ID:
-        return (C)
-            new TriFunction<RequestContext, String, Integer, Flow<Void>>() {
-              @Override
-              public Flow<Void> apply(RequestContext ctx, String ip, Integer port) {
-                try {
-                  return ((TriFunction<RequestContext, String, Integer, Flow<Void>>) callback)
-                      .apply(ctx, ip, port);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
-                }
-              }
+        @Override
+        @SuppressWarnings("unchecked")
+        public <C> Subscription registerCallback(final EventType<C> eventType, final C callback) {
+            final C wrapped = wrap(eventType, callback);
+            final int id = eventType.getId();
+            if (!callbacks.compareAndSet(id, null, wrapped)) {
+                C existing = (C) callbacks.get(id);
+                String message = "Trying to overwrite existing callback " + existing + " for event type " + eventType;
+                log.warn(message);
+                throw new IllegalStateException(message);
+            }
 
-              // Make testing easier by delegating equals
-              @Override
-              public boolean equals(Object obj) {
-                return callback.equals(obj);
-              }
-            };
-      case GRPC_SERVER_METHOD_ID:
-      case REQUEST_INFERRED_CLIENT_ADDRESS_ID:
-        return (C)
-            new BiFunction<RequestContext, String, Flow<Void>>() {
-              @Override
-              public Flow<Void> apply(RequestContext ctx, String ip) {
-                try {
-                  return ((BiFunction<RequestContext, String, Flow<Void>>) callback).apply(ctx, ip);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
-                }
-              }
+            universalCallbackProvider.callbacks.set(id, null);
 
-              // Make testing easier by delegating equals
-              @Override
-              public boolean equals(Object obj) {
-                return callback.equals(obj);
-              }
-            };
-      case REQUEST_BODY_START_ID:
-        return (C)
-            new BiFunction<RequestContext, StoredBodySupplier, Void>() {
-              @Override
-              public Void apply(RequestContext ctx, StoredBodySupplier storedBodySupplier) {
-                try {
-                  return ((BiFunction<RequestContext, StoredBodySupplier, Void>) callback)
-                      .apply(ctx, storedBodySupplier);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return null;
-                }
-              }
-            };
-      case REQUEST_BODY_DONE_ID:
-        return (C)
-            new BiFunction<RequestContext, StoredBodySupplier, Flow<Void>>() {
-              @Override
-              public Flow<Void> apply(RequestContext ctx, StoredBodySupplier storedBodySupplier) {
-                try {
-                  return ((BiFunction<RequestContext, StoredBodySupplier, Flow<Void>>) callback)
-                      .apply(ctx, storedBodySupplier);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
-                }
-              }
-            };
-      case GRPC_SERVER_REQUEST_MESSAGE_ID:
-      case GRAPHQL_SERVER_REQUEST_MESSAGE_ID:
-      case REQUEST_BODY_CONVERTED_ID:
-      case RESPONSE_BODY_ID:
-      case REQUEST_FILES_FILENAMES_ID:
-      case REQUEST_FILES_CONTENT_ID:
-        return (C)
-            new BiFunction<RequestContext, Object, Flow<Void>>() {
-              @Override
-              public Flow<Void> apply(RequestContext ctx, Object obj) {
-                try {
-                  return ((BiFunction<RequestContext, Object, Flow<Void>>) callback)
-                      .apply(ctx, obj);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
-                }
-              }
-            };
-      case RESPONSE_STARTED_ID:
-        return (C)
-            new BiFunction<RequestContext, Integer, Flow<Void>>() {
-              @Override
-              public Flow<Void> apply(RequestContext ctx, Integer status) {
-                try {
-                  return ((BiFunction<RequestContext, Integer, Flow<Void>>) callback)
-                      .apply(ctx, status);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
-                }
-              }
-            };
-      case DATABASE_CONNECTION_ID:
-      case HTTP_ROUTE_ID:
-        return (C)
-            new BiConsumer<RequestContext, String>() {
-              @Override
-              public void accept(RequestContext ctx, String arg) {
-                try {
-                  ((BiConsumer<RequestContext, String>) callback).accept(ctx, arg);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                }
-              }
-            };
-      case USER_ID:
-        return (C)
-            new BiFunction<RequestContext, String, Flow<Void>>() {
-              @Override
-              public Flow<Void> apply(RequestContext ctx, String userId) {
-                try {
-                  return ((BiFunction<RequestContext, String, Flow<Void>>) callback)
-                      .apply(ctx, userId);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
+            return new Subscription() {
+                @Override
+                public void cancel() {
+                    if (!callbacks.compareAndSet(id, wrapped, null)) {
+                        if (log.isDebugEnabled()) {
+                            log.debug("Failed to unregister callback {} for event type {}", callback, eventType);
+                        }
+                    }
                 }
-              }
             };
-      case LOGIN_EVENT_ID:
-        return (C)
-            new TriFunction<RequestContext, LoginEvent, String, Flow<Void>>() {
-
-              @Override
-              public Flow<Void> apply(RequestContext ctx, LoginEvent event, String user) {
-                try {
-                  return ((TriFunction<RequestContext, LoginEvent, String, Flow<Void>>) callback)
-                      .apply(ctx, event, user);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
-                }
-              }
-            };
-      case REQUEST_SESSION_ID:
-        return (C)
-            new BiFunction<RequestContext, String, Flow<Void>>() {
-              @Override
-              public Flow<Void> apply(RequestContext ctx, String arg) {
-                try {
-                  return ((BiFunction<RequestContext, String, Flow<Void>>) callback)
-                      .apply(ctx, arg);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
-                }
-              }
-            };
-      case DATABASE_SQL_QUERY_ID:
-      case FILE_LOADED_ID:
-      case FILE_WRITTEN_ID:
-      case SHELL_CMD_ID:
-        return (C)
-            new BiFunction<RequestContext, String, Flow<Void>>() {
-              @Override
-              public Flow<Void> apply(RequestContext ctx, String arg) {
-                try {
-                  return ((BiFunction<RequestContext, String, Flow<Void>>) callback)
-                      .apply(ctx, arg);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
-                }
-              }
-            };
-      case HTTP_CLIENT_REQUEST_ID:
-      case HTTP_CLIENT_RESPONSE_ID:
-        return (C)
-            new BiFunction<RequestContext, HttpClientPayload, Flow<Object>>() {
-              @Override
-              public Flow<Object> apply(RequestContext ctx, HttpClientPayload arg) {
-                try {
-                  return ((BiFunction<RequestContext, HttpClientPayload, Flow<Object>>) callback)
-                      .apply(ctx, arg);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
-                }
-              }
-            };
-      case HTTP_CLIENT_SAMPLING_ID:
-        return (C)
-            new BiFunction<RequestContext, Long, Flow<Object>>() {
-              @Override
-              public Flow<Object> apply(RequestContext ctx, Long requestId) {
-                try {
-                  return ((BiFunction<RequestContext, Long, Flow<Object>>) callback)
-                      .apply(ctx, requestId);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
-                }
-              }
-            };
-      case EXEC_CMD_ID:
-        return (C)
-            new BiFunction<RequestContext, String[], Flow<Void>>() {
-              @Override
-              public Flow<Void> apply(RequestContext ctx, String[] arg) {
-                try {
-                  return ((BiFunction<RequestContext, String[], Flow<Void>>) callback)
-                      .apply(ctx, arg);
-                } catch (Throwable t) {
-                  log.warn("Callback for {} threw.", eventType, t);
-                  return Flow.ResultFlow.empty();
-                }
-              }
-            };
-      default:
-        log.warn("Unwrapped callback for {}", eventType);
-        return callback;
-    }
-  }
-
-  private <C> C universalCallback(final EventType<C> eventType) {
-    final C callbackAppSec =
-        InstrumentationGateway.this.callbackRegistryAppSec.getCallback(eventType);
-    final C callbackIast = InstrumentationGateway.this.callbackRegistryIast.getCallback(eventType);
-    if (callbackAppSec == null && callbackIast == null) {
-      return null;
-    }
-    if (callbackAppSec != null && callbackIast == null) {
-      return callbackAppSec;
-    }
-    if (callbackAppSec == null && callbackIast != null) {
-      return callbackIast;
+        }
     }
 
-    switch (eventType.getId()) {
-      case REQUEST_ENDED_ID:
-        return (C)
-            (BiFunction<RequestContext, IGSpanInfo, Flow<Void>>)
-                (ctx, agentSpan) -> {
-                  Flow<Void> flowAppSec =
-                      ((BiFunction<RequestContext, IGSpanInfo, Flow<Void>>) callbackAppSec)
-                          .apply(ctx, agentSpan);
-                  Flow<Void> flowIast =
-                      ((BiFunction<RequestContext, IGSpanInfo, Flow<Void>>) callbackIast)
-                          .apply(ctx, agentSpan);
-                  return mergeFlows(flowAppSec, flowIast);
+    /** Ensure that callbacks don't leak exceptions */
+    @SuppressWarnings({"unchecked", "DuplicateBranchesInSwitch"})
+    public static <C> C wrap(final EventType<C> eventType, final C callback) {
+        switch (eventType.getId()) {
+            case REQUEST_STARTED_ID:
+                return (C) new Supplier<Flow<Object>>() {
+                    @Override
+                    public Flow<Object> get() {
+                        try {
+                            return ((Supplier<Flow<Object>>) callback).get();
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
+
+                    // Make testing easier by delegating equals
+                    @Override
+                    public boolean equals(Object obj) {
+                        return callback.equals(obj);
+                    }
+                };
+            case REQUEST_ENDED_ID:
+                return (C) new BiFunction<RequestContext, IGSpanInfo, Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext ctx, IGSpanInfo agentSpan) {
+                        try {
+                            return ((BiFunction<RequestContext, IGSpanInfo, Flow<Void>>) callback)
+                                    .apply(ctx, agentSpan);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
+
+                    // Make testing easier by delegating equals
+                    @Override
+                    public boolean equals(Object obj) {
+                        return callback.equals(obj);
+                    }
+                };
+            case REQUEST_HEADER_DONE_ID:
+            case RESPONSE_HEADER_DONE_ID:
+                return (C) new Function<RequestContext, Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext ctx) {
+                        try {
+                            return ((Function<RequestContext, Flow<Void>>) callback).apply(ctx);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
+
+                    // Make testing easier by delegating equals
+                    @Override
+                    public boolean equals(Object obj) {
+                        return callback.equals(obj);
+                    }
+                };
+            case REQUEST_HEADER_ID:
+            case RESPONSE_HEADER_ID:
+                return (C) new TriConsumer<RequestContext, String, String>() {
+                    @Override
+                    public void accept(RequestContext ctx, String key, String value) {
+                        try {
+                            ((TriConsumer<RequestContext, String, String>) callback).accept(ctx, key, value);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                        }
+                    }
+
+                    // Make testing easier by delegating equals
+                    @Override
+                    public boolean equals(Object obj) {
+                        return callback.equals(obj);
+                    }
+                };
+            case REQUEST_METHOD_URI_RAW_ID:
+                return (C) new TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext ctx, String method, URIDataAdapter adapter) {
+                        try {
+                            return ((TriFunction<RequestContext, String, URIDataAdapter, Flow<Void>>) callback)
+                                    .apply(ctx, method, adapter);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
+
+                    // Make testing easier by delegating equals
+                    @Override
+                    public boolean equals(Object obj) {
+                        return callback.equals(obj);
+                    }
+                };
+            case REQUEST_PATH_PARAMS_ID:
+                return (C) new BiFunction<RequestContext, Map<String, Object>, Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext ctx, Map<String, Object> map) {
+                        try {
+                            return ((BiFunction<RequestContext, Map<String, Object>, Flow<Void>>) callback)
+                                    .apply(ctx, map);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
+
+                    // Make testing easier by delegating equals
+                    @Override
+                    public boolean equals(Object obj) {
+                        return callback.equals(obj);
+                    }
+                };
+            case REQUEST_CLIENT_SOCKET_ADDRESS_ID:
+                return (C) new TriFunction<RequestContext, String, Integer, Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext ctx, String ip, Integer port) {
+                        try {
+                            return ((TriFunction<RequestContext, String, Integer, Flow<Void>>) callback)
+                                    .apply(ctx, ip, port);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
+
+                    // Make testing easier by delegating equals
+                    @Override
+                    public boolean equals(Object obj) {
+                        return callback.equals(obj);
+                    }
+                };
+            case GRPC_SERVER_METHOD_ID:
+            case REQUEST_INFERRED_CLIENT_ADDRESS_ID:
+                return (C) new BiFunction<RequestContext, String, Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext ctx, String ip) {
+                        try {
+                            return ((BiFunction<RequestContext, String, Flow<Void>>) callback).apply(ctx, ip);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
+
+                    // Make testing easier by delegating equals
+                    @Override
+                    public boolean equals(Object obj) {
+                        return callback.equals(obj);
+                    }
+                };
+            case REQUEST_BODY_START_ID:
+                return (C) new BiFunction<RequestContext, StoredBodySupplier, Void>() {
+                    @Override
+                    public Void apply(RequestContext ctx, StoredBodySupplier storedBodySupplier) {
+                        try {
+                            return ((BiFunction<RequestContext, StoredBodySupplier, Void>) callback)
+                                    .apply(ctx, storedBodySupplier);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return null;
+                        }
+                    }
                 };
-      case REQUEST_HEADER_ID:
-        return (C)
-            (TriConsumer<RequestContext, String, String>)
-                (requestContext, s, s2) -> {
-                  ((TriConsumer<RequestContext, String, String>) callbackAppSec)
-                      .accept(requestContext, s, s2);
-                  ((TriConsumer<RequestContext, String, String>) callbackIast)
-                      .accept(requestContext, s, s2);
+            case REQUEST_BODY_DONE_ID:
+                return (C) new BiFunction<RequestContext, StoredBodySupplier, Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext ctx, StoredBodySupplier storedBodySupplier) {
+                        try {
+                            return ((BiFunction<RequestContext, StoredBodySupplier, Flow<Void>>) callback)
+                                    .apply(ctx, storedBodySupplier);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
                 };
-      case REQUEST_HEADER_DONE_ID:
-        return (C)
-            (Function<RequestContext, Flow<Void>>)
-                requestContext -> {
-                  Flow<Void> flowAppSec =
-                      ((Function<RequestContext, Flow<Void>>) callbackAppSec).apply(requestContext);
-                  Flow<Void> flowIast =
-                      ((Function<RequestContext, Flow<Void>>) callbackIast).apply(requestContext);
-                  return mergeFlows(flowAppSec, flowIast);
+            case GRPC_SERVER_REQUEST_MESSAGE_ID:
+            case GRAPHQL_SERVER_REQUEST_MESSAGE_ID:
+            case REQUEST_BODY_CONVERTED_ID:
+            case RESPONSE_BODY_ID:
+            case REQUEST_FILES_FILENAMES_ID:
+            case REQUEST_FILES_CONTENT_ID:
+                return (C) new BiFunction<RequestContext, Object, Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext ctx, Object obj) {
+                        try {
+                            return ((BiFunction<RequestContext, Object, Flow<Void>>) callback).apply(ctx, obj);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
                 };
+            case RESPONSE_STARTED_ID:
+                return (C) new BiFunction<RequestContext, Integer, Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext ctx, Integer status) {
+                        try {
+                            return ((BiFunction<RequestContext, Integer, Flow<Void>>) callback).apply(ctx, status);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
+                };
+            case DATABASE_CONNECTION_ID:
+            case HTTP_ROUTE_ID:
+                return (C) new BiConsumer<RequestContext, String>() {
+                    @Override
+                    public void accept(RequestContext ctx, String arg) {
+                        try {
+                            ((BiConsumer<RequestContext, String>) callback).accept(ctx, arg);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                        }
+                    }
+                };
+            case USER_ID:
+                return (C) new BiFunction<RequestContext, String, Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext ctx, String userId) {
+                        try {
+                            return ((BiFunction<RequestContext, String, Flow<Void>>) callback).apply(ctx, userId);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
+                };
+            case LOGIN_EVENT_ID:
+                return (C) new TriFunction<RequestContext, LoginEvent, String, Flow<Void>>() {
+
+                    @Override
+                    public Flow<Void> apply(RequestContext ctx, LoginEvent event, String user) {
+                        try {
+                            return ((TriFunction<RequestContext, LoginEvent, String, Flow<Void>>) callback)
+                                    .apply(ctx, event, user);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
+                };
+            case REQUEST_SESSION_ID:
+                return (C) new BiFunction<RequestContext, String, Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext ctx, String arg) {
+                        try {
+                            return ((BiFunction<RequestContext, String, Flow<Void>>) callback).apply(ctx, arg);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
+                };
+            case DATABASE_SQL_QUERY_ID:
+            case FILE_LOADED_ID:
+            case FILE_WRITTEN_ID:
+            case SHELL_CMD_ID:
+                return (C) new BiFunction<RequestContext, String, Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext ctx, String arg) {
+                        try {
+                            return ((BiFunction<RequestContext, String, Flow<Void>>) callback).apply(ctx, arg);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
+                };
+            case HTTP_CLIENT_REQUEST_ID:
+            case HTTP_CLIENT_RESPONSE_ID:
+                return (C) new BiFunction<RequestContext, HttpClientPayload, Flow<Object>>() {
+                    @Override
+                    public Flow<Object> apply(RequestContext ctx, HttpClientPayload arg) {
+                        try {
+                            return ((BiFunction<RequestContext, HttpClientPayload, Flow<Object>>) callback)
+                                    .apply(ctx, arg);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
+                };
+            case HTTP_CLIENT_SAMPLING_ID:
+                return (C) new BiFunction<RequestContext, Long, Flow<Object>>() {
+                    @Override
+                    public Flow<Object> apply(RequestContext ctx, Long requestId) {
+                        try {
+                            return ((BiFunction<RequestContext, Long, Flow<Object>>) callback).apply(ctx, requestId);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
+                };
+            case EXEC_CMD_ID:
+                return (C) new BiFunction<RequestContext, String[], Flow<Void>>() {
+                    @Override
+                    public Flow<Void> apply(RequestContext ctx, String[] arg) {
+                        try {
+                            return ((BiFunction<RequestContext, String[], Flow<Void>>) callback).apply(ctx, arg);
+                        } catch (Throwable t) {
+                            log.warn("Callback for {} threw.", eventType, t);
+                            return Flow.ResultFlow.empty();
+                        }
+                    }
+                };
+            default:
+                log.warn("Unwrapped callback for {}", eventType);
+                return callback;
+        }
     }
-    return null;
-  }
 
-  public static <T> Flow<T> mergeFlows(final Flow<T> flow1, final Flow<T> flow2) {
-    if (flow1 == flow2) {
-      return flow1;
+    private <C> C universalCallback(final EventType<C> eventType) {
+        final C callbackAppSec = InstrumentationGateway.this.callbackRegistryAppSec.getCallback(eventType);
+        final C callbackIast = InstrumentationGateway.this.callbackRegistryIast.getCallback(eventType);
+        if (callbackAppSec == null && callbackIast == null) {
+            return null;
+        }
+        if (callbackAppSec != null && callbackIast == null) {
+            return callbackAppSec;
+        }
+        if (callbackAppSec == null && callbackIast != null) {
+            return callbackIast;
+        }
+
+        switch (eventType.getId()) {
+            case REQUEST_ENDED_ID:
+                return (C) (BiFunction<RequestContext, IGSpanInfo, Flow<Void>>) (ctx, agentSpan) -> {
+                    Flow<Void> flowAppSec =
+                            ((BiFunction<RequestContext, IGSpanInfo, Flow<Void>>) callbackAppSec).apply(ctx, agentSpan);
+                    Flow<Void> flowIast =
+                            ((BiFunction<RequestContext, IGSpanInfo, Flow<Void>>) callbackIast).apply(ctx, agentSpan);
+                    return mergeFlows(flowAppSec, flowIast);
+                };
+            case REQUEST_HEADER_ID:
+                return (C) (TriConsumer<RequestContext, String, String>) (requestContext, s, s2) -> {
+                    ((TriConsumer<RequestContext, String, String>) callbackAppSec).accept(requestContext, s, s2);
+                    ((TriConsumer<RequestContext, String, String>) callbackIast).accept(requestContext, s, s2);
+                };
+            case REQUEST_HEADER_DONE_ID:
+                return (C) (Function<RequestContext, Flow<Void>>) requestContext -> {
+                    Flow<Void> flowAppSec =
+                            ((Function<RequestContext, Flow<Void>>) callbackAppSec).apply(requestContext);
+                    Flow<Void> flowIast = ((Function<RequestContext, Flow<Void>>) callbackIast).apply(requestContext);
+                    return mergeFlows(flowAppSec, flowIast);
+                };
+        }
+        return null;
     }
-    return new Flow<T>() {
-      @Override
-      public Action getAction() {
-        return flow1.getAction().isBlocking() ? flow1.getAction() : flow2.getAction();
-      }
-
-      @Override
-      public T getResult() {
-        if (flow2.getResult() != null) {
-          return flow2.getResult();
+
+    public static <T> Flow<T> mergeFlows(final Flow<T> flow1, final Flow<T> flow2) {
+        if (flow1 == flow2) {
+            return flow1;
         }
-        return flow1.getResult();
-      }
-    };
-  }
+        return new Flow<T>() {
+            @Override
+            public Action getAction() {
+                return flow1.getAction().isBlocking() ? flow1.getAction() : flow2.getAction();
+            }
+
+            @Override
+            public T getResult() {
+                if (flow2.getResult() != null) {
+                    return flow2.getResult();
+                }
+                return flow1.getResult();
+            }
+        };
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/RequestContext.java b/internal-api/src/main/java/datadog/trace/api/gateway/RequestContext.java
index af9e2f8f493..4fef790a1e2 100644
--- a/internal-api/src/main/java/datadog/trace/api/gateway/RequestContext.java
+++ b/internal-api/src/main/java/datadog/trace/api/gateway/RequestContext.java
@@ -11,65 +11,65 @@
  * Instrumentation Gateway subscribers.
  */
 public interface RequestContext extends Closeable {
-  <T> T getData(RequestContextSlot slot);
+    <T> T getData(RequestContextSlot slot);
 
-  TraceSegment getTraceSegment();
+    TraceSegment getTraceSegment();
 
-  void setBlockResponseFunction(BlockResponseFunction blockResponseFunction);
+    void setBlockResponseFunction(BlockResponseFunction blockResponseFunction);
 
-  BlockResponseFunction getBlockResponseFunction();
+    BlockResponseFunction getBlockResponseFunction();
 
-  <T> T getOrCreateMetaStructTop(String key, Function<String, T> defaultValue);
+    <T> T getOrCreateMetaStructTop(String key, Function<String, T> defaultValue);
 
-  /**
-   * Stores the client IP address information resolved during HTTP server request decoration so that
-   * later consumers (such as AI Guard) can apply it to the local root span without re-running the
-   * resolver. Implementations should store the data on the root request context.
-   */
-  void setClientIpAddressData(ClientIpAddressData clientIpAddressData);
+    /**
+     * Stores the client IP address information resolved during HTTP server request decoration so that
+     * later consumers (such as AI Guard) can apply it to the local root span without re-running the
+     * resolver. Implementations should store the data on the root request context.
+     */
+    void setClientIpAddressData(ClientIpAddressData clientIpAddressData);
 
-  /**
-   * Returns the previously stored {@link ClientIpAddressData}, or {@code null} if none was stored.
-   */
-  ClientIpAddressData getClientIpAddressData();
+    /**
+     * Returns the previously stored {@link ClientIpAddressData}, or {@code null} if none was stored.
+     */
+    ClientIpAddressData getClientIpAddressData();
 
-  class Noop implements RequestContext {
-    public static final RequestContext INSTANCE = new Noop();
+    class Noop implements RequestContext {
+        public static final RequestContext INSTANCE = new Noop();
 
-    private Noop() {}
+        private Noop() {}
 
-    @Override
-    public <T> T getData(RequestContextSlot slot) {
-      return null;
-    }
+        @Override
+        public <T> T getData(RequestContextSlot slot) {
+            return null;
+        }
 
-    @Override
-    public TraceSegment getTraceSegment() {
-      return TraceSegment.NoOp.INSTANCE;
-    }
+        @Override
+        public TraceSegment getTraceSegment() {
+            return TraceSegment.NoOp.INSTANCE;
+        }
 
-    @Override
-    public void setBlockResponseFunction(BlockResponseFunction blockResponseFunction) {}
+        @Override
+        public void setBlockResponseFunction(BlockResponseFunction blockResponseFunction) {}
 
-    @Override
-    public BlockResponseFunction getBlockResponseFunction() {
-      return null;
-    }
+        @Override
+        public BlockResponseFunction getBlockResponseFunction() {
+            return null;
+        }
 
-    @Override
-    public <T> T getOrCreateMetaStructTop(String key, Function<String, T> defaultValue) {
-      return null;
-    }
+        @Override
+        public <T> T getOrCreateMetaStructTop(String key, Function<String, T> defaultValue) {
+            return null;
+        }
 
-    @Override
-    public void setClientIpAddressData(ClientIpAddressData clientIpAddressData) {}
+        @Override
+        public void setClientIpAddressData(ClientIpAddressData clientIpAddressData) {}
 
-    @Override
-    public ClientIpAddressData getClientIpAddressData() {
-      return null;
-    }
+        @Override
+        public ClientIpAddressData getClientIpAddressData() {
+            return null;
+        }
 
-    @Override
-    public void close() throws IOException {}
-  }
+        @Override
+        public void close() throws IOException {}
+    }
 }
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 94cfb50d2fa..abf994553b5 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
@@ -1,7 +1,7 @@
 package datadog.trace.api.gateway;
 
 public enum RequestContextSlot {
-  APPSEC,
-  CI_VISIBILITY,
-  IAST
+    APPSEC,
+    CI_VISIBILITY,
+    IAST
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/Subscription.java b/internal-api/src/main/java/datadog/trace/api/gateway/Subscription.java
index dae58bf74da..67505a3f0db 100644
--- a/internal-api/src/main/java/datadog/trace/api/gateway/Subscription.java
+++ b/internal-api/src/main/java/datadog/trace/api/gateway/Subscription.java
@@ -2,14 +2,14 @@
 
 /** A handle to the started subscription of an event. */
 public interface Subscription {
-  void cancel();
+    void cancel();
 
-  class SubscriptionNoop implements Subscription {
-    public static final Subscription INSTANCE = new SubscriptionNoop();
+    class SubscriptionNoop implements Subscription {
+        public static final Subscription INSTANCE = new SubscriptionNoop();
 
-    private SubscriptionNoop() {}
+        private SubscriptionNoop() {}
 
-    @Override
-    public void cancel() {}
-  }
+        @Override
+        public void cancel() {}
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/SubscriptionService.java b/internal-api/src/main/java/datadog/trace/api/gateway/SubscriptionService.java
index 48448135afb..35eb6fff76d 100644
--- a/internal-api/src/main/java/datadog/trace/api/gateway/SubscriptionService.java
+++ b/internal-api/src/main/java/datadog/trace/api/gateway/SubscriptionService.java
@@ -2,21 +2,21 @@
 
 /** The API used by the consumers to register callbacks. */
 public interface SubscriptionService {
-  <C> Subscription registerCallback(EventType<C> eventType, C callback);
+    <C> Subscription registerCallback(EventType<C> eventType, C callback);
 
-  void reset();
+    void reset();
 
-  class SubscriptionServiceNoop implements SubscriptionService {
-    public static final SubscriptionService INSTANCE = new SubscriptionServiceNoop();
+    class SubscriptionServiceNoop implements SubscriptionService {
+        public static final SubscriptionService INSTANCE = new SubscriptionServiceNoop();
 
-    private SubscriptionServiceNoop() {}
+        private SubscriptionServiceNoop() {}
 
-    @Override
-    public <C> Subscription registerCallback(EventType<C> eventType, C callback) {
-      return Subscription.SubscriptionNoop.INSTANCE;
-    }
+        @Override
+        public <C> Subscription registerCallback(EventType<C> eventType, C callback) {
+            return Subscription.SubscriptionNoop.INSTANCE;
+        }
 
-    @Override
-    public void reset() {}
-  }
+        @Override
+        public void reset() {}
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/git/CommitInfo.java b/internal-api/src/main/java/datadog/trace/api/git/CommitInfo.java
index be0ddae0281..e80ccd40095 100644
--- a/internal-api/src/main/java/datadog/trace/api/git/CommitInfo.java
+++ b/internal-api/src/main/java/datadog/trace/api/git/CommitInfo.java
@@ -4,112 +4,107 @@
 import java.util.Objects;
 
 public final class CommitInfo {
-  public static final CommitInfo NOOP =
-      new CommitInfo(null, PersonInfo.NOOP, PersonInfo.NOOP, null);
+    public static final CommitInfo NOOP = new CommitInfo(null, PersonInfo.NOOP, PersonInfo.NOOP, null);
 
-  private final String sha;
-  private final PersonInfo author;
-  private final PersonInfo committer;
-  private final String fullMessage;
+    private final String sha;
+    private final PersonInfo author;
+    private final PersonInfo committer;
+    private final String fullMessage;
 
-  public CommitInfo(final String sha) {
-    this(sha, PersonInfo.NOOP, PersonInfo.NOOP, null);
-  }
-
-  public CommitInfo(
-      final String sha,
-      final PersonInfo author,
-      final PersonInfo committer,
-      final String fullMessage) {
-    this.sha = sha;
-    this.author = author;
-    this.committer = committer;
-    this.fullMessage = fullMessage;
-  }
+    public CommitInfo(final String sha) {
+        this(sha, PersonInfo.NOOP, PersonInfo.NOOP, null);
+    }
 
-  public String getSha() {
-    return sha;
-  }
+    public CommitInfo(final String sha, final PersonInfo author, final PersonInfo committer, final String fullMessage) {
+        this.sha = sha;
+        this.author = author;
+        this.committer = committer;
+        this.fullMessage = fullMessage;
+    }
 
-  public PersonInfo getAuthor() {
-    return author;
-  }
+    public String getSha() {
+        return sha;
+    }
 
-  public PersonInfo getCommitter() {
-    return committer;
-  }
+    public PersonInfo getAuthor() {
+        return author;
+    }
 
-  public String getFullMessage() {
-    return fullMessage;
-  }
+    public PersonInfo getCommitter() {
+        return committer;
+    }
 
-  public boolean isEmpty() {
-    return Strings.isBlank(sha)
-        && (author == null || author.isEmpty())
-        && (committer == null || committer.isEmpty())
-        && Strings.isBlank(fullMessage);
-  }
+    public String getFullMessage() {
+        return fullMessage;
+    }
 
-  public boolean isComplete() {
-    return Strings.isNotBlank(sha)
-        && (author != null && author.isComplete())
-        && (committer != null && committer.isComplete())
-        && Strings.isNotBlank(fullMessage);
-  }
+    public boolean isEmpty() {
+        return Strings.isBlank(sha)
+                && (author == null || author.isEmpty())
+                && (committer == null || committer.isEmpty())
+                && Strings.isBlank(fullMessage);
+    }
 
-  /**
-   * Combine infos by completing the empty information fields in {@code first} with {@code second}'s
-   *
-   * @param first Base commit info
-   * @param second Fallback commit info
-   * @return Combined commit info
-   */
-  public static CommitInfo coalesce(final CommitInfo first, final CommitInfo second) {
-    return new CommitInfo(
-        Strings.coalesce(first.sha, second.sha),
-        PersonInfo.coalesce(first.author, second.author),
-        PersonInfo.coalesce(first.committer, second.committer),
-        Strings.coalesce(first.fullMessage, second.fullMessage));
-  }
+    public boolean isComplete() {
+        return Strings.isNotBlank(sha)
+                && (author != null && author.isComplete())
+                && (committer != null && committer.isComplete())
+                && Strings.isNotBlank(fullMessage);
+    }
 
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Combine infos by completing the empty information fields in {@code first} with {@code second}'s
+     *
+     * @param first Base commit info
+     * @param second Fallback commit info
+     * @return Combined commit info
+     */
+    public static CommitInfo coalesce(final CommitInfo first, final CommitInfo second) {
+        return new CommitInfo(
+                Strings.coalesce(first.sha, second.sha),
+                PersonInfo.coalesce(first.author, second.author),
+                PersonInfo.coalesce(first.committer, second.committer),
+                Strings.coalesce(first.fullMessage, second.fullMessage));
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final CommitInfo that = (CommitInfo) o;
+        return Objects.equals(sha, that.sha)
+                && Objects.equals(author, that.author)
+                && Objects.equals(committer, that.committer)
+                && Objects.equals(fullMessage, that.fullMessage);
     }
-    final CommitInfo that = (CommitInfo) o;
-    return Objects.equals(sha, that.sha)
-        && Objects.equals(author, that.author)
-        && Objects.equals(committer, that.committer)
-        && Objects.equals(fullMessage, that.fullMessage);
-  }
 
-  @Override
-  public int hashCode() {
-    int hash = 1;
-    hash = 31 * hash + (sha == null ? 0 : sha.hashCode());
-    hash = 31 * hash + (author == null ? 0 : author.hashCode());
-    hash = 31 * hash + (committer == null ? 0 : committer.hashCode());
-    hash = 31 * hash + (fullMessage == null ? 0 : fullMessage.hashCode());
-    return hash;
-  }
+    @Override
+    public int hashCode() {
+        int hash = 1;
+        hash = 31 * hash + (sha == null ? 0 : sha.hashCode());
+        hash = 31 * hash + (author == null ? 0 : author.hashCode());
+        hash = 31 * hash + (committer == null ? 0 : committer.hashCode());
+        hash = 31 * hash + (fullMessage == null ? 0 : fullMessage.hashCode());
+        return hash;
+    }
 
-  @Override
-  public String toString() {
-    return "CommitInfo{"
-        + "sha='"
-        + sha
-        + '\''
-        + ", author="
-        + author
-        + ", committer="
-        + committer
-        + ", fullMessage='"
-        + fullMessage
-        + '\''
-        + '}';
-  }
+    @Override
+    public String toString() {
+        return "CommitInfo{"
+                + "sha='"
+                + sha
+                + '\''
+                + ", author="
+                + author
+                + ", committer="
+                + committer
+                + ", fullMessage='"
+                + fullMessage
+                + '\''
+                + '}';
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/git/EmbeddedGitInfoBuilder.java b/internal-api/src/main/java/datadog/trace/api/git/EmbeddedGitInfoBuilder.java
index 5b0c71ce149..13799debfec 100644
--- a/internal-api/src/main/java/datadog/trace/api/git/EmbeddedGitInfoBuilder.java
+++ b/internal-api/src/main/java/datadog/trace/api/git/EmbeddedGitInfoBuilder.java
@@ -13,92 +13,91 @@
 
 public class EmbeddedGitInfoBuilder implements GitInfoBuilder {
 
-  private static final Logger log = LoggerFactory.getLogger(EmbeddedGitInfoBuilder.class);
+    private static final Logger log = LoggerFactory.getLogger(EmbeddedGitInfoBuilder.class);
 
-  private final List<String> resourceNames;
+    private final List<String> resourceNames;
 
-  public EmbeddedGitInfoBuilder() {
-    // Order is important here, from the most reliable sources to the least reliable ones
-    this(
-        Arrays.asList(
-            // Spring boot fat jars and wars should have the git.properties file in the following
-            // specific paths, guaranteeing that it's not coming from a dependency
-            "BOOT-INF/classes/datadog_git.properties",
-            "BOOT-INF/classes/git.properties",
-            "WEB-INF/classes/datadog_git.properties",
-            "WEB-INF/classes/git.properties",
-            // If we can't find the files above, probably because we're not in a spring context, we
-            // can look at the root of the classpath. Since it could be tainted by dependencies,
-            // we're looking for a specific datadog_git.properties file.
-            "datadog_git.properties"));
-  }
+    public EmbeddedGitInfoBuilder() {
+        // Order is important here, from the most reliable sources to the least reliable ones
+        this(Arrays.asList(
+                // Spring boot fat jars and wars should have the git.properties file in the following
+                // specific paths, guaranteeing that it's not coming from a dependency
+                "BOOT-INF/classes/datadog_git.properties",
+                "BOOT-INF/classes/git.properties",
+                "WEB-INF/classes/datadog_git.properties",
+                "WEB-INF/classes/git.properties",
+                // If we can't find the files above, probably because we're not in a spring context, we
+                // can look at the root of the classpath. Since it could be tainted by dependencies,
+                // we're looking for a specific datadog_git.properties file.
+                "datadog_git.properties"));
+    }
 
-  EmbeddedGitInfoBuilder(List<String> resourceNames) {
-    this.resourceNames = resourceNames;
-  }
+    EmbeddedGitInfoBuilder(List<String> resourceNames) {
+        this.resourceNames = resourceNames;
+    }
 
-  @Override
-  public GitInfo build(@Nullable String repositoryPath) {
-    Properties gitProperties = new Properties();
+    @Override
+    public GitInfo build(@Nullable String repositoryPath) {
+        Properties gitProperties = new Properties();
 
-    for (String resourceName : resourceNames) {
-      try (InputStream is = ClassLoader.getSystemResourceAsStream(resourceName)) {
-        if (is != null) {
-          gitProperties.load(is);
-          // stop at the first git properties file found
-          break;
-        } else {
-          log.debug("Could not find embedded Git properties resource: {}", resourceName);
+        for (String resourceName : resourceNames) {
+            try (InputStream is = ClassLoader.getSystemResourceAsStream(resourceName)) {
+                if (is != null) {
+                    gitProperties.load(is);
+                    // stop at the first git properties file found
+                    break;
+                } else {
+                    log.debug("Could not find embedded Git properties resource: {}", resourceName);
+                }
+            } catch (IOException e) {
+                log.error("Error reading embedded Git properties from {}", resourceName, e);
+            }
         }
-      } catch (IOException e) {
-        log.error("Error reading embedded Git properties from {}", resourceName, e);
-      }
-    }
 
-    String commitSha = gitProperties.getProperty("git.commit.id");
-    if (commitSha == null) {
-      commitSha = gitProperties.getProperty("git.commit.id.full");
-    }
+        String commitSha = gitProperties.getProperty("git.commit.id");
+        if (commitSha == null) {
+            commitSha = gitProperties.getProperty("git.commit.id.full");
+        }
 
-    String committerTime = gitProperties.getProperty("git.commit.committer.time");
-    if (committerTime == null) {
-      committerTime = gitProperties.getProperty("git.commit.time");
-    }
+        String committerTime = gitProperties.getProperty("git.commit.committer.time");
+        if (committerTime == null) {
+            committerTime = gitProperties.getProperty("git.commit.time");
+        }
 
-    String authorTime = gitProperties.getProperty("git.commit.author.time");
-    if (authorTime == null) {
-      authorTime = gitProperties.getProperty("git.commit.time");
-    }
+        String authorTime = gitProperties.getProperty("git.commit.author.time");
+        if (authorTime == null) {
+            authorTime = gitProperties.getProperty("git.commit.time");
+        }
 
-    return new GitInfo(
-        gitProperties.getProperty("git.remote.origin.url"),
-        gitProperties.getProperty("git.branch"),
-        gitProperties.getProperty("git.tags"),
-        new CommitInfo(
-            commitSha,
-            new PersonInfo(
-                gitProperties.getProperty("git.commit.user.name"),
-                gitProperties.getProperty("git.commit.user.email"),
-                authorTime),
-            new PersonInfo(
-                gitProperties.getProperty("git.commit.user.name"),
-                gitProperties.getProperty("git.commit.user.email"),
-                committerTime),
-            gitProperties.getProperty("git.commit.message.full")));
-  }
+        return new GitInfo(
+                gitProperties.getProperty("git.remote.origin.url"),
+                gitProperties.getProperty("git.branch"),
+                gitProperties.getProperty("git.tags"),
+                new CommitInfo(
+                        commitSha,
+                        new PersonInfo(
+                                gitProperties.getProperty("git.commit.user.name"),
+                                gitProperties.getProperty("git.commit.user.email"),
+                                authorTime),
+                        new PersonInfo(
+                                gitProperties.getProperty("git.commit.user.name"),
+                                gitProperties.getProperty("git.commit.user.email"),
+                                committerTime),
+                        gitProperties.getProperty("git.commit.message.full")));
+    }
 
-  @Override
-  public int order() {
-    return Integer.MAX_VALUE;
-  }
+    @Override
+    public int order() {
+        return Integer.MAX_VALUE;
+    }
 
-  @Override
-  public GitProviderExpected providerAsExpected() {
-    return GitProviderExpected.EMBEDDED;
-  }
+    @Override
+    public GitProviderExpected providerAsExpected() {
+        return GitProviderExpected.EMBEDDED;
+    }
 
-  @Override
-  public GitProviderDiscrepant providerAsDiscrepant() {
-    return GitProviderDiscrepant.EMBEDDED;
-  }
+    @Override
+    public GitProviderDiscrepant providerAsDiscrepant() {
+        return GitProviderDiscrepant.EMBEDDED;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/git/GitInfo.java b/internal-api/src/main/java/datadog/trace/api/git/GitInfo.java
index 32929b2b3c8..e5d0aa45a99 100644
--- a/internal-api/src/main/java/datadog/trace/api/git/GitInfo.java
+++ b/internal-api/src/main/java/datadog/trace/api/git/GitInfo.java
@@ -6,81 +6,78 @@
 import java.util.Objects;
 
 public final class GitInfo {
-  public static final GitInfo NOOP = new GitInfo(null, null, null, CommitInfo.NOOP);
+    public static final GitInfo NOOP = new GitInfo(null, null, null, CommitInfo.NOOP);
 
-  private final String repositoryURL;
-  private final String branch;
-  private final String tag;
-  private final CommitInfo commit;
+    private final String repositoryURL;
+    private final String branch;
+    private final String tag;
+    private final CommitInfo commit;
 
-  private final TagMap.Entry repositoryEntry;
-  private final TagMap.Entry commitEntry;
+    private final TagMap.Entry repositoryEntry;
+    private final TagMap.Entry commitEntry;
 
-  public GitInfo(String repositoryURL, String branch, String tag, CommitInfo commit) {
-    this.repositoryURL = repositoryURL;
-    this.branch = branch;
-    this.tag = tag;
-    this.commit = commit;
+    public GitInfo(String repositoryURL, String branch, String tag, CommitInfo commit) {
+        this.repositoryURL = repositoryURL;
+        this.branch = branch;
+        this.tag = tag;
+        this.commit = commit;
 
-    // GitInfo is reused across many traces, so create entries once and reuse them (see addTags)
-    // null & empty values result in null entries which nop when added to a span
-    this.repositoryEntry = TagMap.Entry.create(DDTags.INTERNAL_GIT_REPOSITORY_URL, repositoryURL);
-    this.commitEntry =
-        commit == null
-            ? null
-            : TagMap.Entry.create(DDTags.INTERNAL_GIT_COMMIT_SHA, commit.getSha());
-  }
-
-  public String getRepositoryURL() {
-    return repositoryURL;
-  }
+        // GitInfo is reused across many traces, so create entries once and reuse them (see addTags)
+        // null & empty values result in null entries which nop when added to a span
+        this.repositoryEntry = TagMap.Entry.create(DDTags.INTERNAL_GIT_REPOSITORY_URL, repositoryURL);
+        this.commitEntry = commit == null ? null : TagMap.Entry.create(DDTags.INTERNAL_GIT_COMMIT_SHA, commit.getSha());
+    }
 
-  public String getBranch() {
-    return branch;
-  }
+    public String getRepositoryURL() {
+        return repositoryURL;
+    }
 
-  public String getTag() {
-    return tag;
-  }
+    public String getBranch() {
+        return branch;
+    }
 
-  public CommitInfo getCommit() {
-    return commit;
-  }
+    public String getTag() {
+        return tag;
+    }
 
-  public void addTags(AgentSpan span) {
-    span.setTag(this.repositoryEntry);
-    span.setTag(this.commitEntry);
-  }
+    public CommitInfo getCommit() {
+        return commit;
+    }
 
-  public boolean isEmpty() {
-    return (repositoryURL == null || repositoryURL.isEmpty())
-        && (branch == null || branch.isEmpty())
-        && (tag == null || tag.isEmpty())
-        && (commit == null || commit.isEmpty());
-  }
+    public void addTags(AgentSpan span) {
+        span.setTag(this.repositoryEntry);
+        span.setTag(this.commitEntry);
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public boolean isEmpty() {
+        return (repositoryURL == null || repositoryURL.isEmpty())
+                && (branch == null || branch.isEmpty())
+                && (tag == null || tag.isEmpty())
+                && (commit == null || commit.isEmpty());
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        GitInfo gitInfo = (GitInfo) o;
+        return Objects.equals(repositoryURL, gitInfo.repositoryURL)
+                && Objects.equals(branch, gitInfo.branch)
+                && Objects.equals(tag, gitInfo.tag)
+                && Objects.equals(commit, gitInfo.commit);
     }
-    GitInfo gitInfo = (GitInfo) o;
-    return Objects.equals(repositoryURL, gitInfo.repositoryURL)
-        && Objects.equals(branch, gitInfo.branch)
-        && Objects.equals(tag, gitInfo.tag)
-        && Objects.equals(commit, gitInfo.commit);
-  }
 
-  @Override
-  public int hashCode() {
-    int hash = 1;
-    hash = 31 * hash + (repositoryURL == null ? 0 : repositoryURL.hashCode());
-    hash = 31 * hash + (branch == null ? 0 : branch.hashCode());
-    hash = 31 * hash + (tag == null ? 0 : tag.hashCode());
-    hash = 31 * hash + (commit == null ? 0 : commit.hashCode());
-    return hash;
-  }
+    @Override
+    public int hashCode() {
+        int hash = 1;
+        hash = 31 * hash + (repositoryURL == null ? 0 : repositoryURL.hashCode());
+        hash = 31 * hash + (branch == null ? 0 : branch.hashCode());
+        hash = 31 * hash + (tag == null ? 0 : tag.hashCode());
+        hash = 31 * hash + (commit == null ? 0 : commit.hashCode());
+        return hash;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/git/GitInfoBuilder.java b/internal-api/src/main/java/datadog/trace/api/git/GitInfoBuilder.java
index 7deb594d25b..a724d697665 100644
--- a/internal-api/src/main/java/datadog/trace/api/git/GitInfoBuilder.java
+++ b/internal-api/src/main/java/datadog/trace/api/git/GitInfoBuilder.java
@@ -5,16 +5,16 @@
 import javax.annotation.Nullable;
 
 public interface GitInfoBuilder {
-  GitInfo build(@Nullable String repositoryPath);
+    GitInfo build(@Nullable String repositoryPath);
 
-  int order();
+    int order();
 
-  /**
-   * Used for SHA discrepancies telemetry. Two enums are needed, one for each tag:
-   * `expected_provider`, `discrepant_provider`. A provider can act as either of them depending on
-   * the discrepancy found.
-   */
-  GitProviderExpected providerAsExpected();
+    /**
+     * Used for SHA discrepancies telemetry. Two enums are needed, one for each tag:
+     * `expected_provider`, `discrepant_provider`. A provider can act as either of them depending on
+     * the discrepancy found.
+     */
+    GitProviderExpected providerAsExpected();
 
-  GitProviderDiscrepant providerAsDiscrepant();
+    GitProviderDiscrepant providerAsDiscrepant();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/git/GitInfoProvider.java b/internal-api/src/main/java/datadog/trace/api/git/GitInfoProvider.java
index 5dc94e713bc..7dccd254b18 100644
--- a/internal-api/src/main/java/datadog/trace/api/git/GitInfoProvider.java
+++ b/internal-api/src/main/java/datadog/trace/api/git/GitInfoProvider.java
@@ -26,224 +26,217 @@
 
 public class GitInfoProvider {
 
-  public static final GitInfoProvider INSTANCE;
-
-  static {
-    INSTANCE = new GitInfoProvider();
-    INSTANCE.registerGitInfoBuilder(new UserSuppliedGitInfoBuilder());
-  }
-
-  static final String NULL_PATH_STRING = Paths.get("").toAbsolutePath().toString();
-
-  private volatile Collection<GitInfoBuilder> builders = Collections.emptyList();
-
-  // in regular cases git info has to be built only once,
-  // but there is a rare exception:
-  // when attaching to a Gradle Daemon,
-  // it is possible to have builds from multiple repositories
-  // executed in the same process;
-  // 4 is chosen somewhat randomly, since we want to make memory footprint small
-  // and having more than 4 builds from different repos running in parallel
-  // in the same daemon is unlikely
-  private final DDCache<String, GitInfo> gitInfoCache = DDCaches.newFixedSizeCache(4);
-
-  // DQH - The lambda in getGitInfo was a hot allocation point, so
-  // pulled the lambda into a member variable to avoid constantly allocating.
-  final Function<String, GitInfo> buildGitInfoFn = this::buildGitInfo;
-
-  public GitInfo getGitInfo() {
-    return getGitInfo(null);
-  }
-
-  public GitInfo getGitInfo(@Nullable String repositoryPath) {
-    if (repositoryPath == null) {
-      repositoryPath = NULL_PATH_STRING;
-    }
+    public static final GitInfoProvider INSTANCE;
 
-    return gitInfoCache.computeIfAbsent(repositoryPath, buildGitInfoFn);
-  }
-
-  private GitInfo buildGitInfo(String repositoryPath) {
-    Evaluator evaluator = new Evaluator(repositoryPath, builders);
-    GitInfo gitInfo =
-        new GitInfo(
-            evaluator.get(
-                gi -> GitUtils.filterSensitiveInfo(gi.getRepositoryURL()),
-                GitInfoProvider::validateGitRemoteUrl),
-            evaluator.get(GitInfo::getBranch, Strings::isNotBlank),
-            evaluator.get(GitInfo::getTag, Strings::isNotBlank),
-            new CommitInfo(
-                evaluator.get(gi1 -> gi1.getCommit().getSha(), Strings::isNotBlank),
-                new PersonInfo(
-                    evaluator.getIfCommitShaMatches(
-                        gi -> gi.getCommit().getAuthor().getName(), Strings::isNotBlank),
-                    evaluator.getIfCommitShaMatches(
-                        gi -> gi.getCommit().getAuthor().getEmail(), Strings::isNotBlank),
-                    evaluator.getIfCommitShaMatches(
-                        gi -> gi.getCommit().getAuthor().getIso8601Date(), Strings::isNotBlank)),
-                new PersonInfo(
-                    evaluator.getIfCommitShaMatches(
-                        gi -> gi.getCommit().getCommitter().getName(), Strings::isNotBlank),
-                    evaluator.getIfCommitShaMatches(
-                        gi -> gi.getCommit().getCommitter().getEmail(), Strings::isNotBlank),
-                    evaluator.getIfCommitShaMatches(
-                        gi -> gi.getCommit().getCommitter().getIso8601Date(), Strings::isNotBlank)),
-                evaluator.getIfCommitShaMatches(
-                    gi -> gi.getCommit().getFullMessage(), Strings::isNotBlank)));
-
-    InstrumentationBridge.getMetricCollector()
-        .add(
-            CiVisibilityCountMetric.GIT_COMMIT_SHA_MATCH,
-            1,
-            evaluator.shaDiscrepancies.isEmpty() ? GitShaMatch.TRUE : GitShaMatch.FALSE);
-    for (ShaDiscrepancy mismatch : evaluator.shaDiscrepancies) {
-      mismatch.addTelemetry();
+    static {
+        INSTANCE = new GitInfoProvider();
+        INSTANCE.registerGitInfoBuilder(new UserSuppliedGitInfoBuilder());
     }
 
-    return gitInfo;
-  }
-
-  private static boolean validateGitRemoteUrl(String s) {
-    // we cannot work with URL that uses "file://" protocol
-    return Strings.isNotBlank(s) && !s.startsWith("file:");
-  }
-
-  private static final class ShaDiscrepancy {
-    private final GitProviderExpected expectedGitProvider;
-    private final GitProviderDiscrepant discrepantGitProvider;
-    private final GitShaDiscrepancyType discrepancyType;
-
-    private ShaDiscrepancy(
-        GitProviderExpected expectedGitProvider,
-        GitProviderDiscrepant discrepantGitProvider,
-        GitShaDiscrepancyType discrepancyType) {
-      this.expectedGitProvider = expectedGitProvider;
-      this.discrepantGitProvider = discrepantGitProvider;
-      this.discrepancyType = discrepancyType;
-    }
+    static final String NULL_PATH_STRING = Paths.get("").toAbsolutePath().toString();
+
+    private volatile Collection<GitInfoBuilder> builders = Collections.emptyList();
+
+    // in regular cases git info has to be built only once,
+    // but there is a rare exception:
+    // when attaching to a Gradle Daemon,
+    // it is possible to have builds from multiple repositories
+    // executed in the same process;
+    // 4 is chosen somewhat randomly, since we want to make memory footprint small
+    // and having more than 4 builds from different repos running in parallel
+    // in the same daemon is unlikely
+    private final DDCache<String, GitInfo> gitInfoCache = DDCaches.newFixedSizeCache(4);
 
-    private void addTelemetry() {
-      InstrumentationBridge.getMetricCollector()
-          .add(
-              CiVisibilityCountMetric.GIT_COMMIT_SHA_DISCREPANCY,
-              1,
-              expectedGitProvider,
-              discrepantGitProvider,
-              discrepancyType);
+    // DQH - The lambda in getGitInfo was a hot allocation point, so
+    // pulled the lambda into a member variable to avoid constantly allocating.
+    final Function<String, GitInfo> buildGitInfoFn = this::buildGitInfo;
+
+    public GitInfo getGitInfo() {
+        return getGitInfo(null);
     }
 
-    @Override
-    public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      ShaDiscrepancy that = (ShaDiscrepancy) obj;
-      return expectedGitProvider.equals(that.expectedGitProvider)
-          && discrepantGitProvider.equals(that.discrepantGitProvider)
-          && discrepancyType.equals(that.discrepancyType);
+    public GitInfo getGitInfo(@Nullable String repositoryPath) {
+        if (repositoryPath == null) {
+            repositoryPath = NULL_PATH_STRING;
+        }
+
+        return gitInfoCache.computeIfAbsent(repositoryPath, buildGitInfoFn);
     }
 
-    @Override
-    public int hashCode() {
-      return Objects.hash(expectedGitProvider, discrepantGitProvider, discrepancyType);
+    private GitInfo buildGitInfo(String repositoryPath) {
+        Evaluator evaluator = new Evaluator(repositoryPath, builders);
+        GitInfo gitInfo = new GitInfo(
+                evaluator.get(
+                        gi -> GitUtils.filterSensitiveInfo(gi.getRepositoryURL()),
+                        GitInfoProvider::validateGitRemoteUrl),
+                evaluator.get(GitInfo::getBranch, Strings::isNotBlank),
+                evaluator.get(GitInfo::getTag, Strings::isNotBlank),
+                new CommitInfo(
+                        evaluator.get(gi1 -> gi1.getCommit().getSha(), Strings::isNotBlank),
+                        new PersonInfo(
+                                evaluator.getIfCommitShaMatches(
+                                        gi -> gi.getCommit().getAuthor().getName(), Strings::isNotBlank),
+                                evaluator.getIfCommitShaMatches(
+                                        gi -> gi.getCommit().getAuthor().getEmail(), Strings::isNotBlank),
+                                evaluator.getIfCommitShaMatches(
+                                        gi -> gi.getCommit().getAuthor().getIso8601Date(), Strings::isNotBlank)),
+                        new PersonInfo(
+                                evaluator.getIfCommitShaMatches(
+                                        gi -> gi.getCommit().getCommitter().getName(), Strings::isNotBlank),
+                                evaluator.getIfCommitShaMatches(
+                                        gi -> gi.getCommit().getCommitter().getEmail(), Strings::isNotBlank),
+                                evaluator.getIfCommitShaMatches(
+                                        gi -> gi.getCommit().getCommitter().getIso8601Date(), Strings::isNotBlank)),
+                        evaluator.getIfCommitShaMatches(gi -> gi.getCommit().getFullMessage(), Strings::isNotBlank)));
+
+        InstrumentationBridge.getMetricCollector()
+                .add(
+                        CiVisibilityCountMetric.GIT_COMMIT_SHA_MATCH,
+                        1,
+                        evaluator.shaDiscrepancies.isEmpty() ? GitShaMatch.TRUE : GitShaMatch.FALSE);
+        for (ShaDiscrepancy mismatch : evaluator.shaDiscrepancies) {
+            mismatch.addTelemetry();
+        }
+
+        return gitInfo;
     }
-  }
-
-  /**
-   * Uses provided GitInfoBuilder instances to get GitInfo data.
-   *
-   * <p>Provided builders are sorted according to priority: those builders that are first in the
-   * list have higher priority.
-   *
-   * <p>GitInfo is evaluated at most once for each builder, and the evaluation is lazy: if all
-   * required info can be retrieved from a higher-priority builder, those with lower priority will
-   * not be evaluated.
-   */
-  private static final class Evaluator {
-    private final String repositoryPath;
-    private final Map<GitInfoBuilder, GitInfo> infos;
-    private final Set<ShaDiscrepancy> shaDiscrepancies;
-
-    private Evaluator(String repositoryPath, Collection<GitInfoBuilder> builders) {
-      this.repositoryPath = repositoryPath;
-      this.infos = new LinkedHashMap<>();
-      this.shaDiscrepancies = new HashSet<>();
-      for (GitInfoBuilder builder : builders) {
-        infos.put(builder, null);
-      }
+
+    private static boolean validateGitRemoteUrl(String s) {
+        // we cannot work with URL that uses "file://" protocol
+        return Strings.isNotBlank(s) && !s.startsWith("file:");
     }
 
-    private String get(Function<GitInfo, String> function, Predicate<String> validator) {
-      return get(function, validator, false);
+    private static final class ShaDiscrepancy {
+        private final GitProviderExpected expectedGitProvider;
+        private final GitProviderDiscrepant discrepantGitProvider;
+        private final GitShaDiscrepancyType discrepancyType;
+
+        private ShaDiscrepancy(
+                GitProviderExpected expectedGitProvider,
+                GitProviderDiscrepant discrepantGitProvider,
+                GitShaDiscrepancyType discrepancyType) {
+            this.expectedGitProvider = expectedGitProvider;
+            this.discrepantGitProvider = discrepantGitProvider;
+            this.discrepancyType = discrepancyType;
+        }
+
+        private void addTelemetry() {
+            InstrumentationBridge.getMetricCollector()
+                    .add(
+                            CiVisibilityCountMetric.GIT_COMMIT_SHA_DISCREPANCY,
+                            1,
+                            expectedGitProvider,
+                            discrepantGitProvider,
+                            discrepancyType);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) return true;
+            if (obj == null || getClass() != obj.getClass()) return false;
+            ShaDiscrepancy that = (ShaDiscrepancy) obj;
+            return expectedGitProvider.equals(that.expectedGitProvider)
+                    && discrepantGitProvider.equals(that.discrepantGitProvider)
+                    && discrepancyType.equals(that.discrepancyType);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(expectedGitProvider, discrepantGitProvider, discrepancyType);
+        }
     }
 
     /**
-     * If a builder with a higher priority has commit SHA that differs from that of a builder with
-     * lower priority, lower-priority info will be ignored.
+     * Uses provided GitInfoBuilder instances to get GitInfo data.
+     *
+     * <p>Provided builders are sorted according to priority: those builders that are first in the
+     * list have higher priority.
+     *
+     * <p>GitInfo is evaluated at most once for each builder, and the evaluation is lazy: if all
+     * required info can be retrieved from a higher-priority builder, those with lower priority will
+     * not be evaluated.
      */
-    private String getIfCommitShaMatches(
-        Function<GitInfo, String> function, Predicate<String> validator) {
-      return get(function, validator, true);
-    }
+    private static final class Evaluator {
+        private final String repositoryPath;
+        private final Map<GitInfoBuilder, GitInfo> infos;
+        private final Set<ShaDiscrepancy> shaDiscrepancies;
+
+        private Evaluator(String repositoryPath, Collection<GitInfoBuilder> builders) {
+            this.repositoryPath = repositoryPath;
+            this.infos = new LinkedHashMap<>();
+            this.shaDiscrepancies = new HashSet<>();
+            for (GitInfoBuilder builder : builders) {
+                infos.put(builder, null);
+            }
+        }
 
-    private String get(
-        Function<GitInfo, String> function,
-        Predicate<String> validator,
-        boolean checkShaIntegrity) {
-      String expectedCommitSha = null;
-      String expectedRepoUrl = null;
-      GitProviderExpected expectedGitProvider = null;
-
-      for (Map.Entry<GitInfoBuilder, GitInfo> e : infos.entrySet()) {
-        GitInfo info = e.getValue();
-        if (info == null) {
-          GitInfoBuilder builder = e.getKey();
-          info = builder.build(repositoryPath);
-          e.setValue(info);
+        private String get(Function<GitInfo, String> function, Predicate<String> validator) {
+            return get(function, validator, false);
         }
 
-        if (checkShaIntegrity) {
-          CommitInfo currentCommit = info.getCommit();
-          String currentCommitSha = currentCommit != null ? currentCommit.getSha() : null;
-          if (Strings.isNotBlank(currentCommitSha)) {
-            if (expectedCommitSha == null) {
-              expectedCommitSha = currentCommitSha;
-              expectedRepoUrl = info.getRepositoryURL();
-              expectedGitProvider = e.getKey().providerAsExpected();
-            } else if (!expectedCommitSha.equals(currentCommitSha)) {
-              // We already have a commit SHA from source that has higher priority.
-              // Commit SHA from current source is different, so we have to skip it
-              GitShaDiscrepancyType discrepancyType = GitShaDiscrepancyType.COMMIT_DISCREPANCY;
-              String repoUrl = info.getRepositoryURL();
-              if (expectedRepoUrl != null && repoUrl != null && !repoUrl.equals(expectedRepoUrl)) {
-                discrepancyType = GitShaDiscrepancyType.REPOSITORY_DISCREPANCY;
-              }
-
-              shaDiscrepancies.add(
-                  new ShaDiscrepancy(
-                      expectedGitProvider, e.getKey().providerAsDiscrepant(), discrepancyType));
-              continue;
-            }
-          }
+        /**
+         * If a builder with a higher priority has commit SHA that differs from that of a builder with
+         * lower priority, lower-priority info will be ignored.
+         */
+        private String getIfCommitShaMatches(Function<GitInfo, String> function, Predicate<String> validator) {
+            return get(function, validator, true);
         }
 
-        String result = function.apply(info);
-        if (validator.test(result)) {
-          return result;
+        private String get(Function<GitInfo, String> function, Predicate<String> validator, boolean checkShaIntegrity) {
+            String expectedCommitSha = null;
+            String expectedRepoUrl = null;
+            GitProviderExpected expectedGitProvider = null;
+
+            for (Map.Entry<GitInfoBuilder, GitInfo> e : infos.entrySet()) {
+                GitInfo info = e.getValue();
+                if (info == null) {
+                    GitInfoBuilder builder = e.getKey();
+                    info = builder.build(repositoryPath);
+                    e.setValue(info);
+                }
+
+                if (checkShaIntegrity) {
+                    CommitInfo currentCommit = info.getCommit();
+                    String currentCommitSha = currentCommit != null ? currentCommit.getSha() : null;
+                    if (Strings.isNotBlank(currentCommitSha)) {
+                        if (expectedCommitSha == null) {
+                            expectedCommitSha = currentCommitSha;
+                            expectedRepoUrl = info.getRepositoryURL();
+                            expectedGitProvider = e.getKey().providerAsExpected();
+                        } else if (!expectedCommitSha.equals(currentCommitSha)) {
+                            // We already have a commit SHA from source that has higher priority.
+                            // Commit SHA from current source is different, so we have to skip it
+                            GitShaDiscrepancyType discrepancyType = GitShaDiscrepancyType.COMMIT_DISCREPANCY;
+                            String repoUrl = info.getRepositoryURL();
+                            if (expectedRepoUrl != null && repoUrl != null && !repoUrl.equals(expectedRepoUrl)) {
+                                discrepancyType = GitShaDiscrepancyType.REPOSITORY_DISCREPANCY;
+                            }
+
+                            shaDiscrepancies.add(new ShaDiscrepancy(
+                                    expectedGitProvider, e.getKey().providerAsDiscrepant(), discrepancyType));
+                            continue;
+                        }
+                    }
+                }
+
+                String result = function.apply(info);
+                if (validator.test(result)) {
+                    return result;
+                }
+            }
+            return null;
         }
-      }
-      return null;
     }
-  }
-
-  public synchronized void registerGitInfoBuilder(GitInfoBuilder builder) {
-    List<GitInfoBuilder> updatedBuilders = new ArrayList<>(builders);
-    updatedBuilders.add(builder);
-    updatedBuilders.sort(Comparator.comparingInt(GitInfoBuilder::order));
-    builders = updatedBuilders;
-    gitInfoCache.clear();
-  }
-
-  public synchronized void invalidateCache() {
-    gitInfoCache.clear();
-  }
+
+    public synchronized void registerGitInfoBuilder(GitInfoBuilder builder) {
+        List<GitInfoBuilder> updatedBuilders = new ArrayList<>(builders);
+        updatedBuilders.add(builder);
+        updatedBuilders.sort(Comparator.comparingInt(GitInfoBuilder::order));
+        builders = updatedBuilders;
+        gitInfoCache.clear();
+    }
+
+    public synchronized void invalidateCache() {
+        gitInfoCache.clear();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/git/GitUtils.java b/internal-api/src/main/java/datadog/trace/api/git/GitUtils.java
index 892d4986bde..03088a658c6 100644
--- a/internal-api/src/main/java/datadog/trace/api/git/GitUtils.java
+++ b/internal-api/src/main/java/datadog/trace/api/git/GitUtils.java
@@ -18,287 +18,286 @@
 
 public class GitUtils {
 
-  private static final Pattern ORIGIN_PATTERN = Pattern.compile("origin/", Pattern.LITERAL);
-  private static final Pattern REFS_HEADS_PATTERN = Pattern.compile("refs/heads/", Pattern.LITERAL);
-  private static final Pattern REFS_TAGS_PATTERN = Pattern.compile("refs/tags/", Pattern.LITERAL);
-  private static final Pattern TAGS_PATTERN = Pattern.compile("tags/", Pattern.LITERAL);
-  // Based on https://git-scm.com/docs/git-check-ref-format
-  private static final Pattern INVALID_REF_PATTERN =
-      Pattern.compile(
-          "^/" // starts with /
-              + "|//" // contains //
-              + "|\\.\\." // contains ..
-              + "|@\\{" // contains @{
-              + "|\\.$" // ends with a dot
-              + "|\\.lock(/|$)" // ends with .lock in any path component
-              + "|(?:^|/)\\." // any component starts with a dot
-              + "|\\s" // contains space
-              + "|[~^:?*\\[\\\\]" // contains ~ ^ : ? * [ \
-              + "|^@$" // is only @
-              + "|/$" // ends with slash
-          );
-  private static final Pattern PATH_PATTERN = Pattern.compile("^[a-zA-Z0-9_./-]+$");
-  private static final Pattern SHELL_METACHAR_PATTERN = Pattern.compile(".*[`$&|;<>\n\r#].*");
-
-  private static final int SHORT_SHA_LENGTH = 7;
-  private static final int FULL_SHA_LENGTH = 40;
-
-  private static final Logger log = LoggerFactory.getLogger(GitUtils.class);
-
-  /**
-   * Normalizes Git tag references:
-   *
-   * <ul>
-   *   <li>refs/tags/my-tag -> my tag
-   * </ul>
-   *
-   * @param rawTagRef
-   * @return git reference normalized.
-   */
-  public static String normalizeTag(final String rawTagRef) {
-    return normalizeRef(rawTagRef);
-  }
-
-  /**
-   * Normalizes Git branch references:
-   *
-   * <ul>
-   *   <li>origin/my-branch -> my-branch
-   *   <li>refs/heads/my-branch -> my-branch
-   * </ul>
-   *
-   * <p>If the reference starts with "tags/" or contains "/tags/",<code>null</code> is returned
-   *
-   * @param rawBranchRef
-   * @return git reference normalized.
-   */
-  public static String normalizeBranch(final String rawBranchRef) {
-    if (isTagReference(rawBranchRef)) {
-      return null;
-    } else {
-      return normalizeRef(rawBranchRef);
+    private static final Pattern ORIGIN_PATTERN = Pattern.compile("origin/", Pattern.LITERAL);
+    private static final Pattern REFS_HEADS_PATTERN = Pattern.compile("refs/heads/", Pattern.LITERAL);
+    private static final Pattern REFS_TAGS_PATTERN = Pattern.compile("refs/tags/", Pattern.LITERAL);
+    private static final Pattern TAGS_PATTERN = Pattern.compile("tags/", Pattern.LITERAL);
+    // Based on https://git-scm.com/docs/git-check-ref-format
+    private static final Pattern INVALID_REF_PATTERN = Pattern.compile(
+            "^/" // starts with /
+                    + "|//" // contains //
+                    + "|\\.\\." // contains ..
+                    + "|@\\{" // contains @{
+                    + "|\\.$" // ends with a dot
+                    + "|\\.lock(/|$)" // ends with .lock in any path component
+                    + "|(?:^|/)\\." // any component starts with a dot
+                    + "|\\s" // contains space
+                    + "|[~^:?*\\[\\\\]" // contains ~ ^ : ? * [ \
+                    + "|^@$" // is only @
+                    + "|/$" // ends with slash
+            );
+    private static final Pattern PATH_PATTERN = Pattern.compile("^[a-zA-Z0-9_./-]+$");
+    private static final Pattern SHELL_METACHAR_PATTERN = Pattern.compile(".*[`$&|;<>\n\r#].*");
+
+    private static final int SHORT_SHA_LENGTH = 7;
+    private static final int FULL_SHA_LENGTH = 40;
+
+    private static final Logger log = LoggerFactory.getLogger(GitUtils.class);
+
+    /**
+     * Normalizes Git tag references:
+     *
+     * <ul>
+     *   <li>refs/tags/my-tag -> my tag
+     * </ul>
+     *
+     * @param rawTagRef
+     * @return git reference normalized.
+     */
+    public static String normalizeTag(final String rawTagRef) {
+        return normalizeRef(rawTagRef);
     }
-  }
 
-  public static boolean isTagReference(final String ref) {
-    return ref != null && (ref.startsWith("tags/") || ref.contains("/tags/"));
-  }
-
-  private static String normalizeRef(final String rawRef) {
-    if (rawRef == null || rawRef.isEmpty()) {
-      return null;
+    /**
+     * Normalizes Git branch references:
+     *
+     * <ul>
+     *   <li>origin/my-branch -> my-branch
+     *   <li>refs/heads/my-branch -> my-branch
+     * </ul>
+     *
+     * <p>If the reference starts with "tags/" or contains "/tags/",<code>null</code> is returned
+     *
+     * @param rawBranchRef
+     * @return git reference normalized.
+     */
+    public static String normalizeBranch(final String rawBranchRef) {
+        if (isTagReference(rawBranchRef)) {
+            return null;
+        } else {
+            return normalizeRef(rawBranchRef);
+        }
     }
 
-    String ref = rawRef;
-    if (ref.startsWith("origin")) {
-      ref = ORIGIN_PATTERN.matcher(ref).replaceAll("");
-    } else if (ref.startsWith("refs/heads")) {
-      ref = REFS_HEADS_PATTERN.matcher(ref).replaceAll("");
+    public static boolean isTagReference(final String ref) {
+        return ref != null && (ref.startsWith("tags/") || ref.contains("/tags/"));
     }
 
-    if (ref.startsWith("refs/tags")) {
-      return REFS_TAGS_PATTERN.matcher(ref).replaceAll("");
-    } else if (ref.startsWith("tags")) {
-      return TAGS_PATTERN.matcher(ref).replaceAll("");
-    }
+    private static String normalizeRef(final String rawRef) {
+        if (rawRef == null || rawRef.isEmpty()) {
+            return null;
+        }
 
-    return ref;
-  }
-
-  private static final Pattern SSH_PROTOCOL_AND_USER_INFO = Pattern.compile("^(ssh://).*?@");
-
-  /**
-   * Removes the user info of a certain URL. E.g: https://user:password@host.com/path ->
-   * https://host.com/path
-   *
-   * @param urlStr
-   * @return url without user info.
-   */
-  public static String filterSensitiveInfo(final String urlStr) {
-    if (urlStr == null || urlStr.isEmpty()) {
-      return null;
-    }
-    try {
-      if (urlStr.startsWith("http")) {
-        final URI url = new URI(urlStr);
-        final String userInfo = url.getRawUserInfo();
-        return Pattern.compile(userInfo + "@", Pattern.LITERAL).matcher(urlStr).replaceAll("");
-      } else {
-        return SSH_PROTOCOL_AND_USER_INFO.matcher(urlStr).replaceAll("$1");
-      }
-    } catch (final Exception ex) {
-      return urlStr;
+        String ref = rawRef;
+        if (ref.startsWith("origin")) {
+            ref = ORIGIN_PATTERN.matcher(ref).replaceAll("");
+        } else if (ref.startsWith("refs/heads")) {
+            ref = REFS_HEADS_PATTERN.matcher(ref).replaceAll("");
+        }
+
+        if (ref.startsWith("refs/tags")) {
+            return REFS_TAGS_PATTERN.matcher(ref).replaceAll("");
+        } else if (ref.startsWith("tags")) {
+            return TAGS_PATTERN.matcher(ref).replaceAll("");
+        }
+
+        return ref;
     }
-  }
-
-  /**
-   * Splits the git author in the form `John Doe <john.doe@email.com>` in a PersonInfo with name:
-   * John Doe and email: john.doe@email.com
-   *
-   * @param rawAuthor
-   * @return PersonInfo
-   */
-  public static PersonInfo splitAuthorAndEmail(String rawAuthor) {
-    if (rawAuthor == null || rawAuthor.isEmpty()) {
-      return PersonInfo.NOOP;
+
+    private static final Pattern SSH_PROTOCOL_AND_USER_INFO = Pattern.compile("^(ssh://).*?@");
+
+    /**
+     * Removes the user info of a certain URL. E.g: https://user:password@host.com/path ->
+     * https://host.com/path
+     *
+     * @param urlStr
+     * @return url without user info.
+     */
+    public static String filterSensitiveInfo(final String urlStr) {
+        if (urlStr == null || urlStr.isEmpty()) {
+            return null;
+        }
+        try {
+            if (urlStr.startsWith("http")) {
+                final URI url = new URI(urlStr);
+                final String userInfo = url.getRawUserInfo();
+                return Pattern.compile(userInfo + "@", Pattern.LITERAL)
+                        .matcher(urlStr)
+                        .replaceAll("");
+            } else {
+                return SSH_PROTOCOL_AND_USER_INFO.matcher(urlStr).replaceAll("$1");
+            }
+        } catch (final Exception ex) {
+            return urlStr;
+        }
     }
 
-    final byte[] raw = rawAuthor.getBytes(StandardCharsets.UTF_8);
-    final int nameB = 0;
+    /**
+     * Splits the git author in the form `John Doe <john.doe@email.com>` in a PersonInfo with name:
+     * John Doe and email: john.doe@email.com
+     *
+     * @param rawAuthor
+     * @return PersonInfo
+     */
+    public static PersonInfo splitAuthorAndEmail(String rawAuthor) {
+        if (rawAuthor == null || rawAuthor.isEmpty()) {
+            return PersonInfo.NOOP;
+        }
+
+        final byte[] raw = rawAuthor.getBytes(StandardCharsets.UTF_8);
+        final int nameB = 0;
+
+        // First, we find the index where the email starts and ends:
+        final int emailB = nextLF(raw, nameB, '<');
+        final int emailE = nextLF(raw, emailB, '>');
+        if (emailB >= raw.length || raw[emailB] == '\n' || (emailE >= raw.length - 1 && raw[emailE - 1] != '>')) {
+            return PersonInfo.NOOP;
+        }
+
+        // We need to find which is the index where the name ends,
+        // using the relative position where the email starts.
+        final int nameEnd = emailB - 2 >= nameB && raw[emailB - 2] == ' ' ? emailB - 2 : emailB - 1;
+
+        // Once we have the indexes where the name starts and ends
+        // we can extract the name.
+        final String name = decode(raw, nameB, nameEnd);
+
+        // Same approach to extract the email, using the indexes
+        // where the email starts and ends.
+        final String email = decode(raw, emailB, emailE - 1);
 
-    // First, we find the index where the email starts and ends:
-    final int emailB = nextLF(raw, nameB, '<');
-    final int emailE = nextLF(raw, emailB, '>');
-    if (emailB >= raw.length
-        || raw[emailB] == '\n'
-        || (emailE >= raw.length - 1 && raw[emailE - 1] != '>')) {
-      return PersonInfo.NOOP;
+        return new PersonInfo(name, email);
     }
 
-    // We need to find which is the index where the name ends,
-    // using the relative position where the email starts.
-    final int nameEnd = emailB - 2 >= nameB && raw[emailB - 2] == ' ' ? emailB - 2 : emailB - 1;
-
-    // Once we have the indexes where the name starts and ends
-    // we can extract the name.
-    final String name = decode(raw, nameB, nameEnd);
-
-    // Same approach to extract the email, using the indexes
-    // where the email starts and ends.
-    final String email = decode(raw, emailB, emailE - 1);
-
-    return new PersonInfo(name, email);
-  }
-
-  /**
-   * Decompress the byte array passed as argument using Java Inflater. The git objects are stored
-   * using ZLib compression.
-   *
-   * <p>If the decompression process requires a preset dictionary or the input is not enough, we
-   * return null.
-   *
-   * @param bytes compress data
-   * @return decompressed data or null
-   * @throws DataFormatException
-   */
-  public static byte[] inflate(final byte[] bytes) throws DataFormatException {
-    try (final ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-
-      // Git objects are compressed with ZLib.
-      // We need to decompress it using Inflater.
-      final Inflater ifr = new Inflater();
-      try {
-        ifr.setInput(bytes);
-        final byte[] tmp = new byte[4 * 1024];
-        while (!ifr.finished()) {
-          final int size = ifr.inflate(tmp);
-          if (size != 0) {
-            baos.write(tmp, 0, size);
-          } else {
-            // Inflater can return !finished but 0 bytes inflated.
-            if (ifr.needsDictionary()) {
-              logErrorInflating(
-                  "The data was compressed using a preset dictionary. We cannot decompress it.");
-              return null;
-            } else if (ifr.needsInput()) {
-              logErrorInflating("The provided data is not enough. It might be corrupted");
-              return null;
-            } else {
-              // At this point, neither dictionary nor input is needed.
-              // We break the loop and we will use the decompressed data that we already have.
-              break;
+    /**
+     * Decompress the byte array passed as argument using Java Inflater. The git objects are stored
+     * using ZLib compression.
+     *
+     * <p>If the decompression process requires a preset dictionary or the input is not enough, we
+     * return null.
+     *
+     * @param bytes compress data
+     * @return decompressed data or null
+     * @throws DataFormatException
+     */
+    public static byte[] inflate(final byte[] bytes) throws DataFormatException {
+        try (final ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+
+            // Git objects are compressed with ZLib.
+            // We need to decompress it using Inflater.
+            final Inflater ifr = new Inflater();
+            try {
+                ifr.setInput(bytes);
+                final byte[] tmp = new byte[4 * 1024];
+                while (!ifr.finished()) {
+                    final int size = ifr.inflate(tmp);
+                    if (size != 0) {
+                        baos.write(tmp, 0, size);
+                    } else {
+                        // Inflater can return !finished but 0 bytes inflated.
+                        if (ifr.needsDictionary()) {
+                            logErrorInflating(
+                                    "The data was compressed using a preset dictionary. We cannot decompress it.");
+                            return null;
+                        } else if (ifr.needsInput()) {
+                            logErrorInflating("The provided data is not enough. It might be corrupted");
+                            return null;
+                        } else {
+                            // At this point, neither dictionary nor input is needed.
+                            // We break the loop and we will use the decompressed data that we already have.
+                            break;
+                        }
+                    }
+                }
+
+                return baos.toByteArray();
+            } finally {
+                ifr.end();
             }
-          }
+        } catch (final IOException e) {
+            return null;
         }
+    }
 
-        return baos.toByteArray();
-      } finally {
-        ifr.end();
-      }
-    } catch (final IOException e) {
-      return null;
+    private static void logErrorInflating(final String reason) {
+        log.warn("Could not decompressed git object: Reason {}", reason);
     }
-  }
-
-  private static void logErrorInflating(final String reason) {
-    log.warn("Could not decompressed git object: Reason {}", reason);
-  }
-
-  /**
-   * Checks if the provided string is a valid commit SHA:
-   *
-   * <ul>
-   *   <li>length >= 7
-   *   <li>every character is a hexadecimal digit
-   * </ul>
-   */
-  public static boolean isValidCommitSha(final String commitSha) {
-    return isValidCommitSha(commitSha, SHORT_SHA_LENGTH);
-  }
-
-  /**
-   * Checks if the provided string is a valid commit SHA of full length:
-   *
-   * <ul>
-   *   <li>length >= 40
-   *   <li>every character is a hexadecimal digit
-   * </ul>
-   */
-  public static boolean isValidCommitShaFull(final String commitSha) {
-    return isValidCommitSha(commitSha, FULL_SHA_LENGTH);
-  }
-
-  private static boolean isValidCommitSha(final String commitSha, final int minLength) {
-    if (commitSha == null || commitSha.length() < minLength) {
-      return false;
+
+    /**
+     * Checks if the provided string is a valid commit SHA:
+     *
+     * <ul>
+     *   <li>length >= 7
+     *   <li>every character is a hexadecimal digit
+     * </ul>
+     */
+    public static boolean isValidCommitSha(final String commitSha) {
+        return isValidCommitSha(commitSha, SHORT_SHA_LENGTH);
     }
-    for (char c : commitSha.toCharArray()) {
-      if (!isHex(c)) {
-        return false;
-      }
+
+    /**
+     * Checks if the provided string is a valid commit SHA of full length:
+     *
+     * <ul>
+     *   <li>length >= 40
+     *   <li>every character is a hexadecimal digit
+     * </ul>
+     */
+    public static boolean isValidCommitShaFull(final String commitSha) {
+        return isValidCommitSha(commitSha, FULL_SHA_LENGTH);
     }
-    return true;
-  }
 
-  private static boolean isHex(char c) {
-    return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F');
-  }
+    private static boolean isValidCommitSha(final String commitSha, final int minLength) {
+        if (commitSha == null || commitSha.length() < minLength) {
+            return false;
+        }
+        for (char c : commitSha.toCharArray()) {
+            if (!isHex(c)) {
+                return false;
+            }
+        }
+        return true;
+    }
 
-  /** Checks if a string that will be used as a Git command argument is valid and safe */
-  static boolean isValidArg(@Nullable String arg) {
-    if (Strings.isBlank(arg)) {
-      return false;
+    private static boolean isHex(char c) {
+        return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F');
     }
-    return !SHELL_METACHAR_PATTERN.matcher(arg).find();
-  }
 
-  /** Checks if the provided string is a valid Git reference (branch, tag, etc.) */
-  public static boolean isValidRef(@Nullable String ref) {
-    if (Strings.isBlank(ref)) {
-      return false;
+    /** Checks if a string that will be used as a Git command argument is valid and safe */
+    static boolean isValidArg(@Nullable String arg) {
+        if (Strings.isBlank(arg)) {
+            return false;
+        }
+        return !SHELL_METACHAR_PATTERN.matcher(arg).find();
     }
 
-    for (char c : ref.toCharArray()) {
-      if (c < 32 || c == 127) return false;
+    /** Checks if the provided string is a valid Git reference (branch, tag, etc.) */
+    public static boolean isValidRef(@Nullable String ref) {
+        if (Strings.isBlank(ref)) {
+            return false;
+        }
+
+        for (char c : ref.toCharArray()) {
+            if (c < 32 || c == 127) return false;
+        }
+
+        if (INVALID_REF_PATTERN.matcher(ref).find()) {
+            return false;
+        }
+        return isValidArg(ref);
     }
 
-    if (INVALID_REF_PATTERN.matcher(ref).find()) {
-      return false;
+    /** Checks if the provided string is a valid system path for Git operations */
+    public static boolean isValidPath(@Nonnull String path) {
+        if (!PATH_PATTERN.matcher(path).matches()) {
+            return false;
+        }
+        // Reject path traversal sequences
+        return !path.contains("..");
     }
-    return isValidArg(ref);
-  }
 
-  /** Checks if the provided string is a valid system path for Git operations */
-  public static boolean isValidPath(@Nonnull String path) {
-    if (!PATH_PATTERN.matcher(path).matches()) {
-      return false;
+    /** Checks if the provided string is neither a valid commit SHA nor a valid Git reference */
+    public static boolean isNotValidCommit(@Nullable String commit) {
+        return !isValidCommitSha(commit) && !isValidRef(commit);
     }
-    // Reject path traversal sequences
-    return !path.contains("..");
-  }
-
-  /** Checks if the provided string is neither a valid commit SHA nor a valid Git reference */
-  public static boolean isNotValidCommit(@Nullable String commit) {
-    return !isValidCommitSha(commit) && !isValidRef(commit);
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/git/PersonInfo.java b/internal-api/src/main/java/datadog/trace/api/git/PersonInfo.java
index 2eae5d9c6c9..a83d87df08d 100644
--- a/internal-api/src/main/java/datadog/trace/api/git/PersonInfo.java
+++ b/internal-api/src/main/java/datadog/trace/api/git/PersonInfo.java
@@ -7,113 +7,113 @@
 import java.util.TimeZone;
 
 public final class PersonInfo {
-  public static final PersonInfo NOOP = new PersonInfo();
-
-  private static final String DATE_FORMAT_ISO8601 = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
-
-  private final String name;
-  private final String email;
-  private final String iso8601Date;
-
-  public PersonInfo() {
-    this(null, null, 0, 0);
-  }
-
-  public PersonInfo(final String name, final String email) {
-    this(name, email, 0, 0);
-  }
-
-  public PersonInfo(final String name, final String email, final String iso8601date) {
-    this.name = name;
-    this.email = email;
-    iso8601Date = iso8601date;
-  }
-
-  public PersonInfo(String name, String email, long when, int tzOffset) {
-    this.name = name;
-    this.email = email;
-    iso8601Date = buildISO8601Date(when);
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public String getEmail() {
-    return email;
-  }
-
-  public String getIso8601Date() {
-    return iso8601Date;
-  }
-
-  public boolean isEmpty() {
-    return Strings.isBlank(name) && Strings.isBlank(email) && Strings.isBlank(iso8601Date);
-  }
-
-  public boolean isComplete() {
-    return Strings.isNotBlank(name) && Strings.isNotBlank(email) && Strings.isNotBlank(iso8601Date);
-  }
-
-  /**
-   * Combine infos by completing the empty information fields in {@code first} with {@code second}'s
-   *
-   * @param first Base person info
-   * @param second Fallback person info
-   * @return Combined person info
-   */
-  public static PersonInfo coalesce(final PersonInfo first, final PersonInfo second) {
-    return new PersonInfo(
-        Strings.coalesce(first.name, second.name),
-        Strings.coalesce(first.email, second.email),
-        Strings.coalesce(first.iso8601Date, second.iso8601Date));
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    public static final PersonInfo NOOP = new PersonInfo();
+
+    private static final String DATE_FORMAT_ISO8601 = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
+
+    private final String name;
+    private final String email;
+    private final String iso8601Date;
+
+    public PersonInfo() {
+        this(null, null, 0, 0);
+    }
+
+    public PersonInfo(final String name, final String email) {
+        this(name, email, 0, 0);
+    }
+
+    public PersonInfo(final String name, final String email, final String iso8601date) {
+        this.name = name;
+        this.email = email;
+        iso8601Date = iso8601date;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    public PersonInfo(String name, String email, long when, int tzOffset) {
+        this.name = name;
+        this.email = email;
+        iso8601Date = buildISO8601Date(when);
+    }
+
+    public String getName() {
+        return name;
     }
-    PersonInfo that = (PersonInfo) o;
-    return Objects.equals(name, that.name)
-        && Objects.equals(email, that.email)
-        && Objects.equals(iso8601Date, that.iso8601Date);
-  }
-
-  @Override
-  public int hashCode() {
-    int hash = 1;
-    hash = 31 * hash + (name == null ? 0 : name.hashCode());
-    hash = 31 * hash + (email == null ? 0 : email.hashCode());
-    hash = 31 * hash + (iso8601Date == null ? 0 : iso8601Date.hashCode());
-    return hash;
-  }
-
-  @Override
-  public String toString() {
-    return "PersonInfo{"
-        + "name='"
-        + name
-        + '\''
-        + ", email='"
-        + email
-        + '\''
-        + ", ISO8601Date='"
-        + iso8601Date
-        + '\''
-        + '}';
-  }
-
-  private static String buildISO8601Date(final long when) {
-    if (when <= 0) {
-      return null;
+
+    public String getEmail() {
+        return email;
     }
 
-    final SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT_ISO8601);
-    sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
-    return sdf.format(new Date(when));
-  }
+    public String getIso8601Date() {
+        return iso8601Date;
+    }
+
+    public boolean isEmpty() {
+        return Strings.isBlank(name) && Strings.isBlank(email) && Strings.isBlank(iso8601Date);
+    }
+
+    public boolean isComplete() {
+        return Strings.isNotBlank(name) && Strings.isNotBlank(email) && Strings.isNotBlank(iso8601Date);
+    }
+
+    /**
+     * Combine infos by completing the empty information fields in {@code first} with {@code second}'s
+     *
+     * @param first Base person info
+     * @param second Fallback person info
+     * @return Combined person info
+     */
+    public static PersonInfo coalesce(final PersonInfo first, final PersonInfo second) {
+        return new PersonInfo(
+                Strings.coalesce(first.name, second.name),
+                Strings.coalesce(first.email, second.email),
+                Strings.coalesce(first.iso8601Date, second.iso8601Date));
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        PersonInfo that = (PersonInfo) o;
+        return Objects.equals(name, that.name)
+                && Objects.equals(email, that.email)
+                && Objects.equals(iso8601Date, that.iso8601Date);
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 1;
+        hash = 31 * hash + (name == null ? 0 : name.hashCode());
+        hash = 31 * hash + (email == null ? 0 : email.hashCode());
+        hash = 31 * hash + (iso8601Date == null ? 0 : iso8601Date.hashCode());
+        return hash;
+    }
+
+    @Override
+    public String toString() {
+        return "PersonInfo{"
+                + "name='"
+                + name
+                + '\''
+                + ", email='"
+                + email
+                + '\''
+                + ", ISO8601Date='"
+                + iso8601Date
+                + '\''
+                + '}';
+    }
+
+    private static String buildISO8601Date(final long when) {
+        if (when <= 0) {
+            return null;
+        }
+
+        final SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT_ISO8601);
+        sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+        return sdf.format(new Date(when));
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/git/RawParseUtils.java b/internal-api/src/main/java/datadog/trace/api/git/RawParseUtils.java
index 2addfcddcb9..0f64efbabdb 100644
--- a/internal-api/src/main/java/datadog/trace/api/git/RawParseUtils.java
+++ b/internal-api/src/main/java/datadog/trace/api/git/RawParseUtils.java
@@ -16,378 +16,378 @@
  */
 public final class RawParseUtils {
 
-  private RawParseUtils() {}
+    private RawParseUtils() {}
 
-  public static final byte[] COMMITTER = "committer ".getBytes(StandardCharsets.UTF_8);
-  public static final byte[] AUTHOR = "author ".getBytes(StandardCharsets.UTF_8);
+    public static final byte[] COMMITTER = "committer ".getBytes(StandardCharsets.UTF_8);
+    public static final byte[] AUTHOR = "author ".getBytes(StandardCharsets.UTF_8);
 
-  private static final byte[] digits10;
+    private static final byte[] digits10;
 
-  static {
-    digits10 = new byte['9' + 1];
-    Arrays.fill(digits10, (byte) -1);
-    for (char i = '0'; i <= '9'; i++) {
-      digits10[i] = (byte) (i - '0');
-    }
-  }
-
-  /**
-   * Locate the position of the commit message body.
-   *
-   * @param b buffer to scan.
-   * @param ptr position in buffer to start the scan at. Most callers should pass 0 to ensure the
-   *     scan starts from the beginning of the commit buffer.
-   * @return position of the user's message buffer.
-   */
-  public static int commitMessage(final byte[] b, int ptr) {
-    final int sz = b.length;
-    if (ptr == 0) {
-      ptr += 46; // skip the "tree ..." line.
-    }
-    while (ptr < sz && b[ptr] == 'p') {
-      ptr += 48; // skip this parent.
+    static {
+        digits10 = new byte['9' + 1];
+        Arrays.fill(digits10, (byte) -1);
+        for (char i = '0'; i <= '9'; i++) {
+            digits10[i] = (byte) (i - '0');
+        }
     }
 
-    // Skip any remaining header lines, ignoring what their actual
-    // header line type is. This is identical to the logic for a tag.
-    //
-    return tagMessage(b, ptr);
-  }
+    /**
+     * Locate the position of the commit message body.
+     *
+     * @param b buffer to scan.
+     * @param ptr position in buffer to start the scan at. Most callers should pass 0 to ensure the
+     *     scan starts from the beginning of the commit buffer.
+     * @return position of the user's message buffer.
+     */
+    public static int commitMessage(final byte[] b, int ptr) {
+        final int sz = b.length;
+        if (ptr == 0) {
+            ptr += 46; // skip the "tree ..." line.
+        }
+        while (ptr < sz && b[ptr] == 'p') {
+            ptr += 48; // skip this parent.
+        }
 
-  /**
-   * Locate the position of the tag message body.
-   *
-   * @param b buffer to scan.
-   * @param ptr position in buffer to start the scan at. Most callers should pass 0 to ensure the
-   *     scan starts from the beginning of the tag buffer.
-   * @return position of the user's message buffer.
-   */
-  public static int tagMessage(final byte[] b, int ptr) {
-    final int sz = b.length;
-    if (ptr == 0) {
-      ptr += 48; // skip the "object ..." line.
-    }
-    while (ptr < sz && b[ptr] != '\n') {
-      ptr = nextLF(b, ptr);
-    }
-    if (ptr < sz && b[ptr] == '\n') {
-      return ptr + 1;
+        // Skip any remaining header lines, ignoring what their actual
+        // header line type is. This is identical to the logic for a tag.
+        //
+        return tagMessage(b, ptr);
     }
-    return -1;
-  }
 
-  /**
-   * Locate the "committer " header line data.
-   *
-   * @param b buffer to scan.
-   * @param ptr position in buffer to start the scan at. Most callers should pass 0 to ensure the
-   *     scan starts from the beginning of the commit buffer and does not accidentally look at
-   *     message body.
-   * @return position just after the space in "committer ", so the first character of the
-   *     committer's name. If no committer header can be located -1 is returned.
-   */
-  public static int committer(final byte[] b, int ptr) {
-    final int sz = b.length;
-    if (ptr == 0) {
-      ptr += 46; // skip the "tree ..." line.
-    }
-    while (ptr < sz && b[ptr] == 'p') {
-      ptr += 48; // skip this parent.
-    }
-    if (ptr < sz && b[ptr] == 'a') {
-      ptr = nextLF(b, ptr);
+    /**
+     * Locate the position of the tag message body.
+     *
+     * @param b buffer to scan.
+     * @param ptr position in buffer to start the scan at. Most callers should pass 0 to ensure the
+     *     scan starts from the beginning of the tag buffer.
+     * @return position of the user's message buffer.
+     */
+    public static int tagMessage(final byte[] b, int ptr) {
+        final int sz = b.length;
+        if (ptr == 0) {
+            ptr += 48; // skip the "object ..." line.
+        }
+        while (ptr < sz && b[ptr] != '\n') {
+            ptr = nextLF(b, ptr);
+        }
+        if (ptr < sz && b[ptr] == '\n') {
+            return ptr + 1;
+        }
+        return -1;
     }
-    return match(b, ptr, COMMITTER);
-  }
 
-  /**
-   * Locate the "author " header line data.
-   *
-   * @param b buffer to scan.
-   * @param ptr position in buffer to start the scan at. Most callers should pass 0 to ensure the
-   *     scan starts from the beginning of the commit buffer and does not accidentally look at
-   *     message body.
-   * @return position just after the space in "author ", so the first character of the author's
-   *     name. If no author header can be located -1 is returned.
-   */
-  public static final int author(final byte[] b, int ptr) {
-    final int sz = b.length;
-    if (ptr == 0) {
-      ptr += 46; // skip the "tree ..." line.
+    /**
+     * Locate the "committer " header line data.
+     *
+     * @param b buffer to scan.
+     * @param ptr position in buffer to start the scan at. Most callers should pass 0 to ensure the
+     *     scan starts from the beginning of the commit buffer and does not accidentally look at
+     *     message body.
+     * @return position just after the space in "committer ", so the first character of the
+     *     committer's name. If no committer header can be located -1 is returned.
+     */
+    public static int committer(final byte[] b, int ptr) {
+        final int sz = b.length;
+        if (ptr == 0) {
+            ptr += 46; // skip the "tree ..." line.
+        }
+        while (ptr < sz && b[ptr] == 'p') {
+            ptr += 48; // skip this parent.
+        }
+        if (ptr < sz && b[ptr] == 'a') {
+            ptr = nextLF(b, ptr);
+        }
+        return match(b, ptr, COMMITTER);
     }
-    while (ptr < sz && b[ptr] == 'p') {
-      ptr += 48; // skip this parent.
+
+    /**
+     * Locate the "author " header line data.
+     *
+     * @param b buffer to scan.
+     * @param ptr position in buffer to start the scan at. Most callers should pass 0 to ensure the
+     *     scan starts from the beginning of the commit buffer and does not accidentally look at
+     *     message body.
+     * @return position just after the space in "author ", so the first character of the author's
+     *     name. If no author header can be located -1 is returned.
+     */
+    public static final int author(final byte[] b, int ptr) {
+        final int sz = b.length;
+        if (ptr == 0) {
+            ptr += 46; // skip the "tree ..." line.
+        }
+        while (ptr < sz && b[ptr] == 'p') {
+            ptr += 48; // skip this parent.
+        }
+        return match(b, ptr, AUTHOR);
     }
-    return match(b, ptr, AUTHOR);
-  }
 
-  /**
-   * Locate the first position after the next LF.
-   *
-   * <p>This method stops on the first '\n' it finds.
-   *
-   * @param b buffer to scan.
-   * @param ptr position within buffer to start looking for LF at.
-   * @return new position just after the first LF found.
-   */
-  public static int nextLF(final byte[] b, final int ptr) {
-    return next(b, ptr, '\n');
-  }
+    /**
+     * Locate the first position after the next LF.
+     *
+     * <p>This method stops on the first '\n' it finds.
+     *
+     * @param b buffer to scan.
+     * @param ptr position within buffer to start looking for LF at.
+     * @return new position just after the first LF found.
+     */
+    public static int nextLF(final byte[] b, final int ptr) {
+        return next(b, ptr, '\n');
+    }
 
-  /**
-   * Locate the first position after either the given character or LF.
-   *
-   * <p>This method stops on the first match it finds from either chrA or '\n'.
-   *
-   * @param b buffer to scan.
-   * @param ptr position within buffer to start looking for chrA or LF at.
-   * @param chrA character to find.
-   * @return new position just after the first chrA or LF to be found.
-   */
-  public static int nextLF(final byte[] b, int ptr, final char chrA) {
-    final int sz = b.length;
-    while (ptr < sz) {
-      final byte c = b[ptr++];
-      if (c == chrA || c == '\n') {
+    /**
+     * Locate the first position after either the given character or LF.
+     *
+     * <p>This method stops on the first match it finds from either chrA or '\n'.
+     *
+     * @param b buffer to scan.
+     * @param ptr position within buffer to start looking for chrA or LF at.
+     * @param chrA character to find.
+     * @return new position just after the first chrA or LF to be found.
+     */
+    public static int nextLF(final byte[] b, int ptr, final char chrA) {
+        final int sz = b.length;
+        while (ptr < sz) {
+            final byte c = b[ptr++];
+            if (c == chrA || c == '\n') {
+                return ptr;
+            }
+        }
         return ptr;
-      }
     }
-    return ptr;
-  }
 
-  /**
-   * Locate the first position after a given character.
-   *
-   * @param b buffer to scan.
-   * @param ptr position within buffer to start looking for chrA at.
-   * @param chrA character to find.
-   * @return new position just after chrA.
-   */
-  public static int next(final byte[] b, int ptr, final char chrA) {
-    final int sz = b.length;
-    while (ptr < sz) {
-      if (b[ptr++] == chrA) {
+    /**
+     * Locate the first position after a given character.
+     *
+     * @param b buffer to scan.
+     * @param ptr position within buffer to start looking for chrA at.
+     * @param chrA character to find.
+     * @return new position just after chrA.
+     */
+    public static int next(final byte[] b, int ptr, final char chrA) {
+        final int sz = b.length;
+        while (ptr < sz) {
+            if (b[ptr++] == chrA) {
+                return ptr;
+            }
+        }
         return ptr;
-      }
     }
-    return ptr;
-  }
 
-  /**
-   * Determine if b[ptr] matches src.
-   *
-   * @param b the buffer to scan.
-   * @param ptr first position within b, this should match src[0].
-   * @param src the buffer to test for equality with b.
-   * @return ptr + src.length if b[ptr..src.length] == src; else -1.
-   */
-  public static int match(final byte[] b, int ptr, final byte[] src) {
-    if (ptr + src.length > b.length) {
-      return -1;
-    }
-    for (int i = 0; i < src.length; i++, ptr++) {
-      if (b[ptr] != src[i]) {
-        return -1;
-      }
+    /**
+     * Determine if b[ptr] matches src.
+     *
+     * @param b the buffer to scan.
+     * @param ptr first position within b, this should match src[0].
+     * @param src the buffer to test for equality with b.
+     * @return ptr + src.length if b[ptr..src.length] == src; else -1.
+     */
+    public static int match(final byte[] b, int ptr, final byte[] src) {
+        if (ptr + src.length > b.length) {
+            return -1;
+        }
+        for (int i = 0; i < src.length; i++, ptr++) {
+            if (b[ptr] != src[i]) {
+                return -1;
+            }
+        }
+        return ptr;
     }
-    return ptr;
-  }
 
-  /**
-   * Decode a region of the buffer under the specified character set if possible.
-   *
-   * <p>If the byte stream cannot be decoded that way, the platform default is tried and if that too
-   * fails, the fail-safe ISO-8859-1 encoding is tried.
-   *
-   * @param buffer buffer to pull raw bytes from.
-   * @param start first position within the buffer to take data from.
-   * @param end one position past the last location within the buffer to take data from.
-   * @return a string representation of the range <code>[start,end)</code>, after decoding the
-   *     region through the specified character set.
-   */
-  public static String decode(final byte[] buffer, final int start, final int end) {
-    final ByteBuffer b = ByteBuffer.wrap(buffer, start, end - start);
-    b.mark();
+    /**
+     * Decode a region of the buffer under the specified character set if possible.
+     *
+     * <p>If the byte stream cannot be decoded that way, the platform default is tried and if that too
+     * fails, the fail-safe ISO-8859-1 encoding is tried.
+     *
+     * @param buffer buffer to pull raw bytes from.
+     * @param start first position within the buffer to take data from.
+     * @param end one position past the last location within the buffer to take data from.
+     * @return a string representation of the range <code>[start,end)</code>, after decoding the
+     *     region through the specified character set.
+     */
+    public static String decode(final byte[] buffer, final int start, final int end) {
+        final ByteBuffer b = ByteBuffer.wrap(buffer, start, end - start);
+        b.mark();
 
-    try {
-      final CharsetDecoder d = UTF_8.newDecoder();
-      d.onMalformedInput(CodingErrorAction.REPORT);
-      d.onUnmappableCharacter(CodingErrorAction.REPORT);
-      return d.decode(b).toString();
-    } catch (final CharacterCodingException e) {
-      b.reset();
+        try {
+            final CharsetDecoder d = UTF_8.newDecoder();
+            d.onMalformedInput(CodingErrorAction.REPORT);
+            d.onUnmappableCharacter(CodingErrorAction.REPORT);
+            return d.decode(b).toString();
+        } catch (final CharacterCodingException e) {
+            b.reset();
 
-      // Fall back to an ISO-8859-1 style encoding. At least all of
-      // the bytes will be present in the output.
-      //
-      return extractBinaryString(buffer, start, end);
+            // Fall back to an ISO-8859-1 style encoding. At least all of
+            // the bytes will be present in the output.
+            //
+            return extractBinaryString(buffer, start, end);
+        }
     }
-  }
 
-  /**
-   * Decode a region of the buffer under the ISO-8859-1 encoding.
-   *
-   * <p>Each byte is treated as a single character in the 8859-1 character encoding, performing a
-   * raw binary-&gt;char conversion.
-   *
-   * @param buffer buffer to pull raw bytes from.
-   * @param start first position within the buffer to take data from.
-   * @param end one position past the last location within the buffer to take data from.
-   * @return a string representation of the range <code>[start,end)</code>.
-   */
-  public static String extractBinaryString(final byte[] buffer, final int start, final int end) {
-    final StringBuilder r = new StringBuilder(end - start);
-    for (int i = start; i < end; i++) {
-      r.append((char) (buffer[i] & 0xff));
+    /**
+     * Decode a region of the buffer under the ISO-8859-1 encoding.
+     *
+     * <p>Each byte is treated as a single character in the 8859-1 character encoding, performing a
+     * raw binary-&gt;char conversion.
+     *
+     * @param buffer buffer to pull raw bytes from.
+     * @param start first position within the buffer to take data from.
+     * @param end one position past the last location within the buffer to take data from.
+     * @return a string representation of the range <code>[start,end)</code>.
+     */
+    public static String extractBinaryString(final byte[] buffer, final int start, final int end) {
+        final StringBuilder r = new StringBuilder(end - start);
+        for (int i = start; i < end; i++) {
+            r.append((char) (buffer[i] & 0xff));
+        }
+        return r.toString();
     }
-    return r.toString();
-  }
 
-  /**
-   * Get last index of {@code ch} in raw, trimming spaces.
-   *
-   * @param raw buffer to scan.
-   * @param ch character to find.
-   * @param pos starting position.
-   * @return last index of {@code ch} in raw, trimming spaces.
-   * @since 4.1
-   */
-  public static int lastIndexOfTrim(final byte[] raw, final char ch, int pos) {
-    while (pos >= 0 && raw[pos] == ' ') {
-      pos--;
-    }
+    /**
+     * Get last index of {@code ch} in raw, trimming spaces.
+     *
+     * @param raw buffer to scan.
+     * @param ch character to find.
+     * @param pos starting position.
+     * @return last index of {@code ch} in raw, trimming spaces.
+     * @since 4.1
+     */
+    public static int lastIndexOfTrim(final byte[] raw, final char ch, int pos) {
+        while (pos >= 0 && raw[pos] == ' ') {
+            pos--;
+        }
 
-    while (pos >= 0 && raw[pos] != ch) {
-      pos--;
-    }
+        while (pos >= 0 && raw[pos] != ch) {
+            pos--;
+        }
 
-    return pos;
-  }
+        return pos;
+    }
 
-  /**
-   * Parse a base 10 numeric from a sequence of ASCII digits into a long.
-   *
-   * <p>Digit sequences can begin with an optional run of spaces before the sequence, and may start
-   * with a '+' or a '-' to indicate sign position. Any other characters will cause the method to
-   * stop and return the current result to the caller.
-   *
-   * @param b buffer to scan.
-   * @param ptr position within buffer to start parsing digits at.
-   * @return the value at this location; 0 if the location is not a valid numeric.
-   */
-  public static long parseLongBase10(final byte[] b, int ptr) {
-    long r = 0;
-    int sign = 0;
-    try {
-      final int sz = b.length;
-      while (ptr < sz && b[ptr] == ' ') {
-        ptr++;
-      }
-      if (ptr >= sz) {
-        return 0;
-      }
+    /**
+     * Parse a base 10 numeric from a sequence of ASCII digits into a long.
+     *
+     * <p>Digit sequences can begin with an optional run of spaces before the sequence, and may start
+     * with a '+' or a '-' to indicate sign position. Any other characters will cause the method to
+     * stop and return the current result to the caller.
+     *
+     * @param b buffer to scan.
+     * @param ptr position within buffer to start parsing digits at.
+     * @return the value at this location; 0 if the location is not a valid numeric.
+     */
+    public static long parseLongBase10(final byte[] b, int ptr) {
+        long r = 0;
+        int sign = 0;
+        try {
+            final int sz = b.length;
+            while (ptr < sz && b[ptr] == ' ') {
+                ptr++;
+            }
+            if (ptr >= sz) {
+                return 0;
+            }
 
-      switch (b[ptr]) {
-        case '-':
-          sign = -1;
-          ptr++;
-          break;
-        case '+':
-          ptr++;
-          break;
-        default:
-          break;
-      }
+            switch (b[ptr]) {
+                case '-':
+                    sign = -1;
+                    ptr++;
+                    break;
+                case '+':
+                    ptr++;
+                    break;
+                default:
+                    break;
+            }
 
-      while (ptr < sz) {
-        final byte v = digits10[b[ptr]];
-        if (v < 0) {
-          break;
+            while (ptr < sz) {
+                final byte v = digits10[b[ptr]];
+                if (v < 0) {
+                    break;
+                }
+                r = (r * 10) + v;
+                ptr++;
+            }
+        } catch (final ArrayIndexOutOfBoundsException e) {
+            // Not a valid digit.
         }
-        r = (r * 10) + v;
-        ptr++;
-      }
-    } catch (final ArrayIndexOutOfBoundsException e) {
-      // Not a valid digit.
+        return sign < 0 ? -r : r;
     }
-    return sign < 0 ? -r : r;
-  }
 
-  /**
-   * Parse a base 10 numeric from a sequence of ASCII digits into an int.
-   *
-   * <p>Digit sequences can begin with an optional run of spaces before the sequence, and may start
-   * with a '+' or a '-' to indicate sign position. Any other characters will cause the method to
-   * stop and return the current result to the caller.
-   *
-   * @param b buffer to scan.
-   * @param ptr position within buffer to start parsing digits at.
-   * @return the value at this location; 0 if the location is not a valid numeric.
-   */
-  public static int parseBase10(final byte[] b, int ptr) {
-    int r = 0;
-    int sign = 0;
-    try {
-      final int sz = b.length;
-      while (ptr < sz && b[ptr] == ' ') {
-        ptr++;
-      }
-      if (ptr >= sz) {
-        return 0;
-      }
+    /**
+     * Parse a base 10 numeric from a sequence of ASCII digits into an int.
+     *
+     * <p>Digit sequences can begin with an optional run of spaces before the sequence, and may start
+     * with a '+' or a '-' to indicate sign position. Any other characters will cause the method to
+     * stop and return the current result to the caller.
+     *
+     * @param b buffer to scan.
+     * @param ptr position within buffer to start parsing digits at.
+     * @return the value at this location; 0 if the location is not a valid numeric.
+     */
+    public static int parseBase10(final byte[] b, int ptr) {
+        int r = 0;
+        int sign = 0;
+        try {
+            final int sz = b.length;
+            while (ptr < sz && b[ptr] == ' ') {
+                ptr++;
+            }
+            if (ptr >= sz) {
+                return 0;
+            }
 
-      switch (b[ptr]) {
-        case '-':
-          sign = -1;
-          ptr++;
-          break;
-        case '+':
-          ptr++;
-          break;
-        default:
-          break;
-      }
+            switch (b[ptr]) {
+                case '-':
+                    sign = -1;
+                    ptr++;
+                    break;
+                case '+':
+                    ptr++;
+                    break;
+                default:
+                    break;
+            }
 
-      while (ptr < sz) {
-        final byte v = digits10[b[ptr]];
-        if (v < 0) {
-          break;
+            while (ptr < sz) {
+                final byte v = digits10[b[ptr]];
+                if (v < 0) {
+                    break;
+                }
+                r = (r * 10) + v;
+                ptr++;
+            }
+        } catch (final ArrayIndexOutOfBoundsException e) {
+            // Not a valid digit.
         }
-        r = (r * 10) + v;
-        ptr++;
-      }
-    } catch (final ArrayIndexOutOfBoundsException e) {
-      // Not a valid digit.
+        return sign < 0 ? -r : r;
     }
-    return sign < 0 ? -r : r;
-  }
 
-  /**
-   * Parse a Git style timezone string.
-   *
-   * <p>The sequence "-0315" will be parsed as the numeric value -195, as the lower two positions
-   * count minutes, not 100ths of an hour.
-   *
-   * @param b buffer to scan.
-   * @param ptr position within buffer to start parsing digits at.
-   * @return the timezone at this location, expressed in minutes.
-   * @since 4.1
-   */
-  public static int parseTimeZoneOffset(final byte[] b, final int ptr) {
-    final int v = parseBase10(b, ptr);
-    final int tzMins = v % 100;
-    final int tzHours = v / 100;
-    return tzHours * 60 + tzMins;
-  }
+    /**
+     * Parse a Git style timezone string.
+     *
+     * <p>The sequence "-0315" will be parsed as the numeric value -195, as the lower two positions
+     * count minutes, not 100ths of an hour.
+     *
+     * @param b buffer to scan.
+     * @param ptr position within buffer to start parsing digits at.
+     * @return the timezone at this location, expressed in minutes.
+     * @since 4.1
+     */
+    public static int parseTimeZoneOffset(final byte[] b, final int ptr) {
+        final int v = parseBase10(b, ptr);
+        final int tzMins = v % 100;
+        final int tzHours = v / 100;
+        return tzHours * 60 + tzMins;
+    }
 
-  public static int findByte(final byte[] bytes, final byte b) {
-    int i = 0;
-    while (i < bytes.length) {
-      if (bytes[i] == b) {
-        return i;
-      }
-      i += 1;
+    public static int findByte(final byte[] bytes, final byte b) {
+        int i = 0;
+        while (i < bytes.length) {
+            if (bytes[i] == b) {
+                return i;
+            }
+            i += 1;
+        }
+        return -1;
     }
-    return -1;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/git/UserSuppliedGitInfoBuilder.java b/internal-api/src/main/java/datadog/trace/api/git/UserSuppliedGitInfoBuilder.java
index 96f1b7f9d63..99a4b8e8b66 100644
--- a/internal-api/src/main/java/datadog/trace/api/git/UserSuppliedGitInfoBuilder.java
+++ b/internal-api/src/main/java/datadog/trace/api/git/UserSuppliedGitInfoBuilder.java
@@ -13,107 +13,105 @@
 
 public class UserSuppliedGitInfoBuilder implements GitInfoBuilder {
 
-  public static final String DD_GIT_REPOSITORY_URL = "git.repository.url";
-  public static final String DD_GIT_BRANCH = "git.branch";
-  public static final String DD_GIT_TAG = "git.tag";
-  public static final String DD_GIT_COMMIT_SHA = "git.commit.sha";
-  public static final String DD_GIT_COMMIT_MESSAGE = "git.commit.message";
-  public static final String DD_GIT_COMMIT_AUTHOR_NAME = "git.commit.author.name";
-  public static final String DD_GIT_COMMIT_AUTHOR_EMAIL = "git.commit.author.email";
-  public static final String DD_GIT_COMMIT_AUTHOR_DATE = "git.commit.author.date";
-  public static final String DD_GIT_COMMIT_COMMITTER_NAME = "git.commit.committer.name";
-  public static final String DD_GIT_COMMIT_COMMITTER_EMAIL = "git.commit.committer.email";
-  public static final String DD_GIT_COMMIT_COMMITTER_DATE = "git.commit.committer.date";
-  private static final Logger log = LoggerFactory.getLogger(UserSuppliedGitInfoBuilder.class);
+    public static final String DD_GIT_REPOSITORY_URL = "git.repository.url";
+    public static final String DD_GIT_BRANCH = "git.branch";
+    public static final String DD_GIT_TAG = "git.tag";
+    public static final String DD_GIT_COMMIT_SHA = "git.commit.sha";
+    public static final String DD_GIT_COMMIT_MESSAGE = "git.commit.message";
+    public static final String DD_GIT_COMMIT_AUTHOR_NAME = "git.commit.author.name";
+    public static final String DD_GIT_COMMIT_AUTHOR_EMAIL = "git.commit.author.email";
+    public static final String DD_GIT_COMMIT_AUTHOR_DATE = "git.commit.author.date";
+    public static final String DD_GIT_COMMIT_COMMITTER_NAME = "git.commit.committer.name";
+    public static final String DD_GIT_COMMIT_COMMITTER_EMAIL = "git.commit.committer.email";
+    public static final String DD_GIT_COMMIT_COMMITTER_DATE = "git.commit.committer.date";
+    private static final Logger log = LoggerFactory.getLogger(UserSuppliedGitInfoBuilder.class);
 
-  @Override
-  public GitInfo build(@Nullable String repositoryPath) {
-    ConfigProvider configProvider = ConfigProvider.getInstance();
+    @Override
+    public GitInfo build(@Nullable String repositoryPath) {
+        ConfigProvider configProvider = ConfigProvider.getInstance();
 
-    String gitRepositoryUrl = configProvider.getString(DD_GIT_REPOSITORY_URL);
-    if (gitRepositoryUrl == null) {
-      gitRepositoryUrl = Config.get().getGlobalTags().get(Tags.GIT_REPOSITORY_URL);
-    }
+        String gitRepositoryUrl = configProvider.getString(DD_GIT_REPOSITORY_URL);
+        if (gitRepositoryUrl == null) {
+            gitRepositoryUrl = Config.get().getGlobalTags().get(Tags.GIT_REPOSITORY_URL);
+        }
 
-    // The user can set the DD_GIT_BRANCH manually but
-    // using the value returned by the CI Provider, so
-    // we need to normalize the value. Also, it can contain
-    // the tag (e.g. origin/tags/0.1.0)
-    String gitTag = configProvider.getString(DD_GIT_TAG);
-    String gitBranch = null;
-    final String gitBranchOrTag = configProvider.getString(DD_GIT_BRANCH);
-    if (gitBranchOrTag != null) {
-      if (!GitUtils.isTagReference(gitBranchOrTag)) {
-        gitBranch = GitUtils.normalizeBranch(gitBranchOrTag);
-      } else if (gitTag == null) {
-        gitTag = GitUtils.normalizeTag(gitBranchOrTag);
-      }
-    }
+        // The user can set the DD_GIT_BRANCH manually but
+        // using the value returned by the CI Provider, so
+        // we need to normalize the value. Also, it can contain
+        // the tag (e.g. origin/tags/0.1.0)
+        String gitTag = configProvider.getString(DD_GIT_TAG);
+        String gitBranch = null;
+        final String gitBranchOrTag = configProvider.getString(DD_GIT_BRANCH);
+        if (gitBranchOrTag != null) {
+            if (!GitUtils.isTagReference(gitBranchOrTag)) {
+                gitBranch = GitUtils.normalizeBranch(gitBranchOrTag);
+            } else if (gitTag == null) {
+                gitTag = GitUtils.normalizeTag(gitBranchOrTag);
+            }
+        }
 
-    String gitCommitSha = configProvider.getString(DD_GIT_COMMIT_SHA);
-    if (gitCommitSha == null) {
-      gitCommitSha = Config.get().getGlobalTags().get(Tags.GIT_COMMIT_SHA);
-    }
+        String gitCommitSha = configProvider.getString(DD_GIT_COMMIT_SHA);
+        if (gitCommitSha == null) {
+            gitCommitSha = Config.get().getGlobalTags().get(Tags.GIT_COMMIT_SHA);
+        }
 
-    final String gitCommitMessage = configProvider.getString(DD_GIT_COMMIT_MESSAGE);
-    final String gitCommitAuthorName = configProvider.getString(DD_GIT_COMMIT_AUTHOR_NAME);
-    final String gitCommitAuthorEmail = configProvider.getString(DD_GIT_COMMIT_AUTHOR_EMAIL);
-    final String gitCommitAuthorDate = configProvider.getString(DD_GIT_COMMIT_AUTHOR_DATE);
-    final String gitCommitCommitterName = configProvider.getString(DD_GIT_COMMIT_COMMITTER_NAME);
-    final String gitCommitCommitterEmail = configProvider.getString(DD_GIT_COMMIT_COMMITTER_EMAIL);
-    final String gitCommitCommitterDate = configProvider.getString(DD_GIT_COMMIT_COMMITTER_DATE);
+        final String gitCommitMessage = configProvider.getString(DD_GIT_COMMIT_MESSAGE);
+        final String gitCommitAuthorName = configProvider.getString(DD_GIT_COMMIT_AUTHOR_NAME);
+        final String gitCommitAuthorEmail = configProvider.getString(DD_GIT_COMMIT_AUTHOR_EMAIL);
+        final String gitCommitAuthorDate = configProvider.getString(DD_GIT_COMMIT_AUTHOR_DATE);
+        final String gitCommitCommitterName = configProvider.getString(DD_GIT_COMMIT_COMMITTER_NAME);
+        final String gitCommitCommitterEmail = configProvider.getString(DD_GIT_COMMIT_COMMITTER_EMAIL);
+        final String gitCommitCommitterDate = configProvider.getString(DD_GIT_COMMIT_COMMITTER_DATE);
 
-    GitInfo gitInfo =
-        new GitInfo(
-            gitRepositoryUrl,
-            gitBranch,
-            gitTag,
-            new CommitInfo(
-                gitCommitSha,
-                new PersonInfo(gitCommitAuthorName, gitCommitAuthorEmail, gitCommitAuthorDate),
-                new PersonInfo(
-                    gitCommitCommitterName, gitCommitCommitterEmail, gitCommitCommitterDate),
-                gitCommitMessage));
+        GitInfo gitInfo = new GitInfo(
+                gitRepositoryUrl,
+                gitBranch,
+                gitTag,
+                new CommitInfo(
+                        gitCommitSha,
+                        new PersonInfo(gitCommitAuthorName, gitCommitAuthorEmail, gitCommitAuthorDate),
+                        new PersonInfo(gitCommitCommitterName, gitCommitCommitterEmail, gitCommitCommitterDate),
+                        gitCommitMessage));
 
-    if (!gitInfo.isEmpty()) {
-      // if there is any git metadata supplied by the user, we want to check that repo URL and
-      // commit SHA are valid
-      String repoUrl = gitInfo.getRepositoryURL();
-      if (repoUrl == null || repoUrl.isEmpty()) {
-        log.error(
-            "Could not resolve git repository URL (can be provided via {} env var or corresponding system property, {} config property or by embedding git metadata at build time)",
-            ConfigStrings.propertyNameToEnvironmentVariableName(DD_GIT_REPOSITORY_URL),
-            GeneralConfig.TAGS);
-      }
+        if (!gitInfo.isEmpty()) {
+            // if there is any git metadata supplied by the user, we want to check that repo URL and
+            // commit SHA are valid
+            String repoUrl = gitInfo.getRepositoryURL();
+            if (repoUrl == null || repoUrl.isEmpty()) {
+                log.error(
+                        "Could not resolve git repository URL (can be provided via {} env var or corresponding system property, {} config property or by embedding git metadata at build time)",
+                        ConfigStrings.propertyNameToEnvironmentVariableName(DD_GIT_REPOSITORY_URL),
+                        GeneralConfig.TAGS);
+            }
 
-      String commitSha = gitInfo.getCommit().getSha();
-      if (!GitUtils.isValidCommitShaFull(commitSha)) {
-        log.error(
-            "Git commit SHA could not be resolved or is invalid: {}"
-                + " (can be provided via {}"
-                + " env var or corresponding system property, {}"
-                + " config property or by embedding git metadata at build time; must be a full-length SHA",
-            commitSha,
-            ConfigStrings.propertyNameToEnvironmentVariableName(DD_GIT_COMMIT_SHA),
-            GeneralConfig.TAGS);
-      }
-    }
+            String commitSha = gitInfo.getCommit().getSha();
+            if (!GitUtils.isValidCommitShaFull(commitSha)) {
+                log.error(
+                        "Git commit SHA could not be resolved or is invalid: {}"
+                                + " (can be provided via {}"
+                                + " env var or corresponding system property, {}"
+                                + " config property or by embedding git metadata at build time; must be a full-length SHA",
+                        commitSha,
+                        ConfigStrings.propertyNameToEnvironmentVariableName(DD_GIT_COMMIT_SHA),
+                        GeneralConfig.TAGS);
+            }
+        }
 
-    return gitInfo;
-  }
+        return gitInfo;
+    }
 
-  @Override
-  public int order() {
-    return 0;
-  }
+    @Override
+    public int order() {
+        return 0;
+    }
 
-  @Override
-  public GitProviderExpected providerAsExpected() {
-    return GitProviderExpected.USER_SUPPLIED;
-  }
+    @Override
+    public GitProviderExpected providerAsExpected() {
+        return GitProviderExpected.USER_SUPPLIED;
+    }
 
-  @Override
-  public GitProviderDiscrepant providerAsDiscrepant() {
-    return GitProviderDiscrepant.USER_SUPPLIED;
-  }
+    @Override
+    public GitProviderDiscrepant providerAsDiscrepant() {
+        return GitProviderDiscrepant.USER_SUPPLIED;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/http/MultipartContentDecoder.java b/internal-api/src/main/java/datadog/trace/api/http/MultipartContentDecoder.java
index dd78cc5241d..8a625478ce9 100644
--- a/internal-api/src/main/java/datadog/trace/api/http/MultipartContentDecoder.java
+++ b/internal-api/src/main/java/datadog/trace/api/http/MultipartContentDecoder.java
@@ -10,112 +10,110 @@
 /** Decodes multipart file content bytes to String using the per-part Content-Type charset. */
 public final class MultipartContentDecoder {
 
-  public static String readInputStream(InputStream is, int maxBytes, String contentType)
-      throws IOException {
-    byte[] buf = new byte[maxBytes];
-    int total = 0;
-    int n;
-    while (total < maxBytes && (n = is.read(buf, total, maxBytes - total)) != -1) {
-      total += n;
+    public static String readInputStream(InputStream is, int maxBytes, String contentType) throws IOException {
+        byte[] buf = new byte[maxBytes];
+        int total = 0;
+        int n;
+        while (total < maxBytes && (n = is.read(buf, total, maxBytes - total)) != -1) {
+            total += n;
+        }
+        return decodeBytes(buf, total, contentType);
     }
-    return decodeBytes(buf, total, contentType);
-  }
 
-  public static String decodeBytes(byte[] buf, int length, String contentType) {
-    Charset charset = extractCharset(contentType);
-    if (charset == null) charset = Charset.defaultCharset();
-    try {
-      return charset
-          .newDecoder()
-          .onMalformedInput(CodingErrorAction.REPLACE)
-          .onUnmappableCharacter(CodingErrorAction.REPLACE)
-          .decode(ByteBuffer.wrap(buf, 0, length))
-          .toString();
-    } catch (CharacterCodingException e) {
-      // unreachable: CodingErrorAction.REPLACE never throws CharacterCodingException
-      throw new IllegalStateException(e);
+    public static String decodeBytes(byte[] buf, int length, String contentType) {
+        Charset charset = extractCharset(contentType);
+        if (charset == null) charset = Charset.defaultCharset();
+        try {
+            return charset.newDecoder()
+                    .onMalformedInput(CodingErrorAction.REPLACE)
+                    .onUnmappableCharacter(CodingErrorAction.REPLACE)
+                    .decode(ByteBuffer.wrap(buf, 0, length))
+                    .toString();
+        } catch (CharacterCodingException e) {
+            // unreachable: CodingErrorAction.REPLACE never throws CharacterCodingException
+            throw new IllegalStateException(e);
+        }
     }
-  }
 
-  /**
-   * Walks the media-type parameter list of a Content-Type value looking for a {@code charset}
-   * parameter, honoring RFC 7230 quoted-string syntax for parameter values. Quoted values are fully
-   * consumed as opaque tokens, so a {@code charset}-looking substring inside another parameter's
-   * quoted value (e.g. {@code boundary="charset=oops"}) can never be mistaken for a real {@code
-   * charset} parameter. If a {@code charset} parameter is found but its value is not a valid
-   * charset name, the search continues to any later {@code charset} parameter instead of giving up.
-   */
-  public static Charset extractCharset(String contentType) {
-    if (contentType == null) return null;
-    int len = contentType.length();
-    // Skip the media type itself (e.g. "text/plain") up to the first parameter delimiter.
-    int i = skipToDelimiter(contentType, 0, len);
-    while (i < len) {
-      i++; // consume the ';' or ',' that ends the previous token
-      i = skipOws(contentType, i, len);
-      int nameStart = i;
-      while (i < len
-          && contentType.charAt(i) != '='
-          && contentType.charAt(i) != ';'
-          && contentType.charAt(i) != ',') {
-        i++;
-      }
-      if (i >= len || contentType.charAt(i) != '=') {
-        // Parameter with no '=' (malformed) — skip past it and keep looking.
-        i = skipToDelimiter(contentType, i, len);
-        continue;
-      }
-      int nameEnd = i;
-      while (nameEnd > nameStart && isOws(contentType.charAt(nameEnd - 1))) nameEnd--;
-      String name = contentType.substring(nameStart, nameEnd);
-      i = skipOws(contentType, i + 1, len);
-      String value;
-      if (i < len && contentType.charAt(i) == '"') {
-        StringBuilder sb = new StringBuilder();
-        i++;
-        while (i < len && contentType.charAt(i) != '"') {
-          char c = contentType.charAt(i);
-          if (c == '\\' && i + 1 < len) {
-            i++;
-            c = contentType.charAt(i);
-          }
-          sb.append(c);
-          i++;
-        }
-        if (i < len) i++; // consume closing quote
-        value = sb.toString();
-        i = skipToDelimiter(contentType, i, len);
-      } else {
-        int valStart = i;
-        i = skipToDelimiter(contentType, i, len);
-        int valEnd = i;
-        while (valEnd > valStart && isOws(contentType.charAt(valEnd - 1))) valEnd--;
-        value = contentType.substring(valStart, valEnd);
-      }
-      if (name.equalsIgnoreCase("charset")) {
-        try {
-          return Charset.forName(value);
-        } catch (IllegalArgumentException ignored) {
-          // An invalid charset value here does not rule out a later, valid charset parameter.
+    /**
+     * Walks the media-type parameter list of a Content-Type value looking for a {@code charset}
+     * parameter, honoring RFC 7230 quoted-string syntax for parameter values. Quoted values are fully
+     * consumed as opaque tokens, so a {@code charset}-looking substring inside another parameter's
+     * quoted value (e.g. {@code boundary="charset=oops"}) can never be mistaken for a real {@code
+     * charset} parameter. If a {@code charset} parameter is found but its value is not a valid
+     * charset name, the search continues to any later {@code charset} parameter instead of giving up.
+     */
+    public static Charset extractCharset(String contentType) {
+        if (contentType == null) return null;
+        int len = contentType.length();
+        // Skip the media type itself (e.g. "text/plain") up to the first parameter delimiter.
+        int i = skipToDelimiter(contentType, 0, len);
+        while (i < len) {
+            i++; // consume the ';' or ',' that ends the previous token
+            i = skipOws(contentType, i, len);
+            int nameStart = i;
+            while (i < len
+                    && contentType.charAt(i) != '='
+                    && contentType.charAt(i) != ';'
+                    && contentType.charAt(i) != ',') {
+                i++;
+            }
+            if (i >= len || contentType.charAt(i) != '=') {
+                // Parameter with no '=' (malformed) — skip past it and keep looking.
+                i = skipToDelimiter(contentType, i, len);
+                continue;
+            }
+            int nameEnd = i;
+            while (nameEnd > nameStart && isOws(contentType.charAt(nameEnd - 1))) nameEnd--;
+            String name = contentType.substring(nameStart, nameEnd);
+            i = skipOws(contentType, i + 1, len);
+            String value;
+            if (i < len && contentType.charAt(i) == '"') {
+                StringBuilder sb = new StringBuilder();
+                i++;
+                while (i < len && contentType.charAt(i) != '"') {
+                    char c = contentType.charAt(i);
+                    if (c == '\\' && i + 1 < len) {
+                        i++;
+                        c = contentType.charAt(i);
+                    }
+                    sb.append(c);
+                    i++;
+                }
+                if (i < len) i++; // consume closing quote
+                value = sb.toString();
+                i = skipToDelimiter(contentType, i, len);
+            } else {
+                int valStart = i;
+                i = skipToDelimiter(contentType, i, len);
+                int valEnd = i;
+                while (valEnd > valStart && isOws(contentType.charAt(valEnd - 1))) valEnd--;
+                value = contentType.substring(valStart, valEnd);
+            }
+            if (name.equalsIgnoreCase("charset")) {
+                try {
+                    return Charset.forName(value);
+                } catch (IllegalArgumentException ignored) {
+                    // An invalid charset value here does not rule out a later, valid charset parameter.
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
 
-  private static int skipToDelimiter(String s, int i, int len) {
-    while (i < len && s.charAt(i) != ';' && s.charAt(i) != ',') i++;
-    return i;
-  }
+    private static int skipToDelimiter(String s, int i, int len) {
+        while (i < len && s.charAt(i) != ';' && s.charAt(i) != ',') i++;
+        return i;
+    }
 
-  private static boolean isOws(char c) {
-    return c == ' ' || c == '\t';
-  }
+    private static boolean isOws(char c) {
+        return c == ' ' || c == '\t';
+    }
 
-  private static int skipOws(String s, int i, int len) {
-    while (i < len && isOws(s.charAt(i))) i++;
-    return i;
-  }
+    private static int skipOws(String s, int i, int len) {
+        while (i < len && isOws(s.charAt(i))) i++;
+        return i;
+    }
 
-  private MultipartContentDecoder() {}
+    private MultipartContentDecoder() {}
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/http/StoredBodyFactories.java b/internal-api/src/main/java/datadog/trace/api/http/StoredBodyFactories.java
index b1fc9226af5..8a5ae28920f 100644
--- a/internal-api/src/main/java/datadog/trace/api/http/StoredBodyFactories.java
+++ b/internal-api/src/main/java/datadog/trace/api/http/StoredBodyFactories.java
@@ -13,112 +13,110 @@
 import java.util.function.Supplier;
 
 public class StoredBodyFactories {
-  private StoredBodyFactories() {}
-
-  public static StoredByteBody maybeCreateForByte(Charset charset, Object contentLengthHeader) {
-    AgentSpan agentSpan = AgentTracer.activeSpan();
-    if (agentSpan == null) {
-      return null;
-    }
-    return maybeCreateForByte(charset, agentSpan, contentLengthHeader);
-  }
-
-  @SuppressWarnings("Duplicates")
-  public static StoredByteBody maybeCreateForByte(
-      Charset charset, AgentSpan agentSpan, Object contentLengthHeader) {
-    RequestContext requestContext = agentSpan.getRequestContext();
-    if (requestContext == null) {
-      return null;
+    private StoredBodyFactories() {}
+
+    public static StoredByteBody maybeCreateForByte(Charset charset, Object contentLengthHeader) {
+        AgentSpan agentSpan = AgentTracer.activeSpan();
+        if (agentSpan == null) {
+            return null;
+        }
+        return maybeCreateForByte(charset, agentSpan, contentLengthHeader);
     }
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, StoredBodySupplier, Void> requestStartCb =
-        cbp.getCallback(EVENTS.requestBodyStart());
-    BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> requestEndedCb =
-        cbp.getCallback(EVENTS.requestBodyDone());
-    if (requestStartCb == null || requestEndedCb == null) {
-      return null;
+    @SuppressWarnings("Duplicates")
+    public static StoredByteBody maybeCreateForByte(Charset charset, AgentSpan agentSpan, Object contentLengthHeader) {
+        RequestContext requestContext = agentSpan.getRequestContext();
+        if (requestContext == null) {
+            return null;
+        }
+
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, StoredBodySupplier, Void> requestStartCb =
+                cbp.getCallback(EVENTS.requestBodyStart());
+        BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> requestEndedCb =
+                cbp.getCallback(EVENTS.requestBodyDone());
+        if (requestStartCb == null || requestEndedCb == null) {
+            return null;
+        }
+
+        int lengthHint = parseLengthHeader(contentLengthHeader);
+
+        return new StoredByteBody(requestContext, requestStartCb, requestEndedCb, charset, lengthHint);
     }
 
-    int lengthHint = parseLengthHeader(contentLengthHeader);
-
-    return new StoredByteBody(requestContext, requestStartCb, requestEndedCb, charset, lengthHint);
-  }
-
-  @SuppressWarnings("Duplicates")
-  public static Flow<Void> maybeDeliverBodyInOneGo(
-      Supplier<CharSequence> supplier, RequestContext requestContext) {
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, StoredBodySupplier, Void> requestStartCb =
-        cbp.getCallback(EVENTS.requestBodyStart());
-    BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> requestEndedCb =
-        cbp.getCallback(EVENTS.requestBodyDone());
-    if (requestStartCb == null || requestEndedCb == null) {
-      return Flow.ResultFlow.empty();
+    @SuppressWarnings("Duplicates")
+    public static Flow<Void> maybeDeliverBodyInOneGo(Supplier<CharSequence> supplier, RequestContext requestContext) {
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, StoredBodySupplier, Void> requestStartCb =
+                cbp.getCallback(EVENTS.requestBodyStart());
+        BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> requestEndedCb =
+                cbp.getCallback(EVENTS.requestBodyDone());
+        if (requestStartCb == null || requestEndedCb == null) {
+            return Flow.ResultFlow.empty();
+        }
+
+        StoredBodySupplier wrappedSupplier = new ConstantBodySupplier(supplier);
+        requestStartCb.apply(requestContext, wrappedSupplier);
+        return requestEndedCb.apply(requestContext, wrappedSupplier);
     }
 
-    StoredBodySupplier wrappedSupplier = new ConstantBodySupplier(supplier);
-    requestStartCb.apply(requestContext, wrappedSupplier);
-    return requestEndedCb.apply(requestContext, wrappedSupplier);
-  }
+    public static Flow<Void> maybeDeliverBodyInOneGo(final String str, RequestContext reqCtx) {
+        return maybeDeliverBodyInOneGo(() -> str, reqCtx);
+    }
 
-  public static Flow<Void> maybeDeliverBodyInOneGo(final String str, RequestContext reqCtx) {
-    return maybeDeliverBodyInOneGo(() -> str, reqCtx);
-  }
+    public static class ConstantBodySupplier implements StoredBodySupplier {
+        private final CharSequence sequence;
 
-  public static class ConstantBodySupplier implements StoredBodySupplier {
-    private final CharSequence sequence;
+        public ConstantBodySupplier(Supplier<CharSequence> original) {
+            this.sequence = original.get();
+        }
 
-    public ConstantBodySupplier(Supplier<CharSequence> original) {
-      this.sequence = original.get();
+        @Override
+        public CharSequence get() {
+            return this.sequence;
+        }
     }
 
-    @Override
-    public CharSequence get() {
-      return this.sequence;
+    public static StoredCharBody maybeCreateForChar(Object contentLengthHeader) {
+        AgentSpan agentSpan = AgentTracer.activeSpan();
+        if (agentSpan == null) {
+            return null;
+        }
+        return maybeCreateForChar(agentSpan, contentLengthHeader);
     }
-  }
 
-  public static StoredCharBody maybeCreateForChar(Object contentLengthHeader) {
-    AgentSpan agentSpan = AgentTracer.activeSpan();
-    if (agentSpan == null) {
-      return null;
-    }
-    return maybeCreateForChar(agentSpan, contentLengthHeader);
-  }
-
-  @SuppressWarnings("Duplicates")
-  public static StoredCharBody maybeCreateForChar(AgentSpan agentSpan, Object contentLengthHeader) {
-    RequestContext requestContext = agentSpan.getRequestContext();
-    if (requestContext == null) {
-      return null;
+    @SuppressWarnings("Duplicates")
+    public static StoredCharBody maybeCreateForChar(AgentSpan agentSpan, Object contentLengthHeader) {
+        RequestContext requestContext = agentSpan.getRequestContext();
+        if (requestContext == null) {
+            return null;
+        }
+
+        CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+        BiFunction<RequestContext, StoredBodySupplier, Void> requestStartCb =
+                cbp.getCallback(EVENTS.requestBodyStart());
+        BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> requestEndedCb =
+                cbp.getCallback(EVENTS.requestBodyDone());
+        if (requestStartCb == null || requestEndedCb == null) {
+            return null;
+        }
+
+        int lengthHint = parseLengthHeader(contentLengthHeader);
+
+        return new StoredCharBody(requestContext, requestStartCb, requestEndedCb, lengthHint);
     }
 
-    CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
-    BiFunction<RequestContext, StoredBodySupplier, Void> requestStartCb =
-        cbp.getCallback(EVENTS.requestBodyStart());
-    BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> requestEndedCb =
-        cbp.getCallback(EVENTS.requestBodyDone());
-    if (requestStartCb == null || requestEndedCb == null) {
-      return null;
-    }
-
-    int lengthHint = parseLengthHeader(contentLengthHeader);
-
-    return new StoredCharBody(requestContext, requestStartCb, requestEndedCb, lengthHint);
-  }
-
-  private static int parseLengthHeader(Object contentLengthHeader) {
-    if (contentLengthHeader instanceof Number) {
-      return ((Number) contentLengthHeader).intValue();
-    }
-    if (contentLengthHeader != null) {
-      try {
-        return Integer.parseInt(contentLengthHeader.toString());
-      } catch (NumberFormatException nfe) {
-        // purposefully left blank
-      }
+    private static int parseLengthHeader(Object contentLengthHeader) {
+        if (contentLengthHeader instanceof Number) {
+            return ((Number) contentLengthHeader).intValue();
+        }
+        if (contentLengthHeader != null) {
+            try {
+                return Integer.parseInt(contentLengthHeader.toString());
+            } catch (NumberFormatException nfe) {
+                // purposefully left blank
+            }
+        }
+        return 0;
     }
-    return 0;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/http/StoredBodySupplier.java b/internal-api/src/main/java/datadog/trace/api/http/StoredBodySupplier.java
index dc77a542426..be60e3d0777 100644
--- a/internal-api/src/main/java/datadog/trace/api/http/StoredBodySupplier.java
+++ b/internal-api/src/main/java/datadog/trace/api/http/StoredBodySupplier.java
@@ -4,6 +4,6 @@
 import javax.annotation.Nonnull;
 
 public interface StoredBodySupplier extends Supplier<CharSequence> {
-  @Nonnull
-  CharSequence get();
+    @Nonnull
+    CharSequence get();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/http/StoredByteBody.java b/internal-api/src/main/java/datadog/trace/api/http/StoredByteBody.java
index a2c44906855..74f29c02858 100644
--- a/internal-api/src/main/java/datadog/trace/api/http/StoredByteBody.java
+++ b/internal-api/src/main/java/datadog/trace/api/http/StoredByteBody.java
@@ -22,288 +22,285 @@
  */
 public class StoredByteBody implements StoredBodySupplier {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(StoredByteBody.class);
-
-  static final Charset UTF_8 = StandardCharsets.UTF_8;
-  static final Charset ISO_8859_1 = StandardCharsets.ISO_8859_1;
-
-  private final ByteBuffer undecodedData = ByteBuffer.allocate(64);
-  // decoded data has double the size to allow for the (unlikely)
-  // prospect that supplementary characters (2 chars) be encoded in 1 byte
-  private final CharBuffer decodedData = CharBuffer.allocate(128);
-  private CharsetDecoder charsetDecoder;
-  private StoredCharBody storedCharBody;
-
-  public StoredByteBody(
-      RequestContext requestContext,
-      BiFunction<RequestContext, StoredBodySupplier, Void> startCb,
-      BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> endCb,
-      @Nullable Charset charset,
-      int lengthHint) {
-    if (charset != null) {
-      this.charsetDecoder = ThreadLocalCoders.decoderFor(charset);
-    }
-    this.storedCharBody = new StoredCharBody(requestContext, startCb, endCb, lengthHint, this);
-  }
-
-  public synchronized void appendData(byte[] bytes, int start, int end) {
-    try {
-      if (storedCharBody.isLimitReached()) {
-        return;
-      }
-      for (int i = start; i < end; ) {
-        if (!undecodedData.hasRemaining()) {
-          commit(false);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StoredByteBody.class);
+
+    static final Charset UTF_8 = StandardCharsets.UTF_8;
+    static final Charset ISO_8859_1 = StandardCharsets.ISO_8859_1;
+
+    private final ByteBuffer undecodedData = ByteBuffer.allocate(64);
+    // decoded data has double the size to allow for the (unlikely)
+    // prospect that supplementary characters (2 chars) be encoded in 1 byte
+    private final CharBuffer decodedData = CharBuffer.allocate(128);
+    private CharsetDecoder charsetDecoder;
+    private StoredCharBody storedCharBody;
+
+    public StoredByteBody(
+            RequestContext requestContext,
+            BiFunction<RequestContext, StoredBodySupplier, Void> startCb,
+            BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> endCb,
+            @Nullable Charset charset,
+            int lengthHint) {
+        if (charset != null) {
+            this.charsetDecoder = ThreadLocalCoders.decoderFor(charset);
         }
-        int write = Math.min(end - i, undecodedData.remaining());
-        undecodedData.put(bytes, i, write);
-        i += write;
-      }
-    } catch (final Throwable e) {
-      LOGGER.debug("Failed to append byte array chunk", e);
+        this.storedCharBody = new StoredCharBody(requestContext, startCb, endCb, lengthHint, this);
     }
-    storedCharBody.maybeNotifyStart();
-  }
-
-  /**
-   * Writes up to <code>len</code> bytes, in general through several invocations of the callback
-   * <code>cb</code>. The callback must write exactly <code>undecodedData.remaining()</code> bytes
-   * on each invocation. The limit of <code>undecodedData</code> passed to the callback will be
-   * adjusted in the last iteration, if necessary.
-   *
-   * @param cb the callback used to write directly into undecodedData
-   * @param len the amount of data available to write
-   */
-  public synchronized void appendData(ByteBufferWriteCallback cb, int len) {
-    try {
-      for (int i = 0; i < len; ) {
-        if (storedCharBody.isLimitReached()) {
-          return;
-        }
-        if (!undecodedData.hasRemaining()) {
-          commit(false);
-        }
-        int left = len - i;
-        int remainingInUndecoded = undecodedData.remaining();
-        if (remainingInUndecoded > left) {
-          undecodedData.limit(left);
-          i += left;
-        } else {
-          i += remainingInUndecoded;
-        }
-        cb.put(undecodedData);
-      }
-      undecodedData.limit(undecodedData.capacity());
 
-    } catch (final Throwable e) {
-      LOGGER.debug("Failed to append byte buffer callback", e);
+    public synchronized void appendData(byte[] bytes, int start, int end) {
+        try {
+            if (storedCharBody.isLimitReached()) {
+                return;
+            }
+            for (int i = start; i < end; ) {
+                if (!undecodedData.hasRemaining()) {
+                    commit(false);
+                }
+                int write = Math.min(end - i, undecodedData.remaining());
+                undecodedData.put(bytes, i, write);
+                i += write;
+            }
+        } catch (final Throwable e) {
+            LOGGER.debug("Failed to append byte array chunk", e);
+        }
+        storedCharBody.maybeNotifyStart();
     }
-    storedCharBody.maybeNotifyStart();
-  }
-
-  public synchronized void appendData(int byteValue) {
-    try {
-      if (storedCharBody.isLimitReached()) {
-        return;
-      }
-      if (byteValue < 0 || byteValue > 255) {
-        return;
-      }
-
-      if (!undecodedData.hasRemaining()) {
-        commit(false);
-      }
-      undecodedData.put((byte) byteValue);
-    } catch (final Throwable e) {
-      LOGGER.debug("Failed to append byte", e);
+
+    /**
+     * Writes up to <code>len</code> bytes, in general through several invocations of the callback
+     * <code>cb</code>. The callback must write exactly <code>undecodedData.remaining()</code> bytes
+     * on each invocation. The limit of <code>undecodedData</code> passed to the callback will be
+     * adjusted in the last iteration, if necessary.
+     *
+     * @param cb the callback used to write directly into undecodedData
+     * @param len the amount of data available to write
+     */
+    public synchronized void appendData(ByteBufferWriteCallback cb, int len) {
+        try {
+            for (int i = 0; i < len; ) {
+                if (storedCharBody.isLimitReached()) {
+                    return;
+                }
+                if (!undecodedData.hasRemaining()) {
+                    commit(false);
+                }
+                int left = len - i;
+                int remainingInUndecoded = undecodedData.remaining();
+                if (remainingInUndecoded > left) {
+                    undecodedData.limit(left);
+                    i += left;
+                } else {
+                    i += remainingInUndecoded;
+                }
+                cb.put(undecodedData);
+            }
+            undecodedData.limit(undecodedData.capacity());
+
+        } catch (final Throwable e) {
+            LOGGER.debug("Failed to append byte buffer callback", e);
+        }
+        storedCharBody.maybeNotifyStart();
     }
-    storedCharBody.maybeNotifyStart();
-  }
-
-  public synchronized void setCharset(Charset charset) {
-    this.charsetDecoder = ThreadLocalCoders.decoderFor(charset);
-  }
-
-  public Flow<Void> maybeNotify() {
-    try {
-      commit(true);
-    } catch (final Throwable e) {
-      LOGGER.debug("Failed to commit end of input", e);
+
+    public synchronized void appendData(int byteValue) {
+        try {
+            if (storedCharBody.isLimitReached()) {
+                return;
+            }
+            if (byteValue < 0 || byteValue > 255) {
+                return;
+            }
+
+            if (!undecodedData.hasRemaining()) {
+                commit(false);
+            }
+            undecodedData.put((byte) byteValue);
+        } catch (final Throwable e) {
+            LOGGER.debug("Failed to append byte", e);
+        }
+        storedCharBody.maybeNotifyStart();
     }
-    return storedCharBody.maybeNotify();
-  }
-
-  // may throw BlockingException. If used directly in advice, make use of @Advice.Throwable to
-  // propagate
-  public void maybeNotifyAndBlock() {
-    try {
-      commit(true);
-    } catch (final Throwable e) {
-      LOGGER.debug("Failed to commit end of input", e);
+
+    public synchronized void setCharset(Charset charset) {
+        this.charsetDecoder = ThreadLocalCoders.decoderFor(charset);
     }
-    storedCharBody.maybeNotifyAndBlock();
-  }
-
-  @Override
-  public synchronized CharSequence get() {
-    commit(false);
-    return storedCharBody.get();
-  }
-
-  private void commit(boolean endOfInput) {
-    if (undecodedData.position() == 0) {
-      return;
+
+    public Flow<Void> maybeNotify() {
+        try {
+            commit(true);
+        } catch (final Throwable e) {
+            LOGGER.debug("Failed to commit end of input", e);
+        }
+        return storedCharBody.maybeNotify();
     }
-    if (charsetDecoder == null) {
-      charsetDecoder =
-          ThreadLocalCoders.decoderFor(UTF_8).onMalformedInput(CodingErrorAction.REPORT);
+
+    // may throw BlockingException. If used directly in advice, make use of @Advice.Throwable to
+    // propagate
+    public void maybeNotifyAndBlock() {
+        try {
+            commit(true);
+        } catch (final Throwable e) {
+            LOGGER.debug("Failed to commit end of input", e);
+        }
+        storedCharBody.maybeNotifyAndBlock();
     }
 
-    this.undecodedData.flip();
-    CoderResult decode = charsetDecoder.decode(this.undecodedData, this.decodedData, endOfInput);
-    if (endOfInput) {
-      /**
-       * Ensure the decoder is at a proper state in case the original input stream is reset,
-       * otherwise we will face: java.lang.IllegalStateException: Current state = CODING_END, new
-       * state = CODING
-       */
-      charsetDecoder.reset();
+    @Override
+    public synchronized CharSequence get() {
+        commit(false);
+        return storedCharBody.get();
     }
 
-    this.decodedData.flip();
-    this.storedCharBody.appendData(this.decodedData);
-    this.decodedData.position(0);
-    this.decodedData.limit(this.decodedData.capacity());
+    private void commit(boolean endOfInput) {
+        if (undecodedData.position() == 0) {
+            return;
+        }
+        if (charsetDecoder == null) {
+            charsetDecoder = ThreadLocalCoders.decoderFor(UTF_8).onMalformedInput(CodingErrorAction.REPORT);
+        }
+
+        this.undecodedData.flip();
+        CoderResult decode = charsetDecoder.decode(this.undecodedData, this.decodedData, endOfInput);
+        if (endOfInput) {
+            /**
+             * Ensure the decoder is at a proper state in case the original input stream is reset,
+             * otherwise we will face: java.lang.IllegalStateException: Current state = CODING_END, new
+             * state = CODING
+             */
+            charsetDecoder.reset();
+        }
 
-    this.undecodedData.compact();
+        this.decodedData.flip();
+        this.storedCharBody.appendData(this.decodedData);
+        this.decodedData.position(0);
+        this.decodedData.limit(this.decodedData.capacity());
 
-    if (decode.isError()) {
-      // should only happen if charset was not explicitly given,
-      // as o/wise we use repl. chars
-      reencodeAsLatin1();
-      this.charsetDecoder = ThreadLocalCoders.decoderFor(ISO_8859_1);
-      commit(endOfInput);
-    }
-  }
-
-  private void reencodeAsLatin1() {
-    CharBuffer curData = this.storedCharBody.get();
-    // reinterpreting the UTF-8 decoded sequence as latin1 will
-    // possibly result in a bigger result in terms of code points,
-    // so we need to make a copy
-
-    CharsetEncoder encoder = ThreadLocalCoders.utf8Encoder();
-    ByteBuffer utf8Encoded;
-    try {
-      utf8Encoded = encoder.encode(curData);
-    } catch (CharacterCodingException e) {
-      throw new UndeclaredThrowableException(e); // can't happen
+        this.undecodedData.compact();
+
+        if (decode.isError()) {
+            // should only happen if charset was not explicitly given,
+            // as o/wise we use repl. chars
+            reencodeAsLatin1();
+            this.charsetDecoder = ThreadLocalCoders.decoderFor(ISO_8859_1);
+            commit(endOfInput);
+        }
     }
 
-    this.storedCharBody.dropData();
+    private void reencodeAsLatin1() {
+        CharBuffer curData = this.storedCharBody.get();
+        // reinterpreting the UTF-8 decoded sequence as latin1 will
+        // possibly result in a bigger result in terms of code points,
+        // so we need to make a copy
+
+        CharsetEncoder encoder = ThreadLocalCoders.utf8Encoder();
+        ByteBuffer utf8Encoded;
+        try {
+            utf8Encoded = encoder.encode(curData);
+        } catch (CharacterCodingException e) {
+            throw new UndeclaredThrowableException(e); // can't happen
+        }
+
+        this.storedCharBody.dropData();
 
-    int limit = utf8Encoded.limit();
-    for (int i = 0; i < limit; i++) {
-      // & to reverse the sign extension on the int promotion
-      this.storedCharBody.appendData(utf8Encoded.get(i) & 0xFF);
+        int limit = utf8Encoded.limit();
+        for (int i = 0; i < limit; i++) {
+            // & to reverse the sign extension on the int promotion
+            this.storedCharBody.appendData(utf8Encoded.get(i) & 0xFF);
+        }
     }
-  }
 
-  public interface ByteBufferWriteCallback {
-    /**
-     * Asks the callback of {@link StoredByteBody#appendData(ByteBufferWriteCallback, int)} to write
-     * exactly <code>undecodedData.remaining()</code> bytes into the passed <code>ByteBuffer</code>.
-     * This amount of bytes will never be larger that the amount of data yet to be written; put
-     * another way, for one invocation of <code>appendData(cb, n)</code>, the sum of the values of
-     * <code>undecodedData.remaining()</code> for the several <code>cb</code> calls will be <code>n
-     * </code> (or zero, if alternatively, cb is never invoked by <code>appendData</code>).
-     *
-     * @param undecodedData the buffer to write into
-     */
-    void put(ByteBuffer undecodedData);
-  }
+    public interface ByteBufferWriteCallback {
+        /**
+         * Asks the callback of {@link StoredByteBody#appendData(ByteBufferWriteCallback, int)} to write
+         * exactly <code>undecodedData.remaining()</code> bytes into the passed <code>ByteBuffer</code>.
+         * This amount of bytes will never be larger that the amount of data yet to be written; put
+         * another way, for one invocation of <code>appendData(cb, n)</code>, the sum of the values of
+         * <code>undecodedData.remaining()</code> for the several <code>cb</code> calls will be <code>n
+         * </code> (or zero, if alternatively, cb is never invoked by <code>appendData</code>).
+         *
+         * @param undecodedData the buffer to write into
+         */
+        void put(ByteBuffer undecodedData);
+    }
 }
 
 // adapted from sun.nio.cs
 class ThreadLocalCoders {
-  private static final int CACHE_SIZE = 3;
+    private static final int CACHE_SIZE = 3;
 
-  private abstract static class Cache {
+    private abstract static class Cache {
 
-    // Thread-local reference to array of cached objects, in LRU order
-    private final ThreadLocal<Object[]> cache = new ThreadLocal<>();
-    private final int size;
+        // Thread-local reference to array of cached objects, in LRU order
+        private final ThreadLocal<Object[]> cache = new ThreadLocal<>();
+        private final int size;
 
-    Cache(int size) {
-      this.size = size;
-    }
+        Cache(int size) {
+            this.size = size;
+        }
 
-    abstract Object create(Object name);
+        abstract Object create(Object name);
 
-    private void moveToFront(Object[] oa, int i) {
-      Object ob = oa[i];
-      for (int j = i; j > 0; j--) oa[j] = oa[j - 1];
-      oa[0] = ob;
-    }
+        private void moveToFront(Object[] oa, int i) {
+            Object ob = oa[i];
+            for (int j = i; j > 0; j--) oa[j] = oa[j - 1];
+            oa[0] = ob;
+        }
 
-    abstract boolean hasName(Object ob, Object name);
-
-    Object forName(Object name) {
-      Object[] oa = cache.get();
-      if (oa == null) {
-        oa = new Object[size];
-        cache.set(oa);
-      } else {
-        for (int i = 0; i < oa.length; i++) {
-          Object ob = oa[i];
-          if (ob == null) continue;
-          if (hasName(ob, name)) {
-            if (i > 0) moveToFront(oa, i);
+        abstract boolean hasName(Object ob, Object name);
+
+        Object forName(Object name) {
+            Object[] oa = cache.get();
+            if (oa == null) {
+                oa = new Object[size];
+                cache.set(oa);
+            } else {
+                for (int i = 0; i < oa.length; i++) {
+                    Object ob = oa[i];
+                    if (ob == null) continue;
+                    if (hasName(ob, name)) {
+                        if (i > 0) moveToFront(oa, i);
+                        return ob;
+                    }
+                }
+            }
+
+            // Create a new object
+            Object ob = create(name);
+            oa[oa.length - 1] = ob;
+            moveToFront(oa, oa.length - 1);
             return ob;
-          }
         }
-      }
-
-      // Create a new object
-      Object ob = create(name);
-      oa[oa.length - 1] = ob;
-      moveToFront(oa, oa.length - 1);
-      return ob;
     }
-  }
 
-  private static final Cache DECODER_CACHE =
-      new Cache(CACHE_SIZE) {
+    private static final Cache DECODER_CACHE = new Cache(CACHE_SIZE) {
         boolean hasName(Object ob, Object name) {
-          return ((CharsetDecoder) ob).charset().equals(name);
+            return ((CharsetDecoder) ob).charset().equals(name);
         }
 
         Object create(Object charset) {
-          return ((Charset) charset).newDecoder().onUnmappableCharacter(CodingErrorAction.REPLACE);
+            return ((Charset) charset).newDecoder().onUnmappableCharacter(CodingErrorAction.REPLACE);
         }
-      };
+    };
 
-  public static CharsetDecoder decoderFor(Charset charset) {
-    CharsetDecoder cd = (CharsetDecoder) DECODER_CACHE.forName(charset);
-    cd.onMalformedInput(CodingErrorAction.REPLACE);
-    cd.reset();
-    return cd;
-  }
+    public static CharsetDecoder decoderFor(Charset charset) {
+        CharsetDecoder cd = (CharsetDecoder) DECODER_CACHE.forName(charset);
+        cd.onMalformedInput(CodingErrorAction.REPLACE);
+        cd.reset();
+        return cd;
+    }
 
-  private static final ThreadLocal<CharsetEncoder> UTF8_ENCODER_CACHE =
-      new ThreadLocal<CharsetEncoder>() {
+    private static final ThreadLocal<CharsetEncoder> UTF8_ENCODER_CACHE = new ThreadLocal<CharsetEncoder>() {
         @Override
         protected CharsetEncoder initialValue() {
-          return StoredByteBody.UTF_8
-              .newEncoder()
-              .onUnmappableCharacter(CodingErrorAction.REPLACE)
-              .onMalformedInput(CodingErrorAction.REPLACE);
+            return StoredByteBody.UTF_8
+                    .newEncoder()
+                    .onUnmappableCharacter(CodingErrorAction.REPLACE)
+                    .onMalformedInput(CodingErrorAction.REPLACE);
         }
-      };
+    };
 
-  public static CharsetEncoder utf8Encoder() {
-    CharsetEncoder charsetEncoder = UTF8_ENCODER_CACHE.get();
-    charsetEncoder.reset();
-    return charsetEncoder;
-  }
+    public static CharsetEncoder utf8Encoder() {
+        CharsetEncoder charsetEncoder = UTF8_ENCODER_CACHE.get();
+        charsetEncoder.reset();
+        return charsetEncoder;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/http/StoredCharBody.java b/internal-api/src/main/java/datadog/trace/api/http/StoredCharBody.java
index aee387eb5ac..2f9ca4fa69e 100644
--- a/internal-api/src/main/java/datadog/trace/api/http/StoredCharBody.java
+++ b/internal-api/src/main/java/datadog/trace/api/http/StoredCharBody.java
@@ -13,193 +13,191 @@
 /** Analogous to {@link StoredByteBody}, but Java doesn't support generics with scalar types. */
 public class StoredCharBody implements StoredBodySupplier {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(StoredCharBody.class);
-
-  private static final int MIN_BUFFER_SIZE = 128; // chars
-  private static final int MAX_BUFFER_SIZE = 128 * 1024; // 256k (char == 2 bytes)
-  private static final int GROW_FACTOR = 4;
-  private static final CharBuffer EMPTY_CHAR_BUFFER = CharBuffer.allocate(0);
-
-  private final RequestContext httpContext;
-  private final BiFunction<RequestContext, StoredBodySupplier, Void> startCb;
-  private final BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> endCb;
-  private final StoredBodySupplier supplierInNotifications;
-
-  private boolean listenerNotified;
-
-  private char[] storedBody;
-  private int storedBodyLen;
-  private boolean bodyReadStarted = false;
-
-  public StoredCharBody(
-      RequestContext httpContext,
-      BiFunction<RequestContext, StoredBodySupplier, Void> startCb,
-      BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> endCb,
-      int lengthHint) {
-    this(httpContext, startCb, endCb, lengthHint, null);
-  }
-
-  StoredCharBody(
-      RequestContext httpContext,
-      BiFunction<RequestContext, StoredBodySupplier, Void> startCb,
-      BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> endCb,
-      int lengthHint,
-      StoredBodySupplier supplierInNotifications) {
-    this.httpContext = httpContext;
-    this.startCb = startCb;
-    this.endCb = endCb;
-
-    if (lengthHint != 0) {
-      int initialSize = Math.max(MIN_BUFFER_SIZE, Math.min(lengthHint, MAX_BUFFER_SIZE));
-      this.storedBody = new char[initialSize];
+    private static final Logger LOGGER = LoggerFactory.getLogger(StoredCharBody.class);
+
+    private static final int MIN_BUFFER_SIZE = 128; // chars
+    private static final int MAX_BUFFER_SIZE = 128 * 1024; // 256k (char == 2 bytes)
+    private static final int GROW_FACTOR = 4;
+    private static final CharBuffer EMPTY_CHAR_BUFFER = CharBuffer.allocate(0);
+
+    private final RequestContext httpContext;
+    private final BiFunction<RequestContext, StoredBodySupplier, Void> startCb;
+    private final BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> endCb;
+    private final StoredBodySupplier supplierInNotifications;
+
+    private boolean listenerNotified;
+
+    private char[] storedBody;
+    private int storedBodyLen;
+    private boolean bodyReadStarted = false;
+
+    public StoredCharBody(
+            RequestContext httpContext,
+            BiFunction<RequestContext, StoredBodySupplier, Void> startCb,
+            BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> endCb,
+            int lengthHint) {
+        this(httpContext, startCb, endCb, lengthHint, null);
     }
 
-    this.supplierInNotifications = supplierInNotifications != null ? supplierInNotifications : this;
-  }
-
-  public synchronized void appendData(char[] chars, int start, int end) {
-    try {
-      int newDataLen = end - start;
-      if (newDataLen <= 0) {
-        return;
-      }
-      if (!maybeExtendStorage(newDataLen)) {
-        return;
-      }
-
-      int lenToCopy = Math.min(newDataLen, capacityLeft());
-      System.arraycopy(chars, start, this.storedBody, this.storedBodyLen, lenToCopy);
-
-      this.storedBodyLen += lenToCopy;
-    } catch (final Throwable e) {
-      LOGGER.debug("Error appending char array chunk", e);
+    StoredCharBody(
+            RequestContext httpContext,
+            BiFunction<RequestContext, StoredBodySupplier, Void> startCb,
+            BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> endCb,
+            int lengthHint,
+            StoredBodySupplier supplierInNotifications) {
+        this.httpContext = httpContext;
+        this.startCb = startCb;
+        this.endCb = endCb;
+
+        if (lengthHint != 0) {
+            int initialSize = Math.max(MIN_BUFFER_SIZE, Math.min(lengthHint, MAX_BUFFER_SIZE));
+            this.storedBody = new char[initialSize];
+        }
+
+        this.supplierInNotifications = supplierInNotifications != null ? supplierInNotifications : this;
     }
-    maybeNotifyStart();
-  }
-
-  public synchronized void appendData(CharBuffer buffer) {
-    try {
-      int inputLen = buffer.remaining();
-      if (inputLen == 0) {
-        return;
-      }
-      if (!maybeExtendStorage(inputLen)) {
-        return;
-      }
-      int lenToCopy = Math.min(inputLen, capacityLeft());
-
-      buffer.get(this.storedBody, this.storedBodyLen, lenToCopy);
-      this.storedBodyLen += lenToCopy;
-    } catch (final Throwable e) {
-      LOGGER.debug("Error appending char buffer", e);
+
+    public synchronized void appendData(char[] chars, int start, int end) {
+        try {
+            int newDataLen = end - start;
+            if (newDataLen <= 0) {
+                return;
+            }
+            if (!maybeExtendStorage(newDataLen)) {
+                return;
+            }
+
+            int lenToCopy = Math.min(newDataLen, capacityLeft());
+            System.arraycopy(chars, start, this.storedBody, this.storedBodyLen, lenToCopy);
+
+            this.storedBodyLen += lenToCopy;
+        } catch (final Throwable e) {
+            LOGGER.debug("Error appending char array chunk", e);
+        }
+        maybeNotifyStart();
+    }
+
+    public synchronized void appendData(CharBuffer buffer) {
+        try {
+            int inputLen = buffer.remaining();
+            if (inputLen == 0) {
+                return;
+            }
+            if (!maybeExtendStorage(inputLen)) {
+                return;
+            }
+            int lenToCopy = Math.min(inputLen, capacityLeft());
+
+            buffer.get(this.storedBody, this.storedBodyLen, lenToCopy);
+            this.storedBodyLen += lenToCopy;
+        } catch (final Throwable e) {
+            LOGGER.debug("Error appending char buffer", e);
+        }
+        maybeNotifyStart();
     }
-    maybeNotifyStart();
-  }
-
-  private boolean maybeExtendStorage(int newDataLen) {
-    if (this.storedBody == null) {
-      int initialSize = Math.max(Math.min(newDataLen, MAX_BUFFER_SIZE), MIN_BUFFER_SIZE);
-      this.storedBody = new char[initialSize];
-    } else if (this.storedBodyLen == MAX_BUFFER_SIZE) {
-      return false;
-    } else if (capacityLeft() < newDataLen) {
-      int newSize =
-          Math.min(
-              Math.max(this.storedBodyLen + newDataLen, this.storedBodyLen * GROW_FACTOR),
-              MAX_BUFFER_SIZE);
-      this.storedBody = Arrays.copyOf(this.storedBody, newSize);
+
+    private boolean maybeExtendStorage(int newDataLen) {
+        if (this.storedBody == null) {
+            int initialSize = Math.max(Math.min(newDataLen, MAX_BUFFER_SIZE), MIN_BUFFER_SIZE);
+            this.storedBody = new char[initialSize];
+        } else if (this.storedBodyLen == MAX_BUFFER_SIZE) {
+            return false;
+        } else if (capacityLeft() < newDataLen) {
+            int newSize = Math.min(
+                    Math.max(this.storedBodyLen + newDataLen, this.storedBodyLen * GROW_FACTOR), MAX_BUFFER_SIZE);
+            this.storedBody = Arrays.copyOf(this.storedBody, newSize);
+        }
+        return true;
     }
-    return true;
-  }
 
-  public synchronized void appendData(String s) {
-    try {
-      int newDataLen = s.length();
-      if (!maybeExtendStorage(newDataLen)) {
-        return;
-      }
+    public synchronized void appendData(String s) {
+        try {
+            int newDataLen = s.length();
+            if (!maybeExtendStorage(newDataLen)) {
+                return;
+            }
 
-      int lenToCopy = Math.min(newDataLen, capacityLeft());
-      s.getChars(0, lenToCopy, this.storedBody, this.storedBodyLen);
+            int lenToCopy = Math.min(newDataLen, capacityLeft());
+            s.getChars(0, lenToCopy, this.storedBody, this.storedBodyLen);
 
-      this.storedBodyLen += lenToCopy;
+            this.storedBodyLen += lenToCopy;
 
-    } catch (final Throwable e) {
-      LOGGER.debug("Error appending string", e);
+        } catch (final Throwable e) {
+            LOGGER.debug("Error appending string", e);
+        }
+        maybeNotifyStart();
     }
-    maybeNotifyStart();
-  }
-
-  private int capacityLeft() {
-    return this.storedBody.length - this.storedBodyLen;
-  }
-
-  /**
-   * @param utf16CodeUnit an int in the range 0-0xFFFF
-   */
-  public synchronized void appendData(int utf16CodeUnit) {
-    try {
-      if (utf16CodeUnit < 0) {
-        return;
-      }
-      if (!maybeExtendStorage(1)) {
-        return;
-      }
-      this.storedBody[this.storedBodyLen] = (char) utf16CodeUnit;
-      this.storedBodyLen += 1;
-
-    } catch (final Throwable e) {
-      LOGGER.debug("Error appending code unit", e);
+
+    private int capacityLeft() {
+        return this.storedBody.length - this.storedBodyLen;
     }
-    maybeNotifyStart();
-  }
 
-  void maybeNotifyStart() {
-    if (!bodyReadStarted) {
-      bodyReadStarted = true;
-      this.startCb.apply(httpContext, supplierInNotifications);
+    /**
+     * @param utf16CodeUnit an int in the range 0-0xFFFF
+     */
+    public synchronized void appendData(int utf16CodeUnit) {
+        try {
+            if (utf16CodeUnit < 0) {
+                return;
+            }
+            if (!maybeExtendStorage(1)) {
+                return;
+            }
+            this.storedBody[this.storedBodyLen] = (char) utf16CodeUnit;
+            this.storedBodyLen += 1;
+
+        } catch (final Throwable e) {
+            LOGGER.debug("Error appending code unit", e);
+        }
+        maybeNotifyStart();
     }
-  }
-
-  public synchronized Flow<Void> maybeNotify() {
-    if (!listenerNotified) {
-      listenerNotified = true;
-      if (!bodyReadStarted) {
-        this.startCb.apply(httpContext, supplierInNotifications);
-      }
-      return this.endCb.apply(httpContext, supplierInNotifications);
+
+    void maybeNotifyStart() {
+        if (!bodyReadStarted) {
+            bodyReadStarted = true;
+            this.startCb.apply(httpContext, supplierInNotifications);
+        }
     }
-    return Flow.ResultFlow.empty();
-  }
-
-  public synchronized void maybeNotifyAndBlock() {
-    Flow<Void> flow = maybeNotify();
-    Flow.Action action = flow.getAction();
-    if (action instanceof Flow.Action.RequestBlockingAction) {
-      Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-
-      BlockResponseFunction blockResponseFunction = httpContext.getBlockResponseFunction();
-      if (blockResponseFunction != null) {
-        blockResponseFunction.tryCommitBlockingResponse(httpContext.getTraceSegment(), rba);
-      }
-      throw new BlockingException("Blocked request (for request body stream read)");
+
+    public synchronized Flow<Void> maybeNotify() {
+        if (!listenerNotified) {
+            listenerNotified = true;
+            if (!bodyReadStarted) {
+                this.startCb.apply(httpContext, supplierInNotifications);
+            }
+            return this.endCb.apply(httpContext, supplierInNotifications);
+        }
+        return Flow.ResultFlow.empty();
     }
-  }
 
-  @Override
-  public synchronized CharBuffer get() {
-    if (this.storedBodyLen == 0) {
-      return EMPTY_CHAR_BUFFER;
+    public synchronized void maybeNotifyAndBlock() {
+        Flow<Void> flow = maybeNotify();
+        Flow.Action action = flow.getAction();
+        if (action instanceof Flow.Action.RequestBlockingAction) {
+            Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+
+            BlockResponseFunction blockResponseFunction = httpContext.getBlockResponseFunction();
+            if (blockResponseFunction != null) {
+                blockResponseFunction.tryCommitBlockingResponse(httpContext.getTraceSegment(), rba);
+            }
+            throw new BlockingException("Blocked request (for request body stream read)");
+        }
     }
-    return CharBuffer.wrap(this.storedBody, 0, this.storedBodyLen);
-  }
 
-  synchronized boolean isLimitReached() {
-    return this.storedBodyLen == MAX_BUFFER_SIZE;
-  }
+    @Override
+    public synchronized CharBuffer get() {
+        if (this.storedBodyLen == 0) {
+            return EMPTY_CHAR_BUFFER;
+        }
+        return CharBuffer.wrap(this.storedBody, 0, this.storedBodyLen);
+    }
 
-  // for StoredByteBody's reencodeAsLatin1
-  synchronized void dropData() {
-    this.storedBodyLen = 0;
-  }
+    synchronized boolean isLimitReached() {
+        return this.storedBodyLen == MAX_BUFFER_SIZE;
+    }
+
+    // for StoredByteBody's reencodeAsLatin1
+    synchronized void dropData() {
+        this.storedBodyLen = 0;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/IastCallSites.java b/internal-api/src/main/java/datadog/trace/api/iast/IastCallSites.java
index 322e3cfb51d..4ac8423b342 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/IastCallSites.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/IastCallSites.java
@@ -8,7 +8,7 @@
  */
 public interface IastCallSites {
 
-  interface HasTelemetry {
-    void setVerbosity(Verbosity verbosity);
-  }
+    interface HasTelemetry {
+        void setVerbosity(Verbosity verbosity);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/IastContext.java b/internal-api/src/main/java/datadog/trace/api/iast/IastContext.java
index 28e899a8030..26b279a0ff0 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/IastContext.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/IastContext.java
@@ -11,69 +11,69 @@
 /** Encapsulation for the IAST context, */
 public interface IastContext extends Closeable {
 
-  /**
-   * Get the tainted objects dictionary linked to the context, since we have no visibility over the
-   * {@code TaintedObject} class from here, we use a dirty generics hack.
-   */
-  @Nonnull
-  <TO> TO getTaintedObjects();
+    /**
+     * Get the tainted objects dictionary linked to the context, since we have no visibility over the
+     * {@code TaintedObject} class from here, we use a dirty generics hack.
+     */
+    @Nonnull
+    <TO> TO getTaintedObjects();
 
-  enum Mode {
-    GLOBAL,
-    REQUEST
-  }
+    enum Mode {
+        GLOBAL,
+        REQUEST
+    }
 
-  abstract class Provider {
+    abstract class Provider {
 
-    private static Provider INSTANCE;
+        private static Provider INSTANCE;
 
-    public static void register(@Nonnull final Provider instance) {
-      INSTANCE = instance;
-    }
+        public static void register(@Nonnull final Provider instance) {
+            INSTANCE = instance;
+        }
 
-    /**
-     * Gets an active IAST context, there are two possibilities:
-     *
-     * <ul>
-     *   <li>dd.iast.context.mode=GLOBAL: It returns the global IAST context instance
-     *   <li>dd.iast.context.mode=REQUEST: Fetches the active request context and extracts the IAST
-     *       context, {@code null} if there is no active request context
-     * </ul>
-     */
-    @Nullable
-    public abstract IastContext resolve();
+        /**
+         * Gets an active IAST context, there are two possibilities:
+         *
+         * <ul>
+         *   <li>dd.iast.context.mode=GLOBAL: It returns the global IAST context instance
+         *   <li>dd.iast.context.mode=REQUEST: Fetches the active request context and extracts the IAST
+         *       context, {@code null} if there is no active request context
+         * </ul>
+         */
+        @Nullable
+        public abstract IastContext resolve();
 
-    /** Builds a new context to be scoped to the request */
-    public abstract IastContext buildRequestContext();
+        /** Builds a new context to be scoped to the request */
+        public abstract IastContext buildRequestContext();
 
-    /** Release the current request context, e.g. free resources, add objects to pools, ... */
-    public abstract void releaseRequestContext(@Nonnull IastContext context);
+        /** Release the current request context, e.g. free resources, add objects to pools, ... */
+        public abstract void releaseRequestContext(@Nonnull IastContext context);
 
-    /**
-     * Gets the current active IAST context, if no provider is configured this method defaults to
-     * fetching the current request context
-     *
-     * @see Provider#resolve()
-     */
-    @Nullable
-    public static IastContext get() {
-      if (INSTANCE == null) {
-        return get(AgentTracer.activeSpan());
-      }
-      return INSTANCE.resolve();
-    }
+        /**
+         * Gets the current active IAST context, if no provider is configured this method defaults to
+         * fetching the current request context
+         *
+         * @see Provider#resolve()
+         */
+        @Nullable
+        public static IastContext get() {
+            if (INSTANCE == null) {
+                return get(AgentTracer.activeSpan());
+            }
+            return INSTANCE.resolve();
+        }
 
-    /** Gets the current IAST context associated with the request context inside the span */
-    @Nullable
-    public static IastContext get(@Nullable final AgentSpan span) {
-      if (span == null) {
-        return null;
-      }
-      final RequestContext reqCtx = span.getRequestContext();
-      if (reqCtx == null) {
-        return null;
-      }
-      return reqCtx.getData(RequestContextSlot.IAST);
+        /** Gets the current IAST context associated with the request context inside the span */
+        @Nullable
+        public static IastContext get(@Nullable final AgentSpan span) {
+            if (span == null) {
+                return null;
+            }
+            final RequestContext reqCtx = span.getRequestContext();
+            if (reqCtx == null) {
+                return null;
+            }
+            return reqCtx.getData(RequestContextSlot.IAST);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/IastDetectionMode.java b/internal-api/src/main/java/datadog/trace/api/iast/IastDetectionMode.java
index 5b5becc4df7..a17457b628d 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/IastDetectionMode.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/IastDetectionMode.java
@@ -15,70 +15,69 @@
 import javax.annotation.Nonnull;
 
 public enum IastDetectionMode {
-  FULL {
-    @Override
-    public int getIastMaxConcurrentRequests(@Nonnull final ConfigProvider config) {
-      return UNLIMITED;
-    }
-
-    @Override
-    public int getIastVulnerabilitiesPerRequest(@Nonnull final ConfigProvider config) {
-      return UNLIMITED;
-    }
-
-    @Override
-    public float getIastRequestSampling(@Nonnull final ConfigProvider config) {
-      return 100;
-    }
-
-    @Override
-    public boolean isIastDeduplicationEnabled(@Nonnull final ConfigProvider config) {
-      return false;
-    }
-
-    @Override
-    public int getIastMaxRangeCount(@Nonnull final ConfigProvider config) {
-      return Integer.MAX_VALUE;
-    }
-  },
-
-  DEFAULT {
-    @Override
-    public int getIastMaxConcurrentRequests(@Nonnull final ConfigProvider config) {
-      return config.getInteger(IAST_MAX_CONCURRENT_REQUESTS, DEFAULT_IAST_MAX_CONCURRENT_REQUESTS);
-    }
-
-    @Override
-    public int getIastVulnerabilitiesPerRequest(@Nonnull final ConfigProvider config) {
-      return config.getInteger(
-          IAST_VULNERABILITIES_PER_REQUEST, DEFAULT_IAST_VULNERABILITIES_PER_REQUEST);
-    }
-
-    @Override
-    public float getIastRequestSampling(@Nonnull final ConfigProvider config) {
-      return config.getFloat(IAST_REQUEST_SAMPLING, DEFAULT_IAST_REQUEST_SAMPLING);
-    }
-
-    @Override
-    public boolean isIastDeduplicationEnabled(@Nonnull final ConfigProvider config) {
-      return config.getBoolean(IAST_DEDUPLICATION_ENABLED, DEFAULT_IAST_DEDUPLICATION_ENABLED);
-    }
-
-    @Override
-    public int getIastMaxRangeCount(@Nonnull final ConfigProvider config) {
-      return config.getInteger(IAST_MAX_RANGE_COUNT, DEFAULT_IAST_MAX_RANGE_COUNT);
-    }
-  };
-
-  public static final int UNLIMITED = Integer.MIN_VALUE;
-
-  public abstract int getIastMaxConcurrentRequests(@Nonnull ConfigProvider config);
-
-  public abstract int getIastVulnerabilitiesPerRequest(@Nonnull ConfigProvider config);
-
-  public abstract float getIastRequestSampling(@Nonnull ConfigProvider config);
-
-  public abstract boolean isIastDeduplicationEnabled(@Nonnull ConfigProvider config);
-
-  public abstract int getIastMaxRangeCount(@Nonnull ConfigProvider config);
+    FULL {
+        @Override
+        public int getIastMaxConcurrentRequests(@Nonnull final ConfigProvider config) {
+            return UNLIMITED;
+        }
+
+        @Override
+        public int getIastVulnerabilitiesPerRequest(@Nonnull final ConfigProvider config) {
+            return UNLIMITED;
+        }
+
+        @Override
+        public float getIastRequestSampling(@Nonnull final ConfigProvider config) {
+            return 100;
+        }
+
+        @Override
+        public boolean isIastDeduplicationEnabled(@Nonnull final ConfigProvider config) {
+            return false;
+        }
+
+        @Override
+        public int getIastMaxRangeCount(@Nonnull final ConfigProvider config) {
+            return Integer.MAX_VALUE;
+        }
+    },
+
+    DEFAULT {
+        @Override
+        public int getIastMaxConcurrentRequests(@Nonnull final ConfigProvider config) {
+            return config.getInteger(IAST_MAX_CONCURRENT_REQUESTS, DEFAULT_IAST_MAX_CONCURRENT_REQUESTS);
+        }
+
+        @Override
+        public int getIastVulnerabilitiesPerRequest(@Nonnull final ConfigProvider config) {
+            return config.getInteger(IAST_VULNERABILITIES_PER_REQUEST, DEFAULT_IAST_VULNERABILITIES_PER_REQUEST);
+        }
+
+        @Override
+        public float getIastRequestSampling(@Nonnull final ConfigProvider config) {
+            return config.getFloat(IAST_REQUEST_SAMPLING, DEFAULT_IAST_REQUEST_SAMPLING);
+        }
+
+        @Override
+        public boolean isIastDeduplicationEnabled(@Nonnull final ConfigProvider config) {
+            return config.getBoolean(IAST_DEDUPLICATION_ENABLED, DEFAULT_IAST_DEDUPLICATION_ENABLED);
+        }
+
+        @Override
+        public int getIastMaxRangeCount(@Nonnull final ConfigProvider config) {
+            return config.getInteger(IAST_MAX_RANGE_COUNT, DEFAULT_IAST_MAX_RANGE_COUNT);
+        }
+    };
+
+    public static final int UNLIMITED = Integer.MIN_VALUE;
+
+    public abstract int getIastMaxConcurrentRequests(@Nonnull ConfigProvider config);
+
+    public abstract int getIastVulnerabilitiesPerRequest(@Nonnull ConfigProvider config);
+
+    public abstract float getIastRequestSampling(@Nonnull ConfigProvider config);
+
+    public abstract boolean isIastDeduplicationEnabled(@Nonnull ConfigProvider config);
+
+    public abstract int getIastMaxRangeCount(@Nonnull ConfigProvider config);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/IastEnabledChecks.java b/internal-api/src/main/java/datadog/trace/api/iast/IastEnabledChecks.java
index 741950b0c40..b7b77565cc7 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/IastEnabledChecks.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/IastEnabledChecks.java
@@ -7,27 +7,24 @@
 
 public abstract class IastEnabledChecks {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(IastEnabledChecks.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(IastEnabledChecks.class);
 
-  private IastEnabledChecks() {}
+    private IastEnabledChecks() {}
 
-  public static boolean isMajorJavaVersionAtLeast(final String version) {
-    try {
-      return JavaVirtualMachine.isJavaVersionAtLeast(Integer.parseInt(version));
-    } catch (final Exception e) {
-      LOGGER.error(
-          "Error checking major java version {}, expect some call sites to be disabled",
-          version,
-          e);
-      return false;
+    public static boolean isMajorJavaVersionAtLeast(final String version) {
+        try {
+            return JavaVirtualMachine.isJavaVersionAtLeast(Integer.parseInt(version));
+        } catch (final Exception e) {
+            LOGGER.error("Error checking major java version {}, expect some call sites to be disabled", version, e);
+            return false;
+        }
     }
-  }
 
-  public static boolean isFullDetection() {
-    return Config.get().getIastDetectionMode() == IastDetectionMode.FULL;
-  }
+    public static boolean isFullDetection() {
+        return Config.get().getIastDetectionMode() == IastDetectionMode.FULL;
+    }
 
-  public static boolean isExperimentalPropagationEnabled() {
-    return Config.get().isIastExperimentalPropagationEnabled();
-  }
+    public static boolean isExperimentalPropagationEnabled() {
+        return Config.get().isIastExperimentalPropagationEnabled();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/IastModule.java b/internal-api/src/main/java/datadog/trace/api/iast/IastModule.java
index 2dd561e8713..2bb9f2bbd37 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/IastModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/IastModule.java
@@ -9,13 +9,13 @@
 
 public interface IastModule {
 
-  Logger LOG = LoggerFactory.getLogger(IastModule.class);
+    Logger LOG = LoggerFactory.getLogger(IastModule.class);
 
-  default void onUnexpectedException(final String message, final Throwable error) {
-    LOG.debug(message, error);
-  }
+    default void onUnexpectedException(final String message, final Throwable error) {
+        LOG.debug(message, error);
+    }
 
-  @Retention(RetentionPolicy.RUNTIME)
-  @Target(ElementType.TYPE)
-  @interface OptOut {}
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.TYPE)
+    @interface OptOut {}
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/InstrumentationBridge.java b/internal-api/src/main/java/datadog/trace/api/iast/InstrumentationBridge.java
index e5faeb96a4c..b4535d7711a 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/InstrumentationBridge.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/InstrumentationBridge.java
@@ -42,121 +42,121 @@
 /** Bridge between instrumentations and {@link IastModule} instances. */
 public abstract class InstrumentationBridge {
 
-  public static StringModule STRING;
-  public static CodecModule CODEC;
-  public static SqlInjectionModule SQL_INJECTION;
-  public static PathTraversalModule PATH_TRAVERSAL;
-  public static CommandInjectionModule COMMAND_INJECTION;
-  public static WeakCipherModule WEAK_CIPHER;
-  public static WeakHashModule WEAK_HASH;
-  public static LdapInjectionModule LDAP_INJECTION;
-  public static PropagationModule PROPAGATION;
-  public static InsecureCookieModule<?> INSECURE_COOKIE;
-  public static NoHttpOnlyCookieModule<?> NO_HTTPONLY_COOKIE;
-  public static NoSameSiteCookieModule<?> NO_SAMESITE_COOKIE;
-  public static SsrfModule SSRF;
-  public static UnvalidatedRedirectModule UNVALIDATED_REDIRECT;
-  public static WeakRandomnessModule WEAK_RANDOMNESS;
-  public static HttpResponseHeaderModule RESPONSE_HEADER_MODULE;
-  public static HstsMissingHeaderModule HSTS_MISSING_HEADER_MODULE;
-  public static XContentTypeModule X_CONTENT_TYPE_HEADER_MODULE;
-  public static TrustBoundaryViolationModule TRUST_BOUNDARY_VIOLATION;
-  public static XPathInjectionModule XPATH_INJECTION;
-  public static XssModule XSS;
-  public static StacktraceLeakModule STACKTRACE_LEAK_MODULE;
-  public static HeaderInjectionModule HEADER_INJECTION;
-  public static ApplicationModule APPLICATION;
-  public static HardcodedSecretModule HARDCODED_SECRET;
-  public static InsecureAuthProtocolModule INSECURE_AUTH_PROTOCOL;
-  public static ReflectionInjectionModule REFLECTION_INJECTION;
-  public static UntrustedDeserializationModule UNTRUSTED_DESERIALIZATION;
-  public static EmailInjectionModule EMAIL_INJECTION;
-  public static CodeInjectionModule CODE_INJECTION;
+    public static StringModule STRING;
+    public static CodecModule CODEC;
+    public static SqlInjectionModule SQL_INJECTION;
+    public static PathTraversalModule PATH_TRAVERSAL;
+    public static CommandInjectionModule COMMAND_INJECTION;
+    public static WeakCipherModule WEAK_CIPHER;
+    public static WeakHashModule WEAK_HASH;
+    public static LdapInjectionModule LDAP_INJECTION;
+    public static PropagationModule PROPAGATION;
+    public static InsecureCookieModule<?> INSECURE_COOKIE;
+    public static NoHttpOnlyCookieModule<?> NO_HTTPONLY_COOKIE;
+    public static NoSameSiteCookieModule<?> NO_SAMESITE_COOKIE;
+    public static SsrfModule SSRF;
+    public static UnvalidatedRedirectModule UNVALIDATED_REDIRECT;
+    public static WeakRandomnessModule WEAK_RANDOMNESS;
+    public static HttpResponseHeaderModule RESPONSE_HEADER_MODULE;
+    public static HstsMissingHeaderModule HSTS_MISSING_HEADER_MODULE;
+    public static XContentTypeModule X_CONTENT_TYPE_HEADER_MODULE;
+    public static TrustBoundaryViolationModule TRUST_BOUNDARY_VIOLATION;
+    public static XPathInjectionModule XPATH_INJECTION;
+    public static XssModule XSS;
+    public static StacktraceLeakModule STACKTRACE_LEAK_MODULE;
+    public static HeaderInjectionModule HEADER_INJECTION;
+    public static ApplicationModule APPLICATION;
+    public static HardcodedSecretModule HARDCODED_SECRET;
+    public static InsecureAuthProtocolModule INSECURE_AUTH_PROTOCOL;
+    public static ReflectionInjectionModule REFLECTION_INJECTION;
+    public static UntrustedDeserializationModule UNTRUSTED_DESERIALIZATION;
+    public static EmailInjectionModule EMAIL_INJECTION;
+    public static CodeInjectionModule CODE_INJECTION;
 
-  private static final Map<Class<? extends IastModule>, Field> MODULE_MAP = buildModuleMap();
+    private static final Map<Class<? extends IastModule>, Field> MODULE_MAP = buildModuleMap();
 
-  private InstrumentationBridge() {}
+    private InstrumentationBridge() {}
 
-  public static void registerIastModule(final IastModule module) {
-    final Class<? extends IastModule> type = getType(module.getClass());
-    final Field field = MODULE_MAP.get(type);
-    if (field == null) {
-      throw new UnsupportedOperationException("Module not yet supported: " + module.getClass());
+    public static void registerIastModule(final IastModule module) {
+        final Class<? extends IastModule> type = getType(module.getClass());
+        final Field field = MODULE_MAP.get(type);
+        if (field == null) {
+            throw new UnsupportedOperationException("Module not yet supported: " + module.getClass());
+        }
+        set(field, module);
     }
-    set(field, module);
-  }
 
-  /** Used for testing purposes, never use it from production code */
-  static <M extends IastModule> M getIastModule(final Class<M> type) {
-    final Field field = MODULE_MAP.get(type);
-    if (field == null) {
-      throw new UnsupportedOperationException("Module not yet supported: " + type);
+    /** Used for testing purposes, never use it from production code */
+    static <M extends IastModule> M getIastModule(final Class<M> type) {
+        final Field field = MODULE_MAP.get(type);
+        if (field == null) {
+            throw new UnsupportedOperationException("Module not yet supported: " + type);
+        }
+        return get(field);
     }
-    return get(field);
-  }
 
-  /** Used for testing purposes, never use it from production code */
-  static void clearIastModules() {
-    MODULE_MAP.values().forEach(it -> set(it, null));
-  }
-
-  /** Used for testing purposes, never use it from production code */
-  static Set<Class<? extends IastModule>> getIastModules() {
-    return MODULE_MAP.keySet();
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Class<? extends IastModule> getType(final Class<?> module) {
-    if (module == null) {
-      return null;
+    /** Used for testing purposes, never use it from production code */
+    static void clearIastModules() {
+        MODULE_MAP.values().forEach(it -> set(it, null));
     }
-    for (final Class<?> ifc : module.getInterfaces()) {
-      if (IastModule.class.isAssignableFrom(ifc)) {
-        return (Class<? extends IastModule>) ifc;
-      }
+
+    /** Used for testing purposes, never use it from production code */
+    static Set<Class<? extends IastModule>> getIastModules() {
+        return MODULE_MAP.keySet();
     }
-    return getType(module.getSuperclass());
-  }
 
-  @SuppressWarnings("unchecked")
-  private static <M extends IastModule> M get(final Field field) {
-    try {
-      return (M) field.get(null);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(e);
+    @SuppressWarnings("unchecked")
+    private static Class<? extends IastModule> getType(final Class<?> module) {
+        if (module == null) {
+            return null;
+        }
+        for (final Class<?> ifc : module.getInterfaces()) {
+            if (IastModule.class.isAssignableFrom(ifc)) {
+                return (Class<? extends IastModule>) ifc;
+            }
+        }
+        return getType(module.getSuperclass());
     }
-  }
 
-  // Field::set() is forbidden because it may be used to mutate final fields, disallowed by
-  // https://openjdk.org/jeps/500.
-  // However, in this case the method is called on a non-final field, so it is safe.
-  @SuppressForbidden
-  private static void set(final Field field, final IastModule module) {
-    try {
-      field.set(null, module);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(e);
+    @SuppressWarnings("unchecked")
+    private static <M extends IastModule> M get(final Field field) {
+        try {
+            return (M) field.get(null);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 
-  @SuppressWarnings("unchecked")
-  private static Map<Class<? extends IastModule>, Field> buildModuleMap() {
-    final List<Field> fields = new ArrayList<>();
-    for (final Field field : InstrumentationBridge.class.getDeclaredFields()) {
-      final Class<?> module = field.getType();
-      final int modifiers = field.getModifiers();
-      if (module.isInterface()
-          && Modifier.isStatic(modifiers)
-          && Modifier.isPublic(modifiers)
-          && IastModule.class.isAssignableFrom(module)) {
-        fields.add(field);
-      }
+    // Field::set() is forbidden because it may be used to mutate final fields, disallowed by
+    // https://openjdk.org/jeps/500.
+    // However, in this case the method is called on a non-final field, so it is safe.
+    @SuppressForbidden
+    private static void set(final Field field, final IastModule module) {
+        try {
+            field.set(null, module);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
     }
-    final Map<Class<? extends IastModule>, Field> result = new HashMap<>(fields.size());
-    for (final Field field : fields) {
-      field.setAccessible(true);
-      result.put((Class<? extends IastModule>) field.getType(), field);
+
+    @SuppressWarnings("unchecked")
+    private static Map<Class<? extends IastModule>, Field> buildModuleMap() {
+        final List<Field> fields = new ArrayList<>();
+        for (final Field field : InstrumentationBridge.class.getDeclaredFields()) {
+            final Class<?> module = field.getType();
+            final int modifiers = field.getModifiers();
+            if (module.isInterface()
+                    && Modifier.isStatic(modifiers)
+                    && Modifier.isPublic(modifiers)
+                    && IastModule.class.isAssignableFrom(module)) {
+                fields.add(field);
+            }
+        }
+        final Map<Class<? extends IastModule>, Field> result = new HashMap<>(fields.size());
+        for (final Field field : fields) {
+            field.setAccessible(true);
+            result.put((Class<? extends IastModule>) field.getType(), field);
+        }
+        return result;
     }
-    return result;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/Sink.java b/internal-api/src/main/java/datadog/trace/api/iast/Sink.java
index c7e53d20e8c..9b191e1db15 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/Sink.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/Sink.java
@@ -8,6 +8,6 @@
 @Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Sink {
-  /** Vulnerability type */
-  byte value();
+    /** Vulnerability type */
+    byte value();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/Source.java b/internal-api/src/main/java/datadog/trace/api/iast/Source.java
index 0cf222b59e9..5ef1cff941a 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/Source.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/Source.java
@@ -8,6 +8,6 @@
 @Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Source {
-  /** Source type */
-  byte value();
+    /** Source type */
+    byte value();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/SourceTypes.java b/internal-api/src/main/java/datadog/trace/api/iast/SourceTypes.java
index 515cab6f252..3871bc58380 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/SourceTypes.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/SourceTypes.java
@@ -4,86 +4,86 @@
 
 public abstract class SourceTypes {
 
-  private SourceTypes() {}
+    private SourceTypes() {}
 
-  public static final byte NONE = -1;
+    public static final byte NONE = -1;
 
-  public static final byte REQUEST_PARAMETER_NAME = 0;
-  public static final byte REQUEST_PARAMETER_VALUE = 1;
-  public static final byte REQUEST_HEADER_NAME = 2;
-  public static final byte REQUEST_HEADER_VALUE = 3;
-  public static final byte REQUEST_COOKIE_NAME = 4;
-  public static final byte REQUEST_COOKIE_VALUE = 5;
-  public static final byte REQUEST_BODY = 6;
-  public static final byte REQUEST_QUERY = 7;
-  public static final byte REQUEST_PATH_PARAMETER = 8;
-  public static final byte REQUEST_MATRIX_PARAMETER = 9;
-  public static final byte REQUEST_MULTIPART_PARAMETER = 10;
-  public static final byte REQUEST_URI = 11;
-  public static final byte REQUEST_PATH = 12;
-  public static final byte GRPC_BODY = 13;
-  public static final byte KAFKA_MESSAGE_KEY = 14;
-  public static final byte KAFKA_MESSAGE_VALUE = 15;
-  public static final byte SQL_TABLE = 16;
+    public static final byte REQUEST_PARAMETER_NAME = 0;
+    public static final byte REQUEST_PARAMETER_VALUE = 1;
+    public static final byte REQUEST_HEADER_NAME = 2;
+    public static final byte REQUEST_HEADER_VALUE = 3;
+    public static final byte REQUEST_COOKIE_NAME = 4;
+    public static final byte REQUEST_COOKIE_VALUE = 5;
+    public static final byte REQUEST_BODY = 6;
+    public static final byte REQUEST_QUERY = 7;
+    public static final byte REQUEST_PATH_PARAMETER = 8;
+    public static final byte REQUEST_MATRIX_PARAMETER = 9;
+    public static final byte REQUEST_MULTIPART_PARAMETER = 10;
+    public static final byte REQUEST_URI = 11;
+    public static final byte REQUEST_PATH = 12;
+    public static final byte GRPC_BODY = 13;
+    public static final byte KAFKA_MESSAGE_KEY = 14;
+    public static final byte KAFKA_MESSAGE_VALUE = 15;
+    public static final byte SQL_TABLE = 16;
 
-  /** Array indexed with all source types, the index should match the source types values */
-  public static final String[] STRINGS = {
-    "http.request.parameter.name",
-    "http.request.parameter",
-    "http.request.header.name",
-    "http.request.header",
-    "http.request.cookie.name",
-    "http.request.cookie.value",
-    "http.request.body",
-    "http.request.query",
-    "http.request.path.parameter",
-    "http.request.matrix.parameter",
-    "http.request.multipart.parameter",
-    "http.request.uri",
-    "http.request.path",
-    "grpc.request.body",
-    "kafka.message.key",
-    "kafka.message.value",
-    "sql.row.value"
-  };
+    /** Array indexed with all source types, the index should match the source types values */
+    public static final String[] STRINGS = {
+        "http.request.parameter.name",
+        "http.request.parameter",
+        "http.request.header.name",
+        "http.request.header",
+        "http.request.cookie.name",
+        "http.request.cookie.value",
+        "http.request.body",
+        "http.request.query",
+        "http.request.path.parameter",
+        "http.request.matrix.parameter",
+        "http.request.multipart.parameter",
+        "http.request.uri",
+        "http.request.path",
+        "grpc.request.body",
+        "kafka.message.key",
+        "kafka.message.value",
+        "sql.row.value"
+    };
 
-  public static String toString(final byte source) {
-    return source < 0 ? null : STRINGS[source];
-  }
+    public static String toString(final byte source) {
+        return source < 0 ? null : STRINGS[source];
+    }
 
-  public static byte namedSource(final byte sourceType) {
-    switch (sourceType) {
-      case SourceTypes.REQUEST_PARAMETER_VALUE:
-      case SourceTypes.REQUEST_PARAMETER_NAME:
-        return SourceTypes.REQUEST_PARAMETER_NAME;
-      case SourceTypes.REQUEST_HEADER_VALUE:
-      case SourceTypes.REQUEST_HEADER_NAME:
-        return SourceTypes.REQUEST_HEADER_NAME;
-      case SourceTypes.REQUEST_COOKIE_VALUE:
-      case SourceTypes.REQUEST_COOKIE_NAME:
-        return SourceTypes.REQUEST_COOKIE_NAME;
-      case SourceTypes.KAFKA_MESSAGE_KEY:
-      case SourceTypes.KAFKA_MESSAGE_VALUE:
-        return SourceTypes.KAFKA_MESSAGE_VALUE;
-      default:
-        return sourceType;
+    public static byte namedSource(final byte sourceType) {
+        switch (sourceType) {
+            case SourceTypes.REQUEST_PARAMETER_VALUE:
+            case SourceTypes.REQUEST_PARAMETER_NAME:
+                return SourceTypes.REQUEST_PARAMETER_NAME;
+            case SourceTypes.REQUEST_HEADER_VALUE:
+            case SourceTypes.REQUEST_HEADER_NAME:
+                return SourceTypes.REQUEST_HEADER_NAME;
+            case SourceTypes.REQUEST_COOKIE_VALUE:
+            case SourceTypes.REQUEST_COOKIE_NAME:
+                return SourceTypes.REQUEST_COOKIE_NAME;
+            case SourceTypes.KAFKA_MESSAGE_KEY:
+            case SourceTypes.KAFKA_MESSAGE_VALUE:
+                return SourceTypes.KAFKA_MESSAGE_VALUE;
+            default:
+                return sourceType;
+        }
     }
-  }
 
-  /**
-   * Used for telemetry only, this is a special source type that is not reported, reported values
-   * will be {@link #KAFKA_MESSAGE_TYPES}
-   */
-  public static final byte KAFKA_MESSAGE = -127;
+    /**
+     * Used for telemetry only, this is a special source type that is not reported, reported values
+     * will be {@link #KAFKA_MESSAGE_TYPES}
+     */
+    public static final byte KAFKA_MESSAGE = -127;
 
-  /** Use for kafka key and values sources */
-  public static final byte[] KAFKA_MESSAGE_TYPES = {KAFKA_MESSAGE_KEY, KAFKA_MESSAGE_VALUE};
+    /** Use for kafka key and values sources */
+    public static final byte[] KAFKA_MESSAGE_TYPES = {KAFKA_MESSAGE_KEY, KAFKA_MESSAGE_VALUE};
 
-  @Nullable
-  public static byte[] unwrap(final byte vulnerability) {
-    if (vulnerability == KAFKA_MESSAGE) {
-      return KAFKA_MESSAGE_TYPES;
+    @Nullable
+    public static byte[] unwrap(final byte vulnerability) {
+        if (vulnerability == KAFKA_MESSAGE) {
+            return KAFKA_MESSAGE_TYPES;
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/Taintable.java b/internal-api/src/main/java/datadog/trace/api/iast/Taintable.java
index 3c221426040..7606d8d579c 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/Taintable.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/Taintable.java
@@ -8,60 +8,60 @@
 
 public interface Taintable {
 
-  Source $$DD$getSource();
+    Source $$DD$getSource();
 
-  void $$DD$setSource(final Source source);
+    void $$DD$setSource(final Source source);
 
-  default boolean $DD$isTainted() {
-    return $$DD$getSource() != null;
-  }
+    default boolean $DD$isTainted() {
+        return $$DD$getSource() != null;
+    }
 
-  /** Interface to isolate customer classloader from our classes */
-  interface Source {
-    byte getOrigin();
+    /** Interface to isolate customer classloader from our classes */
+    interface Source {
+        byte getOrigin();
 
-    String getName();
+        String getName();
 
-    String getValue();
-  }
+        String getValue();
+    }
 
-  @SuppressForbidden
-  class DebugLogger {
-    private static final Logger LOGGER;
+    @SuppressForbidden
+    class DebugLogger {
+        private static final Logger LOGGER;
 
-    static {
-      LOGGER = LoggerFactory.getLogger("Taintable tainted objects");
+        static {
+            LOGGER = LoggerFactory.getLogger("Taintable tainted objects");
 
-      // Check logger class by name to avoid NoClassDefFoundError at runtime
-      // for tests without Logback.
-      if (LOGGER.getClass().getName().equals("ch.qos.logback.classic.Logger")) {
-        try {
-          Class<?> levelCls = Class.forName("ch.qos.logback.classic.Level");
-          Method setLevel = LOGGER.getClass().getMethod("setLevel", levelCls);
-          Object debugLevel = levelCls.getField("DEBUG").get(null);
-          setLevel.invoke(LOGGER, debugLevel);
-        } catch (IllegalAccessException
-            | NoSuchFieldException
-            | ClassNotFoundException
-            | NoSuchMethodException
-            | InvocationTargetException e) {
-          throw new RuntimeException(e);
+            // Check logger class by name to avoid NoClassDefFoundError at runtime
+            // for tests without Logback.
+            if (LOGGER.getClass().getName().equals("ch.qos.logback.classic.Logger")) {
+                try {
+                    Class<?> levelCls = Class.forName("ch.qos.logback.classic.Level");
+                    Method setLevel = LOGGER.getClass().getMethod("setLevel", levelCls);
+                    Object debugLevel = levelCls.getField("DEBUG").get(null);
+                    setLevel.invoke(LOGGER, debugLevel);
+                } catch (IllegalAccessException
+                        | NoSuchFieldException
+                        | ClassNotFoundException
+                        | NoSuchMethodException
+                        | InvocationTargetException e) {
+                    throw new RuntimeException(e);
+                }
+            }
         }
-      }
-    }
 
-    public static void logTaint(Taintable t) {
-      String content;
-      if (t.getClass().getName().startsWith("java.")) {
-        content = t.toString();
-      } else {
-        content = "(value not shown)"; // toString() may trigger tainting
-      }
-      LOGGER.debug(
-          "taint: {}[{}] {}",
-          t.getClass().getSimpleName(),
-          Integer.toHexString(System.identityHashCode(t)),
-          content);
+        public static void logTaint(Taintable t) {
+            String content;
+            if (t.getClass().getName().startsWith("java.")) {
+                content = t.toString();
+            } else {
+                content = "(value not shown)"; // toString() may trigger tainting
+            }
+            LOGGER.debug(
+                    "taint: {}[{}] {}",
+                    t.getClass().getSimpleName(),
+                    Integer.toHexString(System.identityHashCode(t)),
+                    content);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/VulnerabilityMarks.java b/internal-api/src/main/java/datadog/trace/api/iast/VulnerabilityMarks.java
index b1915b4ded6..123aed43090 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/VulnerabilityMarks.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/VulnerabilityMarks.java
@@ -2,81 +2,81 @@
 
 public class VulnerabilityMarks {
 
-  private VulnerabilityMarks() {}
+    private VulnerabilityMarks() {}
 
-  public static final int NOT_MARKED = 0;
+    public static final int NOT_MARKED = 0;
 
-  public static final int XPATH_INJECTION_MARK = 1;
-  public static final int SQL_INJECTION_MARK = 1 << 1;
-  public static final int COMMAND_INJECTION_MARK = 1 << 2;
-  public static final int PATH_TRAVERSAL_MARK = 1 << 3;
-  public static final int LDAP_INJECTION_MARK = 1 << 4;
-  public static final int SSRF_MARK = 1 << 5;
-  public static final int UNVALIDATED_REDIRECT_MARK = 1 << 6;
+    public static final int XPATH_INJECTION_MARK = 1;
+    public static final int SQL_INJECTION_MARK = 1 << 1;
+    public static final int COMMAND_INJECTION_MARK = 1 << 2;
+    public static final int PATH_TRAVERSAL_MARK = 1 << 3;
+    public static final int LDAP_INJECTION_MARK = 1 << 4;
+    public static final int SSRF_MARK = 1 << 5;
+    public static final int UNVALIDATED_REDIRECT_MARK = 1 << 6;
 
-  public static final int XSS_MARK = 1 << 7;
+    public static final int XSS_MARK = 1 << 7;
 
-  public static final int TRUST_BOUNDARY_VIOLATION_MARK = 1 << 8;
-  public static final int HEADER_INJECTION_MARK = 1 << 9;
-  public static final int REFLECTION_INJECTION_MARK = 1 << 10;
-  public static final int UNTRUSTED_DESERIALIZATION_MARK = 1 << 11;
-  public static final int CODE_INJECTION_MARK = 1 << 12;
+    public static final int TRUST_BOUNDARY_VIOLATION_MARK = 1 << 8;
+    public static final int HEADER_INJECTION_MARK = 1 << 9;
+    public static final int REFLECTION_INJECTION_MARK = 1 << 10;
+    public static final int UNTRUSTED_DESERIALIZATION_MARK = 1 << 11;
+    public static final int CODE_INJECTION_MARK = 1 << 12;
 
-  public static final int CUSTOM_SECURITY_CONTROL_MARK = 1 << 13;
-  public static final int EMAIL_HTML_INJECTION_MARK = 1 << 14;
-  public static final int HTML_ESCAPED_MARK = XSS_MARK | EMAIL_HTML_INJECTION_MARK;
+    public static final int CUSTOM_SECURITY_CONTROL_MARK = 1 << 13;
+    public static final int EMAIL_HTML_INJECTION_MARK = 1 << 14;
+    public static final int HTML_ESCAPED_MARK = XSS_MARK | EMAIL_HTML_INJECTION_MARK;
 
-  public static int markForAll() {
-    return HTML_ESCAPED_MARK
-        | XPATH_INJECTION_MARK
-        | SQL_INJECTION_MARK
-        | COMMAND_INJECTION_MARK
-        | PATH_TRAVERSAL_MARK
-        | LDAP_INJECTION_MARK
-        | SSRF_MARK
-        | UNVALIDATED_REDIRECT_MARK
-        | TRUST_BOUNDARY_VIOLATION_MARK
-        | HEADER_INJECTION_MARK
-        | REFLECTION_INJECTION_MARK
-        | UNTRUSTED_DESERIALIZATION_MARK
-        | CODE_INJECTION_MARK
-        | CUSTOM_SECURITY_CONTROL_MARK;
-  }
+    public static int markForAll() {
+        return HTML_ESCAPED_MARK
+                | XPATH_INJECTION_MARK
+                | SQL_INJECTION_MARK
+                | COMMAND_INJECTION_MARK
+                | PATH_TRAVERSAL_MARK
+                | LDAP_INJECTION_MARK
+                | SSRF_MARK
+                | UNVALIDATED_REDIRECT_MARK
+                | TRUST_BOUNDARY_VIOLATION_MARK
+                | HEADER_INJECTION_MARK
+                | REFLECTION_INJECTION_MARK
+                | UNTRUSTED_DESERIALIZATION_MARK
+                | CODE_INJECTION_MARK
+                | CUSTOM_SECURITY_CONTROL_MARK;
+    }
 
-  public static int getMarkFromVulnerabitityType(final String vulnerabilityTypeString) {
-    switch (vulnerabilityTypeString) {
-      case "XSS":
-        return XSS_MARK;
-      case "XPATH_INJECTION":
-        return XPATH_INJECTION_MARK;
-      case "SQL_INJECTION":
-        return SQL_INJECTION_MARK;
-      case "COMMAND_INJECTION":
-        return COMMAND_INJECTION_MARK;
-      case "PATH_TRAVERSAL":
-        return PATH_TRAVERSAL_MARK;
-      case "LDAP_INJECTION":
-        return LDAP_INJECTION_MARK;
-      case "SSRF":
-        return SSRF_MARK;
-      case "UNVALIDATED_REDIRECT":
-        return UNVALIDATED_REDIRECT_MARK;
-      case "TRUST_BOUNDARY_VIOLATION":
-        return TRUST_BOUNDARY_VIOLATION_MARK;
-      case "HEADER_INJECTION":
-        return HEADER_INJECTION_MARK;
-      case "REFLECTION_INJECTION":
-        return REFLECTION_INJECTION_MARK;
-      case "UNTRUSTED_DESERIALIZATION":
-        return UNTRUSTED_DESERIALIZATION_MARK;
-      case "EMAIL_HTML_INJECTION":
-        return EMAIL_HTML_INJECTION_MARK;
-      case "CODE_INJECTION":
-        return CODE_INJECTION_MARK;
-      case "CUSTOM_SECURITY_CONTROL":
-        return CUSTOM_SECURITY_CONTROL_MARK;
-      default:
-        return NOT_MARKED;
+    public static int getMarkFromVulnerabitityType(final String vulnerabilityTypeString) {
+        switch (vulnerabilityTypeString) {
+            case "XSS":
+                return XSS_MARK;
+            case "XPATH_INJECTION":
+                return XPATH_INJECTION_MARK;
+            case "SQL_INJECTION":
+                return SQL_INJECTION_MARK;
+            case "COMMAND_INJECTION":
+                return COMMAND_INJECTION_MARK;
+            case "PATH_TRAVERSAL":
+                return PATH_TRAVERSAL_MARK;
+            case "LDAP_INJECTION":
+                return LDAP_INJECTION_MARK;
+            case "SSRF":
+                return SSRF_MARK;
+            case "UNVALIDATED_REDIRECT":
+                return UNVALIDATED_REDIRECT_MARK;
+            case "TRUST_BOUNDARY_VIOLATION":
+                return TRUST_BOUNDARY_VIOLATION_MARK;
+            case "HEADER_INJECTION":
+                return HEADER_INJECTION_MARK;
+            case "REFLECTION_INJECTION":
+                return REFLECTION_INJECTION_MARK;
+            case "UNTRUSTED_DESERIALIZATION":
+                return UNTRUSTED_DESERIALIZATION_MARK;
+            case "EMAIL_HTML_INJECTION":
+                return EMAIL_HTML_INJECTION_MARK;
+            case "CODE_INJECTION":
+                return CODE_INJECTION_MARK;
+            case "CUSTOM_SECURITY_CONTROL":
+                return CUSTOM_SECURITY_CONTROL_MARK;
+            default:
+                return NOT_MARKED;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/VulnerabilityTypes.java b/internal-api/src/main/java/datadog/trace/api/iast/VulnerabilityTypes.java
index 37b9096de6d..075b6b2b9c6 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/VulnerabilityTypes.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/VulnerabilityTypes.java
@@ -4,139 +4,139 @@
 
 public abstract class VulnerabilityTypes {
 
-  private VulnerabilityTypes() {}
+    private VulnerabilityTypes() {}
 
-  public static final byte WEAK_CIPHER = 0;
-  public static final byte WEAK_HASH = 1;
-  public static final byte SQL_INJECTION = 2;
-  public static final byte COMMAND_INJECTION = 3;
-  public static final byte PATH_TRAVERSAL = 4;
-  public static final byte LDAP_INJECTION = 5;
-  public static final byte SSRF = 6;
-  public static final byte INSECURE_COOKIE = 7;
-  public static final byte NO_HTTPONLY_COOKIE = 8;
-  public static final byte HSTS_HEADER_MISSING = 9;
-  public static final byte XCONTENTTYPE_HEADER_MISSING = 10;
-  public static final byte NO_SAMESITE_COOKIE = 11;
-  public static final byte UNVALIDATED_REDIRECT = 12;
-  public static final byte WEAK_RANDOMNESS = 13;
-  public static final byte XPATH_INJECTION = 14;
-  public static final byte TRUST_BOUNDARY_VIOLATION = 15;
-  public static final byte XSS = 16;
-  public static final byte STACKTRACE_LEAK = 17;
-  public static final byte HEADER_INJECTION = 18;
-  public static final byte VERB_TAMPERING = 19;
-  public static final byte DEFAULT_HTML_ESCAPE_INVALID = 20;
-  public static final byte SESSION_TIMEOUT = 21;
-  public static final byte DIRECTORY_LISTING_LEAK = 22;
-  public static final byte INSECURE_JSP_LAYOUT = 23;
-  public static final byte ADMIN_CONSOLE_ACTIVE = 24;
-  public static final byte HARDCODED_SECRET = 25;
-  public static final byte INSECURE_AUTH_PROTOCOL = 26;
-  public static final byte REFLECTION_INJECTION = 27;
-  public static final byte SESSION_REWRITING = 28;
-  public static final byte DEFAULT_APP_DEPLOYED = 29;
-  public static final byte UNTRUSTED_DESERIALIZATION = 30;
-  public static final byte EMAIL_HTML_INJECTION = 31;
-  public static final byte CODE_INJECTION = 32;
+    public static final byte WEAK_CIPHER = 0;
+    public static final byte WEAK_HASH = 1;
+    public static final byte SQL_INJECTION = 2;
+    public static final byte COMMAND_INJECTION = 3;
+    public static final byte PATH_TRAVERSAL = 4;
+    public static final byte LDAP_INJECTION = 5;
+    public static final byte SSRF = 6;
+    public static final byte INSECURE_COOKIE = 7;
+    public static final byte NO_HTTPONLY_COOKIE = 8;
+    public static final byte HSTS_HEADER_MISSING = 9;
+    public static final byte XCONTENTTYPE_HEADER_MISSING = 10;
+    public static final byte NO_SAMESITE_COOKIE = 11;
+    public static final byte UNVALIDATED_REDIRECT = 12;
+    public static final byte WEAK_RANDOMNESS = 13;
+    public static final byte XPATH_INJECTION = 14;
+    public static final byte TRUST_BOUNDARY_VIOLATION = 15;
+    public static final byte XSS = 16;
+    public static final byte STACKTRACE_LEAK = 17;
+    public static final byte HEADER_INJECTION = 18;
+    public static final byte VERB_TAMPERING = 19;
+    public static final byte DEFAULT_HTML_ESCAPE_INVALID = 20;
+    public static final byte SESSION_TIMEOUT = 21;
+    public static final byte DIRECTORY_LISTING_LEAK = 22;
+    public static final byte INSECURE_JSP_LAYOUT = 23;
+    public static final byte ADMIN_CONSOLE_ACTIVE = 24;
+    public static final byte HARDCODED_SECRET = 25;
+    public static final byte INSECURE_AUTH_PROTOCOL = 26;
+    public static final byte REFLECTION_INJECTION = 27;
+    public static final byte SESSION_REWRITING = 28;
+    public static final byte DEFAULT_APP_DEPLOYED = 29;
+    public static final byte UNTRUSTED_DESERIALIZATION = 30;
+    public static final byte EMAIL_HTML_INJECTION = 31;
+    public static final byte CODE_INJECTION = 32;
 
-  /**
-   * Use for telemetry only, this is a special vulnerability type that is not reported, reported
-   * values will be {@link #RESPONSE_HEADER_TYPES}
-   */
-  public static final byte RESPONSE_HEADER = -128;
+    /**
+     * Use for telemetry only, this is a special vulnerability type that is not reported, reported
+     * values will be {@link #RESPONSE_HEADER_TYPES}
+     */
+    public static final byte RESPONSE_HEADER = -128;
 
-  public static final byte[] RESPONSE_HEADER_TYPES = {
-    UNVALIDATED_REDIRECT,
-    INSECURE_COOKIE,
-    NO_SAMESITE_COOKIE,
-    NO_HTTPONLY_COOKIE,
-    XCONTENTTYPE_HEADER_MISSING,
-    HSTS_HEADER_MISSING,
-    HEADER_INJECTION
-  };
+    public static final byte[] RESPONSE_HEADER_TYPES = {
+        UNVALIDATED_REDIRECT,
+        INSECURE_COOKIE,
+        NO_SAMESITE_COOKIE,
+        NO_HTTPONLY_COOKIE,
+        XCONTENTTYPE_HEADER_MISSING,
+        HSTS_HEADER_MISSING,
+        HEADER_INJECTION
+    };
 
-  /**
-   * Use for telemetry only, this is a special vulnerability type that is not reported, reported
-   * values will be {@link #SPRING_RESPONSE_TYPES}
-   */
-  public static final byte SPRING_RESPONSE = -127;
+    /**
+     * Use for telemetry only, this is a special vulnerability type that is not reported, reported
+     * values will be {@link #SPRING_RESPONSE_TYPES}
+     */
+    public static final byte SPRING_RESPONSE = -127;
 
-  /** Use for spring unvalidated redirect and xss */
-  public static final byte[] SPRING_RESPONSE_TYPES = {UNVALIDATED_REDIRECT, XSS};
+    /** Use for spring unvalidated redirect and xss */
+    public static final byte[] SPRING_RESPONSE_TYPES = {UNVALIDATED_REDIRECT, XSS};
 
-  /**
-   * Use for telemetry only, this is a special vulnerability type that is not reported, reported
-   * values will be {@link #APPLICATION_TYPES}
-   */
-  public static final byte APPLICATION = -126;
+    /**
+     * Use for telemetry only, this is a special vulnerability type that is not reported, reported
+     * values will be {@link #APPLICATION_TYPES}
+     */
+    public static final byte APPLICATION = -126;
 
-  /** Use for spring unvalidated redirect and xss */
-  public static final byte[] APPLICATION_TYPES = {
-    VERB_TAMPERING,
-    ADMIN_CONSOLE_ACTIVE,
-    DEFAULT_HTML_ESCAPE_INVALID,
-    SESSION_TIMEOUT,
-    DIRECTORY_LISTING_LEAK,
-    INSECURE_JSP_LAYOUT,
-    DEFAULT_APP_DEPLOYED,
-  };
+    /** Use for spring unvalidated redirect and xss */
+    public static final byte[] APPLICATION_TYPES = {
+        VERB_TAMPERING,
+        ADMIN_CONSOLE_ACTIVE,
+        DEFAULT_HTML_ESCAPE_INVALID,
+        SESSION_TIMEOUT,
+        DIRECTORY_LISTING_LEAK,
+        INSECURE_JSP_LAYOUT,
+        DEFAULT_APP_DEPLOYED,
+    };
 
-  /**
-   * Array indexed with all vulnerability types, the index should match the vulnerability type
-   * values
-   */
-  public static final String[] STRINGS = {
-    "WEAK_CIPHER",
-    "WEAK_HASH",
-    "SQL_INJECTION",
-    "COMMAND_INJECTION",
-    "PATH_TRAVERSAL",
-    "LDAP_INJECTION",
-    "SSRF",
-    "INSECURE_COOKIE",
-    "NO_HTTPONLY_COOKIE",
-    "HSTS_HEADER_MISSING",
-    "XCONTENTTYPE_HEADER_MISSING",
-    "NO_SAMESITE_COOKIE",
-    "UNVALIDATED_REDIRECT",
-    "WEAK_RANDOMNESS",
-    "XPATH_INJECTION",
-    "TRUST_BOUNDARY_VIOLATION",
-    "XSS",
-    "STACKTRACE_LEAK",
-    "HEADER_INJECTION",
-    "VERB_TAMPERING",
-    "DEFAULT_HTML_ESCAPE_INVALID",
-    "SESSION_TIMEOUT",
-    "DIRECTORY_LISTING_LEAK",
-    "INSECURE_JSP_LAYOUT",
-    "ADMIN_CONSOLE_ACTIVE",
-    "HARDCODED_SECRET",
-    "INSECURE_AUTH_PROTOCOL",
-    "REFLECTION_INJECTION",
-    "SESSION_REWRITING",
-    "DEFAULT_APP_DEPLOYED",
-    "UNTRUSTED_DESERIALIZATION",
-    "EMAIL_HTML_INJECTION",
-    "CODE_INJECTION"
-  };
+    /**
+     * Array indexed with all vulnerability types, the index should match the vulnerability type
+     * values
+     */
+    public static final String[] STRINGS = {
+        "WEAK_CIPHER",
+        "WEAK_HASH",
+        "SQL_INJECTION",
+        "COMMAND_INJECTION",
+        "PATH_TRAVERSAL",
+        "LDAP_INJECTION",
+        "SSRF",
+        "INSECURE_COOKIE",
+        "NO_HTTPONLY_COOKIE",
+        "HSTS_HEADER_MISSING",
+        "XCONTENTTYPE_HEADER_MISSING",
+        "NO_SAMESITE_COOKIE",
+        "UNVALIDATED_REDIRECT",
+        "WEAK_RANDOMNESS",
+        "XPATH_INJECTION",
+        "TRUST_BOUNDARY_VIOLATION",
+        "XSS",
+        "STACKTRACE_LEAK",
+        "HEADER_INJECTION",
+        "VERB_TAMPERING",
+        "DEFAULT_HTML_ESCAPE_INVALID",
+        "SESSION_TIMEOUT",
+        "DIRECTORY_LISTING_LEAK",
+        "INSECURE_JSP_LAYOUT",
+        "ADMIN_CONSOLE_ACTIVE",
+        "HARDCODED_SECRET",
+        "INSECURE_AUTH_PROTOCOL",
+        "REFLECTION_INJECTION",
+        "SESSION_REWRITING",
+        "DEFAULT_APP_DEPLOYED",
+        "UNTRUSTED_DESERIALIZATION",
+        "EMAIL_HTML_INJECTION",
+        "CODE_INJECTION"
+    };
 
-  public static String toString(final byte vulnerability) {
-    return vulnerability < 0 ? null : STRINGS[vulnerability];
-  }
+    public static String toString(final byte vulnerability) {
+        return vulnerability < 0 ? null : STRINGS[vulnerability];
+    }
 
-  @Nullable
-  public static byte[] unwrap(final byte vulnerability) {
-    switch (vulnerability) {
-      case RESPONSE_HEADER:
-        return RESPONSE_HEADER_TYPES;
-      case SPRING_RESPONSE:
-        return SPRING_RESPONSE_TYPES;
-      case APPLICATION:
-        return APPLICATION_TYPES;
-      default:
-        return null;
+    @Nullable
+    public static byte[] unwrap(final byte vulnerability) {
+        switch (vulnerability) {
+            case RESPONSE_HEADER:
+                return RESPONSE_HEADER_TYPES;
+            case SPRING_RESPONSE:
+                return SPRING_RESPONSE_TYPES;
+            case APPLICATION:
+                return APPLICATION_TYPES;
+            default:
+                return null;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/propagation/CodecModule.java b/internal-api/src/main/java/datadog/trace/api/iast/propagation/CodecModule.java
index 5909fd82a2a..76ed702dd7c 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/propagation/CodecModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/propagation/CodecModule.java
@@ -8,24 +8,20 @@
 
 public interface CodecModule extends IastModule {
 
-  void onUrlDecode(@Nonnull String value, @Nullable String encoding, @Nonnull String result);
+    void onUrlDecode(@Nonnull String value, @Nullable String encoding, @Nonnull String result);
 
-  void onUrlEncode(@Nonnull String value, @Nullable String encoding, @Nonnull String result);
+    void onUrlEncode(@Nonnull String value, @Nullable String encoding, @Nonnull String result);
 
-  void onUriCreate(@Nonnull URI result, Object... args);
+    void onUriCreate(@Nonnull URI result, Object... args);
 
-  void onUrlCreate(@Nonnull URL result, Object... args);
+    void onUrlCreate(@Nonnull URL result, Object... args);
 
-  void onStringFromBytes(
-      @Nonnull byte[] value,
-      int offset,
-      int length,
-      @Nullable String charset,
-      @Nonnull String result);
+    void onStringFromBytes(
+            @Nonnull byte[] value, int offset, int length, @Nullable String charset, @Nonnull String result);
 
-  void onStringGetBytes(@Nonnull String value, @Nullable String charset, @Nonnull byte[] result);
+    void onStringGetBytes(@Nonnull String value, @Nullable String charset, @Nonnull byte[] result);
 
-  void onBase64Encode(@Nullable byte[] value, @Nullable byte[] result);
+    void onBase64Encode(@Nullable byte[] value, @Nullable byte[] result);
 
-  void onBase64Decode(@Nullable byte[] value, @Nullable byte[] result);
+    void onBase64Decode(@Nullable byte[] value, @Nullable byte[] result);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/propagation/PropagationModule.java b/internal-api/src/main/java/datadog/trace/api/iast/propagation/PropagationModule.java
index 4eaf20a1539..4cf8c060559 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/propagation/PropagationModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/propagation/PropagationModule.java
@@ -10,419 +10,379 @@
 @SuppressWarnings("unused")
 public interface PropagationModule extends IastModule {
 
-  /**
-   * @see #taintObject(IastContext, Object, byte)
-   */
-  void taintObject(@Nullable Object target, byte origin);
-
-  /**
-   * Taints the object with a source with the selected origin and no name, if target is a char
-   * sequence it will be used as value
-   */
-  void taintObject(@Nullable IastContext ctx, @Nullable Object target, byte origin);
-
-  /**
-   * @see #taintString(IastContext, String, byte)
-   */
-  void taintString(@Nullable String target, byte origin);
-
-  /**
-   * @see #taintObject(IastContext, Object, byte)
-   */
-  void taintString(@Nullable IastContext ctx, @Nullable String target, byte origin);
-
-  /**
-   * Taints the object with a source with the selected origin and name, if target is a char sequence
-   * it will be used as value
-   */
-  void taintObject(
-      @Nullable IastContext ctx, @Nullable Object target, byte origin, @Nullable CharSequence name);
-
-  /**
-   * @see #taintObject(IastContext, Object, byte, CharSequence)
-   */
-  void taintObject(@Nullable Object target, byte origin, @Nullable CharSequence name);
-
-  /**
-   * @see #taintObject(IastContext, Object, byte, CharSequence)
-   */
-  void taintString(
-      @Nullable IastContext ctx, @Nullable String target, byte origin, @Nullable CharSequence name);
-
-  /**
-   * @see #taintString(IastContext, String, byte, CharSequence)
-   */
-  void taintString(@Nullable String target, byte origin, @Nullable CharSequence name);
-
-  /**
-   * @see #taintObject(IastContext, Object, byte, CharSequence, Object)
-   */
-  void taintObject(
-      @Nullable Object target, byte origin, @Nullable CharSequence name, @Nullable Object value);
-
-  /** Taints the object with a source with the selected origin, name and value */
-  void taintObject(
-      @Nullable IastContext ctx,
-      @Nullable Object target,
-      byte origin,
-      @Nullable CharSequence name,
-      @Nullable Object value);
-
-  /**
-   * @see #taintString(IastContext, String, byte, CharSequence, CharSequence)
-   */
-  void taintString(
-      @Nullable String target,
-      byte origin,
-      @Nullable CharSequence name,
-      @Nullable CharSequence value);
-
-  /**
-   * @see #taintObject(IastContext, Object, byte, CharSequence, Object)
-   */
-  void taintString(
-      @Nullable IastContext ctx,
-      @Nullable String target,
-      byte origin,
-      @Nullable CharSequence name,
-      @Nullable CharSequence value);
-
-  /**
-   * @see #taintObjectRange(IastContext, Object, byte, int, int)
-   */
-  void taintObjectRange(@Nullable Object target, byte origin, int start, int length);
-
-  /**
-   * Taints the object with a source with the selected origin, range and no name. If target is a
-   * char sequence it will be used as value.
-   *
-   * <p>If the value is already tainted this method will append a new range.
-   */
-  void taintObjectRange(
-      @Nullable IastContext ctx, @Nullable Object target, byte origin, int start, int length);
-
-  /**
-   * @see #taintStringRange(IastContext, String, byte, int, int)
-   */
-  void taintStringRange(@Nullable String target, byte origin, int start, int length);
-
-  /**
-   * @see #taintObjectRange(IastContext, Object, byte, int, int)
-   */
-  void taintStringRange(
-      @Nullable IastContext ctx, @Nullable String target, byte origin, int start, int length);
-
-  /**
-   * @see #taintObjectIfTainted(IastContext, Object, Object)
-   */
-  void taintObjectIfTainted(@Nullable Object target, @Nullable Object input);
-
-  /**
-   * Taints the object only if the input value is tainted. If tainted, it will use the highest
-   * priority source of the input to taint the object.
-   */
-  void taintObjectIfTainted(
-      @Nullable IastContext ctx, @Nullable Object target, @Nullable Object input);
-
-  /**
-   * @see #taintStringIfTainted(IastContext, String, Object)
-   */
-  void taintStringIfTainted(@Nullable String target, @Nullable Object input);
-
-  /**
-   * @see #taintObjectIfTainted(IastContext, Object, Object)
-   */
-  void taintStringIfTainted(
-      @Nullable IastContext ctx, @Nullable String target, @Nullable Object input);
-
-  /**
-   * @see #taintObjectIfTainted(IastContext, Object, Object, boolean, int)
-   */
-  void taintObjectIfTainted(
-      @Nullable Object target, @Nullable Object input, boolean keepRanges, int mark);
-
-  /**
-   * Taints the object only if the input value is tainted. It will try to reuse sources from the
-   * input value according to:
-   *
-   * <ul>
-   *   <li>keepRanges=true will reuse the ranges from the input tainted value and mark them
-   *   <li>keepRanges=false will use the highest priority source from the input ranges and mark it
-   * </ul>
-   */
-  void taintObjectIfTainted(
-      @Nullable IastContext ctx,
-      @Nullable Object target,
-      @Nullable Object input,
-      boolean keepRanges,
-      int mark);
-
-  /**
-   * @see #taintStringIfTainted(IastContext, String, Object, boolean, int)
-   */
-  void taintStringIfTainted(
-      @Nullable String target, @Nullable Object input, boolean keepRanges, int mark);
-
-  /**
-   * @see #taintObjectIfTainted(IastContext, Object, Object, boolean, int)
-   */
-  void taintStringIfTainted(
-      @Nullable IastContext ctx,
-      @Nullable String target,
-      @Nullable Object input,
-      boolean keepRanges,
-      int mark);
-
-  /**
-   * @see #taintObjectIfTainted(IastContext, Object, Object, boolean, int)
-   */
-  void taintObjectIfRangeTainted(
-      @Nullable Object target,
-      @Nullable Object input,
-      int start,
-      int length,
-      boolean keepRanges,
-      int mark);
-
-  /**
-   * Taints the object only if the input value has a tainted range that intersects with the
-   * specified range. It will try to reuse sources from the input value according to:
-   *
-   * <ul>
-   *   <li>keepRanges=true will reuse the ranges from the intersection and mark them
-   *   <li>keepRanges=false will use the highest priority source from the intersection and mark it
-   * </ul>
-   */
-  void taintObjectIfRangeTainted(
-      @Nullable IastContext ctx,
-      @Nullable Object target,
-      @Nullable Object input,
-      int start,
-      int length,
-      boolean keepRanges,
-      int mark);
-
-  /**
-   * @see #taintStringIfTainted(IastContext, String, Object, boolean, int)
-   */
-  void taintStringIfRangeTainted(
-      @Nullable String target,
-      @Nullable Object input,
-      int start,
-      int length,
-      boolean keepRanges,
-      int mark);
-
-  /**
-   * @see #taintObjectIfTainted(IastContext, Object, Object, boolean, int)
-   */
-  void taintStringIfRangeTainted(
-      @Nullable IastContext ctx,
-      @Nullable String target,
-      @Nullable Object input,
-      int start,
-      int length,
-      boolean keepRanges,
-      int mark);
-
-  /**
-   * @see #taintObjectIfTainted(IastContext, Object, Object, byte)
-   */
-  void taintObjectIfTainted(@Nullable Object target, @Nullable Object input, byte origin);
-
-  /**
-   * Taints the object only if the input value is tainted, the resulting value will be tainted using
-   * a source with the specified origin and no name, if target is a char sequence it will be used as
-   * value
-   */
-  void taintObjectIfTainted(
-      @Nullable IastContext ctx, @Nullable Object target, @Nullable Object input, byte origin);
-
-  /**
-   * @see #taintStringIfTainted(IastContext, String, Object, byte)
-   */
-  void taintStringIfTainted(@Nullable String target, @Nullable Object input, byte origin);
-
-  /**
-   * @see #taintObjectIfTainted(IastContext, Object, Object, byte)
-   */
-  void taintStringIfTainted(
-      @Nullable IastContext ctx, @Nullable String target, @Nullable Object input, byte origin);
-
-  /**
-   * @see #taintObjectIfTainted(IastContext, Object, Object, byte, CharSequence)
-   */
-  void taintObjectIfTainted(
-      @Nullable Object target, @Nullable Object input, byte origin, @Nullable CharSequence name);
-
-  /**
-   * Taints the object only if the input value is tainted, the resulting value will be tainted using
-   * a source with the specified origin and name, if target is a char sequence it will be used as
-   * value
-   */
-  void taintObjectIfTainted(
-      @Nullable IastContext ctx,
-      @Nullable Object target,
-      @Nullable Object input,
-      byte origin,
-      @Nullable CharSequence name);
-
-  /**
-   * @see #taintStringIfTainted(IastContext, String, Object, byte, CharSequence)
-   */
-  void taintStringIfTainted(
-      @Nullable String target, @Nullable Object input, byte origin, @Nullable CharSequence name);
-
-  /**
-   * @see #taintObjectIfTainted(IastContext, Object, Object, byte, CharSequence)
-   */
-  void taintStringIfTainted(
-      @Nullable IastContext ctx,
-      @Nullable String target,
-      @Nullable Object input,
-      byte origin,
-      @Nullable CharSequence name);
-
-  /**
-   * @see #taintObjectIfTainted(IastContext, Object, Object, byte, CharSequence, Object)
-   */
-  void taintObjectIfTainted(
-      @Nullable Object target,
-      @Nullable Object input,
-      byte origin,
-      @Nullable CharSequence name,
-      @Nullable Object value);
-
-  /**
-   * Taints the object only if the input value is tainted, the resulting value will be tainted using
-   * a source with the specified origin, name and value.
-   */
-  void taintObjectIfTainted(
-      @Nullable IastContext ctx,
-      @Nullable Object target,
-      @Nullable Object input,
-      byte origin,
-      @Nullable CharSequence name,
-      @Nullable Object value);
-
-  /**
-   * @see #taintStringIfTainted(IastContext, String, Object, byte, CharSequence, Object)
-   */
-  void taintStringIfTainted(
-      @Nullable String target,
-      @Nullable Object input,
-      byte origin,
-      @Nullable CharSequence name,
-      @Nullable Object value);
-
-  /**
-   * @see #taintObjectIfTainted(IastContext, Object, Object, byte, CharSequence, Object)
-   */
-  void taintStringIfTainted(
-      @Nullable IastContext ctx,
-      @Nullable String target,
-      @Nullable Object input,
-      byte origin,
-      @Nullable CharSequence name,
-      @Nullable Object value);
-
-  /**
-   * @see #taintObjectIfAnyTainted(IastContext, Object, Object[])
-   */
-  void taintObjectIfAnyTainted(@Nullable Object target, @Nullable Object[] inputs);
-
-  /**
-   * Taints the object if any of the inputs is tainted. When a tainted input is found the logic is
-   * the same as in {@link #taintObjectIfTainted(IastContext, Object, Object)}
-   *
-   * @see #taintObjectIfTainted(IastContext, Object, Object)
-   */
-  void taintObjectIfAnyTainted(
-      @Nullable IastContext ctx, @Nullable Object target, @Nullable Object[] inputs);
-
-  /**
-   * @see #taintStringIfAnyTainted(IastContext, String, Object[])
-   */
-  void taintStringIfAnyTainted(@Nullable String target, @Nullable Object[] inputs);
-
-  /**
-   * @see #taintObjectIfAnyTainted(IastContext, Object, Object[])
-   */
-  void taintStringIfAnyTainted(
-      @Nullable IastContext ctx, @Nullable String target, @Nullable Object[] inputs);
-
-  /**
-   * @see #taintObjectIfAnyTainted(IastContext, Object, Object[], boolean, int)
-   */
-  void taintObjectIfAnyTainted(
-      @Nullable Object target, @Nullable Object[] inputs, boolean keepRanges, int mark);
-
-  /**
-   * Taints the object if any of the inputs is tainted. When a tainted input is found the logic is
-   * the same as in {@link #taintObjectIfTainted(IastContext, Object, Object, boolean, int)}
-   *
-   * @see #taintObjectIfTainted(IastContext, Object, Object, boolean, int)
-   */
-  void taintObjectIfAnyTainted(
-      @Nullable IastContext ctx,
-      @Nullable Object target,
-      @Nullable Object[] inputs,
-      boolean keepRanges,
-      int mark);
-
-  /**
-   * @see #taintStringIfAnyTainted(IastContext, String, Object[], boolean, int)
-   */
-  void taintStringIfAnyTainted(
-      @Nullable String target, @Nullable Object[] inputs, boolean keepRanges, int mark);
-
-  /**
-   * @see #taintObjectIfAnyTainted(IastContext, Object, Object[], boolean, int)
-   */
-  void taintStringIfAnyTainted(
-      @Nullable IastContext ctx,
-      @Nullable String target,
-      @Nullable Object[] inputs,
-      boolean keepRanges,
-      int mark);
-
-  /**
-   * @see #taintObjectDeeply(IastContext, Object, byte, Predicate)
-   */
-  int taintObjectDeeply(@Nullable Object target, byte origin, Predicate<Class<?>> classFilter);
-
-  /**
-   * Visit the graph of the object and taints all the string properties found using a source with
-   * the selected origin and no name.
-   *
-   * @param classFilter filter for types that should be included in the visiting process
-   * @return number of tainted elements
-   */
-  int taintObjectDeeply(
-      @Nullable IastContext ctx,
-      @Nullable Object target,
-      byte origin,
-      Predicate<Class<?>> classFilter);
-
-  /**
-   * @see #isTainted(IastContext, Object)
-   */
-  boolean isTainted(@Nullable Object target);
-
-  /** Checks if an arbitrary object is tainted */
-  boolean isTainted(@Nullable IastContext ctx, @Nullable Object target);
-
-  /**
-   * @see #findSource(IastContext, Object)
-   */
-  @Nullable
-  Source findSource(@Nullable Object target);
-
-  /**
-   * Returns the source with the highest priority if the object is tainted, {@code null} otherwise
-   */
-  @Nullable
-  Source findSource(@Nullable IastContext ctx, @Nullable Object target);
-
-  void markIfTainted(@Nullable Object target, int mark);
+    /**
+     * @see #taintObject(IastContext, Object, byte)
+     */
+    void taintObject(@Nullable Object target, byte origin);
+
+    /**
+     * Taints the object with a source with the selected origin and no name, if target is a char
+     * sequence it will be used as value
+     */
+    void taintObject(@Nullable IastContext ctx, @Nullable Object target, byte origin);
+
+    /**
+     * @see #taintString(IastContext, String, byte)
+     */
+    void taintString(@Nullable String target, byte origin);
+
+    /**
+     * @see #taintObject(IastContext, Object, byte)
+     */
+    void taintString(@Nullable IastContext ctx, @Nullable String target, byte origin);
+
+    /**
+     * Taints the object with a source with the selected origin and name, if target is a char sequence
+     * it will be used as value
+     */
+    void taintObject(@Nullable IastContext ctx, @Nullable Object target, byte origin, @Nullable CharSequence name);
+
+    /**
+     * @see #taintObject(IastContext, Object, byte, CharSequence)
+     */
+    void taintObject(@Nullable Object target, byte origin, @Nullable CharSequence name);
+
+    /**
+     * @see #taintObject(IastContext, Object, byte, CharSequence)
+     */
+    void taintString(@Nullable IastContext ctx, @Nullable String target, byte origin, @Nullable CharSequence name);
+
+    /**
+     * @see #taintString(IastContext, String, byte, CharSequence)
+     */
+    void taintString(@Nullable String target, byte origin, @Nullable CharSequence name);
+
+    /**
+     * @see #taintObject(IastContext, Object, byte, CharSequence, Object)
+     */
+    void taintObject(@Nullable Object target, byte origin, @Nullable CharSequence name, @Nullable Object value);
+
+    /** Taints the object with a source with the selected origin, name and value */
+    void taintObject(
+            @Nullable IastContext ctx,
+            @Nullable Object target,
+            byte origin,
+            @Nullable CharSequence name,
+            @Nullable Object value);
+
+    /**
+     * @see #taintString(IastContext, String, byte, CharSequence, CharSequence)
+     */
+    void taintString(@Nullable String target, byte origin, @Nullable CharSequence name, @Nullable CharSequence value);
+
+    /**
+     * @see #taintObject(IastContext, Object, byte, CharSequence, Object)
+     */
+    void taintString(
+            @Nullable IastContext ctx,
+            @Nullable String target,
+            byte origin,
+            @Nullable CharSequence name,
+            @Nullable CharSequence value);
+
+    /**
+     * @see #taintObjectRange(IastContext, Object, byte, int, int)
+     */
+    void taintObjectRange(@Nullable Object target, byte origin, int start, int length);
+
+    /**
+     * Taints the object with a source with the selected origin, range and no name. If target is a
+     * char sequence it will be used as value.
+     *
+     * <p>If the value is already tainted this method will append a new range.
+     */
+    void taintObjectRange(@Nullable IastContext ctx, @Nullable Object target, byte origin, int start, int length);
+
+    /**
+     * @see #taintStringRange(IastContext, String, byte, int, int)
+     */
+    void taintStringRange(@Nullable String target, byte origin, int start, int length);
+
+    /**
+     * @see #taintObjectRange(IastContext, Object, byte, int, int)
+     */
+    void taintStringRange(@Nullable IastContext ctx, @Nullable String target, byte origin, int start, int length);
+
+    /**
+     * @see #taintObjectIfTainted(IastContext, Object, Object)
+     */
+    void taintObjectIfTainted(@Nullable Object target, @Nullable Object input);
+
+    /**
+     * Taints the object only if the input value is tainted. If tainted, it will use the highest
+     * priority source of the input to taint the object.
+     */
+    void taintObjectIfTainted(@Nullable IastContext ctx, @Nullable Object target, @Nullable Object input);
+
+    /**
+     * @see #taintStringIfTainted(IastContext, String, Object)
+     */
+    void taintStringIfTainted(@Nullable String target, @Nullable Object input);
+
+    /**
+     * @see #taintObjectIfTainted(IastContext, Object, Object)
+     */
+    void taintStringIfTainted(@Nullable IastContext ctx, @Nullable String target, @Nullable Object input);
+
+    /**
+     * @see #taintObjectIfTainted(IastContext, Object, Object, boolean, int)
+     */
+    void taintObjectIfTainted(@Nullable Object target, @Nullable Object input, boolean keepRanges, int mark);
+
+    /**
+     * Taints the object only if the input value is tainted. It will try to reuse sources from the
+     * input value according to:
+     *
+     * <ul>
+     *   <li>keepRanges=true will reuse the ranges from the input tainted value and mark them
+     *   <li>keepRanges=false will use the highest priority source from the input ranges and mark it
+     * </ul>
+     */
+    void taintObjectIfTainted(
+            @Nullable IastContext ctx, @Nullable Object target, @Nullable Object input, boolean keepRanges, int mark);
+
+    /**
+     * @see #taintStringIfTainted(IastContext, String, Object, boolean, int)
+     */
+    void taintStringIfTainted(@Nullable String target, @Nullable Object input, boolean keepRanges, int mark);
+
+    /**
+     * @see #taintObjectIfTainted(IastContext, Object, Object, boolean, int)
+     */
+    void taintStringIfTainted(
+            @Nullable IastContext ctx, @Nullable String target, @Nullable Object input, boolean keepRanges, int mark);
+
+    /**
+     * @see #taintObjectIfTainted(IastContext, Object, Object, boolean, int)
+     */
+    void taintObjectIfRangeTainted(
+            @Nullable Object target, @Nullable Object input, int start, int length, boolean keepRanges, int mark);
+
+    /**
+     * Taints the object only if the input value has a tainted range that intersects with the
+     * specified range. It will try to reuse sources from the input value according to:
+     *
+     * <ul>
+     *   <li>keepRanges=true will reuse the ranges from the intersection and mark them
+     *   <li>keepRanges=false will use the highest priority source from the intersection and mark it
+     * </ul>
+     */
+    void taintObjectIfRangeTainted(
+            @Nullable IastContext ctx,
+            @Nullable Object target,
+            @Nullable Object input,
+            int start,
+            int length,
+            boolean keepRanges,
+            int mark);
+
+    /**
+     * @see #taintStringIfTainted(IastContext, String, Object, boolean, int)
+     */
+    void taintStringIfRangeTainted(
+            @Nullable String target, @Nullable Object input, int start, int length, boolean keepRanges, int mark);
+
+    /**
+     * @see #taintObjectIfTainted(IastContext, Object, Object, boolean, int)
+     */
+    void taintStringIfRangeTainted(
+            @Nullable IastContext ctx,
+            @Nullable String target,
+            @Nullable Object input,
+            int start,
+            int length,
+            boolean keepRanges,
+            int mark);
+
+    /**
+     * @see #taintObjectIfTainted(IastContext, Object, Object, byte)
+     */
+    void taintObjectIfTainted(@Nullable Object target, @Nullable Object input, byte origin);
+
+    /**
+     * Taints the object only if the input value is tainted, the resulting value will be tainted using
+     * a source with the specified origin and no name, if target is a char sequence it will be used as
+     * value
+     */
+    void taintObjectIfTainted(@Nullable IastContext ctx, @Nullable Object target, @Nullable Object input, byte origin);
+
+    /**
+     * @see #taintStringIfTainted(IastContext, String, Object, byte)
+     */
+    void taintStringIfTainted(@Nullable String target, @Nullable Object input, byte origin);
+
+    /**
+     * @see #taintObjectIfTainted(IastContext, Object, Object, byte)
+     */
+    void taintStringIfTainted(@Nullable IastContext ctx, @Nullable String target, @Nullable Object input, byte origin);
+
+    /**
+     * @see #taintObjectIfTainted(IastContext, Object, Object, byte, CharSequence)
+     */
+    void taintObjectIfTainted(
+            @Nullable Object target, @Nullable Object input, byte origin, @Nullable CharSequence name);
+
+    /**
+     * Taints the object only if the input value is tainted, the resulting value will be tainted using
+     * a source with the specified origin and name, if target is a char sequence it will be used as
+     * value
+     */
+    void taintObjectIfTainted(
+            @Nullable IastContext ctx,
+            @Nullable Object target,
+            @Nullable Object input,
+            byte origin,
+            @Nullable CharSequence name);
+
+    /**
+     * @see #taintStringIfTainted(IastContext, String, Object, byte, CharSequence)
+     */
+    void taintStringIfTainted(
+            @Nullable String target, @Nullable Object input, byte origin, @Nullable CharSequence name);
+
+    /**
+     * @see #taintObjectIfTainted(IastContext, Object, Object, byte, CharSequence)
+     */
+    void taintStringIfTainted(
+            @Nullable IastContext ctx,
+            @Nullable String target,
+            @Nullable Object input,
+            byte origin,
+            @Nullable CharSequence name);
+
+    /**
+     * @see #taintObjectIfTainted(IastContext, Object, Object, byte, CharSequence, Object)
+     */
+    void taintObjectIfTainted(
+            @Nullable Object target,
+            @Nullable Object input,
+            byte origin,
+            @Nullable CharSequence name,
+            @Nullable Object value);
+
+    /**
+     * Taints the object only if the input value is tainted, the resulting value will be tainted using
+     * a source with the specified origin, name and value.
+     */
+    void taintObjectIfTainted(
+            @Nullable IastContext ctx,
+            @Nullable Object target,
+            @Nullable Object input,
+            byte origin,
+            @Nullable CharSequence name,
+            @Nullable Object value);
+
+    /**
+     * @see #taintStringIfTainted(IastContext, String, Object, byte, CharSequence, Object)
+     */
+    void taintStringIfTainted(
+            @Nullable String target,
+            @Nullable Object input,
+            byte origin,
+            @Nullable CharSequence name,
+            @Nullable Object value);
+
+    /**
+     * @see #taintObjectIfTainted(IastContext, Object, Object, byte, CharSequence, Object)
+     */
+    void taintStringIfTainted(
+            @Nullable IastContext ctx,
+            @Nullable String target,
+            @Nullable Object input,
+            byte origin,
+            @Nullable CharSequence name,
+            @Nullable Object value);
+
+    /**
+     * @see #taintObjectIfAnyTainted(IastContext, Object, Object[])
+     */
+    void taintObjectIfAnyTainted(@Nullable Object target, @Nullable Object[] inputs);
+
+    /**
+     * Taints the object if any of the inputs is tainted. When a tainted input is found the logic is
+     * the same as in {@link #taintObjectIfTainted(IastContext, Object, Object)}
+     *
+     * @see #taintObjectIfTainted(IastContext, Object, Object)
+     */
+    void taintObjectIfAnyTainted(@Nullable IastContext ctx, @Nullable Object target, @Nullable Object[] inputs);
+
+    /**
+     * @see #taintStringIfAnyTainted(IastContext, String, Object[])
+     */
+    void taintStringIfAnyTainted(@Nullable String target, @Nullable Object[] inputs);
+
+    /**
+     * @see #taintObjectIfAnyTainted(IastContext, Object, Object[])
+     */
+    void taintStringIfAnyTainted(@Nullable IastContext ctx, @Nullable String target, @Nullable Object[] inputs);
+
+    /**
+     * @see #taintObjectIfAnyTainted(IastContext, Object, Object[], boolean, int)
+     */
+    void taintObjectIfAnyTainted(@Nullable Object target, @Nullable Object[] inputs, boolean keepRanges, int mark);
+
+    /**
+     * Taints the object if any of the inputs is tainted. When a tainted input is found the logic is
+     * the same as in {@link #taintObjectIfTainted(IastContext, Object, Object, boolean, int)}
+     *
+     * @see #taintObjectIfTainted(IastContext, Object, Object, boolean, int)
+     */
+    void taintObjectIfAnyTainted(
+            @Nullable IastContext ctx,
+            @Nullable Object target,
+            @Nullable Object[] inputs,
+            boolean keepRanges,
+            int mark);
+
+    /**
+     * @see #taintStringIfAnyTainted(IastContext, String, Object[], boolean, int)
+     */
+    void taintStringIfAnyTainted(@Nullable String target, @Nullable Object[] inputs, boolean keepRanges, int mark);
+
+    /**
+     * @see #taintObjectIfAnyTainted(IastContext, Object, Object[], boolean, int)
+     */
+    void taintStringIfAnyTainted(
+            @Nullable IastContext ctx,
+            @Nullable String target,
+            @Nullable Object[] inputs,
+            boolean keepRanges,
+            int mark);
+
+    /**
+     * @see #taintObjectDeeply(IastContext, Object, byte, Predicate)
+     */
+    int taintObjectDeeply(@Nullable Object target, byte origin, Predicate<Class<?>> classFilter);
+
+    /**
+     * Visit the graph of the object and taints all the string properties found using a source with
+     * the selected origin and no name.
+     *
+     * @param classFilter filter for types that should be included in the visiting process
+     * @return number of tainted elements
+     */
+    int taintObjectDeeply(
+            @Nullable IastContext ctx, @Nullable Object target, byte origin, Predicate<Class<?>> classFilter);
+
+    /**
+     * @see #isTainted(IastContext, Object)
+     */
+    boolean isTainted(@Nullable Object target);
+
+    /** Checks if an arbitrary object is tainted */
+    boolean isTainted(@Nullable IastContext ctx, @Nullable Object target);
+
+    /**
+     * @see #findSource(IastContext, Object)
+     */
+    @Nullable
+    Source findSource(@Nullable Object target);
+
+    /**
+     * Returns the source with the highest priority if the object is tainted, {@code null} otherwise
+     */
+    @Nullable
+    Source findSource(@Nullable IastContext ctx, @Nullable Object target);
+
+    void markIfTainted(@Nullable Object target, int mark);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/propagation/StringModule.java b/internal-api/src/main/java/datadog/trace/api/iast/propagation/StringModule.java
index 2660b0cd53b..4ff0db7b8d4 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/propagation/StringModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/propagation/StringModule.java
@@ -7,67 +7,59 @@
 
 public interface StringModule extends IastModule {
 
-  void onStringConcat(@Nonnull String left, @Nullable String right, @Nonnull String result);
+    void onStringConcat(@Nonnull String left, @Nullable String right, @Nonnull String result);
 
-  void onStringBuilderInit(@Nonnull CharSequence builder, @Nullable CharSequence param);
+    void onStringBuilderInit(@Nonnull CharSequence builder, @Nullable CharSequence param);
 
-  void onStringBuilderAppend(@Nonnull CharSequence builder, @Nullable CharSequence param);
+    void onStringBuilderAppend(@Nonnull CharSequence builder, @Nullable CharSequence param);
 
-  void onStringBuilderAppend(
-      @Nonnull CharSequence builder, @Nullable CharSequence param, int start, int end);
+    void onStringBuilderAppend(@Nonnull CharSequence builder, @Nullable CharSequence param, int start, int end);
 
-  void onStringBuilderToString(@Nonnull CharSequence builder, @Nonnull String result);
+    void onStringBuilderToString(@Nonnull CharSequence builder, @Nonnull String result);
 
-  void onStringBuilderSetLength(@Nonnull CharSequence self, int length);
+    void onStringBuilderSetLength(@Nonnull CharSequence self, int length);
 
-  void onStringConcatFactory(
-      @Nullable String result,
-      @Nullable String[] args,
-      @Nullable String recipe,
-      @Nullable Object[] dynamicConstants,
-      @Nonnull int[] recipeOffsets);
+    void onStringConcatFactory(
+            @Nullable String result,
+            @Nullable String[] args,
+            @Nullable String recipe,
+            @Nullable Object[] dynamicConstants,
+            @Nonnull int[] recipeOffsets);
 
-  void onStringSubSequence(
-      @Nonnull CharSequence self, int beginIndex, int endIndex, @Nullable CharSequence result);
+    void onStringSubSequence(@Nonnull CharSequence self, int beginIndex, int endIndex, @Nullable CharSequence result);
 
-  void onStringJoin(
-      @Nullable String result, @Nonnull CharSequence delimiter, @Nonnull CharSequence[] elements);
+    void onStringJoin(@Nullable String result, @Nonnull CharSequence delimiter, @Nonnull CharSequence[] elements);
 
-  void onStringToUpperCase(@Nonnull String self, @Nullable String result);
+    void onStringToUpperCase(@Nonnull String self, @Nullable String result);
 
-  void onStringTranslateEscapes(@Nonnull String self, @Nullable String result);
+    void onStringTranslateEscapes(@Nonnull String self, @Nullable String result);
 
-  void onStringToLowerCase(@Nonnull String self, @Nullable String result);
+    void onStringToLowerCase(@Nonnull String self, @Nullable String result);
 
-  void onStringTrim(@Nonnull String self, @Nullable String result);
+    void onStringTrim(@Nonnull String self, @Nullable String result);
 
-  void onStringRepeat(@Nonnull String self, int count, @Nonnull String result);
+    void onStringRepeat(@Nonnull String self, int count, @Nonnull String result);
 
-  void onStringConstructor(@Nonnull CharSequence self, @Nonnull String result);
+    void onStringConstructor(@Nonnull CharSequence self, @Nonnull String result);
 
-  void onStringFormat(@Nonnull String pattern, @Nonnull Object[] params, @Nonnull String result);
+    void onStringFormat(@Nonnull String pattern, @Nonnull Object[] params, @Nonnull String result);
 
-  void onStringFormat(
-      @Nullable Locale locale,
-      @Nonnull String pattern,
-      @Nonnull Object[] params,
-      @Nonnull String result);
+    void onStringFormat(
+            @Nullable Locale locale, @Nonnull String pattern, @Nonnull Object[] params, @Nonnull String result);
 
-  void onStringFormat(
-      @Nonnull Iterable<String> literals, @Nonnull Object[] params, @Nonnull String result);
+    void onStringFormat(@Nonnull Iterable<String> literals, @Nonnull Object[] params, @Nonnull String result);
 
-  void onSplit(final @Nonnull String self, final @Nonnull String[] result);
+    void onSplit(final @Nonnull String self, final @Nonnull String[] result);
 
-  void onStringStrip(@Nonnull String self, @Nonnull String result, boolean trailing);
+    void onStringStrip(@Nonnull String self, @Nonnull String result, boolean trailing);
 
-  void onIndent(@Nonnull String self, int indentation, @Nonnull String result);
+    void onIndent(@Nonnull String self, int indentation, @Nonnull String result);
 
-  void onStringReplace(@Nonnull String self, char oldChar, char newChar, @Nonnull String result);
+    void onStringReplace(@Nonnull String self, char oldChar, char newChar, @Nonnull String result);
 
-  String onStringReplace(@Nonnull String self, CharSequence oldCharSeq, CharSequence newCharSeq);
+    String onStringReplace(@Nonnull String self, CharSequence oldCharSeq, CharSequence newCharSeq);
 
-  String onStringReplace(
-      @Nonnull String self, String regex, String replacement, int numReplacements);
+    String onStringReplace(@Nonnull String self, String regex, String replacement, int numReplacements);
 
-  void onStringValueOf(Object param, @Nullable String result);
+    void onStringValueOf(Object param, @Nullable String result);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/secrets/HardcodedSecretMatcher.java b/internal-api/src/main/java/datadog/trace/api/iast/secrets/HardcodedSecretMatcher.java
index f90ffde5834..7123f4cb4c1 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/secrets/HardcodedSecretMatcher.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/secrets/HardcodedSecretMatcher.java
@@ -4,323 +4,246 @@
 
 public class HardcodedSecretMatcher {
 
-  public static final int MIN_SECRET_LENGTH = 10;
+    public static final int MIN_SECRET_LENGTH = 10;
 
-  public static final HardcodedSecretMatcher ADOBE_CLIENT_SECRET =
-      new HardcodedSecretMatcher(
-          "adobe-client-secret",
-          Pattern.compile("(?i)\\b((p8e-)(?i)[a-z0-9]{32})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher AGE_SECRET_KEY =
-      new HardcodedSecretMatcher(
-          "age-secret-key",
-          Pattern.compile("AGE-SECRET-KEY-1[QPZRY9X8GF2TVDW0S3JN54KHCE6MUA7L]{58}"));
-  public static final HardcodedSecretMatcher ALIBABA_ACCESS_KEY_ID =
-      new HardcodedSecretMatcher(
-          "alibaba-access-key-id",
-          Pattern.compile("(?i)\\b((LTAI)(?i)[a-z0-9]{20})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher AUTHRESS_SERVICE_CLIENT_ACCESS_KEY =
-      new HardcodedSecretMatcher(
-          "authress-service-client-access-key",
-          Pattern.compile(
-              "(?i)\\b((?:sc|ext|scauth|authress)_[a-z0-9]{5,30}\\.[a-z0-9]{4,6}\\.acc[_-][a-z0-9-]{10,32}\\.[a-z0-9+/_=-]{30,120})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher AWS_ACCESS_TOKEN =
-      new HardcodedSecretMatcher(
-          "aws-access-token",
-          Pattern.compile(
-              "\\b((A3T[A-Z0-9]|AKIA|AGPA|AIDA|AROA|AIPA|ANPA|ANVA|ASIA)[A-Z0-9]{16})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher CLOJARS_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "clojars-api-token", Pattern.compile("(?i)(CLOJARS_)[a-z0-9]{60}"));
-  public static final HardcodedSecretMatcher DATABRICKS_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "databricks-api-token",
-          Pattern.compile("(?i)\\b(dapi[a-h0-9]{32})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher DIGITALOCEAN_ACCESS_TOKEN =
-      new HardcodedSecretMatcher(
-          "digitalocean-access-token",
-          Pattern.compile("(?i)\\b(doo_v1_[a-f0-9]{64})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher DIGITALOCEAN_PAT =
-      new HardcodedSecretMatcher(
-          "digitalocean-pat",
-          Pattern.compile("(?i)\\b(dop_v1_[a-f0-9]{64})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher DIGITALOCEAN_REFRESH_TOKEN =
-      new HardcodedSecretMatcher(
-          "digitalocean-refresh-token",
-          Pattern.compile("(?i)\\b(dor_v1_[a-f0-9]{64})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher DOPPLER_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "doppler-api-token", Pattern.compile("(dp\\.pt\\.)(?i)[a-z0-9]{43}"));
-  public static final HardcodedSecretMatcher DUFFEL_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "duffel-api-token", Pattern.compile("duffel_(test|live)_(?i)[a-z0-9_\\-=]{43}"));
-  public static final HardcodedSecretMatcher DYNATRACE_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "dynatrace-api-token", Pattern.compile("dt0c01\\.(?i)[a-z0-9]{24}\\.[a-z0-9]{64}"));
-  public static final HardcodedSecretMatcher EASYPOST_API_TOKEN =
-      new HardcodedSecretMatcher("easypost-api-token", Pattern.compile("\\bEZAK(?i)[a-z0-9]{54}"));
-  public static final HardcodedSecretMatcher FLUTTERWAVE_PUBLIC_KEY =
-      new HardcodedSecretMatcher(
-          "flutterwave-public-key", Pattern.compile("FLWPUBK_TEST-(?i)[a-h0-9]{32}-X"));
-  public static final HardcodedSecretMatcher FRAMEIO_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "frameio-api-token", Pattern.compile("fio-u-(?i)[a-z0-9\\-_=]{64}"));
-  public static final HardcodedSecretMatcher GCP_API_KEY =
-      new HardcodedSecretMatcher(
-          "gcp-api-key",
-          Pattern.compile("(?i)\\b(AIza[0-9A-Za-z\\-_]{35})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher GITHUB_APP_TOKEN =
-      new HardcodedSecretMatcher("github-app-token", Pattern.compile("(ghu|ghs)_[0-9a-zA-Z]{36}"));
-  public static final HardcodedSecretMatcher GITHUB_FINE_GRAINED_PAT =
-      new HardcodedSecretMatcher(
-          "github-fine-grained-pat", Pattern.compile("github_pat_[0-9a-zA-Z_]{82}"));
-  public static final HardcodedSecretMatcher GITHUB_OAUTH =
-      new HardcodedSecretMatcher("github-oauth", Pattern.compile("gho_[0-9a-zA-Z]{36}"));
-  public static final HardcodedSecretMatcher GITHUB_PAT =
-      new HardcodedSecretMatcher("github-pat", Pattern.compile("ghp_[0-9a-zA-Z]{36}"));
-  public static final HardcodedSecretMatcher GITLAB_PAT =
-      new HardcodedSecretMatcher("gitlab-pat", Pattern.compile("glpat-[0-9a-zA-Z\\-_]{20}"));
-  public static final HardcodedSecretMatcher GITLAB_PTT =
-      new HardcodedSecretMatcher("gitlab-ptt", Pattern.compile("glptt-[0-9a-f]{40}"));
-  public static final HardcodedSecretMatcher GITLAB_RRT =
-      new HardcodedSecretMatcher("gitlab-rrt", Pattern.compile("GR1348941[0-9a-zA-Z\\-_]{20}"));
-  public static final HardcodedSecretMatcher GRAFANA_API_KEY =
-      new HardcodedSecretMatcher(
-          "grafana-api-key",
-          Pattern.compile(
-              "(?i)\\b(eyJrIjoi[A-Za-z0-9]{70,400}={0,2})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher GRAFANA_CLOUD_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "grafana-cloud-api-token",
-          Pattern.compile(
-              "(?i)\\b(glc_[A-Za-z0-9+/]{32,400}={0,2})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher GRAFANA_SERVICE_ACCOUNT_TOKEN =
-      new HardcodedSecretMatcher(
-          "grafana-service-account-token",
-          Pattern.compile(
-              "(?i)\\b(glsa_[A-Za-z0-9]{32}_[A-Fa-f0-9]{8})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher HASHICORP_TF_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "hashicorp-tf-api-token",
-          Pattern.compile("(?i)[a-z0-9]{14}\\.atlasv1\\.[a-z0-9\\-_=]{60,70}"));
-  public static final HardcodedSecretMatcher JWT =
-      new HardcodedSecretMatcher(
-          "jwt",
-          Pattern.compile(
-              "\\b(ey[a-zA-Z0-9]{17,}\\.ey[a-zA-Z0-9\\/_-]{17,}\\.(?:[a-zA-Z0-9\\/_-]{10,}={0,2})?)(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher LINEAR_API_KEY =
-      new HardcodedSecretMatcher("linear-api-key", Pattern.compile("lin_api_(?i)[a-z0-9]{40}"));
-  public static final HardcodedSecretMatcher NPM_ACCESS_TOKEN =
-      new HardcodedSecretMatcher(
-          "npm-access-token",
-          Pattern.compile("(?i)\\b(npm_[a-z0-9]{36})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher OPENAI_API_KEY =
-      new HardcodedSecretMatcher(
-          "openai-api-key",
-          Pattern.compile(
-              "(?i)\\b(sk-[a-zA-Z0-9]{20}T3BlbkFJ[a-zA-Z0-9]{20})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher PLANETSCALE_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "planetscale-api-token",
-          Pattern.compile(
-              "(?i)\\b(pscale_tkn_(?i)[a-z0-9=\\-_\\.]{32,64})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher PLANETSCALE_OAUTH_TOKEN =
-      new HardcodedSecretMatcher(
-          "planetscale-oauth-token",
-          Pattern.compile(
-              "(?i)\\b(pscale_oauth_(?i)[a-z0-9=\\-_\\.]{32,64})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher PLANETSCALE_PASSWORD =
-      new HardcodedSecretMatcher(
-          "planetscale-password",
-          Pattern.compile(
-              "(?i)\\b(pscale_pw_(?i)[a-z0-9=\\-_\\.]{32,64})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher POSTMAN_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "postman-api-token",
-          Pattern.compile(
-              "(?i)\\b(PMAK-(?i)[a-f0-9]{24}\\-[a-f0-9]{34})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher PREFECT_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "prefect-api-token",
-          Pattern.compile("(?i)\\b(pnu_[a-z0-9]{36})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher PRIVATE_KEY =
-      new HardcodedSecretMatcher(
-          "private-key",
-          Pattern.compile(
-              "(?i)-----BEGIN[ A-Z0-9_-]{0,100}PRIVATE KEY( BLOCK)?-----[\\s\\S-]*KEY( BLOCK)?----"));
-  public static final HardcodedSecretMatcher PULUMI_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "pulumi-api-token",
-          Pattern.compile("(?i)\\b(pul-[a-f0-9]{40})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher PYPI_UPLOAD_TOKEN =
-      new HardcodedSecretMatcher(
-          "pypi-upload-token", Pattern.compile("pypi-AgEIcHlwaS5vcmc[A-Za-z0-9\\-_]{50,1000}"));
-  public static final HardcodedSecretMatcher README_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "readme-api-token",
-          Pattern.compile("(?i)\\b(rdme_[a-z0-9]{70})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher RUBYGEMS_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "rubygems-api-token",
-          Pattern.compile("(?i)\\b(rubygems_[a-f0-9]{48})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher SCALINGO_API_TOKEN =
-      new HardcodedSecretMatcher("scalingo-api-token", Pattern.compile("tk-us-[a-zA-Z0-9-_]{48}"));
-  public static final HardcodedSecretMatcher SENDGRID_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "sendgrid-api-token",
-          Pattern.compile(
-              "(?i)\\b(SG\\.(?i)[a-z0-9=_\\-\\.]{66})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher SENDINBLUE_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "sendinblue-api-token",
-          Pattern.compile(
-              "(?i)\\b(xkeysib-[a-f0-9]{64}\\-(?i)[a-z0-9]{16})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher SHIPPO_API_TOKEN =
-      new HardcodedSecretMatcher(
-          "shippo-api-token",
-          Pattern.compile(
-              "(?i)\\b(shippo_(live|test)_[a-f0-9]{40})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher SHOPIFY_ACCESS_TOKEN =
-      new HardcodedSecretMatcher("shopify-access-token", Pattern.compile("shpat_[a-fA-F0-9]{32}"));
-  public static final HardcodedSecretMatcher SHOPIFY_CUSTOM_ACCESS_TOKEN =
-      new HardcodedSecretMatcher(
-          "shopify-custom-access-token", Pattern.compile("shpca_[a-fA-F0-9]{32}"));
-  public static final HardcodedSecretMatcher SHOPIFY_PRIVATE_APP_ACCESS_TOKEN =
-      new HardcodedSecretMatcher(
-          "shopify-private-app-access-token", Pattern.compile("shppa_[a-fA-F0-9]{32}"));
-  public static final HardcodedSecretMatcher SHOPIFY_SHARED_SECRET =
-      new HardcodedSecretMatcher("shopify-shared-secret", Pattern.compile("shpss_[a-fA-F0-9]{32}"));
-  public static final HardcodedSecretMatcher SLACK_APP_TOKEN =
-      new HardcodedSecretMatcher(
-          "slack-app-token", Pattern.compile("(?i)(xapp-\\d-[A-Z0-9]+-\\d+-[a-z0-9]+)"));
-  public static final HardcodedSecretMatcher SLACK_BOT_TOKEN =
-      new HardcodedSecretMatcher(
-          "slack-bot-token", Pattern.compile("(xoxb-[0-9]{10,13}\\-[0-9]{10,13}[a-zA-Z0-9-]*)"));
-  public static final HardcodedSecretMatcher SLACK_CONFIG_ACCESS_TOKEN =
-      new HardcodedSecretMatcher(
-          "slack-config-access-token", Pattern.compile("(?i)(xoxe.xox[bp]-\\d-[A-Z0-9]{163,166})"));
-  public static final HardcodedSecretMatcher SLACK_CONFIG_REFRESH_TOKEN =
-      new HardcodedSecretMatcher(
-          "slack-config-refresh-token", Pattern.compile("(?i)(xoxe-\\d-[A-Z0-9]{146})"));
-  public static final HardcodedSecretMatcher SLACK_LEGACY_BOT_TOKEN =
-      new HardcodedSecretMatcher(
-          "slack-legacy-bot-token", Pattern.compile("(xoxb-[0-9]{8,14}\\-[a-zA-Z0-9]{18,26})"));
-  public static final HardcodedSecretMatcher SLACK_LEGACY_TOKEN =
-      new HardcodedSecretMatcher(
-          "slack-legacy-token", Pattern.compile("(xox[os]-\\d+-\\d+-\\d+-[a-fA-F\\d]+)"));
-  public static final HardcodedSecretMatcher SLACK_LEGACY_WORKSPACE_TOKEN =
-      new HardcodedSecretMatcher(
-          "slack-legacy-workspace-token", Pattern.compile("(xox[ar]-(?:\\d-)?[0-9a-zA-Z]{8,48})"));
-  public static final HardcodedSecretMatcher SLACK_USER_TOKEN =
-      new HardcodedSecretMatcher(
-          "slack-user-token", Pattern.compile("(xox[pe](?:-[0-9]{10,13}){3}-[a-zA-Z0-9-]{28,34})"));
-  public static final HardcodedSecretMatcher SLACK_WEBHOOK_URL =
-      new HardcodedSecretMatcher(
-          "slack-webhook-url",
-          Pattern.compile(
-              "(https?:\\/\\/)?hooks.slack.com\\/(services|workflows)\\/[A-Za-z0-9+\\/]{43,46}"));
-  public static final HardcodedSecretMatcher SQUARE_ACCESS_TOKEN =
-      new HardcodedSecretMatcher(
-          "square-access-token",
-          Pattern.compile("(?i)\\b(sq0atp-[0-9A-Za-z\\-_]{22})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher SQUARE_SECRET =
-      new HardcodedSecretMatcher(
-          "square-secret",
-          Pattern.compile("(?i)\\b(sq0csp-[0-9A-Za-z\\-_]{43})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher STRIPE_ACCESS_TOKEN =
-      new HardcodedSecretMatcher(
-          "stripe-access-token", Pattern.compile("(?i)(sk|pk)_(test|live)_[0-9a-z]{10,32}"));
-  public static final HardcodedSecretMatcher TWILIO_API_KEY =
-      new HardcodedSecretMatcher("twilio-api-key", Pattern.compile("SK[0-9a-fA-F]{32}"));
-  public static final HardcodedSecretMatcher VAULT_BATCH_TOKEN =
-      new HardcodedSecretMatcher(
-          "vault-batch-token",
-          Pattern.compile("(?i)\\b(hvb\\.[a-z0-9_-]{138,212})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
-  public static final HardcodedSecretMatcher VAULT_SERVICE_TOKEN =
-      new HardcodedSecretMatcher(
-          "vault-service-token",
-          Pattern.compile("(?i)\\b(hvs\\.[a-z0-9_-]{90,100})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher ADOBE_CLIENT_SECRET = new HardcodedSecretMatcher(
+            "adobe-client-secret",
+            Pattern.compile("(?i)\\b((p8e-)(?i)[a-z0-9]{32})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher AGE_SECRET_KEY = new HardcodedSecretMatcher(
+            "age-secret-key", Pattern.compile("AGE-SECRET-KEY-1[QPZRY9X8GF2TVDW0S3JN54KHCE6MUA7L]{58}"));
+    public static final HardcodedSecretMatcher ALIBABA_ACCESS_KEY_ID = new HardcodedSecretMatcher(
+            "alibaba-access-key-id",
+            Pattern.compile("(?i)\\b((LTAI)(?i)[a-z0-9]{20})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher AUTHRESS_SERVICE_CLIENT_ACCESS_KEY = new HardcodedSecretMatcher(
+            "authress-service-client-access-key",
+            Pattern.compile(
+                    "(?i)\\b((?:sc|ext|scauth|authress)_[a-z0-9]{5,30}\\.[a-z0-9]{4,6}\\.acc[_-][a-z0-9-]{10,32}\\.[a-z0-9+/_=-]{30,120})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher AWS_ACCESS_TOKEN = new HardcodedSecretMatcher(
+            "aws-access-token",
+            Pattern.compile(
+                    "\\b((A3T[A-Z0-9]|AKIA|AGPA|AIDA|AROA|AIPA|ANPA|ANVA|ASIA)[A-Z0-9]{16})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher CLOJARS_API_TOKEN =
+            new HardcodedSecretMatcher("clojars-api-token", Pattern.compile("(?i)(CLOJARS_)[a-z0-9]{60}"));
+    public static final HardcodedSecretMatcher DATABRICKS_API_TOKEN = new HardcodedSecretMatcher(
+            "databricks-api-token", Pattern.compile("(?i)\\b(dapi[a-h0-9]{32})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher DIGITALOCEAN_ACCESS_TOKEN = new HardcodedSecretMatcher(
+            "digitalocean-access-token",
+            Pattern.compile("(?i)\\b(doo_v1_[a-f0-9]{64})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher DIGITALOCEAN_PAT = new HardcodedSecretMatcher(
+            "digitalocean-pat", Pattern.compile("(?i)\\b(dop_v1_[a-f0-9]{64})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher DIGITALOCEAN_REFRESH_TOKEN = new HardcodedSecretMatcher(
+            "digitalocean-refresh-token",
+            Pattern.compile("(?i)\\b(dor_v1_[a-f0-9]{64})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher DOPPLER_API_TOKEN =
+            new HardcodedSecretMatcher("doppler-api-token", Pattern.compile("(dp\\.pt\\.)(?i)[a-z0-9]{43}"));
+    public static final HardcodedSecretMatcher DUFFEL_API_TOKEN =
+            new HardcodedSecretMatcher("duffel-api-token", Pattern.compile("duffel_(test|live)_(?i)[a-z0-9_\\-=]{43}"));
+    public static final HardcodedSecretMatcher DYNATRACE_API_TOKEN = new HardcodedSecretMatcher(
+            "dynatrace-api-token", Pattern.compile("dt0c01\\.(?i)[a-z0-9]{24}\\.[a-z0-9]{64}"));
+    public static final HardcodedSecretMatcher EASYPOST_API_TOKEN =
+            new HardcodedSecretMatcher("easypost-api-token", Pattern.compile("\\bEZAK(?i)[a-z0-9]{54}"));
+    public static final HardcodedSecretMatcher FLUTTERWAVE_PUBLIC_KEY =
+            new HardcodedSecretMatcher("flutterwave-public-key", Pattern.compile("FLWPUBK_TEST-(?i)[a-h0-9]{32}-X"));
+    public static final HardcodedSecretMatcher FRAMEIO_API_TOKEN =
+            new HardcodedSecretMatcher("frameio-api-token", Pattern.compile("fio-u-(?i)[a-z0-9\\-_=]{64}"));
+    public static final HardcodedSecretMatcher GCP_API_KEY = new HardcodedSecretMatcher(
+            "gcp-api-key", Pattern.compile("(?i)\\b(AIza[0-9A-Za-z\\-_]{35})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher GITHUB_APP_TOKEN =
+            new HardcodedSecretMatcher("github-app-token", Pattern.compile("(ghu|ghs)_[0-9a-zA-Z]{36}"));
+    public static final HardcodedSecretMatcher GITHUB_FINE_GRAINED_PAT =
+            new HardcodedSecretMatcher("github-fine-grained-pat", Pattern.compile("github_pat_[0-9a-zA-Z_]{82}"));
+    public static final HardcodedSecretMatcher GITHUB_OAUTH =
+            new HardcodedSecretMatcher("github-oauth", Pattern.compile("gho_[0-9a-zA-Z]{36}"));
+    public static final HardcodedSecretMatcher GITHUB_PAT =
+            new HardcodedSecretMatcher("github-pat", Pattern.compile("ghp_[0-9a-zA-Z]{36}"));
+    public static final HardcodedSecretMatcher GITLAB_PAT =
+            new HardcodedSecretMatcher("gitlab-pat", Pattern.compile("glpat-[0-9a-zA-Z\\-_]{20}"));
+    public static final HardcodedSecretMatcher GITLAB_PTT =
+            new HardcodedSecretMatcher("gitlab-ptt", Pattern.compile("glptt-[0-9a-f]{40}"));
+    public static final HardcodedSecretMatcher GITLAB_RRT =
+            new HardcodedSecretMatcher("gitlab-rrt", Pattern.compile("GR1348941[0-9a-zA-Z\\-_]{20}"));
+    public static final HardcodedSecretMatcher GRAFANA_API_KEY = new HardcodedSecretMatcher(
+            "grafana-api-key",
+            Pattern.compile("(?i)\\b(eyJrIjoi[A-Za-z0-9]{70,400}={0,2})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher GRAFANA_CLOUD_API_TOKEN = new HardcodedSecretMatcher(
+            "grafana-cloud-api-token",
+            Pattern.compile("(?i)\\b(glc_[A-Za-z0-9+/]{32,400}={0,2})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher GRAFANA_SERVICE_ACCOUNT_TOKEN = new HardcodedSecretMatcher(
+            "grafana-service-account-token",
+            Pattern.compile("(?i)\\b(glsa_[A-Za-z0-9]{32}_[A-Fa-f0-9]{8})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher HASHICORP_TF_API_TOKEN = new HardcodedSecretMatcher(
+            "hashicorp-tf-api-token", Pattern.compile("(?i)[a-z0-9]{14}\\.atlasv1\\.[a-z0-9\\-_=]{60,70}"));
+    public static final HardcodedSecretMatcher JWT = new HardcodedSecretMatcher(
+            "jwt",
+            Pattern.compile(
+                    "\\b(ey[a-zA-Z0-9]{17,}\\.ey[a-zA-Z0-9\\/_-]{17,}\\.(?:[a-zA-Z0-9\\/_-]{10,}={0,2})?)(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher LINEAR_API_KEY =
+            new HardcodedSecretMatcher("linear-api-key", Pattern.compile("lin_api_(?i)[a-z0-9]{40}"));
+    public static final HardcodedSecretMatcher NPM_ACCESS_TOKEN = new HardcodedSecretMatcher(
+            "npm-access-token", Pattern.compile("(?i)\\b(npm_[a-z0-9]{36})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher OPENAI_API_KEY = new HardcodedSecretMatcher(
+            "openai-api-key",
+            Pattern.compile("(?i)\\b(sk-[a-zA-Z0-9]{20}T3BlbkFJ[a-zA-Z0-9]{20})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher PLANETSCALE_API_TOKEN = new HardcodedSecretMatcher(
+            "planetscale-api-token",
+            Pattern.compile("(?i)\\b(pscale_tkn_(?i)[a-z0-9=\\-_\\.]{32,64})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher PLANETSCALE_OAUTH_TOKEN = new HardcodedSecretMatcher(
+            "planetscale-oauth-token",
+            Pattern.compile("(?i)\\b(pscale_oauth_(?i)[a-z0-9=\\-_\\.]{32,64})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher PLANETSCALE_PASSWORD = new HardcodedSecretMatcher(
+            "planetscale-password",
+            Pattern.compile("(?i)\\b(pscale_pw_(?i)[a-z0-9=\\-_\\.]{32,64})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher POSTMAN_API_TOKEN = new HardcodedSecretMatcher(
+            "postman-api-token",
+            Pattern.compile("(?i)\\b(PMAK-(?i)[a-f0-9]{24}\\-[a-f0-9]{34})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher PREFECT_API_TOKEN = new HardcodedSecretMatcher(
+            "prefect-api-token", Pattern.compile("(?i)\\b(pnu_[a-z0-9]{36})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher PRIVATE_KEY = new HardcodedSecretMatcher(
+            "private-key",
+            Pattern.compile("(?i)-----BEGIN[ A-Z0-9_-]{0,100}PRIVATE KEY( BLOCK)?-----[\\s\\S-]*KEY( BLOCK)?----"));
+    public static final HardcodedSecretMatcher PULUMI_API_TOKEN = new HardcodedSecretMatcher(
+            "pulumi-api-token", Pattern.compile("(?i)\\b(pul-[a-f0-9]{40})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher PYPI_UPLOAD_TOKEN = new HardcodedSecretMatcher(
+            "pypi-upload-token", Pattern.compile("pypi-AgEIcHlwaS5vcmc[A-Za-z0-9\\-_]{50,1000}"));
+    public static final HardcodedSecretMatcher README_API_TOKEN = new HardcodedSecretMatcher(
+            "readme-api-token", Pattern.compile("(?i)\\b(rdme_[a-z0-9]{70})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher RUBYGEMS_API_TOKEN = new HardcodedSecretMatcher(
+            "rubygems-api-token", Pattern.compile("(?i)\\b(rubygems_[a-f0-9]{48})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher SCALINGO_API_TOKEN =
+            new HardcodedSecretMatcher("scalingo-api-token", Pattern.compile("tk-us-[a-zA-Z0-9-_]{48}"));
+    public static final HardcodedSecretMatcher SENDGRID_API_TOKEN = new HardcodedSecretMatcher(
+            "sendgrid-api-token",
+            Pattern.compile("(?i)\\b(SG\\.(?i)[a-z0-9=_\\-\\.]{66})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher SENDINBLUE_API_TOKEN = new HardcodedSecretMatcher(
+            "sendinblue-api-token",
+            Pattern.compile("(?i)\\b(xkeysib-[a-f0-9]{64}\\-(?i)[a-z0-9]{16})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher SHIPPO_API_TOKEN = new HardcodedSecretMatcher(
+            "shippo-api-token",
+            Pattern.compile("(?i)\\b(shippo_(live|test)_[a-f0-9]{40})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher SHOPIFY_ACCESS_TOKEN =
+            new HardcodedSecretMatcher("shopify-access-token", Pattern.compile("shpat_[a-fA-F0-9]{32}"));
+    public static final HardcodedSecretMatcher SHOPIFY_CUSTOM_ACCESS_TOKEN =
+            new HardcodedSecretMatcher("shopify-custom-access-token", Pattern.compile("shpca_[a-fA-F0-9]{32}"));
+    public static final HardcodedSecretMatcher SHOPIFY_PRIVATE_APP_ACCESS_TOKEN =
+            new HardcodedSecretMatcher("shopify-private-app-access-token", Pattern.compile("shppa_[a-fA-F0-9]{32}"));
+    public static final HardcodedSecretMatcher SHOPIFY_SHARED_SECRET =
+            new HardcodedSecretMatcher("shopify-shared-secret", Pattern.compile("shpss_[a-fA-F0-9]{32}"));
+    public static final HardcodedSecretMatcher SLACK_APP_TOKEN =
+            new HardcodedSecretMatcher("slack-app-token", Pattern.compile("(?i)(xapp-\\d-[A-Z0-9]+-\\d+-[a-z0-9]+)"));
+    public static final HardcodedSecretMatcher SLACK_BOT_TOKEN = new HardcodedSecretMatcher(
+            "slack-bot-token", Pattern.compile("(xoxb-[0-9]{10,13}\\-[0-9]{10,13}[a-zA-Z0-9-]*)"));
+    public static final HardcodedSecretMatcher SLACK_CONFIG_ACCESS_TOKEN = new HardcodedSecretMatcher(
+            "slack-config-access-token", Pattern.compile("(?i)(xoxe.xox[bp]-\\d-[A-Z0-9]{163,166})"));
+    public static final HardcodedSecretMatcher SLACK_CONFIG_REFRESH_TOKEN =
+            new HardcodedSecretMatcher("slack-config-refresh-token", Pattern.compile("(?i)(xoxe-\\d-[A-Z0-9]{146})"));
+    public static final HardcodedSecretMatcher SLACK_LEGACY_BOT_TOKEN = new HardcodedSecretMatcher(
+            "slack-legacy-bot-token", Pattern.compile("(xoxb-[0-9]{8,14}\\-[a-zA-Z0-9]{18,26})"));
+    public static final HardcodedSecretMatcher SLACK_LEGACY_TOKEN =
+            new HardcodedSecretMatcher("slack-legacy-token", Pattern.compile("(xox[os]-\\d+-\\d+-\\d+-[a-fA-F\\d]+)"));
+    public static final HardcodedSecretMatcher SLACK_LEGACY_WORKSPACE_TOKEN = new HardcodedSecretMatcher(
+            "slack-legacy-workspace-token", Pattern.compile("(xox[ar]-(?:\\d-)?[0-9a-zA-Z]{8,48})"));
+    public static final HardcodedSecretMatcher SLACK_USER_TOKEN = new HardcodedSecretMatcher(
+            "slack-user-token", Pattern.compile("(xox[pe](?:-[0-9]{10,13}){3}-[a-zA-Z0-9-]{28,34})"));
+    public static final HardcodedSecretMatcher SLACK_WEBHOOK_URL = new HardcodedSecretMatcher(
+            "slack-webhook-url",
+            Pattern.compile("(https?:\\/\\/)?hooks.slack.com\\/(services|workflows)\\/[A-Za-z0-9+\\/]{43,46}"));
+    public static final HardcodedSecretMatcher SQUARE_ACCESS_TOKEN = new HardcodedSecretMatcher(
+            "square-access-token",
+            Pattern.compile("(?i)\\b(sq0atp-[0-9A-Za-z\\-_]{22})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher SQUARE_SECRET = new HardcodedSecretMatcher(
+            "square-secret", Pattern.compile("(?i)\\b(sq0csp-[0-9A-Za-z\\-_]{43})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher STRIPE_ACCESS_TOKEN = new HardcodedSecretMatcher(
+            "stripe-access-token", Pattern.compile("(?i)(sk|pk)_(test|live)_[0-9a-z]{10,32}"));
+    public static final HardcodedSecretMatcher TWILIO_API_KEY =
+            new HardcodedSecretMatcher("twilio-api-key", Pattern.compile("SK[0-9a-fA-F]{32}"));
+    public static final HardcodedSecretMatcher VAULT_BATCH_TOKEN = new HardcodedSecretMatcher(
+            "vault-batch-token",
+            Pattern.compile("(?i)\\b(hvb\\.[a-z0-9_-]{138,212})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
+    public static final HardcodedSecretMatcher VAULT_SERVICE_TOKEN = new HardcodedSecretMatcher(
+            "vault-service-token",
+            Pattern.compile("(?i)\\b(hvs\\.[a-z0-9_-]{90,100})(?:['|\"\"|\\n|\\r|\\s|\\x60|;]|$)"));
 
-  public static final HardcodedSecretMatcher[] HARDCODED_SECRET_MATCHERS = {
-    ADOBE_CLIENT_SECRET,
-    AGE_SECRET_KEY,
-    ALIBABA_ACCESS_KEY_ID,
-    AUTHRESS_SERVICE_CLIENT_ACCESS_KEY,
-    AWS_ACCESS_TOKEN,
-    CLOJARS_API_TOKEN,
-    DATABRICKS_API_TOKEN,
-    DIGITALOCEAN_ACCESS_TOKEN,
-    DIGITALOCEAN_PAT,
-    DIGITALOCEAN_REFRESH_TOKEN,
-    DOPPLER_API_TOKEN,
-    DUFFEL_API_TOKEN,
-    DYNATRACE_API_TOKEN,
-    EASYPOST_API_TOKEN,
-    FLUTTERWAVE_PUBLIC_KEY,
-    FRAMEIO_API_TOKEN,
-    GCP_API_KEY,
-    GITHUB_APP_TOKEN,
-    GITHUB_FINE_GRAINED_PAT,
-    GITHUB_OAUTH,
-    GITHUB_PAT,
-    GITLAB_PAT,
-    GITLAB_PTT,
-    GITLAB_RRT,
-    GRAFANA_API_KEY,
-    GRAFANA_CLOUD_API_TOKEN,
-    GRAFANA_SERVICE_ACCOUNT_TOKEN,
-    HASHICORP_TF_API_TOKEN,
-    JWT,
-    LINEAR_API_KEY,
-    NPM_ACCESS_TOKEN,
-    OPENAI_API_KEY,
-    PLANETSCALE_API_TOKEN,
-    PLANETSCALE_OAUTH_TOKEN,
-    PLANETSCALE_PASSWORD,
-    POSTMAN_API_TOKEN,
-    PREFECT_API_TOKEN,
-    PRIVATE_KEY,
-    PULUMI_API_TOKEN,
-    PYPI_UPLOAD_TOKEN,
-    README_API_TOKEN,
-    RUBYGEMS_API_TOKEN,
-    SCALINGO_API_TOKEN,
-    SENDGRID_API_TOKEN,
-    SENDINBLUE_API_TOKEN,
-    SHIPPO_API_TOKEN,
-    SHOPIFY_ACCESS_TOKEN,
-    SHOPIFY_CUSTOM_ACCESS_TOKEN,
-    SHOPIFY_PRIVATE_APP_ACCESS_TOKEN,
-    SHOPIFY_SHARED_SECRET,
-    SLACK_APP_TOKEN,
-    SLACK_BOT_TOKEN,
-    SLACK_CONFIG_ACCESS_TOKEN,
-    SLACK_CONFIG_REFRESH_TOKEN,
-    SLACK_LEGACY_BOT_TOKEN,
-    SLACK_LEGACY_TOKEN,
-    SLACK_LEGACY_WORKSPACE_TOKEN,
-    SLACK_USER_TOKEN,
-    SLACK_WEBHOOK_URL,
-    SQUARE_ACCESS_TOKEN,
-    SQUARE_SECRET,
-    STRIPE_ACCESS_TOKEN,
-    TWILIO_API_KEY,
-    VAULT_BATCH_TOKEN,
-    VAULT_SERVICE_TOKEN
-  };
-  private final String redactedEvidence;
+    public static final HardcodedSecretMatcher[] HARDCODED_SECRET_MATCHERS = {
+        ADOBE_CLIENT_SECRET,
+        AGE_SECRET_KEY,
+        ALIBABA_ACCESS_KEY_ID,
+        AUTHRESS_SERVICE_CLIENT_ACCESS_KEY,
+        AWS_ACCESS_TOKEN,
+        CLOJARS_API_TOKEN,
+        DATABRICKS_API_TOKEN,
+        DIGITALOCEAN_ACCESS_TOKEN,
+        DIGITALOCEAN_PAT,
+        DIGITALOCEAN_REFRESH_TOKEN,
+        DOPPLER_API_TOKEN,
+        DUFFEL_API_TOKEN,
+        DYNATRACE_API_TOKEN,
+        EASYPOST_API_TOKEN,
+        FLUTTERWAVE_PUBLIC_KEY,
+        FRAMEIO_API_TOKEN,
+        GCP_API_KEY,
+        GITHUB_APP_TOKEN,
+        GITHUB_FINE_GRAINED_PAT,
+        GITHUB_OAUTH,
+        GITHUB_PAT,
+        GITLAB_PAT,
+        GITLAB_PTT,
+        GITLAB_RRT,
+        GRAFANA_API_KEY,
+        GRAFANA_CLOUD_API_TOKEN,
+        GRAFANA_SERVICE_ACCOUNT_TOKEN,
+        HASHICORP_TF_API_TOKEN,
+        JWT,
+        LINEAR_API_KEY,
+        NPM_ACCESS_TOKEN,
+        OPENAI_API_KEY,
+        PLANETSCALE_API_TOKEN,
+        PLANETSCALE_OAUTH_TOKEN,
+        PLANETSCALE_PASSWORD,
+        POSTMAN_API_TOKEN,
+        PREFECT_API_TOKEN,
+        PRIVATE_KEY,
+        PULUMI_API_TOKEN,
+        PYPI_UPLOAD_TOKEN,
+        README_API_TOKEN,
+        RUBYGEMS_API_TOKEN,
+        SCALINGO_API_TOKEN,
+        SENDGRID_API_TOKEN,
+        SENDINBLUE_API_TOKEN,
+        SHIPPO_API_TOKEN,
+        SHOPIFY_ACCESS_TOKEN,
+        SHOPIFY_CUSTOM_ACCESS_TOKEN,
+        SHOPIFY_PRIVATE_APP_ACCESS_TOKEN,
+        SHOPIFY_SHARED_SECRET,
+        SLACK_APP_TOKEN,
+        SLACK_BOT_TOKEN,
+        SLACK_CONFIG_ACCESS_TOKEN,
+        SLACK_CONFIG_REFRESH_TOKEN,
+        SLACK_LEGACY_BOT_TOKEN,
+        SLACK_LEGACY_TOKEN,
+        SLACK_LEGACY_WORKSPACE_TOKEN,
+        SLACK_USER_TOKEN,
+        SLACK_WEBHOOK_URL,
+        SQUARE_ACCESS_TOKEN,
+        SQUARE_SECRET,
+        STRIPE_ACCESS_TOKEN,
+        TWILIO_API_KEY,
+        VAULT_BATCH_TOKEN,
+        VAULT_SERVICE_TOKEN
+    };
+    private final String redactedEvidence;
 
-  private final Pattern pattern;
+    private final Pattern pattern;
 
-  private HardcodedSecretMatcher(final String redactedEvidence, final Pattern pattern) {
-    this.redactedEvidence = redactedEvidence;
-    this.pattern = pattern;
-  }
+    private HardcodedSecretMatcher(final String redactedEvidence, final Pattern pattern) {
+        this.redactedEvidence = redactedEvidence;
+        this.pattern = pattern;
+    }
 
-  public String getRedactedEvidence() {
-    return redactedEvidence;
-  }
+    public String getRedactedEvidence() {
+        return redactedEvidence;
+    }
 
-  public boolean matches(final String value) {
-    return pattern.matcher(value).matches();
-  }
+    public boolean matches(final String value) {
+        return pattern.matcher(value).matches();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/securitycontrol/SecurityControl.java b/internal-api/src/main/java/datadog/trace/api/iast/securitycontrol/SecurityControl.java
index 5126d323811..67364cdf191 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/securitycontrol/SecurityControl.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/securitycontrol/SecurityControl.java
@@ -7,80 +7,85 @@
 
 public class SecurityControl {
 
-  @Nonnull private SecurityControlType type;
-
-  private int marks;
-
-  @Nonnull private String className;
-
-  @Nonnull private String method;
-
-  @Nullable private List<String> parameterTypes;
-
-  @Nullable private BitSet parametersToMark;
-
-  public SecurityControl(
-      @Nonnull SecurityControlType type,
-      int marks,
-      @Nonnull String className,
-      @Nonnull String method,
-      @Nullable List<String> parameterTypes,
-      @Nullable BitSet parametersToMark) {
-    this.type = type;
-    this.marks = marks;
-    this.className = className;
-    this.method = method;
-    this.parameterTypes = parameterTypes;
-    this.parametersToMark = parametersToMark;
-  }
-
-  @Nonnull
-  public SecurityControlType getType() {
-    return type;
-  }
-
-  @Nonnull
-  public int getMarks() {
-    return marks;
-  }
-
-  @Nonnull
-  public String getClassName() {
-    return className;
-  }
-
-  @Nonnull
-  public String getMethod() {
-    return method;
-  }
-
-  @Nullable
-  public List<String> getParameterTypes() {
-    return parameterTypes;
-  }
-
-  @Nullable
-  public BitSet getParametersToMark() {
-    return parametersToMark;
-  }
-
-  @Override
-  public String toString() {
-    return "SecurityControl{"
-        + "type="
-        + type
-        + ", marks="
-        + marks
-        + ", className='"
-        + className
-        + '\''
-        + ", method='"
-        + method
-        + '\''
-        + ", parameterTypes="
-        + parameterTypes
-        + ", parametersToMark="
-        + parametersToMark
-        + '}';
-  }
+    @Nonnull
+    private SecurityControlType type;
+
+    private int marks;
+
+    @Nonnull
+    private String className;
+
+    @Nonnull
+    private String method;
+
+    @Nullable
+    private List<String> parameterTypes;
+
+    @Nullable
+    private BitSet parametersToMark;
+
+    public SecurityControl(
+            @Nonnull SecurityControlType type,
+            int marks,
+            @Nonnull String className,
+            @Nonnull String method,
+            @Nullable List<String> parameterTypes,
+            @Nullable BitSet parametersToMark) {
+        this.type = type;
+        this.marks = marks;
+        this.className = className;
+        this.method = method;
+        this.parameterTypes = parameterTypes;
+        this.parametersToMark = parametersToMark;
+    }
+
+    @Nonnull
+    public SecurityControlType getType() {
+        return type;
+    }
+
+    @Nonnull
+    public int getMarks() {
+        return marks;
+    }
+
+    @Nonnull
+    public String getClassName() {
+        return className;
+    }
+
+    @Nonnull
+    public String getMethod() {
+        return method;
+    }
+
+    @Nullable
+    public List<String> getParameterTypes() {
+        return parameterTypes;
+    }
+
+    @Nullable
+    public BitSet getParametersToMark() {
+        return parametersToMark;
+    }
+
+    @Override
+    public String toString() {
+        return "SecurityControl{"
+                + "type="
+                + type
+                + ", marks="
+                + marks
+                + ", className='"
+                + className
+                + '\''
+                + ", method='"
+                + method
+                + '\''
+                + ", parameterTypes="
+                + parameterTypes
+                + ", parametersToMark="
+                + parametersToMark
+                + '}';
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/securitycontrol/SecurityControlFormatter.java b/internal-api/src/main/java/datadog/trace/api/iast/securitycontrol/SecurityControlFormatter.java
index 2d6894c5c8b..2b2d761d215 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/securitycontrol/SecurityControlFormatter.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/securitycontrol/SecurityControlFormatter.java
@@ -17,109 +17,107 @@
 @SuppressForbidden // Suppresses the warning for using split method
 public class SecurityControlFormatter {
 
-  private static final Logger log =
-      org.slf4j.LoggerFactory.getLogger(SecurityControlFormatter.class);
+    private static final Logger log = org.slf4j.LoggerFactory.getLogger(SecurityControlFormatter.class);
 
-  private static final String SECURITY_CONTROL_DELIMITER = ";";
-  private static final String SECURITY_CONTROL_FIELD_DELIMITER = ":";
-  private static final String SECURITY_CONTROL_ELEMENT_DELIMITER = ",";
+    private static final String SECURITY_CONTROL_DELIMITER = ";";
+    private static final String SECURITY_CONTROL_FIELD_DELIMITER = ":";
+    private static final String SECURITY_CONTROL_ELEMENT_DELIMITER = ",";
 
-  private static final String ALL = "*";
+    private static final String ALL = "*";
 
-  @Nullable
-  public static Map<String, List<SecurityControl>> format(
-      final @Nonnull String securityControlString) {
+    @Nullable
+    public static Map<String, List<SecurityControl>> format(final @Nonnull String securityControlString) {
 
-    if (securityControlString.isEmpty()) {
-      log.warn("Security control configuration is empty");
-      return null;
-    }
+        if (securityControlString.isEmpty()) {
+            log.warn("Security control configuration is empty");
+            return null;
+        }
 
-    String config = securityControlString.replaceAll("\\s+", "");
+        String config = securityControlString.replaceAll("\\s+", "");
 
-    String[] list = config.split(SECURITY_CONTROL_DELIMITER);
+        String[] list = config.split(SECURITY_CONTROL_DELIMITER);
 
-    Map<String, List<SecurityControl>> securityControls = new HashMap<>();
+        Map<String, List<SecurityControl>> securityControls = new HashMap<>();
 
-    for (String s : list) {
-      try {
-        SecurityControl securityControl = getSecurityControl(s);
-        if (securityControl != null) {
-          securityControls.putIfAbsent(securityControl.getClassName(), new ArrayList<>());
-          securityControls.get(securityControl.getClassName()).add(securityControl);
+        for (String s : list) {
+            try {
+                SecurityControl securityControl = getSecurityControl(s);
+                if (securityControl != null) {
+                    securityControls.putIfAbsent(securityControl.getClassName(), new ArrayList<>());
+                    securityControls.get(securityControl.getClassName()).add(securityControl);
+                }
+            } catch (Exception e) {
+                log.warn("Security control configuration is invalid: {}", s);
+            }
         }
-      } catch (Exception e) {
-        log.warn("Security control configuration is invalid: {}", s);
-      }
+        return securityControls.isEmpty() ? null : securityControls;
     }
-    return securityControls.isEmpty() ? null : securityControls;
-  }
 
-  private static SecurityControl getSecurityControl(@Nonnull final String config) {
-    if (config.isEmpty()) {
-      log.warn("Security control configuration is empty");
-      return null;
-    }
-    String[] split = config.split(SECURITY_CONTROL_FIELD_DELIMITER);
-    if (split.length < 4) {
-      log.warn("Security control configuration is invalid: {}", config);
-      return null;
-    }
-    SecurityControlType type = SecurityControlType.valueOf(split[0]);
-    if (type == null) {
-      log.warn("Security control type is invalid: {}", split[0]);
-      return null;
-    }
-    int marks = getMarks(split[1]);
-    String className = split[2].replaceAll("\\.", "/");
-    String method = split[3];
-
-    List<String> parameterTypes = null;
-    BitSet parametersToMark = null;
-
-    if (split.length > 4) {
-      String[] elements = split[4].split(SECURITY_CONTROL_ELEMENT_DELIMITER);
-      if (elements.length > 0) {
-        if (isNumeric(elements[0])) {
-          if (split.length != 5) {
+    private static SecurityControl getSecurityControl(@Nonnull final String config) {
+        if (config.isEmpty()) {
+            log.warn("Security control configuration is empty");
+            return null;
+        }
+        String[] split = config.split(SECURITY_CONTROL_FIELD_DELIMITER);
+        if (split.length < 4) {
             log.warn("Security control configuration is invalid: {}", config);
             return null;
-          }
-          parametersToMark = getParametersToMark(elements);
-        } else {
-          parameterTypes = Arrays.asList(elements);
         }
-      }
-    }
-    if (split.length > 5) {
-      String[] elements = split[5].split(SECURITY_CONTROL_ELEMENT_DELIMITER);
-      parametersToMark = getParametersToMark(elements);
+        SecurityControlType type = SecurityControlType.valueOf(split[0]);
+        if (type == null) {
+            log.warn("Security control type is invalid: {}", split[0]);
+            return null;
+        }
+        int marks = getMarks(split[1]);
+        String className = split[2].replaceAll("\\.", "/");
+        String method = split[3];
+
+        List<String> parameterTypes = null;
+        BitSet parametersToMark = null;
+
+        if (split.length > 4) {
+            String[] elements = split[4].split(SECURITY_CONTROL_ELEMENT_DELIMITER);
+            if (elements.length > 0) {
+                if (isNumeric(elements[0])) {
+                    if (split.length != 5) {
+                        log.warn("Security control configuration is invalid: {}", config);
+                        return null;
+                    }
+                    parametersToMark = getParametersToMark(elements);
+                } else {
+                    parameterTypes = Arrays.asList(elements);
+                }
+            }
+        }
+        if (split.length > 5) {
+            String[] elements = split[5].split(SECURITY_CONTROL_ELEMENT_DELIMITER);
+            parametersToMark = getParametersToMark(elements);
+        }
+
+        return new SecurityControl(type, marks, className, method, parameterTypes, parametersToMark);
     }
 
-    return new SecurityControl(type, marks, className, method, parameterTypes, parametersToMark);
-  }
+    private static int getMarks(String s) {
+        if (s.equals(ALL)) {
+            return VulnerabilityMarks.markForAll();
+        }
+        String[] elements = s.split(SECURITY_CONTROL_ELEMENT_DELIMITER);
+        int marks = CUSTOM_SECURITY_CONTROL_MARK;
+        for (String element : elements) {
+            marks |= VulnerabilityMarks.getMarkFromVulnerabitityType(element);
+        }
+        return marks;
+    }
 
-  private static int getMarks(String s) {
-    if (s.equals(ALL)) {
-      return VulnerabilityMarks.markForAll();
+    private static BitSet getParametersToMark(String[] elements) {
+        BitSet bitSet = new BitSet();
+        Arrays.stream(elements)
+                .map(Integer::parseInt) // Convert each element to an Integer
+                .forEach(bitSet::set);
+        return bitSet;
     }
-    String[] elements = s.split(SECURITY_CONTROL_ELEMENT_DELIMITER);
-    int marks = CUSTOM_SECURITY_CONTROL_MARK;
-    for (String element : elements) {
-      marks |= VulnerabilityMarks.getMarkFromVulnerabitityType(element);
+
+    private static boolean isNumeric(String str) {
+        return str.matches("[0-9]+");
     }
-    return marks;
-  }
-
-  private static BitSet getParametersToMark(String[] elements) {
-    BitSet bitSet = new BitSet();
-    Arrays.stream(elements)
-        .map(Integer::parseInt) // Convert each element to an Integer
-        .forEach(bitSet::set);
-    return bitSet;
-  }
-
-  private static boolean isNumeric(String str) {
-    return str.matches("[0-9]+");
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/securitycontrol/SecurityControlHelper.java b/internal-api/src/main/java/datadog/trace/api/iast/securitycontrol/SecurityControlHelper.java
index babf9b20edc..9f9e5a34ac2 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/securitycontrol/SecurityControlHelper.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/securitycontrol/SecurityControlHelper.java
@@ -5,15 +5,15 @@
 
 public class SecurityControlHelper {
 
-  public static void setSecureMarks(final Object target, int marks) {
+    public static void setSecureMarks(final Object target, int marks) {
 
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    try {
-      if (module != null) {
-        module.markIfTainted(target, marks);
-      }
-    } catch (final Throwable e) {
-      module.onUnexpectedException("setSecureMarks threw", e);
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        try {
+            if (module != null) {
+                module.markIfTainted(target, marks);
+            }
+        } catch (final Throwable e) {
+            module.onUnexpectedException("setSecureMarks threw", e);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/securitycontrol/SecurityControlType.java b/internal-api/src/main/java/datadog/trace/api/iast/securitycontrol/SecurityControlType.java
index f1b5b6a53da..23efe683c9e 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/securitycontrol/SecurityControlType.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/securitycontrol/SecurityControlType.java
@@ -1,6 +1,6 @@
 package datadog.trace.api.iast.securitycontrol;
 
 public enum SecurityControlType {
-  INPUT_VALIDATOR,
-  SANITIZER
+    INPUT_VALIDATOR,
+    SANITIZER
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/ApplicationModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/ApplicationModule.java
index 2282324cdc8..690f4801c92 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/ApplicationModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/ApplicationModule.java
@@ -9,7 +9,7 @@
 @OptOut
 public interface ApplicationModule extends IastModule {
 
-  void onRealPath(@Nullable String realPath);
+    void onRealPath(@Nullable String realPath);
 
-  void checkSessionTrackingModes(@Nonnull Set<String> sessionTrackingModes);
+    void checkSessionTrackingModes(@Nonnull Set<String> sessionTrackingModes);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/CodeInjectionModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/CodeInjectionModule.java
index dc0c8cf9a43..aabef12ec6f 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/CodeInjectionModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/CodeInjectionModule.java
@@ -6,7 +6,7 @@
 
 public interface CodeInjectionModule extends IastModule {
 
-  void onEval(@Nonnull Reader reader);
+    void onEval(@Nonnull Reader reader);
 
-  void onEval(@Nonnull String string);
+    void onEval(@Nonnull String string);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/CommandInjectionModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/CommandInjectionModule.java
index 01cde90b725..0fb84e425d1 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/CommandInjectionModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/CommandInjectionModule.java
@@ -7,9 +7,9 @@
 
 public interface CommandInjectionModule extends IastModule {
 
-  void onRuntimeExec(@Nonnull String... command);
+    void onRuntimeExec(@Nonnull String... command);
 
-  void onRuntimeExec(@Nullable String[] env, @Nonnull String... command);
+    void onRuntimeExec(@Nullable String[] env, @Nonnull String... command);
 
-  void onProcessBuilderStart(@Nonnull List<String> command);
+    void onProcessBuilderStart(@Nonnull List<String> command);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/EmailInjectionModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/EmailInjectionModule.java
index 53a81d507bd..95ec21da561 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/EmailInjectionModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/EmailInjectionModule.java
@@ -4,5 +4,5 @@
 import javax.annotation.Nullable;
 
 public interface EmailInjectionModule extends IastModule {
-  void onSendEmail(@Nullable Object message);
+    void onSendEmail(@Nullable Object message);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/HardcodedSecretModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/HardcodedSecretModule.java
index c85687eeb89..fb7ce86b91d 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/HardcodedSecretModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/HardcodedSecretModule.java
@@ -5,6 +5,5 @@
 
 public interface HardcodedSecretModule extends IastModule {
 
-  void onHardcodedSecret(
-      @Nonnull String value, @Nonnull String method, @Nonnull String clazz, int currentLine);
+    void onHardcodedSecret(@Nonnull String value, @Nonnull String method, @Nonnull String clazz, int currentLine);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/HeaderInjectionModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/HeaderInjectionModule.java
index 29d90b6853b..aad0acfb2ba 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/HeaderInjectionModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/HeaderInjectionModule.java
@@ -5,5 +5,5 @@
 
 public interface HeaderInjectionModule extends IastModule {
 
-  void onHeader(@Nonnull String name, String value);
+    void onHeader(@Nonnull String name, String value);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/HttpCookieModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/HttpCookieModule.java
index 8cdac6df5d2..7517e876654 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/HttpCookieModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/HttpCookieModule.java
@@ -6,7 +6,7 @@
 
 public interface HttpCookieModule<T> extends IastModule {
 
-  boolean isVulnerable(@Nonnull final Cookie cookie);
+    boolean isVulnerable(@Nonnull final Cookie cookie);
 
-  T getType();
+    T getType();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/HttpRequestEndModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/HttpRequestEndModule.java
index 312d4eb985c..22d959a57cd 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/HttpRequestEndModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/HttpRequestEndModule.java
@@ -8,26 +8,26 @@
 
 public interface HttpRequestEndModule extends IastModule {
 
-  void onRequestEnd(IastContext ctx, IGSpanInfo span);
+    void onRequestEnd(IastContext ctx, IGSpanInfo span);
 
-  default boolean isHtmlResponse(final String value) {
-    if (value == null) {
-      return false;
+    default boolean isHtmlResponse(final String value) {
+        if (value == null) {
+            return false;
+        }
+        final String contentType = value.toLowerCase(Locale.ROOT);
+        return contentType.contains("text/html") || contentType.contains("application/xhtml+xml");
     }
-    final String contentType = value.toLowerCase(Locale.ROOT);
-    return contentType.contains("text/html") || contentType.contains("application/xhtml+xml");
-  }
 
-  default boolean isIgnorableResponseCode(final Integer httpStatus) {
-    if (httpStatus == null) {
-      return false;
+    default boolean isIgnorableResponseCode(final Integer httpStatus) {
+        if (httpStatus == null) {
+            return false;
+        }
+        return httpStatus == HttpURLConnection.HTTP_MOVED_PERM
+                || httpStatus == HttpURLConnection.HTTP_MOVED_TEMP
+                || httpStatus == HttpURLConnection.HTTP_NOT_MODIFIED
+                || httpStatus == HttpURLConnection.HTTP_NOT_FOUND
+                || httpStatus == HttpURLConnection.HTTP_GONE
+                || httpStatus == HttpURLConnection.HTTP_INTERNAL_ERROR
+                || httpStatus == 307;
     }
-    return httpStatus == HttpURLConnection.HTTP_MOVED_PERM
-        || httpStatus == HttpURLConnection.HTTP_MOVED_TEMP
-        || httpStatus == HttpURLConnection.HTTP_NOT_MODIFIED
-        || httpStatus == HttpURLConnection.HTTP_NOT_FOUND
-        || httpStatus == HttpURLConnection.HTTP_GONE
-        || httpStatus == HttpURLConnection.HTTP_INTERNAL_ERROR
-        || httpStatus == 307;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/HttpResponseHeaderModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/HttpResponseHeaderModule.java
index 7d1faa6ce70..2b59f281566 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/HttpResponseHeaderModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/HttpResponseHeaderModule.java
@@ -8,7 +8,7 @@
 @OptOut
 public interface HttpResponseHeaderModule extends IastModule {
 
-  void onHeader(@Nonnull String name, String value);
+    void onHeader(@Nonnull String name, String value);
 
-  void onCookie(@Nonnull Cookie cookie);
+    void onCookie(@Nonnull Cookie cookie);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/LdapInjectionModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/LdapInjectionModule.java
index 7dc5c35eeb7..92bf85c1024 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/LdapInjectionModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/LdapInjectionModule.java
@@ -6,6 +6,5 @@
 
 public interface LdapInjectionModule extends IastModule {
 
-  void onDirContextSearch(
-      @Nullable String name, @Nonnull String filterExpr, @Nullable Object[] filterArgs);
+    void onDirContextSearch(@Nullable String name, @Nonnull String filterExpr, @Nullable Object[] filterArgs);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/PathTraversalModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/PathTraversalModule.java
index ba7c4e00252..22c0b66e6d4 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/PathTraversalModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/PathTraversalModule.java
@@ -8,13 +8,13 @@
 
 public interface PathTraversalModule extends IastModule {
 
-  void onPathTraversal(@Nonnull String path);
+    void onPathTraversal(@Nonnull String path);
 
-  void onPathTraversal(@Nullable String parent, @Nonnull String child);
+    void onPathTraversal(@Nullable String parent, @Nonnull String child);
 
-  void onPathTraversal(@Nonnull String first, @Nonnull String[] more);
+    void onPathTraversal(@Nonnull String first, @Nonnull String[] more);
 
-  void onPathTraversal(@Nonnull URI uri);
+    void onPathTraversal(@Nonnull URI uri);
 
-  void onPathTraversal(@Nullable File parent, @Nonnull String child);
+    void onPathTraversal(@Nullable File parent, @Nonnull String child);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/ReflectionInjectionModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/ReflectionInjectionModule.java
index 7b07d72af18..675cda28091 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/ReflectionInjectionModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/ReflectionInjectionModule.java
@@ -5,10 +5,9 @@
 import javax.annotation.Nullable;
 
 public interface ReflectionInjectionModule extends IastModule {
-  void onClassName(@Nullable String value);
+    void onClassName(@Nullable String value);
 
-  void onMethodName(
-      @Nonnull Class<?> clazz, @Nonnull String methodName, @Nullable Class<?>... parameterTypes);
+    void onMethodName(@Nonnull Class<?> clazz, @Nonnull String methodName, @Nullable Class<?>... parameterTypes);
 
-  void onFieldName(@Nonnull Class<?> clazz, @Nonnull String fieldName);
+    void onFieldName(@Nonnull Class<?> clazz, @Nonnull String fieldName);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/SqlInjectionModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/SqlInjectionModule.java
index ac9a5f5ddec..66907396ad8 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/SqlInjectionModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/SqlInjectionModule.java
@@ -5,9 +5,9 @@
 
 public interface SqlInjectionModule extends IastModule {
 
-  String DATABASE_PARAMETER = "DATABASE";
+    String DATABASE_PARAMETER = "DATABASE";
 
-  void onJdbcQuery(@Nullable String sql);
+    void onJdbcQuery(@Nullable String sql);
 
-  void onJdbcQuery(@Nullable String sql, @Nullable String database);
+    void onJdbcQuery(@Nullable String sql, @Nullable String database);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/SsrfModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/SsrfModule.java
index bd1bddac27c..b4a29db6d0f 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/SsrfModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/SsrfModule.java
@@ -5,5 +5,5 @@
 
 public interface SsrfModule extends IastModule {
 
-  void onURLConnection(@Nullable Object url);
+    void onURLConnection(@Nullable Object url);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/StacktraceLeakModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/StacktraceLeakModule.java
index 728c018a59e..7427fc19bd4 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/StacktraceLeakModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/StacktraceLeakModule.java
@@ -7,6 +7,5 @@
 @OptOut
 public interface StacktraceLeakModule extends IastModule {
 
-  void onStacktraceLeak(
-      @Nullable final Throwable expression, String moduleName, String className, String methodName);
+    void onStacktraceLeak(@Nullable final Throwable expression, String moduleName, String className, String methodName);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/TrustBoundaryViolationModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/TrustBoundaryViolationModule.java
index bf94320aed3..8a14faec64a 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/TrustBoundaryViolationModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/TrustBoundaryViolationModule.java
@@ -5,5 +5,5 @@
 
 public interface TrustBoundaryViolationModule extends IastModule {
 
-  void onSessionValue(@Nonnull String name, Object value);
+    void onSessionValue(@Nonnull String name, Object value);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/UntrustedDeserializationModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/UntrustedDeserializationModule.java
index 932ff1ebab3..5d52e9c4b41 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/UntrustedDeserializationModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/UntrustedDeserializationModule.java
@@ -5,5 +5,5 @@
 
 public interface UntrustedDeserializationModule extends IastModule {
 
-  void onObject(@Nullable Object object);
+    void onObject(@Nullable Object object);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/UnvalidatedRedirectModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/UnvalidatedRedirectModule.java
index fb80ced27ec..d2d2bf72913 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/UnvalidatedRedirectModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/UnvalidatedRedirectModule.java
@@ -7,11 +7,11 @@
 
 public interface UnvalidatedRedirectModule extends IastModule {
 
-  void onRedirect(@Nullable String value);
+    void onRedirect(@Nullable String value);
 
-  void onRedirect(@Nonnull String value, @Nonnull String clazz, @Nonnull String method);
+    void onRedirect(@Nonnull String value, @Nonnull String clazz, @Nonnull String method);
 
-  void onURIRedirect(@Nullable URI value);
+    void onURIRedirect(@Nullable URI value);
 
-  void onHeader(@Nonnull String name, String value);
+    void onHeader(@Nonnull String name, String value);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/WeakCipherModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/WeakCipherModule.java
index f2aded1a701..a491b8164af 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/WeakCipherModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/WeakCipherModule.java
@@ -5,5 +5,5 @@
 
 public interface WeakCipherModule extends IastModule {
 
-  void onCipherAlgorithm(@Nonnull String algorithm);
+    void onCipherAlgorithm(@Nonnull String algorithm);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/WeakHashModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/WeakHashModule.java
index 612c605c58a..3d95ca009af 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/WeakHashModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/WeakHashModule.java
@@ -5,5 +5,5 @@
 
 public interface WeakHashModule extends IastModule {
 
-  void onHashingAlgorithm(@Nonnull String algorithm);
+    void onHashingAlgorithm(@Nonnull String algorithm);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/WeakRandomnessModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/WeakRandomnessModule.java
index 90c2f505dae..3a3959c7f5f 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/WeakRandomnessModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/WeakRandomnessModule.java
@@ -5,5 +5,5 @@
 
 public interface WeakRandomnessModule extends IastModule {
 
-  void onWeakRandom(@Nonnull final Class<?> instance);
+    void onWeakRandom(@Nonnull final Class<?> instance);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/XPathInjectionModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/XPathInjectionModule.java
index b0dd8b626d2..0a30b0acfb6 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/XPathInjectionModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/XPathInjectionModule.java
@@ -4,5 +4,5 @@
 import javax.annotation.Nullable;
 
 public interface XPathInjectionModule extends IastModule {
-  void onExpression(@Nullable final String expression);
+    void onExpression(@Nullable final String expression);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/sink/XssModule.java b/internal-api/src/main/java/datadog/trace/api/iast/sink/XssModule.java
index fd2904b39d3..baeaa01eef5 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/sink/XssModule.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/sink/XssModule.java
@@ -6,13 +6,13 @@
 
 public interface XssModule extends IastModule {
 
-  void onXss(@Nonnull String s);
+    void onXss(@Nonnull String s);
 
-  void onXss(@Nonnull String s, @Nonnull String clazz, @Nonnull String method);
+    void onXss(@Nonnull String s, @Nonnull String clazz, @Nonnull String method);
 
-  void onXss(@Nonnull char[] array);
+    void onXss(@Nonnull char[] array);
 
-  void onXss(@Nonnull String format, @Nullable Object[] args);
+    void onXss(@Nonnull String format, @Nullable Object[] args);
 
-  void onXss(@Nonnull CharSequence s, @Nullable String file, int line);
+    void onXss(@Nonnull CharSequence s, @Nullable String file, int line);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/stratum/SourceMapper.java b/internal-api/src/main/java/datadog/trace/api/iast/stratum/SourceMapper.java
index f72ac131f3d..39fa90bf4a9 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/stratum/SourceMapper.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/stratum/SourceMapper.java
@@ -4,5 +4,5 @@
 
 public interface SourceMapper {
 
-  Pair<String, Integer> getFileAndLine(String className, int lineNumber);
+    Pair<String, Integer> getFileAndLine(String className, int lineNumber);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/telemetry/IastMetric.java b/internal-api/src/main/java/datadog/trace/api/iast/telemetry/IastMetric.java
index 736ed126146..8cdb0491532 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/telemetry/IastMetric.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/telemetry/IastMetric.java
@@ -7,205 +7,190 @@
 import javax.annotation.Nullable;
 
 public enum IastMetric {
-  INSTRUMENTED_PROPAGATION("instrumented.propagation", true, Scope.GLOBAL, Verbosity.MANDATORY),
-  INSTRUMENTED_SOURCE(
-      "instrumented.source", true, Scope.GLOBAL, Tag.SOURCE_TYPE, Verbosity.MANDATORY),
-  INSTRUMENTED_SINK(
-      "instrumented.sink", true, Scope.GLOBAL, Tag.VULNERABILITY_TYPE, Verbosity.MANDATORY),
-  EXECUTED_PROPAGATION("executed.propagation", true, Scope.REQUEST, Verbosity.DEBUG),
-  EXECUTED_SOURCE("executed.source", true, Scope.REQUEST, Tag.SOURCE_TYPE, Verbosity.INFORMATION),
-  EXECUTED_SINK(
-      "executed.sink", true, Scope.REQUEST, Tag.VULNERABILITY_TYPE, Verbosity.INFORMATION),
-  EXECUTED_TAINTED("executed.tainted", true, Scope.REQUEST, Verbosity.DEBUG),
-  REQUEST_TAINTED("request.tainted", true, Scope.REQUEST, Verbosity.INFORMATION),
-  TAINTED_FLAT_MODE("tainted.flat.mode", false, Scope.GLOBAL, Verbosity.INFORMATION),
-  JSON_TAG_SIZE_EXCEED("json.tag.size.exceeded", true, Scope.GLOBAL, Verbosity.INFORMATION),
-  SOURCE_MAPPING_LIMIT_REACHED(
-      "source.mapping.limit.reached", true, Scope.GLOBAL, Verbosity.INFORMATION),
-  SUPPRESSED_VULNERABILITIES(
-      "suppressed.vulnerabilities",
-      true,
-      Scope.REQUEST,
-      Tag.VULNERABILITY_TYPE,
-      Verbosity.INFORMATION),
-  EXPERIMENTAL_PROPAGATION("experimental.propagation", false, Scope.GLOBAL, Verbosity.INFORMATION);
-
-  private static final int COUNT;
-
-  public static final String TRACE_METRIC_PREFIX = "_dd.iast.telemetry.";
-
-  static {
-    int count = 0;
-    for (final IastMetric metric : values()) {
-      metric.index = count;
-      if (metric.tag == null) {
-        count++;
-      } else {
-        count += metric.tag.count();
-      }
+    INSTRUMENTED_PROPAGATION("instrumented.propagation", true, Scope.GLOBAL, Verbosity.MANDATORY),
+    INSTRUMENTED_SOURCE("instrumented.source", true, Scope.GLOBAL, Tag.SOURCE_TYPE, Verbosity.MANDATORY),
+    INSTRUMENTED_SINK("instrumented.sink", true, Scope.GLOBAL, Tag.VULNERABILITY_TYPE, Verbosity.MANDATORY),
+    EXECUTED_PROPAGATION("executed.propagation", true, Scope.REQUEST, Verbosity.DEBUG),
+    EXECUTED_SOURCE("executed.source", true, Scope.REQUEST, Tag.SOURCE_TYPE, Verbosity.INFORMATION),
+    EXECUTED_SINK("executed.sink", true, Scope.REQUEST, Tag.VULNERABILITY_TYPE, Verbosity.INFORMATION),
+    EXECUTED_TAINTED("executed.tainted", true, Scope.REQUEST, Verbosity.DEBUG),
+    REQUEST_TAINTED("request.tainted", true, Scope.REQUEST, Verbosity.INFORMATION),
+    TAINTED_FLAT_MODE("tainted.flat.mode", false, Scope.GLOBAL, Verbosity.INFORMATION),
+    JSON_TAG_SIZE_EXCEED("json.tag.size.exceeded", true, Scope.GLOBAL, Verbosity.INFORMATION),
+    SOURCE_MAPPING_LIMIT_REACHED("source.mapping.limit.reached", true, Scope.GLOBAL, Verbosity.INFORMATION),
+    SUPPRESSED_VULNERABILITIES(
+            "suppressed.vulnerabilities", true, Scope.REQUEST, Tag.VULNERABILITY_TYPE, Verbosity.INFORMATION),
+    EXPERIMENTAL_PROPAGATION("experimental.propagation", false, Scope.GLOBAL, Verbosity.INFORMATION);
+
+    private static final int COUNT;
+
+    public static final String TRACE_METRIC_PREFIX = "_dd.iast.telemetry.";
+
+    static {
+        int count = 0;
+        for (final IastMetric metric : values()) {
+            metric.index = count;
+            if (metric.tag == null) {
+                count++;
+            } else {
+                count += metric.tag.count();
+            }
+        }
+        COUNT = count;
     }
-    COUNT = count;
-  }
-
-  public static int count() {
-    return COUNT;
-  }
-
-  private final String name;
-  private final boolean common;
-  private final Scope scope;
-  private final Tag tag;
-  private final Verbosity verbosity;
-  private int index;
-  private final String[] spanTags;
-
-  IastMetric(
-      final String name, final boolean common, final Scope scope, final Verbosity verbosity) {
-    this(name, common, scope, null, verbosity);
-  }
-
-  IastMetric(
-      final String name,
-      final boolean common,
-      final Scope scope,
-      final Tag tag,
-      final Verbosity verbosity) {
-    this.name = name;
-    this.common = common;
-    this.scope = scope;
-    this.tag = tag;
-    this.verbosity = verbosity;
-    spanTags = computeSpanTags(name, tag);
-  }
-
-  private String[] computeSpanTags(final String name, final Tag tag) {
-    final String[] result = new String[tag == null ? 1 : tag.count()];
-    if (tag == null) {
-      result[0] = TRACE_METRIC_PREFIX + name;
-    } else {
-      for (int i = 0; i < result.length; i++) {
-        final String spanTagValue = tag.values[i].toLowerCase(Locale.ROOT).replace('.', '_');
-        result[i] = TRACE_METRIC_PREFIX + name + '.' + spanTagValue;
-      }
-    }
-    return result;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public boolean isCommon() {
-    return common;
-  }
-
-  public Scope getScope() {
-    return scope;
-  }
-
-  public boolean isEnabled(@Nonnull final Verbosity verbosity) {
-    return verbosity.isEnabled(this.verbosity);
-  }
-
-  public Tag getTag() {
-    return tag;
-  }
-
-  /**
-   * Returns the index for the particular tag to be used in the {@link
-   * java.util.concurrent.atomic.AtomicLongArray} of {@link IastMetricCollector}
-   */
-  public int getIndex(final byte tagValue) {
-    if (tag == null) {
-      return index;
+
+    public static int count() {
+        return COUNT;
     }
-    if (tagValue < 0) {
-      return -1;
+
+    private final String name;
+    private final boolean common;
+    private final Scope scope;
+    private final Tag tag;
+    private final Verbosity verbosity;
+    private int index;
+    private final String[] spanTags;
+
+    IastMetric(final String name, final boolean common, final Scope scope, final Verbosity verbosity) {
+        this(name, common, scope, null, verbosity);
     }
-    return index + tagValue;
-  }
 
-  /** Gets the full value of the tag for the telemetry intake (name : value). */
-  public String getTelemetryTag(final byte tagValue) {
-    if (tag == null) {
-      return null;
+    IastMetric(final String name, final boolean common, final Scope scope, final Tag tag, final Verbosity verbosity) {
+        this.name = name;
+        this.common = common;
+        this.scope = scope;
+        this.tag = tag;
+        this.verbosity = verbosity;
+        spanTags = computeSpanTags(name, tag);
     }
-    return tag.getTelemetryTag(tagValue);
-  }
 
-  /** Gets the key of the tag to be used in spans */
-  public String getSpanTag(final byte tagValue) {
-    if (tag == null) {
-      return spanTags[0];
+    private String[] computeSpanTags(final String name, final Tag tag) {
+        final String[] result = new String[tag == null ? 1 : tag.count()];
+        if (tag == null) {
+            result[0] = TRACE_METRIC_PREFIX + name;
+        } else {
+            for (int i = 0; i < result.length; i++) {
+                final String spanTagValue =
+                        tag.values[i].toLowerCase(Locale.ROOT).replace('.', '_');
+                result[i] = TRACE_METRIC_PREFIX + name + '.' + spanTagValue;
+            }
+        }
+        return result;
     }
-    return spanTags[tagValue];
-  }
-
-  public abstract static class Tag {
-
-    public static final Tag VULNERABILITY_TYPE =
-        new Tag("vulnerability_type", VulnerabilityTypes.STRINGS) {
-          @Nullable
-          @Override
-          public byte[] unwrap(byte tagValue) {
-            return VulnerabilityTypes.unwrap(tagValue);
-          }
-        };
 
-    public static final Tag SOURCE_TYPE =
-        new Tag("source_type", SourceTypes.STRINGS) {
+    public String getName() {
+        return name;
+    }
 
-          @Nullable
-          @Override
-          public byte[] unwrap(byte tagValue) {
-            return SourceTypes.unwrap(tagValue);
-          }
-        };
+    public boolean isCommon() {
+        return common;
+    }
 
-    protected final String name;
+    public Scope getScope() {
+        return scope;
+    }
 
-    protected final String[] values;
+    public boolean isEnabled(@Nonnull final Verbosity verbosity) {
+        return verbosity.isEnabled(this.verbosity);
+    }
 
-    protected final String[] telemetryTags;
+    public Tag getTag() {
+        return tag;
+    }
 
-    private Tag(final String name, final String[] values) {
-      this.name = name;
-      this.values = values;
-      telemetryTags = new String[values.length];
-      for (int i = 0; i < values.length; i++) {
-        telemetryTags[i] = name + ":" + values[i];
-      }
+    /**
+     * Returns the index for the particular tag to be used in the {@link
+     * java.util.concurrent.atomic.AtomicLongArray} of {@link IastMetricCollector}
+     */
+    public int getIndex(final byte tagValue) {
+        if (tag == null) {
+            return index;
+        }
+        if (tagValue < 0) {
+            return -1;
+        }
+        return index + tagValue;
     }
 
-    public String getName() {
-      return name;
+    /** Gets the full value of the tag for the telemetry intake (name : value). */
+    public String getTelemetryTag(final byte tagValue) {
+        if (tag == null) {
+            return null;
+        }
+        return tag.getTelemetryTag(tagValue);
     }
 
-    public int count() {
-      return values.length;
+    /** Gets the key of the tag to be used in spans */
+    public String getSpanTag(final byte tagValue) {
+        if (tag == null) {
+            return spanTags[0];
+        }
+        return spanTags[tagValue];
     }
 
-    @Nullable
-    public abstract byte[] unwrap(final byte tagValue);
+    public abstract static class Tag {
 
-    public String getTelemetryTag(final byte tagValue) {
-      return telemetryTags[tagValue];
-    }
-  }
+        public static final Tag VULNERABILITY_TYPE = new Tag("vulnerability_type", VulnerabilityTypes.STRINGS) {
+            @Nullable
+            @Override
+            public byte[] unwrap(byte tagValue) {
+                return VulnerabilityTypes.unwrap(tagValue);
+            }
+        };
 
-  public static final class Scope {
+        public static final Tag SOURCE_TYPE = new Tag("source_type", SourceTypes.STRINGS) {
 
-    public static final Scope GLOBAL = new Scope("global");
-    public static final Scope REQUEST = new Scope("request");
+            @Nullable
+            @Override
+            public byte[] unwrap(byte tagValue) {
+                return SourceTypes.unwrap(tagValue);
+            }
+        };
 
-    private final String name;
+        protected final String name;
+
+        protected final String[] values;
+
+        protected final String[] telemetryTags;
+
+        private Tag(final String name, final String[] values) {
+            this.name = name;
+            this.values = values;
+            telemetryTags = new String[values.length];
+            for (int i = 0; i < values.length; i++) {
+                telemetryTags[i] = name + ":" + values[i];
+            }
+        }
+
+        public String getName() {
+            return name;
+        }
 
-    private Scope(final String name) {
-      this.name = name;
+        public int count() {
+            return values.length;
+        }
+
+        @Nullable
+        public abstract byte[] unwrap(final byte tagValue);
+
+        public String getTelemetryTag(final byte tagValue) {
+            return telemetryTags[tagValue];
+        }
     }
 
-    public String getName() {
-      return name;
+    public static final class Scope {
+
+        public static final Scope GLOBAL = new Scope("global");
+        public static final Scope REQUEST = new Scope("request");
+
+        private final String name;
+
+        private Scope(final String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/telemetry/IastMetricCollector.java b/internal-api/src/main/java/datadog/trace/api/iast/telemetry/IastMetricCollector.java
index fd0b0b3f63d..136c02f9efc 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/telemetry/IastMetricCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/telemetry/IastMetricCollector.java
@@ -24,203 +24,192 @@
 @SuppressWarnings("resource")
 public class IastMetricCollector implements MetricCollector<IastMetricCollector.IastMetricData> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(IastMetricCollector.class);
-
-  private static final String NAMESPACE = "iast";
-
-  private static final Verbosity VERBOSITY = Config.get().getIastTelemetryVerbosity();
-
-  private static IastMetricCollector INSTANCE = new NoOpInstance();
-
-  public static void register(final IastMetricCollector collector) {
-    INSTANCE = collector;
-  }
-
-  public static IastMetricCollector get() {
-    return INSTANCE;
-  }
-
-  private static IastMetricCollector get(@Nullable Object ctx) {
-    if (VERBOSITY == Verbosity.OFF) {
-      return INSTANCE;
-    }
-    if (ctx == null) {
-      ctx = activeRequestContext();
-    }
-    if (ctx instanceof RequestContext) {
-      ctx = ((RequestContext) ctx).getData(RequestContextSlot.IAST);
-    }
-    if (ctx instanceof HasMetricCollector) {
-      final IastMetricCollector collector = ((HasMetricCollector) ctx).getMetricCollector();
-      if (collector != null) {
-        return collector;
-      }
-    }
-    // if no active request then forward to the global collector
-    return INSTANCE;
-  }
-
-  private final BlockingQueue<IastMetricData> rawMetricsQueue;
-
-  private final AtomicLongArray counters;
-
-  public IastMetricCollector() {
-    this(new ArrayBlockingQueue<>(RAW_QUEUE_SIZE), new AtomicLongArray(IastMetric.count()));
-  }
-
-  protected IastMetricCollector(
-      final BlockingQueue<IastMetricData> rawMetricsQueue, final AtomicLongArray counters) {
-    this.rawMetricsQueue = rawMetricsQueue;
-    this.counters = counters;
-  }
-
-  /** Prefer using {@link #add(IastMetric, int, Object)} if possible */
-  public static void add(@Nonnull final IastMetric metric, final int value) {
-    add(metric, value, null);
-  }
-
-  public static void add(
-      @Nonnull final IastMetric metric, final int value, @Nullable final Object ctx) {
-    add(metric, (byte) -1, value, ctx);
-  }
-
-  /** Prefer using {@link #add(IastMetric, byte, int, Object)} if possible */
-  public static void add(@Nonnull final IastMetric metric, final byte tagValue, final int value) {
-    add(metric, tagValue, value, null);
-  }
-
-  public static void add(
-      @Nonnull final IastMetric metric,
-      final byte tagValue,
-      final int value,
-      @Nullable final Object ctx) {
-    try {
-      final IastMetricCollector instance = metric.getScope() == REQUEST ? get(ctx) : INSTANCE;
-      instance.addMetric(metric, tagValue, value);
-    } catch (final Throwable e) {
-      LOGGER.warn("Failed to add metric {} with tag {}", metric, tagValue, e);
-    }
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(IastMetricCollector.class);
 
-  public void addMetric(final IastMetric metric, final byte tagValue, final int value) {
-    final int index = metric.getIndex(tagValue);
-    if (index >= 0) {
-      counters.getAndAdd(index, value);
-    } else if (tagValue < 0) {
-      final Tag tag = metric.getTag();
-      final byte[] unwrapped = tag == null ? null : tag.unwrap(tagValue);
-      if (unwrapped != null) {
-        for (byte unwrappedValue : unwrapped) {
-          final int unwrappedIndex = metric.getIndex(unwrappedValue);
-          if (unwrappedIndex >= 0) {
-            counters.getAndAdd(unwrappedIndex, value);
-          }
-        }
-      }
+    private static final String NAMESPACE = "iast";
+
+    private static final Verbosity VERBOSITY = Config.get().getIastTelemetryVerbosity();
+
+    private static IastMetricCollector INSTANCE = new NoOpInstance();
+
+    public static void register(final IastMetricCollector collector) {
+        INSTANCE = collector;
     }
-  }
 
-  public void merge(final Collection<IastMetricData> metrics) {
-    for (final IastMetricData data : metrics) {
-      final IastMetric metric = data.metric;
-      final byte tagValue = data.tagValue;
-      final long value = data.value.longValue();
-      counters.getAndAdd(metric.getIndex(tagValue), value);
+    public static IastMetricCollector get() {
+        return INSTANCE;
     }
-  }
 
-  @Override
-  public void prepareMetrics() {
-    for (final IastMetric metric : IastMetric.values()) {
-      if (metric.getTag() == null) {
-        prepareMetric(metric, (byte) -1);
-      } else {
-        final int tagCount = metric.getTag().count();
-        for (byte i = 0; i < tagCount; i++) {
-          prepareMetric(metric, i);
+    private static IastMetricCollector get(@Nullable Object ctx) {
+        if (VERBOSITY == Verbosity.OFF) {
+            return INSTANCE;
         }
-      }
-    }
-  }
-
-  private void prepareMetric(final IastMetric metric, final byte tagValue) {
-    final int index = metric.getIndex(tagValue);
-    final long value = counters.getAndSet(index, 0);
-    if (value > 0) {
-      rawMetricsQueue.offer(new IastMetricData(metric, tagValue, value));
-    }
-  }
-
-  @Override
-  public Collection<IastMetricData> drain() {
-    if (!rawMetricsQueue.isEmpty()) {
-      final List<IastMetricData> list = new LinkedList<>();
-      final int drained = rawMetricsQueue.drainTo(list);
-      if (drained > 0) {
-        return list;
-      }
+        if (ctx == null) {
+            ctx = activeRequestContext();
+        }
+        if (ctx instanceof RequestContext) {
+            ctx = ((RequestContext) ctx).getData(RequestContextSlot.IAST);
+        }
+        if (ctx instanceof HasMetricCollector) {
+            final IastMetricCollector collector = ((HasMetricCollector) ctx).getMetricCollector();
+            if (collector != null) {
+                return collector;
+            }
+        }
+        // if no active request then forward to the global collector
+        return INSTANCE;
     }
-    return Collections.emptyList();
-  }
-
-  public static class IastMetricData extends MetricCollector.Metric {
-
-    private final IastMetric metric;
-    private final byte tagValue;
-
-    public IastMetricData(final IastMetric metric, final byte tagValue, final long value) {
-      super(
-          NAMESPACE,
-          metric.isCommon(),
-          metric.getName(),
-          "count",
-          value,
-          metric.getTelemetryTag(tagValue));
-      this.metric = metric;
-      this.tagValue = tagValue;
+
+    private final BlockingQueue<IastMetricData> rawMetricsQueue;
+
+    private final AtomicLongArray counters;
+
+    public IastMetricCollector() {
+        this(new ArrayBlockingQueue<>(RAW_QUEUE_SIZE), new AtomicLongArray(IastMetric.count()));
     }
-
-    public IastMetric getMetric() {
-      return metric;
+
+    protected IastMetricCollector(final BlockingQueue<IastMetricData> rawMetricsQueue, final AtomicLongArray counters) {
+        this.rawMetricsQueue = rawMetricsQueue;
+        this.counters = counters;
     }
 
-    public byte getTagValue() {
-      return tagValue;
+    /** Prefer using {@link #add(IastMetric, int, Object)} if possible */
+    public static void add(@Nonnull final IastMetric metric, final int value) {
+        add(metric, value, null);
     }
 
-    public String getSpanTag() {
-      return metric.getSpanTag(tagValue);
+    public static void add(@Nonnull final IastMetric metric, final int value, @Nullable final Object ctx) {
+        add(metric, (byte) -1, value, ctx);
     }
-  }
 
-  private static RequestContext activeRequestContext() {
-    final AgentSpan span = AgentTracer.activeSpan();
-    return span == null ? null : span.getRequestContext();
-  }
+    /** Prefer using {@link #add(IastMetric, byte, int, Object)} if possible */
+    public static void add(@Nonnull final IastMetric metric, final byte tagValue, final int value) {
+        add(metric, tagValue, value, null);
+    }
 
-  private static class NoOpInstance extends IastMetricCollector {
+    public static void add(
+            @Nonnull final IastMetric metric, final byte tagValue, final int value, @Nullable final Object ctx) {
+        try {
+            final IastMetricCollector instance = metric.getScope() == REQUEST ? get(ctx) : INSTANCE;
+            instance.addMetric(metric, tagValue, value);
+        } catch (final Throwable e) {
+            LOGGER.warn("Failed to add metric {} with tag {}", metric, tagValue, e);
+        }
+    }
 
-    public NoOpInstance() {
-      super(null, null);
+    public void addMetric(final IastMetric metric, final byte tagValue, final int value) {
+        final int index = metric.getIndex(tagValue);
+        if (index >= 0) {
+            counters.getAndAdd(index, value);
+        } else if (tagValue < 0) {
+            final Tag tag = metric.getTag();
+            final byte[] unwrapped = tag == null ? null : tag.unwrap(tagValue);
+            if (unwrapped != null) {
+                for (byte unwrappedValue : unwrapped) {
+                    final int unwrappedIndex = metric.getIndex(unwrappedValue);
+                    if (unwrappedIndex >= 0) {
+                        counters.getAndAdd(unwrappedIndex, value);
+                    }
+                }
+            }
+        }
     }
 
-    @Override
-    public void addMetric(final IastMetric metric, final byte tagValue, final int value) {}
+    public void merge(final Collection<IastMetricData> metrics) {
+        for (final IastMetricData data : metrics) {
+            final IastMetric metric = data.metric;
+            final byte tagValue = data.tagValue;
+            final long value = data.value.longValue();
+            counters.getAndAdd(metric.getIndex(tagValue), value);
+        }
+    }
 
     @Override
-    public void merge(final Collection<IastMetricData> metrics) {}
+    public void prepareMetrics() {
+        for (final IastMetric metric : IastMetric.values()) {
+            if (metric.getTag() == null) {
+                prepareMetric(metric, (byte) -1);
+            } else {
+                final int tagCount = metric.getTag().count();
+                for (byte i = 0; i < tagCount; i++) {
+                    prepareMetric(metric, i);
+                }
+            }
+        }
+    }
 
-    @Override
-    public void prepareMetrics() {}
+    private void prepareMetric(final IastMetric metric, final byte tagValue) {
+        final int index = metric.getIndex(tagValue);
+        final long value = counters.getAndSet(index, 0);
+        if (value > 0) {
+            rawMetricsQueue.offer(new IastMetricData(metric, tagValue, value));
+        }
+    }
 
     @Override
     public Collection<IastMetricData> drain() {
-      return Collections.emptyList();
+        if (!rawMetricsQueue.isEmpty()) {
+            final List<IastMetricData> list = new LinkedList<>();
+            final int drained = rawMetricsQueue.drainTo(list);
+            if (drained > 0) {
+                return list;
+            }
+        }
+        return Collections.emptyList();
+    }
+
+    public static class IastMetricData extends MetricCollector.Metric {
+
+        private final IastMetric metric;
+        private final byte tagValue;
+
+        public IastMetricData(final IastMetric metric, final byte tagValue, final long value) {
+            super(NAMESPACE, metric.isCommon(), metric.getName(), "count", value, metric.getTelemetryTag(tagValue));
+            this.metric = metric;
+            this.tagValue = tagValue;
+        }
+
+        public IastMetric getMetric() {
+            return metric;
+        }
+
+        public byte getTagValue() {
+            return tagValue;
+        }
+
+        public String getSpanTag() {
+            return metric.getSpanTag(tagValue);
+        }
     }
-  }
 
-  public interface HasMetricCollector {
+    private static RequestContext activeRequestContext() {
+        final AgentSpan span = AgentTracer.activeSpan();
+        return span == null ? null : span.getRequestContext();
+    }
+
+    private static class NoOpInstance extends IastMetricCollector {
+
+        public NoOpInstance() {
+            super(null, null);
+        }
+
+        @Override
+        public void addMetric(final IastMetric metric, final byte tagValue, final int value) {}
+
+        @Override
+        public void merge(final Collection<IastMetricData> metrics) {}
 
-    IastMetricCollector getMetricCollector();
-  }
+        @Override
+        public void prepareMetrics() {}
+
+        @Override
+        public Collection<IastMetricData> drain() {
+            return Collections.emptyList();
+        }
+    }
+
+    public interface HasMetricCollector {
+
+        IastMetricCollector getMetricCollector();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/telemetry/Verbosity.java b/internal-api/src/main/java/datadog/trace/api/iast/telemetry/Verbosity.java
index c6965aca24f..078b9e2f44c 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/telemetry/Verbosity.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/telemetry/Verbosity.java
@@ -1,24 +1,24 @@
 package datadog.trace.api.iast.telemetry;
 
 public enum Verbosity {
-  OFF,
-  MANDATORY,
-  INFORMATION,
-  DEBUG;
+    OFF,
+    MANDATORY,
+    INFORMATION,
+    DEBUG;
 
-  public boolean isEnabled(final Verbosity value) {
-    return value.ordinal() <= ordinal();
-  }
+    public boolean isEnabled(final Verbosity value) {
+        return value.ordinal() <= ordinal();
+    }
 
-  public boolean isDebugEnabled() {
-    return isEnabled(DEBUG);
-  }
+    public boolean isDebugEnabled() {
+        return isEnabled(DEBUG);
+    }
 
-  public boolean isInformationEnabled() {
-    return isEnabled(INFORMATION);
-  }
+    public boolean isInformationEnabled() {
+        return isEnabled(INFORMATION);
+    }
 
-  public boolean isMandatoryEnabled() {
-    return isEnabled(MANDATORY);
-  }
+    public boolean isMandatoryEnabled() {
+        return isEnabled(MANDATORY);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/util/Cookie.java b/internal-api/src/main/java/datadog/trace/api/iast/util/Cookie.java
index f112f9cee15..d3426f99c2b 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/util/Cookie.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/util/Cookie.java
@@ -2,112 +2,112 @@
 
 public class Cookie {
 
-  private final String cookieName;
-  private final String cookieValue;
-  private final boolean secure;
-  private final String sameSite;
-  private final boolean httpOnly;
-
-  private final Integer expiresYear;
-
-  private final Integer maxAge;
-
-  public Cookie(
-      final String cookieName,
-      final String cookieValue,
-      boolean secure,
-      boolean httpOnly,
-      String sameSite,
-      Integer expiresYear,
-      Integer maxAge) {
-    this.cookieName = cookieName;
-    this.cookieValue = cookieValue;
-    this.secure = secure;
-    this.sameSite = sameSite;
-    this.httpOnly = httpOnly;
-    this.expiresYear = expiresYear;
-    this.maxAge = maxAge;
-  }
-
-  public String getCookieName() {
-    return cookieName;
-  }
-
-  public String getCookieValue() {
-    return cookieValue;
-  }
-
-  public boolean isSecure() {
-    return secure;
-  }
-
-  public String getSameSite() {
-    return sameSite;
-  }
-
-  public boolean isHttpOnly() {
-    return httpOnly;
-  }
-
-  public Integer getExpiresYear() {
-    return expiresYear;
-  }
-
-  public Integer getMaxAge() {
-    return maxAge;
-  }
-
-  public static Builder named(final String name) {
-    return new Builder(name);
-  }
-
-  public static class Builder {
-    private final String name;
-    private String value;
-    private boolean secure = false;
-    private boolean httpOnly = false;
-    private String sameSite = null;
-
-    private Integer expiresYear = null;
-
-    private Integer maxAge = null;
-
-    public Builder(final String name) {
-      this.name = name;
+    private final String cookieName;
+    private final String cookieValue;
+    private final boolean secure;
+    private final String sameSite;
+    private final boolean httpOnly;
+
+    private final Integer expiresYear;
+
+    private final Integer maxAge;
+
+    public Cookie(
+            final String cookieName,
+            final String cookieValue,
+            boolean secure,
+            boolean httpOnly,
+            String sameSite,
+            Integer expiresYear,
+            Integer maxAge) {
+        this.cookieName = cookieName;
+        this.cookieValue = cookieValue;
+        this.secure = secure;
+        this.sameSite = sameSite;
+        this.httpOnly = httpOnly;
+        this.expiresYear = expiresYear;
+        this.maxAge = maxAge;
     }
 
-    public Builder value(final String value) {
-      this.value = value;
-      return this;
+    public String getCookieName() {
+        return cookieName;
     }
 
-    public Builder secure(final boolean secure) {
-      this.secure = secure;
-      return this;
+    public String getCookieValue() {
+        return cookieValue;
     }
 
-    public Builder httpOnly(final boolean httpOnly) {
-      this.httpOnly = httpOnly;
-      return this;
+    public boolean isSecure() {
+        return secure;
     }
 
-    public Builder sameSite(final String sameSite) {
-      this.sameSite = sameSite;
-      return this;
+    public String getSameSite() {
+        return sameSite;
     }
 
-    public Builder expiresYear(final Integer expiresYear) {
-      this.expiresYear = expiresYear;
-      return this;
+    public boolean isHttpOnly() {
+        return httpOnly;
     }
 
-    public Builder maxAge(final Integer maxAge) {
-      this.maxAge = maxAge;
-      return this;
+    public Integer getExpiresYear() {
+        return expiresYear;
     }
 
-    public Cookie build() {
-      return new Cookie(name, value, secure, httpOnly, sameSite, expiresYear, maxAge);
+    public Integer getMaxAge() {
+        return maxAge;
+    }
+
+    public static Builder named(final String name) {
+        return new Builder(name);
+    }
+
+    public static class Builder {
+        private final String name;
+        private String value;
+        private boolean secure = false;
+        private boolean httpOnly = false;
+        private String sameSite = null;
+
+        private Integer expiresYear = null;
+
+        private Integer maxAge = null;
+
+        public Builder(final String name) {
+            this.name = name;
+        }
+
+        public Builder value(final String value) {
+            this.value = value;
+            return this;
+        }
+
+        public Builder secure(final boolean secure) {
+            this.secure = secure;
+            return this;
+        }
+
+        public Builder httpOnly(final boolean httpOnly) {
+            this.httpOnly = httpOnly;
+            return this;
+        }
+
+        public Builder sameSite(final String sameSite) {
+            this.sameSite = sameSite;
+            return this;
+        }
+
+        public Builder expiresYear(final Integer expiresYear) {
+            this.expiresYear = expiresYear;
+            return this;
+        }
+
+        public Builder maxAge(final Integer maxAge) {
+            this.maxAge = maxAge;
+            return this;
+        }
+
+        public Cookie build() {
+            return new Cookie(name, value, secure, httpOnly, sameSite, expiresYear, maxAge);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/iast/util/PropagationUtils.java b/internal-api/src/main/java/datadog/trace/api/iast/util/PropagationUtils.java
index 12d8eb195df..b7bfb7bfd0f 100644
--- a/internal-api/src/main/java/datadog/trace/api/iast/util/PropagationUtils.java
+++ b/internal-api/src/main/java/datadog/trace/api/iast/util/PropagationUtils.java
@@ -8,52 +8,52 @@
 
 public abstract class PropagationUtils {
 
-  private PropagationUtils() {}
+    private PropagationUtils() {}
 
-  public static URI onUriCreate(final String value, final URI uri) {
-    final CodecModule module = InstrumentationBridge.CODEC;
-    if (module != null) {
-      try {
-        module.onUriCreate(uri, value);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("onUriCreate threw", e);
-      }
+    public static URI onUriCreate(final String value, final URI uri) {
+        final CodecModule module = InstrumentationBridge.CODEC;
+        if (module != null) {
+            try {
+                module.onUriCreate(uri, value);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("onUriCreate threw", e);
+            }
+        }
+        return uri;
     }
-    return uri;
-  }
 
-  public static String onStringBuilderToString(final StringBuilder sb, final String result) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringBuilderToString(sb, result);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("onStringBuilderToString threw", e);
-      }
+    public static String onStringBuilderToString(final StringBuilder sb, final String result) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringBuilderToString(sb, result);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("onStringBuilderToString threw", e);
+            }
+        }
+        return result;
     }
-    return result;
-  }
 
-  public static StringBuilder onStringBuilderAppend(final String path, final StringBuilder sb) {
-    final StringModule module = InstrumentationBridge.STRING;
-    if (module != null) {
-      try {
-        module.onStringBuilderAppend(sb, path);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("onStringBuilderAppend threw", e);
-      }
+    public static StringBuilder onStringBuilderAppend(final String path, final StringBuilder sb) {
+        final StringModule module = InstrumentationBridge.STRING;
+        if (module != null) {
+            try {
+                module.onStringBuilderAppend(sb, path);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("onStringBuilderAppend threw", e);
+            }
+        }
+        return sb;
     }
-    return sb;
-  }
 
-  public static void taintObjectIfTainted(final Object target, final Object input) {
-    final PropagationModule module = InstrumentationBridge.PROPAGATION;
-    if (module != null) {
-      try {
-        module.taintObjectIfTainted(target, input);
-      } catch (final Throwable e) {
-        module.onUnexpectedException("taintObjectIfTainted threw", e);
-      }
+    public static void taintObjectIfTainted(final Object target, final Object input) {
+        final PropagationModule module = InstrumentationBridge.PROPAGATION;
+        if (module != null) {
+            try {
+                module.taintObjectIfTainted(target, input);
+            } catch (final Throwable e) {
+                module.onUnexpectedException("taintObjectIfTainted threw", e);
+            }
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/intake/Intake.java b/internal-api/src/main/java/datadog/trace/api/intake/Intake.java
index 2d715c2913a..f08421e4b14 100644
--- a/internal-api/src/main/java/datadog/trace/api/intake/Intake.java
+++ b/internal-api/src/main/java/datadog/trace/api/intake/Intake.java
@@ -4,59 +4,51 @@
 import java.util.function.Function;
 
 public enum Intake {
-  API("api", "v2", Config::isCiVisibilityAgentlessEnabled, Config::getCiVisibilityAgentlessUrl),
-  LLMOBS_API("api", "v2", Config::isLlmObsAgentlessEnabled, Config::getLlMObsAgentlessUrl),
-  LOGS(
-      "http-intake.logs",
-      "v2",
-      Config::isAgentlessLogSubmissionEnabled,
-      Config::getAgentlessLogSubmissionUrl),
-  CI_INTAKE(
-      "ci-intake",
-      "v2",
-      Config::isCiVisibilityAgentlessEnabled,
-      Config::getCiVisibilityIntakeAgentlessUrl),
-  EVENT_PLATFORM("event-platform-intake", "v2");
-
-  public final String urlPrefix;
-  public final String version;
-  public final Function<Config, Boolean> agentlessModeEnabled;
-  public final Function<Config, String> customUrl;
-
-  Intake(String urlPrefix, String version) {
-    this(urlPrefix, version, config -> false, config -> null);
-  }
-
-  Intake(
-      String urlPrefix,
-      String version,
-      Function<Config, Boolean> agentlessModeEnabled,
-      Function<Config, String> customUrl) {
-    this.urlPrefix = urlPrefix;
-    this.version = version;
-    this.agentlessModeEnabled = agentlessModeEnabled;
-    this.customUrl = customUrl;
-  }
-
-  public String getUrlPrefix() {
-    return urlPrefix;
-  }
-
-  public String getVersion() {
-    return version;
-  }
-
-  public boolean isAgentlessEnabled(Config config) {
-    return agentlessModeEnabled.apply(config);
-  }
-
-  public String getAgentlessUrl(Config config) {
-    String custom = customUrl.apply(config);
-    if (custom != null && !custom.isEmpty()) {
-      return String.format("%s/api/%s/", custom, version);
-    } else {
-      String site = config.getSite();
-      return String.format("https://%s.%s/api/%s/", urlPrefix, site, version);
+    API("api", "v2", Config::isCiVisibilityAgentlessEnabled, Config::getCiVisibilityAgentlessUrl),
+    LLMOBS_API("api", "v2", Config::isLlmObsAgentlessEnabled, Config::getLlMObsAgentlessUrl),
+    LOGS("http-intake.logs", "v2", Config::isAgentlessLogSubmissionEnabled, Config::getAgentlessLogSubmissionUrl),
+    CI_INTAKE("ci-intake", "v2", Config::isCiVisibilityAgentlessEnabled, Config::getCiVisibilityIntakeAgentlessUrl),
+    EVENT_PLATFORM("event-platform-intake", "v2");
+
+    public final String urlPrefix;
+    public final String version;
+    public final Function<Config, Boolean> agentlessModeEnabled;
+    public final Function<Config, String> customUrl;
+
+    Intake(String urlPrefix, String version) {
+        this(urlPrefix, version, config -> false, config -> null);
+    }
+
+    Intake(
+            String urlPrefix,
+            String version,
+            Function<Config, Boolean> agentlessModeEnabled,
+            Function<Config, String> customUrl) {
+        this.urlPrefix = urlPrefix;
+        this.version = version;
+        this.agentlessModeEnabled = agentlessModeEnabled;
+        this.customUrl = customUrl;
+    }
+
+    public String getUrlPrefix() {
+        return urlPrefix;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public boolean isAgentlessEnabled(Config config) {
+        return agentlessModeEnabled.apply(config);
+    }
+
+    public String getAgentlessUrl(Config config) {
+        String custom = customUrl.apply(config);
+        if (custom != null && !custom.isEmpty()) {
+            return String.format("%s/api/%s/", custom, version);
+        } else {
+            String site = config.getSite();
+            return String.format("https://%s.%s/api/%s/", urlPrefix, site, version);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/intake/TrackType.java b/internal-api/src/main/java/datadog/trace/api/intake/TrackType.java
index e50f46b6f13..eb710d52d29 100644
--- a/internal-api/src/main/java/datadog/trace/api/intake/TrackType.java
+++ b/internal-api/src/main/java/datadog/trace/api/intake/TrackType.java
@@ -4,14 +4,15 @@
 import javax.annotation.Nullable;
 
 public enum TrackType {
-  CITESTCYCLE(Endpoint.TEST_CYCLE),
-  CITESTCOV(Endpoint.CODE_COVERAGE),
-  LLMOBS(Endpoint.LLMOBS),
-  NOOP(null);
+    CITESTCYCLE(Endpoint.TEST_CYCLE),
+    CITESTCOV(Endpoint.CODE_COVERAGE),
+    LLMOBS(Endpoint.LLMOBS),
+    NOOP(null);
 
-  @Nullable public final Endpoint endpoint;
+    @Nullable
+    public final Endpoint endpoint;
 
-  TrackType(Endpoint endpoint) {
-    this.endpoint = endpoint;
-  }
+    TrackType(Endpoint endpoint) {
+        this.endpoint = endpoint;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/llmobs/GenAiApmTags.java b/internal-api/src/main/java/datadog/trace/api/llmobs/GenAiApmTags.java
index 5ccc2312c18..83bb5bb7a93 100644
--- a/internal-api/src/main/java/datadog/trace/api/llmobs/GenAiApmTags.java
+++ b/internal-api/src/main/java/datadog/trace/api/llmobs/GenAiApmTags.java
@@ -14,136 +14,133 @@
  * stay off the APM span and keep coming from the LLM Observability track.
  */
 public final class GenAiApmTags {
-  public static final String OPERATION_NAME = "gen_ai.operation.name";
-  public static final String REQUEST_MODEL = "gen_ai.request.model";
-  public static final String PROVIDER_NAME = "gen_ai.provider.name";
-  public static final String APPLICATION_NAME = "gen_ai.application.name";
-  public static final String CONVERSATION_ID = "gen_ai.conversation.id";
-
-  public static final String USAGE_INPUT_TOKENS = "gen_ai.usage.input_tokens";
-  public static final String USAGE_OUTPUT_TOKENS = "gen_ai.usage.output_tokens";
-  public static final String USAGE_TOTAL_TOKENS = "gen_ai.usage.total_tokens";
-  public static final String USAGE_CACHE_READ_INPUT_TOKENS = "gen_ai.usage.cache_read_input_tokens";
-  public static final String USAGE_CACHE_WRITE_INPUT_TOKENS =
-      "gen_ai.usage.cache_write_input_tokens";
-  public static final String USAGE_REASONING_OUTPUT_TOKENS = "gen_ai.usage.reasoning_output_tokens";
-
-  /**
-   * Marks the {@code gen_ai.*} attributes as written by the tracer rather than by the user. Without
-   * it, the backend processor treats the attributes as a user annotation and creates a duplicate
-   * LLM Observability span.
-   */
-  public static final String ARTIFICIAL_TAGS = "_dd.llmobs.artificial_gen_ai_tags";
-
-  private static final String LLMOBS_TAG_PREFIX = "_ml_obs_tag.";
-  private static final String LLMOBS_METRIC_PREFIX = "_ml_obs_metric.";
-
-  private static final String SPAN_KIND_TAG = LLMOBS_TAG_PREFIX + Tags.SPAN_KIND;
-  private static final String MODEL_NAME_TAG = LLMOBS_TAG_PREFIX + LLMObsTags.MODEL_NAME;
-  private static final String MODEL_PROVIDER_TAG = LLMOBS_TAG_PREFIX + LLMObsTags.MODEL_PROVIDER;
-  private static final String ML_APP_TAG = LLMOBS_TAG_PREFIX + LLMObsTags.ML_APP;
-  private static final String SESSION_ID_TAG = LLMOBS_TAG_PREFIX + LLMObsTags.SESSION_ID;
-
-  /** Matches the fallback the LLM Observability event uses. */
-  private static final String DEFAULT_MODEL = "custom";
-
-  /** LLM Observability metric name mapped to the {@code gen_ai.usage.*} key it feeds. */
-  private static final Map<String, String> USAGE_KEYS;
-
-  static {
-    Map<String, String> keys = new HashMap<>();
-    keys.put(LLMOBS_METRIC_PREFIX + "input_tokens", USAGE_INPUT_TOKENS);
-    keys.put(LLMOBS_METRIC_PREFIX + "output_tokens", USAGE_OUTPUT_TOKENS);
-    keys.put(LLMOBS_METRIC_PREFIX + "total_tokens", USAGE_TOTAL_TOKENS);
-    keys.put(LLMOBS_METRIC_PREFIX + "cache_read_input_tokens", USAGE_CACHE_READ_INPUT_TOKENS);
-    keys.put(LLMOBS_METRIC_PREFIX + "cache_write_input_tokens", USAGE_CACHE_WRITE_INPUT_TOKENS);
-    keys.put(LLMOBS_METRIC_PREFIX + "reasoning_output_tokens", USAGE_REASONING_OUTPUT_TOKENS);
-    USAGE_KEYS = unmodifiableMap(keys);
-  }
-
-  public static void apply(AgentSpan span) {
-    apply(span, null, null, null);
-  }
-
-  /**
-   * Writes the attributes onto a span that is not yet finished, reading them from its {@code
-   * _ml_obs_tag.} / {@code _ml_obs_metric.} tags. The arguments take precedence over those tags and
-   * cover instrumentation that traces with LLM Observability disabled, where they are not all set.
-   * No-op for a span with no resolvable operation.
-   */
-  public static void apply(AgentSpan span, String operationName, String modelName, String mlApp) {
-    if (span == null) {
-      return;
+    public static final String OPERATION_NAME = "gen_ai.operation.name";
+    public static final String REQUEST_MODEL = "gen_ai.request.model";
+    public static final String PROVIDER_NAME = "gen_ai.provider.name";
+    public static final String APPLICATION_NAME = "gen_ai.application.name";
+    public static final String CONVERSATION_ID = "gen_ai.conversation.id";
+
+    public static final String USAGE_INPUT_TOKENS = "gen_ai.usage.input_tokens";
+    public static final String USAGE_OUTPUT_TOKENS = "gen_ai.usage.output_tokens";
+    public static final String USAGE_TOTAL_TOKENS = "gen_ai.usage.total_tokens";
+    public static final String USAGE_CACHE_READ_INPUT_TOKENS = "gen_ai.usage.cache_read_input_tokens";
+    public static final String USAGE_CACHE_WRITE_INPUT_TOKENS = "gen_ai.usage.cache_write_input_tokens";
+    public static final String USAGE_REASONING_OUTPUT_TOKENS = "gen_ai.usage.reasoning_output_tokens";
+
+    /**
+     * Marks the {@code gen_ai.*} attributes as written by the tracer rather than by the user. Without
+     * it, the backend processor treats the attributes as a user annotation and creates a duplicate
+     * LLM Observability span.
+     */
+    public static final String ARTIFICIAL_TAGS = "_dd.llmobs.artificial_gen_ai_tags";
+
+    private static final String LLMOBS_TAG_PREFIX = "_ml_obs_tag.";
+    private static final String LLMOBS_METRIC_PREFIX = "_ml_obs_metric.";
+
+    private static final String SPAN_KIND_TAG = LLMOBS_TAG_PREFIX + Tags.SPAN_KIND;
+    private static final String MODEL_NAME_TAG = LLMOBS_TAG_PREFIX + LLMObsTags.MODEL_NAME;
+    private static final String MODEL_PROVIDER_TAG = LLMOBS_TAG_PREFIX + LLMObsTags.MODEL_PROVIDER;
+    private static final String ML_APP_TAG = LLMOBS_TAG_PREFIX + LLMObsTags.ML_APP;
+    private static final String SESSION_ID_TAG = LLMOBS_TAG_PREFIX + LLMObsTags.SESSION_ID;
+
+    /** Matches the fallback the LLM Observability event uses. */
+    private static final String DEFAULT_MODEL = "custom";
+
+    /** LLM Observability metric name mapped to the {@code gen_ai.usage.*} key it feeds. */
+    private static final Map<String, String> USAGE_KEYS;
+
+    static {
+        Map<String, String> keys = new HashMap<>();
+        keys.put(LLMOBS_METRIC_PREFIX + "input_tokens", USAGE_INPUT_TOKENS);
+        keys.put(LLMOBS_METRIC_PREFIX + "output_tokens", USAGE_OUTPUT_TOKENS);
+        keys.put(LLMOBS_METRIC_PREFIX + "total_tokens", USAGE_TOTAL_TOKENS);
+        keys.put(LLMOBS_METRIC_PREFIX + "cache_read_input_tokens", USAGE_CACHE_READ_INPUT_TOKENS);
+        keys.put(LLMOBS_METRIC_PREFIX + "cache_write_input_tokens", USAGE_CACHE_WRITE_INPUT_TOKENS);
+        keys.put(LLMOBS_METRIC_PREFIX + "reasoning_output_tokens", USAGE_REASONING_OUTPUT_TOKENS);
+        USAGE_KEYS = unmodifiableMap(keys);
     }
-    String operation = firstNonEmpty(operationName, stringTag(span, SPAN_KIND_TAG));
-    if (operation == null) {
-      return;
+
+    public static void apply(AgentSpan span) {
+        apply(span, null, null, null);
     }
-    span.setTag(OPERATION_NAME, operation);
 
-    boolean modelBacked =
-        Tags.LLMOBS_LLM_SPAN_KIND.equals(operation)
-            || Tags.LLMOBS_EMBEDDING_SPAN_KIND.equals(operation);
+    /**
+     * Writes the attributes onto a span that is not yet finished, reading them from its {@code
+     * _ml_obs_tag.} / {@code _ml_obs_metric.} tags. The arguments take precedence over those tags and
+     * cover instrumentation that traces with LLM Observability disabled, where they are not all set.
+     * No-op for a span with no resolvable operation.
+     */
+    public static void apply(AgentSpan span, String operationName, String modelName, String mlApp) {
+        if (span == null) {
+            return;
+        }
+        String operation = firstNonEmpty(operationName, stringTag(span, SPAN_KIND_TAG));
+        if (operation == null) {
+            return;
+        }
+        span.setTag(OPERATION_NAME, operation);
 
-    String model = firstNonEmpty(modelName, stringTag(span, MODEL_NAME_TAG));
-    if (model != null || modelBacked) {
-      span.setTag(REQUEST_MODEL, model == null ? DEFAULT_MODEL : model);
-    }
-    String provider = stringTag(span, MODEL_PROVIDER_TAG);
-    if (provider != null || modelBacked) {
-      span.setTag(
-          PROVIDER_NAME, (provider == null ? DEFAULT_MODEL : provider).toLowerCase(Locale.ROOT));
-    }
-    String application = firstNonEmpty(mlApp, stringTag(span, ML_APP_TAG));
-    if (application != null) {
-      span.setTag(APPLICATION_NAME, application);
-    }
-    String sessionId = stringTag(span, SESSION_ID_TAG);
-    if (sessionId != null) {
-      span.setTag(CONVERSATION_ID, sessionId);
-    }
+        boolean modelBacked =
+                Tags.LLMOBS_LLM_SPAN_KIND.equals(operation) || Tags.LLMOBS_EMBEDDING_SPAN_KIND.equals(operation);
 
-    // Other kinds carry unrelated metrics that a gen_ai.usage.* key would misrepresent.
-    if (modelBacked) {
-      for (Map.Entry<String, String> metric : USAGE_KEYS.entrySet()) {
-        Object value = span.getTag(metric.getKey());
-        if (value instanceof Number) {
-          span.setMetric(metric.getValue(), ((Number) value).doubleValue());
+        String model = firstNonEmpty(modelName, stringTag(span, MODEL_NAME_TAG));
+        if (model != null || modelBacked) {
+            span.setTag(REQUEST_MODEL, model == null ? DEFAULT_MODEL : model);
+        }
+        String provider = stringTag(span, MODEL_PROVIDER_TAG);
+        if (provider != null || modelBacked) {
+            span.setTag(PROVIDER_NAME, (provider == null ? DEFAULT_MODEL : provider).toLowerCase(Locale.ROOT));
+        }
+        String application = firstNonEmpty(mlApp, stringTag(span, ML_APP_TAG));
+        if (application != null) {
+            span.setTag(APPLICATION_NAME, application);
+        }
+        String sessionId = stringTag(span, SESSION_ID_TAG);
+        if (sessionId != null) {
+            span.setTag(CONVERSATION_ID, sessionId);
         }
-      }
-    }
 
-    span.setTag(ARTIFICIAL_TAGS, "true");
-  }
-
-  /**
-   * Writes the {@code gen_ai.usage.*} metric that {@code llmObsMetric} maps to, for instrumentation
-   * that has the token counts but does not tag them because LLM Observability is disabled. No-op
-   * for an unknown metric name.
-   */
-  public static void usage(AgentSpan span, String llmObsMetric, Number value) {
-    if (span == null || value == null) {
-      return;
+        // Other kinds carry unrelated metrics that a gen_ai.usage.* key would misrepresent.
+        if (modelBacked) {
+            for (Map.Entry<String, String> metric : USAGE_KEYS.entrySet()) {
+                Object value = span.getTag(metric.getKey());
+                if (value instanceof Number) {
+                    span.setMetric(metric.getValue(), ((Number) value).doubleValue());
+                }
+            }
+        }
+
+        span.setTag(ARTIFICIAL_TAGS, "true");
     }
-    String key = USAGE_KEYS.get(llmObsMetric);
-    if (key != null) {
-      span.setMetric(key, value.doubleValue());
+
+    /**
+     * Writes the {@code gen_ai.usage.*} metric that {@code llmObsMetric} maps to, for instrumentation
+     * that has the token counts but does not tag them because LLM Observability is disabled. No-op
+     * for an unknown metric name.
+     */
+    public static void usage(AgentSpan span, String llmObsMetric, Number value) {
+        if (span == null || value == null) {
+            return;
+        }
+        String key = USAGE_KEYS.get(llmObsMetric);
+        if (key != null) {
+            span.setMetric(key, value.doubleValue());
+        }
     }
-  }
 
-  /** The value of {@code key} as a non-empty string, or null. */
-  public static String stringTag(AgentSpan span, String key) {
-    Object value = span.getTag(key);
-    if (value == null) {
-      return null;
+    /** The value of {@code key} as a non-empty string, or null. */
+    public static String stringTag(AgentSpan span, String key) {
+        Object value = span.getTag(key);
+        if (value == null) {
+            return null;
+        }
+        String string = String.valueOf(value);
+        return string.isEmpty() ? null : string;
     }
-    String string = String.valueOf(value);
-    return string.isEmpty() ? null : string;
-  }
 
-  private static String firstNonEmpty(String preferred, String fallback) {
-    return preferred == null || preferred.isEmpty() ? fallback : preferred;
-  }
+    private static String firstNonEmpty(String preferred, String fallback) {
+        return preferred == null || preferred.isEmpty() ? fallback : preferred;
+    }
 
-  private GenAiApmTags() {}
+    private GenAiApmTags() {}
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/llmobs/LLMObsContext.java b/internal-api/src/main/java/datadog/trace/api/llmobs/LLMObsContext.java
index 1e768846b10..313576139fa 100644
--- a/internal-api/src/main/java/datadog/trace/api/llmobs/LLMObsContext.java
+++ b/internal-api/src/main/java/datadog/trace/api/llmobs/LLMObsContext.java
@@ -6,169 +6,166 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
 
 public final class LLMObsContext {
-  public static final String ROOT_SPAN_ID = "undefined";
-
-  /** Sampling decision value meaning "retain this span". */
-  public static final String SAMPLING_DECISION_SAMPLED = "1";
-
-  /** Sampling decision value meaning "drop this span". */
-  public static final String SAMPLING_DECISION_DROPPED = "0";
-
-  private LLMObsContext() {
-    // ~
-  }
-
-  private static final ContextKey<AgentSpanContext> CONTEXT_KEY = ContextKey.named("llmobs_span");
-  private static final ContextKey<String> SESSION_ID_KEY = ContextKey.named("llmobs_session_id");
-  private static final ContextKey<String> AGENT_VERSION_KEY =
-      ContextKey.named("llmobs_agent_version");
-  private static final ContextKey<String> SAMPLE_RATE_KEY = ContextKey.named("llmobs_sample_rate");
-  private static final ContextKey<String> SAMPLING_DECISION_KEY =
-      ContextKey.named("llmobs_sampling_decision");
-  private static final ContextKey<String> PAGENT_SPAN_ID_KEY =
-      ContextKey.named("llmobs_pagent_span_id");
-  private static final ContextKey<String> PAGENT_NAME_KEY = ContextKey.named("llmobs_pagent_name");
-
-  /**
-   * Attach an LLMObs span context, leaving any inherited session_id/agent_version from an enclosing
-   * scope untouched (see {@link #currentSessionId()}, {@link #currentAgentVersion()}).
-   */
-  public static ContextScope attach(AgentSpanContext ctx) {
-    return Context.current().with(CONTEXT_KEY, ctx).attach();
-  }
-
-  /**
-   * Attach an LLMObs span context, optionally propagating a session_id to descendant LLMObs spans.
-   * When sessionId is non-null and non-empty, child LLMObs spans started under this context that do
-   * not specify their own sessionId will inherit it via {@link #currentSessionId()}. A null or
-   * empty sessionId clears any session_id inherited from an enclosing scope.
-   */
-  public static ContextScope attach(AgentSpanContext ctx, String sessionId) {
-    return Context.current()
-        .with(CONTEXT_KEY, ctx)
-        .with(SESSION_ID_KEY, emptyToNull(sessionId))
-        .attach();
-  }
-
-  /**
-   * Attach an LLMObs span context, optionally propagating a session_id and an agent_version to
-   * descendant LLMObs spans. See {@link #attach(AgentSpanContext, String)}. Same
-   * clears-if-null-or-empty semantics apply to agentVersion via {@link #currentAgentVersion()} —
-   * callers (e.g. {@code DDLLMObsSpan}) are expected to pass the already-resolved effective value,
-   * so that a stale value from an unrelated context is always cleared rather than silently carried
-   * forward.
-   */
-  public static ContextScope attach(AgentSpanContext ctx, String sessionId, String agentVersion) {
-    return Context.current()
-        .with(CONTEXT_KEY, ctx)
-        .with(SESSION_ID_KEY, emptyToNull(sessionId))
-        .with(AGENT_VERSION_KEY, emptyToNull(agentVersion))
-        .attach();
-  }
-
-  /**
-   * Attach an LLMObs span context, propagating a session_id, an agent_version, a sampling decision,
-   * and agent attribution to descendant LLMObs spans. See {@link #attach(AgentSpanContext, String,
-   * String)} — the same clears-if-null-or-empty semantics apply to every value, so callers are
-   * expected to pass already-resolved effective values.
-   *
-   * <p>This overload carries every propagated value at once because a span's scope is attached
-   * exactly once: three independent mechanisms (session, sampling, attribution) share one context,
-   * so they cannot be attached by separate calls without nesting redundant scopes.
-   *
-   * <p>The sampling decision is computed once at the root of an LLMObs trace and inherited
-   * unchanged by every descendant, so that a trace is retained or dropped as a whole. Both sampling
-   * values are carried pre-formatted so that every span in the trace reports byte-identical values.
-   * The rate travels only alongside a decision — a rate on its own says nothing about whether the
-   * trace was kept — so a null decision clears both.
-   *
-   * <p>parentAgentSpanId identifies the nearest agent-kind ancestor; parentAgentName is its name
-   * (may be null). Both pagent keys are always written. Per the Context API contract (Context.java:
-   * "Mapping to a null value will remove the key-value from the context copy"), with(key, null)
-   * clears any stale value inherited from an outer scope. This prevents two leakage scenarios:
-   *
-   * <ol>
-   *   <li>An unsafe-named inner agent must not let descendants see the outer agent's name.
-   *   <li>A non-agent span whose trace-ID gate blocked attribution must not let its same-trace
-   *       children pick up a pagent ID that belongs to a different trace.
-   * </ol>
-   *
-   * <p><strong>In-process only.</strong> This context is not serialized into distributed trace
-   * headers, so each service in a distributed trace decides independently. Because the decision is
-   * a pure function of the APM trace ID and the configured rate, services configured at the same
-   * rate agree; services configured at different rates disagree and the trace is retained in part.
-   * A decision propagated by an upstream dd-trace-py or dd-trace-js service is likewise not read
-   * here. Closing that gap needs propagated trace tags mirroring the existing {@code _dd.p.ksr}.
-   */
-  public static ContextScope attach(
-      AgentSpanContext ctx,
-      String sessionId,
-      String agentVersion,
-      String sampleRate,
-      String samplingDecision,
-      String parentAgentSpanId,
-      String parentAgentName) {
-    String decision = emptyToNull(samplingDecision);
-    return Context.current()
-        .with(CONTEXT_KEY, ctx)
-        .with(SESSION_ID_KEY, emptyToNull(sessionId))
-        .with(AGENT_VERSION_KEY, emptyToNull(agentVersion))
-        .with(SAMPLING_DECISION_KEY, decision)
-        .with(SAMPLE_RATE_KEY, decision == null ? null : emptyToNull(sampleRate))
-        .with(PAGENT_SPAN_ID_KEY, parentAgentSpanId)
-        .with(PAGENT_NAME_KEY, parentAgentName)
-        .attach();
-  }
-
-  public static AgentSpanContext current() {
-    return Context.current().get(CONTEXT_KEY);
-  }
-
-  /**
-   * Return the session_id propagated from an enclosing LLMObs span, or null if no parent set one.
-   */
-  public static String currentSessionId() {
-    return Context.current().get(SESSION_ID_KEY);
-  }
-
-  /**
-   * Return the agent_version propagated from an enclosing agent span, or null if no ancestor set
-   * one.
-   */
-  public static String currentAgentVersion() {
-    return Context.current().get(AGENT_VERSION_KEY);
-  }
-
-  /**
-   * Return the sample rate that produced {@link #currentSamplingDecision()}, or null if no
-   * enclosing LLMObs span made a sampling decision.
-   */
-  public static String currentSampleRate() {
-    return Context.current().get(SAMPLE_RATE_KEY);
-  }
-
-  /**
-   * Return the sampling decision propagated from an enclosing LLMObs span, or null if none was
-   * made. A null value identifies the current span as the root of an LLMObs trace, which is the
-   * only place a decision is computed.
-   */
-  public static String currentSamplingDecision() {
-    return Context.current().get(SAMPLING_DECISION_KEY);
-  }
-
-  /**
-   * Return the parent agent span ID propagated from an enclosing agent-kind LLMObs span, or null.
-   */
-  public static String currentParentAgentSpanId() {
-    return Context.current().get(PAGENT_SPAN_ID_KEY);
-  }
-
-  /** Return the parent agent name propagated from an enclosing agent-kind LLMObs span, or null. */
-  public static String currentParentAgentName() {
-    return Context.current().get(PAGENT_NAME_KEY);
-  }
-
-  private static String emptyToNull(String value) {
-    return value != null && !value.isEmpty() ? value : null;
-  }
+    public static final String ROOT_SPAN_ID = "undefined";
+
+    /** Sampling decision value meaning "retain this span". */
+    public static final String SAMPLING_DECISION_SAMPLED = "1";
+
+    /** Sampling decision value meaning "drop this span". */
+    public static final String SAMPLING_DECISION_DROPPED = "0";
+
+    private LLMObsContext() {
+        // ~
+    }
+
+    private static final ContextKey<AgentSpanContext> CONTEXT_KEY = ContextKey.named("llmobs_span");
+    private static final ContextKey<String> SESSION_ID_KEY = ContextKey.named("llmobs_session_id");
+    private static final ContextKey<String> AGENT_VERSION_KEY = ContextKey.named("llmobs_agent_version");
+    private static final ContextKey<String> SAMPLE_RATE_KEY = ContextKey.named("llmobs_sample_rate");
+    private static final ContextKey<String> SAMPLING_DECISION_KEY = ContextKey.named("llmobs_sampling_decision");
+    private static final ContextKey<String> PAGENT_SPAN_ID_KEY = ContextKey.named("llmobs_pagent_span_id");
+    private static final ContextKey<String> PAGENT_NAME_KEY = ContextKey.named("llmobs_pagent_name");
+
+    /**
+     * Attach an LLMObs span context, leaving any inherited session_id/agent_version from an enclosing
+     * scope untouched (see {@link #currentSessionId()}, {@link #currentAgentVersion()}).
+     */
+    public static ContextScope attach(AgentSpanContext ctx) {
+        return Context.current().with(CONTEXT_KEY, ctx).attach();
+    }
+
+    /**
+     * Attach an LLMObs span context, optionally propagating a session_id to descendant LLMObs spans.
+     * When sessionId is non-null and non-empty, child LLMObs spans started under this context that do
+     * not specify their own sessionId will inherit it via {@link #currentSessionId()}. A null or
+     * empty sessionId clears any session_id inherited from an enclosing scope.
+     */
+    public static ContextScope attach(AgentSpanContext ctx, String sessionId) {
+        return Context.current()
+                .with(CONTEXT_KEY, ctx)
+                .with(SESSION_ID_KEY, emptyToNull(sessionId))
+                .attach();
+    }
+
+    /**
+     * Attach an LLMObs span context, optionally propagating a session_id and an agent_version to
+     * descendant LLMObs spans. See {@link #attach(AgentSpanContext, String)}. Same
+     * clears-if-null-or-empty semantics apply to agentVersion via {@link #currentAgentVersion()} —
+     * callers (e.g. {@code DDLLMObsSpan}) are expected to pass the already-resolved effective value,
+     * so that a stale value from an unrelated context is always cleared rather than silently carried
+     * forward.
+     */
+    public static ContextScope attach(AgentSpanContext ctx, String sessionId, String agentVersion) {
+        return Context.current()
+                .with(CONTEXT_KEY, ctx)
+                .with(SESSION_ID_KEY, emptyToNull(sessionId))
+                .with(AGENT_VERSION_KEY, emptyToNull(agentVersion))
+                .attach();
+    }
+
+    /**
+     * Attach an LLMObs span context, propagating a session_id, an agent_version, a sampling decision,
+     * and agent attribution to descendant LLMObs spans. See {@link #attach(AgentSpanContext, String,
+     * String)} — the same clears-if-null-or-empty semantics apply to every value, so callers are
+     * expected to pass already-resolved effective values.
+     *
+     * <p>This overload carries every propagated value at once because a span's scope is attached
+     * exactly once: three independent mechanisms (session, sampling, attribution) share one context,
+     * so they cannot be attached by separate calls without nesting redundant scopes.
+     *
+     * <p>The sampling decision is computed once at the root of an LLMObs trace and inherited
+     * unchanged by every descendant, so that a trace is retained or dropped as a whole. Both sampling
+     * values are carried pre-formatted so that every span in the trace reports byte-identical values.
+     * The rate travels only alongside a decision — a rate on its own says nothing about whether the
+     * trace was kept — so a null decision clears both.
+     *
+     * <p>parentAgentSpanId identifies the nearest agent-kind ancestor; parentAgentName is its name
+     * (may be null). Both pagent keys are always written. Per the Context API contract (Context.java:
+     * "Mapping to a null value will remove the key-value from the context copy"), with(key, null)
+     * clears any stale value inherited from an outer scope. This prevents two leakage scenarios:
+     *
+     * <ol>
+     *   <li>An unsafe-named inner agent must not let descendants see the outer agent's name.
+     *   <li>A non-agent span whose trace-ID gate blocked attribution must not let its same-trace
+     *       children pick up a pagent ID that belongs to a different trace.
+     * </ol>
+     *
+     * <p><strong>In-process only.</strong> This context is not serialized into distributed trace
+     * headers, so each service in a distributed trace decides independently. Because the decision is
+     * a pure function of the APM trace ID and the configured rate, services configured at the same
+     * rate agree; services configured at different rates disagree and the trace is retained in part.
+     * A decision propagated by an upstream dd-trace-py or dd-trace-js service is likewise not read
+     * here. Closing that gap needs propagated trace tags mirroring the existing {@code _dd.p.ksr}.
+     */
+    public static ContextScope attach(
+            AgentSpanContext ctx,
+            String sessionId,
+            String agentVersion,
+            String sampleRate,
+            String samplingDecision,
+            String parentAgentSpanId,
+            String parentAgentName) {
+        String decision = emptyToNull(samplingDecision);
+        return Context.current()
+                .with(CONTEXT_KEY, ctx)
+                .with(SESSION_ID_KEY, emptyToNull(sessionId))
+                .with(AGENT_VERSION_KEY, emptyToNull(agentVersion))
+                .with(SAMPLING_DECISION_KEY, decision)
+                .with(SAMPLE_RATE_KEY, decision == null ? null : emptyToNull(sampleRate))
+                .with(PAGENT_SPAN_ID_KEY, parentAgentSpanId)
+                .with(PAGENT_NAME_KEY, parentAgentName)
+                .attach();
+    }
+
+    public static AgentSpanContext current() {
+        return Context.current().get(CONTEXT_KEY);
+    }
+
+    /**
+     * Return the session_id propagated from an enclosing LLMObs span, or null if no parent set one.
+     */
+    public static String currentSessionId() {
+        return Context.current().get(SESSION_ID_KEY);
+    }
+
+    /**
+     * Return the agent_version propagated from an enclosing agent span, or null if no ancestor set
+     * one.
+     */
+    public static String currentAgentVersion() {
+        return Context.current().get(AGENT_VERSION_KEY);
+    }
+
+    /**
+     * Return the sample rate that produced {@link #currentSamplingDecision()}, or null if no
+     * enclosing LLMObs span made a sampling decision.
+     */
+    public static String currentSampleRate() {
+        return Context.current().get(SAMPLE_RATE_KEY);
+    }
+
+    /**
+     * Return the sampling decision propagated from an enclosing LLMObs span, or null if none was
+     * made. A null value identifies the current span as the root of an LLMObs trace, which is the
+     * only place a decision is computed.
+     */
+    public static String currentSamplingDecision() {
+        return Context.current().get(SAMPLING_DECISION_KEY);
+    }
+
+    /**
+     * Return the parent agent span ID propagated from an enclosing agent-kind LLMObs span, or null.
+     */
+    public static String currentParentAgentSpanId() {
+        return Context.current().get(PAGENT_SPAN_ID_KEY);
+    }
+
+    /** Return the parent agent name propagated from an enclosing agent-kind LLMObs span, or null. */
+    public static String currentParentAgentName() {
+        return Context.current().get(PAGENT_NAME_KEY);
+    }
+
+    private static String emptyToNull(String value) {
+        return value != null && !value.isEmpty() ? value : null;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/llmobs/LLMObsInternal.java b/internal-api/src/main/java/datadog/trace/api/llmobs/LLMObsInternal.java
index ed32f10118a..c79d6479ac9 100644
--- a/internal-api/src/main/java/datadog/trace/api/llmobs/LLMObsInternal.java
+++ b/internal-api/src/main/java/datadog/trace/api/llmobs/LLMObsInternal.java
@@ -4,26 +4,26 @@
 
 /** Internal bridge to LLM Observability API state. */
 public final class LLMObsInternal extends LLMObs {
-  private LLMObsInternal() {}
+    private LLMObsInternal() {}
 
-  /** Sets the LLM Observability span factory. */
-  public static void setSpanFactory(LLMObsSpanFactory factory) {
-    SPAN_FACTORY = factory;
-  }
+    /** Sets the LLM Observability span factory. */
+    public static void setSpanFactory(LLMObsSpanFactory factory) {
+        SPAN_FACTORY = factory;
+    }
 
-  /** Sets the LLM Observability evaluation processor. */
-  public static void setEvalProcessor(LLMObsEvalProcessor evalProcessor) {
-    EVAL_PROCESSOR = evalProcessor;
-  }
+    /** Sets the LLM Observability evaluation processor. */
+    public static void setEvalProcessor(LLMObsEvalProcessor evalProcessor) {
+        EVAL_PROCESSOR = evalProcessor;
+    }
 
-  /** Sets the LLM Observability feedback processor. */
-  public static void setFeedbackProcessor(LLMObsFeedbackProcessor feedbackProcessor) {
-    FEEDBACK_PROCESSOR = feedbackProcessor;
-  }
+    /** Sets the LLM Observability feedback processor. */
+    public static void setFeedbackProcessor(LLMObsFeedbackProcessor feedbackProcessor) {
+        FEEDBACK_PROCESSOR = feedbackProcessor;
+    }
 
-  /** Returns the registered user span processor, if any. */
-  @Nullable
-  public static LLMObsSpanProcessor getSpanProcessor() {
-    return SPAN_PROCESSOR;
-  }
+    /** Returns the registered user span processor, if any. */
+    @Nullable
+    public static LLMObsSpanProcessor getSpanProcessor() {
+        return SPAN_PROCESSOR;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/llmobs/LLMObsSampler.java b/internal-api/src/main/java/datadog/trace/api/llmobs/LLMObsSampler.java
index ff92d8368d3..1b64c98bb2d 100644
--- a/internal-api/src/main/java/datadog/trace/api/llmobs/LLMObsSampler.java
+++ b/internal-api/src/main/java/datadog/trace/api/llmobs/LLMObsSampler.java
@@ -10,82 +10,82 @@
  */
 public final class LLMObsSampler {
 
-  private static final long KNUTH_FACTOR = 1111111111111111111L;
-  private static final double MAX = Math.pow(2, 64) - 1;
+    private static final long KNUTH_FACTOR = 1111111111111111111L;
+    private static final double MAX = Math.pow(2, 64) - 1;
 
-  private final double rate;
-  private final long threshold;
-  private final String formattedRate;
+    private final double rate;
+    private final long threshold;
+    private final String formattedRate;
 
-  public static LLMObsSampler fromConfig() {
-    return new LLMObsSampler(Config.get().getLlmObsSampleRate());
-  }
-
-  public LLMObsSampler(final double rate) {
-    // Any rate outside [0.0, 1.0] (including NaN) falls back to 1.0
-    this.rate = (rate >= 0.0 && rate <= 1.0) ? rate : 1.0;
-    this.threshold = cutoff(this.rate);
-    this.formattedRate = formatRate(this.rate);
-  }
-
-  /**
-   * The configured rate, formatted for the wire. Derived from the configured {@code double} rather
-   * than from a narrowed {@code float}, so the reported rate is the rate actually applied.
-   */
-  public String formattedRate() {
-    return formattedRate;
-  }
-
-  /**
-   * @param samplingId the low-order 64 bits of the APM trace ID.
-   * @return whether the trace is retained.
-   */
-  public boolean sample(final long samplingId) {
-    // unsigned 64 bit comparison with cutoff/threshold
-    return samplingId * KNUTH_FACTOR + Long.MIN_VALUE <= threshold;
-  }
-
-  private static long cutoff(final double rate) {
-    if (rate < 0.5) {
-      return (long) (rate * MAX) + Long.MIN_VALUE;
-    }
-    if (rate < 1.0) {
-      return (long) ((rate * MAX) + Long.MIN_VALUE);
+    public static LLMObsSampler fromConfig() {
+        return new LLMObsSampler(Config.get().getLlmObsSampleRate());
     }
-    return Long.MAX_VALUE;
-  }
 
-  /**
-   * Formats a sampling rate with up to 6 decimal digits of precision and no trailing zeros. Mirrors
-   * {@code format_rate} in dd-trace-py, which stamps {@code sample_rate} through the same helper it
-   * uses for {@code _dd.p.ksr}, so the two languages report the same rate as the same string.
-   */
-  static String formatRate(final double rate) {
-    if (rate <= 0.0) {
-      return "0";
+    public LLMObsSampler(final double rate) {
+        // Any rate outside [0.0, 1.0] (including NaN) falls back to 1.0
+        this.rate = (rate >= 0.0 && rate <= 1.0) ? rate : 1.0;
+        this.threshold = cutoff(this.rate);
+        this.formattedRate = formatRate(this.rate);
     }
-    if (rate >= 1.0) {
-      return "1";
-    }
-    long rounded = Math.round(rate * 1_000_000L);
-    if (rounded <= 0) {
-      return "0";
+
+    /**
+     * The configured rate, formatted for the wire. Derived from the configured {@code double} rather
+     * than from a narrowed {@code float}, so the reported rate is the rate actually applied.
+     */
+    public String formattedRate() {
+        return formattedRate;
     }
-    if (rounded >= 1_000_000L) {
-      return "1";
+
+    /**
+     * @param samplingId the low-order 64 bits of the APM trace ID.
+     * @return whether the trace is retained.
+     */
+    public boolean sample(final long samplingId) {
+        // unsigned 64 bit comparison with cutoff/threshold
+        return samplingId * KNUTH_FACTOR + Long.MIN_VALUE <= threshold;
     }
-    // Build "0.DDDDDD", then trim trailing zeros.
-    char[] chars = new char[8];
-    chars[0] = '0';
-    chars[1] = '.';
-    for (int i = 7; i >= 2; i--) {
-      chars[i] = (char) ('0' + (rounded % 10));
-      rounded /= 10;
+
+    private static long cutoff(final double rate) {
+        if (rate < 0.5) {
+            return (long) (rate * MAX) + Long.MIN_VALUE;
+        }
+        if (rate < 1.0) {
+            return (long) ((rate * MAX) + Long.MIN_VALUE);
+        }
+        return Long.MAX_VALUE;
     }
-    int end = 8;
-    while (chars[end - 1] == '0') {
-      end--;
+
+    /**
+     * Formats a sampling rate with up to 6 decimal digits of precision and no trailing zeros. Mirrors
+     * {@code format_rate} in dd-trace-py, which stamps {@code sample_rate} through the same helper it
+     * uses for {@code _dd.p.ksr}, so the two languages report the same rate as the same string.
+     */
+    static String formatRate(final double rate) {
+        if (rate <= 0.0) {
+            return "0";
+        }
+        if (rate >= 1.0) {
+            return "1";
+        }
+        long rounded = Math.round(rate * 1_000_000L);
+        if (rounded <= 0) {
+            return "0";
+        }
+        if (rounded >= 1_000_000L) {
+            return "1";
+        }
+        // Build "0.DDDDDD", then trim trailing zeros.
+        char[] chars = new char[8];
+        chars[0] = '0';
+        chars[1] = '.';
+        for (int i = 7; i >= 2; i--) {
+            chars[i] = (char) ('0' + (rounded % 10));
+            rounded /= 10;
+        }
+        int end = 8;
+        while (chars[end - 1] == '0') {
+            end--;
+        }
+        return new String(chars, 0, end);
     }
-    return new String(chars, 0, end);
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/logging/intake/LogsIntake.java b/internal-api/src/main/java/datadog/trace/api/logging/intake/LogsIntake.java
index 6984d6210cb..86f19dae804 100644
--- a/internal-api/src/main/java/datadog/trace/api/logging/intake/LogsIntake.java
+++ b/internal-api/src/main/java/datadog/trace/api/logging/intake/LogsIntake.java
@@ -4,23 +4,23 @@
 
 public class LogsIntake {
 
-  private static volatile LogsWriter WRITER;
+    private static volatile LogsWriter WRITER;
 
-  public static void registerWriter(LogsWriter writer) {
-    WRITER = writer;
-  }
+    public static void registerWriter(LogsWriter writer) {
+        WRITER = writer;
+    }
 
-  public static void shutdown() {
-    LogsWriter writer = WRITER;
-    if (writer != null) {
-      writer.shutdown();
+    public static void shutdown() {
+        LogsWriter writer = WRITER;
+        if (writer != null) {
+            writer.shutdown();
+        }
     }
-  }
 
-  public static void log(Map<String, Object> message) {
-    LogsWriter writer = WRITER;
-    if (writer != null) {
-      writer.log(message);
+    public static void log(Map<String, Object> message) {
+        LogsWriter writer = WRITER;
+        if (writer != null) {
+            writer.log(message);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/logging/intake/LogsWriter.java b/internal-api/src/main/java/datadog/trace/api/logging/intake/LogsWriter.java
index 71d6140a1cb..8a77d09082a 100644
--- a/internal-api/src/main/java/datadog/trace/api/logging/intake/LogsWriter.java
+++ b/internal-api/src/main/java/datadog/trace/api/logging/intake/LogsWriter.java
@@ -4,9 +4,9 @@
 
 public interface LogsWriter {
 
-  void start();
+    void start();
 
-  void log(Map<String, Object> message);
+    void log(Map<String, Object> message);
 
-  void shutdown();
+    void shutdown();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/metrics/BaggageMetrics.java b/internal-api/src/main/java/datadog/trace/api/metrics/BaggageMetrics.java
index 5ca98ce43db..eb259505e72 100644
--- a/internal-api/src/main/java/datadog/trace/api/metrics/BaggageMetrics.java
+++ b/internal-api/src/main/java/datadog/trace/api/metrics/BaggageMetrics.java
@@ -8,118 +8,110 @@
 
 /** Metrics for baggage propagation operations. */
 public class BaggageMetrics {
-  private static final BaggageMetrics INSTANCE = new BaggageMetrics();
-  private final AtomicLong extractedCounter = new AtomicLong(0);
-  private final AtomicLong injectedCounter = new AtomicLong(0);
-  private final AtomicLong malformedCounter = new AtomicLong(0);
-  private final AtomicLong truncatedInjectByteCounter = new AtomicLong(0);
-  private final AtomicLong truncatedInjectItemCounter = new AtomicLong(0);
-  private final AtomicLong truncatedExtractByteCounter = new AtomicLong(0);
-  private final AtomicLong truncatedExtractItemCounter = new AtomicLong(0);
-  private final Collection<TaggedCounter> taggedCounters;
-
-  public static BaggageMetrics getInstance() {
-    return INSTANCE;
-  }
-
-  private BaggageMetrics() {
-    List<TaggedCounter> counters = new ArrayList<>(5);
-    counters.add(
-        new TaggedCounter(
-            "context_header_style.extracted", this.extractedCounter, "header_style:baggage"));
-    counters.add(
-        new TaggedCounter(
-            "context_header_style.injected", this.injectedCounter, "header_style:baggage"));
-    counters.add(
-        new TaggedCounter(
-            "context_header_style.malformed", this.malformedCounter, "header_style:baggage"));
-    counters.add(
-        new TaggedCounter(
-            "context_header.truncated",
-            this.truncatedInjectByteCounter,
-            "truncation_reason:baggage_byte_count_exceeded"));
-    counters.add(
-        new TaggedCounter(
-            "context_header.truncated",
-            this.truncatedInjectItemCounter,
-            "truncation_reason:baggage_item_count_exceeded"));
-    counters.add(
-        new TaggedCounter(
-            "context_header.truncated",
-            this.truncatedExtractByteCounter,
-            "truncation_reason:baggage_extract_byte_exceeded"));
-    counters.add(
-        new TaggedCounter(
-            "context_header.truncated",
-            this.truncatedExtractItemCounter,
-            "truncation_reason:baggage_extract_item_exceeded"));
-    this.taggedCounters = Collections.unmodifiableList(counters);
-  }
-
-  public void onBaggageExtracted() {
-    this.extractedCounter.incrementAndGet();
-  }
-
-  public void onBaggageInjected() {
-    this.injectedCounter.incrementAndGet();
-  }
-
-  public void onBaggageMalformed() {
-    this.malformedCounter.incrementAndGet();
-  }
-
-  public void onBaggageTruncatedByInjectByteLimit() {
-    this.truncatedInjectByteCounter.incrementAndGet();
-  }
-
-  public void onBaggageTruncatedByInjectItemLimit() {
-    this.truncatedInjectItemCounter.incrementAndGet();
-  }
-
-  public void onBaggageTruncatedByExtractByteLimit() {
-    this.truncatedExtractByteCounter.incrementAndGet();
-  }
-
-  public void onBaggageTruncatedByExtractItemLimit() {
-    this.truncatedExtractItemCounter.incrementAndGet();
-  }
-
-  public Collection<TaggedCounter> getTaggedCounters() {
-    return this.taggedCounters;
-  }
-
-  public static class TaggedCounter implements CoreCounter {
-    private final String name;
-    private final AtomicLong counter;
-    private final String tag;
-    private long previousCount;
-
-    public TaggedCounter(String name, AtomicLong counter, String tag) {
-      this.name = name;
-      this.counter = counter;
-      this.tag = tag;
+    private static final BaggageMetrics INSTANCE = new BaggageMetrics();
+    private final AtomicLong extractedCounter = new AtomicLong(0);
+    private final AtomicLong injectedCounter = new AtomicLong(0);
+    private final AtomicLong malformedCounter = new AtomicLong(0);
+    private final AtomicLong truncatedInjectByteCounter = new AtomicLong(0);
+    private final AtomicLong truncatedInjectItemCounter = new AtomicLong(0);
+    private final AtomicLong truncatedExtractByteCounter = new AtomicLong(0);
+    private final AtomicLong truncatedExtractItemCounter = new AtomicLong(0);
+    private final Collection<TaggedCounter> taggedCounters;
+
+    public static BaggageMetrics getInstance() {
+        return INSTANCE;
     }
 
-    @Override
-    public String getName() {
-      return this.name;
+    private BaggageMetrics() {
+        List<TaggedCounter> counters = new ArrayList<>(5);
+        counters.add(
+                new TaggedCounter("context_header_style.extracted", this.extractedCounter, "header_style:baggage"));
+        counters.add(new TaggedCounter("context_header_style.injected", this.injectedCounter, "header_style:baggage"));
+        counters.add(
+                new TaggedCounter("context_header_style.malformed", this.malformedCounter, "header_style:baggage"));
+        counters.add(new TaggedCounter(
+                "context_header.truncated",
+                this.truncatedInjectByteCounter,
+                "truncation_reason:baggage_byte_count_exceeded"));
+        counters.add(new TaggedCounter(
+                "context_header.truncated",
+                this.truncatedInjectItemCounter,
+                "truncation_reason:baggage_item_count_exceeded"));
+        counters.add(new TaggedCounter(
+                "context_header.truncated",
+                this.truncatedExtractByteCounter,
+                "truncation_reason:baggage_extract_byte_exceeded"));
+        counters.add(new TaggedCounter(
+                "context_header.truncated",
+                this.truncatedExtractItemCounter,
+                "truncation_reason:baggage_extract_item_exceeded"));
+        this.taggedCounters = Collections.unmodifiableList(counters);
     }
 
-    public String getTag() {
-      return this.tag;
+    public void onBaggageExtracted() {
+        this.extractedCounter.incrementAndGet();
     }
 
-    @Override
-    public long getValue() {
-      return counter.get();
+    public void onBaggageInjected() {
+        this.injectedCounter.incrementAndGet();
     }
 
-    @Override
-    public long getValueAndReset() {
-      long count = counter.get();
-      long delta = count - previousCount;
-      previousCount = count;
-      return delta;
+    public void onBaggageMalformed() {
+        this.malformedCounter.incrementAndGet();
+    }
+
+    public void onBaggageTruncatedByInjectByteLimit() {
+        this.truncatedInjectByteCounter.incrementAndGet();
+    }
+
+    public void onBaggageTruncatedByInjectItemLimit() {
+        this.truncatedInjectItemCounter.incrementAndGet();
+    }
+
+    public void onBaggageTruncatedByExtractByteLimit() {
+        this.truncatedExtractByteCounter.incrementAndGet();
+    }
+
+    public void onBaggageTruncatedByExtractItemLimit() {
+        this.truncatedExtractItemCounter.incrementAndGet();
+    }
+
+    public Collection<TaggedCounter> getTaggedCounters() {
+        return this.taggedCounters;
+    }
+
+    public static class TaggedCounter implements CoreCounter {
+        private final String name;
+        private final AtomicLong counter;
+        private final String tag;
+        private long previousCount;
+
+        public TaggedCounter(String name, AtomicLong counter, String tag) {
+            this.name = name;
+            this.counter = counter;
+            this.tag = tag;
+        }
+
+        @Override
+        public String getName() {
+            return this.name;
+        }
+
+        public String getTag() {
+            return this.tag;
+        }
+
+        @Override
+        public long getValue() {
+            return counter.get();
+        }
+
+        @Override
+        public long getValueAndReset() {
+            long count = counter.get();
+            long delta = count - previousCount;
+            previousCount = count;
+            return delta;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/metrics/CoreCounter.java b/internal-api/src/main/java/datadog/trace/api/metrics/CoreCounter.java
index c5d9abedcec..a39aedf056d 100644
--- a/internal-api/src/main/java/datadog/trace/api/metrics/CoreCounter.java
+++ b/internal-api/src/main/java/datadog/trace/api/metrics/CoreCounter.java
@@ -2,24 +2,24 @@
 
 /** This interface describes a core counter metric. */
 public interface CoreCounter {
-  /**
-   * Get the counter name.
-   *
-   * @return The counter name.
-   */
-  String getName();
+    /**
+     * Get the counter name.
+     *
+     * @return The counter name.
+     */
+    String getName();
 
-  /**
-   * Get the counter value.
-   *
-   * @return The counter value.
-   */
-  long getValue();
+    /**
+     * Get the counter value.
+     *
+     * @return The counter value.
+     */
+    long getValue();
 
-  /**
-   * Get the value and reset the counter.
-   *
-   * @return The current counter value.
-   */
-  long getValueAndReset();
+    /**
+     * Get the value and reset the counter.
+     *
+     * @return The current counter value.
+     */
+    long getValueAndReset();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/metrics/SpanMetricRegistry.java b/internal-api/src/main/java/datadog/trace/api/metrics/SpanMetricRegistry.java
index 9b44c8ef221..a137238cb44 100644
--- a/internal-api/src/main/java/datadog/trace/api/metrics/SpanMetricRegistry.java
+++ b/internal-api/src/main/java/datadog/trace/api/metrics/SpanMetricRegistry.java
@@ -5,31 +5,31 @@
 /** This class holds the {@link SpanMetrics} instances. */
 @FunctionalInterface
 public interface SpanMetricRegistry {
-  SpanMetricRegistry NOOP = instrumentationName -> SpanMetrics.NOOP;
+    SpanMetricRegistry NOOP = instrumentationName -> SpanMetrics.NOOP;
 
-  /**
-   * Get the span metrics for an instrumentation.
-   *
-   * @param instrumentationName The instrumentation name to get span metrics.
-   * @return The related span metrics instance.
-   */
-  SpanMetrics get(String instrumentationName);
+    /**
+     * Get the span metrics for an instrumentation.
+     *
+     * @param instrumentationName The instrumentation name to get span metrics.
+     * @return The related span metrics instance.
+     */
+    SpanMetrics get(String instrumentationName);
 
-  /**
-   * @return Human-readable summary of the current span metrics.
-   */
-  default String summary() {
-    return "";
-  }
+    /**
+     * @return Human-readable summary of the current span metrics.
+     */
+    default String summary() {
+        return "";
+    }
 
-  /**
-   * Get the registry instance according the telemetry status.
-   *
-   * @return The registry instance.
-   */
-  static SpanMetricRegistry getInstance() {
-    return InstrumenterConfig.get().isTelemetryEnabled()
-        ? SpanMetricRegistryImpl.getInstance()
-        : SpanMetricRegistry.NOOP;
-  }
+    /**
+     * Get the registry instance according the telemetry status.
+     *
+     * @return The registry instance.
+     */
+    static SpanMetricRegistry getInstance() {
+        return InstrumenterConfig.get().isTelemetryEnabled()
+                ? SpanMetricRegistryImpl.getInstance()
+                : SpanMetricRegistry.NOOP;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/metrics/SpanMetricRegistryImpl.java b/internal-api/src/main/java/datadog/trace/api/metrics/SpanMetricRegistryImpl.java
index be2123c3aec..5eb0d13e9ed 100644
--- a/internal-api/src/main/java/datadog/trace/api/metrics/SpanMetricRegistryImpl.java
+++ b/internal-api/src/main/java/datadog/trace/api/metrics/SpanMetricRegistryImpl.java
@@ -6,43 +6,43 @@
 
 /** The default {@link SpanMetricRegistry} implementation. */
 public class SpanMetricRegistryImpl implements SpanMetricRegistry {
-  private static final SpanMetricRegistryImpl INSTANCE = new SpanMetricRegistryImpl();
-  private final Map<String, SpanMetricsImpl> spanMetrics;
+    private static final SpanMetricRegistryImpl INSTANCE = new SpanMetricRegistryImpl();
+    private final Map<String, SpanMetricsImpl> spanMetrics;
 
-  public static SpanMetricRegistryImpl getInstance() {
-    return INSTANCE;
-  }
+    public static SpanMetricRegistryImpl getInstance() {
+        return INSTANCE;
+    }
 
-  private SpanMetricRegistryImpl() {
-    this.spanMetrics = new ConcurrentHashMap<>();
-  }
+    private SpanMetricRegistryImpl() {
+        this.spanMetrics = new ConcurrentHashMap<>();
+    }
 
-  @Override
-  public SpanMetrics get(String instrumentationName) {
-    return this.spanMetrics.computeIfAbsent(instrumentationName, SpanMetricsImpl::new);
-  }
+    @Override
+    public SpanMetrics get(String instrumentationName) {
+        return this.spanMetrics.computeIfAbsent(instrumentationName, SpanMetricsImpl::new);
+    }
 
-  @Override
-  public String summary() {
-    StringBuilder summary = new StringBuilder();
-    for (SpanMetricsImpl metric : spanMetrics.values()) {
-      summary.append(metric.getInstrumentationName());
-      String separator = ": ";
-      for (CoreCounter counter : metric.getCounters()) {
-        summary.append(separator).append(counter.getName()).append('=').append(counter.getValue());
-        separator = ", ";
-      }
-      summary.append('\n');
+    @Override
+    public String summary() {
+        StringBuilder summary = new StringBuilder();
+        for (SpanMetricsImpl metric : spanMetrics.values()) {
+            summary.append(metric.getInstrumentationName());
+            String separator = ": ";
+            for (CoreCounter counter : metric.getCounters()) {
+                summary.append(separator).append(counter.getName()).append('=').append(counter.getValue());
+                separator = ", ";
+            }
+            summary.append('\n');
+        }
+        return summary.toString();
     }
-    return summary.toString();
-  }
 
-  /**
-   * Get all span metrics.
-   *
-   * @return All span metrics registered instances.
-   */
-  public Collection<SpanMetricsImpl> getSpanMetrics() {
-    return this.spanMetrics.values();
-  }
+    /**
+     * Get all span metrics.
+     *
+     * @return All span metrics registered instances.
+     */
+    public Collection<SpanMetricsImpl> getSpanMetrics() {
+        return this.spanMetrics.values();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/metrics/SpanMetrics.java b/internal-api/src/main/java/datadog/trace/api/metrics/SpanMetrics.java
index fa4462316ca..25c364bbddd 100644
--- a/internal-api/src/main/java/datadog/trace/api/metrics/SpanMetrics.java
+++ b/internal-api/src/main/java/datadog/trace/api/metrics/SpanMetrics.java
@@ -2,18 +2,17 @@
 
 /** The core metrics related to a span./ */
 public interface SpanMetrics {
-  SpanMetrics NOOP =
-      new SpanMetrics() {
+    SpanMetrics NOOP = new SpanMetrics() {
         @Override
         public void onSpanCreated() {}
 
         @Override
         public void onSpanFinished() {}
-      };
+    };
 
-  /** Increment span created counter. */
-  void onSpanCreated();
+    /** Increment span created counter. */
+    void onSpanCreated();
 
-  /** Increment span finished counter. */
-  void onSpanFinished();
+    /** Increment span finished counter. */
+    void onSpanFinished();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/metrics/SpanMetricsImpl.java b/internal-api/src/main/java/datadog/trace/api/metrics/SpanMetricsImpl.java
index b0781008e20..57399459d5f 100644
--- a/internal-api/src/main/java/datadog/trace/api/metrics/SpanMetricsImpl.java
+++ b/internal-api/src/main/java/datadog/trace/api/metrics/SpanMetricsImpl.java
@@ -8,65 +8,65 @@
 
 /** The default implementation of {@link SpanMetrics} based on atomic counters. */
 public class SpanMetricsImpl implements SpanMetrics {
-  private final String instrumentationName;
-  private final AtomicLong spanCreatedCounter;
-  private final AtomicLong spanFinishedCounter;
-  private final Collection<CoreCounter> coreCounters;
+    private final String instrumentationName;
+    private final AtomicLong spanCreatedCounter;
+    private final AtomicLong spanFinishedCounter;
+    private final Collection<CoreCounter> coreCounters;
 
-  public SpanMetricsImpl(String instrumentationName) {
-    this.instrumentationName = instrumentationName;
-    this.spanCreatedCounter = new AtomicLong(0);
-    this.spanFinishedCounter = new AtomicLong(0);
-    List<CoreCounter> coreCounters = new ArrayList<>(2);
-    coreCounters.add(new SpanCounter("spans_created", this.spanCreatedCounter));
-    coreCounters.add(new SpanCounter("spans_finished", this.spanFinishedCounter));
-    this.coreCounters = Collections.unmodifiableList(coreCounters);
-  }
+    public SpanMetricsImpl(String instrumentationName) {
+        this.instrumentationName = instrumentationName;
+        this.spanCreatedCounter = new AtomicLong(0);
+        this.spanFinishedCounter = new AtomicLong(0);
+        List<CoreCounter> coreCounters = new ArrayList<>(2);
+        coreCounters.add(new SpanCounter("spans_created", this.spanCreatedCounter));
+        coreCounters.add(new SpanCounter("spans_finished", this.spanFinishedCounter));
+        this.coreCounters = Collections.unmodifiableList(coreCounters);
+    }
 
-  @Override
-  public void onSpanCreated() {
-    this.spanCreatedCounter.incrementAndGet();
-  }
+    @Override
+    public void onSpanCreated() {
+        this.spanCreatedCounter.incrementAndGet();
+    }
 
-  @Override
-  public void onSpanFinished() {
-    this.spanFinishedCounter.incrementAndGet();
-  }
+    @Override
+    public void onSpanFinished() {
+        this.spanFinishedCounter.incrementAndGet();
+    }
 
-  public String getInstrumentationName() {
-    return this.instrumentationName;
-  }
+    public String getInstrumentationName() {
+        return this.instrumentationName;
+    }
 
-  public Collection<CoreCounter> getCounters() {
-    return this.coreCounters;
-  }
+    public Collection<CoreCounter> getCounters() {
+        return this.coreCounters;
+    }
 
-  private static class SpanCounter implements CoreCounter {
-    private final String name;
-    private final AtomicLong counter;
-    private long previousCount;
+    private static class SpanCounter implements CoreCounter {
+        private final String name;
+        private final AtomicLong counter;
+        private long previousCount;
 
-    private SpanCounter(String name, AtomicLong counter) {
-      this.name = name;
-      this.counter = counter;
-    }
+        private SpanCounter(String name, AtomicLong counter) {
+            this.name = name;
+            this.counter = counter;
+        }
 
-    @Override
-    public String getName() {
-      return this.name;
-    }
+        @Override
+        public String getName() {
+            return this.name;
+        }
 
-    @Override
-    public long getValue() {
-      return counter.get();
-    }
+        @Override
+        public long getValue() {
+            return counter.get();
+        }
 
-    @Override
-    public long getValueAndReset() {
-      long count = counter.get();
-      long delta = count - previousCount;
-      previousCount = count;
-      return delta;
+        @Override
+        public long getValueAndReset() {
+            long count = counter.get();
+            long delta = count - previousCount;
+            previousCount = count;
+            return delta;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/metrics/StatsMetrics.java b/internal-api/src/main/java/datadog/trace/api/metrics/StatsMetrics.java
index 8e49eb09b19..e1e928e194c 100644
--- a/internal-api/src/main/java/datadog/trace/api/metrics/StatsMetrics.java
+++ b/internal-api/src/main/java/datadog/trace/api/metrics/StatsMetrics.java
@@ -23,89 +23,88 @@
  * TaggedCounter#getValueAndReset()} is only called from the draining thread.
  */
 public final class StatsMetrics {
-  static final String COLLAPSED_SPANS = "stats.collapsed_spans";
-  static final String COLLAPSED_WHOLE_KEY = "collapsed:whole_key";
-
-  private static final StatsMetrics INSTANCE = new StatsMetrics();
-
-  // reason tag (e.g. "collapsed:additional_metric_tags") -> counter. Created on first collapse for
-  // that reason; the reason set is bounded, so this never grows unboundedly.
-  private final ConcurrentMap<String, TaggedCounter> collapsedByReason = new ConcurrentHashMap<>();
-
-  // The one reason counted per dropped span on the hot aggregator path (aggregate table at cap);
-  // every other reason is batched once per reporting cycle. Pre-created and cached so the per-span
-  // increment is a direct counter hit rather than a map lookup -- this matters precisely when a
-  // cardinality explosion pins the table at cap and every arriving span is dropped, turning a cold
-  // path hot. Still registered in the map above, so the telemetry drain sees it with the rest.
-  private final TaggedCounter wholeKeyCollapses =
-      this.collapsedByReason.computeIfAbsent(
-          COLLAPSED_WHOLE_KEY, tag -> new TaggedCounter(COLLAPSED_SPANS, tag));
-
-  public static StatsMetrics getInstance() {
-    return INSTANCE;
-  }
-
-  private StatsMetrics() {}
-
-  /**
-   * Records {@code count} spans collapsed under the given {@code reason} tag (e.g. {@code
-   * collapsed:additional_metric_tags}). No-op for a non-positive count.
-   */
-  public void onCollapsedSpans(String reason, long count) {
-    if (count <= 0) {
-      return;
-    }
-    collapsedByReason
-        .computeIfAbsent(reason, tag -> new TaggedCounter(COLLAPSED_SPANS, tag))
-        .counter
-        .addAndGet(count);
-  }
-
-  /**
-   * Records a single whole-key collapse: a span dropped because the aggregate table was at cap with
-   * no entry to evict. Increments the pre-created {@link #COLLAPSED_WHOLE_KEY} counter directly,
-   * keeping the per-dropped-span aggregator path off the reason map.
-   */
-  public void onWholeKeyCollapse() {
-    this.wholeKeyCollapses.counter.addAndGet(1);
-  }
-
-  public Collection<TaggedCounter> getTaggedCounters() {
-    return this.collapsedByReason.values();
-  }
-
-  /** A named, single-tag counter drained as a telemetry {@code count} metric. */
-  public static final class TaggedCounter implements CoreCounter {
-    private final String name;
-    private final String tag;
-    private final AtomicLong counter = new AtomicLong();
-    private long previousCount;
-
-    TaggedCounter(String name, String tag) {
-      this.name = name;
-      this.tag = tag;
+    static final String COLLAPSED_SPANS = "stats.collapsed_spans";
+    static final String COLLAPSED_WHOLE_KEY = "collapsed:whole_key";
+
+    private static final StatsMetrics INSTANCE = new StatsMetrics();
+
+    // reason tag (e.g. "collapsed:additional_metric_tags") -> counter. Created on first collapse for
+    // that reason; the reason set is bounded, so this never grows unboundedly.
+    private final ConcurrentMap<String, TaggedCounter> collapsedByReason = new ConcurrentHashMap<>();
+
+    // The one reason counted per dropped span on the hot aggregator path (aggregate table at cap);
+    // every other reason is batched once per reporting cycle. Pre-created and cached so the per-span
+    // increment is a direct counter hit rather than a map lookup -- this matters precisely when a
+    // cardinality explosion pins the table at cap and every arriving span is dropped, turning a cold
+    // path hot. Still registered in the map above, so the telemetry drain sees it with the rest.
+    private final TaggedCounter wholeKeyCollapses =
+            this.collapsedByReason.computeIfAbsent(COLLAPSED_WHOLE_KEY, tag -> new TaggedCounter(COLLAPSED_SPANS, tag));
+
+    public static StatsMetrics getInstance() {
+        return INSTANCE;
     }
 
-    @Override
-    public String getName() {
-      return this.name;
+    private StatsMetrics() {}
+
+    /**
+     * Records {@code count} spans collapsed under the given {@code reason} tag (e.g. {@code
+     * collapsed:additional_metric_tags}). No-op for a non-positive count.
+     */
+    public void onCollapsedSpans(String reason, long count) {
+        if (count <= 0) {
+            return;
+        }
+        collapsedByReason
+                .computeIfAbsent(reason, tag -> new TaggedCounter(COLLAPSED_SPANS, tag))
+                .counter
+                .addAndGet(count);
     }
 
-    public String getTag() {
-      return this.tag;
+    /**
+     * Records a single whole-key collapse: a span dropped because the aggregate table was at cap with
+     * no entry to evict. Increments the pre-created {@link #COLLAPSED_WHOLE_KEY} counter directly,
+     * keeping the per-dropped-span aggregator path off the reason map.
+     */
+    public void onWholeKeyCollapse() {
+        this.wholeKeyCollapses.counter.addAndGet(1);
     }
 
-    @Override
-    public long getValue() {
-      return this.counter.get();
+    public Collection<TaggedCounter> getTaggedCounters() {
+        return this.collapsedByReason.values();
     }
 
-    @Override
-    public long getValueAndReset() {
-      long count = this.counter.get();
-      long delta = count - this.previousCount;
-      this.previousCount = count;
-      return delta;
+    /** A named, single-tag counter drained as a telemetry {@code count} metric. */
+    public static final class TaggedCounter implements CoreCounter {
+        private final String name;
+        private final String tag;
+        private final AtomicLong counter = new AtomicLong();
+        private long previousCount;
+
+        TaggedCounter(String name, String tag) {
+            this.name = name;
+            this.tag = tag;
+        }
+
+        @Override
+        public String getName() {
+            return this.name;
+        }
+
+        public String getTag() {
+            return this.tag;
+        }
+
+        @Override
+        public long getValue() {
+            return this.counter.get();
+        }
+
+        @Override
+        public long getValueAndReset() {
+            long count = this.counter.get();
+            long delta = count - this.previousCount;
+            this.previousCount = count;
+            return delta;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/NamingSchema.java b/internal-api/src/main/java/datadog/trace/api/naming/NamingSchema.java
index 9ddf3178f3b..145d3f5911f 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/NamingSchema.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/NamingSchema.java
@@ -6,252 +6,252 @@
 import javax.annotation.Nullable;
 
 public interface NamingSchema {
-  /**
-   * Get the naming policy for caches.
-   *
-   * @return a {@link NamingSchema.ForCache} instance.
-   */
-  ForCache cache();
-
-  /**
-   * Get the naming policy for clients (http, soap, ...).
-   *
-   * @return a {@link NamingSchema.ForClient} instance.
-   */
-  ForClient client();
-
-  /**
-   * Get the naming policy for cloud providers (aws, gpc, azure, ...).
-   *
-   * @return a {@link NamingSchema.ForCloud} instance.
-   */
-  ForCloud cloud();
-
-  /**
-   * Get the naming policy for databases.
-   *
-   * @return a {@link NamingSchema.ForDatabase} instance.
-   */
-  ForDatabase database();
-
-  /**
-   * Get the naming policy for messaging.
-   *
-   * @return a {@link NamingSchema.ForMessaging} instance.
-   */
-  ForMessaging messaging();
-
-  /**
-   * Get the naming policy for servers.
-   *
-   * @return a {@link NamingSchema.ForServer} instance.
-   */
-  ForServer server();
-
-  /**
-   * Policy for peer service tags calculation
-   *
-   * @return the peer service naming policy
-   */
-  ForPeerService peerService();
-
-  /**
-   * If true, the schema allows having service names != DD_SERVICE
-   *
-   * @return {@code true} if the schema allows service names different from {@code DD_SERVICE}
-   */
-  boolean allowInferredServices();
-
-  interface ForCache {
     /**
-     * Calculate the operation name for a cache span.
+     * Get the naming policy for caches.
      *
-     * @param cacheSystem the caching system (e.g. redis, memcached,..)
-     * @return the operation name
+     * @return a {@link NamingSchema.ForCache} instance.
      */
-    @Nonnull
-    String operation(@Nonnull String cacheSystem);
+    ForCache cache();
 
     /**
-     * Calculate the service name for a cache span.
+     * Get the naming policy for clients (http, soap, ...).
      *
-     * @param cacheSystem the caching system (e.g. redis, memcached,..)
-     * @return the service name
+     * @return a {@link NamingSchema.ForClient} instance.
      */
-    String service(@Nonnull String cacheSystem);
-  }
+    ForClient client();
 
-  interface ForClient {
     /**
-     * Calculate the operation name for a client span.
+     * Get the naming policy for cloud providers (aws, gpc, azure, ...).
      *
-     * @param protocol the protocol used (e.g. http, ftp, ..)
-     * @return the operation name
+     * @return a {@link NamingSchema.ForCloud} instance.
      */
-    @Nonnull
-    String operationForProtocol(@Nonnull String protocol);
+    ForCloud cloud();
 
     /**
-     * Calculate the operation name for a client span.
+     * Get the naming policy for databases.
      *
-     * @param component the name of the instrumentation componen
-     * @return the operation name
+     * @return a {@link NamingSchema.ForDatabase} instance.
      */
-    @Nonnull
-    String operationForComponent(@Nonnull String component);
-  }
-
-  interface ForCloud {
+    ForDatabase database();
 
     /**
-     * Calculate the operation name for a generic cloud sdk call.
+     * Get the naming policy for messaging.
      *
-     * @param provider the cloud provider
-     * @param cloudService the cloud service name (e.g. s3)
-     * @param serviceOperation the qualified service operation (e.g.S3.CreateBucket)
-     * @return the operation name for this span
+     * @return a {@link NamingSchema.ForMessaging} instance.
      */
-    @Nonnull
-    String operationForRequest(
-        @Nonnull String provider, @Nonnull String cloudService, @Nonnull String serviceOperation);
+    ForMessaging messaging();
 
     /**
-     * Calculate the service name for a generic cloud sdk call.
+     * Get the naming policy for servers.
      *
-     * @param provider the cloud provider
-     * @param cloudService the cloud service name (e.g. s3). If not provided the method should
-     *     return a default value
-     * @return the service name for this span
+     * @return a {@link NamingSchema.ForServer} instance.
      */
-    String serviceForRequest(@Nonnull String provider, @Nullable String cloudService);
+    ForServer server();
 
     /**
-     * Calculate the operation name for a function as a service invocation (e.g. aws lambda)
+     * Policy for peer service tags calculation
      *
-     * @param provider the cloud provider
-     * @return the operation name for this span
+     * @return the peer service naming policy
      */
-    @Nonnull
-    String operationForFaas(@Nonnull String provider);
-  }
+    ForPeerService peerService();
 
-  interface ForDatabase {
     /**
-     * Normalize the cache name from the raw parsed one.
+     * If true, the schema allows having service names != DD_SERVICE
      *
-     * @param rawName the raw name
-     * @return the normalized one
+     * @return {@code true} if the schema allows service names different from {@code DD_SERVICE}
      */
-    String normalizedName(@Nonnull String rawName);
+    boolean allowInferredServices();
 
-    /**
-     * Calculate the operation name for a database span.
-     *
-     * @param databaseType the database type (e.g. postgres, elasticsearch,..)
-     * @return the operation name
-     */
-    @Nonnull
-    String operation(@Nonnull String databaseType);
+    interface ForCache {
+        /**
+         * Calculate the operation name for a cache span.
+         *
+         * @param cacheSystem the caching system (e.g. redis, memcached,..)
+         * @return the operation name
+         */
+        @Nonnull
+        String operation(@Nonnull String cacheSystem);
 
-    /**
-     * Calculate the service name for a database span.
-     *
-     * @param databaseType the database type (e.g. postgres, elasticsearch,..)
-     * @return the service name
-     */
-    String service(@Nonnull String databaseType);
-  }
+        /**
+         * Calculate the service name for a cache span.
+         *
+         * @param cacheSystem the caching system (e.g. redis, memcached,..)
+         * @return the service name
+         */
+        String service(@Nonnull String cacheSystem);
+    }
 
-  interface ForMessaging {
-    /**
-     * Calculate the operation name for a messaging consumer span for process operation.
-     *
-     * @param messagingSystem the messaging system (e.g. jms, kafka,..)
-     * @return the operation name
-     */
-    @Nonnull
-    String inboundOperation(@Nonnull String messagingSystem);
+    interface ForClient {
+        /**
+         * Calculate the operation name for a client span.
+         *
+         * @param protocol the protocol used (e.g. http, ftp, ..)
+         * @return the operation name
+         */
+        @Nonnull
+        String operationForProtocol(@Nonnull String protocol);
 
-    /**
-     * Calculate the service name for a messaging producer span.
-     *
-     * @param messagingSystem the messaging system (e.g. jms, kafka, amqp,..)
-     * @param useLegacyTracing if true legacy tracing service naming will be applied if compatible
-     * @return the supplier for the service name
-     */
-    Supplier<String> inboundService(@Nonnull String messagingSystem, boolean useLegacyTracing);
+        /**
+         * Calculate the operation name for a client span.
+         *
+         * @param component the name of the instrumentation componen
+         * @return the operation name
+         */
+        @Nonnull
+        String operationForComponent(@Nonnull String component);
+    }
 
-    /**
-     * Calculate the operation name for a messaging producer span.
-     *
-     * @param messagingSystem the messaging system (e.g. jms, kafka, amqp,..)
-     * @return the operation name
-     */
-    @Nonnull
-    String outboundOperation(@Nonnull String messagingSystem);
+    interface ForCloud {
 
-    /**
-     * Calculate the service name for a messaging producer span.
-     *
-     * @param messagingSystem the messaging system (e.g. jms, kafka, amqp,..)
-     * @param useLegacyTracing if true legacy tracing service naming will be applied if compatible
-     * @return the service name
-     */
-    Supplier<String> outboundService(@Nonnull String messagingSystem, boolean useLegacyTracing);
+        /**
+         * Calculate the operation name for a generic cloud sdk call.
+         *
+         * @param provider the cloud provider
+         * @param cloudService the cloud service name (e.g. s3)
+         * @param serviceOperation the qualified service operation (e.g.S3.CreateBucket)
+         * @return the operation name for this span
+         */
+        @Nonnull
+        String operationForRequest(
+                @Nonnull String provider, @Nonnull String cloudService, @Nonnull String serviceOperation);
 
-    /**
-     * Calculate the service name for a messaging time in queue synthetic span.
-     *
-     * @param messagingSystem the messaging system (e.g. jms, kafka, amqp,..)
-     * @return the service name supplier
-     */
-    @Nonnull
-    Supplier<String> timeInQueueService(@Nonnull String messagingSystem);
+        /**
+         * Calculate the service name for a generic cloud sdk call.
+         *
+         * @param provider the cloud provider
+         * @param cloudService the cloud service name (e.g. s3). If not provided the method should
+         *     return a default value
+         * @return the service name for this span
+         */
+        String serviceForRequest(@Nonnull String provider, @Nullable String cloudService);
 
-    /**
-     * Calculate the operation name for a messaging time in queue synthetic span.
-     *
-     * @param messagingSystem the messaging system (e.g. jms, kafka, amqp,..)
-     * @return the operation name
-     */
-    @Nonnull
-    String timeInQueueOperation(@Nonnull String messagingSystem);
-  }
+        /**
+         * Calculate the operation name for a function as a service invocation (e.g. aws lambda)
+         *
+         * @param provider the cloud provider
+         * @return the operation name for this span
+         */
+        @Nonnull
+        String operationForFaas(@Nonnull String provider);
+    }
 
-  interface ForPeerService {
-    /**
-     * Whenever the schema supports peer service calculation
-     *
-     * @return {@code true} if the schema supports peer service calculation
-     */
-    boolean supports();
+    interface ForDatabase {
+        /**
+         * Normalize the cache name from the raw parsed one.
+         *
+         * @param rawName the raw name
+         * @return the normalized one
+         */
+        String normalizedName(@Nonnull String rawName);
 
-    /**
-     * Calculate the tags to be added to a span to represent the peer service
-     *
-     * @param unsafeTags the span tags. Map to be mutated
-     */
-    @Nonnull
-    void tags(@Nonnull TagMap unsafeTags);
-  }
+        /**
+         * Calculate the operation name for a database span.
+         *
+         * @param databaseType the database type (e.g. postgres, elasticsearch,..)
+         * @return the operation name
+         */
+        @Nonnull
+        String operation(@Nonnull String databaseType);
 
-  interface ForServer {
-    /**
-     * Calculate the operation name for a server span.
-     *
-     * @param protocol the protocol used (e.g. http, soap, rmi ..)
-     * @return the operation name
-     */
-    @Nonnull
-    String operationForProtocol(@Nonnull String protocol);
+        /**
+         * Calculate the service name for a database span.
+         *
+         * @param databaseType the database type (e.g. postgres, elasticsearch,..)
+         * @return the service name
+         */
+        String service(@Nonnull String databaseType);
+    }
 
-    /**
-     * Calculate the operation name for a server span.
-     *
-     * @param component the name of the instrumentation component
-     * @return the operation name
-     */
-    @Nonnull
-    String operationForComponent(@Nonnull String component);
-  }
+    interface ForMessaging {
+        /**
+         * Calculate the operation name for a messaging consumer span for process operation.
+         *
+         * @param messagingSystem the messaging system (e.g. jms, kafka,..)
+         * @return the operation name
+         */
+        @Nonnull
+        String inboundOperation(@Nonnull String messagingSystem);
+
+        /**
+         * Calculate the service name for a messaging producer span.
+         *
+         * @param messagingSystem the messaging system (e.g. jms, kafka, amqp,..)
+         * @param useLegacyTracing if true legacy tracing service naming will be applied if compatible
+         * @return the supplier for the service name
+         */
+        Supplier<String> inboundService(@Nonnull String messagingSystem, boolean useLegacyTracing);
+
+        /**
+         * Calculate the operation name for a messaging producer span.
+         *
+         * @param messagingSystem the messaging system (e.g. jms, kafka, amqp,..)
+         * @return the operation name
+         */
+        @Nonnull
+        String outboundOperation(@Nonnull String messagingSystem);
+
+        /**
+         * Calculate the service name for a messaging producer span.
+         *
+         * @param messagingSystem the messaging system (e.g. jms, kafka, amqp,..)
+         * @param useLegacyTracing if true legacy tracing service naming will be applied if compatible
+         * @return the service name
+         */
+        Supplier<String> outboundService(@Nonnull String messagingSystem, boolean useLegacyTracing);
+
+        /**
+         * Calculate the service name for a messaging time in queue synthetic span.
+         *
+         * @param messagingSystem the messaging system (e.g. jms, kafka, amqp,..)
+         * @return the service name supplier
+         */
+        @Nonnull
+        Supplier<String> timeInQueueService(@Nonnull String messagingSystem);
+
+        /**
+         * Calculate the operation name for a messaging time in queue synthetic span.
+         *
+         * @param messagingSystem the messaging system (e.g. jms, kafka, amqp,..)
+         * @return the operation name
+         */
+        @Nonnull
+        String timeInQueueOperation(@Nonnull String messagingSystem);
+    }
+
+    interface ForPeerService {
+        /**
+         * Whenever the schema supports peer service calculation
+         *
+         * @return {@code true} if the schema supports peer service calculation
+         */
+        boolean supports();
+
+        /**
+         * Calculate the tags to be added to a span to represent the peer service
+         *
+         * @param unsafeTags the span tags. Map to be mutated
+         */
+        @Nonnull
+        void tags(@Nonnull TagMap unsafeTags);
+    }
+
+    interface ForServer {
+        /**
+         * Calculate the operation name for a server span.
+         *
+         * @param protocol the protocol used (e.g. http, soap, rmi ..)
+         * @return the operation name
+         */
+        @Nonnull
+        String operationForProtocol(@Nonnull String protocol);
+
+        /**
+         * Calculate the operation name for a server span.
+         *
+         * @param component the name of the instrumentation component
+         * @return the operation name
+         */
+        @Nonnull
+        String operationForComponent(@Nonnull String component);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/SpanNaming.java b/internal-api/src/main/java/datadog/trace/api/naming/SpanNaming.java
index 972a27a00d2..94717ac9798 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/SpanNaming.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/SpanNaming.java
@@ -7,44 +7,44 @@
 
 /** This is the main entry point to drive span naming decisions. */
 public class SpanNaming {
-  public static final int SCHEMA_MIN_VERSION = 0;
-  public static final int SCHEMA_MAX_VERSION = 1;
-
-  private static class Singleton {
-    private static SpanNaming INSTANCE = new SpanNaming();
-  }
-
-  public static SpanNaming instance() {
-    return Singleton.INSTANCE;
-  }
-
-  private final NamingSchema namingSchema;
-  private final int version;
-
-  // Choice of version will be driven by a configuration parameter when all the instrumentations'
-  // naming will be addressed
-  private SpanNaming() {
-    this(Config.get().getSpanAttributeSchemaVersion());
-  }
-
-  private SpanNaming(final int version) {
-    this.version = version;
-    switch (version) {
-      case 1:
-        namingSchema = new NamingSchemaV1();
-        break;
-      default:
-        namingSchema = new NamingSchemaV0();
-        break;
+    public static final int SCHEMA_MIN_VERSION = 0;
+    public static final int SCHEMA_MAX_VERSION = 1;
+
+    private static class Singleton {
+        private static SpanNaming INSTANCE = new SpanNaming();
+    }
+
+    public static SpanNaming instance() {
+        return Singleton.INSTANCE;
+    }
+
+    private final NamingSchema namingSchema;
+    private final int version;
+
+    // Choice of version will be driven by a configuration parameter when all the instrumentations'
+    // naming will be addressed
+    private SpanNaming() {
+        this(Config.get().getSpanAttributeSchemaVersion());
     }
-  }
 
-  @Nonnull
-  public NamingSchema namingSchema() {
-    return namingSchema;
-  }
+    private SpanNaming(final int version) {
+        this.version = version;
+        switch (version) {
+            case 1:
+                namingSchema = new NamingSchemaV1();
+                break;
+            default:
+                namingSchema = new NamingSchemaV0();
+                break;
+        }
+    }
 
-  public int version() {
-    return version;
-  }
+    @Nonnull
+    public NamingSchema namingSchema() {
+        return namingSchema;
+    }
+
+    public int version() {
+        return version;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v0/CacheNamingV0.java b/internal-api/src/main/java/datadog/trace/api/naming/v0/CacheNamingV0.java
index 819f9405296..eb743920770 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v0/CacheNamingV0.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v0/CacheNamingV0.java
@@ -6,40 +6,40 @@
 
 public class CacheNamingV0 implements NamingSchema.ForCache {
 
-  private final boolean allowInferredServices;
+    private final boolean allowInferredServices;
 
-  public CacheNamingV0(boolean allowInferredServices) {
-    this.allowInferredServices = allowInferredServices;
-  }
-
-  @Nonnull
-  @Override
-  public String operation(@Nonnull String cacheSystem) {
-    String postfix;
-    switch (cacheSystem) {
-      case "ignite":
-        postfix = ".cache";
-        break;
-      case "hazelcast":
-        postfix = ".invoke";
-        break;
-      default:
-        postfix = ".query";
-        break;
+    public CacheNamingV0(boolean allowInferredServices) {
+        this.allowInferredServices = allowInferredServices;
     }
-    return cacheSystem + postfix;
-  }
 
-  @Override
-  public String service(@Nonnull String cacheSystem) {
-    String service = cacheSystem;
-    if (!allowInferredServices) {
-      return null;
+    @Nonnull
+    @Override
+    public String operation(@Nonnull String cacheSystem) {
+        String postfix;
+        switch (cacheSystem) {
+            case "ignite":
+                postfix = ".cache";
+                break;
+            case "hazelcast":
+                postfix = ".invoke";
+                break;
+            default:
+                postfix = ".query";
+                break;
+        }
+        return cacheSystem + postfix;
     }
-    if ("hazelcast".equals(cacheSystem)) {
-      service = "hazelcast-sdk";
+
+    @Override
+    public String service(@Nonnull String cacheSystem) {
+        String service = cacheSystem;
+        if (!allowInferredServices) {
+            return null;
+        }
+        if ("hazelcast".equals(cacheSystem)) {
+            service = "hazelcast-sdk";
+        }
+        ServiceNameCollector.get().addService(service);
+        return service;
     }
-    ServiceNameCollector.get().addService(service);
-    return service;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v0/ClientNamingV0.java b/internal-api/src/main/java/datadog/trace/api/naming/v0/ClientNamingV0.java
index df48b449d85..00ba9aa64b3 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v0/ClientNamingV0.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v0/ClientNamingV0.java
@@ -5,41 +5,41 @@
 
 public class ClientNamingV0 implements NamingSchema.ForClient {
 
-  @Nonnull
-  @Override
-  public String operationForProtocol(@Nonnull String protocol) {
-    final String postfix;
-    switch (protocol) {
-      case "grpc":
-        postfix = ".client";
-        break;
-      case "rmi":
-        postfix = ".invoke";
-        break;
-      default:
-        postfix = ".request";
-    }
+    @Nonnull
+    @Override
+    public String operationForProtocol(@Nonnull String protocol) {
+        final String postfix;
+        switch (protocol) {
+            case "grpc":
+                postfix = ".client";
+                break;
+            case "rmi":
+                postfix = ".invoke";
+                break;
+            default:
+                postfix = ".request";
+        }
 
-    return protocol + postfix;
-  }
+        return protocol + postfix;
+    }
 
-  @Nonnull
-  @Override
-  public String operationForComponent(@Nonnull String component) {
-    switch (component) {
-      case "play-ws":
-      case "okhttp":
-        return component + ".request";
-      case "netty-client":
-        return "netty.client.request";
-      case "akka-http-client":
-        return "akka-http.client.request";
-      case "pekko-http-client":
-        return "pekko-http.client.request";
-      case "jax-rs.client":
-        return "jax-rs.client.call";
-      default:
-        return "http.request";
+    @Nonnull
+    @Override
+    public String operationForComponent(@Nonnull String component) {
+        switch (component) {
+            case "play-ws":
+            case "okhttp":
+                return component + ".request";
+            case "netty-client":
+                return "netty.client.request";
+            case "akka-http-client":
+                return "akka-http.client.request";
+            case "pekko-http-client":
+                return "pekko-http.client.request";
+            case "jax-rs.client":
+                return "jax-rs.client.call";
+            default:
+                return "http.request";
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v0/CloudNamingV0.java b/internal-api/src/main/java/datadog/trace/api/naming/v0/CloudNamingV0.java
index f47ded67ecd..9bd3d13daf3 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v0/CloudNamingV0.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v0/CloudNamingV0.java
@@ -6,50 +6,49 @@
 import javax.annotation.Nullable;
 
 public class CloudNamingV0 implements NamingSchema.ForCloud {
-  public static final String JAVA_AWS_SDK = "java-aws-sdk";
-  private final boolean allowInferredServices;
-
-  public CloudNamingV0(boolean allowInferredServices) {
-    this.allowInferredServices = allowInferredServices;
-  }
-
-  @Nonnull
-  @Override
-  public String operationForRequest(
-      @Nonnull final String provider,
-      @Nonnull final String cloudService,
-      @Nonnull final String qualifiedOperation) {
-    // only aws sdk is right now implemented
-    return "aws.http";
-  }
-
-  @Override
-  public String serviceForRequest(
-      @Nonnull final String provider, @Nullable final String cloudService) {
-    if (!allowInferredServices) {
-      return null;
+    public static final String JAVA_AWS_SDK = "java-aws-sdk";
+    private final boolean allowInferredServices;
+
+    public CloudNamingV0(boolean allowInferredServices) {
+        this.allowInferredServices = allowInferredServices;
     }
 
-    // we only manage aws. Future switch for other cloud providers will be needed in the future
-    if (cloudService == null) {
-      ServiceNameCollector.get().addService(JAVA_AWS_SDK);
-      return JAVA_AWS_SDK;
+    @Nonnull
+    @Override
+    public String operationForRequest(
+            @Nonnull final String provider,
+            @Nonnull final String cloudService,
+            @Nonnull final String qualifiedOperation) {
+        // only aws sdk is right now implemented
+        return "aws.http";
     }
 
-    switch (cloudService) {
-      case "sns":
-      case "sqs":
-        ServiceNameCollector.get().addService(cloudService);
-        return cloudService;
-      default:
-        ServiceNameCollector.get().addService(JAVA_AWS_SDK);
-        return JAVA_AWS_SDK;
+    @Override
+    public String serviceForRequest(@Nonnull final String provider, @Nullable final String cloudService) {
+        if (!allowInferredServices) {
+            return null;
+        }
+
+        // we only manage aws. Future switch for other cloud providers will be needed in the future
+        if (cloudService == null) {
+            ServiceNameCollector.get().addService(JAVA_AWS_SDK);
+            return JAVA_AWS_SDK;
+        }
+
+        switch (cloudService) {
+            case "sns":
+            case "sqs":
+                ServiceNameCollector.get().addService(cloudService);
+                return cloudService;
+            default:
+                ServiceNameCollector.get().addService(JAVA_AWS_SDK);
+                return JAVA_AWS_SDK;
+        }
     }
-  }
 
-  @Nonnull
-  @Override
-  public String operationForFaas(@Nonnull final String provider) {
-    return "dd-tracer-serverless-span";
-  }
+    @Nonnull
+    @Override
+    public String operationForFaas(@Nonnull final String provider) {
+        return "dd-tracer-serverless-span";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v0/DatabaseNamingV0.java b/internal-api/src/main/java/datadog/trace/api/naming/v0/DatabaseNamingV0.java
index ce7c1501f08..128e4e8cc03 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v0/DatabaseNamingV0.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v0/DatabaseNamingV0.java
@@ -6,33 +6,33 @@
 
 public class DatabaseNamingV0 implements NamingSchema.ForDatabase {
 
-  private final boolean allowInferredServices;
+    private final boolean allowInferredServices;
 
-  public DatabaseNamingV0(boolean allowInferredServices) {
-    this.allowInferredServices = allowInferredServices;
-  }
+    public DatabaseNamingV0(boolean allowInferredServices) {
+        this.allowInferredServices = allowInferredServices;
+    }
 
-  @Override
-  public String normalizedName(@Nonnull String rawName) {
-    return rawName;
-  }
+    @Override
+    public String normalizedName(@Nonnull String rawName) {
+        return rawName;
+    }
 
-  @Nonnull
-  @Override
-  public String operation(@Nonnull String databaseType) {
-    String postfix = ".query";
-    if ("couchbase".equals(databaseType)) {
-      postfix = ".call";
+    @Nonnull
+    @Override
+    public String operation(@Nonnull String databaseType) {
+        String postfix = ".query";
+        if ("couchbase".equals(databaseType)) {
+            postfix = ".call";
+        }
+        return databaseType + postfix;
     }
-    return databaseType + postfix;
-  }
 
-  @Override
-  public String service(@Nonnull String databaseType) {
-    if (allowInferredServices) {
-      ServiceNameCollector.get().addService(databaseType);
-      return databaseType;
+    @Override
+    public String service(@Nonnull String databaseType) {
+        if (allowInferredServices) {
+            ServiceNameCollector.get().addService(databaseType);
+            return databaseType;
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v0/MessagingNamingV0.java b/internal-api/src/main/java/datadog/trace/api/naming/v0/MessagingNamingV0.java
index 60447310128..e0ccd65ae49 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v0/MessagingNamingV0.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v0/MessagingNamingV0.java
@@ -9,90 +9,87 @@
 
 class MessagingNamingV0 implements NamingSchema.ForMessaging {
 
-  private static class ClassloaderDependentNamingSupplier implements Supplier<String> {
-    private static final ClassloaderDependentNamingSupplier INSTANCE =
-        new ClassloaderDependentNamingSupplier();
-    private final String configServiceName = Config.get().getServiceName();
+    private static class ClassloaderDependentNamingSupplier implements Supplier<String> {
+        private static final ClassloaderDependentNamingSupplier INSTANCE = new ClassloaderDependentNamingSupplier();
+        private final String configServiceName = Config.get().getServiceName();
 
-    @Override
-    public String get() {
-      final ClassloaderConfigurationOverrides.ContextualInfo contextual =
-          ClassloaderConfigurationOverrides.maybeGetContextualInfo();
-      if (contextual != null && contextual.getServiceName() != null) {
-        final String serviceName = contextual.getServiceName();
-        ServiceNameCollector.get().addService(serviceName);
-        return serviceName;
-      }
-      return configServiceName;
+        @Override
+        public String get() {
+            final ClassloaderConfigurationOverrides.ContextualInfo contextual =
+                    ClassloaderConfigurationOverrides.maybeGetContextualInfo();
+            if (contextual != null && contextual.getServiceName() != null) {
+                final String serviceName = contextual.getServiceName();
+                ServiceNameCollector.get().addService(serviceName);
+                return serviceName;
+            }
+            return configServiceName;
+        }
     }
-  }
 
-  private static final Supplier<String> NULL_SUPPLIER = () -> null;
+    private static final Supplier<String> NULL_SUPPLIER = () -> null;
+
+    private final boolean allowInferredServices;
 
-  private final boolean allowInferredServices;
+    public MessagingNamingV0(final boolean allowInferredServices) {
+        this.allowInferredServices = allowInferredServices;
+    }
 
-  public MessagingNamingV0(final boolean allowInferredServices) {
-    this.allowInferredServices = allowInferredServices;
-  }
+    @Nonnull
+    @Override
+    public String outboundOperation(@Nonnull final String messagingSystem) {
+        if ("amqp".equals(messagingSystem)) {
+            return "amqp.command";
+        }
+        return messagingSystem + ".produce";
+    }
 
-  @Nonnull
-  @Override
-  public String outboundOperation(@Nonnull final String messagingSystem) {
-    if ("amqp".equals(messagingSystem)) {
-      return "amqp.command";
+    @Override
+    public Supplier<String> outboundService(@Nonnull final String messagingSystem, boolean useLegacyTracing) {
+        return inboundService(messagingSystem, useLegacyTracing);
     }
-    return messagingSystem + ".produce";
-  }
 
-  @Override
-  public Supplier<String> outboundService(
-      @Nonnull final String messagingSystem, boolean useLegacyTracing) {
-    return inboundService(messagingSystem, useLegacyTracing);
-  }
+    @Nonnull
+    @Override
+    public String inboundOperation(@Nonnull final String messagingSystem) {
+        switch (messagingSystem) {
+            case "amqp":
+                return "amqp.command";
+            case "sqs":
+                return "aws.http";
+            default:
+                return messagingSystem + ".consume";
+        }
+    }
 
-  @Nonnull
-  @Override
-  public String inboundOperation(@Nonnull final String messagingSystem) {
-    switch (messagingSystem) {
-      case "amqp":
-        return "amqp.command";
-      case "sqs":
-        return "aws.http";
-      default:
-        return messagingSystem + ".consume";
+    @Override
+    public Supplier<String> inboundService(@Nonnull final String messagingSystem, boolean useLegacyTracing) {
+        if (allowInferredServices) {
+            if (useLegacyTracing) {
+                ServiceNameCollector.get().addService(messagingSystem);
+                return messagingSystem::toString;
+            } else if (Config.get().isJeeSplitByDeployment()) {
+                // in this particular case we're narrowing the service name from the context classloader.
+                // this is more expensive so we're doing only if that feature is enabled.
+                return ClassloaderDependentNamingSupplier.INSTANCE;
+            }
+            return Config.get()::getServiceName;
+        }
+        return NULL_SUPPLIER;
     }
-  }
 
-  @Override
-  public Supplier<String> inboundService(
-      @Nonnull final String messagingSystem, boolean useLegacyTracing) {
-    if (allowInferredServices) {
-      if (useLegacyTracing) {
+    @Override
+    @Nonnull
+    public Supplier<String> timeInQueueService(@Nonnull final String messagingSystem) {
         ServiceNameCollector.get().addService(messagingSystem);
-        return messagingSystem::toString;
-      } else if (Config.get().isJeeSplitByDeployment()) {
-        // in this particular case we're narrowing the service name from the context classloader.
-        // this is more expensive so we're doing only if that feature is enabled.
-        return ClassloaderDependentNamingSupplier.INSTANCE;
-      }
-      return Config.get()::getServiceName;
+        return () -> messagingSystem;
     }
-    return NULL_SUPPLIER;
-  }
-
-  @Override
-  @Nonnull
-  public Supplier<String> timeInQueueService(@Nonnull final String messagingSystem) {
-    ServiceNameCollector.get().addService(messagingSystem);
-    return () -> messagingSystem;
-  }
 
-  @Nonnull
-  @Override
-  public String timeInQueueOperation(@Nonnull String messagingSystem) {
-    if ("sqs".equals(messagingSystem)) {
-      return "aws.http";
+    @Nonnull
+    @Override
+    public String timeInQueueOperation(@Nonnull String messagingSystem) {
+        if ("sqs".equals(messagingSystem)) {
+            return "aws.http";
+        }
+        return messagingSystem + ".deliver";
     }
-    return messagingSystem + ".deliver";
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v0/NamingSchemaV0.java b/internal-api/src/main/java/datadog/trace/api/naming/v0/NamingSchemaV0.java
index c0f8d4d225c..4a8f61ec954 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v0/NamingSchemaV0.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v0/NamingSchemaV0.java
@@ -6,58 +6,54 @@
 
 public class NamingSchemaV0 implements NamingSchema {
 
-  private final boolean allowInferredServices =
-      !Config.get().isRemoveIntegrationServiceNamesEnabled();
-  private final NamingSchema.ForCache cacheNaming = new CacheNamingV0(allowInferredServices);
-  private final NamingSchema.ForClient clientNaming = new ClientNamingV0();
-  private final NamingSchema.ForCloud cloudNaming = new CloudNamingV0(allowInferredServices);
-  private final NamingSchema.ForDatabase databaseNaming =
-      new DatabaseNamingV0(allowInferredServices);
-  private final NamingSchema.ForMessaging messagingNaming =
-      new MessagingNamingV0(allowInferredServices);
-  private final NamingSchema.ForPeerService peerServiceNaming =
-      Config.get().isPeerServiceDefaultsEnabled()
-          ? new PeerServiceNamingV1(Config.get().getPeerServiceComponentOverrides())
-          : new PeerServiceNamingV0();
-  private final NamingSchema.ForServer serverNaming = new ServerNamingV0();
-
-  @Override
-  public NamingSchema.ForCache cache() {
-    return cacheNaming;
-  }
-
-  @Override
-  public ForClient client() {
-    return clientNaming;
-  }
-
-  @Override
-  public ForCloud cloud() {
-    return cloudNaming;
-  }
-
-  @Override
-  public ForDatabase database() {
-    return databaseNaming;
-  }
-
-  @Override
-  public ForMessaging messaging() {
-    return messagingNaming;
-  }
-
-  @Override
-  public ForServer server() {
-    return serverNaming;
-  }
-
-  @Override
-  public ForPeerService peerService() {
-    return peerServiceNaming;
-  }
-
-  @Override
-  public boolean allowInferredServices() {
-    return allowInferredServices;
-  }
+    private final boolean allowInferredServices = !Config.get().isRemoveIntegrationServiceNamesEnabled();
+    private final NamingSchema.ForCache cacheNaming = new CacheNamingV0(allowInferredServices);
+    private final NamingSchema.ForClient clientNaming = new ClientNamingV0();
+    private final NamingSchema.ForCloud cloudNaming = new CloudNamingV0(allowInferredServices);
+    private final NamingSchema.ForDatabase databaseNaming = new DatabaseNamingV0(allowInferredServices);
+    private final NamingSchema.ForMessaging messagingNaming = new MessagingNamingV0(allowInferredServices);
+    private final NamingSchema.ForPeerService peerServiceNaming = Config.get().isPeerServiceDefaultsEnabled()
+            ? new PeerServiceNamingV1(Config.get().getPeerServiceComponentOverrides())
+            : new PeerServiceNamingV0();
+    private final NamingSchema.ForServer serverNaming = new ServerNamingV0();
+
+    @Override
+    public NamingSchema.ForCache cache() {
+        return cacheNaming;
+    }
+
+    @Override
+    public ForClient client() {
+        return clientNaming;
+    }
+
+    @Override
+    public ForCloud cloud() {
+        return cloudNaming;
+    }
+
+    @Override
+    public ForDatabase database() {
+        return databaseNaming;
+    }
+
+    @Override
+    public ForMessaging messaging() {
+        return messagingNaming;
+    }
+
+    @Override
+    public ForServer server() {
+        return serverNaming;
+    }
+
+    @Override
+    public ForPeerService peerService() {
+        return peerServiceNaming;
+    }
+
+    @Override
+    public boolean allowInferredServices() {
+        return allowInferredServices;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v0/PeerServiceNamingV0.java b/internal-api/src/main/java/datadog/trace/api/naming/v0/PeerServiceNamingV0.java
index 3e76d657069..b550fb741b1 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v0/PeerServiceNamingV0.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v0/PeerServiceNamingV0.java
@@ -5,12 +5,12 @@
 import javax.annotation.Nonnull;
 
 public class PeerServiceNamingV0 implements NamingSchema.ForPeerService {
-  @Override
-  public boolean supports() {
-    return false;
-  }
+    @Override
+    public boolean supports() {
+        return false;
+    }
 
-  @Nonnull
-  @Override
-  public void tags(@Nonnull final TagMap unsafeTags) {}
+    @Nonnull
+    @Override
+    public void tags(@Nonnull final TagMap unsafeTags) {}
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v0/ServerNamingV0.java b/internal-api/src/main/java/datadog/trace/api/naming/v0/ServerNamingV0.java
index 60b7fd88206..4a8ad450ef6 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v0/ServerNamingV0.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v0/ServerNamingV0.java
@@ -4,47 +4,47 @@
 import javax.annotation.Nonnull;
 
 public class ServerNamingV0 implements NamingSchema.ForServer {
-  @Nonnull
-  @Override
-  public String operationForProtocol(@Nonnull String protocol) {
-    if ("grpc".equals(protocol)) {
-      return "grpc.server";
+    @Nonnull
+    @Override
+    public String operationForProtocol(@Nonnull String protocol) {
+        if ("grpc".equals(protocol)) {
+            return "grpc.server";
+        }
+        return protocol + ".request";
     }
-    return protocol + ".request";
-  }
 
-  @Nonnull
-  @Override
-  public String operationForComponent(@Nonnull String component) {
-    final String prefix;
-    switch (component) {
-      case "undertow-http-server":
-        prefix = "undertow-http";
-        break;
-      case "akka-http-server":
-        prefix = "akka-http";
-        break;
-      case "pekko-http-server":
-        prefix = "pekko-http";
-        break;
-      case "netty":
-      case "finatra":
-      case "axway-http":
-        prefix = component;
-        break;
-      case "spray-http-server":
-        prefix = "spray-http";
-        break;
-      case "restlet-http-server":
-        prefix = "restlet-http";
-        break;
-      case "synapse-server":
-        prefix = "synapse";
-        break;
-      default:
-        prefix = "servlet";
-        break;
+    @Nonnull
+    @Override
+    public String operationForComponent(@Nonnull String component) {
+        final String prefix;
+        switch (component) {
+            case "undertow-http-server":
+                prefix = "undertow-http";
+                break;
+            case "akka-http-server":
+                prefix = "akka-http";
+                break;
+            case "pekko-http-server":
+                prefix = "pekko-http";
+                break;
+            case "netty":
+            case "finatra":
+            case "axway-http":
+                prefix = component;
+                break;
+            case "spray-http-server":
+                prefix = "spray-http";
+                break;
+            case "restlet-http-server":
+                prefix = "restlet-http";
+                break;
+            case "synapse-server":
+                prefix = "synapse";
+                break;
+            default:
+                prefix = "servlet";
+                break;
+        }
+        return prefix + ".request";
     }
-    return prefix + ".request";
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v1/CacheNamingV1.java b/internal-api/src/main/java/datadog/trace/api/naming/v1/CacheNamingV1.java
index 5b63cdcbc3e..4eee80dcbd6 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v1/CacheNamingV1.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v1/CacheNamingV1.java
@@ -4,14 +4,14 @@
 import javax.annotation.Nonnull;
 
 public class CacheNamingV1 implements NamingSchema.ForCache {
-  @Nonnull
-  @Override
-  public String operation(@Nonnull String cacheSystem) {
-    return cacheSystem + ".command";
-  }
+    @Nonnull
+    @Override
+    public String operation(@Nonnull String cacheSystem) {
+        return cacheSystem + ".command";
+    }
 
-  @Override
-  public String service(@Nonnull String cacheSystem) {
-    return null;
-  }
+    @Override
+    public String service(@Nonnull String cacheSystem) {
+        return null;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v1/ClientNamingV1.java b/internal-api/src/main/java/datadog/trace/api/naming/v1/ClientNamingV1.java
index d1342552704..5a8be9ec4e9 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v1/ClientNamingV1.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v1/ClientNamingV1.java
@@ -5,29 +5,29 @@
 
 public class ClientNamingV1 implements NamingSchema.ForClient {
 
-  @Nonnull
-  private String normalizeProtocol(@Nonnull final String protocol) {
-    switch (protocol) {
-      case "http":
-      case "https":
-        return "http";
-      case "ftp":
-      case "ftps":
-        return "ftp";
-      default:
-        return protocol;
+    @Nonnull
+    private String normalizeProtocol(@Nonnull final String protocol) {
+        switch (protocol) {
+            case "http":
+            case "https":
+                return "http";
+            case "ftp":
+            case "ftps":
+                return "ftp";
+            default:
+                return protocol;
+        }
     }
-  }
 
-  @Nonnull
-  @Override
-  public String operationForProtocol(@Nonnull String protocol) {
-    return normalizeProtocol(protocol) + ".client.request";
-  }
+    @Nonnull
+    @Override
+    public String operationForProtocol(@Nonnull String protocol) {
+        return normalizeProtocol(protocol) + ".client.request";
+    }
 
-  @Nonnull
-  @Override
-  public String operationForComponent(@Nonnull String component) {
-    return "http.client.request";
-  }
+    @Nonnull
+    @Override
+    public String operationForComponent(@Nonnull String component) {
+        return "http.client.request";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v1/CloudNamingV1.java b/internal-api/src/main/java/datadog/trace/api/naming/v1/CloudNamingV1.java
index 88691d50660..56bfdd2888d 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v1/CloudNamingV1.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v1/CloudNamingV1.java
@@ -7,52 +7,51 @@
 import javax.annotation.Nullable;
 
 public class CloudNamingV1 implements NamingSchema.ForCloud {
-  @Nonnull
-  @Override
-  public String operationForRequest(
-      @Nonnull final String provider,
-      @Nonnull final String cloudService,
-      @Nonnull final String qualifiedOperation) {
-    // only aws sdk is right now implemented
-    switch (qualifiedOperation) {
-      // sdk 1.x format
-      case "SQS.SendMessage":
-      case "SQS.SendMessageBatch":
-      // sdk 2.x format
-      case "Sqs.SendMessage":
-      case "Sqs.SendMessageBatch":
-        return SpanNaming.instance().namingSchema().messaging().outboundOperation("sqs");
+    @Nonnull
+    @Override
+    public String operationForRequest(
+            @Nonnull final String provider,
+            @Nonnull final String cloudService,
+            @Nonnull final String qualifiedOperation) {
+        // only aws sdk is right now implemented
+        switch (qualifiedOperation) {
+            // sdk 1.x format
+            case "SQS.SendMessage":
+            case "SQS.SendMessageBatch":
+            // sdk 2.x format
+            case "Sqs.SendMessage":
+            case "Sqs.SendMessageBatch":
+                return SpanNaming.instance().namingSchema().messaging().outboundOperation("sqs");
 
-      case "Sqs.ReceiveMessage":
-      case "SQS.ReceiveMessage":
-        return SpanNaming.instance().namingSchema().messaging().inboundOperation("sqs");
-      case "Sns.Publish":
-      case "SNS.Publish":
-      case "Sns.PublishBatch":
-      case "SNS.PublishBatch":
-        return SpanNaming.instance().namingSchema().messaging().outboundOperation("sns");
-      default:
-        final String lowercaseService = cloudService.toLowerCase(Locale.ROOT);
-        return String.join(".", provider, lowercaseService, "request"); // aws.s3.request
+            case "Sqs.ReceiveMessage":
+            case "SQS.ReceiveMessage":
+                return SpanNaming.instance().namingSchema().messaging().inboundOperation("sqs");
+            case "Sns.Publish":
+            case "SNS.Publish":
+            case "Sns.PublishBatch":
+            case "SNS.PublishBatch":
+                return SpanNaming.instance().namingSchema().messaging().outboundOperation("sns");
+            default:
+                final String lowercaseService = cloudService.toLowerCase(Locale.ROOT);
+                return String.join(".", provider, lowercaseService, "request"); // aws.s3.request
+        }
     }
-  }
 
-  @Override
-  public String serviceForRequest(
-      @Nonnull final String provider, @Nullable final String cloudService) {
-    return null;
-  }
+    @Override
+    public String serviceForRequest(@Nonnull final String provider, @Nullable final String cloudService) {
+        return null;
+    }
 
-  @Nonnull
-  @Override
-  public String operationForFaas(@Nonnull final String provider) {
-    switch (provider) {
-      case "aws":
-        return "aws.lambda.invoke";
-      case "azure":
-        return "azure.functions.invoke";
-      default:
-        return "aws.lambda.invoke";
+    @Nonnull
+    @Override
+    public String operationForFaas(@Nonnull final String provider) {
+        switch (provider) {
+            case "aws":
+                return "aws.lambda.invoke";
+            case "azure":
+                return "azure.functions.invoke";
+            default:
+                return "aws.lambda.invoke";
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v1/DatabaseNamingV1.java b/internal-api/src/main/java/datadog/trace/api/naming/v1/DatabaseNamingV1.java
index 129944cc61a..eb9b55fa3b9 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v1/DatabaseNamingV1.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v1/DatabaseNamingV1.java
@@ -4,37 +4,37 @@
 import javax.annotation.Nonnull;
 
 public class DatabaseNamingV1 implements NamingSchema.ForDatabase {
-  @Override
-  public String normalizedName(@Nonnull String rawName) {
-    switch (rawName) {
-      case "mongo":
-        return "mongodb";
-      case "sqlserver":
-        return "mssql";
+    @Override
+    public String normalizedName(@Nonnull String rawName) {
+        switch (rawName) {
+            case "mongo":
+                return "mongodb";
+            case "sqlserver":
+                return "mssql";
+        }
+        return rawName;
     }
-    return rawName;
-  }
 
-  @Nonnull
-  @Override
-  public String operation(@Nonnull String databaseType) {
-    final String prefix;
-    switch (databaseType) {
-      case "elasticsearch.rest":
-        prefix = "elasticsearch";
-        break;
-      case "opensearch.rest":
-        prefix = "opensearch";
-        break;
-      default:
-        prefix = databaseType;
+    @Nonnull
+    @Override
+    public String operation(@Nonnull String databaseType) {
+        final String prefix;
+        switch (databaseType) {
+            case "elasticsearch.rest":
+                prefix = "elasticsearch";
+                break;
+            case "opensearch.rest":
+                prefix = "opensearch";
+                break;
+            default:
+                prefix = databaseType;
+        }
+        // already normalized when calling dbType on the decorator. It saves one operation
+        return prefix + ".query";
     }
-    // already normalized when calling dbType on the decorator. It saves one operation
-    return prefix + ".query";
-  }
 
-  @Override
-  public String service(@Nonnull String databaseType) {
-    return null;
-  }
+    @Override
+    public String service(@Nonnull String databaseType) {
+        return null;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v1/MessagingNamingV1.java b/internal-api/src/main/java/datadog/trace/api/naming/v1/MessagingNamingV1.java
index 298d724a83e..f8d49b1b089 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v1/MessagingNamingV1.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v1/MessagingNamingV1.java
@@ -5,53 +5,51 @@
 import javax.annotation.Nonnull;
 
 public class MessagingNamingV1 implements NamingSchema.ForMessaging {
-  private static final Supplier<String> NULL_SUPPLIER = () -> null;
-
-  private String normalizeForCloud(@Nonnull final String messagingSystem) {
-    switch (messagingSystem) {
-      case "sns":
-      case "sqs":
-        return "aws." + messagingSystem;
-      case "google-pubsub":
-        return "gcp.pubsub";
-      default:
-        return messagingSystem;
+    private static final Supplier<String> NULL_SUPPLIER = () -> null;
+
+    private String normalizeForCloud(@Nonnull final String messagingSystem) {
+        switch (messagingSystem) {
+            case "sns":
+            case "sqs":
+                return "aws." + messagingSystem;
+            case "google-pubsub":
+                return "gcp.pubsub";
+            default:
+                return messagingSystem;
+        }
+    }
+
+    @Nonnull
+    @Override
+    public String outboundOperation(@Nonnull String messagingSystem) {
+        return normalizeForCloud(messagingSystem) + ".send";
+    }
+
+    @Override
+    public Supplier<String> outboundService(@Nonnull String messagingSystem, boolean useLegacyTracing) {
+        return NULL_SUPPLIER;
+    }
+
+    @Nonnull
+    @Override
+    public String inboundOperation(@Nonnull String messagingSystem) {
+        return normalizeForCloud(messagingSystem) + ".process";
+    }
+
+    @Override
+    public Supplier<String> inboundService(@Nonnull String messagingSystem, boolean useLegacyTracing) {
+        return NULL_SUPPLIER;
+    }
+
+    @Override
+    @Nonnull
+    public Supplier<String> timeInQueueService(@Nonnull String messagingSystem) {
+        return () -> messagingSystem + "-queue";
+    }
+
+    @Nonnull
+    @Override
+    public String timeInQueueOperation(@Nonnull String messagingSystem) {
+        return normalizeForCloud(messagingSystem) + ".deliver";
     }
-  }
-
-  @Nonnull
-  @Override
-  public String outboundOperation(@Nonnull String messagingSystem) {
-    return normalizeForCloud(messagingSystem) + ".send";
-  }
-
-  @Override
-  public Supplier<String> outboundService(
-      @Nonnull String messagingSystem, boolean useLegacyTracing) {
-    return NULL_SUPPLIER;
-  }
-
-  @Nonnull
-  @Override
-  public String inboundOperation(@Nonnull String messagingSystem) {
-    return normalizeForCloud(messagingSystem) + ".process";
-  }
-
-  @Override
-  public Supplier<String> inboundService(
-      @Nonnull String messagingSystem, boolean useLegacyTracing) {
-    return NULL_SUPPLIER;
-  }
-
-  @Override
-  @Nonnull
-  public Supplier<String> timeInQueueService(@Nonnull String messagingSystem) {
-    return () -> messagingSystem + "-queue";
-  }
-
-  @Nonnull
-  @Override
-  public String timeInQueueOperation(@Nonnull String messagingSystem) {
-    return normalizeForCloud(messagingSystem) + ".deliver";
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v1/NamingSchemaV1.java b/internal-api/src/main/java/datadog/trace/api/naming/v1/NamingSchemaV1.java
index 89739011005..4c8d282954e 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v1/NamingSchemaV1.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v1/NamingSchemaV1.java
@@ -4,52 +4,52 @@
 import datadog.trace.api.naming.NamingSchema;
 
 public class NamingSchemaV1 implements NamingSchema {
-  private final NamingSchema.ForCache cacheNaming = new CacheNamingV1();
-  private final NamingSchema.ForClient clientNaming = new ClientNamingV1();
-  private final NamingSchema.ForCloud cloudNaming = new CloudNamingV1();
-  private final NamingSchema.ForDatabase databaseNaming = new DatabaseNamingV1();
-  private final NamingSchema.ForMessaging messagingNaming = new MessagingNamingV1();
-  private final NamingSchema.ForPeerService peerServiceNaming =
-      new PeerServiceNamingV1(Config.get().getPeerServiceComponentOverrides());
-  private final NamingSchema.ForServer serverNaming = new ServerNamingV1();
-
-  @Override
-  public NamingSchema.ForCache cache() {
-    return cacheNaming;
-  }
-
-  @Override
-  public ForClient client() {
-    return clientNaming;
-  }
-
-  @Override
-  public ForCloud cloud() {
-    return cloudNaming;
-  }
-
-  @Override
-  public ForDatabase database() {
-    return databaseNaming;
-  }
-
-  @Override
-  public ForMessaging messaging() {
-    return messagingNaming;
-  }
-
-  @Override
-  public ForPeerService peerService() {
-    return peerServiceNaming;
-  }
-
-  @Override
-  public boolean allowInferredServices() {
-    return false;
-  }
-
-  @Override
-  public ForServer server() {
-    return serverNaming;
-  }
+    private final NamingSchema.ForCache cacheNaming = new CacheNamingV1();
+    private final NamingSchema.ForClient clientNaming = new ClientNamingV1();
+    private final NamingSchema.ForCloud cloudNaming = new CloudNamingV1();
+    private final NamingSchema.ForDatabase databaseNaming = new DatabaseNamingV1();
+    private final NamingSchema.ForMessaging messagingNaming = new MessagingNamingV1();
+    private final NamingSchema.ForPeerService peerServiceNaming =
+            new PeerServiceNamingV1(Config.get().getPeerServiceComponentOverrides());
+    private final NamingSchema.ForServer serverNaming = new ServerNamingV1();
+
+    @Override
+    public NamingSchema.ForCache cache() {
+        return cacheNaming;
+    }
+
+    @Override
+    public ForClient client() {
+        return clientNaming;
+    }
+
+    @Override
+    public ForCloud cloud() {
+        return cloudNaming;
+    }
+
+    @Override
+    public ForDatabase database() {
+        return databaseNaming;
+    }
+
+    @Override
+    public ForMessaging messaging() {
+        return messagingNaming;
+    }
+
+    @Override
+    public ForPeerService peerService() {
+        return peerServiceNaming;
+    }
+
+    @Override
+    public boolean allowInferredServices() {
+        return false;
+    }
+
+    @Override
+    public ForServer server() {
+        return serverNaming;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v1/PeerServiceNamingV1.java b/internal-api/src/main/java/datadog/trace/api/naming/v1/PeerServiceNamingV1.java
index 827a7489e09..353ebb81353 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v1/PeerServiceNamingV1.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v1/PeerServiceNamingV1.java
@@ -11,100 +11,95 @@
 import javax.annotation.Nullable;
 
 public class PeerServiceNamingV1 implements NamingSchema.ForPeerService {
-  private static final Map<Object, String[]> SPECIFIC_PRECURSORS_BY_COMPONENT =
-      initPrecursorsByComponent();
-  private static final String[] DEFAULT_PRECURSORS = {Tags.DB_INSTANCE, Tags.PEER_HOSTNAME};
+    private static final Map<Object, String[]> SPECIFIC_PRECURSORS_BY_COMPONENT = initPrecursorsByComponent();
+    private static final String[] DEFAULT_PRECURSORS = {Tags.DB_INSTANCE, Tags.PEER_HOSTNAME};
 
-  private final Map<String, String> overridesByComponent;
+    private final Map<String, String> overridesByComponent;
 
-  private static Map<Object, String[]> initPrecursorsByComponent() {
-    final Map<Object, String[]> ret = new HashMap<>(7);
-    // messaging
-    ret.put("java-kafka", new String[] {InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS});
-    // database
-    ret.put("hazelcast-sdk", new String[] {"hazelcast.instance", Tags.PEER_HOSTNAME});
-    ret.put(
-        "couchbase-client",
-        new String[] {
-          InstrumentationTags.COUCHBASE_SEED_NODES, "net.peer.name", Tags.PEER_HOSTNAME
-        });
+    private static Map<Object, String[]> initPrecursorsByComponent() {
+        final Map<Object, String[]> ret = new HashMap<>(7);
+        // messaging
+        ret.put("java-kafka", new String[] {InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS});
+        // database
+        ret.put("hazelcast-sdk", new String[] {"hazelcast.instance", Tags.PEER_HOSTNAME});
+        ret.put(
+                "couchbase-client",
+                new String[] {InstrumentationTags.COUCHBASE_SEED_NODES, "net.peer.name", Tags.PEER_HOSTNAME});
 
-    ret.put(
-        "java-cassandra",
-        new String[] {InstrumentationTags.CASSANDRA_CONTACT_POINTS, Tags.PEER_HOSTNAME});
-    // rpc
-    final String[] rpcPrecursors = {Tags.RPC_SERVICE, Tags.PEER_HOSTNAME};
-    ret.put("grpc-client", rpcPrecursors);
-    ret.put("armeria-grpc-client", rpcPrecursors);
-    ret.put("rmi-client", rpcPrecursors);
+        ret.put("java-cassandra", new String[] {InstrumentationTags.CASSANDRA_CONTACT_POINTS, Tags.PEER_HOSTNAME});
+        // rpc
+        final String[] rpcPrecursors = {Tags.RPC_SERVICE, Tags.PEER_HOSTNAME};
+        ret.put("grpc-client", rpcPrecursors);
+        ret.put("armeria-grpc-client", rpcPrecursors);
+        ret.put("rmi-client", rpcPrecursors);
 
-    // for aws sdk we calculate eagerly to avoid doing too much complex lookups
-    // this will avoid calculating defaults
-    ret.put("java-aws-sdk", new String[] {});
-    return ret;
-  }
-
-  public PeerServiceNamingV1(@Nonnull final Map<String, String> overridesByComponent) {
-    this.overridesByComponent = overridesByComponent;
-  }
-
-  @Override
-  public boolean supports() {
-    return true;
-  }
+        // for aws sdk we calculate eagerly to avoid doing too much complex lookups
+        // this will avoid calculating defaults
+        ret.put("java-aws-sdk", new String[] {});
+        return ret;
+    }
 
-  private void resolve(@Nonnull final TagMap unsafeTags) {
-    final Object component = unsafeTags.getObject(Tags.COMPONENT);
-    // avoid issues with UTF8ByteString or others
-    final String componentString = component == null ? null : component.toString();
-    final String override = overridesByComponent.get(componentString);
-    // check if value can be overridden
-    if (override != null) {
-      set(unsafeTags, override, "_component_override");
-      return;
+    public PeerServiceNamingV1(@Nonnull final Map<String, String> overridesByComponent) {
+        this.overridesByComponent = overridesByComponent;
     }
-    // otherwise try to lookup by component specific precursor
-    if (resolveBy(unsafeTags, SPECIFIC_PRECURSORS_BY_COMPONENT.get(componentString))) {
-      return;
+
+    @Override
+    public boolean supports() {
+        return true;
     }
-    // finally fallback to default lookup
-    resolveBy(unsafeTags, DEFAULT_PRECURSORS);
-  }
 
-  private boolean resolveBy(@Nonnull final TagMap unsafeTags, @Nullable final String[] precursors) {
-    if (precursors == null) {
-      return false;
+    private void resolve(@Nonnull final TagMap unsafeTags) {
+        final Object component = unsafeTags.getObject(Tags.COMPONENT);
+        // avoid issues with UTF8ByteString or others
+        final String componentString = component == null ? null : component.toString();
+        final String override = overridesByComponent.get(componentString);
+        // check if value can be overridden
+        if (override != null) {
+            set(unsafeTags, override, "_component_override");
+            return;
+        }
+        // otherwise try to lookup by component specific precursor
+        if (resolveBy(unsafeTags, SPECIFIC_PRECURSORS_BY_COMPONENT.get(componentString))) {
+            return;
+        }
+        // finally fallback to default lookup
+        resolveBy(unsafeTags, DEFAULT_PRECURSORS);
     }
-    Object value = null;
-    String source = null;
-    for (String precursor : precursors) {
-      value = unsafeTags.getObject(precursor);
-      if (value != null) {
-        // we have a match. Use the tag name for the source
-        source = precursor;
-        break;
-      }
+
+    private boolean resolveBy(@Nonnull final TagMap unsafeTags, @Nullable final String[] precursors) {
+        if (precursors == null) {
+            return false;
+        }
+        Object value = null;
+        String source = null;
+        for (String precursor : precursors) {
+            value = unsafeTags.getObject(precursor);
+            if (value != null) {
+                // we have a match. Use the tag name for the source
+                source = precursor;
+                break;
+            }
+        }
+        // if something matched now set the value and the source
+        set(unsafeTags, value, source);
+        return true;
     }
-    // if something matched now set the value and the source
-    set(unsafeTags, value, source);
-    return true;
-  }
 
-  private void set(@Nonnull final TagMap unsafeTags, Object value, String source) {
-    if (value != null) {
-      unsafeTags.put(Tags.PEER_SERVICE, value);
-      unsafeTags.put(DDTags.PEER_SERVICE_SOURCE, source);
+    private void set(@Nonnull final TagMap unsafeTags, Object value, String source) {
+        if (value != null) {
+            unsafeTags.put(Tags.PEER_SERVICE, value);
+            unsafeTags.put(DDTags.PEER_SERVICE_SOURCE, source);
+        }
     }
-  }
 
-  @Nonnull
-  @Override
-  public void tags(@Nonnull final TagMap unsafeTags) {
-    // check span.kind eligibility
-    final Object kind = unsafeTags.getObject(Tags.SPAN_KIND);
-    if (Tags.SPAN_KIND_CLIENT.equals(kind) || Tags.SPAN_KIND_PRODUCER.equals(kind)) {
-      // we can calculate the peer service now
-      resolve(unsafeTags);
+    @Nonnull
+    @Override
+    public void tags(@Nonnull final TagMap unsafeTags) {
+        // check span.kind eligibility
+        final Object kind = unsafeTags.getObject(Tags.SPAN_KIND);
+        if (Tags.SPAN_KIND_CLIENT.equals(kind) || Tags.SPAN_KIND_PRODUCER.equals(kind)) {
+            // we can calculate the peer service now
+            resolve(unsafeTags);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v1/ServerNamingV1.java b/internal-api/src/main/java/datadog/trace/api/naming/v1/ServerNamingV1.java
index e8624a1ad89..2aa4e1c57c2 100644
--- a/internal-api/src/main/java/datadog/trace/api/naming/v1/ServerNamingV1.java
+++ b/internal-api/src/main/java/datadog/trace/api/naming/v1/ServerNamingV1.java
@@ -5,15 +5,15 @@
 
 public class ServerNamingV1 implements NamingSchema.ForServer {
 
-  @Nonnull
-  @Override
-  public String operationForProtocol(@Nonnull String protocol) {
-    return protocol + ".server.request";
-  }
+    @Nonnull
+    @Override
+    public String operationForProtocol(@Nonnull String protocol) {
+        return protocol + ".server.request";
+    }
 
-  @Nonnull
-  @Override
-  public String operationForComponent(@Nonnull String component) {
-    return "http.server.request";
-  }
+    @Nonnull
+    @Override
+    public String operationForComponent(@Nonnull String component) {
+        return "http.server.request";
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/normalize/AntPathMatcher.java b/internal-api/src/main/java/datadog/trace/api/normalize/AntPathMatcher.java
index f50dd62f304..42e7048c394 100644
--- a/internal-api/src/main/java/datadog/trace/api/normalize/AntPathMatcher.java
+++ b/internal-api/src/main/java/datadog/trace/api/normalize/AntPathMatcher.java
@@ -39,313 +39,311 @@
  */
 final class AntPathMatcher {
 
-  AntPathMatcher() {}
-
-  /**
-   * Checks if {@code path} is a pattern (i.e. contains a '*', or '?'). For example the {@code
-   * /foo/**} would return {@code true}, while {@code /bar/} would return {@code false}.
-   *
-   * @param path the string to check
-   * @return this method returns {@code true} if {@code path} contains a '*' or '?', otherwise,
-   *     {@code false}
-   */
-  public boolean isPattern(String path) {
-    return (path.indexOf('*') != -1 || path.indexOf('?') != -1);
-  }
-
-  /**
-   * match the given <code>path</code> against the given <code>pattern</code>.
-   *
-   * @param pattern the pattern to match against
-   * @param path the path String to test
-   * @return <code>true</code> if the supplied <code>path</code> matched, <code>false</code> if it
-   *     didn't
-   */
-  public boolean match(String pattern, String path) {
-    String pathSeparator = "/";
-    if (path == null || path.startsWith(pathSeparator) != pattern.startsWith(pathSeparator)) {
-      return false;
+    AntPathMatcher() {}
+
+    /**
+     * Checks if {@code path} is a pattern (i.e. contains a '*', or '?'). For example the {@code
+     * /foo/**} would return {@code true}, while {@code /bar/} would return {@code false}.
+     *
+     * @param path the string to check
+     * @return this method returns {@code true} if {@code path} contains a '*' or '?', otherwise,
+     *     {@code false}
+     */
+    public boolean isPattern(String path) {
+        return (path.indexOf('*') != -1 || path.indexOf('?') != -1);
     }
 
-    String[] pattDirs = tokenizeToStringArray(pattern, pathSeparator);
-    String[] pathDirs = tokenizeToStringArray(path, pathSeparator);
-
-    int pattIdxStart = 0;
-    int pattIdxEnd = pattDirs.length - 1;
-    int pathIdxStart = 0;
-    int pathIdxEnd = pathDirs.length - 1;
-
-    // Match all elements up to the first **
-    while (pattIdxStart <= pattIdxEnd && pathIdxStart <= pathIdxEnd) {
-      String patDir = pattDirs[pattIdxStart];
-      if ("**".equals(patDir)) {
-        break;
-      }
-      if (!matchStrings(patDir, pathDirs[pathIdxStart])) {
-        return false;
-      }
-      pattIdxStart++;
-      pathIdxStart++;
-    }
+    /**
+     * match the given <code>path</code> against the given <code>pattern</code>.
+     *
+     * @param pattern the pattern to match against
+     * @param path the path String to test
+     * @return <code>true</code> if the supplied <code>path</code> matched, <code>false</code> if it
+     *     didn't
+     */
+    public boolean match(String pattern, String path) {
+        String pathSeparator = "/";
+        if (path == null || path.startsWith(pathSeparator) != pattern.startsWith(pathSeparator)) {
+            return false;
+        }
 
-    if (pathIdxStart > pathIdxEnd) {
-      // Path is exhausted, only match if rest of pattern is * or **'s
-      if (pattIdxStart > pattIdxEnd) {
-        return (pattern.endsWith(pathSeparator) == path.endsWith(pathSeparator));
-      }
-      if (pattIdxStart == pattIdxEnd
-          && pattDirs[pattIdxStart].equals("*")
-          && path.endsWith(pathSeparator)) {
-        return true;
-      }
-      for (int i = pattIdxStart; i <= pattIdxEnd; i++) {
-        if (!pattDirs[i].equals("**")) {
-          return false;
+        String[] pattDirs = tokenizeToStringArray(pattern, pathSeparator);
+        String[] pathDirs = tokenizeToStringArray(path, pathSeparator);
+
+        int pattIdxStart = 0;
+        int pattIdxEnd = pattDirs.length - 1;
+        int pathIdxStart = 0;
+        int pathIdxEnd = pathDirs.length - 1;
+
+        // Match all elements up to the first **
+        while (pattIdxStart <= pattIdxEnd && pathIdxStart <= pathIdxEnd) {
+            String patDir = pattDirs[pattIdxStart];
+            if ("**".equals(patDir)) {
+                break;
+            }
+            if (!matchStrings(patDir, pathDirs[pathIdxStart])) {
+                return false;
+            }
+            pattIdxStart++;
+            pathIdxStart++;
         }
-      }
-      return true;
-    } else if (pattIdxStart > pattIdxEnd) {
-      // String not exhausted, but pattern is. Failure.
-      return false;
-    }
 
-    // up to last '**'
-    while (pattIdxStart <= pattIdxEnd && pathIdxStart <= pathIdxEnd) {
-      String patDir = pattDirs[pattIdxEnd];
-      if (patDir.equals("**")) {
-        break;
-      }
-      if (!matchStrings(patDir, pathDirs[pathIdxEnd])) {
-        return false;
-      }
-      pattIdxEnd--;
-      pathIdxEnd--;
-    }
-    if (pathIdxStart > pathIdxEnd) {
-      // String is exhausted
-      for (int i = pattIdxStart; i <= pattIdxEnd; i++) {
-        if (!pattDirs[i].equals("**")) {
-          return false;
+        if (pathIdxStart > pathIdxEnd) {
+            // Path is exhausted, only match if rest of pattern is * or **'s
+            if (pattIdxStart > pattIdxEnd) {
+                return (pattern.endsWith(pathSeparator) == path.endsWith(pathSeparator));
+            }
+            if (pattIdxStart == pattIdxEnd && pattDirs[pattIdxStart].equals("*") && path.endsWith(pathSeparator)) {
+                return true;
+            }
+            for (int i = pattIdxStart; i <= pattIdxEnd; i++) {
+                if (!pattDirs[i].equals("**")) {
+                    return false;
+                }
+            }
+            return true;
+        } else if (pattIdxStart > pattIdxEnd) {
+            // String not exhausted, but pattern is. Failure.
+            return false;
         }
-      }
-      return true;
-    }
 
-    while (pattIdxStart != pattIdxEnd && pathIdxStart <= pathIdxEnd) {
-      int patIdxTmp = -1;
-      for (int i = pattIdxStart + 1; i <= pattIdxEnd; i++) {
-        if (pattDirs[i].equals("**")) {
-          patIdxTmp = i;
-          break;
+        // up to last '**'
+        while (pattIdxStart <= pattIdxEnd && pathIdxStart <= pathIdxEnd) {
+            String patDir = pattDirs[pattIdxEnd];
+            if (patDir.equals("**")) {
+                break;
+            }
+            if (!matchStrings(patDir, pathDirs[pathIdxEnd])) {
+                return false;
+            }
+            pattIdxEnd--;
+            pathIdxEnd--;
         }
-      }
-      if (patIdxTmp == pattIdxStart + 1) {
-        // '**/**' situation, so skip one
-        pattIdxStart++;
-        continue;
-      }
-      // Find the pattern between padIdxStart & padIdxTmp in str between
-      // strIdxStart & strIdxEnd
-      int patLength = (patIdxTmp - pattIdxStart - 1);
-      int strLength = (pathIdxEnd - pathIdxStart + 1);
-      int foundIdx = -1;
-
-      strLoop:
-      for (int i = 0; i <= strLength - patLength; i++) {
-        for (int j = 0; j < patLength; j++) {
-          String subPat = pattDirs[pattIdxStart + j + 1];
-          String subStr = pathDirs[pathIdxStart + i + j];
-          if (!matchStrings(subPat, subStr)) {
-            continue strLoop;
-          }
+        if (pathIdxStart > pathIdxEnd) {
+            // String is exhausted
+            for (int i = pattIdxStart; i <= pattIdxEnd; i++) {
+                if (!pattDirs[i].equals("**")) {
+                    return false;
+                }
+            }
+            return true;
         }
-        foundIdx = pathIdxStart + i;
-        break;
-      }
 
-      if (foundIdx == -1) {
-        return false;
-      }
-
-      pattIdxStart = patIdxTmp;
-      pathIdxStart = foundIdx + patLength;
-    }
+        while (pattIdxStart != pattIdxEnd && pathIdxStart <= pathIdxEnd) {
+            int patIdxTmp = -1;
+            for (int i = pattIdxStart + 1; i <= pattIdxEnd; i++) {
+                if (pattDirs[i].equals("**")) {
+                    patIdxTmp = i;
+                    break;
+                }
+            }
+            if (patIdxTmp == pattIdxStart + 1) {
+                // '**/**' situation, so skip one
+                pattIdxStart++;
+                continue;
+            }
+            // Find the pattern between padIdxStart & padIdxTmp in str between
+            // strIdxStart & strIdxEnd
+            int patLength = (patIdxTmp - pattIdxStart - 1);
+            int strLength = (pathIdxEnd - pathIdxStart + 1);
+            int foundIdx = -1;
+
+            strLoop:
+            for (int i = 0; i <= strLength - patLength; i++) {
+                for (int j = 0; j < patLength; j++) {
+                    String subPat = pattDirs[pattIdxStart + j + 1];
+                    String subStr = pathDirs[pathIdxStart + i + j];
+                    if (!matchStrings(subPat, subStr)) {
+                        continue strLoop;
+                    }
+                }
+                foundIdx = pathIdxStart + i;
+                break;
+            }
 
-    for (int i = pattIdxStart; i <= pattIdxEnd; i++) {
-      if (!pattDirs[i].equals("**")) {
-        return false;
-      }
-    }
+            if (foundIdx == -1) {
+                return false;
+            }
 
-    return true;
-  }
-
-  /**
-   * Tests whether or not a string matches against a pattern. The pattern may contain two special
-   * characters:<br>
-   * '*' means zero or more characters<br>
-   * '?' means one and only one character
-   *
-   * @param pattern pattern to match against. Must not be <code>null</code>.
-   * @param str string which must be matched against the pattern. Must not be <code>null</code>.
-   * @return <code>true</code> if the string matches against the pattern, or <code>false</code>
-   *     otherwise.
-   */
-  private boolean matchStrings(String pattern, String str) {
-    char[] patArr = pattern.toCharArray();
-    char[] strArr = str.toCharArray();
-    int patIdxStart = 0;
-    int patIdxEnd = patArr.length - 1;
-    int strIdxStart = 0;
-    int strIdxEnd = strArr.length - 1;
-    char ch;
-
-    boolean containsStar = false;
-    for (char aPatArr : patArr) {
-      if (aPatArr == '*') {
-        containsStar = true;
-        break;
-      }
-    }
+            pattIdxStart = patIdxTmp;
+            pathIdxStart = foundIdx + patLength;
+        }
 
-    if (!containsStar) {
-      // No '*'s, so we make a shortcut
-      if (patIdxEnd != strIdxEnd) {
-        return false; // Pattern and string do not have the same size
-      }
-      for (int i = 0; i <= patIdxEnd; i++) {
-        ch = patArr[i];
-        if (ch != '?') {
-          if (ch != strArr[i]) {
-            return false; // Character mismatch
-          }
+        for (int i = pattIdxStart; i <= pattIdxEnd; i++) {
+            if (!pattDirs[i].equals("**")) {
+                return false;
+            }
         }
-      }
-      return true; // String matches against pattern
-    }
 
-    if (patIdxEnd == 0) {
-      return true; // Pattern contains only '*', which matches anything
+        return true;
     }
 
-    // Process characters before first star
-    while ((ch = patArr[patIdxStart]) != '*' && strIdxStart <= strIdxEnd) {
-      if (ch != '?') {
-        if (ch != strArr[strIdxStart]) {
-          return false; // Character mismatch
+    /**
+     * Tests whether or not a string matches against a pattern. The pattern may contain two special
+     * characters:<br>
+     * '*' means zero or more characters<br>
+     * '?' means one and only one character
+     *
+     * @param pattern pattern to match against. Must not be <code>null</code>.
+     * @param str string which must be matched against the pattern. Must not be <code>null</code>.
+     * @return <code>true</code> if the string matches against the pattern, or <code>false</code>
+     *     otherwise.
+     */
+    private boolean matchStrings(String pattern, String str) {
+        char[] patArr = pattern.toCharArray();
+        char[] strArr = str.toCharArray();
+        int patIdxStart = 0;
+        int patIdxEnd = patArr.length - 1;
+        int strIdxStart = 0;
+        int strIdxEnd = strArr.length - 1;
+        char ch;
+
+        boolean containsStar = false;
+        for (char aPatArr : patArr) {
+            if (aPatArr == '*') {
+                containsStar = true;
+                break;
+            }
         }
-      }
-      patIdxStart++;
-      strIdxStart++;
-    }
-    if (strIdxStart > strIdxEnd) {
-      // All characters in the string are used. Check if only '*'s are
-      // left in the pattern. If so, we succeeded. Otherwise failure.
-      for (int i = patIdxStart; i <= patIdxEnd; i++) {
-        if (patArr[i] != '*') {
-          return false;
+
+        if (!containsStar) {
+            // No '*'s, so we make a shortcut
+            if (patIdxEnd != strIdxEnd) {
+                return false; // Pattern and string do not have the same size
+            }
+            for (int i = 0; i <= patIdxEnd; i++) {
+                ch = patArr[i];
+                if (ch != '?') {
+                    if (ch != strArr[i]) {
+                        return false; // Character mismatch
+                    }
+                }
+            }
+            return true; // String matches against pattern
         }
-      }
-      return true;
-    }
 
-    // Process characters after last star
-    while ((ch = patArr[patIdxEnd]) != '*' && strIdxStart <= strIdxEnd) {
-      if (ch != '?') {
-        if (ch != strArr[strIdxEnd]) {
-          return false; // Character mismatch
+        if (patIdxEnd == 0) {
+            return true; // Pattern contains only '*', which matches anything
         }
-      }
-      patIdxEnd--;
-      strIdxEnd--;
-    }
-    if (strIdxStart > strIdxEnd) {
-      // All characters in the string are used. Check if only '*'s are
-      // left in the pattern. If so, we succeeded. Otherwise failure.
-      for (int i = patIdxStart; i <= patIdxEnd; i++) {
-        if (patArr[i] != '*') {
-          return false;
+
+        // Process characters before first star
+        while ((ch = patArr[patIdxStart]) != '*' && strIdxStart <= strIdxEnd) {
+            if (ch != '?') {
+                if (ch != strArr[strIdxStart]) {
+                    return false; // Character mismatch
+                }
+            }
+            patIdxStart++;
+            strIdxStart++;
+        }
+        if (strIdxStart > strIdxEnd) {
+            // All characters in the string are used. Check if only '*'s are
+            // left in the pattern. If so, we succeeded. Otherwise failure.
+            for (int i = patIdxStart; i <= patIdxEnd; i++) {
+                if (patArr[i] != '*') {
+                    return false;
+                }
+            }
+            return true;
         }
-      }
-      return true;
-    }
 
-    // process pattern between stars. padIdxStart and patIdxEnd point
-    // always to a '*'.
-    while (patIdxStart != patIdxEnd && strIdxStart <= strIdxEnd) {
-      int patIdxTmp = -1;
-      for (int i = patIdxStart + 1; i <= patIdxEnd; i++) {
-        if (patArr[i] == '*') {
-          patIdxTmp = i;
-          break;
+        // Process characters after last star
+        while ((ch = patArr[patIdxEnd]) != '*' && strIdxStart <= strIdxEnd) {
+            if (ch != '?') {
+                if (ch != strArr[strIdxEnd]) {
+                    return false; // Character mismatch
+                }
+            }
+            patIdxEnd--;
+            strIdxEnd--;
         }
-      }
-      if (patIdxTmp == patIdxStart + 1) {
-        // Two stars next to each other, skip the first one.
-        patIdxStart++;
-        continue;
-      }
-      // Find the pattern between padIdxStart & padIdxTmp in str between
-      // strIdxStart & strIdxEnd
-      int patLength = (patIdxTmp - patIdxStart - 1);
-      int strLength = (strIdxEnd - strIdxStart + 1);
-      int foundIdx = -1;
-      strLoop:
-      for (int i = 0; i <= strLength - patLength; i++) {
-        for (int j = 0; j < patLength; j++) {
-          ch = patArr[patIdxStart + j + 1];
-          if (ch != '?') {
-            if (ch != strArr[strIdxStart + i + j]) {
-              continue strLoop;
+        if (strIdxStart > strIdxEnd) {
+            // All characters in the string are used. Check if only '*'s are
+            // left in the pattern. If so, we succeeded. Otherwise failure.
+            for (int i = patIdxStart; i <= patIdxEnd; i++) {
+                if (patArr[i] != '*') {
+                    return false;
+                }
             }
-          }
+            return true;
         }
 
-        foundIdx = strIdxStart + i;
-        break;
-      }
+        // process pattern between stars. padIdxStart and patIdxEnd point
+        // always to a '*'.
+        while (patIdxStart != patIdxEnd && strIdxStart <= strIdxEnd) {
+            int patIdxTmp = -1;
+            for (int i = patIdxStart + 1; i <= patIdxEnd; i++) {
+                if (patArr[i] == '*') {
+                    patIdxTmp = i;
+                    break;
+                }
+            }
+            if (patIdxTmp == patIdxStart + 1) {
+                // Two stars next to each other, skip the first one.
+                patIdxStart++;
+                continue;
+            }
+            // Find the pattern between padIdxStart & padIdxTmp in str between
+            // strIdxStart & strIdxEnd
+            int patLength = (patIdxTmp - patIdxStart - 1);
+            int strLength = (strIdxEnd - strIdxStart + 1);
+            int foundIdx = -1;
+            strLoop:
+            for (int i = 0; i <= strLength - patLength; i++) {
+                for (int j = 0; j < patLength; j++) {
+                    ch = patArr[patIdxStart + j + 1];
+                    if (ch != '?') {
+                        if (ch != strArr[strIdxStart + i + j]) {
+                            continue strLoop;
+                        }
+                    }
+                }
+
+                foundIdx = strIdxStart + i;
+                break;
+            }
 
-      if (foundIdx == -1) {
-        return false;
-      }
+            if (foundIdx == -1) {
+                return false;
+            }
 
-      patIdxStart = patIdxTmp;
-      strIdxStart = foundIdx + patLength;
-    }
+            patIdxStart = patIdxTmp;
+            strIdxStart = foundIdx + patLength;
+        }
 
-    // All characters in the string are used. Check if only '*'s are left
-    // in the pattern. If so, we succeeded. Otherwise failure.
-    for (int i = patIdxStart; i <= patIdxEnd; i++) {
-      if (patArr[i] != '*') {
-        return false;
-      }
+        // All characters in the string are used. Check if only '*'s are left
+        // in the pattern. If so, we succeeded. Otherwise failure.
+        for (int i = patIdxStart; i <= patIdxEnd; i++) {
+            if (patArr[i] != '*') {
+                return false;
+            }
+        }
+
+        return true;
     }
 
-    return true;
-  }
+    private static final String[] EMPTY_STRING_ARRAY = {};
 
-  private static final String[] EMPTY_STRING_ARRAY = {};
+    private static String[] tokenizeToStringArray(String str, String delimiters) {
 
-  private static String[] tokenizeToStringArray(String str, String delimiters) {
+        if (str == null) {
+            return EMPTY_STRING_ARRAY;
+        }
 
-    if (str == null) {
-      return EMPTY_STRING_ARRAY;
+        StringTokenizer st = new StringTokenizer(str, delimiters);
+        List<String> tokens = new ArrayList<>();
+        while (st.hasMoreTokens()) {
+            String token = st.nextToken();
+            if (token.length() > 0) {
+                tokens.add(token);
+            }
+        }
+        return toStringArray(tokens);
     }
 
-    StringTokenizer st = new StringTokenizer(str, delimiters);
-    List<String> tokens = new ArrayList<>();
-    while (st.hasMoreTokens()) {
-      String token = st.nextToken();
-      if (token.length() > 0) {
-        tokens.add(token);
-      }
+    private static String[] toStringArray(Collection<String> collection) {
+        return ((collection != null && !collection.isEmpty())
+                ? collection.toArray(EMPTY_STRING_ARRAY)
+                : EMPTY_STRING_ARRAY);
     }
-    return toStringArray(tokens);
-  }
-
-  private static String[] toStringArray(Collection<String> collection) {
-    return ((collection != null && !collection.isEmpty())
-        ? collection.toArray(EMPTY_STRING_ARRAY)
-        : EMPTY_STRING_ARRAY);
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/normalize/AntPatternHttpPathNormalizer.java b/internal-api/src/main/java/datadog/trace/api/normalize/AntPatternHttpPathNormalizer.java
index 7be1924bc23..f16dd583b2e 100644
--- a/internal-api/src/main/java/datadog/trace/api/normalize/AntPatternHttpPathNormalizer.java
+++ b/internal-api/src/main/java/datadog/trace/api/normalize/AntPatternHttpPathNormalizer.java
@@ -11,52 +11,52 @@
 import org.slf4j.LoggerFactory;
 
 final class AntPatternHttpPathNormalizer extends HttpPathNormalizer {
-  private static final Logger log = LoggerFactory.getLogger(AntPatternHttpPathNormalizer.class);
+    private static final Logger log = LoggerFactory.getLogger(AntPatternHttpPathNormalizer.class);
 
-  /** Used to preserve original value as is when it's mapped to this value. */
-  private static final String KEEP_AS_IS = "*";
+    /** Used to preserve original value as is when it's mapped to this value. */
+    private static final String KEEP_AS_IS = "*";
 
-  private final Map<String, String> resourceNameMatchers;
-  private final AntPathMatcher matcher = new AntPathMatcher();
+    private final Map<String, String> resourceNameMatchers;
+    private final AntPathMatcher matcher = new AntPathMatcher();
 
-  private final DDCache<String, String> cache = DDCaches.newFixedSizeCache(512);
-  private final Function<String, String> cacheLoader =
-      new Function<String, String>() {
+    private final DDCache<String, String> cache = DDCaches.newFixedSizeCache(512);
+    private final Function<String, String> cacheLoader = new Function<String, String>() {
         @Override
         public String apply(String path) {
-          for (Map.Entry<String, String> resourceNameMatcher : resourceNameMatchers.entrySet()) {
-            if (matcher.match(resourceNameMatcher.getKey(), path)) {
-              if (KEEP_AS_IS.equals(resourceNameMatcher.getValue())) {
-                return path;
-              }
-              return resourceNameMatcher.getValue();
+            for (Map.Entry<String, String> resourceNameMatcher : resourceNameMatchers.entrySet()) {
+                if (matcher.match(resourceNameMatcher.getKey(), path)) {
+                    if (KEEP_AS_IS.equals(resourceNameMatcher.getValue())) {
+                        return path;
+                    }
+                    return resourceNameMatcher.getValue();
+                }
             }
-          }
-          return null;
+            return null;
         }
-      };
+    };
 
-  AntPatternHttpPathNormalizer(Map<String, String> httpResourceNameMatchers) {
-    resourceNameMatchers = httpResourceNameMatchers;
+    AntPatternHttpPathNormalizer(Map<String, String> httpResourceNameMatchers) {
+        resourceNameMatchers = httpResourceNameMatchers;
 
-    // Clean up invalid patterns
-    List<String> invalidPatterns = new ArrayList<>(httpResourceNameMatchers.keySet().size());
-    for (String pattern : resourceNameMatchers.keySet()) {
-      if (!matcher.isPattern(pattern)) {
-        invalidPatterns.add(pattern);
-      }
-    }
-    for (String invalid : invalidPatterns) {
-      log.warn("Invalid pattern {} removed from matchers", invalid);
-      resourceNameMatchers.remove(invalid);
+        // Clean up invalid patterns
+        List<String> invalidPatterns =
+                new ArrayList<>(httpResourceNameMatchers.keySet().size());
+        for (String pattern : resourceNameMatchers.keySet()) {
+            if (!matcher.isPattern(pattern)) {
+                invalidPatterns.add(pattern);
+            }
+        }
+        for (String invalid : invalidPatterns) {
+            log.warn("Invalid pattern {} removed from matchers", invalid);
+            resourceNameMatchers.remove(invalid);
+        }
     }
-  }
 
-  @Override
-  public String normalize(String path, boolean encoded) {
-    if (encoded) {
-      path = URIUtils.decode(path);
+    @Override
+    public String normalize(String path, boolean encoded) {
+        if (encoded) {
+            path = URIUtils.decode(path);
+        }
+        return cache.computeIfAbsent(path, cacheLoader);
     }
-    return cache.computeIfAbsent(path, cacheLoader);
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/normalize/HttpPathNormalizer.java b/internal-api/src/main/java/datadog/trace/api/normalize/HttpPathNormalizer.java
index 4496607d61b..2f36590f4c9 100644
--- a/internal-api/src/main/java/datadog/trace/api/normalize/HttpPathNormalizer.java
+++ b/internal-api/src/main/java/datadog/trace/api/normalize/HttpPathNormalizer.java
@@ -1,9 +1,9 @@
 package datadog.trace.api.normalize;
 
 abstract class HttpPathNormalizer {
-  public final String normalize(String path) {
-    return normalize(path, false);
-  }
+    public final String normalize(String path) {
+        return normalize(path, false);
+    }
 
-  public abstract String normalize(String path, boolean encoded);
+    public abstract String normalize(String path, boolean encoded);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/normalize/HttpResourceNames.java b/internal-api/src/main/java/datadog/trace/api/normalize/HttpResourceNames.java
index 3513ed67daa..2f121e1f22f 100644
--- a/internal-api/src/main/java/datadog/trace/api/normalize/HttpResourceNames.java
+++ b/internal-api/src/main/java/datadog/trace/api/normalize/HttpResourceNames.java
@@ -11,122 +11,116 @@
 import javax.annotation.Nonnull;
 
 public class HttpResourceNames {
-  public static final UTF8BytesString DEFAULT_RESOURCE_NAME = UTF8BytesString.create("/");
+    public static final UTF8BytesString DEFAULT_RESOURCE_NAME = UTF8BytesString.create("/");
 
-  private static final Function<Pair<CharSequence, CharSequence>, UTF8BytesString> JOINER =
-      input -> {
+    private static final Function<Pair<CharSequence, CharSequence>, UTF8BytesString> JOINER = input -> {
         CharSequence path = input.getRight();
         if (path == null) {
-          return DEFAULT_RESOURCE_NAME;
+            return DEFAULT_RESOURCE_NAME;
         }
         StringBuilder sb;
         CharSequence method = input.getLeft();
         if (method == null) {
-          sb = new StringBuilder(path.length());
+            sb = new StringBuilder(path.length());
         } else {
-          sb = new StringBuilder(path.length() + method.length() + 1);
-          sb.append(method);
-          // uppercase the method part of the resource name
-          for (int i = 0; i < sb.length(); i++) {
-            sb.setCharAt(i, Character.toUpperCase(sb.charAt(i)));
-          }
-          sb.append(' ');
+            sb = new StringBuilder(path.length() + method.length() + 1);
+            sb.append(method);
+            // uppercase the method part of the resource name
+            for (int i = 0; i < sb.length(); i++) {
+                sb.setCharAt(i, Character.toUpperCase(sb.charAt(i)));
+            }
+            sb.append(' ');
         }
         int l = path.length() - 1;
         if (instance().removeTrailingSlash && l > 0 && path.charAt(l) == '/') {
-          // remove trailing slash from the resource name path if needed
-          sb.append(path, 0, l);
+            // remove trailing slash from the resource name path if needed
+            sb.append(path, 0, l);
         } else {
-          sb.append(path);
+            sb.append(path);
         }
         return UTF8BytesString.create(sb);
-      };
+    };
 
-  private static final DDCache<Pair<CharSequence, CharSequence>, CharSequence> JOINER_CACHE =
-      DDCaches.newFixedSizeCache(128);
+    private static final DDCache<Pair<CharSequence, CharSequence>, CharSequence> JOINER_CACHE =
+            DDCaches.newFixedSizeCache(128);
 
-  private static final SimpleHttpPathNormalizer simpleHttpPathNormalizer =
-      new SimpleHttpPathNormalizer();
+    private static final SimpleHttpPathNormalizer simpleHttpPathNormalizer = new SimpleHttpPathNormalizer();
 
-  // Not final for testing
-  private static HttpResourceNames INSTANCE;
+    // Not final for testing
+    private static HttpResourceNames INSTANCE;
 
-  private final AntPatternHttpPathNormalizer serverAntPatternHttpPathNormalizer;
-  private final AntPatternHttpPathNormalizer clientAntPatternHttpPathNormalizer;
-  private final boolean removeTrailingSlash;
+    private final AntPatternHttpPathNormalizer serverAntPatternHttpPathNormalizer;
+    private final AntPatternHttpPathNormalizer clientAntPatternHttpPathNormalizer;
+    private final boolean removeTrailingSlash;
 
-  private static HttpResourceNames instance() {
-    if (null == INSTANCE) {
-      INSTANCE = new HttpResourceNames();
-    }
-    return INSTANCE;
-  }
-
-  private HttpResourceNames() {
-    serverAntPatternHttpPathNormalizer =
-        new AntPatternHttpPathNormalizer(Config.get().getHttpServerPathResourceNameMapping());
-    clientAntPatternHttpPathNormalizer =
-        new AntPatternHttpPathNormalizer(Config.get().getHttpClientPathResourceNameMapping());
-    removeTrailingSlash = Config.get().getHttpResourceRemoveTrailingSlash();
-  }
-
-  public static AgentSpan setForServer(
-      AgentSpan span, CharSequence method, CharSequence path, boolean encoded) {
-    if (path == null) {
-      return span;
-    }
-    Pair<CharSequence, Byte> result = computeForServer(method, path, encoded);
-    if (result.hasLeft()) {
-      span.setResourceName(result.getLeft(), result.getRight());
+    private static HttpResourceNames instance() {
+        if (null == INSTANCE) {
+            INSTANCE = new HttpResourceNames();
+        }
+        return INSTANCE;
     }
 
-    return span;
-  }
+    private HttpResourceNames() {
+        serverAntPatternHttpPathNormalizer =
+                new AntPatternHttpPathNormalizer(Config.get().getHttpServerPathResourceNameMapping());
+        clientAntPatternHttpPathNormalizer =
+                new AntPatternHttpPathNormalizer(Config.get().getHttpClientPathResourceNameMapping());
+        removeTrailingSlash = Config.get().getHttpResourceRemoveTrailingSlash();
+    }
 
-  public static Pair<CharSequence, Byte> computeForServer(
-      CharSequence method, @Nonnull CharSequence path, boolean encoded) {
-    byte priority;
+    public static AgentSpan setForServer(AgentSpan span, CharSequence method, CharSequence path, boolean encoded) {
+        if (path == null) {
+            return span;
+        }
+        Pair<CharSequence, Byte> result = computeForServer(method, path, encoded);
+        if (result.hasLeft()) {
+            span.setResourceName(result.getLeft(), result.getRight());
+        }
 
-    String resourcePath =
-        instance().serverAntPatternHttpPathNormalizer.normalize(path.toString(), encoded);
-    if (resourcePath != null) {
-      priority = ResourceNamePriorities.HTTP_SERVER_CONFIG_PATTERN_MATCH;
-    } else {
-      resourcePath = simpleHttpPathNormalizer.normalize(path.toString(), encoded);
-      priority = ResourceNamePriorities.HTTP_PATH_NORMALIZER;
+        return span;
     }
 
-    return Pair.of(join(method, resourcePath), priority);
-  }
+    public static Pair<CharSequence, Byte> computeForServer(
+            CharSequence method, @Nonnull CharSequence path, boolean encoded) {
+        byte priority;
 
-  public static Pair<CharSequence, Byte> computeForClient(
-      CharSequence method, @Nonnull CharSequence path, boolean encoded) {
-    byte priority;
+        String resourcePath = instance().serverAntPatternHttpPathNormalizer.normalize(path.toString(), encoded);
+        if (resourcePath != null) {
+            priority = ResourceNamePriorities.HTTP_SERVER_CONFIG_PATTERN_MATCH;
+        } else {
+            resourcePath = simpleHttpPathNormalizer.normalize(path.toString(), encoded);
+            priority = ResourceNamePriorities.HTTP_PATH_NORMALIZER;
+        }
 
-    String resourcePath =
-        instance().clientAntPatternHttpPathNormalizer.normalize(path.toString(), encoded);
-    if (resourcePath != null) {
-      priority = ResourceNamePriorities.HTTP_CLIENT_CONFIG_PATTERN_MATCH;
-    } else {
-      resourcePath = simpleHttpPathNormalizer.normalize(path.toString(), encoded);
-      priority = ResourceNamePriorities.HTTP_PATH_NORMALIZER;
+        return Pair.of(join(method, resourcePath), priority);
     }
-    return Pair.of(join(method, resourcePath), priority);
-  }
 
-  public static AgentSpan setForClient(
-      AgentSpan span, CharSequence method, CharSequence path, boolean encoded) {
-    if (path == null) {
-      return span;
+    public static Pair<CharSequence, Byte> computeForClient(
+            CharSequence method, @Nonnull CharSequence path, boolean encoded) {
+        byte priority;
+
+        String resourcePath = instance().clientAntPatternHttpPathNormalizer.normalize(path.toString(), encoded);
+        if (resourcePath != null) {
+            priority = ResourceNamePriorities.HTTP_CLIENT_CONFIG_PATTERN_MATCH;
+        } else {
+            resourcePath = simpleHttpPathNormalizer.normalize(path.toString(), encoded);
+            priority = ResourceNamePriorities.HTTP_PATH_NORMALIZER;
+        }
+        return Pair.of(join(method, resourcePath), priority);
     }
-    Pair<CharSequence, Byte> result = computeForClient(method, path, encoded);
-    if (result.hasLeft()) {
-      span.setResourceName(result.getLeft(), result.getRight());
+
+    public static AgentSpan setForClient(AgentSpan span, CharSequence method, CharSequence path, boolean encoded) {
+        if (path == null) {
+            return span;
+        }
+        Pair<CharSequence, Byte> result = computeForClient(method, path, encoded);
+        if (result.hasLeft()) {
+            span.setResourceName(result.getLeft(), result.getRight());
+        }
+        return span;
     }
-    return span;
-  }
 
-  public static CharSequence join(CharSequence method, CharSequence path) {
-    return JOINER_CACHE.computeIfAbsent(Pair.of(method, path), JOINER);
-  }
+    public static CharSequence join(CharSequence method, CharSequence path) {
+        return JOINER_CACHE.computeIfAbsent(Pair.of(method, path), JOINER);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/normalize/SQLNormalizer.java b/internal-api/src/main/java/datadog/trace/api/normalize/SQLNormalizer.java
index 39d4156dcb3..cb82400ca2e 100644
--- a/internal-api/src/main/java/datadog/trace/api/normalize/SQLNormalizer.java
+++ b/internal-api/src/main/java/datadog/trace/api/normalize/SQLNormalizer.java
@@ -18,111 +18,110 @@
  */
 public final class SQLNormalizer {
 
-  private static final Logger log = LoggerFactory.getLogger(SQLNormalizer.class);
+    private static final Logger log = LoggerFactory.getLogger(SQLNormalizer.class);
 
-  private static final BitSet NUMERIC_LITERAL_PREFIX = new BitSet();
-  private static final BitSet SPLITTERS = new BitSet();
+    private static final BitSet NUMERIC_LITERAL_PREFIX = new BitSet();
+    private static final BitSet SPLITTERS = new BitSet();
 
-  static {
-    for (byte symbol :
-        new byte[] {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '+', '.'}) {
-      int unsigned = symbol & 0xFF;
-      NUMERIC_LITERAL_PREFIX.set(unsigned);
-    }
-    for (byte symbol : new byte[] {',', '(', ')', '|'}) {
-      int unsigned = symbol & 0xFF;
-      SPLITTERS.set(unsigned);
-    }
-    for (int i = 0; i < 256; ++i) {
-      if (Character.isWhitespace((char) i)) {
-        SPLITTERS.set(i);
-      }
+    static {
+        for (byte symbol : new byte[] {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '+', '.'}) {
+            int unsigned = symbol & 0xFF;
+            NUMERIC_LITERAL_PREFIX.set(unsigned);
+        }
+        for (byte symbol : new byte[] {',', '(', ')', '|'}) {
+            int unsigned = symbol & 0xFF;
+            SPLITTERS.set(unsigned);
+        }
+        for (int i = 0; i < 256; ++i) {
+            if (Character.isWhitespace((char) i)) {
+                SPLITTERS.set(i);
+            }
+        }
     }
-  }
 
-  public static UTF8BytesString normalizeCharSequence(CharSequence sql) {
-    return normalize(sql.toString());
-  }
+    public static UTF8BytesString normalizeCharSequence(CharSequence sql) {
+        return normalize(sql.toString());
+    }
 
-  public static UTF8BytesString normalize(String sql) {
-    byte[] utf8 = sql.getBytes(UTF_8);
-    try {
-      BitSet splitters = findSplitterPositions(utf8);
-      int outputLength = utf8.length;
-      int end = outputLength;
-      int start = end > 0 ? splitters.previousSetBit(end - 1) : -1;
-      boolean modified = false;
-      // strip out anything ending with a quote (covers string and hex literals)
-      // or anything starting with a number, a quote, a decimal point, or a sign
-      while (end > 0 && start > 0) {
-        int sequenceStart = start + 1;
-        int sequenceEnd = end - 1;
-        if (sequenceEnd == sequenceStart) {
-          // single digit numbers can can be fixed in place
-          if (Character.isDigit(utf8[sequenceStart])) {
-            utf8[sequenceStart] = '?';
-            modified = true;
-          }
-        } else if (sequenceStart < sequenceEnd) {
-          if (isQuoted(utf8, sequenceStart, sequenceEnd)
-              || isNumericLiteralPrefix(utf8, sequenceStart)
-              || isHexLiteralPrefix(utf8, sequenceStart, sequenceEnd)) {
-            int length = sequenceEnd - sequenceStart;
-            System.arraycopy(utf8, end, utf8, sequenceStart + 1, outputLength - end);
-            utf8[sequenceStart] = '?';
-            outputLength -= length;
-            modified = true;
-          }
+    public static UTF8BytesString normalize(String sql) {
+        byte[] utf8 = sql.getBytes(UTF_8);
+        try {
+            BitSet splitters = findSplitterPositions(utf8);
+            int outputLength = utf8.length;
+            int end = outputLength;
+            int start = end > 0 ? splitters.previousSetBit(end - 1) : -1;
+            boolean modified = false;
+            // strip out anything ending with a quote (covers string and hex literals)
+            // or anything starting with a number, a quote, a decimal point, or a sign
+            while (end > 0 && start > 0) {
+                int sequenceStart = start + 1;
+                int sequenceEnd = end - 1;
+                if (sequenceEnd == sequenceStart) {
+                    // single digit numbers can can be fixed in place
+                    if (Character.isDigit(utf8[sequenceStart])) {
+                        utf8[sequenceStart] = '?';
+                        modified = true;
+                    }
+                } else if (sequenceStart < sequenceEnd) {
+                    if (isQuoted(utf8, sequenceStart, sequenceEnd)
+                            || isNumericLiteralPrefix(utf8, sequenceStart)
+                            || isHexLiteralPrefix(utf8, sequenceStart, sequenceEnd)) {
+                        int length = sequenceEnd - sequenceStart;
+                        System.arraycopy(utf8, end, utf8, sequenceStart + 1, outputLength - end);
+                        utf8[sequenceStart] = '?';
+                        outputLength -= length;
+                        modified = true;
+                    }
+                }
+                end = start;
+                start = splitters.previousSetBit(start - 1);
+            }
+            if (modified) {
+                return UTF8BytesString.create(Arrays.copyOf(utf8, outputLength));
+            }
+        } catch (Throwable paranoid) {
+            log.debug("Error normalizing sql {}", sql, paranoid);
         }
-        end = start;
-        start = splitters.previousSetBit(start - 1);
-      }
-      if (modified) {
-        return UTF8BytesString.create(Arrays.copyOf(utf8, outputLength));
-      }
-    } catch (Throwable paranoid) {
-      log.debug("Error normalizing sql {}", sql, paranoid);
+        return UTF8BytesString.create(sql, utf8);
     }
-    return UTF8BytesString.create(sql, utf8);
-  }
 
-  private static boolean isQuoted(byte[] utf8, int start, int end) {
-    return (utf8[start] == '\'' && utf8[end] == '\'');
-  }
+    private static boolean isQuoted(byte[] utf8, int start, int end) {
+        return (utf8[start] == '\'' && utf8[end] == '\'');
+    }
 
-  private static boolean isHexLiteralPrefix(byte[] utf8, int start, int end) {
-    return (utf8[start] | ' ') == 'x' && start + 1 < end && utf8[start + 1] == '\'';
-  }
+    private static boolean isHexLiteralPrefix(byte[] utf8, int start, int end) {
+        return (utf8[start] | ' ') == 'x' && start + 1 < end && utf8[start + 1] == '\'';
+    }
 
-  private static boolean isNumericLiteralPrefix(byte[] utf8, int start) {
-    return NUMERIC_LITERAL_PREFIX.get(utf8[start] & 0xFF)
-        // preserve single line comment (--) prefixes
-        && !(utf8[start + 1] == '-' && utf8[start] == '-');
-  }
+    private static boolean isNumericLiteralPrefix(byte[] utf8, int start) {
+        return NUMERIC_LITERAL_PREFIX.get(utf8[start] & 0xFF)
+                // preserve single line comment (--) prefixes
+                && !(utf8[start + 1] == '-' && utf8[start] == '-');
+    }
 
-  private static boolean isSplitter(byte symbol) {
-    return SPLITTERS.get(symbol & 0xFF);
-  }
+    private static boolean isSplitter(byte symbol) {
+        return SPLITTERS.get(symbol & 0xFF);
+    }
 
-  private static BitSet findSplitterPositions(byte[] utf8) {
-    BitSet positions = new BitSet(utf8.length);
-    boolean singleQuoted = false;
-    boolean doubleQuoted = false;
-    boolean escaped = false;
-    for (int i = 0; i < utf8.length; ++i) {
-      byte b = utf8[i];
-      if (b == '\'' && !escaped && !doubleQuoted) {
-        singleQuoted = !singleQuoted;
-      } else if (b == '"' && !singleQuoted) {
-        // No !escaped check here: in SQL, double quotes delimit identifiers,
-        // where backslash has no special escaping role. A literal double quote
-        // inside an identifier is escaped by doubling it (""), not by backslash.
-        doubleQuoted = !doubleQuoted;
-      } else {
-        escaped = (b == '\\') & !escaped;
-        positions.set(i, !singleQuoted & !doubleQuoted & isSplitter(b));
-      }
+    private static BitSet findSplitterPositions(byte[] utf8) {
+        BitSet positions = new BitSet(utf8.length);
+        boolean singleQuoted = false;
+        boolean doubleQuoted = false;
+        boolean escaped = false;
+        for (int i = 0; i < utf8.length; ++i) {
+            byte b = utf8[i];
+            if (b == '\'' && !escaped && !doubleQuoted) {
+                singleQuoted = !singleQuoted;
+            } else if (b == '"' && !singleQuoted) {
+                // No !escaped check here: in SQL, double quotes delimit identifiers,
+                // where backslash has no special escaping role. A literal double quote
+                // inside an identifier is escaped by doubling it (""), not by backslash.
+                doubleQuoted = !doubleQuoted;
+            } else {
+                escaped = (b == '\\') & !escaped;
+                positions.set(i, !singleQuoted & !doubleQuoted & isSplitter(b));
+            }
+        }
+        return positions;
     }
-    return positions;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/normalize/SimpleHttpPathNormalizer.java b/internal-api/src/main/java/datadog/trace/api/normalize/SimpleHttpPathNormalizer.java
index d4857986ebe..6de6967e22d 100644
--- a/internal-api/src/main/java/datadog/trace/api/normalize/SimpleHttpPathNormalizer.java
+++ b/internal-api/src/main/java/datadog/trace/api/normalize/SimpleHttpPathNormalizer.java
@@ -5,87 +5,86 @@
 // public because this is used in the testing module but groovy accesses it through Class.forName
 // which is banned
 public final class SimpleHttpPathNormalizer extends HttpPathNormalizer {
-  // package private so things outside groovy for tests can't create an instance
-  SimpleHttpPathNormalizer() {}
+    // package private so things outside groovy for tests can't create an instance
+    SimpleHttpPathNormalizer() {}
 
-  @Override
-  public String normalize(String path, boolean encoded) {
-    if (null == path || path.isEmpty()) {
-      return "/";
-    }
-    final boolean preserveSpaces =
-        !encoded && Config.get().isHttpServerDecodedResourcePreserveSpaces();
-    StringBuilder sb = null;
-    int inEncoding = 0;
-    for (int i = 0; i < path.length(); ) {
-      int nextSlash = path.indexOf('/', i);
-      if (nextSlash != i) {
-        int endOfSegment = nextSlash == -1 ? path.length() : nextSlash;
-        // detect version identifiers
-        int segmentLength = (endOfSegment - i);
-        if ((segmentLength <= 3 && segmentLength > 1 && (path.charAt(i) | ' ') == 'v')) {
-          boolean numeric = true;
-          for (int j = i + 1; j < endOfSegment; ++j) {
-            numeric &= isDigit(path.charAt(j));
-          }
-          if (numeric) {
-            if (sb != null) {
-              sb.append(path, i, endOfSegment);
-            }
-          } else {
-            sb = ensureStringBuilder(sb, path, i);
-            sb.append('?');
-          }
-        } else {
-          int snapshot = sb != null ? sb.length() : i;
-          boolean numeric = false;
-          for (int j = i; j < endOfSegment && !numeric; ++j) {
-            final char c = path.charAt(j);
-            if (encoded && c == '%') {
-              inEncoding = 3;
+    @Override
+    public String normalize(String path, boolean encoded) {
+        if (null == path || path.isEmpty()) {
+            return "/";
+        }
+        final boolean preserveSpaces = !encoded && Config.get().isHttpServerDecodedResourcePreserveSpaces();
+        StringBuilder sb = null;
+        int inEncoding = 0;
+        for (int i = 0; i < path.length(); ) {
+            int nextSlash = path.indexOf('/', i);
+            if (nextSlash != i) {
+                int endOfSegment = nextSlash == -1 ? path.length() : nextSlash;
+                // detect version identifiers
+                int segmentLength = (endOfSegment - i);
+                if ((segmentLength <= 3 && segmentLength > 1 && (path.charAt(i) | ' ') == 'v')) {
+                    boolean numeric = true;
+                    for (int j = i + 1; j < endOfSegment; ++j) {
+                        numeric &= isDigit(path.charAt(j));
+                    }
+                    if (numeric) {
+                        if (sb != null) {
+                            sb.append(path, i, endOfSegment);
+                        }
+                    } else {
+                        sb = ensureStringBuilder(sb, path, i);
+                        sb.append('?');
+                    }
+                } else {
+                    int snapshot = sb != null ? sb.length() : i;
+                    boolean numeric = false;
+                    for (int j = i; j < endOfSegment && !numeric; ++j) {
+                        final char c = path.charAt(j);
+                        if (encoded && c == '%') {
+                            inEncoding = 3;
+                        }
+                        inEncoding--;
+                        numeric = inEncoding < 0 && isDigit(c);
+                        if (!numeric) {
+                            if (Character.isWhitespace(c)) {
+                                sb = ensureStringBuilder(sb, path, j);
+                                if (preserveSpaces && sb.length() > 0) {
+                                    sb.append(c);
+                                }
+                            } else if (sb != null) {
+                                sb.append(c);
+                            }
+                        }
+                    }
+                    if (numeric) {
+                        sb = ensureStringBuilder(sb, path, snapshot);
+                        sb.setLength(snapshot);
+                        sb.append('?');
+                    }
+                }
+                i = endOfSegment + 1;
+            } else {
+                ++i;
             }
-            inEncoding--;
-            numeric = inEncoding < 0 && isDigit(c);
-            if (!numeric) {
-              if (Character.isWhitespace(c)) {
-                sb = ensureStringBuilder(sb, path, j);
-                if (preserveSpaces && sb.length() > 0) {
-                  sb.append(c);
+            if (nextSlash != -1) {
+                if (sb != null) {
+                    sb.append('/');
                 }
-              } else if (sb != null) {
-                sb.append(c);
-              }
             }
-          }
-          if (numeric) {
-            sb = ensureStringBuilder(sb, path, snapshot);
-            sb.setLength(snapshot);
-            sb.append('?');
-          }
-        }
-        i = endOfSegment + 1;
-      } else {
-        ++i;
-      }
-      if (nextSlash != -1) {
-        if (sb != null) {
-          sb.append('/');
         }
-      }
+        return sb == null ? path : sb.length() == 0 ? "/" : sb.toString();
     }
-    return sb == null ? path : sb.length() == 0 ? "/" : sb.toString();
-  }
 
-  private static boolean isDigit(char c) {
-    return c <= '9' && c >= '0';
-  }
-
-  private static StringBuilder ensureStringBuilder(StringBuilder sb, String path, int position) {
-    if (sb == null) {
-      sb = new StringBuilder();
-      sb.append(path, 0, position);
+    private static boolean isDigit(char c) {
+        return c <= '9' && c >= '0';
     }
 
-    return sb;
-  }
+    private static StringBuilder ensureStringBuilder(StringBuilder sb, String path, int position) {
+        if (sb == null) {
+            sb = new StringBuilder();
+            sb.append(path, 0, position);
+        }
+
+        return sb;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/profiling/ProfilerFlareLogger.java b/internal-api/src/main/java/datadog/trace/api/profiling/ProfilerFlareLogger.java
index 6fc57ae641d..07656dcd9cc 100644
--- a/internal-api/src/main/java/datadog/trace/api/profiling/ProfilerFlareLogger.java
+++ b/internal-api/src/main/java/datadog/trace/api/profiling/ProfilerFlareLogger.java
@@ -14,90 +14,90 @@
 import org.slf4j.helpers.MessageFormatter;
 
 public final class ProfilerFlareLogger implements TracerFlare.Reporter {
-  private static final Logger log = LoggerFactory.getLogger(ProfilerFlareLogger.class);
+    private static final Logger log = LoggerFactory.getLogger(ProfilerFlareLogger.class);
 
-  private static final class Singleton {
-    private static final ProfilerFlareLogger INSTANCE = new ProfilerFlareLogger();
-  }
+    private static final class Singleton {
+        private static final ProfilerFlareLogger INSTANCE = new ProfilerFlareLogger();
+    }
 
-  private final int REPORT_CAPACITY = 2 * 1024 * 1024; // 2MiB max in profiler reports
-  private final List<String> flareReportLines = new ArrayList<>();
-  private int usedReportCapacity = 0;
+    private final int REPORT_CAPACITY = 2 * 1024 * 1024; // 2MiB max in profiler reports
+    private final List<String> flareReportLines = new ArrayList<>();
+    private int usedReportCapacity = 0;
 
-  @VisibleForTesting
-  ProfilerFlareLogger() {
-    TracerFlare.addReporter(this);
-  }
+    @VisibleForTesting
+    ProfilerFlareLogger() {
+        TracerFlare.addReporter(this);
+    }
 
-  public static ProfilerFlareLogger getInstance() {
-    return Singleton.INSTANCE;
-  }
+    public static ProfilerFlareLogger getInstance() {
+        return Singleton.INSTANCE;
+    }
 
-  /**
-   * Logs the message in slf4j format to the flare log storage.<br>
-   *
-   * @param msgFormat the message format in slf4j style
-   * @param args the arguments for the message format
-   * @return Returns {@literal true} if the message was stored for flare, {@literal false} otherwise
-   */
-  public boolean log(String msgFormat, Object... args) {
-    // if something is important enough to store in flare, perhaps logging at WARN level is fine
-    log.warn(msgFormat, args);
+    /**
+     * Logs the message in slf4j format to the flare log storage.<br>
+     *
+     * @param msgFormat the message format in slf4j style
+     * @param args the arguments for the message format
+     * @return Returns {@literal true} if the message was stored for flare, {@literal false} otherwise
+     */
+    public boolean log(String msgFormat, Object... args) {
+        // if something is important enough to store in flare, perhaps logging at WARN level is fine
+        log.warn(msgFormat, args);
 
-    FormattingTuple ft = MessageFormatter.arrayFormat(msgFormat, args);
-    StringBuilder sb =
-        new StringBuilder(Instant.now().atZone(ZoneOffset.UTC).toString())
-            .append('\t')
-            .append(ft.getMessage())
-            .append('\n');
-    if (ft.getThrowable() != null) {
-      sb.append(ft.getThrowable());
-    }
-    synchronized (flareReportLines) {
-      if (usedReportCapacity + sb.length() < REPORT_CAPACITY) {
-        flareReportLines.add(sb.toString());
-        usedReportCapacity += sb.length();
-        return true;
-      }
+        FormattingTuple ft = MessageFormatter.arrayFormat(msgFormat, args);
+        StringBuilder sb = new StringBuilder(
+                        Instant.now().atZone(ZoneOffset.UTC).toString())
+                .append('\t')
+                .append(ft.getMessage())
+                .append('\n');
+        if (ft.getThrowable() != null) {
+            sb.append(ft.getThrowable());
+        }
+        synchronized (flareReportLines) {
+            if (usedReportCapacity + sb.length() < REPORT_CAPACITY) {
+                flareReportLines.add(sb.toString());
+                usedReportCapacity += sb.length();
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 
-  @Override
-  public void addReportToFlare(ZipOutputStream zip) throws IOException {
-    synchronized (flareReportLines) {
-      if (!flareReportLines.isEmpty()) {
-        TracerFlare.addText(zip, "profiler_log.txt", String.join("\n", flareReportLines));
-      }
+    @Override
+    public void addReportToFlare(ZipOutputStream zip) throws IOException {
+        synchronized (flareReportLines) {
+            if (!flareReportLines.isEmpty()) {
+                TracerFlare.addText(zip, "profiler_log.txt", String.join("\n", flareReportLines));
+            }
+        }
     }
-  }
 
-  @Override
-  public void cleanupAfterFlare() {
-    cleanup();
-  }
+    @Override
+    public void cleanupAfterFlare() {
+        cleanup();
+    }
 
-  @VisibleForTesting
-  int getUsedReportCapacity() {
-    return usedReportCapacity;
-  }
+    @VisibleForTesting
+    int getUsedReportCapacity() {
+        return usedReportCapacity;
+    }
 
-  @VisibleForTesting
-  int getMaxReportCapacity() {
-    return REPORT_CAPACITY;
-  }
+    @VisibleForTesting
+    int getMaxReportCapacity() {
+        return REPORT_CAPACITY;
+    }
 
-  @VisibleForTesting
-  int linesSize() {
-    synchronized (flareReportLines) {
-      return flareReportLines.size();
+    @VisibleForTesting
+    int linesSize() {
+        synchronized (flareReportLines) {
+            return flareReportLines.size();
+        }
     }
-  }
 
-  void cleanup() {
-    synchronized (flareReportLines) {
-      flareReportLines.clear();
-      usedReportCapacity = 0;
+    void cleanup() {
+        synchronized (flareReportLines) {
+            flareReportLines.clear();
+            usedReportCapacity = 0;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/profiling/ProfilingEnablement.java b/internal-api/src/main/java/datadog/trace/api/profiling/ProfilingEnablement.java
index 4c1131f8ade..5b21486f4bd 100644
--- a/internal-api/src/main/java/datadog/trace/api/profiling/ProfilingEnablement.java
+++ b/internal-api/src/main/java/datadog/trace/api/profiling/ProfilingEnablement.java
@@ -6,79 +6,79 @@
 import org.slf4j.LoggerFactory;
 
 public enum ProfilingEnablement {
-  ENABLED(true, "manual"),
-  DISABLED(false),
-  AUTO(true),
-  INJECTED(true);
+    ENABLED(true, "manual"),
+    DISABLED(false),
+    AUTO(true),
+    INJECTED(true);
 
-  private static final Logger logger = LoggerFactory.getLogger(Profiling.class);
+    private static final Logger logger = LoggerFactory.getLogger(Profiling.class);
 
-  private final boolean active;
-  private final String alias;
+    private final boolean active;
+    private final String alias;
 
-  ProfilingEnablement(boolean active) {
-    this.active = active;
-    this.alias = this.name().toLowerCase();
-  }
-
-  ProfilingEnablement(boolean active, String alias) {
-    this.active = active;
-    this.alias = alias;
-  }
-
-  public boolean isActive() {
-    return active;
-  }
-
-  public String getAlias() {
-    return alias;
-  }
+    ProfilingEnablement(boolean active) {
+        this.active = active;
+        this.alias = this.name().toLowerCase();
+    }
 
-  public static ProfilingEnablement from(ConfigProvider config) {
-    ProfilingEnablement ret = ProfilingEnablement.DISABLED;
-    String value = config.getString(ProfilingConfig.PROFILING_ENABLED);
-    if (value != null) {
-      ret = of(value);
+    ProfilingEnablement(boolean active, String alias) {
+        this.active = active;
+        this.alias = alias;
     }
-    if (ret == DISABLED) {
-      String ssi = config.getString("injection.enabled");
-      ret = ssi != null && ssi.contains("profiler") ? INJECTED : DISABLED;
+
+    public boolean isActive() {
+        return active;
     }
-    return ret;
-  }
 
-  public static ProfilingEnablement of(String value) {
-    if (value == null) {
-      return DISABLED;
+    public String getAlias() {
+        return alias;
     }
-    switch (value.toLowerCase()) {
-      case "true":
-      case "1":
-        return ENABLED;
-      case "auto":
-        return AUTO;
-      default:
-        return DISABLED;
+
+    public static ProfilingEnablement from(ConfigProvider config) {
+        ProfilingEnablement ret = ProfilingEnablement.DISABLED;
+        String value = config.getString(ProfilingConfig.PROFILING_ENABLED);
+        if (value != null) {
+            ret = of(value);
+        }
+        if (ret == DISABLED) {
+            String ssi = config.getString("injection.enabled");
+            ret = ssi != null && ssi.contains("profiler") ? INJECTED : DISABLED;
+        }
+        return ret;
     }
-  }
 
-  public static void validate(String value) {
-    if (value == null) {
-      return;
+    public static ProfilingEnablement of(String value) {
+        if (value == null) {
+            return DISABLED;
+        }
+        switch (value.toLowerCase()) {
+            case "true":
+            case "1":
+                return ENABLED;
+            case "auto":
+                return AUTO;
+            default:
+                return DISABLED;
+        }
     }
-    switch (value.toLowerCase()) {
-      case "false":
-      case "true":
-      case "auto":
-        return;
-      // values 1 and 0 are accepted for backwards compatibility
-      case "1":
-      case "0":
-        return;
-      default:
-        logger.warn(
-            "Invalid value for 'dd.profiling.enabled' (DD_PROFILING_ENABLED) detected: {}. Valid values are 'true', 'false' and 'auto'.",
-            value);
+
+    public static void validate(String value) {
+        if (value == null) {
+            return;
+        }
+        switch (value.toLowerCase()) {
+            case "false":
+            case "true":
+            case "auto":
+                return;
+            // values 1 and 0 are accepted for backwards compatibility
+            case "1":
+            case "0":
+                return;
+            default:
+                logger.warn(
+                        "Invalid value for 'dd.profiling.enabled' (DD_PROFILING_ENABLED) detected: {}. Valid values are 'true', 'false' and 'auto'.",
+                        value);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/profiling/ProfilingSnapshot.java b/internal-api/src/main/java/datadog/trace/api/profiling/ProfilingSnapshot.java
index 96496fc9105..81272d441e8 100644
--- a/internal-api/src/main/java/datadog/trace/api/profiling/ProfilingSnapshot.java
+++ b/internal-api/src/main/java/datadog/trace/api/profiling/ProfilingSnapshot.java
@@ -1,8 +1,8 @@
 package datadog.trace.api.profiling;
 
 public interface ProfilingSnapshot {
-  enum Kind {
-    PERIODIC,
-    ON_SHUTDOWN
-  }
+    enum Kind {
+        PERIODIC,
+        ON_SHUTDOWN
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/profiling/QueueTiming.java b/internal-api/src/main/java/datadog/trace/api/profiling/QueueTiming.java
index bdf397d0c09..a3516cdbd6a 100644
--- a/internal-api/src/main/java/datadog/trace/api/profiling/QueueTiming.java
+++ b/internal-api/src/main/java/datadog/trace/api/profiling/QueueTiming.java
@@ -2,11 +2,11 @@
 
 public interface QueueTiming extends Timing {
 
-  void setTask(Object task);
+    void setTask(Object task);
 
-  void setScheduler(Class<?> scheduler);
+    void setScheduler(Class<?> scheduler);
 
-  void setQueue(Class<?> queue);
+    void setQueue(Class<?> queue);
 
-  void setQueueLength(int queueLength);
+    void setQueueLength(int queueLength);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/profiling/RecordingData.java b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingData.java
index d62f1541c3e..bb7aa669b14 100644
--- a/internal-api/src/main/java/datadog/trace/api/profiling/RecordingData.java
+++ b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingData.java
@@ -23,87 +23,87 @@
 
 /** Platform-agnostic API for operations required when retrieving data using the ProfilingSystem. */
 public abstract class RecordingData implements ProfilingSnapshot {
-  protected final Instant start;
-  protected final Instant end;
-  protected final Kind kind;
+    protected final Instant start;
+    protected final Instant end;
+    protected final Kind kind;
 
-  public RecordingData(final Instant start, final Instant end, Kind kind) {
-    this.start = start;
-    this.end = end;
-    this.kind = kind;
-  }
+    public RecordingData(final Instant start, final Instant end, Kind kind) {
+        this.start = start;
+        this.end = end;
+        this.kind = kind;
+    }
 
-  /**
-   * @return the data stream if it contains any data.
-   * @throws IOException if the stream to return is empty or another IO-related problem occurred.
-   */
-  @Nonnull
-  public abstract RecordingInputStream getStream() throws IOException;
+    /**
+     * @return the data stream if it contains any data.
+     * @throws IOException if the stream to return is empty or another IO-related problem occurred.
+     */
+    @Nonnull
+    public abstract RecordingInputStream getStream() throws IOException;
 
-  /**
-   * Releases the resources associated with the recording, for example the underlying file.
-   *
-   * <p>Forgetting to releasing this when done streaming, will lead to one or more of the following:
-   *
-   * <ul>
-   *   <li>Memory leak
-   *   <li>File leak
-   * </ul>
-   *
-   * <p>Please don't forget to call release when done streaming...
-   */
-  public abstract void release();
+    /**
+     * Releases the resources associated with the recording, for example the underlying file.
+     *
+     * <p>Forgetting to releasing this when done streaming, will lead to one or more of the following:
+     *
+     * <ul>
+     *   <li>Memory leak
+     *   <li>File leak
+     * </ul>
+     *
+     * <p>Please don't forget to call release when done streaming...
+     */
+    public abstract void release();
 
-  /**
-   * Returns the name of the recording from which the data is originating.
-   *
-   * @return the name of the recording from which the data is originating.
-   */
-  @Nonnull
-  public abstract String getName();
+    /**
+     * Returns the name of the recording from which the data is originating.
+     *
+     * @return the name of the recording from which the data is originating.
+     */
+    @Nonnull
+    public abstract String getName();
 
-  /**
-   * Returns the requested start time for the recording.
-   *
-   * <p>Note that this doesn't necessarily have to match the time for the actual data recorded.
-   *
-   * @return the requested start time.
-   */
-  @Nonnull
-  public final Instant getStart() {
-    return start;
-  }
+    /**
+     * Returns the requested start time for the recording.
+     *
+     * <p>Note that this doesn't necessarily have to match the time for the actual data recorded.
+     *
+     * @return the requested start time.
+     */
+    @Nonnull
+    public final Instant getStart() {
+        return start;
+    }
 
-  /**
-   * Returns the requested end time for the recording.
-   *
-   * <p>Note that this doesn't necessarily have to match the time for the actual data recorded.
-   *
-   * @return the requested end time.
-   */
-  @Nonnull
-  public final Instant getEnd() {
-    return end;
-  }
+    /**
+     * Returns the requested end time for the recording.
+     *
+     * <p>Note that this doesn't necessarily have to match the time for the actual data recorded.
+     *
+     * @return the requested end time.
+     */
+    @Nonnull
+    public final Instant getEnd() {
+        return end;
+    }
 
-  @Nonnull
-  public final Kind getKind() {
-    return kind;
-  }
+    @Nonnull
+    public final Kind getKind() {
+        return kind;
+    }
 
-  /**
-   * Returns the file path backing this recording data, if available. Implementations that store
-   * recording data on disk can override this to avoid unnecessary stream materialization.
-   *
-   * @return the file path, or {@code null} if the data is not file-backed
-   */
-  @Nullable
-  public Path getPath() {
-    return null;
-  }
+    /**
+     * Returns the file path backing this recording data, if available. Implementations that store
+     * recording data on disk can override this to avoid unnecessary stream materialization.
+     *
+     * @return the file path, or {@code null} if the data is not file-backed
+     */
+    @Nullable
+    public Path getPath() {
+        return null;
+    }
 
-  @Override
-  public final String toString() {
-    return "name=" + getName() + ", kind=" + getKind();
-  }
+    @Override
+    public final String toString() {
+        return "name=" + getName() + ", kind=" + getKind();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/profiling/RecordingDataListener.java b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingDataListener.java
index 29a5e4951bf..b94c719a6b8 100644
--- a/internal-api/src/main/java/datadog/trace/api/profiling/RecordingDataListener.java
+++ b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingDataListener.java
@@ -17,14 +17,14 @@
 
 /** Listener for getting notified when new recording data is becoming available. */
 public interface RecordingDataListener {
-  /**
-   * Called when new recording data becomes available. Handle quickly, e.g. typically schedule
-   * streaming of the new available data in another thread. Do not forget to {@link
-   * RecordingData#release()} when the data has been uploaded.
-   *
-   * @param type type of the recording
-   * @param data the new data available
-   * @param handleSynchronously whether to handle the data synchronously
-   */
-  void onNewData(RecordingType type, RecordingData data, boolean handleSynchronously);
+    /**
+     * Called when new recording data becomes available. Handle quickly, e.g. typically schedule
+     * streaming of the new available data in another thread. Do not forget to {@link
+     * RecordingData#release()} when the data has been uploaded.
+     *
+     * @param type type of the recording
+     * @param data the new data available
+     * @param handleSynchronously whether to handle the data synchronously
+     */
+    void onNewData(RecordingType type, RecordingData data, boolean handleSynchronously);
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/profiling/RecordingInputStream.java b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingInputStream.java
index 0549635a027..42bc12c9e0c 100644
--- a/internal-api/src/main/java/datadog/trace/api/profiling/RecordingInputStream.java
+++ b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingInputStream.java
@@ -5,30 +5,30 @@
 import java.io.InputStream;
 
 public class RecordingInputStream extends BufferedInputStream {
-  public RecordingInputStream(InputStream in) {
-    super(in);
-  }
+    public RecordingInputStream(InputStream in) {
+        super(in);
+    }
 
-  /**
-   * Checks whether the recording input stream does not contain any data
-   *
-   * @return {@literal true} if the input data stream is empty
-   * @throws IOException
-   */
-  public boolean isEmpty() throws IOException {
-    // if 'pos' is non-zero the stream is definitely not empty
-    if (pos == 0) {
-      try {
-        // store the current position (which should be 0)
-        mark(1);
-        // and try reading the next byte - if it fails the stream is empty
-        return read() == -1;
-      } finally {
-        // restore the stream back to the stored position so it can be properly processed if not
-        // empty
-        reset();
-      }
+    /**
+     * Checks whether the recording input stream does not contain any data
+     *
+     * @return {@literal true} if the input data stream is empty
+     * @throws IOException
+     */
+    public boolean isEmpty() throws IOException {
+        // if 'pos' is non-zero the stream is definitely not empty
+        if (pos == 0) {
+            try {
+                // store the current position (which should be 0)
+                mark(1);
+                // and try reading the next byte - if it fails the stream is empty
+                return read() == -1;
+            } finally {
+                // restore the stream back to the stored position so it can be properly processed if not
+                // empty
+                reset();
+            }
+        }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/profiling/RecordingType.java b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingType.java
index 639ccc39557..51eedaadc92 100644
--- a/internal-api/src/main/java/datadog/trace/api/profiling/RecordingType.java
+++ b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingType.java
@@ -1,15 +1,15 @@
 package datadog.trace.api.profiling;
 
 public enum RecordingType {
-  CONTINUOUS("continuous");
+    CONTINUOUS("continuous");
 
-  private final String name;
+    private final String name;
 
-  RecordingType(final String name) {
-    this.name = name;
-  }
+    RecordingType(final String name) {
+        this.name = name;
+    }
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/profiling/Timer.java b/internal-api/src/main/java/datadog/trace/api/profiling/Timer.java
index 991fc832e76..ef28bf5ddae 100644
--- a/internal-api/src/main/java/datadog/trace/api/profiling/Timer.java
+++ b/internal-api/src/main/java/datadog/trace/api/profiling/Timer.java
@@ -2,19 +2,19 @@
 
 public interface Timer {
 
-  enum TimerType {
-    QUEUEING
-  }
+    enum TimerType {
+        QUEUEING
+    }
 
-  Timing start(TimerType type);
+    Timing start(TimerType type);
 
-  final class NoOp implements Timer {
+    final class NoOp implements Timer {
 
-    public static final Timer INSTANCE = new NoOp();
+        public static final Timer INSTANCE = new NoOp();
 
-    @Override
-    public Timing start(TimerType type) {
-      return Timing.NoOp.INSTANCE;
+        @Override
+        public Timing start(TimerType type) {
+            return Timing.NoOp.INSTANCE;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/profiling/Timing.java b/internal-api/src/main/java/datadog/trace/api/profiling/Timing.java
index dc3af48860b..26343056501 100644
--- a/internal-api/src/main/java/datadog/trace/api/profiling/Timing.java
+++ b/internal-api/src/main/java/datadog/trace/api/profiling/Timing.java
@@ -1,31 +1,31 @@
 package datadog.trace.api.profiling;
 
 public interface Timing {
-  void report();
+    void report();
 
-  boolean sample();
+    boolean sample();
 
-  class NoOp implements Timing, QueueTiming {
-    public static final Timing INSTANCE = new NoOp();
+    class NoOp implements Timing, QueueTiming {
+        public static final Timing INSTANCE = new NoOp();
 
-    @Override
-    public void report() {}
+        @Override
+        public void report() {}
 
-    @Override
-    public boolean sample() {
-      return false;
-    }
+        @Override
+        public boolean sample() {
+            return false;
+        }
 
-    @Override
-    public void setTask(Object task) {}
+        @Override
+        public void setTask(Object task) {}
 
-    @Override
-    public void setScheduler(Class<?> scheduler) {}
+        @Override
+        public void setScheduler(Class<?> scheduler) {}
 
-    @Override
-    public void setQueue(Class<?> queue) {}
+        @Override
+        public void setQueue(Class<?> queue) {}
 
-    @Override
-    public void setQueueLength(int queueLength) {}
-  }
+        @Override
+        public void setQueueLength(int queueLength) {}
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/propagation/W3CTraceParent.java b/internal-api/src/main/java/datadog/trace/api/propagation/W3CTraceParent.java
index c8a15dc67e4..771ddea4879 100644
--- a/internal-api/src/main/java/datadog/trace/api/propagation/W3CTraceParent.java
+++ b/internal-api/src/main/java/datadog/trace/api/propagation/W3CTraceParent.java
@@ -11,32 +11,32 @@
  */
 public final class W3CTraceParent {
 
-  private static final int TRACE_PARENT_LENGTH = 55;
+    private static final int TRACE_PARENT_LENGTH = 55;
 
-  private W3CTraceParent() {}
+    private W3CTraceParent() {}
 
-  /**
-   * Builds a W3C traceparent header value from the given trace context components.
-   *
-   * <p>Format: {@code <version>-<traceId>-<spanId>-<flags>}
-   *
-   * @param traceId the trace id
-   * @param spanId the span id
-   * @param isSampled whether the trace was sampled or not
-   * @return the W3C traceparent header value
-   */
-  public static String from(DDTraceId traceId, long spanId, boolean isSampled) {
-    StringBuilder sb = new StringBuilder(TRACE_PARENT_LENGTH);
-    sb.append("00-");
-    sb.append(traceId.toHexString());
-    sb.append('-');
-    sb.append(DDSpanId.toHexStringPadded(spanId));
-    sb.append(isSampled ? "-01" : "-00");
+    /**
+     * Builds a W3C traceparent header value from the given trace context components.
+     *
+     * <p>Format: {@code <version>-<traceId>-<spanId>-<flags>}
+     *
+     * @param traceId the trace id
+     * @param spanId the span id
+     * @param isSampled whether the trace was sampled or not
+     * @return the W3C traceparent header value
+     */
+    public static String from(DDTraceId traceId, long spanId, boolean isSampled) {
+        StringBuilder sb = new StringBuilder(TRACE_PARENT_LENGTH);
+        sb.append("00-");
+        sb.append(traceId.toHexString());
+        sb.append('-');
+        sb.append(DDSpanId.toHexStringPadded(spanId));
+        sb.append(isSampled ? "-01" : "-00");
 
-    return sb.toString();
-  }
+        return sb.toString();
+    }
 
-  public static String from(AgentSpan span) {
-    return from(span.getTraceId(), span.getSpanId(), span.spanContext().getSamplingPriority() > 0);
-  }
+    public static String from(AgentSpan span) {
+        return from(span.getTraceId(), span.getSpanId(), span.spanContext().getSamplingPriority() > 0);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/remoteconfig/ServiceNameCollector.java b/internal-api/src/main/java/datadog/trace/api/remoteconfig/ServiceNameCollector.java
index 838d3cf3157..e9324c5f765 100644
--- a/internal-api/src/main/java/datadog/trace/api/remoteconfig/ServiceNameCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/remoteconfig/ServiceNameCollector.java
@@ -15,67 +15,66 @@
 
 public class ServiceNameCollector {
 
-  private static final Logger log = LoggerFactory.getLogger(ServiceNameCollector.class);
+    private static final Logger log = LoggerFactory.getLogger(ServiceNameCollector.class);
 
-  private static final int MAX_EXTRA_SERVICE = Config.get().getRemoteConfigMaxExtraServices();
+    private static final int MAX_EXTRA_SERVICE = Config.get().getRemoteConfigMaxExtraServices();
 
-  // This is not final to allow mocking it on tests
-  private static ServiceNameCollector INSTANCE = new ServiceNameCollector();
+    // This is not final to allow mocking it on tests
+    private static ServiceNameCollector INSTANCE = new ServiceNameCollector();
 
-  public static ServiceNameCollector get() {
-    return INSTANCE;
-  }
-
-  private final ConcurrentHashMap<String, String> services =
-      new ConcurrentHashMap<>(MAX_EXTRA_SERVICE);
+    public static ServiceNameCollector get() {
+        return INSTANCE;
+    }
 
-  volatile boolean limitReachedLogged = false;
+    private final ConcurrentHashMap<String, String> services = new ConcurrentHashMap<>(MAX_EXTRA_SERVICE);
 
-  private ServiceNameCollector() {
-    // singleton
-  }
+    volatile boolean limitReachedLogged = false;
 
-  public void addService(final String serviceName) {
-    if (serviceName == null || serviceName.isEmpty()) {
-      return;
+    private ServiceNameCollector() {
+        // singleton
     }
-    if (services.size() >= MAX_EXTRA_SERVICE) {
-      if (!limitReachedLogged) {
-        log.debug(
-            SEND_TELEMETRY,
-            "extra service limit({}) reached: service {} can't be added",
-            MAX_EXTRA_SERVICE,
-            serviceName);
-        limitReachedLogged = true;
-      }
-      return;
+
+    public void addService(final String serviceName) {
+        if (serviceName == null || serviceName.isEmpty()) {
+            return;
+        }
+        if (services.size() >= MAX_EXTRA_SERVICE) {
+            if (!limitReachedLogged) {
+                log.debug(
+                        SEND_TELEMETRY,
+                        "extra service limit({}) reached: service {} can't be added",
+                        MAX_EXTRA_SERVICE,
+                        serviceName);
+                limitReachedLogged = true;
+            }
+            return;
+        }
+        services.putIfAbsent(serviceName, serviceName);
     }
-    services.putIfAbsent(serviceName, serviceName);
-  }
 
-  /**
-   * Get the list of unique services deduplicated by case. There is no locking on the addService map
-   * so, the method is not thread safe.
-   *
-   * @return the list of unique services, or {@code null} if none have been collected
-   */
-  @Nullable
-  public List<String> getServices() {
-    if (services.isEmpty()) {
-      return null;
+    /**
+     * Get the list of unique services deduplicated by case. There is no locking on the addService map
+     * so, the method is not thread safe.
+     *
+     * @return the list of unique services, or {@code null} if none have been collected
+     */
+    @Nullable
+    public List<String> getServices() {
+        if (services.isEmpty()) {
+            return null;
+        }
+        final Set<String> uniqueNames = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+        uniqueNames.addAll(services.keySet());
+        uniqueNames.remove(Config.get().getServiceName());
+        return uniqueNames.isEmpty() ? null : new ArrayList<>(uniqueNames);
     }
-    final Set<String> uniqueNames = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
-    uniqueNames.addAll(services.keySet());
-    uniqueNames.remove(Config.get().getServiceName());
-    return uniqueNames.isEmpty() ? null : new ArrayList<>(uniqueNames);
-  }
 
-  public void clear() {
-    services.clear();
-  }
+    public void clear() {
+        services.clear();
+    }
 
-  @VisibleForTesting
-  static void setInstance(ServiceNameCollector instance) {
-    INSTANCE = instance;
-  }
+    @VisibleForTesting
+    static void setInstance(ServiceNameCollector instance) {
+        INSTANCE = instance;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/rum/RumInjector.java b/internal-api/src/main/java/datadog/trace/api/rum/RumInjector.java
index 5683f29372c..d5599be0a7b 100644
--- a/internal-api/src/main/java/datadog/trace/api/rum/RumInjector.java
+++ b/internal-api/src/main/java/datadog/trace/api/rum/RumInjector.java
@@ -8,158 +8,153 @@
 import java.util.function.Function;
 import javax.annotation.Nullable;
 
-@SuppressFBWarnings(
-    value = "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR",
-    justification = "Usage in tests")
+@SuppressFBWarnings(value = "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR", justification = "Usage in tests")
 public final class RumInjector {
-  private static final RumInjector INSTANCE =
-      new RumInjector(Config.get(), InstrumenterConfig.get());
-  private static final String MARKER = "</head>";
-  private static final char[] MARKER_CHARS = MARKER.toCharArray();
-  private static final Function<String, byte[]> MARKER_BYTES =
-      charset -> {
+    private static final RumInjector INSTANCE = new RumInjector(Config.get(), InstrumenterConfig.get());
+    private static final String MARKER = "</head>";
+    private static final char[] MARKER_CHARS = MARKER.toCharArray();
+    private static final Function<String, byte[]> MARKER_BYTES = charset -> {
         try {
-          return MARKER.getBytes(charset);
+            return MARKER.getBytes(charset);
         } catch (Throwable t) {
-          return null;
+            return null;
+        }
+    };
+
+    private final boolean enabled;
+    private final String snippet;
+    private final char[] snippetChars;
+
+    private final DDCache<String, byte[]> snippetCache;
+    private final DDCache<String, byte[]> markerCache;
+    private final Function<String, byte[]> snippetBytes;
+
+    private static volatile RumTelemetryCollector telemetryCollector = RumTelemetryCollector.NO_OP;
+
+    RumInjector(Config config, InstrumenterConfig instrumenterConfig) {
+        boolean rumEnabled = instrumenterConfig.isRumEnabled();
+        RumInjectorConfig injectorConfig = config.getRumInjectorConfig();
+        // If both RUM is enabled and injector config is valid
+        if (rumEnabled && injectorConfig != null) {
+            this.enabled = true;
+            this.snippet = injectorConfig.getSnippet();
+            this.snippetCache = DDCaches.newFixedSizeCache(16);
+            this.markerCache = DDCaches.newFixedSizeCache(16);
+            this.snippetChars = this.snippet.toCharArray();
+            this.snippetBytes = charset -> {
+                try {
+                    return snippet.getBytes(charset);
+                } catch (Throwable t) {
+                    return null;
+                }
+            };
+        } else {
+            this.enabled = false;
+            this.snippet = null;
+            this.snippetCache = null;
+            this.markerCache = null;
+            this.snippetBytes = null;
+            this.snippetChars = null;
         }
-      };
-
-  private final boolean enabled;
-  private final String snippet;
-  private final char[] snippetChars;
-
-  private final DDCache<String, byte[]> snippetCache;
-  private final DDCache<String, byte[]> markerCache;
-  private final Function<String, byte[]> snippetBytes;
-
-  private static volatile RumTelemetryCollector telemetryCollector = RumTelemetryCollector.NO_OP;
-
-  RumInjector(Config config, InstrumenterConfig instrumenterConfig) {
-    boolean rumEnabled = instrumenterConfig.isRumEnabled();
-    RumInjectorConfig injectorConfig = config.getRumInjectorConfig();
-    // If both RUM is enabled and injector config is valid
-    if (rumEnabled && injectorConfig != null) {
-      this.enabled = true;
-      this.snippet = injectorConfig.getSnippet();
-      this.snippetCache = DDCaches.newFixedSizeCache(16);
-      this.markerCache = DDCaches.newFixedSizeCache(16);
-      this.snippetChars = this.snippet.toCharArray();
-      this.snippetBytes =
-          charset -> {
-            try {
-              return snippet.getBytes(charset);
-            } catch (Throwable t) {
-              return null;
-            }
-          };
-    } else {
-      this.enabled = false;
-      this.snippet = null;
-      this.snippetCache = null;
-      this.markerCache = null;
-      this.snippetBytes = null;
-      this.snippetChars = null;
     }
-  }
-
-  public static RumInjector get() {
-    return INSTANCE;
-  }
-
-  /**
-   * Checks whether RUM injection is enabled and ready to inject.
-   *
-   * @return {@code true} if enabled, {@code otherwise}.
-   */
-  public boolean isEnabled() {
-    return this.enabled;
-  }
-
-  /**
-   * Gets the HTML snippet to inject RUM SDK
-   *
-   * @return The HTML snippet chars to inject, {@code null} if RUM injection is disabled.
-   */
-  @Nullable
-  public char[] getSnippetChars() {
-    if (!this.enabled) {
-      return null;
+
+    public static RumInjector get() {
+        return INSTANCE;
     }
-    return this.snippetChars;
-  }
-
-  /**
-   * Gets the HTML snippet to inject RUM SDK
-   *
-   * @return The HTML snippet to inject, {@code null} if RUM injection is disabled.
-   */
-  @Nullable
-  public byte[] getSnippetBytes(String encoding) {
-    if (!this.enabled) {
-      return null;
+
+    /**
+     * Checks whether RUM injection is enabled and ready to inject.
+     *
+     * @return {@code true} if enabled, {@code otherwise}.
+     */
+    public boolean isEnabled() {
+        return this.enabled;
     }
-    return this.snippetCache.computeIfAbsent(encoding, this.snippetBytes);
-  }
-
-  /**
-   * Gets the marker chars to inject RUM SDK after.
-   *
-   * @return The marker chars, {@code null} if RUM injection is disabled.
-   */
-  @Nullable
-  public char[] getMarkerChars() {
-    if (!this.enabled) {
-      return null;
+
+    /**
+     * Gets the HTML snippet to inject RUM SDK
+     *
+     * @return The HTML snippet chars to inject, {@code null} if RUM injection is disabled.
+     */
+    @Nullable
+    public char[] getSnippetChars() {
+        if (!this.enabled) {
+            return null;
+        }
+        return this.snippetChars;
     }
-    return MARKER_CHARS;
-  }
-
-  /**
-   * Gets the marker bytes to inject RUM SDK after.
-   *
-   * @param encoding The encoding to get the marker bytes from.
-   * @return The marker bytes, {@code null} if RUM injection is disabled.
-   */
-  @Nullable
-  public byte[] getMarkerBytes(String encoding) {
-    if (!this.enabled) {
-      return null;
+
+    /**
+     * Gets the HTML snippet to inject RUM SDK
+     *
+     * @return The HTML snippet to inject, {@code null} if RUM injection is disabled.
+     */
+    @Nullable
+    public byte[] getSnippetBytes(String encoding) {
+        if (!this.enabled) {
+            return null;
+        }
+        return this.snippetCache.computeIfAbsent(encoding, this.snippetBytes);
     }
-    return this.markerCache.computeIfAbsent(encoding, MARKER_BYTES);
-  }
-
-  /** Starts telemetry collection if RUM injection is enabled. */
-  public static void enableTelemetry() {
-    if (INSTANCE.isEnabled()) {
-      telemetryCollector = new RumInjectorMetrics();
-      telemetryCollector.onInitializationSucceed();
-    } else {
-      telemetryCollector = RumTelemetryCollector.NO_OP;
+
+    /**
+     * Gets the marker chars to inject RUM SDK after.
+     *
+     * @return The marker chars, {@code null} if RUM injection is disabled.
+     */
+    @Nullable
+    public char[] getMarkerChars() {
+        if (!this.enabled) {
+            return null;
+        }
+        return MARKER_CHARS;
+    }
+
+    /**
+     * Gets the marker bytes to inject RUM SDK after.
+     *
+     * @param encoding The encoding to get the marker bytes from.
+     * @return The marker bytes, {@code null} if RUM injection is disabled.
+     */
+    @Nullable
+    public byte[] getMarkerBytes(String encoding) {
+        if (!this.enabled) {
+            return null;
+        }
+        return this.markerCache.computeIfAbsent(encoding, MARKER_BYTES);
+    }
+
+    /** Starts telemetry collection if RUM injection is enabled. */
+    public static void enableTelemetry() {
+        if (INSTANCE.isEnabled()) {
+            telemetryCollector = new RumInjectorMetrics();
+            telemetryCollector.onInitializationSucceed();
+        } else {
+            telemetryCollector = RumTelemetryCollector.NO_OP;
+        }
+    }
+
+    /** Shuts down telemetry collection and resets the telemetry collector to NO_OP. */
+    public static void shutdownTelemetry() {
+        telemetryCollector.close();
+        telemetryCollector = RumTelemetryCollector.NO_OP;
+    }
+
+    /**
+     * Sets the telemetry collector. This is used for testing purposes only.
+     *
+     * @param collector The telemetry collector to set or {@code null} to reset to NO_OP.
+     */
+    public static void setTelemetryCollector(RumTelemetryCollector collector) {
+        telemetryCollector = collector != null ? collector : RumTelemetryCollector.NO_OP;
+    }
+
+    /**
+     * Gets the telemetry collector.
+     *
+     * @return The telemetry collector used to report telemetry.
+     */
+    public static RumTelemetryCollector getTelemetryCollector() {
+        return telemetryCollector;
     }
-  }
-
-  /** Shuts down telemetry collection and resets the telemetry collector to NO_OP. */
-  public static void shutdownTelemetry() {
-    telemetryCollector.close();
-    telemetryCollector = RumTelemetryCollector.NO_OP;
-  }
-
-  /**
-   * Sets the telemetry collector. This is used for testing purposes only.
-   *
-   * @param collector The telemetry collector to set or {@code null} to reset to NO_OP.
-   */
-  public static void setTelemetryCollector(RumTelemetryCollector collector) {
-    telemetryCollector = collector != null ? collector : RumTelemetryCollector.NO_OP;
-  }
-
-  /**
-   * Gets the telemetry collector.
-   *
-   * @return The telemetry collector used to report telemetry.
-   */
-  public static RumTelemetryCollector getTelemetryCollector() {
-    return telemetryCollector;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/rum/RumInjectorConfig.java b/internal-api/src/main/java/datadog/trace/api/rum/RumInjectorConfig.java
index 11832a0a515..e0a0664beae 100644
--- a/internal-api/src/main/java/datadog/trace/api/rum/RumInjectorConfig.java
+++ b/internal-api/src/main/java/datadog/trace/api/rum/RumInjectorConfig.java
@@ -8,221 +8,229 @@
 import javax.annotation.Nullable;
 
 public class RumInjectorConfig {
-  private static final String GOV_CLOUD_SITE = "ddog-gov.com";
-  private static final Map<String, String> REGIONS = new HashMap<>();
-
-  static {
-    REGIONS.put("datadoghq.com", "us1");
-    REGIONS.put("us3.datadoghq.com", "us3");
-    REGIONS.put("us5.datadoghq.com", "us5");
-    REGIONS.put("datadoghq.eu", "eu1");
-    REGIONS.put("ap1.datadoghq.com", "ap1");
-    REGIONS.put("ap2.datadoghq.com", "ap2");
-  }
-
-  /** RUM application ID */
-  public final String applicationId;
-
-  /** The client token provided by Datadog to authenticate requests. */
-  public final String clientToken;
-
-  /** The Datadog site to which data will be sent (e.g., `datadoghq.com`). */
-  public final String site;
-
-  /** The name of the service being monitored. */
-  @Nullable public final String service;
-
-  /** The environment of the service (e.g., `prod`, `staging` or `dev). */
-  @Nullable public final String env;
-
-  /** SDK major version. */
-  public final int majorVersion;
-
-  /** The version of the service (e.g., `0.1.0`, `a8dj92`, `2024-30`). */
-  @Nullable public final String version;
-
-  /** Enables or disables the automatic collection of users actions (e.g., clicks). */
-  @Nullable public final Boolean trackUserInteractions;
-
-  /** Enables or disables the collection of resource events (e.g., loading of images or scripts). */
-  @Nullable public final Boolean trackResources;
-
-  /** Enables or disables the collection of long task events. */
-  @Nullable public final Boolean trackLongTask;
-
-  /** The privacy level for data collection. */
-  @Nullable public final PrivacyLevel defaultPrivacyLevel;
-
-  /** The percentage of user sessions to be tracked (between 0.0 and 100.0). */
-  @Nullable public final Float sessionSampleRate;
-
-  /**
-   * The percentage of tracked sessions that will include Session Replay data (between 0.0 and
-   * 100.0).
-   */
-  @Nullable public final Float sessionReplaySampleRate;
-
-  /** The remote configuration identifier. */
-  @Nullable public final String remoteConfigurationId;
-
-  /** The JSON representation of injector config to use in the injected SDK snippet. */
-  public final String jsonPayload;
-
-  public RumInjectorConfig(
-      String applicationId,
-      String clientToken,
-      @Nullable String site,
-      @Nullable String service,
-      @Nullable String env,
-      int majorVersion,
-      @Nullable String version,
-      @Nullable Boolean trackUserInteractions,
-      @Nullable Boolean trackResources,
-      @Nullable Boolean trackLongTask,
-      @Nullable PrivacyLevel defaultPrivacyLevel,
-      @Nullable Float sessionSampleRate,
-      @Nullable Float sessionReplaySampleRate,
-      @Nullable String remoteConfigurationId) {
-    if (applicationId == null || applicationId.isEmpty()) {
-      throw new IllegalArgumentException("Invalid application id: " + applicationId);
+    private static final String GOV_CLOUD_SITE = "ddog-gov.com";
+    private static final Map<String, String> REGIONS = new HashMap<>();
+
+    static {
+        REGIONS.put("datadoghq.com", "us1");
+        REGIONS.put("us3.datadoghq.com", "us3");
+        REGIONS.put("us5.datadoghq.com", "us5");
+        REGIONS.put("datadoghq.eu", "eu1");
+        REGIONS.put("ap1.datadoghq.com", "ap1");
+        REGIONS.put("ap2.datadoghq.com", "ap2");
     }
-    this.applicationId = applicationId;
-    if (clientToken == null || clientToken.isEmpty()) {
-      throw new IllegalArgumentException("Invalid client token: " + clientToken);
-    }
-    this.clientToken = clientToken;
-    if (site == null || site.isEmpty()) {
-      this.site = DEFAULT_RUM_SITE;
-    } else if (validateSite(site)) {
-      this.site = site;
-    } else {
-      throw new IllegalArgumentException("Invalid site: " + site);
-    }
-    this.service = service;
-    this.env = env;
-    if (majorVersion != 5 && majorVersion != 6) {
-      throw new IllegalArgumentException("Invalid major version: " + majorVersion);
-    }
-    this.majorVersion = majorVersion;
-    this.version = version;
-    this.trackUserInteractions = trackUserInteractions;
-    this.trackResources = trackResources;
-    this.trackLongTask = trackLongTask;
-    if (sessionSampleRate != null && (sessionSampleRate < 0f || sessionSampleRate > 100f)) {
-      throw new IllegalArgumentException("Invalid session sample rate: " + sessionSampleRate);
-    }
-    this.sessionSampleRate = sessionSampleRate;
-    if (sessionReplaySampleRate != null
-        && (sessionReplaySampleRate < 0f || sessionReplaySampleRate > 100f)) {
-      throw new IllegalArgumentException(
-          "Invalid session replay sample rate: " + sessionReplaySampleRate);
+
+    /** RUM application ID */
+    public final String applicationId;
+
+    /** The client token provided by Datadog to authenticate requests. */
+    public final String clientToken;
+
+    /** The Datadog site to which data will be sent (e.g., `datadoghq.com`). */
+    public final String site;
+
+    /** The name of the service being monitored. */
+    @Nullable
+    public final String service;
+
+    /** The environment of the service (e.g., `prod`, `staging` or `dev). */
+    @Nullable
+    public final String env;
+
+    /** SDK major version. */
+    public final int majorVersion;
+
+    /** The version of the service (e.g., `0.1.0`, `a8dj92`, `2024-30`). */
+    @Nullable
+    public final String version;
+
+    /** Enables or disables the automatic collection of users actions (e.g., clicks). */
+    @Nullable
+    public final Boolean trackUserInteractions;
+
+    /** Enables or disables the collection of resource events (e.g., loading of images or scripts). */
+    @Nullable
+    public final Boolean trackResources;
+
+    /** Enables or disables the collection of long task events. */
+    @Nullable
+    public final Boolean trackLongTask;
+
+    /** The privacy level for data collection. */
+    @Nullable
+    public final PrivacyLevel defaultPrivacyLevel;
+
+    /** The percentage of user sessions to be tracked (between 0.0 and 100.0). */
+    @Nullable
+    public final Float sessionSampleRate;
+
+    /**
+     * The percentage of tracked sessions that will include Session Replay data (between 0.0 and
+     * 100.0).
+     */
+    @Nullable
+    public final Float sessionReplaySampleRate;
+
+    /** The remote configuration identifier. */
+    @Nullable
+    public final String remoteConfigurationId;
+
+    /** The JSON representation of injector config to use in the injected SDK snippet. */
+    public final String jsonPayload;
+
+    public RumInjectorConfig(
+            String applicationId,
+            String clientToken,
+            @Nullable String site,
+            @Nullable String service,
+            @Nullable String env,
+            int majorVersion,
+            @Nullable String version,
+            @Nullable Boolean trackUserInteractions,
+            @Nullable Boolean trackResources,
+            @Nullable Boolean trackLongTask,
+            @Nullable PrivacyLevel defaultPrivacyLevel,
+            @Nullable Float sessionSampleRate,
+            @Nullable Float sessionReplaySampleRate,
+            @Nullable String remoteConfigurationId) {
+        if (applicationId == null || applicationId.isEmpty()) {
+            throw new IllegalArgumentException("Invalid application id: " + applicationId);
+        }
+        this.applicationId = applicationId;
+        if (clientToken == null || clientToken.isEmpty()) {
+            throw new IllegalArgumentException("Invalid client token: " + clientToken);
+        }
+        this.clientToken = clientToken;
+        if (site == null || site.isEmpty()) {
+            this.site = DEFAULT_RUM_SITE;
+        } else if (validateSite(site)) {
+            this.site = site;
+        } else {
+            throw new IllegalArgumentException("Invalid site: " + site);
+        }
+        this.service = service;
+        this.env = env;
+        if (majorVersion != 5 && majorVersion != 6) {
+            throw new IllegalArgumentException("Invalid major version: " + majorVersion);
+        }
+        this.majorVersion = majorVersion;
+        this.version = version;
+        this.trackUserInteractions = trackUserInteractions;
+        this.trackResources = trackResources;
+        this.trackLongTask = trackLongTask;
+        if (sessionSampleRate != null && (sessionSampleRate < 0f || sessionSampleRate > 100f)) {
+            throw new IllegalArgumentException("Invalid session sample rate: " + sessionSampleRate);
+        }
+        this.sessionSampleRate = sessionSampleRate;
+        if (sessionReplaySampleRate != null && (sessionReplaySampleRate < 0f || sessionReplaySampleRate > 100f)) {
+            throw new IllegalArgumentException("Invalid session replay sample rate: " + sessionReplaySampleRate);
+        }
+        this.sessionReplaySampleRate = sessionReplaySampleRate;
+        this.defaultPrivacyLevel = defaultPrivacyLevel;
+        this.remoteConfigurationId = remoteConfigurationId;
+        if (this.remoteConfigurationId == null
+                && (this.sessionSampleRate == null || this.sessionReplaySampleRate == null)) {
+            throw new IllegalArgumentException(
+                    "Either remote configuration id or both session and session replay sample rates must be set");
+        }
+        this.jsonPayload = jsonPayload();
     }
-    this.sessionReplaySampleRate = sessionReplaySampleRate;
-    this.defaultPrivacyLevel = defaultPrivacyLevel;
-    this.remoteConfigurationId = remoteConfigurationId;
-    if (this.remoteConfigurationId == null
-        && (this.sessionSampleRate == null || this.sessionReplaySampleRate == null)) {
-      throw new IllegalArgumentException(
-          "Either remote configuration id or both session and session replay sample rates must be set");
+
+    private static boolean validateSite(String site) {
+        for (String key : REGIONS.keySet()) {
+            if (key.equals(site)) {
+                return true;
+            }
+        }
+        return false;
     }
-    this.jsonPayload = jsonPayload();
-  }
-
-  private static boolean validateSite(String site) {
-    for (String key : REGIONS.keySet()) {
-      if (key.equals(site)) {
-        return true;
-      }
+
+    public String getSnippet() {
+        return "<script>\n"
+                + "(function(h,o,u,n,d) {\n"
+                + "  h=h[d]=h[d]||{q:[],onReady:function(c){h.q.push(c)}}\n"
+                + "  d=o.createElement(u);d.async=1;d.src=n\n"
+                + "  n=o.getElementsByTagName(u)[0];n.parentNode.insertBefore(d,n)\n"
+                + "})(window,document,'script','"
+                + getCdnUrl()
+                + "','DD_RUM')\n"
+                + "window.DD_RUM.onReady(function() {\n"
+                + "  window.DD_RUM.init("
+                + this.jsonPayload
+                + ");\n"
+                + "});\n"
+                + "</script>\n";
     }
-    return false;
-  }
-
-  public String getSnippet() {
-    return "<script>\n"
-        + "(function(h,o,u,n,d) {\n"
-        + "  h=h[d]=h[d]||{q:[],onReady:function(c){h.q.push(c)}}\n"
-        + "  d=o.createElement(u);d.async=1;d.src=n\n"
-        + "  n=o.getElementsByTagName(u)[0];n.parentNode.insertBefore(d,n)\n"
-        + "})(window,document,'script','"
-        + getCdnUrl()
-        + "','DD_RUM')\n"
-        + "window.DD_RUM.onReady(function() {\n"
-        + "  window.DD_RUM.init("
-        + this.jsonPayload
-        + ");\n"
-        + "});\n"
-        + "</script>\n";
-  }
-
-  private String getCdnUrl() {
-    if (!GOV_CLOUD_SITE.equals(this.site)) {
-      return "https://www.datadoghq-browser-agent.com/datadog-rum-v" + this.majorVersion + ".js";
+
+    private String getCdnUrl() {
+        if (!GOV_CLOUD_SITE.equals(this.site)) {
+            return "https://www.datadoghq-browser-agent.com/datadog-rum-v" + this.majorVersion + ".js";
+        }
+        return "https://www.datadoghq-browser-agent.com/"
+                + REGIONS.get(this.site)
+                + "/v"
+                + this.majorVersion
+                + "/datadog-rum.js";
     }
-    return "https://www.datadoghq-browser-agent.com/"
-        + REGIONS.get(this.site)
-        + "/v"
-        + this.majorVersion
-        + "/datadog-rum.js";
-  }
-
-  public String jsonPayload() {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer.beginObject();
-      writer.name("applicationId").value(this.applicationId);
-      writer.name("clientToken").value(this.clientToken);
-      if (this.site != null) {
-        writer.name("site").value(this.site);
-      }
-      if (this.service != null) {
-        writer.name("service").value(this.service);
-      }
-      if (this.env != null) {
-        writer.name("env").value(this.env);
-      }
-      if (this.version != null) {
-        writer.name("version").value(this.version);
-      }
-      if (this.trackUserInteractions != null) {
-        writer.name("trackUserInteractions").value(this.trackUserInteractions);
-      }
-      if (this.trackResources != null) {
-        writer.name("trackResources").value(this.trackResources);
-      }
-      if (this.trackLongTask != null) {
-        writer.name("trackLongTask").value(this.trackLongTask);
-      }
-      if (this.defaultPrivacyLevel != null) {
-        writer.name("defaultPrivacyLevel").value(this.defaultPrivacyLevel.toJson());
-      }
-      if (this.sessionSampleRate != null) {
-        writer.name("sessionSampleRate").value(this.sessionSampleRate);
-      }
-      if (this.sessionReplaySampleRate != null) {
-        writer.name("sessionReplaySampleRate").value(this.sessionReplaySampleRate);
-      }
-      if (this.remoteConfigurationId != null) {
-        writer.name("remoteConfigurationId").value(this.remoteConfigurationId);
-      }
-      writer.endObject();
-      return writer.toString();
-    } catch (Exception e) {
-      throw new IllegalStateException("Fail to generate config payload", e);
+
+    public String jsonPayload() {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginObject();
+            writer.name("applicationId").value(this.applicationId);
+            writer.name("clientToken").value(this.clientToken);
+            if (this.site != null) {
+                writer.name("site").value(this.site);
+            }
+            if (this.service != null) {
+                writer.name("service").value(this.service);
+            }
+            if (this.env != null) {
+                writer.name("env").value(this.env);
+            }
+            if (this.version != null) {
+                writer.name("version").value(this.version);
+            }
+            if (this.trackUserInteractions != null) {
+                writer.name("trackUserInteractions").value(this.trackUserInteractions);
+            }
+            if (this.trackResources != null) {
+                writer.name("trackResources").value(this.trackResources);
+            }
+            if (this.trackLongTask != null) {
+                writer.name("trackLongTask").value(this.trackLongTask);
+            }
+            if (this.defaultPrivacyLevel != null) {
+                writer.name("defaultPrivacyLevel").value(this.defaultPrivacyLevel.toJson());
+            }
+            if (this.sessionSampleRate != null) {
+                writer.name("sessionSampleRate").value(this.sessionSampleRate);
+            }
+            if (this.sessionReplaySampleRate != null) {
+                writer.name("sessionReplaySampleRate").value(this.sessionReplaySampleRate);
+            }
+            if (this.remoteConfigurationId != null) {
+                writer.name("remoteConfigurationId").value(this.remoteConfigurationId);
+            }
+            writer.endObject();
+            return writer.toString();
+        } catch (Exception e) {
+            throw new IllegalStateException("Fail to generate config payload", e);
+        }
     }
-  }
 
-  public enum PrivacyLevel {
-    ALLOW("allow"),
-    MASK("mask"),
-    MASK_USER_INPUT("mask-user-input");
+    public enum PrivacyLevel {
+        ALLOW("allow"),
+        MASK("mask"),
+        MASK_USER_INPUT("mask-user-input");
 
-    private final String json;
+        private final String json;
 
-    PrivacyLevel(String json) {
-      this.json = json;
-    }
+        PrivacyLevel(String json) {
+            this.json = json;
+        }
 
-    public String toJson() {
-      return this.json;
+        public String toJson() {
+            return this.json;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/rum/RumInjectorMetrics.java b/internal-api/src/main/java/datadog/trace/api/rum/RumInjectorMetrics.java
index 54ddd499e82..c35380a403b 100644
--- a/internal-api/src/main/java/datadog/trace/api/rum/RumInjectorMetrics.java
+++ b/internal-api/src/main/java/datadog/trace/api/rum/RumInjectorMetrics.java
@@ -22,202 +22,177 @@
  */
 public class RumInjectorMetrics implements RumTelemetryCollector {
 
-  private final Queue<MetricCollector.Metric> metrics = new LinkedBlockingQueue<>(1024);
-  private final Queue<MetricCollector.DistributionSeriesPoint> distributions =
-      new LinkedBlockingQueue<>(1024);
-
-  private final DDCache<String, List<String>> succeedTagsCache = DDCaches.newFixedSizeCache(8);
-  private final DDCache<String, List<String>> skippedTagsCache = DDCaches.newFixedSizeCache(8);
-  private final DDCache<String, List<String>> cspTagsCache = DDCaches.newFixedSizeCache(8);
-  private final DDCache<String, List<String>> responseTagsCache = DDCaches.newFixedSizeCache(8);
-  private final DDCache<String, List<String>> timeTagsCache = DDCaches.newFixedSizeCache(8);
-  private final DDCache<String, List<String>> failedTagsCache = DDCaches.newFixedSizeCache(16);
-  private final DDCache<String, List<String>> initTagsCache = DDCaches.newFixedSizeCache(1);
-
-  private final String applicationId;
-  private final String remoteConfigUsed;
-
-  public RumInjectorMetrics() {
-
-    // Get RUM config values (applicationId and remoteConfigUsed) for tagging
-    RumInjector rumInjector = RumInjector.get();
-    RumInjectorConfig injectorConfig = Config.get().getRumInjectorConfig();
-    if (rumInjector.isEnabled() && injectorConfig != null) {
-      this.applicationId = injectorConfig.applicationId;
-      this.remoteConfigUsed = injectorConfig.remoteConfigurationId != null ? "true" : "false";
-    } else {
-      this.applicationId = "unknown";
-      this.remoteConfigUsed = "false";
+    private final Queue<MetricCollector.Metric> metrics = new LinkedBlockingQueue<>(1024);
+    private final Queue<MetricCollector.DistributionSeriesPoint> distributions = new LinkedBlockingQueue<>(1024);
+
+    private final DDCache<String, List<String>> succeedTagsCache = DDCaches.newFixedSizeCache(8);
+    private final DDCache<String, List<String>> skippedTagsCache = DDCaches.newFixedSizeCache(8);
+    private final DDCache<String, List<String>> cspTagsCache = DDCaches.newFixedSizeCache(8);
+    private final DDCache<String, List<String>> responseTagsCache = DDCaches.newFixedSizeCache(8);
+    private final DDCache<String, List<String>> timeTagsCache = DDCaches.newFixedSizeCache(8);
+    private final DDCache<String, List<String>> failedTagsCache = DDCaches.newFixedSizeCache(16);
+    private final DDCache<String, List<String>> initTagsCache = DDCaches.newFixedSizeCache(1);
+
+    private final String applicationId;
+    private final String remoteConfigUsed;
+
+    public RumInjectorMetrics() {
+
+        // Get RUM config values (applicationId and remoteConfigUsed) for tagging
+        RumInjector rumInjector = RumInjector.get();
+        RumInjectorConfig injectorConfig = Config.get().getRumInjectorConfig();
+        if (rumInjector.isEnabled() && injectorConfig != null) {
+            this.applicationId = injectorConfig.applicationId;
+            this.remoteConfigUsed = injectorConfig.remoteConfigurationId != null ? "true" : "false";
+        } else {
+            this.applicationId = "unknown";
+            this.remoteConfigUsed = "false";
+        }
     }
-  }
-
-  @Override
-  public void onInjectionSucceed(String servletVersion) {
-    List<String> tags =
-        succeedTagsCache.computeIfAbsent(
-            servletVersion,
-            version ->
-                Arrays.asList(
-                    "application_id:" + applicationId,
-                    "integration_name:servlet",
-                    "integration_version:" + version,
-                    "remote_config_used:" + remoteConfigUsed));
-
-    MetricCollector.Metric metric =
-        new MetricCollector.Metric("rum", true, "injection.succeed", "count", 1, tags);
-    metrics.offer(metric);
-  }
-
-  @Override
-  public void onInjectionFailed(String servletVersion, String contentEncoding) {
-    String cacheKey = servletVersion + ":" + contentEncoding;
-    List<String> tags =
-        failedTagsCache.computeIfAbsent(
-            cacheKey,
-            key -> {
-              if (contentEncoding != null) {
+
+    @Override
+    public void onInjectionSucceed(String servletVersion) {
+        List<String> tags = succeedTagsCache.computeIfAbsent(
+                servletVersion,
+                version -> Arrays.asList(
+                        "application_id:" + applicationId,
+                        "integration_name:servlet",
+                        "integration_version:" + version,
+                        "remote_config_used:" + remoteConfigUsed));
+
+        MetricCollector.Metric metric = new MetricCollector.Metric("rum", true, "injection.succeed", "count", 1, tags);
+        metrics.offer(metric);
+    }
+
+    @Override
+    public void onInjectionFailed(String servletVersion, String contentEncoding) {
+        String cacheKey = servletVersion + ":" + contentEncoding;
+        List<String> tags = failedTagsCache.computeIfAbsent(cacheKey, key -> {
+            if (contentEncoding != null) {
                 return Arrays.asList(
-                    "application_id:" + applicationId,
-                    "content_encoding:" + contentEncoding,
-                    "integration_name:servlet",
-                    "integration_version:" + servletVersion,
-                    "reason:failed_to_return_response_wrapper",
-                    "remote_config_used:" + remoteConfigUsed);
-              } else {
+                        "application_id:" + applicationId,
+                        "content_encoding:" + contentEncoding,
+                        "integration_name:servlet",
+                        "integration_version:" + servletVersion,
+                        "reason:failed_to_return_response_wrapper",
+                        "remote_config_used:" + remoteConfigUsed);
+            } else {
                 return Arrays.asList(
-                    "application_id:" + applicationId,
-                    "integration_name:servlet",
-                    "integration_version:" + servletVersion,
-                    "reason:failed_to_return_response_wrapper",
-                    "remote_config_used:" + remoteConfigUsed);
-              }
-            });
-
-    MetricCollector.Metric metric =
-        new MetricCollector.Metric("rum", true, "injection.failed", "count", 1, tags);
-    metrics.offer(metric);
-  }
-
-  @Override
-  public void onInjectionSkipped(String servletVersion) {
-    List<String> tags =
-        skippedTagsCache.computeIfAbsent(
-            servletVersion,
-            version ->
-                Arrays.asList(
-                    "application_id:" + applicationId,
-                    "integration_name:servlet",
-                    "integration_version:" + version,
-                    "reason:should_not_inject",
-                    "remote_config_used:" + remoteConfigUsed));
-
-    MetricCollector.Metric metric =
-        new MetricCollector.Metric("rum", true, "injection.skipped", "count", 1, tags);
-    metrics.offer(metric);
-  }
-
-  @Override
-  public void onInitializationSucceed() {
-    List<String> tags =
-        initTagsCache.computeIfAbsent(
-            "init", key -> Arrays.asList("integration_name:servlet", "integration_version:N/A"));
-
-    MetricCollector.Metric metric =
-        new MetricCollector.Metric(
-            "rum", true, "injection.initialization.succeed", "count", 1, tags);
-    metrics.offer(metric);
-  }
-
-  @Override
-  public void onContentSecurityPolicyDetected(String servletVersion) {
-    List<String> tags =
-        cspTagsCache.computeIfAbsent(
-            servletVersion,
-            version ->
-                Arrays.asList(
-                    "integration_name:servlet",
-                    "integration_version:" + version,
-                    "kind:header",
-                    "reason:csp_header_found",
-                    "status:seen"));
-
-    MetricCollector.Metric metric =
-        new MetricCollector.Metric(
-            "rum", true, "injection.content_security_policy", "count", 1, tags);
-    metrics.offer(metric);
-  }
-
-  @Override
-  public void onInjectionResponseSize(String servletVersion, long bytes) {
-    List<String> tags =
-        responseTagsCache.computeIfAbsent(
-            servletVersion,
-            version ->
-                Arrays.asList(
-                    "integration_name:servlet",
-                    "integration_version:" + version,
-                    "response_kind:header"));
-
-    MetricCollector.DistributionSeriesPoint distribution =
-        new MetricCollector.DistributionSeriesPoint(
-            "injection.response.bytes", true, "rum", (int) bytes, tags);
-    distributions.offer(distribution);
-  }
-
-  @Override
-  public void onInjectionTime(String servletVersion, long milliseconds) {
-    List<String> tags =
-        timeTagsCache.computeIfAbsent(
-            servletVersion,
-            version -> Arrays.asList("integration_name:servlet", "integration_version:" + version));
-
-    MetricCollector.DistributionSeriesPoint distribution =
-        new MetricCollector.DistributionSeriesPoint(
-            "injection.ms", true, "rum", (int) milliseconds, tags);
-    distributions.offer(distribution);
-  }
-
-  @Override
-  public void close() {
-    metrics.clear();
-    distributions.clear();
-    succeedTagsCache.clear();
-    skippedTagsCache.clear();
-    cspTagsCache.clear();
-    responseTagsCache.clear();
-    timeTagsCache.clear();
-    failedTagsCache.clear();
-    initTagsCache.clear();
-  }
-
-  /**
-   * Drains all count metrics.
-   *
-   * @return Collection of metrics sent via telemetry
-   */
-  public synchronized Collection<MetricCollector.Metric> drain() {
-    if (metrics.isEmpty()) {
-      return Collections.emptyList();
+                        "application_id:" + applicationId,
+                        "integration_name:servlet",
+                        "integration_version:" + servletVersion,
+                        "reason:failed_to_return_response_wrapper",
+                        "remote_config_used:" + remoteConfigUsed);
+            }
+        });
+
+        MetricCollector.Metric metric = new MetricCollector.Metric("rum", true, "injection.failed", "count", 1, tags);
+        metrics.offer(metric);
+    }
+
+    @Override
+    public void onInjectionSkipped(String servletVersion) {
+        List<String> tags = skippedTagsCache.computeIfAbsent(
+                servletVersion,
+                version -> Arrays.asList(
+                        "application_id:" + applicationId,
+                        "integration_name:servlet",
+                        "integration_version:" + version,
+                        "reason:should_not_inject",
+                        "remote_config_used:" + remoteConfigUsed));
+
+        MetricCollector.Metric metric = new MetricCollector.Metric("rum", true, "injection.skipped", "count", 1, tags);
+        metrics.offer(metric);
     }
 
-    List<MetricCollector.Metric> drained = new ArrayList<>(metrics);
-    metrics.clear();
-    return drained;
-  }
-
-  /**
-   * Drains all distribution metrics.
-   *
-   * @return Collection of distribution points sent via telemetry
-   */
-  public synchronized Collection<MetricCollector.DistributionSeriesPoint>
-      drainDistributionSeries() {
-    if (distributions.isEmpty()) {
-      return Collections.emptyList();
+    @Override
+    public void onInitializationSucceed() {
+        List<String> tags = initTagsCache.computeIfAbsent(
+                "init", key -> Arrays.asList("integration_name:servlet", "integration_version:N/A"));
+
+        MetricCollector.Metric metric =
+                new MetricCollector.Metric("rum", true, "injection.initialization.succeed", "count", 1, tags);
+        metrics.offer(metric);
+    }
+
+    @Override
+    public void onContentSecurityPolicyDetected(String servletVersion) {
+        List<String> tags = cspTagsCache.computeIfAbsent(
+                servletVersion,
+                version -> Arrays.asList(
+                        "integration_name:servlet",
+                        "integration_version:" + version,
+                        "kind:header",
+                        "reason:csp_header_found",
+                        "status:seen"));
+
+        MetricCollector.Metric metric =
+                new MetricCollector.Metric("rum", true, "injection.content_security_policy", "count", 1, tags);
+        metrics.offer(metric);
     }
 
-    List<MetricCollector.DistributionSeriesPoint> drained = new ArrayList<>(distributions);
-    distributions.clear();
-    return drained;
-  }
+    @Override
+    public void onInjectionResponseSize(String servletVersion, long bytes) {
+        List<String> tags = responseTagsCache.computeIfAbsent(
+                servletVersion,
+                version -> Arrays.asList(
+                        "integration_name:servlet", "integration_version:" + version, "response_kind:header"));
+
+        MetricCollector.DistributionSeriesPoint distribution =
+                new MetricCollector.DistributionSeriesPoint("injection.response.bytes", true, "rum", (int) bytes, tags);
+        distributions.offer(distribution);
+    }
+
+    @Override
+    public void onInjectionTime(String servletVersion, long milliseconds) {
+        List<String> tags = timeTagsCache.computeIfAbsent(
+                servletVersion, version -> Arrays.asList("integration_name:servlet", "integration_version:" + version));
+
+        MetricCollector.DistributionSeriesPoint distribution =
+                new MetricCollector.DistributionSeriesPoint("injection.ms", true, "rum", (int) milliseconds, tags);
+        distributions.offer(distribution);
+    }
+
+    @Override
+    public void close() {
+        metrics.clear();
+        distributions.clear();
+        succeedTagsCache.clear();
+        skippedTagsCache.clear();
+        cspTagsCache.clear();
+        responseTagsCache.clear();
+        timeTagsCache.clear();
+        failedTagsCache.clear();
+        initTagsCache.clear();
+    }
+
+    /**
+     * Drains all count metrics.
+     *
+     * @return Collection of metrics sent via telemetry
+     */
+    public synchronized Collection<MetricCollector.Metric> drain() {
+        if (metrics.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        List<MetricCollector.Metric> drained = new ArrayList<>(metrics);
+        metrics.clear();
+        return drained;
+    }
+
+    /**
+     * Drains all distribution metrics.
+     *
+     * @return Collection of distribution points sent via telemetry
+     */
+    public synchronized Collection<MetricCollector.DistributionSeriesPoint> drainDistributionSeries() {
+        if (distributions.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        List<MetricCollector.DistributionSeriesPoint> drained = new ArrayList<>(distributions);
+        distributions.clear();
+        return drained;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/rum/RumTelemetryCollector.java b/internal-api/src/main/java/datadog/trace/api/rum/RumTelemetryCollector.java
index 21e19a4cd82..a256133cad6 100644
--- a/internal-api/src/main/java/datadog/trace/api/rum/RumTelemetryCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/rum/RumTelemetryCollector.java
@@ -10,8 +10,7 @@
  */
 public interface RumTelemetryCollector {
 
-  RumTelemetryCollector NO_OP =
-      new RumTelemetryCollector() {
+    RumTelemetryCollector NO_OP = new RumTelemetryCollector() {
         @Override
         public void onInjectionSucceed(String integrationVersion) {}
 
@@ -38,77 +37,77 @@ public void close() {}
 
         @Override
         public Collection<MetricCollector.Metric> drain() {
-          return Collections.emptyList();
+            return Collections.emptyList();
         }
 
         @Override
         public Collection<MetricCollector.DistributionSeriesPoint> drainDistributionSeries() {
-          return Collections.emptyList();
+            return Collections.emptyList();
         }
-      };
-
-  /**
-   * Reports successful RUM injection.
-   *
-   * @param integrationVersion The version of the integration that was injected.
-   */
-  void onInjectionSucceed(String integrationVersion);
-
-  /**
-   * Reports failed RUM injection.
-   *
-   * @param integrationVersion The version of the integration that was injected.
-   * @param contentEncoding The content encoding of the response that was injected.
-   */
-  void onInjectionFailed(String integrationVersion, String contentEncoding);
-
-  /**
-   * Reports skipped RUM injection.
-   *
-   * @param integrationVersion The version of the integration that was injected.
-   */
-  void onInjectionSkipped(String integrationVersion);
-
-  /** Reports successful RUM injector initialization. */
-  void onInitializationSucceed();
-
-  /**
-   * Reports content security policy detected in the response header to be injected.
-   *
-   * @param integrationVersion The version of the integration that was injected.
-   */
-  void onContentSecurityPolicyDetected(String integrationVersion);
-
-  /**
-   * Reports the size of the response before injection.
-   *
-   * @param integrationVersion The version of the integration that was injected.
-   * @param bytes The size of the response before injection.
-   */
-  void onInjectionResponseSize(String integrationVersion, long bytes);
-
-  /**
-   * Reports the time taken to inject the RUM SDK.
-   *
-   * @param integrationVersion The version of the integration that was injected.
-   * @param milliseconds The time taken to inject the RUM SDK.
-   */
-  void onInjectionTime(String integrationVersion, long milliseconds);
-
-  /** Closes the telemetry collector. */
-  default void close() {}
-
-  /**
-   * Drains all count metrics to be sent via telemetry.
-   *
-   * @return Collection of count metrics to be sent via telemetry.
-   */
-  Collection<MetricCollector.Metric> drain();
-
-  /**
-   * Drains all distribution metrics to be sent via telemetry.
-   *
-   * @return Collection of distribution points to be sent via telemetry.
-   */
-  Collection<MetricCollector.DistributionSeriesPoint> drainDistributionSeries();
+    };
+
+    /**
+     * Reports successful RUM injection.
+     *
+     * @param integrationVersion The version of the integration that was injected.
+     */
+    void onInjectionSucceed(String integrationVersion);
+
+    /**
+     * Reports failed RUM injection.
+     *
+     * @param integrationVersion The version of the integration that was injected.
+     * @param contentEncoding The content encoding of the response that was injected.
+     */
+    void onInjectionFailed(String integrationVersion, String contentEncoding);
+
+    /**
+     * Reports skipped RUM injection.
+     *
+     * @param integrationVersion The version of the integration that was injected.
+     */
+    void onInjectionSkipped(String integrationVersion);
+
+    /** Reports successful RUM injector initialization. */
+    void onInitializationSucceed();
+
+    /**
+     * Reports content security policy detected in the response header to be injected.
+     *
+     * @param integrationVersion The version of the integration that was injected.
+     */
+    void onContentSecurityPolicyDetected(String integrationVersion);
+
+    /**
+     * Reports the size of the response before injection.
+     *
+     * @param integrationVersion The version of the integration that was injected.
+     * @param bytes The size of the response before injection.
+     */
+    void onInjectionResponseSize(String integrationVersion, long bytes);
+
+    /**
+     * Reports the time taken to inject the RUM SDK.
+     *
+     * @param integrationVersion The version of the integration that was injected.
+     * @param milliseconds The time taken to inject the RUM SDK.
+     */
+    void onInjectionTime(String integrationVersion, long milliseconds);
+
+    /** Closes the telemetry collector. */
+    default void close() {}
+
+    /**
+     * Drains all count metrics to be sent via telemetry.
+     *
+     * @return Collection of count metrics to be sent via telemetry.
+     */
+    Collection<MetricCollector.Metric> drain();
+
+    /**
+     * Drains all distribution metrics to be sent via telemetry.
+     *
+     * @return Collection of distribution points to be sent via telemetry.
+     */
+    Collection<MetricCollector.DistributionSeriesPoint> drainDistributionSeries();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/sampling/AdaptiveSampler.java b/internal-api/src/main/java/datadog/trace/api/sampling/AdaptiveSampler.java
index 56ad00be9c6..9d9f5fb7ad3 100644
--- a/internal-api/src/main/java/datadog/trace/api/sampling/AdaptiveSampler.java
+++ b/internal-api/src/main/java/datadog/trace/api/sampling/AdaptiveSampler.java
@@ -34,282 +34,278 @@
  */
 public class AdaptiveSampler implements Sampler {
 
-  private static final class Counts {
-    private final LongAdder testCount = new LongAdder();
-    private static final AtomicLongFieldUpdater<Counts> SAMPLE_COUNT =
-        AtomicLongFieldUpdater.newUpdater(Counts.class, "sampleCount");
-    private volatile long sampleCount = 0L;
-
-    void addTest() {
-      testCount.increment();
+    private static final class Counts {
+        private final LongAdder testCount = new LongAdder();
+        private static final AtomicLongFieldUpdater<Counts> SAMPLE_COUNT =
+                AtomicLongFieldUpdater.newUpdater(Counts.class, "sampleCount");
+        private volatile long sampleCount = 0L;
+
+        void addTest() {
+            testCount.increment();
+        }
+
+        boolean addSample(final long limit) {
+            return SAMPLE_COUNT.getAndAccumulate(this, limit, (prev, lim) -> Math.min(prev + 1, lim)) < limit;
+        }
+
+        void addSample() {
+            SAMPLE_COUNT.incrementAndGet(this);
+        }
+
+        void reset() {
+            testCount.reset();
+            SAMPLE_COUNT.set(this, 0);
+        }
+
+        long sampleCount() {
+            return SAMPLE_COUNT.get(this);
+        }
+
+        long testCount() {
+            return testCount.sum();
+        }
     }
 
-    boolean addSample(final long limit) {
-      return SAMPLE_COUNT.getAndAccumulate(this, limit, (prev, lim) -> Math.min(prev + 1, lim))
-          < limit;
+    @FunctionalInterface
+    public interface ConfigListener {
+        void onWindowRoll(long totalCount, long sampledCount, long budget, double totalAverage, double probability);
     }
 
-    void addSample() {
-      SAMPLE_COUNT.incrementAndGet(this);
+    /*
+     * Exponential Moving Average (EMA) last element weight.
+     * Check out papers about using EMA for streaming data - eg.
+     * https://nestedsoftware.com/2018/04/04/exponential-moving-average-on-streaming-data-4hhl.24876.html
+     *
+     * Corresponds to 'lookback' of N values:
+     * With T being the index of the most recent value the lookback of N values means that for all values with index
+     * T-K, where K > N, the relative weight of that value computed as (1 - alpha)^K is less or equal than the
+     * weight assigned by a plain arithmetic average (= 1/N).
+     */
+    private final double emaAlpha;
+    private final int samplesPerWindow;
+
+    private final AtomicReference<Counts> countsRef;
+
+    // these attributes need to be volatile since they are accessed from user threds as well as the
+    // maintenance one
+    private volatile double probability = 1d;
+    private volatile long samplesBudget;
+
+    // these attributes are accessed solely from the window maintenance thread
+    private double totalCountRunningAverage = 0d;
+    private double avgSamples;
+
+    private final int budgetLookback;
+    private final double budgetAlpha;
+
+    // accessed exclusively from the window maintenance task - does not require any synchronization
+    private int countsSlotIdx = 0;
+    private final Counts[] countsSlots = new Counts[] {new Counts(), new Counts()};
+
+    private final ConfigListener listener;
+
+    private final Duration windowDuration;
+    private final AgentTaskScheduler taskScheduler;
+
+    /**
+     * Create a new sampler instance
+     *
+     * @param windowDuration the sampling window duration
+     * @param samplesPerWindow the maximum number of samples in the sampling window
+     * @param averageLookback the number of windows to consider in averaging the sampling rate
+     * @param budgetLookback the number of windows to consider when computing the sampling budget
+     * @param listener an optional listener receiving the sampler config changes
+     * @param taskScheduler agent task scheduler to use for periodic rolls
+     */
+    protected AdaptiveSampler(
+            final Duration windowDuration,
+            final int samplesPerWindow,
+            final int averageLookback,
+            final int budgetLookback,
+            final @Nullable ConfigListener listener,
+            final AgentTaskScheduler taskScheduler,
+            boolean startSampler) {
+
+        if (averageLookback < 1) {
+            throw new IllegalArgumentException("'averageLookback' argument must be at least 1");
+        }
+        if (budgetLookback < 1) {
+            throw new IllegalArgumentException("'budgetLookback' argument must be at least 1");
+        }
+        this.samplesPerWindow = samplesPerWindow;
+        this.budgetLookback = budgetLookback;
+        samplesBudget = samplesPerWindow + (long) budgetLookback * samplesPerWindow;
+        emaAlpha = computeIntervalAlpha(averageLookback);
+        budgetAlpha = computeIntervalAlpha(budgetLookback);
+        countsRef = new AtomicReference<>(countsSlots[0]);
+        this.listener = listener;
+        if (listener != null) {
+            listener.onWindowRoll(0, 0, samplesBudget, totalCountRunningAverage, probability);
+        }
+
+        this.windowDuration = windowDuration;
+        this.taskScheduler = taskScheduler;
+
+        if (startSampler) {
+            start();
+        }
     }
 
-    void reset() {
-      testCount.reset();
-      SAMPLE_COUNT.set(this, 0);
+    /**
+     * Create a new sampler instance with automatic window roll.
+     *
+     * @param windowDuration the sampling window duration
+     * @param samplesPerWindow the maximum number of samples in the sampling window
+     * @param averageLookback the number of windows to consider in averaging the sampling rate
+     * @param budgetLookback the number of windows to consider when computing the sampling budget
+     */
+    public AdaptiveSampler(
+            final Duration windowDuration,
+            final int samplesPerWindow,
+            final int averageLookback,
+            final int budgetLookback,
+            boolean startSampler) {
+        this(
+                windowDuration,
+                samplesPerWindow,
+                averageLookback,
+                budgetLookback,
+                null,
+                AgentTaskScheduler.get(),
+                startSampler);
     }
 
-    long sampleCount() {
-      return SAMPLE_COUNT.get(this);
+    /**
+     * Create a new sampler instance with automatic window roll. The instance is automatically
+     * started.
+     *
+     * @param windowDuration the sampling window duration
+     * @param samplesPerWindow the maximum number of samples in the sampling window
+     * @param averageLookback the number of windows to consider in averaging the sampling rate
+     * @param budgetLookback the number of windows to consider when computing the sampling budget
+     * @param listener an optional listener receiving the sampler config changes
+     */
+    public AdaptiveSampler(
+            final Duration windowDuration,
+            final int samplesPerWindow,
+            final int averageLookback,
+            final int budgetLookback,
+            final ConfigListener listener) {
+        this(
+                windowDuration,
+                samplesPerWindow,
+                averageLookback,
+                budgetLookback,
+                listener,
+                AgentTaskScheduler.get(),
+                true);
     }
 
-    long testCount() {
-      return testCount.sum();
-    }
-  }
-
-  @FunctionalInterface
-  public interface ConfigListener {
-    void onWindowRoll(
-        long totalCount, long sampledCount, long budget, double totalAverage, double probability);
-  }
-
-  /*
-   * Exponential Moving Average (EMA) last element weight.
-   * Check out papers about using EMA for streaming data - eg.
-   * https://nestedsoftware.com/2018/04/04/exponential-moving-average-on-streaming-data-4hhl.24876.html
-   *
-   * Corresponds to 'lookback' of N values:
-   * With T being the index of the most recent value the lookback of N values means that for all values with index
-   * T-K, where K > N, the relative weight of that value computed as (1 - alpha)^K is less or equal than the
-   * weight assigned by a plain arithmetic average (= 1/N).
-   */
-  private final double emaAlpha;
-  private final int samplesPerWindow;
-
-  private final AtomicReference<Counts> countsRef;
-
-  // these attributes need to be volatile since they are accessed from user threds as well as the
-  // maintenance one
-  private volatile double probability = 1d;
-  private volatile long samplesBudget;
-
-  // these attributes are accessed solely from the window maintenance thread
-  private double totalCountRunningAverage = 0d;
-  private double avgSamples;
-
-  private final int budgetLookback;
-  private final double budgetAlpha;
-
-  // accessed exclusively from the window maintenance task - does not require any synchronization
-  private int countsSlotIdx = 0;
-  private final Counts[] countsSlots = new Counts[] {new Counts(), new Counts()};
-
-  private final ConfigListener listener;
-
-  private final Duration windowDuration;
-  private final AgentTaskScheduler taskScheduler;
-
-  /**
-   * Create a new sampler instance
-   *
-   * @param windowDuration the sampling window duration
-   * @param samplesPerWindow the maximum number of samples in the sampling window
-   * @param averageLookback the number of windows to consider in averaging the sampling rate
-   * @param budgetLookback the number of windows to consider when computing the sampling budget
-   * @param listener an optional listener receiving the sampler config changes
-   * @param taskScheduler agent task scheduler to use for periodic rolls
-   */
-  protected AdaptiveSampler(
-      final Duration windowDuration,
-      final int samplesPerWindow,
-      final int averageLookback,
-      final int budgetLookback,
-      final @Nullable ConfigListener listener,
-      final AgentTaskScheduler taskScheduler,
-      boolean startSampler) {
-
-    if (averageLookback < 1) {
-      throw new IllegalArgumentException("'averageLookback' argument must be at least 1");
-    }
-    if (budgetLookback < 1) {
-      throw new IllegalArgumentException("'budgetLookback' argument must be at least 1");
-    }
-    this.samplesPerWindow = samplesPerWindow;
-    this.budgetLookback = budgetLookback;
-    samplesBudget = samplesPerWindow + (long) budgetLookback * samplesPerWindow;
-    emaAlpha = computeIntervalAlpha(averageLookback);
-    budgetAlpha = computeIntervalAlpha(budgetLookback);
-    countsRef = new AtomicReference<>(countsSlots[0]);
-    this.listener = listener;
-    if (listener != null) {
-      listener.onWindowRoll(0, 0, samplesBudget, totalCountRunningAverage, probability);
+    public void start() {
+        taskScheduler.weakScheduleAtFixedRate(
+                RollWindowTask.INSTANCE,
+                this,
+                windowDuration.toNanos(),
+                windowDuration.toNanos(),
+                TimeUnit.NANOSECONDS);
     }
 
-    this.windowDuration = windowDuration;
-    this.taskScheduler = taskScheduler;
+    @Override
+    public boolean sample() {
+        final Counts counts = countsRef.get();
+        counts.addTest();
+        if (ThreadLocalRandom.current().nextDouble() < probability) {
+            return counts.addSample(samplesBudget);
+        }
+
+        return false;
+    }
 
-    if (startSampler) {
-      start();
+    @Override
+    public boolean keep() {
+        final AdaptiveSampler.Counts counts = countsRef.get();
+        counts.addTest();
+        counts.addSample();
+        return true;
     }
-  }
-
-  /**
-   * Create a new sampler instance with automatic window roll.
-   *
-   * @param windowDuration the sampling window duration
-   * @param samplesPerWindow the maximum number of samples in the sampling window
-   * @param averageLookback the number of windows to consider in averaging the sampling rate
-   * @param budgetLookback the number of windows to consider when computing the sampling budget
-   */
-  public AdaptiveSampler(
-      final Duration windowDuration,
-      final int samplesPerWindow,
-      final int averageLookback,
-      final int budgetLookback,
-      boolean startSampler) {
-    this(
-        windowDuration,
-        samplesPerWindow,
-        averageLookback,
-        budgetLookback,
-        null,
-        AgentTaskScheduler.get(),
-        startSampler);
-  }
-
-  /**
-   * Create a new sampler instance with automatic window roll. The instance is automatically
-   * started.
-   *
-   * @param windowDuration the sampling window duration
-   * @param samplesPerWindow the maximum number of samples in the sampling window
-   * @param averageLookback the number of windows to consider in averaging the sampling rate
-   * @param budgetLookback the number of windows to consider when computing the sampling budget
-   * @param listener an optional listener receiving the sampler config changes
-   */
-  public AdaptiveSampler(
-      final Duration windowDuration,
-      final int samplesPerWindow,
-      final int averageLookback,
-      final int budgetLookback,
-      final ConfigListener listener) {
-    this(
-        windowDuration,
-        samplesPerWindow,
-        averageLookback,
-        budgetLookback,
-        listener,
-        AgentTaskScheduler.get(),
-        true);
-  }
-
-  public void start() {
-    taskScheduler.weakScheduleAtFixedRate(
-        RollWindowTask.INSTANCE,
-        this,
-        windowDuration.toNanos(),
-        windowDuration.toNanos(),
-        TimeUnit.NANOSECONDS);
-  }
-
-  @Override
-  public boolean sample() {
-    final Counts counts = countsRef.get();
-    counts.addTest();
-    if (ThreadLocalRandom.current().nextDouble() < probability) {
-      return counts.addSample(samplesBudget);
+
+    @Override
+    public boolean drop() {
+        final AdaptiveSampler.Counts counts = countsRef.get();
+        counts.addTest();
+        return false;
     }
 
-    return false;
-  }
-
-  @Override
-  public boolean keep() {
-    final AdaptiveSampler.Counts counts = countsRef.get();
-    counts.addTest();
-    counts.addSample();
-    return true;
-  }
-
-  @Override
-  public boolean drop() {
-    final AdaptiveSampler.Counts counts = countsRef.get();
-    counts.addTest();
-    return false;
-  }
-
-  private void rollWindow() {
-
-    final Counts counts = countsSlots[countsSlotIdx];
-    try {
-      /*
-       * Semi-atomically replace the Counts instance such that sample requests during window maintenance will be
-       * using the newly created counts instead of the ones currently processed by the maintenance routine.
-       * We are ok with slightly racy outcome where totaCount and sampledCount may not be totally in sync
-       * because it allows to avoid contention in the hot-path and the effect on the overall sample rate is minimal
-       * and will get compensated in the long run.
-       * Theoretically, a compensating system might be devised but it will always require introducing a single point
-       * of contention and add a fair amount of complexity. Considering that we are ok with keeping the target sampling
-       * rate within certain error margins and this data race is not breaking the margin it is better to keep the
-       * code simple and reasonably fast.
-       */
-      countsSlotIdx = (countsSlotIdx++) % 2;
-      countsRef.set(countsSlots[countsSlotIdx]);
-      final long totalCount = counts.testCount();
-      final long sampledCount = counts.sampleCount();
-
-      samplesBudget = calculateBudgetEma(sampledCount);
-
-      if (totalCountRunningAverage == 0 || emaAlpha <= 0.0d) {
-        totalCountRunningAverage = totalCount;
-      } else {
-        totalCountRunningAverage =
-            totalCountRunningAverage + emaAlpha * (totalCount - totalCountRunningAverage);
-      }
-
-      if (totalCountRunningAverage <= 0) {
-        probability = 1;
-      } else {
-        probability = Math.min(samplesBudget / totalCountRunningAverage, 1d);
-      }
-      if (listener != null) {
-        listener.onWindowRoll(
-            totalCount, sampledCount, samplesBudget, totalCountRunningAverage, probability);
-      }
-    } finally {
-      // Reset the previous counts slot
-      counts.reset();
+    private void rollWindow() {
+
+        final Counts counts = countsSlots[countsSlotIdx];
+        try {
+            /*
+             * Semi-atomically replace the Counts instance such that sample requests during window maintenance will be
+             * using the newly created counts instead of the ones currently processed by the maintenance routine.
+             * We are ok with slightly racy outcome where totaCount and sampledCount may not be totally in sync
+             * because it allows to avoid contention in the hot-path and the effect on the overall sample rate is minimal
+             * and will get compensated in the long run.
+             * Theoretically, a compensating system might be devised but it will always require introducing a single point
+             * of contention and add a fair amount of complexity. Considering that we are ok with keeping the target sampling
+             * rate within certain error margins and this data race is not breaking the margin it is better to keep the
+             * code simple and reasonably fast.
+             */
+            countsSlotIdx = (countsSlotIdx++) % 2;
+            countsRef.set(countsSlots[countsSlotIdx]);
+            final long totalCount = counts.testCount();
+            final long sampledCount = counts.sampleCount();
+
+            samplesBudget = calculateBudgetEma(sampledCount);
+
+            if (totalCountRunningAverage == 0 || emaAlpha <= 0.0d) {
+                totalCountRunningAverage = totalCount;
+            } else {
+                totalCountRunningAverage =
+                        totalCountRunningAverage + emaAlpha * (totalCount - totalCountRunningAverage);
+            }
+
+            if (totalCountRunningAverage <= 0) {
+                probability = 1;
+            } else {
+                probability = Math.min(samplesBudget / totalCountRunningAverage, 1d);
+            }
+            if (listener != null) {
+                listener.onWindowRoll(totalCount, sampledCount, samplesBudget, totalCountRunningAverage, probability);
+            }
+        } finally {
+            // Reset the previous counts slot
+            counts.reset();
+        }
     }
-  }
 
-  private long calculateBudgetEma(final long sampledCount) {
-    avgSamples =
-        Double.isNaN(avgSamples) || budgetAlpha <= 0.0d
-            ? sampledCount
-            : avgSamples + budgetAlpha * (sampledCount - avgSamples);
-    return Math.round(Math.max(samplesPerWindow - avgSamples, 0) * budgetLookback);
-  }
+    private long calculateBudgetEma(final long sampledCount) {
+        avgSamples = Double.isNaN(avgSamples) || budgetAlpha <= 0.0d
+                ? sampledCount
+                : avgSamples + budgetAlpha * (sampledCount - avgSamples);
+        return Math.round(Math.max(samplesPerWindow - avgSamples, 0) * budgetLookback);
+    }
 
-  private static double computeIntervalAlpha(final int lookback) {
-    return 1 - Math.pow(lookback, -1d / lookback);
-  }
+    private static double computeIntervalAlpha(final int lookback) {
+        return 1 - Math.pow(lookback, -1d / lookback);
+    }
 
-  private static class RollWindowTask implements Task<AdaptiveSampler> {
+    private static class RollWindowTask implements Task<AdaptiveSampler> {
 
-    static final RollWindowTask INSTANCE = new RollWindowTask();
+        static final RollWindowTask INSTANCE = new RollWindowTask();
 
-    @Override
-    public void run(final AdaptiveSampler target) {
-      target.rollWindow();
+        @Override
+        public void run(final AdaptiveSampler target) {
+            target.rollWindow();
+        }
     }
-  }
 
-  // access for tests
-  long testCount() {
-    return countsRef.get().testCount();
-  }
+    // access for tests
+    long testCount() {
+        return countsRef.get().testCount();
+    }
 
-  long sampleCount() {
-    return countsRef.get().sampleCount();
-  }
+    long sampleCount() {
+        return countsRef.get().sampleCount();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/sampling/ConstantSampler.java b/internal-api/src/main/java/datadog/trace/api/sampling/ConstantSampler.java
index e0fb334f635..9f51c98d70e 100644
--- a/internal-api/src/main/java/datadog/trace/api/sampling/ConstantSampler.java
+++ b/internal-api/src/main/java/datadog/trace/api/sampling/ConstantSampler.java
@@ -2,24 +2,24 @@
 
 public class ConstantSampler implements Sampler {
 
-  private final boolean constant;
+    private final boolean constant;
 
-  public ConstantSampler(boolean constant) {
-    this.constant = constant;
-  }
+    public ConstantSampler(boolean constant) {
+        this.constant = constant;
+    }
 
-  @Override
-  public boolean sample() {
-    return constant;
-  }
+    @Override
+    public boolean sample() {
+        return constant;
+    }
 
-  @Override
-  public boolean keep() {
-    return true;
-  }
+    @Override
+    public boolean keep() {
+        return true;
+    }
 
-  @Override
-  public boolean drop() {
-    return false;
-  }
+    @Override
+    public boolean drop() {
+        return false;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/sampling/PerRecordingRateLimiter.java b/internal-api/src/main/java/datadog/trace/api/sampling/PerRecordingRateLimiter.java
index fdee9232459..6050f50f946 100644
--- a/internal-api/src/main/java/datadog/trace/api/sampling/PerRecordingRateLimiter.java
+++ b/internal-api/src/main/java/datadog/trace/api/sampling/PerRecordingRateLimiter.java
@@ -5,34 +5,30 @@
 
 public class PerRecordingRateLimiter {
 
-  private final AdaptiveSampler sampler;
+    private final AdaptiveSampler sampler;
 
-  public PerRecordingRateLimiter(Duration windowDuration, int limit, Duration recordingLength) {
-    this(windowDuration, limit, recordingLength, 16);
-  }
+    public PerRecordingRateLimiter(Duration windowDuration, int limit, Duration recordingLength) {
+        this(windowDuration, limit, recordingLength, 16);
+    }
 
-  public PerRecordingRateLimiter(
-      Duration windowDuration, int limit, Duration recordingLength, int budgetLookback) {
-    int lookback = samplingWindowsPerRecording(recordingLength.getSeconds(), windowDuration);
-    int samplesPerWindow =
-        limit / samplingWindowsPerRecording(recordingLength.getSeconds(), windowDuration);
-    sampler = new AdaptiveSampler(windowDuration, samplesPerWindow, lookback, budgetLookback, true);
-  }
+    public PerRecordingRateLimiter(Duration windowDuration, int limit, Duration recordingLength, int budgetLookback) {
+        int lookback = samplingWindowsPerRecording(recordingLength.getSeconds(), windowDuration);
+        int samplesPerWindow = limit / samplingWindowsPerRecording(recordingLength.getSeconds(), windowDuration);
+        sampler = new AdaptiveSampler(windowDuration, samplesPerWindow, lookback, budgetLookback, true);
+    }
 
-  public boolean permit() {
-    return sampler.sample();
-  }
+    public boolean permit() {
+        return sampler.sample();
+    }
 
-  public static int samplingWindowsPerRecording(long uploadPeriodSeconds, Duration samplingWindow) {
-    /*
-     * Java8 doesn't have dividedBy#Duration so we have to implement poor man's version.
-     * None of these durations should be big enough to warrant dealing with bigints.
-     * We also do not care about nanoseconds here.
-     */
-    return (int)
-        Math.min(
-            Duration.of(uploadPeriodSeconds, ChronoUnit.SECONDS).toMillis()
-                / samplingWindow.toMillis(),
-            Integer.MAX_VALUE);
-  }
+    public static int samplingWindowsPerRecording(long uploadPeriodSeconds, Duration samplingWindow) {
+        /*
+         * Java8 doesn't have dividedBy#Duration so we have to implement poor man's version.
+         * None of these durations should be big enough to warrant dealing with bigints.
+         * We also do not care about nanoseconds here.
+         */
+        return (int) Math.min(
+                Duration.of(uploadPeriodSeconds, ChronoUnit.SECONDS).toMillis() / samplingWindow.toMillis(),
+                Integer.MAX_VALUE);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/sampling/Sampler.java b/internal-api/src/main/java/datadog/trace/api/sampling/Sampler.java
index 032f5454022..c92e1773f0e 100644
--- a/internal-api/src/main/java/datadog/trace/api/sampling/Sampler.java
+++ b/internal-api/src/main/java/datadog/trace/api/sampling/Sampler.java
@@ -2,24 +2,24 @@
 
 public interface Sampler {
 
-  /**
-   * Provides binary answer whether the current event is to be sampled
-   *
-   * @return {@literal true} if the event should be sampled
-   */
-  boolean sample();
+    /**
+     * Provides binary answer whether the current event is to be sampled
+     *
+     * @return {@literal true} if the event should be sampled
+     */
+    boolean sample();
 
-  /**
-   * Force the sampling decision to keep this item
-   *
-   * @return always {@literal true}
-   */
-  boolean keep();
+    /**
+     * Force the sampling decision to keep this item
+     *
+     * @return always {@literal true}
+     */
+    boolean keep();
 
-  /**
-   * Force the sampling decision to drop this item
-   *
-   * @return always {@literal false}
-   */
-  boolean drop();
+    /**
+     * Force the sampling decision to drop this item
+     *
+     * @return always {@literal false}
+     */
+    boolean drop();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/sampling/SamplingMechanism.java b/internal-api/src/main/java/datadog/trace/api/sampling/SamplingMechanism.java
index 6b0cd397626..d72c579b585 100644
--- a/internal-api/src/main/java/datadog/trace/api/sampling/SamplingMechanism.java
+++ b/internal-api/src/main/java/datadog/trace/api/sampling/SamplingMechanism.java
@@ -8,83 +8,83 @@
 import datadog.trace.api.Config;
 
 public class SamplingMechanism {
-  /** Not encouraged to use */
-  public static final byte UNKNOWN = -1;
+    /** Not encouraged to use */
+    public static final byte UNKNOWN = -1;
 
-  /** Used before the tracer receives any rates from agent and there are no rules configured */
-  public static final byte DEFAULT = 0;
+    /** Used before the tracer receives any rates from agent and there are no rules configured */
+    public static final byte DEFAULT = 0;
 
-  /** The sampling rate received in the agent's http response */
-  public static final byte AGENT_RATE = 1;
+    /** The sampling rate received in the agent's http response */
+    public static final byte AGENT_RATE = 1;
 
-  /** Auto; reserved for future use */
-  public static final byte REMOTE_AUTO_RATE = 2;
+    /** Auto; reserved for future use */
+    public static final byte REMOTE_AUTO_RATE = 2;
 
-  /** Sampling rule or sampling rate based on tracer config */
-  public static final byte LOCAL_USER_RULE = 3;
+    /** Sampling rule or sampling rate based on tracer config */
+    public static final byte LOCAL_USER_RULE = 3;
 
-  /** User directly sets sampling priority via code using span.SetTag(ManualKeep) or similar API */
-  public static final byte MANUAL = 4;
+    /** User directly sets sampling priority via code using span.SetTag(ManualKeep) or similar API */
+    public static final byte MANUAL = 4;
 
-  /** AppSec */
-  public static final byte APPSEC = 5;
+    /** AppSec */
+    public static final byte APPSEC = 5;
 
-  /** User-defined target; reserved for future use */
-  public static final byte REMOTE_USER_RATE = 6;
+    /** User-defined target; reserved for future use */
+    public static final byte REMOTE_USER_RATE = 6;
 
-  /** Span Sampling Rate (single span sampled on account of a span sampling rule) */
-  public static final byte SPAN_SAMPLING_RATE = 8;
+    /** Span Sampling Rate (single span sampled on account of a span sampling rule) */
+    public static final byte SPAN_SAMPLING_RATE = 8;
 
-  /** Data Jobs */
-  public static final byte DATA_JOBS = 10;
+    /** Data Jobs */
+    public static final byte DATA_JOBS = 10;
 
-  public static final byte REMOTE_USER_RULE = 11;
-  public static final byte REMOTE_ADAPTIVE_RULE = 12;
-  public static final byte AI_GUARD = 13;
+    public static final byte REMOTE_USER_RULE = 11;
+    public static final byte REMOTE_ADAPTIVE_RULE = 12;
+    public static final byte AI_GUARD = 13;
 
-  /** Force override sampling decision from external source, like W3C traceparent. */
-  public static final byte EXTERNAL_OVERRIDE = Byte.MIN_VALUE;
+    /** Force override sampling decision from external source, like W3C traceparent. */
+    public static final byte EXTERNAL_OVERRIDE = Byte.MIN_VALUE;
 
-  public static boolean validateWithSamplingPriority(int mechanism, int priority) {
-    switch (mechanism) {
-      case UNKNOWN:
-        return true;
+    public static boolean validateWithSamplingPriority(int mechanism, int priority) {
+        switch (mechanism) {
+            case UNKNOWN:
+                return true;
 
-      case DEFAULT:
-      case AGENT_RATE:
-      case REMOTE_AUTO_RATE:
-        return priority == SAMPLER_DROP || priority == SAMPLER_KEEP;
+            case DEFAULT:
+            case AGENT_RATE:
+            case REMOTE_AUTO_RATE:
+                return priority == SAMPLER_DROP || priority == SAMPLER_KEEP;
 
-      case LOCAL_USER_RULE:
-      case MANUAL:
-      case REMOTE_USER_RATE:
-        return priority == USER_DROP || priority == USER_KEEP;
+            case LOCAL_USER_RULE:
+            case MANUAL:
+            case REMOTE_USER_RATE:
+                return priority == USER_DROP || priority == USER_KEEP;
 
-      case APPSEC:
-        return priority == PrioritySampling.USER_KEEP
-            || priority == SAMPLER_DROP
-            || priority == SAMPLER_KEEP; // Necessary for ASM standalone billing
+            case APPSEC:
+                return priority == PrioritySampling.USER_KEEP
+                        || priority == SAMPLER_DROP
+                        || priority == SAMPLER_KEEP; // Necessary for ASM standalone billing
 
-      case DATA_JOBS:
-        return priority == PrioritySampling.USER_KEEP;
+            case DATA_JOBS:
+                return priority == PrioritySampling.USER_KEEP;
 
-      case EXTERNAL_OVERRIDE:
-        return false;
+            case EXTERNAL_OVERRIDE:
+                return false;
+        }
+        return true;
     }
-    return true;
-  }
-
-  /**
-   * Returns true if sampling priority lock can be avoided for the given mechanism and priority
-   *
-   * @param priority the sampling priority
-   * @param mechanism the sampling mechanism
-   * @return {@code true} if the sampling priority lock can be avoided, {@code false} otherwise
-   */
-  public static boolean canAvoidSamplingPriorityLock(int priority, int mechanism) {
-    return (!Config.get().isApmTracingEnabled() && mechanism == SamplingMechanism.APPSEC)
-        || (Config.get().isDataJobsEnabled() && mechanism == DATA_JOBS);
-  }
-
-  private SamplingMechanism() {}
+
+    /**
+     * Returns true if sampling priority lock can be avoided for the given mechanism and priority
+     *
+     * @param priority the sampling priority
+     * @param mechanism the sampling mechanism
+     * @return {@code true} if the sampling priority lock can be avoided, {@code false} otherwise
+     */
+    public static boolean canAvoidSamplingPriorityLock(int priority, int mechanism) {
+        return (!Config.get().isApmTracingEnabled() && mechanism == SamplingMechanism.APPSEC)
+                || (Config.get().isDataJobsEnabled() && mechanism == DATA_JOBS);
+    }
+
+    private SamplingMechanism() {}
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/sampling/SamplingRule.java b/internal-api/src/main/java/datadog/trace/api/sampling/SamplingRule.java
index 45ae8a536d6..68fc71c96da 100644
--- a/internal-api/src/main/java/datadog/trace/api/sampling/SamplingRule.java
+++ b/internal-api/src/main/java/datadog/trace/api/sampling/SamplingRule.java
@@ -4,80 +4,80 @@
 
 /** This interface describes the criteria for a sampling rule. */
 public interface SamplingRule {
-  static String normalizeGlob(String name) {
-    return name == null || MATCH_ALL.equals(name) ? MATCH_ALL : name;
-  }
+    static String normalizeGlob(String name) {
+        return name == null || MATCH_ALL.equals(name) ? MATCH_ALL : name;
+    }
 
-  /** The "match all" glob pattern . */
-  String MATCH_ALL = "*";
+    /** The "match all" glob pattern . */
+    String MATCH_ALL = "*";
 
-  enum Provenance {
-    /** Rules generated from local static config. */
-    LOCAL,
+    enum Provenance {
+        /** Rules generated from local static config. */
+        LOCAL,
 
-    /** Rules generated from dynamic sampling via remote-config. */
-    DYNAMIC,
+        /** Rules generated from dynamic sampling via remote-config. */
+        DYNAMIC,
 
-    /** Rules supplied by the customer via remote-config. */
-    CUSTOMER
-  }
+        /** Rules supplied by the customer via remote-config. */
+        CUSTOMER
+    }
 
-  /**
-   * Gets the glob pattern the span service must match to validate the rule.
-   *
-   * @return The glob pattern the span service must match.
-   */
-  String getService();
-
-  /**
-   * Gets the glob pattern the span name must match to validate the rule.
-   *
-   * @return The glob pattern the span name must match.
-   */
-  String getName();
-
-  /**
-   * Gets the glob pattern the span resource must match to validate the rule.
-   *
-   * @return The glob pattern the span resource must match.
-   */
-  String getResource();
+    /**
+     * Gets the glob pattern the span service must match to validate the rule.
+     *
+     * @return The glob pattern the span service must match.
+     */
+    String getService();
 
-  /**
-   * Gets the collection of all (tag name, glob pattern) pairs that span tags must match to validate
-   * the rules. If the collection is empty, the rule will be validated. If the collection has
-   * entries, each key must exactly match a span tag name, and its associated glob pattern must
-   * match the span tag value.
-   *
-   * @return The collection of all (tag name, glob pattern) pairs that span tags must match.
-   */
-  Map<String, String> getTags();
+    /**
+     * Gets the glob pattern the span name must match to validate the rule.
+     *
+     * @return The glob pattern the span name must match.
+     */
+    String getName();
 
-  /**
-   * Gets the probability of keeping (sampling) the element matching the rule.
-   *
-   * @return The probability of sampling the element matching the rule, between {@code 0.0} and
-   *     {@code 1.0}.
-   */
-  double getSampleRate();
+    /**
+     * Gets the glob pattern the span resource must match to validate the rule.
+     *
+     * @return The glob pattern the span resource must match.
+     */
+    String getResource();
 
-  /**
-   * How this rule was generated; e.g. from local config, dynamic sampling, or the customer.
-   *
-   * @return How this rule was generated.
-   */
-  Provenance getProvenance();
+    /**
+     * Gets the collection of all (tag name, glob pattern) pairs that span tags must match to validate
+     * the rules. If the collection is empty, the rule will be validated. If the collection has
+     * entries, each key must exactly match a span tag name, and its associated glob pattern must
+     * match the span tag value.
+     *
+     * @return The collection of all (tag name, glob pattern) pairs that span tags must match.
+     */
+    Map<String, String> getTags();
 
-  /** This interface describes the criteria of a sampling rule that can match against a trace. */
-  interface TraceSamplingRule extends SamplingRule {}
+    /**
+     * Gets the probability of keeping (sampling) the element matching the rule.
+     *
+     * @return The probability of sampling the element matching the rule, between {@code 0.0} and
+     *     {@code 1.0}.
+     */
+    double getSampleRate();
 
-  /** This interface describes the criteria of a sampling rule that can match against a span. */
-  interface SpanSamplingRule extends SamplingRule {
     /**
-     * Gets the limit applied to the rule, using a token bucket limiter.
+     * How this rule was generated; e.g. from local config, dynamic sampling, or the customer.
      *
-     * @return The limit applied to the rule, {@link Integer#MAX_VALUE} if no limit.
+     * @return How this rule was generated.
      */
-    int getMaxPerSecond();
-  }
+    Provenance getProvenance();
+
+    /** This interface describes the criteria of a sampling rule that can match against a trace. */
+    interface TraceSamplingRule extends SamplingRule {}
+
+    /** This interface describes the criteria of a sampling rule that can match against a span. */
+    interface SpanSamplingRule extends SamplingRule {
+        /**
+         * Gets the limit applied to the rule, using a token bucket limiter.
+         *
+         * @return The limit applied to the rule, {@link Integer#MAX_VALUE} if no limit.
+         */
+        int getMaxPerSecond();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/scopemanager/ExtendedScopeListener.java b/internal-api/src/main/java/datadog/trace/api/scopemanager/ExtendedScopeListener.java
index 243f3a8cc25..91ccbd6e766 100644
--- a/internal-api/src/main/java/datadog/trace/api/scopemanager/ExtendedScopeListener.java
+++ b/internal-api/src/main/java/datadog/trace/api/scopemanager/ExtendedScopeListener.java
@@ -3,9 +3,9 @@
 import datadog.trace.api.DDTraceId;
 
 public interface ExtendedScopeListener extends ScopeListener {
-  void afterScopeActivated(DDTraceId traceId, long spanId);
+    void afterScopeActivated(DDTraceId traceId, long spanId);
 
-  /** Called just after a scope is closed. */
-  @Override
-  void afterScopeClosed();
+    /** Called just after a scope is closed. */
+    @Override
+    void afterScopeClosed();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/scopemanager/ScopeListener.java b/internal-api/src/main/java/datadog/trace/api/scopemanager/ScopeListener.java
index 3c55c67ef3f..8aaf2309ab1 100644
--- a/internal-api/src/main/java/datadog/trace/api/scopemanager/ScopeListener.java
+++ b/internal-api/src/main/java/datadog/trace/api/scopemanager/ScopeListener.java
@@ -2,14 +2,14 @@
 
 /** Hooks for scope activation */
 public interface ScopeListener {
-  /**
-   * Called just after a scope becomes the active scope
-   *
-   * <p>May be called multiple times. When a scope is initially created, or after a child scope is
-   * deactivated.
-   */
-  void afterScopeActivated();
+    /**
+     * Called just after a scope becomes the active scope
+     *
+     * <p>May be called multiple times. When a scope is initially created, or after a child scope is
+     * deactivated.
+     */
+    void afterScopeActivated();
 
-  /** Called just after a scope is closed. */
-  void afterScopeClosed();
+    /** Called just after a scope is closed. */
+    void afterScopeClosed();
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/ConfigInversionMetricCollectorImpl.java b/internal-api/src/main/java/datadog/trace/api/telemetry/ConfigInversionMetricCollectorImpl.java
index 6a956388256..4561f7400d3 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/ConfigInversionMetricCollectorImpl.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/ConfigInversionMetricCollectorImpl.java
@@ -10,64 +10,55 @@
 import org.slf4j.LoggerFactory;
 
 public class ConfigInversionMetricCollectorImpl
-    implements MetricCollector<ConfigInversionMetricCollectorImpl.ConfigInversionMetric>,
-        ConfigInversionMetricCollector {
-  private static final Logger log =
-      LoggerFactory.getLogger(ConfigInversionMetricCollectorImpl.class);
-  private static final String CONFIG_INVERSION_KEY_TAG = "config_name:";
-  private static final String CONFIG_INVERSION_METRIC_NAME = "untracked.config.detected";
-  private static final String NAMESPACE = "tracers";
-  private static final ConfigInversionMetricCollectorImpl INSTANCE =
-      new ConfigInversionMetricCollectorImpl();
+        implements MetricCollector<ConfigInversionMetricCollectorImpl.ConfigInversionMetric>,
+                ConfigInversionMetricCollector {
+    private static final Logger log = LoggerFactory.getLogger(ConfigInversionMetricCollectorImpl.class);
+    private static final String CONFIG_INVERSION_KEY_TAG = "config_name:";
+    private static final String CONFIG_INVERSION_METRIC_NAME = "untracked.config.detected";
+    private static final String NAMESPACE = "tracers";
+    private static final ConfigInversionMetricCollectorImpl INSTANCE = new ConfigInversionMetricCollectorImpl();
 
-  private final BlockingQueue<ConfigInversionMetricCollectorImpl.ConfigInversionMetric>
-      metricsQueue;
+    private final BlockingQueue<ConfigInversionMetricCollectorImpl.ConfigInversionMetric> metricsQueue;
 
-  private ConfigInversionMetricCollectorImpl() {
-    this.metricsQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
-  }
+    private ConfigInversionMetricCollectorImpl() {
+        this.metricsQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
+    }
 
-  public static ConfigInversionMetricCollectorImpl getInstance() {
-    return INSTANCE;
-  }
+    public static ConfigInversionMetricCollectorImpl getInstance() {
+        return INSTANCE;
+    }
 
-  public void setUndocumentedEnvVarMetric(String configName) {
-    setMetricConfigInversionMetric(CONFIG_INVERSION_KEY_TAG + configName);
-  }
+    public void setUndocumentedEnvVarMetric(String configName) {
+        setMetricConfigInversionMetric(CONFIG_INVERSION_KEY_TAG + configName);
+    }
 
-  private void setMetricConfigInversionMetric(final String... tags) {
-    if (!metricsQueue.offer(
-        new ConfigInversionMetricCollectorImpl.ConfigInversionMetric(
-            NAMESPACE, true, CONFIG_INVERSION_METRIC_NAME, "count", 1, tags))) {
-      log.debug("Unable to add telemetry metric {} for {}", CONFIG_INVERSION_METRIC_NAME, tags[0]);
+    private void setMetricConfigInversionMetric(final String... tags) {
+        if (!metricsQueue.offer(new ConfigInversionMetricCollectorImpl.ConfigInversionMetric(
+                NAMESPACE, true, CONFIG_INVERSION_METRIC_NAME, "count", 1, tags))) {
+            log.debug("Unable to add telemetry metric {} for {}", CONFIG_INVERSION_METRIC_NAME, tags[0]);
+        }
     }
-  }
 
-  @Override
-  public void prepareMetrics() {
-    // Nothing to do here
-  }
+    @Override
+    public void prepareMetrics() {
+        // Nothing to do here
+    }
 
-  @Override
-  public Collection<ConfigInversionMetricCollectorImpl.ConfigInversionMetric> drain() {
-    if (this.metricsQueue.isEmpty()) {
-      return Collections.emptyList();
+    @Override
+    public Collection<ConfigInversionMetricCollectorImpl.ConfigInversionMetric> drain() {
+        if (this.metricsQueue.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<ConfigInversionMetricCollectorImpl.ConfigInversionMetric> drained =
+                new ArrayList<>(this.metricsQueue.size());
+        this.metricsQueue.drainTo(drained);
+        return drained;
     }
-    List<ConfigInversionMetricCollectorImpl.ConfigInversionMetric> drained =
-        new ArrayList<>(this.metricsQueue.size());
-    this.metricsQueue.drainTo(drained);
-    return drained;
-  }
 
-  public static class ConfigInversionMetric extends MetricCollector.Metric {
-    public ConfigInversionMetric(
-        String namespace,
-        boolean common,
-        String metricName,
-        String type,
-        Number value,
-        final String... tags) {
-      super(namespace, common, metricName, type, value, tags);
+    public static class ConfigInversionMetric extends MetricCollector.Metric {
+        public ConfigInversionMetric(
+                String namespace, boolean common, String metricName, String type, Number value, final String... tags) {
+            super(namespace, common, metricName, type, value, tags);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/CoreMetricCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/CoreMetricCollector.java
index 9c8074dee70..946bd67c1ad 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/CoreMetricCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/CoreMetricCollector.java
@@ -14,133 +14,123 @@
 
 /** This class is in charge of draining core metrics for telemetry. */
 public class CoreMetricCollector implements MetricCollector<CoreMetricCollector.CoreMetric> {
-  private static final String METRIC_NAMESPACE = "tracers";
-  private static final String INTEGRATION_NAME_TAG = "integration_name:";
-  private static final CoreMetricCollector INSTANCE = new CoreMetricCollector();
-  private final SpanMetricRegistryImpl spanMetricRegistry = SpanMetricRegistryImpl.getInstance();
-  private final BaggageMetrics baggageMetrics = BaggageMetrics.getInstance();
-  private final StatsMetrics statsMetrics = StatsMetrics.getInstance();
+    private static final String METRIC_NAMESPACE = "tracers";
+    private static final String INTEGRATION_NAME_TAG = "integration_name:";
+    private static final CoreMetricCollector INSTANCE = new CoreMetricCollector();
+    private final SpanMetricRegistryImpl spanMetricRegistry = SpanMetricRegistryImpl.getInstance();
+    private final BaggageMetrics baggageMetrics = BaggageMetrics.getInstance();
+    private final StatsMetrics statsMetrics = StatsMetrics.getInstance();
 
-  private final BlockingQueue<CoreMetric> metricsQueue;
+    private final BlockingQueue<CoreMetric> metricsQueue;
 
-  public static CoreMetricCollector getInstance() {
-    return INSTANCE;
-  }
-
-  private CoreMetricCollector() {
-    this.metricsQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
-  }
-
-  public void count(String metricName, long value, String tag) {
-    if (value <= 0) {
-      return;
+    public static CoreMetricCollector getInstance() {
+        return INSTANCE;
     }
-    this.metricsQueue.offer(
-        new CoreMetric(METRIC_NAMESPACE, true, metricName, "count", value, tag));
-  }
 
-  @Override
-  public void prepareMetrics() {
-    // Collect the bounded, high-value client-side trace-stats span-collapse counters first, tagged
-    // by collapse reason. There is only a small, fixed set of these; the span-metric registry below
-    // is unbounded (one entry per instrumentation name), so draining it first could fill the queue
-    // and starve the collapse counters indefinitely under high instrumentation counts. Collecting
-    // them up front guarantees they are emitted.
-    for (StatsMetrics.TaggedCounter counter : this.statsMetrics.getTaggedCounters()) {
-      if (this.metricsQueue.remainingCapacity() == 0) {
-        // Queue full: stop before reading any more counters. getValueAndReset() below resets the
-        // counter's delta baseline, so resetting one we then fail to enqueue would drop that delta
-        // for good; the untouched counters are picked up on the next collection cycle.
-        break;
-      }
-      long value = counter.getValueAndReset();
-      if (value == 0) {
-        // Skip not updated counters
-        continue;
-      }
-      CoreMetric metric =
-          new CoreMetric(
-              METRIC_NAMESPACE, true, counter.getName(), "count", value, counter.getTag());
-      if (!this.metricsQueue.offer(metric)) {
-        // Stop adding metrics if the queue is full
-        break;
-      }
+    private CoreMetricCollector() {
+        this.metricsQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
     }
 
-    // Collect span metrics
-    spanMetricsLoop:
-    for (SpanMetricsImpl spanMetrics : this.spanMetricRegistry.getSpanMetrics()) {
-      if (this.metricsQueue.remainingCapacity() == 0) {
-        // Queue full: stop before touching any more span-metrics entries, not just the counters of
-        // the current one, so a full queue doesn't leave us building tags and iterating counters we
-        // can't enqueue anyway.
-        break;
-      }
-      String tag = INTEGRATION_NAME_TAG + spanMetrics.getInstrumentationName();
-      for (CoreCounter counter : spanMetrics.getCounters()) {
-        if (this.metricsQueue.remainingCapacity() == 0) {
-          // Queue full: stop before reading any more counters. getValueAndReset() below resets the
-          // counter's delta baseline, so resetting one we then fail to enqueue would drop that
-          // delta for good; the untouched counters are picked up on the next collection cycle.
-          break spanMetricsLoop;
+    public void count(String metricName, long value, String tag) {
+        if (value <= 0) {
+            return;
         }
-        long value = counter.getValueAndReset();
-        if (value == 0) {
-          // Skip not updated counters
-          continue;
+        this.metricsQueue.offer(new CoreMetric(METRIC_NAMESPACE, true, metricName, "count", value, tag));
+    }
+
+    @Override
+    public void prepareMetrics() {
+        // Collect the bounded, high-value client-side trace-stats span-collapse counters first, tagged
+        // by collapse reason. There is only a small, fixed set of these; the span-metric registry below
+        // is unbounded (one entry per instrumentation name), so draining it first could fill the queue
+        // and starve the collapse counters indefinitely under high instrumentation counts. Collecting
+        // them up front guarantees they are emitted.
+        for (StatsMetrics.TaggedCounter counter : this.statsMetrics.getTaggedCounters()) {
+            if (this.metricsQueue.remainingCapacity() == 0) {
+                // Queue full: stop before reading any more counters. getValueAndReset() below resets the
+                // counter's delta baseline, so resetting one we then fail to enqueue would drop that delta
+                // for good; the untouched counters are picked up on the next collection cycle.
+                break;
+            }
+            long value = counter.getValueAndReset();
+            if (value == 0) {
+                // Skip not updated counters
+                continue;
+            }
+            CoreMetric metric =
+                    new CoreMetric(METRIC_NAMESPACE, true, counter.getName(), "count", value, counter.getTag());
+            if (!this.metricsQueue.offer(metric)) {
+                // Stop adding metrics if the queue is full
+                break;
+            }
         }
-        CoreMetric metric =
-            new CoreMetric(METRIC_NAMESPACE, true, counter.getName(), "count", value, tag);
-        if (!this.metricsQueue.offer(metric)) {
-          // Stop adding metrics if the queue is full
-          break spanMetricsLoop;
+
+        // Collect span metrics
+        spanMetricsLoop:
+        for (SpanMetricsImpl spanMetrics : this.spanMetricRegistry.getSpanMetrics()) {
+            if (this.metricsQueue.remainingCapacity() == 0) {
+                // Queue full: stop before touching any more span-metrics entries, not just the counters of
+                // the current one, so a full queue doesn't leave us building tags and iterating counters we
+                // can't enqueue anyway.
+                break;
+            }
+            String tag = INTEGRATION_NAME_TAG + spanMetrics.getInstrumentationName();
+            for (CoreCounter counter : spanMetrics.getCounters()) {
+                if (this.metricsQueue.remainingCapacity() == 0) {
+                    // Queue full: stop before reading any more counters. getValueAndReset() below resets the
+                    // counter's delta baseline, so resetting one we then fail to enqueue would drop that
+                    // delta for good; the untouched counters are picked up on the next collection cycle.
+                    break spanMetricsLoop;
+                }
+                long value = counter.getValueAndReset();
+                if (value == 0) {
+                    // Skip not updated counters
+                    continue;
+                }
+                CoreMetric metric = new CoreMetric(METRIC_NAMESPACE, true, counter.getName(), "count", value, tag);
+                if (!this.metricsQueue.offer(metric)) {
+                    // Stop adding metrics if the queue is full
+                    break spanMetricsLoop;
+                }
+            }
         }
-      }
-    }
 
-    // Collect baggage metrics
-    for (BaggageMetrics.TaggedCounter counter : this.baggageMetrics.getTaggedCounters()) {
-      if (this.metricsQueue.remainingCapacity() == 0) {
-        // Queue full: stop before reading any more counters. getValueAndReset() below resets the
-        // counter's delta baseline, so resetting one we then fail to enqueue would drop that
-        // delta for good; the untouched counters are picked up on the next collection cycle.
-        break;
-      }
-      long value = counter.getValueAndReset();
-      if (value == 0) {
-        // Skip not updated counters
-        continue;
-      }
-      // Use the specific tag for each baggage metric
-      String tag = counter.getTag();
-      CoreMetric metric =
-          new CoreMetric(METRIC_NAMESPACE, true, counter.getName(), "count", value, tag);
-      if (!this.metricsQueue.offer(metric)) {
-        // Stop adding metrics if the queue is full
-        break;
-      }
+        // Collect baggage metrics
+        for (BaggageMetrics.TaggedCounter counter : this.baggageMetrics.getTaggedCounters()) {
+            if (this.metricsQueue.remainingCapacity() == 0) {
+                // Queue full: stop before reading any more counters. getValueAndReset() below resets the
+                // counter's delta baseline, so resetting one we then fail to enqueue would drop that
+                // delta for good; the untouched counters are picked up on the next collection cycle.
+                break;
+            }
+            long value = counter.getValueAndReset();
+            if (value == 0) {
+                // Skip not updated counters
+                continue;
+            }
+            // Use the specific tag for each baggage metric
+            String tag = counter.getTag();
+            CoreMetric metric = new CoreMetric(METRIC_NAMESPACE, true, counter.getName(), "count", value, tag);
+            if (!this.metricsQueue.offer(metric)) {
+                // Stop adding metrics if the queue is full
+                break;
+            }
+        }
     }
-  }
 
-  @Override
-  public Collection<CoreMetric> drain() {
-    if (this.metricsQueue.isEmpty()) {
-      return Collections.emptyList();
+    @Override
+    public Collection<CoreMetric> drain() {
+        if (this.metricsQueue.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<CoreMetric> drained = new ArrayList<>(this.metricsQueue.size());
+        this.metricsQueue.drainTo(drained);
+        return drained;
     }
-    List<CoreMetric> drained = new ArrayList<>(this.metricsQueue.size());
-    this.metricsQueue.drainTo(drained);
-    return drained;
-  }
 
-  public static class CoreMetric extends MetricCollector.Metric {
-    public CoreMetric(
-        String namespace,
-        boolean common,
-        String metricName,
-        String type,
-        Number value,
-        String tag) {
-      super(namespace, common, metricName, type, value, tag);
+    public static class CoreMetric extends MetricCollector.Metric {
+        public CoreMetric(String namespace, boolean common, String metricName, String type, Number value, String tag) {
+            super(namespace, common, metricName, type, value, tag);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/Endpoint.java b/internal-api/src/main/java/datadog/trace/api/telemetry/Endpoint.java
index ded841404c4..8702a4d6818 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/Endpoint.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/Endpoint.java
@@ -11,152 +11,152 @@
 import java.util.Set;
 
 public class Endpoint {
-  private boolean fist;
-  private String type;
-  private String method;
-  private String path;
-  private String operation;
-  private String resource;
-  private List<String> requestBodyType;
-  private List<String> responseBodyType;
-  private List<Integer> responseCode;
-  private List<String> authentication;
-  private Map<String, String> metadata;
-
-  public boolean isFirst() {
-    return fist;
-  }
-
-  public Endpoint first(boolean first) {
-    this.fist = first;
-    return this;
-  }
-
-  public String getType() {
-    return type;
-  }
-
-  public Endpoint type(final String type) {
-    this.type = type;
-    return this;
-  }
-
-  public String getMethod() {
-    return method;
-  }
-
-  public Endpoint method(final String method) {
-    this.method = method;
-    return this;
-  }
-
-  public String getPath() {
-    return path;
-  }
-
-  public Endpoint path(final String path) {
-    this.path = path;
-    return this;
-  }
-
-  public String getOperation() {
-    return operation;
-  }
-
-  public Endpoint operation(final String operation) {
-    this.operation = operation;
-    return this;
-  }
-
-  public String getResource() {
-    return resource;
-  }
-
-  public Endpoint resource(final String resource) {
-    this.resource = resource;
-    return this;
-  }
-
-  public List<String> getRequestBodyType() {
-    return requestBodyType;
-  }
-
-  public Endpoint requestBodyType(final List<String> requestBodyType) {
-    this.requestBodyType = requestBodyType;
-    return this;
-  }
-
-  public List<String> getResponseBodyType() {
-    return responseBodyType;
-  }
-
-  public Endpoint responseBodyType(final List<String> responseBodyType) {
-    this.responseBodyType = responseBodyType;
-    return this;
-  }
-
-  public List<Integer> getResponseCode() {
-    return responseCode;
-  }
-
-  public Endpoint responseCode(final List<Integer> responseCode) {
-    this.responseCode = responseCode;
-    return this;
-  }
-
-  public List<String> getAuthentication() {
-    return authentication;
-  }
-
-  public Endpoint authentication(final List<String> authentication) {
-    this.authentication = authentication;
-    return this;
-  }
-
-  public Map<String, String> getMetadata() {
-    return metadata;
-  }
-
-  public Endpoint metadata(final Map<String, String> metadata) {
-    this.metadata = metadata;
-    return this;
-  }
-
-  public interface Operation {
-    String HTTP_REQUEST = "http.request";
-  }
-
-  public interface Type {
-    String REST = "REST";
-  }
-
-  public interface Method {
-    String CONNECT = "CONNECT";
-    String HEAD = "HEAD";
-    String GET = "GET";
-    String POST = "POST";
-    String PUT = "PUT";
-    String PATCH = "PATCH";
-    String OPTIONS = "OPTIONS";
-    String DELETE = "DELETE";
-    String TRACE = "TRACE";
-    String ALL = "*";
-
-    Set<String> METHODS =
-        new HashSet<>(Arrays.asList(CONNECT, HEAD, GET, POST, PUT, PATCH, OPTIONS, DELETE, TRACE));
-
-    static <E extends Enum<E>, C extends Collection<E>> List<String> parseMethods(final C methods) {
-      if (methods == null || methods.isEmpty()) {
-        return singletonList(ALL);
-      }
-      final List<String> result = new ArrayList<>(methods.size());
-      for (E value : methods) {
-        final String methodName = value.name().toUpperCase();
-        if (METHODS.contains(value.name())) {
-          result.add(methodName);
+    private boolean fist;
+    private String type;
+    private String method;
+    private String path;
+    private String operation;
+    private String resource;
+    private List<String> requestBodyType;
+    private List<String> responseBodyType;
+    private List<Integer> responseCode;
+    private List<String> authentication;
+    private Map<String, String> metadata;
+
+    public boolean isFirst() {
+        return fist;
+    }
+
+    public Endpoint first(boolean first) {
+        this.fist = first;
+        return this;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public Endpoint type(final String type) {
+        this.type = type;
+        return this;
+    }
+
+    public String getMethod() {
+        return method;
+    }
+
+    public Endpoint method(final String method) {
+        this.method = method;
+        return this;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public Endpoint path(final String path) {
+        this.path = path;
+        return this;
+    }
+
+    public String getOperation() {
+        return operation;
+    }
+
+    public Endpoint operation(final String operation) {
+        this.operation = operation;
+        return this;
+    }
+
+    public String getResource() {
+        return resource;
+    }
+
+    public Endpoint resource(final String resource) {
+        this.resource = resource;
+        return this;
+    }
+
+    public List<String> getRequestBodyType() {
+        return requestBodyType;
+    }
+
+    public Endpoint requestBodyType(final List<String> requestBodyType) {
+        this.requestBodyType = requestBodyType;
+        return this;
+    }
+
+    public List<String> getResponseBodyType() {
+        return responseBodyType;
+    }
+
+    public Endpoint responseBodyType(final List<String> responseBodyType) {
+        this.responseBodyType = responseBodyType;
+        return this;
+    }
+
+    public List<Integer> getResponseCode() {
+        return responseCode;
+    }
+
+    public Endpoint responseCode(final List<Integer> responseCode) {
+        this.responseCode = responseCode;
+        return this;
+    }
+
+    public List<String> getAuthentication() {
+        return authentication;
+    }
+
+    public Endpoint authentication(final List<String> authentication) {
+        this.authentication = authentication;
+        return this;
+    }
+
+    public Map<String, String> getMetadata() {
+        return metadata;
+    }
+
+    public Endpoint metadata(final Map<String, String> metadata) {
+        this.metadata = metadata;
+        return this;
+    }
+
+    public interface Operation {
+        String HTTP_REQUEST = "http.request";
+    }
+
+    public interface Type {
+        String REST = "REST";
+    }
+
+    public interface Method {
+        String CONNECT = "CONNECT";
+        String HEAD = "HEAD";
+        String GET = "GET";
+        String POST = "POST";
+        String PUT = "PUT";
+        String PATCH = "PATCH";
+        String OPTIONS = "OPTIONS";
+        String DELETE = "DELETE";
+        String TRACE = "TRACE";
+        String ALL = "*";
+
+        Set<String> METHODS =
+                new HashSet<>(Arrays.asList(CONNECT, HEAD, GET, POST, PUT, PATCH, OPTIONS, DELETE, TRACE));
+
+        static <E extends Enum<E>, C extends Collection<E>> List<String> parseMethods(final C methods) {
+            if (methods == null || methods.isEmpty()) {
+                return singletonList(ALL);
+            }
+            final List<String> result = new ArrayList<>(methods.size());
+            for (E value : methods) {
+                final String methodName = value.name().toUpperCase();
+                if (METHODS.contains(value.name())) {
+                    result.add(methodName);
+                }
+            }
+            return result;
         }
-      }
-      return result;
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/EndpointCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/EndpointCollector.java
index ed888c1ff43..fef2d7c8457 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/EndpointCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/EndpointCollector.java
@@ -6,25 +6,22 @@
 import java.util.Iterator;
 import java.util.concurrent.atomic.AtomicReference;
 
-@SuppressFBWarnings(
-    value = "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR",
-    justification = "Usage in tests")
+@SuppressFBWarnings(value = "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR", justification = "Usage in tests")
 public class EndpointCollector {
 
-  private static final EndpointCollector INSTANCE = new EndpointCollector();
+    private static final EndpointCollector INSTANCE = new EndpointCollector();
 
-  public static EndpointCollector get() {
-    return INSTANCE;
-  }
+    public static EndpointCollector get() {
+        return INSTANCE;
+    }
 
-  private final AtomicReference<Iterator<Endpoint>> provider =
-      new AtomicReference<>(emptyIterator());
+    private final AtomicReference<Iterator<Endpoint>> provider = new AtomicReference<>(emptyIterator());
 
-  public Iterator<Endpoint> drain() {
-    return provider.getAndSet(emptyIterator());
-  }
+    public Iterator<Endpoint> drain() {
+        return provider.getAndSet(emptyIterator());
+    }
 
-  public void supplier(final Iterator<Endpoint> supplier) {
-    provider.set(supplier);
-  }
+    public void supplier(final Iterator<Endpoint> supplier) {
+        provider.set(supplier);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/IntegrationsCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/IntegrationsCollector.java
index 0ed6f5643ff..d6ac610f88a 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/IntegrationsCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/IntegrationsCollector.java
@@ -9,51 +9,51 @@
 
 public class IntegrationsCollector {
 
-  private static final IntegrationsCollector INSTANCE = new IntegrationsCollector();
-  private final Queue<Integration> integrations = new LinkedBlockingQueue<>();
-
-  private IntegrationsCollector() {}
-
-  public static IntegrationsCollector get() {
-    return INSTANCE;
-  }
-
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_METHOD_SYNCHRONIZATION",
-      justification =
-          "All production callers are agent-owned and do not synchronize on this monitor; locking prevents updates from interleaving with draining.")
-  public synchronized void update(Iterable<String> names, boolean enabled) {
-    Integration i = new Integration();
-    i.names = names;
-    i.enabled = enabled;
-
-    integrations.offer(i);
-  }
-
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_METHOD_SYNCHRONIZATION",
-      justification =
-          "All production callers are agent-owned and do not synchronize on this monitor; locking prevents updates from interleaving with draining.")
-  public synchronized Map<String, Boolean> drain() {
-    if (integrations.isEmpty()) {
-      return Collections.emptyMap();
+    private static final IntegrationsCollector INSTANCE = new IntegrationsCollector();
+    private final Queue<Integration> integrations = new LinkedBlockingQueue<>();
+
+    private IntegrationsCollector() {}
+
+    public static IntegrationsCollector get() {
+        return INSTANCE;
     }
 
-    Map<String, Boolean> map = new LinkedHashMap<>();
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_METHOD_SYNCHRONIZATION",
+            justification =
+                    "All production callers are agent-owned and do not synchronize on this monitor; locking prevents updates from interleaving with draining.")
+    public synchronized void update(Iterable<String> names, boolean enabled) {
+        Integration i = new Integration();
+        i.names = names;
+        i.enabled = enabled;
 
-    Integration i;
-    while ((i = integrations.poll()) != null) {
-      boolean enabled = i.enabled;
-      for (String name : i.names) {
-        map.put(name, enabled);
-      }
+        integrations.offer(i);
     }
 
-    return map;
-  }
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_METHOD_SYNCHRONIZATION",
+            justification =
+                    "All production callers are agent-owned and do not synchronize on this monitor; locking prevents updates from interleaving with draining.")
+    public synchronized Map<String, Boolean> drain() {
+        if (integrations.isEmpty()) {
+            return Collections.emptyMap();
+        }
+
+        Map<String, Boolean> map = new LinkedHashMap<>();
+
+        Integration i;
+        while ((i = integrations.poll()) != null) {
+            boolean enabled = i.enabled;
+            for (String name : i.names) {
+                map.put(name, enabled);
+            }
+        }
+
+        return map;
+    }
 
-  private static class Integration {
-    public Iterable<String> names;
-    public boolean enabled;
-  }
+    private static class Integration {
+        public Iterable<String> names;
+        public boolean enabled;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/LLMObsMetricCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/LLMObsMetricCollector.java
index 9ca9e556b5c..608f99f99f7 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/LLMObsMetricCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/LLMObsMetricCollector.java
@@ -23,216 +23,200 @@
  * <p>Counts are aggregated per tag combination in-process and emitted as one point per metrics
  * interval.
  */
-public final class LLMObsMetricCollector
-    implements MetricCollector<LLMObsMetricCollector.LLMObsMetric> {
-  private static final String METRIC_NAMESPACE = "mlobs";
-
-  private static final Logger log = LoggerFactory.getLogger(LLMObsMetricCollector.class);
-  private static final LLMObsMetricCollector INSTANCE = new LLMObsMetricCollector();
-
-  public static LLMObsMetricCollector get() {
-    return INSTANCE;
-  }
-
-  public static final String SPAN_FINISHED_METRIC = "span.finished";
-  public static final String USER_PROCESSOR_CALLED_METRIC = "user_processor_called";
-  public static final String FEEDBACK_SUBMITTED_METRIC = "feedback_submitted";
-  public static final String COUNT_METRIC_TYPE = "count";
-
-  /** Tag value used when a submission failed before the real value could be determined. */
-  private static final String OTHER = "other";
-
-  private static final String IS_ROOT_SPAN_TRUE = "is_root_span:1";
-  private static final String IS_ROOT_SPAN_FALSE = "is_root_span:0";
-  private static final String AUTOINSTRUMENTED_TRUE = "autoinstrumented:1";
-  private static final String AUTOINSTRUMENTED_FALSE = "autoinstrumented:0";
-  private static final String ERROR_TRUE = "error:1";
-  private static final String ERROR_FALSE = "error:0";
-  private static final String HAS_SESSION_ID_TRUE = "has_session_id:1";
-  private static final String HAS_SESSION_ID_FALSE = "has_session_id:0";
-
-  /**
-   * Upper bound on the number of distinct tag combinations tracked. Tag values are drawn from
-   * bounded sets (integrations, span kinds, and four booleans), so legitimate cardinality is in the
-   * low hundreds at the 8-integration scale the tag caches are sized for; this only guards against
-   * an unexpected high-cardinality source. Entries are never removed (see {@link
-   * #prepareMetrics()}), so this is a lifetime ceiling, not a concurrent one.
-   */
-  static final int MAX_TAG_COMBINATIONS = 512;
-
-  private final BlockingQueue<LLMObsMetric> metricsQueue;
-  private final DDCache<String, String> integrationTagCache;
-  private final DDCache<String, String> spanKindTagCache;
-
-  /**
-   * Counter per tag combination, aggregated in-process and flushed once per metrics interval by
-   * {@link #prepareMetrics()}.
-   */
-  private final ConcurrentHashMap<List<String>, LongAdder> spanFinishedCounters;
-
-  private LLMObsMetricCollector() {
-    this.metricsQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
-    this.integrationTagCache = DDCaches.newFixedSizeCache(8);
-    this.spanKindTagCache = DDCaches.newFixedSizeCache(8);
-    this.spanFinishedCounters = new ConcurrentHashMap<>();
-  }
-
-  /**
-   * Record a span finished metric for LLMObs telemetry.
-   *
-   * <p>This only increments an in-process counter. The counter is converted into a single telemetry
-   * metric per tag combination by {@link #prepareMetrics()}, once per metrics interval.
-   *
-   * @param integration the integration name (e.g., "openai")
-   * @param spanKind the span kind (e.g., "llm", "embedding")
-   * @param isRootSpan whether this is a root span
-   * @param isAutoInstrumented whether this span was auto-instrumented
-   * @param hasError whether the span had an error
-   * @param hasSessionId whether a session id was provided for this span
-   */
-  public void recordSpanFinished(
-      String integration,
-      String spanKind,
-      boolean isRootSpan,
-      boolean isAutoInstrumented,
-      boolean hasError,
-      boolean hasSessionId) {
-    String integrationTag =
-        integrationTagCache.computeIfAbsent(integration, key -> "integration:" + key);
-    String spanKindTag = spanKindTagCache.computeIfAbsent(spanKind, key -> "span_kind:" + key);
-
-    List<String> tags =
-        Arrays.asList(
-            integrationTag,
-            spanKindTag,
-            isRootSpan ? IS_ROOT_SPAN_TRUE : IS_ROOT_SPAN_FALSE,
-            isAutoInstrumented ? AUTOINSTRUMENTED_TRUE : AUTOINSTRUMENTED_FALSE,
-            hasError ? ERROR_TRUE : ERROR_FALSE,
-            hasSessionId ? HAS_SESSION_ID_TRUE : HAS_SESSION_ID_FALSE);
-
-    LongAdder counter = spanFinishedCounters.get(tags);
-    if (counter == null) {
-      // Soft bound: concurrent recorders may overshoot slightly, which is fine for a guard.
-      if (spanFinishedCounters.size() >= MAX_TAG_COMBINATIONS) {
-        if (log.isDebugEnabled()) {
-          log.debug(
-              "Dropping telemetry metric {} for {}: tag combination limit ({}) reached",
-              SPAN_FINISHED_METRIC,
-              integration,
-              MAX_TAG_COMBINATIONS);
+public final class LLMObsMetricCollector implements MetricCollector<LLMObsMetricCollector.LLMObsMetric> {
+    private static final String METRIC_NAMESPACE = "mlobs";
+
+    private static final Logger log = LoggerFactory.getLogger(LLMObsMetricCollector.class);
+    private static final LLMObsMetricCollector INSTANCE = new LLMObsMetricCollector();
+
+    public static LLMObsMetricCollector get() {
+        return INSTANCE;
+    }
+
+    public static final String SPAN_FINISHED_METRIC = "span.finished";
+    public static final String USER_PROCESSOR_CALLED_METRIC = "user_processor_called";
+    public static final String FEEDBACK_SUBMITTED_METRIC = "feedback_submitted";
+    public static final String COUNT_METRIC_TYPE = "count";
+
+    /** Tag value used when a submission failed before the real value could be determined. */
+    private static final String OTHER = "other";
+
+    private static final String IS_ROOT_SPAN_TRUE = "is_root_span:1";
+    private static final String IS_ROOT_SPAN_FALSE = "is_root_span:0";
+    private static final String AUTOINSTRUMENTED_TRUE = "autoinstrumented:1";
+    private static final String AUTOINSTRUMENTED_FALSE = "autoinstrumented:0";
+    private static final String ERROR_TRUE = "error:1";
+    private static final String ERROR_FALSE = "error:0";
+    private static final String HAS_SESSION_ID_TRUE = "has_session_id:1";
+    private static final String HAS_SESSION_ID_FALSE = "has_session_id:0";
+
+    /**
+     * Upper bound on the number of distinct tag combinations tracked. Tag values are drawn from
+     * bounded sets (integrations, span kinds, and four booleans), so legitimate cardinality is in the
+     * low hundreds at the 8-integration scale the tag caches are sized for; this only guards against
+     * an unexpected high-cardinality source. Entries are never removed (see {@link
+     * #prepareMetrics()}), so this is a lifetime ceiling, not a concurrent one.
+     */
+    static final int MAX_TAG_COMBINATIONS = 512;
+
+    private final BlockingQueue<LLMObsMetric> metricsQueue;
+    private final DDCache<String, String> integrationTagCache;
+    private final DDCache<String, String> spanKindTagCache;
+
+    /**
+     * Counter per tag combination, aggregated in-process and flushed once per metrics interval by
+     * {@link #prepareMetrics()}.
+     */
+    private final ConcurrentHashMap<List<String>, LongAdder> spanFinishedCounters;
+
+    private LLMObsMetricCollector() {
+        this.metricsQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
+        this.integrationTagCache = DDCaches.newFixedSizeCache(8);
+        this.spanKindTagCache = DDCaches.newFixedSizeCache(8);
+        this.spanFinishedCounters = new ConcurrentHashMap<>();
+    }
+
+    /**
+     * Record a span finished metric for LLMObs telemetry.
+     *
+     * <p>This only increments an in-process counter. The counter is converted into a single telemetry
+     * metric per tag combination by {@link #prepareMetrics()}, once per metrics interval.
+     *
+     * @param integration the integration name (e.g., "openai")
+     * @param spanKind the span kind (e.g., "llm", "embedding")
+     * @param isRootSpan whether this is a root span
+     * @param isAutoInstrumented whether this span was auto-instrumented
+     * @param hasError whether the span had an error
+     * @param hasSessionId whether a session id was provided for this span
+     */
+    public void recordSpanFinished(
+            String integration,
+            String spanKind,
+            boolean isRootSpan,
+            boolean isAutoInstrumented,
+            boolean hasError,
+            boolean hasSessionId) {
+        String integrationTag = integrationTagCache.computeIfAbsent(integration, key -> "integration:" + key);
+        String spanKindTag = spanKindTagCache.computeIfAbsent(spanKind, key -> "span_kind:" + key);
+
+        List<String> tags = Arrays.asList(
+                integrationTag,
+                spanKindTag,
+                isRootSpan ? IS_ROOT_SPAN_TRUE : IS_ROOT_SPAN_FALSE,
+                isAutoInstrumented ? AUTOINSTRUMENTED_TRUE : AUTOINSTRUMENTED_FALSE,
+                hasError ? ERROR_TRUE : ERROR_FALSE,
+                hasSessionId ? HAS_SESSION_ID_TRUE : HAS_SESSION_ID_FALSE);
+
+        LongAdder counter = spanFinishedCounters.get(tags);
+        if (counter == null) {
+            // Soft bound: concurrent recorders may overshoot slightly, which is fine for a guard.
+            if (spanFinishedCounters.size() >= MAX_TAG_COMBINATIONS) {
+                if (log.isDebugEnabled()) {
+                    log.debug(
+                            "Dropping telemetry metric {} for {}: tag combination limit ({}) reached",
+                            SPAN_FINISHED_METRIC,
+                            integration,
+                            MAX_TAG_COMBINATIONS);
+                }
+                return;
+            }
+            counter = spanFinishedCounters.computeIfAbsent(tags, key -> new LongAdder());
         }
-        return;
-      }
-      counter = spanFinishedCounters.computeIfAbsent(tags, key -> new LongAdder());
+        counter.increment();
     }
-    counter.increment();
-  }
-
-  /**
-   * Records that a user-provided LLM Observability span processor was called.
-   *
-   * @param error whether the processor failed
-   */
-  public void recordUserProcessorCalled(boolean error) {
-    LLMObsMetric metric =
-        new LLMObsMetric(
-            METRIC_NAMESPACE,
-            true,
-            USER_PROCESSOR_CALLED_METRIC,
-            COUNT_METRIC_TYPE,
-            1L,
-            Collections.singletonList(error ? ERROR_TRUE : ERROR_FALSE));
-    if (!metricsQueue.offer(metric)) {
-      log.debug("Unable to add telemetry metric {}", USER_PROCESSOR_CALLED_METRIC);
+
+    /**
+     * Records that a user-provided LLM Observability span processor was called.
+     *
+     * @param error whether the processor failed
+     */
+    public void recordUserProcessorCalled(boolean error) {
+        LLMObsMetric metric = new LLMObsMetric(
+                METRIC_NAMESPACE,
+                true,
+                USER_PROCESSOR_CALLED_METRIC,
+                COUNT_METRIC_TYPE,
+                1L,
+                Collections.singletonList(error ? ERROR_TRUE : ERROR_FALSE));
+        if (!metricsQueue.offer(metric)) {
+            log.debug("Unable to add telemetry metric {}", USER_PROCESSOR_CALLED_METRIC);
+        }
     }
-  }
-
-  /**
-   * Record an end-user feedback submission attempt, successful or not.
-   *
-   * <p>Mirrors {@code record_llmobs_submit_feedback} in dd-trace-py: rejected submissions are
-   * counted too, tagged with the validation error, so that adoption and SDK misuse are both
-   * visible.
-   *
-   * @param metricType the feedback metric type (e.g. "boolean"), or null if it could not be
-   *     determined
-   * @param targetType the wire key of the feedback target (e.g. "span_id"), or null if it could not
-   *     be determined
-   * @param error the validation error code (e.g. "invalid_submitter"), or null if the submission
-   *     was accepted
-   */
-  public void recordFeedbackSubmitted(
-      @Nullable String metricType, @Nullable String targetType, @Nullable String error) {
-    List<String> tags = new ArrayList<>(4);
-    tags.add(error == null ? ERROR_FALSE : ERROR_TRUE);
-    if (error != null) {
-      tags.add("error_type:" + error);
+
+    /**
+     * Record an end-user feedback submission attempt, successful or not.
+     *
+     * <p>Mirrors {@code record_llmobs_submit_feedback} in dd-trace-py: rejected submissions are
+     * counted too, tagged with the validation error, so that adoption and SDK misuse are both
+     * visible.
+     *
+     * @param metricType the feedback metric type (e.g. "boolean"), or null if it could not be
+     *     determined
+     * @param targetType the wire key of the feedback target (e.g. "span_id"), or null if it could not
+     *     be determined
+     * @param error the validation error code (e.g. "invalid_submitter"), or null if the submission
+     *     was accepted
+     */
+    public void recordFeedbackSubmitted(
+            @Nullable String metricType, @Nullable String targetType, @Nullable String error) {
+        List<String> tags = new ArrayList<>(4);
+        tags.add(error == null ? ERROR_FALSE : ERROR_TRUE);
+        if (error != null) {
+            tags.add("error_type:" + error);
+        }
+        tags.add("metric_type:" + (metricType == null ? OTHER : metricType));
+        tags.add("target_type:" + (targetType == null ? OTHER : targetType));
+
+        LLMObsMetric metric =
+                new LLMObsMetric(METRIC_NAMESPACE, true, FEEDBACK_SUBMITTED_METRIC, COUNT_METRIC_TYPE, 1L, tags);
+        if (!metricsQueue.offer(metric)) {
+            log.debug("Unable to add telemetry metric {}", FEEDBACK_SUBMITTED_METRIC);
+        }
     }
-    tags.add("metric_type:" + (metricType == null ? OTHER : metricType));
-    tags.add("target_type:" + (targetType == null ? OTHER : targetType));
-
-    LLMObsMetric metric =
-        new LLMObsMetric(
-            METRIC_NAMESPACE, true, FEEDBACK_SUBMITTED_METRIC, COUNT_METRIC_TYPE, 1L, tags);
-    if (!metricsQueue.offer(metric)) {
-      log.debug("Unable to add telemetry metric {}", FEEDBACK_SUBMITTED_METRIC);
+
+    @Override
+    public void prepareMetrics() {
+        // Entries are never removed: a recorder thread may already hold a reference to a LongAdder, so
+        // removing it here would silently drop a concurrent increment. Tag values come from bounded
+        // sets, so retaining idle combinations costs at most MAX_TAG_COMBINATIONS entries.
+        for (Map.Entry<List<String>, LongAdder> entry : spanFinishedCounters.entrySet()) {
+            long value = entry.getValue().sumThenReset();
+            if (value == 0) {
+                continue;
+            }
+            LLMObsMetric metric = new LLMObsMetric(
+                    METRIC_NAMESPACE, true, SPAN_FINISHED_METRIC, COUNT_METRIC_TYPE, value, entry.getKey());
+            if (!metricsQueue.offer(metric)) {
+                // Queue is full; give the count back to the counter so it is reported in a later interval
+                // instead of being lost, and stop staging for now.
+                entry.getValue().add(value);
+                log.debug("Unable to add telemetry metric {}: queue is full", SPAN_FINISHED_METRIC);
+                break;
+            }
+        }
     }
-  }
-
-  @Override
-  public void prepareMetrics() {
-    // Entries are never removed: a recorder thread may already hold a reference to a LongAdder, so
-    // removing it here would silently drop a concurrent increment. Tag values come from bounded
-    // sets, so retaining idle combinations costs at most MAX_TAG_COMBINATIONS entries.
-    for (Map.Entry<List<String>, LongAdder> entry : spanFinishedCounters.entrySet()) {
-      long value = entry.getValue().sumThenReset();
-      if (value == 0) {
-        continue;
-      }
-      LLMObsMetric metric =
-          new LLMObsMetric(
-              METRIC_NAMESPACE,
-              true,
-              SPAN_FINISHED_METRIC,
-              COUNT_METRIC_TYPE,
-              value,
-              entry.getKey());
-      if (!metricsQueue.offer(metric)) {
-        // Queue is full; give the count back to the counter so it is reported in a later interval
-        // instead of being lost, and stop staging for now.
-        entry.getValue().add(value);
-        log.debug("Unable to add telemetry metric {}: queue is full", SPAN_FINISHED_METRIC);
-        break;
-      }
+
+    @Override
+    public Collection<LLMObsMetric> drain() {
+        if (this.metricsQueue.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<LLMObsMetric> drained = new ArrayList<>(this.metricsQueue.size());
+        this.metricsQueue.drainTo(drained);
+        return drained;
     }
-  }
 
-  @Override
-  public Collection<LLMObsMetric> drain() {
-    if (this.metricsQueue.isEmpty()) {
-      return Collections.emptyList();
+    /** Clears all staged counters and metrics. Visible for testing only. */
+    @VisibleForTesting
+    public void resetForTesting() {
+        spanFinishedCounters.clear();
+        metricsQueue.clear();
     }
-    List<LLMObsMetric> drained = new ArrayList<>(this.metricsQueue.size());
-    this.metricsQueue.drainTo(drained);
-    return drained;
-  }
-
-  /** Clears all staged counters and metrics. Visible for testing only. */
-  @VisibleForTesting
-  public void resetForTesting() {
-    spanFinishedCounters.clear();
-    metricsQueue.clear();
-  }
-
-  public static class LLMObsMetric extends MetricCollector.Metric {
-    public LLMObsMetric(
-        String namespace,
-        boolean common,
-        String metricName,
-        String type,
-        Number value,
-        List<String> tags) {
-      super(namespace, common, metricName, type, value, tags);
+
+    public static class LLMObsMetric extends MetricCollector.Metric {
+        public LLMObsMetric(
+                String namespace, boolean common, String metricName, String type, Number value, List<String> tags) {
+            super(namespace, common, metricName, type, value, tags);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/LogCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/LogCollector.java
index 404e8eebb0f..17d55a30860 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/LogCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/LogCollector.java
@@ -18,233 +18,223 @@
 import org.slf4j.MarkerFactory;
 
 public class LogCollector {
-  public static final Marker SEND_TELEMETRY = MarkerFactory.getMarker("SEND_TELEMETRY");
-  public static final Marker EXCLUDE_TELEMETRY = MarkerFactory.getMarker("EXCLUDE_TELEMETRY");
-  private static final int DEFAULT_MAX_CAPACITY = 10;
-  private static final LogCollector INSTANCE = new LogCollector();
-  @VisibleForTesting final ConcurrentHashtable.State<RawLogMessage> rawLogMessages;
-
-  public static LogCollector get() {
-    return INSTANCE;
-  }
-
-  private LogCollector() {
-    this(DEFAULT_MAX_CAPACITY);
-  }
-
-  @SuppressFBWarnings(
-      value = "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR",
-      justification = "Usage in tests")
-  LogCollector(int maxCapacity) {
-    this.rawLogMessages = ConcurrentHashtable.createBounded(RawLogMessage.class, maxCapacity);
-  }
-
-  public void addLogMessage(String logLevel, String message, @Nullable Throwable throwable) {
-    addLogMessage(logLevel, message, throwable, null);
-  }
-
-  /**
-   * Queue a log message to be sent on next telemetry flush.
-   *
-   * @param logLevel Log level (ERROR, WARN, DEBUG). Unknown log levels will be ignored.
-   * @param message Log message.
-   * @param throwable Optional throwable to attach a stacktrace.
-   * @param tags Optional tags to attach to the log. These are a comma-separated list, e.g.
-   *     tag1:value1,tag2:value2
-   */
-  public void addLogMessage(
-      String logLevel, String message, @Nullable Throwable throwable, @Nullable String tags) {
-    long keyHash = RawLogMessage.computeHash(logLevel, message, throwable);
-    // Fast path for duplicates: search lock-free before ever taking the table lock.
-    RawLogMessage rawLogMessage = find(keyHash, logLevel, message, throwable);
-    if (rawLogMessage != null) {
-      rawLogMessage.increment();
-      return;
+    public static final Marker SEND_TELEMETRY = MarkerFactory.getMarker("SEND_TELEMETRY");
+    public static final Marker EXCLUDE_TELEMETRY = MarkerFactory.getMarker("EXCLUDE_TELEMETRY");
+    private static final int DEFAULT_MAX_CAPACITY = 10;
+    private static final LogCollector INSTANCE = new LogCollector();
+
+    @VisibleForTesting
+    final ConcurrentHashtable.State<RawLogMessage> rawLogMessages;
+
+    public static LogCollector get() {
+        return INSTANCE;
     }
 
-    // Slow path after a miss: tryGetOrInsertOrNull does its own locked comparison -- including,
-    // via tryReserve, a recheck against a concurrent duplicate even when the table looks full --
-    // so there's no need to repeat find() here first.
-    try (Reservation<RawLogMessage> reservation =
-        ConcurrentHashtable.tryReserve(rawLogMessages, keyHash)) {
-      // Built zeroed, so this occurrence can be counted uniformly below whether or not
-      // tryGetOrInsertOrNull ends up returning this instance or an existing match.
-      rawLogMessage =
-          reservation.tryGetOrInsertOrNull(
-              new RawLogMessage(
-                  logLevel, message, throwable, tags, System.currentTimeMillis() / 1000));
-      if (rawLogMessage == null) {
-        // TODO: We could emit a metric for dropped logs.
-        return;
-      }
-      rawLogMessage.increment();
+    private LogCollector() {
+        this(DEFAULT_MAX_CAPACITY);
     }
-  }
-
-  /**
-   * Removes all available <em>log group</em> from this collector and returns them.
-   *
-   * <p>The count of each returned group is captured during removal. Increments that complete
-   * <em>after</em> the count is captured are not included.
-   *
-   * @return a collection containing the removed log groups
-   */
-  public Collection<RawLogMessage> drain() {
-    int size = estimateSize(rawLogMessages);
-    if (size == 0) {
-      return Collections.emptyList();
+
+    @SuppressFBWarnings(value = "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR", justification = "Usage in tests")
+    LogCollector(int maxCapacity) {
+        this.rawLogMessages = ConcurrentHashtable.createBounded(RawLogMessage.class, maxCapacity);
     }
 
-    // Note drain takes the table lock
-    List<RawLogMessage> list = new ArrayList<>(size);
-    ConcurrentHashtable.drain(
-        rawLogMessages,
-        list,
-        (drained, logMessage) -> {
-          // Snapshot each log group's count before adding it to the drain result.
-          logMessage.snapshotCount();
-          drained.add(logMessage);
-        });
-    return list;
-  }
-
-  /**
-   * Finds a <em>log group</em> with the same <em>level</em>, <em>message</em>, and
-   * <em>throwable</em> as {@code keyHash}'s candidates.
-   *
-   * <p>Note, throwables are matched by identity or by class and stack trace.
-   *
-   * <p>The bucket chain supports lock-free reads. A caller that inserts after a miss must repeat
-   * the search under the table write lock.
-   *
-   * @param keyHash precomputed hash of the level, message, and throwable class
-   * @param logLevel log level to match
-   * @param message message to match
-   * @param throwable optional throwable to match
-   * @return the matching log group, or {@code null} if none is present
-   */
-  @Nullable
-  private RawLogMessage find(
-      long keyHash, String logLevel, String message, @Nullable Throwable throwable) {
-    StackTraceElement[] stackTrace = null;
-    for (RawLogMessage entry : ConcurrentHashtable.hashIterable(rawLogMessages, keyHash)) {
-      if (!Objects.equals(logLevel, entry.logLevel) || !Objects.equals(message, entry.message)) {
-        continue;
-      }
-      // throwables are more costly to compare, check first the identity
-      if (throwable == entry.throwable) {
-        return entry;
-      }
-      if (throwable != null
-          && entry.throwable != null
-          && throwable.getClass().equals(entry.throwable.getClass())) {
-        if (stackTrace == null) {
-          stackTrace = throwable.getStackTrace();
+    public void addLogMessage(String logLevel, String message, @Nullable Throwable throwable) {
+        addLogMessage(logLevel, message, throwable, null);
+    }
+
+    /**
+     * Queue a log message to be sent on next telemetry flush.
+     *
+     * @param logLevel Log level (ERROR, WARN, DEBUG). Unknown log levels will be ignored.
+     * @param message Log message.
+     * @param throwable Optional throwable to attach a stacktrace.
+     * @param tags Optional tags to attach to the log. These are a comma-separated list, e.g.
+     *     tag1:value1,tag2:value2
+     */
+    public void addLogMessage(String logLevel, String message, @Nullable Throwable throwable, @Nullable String tags) {
+        long keyHash = RawLogMessage.computeHash(logLevel, message, throwable);
+        // Fast path for duplicates: search lock-free before ever taking the table lock.
+        RawLogMessage rawLogMessage = find(keyHash, logLevel, message, throwable);
+        if (rawLogMessage != null) {
+            rawLogMessage.increment();
+            return;
         }
-        if (Objects.deepEquals(stackTrace, entry.stackTrace())) {
-          return entry;
+
+        // Slow path after a miss: tryGetOrInsertOrNull does its own locked comparison -- including,
+        // via tryReserve, a recheck against a concurrent duplicate even when the table looks full --
+        // so there's no need to repeat find() here first.
+        try (Reservation<RawLogMessage> reservation = ConcurrentHashtable.tryReserve(rawLogMessages, keyHash)) {
+            // Built zeroed, so this occurrence can be counted uniformly below whether or not
+            // tryGetOrInsertOrNull ends up returning this instance or an existing match.
+            rawLogMessage = reservation.tryGetOrInsertOrNull(
+                    new RawLogMessage(logLevel, message, throwable, tags, System.currentTimeMillis() / 1000));
+            if (rawLogMessage == null) {
+                // TODO: We could emit a metric for dropped logs.
+                return;
+            }
+            rawLogMessage.increment();
         }
-      }
     }
-    return null;
-  }
-
-  /**
-   * Groups equivalent log messages for a telemetry flush.
-   *
-   * <p>Messages are equivalent when their log level, message, and throwable type and stack trace
-   * match. The first message supplies the tags and timestamp; later messages only increment the
-   * occurrence count.
-   */
-  public static final class RawLogMessage extends ConcurrentHashtable.Entry<RawLogMessage> {
-    private static final AtomicIntegerFieldUpdater<RawLogMessage> LIVE_OCCURRENCE_COUNT_UPDATER =
-        AtomicIntegerFieldUpdater.newUpdater(RawLogMessage.class, "liveOccurrenceCount");
-
-    public final String message;
-    public final String logLevel;
-    public final Throwable throwable;
-    public final String tags;
-    public final long timestamp;
-
-    /** Number of equivalent log messages captured when this group was drained. */
-    public int count;
 
     /**
-     * Live counter equivalent log messages accumulated in this group. Starts zeroed so a caller can
-     * unconditionally {@link #increment()} once after a find-or-insert, whether it landed this
-     * instance or an existing match.
+     * Removes all available <em>log group</em> from this collector and returns them.
+     *
+     * <p>The count of each returned group is captured during removal. Increments that complete
+     * <em>after</em> the count is captured are not included.
+     *
+     * @return a collection containing the removed log groups
      */
-    private volatile int liveOccurrenceCount = 0;
-
-    private volatile StackTraceElement[] cachedStackTrace = null;
-
-    public RawLogMessage(
-        String logLevel, String message, Throwable throwable, String tags, long timestamp) {
-      super(computeHash(logLevel, message, throwable));
-      this.logLevel = logLevel;
-      this.message = message;
-      this.throwable = throwable;
-      this.tags = tags;
-      this.timestamp = timestamp;
+    public Collection<RawLogMessage> drain() {
+        int size = estimateSize(rawLogMessages);
+        if (size == 0) {
+            return Collections.emptyList();
+        }
+
+        // Note drain takes the table lock
+        List<RawLogMessage> list = new ArrayList<>(size);
+        ConcurrentHashtable.drain(rawLogMessages, list, (drained, logMessage) -> {
+            // Snapshot each log group's count before adding it to the drain result.
+            logMessage.snapshotCount();
+            drained.add(logMessage);
+        });
+        return list;
+    }
+
+    /**
+     * Finds a <em>log group</em> with the same <em>level</em>, <em>message</em>, and
+     * <em>throwable</em> as {@code keyHash}'s candidates.
+     *
+     * <p>Note, throwables are matched by identity or by class and stack trace.
+     *
+     * <p>The bucket chain supports lock-free reads. A caller that inserts after a miss must repeat
+     * the search under the table write lock.
+     *
+     * @param keyHash precomputed hash of the level, message, and throwable class
+     * @param logLevel log level to match
+     * @param message message to match
+     * @param throwable optional throwable to match
+     * @return the matching log group, or {@code null} if none is present
+     */
+    @Nullable
+    private RawLogMessage find(long keyHash, String logLevel, String message, @Nullable Throwable throwable) {
+        StackTraceElement[] stackTrace = null;
+        for (RawLogMessage entry : ConcurrentHashtable.hashIterable(rawLogMessages, keyHash)) {
+            if (!Objects.equals(logLevel, entry.logLevel) || !Objects.equals(message, entry.message)) {
+                continue;
+            }
+            // throwables are more costly to compare, check first the identity
+            if (throwable == entry.throwable) {
+                return entry;
+            }
+            if (throwable != null
+                    && entry.throwable != null
+                    && throwable.getClass().equals(entry.throwable.getClass())) {
+                if (stackTrace == null) {
+                    stackTrace = throwable.getStackTrace();
+                }
+                if (Objects.deepEquals(stackTrace, entry.stackTrace())) {
+                    return entry;
+                }
+            }
+        }
+        return null;
     }
 
-    public StackTraceElement[] stackTrace() {
-      if (throwable == null) return null;
+    /**
+     * Groups equivalent log messages for a telemetry flush.
+     *
+     * <p>Messages are equivalent when their log level, message, and throwable type and stack trace
+     * match. The first message supplies the tags and timestamp; later messages only increment the
+     * occurrence count.
+     */
+    public static final class RawLogMessage extends ConcurrentHashtable.Entry<RawLogMessage> {
+        private static final AtomicIntegerFieldUpdater<RawLogMessage> LIVE_OCCURRENCE_COUNT_UPDATER =
+                AtomicIntegerFieldUpdater.newUpdater(RawLogMessage.class, "liveOccurrenceCount");
+
+        public final String message;
+        public final String logLevel;
+        public final Throwable throwable;
+        public final String tags;
+        public final long timestamp;
+
+        /** Number of equivalent log messages captured when this group was drained. */
+        public int count;
+
+        /**
+         * Live counter equivalent log messages accumulated in this group. Starts zeroed so a caller can
+         * unconditionally {@link #increment()} once after a find-or-insert, whether it landed this
+         * instance or an existing match.
+         */
+        private volatile int liveOccurrenceCount = 0;
+
+        private volatile StackTraceElement[] cachedStackTrace = null;
+
+        public RawLogMessage(String logLevel, String message, Throwable throwable, String tags, long timestamp) {
+            super(computeHash(logLevel, message, throwable));
+            this.logLevel = logLevel;
+            this.message = message;
+            this.throwable = throwable;
+            this.tags = tags;
+            this.timestamp = timestamp;
+        }
 
-      // getStackTrace() makes a defensive copy. Cache one safely published copy for concurrent
-      // comparisons against equivalent throwables.
-      StackTraceElement[] stackTrace = cachedStackTrace;
-      if (stackTrace != null) return stackTrace;
+        public StackTraceElement[] stackTrace() {
+            if (throwable == null) return null;
 
-      cachedStackTrace = stackTrace = throwable.getStackTrace();
-      return stackTrace;
-    }
+            // getStackTrace() makes a defensive copy. Cache one safely published copy for concurrent
+            // comparisons against equivalent throwables.
+            StackTraceElement[] stackTrace = cachedStackTrace;
+            if (stackTrace != null) return stackTrace;
 
-    private void increment() {
-      LIVE_OCCURRENCE_COUNT_UPDATER.incrementAndGet(this);
-    }
+            cachedStackTrace = stackTrace = throwable.getStackTrace();
+            return stackTrace;
+        }
 
-    /** Snapshot this log's live occurrence count */
-    private void snapshotCount() {
-      count = LIVE_OCCURRENCE_COUNT_UPDATER.get(this);
-    }
+        private void increment() {
+            LIVE_OCCURRENCE_COUNT_UPDATER.incrementAndGet(this);
+        }
 
-    @Override
-    public boolean matches(RawLogMessage that) {
-      if (!Objects.equals(logLevel, that.logLevel)) return false;
-      if (!Objects.equals(message, that.message)) return false;
-
-      if (throwable == that.throwable) {
-        // DQH - While this path may seem unlikely, it does happen if the JVM fast
-        // throws optimization kicks-in (for NPE, etc), so this case is worth optimizing.
-
-        // This also covers the case where both throwables are null
-        return true;
-      } else if (throwable != null && that.throwable != null) {
-        // Both have a throwable perform a deeper comparison
-        return throwable.getClass().equals(that.throwable.getClass())
-            && Objects.deepEquals(stackTrace(), that.stackTrace());
-      } else {
-        // One has an exception & the other doesn't, not equal
-        return false;
-      }
-    }
+        /** Snapshot this log's live occurrence count */
+        private void snapshotCount() {
+            count = LIVE_OCCURRENCE_COUNT_UPDATER.get(this);
+        }
 
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      return matches((RawLogMessage) o);
-    }
+        @Override
+        public boolean matches(RawLogMessage that) {
+            if (!Objects.equals(logLevel, that.logLevel)) return false;
+            if (!Objects.equals(message, that.message)) return false;
+
+            if (throwable == that.throwable) {
+                // DQH - While this path may seem unlikely, it does happen if the JVM fast
+                // throws optimization kicks-in (for NPE, etc), so this case is worth optimizing.
+
+                // This also covers the case where both throwables are null
+                return true;
+            } else if (throwable != null && that.throwable != null) {
+                // Both have a throwable perform a deeper comparison
+                return throwable.getClass().equals(that.throwable.getClass())
+                        && Objects.deepEquals(stackTrace(), that.stackTrace());
+            } else {
+                // One has an exception & the other doesn't, not equal
+                return false;
+            }
+        }
 
-    @Override
-    public int hashCode() {
-      return (int) keyHash;
-    }
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            return matches((RawLogMessage) o);
+        }
+
+        @Override
+        public int hashCode() {
+            return (int) keyHash;
+        }
 
-    private static long computeHash(
-        String logLevel, String message, @Nullable Throwable throwable) {
-      return hash(logLevel, message, throwable == null ? null : throwable.getClass());
+        private static long computeHash(String logLevel, String message, @Nullable Throwable throwable) {
+            return hash(logLevel, message, throwable == null ? null : throwable.getClass());
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/LoginEvent.java b/internal-api/src/main/java/datadog/trace/api/telemetry/LoginEvent.java
index c7aeeb91db9..7e6c11476d8 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/LoginEvent.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/LoginEvent.java
@@ -1,24 +1,24 @@
 package datadog.trace.api.telemetry;
 
 public enum LoginEvent {
-  LOGIN_SUCCESS("login_success"),
-  LOGIN_FAILURE("login_failure"),
-  SIGN_UP("signup"),
-  CUSTOM("custom");
+    LOGIN_SUCCESS("login_success"),
+    LOGIN_FAILURE("login_failure"),
+    SIGN_UP("signup"),
+    CUSTOM("custom");
 
-  private static final int numValues = LoginEvent.values().length;
+    private static final int numValues = LoginEvent.values().length;
 
-  private final String tag;
+    private final String tag;
 
-  LoginEvent(final String tag) {
-    this.tag = tag;
-  }
+    LoginEvent(final String tag) {
+        this.tag = tag;
+    }
 
-  public String getTag() {
-    return tag;
-  }
+    public String getTag() {
+        return tag;
+    }
 
-  public static int getNumValues() {
-    return numValues;
-  }
+    public static int getNumValues() {
+        return numValues;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/LoginFramework.java b/internal-api/src/main/java/datadog/trace/api/telemetry/LoginFramework.java
index c0b00b47d3f..ea08ef3ea93 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/LoginFramework.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/LoginFramework.java
@@ -1,21 +1,21 @@
 package datadog.trace.api.telemetry;
 
 public enum LoginFramework {
-  SPRING_SECURITY("spring_security");
+    SPRING_SECURITY("spring_security");
 
-  private static final int numValues = LoginFramework.values().length;
+    private static final int numValues = LoginFramework.values().length;
 
-  private final String tag;
+    private final String tag;
 
-  LoginFramework(final String tag) {
-    this.tag = tag;
-  }
+    LoginFramework(final String tag) {
+        this.tag = tag;
+    }
 
-  public String getTag() {
-    return tag;
-  }
+    public String getTag() {
+        return tag;
+    }
 
-  public static int getNumValues() {
-    return numValues;
-  }
+    public static int getNumValues() {
+        return numValues;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/LoginVersion.java b/internal-api/src/main/java/datadog/trace/api/telemetry/LoginVersion.java
index d91fd519cca..51fcabba82a 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/LoginVersion.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/LoginVersion.java
@@ -1,23 +1,23 @@
 package datadog.trace.api.telemetry;
 
 public enum LoginVersion {
-  V1("v1"),
-  V2("v2"),
-  AUTO(null);
+    V1("v1"),
+    V2("v2"),
+    AUTO(null);
 
-  private final String tag;
+    private final String tag;
 
-  LoginVersion(final String tag) {
-    this.tag = tag;
-  }
+    LoginVersion(final String tag) {
+        this.tag = tag;
+    }
 
-  public String getTag() {
-    return tag;
-  }
+    public String getTag() {
+        return tag;
+    }
 
-  private static final int numValues = LoginVersion.values().length;
+    private static final int numValues = LoginVersion.values().length;
 
-  public static int getNumValues() {
-    return numValues;
-  }
+    public static int getNumValues() {
+        return numValues;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/MetricCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/MetricCollector.java
index 1e510424d7d..756c6b86abf 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/MetricCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/MetricCollector.java
@@ -13,158 +13,142 @@
 
 public interface MetricCollector<M extends Metric> {
 
-  int RAW_QUEUE_SIZE = 1024;
-
-  // TODO All implementations are based on queueing metrics and never care when the queue is full.
-  // TODO This leads to always resetting counters even if the related metrics could not be enqueued.
-  // TODO So we may loose metric information during this call.
-  void prepareMetrics();
-
-  Collection<M> drain();
-
-  default Collection<DistributionSeriesPoint> drainDistributionSeries() {
-    return Collections.emptySet();
-  }
-
-  class Metric {
-    public final String metricName;
-    public final boolean common;
-    public final String namespace;
-    public final String type;
-    public final long timestamp;
-    public final Number value;
-    public final List<String> tags;
-
-    public Metric(
-        String namespace,
-        boolean common,
-        String metricName,
-        String type,
-        Number value,
-        final String tag) {
-      this(
-          namespace,
-          common,
-          metricName,
-          type,
-          value,
-          tag == null ? emptyList() : singletonList(tag));
-    }
-
-    public Metric(
-        String namespace,
-        boolean common,
-        String metricName,
-        String type,
-        Number value,
-        final String... tags) {
-      this(namespace, common, metricName, type, value, Arrays.asList(tags));
-    }
-
-    public Metric(
-        String namespace,
-        boolean common,
-        String metricName,
-        String type,
-        Number value,
-        final List<String> tags) {
-      this.namespace = namespace;
-      this.common = common;
-      this.metricName = metricName;
-      this.type = type;
-      this.timestamp = System.currentTimeMillis() / 1000;
-      this.value = value;
-      this.tags = tags;
-    }
+    int RAW_QUEUE_SIZE = 1024;
 
-    @Override
-    public boolean equals(final Object o) {
-      if (this == o) return true;
-      if (!(o instanceof Metric)) return false;
-      Metric metric = (Metric) o;
-      return common == metric.common
-          && Objects.equals(metricName, metric.metricName)
-          && Objects.equals(namespace, metric.namespace)
-          && Objects.equals(tags, metric.tags);
-    }
-
-    @Override
-    public int hashCode() {
-      return HashingUtils.hash(metricName, common, namespace, tags);
-    }
+    // TODO All implementations are based on queueing metrics and never care when the queue is full.
+    // TODO This leads to always resetting counters even if the related metrics could not be enqueued.
+    // TODO So we may loose metric information during this call.
+    void prepareMetrics();
 
-    @Override
-    public String toString() {
-      return "Metric{"
-          + "metricName='"
-          + metricName
-          + '\''
-          + ", common="
-          + common
-          + ", namespace='"
-          + namespace
-          + '\''
-          + ", type='"
-          + type
-          + '\''
-          + ", timestamp="
-          + timestamp
-          + ", value="
-          + value
-          + ", tags="
-          + tags
-          + '}';
-    }
-  }
-
-  class DistributionSeriesPoint {
-    public final String metricName;
-    public final boolean common;
-    public final String namespace;
-    public final int value;
-    public final List<String> tags;
-
-    public DistributionSeriesPoint(
-        String metricName, boolean common, String namespace, int value, List<String> tags) {
-      this.metricName = metricName;
-      this.common = common;
-      this.namespace = namespace;
-      this.value = value;
-      this.tags = tags;
-    }
+    Collection<M> drain();
 
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      DistributionSeriesPoint that = (DistributionSeriesPoint) o;
-      return common == that.common
-          && Objects.equals(metricName, that.metricName)
-          && Objects.equals(namespace, that.namespace)
-          && Objects.equals(tags, that.tags);
+    default Collection<DistributionSeriesPoint> drainDistributionSeries() {
+        return Collections.emptySet();
     }
 
-    @Override
-    public int hashCode() {
-      return HashingUtils.hash(metricName, common, namespace, tags);
+    class Metric {
+        public final String metricName;
+        public final boolean common;
+        public final String namespace;
+        public final String type;
+        public final long timestamp;
+        public final Number value;
+        public final List<String> tags;
+
+        public Metric(
+                String namespace, boolean common, String metricName, String type, Number value, final String tag) {
+            this(namespace, common, metricName, type, value, tag == null ? emptyList() : singletonList(tag));
+        }
+
+        public Metric(
+                String namespace, boolean common, String metricName, String type, Number value, final String... tags) {
+            this(namespace, common, metricName, type, value, Arrays.asList(tags));
+        }
+
+        public Metric(
+                String namespace,
+                boolean common,
+                String metricName,
+                String type,
+                Number value,
+                final List<String> tags) {
+            this.namespace = namespace;
+            this.common = common;
+            this.metricName = metricName;
+            this.type = type;
+            this.timestamp = System.currentTimeMillis() / 1000;
+            this.value = value;
+            this.tags = tags;
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) return true;
+            if (!(o instanceof Metric)) return false;
+            Metric metric = (Metric) o;
+            return common == metric.common
+                    && Objects.equals(metricName, metric.metricName)
+                    && Objects.equals(namespace, metric.namespace)
+                    && Objects.equals(tags, metric.tags);
+        }
+
+        @Override
+        public int hashCode() {
+            return HashingUtils.hash(metricName, common, namespace, tags);
+        }
+
+        @Override
+        public String toString() {
+            return "Metric{"
+                    + "metricName='"
+                    + metricName
+                    + '\''
+                    + ", common="
+                    + common
+                    + ", namespace='"
+                    + namespace
+                    + '\''
+                    + ", type='"
+                    + type
+                    + '\''
+                    + ", timestamp="
+                    + timestamp
+                    + ", value="
+                    + value
+                    + ", tags="
+                    + tags
+                    + '}';
+        }
     }
 
-    @Override
-    public String toString() {
-      return "DistributionSeriesPoint{"
-          + "metricName='"
-          + metricName
-          + '\''
-          + ", common="
-          + common
-          + ", namespace='"
-          + namespace
-          + '\''
-          + ", value="
-          + value
-          + ", tags="
-          + tags
-          + '}';
+    class DistributionSeriesPoint {
+        public final String metricName;
+        public final boolean common;
+        public final String namespace;
+        public final int value;
+        public final List<String> tags;
+
+        public DistributionSeriesPoint(
+                String metricName, boolean common, String namespace, int value, List<String> tags) {
+            this.metricName = metricName;
+            this.common = common;
+            this.namespace = namespace;
+            this.value = value;
+            this.tags = tags;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            DistributionSeriesPoint that = (DistributionSeriesPoint) o;
+            return common == that.common
+                    && Objects.equals(metricName, that.metricName)
+                    && Objects.equals(namespace, that.namespace)
+                    && Objects.equals(tags, that.tags);
+        }
+
+        @Override
+        public int hashCode() {
+            return HashingUtils.hash(metricName, common, namespace, tags);
+        }
+
+        @Override
+        public String toString() {
+            return "DistributionSeriesPoint{"
+                    + "metricName='"
+                    + metricName
+                    + '\''
+                    + ", common="
+                    + common
+                    + ", namespace='"
+                    + namespace
+                    + '\''
+                    + ", value="
+                    + value
+                    + ", tags="
+                    + tags
+                    + '}';
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/OtelEnvMetricCollectorImpl.java b/internal-api/src/main/java/datadog/trace/api/telemetry/OtelEnvMetricCollectorImpl.java
index 5f01d884a65..61baa8e61a3 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/OtelEnvMetricCollectorImpl.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/OtelEnvMetricCollectorImpl.java
@@ -10,80 +10,69 @@
 import org.slf4j.LoggerFactory;
 
 public class OtelEnvMetricCollectorImpl
-    implements MetricCollector<OtelEnvMetricCollectorImpl.OtelEnvMetric>, OtelEnvMetricCollector {
-  private static final Logger log = LoggerFactory.getLogger(OtelEnvMetricCollectorImpl.class);
-  private static final String OTEL_ENV_HIDING_METRIC_NAME = "otel.env.hiding";
-  private static final String OTEL_ENV_INVALID_METRIC_NAME = "otel.env.invalid";
-  private static final String OTEL_ENV_UNSUPPORTED_METRIC_NAME = "otel.env.unsupported";
-  private static final String CONFIG_OTEL_KEY_TAG = "config_opentelemetry:";
-  private static final String CONFIG_DATADOG_KEY_TAG = "config_datadog:";
-  private static final String NAMESPACE = "tracers";
-  private static final OtelEnvMetricCollectorImpl INSTANCE = new OtelEnvMetricCollectorImpl();
+        implements MetricCollector<OtelEnvMetricCollectorImpl.OtelEnvMetric>, OtelEnvMetricCollector {
+    private static final Logger log = LoggerFactory.getLogger(OtelEnvMetricCollectorImpl.class);
+    private static final String OTEL_ENV_HIDING_METRIC_NAME = "otel.env.hiding";
+    private static final String OTEL_ENV_INVALID_METRIC_NAME = "otel.env.invalid";
+    private static final String OTEL_ENV_UNSUPPORTED_METRIC_NAME = "otel.env.unsupported";
+    private static final String CONFIG_OTEL_KEY_TAG = "config_opentelemetry:";
+    private static final String CONFIG_DATADOG_KEY_TAG = "config_datadog:";
+    private static final String NAMESPACE = "tracers";
+    private static final OtelEnvMetricCollectorImpl INSTANCE = new OtelEnvMetricCollectorImpl();
 
-  private final BlockingQueue<OtelEnvMetricCollectorImpl.OtelEnvMetric> metricsQueue;
+    private final BlockingQueue<OtelEnvMetricCollectorImpl.OtelEnvMetric> metricsQueue;
 
-  private OtelEnvMetricCollectorImpl() {
-    this.metricsQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
-  }
+    private OtelEnvMetricCollectorImpl() {
+        this.metricsQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
+    }
 
-  public static OtelEnvMetricCollectorImpl getInstance() {
-    return INSTANCE;
-  }
+    public static OtelEnvMetricCollectorImpl getInstance() {
+        return INSTANCE;
+    }
 
-  @Override
-  public void setHidingOtelEnvVarMetric(String otelName, String ddName) {
-    setMetricOtelEnvVarMetric(
-        OTEL_ENV_HIDING_METRIC_NAME,
-        CONFIG_OTEL_KEY_TAG + otelName,
-        CONFIG_DATADOG_KEY_TAG + ddName);
-  }
+    @Override
+    public void setHidingOtelEnvVarMetric(String otelName, String ddName) {
+        setMetricOtelEnvVarMetric(
+                OTEL_ENV_HIDING_METRIC_NAME, CONFIG_OTEL_KEY_TAG + otelName, CONFIG_DATADOG_KEY_TAG + ddName);
+    }
 
-  @Override
-  public void setInvalidOtelEnvVarMetric(String otelName, String ddName) {
-    setMetricOtelEnvVarMetric(
-        OTEL_ENV_INVALID_METRIC_NAME,
-        CONFIG_OTEL_KEY_TAG + otelName,
-        CONFIG_DATADOG_KEY_TAG + ddName);
-  }
+    @Override
+    public void setInvalidOtelEnvVarMetric(String otelName, String ddName) {
+        setMetricOtelEnvVarMetric(
+                OTEL_ENV_INVALID_METRIC_NAME, CONFIG_OTEL_KEY_TAG + otelName, CONFIG_DATADOG_KEY_TAG + ddName);
+    }
 
-  @Override
-  public void setUnsupportedOtelEnvVarMetric(String otelName) {
-    setMetricOtelEnvVarMetric(OTEL_ENV_UNSUPPORTED_METRIC_NAME, CONFIG_OTEL_KEY_TAG + otelName);
-  }
+    @Override
+    public void setUnsupportedOtelEnvVarMetric(String otelName) {
+        setMetricOtelEnvVarMetric(OTEL_ENV_UNSUPPORTED_METRIC_NAME, CONFIG_OTEL_KEY_TAG + otelName);
+    }
 
-  private void setMetricOtelEnvVarMetric(String metricName, final String... tags) {
-    if (!metricsQueue.offer(
-        new OtelEnvMetricCollectorImpl.OtelEnvMetric(
-            NAMESPACE, true, metricName, "count", 1, tags))) {
-      log.debug("Unable to add telemetry metric {} for {}", metricName, tags[0]);
+    private void setMetricOtelEnvVarMetric(String metricName, final String... tags) {
+        if (!metricsQueue.offer(
+                new OtelEnvMetricCollectorImpl.OtelEnvMetric(NAMESPACE, true, metricName, "count", 1, tags))) {
+            log.debug("Unable to add telemetry metric {} for {}", metricName, tags[0]);
+        }
     }
-  }
 
-  @Override
-  public void prepareMetrics() {
-    // Nothing to do here
-  }
+    @Override
+    public void prepareMetrics() {
+        // Nothing to do here
+    }
 
-  @Override
-  public Collection<OtelEnvMetricCollectorImpl.OtelEnvMetric> drain() {
-    if (this.metricsQueue.isEmpty()) {
-      return Collections.emptyList();
+    @Override
+    public Collection<OtelEnvMetricCollectorImpl.OtelEnvMetric> drain() {
+        if (this.metricsQueue.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<OtelEnvMetricCollectorImpl.OtelEnvMetric> drained = new ArrayList<>(this.metricsQueue.size());
+        this.metricsQueue.drainTo(drained);
+        return drained;
     }
-    List<OtelEnvMetricCollectorImpl.OtelEnvMetric> drained =
-        new ArrayList<>(this.metricsQueue.size());
-    this.metricsQueue.drainTo(drained);
-    return drained;
-  }
 
-  public static class OtelEnvMetric extends MetricCollector.Metric {
-    public OtelEnvMetric(
-        String namespace,
-        boolean common,
-        String metricName,
-        String type,
-        Number value,
-        final String... tags) {
-      super(namespace, common, metricName, type, value, tags);
+    public static class OtelEnvMetric extends MetricCollector.Metric {
+        public OtelEnvMetric(
+                String namespace, boolean common, String metricName, String type, Number value, final String... tags) {
+            super(namespace, common, metricName, type, value, tags);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/OtelSpiCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/OtelSpiCollector.java
index 375b17b6893..563e25524f5 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/OtelSpiCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/OtelSpiCollector.java
@@ -11,65 +11,59 @@
 
 /** Collects telemetry about OpenTelemetry SPIs detected in the customer environment. */
 public class OtelSpiCollector implements MetricCollector<OtelSpiCollector.OtelSpiMetric> {
-  private static final Logger log = LoggerFactory.getLogger(OtelSpiCollector.class);
-  private static final String OTEL_SPI_DETECTED_METRIC_NAME = "otel.spi.detected";
-  private static final String SPI_CLASS_TAG = "spi_class:";
-  private static final String SOURCE_TAG = "source:";
-  private static final String NAMESPACE = "tracers";
-  private static final OtelSpiCollector INSTANCE = new OtelSpiCollector();
+    private static final Logger log = LoggerFactory.getLogger(OtelSpiCollector.class);
+    private static final String OTEL_SPI_DETECTED_METRIC_NAME = "otel.spi.detected";
+    private static final String SPI_CLASS_TAG = "spi_class:";
+    private static final String SOURCE_TAG = "source:";
+    private static final String NAMESPACE = "tracers";
+    private static final OtelSpiCollector INSTANCE = new OtelSpiCollector();
 
-  private final BlockingQueue<OtelSpiMetric> metricsQueue;
+    private final BlockingQueue<OtelSpiMetric> metricsQueue;
 
-  private OtelSpiCollector() {
-    this.metricsQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
-  }
+    private OtelSpiCollector() {
+        this.metricsQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
+    }
 
-  public static OtelSpiCollector getInstance() {
-    return INSTANCE;
-  }
+    public static OtelSpiCollector getInstance() {
+        return INSTANCE;
+    }
 
-  public void recordSpiDetected(String spiFqn, String source) {
-    if (!metricsQueue.offer(
-        new OtelSpiMetric(
-            NAMESPACE,
-            true,
-            OTEL_SPI_DETECTED_METRIC_NAME,
-            "count",
-            1,
-            SPI_CLASS_TAG + spiFqn,
-            SOURCE_TAG + source))) {
-      log.debug(
-          "Unable to add telemetry metric {} for spi_class={} source={}",
-          OTEL_SPI_DETECTED_METRIC_NAME,
-          spiFqn,
-          source);
+    public void recordSpiDetected(String spiFqn, String source) {
+        if (!metricsQueue.offer(new OtelSpiMetric(
+                NAMESPACE,
+                true,
+                OTEL_SPI_DETECTED_METRIC_NAME,
+                "count",
+                1,
+                SPI_CLASS_TAG + spiFqn,
+                SOURCE_TAG + source))) {
+            log.debug(
+                    "Unable to add telemetry metric {} for spi_class={} source={}",
+                    OTEL_SPI_DETECTED_METRIC_NAME,
+                    spiFqn,
+                    source);
+        }
     }
-  }
 
-  @Override
-  public void prepareMetrics() {
-    // Nothing to do here
-  }
+    @Override
+    public void prepareMetrics() {
+        // Nothing to do here
+    }
 
-  @Override
-  public Collection<OtelSpiMetric> drain() {
-    if (this.metricsQueue.isEmpty()) {
-      return Collections.emptyList();
+    @Override
+    public Collection<OtelSpiMetric> drain() {
+        if (this.metricsQueue.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<OtelSpiMetric> drained = new ArrayList<>(this.metricsQueue.size());
+        this.metricsQueue.drainTo(drained);
+        return drained;
     }
-    List<OtelSpiMetric> drained = new ArrayList<>(this.metricsQueue.size());
-    this.metricsQueue.drainTo(drained);
-    return drained;
-  }
 
-  public static class OtelSpiMetric extends MetricCollector.Metric {
-    public OtelSpiMetric(
-        String namespace,
-        boolean common,
-        String metricName,
-        String type,
-        Number value,
-        final String... tags) {
-      super(namespace, common, metricName, type, value, tags);
+    public static class OtelSpiMetric extends MetricCollector.Metric {
+        public OtelSpiMetric(
+                String namespace, boolean common, String metricName, String type, Number value, final String... tags) {
+            super(namespace, common, metricName, type, value, tags);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/OtlpTelemetry.java b/internal-api/src/main/java/datadog/trace/api/telemetry/OtlpTelemetry.java
index a36bcff67c8..57e69d6ab4b 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/OtlpTelemetry.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/OtlpTelemetry.java
@@ -12,112 +12,112 @@
 
 /** Collects telemetry metrics for the OTLP trace, metrics, and log exporters. */
 public class OtlpTelemetry implements MetricCollector<OtlpTelemetry.OtlpMetric> {
-  private static final String NAMESPACE = "tracers";
+    private static final String NAMESPACE = "tracers";
 
-  private static final OtlpTelemetry INSTANCE = new OtlpTelemetry();
+    private static final OtlpTelemetry INSTANCE = new OtlpTelemetry();
 
-  public static OtlpTelemetry getInstance() {
-    return INSTANCE;
-  }
-
-  private final String[] tracesTags = tagsFor(Config.get().getOtlpTracesProtocol());
-  private final String[] metricsTags = tagsFor(Config.get().getOtlpMetricsProtocol());
-  private final String[] logsTags = tagsFor(Config.get().getOtlpLogsProtocol());
-
-  private final ExportCounters tracesExport = new ExportCounters("traces");
-  private final ExportCounters metricsExport = new ExportCounters("metrics");
-  private final LongAdder logRecords = new LongAdder();
+    public static OtlpTelemetry getInstance() {
+        return INSTANCE;
+    }
 
-  private final BlockingQueue<OtlpMetric> telemetryQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
+    private final String[] tracesTags = tagsFor(Config.get().getOtlpTracesProtocol());
+    private final String[] metricsTags = tagsFor(Config.get().getOtlpMetricsProtocol());
+    private final String[] logsTags = tagsFor(Config.get().getOtlpLogsProtocol());
 
-  private OtlpTelemetry() {}
+    private final ExportCounters tracesExport = new ExportCounters("traces");
+    private final ExportCounters metricsExport = new ExportCounters("metrics");
+    private final LongAdder logRecords = new LongAdder();
 
-  public void onTracesExportAttempt() {
-    tracesExport.attempts.increment();
-  }
+    private final BlockingQueue<OtlpMetric> telemetryQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
 
-  public void onTracesExportComplete(boolean success) {
-    tracesExport.complete(success);
-  }
+    private OtlpTelemetry() {}
 
-  public void onMetricsExportAttempt() {
-    metricsExport.attempts.increment();
-  }
+    public void onTracesExportAttempt() {
+        tracesExport.attempts.increment();
+    }
 
-  public void onMetricsExportComplete(boolean success) {
-    metricsExport.complete(success);
-  }
+    public void onTracesExportComplete(boolean success) {
+        tracesExport.complete(success);
+    }
 
-  public void onLogRecordsSubmitted(long count) {
-    if (count > 0) {
-      logRecords.add(count);
+    public void onMetricsExportAttempt() {
+        metricsExport.attempts.increment();
     }
-  }
-
-  private static String[] tagsFor(OtlpConfig.Protocol protocol) {
-    String protocolTag = protocol == OtlpConfig.Protocol.GRPC ? "grpc" : "http";
-    String encodingTag = protocol == OtlpConfig.Protocol.HTTP_JSON ? "json" : "protobuf";
-    return new String[] {"protocol:" + protocolTag, "encoding:" + encodingTag};
-  }
-
-  @Override
-  public void prepareMetrics() {
-    tracesExport.stageInto(telemetryQueue, tracesTags);
-    metricsExport.stageInto(telemetryQueue, metricsTags);
-    long logRecordCount = logRecords.sumThenReset();
-    if (logRecordCount > 0) {
-      telemetryQueue.offer(new OtlpMetric("otel.log_records", logRecordCount, logsTags));
+
+    public void onMetricsExportComplete(boolean success) {
+        metricsExport.complete(success);
     }
-  }
 
-  @Override
-  public Collection<OtlpMetric> drain() {
-    if (telemetryQueue.isEmpty()) {
-      return Collections.emptyList();
+    public void onLogRecordsSubmitted(long count) {
+        if (count > 0) {
+            logRecords.add(count);
+        }
     }
-    List<OtlpMetric> drained = new ArrayList<>(telemetryQueue.size());
-    telemetryQueue.drainTo(drained);
-    return drained;
-  }
-
-  /** Counters for a single signal's export attempts/successes/failures. */
-  private static final class ExportCounters {
-    final String attemptsMetric;
-    final String successesMetric;
-    final String failuresMetric;
-
-    final LongAdder attempts = new LongAdder();
-    final LongAdder successes = new LongAdder();
-    final LongAdder failures = new LongAdder();
-
-    ExportCounters(String signal) {
-      this.attemptsMetric = "otel." + signal + "_export_attempts";
-      this.successesMetric = "otel." + signal + "_export_successes";
-      this.failuresMetric = "otel." + signal + "_export_failures";
+
+    private static String[] tagsFor(OtlpConfig.Protocol protocol) {
+        String protocolTag = protocol == OtlpConfig.Protocol.GRPC ? "grpc" : "http";
+        String encodingTag = protocol == OtlpConfig.Protocol.HTTP_JSON ? "json" : "protobuf";
+        return new String[] {"protocol:" + protocolTag, "encoding:" + encodingTag};
     }
 
-    void complete(boolean success) {
-      (success ? successes : failures).increment();
+    @Override
+    public void prepareMetrics() {
+        tracesExport.stageInto(telemetryQueue, tracesTags);
+        metricsExport.stageInto(telemetryQueue, metricsTags);
+        long logRecordCount = logRecords.sumThenReset();
+        if (logRecordCount > 0) {
+            telemetryQueue.offer(new OtlpMetric("otel.log_records", logRecordCount, logsTags));
+        }
     }
 
-    void stageInto(BlockingQueue<OtlpMetric> out, String[] tags) {
-      addIfNonZero(out, attemptsMetric, attempts, tags);
-      addIfNonZero(out, successesMetric, successes, tags);
-      addIfNonZero(out, failuresMetric, failures, tags);
+    @Override
+    public Collection<OtlpMetric> drain() {
+        if (telemetryQueue.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<OtlpMetric> drained = new ArrayList<>(telemetryQueue.size());
+        telemetryQueue.drainTo(drained);
+        return drained;
     }
 
-    private static void addIfNonZero(
-        BlockingQueue<OtlpMetric> out, String metricName, LongAdder counter, String[] tags) {
-      long value = counter.sumThenReset();
-      if (value > 0) {
-        out.offer(new OtlpMetric(metricName, value, tags));
-      }
+    /** Counters for a single signal's export attempts/successes/failures. */
+    private static final class ExportCounters {
+        final String attemptsMetric;
+        final String successesMetric;
+        final String failuresMetric;
+
+        final LongAdder attempts = new LongAdder();
+        final LongAdder successes = new LongAdder();
+        final LongAdder failures = new LongAdder();
+
+        ExportCounters(String signal) {
+            this.attemptsMetric = "otel." + signal + "_export_attempts";
+            this.successesMetric = "otel." + signal + "_export_successes";
+            this.failuresMetric = "otel." + signal + "_export_failures";
+        }
+
+        void complete(boolean success) {
+            (success ? successes : failures).increment();
+        }
+
+        void stageInto(BlockingQueue<OtlpMetric> out, String[] tags) {
+            addIfNonZero(out, attemptsMetric, attempts, tags);
+            addIfNonZero(out, successesMetric, successes, tags);
+            addIfNonZero(out, failuresMetric, failures, tags);
+        }
+
+        private static void addIfNonZero(
+                BlockingQueue<OtlpMetric> out, String metricName, LongAdder counter, String[] tags) {
+            long value = counter.sumThenReset();
+            if (value > 0) {
+                out.offer(new OtlpMetric(metricName, value, tags));
+            }
+        }
     }
-  }
 
-  public static class OtlpMetric extends MetricCollector.Metric {
-    public OtlpMetric(String metricName, long value, String... tags) {
-      super(NAMESPACE, true, metricName, "count", value, tags);
+    public static class OtlpMetric extends MetricCollector.Metric {
+        public OtlpMetric(String metricName, long value, String... tags) {
+            super(NAMESPACE, true, metricName, "count", value, tags);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/ProductChange.java b/internal-api/src/main/java/datadog/trace/api/telemetry/ProductChange.java
index 0ef85a8b3c1..70fe6acea97 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/ProductChange.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/ProductChange.java
@@ -2,40 +2,40 @@
 
 public class ProductChange {
 
-  private ProductType productType;
-  private boolean enabled;
+    private ProductType productType;
+    private boolean enabled;
 
-  public ProductType getProductType() {
-    return productType;
-  }
+    public ProductType getProductType() {
+        return productType;
+    }
 
-  public boolean isEnabled() {
-    return enabled;
-  }
+    public boolean isEnabled() {
+        return enabled;
+    }
 
-  public ProductChange productType(ProductType productType) {
-    this.productType = productType;
-    return this;
-  }
+    public ProductChange productType(ProductType productType) {
+        this.productType = productType;
+        return this;
+    }
 
-  public ProductChange enabled(boolean enabled) {
-    this.enabled = enabled;
-    return this;
-  }
+    public ProductChange enabled(boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
 
-  public enum ProductType {
-    APPSEC("appsec"),
-    PROFILER("profiler"),
-    DYNAMIC_INSTRUMENTATION("dynamic_instrumentation");
+    public enum ProductType {
+        APPSEC("appsec"),
+        PROFILER("profiler"),
+        DYNAMIC_INSTRUMENTATION("dynamic_instrumentation");
 
-    private final String name;
+        private final String name;
 
-    ProductType(String name) {
-      this.name = name;
-    }
+        ProductType(String name) {
+            this.name = name;
+        }
 
-    public String getName() {
-      return name;
+        public String getName() {
+            return name;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/ProductChangeCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/ProductChangeCollector.java
index a3e38d25723..b958e54db43 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/ProductChangeCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/ProductChangeCollector.java
@@ -9,39 +9,39 @@
 
 public class ProductChangeCollector {
 
-  private static final ProductChangeCollector INSTANCE = new ProductChangeCollector();
-  private final Queue<ProductChange> productChanges = new LinkedBlockingQueue<>();
-
-  private ProductChangeCollector() {}
-
-  public static ProductChangeCollector get() {
-    return INSTANCE;
-  }
-
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_METHOD_SYNCHRONIZATION",
-      justification =
-          "All production callers are agent-owned and do not synchronize on this monitor; locking prevents updates from interleaving with draining.")
-  public synchronized void update(final ProductChange productChange) {
-    productChanges.offer(productChange);
-  }
-
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_METHOD_SYNCHRONIZATION",
-      justification =
-          "All production callers are agent-owned and do not synchronize on this monitor; locking prevents updates from interleaving with draining.")
-  public synchronized List<ProductChange> drain() {
-    if (productChanges.isEmpty()) {
-      return Collections.emptyList();
-    }
+    private static final ProductChangeCollector INSTANCE = new ProductChangeCollector();
+    private final Queue<ProductChange> productChanges = new LinkedBlockingQueue<>();
+
+    private ProductChangeCollector() {}
 
-    List<ProductChange> list = new LinkedList<>();
+    public static ProductChangeCollector get() {
+        return INSTANCE;
+    }
 
-    ProductChange productChange;
-    while ((productChange = productChanges.poll()) != null) {
-      list.add(productChange);
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_METHOD_SYNCHRONIZATION",
+            justification =
+                    "All production callers are agent-owned and do not synchronize on this monitor; locking prevents updates from interleaving with draining.")
+    public synchronized void update(final ProductChange productChange) {
+        productChanges.offer(productChange);
     }
 
-    return list;
-  }
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_METHOD_SYNCHRONIZATION",
+            justification =
+                    "All production callers are agent-owned and do not synchronize on this monitor; locking prevents updates from interleaving with draining.")
+    public synchronized List<ProductChange> drain() {
+        if (productChanges.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        List<ProductChange> list = new LinkedList<>();
+
+        ProductChange productChange;
+        while ((productChange = productChanges.poll()) != null) {
+            list.add(productChange);
+        }
+
+        return list;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/RuleType.java b/internal-api/src/main/java/datadog/trace/api/telemetry/RuleType.java
index 4ae4e7d4a9d..78aea87da18 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/RuleType.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/RuleType.java
@@ -3,63 +3,66 @@
 import javax.annotation.Nullable;
 
 public enum RuleType {
-  LFI(Type.LFI),
-  SQL_INJECTION(Type.SQL_INJECTION),
-  SSRF_REQUEST(Type.SSRF, Variant.REQUEST),
-  SSRF_RESPONSE(Type.SSRF, Variant.RESPONSE),
-  SHELL_INJECTION(Type.COMMAND_INJECTION, Variant.SHELL),
-  COMMAND_INJECTION(Type.COMMAND_INJECTION, Variant.EXEC);
-
-  public final Type type;
-  @Nullable public final Variant variant;
-  private static final int numValues = RuleType.values().length;
-
-  RuleType(Type type) {
-    this(type, null);
-  }
-
-  RuleType(Type type, @Nullable Variant variant) {
-    this.type = type;
-    this.variant = variant;
-  }
-
-  public static int getNumValues() {
-    return numValues;
-  }
-
-  public enum Type {
-    LFI("lfi"),
-    SQL_INJECTION("sql_injection"),
-    SSRF("ssrf"),
-    COMMAND_INJECTION("command_injection");
-
-    public final String name;
-
-    Type(String name) {
-      this.name = name;
+    LFI(Type.LFI),
+    SQL_INJECTION(Type.SQL_INJECTION),
+    SSRF_REQUEST(Type.SSRF, Variant.REQUEST),
+    SSRF_RESPONSE(Type.SSRF, Variant.RESPONSE),
+    SHELL_INJECTION(Type.COMMAND_INJECTION, Variant.SHELL),
+    COMMAND_INJECTION(Type.COMMAND_INJECTION, Variant.EXEC);
+
+    public final Type type;
+
+    @Nullable
+    public final Variant variant;
+
+    private static final int numValues = RuleType.values().length;
+
+    RuleType(Type type) {
+        this(type, null);
+    }
+
+    RuleType(Type type, @Nullable Variant variant) {
+        this.type = type;
+        this.variant = variant;
     }
 
-    @Override
-    public String toString() {
-      return name;
+    public static int getNumValues() {
+        return numValues;
     }
-  }
 
-  public enum Variant {
-    SHELL("shell"),
-    EXEC("exec"),
-    REQUEST("request"),
-    RESPONSE("response");
+    public enum Type {
+        LFI("lfi"),
+        SQL_INJECTION("sql_injection"),
+        SSRF("ssrf"),
+        COMMAND_INJECTION("command_injection");
+
+        public final String name;
 
-    public final String name;
+        Type(String name) {
+            this.name = name;
+        }
 
-    Variant(String name) {
-      this.name = name;
+        @Override
+        public String toString() {
+            return name;
+        }
     }
 
-    @Override
-    public String toString() {
-      return name;
+    public enum Variant {
+        SHELL("shell"),
+        EXEC("exec"),
+        REQUEST("request"),
+        RESPONSE("response");
+
+        public final String name;
+
+        Variant(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/ScaReachabilityDependencyRegistry.java b/internal-api/src/main/java/datadog/trace/api/telemetry/ScaReachabilityDependencyRegistry.java
index 316e1bce922..cdba90f3887 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/ScaReachabilityDependencyRegistry.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/ScaReachabilityDependencyRegistry.java
@@ -30,219 +30,217 @@
  */
 public final class ScaReachabilityDependencyRegistry {
 
-  private static final Logger log =
-      LoggerFactory.getLogger(ScaReachabilityDependencyRegistry.class);
-
-  public static final ScaReachabilityDependencyRegistry INSTANCE =
-      new ScaReachabilityDependencyRegistry();
-
-  private final int maxTrackedDependencies = Config.get().getAppSecScaMaxTrackedDependencies();
-  private final AtomicBoolean capWarningLogged = new AtomicBoolean(false);
-
-  /** Keyed by {@link #depKey(String, String)}. */
-  private final ConcurrentHashMap<String, DependencyState> dependencies = new ConcurrentHashMap<>();
-
-  public static String depKey(String artifact, String version) {
-    return artifact + "@" + version;
-  }
-
-  /**
-   * Optional periodic work hook for retransformation of pending method-level classes. Registered by
-   * {@code ScaReachabilitySystem}, called by {@code ScaReachabilityPeriodicAction}.
-   */
-  private volatile Runnable periodicWorkCallback;
-
-  public void setPeriodicWorkCallback(Runnable callback) {
-    periodicWorkCallback = callback;
-  }
-
-  public Runnable getPeriodicWorkCallback() {
-    return periodicWorkCallback;
-  }
-
-  /** Clears all state. Used in tests to reset between test cases. */
-  @VisibleForTesting
-  public void resetForTesting() {
-    dependencies.clear();
-    capWarningLogged.set(false);
-    periodicWorkCallback = null;
-  }
-
-  private ScaReachabilityDependencyRegistry() {}
-
-  /**
-   * Registers a CVE for a dependency when a class from a vulnerable version is loaded. Creates a
-   * new entry with {@code reached=[]} if not already present. Marks the dependency as pending so
-   * the next heartbeat reports it (signalling that SCA is monitoring this CVE).
-   *
-   * <p>Called by {@code ScaReachabilityTransformer} on class load (class-level symbols) and before
-   * bytecode injection (method-level symbols).
-   */
-  public void registerCve(String artifact, String version, String vulnId) {
-    String key = depKey(artifact, version);
-    if (isCapExceeded(key)) return;
-    DependencyState dep =
-        dependencies.computeIfAbsent(key, k -> new DependencyState(artifact, version));
-    dep.registerCve(vulnId);
-  }
-
-  /**
-   * Records the first callsite that triggered a vulnerable method. Only the first hit per CVE is
-   * stored (RFC: "reporting a single occurrence is sufficient"). Marks the dependency as pending.
-   *
-   * <p>Called by {@code ScaReachabilitySystem} handler when injected bytecode fires.
-   */
-  public void recordHit(
-      String artifact,
-      String version,
-      String vulnId,
-      String callsiteClass,
-      String callsiteSymbol,
-      int callsiteLine) {
-    String key = depKey(artifact, version);
-    if (isCapExceeded(key)) return;
-    dependencies
-        .computeIfAbsent(key, k -> new DependencyState(artifact, version))
-        .recordHit(vulnId, callsiteClass, callsiteSymbol, callsiteLine);
-  }
-
-  private boolean isCapExceeded(String key) {
-    if (!dependencies.containsKey(key) && dependencies.size() >= maxTrackedDependencies) {
-      if (capWarningLogged.compareAndSet(false, true)) {
-        log.warn(
-            "SCA Reachability: dependency tracking cap ({}) reached, further dependencies will not be tracked. Increase DD_APPSEC_SCA_MAX_TRACKED_DEPENDENCIES to raise the limit.",
-            maxTrackedDependencies);
-      }
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * Returns the current CVE snapshot for a dependency without clearing the pending flag. Used by
-   * {@code ScaReachabilityPeriodicAction} when a newly-resolved JAR is not in {@code snapshotByKey}
-   * (i.e., the CVE was drained in a prior heartbeat but DependencyService resolved the JAR only
-   * now). Without this peek the emission would carry {@code metadata:[]} and overwrite the CVE
-   * state already reported.
-   *
-   * <p>Returns {@code null} if the dependency has no CVE state.
-   */
-  public DependencySnapshot peekSnapshot(String artifact, String version) {
-    DependencyState dep = dependencies.get(depKey(artifact, version));
-    if (dep == null || dep.cves.isEmpty()) {
-      return null;
-    }
-    List<CveSnapshot> cveSnapshots = new ArrayList<>(dep.cves.size());
-    for (Map.Entry<String, CveState> entry : dep.cves.entrySet()) {
-      cveSnapshots.add(new CveSnapshot(entry.getKey(), entry.getValue().hitRef.get()));
-    }
-    return new DependencySnapshot(artifact, version, Collections.unmodifiableList(cveSnapshots));
-  }
-
-  /**
-   * Returns a snapshot of all dependencies that have pending changes since the last drain, then
-   * clears the pending flag. Called by {@code ScaReachabilityPeriodicAction} on each heartbeat.
-   *
-   * <p>Each returned {@link DependencySnapshot} contains ALL CVEs for that dependency (both with
-   * and without callsite hits), as required by the RFC stateful model.
-   */
-  public List<DependencySnapshot> drainPendingDependencies() {
-    List<DependencySnapshot> result = new ArrayList<>();
-    for (DependencyState dep : dependencies.values()) {
-      DependencySnapshot snapshot = dep.drainIfPending();
-      if (snapshot != null) {
-        result.add(snapshot);
-      }
+    private static final Logger log = LoggerFactory.getLogger(ScaReachabilityDependencyRegistry.class);
+
+    public static final ScaReachabilityDependencyRegistry INSTANCE = new ScaReachabilityDependencyRegistry();
+
+    private final int maxTrackedDependencies = Config.get().getAppSecScaMaxTrackedDependencies();
+    private final AtomicBoolean capWarningLogged = new AtomicBoolean(false);
+
+    /** Keyed by {@link #depKey(String, String)}. */
+    private final ConcurrentHashMap<String, DependencyState> dependencies = new ConcurrentHashMap<>();
+
+    public static String depKey(String artifact, String version) {
+        return artifact + "@" + version;
     }
-    return result;
-  }
 
-  // ---------------------------------------------------------------------------
-  // Internal state classes
-  // ---------------------------------------------------------------------------
+    /**
+     * Optional periodic work hook for retransformation of pending method-level classes. Registered by
+     * {@code ScaReachabilitySystem}, called by {@code ScaReachabilityPeriodicAction}.
+     */
+    private volatile Runnable periodicWorkCallback;
+
+    public void setPeriodicWorkCallback(Runnable callback) {
+        periodicWorkCallback = callback;
+    }
 
-  /** Mutable state for one (artifact, version) dependency. Thread-safe. */
-  public static final class DependencyState {
-    public final String artifact;
-    public final String version;
+    public Runnable getPeriodicWorkCallback() {
+        return periodicWorkCallback;
+    }
 
-    /** CVE ID → first callsite hit, or {@code null} if not yet reached. */
-    private final ConcurrentHashMap<String, CveState> cves = new ConcurrentHashMap<>();
+    /** Clears all state. Used in tests to reset between test cases. */
+    @VisibleForTesting
+    public void resetForTesting() {
+        dependencies.clear();
+        capWarningLogged.set(false);
+        periodicWorkCallback = null;
+    }
 
-    private volatile boolean pendingReport = false;
+    private ScaReachabilityDependencyRegistry() {}
 
-    DependencyState(String artifact, String version) {
-      this.artifact = artifact;
-      this.version = version;
+    /**
+     * Registers a CVE for a dependency when a class from a vulnerable version is loaded. Creates a
+     * new entry with {@code reached=[]} if not already present. Marks the dependency as pending so
+     * the next heartbeat reports it (signalling that SCA is monitoring this CVE).
+     *
+     * <p>Called by {@code ScaReachabilityTransformer} on class load (class-level symbols) and before
+     * bytecode injection (method-level symbols).
+     */
+    public void registerCve(String artifact, String version, String vulnId) {
+        String key = depKey(artifact, version);
+        if (isCapExceeded(key)) return;
+        DependencyState dep = dependencies.computeIfAbsent(key, k -> new DependencyState(artifact, version));
+        dep.registerCve(vulnId);
     }
 
-    void registerCve(String vulnId) {
-      cves.computeIfAbsent(vulnId, k -> new CveState());
-      pendingReport = true;
+    /**
+     * Records the first callsite that triggered a vulnerable method. Only the first hit per CVE is
+     * stored (RFC: "reporting a single occurrence is sufficient"). Marks the dependency as pending.
+     *
+     * <p>Called by {@code ScaReachabilitySystem} handler when injected bytecode fires.
+     */
+    public void recordHit(
+            String artifact,
+            String version,
+            String vulnId,
+            String callsiteClass,
+            String callsiteSymbol,
+            int callsiteLine) {
+        String key = depKey(artifact, version);
+        if (isCapExceeded(key)) return;
+        dependencies
+                .computeIfAbsent(key, k -> new DependencyState(artifact, version))
+                .recordHit(vulnId, callsiteClass, callsiteSymbol, callsiteLine);
     }
 
-    void recordHit(String vulnId, String callsiteClass, String callsiteSymbol, int callsiteLine) {
-      CveState state = cves.computeIfAbsent(vulnId, k -> new CveState());
-      // compareAndSet guarantees exactly one callsite is stored (first hit wins).
-      // A plain volatile check-then-assign would allow two threads racing on different
-      // methods of the same CVE to both see null and both write, violating the invariant.
-      ScaReachabilityHit newHit =
-          new ScaReachabilityHit(
-              vulnId, artifact, version, callsiteClass, callsiteSymbol, callsiteLine);
-      if (state.hitRef.compareAndSet(null, newHit)) {
-        pendingReport = true;
-      }
+    private boolean isCapExceeded(String key) {
+        if (!dependencies.containsKey(key) && dependencies.size() >= maxTrackedDependencies) {
+            if (capWarningLogged.compareAndSet(false, true)) {
+                log.warn(
+                        "SCA Reachability: dependency tracking cap ({}) reached, further dependencies will not be tracked. Increase DD_APPSEC_SCA_MAX_TRACKED_DEPENDENCIES to raise the limit.",
+                        maxTrackedDependencies);
+            }
+            return true;
+        }
+        return false;
     }
 
     /**
-     * Returns a snapshot if pending, then clears the pending flag. Returns null if nothing to
-     * report.
+     * Returns the current CVE snapshot for a dependency without clearing the pending flag. Used by
+     * {@code ScaReachabilityPeriodicAction} when a newly-resolved JAR is not in {@code snapshotByKey}
+     * (i.e., the CVE was drained in a prior heartbeat but DependencyService resolved the JAR only
+     * now). Without this peek the emission would carry {@code metadata:[]} and overwrite the CVE
+     * state already reported.
+     *
+     * <p>Returns {@code null} if the dependency has no CVE state.
      */
-    DependencySnapshot drainIfPending() {
-      if (!pendingReport) {
-        return null;
-      }
-      pendingReport = false;
-      List<CveSnapshot> cveSnapshots = new ArrayList<>(cves.size());
-      for (Map.Entry<String, CveState> entry : cves.entrySet()) {
-        cveSnapshots.add(new CveSnapshot(entry.getKey(), entry.getValue().hitRef.get()));
-      }
-      return new DependencySnapshot(artifact, version, Collections.unmodifiableList(cveSnapshots));
+    public DependencySnapshot peekSnapshot(String artifact, String version) {
+        DependencyState dep = dependencies.get(depKey(artifact, version));
+        if (dep == null || dep.cves.isEmpty()) {
+            return null;
+        }
+        List<CveSnapshot> cveSnapshots = new ArrayList<>(dep.cves.size());
+        for (Map.Entry<String, CveState> entry : dep.cves.entrySet()) {
+            cveSnapshots.add(
+                    new CveSnapshot(entry.getKey(), entry.getValue().hitRef.get()));
+        }
+        return new DependencySnapshot(artifact, version, Collections.unmodifiableList(cveSnapshots));
     }
-  }
 
-  /** Mutable state for one CVE within a dependency. */
-  static final class CveState {
     /**
-     * First callsite hit, or {@code null} if not yet reached. AtomicReference ensures compareAndSet
-     * atomicity so exactly one thread wins the "first hit" race.
+     * Returns a snapshot of all dependencies that have pending changes since the last drain, then
+     * clears the pending flag. Called by {@code ScaReachabilityPeriodicAction} on each heartbeat.
+     *
+     * <p>Each returned {@link DependencySnapshot} contains ALL CVEs for that dependency (both with
+     * and without callsite hits), as required by the RFC stateful model.
      */
-    final AtomicReference<ScaReachabilityHit> hitRef = new AtomicReference<>(null);
-  }
+    public List<DependencySnapshot> drainPendingDependencies() {
+        List<DependencySnapshot> result = new ArrayList<>();
+        for (DependencyState dep : dependencies.values()) {
+            DependencySnapshot snapshot = dep.drainIfPending();
+            if (snapshot != null) {
+                result.add(snapshot);
+            }
+        }
+        return result;
+    }
+
+    // ---------------------------------------------------------------------------
+    // Internal state classes
+    // ---------------------------------------------------------------------------
+
+    /** Mutable state for one (artifact, version) dependency. Thread-safe. */
+    public static final class DependencyState {
+        public final String artifact;
+        public final String version;
+
+        /** CVE ID → first callsite hit, or {@code null} if not yet reached. */
+        private final ConcurrentHashMap<String, CveState> cves = new ConcurrentHashMap<>();
+
+        private volatile boolean pendingReport = false;
+
+        DependencyState(String artifact, String version) {
+            this.artifact = artifact;
+            this.version = version;
+        }
+
+        void registerCve(String vulnId) {
+            cves.computeIfAbsent(vulnId, k -> new CveState());
+            pendingReport = true;
+        }
+
+        void recordHit(String vulnId, String callsiteClass, String callsiteSymbol, int callsiteLine) {
+            CveState state = cves.computeIfAbsent(vulnId, k -> new CveState());
+            // compareAndSet guarantees exactly one callsite is stored (first hit wins).
+            // A plain volatile check-then-assign would allow two threads racing on different
+            // methods of the same CVE to both see null and both write, violating the invariant.
+            ScaReachabilityHit newHit =
+                    new ScaReachabilityHit(vulnId, artifact, version, callsiteClass, callsiteSymbol, callsiteLine);
+            if (state.hitRef.compareAndSet(null, newHit)) {
+                pendingReport = true;
+            }
+        }
+
+        /**
+         * Returns a snapshot if pending, then clears the pending flag. Returns null if nothing to
+         * report.
+         */
+        DependencySnapshot drainIfPending() {
+            if (!pendingReport) {
+                return null;
+            }
+            pendingReport = false;
+            List<CveSnapshot> cveSnapshots = new ArrayList<>(cves.size());
+            for (Map.Entry<String, CveState> entry : cves.entrySet()) {
+                cveSnapshots.add(
+                        new CveSnapshot(entry.getKey(), entry.getValue().hitRef.get()));
+            }
+            return new DependencySnapshot(artifact, version, Collections.unmodifiableList(cveSnapshots));
+        }
+    }
+
+    /** Mutable state for one CVE within a dependency. */
+    static final class CveState {
+        /**
+         * First callsite hit, or {@code null} if not yet reached. AtomicReference ensures compareAndSet
+         * atomicity so exactly one thread wins the "first hit" race.
+         */
+        final AtomicReference<ScaReachabilityHit> hitRef = new AtomicReference<>(null);
+    }
 
-  /** Immutable snapshot of a dependency's CVE state at drain time. */
-  public static final class DependencySnapshot {
-    public final String artifact;
-    public final String version;
+    /** Immutable snapshot of a dependency's CVE state at drain time. */
+    public static final class DependencySnapshot {
+        public final String artifact;
+        public final String version;
 
-    /** All CVEs for this dependency: hit==null means known but not reached yet. */
-    public final List<CveSnapshot> cves;
+        /** All CVEs for this dependency: hit==null means known but not reached yet. */
+        public final List<CveSnapshot> cves;
 
-    DependencySnapshot(String artifact, String version, List<CveSnapshot> cves) {
-      this.artifact = artifact;
-      this.version = version;
-      this.cves = cves;
+        DependencySnapshot(String artifact, String version, List<CveSnapshot> cves) {
+            this.artifact = artifact;
+            this.version = version;
+            this.cves = cves;
+        }
     }
-  }
 
-  /** Snapshot of one CVE: hit is null if not yet reached. */
-  public static final class CveSnapshot {
-    public final String vulnId;
-    public final ScaReachabilityHit hit; // null = reached:[]
+    /** Snapshot of one CVE: hit is null if not yet reached. */
+    public static final class CveSnapshot {
+        public final String vulnId;
+        public final ScaReachabilityHit hit; // null = reached:[]
 
-    public CveSnapshot(String vulnId, ScaReachabilityHit hit) {
-      this.vulnId = vulnId;
-      this.hit = hit;
+        public CveSnapshot(String vulnId, ScaReachabilityHit hit) {
+            this.vulnId = vulnId;
+            this.hit = hit;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/ScaReachabilityHit.java b/internal-api/src/main/java/datadog/trace/api/telemetry/ScaReachabilityHit.java
index f0e1e5f477c..ec53bb6841e 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/ScaReachabilityHit.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/ScaReachabilityHit.java
@@ -7,60 +7,55 @@
  */
 public final class ScaReachabilityHit {
 
-  private final String vulnId;
-  private final String artifact;
-  private final String version;
-  // FQN of the APPLICATION class that called the vulnerable method (callsite, dot notation)
-  private final String className;
-  // The APPLICATION method that called the vulnerable method (callsite)
-  private final String symbolName;
-  // Line number in the application code where the call was made
-  private final int line;
-
-  public ScaReachabilityHit(
-      String vulnId,
-      String artifact,
-      String version,
-      String className,
-      String symbolName,
-      int line) {
-    this.vulnId = vulnId;
-    this.artifact = artifact;
-    this.version = version;
-    this.className = className;
-    this.symbolName = symbolName;
-    this.line = line;
-  }
-
-  /** GHSA identifier, e.g. {@code "GHSA-645p-88qh-w398"}. */
-  public String vulnId() {
-    return vulnId;
-  }
-
-  /** Maven coordinate, e.g. {@code "com.fasterxml.jackson.core:jackson-databind"}. */
-  public String artifact() {
-    return artifact;
-  }
-
-  public String version() {
-    return version;
-  }
-
-  /**
-   * FQN of the APPLICATION class that called the vulnerable method (callsite, dot notation). This
-   * is the caller frame, not the vulnerable class itself.
-   */
-  public String className() {
-    return className;
-  }
-
-  /** The APPLICATION method that called the vulnerable method (callsite). */
-  public String symbolName() {
-    return symbolName;
-  }
-
-  /** Line number in the application code where the call was made. */
-  public int line() {
-    return line;
-  }
+    private final String vulnId;
+    private final String artifact;
+    private final String version;
+    // FQN of the APPLICATION class that called the vulnerable method (callsite, dot notation)
+    private final String className;
+    // The APPLICATION method that called the vulnerable method (callsite)
+    private final String symbolName;
+    // Line number in the application code where the call was made
+    private final int line;
+
+    public ScaReachabilityHit(
+            String vulnId, String artifact, String version, String className, String symbolName, int line) {
+        this.vulnId = vulnId;
+        this.artifact = artifact;
+        this.version = version;
+        this.className = className;
+        this.symbolName = symbolName;
+        this.line = line;
+    }
+
+    /** GHSA identifier, e.g. {@code "GHSA-645p-88qh-w398"}. */
+    public String vulnId() {
+        return vulnId;
+    }
+
+    /** Maven coordinate, e.g. {@code "com.fasterxml.jackson.core:jackson-databind"}. */
+    public String artifact() {
+        return artifact;
+    }
+
+    public String version() {
+        return version;
+    }
+
+    /**
+     * FQN of the APPLICATION class that called the vulnerable method (callsite, dot notation). This
+     * is the caller frame, not the vulnerable class itself.
+     */
+    public String className() {
+        return className;
+    }
+
+    /** The APPLICATION method that called the vulnerable method (callsite). */
+    public String symbolName() {
+        return symbolName;
+    }
+
+    /** Line number in the application code where the call was made. */
+    public int line() {
+        return line;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java
index 98797a1979a..79d50a55fbe 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java
@@ -19,392 +19,142 @@
 
 public class WafMetricCollector implements MetricCollector<WafMetricCollector.WafMetric> {
 
-  private static final int MASK_STRING_TOO_LONG = 1; // 0b001
-  private static final int MASK_LIST_MAP_TOO_LARGE = 1 << 1; // 0b010
-  private static final int MASK_OBJECT_TOO_DEEP = 1 << 2; // 0b100
-
-  public static WafMetricCollector INSTANCE = new WafMetricCollector();
-
-  public static WafMetricCollector get() {
-    return WafMetricCollector.INSTANCE;
-  }
-
-  private WafMetricCollector() {
-    // Prevent external instantiation
-  }
-
-  private static final String NAMESPACE = "appsec";
-
-  /**
-   * AI Guard metrics live in their own telemetry namespace. The namespace and the metric name are
-   * reported as separate fields and joined downstream, so {@code ai_guard} + {@code requests} is
-   * what surfaces the {@code ai_guard.requests} metric the AI Guard RFC specifies.
-   */
-  private static final String AI_GUARD_NAMESPACE = "ai_guard";
-
-  /** Hoisted because {@link Enum#values()} clones its backing array on every call. */
-  private static final AIGuardRedaction[] REDACTION_VALUES = AIGuardRedaction.values();
-
-  /** Hoisted because {@link Enum#values()} clones its backing array on every call. */
-  private static final AIGuardError[] AI_GUARD_ERROR_VALUES = AIGuardError.values();
-
-  private static final BlockingQueue<WafMetric> rawMetricsQueue =
-      new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
-
-  private static final int WAF_REQUEST_COMBINATIONS = 256; // 2^8
-  private final AtomicLongArray wafRequestCounter = new AtomicLongArray(WAF_REQUEST_COMBINATIONS);
-
-  private static final AtomicLongArray wafInputTruncatedCounter =
-      new AtomicLongArray(1 << 3); // 3 flags → 2^3 = 8 possible bit combinations
-
-  private static final AtomicLongArray raspRuleEvalCounter =
-      new AtomicLongArray(RuleType.getNumValues());
-  private static final AtomicLongArray raspRuleSkippedCounter =
-      new AtomicLongArray(RuleType.getNumValues());
-  private static final AtomicLongArray raspRuleMatchCounter =
-      new AtomicLongArray(RuleType.getNumValues() * 2);
-  private static final AtomicLongArray raspTimeoutCounter =
-      new AtomicLongArray(RuleType.getNumValues());
-  private static final AtomicLongArray raspErrorCodeCounter =
-      new AtomicLongArray(WafErrorCode.values().length * RuleType.getNumValues());
-  private static final AtomicLongArray wafErrorCodeCounter =
-      new AtomicLongArray(WafErrorCode.values().length);
-  private static final AtomicLongArray missingUserLoginQueue =
-      new AtomicLongArray(LoginFramework.getNumValues() * LoginEvent.getNumValues());
-  private static final AtomicLongArray missingUserIdQueue =
-      new AtomicLongArray(LoginFramework.getNumValues());
-  private static final AtomicLongArray appSecSdkEventQueue =
-      new AtomicLongArray(LoginEvent.getNumValues() * LoginVersion.getNumValues());
-  private static final AtomicInteger wafConfigErrorCounter = new AtomicInteger();
-  private static final AtomicInteger contextClosedRaceCounter = new AtomicInteger();
-  private static final AtomicLongArray aiGuardRequests =
-      new AtomicLongArray(
-          AIGuard.Action.values().length
-              * 2
-              * REDACTION_VALUES.length); // actions * block * redaction state
-  private static final AtomicInteger aiGuardErrors = new AtomicInteger();
-  private static final AtomicLongArray aiGuardErrorTypes =
-      new AtomicLongArray(AI_GUARD_ERROR_VALUES.length);
-  private static final AtomicLongArray aiGuardTruncated =
-      new AtomicLongArray(AIGuardTruncationType.values().length);
-
-  /**
-   * Per-framework counters for requests where API Security could not resolve a route. Aggregated
-   * in-memory and drained on {@link #prepareMetrics()} instead of enqueueing on every request,
-   * since this call site has no sampling gate and could otherwise saturate {@link #rawMetricsQueue}
-   * under load (e.g. scanner traffic hitting unresolvable routes).
-   */
-  private static final String UNKNOWN_FRAMEWORK = "unknown";
-
-  /**
-   * Cap on distinct framework keys tracked per counter map, {@link #UNKNOWN_FRAMEWORK} included.
-   * {@code framework} is read from the span's {@code component} tag, which is not guaranteed to
-   * come from a bounded, known set (e.g. custom/manual instrumentation could set it per-request) —
-   * without a cap the maps would never shrink, since {@link #prepareMetrics()} only resets counters
-   * to zero, it never removes keys. Frameworks beyond the cap are folded into {@link
-   * #UNKNOWN_FRAMEWORK}. Admission is synchronized per-map in {@link #counterFor} so the cap is
-   * enforced atomically instead of racing on {@code size()}.
-   */
-  private static final int MAX_FRAMEWORK_CARDINALITY = 64;
-
-  private static final ConcurrentHashMap<String, AtomicLong> apiSecurityMissingRouteCounters =
-      newFrameworkCounters();
-
-  /**
-   * Per-framework counters for sampled requests with/without an extracted API Security schema.
-   * Aggregated in-memory and drained on {@link #prepareMetrics()} for the same reason as {@link
-   * #apiSecurityMissingRouteCounters}: a burst of sampled requests across many distinct routes
-   * between telemetry heartbeats could otherwise saturate {@link #rawMetricsQueue} one request at a
-   * time.
-   */
-  private static final ConcurrentHashMap<String, AtomicLong> apiSecurityRequestSchemaCounters =
-      newFrameworkCounters();
-
-  private static final ConcurrentHashMap<String, AtomicLong> apiSecurityRequestNoSchemaCounters =
-      newFrameworkCounters();
-
-  /** Reserves the {@link #UNKNOWN_FRAMEWORK} bucket within the cardinality cap up front. */
-  private static ConcurrentHashMap<String, AtomicLong> newFrameworkCounters() {
-    final ConcurrentHashMap<String, AtomicLong> counters = new ConcurrentHashMap<>();
-    counters.put(UNKNOWN_FRAMEWORK, new AtomicLong());
-    return counters;
-  }
-
-  /** WAF version that will be initialized with wafInit and reused for all metrics. */
-  private static String wafVersion = "";
-
-  /**
-   * Rules version that will be updated on each wafInit and wafUpdates. This is not entirely
-   * accurate, since wafRequest metrics might be collected for a period where a rules update happens
-   * and some requests will be incorrectly reported with the old or new rules version.
-   */
-  private static String rulesVersion = "";
-
-  public void wafInit(final String wafVersion, final String rulesVersion, final boolean success) {
-    WafMetricCollector.wafVersion = wafVersion;
-    WafMetricCollector.rulesVersion = rulesVersion;
-    rawMetricsQueue.offer(new WafInitRawMetric(1L, wafVersion, rulesVersion, success));
-  }
-
-  public void wafUpdates(final String rulesVersion, final boolean success) {
-    rawMetricsQueue.offer(new WafUpdatesRawMetric(1L, wafVersion, rulesVersion, success));
-
-    // Flush request metrics to get the new version.
-    if (rulesVersion != null
-        && WafMetricCollector.rulesVersion != null
-        && !rulesVersion.equals(WafMetricCollector.rulesVersion)) {
-      WafMetricCollector.get().prepareMetrics();
-    }
-    WafMetricCollector.rulesVersion = rulesVersion;
-  }
-
-  public void wafRequest(
-      final boolean ruleTriggered,
-      final boolean requestBlocked,
-      final boolean wafError,
-      final boolean wafTimeout,
-      final boolean blockFailure,
-      final boolean rateLimited,
-      final boolean inputTruncated,
-      final boolean requestExcluded) {
-    int index =
-        computeWafRequestIndex(
-            ruleTriggered,
-            requestBlocked,
-            wafError,
-            wafTimeout,
-            blockFailure,
-            rateLimited,
-            inputTruncated,
-            requestExcluded);
-    wafRequestCounter.incrementAndGet(index);
-  }
-
-  public void wafInputTruncated(
-      final boolean stringTooLong, final boolean listMapTooLarge, final boolean objectTooDeep) {
-    int index = computeWafInputTruncatedIndex(stringTooLong, listMapTooLarge, objectTooDeep);
-    wafInputTruncatedCounter.incrementAndGet(index);
-  }
-
-  static int computeWafRequestIndex(
-      boolean ruleTriggered,
-      boolean requestBlocked,
-      boolean wafError,
-      boolean wafTimeout,
-      boolean blockFailure,
-      boolean rateLimited,
-      boolean inputTruncated,
-      boolean requestExcluded) {
-    int index = 0;
-    if (ruleTriggered) index |= 1;
-    if (requestBlocked) index |= 1 << 1;
-    if (wafError) index |= 1 << 2;
-    if (wafTimeout) index |= 1 << 3;
-    if (blockFailure) index |= 1 << 4;
-    if (rateLimited) index |= 1 << 5;
-    if (inputTruncated) index |= 1 << 6;
-    if (requestExcluded) index |= 1 << 7;
-    return index;
-  }
-
-  static int computeWafInputTruncatedIndex(
-      boolean stringTooLong, boolean listMapTooLarge, boolean objectTooDeep) {
-    int index = 0;
-    if (stringTooLong) index |= MASK_STRING_TOO_LONG;
-    if (listMapTooLarge) index |= MASK_LIST_MAP_TOO_LARGE;
-    if (objectTooDeep) index |= MASK_OBJECT_TOO_DEEP;
-    return index;
-  }
-
-  public void raspRuleEval(final RuleType ruleType) {
-    raspRuleEvalCounter.incrementAndGet(ruleType.ordinal());
-  }
-
-  public void raspRuleSkipped(final RuleType ruleType) {
-    raspRuleSkippedCounter.incrementAndGet(ruleType.ordinal());
-  }
-
-  public void raspRuleMatch(final RuleType ruleType, final boolean blocked) {
-    raspRuleMatchCounter.incrementAndGet(ruleType.ordinal() * 2 + (blocked ? 1 : 0));
-  }
-
-  public void raspTimeout(final RuleType ruleType) {
-    raspTimeoutCounter.incrementAndGet(ruleType.ordinal());
-  }
-
-  public void raspErrorCode(RuleType ruleType, final int errorCode) {
-    WafErrorCode wafErrorCode = WafErrorCode.fromCode(errorCode);
-    // Unsupported waf error code
-    if (wafErrorCode == null) {
-      return;
-    }
-    int index = wafErrorCode.ordinal() * RuleType.getNumValues() + ruleType.ordinal();
-    raspErrorCodeCounter.incrementAndGet(index);
-  }
-
-  public void wafErrorCode(final int errorCode) {
-    WafErrorCode wafErrorCode = WafErrorCode.fromCode(errorCode);
-    // Unsupported waf error code
-    if (wafErrorCode == null) {
-      return;
-    }
-    wafErrorCodeCounter.incrementAndGet(wafErrorCode.ordinal());
-  }
-
-  public void missingUserLogin(final LoginFramework framework, final LoginEvent eventType) {
-    missingUserLoginQueue.incrementAndGet(
-        framework.ordinal() * LoginEvent.getNumValues() + eventType.ordinal());
-  }
-
-  public void missingUserId(final LoginFramework framework) {
-    missingUserIdQueue.incrementAndGet(framework.ordinal());
-  }
-
-  public void appSecSdkEvent(final LoginEvent event, final LoginVersion version) {
-    final int index = event.ordinal() * LoginVersion.getNumValues() + version.ordinal();
-    appSecSdkEventQueue.incrementAndGet(index);
-  }
-
-  public void aiGuardRequest(
-      final AIGuard.Action action, final boolean block, final AIGuardRedaction redaction) {
-    aiGuardRequests.incrementAndGet(aiGuardRequestIndex(action, block, redaction));
-  }
-
-  private static int aiGuardRequestIndex(
-      final AIGuard.Action action, final boolean block, final AIGuardRedaction redaction) {
-    return (action.ordinal() * 2 + (block ? 1 : 0)) * REDACTION_VALUES.length + redaction.ordinal();
-  }
-
-  /**
-   * Reports an evaluation that failed. The failure is counted twice on purpose, mirroring every
-   * other tracer: as {@code error:true} on {@code ai_guard.requests}, which keeps the request count
-   * complete, and under {@code ai_guard.error} with the {@code type} that classifies it.
-   */
-  public void aiGuardError(final AIGuardError type) {
-    aiGuardErrors.incrementAndGet();
-    aiGuardErrorTypes.incrementAndGet(type.ordinal());
-  }
-
-  /**
-   * Reports {@code count} replacements that redaction could not apply. Unlike {@link
-   * #aiGuardError(AIGuardError)} this does not count a failed request: redaction is best effort and
-   * never fails the evaluation it rode in on.
-   */
-  public void aiGuardRedactionErrors(final long count) {
-    aiGuardErrorTypes.addAndGet(AIGuardError.REDACTION_ERROR.ordinal(), count);
-  }
-
-  public void aiGuardTruncated(final AIGuardTruncationType type) {
-    aiGuardTruncated.incrementAndGet(type.ordinal());
-  }
-
-  /**
-   * Reports a request for which API Security could not resolve a route, and therefore could not be
-   * considered for schema extraction sampling.
-   */
-  public void apiSecurityMissingRoute(final String framework) {
-    counterFor(apiSecurityMissingRouteCounters, framework).incrementAndGet();
-  }
-
-  /** Reports a sampled request for which at least one API Security schema was extracted. */
-  public void apiSecurityRequestSchema(final String framework) {
-    counterFor(apiSecurityRequestSchemaCounters, framework).incrementAndGet();
-  }
-
-  /** Reports a sampled request for which no API Security schema was extracted. */
-  public void apiSecurityRequestNoSchema(final String framework) {
-    counterFor(apiSecurityRequestNoSchemaCounters, framework).incrementAndGet();
-  }
-
-  /**
-   * Normalizes a framework (span component) value, mapping null or blank values to "unknown" and
-   * sanitizing the rest via {@link TagsHelper#sanitize}, which also bounds its length. {@code
-   * framework} can originate from manual/custom instrumentation setting the {@code component} tag
-   * per request, so without this the retained-but-cardinality-capped keys could still consume
-   * unbounded heap in bytes even though their count is bounded.
-   */
-  static String normalizeFramework(final String framework) {
-    if (framework == null || framework.trim().isEmpty()) {
-      return UNKNOWN_FRAMEWORK;
-    }
-    return TagsHelper.sanitize(framework.trim());
-  }
-
-  /**
-   * Returns the counter for {@code framework} in {@code counters}, capping the map at {@link
-   * #MAX_FRAMEWORK_CARDINALITY} distinct keys ({@link #UNKNOWN_FRAMEWORK} pre-reserved by {@link
-   * #newFrameworkCounters()}). Once the cap is reached, any framework not already tracked is folded
-   * into {@link #UNKNOWN_FRAMEWORK} instead of growing the map further. The fast path for an
-   * already-tracked key is lock-free; admission of a never-seen key is synchronized on {@code
-   * counters} so the size check and the insertion happen atomically, closing the race where
-   * concurrent first-seen frameworks could otherwise all pass the check and overshoot the cap.
-   *
-   * <p>Before normalizing, we first probe {@code counters} with the raw, unsanitized {@code
-   * framework} value. Well-known frameworks (e.g. "netty") are already in sanitized form, so once
-   * admitted, this raw lookup hits directly and skips {@link #normalizeFramework}'s allocation (via
-   * {@link TagsHelper#sanitize}) on every subsequent call for that framework.
-   */
-  @SuppressFBWarnings("JLM_JSR166_UTILCONCURRENT_MONITORENTER")
-  private static AtomicLong counterFor(
-      final ConcurrentHashMap<String, AtomicLong> counters, final String framework) {
-    if (framework != null) {
-      final AtomicLong rawHit = counters.get(framework);
-      if (rawHit != null) {
-        return rawHit;
-      }
+    private static final int MASK_STRING_TOO_LONG = 1; // 0b001
+    private static final int MASK_LIST_MAP_TOO_LARGE = 1 << 1; // 0b010
+    private static final int MASK_OBJECT_TOO_DEEP = 1 << 2; // 0b100
+
+    public static WafMetricCollector INSTANCE = new WafMetricCollector();
+
+    public static WafMetricCollector get() {
+        return WafMetricCollector.INSTANCE;
     }
-    final String key = normalizeFramework(framework);
-    final AtomicLong existing = counters.get(key);
-    if (existing != null) {
-      return existing;
+
+    private WafMetricCollector() {
+        // Prevent external instantiation
     }
-    synchronized (counters) {
-      final AtomicLong existingSync = counters.get(key);
-      if (existingSync != null) {
-        return existingSync;
-      }
-      if (counters.size() >= MAX_FRAMEWORK_CARDINALITY) {
-        return counters.get(UNKNOWN_FRAMEWORK);
-      }
-      final AtomicLong created = new AtomicLong();
-      counters.put(key, created);
-      return created;
+
+    private static final String NAMESPACE = "appsec";
+
+    /**
+     * AI Guard metrics live in their own telemetry namespace. The namespace and the metric name are
+     * reported as separate fields and joined downstream, so {@code ai_guard} + {@code requests} is
+     * what surfaces the {@code ai_guard.requests} metric the AI Guard RFC specifies.
+     */
+    private static final String AI_GUARD_NAMESPACE = "ai_guard";
+
+    /** Hoisted because {@link Enum#values()} clones its backing array on every call. */
+    private static final AIGuardRedaction[] REDACTION_VALUES = AIGuardRedaction.values();
+
+    /** Hoisted because {@link Enum#values()} clones its backing array on every call. */
+    private static final AIGuardError[] AI_GUARD_ERROR_VALUES = AIGuardError.values();
+
+    private static final BlockingQueue<WafMetric> rawMetricsQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
+
+    private static final int WAF_REQUEST_COMBINATIONS = 256; // 2^8
+    private final AtomicLongArray wafRequestCounter = new AtomicLongArray(WAF_REQUEST_COMBINATIONS);
+
+    private static final AtomicLongArray wafInputTruncatedCounter =
+            new AtomicLongArray(1 << 3); // 3 flags → 2^3 = 8 possible bit combinations
+
+    private static final AtomicLongArray raspRuleEvalCounter = new AtomicLongArray(RuleType.getNumValues());
+    private static final AtomicLongArray raspRuleSkippedCounter = new AtomicLongArray(RuleType.getNumValues());
+    private static final AtomicLongArray raspRuleMatchCounter = new AtomicLongArray(RuleType.getNumValues() * 2);
+    private static final AtomicLongArray raspTimeoutCounter = new AtomicLongArray(RuleType.getNumValues());
+    private static final AtomicLongArray raspErrorCodeCounter =
+            new AtomicLongArray(WafErrorCode.values().length * RuleType.getNumValues());
+    private static final AtomicLongArray wafErrorCodeCounter = new AtomicLongArray(WafErrorCode.values().length);
+    private static final AtomicLongArray missingUserLoginQueue =
+            new AtomicLongArray(LoginFramework.getNumValues() * LoginEvent.getNumValues());
+    private static final AtomicLongArray missingUserIdQueue = new AtomicLongArray(LoginFramework.getNumValues());
+    private static final AtomicLongArray appSecSdkEventQueue =
+            new AtomicLongArray(LoginEvent.getNumValues() * LoginVersion.getNumValues());
+    private static final AtomicInteger wafConfigErrorCounter = new AtomicInteger();
+    private static final AtomicInteger contextClosedRaceCounter = new AtomicInteger();
+    private static final AtomicLongArray aiGuardRequests = new AtomicLongArray(
+            AIGuard.Action.values().length * 2 * REDACTION_VALUES.length); // actions * block * redaction state
+    private static final AtomicInteger aiGuardErrors = new AtomicInteger();
+    private static final AtomicLongArray aiGuardErrorTypes = new AtomicLongArray(AI_GUARD_ERROR_VALUES.length);
+    private static final AtomicLongArray aiGuardTruncated = new AtomicLongArray(AIGuardTruncationType.values().length);
+
+    /**
+     * Per-framework counters for requests where API Security could not resolve a route. Aggregated
+     * in-memory and drained on {@link #prepareMetrics()} instead of enqueueing on every request,
+     * since this call site has no sampling gate and could otherwise saturate {@link #rawMetricsQueue}
+     * under load (e.g. scanner traffic hitting unresolvable routes).
+     */
+    private static final String UNKNOWN_FRAMEWORK = "unknown";
+
+    /**
+     * Cap on distinct framework keys tracked per counter map, {@link #UNKNOWN_FRAMEWORK} included.
+     * {@code framework} is read from the span's {@code component} tag, which is not guaranteed to
+     * come from a bounded, known set (e.g. custom/manual instrumentation could set it per-request) —
+     * without a cap the maps would never shrink, since {@link #prepareMetrics()} only resets counters
+     * to zero, it never removes keys. Frameworks beyond the cap are folded into {@link
+     * #UNKNOWN_FRAMEWORK}. Admission is synchronized per-map in {@link #counterFor} so the cap is
+     * enforced atomically instead of racing on {@code size()}.
+     */
+    private static final int MAX_FRAMEWORK_CARDINALITY = 64;
+
+    private static final ConcurrentHashMap<String, AtomicLong> apiSecurityMissingRouteCounters = newFrameworkCounters();
+
+    /**
+     * Per-framework counters for sampled requests with/without an extracted API Security schema.
+     * Aggregated in-memory and drained on {@link #prepareMetrics()} for the same reason as {@link
+     * #apiSecurityMissingRouteCounters}: a burst of sampled requests across many distinct routes
+     * between telemetry heartbeats could otherwise saturate {@link #rawMetricsQueue} one request at a
+     * time.
+     */
+    private static final ConcurrentHashMap<String, AtomicLong> apiSecurityRequestSchemaCounters =
+            newFrameworkCounters();
+
+    private static final ConcurrentHashMap<String, AtomicLong> apiSecurityRequestNoSchemaCounters =
+            newFrameworkCounters();
+
+    /** Reserves the {@link #UNKNOWN_FRAMEWORK} bucket within the cardinality cap up front. */
+    private static ConcurrentHashMap<String, AtomicLong> newFrameworkCounters() {
+        final ConcurrentHashMap<String, AtomicLong> counters = new ConcurrentHashMap<>();
+        counters.put(UNKNOWN_FRAMEWORK, new AtomicLong());
+        return counters;
     }
-  }
-
-  @Override
-  public Collection<WafMetric> drain() {
-    if (!rawMetricsQueue.isEmpty()) {
-      List<WafMetric> list = new LinkedList<>();
-      int drained = rawMetricsQueue.drainTo(list);
-      if (drained > 0) {
-        return list;
-      }
+
+    /** WAF version that will be initialized with wafInit and reused for all metrics. */
+    private static String wafVersion = "";
+
+    /**
+     * Rules version that will be updated on each wafInit and wafUpdates. This is not entirely
+     * accurate, since wafRequest metrics might be collected for a period where a rules update happens
+     * and some requests will be incorrectly reported with the old or new rules version.
+     */
+    private static String rulesVersion = "";
+
+    public void wafInit(final String wafVersion, final String rulesVersion, final boolean success) {
+        WafMetricCollector.wafVersion = wafVersion;
+        WafMetricCollector.rulesVersion = rulesVersion;
+        rawMetricsQueue.offer(new WafInitRawMetric(1L, wafVersion, rulesVersion, success));
     }
-    return Collections.emptyList();
-  }
-
-  @Override
-  public void prepareMetrics() {
-
-    // Requests
-    for (int i = 0; i < WAF_REQUEST_COMBINATIONS; i++) {
-      long counter = wafRequestCounter.getAndSet(i, 0);
-      if (counter > 0) {
-        boolean ruleTriggered = (i & 1) != 0;
-        boolean requestBlocked = (i & (1 << 1)) != 0;
-        boolean wafError = (i & (1 << 2)) != 0;
-        boolean wafTimeout = (i & (1 << 3)) != 0;
-        boolean blockFailure = (i & (1 << 4)) != 0;
-        boolean rateLimited = (i & (1 << 5)) != 0;
-        boolean inputTruncated = (i & (1 << 6)) != 0;
-        boolean requestExcluded = (i & (1 << 7)) != 0;
-
-        if (!rawMetricsQueue.offer(
-            new WafRequestsRawMetric(
-                counter,
-                WafMetricCollector.wafVersion,
-                WafMetricCollector.rulesVersion,
+
+    public void wafUpdates(final String rulesVersion, final boolean success) {
+        rawMetricsQueue.offer(new WafUpdatesRawMetric(1L, wafVersion, rulesVersion, success));
+
+        // Flush request metrics to get the new version.
+        if (rulesVersion != null
+                && WafMetricCollector.rulesVersion != null
+                && !rulesVersion.equals(WafMetricCollector.rulesVersion)) {
+            WafMetricCollector.get().prepareMetrics();
+        }
+        WafMetricCollector.rulesVersion = rulesVersion;
+    }
+
+    public void wafRequest(
+            final boolean ruleTriggered,
+            final boolean requestBlocked,
+            final boolean wafError,
+            final boolean wafTimeout,
+            final boolean blockFailure,
+            final boolean rateLimited,
+            final boolean inputTruncated,
+            final boolean requestExcluded) {
+        int index = computeWafRequestIndex(
                 ruleTriggered,
                 requestBlocked,
                 wafError,
@@ -412,642 +162,840 @@ public void prepareMetrics() {
                 blockFailure,
                 rateLimited,
                 inputTruncated,
-                requestExcluded))) {
-          return;
-        }
-      }
+                requestExcluded);
+        wafRequestCounter.incrementAndGet(index);
     }
 
-    // WAF input truncated
-    for (int i = 0; i < (1 << 3); i++) {
-      long counter = wafInputTruncatedCounter.getAndSet(i, 0);
-      if (counter > 0) {
-        if (!rawMetricsQueue.offer(new WafInputTruncated(counter, i))) {
-          return;
-        }
-      }
+    public void wafInputTruncated(
+            final boolean stringTooLong, final boolean listMapTooLarge, final boolean objectTooDeep) {
+        int index = computeWafInputTruncatedIndex(stringTooLong, listMapTooLarge, objectTooDeep);
+        wafInputTruncatedCounter.incrementAndGet(index);
     }
 
-    // RASP rule eval per rule type
-    for (RuleType ruleType : RuleType.values()) {
-      long counter = raspRuleEvalCounter.getAndSet(ruleType.ordinal(), 0);
-      if (counter > 0) {
-        if (!rawMetricsQueue.offer(
-            new RaspRuleEval(counter, ruleType, WafMetricCollector.wafVersion))) {
-          return;
-        }
-      }
+    static int computeWafRequestIndex(
+            boolean ruleTriggered,
+            boolean requestBlocked,
+            boolean wafError,
+            boolean wafTimeout,
+            boolean blockFailure,
+            boolean rateLimited,
+            boolean inputTruncated,
+            boolean requestExcluded) {
+        int index = 0;
+        if (ruleTriggered) index |= 1;
+        if (requestBlocked) index |= 1 << 1;
+        if (wafError) index |= 1 << 2;
+        if (wafTimeout) index |= 1 << 3;
+        if (blockFailure) index |= 1 << 4;
+        if (rateLimited) index |= 1 << 5;
+        if (inputTruncated) index |= 1 << 6;
+        if (requestExcluded) index |= 1 << 7;
+        return index;
     }
 
-    // RASP rule match per rule type: two slots per RuleType: ordinal*2 (non-blocked),
-    // ordinal*2+1 (blocked)
-    for (RuleType ruleType : RuleType.values()) {
-      long blockedCount = raspRuleMatchCounter.getAndSet(ruleType.ordinal() * 2 + 1, 0);
-      if (blockedCount > 0) {
-        if (!rawMetricsQueue.offer(
-            new RaspRuleMatch(blockedCount, ruleType, WafMetricCollector.wafVersion, true))) {
-          return;
-        }
-      }
-      long nonBlockedCount = raspRuleMatchCounter.getAndSet(ruleType.ordinal() * 2, 0);
-      if (nonBlockedCount > 0) {
-        if (!rawMetricsQueue.offer(
-            new RaspRuleMatch(nonBlockedCount, ruleType, WafMetricCollector.wafVersion, false))) {
-          return;
-        }
-      }
+    static int computeWafInputTruncatedIndex(boolean stringTooLong, boolean listMapTooLarge, boolean objectTooDeep) {
+        int index = 0;
+        if (stringTooLong) index |= MASK_STRING_TOO_LONG;
+        if (listMapTooLarge) index |= MASK_LIST_MAP_TOO_LARGE;
+        if (objectTooDeep) index |= MASK_OBJECT_TOO_DEEP;
+        return index;
     }
 
-    // RASP timeout per rule type
-    for (RuleType ruleType : RuleType.values()) {
-      long counter = raspTimeoutCounter.getAndSet(ruleType.ordinal(), 0);
-      if (counter > 0) {
-        if (!rawMetricsQueue.offer(
-            new RaspTimeout(counter, ruleType, WafMetricCollector.wafVersion))) {
-          return;
-        }
-      }
+    public void raspRuleEval(final RuleType ruleType) {
+        raspRuleEvalCounter.incrementAndGet(ruleType.ordinal());
+    }
+
+    public void raspRuleSkipped(final RuleType ruleType) {
+        raspRuleSkippedCounter.incrementAndGet(ruleType.ordinal());
     }
 
-    // RASP rule type for each possible error code
-    for (WafErrorCode errorCode : WafErrorCode.values()) {
-      for (RuleType ruleType : RuleType.values()) {
-        int index = errorCode.ordinal() * RuleType.getNumValues() + ruleType.ordinal();
-        long count = raspErrorCodeCounter.getAndSet(index, 0);
-        if (count > 0) {
-          if (!rawMetricsQueue.offer(
-              new RaspError(count, ruleType, WafMetricCollector.wafVersion, errorCode.getCode()))) {
+    public void raspRuleMatch(final RuleType ruleType, final boolean blocked) {
+        raspRuleMatchCounter.incrementAndGet(ruleType.ordinal() * 2 + (blocked ? 1 : 0));
+    }
+
+    public void raspTimeout(final RuleType ruleType) {
+        raspTimeoutCounter.incrementAndGet(ruleType.ordinal());
+    }
+
+    public void raspErrorCode(RuleType ruleType, final int errorCode) {
+        WafErrorCode wafErrorCode = WafErrorCode.fromCode(errorCode);
+        // Unsupported waf error code
+        if (wafErrorCode == null) {
             return;
-          }
         }
-      }
+        int index = wafErrorCode.ordinal() * RuleType.getNumValues() + ruleType.ordinal();
+        raspErrorCodeCounter.incrementAndGet(index);
     }
 
-    // Missing user login
-    for (LoginFramework framework : LoginFramework.values()) {
-      for (LoginEvent event : LoginEvent.values()) {
-        final int ordinal = framework.ordinal() * LoginEvent.getNumValues() + event.ordinal();
-        long counter = missingUserLoginQueue.getAndSet(ordinal, 0);
-        if (counter > 0) {
-          if (!rawMetricsQueue.offer(
-              new MissingUserLoginMetric(counter, framework.getTag(), event.getTag()))) {
+    public void wafErrorCode(final int errorCode) {
+        WafErrorCode wafErrorCode = WafErrorCode.fromCode(errorCode);
+        // Unsupported waf error code
+        if (wafErrorCode == null) {
             return;
-          }
         }
-      }
+        wafErrorCodeCounter.incrementAndGet(wafErrorCode.ordinal());
     }
 
-    // Missing user id
-    for (LoginFramework framework : LoginFramework.values()) {
-      long counter = missingUserIdQueue.getAndSet(framework.ordinal(), 0);
-      if (counter > 0) {
-        if (!rawMetricsQueue.offer(new MissingUserIdMetric(counter, framework.getTag()))) {
-          return;
-        }
-      }
+    public void missingUserLogin(final LoginFramework framework, final LoginEvent eventType) {
+        missingUserLoginQueue.incrementAndGet(framework.ordinal() * LoginEvent.getNumValues() + eventType.ordinal());
     }
 
-    // ATO login events
-    for (LoginEvent event : LoginEvent.values()) {
-      for (LoginVersion version : LoginVersion.values()) {
-        final int ordinal = event.ordinal() * LoginVersion.getNumValues() + version.ordinal();
-        long counter = appSecSdkEventQueue.getAndSet(ordinal, 0);
-        if (counter > 0) {
-          if (!rawMetricsQueue.offer(
-              new AppSecSdkEvent(counter, event.getTag(), version.getTag()))) {
-            return;
-          }
-        }
-      }
+    public void missingUserId(final LoginFramework framework) {
+        missingUserIdQueue.incrementAndGet(framework.ordinal());
     }
 
-    // WAF rule type for each possible error code
-    for (WafErrorCode errorCode : WafErrorCode.values()) {
-      long count = wafErrorCodeCounter.getAndSet(errorCode.ordinal(), 0);
-      if (count > 0) {
-        if (!rawMetricsQueue.offer(
-            new WafError(count, WafMetricCollector.wafVersion, errorCode.getCode()))) {
-          return;
-        }
-      }
+    public void appSecSdkEvent(final LoginEvent event, final LoginVersion version) {
+        final int index = event.ordinal() * LoginVersion.getNumValues() + version.ordinal();
+        appSecSdkEventQueue.incrementAndGet(index);
     }
 
-    // RASP rule skipped per rule type for after-request reason
-    for (RuleType ruleType : RuleType.values()) {
-      long counter = raspRuleSkippedCounter.getAndSet(ruleType.ordinal(), 0);
-      if (counter > 0) {
-        if (!rawMetricsQueue.offer(new AfterRequestRaspRuleSkipped(counter, ruleType))) {
-          return;
-        }
-      }
+    public void aiGuardRequest(final AIGuard.Action action, final boolean block, final AIGuardRedaction redaction) {
+        aiGuardRequests.incrementAndGet(aiGuardRequestIndex(action, block, redaction));
     }
 
-    // WAF config errors
-    int configErrors = wafConfigErrorCounter.getAndSet(0);
-    if (configErrors > 0) {
-      if (!rawMetricsQueue.offer(
-          new WafConfigError(
-              configErrors, WafMetricCollector.wafVersion, WafMetricCollector.rulesVersion))) {
-        return;
-      }
+    private static int aiGuardRequestIndex(
+            final AIGuard.Action action, final boolean block, final AIGuardRedaction redaction) {
+        return (action.ordinal() * 2 + (block ? 1 : 0)) * REDACTION_VALUES.length + redaction.ordinal();
     }
 
-    // WafContext closed-concurrently race (APPSEC-69085)
-    int contextClosedRace = contextClosedRaceCounter.getAndSet(0);
-    if (contextClosedRace > 0) {
-      if (!rawMetricsQueue.offer(new ContextClosedRace(contextClosedRace))) {
-        return;
-      }
+    /**
+     * Reports an evaluation that failed. The failure is counted twice on purpose, mirroring every
+     * other tracer: as {@code error:true} on {@code ai_guard.requests}, which keeps the request count
+     * complete, and under {@code ai_guard.error} with the {@code type} that classifies it.
+     */
+    public void aiGuardError(final AIGuardError type) {
+        aiGuardErrors.incrementAndGet();
+        aiGuardErrorTypes.incrementAndGet(type.ordinal());
     }
 
-    // AI Guard successful requests
-    aiGuardSuccesses:
-    for (final AIGuard.Action action : AIGuard.Action.values()) {
-      for (int blockFlag = 1; blockFlag >= 0; blockFlag--) {
-        final boolean block = blockFlag == 1;
-        for (final AIGuardRedaction redaction : REDACTION_VALUES) {
-          final long count =
-              aiGuardRequests.getAndSet(aiGuardRequestIndex(action, block, redaction), 0);
-          if (count > 0) {
-            if (!rawMetricsQueue.offer(AIGuardRequests.success(count, action, block, redaction))) {
-              break aiGuardSuccesses;
-            }
-          }
-        }
-      }
+    /**
+     * Reports {@code count} replacements that redaction could not apply. Unlike {@link
+     * #aiGuardError(AIGuardError)} this does not count a failed request: redaction is best effort and
+     * never fails the evaluation it rode in on.
+     */
+    public void aiGuardRedactionErrors(final long count) {
+        aiGuardErrorTypes.addAndGet(AIGuardError.REDACTION_ERROR.ordinal(), count);
     }
 
-    // AI Guard failed requests
-    final int aiGuardErrorRequests = aiGuardErrors.getAndSet(0);
-    if (aiGuardErrorRequests > 0) {
-      if (!rawMetricsQueue.offer(AIGuardRequests.error(aiGuardErrorRequests))) {
-        return;
-      }
+    public void aiGuardTruncated(final AIGuardTruncationType type) {
+        aiGuardTruncated.incrementAndGet(type.ordinal());
     }
 
-    // AI Guard errors, per type
-    for (final AIGuardError type : AI_GUARD_ERROR_VALUES) {
-      final long count = aiGuardErrorTypes.getAndSet(type.ordinal(), 0);
-      if (count > 0) {
-        if (!rawMetricsQueue.offer(new AIGuardErrors(count, type))) {
-          return;
-        }
-      }
+    /**
+     * Reports a request for which API Security could not resolve a route, and therefore could not be
+     * considered for schema extraction sampling.
+     */
+    public void apiSecurityMissingRoute(final String framework) {
+        counterFor(apiSecurityMissingRouteCounters, framework).incrementAndGet();
     }
 
-    // AI Guard truncated messages
-    for (final AIGuardTruncationType type : AIGuardTruncationType.values()) {
-      final long count = aiGuardTruncated.getAndSet(type.ordinal(), 0);
-      if (count > 0) {
-        if (!rawMetricsQueue.offer(new AIGuardTruncated(count, type))) {
-          return;
-        }
-      }
+    /** Reports a sampled request for which at least one API Security schema was extracted. */
+    public void apiSecurityRequestSchema(final String framework) {
+        counterFor(apiSecurityRequestSchemaCounters, framework).incrementAndGet();
     }
 
-    // API Security missing route, per framework
-    for (final Map.Entry<String, AtomicLong> entry : apiSecurityMissingRouteCounters.entrySet()) {
-      final long count = entry.getValue().getAndSet(0);
-      if (count > 0) {
-        if (!rawMetricsQueue.offer(new ApiSecurityMissingRoute(count, entry.getKey()))) {
-          return;
+    /** Reports a sampled request for which no API Security schema was extracted. */
+    public void apiSecurityRequestNoSchema(final String framework) {
+        counterFor(apiSecurityRequestNoSchemaCounters, framework).incrementAndGet();
+    }
+
+    /**
+     * Normalizes a framework (span component) value, mapping null or blank values to "unknown" and
+     * sanitizing the rest via {@link TagsHelper#sanitize}, which also bounds its length. {@code
+     * framework} can originate from manual/custom instrumentation setting the {@code component} tag
+     * per request, so without this the retained-but-cardinality-capped keys could still consume
+     * unbounded heap in bytes even though their count is bounded.
+     */
+    static String normalizeFramework(final String framework) {
+        if (framework == null || framework.trim().isEmpty()) {
+            return UNKNOWN_FRAMEWORK;
         }
-      }
+        return TagsHelper.sanitize(framework.trim());
     }
 
-    // API Security request schema, per framework
-    for (final Map.Entry<String, AtomicLong> entry : apiSecurityRequestSchemaCounters.entrySet()) {
-      final long count = entry.getValue().getAndSet(0);
-      if (count > 0) {
-        if (!rawMetricsQueue.offer(new ApiSecurityRequestSchema(count, entry.getKey()))) {
-          return;
+    /**
+     * Returns the counter for {@code framework} in {@code counters}, capping the map at {@link
+     * #MAX_FRAMEWORK_CARDINALITY} distinct keys ({@link #UNKNOWN_FRAMEWORK} pre-reserved by {@link
+     * #newFrameworkCounters()}). Once the cap is reached, any framework not already tracked is folded
+     * into {@link #UNKNOWN_FRAMEWORK} instead of growing the map further. The fast path for an
+     * already-tracked key is lock-free; admission of a never-seen key is synchronized on {@code
+     * counters} so the size check and the insertion happen atomically, closing the race where
+     * concurrent first-seen frameworks could otherwise all pass the check and overshoot the cap.
+     *
+     * <p>Before normalizing, we first probe {@code counters} with the raw, unsanitized {@code
+     * framework} value. Well-known frameworks (e.g. "netty") are already in sanitized form, so once
+     * admitted, this raw lookup hits directly and skips {@link #normalizeFramework}'s allocation (via
+     * {@link TagsHelper#sanitize}) on every subsequent call for that framework.
+     */
+    @SuppressFBWarnings("JLM_JSR166_UTILCONCURRENT_MONITORENTER")
+    private static AtomicLong counterFor(final ConcurrentHashMap<String, AtomicLong> counters, final String framework) {
+        if (framework != null) {
+            final AtomicLong rawHit = counters.get(framework);
+            if (rawHit != null) {
+                return rawHit;
+            }
+        }
+        final String key = normalizeFramework(framework);
+        final AtomicLong existing = counters.get(key);
+        if (existing != null) {
+            return existing;
+        }
+        synchronized (counters) {
+            final AtomicLong existingSync = counters.get(key);
+            if (existingSync != null) {
+                return existingSync;
+            }
+            if (counters.size() >= MAX_FRAMEWORK_CARDINALITY) {
+                return counters.get(UNKNOWN_FRAMEWORK);
+            }
+            final AtomicLong created = new AtomicLong();
+            counters.put(key, created);
+            return created;
         }
-      }
     }
 
-    // API Security request no schema, per framework
-    for (final Map.Entry<String, AtomicLong> entry :
-        apiSecurityRequestNoSchemaCounters.entrySet()) {
-      final long count = entry.getValue().getAndSet(0);
-      if (count > 0) {
-        if (!rawMetricsQueue.offer(new ApiSecurityRequestNoSchema(count, entry.getKey()))) {
-          return;
+    @Override
+    public Collection<WafMetric> drain() {
+        if (!rawMetricsQueue.isEmpty()) {
+            List<WafMetric> list = new LinkedList<>();
+            int drained = rawMetricsQueue.drainTo(list);
+            if (drained > 0) {
+                return list;
+            }
+        }
+        return Collections.emptyList();
+    }
+
+    @Override
+    public void prepareMetrics() {
+
+        // Requests
+        for (int i = 0; i < WAF_REQUEST_COMBINATIONS; i++) {
+            long counter = wafRequestCounter.getAndSet(i, 0);
+            if (counter > 0) {
+                boolean ruleTriggered = (i & 1) != 0;
+                boolean requestBlocked = (i & (1 << 1)) != 0;
+                boolean wafError = (i & (1 << 2)) != 0;
+                boolean wafTimeout = (i & (1 << 3)) != 0;
+                boolean blockFailure = (i & (1 << 4)) != 0;
+                boolean rateLimited = (i & (1 << 5)) != 0;
+                boolean inputTruncated = (i & (1 << 6)) != 0;
+                boolean requestExcluded = (i & (1 << 7)) != 0;
+
+                if (!rawMetricsQueue.offer(new WafRequestsRawMetric(
+                        counter,
+                        WafMetricCollector.wafVersion,
+                        WafMetricCollector.rulesVersion,
+                        ruleTriggered,
+                        requestBlocked,
+                        wafError,
+                        wafTimeout,
+                        blockFailure,
+                        rateLimited,
+                        inputTruncated,
+                        requestExcluded))) {
+                    return;
+                }
+            }
+        }
+
+        // WAF input truncated
+        for (int i = 0; i < (1 << 3); i++) {
+            long counter = wafInputTruncatedCounter.getAndSet(i, 0);
+            if (counter > 0) {
+                if (!rawMetricsQueue.offer(new WafInputTruncated(counter, i))) {
+                    return;
+                }
+            }
+        }
+
+        // RASP rule eval per rule type
+        for (RuleType ruleType : RuleType.values()) {
+            long counter = raspRuleEvalCounter.getAndSet(ruleType.ordinal(), 0);
+            if (counter > 0) {
+                if (!rawMetricsQueue.offer(new RaspRuleEval(counter, ruleType, WafMetricCollector.wafVersion))) {
+                    return;
+                }
+            }
+        }
+
+        // RASP rule match per rule type: two slots per RuleType: ordinal*2 (non-blocked),
+        // ordinal*2+1 (blocked)
+        for (RuleType ruleType : RuleType.values()) {
+            long blockedCount = raspRuleMatchCounter.getAndSet(ruleType.ordinal() * 2 + 1, 0);
+            if (blockedCount > 0) {
+                if (!rawMetricsQueue.offer(
+                        new RaspRuleMatch(blockedCount, ruleType, WafMetricCollector.wafVersion, true))) {
+                    return;
+                }
+            }
+            long nonBlockedCount = raspRuleMatchCounter.getAndSet(ruleType.ordinal() * 2, 0);
+            if (nonBlockedCount > 0) {
+                if (!rawMetricsQueue.offer(
+                        new RaspRuleMatch(nonBlockedCount, ruleType, WafMetricCollector.wafVersion, false))) {
+                    return;
+                }
+            }
+        }
+
+        // RASP timeout per rule type
+        for (RuleType ruleType : RuleType.values()) {
+            long counter = raspTimeoutCounter.getAndSet(ruleType.ordinal(), 0);
+            if (counter > 0) {
+                if (!rawMetricsQueue.offer(new RaspTimeout(counter, ruleType, WafMetricCollector.wafVersion))) {
+                    return;
+                }
+            }
+        }
+
+        // RASP rule type for each possible error code
+        for (WafErrorCode errorCode : WafErrorCode.values()) {
+            for (RuleType ruleType : RuleType.values()) {
+                int index = errorCode.ordinal() * RuleType.getNumValues() + ruleType.ordinal();
+                long count = raspErrorCodeCounter.getAndSet(index, 0);
+                if (count > 0) {
+                    if (!rawMetricsQueue.offer(
+                            new RaspError(count, ruleType, WafMetricCollector.wafVersion, errorCode.getCode()))) {
+                        return;
+                    }
+                }
+            }
+        }
+
+        // Missing user login
+        for (LoginFramework framework : LoginFramework.values()) {
+            for (LoginEvent event : LoginEvent.values()) {
+                final int ordinal = framework.ordinal() * LoginEvent.getNumValues() + event.ordinal();
+                long counter = missingUserLoginQueue.getAndSet(ordinal, 0);
+                if (counter > 0) {
+                    if (!rawMetricsQueue.offer(
+                            new MissingUserLoginMetric(counter, framework.getTag(), event.getTag()))) {
+                        return;
+                    }
+                }
+            }
+        }
+
+        // Missing user id
+        for (LoginFramework framework : LoginFramework.values()) {
+            long counter = missingUserIdQueue.getAndSet(framework.ordinal(), 0);
+            if (counter > 0) {
+                if (!rawMetricsQueue.offer(new MissingUserIdMetric(counter, framework.getTag()))) {
+                    return;
+                }
+            }
+        }
+
+        // ATO login events
+        for (LoginEvent event : LoginEvent.values()) {
+            for (LoginVersion version : LoginVersion.values()) {
+                final int ordinal = event.ordinal() * LoginVersion.getNumValues() + version.ordinal();
+                long counter = appSecSdkEventQueue.getAndSet(ordinal, 0);
+                if (counter > 0) {
+                    if (!rawMetricsQueue.offer(new AppSecSdkEvent(counter, event.getTag(), version.getTag()))) {
+                        return;
+                    }
+                }
+            }
+        }
+
+        // WAF rule type for each possible error code
+        for (WafErrorCode errorCode : WafErrorCode.values()) {
+            long count = wafErrorCodeCounter.getAndSet(errorCode.ordinal(), 0);
+            if (count > 0) {
+                if (!rawMetricsQueue.offer(new WafError(count, WafMetricCollector.wafVersion, errorCode.getCode()))) {
+                    return;
+                }
+            }
+        }
+
+        // RASP rule skipped per rule type for after-request reason
+        for (RuleType ruleType : RuleType.values()) {
+            long counter = raspRuleSkippedCounter.getAndSet(ruleType.ordinal(), 0);
+            if (counter > 0) {
+                if (!rawMetricsQueue.offer(new AfterRequestRaspRuleSkipped(counter, ruleType))) {
+                    return;
+                }
+            }
+        }
+
+        // WAF config errors
+        int configErrors = wafConfigErrorCounter.getAndSet(0);
+        if (configErrors > 0) {
+            if (!rawMetricsQueue.offer(
+                    new WafConfigError(configErrors, WafMetricCollector.wafVersion, WafMetricCollector.rulesVersion))) {
+                return;
+            }
+        }
+
+        // WafContext closed-concurrently race (APPSEC-69085)
+        int contextClosedRace = contextClosedRaceCounter.getAndSet(0);
+        if (contextClosedRace > 0) {
+            if (!rawMetricsQueue.offer(new ContextClosedRace(contextClosedRace))) {
+                return;
+            }
+        }
+
+        // AI Guard successful requests
+        aiGuardSuccesses:
+        for (final AIGuard.Action action : AIGuard.Action.values()) {
+            for (int blockFlag = 1; blockFlag >= 0; blockFlag--) {
+                final boolean block = blockFlag == 1;
+                for (final AIGuardRedaction redaction : REDACTION_VALUES) {
+                    final long count = aiGuardRequests.getAndSet(aiGuardRequestIndex(action, block, redaction), 0);
+                    if (count > 0) {
+                        if (!rawMetricsQueue.offer(AIGuardRequests.success(count, action, block, redaction))) {
+                            break aiGuardSuccesses;
+                        }
+                    }
+                }
+            }
+        }
+
+        // AI Guard failed requests
+        final int aiGuardErrorRequests = aiGuardErrors.getAndSet(0);
+        if (aiGuardErrorRequests > 0) {
+            if (!rawMetricsQueue.offer(AIGuardRequests.error(aiGuardErrorRequests))) {
+                return;
+            }
+        }
+
+        // AI Guard errors, per type
+        for (final AIGuardError type : AI_GUARD_ERROR_VALUES) {
+            final long count = aiGuardErrorTypes.getAndSet(type.ordinal(), 0);
+            if (count > 0) {
+                if (!rawMetricsQueue.offer(new AIGuardErrors(count, type))) {
+                    return;
+                }
+            }
+        }
+
+        // AI Guard truncated messages
+        for (final AIGuardTruncationType type : AIGuardTruncationType.values()) {
+            final long count = aiGuardTruncated.getAndSet(type.ordinal(), 0);
+            if (count > 0) {
+                if (!rawMetricsQueue.offer(new AIGuardTruncated(count, type))) {
+                    return;
+                }
+            }
+        }
+
+        // API Security missing route, per framework
+        for (final Map.Entry<String, AtomicLong> entry : apiSecurityMissingRouteCounters.entrySet()) {
+            final long count = entry.getValue().getAndSet(0);
+            if (count > 0) {
+                if (!rawMetricsQueue.offer(new ApiSecurityMissingRoute(count, entry.getKey()))) {
+                    return;
+                }
+            }
+        }
+
+        // API Security request schema, per framework
+        for (final Map.Entry<String, AtomicLong> entry : apiSecurityRequestSchemaCounters.entrySet()) {
+            final long count = entry.getValue().getAndSet(0);
+            if (count > 0) {
+                if (!rawMetricsQueue.offer(new ApiSecurityRequestSchema(count, entry.getKey()))) {
+                    return;
+                }
+            }
+        }
+
+        // API Security request no schema, per framework
+        for (final Map.Entry<String, AtomicLong> entry : apiSecurityRequestNoSchemaCounters.entrySet()) {
+            final long count = entry.getValue().getAndSet(0);
+            if (count > 0) {
+                if (!rawMetricsQueue.offer(new ApiSecurityRequestNoSchema(count, entry.getKey()))) {
+                    return;
+                }
+            }
         }
-      }
     }
-  }
 
-  public abstract static class WafMetric extends MetricCollector.Metric {
+    public abstract static class WafMetric extends MetricCollector.Metric {
+
+        public WafMetric(String metricName, long counter, String... tags) {
+            this(NAMESPACE, metricName, counter, tags);
+        }
 
-    public WafMetric(String metricName, long counter, String... tags) {
-      this(NAMESPACE, metricName, counter, tags);
+        protected WafMetric(String namespace, String metricName, long counter, String... tags) {
+            super(namespace, true, metricName, "count", counter, tags);
+        }
     }
 
-    protected WafMetric(String namespace, String metricName, long counter, String... tags) {
-      super(namespace, true, metricName, "count", counter, tags);
+    public static class WafInitRawMetric extends WafMetric {
+        public WafInitRawMetric(
+                final long counter, final String wafVersion, final String rulesVersion, final boolean success) {
+            super(
+                    "waf.init",
+                    counter,
+                    "waf_version:" + wafVersion,
+                    "event_rules_version:" + rulesVersion,
+                    "success:" + success);
+        }
     }
-  }
-
-  public static class WafInitRawMetric extends WafMetric {
-    public WafInitRawMetric(
-        final long counter,
-        final String wafVersion,
-        final String rulesVersion,
-        final boolean success) {
-      super(
-          "waf.init",
-          counter,
-          "waf_version:" + wafVersion,
-          "event_rules_version:" + rulesVersion,
-          "success:" + success);
+
+    public static class WafUpdatesRawMetric extends WafMetric {
+        public WafUpdatesRawMetric(
+                final long counter, final String wafVersion, final String rulesVersion, final boolean success) {
+            super(
+                    "waf.updates",
+                    counter,
+                    "waf_version:" + wafVersion,
+                    "event_rules_version:" + rulesVersion,
+                    "success:" + success);
+        }
     }
-  }
-
-  public static class WafUpdatesRawMetric extends WafMetric {
-    public WafUpdatesRawMetric(
-        final long counter,
-        final String wafVersion,
-        final String rulesVersion,
-        final boolean success) {
-      super(
-          "waf.updates",
-          counter,
-          "waf_version:" + wafVersion,
-          "event_rules_version:" + rulesVersion,
-          "success:" + success);
+
+    public static class MissingUserLoginMetric extends WafMetric {
+
+        public MissingUserLoginMetric(long counter, String framework, String type) {
+            super("instrum.user_auth.missing_user_login", counter, "framework:" + framework, "event_type:" + type);
+        }
     }
-  }
 
-  public static class MissingUserLoginMetric extends WafMetric {
+    public static class MissingUserIdMetric extends WafMetric {
 
-    public MissingUserLoginMetric(long counter, String framework, String type) {
-      super(
-          "instrum.user_auth.missing_user_login",
-          counter,
-          "framework:" + framework,
-          "event_type:" + type);
+        public MissingUserIdMetric(long counter, String framework) {
+            super(
+                    "instrum.user_auth.missing_user_id",
+                    counter,
+                    "framework:" + framework,
+                    "event_type:authenticated_request");
+        }
     }
-  }
 
-  public static class MissingUserIdMetric extends WafMetric {
+    public static class AppSecSdkEvent extends WafMetric {
 
-    public MissingUserIdMetric(long counter, String framework) {
-      super(
-          "instrum.user_auth.missing_user_id",
-          counter,
-          "framework:" + framework,
-          "event_type:authenticated_request");
+        public AppSecSdkEvent(long counter, String event, final String version) {
+            super("sdk.event", counter, "event_type:" + event, "sdk_version:" + version);
+        }
     }
-  }
 
-  public static class AppSecSdkEvent extends WafMetric {
+    public static class WafRequestsRawMetric extends WafMetric {
+        public WafRequestsRawMetric(
+                final long counter,
+                final String wafVersion,
+                final String rulesVersion,
+                final boolean triggered,
+                final boolean blocked,
+                final boolean wafError,
+                final boolean wafTimeout,
+                final boolean blockFailure,
+                final boolean rateLimited,
+                final boolean inputTruncated,
+                final boolean requestExcluded) {
+            super(
+                    "waf.requests",
+                    counter,
+                    "waf_version:" + wafVersion,
+                    "event_rules_version:" + rulesVersion,
+                    "rule_triggered:" + triggered,
+                    "request_blocked:" + blocked,
+                    "waf_error:" + wafError,
+                    "waf_timeout:" + wafTimeout,
+                    "block_failure:" + blockFailure,
+                    "rate_limited:" + rateLimited,
+                    "input_truncated:" + inputTruncated,
+                    "request_excluded:" + (requestExcluded ? "full" : "none"));
+        }
+    }
 
-    public AppSecSdkEvent(long counter, String event, final String version) {
-      super("sdk.event", counter, "event_type:" + event, "sdk_version:" + version);
+    public void addWafConfigError(int nbErrors) {
+        wafConfigErrorCounter.addAndGet(nbErrors);
     }
-  }
-
-  public static class WafRequestsRawMetric extends WafMetric {
-    public WafRequestsRawMetric(
-        final long counter,
-        final String wafVersion,
-        final String rulesVersion,
-        final boolean triggered,
-        final boolean blocked,
-        final boolean wafError,
-        final boolean wafTimeout,
-        final boolean blockFailure,
-        final boolean rateLimited,
-        final boolean inputTruncated,
-        final boolean requestExcluded) {
-      super(
-          "waf.requests",
-          counter,
-          "waf_version:" + wafVersion,
-          "event_rules_version:" + rulesVersion,
-          "rule_triggered:" + triggered,
-          "request_blocked:" + blocked,
-          "waf_error:" + wafError,
-          "waf_timeout:" + wafTimeout,
-          "block_failure:" + blockFailure,
-          "rate_limited:" + rateLimited,
-          "input_truncated:" + inputTruncated,
-          "request_excluded:" + (requestExcluded ? "full" : "none"));
+
+    /**
+     * Records that {@code getOrCreateWafContext} rejected a run because the request's {@code
+     * WafContext} was already closed concurrently (APPSEC-69085). Used to measure the frequency of
+     * this race in production.
+     */
+    public void wafContextClosedRace() {
+        contextClosedRaceCounter.incrementAndGet();
     }
-  }
-
-  public void addWafConfigError(int nbErrors) {
-    wafConfigErrorCounter.addAndGet(nbErrors);
-  }
-
-  /**
-   * Records that {@code getOrCreateWafContext} rejected a run because the request's {@code
-   * WafContext} was already closed concurrently (APPSEC-69085). Used to measure the frequency of
-   * this race in production.
-   */
-  public void wafContextClosedRace() {
-    contextClosedRaceCounter.incrementAndGet();
-  }
-
-  public static class ContextClosedRace extends WafMetric {
-    public ContextClosedRace(final long counter) {
-      super("waf.context_closed_race", counter);
+
+    public static class ContextClosedRace extends WafMetric {
+        public ContextClosedRace(final long counter) {
+            super("waf.context_closed_race", counter);
+        }
     }
-  }
-
-  public static class WafConfigError extends WafMetric {
-    public WafConfigError(final long counter, final String wafVersion, final String rulesVersion) {
-      super(
-          "waf.config_errors",
-          counter,
-          "waf_version:" + wafVersion,
-          "event_rules_version:" + rulesVersion);
+
+    public static class WafConfigError extends WafMetric {
+        public WafConfigError(final long counter, final String wafVersion, final String rulesVersion) {
+            super("waf.config_errors", counter, "waf_version:" + wafVersion, "event_rules_version:" + rulesVersion);
+        }
     }
-  }
-
-  public static class RaspRuleEval extends WafMetric {
-    public RaspRuleEval(final long counter, final RuleType ruleType, final String wafVersion) {
-      super(
-          "rasp.rule.eval",
-          counter,
-          ruleType.variant != null
-              ? new String[] {
-                "rule_type:" + ruleType.type,
-                "rule_variant:" + ruleType.variant,
-                "waf_version:" + wafVersion,
-                "event_rules_version:" + rulesVersion
-              }
-              : new String[] {"rule_type:" + ruleType.type, "waf_version:" + wafVersion});
+
+    public static class RaspRuleEval extends WafMetric {
+        public RaspRuleEval(final long counter, final RuleType ruleType, final String wafVersion) {
+            super(
+                    "rasp.rule.eval",
+                    counter,
+                    ruleType.variant != null
+                            ? new String[] {
+                                "rule_type:" + ruleType.type,
+                                "rule_variant:" + ruleType.variant,
+                                "waf_version:" + wafVersion,
+                                "event_rules_version:" + rulesVersion
+                            }
+                            : new String[] {"rule_type:" + ruleType.type, "waf_version:" + wafVersion});
+        }
     }
-  }
-
-  // Although rasp.rule.skipped reason could be before-request, there is no real case scenario
-  public static class AfterRequestRaspRuleSkipped extends WafMetric {
-    public AfterRequestRaspRuleSkipped(final long counter, final RuleType ruleType) {
-      super(
-          "rasp.rule.skipped",
-          counter,
-          ruleType.variant != null
-              ? new String[] {
-                "rule_type:" + ruleType.type,
-                "rule_variant:" + ruleType.variant,
-                "reason:" + "after-request"
-              }
-              : new String[] {"rule_type:" + ruleType.type, "reason:" + "after-request"});
+
+    // Although rasp.rule.skipped reason could be before-request, there is no real case scenario
+    public static class AfterRequestRaspRuleSkipped extends WafMetric {
+        public AfterRequestRaspRuleSkipped(final long counter, final RuleType ruleType) {
+            super(
+                    "rasp.rule.skipped",
+                    counter,
+                    ruleType.variant != null
+                            ? new String[] {
+                                "rule_type:" + ruleType.type,
+                                "rule_variant:" + ruleType.variant,
+                                "reason:" + "after-request"
+                            }
+                            : new String[] {"rule_type:" + ruleType.type, "reason:" + "after-request"});
+        }
     }
-  }
-
-  public static class RaspRuleMatch extends WafMetric {
-    public RaspRuleMatch(
-        final long counter,
-        final RuleType ruleType,
-        final String wafVersion,
-        final boolean blocked) {
-      super(
-          "rasp.rule.match",
-          counter,
-          ruleType.variant != null
-              ? new String[] {
-                "rule_type:" + ruleType.type,
-                "rule_variant:" + ruleType.variant,
-                "waf_version:" + wafVersion,
-                "event_rules_version:" + rulesVersion,
-                "block:" + blocked
-              }
-              : new String[] {
-                "rule_type:" + ruleType.type, "waf_version:" + wafVersion, "block:" + blocked
-              });
+
+    public static class RaspRuleMatch extends WafMetric {
+        public RaspRuleMatch(
+                final long counter, final RuleType ruleType, final String wafVersion, final boolean blocked) {
+            super(
+                    "rasp.rule.match",
+                    counter,
+                    ruleType.variant != null
+                            ? new String[] {
+                                "rule_type:" + ruleType.type,
+                                "rule_variant:" + ruleType.variant,
+                                "waf_version:" + wafVersion,
+                                "event_rules_version:" + rulesVersion,
+                                "block:" + blocked
+                            }
+                            : new String[] {
+                                "rule_type:" + ruleType.type, "waf_version:" + wafVersion, "block:" + blocked
+                            });
+        }
     }
-  }
-
-  public static class RaspTimeout extends WafMetric {
-    public RaspTimeout(final long counter, final RuleType ruleType, final String wafVersion) {
-      super(
-          "rasp.timeout",
-          counter,
-          ruleType.variant != null
-              ? new String[] {
-                "rule_type:" + ruleType.type,
-                "rule_variant:" + ruleType.variant,
-                "waf_version:" + wafVersion,
-                "event_rules_version:" + rulesVersion
-              }
-              : new String[] {"rule_type:" + ruleType.type, "waf_version:" + wafVersion});
+
+    public static class RaspTimeout extends WafMetric {
+        public RaspTimeout(final long counter, final RuleType ruleType, final String wafVersion) {
+            super(
+                    "rasp.timeout",
+                    counter,
+                    ruleType.variant != null
+                            ? new String[] {
+                                "rule_type:" + ruleType.type,
+                                "rule_variant:" + ruleType.variant,
+                                "waf_version:" + wafVersion,
+                                "event_rules_version:" + rulesVersion
+                            }
+                            : new String[] {"rule_type:" + ruleType.type, "waf_version:" + wafVersion});
+        }
     }
-  }
-
-  public static class RaspError extends WafMetric {
-    public RaspError(
-        final long counter,
-        final RuleType ruleType,
-        final String wafVersion,
-        final Integer ddwafRunError) {
-      super(
-          "rasp.error",
-          counter,
-          ruleType.variant != null
-              ? new String[] {
-                "rule_type:" + ruleType.type,
-                "rule_variant:" + ruleType.variant,
-                "waf_version:" + wafVersion,
-                "event_rules_version:" + rulesVersion,
-                "waf_error:" + ddwafRunError
-              }
-              : new String[] {
-                "rule_type:" + ruleType.type,
-                "waf_version:" + wafVersion,
-                "waf_error:" + ddwafRunError
-              });
+
+    public static class RaspError extends WafMetric {
+        public RaspError(
+                final long counter, final RuleType ruleType, final String wafVersion, final Integer ddwafRunError) {
+            super(
+                    "rasp.error",
+                    counter,
+                    ruleType.variant != null
+                            ? new String[] {
+                                "rule_type:" + ruleType.type,
+                                "rule_variant:" + ruleType.variant,
+                                "waf_version:" + wafVersion,
+                                "event_rules_version:" + rulesVersion,
+                                "waf_error:" + ddwafRunError
+                            }
+                            : new String[] {
+                                "rule_type:" + ruleType.type, "waf_version:" + wafVersion, "waf_error:" + ddwafRunError
+                            });
+        }
     }
-  }
-
-  public static class WafError extends WafMetric {
-    public WafError(final long counter, final String wafVersion, final Integer ddwafRunError) {
-      super(
-          "waf.error",
-          counter,
-          "waf_version:" + wafVersion,
-          "event_rules_version:" + rulesVersion,
-          "waf_error:" + ddwafRunError);
+
+    public static class WafError extends WafMetric {
+        public WafError(final long counter, final String wafVersion, final Integer ddwafRunError) {
+            super(
+                    "waf.error",
+                    counter,
+                    "waf_version:" + wafVersion,
+                    "event_rules_version:" + rulesVersion,
+                    "waf_error:" + ddwafRunError);
+        }
     }
-  }
 
-  public static class WafInputTruncated extends WafMetric {
-    public WafInputTruncated(final long counter, final int bitfield) {
-      super("waf.input_truncated", counter, "truncation_reason:" + bitfield);
+    public static class WafInputTruncated extends WafMetric {
+        public WafInputTruncated(final long counter, final int bitfield) {
+            super("waf.input_truncated", counter, "truncation_reason:" + bitfield);
+        }
     }
-  }
 
-  /** Base class for the metrics reported under the {@code ai_guard} namespace. */
-  public abstract static class AIGuardMetric extends WafMetric {
+    /** Base class for the metrics reported under the {@code ai_guard} namespace. */
+    public abstract static class AIGuardMetric extends WafMetric {
 
-    /**
-     * Call-path tags the AI Guard specification requires on every metric in this namespace. Both
-     * are constant here: the JVM tracer only reaches an evaluation through a direct SDK call, so
-     * there is no auto-instrumented integration to name. They become dimensional once AI Guard
-     * auto-instrumentation lands.
-     */
-    private static final String[] CALL_PATH_TAGS = {"source:sdk", "integration:none"};
+        /**
+         * Call-path tags the AI Guard specification requires on every metric in this namespace. Both
+         * are constant here: the JVM tracer only reaches an evaluation through a direct SDK call, so
+         * there is no auto-instrumented integration to name. They become dimensional once AI Guard
+         * auto-instrumentation lands.
+         */
+        private static final String[] CALL_PATH_TAGS = {"source:sdk", "integration:none"};
 
-    protected AIGuardMetric(final String metricName, final long counter, final String... tags) {
-      super(AI_GUARD_NAMESPACE, metricName, counter, withCallPath(tags));
-    }
+        protected AIGuardMetric(final String metricName, final long counter, final String... tags) {
+            super(AI_GUARD_NAMESPACE, metricName, counter, withCallPath(tags));
+        }
 
-    private static String[] withCallPath(final String[] tags) {
-      final String[] result = Arrays.copyOf(tags, tags.length + CALL_PATH_TAGS.length);
-      System.arraycopy(CALL_PATH_TAGS, 0, result, tags.length, CALL_PATH_TAGS.length);
-      return result;
+        private static String[] withCallPath(final String[] tags) {
+            final String[] result = Arrays.copyOf(tags, tags.length + CALL_PATH_TAGS.length);
+            System.arraycopy(CALL_PATH_TAGS, 0, result, tags.length, CALL_PATH_TAGS.length);
+            return result;
+        }
     }
-  }
 
-  public static class AIGuardRequests extends AIGuardMetric {
-    private AIGuardRequests(final long count, final String... tags) {
-      super("requests", count, tags);
-    }
+    public static class AIGuardRequests extends AIGuardMetric {
+        private AIGuardRequests(final long count, final String... tags) {
+            super("requests", count, tags);
+        }
+
+        public static AIGuardRequests success(
+                final long count, final AIGuard.Action action, final boolean block, final AIGuardRedaction redaction) {
+            if (redaction == AIGuardRedaction.DISABLED) {
+                // No redacted tag at all, so its absence stays distinguishable from a false value.
+                return new AIGuardRequests(count, "action:" + action, "block:" + block, "error:false");
+            }
+            return new AIGuardRequests(
+                    count,
+                    "action:" + action,
+                    "block:" + block,
+                    "error:false",
+                    "redacted:" + (redaction == AIGuardRedaction.APPLIED));
+        }
 
-    public static AIGuardRequests success(
-        final long count,
-        final AIGuard.Action action,
-        final boolean block,
-        final AIGuardRedaction redaction) {
-      if (redaction == AIGuardRedaction.DISABLED) {
-        // No redacted tag at all, so its absence stays distinguishable from a false value.
-        return new AIGuardRequests(count, "action:" + action, "block:" + block, "error:false");
-      }
-      return new AIGuardRequests(
-          count,
-          "action:" + action,
-          "block:" + block,
-          "error:false",
-          "redacted:" + (redaction == AIGuardRedaction.APPLIED));
+        public static AIGuardRequests error(final long count) {
+            return new AIGuardRequests(count, "error:true");
+        }
     }
 
-    public static AIGuardRequests error(final long count) {
-      return new AIGuardRequests(count, "error:true");
+    /**
+     * Failures reported under {@code ai_guard.error}, classified by {@link AIGuardError}. An
+     * evaluation failure is reported here <em>and</em> as {@code error:true} on {@code
+     * ai_guard.requests}; a redaction error is reported only here.
+     */
+    public static class AIGuardErrors extends AIGuardMetric {
+        public AIGuardErrors(final long count, final AIGuardError type) {
+            super("error", count, "type:" + type.tagValue);
+        }
     }
-  }
-
-  /**
-   * Failures reported under {@code ai_guard.error}, classified by {@link AIGuardError}. An
-   * evaluation failure is reported here <em>and</em> as {@code error:true} on {@code
-   * ai_guard.requests}; a redaction error is reported only here.
-   */
-  public static class AIGuardErrors extends AIGuardMetric {
-    public AIGuardErrors(final long count, final AIGuardError type) {
-      super("error", count, "type:" + type.tagValue);
+
+    public static class AIGuardTruncated extends AIGuardMetric {
+        public AIGuardTruncated(final long count, final AIGuardTruncationType type) {
+            super("truncated", count, "type:" + type.tagValue);
+        }
     }
-  }
 
-  public static class AIGuardTruncated extends AIGuardMetric {
-    public AIGuardTruncated(final long count, final AIGuardTruncationType type) {
-      super("truncated", count, "type:" + type.tagValue);
+    public static class ApiSecurityMissingRoute extends WafMetric {
+        public ApiSecurityMissingRoute(final long counter, final String framework) {
+            super("api_security.missing_route", counter, "framework:" + framework);
+        }
     }
-  }
 
-  public static class ApiSecurityMissingRoute extends WafMetric {
-    public ApiSecurityMissingRoute(final long counter, final String framework) {
-      super("api_security.missing_route", counter, "framework:" + framework);
+    public static class ApiSecurityRequestSchema extends WafMetric {
+        public ApiSecurityRequestSchema(final long counter, final String framework) {
+            super("api_security.request.schema", counter, "framework:" + framework);
+        }
     }
-  }
 
-  public static class ApiSecurityRequestSchema extends WafMetric {
-    public ApiSecurityRequestSchema(final long counter, final String framework) {
-      super("api_security.request.schema", counter, "framework:" + framework);
+    public static class ApiSecurityRequestNoSchema extends WafMetric {
+        public ApiSecurityRequestNoSchema(final long counter, final String framework) {
+            super("api_security.request.no_schema", counter, "framework:" + framework);
+        }
     }
-  }
 
-  public static class ApiSecurityRequestNoSchema extends WafMetric {
-    public ApiSecurityRequestNoSchema(final long counter, final String framework) {
-      super("api_security.request.no_schema", counter, "framework:" + framework);
+    /**
+     * Whether an evaluation redacted anything, as reported by the {@code redacted} tag on {@code
+     * ai_guard.requests}. {@link #DISABLED} reports no tag at all, so an absent tag means "redaction
+     * is off" and stays distinguishable from {@code redacted:false}.
+     */
+    public enum AIGuardRedaction {
+        /** Redaction is disabled locally, so nothing was even attempted. */
+        DISABLED,
+        /** Redaction is enabled and at least one replacement was applied. */
+        APPLIED,
+        /** Redaction is enabled but nothing was redacted. */
+        NOT_APPLIED
     }
-  }
-
-  /**
-   * Whether an evaluation redacted anything, as reported by the {@code redacted} tag on {@code
-   * ai_guard.requests}. {@link #DISABLED} reports no tag at all, so an absent tag means "redaction
-   * is off" and stays distinguishable from {@code redacted:false}.
-   */
-  public enum AIGuardRedaction {
-    /** Redaction is disabled locally, so nothing was even attempted. */
-    DISABLED,
-    /** Redaction is enabled and at least one replacement was applied. */
-    APPLIED,
-    /** Redaction is enabled but nothing was redacted. */
-    NOT_APPLIED
-  }
-
-  /**
-   * Classification of the failures reported under {@code ai_guard.error}, as the {@code type} tag.
-   */
-  public enum AIGuardError {
-    /** A transport failure, or any error the tracer could not attribute to the response. */
-    CLIENT_ERROR("client_error"),
-    /** The service answered with a status code that explains the failure on its own. */
-    BAD_STATUS("bad_status"),
-    /** The service answered successfully, with a body the tracer cannot use. */
-    BAD_RESPONSE("bad_response"),
-    /** A redaction replacement the tracer could not apply. Never fails the evaluation. */
-    REDACTION_ERROR("redaction_error");
-
-    public final String tagValue;
-
-    AIGuardError(final String tagValue) {
-      this.tagValue = tagValue;
+
+    /**
+     * Classification of the failures reported under {@code ai_guard.error}, as the {@code type} tag.
+     */
+    public enum AIGuardError {
+        /** A transport failure, or any error the tracer could not attribute to the response. */
+        CLIENT_ERROR("client_error"),
+        /** The service answered with a status code that explains the failure on its own. */
+        BAD_STATUS("bad_status"),
+        /** The service answered successfully, with a body the tracer cannot use. */
+        BAD_RESPONSE("bad_response"),
+        /** A redaction replacement the tracer could not apply. Never fails the evaluation. */
+        REDACTION_ERROR("redaction_error");
+
+        public final String tagValue;
+
+        AIGuardError(final String tagValue) {
+            this.tagValue = tagValue;
+        }
     }
-  }
 
-  public enum AIGuardTruncationType {
-    MESSAGES("messages"),
-    CONTENT("content");
-    public final String tagValue;
+    public enum AIGuardTruncationType {
+        MESSAGES("messages"),
+        CONTENT("content");
+        public final String tagValue;
 
-    AIGuardTruncationType(final String tagValue) {
-      this.tagValue = tagValue;
-    }
-  }
-
-  /**
-   * Mirror of the {@code WafErrorCode} enum defined in the {@code libddwaf-java} module.
-   *
-   * <p>This enum is duplicated here to avoid adding a dependency on the native bindings module
-   * (`libddwaf-java`) within the {@code internal-api} module.
-   *
-   * <p>IMPORTANT: If the {@code WafErrorCode} definition in {@code libddwaf-java} is updated, this
-   * enum must be kept in sync manually to ensure correct behavior and compatibility.
-   *
-   * <p>Each enum value represents a specific WAF error condition, typically returned when running a
-   * WAF rule evaluation.
-   */
-  public enum WafErrorCode {
-    INVALID_ARGUMENT(-1),
-    INVALID_OBJECT(-2),
-    INTERNAL_ERROR(-3),
-    BINDING_ERROR(
-        -127); // This is a special error code that is not returned by the WAF, is used to signal a
-    // binding error
-
-    private final int code;
-
-    private static final Map<Integer, WafErrorCode> CODE_MAP;
-
-    static {
-      Map<Integer, WafErrorCode> map = new HashMap<>();
-      for (WafErrorCode errorCode : values()) {
-        map.put(errorCode.code, errorCode);
-      }
-      CODE_MAP = Collections.unmodifiableMap(map);
+        AIGuardTruncationType(final String tagValue) {
+            this.tagValue = tagValue;
+        }
     }
 
-    WafErrorCode(int code) {
-      this.code = code;
-    }
+    /**
+     * Mirror of the {@code WafErrorCode} enum defined in the {@code libddwaf-java} module.
+     *
+     * <p>This enum is duplicated here to avoid adding a dependency on the native bindings module
+     * (`libddwaf-java`) within the {@code internal-api} module.
+     *
+     * <p>IMPORTANT: If the {@code WafErrorCode} definition in {@code libddwaf-java} is updated, this
+     * enum must be kept in sync manually to ensure correct behavior and compatibility.
+     *
+     * <p>Each enum value represents a specific WAF error condition, typically returned when running a
+     * WAF rule evaluation.
+     */
+    public enum WafErrorCode {
+        INVALID_ARGUMENT(-1),
+        INVALID_OBJECT(-2),
+        INTERNAL_ERROR(-3),
+        BINDING_ERROR(-127); // This is a special error code that is not returned by the WAF, is used to signal a
+        // binding error
 
-    public int getCode() {
-      return code;
-    }
+        private final int code;
+
+        private static final Map<Integer, WafErrorCode> CODE_MAP;
+
+        static {
+            Map<Integer, WafErrorCode> map = new HashMap<>();
+            for (WafErrorCode errorCode : values()) {
+                map.put(errorCode.code, errorCode);
+            }
+            CODE_MAP = Collections.unmodifiableMap(map);
+        }
+
+        WafErrorCode(int code) {
+            this.code = code;
+        }
 
-    public static WafErrorCode fromCode(int code) {
-      return CODE_MAP.get(code);
+        public int getCode() {
+            return code;
+        }
+
+        public static WafErrorCode fromCode(int code) {
+            return CODE_MAP.get(code);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/WafTruncatedType.java b/internal-api/src/main/java/datadog/trace/api/telemetry/WafTruncatedType.java
index e2051425fac..ff4282ef009 100644
--- a/internal-api/src/main/java/datadog/trace/api/telemetry/WafTruncatedType.java
+++ b/internal-api/src/main/java/datadog/trace/api/telemetry/WafTruncatedType.java
@@ -1,17 +1,17 @@
 package datadog.trace.api.telemetry;
 
 public enum WafTruncatedType {
-  STRING_TOO_LONG(1),
-  LIST_MAP_TOO_LARGE(2),
-  OBJECT_TOO_DEEP(4);
+    STRING_TOO_LONG(1),
+    LIST_MAP_TOO_LARGE(2),
+    OBJECT_TOO_DEEP(4);
 
-  private final int value;
+    private final int value;
 
-  WafTruncatedType(int value) {
-    this.value = value;
-  }
+    WafTruncatedType(int value) {
+        this.value = value;
+    }
 
-  public int getValue() {
-    return this.value;
-  }
+    public int getValue() {
+        return this.value;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/ActiveSubsystems.java b/internal-api/src/main/java/datadog/trace/bootstrap/ActiveSubsystems.java
index eb811a678fb..62720665db8 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/ActiveSubsystems.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/ActiveSubsystems.java
@@ -2,5 +2,5 @@
 
 /** Runtime activation state of the subsystems that can be switched on and off after start-up. */
 public class ActiveSubsystems {
-  public static volatile boolean APPSEC_ACTIVE;
+    public static volatile boolean APPSEC_ACTIVE;
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/ContextStore.java b/internal-api/src/main/java/datadog/trace/bootstrap/ContextStore.java
index 18dd8344a5c..8ef15caba8e 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/ContextStore.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/ContextStore.java
@@ -14,78 +14,78 @@
  */
 public interface ContextStore<K, C> {
 
-  /**
-   * Factory interface to create context instances
-   *
-   * @param <C> context type
-   */
-  interface Factory<C> extends Function<Object, C> {
-
     /**
-     * @return new context instance
+     * Factory interface to create context instances
+     *
+     * @param <C> context type
      */
-    C create();
+    interface Factory<C> extends Function<Object, C> {
+
+        /**
+         * @return new context instance
+         */
+        C create();
 
-    default C apply(Object key) {
-      return create();
+        default C apply(Object key) {
+            return create();
+        }
     }
-  }
 
-  /**
-   * Get context instance for the given key.
-   *
-   * @param key the context key
-   * @return context instance; {@code null} if the key had no context
-   */
-  @Nullable
-  C get(K key);
+    /**
+     * Get context instance for the given key.
+     *
+     * @param key the context key
+     * @return context instance; {@code null} if the key had no context
+     */
+    @Nullable
+    C get(K key);
 
-  /**
-   * Unconditionally put new context instance for the given key.
-   *
-   * @param key the context key
-   * @param context context instance to save
-   */
-  void put(K key, C context);
+    /**
+     * Unconditionally put new context instance for the given key.
+     *
+     * @param key the context key
+     * @param context context instance to save
+     */
+    void put(K key, C context);
 
-  /**
-   * Gets the context instance for the given key. If no context exists then associate it with the
-   * new context.
-   *
-   * @param key the context key
-   * @param context new context instance
-   * @return existing context instance if present; otherwise new instance
-   */
-  C getOrPut(K key, C context);
+    /**
+     * Gets the context instance for the given key. If no context exists then associate it with the
+     * new context.
+     *
+     * @param key the context key
+     * @param context new context instance
+     * @return existing context instance if present; otherwise new instance
+     */
+    C getOrPut(K key, C context);
 
-  /**
-   * Gets the context instance for the given key. If no context exists then create one using the
-   * given factory and associate it with the key.
-   *
-   * @param key the context key
-   * @param contextFactory factory instance to produce new context instances
-   * @return existing context instance if present; otherwise new instance
-   */
-  default C getOrCreate(K key, Factory<C> contextFactory) {
-    return getOrCompute(key, contextFactory);
-  }
+    /**
+     * Gets the context instance for the given key. If no context exists then create one using the
+     * given factory and associate it with the key.
+     *
+     * @param key the context key
+     * @param contextFactory factory instance to produce new context instances
+     * @return existing context instance if present; otherwise new instance
+     */
+    default C getOrCreate(K key, Factory<C> contextFactory) {
+        return getOrCompute(key, contextFactory);
+    }
 
-  /**
-   * Gets the context instance for the given key. If no context exists then create one using the
-   * given factory and associate it with the key.
-   *
-   * @param key the context key
-   * @param contextFactory factory instance to produce new context instances
-   * @return existing context instance if present; otherwise new instance
-   */
-  C getOrCompute(K key, Function<? super K, C> contextFactory);
+    /**
+     * Gets the context instance for the given key. If no context exists then create one using the
+     * given factory and associate it with the key.
+     *
+     * @param key the context key
+     * @param contextFactory factory instance to produce new context instances
+     * @return existing context instance if present; otherwise new instance
+     */
+    C getOrCompute(K key, Function<? super K, C> contextFactory);
 
-  /**
-   * Removes the context instance for the given key.
-   *
-   * @param key the context key
-   * @return removed context instance; {@code null} if the key had no context
-   */
-  @Nullable
-  C remove(K key);
+    /**
+     * Removes the context instance for the given key.
+     *
+     * @param key the context key
+     * @return removed context instance; {@code null} if the key had no context
+     */
+    @Nullable
+    C remove(K key);
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java
index 46a01b3f70f..cdcca877069 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java
@@ -14,63 +14,61 @@
 import javax.annotation.ParametersAreNonnullByDefault;
 
 public final class AgentPropagation {
-  public static final Concern TRACING_CONCERN = named("tracing");
-  // TODO: Baggage propagator should run after tracing so it can link baggage with the span context
-  // TODO: remove this priority once we have a story for replacing TagContext with the Context API
-  public static final Concern BAGGAGE_CONCERN = withPriority("baggage", 105);
-  public static final Concern XRAY_TRACING_CONCERN = named("tracing-xray");
-  public static final Concern INFERRED_PROXY_CONCERN = named("inferred-proxy");
-  // TODO DSM propagator should run after the other propagators as it stores the pathway context
-  // TODO into the span context for now. Remove priority after the migration is complete.
-  public static final Concern DSM_CONCERN = withPriority("data-stream-monitoring", 110);
+    public static final Concern TRACING_CONCERN = named("tracing");
+    // TODO: Baggage propagator should run after tracing so it can link baggage with the span context
+    // TODO: remove this priority once we have a story for replacing TagContext with the Context API
+    public static final Concern BAGGAGE_CONCERN = withPriority("baggage", 105);
+    public static final Concern XRAY_TRACING_CONCERN = named("tracing-xray");
+    public static final Concern INFERRED_PROXY_CONCERN = named("inferred-proxy");
+    // TODO DSM propagator should run after the other propagators as it stores the pathway context
+    // TODO into the span context for now. Remove priority after the migration is complete.
+    public static final Concern DSM_CONCERN = withPriority("data-stream-monitoring", 110);
 
-  private AgentPropagation() {}
-
-  /**
-   * @deprecated Use {@link Propagators} API instead.
-   */
-  @Deprecated
-  public static <C> AgentSpanContext.Extracted extractContextAndGetSpanContext(
-      final C carrier, final ContextVisitor<C> getter) {
-    Context extracted = Propagators.defaultPropagator().extract(root(), carrier, getter);
-    AgentSpan extractedSpan = fromContext(extracted);
-    return extractedSpan == null ? null : (AgentSpanContext.Extracted) extractedSpan.spanContext();
-  }
-
-  public interface KeyClassifier {
-    boolean accept(String key, String value);
+    private AgentPropagation() {}
 
     /**
-     * Variant of {@link #accept(String, String)} for carriers that store header values in a raw
-     * form (e.g. {@code byte[]}) and want to defer string conversion until after the key is known
-     * to be relevant.
-     *
-     * <p>The default implementation applies {@code transformer} eagerly and delegates to {@link
-     * #accept(String, String)}, so existing classifiers work without any changes.
-     *
-     * @param key the header name
-     * @param value the raw header value, in whatever form the carrier provides
-     * @param transformer converts {@code value} to a string; called at most once by the default
-     *     implementation
-     * @return {@code false} to stop iteration, {@code true} to continue
+     * @deprecated Use {@link Propagators} API instead.
      */
-    default <T> boolean accept(String key, T value, Function<T, String> transformer) {
-      return accept(key, transformer.apply(value));
+    @Deprecated
+    public static <C> AgentSpanContext.Extracted extractContextAndGetSpanContext(
+            final C carrier, final ContextVisitor<C> getter) {
+        Context extracted = Propagators.defaultPropagator().extract(root(), carrier, getter);
+        AgentSpan extractedSpan = fromContext(extracted);
+        return extractedSpan == null ? null : (AgentSpanContext.Extracted) extractedSpan.spanContext();
+    }
+
+    public interface KeyClassifier {
+        boolean accept(String key, String value);
+
+        /**
+         * Variant of {@link #accept(String, String)} for carriers that store header values in a raw
+         * form (e.g. {@code byte[]}) and want to defer string conversion until after the key is known
+         * to be relevant.
+         *
+         * <p>The default implementation applies {@code transformer} eagerly and delegates to {@link
+         * #accept(String, String)}, so existing classifiers work without any changes.
+         *
+         * @param key the header name
+         * @param value the raw header value, in whatever form the carrier provides
+         * @param transformer converts {@code value} to a string; called at most once by the default
+         *     implementation
+         * @return {@code false} to stop iteration, {@code true} to continue
+         */
+        default <T> boolean accept(String key, T value, Function<T, String> transformer) {
+            return accept(key, transformer.apply(value));
+        }
     }
-  }
 
-  public interface ContextVisitor<C> extends CarrierVisitor<C> {
-    void forEachKey(C carrier, KeyClassifier classifier);
+    public interface ContextVisitor<C> extends CarrierVisitor<C> {
+        void forEachKey(C carrier, KeyClassifier classifier);
 
-    @ParametersAreNonnullByDefault
-    @Override
-    default void forEachKeyValue(C carrier, BiConsumer<String, String> visitor) {
-      forEachKey(
-          carrier,
-          (key, value) -> {
-            visitor.accept(key, value);
-            return true;
-          });
+        @ParametersAreNonnullByDefault
+        @Override
+        default void forEachKeyValue(C carrier, BiConsumer<String, String> visitor) {
+            forEachKey(carrier, (key, value) -> {
+                visitor.accept(key, value);
+                return true;
+            });
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java
index 94c0f80572a..471d1b67b62 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java
@@ -19,352 +19,344 @@
 import javax.annotation.Nullable;
 
 public interface AgentSpan
-    extends MutableSpan,
-        AppendableSpanLinks,
-        ImplicitContextKeyed,
-        Context,
-        IGSpanInfo,
-        WithAgentSpan {
-
-  /**
-   * Extracts the span from the current {@link Context}.
-   *
-   * @return the current span if existing, {@code null} otherwise.
-   */
-  static AgentSpan current() {
-    return Context.current().get(SPAN_KEY);
-  }
-
-  /**
-   * Extracts the span from the given {@link Context}.
-   *
-   * @param context the context to extract the span from.
-   * @return the span if existing, {@code null} otherwise.
-   */
-  static AgentSpan fromContext(Context context) {
-    return context == null ? null : context.get(SPAN_KEY);
-  }
-
-  /**
-   * Extracts the span from the given {@link ContextScope}.
-   *
-   * @param scope the context scope to extract the span from.
-   * @return the span if existing, {@code null} otherwise.
-   */
-  static AgentSpan fromScope(ContextScope scope) {
-    return scope == null ? null : scope.context().get(SPAN_KEY);
-  }
-
-  /**
-   * Creates a span wrapper from a span context.
-   *
-   * <p>Creating such span will not create a tracing span to complete a local root trace. It gives a
-   * span instance based on a span context for span-based API. It is usually used with an extracted
-   * span context as parameter to represent a remote span.
-   *
-   * @param spanContext the span context to get a full-fledged span.
-   * @return a span wrapper based on a span context.
-   */
-  static AgentSpan fromSpanContext(AgentSpanContext spanContext) {
-    if (spanContext == null || spanContext == NoopSpanContext.INSTANCE) {
-      return NoopSpan.INSTANCE;
+        extends MutableSpan, AppendableSpanLinks, ImplicitContextKeyed, Context, IGSpanInfo, WithAgentSpan {
+
+    /**
+     * Extracts the span from the current {@link Context}.
+     *
+     * @return the current span if existing, {@code null} otherwise.
+     */
+    static AgentSpan current() {
+        return Context.current().get(SPAN_KEY);
     }
-    return new ExtractedSpan(spanContext);
-  }
 
-  DDTraceId getTraceId();
+    /**
+     * Extracts the span from the given {@link Context}.
+     *
+     * @param context the context to extract the span from.
+     * @return the span if existing, {@code null} otherwise.
+     */
+    static AgentSpan fromContext(Context context) {
+        return context == null ? null : context.get(SPAN_KEY);
+    }
 
-  long getSpanId();
+    /**
+     * Extracts the span from the given {@link ContextScope}.
+     *
+     * @param scope the context scope to extract the span from.
+     * @return the span if existing, {@code null} otherwise.
+     */
+    static AgentSpan fromScope(ContextScope scope) {
+        return scope == null ? null : scope.context().get(SPAN_KEY);
+    }
 
-  /**
-   * Checks whether a span is considered valid by having valid trace and span identifiers.
-   *
-   * @return {@code true} if the span is considered valid, {@code false} otherwise.
-   */
-  default boolean isValid() {
-    return getTraceId() != DDTraceId.ZERO && getSpanId() != DDSpanId.ZERO;
-  }
+    /**
+     * Creates a span wrapper from a span context.
+     *
+     * <p>Creating such span will not create a tracing span to complete a local root trace. It gives a
+     * span instance based on a span context for span-based API. It is usually used with an extracted
+     * span context as parameter to represent a remote span.
+     *
+     * @param spanContext the span context to get a full-fledged span.
+     * @return a span wrapper based on a span context.
+     */
+    static AgentSpan fromSpanContext(AgentSpanContext spanContext) {
+        if (spanContext == null || spanContext == NoopSpanContext.INSTANCE) {
+            return NoopSpan.INSTANCE;
+        }
+        return new ExtractedSpan(spanContext);
+    }
 
-  @Override
-  AgentSpan setTag(String key, boolean value);
+    DDTraceId getTraceId();
 
-  AgentSpan setTag(String key, int value);
+    long getSpanId();
 
-  AgentSpan setTag(String key, long value);
+    /**
+     * Checks whether a span is considered valid by having valid trace and span identifiers.
+     *
+     * @return {@code true} if the span is considered valid, {@code false} otherwise.
+     */
+    default boolean isValid() {
+        return getTraceId() != DDTraceId.ZERO && getSpanId() != DDSpanId.ZERO;
+    }
 
-  AgentSpan setTag(String key, float value);
+    @Override
+    AgentSpan setTag(String key, boolean value);
 
-  AgentSpan setTag(String key, double value);
+    AgentSpan setTag(String key, int value);
 
-  @Override
-  AgentSpan setTag(String key, String value);
+    AgentSpan setTag(String key, long value);
 
-  AgentSpan setTag(String key, CharSequence value);
+    AgentSpan setTag(String key, float value);
 
-  AgentSpan setTag(String key, Object value);
+    AgentSpan setTag(String key, double value);
 
-  /** entry may be null - in which case the tags remained unchanged */
-  AgentSpan setTag(TagMap.EntryReader entry);
+    @Override
+    AgentSpan setTag(String key, String value);
 
-  AgentSpan setAllTags(Map<String, ?> map);
+    AgentSpan setTag(String key, CharSequence value);
 
-  @Override
-  AgentSpan setTag(String key, Number value);
+    AgentSpan setTag(String key, Object value);
 
-  @Override
-  AgentSpan setMetric(CharSequence key, int value);
+    /** entry may be null - in which case the tags remained unchanged */
+    AgentSpan setTag(TagMap.EntryReader entry);
 
-  @Override
-  AgentSpan setMetric(CharSequence key, long value);
+    AgentSpan setAllTags(Map<String, ?> map);
 
-  @Override
-  AgentSpan setMetric(CharSequence key, float value);
+    @Override
+    AgentSpan setTag(String key, Number value);
 
-  @Override
-  AgentSpan setMetric(CharSequence key, double value);
+    @Override
+    AgentSpan setMetric(CharSequence key, int value);
 
-  /** metricEntry may be null - in which case the tags remained unchanged */
-  AgentSpan setMetric(TagMap.EntryReader metricEntry);
+    @Override
+    AgentSpan setMetric(CharSequence key, long value);
 
-  @Override
-  AgentSpan setSpanType(final CharSequence type);
+    @Override
+    AgentSpan setMetric(CharSequence key, float value);
 
-  @Override
-  TagMap getTags();
+    @Override
+    AgentSpan setMetric(CharSequence key, double value);
 
-  Object getTag(String key);
+    /** metricEntry may be null - in which case the tags remained unchanged */
+    AgentSpan setMetric(TagMap.EntryReader metricEntry);
 
-  @Override
-  AgentSpan setError(boolean error);
+    @Override
+    AgentSpan setSpanType(final CharSequence type);
 
-  AgentSpan setError(boolean error, byte priority);
+    @Override
+    TagMap getTags();
 
-  AgentSpan setMeasured(boolean measured);
+    Object getTag(String key);
 
-  AgentSpan setErrorMessage(String errorMessage);
+    @Override
+    AgentSpan setError(boolean error);
 
-  AgentSpan addThrowable(Throwable throwable);
+    AgentSpan setError(boolean error, byte priority);
 
-  AgentSpan addThrowable(Throwable throwable, byte errorPriority);
+    AgentSpan setMeasured(boolean measured);
 
-  @Override
-  AgentSpan getLocalRootSpan();
+    AgentSpan setErrorMessage(String errorMessage);
 
-  boolean isSameTrace(AgentSpan otherSpan);
+    AgentSpan addThrowable(Throwable throwable);
 
-  AgentSpanContext spanContext();
+    AgentSpan addThrowable(Throwable throwable, byte errorPriority);
 
-  String getBaggageItem(String key);
+    @Override
+    AgentSpan getLocalRootSpan();
 
-  AgentSpan setBaggageItem(String key, String value);
+    boolean isSameTrace(AgentSpan otherSpan);
 
-  AgentSpan setHttpStatusCode(int statusCode);
+    AgentSpanContext spanContext();
 
-  short getHttpStatusCode();
+    String getBaggageItem(String key);
 
-  void finish();
+    AgentSpan setBaggageItem(String key, String value);
 
-  void finish(long finishMicros);
+    AgentSpan setHttpStatusCode(int statusCode);
 
-  void finishWithDuration(long durationNanos);
+    short getHttpStatusCode();
 
-  /** Marks the start of a message pipeline where we want to track end-to-end processing time. */
-  void beginEndToEnd();
+    void finish();
 
-  /**
-   * Marks the end of a message pipeline where the final end-to-end processing time is recorded.
-   *
-   * <p>Note: this will also finish the span and publish it.
-   */
-  void finishWithEndToEnd();
+    void finish(long finishMicros);
 
-  /**
-   * Finishes the span but does not publish it. The {@link #publish()} method MUST be called once
-   * otherwise the trace will not be reported.
-   *
-   * @return true if the span was successfully finished, false if it was already finished.
-   */
-  boolean phasedFinish();
+    void finishWithDuration(long durationNanos);
 
-  /**
-   * Publish a span that was previously finished by calling {@link #phasedFinish()}. Must be called
-   * once and only once per span.
-   */
-  void publish();
+    /** Marks the start of a message pipeline where we want to track end-to-end processing time. */
+    void beginEndToEnd();
 
-  CharSequence getSpanName();
+    /**
+     * Marks the end of a message pipeline where the final end-to-end processing time is recorded.
+     *
+     * <p>Note: this will also finish the span and publish it.
+     */
+    void finishWithEndToEnd();
 
-  void setSpanName(CharSequence spanName);
+    /**
+     * Finishes the span but does not publish it. The {@link #publish()} method MUST be called once
+     * otherwise the trace will not be reported.
+     *
+     * @return true if the span was successfully finished, false if it was already finished.
+     */
+    boolean phasedFinish();
 
-  /**
-   * Deprecated in favor of setResourceName(final CharSequence resourceName, byte priority) or using
-   * getResourceNamePriority() for comparisons.
-   */
-  @Deprecated
-  boolean hasResourceName();
+    /**
+     * Publish a span that was previously finished by calling {@link #phasedFinish()}. Must be called
+     * once and only once per span.
+     */
+    void publish();
 
-  byte getResourceNamePriority();
+    CharSequence getSpanName();
 
-  @Override
-  AgentSpan setResourceName(final CharSequence resourceName);
+    void setSpanName(CharSequence spanName);
 
-  /**
-   * Implementation note: two calls with the same priority will result in the second resource name
-   * being used
-   */
-  AgentSpan setResourceName(final CharSequence resourceName, byte priority);
+    /**
+     * Deprecated in favor of setResourceName(final CharSequence resourceName, byte priority) or using
+     * getResourceNamePriority() for comparisons.
+     */
+    @Deprecated
+    boolean hasResourceName();
 
-  /** RequestContext for the Instrumentation Gateway */
-  RequestContext getRequestContext();
+    byte getResourceNamePriority();
 
-  Integer forceSamplingDecision();
+    @Override
+    AgentSpan setResourceName(final CharSequence resourceName);
 
-  AgentSpan setSamplingPriority(final int newPriority, int samplingMechanism);
+    /**
+     * Implementation note: two calls with the same priority will result in the second resource name
+     * being used
+     */
+    AgentSpan setResourceName(final CharSequence resourceName, byte priority);
 
-  @Nonnull
-  TraceConfig traceConfig();
+    /** RequestContext for the Instrumentation Gateway */
+    RequestContext getRequestContext();
 
-  void addLink(AgentSpanLink link);
+    Integer forceSamplingDecision();
 
-  AgentSpan setMetaStruct(final String field, final Object value);
+    AgentSpan setSamplingPriority(final int newPriority, int samplingMechanism);
 
-  boolean isOutbound();
+    @Nonnull
+    TraceConfig traceConfig();
 
-  /**
-   * Applies a {@link SpanPrototype} as fallback defaults: stamps its span type, constant tags, and
-   * integration name only where this span has not already set them. Prototype values are the lowest
-   * precedence -- anything explicitly set wins -- so {@code apply} never clobbers, is
-   * order-independent, and self-neutralizes once construction has already seeded the same
-   * prototype.
-   *
-   * <p>This is the single seam through which a prototype's constant initial state is applied,
-   * shared by the construction path (buildSpan/startSpan) and decorator {@code afterStart}. Core
-   * spans override to route straight to the context, which owns the tag map and will host the
-   * eventual fast path (bulk share / identity short-circuit); this default is the best-effort
-   * fallback for other span implementations.
-   */
-  default void apply(@Nonnull final SpanPrototype prototype) {
-    if (getSpanType() == null) {
-      final CharSequence spanType = prototype.spanType();
-      if (spanType != null) {
-        setSpanType(spanType);
-      }
-    }
+    void addLink(AgentSpanLink link);
+
+    AgentSpan setMetaStruct(final String field, final Object value);
+
+    boolean isOutbound();
 
-    // Prototype tags are fallback defaults: only fill keys this span has not already set.
-    prototype
-        .tags()
-        .forEach(
-            (tag, value) -> {
-              if (getTag(tag) == null) {
+    /**
+     * Applies a {@link SpanPrototype} as fallback defaults: stamps its span type, constant tags, and
+     * integration name only where this span has not already set them. Prototype values are the lowest
+     * precedence -- anything explicitly set wins -- so {@code apply} never clobbers, is
+     * order-independent, and self-neutralizes once construction has already seeded the same
+     * prototype.
+     *
+     * <p>This is the single seam through which a prototype's constant initial state is applied,
+     * shared by the construction path (buildSpan/startSpan) and decorator {@code afterStart}. Core
+     * spans override to route straight to the context, which owns the tag map and will host the
+     * eventual fast path (bulk share / identity short-circuit); this default is the best-effort
+     * fallback for other span implementations.
+     */
+    default void apply(@Nonnull final SpanPrototype prototype) {
+        if (getSpanType() == null) {
+            final CharSequence spanType = prototype.spanType();
+            if (spanType != null) {
+                setSpanType(spanType);
+            }
+        }
+
+        // Prototype tags are fallback defaults: only fill keys this span has not already set.
+        prototype.tags().forEach((tag, value) -> {
+            if (getTag(tag) == null) {
                 setTag(tag, value);
-              }
-            });
-
-    // Never-clobber: only stamp the integration name when the context reports none.
-    if (spanContext().getIntegrationName() == null) {
-      final CharSequence integrationName = prototype.integrationName();
-      if (integrationName != null) {
-        spanContext().setIntegrationName(integrationName);
-      }
+            }
+        });
+
+        // Never-clobber: only stamp the integration name when the context reports none.
+        if (spanContext().getIntegrationName() == null) {
+            final CharSequence integrationName = prototype.integrationName();
+            if (integrationName != null) {
+                spanContext().setIntegrationName(integrationName);
+            }
+        }
+    }
+
+    default AgentSpan asAgentSpan() {
+        return this;
+    }
+
+    default void copyPropagationAndBaggage(final AgentSpan source) {
+        // no op default
+    }
+
+    @Override
+    default Context storeInto(@Nonnull Context context) {
+        return context == Context.root() ? this : context.with(SPAN_KEY, this);
+    }
+
+    @Nullable
+    @Override
+    default <T> T get(@Nonnull ContextKey<T> key) {
+        // noinspection unchecked
+        return SPAN_KEY == key ? (T) this : Context.root().get(key);
+    }
+
+    @Override
+    default <T> Context with(@Nonnull ContextKey<T> key, @Nullable T value) {
+        return SPAN_KEY == key ? (Context) value : Context.root().with(SPAN_KEY, this, key, value);
+    }
+
+    /**
+     * Attaches a context containing just the span to the current execution unit. Use this when you
+     * want to temporarily suppress any surrounding custom context during the span's scope.
+     *
+     * @return a scope to be closed when the span context is invalid.
+     */
+    @Override
+    default ContextScope attach() {
+        return Context.super.attach();
+    }
+
+    /**
+     * Attaches a context combining the span with the current context to the current execution unit.
+     * Use this when you want to maintain any surrounding custom context during the span's scope.
+     *
+     * @return a scope to be closed when the combined context is invalid.
+     */
+    default ContextScope attachWithContext() {
+        return storeInto(Context.current()).attach();
+    }
+
+    /**
+     * Captures a continuation of just the span so it can be resumed in another execution unit. Use
+     * this when you want to temporarily suppress any surrounding custom context during the span's
+     * continuation.
+     *
+     * <p>If async propagation is disabled nothing is captured and a no-op continuation is returned.
+     *
+     * @return a continuation capturing only this span; no-op continuation if async propagation
+     *     disabled
+     */
+    @Override
+    default ContextContinuation capture() {
+        return Context.super.capture();
+    }
+
+    /**
+     * Captures a continuation combining the span with the current context so it can be resumed in
+     * another execution unit. Use this when you want to maintain any surrounding custom context
+     * during the span's continuation
+     *
+     * <p>If async propagation is disabled nothing is captured and a no-op continuation is returned.
+     *
+     * @return a continuation capturing this span and any custom context; no-op continuation if async
+     *     propagation disabled
+     */
+    default ContextContinuation captureWithContext() {
+        return storeInto(Context.current()).capture();
+    }
+
+    /**
+     * Sets the service name without tracking it's source.
+     *
+     * <p>Note: please use setServiceName(String, CharSequence) instead.
+     *
+     * @param serviceName the service name.
+     * @return the span itself.
+     */
+    @Override
+    @Deprecated
+    MutableSpan setServiceName(final String serviceName);
+
+    /**
+     * Set the service name specifying the source (origin) of this name
+     *
+     * @param serviceName the service name
+     * @param source the source. Can be typically the name of the integration that overrides the
+     *     default name.
+     */
+    default void setServiceName(@Nonnull String serviceName, @Nonnull CharSequence source) {
+        setServiceName(serviceName);
     }
-  }
-
-  default AgentSpan asAgentSpan() {
-    return this;
-  }
-
-  default void copyPropagationAndBaggage(final AgentSpan source) {
-    // no op default
-  }
-
-  @Override
-  default Context storeInto(@Nonnull Context context) {
-    return context == Context.root() ? this : context.with(SPAN_KEY, this);
-  }
-
-  @Nullable
-  @Override
-  default <T> T get(@Nonnull ContextKey<T> key) {
-    // noinspection unchecked
-    return SPAN_KEY == key ? (T) this : Context.root().get(key);
-  }
-
-  @Override
-  default <T> Context with(@Nonnull ContextKey<T> key, @Nullable T value) {
-    return SPAN_KEY == key ? (Context) value : Context.root().with(SPAN_KEY, this, key, value);
-  }
-
-  /**
-   * Attaches a context containing just the span to the current execution unit. Use this when you
-   * want to temporarily suppress any surrounding custom context during the span's scope.
-   *
-   * @return a scope to be closed when the span context is invalid.
-   */
-  @Override
-  default ContextScope attach() {
-    return Context.super.attach();
-  }
-
-  /**
-   * Attaches a context combining the span with the current context to the current execution unit.
-   * Use this when you want to maintain any surrounding custom context during the span's scope.
-   *
-   * @return a scope to be closed when the combined context is invalid.
-   */
-  default ContextScope attachWithContext() {
-    return storeInto(Context.current()).attach();
-  }
-
-  /**
-   * Captures a continuation of just the span so it can be resumed in another execution unit. Use
-   * this when you want to temporarily suppress any surrounding custom context during the span's
-   * continuation.
-   *
-   * <p>If async propagation is disabled nothing is captured and a no-op continuation is returned.
-   *
-   * @return a continuation capturing only this span; no-op continuation if async propagation
-   *     disabled
-   */
-  @Override
-  default ContextContinuation capture() {
-    return Context.super.capture();
-  }
-
-  /**
-   * Captures a continuation combining the span with the current context so it can be resumed in
-   * another execution unit. Use this when you want to maintain any surrounding custom context
-   * during the span's continuation
-   *
-   * <p>If async propagation is disabled nothing is captured and a no-op continuation is returned.
-   *
-   * @return a continuation capturing this span and any custom context; no-op continuation if async
-   *     propagation disabled
-   */
-  default ContextContinuation captureWithContext() {
-    return storeInto(Context.current()).capture();
-  }
-
-  /**
-   * Sets the service name without tracking it's source.
-   *
-   * <p>Note: please use setServiceName(String, CharSequence) instead.
-   *
-   * @param serviceName the service name.
-   * @return the span itself.
-   */
-  @Override
-  @Deprecated
-  MutableSpan setServiceName(final String serviceName);
-
-  /**
-   * Set the service name specifying the source (origin) of this name
-   *
-   * @param serviceName the service name
-   * @param source the source. Can be typically the name of the integration that overrides the
-   *     default name.
-   */
-  default void setServiceName(@Nonnull String serviceName, @Nonnull CharSequence source) {
-    setServiceName(serviceName);
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanContext.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanContext.java
index 6e950925305..9483e0692e5 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanContext.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanContext.java
@@ -15,98 +15,98 @@
  */
 public interface AgentSpanContext {
 
-  /**
-   * Gets the TraceId of the span's trace.
-   *
-   * @return The TraceId of the span's trace, or {@link DDTraceId#ZERO} if not set.
-   */
-  DDTraceId getTraceId();
-
-  /**
-   * Gets the SpanId.
-   *
-   * @return The span identifier, or {@link datadog.trace.api.DDSpanId#ZERO} if not set.
-   */
-  long getSpanId();
-
-  /**
-   * Get the span's trace collector.
-   *
-   * @return The span's trace, or a noop {@link AgentTracer.NoopAgentTraceCollector#INSTANCE} if the
-   *     trace is not valid.
-   */
-  AgentTraceCollector getTraceCollector();
-
-  /**
-   * Gets the trace sampling priority of the span's trace.
-   *
-   * <p>Check {@link PrioritySampling} for possible values.
-   *
-   * @return The trace sampling priority of the span's trace, or {@link PrioritySampling#UNSET} if
-   *     no priority has been set.
-   */
-  int getSamplingPriority();
-
-  Iterable<Map.Entry<String, String>> baggageItems();
-
-  PathwayContext getPathwayContext();
-
-  default void mergePathwayContext(PathwayContext pathwayContext) {}
-
-  default void setIntegrationName(CharSequence componentName) {}
-
-  /**
-   * The integration name recorded on this context, or {@code null} if none. Default {@code null}
-   * mirrors {@link #setIntegrationName}'s no-op default: contexts that do not track an integration
-   * name report absence, which lets never-clobber callers guard before setting.
-   */
-  default CharSequence getIntegrationName() {
-    return null;
-  }
-
-  /**
-   * Gets whether the span context used is part of the local trace or from another service
-   *
-   * @return boolean representing if the span context is part of the local trace
-   */
-  boolean isRemote();
-
-  interface Extracted extends AgentSpanContext {
     /**
-     * Gets the span links related to the other terminated context.
+     * Gets the TraceId of the span's trace.
      *
-     * @return The span links to other extracted contexts found but terminated.
+     * @return The TraceId of the span's trace, or {@link DDTraceId#ZERO} if not set.
      */
-    List<AgentSpanLink> getTerminatedSpanLinks();
+    DDTraceId getTraceId();
 
-    String getForwarded();
+    /**
+     * Gets the SpanId.
+     *
+     * @return The span identifier, or {@link datadog.trace.api.DDSpanId#ZERO} if not set.
+     */
+    long getSpanId();
+
+    /**
+     * Get the span's trace collector.
+     *
+     * @return The span's trace, or a noop {@link AgentTracer.NoopAgentTraceCollector#INSTANCE} if the
+     *     trace is not valid.
+     */
+    AgentTraceCollector getTraceCollector();
+
+    /**
+     * Gets the trace sampling priority of the span's trace.
+     *
+     * <p>Check {@link PrioritySampling} for possible values.
+     *
+     * @return The trace sampling priority of the span's trace, or {@link PrioritySampling#UNSET} if
+     *     no priority has been set.
+     */
+    int getSamplingPriority();
+
+    Iterable<Map.Entry<String, String>> baggageItems();
+
+    PathwayContext getPathwayContext();
+
+    default void mergePathwayContext(PathwayContext pathwayContext) {}
+
+    default void setIntegrationName(CharSequence componentName) {}
+
+    /**
+     * The integration name recorded on this context, or {@code null} if none. Default {@code null}
+     * mirrors {@link #setIntegrationName}'s no-op default: contexts that do not track an integration
+     * name report absence, which lets never-clobber callers guard before setting.
+     */
+    default CharSequence getIntegrationName() {
+        return null;
+    }
+
+    /**
+     * Gets whether the span context used is part of the local trace or from another service
+     *
+     * @return boolean representing if the span context is part of the local trace
+     */
+    boolean isRemote();
+
+    interface Extracted extends AgentSpanContext {
+        /**
+         * Gets the span links related to the other terminated context.
+         *
+         * @return The span links to other extracted contexts found but terminated.
+         */
+        List<AgentSpanLink> getTerminatedSpanLinks();
+
+        String getForwarded();
 
-    String getFastlyClientIp();
+        String getFastlyClientIp();
 
-    String getCfConnectingIp();
+        String getCfConnectingIp();
 
-    String getCfConnectingIpv6();
+        String getCfConnectingIpv6();
 
-    String getXForwardedProto();
+        String getXForwardedProto();
 
-    String getXForwardedHost();
+        String getXForwardedHost();
 
-    String getXForwardedPort();
+        String getXForwardedPort();
 
-    String getForwardedFor();
+        String getForwardedFor();
 
-    String getXForwardedFor();
+        String getXForwardedFor();
 
-    String getXClusterClientIp();
+        String getXClusterClientIp();
 
-    String getXRealIp();
+        String getXRealIp();
 
-    String getXClientIp();
+        String getXClientIp();
 
-    String getUserAgent();
+        String getUserAgent();
 
-    String getTrueClientIp();
+        String getTrueClientIp();
 
-    String getCustomIpHeader();
-  }
+        String getCustomIpHeader();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanLink.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanLink.java
index 8974ae4dfc7..dcecba58979 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanLink.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanLink.java
@@ -7,48 +7,48 @@
  * or not.
  */
 public interface AgentSpanLink {
-  /** The default trace flags (no flag enabled). */
-  byte DEFAULT_FLAGS = 0;
-
-  /** The sampled flag denotes that the caller may have recorded trace data. */
-  byte SAMPLED_FLAG = 1;
-
-  /**
-   * Gets the trace identifier of the linked span.
-   *
-   * @return The trace identifier of the linked span.
-   */
-  DDTraceId traceId();
-
-  /**
-   * Gets the span identifier of the linked span.
-   *
-   * @return The span identifier of the linked span as an unsigned 64-bit long.
-   */
-  long spanId();
-
-  /**
-   * Gets the 8-bit field that controls tracing flags such as sampling, trace level, etc.
-   *
-   * @return The 8-bit field that controls tracing flags such as sampling, trace level, etc.
-   * @see <a href="https://www.w3.org/TR/trace-context/#trace-flags">Trace flag header W3C
-   *     Specification</a>
-   */
-  byte traceFlags();
-
-  /**
-   * Gets the vendor-specific trace information as defined per W3C standard.
-   *
-   * @return The vendor-specific trace state.
-   * @see <a href="https://www.w3.org/TR/trace-context/#tracestate-header">Trace state header W3C
-   *     Specification</a>
-   */
-  String traceState();
-
-  /**
-   * Gets the link attributes.
-   *
-   * @return The link attributes.
-   */
-  SpanAttributes attributes();
+    /** The default trace flags (no flag enabled). */
+    byte DEFAULT_FLAGS = 0;
+
+    /** The sampled flag denotes that the caller may have recorded trace data. */
+    byte SAMPLED_FLAG = 1;
+
+    /**
+     * Gets the trace identifier of the linked span.
+     *
+     * @return The trace identifier of the linked span.
+     */
+    DDTraceId traceId();
+
+    /**
+     * Gets the span identifier of the linked span.
+     *
+     * @return The span identifier of the linked span as an unsigned 64-bit long.
+     */
+    long spanId();
+
+    /**
+     * Gets the 8-bit field that controls tracing flags such as sampling, trace level, etc.
+     *
+     * @return The 8-bit field that controls tracing flags such as sampling, trace level, etc.
+     * @see <a href="https://www.w3.org/TR/trace-context/#trace-flags">Trace flag header W3C
+     *     Specification</a>
+     */
+    byte traceFlags();
+
+    /**
+     * Gets the vendor-specific trace information as defined per W3C standard.
+     *
+     * @return The vendor-specific trace state.
+     * @see <a href="https://www.w3.org/TR/trace-context/#tracestate-header">Trace state header W3C
+     *     Specification</a>
+     */
+    String traceState();
+
+    /**
+     * Gets the link attributes.
+     *
+     * @return The link attributes.
+     */
+    SpanAttributes attributes();
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTraceCollector.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTraceCollector.java
index b018795ffd1..df1dbb22305 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTraceCollector.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTraceCollector.java
@@ -3,7 +3,7 @@
 import datadog.context.ContextContinuation;
 
 public interface AgentTraceCollector {
-  void registerContinuation(ContextContinuation continuation);
+    void registerContinuation(ContextContinuation continuation);
 
-  void removeContinuation(ContextContinuation continuation);
+    void removeContinuation(ContextContinuation continuation);
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java
index 71767ea7fae..7e74228ce2d 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java
@@ -33,823 +33,808 @@
 
 public class AgentTracer {
 
-  /**
-   * @see TracerAPI#startSpan(String, CharSequence)
-   */
-  public static AgentSpan startSpan(final String instrumentationName, final CharSequence spanName) {
-    return get().startSpan(instrumentationName, spanName);
-  }
-
-  /**
-   * @see TracerAPI#startSpan(String, CharSequence, long)
-   */
-  public static AgentSpan startSpan(
-      final String instrumentationName, final CharSequence spanName, final long startTimeMicros) {
-    return get().startSpan(instrumentationName, spanName, startTimeMicros);
-  }
-
-  /**
-   * @see TracerAPI#startSpan(String, CharSequence, AgentSpanContext)
-   */
-  public static AgentSpan startSpan(
-      final String instrumentationName,
-      final CharSequence spanName,
-      final AgentSpanContext parent) {
-    return get().startSpan(instrumentationName, spanName, parent);
-  }
-
-  /**
-   * @see TracerAPI#startSpan(String, CharSequence, AgentSpanContext, long)
-   */
-  public static AgentSpan startSpan(
-      final String instrumentationName,
-      final CharSequence spanName,
-      final AgentSpanContext parent,
-      final long startTimeMicros) {
-    return get().startSpan(instrumentationName, spanName, parent, startTimeMicros);
-  }
-
-  /**
-   * @see TracerAPI#startSpan(SpanPrototype, CharSequence)
-   */
-  public static AgentSpan startSpan(
-      @Nonnull final SpanPrototype prototype, final CharSequence operationName) {
-    return get().startSpan(prototype, operationName);
-  }
-
-  public static ContextScope activateSpan(final AgentSpan span) {
-    return get().activateSpan(span);
-  }
-
-  /**
-   * Activate a span which will be closed by {@link #closeActive()} instead of a scope.
-   *
-   * @deprecated This should only be used when the instrumented code doesn't align with a scope.
-   */
-  @Deprecated
-  public static void activateSpanWithoutScope(final AgentSpan span) {
-    get().activateSpanWithoutScope(span);
-  }
-
-  /**
-   * Checkpoints the active scope. A subsequent call to {@link #rollbackActiveToCheckpoint()} closes
-   * outstanding scopes up to but not including the most recent checkpointed scope.
-   *
-   * @deprecated This should only be used when scopes might leak onto the scope stack which cannot
-   *     be cleaned up by other means.
-   */
-  @Deprecated
-  public static void checkpointActiveForRollback() {
-    get().checkpointActiveForRollback();
-  }
-
-  /**
-   * Closes outstanding scopes up to but not including the most recent scope checkpointed with
-   * {@link #checkpointActiveForRollback()}. Closes all scopes if none have been checkpointed.
-   *
-   * @deprecated This should only be used when scopes have leaked onto the scope stack that cannot
-   *     be cleaned up by other means.
-   */
-  @Deprecated
-  public static void rollbackActiveToCheckpoint() {
-    get().rollbackActiveToCheckpoint();
-  }
-
-  /**
-   * Closes the scope for the currently active span.
-   *
-   * @deprecated This should only be used when the span was previously activated with {@link
-   *     #activateSpanWithoutScope} because the instrumented code didn't align with a scope.
-   */
-  @Deprecated
-  public static void closeActive() {
-    get().closeActive();
-  }
-
-  /**
-   * Closes the immediately previous iteration scope. Should be called before creating a new span
-   * for {@link #activateNext(AgentSpan)}.
-   */
-  public static void closePrevious(final boolean finishSpan) {
-    get().closePrevious(finishSpan);
-  }
-
-  /**
-   * Activates a new iteration scope; closes automatically after a fixed period.
-   *
-   * @see datadog.trace.api.config.TracerConfig#SCOPE_ITERATION_KEEP_ALIVE
-   */
-  public static ContextScope activateNext(final AgentSpan span) {
-    return get().activateNext(span);
-  }
-
-  public static TraceConfig traceConfig(final AgentSpan span) {
-    return null != span ? span.traceConfig() : traceConfig();
-  }
-
-  public static TraceConfig traceConfig() {
-    return get().captureTraceConfig();
-  }
-
-  public static AgentSpan activeSpan() {
-    return get().activeSpan();
-  }
-
-  /**
-   * Checks whether asynchronous propagation is enabled, meaning this context will propagate across
-   * asynchronous boundaries.
-   *
-   * @return {@code true} if asynchronous propagation is enabled, {@code false} otherwise.
-   */
-  public static boolean isAsyncPropagationEnabled() {
-    return get().isAsyncPropagationEnabled();
-  }
-
-  /**
-   * Enables or disables asynchronous propagation for the active span.
-   *
-   * <p>Asynchronous propagation is enabled by default from {@link
-   * ConfigDefaults#DEFAULT_ASYNC_PROPAGATING}.
-   *
-   * @param asyncPropagationEnabled {@code true} to enable asynchronous propagation, {@code false}
-   *     to disable it.
-   */
-  public static void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) {
-    get().setAsyncPropagationEnabled(asyncPropagationEnabled);
-  }
-
-  /**
-   * Returns the noop span instance.
-   *
-   * <p>This instance will always be the same, and can be safely tested using object identity (ie
-   * {@code ==}).
-   *
-   * @return the noop span instance.
-   */
-  public static AgentSpan noopSpan() {
-    return NoopSpan.INSTANCE;
-  }
-
-  public static AgentSpan blackholeSpan() {
-    return get().blackholeSpan();
-  }
-
-  /**
-   * Returns the noop span context instance.
-   *
-   * <p>This instance will always be the same, and can be safely tested using object identity (ie
-   * {@code ==}).
-   *
-   * @return the noop scope instance.
-   */
-  public static AgentSpanContext noopSpanContext() {
-    return NoopSpanContext.INSTANCE;
-  }
-
-  public static final TracerAPI NOOP_TRACER = new NoopTracerAPI();
-
-  private static volatile TracerAPI provider = NOOP_TRACER;
-
-  public static boolean isRegistered() {
-    return provider != NOOP_TRACER;
-  }
-
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification = "Agent-internal static holder; class lock guards private static provider")
-  public static synchronized void registerIfAbsent(final TracerAPI tracer) {
-    if (tracer != null && tracer != NOOP_TRACER) {
-      provider = tracer;
-    }
-  }
-
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification = "Agent-internal static holder; class lock guards private static provider")
-  public static synchronized void forceRegister(TracerAPI tracer) {
-    if (tracer == null) {
-      throw new IllegalArgumentException("tracer must not be null, use NOOP_TRACER instead");
-    }
-    provider = tracer;
-  }
-
-  public static TracerAPI get() {
-    return provider;
-  }
-
-  // Not intended to be constructed.
-  private AgentTracer() {}
-
-  public interface TracerAPI
-      extends datadog.trace.api.Tracer, InternalTracer, EndpointCheckpointer {
-
     /**
-     * Create and start a new span.
-     *
-     * @param instrumentationName The instrumentation creating the span.
-     * @param spanName The span operation name.
-     * @return The new started span.
+     * @see TracerAPI#startSpan(String, CharSequence)
      */
-    AgentSpan startSpan(String instrumentationName, CharSequence spanName);
+    public static AgentSpan startSpan(final String instrumentationName, final CharSequence spanName) {
+        return get().startSpan(instrumentationName, spanName);
+    }
 
     /**
-     * Create and start a new span with a given start time.
-     *
-     * @param instrumentationName The instrumentation creating the span.
-     * @param spanName The span operation name.
-     * @param startTimeMicros The span start time, in microseconds.
-     * @return The new started span.
+     * @see TracerAPI#startSpan(String, CharSequence, long)
      */
-    AgentSpan startSpan(String instrumentationName, CharSequence spanName, long startTimeMicros);
+    public static AgentSpan startSpan(
+            final String instrumentationName, final CharSequence spanName, final long startTimeMicros) {
+        return get().startSpan(instrumentationName, spanName, startTimeMicros);
+    }
 
     /**
-     * Create and start a new span with an explicit parent.
-     *
-     * @param instrumentationName The instrumentation creating the span.
-     * @param spanName The span operation name.
-     * @param parent The parent span context.
-     * @return The new started span.
+     * @see TracerAPI#startSpan(String, CharSequence, AgentSpanContext)
      */
-    AgentSpan startSpan(String instrumentationName, CharSequence spanName, AgentSpanContext parent);
+    public static AgentSpan startSpan(
+            final String instrumentationName, final CharSequence spanName, final AgentSpanContext parent) {
+        return get().startSpan(instrumentationName, spanName, parent);
+    }
 
     /**
-     * Create and start a new span with an explicit parent and a given start time.
-     *
-     * @param instrumentationName The instrumentation creating the span.
-     * @param spanName The span operation name.
-     * @param parent The parent span context.
-     * @param startTimeMicros The span start time, in microseconds.
-     * @return The new started span.
+     * @see TracerAPI#startSpan(String, CharSequence, AgentSpanContext, long)
      */
-    AgentSpan startSpan(
-        String instrumentationName,
-        CharSequence spanName,
-        AgentSpanContext parent,
-        long startTimeMicros);
-
-    /** Activate a span from inside auto-instrumentation. */
-    ContextScope activateSpan(AgentSpan span);
-
-    /** Activate a span from outside auto-instrumentation, i.e. a manual or custom span. */
-    ContextScope activateManualSpan(AgentSpan span);
-
-    /** Activate a span which will be closed by {@link #closeActive()} instead of a scope. */
-    void activateSpanWithoutScope(AgentSpan span);
-
-    @Override
-    default TraceScope.Continuation captureActiveSpan() {
-      Context current = currentContext();
-      if (AgentSpan.fromContext(current) == null) {
-        return NoopTraceScope.NoopContinuation.INSTANCE;
-      }
-      // captureActiveSpan is deprecated; use a best-effort wrapper
-      return new TraceScopeContinuationWrapper(capture(current));
+    public static AgentSpan startSpan(
+            final String instrumentationName,
+            final CharSequence spanName,
+            final AgentSpanContext parent,
+            final long startTimeMicros) {
+        return get().startSpan(instrumentationName, spanName, parent, startTimeMicros);
     }
 
-    void checkpointActiveForRollback();
-
-    void rollbackActiveToCheckpoint();
-
-    void closeActive();
-
-    void closePrevious(boolean finishSpan);
-
-    ContextScope activateNext(AgentSpan span);
-
-    AgentSpan activeSpan();
+    /**
+     * @see TracerAPI#startSpan(SpanPrototype, CharSequence)
+     */
+    public static AgentSpan startSpan(@Nonnull final SpanPrototype prototype, final CharSequence operationName) {
+        return get().startSpan(prototype, operationName);
+    }
 
-    default AgentSpan blackholeSpan() {
-      final AgentSpan active = activeSpan();
-      return new BlackHoleSpan(active != null ? active.getTraceId() : DDTraceId.ZERO);
+    public static ContextScope activateSpan(final AgentSpan span) {
+        return get().activateSpan(span);
     }
 
     /**
-     * Returns a SpanBuilder that can be used to produce multiple spans. To minimize overhead, use
-     * of {@link #singleSpanBuilder(String, CharSequence)} is preferred when only a single span is
-     * being built.
+     * Activate a span which will be closed by {@link #closeActive()} instead of a scope.
+     *
+     * @deprecated This should only be used when the instrumented code doesn't align with a scope.
      */
-    SpanBuilder buildSpan(String instrumentationName, CharSequence spanName);
+    @Deprecated
+    public static void activateSpanWithoutScope(final AgentSpan span) {
+        get().activateSpanWithoutScope(span);
+    }
 
     /**
-     * Returns a SpanBuilder seeded from a {@link SpanPrototype}: the prototype supplies the
-     * instrumentation name, span type, and constant tags. {@code operationName} overrides the
-     * prototype's when non-null — the explicit value wins, the prototype is the fallback.
+     * Checkpoints the active scope. A subsequent call to {@link #rollbackActiveToCheckpoint()} closes
+     * outstanding scopes up to but not including the most recent checkpointed scope.
      *
-     * <p>This default seeds identity only; a real tracer should override it to also seed the
-     * prototype's tags (see {@code CoreTracer}). The no-op tracer discards tags, so identity-only
-     * is correct there.
+     * @deprecated This should only be used when scopes might leak onto the scope stack which cannot
+     *     be cleaned up by other means.
      */
-    default SpanBuilder buildSpan(@Nonnull SpanPrototype prototype, CharSequence operationName) {
-      return buildSpan(
-          prototype.instrumentationName(),
-          operationName != null ? operationName : prototype.operationName());
+    @Deprecated
+    public static void checkpointActiveForRollback() {
+        get().checkpointActiveForRollback();
     }
 
     /**
-     * Creates and starts a span seeded from a {@link SpanPrototype}. This is the
-     * auto-instrumentation entry point mirroring {@link #startSpan(String, CharSequence)}; see
-     * {@link #buildSpan(SpanPrototype, CharSequence)}.
+     * Closes outstanding scopes up to but not including the most recent scope checkpointed with
+     * {@link #checkpointActiveForRollback()}. Closes all scopes if none have been checkpointed.
+     *
+     * @deprecated This should only be used when scopes have leaked onto the scope stack that cannot
+     *     be cleaned up by other means.
      */
-    default AgentSpan startSpan(@Nonnull SpanPrototype prototype, CharSequence operationName) {
-      return buildSpan(prototype, operationName).start();
+    @Deprecated
+    public static void rollbackActiveToCheckpoint() {
+        get().rollbackActiveToCheckpoint();
     }
 
     /**
-     * Returns a SpanBuilder that can be used to produce one and only one span. By imposing the
-     * single span creation limitation, this method is more efficient than {@link #buildSpan}
+     * Closes the scope for the currently active span.
+     *
+     * @deprecated This should only be used when the span was previously activated with {@link
+     *     #activateSpanWithoutScope} because the instrumented code didn't align with a scope.
      */
-    SpanBuilder singleSpanBuilder(String instrumentationName, CharSequence spanName);
-
-    void close();
+    @Deprecated
+    public static void closeActive() {
+        get().closeActive();
+    }
 
     /**
-     * Attach a scope listener to the global scope manager
-     *
-     * @param listener listener to attach
+     * Closes the immediately previous iteration scope. Should be called before creating a new span
+     * for {@link #activateNext(AgentSpan)}.
      */
-    void addScopeListener(ScopeListener listener);
-
-    SubscriptionService getSubscriptionService(RequestContextSlot slot);
-
-    CallbackProvider getCallbackProvider(RequestContextSlot slot);
-
-    CallbackProvider getUniversalCallbackProvider();
-
-    AgentSpanContext notifyLambdaStart(Object event, String lambdaRequestId);
-
-    void notifyExtensionEnd(AgentSpan span, Object result, boolean isError, String lambdaRequestId);
-
-    void notifyAppSecEnd(AgentSpan span, Object result);
-
-    AgentDataStreamsMonitoring getDataStreamsMonitoring();
-
-    String getTraceId(AgentSpan span);
-
-    String getSpanId(AgentSpan span);
-
-    TraceConfig captureTraceConfig();
-
-    ProfilingContextIntegration getProfilingContext();
+    public static void closePrevious(final boolean finishSpan) {
+        get().closePrevious(finishSpan);
+    }
 
     /**
-     * Sets the new service name to be used as a default.
+     * Activates a new iteration scope; closes automatically after a fixed period.
      *
-     * @param serviceName The service name to use as default.
-     * @param source the source which is setting it.
+     * @see datadog.trace.api.config.TracerConfig#SCOPE_ITERATION_KEEP_ALIVE
      */
-    void updatePreferredServiceName(String serviceName, CharSequence source);
-
-    void addShutdownListener(Runnable listener);
-
-    // these methods are only used for legacy context manager migration
-
-    @Deprecated
-    Context currentContext();
-
-    @Deprecated
-    ContextScope attach(Context context);
-
-    @Deprecated
-    Context swap(Context context);
-
-    @Deprecated
-    ContextContinuation capture(Context context);
-  }
-
-  public interface SpanBuilder {
-    AgentSpan start();
-
-    SpanBuilder asChildOf(AgentSpanContext toContext);
-
-    SpanBuilder ignoreActiveSpan();
-
-    SpanBuilder withTag(String key, String value);
-
-    SpanBuilder withTag(String key, boolean value);
-
-    SpanBuilder withTag(String key, Number value);
-
-    SpanBuilder withTag(String tag, Object value);
-
-    SpanBuilder withStartTimestamp(long microseconds);
-
-    SpanBuilder withServiceName(String serviceName);
-
-    SpanBuilder withResourceName(String resourceName);
-
-    SpanBuilder withErrorFlag();
-
-    SpanBuilder withSpanType(CharSequence spanType);
-
-    <T> SpanBuilder withRequestContextData(RequestContextSlot slot, T data);
-
-    SpanBuilder withLink(AgentSpanLink link);
-
-    SpanBuilder withSpanId(long spanId);
-  }
-
-  static class NoopTracerAPI implements TracerAPI {
-
-    protected NoopTracerAPI() {}
-
-    @Override
-    public AgentSpan startSpan(final String instrumentationName, final CharSequence spanName) {
-      return NoopSpan.INSTANCE;
+    public static ContextScope activateNext(final AgentSpan span) {
+        return get().activateNext(span);
     }
 
-    @Override
-    public AgentSpan startSpan(
-        @Nonnull final SpanPrototype prototype, final CharSequence operationName) {
-      // The default routes through buildSpan(String,...), which is null on the noop tracer -> NPE.
-      return NoopSpan.INSTANCE;
+    public static TraceConfig traceConfig(final AgentSpan span) {
+        return null != span ? span.traceConfig() : traceConfig();
     }
 
-    @Override
-    public AgentSpan startSpan(
-        final String instrumentationName, final CharSequence spanName, final long startTimeMicros) {
-      return NoopSpan.INSTANCE;
+    public static TraceConfig traceConfig() {
+        return get().captureTraceConfig();
     }
 
-    @Override
-    public AgentSpan startSpan(
-        final String instrumentationName,
-        final CharSequence spanName,
-        final AgentSpanContext parent) {
-      return NoopSpan.INSTANCE;
+    public static AgentSpan activeSpan() {
+        return get().activeSpan();
     }
 
-    @Override
-    public AgentSpan startSpan(
-        final String instrumentationName,
-        final CharSequence spanName,
-        final AgentSpanContext parent,
-        final long startTimeMicros) {
-      return NoopSpan.INSTANCE;
+    /**
+     * Checks whether asynchronous propagation is enabled, meaning this context will propagate across
+     * asynchronous boundaries.
+     *
+     * @return {@code true} if asynchronous propagation is enabled, {@code false} otherwise.
+     */
+    public static boolean isAsyncPropagationEnabled() {
+        return get().isAsyncPropagationEnabled();
     }
 
-    @Override
-    public ContextScope activateSpan(final AgentSpan span) {
-      return NoopScope.INSTANCE;
+    /**
+     * Enables or disables asynchronous propagation for the active span.
+     *
+     * <p>Asynchronous propagation is enabled by default from {@link
+     * ConfigDefaults#DEFAULT_ASYNC_PROPAGATING}.
+     *
+     * @param asyncPropagationEnabled {@code true} to enable asynchronous propagation, {@code false}
+     *     to disable it.
+     */
+    public static void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) {
+        get().setAsyncPropagationEnabled(asyncPropagationEnabled);
     }
 
-    @Override
-    public ContextScope activateManualSpan(final AgentSpan span) {
-      return NoopScope.INSTANCE;
+    /**
+     * Returns the noop span instance.
+     *
+     * <p>This instance will always be the same, and can be safely tested using object identity (ie
+     * {@code ==}).
+     *
+     * @return the noop span instance.
+     */
+    public static AgentSpan noopSpan() {
+        return NoopSpan.INSTANCE;
     }
 
-    @Override
-    public void activateSpanWithoutScope(final AgentSpan span) {}
+    public static AgentSpan blackholeSpan() {
+        return get().blackholeSpan();
+    }
 
-    @Override
-    public boolean isAsyncPropagationEnabled() {
-      return false;
+    /**
+     * Returns the noop span context instance.
+     *
+     * <p>This instance will always be the same, and can be safely tested using object identity (ie
+     * {@code ==}).
+     *
+     * @return the noop scope instance.
+     */
+    public static AgentSpanContext noopSpanContext() {
+        return NoopSpanContext.INSTANCE;
+    }
+
+    public static final TracerAPI NOOP_TRACER = new NoopTracerAPI();
+
+    private static volatile TracerAPI provider = NOOP_TRACER;
+
+    public static boolean isRegistered() {
+        return provider != NOOP_TRACER;
     }
 
-    @Override
-    public void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) {}
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Agent-internal static holder; class lock guards private static provider")
+    public static synchronized void registerIfAbsent(final TracerAPI tracer) {
+        if (tracer != null && tracer != NOOP_TRACER) {
+            provider = tracer;
+        }
+    }
+
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Agent-internal static holder; class lock guards private static provider")
+    public static synchronized void forceRegister(TracerAPI tracer) {
+        if (tracer == null) {
+            throw new IllegalArgumentException("tracer must not be null, use NOOP_TRACER instead");
+        }
+        provider = tracer;
+    }
+
+    public static TracerAPI get() {
+        return provider;
+    }
+
+    // Not intended to be constructed.
+    private AgentTracer() {}
+
+    public interface TracerAPI extends datadog.trace.api.Tracer, InternalTracer, EndpointCheckpointer {
+
+        /**
+         * Create and start a new span.
+         *
+         * @param instrumentationName The instrumentation creating the span.
+         * @param spanName The span operation name.
+         * @return The new started span.
+         */
+        AgentSpan startSpan(String instrumentationName, CharSequence spanName);
+
+        /**
+         * Create and start a new span with a given start time.
+         *
+         * @param instrumentationName The instrumentation creating the span.
+         * @param spanName The span operation name.
+         * @param startTimeMicros The span start time, in microseconds.
+         * @return The new started span.
+         */
+        AgentSpan startSpan(String instrumentationName, CharSequence spanName, long startTimeMicros);
+
+        /**
+         * Create and start a new span with an explicit parent.
+         *
+         * @param instrumentationName The instrumentation creating the span.
+         * @param spanName The span operation name.
+         * @param parent The parent span context.
+         * @return The new started span.
+         */
+        AgentSpan startSpan(String instrumentationName, CharSequence spanName, AgentSpanContext parent);
+
+        /**
+         * Create and start a new span with an explicit parent and a given start time.
+         *
+         * @param instrumentationName The instrumentation creating the span.
+         * @param spanName The span operation name.
+         * @param parent The parent span context.
+         * @param startTimeMicros The span start time, in microseconds.
+         * @return The new started span.
+         */
+        AgentSpan startSpan(
+                String instrumentationName, CharSequence spanName, AgentSpanContext parent, long startTimeMicros);
+
+        /** Activate a span from inside auto-instrumentation. */
+        ContextScope activateSpan(AgentSpan span);
 
-    @Override
-    public void checkpointActiveForRollback() {}
+        /** Activate a span from outside auto-instrumentation, i.e. a manual or custom span. */
+        ContextScope activateManualSpan(AgentSpan span);
 
-    @Override
-    public void rollbackActiveToCheckpoint() {}
+        /** Activate a span which will be closed by {@link #closeActive()} instead of a scope. */
+        void activateSpanWithoutScope(AgentSpan span);
+
+        @Override
+        default TraceScope.Continuation captureActiveSpan() {
+            Context current = currentContext();
+            if (AgentSpan.fromContext(current) == null) {
+                return NoopTraceScope.NoopContinuation.INSTANCE;
+            }
+            // captureActiveSpan is deprecated; use a best-effort wrapper
+            return new TraceScopeContinuationWrapper(capture(current));
+        }
 
-    @Override
-    public void closeActive() {}
+        void checkpointActiveForRollback();
 
-    @Override
-    public void closePrevious(final boolean finishSpan) {}
+        void rollbackActiveToCheckpoint();
 
-    @Override
-    public ContextScope activateNext(final AgentSpan span) {
-      return NoopScope.INSTANCE;
-    }
+        void closeActive();
 
-    @Override
-    public AgentSpan activeSpan() {
-      return NoopSpan.INSTANCE;
-    }
+        void closePrevious(boolean finishSpan);
 
-    @Override
-    public AgentSpan blackholeSpan() {
-      return NoopSpan.INSTANCE; // no-op tracer stays no-op
-    }
+        ContextScope activateNext(AgentSpan span);
 
-    @Override
-    public SpanBuilder buildSpan(final String instrumentationName, final CharSequence spanName) {
-      return null;
-    }
+        AgentSpan activeSpan();
 
-    @Override
-    public SpanBuilder buildSpan(
-        @Nonnull final SpanPrototype prototype, final CharSequence operationName) {
-      // Mirrors buildSpan(String,...): the noop tracer returns a null builder. Callers that need a
-      // noop-safe entry point use startSpan(...), which is overridden above. A chainable
-      // NoopSpanBuilder would fix the null-vs-NoopSpan asymmetry, but that is a separate PR.
-      return null;
-    }
+        default AgentSpan blackholeSpan() {
+            final AgentSpan active = activeSpan();
+            return new BlackHoleSpan(active != null ? active.getTraceId() : DDTraceId.ZERO);
+        }
 
-    @Override
-    public SpanBuilder singleSpanBuilder(
-        final String instrumentationName, final CharSequence spanName) {
-      return null;
-    }
+        /**
+         * Returns a SpanBuilder that can be used to produce multiple spans. To minimize overhead, use
+         * of {@link #singleSpanBuilder(String, CharSequence)} is preferred when only a single span is
+         * being built.
+         */
+        SpanBuilder buildSpan(String instrumentationName, CharSequence spanName);
 
-    @Override
-    public void close() {}
+        /**
+         * Returns a SpanBuilder seeded from a {@link SpanPrototype}: the prototype supplies the
+         * instrumentation name, span type, and constant tags. {@code operationName} overrides the
+         * prototype's when non-null — the explicit value wins, the prototype is the fallback.
+         *
+         * <p>This default seeds identity only; a real tracer should override it to also seed the
+         * prototype's tags (see {@code CoreTracer}). The no-op tracer discards tags, so identity-only
+         * is correct there.
+         */
+        default SpanBuilder buildSpan(@Nonnull SpanPrototype prototype, CharSequence operationName) {
+            return buildSpan(
+                    prototype.instrumentationName(), operationName != null ? operationName : prototype.operationName());
+        }
 
-    @Override
-    public void addScopeListener(
-        Runnable afterScopeActivatedCallback, Runnable afterScopeClosedCallback) {}
+        /**
+         * Creates and starts a span seeded from a {@link SpanPrototype}. This is the
+         * auto-instrumentation entry point mirroring {@link #startSpan(String, CharSequence)}; see
+         * {@link #buildSpan(SpanPrototype, CharSequence)}.
+         */
+        default AgentSpan startSpan(@Nonnull SpanPrototype prototype, CharSequence operationName) {
+            return buildSpan(prototype, operationName).start();
+        }
 
-    @Override
-    public void flush() {}
+        /**
+         * Returns a SpanBuilder that can be used to produce one and only one span. By imposing the
+         * single span creation limitation, this method is more efficient than {@link #buildSpan}
+         */
+        SpanBuilder singleSpanBuilder(String instrumentationName, CharSequence spanName);
 
-    @Override
-    public void flushMetrics() {}
+        void close();
 
-    @Override
-    public void flushLogs() {}
+        /**
+         * Attach a scope listener to the global scope manager
+         *
+         * @param listener listener to attach
+         */
+        void addScopeListener(ScopeListener listener);
 
-    @Override
-    public ProfilingContextIntegration getProfilingContext() {
-      return ProfilingContextIntegration.NoOp.INSTANCE;
-    }
+        SubscriptionService getSubscriptionService(RequestContextSlot slot);
 
-    @Override
-    public TraceSegment getTraceSegment() {
-      return null;
-    }
+        CallbackProvider getCallbackProvider(RequestContextSlot slot);
 
-    @Override
-    public String getTraceId() {
-      return null;
-    }
+        CallbackProvider getUniversalCallbackProvider();
 
-    @Override
-    public String getSpanId() {
-      return null;
-    }
+        AgentSpanContext notifyLambdaStart(Object event, String lambdaRequestId);
 
-    @Override
-    public String getTraceId(AgentSpan span) {
-      return null;
-    }
+        void notifyExtensionEnd(AgentSpan span, Object result, boolean isError, String lambdaRequestId);
 
-    @Override
-    public String getSpanId(AgentSpan span) {
-      return null;
-    }
-
-    @Override
-    public boolean addTraceInterceptor(final TraceInterceptor traceInterceptor) {
-      return false;
-    }
-
-    @Override
-    public TraceScope muteTracing() {
-      return NoopTraceScope.INSTANCE;
-    }
+        void notifyAppSecEnd(AgentSpan span, Object result);
 
-    @Override
-    public DataStreamsCheckpointer getDataStreamsCheckpointer() {
-      return getDataStreamsMonitoring();
-    }
+        AgentDataStreamsMonitoring getDataStreamsMonitoring();
 
-    @Override
-    public void addShutdownListener(Runnable listener) {}
+        String getTraceId(AgentSpan span);
 
-    @Override
-    public void addScopeListener(final ScopeListener listener) {}
+        String getSpanId(AgentSpan span);
 
-    @Override
-    public SubscriptionService getSubscriptionService(RequestContextSlot slot) {
-      return SubscriptionService.SubscriptionServiceNoop.INSTANCE;
-    }
+        TraceConfig captureTraceConfig();
 
-    @Override
-    public CallbackProvider getCallbackProvider(RequestContextSlot slot) {
-      return CallbackProvider.CallbackProviderNoop.INSTANCE;
-    }
+        ProfilingContextIntegration getProfilingContext();
 
-    @Override
-    public CallbackProvider getUniversalCallbackProvider() {
-      return CallbackProvider.CallbackProviderNoop.INSTANCE;
-    }
+        /**
+         * Sets the new service name to be used as a default.
+         *
+         * @param serviceName The service name to use as default.
+         * @param source the source which is setting it.
+         */
+        void updatePreferredServiceName(String serviceName, CharSequence source);
 
-    @Override
-    public void onRootSpanFinished(AgentSpan root, EndpointTracker tracker) {}
+        void addShutdownListener(Runnable listener);
 
-    @Override
-    public EndpointTracker onRootSpanStarted(AgentSpan root) {
-      return EndpointTracker.NO_OP;
-    }
+        // these methods are only used for legacy context manager migration
 
-    @Override
-    public AgentSpanContext notifyLambdaStart(Object event, String lambdaRequestId) {
-      return null;
-    }
+        @Deprecated
+        Context currentContext();
 
-    @Override
-    public void notifyExtensionEnd(
-        AgentSpan span, Object result, boolean isError, String lambdaRequestId) {}
+        @Deprecated
+        ContextScope attach(Context context);
 
-    @Override
-    public void notifyAppSecEnd(AgentSpan span, Object result) {}
+        @Deprecated
+        Context swap(Context context);
 
-    @Override
-    public AgentDataStreamsMonitoring getDataStreamsMonitoring() {
-      return NoopDataStreamsMonitoring.INSTANCE;
+        @Deprecated
+        ContextContinuation capture(Context context);
     }
 
-    @Override
-    public TraceConfig captureTraceConfig() {
-      return NoopTraceConfig.INSTANCE;
-    }
+    public interface SpanBuilder {
+        AgentSpan start();
 
-    @Override
-    public void updatePreferredServiceName(String serviceName, CharSequence preferredServiceName) {
-      // no ops
-    }
+        SpanBuilder asChildOf(AgentSpanContext toContext);
 
-    @Override
-    public Context currentContext() {
-      return Context.root();
-    }
+        SpanBuilder ignoreActiveSpan();
 
-    @Override
-    public ContextScope attach(Context context) {
-      return NoopScope.INSTANCE;
-    }
+        SpanBuilder withTag(String key, String value);
 
-    @Override
-    public Context swap(Context context) {
-      return Context.root();
-    }
+        SpanBuilder withTag(String key, boolean value);
 
-    @Override
-    public ContextContinuation capture(Context context) {
-      return NoopContinuation.INSTANCE;
-    }
-  }
+        SpanBuilder withTag(String key, Number value);
 
-  public static class NoopAgentTraceCollector implements AgentTraceCollector {
-    public static final NoopAgentTraceCollector INSTANCE = new NoopAgentTraceCollector();
+        SpanBuilder withTag(String tag, Object value);
 
-    @Override
-    public void registerContinuation(final ContextContinuation continuation) {}
+        SpanBuilder withStartTimestamp(long microseconds);
 
-    @Override
-    public void removeContinuation(final ContextContinuation continuation) {}
-  }
+        SpanBuilder withServiceName(String serviceName);
 
-  /** TraceConfig when there is no tracer; this is not the same as a default config. */
-  public static final class NoopTraceConfig implements TraceConfig {
-    public static final NoopTraceConfig INSTANCE = new NoopTraceConfig();
+        SpanBuilder withResourceName(String resourceName);
 
-    @Override
-    public boolean isTraceEnabled() {
-      return false;
-    }
+        SpanBuilder withErrorFlag();
 
-    @Override
-    public boolean isRuntimeMetricsEnabled() {
-      return false;
-    }
+        SpanBuilder withSpanType(CharSequence spanType);
 
-    @Override
-    public boolean isLogsInjectionEnabled() {
-      return false;
-    }
+        <T> SpanBuilder withRequestContextData(RequestContextSlot slot, T data);
 
-    @Override
-    public boolean isDataStreamsEnabled() {
-      return false;
-    }
+        SpanBuilder withLink(AgentSpanLink link);
 
-    @Override
-    public Map<String, String> getServiceMapping() {
-      return Collections.emptyMap();
+        SpanBuilder withSpanId(long spanId);
     }
 
-    @Override
-    public Map<String, String> getRequestHeaderTags() {
-      return Collections.emptyMap();
-    }
+    static class NoopTracerAPI implements TracerAPI {
 
-    @Override
-    public Map<String, String> getResponseHeaderTags() {
-      return Collections.emptyMap();
-    }
+        protected NoopTracerAPI() {}
 
-    @Override
-    public Map<String, String> getBaggageMapping() {
-      return Collections.emptyMap();
-    }
+        @Override
+        public AgentSpan startSpan(final String instrumentationName, final CharSequence spanName) {
+            return NoopSpan.INSTANCE;
+        }
 
-    @Override
-    public Double getTraceSampleRate() {
-      return null;
-    }
+        @Override
+        public AgentSpan startSpan(@Nonnull final SpanPrototype prototype, final CharSequence operationName) {
+            // The default routes through buildSpan(String,...), which is null on the noop tracer -> NPE.
+            return NoopSpan.INSTANCE;
+        }
 
-    @Override
-    public Map<String, String> getTracingTags() {
-      return Collections.emptyMap();
-    }
+        @Override
+        public AgentSpan startSpan(
+                final String instrumentationName, final CharSequence spanName, final long startTimeMicros) {
+            return NoopSpan.INSTANCE;
+        }
 
-    @Override
-    public Pair<String, CharSequence> getPreferredServiceNameAndSource() {
-      return null;
-    }
+        @Override
+        public AgentSpan startSpan(
+                final String instrumentationName, final CharSequence spanName, final AgentSpanContext parent) {
+            return NoopSpan.INSTANCE;
+        }
 
-    @Override
-    public List<? extends SamplingRule.SpanSamplingRule> getSpanSamplingRules() {
-      return Collections.emptyList();
-    }
+        @Override
+        public AgentSpan startSpan(
+                final String instrumentationName,
+                final CharSequence spanName,
+                final AgentSpanContext parent,
+                final long startTimeMicros) {
+            return NoopSpan.INSTANCE;
+        }
 
-    @Override
-    public List<? extends SamplingRule.TraceSamplingRule> getTraceSamplingRules() {
-      return Collections.emptyList();
-    }
+        @Override
+        public ContextScope activateSpan(final AgentSpan span) {
+            return NoopScope.INSTANCE;
+        }
 
-    @Override
-    public List<DataStreamsTransactionExtractor> getDataStreamsTransactionExtractors() {
-      return null;
-    }
-  }
+        @Override
+        public ContextScope activateManualSpan(final AgentSpan span) {
+            return NoopScope.INSTANCE;
+        }
 
-  /**
-   * Decides whether to install the legacy approach to managing contexts, which requires a tracer.
-   *
-   * <p>Must be called ahead of instrumentation, before any use of the Context API.
-   */
-  public static void maybeInstallLegacyContextManager() {
-    installLegacyContextManager(); // install everywhere to begin with
-  }
+        @Override
+        public void activateSpanWithoutScope(final AgentSpan span) {}
 
-  /**
-   * Always install the legacy approach to managing contexts, which requires a tracer.
-   *
-   * <p>Must be called ahead of instrumentation, before any use of the Context API.
-   */
-  public static void installLegacyContextManager() {
-    ContextManager.register(LegacyContextManager.INSTANCE);
-  }
+        @Override
+        public boolean isAsyncPropagationEnabled() {
+            return false;
+        }
 
-  /** Shim mapping new Context API to legacy scope manager. */
-  static final class LegacyContextManager implements ContextManager {
-    static final LegacyContextManager INSTANCE = new LegacyContextManager();
+        @Override
+        public void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) {}
 
-    @Override
-    public Context current() {
-      return AgentTracer.get().currentContext();
-    }
+        @Override
+        public void checkpointActiveForRollback() {}
 
-    @Override
-    public ContextScope attach(@Nonnull Context context) {
-      return AgentTracer.get().attach(context);
-    }
+        @Override
+        public void rollbackActiveToCheckpoint() {}
 
-    @Override
-    public Context swap(@Nonnull Context context) {
-      return AgentTracer.get().swap(context);
-    }
+        @Override
+        public void closeActive() {}
 
-    @Override
-    public ContextContinuation capture(@Nonnull Context context) {
-      return AgentTracer.get().capture(context);
-    }
+        @Override
+        public void closePrevious(final boolean finishSpan) {}
 
-    @Override
-    public void addListener(@Nonnull ContextListener listener) {
-      // this method is never used in legacy mode...
-    }
-  }
+        @Override
+        public ContextScope activateNext(final AgentSpan span) {
+            return NoopScope.INSTANCE;
+        }
 
-  /** Adapts a {@link ContextContinuation} to the deprecated {@link TraceScope.Continuation} SPI. */
-  private static final class TraceScopeContinuationWrapper implements TraceScope.Continuation {
-    private final ContextContinuation continuation;
+        @Override
+        public AgentSpan activeSpan() {
+            return NoopSpan.INSTANCE;
+        }
 
-    TraceScopeContinuationWrapper(ContextContinuation continuation) {
-      this.continuation = continuation;
-    }
+        @Override
+        public AgentSpan blackholeSpan() {
+            return NoopSpan.INSTANCE; // no-op tracer stays no-op
+        }
+
+        @Override
+        public SpanBuilder buildSpan(final String instrumentationName, final CharSequence spanName) {
+            return null;
+        }
+
+        @Override
+        public SpanBuilder buildSpan(@Nonnull final SpanPrototype prototype, final CharSequence operationName) {
+            // Mirrors buildSpan(String,...): the noop tracer returns a null builder. Callers that need a
+            // noop-safe entry point use startSpan(...), which is overridden above. A chainable
+            // NoopSpanBuilder would fix the null-vs-NoopSpan asymmetry, but that is a separate PR.
+            return null;
+        }
+
+        @Override
+        public SpanBuilder singleSpanBuilder(final String instrumentationName, final CharSequence spanName) {
+            return null;
+        }
+
+        @Override
+        public void close() {}
+
+        @Override
+        public void addScopeListener(Runnable afterScopeActivatedCallback, Runnable afterScopeClosedCallback) {}
+
+        @Override
+        public void flush() {}
+
+        @Override
+        public void flushMetrics() {}
+
+        @Override
+        public void flushLogs() {}
+
+        @Override
+        public ProfilingContextIntegration getProfilingContext() {
+            return ProfilingContextIntegration.NoOp.INSTANCE;
+        }
+
+        @Override
+        public TraceSegment getTraceSegment() {
+            return null;
+        }
+
+        @Override
+        public String getTraceId() {
+            return null;
+        }
+
+        @Override
+        public String getSpanId() {
+            return null;
+        }
+
+        @Override
+        public String getTraceId(AgentSpan span) {
+            return null;
+        }
+
+        @Override
+        public String getSpanId(AgentSpan span) {
+            return null;
+        }
+
+        @Override
+        public boolean addTraceInterceptor(final TraceInterceptor traceInterceptor) {
+            return false;
+        }
+
+        @Override
+        public TraceScope muteTracing() {
+            return NoopTraceScope.INSTANCE;
+        }
+
+        @Override
+        public DataStreamsCheckpointer getDataStreamsCheckpointer() {
+            return getDataStreamsMonitoring();
+        }
+
+        @Override
+        public void addShutdownListener(Runnable listener) {}
+
+        @Override
+        public void addScopeListener(final ScopeListener listener) {}
+
+        @Override
+        public SubscriptionService getSubscriptionService(RequestContextSlot slot) {
+            return SubscriptionService.SubscriptionServiceNoop.INSTANCE;
+        }
+
+        @Override
+        public CallbackProvider getCallbackProvider(RequestContextSlot slot) {
+            return CallbackProvider.CallbackProviderNoop.INSTANCE;
+        }
+
+        @Override
+        public CallbackProvider getUniversalCallbackProvider() {
+            return CallbackProvider.CallbackProviderNoop.INSTANCE;
+        }
+
+        @Override
+        public void onRootSpanFinished(AgentSpan root, EndpointTracker tracker) {}
+
+        @Override
+        public EndpointTracker onRootSpanStarted(AgentSpan root) {
+            return EndpointTracker.NO_OP;
+        }
+
+        @Override
+        public AgentSpanContext notifyLambdaStart(Object event, String lambdaRequestId) {
+            return null;
+        }
+
+        @Override
+        public void notifyExtensionEnd(AgentSpan span, Object result, boolean isError, String lambdaRequestId) {}
+
+        @Override
+        public void notifyAppSecEnd(AgentSpan span, Object result) {}
+
+        @Override
+        public AgentDataStreamsMonitoring getDataStreamsMonitoring() {
+            return NoopDataStreamsMonitoring.INSTANCE;
+        }
+
+        @Override
+        public TraceConfig captureTraceConfig() {
+            return NoopTraceConfig.INSTANCE;
+        }
+
+        @Override
+        public void updatePreferredServiceName(String serviceName, CharSequence preferredServiceName) {
+            // no ops
+        }
+
+        @Override
+        public Context currentContext() {
+            return Context.root();
+        }
+
+        @Override
+        public ContextScope attach(Context context) {
+            return NoopScope.INSTANCE;
+        }
+
+        @Override
+        public Context swap(Context context) {
+            return Context.root();
+        }
+
+        @Override
+        public ContextContinuation capture(Context context) {
+            return NoopContinuation.INSTANCE;
+        }
+    }
+
+    public static class NoopAgentTraceCollector implements AgentTraceCollector {
+        public static final NoopAgentTraceCollector INSTANCE = new NoopAgentTraceCollector();
+
+        @Override
+        public void registerContinuation(final ContextContinuation continuation) {}
+
+        @Override
+        public void removeContinuation(final ContextContinuation continuation) {}
+    }
+
+    /** TraceConfig when there is no tracer; this is not the same as a default config. */
+    public static final class NoopTraceConfig implements TraceConfig {
+        public static final NoopTraceConfig INSTANCE = new NoopTraceConfig();
+
+        @Override
+        public boolean isTraceEnabled() {
+            return false;
+        }
+
+        @Override
+        public boolean isRuntimeMetricsEnabled() {
+            return false;
+        }
+
+        @Override
+        public boolean isLogsInjectionEnabled() {
+            return false;
+        }
+
+        @Override
+        public boolean isDataStreamsEnabled() {
+            return false;
+        }
+
+        @Override
+        public Map<String, String> getServiceMapping() {
+            return Collections.emptyMap();
+        }
+
+        @Override
+        public Map<String, String> getRequestHeaderTags() {
+            return Collections.emptyMap();
+        }
+
+        @Override
+        public Map<String, String> getResponseHeaderTags() {
+            return Collections.emptyMap();
+        }
+
+        @Override
+        public Map<String, String> getBaggageMapping() {
+            return Collections.emptyMap();
+        }
+
+        @Override
+        public Double getTraceSampleRate() {
+            return null;
+        }
+
+        @Override
+        public Map<String, String> getTracingTags() {
+            return Collections.emptyMap();
+        }
+
+        @Override
+        public Pair<String, CharSequence> getPreferredServiceNameAndSource() {
+            return null;
+        }
+
+        @Override
+        public List<? extends SamplingRule.SpanSamplingRule> getSpanSamplingRules() {
+            return Collections.emptyList();
+        }
+
+        @Override
+        public List<? extends SamplingRule.TraceSamplingRule> getTraceSamplingRules() {
+            return Collections.emptyList();
+        }
 
-    @Override
-    public TraceScope.Continuation hold() {
-      continuation.hold();
-      return this;
+        @Override
+        public List<DataStreamsTransactionExtractor> getDataStreamsTransactionExtractors() {
+            return null;
+        }
     }
 
-    @Override
-    @SuppressWarnings("resource")
-    public TraceScope activate() {
-      ContextScope scope = continuation.resume();
-      return scope instanceof TraceScope ? (TraceScope) scope : scope::close;
+    /**
+     * Decides whether to install the legacy approach to managing contexts, which requires a tracer.
+     *
+     * <p>Must be called ahead of instrumentation, before any use of the Context API.
+     */
+    public static void maybeInstallLegacyContextManager() {
+        installLegacyContextManager(); // install everywhere to begin with
     }
 
-    @Override
-    public void cancel() {
-      continuation.release();
+    /**
+     * Always install the legacy approach to managing contexts, which requires a tracer.
+     *
+     * <p>Must be called ahead of instrumentation, before any use of the Context API.
+     */
+    public static void installLegacyContextManager() {
+        ContextManager.register(LegacyContextManager.INSTANCE);
+    }
+
+    /** Shim mapping new Context API to legacy scope manager. */
+    static final class LegacyContextManager implements ContextManager {
+        static final LegacyContextManager INSTANCE = new LegacyContextManager();
+
+        @Override
+        public Context current() {
+            return AgentTracer.get().currentContext();
+        }
+
+        @Override
+        public ContextScope attach(@Nonnull Context context) {
+            return AgentTracer.get().attach(context);
+        }
+
+        @Override
+        public Context swap(@Nonnull Context context) {
+            return AgentTracer.get().swap(context);
+        }
+
+        @Override
+        public ContextContinuation capture(@Nonnull Context context) {
+            return AgentTracer.get().capture(context);
+        }
+
+        @Override
+        public void addListener(@Nonnull ContextListener listener) {
+            // this method is never used in legacy mode...
+        }
+    }
+
+    /** Adapts a {@link ContextContinuation} to the deprecated {@link TraceScope.Continuation} SPI. */
+    private static final class TraceScopeContinuationWrapper implements TraceScope.Continuation {
+        private final ContextContinuation continuation;
+
+        TraceScopeContinuationWrapper(ContextContinuation continuation) {
+            this.continuation = continuation;
+        }
+
+        @Override
+        public TraceScope.Continuation hold() {
+            continuation.hold();
+            return this;
+        }
+
+        @Override
+        @SuppressWarnings("resource")
+        public TraceScope activate() {
+            ContextScope scope = continuation.resume();
+            return scope instanceof TraceScope ? (TraceScope) scope : scope::close;
+        }
+
+        @Override
+        public void cancel() {
+            continuation.release();
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AppendableSpanLinks.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AppendableSpanLinks.java
index f1cc5325695..e64e2fa5634 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AppendableSpanLinks.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AppendableSpanLinks.java
@@ -3,5 +3,5 @@
 /** Interface that provides the ability to append a span link */
 @FunctionalInterface
 public interface AppendableSpanLinks {
-  void addLink(AgentSpanLink link);
+    void addLink(AgentSpanLink link);
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AttachableWrapper.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AttachableWrapper.java
index 61a835938e2..e7d40cc9bbe 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AttachableWrapper.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AttachableWrapper.java
@@ -6,10 +6,10 @@
 /** Cache interface for OT/OTel wrappers used by TypeConverters to avoid extra allocations. */
 public interface AttachableWrapper {
 
-  /** Attaches a OT/OTel wrapper to a tracer object. */
-  void attachWrapper(@Nonnull SpanWrapper wrapper);
+    /** Attaches a OT/OTel wrapper to a tracer object. */
+    void attachWrapper(@Nonnull SpanWrapper wrapper);
 
-  /** Returns an attached OT/OTel wrapper or null. */
-  @Nullable
-  SpanWrapper getWrapper();
+    /** Returns an attached OT/OTel wrapper or null. */
+    @Nullable
+    SpanWrapper getWrapper();
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Baggage.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Baggage.java
index a66ec83a331..162582db9c0 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Baggage.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Baggage.java
@@ -13,111 +13,111 @@
 
 /** Baggage are key/value store which propagate alongside {@link Context}. */
 public class Baggage implements ImplicitContextKeyed {
-  private static final ContextKey<Baggage> CONTEXT_KEY = named("baggage-key");
-  private final Map<String, String> items;
+    private static final ContextKey<Baggage> CONTEXT_KEY = named("baggage-key");
+    private final Map<String, String> items;
 
-  /**
-   * The <a href="https://www.w3.org/TR/baggage/">W3C Baggage header representation</a> of the
-   * baggage instance, {@code null} if not in sync with the current baggage items.
-   */
-  private String w3cHeader;
+    /**
+     * The <a href="https://www.w3.org/TR/baggage/">W3C Baggage header representation</a> of the
+     * baggage instance, {@code null} if not in sync with the current baggage items.
+     */
+    private String w3cHeader;
 
-  /**
-   * Gets baggage from context.
-   *
-   * @param context The context to get baggage from.
-   * @return The baggage from the given context if any, {@code null} if none.
-   */
-  public static @Nullable Baggage fromContext(Context context) {
-    return context.get(CONTEXT_KEY);
-  }
+    /**
+     * Gets baggage from context.
+     *
+     * @param context The context to get baggage from.
+     * @return The baggage from the given context if any, {@code null} if none.
+     */
+    public static @Nullable Baggage fromContext(Context context) {
+        return context.get(CONTEXT_KEY);
+    }
 
-  /**
-   * Create empty baggage.
-   *
-   * @return Empty baggage.
-   */
-  public static Baggage empty() {
-    return create(new HashMap<>(), "");
-  }
+    /**
+     * Create empty baggage.
+     *
+     * @return Empty baggage.
+     */
+    public static Baggage empty() {
+        return create(new HashMap<>(), "");
+    }
 
-  /**
-   * Create baggage from items.
-   *
-   * @param items The original baggage items.
-   * @return Baggage with the given items.
-   */
-  public static Baggage create(Map<String, String> items) {
-    return new Baggage(items, null);
-  }
+    /**
+     * Create baggage from items.
+     *
+     * @param items The original baggage items.
+     * @return Baggage with the given items.
+     */
+    public static Baggage create(Map<String, String> items) {
+        return new Baggage(items, null);
+    }
 
-  /**
-   * Create baggage from items.
-   *
-   * @param items The original baggage items.
-   * @param w3cHeader The W3C Baggage header representation.
-   * @return Baggage with the given items and its W3C header cached.
-   */
-  public static Baggage create(Map<String, String> items, String w3cHeader) {
-    return new Baggage(items, w3cHeader);
-  }
+    /**
+     * Create baggage from items.
+     *
+     * @param items The original baggage items.
+     * @param w3cHeader The W3C Baggage header representation.
+     * @return Baggage with the given items and its W3C header cached.
+     */
+    public static Baggage create(Map<String, String> items, String w3cHeader) {
+        return new Baggage(items, w3cHeader);
+    }
 
-  private Baggage(Map<String, String> items, String w3cHeader) {
-    this.items = items;
-    this.w3cHeader = w3cHeader;
-  }
+    private Baggage(Map<String, String> items, String w3cHeader) {
+        this.items = items;
+        this.w3cHeader = w3cHeader;
+    }
 
-  /**
-   * Adds a baggage item.
-   *
-   * @param key The item key.
-   * @param value The item value.
-   */
-  public void addItem(String key, String value) {
-    this.items.put(key, value);
-    this.w3cHeader = null;
-  }
+    /**
+     * Adds a baggage item.
+     *
+     * @param key The item key.
+     * @param value The item value.
+     */
+    public void addItem(String key, String value) {
+        this.items.put(key, value);
+        this.w3cHeader = null;
+    }
 
-  /**
-   * Removes a baggage item.
-   *
-   * @param key The item key to remove.
-   */
-  public void removeItem(String key) {
-    if (this.items.remove(key) != null) {
-      this.w3cHeader = null;
+    /**
+     * Removes a baggage item.
+     *
+     * @param key The item key to remove.
+     */
+    public void removeItem(String key) {
+        if (this.items.remove(key) != null) {
+            this.w3cHeader = null;
+        }
     }
-  }
 
-  /**
-   * Gets the <a href="https://www.w3.org/TR/baggage/">W3C Baggage header representation</a>.
-   *
-   * @return The header value, {@code null} if not in sync with the current baggage items.
-   */
-  public @Nullable String getW3cHeader() {
-    return this.w3cHeader;
-  }
+    /**
+     * Gets the <a href="https://www.w3.org/TR/baggage/">W3C Baggage header representation</a>.
+     *
+     * @return The header value, {@code null} if not in sync with the current baggage items.
+     */
+    public @Nullable String getW3cHeader() {
+        return this.w3cHeader;
+    }
 
-  /**
-   * Updates the <a href="https://www.w3.org/TR/baggage/">W3C Baggage header representation</a>.
-   *
-   * @param w3cHeader The header value.
-   */
-  public void setW3cHeader(String w3cHeader) {
-    this.w3cHeader = w3cHeader;
-  }
+    /**
+     * Updates the <a href="https://www.w3.org/TR/baggage/">W3C Baggage header representation</a>.
+     *
+     * @param w3cHeader The header value.
+     */
+    public void setW3cHeader(String w3cHeader) {
+        this.w3cHeader = w3cHeader;
+    }
 
-  /**
-   * Gets a view of the baggage items.
-   *
-   * @return The read-only view of the baggage items.
-   */
-  public Map<String, String> asMap() {
-    return unmodifiableMap(this.items);
-  }
+    /**
+     * Gets a view of the baggage items.
+     *
+     * @return The read-only view of the baggage items.
+     */
+    public Map<String, String> asMap() {
+        return unmodifiableMap(this.items);
+    }
 
-  @Override
-  public Context storeInto(@Nonnull Context context) {
-    return context.with(CONTEXT_KEY, this);
-  }
+    @Override
+    public Context storeInto(@Nonnull Context context) {
+        return context.with(CONTEXT_KEY, this);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/BlackHoleSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/BlackHoleSpan.java
index f5e477d2054..10555c88677 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/BlackHoleSpan.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/BlackHoleSpan.java
@@ -4,32 +4,31 @@
 
 /** An {@link AgentSpan} implementation that stops context propagation. */
 public final class BlackHoleSpan extends NoopSpan {
-  private final DDTraceId traceId;
-
-  public BlackHoleSpan(final DDTraceId traceId) {
-    this.traceId = traceId;
-  }
-
-  @Override
-  public boolean isSameTrace(final AgentSpan otherSpan) {
-    return otherSpan != null
-        && ((traceId != null && traceId.equals(otherSpan.getTraceId()))
-            || otherSpan.getTraceId() == null);
-  }
-
-  @Override
-  public DDTraceId getTraceId() {
-    return traceId;
-  }
-
-  @Override
-  public AgentSpanContext spanContext() {
-    return Context.INSTANCE;
-  }
-
-  public static final class Context extends NoopSpanContext {
-    public static final Context INSTANCE = new Context();
-
-    private Context() {}
-  }
+    private final DDTraceId traceId;
+
+    public BlackHoleSpan(final DDTraceId traceId) {
+        this.traceId = traceId;
+    }
+
+    @Override
+    public boolean isSameTrace(final AgentSpan otherSpan) {
+        return otherSpan != null
+                && ((traceId != null && traceId.equals(otherSpan.getTraceId())) || otherSpan.getTraceId() == null);
+    }
+
+    @Override
+    public DDTraceId getTraceId() {
+        return traceId;
+    }
+
+    @Override
+    public AgentSpanContext spanContext() {
+        return Context.INSTANCE;
+    }
+
+    public static final class Context extends NoopSpanContext {
+        public static final Context INSTANCE = new Context();
+
+        private Context() {}
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ClientIpAddressData.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ClientIpAddressData.java
index d22bcde4618..834af4a7e56 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ClientIpAddressData.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ClientIpAddressData.java
@@ -5,19 +5,19 @@
  * (such as AI Guard) can apply it lazily to the local root span without re-running the resolver.
  */
 public final class ClientIpAddressData {
-  private final String peerIp;
-  private final String inferredClientIp;
+    private final String peerIp;
+    private final String inferredClientIp;
 
-  public ClientIpAddressData(final String peerIp, final String inferredClientIp) {
-    this.peerIp = peerIp;
-    this.inferredClientIp = inferredClientIp;
-  }
+    public ClientIpAddressData(final String peerIp, final String inferredClientIp) {
+        this.peerIp = peerIp;
+        this.inferredClientIp = inferredClientIp;
+    }
 
-  public String getPeerIp() {
-    return peerIp;
-  }
+    public String getPeerIp() {
+        return peerIp;
+    }
 
-  public String getInferredClientIp() {
-    return inferredClientIp;
-  }
+    public String getInferredClientIp() {
+        return inferredClientIp;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ErrorPriorities.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ErrorPriorities.java
index d1a5525efdf..6f86abe1fba 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ErrorPriorities.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ErrorPriorities.java
@@ -1,9 +1,9 @@
 package datadog.trace.bootstrap.instrumentation.api;
 
 public class ErrorPriorities {
-  public static final byte UNSET = Byte.MIN_VALUE;
-  public static final byte HTTP_SERVER_DECORATOR = -1;
+    public static final byte UNSET = Byte.MIN_VALUE;
+    public static final byte HTTP_SERVER_DECORATOR = -1;
 
-  public static final byte DEFAULT = 0;
-  public static final byte MANUAL_INSTRUMENTATION = 1;
+    public static final byte DEFAULT = 0;
+    public static final byte MANUAL_INSTRUMENTATION = 1;
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ExtractedSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ExtractedSpan.java
index d589141b8d2..4cb1bfddd7d 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ExtractedSpan.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ExtractedSpan.java
@@ -14,158 +14,158 @@
  * propagated information into span context, until they migrate to the new context API.
  */
 class ExtractedSpan extends ImmutableSpan {
-  private final AgentSpanContext spanContext;
-
-  ExtractedSpan(AgentSpanContext spanContext) {
-    this.spanContext = spanContext;
-  }
-
-  @Override
-  public DDTraceId getTraceId() {
-    return this.spanContext.getTraceId();
-  }
-
-  @Override
-  public long getSpanId() {
-    return this.spanContext.getSpanId();
-  }
-
-  @Override
-  public AgentSpan getRootSpan() {
-    return this;
-  }
-
-  @Override
-  public AgentSpan getLocalRootSpan() {
-    return this;
-  }
-
-  @Override
-  public boolean isError() {
-    return false;
-  }
-
-  @Override
-  public short getHttpStatusCode() {
-    return 0;
-  }
-
-  @Override
-  public CharSequence getSpanName() {
-    return "";
-  }
-
-  @Override
-  public boolean hasResourceName() {
-    return false;
-  }
-
-  @Override
-  public byte getResourceNamePriority() {
-    return Byte.MAX_VALUE;
-  }
-
-  @Override
-  public long getStartTime() {
-    return 0;
-  }
-
-  @Override
-  public long getDurationNano() {
-    return 0;
-  }
-
-  @Override
-  public CharSequence getOperationName() {
-    return null;
-  }
-
-  @Override
-  public String getServiceName() {
-    return "";
-  }
-
-  @Override
-  public CharSequence getResourceName() {
-    return null;
-  }
-
-  @Override
-  public Integer getSamplingPriority() {
-    return this.spanContext.getSamplingPriority();
-  }
-
-  @Override
-  public String getSpanType() {
-    return null;
-  }
-
-  @Override
-  public boolean isOutbound() {
-    return false;
-  }
-
-  @Override
-  public Object getTag(final String tag) {
-    if (this.spanContext instanceof TagContext) {
-      return ((TagContext) this.spanContext).getTags().getObject(tag);
-    }
-    return null;
-  }
-
-  @Override
-  public TagMap getTags() {
-    if (this.spanContext instanceof TagContext) {
-      return ((TagContext) this.spanContext).getTags();
-    } else {
-      return TagMap.EMPTY;
-    }
-  }
-
-  @Override
-  public String getBaggageItem(final String key) {
-    Iterable<Map.Entry<String, String>> baggage = this.spanContext.baggageItems();
-    for (Map.Entry<String, String> stringStringEntry : baggage) {
-      if (stringStringEntry.getKey().equals(key)) {
-        return stringStringEntry.getValue();
-      }
-    }
-    return null;
-  }
-
-  @Override
-  public AgentSpanContext spanContext() {
-    return this.spanContext;
-  }
-
-  @Override
-  public TraceConfig traceConfig() {
-    if (this.spanContext instanceof TagContext) {
-      TraceConfig traceConfig = ((TagContext) this.spanContext).getTraceConfig();
-      if (traceConfig != null) {
-        return traceConfig;
-      }
-    }
-    return AgentTracer.traceConfig();
-  }
-
-  @Override
-  public boolean isSameTrace(AgentSpan otherSpan) {
-    return null != otherSpan && getTraceId().equals(otherSpan.getTraceId());
-  }
-
-  @Override
-  public RequestContext getRequestContext() {
-    return RequestContext.Noop.INSTANCE;
-  }
-
-  @Override
-  public RequestBlockingAction getRequestBlockingAction() {
-    return null;
-  }
-
-  @Override
-  public String toString() {
-    return "ExtractedSpan{spanContext=" + this.spanContext + '}';
-  }
+    private final AgentSpanContext spanContext;
+
+    ExtractedSpan(AgentSpanContext spanContext) {
+        this.spanContext = spanContext;
+    }
+
+    @Override
+    public DDTraceId getTraceId() {
+        return this.spanContext.getTraceId();
+    }
+
+    @Override
+    public long getSpanId() {
+        return this.spanContext.getSpanId();
+    }
+
+    @Override
+    public AgentSpan getRootSpan() {
+        return this;
+    }
+
+    @Override
+    public AgentSpan getLocalRootSpan() {
+        return this;
+    }
+
+    @Override
+    public boolean isError() {
+        return false;
+    }
+
+    @Override
+    public short getHttpStatusCode() {
+        return 0;
+    }
+
+    @Override
+    public CharSequence getSpanName() {
+        return "";
+    }
+
+    @Override
+    public boolean hasResourceName() {
+        return false;
+    }
+
+    @Override
+    public byte getResourceNamePriority() {
+        return Byte.MAX_VALUE;
+    }
+
+    @Override
+    public long getStartTime() {
+        return 0;
+    }
+
+    @Override
+    public long getDurationNano() {
+        return 0;
+    }
+
+    @Override
+    public CharSequence getOperationName() {
+        return null;
+    }
+
+    @Override
+    public String getServiceName() {
+        return "";
+    }
+
+    @Override
+    public CharSequence getResourceName() {
+        return null;
+    }
+
+    @Override
+    public Integer getSamplingPriority() {
+        return this.spanContext.getSamplingPriority();
+    }
+
+    @Override
+    public String getSpanType() {
+        return null;
+    }
+
+    @Override
+    public boolean isOutbound() {
+        return false;
+    }
+
+    @Override
+    public Object getTag(final String tag) {
+        if (this.spanContext instanceof TagContext) {
+            return ((TagContext) this.spanContext).getTags().getObject(tag);
+        }
+        return null;
+    }
+
+    @Override
+    public TagMap getTags() {
+        if (this.spanContext instanceof TagContext) {
+            return ((TagContext) this.spanContext).getTags();
+        } else {
+            return TagMap.EMPTY;
+        }
+    }
+
+    @Override
+    public String getBaggageItem(final String key) {
+        Iterable<Map.Entry<String, String>> baggage = this.spanContext.baggageItems();
+        for (Map.Entry<String, String> stringStringEntry : baggage) {
+            if (stringStringEntry.getKey().equals(key)) {
+                return stringStringEntry.getValue();
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public AgentSpanContext spanContext() {
+        return this.spanContext;
+    }
+
+    @Override
+    public TraceConfig traceConfig() {
+        if (this.spanContext instanceof TagContext) {
+            TraceConfig traceConfig = ((TagContext) this.spanContext).getTraceConfig();
+            if (traceConfig != null) {
+                return traceConfig;
+            }
+        }
+        return AgentTracer.traceConfig();
+    }
+
+    @Override
+    public boolean isSameTrace(AgentSpan otherSpan) {
+        return null != otherSpan && getTraceId().equals(otherSpan.getTraceId());
+    }
+
+    @Override
+    public RequestContext getRequestContext() {
+        return RequestContext.Noop.INSTANCE;
+    }
+
+    @Override
+    public RequestBlockingAction getRequestBlockingAction() {
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return "ExtractedSpan{spanContext=" + this.spanContext + '}';
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ImmutableSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ImmutableSpan.java
index c71f8b59023..afda8357efd 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ImmutableSpan.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ImmutableSpan.java
@@ -12,200 +12,200 @@
  * alternative to provide read-only span implementations.
  */
 public abstract class ImmutableSpan implements AgentSpan {
-  @Override
-  public AgentSpan setTag(String key, boolean value) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setTag(String key, int value) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setTag(String key, long value) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setTag(String key, float value) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setTag(String key, double value) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setTag(String key, String value) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setTag(TagMap.EntryReader entry) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setTag(String key, CharSequence value) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setTag(String key, Object value) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setAllTags(Map<String, ?> map) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setTag(String key, Number value) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setMetric(CharSequence key, int value) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setMetric(CharSequence key, long value) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setMetric(CharSequence key, float value) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setMetric(CharSequence key, double value) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setMetric(TagMap.EntryReader entry) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setSpanType(CharSequence type) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setError(boolean error) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setError(boolean error, byte priority) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setMeasured(boolean measured) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setErrorMessage(String errorMessage) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan addThrowable(Throwable throwable) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan addThrowable(Throwable throwable, byte errorPriority) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setBaggageItem(String key, String value) {
-    return null;
-  }
-
-  @Override
-  public AgentSpan setHttpStatusCode(int statusCode) {
-    return this;
-  }
-
-  @Override
-  public void finish() {}
-
-  @Override
-  public void finish(long finishMicros) {}
-
-  @Override
-  public void finishWithDuration(long durationNanos) {}
-
-  @Override
-  public void beginEndToEnd() {}
-
-  @Override
-  public void finishWithEndToEnd() {}
-
-  @Override
-  public boolean phasedFinish() {
-    return false;
-  }
-
-  @Override
-  public void publish() {}
-
-  @Override
-  public void setSpanName(CharSequence spanName) {}
-
-  @Override
-  public MutableSpan setOperationName(CharSequence serviceName) {
-    return this;
-  }
-
-  @Override
-  public MutableSpan setServiceName(String serviceName) {
-    return this;
-  }
-
-  @Override
-  public AgentSpan setResourceName(CharSequence resourceName) {
-    return this;
-  }
-
-  @Override
-  public MutableSpan setSamplingPriority(int newPriority) {
-    return null;
-  }
-
-  @Override
-  public AgentSpan setResourceName(CharSequence resourceName, byte priority) {
-    return null;
-  }
-
-  @Override
-  public Integer forceSamplingDecision() {
-    return null;
-  }
-
-  @Override
-  public AgentSpan setSamplingPriority(int newPriority, int samplingMechanism) {
-    return this;
-  }
-
-  @Override
-  public void addLink(AgentSpanLink link) {}
-
-  @Override
-  public AgentSpan setMetaStruct(String field, Object value) {
-    return this;
-  }
-
-  @Override
-  public void setRequestBlockingAction(RequestBlockingAction rba) {}
+    @Override
+    public AgentSpan setTag(String key, boolean value) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setTag(String key, int value) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setTag(String key, long value) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setTag(String key, float value) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setTag(String key, double value) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setTag(String key, String value) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setTag(TagMap.EntryReader entry) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setTag(String key, CharSequence value) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setTag(String key, Object value) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setAllTags(Map<String, ?> map) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setTag(String key, Number value) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setMetric(CharSequence key, int value) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setMetric(CharSequence key, long value) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setMetric(CharSequence key, float value) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setMetric(CharSequence key, double value) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setMetric(TagMap.EntryReader entry) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setSpanType(CharSequence type) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setError(boolean error) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setError(boolean error, byte priority) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setMeasured(boolean measured) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setErrorMessage(String errorMessage) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan addThrowable(Throwable throwable) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan addThrowable(Throwable throwable, byte errorPriority) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setBaggageItem(String key, String value) {
+        return null;
+    }
+
+    @Override
+    public AgentSpan setHttpStatusCode(int statusCode) {
+        return this;
+    }
+
+    @Override
+    public void finish() {}
+
+    @Override
+    public void finish(long finishMicros) {}
+
+    @Override
+    public void finishWithDuration(long durationNanos) {}
+
+    @Override
+    public void beginEndToEnd() {}
+
+    @Override
+    public void finishWithEndToEnd() {}
+
+    @Override
+    public boolean phasedFinish() {
+        return false;
+    }
+
+    @Override
+    public void publish() {}
+
+    @Override
+    public void setSpanName(CharSequence spanName) {}
+
+    @Override
+    public MutableSpan setOperationName(CharSequence serviceName) {
+        return this;
+    }
+
+    @Override
+    public MutableSpan setServiceName(String serviceName) {
+        return this;
+    }
+
+    @Override
+    public AgentSpan setResourceName(CharSequence resourceName) {
+        return this;
+    }
+
+    @Override
+    public MutableSpan setSamplingPriority(int newPriority) {
+        return null;
+    }
+
+    @Override
+    public AgentSpan setResourceName(CharSequence resourceName, byte priority) {
+        return null;
+    }
+
+    @Override
+    public Integer forceSamplingDecision() {
+        return null;
+    }
+
+    @Override
+    public AgentSpan setSamplingPriority(int newPriority, int samplingMechanism) {
+        return this;
+    }
+
+    @Override
+    public void addLink(AgentSpanLink link) {}
+
+    @Override
+    public AgentSpan setMetaStruct(String field, Object value) {
+        return this;
+    }
+
+    @Override
+    public void setRequestBlockingAction(RequestBlockingAction rba) {}
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InstrumentationTags.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InstrumentationTags.java
index 0c1054e7776..20931989588 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InstrumentationTags.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InstrumentationTags.java
@@ -2,140 +2,130 @@
 
 public class InstrumentationTags {
 
-  // this exists to make it easy to intern UTF-8 encoding
-  // of tag/metric keys used in instrumentations. It should
-  // stay reasonably small. TODO when/if this gets large
-  // start looking at generating constants based on the
-  // enabled instrumentations.
+    // this exists to make it easy to intern UTF-8 encoding
+    // of tag/metric keys used in instrumentations. It should
+    // stay reasonably small. TODO when/if this gets large
+    // start looking at generating constants based on the
+    // enabled instrumentations.
 
-  public static final String PARTITION = "partition";
-  public static final String OFFSET = "offset";
-  public static final String CONSUMER_GROUP = "kafka.group";
-  public static final String PROCESSOR_NAME = "processor.name";
-  public static final String RECORD_QUEUE_TIME_MS = "record.queue_time_ms";
-  public static final String RECORD_END_TO_END_DURATION_MS = "record.e2e_duration_ms";
-  public static final String KAFKA_RECORDS_COUNT = "kafka.records_count";
-  public static final String TOMBSTONE = "tombstone";
-  public static final String AWS_AGENT = "aws.agent";
-  public static final String AWS_SERVICE = "aws.service";
-  public static final String TOP_LEVEL_AWS_SERVICE = "aws_service";
-  public static final String AWS_OPERATION = "aws.operation";
-  public static final String AWS_ENDPOINT = "aws.endpoint";
-  public static final String AWS_BUCKET_NAME = "aws.bucket.name";
-  public static final String BUCKET_NAME = "bucketname";
-  public static final String AWS_OBJECT_KEY = "aws.object.key";
-  public static final String AWS_QUEUE_URL = "aws.queue.url";
+    public static final String PARTITION = "partition";
+    public static final String OFFSET = "offset";
+    public static final String CONSUMER_GROUP = "kafka.group";
+    public static final String PROCESSOR_NAME = "processor.name";
+    public static final String RECORD_QUEUE_TIME_MS = "record.queue_time_ms";
+    public static final String RECORD_END_TO_END_DURATION_MS = "record.e2e_duration_ms";
+    public static final String KAFKA_RECORDS_COUNT = "kafka.records_count";
+    public static final String TOMBSTONE = "tombstone";
+    public static final String AWS_AGENT = "aws.agent";
+    public static final String AWS_SERVICE = "aws.service";
+    public static final String TOP_LEVEL_AWS_SERVICE = "aws_service";
+    public static final String AWS_OPERATION = "aws.operation";
+    public static final String AWS_ENDPOINT = "aws.endpoint";
+    public static final String AWS_BUCKET_NAME = "aws.bucket.name";
+    public static final String BUCKET_NAME = "bucketname";
+    public static final String AWS_OBJECT_KEY = "aws.object.key";
+    public static final String AWS_QUEUE_URL = "aws.queue.url";
 
-  public static final String AWS_QUEUE_NAME = "aws.queue.name";
-  public static final String QUEUE_NAME = "queuename";
-  public static final String AWS_TOPIC_NAME = "aws.topic.name";
-  public static final String TOPIC_NAME = "topicname";
-  public static final String AWS_STREAM_NAME = "aws.stream.name";
-  public static final String STREAM_NAME = "streamname";
-  public static final String AWS_TABLE_NAME = "aws.table.name";
-  public static final String TABLE_NAME = "tablename";
-  public static final String AWS_REQUEST_ID = "aws.requestId";
-  public static final String AWS_STORAGE_CLASS = "aws.storage.class";
+    public static final String AWS_QUEUE_NAME = "aws.queue.name";
+    public static final String QUEUE_NAME = "queuename";
+    public static final String AWS_TOPIC_NAME = "aws.topic.name";
+    public static final String TOPIC_NAME = "topicname";
+    public static final String AWS_STREAM_NAME = "aws.stream.name";
+    public static final String STREAM_NAME = "streamname";
+    public static final String AWS_TABLE_NAME = "aws.table.name";
+    public static final String TABLE_NAME = "tablename";
+    public static final String AWS_REQUEST_ID = "aws.requestId";
+    public static final String AWS_STORAGE_CLASS = "aws.storage.class";
 
-  // These are temporary keys used for span pointer hash calculation
-  public static final String S3_ETAG = "s3.eTag";
-  public static final String DYNAMO_PRIMARY_KEY_1 = "dynamodb.primary_key_1";
-  public static final String DYNAMO_PRIMARY_KEY_1_VALUE = "dynamodb.primary_key_1_value";
-  public static final String DYNAMO_PRIMARY_KEY_2 = "dynamodb.primary_key_2";
-  public static final String DYNAMO_PRIMARY_KEY_2_VALUE = "dynamodb.primary_key_2_value";
+    // These are temporary keys used for span pointer hash calculation
+    public static final String S3_ETAG = "s3.eTag";
+    public static final String DYNAMO_PRIMARY_KEY_1 = "dynamodb.primary_key_1";
+    public static final String DYNAMO_PRIMARY_KEY_1_VALUE = "dynamodb.primary_key_1_value";
+    public static final String DYNAMO_PRIMARY_KEY_2 = "dynamodb.primary_key_2";
+    public static final String DYNAMO_PRIMARY_KEY_2_VALUE = "dynamodb.primary_key_2_value";
 
-  public static final String BUCKET = "bucket";
-  public static final String CASSANDRA_CONTACT_POINTS = "db.cassandra.contact.points";
-  public static final String COUCHBASE_OPERATION_ID = "couchbase.operation_id";
-  public static final String COUCHBASE_SEED_NODES = "db.couchbase.seed.nodes";
-  public static final String ELASTICSEARCH_REQUEST_INDICES = "elasticsearch.request.indices";
-  public static final String ELASTICSEARCH_REQUEST_SEARCH_TYPES =
-      "elasticsearch.request.search.types";
-  public static final String ELASTICSEARCH_REQUEST_WRITE_TYPE = "elasticsearch.request.write.type";
-  public static final String ELASTICSEARCH_REQUEST_WRITE_ROUTING =
-      "elasticsearch.request.write.routing";
-  public static final String ELASTICSEARCH_REQUEST_WRITE_VERSION =
-      "elasticsearch.request.write.version";
-  public static final String ELASTICSEARCH_TYPE = "elasticsearch.type";
-  public static final String ELASTICSEARCH_ID = "elasticsearch.id";
-  public static final String ELASTICSEARCH_VERSION = "elasticsearch.version";
-  public static final String ELASTICSEARCH_SHARD_BROADCAST_TOTAL =
-      "elasticsearch.shard.broadcast.total";
-  public static final String ELASTICSEARCH_SHARD_BROADCAST_SUCCESSFUL =
-      "elasticsearch.shard.broadcast.successful";
-  public static final String ELASTICSEARCH_SHARD_BROADCAST_FAILED =
-      "elasticsearch.shard.broadcast.failed";
-  public static final String ELASTICSEARCH_SHARD_BULK_ID = "elasticsearch.shard.bulk.id";
-  public static final String ELASTICSEARCH_SHARD_BULK_INDEX = "elasticsearch.shard.bulk.index";
-  public static final String ELASTICSEARCH_NODE_FAILURES = "elasticsearch.node.failures";
-  public static final String ELASTICSEARCH_NODE_CLUSTER_NAME = "elasticsearch.node.cluster.name";
-  public static final String ELASTICSEARCH_SHARD_REPLICATION_TOTAL =
-      "elasticsearch.shard.replication.total";
-  public static final String ELASTICSEARCH_SHARD_REPLICATION_FAILED =
-      "elasticsearch.shard.replication.failed";
-  public static final String ELASTICSEARCH_RESPONSE_STATUS = "elasticsearch.response.status";
-  public static final String STATUS_CODE = "status.code";
-  public static final String STATUS_DESCRIPTION = "status.description";
-  public static final String GRPC_STATUS_CODE = "rpc.grpc.status_code";
-  public static final String MESSAGE_TYPE = "message.type";
-  public static final String MESSAGE_SIZE = "message.size";
-  public static final String HYSTRIX_COMMAND = "hystrix.command";
-  public static final String HYSTRIX_CIRCUIT_OPEN = "hystrix.circuit-open";
-  public static final String HYSTRIX_GROUP = "hystrix.group";
-  public static final String SERVLET_CONTEXT = "servlet.context";
-  public static final String SERVLET_PATH = "servlet.path";
-  public static final String SERVLET_DISPATCH = "servlet.dispatch";
-  public static final String TIMEOUT = "timeout";
-  public static final String JMS_PRODUCE = "jms.produce";
-  public static final String JSP_COMPILER = "jsp.compiler";
-  public static final String JSP_CLASSFQCN = "jsp.classFQCN";
-  public static final String JSP_FORWARD_ORIGIN = "jsp.forwardOrigin";
-  public static final String DB_REDIS_DBINDEX = "db.redis.dbIndex";
-  public static final String DB_COMMAND_CANCELLED = "db.command.cancelled";
-  public static final String DB_COMMAND_RESULTS_COUNT = "db.command.results.count";
-  public static final String AMQP_DELIVERY_MODE = "amqp.delivery_mode";
-  public static final String AMQP_COMMAND = "amqp.command";
-  public static final String AMQP_EXCHANGE = "amqp.exchange";
-  public static final String AMQP_ROUTING_KEY = "amqp.routing_key";
-  public static final String AMQP_QUEUE = "amqp.queue";
-  public static final String EVENT = "event";
-  public static final String MESSAGE = "message";
-  public static final String HANDLER_TYPE = "handler.type";
-  public static final String KAFKA_BOOTSTRAP_SERVERS = "messaging.kafka.bootstrap.servers";
-  public static final String KAFKA_CLUSTER_ID = "messaging.kafka.cluster.id";
-  public static final String MESSAGING_DESTINATION_NAME = "messaging.destination.name";
-  public static final String QUARTZ_JOB_NAME = "quartz.job.name";
-  public static final String QUARTZ_JOB_GROUP = "quartz.job.group";
-  public static final String QUARTZ_TRIGGER_NAME = "quartz.trigger.name";
-  public static final String QUARTZ_TRIGGER_GROUP = "quartz.trigger.group";
-  public static final String REQUEST_PREDICATE = "request.predicate";
-  public static final String VIEW_NAME = "view.name";
-  public static final String VIEW_TYPE = "view.type";
-  public static final String TWILIO_TYPE = "twilio.type";
-  public static final String TWILIO_ACCOUNT = "twilio.account";
-  public static final String TWILIO_SID = "twilio.sid";
-  public static final String TWILIO_STATUS = "twilio.status";
-  public static final String TWILIO_PARENT_SID = "twilio.parentSid";
-  public static final String DBM_TRACE_INJECTED = "_dd.dbm_trace_injected";
-  public static final String INSTRUMENTATION_TIME_MS = "_dd.instrumentation.time_ms";
-  public static final UTF8BytesString DD_MEASURED = UTF8BytesString.create("_dd.measured");
-  public static final UTF8BytesString DD_TOP_LEVEL = UTF8BytesString.create("_dd.top_level");
-  public static final UTF8BytesString DD_PARTIAL_VERSION =
-      UTF8BytesString.create("_dd.partial_version");
-  public static final UTF8BytesString DD_WAS_LONG_RUNNING =
-      UTF8BytesString.create("_dd.was_long_running");
+    public static final String BUCKET = "bucket";
+    public static final String CASSANDRA_CONTACT_POINTS = "db.cassandra.contact.points";
+    public static final String COUCHBASE_OPERATION_ID = "couchbase.operation_id";
+    public static final String COUCHBASE_SEED_NODES = "db.couchbase.seed.nodes";
+    public static final String ELASTICSEARCH_REQUEST_INDICES = "elasticsearch.request.indices";
+    public static final String ELASTICSEARCH_REQUEST_SEARCH_TYPES = "elasticsearch.request.search.types";
+    public static final String ELASTICSEARCH_REQUEST_WRITE_TYPE = "elasticsearch.request.write.type";
+    public static final String ELASTICSEARCH_REQUEST_WRITE_ROUTING = "elasticsearch.request.write.routing";
+    public static final String ELASTICSEARCH_REQUEST_WRITE_VERSION = "elasticsearch.request.write.version";
+    public static final String ELASTICSEARCH_TYPE = "elasticsearch.type";
+    public static final String ELASTICSEARCH_ID = "elasticsearch.id";
+    public static final String ELASTICSEARCH_VERSION = "elasticsearch.version";
+    public static final String ELASTICSEARCH_SHARD_BROADCAST_TOTAL = "elasticsearch.shard.broadcast.total";
+    public static final String ELASTICSEARCH_SHARD_BROADCAST_SUCCESSFUL = "elasticsearch.shard.broadcast.successful";
+    public static final String ELASTICSEARCH_SHARD_BROADCAST_FAILED = "elasticsearch.shard.broadcast.failed";
+    public static final String ELASTICSEARCH_SHARD_BULK_ID = "elasticsearch.shard.bulk.id";
+    public static final String ELASTICSEARCH_SHARD_BULK_INDEX = "elasticsearch.shard.bulk.index";
+    public static final String ELASTICSEARCH_NODE_FAILURES = "elasticsearch.node.failures";
+    public static final String ELASTICSEARCH_NODE_CLUSTER_NAME = "elasticsearch.node.cluster.name";
+    public static final String ELASTICSEARCH_SHARD_REPLICATION_TOTAL = "elasticsearch.shard.replication.total";
+    public static final String ELASTICSEARCH_SHARD_REPLICATION_FAILED = "elasticsearch.shard.replication.failed";
+    public static final String ELASTICSEARCH_RESPONSE_STATUS = "elasticsearch.response.status";
+    public static final String STATUS_CODE = "status.code";
+    public static final String STATUS_DESCRIPTION = "status.description";
+    public static final String GRPC_STATUS_CODE = "rpc.grpc.status_code";
+    public static final String MESSAGE_TYPE = "message.type";
+    public static final String MESSAGE_SIZE = "message.size";
+    public static final String HYSTRIX_COMMAND = "hystrix.command";
+    public static final String HYSTRIX_CIRCUIT_OPEN = "hystrix.circuit-open";
+    public static final String HYSTRIX_GROUP = "hystrix.group";
+    public static final String SERVLET_CONTEXT = "servlet.context";
+    public static final String SERVLET_PATH = "servlet.path";
+    public static final String SERVLET_DISPATCH = "servlet.dispatch";
+    public static final String TIMEOUT = "timeout";
+    public static final String JMS_PRODUCE = "jms.produce";
+    public static final String JSP_COMPILER = "jsp.compiler";
+    public static final String JSP_CLASSFQCN = "jsp.classFQCN";
+    public static final String JSP_FORWARD_ORIGIN = "jsp.forwardOrigin";
+    public static final String DB_REDIS_DBINDEX = "db.redis.dbIndex";
+    public static final String DB_COMMAND_CANCELLED = "db.command.cancelled";
+    public static final String DB_COMMAND_RESULTS_COUNT = "db.command.results.count";
+    public static final String AMQP_DELIVERY_MODE = "amqp.delivery_mode";
+    public static final String AMQP_COMMAND = "amqp.command";
+    public static final String AMQP_EXCHANGE = "amqp.exchange";
+    public static final String AMQP_ROUTING_KEY = "amqp.routing_key";
+    public static final String AMQP_QUEUE = "amqp.queue";
+    public static final String EVENT = "event";
+    public static final String MESSAGE = "message";
+    public static final String HANDLER_TYPE = "handler.type";
+    public static final String KAFKA_BOOTSTRAP_SERVERS = "messaging.kafka.bootstrap.servers";
+    public static final String KAFKA_CLUSTER_ID = "messaging.kafka.cluster.id";
+    public static final String MESSAGING_DESTINATION_NAME = "messaging.destination.name";
+    public static final String QUARTZ_JOB_NAME = "quartz.job.name";
+    public static final String QUARTZ_JOB_GROUP = "quartz.job.group";
+    public static final String QUARTZ_TRIGGER_NAME = "quartz.trigger.name";
+    public static final String QUARTZ_TRIGGER_GROUP = "quartz.trigger.group";
+    public static final String REQUEST_PREDICATE = "request.predicate";
+    public static final String VIEW_NAME = "view.name";
+    public static final String VIEW_TYPE = "view.type";
+    public static final String TWILIO_TYPE = "twilio.type";
+    public static final String TWILIO_ACCOUNT = "twilio.account";
+    public static final String TWILIO_SID = "twilio.sid";
+    public static final String TWILIO_STATUS = "twilio.status";
+    public static final String TWILIO_PARENT_SID = "twilio.parentSid";
+    public static final String DBM_TRACE_INJECTED = "_dd.dbm_trace_injected";
+    public static final String INSTRUMENTATION_TIME_MS = "_dd.instrumentation.time_ms";
+    public static final UTF8BytesString DD_MEASURED = UTF8BytesString.create("_dd.measured");
+    public static final UTF8BytesString DD_TOP_LEVEL = UTF8BytesString.create("_dd.top_level");
+    public static final UTF8BytesString DD_PARTIAL_VERSION = UTF8BytesString.create("_dd.partial_version");
+    public static final UTF8BytesString DD_WAS_LONG_RUNNING = UTF8BytesString.create("_dd.was_long_running");
 
-  public static final String TIBCO_NODE = "tibco.node";
-  public static final String TIBCO_VERSION = "tibco.version";
+    public static final String TIBCO_NODE = "tibco.node";
+    public static final String TIBCO_VERSION = "tibco.version";
 
-  public static final String MULE_CORRELATION_ID = "mule.correlation_id";
-  public static final String MULE_LOCATION = "mule.location";
+    public static final String MULE_CORRELATION_ID = "mule.correlation_id";
+    public static final String MULE_LOCATION = "mule.location";
 
-  public static final String WEBSOCKET_SESSION_ID = "websocket.session.id";
-  public static final String WEBSOCKET_MESSAGE_TYPE = "websocket.message.type";
-  public static final String WEBSOCKET_MESSAGE_LENGTH = "websocket.message.length";
-  public static final String WEBSOCKET_MESSAGE_FRAMES = "websocket.message.frames";
-  public static final String WEBSOCKET_MESSAGE_RECEIVE_TIME = "websocket.message.receive_time";
-  public static final String WEBSOCKET_CLOSE_CODE = "websocket.close.code";
-  public static final String WEBSOCKET_CLOSE_REASON = "websocket.close.reason";
+    public static final String WEBSOCKET_SESSION_ID = "websocket.session.id";
+    public static final String WEBSOCKET_MESSAGE_TYPE = "websocket.message.type";
+    public static final String WEBSOCKET_MESSAGE_LENGTH = "websocket.message.length";
+    public static final String WEBSOCKET_MESSAGE_FRAMES = "websocket.message.frames";
+    public static final String WEBSOCKET_MESSAGE_RECEIVE_TIME = "websocket.message.receive_time";
+    public static final String WEBSOCKET_CLOSE_CODE = "websocket.close.code";
+    public static final String WEBSOCKET_CLOSE_REASON = "websocket.close.reason";
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InternalContextKeys.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InternalContextKeys.java
index 296b45fec23..873c1067d38 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InternalContextKeys.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InternalContextKeys.java
@@ -3,7 +3,7 @@
 import datadog.context.ContextKey;
 
 final class InternalContextKeys {
-  static final ContextKey<AgentSpan> SPAN_KEY = ContextKey.named("dd-span-key");
+    static final ContextKey<AgentSpan> SPAN_KEY = ContextKey.named("dd-span-key");
 
-  private InternalContextKeys() {}
+    private InternalContextKeys() {}
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InternalSpanTypes.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InternalSpanTypes.java
index 6682a98f8b5..e106df64a2b 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InternalSpanTypes.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InternalSpanTypes.java
@@ -3,55 +3,46 @@
 import datadog.trace.api.DDSpanTypes;
 
 public class InternalSpanTypes {
-  public static final CharSequence HTTP_CLIENT = UTF8BytesString.create(DDSpanTypes.HTTP_CLIENT);
-  public static final CharSequence HTTP_SERVER = UTF8BytesString.create(DDSpanTypes.HTTP_SERVER);
-  public static final CharSequence RPC = UTF8BytesString.create(DDSpanTypes.RPC);
-  public static final CharSequence CACHE = UTF8BytesString.create(DDSpanTypes.CACHE);
-  public static final CharSequence SOAP = UTF8BytesString.create(DDSpanTypes.SOAP);
-
-  public static final CharSequence SQL = UTF8BytesString.create(DDSpanTypes.SQL);
-  public static final CharSequence MONGO = UTF8BytesString.create(DDSpanTypes.MONGO);
-  public static final CharSequence CASSANDRA = UTF8BytesString.create(DDSpanTypes.CASSANDRA);
-  public static final CharSequence COUCHBASE =
-      UTF8BytesString.create(DDSpanTypes.COUCHBASE); // Using generic for now.
-  public static final CharSequence REDIS = UTF8BytesString.create(DDSpanTypes.REDIS);
-  public static final CharSequence MEMCACHED = UTF8BytesString.create(DDSpanTypes.MEMCACHED);
-  public static final CharSequence ELASTICSEARCH =
-      UTF8BytesString.create(DDSpanTypes.ELASTICSEARCH);
-  public static final CharSequence OPENSEARCH = UTF8BytesString.create(DDSpanTypes.OPENSEARCH);
-  public static final CharSequence HIBERNATE = UTF8BytesString.create(DDSpanTypes.HIBERNATE);
-  public static final CharSequence AEROSPIKE = UTF8BytesString.create(DDSpanTypes.AEROSPIKE);
-  public static final CharSequence DATANUCLEUS = UTF8BytesString.create(DDSpanTypes.DATANUCLEUS);
-
-  // these are all the same thing but don't want to be taken by surprise by changes in DDSpanTypes
-  public static final CharSequence MESSAGE_CLIENT =
-      UTF8BytesString.create(DDSpanTypes.MESSAGE_CLIENT);
-  public static final CharSequence MESSAGE_CONSUMER =
-      UTF8BytesString.create(DDSpanTypes.MESSAGE_CONSUMER);
-  public static final CharSequence MESSAGE_PRODUCER =
-      UTF8BytesString.create(DDSpanTypes.MESSAGE_PRODUCER);
-  public static final CharSequence MESSAGE_BROKER =
-      UTF8BytesString.create(DDSpanTypes.MESSAGE_BROKER);
-
-  public static final CharSequence GRAPHQL = UTF8BytesString.create(DDSpanTypes.GRAPHQL);
-
-  public static final UTF8BytesString TEST = UTF8BytesString.create(DDSpanTypes.TEST);
-  public static final UTF8BytesString TEST_SUITE_END =
-      UTF8BytesString.create(DDSpanTypes.TEST_SUITE_END);
-  public static final UTF8BytesString TEST_MODULE_END =
-      UTF8BytesString.create(DDSpanTypes.TEST_MODULE_END);
-  public static final UTF8BytesString TEST_SESSION_END =
-      UTF8BytesString.create(DDSpanTypes.TEST_SESSION_END);
-  public static final UTF8BytesString VULNERABILITY =
-      UTF8BytesString.create(DDSpanTypes.VULNERABILITY);
-  public static final UTF8BytesString PROTOBUF = UTF8BytesString.create(DDSpanTypes.PROTOBUF);
-
-  public static final UTF8BytesString LLMOBS = UTF8BytesString.create(DDSpanTypes.LLMOBS);
-
-  public static final UTF8BytesString TIBCO_BW = UTF8BytesString.create("tibco_bw");
-  public static final UTF8BytesString MULE = UTF8BytesString.create(DDSpanTypes.MULE);
-  public static final CharSequence VALKEY = UTF8BytesString.create(DDSpanTypes.VALKEY);
-  public static final UTF8BytesString WEBSOCKET = UTF8BytesString.create(DDSpanTypes.WEBSOCKET);
-
-  public static final CharSequence SERVERLESS = UTF8BytesString.create(DDSpanTypes.SERVERLESS);
+    public static final CharSequence HTTP_CLIENT = UTF8BytesString.create(DDSpanTypes.HTTP_CLIENT);
+    public static final CharSequence HTTP_SERVER = UTF8BytesString.create(DDSpanTypes.HTTP_SERVER);
+    public static final CharSequence RPC = UTF8BytesString.create(DDSpanTypes.RPC);
+    public static final CharSequence CACHE = UTF8BytesString.create(DDSpanTypes.CACHE);
+    public static final CharSequence SOAP = UTF8BytesString.create(DDSpanTypes.SOAP);
+
+    public static final CharSequence SQL = UTF8BytesString.create(DDSpanTypes.SQL);
+    public static final CharSequence MONGO = UTF8BytesString.create(DDSpanTypes.MONGO);
+    public static final CharSequence CASSANDRA = UTF8BytesString.create(DDSpanTypes.CASSANDRA);
+    public static final CharSequence COUCHBASE =
+            UTF8BytesString.create(DDSpanTypes.COUCHBASE); // Using generic for now.
+    public static final CharSequence REDIS = UTF8BytesString.create(DDSpanTypes.REDIS);
+    public static final CharSequence MEMCACHED = UTF8BytesString.create(DDSpanTypes.MEMCACHED);
+    public static final CharSequence ELASTICSEARCH = UTF8BytesString.create(DDSpanTypes.ELASTICSEARCH);
+    public static final CharSequence OPENSEARCH = UTF8BytesString.create(DDSpanTypes.OPENSEARCH);
+    public static final CharSequence HIBERNATE = UTF8BytesString.create(DDSpanTypes.HIBERNATE);
+    public static final CharSequence AEROSPIKE = UTF8BytesString.create(DDSpanTypes.AEROSPIKE);
+    public static final CharSequence DATANUCLEUS = UTF8BytesString.create(DDSpanTypes.DATANUCLEUS);
+
+    // these are all the same thing but don't want to be taken by surprise by changes in DDSpanTypes
+    public static final CharSequence MESSAGE_CLIENT = UTF8BytesString.create(DDSpanTypes.MESSAGE_CLIENT);
+    public static final CharSequence MESSAGE_CONSUMER = UTF8BytesString.create(DDSpanTypes.MESSAGE_CONSUMER);
+    public static final CharSequence MESSAGE_PRODUCER = UTF8BytesString.create(DDSpanTypes.MESSAGE_PRODUCER);
+    public static final CharSequence MESSAGE_BROKER = UTF8BytesString.create(DDSpanTypes.MESSAGE_BROKER);
+
+    public static final CharSequence GRAPHQL = UTF8BytesString.create(DDSpanTypes.GRAPHQL);
+
+    public static final UTF8BytesString TEST = UTF8BytesString.create(DDSpanTypes.TEST);
+    public static final UTF8BytesString TEST_SUITE_END = UTF8BytesString.create(DDSpanTypes.TEST_SUITE_END);
+    public static final UTF8BytesString TEST_MODULE_END = UTF8BytesString.create(DDSpanTypes.TEST_MODULE_END);
+    public static final UTF8BytesString TEST_SESSION_END = UTF8BytesString.create(DDSpanTypes.TEST_SESSION_END);
+    public static final UTF8BytesString VULNERABILITY = UTF8BytesString.create(DDSpanTypes.VULNERABILITY);
+    public static final UTF8BytesString PROTOBUF = UTF8BytesString.create(DDSpanTypes.PROTOBUF);
+
+    public static final UTF8BytesString LLMOBS = UTF8BytesString.create(DDSpanTypes.LLMOBS);
+
+    public static final UTF8BytesString TIBCO_BW = UTF8BytesString.create("tibco_bw");
+    public static final UTF8BytesString MULE = UTF8BytesString.create(DDSpanTypes.MULE);
+    public static final CharSequence VALKEY = UTF8BytesString.create(DDSpanTypes.VALKEY);
+    public static final UTF8BytesString WEBSOCKET = UTF8BytesString.create(DDSpanTypes.WEBSOCKET);
+
+    public static final CharSequence SERVERLESS = UTF8BytesString.create(DDSpanTypes.SERVERLESS);
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopContinuation.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopContinuation.java
index 5f8c4dad657..456cd5ed0bb 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopContinuation.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopContinuation.java
@@ -5,25 +5,25 @@
 import datadog.context.ContextScope;
 
 public final class NoopContinuation implements ContextContinuation {
-  public static final NoopContinuation INSTANCE = new NoopContinuation();
+    public static final NoopContinuation INSTANCE = new NoopContinuation();
 
-  private NoopContinuation() {}
+    private NoopContinuation() {}
 
-  @Override
-  public NoopContinuation hold() {
-    return this;
-  }
+    @Override
+    public NoopContinuation hold() {
+        return this;
+    }
 
-  @Override
-  public ContextScope resume() {
-    return NoopScope.INSTANCE;
-  }
+    @Override
+    public ContextScope resume() {
+        return NoopScope.INSTANCE;
+    }
 
-  @Override
-  public Context context() {
-    return Context.root();
-  }
+    @Override
+    public Context context() {
+        return Context.root();
+    }
 
-  @Override
-  public void release() {}
+    @Override
+    public void release() {}
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopScope.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopScope.java
index 5347b5de1c7..f3839c90bec 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopScope.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopScope.java
@@ -4,15 +4,15 @@
 import datadog.context.ContextScope;
 
 public final class NoopScope implements ContextScope {
-  public static final NoopScope INSTANCE = new NoopScope();
+    public static final NoopScope INSTANCE = new NoopScope();
 
-  private NoopScope() {}
+    private NoopScope() {}
 
-  @Override
-  public Context context() {
-    return NoopSpan.INSTANCE;
-  }
+    @Override
+    public Context context() {
+        return NoopSpan.INSTANCE;
+    }
 
-  @Override
-  public void close() {}
+    @Override
+    public void close() {}
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpan.java
index a5f1ce0d788..badf3897b2a 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpan.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpan.java
@@ -10,132 +10,132 @@
 import datadog.trace.api.sampling.PrioritySampling;
 
 class NoopSpan extends ImmutableSpan implements AgentSpan, SelfScopedContext {
-  static final NoopSpan INSTANCE = new NoopSpan();
-
-  NoopSpan() {}
-
-  @Override
-  public DDTraceId getTraceId() {
-    return DDTraceId.ZERO;
-  }
-
-  @Override
-  public long getSpanId() {
-    return DDSpanId.ZERO;
-  }
-
-  @Override
-  public RequestBlockingAction getRequestBlockingAction() {
-    return null;
-  }
-
-  @Override
-  public boolean isError() {
-    return false;
-  }
-
-  @Override
-  public Object getTag(final String key) {
-    return null;
-  }
-
-  @Override
-  public long getStartTime() {
-    return 0;
-  }
-
-  @Override
-  public long getDurationNano() {
-    return 0;
-  }
-
-  @Override
-  public String getOperationName() {
-    return null;
-  }
-
-  @Override
-  public String getServiceName() {
-    return null;
-  }
-
-  @Override
-  public CharSequence getResourceName() {
-    return null;
-  }
-
-  @Override
-  public RequestContext getRequestContext() {
-    return RequestContext.Noop.INSTANCE;
-  }
-
-  @Override
-  public Integer getSamplingPriority() {
-    return (int) PrioritySampling.UNSET;
-  }
-
-  @Override
-  public String getSpanType() {
-    return null;
-  }
-
-  @Override
-  public TagMap getTags() {
-    return TagMap.EMPTY;
-  }
-
-  @Override
-  public AgentSpan getRootSpan() {
-    return this;
-  }
-
-  @Override
-  public short getHttpStatusCode() {
-    return 0;
-  }
-
-  @Override
-  public AgentSpan getLocalRootSpan() {
-    return this;
-  }
-
-  @Override
-  public boolean isSameTrace(final AgentSpan otherSpan) {
-    return otherSpan == INSTANCE;
-  }
-
-  @Override
-  public AgentSpanContext spanContext() {
-    return NoopSpanContext.INSTANCE;
-  }
-
-  @Override
-  public String getBaggageItem(final String key) {
-    return null;
-  }
-
-  @Override
-  public String getSpanName() {
-    return "";
-  }
-
-  @Override
-  public boolean hasResourceName() {
-    return false;
-  }
-
-  @Override
-  public byte getResourceNamePriority() {
-    return Byte.MAX_VALUE;
-  }
-
-  @Override
-  public TraceConfig traceConfig() {
-    return AgentTracer.NoopTraceConfig.INSTANCE;
-  }
-
-  @Override
-  public boolean isOutbound() {
-    return false;
-  }
+    static final NoopSpan INSTANCE = new NoopSpan();
+
+    NoopSpan() {}
+
+    @Override
+    public DDTraceId getTraceId() {
+        return DDTraceId.ZERO;
+    }
+
+    @Override
+    public long getSpanId() {
+        return DDSpanId.ZERO;
+    }
+
+    @Override
+    public RequestBlockingAction getRequestBlockingAction() {
+        return null;
+    }
+
+    @Override
+    public boolean isError() {
+        return false;
+    }
+
+    @Override
+    public Object getTag(final String key) {
+        return null;
+    }
+
+    @Override
+    public long getStartTime() {
+        return 0;
+    }
+
+    @Override
+    public long getDurationNano() {
+        return 0;
+    }
+
+    @Override
+    public String getOperationName() {
+        return null;
+    }
+
+    @Override
+    public String getServiceName() {
+        return null;
+    }
+
+    @Override
+    public CharSequence getResourceName() {
+        return null;
+    }
+
+    @Override
+    public RequestContext getRequestContext() {
+        return RequestContext.Noop.INSTANCE;
+    }
+
+    @Override
+    public Integer getSamplingPriority() {
+        return (int) PrioritySampling.UNSET;
+    }
+
+    @Override
+    public String getSpanType() {
+        return null;
+    }
+
+    @Override
+    public TagMap getTags() {
+        return TagMap.EMPTY;
+    }
+
+    @Override
+    public AgentSpan getRootSpan() {
+        return this;
+    }
+
+    @Override
+    public short getHttpStatusCode() {
+        return 0;
+    }
+
+    @Override
+    public AgentSpan getLocalRootSpan() {
+        return this;
+    }
+
+    @Override
+    public boolean isSameTrace(final AgentSpan otherSpan) {
+        return otherSpan == INSTANCE;
+    }
+
+    @Override
+    public AgentSpanContext spanContext() {
+        return NoopSpanContext.INSTANCE;
+    }
+
+    @Override
+    public String getBaggageItem(final String key) {
+        return null;
+    }
+
+    @Override
+    public String getSpanName() {
+        return "";
+    }
+
+    @Override
+    public boolean hasResourceName() {
+        return false;
+    }
+
+    @Override
+    public byte getResourceNamePriority() {
+        return Byte.MAX_VALUE;
+    }
+
+    @Override
+    public TraceConfig traceConfig() {
+        return AgentTracer.NoopTraceConfig.INSTANCE;
+    }
+
+    @Override
+    public boolean isOutbound() {
+        return false;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpanContext.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpanContext.java
index 43458f54928..30f1337c8e7 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpanContext.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpanContext.java
@@ -11,122 +11,122 @@
 import java.util.Map;
 
 class NoopSpanContext implements AgentSpanContext.Extracted {
-  static final NoopSpanContext INSTANCE = new NoopSpanContext();
-
-  NoopSpanContext() {}
-
-  @Override
-  public DDTraceId getTraceId() {
-    return DDTraceId.ZERO;
-  }
-
-  @Override
-  public long getSpanId() {
-    return DDSpanId.ZERO;
-  }
-
-  @Override
-  public AgentTraceCollector getTraceCollector() {
-    return AgentTracer.NoopAgentTraceCollector.INSTANCE;
-  }
-
-  @Override
-  public int getSamplingPriority() {
-    return PrioritySampling.UNSET;
-  }
-
-  @Override
-  public Iterable<Map.Entry<String, String>> baggageItems() {
-    return emptyList();
-  }
-
-  @Override
-  public PathwayContext getPathwayContext() {
-    return NoopPathwayContext.INSTANCE;
-  }
-
-  @Override
-  public boolean isRemote() {
-    return false;
-  }
-
-  @Override
-  public List<AgentSpanLink> getTerminatedSpanLinks() {
-    return emptyList();
-  }
-
-  @Override
-  public String getForwarded() {
-    return null;
-  }
-
-  @Override
-  public String getFastlyClientIp() {
-    return null;
-  }
-
-  @Override
-  public String getCfConnectingIp() {
-    return null;
-  }
-
-  @Override
-  public String getCfConnectingIpv6() {
-    return null;
-  }
-
-  @Override
-  public String getXForwardedProto() {
-    return null;
-  }
-
-  @Override
-  public String getXForwardedHost() {
-    return null;
-  }
-
-  @Override
-  public String getXForwardedPort() {
-    return null;
-  }
-
-  @Override
-  public String getForwardedFor() {
-    return null;
-  }
-
-  @Override
-  public String getXForwardedFor() {
-    return null;
-  }
-
-  @Override
-  public String getXClusterClientIp() {
-    return null;
-  }
-
-  @Override
-  public String getXRealIp() {
-    return null;
-  }
-
-  @Override
-  public String getXClientIp() {
-    return null;
-  }
-
-  @Override
-  public String getUserAgent() {
-    return null;
-  }
-
-  @Override
-  public String getTrueClientIp() {
-    return null;
-  }
-
-  @Override
-  public String getCustomIpHeader() {
-    return null;
-  }
+    static final NoopSpanContext INSTANCE = new NoopSpanContext();
+
+    NoopSpanContext() {}
+
+    @Override
+    public DDTraceId getTraceId() {
+        return DDTraceId.ZERO;
+    }
+
+    @Override
+    public long getSpanId() {
+        return DDSpanId.ZERO;
+    }
+
+    @Override
+    public AgentTraceCollector getTraceCollector() {
+        return AgentTracer.NoopAgentTraceCollector.INSTANCE;
+    }
+
+    @Override
+    public int getSamplingPriority() {
+        return PrioritySampling.UNSET;
+    }
+
+    @Override
+    public Iterable<Map.Entry<String, String>> baggageItems() {
+        return emptyList();
+    }
+
+    @Override
+    public PathwayContext getPathwayContext() {
+        return NoopPathwayContext.INSTANCE;
+    }
+
+    @Override
+    public boolean isRemote() {
+        return false;
+    }
+
+    @Override
+    public List<AgentSpanLink> getTerminatedSpanLinks() {
+        return emptyList();
+    }
+
+    @Override
+    public String getForwarded() {
+        return null;
+    }
+
+    @Override
+    public String getFastlyClientIp() {
+        return null;
+    }
+
+    @Override
+    public String getCfConnectingIp() {
+        return null;
+    }
+
+    @Override
+    public String getCfConnectingIpv6() {
+        return null;
+    }
+
+    @Override
+    public String getXForwardedProto() {
+        return null;
+    }
+
+    @Override
+    public String getXForwardedHost() {
+        return null;
+    }
+
+    @Override
+    public String getXForwardedPort() {
+        return null;
+    }
+
+    @Override
+    public String getForwardedFor() {
+        return null;
+    }
+
+    @Override
+    public String getXForwardedFor() {
+        return null;
+    }
+
+    @Override
+    public String getXClusterClientIp() {
+        return null;
+    }
+
+    @Override
+    public String getXRealIp() {
+        return null;
+    }
+
+    @Override
+    public String getXClientIp() {
+        return null;
+    }
+
+    @Override
+    public String getUserAgent() {
+        return null;
+    }
+
+    @Override
+    public String getTrueClientIp() {
+        return null;
+    }
+
+    @Override
+    public String getCustomIpHeader() {
+        return null;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NotSampledSpanContext.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NotSampledSpanContext.java
index 743f9c3bf66..a8a567fb108 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NotSampledSpanContext.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NotSampledSpanContext.java
@@ -7,44 +7,44 @@
 
 /** An {@link AgentSpanContext} that hides the sampling priority. */
 public final class NotSampledSpanContext implements AgentSpanContext {
-  private final AgentSpanContext delegate;
-
-  public NotSampledSpanContext(AgentSpanContext delegate) {
-    this.delegate = delegate;
-  }
-
-  @Override
-  public DDTraceId getTraceId() {
-    return delegate.getTraceId();
-  }
-
-  @Override
-  public long getSpanId() {
-    return delegate.getSpanId();
-  }
-
-  @Override
-  public AgentTraceCollector getTraceCollector() {
-    return delegate.getTraceCollector();
-  }
-
-  @Override
-  public int getSamplingPriority() {
-    return PrioritySampling.UNSET;
-  }
-
-  @Override
-  public Iterable<Map.Entry<String, String>> baggageItems() {
-    return delegate.baggageItems();
-  }
-
-  @Override
-  public PathwayContext getPathwayContext() {
-    return delegate.getPathwayContext();
-  }
-
-  @Override
-  public boolean isRemote() {
-    return delegate.isRemote();
-  }
+    private final AgentSpanContext delegate;
+
+    public NotSampledSpanContext(AgentSpanContext delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public DDTraceId getTraceId() {
+        return delegate.getTraceId();
+    }
+
+    @Override
+    public long getSpanId() {
+        return delegate.getSpanId();
+    }
+
+    @Override
+    public AgentTraceCollector getTraceCollector() {
+        return delegate.getTraceCollector();
+    }
+
+    @Override
+    public int getSamplingPriority() {
+        return PrioritySampling.UNSET;
+    }
+
+    @Override
+    public Iterable<Map.Entry<String, String>> baggageItems() {
+        return delegate.baggageItems();
+    }
+
+    @Override
+    public PathwayContext getPathwayContext() {
+        return delegate.getPathwayContext();
+    }
+
+    @Override
+    public boolean isRemote() {
+        return delegate.isRemote();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ProfilerContext.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ProfilerContext.java
index 646ca92bf40..e95e4839081 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ProfilerContext.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ProfilerContext.java
@@ -2,32 +2,32 @@
 
 public interface ProfilerContext {
 
-  long getSpanId();
+    long getSpanId();
 
-  /**
-   * @return the span id of the local root span, or the span itself
-   */
-  long getRootSpanId();
+    /**
+     * @return the span id of the local root span, or the span itself
+     */
+    long getRootSpanId();
 
-  /**
-   * @return upper 64 bits of the 128-bit trace id, or 0 if not available
-   */
-  default long getTraceIdHigh() {
-    return 0L;
-  }
+    /**
+     * @return upper 64 bits of the 128-bit trace id, or 0 if not available
+     */
+    default long getTraceIdHigh() {
+        return 0L;
+    }
 
-  /**
-   * @return lower 64 bits of the 128-bit trace id, or 0 if not available
-   */
-  default long getTraceIdLow() {
-    return 0L;
-  }
+    /**
+     * @return lower 64 bits of the 128-bit trace id, or 0 if not available
+     */
+    default long getTraceIdLow() {
+        return 0L;
+    }
 
-  int getEncodedOperationName();
+    int getEncodedOperationName();
 
-  CharSequence getOperationName();
+    CharSequence getOperationName();
 
-  int getEncodedResourceName();
+    int getEncodedResourceName();
 
-  CharSequence getResourceName();
+    CharSequence getResourceName();
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ProfilingContextIntegration.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ProfilingContextIntegration.java
index f479a956973..3a135b843bd 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ProfilingContextIntegration.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ProfilingContextIntegration.java
@@ -11,97 +11,96 @@
 import datadog.trace.api.profiling.Timing;
 
 public interface ProfilingContextIntegration extends Profiling, EndpointCheckpointer, Timer {
-  /**
-   * invoked when the profiler is started, implementations must not initialise JFR before this is
-   * called.
-   */
-  default void onStart() {}
-
-  /** Invoked when a trace first propagates to a thread */
-  default void onAttach() {}
-
-  /** Invoked when a thread exits */
-  default void onDetach() {}
-
-  /**
-   * Binds {@code context} to profiler state associated with the current carrier thread.
-   *
-   * <p>The default implementation is a no-op. Integrations that return {@code true} from {@link
-   * #isThreadContextBindingRequired()} must override this method and treat {@link Context#root()}
-   * as clearing the current binding.
-   *
-   * @param context context to bind
-   */
-  default void setContext(Context context) {}
-
-  /** Whether profiler context must be rebound when a virtual thread changes carrier threads. */
-  default boolean isThreadContextBindingRequired() {
-    return false;
-  }
-
-  default Stateful newScopeState(ProfilerContext profilerContext) {
-    return Stateful.DEFAULT;
-  }
-
-  default int encode(CharSequence constant) {
-    return 0;
-  }
-
-  default int encodeOperationName(CharSequence constant) {
-    return 0;
-  }
-
-  default int encodeResourceName(CharSequence constant) {
-    return 0;
-  }
-
-  String name();
-
-  /**
-   * Registers a one-shot callback to run once this integration is actually able to label context;
-   * runs inline if already available, or never if a deferred construction fails.
-   */
-  default void whenAvailable(Runnable callback) {
-    callback.run();
-  }
-
-  final class NoOp implements ProfilingContextIntegration {
-
-    public static final ProfilingContextIntegration INSTANCE =
-        new ProfilingContextIntegration.NoOp();
-
-    @Override
-    public ProfilingContextAttribute createContextAttribute(String attribute) {
-      return ProfilingContextAttribute.NoOp.INSTANCE;
+    /**
+     * invoked when the profiler is started, implementations must not initialise JFR before this is
+     * called.
+     */
+    default void onStart() {}
+
+    /** Invoked when a trace first propagates to a thread */
+    default void onAttach() {}
+
+    /** Invoked when a thread exits */
+    default void onDetach() {}
+
+    /**
+     * Binds {@code context} to profiler state associated with the current carrier thread.
+     *
+     * <p>The default implementation is a no-op. Integrations that return {@code true} from {@link
+     * #isThreadContextBindingRequired()} must override this method and treat {@link Context#root()}
+     * as clearing the current binding.
+     *
+     * @param context context to bind
+     */
+    default void setContext(Context context) {}
+
+    /** Whether profiler context must be rebound when a virtual thread changes carrier threads. */
+    default boolean isThreadContextBindingRequired() {
+        return false;
     }
 
-    @Override
-    public ProfilingScope newScope() {
-      return ProfilingScope.NO_OP;
+    default Stateful newScopeState(ProfilerContext profilerContext) {
+        return Stateful.DEFAULT;
     }
 
-    @Override
-    public void onAttach() {}
+    default int encode(CharSequence constant) {
+        return 0;
+    }
 
-    @Override
-    public void onDetach() {}
+    default int encodeOperationName(CharSequence constant) {
+        return 0;
+    }
 
-    @Override
-    public String name() {
-      return "none";
+    default int encodeResourceName(CharSequence constant) {
+        return 0;
     }
 
-    @Override
-    public void onRootSpanFinished(AgentSpan rootSpan, EndpointTracker tracker) {}
+    String name();
 
-    @Override
-    public EndpointTracker onRootSpanStarted(AgentSpan rootSpan) {
-      return EndpointTracker.NO_OP;
+    /**
+     * Registers a one-shot callback to run once this integration is actually able to label context;
+     * runs inline if already available, or never if a deferred construction fails.
+     */
+    default void whenAvailable(Runnable callback) {
+        callback.run();
     }
 
-    @Override
-    public Timing start(TimerType type) {
-      return Timing.NoOp.INSTANCE;
+    final class NoOp implements ProfilingContextIntegration {
+
+        public static final ProfilingContextIntegration INSTANCE = new ProfilingContextIntegration.NoOp();
+
+        @Override
+        public ProfilingContextAttribute createContextAttribute(String attribute) {
+            return ProfilingContextAttribute.NoOp.INSTANCE;
+        }
+
+        @Override
+        public ProfilingScope newScope() {
+            return ProfilingScope.NO_OP;
+        }
+
+        @Override
+        public void onAttach() {}
+
+        @Override
+        public void onDetach() {}
+
+        @Override
+        public String name() {
+            return "none";
+        }
+
+        @Override
+        public void onRootSpanFinished(AgentSpan rootSpan, EndpointTracker tracker) {}
+
+        @Override
+        public EndpointTracker onRootSpanStarted(AgentSpan rootSpan) {
+            return EndpointTracker.NO_OP;
+        }
+
+        @Override
+        public Timing start(TimerType type) {
+            return Timing.NoOp.INSTANCE;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ResourceNamePriorities.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ResourceNamePriorities.java
index dddeabaf0e4..21d7ca658c0 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ResourceNamePriorities.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ResourceNamePriorities.java
@@ -1,13 +1,13 @@
 package datadog.trace.bootstrap.instrumentation.api;
 
 public class ResourceNamePriorities {
-  public static final byte DEFAULT = 0;
-  public static final byte HTTP_PATH_NORMALIZER = 1;
-  public static final byte HTTP_404 = 2;
-  public static final byte HTTP_FRAMEWORK_ROUTE = 3;
-  public static final byte RPC_COMMAND_NAME = 3;
-  public static final byte HTTP_SERVER_CONFIG_PATTERN_MATCH = 4;
-  public static final byte HTTP_CLIENT_CONFIG_PATTERN_MATCH = 4;
-  public static final byte TAG_INTERCEPTOR = 5;
-  public static final byte MANUAL_INSTRUMENTATION = 6;
+    public static final byte DEFAULT = 0;
+    public static final byte HTTP_PATH_NORMALIZER = 1;
+    public static final byte HTTP_404 = 2;
+    public static final byte HTTP_FRAMEWORK_ROUTE = 3;
+    public static final byte RPC_COMMAND_NAME = 3;
+    public static final byte HTTP_SERVER_CONFIG_PATTERN_MATCH = 4;
+    public static final byte HTTP_CLIENT_CONFIG_PATTERN_MATCH = 4;
+    public static final byte TAG_INTERCEPTOR = 5;
+    public static final byte MANUAL_INSTRUMENTATION = 6;
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SamplerConstants.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SamplerConstants.java
index eae61cdc310..3cc0859b19a 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SamplerConstants.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SamplerConstants.java
@@ -2,8 +2,8 @@
 
 public class SamplerConstants {
 
-  public static final String KEEP = "keep";
-  public static final String DROP = "drop";
+    public static final String KEEP = "keep";
+    public static final String DROP = "drop";
 
-  private SamplerConstants() {}
+    private SamplerConstants() {}
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ServiceNameSources.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ServiceNameSources.java
index e7896972944..189f9811573 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ServiceNameSources.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ServiceNameSources.java
@@ -1,22 +1,19 @@
 package datadog.trace.bootstrap.instrumentation.api;
 
 public final class ServiceNameSources {
-  public static final CharSequence DB_CLIENT_SPLIT_BY_HOST =
-      UTF8BytesString.create("opt.db_client_split_by_host");
-  public static final CharSequence DB_CLIENT_SPLIT_BY_INSTANCE =
-      UTF8BytesString.create("opt.db_client_split_by_instance");
-  public static final CharSequence HTTP_CLIENT_SPLIT_BY_DOMAIN =
-      UTF8BytesString.create("opt.http_client_split_by_domain");
-  public static final CharSequence JEE_SPLIT_BY_DEPLOYMENT =
-      UTF8BytesString.create("opt.jee_split_by_deployment");
-  public static final CharSequence MESSAGE_BROKER_SPLIT_BY_DESTINATION =
-      UTF8BytesString.create("opt.message_broker_split_by_destination");
-  public static final CharSequence SPLIT_BY_SERVLET_CONTEXT =
-      UTF8BytesString.create("opt.split_by_servlet_context");
-  public static final CharSequence SPLIT_BY_TAGS = UTF8BytesString.create("opt.split_by_tags");
-  public static final CharSequence MANUAL = UTF8BytesString.create("m");
+    public static final CharSequence DB_CLIENT_SPLIT_BY_HOST = UTF8BytesString.create("opt.db_client_split_by_host");
+    public static final CharSequence DB_CLIENT_SPLIT_BY_INSTANCE =
+            UTF8BytesString.create("opt.db_client_split_by_instance");
+    public static final CharSequence HTTP_CLIENT_SPLIT_BY_DOMAIN =
+            UTF8BytesString.create("opt.http_client_split_by_domain");
+    public static final CharSequence JEE_SPLIT_BY_DEPLOYMENT = UTF8BytesString.create("opt.jee_split_by_deployment");
+    public static final CharSequence MESSAGE_BROKER_SPLIT_BY_DESTINATION =
+            UTF8BytesString.create("opt.message_broker_split_by_destination");
+    public static final CharSequence SPLIT_BY_SERVLET_CONTEXT = UTF8BytesString.create("opt.split_by_servlet_context");
+    public static final CharSequence SPLIT_BY_TAGS = UTF8BytesString.create("opt.split_by_tags");
+    public static final CharSequence MANUAL = UTF8BytesString.create("m");
 
-  private ServiceNameSources() {
-    // utility class - no instantiation
-  }
+    private ServiceNameSources() {
+        // utility class - no instantiation
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanAttributes.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanAttributes.java
index 169e01da374..0e3d54b5962 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanAttributes.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanAttributes.java
@@ -9,133 +9,133 @@
 import java.util.Objects;
 
 public class SpanAttributes {
-  /** Represent an empty attributes. */
-  public static final SpanAttributes EMPTY = new SpanAttributes(Collections.emptyMap());
-
-  private final Map<String, String> attributes;
-
-  protected SpanAttributes(Map<String, String> attributes) {
-    this.attributes = attributes;
-  }
-
-  /**
-   * Gets a builder to create attributes.
-   *
-   * @return A builder to create attributes.
-   */
-  public static Builder builder() {
-    return new Builder();
-  }
-
-  /**
-   * Create attributes from its map representation.
-   *
-   * @param map A map representing the attributes.
-   * @return The related attributes.
-   */
-  public static SpanAttributes fromMap(Map<String, String> map) {
-    return new SpanAttributes(new HashMap<>(map));
-  }
-
-  /**
-   * Gets the attributes as an immutable map.
-   *
-   * @return The attributes as an immutable map.
-   */
-  public Map<String, String> asMap() {
-    return this.attributes;
-  }
-
-  /**
-   * Checks whether the attributes are empty.
-   *
-   * @return {@code true} if the attributes are empty, {@code false} otherwise.
-   */
-  public boolean isEmpty() {
-    return this.attributes.isEmpty();
-  }
-
-  @Override
-  public String toString() {
-    return "SpanAttributes{" + this.attributes + '}';
-  }
-
-  public static class Builder {
+    /** Represent an empty attributes. */
+    public static final SpanAttributes EMPTY = new SpanAttributes(Collections.emptyMap());
+
     private final Map<String, String> attributes;
 
-    protected Builder() {
-      this.attributes = new HashMap<>();
+    protected SpanAttributes(Map<String, String> attributes) {
+        this.attributes = attributes;
     }
 
-    public Builder put(String key, String value) {
-      requireNonNull(key, "key must not be null");
-      if (value != null) {
-        this.attributes.put(key, value);
-      }
-      return this;
+    /**
+     * Gets a builder to create attributes.
+     *
+     * @return A builder to create attributes.
+     */
+    public static Builder builder() {
+        return new Builder();
     }
 
-    public Builder put(String key, boolean value) {
-      requireNonNull(key, "key must not be null");
-      this.attributes.put(key, Boolean.toString(value));
-      return this;
+    /**
+     * Create attributes from its map representation.
+     *
+     * @param map A map representing the attributes.
+     * @return The related attributes.
+     */
+    public static SpanAttributes fromMap(Map<String, String> map) {
+        return new SpanAttributes(new HashMap<>(map));
     }
 
-    public Builder put(String key, long value) {
-      requireNonNull(key, "key must not be null");
-      this.attributes.put(key, Long.toString(value));
-      return this;
+    /**
+     * Gets the attributes as an immutable map.
+     *
+     * @return The attributes as an immutable map.
+     */
+    public Map<String, String> asMap() {
+        return this.attributes;
     }
 
-    public Builder put(String key, double value) {
-      requireNonNull(key, "key must not be null");
-      this.attributes.put(key, Double.toString(value));
-      return this;
+    /**
+     * Checks whether the attributes are empty.
+     *
+     * @return {@code true} if the attributes are empty, {@code false} otherwise.
+     */
+    public boolean isEmpty() {
+        return this.attributes.isEmpty();
     }
 
-    public Builder putStringArray(String key, List<String> array) {
-      return putArray(key, array);
+    @Override
+    public String toString() {
+        return "SpanAttributes{" + this.attributes + '}';
     }
 
-    public Builder putBooleanArray(String key, List<Boolean> array) {
-      return putArray(key, array);
-    }
+    public static class Builder {
+        private final Map<String, String> attributes;
 
-    public Builder putLongArray(String key, List<Long> array) {
-      return putArray(key, array);
-    }
+        protected Builder() {
+            this.attributes = new HashMap<>();
+        }
 
-    public Builder putDoubleArray(String key, List<Double> array) {
-      return putArray(key, array);
-    }
+        public Builder put(String key, String value) {
+            requireNonNull(key, "key must not be null");
+            if (value != null) {
+                this.attributes.put(key, value);
+            }
+            return this;
+        }
+
+        public Builder put(String key, boolean value) {
+            requireNonNull(key, "key must not be null");
+            this.attributes.put(key, Boolean.toString(value));
+            return this;
+        }
+
+        public Builder put(String key, long value) {
+            requireNonNull(key, "key must not be null");
+            this.attributes.put(key, Long.toString(value));
+            return this;
+        }
+
+        public Builder put(String key, double value) {
+            requireNonNull(key, "key must not be null");
+            this.attributes.put(key, Double.toString(value));
+            return this;
+        }
 
-    protected <T> Builder putArray(String key, List<T> array) {
-      requireNonNull(key, "key must not be null");
-      if (array != null) {
-        for (int index = 0; index < array.size(); index++) {
-          Object value = array.get(index);
-          if (value != null) {
-            this.attributes.put(key + "." + index, value.toString());
-          }
+        public Builder putStringArray(String key, List<String> array) {
+            return putArray(key, array);
         }
-      }
-      return this;
+
+        public Builder putBooleanArray(String key, List<Boolean> array) {
+            return putArray(key, array);
+        }
+
+        public Builder putLongArray(String key, List<Long> array) {
+            return putArray(key, array);
+        }
+
+        public Builder putDoubleArray(String key, List<Double> array) {
+            return putArray(key, array);
+        }
+
+        protected <T> Builder putArray(String key, List<T> array) {
+            requireNonNull(key, "key must not be null");
+            if (array != null) {
+                for (int index = 0; index < array.size(); index++) {
+                    Object value = array.get(index);
+                    if (value != null) {
+                        this.attributes.put(key + "." + index, value.toString());
+                    }
+                }
+            }
+            return this;
+        }
+
+        public SpanAttributes build() {
+            return new SpanAttributes(this.attributes);
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof SpanAttributes)) return false;
+        SpanAttributes that = (SpanAttributes) o;
+        return Objects.equals(attributes, that.attributes);
     }
 
-    public SpanAttributes build() {
-      return new SpanAttributes(this.attributes);
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(attributes);
     }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (!(o instanceof SpanAttributes)) return false;
-    SpanAttributes that = (SpanAttributes) o;
-    return Objects.equals(attributes, that.attributes);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hashCode(attributes);
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanLink.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanLink.java
index 11351d2d594..0a276faaa30 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanLink.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanLink.java
@@ -6,94 +6,88 @@
 
 /** This class is a base implementation of {@link AgentSpanLink}. */
 public class SpanLink implements AgentSpanLink {
-  private final DDTraceId traceId;
-  private final long spanId;
-  private final byte traceFlags;
-  private final String traceState;
-  private final SpanAttributes attributes;
+    private final DDTraceId traceId;
+    private final long spanId;
+    private final byte traceFlags;
+    private final String traceState;
+    private final SpanAttributes attributes;
 
-  protected SpanLink(
-      DDTraceId traceId,
-      long spanId,
-      byte traceFlags,
-      String traceState,
-      SpanAttributes attributes) {
-    this.traceId = traceId == null ? DDTraceId.ZERO : traceId;
-    this.spanId = spanId;
-    this.traceFlags = traceFlags;
-    this.traceState = traceState == null ? "" : traceState;
-    this.attributes = attributes == null ? EMPTY : attributes;
-  }
+    protected SpanLink(DDTraceId traceId, long spanId, byte traceFlags, String traceState, SpanAttributes attributes) {
+        this.traceId = traceId == null ? DDTraceId.ZERO : traceId;
+        this.spanId = spanId;
+        this.traceFlags = traceFlags;
+        this.traceState = traceState == null ? "" : traceState;
+        this.attributes = attributes == null ? EMPTY : attributes;
+    }
 
-  /**
-   * Creates a span link from a span context. Gathers the trace and span identifiers from the given
-   * instance.
-   *
-   * @param context The context of the span to get the link to.
-   * @return A span link to the given context.
-   */
-  public static SpanLink from(AgentSpanContext context) {
-    return from(context, DEFAULT_FLAGS, "", EMPTY);
-  }
+    /**
+     * Creates a span link from a span context. Gathers the trace and span identifiers from the given
+     * instance.
+     *
+     * @param context The context of the span to get the link to.
+     * @return A span link to the given context.
+     */
+    public static SpanLink from(AgentSpanContext context) {
+        return from(context, DEFAULT_FLAGS, "", EMPTY);
+    }
 
-  /**
-   * Creates a span link from a span context with W3C trace state and custom attributes. Gathers the
-   * trace and span identifiers from the given instance.
-   *
-   * @param context The context of the span to get the link to.
-   * @param traceFlags The W3C formatted trace flags.
-   * @param traceState The W3C formatted trace state.
-   * @param attributes The link attributes.
-   * @return A span link to the given context.
-   */
-  public static SpanLink from(
-      AgentSpanContext context, byte traceFlags, String traceState, SpanAttributes attributes) {
-    if (context.getSamplingPriority() > 0) {
-      traceFlags = (byte) (traceFlags | SAMPLED_FLAG);
+    /**
+     * Creates a span link from a span context with W3C trace state and custom attributes. Gathers the
+     * trace and span identifiers from the given instance.
+     *
+     * @param context The context of the span to get the link to.
+     * @param traceFlags The W3C formatted trace flags.
+     * @param traceState The W3C formatted trace state.
+     * @param attributes The link attributes.
+     * @return A span link to the given context.
+     */
+    public static SpanLink from(
+            AgentSpanContext context, byte traceFlags, String traceState, SpanAttributes attributes) {
+        if (context.getSamplingPriority() > 0) {
+            traceFlags = (byte) (traceFlags | SAMPLED_FLAG);
+        }
+        return new SpanLink(context.getTraceId(), context.getSpanId(), traceFlags, traceState, attributes);
     }
-    return new SpanLink(
-        context.getTraceId(), context.getSpanId(), traceFlags, traceState, attributes);
-  }
 
-  @Override
-  public DDTraceId traceId() {
-    return this.traceId;
-  }
+    @Override
+    public DDTraceId traceId() {
+        return this.traceId;
+    }
 
-  @Override
-  public long spanId() {
-    return this.spanId;
-  }
+    @Override
+    public long spanId() {
+        return this.spanId;
+    }
 
-  @Override
-  public byte traceFlags() {
-    return this.traceFlags;
-  }
+    @Override
+    public byte traceFlags() {
+        return this.traceFlags;
+    }
 
-  @Override
-  public String traceState() {
-    return this.traceState;
-  }
+    @Override
+    public String traceState() {
+        return this.traceState;
+    }
 
-  @Override
-  public SpanAttributes attributes() {
-    return this.attributes;
-  }
+    @Override
+    public SpanAttributes attributes() {
+        return this.attributes;
+    }
 
-  @Override
-  public String toString() {
-    return "SpanLink{"
-        + "traceId="
-        + this.traceId
-        + ", spanId="
-        + this.spanId
-        + ", traceFlags="
-        + this.traceFlags
-        + ", traceState='"
-        + this.traceState
-        + '\''
-        + ", attributes="
-        + this.attributes
-        + '}';
-  }
+    @Override
+    public String toString() {
+        return "SpanLink{"
+                + "traceId="
+                + this.traceId
+                + ", spanId="
+                + this.spanId
+                + ", traceFlags="
+                + this.traceFlags
+                + ", traceState='"
+                + this.traceState
+                + '\''
+                + ", attributes="
+                + this.attributes
+                + '}';
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanPostProcessor.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanPostProcessor.java
index 137ddedba1d..bfc174bc56a 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanPostProcessor.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanPostProcessor.java
@@ -13,25 +13,25 @@
  */
 public interface SpanPostProcessor {
 
-  /**
-   * Post-processes a span, if needed.
-   *
-   * <p>Implementations should use {@code timeoutCheck}, and if true, they should halt processing as
-   * much as possible. This method is guaranteed to be called even if post-processing of previous
-   * spans have timed out.
-   */
-  void process(@Nonnull AgentSpan span, @Nonnull BooleanSupplier timeoutCheck);
+    /**
+     * Post-processes a span, if needed.
+     *
+     * <p>Implementations should use {@code timeoutCheck}, and if true, they should halt processing as
+     * much as possible. This method is guaranteed to be called even if post-processing of previous
+     * spans have timed out.
+     */
+    void process(@Nonnull AgentSpan span, @Nonnull BooleanSupplier timeoutCheck);
 
-  class Holder {
-    public static final SpanPostProcessor NOOP = new NoOpSpanPostProcessor();
+    class Holder {
+        public static final SpanPostProcessor NOOP = new NoOpSpanPostProcessor();
 
-    // XXX: At the moment, a single post-processor can be registered, and only AppSec defines one.
-    // If other products add their own, we'll need to refactor this to support multiple processors.
-    public static volatile SpanPostProcessor INSTANCE = NOOP;
-  }
+        // XXX: At the moment, a single post-processor can be registered, and only AppSec defines one.
+        // If other products add their own, we'll need to refactor this to support multiple processors.
+        public static volatile SpanPostProcessor INSTANCE = NOOP;
+    }
 
-  class NoOpSpanPostProcessor implements SpanPostProcessor {
-    @Override
-    public void process(@Nonnull AgentSpan span, @Nonnull BooleanSupplier timeoutCheck) {}
-  }
+    class NoOpSpanPostProcessor implements SpanPostProcessor {
+        @Override
+        public void process(@Nonnull AgentSpan span, @Nonnull BooleanSupplier timeoutCheck) {}
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanPrototype.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanPrototype.java
index 24ccd2b39d8..0a45765caaf 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanPrototype.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanPrototype.java
@@ -17,163 +17,163 @@
  * deliberately out — grown when the work that needs each arrives, not pre-slotted.
  */
 public final class SpanPrototype {
-  /** The empty prototype — for spans created without a decorator-provided prototype. */
-  public static final SpanPrototype NONE = builder().build();
-
-  public static Builder builder() {
-    return new Builder();
-  }
-
-  private final String instrumentationName;
-  private final CharSequence operationName;
-  private final CharSequence spanType;
-  private final CharSequence integrationName;
-  private final TagMap tags; // frozen
-
-  private SpanPrototype(final Builder builder) {
-    this.instrumentationName = builder.instrumentationName;
-    this.operationName = builder.operationName;
-    this.spanType = builder.spanType;
-    this.integrationName = builder.integrationName;
-    this.tags = builder.tags.immutableCopy();
-  }
-
-  public String instrumentationName() {
-    return instrumentationName;
-  }
-
-  public CharSequence operationName() {
-    return operationName;
-  }
-
-  public CharSequence spanType() {
-    return spanType;
-  }
-
-  /**
-   * The integration name to record on the span context ({@code setIntegrationName}), which the
-   * IntegrationAdder serializer step turns into {@code _dd.integration}. Null unless set via {@link
-   * Builder#initComponentAndIntegration}. Mirrors {@code BaseDecorator.afterStart}'s side effect.
-   */
-  public CharSequence integrationName() {
-    return integrationName;
-  }
-
-  /** The frozen constant tags — the internal seed applied at span construction. */
-  public TagMap tags() {
-    return tags;
-  }
-
-  public static final class Builder {
-    private String instrumentationName;
-    private CharSequence operationName;
-    private CharSequence spanType;
-    private CharSequence integrationName;
-    // Internal accumulator — never exposed; authors compose via the typed methods below.
-    private final TagMap tags = TagMap.create();
-
-    private Builder() {}
+    /** The empty prototype — for spans created without a decorator-provided prototype. */
+    public static final SpanPrototype NONE = builder().build();
 
-    /**
-     * Inherit a base prototype's identity and constant tags (e.g. a SpanType base). Subsequent
-     * identity / {@code init*} calls on this builder override the inherited values.
-     */
-    public Builder extends_(final SpanPrototype base) {
-      if (base != null) {
-        if (base.instrumentationName != null) {
-          this.instrumentationName = base.instrumentationName;
-        }
-        if (base.operationName != null) {
-          this.operationName = base.operationName;
-        }
-        if (base.spanType != null) {
-          this.spanType = base.spanType;
-        }
-        if (base.integrationName != null) {
-          this.integrationName = base.integrationName;
-        }
-        this.tags.putAll(base.tags);
-      }
-      return this;
-    }
-
-    public Builder initInstrumentationNames(final String[] instrumentationNames) {
-      return (instrumentationNames == null || instrumentationNames.length == 0)
-          ? this
-          : initInstrumentationName(instrumentationNames[0]);
+    public static Builder builder() {
+        return new Builder();
     }
 
-    public Builder initInstrumentationName(final String instrumentationName) {
-      this.instrumentationName = instrumentationName;
-      return this;
+    private final String instrumentationName;
+    private final CharSequence operationName;
+    private final CharSequence spanType;
+    private final CharSequence integrationName;
+    private final TagMap tags; // frozen
+
+    private SpanPrototype(final Builder builder) {
+        this.instrumentationName = builder.instrumentationName;
+        this.operationName = builder.operationName;
+        this.spanType = builder.spanType;
+        this.integrationName = builder.integrationName;
+        this.tags = builder.tags.immutableCopy();
     }
 
-    public Builder initOperationName(final CharSequence operationName) {
-      this.operationName = operationName;
-      return this;
+    public String instrumentationName() {
+        return instrumentationName;
     }
 
-    public Builder initSpanType(final CharSequence spanType) {
-      this.spanType = spanType;
-      return this;
+    public CharSequence operationName() {
+        return operationName;
     }
 
-    /** Sets {@code span.kind}. */
-    public Builder initKind(final CharSequence kind) {
-      return initTag(Tags.SPAN_KIND, kind);
+    public CharSequence spanType() {
+        return spanType;
     }
 
     /**
-     * Sets the {@code component} tag only. Does NOT touch the integration name — so overriding a
-     * component inherited via {@link #initComponentAndIntegration} with this leaves the inherited
-     * integration name in place (a desync). Use {@link #initComponentAndIntegration} to override
-     * both together.
+     * The integration name to record on the span context ({@code setIntegrationName}), which the
+     * IntegrationAdder serializer step turns into {@code _dd.integration}. Null unless set via {@link
+     * Builder#initComponentAndIntegration}. Mirrors {@code BaseDecorator.afterStart}'s side effect.
      */
-    public Builder initComponentOnly(final CharSequence component) {
-      return initTag(Tags.COMPONENT, component);
+    public CharSequence integrationName() {
+        return integrationName;
     }
 
-    /**
-     * Sets the {@code component} tag AND records it as the integration name — the {@code
-     * BaseDecorator.afterStart} pairing (component tag + {@code setIntegrationName(component)},
-     * which the IntegrationAdder serializer turns into {@code _dd.integration}). Null/empty is a
-     * no-op for both.
-     */
-    public Builder initComponentAndIntegration(final CharSequence component) {
-      if (!TagMap.Entry.isEmptyValue(component)) {
-        this.tags.set(Tags.COMPONENT, component);
-        this.integrationName = component;
-      }
-      return this;
+    /** The frozen constant tags — the internal seed applied at span construction. */
+    public TagMap tags() {
+        return tags;
     }
 
-    public Builder initTag(final String key, final CharSequence value) {
-      if (!TagMap.Entry.isEmptyValue(value)) {
-        this.tags.set(key, value);
-      }
-      return this;
-    }
+    public static final class Builder {
+        private String instrumentationName;
+        private CharSequence operationName;
+        private CharSequence spanType;
+        private CharSequence integrationName;
+        // Internal accumulator — never exposed; authors compose via the typed methods below.
+        private final TagMap tags = TagMap.create();
+
+        private Builder() {}
+
+        /**
+         * Inherit a base prototype's identity and constant tags (e.g. a SpanType base). Subsequent
+         * identity / {@code init*} calls on this builder override the inherited values.
+         */
+        public Builder extends_(final SpanPrototype base) {
+            if (base != null) {
+                if (base.instrumentationName != null) {
+                    this.instrumentationName = base.instrumentationName;
+                }
+                if (base.operationName != null) {
+                    this.operationName = base.operationName;
+                }
+                if (base.spanType != null) {
+                    this.spanType = base.spanType;
+                }
+                if (base.integrationName != null) {
+                    this.integrationName = base.integrationName;
+                }
+                this.tags.putAll(base.tags);
+            }
+            return this;
+        }
 
-    public Builder initTag(final String key, final Object value) {
-      if (!TagMap.Entry.isEmptyValue(value)) {
-        this.tags.set(key, value);
-      }
-      return this;
-    }
+        public Builder initInstrumentationNames(final String[] instrumentationNames) {
+            return (instrumentationNames == null || instrumentationNames.length == 0)
+                    ? this
+                    : initInstrumentationName(instrumentationNames[0]);
+        }
 
-    /**
-     * Advanced/internal: reuse an already-built entry — a decorator's cached constant or a metric
-     * entry — rather than re-creating it. Authors should prefer the typed {@code init*} methods.
-     */
-    public Builder initTag(final TagMap.EntryReader entry) {
-      if (entry != null) {
-        this.tags.set(entry);
-      }
-      return this;
-    }
+        public Builder initInstrumentationName(final String instrumentationName) {
+            this.instrumentationName = instrumentationName;
+            return this;
+        }
 
-    public SpanPrototype build() {
-      return new SpanPrototype(this);
+        public Builder initOperationName(final CharSequence operationName) {
+            this.operationName = operationName;
+            return this;
+        }
+
+        public Builder initSpanType(final CharSequence spanType) {
+            this.spanType = spanType;
+            return this;
+        }
+
+        /** Sets {@code span.kind}. */
+        public Builder initKind(final CharSequence kind) {
+            return initTag(Tags.SPAN_KIND, kind);
+        }
+
+        /**
+         * Sets the {@code component} tag only. Does NOT touch the integration name — so overriding a
+         * component inherited via {@link #initComponentAndIntegration} with this leaves the inherited
+         * integration name in place (a desync). Use {@link #initComponentAndIntegration} to override
+         * both together.
+         */
+        public Builder initComponentOnly(final CharSequence component) {
+            return initTag(Tags.COMPONENT, component);
+        }
+
+        /**
+         * Sets the {@code component} tag AND records it as the integration name — the {@code
+         * BaseDecorator.afterStart} pairing (component tag + {@code setIntegrationName(component)},
+         * which the IntegrationAdder serializer turns into {@code _dd.integration}). Null/empty is a
+         * no-op for both.
+         */
+        public Builder initComponentAndIntegration(final CharSequence component) {
+            if (!TagMap.Entry.isEmptyValue(component)) {
+                this.tags.set(Tags.COMPONENT, component);
+                this.integrationName = component;
+            }
+            return this;
+        }
+
+        public Builder initTag(final String key, final CharSequence value) {
+            if (!TagMap.Entry.isEmptyValue(value)) {
+                this.tags.set(key, value);
+            }
+            return this;
+        }
+
+        public Builder initTag(final String key, final Object value) {
+            if (!TagMap.Entry.isEmptyValue(value)) {
+                this.tags.set(key, value);
+            }
+            return this;
+        }
+
+        /**
+         * Advanced/internal: reuse an already-built entry — a decorator's cached constant or a metric
+         * entry — rather than re-creating it. Authors should prefer the typed {@code init*} methods.
+         */
+        public Builder initTag(final TagMap.EntryReader entry) {
+            if (entry != null) {
+                this.tags.set(entry);
+            }
+            return this;
+        }
+
+        public SpanPrototype build() {
+            return new SpanPrototype(this);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanWrapper.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanWrapper.java
index 8c0b8241c13..95ce45708d8 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanWrapper.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/SpanWrapper.java
@@ -6,5 +6,5 @@
  * specific logic runs when spans are auto-finished.
  */
 public interface SpanWrapper {
-  default void onSpanFinished() {}
+    default void onSpanFinished() {}
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java
index 078ffeb1625..c34da34a578 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java
@@ -21,273 +21,273 @@
  */
 public class TagContext implements AgentSpanContext.Extracted {
 
-  private static final HttpHeaders EMPTY_HTTP_HEADERS = new HttpHeaders();
-
-  private final CharSequence origin;
-  private TagMap tags;
-  private List<AgentSpanLink> terminatedSpanLinks;
-  private Object requestContextDataAppSec;
-  private Object requestContextDataIast;
-  private Object ciVisibilityContextData;
-  private PathwayContext pathwayContext;
-  private final HttpHeaders httpHeaders;
-  private final Map<String, String> baggage;
-  private Baggage w3cBaggage;
-  private final int samplingPriority;
-  private final TraceConfig traceConfig;
-  private final TracePropagationStyle propagationStyle;
-  private final DDTraceId traceId;
-
-  public TagContext() {
-    this(null, null);
-  }
-
-  public TagContext(final CharSequence origin, final TagMap tags) {
-    this(origin, tags, null, null, PrioritySampling.UNSET, null, NONE, DDTraceId.ZERO);
-  }
-
-  public TagContext(
-      final CharSequence origin,
-      final TagMap tags,
-      final HttpHeaders httpHeaders,
-      final Map<String, String> baggage,
-      final int samplingPriority,
-      final TraceConfig traceConfig,
-      final TracePropagationStyle propagationStyle,
-      final DDTraceId traceId) {
-    this.origin = origin;
-    this.tags = tags;
-    this.terminatedSpanLinks = null;
-    this.httpHeaders = httpHeaders == null ? EMPTY_HTTP_HEADERS : httpHeaders;
-    this.baggage = baggage == null ? Collections.emptyMap() : baggage;
-    this.samplingPriority = samplingPriority;
-    this.traceConfig = traceConfig;
-    this.propagationStyle = propagationStyle;
-    this.traceId = traceId;
-  }
-
-  public TraceConfig getTraceConfig() {
-    return traceConfig;
-  }
-
-  public TracePropagationStyle getPropagationStyle() {
-    return this.propagationStyle;
-  }
-
-  public final CharSequence getOrigin() {
-    return origin;
-  }
-
-  @Override
-  public List<AgentSpanLink> getTerminatedSpanLinks() {
-    return this.terminatedSpanLinks == null ? emptyList() : this.terminatedSpanLinks;
-  }
-
-  public void addTerminatedSpanLink(AgentSpanLink link) {
-    if (this.terminatedSpanLinks == null) {
-      this.terminatedSpanLinks = new ArrayList<>();
-    }
-    this.terminatedSpanLinks.add(link);
-  }
-
-  @Override
-  public String getForwarded() {
-    return httpHeaders.forwarded;
-  }
-
-  @Override
-  public String getFastlyClientIp() {
-    return httpHeaders.fastlyClientIp;
-  }
-
-  @Override
-  public String getCfConnectingIp() {
-    return httpHeaders.cfConnectingIp;
-  }
-
-  @Override
-  public String getCfConnectingIpv6() {
-    return httpHeaders.cfConnectingIpv6;
-  }
-
-  @Override
-  public String getXForwardedProto() {
-    return httpHeaders.xForwardedProto;
-  }
-
-  @Override
-  public String getXForwardedHost() {
-    return httpHeaders.xForwardedHost;
-  }
-
-  @Override
-  public String getXForwardedPort() {
-    return httpHeaders.xForwardedPort;
-  }
-
-  @Override
-  public String getForwardedFor() {
-    return httpHeaders.forwardedFor;
-  }
-
-  @Override
-  public String getXForwardedFor() {
-    return httpHeaders.xForwardedFor;
-  }
-
-  @Override
-  public String getXClusterClientIp() {
-    return httpHeaders.xClusterClientIp;
-  }
-
-  @Override
-  public String getXRealIp() {
-    return httpHeaders.xRealIp;
-  }
-
-  @Override
-  public String getXClientIp() {
-    return httpHeaders.xClientIp;
-  }
-
-  @Override
-  public String getUserAgent() {
-    return httpHeaders.userAgent;
-  }
-
-  @Override
-  public String getTrueClientIp() {
-    return httpHeaders.trueClientIp;
-  }
-
-  @Override
-  public String getCustomIpHeader() {
-    return httpHeaders.customIpHeader;
-  }
-
-  public final TagMap getTags() {
-    return (this.tags == null) ? TagMap.EMPTY : this.tags;
-  }
-
-  public void putTag(final String key, final String value) {
-    if (this.tags == null) {
-      this.tags = TagMap.create(4);
-    }
-    this.tags.set(key, value);
-  }
-
-  @Override
-  public final int getSamplingPriority() {
-    return samplingPriority;
-  }
-
-  public final Map<String, String> getBaggage() {
-    return baggage;
-  }
-
-  @Override
-  public Iterable<Map.Entry<String, String>> baggageItems() {
-    return baggage.entrySet();
-  }
-
-  public final Baggage getW3CBaggage() {
-    return w3cBaggage;
-  }
-
-  public void setW3CBaggage(Baggage w3cBaggage) {
-    this.w3cBaggage = w3cBaggage;
-  }
-
-  @Override
-  public DDTraceId getTraceId() {
-    return traceId;
-  }
-
-  @Override
-  public long getSpanId() {
-    return DDSpanId.ZERO;
-  }
-
-  @Override
-  public final AgentTraceCollector getTraceCollector() {
-    return AgentTracer.NoopAgentTraceCollector.INSTANCE;
-  }
-
-  public final Object getRequestContextDataAppSec() {
-    return requestContextDataAppSec;
-  }
-
-  public final TagContext withRequestContextDataAppSec(Object requestContextData) {
-    this.requestContextDataAppSec = requestContextData;
-    return this;
-  }
-
-  public final Object getRequestContextDataIast() {
-    return requestContextDataIast;
-  }
-
-  public final TagContext withRequestContextDataIast(Object requestContextData) {
-    this.requestContextDataIast = requestContextData;
-    return this;
-  }
-
-  public Object getCiVisibilityContextData() {
-    return ciVisibilityContextData;
-  }
-
-  public TagContext withCiVisibilityContextData(Object ciVisibilityContextData) {
-    this.ciVisibilityContextData = ciVisibilityContextData;
-    return this;
-  }
-
-  @Override
-  public PathwayContext getPathwayContext() {
-    return this.pathwayContext;
-  }
-
-  @Override
-  public boolean isRemote() {
-    return true;
-  }
-
-  public TagContext withPathwayContext(PathwayContext pathwayContext) {
-    this.pathwayContext = pathwayContext;
-    return this;
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder builder = new StringBuilder("TagContext{");
-    if (origin != null) {
-      builder.append("origin=").append(origin).append(", ");
-    }
-    if (tags != null) {
-      builder.append("tags=").append(tags).append(", ");
-    }
-    if (baggage != null) {
-      builder.append("baggage=").append(baggage).append(", ");
-    }
-    if (samplingPriority != PrioritySampling.UNSET) {
-      builder.append("samplingPriority=").append(samplingPriority).append(", ");
-    }
-    return builder.append('}').toString();
-  }
-
-  public static class HttpHeaders {
-    public String fastlyClientIp;
-    public String cfConnectingIp;
-    public String cfConnectingIpv6;
-    public String xForwardedProto;
-    public String xForwardedHost;
-    public String xForwardedPort;
-    public String xForwardedFor;
-    public String forwarded;
-    public String forwardedFor;
-    public String xClusterClientIp;
-    public String xRealIp;
-    public String xClientIp;
-    public String userAgent;
-    public String trueClientIp;
-    public String customIpHeader;
-  }
+    private static final HttpHeaders EMPTY_HTTP_HEADERS = new HttpHeaders();
+
+    private final CharSequence origin;
+    private TagMap tags;
+    private List<AgentSpanLink> terminatedSpanLinks;
+    private Object requestContextDataAppSec;
+    private Object requestContextDataIast;
+    private Object ciVisibilityContextData;
+    private PathwayContext pathwayContext;
+    private final HttpHeaders httpHeaders;
+    private final Map<String, String> baggage;
+    private Baggage w3cBaggage;
+    private final int samplingPriority;
+    private final TraceConfig traceConfig;
+    private final TracePropagationStyle propagationStyle;
+    private final DDTraceId traceId;
+
+    public TagContext() {
+        this(null, null);
+    }
+
+    public TagContext(final CharSequence origin, final TagMap tags) {
+        this(origin, tags, null, null, PrioritySampling.UNSET, null, NONE, DDTraceId.ZERO);
+    }
+
+    public TagContext(
+            final CharSequence origin,
+            final TagMap tags,
+            final HttpHeaders httpHeaders,
+            final Map<String, String> baggage,
+            final int samplingPriority,
+            final TraceConfig traceConfig,
+            final TracePropagationStyle propagationStyle,
+            final DDTraceId traceId) {
+        this.origin = origin;
+        this.tags = tags;
+        this.terminatedSpanLinks = null;
+        this.httpHeaders = httpHeaders == null ? EMPTY_HTTP_HEADERS : httpHeaders;
+        this.baggage = baggage == null ? Collections.emptyMap() : baggage;
+        this.samplingPriority = samplingPriority;
+        this.traceConfig = traceConfig;
+        this.propagationStyle = propagationStyle;
+        this.traceId = traceId;
+    }
+
+    public TraceConfig getTraceConfig() {
+        return traceConfig;
+    }
+
+    public TracePropagationStyle getPropagationStyle() {
+        return this.propagationStyle;
+    }
+
+    public final CharSequence getOrigin() {
+        return origin;
+    }
+
+    @Override
+    public List<AgentSpanLink> getTerminatedSpanLinks() {
+        return this.terminatedSpanLinks == null ? emptyList() : this.terminatedSpanLinks;
+    }
+
+    public void addTerminatedSpanLink(AgentSpanLink link) {
+        if (this.terminatedSpanLinks == null) {
+            this.terminatedSpanLinks = new ArrayList<>();
+        }
+        this.terminatedSpanLinks.add(link);
+    }
+
+    @Override
+    public String getForwarded() {
+        return httpHeaders.forwarded;
+    }
+
+    @Override
+    public String getFastlyClientIp() {
+        return httpHeaders.fastlyClientIp;
+    }
+
+    @Override
+    public String getCfConnectingIp() {
+        return httpHeaders.cfConnectingIp;
+    }
+
+    @Override
+    public String getCfConnectingIpv6() {
+        return httpHeaders.cfConnectingIpv6;
+    }
+
+    @Override
+    public String getXForwardedProto() {
+        return httpHeaders.xForwardedProto;
+    }
+
+    @Override
+    public String getXForwardedHost() {
+        return httpHeaders.xForwardedHost;
+    }
+
+    @Override
+    public String getXForwardedPort() {
+        return httpHeaders.xForwardedPort;
+    }
+
+    @Override
+    public String getForwardedFor() {
+        return httpHeaders.forwardedFor;
+    }
+
+    @Override
+    public String getXForwardedFor() {
+        return httpHeaders.xForwardedFor;
+    }
+
+    @Override
+    public String getXClusterClientIp() {
+        return httpHeaders.xClusterClientIp;
+    }
+
+    @Override
+    public String getXRealIp() {
+        return httpHeaders.xRealIp;
+    }
+
+    @Override
+    public String getXClientIp() {
+        return httpHeaders.xClientIp;
+    }
+
+    @Override
+    public String getUserAgent() {
+        return httpHeaders.userAgent;
+    }
+
+    @Override
+    public String getTrueClientIp() {
+        return httpHeaders.trueClientIp;
+    }
+
+    @Override
+    public String getCustomIpHeader() {
+        return httpHeaders.customIpHeader;
+    }
+
+    public final TagMap getTags() {
+        return (this.tags == null) ? TagMap.EMPTY : this.tags;
+    }
+
+    public void putTag(final String key, final String value) {
+        if (this.tags == null) {
+            this.tags = TagMap.create(4);
+        }
+        this.tags.set(key, value);
+    }
+
+    @Override
+    public final int getSamplingPriority() {
+        return samplingPriority;
+    }
+
+    public final Map<String, String> getBaggage() {
+        return baggage;
+    }
+
+    @Override
+    public Iterable<Map.Entry<String, String>> baggageItems() {
+        return baggage.entrySet();
+    }
+
+    public final Baggage getW3CBaggage() {
+        return w3cBaggage;
+    }
+
+    public void setW3CBaggage(Baggage w3cBaggage) {
+        this.w3cBaggage = w3cBaggage;
+    }
+
+    @Override
+    public DDTraceId getTraceId() {
+        return traceId;
+    }
+
+    @Override
+    public long getSpanId() {
+        return DDSpanId.ZERO;
+    }
+
+    @Override
+    public final AgentTraceCollector getTraceCollector() {
+        return AgentTracer.NoopAgentTraceCollector.INSTANCE;
+    }
+
+    public final Object getRequestContextDataAppSec() {
+        return requestContextDataAppSec;
+    }
+
+    public final TagContext withRequestContextDataAppSec(Object requestContextData) {
+        this.requestContextDataAppSec = requestContextData;
+        return this;
+    }
+
+    public final Object getRequestContextDataIast() {
+        return requestContextDataIast;
+    }
+
+    public final TagContext withRequestContextDataIast(Object requestContextData) {
+        this.requestContextDataIast = requestContextData;
+        return this;
+    }
+
+    public Object getCiVisibilityContextData() {
+        return ciVisibilityContextData;
+    }
+
+    public TagContext withCiVisibilityContextData(Object ciVisibilityContextData) {
+        this.ciVisibilityContextData = ciVisibilityContextData;
+        return this;
+    }
+
+    @Override
+    public PathwayContext getPathwayContext() {
+        return this.pathwayContext;
+    }
+
+    @Override
+    public boolean isRemote() {
+        return true;
+    }
+
+    public TagContext withPathwayContext(PathwayContext pathwayContext) {
+        this.pathwayContext = pathwayContext;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder("TagContext{");
+        if (origin != null) {
+            builder.append("origin=").append(origin).append(", ");
+        }
+        if (tags != null) {
+            builder.append("tags=").append(tags).append(", ");
+        }
+        if (baggage != null) {
+            builder.append("baggage=").append(baggage).append(", ");
+        }
+        if (samplingPriority != PrioritySampling.UNSET) {
+            builder.append("samplingPriority=").append(samplingPriority).append(", ");
+        }
+        return builder.append('}').toString();
+    }
+
+    public static class HttpHeaders {
+        public String fastlyClientIp;
+        public String cfConnectingIp;
+        public String cfConnectingIpv6;
+        public String xForwardedProto;
+        public String xForwardedHost;
+        public String xForwardedPort;
+        public String xForwardedFor;
+        public String forwarded;
+        public String forwardedFor;
+        public String xClusterClientIp;
+        public String xRealIp;
+        public String xClientIp;
+        public String userAgent;
+        public String trueClientIp;
+        public String customIpHeader;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java
index 9e96c17a486..cbefdd70a6a 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java
@@ -3,200 +3,196 @@
 // standard tag names (and span kind values) from OpenTracing (see io.opentracing.tag.Tags)
 public class Tags {
 
-  public static final String SPAN_KIND_SERVER = "server";
-  public static final String SPAN_KIND_CLIENT = "client";
-  public static final String SPAN_KIND_PRODUCER = "producer";
-  public static final String SPAN_KIND_CONSUMER = "consumer";
-  public static final String SPAN_KIND_BROKER = "broker";
-  public static final String SPAN_KIND_TEST = "test";
-  public static final String SPAN_KIND_TEST_SUITE = "test_suite_end";
-  public static final String SPAN_KIND_TEST_MODULE = "test_module_end";
-  public static final String SPAN_KIND_TEST_SESSION = "test_session_end";
-  public static final String SPAN_KIND_INTERNAL = "internal";
-
-  public static final String HTTP_URL = "http.url";
-  public static final String HTTP_HOSTNAME = "http.hostname";
-  public static final String HTTP_ROUTE = "http.route";
-  public static final String HTTP_STATUS = "http.status_code";
-  public static final String HTTP_METHOD = "http.method";
-  public static final String HTTP_ENDPOINT = "http.endpoint";
-  public static final String HTTP_FORWARDED = "http.forwarded";
-  public static final String HTTP_FORWARDED_PROTO = "http.forwarded.proto";
-  public static final String HTTP_FORWARDED_HOST = "http.forwarded.host";
-  public static final String HTTP_FORWARDED_IP = "http.forwarded.ip";
-  public static final String HTTP_FORWARDED_PORT = "http.forwarded.port";
-  public static final String HTTP_USER_AGENT = "http.useragent";
-  public static final String HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN =
-      "http.request.headers.x-datadog-endpoint-scan";
-  public static final String HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST =
-      "http.request.headers.x-datadog-security-test";
-  public static final String HTTP_CLIENT_IP = "http.client_ip";
-  public static final String NETWORK_CLIENT_IP = "network.client.ip";
-  public static final String HTTP_REQUEST_CONTENT_LENGTH = "http.request_content_length";
-  public static final String HTTP_RESPONSE_CONTENT_LENGTH = "http.response_content_length";
-  public static final String PEER_HOST_IPV4 = "peer.ipv4";
-  public static final String PEER_HOST_IPV6 = "peer.ipv6";
-  public static final String PEER_SERVICE = "peer.service";
-  public static final String PEER_HOSTNAME = "peer.hostname";
-  public static final String PEER_PORT = "peer.port";
-  public static final String RPC_SERVICE = "rpc.service";
-  public static final String SAMPLING_PRIORITY = "sampling.priority";
-  public static final String SPAN_KIND = "span.kind";
-  public static final String COMPONENT = "component";
-  public static final String ERROR = "error";
-  public static final String DB_TYPE = "db.type";
-  public static final String DB_INSTANCE = "db.instance";
-  public static final String DB_USER = "db.user";
-  public static final String DB_OPERATION = "db.operation";
-  public static final String DB_STATEMENT = "db.statement";
-  public static final String DB_WAREHOUSE = "db.warehouse";
-  public static final String DB_HOST = "db.host";
-  public static final String DB_SCHEMA = "db.schema";
-  public static final String MESSAGE_BUS_DESTINATION = "message_bus.destination";
-  public static final String DB_POOL_NAME = "db.pool.name";
-  public static final String BASE_HASH = "_dd.propagated_hash";
-
-  public static final String TEST_SESSION_NAME = "test_session.name";
-  public static final String TEST_MODULE = "test.module";
-  public static final String TEST_SUITE = "test.suite";
-  public static final String TEST_NAME = "test.name";
-  public static final String TEST_STATUS = "test.status";
-  public static final String TEST_FINAL_STATUS = "test.final_status";
-  public static final String TEST_FRAMEWORK = "test.framework";
-  public static final String TEST_FRAMEWORK_VERSION = "test.framework_version";
-  public static final String TEST_SKIP_REASON = "test.skip_reason";
-  public static final String TEST_SKIPPED_BY_ITR = "test.skipped_by_itr";
-  public static final String TEST_TYPE = "test.type";
-  public static final String TEST_PARAMETERS = "test.parameters";
-  public static final String TEST_CODEOWNERS = "test.codeowners";
-  public static final String TEST_SOURCE_FILE = "test.source.file";
-  public static final String TEST_SOURCE_CLASS = "test.source.class";
-  public static final String TEST_SOURCE_METHOD = "test.source.method";
-  public static final String TEST_SOURCE_START = "test.source.start";
-  public static final String TEST_SOURCE_END = "test.source.end";
-  public static final String TEST_TRAITS = "test.traits";
-  public static final String TEST_COMMAND = "test.command";
-  public static final String TEST_TOOLCHAIN = "test.toolchain";
-  public static final String TEST_EXECUTION = "test.execution";
-  public static final String TEST_GRADLE_NESTED_BUILD = "test.gradle.nested_build";
-  public static final String TEST_IS_RUM_ACTIVE = "test.is_rum_active";
-  public static final String TEST_BROWSER_DRIVER = "test.browser.driver";
-  public static final String TEST_BROWSER_DRIVER_VERSION = "test.browser.driver_version";
-  public static final String TEST_BROWSER_NAME = "test.browser.name";
-  public static final String TEST_BROWSER_VERSION = "test.browser.version";
-  public static final String TEST_CALLBACK = "test.callback";
-  public static final String TEST_ANDROID_API_LEVEL = "test.android.api_level";
-  public static final String TEST_ANDROID_RELEASE = "test.android.release";
-  public static final String TEST_ANDROID_CODENAME = "test.android.codename";
-  public static final String TEST_ANDROID_ROBOLECTRIC_VERSION = "test.android.robolectric.version";
-
-  public static final String TEST_IS_ANDROID = "test.is_android";
-
-  public static final String TEST_SESSION_ID = "test_session_id";
-  public static final String TEST_MODULE_ID = "test_module_id";
-  public static final String TEST_SUITE_ID = "test_suite_id";
-  public static final String ITR_CORRELATION_ID = "itr_correlation_id";
-  public static final String TEST_CODE_COVERAGE_ENABLED = "test.code_coverage.enabled";
-  public static final String TEST_CODE_COVERAGE_LINES_PERCENTAGE = "test.code_coverage.lines_pct";
-  public static final String TEST_CODE_COVERAGE_BACKFILLED = "test.code_coverage.backfilled";
-  public static final String TEST_ITR_TESTS_SKIPPING_ENABLED = "test.itr.tests_skipping.enabled";
-  public static final String TEST_ITR_TESTS_SKIPPING_TYPE = "test.itr.tests_skipping.type";
-  public static final String TEST_ITR_TESTS_SKIPPING_COUNT = "test.itr.tests_skipping.count";
-  public static final String TEST_ITR_UNSKIPPABLE = "test.itr.unskippable";
-  public static final String TEST_ITR_FORCED_RUN = "test.itr.forced_run";
-  public static final String TEST_EARLY_FLAKE_ENABLED = "test.early_flake.enabled";
-  public static final String TEST_EARLY_FLAKE_ABORT_REASON = "test.early_flake.abort_reason";
-  public static final String TEST_IS_NEW = "test.is_new";
-  public static final String TEST_IS_RETRY = "test.is_retry";
-  public static final String TEST_RETRY_REASON = "test.retry_reason";
-  public static final String TEST_JUNIT_IS_DYNAMIC = "test.junit5.is_dynamic";
-  public static final String TEST_IS_MODIFIED = "test.is_modified";
-  public static final String TEST_HAS_FAILED_ALL_RETRIES = "test.has_failed_all_retries";
-  public static final String TEST_FAILURE_SUPPRESSED = "test.failure_suppressed";
-  public static final String TEST_TEST_MANAGEMENT_ENABLED = "test.test_management.enabled";
-  public static final String TEST_TEST_MANAGEMENT_IS_QUARANTINED =
-      "test.test_management.is_quarantined";
-  public static final String TEST_TEST_MANAGEMENT_IS_TEST_DISABLED =
-      "test.test_management.is_test_disabled";
-  public static final String TEST_TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX =
-      "test.test_management.is_attempt_to_fix";
-  public static final String TEST_TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED =
-      "test.test_management.attempt_to_fix_passed";
-
-  public static final String ERROR_DEBUG_INFO_CAPTURED = "error.debug_info_captured";
-
-  public static final String CI_PROVIDER_NAME = "ci.provider.name";
-  public static final String CI_PIPELINE_ID = "ci.pipeline.id";
-  public static final String CI_PIPELINE_NAME = "ci.pipeline.name";
-  public static final String CI_PIPELINE_DISPLAY_NAME = "ci.pipeline.display_name";
-  public static final String CI_PIPELINE_NUMBER = "ci.pipeline.number";
-  public static final String CI_PIPELINE_URL = "ci.pipeline.url";
-  public static final String CI_STAGE_NAME = "ci.stage.name";
-  public static final String CI_JOB_ID = "ci.job.id";
-  public static final String CI_JOB_NAME = "ci.job.name";
-  public static final String CI_JOB_URL = "ci.job.url";
-  public static final String CI_WORKSPACE_PATH = "ci.workspace_path";
-  public static final String CI_NODE_NAME = "ci.node.name";
-  public static final String CI_NODE_LABELS = "ci.node.labels";
-
-  public static final String GIT_REPOSITORY_URL = "git.repository_url";
-  public static final String GIT_COMMIT_SHA = "git.commit.sha";
-  public static final String GIT_COMMIT_AUTHOR_NAME = "git.commit.author.name";
-  public static final String GIT_COMMIT_AUTHOR_EMAIL = "git.commit.author.email";
-  public static final String GIT_COMMIT_AUTHOR_DATE = "git.commit.author.date";
-  public static final String GIT_COMMIT_COMMITTER_NAME = "git.commit.committer.name";
-  public static final String GIT_COMMIT_COMMITTER_EMAIL = "git.commit.committer.email";
-  public static final String GIT_COMMIT_COMMITTER_DATE = "git.commit.committer.date";
-  public static final String GIT_COMMIT_MESSAGE = "git.commit.message";
-  public static final String GIT_BRANCH = "git.branch";
-  public static final String GIT_TAG = "git.tag";
-  public static final String GIT_PULL_REQUEST_BASE_BRANCH = "git.pull_request.base_branch";
-  public static final String GIT_PULL_REQUEST_BASE_BRANCH_SHA = "git.pull_request.base_branch_sha";
-  public static final String GIT_PULL_REQUEST_BASE_BRANCH_HEAD_SHA =
-      "git.pull_request.base_branch_head_sha";
-  public static final String GIT_COMMIT_HEAD_SHA = "git.commit.head.sha";
-  public static final String GIT_COMMIT_HEAD_AUTHOR_NAME = "git.commit.head.author.name";
-  public static final String GIT_COMMIT_HEAD_AUTHOR_EMAIL = "git.commit.head.author.email";
-  public static final String GIT_COMMIT_HEAD_AUTHOR_DATE = "git.commit.head.author.date";
-  public static final String GIT_COMMIT_HEAD_COMMITTER_NAME = "git.commit.head.committer.name";
-  public static final String GIT_COMMIT_HEAD_COMMITTER_EMAIL = "git.commit.head.committer.email";
-  public static final String GIT_COMMIT_HEAD_COMMITTER_DATE = "git.commit.head.committer.date";
-  public static final String GIT_COMMIT_HEAD_MESSAGE = "git.commit.head.message";
-  public static final String PULL_REQUEST_NUMBER = "pr.number";
-
-  public static final String RUNTIME_NAME = "runtime.name";
-  public static final String RUNTIME_VENDOR = "runtime.vendor";
-  public static final String RUNTIME_VERSION = "runtime.version";
-  public static final String OS_ARCHITECTURE = "os.architecture";
-  public static final String OS_PLATFORM = "os.platform";
-  public static final String OS_VERSION = "os.version";
-
-  public static final String DD_SERVICE = "dd.service";
-  public static final String DD_VERSION = "dd.version";
-  public static final String DD_ENV = "dd.env";
-
-  public static final String ENV = "env";
-  public static final String VERSION = "version";
-
-  /** ASM force tracer to keep the trace */
-  public static final String ASM_KEEP = "asm.keep";
-
-  /** AI Guard force tracer to keep the trace */
-  public static final String AI_GUARD_KEEP = "ai_guard.keep";
-
-  /** Marks a span as originating from an AI Guard evaluation */
-  public static final String AI_GUARD_EVENT = "ai_guard.event";
-
-  public static final String PROPAGATED_TRACE_SOURCE = "_dd.p.ts";
-  public static final String PROPAGATED_DEBUG = "_dd.p.debug";
-
-  public static final String LLMOBS_LLM_SPAN_KIND = "llm";
-  public static final String LLMOBS_WORKFLOW_SPAN_KIND = "workflow";
-  public static final String LLMOBS_TASK_SPAN_KIND = "task";
-  public static final String LLMOBS_AGENT_SPAN_KIND = "agent";
-  public static final String LLMOBS_TOOL_SPAN_KIND = "tool";
-  public static final String LLMOBS_EMBEDDING_SPAN_KIND = "embedding";
-  public static final String LLMOBS_RETRIEVAL_SPAN_KIND = "retrieval";
-  public static final String DSM_TRANSACTION_ID = "dsm.transaction.id";
-  public static final String DSM_TRANSACTION_CHECKPOINT = "dsm.transaction.checkpoint";
+    public static final String SPAN_KIND_SERVER = "server";
+    public static final String SPAN_KIND_CLIENT = "client";
+    public static final String SPAN_KIND_PRODUCER = "producer";
+    public static final String SPAN_KIND_CONSUMER = "consumer";
+    public static final String SPAN_KIND_BROKER = "broker";
+    public static final String SPAN_KIND_TEST = "test";
+    public static final String SPAN_KIND_TEST_SUITE = "test_suite_end";
+    public static final String SPAN_KIND_TEST_MODULE = "test_module_end";
+    public static final String SPAN_KIND_TEST_SESSION = "test_session_end";
+    public static final String SPAN_KIND_INTERNAL = "internal";
+
+    public static final String HTTP_URL = "http.url";
+    public static final String HTTP_HOSTNAME = "http.hostname";
+    public static final String HTTP_ROUTE = "http.route";
+    public static final String HTTP_STATUS = "http.status_code";
+    public static final String HTTP_METHOD = "http.method";
+    public static final String HTTP_ENDPOINT = "http.endpoint";
+    public static final String HTTP_FORWARDED = "http.forwarded";
+    public static final String HTTP_FORWARDED_PROTO = "http.forwarded.proto";
+    public static final String HTTP_FORWARDED_HOST = "http.forwarded.host";
+    public static final String HTTP_FORWARDED_IP = "http.forwarded.ip";
+    public static final String HTTP_FORWARDED_PORT = "http.forwarded.port";
+    public static final String HTTP_USER_AGENT = "http.useragent";
+    public static final String HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN =
+            "http.request.headers.x-datadog-endpoint-scan";
+    public static final String HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST =
+            "http.request.headers.x-datadog-security-test";
+    public static final String HTTP_CLIENT_IP = "http.client_ip";
+    public static final String NETWORK_CLIENT_IP = "network.client.ip";
+    public static final String HTTP_REQUEST_CONTENT_LENGTH = "http.request_content_length";
+    public static final String HTTP_RESPONSE_CONTENT_LENGTH = "http.response_content_length";
+    public static final String PEER_HOST_IPV4 = "peer.ipv4";
+    public static final String PEER_HOST_IPV6 = "peer.ipv6";
+    public static final String PEER_SERVICE = "peer.service";
+    public static final String PEER_HOSTNAME = "peer.hostname";
+    public static final String PEER_PORT = "peer.port";
+    public static final String RPC_SERVICE = "rpc.service";
+    public static final String SAMPLING_PRIORITY = "sampling.priority";
+    public static final String SPAN_KIND = "span.kind";
+    public static final String COMPONENT = "component";
+    public static final String ERROR = "error";
+    public static final String DB_TYPE = "db.type";
+    public static final String DB_INSTANCE = "db.instance";
+    public static final String DB_USER = "db.user";
+    public static final String DB_OPERATION = "db.operation";
+    public static final String DB_STATEMENT = "db.statement";
+    public static final String DB_WAREHOUSE = "db.warehouse";
+    public static final String DB_HOST = "db.host";
+    public static final String DB_SCHEMA = "db.schema";
+    public static final String MESSAGE_BUS_DESTINATION = "message_bus.destination";
+    public static final String DB_POOL_NAME = "db.pool.name";
+    public static final String BASE_HASH = "_dd.propagated_hash";
+
+    public static final String TEST_SESSION_NAME = "test_session.name";
+    public static final String TEST_MODULE = "test.module";
+    public static final String TEST_SUITE = "test.suite";
+    public static final String TEST_NAME = "test.name";
+    public static final String TEST_STATUS = "test.status";
+    public static final String TEST_FINAL_STATUS = "test.final_status";
+    public static final String TEST_FRAMEWORK = "test.framework";
+    public static final String TEST_FRAMEWORK_VERSION = "test.framework_version";
+    public static final String TEST_SKIP_REASON = "test.skip_reason";
+    public static final String TEST_SKIPPED_BY_ITR = "test.skipped_by_itr";
+    public static final String TEST_TYPE = "test.type";
+    public static final String TEST_PARAMETERS = "test.parameters";
+    public static final String TEST_CODEOWNERS = "test.codeowners";
+    public static final String TEST_SOURCE_FILE = "test.source.file";
+    public static final String TEST_SOURCE_CLASS = "test.source.class";
+    public static final String TEST_SOURCE_METHOD = "test.source.method";
+    public static final String TEST_SOURCE_START = "test.source.start";
+    public static final String TEST_SOURCE_END = "test.source.end";
+    public static final String TEST_TRAITS = "test.traits";
+    public static final String TEST_COMMAND = "test.command";
+    public static final String TEST_TOOLCHAIN = "test.toolchain";
+    public static final String TEST_EXECUTION = "test.execution";
+    public static final String TEST_GRADLE_NESTED_BUILD = "test.gradle.nested_build";
+    public static final String TEST_IS_RUM_ACTIVE = "test.is_rum_active";
+    public static final String TEST_BROWSER_DRIVER = "test.browser.driver";
+    public static final String TEST_BROWSER_DRIVER_VERSION = "test.browser.driver_version";
+    public static final String TEST_BROWSER_NAME = "test.browser.name";
+    public static final String TEST_BROWSER_VERSION = "test.browser.version";
+    public static final String TEST_CALLBACK = "test.callback";
+    public static final String TEST_ANDROID_API_LEVEL = "test.android.api_level";
+    public static final String TEST_ANDROID_RELEASE = "test.android.release";
+    public static final String TEST_ANDROID_CODENAME = "test.android.codename";
+    public static final String TEST_ANDROID_ROBOLECTRIC_VERSION = "test.android.robolectric.version";
+
+    public static final String TEST_IS_ANDROID = "test.is_android";
+
+    public static final String TEST_SESSION_ID = "test_session_id";
+    public static final String TEST_MODULE_ID = "test_module_id";
+    public static final String TEST_SUITE_ID = "test_suite_id";
+    public static final String ITR_CORRELATION_ID = "itr_correlation_id";
+    public static final String TEST_CODE_COVERAGE_ENABLED = "test.code_coverage.enabled";
+    public static final String TEST_CODE_COVERAGE_LINES_PERCENTAGE = "test.code_coverage.lines_pct";
+    public static final String TEST_CODE_COVERAGE_BACKFILLED = "test.code_coverage.backfilled";
+    public static final String TEST_ITR_TESTS_SKIPPING_ENABLED = "test.itr.tests_skipping.enabled";
+    public static final String TEST_ITR_TESTS_SKIPPING_TYPE = "test.itr.tests_skipping.type";
+    public static final String TEST_ITR_TESTS_SKIPPING_COUNT = "test.itr.tests_skipping.count";
+    public static final String TEST_ITR_UNSKIPPABLE = "test.itr.unskippable";
+    public static final String TEST_ITR_FORCED_RUN = "test.itr.forced_run";
+    public static final String TEST_EARLY_FLAKE_ENABLED = "test.early_flake.enabled";
+    public static final String TEST_EARLY_FLAKE_ABORT_REASON = "test.early_flake.abort_reason";
+    public static final String TEST_IS_NEW = "test.is_new";
+    public static final String TEST_IS_RETRY = "test.is_retry";
+    public static final String TEST_RETRY_REASON = "test.retry_reason";
+    public static final String TEST_JUNIT_IS_DYNAMIC = "test.junit5.is_dynamic";
+    public static final String TEST_IS_MODIFIED = "test.is_modified";
+    public static final String TEST_HAS_FAILED_ALL_RETRIES = "test.has_failed_all_retries";
+    public static final String TEST_FAILURE_SUPPRESSED = "test.failure_suppressed";
+    public static final String TEST_TEST_MANAGEMENT_ENABLED = "test.test_management.enabled";
+    public static final String TEST_TEST_MANAGEMENT_IS_QUARANTINED = "test.test_management.is_quarantined";
+    public static final String TEST_TEST_MANAGEMENT_IS_TEST_DISABLED = "test.test_management.is_test_disabled";
+    public static final String TEST_TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX = "test.test_management.is_attempt_to_fix";
+    public static final String TEST_TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED =
+            "test.test_management.attempt_to_fix_passed";
+
+    public static final String ERROR_DEBUG_INFO_CAPTURED = "error.debug_info_captured";
+
+    public static final String CI_PROVIDER_NAME = "ci.provider.name";
+    public static final String CI_PIPELINE_ID = "ci.pipeline.id";
+    public static final String CI_PIPELINE_NAME = "ci.pipeline.name";
+    public static final String CI_PIPELINE_DISPLAY_NAME = "ci.pipeline.display_name";
+    public static final String CI_PIPELINE_NUMBER = "ci.pipeline.number";
+    public static final String CI_PIPELINE_URL = "ci.pipeline.url";
+    public static final String CI_STAGE_NAME = "ci.stage.name";
+    public static final String CI_JOB_ID = "ci.job.id";
+    public static final String CI_JOB_NAME = "ci.job.name";
+    public static final String CI_JOB_URL = "ci.job.url";
+    public static final String CI_WORKSPACE_PATH = "ci.workspace_path";
+    public static final String CI_NODE_NAME = "ci.node.name";
+    public static final String CI_NODE_LABELS = "ci.node.labels";
+
+    public static final String GIT_REPOSITORY_URL = "git.repository_url";
+    public static final String GIT_COMMIT_SHA = "git.commit.sha";
+    public static final String GIT_COMMIT_AUTHOR_NAME = "git.commit.author.name";
+    public static final String GIT_COMMIT_AUTHOR_EMAIL = "git.commit.author.email";
+    public static final String GIT_COMMIT_AUTHOR_DATE = "git.commit.author.date";
+    public static final String GIT_COMMIT_COMMITTER_NAME = "git.commit.committer.name";
+    public static final String GIT_COMMIT_COMMITTER_EMAIL = "git.commit.committer.email";
+    public static final String GIT_COMMIT_COMMITTER_DATE = "git.commit.committer.date";
+    public static final String GIT_COMMIT_MESSAGE = "git.commit.message";
+    public static final String GIT_BRANCH = "git.branch";
+    public static final String GIT_TAG = "git.tag";
+    public static final String GIT_PULL_REQUEST_BASE_BRANCH = "git.pull_request.base_branch";
+    public static final String GIT_PULL_REQUEST_BASE_BRANCH_SHA = "git.pull_request.base_branch_sha";
+    public static final String GIT_PULL_REQUEST_BASE_BRANCH_HEAD_SHA = "git.pull_request.base_branch_head_sha";
+    public static final String GIT_COMMIT_HEAD_SHA = "git.commit.head.sha";
+    public static final String GIT_COMMIT_HEAD_AUTHOR_NAME = "git.commit.head.author.name";
+    public static final String GIT_COMMIT_HEAD_AUTHOR_EMAIL = "git.commit.head.author.email";
+    public static final String GIT_COMMIT_HEAD_AUTHOR_DATE = "git.commit.head.author.date";
+    public static final String GIT_COMMIT_HEAD_COMMITTER_NAME = "git.commit.head.committer.name";
+    public static final String GIT_COMMIT_HEAD_COMMITTER_EMAIL = "git.commit.head.committer.email";
+    public static final String GIT_COMMIT_HEAD_COMMITTER_DATE = "git.commit.head.committer.date";
+    public static final String GIT_COMMIT_HEAD_MESSAGE = "git.commit.head.message";
+    public static final String PULL_REQUEST_NUMBER = "pr.number";
+
+    public static final String RUNTIME_NAME = "runtime.name";
+    public static final String RUNTIME_VENDOR = "runtime.vendor";
+    public static final String RUNTIME_VERSION = "runtime.version";
+    public static final String OS_ARCHITECTURE = "os.architecture";
+    public static final String OS_PLATFORM = "os.platform";
+    public static final String OS_VERSION = "os.version";
+
+    public static final String DD_SERVICE = "dd.service";
+    public static final String DD_VERSION = "dd.version";
+    public static final String DD_ENV = "dd.env";
+
+    public static final String ENV = "env";
+    public static final String VERSION = "version";
+
+    /** ASM force tracer to keep the trace */
+    public static final String ASM_KEEP = "asm.keep";
+
+    /** AI Guard force tracer to keep the trace */
+    public static final String AI_GUARD_KEEP = "ai_guard.keep";
+
+    /** Marks a span as originating from an AI Guard evaluation */
+    public static final String AI_GUARD_EVENT = "ai_guard.event";
+
+    public static final String PROPAGATED_TRACE_SOURCE = "_dd.p.ts";
+    public static final String PROPAGATED_DEBUG = "_dd.p.debug";
+
+    public static final String LLMOBS_LLM_SPAN_KIND = "llm";
+    public static final String LLMOBS_WORKFLOW_SPAN_KIND = "workflow";
+    public static final String LLMOBS_TASK_SPAN_KIND = "task";
+    public static final String LLMOBS_AGENT_SPAN_KIND = "agent";
+    public static final String LLMOBS_TOOL_SPAN_KIND = "tool";
+    public static final String LLMOBS_EMBEDDING_SPAN_KIND = "embedding";
+    public static final String LLMOBS_RETRIEVAL_SPAN_KIND = "retrieval";
+    public static final String DSM_TRANSACTION_ID = "dsm.transaction.id";
+    public static final String DSM_TRANSACTION_CHECKPOINT = "dsm.transaction.checkpoint";
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TaskWrapper.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TaskWrapper.java
index 3315ab3e8b2..6d66b06553f 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TaskWrapper.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TaskWrapper.java
@@ -1,15 +1,15 @@
 package datadog.trace.bootstrap.instrumentation.api;
 
 public interface TaskWrapper {
-  static Class<?> getUnwrappedType(Object task) {
-    int depth = 0;
-    Object inspected = task;
-    while (depth < 5 && inspected instanceof TaskWrapper) {
-      inspected = ((TaskWrapper) inspected).$$DD$$__unwrap();
-      depth++;
+    static Class<?> getUnwrappedType(Object task) {
+        int depth = 0;
+        Object inspected = task;
+        while (depth < 5 && inspected instanceof TaskWrapper) {
+            inspected = ((TaskWrapper) inspected).$$DD$$__unwrap();
+            depth++;
+        }
+        return inspected == null ? null : inspected.getClass();
     }
-    return inspected == null ? null : inspected.getClass();
-  }
 
-  Object $$DD$$__unwrap();
+    Object $$DD$$__unwrap();
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIDataAdapter.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIDataAdapter.java
index e2511b6e4be..48510e45d87 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIDataAdapter.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIDataAdapter.java
@@ -1,43 +1,43 @@
 package datadog.trace.bootstrap.instrumentation.api;
 
 public interface URIDataAdapter {
-  /** The scheme of this URI. Can never be encoded. */
-  String scheme();
+    /** The scheme of this URI. Can never be encoded. */
+    String scheme();
 
-  /** The host of this URI. Can never be encoded. */
-  String host();
+    /** The host of this URI. Can never be encoded. */
+    String host();
 
-  /** The port number of this URI. */
-  int port();
+    /** The port number of this URI. */
+    int port();
 
-  /** The decoded path of this URI. */
-  String path();
+    /** The decoded path of this URI. */
+    String path();
 
-  /** The decoded fragment of this URI. */
-  String fragment();
+    /** The decoded fragment of this URI. */
+    String fragment();
 
-  /** The decoded query string of this URI. */
-  String query();
+    /** The decoded query string of this URI. */
+    String query();
 
-  /** Does this adapter support raw encoded access? */
-  boolean supportsRaw();
+    /** Does this adapter support raw encoded access? */
+    boolean supportsRaw();
 
-  /** The raw path of this URI. */
-  String rawPath();
+    /** The raw path of this URI. */
+    String rawPath();
 
-  /** Does the raw query string have '+' encoded spaces? */
-  boolean hasPlusEncodedSpaces();
+    /** Does the raw query string have '+' encoded spaces? */
+    boolean hasPlusEncodedSpaces();
 
-  /** The raw query string of this URI. */
-  String rawQuery();
+    /** The raw query string of this URI. */
+    String rawQuery();
 
-  /** The raw path(?query) of this URI. */
-  String raw();
+    /** The raw path(?query) of this URI. */
+    String raw();
 
-  /**
-   * The URI is a valid one or not (looks malformed)
-   *
-   * @return {@code true} if the URI is valid, {@code false} if it looks malformed
-   */
-  boolean isValid();
+    /**
+     * The URI is a valid one or not (looks malformed)
+     *
+     * @return {@code true} if the URI is valid, {@code false} if it looks malformed
+     */
+    boolean isValid();
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIDataAdapterBase.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIDataAdapterBase.java
index 0587e0c7644..c30dee1638d 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIDataAdapterBase.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIDataAdapterBase.java
@@ -6,45 +6,45 @@
 
 @SuppressFBWarnings(value = "DM_STRING_CTOR", justification = "Unique instance needs constructor")
 public abstract class URIDataAdapterBase implements URIDataAdapter {
-  /** Unique instance that signifies an uninitialized field, to allow for == comparison */
-  protected static final String UNINITIALIZED = new String("uninitialized");
+    /** Unique instance that signifies an uninitialized field, to allow for == comparison */
+    protected static final String UNINITIALIZED = new String("uninitialized");
 
-  private String raw = supportsRaw() ? UNINITIALIZED : null;
+    private String raw = supportsRaw() ? UNINITIALIZED : null;
 
-  @Override
-  public boolean hasPlusEncodedSpaces() {
-    return false;
-  }
+    @Override
+    public boolean hasPlusEncodedSpaces() {
+        return false;
+    }
 
-  @Override
-  public String raw() {
-    String raw = this.raw;
-    if (raw == UNINITIALIZED) {
-      String p = rawPath();
-      String q = rawQuery();
-      StringBuilder builder = new StringBuilder();
-      if (null != p && !p.isEmpty()) {
-        builder.append(p);
-      }
-      if (null != q && !q.isEmpty()) {
-        builder.append('?');
-        builder.append(q);
-      }
-      this.raw = raw = builder.toString();
+    @Override
+    public String raw() {
+        String raw = this.raw;
+        if (raw == UNINITIALIZED) {
+            String p = rawPath();
+            String q = rawQuery();
+            StringBuilder builder = new StringBuilder();
+            if (null != p && !p.isEmpty()) {
+                builder.append(p);
+            }
+            if (null != q && !q.isEmpty()) {
+                builder.append('?');
+                builder.append(q);
+            }
+            this.raw = raw = builder.toString();
+        }
+        return raw;
     }
-    return raw;
-  }
 
-  @Override
-  public boolean isValid() {
-    return true;
-  }
+    @Override
+    public boolean isValid() {
+        return true;
+    }
 
-  public static URIDataAdapter fromURI(String uri, Function<URI, URIDataAdapter> mapper) {
-    final URI parsed = URIUtils.safeParse(uri);
-    if (parsed != null) {
-      return mapper.apply(parsed);
+    public static URIDataAdapter fromURI(String uri, Function<URI, URIDataAdapter> mapper) {
+        final URI parsed = URIUtils.safeParse(uri);
+        if (parsed != null) {
+            return mapper.apply(parsed);
+        }
+        return new UnparseableURIDataAdapter(uri);
     }
-    return new UnparseableURIDataAdapter(uri);
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIDefaultDataAdapter.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIDefaultDataAdapter.java
index 6392aad2d4e..84cdc9ef313 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIDefaultDataAdapter.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIDefaultDataAdapter.java
@@ -4,54 +4,54 @@
 
 public class URIDefaultDataAdapter extends URIDataAdapterBase {
 
-  private final URI uri;
-
-  public URIDefaultDataAdapter(URI uri) {
-    this.uri = uri;
-  }
-
-  @Override
-  public String scheme() {
-    return uri.getScheme();
-  }
-
-  @Override
-  public String host() {
-    return uri.getHost();
-  }
-
-  @Override
-  public int port() {
-    return uri.getPort();
-  }
-
-  @Override
-  public String path() {
-    return uri.getPath();
-  }
-
-  @Override
-  public String fragment() {
-    return uri.getFragment();
-  }
-
-  @Override
-  public String query() {
-    return uri.getQuery();
-  }
-
-  @Override
-  public boolean supportsRaw() {
-    return true;
-  }
-
-  @Override
-  public String rawPath() {
-    return uri.getRawPath();
-  }
-
-  @Override
-  public String rawQuery() {
-    return uri.getRawQuery();
-  }
+    private final URI uri;
+
+    public URIDefaultDataAdapter(URI uri) {
+        this.uri = uri;
+    }
+
+    @Override
+    public String scheme() {
+        return uri.getScheme();
+    }
+
+    @Override
+    public String host() {
+        return uri.getHost();
+    }
+
+    @Override
+    public int port() {
+        return uri.getPort();
+    }
+
+    @Override
+    public String path() {
+        return uri.getPath();
+    }
+
+    @Override
+    public String fragment() {
+        return uri.getFragment();
+    }
+
+    @Override
+    public String query() {
+        return uri.getQuery();
+    }
+
+    @Override
+    public boolean supportsRaw() {
+        return true;
+    }
+
+    @Override
+    public String rawPath() {
+        return uri.getRawPath();
+    }
+
+    @Override
+    public String rawQuery() {
+        return uri.getRawQuery();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIRawDataAdapter.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIRawDataAdapter.java
index d02af4ead12..b3bf10218bd 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIRawDataAdapter.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIRawDataAdapter.java
@@ -1,55 +1,55 @@
 package datadog.trace.bootstrap.instrumentation.api;
 
 public abstract class URIRawDataAdapter extends URIDataAdapterBase {
-  private String decodedPath = UNINITIALIZED;
-  private String decodedQuery = UNINITIALIZED;
-  private String rawPath = UNINITIALIZED;
-  private String rawQuery = UNINITIALIZED;
-
-  protected abstract String innerRawPath();
-
-  protected abstract String innerRawQuery();
+    private String decodedPath = UNINITIALIZED;
+    private String decodedQuery = UNINITIALIZED;
+    private String rawPath = UNINITIALIZED;
+    private String rawQuery = UNINITIALIZED;
+
+    protected abstract String innerRawPath();
+
+    protected abstract String innerRawQuery();
+
+    @Override
+    public final String path() {
+        String path = decodedPath;
+        if (path != UNINITIALIZED) {
+            return path;
+        }
+        decodedPath = path = URIUtils.decode(rawPath());
+        return path;
+    }
 
-  @Override
-  public final String path() {
-    String path = decodedPath;
-    if (path != UNINITIALIZED) {
-      return path;
+    @Override
+    public final String query() {
+        String query = decodedQuery;
+        if (query != UNINITIALIZED) {
+            return query;
+        }
+        decodedQuery = query = URIUtils.decode(rawQuery(), hasPlusEncodedSpaces());
+        return query;
     }
-    decodedPath = path = URIUtils.decode(rawPath());
-    return path;
-  }
-
-  @Override
-  public final String query() {
-    String query = decodedQuery;
-    if (query != UNINITIALIZED) {
-      return query;
+
+    @Override
+    public final boolean supportsRaw() {
+        return true;
     }
-    decodedQuery = query = URIUtils.decode(rawQuery(), hasPlusEncodedSpaces());
-    return query;
-  }
-
-  @Override
-  public final boolean supportsRaw() {
-    return true;
-  }
-
-  @Override
-  public final String rawPath() {
-    String path = rawPath;
-    if (path == UNINITIALIZED) {
-      rawPath = path = innerRawPath();
+
+    @Override
+    public final String rawPath() {
+        String path = rawPath;
+        if (path == UNINITIALIZED) {
+            rawPath = path = innerRawPath();
+        }
+        return path;
     }
-    return path;
-  }
-
-  @Override
-  public final String rawQuery() {
-    String query = rawQuery;
-    if (query == UNINITIALIZED) {
-      rawQuery = query = innerRawQuery();
+
+    @Override
+    public final String rawQuery() {
+        String query = rawQuery;
+        if (query == UNINITIALIZED) {
+            rawQuery = query = innerRawQuery();
+        }
+        return query;
     }
-    return query;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIUtils.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIUtils.java
index 5f1fd20504e..5a685fd902c 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIUtils.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIUtils.java
@@ -13,292 +13,289 @@
 import org.slf4j.LoggerFactory;
 
 public class URIUtils {
-  private URIUtils() {}
+    private URIUtils() {}
 
-  // This is the � character, which is also the default replacement for the UTF_8 charset
-  private static final byte[] REPLACEMENT = {(byte) 0xEF, (byte) 0xBF, (byte) 0xBD};
+    // This is the � character, which is also the default replacement for the UTF_8 charset
+    private static final byte[] REPLACEMENT = {(byte) 0xEF, (byte) 0xBF, (byte) 0xBD};
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(URIUtils.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(URIUtils.class);
 
-  /**
-   * Decodes a %-encoded UTF-8 {@code String} into a regular {@code String}.
-   *
-   * <p>All illegal % sequences and illegal UTF-8 sequences are replaced with one or more �
-   * characters.
-   */
-  public static String decode(String encoded) {
-    return decode(encoded, false);
-  }
+    /**
+     * Decodes a %-encoded UTF-8 {@code String} into a regular {@code String}.
+     *
+     * <p>All illegal % sequences and illegal UTF-8 sequences are replaced with one or more �
+     * characters.
+     */
+    public static String decode(String encoded) {
+        return decode(encoded, false);
+    }
 
-  /**
-   * Decodes a %-encoded UTF-8 {@code String} into a regular {@code String}. Can also be made to
-   * decode '+' to ' ' to support old query strings.
-   *
-   * <p>All illegal % sequences and illegal UTF-8 sequences are replaced with one or more �
-   * characters.
-   */
-  public static String decode(String encoded, boolean plusToSpace) {
-    if (encoded == null) return null;
-    int len = encoded.length();
-    if (len == 0) return encoded;
-    if (encoded.indexOf('%') < 0 && (!plusToSpace || encoded.indexOf('+') < 0)) return encoded;
+    /**
+     * Decodes a %-encoded UTF-8 {@code String} into a regular {@code String}. Can also be made to
+     * decode '+' to ' ' to support old query strings.
+     *
+     * <p>All illegal % sequences and illegal UTF-8 sequences are replaced with one or more �
+     * characters.
+     */
+    public static String decode(String encoded, boolean plusToSpace) {
+        if (encoded == null) return null;
+        int len = encoded.length();
+        if (len == 0) return encoded;
+        if (encoded.indexOf('%') < 0 && (!plusToSpace || encoded.indexOf('+') < 0)) return encoded;
 
-    ByteBuffer bb =
-        ByteBuffer.allocate(len + 2); // The extra 2 is if we have a % last and need to replace it
-    for (int i = 0; i < len; i++) {
-      int c = encoded.charAt(i);
-      if (c == '%') {
-        if (i + 2 < len) {
-          int h = Character.digit(encoded.charAt(i + 1), 16);
-          int l = Character.digit(encoded.charAt(i + 2), 16);
-          if ((h | l) < 0) {
-            bb.put(REPLACEMENT[0]);
-            bb.put(REPLACEMENT[1]);
-            bb.put(REPLACEMENT[2]);
-          } else {
-            bb.put((byte) ((h << 4) + l));
-          }
-          i += 2;
+        ByteBuffer bb = ByteBuffer.allocate(len + 2); // The extra 2 is if we have a % last and need to replace it
+        for (int i = 0; i < len; i++) {
+            int c = encoded.charAt(i);
+            if (c == '%') {
+                if (i + 2 < len) {
+                    int h = Character.digit(encoded.charAt(i + 1), 16);
+                    int l = Character.digit(encoded.charAt(i + 2), 16);
+                    if ((h | l) < 0) {
+                        bb.put(REPLACEMENT[0]);
+                        bb.put(REPLACEMENT[1]);
+                        bb.put(REPLACEMENT[2]);
+                    } else {
+                        bb.put((byte) ((h << 4) + l));
+                    }
+                    i += 2;
+                } else {
+                    bb.put(REPLACEMENT[0]);
+                    bb.put(REPLACEMENT[1]);
+                    bb.put(REPLACEMENT[2]);
+                    i = len;
+                }
+            } else {
+                if (plusToSpace && c == '+') {
+                    c = ' ';
+                }
+                bb.put((byte) c);
+            }
+        }
+        bb.flip();
+        return new String(bb.array(), 0, bb.limit(), StandardCharsets.UTF_8);
+    }
+
+    /**
+     * Build a URL based on the scheme, host, port and path.
+     *
+     * <p>Will remove the port if it is <= 0 or if its the default http/https port.
+     */
+    public static String buildURL(String scheme, String host, int port, String path) {
+        int length = 0;
+        length += null == scheme ? 0 : scheme.length() + 3;
+        if (null != host) {
+            length += host.length();
+            if (port > 0 && port != 80 && port != 443) {
+                length += 6;
+            }
+        }
+        if (null == path || path.isEmpty()) {
+            ++length;
         } else {
-          bb.put(REPLACEMENT[0]);
-          bb.put(REPLACEMENT[1]);
-          bb.put(REPLACEMENT[2]);
-          i = len;
+            if (path.charAt(0) != '/') {
+                ++length;
+            }
+            length += path.length();
         }
-      } else {
-        if (plusToSpace && c == '+') {
-          c = ' ';
+        final StringBuilder urlNoParams = new StringBuilder(length);
+        if (scheme != null) {
+            urlNoParams.append(scheme);
+            urlNoParams.append("://");
         }
-        bb.put((byte) c);
-      }
-    }
-    bb.flip();
-    return new String(bb.array(), 0, bb.limit(), StandardCharsets.UTF_8);
-  }
 
-  /**
-   * Build a URL based on the scheme, host, port and path.
-   *
-   * <p>Will remove the port if it is <= 0 or if its the default http/https port.
-   */
-  public static String buildURL(String scheme, String host, int port, String path) {
-    int length = 0;
-    length += null == scheme ? 0 : scheme.length() + 3;
-    if (null != host) {
-      length += host.length();
-      if (port > 0 && port != 80 && port != 443) {
-        length += 6;
-      }
-    }
-    if (null == path || path.isEmpty()) {
-      ++length;
-    } else {
-      if (path.charAt(0) != '/') {
-        ++length;
-      }
-      length += path.length();
-    }
-    final StringBuilder urlNoParams = new StringBuilder(length);
-    if (scheme != null) {
-      urlNoParams.append(scheme);
-      urlNoParams.append("://");
-    }
+        if (host != null) {
+            urlNoParams.append(host);
+            if (port > 0 && !(port == 80 && "http".equals(scheme) || port == 443 && "https".equals(scheme))) {
+                urlNoParams.append(':');
+                urlNoParams.append(port);
+            }
+        }
 
-    if (host != null) {
-      urlNoParams.append(host);
-      if (port > 0
-          && !(port == 80 && "http".equals(scheme) || port == 443 && "https".equals(scheme))) {
-        urlNoParams.append(':');
-        urlNoParams.append(port);
-      }
+        if (null == path || path.isEmpty()) {
+            urlNoParams.append('/');
+        } else {
+            if (path.charAt(0) != '/' && urlNoParams.length() > 0) {
+                urlNoParams.append('/');
+            }
+            urlNoParams.append(path);
+        }
+        return urlNoParams.toString();
     }
 
-    if (null == path || path.isEmpty()) {
-      urlNoParams.append('/');
-    } else {
-      if (path.charAt(0) != '/' && urlNoParams.length() > 0) {
-        urlNoParams.append('/');
-      }
-      urlNoParams.append(path);
+    public static URI safeParse(final String unparsed) {
+        if (unparsed == null) {
+            return null;
+        }
+        try {
+            return PropagationUtils.onUriCreate(unparsed, URI.create(unparsed));
+        } catch (final IllegalArgumentException exception) {
+            LOGGER.debug(EXCLUDE_TELEMETRY, "Unable to parse request uri {}", unparsed, exception);
+            return null;
+        }
     }
-    return urlNoParams.toString();
-  }
 
-  public static URI safeParse(final String unparsed) {
-    if (unparsed == null) {
-      return null;
-    }
-    try {
-      return PropagationUtils.onUriCreate(unparsed, URI.create(unparsed));
-    } catch (final IllegalArgumentException exception) {
-      LOGGER.debug(EXCLUDE_TELEMETRY, "Unable to parse request uri {}", unparsed, exception);
-      return null;
+    /**
+     * Builds a lazily evaluated valid URL based on the scheme, host, port and path.
+     *
+     * <p>Will remove the port if it is <= 0 or if its the default http/https port.
+     *
+     * @param scheme The scheme
+     * @param host The host
+     * @param port The port
+     * @param path The path
+     * @return The {@code LazyUrl}
+     */
+    public static LazyUrl lazyValidURL(String scheme, String host, int port, String path) {
+        return new ValidUrl(scheme, host, port, path);
     }
-  }
-
-  /**
-   * Builds a lazily evaluated valid URL based on the scheme, host, port and path.
-   *
-   * <p>Will remove the port if it is <= 0 or if its the default http/https port.
-   *
-   * @param scheme The scheme
-   * @param host The host
-   * @param port The port
-   * @param path The path
-   * @return The {@code LazyUrl}
-   */
-  public static LazyUrl lazyValidURL(String scheme, String host, int port, String path) {
-    return new ValidUrl(scheme, host, port, path);
-  }
 
-  /**
-   * Builds an invalid URL from a raw string representation.
-   *
-   * @param raw The raw {@code String} representation of the invalid URL
-   * @return The {@code LazyUrl}
-   */
-  public static LazyUrl lazyInvalidUrl(String raw) {
-    return new InvalidUrl(raw);
-  }
-
-  public static String urlFileName(String raw) {
-    try {
-      URL url = new URL(raw);
-      String path = url.getPath();
-      int nameEnd = path.length() - 1;
-      while (nameEnd >= 0 && path.charAt(nameEnd) == '/') {
-        nameEnd--;
-      }
-      if (nameEnd < 0) {
-        return "";
-      }
-      String name = path.substring(path.lastIndexOf('/', nameEnd) + 1, nameEnd + 1);
-      return name;
-    } catch (MalformedURLException e) {
-      return "";
+    /**
+     * Builds an invalid URL from a raw string representation.
+     *
+     * @param raw The raw {@code String} representation of the invalid URL
+     * @return The {@code LazyUrl}
+     */
+    public static LazyUrl lazyInvalidUrl(String raw) {
+        return new InvalidUrl(raw);
     }
-  }
 
-  /**
-   * A lazily evaluated URL that can also return its path. If the URL is invalid the path will be
-   * {@code null}.
-   */
-  public abstract static class LazyUrl implements CharSequence, Supplier<String> {
-    protected String lazy;
-
-    protected LazyUrl(String lazy) {
-      this.lazy = lazy;
+    public static String urlFileName(String raw) {
+        try {
+            URL url = new URL(raw);
+            String path = url.getPath();
+            int nameEnd = path.length() - 1;
+            while (nameEnd >= 0 && path.charAt(nameEnd) == '/') {
+                nameEnd--;
+            }
+            if (nameEnd < 0) {
+                return "";
+            }
+            String name = path.substring(path.lastIndexOf('/', nameEnd) + 1, nameEnd + 1);
+            return name;
+        } catch (MalformedURLException e) {
+            return "";
+        }
     }
 
     /**
-     * The path component of this URL.
-     *
-     * @return The path if valid or {@code null} if invalid
+     * A lazily evaluated URL that can also return its path. If the URL is invalid the path will be
+     * {@code null}.
      */
-    public abstract String path();
+    public abstract static class LazyUrl implements CharSequence, Supplier<String> {
+        protected String lazy;
 
-    @Override
-    public String toString() {
-      String str = lazy;
-      if (str == null) {
-        str = lazy = get();
-      }
-      return str;
-    }
+        protected LazyUrl(String lazy) {
+            this.lazy = lazy;
+        }
 
-    @Override
-    public int length() {
-      return toString().length();
-    }
+        /**
+         * The path component of this URL.
+         *
+         * @return The path if valid or {@code null} if invalid
+         */
+        public abstract String path();
 
-    @Override
-    public char charAt(int index) {
-      return toString().charAt(index);
-    }
+        @Override
+        public String toString() {
+            String str = lazy;
+            if (str == null) {
+                str = lazy = get();
+            }
+            return str;
+        }
 
-    @Override
-    public CharSequence subSequence(int start, int end) {
-      return toString().subSequence(start, end);
-    }
+        @Override
+        public int length() {
+            return toString().length();
+        }
 
-    @Override
-    public int hashCode() {
-      return toString().hashCode();
-    }
-  }
+        @Override
+        public char charAt(int index) {
+            return toString().charAt(index);
+        }
 
-  private static class ValidUrl extends LazyUrl {
-    private final String scheme;
-    private final String host;
-    private final int port;
-    private final String path;
+        @Override
+        public CharSequence subSequence(int start, int end) {
+            return toString().subSequence(start, end);
+        }
 
-    private ValidUrl(String scheme, String host, int port, String path) {
-      super(null);
-      this.scheme = scheme;
-      this.host = host;
-      this.port = port;
-      if (null == path || path.isEmpty()) {
-        this.path = "";
-      } else {
-        this.path = path;
-      }
+        @Override
+        public int hashCode() {
+            return toString().hashCode();
+        }
     }
 
-    @Override
-    public String path() {
-      return path;
-    }
+    private static class ValidUrl extends LazyUrl {
+        private final String scheme;
+        private final String host;
+        private final int port;
+        private final String path;
 
-    @Override
-    public String get() {
-      String res = lazy;
-      return res != null ? res : buildURL(scheme, host, port, path);
-    }
-  }
+        private ValidUrl(String scheme, String host, int port, String path) {
+            super(null);
+            this.scheme = scheme;
+            this.host = host;
+            this.port = port;
+            if (null == path || path.isEmpty()) {
+                this.path = "";
+            } else {
+                this.path = path;
+            }
+        }
 
-  private static class InvalidUrl extends LazyUrl {
-    public InvalidUrl(String raw) {
-      super(String.valueOf(raw));
-    }
+        @Override
+        public String path() {
+            return path;
+        }
 
-    @Override
-    public String path() {
-      return null;
+        @Override
+        public String get() {
+            String res = lazy;
+            return res != null ? res : buildURL(scheme, host, port, path);
+        }
     }
 
-    @Override
-    public String get() {
-      return lazy;
-    }
-  }
+    private static class InvalidUrl extends LazyUrl {
+        public InvalidUrl(String raw) {
+            super(String.valueOf(raw));
+        }
 
-  /**
-   * Concatenate two URI parts to form the complete one. Mostly used for apache http client
-   * instrumentations
-   *
-   * @param schemeHostPort the first part (usually <code>http://host:port</code>)
-   * @param theRest the rest of the uri (e.g. <code>/path?query#fragment</code>
-   * @return the full URI or <code>null</code> if fails to parse
-   */
-  public static URI safeConcat(final String schemeHostPort, final String theRest) {
-    if (schemeHostPort == null && theRest == null) {
-      return null;
-    }
-    final String part1 = schemeHostPort != null ? schemeHostPort : "";
-    final String part2 = theRest != null ? theRest : "";
-    if (part2.startsWith(part1)) {
-      return safeParse(part2);
+        @Override
+        public String path() {
+            return null;
+        }
+
+        @Override
+        public String get() {
+            return lazy;
+        }
     }
-    final boolean addSlash = !(part2.startsWith("/") || part1.endsWith("/"));
-    final StringBuilder sb =
-        new StringBuilder(part1.length() + part2.length() + (addSlash ? 1 : 0));
-    PropagationUtils.onStringBuilderAppend(part1, sb.append(part1));
-    if (addSlash) {
-      // it happens for http async client 4 with relative URI
-      sb.append('/');
+
+    /**
+     * Concatenate two URI parts to form the complete one. Mostly used for apache http client
+     * instrumentations
+     *
+     * @param schemeHostPort the first part (usually <code>http://host:port</code>)
+     * @param theRest the rest of the uri (e.g. <code>/path?query#fragment</code>
+     * @return the full URI or <code>null</code> if fails to parse
+     */
+    public static URI safeConcat(final String schemeHostPort, final String theRest) {
+        if (schemeHostPort == null && theRest == null) {
+            return null;
+        }
+        final String part1 = schemeHostPort != null ? schemeHostPort : "";
+        final String part2 = theRest != null ? theRest : "";
+        if (part2.startsWith(part1)) {
+            return safeParse(part2);
+        }
+        final boolean addSlash = !(part2.startsWith("/") || part1.endsWith("/"));
+        final StringBuilder sb = new StringBuilder(part1.length() + part2.length() + (addSlash ? 1 : 0));
+        PropagationUtils.onStringBuilderAppend(part1, sb.append(part1));
+        if (addSlash) {
+            // it happens for http async client 4 with relative URI
+            sb.append('/');
+        }
+        PropagationUtils.onStringBuilderAppend(part2, sb.append(part2));
+        return safeParse(PropagationUtils.onStringBuilderToString(sb, sb.toString()));
     }
-    PropagationUtils.onStringBuilderAppend(part2, sb.append(part2));
-    return safeParse(PropagationUtils.onStringBuilderToString(sb, sb.toString()));
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/UTF8BytesString.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/UTF8BytesString.java
index 9ea332a9a82..373e667af58 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/UTF8BytesString.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/UTF8BytesString.java
@@ -10,137 +10,137 @@
  */
 public final class UTF8BytesString implements CharSequence {
 
-  public static final UTF8BytesString EMPTY = UTF8BytesString.create("");
-
-  public static UTF8BytesString create(CharSequence sequence) {
-    if (null == sequence) {
-      return null;
-    } else if (sequence instanceof UTF8BytesString) {
-      return (UTF8BytesString) sequence;
-    } else {
-      return new UTF8BytesString(String.valueOf(sequence));
-    }
-  }
-
-  public static UTF8BytesString create(byte[] utf8Bytes) {
-    if (null == utf8Bytes) {
-      return null;
-    } else {
-      return new UTF8BytesString(utf8Bytes);
-    }
-  }
-
-  public static UTF8BytesString create(String string, byte[] utf8Bytes) {
-    if (null == utf8Bytes) {
-      return null;
-    } else {
-      return new UTF8BytesString(string, utf8Bytes);
-    }
-  }
-
-  /**
-   * Creates a new {@linkplain UTF8BytesString} instance using the provided {@linkplain ByteBuffer}
-   * <br>
-   * All available data from the current position are read and used as the backing array.
-   *
-   * @param utf8BytesBuffer the byte buffer containing UTF8 data
-   * @return a new {@linkplain UTF8BytesString} instance or {@literal null}
-   */
-  public static UTF8BytesString create(ByteBuffer utf8BytesBuffer) {
-    if (null == utf8BytesBuffer) {
-      return null;
-    } else {
-      byte[] utf8Bytes = new byte[utf8BytesBuffer.remaining()];
-      utf8BytesBuffer.get(utf8Bytes);
-      return new UTF8BytesString(utf8Bytes);
-    }
-  }
-
-  private final String string;
-  private byte[] utf8Bytes;
-  // Lazy hashCode cache. {@link String} already caches its own {@code hashCode} internally, but
-  // the inter-class call through {@code string.hashCode()} still costs a virtual dispatch + the
-  // String's own cached-hash field read + branch -- caching here saves all of that on subsequent
-  // calls. Benign race in the same shape as {@link #utf8Bytes}: two threads computing the same
-  // hash in parallel both produce the same value, and {@code int} writes are atomic per JLS so a
-  // reader cannot observe a partial value.
-  private int cachedHashCode;
-
-  private UTF8BytesString(String string) {
-    this.string = string;
-  }
-
-  private UTF8BytesString(byte[] utf8Bytes) {
-    this(new String(utf8Bytes, UTF_8), utf8Bytes);
-  }
-
-  private UTF8BytesString(String string, byte[] utf8Bytes) {
-    this.string = string;
-    this.utf8Bytes = utf8Bytes;
-  }
-
-  /** Writes the UTF8 encoding of the wrapped {@code String}. */
-  public void transferTo(ByteBuffer buffer) {
-    encodeIfNecessary();
-    buffer.put(utf8Bytes);
-  }
-
-  /** Writes the UTF8 encoding of the wrapped {@code String}. */
-  public byte[] getUtf8Bytes() {
-    encodeIfNecessary();
-    return utf8Bytes;
-  }
-
-  public int encodedLength() {
-    encodeIfNecessary();
-    return utf8Bytes.length;
-  }
-
-  @Override
-  public String toString() {
-    return string;
-  }
-
-  private void encodeIfNecessary() {
-    // benign and intentional race condition
-    if (null == utf8Bytes) {
-      utf8Bytes = string.getBytes(UTF_8);
-    }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null) return false;
-    String that = null;
-    if (o instanceof UTF8BytesString) {
-      that = ((UTF8BytesString) o).string;
-    }
-    return this.string.equals(that);
-  }
-
-  @Override
-  public int hashCode() {
-    int h = this.cachedHashCode;
-    if (h == 0) {
-      h = this.string.hashCode();
-      this.cachedHashCode = h;
-    }
-    return h;
-  }
-
-  @Override
-  public int length() {
-    return this.string.length();
-  }
-
-  @Override
-  public char charAt(int index) {
-    return this.string.charAt(index);
-  }
-
-  @Override
-  public CharSequence subSequence(int start, int end) {
-    return this.string.subSequence(start, end);
-  }
+    public static final UTF8BytesString EMPTY = UTF8BytesString.create("");
+
+    public static UTF8BytesString create(CharSequence sequence) {
+        if (null == sequence) {
+            return null;
+        } else if (sequence instanceof UTF8BytesString) {
+            return (UTF8BytesString) sequence;
+        } else {
+            return new UTF8BytesString(String.valueOf(sequence));
+        }
+    }
+
+    public static UTF8BytesString create(byte[] utf8Bytes) {
+        if (null == utf8Bytes) {
+            return null;
+        } else {
+            return new UTF8BytesString(utf8Bytes);
+        }
+    }
+
+    public static UTF8BytesString create(String string, byte[] utf8Bytes) {
+        if (null == utf8Bytes) {
+            return null;
+        } else {
+            return new UTF8BytesString(string, utf8Bytes);
+        }
+    }
+
+    /**
+     * Creates a new {@linkplain UTF8BytesString} instance using the provided {@linkplain ByteBuffer}
+     * <br>
+     * All available data from the current position are read and used as the backing array.
+     *
+     * @param utf8BytesBuffer the byte buffer containing UTF8 data
+     * @return a new {@linkplain UTF8BytesString} instance or {@literal null}
+     */
+    public static UTF8BytesString create(ByteBuffer utf8BytesBuffer) {
+        if (null == utf8BytesBuffer) {
+            return null;
+        } else {
+            byte[] utf8Bytes = new byte[utf8BytesBuffer.remaining()];
+            utf8BytesBuffer.get(utf8Bytes);
+            return new UTF8BytesString(utf8Bytes);
+        }
+    }
+
+    private final String string;
+    private byte[] utf8Bytes;
+    // Lazy hashCode cache. {@link String} already caches its own {@code hashCode} internally, but
+    // the inter-class call through {@code string.hashCode()} still costs a virtual dispatch + the
+    // String's own cached-hash field read + branch -- caching here saves all of that on subsequent
+    // calls. Benign race in the same shape as {@link #utf8Bytes}: two threads computing the same
+    // hash in parallel both produce the same value, and {@code int} writes are atomic per JLS so a
+    // reader cannot observe a partial value.
+    private int cachedHashCode;
+
+    private UTF8BytesString(String string) {
+        this.string = string;
+    }
+
+    private UTF8BytesString(byte[] utf8Bytes) {
+        this(new String(utf8Bytes, UTF_8), utf8Bytes);
+    }
+
+    private UTF8BytesString(String string, byte[] utf8Bytes) {
+        this.string = string;
+        this.utf8Bytes = utf8Bytes;
+    }
+
+    /** Writes the UTF8 encoding of the wrapped {@code String}. */
+    public void transferTo(ByteBuffer buffer) {
+        encodeIfNecessary();
+        buffer.put(utf8Bytes);
+    }
+
+    /** Writes the UTF8 encoding of the wrapped {@code String}. */
+    public byte[] getUtf8Bytes() {
+        encodeIfNecessary();
+        return utf8Bytes;
+    }
+
+    public int encodedLength() {
+        encodeIfNecessary();
+        return utf8Bytes.length;
+    }
+
+    @Override
+    public String toString() {
+        return string;
+    }
+
+    private void encodeIfNecessary() {
+        // benign and intentional race condition
+        if (null == utf8Bytes) {
+            utf8Bytes = string.getBytes(UTF_8);
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null) return false;
+        String that = null;
+        if (o instanceof UTF8BytesString) {
+            that = ((UTF8BytesString) o).string;
+        }
+        return this.string.equals(that);
+    }
+
+    @Override
+    public int hashCode() {
+        int h = this.cachedHashCode;
+        if (h == 0) {
+            h = this.string.hashCode();
+            this.cachedHashCode = h;
+        }
+        return h;
+    }
+
+    @Override
+    public int length() {
+        return this.string.length();
+    }
+
+    @Override
+    public char charAt(int index) {
+        return this.string.charAt(index);
+    }
+
+    @Override
+    public CharSequence subSequence(int start, int end) {
+        return this.string.subSequence(start, end);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/UnparseableURIDataAdapter.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/UnparseableURIDataAdapter.java
index b85d24e8045..d588c3e733d 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/UnparseableURIDataAdapter.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/UnparseableURIDataAdapter.java
@@ -3,64 +3,64 @@
 import javax.annotation.Nonnull;
 
 public class UnparseableURIDataAdapter extends URIDataAdapterBase {
-  private final String rawUri;
+    private final String rawUri;
 
-  public UnparseableURIDataAdapter(@Nonnull String rawUri) {
-    this.rawUri = rawUri;
-  }
+    public UnparseableURIDataAdapter(@Nonnull String rawUri) {
+        this.rawUri = rawUri;
+    }
 
-  @Override
-  public boolean isValid() {
-    return false;
-  }
+    @Override
+    public boolean isValid() {
+        return false;
+    }
 
-  @Override
-  public String scheme() {
-    return null;
-  }
+    @Override
+    public String scheme() {
+        return null;
+    }
 
-  @Override
-  public String host() {
-    return null;
-  }
+    @Override
+    public String host() {
+        return null;
+    }
 
-  @Override
-  public int port() {
-    return 0;
-  }
+    @Override
+    public int port() {
+        return 0;
+    }
 
-  @Override
-  public String path() {
-    return null;
-  }
+    @Override
+    public String path() {
+        return null;
+    }
 
-  @Override
-  public String fragment() {
-    return null;
-  }
+    @Override
+    public String fragment() {
+        return null;
+    }
 
-  @Override
-  public String query() {
-    return null;
-  }
+    @Override
+    public String query() {
+        return null;
+    }
 
-  @Override
-  public boolean supportsRaw() {
-    return true;
-  }
+    @Override
+    public boolean supportsRaw() {
+        return true;
+    }
 
-  @Override
-  public String rawPath() {
-    return null;
-  }
+    @Override
+    public String rawPath() {
+        return null;
+    }
 
-  @Override
-  public String rawQuery() {
-    return null;
-  }
+    @Override
+    public String rawQuery() {
+        return null;
+    }
 
-  @Override
-  public String raw() {
-    return rawUri;
-  }
+    @Override
+    public String raw() {
+        return rawUri;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/WithAgentSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/WithAgentSpan.java
index 13bd1d7d5d7..593998e1e8d 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/WithAgentSpan.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/WithAgentSpan.java
@@ -1,5 +1,5 @@
 package datadog.trace.bootstrap.instrumentation.api;
 
 public interface WithAgentSpan {
-  AgentSpan asAgentSpan();
+    AgentSpan asAgentSpan();
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/WriterConstants.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/WriterConstants.java
index 724e9296455..9de94769bef 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/WriterConstants.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/WriterConstants.java
@@ -1,13 +1,13 @@
 package datadog.trace.bootstrap.instrumentation.api;
 
 public final class WriterConstants {
-  public static final String DD_AGENT_WRITER_TYPE = "DDAgentWriter";
-  public static final String DD_INTAKE_WRITER_TYPE = "DDIntakeWriter";
-  public static final String LOGGING_WRITER_TYPE = "LoggingWriter";
-  public static final String PRINTING_WRITER_TYPE = "PrintingWriter";
-  public static final String TRACE_STRUCTURE_WRITER_TYPE = "TraceStructureWriter";
-  public static final String MULTI_WRITER_TYPE = "MultiWriter";
-  public static final String OTLP_WRITER_TYPE = "OtlpWriter";
+    public static final String DD_AGENT_WRITER_TYPE = "DDAgentWriter";
+    public static final String DD_INTAKE_WRITER_TYPE = "DDIntakeWriter";
+    public static final String LOGGING_WRITER_TYPE = "LoggingWriter";
+    public static final String PRINTING_WRITER_TYPE = "PrintingWriter";
+    public static final String TRACE_STRUCTURE_WRITER_TYPE = "TraceStructureWriter";
+    public static final String MULTI_WRITER_TYPE = "MultiWriter";
+    public static final String OTLP_WRITER_TYPE = "OtlpWriter";
 
-  private WriterConstants() {}
+    private WriterConstants() {}
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java
index 97b8eb15c29..c898ce5f723 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java
@@ -32,289 +32,280 @@
 /** This class is included here because it needs to injected into the bootstrap clasloader. */
 public class ProcessImplInstrumentationHelpers {
 
-  private static final Logger LOGGER =
-      LoggerFactory.getLogger(ProcessImplInstrumentationHelpers.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProcessImplInstrumentationHelpers.class);
 
-  private static final int LIMIT = 4096;
-  public static final boolean ONLINE;
-  private static final MethodHandle PROCESS_ON_EXIT;
-  private static final Executor EXECUTOR;
+    private static final int LIMIT = 4096;
+    public static final boolean ONLINE;
+    private static final MethodHandle PROCESS_ON_EXIT;
+    private static final Executor EXECUTOR;
 
-  private static final Pattern REDACTED_PARAM_PAT =
-      Pattern.compile(
-          "^(?i)-{0,2}(?:p(?:ass(?:w(?:or)?d)?)?|api_?key|secret|"
-              + "a(?:ccess|uth)_token|mysql_pwd|credentials|(?:stripe)?token)$");
-  private static final Set<String> REDACTED_BINARIES = Collections.singleton("md5");
+    private static final Pattern REDACTED_PARAM_PAT =
+            Pattern.compile("^(?i)-{0,2}(?:p(?:ass(?:w(?:or)?d)?)?|api_?key|secret|"
+                    + "a(?:ccess|uth)_token|mysql_pwd|credentials|(?:stripe)?token)$");
+    private static final Set<String> REDACTED_BINARIES = Collections.singleton("md5");
 
-  // This check is used to avoid command injection exploit prevention if shell injection exploit
-  // prevention checked
-  private static final ThreadLocal<Boolean> checkShi = ThreadLocal.withInitial(() -> false);
+    // This check is used to avoid command injection exploit prevention if shell injection exploit
+    // prevention checked
+    private static final ThreadLocal<Boolean> checkShi = ThreadLocal.withInitial(() -> false);
 
-  static {
-    MethodHandle processOnExit = null;
-    Executor executor = null;
-    try {
-      // java 9
-      processOnExit =
-          MethodHandles.publicLookup()
-              .findVirtual(Process.class, "onExit", methodType(CompletableFuture.class));
-    } catch (Throwable e) {
-      try {
-        // java 8
-        Class<?> unixProcessCls =
-            ClassLoader.getSystemClassLoader().loadClass("java.lang.UNIXProcess");
-        Field f = unixProcessCls.getDeclaredField("processReaperExecutor");
-        f.setAccessible(true);
-        executor = (Executor) f.get(null);
-      } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException ex) {
-      }
-    }
-    PROCESS_ON_EXIT = processOnExit;
-    EXECUTOR = executor;
-    ONLINE = PROCESS_ON_EXIT != null || EXECUTOR != null;
-  }
-
-  private ProcessImplInstrumentationHelpers() {}
-
-  public static void setTags(final AgentSpan span, final String[] origCommand) {
-    String[] command;
-    if (!ActiveSubsystems.APPSEC_ACTIVE) {
-      command = new String[] {origCommand[0]};
-    } else {
-      command = origCommand;
-    }
-    command = redact(command);
-    StringBuilder sb = new StringBuilder("[");
-    long remaining = LIMIT;
-    for (int i = 0; i < command.length; i++) {
-      String cur = command[i];
-      remaining -= cur.length();
-      if (remaining < 0) {
-        span.setTag("cmd.truncated", "true");
-        break;
-      }
-      if (i != 0) {
-        sb.append(',');
-      }
-      sb.append('"');
-      sb.append(cur.replace("\\", "\\\\").replace("\"", "\\\""));
-      sb.append('"');
+    static {
+        MethodHandle processOnExit = null;
+        Executor executor = null;
+        try {
+            // java 9
+            processOnExit = MethodHandles.publicLookup()
+                    .findVirtual(Process.class, "onExit", methodType(CompletableFuture.class));
+        } catch (Throwable e) {
+            try {
+                // java 8
+                Class<?> unixProcessCls = ClassLoader.getSystemClassLoader().loadClass("java.lang.UNIXProcess");
+                Field f = unixProcessCls.getDeclaredField("processReaperExecutor");
+                f.setAccessible(true);
+                executor = (Executor) f.get(null);
+            } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException ex) {
+            }
+        }
+        PROCESS_ON_EXIT = processOnExit;
+        EXECUTOR = executor;
+        ONLINE = PROCESS_ON_EXIT != null || EXECUTOR != null;
     }
-    sb.append(']');
-    span.setTag("cmd.exec", sb.toString());
-  }
 
-  private static String[] redact(String[] command) {
-    if (command.length == 0) {
-      return command;
-    }
+    private ProcessImplInstrumentationHelpers() {}
 
-    String[] newCommand = null;
-    if (REDACTED_BINARIES.contains(determineResource(command))) {
-      newCommand = new String[command.length];
-      newCommand[0] = command[0];
-      for (int i = 1; i < command.length; i++) {
-        newCommand[i] = "?";
-      }
-      return newCommand;
+    public static void setTags(final AgentSpan span, final String[] origCommand) {
+        String[] command;
+        if (!ActiveSubsystems.APPSEC_ACTIVE) {
+            command = new String[] {origCommand[0]};
+        } else {
+            command = origCommand;
+        }
+        command = redact(command);
+        StringBuilder sb = new StringBuilder("[");
+        long remaining = LIMIT;
+        for (int i = 0; i < command.length; i++) {
+            String cur = command[i];
+            remaining -= cur.length();
+            if (remaining < 0) {
+                span.setTag("cmd.truncated", "true");
+                break;
+            }
+            if (i != 0) {
+                sb.append(',');
+            }
+            sb.append('"');
+            sb.append(cur.replace("\\", "\\\\").replace("\"", "\\\""));
+            sb.append('"');
+        }
+        sb.append(']');
+        span.setTag("cmd.exec", sb.toString());
     }
 
-    boolean redactNext = false;
-    for (int i = 1; i < command.length; i++) {
-      if (redactNext) {
-        if (newCommand == null) {
-          newCommand = new String[command.length];
-          System.arraycopy(command, 0, newCommand, 0, command.length);
+    private static String[] redact(String[] command) {
+        if (command.length == 0) {
+            return command;
         }
-        newCommand[i] = "?";
-        redactNext = false;
-        continue;
-      }
 
-      String s = command[i];
-      if (s == null) {
-        continue;
-      }
-      int posEqual = s.indexOf('=');
-      if (posEqual == -1) {
-        if (REDACTED_PARAM_PAT.matcher(s).matches()) {
-          redactNext = true;
-        }
-      } else {
-        String param = s.substring(0, posEqual);
-        if (REDACTED_PARAM_PAT.matcher(param).matches()) {
-          if (newCommand == null) {
+        String[] newCommand = null;
+        if (REDACTED_BINARIES.contains(determineResource(command))) {
             newCommand = new String[command.length];
-            System.arraycopy(command, 0, newCommand, 0, command.length);
-          }
-          newCommand[i] = param + "=?";
+            newCommand[0] = command[0];
+            for (int i = 1; i < command.length; i++) {
+                newCommand[i] = "?";
+            }
+            return newCommand;
         }
-      }
-    }
-
-    return newCommand != null ? newCommand : command;
-  }
 
-  public static void addProcessCompletionHook(Process p, AgentSpan span) {
-    if (PROCESS_ON_EXIT != null) {
-      CompletableFuture<Process> future;
-      try {
-        future = (CompletableFuture<Process>) PROCESS_ON_EXIT.invokeExact(p);
-      } catch (Throwable e) {
-        span.finish();
-        if (e instanceof Error) {
-          throw (Error) e;
-        } else if (e instanceof RuntimeException) {
-          throw (RuntimeException) e;
-        } else {
-          throw new UndeclaredThrowableException(e);
-        }
-      }
+        boolean redactNext = false;
+        for (int i = 1; i < command.length; i++) {
+            if (redactNext) {
+                if (newCommand == null) {
+                    newCommand = new String[command.length];
+                    System.arraycopy(command, 0, newCommand, 0, command.length);
+                }
+                newCommand[i] = "?";
+                redactNext = false;
+                continue;
+            }
 
-      final ContextContinuation continuation = Context.current().capture();
-      future.whenComplete(
-          (process, thr) -> {
-            if (thr != null) {
-              span.addThrowable(thr);
+            String s = command[i];
+            if (s == null) {
+                continue;
+            }
+            int posEqual = s.indexOf('=');
+            if (posEqual == -1) {
+                if (REDACTED_PARAM_PAT.matcher(s).matches()) {
+                    redactNext = true;
+                }
             } else {
-              span.setTag("cmd.exit_code", Integer.toString(process.exitValue()));
+                String param = s.substring(0, posEqual);
+                if (REDACTED_PARAM_PAT.matcher(param).matches()) {
+                    if (newCommand == null) {
+                        newCommand = new String[command.length];
+                        System.arraycopy(command, 0, newCommand, 0, command.length);
+                    }
+                    newCommand[i] = param + "=?";
+                }
             }
-            finishSpan(continuation, span);
-          });
-    } else if (EXECUTOR != null) {
-      final ContextContinuation continuation = Context.current().capture();
-      EXECUTOR.execute(
-          () -> {
+        }
+
+        return newCommand != null ? newCommand : command;
+    }
+
+    public static void addProcessCompletionHook(Process p, AgentSpan span) {
+        if (PROCESS_ON_EXIT != null) {
+            CompletableFuture<Process> future;
             try {
-              int exitCode = p.waitFor();
-              span.setTag("cmd.exit_code", Integer.toString(exitCode));
-            } catch (InterruptedException e) {
-              span.addThrowable(e);
-            } finally {
-              finishSpan(continuation, span);
+                future = (CompletableFuture<Process>) PROCESS_ON_EXIT.invokeExact(p);
+            } catch (Throwable e) {
+                span.finish();
+                if (e instanceof Error) {
+                    throw (Error) e;
+                } else if (e instanceof RuntimeException) {
+                    throw (RuntimeException) e;
+                } else {
+                    throw new UndeclaredThrowableException(e);
+                }
             }
-          });
-    }
-  }
 
-  public static CharSequence determineResource(String[] command) {
-    String first = command[0];
-    int pos = first.lastIndexOf('/');
-    if (pos == -1 || pos == first.length() - 1) {
-      return first;
+            final ContextContinuation continuation = Context.current().capture();
+            future.whenComplete((process, thr) -> {
+                if (thr != null) {
+                    span.addThrowable(thr);
+                } else {
+                    span.setTag("cmd.exit_code", Integer.toString(process.exitValue()));
+                }
+                finishSpan(continuation, span);
+            });
+        } else if (EXECUTOR != null) {
+            final ContextContinuation continuation = Context.current().capture();
+            EXECUTOR.execute(() -> {
+                try {
+                    int exitCode = p.waitFor();
+                    span.setTag("cmd.exit_code", Integer.toString(exitCode));
+                } catch (InterruptedException e) {
+                    span.addThrowable(e);
+                } finally {
+                    finishSpan(continuation, span);
+                }
+            });
+        }
     }
-    return first.substring(pos + 1);
-  }
 
-  /*
-   Check if there is a cmd injection attempt to block it
-  */
-  public static void cmdiRaspCheck(@Nonnull final String[] cmdArray) {
-    if (!Config.get().isAppSecRaspEnabled()) {
-      return;
-    }
-    // if shell injection was checked, skip cmd injection check
-    if (checkShi.get()) {
-      return;
+    public static CharSequence determineResource(String[] command) {
+        String first = command[0];
+        int pos = first.lastIndexOf('/');
+        if (pos == -1 || pos == first.length() - 1) {
+            return first;
+        }
+        return first.substring(pos + 1);
     }
-    try {
-      final BiFunction<RequestContext, String[], Flow<Void>> execCmdCallback =
-          AgentTracer.get()
-              .getCallbackProvider(RequestContextSlot.APPSEC)
-              .getCallback(EVENTS.execCmd());
 
-      if (execCmdCallback == null) {
-        return;
-      }
+    /*
+     Check if there is a cmd injection attempt to block it
+    */
+    public static void cmdiRaspCheck(@Nonnull final String[] cmdArray) {
+        if (!Config.get().isAppSecRaspEnabled()) {
+            return;
+        }
+        // if shell injection was checked, skip cmd injection check
+        if (checkShi.get()) {
+            return;
+        }
+        try {
+            final BiFunction<RequestContext, String[], Flow<Void>> execCmdCallback = AgentTracer.get()
+                    .getCallbackProvider(RequestContextSlot.APPSEC)
+                    .getCallback(EVENTS.execCmd());
+
+            if (execCmdCallback == null) {
+                return;
+            }
 
-      final AgentSpan span = AgentTracer.get().activeSpan();
-      if (span == null) {
-        return;
-      }
+            final AgentSpan span = AgentTracer.get().activeSpan();
+            if (span == null) {
+                return;
+            }
 
-      final RequestContext ctx = span.getRequestContext();
-      if (ctx == null) {
-        return;
-      }
+            final RequestContext ctx = span.getRequestContext();
+            if (ctx == null) {
+                return;
+            }
 
-      Flow<Void> flow = execCmdCallback.apply(ctx, cmdArray);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        BlockResponseFunction brf = ctx.getBlockResponseFunction();
-        if (brf != null) {
-          Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-          brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
+            Flow<Void> flow = execCmdCallback.apply(ctx, cmdArray);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                BlockResponseFunction brf = ctx.getBlockResponseFunction();
+                if (brf != null) {
+                    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                    brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
+                }
+                throw new BlockingException("Blocked request (for CMDI attempt)");
+            }
+        } catch (final BlockingException e) {
+            // re-throw blocking exceptions
+            throw e;
+        } catch (final Throwable e) {
+            // suppress anything else
+            LOGGER.debug("Exception during CMDI rasp callback", e);
         }
-        throw new BlockingException("Blocked request (for CMDI attempt)");
-      }
-    } catch (final BlockingException e) {
-      // re-throw blocking exceptions
-      throw e;
-    } catch (final Throwable e) {
-      // suppress anything else
-      LOGGER.debug("Exception during CMDI rasp callback", e);
     }
-  }
-
-  public static void resetCheckShi() {
-    checkShi.set(false);
-  }
 
-  /*
-   Check if there is a chell injection attempt to block it
-  */
-  public static void shiRaspCheck(@Nonnull final String cmd) {
-    if (!Config.get().isAppSecRaspEnabled()) {
-      return;
+    public static void resetCheckShi() {
+        checkShi.set(false);
     }
-    checkShi.set(true);
-    try {
-      final BiFunction<RequestContext, String, Flow<Void>> shellCmdCallback =
-          AgentTracer.get()
-              .getCallbackProvider(RequestContextSlot.APPSEC)
-              .getCallback(EVENTS.shellCmd());
 
-      if (shellCmdCallback == null) {
-        return;
-      }
+    /*
+     Check if there is a chell injection attempt to block it
+    */
+    public static void shiRaspCheck(@Nonnull final String cmd) {
+        if (!Config.get().isAppSecRaspEnabled()) {
+            return;
+        }
+        checkShi.set(true);
+        try {
+            final BiFunction<RequestContext, String, Flow<Void>> shellCmdCallback = AgentTracer.get()
+                    .getCallbackProvider(RequestContextSlot.APPSEC)
+                    .getCallback(EVENTS.shellCmd());
 
-      final AgentSpan span = AgentTracer.get().activeSpan();
-      if (span == null) {
-        return;
-      }
+            if (shellCmdCallback == null) {
+                return;
+            }
 
-      final RequestContext ctx = span.getRequestContext();
-      if (ctx == null) {
-        return;
-      }
+            final AgentSpan span = AgentTracer.get().activeSpan();
+            if (span == null) {
+                return;
+            }
 
-      Flow<Void> flow = shellCmdCallback.apply(ctx, cmd);
-      Flow.Action action = flow.getAction();
-      if (action instanceof Flow.Action.RequestBlockingAction) {
-        BlockResponseFunction brf = ctx.getBlockResponseFunction();
-        if (brf != null) {
-          Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
-          brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
+            final RequestContext ctx = span.getRequestContext();
+            if (ctx == null) {
+                return;
+            }
+
+            Flow<Void> flow = shellCmdCallback.apply(ctx, cmd);
+            Flow.Action action = flow.getAction();
+            if (action instanceof Flow.Action.RequestBlockingAction) {
+                BlockResponseFunction brf = ctx.getBlockResponseFunction();
+                if (brf != null) {
+                    Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
+                    brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
+                }
+                throw new BlockingException("Blocked request (for SHI attempt)");
+            }
+        } catch (final BlockingException e) {
+            // re-throw blocking exceptions
+            throw e;
+        } catch (final Throwable e) {
+            // suppress anything else
+            LOGGER.debug("Exception during SHI rasp callback", e);
         }
-        throw new BlockingException("Blocked request (for SHI attempt)");
-      }
-    } catch (final BlockingException e) {
-      // re-throw blocking exceptions
-      throw e;
-    } catch (final Throwable e) {
-      // suppress anything else
-      LOGGER.debug("Exception during SHI rasp callback", e);
     }
-  }
 
-  private static void finishSpan(
-      final ContextContinuation parentContinuation, final AgentSpan span) {
-    if (parentContinuation.context() == Context.root()) {
-      span.finish();
-      return;
-    }
-    try (final ContextScope scope = parentContinuation.resume()) {
-      span.finish();
+    private static void finishSpan(final ContextContinuation parentContinuation, final AgentSpan span) {
+        if (parentContinuation.context() == Context.root()) {
+            span.finish();
+            return;
+        }
+        try (final ContextScope scope = parentContinuation.resume()) {
+            span.finish();
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/logging/GlobalLogLevelSwitcher.java b/internal-api/src/main/java/datadog/trace/logging/GlobalLogLevelSwitcher.java
index 400772b7f2d..31e686513da 100644
--- a/internal-api/src/main/java/datadog/trace/logging/GlobalLogLevelSwitcher.java
+++ b/internal-api/src/main/java/datadog/trace/logging/GlobalLogLevelSwitcher.java
@@ -5,49 +5,50 @@
 import org.slf4j.LoggerFactory;
 
 public class GlobalLogLevelSwitcher implements LogLevelSwitcher {
-  private static volatile LogLevelSwitcher INSTANCE = null;
-
-  public static LogLevelSwitcher get() {
-    LogLevelSwitcher switcher = INSTANCE;
-    if (switcher == null) {
-      ILoggerFactory factory = LoggerFactory.getILoggerFactory();
-      INSTANCE = switcher = new GlobalLogLevelSwitcher(factory);
+    private static volatile LogLevelSwitcher INSTANCE = null;
+
+    public static LogLevelSwitcher get() {
+        LogLevelSwitcher switcher = INSTANCE;
+        if (switcher == null) {
+            ILoggerFactory factory = LoggerFactory.getILoggerFactory();
+            INSTANCE = switcher = new GlobalLogLevelSwitcher(factory);
+        }
+        return switcher;
     }
-    return switcher;
-  }
-
-  private final Logger log;
-  private final LogLevelSwitcher delegate;
-
-  GlobalLogLevelSwitcher(ILoggerFactory factory) {
-    log = factory.getLogger(GlobalLogLevelSwitcher.class.getName());
-    if (factory instanceof LogLevelSwitcher) {
-      delegate = (LogLevelSwitcher) factory;
-    } else {
-      log.error(
-          "Unable to find global log level switcher, found {}", factory.getClass().getSimpleName());
-      delegate = null;
+
+    private final Logger log;
+    private final LogLevelSwitcher delegate;
+
+    GlobalLogLevelSwitcher(ILoggerFactory factory) {
+        log = factory.getLogger(GlobalLogLevelSwitcher.class.getName());
+        if (factory instanceof LogLevelSwitcher) {
+            delegate = (LogLevelSwitcher) factory;
+        } else {
+            log.error(
+                    "Unable to find global log level switcher, found {}",
+                    factory.getClass().getSimpleName());
+            delegate = null;
+        }
     }
-  }
 
-  @Override
-  public void switchLevel(LogLevel level) {
-    if (delegate != null) {
-      delegate.switchLevel(level);
+    @Override
+    public void switchLevel(LogLevel level) {
+        if (delegate != null) {
+            delegate.switchLevel(level);
+        }
     }
-  }
 
-  @Override
-  public void restore() {
-    if (delegate != null) {
-      delegate.restore();
+    @Override
+    public void restore() {
+        if (delegate != null) {
+            delegate.restore();
+        }
     }
-  }
 
-  @Override
-  public void reinitialize() {
-    if (delegate != null) {
-      delegate.reinitialize();
+    @Override
+    public void reinitialize() {
+        if (delegate != null) {
+            delegate.reinitialize();
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/logging/LogLevel.java b/internal-api/src/main/java/datadog/trace/logging/LogLevel.java
index 7fb8ab5981f..9c45c2fe440 100644
--- a/internal-api/src/main/java/datadog/trace/logging/LogLevel.java
+++ b/internal-api/src/main/java/datadog/trace/logging/LogLevel.java
@@ -2,38 +2,38 @@
 
 /** Log level enum. */
 public enum LogLevel {
-  TRACE,
-  DEBUG,
-  INFO,
-  WARN,
-  ERROR,
-  OFF;
+    TRACE,
+    DEBUG,
+    INFO,
+    WARN,
+    ERROR,
+    OFF;
 
-  /**
-   * Case insensitive conversion from {@link String} to {@link LogLevel}.
-   *
-   * <p>Fallback is {@link #INFO}.
-   *
-   * @param level the {@link LogLevel} as a {@link String}
-   * @return the corresponding {@link LogLevel} enum
-   */
-  public static LogLevel fromString(String level) {
-    String upper = level.toUpperCase();
-    try {
-      return Enum.valueOf(LogLevel.class, upper);
-    } catch (Throwable t) {
-      // INFO is the fallback
-      return LogLevel.INFO;
+    /**
+     * Case insensitive conversion from {@link String} to {@link LogLevel}.
+     *
+     * <p>Fallback is {@link #INFO}.
+     *
+     * @param level the {@link LogLevel} as a {@link String}
+     * @return the corresponding {@link LogLevel} enum
+     */
+    public static LogLevel fromString(String level) {
+        String upper = level.toUpperCase();
+        try {
+            return Enum.valueOf(LogLevel.class, upper);
+        } catch (Throwable t) {
+            // INFO is the fallback
+            return LogLevel.INFO;
+        }
     }
-  }
 
-  /**
-   * Check if a {@link LogLevel} is enabled for this {@link LogLevel}.
-   *
-   * @param level the {@link LogLevel} to check
-   * @return true if the {@code level} is enabled, false otherwise
-   */
-  public boolean isEnabled(LogLevel level) {
-    return this.compareTo(level) >= 0;
-  }
+    /**
+     * Check if a {@link LogLevel} is enabled for this {@link LogLevel}.
+     *
+     * @param level the {@link LogLevel} to check
+     * @return true if the {@code level} is enabled, false otherwise
+     */
+    public boolean isEnabled(LogLevel level) {
+        return this.compareTo(level) >= 0;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/logging/LogLevelSwitcher.java b/internal-api/src/main/java/datadog/trace/logging/LogLevelSwitcher.java
index 3e1adfe12fe..2d566302ac9 100644
--- a/internal-api/src/main/java/datadog/trace/logging/LogLevelSwitcher.java
+++ b/internal-api/src/main/java/datadog/trace/logging/LogLevelSwitcher.java
@@ -3,16 +3,16 @@
 /** Enables temporary runtime switching of LogLevel. */
 public interface LogLevelSwitcher {
 
-  /**
-   * Temporarily switch the current LogLevel to a new LogLevel
-   *
-   * @param level the LogLevel to switch to
-   */
-  void switchLevel(LogLevel level);
+    /**
+     * Temporarily switch the current LogLevel to a new LogLevel
+     *
+     * @param level the LogLevel to switch to
+     */
+    void switchLevel(LogLevel level);
 
-  /** Restore the LogLevel to the original setting. */
-  void restore();
+    /** Restore the LogLevel to the original setting. */
+    void restore();
 
-  /** Re-execute logging settings initialization */
-  void reinitialize();
+    /** Re-execute logging settings initialization */
+    void reinitialize();
 }
diff --git a/internal-api/src/main/java/datadog/trace/logging/LoggingSettingsDescription.java b/internal-api/src/main/java/datadog/trace/logging/LoggingSettingsDescription.java
index 90924168aee..f5e2ea25338 100644
--- a/internal-api/src/main/java/datadog/trace/logging/LoggingSettingsDescription.java
+++ b/internal-api/src/main/java/datadog/trace/logging/LoggingSettingsDescription.java
@@ -5,16 +5,15 @@
 import java.util.Map;
 
 public final class LoggingSettingsDescription {
-  private LoggingSettingsDescription() {}
+    private LoggingSettingsDescription() {}
 
-  private static volatile Map<String, Object> description = Collections.emptyMap();
+    private static volatile Map<String, Object> description = Collections.emptyMap();
 
-  public static void setDescription(Map<String, Object> description) {
-    LoggingSettingsDescription.description =
-        Collections.unmodifiableMap(new HashMap<>(description));
-  }
+    public static void setDescription(Map<String, Object> description) {
+        LoggingSettingsDescription.description = Collections.unmodifiableMap(new HashMap<>(description));
+    }
 
-  public static Map<String, Object> getDescription() {
-    return description;
-  }
+    public static Map<String, Object> getDescription() {
+        return description;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/AgentProxySelector.java b/internal-api/src/main/java/datadog/trace/util/AgentProxySelector.java
index de999b29d6a..15165b4ef77 100644
--- a/internal-api/src/main/java/datadog/trace/util/AgentProxySelector.java
+++ b/internal-api/src/main/java/datadog/trace/util/AgentProxySelector.java
@@ -11,25 +11,25 @@
 import java.util.Set;
 
 public final class AgentProxySelector extends ProxySelector {
-  public static final ProxySelector INSTANCE = new AgentProxySelector();
+    public static final ProxySelector INSTANCE = new AgentProxySelector();
 
-  private static final List<Proxy> DIRECT = Collections.singletonList(Proxy.NO_PROXY);
+    private static final List<Proxy> DIRECT = Collections.singletonList(Proxy.NO_PROXY);
 
-  private final Set<String> noProxyHosts = Config.get().getNoProxyHosts();
+    private final Set<String> noProxyHosts = Config.get().getNoProxyHosts();
 
-  private final ProxySelector defaultProxySelector = ProxySelector.getDefault();
+    private final ProxySelector defaultProxySelector = ProxySelector.getDefault();
 
-  @Override
-  public List<Proxy> select(final URI uri) {
-    if (null != uri.getHost() && noProxyHosts.contains(uri.getHost())) {
-      return DIRECT;
-    } else {
-      return defaultProxySelector.select(uri);
+    @Override
+    public List<Proxy> select(final URI uri) {
+        if (null != uri.getHost() && noProxyHosts.contains(uri.getHost())) {
+            return DIRECT;
+        } else {
+            return defaultProxySelector.select(uri);
+        }
     }
-  }
 
-  @Override
-  public void connectFailed(final URI uri, final SocketAddress sa, final IOException ioe) {
-    defaultProxySelector.connectFailed(uri, sa, ioe);
-  }
+    @Override
+    public void connectFailed(final URI uri, final SocketAddress sa, final IOException ioe) {
+        defaultProxySelector.connectFailed(uri, sa, ioe);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/AgentTaskScheduler.java b/internal-api/src/main/java/datadog/trace/util/AgentTaskScheduler.java
index 81ecb2a76d3..9f19ae96867 100644
--- a/internal-api/src/main/java/datadog/trace/util/AgentTaskScheduler.java
+++ b/internal-api/src/main/java/datadog/trace/util/AgentTaskScheduler.java
@@ -20,379 +20,358 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressFBWarnings(
-    value = "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR",
-    justification = "Not a singleton")
+@SuppressFBWarnings(value = "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR", justification = "Not a singleton")
 public class AgentTaskScheduler implements Executor {
-  private static final Logger log = LoggerFactory.getLogger(AgentTaskScheduler.class);
+    private static final Logger log = LoggerFactory.getLogger(AgentTaskScheduler.class);
 
-  // not final for testing purposes
-  private static AgentTaskScheduler INSTANCE = new AgentTaskScheduler(TASK_SCHEDULER);
+    // not final for testing purposes
+    private static AgentTaskScheduler INSTANCE = new AgentTaskScheduler(TASK_SCHEDULER);
 
-  private static final long SHUTDOWN_TIMEOUT = 5; // seconds
+    private static final long SHUTDOWN_TIMEOUT = 5; // seconds
 
-  public static AgentTaskScheduler get() {
-    return INSTANCE;
-  }
+    public static AgentTaskScheduler get() {
+        return INSTANCE;
+    }
 
-  /**
-   * This method is only for testing. It shuts down the existing executor and swap the instance with
-   * a fresh one.
-   *
-   * @param timeout the amount of time to wait for the shutdown.
-   * @param unit the unit of the time amount.
-   */
-  public static void shutdownAndReset(long timeout, TimeUnit unit) {
-    INSTANCE.shutdown(timeout, unit);
-    INSTANCE = new AgentTaskScheduler(TASK_SCHEDULER);
-  }
+    /**
+     * This method is only for testing. It shuts down the existing executor and swap the instance with
+     * a fresh one.
+     *
+     * @param timeout the amount of time to wait for the shutdown.
+     * @param unit the unit of the time amount.
+     */
+    public static void shutdownAndReset(long timeout, TimeUnit unit) {
+        INSTANCE.shutdown(timeout, unit);
+        INSTANCE = new AgentTaskScheduler(TASK_SCHEDULER);
+    }
 
-  public interface Task<T> {
-    void run(T target);
-  }
+    public interface Task<T> {
+        void run(T target);
+    }
 
-  public interface Target<T> {
-    T get();
-  }
+    public interface Target<T> {
+        T get();
+    }
 
-  public static final class RunnableTask implements Task<Runnable> {
-    public static final RunnableTask INSTANCE = new RunnableTask();
+    public static final class RunnableTask implements Task<Runnable> {
+        public static final RunnableTask INSTANCE = new RunnableTask();
 
-    @Override
-    public void run(final Runnable target) {
-      target.run();
+        @Override
+        public void run(final Runnable target) {
+            target.run();
+        }
+    }
+
+    public static class Scheduled<T> implements Target<T> {
+        private volatile T referent;
+
+        private Scheduled(final T referent) {
+            this.referent = referent;
+        }
+
+        @Override
+        public T get() {
+            return referent;
+        }
+
+        public void cancel() {
+            referent = null;
+        }
+    }
+
+    private static final class WeakTarget<T> extends WeakReference<T> implements Target<T> {
+        private WeakTarget(final T referent) {
+            super(referent);
+        }
     }
-  }
 
-  public static class Scheduled<T> implements Target<T> {
-    private volatile T referent;
+    private final DelayQueue<PeriodicTask<?>> workQueue = new DelayQueue<>();
+    private final AgentThread agentThread;
+    private volatile Thread worker;
+    private volatile boolean shutdown;
 
-    private Scheduled(final T referent) {
-      this.referent = referent;
+    public AgentTaskScheduler(final AgentThread agentThread) {
+        this.agentThread = agentThread;
     }
 
     @Override
-    public T get() {
-      return referent;
+    public void execute(final Runnable target) {
+        schedule(RunnableTask.INSTANCE, target, 0, MILLISECONDS);
     }
 
-    public void cancel() {
-      referent = null;
+    public <T> Scheduled<T> schedule(final Task<T> task, final T target, final long initialDelay, final TimeUnit unit) {
+        final Scheduled<T> scheduled = new Scheduled<>(target);
+        scheduleTarget(task, scheduled, initialDelay, 0, unit);
+        return scheduled;
     }
-  }
 
-  private static final class WeakTarget<T> extends WeakReference<T> implements Target<T> {
-    private WeakTarget(final T referent) {
-      super(referent);
+    public Scheduled<Runnable> schedule(final Runnable target, final long initialDelay, final TimeUnit unit) {
+        return schedule(RunnableTask.INSTANCE, target, initialDelay, unit);
     }
-  }
-
-  private final DelayQueue<PeriodicTask<?>> workQueue = new DelayQueue<>();
-  private final AgentThread agentThread;
-  private volatile Thread worker;
-  private volatile boolean shutdown;
-
-  public AgentTaskScheduler(final AgentThread agentThread) {
-    this.agentThread = agentThread;
-  }
-
-  @Override
-  public void execute(final Runnable target) {
-    schedule(RunnableTask.INSTANCE, target, 0, MILLISECONDS);
-  }
-
-  public <T> Scheduled<T> schedule(
-      final Task<T> task, final T target, final long initialDelay, final TimeUnit unit) {
-    final Scheduled<T> scheduled = new Scheduled<>(target);
-    scheduleTarget(task, scheduled, initialDelay, 0, unit);
-    return scheduled;
-  }
-
-  public Scheduled<Runnable> schedule(
-      final Runnable target, final long initialDelay, final TimeUnit unit) {
-    return schedule(RunnableTask.INSTANCE, target, initialDelay, unit);
-  }
-
-  /**
-   * Adds a random jitter of up to 10 seconds to the delay. This avoids a fleet of traced
-   * applications starting at the same time and scheduling the same publishing task in sync
-   */
-  public <T> Scheduled<T> scheduleWithJitter(
-      final Task<T> task, final T target, final long initialDelay, final TimeUnit unit) {
-
-    // schedule to start after geometrically distributed number of seconds expressed in
-    // milliseconds, with p = 0.25, meaning the probability that the aggregator will not
-    // have started by the nth second is 0.25(0.75)^n-1 (or a 1% chance of not having
-    // started within 10 seconds, where a cap is applied)
-    long randomMillis =
-        unit.toMillis(initialDelay)
-            + Math.min(
-                (long)
-                    (1000D
-                        * Math.log(ThreadLocalRandom.current().nextDouble())
-                        / Math.log(1 - 0.25)),
-                10_000);
-
-    return schedule(task, target, randomMillis, MILLISECONDS);
-  }
-
-  public Scheduled<Runnable> scheduleWithJitter(
-      final Runnable target, final long initialDelay, final TimeUnit unit) {
-    return scheduleWithJitter(RunnableTask.INSTANCE, target, initialDelay, unit);
-  }
-
-  public <T> Scheduled<T> scheduleAtFixedRate(
-      final Task<T> task,
-      final T target,
-      final long initialDelay,
-      final long period,
-      final TimeUnit unit) {
-    final Scheduled<T> scheduled = new Scheduled<>(target);
-    scheduleTarget(task, scheduled, initialDelay, period, unit);
-    return scheduled;
-  }
-
-  public Scheduled<Runnable> scheduleAtFixedRate(
-      final Runnable target, final long initialDelay, final long period, final TimeUnit unit) {
-    return scheduleAtFixedRate(RunnableTask.INSTANCE, target, initialDelay, period, unit);
-  }
-
-  public <T> void weakScheduleAtFixedRate(
-      final Task<T> task,
-      final T target,
-      final long initialDelay,
-      final long period,
-      final TimeUnit unit) {
-    scheduleTarget(task, new WeakTarget<>(target), initialDelay, period, unit);
-  }
-
-  public void weakScheduleAtFixedRate(
-      final Runnable target, final long initialDelay, final long period, final TimeUnit unit) {
-    weakScheduleAtFixedRate(RunnableTask.INSTANCE, target, initialDelay, period, unit);
-  }
-
-  public <T> Scheduled<T> scheduleWithFixedDelay(
-      Task<T> task, T target, long initialDelay, long period, TimeUnit unit) {
-    final Scheduled<T> scheduled = new Scheduled<>(target);
-    scheduleTarget(task, scheduled, initialDelay, -period, unit);
-    return scheduled;
-  }
-
-  public Scheduled<Runnable> scheduleWithFixedDelay(
-      Runnable target, long initialDelay, long period, TimeUnit unit) {
-    return scheduleWithFixedDelay(RunnableTask.INSTANCE, target, initialDelay, period, unit);
-  }
-
-  @SuppressFBWarnings({
-    "JLM_JSR166_UTILCONCURRENT_MONITORENTER",
-    "USO_UNSAFE_ACCESSIBLE_OBJECT_SYNCHRONIZATION"
-  })
-  private <T> void scheduleTarget(
-      final Task<T> task,
-      final Target<T> target,
-      final long initialDelay,
-      final long period,
-      final TimeUnit unit) {
-
-    if (target == null || target.get() == null) {
-      return;
+
+    /**
+     * Adds a random jitter of up to 10 seconds to the delay. This avoids a fleet of traced
+     * applications starting at the same time and scheduling the same publishing task in sync
+     */
+    public <T> Scheduled<T> scheduleWithJitter(
+            final Task<T> task, final T target, final long initialDelay, final TimeUnit unit) {
+
+        // schedule to start after geometrically distributed number of seconds expressed in
+        // milliseconds, with p = 0.25, meaning the probability that the aggregator will not
+        // have started by the nth second is 0.25(0.75)^n-1 (or a 1% chance of not having
+        // started within 10 seconds, where a cap is applied)
+        long randomMillis = unit.toMillis(initialDelay)
+                + Math.min(
+                        (long) (1000D * Math.log(ThreadLocalRandom.current().nextDouble()) / Math.log(1 - 0.25)),
+                        10_000);
+
+        return schedule(task, target, randomMillis, MILLISECONDS);
     }
 
-    if (!shutdown && worker == null) {
-      synchronized (workQueue) {
-        if (!shutdown && worker == null) {
-          prepareWorkQueue();
-          try {
-            worker = newAgentThread(agentThread, new Worker());
-            // register hook after worker is assigned, but before we start it
-            Runtime.getRuntime().addShutdownHook(new ShutdownHook());
-            worker.start();
-          } catch (final IllegalStateException e) {
-            shutdown = true; // couldn't add hook, JVM is shutting down
-          }
-        }
-      }
+    public Scheduled<Runnable> scheduleWithJitter(final Runnable target, final long initialDelay, final TimeUnit unit) {
+        return scheduleWithJitter(RunnableTask.INSTANCE, target, initialDelay, unit);
     }
 
-    if (!shutdown) {
-      workQueue.offer(new PeriodicTask<>(task, target, initialDelay, period, unit));
-    } else {
-      log.debug("Agent task scheduler is shutdown. Will not run {}", describeTask(task, target));
+    public <T> Scheduled<T> scheduleAtFixedRate(
+            final Task<T> task, final T target, final long initialDelay, final long period, final TimeUnit unit) {
+        final Scheduled<T> scheduled = new Scheduled<>(target);
+        scheduleTarget(task, scheduled, initialDelay, period, unit);
+        return scheduled;
     }
-  }
-
-  private void prepareWorkQueue() {
-    try {
-      // exercise 'poll' method to make sure all relevant queue synchronizer types are preloaded
-      // here rather than in the Worker when it calls 'take' - this avoids a potential loop-back
-      workQueue.poll(1, NANOSECONDS);
-    } catch (final InterruptedException e) {
-      // ignore, we only want to preload queue internals
+
+    public Scheduled<Runnable> scheduleAtFixedRate(
+            final Runnable target, final long initialDelay, final long period, final TimeUnit unit) {
+        return scheduleAtFixedRate(RunnableTask.INSTANCE, target, initialDelay, period, unit);
     }
-    if (this == INSTANCE) {
-      // preload a future no-op task to ensure workQueue.take() will use await with timeout during
-      // premain - otherwise on Java 25 it will load ForkJoinPool which in turn loads ForkJoinTask,
-      // which then means we lose the chance to field-inject context into ForkJoinTask instances
-      workQueue.offer(FUTURE_NOOP_PLACEHOLDER);
+
+    public <T> void weakScheduleAtFixedRate(
+            final Task<T> task, final T target, final long initialDelay, final long period, final TimeUnit unit) {
+        scheduleTarget(task, new WeakTarget<>(target), initialDelay, period, unit);
     }
-  }
 
-  // for testing
-  int taskCount() {
-    return workQueue.size();
-  }
+    public void weakScheduleAtFixedRate(
+            final Runnable target, final long initialDelay, final long period, final TimeUnit unit) {
+        weakScheduleAtFixedRate(RunnableTask.INSTANCE, target, initialDelay, period, unit);
+    }
 
-  public boolean isShutdown() {
-    return shutdown;
-  }
+    public <T> Scheduled<T> scheduleWithFixedDelay(
+            Task<T> task, T target, long initialDelay, long period, TimeUnit unit) {
+        final Scheduled<T> scheduled = new Scheduled<>(target);
+        scheduleTarget(task, scheduled, initialDelay, -period, unit);
+        return scheduled;
+    }
 
-  public static void initialize() {
-    AgentTaskScheduler.INSTANCE.dummy();
-  }
+    public Scheduled<Runnable> scheduleWithFixedDelay(Runnable target, long initialDelay, long period, TimeUnit unit) {
+        return scheduleWithFixedDelay(RunnableTask.INSTANCE, target, initialDelay, period, unit);
+    }
 
-  private void dummy() {
-    /*
-     * Dummy empty method body used only to make compiler happy when initializing this class by accessing
-     * the static INSTANCE field.
-     */
-  }
-
-  public void shutdown(final long timeout, final TimeUnit unit) {
-    shutdown = true;
-    final Thread t = worker;
-    if (t != null) {
-      t.interrupt();
-      if (timeout > 0) {
+    @SuppressFBWarnings({"JLM_JSR166_UTILCONCURRENT_MONITORENTER", "USO_UNSAFE_ACCESSIBLE_OBJECT_SYNCHRONIZATION"})
+    private <T> void scheduleTarget(
+            final Task<T> task,
+            final Target<T> target,
+            final long initialDelay,
+            final long period,
+            final TimeUnit unit) {
+
+        if (target == null || target.get() == null) {
+            return;
+        }
+
+        if (!shutdown && worker == null) {
+            synchronized (workQueue) {
+                if (!shutdown && worker == null) {
+                    prepareWorkQueue();
+                    try {
+                        worker = newAgentThread(agentThread, new Worker());
+                        // register hook after worker is assigned, but before we start it
+                        Runtime.getRuntime().addShutdownHook(new ShutdownHook());
+                        worker.start();
+                    } catch (final IllegalStateException e) {
+                        shutdown = true; // couldn't add hook, JVM is shutting down
+                    }
+                }
+            }
+        }
+
+        if (!shutdown) {
+            workQueue.offer(new PeriodicTask<>(task, target, initialDelay, period, unit));
+        } else {
+            log.debug("Agent task scheduler is shutdown. Will not run {}", describeTask(task, target));
+        }
+    }
+
+    private void prepareWorkQueue() {
         try {
-          t.join(unit.toMillis(timeout));
+            // exercise 'poll' method to make sure all relevant queue synchronizer types are preloaded
+            // here rather than in the Worker when it calls 'take' - this avoids a potential loop-back
+            workQueue.poll(1, NANOSECONDS);
         } catch (final InterruptedException e) {
-          // continue shutdown...
+            // ignore, we only want to preload queue internals
+        }
+        if (this == INSTANCE) {
+            // preload a future no-op task to ensure workQueue.take() will use await with timeout during
+            // premain - otherwise on Java 25 it will load ForkJoinPool which in turn loads ForkJoinTask,
+            // which then means we lose the chance to field-inject context into ForkJoinTask instances
+            workQueue.offer(FUTURE_NOOP_PLACEHOLDER);
         }
-      }
     }
-  }
 
-  private static <T> String describeTask(final Task<T> task, final Target<T> target) {
-    return "periodic task " + task.getClass().getSimpleName() + " with target " + target.get();
-  }
+    // for testing
+    int taskCount() {
+        return workQueue.size();
+    }
 
-  private final class ShutdownHook extends Thread {
-    ShutdownHook() {
-      super(AGENT_THREAD_GROUP, agentThread.threadName + "-shutdown-hook");
+    public boolean isShutdown() {
+        return shutdown;
     }
 
-    @Override
-    public void run() {
-      shutdown(SHUTDOWN_TIMEOUT, SECONDS);
+    public static void initialize() {
+        AgentTaskScheduler.INSTANCE.dummy();
     }
-  }
 
-  private final class Worker implements Runnable {
-    @Override
-    public void run() {
-      while (!shutdown) {
-        PeriodicTask<?> work = null;
-        try {
-          work = workQueue.take();
-          work.run();
-        } catch (final Throwable e) {
-          if (work != null) {
-            log.debug("Uncaught exception from {}", work, e);
-          }
-        } finally {
-          if (work != null && work.reschedule()) {
-            workQueue.offer(work);
-          }
+    private void dummy() {
+        /*
+         * Dummy empty method body used only to make compiler happy when initializing this class by accessing
+         * the static INSTANCE field.
+         */
+    }
+
+    public void shutdown(final long timeout, final TimeUnit unit) {
+        shutdown = true;
+        final Thread t = worker;
+        if (t != null) {
+            t.interrupt();
+            if (timeout > 0) {
+                try {
+                    t.join(unit.toMillis(timeout));
+                } catch (final InterruptedException e) {
+                    // continue shutdown...
+                }
+            }
         }
-      }
-      workQueue.clear();
-      worker = null;
     }
-  }
 
-  private static final AtomicInteger TASK_SEQUENCE_GENERATOR = new AtomicInteger();
+    private static <T> String describeTask(final Task<T> task, final Target<T> target) {
+        return "periodic task " + task.getClass().getSimpleName() + " with target " + target.get();
+    }
 
-  private static final PeriodicTask<Object> FUTURE_NOOP_PLACEHOLDER =
-      new PeriodicTask<>(null, new Scheduled<>(null), 10, 0, MINUTES);
+    private final class ShutdownHook extends Thread {
+        ShutdownHook() {
+            super(AGENT_THREAD_GROUP, agentThread.threadName + "-shutdown-hook");
+        }
 
-  private static final class PeriodicTask<T> implements Delayed {
+        @Override
+        public void run() {
+            shutdown(SHUTDOWN_TIMEOUT, SECONDS);
+        }
+    }
 
-    private final Task<T> task;
-    private final Target<T> target;
-    private final long period;
-    private final int taskSequence;
+    private final class Worker implements Runnable {
+        @Override
+        public void run() {
+            while (!shutdown) {
+                PeriodicTask<?> work = null;
+                try {
+                    work = workQueue.take();
+                    work.run();
+                } catch (final Throwable e) {
+                    if (work != null) {
+                        log.debug("Uncaught exception from {}", work, e);
+                    }
+                } finally {
+                    if (work != null && work.reschedule()) {
+                        workQueue.offer(work);
+                    }
+                }
+            }
+            workQueue.clear();
+            worker = null;
+        }
+    }
 
-    private long nextFireTime;
+    private static final AtomicInteger TASK_SEQUENCE_GENERATOR = new AtomicInteger();
 
-    public PeriodicTask(
-        final Task<T> task,
-        final Target<T> target,
-        final long initialDelay,
-        final long period,
-        final TimeUnit unit) {
+    private static final PeriodicTask<Object> FUTURE_NOOP_PLACEHOLDER =
+            new PeriodicTask<>(null, new Scheduled<>(null), 10, 0, MINUTES);
 
-      this.task = task;
-      this.target = target;
-      this.period = unit.toNanos(period);
-      this.taskSequence = TASK_SEQUENCE_GENERATOR.getAndIncrement();
+    private static final class PeriodicTask<T> implements Delayed {
 
-      nextFireTime = System.nanoTime() + unit.toNanos(initialDelay);
-    }
+        private final Task<T> task;
+        private final Target<T> target;
+        private final long period;
+        private final int taskSequence;
 
-    public void run() {
-      final T t = target.get();
-      if (t != null) {
-        task.run(t);
-      }
-    }
+        private long nextFireTime;
 
-    public boolean reschedule() {
-      if (period > 0 && target.get() != null) {
-        nextFireTime += period;
-        return true;
-      }
-      if (period < 0 && target.get() != null) {
-        nextFireTime = System.nanoTime() - period;
-        return true;
-      }
-      return false;
-    }
+        public PeriodicTask(
+                final Task<T> task,
+                final Target<T> target,
+                final long initialDelay,
+                final long period,
+                final TimeUnit unit) {
 
-    @Override
-    public long getDelay(final TimeUnit unit) {
-      return unit.convert(nextFireTime - System.nanoTime(), NANOSECONDS);
-    }
+            this.task = task;
+            this.target = target;
+            this.period = unit.toNanos(period);
+            this.taskSequence = TASK_SEQUENCE_GENERATOR.getAndIncrement();
 
-    @Override
-    public int compareTo(final Delayed other) {
-      if (this == other) {
-        return 0;
-      }
-      long taskOrder;
-      if (other instanceof PeriodicTask<?>) {
-        final PeriodicTask<?> otherTask = (PeriodicTask<?>) other;
-        taskOrder = nextFireTime - otherTask.nextFireTime;
-        if (taskOrder == 0) {
-          taskOrder = taskSequence - otherTask.taskSequence;
+            nextFireTime = System.nanoTime() + unit.toNanos(initialDelay);
         }
-      } else {
-        taskOrder = getDelay(NANOSECONDS) - other.getDelay(NANOSECONDS);
-      }
-      return taskOrder < 0 ? -1 : (taskOrder > 0 ? 1 : 0);
-    }
 
-    @Override
-    public boolean equals(Object obj) {
-      try {
-        return obj == null ? false : (this.compareTo((Delayed) obj) != 0 ? false : true);
-      } catch (ClassCastException e) {
-        return false;
-      }
-    }
+        public void run() {
+            final T t = target.get();
+            if (t != null) {
+                task.run(t);
+            }
+        }
 
-    @Override
-    public String toString() {
-      return describeTask(task, target);
+        public boolean reschedule() {
+            if (period > 0 && target.get() != null) {
+                nextFireTime += period;
+                return true;
+            }
+            if (period < 0 && target.get() != null) {
+                nextFireTime = System.nanoTime() - period;
+                return true;
+            }
+            return false;
+        }
+
+        @Override
+        public long getDelay(final TimeUnit unit) {
+            return unit.convert(nextFireTime - System.nanoTime(), NANOSECONDS);
+        }
+
+        @Override
+        public int compareTo(final Delayed other) {
+            if (this == other) {
+                return 0;
+            }
+            long taskOrder;
+            if (other instanceof PeriodicTask<?>) {
+                final PeriodicTask<?> otherTask = (PeriodicTask<?>) other;
+                taskOrder = nextFireTime - otherTask.nextFireTime;
+                if (taskOrder == 0) {
+                    taskOrder = taskSequence - otherTask.taskSequence;
+                }
+            } else {
+                taskOrder = getDelay(NANOSECONDS) - other.getDelay(NANOSECONDS);
+            }
+            return taskOrder < 0 ? -1 : (taskOrder > 0 ? 1 : 0);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            try {
+                return obj == null ? false : (this.compareTo((Delayed) obj) != 0 ? false : true);
+            } catch (ClassCastException e) {
+                return false;
+            }
+        }
+
+        @Override
+        public String toString() {
+            return describeTask(task, target);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/AgentThreadFactory.java b/internal-api/src/main/java/datadog/trace/util/AgentThreadFactory.java
index 81cd9a0b294..e6cb94c6ff8 100644
--- a/internal-api/src/main/java/datadog/trace/util/AgentThreadFactory.java
+++ b/internal-api/src/main/java/datadog/trace/util/AgentThreadFactory.java
@@ -5,129 +5,123 @@
 
 /** A {@link ThreadFactory} implementation that starts all agent {@link Thread}s as daemons. */
 public final class AgentThreadFactory implements ThreadFactory {
-  public static final ThreadGroup AGENT_THREAD_GROUP = new ThreadGroup("dd-trace-java");
+    public static final ThreadGroup AGENT_THREAD_GROUP = new ThreadGroup("dd-trace-java");
 
-  public static final long THREAD_JOIN_TIMOUT_MS = 800;
+    public static final long THREAD_JOIN_TIMOUT_MS = 800;
 
-  // known agent threads
-  public enum AgentThread {
-    TASK_SCHEDULER("dd-task-scheduler"),
+    // known agent threads
+    public enum AgentThread {
+        TASK_SCHEDULER("dd-task-scheduler"),
 
-    TRACE_STARTUP("dd-agent-startup-datadog-tracer"),
-    TRACE_MONITOR("dd-trace-monitor"),
-    TRACE_PROCESSOR("dd-trace-processor"),
-    SPAN_SAMPLING_PROCESSOR("dd-span-sampling-processor"),
-    TRACE_CASSANDRA_ASYNC_SESSION("dd-cassandra-session-executor"),
+        TRACE_STARTUP("dd-agent-startup-datadog-tracer"),
+        TRACE_MONITOR("dd-trace-monitor"),
+        TRACE_PROCESSOR("dd-trace-processor"),
+        SPAN_SAMPLING_PROCESSOR("dd-span-sampling-processor"),
+        TRACE_CASSANDRA_ASYNC_SESSION("dd-cassandra-session-executor"),
 
-    METRICS_AGGREGATOR("dd-metrics-aggregator"),
-    STATSD_CLIENT("dd-statsd-client"),
+        METRICS_AGGREGATOR("dd-metrics-aggregator"),
+        STATSD_CLIENT("dd-statsd-client"),
 
-    JMX_STARTUP("dd-agent-startup-jmxfetch"),
-    JMX_COLLECTOR("dd-jmx-collector"),
+        JMX_STARTUP("dd-agent-startup-jmxfetch"),
+        JMX_COLLECTOR("dd-jmx-collector"),
 
-    OTLP_METRICS_EXPORTER("dd-otlp-metrics-exporter"),
-    OTLP_LOGS_EXPORTER("dd-otlp-logs-exporter"),
+        OTLP_METRICS_EXPORTER("dd-otlp-metrics-exporter"),
+        OTLP_LOGS_EXPORTER("dd-otlp-logs-exporter"),
 
-    PROFILER_STARTUP("dd-agent-startup-datadog-profiler"),
-    PROFILER_RECORDING_SCHEDULER("dd-profiler-recording-scheduler"),
-    PROFILER_HTTP_DISPATCHER("dd-profiler-http-dispatcher"),
+        PROFILER_STARTUP("dd-agent-startup-datadog-profiler"),
+        PROFILER_RECORDING_SCHEDULER("dd-profiler-recording-scheduler"),
+        PROFILER_HTTP_DISPATCHER("dd-profiler-http-dispatcher"),
 
-    APPSEC_HTTP_DISPATCHER("dd-appsec-http-dispatcher"),
+        APPSEC_HTTP_DISPATCHER("dd-appsec-http-dispatcher"),
 
-    CRASHTRACKING_HTTP_DISPATCHER("dd-crashtracking-http-dispatcher"),
+        CRASHTRACKING_HTTP_DISPATCHER("dd-crashtracking-http-dispatcher"),
 
-    TELEMETRY("dd-telemetry"),
+        TELEMETRY("dd-telemetry"),
 
-    FLEET_MANAGEMENT_POLLER("dd-fleet-management-poller"),
-    REMOTE_CONFIG("dd-remote-config"),
+        FLEET_MANAGEMENT_POLLER("dd-fleet-management-poller"),
+        REMOTE_CONFIG("dd-remote-config"),
 
-    TRACER_FLARE("dd-tracer-flare"),
+        TRACER_FLARE("dd-tracer-flare"),
 
-    CWS_TLS("dd-cws-tls"),
+        CWS_TLS("dd-cws-tls"),
 
-    PROCESS_SUPERVISOR("dd-process-supervisor"),
+        PROCESS_SUPERVISOR("dd-process-supervisor"),
 
-    DATA_JOBS_MONITORING_SHUTDOWN_HOOK("dd-data-jobs-shutdown-hook"),
+        DATA_JOBS_MONITORING_SHUTDOWN_HOOK("dd-data-jobs-shutdown-hook"),
 
-    DATA_STREAMS_MONITORING("dd-data-streams-monitor"),
+        DATA_STREAMS_MONITORING("dd-data-streams-monitor"),
 
-    DEBUGGER_SNAPSHOT_SERIALIZER("dd-debugger-snapshot-serializer"),
-    DEBUGGER_HTTP_DISPATCHER("dd-debugger-upload-http-dispatcher"),
+        DEBUGGER_SNAPSHOT_SERIALIZER("dd-debugger-snapshot-serializer"),
+        DEBUGGER_HTTP_DISPATCHER("dd-debugger-upload-http-dispatcher"),
 
-    CI_SHELL_COMMAND("dd-ci-shell-command"),
-    CI_GIT_DATA_UPLOADER("dd-ci-git-data-uploader"),
-    CI_GIT_DATA_SHUTDOWN_HOOK("dd-ci-git-data-shutdown-hook"),
-    CI_PROJECT_CONFIGURATOR("dd-ci-project-configurator"),
-    CI_SIGNAL_SERVER("dd-ci-signal-server"),
+        CI_SHELL_COMMAND("dd-ci-shell-command"),
+        CI_GIT_DATA_UPLOADER("dd-ci-git-data-uploader"),
+        CI_GIT_DATA_SHUTDOWN_HOOK("dd-ci-git-data-shutdown-hook"),
+        CI_PROJECT_CONFIGURATOR("dd-ci-project-configurator"),
+        CI_SIGNAL_SERVER("dd-ci-signal-server"),
 
-    RETRANSFORMER("dd-retransformer"),
+        RETRANSFORMER("dd-retransformer"),
 
-    LOGS_INTAKE("dd-logs-intake"),
+        LOGS_INTAKE("dd-logs-intake"),
 
-    LLMOBS_EVALS_PROCESSOR("dd-llmobs-evals-processor"),
+        LLMOBS_EVALS_PROCESSOR("dd-llmobs-evals-processor"),
 
-    LLMOBS_FEEDBACK_PROCESSOR("dd-llmobs-feedback-processor"),
+        LLMOBS_FEEDBACK_PROCESSOR("dd-llmobs-feedback-processor"),
 
-    FEATURE_FLAG_EXPOSURE_PROCESSOR("dd-ffe-exposure-processor"),
-    FEATURE_FLAG_EVALUATION_PROCESSOR("dd-ffe-evaluation-processor"),
-    FEATURE_FLAG_CONFIGURATION_POLLER("dd-feature-flagging-http-poller");
+        FEATURE_FLAG_EXPOSURE_PROCESSOR("dd-ffe-exposure-processor"),
+        FEATURE_FLAG_EVALUATION_PROCESSOR("dd-ffe-evaluation-processor"),
+        FEATURE_FLAG_CONFIGURATION_POLLER("dd-feature-flagging-http-poller");
 
-    public final String threadName;
+        public final String threadName;
 
-    AgentThread(final String threadName) {
-      this.threadName = threadName;
+        AgentThread(final String threadName) {
+            this.threadName = threadName;
+        }
     }
-  }
-
-  private final AgentThread agentThread;
-
-  /**
-   * Constructs a new agent {@code ThreadFactory}.
-   *
-   * @param agentThread the agent thread created by this factory.
-   */
-  public AgentThreadFactory(final AgentThread agentThread) {
-    this.agentThread = agentThread;
-  }
-
-  @Override
-  public Thread newThread(final Runnable runnable) {
-    return newAgentThread(agentThread, runnable);
-  }
-
-  /**
-   * Constructs a new agent {@code Thread} as a daemon with a null ContextClassLoader.
-   *
-   * @param agentThread the agent thread to create.
-   * @param runnable work to run on the new thread.
-   */
-  public static Thread newAgentThread(final AgentThread agentThread, final Runnable runnable) {
-    return newAgentThread(agentThread, null, runnable, true);
-  }
-
-  public static Thread newAgentThread(
-      final AgentThread agentThread, final Runnable runnable, boolean daemon) {
-    return newAgentThread(agentThread, null, runnable, daemon);
-  }
-
-  public static Thread newAgentThread(
-      final AgentThread agentThread,
-      final String nameSuffix,
-      final Runnable runnable,
-      boolean daemon) {
-    final String threadName =
-        nameSuffix != null ? agentThread.threadName + nameSuffix : agentThread.threadName;
-    final Thread thread = new Thread(AGENT_THREAD_GROUP, runnable, threadName);
-    thread.setDaemon(daemon);
-    thread.setContextClassLoader(null);
-    thread.setUncaughtExceptionHandler(
-        new Thread.UncaughtExceptionHandler() {
-          @Override
-          public void uncaughtException(final Thread thread, final Throwable e) {
-            LoggerFactory.getLogger(runnable.getClass())
-                .error("Uncaught exception {} in {}", e, agentThread.threadName, e);
-          }
+
+    private final AgentThread agentThread;
+
+    /**
+     * Constructs a new agent {@code ThreadFactory}.
+     *
+     * @param agentThread the agent thread created by this factory.
+     */
+    public AgentThreadFactory(final AgentThread agentThread) {
+        this.agentThread = agentThread;
+    }
+
+    @Override
+    public Thread newThread(final Runnable runnable) {
+        return newAgentThread(agentThread, runnable);
+    }
+
+    /**
+     * Constructs a new agent {@code Thread} as a daemon with a null ContextClassLoader.
+     *
+     * @param agentThread the agent thread to create.
+     * @param runnable work to run on the new thread.
+     */
+    public static Thread newAgentThread(final AgentThread agentThread, final Runnable runnable) {
+        return newAgentThread(agentThread, null, runnable, true);
+    }
+
+    public static Thread newAgentThread(final AgentThread agentThread, final Runnable runnable, boolean daemon) {
+        return newAgentThread(agentThread, null, runnable, daemon);
+    }
+
+    public static Thread newAgentThread(
+            final AgentThread agentThread, final String nameSuffix, final Runnable runnable, boolean daemon) {
+        final String threadName = nameSuffix != null ? agentThread.threadName + nameSuffix : agentThread.threadName;
+        final Thread thread = new Thread(AGENT_THREAD_GROUP, runnable, threadName);
+        thread.setDaemon(daemon);
+        thread.setContextClassLoader(null);
+        thread.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+            @Override
+            public void uncaughtException(final Thread thread, final Throwable e) {
+                LoggerFactory.getLogger(runnable.getClass())
+                        .error("Uncaught exception {} in {}", e, agentThread.threadName, e);
+            }
         });
-    return thread;
-  }
+        return thread;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/BitUtils.java b/internal-api/src/main/java/datadog/trace/util/BitUtils.java
index 8426c4e1cc4..fc3cdd17461 100644
--- a/internal-api/src/main/java/datadog/trace/util/BitUtils.java
+++ b/internal-api/src/main/java/datadog/trace/util/BitUtils.java
@@ -1,34 +1,34 @@
 package datadog.trace.util;
 
 public final class BitUtils {
-  private BitUtils() {}
+    private BitUtils() {}
 
-  /**
-   * Returns the next power of two greater than or equal to the given value. If the input is zero or
-   * negative, this method returns 1;
-   *
-   * @param value the input value
-   * @return the next power of two ≥ {@code value}
-   */
-  public static int nextPowerOfTwo(int value) {
-    // The next power of two for 0 or 1 is 1.
-    if (value <= 1) {
-      return 1;
-    }
+    /**
+     * Returns the next power of two greater than or equal to the given value. If the input is zero or
+     * negative, this method returns 1;
+     *
+     * @param value the input value
+     * @return the next power of two ≥ {@code value}
+     */
+    public static int nextPowerOfTwo(int value) {
+        // The next power of two for 0 or 1 is 1.
+        if (value <= 1) {
+            return 1;
+        }
 
-    // Compute how many leading zero bits there are in (value - 1).  This gives us information about
-    // where the highest set bit is.
-    int n = Integer.numberOfLeadingZeros(value - 1);
+        // Compute how many leading zero bits there are in (value - 1).  This gives us information about
+        // where the highest set bit is.
+        int n = Integer.numberOfLeadingZeros(value - 1);
 
-    //  -1 in two's complement = 0xFFFF_FFFF (all bits set to 1). Unsigned right-shifting by n: (-1
-    // >>> n) produces a mask of (32 - n) one-bits.
-    int result = (-1 >>> n) + 1;
+        //  -1 in two's complement = 0xFFFF_FFFF (all bits set to 1). Unsigned right-shifting by n: (-1
+        // >>> n) produces a mask of (32 - n) one-bits.
+        int result = (-1 >>> n) + 1;
 
-    // If result overflowed clamp it to the largest unsigned power of two fitting an int.
-    if (result <= 0) {
-      return 1 << 30;
-    }
+        // If result overflowed clamp it to the largest unsigned power of two fitting an int.
+        if (result <= 0) {
+            return 1 << 30;
+        }
 
-    return result;
-  }
+        return result;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/CollectionUtils.java b/internal-api/src/main/java/datadog/trace/util/CollectionUtils.java
index 58a7431d612..641773169dc 100644
--- a/internal-api/src/main/java/datadog/trace/util/CollectionUtils.java
+++ b/internal-api/src/main/java/datadog/trace/util/CollectionUtils.java
@@ -17,103 +17,102 @@
 
 public final class CollectionUtils {
 
-  private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
-  private static final MethodHandle IMMUTABLE_COPY_OF_SET = findCopyOf(Set.class, Collection.class);
-  private static final MethodHandle IMMUTABLE_COPY_OF_LIST =
-      findCopyOf(List.class, Collection.class);
-  private static final MethodHandle IMMUTABLE_COPY_OF_MAP = findCopyOf(Map.class, Map.class);
+    private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
+    private static final MethodHandle IMMUTABLE_COPY_OF_SET = findCopyOf(Set.class, Collection.class);
+    private static final MethodHandle IMMUTABLE_COPY_OF_LIST = findCopyOf(List.class, Collection.class);
+    private static final MethodHandle IMMUTABLE_COPY_OF_MAP = findCopyOf(Map.class, Map.class);
 
-  /**
-   * Converts the input to an immutable set if available on the current platform. Otherwise returns
-   * the input as a set.
-   *
-   * @param input the input.
-   * @param <T> the type of the elements of the input.
-   * @return an immutable copy of the input if possible.
-   */
-  @SuppressWarnings("unchecked")
-  public static <T> Set<T> tryMakeImmutableSet(Collection<T> input) {
-    if (null != IMMUTABLE_COPY_OF_SET) {
-      try {
-        return (Set<T>) IMMUTABLE_COPY_OF_SET.invokeExact(input);
-      } catch (Throwable ignore) {
-      }
+    /**
+     * Converts the input to an immutable set if available on the current platform. Otherwise returns
+     * the input as a set.
+     *
+     * @param input the input.
+     * @param <T> the type of the elements of the input.
+     * @return an immutable copy of the input if possible.
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Set<T> tryMakeImmutableSet(Collection<T> input) {
+        if (null != IMMUTABLE_COPY_OF_SET) {
+            try {
+                return (Set<T>) IMMUTABLE_COPY_OF_SET.invokeExact(input);
+            } catch (Throwable ignore) {
+            }
+        }
+        return input instanceof Set ? (Set<T>) input : new HashSet<>(input);
     }
-    return input instanceof Set ? (Set<T>) input : new HashSet<>(input);
-  }
 
-  /**
-   * Converts the input to an immutable list if available on the current platform. Otherwise returns
-   * the input as a list.
-   *
-   * @param input the input.
-   * @param <T> the type of the elements of the input.
-   * @return an immutable copy of the input if possible.
-   */
-  @SuppressWarnings("unchecked")
-  public static <T> List<T> tryMakeImmutableList(Collection<T> input) {
-    if (null != IMMUTABLE_COPY_OF_LIST) {
-      try {
-        return (List<T>) IMMUTABLE_COPY_OF_LIST.invokeExact(input);
-      } catch (Throwable ignore) {
-      }
+    /**
+     * Converts the input to an immutable list if available on the current platform. Otherwise returns
+     * the input as a list.
+     *
+     * @param input the input.
+     * @param <T> the type of the elements of the input.
+     * @return an immutable copy of the input if possible.
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> List<T> tryMakeImmutableList(Collection<T> input) {
+        if (null != IMMUTABLE_COPY_OF_LIST) {
+            try {
+                return (List<T>) IMMUTABLE_COPY_OF_LIST.invokeExact(input);
+            } catch (Throwable ignore) {
+            }
+        }
+        return input instanceof List ? (List<T>) input : new ArrayList<>(input);
     }
-    return input instanceof List ? (List<T>) input : new ArrayList<>(input);
-  }
 
-  /**
-   * Converts the input to an immutable map if available on the current platform. Otherwise returns
-   * the input.
-   *
-   * @param input the input.
-   * @param <K> the key type
-   * @param <V> the value type
-   * @return an immutable copy of the input if possible.
-   */
-  @SuppressWarnings("unchecked")
-  public static <K, V> Map<K, V> tryMakeImmutableMap(Map<K, V> input) {
-    if (null != IMMUTABLE_COPY_OF_MAP) {
-      try {
-        return (Map<K, V>) IMMUTABLE_COPY_OF_MAP.invokeExact(input);
-      } catch (Throwable ignore) {
-      }
+    /**
+     * Converts the input to an immutable map if available on the current platform. Otherwise returns
+     * the input.
+     *
+     * @param input the input.
+     * @param <K> the key type
+     * @param <V> the value type
+     * @return an immutable copy of the input if possible.
+     */
+    @SuppressWarnings("unchecked")
+    public static <K, V> Map<K, V> tryMakeImmutableMap(Map<K, V> input) {
+        if (null != IMMUTABLE_COPY_OF_MAP) {
+            try {
+                return (Map<K, V>) IMMUTABLE_COPY_OF_MAP.invokeExact(input);
+            } catch (Throwable ignore) {
+            }
+        }
+        return input;
     }
-    return input;
-  }
 
-  private static MethodHandle findCopyOf(Class<?> clazz, Class<?> arg) {
-    if (isJavaVersionAtLeast(10)) {
-      try {
-        return LOOKUP.findStatic(clazz, "copyOf", MethodType.methodType(clazz, arg));
-      } catch (NoSuchMethodException | IllegalAccessException ignore) {
-      }
+    private static MethodHandle findCopyOf(Class<?> clazz, Class<?> arg) {
+        if (isJavaVersionAtLeast(10)) {
+            try {
+                return LOOKUP.findStatic(clazz, "copyOf", MethodType.methodType(clazz, arg));
+            } catch (NoSuchMethodException | IllegalAccessException ignore) {
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  /** Appends value to an array, growing it as needed; treats null arrays as empty. */
-  public static <T> T[] appendToArray(@Nullable T[] array, T value) {
-    T[] appended;
-    if (array == null) {
-      //noinspection unchecked
-      appended = (T[]) Array.newInstance(value.getClass(), 1);
-      appended[0] = value;
-    } else {
-      appended = Arrays.copyOf(array, array.length + 1);
-      appended[array.length] = value;
+    /** Appends value to an array, growing it as needed; treats null arrays as empty. */
+    public static <T> T[] appendToArray(@Nullable T[] array, T value) {
+        T[] appended;
+        if (array == null) {
+            //noinspection unchecked
+            appended = (T[]) Array.newInstance(value.getClass(), 1);
+            appended[0] = value;
+        } else {
+            appended = Arrays.copyOf(array, array.length + 1);
+            appended[array.length] = value;
+        }
+        return appended;
     }
-    return appended;
-  }
 
-  /** Checks whether an array contains an element; treats null arrays as empty. */
-  public static <T> boolean arrayContains(@Nullable T[] array, T value) {
-    if (array != null) {
-      for (T element : array) {
-        if (value.equals(element)) {
-          return true;
+    /** Checks whether an array contains an element; treats null arrays as empty. */
+    public static <T> boolean arrayContains(@Nullable T[] array, T value) {
+        if (array != null) {
+            for (T element : array) {
+                if (value.equals(element)) {
+                    return true;
+                }
+            }
         }
-      }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java b/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java
index 147607c71f0..590832f6732 100644
--- a/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java
+++ b/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java
@@ -12,512 +12,512 @@
 
 // backported from org.apache.maven:maven-artifact:3.9.9
 public class ComparableVersion implements Comparable<ComparableVersion> {
-  private static final int MAX_INTITEM_LENGTH = 9;
-  private static final int MAX_LONGITEM_LENGTH = 18;
-  private String value;
-  private String canonical;
-  private ListItem items;
-
-  public ComparableVersion(String version) {
-    this.parseVersion(version);
-  }
-
-  public final void parseVersion(String version) {
-    this.value = version;
-    this.items = new ListItem();
-    version = version.toLowerCase(Locale.ENGLISH);
-    ListItem list = this.items;
-    Deque<Item> stack = new ArrayDeque();
-    stack.push(list);
-    boolean isDigit = false;
-    int startIndex = 0;
-
-    for (int i = 0; i < version.length(); ++i) {
-      char c = version.charAt(i);
-      if (c == '.') {
-        if (i == startIndex) {
-          list.add(ComparableVersion.IntItem.ZERO);
-        } else {
-          list.add(parseItem(isDigit, version.substring(startIndex, i)));
+    private static final int MAX_INTITEM_LENGTH = 9;
+    private static final int MAX_LONGITEM_LENGTH = 18;
+    private String value;
+    private String canonical;
+    private ListItem items;
+
+    public ComparableVersion(String version) {
+        this.parseVersion(version);
+    }
+
+    public final void parseVersion(String version) {
+        this.value = version;
+        this.items = new ListItem();
+        version = version.toLowerCase(Locale.ENGLISH);
+        ListItem list = this.items;
+        Deque<Item> stack = new ArrayDeque();
+        stack.push(list);
+        boolean isDigit = false;
+        int startIndex = 0;
+
+        for (int i = 0; i < version.length(); ++i) {
+            char c = version.charAt(i);
+            if (c == '.') {
+                if (i == startIndex) {
+                    list.add(ComparableVersion.IntItem.ZERO);
+                } else {
+                    list.add(parseItem(isDigit, version.substring(startIndex, i)));
+                }
+
+                startIndex = i + 1;
+            } else if (c == '-') {
+                if (i == startIndex) {
+                    list.add(ComparableVersion.IntItem.ZERO);
+                } else {
+                    list.add(parseItem(isDigit, version.substring(startIndex, i)));
+                }
+
+                startIndex = i + 1;
+                list.add(list = new ListItem());
+                stack.push(list);
+            } else if (Character.isDigit(c)) {
+                if (!isDigit && i > startIndex) {
+                    if (!list.isEmpty()) {
+                        list.add(list = new ListItem());
+                        stack.push(list);
+                    }
+
+                    list.add(new StringItem(version.substring(startIndex, i), true));
+                    startIndex = i;
+                    list.add(list = new ListItem());
+                    stack.push(list);
+                }
+
+                isDigit = true;
+            } else {
+                if (isDigit && i > startIndex) {
+                    list.add(parseItem(true, version.substring(startIndex, i)));
+                    startIndex = i;
+                    list.add(list = new ListItem());
+                    stack.push(list);
+                }
+
+                isDigit = false;
+            }
         }
 
-        startIndex = i + 1;
-      } else if (c == '-') {
-        if (i == startIndex) {
-          list.add(ComparableVersion.IntItem.ZERO);
-        } else {
-          list.add(parseItem(isDigit, version.substring(startIndex, i)));
+        if (version.length() > startIndex) {
+            if (!isDigit && !list.isEmpty()) {
+                list.add(list = new ListItem());
+                stack.push(list);
+            }
+
+            list.add(parseItem(isDigit, version.substring(startIndex)));
         }
 
-        startIndex = i + 1;
-        list.add(list = new ListItem());
-        stack.push(list);
-      } else if (Character.isDigit(c)) {
-        if (!isDigit && i > startIndex) {
-          if (!list.isEmpty()) {
-            list.add(list = new ListItem());
-            stack.push(list);
-          }
-
-          list.add(new StringItem(version.substring(startIndex, i), true));
-          startIndex = i;
-          list.add(list = new ListItem());
-          stack.push(list);
-        }
-
-        isDigit = true;
-      } else {
-        if (isDigit && i > startIndex) {
-          list.add(parseItem(true, version.substring(startIndex, i)));
-          startIndex = i;
-          list.add(list = new ListItem());
-          stack.push(list);
-        }
-
-        isDigit = false;
-      }
+        while (!stack.isEmpty()) {
+            list = (ListItem) stack.pop();
+            list.normalize();
+        }
     }
 
-    if (version.length() > startIndex) {
-      if (!isDigit && !list.isEmpty()) {
-        list.add(list = new ListItem());
-        stack.push(list);
-      }
-
-      list.add(parseItem(isDigit, version.substring(startIndex)));
+    private static Item parseItem(boolean isDigit, String buf) {
+        if (isDigit) {
+            buf = stripLeadingZeroes(buf);
+            if (buf.length() <= 9) {
+                return new IntItem(buf);
+            } else {
+                return buf.length() <= 18 ? new LongItem(buf) : new BigIntegerItem(buf);
+            }
+        } else {
+            return new StringItem(buf, false);
+        }
     }
 
-    while (!stack.isEmpty()) {
-      list = (ListItem) stack.pop();
-      list.normalize();
-    }
-  }
-
-  private static Item parseItem(boolean isDigit, String buf) {
-    if (isDigit) {
-      buf = stripLeadingZeroes(buf);
-      if (buf.length() <= 9) {
-        return new IntItem(buf);
-      } else {
-        return buf.length() <= 18 ? new LongItem(buf) : new BigIntegerItem(buf);
-      }
-    } else {
-      return new StringItem(buf, false);
-    }
-  }
+    private static String stripLeadingZeroes(String buf) {
+        if (buf != null && !buf.isEmpty()) {
+            for (int i = 0; i < buf.length(); ++i) {
+                char c = buf.charAt(i);
+                if (c != '0') {
+                    return buf.substring(i);
+                }
+            }
 
-  private static String stripLeadingZeroes(String buf) {
-    if (buf != null && !buf.isEmpty()) {
-      for (int i = 0; i < buf.length(); ++i) {
-        char c = buf.charAt(i);
-        if (c != '0') {
-          return buf.substring(i);
+            return buf;
+        } else {
+            return "0";
         }
-      }
-
-      return buf;
-    } else {
-      return "0";
     }
-  }
-
-  public int compareTo(ComparableVersion o) {
-    return this.items.compareTo(o.items);
-  }
-
-  public String toString() {
-    return this.value;
-  }
 
-  public String getCanonical() {
-    if (this.canonical == null) {
-      this.canonical = this.items.toString();
+    public int compareTo(ComparableVersion o) {
+        return this.items.compareTo(o.items);
     }
 
-    return this.canonical;
-  }
-
-  public boolean equals(Object o) {
-    return o instanceof ComparableVersion && this.items.equals(((ComparableVersion) o).items);
-  }
-
-  public int hashCode() {
-    return this.items.hashCode();
-  }
+    public String toString() {
+        return this.value;
+    }
 
-  private static class IntItem implements Item {
-    private final int value;
-    public static final IntItem ZERO = new IntItem();
+    public String getCanonical() {
+        if (this.canonical == null) {
+            this.canonical = this.items.toString();
+        }
 
-    private IntItem() {
-      this.value = 0;
+        return this.canonical;
     }
 
-    IntItem(String str) {
-      this.value = Integer.parseInt(str);
+    public boolean equals(Object o) {
+        return o instanceof ComparableVersion && this.items.equals(((ComparableVersion) o).items);
     }
 
-    public int getType() {
-      return 3;
+    public int hashCode() {
+        return this.items.hashCode();
     }
 
-    public boolean isNull() {
-      return this.value == 0;
-    }
+    private static class IntItem implements Item {
+        private final int value;
+        public static final IntItem ZERO = new IntItem();
 
-    public int compareTo(Item item) {
-      if (item == null) {
-        return this.value == 0 ? 0 : 1;
-      } else {
-        switch (item.getType()) {
-          case 0:
-          case 4:
-            return -1;
-          case 1:
-            return 1;
-          case 2:
-            return 1;
-          case 3:
-            int itemValue = ((IntItem) item).value;
-            return this.value < itemValue ? -1 : (this.value == itemValue ? 0 : 1);
-          default:
-            throw new IllegalStateException("invalid item: " + item.getClass());
+        private IntItem() {
+            this.value = 0;
         }
-      }
-    }
 
-    public boolean equals(Object o) {
-      if (this == o) {
-        return true;
-      } else if (o != null && this.getClass() == o.getClass()) {
-        IntItem intItem = (IntItem) o;
-        return this.value == intItem.value;
-      } else {
-        return false;
-      }
-    }
+        IntItem(String str) {
+            this.value = Integer.parseInt(str);
+        }
 
-    public int hashCode() {
-      return this.value;
-    }
+        public int getType() {
+            return 3;
+        }
 
-    public String toString() {
-      return Integer.toString(this.value);
-    }
-  }
+        public boolean isNull() {
+            return this.value == 0;
+        }
 
-  private static class LongItem implements Item {
-    private final long value;
+        public int compareTo(Item item) {
+            if (item == null) {
+                return this.value == 0 ? 0 : 1;
+            } else {
+                switch (item.getType()) {
+                    case 0:
+                    case 4:
+                        return -1;
+                    case 1:
+                        return 1;
+                    case 2:
+                        return 1;
+                    case 3:
+                        int itemValue = ((IntItem) item).value;
+                        return this.value < itemValue ? -1 : (this.value == itemValue ? 0 : 1);
+                    default:
+                        throw new IllegalStateException("invalid item: " + item.getClass());
+                }
+            }
+        }
 
-    LongItem(String str) {
-      this.value = Long.parseLong(str);
-    }
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            } else if (o != null && this.getClass() == o.getClass()) {
+                IntItem intItem = (IntItem) o;
+                return this.value == intItem.value;
+            } else {
+                return false;
+            }
+        }
 
-    public int getType() {
-      return 4;
-    }
+        public int hashCode() {
+            return this.value;
+        }
 
-    public boolean isNull() {
-      return this.value == 0L;
+        public String toString() {
+            return Integer.toString(this.value);
+        }
     }
 
-    public int compareTo(Item item) {
-      if (item == null) {
-        return this.value == 0L ? 0 : 1;
-      } else {
-        switch (item.getType()) {
-          case 0:
-            return -1;
-          case 1:
-            return 1;
-          case 2:
-            return 1;
-          case 3:
-            return 1;
-          case 4:
-            long itemValue = ((LongItem) item).value;
-            return this.value < itemValue ? -1 : (this.value == itemValue ? 0 : 1);
-          default:
-            throw new IllegalStateException("invalid item: " + item.getClass());
+    private static class LongItem implements Item {
+        private final long value;
+
+        LongItem(String str) {
+            this.value = Long.parseLong(str);
         }
-      }
-    }
 
-    public boolean equals(Object o) {
-      if (this == o) {
-        return true;
-      } else if (o != null && this.getClass() == o.getClass()) {
-        LongItem longItem = (LongItem) o;
-        return this.value == longItem.value;
-      } else {
-        return false;
-      }
-    }
+        public int getType() {
+            return 4;
+        }
 
-    public int hashCode() {
-      return (int) (this.value ^ this.value >>> 32);
-    }
+        public boolean isNull() {
+            return this.value == 0L;
+        }
 
-    public String toString() {
-      return Long.toString(this.value);
-    }
-  }
+        public int compareTo(Item item) {
+            if (item == null) {
+                return this.value == 0L ? 0 : 1;
+            } else {
+                switch (item.getType()) {
+                    case 0:
+                        return -1;
+                    case 1:
+                        return 1;
+                    case 2:
+                        return 1;
+                    case 3:
+                        return 1;
+                    case 4:
+                        long itemValue = ((LongItem) item).value;
+                        return this.value < itemValue ? -1 : (this.value == itemValue ? 0 : 1);
+                    default:
+                        throw new IllegalStateException("invalid item: " + item.getClass());
+                }
+            }
+        }
 
-  private static class BigIntegerItem implements Item {
-    private final BigInteger value;
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            } else if (o != null && this.getClass() == o.getClass()) {
+                LongItem longItem = (LongItem) o;
+                return this.value == longItem.value;
+            } else {
+                return false;
+            }
+        }
 
-    BigIntegerItem(String str) {
-      this.value = new BigInteger(str);
-    }
+        public int hashCode() {
+            return (int) (this.value ^ this.value >>> 32);
+        }
 
-    public int getType() {
-      return 0;
+        public String toString() {
+            return Long.toString(this.value);
+        }
     }
 
-    public boolean isNull() {
-      return BigInteger.ZERO.equals(this.value);
-    }
+    private static class BigIntegerItem implements Item {
+        private final BigInteger value;
 
-    public int compareTo(Item item) {
-      if (item == null) {
-        return BigInteger.ZERO.equals(this.value) ? 0 : 1;
-      } else {
-        switch (item.getType()) {
-          case 0:
-            return this.value.compareTo(((BigIntegerItem) item).value);
-          case 1:
-            return 1;
-          case 2:
-            return 1;
-          case 3:
-          case 4:
-            return 1;
-          default:
-            throw new IllegalStateException("invalid item: " + item.getClass());
+        BigIntegerItem(String str) {
+            this.value = new BigInteger(str);
         }
-      }
-    }
 
-    public boolean equals(Object o) {
-      if (this == o) {
-        return true;
-      } else if (o != null && this.getClass() == o.getClass()) {
-        BigIntegerItem that = (BigIntegerItem) o;
-        return this.value.equals(that.value);
-      } else {
-        return false;
-      }
-    }
+        public int getType() {
+            return 0;
+        }
 
-    public int hashCode() {
-      return this.value.hashCode();
-    }
+        public boolean isNull() {
+            return BigInteger.ZERO.equals(this.value);
+        }
 
-    public String toString() {
-      return this.value.toString();
-    }
-  }
-
-  private static class StringItem implements Item {
-    private static final List<String> QUALIFIERS =
-        Arrays.asList("alpha", "beta", "milestone", "rc", "snapshot", "", "sp");
-    private static final Properties ALIASES = new Properties();
-    private static final String RELEASE_VERSION_INDEX;
-    private final String value;
-
-    StringItem(String value, boolean followedByDigit) {
-      if (followedByDigit && value.length() == 1) {
-        switch (value.charAt(0)) {
-          case 'a':
-            value = "alpha";
-            break;
-          case 'b':
-            value = "beta";
-            break;
-          case 'm':
-            value = "milestone";
-            break;
-          default:
-            break;
-        }
-      }
-
-      this.value = ALIASES.getProperty(value, value);
-    }
+        public int compareTo(Item item) {
+            if (item == null) {
+                return BigInteger.ZERO.equals(this.value) ? 0 : 1;
+            } else {
+                switch (item.getType()) {
+                    case 0:
+                        return this.value.compareTo(((BigIntegerItem) item).value);
+                    case 1:
+                        return 1;
+                    case 2:
+                        return 1;
+                    case 3:
+                    case 4:
+                        return 1;
+                    default:
+                        throw new IllegalStateException("invalid item: " + item.getClass());
+                }
+            }
+        }
 
-    public int getType() {
-      return 1;
-    }
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            } else if (o != null && this.getClass() == o.getClass()) {
+                BigIntegerItem that = (BigIntegerItem) o;
+                return this.value.equals(that.value);
+            } else {
+                return false;
+            }
+        }
 
-    public boolean isNull() {
-      return comparableQualifier(this.value).compareTo(RELEASE_VERSION_INDEX) == 0;
-    }
+        public int hashCode() {
+            return this.value.hashCode();
+        }
 
-    public static String comparableQualifier(String qualifier) {
-      int i = QUALIFIERS.indexOf(qualifier);
-      return i == -1 ? QUALIFIERS.size() + "-" + qualifier : String.valueOf(i);
+        public String toString() {
+            return this.value.toString();
+        }
     }
 
-    public int compareTo(Item item) {
-      if (item == null) {
-        return comparableQualifier(this.value).compareTo(RELEASE_VERSION_INDEX);
-      } else {
-        switch (item.getType()) {
-          case 0:
-          case 3:
-          case 4:
-            return -1;
-          case 1:
-            return comparableQualifier(this.value)
-                .compareTo(comparableQualifier(((StringItem) item).value));
-          case 2:
-            return -1;
-          default:
-            throw new IllegalStateException("invalid item: " + item.getClass());
-        }
-      }
-    }
+    private static class StringItem implements Item {
+        private static final List<String> QUALIFIERS =
+                Arrays.asList("alpha", "beta", "milestone", "rc", "snapshot", "", "sp");
+        private static final Properties ALIASES = new Properties();
+        private static final String RELEASE_VERSION_INDEX;
+        private final String value;
+
+        StringItem(String value, boolean followedByDigit) {
+            if (followedByDigit && value.length() == 1) {
+                switch (value.charAt(0)) {
+                    case 'a':
+                        value = "alpha";
+                        break;
+                    case 'b':
+                        value = "beta";
+                        break;
+                    case 'm':
+                        value = "milestone";
+                        break;
+                    default:
+                        break;
+                }
+            }
 
-    public boolean equals(Object o) {
-      if (this == o) {
-        return true;
-      } else if (o != null && this.getClass() == o.getClass()) {
-        StringItem that = (StringItem) o;
-        return this.value.equals(that.value);
-      } else {
-        return false;
-      }
-    }
+            this.value = ALIASES.getProperty(value, value);
+        }
 
-    public int hashCode() {
-      return this.value.hashCode();
-    }
+        public int getType() {
+            return 1;
+        }
 
-    public String toString() {
-      return this.value;
-    }
+        public boolean isNull() {
+            return comparableQualifier(this.value).compareTo(RELEASE_VERSION_INDEX) == 0;
+        }
 
-    static {
-      ALIASES.put("ga", "");
-      ALIASES.put("final", "");
-      ALIASES.put("release", "");
-      ALIASES.put("cr", "rc");
-      RELEASE_VERSION_INDEX = String.valueOf(QUALIFIERS.indexOf(""));
-    }
-  }
+        public static String comparableQualifier(String qualifier) {
+            int i = QUALIFIERS.indexOf(qualifier);
+            return i == -1 ? QUALIFIERS.size() + "-" + qualifier : String.valueOf(i);
+        }
 
-  private static class ListItem extends ArrayList<Item> implements Item {
-    private ListItem() {
-      super();
-    }
+        public int compareTo(Item item) {
+            if (item == null) {
+                return comparableQualifier(this.value).compareTo(RELEASE_VERSION_INDEX);
+            } else {
+                switch (item.getType()) {
+                    case 0:
+                    case 3:
+                    case 4:
+                        return -1;
+                    case 1:
+                        return comparableQualifier(this.value)
+                                .compareTo(comparableQualifier(((StringItem) item).value));
+                    case 2:
+                        return -1;
+                    default:
+                        throw new IllegalStateException("invalid item: " + item.getClass());
+                }
+            }
+        }
 
-    public int getType() {
-      return 2;
-    }
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            } else if (o != null && this.getClass() == o.getClass()) {
+                StringItem that = (StringItem) o;
+                return this.value.equals(that.value);
+            } else {
+                return false;
+            }
+        }
 
-    public boolean isNull() {
-      return this.size() == 0;
-    }
+        public int hashCode() {
+            return this.value.hashCode();
+        }
+
+        public String toString() {
+            return this.value;
+        }
 
-    void normalize() {
-      for (int i = this.size() - 1; i >= 0; --i) {
-        Item lastItem = this.get(i);
-        if (lastItem.isNull()) {
-          this.remove(i);
-        } else if (!(lastItem instanceof ListItem)) {
-          break;
+        static {
+            ALIASES.put("ga", "");
+            ALIASES.put("final", "");
+            ALIASES.put("release", "");
+            ALIASES.put("cr", "rc");
+            RELEASE_VERSION_INDEX = String.valueOf(QUALIFIERS.indexOf(""));
         }
-      }
     }
 
-    public int compareTo(Item item) {
-      if (item == null) {
-        if (this.size() == 0) {
-          return 0;
-        } else {
-          for (Item i : this) {
-            int result = i.compareTo(null);
-            if (result != 0) {
-              return result;
-            }
-          }
+    private static class ListItem extends ArrayList<Item> implements Item {
+        private ListItem() {
+            super();
+        }
 
-          return 0;
+        public int getType() {
+            return 2;
         }
-      } else {
-        switch (item.getType()) {
-          case 0:
-          case 3:
-          case 4:
-            return -1;
-          case 1:
-            return 1;
-          case 2:
-            Iterator<Item> left = this.iterator();
-            Iterator<Item> right = ((ListItem) item).iterator();
-
-            while (left.hasNext() || right.hasNext()) {
-              Item l = left.hasNext() ? left.next() : null;
-              Item r = right.hasNext() ? right.next() : null;
-              int result = l == null ? (r == null ? 0 : -1 * r.compareTo(l)) : l.compareTo(r);
-              if (result != 0) {
-                return result;
-              }
-            }
 
-            return 0;
-          default:
-            throw new IllegalStateException("invalid item: " + item.getClass());
+        public boolean isNull() {
+            return this.size() == 0;
         }
-      }
-    }
 
-    public String toString() {
-      StringBuilder buffer = new StringBuilder();
+        void normalize() {
+            for (int i = this.size() - 1; i >= 0; --i) {
+                Item lastItem = this.get(i);
+                if (lastItem.isNull()) {
+                    this.remove(i);
+                } else if (!(lastItem instanceof ListItem)) {
+                    break;
+                }
+            }
+        }
 
-      for (Item item : this) {
-        if (buffer.length() > 0) {
-          buffer.append(item instanceof ListItem ? '-' : '.');
+        public int compareTo(Item item) {
+            if (item == null) {
+                if (this.size() == 0) {
+                    return 0;
+                } else {
+                    for (Item i : this) {
+                        int result = i.compareTo(null);
+                        if (result != 0) {
+                            return result;
+                        }
+                    }
+
+                    return 0;
+                }
+            } else {
+                switch (item.getType()) {
+                    case 0:
+                    case 3:
+                    case 4:
+                        return -1;
+                    case 1:
+                        return 1;
+                    case 2:
+                        Iterator<Item> left = this.iterator();
+                        Iterator<Item> right = ((ListItem) item).iterator();
+
+                        while (left.hasNext() || right.hasNext()) {
+                            Item l = left.hasNext() ? left.next() : null;
+                            Item r = right.hasNext() ? right.next() : null;
+                            int result = l == null ? (r == null ? 0 : -1 * r.compareTo(l)) : l.compareTo(r);
+                            if (result != 0) {
+                                return result;
+                            }
+                        }
+
+                        return 0;
+                    default:
+                        throw new IllegalStateException("invalid item: " + item.getClass());
+                }
+            }
         }
 
-        buffer.append(item);
-      }
+        public String toString() {
+            StringBuilder buffer = new StringBuilder();
 
-      return buffer.toString();
-    }
+            for (Item item : this) {
+                if (buffer.length() > 0) {
+                    buffer.append(item instanceof ListItem ? '-' : '.');
+                }
 
-    private String toListString() {
-      StringBuilder buffer = new StringBuilder();
-      buffer.append('[');
+                buffer.append(item);
+            }
 
-      for (Item item : this) {
-        if (buffer.length() > 1) {
-          buffer.append(", ");
+            return buffer.toString();
         }
 
-        if (item instanceof ListItem) {
-          buffer.append(((ListItem) item).toListString());
-        } else {
-          buffer.append(item);
-        }
-      }
+        private String toListString() {
+            StringBuilder buffer = new StringBuilder();
+            buffer.append('[');
+
+            for (Item item : this) {
+                if (buffer.length() > 1) {
+                    buffer.append(", ");
+                }
 
-      buffer.append(']');
-      return buffer.toString();
+                if (item instanceof ListItem) {
+                    buffer.append(((ListItem) item).toListString());
+                } else {
+                    buffer.append(item);
+                }
+            }
+
+            buffer.append(']');
+            return buffer.toString();
+        }
     }
-  }
 
-  private interface Item {
-    int INT_ITEM = 3;
-    int LONG_ITEM = 4;
-    int BIGINTEGER_ITEM = 0;
-    int STRING_ITEM = 1;
-    int LIST_ITEM = 2;
+    private interface Item {
+        int INT_ITEM = 3;
+        int LONG_ITEM = 4;
+        int BIGINTEGER_ITEM = 0;
+        int STRING_ITEM = 1;
+        int LIST_ITEM = 2;
 
-    int compareTo(Item var1);
+        int compareTo(Item var1);
 
-    int getType();
+        int getType();
 
-    boolean isNull();
-  }
+        boolean isNull();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/ConcurrentEnumMap.java b/internal-api/src/main/java/datadog/trace/util/ConcurrentEnumMap.java
index 1fcc3440686..c671adffb36 100644
--- a/internal-api/src/main/java/datadog/trace/util/ConcurrentEnumMap.java
+++ b/internal-api/src/main/java/datadog/trace/util/ConcurrentEnumMap.java
@@ -13,175 +13,175 @@
 
 public class ConcurrentEnumMap<K extends Enum<K>, V> implements Map<K, V> {
 
-  private final K[] enumConstants;
-  private final AtomicReferenceArray<V> values;
-
-  public ConcurrentEnumMap(Class<K> enumClass) {
-    this.enumConstants = enumClass.getEnumConstants();
-    this.values = new AtomicReferenceArray<>(enumConstants.length);
-  }
-
-  private int indexOf(Object key) {
-    if (key == null) {
-      throw new NullPointerException("Key must not be null");
-    }
-    if (key.getClass() != enumConstants[0].getDeclaringClass()) {
-      throw new IllegalArgumentException("Key has wrong enum type");
-    }
-    @SuppressWarnings("unchecked")
-    K castKey = (K) key;
-    return castKey.ordinal();
-  }
-
-  @Override
-  public V get(Object key) {
-    int idx = indexOf(key);
-    return values.get(idx);
-  }
-
-  @Override
-  public V put(K key, V value) {
-    int idx = indexOf(key);
-    return values.getAndSet(idx, value);
-  }
-
-  @Override
-  public void putAll(@Nonnull Map<? extends K, ? extends V> m) {
-    for (Map.Entry<? extends K, ? extends V> e : m.entrySet()) {
-      put(e.getKey(), e.getValue());
-    }
-  }
-
-  @Override
-  public V remove(Object key) {
-    int idx = indexOf(key);
-    return values.getAndSet(idx, null);
-  }
-
-  @Override
-  public V putIfAbsent(@Nonnull K key, V value) {
-    int idx = indexOf(key);
-    while (true) {
-      V existing = values.get(idx);
-      if (existing != null) {
-        return existing;
-      }
-      if (values.compareAndSet(idx, null, value)) {
-        return null;
-      }
-    }
-  }
-
-  @Override
-  public boolean remove(@Nonnull Object key, Object value) {
-    int idx = indexOf(key);
-    V cur = values.get(idx);
-    if (cur == null || !cur.equals(value)) {
-      return false;
-    }
-    return values.compareAndSet(idx, cur, null);
-  }
-
-  @Override
-  public boolean replace(@Nonnull K key, @Nonnull V oldValue, @Nonnull V newValue) {
-    int idx = indexOf(key);
-    return values.compareAndSet(idx, oldValue, newValue);
-  }
-
-  @Override
-  public V replace(@Nonnull K key, @Nonnull V value) {
-    int idx = indexOf(key);
-    while (true) {
-      V cur = values.get(idx);
-      if (cur == null) {
-        return null;
-      }
-      if (values.compareAndSet(idx, cur, value)) {
-        return cur;
-      }
-    }
-  }
-
-  @Override
-  public int size() {
-    int count = 0;
-    for (int i = 0; i < values.length(); i++) {
-      if (values.get(i) != null) {
-        count++;
-      }
-    }
-    return count;
-  }
-
-  @Override
-  public boolean isEmpty() {
-    for (int i = 0; i < values.length(); i++) {
-      if (values.get(i) != null) {
-        return false;
-      }
+    private final K[] enumConstants;
+    private final AtomicReferenceArray<V> values;
+
+    public ConcurrentEnumMap(Class<K> enumClass) {
+        this.enumConstants = enumClass.getEnumConstants();
+        this.values = new AtomicReferenceArray<>(enumConstants.length);
+    }
+
+    private int indexOf(Object key) {
+        if (key == null) {
+            throw new NullPointerException("Key must not be null");
+        }
+        if (key.getClass() != enumConstants[0].getDeclaringClass()) {
+            throw new IllegalArgumentException("Key has wrong enum type");
+        }
+        @SuppressWarnings("unchecked")
+        K castKey = (K) key;
+        return castKey.ordinal();
+    }
+
+    @Override
+    public V get(Object key) {
+        int idx = indexOf(key);
+        return values.get(idx);
+    }
+
+    @Override
+    public V put(K key, V value) {
+        int idx = indexOf(key);
+        return values.getAndSet(idx, value);
+    }
+
+    @Override
+    public void putAll(@Nonnull Map<? extends K, ? extends V> m) {
+        for (Map.Entry<? extends K, ? extends V> e : m.entrySet()) {
+            put(e.getKey(), e.getValue());
+        }
     }
-    return true;
-  }
 
-  @Override
-  public boolean containsKey(Object key) {
-    return get(key) != null;
-  }
+    @Override
+    public V remove(Object key) {
+        int idx = indexOf(key);
+        return values.getAndSet(idx, null);
+    }
 
-  @Override
-  public boolean containsValue(Object value) {
-    for (int i = 0; i < values.length(); i++) {
-      V v = values.get(i);
-      if (v != null && v.equals(value)) {
+    @Override
+    public V putIfAbsent(@Nonnull K key, V value) {
+        int idx = indexOf(key);
+        while (true) {
+            V existing = values.get(idx);
+            if (existing != null) {
+                return existing;
+            }
+            if (values.compareAndSet(idx, null, value)) {
+                return null;
+            }
+        }
+    }
+
+    @Override
+    public boolean remove(@Nonnull Object key, Object value) {
+        int idx = indexOf(key);
+        V cur = values.get(idx);
+        if (cur == null || !cur.equals(value)) {
+            return false;
+        }
+        return values.compareAndSet(idx, cur, null);
+    }
+
+    @Override
+    public boolean replace(@Nonnull K key, @Nonnull V oldValue, @Nonnull V newValue) {
+        int idx = indexOf(key);
+        return values.compareAndSet(idx, oldValue, newValue);
+    }
+
+    @Override
+    public V replace(@Nonnull K key, @Nonnull V value) {
+        int idx = indexOf(key);
+        while (true) {
+            V cur = values.get(idx);
+            if (cur == null) {
+                return null;
+            }
+            if (values.compareAndSet(idx, cur, value)) {
+                return cur;
+            }
+        }
+    }
+
+    @Override
+    public int size() {
+        int count = 0;
+        for (int i = 0; i < values.length(); i++) {
+            if (values.get(i) != null) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        for (int i = 0; i < values.length(); i++) {
+            if (values.get(i) != null) {
+                return false;
+            }
+        }
         return true;
-      }
-    }
-    return false;
-  }
-
-  @Override
-  public void clear() {
-    for (int i = 0; i < values.length(); i++) {
-      values.set(i, null);
-    }
-  }
-
-  @Nonnull
-  @Override
-  public Set<K> keySet() {
-    Set<K> keys = EnumSet.noneOf(enumConstants[0].getDeclaringClass());
-    for (int i = 0; i < values.length(); i++) {
-      if (values.get(i) != null) {
-        keys.add(enumConstants[i]);
-      }
-    }
-    return Collections.unmodifiableSet(keys);
-  }
-
-  @Nonnull
-  @Override
-  public Collection<V> values() {
-    List<V> list = new ArrayList<>();
-    for (int i = 0; i < values.length(); i++) {
-      V value = values.get(i);
-      if (value != null) {
-        list.add(value);
-      }
-    }
-    return Collections.unmodifiableList(list);
-  }
-
-  @Nonnull
-  @Override
-  public Set<Map.Entry<K, V>> entrySet() {
-    Set<Map.Entry<K, V>> entrySet = new java.util.HashSet<>();
-    for (int i = 0; i < enumConstants.length; i++) {
-      V value = values.get(i);
-      if (value != null) {
-        K key = enumConstants[i];
-        entrySet.add(new AbstractMap.SimpleEntry<>(key, value));
-      }
-    }
-    return Collections.unmodifiableSet(entrySet);
-  }
+    }
+
+    @Override
+    public boolean containsKey(Object key) {
+        return get(key) != null;
+    }
+
+    @Override
+    public boolean containsValue(Object value) {
+        for (int i = 0; i < values.length(); i++) {
+            V v = values.get(i);
+            if (v != null && v.equals(value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void clear() {
+        for (int i = 0; i < values.length(); i++) {
+            values.set(i, null);
+        }
+    }
+
+    @Nonnull
+    @Override
+    public Set<K> keySet() {
+        Set<K> keys = EnumSet.noneOf(enumConstants[0].getDeclaringClass());
+        for (int i = 0; i < values.length(); i++) {
+            if (values.get(i) != null) {
+                keys.add(enumConstants[i]);
+            }
+        }
+        return Collections.unmodifiableSet(keys);
+    }
+
+    @Nonnull
+    @Override
+    public Collection<V> values() {
+        List<V> list = new ArrayList<>();
+        for (int i = 0; i < values.length(); i++) {
+            V value = values.get(i);
+            if (value != null) {
+                list.add(value);
+            }
+        }
+        return Collections.unmodifiableList(list);
+    }
+
+    @Nonnull
+    @Override
+    public Set<Map.Entry<K, V>> entrySet() {
+        Set<Map.Entry<K, V>> entrySet = new java.util.HashSet<>();
+        for (int i = 0; i < enumConstants.length; i++) {
+            V value = values.get(i);
+            if (value != null) {
+                K key = enumConstants[i];
+                entrySet.add(new AbstractMap.SimpleEntry<>(key, value));
+            }
+        }
+        return Collections.unmodifiableSet(entrySet);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/ConcurrentHashtable.java b/internal-api/src/main/java/datadog/trace/util/ConcurrentHashtable.java
index f860b6ad458..94e4caca213 100644
--- a/internal-api/src/main/java/datadog/trace/util/ConcurrentHashtable.java
+++ b/internal-api/src/main/java/datadog/trace/util/ConcurrentHashtable.java
@@ -63,2014 +63,1976 @@
  * (resets -- {@code FlatHashtable}).
  */
 public final class ConcurrentHashtable {
-  private ConcurrentHashtable() {}
-
-  /**
-   * Internal base class for concurrent entries. Stores the precomputed 64-bit keyHash and a {@code
-   * volatile} chain-next pointer used to link colliding entries within a single bucket.
-   *
-   * <p>The {@code next} pointer is {@code volatile} (unlike {@link Hashtable.Entry}) so that chain
-   * splices performed by {@link D1#remove}/{@link D2#remove} are visible to lock-free readers.
-   *
-   * <p>Subclasses add the key field(s) and a {@code matches(...)} method tailored to their key
-   * arity. See {@link D1.Entry} and {@link D2.Entry}; for higher arities, or for primitive key
-   * components, subclass this directly and drive the table with the static building blocks on
-   * {@link ConcurrentHashtable}.
-   *
-   * <p>The self-bound type parameter ({@code TEntry extends Entry<TEntry>}, mirroring {@code Enum<E
-   * extends Enum<E>>}) exists so {@link #matches(Entry)} can compare two already-built entries
-   * without an {@code Object}/{@code instanceof} boundary. It requires every concrete subclass to
-   * declare itself as its own type argument (see {@link D1.Entry}/{@link D2.Entry}); Java has no
-   * true {@code Self} type, so this is enforced by convention, not the compiler.
-   */
-  public abstract static class Entry<TEntry extends Entry<TEntry>> {
-    public final long keyHash;
-    private volatile TEntry next = null;
-
-    protected Entry(long keyHash) {
-      this.keyHash = keyHash;
-    }
-
-    // Package-private: the only writers are the static insert/remove building blocks
-    // (insertHeadEntry, unlink) on the enclosing class, which reach it via the Entry bound. Custom
-    // tables mutate chains through those helpers, never by touching next directly.
-    final void setNext(TEntry next) {
-      this.next = next;
-    }
-
-    @Nullable
-    public final TEntry next() {
-      return this.next;
-    }
+    private ConcurrentHashtable() {}
 
     /**
-     * Returns {@code true} if {@code other} is logically the same entry as this one (same key(s)),
-     * used to compare two already-built entries under the write lock (e.g. in {@link
-     * Reservation#tryGetOrInsertOrNull}). Deliberately narrower than {@code equals}/{@code
-     * hashCode}: this class doesn't need reflexive/symmetric-with-null-and-unrelated-types contract
-     * baggage, and a bespoke method avoids entries accidentally working as {@code HashSet}/{@code
-     * HashMap} keys via an unrelated identity notion. {@link D1.Entry}/{@link D2.Entry} implement
-     * this in terms of their existing key-based {@code matches(...)}, so most callers never write
-     * it directly.
-     */
-    public abstract boolean matches(@Nonnull TEntry other);
-  }
-
-  /**
-   * Single-key concurrent hash table. Lock-free on hit; locked on miss/mutation.
-   *
-   * @param <K> the key type
-   * @param <TEntry> the user's {@link D1.Entry D1.Entry&lt;K&gt;} subclass
-   */
-  @ThreadSafe
-  public static final class D1<K, TEntry extends D1.Entry<K>> {
-
-    /**
-     * Abstract base for {@link D1} entries. Subclass to add value fields you wish to mutate in
-     * place after retrieving the entry via {@link D1#get}.
+     * Internal base class for concurrent entries. Stores the precomputed 64-bit keyHash and a {@code
+     * volatile} chain-next pointer used to link colliding entries within a single bucket.
      *
-     * <p>Deliberately parameterized on {@code K} alone, not self-bound on the concrete subclass:
-     * {@link D1} stores and links entries internally as {@code Entry<K>} and casts back to {@code
-     * TEntry} at its API boundary, trading one unchecked cast (always sound -- the table only ever
-     * holds instances the caller's own {@code creator} produced) for a simpler subclass signature,
-     * e.g. {@code class MyEntry extends D1.Entry<String>} rather than {@code D1.Entry<String,
-     * MyEntry>}.
+     * <p>The {@code next} pointer is {@code volatile} (unlike {@link Hashtable.Entry}) so that chain
+     * splices performed by {@link D1#remove}/{@link D2#remove} are visible to lock-free readers.
      *
-     * @param <K> the key type
+     * <p>Subclasses add the key field(s) and a {@code matches(...)} method tailored to their key
+     * arity. See {@link D1.Entry} and {@link D2.Entry}; for higher arities, or for primitive key
+     * components, subclass this directly and drive the table with the static building blocks on
+     * {@link ConcurrentHashtable}.
+     *
+     * <p>The self-bound type parameter ({@code TEntry extends Entry<TEntry>}, mirroring {@code Enum<E
+     * extends Enum<E>>}) exists so {@link #matches(Entry)} can compare two already-built entries
+     * without an {@code Object}/{@code instanceof} boundary. It requires every concrete subclass to
+     * declare itself as its own type argument (see {@link D1.Entry}/{@link D2.Entry}); Java has no
+     * true {@code Self} type, so this is enforced by convention, not the compiler.
      */
-    public abstract static class Entry<K> extends ConcurrentHashtable.Entry<Entry<K>> {
-      @Nullable final K key;
-
-      protected Entry(@Nullable K key) {
-        super(hash(key));
-        this.key = key;
-      }
-
-      /** The key this entry was created with. */
-      @Nullable
-      public K key() {
-        return this.key;
-      }
-
-      public boolean matches(@Nullable Object key) {
-        // equals() on the lookup param, not the field, so the JIT can devirtualize it once
-        // matches() inlines into get/getOrCreate (the caller's key type is known there).
-        return Objects.equals(key, this.key);
-      }
-
-      /** {@link ConcurrentHashtable.Entry#matches(Entry)} in terms of the key-based overload. */
-      @Override
-      public final boolean matches(@Nonnull Entry<K> other) {
-        return matches(other.key);
-      }
-
-      /**
-       * Returns the 64-bit lookup hash for {@code key}. Null keys map to {@link Long#MIN_VALUE} so
-       * they don't collide with a real key that hashes to 0; real-key collisions in chains are
-       * resolved by {@link #matches(Object)}.
-       */
-      public static long hash(@Nullable Object key) {
-        return (key == null) ? Long.MIN_VALUE : key.hashCode();
-      }
-    }
+    public abstract static class Entry<TEntry extends Entry<TEntry>> {
+        public final long keyHash;
+        private volatile TEntry next = null;
 
-    private final State<Entry<K>> state;
+        protected Entry(long keyHash) {
+            this.keyHash = keyHash;
+        }
 
-    private D1(State<Entry<K>> state) {
-      this.state = state;
-    }
+        // Package-private: the only writers are the static insert/remove building blocks
+        // (insertHeadEntry, unlink) on the enclosing class, which reach it via the Entry bound. Custom
+        // tables mutate chains through those helpers, never by touching next directly.
+        final void setNext(TEntry next) {
+            this.next = next;
+        }
 
-    /**
-     * Creates a fixed-size table holding at most {@code maxCapacity} entries. {@code entryClass} is
-     * used only to infer {@code TEntry}; entries are created by the {@code creator} functions
-     * passed to the insertion methods. The table does not resize.
-     */
-    @Nonnull
-    @SuppressWarnings("unchecked")
-    public static <K, TEntry extends D1.Entry<K>> D1<K, TEntry> createBounded(
-        @Nonnull Class<TEntry> entryClass, int maxCapacity) {
-      // entryClass is erased away (see ConcurrentHashtable#createFixedBuckets), so treating it as
-      // Class<Entry<K>> instead of the caller's concrete Class<TEntry> is safe.
-      Class<Entry<K>> baseEntryClass = (Class<Entry<K>>) (Class<?>) entryClass;
-      return new D1<>(ConcurrentHashtable.createBounded(baseEntryClass, maxCapacity));
+        @Nullable
+        public final TEntry next() {
+            return this.next;
+        }
+
+        /**
+         * Returns {@code true} if {@code other} is logically the same entry as this one (same key(s)),
+         * used to compare two already-built entries under the write lock (e.g. in {@link
+         * Reservation#tryGetOrInsertOrNull}). Deliberately narrower than {@code equals}/{@code
+         * hashCode}: this class doesn't need reflexive/symmetric-with-null-and-unrelated-types contract
+         * baggage, and a bespoke method avoids entries accidentally working as {@code HashSet}/{@code
+         * HashMap} keys via an unrelated identity notion. {@link D1.Entry}/{@link D2.Entry} implement
+         * this in terms of their existing key-based {@code matches(...)}, so most callers never write
+         * it directly.
+         */
+        public abstract boolean matches(@Nonnull TEntry other);
     }
 
     /**
-     * Sound because every entry ever inserted into {@link #state} was produced as a {@code TEntry}.
+     * Single-key concurrent hash table. Lock-free on hit; locked on miss/mutation.
+     *
+     * @param <K> the key type
+     * @param <TEntry> the user's {@link D1.Entry D1.Entry&lt;K&gt;} subclass
      */
-    @SuppressWarnings("unchecked")
-    private TEntry cast(@Nullable Entry<K> entry) {
-      return (TEntry) entry;
-    }
+    @ThreadSafe
+    public static final class D1<K, TEntry extends D1.Entry<K>> {
+
+        /**
+         * Abstract base for {@link D1} entries. Subclass to add value fields you wish to mutate in
+         * place after retrieving the entry via {@link D1#get}.
+         *
+         * <p>Deliberately parameterized on {@code K} alone, not self-bound on the concrete subclass:
+         * {@link D1} stores and links entries internally as {@code Entry<K>} and casts back to {@code
+         * TEntry} at its API boundary, trading one unchecked cast (always sound -- the table only ever
+         * holds instances the caller's own {@code creator} produced) for a simpler subclass signature,
+         * e.g. {@code class MyEntry extends D1.Entry<String>} rather than {@code D1.Entry<String,
+         * MyEntry>}.
+         *
+         * @param <K> the key type
+         */
+        public abstract static class Entry<K> extends ConcurrentHashtable.Entry<Entry<K>> {
+            @Nullable
+            final K key;
+
+            protected Entry(@Nullable K key) {
+                super(hash(key));
+                this.key = key;
+            }
+
+            /** The key this entry was created with. */
+            @Nullable
+            public K key() {
+                return this.key;
+            }
+
+            public boolean matches(@Nullable Object key) {
+                // equals() on the lookup param, not the field, so the JIT can devirtualize it once
+                // matches() inlines into get/getOrCreate (the caller's key type is known there).
+                return Objects.equals(key, this.key);
+            }
+
+            /** {@link ConcurrentHashtable.Entry#matches(Entry)} in terms of the key-based overload. */
+            @Override
+            public final boolean matches(@Nonnull Entry<K> other) {
+                return matches(other.key);
+            }
+
+            /**
+             * Returns the 64-bit lookup hash for {@code key}. Null keys map to {@link Long#MIN_VALUE} so
+             * they don't collide with a real key that hashes to 0; real-key collisions in chains are
+             * resolved by {@link #matches(Object)}.
+             */
+            public static long hash(@Nullable Object key) {
+                return (key == null) ? Long.MIN_VALUE : key.hashCode();
+            }
+        }
 
-    /** See {@link #cast(Entry)}; casts the functional-interface reference, not each element. */
-    @SuppressWarnings("unchecked")
-    private Predicate<? super Entry<K>> castPredicate(Predicate<? super TEntry> predicate) {
-      return (Predicate<? super Entry<K>>) predicate;
-    }
+        private final State<Entry<K>> state;
 
-    @SuppressWarnings("unchecked")
-    private Consumer<? super Entry<K>> castConsumer(Consumer<? super TEntry> consumer) {
-      return (Consumer<? super Entry<K>>) consumer;
-    }
+        private D1(State<Entry<K>> state) {
+            this.state = state;
+        }
 
-    @SuppressWarnings("unchecked")
-    private <C> BiConsumer<? super C, ? super Entry<K>> castConsumer(
-        BiConsumer<? super C, ? super TEntry> consumer) {
-      return (BiConsumer<? super C, ? super Entry<K>>) consumer;
-    }
+        /**
+         * Creates a fixed-size table holding at most {@code maxCapacity} entries. {@code entryClass} is
+         * used only to infer {@code TEntry}; entries are created by the {@code creator} functions
+         * passed to the insertion methods. The table does not resize.
+         */
+        @Nonnull
+        @SuppressWarnings("unchecked")
+        public static <K, TEntry extends D1.Entry<K>> D1<K, TEntry> createBounded(
+                @Nonnull Class<TEntry> entryClass, int maxCapacity) {
+            // entryClass is erased away (see ConcurrentHashtable#createFixedBuckets), so treating it as
+            // Class<Entry<K>> instead of the caller's concrete Class<TEntry> is safe.
+            Class<Entry<K>> baseEntryClass = (Class<Entry<K>>) (Class<?>) entryClass;
+            return new D1<>(ConcurrentHashtable.createBounded(baseEntryClass, maxCapacity));
+        }
 
-    public int size() {
-      return state.sizeManager.estimateSize();
-    }
+        /**
+         * Sound because every entry ever inserted into {@link #state} was produced as a {@code TEntry}.
+         */
+        @SuppressWarnings("unchecked")
+        private TEntry cast(@Nullable Entry<K> entry) {
+            return (TEntry) entry;
+        }
 
-    public boolean isFull() {
-      return state.sizeManager.isFull();
-    }
+        /** See {@link #cast(Entry)}; casts the functional-interface reference, not each element. */
+        @SuppressWarnings("unchecked")
+        private Predicate<? super Entry<K>> castPredicate(Predicate<? super TEntry> predicate) {
+            return (Predicate<? super Entry<K>>) predicate;
+        }
 
-    @Nullable
-    public TEntry get(@Nullable K key) {
-      long keyHash = D1.Entry.hash(key);
-      for (Entry<K> curEntry = bucketFor(state, keyHash);
-          curEntry != null;
-          curEntry = curEntry.next()) {
-        if (curEntry.keyHash == keyHash && curEntry.matches(key)) {
-          return cast(curEntry);
-        }
-      }
-      return null;
+        @SuppressWarnings("unchecked")
+        private Consumer<? super Entry<K>> castConsumer(Consumer<? super TEntry> consumer) {
+            return (Consumer<? super Entry<K>>) consumer;
+        }
+
+        @SuppressWarnings("unchecked")
+        private <C> BiConsumer<? super C, ? super Entry<K>> castConsumer(
+                BiConsumer<? super C, ? super TEntry> consumer) {
+            return (BiConsumer<? super C, ? super Entry<K>>) consumer;
+        }
+
+        public int size() {
+            return state.sizeManager.estimateSize();
+        }
+
+        public boolean isFull() {
+            return state.sizeManager.isFull();
+        }
+
+        @Nullable
+        public TEntry get(@Nullable K key) {
+            long keyHash = D1.Entry.hash(key);
+            for (Entry<K> curEntry = bucketFor(state, keyHash); curEntry != null; curEntry = curEntry.next()) {
+                if (curEntry.keyHash == keyHash && curEntry.matches(key)) {
+                    return cast(curEntry);
+                }
+            }
+            return null;
+        }
+
+        /**
+         * Returns the entry for {@code key}, creating one via {@code creator} if absent and the table
+         * is under capacity. Lock-free on hit; acquires a table-level lock on miss. Wraps {@link
+         * #tryGetOrCreateOrNull} — see that method for the refusal and ordering details.
+         */
+        @Nonnull
+        public Maybe<TEntry> tryGetOrCreate(
+                @Nullable K key, @Strategy @Nonnull Function<? super K, ? extends TEntry> creator) {
+            return Maybe.of(tryGetOrCreateOrNull(key, creator));
+        }
+
+        /**
+         * Escape hatch for {@link #tryGetOrCreate} for callers that want the nullable entry directly
+         * rather than a {@link Maybe} wrapper. Returns {@code null} when the table is at capacity and
+         * {@code key} was not already present. Re-checks under the lock to avoid duplicate entries
+         * under concurrent misses.
+         */
+        @StrategyConsumer
+        @Nullable
+        public TEntry tryGetOrCreateOrNull(
+                @Nullable K key, @Strategy @Nonnull Function<? super K, ? extends TEntry> creator) {
+            long keyHash = D1.Entry.hash(key);
+            int index = bucketIndex(state.buckets, keyHash);
+            for (Entry<K> curEntry = bucketAt(state, index); curEntry != null; curEntry = curEntry.next()) {
+                if (curEntry.keyHash == keyHash && curEntry.matches(key)) {
+                    return cast(curEntry);
+                }
+            }
+            ReentrantLock lock = getTableWriteLock(state);
+            lock.lock();
+            try {
+                for (Entry<K> curEntry = bucketAt(state, index); curEntry != null; curEntry = curEntry.next()) {
+                    if (curEntry.keyHash == keyHash && curEntry.matches(key)) {
+                        return cast(curEntry);
+                    }
+                }
+                // isFull() is checked before creating the entry, not before reserving a slot for it:
+                // creator.apply() can throw, and if we'd already reserved (incremented) the slot, a
+                // throwing creator would leak that reservation forever. So we accept the entry only after
+                // creator succeeds, then increment.
+                if (state.sizeManager.isFull()) {
+                    return null;
+                }
+                TEntry newEntry = creator.apply(key);
+                insertHeadEntryAt(state, index, newEntry);
+                state.sizeManager.increment();
+                return newEntry;
+            } finally {
+                lock.unlock();
+            }
+        }
+
+        /**
+         * {@link #tryGetOrCreate}, but when the table is full, evicts one entry matching {@code
+         * evictable} to make room instead of refusing the insert. Refuses only when the table is full
+         * <em>and</em> nothing matches {@code evictable} — see {@link #tryGetOrCreateOrEvictOrNull} for
+         * the null-returning form and the eviction/creation ordering.
+         */
+        @Nonnull
+        public Maybe<TEntry> tryGetOrCreateOrEvict(
+                @Nullable K key,
+                @Strategy @Nonnull Function<? super K, ? extends TEntry> creator,
+                @Strategy @Nonnull Predicate<? super TEntry> evictable) {
+            return Maybe.of(tryGetOrCreateOrEvictOrNull(key, creator, evictable));
+        }
+
+        /**
+         * Escape hatch for {@link #tryGetOrCreateOrEvict} for callers that want the nullable entry
+         * directly. Eviction runs before {@code creator}, not after: {@code creator} may throw, so
+         * freeing a slot and only then attempting the fallible create keeps a thrown exception from
+         * ever leaving a slot double-booked. A creator that throws after a successful eviction simply
+         * leaves the table one entry smaller — no corruption, just a wasted eviction.
+         */
+        @StrategyConsumer
+        @Nullable
+        public TEntry tryGetOrCreateOrEvictOrNull(
+                @Nullable K key,
+                @Strategy @Nonnull Function<? super K, ? extends TEntry> creator,
+                @Strategy @Nonnull Predicate<? super TEntry> evictable) {
+            long keyHash = D1.Entry.hash(key);
+            int index = bucketIndex(state.buckets, keyHash);
+            for (Entry<K> curEntry = bucketAt(state, index); curEntry != null; curEntry = curEntry.next()) {
+                if (curEntry.keyHash == keyHash && curEntry.matches(key)) {
+                    return cast(curEntry);
+                }
+            }
+            ReentrantLock lock = getTableWriteLock(state);
+            lock.lock();
+            try {
+                for (Entry<K> curEntry = bucketAt(state, index); curEntry != null; curEntry = curEntry.next()) {
+                    if (curEntry.keyHash == keyHash && curEntry.matches(key)) {
+                        return cast(curEntry);
+                    }
+                }
+                if (state.sizeManager.isFull()
+                        && state.sizeManager.evictOne(state.buckets, castPredicate(evictable)) == null) {
+                    return null;
+                }
+                TEntry newEntry = creator.apply(key);
+                insertHeadEntryAt(state, index, newEntry);
+                state.sizeManager.increment();
+                return newEntry;
+            } finally {
+                lock.unlock();
+            }
+        }
+
+        /**
+         * Removes and returns the entry for {@code key}, or {@code null} if absent. Acquires the
+         * table-level lock to splice the chain; lock-free readers observe the removal via the volatile
+         * write of the predecessor's {@code next} (or the bucket head).
+         */
+        @Nullable
+        public TEntry remove(@Nullable K key) {
+            long keyHash = D1.Entry.hash(key);
+            int index = bucketIndex(state.buckets, keyHash);
+            ReentrantLock lock = getTableWriteLock(state);
+            lock.lock();
+            try {
+                Entry<K> prev = null;
+                for (Entry<K> curEntry = bucketAt(state, index);
+                        curEntry != null;
+                        prev = curEntry, curEntry = curEntry.next()) {
+                    if (curEntry.keyHash == keyHash && curEntry.matches(key)) {
+                        unlink(state, index, prev, curEntry);
+                        state.sizeManager.decrement();
+                        return cast(curEntry);
+                    }
+                }
+                return null;
+            } finally {
+                lock.unlock();
+            }
+        }
+
+        /**
+         * Removes every entry matching {@code predicate}, returning {@code true} if any were removed.
+         * Holds the table-level lock for the whole sweep, so the predicate sees a stable table and
+         * concurrent writers are excluded; lock-free readers continue throughout.
+         */
+        public boolean removeIf(@Strategy @Nonnull Predicate<? super TEntry> predicate) {
+            return ConcurrentHashtable.removeIf(state, castPredicate(predicate));
+        }
+
+        /**
+         * Removes all entries and invokes {@code drainedEntryConsumer} for each one.
+         *
+         * <p>The lock is acquired and released bucket by bucket rather than held for the whole sweep,
+         * so a table-level operation (an insert, a reservation, an eviction) can interleave between
+         * buckets instead of waiting out the entire drain. This means the drain is no longer an atomic
+         * snapshot: an entry inserted into a not-yet-visited bucket while the drain is in progress is
+         * swept up too, and each bucket's capacity slot is released immediately before its consumer
+         * invocation runs, rather than once for the whole sweep at the end. The consumer should be
+         * quick and must not throw. If it does, later entries in the detached bucket remain counted but
+         * are no longer reachable from the table. Buckets not yet visited remain intact, and capacity
+         * already released is not restored.
+         *
+         * <p>Use {@link #drain(Object, BiConsumer)} to avoid a capturing lambda.
+         *
+         * @param drainedEntryConsumer action invoked for each removed entry
+         */
+        public void drain(@Strategy @Nonnull Consumer<? super TEntry> drainedEntryConsumer) {
+            ConcurrentHashtable.drain(state, castConsumer(drainedEntryConsumer));
+        }
+
+        /**
+         * Context-passing {@link #drain(Consumer)}. The lock is acquired and released bucket by bucket
+         * rather than held for the whole sweep, so a table-level operation (an insert, a reservation,
+         * an eviction) can interleave between buckets instead of waiting out the entire drain. This
+         * means the drain is no longer an atomic snapshot: an entry inserted into a not-yet-visited
+         * bucket while the drain is in progress is swept up too, and each bucket's capacity slot is
+         * released immediately before its consumer invocation runs, rather than once for the whole
+         * sweep at the end.
+         *
+         * <p>Pass a non-capturing {@link BiConsumer} (typically a {@code static final}) plus the
+         * accumulator as {@code context} (e.g. the target list or event builder) to avoid a
+         * capturing-lambda allocation.
+         *
+         * @param <C> context type
+         * @param context context passed to each invocation of {@code drainedEntryConsumer}
+         * @param drainedEntryConsumer action invoked with the context and each removed entry
+         */
+        public <C> void drain(
+                C context, @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> drainedEntryConsumer) {
+            ConcurrentHashtable.drain(state, context, castConsumer(drainedEntryConsumer));
+        }
+
+        /** Removes all entries. Lock-free readers mid-walk complete against the entries they hold. */
+        public void clear() {
+            ConcurrentHashtable.clear(state);
+        }
+
+        public void forEach(@Strategy @Nonnull Consumer<? super TEntry> consumer) {
+            ConcurrentHashtable.forEach(state, castConsumer(consumer));
+        }
+
+        /**
+         * Context-passing forEach. Avoids a capturing-lambda allocation — pass a non-capturing {@link
+         * BiConsumer} (typically a {@code static final}) plus whatever side-band state it needs.
+         */
+        public <C> void forEach(C context, @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> consumer) {
+            ConcurrentHashtable.forEach(state, context, castConsumer(consumer));
+        }
     }
 
     /**
-     * Returns the entry for {@code key}, creating one via {@code creator} if absent and the table
-     * is under capacity. Lock-free on hit; acquires a table-level lock on miss. Wraps {@link
-     * #tryGetOrCreateOrNull} — see that method for the refusal and ordering details.
+     * Two-key concurrent hash table. Key parts are passed directly to {@link #get} and {@link
+     * #tryGetOrCreate}, avoiding a composite wrapper whose allocation would otherwise rely on HotSpot
+     * escape analysis to disappear. Reads are lock-free; misses and mutations acquire the write lock.
+     *
+     * @param <K1> first key type
+     * @param <K2> second key type
+     * @param <TEntry> the user's {@link D2.Entry D2.Entry&lt;K1, K2&gt;} subclass
      */
-    @Nonnull
-    public Maybe<TEntry> tryGetOrCreate(
-        @Nullable K key, @Strategy @Nonnull Function<? super K, ? extends TEntry> creator) {
-      return Maybe.of(tryGetOrCreateOrNull(key, creator));
+    @ThreadSafe
+    public static final class D2<K1, K2, TEntry extends D2.Entry<K1, K2>> {
+
+        /**
+         * Abstract base for {@link D2} entries. Subclass to add value fields you wish to mutate in
+         * place after retrieving the entry via {@link D2#get}.
+         *
+         * <p>Deliberately parameterized on {@code K1}/{@code K2} alone, not self-bound on the concrete
+         * subclass -- see {@link D1.Entry} for why.
+         *
+         * @param <K1> first key type
+         * @param <K2> second key type
+         */
+        public abstract static class Entry<K1, K2> extends ConcurrentHashtable.Entry<Entry<K1, K2>> {
+            @Nullable
+            final K1 key1;
+
+            @Nullable
+            final K2 key2;
+
+            protected Entry(@Nullable K1 key1, @Nullable K2 key2) {
+                super(hash(key1, key2));
+                this.key1 = key1;
+                this.key2 = key2;
+            }
+
+            /** The first key part this entry was created with. */
+            @Nullable
+            public K1 key1() {
+                return this.key1;
+            }
+
+            /** The second key part this entry was created with. */
+            @Nullable
+            public K2 key2() {
+                return this.key2;
+            }
+
+            public boolean matches(@Nullable K1 key1, @Nullable K2 key2) {
+                // equals() on the lookup params, not the fields, so the JIT can devirtualize them once
+                // matches() inlines into get/getOrCreate (the caller's key types are known there).
+                return Objects.equals(key1, this.key1) && Objects.equals(key2, this.key2);
+            }
+
+            /** {@link ConcurrentHashtable.Entry#matches(Entry)} in terms of the key-based overload. */
+            @Override
+            public final boolean matches(@Nonnull Entry<K1, K2> other) {
+                return matches(other.key1, other.key2);
+            }
+
+            /** Returns the 64-bit lookup hash combining both key parts via {@link LongHashingUtils}. */
+            public static long hash(@Nullable Object key1, @Nullable Object key2) {
+                return LongHashingUtils.hash(key1, key2);
+            }
+        }
+
+        private final State<Entry<K1, K2>> state;
+
+        private D2(State<Entry<K1, K2>> state) {
+            this.state = state;
+        }
+
+        /**
+         * Creates a fixed-size table holding at most {@code maxCapacity} entries. {@code entryClass} is
+         * used only to infer {@code TEntry}; entries are created by the {@code creator} functions
+         * passed to the insertion methods. The table does not resize.
+         */
+        @Nonnull
+        @SuppressWarnings("unchecked")
+        public static <K1, K2, TEntry extends D2.Entry<K1, K2>> D2<K1, K2, TEntry> createBounded(
+                @Nonnull Class<TEntry> entryClass, int maxCapacity) {
+            // entryClass is erased away (see ConcurrentHashtable#createFixedBuckets), so treating it as
+            // Class<Entry<K1, K2>> instead of the caller's concrete Class<TEntry> is safe.
+            Class<Entry<K1, K2>> baseEntryClass = (Class<Entry<K1, K2>>) (Class<?>) entryClass;
+            return new D2<>(ConcurrentHashtable.createBounded(baseEntryClass, maxCapacity));
+        }
+
+        /**
+         * Sound because every entry ever inserted into {@link #state} was produced as a {@code TEntry}.
+         */
+        @SuppressWarnings("unchecked")
+        private TEntry cast(@Nullable Entry<K1, K2> entry) {
+            return (TEntry) entry;
+        }
+
+        /** See {@link #cast(Entry)}; casts the functional-interface reference, not each element. */
+        @SuppressWarnings("unchecked")
+        private Predicate<? super Entry<K1, K2>> castPredicate(Predicate<? super TEntry> predicate) {
+            return (Predicate<? super Entry<K1, K2>>) predicate;
+        }
+
+        @SuppressWarnings("unchecked")
+        private Consumer<? super Entry<K1, K2>> castConsumer(Consumer<? super TEntry> consumer) {
+            return (Consumer<? super Entry<K1, K2>>) consumer;
+        }
+
+        @SuppressWarnings("unchecked")
+        private <C> BiConsumer<? super C, ? super Entry<K1, K2>> castConsumer(
+                BiConsumer<? super C, ? super TEntry> consumer) {
+            return (BiConsumer<? super C, ? super Entry<K1, K2>>) consumer;
+        }
+
+        public int size() {
+            return state.sizeManager.estimateSize();
+        }
+
+        public boolean isFull() {
+            return state.sizeManager.isFull();
+        }
+
+        @Nullable
+        public TEntry get(@Nullable K1 key1, @Nullable K2 key2) {
+            long keyHash = D2.Entry.hash(key1, key2);
+            for (Entry<K1, K2> curEntry = bucketFor(state, keyHash); curEntry != null; curEntry = curEntry.next()) {
+                if (curEntry.keyHash == keyHash && curEntry.matches(key1, key2)) {
+                    return cast(curEntry);
+                }
+            }
+            return null;
+        }
+
+        /**
+         * Returns the entry for {@code (key1, key2)}, creating one via {@code creator} if absent and
+         * the table is under capacity. Lock-free on hit; acquires a table-level lock on miss. Wraps
+         * {@link #tryGetOrCreateOrNull} — see that method for the refusal and ordering details.
+         */
+        @Nonnull
+        public Maybe<TEntry> tryGetOrCreate(
+                @Nullable K1 key1,
+                @Nullable K2 key2,
+                @Strategy @Nonnull BiFunction<? super K1, ? super K2, ? extends TEntry> creator) {
+            return Maybe.of(tryGetOrCreateOrNull(key1, key2, creator));
+        }
+
+        /**
+         * Escape hatch for {@link #tryGetOrCreate} for callers that want the nullable entry directly
+         * rather than a {@link Maybe} wrapper. Returns {@code null} when the table is at capacity and
+         * {@code (key1, key2)} was not already present. Re-checks under the lock to avoid duplicate
+         * entries under concurrent misses.
+         */
+        @StrategyConsumer
+        @Nullable
+        public TEntry tryGetOrCreateOrNull(
+                @Nullable K1 key1,
+                @Nullable K2 key2,
+                @Strategy @Nonnull BiFunction<? super K1, ? super K2, ? extends TEntry> creator) {
+            long keyHash = D2.Entry.hash(key1, key2);
+            int index = bucketIndex(state.buckets, keyHash);
+            for (Entry<K1, K2> curEntry = bucketAt(state, index); curEntry != null; curEntry = curEntry.next()) {
+                if (curEntry.keyHash == keyHash && curEntry.matches(key1, key2)) {
+                    return cast(curEntry);
+                }
+            }
+            ReentrantLock lock = getTableWriteLock(state);
+            lock.lock();
+            try {
+                for (Entry<K1, K2> curEntry = bucketAt(state, index); curEntry != null; curEntry = curEntry.next()) {
+                    if (curEntry.keyHash == keyHash && curEntry.matches(key1, key2)) {
+                        return cast(curEntry);
+                    }
+                }
+                // isFull() is checked before creating the entry, not before reserving a slot for it:
+                // creator.apply() can throw, and if we'd already reserved (incremented) the slot, a
+                // throwing creator would leak that reservation forever. So we accept the entry only after
+                // creator succeeds, then increment.
+                if (state.sizeManager.isFull()) {
+                    return null;
+                }
+                TEntry newEntry = creator.apply(key1, key2);
+                insertHeadEntryAt(state, index, newEntry);
+                state.sizeManager.increment();
+                return newEntry;
+            } finally {
+                lock.unlock();
+            }
+        }
+
+        /**
+         * {@link #tryGetOrCreate}, but when the table is full, evicts one entry matching {@code
+         * evictable} to make room instead of refusing the insert. Refuses only when the table is full
+         * <em>and</em> nothing matches {@code evictable} — see {@link #tryGetOrCreateOrEvictOrNull} for
+         * the null-returning form and the eviction/creation ordering.
+         */
+        @Nonnull
+        public Maybe<TEntry> tryGetOrCreateOrEvict(
+                @Nullable K1 key1,
+                @Nullable K2 key2,
+                @Strategy @Nonnull BiFunction<? super K1, ? super K2, ? extends TEntry> creator,
+                @Strategy @Nonnull Predicate<? super TEntry> evictable) {
+            return Maybe.of(tryGetOrCreateOrEvictOrNull(key1, key2, creator, evictable));
+        }
+
+        /**
+         * Escape hatch for {@link #tryGetOrCreateOrEvict} for callers that want the nullable entry
+         * directly. Eviction runs before {@code creator}, not after: {@code creator} may throw, so
+         * freeing a slot and only then attempting the fallible create keeps a thrown exception from
+         * ever leaving a slot double-booked. A creator that throws after a successful eviction simply
+         * leaves the table one entry smaller — no corruption, just a wasted eviction.
+         */
+        @StrategyConsumer
+        @Nullable
+        public TEntry tryGetOrCreateOrEvictOrNull(
+                @Nullable K1 key1,
+                @Nullable K2 key2,
+                @Strategy @Nonnull BiFunction<? super K1, ? super K2, ? extends TEntry> creator,
+                @Strategy @Nonnull Predicate<? super TEntry> evictable) {
+            long keyHash = D2.Entry.hash(key1, key2);
+            int index = bucketIndex(state.buckets, keyHash);
+            for (Entry<K1, K2> curEntry = bucketAt(state, index); curEntry != null; curEntry = curEntry.next()) {
+                if (curEntry.keyHash == keyHash && curEntry.matches(key1, key2)) {
+                    return cast(curEntry);
+                }
+            }
+            ReentrantLock lock = getTableWriteLock(state);
+            lock.lock();
+            try {
+                for (Entry<K1, K2> curEntry = bucketAt(state, index); curEntry != null; curEntry = curEntry.next()) {
+                    if (curEntry.keyHash == keyHash && curEntry.matches(key1, key2)) {
+                        return cast(curEntry);
+                    }
+                }
+                if (state.sizeManager.isFull()
+                        && state.sizeManager.evictOne(state.buckets, castPredicate(evictable)) == null) {
+                    return null;
+                }
+                TEntry newEntry = creator.apply(key1, key2);
+                insertHeadEntryAt(state, index, newEntry);
+                state.sizeManager.increment();
+                return newEntry;
+            } finally {
+                lock.unlock();
+            }
+        }
+
+        /**
+         * Removes and returns the entry for {@code (key1, key2)}, or {@code null} if absent. Acquires
+         * the table-level lock to splice the chain; lock-free readers observe the removal via the
+         * volatile write of the predecessor's {@code next} (or the bucket head).
+         */
+        @Nullable
+        public TEntry remove(@Nullable K1 key1, @Nullable K2 key2) {
+            long keyHash = D2.Entry.hash(key1, key2);
+            int index = bucketIndex(state.buckets, keyHash);
+            ReentrantLock lock = getTableWriteLock(state);
+            lock.lock();
+            try {
+                Entry<K1, K2> prev = null;
+                for (Entry<K1, K2> curEntry = bucketAt(state, index);
+                        curEntry != null;
+                        prev = curEntry, curEntry = curEntry.next()) {
+                    if (curEntry.keyHash == keyHash && curEntry.matches(key1, key2)) {
+                        unlink(state, index, prev, curEntry);
+                        state.sizeManager.decrement();
+                        return cast(curEntry);
+                    }
+                }
+                return null;
+            } finally {
+                lock.unlock();
+            }
+        }
+
+        /**
+         * Removes every entry matching {@code predicate}, returning {@code true} if any were removed.
+         * Holds the table-level lock for the whole sweep, so the predicate sees a stable table and
+         * concurrent writers are excluded; lock-free readers continue throughout.
+         */
+        public boolean removeIf(@Strategy @Nonnull Predicate<? super TEntry> predicate) {
+            return ConcurrentHashtable.removeIf(state, castPredicate(predicate));
+        }
+
+        /**
+         * Removes all entries and invokes {@code drainedEntryConsumer} for each one.
+         *
+         * <p>The lock is acquired and released bucket by bucket rather than held for the whole sweep,
+         * so a table-level operation (an insert, a reservation, an eviction) can interleave between
+         * buckets instead of waiting out the entire drain. This means the drain is no longer an atomic
+         * snapshot: an entry inserted into a not-yet-visited bucket while the drain is in progress is
+         * swept up too, and each bucket's capacity slot is released immediately before its consumer
+         * invocation runs, rather than once for the whole sweep at the end. The consumer should be
+         * quick and must not throw. If it does, later entries in the detached bucket remain counted but
+         * are no longer reachable from the table. Buckets not yet visited remain intact, and capacity
+         * already released is not restored.
+         *
+         * <p>Use {@link #drain(Object, BiConsumer)} to avoid a capturing lambda.
+         *
+         * @param drainedEntryConsumer action invoked for each removed entry
+         */
+        public void drain(@Strategy @Nonnull Consumer<? super TEntry> drainedEntryConsumer) {
+            ConcurrentHashtable.drain(state, castConsumer(drainedEntryConsumer));
+        }
+
+        /**
+         * Context-passing {@link #drain(Consumer)}. The lock is acquired and released bucket by bucket
+         * rather than held for the whole sweep, so a table-level operation (an insert, a reservation,
+         * an eviction) can interleave between buckets instead of waiting out the entire drain. This
+         * means the drain is no longer an atomic snapshot: an entry inserted into a not-yet-visited
+         * bucket while the drain is in progress is swept up too, and each bucket's capacity slot is
+         * released immediately before its consumer invocation runs, rather than once for the whole
+         * sweep at the end.
+         *
+         * <p>Pass a non-capturing {@link BiConsumer} (typically a {@code static final}) plus the
+         * accumulator as {@code context} (e.g. the target list or event builder) to avoid a
+         * capturing-lambda allocation.
+         *
+         * @param <C> context type
+         * @param context context passed to each invocation of {@code drainedEntryConsumer}
+         * @param drainedEntryConsumer action invoked with the context and each removed entry
+         */
+        public <C> void drain(
+                C context, @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> drainedEntryConsumer) {
+            ConcurrentHashtable.drain(state, context, castConsumer(drainedEntryConsumer));
+        }
+
+        /** Removes all entries. Lock-free readers mid-walk complete against the entries they hold. */
+        public void clear() {
+            ConcurrentHashtable.clear(state);
+        }
+
+        public void forEach(@Strategy @Nonnull Consumer<? super TEntry> consumer) {
+            ConcurrentHashtable.forEach(state, castConsumer(consumer));
+        }
+
+        /**
+         * Context-passing forEach. Avoids a capturing-lambda allocation — pass a non-capturing {@link
+         * BiConsumer} (typically a {@code static final}) plus whatever side-band state it needs.
+         */
+        public <C> void forEach(C context, @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> consumer) {
+            ConcurrentHashtable.forEach(state, context, castConsumer(consumer));
+        }
     }
 
     /**
-     * Escape hatch for {@link #tryGetOrCreate} for callers that want the nullable entry directly
-     * rather than a {@link Maybe} wrapper. Returns {@code null} when the table is at capacity and
-     * {@code key} was not already present. Re-checks under the lock to avoid duplicate entries
-     * under concurrent misses.
+     * Tracks a capped table's occupancy and eviction position.
+     *
+     * <p>The count includes live entries and outstanding reservations. Its {@link AtomicInteger}
+     * provides volatile visibility and atomic updates, allowing size queries and {@link
+     * #tryReserve()} without the table lock. The plain {@code evictionCursor} is instead protected by
+     * the table write lock; methods annotated with {@link GuardedBy} require that lock.
      */
-    @StrategyConsumer
-    @Nullable
-    public TEntry tryGetOrCreateOrNull(
-        @Nullable K key, @Strategy @Nonnull Function<? super K, ? extends TEntry> creator) {
-      long keyHash = D1.Entry.hash(key);
-      int index = bucketIndex(state.buckets, keyHash);
-      for (Entry<K> curEntry = bucketAt(state, index);
-          curEntry != null;
-          curEntry = curEntry.next()) {
-        if (curEntry.keyHash == keyHash && curEntry.matches(key)) {
-          return cast(curEntry);
-        }
-      }
-      ReentrantLock lock = getTableWriteLock(state);
-      lock.lock();
-      try {
-        for (Entry<K> curEntry = bucketAt(state, index);
-            curEntry != null;
-            curEntry = curEntry.next()) {
-          if (curEntry.keyHash == keyHash && curEntry.matches(key)) {
-            return cast(curEntry);
-          }
-        }
-        // isFull() is checked before creating the entry, not before reserving a slot for it:
-        // creator.apply() can throw, and if we'd already reserved (incremented) the slot, a
-        // throwing creator would leak that reservation forever. So we accept the entry only after
-        // creator succeeds, then increment.
-        if (state.sizeManager.isFull()) {
-          return null;
-        }
-        TEntry newEntry = creator.apply(key);
-        insertHeadEntryAt(state, index, newEntry);
-        state.sizeManager.increment();
-        return newEntry;
-      } finally {
-        lock.unlock();
-      }
+    @ThreadSafe
+    public static final class SizeManager {
+        private final AtomicInteger size = new AtomicInteger();
+        private final int capacity;
+
+        /**
+         * Bucket index the last eviction removed from. The next scan resumes here, so a sustained
+         * eviction stream doesn't repeatedly re-walk the same hot entries clustered near bucket 0.
+         */
+        @GuardedBy("the corresponding State's getTableWriteLock(state)")
+        private int evictionCursor;
+
+        public SizeManager(int capacity) {
+            this.capacity = capacity;
+        }
+
+        /** Live entries. Safe to call without the write lock. */
+        public int estimateSize() {
+            return size.get();
+        }
+
+        public int capacity() {
+            return capacity;
+        }
+
+        /** {@code true} once {@link #estimateSize()} has reached {@link #capacity()}. */
+        public boolean isFull() {
+            return size.get() >= capacity;
+        }
+
+        /**
+         * Atomically reserves one slot without taking the table write lock. It claims first with {@link
+         * AtomicInteger#incrementAndGet()} and refunds values above capacity, so concurrent callers
+         * cannot both acquire the last slot. Returns {@code false} with the count unchanged when the
+         * table is full.
+         *
+         * <p>Every successful claim must be filled or released with {@link #decrement()}. Prefer {@link
+         * ConcurrentHashtable#tryReserve(State, long)}, whose {@link Reservation#close()} gives back an
+         * unused claim automatically.
+         */
+        public boolean tryReserve() {
+            if (size.incrementAndGet() > capacity) {
+                size.decrementAndGet();
+                return false;
+            }
+            return true;
+        }
+
+        /**
+         * Reserves one slot, evicting an entry matching {@code evictable} when the table is full.
+         * Returns {@code false} without changing the table when no entry can be evicted.
+         *
+         * <p>The reservation survives concurrent drain and clear operations. The caller must fill it;
+         * an abandoned reservation permanently consumes capacity.
+         */
+        @GuardedBy("the corresponding State's getTableWriteLock(state)")
+        public <TEntry extends Entry<TEntry>> boolean tryReserveOrEvict(
+                @Nonnull AtomicReferenceArray<TEntry> buckets, @Strategy @Nonnull Predicate<? super TEntry> evictable) {
+            if (tryReserve()) {
+                return true;
+            }
+            if (evictOne(buckets, evictable) == null) {
+                return false;
+            }
+            // evictOne already decremented; the slot it freed is ours.
+            size.incrementAndGet();
+            return true;
+        }
+
+        /** Call after successfully linking a new entry. */
+        public void increment() {
+            size.incrementAndGet();
+        }
+
+        /** Call after successfully unlinking an entry. */
+        public void decrement() {
+            size.decrementAndGet();
+        }
+
+        /**
+         * Releases {@code removed} slots after a sweep and resets the {@code evictionCursor}.
+         * Outstanding reservations remain counted.
+         */
+        @GuardedBy("the corresponding State's getTableWriteLock(state)")
+        @SuppressFBWarnings(
+                value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
+                justification = "evictionCursor is read and written only while the corresponding State's write lock is"
+                        + " held; SpotBugs cannot model that dynamic guard")
+        public void release(int removed) {
+            if (removed != 0) {
+                size.addAndGet(-removed);
+            }
+            evictionCursor = 0;
+        }
+
+        /**
+         * Removes and returns the first entry matching {@code evictable}, scanning from the previous
+         * eviction position and wrapping once. Returns {@code null} without changing the count when no
+         * entry matches.
+         *
+         * <p>This operation may inspect every live entry while holding the table write lock, so the
+         * predicate should be quick.
+         */
+        @GuardedBy("the corresponding State's getTableWriteLock(state)")
+        @Nullable
+        public <TEntry extends Entry<TEntry>> TEntry evictOne(
+                @Nonnull AtomicReferenceArray<TEntry> buckets, @Strategy @Nonnull Predicate<? super TEntry> evictable) {
+            TEntry evicted = evictOneInRange(buckets, evictable, evictionCursor, buckets.length());
+            if (evicted == null && evictionCursor != 0) {
+                evicted = evictOneInRange(buckets, evictable, 0, evictionCursor);
+            }
+            if (evicted != null) {
+                size.decrementAndGet();
+                return evicted;
+            }
+            // Nothing matched anywhere; step the evictionCursor on regardless so repeated refusals don't
+            // all
+            // restart the (wasted) scan from the same bucket.
+            evictionCursor = bucketIndex(buckets, evictionCursor + 1);
+            return null;
+        }
+
+        @GuardedBy("the corresponding State's getTableWriteLock(state)")
+        @SuppressFBWarnings(
+                value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
+                justification = "evictionCursor is read and written only while the corresponding State's write lock is"
+                        + " held; SpotBugs cannot model that dynamic guard")
+        @StrategyConsumer
+        @Nullable
+        private <TEntry extends Entry<TEntry>> TEntry evictOneInRange(
+                @Nonnull AtomicReferenceArray<TEntry> buckets,
+                @Strategy @Nonnull Predicate<? super TEntry> evictable,
+                int startBucket,
+                int endBucket) {
+            for (int i = startBucket; i < endBucket; i++) {
+                TEntry prev = null;
+                for (TEntry e = buckets.get(i); e != null; e = e.next()) {
+                    if (evictable.test(e)) {
+                        unlinkUnchecked(buckets, i, prev, e);
+                        evictionCursor = i;
+                        return e;
+                    }
+                    prev = e;
+                }
+            }
+            return null;
+        }
+
+        /**
+         * Unlinks every entry matching {@code evictable} in one full pass, decrementing the count for
+         * each, and returns how many were removed. Resets the scan position, since a full pass leaves
+         * nothing later to resume from.
+         */
+        @GuardedBy("the corresponding State's getTableWriteLock(state)")
+        @SuppressFBWarnings(
+                value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
+                justification = "evictionCursor is read and written only while the corresponding State's write lock is"
+                        + " held; SpotBugs cannot model that dynamic guard")
+        @StrategyConsumer
+        public <TEntry extends Entry<TEntry>> int evictAll(
+                @Nonnull AtomicReferenceArray<TEntry> buckets, @Strategy @Nonnull Predicate<? super TEntry> evictable) {
+            int count = 0;
+            for (int i = 0; i < buckets.length(); i++) {
+                TEntry prev = null;
+                for (TEntry e = buckets.get(i); e != null; e = e.next()) {
+                    if (evictable.test(e)) {
+                        unlinkUnchecked(buckets, i, prev, e);
+                        size.decrementAndGet();
+                        count++;
+                    } else {
+                        prev = e;
+                    }
+                }
+            }
+            evictionCursor = 0;
+            return count;
+        }
     }
 
     /**
-     * {@link #tryGetOrCreate}, but when the table is full, evicts one entry matching {@code
-     * evictable} to make room instead of refusing the insert. Refuses only when the table is full
-     * <em>and</em> nothing matches {@code evictable} — see {@link #tryGetOrCreateOrEvictOrNull} for
-     * the null-returning form and the eviction/creation ordering.
+     * Bucket array and occupancy manager for a caller-defined capped table. Keep them paired and
+     * prefer the {@code State}-accepting helpers so structural changes update the count consistently.
+     *
+     * <p>{@code sizeManager} is intentionally package-private: callers outside this class must go
+     * through the {@code State}-accepting static helpers ({@link #estimateSize}, {@link #isFull},
+     * {@link #tryReserve}, {@link #tryReserveOrEvict}, {@link #evictOne}, {@link #evictAll}) rather
+     * than reach into the manager directly.
      */
-    @Nonnull
-    public Maybe<TEntry> tryGetOrCreateOrEvict(
-        @Nullable K key,
-        @Strategy @Nonnull Function<? super K, ? extends TEntry> creator,
-        @Strategy @Nonnull Predicate<? super TEntry> evictable) {
-      return Maybe.of(tryGetOrCreateOrEvictOrNull(key, creator, evictable));
+    public static final class State<TEntry extends Entry<TEntry>> {
+        public final AtomicReferenceArray<TEntry> buckets;
+        final SizeManager sizeManager;
+
+        /**
+         * The table's write lock. Unlike the bare-array helpers' opaque {@code synchronized} monitor,
+         * this is a real {@link ReentrantLock}. A {@link Reservation} can acquire it in {@link
+         * ConcurrentHashtable#tryReserve(State, long)} and release it later in {@link
+         * Reservation#close()}, unlike a lexically scoped {@code synchronized} block.
+         */
+        final ReentrantLock writeLock = new ReentrantLock();
+
+        private State(AtomicReferenceArray<TEntry> buckets, int maxCapacity) {
+            this.buckets = buckets;
+            this.sizeManager = new SizeManager(maxCapacity);
+        }
     }
 
     /**
-     * Escape hatch for {@link #tryGetOrCreateOrEvict} for callers that want the nullable entry
-     * directly. Eviction runs before {@code creator}, not after: {@code creator} may throw, so
-     * freeing a slot and only then attempting the fallible create keeps a thrown exception from
-     * ever leaving a slot double-booked. A creator that throws after a successful eviction simply
-     * leaves the table one entry smaller — no corruption, just a wasted eviction.
+     * Creates a bucket array for {@code maxCapacity} entries and pairs it with a manager enforcing
+     * that cap. {@code entryClass} is used only to infer {@code TEntry}.
      */
-    @StrategyConsumer
-    @Nullable
-    public TEntry tryGetOrCreateOrEvictOrNull(
-        @Nullable K key,
-        @Strategy @Nonnull Function<? super K, ? extends TEntry> creator,
-        @Strategy @Nonnull Predicate<? super TEntry> evictable) {
-      long keyHash = D1.Entry.hash(key);
-      int index = bucketIndex(state.buckets, keyHash);
-      for (Entry<K> curEntry = bucketAt(state, index);
-          curEntry != null;
-          curEntry = curEntry.next()) {
-        if (curEntry.keyHash == keyHash && curEntry.matches(key)) {
-          return cast(curEntry);
-        }
-      }
-      ReentrantLock lock = getTableWriteLock(state);
-      lock.lock();
-      try {
-        for (Entry<K> curEntry = bucketAt(state, index);
-            curEntry != null;
-            curEntry = curEntry.next()) {
-          if (curEntry.keyHash == keyHash && curEntry.matches(key)) {
-            return cast(curEntry);
-          }
-        }
-        if (state.sizeManager.isFull()
-            && state.sizeManager.evictOne(state.buckets, castPredicate(evictable)) == null) {
-          return null;
-        }
-        TEntry newEntry = creator.apply(key);
-        insertHeadEntryAt(state, index, newEntry);
-        state.sizeManager.increment();
-        return newEntry;
-      } finally {
-        lock.unlock();
-      }
+    @Nonnull
+    public static <TEntry extends Entry<TEntry>> State<TEntry> createBounded(
+            @Nonnull Class<TEntry> entryClass, int maxCapacity) {
+        return new State<>(createFixedBuckets(entryClass, maxCapacity), maxCapacity);
     }
 
-    /**
-     * Removes and returns the entry for {@code key}, or {@code null} if absent. Acquires the
-     * table-level lock to splice the chain; lock-free readers observe the removal via the volatile
-     * write of the predecessor's {@code next} (or the bucket head).
-     */
-    @Nullable
-    public TEntry remove(@Nullable K key) {
-      long keyHash = D1.Entry.hash(key);
-      int index = bucketIndex(state.buckets, keyHash);
-      ReentrantLock lock = getTableWriteLock(state);
-      lock.lock();
-      try {
-        Entry<K> prev = null;
-        for (Entry<K> curEntry = bucketAt(state, index);
-            curEntry != null;
-            prev = curEntry, curEntry = curEntry.next()) {
-          if (curEntry.keyHash == keyHash && curEntry.matches(key)) {
-            unlink(state, index, prev, curEntry);
-            state.sizeManager.decrement();
-            return cast(curEntry);
-          }
-        }
-        return null;
-      } finally {
-        lock.unlock();
-      }
+    /** Live entries in {@code state}; see {@link SizeManager#estimateSize()}. Lock-free. */
+    public static int estimateSize(@Nonnull State<?> state) {
+        return state.sizeManager.estimateSize();
     }
 
     /**
-     * Removes every entry matching {@code predicate}, returning {@code true} if any were removed.
-     * Holds the table-level lock for the whole sweep, so the predicate sees a stable table and
-     * concurrent writers are excluded; lock-free readers continue throughout.
+     * {@code true} once {@code state} is at capacity; see {@link SizeManager#isFull()}. Lock-free.
      */
-    public boolean removeIf(@Strategy @Nonnull Predicate<? super TEntry> predicate) {
-      return ConcurrentHashtable.removeIf(state, castPredicate(predicate));
+    public static boolean isFull(@Nonnull State<?> state) {
+        return state.sizeManager.isFull();
     }
 
     /**
-     * Removes all entries and invokes {@code drainedEntryConsumer} for each one.
+     * Claims one slot in {@code state} for {@code keyHash} and returns a handle for completing the
+     * find-or-insert protocol, or an empty handle if the table is full. Never returns {@code null},
+     * so this always composes with try-with-resources:
      *
-     * <p>The lock is acquired and released bucket by bucket rather than held for the whole sweep,
-     * so a table-level operation (an insert, a reservation, an eviction) can interleave between
-     * buckets instead of waiting out the entire drain. This means the drain is no longer an atomic
-     * snapshot: an entry inserted into a not-yet-visited bucket while the drain is in progress is
-     * swept up too, and each bucket's capacity slot is released immediately before its consumer
-     * invocation runs, rather than once for the whole sweep at the end. The consumer should be
-     * quick and must not throw. If it does, later entries in the detached bucket remain counted but
-     * are no longer reachable from the table. Buckets not yet visited remain intact, and capacity
-     * already released is not restored.
+     * <pre>{@code
+     * try (Reservation<TEntry> r = ConcurrentHashtable.tryReserve(state, keyHash)) {
+     *   return r.tryGetOrInsertOrNull(component1, component2, component3, TEntry::new);
+     * }
+     * }</pre>
+     *
+     * <p>Run a lock-free scan first (see {@link #bucketFor}/{@link #bucketAt}) and only call this
+     * once that scan has missed — a successful reservation isn't required for correctness (the
+     * reservation itself, and the locked comparison inside {@link Reservation#tryGetOrInsertOrNull},
+     * are the source of truth), it just avoids paying for a lock and a factory call when a hit was
+     * already visible lock-free.
      *
-     * <p>Use {@link #drain(Object, BiConsumer)} to avoid a capturing lambda.
+     * <p>Checks {@link SizeManager#isFull()} lock-free first. If the table looks full, {@code
+     * keyHash}'s bucket is checked too: if it's empty, nothing could possibly match this key --
+     * <em>unless</em> a concurrent reservation for this exact key is in flight, having already
+     * claimed the table's last slot (so {@code isFull()} is genuinely {@code true}) without yet
+     * linking its entry (so the bucket still looks empty). That window is confirmed away under the
+     * write lock before this returns a definitively empty reservation without ever taking it --
+     * otherwise the concurrent duplicate landing in that exact window would be dropped instead of
+     * counted. Once the lock is held (either because the fast peek above couldn't rule out a match,
+     * or because the locked recheck couldn't either), this reserves the slot -- returning a real
+     * reservation that <em>holds the lock open</em> across this call, to be released later by {@link
+     * Reservation#close()} -- or, if the table is genuinely still full, keeps the lock open anyway
+     * (rather than releasing it immediately) so {@link Reservation#finish} can still scan {@code
+     * keyHash}'s bucket the next time the caller supplies a candidate entry. That's what closes the
+     * race where a concurrent insert for the same logical duplicate lands in the exact window between
+     * this caller's own lock-free scan and its reservation attempt: without the lock held open here,
+     * that concurrent duplicate would go uncounted. Holding the lock for the reservation's whole
+     * lifetime (rather than just across this call, the way {@link SizeManager#tryReserve()} does) is
+     * also what lets {@link Reservation#tryGetOrInsertOrNull} skip a second, separately-locked
+     * comparison pass: the reserve-then-insert-or-discard sequence is one uninterrupted critical
+     * section, so no concurrent reservation for the same logical duplicate can slip in between.
      *
-     * @param drainedEntryConsumer action invoked for each removed entry
+     * <p>Always returns a non-null handle — even when the table is full — so the caller must check
+     * {@link Reservation#isReserved()} (or simply call {@link Reservation#tryGetOrInsertOrNull},
+     * which returns {@code null} on an absent reservation) rather than assume every reservation is
+     * real. A reservation can also report {@link Reservation#isReserved()} {@code true} while still
+     * having no slot to insert into (the lock-held-but-full case above); either way, {@code
+     * tryGetOrInsertOrNull}/{@code tryGetOrInsert} return the concurrent match found under the lock,
+     * or {@code null} -- never a newly linked entry when no slot was claimed.
+     *
+     * @param keyHash hash of the key the caller is about to look up or insert
      */
-    public void drain(@Strategy @Nonnull Consumer<? super TEntry> drainedEntryConsumer) {
-      ConcurrentHashtable.drain(state, castConsumer(drainedEntryConsumer));
+    @Nonnull
+    @SuppressFBWarnings(
+            value = "UL_UNRELEASED_LOCK",
+            justification = "Every path either unlocks before returning (the confirmed-empty case) or hands the"
+                    + " held lock off to the returned Reservation, released later by Reservation#close;"
+                    + " SpotBugs can't correlate that transfer across the two lock() call sites here.")
+    public static <TEntry extends Entry<TEntry>> Reservation<TEntry> tryReserve(
+            @Nonnull State<TEntry> state, long keyHash) {
+        int index = bucketIndex(state.buckets, keyHash);
+        ReentrantLock lock = state.writeLock;
+        if (state.sizeManager.isFull() && bucketAt(state, index) == null) {
+            lock.lock();
+            // The lock-free peek above can be stale: a concurrent reservation for this exact key may
+            // have already claimed the table's last slot (isFull() true) without yet linking its entry
+            // (bucket still looks empty). Recheck under the lock before trusting it, or that concurrent
+            // duplicate would be dropped instead of counted.
+            if (state.sizeManager.isFull() && bucketAt(state, index) == null) {
+                lock.unlock();
+                return new Reservation<>(null, false);
+            }
+            if (state.sizeManager.tryReserve()) {
+                return new Reservation<>(state, true);
+            }
+            return new Reservation<>(state, false);
+        }
+        lock.lock();
+        if (state.sizeManager.tryReserve()) {
+            return new Reservation<>(state, true);
+        }
+        return new Reservation<>(state, false);
     }
 
     /**
-     * Context-passing {@link #drain(Consumer)}. The lock is acquired and released bucket by bucket
-     * rather than held for the whole sweep, so a table-level operation (an insert, a reservation,
-     * an eviction) can interleave between buckets instead of waiting out the entire drain. This
-     * means the drain is no longer an atomic snapshot: an entry inserted into a not-yet-visited
-     * bucket while the drain is in progress is swept up too, and each bucket's capacity slot is
-     * released immediately before its consumer invocation runs, rather than once for the whole
-     * sweep at the end.
+     * Handle returned by {@link #tryReserve}, gating {@link #tryGetOrInsertOrNull} behind a claimed
+     * slot and auto-cancelling it on {@link #close} if it's never consumed. A single {@code
+     * Reservation} must be used for at most one {@code tryGetOrInsertOrNull}/{@code tryGetOrInsert}
+     * call -- a second call throws {@link IllegalStateException} rather than silently linking a
+     * second entry while the size counter only reflects the first.
      *
-     * <p>Pass a non-capturing {@link BiConsumer} (typically a {@code static final}) plus the
-     * accumulator as {@code context} (e.g. the target list or event builder) to avoid a
-     * capturing-lambda allocation.
+     * <p>Overloaded up to 4 key components ({@link #tryGetOrInsertOrNull(Object, Function)} through
+     * {@link #tryGetOrInsertOrNull(Object, Object, Object, Object, Function4)}) so a non-capturing
+     * method reference can build the entry directly from its natural constructor arguments, without
+     * an intermediate holder object or a capturing lambda.
      *
-     * @param <C> context type
-     * @param context context passed to each invocation of {@code drainedEntryConsumer}
-     * @param drainedEntryConsumer action invoked with the context and each removed entry
+     * <p>A non-empty reservation holds the table's write lock until {@link #close()}, even after
+     * insertion or a matching entry is returned. Keep its lifetime short: other writers using this
+     * lock must wait until the reservation is closed.
+     *
+     * <p>Create, use, and close the reservation on the same thread: its {@link ReentrantLock} must be
+     * released by the thread that acquired it.
+     *
+     * @param <TEntry> the table's entry type, itself self-bound (see {@link
+     *     ConcurrentHashtable.Entry})
      */
-    public <C> void drain(
-        C context, @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> drainedEntryConsumer) {
-      ConcurrentHashtable.drain(state, context, castConsumer(drainedEntryConsumer));
-    }
+    @NotThreadSafe
+    public static final class Reservation<TEntry extends Entry<TEntry>> implements AutoCloseable {
+        @Nullable
+        private final State<TEntry> state;
+
+        private final boolean slotClaimed;
+        private boolean completed;
+        private boolean consumed;
+
+        private Reservation(@Nullable State<TEntry> state, boolean slotClaimed) {
+            this.state = state;
+            this.slotClaimed = slotClaimed;
+        }
 
-    /** Removes all entries. Lock-free readers mid-walk complete against the entries they hold. */
-    public void clear() {
-      ConcurrentHashtable.clear(state);
-    }
+        /**
+         * {@code true} unless this reservation is definitively empty -- i.e. {@link #tryReserve} could
+         * rule out a match for the target key without even taking the write lock. A {@code true}
+         * reservation may still have no slot to insert into: {@link #tryReserve} keeps the lock open on
+         * a full table when the target bucket is populated, purely so {@link #finish} can still scan it
+         * for a concurrent match. Callers should call {@code tryGetOrInsertOrNull}/{@code
+         * tryGetOrInsert} and check its result rather than assume {@code true} means a slot was
+         * claimed.
+         */
+        public boolean isReserved() {
+            return state != null;
+        }
 
-    public void forEach(@Strategy @Nonnull Consumer<? super TEntry> consumer) {
-      ConcurrentHashtable.forEach(state, castConsumer(consumer));
-    }
+        /**
+         * Escape hatch for a caller that already built {@code newEntry} itself -- e.g. more than 4 key
+         * components, or components the caller wants to keep as primitives rather than boxing them into
+         * a {@code Function}'s type argument:
+         *
+         * <pre>{@code
+         * try (Reservation<TEntry> r = ConcurrentHashtable.tryReserve(state, keyHash)) {
+         *   if (!r.isReserved()) {
+         *     return null;
+         *   }
+         *   return r.tryGetOrInsertOrNull(new TEntry(longComponent1, longComponent2));
+         * }
+         * }</pre>
+         *
+         * See {@link #tryGetOrInsertOrNull(Object, Object, BiFunction)} for the general contract.
+         */
+        @Nullable
+        public TEntry tryGetOrInsertOrNull(@Nonnull TEntry newEntry) {
+            return state == null ? null : finish(newEntry);
+        }
 
-    /**
-     * Context-passing forEach. Avoids a capturing-lambda allocation — pass a non-capturing {@link
-     * BiConsumer} (typically a {@code static final}) plus whatever side-band state it needs.
-     */
-    public <C> void forEach(
-        C context, @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> consumer) {
-      ConcurrentHashtable.forEach(state, context, castConsumer(consumer));
-    }
-  }
-
-  /**
-   * Two-key concurrent hash table. Key parts are passed directly to {@link #get} and {@link
-   * #tryGetOrCreate}, avoiding a composite wrapper whose allocation would otherwise rely on HotSpot
-   * escape analysis to disappear. Reads are lock-free; misses and mutations acquire the write lock.
-   *
-   * @param <K1> first key type
-   * @param <K2> second key type
-   * @param <TEntry> the user's {@link D2.Entry D2.Entry&lt;K1, K2&gt;} subclass
-   */
-  @ThreadSafe
-  public static final class D2<K1, K2, TEntry extends D2.Entry<K1, K2>> {
+        /**
+         * One key component; see {@link #tryGetOrInsertOrNull(Object, Object, BiFunction)} for the
+         * general contract.
+         */
+        @StrategyConsumer
+        @Nullable
+        public <A> TEntry tryGetOrInsertOrNull(A a, @Strategy @Nonnull Function<? super A, ? extends TEntry> factory) {
+            return state == null ? null : finish(factory.apply(a));
+        }
 
-    /**
-     * Abstract base for {@link D2} entries. Subclass to add value fields you wish to mutate in
-     * place after retrieving the entry via {@link D2#get}.
-     *
-     * <p>Deliberately parameterized on {@code K1}/{@code K2} alone, not self-bound on the concrete
-     * subclass -- see {@link D1.Entry} for why.
-     *
-     * @param <K1> first key type
-     * @param <K2> second key type
-     */
-    public abstract static class Entry<K1, K2> extends ConcurrentHashtable.Entry<Entry<K1, K2>> {
-      @Nullable final K1 key1;
-      @Nullable final K2 key2;
-
-      protected Entry(@Nullable K1 key1, @Nullable K2 key2) {
-        super(hash(key1, key2));
-        this.key1 = key1;
-        this.key2 = key2;
-      }
-
-      /** The first key part this entry was created with. */
-      @Nullable
-      public K1 key1() {
-        return this.key1;
-      }
-
-      /** The second key part this entry was created with. */
-      @Nullable
-      public K2 key2() {
-        return this.key2;
-      }
-
-      public boolean matches(@Nullable K1 key1, @Nullable K2 key2) {
-        // equals() on the lookup params, not the fields, so the JIT can devirtualize them once
-        // matches() inlines into get/getOrCreate (the caller's key types are known there).
-        return Objects.equals(key1, this.key1) && Objects.equals(key2, this.key2);
-      }
-
-      /** {@link ConcurrentHashtable.Entry#matches(Entry)} in terms of the key-based overload. */
-      @Override
-      public final boolean matches(@Nonnull Entry<K1, K2> other) {
-        return matches(other.key1, other.key2);
-      }
-
-      /** Returns the 64-bit lookup hash combining both key parts via {@link LongHashingUtils}. */
-      public static long hash(@Nullable Object key1, @Nullable Object key2) {
-        return LongHashingUtils.hash(key1, key2);
-      }
-    }
+        /**
+         * Two key components. Builds {@code factory.apply(...)} (skipped entirely if this reservation
+         * is definitively empty — see {@link #isReserved()}) and either links the result as a new entry
+         * or discards it in favor of an existing match found under the write lock. Returns {@code null}
+         * when there is neither a slot to claim nor a match to return -- either because this
+         * reservation is definitively empty, or (see {@link #tryReserve}) because the table was still
+         * full even under the lock and no concurrent match was found either; otherwise always returns a
+         * real entry (the newly built one, or the concurrent match).
+         *
+         * <p>The factory runs while the reservation holds the write lock. Its result is required for
+         * the entry-to-entry comparison, including when the table is full and no slot was claimed.
+         */
+        @StrategyConsumer
+        @Nullable
+        public <A, B> TEntry tryGetOrInsertOrNull(
+                A a, B b, @Strategy @Nonnull BiFunction<? super A, ? super B, ? extends TEntry> factory) {
+            return state == null ? null : finish(factory.apply(a, b));
+        }
 
-    private final State<Entry<K1, K2>> state;
+        /**
+         * Three key components; see {@link #tryGetOrInsertOrNull(Object, Object, BiFunction)} for the
+         * general contract.
+         */
+        @StrategyConsumer
+        @Nullable
+        public <A, B, C> TEntry tryGetOrInsertOrNull(
+                A a,
+                B b,
+                C c,
+                @Strategy @Nonnull TriFunction<? super A, ? super B, ? super C, ? extends TEntry> factory) {
+            return state == null ? null : finish(factory.apply(a, b, c));
+        }
 
-    private D2(State<Entry<K1, K2>> state) {
-      this.state = state;
-    }
+        /** Four key components; see {@link #tryGetOrInsertOrNull(Object, Object, BiFunction)}. */
+        @StrategyConsumer
+        @Nullable
+        public <A, B, C, D> TEntry tryGetOrInsertOrNull(
+                A a,
+                B b,
+                C c,
+                D d,
+                @Strategy @Nonnull Function4<? super A, ? super B, ? super C, ? super D, ? extends TEntry> factory) {
+            return state == null ? null : finish(factory.apply(a, b, c, d));
+        }
 
-    /**
-     * Creates a fixed-size table holding at most {@code maxCapacity} entries. {@code entryClass} is
-     * used only to infer {@code TEntry}; entries are created by the {@code creator} functions
-     * passed to the insertion methods. The table does not resize.
-     */
-    @Nonnull
-    @SuppressWarnings("unchecked")
-    public static <K1, K2, TEntry extends D2.Entry<K1, K2>> D2<K1, K2, TEntry> createBounded(
-        @Nonnull Class<TEntry> entryClass, int maxCapacity) {
-      // entryClass is erased away (see ConcurrentHashtable#createFixedBuckets), so treating it as
-      // Class<Entry<K1, K2>> instead of the caller's concrete Class<TEntry> is safe.
-      Class<Entry<K1, K2>> baseEntryClass = (Class<Entry<K1, K2>>) (Class<?>) entryClass;
-      return new D2<>(ConcurrentHashtable.createBounded(baseEntryClass, maxCapacity));
-    }
+        /** {@link Maybe}-wrapping counterpart of {@link #tryGetOrInsertOrNull(Entry)}. */
+        @Nonnull
+        public Maybe<TEntry> tryGetOrInsert(@Nonnull TEntry newEntry) {
+            return Maybe.of(tryGetOrInsertOrNull(newEntry));
+        }
 
-    /**
-     * Sound because every entry ever inserted into {@link #state} was produced as a {@code TEntry}.
-     */
-    @SuppressWarnings("unchecked")
-    private TEntry cast(@Nullable Entry<K1, K2> entry) {
-      return (TEntry) entry;
-    }
+        /**
+         * {@link Maybe}-wrapping counterpart of {@link #tryGetOrInsertOrNull(Object, Function)}, for
+         * callers who'd rather make the "this can fail unlike unbounded collections" outcome visible in
+         * the return type than rely on a {@code null} check — mirrors {@link D1#tryGetOrCreate} /
+         * {@link D2#tryGetOrCreate} wrapping their own {@code ...OrNull} methods.
+         */
+        @Nonnull
+        public <A> Maybe<TEntry> tryGetOrInsert(A a, @Strategy @Nonnull Function<? super A, ? extends TEntry> factory) {
+            return Maybe.of(tryGetOrInsertOrNull(a, factory));
+        }
 
-    /** See {@link #cast(Entry)}; casts the functional-interface reference, not each element. */
-    @SuppressWarnings("unchecked")
-    private Predicate<? super Entry<K1, K2>> castPredicate(Predicate<? super TEntry> predicate) {
-      return (Predicate<? super Entry<K1, K2>>) predicate;
-    }
+        /** Two key components; see {@link #tryGetOrInsert(Object, Function)}. */
+        @Nonnull
+        public <A, B> Maybe<TEntry> tryGetOrInsert(
+                A a, B b, @Strategy @Nonnull BiFunction<? super A, ? super B, ? extends TEntry> factory) {
+            return Maybe.of(tryGetOrInsertOrNull(a, b, factory));
+        }
 
-    @SuppressWarnings("unchecked")
-    private Consumer<? super Entry<K1, K2>> castConsumer(Consumer<? super TEntry> consumer) {
-      return (Consumer<? super Entry<K1, K2>>) consumer;
-    }
+        /** Three key components; see {@link #tryGetOrInsert(Object, Function)}. */
+        @Nonnull
+        public <A, B, C> Maybe<TEntry> tryGetOrInsert(
+                A a,
+                B b,
+                C c,
+                @Strategy @Nonnull TriFunction<? super A, ? super B, ? super C, ? extends TEntry> factory) {
+            return Maybe.of(tryGetOrInsertOrNull(a, b, c, factory));
+        }
 
-    @SuppressWarnings("unchecked")
-    private <C> BiConsumer<? super C, ? super Entry<K1, K2>> castConsumer(
-        BiConsumer<? super C, ? super TEntry> consumer) {
-      return (BiConsumer<? super C, ? super Entry<K1, K2>>) consumer;
-    }
+        /** Four key components; see {@link #tryGetOrInsert(Object, Function)}. */
+        @Nonnull
+        public <A, B, C, D> Maybe<TEntry> tryGetOrInsert(
+                A a,
+                B b,
+                C c,
+                D d,
+                @Strategy @Nonnull Function4<? super A, ? super B, ? super C, ? super D, ? extends TEntry> factory) {
+            return Maybe.of(tryGetOrInsertOrNull(a, b, c, d, factory));
+        }
 
-    public int size() {
-      return state.sizeManager.estimateSize();
-    }
+        /**
+         * Runs the locked comparison/link decision. The write lock is already held -- acquired by
+         * {@link #tryReserve} and not yet released -- so this needs no {@code synchronized}/{@code
+         * lock()} of its own.
+         *
+         * <p>Always scans for a match first, whether or not a slot was actually claimed: a {@link
+         * #tryReserve} reservation with no slot still holds the lock specifically so this scan can run.
+         * Only links {@code newEntry} when a slot was claimed; otherwise a miss here means there really
+         * is nothing to return, so this returns {@code null}.
+         *
+         * @throws IllegalStateException if this reservation was already used for a prior {@code
+         *     tryGetOrInsertOrNull}/{@code tryGetOrInsert} call -- reusing one could link a second,
+         *     distinct entry into the table while the size counter only reflects the first.
+         */
+        @Nullable
+        private TEntry finish(@Nonnull TEntry newEntry) {
+            if (completed) {
+                throw new IllegalStateException("Reservation already used for tryGetOrInsertOrNull/tryGetOrInsert");
+            }
+            completed = true;
+            int index = bucketIndex(state.buckets, newEntry.keyHash);
+            for (TEntry curEntry = bucketAt(state, index); curEntry != null; curEntry = curEntry.next()) {
+                if (curEntry.keyHash == newEntry.keyHash && curEntry.matches(newEntry)) {
+                    return curEntry;
+                }
+            }
+            if (!slotClaimed) {
+                return null;
+            }
+            insertHeadEntryAt(state, index, newEntry);
+            consumed = true;
+            return newEntry;
+        }
 
-    public boolean isFull() {
-      return state.sizeManager.isFull();
+        /**
+         * Releases the write lock {@link #tryReserve} acquired, giving back a claimed slot first if it
+         * was never consumed. A no-op on a definitively empty reservation, which never acquired the
+         * lock.
+         */
+        @Override
+        public void close() {
+            if (state == null) {
+                return;
+            }
+            try {
+                if (slotClaimed && !consumed) {
+                    state.sizeManager.decrement();
+                }
+            } finally {
+                state.writeLock.unlock();
+            }
+        }
     }
 
-    @Nullable
-    public TEntry get(@Nullable K1 key1, @Nullable K2 key2) {
-      long keyHash = D2.Entry.hash(key1, key2);
-      for (Entry<K1, K2> curEntry = bucketFor(state, keyHash);
-          curEntry != null;
-          curEntry = curEntry.next()) {
-        if (curEntry.keyHash == keyHash && curEntry.matches(key1, key2)) {
-          return cast(curEntry);
-        }
-      }
-      return null;
+    /** Four-argument analogue of {@link java.util.function.BiFunction}. */
+    @Strategy
+    @FunctionalInterface
+    public interface Function4<A, B, C, D, R> {
+        R apply(A a, B b, C c, D d);
     }
 
     /**
-     * Returns the entry for {@code (key1, key2)}, creating one via {@code creator} if absent and
-     * the table is under capacity. Lock-free on hit; acquires a table-level lock on miss. Wraps
-     * {@link #tryGetOrCreateOrNull} — see that method for the refusal and ordering details.
+     * Reserves one slot in {@code state}, evicting an entry matching {@code evictable} when
+     * necessary. Returns {@code false} if the table is full and nothing can be evicted. This method
+     * acquires the table write lock.
+     *
+     * <p>The reservation survives drain and clear operations. Complete it with {@link
+     * #insertReserved}; abandoning it permanently consumes capacity.
      */
-    @Nonnull
-    public Maybe<TEntry> tryGetOrCreate(
-        @Nullable K1 key1,
-        @Nullable K2 key2,
-        @Strategy @Nonnull BiFunction<? super K1, ? super K2, ? extends TEntry> creator) {
-      return Maybe.of(tryGetOrCreateOrNull(key1, key2, creator));
+    public static <TEntry extends Entry<TEntry>> boolean tryReserveOrEvict(
+            @Nonnull State<TEntry> state, @Strategy @Nonnull Predicate<? super TEntry> evictable) {
+        ReentrantLock lock = getTableWriteLock(state);
+        lock.lock();
+        try {
+            return state.sizeManager.tryReserveOrEvict(state.buckets, evictable);
+        } finally {
+            lock.unlock();
+        }
     }
 
     /**
-     * Escape hatch for {@link #tryGetOrCreate} for callers that want the nullable entry directly
-     * rather than a {@link Maybe} wrapper. Returns {@code null} when the table is at capacity and
-     * {@code (key1, key2)} was not already present. Re-checks under the lock to avoid duplicate
-     * entries under concurrent misses.
+     * Unlinks the first entry in {@code state} matching {@code evictable}, resuming from where the
+     * last eviction looked, and decrements the count. {@code null} if nothing matched anywhere.
+     * Self-locking.
      */
-    @StrategyConsumer
     @Nullable
-    public TEntry tryGetOrCreateOrNull(
-        @Nullable K1 key1,
-        @Nullable K2 key2,
-        @Strategy @Nonnull BiFunction<? super K1, ? super K2, ? extends TEntry> creator) {
-      long keyHash = D2.Entry.hash(key1, key2);
-      int index = bucketIndex(state.buckets, keyHash);
-      for (Entry<K1, K2> curEntry = bucketAt(state, index);
-          curEntry != null;
-          curEntry = curEntry.next()) {
-        if (curEntry.keyHash == keyHash && curEntry.matches(key1, key2)) {
-          return cast(curEntry);
-        }
-      }
-      ReentrantLock lock = getTableWriteLock(state);
-      lock.lock();
-      try {
-        for (Entry<K1, K2> curEntry = bucketAt(state, index);
-            curEntry != null;
-            curEntry = curEntry.next()) {
-          if (curEntry.keyHash == keyHash && curEntry.matches(key1, key2)) {
-            return cast(curEntry);
-          }
-        }
-        // isFull() is checked before creating the entry, not before reserving a slot for it:
-        // creator.apply() can throw, and if we'd already reserved (incremented) the slot, a
-        // throwing creator would leak that reservation forever. So we accept the entry only after
-        // creator succeeds, then increment.
-        if (state.sizeManager.isFull()) {
-          return null;
-        }
-        TEntry newEntry = creator.apply(key1, key2);
-        insertHeadEntryAt(state, index, newEntry);
-        state.sizeManager.increment();
-        return newEntry;
-      } finally {
-        lock.unlock();
-      }
+    public static <TEntry extends Entry<TEntry>> TEntry evictOne(
+            @Nonnull State<TEntry> state, @Strategy @Nonnull Predicate<? super TEntry> evictable) {
+        ReentrantLock lock = getTableWriteLock(state);
+        lock.lock();
+        try {
+            return state.sizeManager.evictOne(state.buckets, evictable);
+        } finally {
+            lock.unlock();
+        }
     }
 
     /**
-     * {@link #tryGetOrCreate}, but when the table is full, evicts one entry matching {@code
-     * evictable} to make room instead of refusing the insert. Refuses only when the table is full
-     * <em>and</em> nothing matches {@code evictable} — see {@link #tryGetOrCreateOrEvictOrNull} for
-     * the null-returning form and the eviction/creation ordering.
+     * Unlinks every entry in {@code state} matching {@code evictable}, decrementing per removal, and
+     * returns how many went. Self-locking.
      */
-    @Nonnull
-    public Maybe<TEntry> tryGetOrCreateOrEvict(
-        @Nullable K1 key1,
-        @Nullable K2 key2,
-        @Strategy @Nonnull BiFunction<? super K1, ? super K2, ? extends TEntry> creator,
-        @Strategy @Nonnull Predicate<? super TEntry> evictable) {
-      return Maybe.of(tryGetOrCreateOrEvictOrNull(key1, key2, creator, evictable));
+    public static <TEntry extends Entry<TEntry>> int evictAll(
+            @Nonnull State<TEntry> state, @Strategy @Nonnull Predicate<? super TEntry> evictable) {
+        ReentrantLock lock = getTableWriteLock(state);
+        lock.lock();
+        try {
+            return state.sizeManager.evictAll(state.buckets, evictable);
+        } finally {
+            lock.unlock();
+        }
     }
 
+    // ---------------------------------------------------------------------------------------------
+    // Static building blocks over a caller-owned bucket array (formerly the nested Support class).
+    // Use these to assemble a custom table (higher arity, primitive keys, extra value fields) when
+    // D1/D2 don't fit; D1/D2 delegate to them internally. The whole-table mutators (removeIf, drain,
+    // clear) self-lock on the array; the single-slot write primitives (insertHeadEntry, unlink) do
+    // not lock and must be called under the caller's own synchronized (getWriteLock(buckets,
+    // keyHash)) block.
+    // Readers
+    // (bucket walks, forEach) are lock-free.
+    // ---------------------------------------------------------------------------------------------
+
     /**
-     * Escape hatch for {@link #tryGetOrCreateOrEvict} for callers that want the nullable entry
-     * directly. Eviction runs before {@code creator}, not after: {@code creator} may throw, so
-     * freeing a slot and only then attempting the fallible create keeps a thrown exception from
-     * ever leaving a slot double-booked. A creator that throws after a successful eviction simply
-     * leaves the table one entry smaller — no corruption, just a wasted eviction.
+     * Creates a bucket array whose length is {@link #sizeFor(int) sizeFor(capacity)}. Because {@link
+     * AtomicReferenceArray}'s element type is erased at runtime, {@code entryClass} is not used for
+     * reflective allocation or runtime type checks; it only lets the compiler infer {@code TEntry}.
      */
-    @StrategyConsumer
-    @Nullable
-    public TEntry tryGetOrCreateOrEvictOrNull(
-        @Nullable K1 key1,
-        @Nullable K2 key2,
-        @Strategy @Nonnull BiFunction<? super K1, ? super K2, ? extends TEntry> creator,
-        @Strategy @Nonnull Predicate<? super TEntry> evictable) {
-      long keyHash = D2.Entry.hash(key1, key2);
-      int index = bucketIndex(state.buckets, keyHash);
-      for (Entry<K1, K2> curEntry = bucketAt(state, index);
-          curEntry != null;
-          curEntry = curEntry.next()) {
-        if (curEntry.keyHash == keyHash && curEntry.matches(key1, key2)) {
-          return cast(curEntry);
-        }
-      }
-      ReentrantLock lock = getTableWriteLock(state);
-      lock.lock();
-      try {
-        for (Entry<K1, K2> curEntry = bucketAt(state, index);
-            curEntry != null;
-            curEntry = curEntry.next()) {
-          if (curEntry.keyHash == keyHash && curEntry.matches(key1, key2)) {
-            return cast(curEntry);
-          }
-        }
-        if (state.sizeManager.isFull()
-            && state.sizeManager.evictOne(state.buckets, castPredicate(evictable)) == null) {
-          return null;
-        }
-        TEntry newEntry = creator.apply(key1, key2);
-        insertHeadEntryAt(state, index, newEntry);
-        state.sizeManager.increment();
-        return newEntry;
-      } finally {
-        lock.unlock();
-      }
+    @Nonnull
+    public static <TEntry extends Entry<TEntry>> AtomicReferenceArray<TEntry> createFixedBuckets(
+            @Nonnull Class<TEntry> entryClass, int capacity) {
+        return new AtomicReferenceArray<>(sizeFor(capacity));
     }
 
+    /** Upper bound on the bucket-array length returned by {@link #sizeFor(int)}. */
+    static final int MAX_BUCKETS = 1 << 30;
+
     /**
-     * Removes and returns the entry for {@code (key1, key2)}, or {@code null} if absent. Acquires
-     * the table-level lock to splice the chain; lock-free readers observe the removal via the
-     * volatile write of the predecessor's {@code next} (or the bucket head).
+     * Returns the bucket-array length to allocate for a table sized to hold {@code requestedSize}
+     * entries: {@code requestedSize} rounded up to the next power of two, capped at {@link
+     * #MAX_BUCKETS}. Throws {@link IllegalArgumentException} for negative inputs or inputs above the
+     * cap.
      */
-    @Nullable
-    public TEntry remove(@Nullable K1 key1, @Nullable K2 key2) {
-      long keyHash = D2.Entry.hash(key1, key2);
-      int index = bucketIndex(state.buckets, keyHash);
-      ReentrantLock lock = getTableWriteLock(state);
-      lock.lock();
-      try {
-        Entry<K1, K2> prev = null;
-        for (Entry<K1, K2> curEntry = bucketAt(state, index);
-            curEntry != null;
-            prev = curEntry, curEntry = curEntry.next()) {
-          if (curEntry.keyHash == keyHash && curEntry.matches(key1, key2)) {
-            unlink(state, index, prev, curEntry);
-            state.sizeManager.decrement();
-            return cast(curEntry);
-          }
-        }
-        return null;
-      } finally {
-        lock.unlock();
-      }
+    public static int sizeFor(int requestedSize) {
+        if (requestedSize < 0) {
+            throw new IllegalArgumentException("requestedSize must be non-negative: " + requestedSize);
+        }
+        if (requestedSize > MAX_BUCKETS) {
+            throw new IllegalArgumentException(
+                    "requestedSize exceeds maximum bucket count (" + MAX_BUCKETS + "): " + requestedSize);
+        }
+        if (requestedSize <= 1) {
+            return 1;
+        }
+        return Integer.highestOneBit(requestedSize - 1) << 1;
     }
 
     /**
-     * Removes every entry matching {@code predicate}, returning {@code true} if any were removed.
-     * Holds the table-level lock for the whole sweep, so the predicate sees a stable table and
-     * concurrent writers are excluded; lock-free readers continue throughout.
+     * Returns the opaque monitor guarding writes to the bucket selected by {@code keyHash}. Use this
+     * monitor for a keyed scan-and-mutate operation; do not depend on its identity or granularity.
+     *
+     * @see #getWriteLockAt(AtomicReferenceArray, int)
+     * @see #getTableWriteLock(AtomicReferenceArray)
      */
-    public boolean removeIf(@Strategy @Nonnull Predicate<? super TEntry> predicate) {
-      return ConcurrentHashtable.removeIf(state, castPredicate(predicate));
+    @Nonnull
+    public static Object getWriteLock(@Nonnull AtomicReferenceArray<?> buckets, long keyHash) {
+        return getWriteLockAt(buckets, bucketIndex(buckets, keyHash));
     }
 
     /**
-     * Removes all entries and invokes {@code drainedEntryConsumer} for each one.
-     *
-     * <p>The lock is acquired and released bucket by bucket rather than held for the whole sweep,
-     * so a table-level operation (an insert, a reservation, an eviction) can interleave between
-     * buckets instead of waiting out the entire drain. This means the drain is no longer an atomic
-     * snapshot: an entry inserted into a not-yet-visited bucket while the drain is in progress is
-     * swept up too, and each bucket's capacity slot is released immediately before its consumer
-     * invocation runs, rather than once for the whole sweep at the end. The consumer should be
-     * quick and must not throw. If it does, later entries in the detached bucket remain counted but
-     * are no longer reachable from the table. Buckets not yet visited remain intact, and capacity
-     * already released is not restored.
-     *
-     * <p>Use {@link #drain(Object, BiConsumer)} to avoid a capturing lambda.
-     *
-     * @param drainedEntryConsumer action invoked for each removed entry
+     * Returns the {@link State}'s {@link ReentrantLock}, held for the same keyed scan-and-mutate
+     * operations as {@link #getWriteLock(AtomicReferenceArray, long)}. Unlike the bare-array
+     * overload's opaque {@code synchronized} monitor, this lock can be acquired in one call and
+     * released in a later one -- see {@link Reservation}.
      */
-    public void drain(@Strategy @Nonnull Consumer<? super TEntry> drainedEntryConsumer) {
-      ConcurrentHashtable.drain(state, castConsumer(drainedEntryConsumer));
+    @Nonnull
+    public static ReentrantLock getWriteLock(@Nonnull State<?> state, long keyHash) {
+        return state.writeLock;
     }
 
     /**
-     * Context-passing {@link #drain(Consumer)}. The lock is acquired and released bucket by bucket
-     * rather than held for the whole sweep, so a table-level operation (an insert, a reservation,
-     * an eviction) can interleave between buckets instead of waiting out the entire drain. This
-     * means the drain is no longer an atomic snapshot: an entry inserted into a not-yet-visited
-     * bucket while the drain is in progress is swept up too, and each bucket's capacity slot is
-     * released immediately before its consumer invocation runs, rather than once for the whole
-     * sweep at the end.
-     *
-     * <p>Pass a non-capturing {@link BiConsumer} (typically a {@code static final}) plus the
-     * accumulator as {@code context} (e.g. the target list or event builder) to avoid a
-     * capturing-lambda allocation.
-     *
-     * @param <C> context type
-     * @param context context passed to each invocation of {@code drainedEntryConsumer}
-     * @param drainedEntryConsumer action invoked with the context and each removed entry
+     * {@link #getWriteLock(AtomicReferenceArray, long)} for a bucket index that has already been
+     * computed — the shape a {@code getOrCreate} wants when it reuses the index from its lock-free
+     * pre-check. This is the primitive; the {@code keyHash} form maps the hash through {@link
+     * #bucketIndex} and calls it.
      */
-    public <C> void drain(
-        C context, @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> drainedEntryConsumer) {
-      ConcurrentHashtable.drain(state, context, castConsumer(drainedEntryConsumer));
+    @Nonnull
+    public static Object getWriteLockAt(@Nonnull AtomicReferenceArray<?> buckets, int bucketIndex) {
+        return buckets;
     }
 
-    /** Removes all entries. Lock-free readers mid-walk complete against the entries they hold. */
-    public void clear() {
-      ConcurrentHashtable.clear(state);
+    /** {@link #getWriteLock(State, long)}, for a bucket index that has already been computed. */
+    @Nonnull
+    public static ReentrantLock getWriteLockAt(@Nonnull State<?> state, int bucketIndex) {
+        return state.writeLock;
     }
 
-    public void forEach(@Strategy @Nonnull Consumer<? super TEntry> consumer) {
-      ConcurrentHashtable.forEach(state, castConsumer(consumer));
+    /**
+     * Returns the opaque monitor guarding operations that span all buckets. Whole-table helpers such
+     * as {@link #drain}, {@link #clear}, and {@link #removeIf} acquire this monitor internally.
+     */
+    @Nonnull
+    public static Object getTableWriteLock(@Nonnull AtomicReferenceArray<?> buckets) {
+        return buckets;
     }
 
     /**
-     * Context-passing forEach. Avoids a capturing-lambda allocation — pass a non-capturing {@link
-     * BiConsumer} (typically a {@code static final}) plus whatever side-band state it needs.
+     * Returns the {@link State}'s {@link ReentrantLock}, guarding operations that span all buckets.
+     * Unlike {@link #getTableWriteLock(AtomicReferenceArray)}'s opaque {@code synchronized} monitor,
+     * this lock can be acquired in one call and released in a later one -- see {@link Reservation}.
      */
-    public <C> void forEach(
-        C context, @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> consumer) {
-      ConcurrentHashtable.forEach(state, context, castConsumer(consumer));
+    @Nonnull
+    public static ReentrantLock getTableWriteLock(@Nonnull State<?> state) {
+        return state.writeLock;
+    }
+
+    public static int bucketIndex(@Nonnull AtomicReferenceArray<?> buckets, long keyHash) {
+        // Bucket lengths are powers of two, so masking replaces a more expensive modulo operation.
+        return (int) (keyHash & (buckets.length() - 1));
     }
-  }
-
-  /**
-   * Tracks a capped table's occupancy and eviction position.
-   *
-   * <p>The count includes live entries and outstanding reservations. Its {@link AtomicInteger}
-   * provides volatile visibility and atomic updates, allowing size queries and {@link
-   * #tryReserve()} without the table lock. The plain {@code evictionCursor} is instead protected by
-   * the table write lock; methods annotated with {@link GuardedBy} require that lock.
-   */
-  @ThreadSafe
-  public static final class SizeManager {
-    private final AtomicInteger size = new AtomicInteger();
-    private final int capacity;
 
     /**
-     * Bucket index the last eviction removed from. The next scan resumes here, so a sustained
-     * eviction stream doesn't repeatedly re-walk the same hot entries clustered near bucket 0.
+     * Returns the head entry of the bucket that {@code keyHash} maps to. The bucket read is a
+     * volatile read of the slot, so it is safe from any thread without a lock.
+     *
+     * <p>Named distinctly from {@link #bucketAt} (rather than overloaded on {@code long} vs. {@code
+     * int}) deliberately: a caller with a primitive {@code int}-typed key hash that called an
+     * overloaded {@code bucket(buckets, intHash)} would silently bind to the {@code int}-index
+     * overload instead of widening to this one, reading the raw hash as an array index — out-of-range
+     * hashes throw {@link IndexOutOfBoundsException}, in-range-but-wrong ones silently read the wrong
+     * bucket.
      */
-    @GuardedBy("the corresponding State's getTableWriteLock(state)")
-    private int evictionCursor;
-
-    public SizeManager(int capacity) {
-      this.capacity = capacity;
+    @Nullable
+    public static <TEntry extends Entry<TEntry>> TEntry bucketFor(
+            @Nonnull AtomicReferenceArray<TEntry> buckets, long keyHash) {
+        return buckets.get(bucketIndex(buckets, keyHash));
     }
 
-    /** Live entries. Safe to call without the write lock. */
-    public int estimateSize() {
-      return size.get();
+    /** {@link #bucketFor(AtomicReferenceArray, long)} over a {@link State}. */
+    @Nullable
+    public static <TEntry extends Entry<TEntry>> TEntry bucketFor(@Nonnull State<TEntry> state, long keyHash) {
+        return bucketFor(state.buckets, keyHash);
     }
 
-    public int capacity() {
-      return capacity;
+    /**
+     * Returns the head entry of the bucket at {@code index}. Use when the bucket index is already
+     * computed (e.g. inside {@code getOrCreate} where the same index is reused across the lock
+     * boundary). See {@link #bucketFor} for why this is a distinct name rather than an {@code int}
+     * overload of it.
+     */
+    @Nullable
+    public static <TEntry extends Entry<TEntry>> TEntry bucketAt(
+            @Nonnull AtomicReferenceArray<TEntry> buckets, int index) {
+        return buckets.get(index);
     }
 
-    /** {@code true} once {@link #estimateSize()} has reached {@link #capacity()}. */
-    public boolean isFull() {
-      return size.get() >= capacity;
+    /** {@link #bucketAt(AtomicReferenceArray, int)} over a {@link State}. */
+    @Nullable
+    public static <TEntry extends Entry<TEntry>> TEntry bucketAt(@Nonnull State<TEntry> state, int index) {
+        return bucketAt(state.buckets, index);
     }
 
     /**
-     * Atomically reserves one slot without taking the table write lock. It claims first with {@link
-     * AtomicInteger#incrementAndGet()} and refunds values above capacity, so concurrent callers
-     * cannot both acquire the last slot. Returns {@code false} with the count unchanged when the
-     * table is full.
+     * Returns a lock-free iterator over the candidates for {@code keyHash}: entries in the bucket
+     * chain that {@code keyHash} maps to (starting from {@link #bucketFor(AtomicReferenceArray,
+     * long)}) whose own {@link Entry#keyHash} equals it, skipping any other entry sharing the same
+     * bucket via hash collision on {@link #bucketIndex}. Callers only need a {@code matches} check
+     * against the entries this yields, not a {@code keyHash} check of their own.
      *
-     * <p>Every successful claim must be filled or released with {@link #decrement()}. Prefer {@link
-     * ConcurrentHashtable#tryReserve(State, long)}, whose {@link Reservation#close()} gives back an
-     * unused claim automatically.
+     * <p>Each step follows {@link Entry#next()}, so the iterator reflects entries linked at the time
+     * each step runs rather than a point-in-time snapshot -- entries inserted ahead of the iterator's
+     * current position after iteration starts may or may not be observed, and a concurrently removed
+     * entry remains reachable because {@code unlink()} deliberately retains its {@code next} link for
+     * in-flight readers.
      */
-    public boolean tryReserve() {
-      if (size.incrementAndGet() > capacity) {
-        size.decrementAndGet();
-        return false;
-      }
-      return true;
+    @Nonnull
+    public static <TEntry extends Entry<TEntry>> Iterator<TEntry> hashIterator(
+            @Nonnull AtomicReferenceArray<TEntry> buckets, long keyHash) {
+        return new Iterator<TEntry>() {
+            private TEntry next = advance(bucketFor(buckets, keyHash));
+
+            private TEntry advance(TEntry candidate) {
+                while (candidate != null && candidate.keyHash != keyHash) {
+                    candidate = candidate.next();
+                }
+                return candidate;
+            }
+
+            @Override
+            public boolean hasNext() {
+                return next != null;
+            }
+
+            @Override
+            public TEntry next() {
+                TEntry current = next;
+                if (current == null) {
+                    throw new NoSuchElementException();
+                }
+                next = advance(current.next());
+                return current;
+            }
+        };
+    }
+
+    /** {@link #hashIterator(AtomicReferenceArray, long)} over a {@link State}. */
+    @Nonnull
+    public static <TEntry extends Entry<TEntry>> Iterator<TEntry> hashIterator(
+            @Nonnull State<TEntry> state, long keyHash) {
+        return hashIterator(state.buckets, keyHash);
     }
 
     /**
-     * Reserves one slot, evicting an entry matching {@code evictable} when the table is full.
-     * Returns {@code false} without changing the table when no entry can be evicted.
-     *
-     * <p>The reservation survives concurrent drain and clear operations. The caller must fill it;
-     * an abandoned reservation permanently consumes capacity.
+     * {@link Iterable} wrapper around {@link #hashIterator(AtomicReferenceArray, long)}, for callers
+     * that want a plain for-each loop over the candidates for {@code keyHash} rather than driving the
+     * {@link Iterator} by hand.
      */
-    @GuardedBy("the corresponding State's getTableWriteLock(state)")
-    public <TEntry extends Entry<TEntry>> boolean tryReserveOrEvict(
-        @Nonnull AtomicReferenceArray<TEntry> buckets,
-        @Strategy @Nonnull Predicate<? super TEntry> evictable) {
-      if (tryReserve()) {
-        return true;
-      }
-      if (evictOne(buckets, evictable) == null) {
-        return false;
-      }
-      // evictOne already decremented; the slot it freed is ours.
-      size.incrementAndGet();
-      return true;
+    @Nonnull
+    public static <TEntry extends Entry<TEntry>> Iterable<TEntry> hashIterable(
+            @Nonnull AtomicReferenceArray<TEntry> buckets, long keyHash) {
+        return () -> hashIterator(buckets, keyHash);
     }
 
-    /** Call after successfully linking a new entry. */
-    public void increment() {
-      size.incrementAndGet();
+    /** {@link #hashIterable(AtomicReferenceArray, long)} over a {@link State}. */
+    @Nonnull
+    public static <TEntry extends Entry<TEntry>> Iterable<TEntry> hashIterable(
+            @Nonnull State<TEntry> state, long keyHash) {
+        return hashIterable(state.buckets, keyHash);
     }
 
-    /** Call after successfully unlinking an entry. */
-    public void decrement() {
-      size.decrementAndGet();
+    /**
+     * Publishes {@code entry} as the head of bucket {@code index}. The helper writes the entry's
+     * {@code next} link before the volatile {@link AtomicReferenceArray#set}; a volatile bucket read
+     * that observes the new head also sees the initialized entry and its link. The caller must hold
+     * {@link #getWriteLockAt}; this method does not acquire a lock or update size accounting.
+     *
+     * <p>The entry must be unlinked and must not be reused after removal. Removal intentionally
+     * retains its {@code next} link for readers already traversing that chain.
+     */
+    @GuardedBy("getWriteLockAt(buckets, index)")
+    public static <TEntry extends Entry<TEntry>> void insertHeadEntryAt(
+            @Nonnull AtomicReferenceArray<TEntry> buckets, int index, @Nonnull TEntry entry) {
+        assert Thread.holdsLock(getWriteLockAt(buckets, index))
+                : "insertHeadEntryAt called without holding getWriteLockAt(buckets, index)";
+        insertHeadEntryAtUnchecked(buckets, index, entry);
+    }
+
+    /** {@link #insertHeadEntryAt(AtomicReferenceArray, int, Entry)} over a {@link State}. */
+    @GuardedBy("getWriteLockAt(state, index)")
+    public static <TEntry extends Entry<TEntry>> void insertHeadEntryAt(
+            @Nonnull State<TEntry> state, int index, @Nonnull TEntry entry) {
+        assert getWriteLockAt(state, index).isHeldByCurrentThread()
+                : "insertHeadEntryAt called without holding getWriteLockAt(state, index)";
+        insertHeadEntryAtUnchecked(state.buckets, index, entry);
+    }
+
+    /** Splicing logic shared by both {@link #insertHeadEntryAt} overloads, without their assert. */
+    private static <TEntry extends Entry<TEntry>> void insertHeadEntryAtUnchecked(
+            @Nonnull AtomicReferenceArray<TEntry> buckets, int index, @Nonnull TEntry entry) {
+        assert entry.next() == null
+                : "Entry already linked -- inserting the same Entry instance twice corrupts the chain"
+                        + " (unlink() deliberately leaves a removed entry's next intact for in-flight"
+                        + " readers, so a removed entry must never be reinserted)";
+        entry.setNext(buckets.get(index));
+        buckets.set(index, entry);
     }
 
     /**
-     * Releases {@code removed} slots after a sweep and resets the {@code evictionCursor}.
-     * Outstanding reservations remain counted.
+     * Convenience form of {@link #insertHeadEntryAt} that derives the bucket index from {@code
+     * keyHash}. Prefer {@link #insertHeadEntryAt} when the index is already computed (e.g. a {@code
+     * getOrCreate} that reuses it across the lock-free pre-check).
      */
-    @GuardedBy("the corresponding State's getTableWriteLock(state)")
-    @SuppressFBWarnings(
-        value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
-        justification =
-            "evictionCursor is read and written only while the corresponding State's write lock is"
-                + " held; SpotBugs cannot model that dynamic guard")
-    public void release(int removed) {
-      if (removed != 0) {
-        size.addAndGet(-removed);
-      }
-      evictionCursor = 0;
+    @GuardedBy("getWriteLock(buckets, keyHash)")
+    public static <TEntry extends Entry<TEntry>> void insertHeadEntryFor(
+            @Nonnull AtomicReferenceArray<TEntry> buckets, long keyHash, @Nonnull TEntry entry) {
+        insertHeadEntryAt(buckets, bucketIndex(buckets, keyHash), entry);
     }
 
     /**
-     * Removes and returns the first entry matching {@code evictable}, scanning from the previous
-     * eviction position and wrapping once. Returns {@code null} without changing the count when no
-     * entry matches.
+     * Links an already-built entry after a successful {@link #tryReserveOrEvict} or {@link
+     * SizeManager#tryReserve()} call. This method does not acquire a lock or update the count.
      *
-     * <p>This operation may inspect every live entry while holding the table write lock, so the
-     * predicate should be quick.
+     * <p>Complete all fallible work before reserving. There is no cancellation operation, so an
+     * abandoned reservation permanently consumes capacity. Drain and clear do not cancel outstanding
+     * reservations.
      */
-    @GuardedBy("the corresponding State's getTableWriteLock(state)")
-    @Nullable
-    public <TEntry extends Entry<TEntry>> TEntry evictOne(
-        @Nonnull AtomicReferenceArray<TEntry> buckets,
-        @Strategy @Nonnull Predicate<? super TEntry> evictable) {
-      TEntry evicted = evictOneInRange(buckets, evictable, evictionCursor, buckets.length());
-      if (evicted == null && evictionCursor != 0) {
-        evicted = evictOneInRange(buckets, evictable, 0, evictionCursor);
-      }
-      if (evicted != null) {
-        size.decrementAndGet();
-        return evicted;
-      }
-      // Nothing matched anywhere; step the evictionCursor on regardless so repeated refusals don't
-      // all
-      // restart the (wasted) scan from the same bucket.
-      evictionCursor = bucketIndex(buckets, evictionCursor + 1);
-      return null;
-    }
-
-    @GuardedBy("the corresponding State's getTableWriteLock(state)")
-    @SuppressFBWarnings(
-        value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
-        justification =
-            "evictionCursor is read and written only while the corresponding State's write lock is"
-                + " held; SpotBugs cannot model that dynamic guard")
-    @StrategyConsumer
-    @Nullable
-    private <TEntry extends Entry<TEntry>> TEntry evictOneInRange(
-        @Nonnull AtomicReferenceArray<TEntry> buckets,
-        @Strategy @Nonnull Predicate<? super TEntry> evictable,
-        int startBucket,
-        int endBucket) {
-      for (int i = startBucket; i < endBucket; i++) {
-        TEntry prev = null;
-        for (TEntry e = buckets.get(i); e != null; e = e.next()) {
-          if (evictable.test(e)) {
-            unlinkUnchecked(buckets, i, prev, e);
-            evictionCursor = i;
-            return e;
-          }
-          prev = e;
-        }
-      }
-      return null;
+    @GuardedBy("getTableWriteLock(state)")
+    public static <TEntry extends Entry<TEntry>> void insertReserved(
+            @Nonnull State<TEntry> state, long keyHash, @Nonnull TEntry entry) {
+        assert getTableWriteLock(state).isHeldByCurrentThread()
+                : "insertReserved called without holding getTableWriteLock(state)";
+        insertHeadEntryAtUnchecked(state.buckets, bucketIndex(state.buckets, keyHash), entry);
     }
 
     /**
-     * Unlinks every entry matching {@code evictable} in one full pass, decrementing the count for
-     * each, and returns how many were removed. Resets the scan position, since a full pass leaves
-     * nothing later to resume from.
+     * Splices {@code entry} out of the chain at {@code index}. {@code prev} is the in-chain
+     * predecessor, or {@code null} when {@code entry} is the bucket head. Re-points the predecessor
+     * (or the bucket head slot) past {@code entry} via a volatile write so lock-free readers see the
+     * removal. {@code entry}'s own {@code next} is deliberately left intact so a reader already
+     * positioned on it can still traverse forward. This is a single-slot primitive: it does not lock,
+     * so call it inside the caller's {@code synchronized (getWriteLockAt(buckets, index))} block.
+     * Does not touch size accounting.
      */
-    @GuardedBy("the corresponding State's getTableWriteLock(state)")
-    @SuppressFBWarnings(
-        value = "AT_STALE_THREAD_WRITE_OF_PRIMITIVE",
-        justification =
-            "evictionCursor is read and written only while the corresponding State's write lock is"
-                + " held; SpotBugs cannot model that dynamic guard")
-    @StrategyConsumer
-    public <TEntry extends Entry<TEntry>> int evictAll(
-        @Nonnull AtomicReferenceArray<TEntry> buckets,
-        @Strategy @Nonnull Predicate<? super TEntry> evictable) {
-      int count = 0;
-      for (int i = 0; i < buckets.length(); i++) {
-        TEntry prev = null;
-        for (TEntry e = buckets.get(i); e != null; e = e.next()) {
-          if (evictable.test(e)) {
-            unlinkUnchecked(buckets, i, prev, e);
-            size.decrementAndGet();
-            count++;
-          } else {
-            prev = e;
-          }
-        }
-      }
-      evictionCursor = 0;
-      return count;
+    @GuardedBy("getWriteLockAt(buckets, index)")
+    public static <TEntry extends Entry<TEntry>> void unlink(
+            @Nonnull AtomicReferenceArray<TEntry> buckets, int index, @Nullable TEntry prev, @Nonnull TEntry entry) {
+        assert Thread.holdsLock(getWriteLockAt(buckets, index))
+                : "unlink called without holding getWriteLockAt(buckets, index)";
+        unlinkUnchecked(buckets, index, prev, entry);
+    }
+
+    /** {@link #unlink(AtomicReferenceArray, int, Entry, Entry)} over a {@link State}. */
+    @GuardedBy("getWriteLockAt(state, index)")
+    public static <TEntry extends Entry<TEntry>> void unlink(
+            @Nonnull State<TEntry> state, int index, @Nullable TEntry prev, @Nonnull TEntry entry) {
+        assert getWriteLockAt(state, index).isHeldByCurrentThread()
+                : "unlink called without holding getWriteLockAt(state, index)";
+        unlinkUnchecked(state.buckets, index, prev, entry);
+    }
+
+    /** Splicing logic shared by both {@link #unlink} overloads, without their assert. */
+    private static <TEntry extends Entry<TEntry>> void unlinkUnchecked(
+            @Nonnull AtomicReferenceArray<TEntry> buckets, int index, @Nullable TEntry prev, @Nonnull TEntry entry) {
+        TEntry next = entry.next();
+        if (prev == null) {
+            buckets.set(index, next);
+        } else {
+            prev.setNext(next);
+        }
     }
-  }
-
-  /**
-   * Bucket array and occupancy manager for a caller-defined capped table. Keep them paired and
-   * prefer the {@code State}-accepting helpers so structural changes update the count consistently.
-   *
-   * <p>{@code sizeManager} is intentionally package-private: callers outside this class must go
-   * through the {@code State}-accepting static helpers ({@link #estimateSize}, {@link #isFull},
-   * {@link #tryReserve}, {@link #tryReserveOrEvict}, {@link #evictOne}, {@link #evictAll}) rather
-   * than reach into the manager directly.
-   */
-  public static final class State<TEntry extends Entry<TEntry>> {
-    public final AtomicReferenceArray<TEntry> buckets;
-    final SizeManager sizeManager;
 
     /**
-     * The table's write lock. Unlike the bare-array helpers' opaque {@code synchronized} monitor,
-     * this is a real {@link ReentrantLock}. A {@link Reservation} can acquire it in {@link
-     * ConcurrentHashtable#tryReserve(State, long)} and release it later in {@link
-     * Reservation#close()}, unlike a lexically scoped {@code synchronized} block.
+     * Removes every entry matching {@code predicate} from {@code buckets}, decrementing {@code size}
+     * once per removal. Self-locking: synchronizes on {@code buckets} for the whole sweep, so the
+     * predicate sees a stable table and concurrent writers are excluded; lock-free readers continue
+     * throughout.
      */
-    final ReentrantLock writeLock = new ReentrantLock();
-
-    private State(AtomicReferenceArray<TEntry> buckets, int maxCapacity) {
-      this.buckets = buckets;
-      this.sizeManager = new SizeManager(maxCapacity);
-    }
-  }
-
-  /**
-   * Creates a bucket array for {@code maxCapacity} entries and pairs it with a manager enforcing
-   * that cap. {@code entryClass} is used only to infer {@code TEntry}.
-   */
-  @Nonnull
-  public static <TEntry extends Entry<TEntry>> State<TEntry> createBounded(
-      @Nonnull Class<TEntry> entryClass, int maxCapacity) {
-    return new State<>(createFixedBuckets(entryClass, maxCapacity), maxCapacity);
-  }
-
-  /** Live entries in {@code state}; see {@link SizeManager#estimateSize()}. Lock-free. */
-  public static int estimateSize(@Nonnull State<?> state) {
-    return state.sizeManager.estimateSize();
-  }
-
-  /**
-   * {@code true} once {@code state} is at capacity; see {@link SizeManager#isFull()}. Lock-free.
-   */
-  public static boolean isFull(@Nonnull State<?> state) {
-    return state.sizeManager.isFull();
-  }
-
-  /**
-   * Claims one slot in {@code state} for {@code keyHash} and returns a handle for completing the
-   * find-or-insert protocol, or an empty handle if the table is full. Never returns {@code null},
-   * so this always composes with try-with-resources:
-   *
-   * <pre>{@code
-   * try (Reservation<TEntry> r = ConcurrentHashtable.tryReserve(state, keyHash)) {
-   *   return r.tryGetOrInsertOrNull(component1, component2, component3, TEntry::new);
-   * }
-   * }</pre>
-   *
-   * <p>Run a lock-free scan first (see {@link #bucketFor}/{@link #bucketAt}) and only call this
-   * once that scan has missed — a successful reservation isn't required for correctness (the
-   * reservation itself, and the locked comparison inside {@link Reservation#tryGetOrInsertOrNull},
-   * are the source of truth), it just avoids paying for a lock and a factory call when a hit was
-   * already visible lock-free.
-   *
-   * <p>Checks {@link SizeManager#isFull()} lock-free first. If the table looks full, {@code
-   * keyHash}'s bucket is checked too: if it's empty, nothing could possibly match this key --
-   * <em>unless</em> a concurrent reservation for this exact key is in flight, having already
-   * claimed the table's last slot (so {@code isFull()} is genuinely {@code true}) without yet
-   * linking its entry (so the bucket still looks empty). That window is confirmed away under the
-   * write lock before this returns a definitively empty reservation without ever taking it --
-   * otherwise the concurrent duplicate landing in that exact window would be dropped instead of
-   * counted. Once the lock is held (either because the fast peek above couldn't rule out a match,
-   * or because the locked recheck couldn't either), this reserves the slot -- returning a real
-   * reservation that <em>holds the lock open</em> across this call, to be released later by {@link
-   * Reservation#close()} -- or, if the table is genuinely still full, keeps the lock open anyway
-   * (rather than releasing it immediately) so {@link Reservation#finish} can still scan {@code
-   * keyHash}'s bucket the next time the caller supplies a candidate entry. That's what closes the
-   * race where a concurrent insert for the same logical duplicate lands in the exact window between
-   * this caller's own lock-free scan and its reservation attempt: without the lock held open here,
-   * that concurrent duplicate would go uncounted. Holding the lock for the reservation's whole
-   * lifetime (rather than just across this call, the way {@link SizeManager#tryReserve()} does) is
-   * also what lets {@link Reservation#tryGetOrInsertOrNull} skip a second, separately-locked
-   * comparison pass: the reserve-then-insert-or-discard sequence is one uninterrupted critical
-   * section, so no concurrent reservation for the same logical duplicate can slip in between.
-   *
-   * <p>Always returns a non-null handle — even when the table is full — so the caller must check
-   * {@link Reservation#isReserved()} (or simply call {@link Reservation#tryGetOrInsertOrNull},
-   * which returns {@code null} on an absent reservation) rather than assume every reservation is
-   * real. A reservation can also report {@link Reservation#isReserved()} {@code true} while still
-   * having no slot to insert into (the lock-held-but-full case above); either way, {@code
-   * tryGetOrInsertOrNull}/{@code tryGetOrInsert} return the concurrent match found under the lock,
-   * or {@code null} -- never a newly linked entry when no slot was claimed.
-   *
-   * @param keyHash hash of the key the caller is about to look up or insert
-   */
-  @Nonnull
-  @SuppressFBWarnings(
-      value = "UL_UNRELEASED_LOCK",
-      justification =
-          "Every path either unlocks before returning (the confirmed-empty case) or hands the"
-              + " held lock off to the returned Reservation, released later by Reservation#close;"
-              + " SpotBugs can't correlate that transfer across the two lock() call sites here.")
-  public static <TEntry extends Entry<TEntry>> Reservation<TEntry> tryReserve(
-      @Nonnull State<TEntry> state, long keyHash) {
-    int index = bucketIndex(state.buckets, keyHash);
-    ReentrantLock lock = state.writeLock;
-    if (state.sizeManager.isFull() && bucketAt(state, index) == null) {
-      lock.lock();
-      // The lock-free peek above can be stale: a concurrent reservation for this exact key may
-      // have already claimed the table's last slot (isFull() true) without yet linking its entry
-      // (bucket still looks empty). Recheck under the lock before trusting it, or that concurrent
-      // duplicate would be dropped instead of counted.
-      if (state.sizeManager.isFull() && bucketAt(state, index) == null) {
-        lock.unlock();
-        return new Reservation<>(null, false);
-      }
-      if (state.sizeManager.tryReserve()) {
-        return new Reservation<>(state, true);
-      }
-      return new Reservation<>(state, false);
-    }
-    lock.lock();
-    if (state.sizeManager.tryReserve()) {
-      return new Reservation<>(state, true);
-    }
-    return new Reservation<>(state, false);
-  }
-
-  /**
-   * Handle returned by {@link #tryReserve}, gating {@link #tryGetOrInsertOrNull} behind a claimed
-   * slot and auto-cancelling it on {@link #close} if it's never consumed. A single {@code
-   * Reservation} must be used for at most one {@code tryGetOrInsertOrNull}/{@code tryGetOrInsert}
-   * call -- a second call throws {@link IllegalStateException} rather than silently linking a
-   * second entry while the size counter only reflects the first.
-   *
-   * <p>Overloaded up to 4 key components ({@link #tryGetOrInsertOrNull(Object, Function)} through
-   * {@link #tryGetOrInsertOrNull(Object, Object, Object, Object, Function4)}) so a non-capturing
-   * method reference can build the entry directly from its natural constructor arguments, without
-   * an intermediate holder object or a capturing lambda.
-   *
-   * <p>A non-empty reservation holds the table's write lock until {@link #close()}, even after
-   * insertion or a matching entry is returned. Keep its lifetime short: other writers using this
-   * lock must wait until the reservation is closed.
-   *
-   * <p>Create, use, and close the reservation on the same thread: its {@link ReentrantLock} must be
-   * released by the thread that acquired it.
-   *
-   * @param <TEntry> the table's entry type, itself self-bound (see {@link
-   *     ConcurrentHashtable.Entry})
-   */
-  @NotThreadSafe
-  public static final class Reservation<TEntry extends Entry<TEntry>> implements AutoCloseable {
-    @Nullable private final State<TEntry> state;
-    private final boolean slotClaimed;
-    private boolean completed;
-    private boolean consumed;
-
-    private Reservation(@Nullable State<TEntry> state, boolean slotClaimed) {
-      this.state = state;
-      this.slotClaimed = slotClaimed;
+    @StrategyConsumer
+    public static <TEntry extends Entry<TEntry>> boolean removeIf(
+            @Nonnull AtomicReferenceArray<TEntry> buckets,
+            @Nonnull AtomicInteger size,
+            @Strategy @Nonnull Predicate<? super TEntry> predicate) {
+        synchronized (getTableWriteLock(buckets)) {
+            boolean removed = false;
+            for (int i = 0; i < buckets.length(); i++) {
+                TEntry prev = null;
+                for (TEntry e = buckets.get(i); e != null; e = e.next()) {
+                    if (predicate.test(e)) {
+                        unlink(buckets, i, prev, e);
+                        size.decrementAndGet();
+                        removed = true;
+                        // prev stays put: e is now unlinked, so the last survivor remains the predecessor.
+                    } else {
+                        prev = e;
+                    }
+                }
+            }
+            return removed;
+        }
     }
 
     /**
-     * {@code true} unless this reservation is definitively empty -- i.e. {@link #tryReserve} could
-     * rule out a match for the target key without even taking the write lock. A {@code true}
-     * reservation may still have no slot to insert into: {@link #tryReserve} keeps the lock open on
-     * a full table when the target bucket is populated, purely so {@link #finish} can still scan it
-     * for a concurrent match. Callers should call {@code tryGetOrInsertOrNull}/{@code
-     * tryGetOrInsert} and check its result rather than assume {@code true} means a slot was
-     * claimed.
+     * {@link #removeIf(AtomicReferenceArray, AtomicInteger, Predicate)} variant for callers tracking
+     * occupancy with a {@link State} instead of a bare counter — used by {@link D1#removeIf} and
+     * {@link D2#removeIf}.
      */
-    public boolean isReserved() {
-      return state != null;
+    @StrategyConsumer
+    public static <TEntry extends Entry<TEntry>> boolean removeIf(
+            @Nonnull State<TEntry> state, @Strategy @Nonnull Predicate<? super TEntry> predicate) {
+        // TODO: no caller contends on this lock today; if one does, consider the same per-bucket
+        // locking drain() uses, trading the "predicate sees a stable table" guarantee for throughput.
+        AtomicReferenceArray<TEntry> buckets = state.buckets;
+        ReentrantLock lock = getTableWriteLock(state);
+        lock.lock();
+        try {
+            boolean removed = false;
+            for (int i = 0; i < buckets.length(); i++) {
+                TEntry prev = null;
+                for (TEntry e = buckets.get(i); e != null; e = e.next()) {
+                    if (predicate.test(e)) {
+                        unlink(state, i, prev, e);
+                        state.sizeManager.decrement();
+                        removed = true;
+                    } else {
+                        prev = e;
+                    }
+                }
+            }
+            return removed;
+        } finally {
+            lock.unlock();
+        }
     }
 
     /**
-     * Escape hatch for a caller that already built {@code newEntry} itself -- e.g. more than 4 key
-     * components, or components the caller wants to keep as primitives rather than boxing them into
-     * a {@code Function}'s type argument:
+     * Removes all entries from {@code buckets} and invokes {@code drainedEntryConsumer} for each one.
      *
-     * <pre>{@code
-     * try (Reservation<TEntry> r = ConcurrentHashtable.tryReserve(state, keyHash)) {
-     *   if (!r.isReserved()) {
-     *     return null;
-     *   }
-     *   return r.tryGetOrInsertOrNull(new TEntry(longComponent1, longComponent2));
-     * }
-     * }</pre>
+     * <p>The drain holds the table write lock while detaching buckets and invoking the consumer. For
+     * each removed entry, the consumer is invoked synchronously after its bucket is detached. A
+     * lock-free reader already traversing the detached chain can continue through its retained links.
      *
-     * See {@link #tryGetOrInsertOrNull(Object, Object, BiFunction)} for the general contract.
+     * <p>This overload does not update size accounting. The consumer should be quick and must not
+     * throw; failures are not rolled back.
+     *
+     * @param <TEntry> entry type
+     * @param buckets bucket array to drain
+     * @param drainedEntryConsumer action invoked for each entry after its bucket is detached
      */
-    @Nullable
-    public TEntry tryGetOrInsertOrNull(@Nonnull TEntry newEntry) {
-      return state == null ? null : finish(newEntry);
+    public static <TEntry extends Entry<TEntry>> void drain(
+            @Nonnull AtomicReferenceArray<TEntry> buckets,
+            @Strategy @Nonnull Consumer<? super TEntry> drainedEntryConsumer) {
+        drainCounting(buckets, drainedEntryConsumer);
     }
 
     /**
-     * One key component; see {@link #tryGetOrInsertOrNull(Object, Object, BiFunction)} for the
-     * general contract.
+     * {@link #drain(AtomicReferenceArray, Consumer)} returning the number of entries passed to {@code
+     * drainedEntryConsumer} for size accounting.
      */
     @StrategyConsumer
-    @Nullable
-    public <A> TEntry tryGetOrInsertOrNull(
-        A a, @Strategy @Nonnull Function<? super A, ? extends TEntry> factory) {
-      return state == null ? null : finish(factory.apply(a));
+    private static <TEntry extends Entry<TEntry>> int drainCounting(
+            @Nonnull AtomicReferenceArray<TEntry> buckets,
+            @Strategy @Nonnull Consumer<? super TEntry> drainedEntryConsumer) {
+        int removed = 0;
+        synchronized (getTableWriteLock(buckets)) {
+            for (int i = 0; i < buckets.length(); i++) {
+                TEntry head = buckets.get(i);
+                if (head == null) {
+                    continue;
+                }
+                buckets.set(i, null);
+                for (TEntry e = head; e != null; e = e.next()) {
+                    removed++;
+                    drainedEntryConsumer.accept(e);
+                }
+            }
+        }
+        return removed;
     }
 
     /**
-     * Two key components. Builds {@code factory.apply(...)} (skipped entirely if this reservation
-     * is definitively empty — see {@link #isReserved()}) and either links the result as a new entry
-     * or discards it in favor of an existing match found under the write lock. Returns {@code null}
-     * when there is neither a slot to claim nor a match to return -- either because this
-     * reservation is definitively empty, or (see {@link #tryReserve}) because the table was still
-     * full even under the lock and no concurrent match was found either; otherwise always returns a
-     * real entry (the newly built one, or the concurrent match).
+     * Removes all entries from {@code buckets} and invokes {@code drainedEntryConsumer} with {@code
+     * context} and each removed entry.
      *
-     * <p>The factory runs while the reservation holds the write lock. Its result is required for
-     * the entry-to-entry comparison, including when the table is full and no slot was claimed.
-     */
-    @StrategyConsumer
-    @Nullable
-    public <A, B> TEntry tryGetOrInsertOrNull(
-        A a, B b, @Strategy @Nonnull BiFunction<? super A, ? super B, ? extends TEntry> factory) {
-      return state == null ? null : finish(factory.apply(a, b));
-    }
-
-    /**
-     * Three key components; see {@link #tryGetOrInsertOrNull(Object, Object, BiFunction)} for the
-     * general contract.
+     * <p>The drain holds the table write lock while detaching buckets and invoking the consumer. For
+     * each removed entry, the consumer is invoked synchronously after its bucket is detached. This
+     * overload does not update size accounting. The consumer should be quick and must not throw;
+     * failures are not rolled back.
+     *
+     * @param <C> context type
+     * @param <TEntry> entry type
+     * @param buckets bucket array to drain
+     * @param context context passed to each invocation of {@code drainedEntryConsumer}
+     * @param drainedEntryConsumer action invoked with the context and each removed entry
      */
-    @StrategyConsumer
-    @Nullable
-    public <A, B, C> TEntry tryGetOrInsertOrNull(
-        A a,
-        B b,
-        C c,
-        @Strategy @Nonnull TriFunction<? super A, ? super B, ? super C, ? extends TEntry> factory) {
-      return state == null ? null : finish(factory.apply(a, b, c));
+    public static <C, TEntry extends Entry<TEntry>> void drain(
+            @Nonnull AtomicReferenceArray<TEntry> buckets,
+            C context,
+            @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> drainedEntryConsumer) {
+        drainCounting(buckets, context, drainedEntryConsumer);
     }
 
-    /** Four key components; see {@link #tryGetOrInsertOrNull(Object, Object, BiFunction)}. */
+    /** {@link #drainCounting(AtomicReferenceArray, Consumer)}, context-passing form. */
     @StrategyConsumer
-    @Nullable
-    public <A, B, C, D> TEntry tryGetOrInsertOrNull(
-        A a,
-        B b,
-        C c,
-        D d,
-        @Strategy @Nonnull
-            Function4<? super A, ? super B, ? super C, ? super D, ? extends TEntry> factory) {
-      return state == null ? null : finish(factory.apply(a, b, c, d));
-    }
-
-    /** {@link Maybe}-wrapping counterpart of {@link #tryGetOrInsertOrNull(Entry)}. */
-    @Nonnull
-    public Maybe<TEntry> tryGetOrInsert(@Nonnull TEntry newEntry) {
-      return Maybe.of(tryGetOrInsertOrNull(newEntry));
+    private static <C, TEntry extends Entry<TEntry>> int drainCounting(
+            @Nonnull AtomicReferenceArray<TEntry> buckets,
+            C context,
+            @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> drainedEntryConsumer) {
+        int removed = 0;
+        synchronized (getTableWriteLock(buckets)) {
+            for (int i = 0; i < buckets.length(); i++) {
+                TEntry head = buckets.get(i);
+                if (head == null) {
+                    continue;
+                }
+                buckets.set(i, null);
+                for (TEntry e = head; e != null; e = e.next()) {
+                    removed++;
+                    drainedEntryConsumer.accept(context, e);
+                }
+            }
+        }
+        return removed;
     }
 
     /**
-     * {@link Maybe}-wrapping counterpart of {@link #tryGetOrInsertOrNull(Object, Function)}, for
-     * callers who'd rather make the "this can fail unlike unbounded collections" outcome visible in
-     * the return type than rely on a {@code null} check — mirrors {@link D1#tryGetOrCreate} /
-     * {@link D2#tryGetOrCreate} wrapping their own {@code ...OrNull} methods.
+     * Removes all entries from {@code state}, invokes {@code drainedEntryConsumer} for each one, and
+     * releases one capacity slot for each removed entry.
+     *
+     * <p>The lock is acquired and released bucket by bucket rather than held for the whole sweep, so
+     * a table-level operation (an insert, a reservation, an eviction) can interleave between buckets
+     * instead of waiting out the entire drain. This means the drain is no longer an atomic snapshot:
+     * an entry inserted into a not-yet-visited bucket while the drain is in progress is swept up too,
+     * and each bucket's capacity slot is released immediately before its consumer invocation runs,
+     * rather than once for the whole sweep at the end. Outstanding reservations remain counted.
+     *
+     * <p>The consumer should be quick and must not throw. If it does, later entries in the detached
+     * bucket remain counted but are no longer reachable from the table. Buckets not yet visited
+     * remain intact, and capacity already released is not restored.
+     *
+     * @param <TEntry> entry type
+     * @param state table state to drain
+     * @param drainedEntryConsumer action invoked for each entry after its bucket is detached
      */
-    @Nonnull
-    public <A> Maybe<TEntry> tryGetOrInsert(
-        A a, @Strategy @Nonnull Function<? super A, ? extends TEntry> factory) {
-      return Maybe.of(tryGetOrInsertOrNull(a, factory));
-    }
-
-    /** Two key components; see {@link #tryGetOrInsert(Object, Function)}. */
-    @Nonnull
-    public <A, B> Maybe<TEntry> tryGetOrInsert(
-        A a, B b, @Strategy @Nonnull BiFunction<? super A, ? super B, ? extends TEntry> factory) {
-      return Maybe.of(tryGetOrInsertOrNull(a, b, factory));
+    public static <TEntry extends Entry<TEntry>> void drain(
+            @Nonnull State<TEntry> state, @Strategy @Nonnull Consumer<? super TEntry> drainedEntryConsumer) {
+        ReentrantLock lock = getTableWriteLock(state);
+        AtomicReferenceArray<TEntry> buckets = state.buckets;
+        for (int i = 0; i < buckets.length(); i++) {
+            lock.lock();
+            try {
+                TEntry head = buckets.get(i);
+                if (head == null) {
+                    continue;
+                }
+                buckets.set(i, null);
+                for (TEntry e = head; e != null; e = e.next()) {
+                    state.sizeManager.decrement();
+                    drainedEntryConsumer.accept(e);
+                }
+            } finally {
+                lock.unlock();
+            }
+        }
+        lock.lock();
+        try {
+            state.sizeManager.release(0); // full sweep: reset the scan position
+        } finally {
+            lock.unlock();
+        }
     }
 
-    /** Three key components; see {@link #tryGetOrInsert(Object, Function)}. */
-    @Nonnull
-    public <A, B, C> Maybe<TEntry> tryGetOrInsert(
-        A a,
-        B b,
-        C c,
-        @Strategy @Nonnull TriFunction<? super A, ? super B, ? super C, ? extends TEntry> factory) {
-      return Maybe.of(tryGetOrInsertOrNull(a, b, c, factory));
+    /**
+     * Removes all entries from {@code state}, invokes {@code drainedEntryConsumer} with {@code
+     * context} and each removed entry, and releases one capacity slot for each removed entry.
+     *
+     * <p>The lock is acquired and released bucket by bucket rather than held for the whole sweep, so
+     * a table-level operation (an insert, a reservation, an eviction) can interleave between buckets
+     * instead of waiting out the entire drain. This means the drain is no longer an atomic snapshot:
+     * an entry inserted into a not-yet-visited bucket while the drain is in progress is swept up too,
+     * and each bucket's capacity slot is released immediately before its consumer invocation runs,
+     * rather than once for the whole sweep at the end. Outstanding reservations remain counted.
+     *
+     * <p>The consumer should be quick and must not throw. If it does, later entries in the detached
+     * bucket remain counted but are no longer reachable from the table. Buckets not yet visited
+     * remain intact, and capacity already released is not restored.
+     *
+     * @param <C> context type
+     * @param <TEntry> entry type
+     * @param state table state to drain
+     * @param context context passed to each invocation of {@code drainedEntryConsumer}
+     * @param drainedEntryConsumer action invoked with the context and each removed entry
+     */
+    public static <C, TEntry extends Entry<TEntry>> void drain(
+            @Nonnull State<TEntry> state,
+            C context,
+            @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> drainedEntryConsumer) {
+        ReentrantLock lock = getTableWriteLock(state);
+        AtomicReferenceArray<TEntry> buckets = state.buckets;
+        for (int i = 0; i < buckets.length(); i++) {
+            lock.lock();
+            try {
+                TEntry head = buckets.get(i);
+                if (head == null) {
+                    continue;
+                }
+                buckets.set(i, null);
+                for (TEntry e = head; e != null; e = e.next()) {
+                    state.sizeManager.decrement();
+                    drainedEntryConsumer.accept(context, e);
+                }
+            } finally {
+                lock.unlock();
+            }
+        }
+        lock.lock();
+        try {
+            state.sizeManager.release(0); // full sweep: reset the scan position
+        } finally {
+            lock.unlock();
+        }
     }
 
-    /** Four key components; see {@link #tryGetOrInsert(Object, Function)}. */
-    @Nonnull
-    public <A, B, C, D> Maybe<TEntry> tryGetOrInsert(
-        A a,
-        B b,
-        C c,
-        D d,
-        @Strategy @Nonnull
-            Function4<? super A, ? super B, ? super C, ? super D, ? extends TEntry> factory) {
-      return Maybe.of(tryGetOrInsertOrNull(a, b, c, d, factory));
+    /** Nulls every bucket head. Self-locking: synchronizes on {@code buckets}. */
+    public static void clear(@Nonnull AtomicReferenceArray<?> buckets) {
+        synchronized (getTableWriteLock(buckets)) {
+            for (int i = 0; i < buckets.length(); i++) {
+                buckets.set(i, null);
+            }
+        }
     }
 
     /**
-     * Runs the locked comparison/link decision. The write lock is already held -- acquired by
-     * {@link #tryReserve} and not yet released -- so this needs no {@code synchronized}/{@code
-     * lock()} of its own.
-     *
-     * <p>Always scans for a match first, whether or not a slot was actually claimed: a {@link
-     * #tryReserve} reservation with no slot still holds the lock specifically so this scan can run.
-     * Only links {@code newEntry} when a slot was claimed; otherwise a miss here means there really
-     * is nothing to return, so this returns {@code null}.
-     *
-     * @throws IllegalStateException if this reservation was already used for a prior {@code
-     *     tryGetOrInsertOrNull}/{@code tryGetOrInsert} call -- reusing one could link a second,
-     *     distinct entry into the table while the size counter only reflects the first.
+     * {@link #clear(AtomicReferenceArray)} returning how many entries it detached, so a {@link State}
+     * form can subtract exactly that rather than zeroing — see {@link SizeManager#release(int)} for
+     * why that distinction matters. Unlike the plain form this walks the chains, making it O(entries)
+     * rather than O(buckets); clear is a rare, whole-table operation, so the walk is affordable and
+     * keeping the count honest is worth more than the constant.
      */
-    @Nullable
-    private TEntry finish(@Nonnull TEntry newEntry) {
-      if (completed) {
-        throw new IllegalStateException(
-            "Reservation already used for tryGetOrInsertOrNull/tryGetOrInsert");
-      }
-      completed = true;
-      int index = bucketIndex(state.buckets, newEntry.keyHash);
-      for (TEntry curEntry = bucketAt(state, index); curEntry != null; curEntry = curEntry.next()) {
-        if (curEntry.keyHash == newEntry.keyHash && curEntry.matches(newEntry)) {
-          return curEntry;
-        }
-      }
-      if (!slotClaimed) {
-        return null;
-      }
-      insertHeadEntryAt(state, index, newEntry);
-      consumed = true;
-      return newEntry;
+    private static int clearCounting(@Nonnull AtomicReferenceArray<? extends Entry<?>> buckets) {
+        int removed = 0;
+        synchronized (getTableWriteLock(buckets)) {
+            for (int i = 0; i < buckets.length(); i++) {
+                Entry<?> head = buckets.get(i);
+                if (head == null) {
+                    continue;
+                }
+                buckets.set(i, null);
+                for (Entry<?> e = head; e != null; e = e.next()) {
+                    removed++;
+                }
+            }
+        }
+        return removed;
     }
 
     /**
-     * Releases the write lock {@link #tryReserve} acquired, giving back a claimed slot first if it
-     * was never consumed. A no-op on a definitively empty reservation, which never acquired the
-     * lock.
+     * {@link #clear(AtomicReferenceArray)} over a {@link State}: also resets its {@link SizeManager}.
      */
-    @Override
-    public void close() {
-      if (state == null) {
-        return;
-      }
-      try {
-        if (slotClaimed && !consumed) {
-          state.sizeManager.decrement();
-        }
-      } finally {
-        state.writeLock.unlock();
-      }
-    }
-  }
-
-  /** Four-argument analogue of {@link java.util.function.BiFunction}. */
-  @Strategy
-  @FunctionalInterface
-  public interface Function4<A, B, C, D, R> {
-    R apply(A a, B b, C c, D d);
-  }
-
-  /**
-   * Reserves one slot in {@code state}, evicting an entry matching {@code evictable} when
-   * necessary. Returns {@code false} if the table is full and nothing can be evicted. This method
-   * acquires the table write lock.
-   *
-   * <p>The reservation survives drain and clear operations. Complete it with {@link
-   * #insertReserved}; abandoning it permanently consumes capacity.
-   */
-  public static <TEntry extends Entry<TEntry>> boolean tryReserveOrEvict(
-      @Nonnull State<TEntry> state, @Strategy @Nonnull Predicate<? super TEntry> evictable) {
-    ReentrantLock lock = getTableWriteLock(state);
-    lock.lock();
-    try {
-      return state.sizeManager.tryReserveOrEvict(state.buckets, evictable);
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  /**
-   * Unlinks the first entry in {@code state} matching {@code evictable}, resuming from where the
-   * last eviction looked, and decrements the count. {@code null} if nothing matched anywhere.
-   * Self-locking.
-   */
-  @Nullable
-  public static <TEntry extends Entry<TEntry>> TEntry evictOne(
-      @Nonnull State<TEntry> state, @Strategy @Nonnull Predicate<? super TEntry> evictable) {
-    ReentrantLock lock = getTableWriteLock(state);
-    lock.lock();
-    try {
-      return state.sizeManager.evictOne(state.buckets, evictable);
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  /**
-   * Unlinks every entry in {@code state} matching {@code evictable}, decrementing per removal, and
-   * returns how many went. Self-locking.
-   */
-  public static <TEntry extends Entry<TEntry>> int evictAll(
-      @Nonnull State<TEntry> state, @Strategy @Nonnull Predicate<? super TEntry> evictable) {
-    ReentrantLock lock = getTableWriteLock(state);
-    lock.lock();
-    try {
-      return state.sizeManager.evictAll(state.buckets, evictable);
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  // ---------------------------------------------------------------------------------------------
-  // Static building blocks over a caller-owned bucket array (formerly the nested Support class).
-  // Use these to assemble a custom table (higher arity, primitive keys, extra value fields) when
-  // D1/D2 don't fit; D1/D2 delegate to them internally. The whole-table mutators (removeIf, drain,
-  // clear) self-lock on the array; the single-slot write primitives (insertHeadEntry, unlink) do
-  // not lock and must be called under the caller's own synchronized (getWriteLock(buckets,
-  // keyHash)) block.
-  // Readers
-  // (bucket walks, forEach) are lock-free.
-  // ---------------------------------------------------------------------------------------------
-
-  /**
-   * Creates a bucket array whose length is {@link #sizeFor(int) sizeFor(capacity)}. Because {@link
-   * AtomicReferenceArray}'s element type is erased at runtime, {@code entryClass} is not used for
-   * reflective allocation or runtime type checks; it only lets the compiler infer {@code TEntry}.
-   */
-  @Nonnull
-  public static <TEntry extends Entry<TEntry>> AtomicReferenceArray<TEntry> createFixedBuckets(
-      @Nonnull Class<TEntry> entryClass, int capacity) {
-    return new AtomicReferenceArray<>(sizeFor(capacity));
-  }
-
-  /** Upper bound on the bucket-array length returned by {@link #sizeFor(int)}. */
-  static final int MAX_BUCKETS = 1 << 30;
-
-  /**
-   * Returns the bucket-array length to allocate for a table sized to hold {@code requestedSize}
-   * entries: {@code requestedSize} rounded up to the next power of two, capped at {@link
-   * #MAX_BUCKETS}. Throws {@link IllegalArgumentException} for negative inputs or inputs above the
-   * cap.
-   */
-  public static int sizeFor(int requestedSize) {
-    if (requestedSize < 0) {
-      throw new IllegalArgumentException("requestedSize must be non-negative: " + requestedSize);
-    }
-    if (requestedSize > MAX_BUCKETS) {
-      throw new IllegalArgumentException(
-          "requestedSize exceeds maximum bucket count (" + MAX_BUCKETS + "): " + requestedSize);
-    }
-    if (requestedSize <= 1) {
-      return 1;
-    }
-    return Integer.highestOneBit(requestedSize - 1) << 1;
-  }
-
-  /**
-   * Returns the opaque monitor guarding writes to the bucket selected by {@code keyHash}. Use this
-   * monitor for a keyed scan-and-mutate operation; do not depend on its identity or granularity.
-   *
-   * @see #getWriteLockAt(AtomicReferenceArray, int)
-   * @see #getTableWriteLock(AtomicReferenceArray)
-   */
-  @Nonnull
-  public static Object getWriteLock(@Nonnull AtomicReferenceArray<?> buckets, long keyHash) {
-    return getWriteLockAt(buckets, bucketIndex(buckets, keyHash));
-  }
-
-  /**
-   * Returns the {@link State}'s {@link ReentrantLock}, held for the same keyed scan-and-mutate
-   * operations as {@link #getWriteLock(AtomicReferenceArray, long)}. Unlike the bare-array
-   * overload's opaque {@code synchronized} monitor, this lock can be acquired in one call and
-   * released in a later one -- see {@link Reservation}.
-   */
-  @Nonnull
-  public static ReentrantLock getWriteLock(@Nonnull State<?> state, long keyHash) {
-    return state.writeLock;
-  }
-
-  /**
-   * {@link #getWriteLock(AtomicReferenceArray, long)} for a bucket index that has already been
-   * computed — the shape a {@code getOrCreate} wants when it reuses the index from its lock-free
-   * pre-check. This is the primitive; the {@code keyHash} form maps the hash through {@link
-   * #bucketIndex} and calls it.
-   */
-  @Nonnull
-  public static Object getWriteLockAt(@Nonnull AtomicReferenceArray<?> buckets, int bucketIndex) {
-    return buckets;
-  }
-
-  /** {@link #getWriteLock(State, long)}, for a bucket index that has already been computed. */
-  @Nonnull
-  public static ReentrantLock getWriteLockAt(@Nonnull State<?> state, int bucketIndex) {
-    return state.writeLock;
-  }
-
-  /**
-   * Returns the opaque monitor guarding operations that span all buckets. Whole-table helpers such
-   * as {@link #drain}, {@link #clear}, and {@link #removeIf} acquire this monitor internally.
-   */
-  @Nonnull
-  public static Object getTableWriteLock(@Nonnull AtomicReferenceArray<?> buckets) {
-    return buckets;
-  }
-
-  /**
-   * Returns the {@link State}'s {@link ReentrantLock}, guarding operations that span all buckets.
-   * Unlike {@link #getTableWriteLock(AtomicReferenceArray)}'s opaque {@code synchronized} monitor,
-   * this lock can be acquired in one call and released in a later one -- see {@link Reservation}.
-   */
-  @Nonnull
-  public static ReentrantLock getTableWriteLock(@Nonnull State<?> state) {
-    return state.writeLock;
-  }
-
-  public static int bucketIndex(@Nonnull AtomicReferenceArray<?> buckets, long keyHash) {
-    // Bucket lengths are powers of two, so masking replaces a more expensive modulo operation.
-    return (int) (keyHash & (buckets.length() - 1));
-  }
-
-  /**
-   * Returns the head entry of the bucket that {@code keyHash} maps to. The bucket read is a
-   * volatile read of the slot, so it is safe from any thread without a lock.
-   *
-   * <p>Named distinctly from {@link #bucketAt} (rather than overloaded on {@code long} vs. {@code
-   * int}) deliberately: a caller with a primitive {@code int}-typed key hash that called an
-   * overloaded {@code bucket(buckets, intHash)} would silently bind to the {@code int}-index
-   * overload instead of widening to this one, reading the raw hash as an array index — out-of-range
-   * hashes throw {@link IndexOutOfBoundsException}, in-range-but-wrong ones silently read the wrong
-   * bucket.
-   */
-  @Nullable
-  public static <TEntry extends Entry<TEntry>> TEntry bucketFor(
-      @Nonnull AtomicReferenceArray<TEntry> buckets, long keyHash) {
-    return buckets.get(bucketIndex(buckets, keyHash));
-  }
-
-  /** {@link #bucketFor(AtomicReferenceArray, long)} over a {@link State}. */
-  @Nullable
-  public static <TEntry extends Entry<TEntry>> TEntry bucketFor(
-      @Nonnull State<TEntry> state, long keyHash) {
-    return bucketFor(state.buckets, keyHash);
-  }
-
-  /**
-   * Returns the head entry of the bucket at {@code index}. Use when the bucket index is already
-   * computed (e.g. inside {@code getOrCreate} where the same index is reused across the lock
-   * boundary). See {@link #bucketFor} for why this is a distinct name rather than an {@code int}
-   * overload of it.
-   */
-  @Nullable
-  public static <TEntry extends Entry<TEntry>> TEntry bucketAt(
-      @Nonnull AtomicReferenceArray<TEntry> buckets, int index) {
-    return buckets.get(index);
-  }
-
-  /** {@link #bucketAt(AtomicReferenceArray, int)} over a {@link State}. */
-  @Nullable
-  public static <TEntry extends Entry<TEntry>> TEntry bucketAt(
-      @Nonnull State<TEntry> state, int index) {
-    return bucketAt(state.buckets, index);
-  }
-
-  /**
-   * Returns a lock-free iterator over the candidates for {@code keyHash}: entries in the bucket
-   * chain that {@code keyHash} maps to (starting from {@link #bucketFor(AtomicReferenceArray,
-   * long)}) whose own {@link Entry#keyHash} equals it, skipping any other entry sharing the same
-   * bucket via hash collision on {@link #bucketIndex}. Callers only need a {@code matches} check
-   * against the entries this yields, not a {@code keyHash} check of their own.
-   *
-   * <p>Each step follows {@link Entry#next()}, so the iterator reflects entries linked at the time
-   * each step runs rather than a point-in-time snapshot -- entries inserted ahead of the iterator's
-   * current position after iteration starts may or may not be observed, and a concurrently removed
-   * entry remains reachable because {@code unlink()} deliberately retains its {@code next} link for
-   * in-flight readers.
-   */
-  @Nonnull
-  public static <TEntry extends Entry<TEntry>> Iterator<TEntry> hashIterator(
-      @Nonnull AtomicReferenceArray<TEntry> buckets, long keyHash) {
-    return new Iterator<TEntry>() {
-      private TEntry next = advance(bucketFor(buckets, keyHash));
-
-      private TEntry advance(TEntry candidate) {
-        while (candidate != null && candidate.keyHash != keyHash) {
-          candidate = candidate.next();
-        }
-        return candidate;
-      }
-
-      @Override
-      public boolean hasNext() {
-        return next != null;
-      }
-
-      @Override
-      public TEntry next() {
-        TEntry current = next;
-        if (current == null) {
-          throw new NoSuchElementException();
-        }
-        next = advance(current.next());
-        return current;
-      }
-    };
-  }
-
-  /** {@link #hashIterator(AtomicReferenceArray, long)} over a {@link State}. */
-  @Nonnull
-  public static <TEntry extends Entry<TEntry>> Iterator<TEntry> hashIterator(
-      @Nonnull State<TEntry> state, long keyHash) {
-    return hashIterator(state.buckets, keyHash);
-  }
-
-  /**
-   * {@link Iterable} wrapper around {@link #hashIterator(AtomicReferenceArray, long)}, for callers
-   * that want a plain for-each loop over the candidates for {@code keyHash} rather than driving the
-   * {@link Iterator} by hand.
-   */
-  @Nonnull
-  public static <TEntry extends Entry<TEntry>> Iterable<TEntry> hashIterable(
-      @Nonnull AtomicReferenceArray<TEntry> buckets, long keyHash) {
-    return () -> hashIterator(buckets, keyHash);
-  }
-
-  /** {@link #hashIterable(AtomicReferenceArray, long)} over a {@link State}. */
-  @Nonnull
-  public static <TEntry extends Entry<TEntry>> Iterable<TEntry> hashIterable(
-      @Nonnull State<TEntry> state, long keyHash) {
-    return hashIterable(state.buckets, keyHash);
-  }
-
-  /**
-   * Publishes {@code entry} as the head of bucket {@code index}. The helper writes the entry's
-   * {@code next} link before the volatile {@link AtomicReferenceArray#set}; a volatile bucket read
-   * that observes the new head also sees the initialized entry and its link. The caller must hold
-   * {@link #getWriteLockAt}; this method does not acquire a lock or update size accounting.
-   *
-   * <p>The entry must be unlinked and must not be reused after removal. Removal intentionally
-   * retains its {@code next} link for readers already traversing that chain.
-   */
-  @GuardedBy("getWriteLockAt(buckets, index)")
-  public static <TEntry extends Entry<TEntry>> void insertHeadEntryAt(
-      @Nonnull AtomicReferenceArray<TEntry> buckets, int index, @Nonnull TEntry entry) {
-    assert Thread.holdsLock(getWriteLockAt(buckets, index))
-        : "insertHeadEntryAt called without holding getWriteLockAt(buckets, index)";
-    insertHeadEntryAtUnchecked(buckets, index, entry);
-  }
-
-  /** {@link #insertHeadEntryAt(AtomicReferenceArray, int, Entry)} over a {@link State}. */
-  @GuardedBy("getWriteLockAt(state, index)")
-  public static <TEntry extends Entry<TEntry>> void insertHeadEntryAt(
-      @Nonnull State<TEntry> state, int index, @Nonnull TEntry entry) {
-    assert getWriteLockAt(state, index).isHeldByCurrentThread()
-        : "insertHeadEntryAt called without holding getWriteLockAt(state, index)";
-    insertHeadEntryAtUnchecked(state.buckets, index, entry);
-  }
-
-  /** Splicing logic shared by both {@link #insertHeadEntryAt} overloads, without their assert. */
-  private static <TEntry extends Entry<TEntry>> void insertHeadEntryAtUnchecked(
-      @Nonnull AtomicReferenceArray<TEntry> buckets, int index, @Nonnull TEntry entry) {
-    assert entry.next() == null
-        : "Entry already linked -- inserting the same Entry instance twice corrupts the chain"
-            + " (unlink() deliberately leaves a removed entry's next intact for in-flight"
-            + " readers, so a removed entry must never be reinserted)";
-    entry.setNext(buckets.get(index));
-    buckets.set(index, entry);
-  }
-
-  /**
-   * Convenience form of {@link #insertHeadEntryAt} that derives the bucket index from {@code
-   * keyHash}. Prefer {@link #insertHeadEntryAt} when the index is already computed (e.g. a {@code
-   * getOrCreate} that reuses it across the lock-free pre-check).
-   */
-  @GuardedBy("getWriteLock(buckets, keyHash)")
-  public static <TEntry extends Entry<TEntry>> void insertHeadEntryFor(
-      @Nonnull AtomicReferenceArray<TEntry> buckets, long keyHash, @Nonnull TEntry entry) {
-    insertHeadEntryAt(buckets, bucketIndex(buckets, keyHash), entry);
-  }
-
-  /**
-   * Links an already-built entry after a successful {@link #tryReserveOrEvict} or {@link
-   * SizeManager#tryReserve()} call. This method does not acquire a lock or update the count.
-   *
-   * <p>Complete all fallible work before reserving. There is no cancellation operation, so an
-   * abandoned reservation permanently consumes capacity. Drain and clear do not cancel outstanding
-   * reservations.
-   */
-  @GuardedBy("getTableWriteLock(state)")
-  public static <TEntry extends Entry<TEntry>> void insertReserved(
-      @Nonnull State<TEntry> state, long keyHash, @Nonnull TEntry entry) {
-    assert getTableWriteLock(state).isHeldByCurrentThread()
-        : "insertReserved called without holding getTableWriteLock(state)";
-    insertHeadEntryAtUnchecked(state.buckets, bucketIndex(state.buckets, keyHash), entry);
-  }
-
-  /**
-   * Splices {@code entry} out of the chain at {@code index}. {@code prev} is the in-chain
-   * predecessor, or {@code null} when {@code entry} is the bucket head. Re-points the predecessor
-   * (or the bucket head slot) past {@code entry} via a volatile write so lock-free readers see the
-   * removal. {@code entry}'s own {@code next} is deliberately left intact so a reader already
-   * positioned on it can still traverse forward. This is a single-slot primitive: it does not lock,
-   * so call it inside the caller's {@code synchronized (getWriteLockAt(buckets, index))} block.
-   * Does not touch size accounting.
-   */
-  @GuardedBy("getWriteLockAt(buckets, index)")
-  public static <TEntry extends Entry<TEntry>> void unlink(
-      @Nonnull AtomicReferenceArray<TEntry> buckets,
-      int index,
-      @Nullable TEntry prev,
-      @Nonnull TEntry entry) {
-    assert Thread.holdsLock(getWriteLockAt(buckets, index))
-        : "unlink called without holding getWriteLockAt(buckets, index)";
-    unlinkUnchecked(buckets, index, prev, entry);
-  }
-
-  /** {@link #unlink(AtomicReferenceArray, int, Entry, Entry)} over a {@link State}. */
-  @GuardedBy("getWriteLockAt(state, index)")
-  public static <TEntry extends Entry<TEntry>> void unlink(
-      @Nonnull State<TEntry> state, int index, @Nullable TEntry prev, @Nonnull TEntry entry) {
-    assert getWriteLockAt(state, index).isHeldByCurrentThread()
-        : "unlink called without holding getWriteLockAt(state, index)";
-    unlinkUnchecked(state.buckets, index, prev, entry);
-  }
-
-  /** Splicing logic shared by both {@link #unlink} overloads, without their assert. */
-  private static <TEntry extends Entry<TEntry>> void unlinkUnchecked(
-      @Nonnull AtomicReferenceArray<TEntry> buckets,
-      int index,
-      @Nullable TEntry prev,
-      @Nonnull TEntry entry) {
-    TEntry next = entry.next();
-    if (prev == null) {
-      buckets.set(index, next);
-    } else {
-      prev.setNext(next);
-    }
-  }
-
-  /**
-   * Removes every entry matching {@code predicate} from {@code buckets}, decrementing {@code size}
-   * once per removal. Self-locking: synchronizes on {@code buckets} for the whole sweep, so the
-   * predicate sees a stable table and concurrent writers are excluded; lock-free readers continue
-   * throughout.
-   */
-  @StrategyConsumer
-  public static <TEntry extends Entry<TEntry>> boolean removeIf(
-      @Nonnull AtomicReferenceArray<TEntry> buckets,
-      @Nonnull AtomicInteger size,
-      @Strategy @Nonnull Predicate<? super TEntry> predicate) {
-    synchronized (getTableWriteLock(buckets)) {
-      boolean removed = false;
-      for (int i = 0; i < buckets.length(); i++) {
-        TEntry prev = null;
-        for (TEntry e = buckets.get(i); e != null; e = e.next()) {
-          if (predicate.test(e)) {
-            unlink(buckets, i, prev, e);
-            size.decrementAndGet();
-            removed = true;
-            // prev stays put: e is now unlinked, so the last survivor remains the predecessor.
-          } else {
-            prev = e;
-          }
-        }
-      }
-      return removed;
-    }
-  }
-
-  /**
-   * {@link #removeIf(AtomicReferenceArray, AtomicInteger, Predicate)} variant for callers tracking
-   * occupancy with a {@link State} instead of a bare counter — used by {@link D1#removeIf} and
-   * {@link D2#removeIf}.
-   */
-  @StrategyConsumer
-  public static <TEntry extends Entry<TEntry>> boolean removeIf(
-      @Nonnull State<TEntry> state, @Strategy @Nonnull Predicate<? super TEntry> predicate) {
-    // TODO: no caller contends on this lock today; if one does, consider the same per-bucket
-    // locking drain() uses, trading the "predicate sees a stable table" guarantee for throughput.
-    AtomicReferenceArray<TEntry> buckets = state.buckets;
-    ReentrantLock lock = getTableWriteLock(state);
-    lock.lock();
-    try {
-      boolean removed = false;
-      for (int i = 0; i < buckets.length(); i++) {
-        TEntry prev = null;
-        for (TEntry e = buckets.get(i); e != null; e = e.next()) {
-          if (predicate.test(e)) {
-            unlink(state, i, prev, e);
-            state.sizeManager.decrement();
-            removed = true;
-          } else {
-            prev = e;
-          }
-        }
-      }
-      return removed;
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  /**
-   * Removes all entries from {@code buckets} and invokes {@code drainedEntryConsumer} for each one.
-   *
-   * <p>The drain holds the table write lock while detaching buckets and invoking the consumer. For
-   * each removed entry, the consumer is invoked synchronously after its bucket is detached. A
-   * lock-free reader already traversing the detached chain can continue through its retained links.
-   *
-   * <p>This overload does not update size accounting. The consumer should be quick and must not
-   * throw; failures are not rolled back.
-   *
-   * @param <TEntry> entry type
-   * @param buckets bucket array to drain
-   * @param drainedEntryConsumer action invoked for each entry after its bucket is detached
-   */
-  public static <TEntry extends Entry<TEntry>> void drain(
-      @Nonnull AtomicReferenceArray<TEntry> buckets,
-      @Strategy @Nonnull Consumer<? super TEntry> drainedEntryConsumer) {
-    drainCounting(buckets, drainedEntryConsumer);
-  }
-
-  /**
-   * {@link #drain(AtomicReferenceArray, Consumer)} returning the number of entries passed to {@code
-   * drainedEntryConsumer} for size accounting.
-   */
-  @StrategyConsumer
-  private static <TEntry extends Entry<TEntry>> int drainCounting(
-      @Nonnull AtomicReferenceArray<TEntry> buckets,
-      @Strategy @Nonnull Consumer<? super TEntry> drainedEntryConsumer) {
-    int removed = 0;
-    synchronized (getTableWriteLock(buckets)) {
-      for (int i = 0; i < buckets.length(); i++) {
-        TEntry head = buckets.get(i);
-        if (head == null) {
-          continue;
-        }
-        buckets.set(i, null);
-        for (TEntry e = head; e != null; e = e.next()) {
-          removed++;
-          drainedEntryConsumer.accept(e);
-        }
-      }
-    }
-    return removed;
-  }
-
-  /**
-   * Removes all entries from {@code buckets} and invokes {@code drainedEntryConsumer} with {@code
-   * context} and each removed entry.
-   *
-   * <p>The drain holds the table write lock while detaching buckets and invoking the consumer. For
-   * each removed entry, the consumer is invoked synchronously after its bucket is detached. This
-   * overload does not update size accounting. The consumer should be quick and must not throw;
-   * failures are not rolled back.
-   *
-   * @param <C> context type
-   * @param <TEntry> entry type
-   * @param buckets bucket array to drain
-   * @param context context passed to each invocation of {@code drainedEntryConsumer}
-   * @param drainedEntryConsumer action invoked with the context and each removed entry
-   */
-  public static <C, TEntry extends Entry<TEntry>> void drain(
-      @Nonnull AtomicReferenceArray<TEntry> buckets,
-      C context,
-      @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> drainedEntryConsumer) {
-    drainCounting(buckets, context, drainedEntryConsumer);
-  }
-
-  /** {@link #drainCounting(AtomicReferenceArray, Consumer)}, context-passing form. */
-  @StrategyConsumer
-  private static <C, TEntry extends Entry<TEntry>> int drainCounting(
-      @Nonnull AtomicReferenceArray<TEntry> buckets,
-      C context,
-      @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> drainedEntryConsumer) {
-    int removed = 0;
-    synchronized (getTableWriteLock(buckets)) {
-      for (int i = 0; i < buckets.length(); i++) {
-        TEntry head = buckets.get(i);
-        if (head == null) {
-          continue;
-        }
-        buckets.set(i, null);
-        for (TEntry e = head; e != null; e = e.next()) {
-          removed++;
-          drainedEntryConsumer.accept(context, e);
-        }
-      }
-    }
-    return removed;
-  }
-
-  /**
-   * Removes all entries from {@code state}, invokes {@code drainedEntryConsumer} for each one, and
-   * releases one capacity slot for each removed entry.
-   *
-   * <p>The lock is acquired and released bucket by bucket rather than held for the whole sweep, so
-   * a table-level operation (an insert, a reservation, an eviction) can interleave between buckets
-   * instead of waiting out the entire drain. This means the drain is no longer an atomic snapshot:
-   * an entry inserted into a not-yet-visited bucket while the drain is in progress is swept up too,
-   * and each bucket's capacity slot is released immediately before its consumer invocation runs,
-   * rather than once for the whole sweep at the end. Outstanding reservations remain counted.
-   *
-   * <p>The consumer should be quick and must not throw. If it does, later entries in the detached
-   * bucket remain counted but are no longer reachable from the table. Buckets not yet visited
-   * remain intact, and capacity already released is not restored.
-   *
-   * @param <TEntry> entry type
-   * @param state table state to drain
-   * @param drainedEntryConsumer action invoked for each entry after its bucket is detached
-   */
-  public static <TEntry extends Entry<TEntry>> void drain(
-      @Nonnull State<TEntry> state,
-      @Strategy @Nonnull Consumer<? super TEntry> drainedEntryConsumer) {
-    ReentrantLock lock = getTableWriteLock(state);
-    AtomicReferenceArray<TEntry> buckets = state.buckets;
-    for (int i = 0; i < buckets.length(); i++) {
-      lock.lock();
-      try {
-        TEntry head = buckets.get(i);
-        if (head == null) {
-          continue;
-        }
-        buckets.set(i, null);
-        for (TEntry e = head; e != null; e = e.next()) {
-          state.sizeManager.decrement();
-          drainedEntryConsumer.accept(e);
-        }
-      } finally {
-        lock.unlock();
-      }
-    }
-    lock.lock();
-    try {
-      state.sizeManager.release(0); // full sweep: reset the scan position
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  /**
-   * Removes all entries from {@code state}, invokes {@code drainedEntryConsumer} with {@code
-   * context} and each removed entry, and releases one capacity slot for each removed entry.
-   *
-   * <p>The lock is acquired and released bucket by bucket rather than held for the whole sweep, so
-   * a table-level operation (an insert, a reservation, an eviction) can interleave between buckets
-   * instead of waiting out the entire drain. This means the drain is no longer an atomic snapshot:
-   * an entry inserted into a not-yet-visited bucket while the drain is in progress is swept up too,
-   * and each bucket's capacity slot is released immediately before its consumer invocation runs,
-   * rather than once for the whole sweep at the end. Outstanding reservations remain counted.
-   *
-   * <p>The consumer should be quick and must not throw. If it does, later entries in the detached
-   * bucket remain counted but are no longer reachable from the table. Buckets not yet visited
-   * remain intact, and capacity already released is not restored.
-   *
-   * @param <C> context type
-   * @param <TEntry> entry type
-   * @param state table state to drain
-   * @param context context passed to each invocation of {@code drainedEntryConsumer}
-   * @param drainedEntryConsumer action invoked with the context and each removed entry
-   */
-  public static <C, TEntry extends Entry<TEntry>> void drain(
-      @Nonnull State<TEntry> state,
-      C context,
-      @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> drainedEntryConsumer) {
-    ReentrantLock lock = getTableWriteLock(state);
-    AtomicReferenceArray<TEntry> buckets = state.buckets;
-    for (int i = 0; i < buckets.length(); i++) {
-      lock.lock();
-      try {
-        TEntry head = buckets.get(i);
-        if (head == null) {
-          continue;
-        }
-        buckets.set(i, null);
-        for (TEntry e = head; e != null; e = e.next()) {
-          state.sizeManager.decrement();
-          drainedEntryConsumer.accept(context, e);
-        }
-      } finally {
-        lock.unlock();
-      }
-    }
-    lock.lock();
-    try {
-      state.sizeManager.release(0); // full sweep: reset the scan position
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  /** Nulls every bucket head. Self-locking: synchronizes on {@code buckets}. */
-  public static void clear(@Nonnull AtomicReferenceArray<?> buckets) {
-    synchronized (getTableWriteLock(buckets)) {
-      for (int i = 0; i < buckets.length(); i++) {
-        buckets.set(i, null);
-      }
+    public static void clear(@Nonnull State<?> state) {
+        ReentrantLock lock = getTableWriteLock(state);
+        lock.lock();
+        try {
+            state.sizeManager.release(clearCounting(state.buckets));
+        } finally {
+            lock.unlock();
+        }
     }
-  }
-
-  /**
-   * {@link #clear(AtomicReferenceArray)} returning how many entries it detached, so a {@link State}
-   * form can subtract exactly that rather than zeroing — see {@link SizeManager#release(int)} for
-   * why that distinction matters. Unlike the plain form this walks the chains, making it O(entries)
-   * rather than O(buckets); clear is a rare, whole-table operation, so the walk is affordable and
-   * keeping the count honest is worth more than the constant.
-   */
-  private static int clearCounting(@Nonnull AtomicReferenceArray<? extends Entry<?>> buckets) {
-    int removed = 0;
-    synchronized (getTableWriteLock(buckets)) {
-      for (int i = 0; i < buckets.length(); i++) {
-        Entry<?> head = buckets.get(i);
-        if (head == null) {
-          continue;
-        }
-        buckets.set(i, null);
-        for (Entry<?> e = head; e != null; e = e.next()) {
-          removed++;
-        }
-      }
+
+    @StrategyConsumer
+    public static <TEntry extends Entry<TEntry>> void forEach(
+            @Nonnull AtomicReferenceArray<TEntry> buckets, @Strategy @Nonnull Consumer<? super TEntry> consumer) {
+        for (int i = 0; i < buckets.length(); i++) {
+            for (TEntry curEntry = buckets.get(i); curEntry != null; curEntry = curEntry.next()) {
+                consumer.accept(curEntry);
+            }
+        }
     }
-    return removed;
-  }
-
-  /**
-   * {@link #clear(AtomicReferenceArray)} over a {@link State}: also resets its {@link SizeManager}.
-   */
-  public static void clear(@Nonnull State<?> state) {
-    ReentrantLock lock = getTableWriteLock(state);
-    lock.lock();
-    try {
-      state.sizeManager.release(clearCounting(state.buckets));
-    } finally {
-      lock.unlock();
+
+    @StrategyConsumer
+    public static <C, TEntry extends Entry<TEntry>> void forEach(
+            @Nonnull AtomicReferenceArray<TEntry> buckets,
+            C context,
+            @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> consumer) {
+        for (int i = 0; i < buckets.length(); i++) {
+            for (TEntry curEntry = buckets.get(i); curEntry != null; curEntry = curEntry.next()) {
+                consumer.accept(context, curEntry);
+            }
+        }
     }
-  }
-
-  @StrategyConsumer
-  public static <TEntry extends Entry<TEntry>> void forEach(
-      @Nonnull AtomicReferenceArray<TEntry> buckets,
-      @Strategy @Nonnull Consumer<? super TEntry> consumer) {
-    for (int i = 0; i < buckets.length(); i++) {
-      for (TEntry curEntry = buckets.get(i); curEntry != null; curEntry = curEntry.next()) {
-        consumer.accept(curEntry);
-      }
+
+    /** {@link #forEach(AtomicReferenceArray, Consumer)} over a {@link State}. */
+    public static <TEntry extends Entry<TEntry>> void forEach(
+            @Nonnull State<TEntry> state, @Strategy @Nonnull Consumer<? super TEntry> consumer) {
+        forEach(state.buckets, consumer);
     }
-  }
-
-  @StrategyConsumer
-  public static <C, TEntry extends Entry<TEntry>> void forEach(
-      @Nonnull AtomicReferenceArray<TEntry> buckets,
-      C context,
-      @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> consumer) {
-    for (int i = 0; i < buckets.length(); i++) {
-      for (TEntry curEntry = buckets.get(i); curEntry != null; curEntry = curEntry.next()) {
-        consumer.accept(context, curEntry);
-      }
+
+    /** {@link #forEach(AtomicReferenceArray, Object, BiConsumer)} over a {@link State}. */
+    public static <C, TEntry extends Entry<TEntry>> void forEach(
+            @Nonnull State<TEntry> state,
+            C context,
+            @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> consumer) {
+        forEach(state.buckets, context, consumer);
     }
-  }
-
-  /** {@link #forEach(AtomicReferenceArray, Consumer)} over a {@link State}. */
-  public static <TEntry extends Entry<TEntry>> void forEach(
-      @Nonnull State<TEntry> state, @Strategy @Nonnull Consumer<? super TEntry> consumer) {
-    forEach(state.buckets, consumer);
-  }
-
-  /** {@link #forEach(AtomicReferenceArray, Object, BiConsumer)} over a {@link State}. */
-  public static <C, TEntry extends Entry<TEntry>> void forEach(
-      @Nonnull State<TEntry> state,
-      C context,
-      @Strategy @Nonnull BiConsumer<? super C, ? super TEntry> consumer) {
-    forEach(state.buckets, context, consumer);
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/FNV64Hash.java b/internal-api/src/main/java/datadog/trace/util/FNV64Hash.java
index ec0120b66db..f1b7cf46892 100644
--- a/internal-api/src/main/java/datadog/trace/util/FNV64Hash.java
+++ b/internal-api/src/main/java/datadog/trace/util/FNV64Hash.java
@@ -8,62 +8,61 @@
  * <p>http://www.isthe.com/chongo/tech/comp/fnv/index.html#FNV-1
  */
 public class FNV64Hash {
-  private static final long FNV_INIT = 0xcbf29ce484222325L;
-  private static final long FNV_PRIME = 0x100000001b3L;
+    private static final long FNV_INIT = 0xcbf29ce484222325L;
+    private static final long FNV_PRIME = 0x100000001b3L;
 
-  public enum Version {
-    v1,
-    v1A
-  }
+    public enum Version {
+        v1,
+        v1A
+    }
 
-  public static long generateHash(String data, Version version) {
-    return generateHash(data.getBytes(StandardCharsets.UTF_8), version);
-  }
+    public static long generateHash(String data, Version version) {
+        return generateHash(data.getBytes(StandardCharsets.UTF_8), version);
+    }
 
-  public static long continueHash(long currentHash, String data, Version version) {
-    return continueHash(currentHash, data.getBytes(StandardCharsets.UTF_8), version);
-  }
+    public static long continueHash(long currentHash, String data, Version version) {
+        return continueHash(currentHash, data.getBytes(StandardCharsets.UTF_8), version);
+    }
 
-  public static long generateHash(byte[] data, Version version) {
-    return generateHash(data, 0, data.length, version);
-  }
+    public static long generateHash(byte[] data, Version version) {
+        return generateHash(data, 0, data.length, version);
+    }
 
-  public static long continueHash(long currentHash, byte[] data, Version version) {
-    return continueHash(currentHash, data, 0, data.length, version);
-  }
+    public static long continueHash(long currentHash, byte[] data, Version version) {
+        return continueHash(currentHash, data, 0, data.length, version);
+    }
 
-  public static long generateHash(byte[] data, int start, int length, Version version) {
-    return continueHash(FNV_INIT, data, start, length, version);
-  }
+    public static long generateHash(byte[] data, int start, int length, Version version) {
+        return continueHash(FNV_INIT, data, start, length, version);
+    }
 
-  public static long continueHash(
-      long currentHash, byte[] data, int start, int length, Version version) {
-    if (version == Version.v1) {
-      return generateFNV1Hash(currentHash, data, start, length);
-    } else {
-      return generateFNV1AHash(currentHash, data, start, length);
+    public static long continueHash(long currentHash, byte[] data, int start, int length, Version version) {
+        if (version == Version.v1) {
+            return generateFNV1Hash(currentHash, data, start, length);
+        } else {
+            return generateFNV1AHash(currentHash, data, start, length);
+        }
     }
-  }
 
-  private static long generateFNV1Hash(long currentHash, byte[] data, int start, int length) {
-    long hash = currentHash;
+    private static long generateFNV1Hash(long currentHash, byte[] data, int start, int length) {
+        long hash = currentHash;
 
-    for (int i = start; i < start + length; i++) {
-      hash *= FNV_PRIME;
-      hash ^= 0xffL & data[i];
+        for (int i = start; i < start + length; i++) {
+            hash *= FNV_PRIME;
+            hash ^= 0xffL & data[i];
+        }
+
+        return hash;
     }
 
-    return hash;
-  }
+    private static long generateFNV1AHash(long currentHash, byte[] data, int start, int length) {
+        long hash = currentHash;
 
-  private static long generateFNV1AHash(long currentHash, byte[] data, int start, int length) {
-    long hash = currentHash;
+        for (int i = start; i < start + length; i++) {
+            hash ^= 0xffL & data[i];
+            hash *= FNV_PRIME;
+        }
 
-    for (int i = start; i < start + length; i++) {
-      hash ^= 0xffL & data[i];
-      hash *= FNV_PRIME;
+        return hash;
     }
-
-    return hash;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/FlatHashtable.java b/internal-api/src/main/java/datadog/trace/util/FlatHashtable.java
index 47802f0d90f..0f15217cb51 100644
--- a/internal-api/src/main/java/datadog/trace/util/FlatHashtable.java
+++ b/internal-api/src/main/java/datadog/trace/util/FlatHashtable.java
@@ -76,997 +76,987 @@
  * #getOrCreate} (so hits stay a single probe and the create path is warmup-rare).
  */
 public final class FlatHashtable {
-  private FlatHashtable() {}
-
-  /**
-   * Optional structure-free entry base carrying only a cached {@code hash} — an
-   * <i>optimization</i>, not plumbing (open addressing needs no {@code next}), so extending it is
-   * never required: bring any entry type and supply a {@link HashStrategy} yourself instead. Caller
-   * contract: {@code hash} must equal the table's {@link MatchingStrategy#hashKey} for this entry's
-   * key (the <i>raw</i> hash — the table applies its own spread), so the entry lands where {@link
-   * #get} looks.
-   */
-  public abstract static class Entry {
-    public final long hash;
-
-    protected Entry(long hash) {
-      this.hash = hash;
-    }
-  }
-
-  /**
-   * Single-key, {@code HashMap}-style convenience over the {@linkplain FlatHashtable static core}:
-   * {@link #get} / {@link #getOrCreate} / {@link #insert} / {@link #forEach} without writing a
-   * {@link MatchingStrategy}. Reach for it when you want something quick that beats {@code
-   * HashMap<K, V>} — the entry carries its own value fields, so updating an existing value is
-   * allocation-free (look up once, then write the returned entry).
-   *
-   * <p><b>Fixed or growable, chosen at construction.</b> {@link #createFixed} keeps the raw core's
-   * bounded posture — the table holds up to {@code maxCapacity} entries, then {@link #getOrCreate}
-   * caps and returns {@code null} (the caller supplies the overflow default). {@link
-   * #createGrowable} trades that for {@code HashMap}-like ergonomics — its {@code initialCapacity}
-   * is a sizing hint, not a cap, the table doubles when it fills past its load factor, and {@code
-   * getOrCreate} never returns {@code null}. The distinct factory names make the choice explicit at
-   * the call site (there's no ambiguous {@code (Class, int)} constructor); {@code Capacity} always
-   * counts <i>entries</i> — contrast the chained {@code Hashtable.D1}, whose factory counts
-   * <i>buckets</i>.
-   *
-   * <p><b>Entry-centric, not strategy-based.</b> Supply a {@link D1.Entry} subclass carrying the
-   * key and value fields; key equality is {@link Object#equals} by default (override {@link
-   * Entry#matches(Object)} for e.g. reference equality on interned keys). The strategy-based core
-   * is untouched and remains the expert path.
-   *
-   * <p><b>No {@code remove}.</b> The open-addressed core has no tombstones (an empty slot
-   * terminates a probe), so deletion isn't supported — this layer is for accumulate / interner /
-   * counter workloads, not churn.
-   *
-   * <p><b>Not thread-safe.</b>
-   *
-   * @param <K> the key type
-   * @param <TEntry> the user's {@link D1.Entry D1.Entry&lt;K&gt;} subclass
-   */
-  public static final class D1<K, TEntry extends D1.Entry<K>> {
+    private FlatHashtable() {}
+
     /**
-     * Abstract base for {@link D1} entries. Subclass to add value fields you wish to mutate in
-     * place after retrieving the entry via {@link D1#get}. The key is captured at construction and
-     * stored alongside its precomputed hash (via {@link FlatHashtable.Entry}).
-     *
-     * @param <K> the key type
+     * Optional structure-free entry base carrying only a cached {@code hash} — an
+     * <i>optimization</i>, not plumbing (open addressing needs no {@code next}), so extending it is
+     * never required: bring any entry type and supply a {@link HashStrategy} yourself instead. Caller
+     * contract: {@code hash} must equal the table's {@link MatchingStrategy#hashKey} for this entry's
+     * key (the <i>raw</i> hash — the table applies its own spread), so the entry lands where {@link
+     * #get} looks.
      */
-    public abstract static class Entry<K> extends FlatHashtable.Entry {
-      final K key;
-
-      protected Entry(@Nullable K key) {
-        super(hash(key));
-        this.key = key;
-      }
-
-      @Nullable
-      public final K key() {
-        return key;
-      }
-
-      public boolean matches(@Nullable Object key) {
-        return Objects.equals(this.key, key);
-      }
-
-      /**
-       * Returns the lookup hash for {@code key}. Null keys map to {@link Long#MIN_VALUE} so they
-       * don't collide with a real key that hashes to 0; real-key collisions are resolved by {@link
-       * #matches(Object)}.
-       */
-      public static long hash(@Nullable Object key) {
-        return (key == null) ? Long.MIN_VALUE : key.hashCode();
-      }
-    }
+    public abstract static class Entry {
+        public final long hash;
 
-    private final boolean growable;
-    private final float loadFactor;
-    private TEntry[] table;
-    private int size;
-    private int limit; // grow trigger when growable; hard cap when fixed
-
-    private D1(TEntry[] table, float loadFactor, boolean growable, int limit) {
-      this.growable = growable;
-      this.loadFactor = loadFactor;
-      this.table = table;
-      this.size = 0;
-      this.limit = limit;
+        protected Entry(long hash) {
+            this.hash = hash;
+        }
     }
 
     /**
-     * A bounded {@link D1} holding up to {@code maxCapacity} entries at the {@link
-     * #DEFAULT_LOAD_FACTOR}, then capping ({@link #getOrCreate} returns {@code null}).
+     * Single-key, {@code HashMap}-style convenience over the {@linkplain FlatHashtable static core}:
+     * {@link #get} / {@link #getOrCreate} / {@link #insert} / {@link #forEach} without writing a
+     * {@link MatchingStrategy}. Reach for it when you want something quick that beats {@code
+     * HashMap<K, V>} — the entry carries its own value fields, so updating an existing value is
+     * allocation-free (look up once, then write the returned entry).
+     *
+     * <p><b>Fixed or growable, chosen at construction.</b> {@link #createFixed} keeps the raw core's
+     * bounded posture — the table holds up to {@code maxCapacity} entries, then {@link #getOrCreate}
+     * caps and returns {@code null} (the caller supplies the overflow default). {@link
+     * #createGrowable} trades that for {@code HashMap}-like ergonomics — its {@code initialCapacity}
+     * is a sizing hint, not a cap, the table doubles when it fills past its load factor, and {@code
+     * getOrCreate} never returns {@code null}. The distinct factory names make the choice explicit at
+     * the call site (there's no ambiguous {@code (Class, int)} constructor); {@code Capacity} always
+     * counts <i>entries</i> — contrast the chained {@code Hashtable.D1}, whose factory counts
+     * <i>buckets</i>.
+     *
+     * <p><b>Entry-centric, not strategy-based.</b> Supply a {@link D1.Entry} subclass carrying the
+     * key and value fields; key equality is {@link Object#equals} by default (override {@link
+     * Entry#matches(Object)} for e.g. reference equality on interned keys). The strategy-based core
+     * is untouched and remains the expert path.
+     *
+     * <p><b>No {@code remove}.</b> The open-addressed core has no tombstones (an empty slot
+     * terminates a probe), so deletion isn't supported — this layer is for accumulate / interner /
+     * counter workloads, not churn.
+     *
+     * <p><b>Not thread-safe.</b>
+     *
+     * @param <K> the key type
+     * @param <TEntry> the user's {@link D1.Entry D1.Entry&lt;K&gt;} subclass
      */
-    @Nonnull
-    public static <K, E extends D1.Entry<K>> D1<K, E> createFixed(
-        @Nonnull Class<E> type, int maxCapacity) {
-      return createFixed(type, maxCapacity, DEFAULT_LOAD_FACTOR);
-    }
+    public static final class D1<K, TEntry extends D1.Entry<K>> {
+        /**
+         * Abstract base for {@link D1} entries. Subclass to add value fields you wish to mutate in
+         * place after retrieving the entry via {@link D1#get}. The key is captured at construction and
+         * stored alongside its precomputed hash (via {@link FlatHashtable.Entry}).
+         *
+         * @param <K> the key type
+         */
+        public abstract static class Entry<K> extends FlatHashtable.Entry {
+            final K key;
+
+            protected Entry(@Nullable K key) {
+                super(hash(key));
+                this.key = key;
+            }
+
+            @Nullable
+            public final K key() {
+                return key;
+            }
+
+            public boolean matches(@Nullable Object key) {
+                return Objects.equals(this.key, key);
+            }
+
+            /**
+             * Returns the lookup hash for {@code key}. Null keys map to {@link Long#MIN_VALUE} so they
+             * don't collide with a real key that hashes to 0; real-key collisions are resolved by {@link
+             * #matches(Object)}.
+             */
+            public static long hash(@Nullable Object key) {
+                return (key == null) ? Long.MIN_VALUE : key.hashCode();
+            }
+        }
 
-    @Nonnull
-    public static <K, E extends D1.Entry<K>> D1<K, E> createFixed(
-        @Nonnull Class<E> type, int maxCapacity, float loadFactor) {
-      return new D1<>(create(type, maxCapacity, loadFactor), loadFactor, false, maxCapacity);
-    }
+        private final boolean growable;
+        private final float loadFactor;
+        private TEntry[] table;
+        private int size;
+        private int limit; // grow trigger when growable; hard cap when fixed
+
+        private D1(TEntry[] table, float loadFactor, boolean growable, int limit) {
+            this.growable = growable;
+            this.loadFactor = loadFactor;
+            this.table = table;
+            this.size = 0;
+            this.limit = limit;
+        }
 
-    /**
-     * A growable {@link D1} sized initially for {@code initialCapacity} entries at the {@link
-     * #DEFAULT_LOAD_FACTOR}; doubles on demand, so it never caps.
-     */
-    @Nonnull
-    public static <K, E extends D1.Entry<K>> D1<K, E> createGrowable(
-        @Nonnull Class<E> type, int initialCapacity) {
-      return createGrowable(type, initialCapacity, DEFAULT_LOAD_FACTOR);
-    }
+        /**
+         * A bounded {@link D1} holding up to {@code maxCapacity} entries at the {@link
+         * #DEFAULT_LOAD_FACTOR}, then capping ({@link #getOrCreate} returns {@code null}).
+         */
+        @Nonnull
+        public static <K, E extends D1.Entry<K>> D1<K, E> createFixed(@Nonnull Class<E> type, int maxCapacity) {
+            return createFixed(type, maxCapacity, DEFAULT_LOAD_FACTOR);
+        }
 
-    @Nonnull
-    public static <K, E extends D1.Entry<K>> D1<K, E> createGrowable(
-        @Nonnull Class<E> type, int initialCapacity, float loadFactor) {
-      E[] table = create(type, initialCapacity, loadFactor);
-      return new D1<>(table, loadFactor, true, (int) (table.length * loadFactor));
-    }
+        @Nonnull
+        public static <K, E extends D1.Entry<K>> D1<K, E> createFixed(
+                @Nonnull Class<E> type, int maxCapacity, float loadFactor) {
+            return new D1<>(create(type, maxCapacity, loadFactor), loadFactor, false, maxCapacity);
+        }
 
-    public int size() {
-      return size;
-    }
+        /**
+         * A growable {@link D1} sized initially for {@code initialCapacity} entries at the {@link
+         * #DEFAULT_LOAD_FACTOR}; doubles on demand, so it never caps.
+         */
+        @Nonnull
+        public static <K, E extends D1.Entry<K>> D1<K, E> createGrowable(@Nonnull Class<E> type, int initialCapacity) {
+            return createGrowable(type, initialCapacity, DEFAULT_LOAD_FACTOR);
+        }
 
-    /** Existing entry for {@code key}, or {@code null}. Read-only — never creates. */
-    @Nullable
-    public TEntry get(@Nullable K key) {
-      final long keyHash = Entry.hash(key);
-      final TEntry[] table = this.table;
-      final int mask = table.length - 1;
-      final int start = home(keyHash, mask);
-      int i = start;
-      for (; ; ) {
-        final TEntry e = table[i];
-        if (e == null) {
-          return null; // empty slot terminates the probe (no tombstones)
+        @Nonnull
+        public static <K, E extends D1.Entry<K>> D1<K, E> createGrowable(
+                @Nonnull Class<E> type, int initialCapacity, float loadFactor) {
+            E[] table = create(type, initialCapacity, loadFactor);
+            return new D1<>(table, loadFactor, true, (int) (table.length * loadFactor));
+        }
+
+        public int size() {
+            return size;
+        }
+
+        /** Existing entry for {@code key}, or {@code null}. Read-only — never creates. */
+        @Nullable
+        public TEntry get(@Nullable K key) {
+            final long keyHash = Entry.hash(key);
+            final TEntry[] table = this.table;
+            final int mask = table.length - 1;
+            final int start = home(keyHash, mask);
+            int i = start;
+            for (; ; ) {
+                final TEntry e = table[i];
+                if (e == null) {
+                    return null; // empty slot terminates the probe (no tombstones)
+                }
+                if (e.hash == keyHash && e.matches(key)) {
+                    return e;
+                }
+                i = (i + 1) & mask;
+                if (i == start) {
+                    return null; // wrapped ⇒ absent (can't happen once growth keeps a free slot)
+                }
+            }
+        }
+
+        /**
+         * Existing entry for {@code key}, or a freshly {@link CreateStrategy#create created} + inserted
+         * one. A growable table never returns {@code null}; a fixed one returns {@code null} when full
+         * and {@code key} is absent (the caller supplies the overflow default). A hit is always
+         * returned even at capacity — the cap blocks only creation, not lookup.
+         */
+        @StrategyConsumer
+        @Nullable
+        public TEntry getOrCreate(@Nullable K key, @Nonnull CreateStrategy<TEntry, K> createStrat) {
+            final TEntry existing = get(key);
+            if (existing != null) {
+                return existing;
+            }
+            if (size >= limit) {
+                if (!growable) {
+                    return null; // fixed table full ⇒ caller supplies the overflow default
+                }
+                grow();
+            }
+            final TEntry created = createStrat.create(key);
+            FlatHashtable.insert(table, created); // fits: cap/growth keeps a free slot
+            size++;
+            return created;
+        }
+
+        /**
+         * Unconditionally adds {@code entry} ({@code true}), or {@code false} if a fixed table is full.
+         * Comparison-free and caller-responsible (same contract as {@link FlatHashtable#insert}): the
+         * caller must ensure {@code entry}'s key is absent, else it lands shadowed.
+         */
+        public boolean insert(@Nonnull TEntry entry) {
+            if (size >= limit) {
+                if (!growable) {
+                    return false; // fixed table full
+                }
+                grow();
+            }
+            FlatHashtable.insert(table, entry);
+            size++;
+            return true;
         }
-        if (e.hash == keyHash && e.matches(key)) {
-          return e;
+
+        private void grow() {
+            table = resize(table);
+            limit = (int) (table.length * loadFactor);
+        }
+
+        public void clear() {
+            Arrays.fill(table, null);
+            size = 0;
         }
-        i = (i + 1) & mask;
-        if (i == start) {
-          return null; // wrapped ⇒ absent (can't happen once growth keeps a free slot)
+
+        public void forEach(@Nonnull Consumer<? super TEntry> consumer) {
+            FlatHashtable.forEach(table, consumer);
+        }
+
+        /**
+         * Context-passing {@link #forEach(Consumer)}: pair a non-capturing {@link BiConsumer} with
+         * side-band {@code context} to avoid a per-call closure.
+         */
+        public <C> void forEach(C context, @Nonnull BiConsumer<? super C, ? super TEntry> consumer) {
+            FlatHashtable.forEach(table, context, consumer);
         }
-      }
     }
 
     /**
-     * Existing entry for {@code key}, or a freshly {@link CreateStrategy#create created} + inserted
-     * one. A growable table never returns {@code null}; a fixed one returns {@code null} when full
-     * and {@code key} is absent (the caller supplies the overflow default). A hit is always
-     * returned even at capacity — the cap blocks only creation, not lookup.
+     * Two-key (composite-key) analogue of {@link D1}. Both key parts pass directly through {@link
+     * #get} / {@link #getOrCreate}, so a lookup allocates no {@code Pair} — the win over {@code
+     * HashMap<Pair, V>}. Same fixed-or-growable ({@link #createFixed} / {@link #createGrowable}),
+     * entry-centric, no-{@code remove}, not-thread-safe contract as {@link D1}.
+     *
+     * @param <K1> first key type
+     * @param <K2> second key type
+     * @param <TEntry> the user's {@link D2.Entry D2.Entry&lt;K1, K2&gt;} subclass
      */
-    @StrategyConsumer
-    @Nullable
-    public TEntry getOrCreate(@Nullable K key, @Nonnull CreateStrategy<TEntry, K> createStrat) {
-      final TEntry existing = get(key);
-      if (existing != null) {
-        return existing;
-      }
-      if (size >= limit) {
-        if (!growable) {
-          return null; // fixed table full ⇒ caller supplies the overflow default
+    public static final class D2<K1, K2, TEntry extends D2.Entry<K1, K2>> {
+        /**
+         * Abstract base for {@link D2} entries. Subclass to add value fields you wish to mutate in
+         * place. Both key parts are captured at construction alongside their combined hash.
+         *
+         * @param <K1> first key type
+         * @param <K2> second key type
+         */
+        public abstract static class Entry<K1, K2> extends FlatHashtable.Entry {
+            final K1 key1;
+            final K2 key2;
+
+            protected Entry(@Nullable K1 key1, @Nullable K2 key2) {
+                super(hash(key1, key2));
+                this.key1 = key1;
+                this.key2 = key2;
+            }
+
+            @Nullable
+            public final K1 key1() {
+                return key1;
+            }
+
+            @Nullable
+            public final K2 key2() {
+                return key2;
+            }
+
+            public boolean matches(@Nullable K1 key1, @Nullable K2 key2) {
+                return Objects.equals(this.key1, key1) && Objects.equals(this.key2, key2);
+            }
+
+            /**
+             * Returns the combined lookup hash for both key parts via {@link
+             * LongHashingUtils#hash(Object, Object)}. Null parts contribute {@code 0} (not a sentinel,
+             * unlike {@link D1.Entry}); {@link #matches(Object, Object)} resolves any collision.
+             */
+            public static long hash(@Nullable Object key1, @Nullable Object key2) {
+                return LongHashingUtils.hash(key1, key2);
+            }
+        }
+
+        private final boolean growable;
+        private final float loadFactor;
+        private TEntry[] table;
+        private int size;
+        private int limit; // grow trigger when growable; hard cap when fixed
+
+        private D2(TEntry[] table, float loadFactor, boolean growable, int limit) {
+            this.growable = growable;
+            this.loadFactor = loadFactor;
+            this.table = table;
+            this.size = 0;
+            this.limit = limit;
+        }
+
+        /**
+         * A bounded {@link D2} holding up to {@code maxCapacity} entries at the {@link
+         * #DEFAULT_LOAD_FACTOR}, then capping ({@link #getOrCreate} returns {@code null}).
+         */
+        @Nonnull
+        public static <K1, K2, E extends D2.Entry<K1, K2>> D2<K1, K2, E> createFixed(
+                @Nonnull Class<E> type, int maxCapacity) {
+            return createFixed(type, maxCapacity, DEFAULT_LOAD_FACTOR);
+        }
+
+        @Nonnull
+        public static <K1, K2, E extends D2.Entry<K1, K2>> D2<K1, K2, E> createFixed(
+                @Nonnull Class<E> type, int maxCapacity, float loadFactor) {
+            return new D2<>(create(type, maxCapacity, loadFactor), loadFactor, false, maxCapacity);
+        }
+
+        /**
+         * A growable {@link D2} sized initially for {@code initialCapacity} entries at the {@link
+         * #DEFAULT_LOAD_FACTOR}; doubles on demand, so it never caps.
+         */
+        @Nonnull
+        public static <K1, K2, E extends D2.Entry<K1, K2>> D2<K1, K2, E> createGrowable(
+                @Nonnull Class<E> type, int initialCapacity) {
+            return createGrowable(type, initialCapacity, DEFAULT_LOAD_FACTOR);
+        }
+
+        @Nonnull
+        public static <K1, K2, E extends D2.Entry<K1, K2>> D2<K1, K2, E> createGrowable(
+                @Nonnull Class<E> type, int initialCapacity, float loadFactor) {
+            E[] table = create(type, initialCapacity, loadFactor);
+            return new D2<>(table, loadFactor, true, (int) (table.length * loadFactor));
+        }
+
+        public int size() {
+            return size;
+        }
+
+        /** Existing entry for {@code (key1, key2)}, or {@code null}. Read-only — never creates. */
+        @Nullable
+        public TEntry get(@Nullable K1 key1, @Nullable K2 key2) {
+            final long keyHash = Entry.hash(key1, key2);
+            final TEntry[] table = this.table;
+            final int mask = table.length - 1;
+            final int start = home(keyHash, mask);
+            int i = start;
+            for (; ; ) {
+                final TEntry e = table[i];
+                if (e == null) {
+                    return null;
+                }
+                if (e.hash == keyHash && e.matches(key1, key2)) {
+                    return e;
+                }
+                i = (i + 1) & mask;
+                if (i == start) {
+                    return null;
+                }
+            }
+        }
+
+        /**
+         * Two-key analogue of {@link D1#getOrCreate}: growable never returns {@code null}; fixed
+         * returns {@code null} when full and {@code (key1, key2)} is absent.
+         */
+        @StrategyConsumer
+        @Nullable
+        public TEntry getOrCreate(
+                @Nullable K1 key1, @Nullable K2 key2, @Nonnull CreateStrategy2<TEntry, K1, K2> createStrat) {
+            final TEntry existing = get(key1, key2);
+            if (existing != null) {
+                return existing;
+            }
+            if (size >= limit) {
+                if (!growable) {
+                    return null; // fixed table full ⇒ caller supplies the overflow default
+                }
+                grow();
+            }
+            final TEntry created = createStrat.create(key1, key2);
+            FlatHashtable.insert(table, created);
+            size++;
+            return created;
+        }
+
+        /**
+         * Unconditionally adds {@code entry} ({@code true}), or {@code false} if a fixed table is full.
+         * Comparison-free and caller-responsible: the caller must ensure {@code (key1, key2)} is
+         * absent.
+         */
+        public boolean insert(@Nonnull TEntry entry) {
+            if (size >= limit) {
+                if (!growable) {
+                    return false; // fixed table full
+                }
+                grow();
+            }
+            FlatHashtable.insert(table, entry);
+            size++;
+            return true;
+        }
+
+        private void grow() {
+            table = resize(table);
+            limit = (int) (table.length * loadFactor);
+        }
+
+        public void clear() {
+            Arrays.fill(table, null);
+            size = 0;
+        }
+
+        public void forEach(@Nonnull Consumer<? super TEntry> consumer) {
+            FlatHashtable.forEach(table, consumer);
+        }
+
+        public <C> void forEach(C context, @Nonnull BiConsumer<? super C, ? super TEntry> consumer) {
+            FlatHashtable.forEach(table, context, consumer);
         }
-        grow();
-      }
-      final TEntry created = createStrat.create(key);
-      FlatHashtable.insert(table, created); // fits: cap/growth keeps a free slot
-      size++;
-      return created;
     }
 
     /**
-     * Unconditionally adds {@code entry} ({@code true}), or {@code false} if a fixed table is full.
-     * Comparison-free and caller-responsible (same contract as {@link FlatHashtable#insert}): the
-     * caller must ensure {@code entry}'s key is absent, else it lands shadowed.
+     * Two-key creation strategy for {@link D2#getOrCreate}: mint a new entry for {@code (key1,
+     * key2)}. Like {@link CreateStrategy}, supply a {@code static final} constant or a
+     * <i>non-capturing</i> lambda (e.g. {@code MyEntry::new}) so it stays a single monomorphic,
+     * allocation-free instance.
+     *
+     * @param <E> stored entry to create
+     * @param <K1> first key type
+     * @param <K2> second key type
      */
-    public boolean insert(@Nonnull TEntry entry) {
-      if (size >= limit) {
-        if (!growable) {
-          return false; // fixed table full
-        }
-        grow();
-      }
-      FlatHashtable.insert(table, entry);
-      size++;
-      return true;
+    @Strategy
+    @FunctionalInterface
+    public interface CreateStrategy2<E, K1, K2> {
+        @Nonnull
+        E create(@Nullable K1 key1, @Nullable K2 key2);
     }
 
-    private void grow() {
-      table = resize(table);
-      limit = (int) (table.length * loadFactor);
+    /**
+     * Entry-side strategy: the hash of a stored {@code entry} — its home is {@link #home}{@code
+     * (hashOf(entry))}. Used by {@link #insert} / {@link #iterator} / {@link #resize}, which have an
+     * entry rather than a lookup key. Must be consistent with {@link MatchingStrategy#hashKey} (see
+     * the class contract). Supply a {@code static final} constant or a non-capturing lambda so it
+     * stays a single monomorphic instance (see {@link Strategy}); for {@link Entry}-based tables use
+     * the strategy-free overloads, which read {@link Entry#hash} directly.
+     *
+     * @param <E> stored entry
+     */
+    @Strategy
+    @FunctionalInterface
+    public interface HashStrategy<E> {
+        long hashOf(@Nonnull E entry);
     }
 
-    public void clear() {
-      Arrays.fill(table, null);
-      size = 0;
+    /**
+     * Key-side strategy: whether a stored {@code entry} is the one for a lookup {@code key} ({@link
+     * #matches}), and how to hash that key ({@link #hashKey}). {@code hashKey} <b>defaults to {@code
+     * key.hashCode()}</b> — override it only when the key's identity needs different hashing (e.g.
+     * case-insensitive), and then keep it consistent with the table's {@link HashStrategy#hashOf}.
+     * Used by {@link #get} / {@link #getOrCreate}.
+     *
+     * <p>A {@link FunctionalInterface} ({@code matches} is the sole abstract method), so the common
+     * case can be a non-capturing lambda; a strategy that also customizes hashing is a named class
+     * that overrides {@code hashKey}.
+     *
+     * @param <E> stored entry
+     * @param <K> lookup key
+     */
+    @Strategy
+    @FunctionalInterface
+    public interface MatchingStrategy<E, K> {
+        /** Whether the stored {@code entry} is the one for {@code key}. */
+        boolean matches(@Nonnull E entry, K key);
+
+        /**
+         * Hash of {@code key}; defaults to {@code key.hashCode()} (the table applies its own spread).
+         * This default NPEs on a {@code null} key — unlike {@link D1.Entry}, which maps a {@code null}
+         * key to a dedicated hash sentinel, the raw core takes no position on {@code null} keys; a
+         * strategy that must support them overrides {@code hashKey} (and {@code matches}) to handle
+         * {@code null} itself.
+         */
+        default long hashKey(K key) {
+            return key.hashCode();
+        }
     }
 
-    public void forEach(@Nonnull Consumer<? super TEntry> consumer) {
-      FlatHashtable.forEach(table, consumer);
-    }
+    /**
+     * The whole policy for a table you both look up in and insert into: a {@link MatchingStrategy}
+     * (key side) and a {@link HashStrategy} (entry side) in one. Extend as a <b>stateless</b> final
+     * class held in a concrete-typed {@code static final} singleton so the JIT specializes each call
+     * site (see {@link Strategy}); an abstract <b>class</b> (not an interface) so a specialization
+     * miss falls back to {@code invokevirtual} rather than the costlier megamorphic {@code
+     * invokeinterface}.
+     *
+     * @param <E> stored entry
+     * @param <K> lookup key
+     */
+    @Strategy
+    public abstract static class EntryStrategy<E, K> implements HashStrategy<E>, MatchingStrategy<E, K> {}
 
     /**
-     * Context-passing {@link #forEach(Consumer)}: pair a non-capturing {@link BiConsumer} with
-     * side-band {@code context} to avoid a per-call closure.
+     * {@link EntryStrategy} for {@code String} keys compared case-insensitively: seals {@link
+     * #hashKey} to {@link Strings#caseInsensitiveHashCode} (consistent with {@link
+     * String#equalsIgnoreCase}, which callers use in {@link #matches}). Callers still supply {@link
+     * #matches} (typically {@code key.equalsIgnoreCase(entry.key)}) and {@link #hashOf} (the same
+     * case-insensitive hash of the entry's key, or the cached {@link Entry#hash}).
+     *
+     * @param <E> stored entry — self-contained (carries its own key)
      */
-    public <C> void forEach(C context, @Nonnull BiConsumer<? super C, ? super TEntry> consumer) {
-      FlatHashtable.forEach(table, context, consumer);
+    public abstract static class CaseInsensitiveStringStrategy<E> extends EntryStrategy<E, String> {
+        @Override
+        public final long hashKey(String key) {
+            return Strings.caseInsensitiveHashCode(key); // raw; the table spreads before masking
+        }
     }
-  }
-
-  /**
-   * Two-key (composite-key) analogue of {@link D1}. Both key parts pass directly through {@link
-   * #get} / {@link #getOrCreate}, so a lookup allocates no {@code Pair} — the win over {@code
-   * HashMap<Pair, V>}. Same fixed-or-growable ({@link #createFixed} / {@link #createGrowable}),
-   * entry-centric, no-{@code remove}, not-thread-safe contract as {@link D1}.
-   *
-   * @param <K1> first key type
-   * @param <K2> second key type
-   * @param <TEntry> the user's {@link D2.Entry D2.Entry&lt;K1, K2&gt;} subclass
-   */
-  public static final class D2<K1, K2, TEntry extends D2.Entry<K1, K2>> {
+
     /**
-     * Abstract base for {@link D2} entries. Subclass to add value fields you wish to mutate in
-     * place. Both key parts are captured at construction alongside their combined hash.
+     * Creation strategy: mint a new entry for {@code key} (called once, on insert). A {@link
+     * FunctionalInterface} — supply a {@code static final} constant or a <i>non-capturing</i> lambda
+     * (e.g. {@code MyEntry::new}) so it stays a single monomorphic, allocation-free instance; a
+     * capturing lambda silently re-allocates per call and can de-monomorphize the site (see {@link
+     * Strategy}). Bespoke rather than {@link java.util.function.Function} so it carries the {@link
+     * Strategy} contract and reads as {@code create} at the call site.
      *
-     * @param <K1> first key type
-     * @param <K2> second key type
+     * @param <E> stored entry to create
+     * @param <K> lookup key
      */
-    public abstract static class Entry<K1, K2> extends FlatHashtable.Entry {
-      final K1 key1;
-      final K2 key2;
-
-      protected Entry(@Nullable K1 key1, @Nullable K2 key2) {
-        super(hash(key1, key2));
-        this.key1 = key1;
-        this.key2 = key2;
-      }
-
-      @Nullable
-      public final K1 key1() {
-        return key1;
-      }
-
-      @Nullable
-      public final K2 key2() {
-        return key2;
-      }
-
-      public boolean matches(@Nullable K1 key1, @Nullable K2 key2) {
-        return Objects.equals(this.key1, key1) && Objects.equals(this.key2, key2);
-      }
-
-      /**
-       * Returns the combined lookup hash for both key parts via {@link
-       * LongHashingUtils#hash(Object, Object)}. Null parts contribute {@code 0} (not a sentinel,
-       * unlike {@link D1.Entry}); {@link #matches(Object, Object)} resolves any collision.
-       */
-      public static long hash(@Nullable Object key1, @Nullable Object key2) {
-        return LongHashingUtils.hash(key1, key2);
-      }
+    @Strategy
+    @FunctionalInterface
+    public interface CreateStrategy<E, K> {
+        @Nonnull
+        E create(@Nullable K key);
     }
 
-    private final boolean growable;
-    private final float loadFactor;
-    private TEntry[] table;
-    private int size;
-    private int limit; // grow trigger when growable; hard cap when fixed
-
-    private D2(TEntry[] table, float loadFactor, boolean growable, int limit) {
-      this.growable = growable;
-      this.loadFactor = loadFactor;
-      this.table = table;
-      this.size = 0;
-      this.limit = limit;
-    }
+    /**
+     * Balanced default load factor — target fill {@code <= 0.5} ({@code >= 2x} capacity). Linear
+     * probing then costs ~1.5 probes on a hit, ~2.5 on a miss (Knuth); the general-purpose sweet
+     * spot.
+     */
+    public static final float DEFAULT_LOAD_FACTOR = 0.5f;
 
     /**
-     * A bounded {@link D2} holding up to {@code maxCapacity} entries at the {@link
-     * #DEFAULT_LOAD_FACTOR}, then capping ({@link #getOrCreate} returns {@code null}).
+     * Sparse load factor — target fill {@code <= 0.25} ({@code >= 4x} capacity): ~1.2 probes on a
+     * hit, ~1.4 on a miss. For miss-heavy hot paths (membership checks) where the extra empty slots
+     * are cheap and shaving the (quadratic-in-load) miss cost is worth the memory. Measure before
+     * preferring it to {@link #DEFAULT_LOAD_FACTOR}. There is deliberately no higher-than-default
+     * constant — open addressing degrades sharply past 0.5 (~8.5 probes/miss at 0.75).
      */
-    @Nonnull
-    public static <K1, K2, E extends D2.Entry<K1, K2>> D2<K1, K2, E> createFixed(
-        @Nonnull Class<E> type, int maxCapacity) {
-      return createFixed(type, maxCapacity, DEFAULT_LOAD_FACTOR);
-    }
+    public static final float LOW_LOAD_FACTOR = 0.25f;
 
-    @Nonnull
-    public static <K1, K2, E extends D2.Entry<K1, K2>> D2<K1, K2, E> createFixed(
-        @Nonnull Class<E> type, int maxCapacity, float loadFactor) {
-      return new D2<>(create(type, maxCapacity, loadFactor), loadFactor, false, maxCapacity);
+    /** Power-of-two capacity for a cardinality budget at the {@link #DEFAULT_LOAD_FACTOR}. */
+    public static int capacityFor(int cardinalityLimit) {
+        return capacityFor(cardinalityLimit, DEFAULT_LOAD_FACTOR);
     }
 
     /**
-     * A growable {@link D2} sized initially for {@code initialCapacity} entries at the {@link
-     * #DEFAULT_LOAD_FACTOR}; doubles on demand, so it never caps.
+     * Power-of-two capacity for a cardinality budget at {@code loadFactor}: the smallest power of two
+     * {@code >= ceil(cardinalityLimit / loadFactor)}. Because it rounds up to a power of two, the
+     * achieved fill is often below {@code loadFactor} (never above) — you always get at least the
+     * headroom you asked for.
      */
-    @Nonnull
-    public static <K1, K2, E extends D2.Entry<K1, K2>> D2<K1, K2, E> createGrowable(
-        @Nonnull Class<E> type, int initialCapacity) {
-      return createGrowable(type, initialCapacity, DEFAULT_LOAD_FACTOR);
+    public static int capacityFor(int cardinalityLimit, float loadFactor) {
+        if (cardinalityLimit <= 0) {
+            throw new IllegalArgumentException("cardinalityLimit must be positive: " + cardinalityLimit);
+        }
+        if (!(loadFactor > 0f && loadFactor < 1f)) {
+            throw new IllegalArgumentException("loadFactor must be in (0, 1): " + loadFactor);
+        }
+        int min = (int) Math.ceil(cardinalityLimit / (double) loadFactor);
+        int capacity = Integer.highestOneBit(min - 1) << 1;
+        if (capacity <= 0) {
+            throw new IllegalArgumentException("cardinalityLimit "
+                    + cardinalityLimit
+                    + " at loadFactor "
+                    + loadFactor
+                    + " requires a capacity larger than Integer.MAX_VALUE");
+        }
+        return capacity;
     }
 
+    /**
+     * Allocates a correctly-typed table for a cardinality budget ({@link #capacityFor} slots).
+     * Passing {@code type} makes the array's runtime component type {@code E} rather than {@code
+     * Object[]} — typed reads, real array-store checks, and a monomorphic element type for the JIT.
+     * Callers can't {@code new E[]} themselves under erasure; this does the one reflective allocation
+     * at construction (off any hot path). Note: this {@code create} mints the backing array; {@link
+     * CreateStrategy#create} mints an entry — different types, no ambiguity at the call site.
+     */
+    @SuppressWarnings("unchecked")
     @Nonnull
-    public static <K1, K2, E extends D2.Entry<K1, K2>> D2<K1, K2, E> createGrowable(
-        @Nonnull Class<E> type, int initialCapacity, float loadFactor) {
-      E[] table = create(type, initialCapacity, loadFactor);
-      return new D2<>(table, loadFactor, true, (int) (table.length * loadFactor));
+    public static <E> E[] create(@Nonnull Class<E> type, int cardinalityLimit) {
+        return (E[]) Array.newInstance(type, capacityFor(cardinalityLimit));
     }
 
-    public int size() {
-      return size;
+    /**
+     * {@link #create(Class, int)} at an explicit {@code loadFactor} (see {@link #capacityFor(int,
+     * float)} and the {@link #DEFAULT_LOAD_FACTOR} / {@link #LOW_LOAD_FACTOR} constants).
+     */
+    @SuppressWarnings("unchecked")
+    @Nonnull
+    public static <E> E[] create(@Nonnull Class<E> type, int cardinalityLimit, float loadFactor) {
+        return (E[]) Array.newInstance(type, capacityFor(cardinalityLimit, loadFactor));
     }
 
-    /** Existing entry for {@code (key1, key2)}, or {@code null}. Read-only — never creates. */
+    /**
+     * Existing entry for {@code key}, or {@code null}. Read-only — never creates. Single probe on a
+     * hit; walks to the first empty slot (or all the way around) on a miss.
+     */
+    @StrategyConsumer
     @Nullable
-    public TEntry get(@Nullable K1 key1, @Nullable K2 key2) {
-      final long keyHash = Entry.hash(key1, key2);
-      final TEntry[] table = this.table;
-      final int mask = table.length - 1;
-      final int start = home(keyHash, mask);
-      int i = start;
-      for (; ; ) {
-        final TEntry e = table[i];
-        if (e == null) {
-          return null;
+    public static <E, K> E get(@Nonnull E[] table, K key, @Nonnull MatchingStrategy<E, K> matchStrat) {
+        final int mask = table.length - 1;
+        final int start = home(matchStrat.hashKey(key), mask);
+        int i = start;
+        for (; ; ) {
+            final E e = table[i];
+            if (e == null) {
+                return null; // empty slot terminates the probe (no tombstones)
+            }
+            if (matchStrat.matches(e, key)) {
+                return e;
+            }
+            i = (i + 1) & mask;
+            if (i == start) {
+                return null; // wrapped ⇒ full, absent
+            }
         }
-        if (e.hash == keyHash && e.matches(key1, key2)) {
-          return e;
-        }
-        i = (i + 1) & mask;
-        if (i == start) {
-          return null;
-        }
-      }
     }
 
     /**
-     * Two-key analogue of {@link D1#getOrCreate}: growable never returns {@code null}; fixed
-     * returns {@code null} when full and {@code (key1, key2)} is absent.
+     * Existing entry for {@code key}, or a freshly {@link CreateStrategy#create created} + inserted
+     * one. Returns {@code null} only if the table is full (no empty slot) — the caller supplies its
+     * overflow default. The insert is a single plain reference store: a concurrent clobber /
+     * double-create is acceptable only when the payload makes it benign (see class doc).
      */
     @StrategyConsumer
     @Nullable
-    public TEntry getOrCreate(
-        @Nullable K1 key1,
-        @Nullable K2 key2,
-        @Nonnull CreateStrategy2<TEntry, K1, K2> createStrat) {
-      final TEntry existing = get(key1, key2);
-      if (existing != null) {
-        return existing;
-      }
-      if (size >= limit) {
-        if (!growable) {
-          return null; // fixed table full ⇒ caller supplies the overflow default
+    public static <E, K> E getOrCreate(
+            @Nonnull E[] table,
+            K key,
+            @Nonnull MatchingStrategy<E, K> matchStrat,
+            @Nonnull CreateStrategy<E, K> createStrat) {
+        final int mask = table.length - 1;
+        final int start = home(matchStrat.hashKey(key), mask);
+        int i = start;
+        for (; ; ) {
+            final E e = table[i];
+            if (e == null) {
+                final E created = createStrat.create(key);
+                table[i] = created; // single-reference publish; benign clobber (see class doc)
+                return created;
+            }
+            if (matchStrat.matches(e, key)) {
+                return e;
+            }
+            i = (i + 1) & mask;
+            if (i == start) {
+                return null; // wrapped ⇒ full
+            }
         }
-        grow();
-      }
-      final TEntry created = createStrat.create(key1, key2);
-      FlatHashtable.insert(table, created);
-      size++;
-      return created;
     }
 
     /**
-     * Unconditionally adds {@code entry} ({@code true}), or {@code false} if a fixed table is full.
-     * Comparison-free and caller-responsible: the caller must ensure {@code (key1, key2)} is
-     * absent.
+     * Unconditionally adds {@code entry} at the first empty slot from its {@link Entry#hash home};
+     * {@code false} if the table is full. Convenience over the {@link HashStrategy}-taking overload
+     * for {@link Entry}-based entries (the home comes from the entry, so no strategy is needed).
+     *
+     * <p><b>Comparison-free and caller-responsible.</b> It does not check for an existing key, so the
+     * caller must ensure {@code entry}'s key is absent. A duplicate lands <i>shadowed</i> further
+     * along the probe run — unreachable by {@link #get}, wasting a slot, and (if the key is later
+     * removed) able to resurrect stale data. Reach for it only from the expert tier, with that
+     * contract in hand.
      */
-    public boolean insert(@Nonnull TEntry entry) {
-      if (size >= limit) {
-        if (!growable) {
-          return false; // fixed table full
-        }
-        grow();
-      }
-      FlatHashtable.insert(table, entry);
-      size++;
-      return true;
+    public static <E extends Entry> boolean insert(@Nonnull E[] table, @Nonnull E entry) {
+        return placeAt(table, entry, entry.hash);
     }
 
-    private void grow() {
-      table = resize(table);
-      limit = (int) (table.length * loadFactor);
+    /**
+     * {@link #insert(Entry[], Entry)} for any entry type: the home comes from {@link
+     * HashStrategy#hashOf}. Same comparison-free, caller-ensures-absence contract.
+     */
+    @StrategyConsumer
+    public static <E> boolean insert(@Nonnull E[] table, @Nonnull E entry, @Nonnull HashStrategy<E> hashStrat) {
+        return placeAt(table, entry, hashStrat.hashOf(entry));
     }
 
-    public void clear() {
-      Arrays.fill(table, null);
-      size = 0;
+    /**
+     * Shared placement core: probe from {@code hash}'s home to the first empty slot; false if full.
+     */
+    private static <E> boolean placeAt(E[] table, E entry, long hash) {
+        final int mask = table.length - 1;
+        final int start = home(hash, mask);
+        int i = start;
+        for (; ; ) {
+            if (table[i] == null) {
+                table[i] = entry; // single-reference publish (see class doc)
+                return true;
+            }
+            i = (i + 1) & mask;
+            if (i == start) {
+                return false; // wrapped ⇒ full
+            }
+        }
     }
 
-    public void forEach(@Nonnull Consumer<? super TEntry> consumer) {
-      FlatHashtable.forEach(table, consumer);
+    /**
+     * Placement slot for {@code hash} in a table of {@code mask + 1} slots. The table owns the
+     * spread: a golden-ratio (Fibonacci) multiply diffuses the hash across all bits — robust to weak
+     * or {@code int}-derived {@code hashCode}s and to full 64-bit composite hashes alike — then the
+     * low index bits are taken. So a strategy may return a plain {@code hashCode} without pre-mixing.
+     * Package-private so tests can predict slots.
+     */
+    static int home(long hash, int mask) {
+        long z = hash * 0x9E3779B97F4A7C15L; // 2^64 / golden ratio; odd ⇒ a bijection (loses no bits)
+        z ^= z >>> 32; // fold the well-mixed high half down into the low bits the mask keeps
+        return (int) z & mask;
     }
 
-    public <C> void forEach(C context, @Nonnull BiConsumer<? super C, ? super TEntry> consumer) {
-      FlatHashtable.forEach(table, context, consumer);
-    }
-  }
-
-  /**
-   * Two-key creation strategy for {@link D2#getOrCreate}: mint a new entry for {@code (key1,
-   * key2)}. Like {@link CreateStrategy}, supply a {@code static final} constant or a
-   * <i>non-capturing</i> lambda (e.g. {@code MyEntry::new}) so it stays a single monomorphic,
-   * allocation-free instance.
-   *
-   * @param <E> stored entry to create
-   * @param <K1> first key type
-   * @param <K2> second key type
-   */
-  @Strategy
-  @FunctionalInterface
-  public interface CreateStrategy2<E, K1, K2> {
+    /**
+     * Doubles capacity and rehashes every entry into a new table — call when {@link #insert} returns
+     * {@code false} and you want to grow rather than reject; the caller stores the returned array
+     * back. Convenience over the {@link HashStrategy}-taking overload for {@link Entry}-based entries
+     * (the home comes from {@link Entry#hash}). See {@link #resizingInsert(Entry[], Entry)} to do
+     * both in one call, and its note on growing over unbounded key domains.
+     */
     @Nonnull
-    E create(@Nullable K1 key1, @Nullable K2 key2);
-  }
-
-  /**
-   * Entry-side strategy: the hash of a stored {@code entry} — its home is {@link #home}{@code
-   * (hashOf(entry))}. Used by {@link #insert} / {@link #iterator} / {@link #resize}, which have an
-   * entry rather than a lookup key. Must be consistent with {@link MatchingStrategy#hashKey} (see
-   * the class contract). Supply a {@code static final} constant or a non-capturing lambda so it
-   * stays a single monomorphic instance (see {@link Strategy}); for {@link Entry}-based tables use
-   * the strategy-free overloads, which read {@link Entry#hash} directly.
-   *
-   * @param <E> stored entry
-   */
-  @Strategy
-  @FunctionalInterface
-  public interface HashStrategy<E> {
-    long hashOf(@Nonnull E entry);
-  }
-
-  /**
-   * Key-side strategy: whether a stored {@code entry} is the one for a lookup {@code key} ({@link
-   * #matches}), and how to hash that key ({@link #hashKey}). {@code hashKey} <b>defaults to {@code
-   * key.hashCode()}</b> — override it only when the key's identity needs different hashing (e.g.
-   * case-insensitive), and then keep it consistent with the table's {@link HashStrategy#hashOf}.
-   * Used by {@link #get} / {@link #getOrCreate}.
-   *
-   * <p>A {@link FunctionalInterface} ({@code matches} is the sole abstract method), so the common
-   * case can be a non-capturing lambda; a strategy that also customizes hashing is a named class
-   * that overrides {@code hashKey}.
-   *
-   * @param <E> stored entry
-   * @param <K> lookup key
-   */
-  @Strategy
-  @FunctionalInterface
-  public interface MatchingStrategy<E, K> {
-    /** Whether the stored {@code entry} is the one for {@code key}. */
-    boolean matches(@Nonnull E entry, K key);
+    public static <E extends Entry> E[] resize(@Nonnull E[] table) {
+        E[] grown = allocateGrown(table);
+        for (final E e : table) {
+            if (e != null) {
+                placeAt(grown, e, e.hash);
+            }
+        }
+        return grown;
+    }
 
     /**
-     * Hash of {@code key}; defaults to {@code key.hashCode()} (the table applies its own spread).
-     * This default NPEs on a {@code null} key — unlike {@link D1.Entry}, which maps a {@code null}
-     * key to a dedicated hash sentinel, the raw core takes no position on {@code null} keys; a
-     * strategy that must support them overrides {@code hashKey} (and {@code matches}) to handle
-     * {@code null} itself.
+     * {@link #resize(Entry[])} for any entry type: each entry's home comes from {@link
+     * HashStrategy#hashOf}. Not a {@link StrategyConsumer} — the rehash is a cold, one-off traversal,
+     * not a hot specialization site.
      */
-    default long hashKey(K key) {
-      return key.hashCode();
-    }
-  }
-
-  /**
-   * The whole policy for a table you both look up in and insert into: a {@link MatchingStrategy}
-   * (key side) and a {@link HashStrategy} (entry side) in one. Extend as a <b>stateless</b> final
-   * class held in a concrete-typed {@code static final} singleton so the JIT specializes each call
-   * site (see {@link Strategy}); an abstract <b>class</b> (not an interface) so a specialization
-   * miss falls back to {@code invokevirtual} rather than the costlier megamorphic {@code
-   * invokeinterface}.
-   *
-   * @param <E> stored entry
-   * @param <K> lookup key
-   */
-  @Strategy
-  public abstract static class EntryStrategy<E, K>
-      implements HashStrategy<E>, MatchingStrategy<E, K> {}
-
-  /**
-   * {@link EntryStrategy} for {@code String} keys compared case-insensitively: seals {@link
-   * #hashKey} to {@link Strings#caseInsensitiveHashCode} (consistent with {@link
-   * String#equalsIgnoreCase}, which callers use in {@link #matches}). Callers still supply {@link
-   * #matches} (typically {@code key.equalsIgnoreCase(entry.key)}) and {@link #hashOf} (the same
-   * case-insensitive hash of the entry's key, or the cached {@link Entry#hash}).
-   *
-   * @param <E> stored entry — self-contained (carries its own key)
-   */
-  public abstract static class CaseInsensitiveStringStrategy<E> extends EntryStrategy<E, String> {
-    @Override
-    public final long hashKey(String key) {
-      return Strings.caseInsensitiveHashCode(key); // raw; the table spreads before masking
-    }
-  }
-
-  /**
-   * Creation strategy: mint a new entry for {@code key} (called once, on insert). A {@link
-   * FunctionalInterface} — supply a {@code static final} constant or a <i>non-capturing</i> lambda
-   * (e.g. {@code MyEntry::new}) so it stays a single monomorphic, allocation-free instance; a
-   * capturing lambda silently re-allocates per call and can de-monomorphize the site (see {@link
-   * Strategy}). Bespoke rather than {@link java.util.function.Function} so it carries the {@link
-   * Strategy} contract and reads as {@code create} at the call site.
-   *
-   * @param <E> stored entry to create
-   * @param <K> lookup key
-   */
-  @Strategy
-  @FunctionalInterface
-  public interface CreateStrategy<E, K> {
     @Nonnull
-    E create(@Nullable K key);
-  }
-
-  /**
-   * Balanced default load factor — target fill {@code <= 0.5} ({@code >= 2x} capacity). Linear
-   * probing then costs ~1.5 probes on a hit, ~2.5 on a miss (Knuth); the general-purpose sweet
-   * spot.
-   */
-  public static final float DEFAULT_LOAD_FACTOR = 0.5f;
-
-  /**
-   * Sparse load factor — target fill {@code <= 0.25} ({@code >= 4x} capacity): ~1.2 probes on a
-   * hit, ~1.4 on a miss. For miss-heavy hot paths (membership checks) where the extra empty slots
-   * are cheap and shaving the (quadratic-in-load) miss cost is worth the memory. Measure before
-   * preferring it to {@link #DEFAULT_LOAD_FACTOR}. There is deliberately no higher-than-default
-   * constant — open addressing degrades sharply past 0.5 (~8.5 probes/miss at 0.75).
-   */
-  public static final float LOW_LOAD_FACTOR = 0.25f;
-
-  /** Power-of-two capacity for a cardinality budget at the {@link #DEFAULT_LOAD_FACTOR}. */
-  public static int capacityFor(int cardinalityLimit) {
-    return capacityFor(cardinalityLimit, DEFAULT_LOAD_FACTOR);
-  }
-
-  /**
-   * Power-of-two capacity for a cardinality budget at {@code loadFactor}: the smallest power of two
-   * {@code >= ceil(cardinalityLimit / loadFactor)}. Because it rounds up to a power of two, the
-   * achieved fill is often below {@code loadFactor} (never above) — you always get at least the
-   * headroom you asked for.
-   */
-  public static int capacityFor(int cardinalityLimit, float loadFactor) {
-    if (cardinalityLimit <= 0) {
-      throw new IllegalArgumentException("cardinalityLimit must be positive: " + cardinalityLimit);
-    }
-    if (!(loadFactor > 0f && loadFactor < 1f)) {
-      throw new IllegalArgumentException("loadFactor must be in (0, 1): " + loadFactor);
-    }
-    int min = (int) Math.ceil(cardinalityLimit / (double) loadFactor);
-    int capacity = Integer.highestOneBit(min - 1) << 1;
-    if (capacity <= 0) {
-      throw new IllegalArgumentException(
-          "cardinalityLimit "
-              + cardinalityLimit
-              + " at loadFactor "
-              + loadFactor
-              + " requires a capacity larger than Integer.MAX_VALUE");
-    }
-    return capacity;
-  }
-
-  /**
-   * Allocates a correctly-typed table for a cardinality budget ({@link #capacityFor} slots).
-   * Passing {@code type} makes the array's runtime component type {@code E} rather than {@code
-   * Object[]} — typed reads, real array-store checks, and a monomorphic element type for the JIT.
-   * Callers can't {@code new E[]} themselves under erasure; this does the one reflective allocation
-   * at construction (off any hot path). Note: this {@code create} mints the backing array; {@link
-   * CreateStrategy#create} mints an entry — different types, no ambiguity at the call site.
-   */
-  @SuppressWarnings("unchecked")
-  @Nonnull
-  public static <E> E[] create(@Nonnull Class<E> type, int cardinalityLimit) {
-    return (E[]) Array.newInstance(type, capacityFor(cardinalityLimit));
-  }
-
-  /**
-   * {@link #create(Class, int)} at an explicit {@code loadFactor} (see {@link #capacityFor(int,
-   * float)} and the {@link #DEFAULT_LOAD_FACTOR} / {@link #LOW_LOAD_FACTOR} constants).
-   */
-  @SuppressWarnings("unchecked")
-  @Nonnull
-  public static <E> E[] create(@Nonnull Class<E> type, int cardinalityLimit, float loadFactor) {
-    return (E[]) Array.newInstance(type, capacityFor(cardinalityLimit, loadFactor));
-  }
-
-  /**
-   * Existing entry for {@code key}, or {@code null}. Read-only — never creates. Single probe on a
-   * hit; walks to the first empty slot (or all the way around) on a miss.
-   */
-  @StrategyConsumer
-  @Nullable
-  public static <E, K> E get(
-      @Nonnull E[] table, K key, @Nonnull MatchingStrategy<E, K> matchStrat) {
-    final int mask = table.length - 1;
-    final int start = home(matchStrat.hashKey(key), mask);
-    int i = start;
-    for (; ; ) {
-      final E e = table[i];
-      if (e == null) {
-        return null; // empty slot terminates the probe (no tombstones)
-      }
-      if (matchStrat.matches(e, key)) {
-        return e;
-      }
-      i = (i + 1) & mask;
-      if (i == start) {
-        return null; // wrapped ⇒ full, absent
-      }
-    }
-  }
-
-  /**
-   * Existing entry for {@code key}, or a freshly {@link CreateStrategy#create created} + inserted
-   * one. Returns {@code null} only if the table is full (no empty slot) — the caller supplies its
-   * overflow default. The insert is a single plain reference store: a concurrent clobber /
-   * double-create is acceptable only when the payload makes it benign (see class doc).
-   */
-  @StrategyConsumer
-  @Nullable
-  public static <E, K> E getOrCreate(
-      @Nonnull E[] table,
-      K key,
-      @Nonnull MatchingStrategy<E, K> matchStrat,
-      @Nonnull CreateStrategy<E, K> createStrat) {
-    final int mask = table.length - 1;
-    final int start = home(matchStrat.hashKey(key), mask);
-    int i = start;
-    for (; ; ) {
-      final E e = table[i];
-      if (e == null) {
-        final E created = createStrat.create(key);
-        table[i] = created; // single-reference publish; benign clobber (see class doc)
-        return created;
-      }
-      if (matchStrat.matches(e, key)) {
-        return e;
-      }
-      i = (i + 1) & mask;
-      if (i == start) {
-        return null; // wrapped ⇒ full
-      }
-    }
-  }
-
-  /**
-   * Unconditionally adds {@code entry} at the first empty slot from its {@link Entry#hash home};
-   * {@code false} if the table is full. Convenience over the {@link HashStrategy}-taking overload
-   * for {@link Entry}-based entries (the home comes from the entry, so no strategy is needed).
-   *
-   * <p><b>Comparison-free and caller-responsible.</b> It does not check for an existing key, so the
-   * caller must ensure {@code entry}'s key is absent. A duplicate lands <i>shadowed</i> further
-   * along the probe run — unreachable by {@link #get}, wasting a slot, and (if the key is later
-   * removed) able to resurrect stale data. Reach for it only from the expert tier, with that
-   * contract in hand.
-   */
-  public static <E extends Entry> boolean insert(@Nonnull E[] table, @Nonnull E entry) {
-    return placeAt(table, entry, entry.hash);
-  }
-
-  /**
-   * {@link #insert(Entry[], Entry)} for any entry type: the home comes from {@link
-   * HashStrategy#hashOf}. Same comparison-free, caller-ensures-absence contract.
-   */
-  @StrategyConsumer
-  public static <E> boolean insert(
-      @Nonnull E[] table, @Nonnull E entry, @Nonnull HashStrategy<E> hashStrat) {
-    return placeAt(table, entry, hashStrat.hashOf(entry));
-  }
-
-  /**
-   * Shared placement core: probe from {@code hash}'s home to the first empty slot; false if full.
-   */
-  private static <E> boolean placeAt(E[] table, E entry, long hash) {
-    final int mask = table.length - 1;
-    final int start = home(hash, mask);
-    int i = start;
-    for (; ; ) {
-      if (table[i] == null) {
-        table[i] = entry; // single-reference publish (see class doc)
-        return true;
-      }
-      i = (i + 1) & mask;
-      if (i == start) {
-        return false; // wrapped ⇒ full
-      }
+    public static <E> E[] resize(@Nonnull E[] table, @Nonnull HashStrategy<E> hashStrat) {
+        E[] grown = allocateGrown(table);
+        for (final E e : table) {
+            if (e != null) {
+                placeAt(grown, e, hashStrat.hashOf(e));
+            }
+        }
+        return grown;
     }
-  }
-
-  /**
-   * Placement slot for {@code hash} in a table of {@code mask + 1} slots. The table owns the
-   * spread: a golden-ratio (Fibonacci) multiply diffuses the hash across all bits — robust to weak
-   * or {@code int}-derived {@code hashCode}s and to full 64-bit composite hashes alike — then the
-   * low index bits are taken. So a strategy may return a plain {@code hashCode} without pre-mixing.
-   * Package-private so tests can predict slots.
-   */
-  static int home(long hash, int mask) {
-    long z = hash * 0x9E3779B97F4A7C15L; // 2^64 / golden ratio; odd ⇒ a bijection (loses no bits)
-    z ^= z >>> 32; // fold the well-mixed high half down into the low bits the mask keeps
-    return (int) z & mask;
-  }
-
-  /**
-   * Doubles capacity and rehashes every entry into a new table — call when {@link #insert} returns
-   * {@code false} and you want to grow rather than reject; the caller stores the returned array
-   * back. Convenience over the {@link HashStrategy}-taking overload for {@link Entry}-based entries
-   * (the home comes from {@link Entry#hash}). See {@link #resizingInsert(Entry[], Entry)} to do
-   * both in one call, and its note on growing over unbounded key domains.
-   */
-  @Nonnull
-  public static <E extends Entry> E[] resize(@Nonnull E[] table) {
-    E[] grown = allocateGrown(table);
-    for (final E e : table) {
-      if (e != null) {
-        placeAt(grown, e, e.hash);
-      }
+
+    /**
+     * A new, empty table of twice the capacity, of the same runtime component type as {@code table}.
+     */
+    @SuppressWarnings("unchecked")
+    private static <E> E[] allocateGrown(E[] table) {
+        return (E[]) Array.newInstance(table.getClass().getComponentType(), grownLength(table.length));
     }
-    return grown;
-  }
-
-  /**
-   * {@link #resize(Entry[])} for any entry type: each entry's home comes from {@link
-   * HashStrategy#hashOf}. Not a {@link StrategyConsumer} — the rehash is a cold, one-off traversal,
-   * not a hot specialization site.
-   */
-  @Nonnull
-  public static <E> E[] resize(@Nonnull E[] table, @Nonnull HashStrategy<E> hashStrat) {
-    E[] grown = allocateGrown(table);
-    for (final E e : table) {
-      if (e != null) {
-        placeAt(grown, e, hashStrat.hashOf(e));
-      }
+
+    /**
+     * {@code currentLength << 1}, guarded against overflow. {@code currentLength << 1} overflows to a
+     * negative value at {@code currentLength == 1 << 30}; without this check the failure surfaces as
+     * an opaque {@code NegativeArraySizeException} from {@code Array.newInstance} in {@link
+     * #allocateGrown}. Same overflow class as {@link #capacityFor}'s guard -- this is the growth-time
+     * counterpart.
+     */
+    static int grownLength(int currentLength) {
+        int grownLength = currentLength << 1;
+        if (grownLength <= 0) {
+            throw new IllegalStateException(
+                    "cannot grow a table of length " + currentLength + " past Integer.MAX_VALUE");
+        }
+        return grownLength;
     }
-    return grown;
-  }
-
-  /**
-   * A new, empty table of twice the capacity, of the same runtime component type as {@code table}.
-   */
-  @SuppressWarnings("unchecked")
-  private static <E> E[] allocateGrown(E[] table) {
-    return (E[]) Array.newInstance(table.getClass().getComponentType(), grownLength(table.length));
-  }
-
-  /**
-   * {@code currentLength << 1}, guarded against overflow. {@code currentLength << 1} overflows to a
-   * negative value at {@code currentLength == 1 << 30}; without this check the failure surfaces as
-   * an opaque {@code NegativeArraySizeException} from {@code Array.newInstance} in {@link
-   * #allocateGrown}. Same overflow class as {@link #capacityFor}'s guard -- this is the growth-time
-   * counterpart.
-   */
-  static int grownLength(int currentLength) {
-    int grownLength = currentLength << 1;
-    if (grownLength <= 0) {
-      throw new IllegalStateException(
-          "cannot grow a table of length " + currentLength + " past Integer.MAX_VALUE");
+
+    /**
+     * {@link #insert(Entry[], Entry) insert} that grows on demand: adds {@code entry}, {@link
+     * #resize(Entry[]) resizing} first if the table is full, and returns the table to store back —
+     * the <b>same</b> array if it fit, a <b>new larger</b> one if it grew:
+     *
+     * <pre>{@code
+     * table = FlatHashtable.resizingInsert(table, entry); // always reassign
+     * }</pre>
+     *
+     * Same comparison-free, caller-ensures-absence contract as {@link #insert}.
+     *
+     * <p><b>Grows unboundedly.</b> Unlike {@code insert}'s {@code false}, this hides the full signal,
+     * so it is the easiest place to leak memory: use it only for a genuinely bounded key domain,
+     * never over externally-controlled cardinality.
+     *
+     * <p><b>Grows at 100% fill, not at a load factor.</b> The raw core carries no live-size counter
+     * (see the class contract), so it has no cheap way to know the current fill short of a full table
+     * scan; growing only when {@link #insert} reports "full" is the only trigger available without
+     * one. {@link #DEFAULT_LOAD_FACTOR} and {@link #LOW_LOAD_FACTOR}'s Knuth figures size a
+     * <i>fixed</i> table (via {@link #capacityFor} / {@link #create}) up front for its expected
+     * cardinality; they are not an insert-time growth trigger here. A caller that sizes up front —
+     * the expected usage — never sees the difference; one that instead leans on {@code
+     * resizingInsert} to grow an under-sized table from scratch runs fill up through 0.75, 0.9, and
+     * 1.0 before doubling, past where those figures stop applying. A caller that already tracks live
+     * size (as {@link D1} / {@link D2} do) can grow at a load factor of its own choosing instead.
+     */
+    @Nonnull
+    public static <E extends Entry> E[] resizingInsert(@Nonnull E[] table, @Nonnull E entry) {
+        E[] t = table;
+        while (!insert(t, entry)) {
+            t = resize(t); // one doubling always suffices; the loop is belt-and-braces
+        }
+        return t;
     }
-    return grownLength;
-  }
-
-  /**
-   * {@link #insert(Entry[], Entry) insert} that grows on demand: adds {@code entry}, {@link
-   * #resize(Entry[]) resizing} first if the table is full, and returns the table to store back —
-   * the <b>same</b> array if it fit, a <b>new larger</b> one if it grew:
-   *
-   * <pre>{@code
-   * table = FlatHashtable.resizingInsert(table, entry); // always reassign
-   * }</pre>
-   *
-   * Same comparison-free, caller-ensures-absence contract as {@link #insert}.
-   *
-   * <p><b>Grows unboundedly.</b> Unlike {@code insert}'s {@code false}, this hides the full signal,
-   * so it is the easiest place to leak memory: use it only for a genuinely bounded key domain,
-   * never over externally-controlled cardinality.
-   *
-   * <p><b>Grows at 100% fill, not at a load factor.</b> The raw core carries no live-size counter
-   * (see the class contract), so it has no cheap way to know the current fill short of a full table
-   * scan; growing only when {@link #insert} reports "full" is the only trigger available without
-   * one. {@link #DEFAULT_LOAD_FACTOR} and {@link #LOW_LOAD_FACTOR}'s Knuth figures size a
-   * <i>fixed</i> table (via {@link #capacityFor} / {@link #create}) up front for its expected
-   * cardinality; they are not an insert-time growth trigger here. A caller that sizes up front —
-   * the expected usage — never sees the difference; one that instead leans on {@code
-   * resizingInsert} to grow an under-sized table from scratch runs fill up through 0.75, 0.9, and
-   * 1.0 before doubling, past where those figures stop applying. A caller that already tracks live
-   * size (as {@link D1} / {@link D2} do) can grow at a load factor of its own choosing instead.
-   */
-  @Nonnull
-  public static <E extends Entry> E[] resizingInsert(@Nonnull E[] table, @Nonnull E entry) {
-    E[] t = table;
-    while (!insert(t, entry)) {
-      t = resize(t); // one doubling always suffices; the loop is belt-and-braces
+
+    /**
+     * {@link #resizingInsert(Entry[], Entry)} for any entry type (home via {@link
+     * HashStrategy#hashOf}). Same grows-unboundedly caution and same probe-to-full growth trigger.
+     */
+    @StrategyConsumer
+    @Nonnull
+    public static <E> E[] resizingInsert(@Nonnull E[] table, @Nonnull E entry, @Nonnull HashStrategy<E> hashStrat) {
+        E[] t = table;
+        while (!insert(t, entry, hashStrat)) {
+            t = resize(t, hashStrat);
+        }
+        return t;
     }
-    return t;
-  }
-
-  /**
-   * {@link #resizingInsert(Entry[], Entry)} for any entry type (home via {@link
-   * HashStrategy#hashOf}). Same grows-unboundedly caution and same probe-to-full growth trigger.
-   */
-  @StrategyConsumer
-  @Nonnull
-  public static <E> E[] resizingInsert(
-      @Nonnull E[] table, @Nonnull E entry, @Nonnull HashStrategy<E> hashStrat) {
-    E[] t = table;
-    while (!insert(t, entry, hashStrat)) {
-      t = resize(t, hashStrat);
+
+    /** Applies {@code consumer} to every entry in {@code table} (skipping empty slots); any order. */
+    public static <E> void forEach(@Nonnull E[] table, @Nonnull Consumer<? super E> consumer) {
+        for (final E e : table) {
+            if (e != null) {
+                consumer.accept(e);
+            }
+        }
     }
-    return t;
-  }
-
-  /** Applies {@code consumer} to every entry in {@code table} (skipping empty slots); any order. */
-  public static <E> void forEach(@Nonnull E[] table, @Nonnull Consumer<? super E> consumer) {
-    for (final E e : table) {
-      if (e != null) {
-        consumer.accept(e);
-      }
+
+    /**
+     * Context-passing {@link #forEach(Object[], Consumer)}: pair a non-capturing {@link BiConsumer}
+     * (typically a {@code static final}) with side-band {@code context} to avoid a per-call closure.
+     */
+    public static <C, E> void forEach(
+            @Nonnull E[] table, C context, @Nonnull BiConsumer<? super C, ? super E> consumer) {
+        for (final E e : table) {
+            if (e != null) {
+                consumer.accept(context, e);
+            }
+        }
     }
-  }
-
-  /**
-   * Context-passing {@link #forEach(Object[], Consumer)}: pair a non-capturing {@link BiConsumer}
-   * (typically a {@code static final}) with side-band {@code context} to avoid a per-call closure.
-   */
-  public static <C, E> void forEach(
-      @Nonnull E[] table, C context, @Nonnull BiConsumer<? super C, ? super E> consumer) {
-    for (final E e : table) {
-      if (e != null) {
-        consumer.accept(context, e);
-      }
+
+    /**
+     * Read-only iterator over the entries sharing {@code hash} — walks the probe run from {@code
+     * hash}'s home and yields each entry whose {@link HashStrategy#hashOf} equals {@code hash},
+     * stopping at the first empty slot (the FlatHashtable analogue of walking a chained bucket).
+     *
+     * <p>This general overload holds the strategy in a field, so {@code hashOf} is called virtually
+     * (not inlined). For {@link Entry}-based tables prefer {@link #iterator(Entry[], long)}, which
+     * specializes the traversal so {@code hashOf} inlines. (Still pass a {@code static final}
+     * strategy to avoid a per-call allocation.)
+     */
+    @Nonnull
+    public static <E> Iterator<E> iterator(@Nonnull E[] table, long hash, @Nonnull HashStrategy<E> hashStrat) {
+        return new StrategyHashIterator<>(table, hash, hashStrat);
     }
-  }
-
-  /**
-   * Read-only iterator over the entries sharing {@code hash} — walks the probe run from {@code
-   * hash}'s home and yields each entry whose {@link HashStrategy#hashOf} equals {@code hash},
-   * stopping at the first empty slot (the FlatHashtable analogue of walking a chained bucket).
-   *
-   * <p>This general overload holds the strategy in a field, so {@code hashOf} is called virtually
-   * (not inlined). For {@link Entry}-based tables prefer {@link #iterator(Entry[], long)}, which
-   * specializes the traversal so {@code hashOf} inlines. (Still pass a {@code static final}
-   * strategy to avoid a per-call allocation.)
-   */
-  @Nonnull
-  public static <E> Iterator<E> iterator(
-      @Nonnull E[] table, long hash, @Nonnull HashStrategy<E> hashStrat) {
-    return new StrategyHashIterator<>(table, hash, hashStrat);
-  }
-
-  /**
-   * {@link #iterator(Object[], long, HashStrategy)} for {@link Entry}-based tables: the filter hash
-   * comes from {@link Entry#hash}, so no strategy is needed. Returns a specialized iterator that
-   * feeds the {@link Entry}-hash strategy singleton into the shared traversal template as a <i>
-   * constant</i>, so {@code hashOf} devirtualizes to {@code entry.hash} and inlines — a monomorphic
-   * call site thus gets a devirtualized pull-based traversal while keeping the plain {@link
-   * Iterator} API and reusing the same core (see the {@link HashIterator} base). Same {@code
-   * Iterator<E>} return type as the general overload; the call site specializes by its own
-   * monomorphism.
-   */
-  @Nonnull
-  public static <E extends Entry> Iterator<E> iterator(@Nonnull E[] table, long hash) {
-    return new EntryHashIterator<>(table, hash);
-  }
-
-  /**
-   * Shared iterator core. The traversal lives in {@code final} template methods parameterized by
-   * the strategy ({@code advanceWith}/{@code nextWith}); each concrete subclass implements {@link
-   * #next} by handing in its strategy source — a field (general) or a {@code static final} constant
-   * (Entry). Feeding a constant into the {@code final} template is what lets the specialized
-   * subclass inline {@code hashOf} (the CacheHelper static-polymorphism move), so the two share all
-   * the mechanism yet differ only in whether the strategy call devirtualizes.
-   */
-  private abstract static class HashIterator<E> implements Iterator<E> {
-    final E[] table;
-    final long hash;
-    final int start;
-    int i;
-    boolean done;
-    E lookahead;
-
-    HashIterator(E[] table, long hash) {
-      this.table = table;
-      this.hash = hash;
-      this.start = home(hash, table.length - 1);
-      this.i = this.start;
-      // Priming advance() is left to the concrete ctor: it needs the subclass's strategy source,
-      // which isn't set until after super().
+
+    /**
+     * {@link #iterator(Object[], long, HashStrategy)} for {@link Entry}-based tables: the filter hash
+     * comes from {@link Entry#hash}, so no strategy is needed. Returns a specialized iterator that
+     * feeds the {@link Entry}-hash strategy singleton into the shared traversal template as a <i>
+     * constant</i>, so {@code hashOf} devirtualizes to {@code entry.hash} and inlines — a monomorphic
+     * call site thus gets a devirtualized pull-based traversal while keeping the plain {@link
+     * Iterator} API and reusing the same core (see the {@link HashIterator} base). Same {@code
+     * Iterator<E>} return type as the general overload; the call site specializes by its own
+     * monomorphism.
+     */
+    @Nonnull
+    public static <E extends Entry> Iterator<E> iterator(@Nonnull E[] table, long hash) {
+        return new EntryHashIterator<>(table, hash);
     }
 
     /**
-     * Template traversal core, parameterized by the strategy. {@code final} so that a subclass
-     * passing a constant strategy inlines this and devirtualizes {@code hashOf}.
+     * Shared iterator core. The traversal lives in {@code final} template methods parameterized by
+     * the strategy ({@code advanceWith}/{@code nextWith}); each concrete subclass implements {@link
+     * #next} by handing in its strategy source — a field (general) or a {@code static final} constant
+     * (Entry). Feeding a constant into the {@code final} template is what lets the specialized
+     * subclass inline {@code hashOf} (the CacheHelper static-polymorphism move), so the two share all
+     * the mechanism yet differ only in whether the strategy call devirtualizes.
      */
-    final void advanceWith(HashStrategy<E> hashStrat) {
-      lookahead = null;
-      if (done) {
-        return;
-      }
-      final int mask = table.length - 1;
-      for (; ; ) {
-        final E e = table[i];
-        if (e == null) {
-          done = true; // probe run ends at the first empty slot
-          return;
+    private abstract static class HashIterator<E> implements Iterator<E> {
+        final E[] table;
+        final long hash;
+        final int start;
+        int i;
+        boolean done;
+        E lookahead;
+
+        HashIterator(E[] table, long hash) {
+            this.table = table;
+            this.hash = hash;
+            this.start = home(hash, table.length - 1);
+            this.i = this.start;
+            // Priming advance() is left to the concrete ctor: it needs the subclass's strategy source,
+            // which isn't set until after super().
         }
-        final boolean match = hashStrat.hashOf(e) == hash;
-        i = (i + 1) & mask;
-        final boolean wrapped = (i == start);
-        if (match) {
-          lookahead = e;
-          done = wrapped;
-          return;
+
+        /**
+         * Template traversal core, parameterized by the strategy. {@code final} so that a subclass
+         * passing a constant strategy inlines this and devirtualizes {@code hashOf}.
+         */
+        final void advanceWith(HashStrategy<E> hashStrat) {
+            lookahead = null;
+            if (done) {
+                return;
+            }
+            final int mask = table.length - 1;
+            for (; ; ) {
+                final E e = table[i];
+                if (e == null) {
+                    done = true; // probe run ends at the first empty slot
+                    return;
+                }
+                final boolean match = hashStrat.hashOf(e) == hash;
+                i = (i + 1) & mask;
+                final boolean wrapped = (i == start);
+                if (match) {
+                    lookahead = e;
+                    done = wrapped;
+                    return;
+                }
+                if (wrapped) {
+                    done = true; // walked the whole table without an empty slot
+                    return;
+                }
+            }
         }
-        if (wrapped) {
-          done = true; // walked the whole table without an empty slot
-          return;
+
+        final E nextWith(HashStrategy<E> hashStrat) {
+            final E e = lookahead;
+            if (e == null) {
+                throw new NoSuchElementException();
+            }
+            advanceWith(hashStrat);
+            return e;
         }
-      }
-    }
 
-    final E nextWith(HashStrategy<E> hashStrat) {
-      final E e = lookahead;
-      if (e == null) {
-        throw new NoSuchElementException();
-      }
-      advanceWith(hashStrat);
-      return e;
-    }
+        @Override
+        public final boolean hasNext() {
+            return lookahead != null;
+        }
 
-    @Override
-    public final boolean hasNext() {
-      return lookahead != null;
+        // Abstract so each subclass injects its own strategy source into nextWith(); that binding is
+        // what lets the Entry variant inline hashOf while the general one stays virtual.
+        @Override
+        public abstract E next();
     }
 
-    // Abstract so each subclass injects its own strategy source into nextWith(); that binding is
-    // what lets the Entry variant inline hashOf while the general one stays virtual.
-    @Override
-    public abstract E next();
-  }
-
-  /** General iterator: strategy held in a field, so {@code hashOf} stays a virtual call. */
-  private static final class StrategyHashIterator<E> extends HashIterator<E> {
-    // Dynamic dispatch on purpose: general iterator fallback partner to EntryHashIterator
-    // (see Strategy's Checker contract).
-    private final HashStrategy<E> hashStrat;
-
-    StrategyHashIterator(E[] table, long hash, HashStrategy<E> hashStrat) {
-      super(table, hash);
-      this.hashStrat = hashStrat;
-      advanceWith(hashStrat); // prime
-    }
+    /** General iterator: strategy held in a field, so {@code hashOf} stays a virtual call. */
+    private static final class StrategyHashIterator<E> extends HashIterator<E> {
+        // Dynamic dispatch on purpose: general iterator fallback partner to EntryHashIterator
+        // (see Strategy's Checker contract).
+        private final HashStrategy<E> hashStrat;
 
-    @Override
-    public E next() {
-      return nextWith(hashStrat);
+        StrategyHashIterator(E[] table, long hash, HashStrategy<E> hashStrat) {
+            super(table, hash);
+            this.hashStrat = hashStrat;
+            advanceWith(hashStrat); // prime
+        }
+
+        @Override
+        public E next() {
+            return nextWith(hashStrat);
+        }
     }
-  }
-
-  /**
-   * Entry iterator: feeds the constant {@link #ENTRY_HASH} singleton, so {@code hashOf} inlines to
-   * {@code entry.hash}.
-   */
-  private static final class EntryHashIterator<E extends Entry> extends HashIterator<E> {
-    EntryHashIterator(E[] table, long hash) {
-      super(table, hash);
-      advanceWith(entryHash()); // prime with the constant
+
+    /**
+     * Entry iterator: feeds the constant {@link #ENTRY_HASH} singleton, so {@code hashOf} inlines to
+     * {@code entry.hash}.
+     */
+    private static final class EntryHashIterator<E extends Entry> extends HashIterator<E> {
+        EntryHashIterator(E[] table, long hash) {
+            super(table, hash);
+            advanceWith(entryHash()); // prime with the constant
+        }
+
+        @Override
+        public E next() {
+            return nextWith(entryHash());
+        }
     }
 
-    @Override
-    public E next() {
-      return nextWith(entryHash());
+    /**
+     * Stateless {@link HashStrategy} that reads the cached {@link Entry#hash} — the constant fed into
+     * the Entry iterator template so {@code hashOf} devirtualizes.
+     */
+    private static final HashStrategy<Entry> ENTRY_HASH = entry -> entry.hash;
+
+    @SuppressWarnings("unchecked")
+    private static <E> HashStrategy<E> entryHash() {
+        return (HashStrategy<E>) ENTRY_HASH; // safe: hashOf only reads Entry.hash, present on all E
     }
-  }
-
-  /**
-   * Stateless {@link HashStrategy} that reads the cached {@link Entry#hash} — the constant fed into
-   * the Entry iterator template so {@code hashOf} devirtualizes.
-   */
-  private static final HashStrategy<Entry> ENTRY_HASH = entry -> entry.hash;
-
-  @SuppressWarnings("unchecked")
-  private static <E> HashStrategy<E> entryHash() {
-    return (HashStrategy<E>) ENTRY_HASH; // safe: hashOf only reads Entry.hash, present on all E
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/HashingUtils.java b/internal-api/src/main/java/datadog/trace/util/HashingUtils.java
index 4d7c405828d..7ac77dbdcb9 100644
--- a/internal-api/src/main/java/datadog/trace/util/HashingUtils.java
+++ b/internal-api/src/main/java/datadog/trace/util/HashingUtils.java
@@ -9,165 +9,165 @@
  * <code>hash</code> that take many argument lengths to avoid var-args allocation.
  */
 public final class HashingUtils {
-  private HashingUtils() {}
-
-  public static final int hashCode(@Nullable Object obj) {
-    return obj != null ? obj.hashCode() : 0;
-  }
-
-  public static final int hash(boolean value) {
-    return Boolean.hashCode(value);
-  }
-
-  public static final int hash(char value) {
-    return Character.hashCode(value);
-  }
-
-  public static final int hash(byte value) {
-    return Byte.hashCode(value);
-  }
-
-  public static final int hash(short value) {
-    return Short.hashCode(value);
-  }
-
-  public static final int hash(int value) {
-    return Integer.hashCode(value);
-  }
-
-  public static final int hash(long value) {
-    return Long.hashCode(value);
-  }
-
-  public static final int hash(float value) {
-    return Float.hashCode(value);
-  }
-
-  public static final int hash(double value) {
-    return Double.hashCode(value);
-  }
-
-  public static final int hash(Object obj) {
-    return obj != null ? obj.hashCode() : 0;
-  }
-
-  public static final int hash(Object obj0, Object obj1) {
-    return hash(hash(obj0), hash(obj1));
-  }
-
-  public static final int hash(int hash0, int hash1) {
-    return 31 * hash0 + hash1;
-  }
-
-  public static final int hash(Object obj0, Object obj1, Object obj2) {
-    return hash(hashCode(obj0), hashCode(obj1), hashCode(obj2));
-  }
-
-  public static final int hash(int hash0, int hash1, int hash2) {
-    // DQH - Micro-optimizing, 31 * 31 will constant fold
-    // Since there are multiple execution ports for load & store,
-    // this will make good use of the core.
-    return 31 * 31 * hash0 + 31 * hash1 + hash2;
-  }
-
-  public static final int hash(Object obj0, Object obj1, Object obj2, Object obj3) {
-    return hash(hashCode(obj0), hashCode(obj1), hashCode(obj2), hashCode(obj3));
-  }
-
-  public static final int hash(int hash0, int hash1, int hash2, int hash3) {
-    // DQH - Micro-optimizing, 31 * 31 will constant fold
-    // Since there are multiple execution ports for load & store,
-    // this will make good use of the core.
-    return 31 * 31 * 31 * hash0 + 31 * 31 * hash1 + 31 * hash2 + hash3;
-  }
-
-  public static final int hash(Object obj0, Object obj1, Object obj2, Object obj3, Object obj4) {
-    return hash(hashCode(obj0), hashCode(obj1), hashCode(obj2), hashCode(obj3), hashCode(obj4));
-  }
-
-  public static final int hash(int hash0, int hash1, int hash2, int hash3, int hash4) {
-    // DQH - Micro-optimizing, 31 * 31 will constant fold
-    // Since there are multiple execution ports for load & store,
-    // this will make good use of the core.
-    return 31 * 31 * 31 * 31 * hash0 + 31 * 31 * 31 * hash1 + 31 * 31 * hash2 + 31 * hash3 + hash4;
-  }
-
-  @Deprecated
-  public static final int hash(int[] hashes) {
-    int result = 0;
-    for (int hash : hashes) {
-      result = addToHash(result, hash);
-    }
-    return result;
-  }
-
-  public static final int addToHash(int hash, int value) {
-    return 31 * hash + value;
-  }
-
-  public static final int addToHash(int hash, @Nullable Object obj) {
-    return addToHash(hash, hashCode(obj));
-  }
-
-  public static final int addToHash(int hash, boolean value) {
-    return addToHash(hash, Boolean.hashCode(value));
-  }
-
-  public static final int addToHash(int hash, char value) {
-    return addToHash(hash, Character.hashCode(value));
-  }
-
-  public static final int addToHash(int hash, byte value) {
-    return addToHash(hash, Byte.hashCode(value));
-  }
-
-  public static final int addToHash(int hash, short value) {
-    return addToHash(hash, Short.hashCode(value));
-  }
-
-  public static final int addToHash(int hash, long value) {
-    return addToHash(hash, Long.hashCode(value));
-  }
-
-  public static final int addToHash(int hash, float value) {
-    return addToHash(hash, Float.hashCode(value));
-  }
-
-  public static final int addToHash(int hash, double value) {
-    return addToHash(hash, Double.hashCode(value));
-  }
-
-  /** Folds {@code arr[0..len)}; the array must be non-null, but its elements may be null. */
-  public static final int addToHash(int hash, @Nonnull Object[] arr, int len) {
-    for (int i = 0; i < len; i++) {
-      hash = addToHash(hash, arr[i]);
-    }
-    return hash;
-  }
-
-  public static final int addToHash(int hash, @Nonnull Object[] arr) {
-    return addToHash(hash, arr, arr.length);
-  }
-
-  public static final int hash(Iterable<?> objs) {
-    int result = 0;
-    for (Object obj : objs) {
-      result = addToHash(result, obj);
-    }
-    return result;
-  }
-
-  /**
-   * Calling this var-arg version can result in large amounts of allocation (see HashingBenchmark)
-   * Rather than calliing this method, add another override of hash that handles a larger number of
-   * arguments or use calls to addToHash.
-   */
-  @Deprecated
-  public static final int hash(Object[] objs) {
-    int result = 0;
-    for (Object obj : objs) {
-      result = addToHash(result, obj);
-    }
-    return result;
-  }
+    private HashingUtils() {}
+
+    public static final int hashCode(@Nullable Object obj) {
+        return obj != null ? obj.hashCode() : 0;
+    }
+
+    public static final int hash(boolean value) {
+        return Boolean.hashCode(value);
+    }
+
+    public static final int hash(char value) {
+        return Character.hashCode(value);
+    }
+
+    public static final int hash(byte value) {
+        return Byte.hashCode(value);
+    }
+
+    public static final int hash(short value) {
+        return Short.hashCode(value);
+    }
+
+    public static final int hash(int value) {
+        return Integer.hashCode(value);
+    }
+
+    public static final int hash(long value) {
+        return Long.hashCode(value);
+    }
+
+    public static final int hash(float value) {
+        return Float.hashCode(value);
+    }
+
+    public static final int hash(double value) {
+        return Double.hashCode(value);
+    }
+
+    public static final int hash(Object obj) {
+        return obj != null ? obj.hashCode() : 0;
+    }
+
+    public static final int hash(Object obj0, Object obj1) {
+        return hash(hash(obj0), hash(obj1));
+    }
+
+    public static final int hash(int hash0, int hash1) {
+        return 31 * hash0 + hash1;
+    }
+
+    public static final int hash(Object obj0, Object obj1, Object obj2) {
+        return hash(hashCode(obj0), hashCode(obj1), hashCode(obj2));
+    }
+
+    public static final int hash(int hash0, int hash1, int hash2) {
+        // DQH - Micro-optimizing, 31 * 31 will constant fold
+        // Since there are multiple execution ports for load & store,
+        // this will make good use of the core.
+        return 31 * 31 * hash0 + 31 * hash1 + hash2;
+    }
+
+    public static final int hash(Object obj0, Object obj1, Object obj2, Object obj3) {
+        return hash(hashCode(obj0), hashCode(obj1), hashCode(obj2), hashCode(obj3));
+    }
+
+    public static final int hash(int hash0, int hash1, int hash2, int hash3) {
+        // DQH - Micro-optimizing, 31 * 31 will constant fold
+        // Since there are multiple execution ports for load & store,
+        // this will make good use of the core.
+        return 31 * 31 * 31 * hash0 + 31 * 31 * hash1 + 31 * hash2 + hash3;
+    }
+
+    public static final int hash(Object obj0, Object obj1, Object obj2, Object obj3, Object obj4) {
+        return hash(hashCode(obj0), hashCode(obj1), hashCode(obj2), hashCode(obj3), hashCode(obj4));
+    }
+
+    public static final int hash(int hash0, int hash1, int hash2, int hash3, int hash4) {
+        // DQH - Micro-optimizing, 31 * 31 will constant fold
+        // Since there are multiple execution ports for load & store,
+        // this will make good use of the core.
+        return 31 * 31 * 31 * 31 * hash0 + 31 * 31 * 31 * hash1 + 31 * 31 * hash2 + 31 * hash3 + hash4;
+    }
+
+    @Deprecated
+    public static final int hash(int[] hashes) {
+        int result = 0;
+        for (int hash : hashes) {
+            result = addToHash(result, hash);
+        }
+        return result;
+    }
+
+    public static final int addToHash(int hash, int value) {
+        return 31 * hash + value;
+    }
+
+    public static final int addToHash(int hash, @Nullable Object obj) {
+        return addToHash(hash, hashCode(obj));
+    }
+
+    public static final int addToHash(int hash, boolean value) {
+        return addToHash(hash, Boolean.hashCode(value));
+    }
+
+    public static final int addToHash(int hash, char value) {
+        return addToHash(hash, Character.hashCode(value));
+    }
+
+    public static final int addToHash(int hash, byte value) {
+        return addToHash(hash, Byte.hashCode(value));
+    }
+
+    public static final int addToHash(int hash, short value) {
+        return addToHash(hash, Short.hashCode(value));
+    }
+
+    public static final int addToHash(int hash, long value) {
+        return addToHash(hash, Long.hashCode(value));
+    }
+
+    public static final int addToHash(int hash, float value) {
+        return addToHash(hash, Float.hashCode(value));
+    }
+
+    public static final int addToHash(int hash, double value) {
+        return addToHash(hash, Double.hashCode(value));
+    }
+
+    /** Folds {@code arr[0..len)}; the array must be non-null, but its elements may be null. */
+    public static final int addToHash(int hash, @Nonnull Object[] arr, int len) {
+        for (int i = 0; i < len; i++) {
+            hash = addToHash(hash, arr[i]);
+        }
+        return hash;
+    }
+
+    public static final int addToHash(int hash, @Nonnull Object[] arr) {
+        return addToHash(hash, arr, arr.length);
+    }
+
+    public static final int hash(Iterable<?> objs) {
+        int result = 0;
+        for (Object obj : objs) {
+            result = addToHash(result, obj);
+        }
+        return result;
+    }
+
+    /**
+     * Calling this var-arg version can result in large amounts of allocation (see HashingBenchmark)
+     * Rather than calliing this method, add another override of hash that handles a larger number of
+     * arguments or use calls to addToHash.
+     */
+    @Deprecated
+    public static final int hash(Object[] objs) {
+        int result = 0;
+        for (Object obj : objs) {
+            result = addToHash(result, obj);
+        }
+        return result;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/Hashtable.java b/internal-api/src/main/java/datadog/trace/util/Hashtable.java
index a2fbfc62ad1..29cd9d8dd90 100644
--- a/internal-api/src/main/java/datadog/trace/util/Hashtable.java
+++ b/internal-api/src/main/java/datadog/trace/util/Hashtable.java
@@ -29,893 +29,873 @@
  * {@link D1}, {@link D2}, and (for higher-arity callers) {@link Support}-driven custom tables.
  */
 public final class Hashtable {
-  private Hashtable() {}
-
-  /**
-   * Internal base class for entries. Stores the precomputed 64-bit keyHash and the chain-next
-   * pointer used to link colliding entries within a single bucket.
-   *
-   * <p>Subclasses add the actual key field(s) and a {@code matches(...)} method tailored to their
-   * key arity. See {@link D1.Entry} and {@link D2.Entry}; for higher arities, client code can
-   * subclass this directly and use {@link Support} to drive the table mechanics.
-   */
-  public abstract static class Entry {
-    public final long keyHash;
-    private Entry next = null;
-
-    protected Entry(long keyHash) {
-      this.keyHash = keyHash;
-    }
+    private Hashtable() {}
 
-    public final <TEntry extends Entry> void setNext(TEntry next) {
-      this.next = next;
-    }
+    /**
+     * Internal base class for entries. Stores the precomputed 64-bit keyHash and the chain-next
+     * pointer used to link colliding entries within a single bucket.
+     *
+     * <p>Subclasses add the actual key field(s) and a {@code matches(...)} method tailored to their
+     * key arity. See {@link D1.Entry} and {@link D2.Entry}; for higher arities, client code can
+     * subclass this directly and use {@link Support} to drive the table mechanics.
+     */
+    public abstract static class Entry {
+        public final long keyHash;
+        private Entry next = null;
 
-    @SuppressWarnings("unchecked")
-    public final <TEntry extends Entry> TEntry next() {
-      return (TEntry) this.next;
+        protected Entry(long keyHash) {
+            this.keyHash = keyHash;
+        }
+
+        public final <TEntry extends Entry> void setNext(TEntry next) {
+            this.next = next;
+        }
+
+        @SuppressWarnings("unchecked")
+        public final <TEntry extends Entry> TEntry next() {
+            return (TEntry) this.next;
+        }
     }
-  }
-
-  /**
-   * Single-key open hash table with chaining.
-   *
-   * <p>The user supplies an {@link D1.Entry} subclass that carries the key and whatever value
-   * fields they want to mutate in place, then instantiates this class over that entry type. The
-   * main advantage over {@code HashMap<K, V>} is that mutating an existing entry's value fields
-   * requires no allocation: call {@link #get} once and write directly to the returned entry's
-   * fields. For counter-style workloads this can be several times faster than {@code HashMap<K,
-   * Long>} and produces effectively zero GC pressure.
-   *
-   * <p>Capacity is fixed at construction. The table does not resize, so the caller is responsible
-   * for choosing a capacity appropriate to the working set. Actual bucket-array length is rounded
-   * up to the next power of two.
-   *
-   * <p>Null keys are permitted; they collapse to a single bucket via the sentinel hash {@link
-   * Long#MIN_VALUE} defined in {@link D1.Entry#hash}.
-   *
-   * <p><b>Not thread-safe.</b> Concurrent access (including mixing reads with writes) requires
-   * external synchronization.
-   *
-   * @param <K> the key type
-   * @param <TEntry> the user's {@link D1.Entry D1.Entry&lt;K&gt;} subclass
-   */
-  public static final class D1<K, TEntry extends D1.Entry<K>> {
+
     /**
-     * Abstract base for {@link D1} entries. Subclass to add value fields you wish to mutate in
-     * place after retrieving the entry via {@link D1#get}.
+     * Single-key open hash table with chaining.
      *
-     * <p>The key is captured at construction and stored alongside its precomputed 64-bit hash.
-     * {@link #matches(Object)} uses {@link Objects#equals} by default; override if a different
-     * equality semantics is needed (e.g. reference equality for interned keys).
+     * <p>The user supplies an {@link D1.Entry} subclass that carries the key and whatever value
+     * fields they want to mutate in place, then instantiates this class over that entry type. The
+     * main advantage over {@code HashMap<K, V>} is that mutating an existing entry's value fields
+     * requires no allocation: call {@link #get} once and write directly to the returned entry's
+     * fields. For counter-style workloads this can be several times faster than {@code HashMap<K,
+     * Long>} and produces effectively zero GC pressure.
+     *
+     * <p>Capacity is fixed at construction. The table does not resize, so the caller is responsible
+     * for choosing a capacity appropriate to the working set. Actual bucket-array length is rounded
+     * up to the next power of two.
+     *
+     * <p>Null keys are permitted; they collapse to a single bucket via the sentinel hash {@link
+     * Long#MIN_VALUE} defined in {@link D1.Entry#hash}.
+     *
+     * <p><b>Not thread-safe.</b> Concurrent access (including mixing reads with writes) requires
+     * external synchronization.
      *
      * @param <K> the key type
+     * @param <TEntry> the user's {@link D1.Entry D1.Entry&lt;K&gt;} subclass
      */
-    public abstract static class Entry<K> extends Hashtable.Entry {
-      final K key;
-
-      protected Entry(K key) {
-        super(hash(key));
-        this.key = key;
-      }
-
-      /** The key this entry was created with. */
-      public K key() {
-        return this.key;
-      }
-
-      public boolean matches(Object key) {
-        return Objects.equals(this.key, key);
-      }
-
-      /**
-       * Returns the 64-bit lookup hash for {@code key}. Null keys map to {@link Long#MIN_VALUE} so
-       * that they don't collide with a real key that hashes to 0 (e.g. {@code
-       * Integer.hashCode(0)}). The {@code Long.MIN_VALUE} sentinel is safe against any {@code
-       * int}-valued {@code hashCode()} since those widen to a long in the range {@code
-       * [Integer.MIN_VALUE, Integer.MAX_VALUE]}; real-key collisions in chains are resolved by
-       * {@link #matches(Object)}.
-       */
-      public static long hash(Object key) {
-        return (key == null) ? Long.MIN_VALUE : key.hashCode();
-      }
-    }
+    public static final class D1<K, TEntry extends D1.Entry<K>> {
+        /**
+         * Abstract base for {@link D1} entries. Subclass to add value fields you wish to mutate in
+         * place after retrieving the entry via {@link D1#get}.
+         *
+         * <p>The key is captured at construction and stored alongside its precomputed 64-bit hash.
+         * {@link #matches(Object)} uses {@link Objects#equals} by default; override if a different
+         * equality semantics is needed (e.g. reference equality for interned keys).
+         *
+         * @param <K> the key type
+         */
+        public abstract static class Entry<K> extends Hashtable.Entry {
+            final K key;
+
+            protected Entry(K key) {
+                super(hash(key));
+                this.key = key;
+            }
+
+            /** The key this entry was created with. */
+            public K key() {
+                return this.key;
+            }
+
+            public boolean matches(Object key) {
+                return Objects.equals(this.key, key);
+            }
+
+            /**
+             * Returns the 64-bit lookup hash for {@code key}. Null keys map to {@link Long#MIN_VALUE} so
+             * that they don't collide with a real key that hashes to 0 (e.g. {@code
+             * Integer.hashCode(0)}). The {@code Long.MIN_VALUE} sentinel is safe against any {@code
+             * int}-valued {@code hashCode()} since those widen to a long in the range {@code
+             * [Integer.MIN_VALUE, Integer.MAX_VALUE]}; real-key collisions in chains are resolved by
+             * {@link #matches(Object)}.
+             */
+            public static long hash(Object key) {
+                return (key == null) ? Long.MIN_VALUE : key.hashCode();
+            }
+        }
 
-    // Package-private so iterator tests in the same package can drive Support.bucketIterator and
-    // friends directly against the table's bucket array.
-    final Hashtable.Entry[] buckets;
-    private int size;
+        // Package-private so iterator tests in the same package can drive Support.bucketIterator and
+        // friends directly against the table's bucket array.
+        final Hashtable.Entry[] buckets;
+        private int size;
 
-    public D1(int capacity) {
-      this.buckets = Support.create(capacity);
-      this.size = 0;
-    }
+        public D1(int capacity) {
+            this.buckets = Support.create(capacity);
+            this.size = 0;
+        }
 
-    public int size() {
-      return this.size;
-    }
+        public int size() {
+            return this.size;
+        }
 
-    public TEntry get(K key) {
-      long keyHash = D1.Entry.hash(key);
-      for (TEntry te = Support.bucket(this.buckets, keyHash); te != null; te = te.next()) {
-        if (te.keyHash == keyHash && te.matches(key)) {
-          return te;
+        public TEntry get(K key) {
+            long keyHash = D1.Entry.hash(key);
+            for (TEntry te = Support.bucket(this.buckets, keyHash); te != null; te = te.next()) {
+                if (te.keyHash == keyHash && te.matches(key)) {
+                    return te;
+                }
+            }
+            return null;
         }
-      }
-      return null;
-    }
 
-    public TEntry remove(K key) {
-      long keyHash = D1.Entry.hash(key);
+        public TEntry remove(K key) {
+            long keyHash = D1.Entry.hash(key);
 
-      for (MutatingBucketIterator<TEntry> iter =
-              Support.mutatingBucketIterator(this.buckets, keyHash);
-          iter.hasNext(); ) {
-        TEntry curEntry = iter.next();
+            for (MutatingBucketIterator<TEntry> iter = Support.mutatingBucketIterator(this.buckets, keyHash);
+                    iter.hasNext(); ) {
+                TEntry curEntry = iter.next();
 
-        if (curEntry.matches(key)) {
-          iter.remove();
-          this.size -= 1;
-          return curEntry;
+                if (curEntry.matches(key)) {
+                    iter.remove();
+                    this.size -= 1;
+                    return curEntry;
+                }
+            }
+
+            return null;
         }
-      }
 
-      return null;
-    }
+        public void insert(TEntry newEntry) {
+            Support.insertHeadEntry(this.buckets, newEntry.keyHash, newEntry);
+            this.size += 1;
+        }
 
-    public void insert(TEntry newEntry) {
-      Support.insertHeadEntry(this.buckets, newEntry.keyHash, newEntry);
-      this.size += 1;
-    }
+        public TEntry insertOrReplace(TEntry newEntry) {
+            for (MutatingBucketIterator<TEntry> iter = Support.mutatingBucketIterator(this.buckets, newEntry.keyHash);
+                    iter.hasNext(); ) {
+                TEntry curEntry = iter.next();
 
-    public TEntry insertOrReplace(TEntry newEntry) {
-      for (MutatingBucketIterator<TEntry> iter =
-              Support.mutatingBucketIterator(this.buckets, newEntry.keyHash);
-          iter.hasNext(); ) {
-        TEntry curEntry = iter.next();
+                if (curEntry.matches(newEntry.key)) {
+                    iter.replace(newEntry);
+                    return curEntry;
+                }
+            }
 
-        if (curEntry.matches(newEntry.key)) {
-          iter.replace(newEntry);
-          return curEntry;
+            Support.insertHeadEntry(this.buckets, newEntry.keyHash, newEntry);
+            this.size += 1;
+            return null;
         }
-      }
 
-      Support.insertHeadEntry(this.buckets, newEntry.keyHash, newEntry);
-      this.size += 1;
-      return null;
-    }
+        /**
+         * Returns the entry for {@code key}, building one via {@code creator} if absent. Computes the
+         * hash once and reuses it for both the lookup and (on miss) the insert -- avoids the
+         * double-hash that "{@code get}; if null then {@code insert}" would incur.
+         *
+         * <p>The {@code creator} is expected to build an entry whose {@code keyHash} equals {@link
+         * Entry#hash(Object) D1.Entry.hash(key)} -- typically by passing {@code key} to a constructor
+         * that calls {@code super(key)}. A mismatched hash will leave the new entry inserted at a
+         * bucket that future {@link #get} calls won't probe.
+         */
+        public TEntry getOrCreate(K key, Function<? super K, ? extends TEntry> creator) {
+            long keyHash = D1.Entry.hash(key);
+            for (TEntry te = Support.bucket(this.buckets, keyHash); te != null; te = te.next()) {
+                if (te.keyHash == keyHash && te.matches(key)) {
+                    return te;
+                }
+            }
+            TEntry newEntry = creator.apply(key);
+            Support.insertHeadEntry(this.buckets, newEntry.keyHash, newEntry);
+            this.size += 1;
+            return newEntry;
+        }
 
-    /**
-     * Returns the entry for {@code key}, building one via {@code creator} if absent. Computes the
-     * hash once and reuses it for both the lookup and (on miss) the insert -- avoids the
-     * double-hash that "{@code get}; if null then {@code insert}" would incur.
-     *
-     * <p>The {@code creator} is expected to build an entry whose {@code keyHash} equals {@link
-     * Entry#hash(Object) D1.Entry.hash(key)} -- typically by passing {@code key} to a constructor
-     * that calls {@code super(key)}. A mismatched hash will leave the new entry inserted at a
-     * bucket that future {@link #get} calls won't probe.
-     */
-    public TEntry getOrCreate(K key, Function<? super K, ? extends TEntry> creator) {
-      long keyHash = D1.Entry.hash(key);
-      for (TEntry te = Support.bucket(this.buckets, keyHash); te != null; te = te.next()) {
-        if (te.keyHash == keyHash && te.matches(key)) {
-          return te;
-        }
-      }
-      TEntry newEntry = creator.apply(key);
-      Support.insertHeadEntry(this.buckets, newEntry.keyHash, newEntry);
-      this.size += 1;
-      return newEntry;
-    }
+        public void clear() {
+            Support.clear(this.buckets);
+            this.size = 0;
+        }
 
-    public void clear() {
-      Support.clear(this.buckets);
-      this.size = 0;
-    }
+        public void forEach(Consumer<? super TEntry> consumer) {
+            Support.forEach(this.buckets, consumer);
+        }
 
-    public void forEach(Consumer<? super TEntry> consumer) {
-      Support.forEach(this.buckets, consumer);
+        /**
+         * Context-passing forEach. Useful for callers that want to avoid a capturing-lambda allocation
+         * -- pass a non-capturing {@link BiConsumer} (typically a {@code static final}) plus whatever
+         * side-band state it needs as {@code context}.
+         */
+        public <T> void forEach(T context, BiConsumer<? super T, ? super TEntry> consumer) {
+            Support.forEach(this.buckets, context, consumer);
+        }
     }
 
     /**
-     * Context-passing forEach. Useful for callers that want to avoid a capturing-lambda allocation
-     * -- pass a non-capturing {@link BiConsumer} (typically a {@code static final}) plus whatever
-     * side-band state it needs as {@code context}.
-     */
-    public <T> void forEach(T context, BiConsumer<? super T, ? super TEntry> consumer) {
-      Support.forEach(this.buckets, context, consumer);
-    }
-  }
-
-  /**
-   * Two-key (composite-key) hash table with chaining.
-   *
-   * <p>The user supplies a {@link D2.Entry} subclass carrying both key parts and any value fields.
-   * Compared to {@code HashMap<Pair, V>} this avoids the per-lookup {@code Pair} (or record)
-   * allocation: both key parts are passed directly through {@link #get}, {@link #remove}, {@link
-   * #insert}, and {@link #insertOrReplace}. Combined with in-place value mutation, this makes
-   * {@code D2} substantially less GC-intensive than the equivalent {@code HashMap<Pair, Long>} for
-   * counter-style workloads.
-   *
-   * <p>Capacity is fixed at construction; the table does not resize. Actual bucket-array length is
-   * rounded up to the next power of two.
-   *
-   * <p>Key parts are combined into a 64-bit hash via {@link LongHashingUtils}; see {@link
-   * D2.Entry#hash(Object, Object)}.
-   *
-   * <p><b>Not thread-safe.</b>
-   *
-   * @param <K1> first key type
-   * @param <K2> second key type
-   * @param <TEntry> the user's {@link D2.Entry D2.Entry&lt;K1, K2&gt;} subclass
-   */
-  public static final class D2<K1, K2, TEntry extends D2.Entry<K1, K2>> {
-    /**
-     * Abstract base for {@link D2} entries. Subclass to add value fields you wish to mutate in
-     * place.
+     * Two-key (composite-key) hash table with chaining.
+     *
+     * <p>The user supplies a {@link D2.Entry} subclass carrying both key parts and any value fields.
+     * Compared to {@code HashMap<Pair, V>} this avoids the per-lookup {@code Pair} (or record)
+     * allocation: both key parts are passed directly through {@link #get}, {@link #remove}, {@link
+     * #insert}, and {@link #insertOrReplace}. Combined with in-place value mutation, this makes
+     * {@code D2} substantially less GC-intensive than the equivalent {@code HashMap<Pair, Long>} for
+     * counter-style workloads.
+     *
+     * <p>Capacity is fixed at construction; the table does not resize. Actual bucket-array length is
+     * rounded up to the next power of two.
+     *
+     * <p>Key parts are combined into a 64-bit hash via {@link LongHashingUtils}; see {@link
+     * D2.Entry#hash(Object, Object)}.
      *
-     * <p>Both key parts are captured at construction and stored alongside their combined 64-bit
-     * hash. {@link #matches(Object, Object)} uses {@link Objects#equals} pairwise on the two parts.
+     * <p><b>Not thread-safe.</b>
      *
      * @param <K1> first key type
      * @param <K2> second key type
+     * @param <TEntry> the user's {@link D2.Entry D2.Entry&lt;K1, K2&gt;} subclass
      */
-    public abstract static class Entry<K1, K2> extends Hashtable.Entry {
-      final K1 key1;
-      final K2 key2;
-
-      protected Entry(K1 key1, K2 key2) {
-        super(hash(key1, key2));
-        this.key1 = key1;
-        this.key2 = key2;
-      }
-
-      /** The first key part this entry was created with. */
-      public K1 key1() {
-        return this.key1;
-      }
-
-      /** The second key part this entry was created with. */
-      public K2 key2() {
-        return this.key2;
-      }
-
-      public boolean matches(K1 key1, K2 key2) {
-        return Objects.equals(this.key1, key1) && Objects.equals(this.key2, key2);
-      }
-
-      /**
-       * Returns the 64-bit lookup hash combining both key parts via {@link
-       * LongHashingUtils#hash(Object, Object)}. Null parts contribute {@code 0} (not a sentinel,
-       * unlike {@link D1.Entry#hash(Object)}): the combined hash can collide with real-key
-       * combinations whose chained hash equals {@code hash(0, 0) = 0} or similar values. {@link
-       * #matches(Object, Object)} resolves any such collision.
-       */
-      public static long hash(Object key1, Object key2) {
-        return LongHashingUtils.hash(key1, key2);
-      }
-    }
+    public static final class D2<K1, K2, TEntry extends D2.Entry<K1, K2>> {
+        /**
+         * Abstract base for {@link D2} entries. Subclass to add value fields you wish to mutate in
+         * place.
+         *
+         * <p>Both key parts are captured at construction and stored alongside their combined 64-bit
+         * hash. {@link #matches(Object, Object)} uses {@link Objects#equals} pairwise on the two parts.
+         *
+         * @param <K1> first key type
+         * @param <K2> second key type
+         */
+        public abstract static class Entry<K1, K2> extends Hashtable.Entry {
+            final K1 key1;
+            final K2 key2;
+
+            protected Entry(K1 key1, K2 key2) {
+                super(hash(key1, key2));
+                this.key1 = key1;
+                this.key2 = key2;
+            }
+
+            /** The first key part this entry was created with. */
+            public K1 key1() {
+                return this.key1;
+            }
+
+            /** The second key part this entry was created with. */
+            public K2 key2() {
+                return this.key2;
+            }
+
+            public boolean matches(K1 key1, K2 key2) {
+                return Objects.equals(this.key1, key1) && Objects.equals(this.key2, key2);
+            }
+
+            /**
+             * Returns the 64-bit lookup hash combining both key parts via {@link
+             * LongHashingUtils#hash(Object, Object)}. Null parts contribute {@code 0} (not a sentinel,
+             * unlike {@link D1.Entry#hash(Object)}): the combined hash can collide with real-key
+             * combinations whose chained hash equals {@code hash(0, 0) = 0} or similar values. {@link
+             * #matches(Object, Object)} resolves any such collision.
+             */
+            public static long hash(Object key1, Object key2) {
+                return LongHashingUtils.hash(key1, key2);
+            }
+        }
 
-    // Package-private to match D1.buckets -- available for iterator tests in the same package.
-    final Hashtable.Entry[] buckets;
-    private int size;
+        // Package-private to match D1.buckets -- available for iterator tests in the same package.
+        final Hashtable.Entry[] buckets;
+        private int size;
 
-    public D2(int capacity) {
-      this.buckets = Support.create(capacity);
-      this.size = 0;
-    }
+        public D2(int capacity) {
+            this.buckets = Support.create(capacity);
+            this.size = 0;
+        }
 
-    public int size() {
-      return this.size;
-    }
+        public int size() {
+            return this.size;
+        }
 
-    public TEntry get(K1 key1, K2 key2) {
-      long keyHash = D2.Entry.hash(key1, key2);
-      for (TEntry te = Support.bucket(this.buckets, keyHash); te != null; te = te.next()) {
-        if (te.keyHash == keyHash && te.matches(key1, key2)) {
-          return te;
+        public TEntry get(K1 key1, K2 key2) {
+            long keyHash = D2.Entry.hash(key1, key2);
+            for (TEntry te = Support.bucket(this.buckets, keyHash); te != null; te = te.next()) {
+                if (te.keyHash == keyHash && te.matches(key1, key2)) {
+                    return te;
+                }
+            }
+            return null;
         }
-      }
-      return null;
-    }
 
-    public TEntry remove(K1 key1, K2 key2) {
-      long keyHash = D2.Entry.hash(key1, key2);
+        public TEntry remove(K1 key1, K2 key2) {
+            long keyHash = D2.Entry.hash(key1, key2);
+
+            for (MutatingBucketIterator<TEntry> iter = Support.mutatingBucketIterator(this.buckets, keyHash);
+                    iter.hasNext(); ) {
+                TEntry curEntry = iter.next();
 
-      for (MutatingBucketIterator<TEntry> iter =
-              Support.mutatingBucketIterator(this.buckets, keyHash);
-          iter.hasNext(); ) {
-        TEntry curEntry = iter.next();
+                if (curEntry.matches(key1, key2)) {
+                    iter.remove();
+                    this.size -= 1;
+                    return curEntry;
+                }
+            }
 
-        if (curEntry.matches(key1, key2)) {
-          iter.remove();
-          this.size -= 1;
-          return curEntry;
+            return null;
         }
-      }
 
-      return null;
-    }
+        public void insert(TEntry newEntry) {
+            Support.insertHeadEntry(this.buckets, newEntry.keyHash, newEntry);
+            this.size += 1;
+        }
 
-    public void insert(TEntry newEntry) {
-      Support.insertHeadEntry(this.buckets, newEntry.keyHash, newEntry);
-      this.size += 1;
-    }
+        public TEntry insertOrReplace(TEntry newEntry) {
+            for (MutatingBucketIterator<TEntry> iter = Support.mutatingBucketIterator(this.buckets, newEntry.keyHash);
+                    iter.hasNext(); ) {
+                TEntry curEntry = iter.next();
 
-    public TEntry insertOrReplace(TEntry newEntry) {
-      for (MutatingBucketIterator<TEntry> iter =
-              Support.mutatingBucketIterator(this.buckets, newEntry.keyHash);
-          iter.hasNext(); ) {
-        TEntry curEntry = iter.next();
+                if (curEntry.matches(newEntry.key1, newEntry.key2)) {
+                    iter.replace(newEntry);
+                    return curEntry;
+                }
+            }
 
-        if (curEntry.matches(newEntry.key1, newEntry.key2)) {
-          iter.replace(newEntry);
-          return curEntry;
+            Support.insertHeadEntry(this.buckets, newEntry.keyHash, newEntry);
+            this.size += 1;
+            return null;
         }
-      }
-
-      Support.insertHeadEntry(this.buckets, newEntry.keyHash, newEntry);
-      this.size += 1;
-      return null;
-    }
 
-    /**
-     * Two-key analogue of {@link D1#getOrCreate}. Computes the combined hash once and reuses it for
-     * both lookup and (on miss) insert. The {@code creator} is expected to build an entry whose
-     * {@code keyHash} equals {@link Entry#hash(Object, Object) D2.Entry.hash(key1, key2)}.
-     */
-    public TEntry getOrCreate(
-        K1 key1, K2 key2, BiFunction<? super K1, ? super K2, ? extends TEntry> creator) {
-      long keyHash = D2.Entry.hash(key1, key2);
-      for (TEntry te = Support.bucket(this.buckets, keyHash); te != null; te = te.next()) {
-        if (te.keyHash == keyHash && te.matches(key1, key2)) {
-          return te;
-        }
-      }
-      TEntry newEntry = creator.apply(key1, key2);
-      Support.insertHeadEntry(this.buckets, newEntry.keyHash, newEntry);
-      this.size += 1;
-      return newEntry;
-    }
+        /**
+         * Two-key analogue of {@link D1#getOrCreate}. Computes the combined hash once and reuses it for
+         * both lookup and (on miss) insert. The {@code creator} is expected to build an entry whose
+         * {@code keyHash} equals {@link Entry#hash(Object, Object) D2.Entry.hash(key1, key2)}.
+         */
+        public TEntry getOrCreate(K1 key1, K2 key2, BiFunction<? super K1, ? super K2, ? extends TEntry> creator) {
+            long keyHash = D2.Entry.hash(key1, key2);
+            for (TEntry te = Support.bucket(this.buckets, keyHash); te != null; te = te.next()) {
+                if (te.keyHash == keyHash && te.matches(key1, key2)) {
+                    return te;
+                }
+            }
+            TEntry newEntry = creator.apply(key1, key2);
+            Support.insertHeadEntry(this.buckets, newEntry.keyHash, newEntry);
+            this.size += 1;
+            return newEntry;
+        }
 
-    public void clear() {
-      Support.clear(this.buckets);
-      this.size = 0;
-    }
+        public void clear() {
+            Support.clear(this.buckets);
+            this.size = 0;
+        }
 
-    public void forEach(Consumer<? super TEntry> consumer) {
-      Support.forEach(this.buckets, consumer);
-    }
+        public void forEach(Consumer<? super TEntry> consumer) {
+            Support.forEach(this.buckets, consumer);
+        }
 
-    /**
-     * Context-passing forEach. Useful for callers that want to avoid a capturing-lambda allocation
-     * -- pass a non-capturing {@link BiConsumer} (typically a {@code static final}) plus whatever
-     * side-band state it needs as {@code context}.
-     */
-    public <T> void forEach(T context, BiConsumer<? super T, ? super TEntry> consumer) {
-      Support.forEach(this.buckets, context, consumer);
-    }
-  }
-
-  /**
-   * Building blocks for hash-table operations.
-   *
-   * <p>Used by {@link D1} and {@link D2}, and available to callers that want to assemble their own
-   * higher-arity table (3+ key parts) without re-implementing the bucket-array mechanics. The
-   * typical recipe:
-   *
-   * <ul>
-   *   <li>Subclass {@link Hashtable.Entry} directly, adding the key fields and a {@code
-   *       matches(...)} method of your chosen arity.
-   *   <li>Allocate a backing array with {@link #create(int)} or {@link #create(int, float)} (the
-   *       latter scales for a target load factor; see {@link #MAX_RATIO}).
-   *   <li>Use {@link #bucketIndex(Object[], long)} for the bucket lookup, {@link
-   *       #bucketIterator(Hashtable.Entry[], long)} for read-only chain walks, and {@link
-   *       #mutatingBucketIterator(Hashtable.Entry[], long)} when you also need {@code remove} /
-   *       {@code replace}.
-   *   <li>Use {@link #insertHeadEntry(Hashtable.Entry[], int, Hashtable.Entry)} to splice a new
-   *       entry as the head of a bucket chain.
-   *   <li>Iterate every entry with {@link #forEach(Hashtable.Entry[], Consumer)} or its
-   *       context-passing sibling. For full-table sweeps with {@code remove}, use {@link
-   *       #mutatingTableIterator(Hashtable.Entry[])}.
-   *   <li>Clear with {@link #clear(Hashtable.Entry[])}.
-   * </ul>
-   *
-   * <p>All bucket arrays produced by {@code create} have a power-of-two length, so {@link
-   * #bucketIndex(Object[], long)} can use a bit mask.
-   */
-  public static final class Support {
-    /**
-     * Allocates a bucket array sized to hold {@code requestedSize} entries. Returned length is
-     * {@code requestedSize} rounded up to the next power of two (capped at {@link #MAX_BUCKETS}).
-     */
-    public static final Hashtable.Entry[] create(int requestedSize) {
-      return new Entry[sizeFor(requestedSize)];
+        /**
+         * Context-passing forEach. Useful for callers that want to avoid a capturing-lambda allocation
+         * -- pass a non-capturing {@link BiConsumer} (typically a {@code static final}) plus whatever
+         * side-band state it needs as {@code context}.
+         */
+        public <T> void forEach(T context, BiConsumer<? super T, ? super TEntry> consumer) {
+            Support.forEach(this.buckets, context, consumer);
+        }
     }
 
     /**
-     * Variant of {@link #create(int)} that scales the requested working-set size before sizing the
-     * bucket array. Pair with {@link #MAX_RATIO} to leave headroom over the working set for a
-     * desired load factor; the canonical call is {@code create(n, MAX_RATIO)}.
+     * Building blocks for hash-table operations.
+     *
+     * <p>Used by {@link D1} and {@link D2}, and available to callers that want to assemble their own
+     * higher-arity table (3+ key parts) without re-implementing the bucket-array mechanics. The
+     * typical recipe:
      *
-     * <p>The scaled size is truncated to {@code int} before going through {@link #sizeFor(int)}.
-     * Truncation rather than {@code ceil} is intentional: {@code sizeFor} rounds up to the next
-     * power of two anyway, so the fractional part would only matter when float fuzz pushes the
-     * result across a power-of-two boundary -- {@code ceil} would then double the array size for no
-     * reason (e.g. {@code 12 * 4/3 = 16.0...0005f -> ceil 17 -> sizeFor 32}).
+     * <ul>
+     *   <li>Subclass {@link Hashtable.Entry} directly, adding the key fields and a {@code
+     *       matches(...)} method of your chosen arity.
+     *   <li>Allocate a backing array with {@link #create(int)} or {@link #create(int, float)} (the
+     *       latter scales for a target load factor; see {@link #MAX_RATIO}).
+     *   <li>Use {@link #bucketIndex(Object[], long)} for the bucket lookup, {@link
+     *       #bucketIterator(Hashtable.Entry[], long)} for read-only chain walks, and {@link
+     *       #mutatingBucketIterator(Hashtable.Entry[], long)} when you also need {@code remove} /
+     *       {@code replace}.
+     *   <li>Use {@link #insertHeadEntry(Hashtable.Entry[], int, Hashtable.Entry)} to splice a new
+     *       entry as the head of a bucket chain.
+     *   <li>Iterate every entry with {@link #forEach(Hashtable.Entry[], Consumer)} or its
+     *       context-passing sibling. For full-table sweeps with {@code remove}, use {@link
+     *       #mutatingTableIterator(Hashtable.Entry[])}.
+     *   <li>Clear with {@link #clear(Hashtable.Entry[])}.
+     * </ul>
+     *
+     * <p>All bucket arrays produced by {@code create} have a power-of-two length, so {@link
+     * #bucketIndex(Object[], long)} can use a bit mask.
      */
-    public static final Hashtable.Entry[] create(int requestedSize, float scale) {
-      return new Entry[sizeFor((int) (requestedSize * scale))];
-    }
+    public static final class Support {
+        /**
+         * Allocates a bucket array sized to hold {@code requestedSize} entries. Returned length is
+         * {@code requestedSize} rounded up to the next power of two (capped at {@link #MAX_BUCKETS}).
+         */
+        public static final Hashtable.Entry[] create(int requestedSize) {
+            return new Entry[sizeFor(requestedSize)];
+        }
 
-    /** Upper bound on the bucket array length returned by {@link #sizeFor(int)}. */
-    static final int MAX_BUCKETS = 1 << 30;
+        /**
+         * Variant of {@link #create(int)} that scales the requested working-set size before sizing the
+         * bucket array. Pair with {@link #MAX_RATIO} to leave headroom over the working set for a
+         * desired load factor; the canonical call is {@code create(n, MAX_RATIO)}.
+         *
+         * <p>The scaled size is truncated to {@code int} before going through {@link #sizeFor(int)}.
+         * Truncation rather than {@code ceil} is intentional: {@code sizeFor} rounds up to the next
+         * power of two anyway, so the fractional part would only matter when float fuzz pushes the
+         * result across a power-of-two boundary -- {@code ceil} would then double the array size for no
+         * reason (e.g. {@code 12 * 4/3 = 16.0...0005f -> ceil 17 -> sizeFor 32}).
+         */
+        public static final Hashtable.Entry[] create(int requestedSize, float scale) {
+            return new Entry[sizeFor((int) (requestedSize * scale))];
+        }
 
-    /**
-     * Inverse of a 75% load factor. Callers that size their bucket array from a target working-set
-     * size {@code n} should pass {@code create(n, MAX_RATIO)} to leave ~25% headroom in the array.
-     */
-    public static final float MAX_RATIO = 4.0f / 3.0f;
+        /** Upper bound on the bucket array length returned by {@link #sizeFor(int)}. */
+        static final int MAX_BUCKETS = 1 << 30;
+
+        /**
+         * Inverse of a 75% load factor. Callers that size their bucket array from a target working-set
+         * size {@code n} should pass {@code create(n, MAX_RATIO)} to leave ~25% headroom in the array.
+         */
+        public static final float MAX_RATIO = 4.0f / 3.0f;
+
+        /**
+         * Rounds {@code requestedSize} up to the next power of two, capped at {@link #MAX_BUCKETS}.
+         * Throws {@link IllegalArgumentException} for negative inputs or inputs above the cap. Returns
+         * the bucket-array length to allocate.
+         */
+        static final int sizeFor(int requestedSize) {
+            if (requestedSize < 0) {
+                throw new IllegalArgumentException("requestedSize must be non-negative: " + requestedSize);
+            }
+            if (requestedSize > MAX_BUCKETS) {
+                throw new IllegalArgumentException(
+                        "requestedSize exceeds maximum bucket count (" + MAX_BUCKETS + "): " + requestedSize);
+            }
+            if (requestedSize <= 1) {
+                return 1;
+            }
+            return Integer.highestOneBit(requestedSize - 1) << 1;
+        }
 
-    /**
-     * Rounds {@code requestedSize} up to the next power of two, capped at {@link #MAX_BUCKETS}.
-     * Throws {@link IllegalArgumentException} for negative inputs or inputs above the cap. Returns
-     * the bucket-array length to allocate.
-     */
-    static final int sizeFor(int requestedSize) {
-      if (requestedSize < 0) {
-        throw new IllegalArgumentException("requestedSize must be non-negative: " + requestedSize);
-      }
-      if (requestedSize > MAX_BUCKETS) {
-        throw new IllegalArgumentException(
-            "requestedSize exceeds maximum bucket count (" + MAX_BUCKETS + "): " + requestedSize);
-      }
-      if (requestedSize <= 1) {
-        return 1;
-      }
-      return Integer.highestOneBit(requestedSize - 1) << 1;
-    }
+        public static final void clear(Hashtable.Entry[] buckets) {
+            Arrays.fill(buckets, null);
+        }
 
-    public static final void clear(Hashtable.Entry[] buckets) {
-      Arrays.fill(buckets, null);
-    }
+        public static final <TEntry extends Hashtable.Entry> BucketIterator<TEntry> bucketIterator(
+                Hashtable.Entry[] buckets, long keyHash) {
+            return new BucketIterator<TEntry>(buckets, keyHash);
+        }
 
-    public static final <TEntry extends Hashtable.Entry> BucketIterator<TEntry> bucketIterator(
-        Hashtable.Entry[] buckets, long keyHash) {
-      return new BucketIterator<TEntry>(buckets, keyHash);
-    }
+        public static final <TEntry extends Hashtable.Entry> MutatingBucketIterator<TEntry> mutatingBucketIterator(
+                Hashtable.Entry[] buckets, long keyHash) {
+            return new MutatingBucketIterator<TEntry>(buckets, keyHash);
+        }
 
-    public static final <TEntry extends Hashtable.Entry>
-        MutatingBucketIterator<TEntry> mutatingBucketIterator(
-            Hashtable.Entry[] buckets, long keyHash) {
-      return new MutatingBucketIterator<TEntry>(buckets, keyHash);
-    }
+        /**
+         * Returns a {@link MutatingTableIterator} over every entry in {@code buckets}. Useful for
+         * sweeps -- eviction, expunge -- that aren't keyed to a specific hash.
+         */
+        public static final <TEntry extends Hashtable.Entry> MutatingTableIterator<TEntry> mutatingTableIterator(
+                Hashtable.Entry[] buckets) {
+            return new MutatingTableIterator<TEntry>(buckets, 0, buckets.length);
+        }
 
-    /**
-     * Returns a {@link MutatingTableIterator} over every entry in {@code buckets}. Useful for
-     * sweeps -- eviction, expunge -- that aren't keyed to a specific hash.
-     */
-    public static final <TEntry extends Hashtable.Entry>
-        MutatingTableIterator<TEntry> mutatingTableIterator(Hashtable.Entry[] buckets) {
-      return new MutatingTableIterator<TEntry>(buckets, 0, buckets.length);
-    }
+        /**
+         * Variant of {@link #mutatingTableIterator(Hashtable.Entry[])} that walks only the half-open
+         * bucket range {@code [startBucket, endBucket)}. Useful for resumable sweeps -- e.g. cursor-
+         * based eviction in {@code AggregateTable} -- where one call drives {@code [cursor, length)}
+         * and a wrap-around call drives {@code [0, cursor)}. The iterator does <b>not</b> wrap around
+         * within a single instance; callers compose two iterators when wrap-around is desired. An empty
+         * range ({@code startBucket == endBucket}) produces an immediately exhausted iterator.
+         *
+         * @param startBucket inclusive lower bound; must be in {@code [0, buckets.length]}.
+         * @param endBucket exclusive upper bound; must be in {@code [startBucket, buckets.length]}.
+         */
+        public static final <TEntry extends Hashtable.Entry> MutatingTableIterator<TEntry> mutatingTableIterator(
+                Hashtable.Entry[] buckets, int startBucket, int endBucket) {
+            return new MutatingTableIterator<TEntry>(buckets, startBucket, endBucket);
+        }
 
-    /**
-     * Variant of {@link #mutatingTableIterator(Hashtable.Entry[])} that walks only the half-open
-     * bucket range {@code [startBucket, endBucket)}. Useful for resumable sweeps -- e.g. cursor-
-     * based eviction in {@code AggregateTable} -- where one call drives {@code [cursor, length)}
-     * and a wrap-around call drives {@code [0, cursor)}. The iterator does <b>not</b> wrap around
-     * within a single instance; callers compose two iterators when wrap-around is desired. An empty
-     * range ({@code startBucket == endBucket}) produces an immediately exhausted iterator.
-     *
-     * @param startBucket inclusive lower bound; must be in {@code [0, buckets.length]}.
-     * @param endBucket exclusive upper bound; must be in {@code [startBucket, buckets.length]}.
-     */
-    public static final <TEntry extends Hashtable.Entry>
-        MutatingTableIterator<TEntry> mutatingTableIterator(
-            Hashtable.Entry[] buckets, int startBucket, int endBucket) {
-      return new MutatingTableIterator<TEntry>(buckets, startBucket, endBucket);
-    }
+        public static final int bucketIndex(Object[] buckets, long keyHash) {
+            return (int) (keyHash & buckets.length - 1);
+        }
 
-    public static final int bucketIndex(Object[] buckets, long keyHash) {
-      return (int) (keyHash & buckets.length - 1);
-    }
+        /**
+         * Splices {@code entry} in as the new head of the chain at {@code bucketIndex}. Caller is
+         * responsible for size accounting -- this method only touches the chain pointers.
+         */
+        public static final void insertHeadEntry(Hashtable.Entry[] buckets, int bucketIndex, Hashtable.Entry entry) {
+            entry.setNext(buckets[bucketIndex]);
+            buckets[bucketIndex] = entry;
+        }
 
-    /**
-     * Splices {@code entry} in as the new head of the chain at {@code bucketIndex}. Caller is
-     * responsible for size accounting -- this method only touches the chain pointers.
-     */
-    public static final void insertHeadEntry(
-        Hashtable.Entry[] buckets, int bucketIndex, Hashtable.Entry entry) {
-      entry.setNext(buckets[bucketIndex]);
-      buckets[bucketIndex] = entry;
-    }
+        /**
+         * Convenience overload of {@link #insertHeadEntry(Hashtable.Entry[], int, Hashtable.Entry)}
+         * that derives the bucket index from {@code keyHash}. Use this when the caller has the hash but
+         * not the index; if the index has already been computed for another reason, prefer the
+         * int-taking overload to avoid the redundant mask.
+         */
+        public static final void insertHeadEntry(Hashtable.Entry[] buckets, long keyHash, Hashtable.Entry entry) {
+            insertHeadEntry(buckets, bucketIndex(buckets, keyHash), entry);
+        }
 
-    /**
-     * Convenience overload of {@link #insertHeadEntry(Hashtable.Entry[], int, Hashtable.Entry)}
-     * that derives the bucket index from {@code keyHash}. Use this when the caller has the hash but
-     * not the index; if the index has already been computed for another reason, prefer the
-     * int-taking overload to avoid the redundant mask.
-     */
-    public static final void insertHeadEntry(
-        Hashtable.Entry[] buckets, long keyHash, Hashtable.Entry entry) {
-      insertHeadEntry(buckets, bucketIndex(buckets, keyHash), entry);
-    }
+        /**
+         * Returns the head entry of the bucket that {@code keyHash} maps to, cast to the caller's
+         * concrete entry type. The unchecked cast lives here so the chain-walk loop at the call site
+         * doesn't need to thread a raw {@link Entry} variable through.
+         */
+        @SuppressWarnings("unchecked")
+        public static final <TEntry extends Hashtable.Entry> TEntry bucket(Hashtable.Entry[] buckets, long keyHash) {
+            return (TEntry) buckets[bucketIndex(buckets, keyHash)];
+        }
 
-    /**
-     * Returns the head entry of the bucket that {@code keyHash} maps to, cast to the caller's
-     * concrete entry type. The unchecked cast lives here so the chain-walk loop at the call site
-     * doesn't need to thread a raw {@link Entry} variable through.
-     */
-    @SuppressWarnings("unchecked")
-    public static final <TEntry extends Hashtable.Entry> TEntry bucket(
-        Hashtable.Entry[] buckets, long keyHash) {
-      return (TEntry) buckets[bucketIndex(buckets, keyHash)];
-    }
+        /**
+         * Walks every entry in {@code buckets} and invokes {@code consumer} on it. The unchecked cast
+         * to {@code TEntry} lives here (mirroring {@link Entry#next()}) so callers don't have to
+         * sprinkle it across their own forEach loops.
+         */
+        @SuppressWarnings("unchecked")
+        public static final <TEntry extends Hashtable.Entry> void forEach(
+                Hashtable.Entry[] buckets, Consumer<? super TEntry> consumer) {
+            for (int i = 0; i < buckets.length; i++) {
+                for (Hashtable.Entry e = buckets[i]; e != null; e = e.next()) {
+                    consumer.accept((TEntry) e);
+                }
+            }
+        }
 
-    /**
-     * Walks every entry in {@code buckets} and invokes {@code consumer} on it. The unchecked cast
-     * to {@code TEntry} lives here (mirroring {@link Entry#next()}) so callers don't have to
-     * sprinkle it across their own forEach loops.
-     */
-    @SuppressWarnings("unchecked")
-    public static final <TEntry extends Hashtable.Entry> void forEach(
-        Hashtable.Entry[] buckets, Consumer<? super TEntry> consumer) {
-      for (int i = 0; i < buckets.length; i++) {
-        for (Hashtable.Entry e = buckets[i]; e != null; e = e.next()) {
-          consumer.accept((TEntry) e);
-        }
-      }
+        /**
+         * Context-passing variant of {@link #forEach(Hashtable.Entry[], Consumer)}. Pair a
+         * non-capturing {@link BiConsumer} (typically a {@code static final}) with side-band state
+         * passed as {@code context} to avoid a fresh-Consumer allocation each call.
+         */
+        @SuppressWarnings("unchecked")
+        public static final <T, TEntry extends Hashtable.Entry> void forEach(
+                Hashtable.Entry[] buckets, T context, BiConsumer<? super T, ? super TEntry> consumer) {
+            for (int i = 0; i < buckets.length; i++) {
+                for (Hashtable.Entry e = buckets[i]; e != null; e = e.next()) {
+                    consumer.accept(context, (TEntry) e);
+                }
+            }
+        }
     }
 
     /**
-     * Context-passing variant of {@link #forEach(Hashtable.Entry[], Consumer)}. Pair a
-     * non-capturing {@link BiConsumer} (typically a {@code static final}) with side-band state
-     * passed as {@code context} to avoid a fresh-Consumer allocation each call.
+     * Read-only iterator over entries in a single bucket whose {@code keyHash} matches a specific
+     * search hash. Cheaper than {@link MutatingBucketIterator} because it does not track the
+     * previous-node pointers required for splicing — use it when you only need to walk the chain.
+     *
+     * <p>For {@code remove} or {@code replace} operations, use {@link MutatingBucketIterator}
+     * instead.
+     *
+     * <p>The chain-walk work to find the next-match entry happens in {@link #next()} (and in the
+     * constructor for the first match); {@link #hasNext()} is an O(1) field read.
      */
-    @SuppressWarnings("unchecked")
-    public static final <T, TEntry extends Hashtable.Entry> void forEach(
-        Hashtable.Entry[] buckets, T context, BiConsumer<? super T, ? super TEntry> consumer) {
-      for (int i = 0; i < buckets.length; i++) {
-        for (Hashtable.Entry e = buckets[i]; e != null; e = e.next()) {
-          consumer.accept(context, (TEntry) e);
-        }
-      }
-    }
-  }
-
-  /**
-   * Read-only iterator over entries in a single bucket whose {@code keyHash} matches a specific
-   * search hash. Cheaper than {@link MutatingBucketIterator} because it does not track the
-   * previous-node pointers required for splicing — use it when you only need to walk the chain.
-   *
-   * <p>For {@code remove} or {@code replace} operations, use {@link MutatingBucketIterator}
-   * instead.
-   *
-   * <p>The chain-walk work to find the next-match entry happens in {@link #next()} (and in the
-   * constructor for the first match); {@link #hasNext()} is an O(1) field read.
-   */
-  public static final class BucketIterator<TEntry extends Entry> implements Iterator<TEntry> {
-    private final long keyHash;
-    private Hashtable.Entry nextEntry;
-
-    BucketIterator(Hashtable.Entry[] buckets, long keyHash) {
-      this.keyHash = keyHash;
-      Hashtable.Entry cur = buckets[Support.bucketIndex(buckets, keyHash)];
-      while (cur != null && cur.keyHash != keyHash) {
-        cur = cur.next();
-      }
-      this.nextEntry = cur;
-    }
-
-    @Override
-    public boolean hasNext() {
-      return this.nextEntry != null;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public TEntry next() {
-      Hashtable.Entry cur = this.nextEntry;
-      if (cur == null) {
-        throw new NoSuchElementException("no next!");
-      }
-
-      Hashtable.Entry advance = cur.next();
-      while (advance != null && advance.keyHash != keyHash) {
-        advance = advance.next();
-      }
-      this.nextEntry = advance;
-
-      return (TEntry) cur;
-    }
-  }
-
-  /**
-   * Mutating iterator over entries in a single bucket whose {@code keyHash} matches a specific
-   * search hash. Supports {@link #remove()} and {@link #replace} to splice the chain in place.
-   *
-   * <p>Carries previous-node pointers for the current entry and the next-match entry so that {@code
-   * remove} and {@code replace} can fix up the chain in O(1) without re-walking from the bucket
-   * head. After {@code remove} or {@code replace}, iteration may continue with another {@link
-   * #next()}.
-   *
-   * <p>The chain-walk work to find the next-match entry happens in {@link #next()} (and in the
-   * constructor for the first match); {@link #hasNext()} is an O(1) field read.
-   */
-  public static final class MutatingBucketIterator<TEntry extends Entry>
-      implements Iterator<TEntry> {
-    private final long keyHash;
-
-    private final Hashtable.Entry[] buckets;
-
-    /** The entry prior to the last entry returned by next Used for mutating operations */
-    private Hashtable.Entry curPrevEntry;
-
-    /** The entry that was last returned by next */
-    private Hashtable.Entry curEntry;
-
-    /** The entry prior to the next entry */
-    private Hashtable.Entry nextPrevEntry;
-
-    /** The next entry to be returned by next */
-    private Hashtable.Entry nextEntry;
-
-    MutatingBucketIterator(Hashtable.Entry[] buckets, long keyHash) {
-      this.buckets = buckets;
-      this.keyHash = keyHash;
-
-      int bucketIndex = Support.bucketIndex(buckets, keyHash);
-      Hashtable.Entry headEntry = this.buckets[bucketIndex];
-      if (headEntry == null) {
-        this.nextEntry = null;
-        this.nextPrevEntry = null;
-
-        this.curEntry = null;
-        this.curPrevEntry = null;
-      } else {
-        Hashtable.Entry prev, cur;
-        for (prev = null, cur = headEntry; cur != null; prev = cur, cur = cur.next()) {
-          if (cur.keyHash == keyHash) {
-            break;
-          }
-        }
-        this.nextPrevEntry = prev;
-        this.nextEntry = cur;
-
-        this.curEntry = null;
-        this.curPrevEntry = null;
-      }
-    }
-
-    @Override
-    public boolean hasNext() {
-      return (this.nextEntry != null);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public TEntry next() {
-      Hashtable.Entry curEntry = this.nextEntry;
-      if (curEntry == null) {
-        throw new NoSuchElementException("no next!");
-      }
-
-      this.curEntry = curEntry;
-      this.curPrevEntry = this.nextPrevEntry;
-
-      Hashtable.Entry prev, cur;
-      for (prev = this.nextEntry, cur = this.nextEntry.next();
-          cur != null;
-          prev = cur, cur = prev.next()) {
-        if (cur.keyHash == keyHash) {
-          break;
-        }
-      }
-      this.nextPrevEntry = prev;
-      this.nextEntry = cur;
-
-      return (TEntry) curEntry;
-    }
-
-    @Override
-    public void remove() {
-      Hashtable.Entry oldCurEntry = this.curEntry;
-      if (oldCurEntry == null) {
-        throw new IllegalStateException();
-      }
-
-      Hashtable.Entry oldNext = oldCurEntry.next();
-      this.setPrevNext(oldNext);
-      // Detach the removed entry from the chain so stale references can't traverse back into
-      // the live chain and so a now-unreachable tail can be reclaimed by GC.
-      oldCurEntry.setNext(null);
-
-      // If the next match was directly after oldCurEntry, its predecessor is now
-      // curPrevEntry (oldCurEntry was just unlinked from the chain).
-      if (this.nextPrevEntry == oldCurEntry) {
-        this.nextPrevEntry = this.curPrevEntry;
-      }
-      this.curEntry = null;
-    }
+    public static final class BucketIterator<TEntry extends Entry> implements Iterator<TEntry> {
+        private final long keyHash;
+        private Hashtable.Entry nextEntry;
+
+        BucketIterator(Hashtable.Entry[] buckets, long keyHash) {
+            this.keyHash = keyHash;
+            Hashtable.Entry cur = buckets[Support.bucketIndex(buckets, keyHash)];
+            while (cur != null && cur.keyHash != keyHash) {
+                cur = cur.next();
+            }
+            this.nextEntry = cur;
+        }
 
-    public void replace(TEntry replacementEntry) {
-      Hashtable.Entry oldCurEntry = this.curEntry;
-      if (oldCurEntry == null) {
-        throw new IllegalStateException();
-      }
-
-      Hashtable.Entry oldNext = oldCurEntry.next();
-      replacementEntry.setNext(oldNext);
-      this.setPrevNext(replacementEntry);
-      // Detach the replaced entry from the chain; the replacement now owns the chain slot.
-      oldCurEntry.setNext(null);
-
-      // If the next match was directly after oldCurEntry, its predecessor is now
-      // the replacement entry (which took oldCurEntry's chain slot).
-      if (this.nextPrevEntry == oldCurEntry) {
-        this.nextPrevEntry = replacementEntry;
-      }
-      this.curEntry = replacementEntry;
-    }
+        @Override
+        public boolean hasNext() {
+            return this.nextEntry != null;
+        }
 
-    void setPrevNext(Hashtable.Entry nextEntry) {
-      if (this.curPrevEntry == null) {
-        Hashtable.Entry[] buckets = this.buckets;
-        buckets[Support.bucketIndex(buckets, this.keyHash)] = nextEntry;
-      } else {
-        this.curPrevEntry.setNext(nextEntry);
-      }
+        @Override
+        @SuppressWarnings("unchecked")
+        public TEntry next() {
+            Hashtable.Entry cur = this.nextEntry;
+            if (cur == null) {
+                throw new NoSuchElementException("no next!");
+            }
+
+            Hashtable.Entry advance = cur.next();
+            while (advance != null && advance.keyHash != keyHash) {
+                advance = advance.next();
+            }
+            this.nextEntry = advance;
+
+            return (TEntry) cur;
+        }
     }
-  }
-
-  /**
-   * Mutating iterator over every entry in a bucket array, regardless of hash. Supports {@link
-   * #remove()} to unlink the entry last returned by {@link #next()}.
-   *
-   * <p>Walks buckets in array order; within a bucket, walks the chain head-to-tail. After {@code
-   * remove}, iteration may continue with another {@link #next()}.
-   *
-   * <p>Use this for sweeps -- eviction, expunge, full-table cleanup -- that aren't keyed to a
-   * specific hash. For per-bucket walks keyed to a search hash, use {@link MutatingBucketIterator}.
-   */
-  public static final class MutatingTableIterator<TEntry extends Entry>
-      implements Iterator<TEntry> {
-    private final Hashtable.Entry[] buckets;
-
-    /** Exclusive upper bound for bucket indices visited by this iterator. */
-    private final int endBucket;
 
     /**
-     * Index of the bucket holding {@link #nextEntry} (or holding {@link #curEntry} after remove).
+     * Mutating iterator over entries in a single bucket whose {@code keyHash} matches a specific
+     * search hash. Supports {@link #remove()} and {@link #replace} to splice the chain in place.
+     *
+     * <p>Carries previous-node pointers for the current entry and the next-match entry so that {@code
+     * remove} and {@code replace} can fix up the chain in O(1) without re-walking from the bucket
+     * head. After {@code remove} or {@code replace}, iteration may continue with another {@link
+     * #next()}.
+     *
+     * <p>The chain-walk work to find the next-match entry happens in {@link #next()} (and in the
+     * constructor for the first match); {@link #hasNext()} is an O(1) field read.
      */
-    private int nextBucketIndex;
+    public static final class MutatingBucketIterator<TEntry extends Entry> implements Iterator<TEntry> {
+        private final long keyHash;
+
+        private final Hashtable.Entry[] buckets;
+
+        /** The entry prior to the last entry returned by next Used for mutating operations */
+        private Hashtable.Entry curPrevEntry;
+
+        /** The entry that was last returned by next */
+        private Hashtable.Entry curEntry;
+
+        /** The entry prior to the next entry */
+        private Hashtable.Entry nextPrevEntry;
+
+        /** The next entry to be returned by next */
+        private Hashtable.Entry nextEntry;
+
+        MutatingBucketIterator(Hashtable.Entry[] buckets, long keyHash) {
+            this.buckets = buckets;
+            this.keyHash = keyHash;
+
+            int bucketIndex = Support.bucketIndex(buckets, keyHash);
+            Hashtable.Entry headEntry = this.buckets[bucketIndex];
+            if (headEntry == null) {
+                this.nextEntry = null;
+                this.nextPrevEntry = null;
+
+                this.curEntry = null;
+                this.curPrevEntry = null;
+            } else {
+                Hashtable.Entry prev, cur;
+                for (prev = null, cur = headEntry; cur != null; prev = cur, cur = cur.next()) {
+                    if (cur.keyHash == keyHash) {
+                        break;
+                    }
+                }
+                this.nextPrevEntry = prev;
+                this.nextEntry = cur;
+
+                this.curEntry = null;
+                this.curPrevEntry = null;
+            }
+        }
 
-    /**
-     * Predecessor of {@link #nextEntry}, or {@code null} when {@code nextEntry} is the bucket head.
-     */
-    private Hashtable.Entry nextPrevEntry;
+        @Override
+        public boolean hasNext() {
+            return (this.nextEntry != null);
+        }
 
-    /** Next entry to be returned by {@link #next()}, or {@code null} if iteration is exhausted. */
-    private Hashtable.Entry nextEntry;
+        @Override
+        @SuppressWarnings("unchecked")
+        public TEntry next() {
+            Hashtable.Entry curEntry = this.nextEntry;
+            if (curEntry == null) {
+                throw new NoSuchElementException("no next!");
+            }
+
+            this.curEntry = curEntry;
+            this.curPrevEntry = this.nextPrevEntry;
+
+            Hashtable.Entry prev, cur;
+            for (prev = this.nextEntry, cur = this.nextEntry.next(); cur != null; prev = cur, cur = prev.next()) {
+                if (cur.keyHash == keyHash) {
+                    break;
+                }
+            }
+            this.nextPrevEntry = prev;
+            this.nextEntry = cur;
+
+            return (TEntry) curEntry;
+        }
 
-    /**
-     * Bucket index that held the entry last returned by {@code next}; {@code -1} after {@code
-     * remove}.
-     */
-    private int curBucketIndex = -1;
+        @Override
+        public void remove() {
+            Hashtable.Entry oldCurEntry = this.curEntry;
+            if (oldCurEntry == null) {
+                throw new IllegalStateException();
+            }
+
+            Hashtable.Entry oldNext = oldCurEntry.next();
+            this.setPrevNext(oldNext);
+            // Detach the removed entry from the chain so stale references can't traverse back into
+            // the live chain and so a now-unreachable tail can be reclaimed by GC.
+            oldCurEntry.setNext(null);
+
+            // If the next match was directly after oldCurEntry, its predecessor is now
+            // curPrevEntry (oldCurEntry was just unlinked from the chain).
+            if (this.nextPrevEntry == oldCurEntry) {
+                this.nextPrevEntry = this.curPrevEntry;
+            }
+            this.curEntry = null;
+        }
 
-    /**
-     * Predecessor of the entry last returned by {@code next}, or {@code null} if it was the bucket
-     * head.
-     */
-    private Hashtable.Entry curPrevEntry;
+        public void replace(TEntry replacementEntry) {
+            Hashtable.Entry oldCurEntry = this.curEntry;
+            if (oldCurEntry == null) {
+                throw new IllegalStateException();
+            }
+
+            Hashtable.Entry oldNext = oldCurEntry.next();
+            replacementEntry.setNext(oldNext);
+            this.setPrevNext(replacementEntry);
+            // Detach the replaced entry from the chain; the replacement now owns the chain slot.
+            oldCurEntry.setNext(null);
+
+            // If the next match was directly after oldCurEntry, its predecessor is now
+            // the replacement entry (which took oldCurEntry's chain slot).
+            if (this.nextPrevEntry == oldCurEntry) {
+                this.nextPrevEntry = replacementEntry;
+            }
+            this.curEntry = replacementEntry;
+        }
 
-    /**
-     * Entry last returned by {@code next}; {@code null} before any call and after {@code remove}.
-     */
-    private Hashtable.Entry curEntry;
-
-    MutatingTableIterator(Hashtable.Entry[] buckets, int startBucket, int endBucket) {
-      this.buckets = buckets;
-      if (startBucket < 0 || startBucket > buckets.length) {
-        throw new IndexOutOfBoundsException(
-            "startBucket " + startBucket + " out of range [0, " + buckets.length + "]");
-      }
-      if (endBucket < startBucket || endBucket > buckets.length) {
-        throw new IndexOutOfBoundsException(
-            "endBucket "
-                + endBucket
-                + " out of range ["
-                + startBucket
-                + ", "
-                + buckets.length
-                + "]");
-      }
-      this.endBucket = endBucket;
-      seekFromBucket(startBucket);
+        void setPrevNext(Hashtable.Entry nextEntry) {
+            if (this.curPrevEntry == null) {
+                Hashtable.Entry[] buckets = this.buckets;
+                buckets[Support.bucketIndex(buckets, this.keyHash)] = nextEntry;
+            } else {
+                this.curPrevEntry.setNext(nextEntry);
+            }
+        }
     }
 
     /**
-     * Bucket index of the entry last returned by {@link #next()}, or {@code -1} if {@code next} has
-     * not yet been called or the most recent call was {@link #remove()}. Useful for callers driving
-     * a cursor — e.g. resumable eviction sweeps that want to remember where the last successful
-     * removal landed.
+     * Mutating iterator over every entry in a bucket array, regardless of hash. Supports {@link
+     * #remove()} to unlink the entry last returned by {@link #next()}.
+     *
+     * <p>Walks buckets in array order; within a bucket, walks the chain head-to-tail. After {@code
+     * remove}, iteration may continue with another {@link #next()}.
+     *
+     * <p>Use this for sweeps -- eviction, expunge, full-table cleanup -- that aren't keyed to a
+     * specific hash. For per-bucket walks keyed to a search hash, use {@link MutatingBucketIterator}.
      */
-    public int currentBucket() {
-      return this.curBucketIndex;
-    }
+    public static final class MutatingTableIterator<TEntry extends Entry> implements Iterator<TEntry> {
+        private final Hashtable.Entry[] buckets;
+
+        /** Exclusive upper bound for bucket indices visited by this iterator. */
+        private final int endBucket;
+
+        /**
+         * Index of the bucket holding {@link #nextEntry} (or holding {@link #curEntry} after remove).
+         */
+        private int nextBucketIndex;
+
+        /**
+         * Predecessor of {@link #nextEntry}, or {@code null} when {@code nextEntry} is the bucket head.
+         */
+        private Hashtable.Entry nextPrevEntry;
+
+        /** Next entry to be returned by {@link #next()}, or {@code null} if iteration is exhausted. */
+        private Hashtable.Entry nextEntry;
+
+        /**
+         * Bucket index that held the entry last returned by {@code next}; {@code -1} after {@code
+         * remove}.
+         */
+        private int curBucketIndex = -1;
+
+        /**
+         * Predecessor of the entry last returned by {@code next}, or {@code null} if it was the bucket
+         * head.
+         */
+        private Hashtable.Entry curPrevEntry;
+
+        /**
+         * Entry last returned by {@code next}; {@code null} before any call and after {@code remove}.
+         */
+        private Hashtable.Entry curEntry;
+
+        MutatingTableIterator(Hashtable.Entry[] buckets, int startBucket, int endBucket) {
+            this.buckets = buckets;
+            if (startBucket < 0 || startBucket > buckets.length) {
+                throw new IndexOutOfBoundsException(
+                        "startBucket " + startBucket + " out of range [0, " + buckets.length + "]");
+            }
+            if (endBucket < startBucket || endBucket > buckets.length) {
+                throw new IndexOutOfBoundsException(
+                        "endBucket " + endBucket + " out of range [" + startBucket + ", " + buckets.length + "]");
+            }
+            this.endBucket = endBucket;
+            seekFromBucket(startBucket);
+        }
 
-    @Override
-    public boolean hasNext() {
-      return this.nextEntry != null;
-    }
+        /**
+         * Bucket index of the entry last returned by {@link #next()}, or {@code -1} if {@code next} has
+         * not yet been called or the most recent call was {@link #remove()}. Useful for callers driving
+         * a cursor — e.g. resumable eviction sweeps that want to remember where the last successful
+         * removal landed.
+         */
+        public int currentBucket() {
+            return this.curBucketIndex;
+        }
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public TEntry next() {
-      Hashtable.Entry e = this.nextEntry;
-      if (e == null) {
-        throw new NoSuchElementException("no next!");
-      }
-
-      this.curEntry = e;
-      this.curPrevEntry = this.nextPrevEntry;
-      this.curBucketIndex = this.nextBucketIndex;
-
-      Hashtable.Entry n = e.next();
-      if (n != null) {
-        this.nextPrevEntry = e;
-        this.nextEntry = n;
-      } else {
-        // walked off the end of this bucket; pick up at the next non-empty bucket
-        seekFromBucket(this.nextBucketIndex + 1);
-      }
-      return (TEntry) e;
-    }
+        @Override
+        public boolean hasNext() {
+            return this.nextEntry != null;
+        }
 
-    @Override
-    public void remove() {
-      Hashtable.Entry oldCurEntry = this.curEntry;
-      if (oldCurEntry == null) {
-        throw new IllegalStateException();
-      }
-
-      Hashtable.Entry oldNext = oldCurEntry.next();
-      if (this.curPrevEntry == null) {
-        this.buckets[this.curBucketIndex] = oldNext;
-      } else {
-        this.curPrevEntry.setNext(oldNext);
-      }
-      // Detach the removed entry from the chain so stale references can't traverse back into
-      // the live chain and so a now-unreachable tail can be reclaimed by GC.
-      oldCurEntry.setNext(null);
-
-      // If the next entry was the immediate chain successor of oldCurEntry, its predecessor is
-      // now what came before oldCurEntry (oldCurEntry was just unlinked).
-      if (this.nextPrevEntry == oldCurEntry) {
-        this.nextPrevEntry = this.curPrevEntry;
-      }
-      this.curEntry = null;
-    }
+        @Override
+        @SuppressWarnings("unchecked")
+        public TEntry next() {
+            Hashtable.Entry e = this.nextEntry;
+            if (e == null) {
+                throw new NoSuchElementException("no next!");
+            }
+
+            this.curEntry = e;
+            this.curPrevEntry = this.nextPrevEntry;
+            this.curBucketIndex = this.nextBucketIndex;
+
+            Hashtable.Entry n = e.next();
+            if (n != null) {
+                this.nextPrevEntry = e;
+                this.nextEntry = n;
+            } else {
+                // walked off the end of this bucket; pick up at the next non-empty bucket
+                seekFromBucket(this.nextBucketIndex + 1);
+            }
+            return (TEntry) e;
+        }
 
-    /**
-     * Advance {@code nextBucketIndex} / {@code nextEntry} to the first non-empty bucket {@code >=
-     * from} within {@code [0, endBucket)}.
-     */
-    private void seekFromBucket(int from) {
-      Hashtable.Entry[] thisBuckets = this.buckets;
-      for (int i = from; i < this.endBucket; i++) {
-        Hashtable.Entry head = thisBuckets[i];
-        if (head != null) {
-          this.nextBucketIndex = i;
-          this.nextPrevEntry = null;
-          this.nextEntry = head;
-          return;
-        }
-      }
-      this.nextEntry = null;
-      this.nextPrevEntry = null;
+        @Override
+        public void remove() {
+            Hashtable.Entry oldCurEntry = this.curEntry;
+            if (oldCurEntry == null) {
+                throw new IllegalStateException();
+            }
+
+            Hashtable.Entry oldNext = oldCurEntry.next();
+            if (this.curPrevEntry == null) {
+                this.buckets[this.curBucketIndex] = oldNext;
+            } else {
+                this.curPrevEntry.setNext(oldNext);
+            }
+            // Detach the removed entry from the chain so stale references can't traverse back into
+            // the live chain and so a now-unreachable tail can be reclaimed by GC.
+            oldCurEntry.setNext(null);
+
+            // If the next entry was the immediate chain successor of oldCurEntry, its predecessor is
+            // now what came before oldCurEntry (oldCurEntry was just unlinked).
+            if (this.nextPrevEntry == oldCurEntry) {
+                this.nextPrevEntry = this.curPrevEntry;
+            }
+            this.curEntry = null;
+        }
+
+        /**
+         * Advance {@code nextBucketIndex} / {@code nextEntry} to the first non-empty bucket {@code >=
+         * from} within {@code [0, endBucket)}.
+         */
+        private void seekFromBucket(int from) {
+            Hashtable.Entry[] thisBuckets = this.buckets;
+            for (int i = from; i < this.endBucket; i++) {
+                Hashtable.Entry head = thisBuckets[i];
+                if (head != null) {
+                    this.nextBucketIndex = i;
+                    this.nextPrevEntry = null;
+                    this.nextEntry = head;
+                    return;
+                }
+            }
+            this.nextEntry = null;
+            this.nextPrevEntry = null;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/LongHashingUtils.java b/internal-api/src/main/java/datadog/trace/util/LongHashingUtils.java
index 87d0482104e..1d347b922ee 100644
--- a/internal-api/src/main/java/datadog/trace/util/LongHashingUtils.java
+++ b/internal-api/src/main/java/datadog/trace/util/LongHashingUtils.java
@@ -9,169 +9,165 @@
  * <code>hash</code> that take many argument lengths to avoid var-args allocation.
  */
 public final class LongHashingUtils {
-  private LongHashingUtils() {}
-
-  public static final long hash(Object obj) {
-    return obj == null ? Long.MIN_VALUE : obj.hashCode();
-  }
-
-  public static final long hash(boolean value) {
-    return Boolean.hashCode(value);
-  }
-
-  public static final long hash(char value) {
-    return Character.hashCode(value);
-  }
-
-  public static final long hash(byte value) {
-    return Byte.hashCode(value);
-  }
-
-  public static final long hash(short value) {
-    return Short.hashCode(value);
-  }
-
-  public static final long hash(int value) {
-    return Integer.hashCode(value);
-  }
-
-  public static final long hash(long value) {
-    return value;
-  }
-
-  public static final long hash(float value) {
-    return Float.hashCode(value);
-  }
-
-  public static final long hash(double value) {
-    return Double.doubleToRawLongBits(value);
-  }
-
-  public static final long hash(Object obj0, Object obj1) {
-    return hash(intHash(obj0), intHash(obj1));
-  }
-
-  static final long hash(int hash0, int hash1) {
-    return 31L * hash0 + hash1;
-  }
-
-  private static final int intHash(@Nullable Object obj) {
-    return obj == null ? 0 : obj.hashCode();
-  }
-
-  public static final long hash(Object obj0, Object obj1, Object obj2) {
-    return hash(intHash(obj0), intHash(obj1), intHash(obj2));
-  }
-
-  static final long hash(int hash0, int hash1, int hash2) {
-    // DQH - Micro-optimizing, 31L * 31L will constant fold
-    // Since there are multiple execution ports for load & store,
-    // this will make good use of the core.
-    return 31L * 31L * hash0 + 31L * hash1 + hash2;
-  }
-
-  public static final long hash(Object obj0, Object obj1, Object obj2, Object obj3) {
-    return hash(intHash(obj0), intHash(obj1), intHash(obj2), intHash(obj3));
-  }
-
-  static final long hash(int hash0, int hash1, int hash2, int hash3) {
-    // DQH - Micro-optimizing, 31L * 31L will constant fold
-    // Since there are multiple execution ports for load & store,
-    // this will make good use of the core.
-    return 31L * 31L * 31L * hash0 + 31L * 31L * hash1 + 31L * hash2 + hash3;
-  }
-
-  public static final long hash(Object obj0, Object obj1, Object obj2, Object obj3, Object obj4) {
-    return hash(intHash(obj0), intHash(obj1), intHash(obj2), intHash(obj3), intHash(obj4));
-  }
-
-  static final long hash(int hash0, int hash1, int hash2, int hash3, int hash4) {
-    // DQH - Micro-optimizing, 31L * 31L will constant fold
-    // Since there are multiple execution ports for load & store,
-    // this will make good use of the core.
-    return 31L * 31L * 31L * 31L * hash0
-        + 31L * 31L * 31L * hash1
-        + 31L * 31L * hash2
-        + 31L * hash3
-        + hash4;
-  }
-
-  @Deprecated
-  public static final long hash(int[] hashes) {
-    long result = 0;
-    for (int hash : hashes) {
-      result = addToHash(result, hash);
-    }
-    return result;
-  }
-
-  public static final long addToHash(long hash, int value) {
-    return 31L * hash + value;
-  }
-
-  public static final long addToHash(long hash, @Nullable Object obj) {
-    return addToHash(hash, intHash(obj));
-  }
-
-  public static final long addToHash(long hash, boolean value) {
-    return addToHash(hash, Boolean.hashCode(value));
-  }
-
-  public static final long addToHash(long hash, char value) {
-    return addToHash(hash, Character.hashCode(value));
-  }
-
-  public static final long addToHash(long hash, byte value) {
-    return addToHash(hash, Byte.hashCode(value));
-  }
-
-  public static final long addToHash(long hash, short value) {
-    return addToHash(hash, Short.hashCode(value));
-  }
-
-  public static final long addToHash(long hash, long value) {
-    return addToHash(hash, Long.hashCode(value));
-  }
-
-  public static final long addToHash(long hash, float value) {
-    return addToHash(hash, Float.hashCode(value));
-  }
-
-  public static final long addToHash(long hash, double value) {
-    return addToHash(hash, Double.hashCode(value));
-  }
-
-  /** Folds {@code arr[0..len)}; the array must be non-null, but its elements may be null. */
-  public static final long addToHash(long hash, @Nonnull Object[] arr, int len) {
-    for (int i = 0; i < len; i++) {
-      hash = addToHash(hash, arr[i]);
-    }
-    return hash;
-  }
-
-  public static final long addToHash(long hash, @Nonnull Object[] arr) {
-    return addToHash(hash, arr, arr.length);
-  }
-
-  public static final long hash(Iterable<?> objs) {
-    long result = 0;
-    for (Object obj : objs) {
-      result = addToHash(result, obj);
-    }
-    return result;
-  }
-
-  /**
-   * Calling this var-arg version can result in large amounts of allocation (see HashingBenchmark)
-   * Rather than calliing this method, add another override of hash that handles a larger number of
-   * arguments or use calls to addToHash.
-   */
-  @Deprecated
-  public static final long hash(Object[] objs) {
-    long result = 0;
-    for (Object obj : objs) {
-      result = addToHash(result, obj);
-    }
-    return result;
-  }
+    private LongHashingUtils() {}
+
+    public static final long hash(Object obj) {
+        return obj == null ? Long.MIN_VALUE : obj.hashCode();
+    }
+
+    public static final long hash(boolean value) {
+        return Boolean.hashCode(value);
+    }
+
+    public static final long hash(char value) {
+        return Character.hashCode(value);
+    }
+
+    public static final long hash(byte value) {
+        return Byte.hashCode(value);
+    }
+
+    public static final long hash(short value) {
+        return Short.hashCode(value);
+    }
+
+    public static final long hash(int value) {
+        return Integer.hashCode(value);
+    }
+
+    public static final long hash(long value) {
+        return value;
+    }
+
+    public static final long hash(float value) {
+        return Float.hashCode(value);
+    }
+
+    public static final long hash(double value) {
+        return Double.doubleToRawLongBits(value);
+    }
+
+    public static final long hash(Object obj0, Object obj1) {
+        return hash(intHash(obj0), intHash(obj1));
+    }
+
+    static final long hash(int hash0, int hash1) {
+        return 31L * hash0 + hash1;
+    }
+
+    private static final int intHash(@Nullable Object obj) {
+        return obj == null ? 0 : obj.hashCode();
+    }
+
+    public static final long hash(Object obj0, Object obj1, Object obj2) {
+        return hash(intHash(obj0), intHash(obj1), intHash(obj2));
+    }
+
+    static final long hash(int hash0, int hash1, int hash2) {
+        // DQH - Micro-optimizing, 31L * 31L will constant fold
+        // Since there are multiple execution ports for load & store,
+        // this will make good use of the core.
+        return 31L * 31L * hash0 + 31L * hash1 + hash2;
+    }
+
+    public static final long hash(Object obj0, Object obj1, Object obj2, Object obj3) {
+        return hash(intHash(obj0), intHash(obj1), intHash(obj2), intHash(obj3));
+    }
+
+    static final long hash(int hash0, int hash1, int hash2, int hash3) {
+        // DQH - Micro-optimizing, 31L * 31L will constant fold
+        // Since there are multiple execution ports for load & store,
+        // this will make good use of the core.
+        return 31L * 31L * 31L * hash0 + 31L * 31L * hash1 + 31L * hash2 + hash3;
+    }
+
+    public static final long hash(Object obj0, Object obj1, Object obj2, Object obj3, Object obj4) {
+        return hash(intHash(obj0), intHash(obj1), intHash(obj2), intHash(obj3), intHash(obj4));
+    }
+
+    static final long hash(int hash0, int hash1, int hash2, int hash3, int hash4) {
+        // DQH - Micro-optimizing, 31L * 31L will constant fold
+        // Since there are multiple execution ports for load & store,
+        // this will make good use of the core.
+        return 31L * 31L * 31L * 31L * hash0 + 31L * 31L * 31L * hash1 + 31L * 31L * hash2 + 31L * hash3 + hash4;
+    }
+
+    @Deprecated
+    public static final long hash(int[] hashes) {
+        long result = 0;
+        for (int hash : hashes) {
+            result = addToHash(result, hash);
+        }
+        return result;
+    }
+
+    public static final long addToHash(long hash, int value) {
+        return 31L * hash + value;
+    }
+
+    public static final long addToHash(long hash, @Nullable Object obj) {
+        return addToHash(hash, intHash(obj));
+    }
+
+    public static final long addToHash(long hash, boolean value) {
+        return addToHash(hash, Boolean.hashCode(value));
+    }
+
+    public static final long addToHash(long hash, char value) {
+        return addToHash(hash, Character.hashCode(value));
+    }
+
+    public static final long addToHash(long hash, byte value) {
+        return addToHash(hash, Byte.hashCode(value));
+    }
+
+    public static final long addToHash(long hash, short value) {
+        return addToHash(hash, Short.hashCode(value));
+    }
+
+    public static final long addToHash(long hash, long value) {
+        return addToHash(hash, Long.hashCode(value));
+    }
+
+    public static final long addToHash(long hash, float value) {
+        return addToHash(hash, Float.hashCode(value));
+    }
+
+    public static final long addToHash(long hash, double value) {
+        return addToHash(hash, Double.hashCode(value));
+    }
+
+    /** Folds {@code arr[0..len)}; the array must be non-null, but its elements may be null. */
+    public static final long addToHash(long hash, @Nonnull Object[] arr, int len) {
+        for (int i = 0; i < len; i++) {
+            hash = addToHash(hash, arr[i]);
+        }
+        return hash;
+    }
+
+    public static final long addToHash(long hash, @Nonnull Object[] arr) {
+        return addToHash(hash, arr, arr.length);
+    }
+
+    public static final long hash(Iterable<?> objs) {
+        long result = 0;
+        for (Object obj : objs) {
+            result = addToHash(result, obj);
+        }
+        return result;
+    }
+
+    /**
+     * Calling this var-arg version can result in large amounts of allocation (see HashingBenchmark)
+     * Rather than calliing this method, add another override of hash that handles a larger number of
+     * arguments or use calls to addToHash.
+     */
+    @Deprecated
+    public static final long hash(Object[] objs) {
+        long result = 0;
+        for (Object obj : objs) {
+            result = addToHash(result, obj);
+        }
+        return result;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/Maybe.java b/internal-api/src/main/java/datadog/trace/util/Maybe.java
index 4aec3fe290e..690f1c07729 100644
--- a/internal-api/src/main/java/datadog/trace/util/Maybe.java
+++ b/internal-api/src/main/java/datadog/trace/util/Maybe.java
@@ -43,108 +43,109 @@
  */
 @NoEscape
 public final class Maybe<T> {
-  @Nullable private final T value;
+    @Nullable
+    private final T value;
 
-  private Maybe(@Nullable T value) {
-    this.value = value;
-  }
+    private Maybe(@Nullable T value) {
+        this.value = value;
+    }
 
-  @Nonnull
-  public static <T> Maybe<T> of(@Nullable T value) {
-    return new Maybe<>(value);
-  }
+    @Nonnull
+    public static <T> Maybe<T> of(@Nullable T value) {
+        return new Maybe<>(value);
+    }
 
-  /**
-   * Convenience form for the common shape {@code Maybe.of(receiver.someNullableMethod(args))}:
-   * {@code Maybe.of(receiver, r -> r.someNullableMethod(args))}. Useful when {@code receiver} would
-   * otherwise have to be re-evaluated or named twice at the call site.
-   *
-   * <p>Unlike the single-arg {@link #of}, {@code fn} here is typically a <em>capturing</em> lambda
-   * -- it closes over whatever local arguments the caller's method has in scope, so a fresh lambda
-   * instance is created on every invocation (capturing lambdas are never cached the way a
-   * non-capturing lambda's singleton instance commonly is) -- which makes it a second heap-object
-   * candidate distinct from the {@code Maybe} itself. That freshly-allocated capturing lambda still
-   * scalar-replaces as reliably as a plain delegating method call does, for the shape actually
-   * measured (JDK 8/11/17/25): a monomorphic receiver and a {@code fn} that is applied exactly once
-   * and does not itself escape (e.g. by being stored or passed further). If {@code fn} itself
-   * captures something that must be freshly allocated per call (e.g. a non-singleton creator), that
-   * allocation is real regardless of what happens to the lambda wrapping it.
-   */
-  @Nonnull
-  public static <R, T> Maybe<T> of(R receiver, @Nonnull Function<? super R, ? extends T> fn) {
-    return new Maybe<>(fn.apply(receiver));
-  }
+    /**
+     * Convenience form for the common shape {@code Maybe.of(receiver.someNullableMethod(args))}:
+     * {@code Maybe.of(receiver, r -> r.someNullableMethod(args))}. Useful when {@code receiver} would
+     * otherwise have to be re-evaluated or named twice at the call site.
+     *
+     * <p>Unlike the single-arg {@link #of}, {@code fn} here is typically a <em>capturing</em> lambda
+     * -- it closes over whatever local arguments the caller's method has in scope, so a fresh lambda
+     * instance is created on every invocation (capturing lambdas are never cached the way a
+     * non-capturing lambda's singleton instance commonly is) -- which makes it a second heap-object
+     * candidate distinct from the {@code Maybe} itself. That freshly-allocated capturing lambda still
+     * scalar-replaces as reliably as a plain delegating method call does, for the shape actually
+     * measured (JDK 8/11/17/25): a monomorphic receiver and a {@code fn} that is applied exactly once
+     * and does not itself escape (e.g. by being stored or passed further). If {@code fn} itself
+     * captures something that must be freshly allocated per call (e.g. a non-singleton creator), that
+     * allocation is real regardless of what happens to the lambda wrapping it.
+     */
+    @Nonnull
+    public static <R, T> Maybe<T> of(R receiver, @Nonnull Function<? super R, ? extends T> fn) {
+        return new Maybe<>(fn.apply(receiver));
+    }
 
-  public boolean isPresent() {
-    return value != null;
-  }
+    public boolean isPresent() {
+        return value != null;
+    }
 
-  /**
-   * Raw accessor -- named to make the null case unmissable at the call site, rather than {@code
-   * orElse}/{@code get}, neither of which says so on its own.
-   */
-  @Nullable
-  public T getOrNull() {
-    return value;
-  }
+    /**
+     * Raw accessor -- named to make the null case unmissable at the call site, rather than {@code
+     * orElse}/{@code get}, neither of which says so on its own.
+     */
+    @Nullable
+    public T getOrNull() {
+        return value;
+    }
 
-  /**
-   * Primary intended usage: a guard in front of mutation, e.g. {@code
-   * table.tryGetOrCreateAsTry(key, FooEntry::new).update(FooEntry::inc)}. No-op if the operation
-   * was refused (table full) rather than throwing or requiring the caller to branch on {@link
-   * #isPresent()} first.
-   */
-  public void update(Consumer<? super T> mutator) {
-    if (value != null) {
-      mutator.accept(value);
+    /**
+     * Primary intended usage: a guard in front of mutation, e.g. {@code
+     * table.tryGetOrCreateAsTry(key, FooEntry::new).update(FooEntry::inc)}. No-op if the operation
+     * was refused (table full) rather than throwing or requiring the caller to branch on {@link
+     * #isPresent()} first.
+     */
+    public void update(Consumer<? super T> mutator) {
+        if (value != null) {
+            mutator.accept(value);
+        }
     }
-  }
 
-  /**
-   * Generic-context form of {@link #update(Consumer)}, for callers that already have a reusable,
-   * non-capturing {@code BiConsumer} (typically a {@code static final}) plus whatever context it
-   * needs -- {@code (value, context)} to stay consistent with the primitive-context overloads
-   * below, at the cost of departing from {@code Hashtable#forEach}'s {@code (context, entry)}
-   * convention.
-   */
-  public <C> void update(C context, BiConsumer<? super T, ? super C> mutator) {
-    if (value != null) {
-      mutator.accept(value, context);
+    /**
+     * Generic-context form of {@link #update(Consumer)}, for callers that already have a reusable,
+     * non-capturing {@code BiConsumer} (typically a {@code static final}) plus whatever context it
+     * needs -- {@code (value, context)} to stay consistent with the primitive-context overloads
+     * below, at the cost of departing from {@code Hashtable#forEach}'s {@code (context, entry)}
+     * convention.
+     */
+    public <C> void update(C context, BiConsumer<? super T, ? super C> mutator) {
+        if (value != null) {
+            mutator.accept(value, context);
+        }
     }
-  }
 
-  /**
-   * Primitive-context form of {@link #update(Consumer)}, for the common case where the mutation
-   * needs one caller-supplied number (e.g. a duration or count) and boxing it into a captured
-   * {@code Long}/generic-context object would be the actual per-call allocation. This exists so a
-   * table wrapping a fallible lookup in {@code Maybe} pays for this shape once, here, instead of
-   * once per mutator-flavor per table type -- see {@code Hashtable#tryGetOrUpdate}'s {@code
-   * ObjLongConsumer} overload for the caller-side problem this replaces.
-   *
-   * <p>Deliberately the <em>only</em> primitive-context overload. An {@code int}/{@code
-   * double}/{@code boolean} sibling was tried and reverted: Java's overload resolution can pick
-   * cleanly between a primitive overload and the generic {@link #update(Object, BiConsumer)} form
-   * for a reference-typed argument (boxing is only considered once no non-boxing candidate
-   * applies), but that guarantee does not extend to a second primitive overload -- {@code update(1,
-   * lambda)} is ambiguous between {@code int} and {@code long} even with no {@code double} overload
-   * in the picture, because {@link ObjIntConsumer} and {@link ObjLongConsumer} are unrelated
-   * interfaces and JLS 15.12.2.5's most-specific-method rule requires every parameter position to
-   * agree, not just the numeric one. Confirmed by direct compilation, not just JLS reading: an
-   * inline lambda call breaks as soon as a second primitive overload exists. A plain {@code int}
-   * argument still widens to {@code long} for free at this single overload -- callers are not
-   * required to have a {@code long} in hand.
-   */
-  public void update(long context, ObjLongConsumer<? super T> mutator) {
-    if (value != null) {
-      mutator.accept(value, context);
+    /**
+     * Primitive-context form of {@link #update(Consumer)}, for the common case where the mutation
+     * needs one caller-supplied number (e.g. a duration or count) and boxing it into a captured
+     * {@code Long}/generic-context object would be the actual per-call allocation. This exists so a
+     * table wrapping a fallible lookup in {@code Maybe} pays for this shape once, here, instead of
+     * once per mutator-flavor per table type -- see {@code Hashtable#tryGetOrUpdate}'s {@code
+     * ObjLongConsumer} overload for the caller-side problem this replaces.
+     *
+     * <p>Deliberately the <em>only</em> primitive-context overload. An {@code int}/{@code
+     * double}/{@code boolean} sibling was tried and reverted: Java's overload resolution can pick
+     * cleanly between a primitive overload and the generic {@link #update(Object, BiConsumer)} form
+     * for a reference-typed argument (boxing is only considered once no non-boxing candidate
+     * applies), but that guarantee does not extend to a second primitive overload -- {@code update(1,
+     * lambda)} is ambiguous between {@code int} and {@code long} even with no {@code double} overload
+     * in the picture, because {@link ObjIntConsumer} and {@link ObjLongConsumer} are unrelated
+     * interfaces and JLS 15.12.2.5's most-specific-method rule requires every parameter position to
+     * agree, not just the numeric one. Confirmed by direct compilation, not just JLS reading: an
+     * inline lambda call breaks as soon as a second primitive overload exists. A plain {@code int}
+     * argument still widens to {@code long} for free at this single overload -- callers are not
+     * required to have a {@code long} in hand.
+     */
+    public void update(long context, ObjLongConsumer<? super T> mutator) {
+        if (value != null) {
+            mutator.accept(value, context);
+        }
     }
-  }
 
-  public void ifPresentOrElse(Consumer<? super T> action, Runnable emptyAction) {
-    if (value != null) {
-      action.accept(value);
-    } else {
-      emptyAction.run();
+    public void ifPresentOrElse(Consumer<? super T> action, Runnable emptyAction) {
+        if (value != null) {
+            action.accept(value);
+        } else {
+            emptyAction.run();
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/MethodHandles.java b/internal-api/src/main/java/datadog/trace/util/MethodHandles.java
index bb0f756bf6f..07e7229960f 100644
--- a/internal-api/src/main/java/datadog/trace/util/MethodHandles.java
+++ b/internal-api/src/main/java/datadog/trace/util/MethodHandles.java
@@ -14,221 +14,202 @@
 
 public class MethodHandles {
 
-  private static final Logger log = LoggerFactory.getLogger(MethodHandles.class);
-
-  private final java.lang.invoke.MethodHandles.Lookup lookup =
-      java.lang.invoke.MethodHandles.lookup();
-  private final ClassLoader classLoader;
-
-  public MethodHandles(ClassLoader classLoader) {
-    this.classLoader = classLoader;
-  }
-
-  public MethodHandle privateFieldGetter(String className, String fieldName) {
-    Class<?> clazz = loadClass(className);
-    return clazz != null ? privateFieldGetter(clazz, fieldName) : null;
-  }
-
-  public MethodHandle privateFieldGetter(Class<?> clazz, String fieldName) {
-    return AccessController.doPrivileged(
-        (PrivilegedAction<MethodHandle>)
-            () -> {
-              try {
+    private static final Logger log = LoggerFactory.getLogger(MethodHandles.class);
+
+    private final java.lang.invoke.MethodHandles.Lookup lookup = java.lang.invoke.MethodHandles.lookup();
+    private final ClassLoader classLoader;
+
+    public MethodHandles(ClassLoader classLoader) {
+        this.classLoader = classLoader;
+    }
+
+    public MethodHandle privateFieldGetter(String className, String fieldName) {
+        Class<?> clazz = loadClass(className);
+        return clazz != null ? privateFieldGetter(clazz, fieldName) : null;
+    }
+
+    public MethodHandle privateFieldGetter(Class<?> clazz, String fieldName) {
+        return AccessController.doPrivileged((PrivilegedAction<MethodHandle>) () -> {
+            try {
                 try {
-                  SecurityManager sm = System.getSecurityManager();
-                  if (sm != null) {
-                    String packageName = clazz.getPackage().getName();
-                    sm.checkPackageAccess(packageName);
-                  }
+                    SecurityManager sm = System.getSecurityManager();
+                    if (sm != null) {
+                        String packageName = clazz.getPackage().getName();
+                        sm.checkPackageAccess(packageName);
+                    }
                 } catch (UnsupportedOperationException e) {
-                  // ignore
+                    // ignore
                 }
 
                 Field field = clazz.getDeclaredField(fieldName);
                 field.setAccessible(true);
                 return lookup.unreflectGetter(field);
 
-              } catch (Throwable t) {
+            } catch (Throwable t) {
                 log.debug(
-                    LogCollector.EXCLUDE_TELEMETRY,
-                    "Could not get private field {} getter from class {}",
-                    fieldName,
-                    clazz.getName(),
-                    t);
+                        LogCollector.EXCLUDE_TELEMETRY,
+                        "Could not get private field {} getter from class {}",
+                        fieldName,
+                        clazz.getName(),
+                        t);
                 return null;
-              }
-            });
-  }
-
-  public MethodHandle privateFieldSetter(String className, String fieldName) {
-    Class<?> clazz = loadClass(className);
-    return clazz != null ? privateFieldSetter(clazz, fieldName) : null;
-  }
-
-  public MethodHandle privateFieldSetter(Class<?> clazz, String fieldName) {
-    return AccessController.doPrivileged(
-        (PrivilegedAction<MethodHandle>)
-            () -> {
-              try {
+            }
+        });
+    }
+
+    public MethodHandle privateFieldSetter(String className, String fieldName) {
+        Class<?> clazz = loadClass(className);
+        return clazz != null ? privateFieldSetter(clazz, fieldName) : null;
+    }
+
+    public MethodHandle privateFieldSetter(Class<?> clazz, String fieldName) {
+        return AccessController.doPrivileged((PrivilegedAction<MethodHandle>) () -> {
+            try {
                 try {
-                  SecurityManager sm = System.getSecurityManager();
-                  if (sm != null) {
-                    String packageName = clazz.getPackage().getName();
-                    sm.checkPackageAccess(packageName);
-                  }
+                    SecurityManager sm = System.getSecurityManager();
+                    if (sm != null) {
+                        String packageName = clazz.getPackage().getName();
+                        sm.checkPackageAccess(packageName);
+                    }
                 } catch (UnsupportedOperationException e) {
-                  // ignore
+                    // ignore
                 }
 
                 Field field = clazz.getDeclaredField(fieldName);
                 field.setAccessible(true);
                 return lookup.unreflectSetter(field);
 
-              } catch (Throwable t) {
+            } catch (Throwable t) {
                 log.debug(
-                    LogCollector.EXCLUDE_TELEMETRY,
-                    "Could not get private field {} setter from class {}",
-                    fieldName,
-                    clazz.getName(),
-                    t);
+                        LogCollector.EXCLUDE_TELEMETRY,
+                        "Could not get private field {} setter from class {}",
+                        fieldName,
+                        clazz.getName(),
+                        t);
                 return null;
-              }
-            });
-  }
-
-  public MethodHandle constructor(String className, Class<?>... parameterTypes) {
-    Class<?> clazz = loadClass(className);
-    return clazz != null ? constructor(clazz, parameterTypes) : null;
-  }
-
-  public MethodHandle constructor(Class<?> clazz, Class<?>... parameterTypes) {
-    return AccessController.doPrivileged(
-        (PrivilegedAction<MethodHandle>)
-            () -> {
-              try {
+            }
+        });
+    }
+
+    public MethodHandle constructor(String className, Class<?>... parameterTypes) {
+        Class<?> clazz = loadClass(className);
+        return clazz != null ? constructor(clazz, parameterTypes) : null;
+    }
+
+    public MethodHandle constructor(Class<?> clazz, Class<?>... parameterTypes) {
+        return AccessController.doPrivileged((PrivilegedAction<MethodHandle>) () -> {
+            try {
                 try {
-                  SecurityManager sm = System.getSecurityManager();
-                  if (sm != null) {
-                    String packageName = clazz.getPackage().getName();
-                    sm.checkPackageAccess(packageName);
-                  }
+                    SecurityManager sm = System.getSecurityManager();
+                    if (sm != null) {
+                        String packageName = clazz.getPackage().getName();
+                        sm.checkPackageAccess(packageName);
+                    }
                 } catch (UnsupportedOperationException e) {
-                  // ignore
+                    // ignore
                 }
 
                 Constructor<?> constructor = clazz.getDeclaredConstructor(parameterTypes);
                 constructor.setAccessible(true);
                 return lookup.unreflectConstructor(constructor);
 
-              } catch (Throwable t) {
+            } catch (Throwable t) {
                 log.debug(
-                    LogCollector.EXCLUDE_TELEMETRY,
-                    "Could not get constructor accepting {} from class {}",
-                    Arrays.toString(parameterTypes),
-                    clazz.getName(),
-                    t);
+                        LogCollector.EXCLUDE_TELEMETRY,
+                        "Could not get constructor accepting {} from class {}",
+                        Arrays.toString(parameterTypes),
+                        clazz.getName(),
+                        t);
                 return null;
-              }
-            });
-  }
-
-  public MethodHandle method(String className, String methodName, Class<?>... parameterTypes) {
-    Class<?> clazz = loadClass(className);
-    return clazz != null ? method(clazz, methodName, parameterTypes) : null;
-  }
-
-  public MethodHandle method(Class<?> clazz, String methodName, Class<?>... parameterTypes) {
-    return AccessController.doPrivileged(
-        (PrivilegedAction<MethodHandle>)
-            () -> {
-              try {
+            }
+        });
+    }
+
+    public MethodHandle method(String className, String methodName, Class<?>... parameterTypes) {
+        Class<?> clazz = loadClass(className);
+        return clazz != null ? method(clazz, methodName, parameterTypes) : null;
+    }
+
+    public MethodHandle method(Class<?> clazz, String methodName, Class<?>... parameterTypes) {
+        return AccessController.doPrivileged((PrivilegedAction<MethodHandle>) () -> {
+            try {
                 try {
-                  SecurityManager sm = System.getSecurityManager();
-                  if (sm != null) {
-                    String packageName = clazz.getPackage().getName();
-                    sm.checkPackageAccess(packageName);
-                  }
+                    SecurityManager sm = System.getSecurityManager();
+                    if (sm != null) {
+                        String packageName = clazz.getPackage().getName();
+                        sm.checkPackageAccess(packageName);
+                    }
                 } catch (UnsupportedOperationException e) {
-                  // ignore
+                    // ignore
                 }
 
                 Method method = clazz.getDeclaredMethod(methodName, parameterTypes);
                 method.setAccessible(true);
                 return lookup.unreflect(method);
 
-              } catch (Throwable t) {
+            } catch (Throwable t) {
                 log.debug(
-                    LogCollector.EXCLUDE_TELEMETRY,
-                    "Could not get method {} accepting {} from class {}",
-                    methodName,
-                    Arrays.toString(parameterTypes),
-                    clazz,
-                    t);
+                        LogCollector.EXCLUDE_TELEMETRY,
+                        "Could not get method {} accepting {} from class {}",
+                        methodName,
+                        Arrays.toString(parameterTypes),
+                        clazz,
+                        t);
                 return null;
-              }
-            });
-  }
-
-  public MethodHandle method(Class<?> clazz, Predicate<Method> filter) {
-    return AccessController.doPrivileged(
-        (PrivilegedAction<MethodHandle>)
-            () -> {
-              try {
+            }
+        });
+    }
+
+    public MethodHandle method(Class<?> clazz, Predicate<Method> filter) {
+        return AccessController.doPrivileged((PrivilegedAction<MethodHandle>) () -> {
+            try {
                 try {
-                  SecurityManager sm = System.getSecurityManager();
-                  if (sm != null) {
-                    String packageName = clazz.getPackage().getName();
-                    sm.checkPackageAccess(packageName);
-                  }
+                    SecurityManager sm = System.getSecurityManager();
+                    if (sm != null) {
+                        String packageName = clazz.getPackage().getName();
+                        sm.checkPackageAccess(packageName);
+                    }
                 } catch (UnsupportedOperationException e) {
-                  // ignore
+                    // ignore
                 }
 
                 Method[] methods = clazz.getDeclaredMethods();
                 for (Method method : methods) {
-                  if (filter.test(method)) {
-                    method.setAccessible(true);
-                    return lookup.unreflect(method);
-                  }
+                    if (filter.test(method)) {
+                        method.setAccessible(true);
+                        return lookup.unreflect(method);
+                    }
                 }
 
                 log.debug("Could not find desired method in class {}", clazz);
                 return null;
 
-              } catch (Throwable t) {
-                log.debug(
-                    LogCollector.EXCLUDE_TELEMETRY,
-                    "Could not find desired method in class {}",
-                    clazz,
-                    t);
+            } catch (Throwable t) {
+                log.debug(LogCollector.EXCLUDE_TELEMETRY, "Could not find desired method in class {}", clazz, t);
                 return null;
-              }
-            });
-  }
-
-  private Class<?> loadClass(String className) {
-    try {
-      return classLoader.loadClass(className);
-    } catch (Throwable t) {
-      log.debug(LogCollector.EXCLUDE_TELEMETRY, "Could not load class {}", className, t);
-      return null;
+            }
+        });
     }
-  }
 
-  @SuppressWarnings("unchecked")
-  public <T> T invoke(MethodHandle handle, Object... arguments) {
-    if (handle == null) {
-      return null;
+    private Class<?> loadClass(String className) {
+        try {
+            return classLoader.loadClass(className);
+        } catch (Throwable t) {
+            log.debug(LogCollector.EXCLUDE_TELEMETRY, "Could not load class {}", className, t);
+            return null;
+        }
     }
-    try {
-      return (T) handle.invokeWithArguments(arguments);
-    } catch (Throwable t) {
-      log.error(
-          "Error while invoking method handle {} with arguments {}",
-          handle,
-          Arrays.toString(arguments),
-          t);
-      return null;
+
+    @SuppressWarnings("unchecked")
+    public <T> T invoke(MethodHandle handle, Object... arguments) {
+        if (handle == null) {
+            return null;
+        }
+        try {
+            return (T) handle.invokeWithArguments(arguments);
+        } catch (Throwable t) {
+            log.error("Error while invoking method handle {} with arguments {}", handle, Arrays.toString(arguments), t);
+            return null;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/Numbers.java b/internal-api/src/main/java/datadog/trace/util/Numbers.java
index 284aa4b733a..8cf96fc2764 100644
--- a/internal-api/src/main/java/datadog/trace/util/Numbers.java
+++ b/internal-api/src/main/java/datadog/trace/util/Numbers.java
@@ -10,123 +10,123 @@
  */
 public final class Numbers {
 
-  private Numbers() {
-    // Utility class - prevent instantiation
-  }
-
-  /**
-   * Attempts to parse a string value as a number with fast-path validation to avoid throwing
-   * NumberFormatException for invalid inputs.
-   *
-   * <p>This method first validates that the string looks like a valid number before attempting to
-   * parse, significantly reducing overhead when processing non-numeric strings. The validation
-   * supports:
-   *
-   * <ul>
-   *   <li>Integers: "42", "-100", "+999"
-   *   <li>Decimals: "3.14", ".5", "5."
-   *   <li>Scientific notation: "1.5e10", "-3.5E-7", "2e+3"
-   *   <li>Whitespace: Trimmed before validation (e.g., " 42 " parses successfully)
-   * </ul>
-   *
-   * <p>Performance characteristics:
-   *
-   * <ul>
-   *   <li>Valid numeric strings: ~50-100 ns/op
-   *   <li>Invalid strings: ~40-70 ns/op (vs ~1000+ ns with exception-based parsing)
-   *   <li>Empty/null: ~5 ns/op
-   * </ul>
-   *
-   * @param value the string to parse, may be null
-   * @return a Long for plain integers, Double for decimals or scientific notation, or null if the
-   *     string is not a valid number
-   */
-  @Nullable
-  public static Number parseNumber(@Nullable String value) {
-    if (value == null || value.isEmpty()) {
-      return null;
+    private Numbers() {
+        // Utility class - prevent instantiation
     }
 
-    // Trim whitespace to handle common cases like " 42 " or "\t100\n"
-    String trimmed = value.trim();
-    if (trimmed.isEmpty()) {
-      return null;
-    }
+    /**
+     * Attempts to parse a string value as a number with fast-path validation to avoid throwing
+     * NumberFormatException for invalid inputs.
+     *
+     * <p>This method first validates that the string looks like a valid number before attempting to
+     * parse, significantly reducing overhead when processing non-numeric strings. The validation
+     * supports:
+     *
+     * <ul>
+     *   <li>Integers: "42", "-100", "+999"
+     *   <li>Decimals: "3.14", ".5", "5."
+     *   <li>Scientific notation: "1.5e10", "-3.5E-7", "2e+3"
+     *   <li>Whitespace: Trimmed before validation (e.g., " 42 " parses successfully)
+     * </ul>
+     *
+     * <p>Performance characteristics:
+     *
+     * <ul>
+     *   <li>Valid numeric strings: ~50-100 ns/op
+     *   <li>Invalid strings: ~40-70 ns/op (vs ~1000+ ns with exception-based parsing)
+     *   <li>Empty/null: ~5 ns/op
+     * </ul>
+     *
+     * @param value the string to parse, may be null
+     * @return a Long for plain integers, Double for decimals or scientific notation, or null if the
+     *     string is not a valid number
+     */
+    @Nullable
+    public static Number parseNumber(@Nullable String value) {
+        if (value == null || value.isEmpty()) {
+            return null;
+        }
 
-    // Fast-path validation: check if the string looks like a valid number
-    // before attempting to parse, to avoid expensive NumberFormatException throws
-    // Supports: integers, decimals, and scientific notation (e.g., "1.5e10", "-3E-7")
-    boolean hasDecimal = false;
-    boolean hasExponent = false;
-    int startIdx = 0;
-    int length = trimmed.length();
+        // Trim whitespace to handle common cases like " 42 " or "\t100\n"
+        String trimmed = value.trim();
+        if (trimmed.isEmpty()) {
+            return null;
+        }
 
-    // Handle optional leading sign
-    char firstChar = trimmed.charAt(0);
-    if (firstChar == '+' || firstChar == '-') {
-      startIdx = 1;
-      // Sign-only strings like "+" or "-" are not valid numbers
-      if (startIdx >= length) {
-        return null;
-      }
-    }
+        // Fast-path validation: check if the string looks like a valid number
+        // before attempting to parse, to avoid expensive NumberFormatException throws
+        // Supports: integers, decimals, and scientific notation (e.g., "1.5e10", "-3E-7")
+        boolean hasDecimal = false;
+        boolean hasExponent = false;
+        int startIdx = 0;
+        int length = trimmed.length();
 
-    // Validate characters: digits, optional decimal point, optional exponent
-    boolean hasDigits = false;
-    for (int i = startIdx; i < length; i++) {
-      char c = trimmed.charAt(i);
-      if (c == '.') {
-        if (hasDecimal || hasExponent) {
-          // Multiple decimal points or decimal after exponent - invalid
-          return null;
-        }
-        hasDecimal = true;
-      } else if (c == 'e' || c == 'E') {
-        if (hasExponent || !hasDigits) {
-          // Multiple exponents or exponent without preceding digits - invalid
-          return null;
+        // Handle optional leading sign
+        char firstChar = trimmed.charAt(0);
+        if (firstChar == '+' || firstChar == '-') {
+            startIdx = 1;
+            // Sign-only strings like "+" or "-" are not valid numbers
+            if (startIdx >= length) {
+                return null;
+            }
         }
-        hasExponent = true;
-        // Next character can be optional sign (+/-) followed by digits
-        if (i + 1 < length) {
-          char next = trimmed.charAt(i + 1);
-          if (next == '+' || next == '-') {
-            i++; // Skip the sign after exponent
-            // Must have at least one digit after exponent sign
-            if (i + 1 >= length) {
-              return null;
+
+        // Validate characters: digits, optional decimal point, optional exponent
+        boolean hasDigits = false;
+        for (int i = startIdx; i < length; i++) {
+            char c = trimmed.charAt(i);
+            if (c == '.') {
+                if (hasDecimal || hasExponent) {
+                    // Multiple decimal points or decimal after exponent - invalid
+                    return null;
+                }
+                hasDecimal = true;
+            } else if (c == 'e' || c == 'E') {
+                if (hasExponent || !hasDigits) {
+                    // Multiple exponents or exponent without preceding digits - invalid
+                    return null;
+                }
+                hasExponent = true;
+                // Next character can be optional sign (+/-) followed by digits
+                if (i + 1 < length) {
+                    char next = trimmed.charAt(i + 1);
+                    if (next == '+' || next == '-') {
+                        i++; // Skip the sign after exponent
+                        // Must have at least one digit after exponent sign
+                        if (i + 1 >= length) {
+                            return null;
+                        }
+                    }
+                } else {
+                    // Exponent must be followed by digits
+                    return null;
+                }
+            } else if (c >= '0' && c <= '9') {
+                hasDigits = true;
+            } else {
+                // Non-digit, non-decimal, non-exponent character - invalid
+                return null;
             }
-          }
-        } else {
-          // Exponent must be followed by digits
-          return null;
         }
-      } else if (c >= '0' && c <= '9') {
-        hasDigits = true;
-      } else {
-        // Non-digit, non-decimal, non-exponent character - invalid
-        return null;
-      }
-    }
 
-    // Must have at least one digit (reject strings like ".", "+.", "e10")
-    if (!hasDigits) {
-      return null;
-    }
+        // Must have at least one digit (reject strings like ".", "+.", "e10")
+        if (!hasDigits) {
+            return null;
+        }
 
-    // Now attempt parsing - the try-catch remains as a fallback for overflow cases
-    // (e.g., Long.MAX_VALUE+1) or other edge cases that passed pre-validation
-    try {
-      if (hasDecimal || hasExponent) {
-        // Parse as Double for decimals and scientific notation
-        return Double.parseDouble(trimmed);
-      } else {
-        // Parse as Long for plain integers
-        return Long.parseLong(trimmed);
-      }
-    } catch (NumberFormatException e) {
-      // Overflow or other parse failure despite pre-check (rare)
-      return null;
+        // Now attempt parsing - the try-catch remains as a fallback for overflow cases
+        // (e.g., Long.MAX_VALUE+1) or other edge cases that passed pre-validation
+        try {
+            if (hasDecimal || hasExponent) {
+                // Parse as Double for decimals and scientific notation
+                return Double.parseDouble(trimmed);
+            } else {
+                // Parse as Long for plain integers
+                return Long.parseLong(trimmed);
+            }
+        } catch (NumberFormatException e) {
+            // Overflow or other parse failure despite pre-check (rare)
+            return null;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/PidHelper.java b/internal-api/src/main/java/datadog/trace/util/PidHelper.java
index 887dd3900e8..cf66c7e5754 100644
--- a/internal-api/src/main/java/datadog/trace/util/PidHelper.java
+++ b/internal-api/src/main/java/datadog/trace/util/PidHelper.java
@@ -23,150 +23,145 @@
 /** Get PID in reasonably cross-platform way. */
 @SuppressForbidden
 public final class PidHelper {
-  private static final Logger log = LoggerFactory.getLogger(PidHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(PidHelper.class);
 
-  private static final String PID = findPid();
+    private static final String PID = findPid();
 
-  private static final long PID_AS_LONG = parsePid();
+    private static final long PID_AS_LONG = parsePid();
 
-  public static String getPid() {
-    return PID;
-  }
-
-  /** Returns 0 if the PID is not a number. */
-  public static long getPidAsLong() {
-    return PID_AS_LONG;
-  }
+    public static String getPid() {
+        return PID;
+    }
 
-  @SuppressWarnings("unchecked")
-  private static String findPid() {
-    String pid = "";
-    if (JavaVirtualMachine.isJavaVersionAtLeast(9)) {
-      try {
-        pid =
-            ((Supplier<String>)
-                    Class.forName("datadog.trace.util.JDK9PidSupplier")
-                        .getDeclaredConstructor()
-                        .newInstance())
-                .get()
-                .trim();
-      } catch (Throwable e) {
-        log.debug("JDK9PidSupplier not available", e);
-      }
+    /** Returns 0 if the PID is not a number. */
+    public static long getPidAsLong() {
+        return PID_AS_LONG;
     }
-    if (pid.isEmpty()) {
-      try {
-        // assumption: first part of runtime vmId is our process id
-        String vmId = ManagementFactory.getRuntimeMXBean().getName();
-        int pidEnd = vmId.indexOf('@');
-        if (pidEnd > 0) {
-          pid = vmId.substring(0, pidEnd).trim();
+
+    @SuppressWarnings("unchecked")
+    private static String findPid() {
+        String pid = "";
+        if (JavaVirtualMachine.isJavaVersionAtLeast(9)) {
+            try {
+                pid = ((Supplier<String>) Class.forName("datadog.trace.util.JDK9PidSupplier")
+                                .getDeclaredConstructor()
+                                .newInstance())
+                        .get()
+                        .trim();
+            } catch (Throwable e) {
+                log.debug("JDK9PidSupplier not available", e);
+            }
         }
-      } catch (Throwable e) {
-        log.debug("Process id not available", e);
-      }
+        if (pid.isEmpty()) {
+            try {
+                // assumption: first part of runtime vmId is our process id
+                String vmId = ManagementFactory.getRuntimeMXBean().getName();
+                int pidEnd = vmId.indexOf('@');
+                if (pidEnd > 0) {
+                    pid = vmId.substring(0, pidEnd).trim();
+                }
+            } catch (Throwable e) {
+                log.debug("Process id not available", e);
+            }
+        }
+        return pid;
     }
-    return pid;
-  }
 
-  private static String getTempDir() {
-    if (!JavaVirtualMachine.isJ9()) {
-      // See
-      // https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-gettemppatha#remarks
-      // and
-      // the JDK OS-specific implementations of os::get_temp_directory(), i.e.
-      // https://github.com/openjdk/jdk/blob/f50bd0d9ec65a6b9596805d0131aaefc1bb913f3/src/hotspot/os/bsd/os_bsd.cpp#L886-L904
-      if (OperatingSystem.isLinux()) {
-        return "/tmp";
-      } else if (OperatingSystem.isWindows()) {
-        return Stream.of("TMP", "TEMP", "USERPROFILE")
-            .map(ConfigHelper::env)
-            .filter(Objects::nonNull)
-            .filter(((Predicate<String>) String::isEmpty).negate())
-            .findFirst()
-            .orElse("C:\\Windows");
-      } else if (OperatingSystem.isMacOs()) {
-        return ConfigHelper.env("TMPDIR");
-      } else {
-        return SystemProperties.get("java.io.tmpdir");
-      }
-    } else {
-      try {
-        https: // github.com/eclipse-openj9/openj9/blob/196082df056a990756a5571bfac29585fbbfbb42/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/IPC.java#L351
-        return (String)
-            Class.forName("openj9.internal.tools.attach.target.IPC")
-                .getDeclaredMethod("getTmpDir")
-                .invoke(null);
-      } catch (Throwable t) {
-        // Fall back to constants based on J9 source code, may not have perfect coverage
-        String tmpDir = SystemProperties.get("java.io.tmpdir");
-        if (tmpDir != null && !tmpDir.isEmpty()) {
-          return tmpDir;
-        } else if (OperatingSystem.isWindows()) {
-          return "C:\\Documents";
+    private static String getTempDir() {
+        if (!JavaVirtualMachine.isJ9()) {
+            // See
+            // https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-gettemppatha#remarks
+            // and
+            // the JDK OS-specific implementations of os::get_temp_directory(), i.e.
+            // https://github.com/openjdk/jdk/blob/f50bd0d9ec65a6b9596805d0131aaefc1bb913f3/src/hotspot/os/bsd/os_bsd.cpp#L886-L904
+            if (OperatingSystem.isLinux()) {
+                return "/tmp";
+            } else if (OperatingSystem.isWindows()) {
+                return Stream.of("TMP", "TEMP", "USERPROFILE")
+                        .map(ConfigHelper::env)
+                        .filter(Objects::nonNull)
+                        .filter(((Predicate<String>) String::isEmpty).negate())
+                        .findFirst()
+                        .orElse("C:\\Windows");
+            } else if (OperatingSystem.isMacOs()) {
+                return ConfigHelper.env("TMPDIR");
+            } else {
+                return SystemProperties.get("java.io.tmpdir");
+            }
         } else {
-          return "/tmp";
+            try {
+                https: // github.com/eclipse-openj9/openj9/blob/196082df056a990756a5571bfac29585fbbfbb42/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/IPC.java#L351
+                return (String) Class.forName("openj9.internal.tools.attach.target.IPC")
+                        .getDeclaredMethod("getTmpDir")
+                        .invoke(null);
+            } catch (Throwable t) {
+                // Fall back to constants based on J9 source code, may not have perfect coverage
+                String tmpDir = SystemProperties.get("java.io.tmpdir");
+                if (tmpDir != null && !tmpDir.isEmpty()) {
+                    return tmpDir;
+                } else if (OperatingSystem.isWindows()) {
+                    return "C:\\Documents";
+                } else {
+                    return "/tmp";
+                }
+            }
         }
-      }
     }
-  }
 
-  private static Path getJavaProcessesDir() {
-    if (JavaVirtualMachine.isJ9()) {
-      // J9 uses a different temporary directory AND subdirectory for storing jps / attach-related
-      // info
-      // https://github.com/eclipse-openj9/openj9/blob/196082df056a990756a5571bfac29585fbbfbb42/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/CommonDirectory.java#L94
-      return Paths.get(getTempDir(), ".com_ibm_tools_attach");
-    } else {
-      // Emulating the hotspot way to enumerate the JVM processes using the perfdata file
-      // https://github.com/openjdk/jdk/blob/d7cb933b89839b692f5562aeeb92076cd25a99f6/src/hotspot/share/runtime/perfMemory.cpp#L244
-      return Paths.get(getTempDir(), "hsperfdata_" + SystemProperties.get("user.name"));
+    private static Path getJavaProcessesDir() {
+        if (JavaVirtualMachine.isJ9()) {
+            // J9 uses a different temporary directory AND subdirectory for storing jps / attach-related
+            // info
+            // https://github.com/eclipse-openj9/openj9/blob/196082df056a990756a5571bfac29585fbbfbb42/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/CommonDirectory.java#L94
+            return Paths.get(getTempDir(), ".com_ibm_tools_attach");
+        } else {
+            // Emulating the hotspot way to enumerate the JVM processes using the perfdata file
+            // https://github.com/openjdk/jdk/blob/d7cb933b89839b692f5562aeeb92076cd25a99f6/src/hotspot/share/runtime/perfMemory.cpp#L244
+            return Paths.get(getTempDir(), "hsperfdata_" + SystemProperties.get("user.name"));
+        }
     }
-  }
 
-  public static Set<String> getJavaPids() {
-    try (Stream<Path> stream = Files.list(getJavaProcessesDir())) {
-      return stream
-          .map(Path::getFileName)
-          .map(Path::toString)
-          .filter(
-              (name) -> {
-                // On J9, additional metadata files are present alongside files named $PID.
-                // Additionally, the contents of the ps dir are files with process ID files for
-                // Hotspot,
-                // but they are directories for J9.
-                // This also makes sense as defensive programming.
-                if (name.isEmpty()) {
-                  return false;
-                }
-                char c = name.charAt(0);
-                if (c < '0' || c > '9') {
-                  // Short-circuit - let's not parse as long something that is definitely not a long
-                  // number
-                  return false;
-                }
-                long pid = -1;
-                try {
-                  pid = Long.parseLong(name);
-                } catch (NumberFormatException ignored) {
-                }
-                return pid != -1;
-              })
-          .collect(Collectors.toSet());
-    } catch (IOException e) {
-      log.debug("Unable to obtain Java PIDs", e);
+    public static Set<String> getJavaPids() {
+        try (Stream<Path> stream = Files.list(getJavaProcessesDir())) {
+            return stream.map(Path::getFileName)
+                    .map(Path::toString)
+                    .filter((name) -> {
+                        // On J9, additional metadata files are present alongside files named $PID.
+                        // Additionally, the contents of the ps dir are files with process ID files for
+                        // Hotspot,
+                        // but they are directories for J9.
+                        // This also makes sense as defensive programming.
+                        if (name.isEmpty()) {
+                            return false;
+                        }
+                        char c = name.charAt(0);
+                        if (c < '0' || c > '9') {
+                            // Short-circuit - let's not parse as long something that is definitely not a long
+                            // number
+                            return false;
+                        }
+                        long pid = -1;
+                        try {
+                            pid = Long.parseLong(name);
+                        } catch (NumberFormatException ignored) {
+                        }
+                        return pid != -1;
+                    })
+                    .collect(Collectors.toSet());
+        } catch (IOException e) {
+            log.debug("Unable to obtain Java PIDs", e);
+        }
+        return Collections.emptySet();
     }
-    return Collections.emptySet();
-  }
 
-  private static long parsePid() {
-    if (!PID.isEmpty()) {
-      try {
-        return Long.parseLong(PID);
-      } catch (NumberFormatException e) {
-        log.warn("Cannot parse PID {} as number. Default to 0", PID, e);
-      }
+    private static long parsePid() {
+        if (!PID.isEmpty()) {
+            try {
+                return Long.parseLong(PID);
+            } catch (NumberFormatException e) {
+                log.warn("Cannot parse PID {} as number. Default to 0", PID, e);
+            }
+        }
+        return 0L;
     }
-    return 0L;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/ProcessSupervisor.java b/internal-api/src/main/java/datadog/trace/util/ProcessSupervisor.java
index 006d921bec9..6c8f5ea4c35 100644
--- a/internal-api/src/main/java/datadog/trace/util/ProcessSupervisor.java
+++ b/internal-api/src/main/java/datadog/trace/util/ProcessSupervisor.java
@@ -17,138 +17,137 @@
 /** Starts an external process and restarts the process if it dies */
 public class ProcessSupervisor implements Closeable {
 
-  public enum Health {
-    NEVER_CHECKED,
-    READY_TO_START,
-    INTERRUPTED,
-    FAULTED,
-    HEALTHY
-  }
-
-  @FunctionalInterface
-  public interface HealthCheck {
-    Health run(Health previousHealth) throws InterruptedException;
-  }
-
-  public static final HealthCheck ALWAYS_READY = health -> READY_TO_START;
-
-  private static final Logger log = LoggerFactory.getLogger(ProcessSupervisor.class);
-
-  private static final long HEALTHY_DELAY_MILLIS = 10_000;
-  private static final long FAULTED_DELAY_MILLIS = 2_000;
-  private static final int MAX_FAULTS = 5;
-
-  private final String imageName;
-  private final ProcessBuilder processBuilder;
-  private final HealthCheck healthCheck;
-  private final Thread supervisorThread;
-
-  private long nextCheckMillis = 0;
-  private Health currentHealth = Health.NEVER_CHECKED;
-  private Process currentProcess;
-  private int faults;
-
-  private volatile boolean stopping = false;
-
-  /**
-   * @param imageName For logging purposes
-   * @param processBuilder Builder to create the process
-   */
-  public ProcessSupervisor(String imageName, ProcessBuilder processBuilder) {
-    this(imageName, processBuilder, ALWAYS_READY);
-  }
-
-  public ProcessSupervisor(
-      String imageName, ProcessBuilder processBuilder, HealthCheck healthCheck) {
-    this.imageName = imageName;
-    this.processBuilder = processBuilder;
-    this.healthCheck = healthCheck;
-    this.supervisorThread = AgentThreadFactory.newAgentThread(PROCESS_SUPERVISOR, this::mainLoop);
-    this.supervisorThread.start();
-  }
-
-  private void mainLoop() {
-    try {
-      while (!stopping) {
-        if (currentHealth == FAULTED && ++faults >= MAX_FAULTS) {
-          log.warn("Failed to start process [{}] after {} attempts", imageName, faults);
-          break;
-        }
+    public enum Health {
+        NEVER_CHECKED,
+        READY_TO_START,
+        INTERRUPTED,
+        FAULTED,
+        HEALTHY
+    }
+
+    @FunctionalInterface
+    public interface HealthCheck {
+        Health run(Health previousHealth) throws InterruptedException;
+    }
+
+    public static final HealthCheck ALWAYS_READY = health -> READY_TO_START;
+
+    private static final Logger log = LoggerFactory.getLogger(ProcessSupervisor.class);
+
+    private static final long HEALTHY_DELAY_MILLIS = 10_000;
+    private static final long FAULTED_DELAY_MILLIS = 2_000;
+    private static final int MAX_FAULTS = 5;
+
+    private final String imageName;
+    private final ProcessBuilder processBuilder;
+    private final HealthCheck healthCheck;
+    private final Thread supervisorThread;
+
+    private long nextCheckMillis = 0;
+    private Health currentHealth = Health.NEVER_CHECKED;
+    private Process currentProcess;
+    private int faults;
+
+    private volatile boolean stopping = false;
+
+    /**
+     * @param imageName For logging purposes
+     * @param processBuilder Builder to create the process
+     */
+    public ProcessSupervisor(String imageName, ProcessBuilder processBuilder) {
+        this(imageName, processBuilder, ALWAYS_READY);
+    }
+
+    public ProcessSupervisor(String imageName, ProcessBuilder processBuilder, HealthCheck healthCheck) {
+        this.imageName = imageName;
+        this.processBuilder = processBuilder;
+        this.healthCheck = healthCheck;
+        this.supervisorThread = AgentThreadFactory.newAgentThread(PROCESS_SUPERVISOR, this::mainLoop);
+        this.supervisorThread.start();
+    }
+
+    private void mainLoop() {
         try {
-          long delayMillis = nextCheckMillis - System.currentTimeMillis();
-          if (delayMillis > 0) {
-            Thread.sleep(delayMillis);
-          }
-          currentHealth = healthCheck.run(currentHealth);
-          if (currentHealth == READY_TO_START) {
-            startProcessAndWait();
-          }
-        } catch (InterruptedException e) {
-          currentHealth = INTERRUPTED;
-        } catch (Throwable e) {
-          log.warn("Exception starting process: [{}]", imageName, e);
-          currentHealth = FAULTED;
+            while (!stopping) {
+                if (currentHealth == FAULTED && ++faults >= MAX_FAULTS) {
+                    log.warn("Failed to start process [{}] after {} attempts", imageName, faults);
+                    break;
+                }
+                try {
+                    long delayMillis = nextCheckMillis - System.currentTimeMillis();
+                    if (delayMillis > 0) {
+                        Thread.sleep(delayMillis);
+                    }
+                    currentHealth = healthCheck.run(currentHealth);
+                    if (currentHealth == READY_TO_START) {
+                        startProcessAndWait();
+                    }
+                } catch (InterruptedException e) {
+                    currentHealth = INTERRUPTED;
+                } catch (Throwable e) {
+                    log.warn("Exception starting process: [{}]", imageName, e);
+                    currentHealth = FAULTED;
+                }
+                scheduleNextHealthCheck();
+            }
+        } finally {
+            stopProcess();
         }
-        scheduleNextHealthCheck();
-      }
-    } finally {
-      stopProcess();
     }
-  }
-
-  private void scheduleNextHealthCheck() {
-    long now = System.currentTimeMillis();
-    if (currentHealth == HEALTHY) {
-      nextCheckMillis = now + HEALTHY_DELAY_MILLIS;
-    } else if (currentHealth == FAULTED) {
-      nextCheckMillis = now + FAULTED_DELAY_MILLIS;
-    } else { // interrupted
-      nextCheckMillis = Long.max(nextCheckMillis, now + 100);
+
+    private void scheduleNextHealthCheck() {
+        long now = System.currentTimeMillis();
+        if (currentHealth == HEALTHY) {
+            nextCheckMillis = now + HEALTHY_DELAY_MILLIS;
+        } else if (currentHealth == FAULTED) {
+            nextCheckMillis = now + FAULTED_DELAY_MILLIS;
+        } else { // interrupted
+            nextCheckMillis = Long.max(nextCheckMillis, now + 100);
+        }
     }
-  }
-
-  private void startProcessAndWait() throws Exception {
-    if (currentProcess == null) {
-      log.debug("Starting process: [{}]", imageName);
-      try (TraceScope ignored = AgentTracer.get().muteTracing()) {
-        currentProcess = processBuilder.start();
-      }
-      currentHealth = HEALTHY;
-      faults = 0;
+
+    private void startProcessAndWait() throws Exception {
+        if (currentProcess == null) {
+            log.debug("Starting process: [{}]", imageName);
+            try (TraceScope ignored = AgentTracer.get().muteTracing()) {
+                currentProcess = processBuilder.start();
+            }
+            currentHealth = HEALTHY;
+            faults = 0;
+        }
+
+        // Block until the process exits
+        int code = currentProcess.waitFor();
+        log.debug("Process [{}] has exited with code {}", imageName, code);
+        currentHealth = code == 0 ? INTERRUPTED : FAULTED;
+
+        // Process is dead, no longer needs to be tracked
+        currentProcess = null;
     }
 
-    // Block until the process exits
-    int code = currentProcess.waitFor();
-    log.debug("Process [{}] has exited with code {}", imageName, code);
-    currentHealth = code == 0 ? INTERRUPTED : FAULTED;
-
-    // Process is dead, no longer needs to be tracked
-    currentProcess = null;
-  }
-
-  private void stopProcess() {
-    if (currentProcess != null) {
-      log.debug("Stopping process: [{}]", imageName);
-      currentProcess.destroy();
-      if (currentProcess.isAlive()) {
-        currentProcess.destroyForcibly();
-      }
-      currentProcess = null;
+    private void stopProcess() {
+        if (currentProcess != null) {
+            log.debug("Stopping process: [{}]", imageName);
+            currentProcess.destroy();
+            if (currentProcess.isAlive()) {
+                currentProcess.destroyForcibly();
+            }
+            currentProcess = null;
+        }
     }
-  }
-
-  @Override
-  public void close() {
-    stopping = true;
-    supervisorThread.interrupt();
-    try {
-      supervisorThread.join(THREAD_JOIN_TIMOUT_MS);
-    } catch (Throwable ignored) {
+
+    @Override
+    public void close() {
+        stopping = true;
+        supervisorThread.interrupt();
+        try {
+            supervisorThread.join(THREAD_JOIN_TIMOUT_MS);
+        } catch (Throwable ignored) {
+        }
     }
-  }
 
-  @VisibleForTesting
-  Process getCurrentProcess() {
-    return currentProcess;
-  }
+    @VisibleForTesting
+    Process getCurrentProcess() {
+        return currentProcess;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/ProcessUtils.java b/internal-api/src/main/java/datadog/trace/util/ProcessUtils.java
index 1a1e41c1f91..a876f2d4ed6 100644
--- a/internal-api/src/main/java/datadog/trace/util/ProcessUtils.java
+++ b/internal-api/src/main/java/datadog/trace/util/ProcessUtils.java
@@ -10,42 +10,41 @@
 
 public abstract class ProcessUtils {
 
-  private static final Logger log = LoggerFactory.getLogger(ProcessUtils.class);
+    private static final Logger log = LoggerFactory.getLogger(ProcessUtils.class);
 
-  /**
-   * Attempts to get path to the JVM that is used by the current process.
-   *
-   * <p>This is done on the best effort basis: depending on the Java version, vendor, current OS or
-   * other environment details this method might return either of the following:
-   *
-   * <ul>
-   *   <li>Path to the {@code java} command that was used to start the process
-   *   <li>Path to home dir of the JDK/JRE that the process uses
-   *   <li>{@code null} if neither of the options above is available
-   * </ul>
-   *
-   * @return Path to the {@code java} command, JDK/JRE home, or {@code null} if neither could be
-   *     determined
-   */
-  @Nullable
-  @SuppressForbidden
-  public static String getCurrentJvmPath() {
-    if (JavaVirtualMachine.isJavaVersionAtLeast(9)) {
-      try {
-        Supplier<String> jdk9Supplier =
-            (Supplier<String>)
-                Class.forName("datadog.trace.util.JDK9ExecutableSupplier")
-                    .getDeclaredConstructor()
-                    .newInstance();
-        return jdk9Supplier.get();
-      } catch (Throwable e) {
-        log.debug("Could not get process executable path using JDK9ExecutableSupplier", e);
-      }
-    }
+    /**
+     * Attempts to get path to the JVM that is used by the current process.
+     *
+     * <p>This is done on the best effort basis: depending on the Java version, vendor, current OS or
+     * other environment details this method might return either of the following:
+     *
+     * <ul>
+     *   <li>Path to the {@code java} command that was used to start the process
+     *   <li>Path to home dir of the JDK/JRE that the process uses
+     *   <li>{@code null} if neither of the options above is available
+     * </ul>
+     *
+     * @return Path to the {@code java} command, JDK/JRE home, or {@code null} if neither could be
+     *     determined
+     */
+    @Nullable
+    @SuppressForbidden
+    public static String getCurrentJvmPath() {
+        if (JavaVirtualMachine.isJavaVersionAtLeast(9)) {
+            try {
+                Supplier<String> jdk9Supplier =
+                        (Supplier<String>) Class.forName("datadog.trace.util.JDK9ExecutableSupplier")
+                                .getDeclaredConstructor()
+                                .newInstance();
+                return jdk9Supplier.get();
+            } catch (Throwable e) {
+                log.debug("Could not get process executable path using JDK9ExecutableSupplier", e);
+            }
+        }
 
-    // JDK/JRE home, does not include "bin/java" portion
-    return SystemProperties.get("java.home");
-  }
+        // JDK/JRE home, does not include "bin/java" portion
+        return SystemProperties.get("java.home");
+    }
 
-  private ProcessUtils() {}
+    private ProcessUtils() {}
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/PropagationUtils.java b/internal-api/src/main/java/datadog/trace/util/PropagationUtils.java
index 19f08ac7778..1bcbafb16a0 100644
--- a/internal-api/src/main/java/datadog/trace/util/PropagationUtils.java
+++ b/internal-api/src/main/java/datadog/trace/util/PropagationUtils.java
@@ -6,28 +6,26 @@
 import java.util.LinkedHashSet;
 
 public class PropagationUtils {
-  private PropagationUtils() {
-    // avoid constructing instances of this class.
-  }
+    private PropagationUtils() {
+        // avoid constructing instances of this class.
+    }
 
-  /** The list of the known propagation headers. They must be lowercased. */
-  public static final Collection<String> KNOWN_PROPAGATION_HEADERS =
-      Collections.unmodifiableCollection(
-          new LinkedHashSet<>(
-              Arrays.asList(
-                  // W3C headers
-                  "traceparent",
-                  "tracestate",
-                  // DD headers
-                  "x-datadog-trace-id",
-                  "x-datadog-parent-id",
-                  "x-datadog-sampling-priority",
-                  "x-datadog-origin",
-                  "x-datadog-tags",
-                  // B3 single headers
-                  "x-b3-traceid",
-                  "x-b3-spanid",
-                  "x-b3-sampled",
-                  // B3 multi header
-                  "b3")));
+    /** The list of the known propagation headers. They must be lowercased. */
+    public static final Collection<String> KNOWN_PROPAGATION_HEADERS =
+            Collections.unmodifiableCollection(new LinkedHashSet<>(Arrays.asList(
+                    // W3C headers
+                    "traceparent",
+                    "tracestate",
+                    // DD headers
+                    "x-datadog-trace-id",
+                    "x-datadog-parent-id",
+                    "x-datadog-sampling-priority",
+                    "x-datadog-origin",
+                    "x-datadog-tags",
+                    // B3 single headers
+                    "x-b3-traceid",
+                    "x-b3-spanid",
+                    "x-b3-sampled",
+                    // B3 multi header
+                    "b3")));
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/RandomUtils.java b/internal-api/src/main/java/datadog/trace/util/RandomUtils.java
index e8ccee710b1..3f9550603bc 100644
--- a/internal-api/src/main/java/datadog/trace/util/RandomUtils.java
+++ b/internal-api/src/main/java/datadog/trace/util/RandomUtils.java
@@ -6,24 +6,24 @@
 import java.util.concurrent.ThreadLocalRandom;
 
 public final class RandomUtils {
-  private RandomUtils() {}
+    private RandomUtils() {}
 
-  /** Returns a random UUID. */
-  public static UUID randomUUID() {
-    Random rnd = ThreadLocalRandom.current();
-    long msb = (rnd.nextLong() & 0xffff_ffff_ffff_0fffL) | 0x0000_0000_0000_4000L;
-    long lsb = (rnd.nextLong() & 0x3fff_ffff_ffff_ffffL) | 0x8000_0000_0000_0000L;
-    return new UUID(msb, lsb);
-  }
+    /** Returns a random UUID. */
+    public static UUID randomUUID() {
+        Random rnd = ThreadLocalRandom.current();
+        long msb = (rnd.nextLong() & 0xffff_ffff_ffff_0fffL) | 0x0000_0000_0000_4000L;
+        long lsb = (rnd.nextLong() & 0x3fff_ffff_ffff_ffffL) | 0x8000_0000_0000_0000L;
+        return new UUID(msb, lsb);
+    }
 
-  /**
-   * Returns a cryptographically strong random UUID.
-   *
-   * <p>Note on some systems this may have a side effect of initializing java.util.logging, so its
-   * use should be avoided during premain.
-   */
-  @SuppressForbidden
-  public static UUID secureRandomUUID() {
-    return UUID.randomUUID();
-  }
+    /**
+     * Returns a cryptographically strong random UUID.
+     *
+     * <p>Note on some systems this may have a side effect of initializing java.util.logging, so its
+     * use should be avoided during premain.
+     */
+    @SuppressForbidden
+    public static UUID secureRandomUUID() {
+        return UUID.randomUUID();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/SizeCheckedInputStream.java b/internal-api/src/main/java/datadog/trace/util/SizeCheckedInputStream.java
index d9319d1fbf4..5be6cd71ac0 100644
--- a/internal-api/src/main/java/datadog/trace/util/SizeCheckedInputStream.java
+++ b/internal-api/src/main/java/datadog/trace/util/SizeCheckedInputStream.java
@@ -6,50 +6,50 @@
 
 /** Wraps input stream to check a maximum allowed size */
 public class SizeCheckedInputStream extends FilterInputStream {
-  private final long maxSize;
-  private long currentSize;
-
-  public SizeCheckedInputStream(InputStream in, long maxSize) {
-    super(in);
-    this.maxSize = maxSize;
-  }
-
-  @Override
-  public int read() throws IOException {
-    checkSize(1);
-    int v = super.read();
-    if (v != -1) {
-      updateCurrentSize(1);
+    private final long maxSize;
+    private long currentSize;
+
+    public SizeCheckedInputStream(InputStream in, long maxSize) {
+        super(in);
+        this.maxSize = maxSize;
+    }
+
+    @Override
+    public int read() throws IOException {
+        checkSize(1);
+        int v = super.read();
+        if (v != -1) {
+            updateCurrentSize(1);
+        }
+        return v;
     }
-    return v;
-  }
-
-  @Override
-  public int read(byte[] b) throws IOException {
-    return read(b, 0, b.length);
-  }
-
-  @Override
-  public int read(byte[] b, int off, int len) throws IOException {
-    if (maxSize == currentSize) {
-      throw new IOException("Reached maximum bytes for this stream: " + maxSize);
+
+    @Override
+    public int read(byte[] b) throws IOException {
+        return read(b, 0, b.length);
     }
 
-    long safeLen = Math.min(len, maxSize - currentSize);
-    checkSize(safeLen);
-    return updateCurrentSize(super.read(b, off, (int) safeLen));
-  }
+    @Override
+    public int read(byte[] b, int off, int len) throws IOException {
+        if (maxSize == currentSize) {
+            throw new IOException("Reached maximum bytes for this stream: " + maxSize);
+        }
+
+        long safeLen = Math.min(len, maxSize - currentSize);
+        checkSize(safeLen);
+        return updateCurrentSize(super.read(b, off, (int) safeLen));
+    }
 
-  private int updateCurrentSize(int delta) {
-    if (delta > 0) {
-      currentSize += delta;
+    private int updateCurrentSize(int delta) {
+        if (delta > 0) {
+            currentSize += delta;
+        }
+        return delta;
     }
-    return delta;
-  }
 
-  private void checkSize(long neededBytes) throws IOException {
-    if (currentSize + neededBytes > maxSize) {
-      throw new IOException("Reached maximum bytes for this stream: " + maxSize);
+    private void checkSize(long neededBytes) throws IOException {
+        if (currentSize + neededBytes > maxSize) {
+            throw new IOException("Reached maximum bytes for this stream: " + maxSize);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/StringIndex.java b/internal-api/src/main/java/datadog/trace/util/StringIndex.java
index d5f848b6f41..e4ff78ffec0 100644
--- a/internal-api/src/main/java/datadog/trace/util/StringIndex.java
+++ b/internal-api/src/main/java/datadog/trace/util/StringIndex.java
@@ -49,342 +49,338 @@
  * at any factor &lt; 1, so no rehash is needed.)
  */
 public final class StringIndex {
-  private final int[] hashes;
-  private final String[] names;
-
-  private StringIndex(int[] hashes, String[] names) {
-    this.hashes = hashes;
-    this.names = names;
-  }
-
-  /**
-   * Convenience instance — wraps the placed arrays. For the hot path prefer raw {@link
-   * EmbeddingSupport}.
-   */
-  public static StringIndex of(String... names) {
-    Data data = EmbeddingSupport.create(names);
-    return new StringIndex(data.hashes, data.names);
-  }
-
-  /**
-   * Slot of {@code name}, or -1. Delegates to {@link EmbeddingSupport} on the instance's arrays.
-   */
-  public int indexOf(String name) {
-    return EmbeddingSupport.indexOf(this.hashes, this.names, name);
-  }
-
-  public boolean contains(String name) {
-    return EmbeddingSupport.indexOf(this.hashes, this.names, name) >= 0;
-  }
-
-  /** Table size — allocate parallel payload arrays of this length. */
-  public int numSlots() {
-    return hashes.length;
-  }
-
-  // --- value mapping: build a slot-aligned parallel array (off the hot path) ---
-
-  /**
-   * Builds a slot-aligned {@code T[]} of values: {@code out[indexOf(name)] == fn.apply(name)} for
-   * every indexed name; other slots stay {@code null}. {@code type} is the array element type (Java
-   * can't allocate a generic array without it). Pair with {@link #lookup(Object[], String)}.
-   */
-  public <T> T[] mapValues(Class<T> type, Function<String, T> fn) {
-    return EmbeddingSupport.mapValues(this.names, type, fn);
-  }
-
-  /** Slot-aligned {@code int[]} of values; absent slots stay 0. See {@link #mapValues}. */
-  public int[] mapIntValues(ToIntFunction<String> fn) {
-    return EmbeddingSupport.mapIntValues(this.names, fn);
-  }
-
-  /** Slot-aligned {@code long[]} of values; absent slots stay 0. See {@link #mapValues}. */
-  public long[] mapLongValues(ToLongFunction<String> fn) {
-    return EmbeddingSupport.mapLongValues(this.names, fn);
-  }
-
-  // --- lookup: resolve a key and read its parallel value in one call ---
-
-  /** {@code data[indexOf(key)]}, or {@code null} when {@code key} is absent. */
-  public <T> T lookup(T[] data, String key) {
-    return EmbeddingSupport.lookup(this.hashes, this.names, data, key);
-  }
-
-  /** {@code data[indexOf(key)]}, or {@code defaultValue} when {@code key} is absent. */
-  public <T> T lookupOrDefault(T[] data, String key, T defaultValue) {
-    return EmbeddingSupport.lookupOrDefault(this.hashes, this.names, data, key, defaultValue);
-  }
-
-  /** {@code data[indexOf(key)]}, or 0 when {@code key} is absent. */
-  public int lookup(int[] data, String key) {
-    return EmbeddingSupport.lookup(this.hashes, this.names, data, key);
-  }
-
-  /** {@code data[indexOf(key)]}, or {@code defaultValue} when {@code key} is absent. */
-  public int lookupOrDefault(int[] data, String key, int defaultValue) {
-    return EmbeddingSupport.lookupOrDefault(this.hashes, this.names, data, key, defaultValue);
-  }
-
-  /** {@code data[indexOf(key)]}, or 0 when {@code key} is absent. */
-  public long lookup(long[] data, String key) {
-    return EmbeddingSupport.lookup(this.hashes, this.names, data, key);
-  }
-
-  /** {@code data[indexOf(key)]}, or {@code defaultValue} when {@code key} is absent. */
-  public long lookupOrDefault(long[] data, String key, long defaultValue) {
-    return EmbeddingSupport.lookupOrDefault(this.hashes, this.names, data, key, defaultValue);
-  }
-
-  /** Build-time carrier. Pull the fields into your own (static final) fields; don't keep this. */
-  public static final class Data {
-    public final int[] hashes;
-    public final String[] names;
-
-    Data(int[] hashes, String[] names) {
-      this.hashes = hashes;
-      this.names = names;
-    }
-  }
-
-  /**
-   * Static algorithm over raw arrays. Query helpers take raw arrays, never a Data or a StringIndex.
-   *
-   * <pre>{@code
-   * private static final int[] METHOD_HASHES;
-   * private static final String[] METHOD_NAMES;
-   * private static final int[] METHOD_IDS;
-   *
-   * static {
-   *   Data data = EmbeddingSupport.create("GET", "POST", "PUT");
-   *   METHOD_HASHES = data.hashes;
-   *   METHOD_NAMES = data.names;
-   *   METHOD_IDS = EmbeddingSupport.mapIntValues(data.names, name -> nextMethodId());
-   * }
-   *
-   * ...
-   * int id = EmbeddingSupport.lookupOrDefault(
-   *     METHOD_HASHES, METHOD_NAMES, METHOD_IDS, incomingMethod, UNKNOWN_METHOD_ID);
-   * }</pre>
-   */
-  public static final class EmbeddingSupport {
-    private EmbeddingSupport() {}
-
-    /** Spread of String.hashCode; 0 reserved as the empty sentinel. */
-    public static int hash(String name) {
-      int h = name.hashCode(); // cached on String -> field load
-      return h == 0 ? 0xDD06 : h ^ (h >>> 16);
+    private final int[] hashes;
+    private final String[] names;
+
+    private StringIndex(int[] hashes, String[] names) {
+        this.hashes = hashes;
+        this.names = names;
     }
 
     /**
-     * Balanced default load factor — target fill {@code <= 0.5} ({@code >= 2x} capacity). (Mirrors
-     * {@code FlatHashtable.DEFAULT_LOAD_FACTOR}; duplicated while the two are separate PRs, to be
-     * unified when the flat-collection family converges.)
+     * Convenience instance — wraps the placed arrays. For the hot path prefer raw {@link
+     * EmbeddingSupport}.
      */
-    public static final float DEFAULT_LOAD_FACTOR = 0.5f;
-
-    /** Sparse load factor — target fill {@code <= 0.25} ({@code >= 4x} capacity). */
-    public static final float LOW_LOAD_FACTOR = 0.25f;
-
-    /** Largest power-of-two capacity {@link #capacityFor} can return without overflowing. */
-    public static final int MAX_CAPACITY = 1 << 30;
-
-    /** Power-of-two capacity for {@code n} names at the {@link #DEFAULT_LOAD_FACTOR}. */
-    public static int capacityFor(int n) {
-      return capacityFor(n, DEFAULT_LOAD_FACTOR);
+    public static StringIndex of(String... names) {
+        Data data = EmbeddingSupport.create(names);
+        return new StringIndex(data.hashes, data.names);
     }
 
     /**
-     * Power-of-two capacity for {@code n} names at {@code loadFactor}: the smallest power of two
-     * {@code >= ceil(n / loadFactor)} (so the achieved fill is {@code <= loadFactor}). {@code n ==
-     * 0} yields a minimal 2-slot table (StringIndex allows the empty set, unlike FlatHashtable).
-     *
-     * @throws IllegalArgumentException if {@code n} is negative, {@code loadFactor} is not in
-     *     {@code (0, 1)}, or the required capacity exceeds {@link #MAX_CAPACITY} — computing {@code
-     *     ceil(n / loadFactor)} as a {@code double} first (rather than narrowing to {@code int}
-     *     before the check) means a huge result saturates the check instead of silently wrapping to
-     *     a negative array size.
+     * Slot of {@code name}, or -1. Delegates to {@link EmbeddingSupport} on the instance's arrays.
      */
-    public static int capacityFor(int n, float loadFactor) {
-      if (n < 0) {
-        throw new IllegalArgumentException("n must be non-negative: " + n);
-      }
-      if (!(loadFactor > 0f && loadFactor < 1f)) {
-        throw new IllegalArgumentException("loadFactor must be in (0, 1): " + loadFactor);
-      }
-      if (n == 0) {
-        return 2; // empty set -> minimal table (one always-empty slot suffices, 2 keeps it pow2)
-      }
-      double min = Math.ceil(n / (double) loadFactor);
-      if (min > MAX_CAPACITY) {
-        throw new IllegalArgumentException(
-            "capacity for n="
-                + n
-                + " at loadFactor="
-                + loadFactor
-                + " exceeds maximum capacity ("
-                + MAX_CAPACITY
-                + ")");
-      }
-      return Integer.highestOneBit((int) min - 1) << 1;
+    public int indexOf(String name) {
+        return EmbeddingSupport.indexOf(this.hashes, this.names, name);
     }
 
-    /** Build the placed table. Returns a Data carrier; pull its arrays into your own fields. */
-    public static Data create(String... names) {
-      int size = capacityFor(names.length);
-      int[] hashes = new int[size];
-      String[] placed = new String[size];
-      for (String name : names) {
-        put(hashes, placed, name, hash(name));
-      }
-      return new Data(hashes, placed);
+    public boolean contains(String name) {
+        return EmbeddingSupport.indexOf(this.hashes, this.names, name) >= 0;
     }
 
-    /**
-     * Slot-aligned {@code T[]} over placed {@code names}: {@code out[slot] = fn(name)} per name,
-     * {@code null} elsewhere. {@code type} is the array element type (generic-array allocation).
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> T[] mapValues(String[] names, Class<T> type, Function<String, T> fn) {
-      T[] out = (T[]) Array.newInstance(type, names.length);
-      for (int slot = 0; slot < names.length; slot++) {
-        String name = names[slot];
-        if (name != null) {
-          out[slot] = fn.apply(name);
-        }
-      }
-      return out;
+    /** Table size — allocate parallel payload arrays of this length. */
+    public int numSlots() {
+        return hashes.length;
     }
 
-    /**
-     * Slot-aligned {@code int[]} over placed {@code names}; {@code out[slot] = fn(name)}, 0 else.
-     */
-    public static int[] mapIntValues(String[] names, ToIntFunction<String> fn) {
-      int[] out = new int[names.length];
-      for (int slot = 0; slot < names.length; slot++) {
-        String name = names[slot];
-        if (name != null) {
-          out[slot] = fn.applyAsInt(name);
-        }
-      }
-      return out;
-    }
+    // --- value mapping: build a slot-aligned parallel array (off the hot path) ---
 
     /**
-     * Slot-aligned {@code long[]} over placed {@code names}; {@code out[slot] = fn(name)}, 0 else.
+     * Builds a slot-aligned {@code T[]} of values: {@code out[indexOf(name)] == fn.apply(name)} for
+     * every indexed name; other slots stay {@code null}. {@code type} is the array element type (Java
+     * can't allocate a generic array without it). Pair with {@link #lookup(Object[], String)}.
      */
-    public static long[] mapLongValues(String[] names, ToLongFunction<String> fn) {
-      long[] out = new long[names.length];
-      for (int slot = 0; slot < names.length; slot++) {
-        String name = names[slot];
-        if (name != null) {
-          out[slot] = fn.applyAsLong(name);
-        }
-      }
-      return out;
+    public <T> T[] mapValues(Class<T> type, Function<String, T> fn) {
+        return EmbeddingSupport.mapValues(this.names, type, fn);
     }
 
-    /**
-     * Build-time placement. Returns the slot. Package-private: only {@link #create} places names.
-     */
-    static int put(int[] hashes, String[] names, String name, int h) {
-      final int mask = hashes.length - 1;
-      for (int probes = 0; probes <= mask; probes++) {
-        int i = (h + probes) & mask;
-        if (hashes[i] == 0) {
-          hashes[i] = h;
-          names[i] = name;
-          return i;
-        }
-        if (hashes[i] == h && names[i].equals(name)) {
-          return i; // already present
-        }
-      }
-      throw new IllegalStateException("table full"); // impossible at LF <= 0.5
+    /** Slot-aligned {@code int[]} of values; absent slots stay 0. See {@link #mapValues}. */
+    public int[] mapIntValues(ToIntFunction<String> fn) {
+        return EmbeddingSupport.mapIntValues(this.names, fn);
     }
 
-    /**
-     * Probe; returns the slot or -1. Raw arrays — no Data, no instance.
-     *
-     * @param h {@code name}'s hash, precomputed by the caller (skips a recomputation when the
-     *     caller already has it, e.g. hashing once to probe several tables). Must be {@link
-     *     #hash(String)}'s exact output for {@code name} — a plain {@code name.hashCode()} (no
-     *     spread) or any other value silently degrades probing or masks a real match as a miss.
-     *     Prefer {@link #indexOf(int[], String[], String)} unless you already have the hash.
-     */
-    public static int indexOf(int[] hashes, String[] names, String name, int h) {
-      final int mask = hashes.length - 1;
-      for (int probes = 0; probes <= mask; probes++) {
-        int i = (h + probes) & mask;
-        int sh = hashes[i];
-        if (sh == 0) {
-          return -1;
-        }
-        if (sh == h && names[i].equals(name)) {
-          return i;
-        }
-      }
-      return -1;
+    /** Slot-aligned {@code long[]} of values; absent slots stay 0. See {@link #mapValues}. */
+    public long[] mapLongValues(ToLongFunction<String> fn) {
+        return EmbeddingSupport.mapLongValues(this.names, fn);
     }
 
-    /**
-     * Probe; returns the slot or -1. Computes {@code name}'s hash for you — prefer this overload
-     * unless you already have the hash on hand (e.g. from probing another table with it).
-     */
-    public static int indexOf(int[] hashes, String[] names, String name) {
-      return indexOf(hashes, names, name, hash(name));
-    }
+    // --- lookup: resolve a key and read its parallel value in one call ---
 
-    /**
-     * Mirrors {@link StringIndex#contains}.
-     *
-     * @return {@code true} when {@code name} is present in the index
-     */
-    public static boolean contains(int[] hashes, String[] names, String name) {
-      return indexOf(hashes, names, name) >= 0;
+    /** {@code data[indexOf(key)]}, or {@code null} when {@code key} is absent. */
+    public <T> T lookup(T[] data, String key) {
+        return EmbeddingSupport.lookup(this.hashes, this.names, data, key);
     }
 
-    /** Number of slots — the length to size parallel payload arrays to. */
-    public static int numSlots(int[] hashes) {
-      return hashes.length;
+    /** {@code data[indexOf(key)]}, or {@code defaultValue} when {@code key} is absent. */
+    public <T> T lookupOrDefault(T[] data, String key, T defaultValue) {
+        return EmbeddingSupport.lookupOrDefault(this.hashes, this.names, data, key, defaultValue);
     }
 
-    /** {@code data[indexOf(...)]}, or {@code null} when {@code key} is absent. */
-    public static <T> T lookup(int[] hashes, String[] names, T[] data, String key) {
-      int slot = indexOf(hashes, names, key);
-      return slot >= 0 ? data[slot] : null;
+    /** {@code data[indexOf(key)]}, or 0 when {@code key} is absent. */
+    public int lookup(int[] data, String key) {
+        return EmbeddingSupport.lookup(this.hashes, this.names, data, key);
     }
 
-    /** {@code data[indexOf(...)]}, or {@code defaultValue} when {@code key} is absent. */
-    public static <T> T lookupOrDefault(
-        int[] hashes, String[] names, T[] data, String key, T defaultValue) {
-      int slot = indexOf(hashes, names, key);
-      return slot >= 0 ? data[slot] : defaultValue;
+    /** {@code data[indexOf(key)]}, or {@code defaultValue} when {@code key} is absent. */
+    public int lookupOrDefault(int[] data, String key, int defaultValue) {
+        return EmbeddingSupport.lookupOrDefault(this.hashes, this.names, data, key, defaultValue);
     }
 
-    /** {@code data[indexOf(...)]}, or 0 when {@code key} is absent. */
-    public static int lookup(int[] hashes, String[] names, int[] data, String key) {
-      int slot = indexOf(hashes, names, key);
-      return slot >= 0 ? data[slot] : 0;
+    /** {@code data[indexOf(key)]}, or 0 when {@code key} is absent. */
+    public long lookup(long[] data, String key) {
+        return EmbeddingSupport.lookup(this.hashes, this.names, data, key);
     }
 
-    /** {@code data[indexOf(...)]}, or {@code defaultValue} when {@code key} is absent. */
-    public static int lookupOrDefault(
-        int[] hashes, String[] names, int[] data, String key, int defaultValue) {
-      int slot = indexOf(hashes, names, key);
-      return slot >= 0 ? data[slot] : defaultValue;
+    /** {@code data[indexOf(key)]}, or {@code defaultValue} when {@code key} is absent. */
+    public long lookupOrDefault(long[] data, String key, long defaultValue) {
+        return EmbeddingSupport.lookupOrDefault(this.hashes, this.names, data, key, defaultValue);
     }
 
-    /** {@code data[indexOf(...)]}, or 0 when {@code key} is absent. */
-    public static long lookup(int[] hashes, String[] names, long[] data, String key) {
-      int slot = indexOf(hashes, names, key);
-      return slot >= 0 ? data[slot] : 0L;
+    /** Build-time carrier. Pull the fields into your own (static final) fields; don't keep this. */
+    public static final class Data {
+        public final int[] hashes;
+        public final String[] names;
+
+        Data(int[] hashes, String[] names) {
+            this.hashes = hashes;
+            this.names = names;
+        }
     }
 
-    /** {@code data[indexOf(...)]}, or {@code defaultValue} when {@code key} is absent. */
-    public static long lookupOrDefault(
-        int[] hashes, String[] names, long[] data, String key, long defaultValue) {
-      int slot = indexOf(hashes, names, key);
-      return slot >= 0 ? data[slot] : defaultValue;
+    /**
+     * Static algorithm over raw arrays. Query helpers take raw arrays, never a Data or a StringIndex.
+     *
+     * <pre>{@code
+     * private static final int[] METHOD_HASHES;
+     * private static final String[] METHOD_NAMES;
+     * private static final int[] METHOD_IDS;
+     *
+     * static {
+     *   Data data = EmbeddingSupport.create("GET", "POST", "PUT");
+     *   METHOD_HASHES = data.hashes;
+     *   METHOD_NAMES = data.names;
+     *   METHOD_IDS = EmbeddingSupport.mapIntValues(data.names, name -> nextMethodId());
+     * }
+     *
+     * ...
+     * int id = EmbeddingSupport.lookupOrDefault(
+     *     METHOD_HASHES, METHOD_NAMES, METHOD_IDS, incomingMethod, UNKNOWN_METHOD_ID);
+     * }</pre>
+     */
+    public static final class EmbeddingSupport {
+        private EmbeddingSupport() {}
+
+        /** Spread of String.hashCode; 0 reserved as the empty sentinel. */
+        public static int hash(String name) {
+            int h = name.hashCode(); // cached on String -> field load
+            return h == 0 ? 0xDD06 : h ^ (h >>> 16);
+        }
+
+        /**
+         * Balanced default load factor — target fill {@code <= 0.5} ({@code >= 2x} capacity). (Mirrors
+         * {@code FlatHashtable.DEFAULT_LOAD_FACTOR}; duplicated while the two are separate PRs, to be
+         * unified when the flat-collection family converges.)
+         */
+        public static final float DEFAULT_LOAD_FACTOR = 0.5f;
+
+        /** Sparse load factor — target fill {@code <= 0.25} ({@code >= 4x} capacity). */
+        public static final float LOW_LOAD_FACTOR = 0.25f;
+
+        /** Largest power-of-two capacity {@link #capacityFor} can return without overflowing. */
+        public static final int MAX_CAPACITY = 1 << 30;
+
+        /** Power-of-two capacity for {@code n} names at the {@link #DEFAULT_LOAD_FACTOR}. */
+        public static int capacityFor(int n) {
+            return capacityFor(n, DEFAULT_LOAD_FACTOR);
+        }
+
+        /**
+         * Power-of-two capacity for {@code n} names at {@code loadFactor}: the smallest power of two
+         * {@code >= ceil(n / loadFactor)} (so the achieved fill is {@code <= loadFactor}). {@code n ==
+         * 0} yields a minimal 2-slot table (StringIndex allows the empty set, unlike FlatHashtable).
+         *
+         * @throws IllegalArgumentException if {@code n} is negative, {@code loadFactor} is not in
+         *     {@code (0, 1)}, or the required capacity exceeds {@link #MAX_CAPACITY} — computing {@code
+         *     ceil(n / loadFactor)} as a {@code double} first (rather than narrowing to {@code int}
+         *     before the check) means a huge result saturates the check instead of silently wrapping to
+         *     a negative array size.
+         */
+        public static int capacityFor(int n, float loadFactor) {
+            if (n < 0) {
+                throw new IllegalArgumentException("n must be non-negative: " + n);
+            }
+            if (!(loadFactor > 0f && loadFactor < 1f)) {
+                throw new IllegalArgumentException("loadFactor must be in (0, 1): " + loadFactor);
+            }
+            if (n == 0) {
+                return 2; // empty set -> minimal table (one always-empty slot suffices, 2 keeps it pow2)
+            }
+            double min = Math.ceil(n / (double) loadFactor);
+            if (min > MAX_CAPACITY) {
+                throw new IllegalArgumentException("capacity for n="
+                        + n
+                        + " at loadFactor="
+                        + loadFactor
+                        + " exceeds maximum capacity ("
+                        + MAX_CAPACITY
+                        + ")");
+            }
+            return Integer.highestOneBit((int) min - 1) << 1;
+        }
+
+        /** Build the placed table. Returns a Data carrier; pull its arrays into your own fields. */
+        public static Data create(String... names) {
+            int size = capacityFor(names.length);
+            int[] hashes = new int[size];
+            String[] placed = new String[size];
+            for (String name : names) {
+                put(hashes, placed, name, hash(name));
+            }
+            return new Data(hashes, placed);
+        }
+
+        /**
+         * Slot-aligned {@code T[]} over placed {@code names}: {@code out[slot] = fn(name)} per name,
+         * {@code null} elsewhere. {@code type} is the array element type (generic-array allocation).
+         */
+        @SuppressWarnings("unchecked")
+        public static <T> T[] mapValues(String[] names, Class<T> type, Function<String, T> fn) {
+            T[] out = (T[]) Array.newInstance(type, names.length);
+            for (int slot = 0; slot < names.length; slot++) {
+                String name = names[slot];
+                if (name != null) {
+                    out[slot] = fn.apply(name);
+                }
+            }
+            return out;
+        }
+
+        /**
+         * Slot-aligned {@code int[]} over placed {@code names}; {@code out[slot] = fn(name)}, 0 else.
+         */
+        public static int[] mapIntValues(String[] names, ToIntFunction<String> fn) {
+            int[] out = new int[names.length];
+            for (int slot = 0; slot < names.length; slot++) {
+                String name = names[slot];
+                if (name != null) {
+                    out[slot] = fn.applyAsInt(name);
+                }
+            }
+            return out;
+        }
+
+        /**
+         * Slot-aligned {@code long[]} over placed {@code names}; {@code out[slot] = fn(name)}, 0 else.
+         */
+        public static long[] mapLongValues(String[] names, ToLongFunction<String> fn) {
+            long[] out = new long[names.length];
+            for (int slot = 0; slot < names.length; slot++) {
+                String name = names[slot];
+                if (name != null) {
+                    out[slot] = fn.applyAsLong(name);
+                }
+            }
+            return out;
+        }
+
+        /**
+         * Build-time placement. Returns the slot. Package-private: only {@link #create} places names.
+         */
+        static int put(int[] hashes, String[] names, String name, int h) {
+            final int mask = hashes.length - 1;
+            for (int probes = 0; probes <= mask; probes++) {
+                int i = (h + probes) & mask;
+                if (hashes[i] == 0) {
+                    hashes[i] = h;
+                    names[i] = name;
+                    return i;
+                }
+                if (hashes[i] == h && names[i].equals(name)) {
+                    return i; // already present
+                }
+            }
+            throw new IllegalStateException("table full"); // impossible at LF <= 0.5
+        }
+
+        /**
+         * Probe; returns the slot or -1. Raw arrays — no Data, no instance.
+         *
+         * @param h {@code name}'s hash, precomputed by the caller (skips a recomputation when the
+         *     caller already has it, e.g. hashing once to probe several tables). Must be {@link
+         *     #hash(String)}'s exact output for {@code name} — a plain {@code name.hashCode()} (no
+         *     spread) or any other value silently degrades probing or masks a real match as a miss.
+         *     Prefer {@link #indexOf(int[], String[], String)} unless you already have the hash.
+         */
+        public static int indexOf(int[] hashes, String[] names, String name, int h) {
+            final int mask = hashes.length - 1;
+            for (int probes = 0; probes <= mask; probes++) {
+                int i = (h + probes) & mask;
+                int sh = hashes[i];
+                if (sh == 0) {
+                    return -1;
+                }
+                if (sh == h && names[i].equals(name)) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+
+        /**
+         * Probe; returns the slot or -1. Computes {@code name}'s hash for you — prefer this overload
+         * unless you already have the hash on hand (e.g. from probing another table with it).
+         */
+        public static int indexOf(int[] hashes, String[] names, String name) {
+            return indexOf(hashes, names, name, hash(name));
+        }
+
+        /**
+         * Mirrors {@link StringIndex#contains}.
+         *
+         * @return {@code true} when {@code name} is present in the index
+         */
+        public static boolean contains(int[] hashes, String[] names, String name) {
+            return indexOf(hashes, names, name) >= 0;
+        }
+
+        /** Number of slots — the length to size parallel payload arrays to. */
+        public static int numSlots(int[] hashes) {
+            return hashes.length;
+        }
+
+        /** {@code data[indexOf(...)]}, or {@code null} when {@code key} is absent. */
+        public static <T> T lookup(int[] hashes, String[] names, T[] data, String key) {
+            int slot = indexOf(hashes, names, key);
+            return slot >= 0 ? data[slot] : null;
+        }
+
+        /** {@code data[indexOf(...)]}, or {@code defaultValue} when {@code key} is absent. */
+        public static <T> T lookupOrDefault(int[] hashes, String[] names, T[] data, String key, T defaultValue) {
+            int slot = indexOf(hashes, names, key);
+            return slot >= 0 ? data[slot] : defaultValue;
+        }
+
+        /** {@code data[indexOf(...)]}, or 0 when {@code key} is absent. */
+        public static int lookup(int[] hashes, String[] names, int[] data, String key) {
+            int slot = indexOf(hashes, names, key);
+            return slot >= 0 ? data[slot] : 0;
+        }
+
+        /** {@code data[indexOf(...)]}, or {@code defaultValue} when {@code key} is absent. */
+        public static int lookupOrDefault(int[] hashes, String[] names, int[] data, String key, int defaultValue) {
+            int slot = indexOf(hashes, names, key);
+            return slot >= 0 ? data[slot] : defaultValue;
+        }
+
+        /** {@code data[indexOf(...)]}, or 0 when {@code key} is absent. */
+        public static long lookup(int[] hashes, String[] names, long[] data, String key) {
+            int slot = indexOf(hashes, names, key);
+            return slot >= 0 ? data[slot] : 0L;
+        }
+
+        /** {@code data[indexOf(...)]}, or {@code defaultValue} when {@code key} is absent. */
+        public static long lookupOrDefault(int[] hashes, String[] names, long[] data, String key, long defaultValue) {
+            int slot = indexOf(hashes, names, key);
+            return slot >= 0 ? data[slot] : defaultValue;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/Strings.java b/internal-api/src/main/java/datadog/trace/util/Strings.java
index 7bd2055f32c..9d41883fe48 100644
--- a/internal-api/src/main/java/datadog/trace/util/Strings.java
+++ b/internal-api/src/main/java/datadog/trace/util/Strings.java
@@ -14,390 +14,390 @@
 
 public final class Strings {
 
-  private static final byte[] HEX_DIGITS = {
-    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
-  };
-
-  /** com.foo.Bar -> com/foo/Bar.class */
-  public static String getResourceName(final String className) {
-    if (!className.endsWith(".class")) {
-      return className.replace('.', '/') + ".class";
-    } else {
-      return className;
+    private static final byte[] HEX_DIGITS = {
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
+    };
+
+    /** com.foo.Bar -> com/foo/Bar.class */
+    public static String getResourceName(final String className) {
+        if (!className.endsWith(".class")) {
+            return className.replace('.', '/') + ".class";
+        } else {
+            return className;
+        }
     }
-  }
 
-  /** com/foo/Bar.class -> com.foo.Bar */
-  public static String getClassName(final String resourceName) {
-    if (resourceName.endsWith(".class")) {
-      return resourceName.substring(0, resourceName.length() - 6).replace('/', '.');
+    /** com/foo/Bar.class -> com.foo.Bar */
+    public static String getClassName(final String resourceName) {
+        if (resourceName.endsWith(".class")) {
+            return resourceName.substring(0, resourceName.length() - 6).replace('/', '.');
+        }
+        return resourceName.replace('/', '.');
     }
-    return resourceName.replace('/', '.');
-  }
-
-  /** com.foo.Bar -> com/foo/Bar */
-  public static String getInternalName(final String className) {
-    return className.replace('.', '/');
-  }
-
-  /** com.foo.Bar -> com.foo */
-  public static String getPackageName(final String className) {
-    int lastDot = className.lastIndexOf('.');
-    return lastDot < 0 ? "" : className.substring(0, lastDot);
-  }
-
-  /** com.foo.Bar -> Bar */
-  public static String getSimpleName(final String className) {
-    return className.substring(className.lastIndexOf('.') + 1);
-  }
-
-  // reimplementation of string functions without regex
-  public static String replace(String str, String delimiter, String replacement) {
-    StringBuilder sb = new StringBuilder(str);
-    int matchIndex, curIndex = 0;
-    while ((matchIndex = sb.indexOf(delimiter, curIndex)) != -1) {
-      sb.replace(matchIndex, matchIndex + delimiter.length(), replacement);
-      curIndex = matchIndex + replacement.length();
-    }
-    return sb.toString();
-  }
-
-  public static String replaceFirst(String str, String delimiter, String replacement) {
-    StringBuilder sb = new StringBuilder(str);
-    int i = sb.indexOf(delimiter);
-    if (i != -1) {
-      sb.replace(i, i + delimiter.length(), replacement);
-    }
-    return sb.toString();
-  }
-
-  public static String sha256(String input) throws NoSuchAlgorithmException {
-    MessageDigest digest = MessageDigest.getInstance("SHA-256");
-    byte[] hash = digest.digest(input.getBytes(StandardCharsets.UTF_8));
-    StringBuilder hexString = new StringBuilder(2 * hash.length);
-    for (byte b : hash) {
-      String hex = Integer.toHexString(0xFF & b);
-      if (hex.length() == 1) {
-        hexString.append('0');
-      }
-      hexString.append(hex);
-    }
-    return hexString.toString();
-  }
 
-  public static String truncate(String input, int limit) {
-    return (String) truncate((CharSequence) input, limit);
-  }
+    /** com.foo.Bar -> com/foo/Bar */
+    public static String getInternalName(final String className) {
+        return className.replace('.', '/');
+    }
 
-  public static CharSequence truncate(CharSequence input, int limit) {
-    if (input == null || input.length() <= limit) {
-      return input;
+    /** com.foo.Bar -> com.foo */
+    public static String getPackageName(final String className) {
+        int lastDot = className.lastIndexOf('.');
+        return lastDot < 0 ? "" : className.substring(0, lastDot);
     }
-    return input.subSequence(0, limit);
-  }
-
-  /**
-   * Truncates a pre-encoded {@link UTF8BytesString}. Returns the same instance when within the
-   * limit, so callers writing it back out keep the zero-copy fast path; only the rare over-limit
-   * case re-encodes the truncated value.
-   */
-  public static UTF8BytesString truncate(UTF8BytesString input, int limit) {
-    if (input == null || input.length() <= limit) {
-      return input;
+
+    /** com.foo.Bar -> Bar */
+    public static String getSimpleName(final String className) {
+        return className.substring(className.lastIndexOf('.') + 1);
     }
-    return UTF8BytesString.create(input.subSequence(0, limit));
-  }
-
-  /**
-   * Checks that a string is not blank, i.e. contains at least one character that is not a
-   * whitespace
-   *
-   * @param s The string to be checked
-   * @return {@code true} if string is not blank, {@code false} otherwise (string is {@code null},
-   *     empty, or contains only whitespace characters)
-   */
-  public static boolean isNotBlank(String s) {
-    if (s == null || s.isEmpty()) {
-      return false;
+
+    // reimplementation of string functions without regex
+    public static String replace(String str, String delimiter, String replacement) {
+        StringBuilder sb = new StringBuilder(str);
+        int matchIndex, curIndex = 0;
+        while ((matchIndex = sb.indexOf(delimiter, curIndex)) != -1) {
+            sb.replace(matchIndex, matchIndex + delimiter.length(), replacement);
+            curIndex = matchIndex + replacement.length();
+        }
+        return sb.toString();
     }
 
-    // the code below traverses string characters one by one
-    // and checks if there is any character that is not a whitespace (space, tab, newline, etc);
-    final int length = s.length();
-    for (int offset = 0; offset < length; ) {
-      // codepoints are used instead of chars, to properly handle non-unicode symbols
-      final int codepoint = s.codePointAt(offset);
-      if (!Character.isWhitespace(codepoint)) {
-        return true;
-      }
-      offset += Character.charCount(codepoint);
+    public static String replaceFirst(String str, String delimiter, String replacement) {
+        StringBuilder sb = new StringBuilder(str);
+        int i = sb.indexOf(delimiter);
+        if (i != -1) {
+            sb.replace(i, i + delimiter.length(), replacement);
+        }
+        return sb.toString();
     }
 
-    return false;
-  }
-
-  /**
-   * Checks that a string is blank, i.e. doest not contain characters or is null
-   *
-   * @param s The string to be checked
-   * @return {@code true} if string is blank (string is {@code null}, empty, or contains only
-   *     whitespace characters), {@code false} otherwise
-   */
-  public static boolean isBlank(String s) {
-    return !isNotBlank(s);
-  }
-
-  /**
-   * Generates a random string of the given length from lowercase characters a-z
-   *
-   * @param length length of the string
-   * @return random string containing lowercase latin characters
-   */
-  public static String random(int length) {
-    char[] c = new char[length];
-    for (int i = 0; i < length; i++) {
-      c[i] = (char) ('a' + ThreadLocalRandom.current().nextInt(26));
+    public static String sha256(String input) throws NoSuchAlgorithmException {
+        MessageDigest digest = MessageDigest.getInstance("SHA-256");
+        byte[] hash = digest.digest(input.getBytes(StandardCharsets.UTF_8));
+        StringBuilder hexString = new StringBuilder(2 * hash.length);
+        for (byte b : hash) {
+            String hex = Integer.toHexString(0xFF & b);
+            if (hex.length() == 1) {
+                hexString.append('0');
+            }
+            hexString.append(hex);
+        }
+        return hexString.toString();
     }
-    return new String(c);
-  }
 
-  public static String toHexString(byte[] value) {
-    if (value == null) {
-      return null;
+    public static String truncate(String input, int limit) {
+        return (String) truncate((CharSequence) input, limit);
     }
-    byte[] bytes = new byte[value.length * 2];
-    for (int i = 0; i < value.length; i++) {
-      byte v = value[i];
-      bytes[i * 2] = HEX_DIGITS[(v & 0xF0) >>> 4];
-      bytes[i * 2 + 1] = HEX_DIGITS[v & 0x0F];
+
+    public static CharSequence truncate(CharSequence input, int limit) {
+        if (input == null || input.length() <= limit) {
+            return input;
+        }
+        return input.subSequence(0, limit);
     }
-    return new String(bytes, US_ASCII);
-  }
-
-  public static String[] concat(String[] arr, String... extra) {
-    if (arr.length == 0) return extra;
-    if (extra.length == 0) return arr;
-    String[] result = new String[arr.length + extra.length];
-    System.arraycopy(arr, 0, result, 0, arr.length);
-    System.arraycopy(extra, 0, result, arr.length, extra.length);
-    return result;
-  }
-
-  /**
-   * @return first non-blank string out of the two, {@code null} if both are blank
-   */
-  @Nullable
-  public static String coalesce(@Nullable final String first, @Nullable final String second) {
-    if (isNotBlank(first)) {
-      return first;
-    } else if (isNotBlank(second)) {
-      return second;
-    } else {
-      return null;
+
+    /**
+     * Truncates a pre-encoded {@link UTF8BytesString}. Returns the same instance when within the
+     * limit, so callers writing it back out keep the zero-copy fast path; only the rare over-limit
+     * case re-encodes the truncated value.
+     */
+    public static UTF8BytesString truncate(UTF8BytesString input, int limit) {
+        if (input == null || input.length() <= limit) {
+            return input;
+        }
+        return UTF8BytesString.create(input.subSequence(0, limit));
     }
-  }
 
-  /** Low overhead replaceAll */
-  public static final String replaceAll(String input, String needle, String replacement) {
-    int index = input.indexOf(needle);
-    if (index == -1) return input;
+    /**
+     * Checks that a string is not blank, i.e. contains at least one character that is not a
+     * whitespace
+     *
+     * @param s The string to be checked
+     * @return {@code true} if string is not blank, {@code false} otherwise (string is {@code null},
+     *     empty, or contains only whitespace characters)
+     */
+    public static boolean isNotBlank(String s) {
+        if (s == null || s.isEmpty()) {
+            return false;
+        }
+
+        // the code below traverses string characters one by one
+        // and checks if there is any character that is not a whitespace (space, tab, newline, etc);
+        final int length = s.length();
+        for (int offset = 0; offset < length; ) {
+            // codepoints are used instead of chars, to properly handle non-unicode symbols
+            final int codepoint = s.codePointAt(offset);
+            if (!Character.isWhitespace(codepoint)) {
+                return true;
+            }
+            offset += Character.charCount(codepoint);
+        }
+
+        return false;
+    }
 
-    int needleLen = needle.length();
+    /**
+     * Checks that a string is blank, i.e. doest not contain characters or is null
+     *
+     * @param s The string to be checked
+     * @return {@code true} if string is blank (string is {@code null}, empty, or contains only
+     *     whitespace characters), {@code false} otherwise
+     */
+    public static boolean isBlank(String s) {
+        return !isNotBlank(s);
+    }
 
-    StringBuilder builder = new StringBuilder(input.length() + 10);
-    builder.append(input, 0, index);
-    builder.append(replacement);
+    /**
+     * Generates a random string of the given length from lowercase characters a-z
+     *
+     * @param length length of the string
+     * @return random string containing lowercase latin characters
+     */
+    public static String random(int length) {
+        char[] c = new char[length];
+        for (int i = 0; i < length; i++) {
+            c[i] = (char) ('a' + ThreadLocalRandom.current().nextInt(26));
+        }
+        return new String(c);
+    }
 
-    int prevIndex = index;
-    index = input.indexOf(needle, index + needleLen);
-    for (; index != -1; prevIndex = index, index = input.indexOf(needle, index + needleLen)) {
-      builder.append(input, prevIndex + needleLen, index);
-      builder.append(replacement);
+    public static String toHexString(byte[] value) {
+        if (value == null) {
+            return null;
+        }
+        byte[] bytes = new byte[value.length * 2];
+        for (int i = 0; i < value.length; i++) {
+            byte v = value[i];
+            bytes[i * 2] = HEX_DIGITS[(v & 0xF0) >>> 4];
+            bytes[i * 2 + 1] = HEX_DIGITS[v & 0x0F];
+        }
+        return new String(bytes, US_ASCII);
     }
-    builder.append(input, prevIndex + needleLen, input.length());
-
-    return builder.toString();
-  }
-
-  /**
-   * Provides a SubSequence which a view into the provided String Unlike String.subSequence (which
-   * is usually just a wrapper around String.substring), this routine doesn't allocate a new String
-   * or byte[]/char[].
-   */
-  public static final SubSequence subSequence(String str, int beginIndex) {
-    return new SubSequence(str, beginIndex, str.length());
-  }
-
-  /**
-   * Provides a SubSequence which a view into the provided String Unlike String.subSequence (which
-   * is usually just a wrapper around String.substring), this routine doesn't allocate a new <code>
-   * String</code> or <code>byte[]</code> / <code>char[]</code>.
-   */
-  public static final SubSequence subSequence(String str, int beginIndex, int endIndex) {
-    return new SubSequence(str, beginIndex, endIndex);
-  }
-
-  /**
-   * Provides an Iterable<SubSequence> where the sub-sequences are separated by <code>splitChar
-   * </code>. Unlike other approaches to splitting, this routine doesn't allocate any new <code>
-   * String</code> or <code>byte[]</code> / <code>char[]</code>
-   */
-  public static final Iterable<SubSequence> split(String str, char splitChar) {
-    if (str.isEmpty()) {
-      return Collections.emptyList();
+
+    public static String[] concat(String[] arr, String... extra) {
+        if (arr.length == 0) return extra;
+        if (extra.length == 0) return arr;
+        String[] result = new String[arr.length + extra.length];
+        System.arraycopy(arr, 0, result, 0, arr.length);
+        System.arraycopy(extra, 0, result, arr.length, extra.length);
+        return result;
     }
 
-    int firstIndex = str.indexOf(splitChar);
-    if (firstIndex == -1) {
-      return Collections.singletonList(subSequence(str, 0));
+    /**
+     * @return first non-blank string out of the two, {@code null} if both are blank
+     */
+    @Nullable
+    public static String coalesce(@Nullable final String first, @Nullable final String second) {
+        if (isNotBlank(first)) {
+            return first;
+        } else if (isNotBlank(second)) {
+            return second;
+        } else {
+            return null;
+        }
     }
 
-    return new SplitIterable(str, splitChar, firstIndex);
-  }
+    /** Low overhead replaceAll */
+    public static final String replaceAll(String input, String needle, String replacement) {
+        int index = input.indexOf(needle);
+        if (index == -1) return input;
 
-  static final class SplitIterable implements Iterable<SubSequence> {
-    private final String str;
-    private final int len;
-    private final char splitChar;
-    private final int firstIndex;
+        int needleLen = needle.length();
 
-    SplitIterable(String str, char splitChar, int firstIndex) {
-      this.str = str;
-      this.len = str.length();
-      this.splitChar = splitChar;
-      this.firstIndex = firstIndex;
-    }
+        StringBuilder builder = new StringBuilder(input.length() + 10);
+        builder.append(input, 0, index);
+        builder.append(replacement);
+
+        int prevIndex = index;
+        index = input.indexOf(needle, index + needleLen);
+        for (; index != -1; prevIndex = index, index = input.indexOf(needle, index + needleLen)) {
+            builder.append(input, prevIndex + needleLen, index);
+            builder.append(replacement);
+        }
+        builder.append(input, prevIndex + needleLen, input.length());
 
-    @Override
-    public SplitIterator iterator() {
-      return new SplitIterator(this.str, this.len, this.splitChar, this.firstIndex);
+        return builder.toString();
     }
-  }
 
-  static final class SplitIterator implements Iterator<SubSequence> {
-    private final String str;
-    private final int len;
-    private final char splitChar;
+    /**
+     * Provides a SubSequence which a view into the provided String Unlike String.subSequence (which
+     * is usually just a wrapper around String.substring), this routine doesn't allocate a new String
+     * or byte[]/char[].
+     */
+    public static final SubSequence subSequence(String str, int beginIndex) {
+        return new SubSequence(str, beginIndex, str.length());
+    }
 
-    private int curIndex;
-    private int nextIndex;
+    /**
+     * Provides a SubSequence which a view into the provided String Unlike String.subSequence (which
+     * is usually just a wrapper around String.substring), this routine doesn't allocate a new <code>
+     * String</code> or <code>byte[]</code> / <code>char[]</code>.
+     */
+    public static final SubSequence subSequence(String str, int beginIndex, int endIndex) {
+        return new SubSequence(str, beginIndex, endIndex);
+    }
 
-    SplitIterator(String str, int len, char splitChar, int firstIndex) {
-      this.str = str;
-      this.len = len;
-      this.splitChar = splitChar;
+    /**
+     * Provides an Iterable<SubSequence> where the sub-sequences are separated by <code>splitChar
+     * </code>. Unlike other approaches to splitting, this routine doesn't allocate any new <code>
+     * String</code> or <code>byte[]</code> / <code>char[]</code>
+     */
+    public static final Iterable<SubSequence> split(String str, char splitChar) {
+        if (str.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        int firstIndex = str.indexOf(splitChar);
+        if (firstIndex == -1) {
+            return Collections.singletonList(subSequence(str, 0));
+        }
+
+        return new SplitIterable(str, splitChar, firstIndex);
+    }
 
-      this.curIndex = 0;
-      this.nextIndex = firstIndex == -1 ? len : firstIndex;
+    static final class SplitIterable implements Iterable<SubSequence> {
+        private final String str;
+        private final int len;
+        private final char splitChar;
+        private final int firstIndex;
+
+        SplitIterable(String str, char splitChar, int firstIndex) {
+            this.str = str;
+            this.len = str.length();
+            this.splitChar = splitChar;
+            this.firstIndex = firstIndex;
+        }
+
+        @Override
+        public SplitIterator iterator() {
+            return new SplitIterator(this.str, this.len, this.splitChar, this.firstIndex);
+        }
     }
 
-    @Override
-    public boolean hasNext() {
-      return (this.curIndex <= this.len);
+    static final class SplitIterator implements Iterator<SubSequence> {
+        private final String str;
+        private final int len;
+        private final char splitChar;
+
+        private int curIndex;
+        private int nextIndex;
+
+        SplitIterator(String str, int len, char splitChar, int firstIndex) {
+            this.str = str;
+            this.len = len;
+            this.splitChar = splitChar;
+
+            this.curIndex = 0;
+            this.nextIndex = firstIndex == -1 ? len : firstIndex;
+        }
+
+        @Override
+        public boolean hasNext() {
+            return (this.curIndex <= this.len);
+        }
+
+        @Override
+        public SubSequence next() {
+            int curIndex = this.curIndex;
+            int len = this.len;
+
+            if (curIndex > len) throw new NoSuchElementException();
+
+            // NOTE: Experimented with returning a single mutable SubSequence
+            // where the index range is updated each time.  In typical usage,
+            // that was slightly worse -- likely because escape analysis was
+            // able to eliminate the allocation, but that hasn't been directly
+            // confirmed.
+            SubSequence subSeq;
+
+            int nextIndex = this.nextIndex;
+            if (nextIndex == len - 1) {
+                // Handles the case where there's a trailing separator,
+                // curIndex is moved to len to represent the empty string
+                // after the trailing separator
+
+                // Next call then goes into the special case below
+                subSeq = new SubSequence(this.str, curIndex, nextIndex);
+                this.curIndex = len;
+                this.nextIndex = len;
+            } else if (curIndex == len) {
+                // Handles the empty string after the trailing separator
+                // curIndex is given the terminating value `len + 1`
+
+                // Don't use SubSequence.EMPTY because it wouldn't have
+                // the correct beginIndex
+                subSeq = new SubSequence(this.str, len, len);
+                this.curIndex = len + 1;
+            } else {
+                subSeq = new SubSequence(this.str, curIndex, nextIndex);
+
+                // core advancing logic
+                this.curIndex = nextIndex + 1;
+                int searchIndex = this.str.indexOf(this.splitChar, nextIndex + 1);
+                this.nextIndex = (searchIndex == -1) ? len : searchIndex;
+            }
+
+            return subSeq;
+        }
     }
 
-    @Override
-    public SubSequence next() {
-      int curIndex = this.curIndex;
-      int len = this.len;
-
-      if (curIndex > len) throw new NoSuchElementException();
-
-      // NOTE: Experimented with returning a single mutable SubSequence
-      // where the index range is updated each time.  In typical usage,
-      // that was slightly worse -- likely because escape analysis was
-      // able to eliminate the allocation, but that hasn't been directly
-      // confirmed.
-      SubSequence subSeq;
-
-      int nextIndex = this.nextIndex;
-      if (nextIndex == len - 1) {
-        // Handles the case where there's a trailing separator,
-        // curIndex is moved to len to represent the empty string
-        // after the trailing separator
-
-        // Next call then goes into the special case below
-        subSeq = new SubSequence(this.str, curIndex, nextIndex);
-        this.curIndex = len;
-        this.nextIndex = len;
-      } else if (curIndex == len) {
-        // Handles the empty string after the trailing separator
-        // curIndex is given the terminating value `len + 1`
-
-        // Don't use SubSequence.EMPTY because it wouldn't have
-        // the correct beginIndex
-        subSeq = new SubSequence(this.str, len, len);
-        this.curIndex = len + 1;
-      } else {
-        subSeq = new SubSequence(this.str, curIndex, nextIndex);
-
-        // core advancing logic
-        this.curIndex = nextIndex + 1;
-        int searchIndex = this.str.indexOf(this.splitChar, nextIndex + 1);
-        this.nextIndex = (searchIndex == -1) ? len : searchIndex;
-      }
-
-      return subSeq;
+    /**
+     * True if {@code needle} occurs fully within {@code s[beginIndex, endIndex)} -- a range-limited,
+     * allocation-free alternative to {@code s.substring(beginIndex, endIndex).contains(needle)}.
+     *
+     * <p>{@code indexOf} returns the earliest occurrence at or after {@code beginIndex}; if that one
+     * overshoots {@code endIndex} there is no earlier full occurrence in range, so the bound check is
+     * exact.
+     */
+    public static boolean regionContains(String s, int beginIndex, int endIndex, String needle) {
+        int idx = s.indexOf(needle, beginIndex);
+        return idx >= 0 && idx + needle.length() <= endIndex;
     }
-  }
-
-  /**
-   * True if {@code needle} occurs fully within {@code s[beginIndex, endIndex)} -- a range-limited,
-   * allocation-free alternative to {@code s.substring(beginIndex, endIndex).contains(needle)}.
-   *
-   * <p>{@code indexOf} returns the earliest occurrence at or after {@code beginIndex}; if that one
-   * overshoots {@code endIndex} there is no earlier full occurrence in range, so the bound check is
-   * exact.
-   */
-  public static boolean regionContains(String s, int beginIndex, int endIndex, String needle) {
-    int idx = s.indexOf(needle, beginIndex);
-    return idx >= 0 && idx + needle.length() <= endIndex;
-  }
-
-  /**
-   * A {@code hashCode} consistent with {@link String#equalsIgnoreCase}: any two strings that are
-   * equal ignoring case produce the same value. Same polynomial as {@link String#hashCode} but over
-   * the case-folded characters, so it never allocates (no {@code toLowerCase} copy).
-   *
-   * <p>Uses the same two-way fold {@code String.equalsIgnoreCase} / {@code
-   * String.regionMatches(ignoreCase)} use ({@code toLowerCase(toUpperCase(c))}), so the two stay
-   * consistent for all inputs, not just ASCII — pairing a one-way fold here with {@code
-   * equalsIgnoreCase} would risk silent false misses on the Unicode characters where they diverge.
-   *
-   * <p>Folds by code point, not by {@code char} (UTF-16 unit). On JDK 9+, {@code equalsIgnoreCase}
-   * itself reconstructs supplementary code points before folding (e.g. it treats U+10400 and
-   * U+10428 as equal), so a per-{@code char} fold would make this hash inconsistent with it for
-   * such pairs -- a supplementary-plane analog of the same silent-false-miss risk called out above.
-   * A per-{@code char} fold matched {@code equalsIgnoreCase} only on JDK 8, where it did not
-   * reconstruct code points; folding by code point keeps the two consistent on every supported JDK.
-   * (On JDK 8, where {@code equalsIgnoreCase} still treats such pairs as distinct, folding them
-   * together here is merely an extra, harmless collision -- consistency only needs to hold in the
-   * equal-hash direction, not the reverse.)
-   */
-  public static int caseInsensitiveHashCode(String s) {
-    int h = 0;
-    final int len = s.length();
-    for (int i = 0; i < len; ) {
-      final char c = s.charAt(i);
-      if (c < 0x80) {
-        // ASCII fast path: case folding is exactly A-Z -> a-z, and every ASCII char is its own
-        // code point, so this is equivalent to (and cheaper than) the code-point fold below.
-        h = 31 * h + ((c >= 'A' && c <= 'Z') ? (c + 32) : c);
-        ++i;
-        continue;
-      }
-      final int cp = s.codePointAt(i);
-      final int folded = Character.toLowerCase(Character.toUpperCase(cp));
-      if (Character.isSupplementaryCodePoint(folded)) {
-        // Fold back into the two chars equalsIgnoreCase itself compares, so the polynomial stays
-        // over the same "characters" for both single- and multi-char inputs.
-        h = 31 * h + Character.highSurrogate(folded);
-        h = 31 * h + Character.lowSurrogate(folded);
-      } else {
-        h = 31 * h + folded;
-      }
-      i += Character.charCount(cp);
+
+    /**
+     * A {@code hashCode} consistent with {@link String#equalsIgnoreCase}: any two strings that are
+     * equal ignoring case produce the same value. Same polynomial as {@link String#hashCode} but over
+     * the case-folded characters, so it never allocates (no {@code toLowerCase} copy).
+     *
+     * <p>Uses the same two-way fold {@code String.equalsIgnoreCase} / {@code
+     * String.regionMatches(ignoreCase)} use ({@code toLowerCase(toUpperCase(c))}), so the two stay
+     * consistent for all inputs, not just ASCII — pairing a one-way fold here with {@code
+     * equalsIgnoreCase} would risk silent false misses on the Unicode characters where they diverge.
+     *
+     * <p>Folds by code point, not by {@code char} (UTF-16 unit). On JDK 9+, {@code equalsIgnoreCase}
+     * itself reconstructs supplementary code points before folding (e.g. it treats U+10400 and
+     * U+10428 as equal), so a per-{@code char} fold would make this hash inconsistent with it for
+     * such pairs -- a supplementary-plane analog of the same silent-false-miss risk called out above.
+     * A per-{@code char} fold matched {@code equalsIgnoreCase} only on JDK 8, where it did not
+     * reconstruct code points; folding by code point keeps the two consistent on every supported JDK.
+     * (On JDK 8, where {@code equalsIgnoreCase} still treats such pairs as distinct, folding them
+     * together here is merely an extra, harmless collision -- consistency only needs to hold in the
+     * equal-hash direction, not the reverse.)
+     */
+    public static int caseInsensitiveHashCode(String s) {
+        int h = 0;
+        final int len = s.length();
+        for (int i = 0; i < len; ) {
+            final char c = s.charAt(i);
+            if (c < 0x80) {
+                // ASCII fast path: case folding is exactly A-Z -> a-z, and every ASCII char is its own
+                // code point, so this is equivalent to (and cheaper than) the code-point fold below.
+                h = 31 * h + ((c >= 'A' && c <= 'Z') ? (c + 32) : c);
+                ++i;
+                continue;
+            }
+            final int cp = s.codePointAt(i);
+            final int folded = Character.toLowerCase(Character.toUpperCase(cp));
+            if (Character.isSupplementaryCodePoint(folded)) {
+                // Fold back into the two chars equalsIgnoreCase itself compares, so the polynomial stays
+                // over the same "characters" for both single- and multi-char inputs.
+                h = 31 * h + Character.highSurrogate(folded);
+                h = 31 * h + Character.lowSurrogate(folded);
+            } else {
+                h = 31 * h + folded;
+            }
+            i += Character.charCount(cp);
+        }
+        return h;
     }
-    return h;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/SubSequence.java b/internal-api/src/main/java/datadog/trace/util/SubSequence.java
index 1f9405d823d..cf7ea190ec8 100644
--- a/internal-api/src/main/java/datadog/trace/util/SubSequence.java
+++ b/internal-api/src/main/java/datadog/trace/util/SubSequence.java
@@ -22,261 +22,261 @@
  */
 @NoEscape
 public final class SubSequence implements CharSequence {
-  // @NoEscape exemption: backed by the interned "" literal, which is already permanently
-  // retained by the JVM -- holding this instance pins nothing beyond what's already immortal.
-  public static final SubSequence EMPTY = new SubSequence("", 0, 0);
-
-  /**
-   * SubSequence from <code>beginIndex</code> to end of <code>str</code> Equivalent to
-   * str.subSequence(str, startIndex)
-   */
-  public static final SubSequence of(String str, int startIndex) {
-    return new SubSequence(str, startIndex, str.length());
-  }
-
-  /**
-   * SubSequence from <code>beginIndex</code> inclusive to <code>endIndex</code> exclusive of <code>
-   * str</code> Equivalent to str.subSequence(str, startIndex, endIndex)
-   *
-   * <p>Unlike {@code String.substring}, this always allocates a view, even when <code>startIndex
-   * == endIndex</code> -- there is no free empty case here, because returning {@link #EMPTY}
-   * instead would mean this factory sometimes returns the singleton and sometimes a fresh instance,
-   * which defeats escape analysis at the call site (see {@link NoEscape}). {@code String.substring}
-   * pays no such cost for an empty range: it returns the interned {@code ""} literal
-   * unconditionally, independent of whether escape analysis succeeds. So on an empty range
-   * specifically, this is a real allocation with no offsetting copy avoided; use {@link #EMPTY}
-   * directly when the range is known to be empty.
-   */
-  public static final SubSequence of(String str, int startIndex, int endIndex) {
-    return new SubSequence(str, startIndex, endIndex);
-  }
-
-  private final String str;
-  private final int beginIndex;
-  private final int endIndex;
-
-  private String cachedSubstr = null;
-
-  SubSequence(String str, int startIndex, int endIndex) {
-    this.str = str;
-    this.beginIndex = startIndex;
-    this.endIndex = endIndex;
-  }
-
-  /** Beginning index of the subseqence in the backing String - can be useful in text processing */
-  public int beginIndex() {
-    return this.beginIndex;
-  }
-
-  /** Ending index of the subsequence in the backing String - can be useful in text processing */
-  public int endIndex() {
-    return this.endIndex;
-  }
-
-  @Override
-  public char charAt(int index) {
-    return this.str.charAt(this.beginIndex + index);
-  }
-
-  @Override
-  public int length() {
-    return this.endIndex - this.beginIndex;
-  }
-
-  @Override
-  public SubSequence subSequence(int start, int end) {
-    // start/end are offsets in THIS view's coordinates (CharSequence contract), so the absolute
-    // end is beginIndex + end -- NOT beginIndex + start + end (which overshoots by `start`).
-    int newBeginIndex = this.beginIndex + start;
-    int newEndIndex = this.beginIndex + end;
-
-    return new SubSequence(this.str, newBeginIndex, newEndIndex);
-  }
-
-  /** Appends this SubSequence to the StringBuilder Equivalent to builder.append(this) but faster */
-  public void appendTo(StringBuilder builder) {
-    int beginIndex = this.beginIndex;
-    int endIndex = this.endIndex;
-
-    // Guards against the special case empty SubSequence at this.str.length
-    if (beginIndex != endIndex) builder.append(this.str, beginIndex, endIndex);
-  }
-
-  /**
-   * The same value as {@code toString().hashCode()} -- the {@link String} hash polynomial over this
-   * window -- but computed directly over the backing characters so hashing a view does not
-   * materialize a substring. Stays consistent with {@link #equals}: a view, its content-equal
-   * {@code String}, and an equal-content view all share this hash.
-   */
-  @Override
-  public int hashCode() {
-    int h = 0;
-    for (int i = this.beginIndex; i < this.endIndex; ++i) {
-      h = 31 * h + this.str.charAt(i);
+    // @NoEscape exemption: backed by the interned "" literal, which is already permanently
+    // retained by the JVM -- holding this instance pins nothing beyond what's already immortal.
+    public static final SubSequence EMPTY = new SubSequence("", 0, 0);
+
+    /**
+     * SubSequence from <code>beginIndex</code> to end of <code>str</code> Equivalent to
+     * str.subSequence(str, startIndex)
+     */
+    public static final SubSequence of(String str, int startIndex) {
+        return new SubSequence(str, startIndex, str.length());
     }
-    return h;
-  }
-
-  /**
-   * Dispatches on the argument's runtime type: a {@code String} takes the {@link #equals(String)}
-   * region-compare fast path; any other {@code CharSequence} is compared via {@link
-   * #contentEquals(CharSequence)}. So {@code this.equals(backingStr.substring(beginIndex,
-   * endIndex))} is true, and two views with equal content are equal.
-   */
-  // Intentionally asymmetric: a SubSequence equals any String/CharSequence with the same content,
-  // so subSeq.equals(str) can be true while str.equals(subSeq) is false. This view-equality
-  // convenience is by design (see class javadoc); accepted despite the equals() symmetry contract.
-  @Override
-  @SuppressFBWarnings("EQ_CHECK_FOR_OPERAND_NOT_COMPATIBLE_WITH_THIS")
-  public boolean equals(Object obj) {
-    if (obj instanceof String) return this.equals((String) obj);
-    if (obj instanceof CharSequence) return this.contentEquals((CharSequence) obj);
-
-    return false;
-  }
-
-  /**
-   * Equivalent to {@code toString().equals(other)}. A thin alias for {@link
-   * #contentEquals(String)}, kept for callers working in terms of {@code equals}; prefer {@link
-   * #contentEquals(String)} directly.
-   */
-  public final boolean equals(String other) {
-    return this.contentEquals(other);
-  }
-
-  /**
-   * Equivalent to {@code toString().contentEquals(that)}: true when {@code that} has the same
-   * length and characters as this window. The general char-by-char comparison for any {@code
-   * CharSequence}; prefer {@link #contentEquals(String)} when the argument is known to be a {@code
-   * String}.
-   */
-  public final boolean contentEquals(CharSequence that) {
-    if (that == null) return false;
-
-    int len = this.length();
-    if (len != that.length()) return false;
-
-    for (int i = 0; i < len; ++i) {
-      if (this.charAt(i) != that.charAt(i)) return false;
+
+    /**
+     * SubSequence from <code>beginIndex</code> inclusive to <code>endIndex</code> exclusive of <code>
+     * str</code> Equivalent to str.subSequence(str, startIndex, endIndex)
+     *
+     * <p>Unlike {@code String.substring}, this always allocates a view, even when <code>startIndex
+     * == endIndex</code> -- there is no free empty case here, because returning {@link #EMPTY}
+     * instead would mean this factory sometimes returns the singleton and sometimes a fresh instance,
+     * which defeats escape analysis at the call site (see {@link NoEscape}). {@code String.substring}
+     * pays no such cost for an empty range: it returns the interned {@code ""} literal
+     * unconditionally, independent of whether escape analysis succeeds. So on an empty range
+     * specifically, this is a real allocation with no offsetting copy avoided; use {@link #EMPTY}
+     * directly when the range is known to be empty.
+     */
+    public static final SubSequence of(String str, int startIndex, int endIndex) {
+        return new SubSequence(str, startIndex, endIndex);
+    }
+
+    private final String str;
+    private final int beginIndex;
+    private final int endIndex;
+
+    private String cachedSubstr = null;
+
+    SubSequence(String str, int startIndex, int endIndex) {
+        this.str = str;
+        this.beginIndex = startIndex;
+        this.endIndex = endIndex;
+    }
+
+    /** Beginning index of the subseqence in the backing String - can be useful in text processing */
+    public int beginIndex() {
+        return this.beginIndex;
+    }
+
+    /** Ending index of the subsequence in the backing String - can be useful in text processing */
+    public int endIndex() {
+        return this.endIndex;
+    }
+
+    @Override
+    public char charAt(int index) {
+        return this.str.charAt(this.beginIndex + index);
+    }
+
+    @Override
+    public int length() {
+        return this.endIndex - this.beginIndex;
+    }
+
+    @Override
+    public SubSequence subSequence(int start, int end) {
+        // start/end are offsets in THIS view's coordinates (CharSequence contract), so the absolute
+        // end is beginIndex + end -- NOT beginIndex + start + end (which overshoots by `start`).
+        int newBeginIndex = this.beginIndex + start;
+        int newEndIndex = this.beginIndex + end;
+
+        return new SubSequence(this.str, newBeginIndex, newEndIndex);
+    }
+
+    /** Appends this SubSequence to the StringBuilder Equivalent to builder.append(this) but faster */
+    public void appendTo(StringBuilder builder) {
+        int beginIndex = this.beginIndex;
+        int endIndex = this.endIndex;
+
+        // Guards against the special case empty SubSequence at this.str.length
+        if (beginIndex != endIndex) builder.append(this.str, beginIndex, endIndex);
+    }
+
+    /**
+     * The same value as {@code toString().hashCode()} -- the {@link String} hash polynomial over this
+     * window -- but computed directly over the backing characters so hashing a view does not
+     * materialize a substring. Stays consistent with {@link #equals}: a view, its content-equal
+     * {@code String}, and an equal-content view all share this hash.
+     */
+    @Override
+    public int hashCode() {
+        int h = 0;
+        for (int i = this.beginIndex; i < this.endIndex; ++i) {
+            h = 31 * h + this.str.charAt(i);
+        }
+        return h;
+    }
+
+    /**
+     * Dispatches on the argument's runtime type: a {@code String} takes the {@link #equals(String)}
+     * region-compare fast path; any other {@code CharSequence} is compared via {@link
+     * #contentEquals(CharSequence)}. So {@code this.equals(backingStr.substring(beginIndex,
+     * endIndex))} is true, and two views with equal content are equal.
+     */
+    // Intentionally asymmetric: a SubSequence equals any String/CharSequence with the same content,
+    // so subSeq.equals(str) can be true while str.equals(subSeq) is false. This view-equality
+    // convenience is by design (see class javadoc); accepted despite the equals() symmetry contract.
+    @Override
+    @SuppressFBWarnings("EQ_CHECK_FOR_OPERAND_NOT_COMPATIBLE_WITH_THIS")
+    public boolean equals(Object obj) {
+        if (obj instanceof String) return this.equals((String) obj);
+        if (obj instanceof CharSequence) return this.contentEquals((CharSequence) obj);
+
+        return false;
+    }
+
+    /**
+     * Equivalent to {@code toString().equals(other)}. A thin alias for {@link
+     * #contentEquals(String)}, kept for callers working in terms of {@code equals}; prefer {@link
+     * #contentEquals(String)} directly.
+     */
+    public final boolean equals(String other) {
+        return this.contentEquals(other);
+    }
+
+    /**
+     * Equivalent to {@code toString().contentEquals(that)}: true when {@code that} has the same
+     * length and characters as this window. The general char-by-char comparison for any {@code
+     * CharSequence}; prefer {@link #contentEquals(String)} when the argument is known to be a {@code
+     * String}.
+     */
+    public final boolean contentEquals(CharSequence that) {
+        if (that == null) return false;
+
+        int len = this.length();
+        if (len != that.length()) return false;
+
+        for (int i = 0; i < len; ++i) {
+            if (this.charAt(i) != that.charAt(i)) return false;
+        }
+        return true;
+    }
+
+    /**
+     * String-specialized {@link #contentEquals(CharSequence)}: true when {@code other} has the same
+     * length and characters as this window, via {@link String#regionMatches} (backing-array compare,
+     * no per-char loop). Prefer this to {@link #equals(Object)} -- it states content-comparison
+     * intent and is free of the {@code equals} contract's cross-type asymmetry.
+     */
+    public final boolean contentEquals(String other) {
+        return other != null
+                && other.length() == this.length()
+                && this.str.regionMatches(this.beginIndex, other, 0, other.length());
+    }
+
+    /**
+     * Case-insensitive counterpart of {@link #equals(String)}. Like {@link
+     * String#equalsIgnoreCase(String)}, a {@code null} argument is {@code false} rather than an
+     * error.
+     */
+    public final boolean equalsIgnoreCase(String other) {
+        return other != null
+                && other.length() == this.length()
+                && this.str.regionMatches(true, this.beginIndex, other, 0, other.length());
+    }
+
+    /**
+     * Equivalent to {@code toString().startsWith(prefix)}. The window guard ({@code prefix.length()
+     * <= length()}) keeps the delegated read inside {@code [beginIndex, endIndex)}.
+     */
+    public final boolean startsWith(String prefix) {
+        return prefix.length() <= this.length() && this.str.startsWith(prefix, this.beginIndex);
+    }
+
+    /**
+     * Equivalent to {@code length() > 0 && charAt(0) == c}, the single-character {@link
+     * #startsWith(String)}.
+     */
+    public final boolean startsWith(char c) {
+        return this.beginIndex < this.endIndex && this.str.charAt(this.beginIndex) == c;
+    }
+
+    /**
+     * Equivalent to {@code toString().endsWith(suffix)}. Implemented as a prefix match anchored at
+     * {@code endIndex - suffix.length()} so the read stays inside this window.
+     */
+    public final boolean endsWith(String suffix) {
+        int suffixLen = suffix.length();
+        return suffixLen <= this.length() && this.str.startsWith(suffix, this.endIndex - suffixLen);
+    }
+
+    /**
+     * Equivalent to {@code length() > 0 && charAt(length() - 1) == c}, the single-character {@link
+     * #endsWith(String)}.
+     */
+    public final boolean endsWith(char c) {
+        return this.beginIndex < this.endIndex && this.str.charAt(this.endIndex - 1) == c;
+    }
+
+    /**
+     * Equivalent to {@code toString().indexOf(needle)}: the offset of the first full occurrence of
+     * {@code needle} within this window relative to the window start, or {@code -1} if it does not
+     * occur fully in range. {@link String#indexOf(String, int)} returns the earliest occurrence at or
+     * after {@code beginIndex}, so a single bound check against {@code endIndex} is exact.
+     */
+    public final int indexOf(String needle) {
+        int idx = this.str.indexOf(needle, this.beginIndex);
+        return (idx >= 0 && idx + needle.length() <= this.endIndex) ? idx - this.beginIndex : -1;
+    }
+
+    /**
+     * Equivalent to {@code toString().indexOf(c)}: the offset of the first {@code c} within this
+     * window relative to the window start, or {@code -1} if it does not occur in range.
+     */
+    public final int indexOf(char c) {
+        int idx = this.str.indexOf(c, this.beginIndex);
+        return (idx >= 0 && idx < this.endIndex) ? idx - this.beginIndex : -1;
+    }
+
+    /**
+     * Equivalent to {@code toString().lastIndexOf(needle)}: the offset of the last full occurrence of
+     * {@code needle} within this window relative to the window start, or {@code -1} if it does not
+     * occur fully in range. Searches back from {@code endIndex - needle.length()} -- the latest start
+     * whose end still fits the window -- so the lower bound is a single check against {@code
+     * beginIndex}.
+     */
+    public final int lastIndexOf(String needle) {
+        int idx = this.str.lastIndexOf(needle, this.endIndex - needle.length());
+        return (idx >= this.beginIndex) ? idx - this.beginIndex : -1;
+    }
+
+    /**
+     * Equivalent to {@code toString().lastIndexOf(c)}: the offset of the last {@code c} within this
+     * window relative to the window start, or {@code -1} if it does not occur in range.
+     */
+    public final int lastIndexOf(char c) {
+        int idx = this.str.lastIndexOf(c, this.endIndex - 1);
+        return (idx >= this.beginIndex) ? idx - this.beginIndex : -1;
+    }
+
+    /**
+     * True if this sub-sequence contains {@code needle} -- the zero-copy equivalent of {@code
+     * toString().contains(needle)}, with no substring materialized.
+     */
+    public final boolean contains(String needle) {
+        return Strings.regionContains(this.str, this.beginIndex, this.endIndex, needle);
+    }
+
+    @Override
+    public String toString() {
+        String cached = this.cachedSubstr;
+        if (cached != null) return cached;
+
+        int beginIndex = this.beginIndex;
+        int endIndex = this.endIndex;
+
+        String substr = (beginIndex == endIndex) ? "" : this.str.substring(beginIndex, endIndex);
+        this.cachedSubstr = substr;
+        return substr;
     }
-    return true;
-  }
-
-  /**
-   * String-specialized {@link #contentEquals(CharSequence)}: true when {@code other} has the same
-   * length and characters as this window, via {@link String#regionMatches} (backing-array compare,
-   * no per-char loop). Prefer this to {@link #equals(Object)} -- it states content-comparison
-   * intent and is free of the {@code equals} contract's cross-type asymmetry.
-   */
-  public final boolean contentEquals(String other) {
-    return other != null
-        && other.length() == this.length()
-        && this.str.regionMatches(this.beginIndex, other, 0, other.length());
-  }
-
-  /**
-   * Case-insensitive counterpart of {@link #equals(String)}. Like {@link
-   * String#equalsIgnoreCase(String)}, a {@code null} argument is {@code false} rather than an
-   * error.
-   */
-  public final boolean equalsIgnoreCase(String other) {
-    return other != null
-        && other.length() == this.length()
-        && this.str.regionMatches(true, this.beginIndex, other, 0, other.length());
-  }
-
-  /**
-   * Equivalent to {@code toString().startsWith(prefix)}. The window guard ({@code prefix.length()
-   * <= length()}) keeps the delegated read inside {@code [beginIndex, endIndex)}.
-   */
-  public final boolean startsWith(String prefix) {
-    return prefix.length() <= this.length() && this.str.startsWith(prefix, this.beginIndex);
-  }
-
-  /**
-   * Equivalent to {@code length() > 0 && charAt(0) == c}, the single-character {@link
-   * #startsWith(String)}.
-   */
-  public final boolean startsWith(char c) {
-    return this.beginIndex < this.endIndex && this.str.charAt(this.beginIndex) == c;
-  }
-
-  /**
-   * Equivalent to {@code toString().endsWith(suffix)}. Implemented as a prefix match anchored at
-   * {@code endIndex - suffix.length()} so the read stays inside this window.
-   */
-  public final boolean endsWith(String suffix) {
-    int suffixLen = suffix.length();
-    return suffixLen <= this.length() && this.str.startsWith(suffix, this.endIndex - suffixLen);
-  }
-
-  /**
-   * Equivalent to {@code length() > 0 && charAt(length() - 1) == c}, the single-character {@link
-   * #endsWith(String)}.
-   */
-  public final boolean endsWith(char c) {
-    return this.beginIndex < this.endIndex && this.str.charAt(this.endIndex - 1) == c;
-  }
-
-  /**
-   * Equivalent to {@code toString().indexOf(needle)}: the offset of the first full occurrence of
-   * {@code needle} within this window relative to the window start, or {@code -1} if it does not
-   * occur fully in range. {@link String#indexOf(String, int)} returns the earliest occurrence at or
-   * after {@code beginIndex}, so a single bound check against {@code endIndex} is exact.
-   */
-  public final int indexOf(String needle) {
-    int idx = this.str.indexOf(needle, this.beginIndex);
-    return (idx >= 0 && idx + needle.length() <= this.endIndex) ? idx - this.beginIndex : -1;
-  }
-
-  /**
-   * Equivalent to {@code toString().indexOf(c)}: the offset of the first {@code c} within this
-   * window relative to the window start, or {@code -1} if it does not occur in range.
-   */
-  public final int indexOf(char c) {
-    int idx = this.str.indexOf(c, this.beginIndex);
-    return (idx >= 0 && idx < this.endIndex) ? idx - this.beginIndex : -1;
-  }
-
-  /**
-   * Equivalent to {@code toString().lastIndexOf(needle)}: the offset of the last full occurrence of
-   * {@code needle} within this window relative to the window start, or {@code -1} if it does not
-   * occur fully in range. Searches back from {@code endIndex - needle.length()} -- the latest start
-   * whose end still fits the window -- so the lower bound is a single check against {@code
-   * beginIndex}.
-   */
-  public final int lastIndexOf(String needle) {
-    int idx = this.str.lastIndexOf(needle, this.endIndex - needle.length());
-    return (idx >= this.beginIndex) ? idx - this.beginIndex : -1;
-  }
-
-  /**
-   * Equivalent to {@code toString().lastIndexOf(c)}: the offset of the last {@code c} within this
-   * window relative to the window start, or {@code -1} if it does not occur in range.
-   */
-  public final int lastIndexOf(char c) {
-    int idx = this.str.lastIndexOf(c, this.endIndex - 1);
-    return (idx >= this.beginIndex) ? idx - this.beginIndex : -1;
-  }
-
-  /**
-   * True if this sub-sequence contains {@code needle} -- the zero-copy equivalent of {@code
-   * toString().contains(needle)}, with no substring materialized.
-   */
-  public final boolean contains(String needle) {
-    return Strings.regionContains(this.str, this.beginIndex, this.endIndex, needle);
-  }
-
-  @Override
-  public String toString() {
-    String cached = this.cachedSubstr;
-    if (cached != null) return cached;
-
-    int beginIndex = this.beginIndex;
-    int endIndex = this.endIndex;
-
-    String substr = (beginIndex == endIndex) ? "" : this.str.substring(beginIndex, endIndex);
-    this.cachedSubstr = substr;
-    return substr;
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/TagsHelper.java b/internal-api/src/main/java/datadog/trace/util/TagsHelper.java
index 3627cb47648..09ac1a96a14 100644
--- a/internal-api/src/main/java/datadog/trace/util/TagsHelper.java
+++ b/internal-api/src/main/java/datadog/trace/util/TagsHelper.java
@@ -4,83 +4,83 @@
 
 /** Helper class for handling tags */
 public final class TagsHelper {
-  private static final int MAX_LENGTH = 200;
+    private static final int MAX_LENGTH = 200;
 
-  /**
-   * Taken from:
-   * https://github.com/DataDog/logs-backend/blob/d0b3289ce2c63c1e8f961f03fc4e03318fb36b0f/processing/src/main/java/com/dd/logs/processing/common/Tags.java#L44
-   *
-   * <p>Sanitizes a tag, more or less following (but not exactly) as per recommended DataDog
-   * guidelines.
-   *
-   * <p>See the exact guidelines:
-   * https://docs.datadoghq.com/getting_started/tagging/#tags-best-practices
-   *
-   * <p>1. Tags must start with a letter, and after that may contain: - Alphanumerics - Underscores
-   * - Minuses - Colons - Periods - Slashes Other special characters get converted to underscores.
-   * Note: A tag cannot end with a colon (e.g., tag:)
-   *
-   * <p>2. Tags can be up to 200 characters long and support unicode.
-   *
-   * <p>3. Tags are converted to lowercase.
-   *
-   * <p>4. A tag can have a value or a key:value syntax: For optimal functionality, we recommend
-   * constructing tags that use the key:value syntax. The key is always what precedes the first
-   * colon of the global tag definition, e.g.: - role:database:mysql is parsed as key:role ,
-   * value:database:mysql - role_database:mysql is parsed as key:role_database , value:mysql
-   * Examples of commonly used metric tag keys are env, instance, name, and role.
-   *
-   * <p>5. device, host, and source are reserved tag keys and cannot be specified in the standard
-   * way.
-   *
-   * <p>6. Tags shouldn't originate from unbounded sources, such as EPOCH timestamps or user IDs.
-   * These tags may impact platform performance and billing.
-   *
-   * <p>Changes: we trim leading and trailing spaces.
-   *
-   * @param tag The tag to sanitize.
-   * @return A sanitized tag, or null if the provided tag was null.
-   */
-  public static String sanitize(String tag) {
-    if (tag == null) {
-      return null;
+    /**
+     * Taken from:
+     * https://github.com/DataDog/logs-backend/blob/d0b3289ce2c63c1e8f961f03fc4e03318fb36b0f/processing/src/main/java/com/dd/logs/processing/common/Tags.java#L44
+     *
+     * <p>Sanitizes a tag, more or less following (but not exactly) as per recommended DataDog
+     * guidelines.
+     *
+     * <p>See the exact guidelines:
+     * https://docs.datadoghq.com/getting_started/tagging/#tags-best-practices
+     *
+     * <p>1. Tags must start with a letter, and after that may contain: - Alphanumerics - Underscores
+     * - Minuses - Colons - Periods - Slashes Other special characters get converted to underscores.
+     * Note: A tag cannot end with a colon (e.g., tag:)
+     *
+     * <p>2. Tags can be up to 200 characters long and support unicode.
+     *
+     * <p>3. Tags are converted to lowercase.
+     *
+     * <p>4. A tag can have a value or a key:value syntax: For optimal functionality, we recommend
+     * constructing tags that use the key:value syntax. The key is always what precedes the first
+     * colon of the global tag definition, e.g.: - role:database:mysql is parsed as key:role ,
+     * value:database:mysql - role_database:mysql is parsed as key:role_database , value:mysql
+     * Examples of commonly used metric tag keys are env, instance, name, and role.
+     *
+     * <p>5. device, host, and source are reserved tag keys and cannot be specified in the standard
+     * way.
+     *
+     * <p>6. Tags shouldn't originate from unbounded sources, such as EPOCH timestamps or user IDs.
+     * These tags may impact platform performance and billing.
+     *
+     * <p>Changes: we trim leading and trailing spaces.
+     *
+     * @param tag The tag to sanitize.
+     * @return A sanitized tag, or null if the provided tag was null.
+     */
+    public static String sanitize(String tag) {
+        if (tag == null) {
+            return null;
+        }
+        String lower = tag.toLowerCase(Locale.ROOT).trim();
+        int length = Math.min(lower.length(), MAX_LENGTH);
+        StringBuilder sanitized = new StringBuilder(length);
+        for (int i = 0; i < length; ++i) {
+            char c = lower.charAt(i);
+            if (isValid(c)) {
+                sanitized.append(c);
+            } else {
+                sanitized.append('_');
+            }
+        }
+        return sanitized.toString();
     }
-    String lower = tag.toLowerCase(Locale.ROOT).trim();
-    int length = Math.min(lower.length(), MAX_LENGTH);
-    StringBuilder sanitized = new StringBuilder(length);
-    for (int i = 0; i < length; ++i) {
-      char c = lower.charAt(i);
-      if (isValid(c)) {
-        sanitized.append(c);
-      } else {
-        sanitized.append('_');
-      }
-    }
-    return sanitized.toString();
-  }
-
-  static boolean isValid(char c) {
-    return (c >= 'a' && c <= 'z')
-        || (c >= '0' && c <= '9')
-        || c == '-'
-        || c == '_'
-        || c == '.'
-        || c == '/'
-        || c == ':';
-  }
 
-  public static String concatTags(String... tags) {
-    if (tags == null || tags.length == 0) {
-      return "";
+    static boolean isValid(char c) {
+        return (c >= 'a' && c <= 'z')
+                || (c >= '0' && c <= '9')
+                || c == '-'
+                || c == '_'
+                || c == '.'
+                || c == '/'
+                || c == ':';
     }
-    StringBuilder sb = new StringBuilder();
-    for (String tag : tags) {
-      if (tag == null) {
-        continue;
-      }
-      sb.append(tag);
-      sb.append(',');
+
+    public static String concatTags(String... tags) {
+        if (tags == null || tags.length == 0) {
+            return "";
+        }
+        StringBuilder sb = new StringBuilder();
+        for (String tag : tags) {
+            if (tag == null) {
+                continue;
+            }
+            sb.append(tag);
+            sb.append(',');
+        }
+        return sb.substring(0, sb.length() - 1); // Remove last comma
     }
-    return sb.substring(0, sb.length() - 1); // Remove last comma
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/TempLocationManager.java b/internal-api/src/main/java/datadog/trace/util/TempLocationManager.java
index bbdcedadfa6..c9da813c273 100644
--- a/internal-api/src/main/java/datadog/trace/util/TempLocationManager.java
+++ b/internal-api/src/main/java/datadog/trace/util/TempLocationManager.java
@@ -36,544 +36,521 @@
  * to a running Java process. Also, the temporary location is cleaned up on shutdown.
  */
 public final class TempLocationManager {
-  private static final Logger log = LoggerFactory.getLogger(TempLocationManager.class);
-  private static final String TEMPDIR_PREFIX = "pid_";
+    private static final Logger log = LoggerFactory.getLogger(TempLocationManager.class);
+    private static final String TEMPDIR_PREFIX = "pid_";
 
-  private static final class SingletonHolder {
-    private static final TempLocationManager INSTANCE = new TempLocationManager();
-  }
+    private static final class SingletonHolder {
+        private static final TempLocationManager INSTANCE = new TempLocationManager();
+    }
 
-  interface CleanupHook {
-    CleanupHook EMPTY = new CleanupHook() {};
+    interface CleanupHook {
+        CleanupHook EMPTY = new CleanupHook() {};
 
-    default FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs, boolean timeout)
-        throws IOException {
-      return timeout ? FileVisitResult.TERMINATE : FileVisitResult.CONTINUE;
-    }
+        default FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs, boolean timeout)
+                throws IOException {
+            return timeout ? FileVisitResult.TERMINATE : FileVisitResult.CONTINUE;
+        }
 
-    default FileVisitResult visitFile(Path file, BasicFileAttributes attrs, boolean timeout)
-        throws IOException {
-      return timeout ? FileVisitResult.TERMINATE : FileVisitResult.CONTINUE;
-    }
+        default FileVisitResult visitFile(Path file, BasicFileAttributes attrs, boolean timeout) throws IOException {
+            return timeout ? FileVisitResult.TERMINATE : FileVisitResult.CONTINUE;
+        }
 
-    default FileVisitResult visitFileFailed(Path file, IOException exc, boolean timeout)
-        throws IOException {
-      return timeout ? FileVisitResult.TERMINATE : FileVisitResult.CONTINUE;
-    }
+        default FileVisitResult visitFileFailed(Path file, IOException exc, boolean timeout) throws IOException {
+            return timeout ? FileVisitResult.TERMINATE : FileVisitResult.CONTINUE;
+        }
+
+        default FileVisitResult postVisitDirectory(Path dir, IOException exc, boolean timeout) throws IOException {
+            return timeout ? FileVisitResult.TERMINATE : FileVisitResult.CONTINUE;
+        }
 
-    default FileVisitResult postVisitDirectory(Path dir, IOException exc, boolean timeout)
-        throws IOException {
-      return timeout ? FileVisitResult.TERMINATE : FileVisitResult.CONTINUE;
+        default void onCleanupStart(long timeout, TimeUnit unit) {}
     }
 
-    default void onCleanupStart(long timeout, TimeUnit unit) {}
-  }
+    private final class CleanupVisitor implements FileVisitor<Path> {
+        private boolean shouldClean;
 
-  private final class CleanupVisitor implements FileVisitor<Path> {
-    private boolean shouldClean;
+        private Set<String> pidSet;
 
-    private Set<String> pidSet;
+        private final long cutoffMillis;
+        private final long timeoutTargetMillis;
 
-    private final long cutoffMillis;
-    private final long timeoutTargetMillis;
+        private boolean terminated = false;
 
-    private boolean terminated = false;
+        CleanupVisitor(long timeout, TimeUnit unit) {
+            long now = timeSource.getCurrentTimeMillis();
+            this.cutoffMillis = now - TimeUnit.SECONDS.toMillis(cutoffSeconds);
+            this.timeoutTargetMillis = timeout > -1 ? now + unit.toMillis(timeout) : Long.MAX_VALUE;
+        }
 
-    CleanupVisitor(long timeout, TimeUnit unit) {
-      long now = timeSource.getCurrentTimeMillis();
-      this.cutoffMillis = now - TimeUnit.SECONDS.toMillis(cutoffSeconds);
-      this.timeoutTargetMillis = timeout > -1 ? now + unit.toMillis(timeout) : Long.MAX_VALUE;
-    }
+        boolean isTerminated() {
+            return terminated;
+        }
 
-    boolean isTerminated() {
-      return terminated;
-    }
+        private boolean isTimedOut() {
+            return timeSource.getCurrentTimeMillis() > timeoutTargetMillis;
+        }
 
-    private boolean isTimedOut() {
-      return timeSource.getCurrentTimeMillis() > timeoutTargetMillis;
-    }
+        @Override
+        public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+            if (isTimedOut()) {
+                log.debug("Cleaning task timed out");
+                terminated = true;
+                cleanupTestHook.preVisitDirectory(dir, attrs, true);
+                return FileVisitResult.TERMINATE;
+            }
 
-    @Override
-    public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
-        throws IOException {
-      if (isTimedOut()) {
-        log.debug("Cleaning task timed out");
-        terminated = true;
-        cleanupTestHook.preVisitDirectory(dir, attrs, true);
-        return FileVisitResult.TERMINATE;
-      }
-
-      cleanupTestHook.preVisitDirectory(dir, attrs, false);
-
-      if (dir.equals(baseTempDir)) {
-        return FileVisitResult.CONTINUE;
-      }
-      String fileName = dir.getFileName().toString();
-      // the JFR repository directories are under <basedir>/pid_<pid>
-      String pid = fileName.startsWith(TEMPDIR_PREFIX) ? fileName.substring(4) : null;
-      boolean isSelfPid = pid != null && pid.equals(PidHelper.getPid());
-      if (!isSelfPid) {
-        if (pidSet == null) {
-          pidSet = PidHelper.getJavaPids(); // only fork jps when required
+            cleanupTestHook.preVisitDirectory(dir, attrs, false);
+
+            if (dir.equals(baseTempDir)) {
+                return FileVisitResult.CONTINUE;
+            }
+            String fileName = dir.getFileName().toString();
+            // the JFR repository directories are under <basedir>/pid_<pid>
+            String pid = fileName.startsWith(TEMPDIR_PREFIX) ? fileName.substring(4) : null;
+            boolean isSelfPid = pid != null && pid.equals(PidHelper.getPid());
+            if (!isSelfPid) {
+                if (pidSet == null) {
+                    pidSet = PidHelper.getJavaPids(); // only fork jps when required
+                }
+                shouldClean |= !pidSet.contains(pid);
+            }
+            if (shouldClean) {
+                log.debug("Cleaning temporary location {}", dir);
+            }
+            return shouldClean ? FileVisitResult.CONTINUE : FileVisitResult.SKIP_SUBTREE;
+        }
+
+        @Override
+        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+            if (isTimedOut()) {
+                log.debug("Cleaning task timed out");
+                terminated = true;
+                cleanupTestHook.visitFile(file, attrs, true);
+                return FileVisitResult.TERMINATE;
+            }
+            cleanupTestHook.visitFile(file, attrs, false);
+            try {
+                if (Files.getLastModifiedTime(file).toMillis() > cutoffMillis) {
+                    return FileVisitResult.SKIP_SUBTREE;
+                }
+                Files.delete(file);
+            } catch (NoSuchFileException ignored) {
+                // another process has already cleaned it; ignore
+            }
+            return FileVisitResult.CONTINUE;
+        }
+
+        @Override
+        public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
+            if (isTimedOut()) {
+                log.debug("Cleaning task timed out");
+                terminated = true;
+                cleanupTestHook.visitFileFailed(file, exc, true);
+                return FileVisitResult.TERMINATE;
+            }
+            cleanupTestHook.visitFileFailed(file, exc, false);
+            // do not log files/directories removed by another process running concurrently
+            if (!(exc instanceof NoSuchFileException) && log.isDebugEnabled()) {
+                log.debug("Failed to delete file {}", file, exc);
+            }
+            return FileVisitResult.CONTINUE;
+        }
+
+        @Override
+        public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+            if (isTimedOut()) {
+                log.debug("Cleaning task timed out");
+                terminated = true;
+                cleanupTestHook.postVisitDirectory(dir, exc, true);
+                return FileVisitResult.TERMINATE;
+            }
+            cleanupTestHook.postVisitDirectory(dir, exc, false);
+            if (exc instanceof NoSuchFileException) {
+                return FileVisitResult.CONTINUE;
+            }
+            if (shouldClean) {
+                try {
+                    Files.delete(dir);
+                } catch (NoSuchFileException ignored) {
+                    // another process has already cleaned it; ignore
+                }
+                String fileName = dir.getFileName().toString();
+                // reset the flag only if we are done cleaning the top-level directory
+                shouldClean = !fileName.startsWith(TEMPDIR_PREFIX);
+            }
+            return FileVisitResult.CONTINUE;
         }
-        shouldClean |= !pidSet.contains(pid);
-      }
-      if (shouldClean) {
-        log.debug("Cleaning temporary location {}", dir);
-      }
-      return shouldClean ? FileVisitResult.CONTINUE : FileVisitResult.SKIP_SUBTREE;
     }
 
-    @Override
-    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-      if (isTimedOut()) {
-        log.debug("Cleaning task timed out");
-        terminated = true;
-        cleanupTestHook.visitFile(file, attrs, true);
-        return FileVisitResult.TERMINATE;
-      }
-      cleanupTestHook.visitFile(file, attrs, false);
-      try {
-        if (Files.getLastModifiedTime(file).toMillis() > cutoffMillis) {
-          return FileVisitResult.SKIP_SUBTREE;
+    private final class CleanupTask implements Runnable {
+        private final CountDownLatch latch = new CountDownLatch(1);
+        private volatile Throwable throwable = null;
+
+        @Override
+        public void run() {
+            try {
+                cleanup();
+            } catch (OutOfMemoryError oom) {
+                throw oom;
+            } catch (Throwable t) {
+                throwable = t;
+            } finally {
+                latch.countDown();
+            }
+        }
+
+        boolean await(long timeout, TimeUnit unit) throws Throwable {
+            boolean ret = latch.await(timeout, unit);
+            if (throwable != null) {
+                throw throwable;
+            }
+            return ret;
         }
-        Files.delete(file);
-      } catch (NoSuchFileException ignored) {
-        // another process has already cleaned it; ignore
-      }
-      return FileVisitResult.CONTINUE;
     }
 
-    @Override
-    public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
-      if (isTimedOut()) {
-        log.debug("Cleaning task timed out");
-        terminated = true;
-        cleanupTestHook.visitFileFailed(file, exc, true);
-        return FileVisitResult.TERMINATE;
-      }
-      cleanupTestHook.visitFileFailed(file, exc, false);
-      // do not log files/directories removed by another process running concurrently
-      if (!(exc instanceof NoSuchFileException) && log.isDebugEnabled()) {
-        log.debug("Failed to delete file {}", file, exc);
-      }
-      return FileVisitResult.CONTINUE;
+    private static final Set<PosixFilePermission> GROUP_WORLD_BITS = EnumSet.of(
+            PosixFilePermission.GROUP_READ,
+            PosixFilePermission.GROUP_WRITE,
+            PosixFilePermission.GROUP_EXECUTE,
+            PosixFilePermission.OTHERS_READ,
+            PosixFilePermission.OTHERS_WRITE,
+            PosixFilePermission.OTHERS_EXECUTE);
+
+    private final boolean isPosixFs;
+    private final Path baseTempDir;
+    private final Path tempDir;
+    private final long cutoffSeconds;
+    private UserPrincipal expectedOwner;
+
+    private final CleanupTask cleanupTask = new CleanupTask();
+    private final CleanupHook cleanupTestHook;
+    private final TimeSource timeSource;
+
+    /**
+     * Get the singleton instance of the TempLocationManager. It will run the cleanup task in the
+     * background.
+     *
+     * @return the singleton instance of the TempLocationManager
+     */
+    public static TempLocationManager getInstance() {
+        return getInstance(false);
     }
 
-    @Override
-    public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
-      if (isTimedOut()) {
-        log.debug("Cleaning task timed out");
-        terminated = true;
-        cleanupTestHook.postVisitDirectory(dir, exc, true);
-        return FileVisitResult.TERMINATE;
-      }
-      cleanupTestHook.postVisitDirectory(dir, exc, false);
-      if (exc instanceof NoSuchFileException) {
-        return FileVisitResult.CONTINUE;
-      }
-      if (shouldClean) {
-        try {
-          Files.delete(dir);
-        } catch (NoSuchFileException ignored) {
-          // another process has already cleaned it; ignore
+    /**
+     * Get the singleton instance of the TempLocationManager.
+     *
+     * @param waitForCleanup if true, wait for the cleanup task to finish before returning
+     * @return the singleton instance of the TempLocationManager
+     */
+    static TempLocationManager getInstance(boolean waitForCleanup) {
+        TempLocationManager instance = SingletonHolder.INSTANCE;
+        if (waitForCleanup) {
+            instance.waitForCleanup(5, TimeUnit.SECONDS);
         }
-        String fileName = dir.getFileName().toString();
-        // reset the flag only if we are done cleaning the top-level directory
-        shouldClean = !fileName.startsWith(TEMPDIR_PREFIX);
-      }
-      return FileVisitResult.CONTINUE;
+        return instance;
     }
-  }
-
-  private final class CleanupTask implements Runnable {
-    private final CountDownLatch latch = new CountDownLatch(1);
-    private volatile Throwable throwable = null;
-
-    @Override
-    public void run() {
-      try {
-        cleanup();
-      } catch (OutOfMemoryError oom) {
-        throw oom;
-      } catch (Throwable t) {
-        throwable = t;
-      } finally {
-        latch.countDown();
-      }
+
+    private TempLocationManager() {
+        this(ConfigProvider.getInstance());
     }
 
-    boolean await(long timeout, TimeUnit unit) throws Throwable {
-      boolean ret = latch.await(timeout, unit);
-      if (throwable != null) {
-        throw throwable;
-      }
-      return ret;
+    TempLocationManager(ConfigProvider configProvider) {
+        this(configProvider, true, CleanupHook.EMPTY, SystemTimeSource.INSTANCE);
     }
-  }
-
-  private static final Set<PosixFilePermission> GROUP_WORLD_BITS =
-      EnumSet.of(
-          PosixFilePermission.GROUP_READ,
-          PosixFilePermission.GROUP_WRITE,
-          PosixFilePermission.GROUP_EXECUTE,
-          PosixFilePermission.OTHERS_READ,
-          PosixFilePermission.OTHERS_WRITE,
-          PosixFilePermission.OTHERS_EXECUTE);
-
-  private final boolean isPosixFs;
-  private final Path baseTempDir;
-  private final Path tempDir;
-  private final long cutoffSeconds;
-  private UserPrincipal expectedOwner;
-
-  private final CleanupTask cleanupTask = new CleanupTask();
-  private final CleanupHook cleanupTestHook;
-  private final TimeSource timeSource;
-
-  /**
-   * Get the singleton instance of the TempLocationManager. It will run the cleanup task in the
-   * background.
-   *
-   * @return the singleton instance of the TempLocationManager
-   */
-  public static TempLocationManager getInstance() {
-    return getInstance(false);
-  }
-
-  /**
-   * Get the singleton instance of the TempLocationManager.
-   *
-   * @param waitForCleanup if true, wait for the cleanup task to finish before returning
-   * @return the singleton instance of the TempLocationManager
-   */
-  static TempLocationManager getInstance(boolean waitForCleanup) {
-    TempLocationManager instance = SingletonHolder.INSTANCE;
-    if (waitForCleanup) {
-      instance.waitForCleanup(5, TimeUnit.SECONDS);
+
+    TempLocationManager(ConfigProvider configProvider, boolean runStartupCleanup, CleanupHook testHook) {
+        this(configProvider, runStartupCleanup, testHook, SystemTimeSource.INSTANCE);
     }
-    return instance;
-  }
-
-  private TempLocationManager() {
-    this(ConfigProvider.getInstance());
-  }
-
-  TempLocationManager(ConfigProvider configProvider) {
-    this(configProvider, true, CleanupHook.EMPTY, SystemTimeSource.INSTANCE);
-  }
-
-  TempLocationManager(
-      ConfigProvider configProvider, boolean runStartupCleanup, CleanupHook testHook) {
-    this(configProvider, runStartupCleanup, testHook, SystemTimeSource.INSTANCE);
-  }
-
-  TempLocationManager(
-      ConfigProvider configProvider,
-      boolean runStartupCleanup,
-      CleanupHook testHook,
-      TimeSource timeSource) {
-    cleanupTestHook = testHook;
-    this.timeSource = timeSource;
-
-    Set<String> supportedViews = FileSystems.getDefault().supportedFileAttributeViews();
-    isPosixFs = supportedViews.contains("posix");
-
-    // In order to avoid racy attempts to clean up files which are currently being processed in a
-    // JVM which is being shut down (the JVMs far in the shutdown routine may not be reported by
-    // 'jps' but still can be eg. processing JFR chunks) we will not clean up any files not older
-    // than '2 * PROFILING_UPLOAD_PERIOD' seconds.
-    // The reasoning is that even if the file is created immediately at JVM startup once it is
-    // 'PROFILING_UPLOAD_PERIOD' seconds old it gets processed to upload the final profile data and
-    // this processing will not take longer than another `PROFILING_UPLOAD_PERIOD' seconds.
-    // This is just an assumption but as long as the profiled application is working normally (eg.
-    // OS is not stalling) this assumption will hold.
-    cutoffSeconds =
-        configProvider.getLong(
-            ProfilingConfig.PROFILING_UPLOAD_PERIOD,
-            ProfilingConfig.PROFILING_UPLOAD_PERIOD_DEFAULT);
-    Path configuredTempDir =
-        Paths.get(
-            configProvider.getString(
+
+    TempLocationManager(
+            ConfigProvider configProvider, boolean runStartupCleanup, CleanupHook testHook, TimeSource timeSource) {
+        cleanupTestHook = testHook;
+        this.timeSource = timeSource;
+
+        Set<String> supportedViews = FileSystems.getDefault().supportedFileAttributeViews();
+        isPosixFs = supportedViews.contains("posix");
+
+        // In order to avoid racy attempts to clean up files which are currently being processed in a
+        // JVM which is being shut down (the JVMs far in the shutdown routine may not be reported by
+        // 'jps' but still can be eg. processing JFR chunks) we will not clean up any files not older
+        // than '2 * PROFILING_UPLOAD_PERIOD' seconds.
+        // The reasoning is that even if the file is created immediately at JVM startup once it is
+        // 'PROFILING_UPLOAD_PERIOD' seconds old it gets processed to upload the final profile data and
+        // this processing will not take longer than another `PROFILING_UPLOAD_PERIOD' seconds.
+        // This is just an assumption but as long as the profiled application is working normally (eg.
+        // OS is not stalling) this assumption will hold.
+        cutoffSeconds = configProvider.getLong(
+                ProfilingConfig.PROFILING_UPLOAD_PERIOD, ProfilingConfig.PROFILING_UPLOAD_PERIOD_DEFAULT);
+        Path configuredTempDir = Paths.get(configProvider.getString(
                 ProfilingConfig.PROFILING_TEMP_DIR, ProfilingConfig.PROFILING_TEMP_DIR_DEFAULT));
-    if (!Files.exists(configuredTempDir)) {
-      ProfilerFlareLogger.getInstance()
-          .log("Base temp directory, as defined in '{}' does not exist.", configuredTempDir);
-      throw new IllegalStateException(
-          "Base temp directory, as defined in '"
-              + ProfilingConfig.PROFILING_TEMP_DIR
-              + "' does not exist: "
-              + configuredTempDir);
-    }
+        if (!Files.exists(configuredTempDir)) {
+            ProfilerFlareLogger.getInstance()
+                    .log("Base temp directory, as defined in '{}' does not exist.", configuredTempDir);
+            throw new IllegalStateException("Base temp directory, as defined in '"
+                    + ProfilingConfig.PROFILING_TEMP_DIR
+                    + "' does not exist: "
+                    + configuredTempDir);
+        }
+
+        String pid = PidHelper.getPid();
 
-    String pid = PidHelper.getPid();
+        baseTempDir = configuredTempDir.resolve(getBaseTempDirName());
+        baseTempDir.toFile().deleteOnExit();
 
-    baseTempDir = configuredTempDir.resolve(getBaseTempDirName());
-    baseTempDir.toFile().deleteOnExit();
+        tempDir = baseTempDir.resolve(TEMPDIR_PREFIX + pid);
+        if (runStartupCleanup) {
+            // do not execute the background cleanup task when running in tests
+            AgentTaskScheduler.get().execute(cleanupTask);
+        }
 
-    tempDir = baseTempDir.resolve(TEMPDIR_PREFIX + pid);
-    if (runStartupCleanup) {
-      // do not execute the background cleanup task when running in tests
-      AgentTaskScheduler.get().execute(cleanupTask);
+        createTempDir(tempDir);
     }
 
-    createTempDir(tempDir);
-  }
-
-  @VisibleForTesting
-  static String getBaseTempDirName() {
-    String userName = SystemProperties.get("user.name");
-    // unlikely, but fall-back to system env based user name
-    userName = userName == null ? ConfigHelper.env("USER") : userName;
-    // make sure we do not have any illegal characters in the user name
-    userName =
-        userName != null ? userName.replace('.', '_').replace('/', '_').replace(' ', '_') : null;
-    return "ddprof" + (userName != null ? "_" + userName : "");
-  }
-
-  /**
-   * Get the temporary directory for the current process. The directory will be removed at JVM exit.
-   *
-   * @return the temporary directory for the current process
-   */
-  public Path getTempDir() {
-    return getTempDir(null);
-  }
-
-  /**
-   * Get the temporary subdirectory for the current process. The directory will be removed at JVM
-   * exit.
-   *
-   * @param subPath the relative subdirectory path, may be {@literal null}
-   * @return the temporary subdirectory for the current process
-   */
-  public Path getTempDir(Path subPath) {
-    return getTempDir(subPath, true);
-  }
-
-  /**
-   * Get the temporary subdirectory for the current process.
-   *
-   * @param subPath the relative subdirectory path, may be {@literal null}
-   * @param create if true, create the directory if it does not exist
-   * @return the temporary directory for the current process
-   * @throws IllegalStateException if the directory could not be created
-   */
-  public Path getTempDir(Path subPath, boolean create) {
-    Path rslt =
-        subPath != null && !subPath.toString().isEmpty() ? tempDir.resolve(subPath) : tempDir;
-    if (create && !Files.exists(rslt)) {
-      createTempDir(rslt);
-    } else if (isPosixFs && Files.exists(rslt)) {
-      validateOwnedSecureDir(rslt);
+    @VisibleForTesting
+    static String getBaseTempDirName() {
+        String userName = SystemProperties.get("user.name");
+        // unlikely, but fall-back to system env based user name
+        userName = userName == null ? ConfigHelper.env("USER") : userName;
+        // make sure we do not have any illegal characters in the user name
+        userName =
+                userName != null ? userName.replace('.', '_').replace('/', '_').replace(' ', '_') : null;
+        return "ddprof" + (userName != null ? "_" + userName : "");
     }
-    return rslt;
-  }
-
-  /**
-   * Walk the base temp directory recursively and remove all inactive per-process entries. No
-   * timeout is applied.
-   *
-   * @return {@literal true} if cleanup fully succeeded or {@literal false} otherwise (eg.
-   *     interruption etc.)
-   */
-  boolean cleanup() {
-    return cleanup(-1, TimeUnit.SECONDS);
-  }
-
-  /**
-   * Walk the base temp directory recursively and remove all inactive per-process entries
-   *
-   * @param timeout the task timeout; may be {@literal -1} to signal no timeout
-   * @param unit the task timeout unit
-   * @return {@literal true} if cleanup fully succeeded or {@literal false} otherwise (timeout,
-   *     interruption etc.)
-   */
-  boolean cleanup(long timeout, TimeUnit unit) {
-    try {
-      if (!Files.exists(baseTempDir)) {
-        // not even the main temp location exists; nothing to clean up
-        return true;
-      }
-      try (Stream<Path> paths = Files.walk(baseTempDir)) {
-        if (paths.noneMatch(
-            path ->
-                Files.isDirectory(path)
-                    && path.getFileName().toString().startsWith(TEMPDIR_PREFIX))) {
-          // nothing to clean up; bail out early
-          return true;
-        }
-      }
-      cleanupTestHook.onCleanupStart(timeout, unit);
-      CleanupVisitor visitor = new CleanupVisitor(timeout, unit);
-      Files.walkFileTree(baseTempDir, visitor);
-      return !visitor.isTerminated();
-    } catch (IOException e) {
-      log.debug("Unable to cleanup temp location {}", baseTempDir, e);
+
+    /**
+     * Get the temporary directory for the current process. The directory will be removed at JVM exit.
+     *
+     * @return the temporary directory for the current process
+     */
+    public Path getTempDir() {
+        return getTempDir(null);
     }
-    return false;
-  }
-
-  @VisibleForTesting
-  boolean waitForCleanup(long timeout, TimeUnit unit) {
-    try {
-      return cleanupTask.await(timeout, unit);
-    } catch (InterruptedException e) {
-      log.debug("Temp directory cleanup was interrupted");
-      Thread.currentThread().interrupt();
-    } catch (Throwable t) {
-      if (log.isDebugEnabled()) {
-        log.debug("Failed to cleanup temp directory: {}", tempDir, t);
-      } else {
-        log.debug("Failed to cleanup temp directory: {}", tempDir);
-      }
+
+    /**
+     * Get the temporary subdirectory for the current process. The directory will be removed at JVM
+     * exit.
+     *
+     * @param subPath the relative subdirectory path, may be {@literal null}
+     * @return the temporary subdirectory for the current process
+     */
+    public Path getTempDir(Path subPath) {
+        return getTempDir(subPath, true);
     }
-    return false;
-  }
-
-  @VisibleForTesting
-  void createDirStructure() throws IOException {
-    Files.createDirectories(baseTempDir);
-    if (isPosixFs) {
-      if (expectedOwner == null) {
-        expectedOwner = Files.getOwner(baseTempDir);
-      }
-      validateOwnedSecureDir(baseTempDir);
+
+    /**
+     * Get the temporary subdirectory for the current process.
+     *
+     * @param subPath the relative subdirectory path, may be {@literal null}
+     * @param create if true, create the directory if it does not exist
+     * @return the temporary directory for the current process
+     * @throws IllegalStateException if the directory could not be created
+     */
+    public Path getTempDir(Path subPath, boolean create) {
+        Path rslt = subPath != null && !subPath.toString().isEmpty() ? tempDir.resolve(subPath) : tempDir;
+        if (create && !Files.exists(rslt)) {
+            createTempDir(rslt);
+        } else if (isPosixFs && Files.exists(rslt)) {
+            validateOwnedSecureDir(rslt);
+        }
+        return rslt;
+    }
+
+    /**
+     * Walk the base temp directory recursively and remove all inactive per-process entries. No
+     * timeout is applied.
+     *
+     * @return {@literal true} if cleanup fully succeeded or {@literal false} otherwise (eg.
+     *     interruption etc.)
+     */
+    boolean cleanup() {
+        return cleanup(-1, TimeUnit.SECONDS);
     }
-  }
-
-  /**
-   * Validates that the given directory is owned by the current JVM user and has no group or world
-   * permission bits set (effective {@code 0700}). Only enforced on POSIX file systems.
-   *
-   * @throws IllegalStateException if the directory fails the ownership or permission check
-   */
-  private void validateOwnedSecureDir(Path dir) {
-    if (!isPosixFs) {
-      return;
+
+    /**
+     * Walk the base temp directory recursively and remove all inactive per-process entries
+     *
+     * @param timeout the task timeout; may be {@literal -1} to signal no timeout
+     * @param unit the task timeout unit
+     * @return {@literal true} if cleanup fully succeeded or {@literal false} otherwise (timeout,
+     *     interruption etc.)
+     */
+    boolean cleanup(long timeout, TimeUnit unit) {
+        try {
+            if (!Files.exists(baseTempDir)) {
+                // not even the main temp location exists; nothing to clean up
+                return true;
+            }
+            try (Stream<Path> paths = Files.walk(baseTempDir)) {
+                if (paths.noneMatch(path ->
+                        Files.isDirectory(path) && path.getFileName().toString().startsWith(TEMPDIR_PREFIX))) {
+                    // nothing to clean up; bail out early
+                    return true;
+                }
+            }
+            cleanupTestHook.onCleanupStart(timeout, unit);
+            CleanupVisitor visitor = new CleanupVisitor(timeout, unit);
+            Files.walkFileTree(baseTempDir, visitor);
+            return !visitor.isTerminated();
+        } catch (IOException e) {
+            log.debug("Unable to cleanup temp location {}", baseTempDir, e);
+        }
+        return false;
     }
-    try {
-      Set<PosixFilePermission> perms = Files.getPosixFilePermissions(dir);
-      UserPrincipal owner = Files.getOwner(dir);
-      boolean hasGroupWorldBits = perms.stream().anyMatch(GROUP_WORLD_BITS::contains);
-      boolean wrongOwner = expectedOwner != null && !expectedOwner.equals(owner);
-      if (hasGroupWorldBits || wrongOwner) {
-        ProfilerFlareLogger.getInstance()
-            .log(
-                "Refusing to use temp directory {} owned by {} with perms {}",
-                dir,
-                owner,
-                PosixFilePermissions.toString(perms));
-        throw new IllegalStateException("Untrusted temp directory: " + dir);
-      }
-    } catch (IllegalStateException e) {
-      throw e;
-    } catch (IOException e) {
-      ProfilerFlareLogger.getInstance()
-          .log("Failed to validate temp directory ownership/permissions for {}", dir);
-      throw new IllegalStateException("Untrusted temp directory: " + dir, e);
+
+    @VisibleForTesting
+    boolean waitForCleanup(long timeout, TimeUnit unit) {
+        try {
+            return cleanupTask.await(timeout, unit);
+        } catch (InterruptedException e) {
+            log.debug("Temp directory cleanup was interrupted");
+            Thread.currentThread().interrupt();
+        } catch (Throwable t) {
+            if (log.isDebugEnabled()) {
+                log.debug("Failed to cleanup temp directory: {}", tempDir, t);
+            } else {
+                log.debug("Failed to cleanup temp directory: {}", tempDir);
+            }
+        }
+        return false;
     }
-  }
-
-  private void createTempDir(Path tempDir) {
-    String msg = "Failed to create temp directory: " + tempDir;
-    try {
-      if (isPosixFs) {
-        // Validate any already-existing components from baseTempDir down to tempDir
-        // before creating anything new, to reject attacker-pre-planted directories.
-        Path current = baseTempDir;
-        if (Files.exists(current)) {
-          if (expectedOwner == null) {
-            expectedOwner = Files.getOwner(current);
-          }
-          validateOwnedSecureDir(current);
-          // Walk the relative path components between baseTempDir and tempDir
-          Path rel = baseTempDir.relativize(tempDir);
-          for (int i = 0; i < rel.getNameCount(); i++) {
-            current = current.resolve(rel.getName(i));
-            if (Files.exists(current)) {
-              validateOwnedSecureDir(current);
+
+    @VisibleForTesting
+    void createDirStructure() throws IOException {
+        Files.createDirectories(baseTempDir);
+        if (isPosixFs) {
+            if (expectedOwner == null) {
+                expectedOwner = Files.getOwner(baseTempDir);
             }
-          }
+            validateOwnedSecureDir(baseTempDir);
         }
-        Files.createDirectories(
-            tempDir,
-            PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
-        // Capture owner from a freshly created reference if not yet established
-        if (expectedOwner == null) {
-          expectedOwner = Files.getOwner(tempDir);
+    }
+
+    /**
+     * Validates that the given directory is owned by the current JVM user and has no group or world
+     * permission bits set (effective {@code 0700}). Only enforced on POSIX file systems.
+     *
+     * @throws IllegalStateException if the directory fails the ownership or permission check
+     */
+    private void validateOwnedSecureDir(Path dir) {
+        if (!isPosixFs) {
+            return;
         }
-        validateOwnedSecureDir(tempDir);
-      } else {
-        Files.createDirectories(tempDir);
-      }
-    } catch (IllegalStateException e) {
-      throw e;
-    } catch (IOException e) {
-      // if on a posix fs, let's check the expected permissions
-      // we will find the first offender not having the expected permissions and fail the check
-      if (isPosixFs) {
-        // take the first subfolder below the base temp dir
-        // we can wave the checks for tempDir being a subdir of baseTempDir because that's how it is
-        // created
-        Path root = baseTempDir.resolve(baseTempDir.relativize(tempDir).getName(0));
         try {
-          AtomicReference<Path> failed = new AtomicReference<>();
-          Files.walkFileTree(
-              root,
-              new FileVisitor<Path>() {
-                @Override
-                public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
-                    throws IOException {
-                  Set<PosixFilePermission> perms = Files.getPosixFilePermissions(dir);
-                  if (!perms.contains(PosixFilePermission.OWNER_READ)
-                      || !perms.contains(PosixFilePermission.OWNER_WRITE)
-                      || !perms.contains(PosixFilePermission.OWNER_EXECUTE)) {
-                    failed.set(dir);
-                    return FileVisitResult.TERMINATE;
-                  }
-                  return FileVisitResult.CONTINUE;
-                }
+            Set<PosixFilePermission> perms = Files.getPosixFilePermissions(dir);
+            UserPrincipal owner = Files.getOwner(dir);
+            boolean hasGroupWorldBits = perms.stream().anyMatch(GROUP_WORLD_BITS::contains);
+            boolean wrongOwner = expectedOwner != null && !expectedOwner.equals(owner);
+            if (hasGroupWorldBits || wrongOwner) {
+                ProfilerFlareLogger.getInstance()
+                        .log(
+                                "Refusing to use temp directory {} owned by {} with perms {}",
+                                dir,
+                                owner,
+                                PosixFilePermissions.toString(perms));
+                throw new IllegalStateException("Untrusted temp directory: " + dir);
+            }
+        } catch (IllegalStateException e) {
+            throw e;
+        } catch (IOException e) {
+            ProfilerFlareLogger.getInstance()
+                    .log("Failed to validate temp directory ownership/permissions for {}", dir);
+            throw new IllegalStateException("Untrusted temp directory: " + dir, e);
+        }
+    }
 
-                @Override
-                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-                    throws IOException {
-                  return FileVisitResult.SKIP_SIBLINGS;
+    private void createTempDir(Path tempDir) {
+        String msg = "Failed to create temp directory: " + tempDir;
+        try {
+            if (isPosixFs) {
+                // Validate any already-existing components from baseTempDir down to tempDir
+                // before creating anything new, to reject attacker-pre-planted directories.
+                Path current = baseTempDir;
+                if (Files.exists(current)) {
+                    if (expectedOwner == null) {
+                        expectedOwner = Files.getOwner(current);
+                    }
+                    validateOwnedSecureDir(current);
+                    // Walk the relative path components between baseTempDir and tempDir
+                    Path rel = baseTempDir.relativize(tempDir);
+                    for (int i = 0; i < rel.getNameCount(); i++) {
+                        current = current.resolve(rel.getName(i));
+                        if (Files.exists(current)) {
+                            validateOwnedSecureDir(current);
+                        }
+                    }
                 }
-
-                @Override
-                public FileVisitResult visitFileFailed(Path file, IOException exc)
-                    throws IOException {
-                  return FileVisitResult.TERMINATE;
+                Files.createDirectories(
+                        tempDir, PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
+                // Capture owner from a freshly created reference if not yet established
+                if (expectedOwner == null) {
+                    expectedOwner = Files.getOwner(tempDir);
                 }
-
-                @Override
-                public FileVisitResult postVisitDirectory(Path dir, IOException exc)
-                    throws IOException {
-                  return FileVisitResult.CONTINUE;
+                validateOwnedSecureDir(tempDir);
+            } else {
+                Files.createDirectories(tempDir);
+            }
+        } catch (IllegalStateException e) {
+            throw e;
+        } catch (IOException e) {
+            // if on a posix fs, let's check the expected permissions
+            // we will find the first offender not having the expected permissions and fail the check
+            if (isPosixFs) {
+                // take the first subfolder below the base temp dir
+                // we can wave the checks for tempDir being a subdir of baseTempDir because that's how it is
+                // created
+                Path root = baseTempDir.resolve(baseTempDir.relativize(tempDir).getName(0));
+                try {
+                    AtomicReference<Path> failed = new AtomicReference<>();
+                    Files.walkFileTree(root, new FileVisitor<Path>() {
+                        @Override
+                        public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
+                                throws IOException {
+                            Set<PosixFilePermission> perms = Files.getPosixFilePermissions(dir);
+                            if (!perms.contains(PosixFilePermission.OWNER_READ)
+                                    || !perms.contains(PosixFilePermission.OWNER_WRITE)
+                                    || !perms.contains(PosixFilePermission.OWNER_EXECUTE)) {
+                                failed.set(dir);
+                                return FileVisitResult.TERMINATE;
+                            }
+                            return FileVisitResult.CONTINUE;
+                        }
+
+                        @Override
+                        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                            return FileVisitResult.SKIP_SIBLINGS;
+                        }
+
+                        @Override
+                        public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
+                            return FileVisitResult.TERMINATE;
+                        }
+
+                        @Override
+                        public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                            return FileVisitResult.CONTINUE;
+                        }
+                    });
+                    Path failedDir = failed.get();
+
+                    if (failedDir != null) {
+                        ProfilerFlareLogger.getInstance()
+                                .log(
+                                        "Failed to create temp directory: {}, offender: {}, permissions: {}",
+                                        msg,
+                                        failedDir,
+                                        PosixFilePermissions.toString(Files.getPosixFilePermissions(failedDir)),
+                                        e);
+                    } else {
+                        ProfilerFlareLogger.getInstance().log(msg);
+                    }
+                } catch (IOException ignored) {
+                    // should not happen, but let's ignore it anyway
                 }
-              });
-          Path failedDir = failed.get();
-
-          if (failedDir != null) {
-            ProfilerFlareLogger.getInstance()
-                .log(
-                    "Failed to create temp directory: {}, offender: {}, permissions: {}",
-                    msg,
-                    failedDir,
-                    PosixFilePermissions.toString(Files.getPosixFilePermissions(failedDir)),
-                    e);
-          } else {
-            ProfilerFlareLogger.getInstance().log(msg);
-          }
-        } catch (IOException ignored) {
-          // should not happen, but let's ignore it anyway
+                throw new IllegalStateException(msg, e);
+            } else {
+                ProfilerFlareLogger.getInstance().log(msg, e);
+                throw new IllegalStateException(msg, e);
+            }
         }
-        throw new IllegalStateException(msg, e);
-      } else {
-        ProfilerFlareLogger.getInstance().log(msg, e);
-        throw new IllegalStateException(msg, e);
-      }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/TraceUtils.java b/internal-api/src/main/java/datadog/trace/util/TraceUtils.java
index 2e4c52c606c..8e6dcfc8332 100644
--- a/internal-api/src/main/java/datadog/trace/util/TraceUtils.java
+++ b/internal-api/src/main/java/datadog/trace/util/TraceUtils.java
@@ -12,80 +12,80 @@
  */
 public class TraceUtils {
 
-  private static final int MAX_TYPE_LEN = 100;
-  private static final int MAX_SERVICE_LEN = 100;
-  private static final int MAX_OP_NAME_LEN = 100;
-  private static final int MAX_ENV_LEN = 200;
-
-  static final String DEFAULT_SERVICE_NAME = "unnamed-service";
-  static final String DEFAULT_OPERATION_NAME = "unnamed_operation";
-  static final String DEFAULT_ENV = "none";
-
-  private static final Logger log = LoggerFactory.getLogger(TraceUtils.class);
-
-  public static String normalizeServiceName(final String service) {
-    if (service == null || service.isEmpty()) {
-      log.debug(
-          "Fixing malformed trace. Service  is empty (reason:service_empty), setting span.service={}.",
-          service);
-      return DEFAULT_SERVICE_NAME;
-    }
+    private static final int MAX_TYPE_LEN = 100;
+    private static final int MAX_SERVICE_LEN = 100;
+    private static final int MAX_OP_NAME_LEN = 100;
+    private static final int MAX_ENV_LEN = 200;
+
+    static final String DEFAULT_SERVICE_NAME = "unnamed-service";
+    static final String DEFAULT_OPERATION_NAME = "unnamed_operation";
+    static final String DEFAULT_ENV = "none";
+
+    private static final Logger log = LoggerFactory.getLogger(TraceUtils.class);
+
+    public static String normalizeServiceName(final String service) {
+        if (service == null || service.isEmpty()) {
+            log.debug(
+                    "Fixing malformed trace. Service  is empty (reason:service_empty), setting span.service={}.",
+                    service);
+            return DEFAULT_SERVICE_NAME;
+        }
+
+        String svc = service;
+        if (svc.length() > MAX_SERVICE_LEN) {
+            log.debug(
+                    "Fixing malformed trace. Service is too long (reason:service_truncate), truncating span.service to length={}.",
+                    MAX_SERVICE_LEN);
+            svc = truncate(svc, MAX_SERVICE_LEN);
+        }
 
-    String svc = service;
-    if (svc.length() > MAX_SERVICE_LEN) {
-      log.debug(
-          "Fixing malformed trace. Service is too long (reason:service_truncate), truncating span.service to length={}.",
-          MAX_SERVICE_LEN);
-      svc = truncate(svc, MAX_SERVICE_LEN);
+        return normalizeTag(svc);
     }
 
-    return normalizeTag(svc);
-  }
+    public static CharSequence normalizeOperationName(final CharSequence opName) {
+        if (opName == null || opName.length() == 0) {
+            return DEFAULT_OPERATION_NAME;
+        }
 
-  public static CharSequence normalizeOperationName(final CharSequence opName) {
-    if (opName == null || opName.length() == 0) {
-      return DEFAULT_OPERATION_NAME;
-    }
+        CharSequence name = opName;
+        if (name.length() > MAX_OP_NAME_LEN) {
+            log.debug(
+                    "Fixing malformed trace. Name is too long (reason:span_name_truncate), truncating span.name to length={}.",
+                    MAX_OP_NAME_LEN);
+            name = truncate(name, MAX_OP_NAME_LEN);
+        }
 
-    CharSequence name = opName;
-    if (name.length() > MAX_OP_NAME_LEN) {
-      log.debug(
-          "Fixing malformed trace. Name is too long (reason:span_name_truncate), truncating span.name to length={}.",
-          MAX_OP_NAME_LEN);
-      name = truncate(name, MAX_OP_NAME_LEN);
+        name = normalizeSpanName(name);
+        if (name.length() == 0) {
+            name = DEFAULT_OPERATION_NAME;
+        }
+        return name;
     }
 
-    name = normalizeSpanName(name);
-    if (name.length() == 0) {
-      name = DEFAULT_OPERATION_NAME;
-    }
-    return name;
-  }
-
-  public static CharSequence normalizeSpanType(final CharSequence spanType) {
-    if (spanType != null && spanType.length() > MAX_TYPE_LEN) {
-      log.debug(
-          "Fixing malformed trace. Type is too long (reason:type_truncate), truncating span.type to length={}",
-          MAX_TYPE_LEN);
-      return truncate(spanType, MAX_TYPE_LEN);
+    public static CharSequence normalizeSpanType(final CharSequence spanType) {
+        if (spanType != null && spanType.length() > MAX_TYPE_LEN) {
+            log.debug(
+                    "Fixing malformed trace. Type is too long (reason:type_truncate), truncating span.type to length={}",
+                    MAX_TYPE_LEN);
+            return truncate(spanType, MAX_TYPE_LEN);
+        }
+        return spanType;
     }
-    return spanType;
-  }
 
-  public static String normalizeEnv(final String env) {
-    if (env == null || env.length() == 0) {
-      return DEFAULT_ENV;
-    }
+    public static String normalizeEnv(final String env) {
+        if (env == null || env.length() == 0) {
+            return DEFAULT_ENV;
+        }
 
-    String e = truncate(env, MAX_ENV_LEN);
-    return normalizeTag(e);
-  }
+        String e = truncate(env, MAX_ENV_LEN);
+        return normalizeTag(e);
+    }
 
-  public static boolean isValidStatusCode(final int httpStatusCode) {
-    return (httpStatusCode >= 100 && httpStatusCode < 600);
-  }
+    public static boolean isValidStatusCode(final int httpStatusCode) {
+        return (httpStatusCode >= 100 && httpStatusCode < 600);
+    }
 
-  // spotless:off
+    // spotless:off
 
   /**
    * Normalizes a full tag (key:value):
@@ -99,74 +99,74 @@ public static boolean isValidStatusCode(final int httpStatusCode) {
    * See https://docs.datadoghq.com/getting_started/tagging/
    */
   // spotless:on
-  public static String normalizeTag(final String tag) {
-    return doNormalize(tag, true);
-  }
-
-  /**
-   * Normalizes a tag value according to the datadog tag conventions - Only letters, digits, ":",
-   * ".", "-", "_" and "/" are allowed. - If a non-valid char is found, it's replaced with "_". If
-   * it's the last char, it's removed. - It applies lower case.
-   *
-   * @param tagValue the tag value
-   * @return normalized tag value See https://docs.datadoghq.com/getting_started/tagging/
-   */
-  public static String normalizeTagValue(final String tagValue) {
-    return doNormalize(tagValue, false);
-  }
+    public static String normalizeTag(final String tag) {
+        return doNormalize(tag, true);
+    }
 
-  private static String doNormalize(String tag, boolean skipNumericalPrefixes) {
-    if (tag == null || tag.isEmpty()) {
-      return "";
+    /**
+     * Normalizes a tag value according to the datadog tag conventions - Only letters, digits, ":",
+     * ".", "-", "_" and "/" are allowed. - If a non-valid char is found, it's replaced with "_". If
+     * it's the last char, it's removed. - It applies lower case.
+     *
+     * @param tagValue the tag value
+     * @return normalized tag value See https://docs.datadoghq.com/getting_started/tagging/
+     */
+    public static String normalizeTagValue(final String tagValue) {
+        return doNormalize(tagValue, false);
     }
 
-    StringBuilder builder = new StringBuilder(tag.length());
-    boolean isJumping = false;
-    for (int i = 0; i < tag.length(); ++i) {
-      char ch = tag.charAt(i);
-      if (ch >= 'a' && ch <= 'z' || ch == ':') {
-        isJumping = false;
-        builder.append(ch);
-        continue;
-      }
-      if (ch >= 'A' && ch <= 'Z') {
-        isJumping = false;
-        ch += 'a' - 'A';
-        builder.append(ch);
-        continue;
-      }
-      if (Character.isUpperCase(ch)) {
-        ch = Character.toLowerCase(ch);
-      }
-      if (Character.isLetter(ch)) {
-        isJumping = false;
-        builder.append(ch);
-        continue;
-      }
-      if (builder.length() == 0) {
-        if (skipNumericalPrefixes || !Character.isDigit(ch)) {
-          // this character can't start the string, trim
-          continue;
+    private static String doNormalize(String tag, boolean skipNumericalPrefixes) {
+        if (tag == null || tag.isEmpty()) {
+            return "";
         }
-      }
-      if (Character.isDigit(ch) || ch == '.' || ch == '/' || ch == '-') {
-        isJumping = false;
-        builder.append(ch);
-        continue;
-      }
-      if (!isJumping) {
-        builder.append('_');
-        isJumping = true;
-      }
-    }
-    // If last added character was due to a bad pattern, just remove the last added underscore
-    if (isJumping) {
-      builder.setLength(builder.length() - 1);
+
+        StringBuilder builder = new StringBuilder(tag.length());
+        boolean isJumping = false;
+        for (int i = 0; i < tag.length(); ++i) {
+            char ch = tag.charAt(i);
+            if (ch >= 'a' && ch <= 'z' || ch == ':') {
+                isJumping = false;
+                builder.append(ch);
+                continue;
+            }
+            if (ch >= 'A' && ch <= 'Z') {
+                isJumping = false;
+                ch += 'a' - 'A';
+                builder.append(ch);
+                continue;
+            }
+            if (Character.isUpperCase(ch)) {
+                ch = Character.toLowerCase(ch);
+            }
+            if (Character.isLetter(ch)) {
+                isJumping = false;
+                builder.append(ch);
+                continue;
+            }
+            if (builder.length() == 0) {
+                if (skipNumericalPrefixes || !Character.isDigit(ch)) {
+                    // this character can't start the string, trim
+                    continue;
+                }
+            }
+            if (Character.isDigit(ch) || ch == '.' || ch == '/' || ch == '-') {
+                isJumping = false;
+                builder.append(ch);
+                continue;
+            }
+            if (!isJumping) {
+                builder.append('_');
+                isJumping = true;
+            }
+        }
+        // If last added character was due to a bad pattern, just remove the last added underscore
+        if (isJumping) {
+            builder.setLength(builder.length() - 1);
+        }
+        return builder.toString();
     }
-    return builder.toString();
-  }
 
-  // spotless:off
+    // spotless:off
 
   /**
    * Normalizes the span name:
@@ -179,57 +179,57 @@ private static String doNormalize(String tag, boolean skipNumericalPrefixes) {
    * @return normalized span name
    */
   // spotless:on
-  private static CharSequence normalizeSpanName(final CharSequence name) {
-    if (name.length() == 0) {
-      return name;
-    }
+    private static CharSequence normalizeSpanName(final CharSequence name) {
+        if (name.length() == 0) {
+            return name;
+        }
 
-    final StringBuilder builder = new StringBuilder(name.length());
+        final StringBuilder builder = new StringBuilder(name.length());
 
-    int i = 0;
-    char previousCh = 0;
-    // skip non-alphabetic characters
-    for (i = 0; i < name.length() && !isAlpha(name.charAt(i)); i++) {}
+        int i = 0;
+        char previousCh = 0;
+        // skip non-alphabetic characters
+        for (i = 0; i < name.length() && !isAlpha(name.charAt(i)); i++) {}
 
-    // if there were no alphabetic characters it wasn't valid
-    if (i == name.length()) {
-      return "";
-    }
+        // if there were no alphabetic characters it wasn't valid
+        if (i == name.length()) {
+            return "";
+        }
 
-    for (; i < name.length(); i++) {
-      char ch = name.charAt(i);
+        for (; i < name.length(); i++) {
+            char ch = name.charAt(i);
+
+            if (isAlphaNum(ch)) {
+                builder.append(ch);
+                previousCh = ch;
+            } else if (ch == '.') {
+                if (previousCh == '_') {
+                    // overwrite underscores that happen before periods
+                    builder.setLength(builder.length() - 1);
+                }
+                builder.append(ch);
+                previousCh = ch;
+            } else {
+                if (previousCh != '.' && previousCh != '_') {
+                    builder.append('_');
+                    previousCh = '_';
+                }
+            }
+        }
 
-      if (isAlphaNum(ch)) {
-        builder.append(ch);
-        previousCh = ch;
-      } else if (ch == '.') {
         if (previousCh == '_') {
-          // overwrite underscores that happen before periods
-          builder.setLength(builder.length() - 1);
+            builder.setLength(builder.length() - 1);
         }
-        builder.append(ch);
-        previousCh = ch;
-      } else {
-        if (previousCh != '.' && previousCh != '_') {
-          builder.append('_');
-          previousCh = '_';
-        }
-      }
+        return builder.toString();
+    }
+
+    // fast isAlpha for ascii
+    private static boolean isAlpha(char ch) {
+        return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z');
     }
 
-    if (previousCh == '_') {
-      builder.setLength(builder.length() - 1);
+    // fast isAlphaNumeric for ascii
+    private static boolean isAlphaNum(char ch) {
+        return isAlpha(ch) || (ch >= '0' && ch <= '9');
     }
-    return builder.toString();
-  }
-
-  // fast isAlpha for ascii
-  private static boolean isAlpha(char ch) {
-    return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z');
-  }
-
-  // fast isAlphaNumeric for ascii
-  private static boolean isAlphaNum(char ch) {
-    return isAlpha(ch) || (ch >= '0' && ch <= '9');
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/UnsafeUtils.java b/internal-api/src/main/java/datadog/trace/util/UnsafeUtils.java
index fc9fdabccd8..d377f3699a9 100644
--- a/internal-api/src/main/java/datadog/trace/util/UnsafeUtils.java
+++ b/internal-api/src/main/java/datadog/trace/util/UnsafeUtils.java
@@ -10,68 +10,68 @@
 
 public abstract class UnsafeUtils {
 
-  private static final Logger log = LoggerFactory.getLogger(UnsafeUtils.class);
+    private static final Logger log = LoggerFactory.getLogger(UnsafeUtils.class);
 
-  private static final Unsafe UNSAFE = getUnsafe();
+    private static final Unsafe UNSAFE = getUnsafe();
 
-  private static Unsafe getUnsafe() {
-    try {
-      Field f = Unsafe.class.getDeclaredField("theUnsafe");
-      f.setAccessible(true);
-      return (Unsafe) f.get(null);
+    private static Unsafe getUnsafe() {
+        try {
+            Field f = Unsafe.class.getDeclaredField("theUnsafe");
+            f.setAccessible(true);
+            return (Unsafe) f.get(null);
 
-    } catch (Throwable t) {
-      log.debug("Unsafe is unavailable", t);
-      return null;
+        } catch (Throwable t) {
+            log.debug("Unsafe is unavailable", t);
+            return null;
+        }
     }
-  }
 
-  /**
-   * Tries to create a shallow clone of the provided object: another instance of the same class
-   * whose fields have the same values as the original (for reference fields that means referring to
-   * the same objects).
-   *
-   * <p>If cloning fails, the original instance is returned.
-   *
-   * @param original Original object
-   * @return A shallow clone
-   * @param <T> Type of the object being cloned
-   */
-  @SuppressFBWarnings(
-      value = "UNS_UNSAFE_CALL",
-      justification = "Intentional sun.misc.Unsafe wrapper for shallow cloning")
-  @SuppressWarnings("unchecked")
-  public static <T> T tryShallowClone(T original) {
-    if (UNSAFE == null) {
-      log.debug("Unsafe is unavailable, {} will not be cloned", original);
-      return original;
-    }
-    try {
-      Class<?> clazz = original.getClass();
-      T clone = (T) UNSAFE.allocateInstance(clazz);
+    /**
+     * Tries to create a shallow clone of the provided object: another instance of the same class
+     * whose fields have the same values as the original (for reference fields that means referring to
+     * the same objects).
+     *
+     * <p>If cloning fails, the original instance is returned.
+     *
+     * @param original Original object
+     * @return A shallow clone
+     * @param <T> Type of the object being cloned
+     */
+    @SuppressFBWarnings(
+            value = "UNS_UNSAFE_CALL",
+            justification = "Intentional sun.misc.Unsafe wrapper for shallow cloning")
+    @SuppressWarnings("unchecked")
+    public static <T> T tryShallowClone(T original) {
+        if (UNSAFE == null) {
+            log.debug("Unsafe is unavailable, {} will not be cloned", original);
+            return original;
+        }
+        try {
+            Class<?> clazz = original.getClass();
+            T clone = (T) UNSAFE.allocateInstance(clazz);
 
-      while (clazz != Object.class) {
-        cloneFields(clazz, original, clone);
-        clazz = clazz.getSuperclass();
-      }
-      return clone;
+            while (clazz != Object.class) {
+                cloneFields(clazz, original, clone);
+                clazz = clazz.getSuperclass();
+            }
+            return clone;
 
-    } catch (Throwable t) {
-      log.debug("Error while cloning {}: {}", original, t);
-      return original;
+        } catch (Throwable t) {
+            log.debug("Error while cloning {}: {}", original, t);
+            return original;
+        }
     }
-  }
 
-  // TODO: JEP 500 - avoid mutating final fields
-  @SuppressForbidden
-  private static void cloneFields(Class<?> clazz, Object original, Object clone) throws Exception {
-    for (Field field : clazz.getDeclaredFields()) {
-      if ((field.getModifiers() & Modifier.STATIC) != 0) {
-        continue;
-      }
-      field.setAccessible(true);
-      Object fieldValue = field.get(original);
-      field.set(clone, fieldValue);
+    // TODO: JEP 500 - avoid mutating final fields
+    @SuppressForbidden
+    private static void cloneFields(Class<?> clazz, Object original, Object clone) throws Exception {
+        for (Field field : clazz.getDeclaredFields()) {
+            if ((field.getModifiers() & Modifier.STATIC) != 0) {
+                continue;
+            }
+            field.setAccessible(true);
+            Object fieldValue = field.get(original);
+            field.set(clone, fieldValue);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/json/JsonPath.java b/internal-api/src/main/java/datadog/trace/util/json/JsonPath.java
index 1c1c7221def..d77ccf6ce6e 100644
--- a/internal-api/src/main/java/datadog/trace/util/json/JsonPath.java
+++ b/internal-api/src/main/java/datadog/trace/util/json/JsonPath.java
@@ -6,170 +6,168 @@
 
 public final class JsonPath {
 
-  public static class Builder {
-    private final List<Segment> segments;
+    public static class Builder {
+        private final List<Segment> segments;
 
-    public Builder() {
-      super();
-      segments = new ArrayList<>();
-      segments.add(Segment.Singleton.ROOT);
-    }
+        public Builder() {
+            super();
+            segments = new ArrayList<>();
+            segments.add(Segment.Singleton.ROOT);
+        }
 
-    public static Builder start() {
-      return new Builder();
-    }
+        public static Builder start() {
+            return new Builder();
+        }
 
-    public Builder name(String name) {
-      segments.add(new Segment.Name(name));
-      return this;
-    }
+        public Builder name(String name) {
+            segments.add(new Segment.Name(name));
+            return this;
+        }
 
-    public Builder index(int index) {
-      segments.add(new Segment.Index(index));
-      return this;
-    }
+        public Builder index(int index) {
+            segments.add(new Segment.Index(index));
+            return this;
+        }
 
-    public Builder anyDesc() {
-      segments.add(Segment.Singleton.DESCENDANT);
-      return this;
-    }
+        public Builder anyDesc() {
+            segments.add(Segment.Singleton.DESCENDANT);
+            return this;
+        }
 
-    public Builder anyChild() {
-      segments.add(Segment.Singleton.WILDCARD);
-      return this;
-    }
+        public Builder anyChild() {
+            segments.add(Segment.Singleton.WILDCARD);
+            return this;
+        }
 
-    public JsonPath build() {
-      return new JsonPath(segments);
+        public JsonPath build() {
+            return new JsonPath(segments);
+        }
     }
-  }
-
-  private final Segment[] segments;
-
-  private JsonPath(Collection<Segment> segments) {
-    this.segments = segments.toArray(new Segment[0]);
-  }
-
-  public boolean matches(PathCursor pathCursor) {
-    int i = segments.length - 1;
-    int j = pathCursor.length();
-    while (i >= 0 && j >= 0 && segments[i].matches(jsonPathSegment(pathCursor, j))) {
-      i--;
-      j--;
-      if (segments[i + 1] == Segment.Singleton.DESCENDANT) {
-        int prevSearchSegmentPos = findPrevDescendantSegment(this, i);
-        int blockSize = i - prevSearchSegmentPos;
-        int offset2 = j - blockSize + 2;
-        while (offset2 > 0
-            && !matchPathBlock(this, prevSearchSegmentPos + 1, pathCursor, offset2, blockSize)) {
-          offset2--;
-        }
-        i = prevSearchSegmentPos;
-        j = offset2 - 1;
-      }
+
+    private final Segment[] segments;
+
+    private JsonPath(Collection<Segment> segments) {
+        this.segments = segments.toArray(new Segment[0]);
+    }
+
+    public boolean matches(PathCursor pathCursor) {
+        int i = segments.length - 1;
+        int j = pathCursor.length();
+        while (i >= 0 && j >= 0 && segments[i].matches(jsonPathSegment(pathCursor, j))) {
+            i--;
+            j--;
+            if (segments[i + 1] == Segment.Singleton.DESCENDANT) {
+                int prevSearchSegmentPos = findPrevDescendantSegment(this, i);
+                int blockSize = i - prevSearchSegmentPos;
+                int offset2 = j - blockSize + 2;
+                while (offset2 > 0 && !matchPathBlock(this, prevSearchSegmentPos + 1, pathCursor, offset2, blockSize)) {
+                    offset2--;
+                }
+                i = prevSearchSegmentPos;
+                j = offset2 - 1;
+            }
+        }
+        return j < 0 && i < 0;
     }
-    return j < 0 && i < 0;
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    for (Segment segment : segments) {
-      sb.append(segment);
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        for (Segment segment : segments) {
+            sb.append(segment);
+        }
+        return sb.toString();
     }
-    return sb.toString();
-  }
-
-  private boolean matchPathBlock(
-      JsonPath pattern, int offset1, PathCursor pathCursor, int offset2, int blockSize) {
-    for (int i = 0; i < blockSize; i++) {
-      if (!pattern.segments[offset1 + i].matches(jsonPathSegment(pathCursor, offset2 + i))) {
-        return false;
-      }
+
+    private boolean matchPathBlock(JsonPath pattern, int offset1, PathCursor pathCursor, int offset2, int blockSize) {
+        for (int i = 0; i < blockSize; i++) {
+            if (!pattern.segments[offset1 + i].matches(jsonPathSegment(pathCursor, offset2 + i))) {
+                return false;
+            }
+        }
+        return true;
     }
-    return true;
-  }
 
-  private Object jsonPathSegment(PathCursor pathCursor, int index) {
-    if (index == 0) {
-      return null;
+    private Object jsonPathSegment(PathCursor pathCursor, int index) {
+        if (index == 0) {
+            return null;
+        }
+        return pathCursor.get(index - 1);
     }
-    return pathCursor.get(index - 1);
-  }
 
-  private int findPrevDescendantSegment(JsonPath pattern, int from) {
-    int i = from - 1;
-    while (i > 0) {
-      if (pattern.segments[i] == Segment.Singleton.DESCENDANT) {
+    private int findPrevDescendantSegment(JsonPath pattern, int from) {
+        int i = from - 1;
+        while (i > 0) {
+            if (pattern.segments[i] == Segment.Singleton.DESCENDANT) {
+                return i;
+            }
+            i--;
+        }
         return i;
-      }
-      i--;
     }
-    return i;
-  }
 
-  private abstract static class Segment {
+    private abstract static class Segment {
 
-    protected boolean matches(Object value) {
-      return this == Singleton.WILDCARD
-          || this == Singleton.DESCENDANT
-          || this == Singleton.ROOT && value == null;
-    }
+        protected boolean matches(Object value) {
+            return this == Singleton.WILDCARD
+                    || this == Singleton.DESCENDANT
+                    || this == Singleton.ROOT && value == null;
+        }
 
-    private static final class Singleton extends Segment {
-      private static final Segment ROOT = new Singleton("$");
-      private static final Segment WILDCARD = new Singleton("[*]");
-      private static final Segment DESCENDANT = new Singleton("..");
+        private static final class Singleton extends Segment {
+            private static final Segment ROOT = new Singleton("$");
+            private static final Segment WILDCARD = new Singleton("[*]");
+            private static final Segment DESCENDANT = new Singleton("..");
 
-      private final String repr;
+            private final String repr;
 
-      private Singleton(String repr) {
-        super();
-        this.repr = repr;
-      }
+            private Singleton(String repr) {
+                super();
+                this.repr = repr;
+            }
 
-      @Override
-      public String toString() {
-        return repr;
-      }
-    }
+            @Override
+            public String toString() {
+                return repr;
+            }
+        }
 
-    private static final class Name extends Segment {
-      private final String name;
+        private static final class Name extends Segment {
+            private final String name;
 
-      public Name(String name) {
-        super();
-        this.name = name;
-      }
+            public Name(String name) {
+                super();
+                this.name = name;
+            }
 
-      @Override
-      protected boolean matches(Object value) {
-        return value instanceof String && value.equals(name);
-      }
+            @Override
+            protected boolean matches(Object value) {
+                return value instanceof String && value.equals(name);
+            }
 
-      @Override
-      public String toString() {
-        return "['" + name + "']";
-      }
-    }
+            @Override
+            public String toString() {
+                return "['" + name + "']";
+            }
+        }
 
-    private static final class Index extends Segment {
-      private final int index;
+        private static final class Index extends Segment {
+            private final int index;
 
-      public Index(int index) {
-        super();
-        this.index = index;
-      }
+            public Index(int index) {
+                super();
+                this.index = index;
+            }
 
-      @Override
-      protected boolean matches(Object value) {
-        return value instanceof Integer && ((Integer) value) == index;
-      }
+            @Override
+            protected boolean matches(Object value) {
+                return value instanceof Integer && ((Integer) value) == index;
+            }
 
-      @Override
-      public String toString() {
-        return "[" + index + "]";
-      }
+            @Override
+            public String toString() {
+                return "[" + index + "]";
+            }
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/json/JsonPathParser.java b/internal-api/src/main/java/datadog/trace/util/json/JsonPathParser.java
index 4bb2218da49..0651392b42c 100644
--- a/internal-api/src/main/java/datadog/trace/util/json/JsonPathParser.java
+++ b/internal-api/src/main/java/datadog/trace/util/json/JsonPathParser.java
@@ -10,327 +10,323 @@
 
 public class JsonPathParser {
 
-  public static final class ParseError extends Exception {
-    public final int position;
-    public final String error;
-
-    public ParseError(CharSequence path, int position, String error) {
-      super("Failed to parse JsonPath \"" + path + "\" at " + position + ". " + error);
-      this.position = position;
-      this.error = error;
-    }
-  }
-
-  private static final char OPEN_BRACKET = '[';
-  private static final char CLOSE_BRACKET = ']';
-  private static final char OPEN_BRACE = '(';
-  private static final char ASTERISK = '*';
-  private static final char PERIOD = '.';
-  private static final char SPACE = ' ';
-  private static final char COMMA = ',';
-  private static final char SINGLE_QUOTE = '\'';
-  private static final char DOUBLE_QUOTE = '"';
-  private static final char ESC = '\\';
-
-  private static final Logger log = LoggerFactory.getLogger(JsonPathParser.class);
-
-  public static List<JsonPath> parseJsonPaths(List<String> rules) {
-    if (null == rules || rules.isEmpty()) {
-      return Collections.emptyList();
-    }
-    List<JsonPath> result = new ArrayList<>(rules.size());
-    for (String rule : rules) {
-      try {
-        JsonPath jp = parse(rule);
-        result.add(jp);
-      } catch (Exception ex) {
-        log.warn("Failed to parse redaction rule '{}'. {}. Skipping rule.", rule, ex.getMessage());
-      }
+    public static final class ParseError extends Exception {
+        public final int position;
+        public final String error;
+
+        public ParseError(CharSequence path, int position, String error) {
+            super("Failed to parse JsonPath \"" + path + "\" at " + position + ". " + error);
+            this.position = position;
+            this.error = error;
+        }
     }
-    return result;
-  }
 
-  public static JsonPath parse(String path) throws ParseError {
-    Cursor cur = new Cursor(path);
+    private static final char OPEN_BRACKET = '[';
+    private static final char CLOSE_BRACKET = ']';
+    private static final char OPEN_BRACE = '(';
+    private static final char ASTERISK = '*';
+    private static final char PERIOD = '.';
+    private static final char SPACE = ' ';
+    private static final char COMMA = ',';
+    private static final char SINGLE_QUOTE = '\'';
+    private static final char DOUBLE_QUOTE = '"';
+    private static final char ESC = '\\';
 
-    if (!(path.startsWith("$.") || path.startsWith("$["))) {
-      cur.fail("JsonPath must start with '$.' or '$['");
+    private static final Logger log = LoggerFactory.getLogger(JsonPathParser.class);
+
+    public static List<JsonPath> parseJsonPaths(List<String> rules) {
+        if (null == rules || rules.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<JsonPath> result = new ArrayList<>(rules.size());
+        for (String rule : rules) {
+            try {
+                JsonPath jp = parse(rule);
+                result.add(jp);
+            } catch (Exception ex) {
+                log.warn("Failed to parse redaction rule '{}'. {}. Skipping rule.", rule, ex.getMessage());
+            }
+        }
+        return result;
     }
 
-    JsonPath.Builder builder = JsonPath.Builder.start();
-    cur.incPos(1);
-
-    while (cur.isWithinLimits()) {
-      if (cur.is(OPEN_BRACKET)) {
-        boolean ok =
-            tryToParsePropertyInBrackets(cur, builder)
-                || tryToParseIndex(cur, builder)
-                || tryToParseWildcard(cur, builder);
-        if (!ok) {
-          cur.fail("Expecting in brackets a property, an array index, or a wildcard.");
-        }
-      } else if (cur.is(PERIOD)) {
-        if (cur.nextIs(PERIOD)) {
-          builder.anyDesc();
-          cur.incPos(1);
-        } else if (cur.nextIs(OPEN_BRACKET)) {
-          cur.fail("'" + PERIOD + "' can't go before '" + OPEN_BRACKET + "'");
-        }
-        if (!cur.hasMoreCharacters()) {
-          cur.fail("Path must not end with a '" + PERIOD + "'");
-        } else {
-          cur.incPos(1);
-        }
-        if (cur.is(PERIOD)) {
-          cur.fail("More than two '" + PERIOD + "' in a row");
-        }
-      } else if (cur.is(ASTERISK)) {
-        if (cur.nextIs(ASTERISK)) {
-          cur.fail("More than one '" + ASTERISK + "' in a row");
+    public static JsonPath parse(String path) throws ParseError {
+        Cursor cur = new Cursor(path);
+
+        if (!(path.startsWith("$.") || path.startsWith("$["))) {
+            cur.fail("JsonPath must start with '$.' or '$['");
         }
+
+        JsonPath.Builder builder = JsonPath.Builder.start();
         cur.incPos(1);
-        builder.anyChild();
-      } else {
-        parseKey(cur, builder);
-      }
-    }
-    return builder.build();
-  }
-
-  private static void parseKey(Cursor cur, JsonPath.Builder builder) throws ParseError {
-    int start = cur.position();
-    int i = start;
-    int end = 0;
-
-    while (cur.isWithinLimits(i)) {
-      char c = cur.charAt(i);
-      if (c == SPACE) {
-        cur.failAt(i, "No spaces allowed in property names.");
-      } else if (c == PERIOD || c == OPEN_BRACKET) {
-        end = i;
-        break;
-      } else if (c == OPEN_BRACE) {
-        cur.failAt(i, "Expressions are not supported.");
-      }
-      i++;
-    }
-    if (end == 0) {
-      end = cur.len();
-    }
 
-    cur.setPos(end);
+        while (cur.isWithinLimits()) {
+            if (cur.is(OPEN_BRACKET)) {
+                boolean ok = tryToParsePropertyInBrackets(cur, builder)
+                        || tryToParseIndex(cur, builder)
+                        || tryToParseWildcard(cur, builder);
+                if (!ok) {
+                    cur.fail("Expecting in brackets a property, an array index, or a wildcard.");
+                }
+            } else if (cur.is(PERIOD)) {
+                if (cur.nextIs(PERIOD)) {
+                    builder.anyDesc();
+                    cur.incPos(1);
+                } else if (cur.nextIs(OPEN_BRACKET)) {
+                    cur.fail("'" + PERIOD + "' can't go before '" + OPEN_BRACKET + "'");
+                }
+                if (!cur.hasMoreCharacters()) {
+                    cur.fail("Path must not end with a '" + PERIOD + "'");
+                } else {
+                    cur.incPos(1);
+                }
+                if (cur.is(PERIOD)) {
+                    cur.fail("More than two '" + PERIOD + "' in a row");
+                }
+            } else if (cur.is(ASTERISK)) {
+                if (cur.nextIs(ASTERISK)) {
+                    cur.fail("More than one '" + ASTERISK + "' in a row");
+                }
+                cur.incPos(1);
+                builder.anyChild();
+            } else {
+                parseKey(cur, builder);
+            }
+        }
+        return builder.build();
+    }
+
+    private static void parseKey(Cursor cur, JsonPath.Builder builder) throws ParseError {
+        int start = cur.position();
+        int i = start;
+        int end = 0;
+
+        while (cur.isWithinLimits(i)) {
+            char c = cur.charAt(i);
+            if (c == SPACE) {
+                cur.failAt(i, "No spaces allowed in property names.");
+            } else if (c == PERIOD || c == OPEN_BRACKET) {
+                end = i;
+                break;
+            } else if (c == OPEN_BRACE) {
+                cur.failAt(i, "Expressions are not supported.");
+            }
+            i++;
+        }
+        if (end == 0) {
+            end = cur.len();
+        }
 
-    String property = cur.subSequence(start, end).toString();
-    builder.name(property);
-  }
+        cur.setPos(end);
 
-  private static boolean tryToParseWildcard(Cursor cur, JsonPath.Builder builder)
-      throws ParseError {
-    if (!cur.nextIsIgnoreSpaces(cur.pos, ASTERISK)) {
-      return false;
+        String property = cur.subSequence(start, end).toString();
+        builder.name(property);
     }
-    int asteriskPos = cur.findCharSkipSpaces(cur.pos, ASTERISK);
-    if (!cur.nextIsIgnoreSpaces(asteriskPos, CLOSE_BRACKET)) {
-      int offset = asteriskPos + 1;
-      cur.failAt(offset, "Expected '" + CLOSE_BRACKET + "'");
-    }
-    int closedAt = cur.findCharSkipSpaces(asteriskPos, CLOSE_BRACKET);
-    cur.setPos(closedAt + 1);
-    builder.anyChild();
-    return true;
-  }
-
-  private static boolean tryToParseIndex(Cursor cur, JsonPath.Builder builder) throws ParseError {
-    int start = cur.position() + 1;
-    int end = cur.indexOf(start, CLOSE_BRACKET);
-
-    if (end < 0) {
-      return false;
+
+    private static boolean tryToParseWildcard(Cursor cur, JsonPath.Builder builder) throws ParseError {
+        if (!cur.nextIsIgnoreSpaces(cur.pos, ASTERISK)) {
+            return false;
+        }
+        int asteriskPos = cur.findCharSkipSpaces(cur.pos, ASTERISK);
+        if (!cur.nextIsIgnoreSpaces(asteriskPos, CLOSE_BRACKET)) {
+            int offset = asteriskPos + 1;
+            cur.failAt(offset, "Expected '" + CLOSE_BRACKET + "'");
+        }
+        int closedAt = cur.findCharSkipSpaces(asteriskPos, CLOSE_BRACKET);
+        cur.setPos(closedAt + 1);
+        builder.anyChild();
+        return true;
     }
 
-    String expr = cur.subSequence(start, end).toString().trim();
+    private static boolean tryToParseIndex(Cursor cur, JsonPath.Builder builder) throws ParseError {
+        int start = cur.position() + 1;
+        int end = cur.indexOf(start, CLOSE_BRACKET);
 
-    for (int i = 0; i < expr.length(); i++) {
-      char c = expr.charAt(i);
-      if (!isDigit(c)) {
-        return false;
-      }
-    }
+        if (end < 0) {
+            return false;
+        }
 
-    try {
-      int index = Integer.parseInt(expr);
-      builder.index(index);
-    } catch (NumberFormatException ex) {
-      cur.fail("Invalid array index. Must be an integer.");
-    }
+        String expr = cur.subSequence(start, end).toString().trim();
 
-    cur.setPos(end + 1);
+        for (int i = 0; i < expr.length(); i++) {
+            char c = expr.charAt(i);
+            if (!isDigit(c)) {
+                return false;
+            }
+        }
 
-    return true;
-  }
+        try {
+            int index = Integer.parseInt(expr);
+            builder.index(index);
+        } catch (NumberFormatException ex) {
+            cur.fail("Invalid array index. Must be an integer.");
+        }
 
-  private static boolean tryToParsePropertyInBrackets(Cursor cur, JsonPath.Builder builder)
-      throws ParseError {
-    char quote = cur.findNonSpace();
-    if (quote != SINGLE_QUOTE && quote != DOUBLE_QUOTE) {
-      return false;
-    }
+        cur.setPos(end + 1);
 
-    String property = null;
-
-    int startPosition = cur.position() + 1;
-    int readPosition = startPosition;
-    int endPosition = 0;
-    boolean inProperty = false;
-
-    while (cur.isWithinLimits(readPosition)) {
-      char c = cur.charAt(readPosition);
-
-      if (ESC == c) {
-        cur.failAt(readPosition, "Escape character is not supported in property name.");
-      } else if (c == COMMA) {
-        String message =
-            inProperty
-                ? "Comma is not allowed in property name."
-                : "Multiple properties are not supported.";
-        cur.failAt(readPosition, message);
-      } else if (c == CLOSE_BRACKET && !inProperty) {
-        break;
-      } else if (c == quote) {
-        if (inProperty) {
-          endPosition = readPosition;
-          property = cur.subSequence(startPosition, endPosition).toString();
-          inProperty = false;
-        } else {
-          startPosition = readPosition + 1;
-          inProperty = true;
-        }
-      }
-      readPosition++;
+        return true;
     }
 
-    if (inProperty) {
-      cur.fail("Property has not been closed - missing closing " + quote);
-    }
+    private static boolean tryToParsePropertyInBrackets(Cursor cur, JsonPath.Builder builder) throws ParseError {
+        char quote = cur.findNonSpace();
+        if (quote != SINGLE_QUOTE && quote != DOUBLE_QUOTE) {
+            return false;
+        }
 
-    int endBracketIndex = cur.findCharSkipSpaces(endPosition, CLOSE_BRACKET);
-    if (endBracketIndex < 0) {
-      cur.fail("Property has not been closed - missing closing '" + CLOSE_BRACKET + "'");
-    }
-    endBracketIndex++;
+        String property = null;
+
+        int startPosition = cur.position() + 1;
+        int readPosition = startPosition;
+        int endPosition = 0;
+        boolean inProperty = false;
+
+        while (cur.isWithinLimits(readPosition)) {
+            char c = cur.charAt(readPosition);
+
+            if (ESC == c) {
+                cur.failAt(readPosition, "Escape character is not supported in property name.");
+            } else if (c == COMMA) {
+                String message = inProperty
+                        ? "Comma is not allowed in property name."
+                        : "Multiple properties are not supported.";
+                cur.failAt(readPosition, message);
+            } else if (c == CLOSE_BRACKET && !inProperty) {
+                break;
+            } else if (c == quote) {
+                if (inProperty) {
+                    endPosition = readPosition;
+                    property = cur.subSequence(startPosition, endPosition).toString();
+                    inProperty = false;
+                } else {
+                    startPosition = readPosition + 1;
+                    inProperty = true;
+                }
+            }
+            readPosition++;
+        }
 
-    cur.setPos(endBracketIndex);
+        if (inProperty) {
+            cur.fail("Property has not been closed - missing closing " + quote);
+        }
 
-    builder.name(property);
-    return true;
-  }
+        int endBracketIndex = cur.findCharSkipSpaces(endPosition, CLOSE_BRACKET);
+        if (endBracketIndex < 0) {
+            cur.fail("Property has not been closed - missing closing '" + CLOSE_BRACKET + "'");
+        }
+        endBracketIndex++;
 
-  private static class Cursor {
-    private final CharSequence data;
-    private int pos;
-    private final int endPos;
+        cur.setPos(endBracketIndex);
 
-    public Cursor(CharSequence data) {
-      this.data = data;
-      this.pos = 0;
-      this.endPos = data.length() - 1;
+        builder.name(property);
+        return true;
     }
 
-    public int len() {
-      return endPos + 1;
-    }
+    private static class Cursor {
+        private final CharSequence data;
+        private int pos;
+        private final int endPos;
 
-    public char charAt(int idx) {
-      return data.charAt(idx);
-    }
+        public Cursor(CharSequence data) {
+            this.data = data;
+            this.pos = 0;
+            this.endPos = data.length() - 1;
+        }
 
-    public boolean is(char c) {
-      return data.charAt(pos) == c;
-    }
+        public int len() {
+            return endPos + 1;
+        }
 
-    public boolean nextIs(char c) {
-      return isWithinLimits(pos + 1) && (data.charAt(pos + 1) == c);
-    }
+        public char charAt(int idx) {
+            return data.charAt(idx);
+        }
 
-    public void incPos(int count) {
-      pos += count;
-    }
+        public boolean is(char c) {
+            return data.charAt(pos) == c;
+        }
 
-    public void setPos(int newPos) {
-      pos = newPos;
-    }
+        public boolean nextIs(char c) {
+            return isWithinLimits(pos + 1) && (data.charAt(pos + 1) == c);
+        }
 
-    public int position() {
-      return pos;
-    }
+        public void incPos(int count) {
+            pos += count;
+        }
 
-    public int findCharSkipSpaces(int startAt, char c) {
-      int p = startAt == endPos ? startAt : skipSpaces(startAt + 1);
-      if (charAt(p) == c) {
-        return p;
-      } else {
-        return -1;
-      }
-    }
+        public void setPos(int newPos) {
+            pos = newPos;
+        }
 
-    private int skipSpaces(int p) {
-      while (isWithinLimits(p + 1) && charAt(p) == SPACE) {
-        p++;
-      }
-      return p;
-    }
+        public int position() {
+            return pos;
+        }
 
-    public int indexOf(int start, char c) {
-      int p = start;
-      while (isWithinLimits(p)) {
-        if (charAt(p) == c) {
-          return p;
+        public int findCharSkipSpaces(int startAt, char c) {
+            int p = startAt == endPos ? startAt : skipSpaces(startAt + 1);
+            if (charAt(p) == c) {
+                return p;
+            } else {
+                return -1;
+            }
         }
-        p++;
-      }
-      return -1;
-    }
 
-    public boolean nextIsIgnoreSpaces(int start, char c) {
-      int p = skipSpaces(start + 1);
-      return isWithinLimits(p) && charAt(p) == c;
-    }
+        private int skipSpaces(int p) {
+            while (isWithinLimits(p + 1) && charAt(p) == SPACE) {
+                p++;
+            }
+            return p;
+        }
 
-    public char findNonSpace() {
-      return findNonSpace(pos);
-    }
+        public int indexOf(int start, char c) {
+            int p = start;
+            while (isWithinLimits(p)) {
+                if (charAt(p) == c) {
+                    return p;
+                }
+                p++;
+            }
+            return -1;
+        }
 
-    public char findNonSpace(int start) {
-      int p = skipSpaces(start + 1);
-      if (isWithinLimits(p)) {
-        return charAt(p);
-      } else {
-        return SPACE;
-      }
-    }
+        public boolean nextIsIgnoreSpaces(int start, char c) {
+            int p = skipSpaces(start + 1);
+            return isWithinLimits(p) && charAt(p) == c;
+        }
 
-    private boolean isWithinLimits() {
-      return pos <= endPos;
-    }
+        public char findNonSpace() {
+            return findNonSpace(pos);
+        }
 
-    public boolean hasMoreCharacters() {
-      return isWithinLimits(pos + 1);
-    }
+        public char findNonSpace(int start) {
+            int p = skipSpaces(start + 1);
+            if (isWithinLimits(p)) {
+                return charAt(p);
+            } else {
+                return SPACE;
+            }
+        }
 
-    public boolean isWithinLimits(int p) {
-      return p >= 0 && p <= endPos;
-    }
+        private boolean isWithinLimits() {
+            return pos <= endPos;
+        }
 
-    public CharSequence subSequence(int start, int end) {
-      return data.subSequence(start, end);
-    }
+        public boolean hasMoreCharacters() {
+            return isWithinLimits(pos + 1);
+        }
 
-    private void fail(String message) throws ParseError {
-      failAt(this.pos, message);
-    }
+        public boolean isWithinLimits(int p) {
+            return p >= 0 && p <= endPos;
+        }
 
-    private void failAt(int position, String message) throws ParseError {
-      throw new ParseError(this.data, position, message);
+        public CharSequence subSequence(int start, int end) {
+            return data.subSequence(start, end);
+        }
+
+        private void fail(String message) throws ParseError {
+            failAt(this.pos, message);
+        }
+
+        private void failAt(int position, String message) throws ParseError {
+            throw new ParseError(this.data, position, message);
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/json/PathCursor.java b/internal-api/src/main/java/datadog/trace/util/json/PathCursor.java
index 5048c724e01..a33102b32b1 100644
--- a/internal-api/src/main/java/datadog/trace/util/json/PathCursor.java
+++ b/internal-api/src/main/java/datadog/trace/util/json/PathCursor.java
@@ -4,82 +4,82 @@
 
 /** Represents a mutable path in a hierarchical structure such as JSON. */
 public class PathCursor {
-  private final Object[] path;
-  private int length;
+    private final Object[] path;
+    private int length;
 
-  public PathCursor(int capacity) {
-    super();
-    path = new Object[capacity];
-    length = 0;
-  }
+    public PathCursor(int capacity) {
+        super();
+        path = new Object[capacity];
+        length = 0;
+    }
 
-  public PathCursor(Object[] path, int capacity) {
-    super();
-    assert path.length <= capacity;
-    this.path = new Object[capacity];
-    System.arraycopy(path, 0, this.path, 0, path.length);
-    length = path.length;
-  }
+    public PathCursor(Object[] path, int capacity) {
+        super();
+        assert path.length <= capacity;
+        this.path = new Object[capacity];
+        System.arraycopy(path, 0, this.path, 0, path.length);
+        length = path.length;
+    }
 
-  private PathCursor(PathCursor that) {
-    super();
-    path = Arrays.copyOf(that.path, that.path.length);
-    length = that.length;
-  }
+    private PathCursor(PathCursor that) {
+        super();
+        path = Arrays.copyOf(that.path, that.path.length);
+        length = that.length;
+    }
 
-  public PathCursor push(String name) {
-    assert length < path.length;
-    path[length] = name;
-    length += 1;
-    return this;
-  }
+    public PathCursor push(String name) {
+        assert length < path.length;
+        path[length] = name;
+        length += 1;
+        return this;
+    }
 
-  public PathCursor push(int index) {
-    assert length < path.length;
-    path[length] = index;
-    length += 1;
-    return this;
-  }
+    public PathCursor push(int index) {
+        assert length < path.length;
+        path[length] = index;
+        length += 1;
+        return this;
+    }
 
-  public void pop() {
-    if (length > 0) {
-      length -= 1;
+    public void pop() {
+        if (length > 0) {
+            length -= 1;
+        }
     }
-  }
 
-  public void advance() {
-    if (length > 0) {
-      Object last = path[length - 1];
-      if (last instanceof Integer) {
-        path[length - 1] = (int) last + 1;
-      } else {
-        length -= 1;
-      }
+    public void advance() {
+        if (length > 0) {
+            Object last = path[length - 1];
+            if (last instanceof Integer) {
+                path[length - 1] = (int) last + 1;
+            } else {
+                length -= 1;
+            }
+        }
     }
-  }
 
-  public PathCursor copy() {
-    return new PathCursor(this);
-  }
+    public PathCursor copy() {
+        return new PathCursor(this);
+    }
 
-  public int length() {
-    return length;
-  }
+    public int length() {
+        return length;
+    }
 
-  Object get(int i) {
-    return path[i];
-  }
+    Object get(int i) {
+        return path[i];
+    }
 
-  public String toString(String prefix) {
-    StringBuilder sb = new StringBuilder(prefix);
-    for (int i = 0; i < length; i++) {
-      sb.append('.');
-      sb.append(String.valueOf(path[i]).replace(".", "\\."));
+    public String toString(String prefix) {
+        StringBuilder sb = new StringBuilder(prefix);
+        for (int i = 0; i < length; i++) {
+            sb.append('.');
+            sb.append(String.valueOf(path[i]).replace(".", "\\."));
+        }
+        return sb.toString();
     }
-    return sb.toString();
-  }
 
-  public Object[] toPath() {
-    return Arrays.copyOf(path, length);
-  }
+    public Object[] toPath() {
+        return Arrays.copyOf(path, length);
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/stacktrace/AbstractStackWalker.java b/internal-api/src/main/java/datadog/trace/util/stacktrace/AbstractStackWalker.java
index 34a002f47bb..45ae05754c6 100644
--- a/internal-api/src/main/java/datadog/trace/util/stacktrace/AbstractStackWalker.java
+++ b/internal-api/src/main/java/datadog/trace/util/stacktrace/AbstractStackWalker.java
@@ -5,21 +5,21 @@
 
 public abstract class AbstractStackWalker implements StackWalker {
 
-  @Override
-  public <T> T walk(Function<Stream<StackTraceElement>, T> consumer) {
-    return doGetStack(input -> consumer.apply(doFilterStack(input)));
-  }
+    @Override
+    public <T> T walk(Function<Stream<StackTraceElement>, T> consumer) {
+        return doGetStack(input -> consumer.apply(doFilterStack(input)));
+    }
 
-  final Stream<StackTraceElement> doFilterStack(Stream<StackTraceElement> stream) {
-    return stream.filter(AbstractStackWalker::isNotDatadogTraceStackElement);
-  }
+    final Stream<StackTraceElement> doFilterStack(Stream<StackTraceElement> stream) {
+        return stream.filter(AbstractStackWalker::isNotDatadogTraceStackElement);
+    }
 
-  abstract <T> T doGetStack(Function<Stream<StackTraceElement>, T> consumer);
+    abstract <T> T doGetStack(Function<Stream<StackTraceElement>, T> consumer);
 
-  public static boolean isNotDatadogTraceStackElement(final StackTraceElement el) {
-    final String clazz = el.getClassName();
-    return !clazz.startsWith("datadog.trace.")
-        && !clazz.startsWith("com.datadog.iast.")
-        && !clazz.startsWith("com.datadog.appsec.");
-  }
+    public static boolean isNotDatadogTraceStackElement(final StackTraceElement el) {
+        final String clazz = el.getClassName();
+        return !clazz.startsWith("datadog.trace.")
+                && !clazz.startsWith("com.datadog.iast.")
+                && !clazz.startsWith("com.datadog.appsec.");
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/stacktrace/DefaultStackWalker.java b/internal-api/src/main/java/datadog/trace/util/stacktrace/DefaultStackWalker.java
index a19d0b702bf..c01ff304eb7 100644
--- a/internal-api/src/main/java/datadog/trace/util/stacktrace/DefaultStackWalker.java
+++ b/internal-api/src/main/java/datadog/trace/util/stacktrace/DefaultStackWalker.java
@@ -6,15 +6,15 @@
 
 public class DefaultStackWalker extends AbstractStackWalker {
 
-  DefaultStackWalker() {}
+    DefaultStackWalker() {}
 
-  @Override
-  public boolean isEnabled() {
-    return true;
-  }
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
 
-  @Override
-  <T> T doGetStack(final Function<Stream<StackTraceElement>, T> consumer) {
-    return consumer.apply(Arrays.stream(new Throwable().getStackTrace()));
-  }
+    @Override
+    <T> T doGetStack(final Function<Stream<StackTraceElement>, T> consumer) {
+        return consumer.apply(Arrays.stream(new Throwable().getStackTrace()));
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/stacktrace/HotSpotStackTraceIterator.java b/internal-api/src/main/java/datadog/trace/util/stacktrace/HotSpotStackTraceIterator.java
index 799079a2818..cf99188715e 100644
--- a/internal-api/src/main/java/datadog/trace/util/stacktrace/HotSpotStackTraceIterator.java
+++ b/internal-api/src/main/java/datadog/trace/util/stacktrace/HotSpotStackTraceIterator.java
@@ -5,36 +5,35 @@
 
 public class HotSpotStackTraceIterator implements Iterator<StackTraceElement> {
 
-  private int index = 0;
+    private int index = 0;
 
-  private final int size;
+    private final int size;
 
-  private final Throwable throwable;
+    private final Throwable throwable;
 
-  private final sun.misc.JavaLangAccess access;
+    private final sun.misc.JavaLangAccess access;
 
-  public HotSpotStackTraceIterator(
-      final Throwable throwable, final sun.misc.JavaLangAccess access) {
-    this.throwable = throwable;
-    this.access = access;
-    size = this.access.getStackTraceDepth(throwable);
-  }
+    public HotSpotStackTraceIterator(final Throwable throwable, final sun.misc.JavaLangAccess access) {
+        this.throwable = throwable;
+        this.access = access;
+        size = this.access.getStackTraceDepth(throwable);
+    }
 
-  @Override
-  public boolean hasNext() {
-    return index < size;
-  }
+    @Override
+    public boolean hasNext() {
+        return index < size;
+    }
 
-  @Override
-  public StackTraceElement next() {
-    if (index >= size) {
-      throw new NoSuchElementException();
+    @Override
+    public StackTraceElement next() {
+        if (index >= size) {
+            throw new NoSuchElementException();
+        }
+        return access.getStackTraceElement(throwable, index++);
     }
-    return access.getStackTraceElement(throwable, index++);
-  }
 
-  @Override
-  public void remove() {
-    throw new UnsupportedOperationException();
-  }
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/stacktrace/HotSpotStackWalker.java b/internal-api/src/main/java/datadog/trace/util/stacktrace/HotSpotStackWalker.java
index 6621478b502..2aa92bf0df4 100644
--- a/internal-api/src/main/java/datadog/trace/util/stacktrace/HotSpotStackWalker.java
+++ b/internal-api/src/main/java/datadog/trace/util/stacktrace/HotSpotStackWalker.java
@@ -7,33 +7,34 @@
 import java.util.stream.StreamSupport;
 
 public class HotSpotStackWalker extends AbstractStackWalker {
-  @SuppressForbidden sun.misc.JavaLangAccess access;
+    @SuppressForbidden
+    sun.misc.JavaLangAccess access;
 
-  @SuppressForbidden
-  HotSpotStackWalker() {
-    try {
-      access = sun.misc.SharedSecrets.getJavaLangAccess();
-    } catch (Throwable ignored) {
+    @SuppressForbidden
+    HotSpotStackWalker() {
+        try {
+            access = sun.misc.SharedSecrets.getJavaLangAccess();
+        } catch (Throwable ignored) {
+        }
     }
-  }
 
-  @Override
-  public boolean isEnabled() {
-    try {
-      if (JavaVirtualMachine.isJavaVersion(8) && access != null) {
-        access.getStackTraceElement(new Throwable(), 0);
-        return true;
-      }
-    } catch (Throwable localThrowable) {
+    @Override
+    public boolean isEnabled() {
+        try {
+            if (JavaVirtualMachine.isJavaVersion(8) && access != null) {
+                access.getStackTraceElement(new Throwable(), 0);
+                return true;
+            }
+        } catch (Throwable localThrowable) {
+        }
+        return false;
     }
-    return false;
-  }
 
-  @Override
-  <T> T doGetStack(Function<Stream<StackTraceElement>, T> consumer) {
+    @Override
+    <T> T doGetStack(Function<Stream<StackTraceElement>, T> consumer) {
 
-    Throwable throwable = new Throwable();
-    Iterable<StackTraceElement> iterable = () -> new HotSpotStackTraceIterator(throwable, access);
-    return consumer.apply(StreamSupport.stream(iterable.spliterator(), false));
-  }
+        Throwable throwable = new Throwable();
+        Iterable<StackTraceElement> iterable = () -> new HotSpotStackTraceIterator(throwable, access);
+        return consumer.apply(StreamSupport.stream(iterable.spliterator(), false));
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/stacktrace/StackTraceEvent.java b/internal-api/src/main/java/datadog/trace/util/stacktrace/StackTraceEvent.java
index 363a9dca1c8..348b1715ddc 100644
--- a/internal-api/src/main/java/datadog/trace/util/stacktrace/StackTraceEvent.java
+++ b/internal-api/src/main/java/datadog/trace/util/stacktrace/StackTraceEvent.java
@@ -6,41 +6,48 @@
 
 public class StackTraceEvent {
 
-  public static final String DEFAULT_LANGUAGE = "java";
-
-  @Nullable private final String language;
-  @Nullable private final String id;
-  @Nullable private final String message;
-  @Nonnull private final List<StackTraceFrame> frames;
-
-  public StackTraceEvent(
-      @Nonnull final List<StackTraceFrame> frames,
-      @Nullable final String language,
-      @Nullable final String id,
-      @Nullable final String message) {
-    this.language = language;
-    this.id = id;
-    this.message = message;
-    this.frames = frames;
-  }
-
-  @Nullable
-  public String getLanguage() {
-    return language;
-  }
-
-  @Nullable
-  public String getId() {
-    return id;
-  }
-
-  @Nullable
-  public String getMessage() {
-    return message;
-  }
-
-  @Nonnull
-  public List<StackTraceFrame> getFrames() {
-    return frames;
-  }
+    public static final String DEFAULT_LANGUAGE = "java";
+
+    @Nullable
+    private final String language;
+
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final String message;
+
+    @Nonnull
+    private final List<StackTraceFrame> frames;
+
+    public StackTraceEvent(
+            @Nonnull final List<StackTraceFrame> frames,
+            @Nullable final String language,
+            @Nullable final String id,
+            @Nullable final String message) {
+        this.language = language;
+        this.id = id;
+        this.message = message;
+        this.frames = frames;
+    }
+
+    @Nullable
+    public String getLanguage() {
+        return language;
+    }
+
+    @Nullable
+    public String getId() {
+        return id;
+    }
+
+    @Nullable
+    public String getMessage() {
+        return message;
+    }
+
+    @Nonnull
+    public List<StackTraceFrame> getFrames() {
+        return frames;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/stacktrace/StackTraceFrame.java b/internal-api/src/main/java/datadog/trace/util/stacktrace/StackTraceFrame.java
index 0e1f385596c..958d0e9f36c 100644
--- a/internal-api/src/main/java/datadog/trace/util/stacktrace/StackTraceFrame.java
+++ b/internal-api/src/main/java/datadog/trace/util/stacktrace/StackTraceFrame.java
@@ -4,65 +4,74 @@
 
 public class StackTraceFrame {
 
-  // Unsigned integer: index of the stack frame (0 = top of stack)
-  private final int id;
-  // Raw stack frame
-  @Nullable private final String text;
-  @Nullable private final String file;
-  @Nullable private final Integer line;
-  @Nullable private final String class_name;
-  @Nullable private final String function;
+    // Unsigned integer: index of the stack frame (0 = top of stack)
+    private final int id;
+    // Raw stack frame
+    @Nullable
+    private final String text;
 
-  public StackTraceFrame(final int id, final StackTraceElement element) {
-    this.id = id;
-    this.text = element.toString();
-    this.file = element.getFileName();
-    this.line = element.getLineNumber();
-    this.class_name = element.getClassName();
-    this.function = element.getMethodName();
-  }
+    @Nullable
+    private final String file;
 
-  public StackTraceFrame(
-      final int id,
-      @Nullable final String text,
-      @Nullable final String file,
-      @Nullable final Integer line,
-      @Nullable final String class_name,
-      @Nullable final String function) {
-    this.id = id;
-    this.text = text;
-    this.file = file;
-    this.line = line;
-    this.class_name = class_name;
-    this.function = function;
-  }
+    @Nullable
+    private final Integer line;
 
-  public int getId() {
-    return id;
-  }
+    @Nullable
+    private final String class_name;
 
-  @Nullable
-  public String getText() {
-    return text;
-  }
+    @Nullable
+    private final String function;
 
-  @Nullable
-  public String getFile() {
-    return file;
-  }
+    public StackTraceFrame(final int id, final StackTraceElement element) {
+        this.id = id;
+        this.text = element.toString();
+        this.file = element.getFileName();
+        this.line = element.getLineNumber();
+        this.class_name = element.getClassName();
+        this.function = element.getMethodName();
+    }
 
-  @Nullable
-  public Integer getLine() {
-    return line;
-  }
+    public StackTraceFrame(
+            final int id,
+            @Nullable final String text,
+            @Nullable final String file,
+            @Nullable final Integer line,
+            @Nullable final String class_name,
+            @Nullable final String function) {
+        this.id = id;
+        this.text = text;
+        this.file = file;
+        this.line = line;
+        this.class_name = class_name;
+        this.function = function;
+    }
 
-  @Nullable
-  public String getClass_name() {
-    return class_name;
-  }
+    public int getId() {
+        return id;
+    }
 
-  @Nullable
-  public String getFunction() {
-    return function;
-  }
+    @Nullable
+    public String getText() {
+        return text;
+    }
+
+    @Nullable
+    public String getFile() {
+        return file;
+    }
+
+    @Nullable
+    public Integer getLine() {
+        return line;
+    }
+
+    @Nullable
+    public String getClass_name() {
+        return class_name;
+    }
+
+    @Nullable
+    public String getFunction() {
+        return function;
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/stacktrace/StackUtils.java b/internal-api/src/main/java/datadog/trace/util/stacktrace/StackUtils.java
index 35ad5151054..47315302a7f 100644
--- a/internal-api/src/main/java/datadog/trace/util/stacktrace/StackUtils.java
+++ b/internal-api/src/main/java/datadog/trace/util/stacktrace/StackUtils.java
@@ -15,97 +15,87 @@
 
 public abstract class StackUtils {
 
-  public static final String META_STRUCT_KEY = "_dd.stack";
-
-  public static <E extends Throwable> E update(
-      final E exception, final Function<StackTraceElement[], StackTraceElement[]> filter) {
-    final StackTraceElement[] stack = exception.getStackTrace();
-    exception.setStackTrace(filter.apply(stack));
-    return exception;
-  }
-
-  public static <E extends Throwable> E filter(
-      final E exception, final Predicate<StackTraceElement> filter) {
-    return update(
-        exception, stack -> Arrays.stream(stack).filter(filter).toArray(StackTraceElement[]::new));
-  }
-
-  public static <E extends Throwable> E filterFirst(
-      final E exception, final Predicate<StackTraceElement> filter) {
-    return filter(exception, new OneTimePredicate<>(filter));
-  }
-
-  public static <E extends Throwable> E filterDatadog(final E exception) {
-    return filter(exception, AbstractStackWalker::isNotDatadogTraceStackElement);
-  }
-
-  public static <E extends Throwable> E filterFirstDatadog(final E exception) {
-    return filterFirst(exception, AbstractStackWalker::isNotDatadogTraceStackElement);
-  }
-
-  public static <E extends Throwable> E filterUntil(
-      final E exception, final Predicate<StackTraceElement> trace) {
-    return update(
-        exception,
-        stack -> {
-          final StackTraceElement[] source = exception.getStackTrace();
-          for (int i = 0; i < source.length; i++) {
-            if (trace.test(source[i])) {
-              final StackTraceElement[] result = new StackTraceElement[source.length - i - 1];
-              System.arraycopy(source, i + 1, result, 0, result.length);
-              return result;
+    public static final String META_STRUCT_KEY = "_dd.stack";
+
+    public static <E extends Throwable> E update(
+            final E exception, final Function<StackTraceElement[], StackTraceElement[]> filter) {
+        final StackTraceElement[] stack = exception.getStackTrace();
+        exception.setStackTrace(filter.apply(stack));
+        return exception;
+    }
+
+    public static <E extends Throwable> E filter(final E exception, final Predicate<StackTraceElement> filter) {
+        return update(exception, stack -> Arrays.stream(stack).filter(filter).toArray(StackTraceElement[]::new));
+    }
+
+    public static <E extends Throwable> E filterFirst(final E exception, final Predicate<StackTraceElement> filter) {
+        return filter(exception, new OneTimePredicate<>(filter));
+    }
+
+    public static <E extends Throwable> E filterDatadog(final E exception) {
+        return filter(exception, AbstractStackWalker::isNotDatadogTraceStackElement);
+    }
+
+    public static <E extends Throwable> E filterFirstDatadog(final E exception) {
+        return filterFirst(exception, AbstractStackWalker::isNotDatadogTraceStackElement);
+    }
+
+    public static <E extends Throwable> E filterUntil(final E exception, final Predicate<StackTraceElement> trace) {
+        return update(exception, stack -> {
+            final StackTraceElement[] source = exception.getStackTrace();
+            for (int i = 0; i < source.length; i++) {
+                if (trace.test(source[i])) {
+                    final StackTraceElement[] result = new StackTraceElement[source.length - i - 1];
+                    System.arraycopy(source, i + 1, result, 0, result.length);
+                    return result;
+                }
             }
-          }
-          return source;
+            return source;
         });
-  }
-
-  public static List<StackTraceFrame> generateUserCodeStackTrace() {
-    return generateUserCodeStackTrace(AbstractStackWalker::isNotDatadogTraceStackElement);
-  }
-
-  /** Function generates stack trace of the user code (excluding datadog classes) */
-  public static List<StackTraceFrame> generateUserCodeStackTrace(
-      final Predicate<StackTraceElement> filterPredicate) {
-    int stackCapacity = Config.get().getAppSecMaxStackTraceDepth();
-    List<StackTraceElement> elements =
-        StackWalkerFactory.INSTANCE.walk(
-            stream ->
-                stream.filter(filterPredicate).limit(stackCapacity).collect(Collectors.toList()));
-    return IntStream.range(0, elements.size())
-        .mapToObj(idx -> new StackTraceFrame(idx, elements.get(idx)))
-        .collect(Collectors.toList());
-  }
-
-  public static void addStacktraceEventsToMetaStruct(
-      final RequestContext reqCtx, final String productKey, final List<StackTraceEvent> events) {
-    final Map<String, List<StackTraceEvent>> stackTraceBatch =
-        reqCtx.getOrCreateMetaStructTop(META_STRUCT_KEY, k -> new ConcurrentHashMap<>());
-    final List<StackTraceEvent> list =
-        stackTraceBatch.computeIfAbsent(
-            productKey, k -> Collections.synchronizedList(new ArrayList<>()));
-    list.addAll(events);
-  }
-
-  private static class OneTimePredicate<T> implements Predicate<T> {
-
-    private final Predicate<T> delegate;
-    private boolean filtered;
-
-    private OneTimePredicate(final Predicate<T> delegate) {
-      this.delegate = delegate;
     }
 
-    @Override
-    public boolean test(final T item) {
-      if (filtered) {
-        return true;
-      }
-      final boolean test = delegate.test(item);
-      if (!test) {
-        filtered = true;
-      }
-      return test;
+    public static List<StackTraceFrame> generateUserCodeStackTrace() {
+        return generateUserCodeStackTrace(AbstractStackWalker::isNotDatadogTraceStackElement);
+    }
+
+    /** Function generates stack trace of the user code (excluding datadog classes) */
+    public static List<StackTraceFrame> generateUserCodeStackTrace(final Predicate<StackTraceElement> filterPredicate) {
+        int stackCapacity = Config.get().getAppSecMaxStackTraceDepth();
+        List<StackTraceElement> elements = StackWalkerFactory.INSTANCE.walk(
+                stream -> stream.filter(filterPredicate).limit(stackCapacity).collect(Collectors.toList()));
+        return IntStream.range(0, elements.size())
+                .mapToObj(idx -> new StackTraceFrame(idx, elements.get(idx)))
+                .collect(Collectors.toList());
+    }
+
+    public static void addStacktraceEventsToMetaStruct(
+            final RequestContext reqCtx, final String productKey, final List<StackTraceEvent> events) {
+        final Map<String, List<StackTraceEvent>> stackTraceBatch =
+                reqCtx.getOrCreateMetaStructTop(META_STRUCT_KEY, k -> new ConcurrentHashMap<>());
+        final List<StackTraceEvent> list =
+                stackTraceBatch.computeIfAbsent(productKey, k -> Collections.synchronizedList(new ArrayList<>()));
+        list.addAll(events);
+    }
+
+    private static class OneTimePredicate<T> implements Predicate<T> {
+
+        private final Predicate<T> delegate;
+        private boolean filtered;
+
+        private OneTimePredicate(final Predicate<T> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public boolean test(final T item) {
+            if (filtered) {
+                return true;
+            }
+            final boolean test = delegate.test(item);
+            if (!test) {
+                filtered = true;
+            }
+            return test;
+        }
     }
-  }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/stacktrace/StackWalker.java b/internal-api/src/main/java/datadog/trace/util/stacktrace/StackWalker.java
index 9364fb306ab..ec7ffee836b 100644
--- a/internal-api/src/main/java/datadog/trace/util/stacktrace/StackWalker.java
+++ b/internal-api/src/main/java/datadog/trace/util/stacktrace/StackWalker.java
@@ -5,8 +5,8 @@
 
 public interface StackWalker {
 
-  boolean isEnabled();
+    boolean isEnabled();
 
-  /** StackTrace should be returned without any element from the dd-trace-java-agent itself. */
-  <T> T walk(Function<Stream<StackTraceElement>, T> consumer);
+    /** StackTrace should be returned without any element from the dd-trace-java-agent itself. */
+    <T> T walk(Function<Stream<StackTraceElement>, T> consumer);
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/stacktrace/StackWalkerFactory.java b/internal-api/src/main/java/datadog/trace/util/stacktrace/StackWalkerFactory.java
index bd9357260d9..768b88ba188 100644
--- a/internal-api/src/main/java/datadog/trace/util/stacktrace/StackWalkerFactory.java
+++ b/internal-api/src/main/java/datadog/trace/util/stacktrace/StackWalkerFactory.java
@@ -11,47 +11,44 @@
 @SuppressForbidden
 public class StackWalkerFactory {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(StackWalkerFactory.class);
-
-  public static final StackWalker INSTANCE;
-
-  static {
-    Stream<StackWalker> stream = Stream.of(hotspot(), jdk9()).map(Supplier::get);
-    INSTANCE =
-        stream
-            .filter(Objects::nonNull)
-            .filter(StackWalker::isEnabled)
-            .findFirst()
-            .orElseGet(defaultStackWalker());
-  }
-
-  private static Supplier<StackWalker> defaultStackWalker() {
-    return DefaultStackWalker::new;
-  }
-
-  private static Supplier<StackWalker> hotspot() {
-    return () -> {
-      if (!JavaVirtualMachine.isJavaVersion(8)) {
-        return null;
-      }
-      return new HotSpotStackWalker();
-    };
-  }
-
-  private static Supplier<StackWalker> jdk9() {
-    return () -> {
-      if (!JavaVirtualMachine.isJavaVersionAtLeast(9)) {
-        return null;
-      }
-      try {
-        return (StackWalker)
-            Class.forName("datadog.trace.util.stacktrace.JDK9StackWalker")
-                .getDeclaredConstructor()
-                .newInstance();
-      } catch (Throwable e) {
-        LOGGER.warn("JDK9StackWalker not available", e);
-        return null;
-      }
-    };
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(StackWalkerFactory.class);
+
+    public static final StackWalker INSTANCE;
+
+    static {
+        Stream<StackWalker> stream = Stream.of(hotspot(), jdk9()).map(Supplier::get);
+        INSTANCE = stream.filter(Objects::nonNull)
+                .filter(StackWalker::isEnabled)
+                .findFirst()
+                .orElseGet(defaultStackWalker());
+    }
+
+    private static Supplier<StackWalker> defaultStackWalker() {
+        return DefaultStackWalker::new;
+    }
+
+    private static Supplier<StackWalker> hotspot() {
+        return () -> {
+            if (!JavaVirtualMachine.isJavaVersion(8)) {
+                return null;
+            }
+            return new HotSpotStackWalker();
+        };
+    }
+
+    private static Supplier<StackWalker> jdk9() {
+        return () -> {
+            if (!JavaVirtualMachine.isJavaVersionAtLeast(9)) {
+                return null;
+            }
+            try {
+                return (StackWalker) Class.forName("datadog.trace.util.stacktrace.JDK9StackWalker")
+                        .getDeclaredConstructor()
+                        .newInstance();
+            } catch (Throwable e) {
+                LOGGER.warn("JDK9StackWalker not available", e);
+                return null;
+            }
+        };
+    }
 }
diff --git a/internal-api/src/main/java/datadog/trace/util/throwable/FatalAgentMisconfigurationError.java b/internal-api/src/main/java/datadog/trace/util/throwable/FatalAgentMisconfigurationError.java
index 5feb71d1603..8f375f8f3b6 100644
--- a/internal-api/src/main/java/datadog/trace/util/throwable/FatalAgentMisconfigurationError.java
+++ b/internal-api/src/main/java/datadog/trace/util/throwable/FatalAgentMisconfigurationError.java
@@ -9,7 +9,7 @@
  * renaming or moving it.
  */
 public class FatalAgentMisconfigurationError extends Error {
-  public FatalAgentMisconfigurationError(String message) {
-    super(message);
-  }
+    public FatalAgentMisconfigurationError(String message) {
+        super(message);
+    }
 }
diff --git a/internal-api/src/test/groovy/datadog/trace/api/env/FixedCapturedEnvironment.java b/internal-api/src/test/groovy/datadog/trace/api/env/FixedCapturedEnvironment.java
index cccc9f0fda6..aaf1094136a 100644
--- a/internal-api/src/test/groovy/datadog/trace/api/env/FixedCapturedEnvironment.java
+++ b/internal-api/src/test/groovy/datadog/trace/api/env/FixedCapturedEnvironment.java
@@ -4,10 +4,10 @@
 
 /** Helper class that has access to {@link CapturedEnvironment} */
 public class FixedCapturedEnvironment {
-  private FixedCapturedEnvironment() {}
+    private FixedCapturedEnvironment() {}
 
-  /** Load properties instance into the {@code CapturedEnvironment} instance. */
-  public static void useFixedEnv(final Map<String, String> properties) {
-    CapturedEnvironment.useFixedEnv(properties);
-  }
+    /** Load properties instance into the {@code CapturedEnvironment} instance. */
+    public static void useFixedEnv(final Map<String, String> properties) {
+        CapturedEnvironment.useFixedEnv(properties);
+    }
 }
diff --git a/internal-api/src/test/groovy/datadog/trace/api/telemetry/ConfigInversionMetricCollectorTestHelper.java b/internal-api/src/test/groovy/datadog/trace/api/telemetry/ConfigInversionMetricCollectorTestHelper.java
index 841ca68e26b..2b22905048a 100644
--- a/internal-api/src/test/groovy/datadog/trace/api/telemetry/ConfigInversionMetricCollectorTestHelper.java
+++ b/internal-api/src/test/groovy/datadog/trace/api/telemetry/ConfigInversionMetricCollectorTestHelper.java
@@ -7,15 +7,14 @@
 // Lightweight helper class to simulate Config Inversion ConfigHelper scenario where telemetry
 // metrics are emitted for "unknown" environment variables.
 public class ConfigInversionMetricCollectorTestHelper {
-  private static final Set<String> SUPPORTED_ENV_VARS =
-      new HashSet<>(Arrays.asList("DD_ENV", "DD_SERVICE"));
+    private static final Set<String> SUPPORTED_ENV_VARS = new HashSet<>(Arrays.asList("DD_ENV", "DD_SERVICE"));
 
-  private static final ConfigInversionMetricCollectorImpl configInversionMetricCollector =
-      ConfigInversionMetricCollectorImpl.getInstance();
+    private static final ConfigInversionMetricCollectorImpl configInversionMetricCollector =
+            ConfigInversionMetricCollectorImpl.getInstance();
 
-  public static void checkAndEmitUnsupported(String envVarName) {
-    if (!SUPPORTED_ENV_VARS.contains(envVarName)) {
-      configInversionMetricCollector.setUndocumentedEnvVarMetric(envVarName);
+    public static void checkAndEmitUnsupported(String envVarName) {
+        if (!SUPPORTED_ENV_VARS.contains(envVarName)) {
+            configInversionMetricCollector.setUndocumentedEnvVarMetric(envVarName);
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/constructors/InaccessibleConstructor.java b/internal-api/src/test/java/constructors/InaccessibleConstructor.java
index c35175b9d92..17b569aded9 100644
--- a/internal-api/src/test/java/constructors/InaccessibleConstructor.java
+++ b/internal-api/src/test/java/constructors/InaccessibleConstructor.java
@@ -1,5 +1,5 @@
 package constructors;
 
 public class InaccessibleConstructor {
-  private InaccessibleConstructor() {}
+    private InaccessibleConstructor() {}
 }
diff --git a/internal-api/src/test/java/constructors/NoDefaultConstructor.java b/internal-api/src/test/java/constructors/NoDefaultConstructor.java
index d12f5642e8b..c04273413fa 100644
--- a/internal-api/src/test/java/constructors/NoDefaultConstructor.java
+++ b/internal-api/src/test/java/constructors/NoDefaultConstructor.java
@@ -2,5 +2,5 @@
 
 public class NoDefaultConstructor {
 
-  public NoDefaultConstructor(Object foo) {}
+    public NoDefaultConstructor(Object foo) {}
 }
diff --git a/internal-api/src/test/java/constructors/ThrowingConstructor.java b/internal-api/src/test/java/constructors/ThrowingConstructor.java
index 7e3219edc6c..5a9ecb1926b 100644
--- a/internal-api/src/test/java/constructors/ThrowingConstructor.java
+++ b/internal-api/src/test/java/constructors/ThrowingConstructor.java
@@ -1,7 +1,7 @@
 package constructors;
 
 public class ThrowingConstructor {
-  public ThrowingConstructor() {
-    throw new RuntimeException();
-  }
+    public ThrowingConstructor() {
+        throw new RuntimeException();
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/ConfigAIGuardRedactionTest.java b/internal-api/src/test/java/datadog/trace/api/ConfigAIGuardRedactionTest.java
index 338b2e30145..a12a4a0b228 100644
--- a/internal-api/src/test/java/datadog/trace/api/ConfigAIGuardRedactionTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/ConfigAIGuardRedactionTest.java
@@ -11,46 +11,46 @@
 @ExtendWith(WithConfigExtension.class)
 class ConfigAIGuardRedactionTest {
 
-  @Test
-  void redactionIsEnabledByDefault() {
-    assertTrue(Config.get().isAiGuardRedactionEnabled());
-  }
-
-  @Test
-  void killSwitchDisablesRedactionViaSystemProperty() {
-    WithConfigExtension.injectSysConfig(AI_GUARD_REDACTION_ENABLED, "false");
-
-    assertFalse(Config.get().isAiGuardRedactionEnabled());
-  }
-
-  @Test
-  void killSwitchDisablesRedactionViaEnvironmentVariable() {
-    WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false);
-
-    assertFalse(Config.get().isAiGuardRedactionEnabled());
-  }
-
-  @Test
-  void killSwitchAcceptsNumericAndMixedCaseValues() {
-    WithConfigExtension.injectSysConfig(AI_GUARD_REDACTION_ENABLED, "0");
-    assertFalse(Config.get().isAiGuardRedactionEnabled());
-
-    WithConfigExtension.injectSysConfig(AI_GUARD_REDACTION_ENABLED, "FALSE");
-    assertFalse(Config.get().isAiGuardRedactionEnabled());
-
-    WithConfigExtension.injectSysConfig(AI_GUARD_REDACTION_ENABLED, "True");
-    assertTrue(Config.get().isAiGuardRedactionEnabled());
-  }
-
-  /**
-   * Invalid boolean values resolve to {@code false} rather than to the configured default: see the
-   * backward-compatibility branch in {@code ConfigProvider#get}. A typo therefore turns redaction
-   * off, even though it defaults to on.
-   */
-  @Test
-  void unparseableValueDisablesRedaction() {
-    WithConfigExtension.injectSysConfig(AI_GUARD_REDACTION_ENABLED, "not-a-boolean");
-
-    assertFalse(Config.get().isAiGuardRedactionEnabled());
-  }
+    @Test
+    void redactionIsEnabledByDefault() {
+        assertTrue(Config.get().isAiGuardRedactionEnabled());
+    }
+
+    @Test
+    void killSwitchDisablesRedactionViaSystemProperty() {
+        WithConfigExtension.injectSysConfig(AI_GUARD_REDACTION_ENABLED, "false");
+
+        assertFalse(Config.get().isAiGuardRedactionEnabled());
+    }
+
+    @Test
+    void killSwitchDisablesRedactionViaEnvironmentVariable() {
+        WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false);
+
+        assertFalse(Config.get().isAiGuardRedactionEnabled());
+    }
+
+    @Test
+    void killSwitchAcceptsNumericAndMixedCaseValues() {
+        WithConfigExtension.injectSysConfig(AI_GUARD_REDACTION_ENABLED, "0");
+        assertFalse(Config.get().isAiGuardRedactionEnabled());
+
+        WithConfigExtension.injectSysConfig(AI_GUARD_REDACTION_ENABLED, "FALSE");
+        assertFalse(Config.get().isAiGuardRedactionEnabled());
+
+        WithConfigExtension.injectSysConfig(AI_GUARD_REDACTION_ENABLED, "True");
+        assertTrue(Config.get().isAiGuardRedactionEnabled());
+    }
+
+    /**
+     * Invalid boolean values resolve to {@code false} rather than to the configured default: see the
+     * backward-compatibility branch in {@code ConfigProvider#get}. A typo therefore turns redaction
+     * off, even though it defaults to on.
+     */
+    @Test
+    void unparseableValueDisablesRedaction() {
+        WithConfigExtension.injectSysConfig(AI_GUARD_REDACTION_ENABLED, "not-a-boolean");
+
+        assertFalse(Config.get().isAiGuardRedactionEnabled());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/ConfigCodeCoverageFlagsTest.java b/internal-api/src/test/java/datadog/trace/api/ConfigCodeCoverageFlagsTest.java
index 0bf89156176..7ff861434b5 100644
--- a/internal-api/src/test/java/datadog/trace/api/ConfigCodeCoverageFlagsTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/ConfigCodeCoverageFlagsTest.java
@@ -21,78 +21,77 @@
 @ExtendWith(WithConfigExtension.class)
 class ConfigCodeCoverageFlagsTest {
 
-  @Test
-  void defaultsToNoFlags() {
-    assertEquals(Collections.emptyList(), Config.get().getCodeCoverageFlags());
-  }
-
-  @Test
-  void removesWhitespaceAndEmptyFlagsWhilePreservingOrderAndDuplicates() {
-    Config config = configWithFlags(" type:unit-tests, ,jvm-21,, type:unit-tests ");
-
-    assertEquals(
-        Arrays.asList("type:unit-tests", "jvm-21", "type:unit-tests"),
-        config.getCodeCoverageFlags());
-  }
-
-  @Test
-  void readsFlagsFromCanonicalEnvironmentVariable() {
-    WithConfigExtension.injectEnvConfig("DD_CODE_COVERAGE_FLAGS", "type:unit-tests,jvm-21", false);
-
-    assertEquals(Arrays.asList("type:unit-tests", "jvm-21"), Config.get().getCodeCoverageFlags());
-  }
-
-  @Test
-  void producesNoFlagsForEmptyInput() {
-    assertEquals(Collections.emptyList(), configWithFlags(" , , ").getCodeCoverageFlags());
-  }
-
-  @Test
-  void acceptsExactlyThirtyTwoFlagsAndReturnsImmutableSnapshot() {
-    List<String> expectedFlags = flags(32);
-    Config config = configWithFlags(String.join(",", expectedFlags));
-
-    assertEquals(expectedFlags, config.getCodeCoverageFlags());
-    assertThrows(
-        UnsupportedOperationException.class, () -> config.getCodeCoverageFlags().add("extra"));
-  }
-
-  @Test
-  void omitsAllFlagsWhenMoreThanThirtyTwoAreConfigured() {
-    Logger logger = (Logger) LoggerFactory.getLogger(Config.class);
-    ListAppender<ILoggingEvent> appender = new ListAppender<>();
-    appender.start();
-    logger.addAppender(appender);
-
-    try {
-      Config config = configWithFlags(String.join(",", flags(33)));
-
-      assertEquals(Collections.emptyList(), config.getCodeCoverageFlags());
-      List<ILoggingEvent> overflowWarnings = new ArrayList<>();
-      for (ILoggingEvent event : appender.list) {
-        if (event.getLevel() == Level.WARN
-            && event.getFormattedMessage().contains("code coverage report flags")) {
-          overflowWarnings.add(event);
+    @Test
+    void defaultsToNoFlags() {
+        assertEquals(Collections.emptyList(), Config.get().getCodeCoverageFlags());
+    }
+
+    @Test
+    void removesWhitespaceAndEmptyFlagsWhilePreservingOrderAndDuplicates() {
+        Config config = configWithFlags(" type:unit-tests, ,jvm-21,, type:unit-tests ");
+
+        assertEquals(Arrays.asList("type:unit-tests", "jvm-21", "type:unit-tests"), config.getCodeCoverageFlags());
+    }
+
+    @Test
+    void readsFlagsFromCanonicalEnvironmentVariable() {
+        WithConfigExtension.injectEnvConfig("DD_CODE_COVERAGE_FLAGS", "type:unit-tests,jvm-21", false);
+
+        assertEquals(Arrays.asList("type:unit-tests", "jvm-21"), Config.get().getCodeCoverageFlags());
+    }
+
+    @Test
+    void producesNoFlagsForEmptyInput() {
+        assertEquals(Collections.emptyList(), configWithFlags(" , , ").getCodeCoverageFlags());
+    }
+
+    @Test
+    void acceptsExactlyThirtyTwoFlagsAndReturnsImmutableSnapshot() {
+        List<String> expectedFlags = flags(32);
+        Config config = configWithFlags(String.join(",", expectedFlags));
+
+        assertEquals(expectedFlags, config.getCodeCoverageFlags());
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> config.getCodeCoverageFlags().add("extra"));
+    }
+
+    @Test
+    void omitsAllFlagsWhenMoreThanThirtyTwoAreConfigured() {
+        Logger logger = (Logger) LoggerFactory.getLogger(Config.class);
+        ListAppender<ILoggingEvent> appender = new ListAppender<>();
+        appender.start();
+        logger.addAppender(appender);
+
+        try {
+            Config config = configWithFlags(String.join(",", flags(33)));
+
+            assertEquals(Collections.emptyList(), config.getCodeCoverageFlags());
+            List<ILoggingEvent> overflowWarnings = new ArrayList<>();
+            for (ILoggingEvent event : appender.list) {
+                if (event.getLevel() == Level.WARN
+                        && event.getFormattedMessage().contains("code coverage report flags")) {
+                    overflowWarnings.add(event);
+                }
+            }
+            assertEquals(1, overflowWarnings.size());
+            assertTrue(overflowWarnings.get(0).getFormattedMessage().contains("33"));
+            assertTrue(overflowWarnings.get(0).getFormattedMessage().contains("32"));
+        } finally {
+            logger.detachAppender(appender);
         }
-      }
-      assertEquals(1, overflowWarnings.size());
-      assertTrue(overflowWarnings.get(0).getFormattedMessage().contains("33"));
-      assertTrue(overflowWarnings.get(0).getFormattedMessage().contains("32"));
-    } finally {
-      logger.detachAppender(appender);
     }
-  }
 
-  private static Config configWithFlags(String flags) {
-    WithConfigExtension.injectSysConfig(CODE_COVERAGE_FLAGS, flags);
-    return Config.get();
-  }
+    private static Config configWithFlags(String flags) {
+        WithConfigExtension.injectSysConfig(CODE_COVERAGE_FLAGS, flags);
+        return Config.get();
+    }
 
-  private static List<String> flags(int count) {
-    List<String> flags = new ArrayList<>(count);
-    for (int i = 0; i < count; i++) {
-      flags.add("flag-" + i);
+    private static List<String> flags(int count) {
+        List<String> flags = new ArrayList<>(count);
+        for (int i = 0; i < count; i++) {
+            flags.add("flag-" + i);
+        }
+        return flags;
     }
-    return flags;
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/ConfigOtelContextExposureTest.java b/internal-api/src/test/java/datadog/trace/api/ConfigOtelContextExposureTest.java
index a095fa72553..bacd4d4e895 100644
--- a/internal-api/src/test/java/datadog/trace/api/ConfigOtelContextExposureTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/ConfigOtelContextExposureTest.java
@@ -16,74 +16,74 @@
 @ExtendWith(WithConfigExtension.class)
 class ConfigOtelContextExposureTest {
 
-  /**
-   * The Datadog profiler raw predicate is vetoed outright on platforms and JVM versions that cannot
-   * run it, regardless of any explicit opt-in. Tests that expect the feature to be enabled are only
-   * meaningful on a JVM where that veto does not apply.
-   */
-  private static void assumeDatadogProfilerNotVetoed() {
-    assumeTrue(
-        !Config.isDatadogProfilerEnablementOverridden(),
-        "Datadog profiler is unavailable on this platform/JVM version");
-  }
+    /**
+     * The Datadog profiler raw predicate is vetoed outright on platforms and JVM versions that cannot
+     * run it, regardless of any explicit opt-in. Tests that expect the feature to be enabled are only
+     * meaningful on a JVM where that veto does not apply.
+     */
+    private static void assumeDatadogProfilerNotVetoed() {
+        assumeTrue(
+                !Config.isDatadogProfilerEnablementOverridden(),
+                "Datadog profiler is unavailable on this platform/JVM version");
+    }
 
-  @Test
-  void disabledByDefault() {
-    assertFalse(Config.get().isOtelThreadContextEnabled());
-  }
+    @Test
+    void disabledByDefault() {
+        assertFalse(Config.get().isOtelThreadContextEnabled());
+    }
 
-  @Test
-  @WithConfig(key = PROFILING_ENABLED, value = "true")
-  @WithConfig(key = APPSEC_ENABLED, value = "false")
-  @WithConfig(key = PROFILING_DATADOG_PROFILER_ENABLED, value = "true")
-  void enabledWhenProfilingIsEnabled() {
-    assumeDatadogProfilerNotVetoed();
+    @Test
+    @WithConfig(key = PROFILING_ENABLED, value = "true")
+    @WithConfig(key = APPSEC_ENABLED, value = "false")
+    @WithConfig(key = PROFILING_DATADOG_PROFILER_ENABLED, value = "true")
+    void enabledWhenProfilingIsEnabled() {
+        assumeDatadogProfilerNotVetoed();
 
-    assertTrue(Config.get().isOtelThreadContextEnabled());
-  }
+        assertTrue(Config.get().isOtelThreadContextEnabled());
+    }
 
-  @Test
-  @WithConfig(key = APPSEC_ENABLED, value = "true")
-  @WithConfig(key = PROFILING_ENABLED, value = "false")
-  @WithConfig(key = PROFILING_DATADOG_PROFILER_ENABLED, value = "true")
-  void enabledWhenAppSecIsFullyEnabledWithoutProfiling() {
-    assumeDatadogProfilerNotVetoed();
+    @Test
+    @WithConfig(key = APPSEC_ENABLED, value = "true")
+    @WithConfig(key = PROFILING_ENABLED, value = "false")
+    @WithConfig(key = PROFILING_DATADOG_PROFILER_ENABLED, value = "true")
+    void enabledWhenAppSecIsFullyEnabledWithoutProfiling() {
+        assumeDatadogProfilerNotVetoed();
 
-    Config config = Config.get();
-    assertFalse(config.isProfilingEnabled());
-    assertTrue(config.isOtelThreadContextEnabled());
-  }
+        Config config = Config.get();
+        assertFalse(config.isProfilingEnabled());
+        assertTrue(config.isOtelThreadContextEnabled());
+    }
 
-  @Test
-  @WithConfig(key = APPSEC_ENABLED, value = "inactive")
-  @WithConfig(key = PROFILING_ENABLED, value = "false")
-  @WithConfig(key = PROFILING_DATADOG_PROFILER_ENABLED, value = "true")
-  void disabledWhenAppSecIsOnlyEnabledInactive() {
-    assertFalse(Config.get().isOtelThreadContextEnabled());
-  }
+    @Test
+    @WithConfig(key = APPSEC_ENABLED, value = "inactive")
+    @WithConfig(key = PROFILING_ENABLED, value = "false")
+    @WithConfig(key = PROFILING_DATADOG_PROFILER_ENABLED, value = "true")
+    void disabledWhenAppSecIsOnlyEnabledInactive() {
+        assertFalse(Config.get().isOtelThreadContextEnabled());
+    }
 
-  @Test
-  @WithConfig(key = APPSEC_ENABLED, value = "true")
-  @WithConfig(key = PROFILING_ENABLED, value = "false")
-  @WithConfig(key = PROFILING_DATADOG_PROFILER_ENABLED, value = "false")
-  void disabledWhenDatadogProfilerIsExplicitlyDisabled() {
-    assertFalse(Config.get().isOtelThreadContextEnabled());
-  }
+    @Test
+    @WithConfig(key = APPSEC_ENABLED, value = "true")
+    @WithConfig(key = PROFILING_ENABLED, value = "false")
+    @WithConfig(key = PROFILING_DATADOG_PROFILER_ENABLED, value = "false")
+    void disabledWhenDatadogProfilerIsExplicitlyDisabled() {
+        assertFalse(Config.get().isOtelThreadContextEnabled());
+    }
 
-  /**
-   * An environment where the Datadog profiler cannot run (unsupported JVM version, Windows, GraalVM
-   * native image) makes the raw ddprof predicate {@code false}. That environment detection reads
-   * real, cached JVM and OS state that a unit test running on a normal JVM cannot fake, and there
-   * is no existing test helper in this module to stub it. This test therefore drives the identical
-   * boolean short-circuit through the {@code DD_PROFILING_DDPROF_ENABLED=false} env variable: from
-   * {@link Config}'s point of view an environment-detected "unsafe" and an explicit "false"
-   * collapse into the same raw-predicate value, so the downstream effect on {@link
-   * Config#isOtelThreadContextEnabled()} is the same.
-   */
-  @Test
-  @WithConfig(key = "APPSEC_ENABLED", value = "true", env = true)
-  @WithConfig(key = "PROFILING_DDPROF_ENABLED", value = "false", env = true)
-  void disabledWhenDatadogProfilerIsUnsafeOrExplicitlyDisabledViaEnv() {
-    assertFalse(Config.get().isOtelThreadContextEnabled());
-  }
+    /**
+     * An environment where the Datadog profiler cannot run (unsupported JVM version, Windows, GraalVM
+     * native image) makes the raw ddprof predicate {@code false}. That environment detection reads
+     * real, cached JVM and OS state that a unit test running on a normal JVM cannot fake, and there
+     * is no existing test helper in this module to stub it. This test therefore drives the identical
+     * boolean short-circuit through the {@code DD_PROFILING_DDPROF_ENABLED=false} env variable: from
+     * {@link Config}'s point of view an environment-detected "unsafe" and an explicit "false"
+     * collapse into the same raw-predicate value, so the downstream effect on {@link
+     * Config#isOtelThreadContextEnabled()} is the same.
+     */
+    @Test
+    @WithConfig(key = "APPSEC_ENABLED", value = "true", env = true)
+    @WithConfig(key = "PROFILING_DDPROF_ENABLED", value = "false", env = true)
+    void disabledWhenDatadogProfilerIsUnsafeOrExplicitlyDisabledViaEnv() {
+        assertFalse(Config.get().isOtelThreadContextEnabled());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/ConfigSecureRandomTest.java b/internal-api/src/test/java/datadog/trace/api/ConfigSecureRandomTest.java
index b780a8a581a..b3f2029b371 100644
--- a/internal-api/src/test/java/datadog/trace/api/ConfigSecureRandomTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/ConfigSecureRandomTest.java
@@ -11,36 +11,41 @@
 @ExtendWith(WithConfigExtension.class)
 class ConfigSecureRandomTest {
 
-  @Test
-  void defaultStrategyIsRandom() {
-    assertNotEquals("SRandom", Config.get().getIdGenerationStrategy().getClass().getSimpleName());
-  }
-
-  @Test
-  void snapStartEnablesSecureRandom() {
-    WithConfigExtension.injectEnvConfig("AWS_LAMBDA_INITIALIZATION_TYPE", "snap-start", false);
-
-    assertEquals("SRandom", Config.get().getIdGenerationStrategy().getClass().getSimpleName());
-  }
-
-  @Test
-  void microvmImageArnEnablesSecureRandom() {
-    WithConfigExtension.injectEnvConfig(
-        "AWS_LAMBDA_MICROVM_IMAGE_ARN", "arn:aws:lambda:us-east-1::runtime:microvm", false);
-
-    assertEquals("SRandom", Config.get().getIdGenerationStrategy().getClass().getSimpleName());
-  }
-
-  @Test
-  void emptyMicrovmImageArnDoesNotEnableSecureRandom() {
-    WithConfigExtension.injectEnvConfig("AWS_LAMBDA_MICROVM_IMAGE_ARN", "", false);
-
-    assertNotEquals("SRandom", Config.get().getIdGenerationStrategy().getClass().getSimpleName());
-  }
-
-  @Test
-  @WithConfig(key = "trace.secure-random", value = "true")
-  void configPropertyEnablesSecureRandom() {
-    assertEquals("SRandom", Config.get().getIdGenerationStrategy().getClass().getSimpleName());
-  }
+    @Test
+    void defaultStrategyIsRandom() {
+        assertNotEquals(
+                "SRandom", Config.get().getIdGenerationStrategy().getClass().getSimpleName());
+    }
+
+    @Test
+    void snapStartEnablesSecureRandom() {
+        WithConfigExtension.injectEnvConfig("AWS_LAMBDA_INITIALIZATION_TYPE", "snap-start", false);
+
+        assertEquals(
+                "SRandom", Config.get().getIdGenerationStrategy().getClass().getSimpleName());
+    }
+
+    @Test
+    void microvmImageArnEnablesSecureRandom() {
+        WithConfigExtension.injectEnvConfig(
+                "AWS_LAMBDA_MICROVM_IMAGE_ARN", "arn:aws:lambda:us-east-1::runtime:microvm", false);
+
+        assertEquals(
+                "SRandom", Config.get().getIdGenerationStrategy().getClass().getSimpleName());
+    }
+
+    @Test
+    void emptyMicrovmImageArnDoesNotEnableSecureRandom() {
+        WithConfigExtension.injectEnvConfig("AWS_LAMBDA_MICROVM_IMAGE_ARN", "", false);
+
+        assertNotEquals(
+                "SRandom", Config.get().getIdGenerationStrategy().getClass().getSimpleName());
+    }
+
+    @Test
+    @WithConfig(key = "trace.secure-random", value = "true")
+    void configPropertyEnablesSecureRandom() {
+        assertEquals(
+                "SRandom", Config.get().getIdGenerationStrategy().getClass().getSimpleName());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/EntryReadingHelperTest.java b/internal-api/src/test/java/datadog/trace/api/EntryReadingHelperTest.java
index c47f15e1b3e..75b022d0933 100644
--- a/internal-api/src/test/java/datadog/trace/api/EntryReadingHelperTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/EntryReadingHelperTest.java
@@ -12,128 +12,128 @@
 
 class EntryReadingHelperTest {
 
-  @Test
-  void setTagValueExposesIntValue() {
-    EntryReadingHelper helper = new EntryReadingHelper();
-    helper.set("my.tag", 42);
-
-    assertEquals("my.tag", helper.tag());
-    assertEquals(42, helper.intValue());
-    assertEquals(42L, helper.longValue());
-    assertEquals(TagMap.EntryReader.INT, helper.type());
-    assertTrue(helper.isNumber());
-    assertTrue(helper.isNumericPrimitive());
-    assertFalse(helper.isObject());
-    assertTrue(helper.is(TagMap.EntryReader.INT));
-  }
-
-  @Test
-  void setTagValueExposesLongValue() {
-    EntryReadingHelper helper = new EntryReadingHelper();
-    helper.set("id", 123456789L);
-
-    assertEquals(123456789L, helper.longValue());
-    assertEquals(TagMap.EntryReader.LONG, helper.type());
-    assertTrue(helper.isNumber());
-    assertTrue(helper.isNumericPrimitive());
-  }
-
-  @Test
-  void setTagValueExposesBooleanValue() {
-    EntryReadingHelper helper = new EntryReadingHelper();
-    helper.set("flag", true);
-
-    assertTrue(helper.booleanValue());
-    assertEquals(TagMap.EntryReader.BOOLEAN, helper.type());
-    assertFalse(helper.isNumber());
-    assertFalse(helper.isObject());
-  }
-
-  @Test
-  void setTagValueExposesFloatValue() {
-    EntryReadingHelper helper = new EntryReadingHelper();
-    helper.set("rate", 1.5f);
-
-    assertEquals(1.5f, helper.floatValue());
-    assertEquals(TagMap.EntryReader.FLOAT, helper.type());
-    assertTrue(helper.isNumericPrimitive());
-  }
-
-  @Test
-  void setTagValueExposesDoubleValue() {
-    EntryReadingHelper helper = new EntryReadingHelper();
-    helper.set("pi", 3.14);
-
-    assertEquals(3.14, helper.doubleValue());
-    assertEquals(TagMap.EntryReader.DOUBLE, helper.type());
-    assertTrue(helper.isNumericPrimitive());
-  }
-
-  @Test
-  void setTagValueExposesStringAsObject() {
-    EntryReadingHelper helper = new EntryReadingHelper();
-    helper.set("name", "foo");
-
-    assertEquals("foo", helper.stringValue());
-    assertEquals("foo", helper.objectValue());
-    assertEquals(TagMap.EntryReader.OBJECT, helper.type());
-    assertTrue(helper.isObject());
-    assertFalse(helper.isNumber());
-    assertFalse(helper.isNumericPrimitive());
-  }
-
-  @Test
-  void setTagValueCreatesEntry() {
-    EntryReadingHelper helper = new EntryReadingHelper();
-    helper.set("tag", "value");
-
-    TagMap.Entry entry = helper.entry();
-    assertNotNull(entry);
-    assertEquals("tag", entry.tag());
-    assertEquals("value", entry.objectValue());
-  }
-
-  @Test
-  void mapEntryFallsBackToNewEntryWhenSetWithTagValue() {
-    EntryReadingHelper helper = new EntryReadingHelper();
-    helper.set("tag", "value");
-
-    Map.Entry<String, Object> mapEntry = helper.mapEntry();
-    assertEquals("tag", mapEntry.getKey());
-    assertEquals("value", mapEntry.getValue());
-  }
-
-  @Test
-  void setMapEntryExposesReadMethods() {
-    EntryReadingHelper helper = new EntryReadingHelper();
-    Map.Entry<String, Object> original = new AbstractMap.SimpleEntry<>("key", "hello");
-    helper.set(original);
-
-    assertEquals("key", helper.tag());
-    assertEquals("hello", helper.stringValue());
-    assertEquals("hello", helper.objectValue());
-    assertEquals(TagMap.EntryReader.OBJECT, helper.type());
-    assertTrue(helper.isObject());
-    assertFalse(helper.isNumber());
-  }
-
-  @Test
-  void mapEntryReturnsSameInstanceWhenSetWithMapEntry() {
-    EntryReadingHelper helper = new EntryReadingHelper();
-    Map.Entry<String, Object> original = new AbstractMap.SimpleEntry<>("key", "value");
-    helper.set(original);
-
-    assertSame(original, helper.mapEntry());
-  }
-
-  @Test
-  void setMapEntryCreatesEntry() {
-    EntryReadingHelper helper = new EntryReadingHelper();
-    helper.set(new AbstractMap.SimpleEntry<>("k", 99));
-
-    TagMap.Entry entry = helper.entry();
-    assertNotNull(entry);
-    assertEquals("k", entry.tag());
-    assertEquals(99, entry.objectValue());
-  }
+    @Test
+    void setTagValueExposesIntValue() {
+        EntryReadingHelper helper = new EntryReadingHelper();
+        helper.set("my.tag", 42);
+
+        assertEquals("my.tag", helper.tag());
+        assertEquals(42, helper.intValue());
+        assertEquals(42L, helper.longValue());
+        assertEquals(TagMap.EntryReader.INT, helper.type());
+        assertTrue(helper.isNumber());
+        assertTrue(helper.isNumericPrimitive());
+        assertFalse(helper.isObject());
+        assertTrue(helper.is(TagMap.EntryReader.INT));
+    }
+
+    @Test
+    void setTagValueExposesLongValue() {
+        EntryReadingHelper helper = new EntryReadingHelper();
+        helper.set("id", 123456789L);
+
+        assertEquals(123456789L, helper.longValue());
+        assertEquals(TagMap.EntryReader.LONG, helper.type());
+        assertTrue(helper.isNumber());
+        assertTrue(helper.isNumericPrimitive());
+    }
+
+    @Test
+    void setTagValueExposesBooleanValue() {
+        EntryReadingHelper helper = new EntryReadingHelper();
+        helper.set("flag", true);
+
+        assertTrue(helper.booleanValue());
+        assertEquals(TagMap.EntryReader.BOOLEAN, helper.type());
+        assertFalse(helper.isNumber());
+        assertFalse(helper.isObject());
+    }
+
+    @Test
+    void setTagValueExposesFloatValue() {
+        EntryReadingHelper helper = new EntryReadingHelper();
+        helper.set("rate", 1.5f);
+
+        assertEquals(1.5f, helper.floatValue());
+        assertEquals(TagMap.EntryReader.FLOAT, helper.type());
+        assertTrue(helper.isNumericPrimitive());
+    }
+
+    @Test
+    void setTagValueExposesDoubleValue() {
+        EntryReadingHelper helper = new EntryReadingHelper();
+        helper.set("pi", 3.14);
+
+        assertEquals(3.14, helper.doubleValue());
+        assertEquals(TagMap.EntryReader.DOUBLE, helper.type());
+        assertTrue(helper.isNumericPrimitive());
+    }
+
+    @Test
+    void setTagValueExposesStringAsObject() {
+        EntryReadingHelper helper = new EntryReadingHelper();
+        helper.set("name", "foo");
+
+        assertEquals("foo", helper.stringValue());
+        assertEquals("foo", helper.objectValue());
+        assertEquals(TagMap.EntryReader.OBJECT, helper.type());
+        assertTrue(helper.isObject());
+        assertFalse(helper.isNumber());
+        assertFalse(helper.isNumericPrimitive());
+    }
+
+    @Test
+    void setTagValueCreatesEntry() {
+        EntryReadingHelper helper = new EntryReadingHelper();
+        helper.set("tag", "value");
+
+        TagMap.Entry entry = helper.entry();
+        assertNotNull(entry);
+        assertEquals("tag", entry.tag());
+        assertEquals("value", entry.objectValue());
+    }
+
+    @Test
+    void mapEntryFallsBackToNewEntryWhenSetWithTagValue() {
+        EntryReadingHelper helper = new EntryReadingHelper();
+        helper.set("tag", "value");
+
+        Map.Entry<String, Object> mapEntry = helper.mapEntry();
+        assertEquals("tag", mapEntry.getKey());
+        assertEquals("value", mapEntry.getValue());
+    }
+
+    @Test
+    void setMapEntryExposesReadMethods() {
+        EntryReadingHelper helper = new EntryReadingHelper();
+        Map.Entry<String, Object> original = new AbstractMap.SimpleEntry<>("key", "hello");
+        helper.set(original);
+
+        assertEquals("key", helper.tag());
+        assertEquals("hello", helper.stringValue());
+        assertEquals("hello", helper.objectValue());
+        assertEquals(TagMap.EntryReader.OBJECT, helper.type());
+        assertTrue(helper.isObject());
+        assertFalse(helper.isNumber());
+    }
+
+    @Test
+    void mapEntryReturnsSameInstanceWhenSetWithMapEntry() {
+        EntryReadingHelper helper = new EntryReadingHelper();
+        Map.Entry<String, Object> original = new AbstractMap.SimpleEntry<>("key", "value");
+        helper.set(original);
+
+        assertSame(original, helper.mapEntry());
+    }
+
+    @Test
+    void setMapEntryCreatesEntry() {
+        EntryReadingHelper helper = new EntryReadingHelper();
+        helper.set(new AbstractMap.SimpleEntry<>("k", 99));
+
+        TagMap.Entry entry = helper.entry();
+        assertNotNull(entry);
+        assertEquals("k", entry.tag());
+        assertEquals(99, entry.objectValue());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/FunctionsBase64Test.java b/internal-api/src/test/java/datadog/trace/api/FunctionsBase64Test.java
index 7330e9a5538..c969d95358a 100644
--- a/internal-api/src/test/java/datadog/trace/api/FunctionsBase64Test.java
+++ b/internal-api/src/test/java/datadog/trace/api/FunctionsBase64Test.java
@@ -12,32 +12,32 @@
 
 class FunctionsBase64Test {
 
-  @Test
-  void utf8BytesToStringConvertsBytes() {
-    byte[] bytes = "hello".getBytes(UTF_8);
-    assertEquals("hello", UTF8_BYTES_TO_STRING.apply(bytes));
-  }
-
-  @Test
-  void base64DecodeDecodesValidInput() {
-    String original = "x-datadog-trace-id";
-    byte[] encoded = Base64.getEncoder().encode(original.getBytes(UTF_8));
-    assertEquals(original, BASE64_DECODE.apply(encoded));
-  }
-
-  @Test
-  void base64DecodeReturnsNullForInvalidBase64() {
-    assertNull(BASE64_DECODE.apply("not-valid-base64!@#".getBytes(UTF_8)));
-  }
-
-  @Test
-  void base64DecodeReturnsNullForUrlSafeChars() {
-    // URL-safe Base64 uses '-' and '_' which the standard decoder rejects
-    assertNull(BASE64_DECODE.apply("abc-def_ghi".getBytes(UTF_8)));
-  }
-
-  @Test
-  void base64DecodeIsNotNull() {
-    assertNotNull(BASE64_DECODE);
-  }
+    @Test
+    void utf8BytesToStringConvertsBytes() {
+        byte[] bytes = "hello".getBytes(UTF_8);
+        assertEquals("hello", UTF8_BYTES_TO_STRING.apply(bytes));
+    }
+
+    @Test
+    void base64DecodeDecodesValidInput() {
+        String original = "x-datadog-trace-id";
+        byte[] encoded = Base64.getEncoder().encode(original.getBytes(UTF_8));
+        assertEquals(original, BASE64_DECODE.apply(encoded));
+    }
+
+    @Test
+    void base64DecodeReturnsNullForInvalidBase64() {
+        assertNull(BASE64_DECODE.apply("not-valid-base64!@#".getBytes(UTF_8)));
+    }
+
+    @Test
+    void base64DecodeReturnsNullForUrlSafeChars() {
+        // URL-safe Base64 uses '-' and '_' which the standard decoder rejects
+        assertNull(BASE64_DECODE.apply("abc-def_ghi".getBytes(UTF_8)));
+    }
+
+    @Test
+    void base64DecodeIsNotNull() {
+        assertNotNull(BASE64_DECODE);
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/TagMapBucketGroupTest.java b/internal-api/src/test/java/datadog/trace/api/TagMapBucketGroupTest.java
index 477a5ae58d8..b394cbea118 100644
--- a/internal-api/src/test/java/datadog/trace/api/TagMapBucketGroupTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/TagMapBucketGroupTest.java
@@ -11,364 +11,359 @@
 import org.junit.jupiter.api.Test;
 
 public class TagMapBucketGroupTest {
-  @Test
-  public void newGroup() {
-    TagMap.Entry firstEntry = TagMap.Entry.newIntEntry("foo", 0xDD06);
-    TagMap.Entry secondEntry = TagMap.Entry.newObjectEntry("bar", "quux");
+    @Test
+    public void newGroup() {
+        TagMap.Entry firstEntry = TagMap.Entry.newIntEntry("foo", 0xDD06);
+        TagMap.Entry secondEntry = TagMap.Entry.newObjectEntry("bar", "quux");
 
-    int firstHash = firstEntry.hash();
-    int secondHash = secondEntry.hash();
+        int firstHash = firstEntry.hash();
+        int secondHash = secondEntry.hash();
 
-    TagMap.BucketGroup group =
-        new TagMap.BucketGroup(
-            firstHash, firstEntry,
-            secondHash, secondEntry);
+        TagMap.BucketGroup group = new TagMap.BucketGroup(
+                firstHash, firstEntry,
+                secondHash, secondEntry);
 
-    assertEquals(firstHash, group._hashAt(0));
-    assertEquals(firstEntry, group._entryAt(0));
+        assertEquals(firstHash, group._hashAt(0));
+        assertEquals(firstEntry, group._entryAt(0));
 
-    assertEquals(secondEntry.hash(), group._hashAt(1));
-    assertEquals(secondEntry, group._entryAt(1));
+        assertEquals(secondEntry.hash(), group._hashAt(1));
+        assertEquals(secondEntry, group._entryAt(1));
 
-    assertFalse(group._isEmpty());
-    assertFalse(group.isEmptyChain());
+        assertFalse(group._isEmpty());
+        assertFalse(group.isEmptyChain());
 
-    assertContainsDirectly(firstEntry, group);
-    assertContainsDirectly(secondEntry, group);
-  }
+        assertContainsDirectly(firstEntry, group);
+        assertContainsDirectly(secondEntry, group);
+    }
 
-  @Test
-  public void _insert() {
-    TagMap.Entry firstEntry = TagMap.Entry.newIntEntry("foo", 0xDD06);
-    TagMap.Entry secondEntry = TagMap.Entry.newObjectEntry("bar", "quux");
+    @Test
+    public void _insert() {
+        TagMap.Entry firstEntry = TagMap.Entry.newIntEntry("foo", 0xDD06);
+        TagMap.Entry secondEntry = TagMap.Entry.newObjectEntry("bar", "quux");
 
-    int firstHash = firstEntry.hash();
-    int secondHash = secondEntry.hash();
+        int firstHash = firstEntry.hash();
+        int secondHash = secondEntry.hash();
 
-    TagMap.BucketGroup group =
-        new TagMap.BucketGroup(firstHash, firstEntry, secondHash, secondEntry);
+        TagMap.BucketGroup group = new TagMap.BucketGroup(firstHash, firstEntry, secondHash, secondEntry);
 
-    TagMap.Entry newEntry = TagMap.Entry.newAnyEntry("baz", "lorem ipsum");
-    int newHash = newEntry.hash();
+        TagMap.Entry newEntry = TagMap.Entry.newAnyEntry("baz", "lorem ipsum");
+        int newHash = newEntry.hash();
 
-    assertTrue(group._insert(newHash, newEntry));
+        assertTrue(group._insert(newHash, newEntry));
 
-    assertContainsDirectly(newEntry, group);
-    assertContainsDirectly(firstEntry, group);
-    assertContainsDirectly(secondEntry, group);
+        assertContainsDirectly(newEntry, group);
+        assertContainsDirectly(firstEntry, group);
+        assertContainsDirectly(secondEntry, group);
 
-    TagMap.Entry newEntry2 = TagMap.Entry.newDoubleEntry("new", 3.1415926535D);
-    int newHash2 = newEntry2.hash();
+        TagMap.Entry newEntry2 = TagMap.Entry.newDoubleEntry("new", 3.1415926535D);
+        int newHash2 = newEntry2.hash();
 
-    assertTrue(group._insert(newHash2, newEntry2));
+        assertTrue(group._insert(newHash2, newEntry2));
 
-    assertContainsDirectly(newEntry2, group);
-    assertContainsDirectly(newEntry, group);
-    assertContainsDirectly(firstEntry, group);
-    assertContainsDirectly(secondEntry, group);
+        assertContainsDirectly(newEntry2, group);
+        assertContainsDirectly(newEntry, group);
+        assertContainsDirectly(firstEntry, group);
+        assertContainsDirectly(secondEntry, group);
 
-    TagMap.Entry overflowEntry = TagMap.Entry.newDoubleEntry("overflow", 2.718281828D);
-    int overflowHash = overflowEntry.hash();
-    assertFalse(group._insert(overflowHash, overflowEntry));
+        TagMap.Entry overflowEntry = TagMap.Entry.newDoubleEntry("overflow", 2.718281828D);
+        int overflowHash = overflowEntry.hash();
+        assertFalse(group._insert(overflowHash, overflowEntry));
 
-    assertDoesntContainDirectly(overflowEntry, group);
-  }
+        assertDoesntContainDirectly(overflowEntry, group);
+    }
 
-  @Test
-  public void _replace() {
-    TagMap.Entry origEntry = TagMap.Entry.newIntEntry("replaceable", 0xDD06);
-    TagMap.Entry otherEntry = TagMap.Entry.newObjectEntry("bar", "quux");
+    @Test
+    public void _replace() {
+        TagMap.Entry origEntry = TagMap.Entry.newIntEntry("replaceable", 0xDD06);
+        TagMap.Entry otherEntry = TagMap.Entry.newObjectEntry("bar", "quux");
 
-    int origHash = origEntry.hash();
-    int otherHash = otherEntry.hash();
+        int origHash = origEntry.hash();
+        int otherHash = otherEntry.hash();
 
-    TagMap.BucketGroup group = new TagMap.BucketGroup(origHash, origEntry, otherHash, otherEntry);
-    assertContainsDirectly(origEntry, group);
-    assertContainsDirectly(otherEntry, group);
+        TagMap.BucketGroup group = new TagMap.BucketGroup(origHash, origEntry, otherHash, otherEntry);
+        assertContainsDirectly(origEntry, group);
+        assertContainsDirectly(otherEntry, group);
 
-    TagMap.Entry replacementEntry = TagMap.Entry.newBooleanEntry("replaceable", true);
-    int replacementHash = replacementEntry.hash();
-    assertEquals(replacementHash, origHash);
+        TagMap.Entry replacementEntry = TagMap.Entry.newBooleanEntry("replaceable", true);
+        int replacementHash = replacementEntry.hash();
+        assertEquals(replacementHash, origHash);
 
-    TagMap.Entry priorEntry = group._replace(origHash, replacementEntry);
-    assertSame(priorEntry, origEntry);
+        TagMap.Entry priorEntry = group._replace(origHash, replacementEntry);
+        assertSame(priorEntry, origEntry);
 
-    assertContainsDirectly(replacementEntry, group);
-    assertDoesntContainDirectly(priorEntry, group);
+        assertContainsDirectly(replacementEntry, group);
+        assertDoesntContainDirectly(priorEntry, group);
 
-    TagMap.Entry dneEntry = TagMap.Entry.newAnyEntry("dne", "not present");
-    int dneHash = dneEntry.hash();
+        TagMap.Entry dneEntry = TagMap.Entry.newAnyEntry("dne", "not present");
+        int dneHash = dneEntry.hash();
 
-    assertNull(group._replace(dneHash, dneEntry));
-    assertDoesntContainDirectly(dneEntry, group);
-  }
+        assertNull(group._replace(dneHash, dneEntry));
+        assertDoesntContainDirectly(dneEntry, group);
+    }
 
-  @Test
-  public void _remove() {
-    TagMap.Entry firstEntry = TagMap.Entry.newIntEntry("first", 0xDD06);
-    TagMap.Entry secondEntry = TagMap.Entry.newObjectEntry("second", "quux");
+    @Test
+    public void _remove() {
+        TagMap.Entry firstEntry = TagMap.Entry.newIntEntry("first", 0xDD06);
+        TagMap.Entry secondEntry = TagMap.Entry.newObjectEntry("second", "quux");
 
-    int firstHash = firstEntry.hash();
-    int secondHash = secondEntry.hash();
+        int firstHash = firstEntry.hash();
+        int secondHash = secondEntry.hash();
 
-    TagMap.BucketGroup group =
-        new TagMap.BucketGroup(
-            firstHash, firstEntry,
-            secondHash, secondEntry);
+        TagMap.BucketGroup group = new TagMap.BucketGroup(
+                firstHash, firstEntry,
+                secondHash, secondEntry);
 
-    assertFalse(group._isEmpty());
+        assertFalse(group._isEmpty());
 
-    assertContainsDirectly(firstEntry, group);
-    assertContainsDirectly(secondEntry, group);
+        assertContainsDirectly(firstEntry, group);
+        assertContainsDirectly(secondEntry, group);
 
-    assertSame(firstEntry, group._remove(firstHash, "first"));
+        assertSame(firstEntry, group._remove(firstHash, "first"));
 
-    assertDoesntContainDirectly(firstEntry, group);
-    assertContainsDirectly(secondEntry, group);
-    assertFalse(group._isEmpty());
+        assertDoesntContainDirectly(firstEntry, group);
+        assertContainsDirectly(secondEntry, group);
+        assertFalse(group._isEmpty());
 
-    assertSame(secondEntry, group._remove(secondHash, "second"));
-    assertDoesntContainDirectly(secondEntry, group);
+        assertSame(secondEntry, group._remove(secondHash, "second"));
+        assertDoesntContainDirectly(secondEntry, group);
 
-    assertTrue(group._isEmpty());
-  }
+        assertTrue(group._isEmpty());
+    }
 
-  @Test
-  public void groupChaining() {
-    int startingIndex = 10;
-    TagMap.BucketGroup firstGroup = fullGroup(startingIndex);
+    @Test
+    public void groupChaining() {
+        int startingIndex = 10;
+        TagMap.BucketGroup firstGroup = fullGroup(startingIndex);
 
-    for (int offset = 0; offset < TagMap.BucketGroup.LEN; ++offset) {
-      assertChainContainsTag(tag(startingIndex + offset), firstGroup);
-    }
+        for (int offset = 0; offset < TagMap.BucketGroup.LEN; ++offset) {
+            assertChainContainsTag(tag(startingIndex + offset), firstGroup);
+        }
 
-    TagMap.Entry newEntry = TagMap.Entry.newObjectEntry("new", "new");
-    int newHash = newEntry.hash();
+        TagMap.Entry newEntry = TagMap.Entry.newObjectEntry("new", "new");
+        int newHash = newEntry.hash();
 
-    // This is a test of the process used by TagMap#put
-    assertNull(firstGroup._replace(newHash, newEntry));
-    assertFalse(firstGroup._insert(newHash, newEntry));
-    assertDoesntContainDirectly(newEntry, firstGroup);
+        // This is a test of the process used by TagMap#put
+        assertNull(firstGroup._replace(newHash, newEntry));
+        assertFalse(firstGroup._insert(newHash, newEntry));
+        assertDoesntContainDirectly(newEntry, firstGroup);
 
-    TagMap.BucketGroup newHeadGroup = new TagMap.BucketGroup(newHash, newEntry, firstGroup);
-    assertContainsDirectly(newEntry, newHeadGroup);
-    assertSame(firstGroup, newHeadGroup.prev);
+        TagMap.BucketGroup newHeadGroup = new TagMap.BucketGroup(newHash, newEntry, firstGroup);
+        assertContainsDirectly(newEntry, newHeadGroup);
+        assertSame(firstGroup, newHeadGroup.prev);
 
-    assertChainContainsTag("new", newHeadGroup);
-    for (int offset = 0; offset < TagMap.BucketGroup.LEN; ++offset) {
-      assertChainContainsTag(tag(startingIndex + offset), newHeadGroup);
+        assertChainContainsTag("new", newHeadGroup);
+        for (int offset = 0; offset < TagMap.BucketGroup.LEN; ++offset) {
+            assertChainContainsTag(tag(startingIndex + offset), newHeadGroup);
+        }
     }
-  }
 
-  @Test
-  public void removeInChain() {
-    TagMap.BucketGroup firstGroup = fullGroup(10);
-    TagMap.BucketGroup headGroup = fullGroup(20, firstGroup);
+    @Test
+    public void removeInChain() {
+        TagMap.BucketGroup firstGroup = fullGroup(10);
+        TagMap.BucketGroup headGroup = fullGroup(20, firstGroup);
 
-    for (int offset = 0; offset < TagMap.BucketGroup.LEN; ++offset) {
-      assertChainContainsTag(tag(10, offset), headGroup);
-      assertChainContainsTag(tag(20, offset), headGroup);
-    }
+        for (int offset = 0; offset < TagMap.BucketGroup.LEN; ++offset) {
+            assertChainContainsTag(tag(10, offset), headGroup);
+            assertChainContainsTag(tag(20, offset), headGroup);
+        }
 
-    assertEquals(TagMap.BucketGroup.LEN * 2, headGroup.sizeInChain());
+        assertEquals(TagMap.BucketGroup.LEN * 2, headGroup.sizeInChain());
 
-    String firstRemovedTag = tag(10, 1);
-    int firstRemovedHash = TagMap.Entry._hash(firstRemovedTag);
+        String firstRemovedTag = tag(10, 1);
+        int firstRemovedHash = TagMap.Entry._hash(firstRemovedTag);
 
-    TagMap.BucketGroup firstContainingGroup =
-        headGroup.findContainingGroupInChain(firstRemovedHash, firstRemovedTag);
-    assertSame(firstContainingGroup, firstGroup);
-    assertNotNull(firstContainingGroup._remove(firstRemovedHash, firstRemovedTag));
+        TagMap.BucketGroup firstContainingGroup =
+                headGroup.findContainingGroupInChain(firstRemovedHash, firstRemovedTag);
+        assertSame(firstContainingGroup, firstGroup);
+        assertNotNull(firstContainingGroup._remove(firstRemovedHash, firstRemovedTag));
 
-    assertChainDoesntContainTag(firstRemovedTag, headGroup);
+        assertChainDoesntContainTag(firstRemovedTag, headGroup);
 
-    assertEquals(TagMap.BucketGroup.LEN * 2 - 1, headGroup.sizeInChain());
+        assertEquals(TagMap.BucketGroup.LEN * 2 - 1, headGroup.sizeInChain());
 
-    String secondRemovedTag = tag(20, 2);
-    int secondRemovedHash = TagMap.Entry._hash(secondRemovedTag);
+        String secondRemovedTag = tag(20, 2);
+        int secondRemovedHash = TagMap.Entry._hash(secondRemovedTag);
 
-    TagMap.BucketGroup secondContainingGroup =
-        headGroup.findContainingGroupInChain(secondRemovedHash, secondRemovedTag);
-    assertSame(secondContainingGroup, headGroup);
-    assertNotNull(secondContainingGroup._remove(secondRemovedHash, secondRemovedTag));
+        TagMap.BucketGroup secondContainingGroup =
+                headGroup.findContainingGroupInChain(secondRemovedHash, secondRemovedTag);
+        assertSame(secondContainingGroup, headGroup);
+        assertNotNull(secondContainingGroup._remove(secondRemovedHash, secondRemovedTag));
 
-    assertChainDoesntContainTag(secondRemovedTag, headGroup);
+        assertChainDoesntContainTag(secondRemovedTag, headGroup);
 
-    assertEquals(TagMap.BucketGroup.LEN * 2 - 2, headGroup.sizeInChain());
-  }
+        assertEquals(TagMap.BucketGroup.LEN * 2 - 2, headGroup.sizeInChain());
+    }
 
-  @Test
-  public void replaceInChain() {
-    TagMap.BucketGroup firstGroup = fullGroup(10);
-    TagMap.BucketGroup headGroup = fullGroup(20, firstGroup);
+    @Test
+    public void replaceInChain() {
+        TagMap.BucketGroup firstGroup = fullGroup(10);
+        TagMap.BucketGroup headGroup = fullGroup(20, firstGroup);
 
-    assertEquals(TagMap.BucketGroup.LEN * 2, headGroup.sizeInChain());
+        assertEquals(TagMap.BucketGroup.LEN * 2, headGroup.sizeInChain());
 
-    TagMap.Entry firstReplacementEntry = TagMap.Entry.newObjectEntry(tag(10, 1), "replaced");
-    assertNotNull(headGroup.replaceInChain(firstReplacementEntry.hash(), firstReplacementEntry));
+        TagMap.Entry firstReplacementEntry = TagMap.Entry.newObjectEntry(tag(10, 1), "replaced");
+        assertNotNull(headGroup.replaceInChain(firstReplacementEntry.hash(), firstReplacementEntry));
 
-    assertEquals(TagMap.BucketGroup.LEN * 2, headGroup.sizeInChain());
+        assertEquals(TagMap.BucketGroup.LEN * 2, headGroup.sizeInChain());
 
-    TagMap.Entry secondReplacementEntry = TagMap.Entry.newObjectEntry(tag(20, 2), "replaced");
-    assertNotNull(headGroup.replaceInChain(secondReplacementEntry.hash(), secondReplacementEntry));
+        TagMap.Entry secondReplacementEntry = TagMap.Entry.newObjectEntry(tag(20, 2), "replaced");
+        assertNotNull(headGroup.replaceInChain(secondReplacementEntry.hash(), secondReplacementEntry));
 
-    assertEquals(TagMap.BucketGroup.LEN * 2, headGroup.sizeInChain());
-  }
+        assertEquals(TagMap.BucketGroup.LEN * 2, headGroup.sizeInChain());
+    }
 
-  @Test
-  public void insertInChain() {
-    // set-up a chain with some gaps in it
-    TagMap.BucketGroup firstGroup = fullGroup(10);
-    TagMap.BucketGroup headGroup = fullGroup(20, firstGroup);
+    @Test
+    public void insertInChain() {
+        // set-up a chain with some gaps in it
+        TagMap.BucketGroup firstGroup = fullGroup(10);
+        TagMap.BucketGroup headGroup = fullGroup(20, firstGroup);
 
-    assertEquals(TagMap.BucketGroup.LEN * 2, headGroup.sizeInChain());
+        assertEquals(TagMap.BucketGroup.LEN * 2, headGroup.sizeInChain());
 
-    String firstHoleTag = tag(10, 1);
-    int firstHoleHash = TagMap.Entry._hash(firstHoleTag);
-    firstGroup._remove(firstHoleHash, firstHoleTag);
+        String firstHoleTag = tag(10, 1);
+        int firstHoleHash = TagMap.Entry._hash(firstHoleTag);
+        firstGroup._remove(firstHoleHash, firstHoleTag);
 
-    String secondHoleTag = tag(20, 2);
-    int secondHoleHash = TagMap.Entry._hash(secondHoleTag);
-    headGroup._remove(secondHoleHash, secondHoleTag);
+        String secondHoleTag = tag(20, 2);
+        int secondHoleHash = TagMap.Entry._hash(secondHoleTag);
+        headGroup._remove(secondHoleHash, secondHoleTag);
 
-    assertEquals(TagMap.BucketGroup.LEN * 2 - 2, headGroup.sizeInChain());
+        assertEquals(TagMap.BucketGroup.LEN * 2 - 2, headGroup.sizeInChain());
 
-    String firstNewTag = "new-tag-0";
-    TagMap.Entry firstNewEntry = TagMap.Entry.newObjectEntry(firstNewTag, "new");
-    int firstNewHash = firstNewEntry.hash();
+        String firstNewTag = "new-tag-0";
+        TagMap.Entry firstNewEntry = TagMap.Entry.newObjectEntry(firstNewTag, "new");
+        int firstNewHash = firstNewEntry.hash();
 
-    assertTrue(headGroup.insertInChain(firstNewHash, firstNewEntry));
-    assertChainContainsTag(firstNewTag, headGroup);
+        assertTrue(headGroup.insertInChain(firstNewHash, firstNewEntry));
+        assertChainContainsTag(firstNewTag, headGroup);
 
-    String secondNewTag = "new-tag-1";
-    TagMap.Entry secondNewEntry = TagMap.Entry.newObjectEntry(secondNewTag, "new");
-    int secondNewHash = secondNewEntry.hash();
+        String secondNewTag = "new-tag-1";
+        TagMap.Entry secondNewEntry = TagMap.Entry.newObjectEntry(secondNewTag, "new");
+        int secondNewHash = secondNewEntry.hash();
 
-    assertTrue(headGroup.insertInChain(secondNewHash, secondNewEntry));
-    assertChainContainsTag(secondNewTag, headGroup);
+        assertTrue(headGroup.insertInChain(secondNewHash, secondNewEntry));
+        assertChainContainsTag(secondNewTag, headGroup);
 
-    String thirdNewTag = "new-tag-2";
-    TagMap.Entry thirdNewEntry = TagMap.Entry.newObjectEntry(secondNewTag, "new");
-    int thirdNewHash = secondNewEntry.hash();
+        String thirdNewTag = "new-tag-2";
+        TagMap.Entry thirdNewEntry = TagMap.Entry.newObjectEntry(secondNewTag, "new");
+        int thirdNewHash = secondNewEntry.hash();
 
-    assertFalse(headGroup.insertInChain(thirdNewHash, thirdNewEntry));
-    assertChainDoesntContainTag(thirdNewTag, headGroup);
+        assertFalse(headGroup.insertInChain(thirdNewHash, thirdNewEntry));
+        assertChainDoesntContainTag(thirdNewTag, headGroup);
+
+        assertEquals(TagMap.BucketGroup.LEN * 2, headGroup.sizeInChain());
+    }
 
-    assertEquals(TagMap.BucketGroup.LEN * 2, headGroup.sizeInChain());
-  }
+    @Test
+    public void cloneChain() {
+        TagMap.BucketGroup firstGroup = fullGroup(10);
+        TagMap.BucketGroup secondGroup = fullGroup(20, firstGroup);
+        TagMap.BucketGroup headGroup = fullGroup(30, secondGroup);
 
-  @Test
-  public void cloneChain() {
-    TagMap.BucketGroup firstGroup = fullGroup(10);
-    TagMap.BucketGroup secondGroup = fullGroup(20, firstGroup);
-    TagMap.BucketGroup headGroup = fullGroup(30, secondGroup);
+        TagMap.BucketGroup clonedHeadGroup = headGroup.cloneChain();
+        TagMap.BucketGroup clonedSecondGroup = clonedHeadGroup.prev;
+        TagMap.BucketGroup clonedFirstGroup = clonedSecondGroup.prev;
 
-    TagMap.BucketGroup clonedHeadGroup = headGroup.cloneChain();
-    TagMap.BucketGroup clonedSecondGroup = clonedHeadGroup.prev;
-    TagMap.BucketGroup clonedFirstGroup = clonedSecondGroup.prev;
+        assertGroupContentsStrictEquals(headGroup, clonedHeadGroup);
+        assertGroupContentsStrictEquals(secondGroup, clonedSecondGroup);
+        assertGroupContentsStrictEquals(firstGroup, clonedFirstGroup);
+    }
 
-    assertGroupContentsStrictEquals(headGroup, clonedHeadGroup);
-    assertGroupContentsStrictEquals(secondGroup, clonedSecondGroup);
-    assertGroupContentsStrictEquals(firstGroup, clonedFirstGroup);
-  }
+    @Test
+    public void removeGroupInChain() {
+        TagMap.BucketGroup tailGroup = fullGroup(10);
+        TagMap.BucketGroup secondGroup = fullGroup(20, tailGroup);
+        TagMap.BucketGroup thirdGroup = fullGroup(30, secondGroup);
+        TagMap.BucketGroup fourthGroup = fullGroup(40, thirdGroup);
+        TagMap.BucketGroup headGroup = fullGroup(50, fourthGroup);
+        assertChain(headGroup, fourthGroup, thirdGroup, secondGroup, tailGroup);
 
-  @Test
-  public void removeGroupInChain() {
-    TagMap.BucketGroup tailGroup = fullGroup(10);
-    TagMap.BucketGroup secondGroup = fullGroup(20, tailGroup);
-    TagMap.BucketGroup thirdGroup = fullGroup(30, secondGroup);
-    TagMap.BucketGroup fourthGroup = fullGroup(40, thirdGroup);
-    TagMap.BucketGroup headGroup = fullGroup(50, fourthGroup);
-    assertChain(headGroup, fourthGroup, thirdGroup, secondGroup, tailGroup);
+        // need to test group removal - at head, middle, and tail of the chain
 
-    // need to test group removal - at head, middle, and tail of the chain
+        // middle
+        assertSame(headGroup, headGroup.removeGroupInChain(thirdGroup));
+        assertChain(headGroup, fourthGroup, secondGroup, tailGroup);
 
-    // middle
-    assertSame(headGroup, headGroup.removeGroupInChain(thirdGroup));
-    assertChain(headGroup, fourthGroup, secondGroup, tailGroup);
+        // tail
+        assertSame(headGroup, headGroup.removeGroupInChain(tailGroup));
+        assertChain(headGroup, fourthGroup, secondGroup);
 
-    // tail
-    assertSame(headGroup, headGroup.removeGroupInChain(tailGroup));
-    assertChain(headGroup, fourthGroup, secondGroup);
+        // head
+        assertSame(fourthGroup, headGroup.removeGroupInChain(headGroup));
+        assertChain(fourthGroup, secondGroup);
+    }
 
-    // head
-    assertSame(fourthGroup, headGroup.removeGroupInChain(headGroup));
-    assertChain(fourthGroup, secondGroup);
-  }
+    static final TagMap.BucketGroup fullGroup(int startingIndex) {
+        TagMap.Entry firstEntry = TagMap.Entry.newObjectEntry(tag(startingIndex), value(startingIndex));
+        TagMap.Entry secondEntry = TagMap.Entry.newObjectEntry(tag(startingIndex + 1), value(startingIndex + 1));
+
+        TagMap.BucketGroup group =
+                new TagMap.BucketGroup(firstEntry.hash(), firstEntry, secondEntry.hash(), secondEntry);
+        for (int offset = 2; offset < TagMap.BucketGroup.LEN; ++offset) {
+            TagMap.Entry anotherEntry =
+                    TagMap.Entry.newObjectEntry(tag(startingIndex + offset), value(startingIndex + offset));
+            group._insert(anotherEntry.hash(), anotherEntry);
+        }
+        return group;
+    }
 
-  static final TagMap.BucketGroup fullGroup(int startingIndex) {
-    TagMap.Entry firstEntry = TagMap.Entry.newObjectEntry(tag(startingIndex), value(startingIndex));
-    TagMap.Entry secondEntry =
-        TagMap.Entry.newObjectEntry(tag(startingIndex + 1), value(startingIndex + 1));
+    static final TagMap.BucketGroup fullGroup(int startingIndex, TagMap.BucketGroup prev) {
+        TagMap.BucketGroup group = fullGroup(startingIndex);
+        group.prev = prev;
+        return group;
+    }
 
-    TagMap.BucketGroup group =
-        new TagMap.BucketGroup(firstEntry.hash(), firstEntry, secondEntry.hash(), secondEntry);
-    for (int offset = 2; offset < TagMap.BucketGroup.LEN; ++offset) {
-      TagMap.Entry anotherEntry =
-          TagMap.Entry.newObjectEntry(tag(startingIndex + offset), value(startingIndex + offset));
-      group._insert(anotherEntry.hash(), anotherEntry);
+    static final String tag(int startingIndex, int offset) {
+        return tag(startingIndex + offset);
     }
-    return group;
-  }
 
-  static final TagMap.BucketGroup fullGroup(int startingIndex, TagMap.BucketGroup prev) {
-    TagMap.BucketGroup group = fullGroup(startingIndex);
-    group.prev = prev;
-    return group;
-  }
+    static final String tag(int i) {
+        return "tag-" + i;
+    }
 
-  static final String tag(int startingIndex, int offset) {
-    return tag(startingIndex + offset);
-  }
+    static final String value(int i) {
+        return "value-" + i;
+    }
 
-  static final String tag(int i) {
-    return "tag-" + i;
-  }
+    static void assertContainsDirectly(TagMap.Entry entry, TagMap.BucketGroup group) {
+        int hash = entry.hash();
+        String tag = entry.tag();
 
-  static final String value(int i) {
-    return "value-" + i;
-  }
+        assertSame(entry, group._find(hash, tag));
 
-  static void assertContainsDirectly(TagMap.Entry entry, TagMap.BucketGroup group) {
-    int hash = entry.hash();
-    String tag = entry.tag();
+        assertSame(entry, group.findInChain(hash, tag));
+        assertSame(group, group.findContainingGroupInChain(hash, tag));
+    }
 
-    assertSame(entry, group._find(hash, tag));
+    static void assertDoesntContainDirectly(TagMap.Entry entry, TagMap.BucketGroup group) {
+        for (int i = 0; i < TagMap.BucketGroup.LEN; ++i) {
+            assertNotSame(entry, group._entryAt(i));
+        }
+    }
 
-    assertSame(entry, group.findInChain(hash, tag));
-    assertSame(group, group.findContainingGroupInChain(hash, tag));
-  }
+    static void assertChainContainsTag(String tag, TagMap.BucketGroup group) {
+        int hash = TagMap.Entry._hash(tag);
+        assertNotNull(group.findInChain(hash, tag));
+    }
 
-  static void assertDoesntContainDirectly(TagMap.Entry entry, TagMap.BucketGroup group) {
-    for (int i = 0; i < TagMap.BucketGroup.LEN; ++i) {
-      assertNotSame(entry, group._entryAt(i));
+    static void assertChainDoesntContainTag(String tag, TagMap.BucketGroup group) {
+        int hash = TagMap.Entry._hash(tag);
+        assertNull(group.findInChain(hash, tag));
     }
-  }
-
-  static void assertChainContainsTag(String tag, TagMap.BucketGroup group) {
-    int hash = TagMap.Entry._hash(tag);
-    assertNotNull(group.findInChain(hash, tag));
-  }
-
-  static void assertChainDoesntContainTag(String tag, TagMap.BucketGroup group) {
-    int hash = TagMap.Entry._hash(tag);
-    assertNull(group.findInChain(hash, tag));
-  }
-
-  static void assertGroupContentsStrictEquals(
-      TagMap.BucketGroup expected, TagMap.BucketGroup actual) {
-    for (int i = 0; i < TagMap.BucketGroup.LEN; ++i) {
-      assertEquals(expected._hashAt(i), actual._hashAt(i));
-      assertSame(expected._entryAt(i), actual._entryAt(i));
+
+    static void assertGroupContentsStrictEquals(TagMap.BucketGroup expected, TagMap.BucketGroup actual) {
+        for (int i = 0; i < TagMap.BucketGroup.LEN; ++i) {
+            assertEquals(expected._hashAt(i), actual._hashAt(i));
+            assertSame(expected._entryAt(i), actual._entryAt(i));
+        }
     }
-  }
 
-  static void assertChain(TagMap.BucketGroup... chain) {
-    TagMap.BucketGroup cur;
-    int index;
-    for (cur = chain[0], index = 0; cur != null; cur = cur.prev, ++index) {
-      assertSame(chain[index], cur);
+    static void assertChain(TagMap.BucketGroup... chain) {
+        TagMap.BucketGroup cur;
+        int index;
+        for (cur = chain[0], index = 0; cur != null; cur = cur.prev, ++index) {
+            assertSame(chain[index], cur);
+        }
+        assertEquals(chain.length, index);
     }
-    assertEquals(chain.length, index);
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/TagMapEntryTest.java b/internal-api/src/test/java/datadog/trace/api/TagMapEntryTest.java
index e7c483e80ec..13a04687f4e 100644
--- a/internal-api/src/test/java/datadog/trace/api/TagMapEntryTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/TagMapEntryTest.java
@@ -37,983 +37,904 @@
  * @author dougqh
  */
 public class TagMapEntryTest {
-  @Test
-  public void isNumericPrimitive() {
-    assertFalse(TagMap.Entry._isNumericPrimitive(TagMap.Entry.ANY));
-    assertFalse(TagMap.Entry._isNumericPrimitive(TagMap.Entry.BOOLEAN));
-    assertFalse(TagMap.Entry._isNumericPrimitive(TagMap.Entry.CHAR_RESERVED));
-    assertFalse(TagMap.Entry._isNumericPrimitive(TagMap.Entry.OBJECT));
-
-    assertTrue(TagMap.Entry._isNumericPrimitive(TagMap.Entry.BYTE_RESERVED));
-    assertTrue(TagMap.Entry._isNumericPrimitive(TagMap.Entry.SHORT_RESERVED));
-    assertTrue(TagMap.Entry._isNumericPrimitive(TagMap.Entry.INT));
-    assertTrue(TagMap.Entry._isNumericPrimitive(TagMap.Entry.LONG));
-    assertTrue(TagMap.Entry._isNumericPrimitive(TagMap.Entry.FLOAT));
-    assertTrue(TagMap.Entry._isNumericPrimitive(TagMap.Entry.DOUBLE));
-  }
-
-  @Test
-  @DisplayName("TagMap.Entry.create: Object")
-  public void createObject() {
-    Map<String, String> map = new HashMap<>();
-
-    test(
-        () -> TagMap.Entry.create("foo", map),
-        TagMap.Entry.ANY,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(map, entry),
-                checkTrue(entry::isObject),
-                checkFalse(entry::isNumber),
-                checkType(TagMap.Entry.OBJECT, entry)));
-  }
-
-  @Test
-  @DisplayName("TagMap.Entry.create: null Object")
-  public void createEntryNullObject() {
-    assertNull(TagMap.Entry.create("foo", null));
-  }
-
-  @Test
-  @DisplayName("TagMap.Entry.create: CharSequence")
-  public void createCharSequence() {
-    test(
-        () -> TagMap.Entry.create("foo", "bar"),
-        TagMap.Entry.OBJECT,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue("bar", entry),
-                checkEquals("bar", entry::stringValue),
-                checkFalse(entry::isNumber),
-                checkTrue(entry::isObject),
-                checkType(TagMap.Entry.OBJECT, entry)));
-  }
-
-  @Test
-  @DisplayName("TagMap.Entry.create: null CharSequence")
-  public void createNullCharSequence() {
-    assertNull(TagMap.Entry.create("foo", (String) null));
-  }
-
-  @Test
-  @DisplayName("TagMap.Entry.create: empty CharSequence")
-  public void createEmptyCharSequence() {
-    assertNull(TagMap.Entry.create("foo", ""));
-  }
-
-  @Test
-  public void newObjectEntry() {
-    test(
-        () -> TagMap.Entry.newObjectEntry("foo", "bar"),
-        TagMap.Entry.OBJECT,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue("bar", entry),
-                checkEquals("bar", entry::stringValue),
-                checkFalse(entry::isNumber),
-                checkTrue(entry::isObject),
-                checkType(TagMap.Entry.OBJECT, entry)));
-  }
-
-  @Test
-  @DisplayName("newAnyEntry: Object")
-  public void anyEntryObject() {
-    test(
-        () -> TagMap.Entry.newAnyEntry("foo", "bar"),
-        TagMap.Entry.ANY,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue("bar", entry),
-                checkTrue(entry::isObject),
-                checkFalse(entry::isNumber),
-                checkType(TagMap.EntryReader.OBJECT, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("TagMap.Entry.create: boolean")
-  @ValueSource(booleans = {false, true})
-  public void createBoolean(boolean value) {
-    test(
-        () -> TagMap.Entry.create("foo", value),
-        TagMap.Entry.BOOLEAN,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkFalse(entry::isNumericPrimitive),
-                checkFalse(entry::isNumber),
-                checkFalse(entry::isObject),
-                checkType(TagMap.Entry.BOOLEAN, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("newBooleanEntry: boolean")
-  @ValueSource(booleans = {false, true})
-  public void newBooleanEntry(boolean value) {
-    test(
-        () -> TagMap.Entry.create("foo", value),
-        TagMap.Entry.BOOLEAN,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkFalse(entry::isNumericPrimitive),
-                checkFalse(entry::isNumber),
-                checkFalse(entry::isObject),
-                checkType(TagMap.Entry.BOOLEAN, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("newBooleanEntry: Boolean")
-  @ValueSource(booleans = {false, true})
-  public void newBooleanEntryBoxed(boolean value) {
-    test(
-        () -> TagMap.Entry.newBooleanEntry("foo", Boolean.valueOf(value)),
-        TagMap.Entry.BOOLEAN,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkFalse(entry::isNumericPrimitive),
-                checkFalse(entry::isNumber),
-                checkFalse(entry::isObject),
-                checkType(TagMap.Entry.BOOLEAN, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("newAnyEntry: Boolean")
-  @ValueSource(booleans = {false, true})
-  public void newAnyEntryBoolean(boolean value) {
-    test(
-        () -> TagMap.Entry.newAnyEntry("foo", Boolean.valueOf(value)),
-        TagMap.Entry.ANY,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkFalse(entry::isNumericPrimitive),
-                checkFalse(entry::isNumber),
-                checkFalse(entry::isObject),
-                checkType(TagMap.Entry.BOOLEAN, entry),
-                checkValue(value, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("TagMap.Entry.create: int")
-  @ValueSource(ints = {Integer.MIN_VALUE, -256, -128, -1, 0, 1, 128, 256, Integer.MAX_VALUE})
-  public void createInt(int value) {
-    test(
-        () -> TagMap.Entry.create("foo", value),
-        TagMap.Entry.INT,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkIsNumericPrimitive(entry),
-                checkInstanceOf(Number.class, entry),
-                checkType(TagMap.Entry.INT, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("newIntEntry: int")
-  @ValueSource(ints = {Integer.MIN_VALUE, -256, -128, -1, 0, 1, 128, 256, Integer.MAX_VALUE})
-  public void newIntEntry(int value) {
-    test(
-        () -> TagMap.Entry.newIntEntry("foo", value),
-        TagMap.Entry.INT,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkIsNumericPrimitive(entry),
-                checkInstanceOf(Number.class, entry),
-                checkType(TagMap.Entry.INT, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("newIntEntry: Integer")
-  @ValueSource(ints = {Integer.MIN_VALUE, -256, -128, -1, 0, 1, 128, 256, Integer.MAX_VALUE})
-  public void newIntEntryBoxed(int value) {
-    test(
-        () -> TagMap.Entry.newIntEntry("foo", Integer.valueOf(value)),
-        TagMap.Entry.INT,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkIsNumericPrimitive(entry),
-                checkInstanceOf(Number.class, entry),
-                checkType(TagMap.Entry.INT, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("newIntEntry: Short")
-  @ValueSource(shorts = {Short.MIN_VALUE, -256, -128, -1, 0, 1, 128, 256, Short.MAX_VALUE})
-  public void newIntEntryBoxedShort(short value) {
-    test(
-        () -> TagMap.Entry.newIntEntry("foo", Short.valueOf(value)),
-        TagMap.Entry.INT,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkIsNumericPrimitive(entry),
-                checkInstanceOf(Number.class, entry),
-                checkType(TagMap.Entry.INT, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("newIntEntry: Byte")
-  @ValueSource(bytes = {Byte.MIN_VALUE, -32, -1, 0, 1, 32, Byte.MAX_VALUE})
-  public void newIntEntryBoxedByte(byte value) {
-    test(
-        () -> TagMap.Entry.newIntEntry("foo", Byte.valueOf(value)),
-        TagMap.Entry.INT,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkIsNumericPrimitive(entry),
-                checkInstanceOf(Number.class, entry),
-                checkType(TagMap.Entry.INT, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("newAnyEntry: Integer")
-  @ValueSource(ints = {Integer.MIN_VALUE, -256, -128, -1, 0, 1, 128, 256, Integer.MAX_VALUE})
-  public void newAnyEntryInteger(int value) {
-    test(
-        () -> TagMap.Entry.newAnyEntry("foo", Integer.valueOf(value)),
-        TagMap.Entry.ANY,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkIsNumericPrimitive(entry),
-                checkInstanceOf(Number.class, entry),
-                checkType(TagMap.Entry.INT, entry),
-                checkValue(value, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("TagMap.Entry.create: long")
-  @ValueSource(
-      longs = {
-        Long.MIN_VALUE,
-        Integer.MIN_VALUE,
-        -1_048_576L,
-        -256L,
-        -128L,
-        -1L,
-        0L,
-        1L,
-        128L,
-        256L,
-        1_048_576L,
-        Integer.MAX_VALUE,
-        Long.MAX_VALUE
-      })
-  public void createLong(long value) {
-    test(
-        () -> TagMap.Entry.create("foo", value),
-        TagMap.Entry.LONG,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkTrue(entry::isNumericPrimitive),
-                checkType(TagMap.Entry.LONG, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("newLongEntry: long")
-  @ValueSource(
-      longs = {
-        Long.MIN_VALUE,
-        Integer.MIN_VALUE,
-        -1_048_576L,
-        -256L,
-        -128L,
-        -1L,
-        0L,
-        1L,
-        128L,
-        256L,
-        1_048_576L,
-        Integer.MAX_VALUE,
-        Long.MAX_VALUE
-      })
-  public void newLongEntry(long value) {
-    test(
-        () -> TagMap.Entry.newLongEntry("foo", value),
-        TagMap.Entry.LONG,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkTrue(entry::isNumericPrimitive),
-                checkType(TagMap.Entry.LONG, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("newLongEntry: Long")
-  @ValueSource(
-      longs = {
-        Long.MIN_VALUE,
-        Integer.MIN_VALUE,
-        -1_048_576L,
-        -256L,
-        -128L,
-        -1L,
-        0L,
-        1L,
-        128L,
-        256L,
-        1_048_576L,
-        Integer.MAX_VALUE,
-        Long.MAX_VALUE
-      })
-  public void newLongEntryBoxed(long value) {
-    test(
-        () -> TagMap.Entry.newLongEntry("foo", Long.valueOf(value)),
-        TagMap.Entry.LONG,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkIsNumericPrimitive(entry),
-                checkType(TagMap.Entry.LONG, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("newAnyEntry: Long")
-  @ValueSource(
-      longs = {
-        Long.MIN_VALUE,
-        Integer.MIN_VALUE,
-        -1_048_576L,
-        -256L,
-        -128L,
-        -1L,
-        0L,
-        1L,
-        128L,
-        256L,
-        1_048_576L,
-        Integer.MAX_VALUE,
-        Long.MAX_VALUE
-      })
-  public void newAnyEntryLong(long value) {
-    test(
-        () -> TagMap.Entry.newAnyEntry("foo", Long.valueOf(value)),
-        TagMap.Entry.ANY,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkIsNumericPrimitive(entry),
-                checkTrue(() -> entry.is(TagMap.Entry.LONG)),
-                checkValue(value, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("TagMap.Entry.create: float")
-  @ValueSource(floats = {Float.MIN_VALUE, -1F, 0F, 1F, 2.171828F, 3.1415F, Float.MAX_VALUE})
-  public void createFloat(float value) {
-    test(
-        () -> TagMap.Entry.create("foo", value),
-        TagMap.Entry.FLOAT,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkTrue(entry::isNumericPrimitive),
-                checkType(TagMap.Entry.FLOAT, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("newFloatEntry: float")
-  @ValueSource(floats = {Float.MIN_VALUE, -1F, 0F, 1F, 2.171828F, 3.1415F, Float.MAX_VALUE})
-  public void newFloatEntry(float value) {
-    test(
-        () -> TagMap.Entry.newFloatEntry("foo", value),
-        TagMap.Entry.FLOAT,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkTrue(entry::isNumericPrimitive),
-                checkType(TagMap.Entry.FLOAT, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("newFloatEntry: Float")
-  @ValueSource(floats = {Float.MIN_VALUE, -1F, 0F, 1F, 2.171828F, 3.1415F, Float.MAX_VALUE})
-  public void newFloatEntryBoxed(float value) {
-    test(
-        () -> TagMap.Entry.newFloatEntry("foo", Float.valueOf(value)),
-        TagMap.Entry.FLOAT,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkIsNumericPrimitive(entry),
-                checkType(TagMap.Entry.FLOAT, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("newAnyEntry: Float")
-  @ValueSource(floats = {Float.MIN_VALUE, -1F, 0F, 1F, 2.171828F, 3.1415F, Float.MAX_VALUE})
-  public void newAnyEntryFloat(float value) {
-    test(
-        () -> TagMap.Entry.newAnyEntry("foo", Float.valueOf(value)),
-        TagMap.Entry.ANY,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkTrue(entry::isNumericPrimitive),
-                checkType(TagMap.Entry.FLOAT, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("TagMap.Entry.create: double")
-  @ValueSource(
-      doubles = {Double.MIN_VALUE, Float.MIN_VALUE, -1D, 0D, 1D, Math.E, Math.PI, Double.MAX_VALUE})
-  public void createDouble(double value) {
-    test(
-        () -> TagMap.Entry.create("foo", value),
-        TagMap.Entry.DOUBLE,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkIsNumericPrimitive(entry),
-                checkType(TagMap.Entry.DOUBLE, entry)));
-  }
-
-  @ParameterizedTest
-  @ValueSource(
-      doubles = {Double.MIN_VALUE, Float.MIN_VALUE, -1D, 0D, 1D, Math.E, Math.PI, Double.MAX_VALUE})
-  public void newDoubleEntry(double value) {
-    test(
-        () -> TagMap.Entry.newDoubleEntry("foo", value),
-        TagMap.Entry.DOUBLE,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkIsNumericPrimitive(entry),
-                checkType(TagMap.Entry.DOUBLE, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("newDoubleEntry: Double")
-  @ValueSource(
-      doubles = {Double.MIN_VALUE, Float.MIN_VALUE, -1D, 0D, 1D, Math.E, Math.PI, Double.MAX_VALUE})
-  public void newDoubleEntryBoxed(double value) {
-    test(
-        () -> TagMap.Entry.newDoubleEntry("foo", Double.valueOf(value)),
-        TagMap.Entry.DOUBLE,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkTrue(entry::isNumericPrimitive),
-                checkType(TagMap.Entry.DOUBLE, entry)));
-  }
-
-  @ParameterizedTest
-  @DisplayName("newAnyEntry: Double")
-  @ValueSource(
-      doubles = {Double.MIN_VALUE, Float.MIN_VALUE, -1D, 0D, 1D, Math.E, Math.PI, Double.MAX_VALUE})
-  public void newAnyEntryDouble(double value) {
-    test(
-        () -> TagMap.Entry.newAnyEntry("foo", Double.valueOf(value)),
-        TagMap.Entry.ANY,
-        (entry) ->
-            multiCheck(
-                checkKey("foo", entry),
-                checkValue(value, entry),
-                checkTrue(entry::isNumericPrimitive),
-                checkType(TagMap.Entry.DOUBLE, entry),
-                checkValue(value, entry)));
-  }
-
-  @Test
-  public void removalChange() {
-    TagMap.EntryChange removalChange = TagMap.EntryChange.newRemoval("foo");
-    assertTrue(removalChange.isRemoval());
-  }
-
-  static final int NUM_THREADS = 4;
-  static final ExecutorService EXECUTOR =
-      Executors.newFixedThreadPool(
-          NUM_THREADS,
-          new ThreadFactory() {
+    @Test
+    public void isNumericPrimitive() {
+        assertFalse(TagMap.Entry._isNumericPrimitive(TagMap.Entry.ANY));
+        assertFalse(TagMap.Entry._isNumericPrimitive(TagMap.Entry.BOOLEAN));
+        assertFalse(TagMap.Entry._isNumericPrimitive(TagMap.Entry.CHAR_RESERVED));
+        assertFalse(TagMap.Entry._isNumericPrimitive(TagMap.Entry.OBJECT));
+
+        assertTrue(TagMap.Entry._isNumericPrimitive(TagMap.Entry.BYTE_RESERVED));
+        assertTrue(TagMap.Entry._isNumericPrimitive(TagMap.Entry.SHORT_RESERVED));
+        assertTrue(TagMap.Entry._isNumericPrimitive(TagMap.Entry.INT));
+        assertTrue(TagMap.Entry._isNumericPrimitive(TagMap.Entry.LONG));
+        assertTrue(TagMap.Entry._isNumericPrimitive(TagMap.Entry.FLOAT));
+        assertTrue(TagMap.Entry._isNumericPrimitive(TagMap.Entry.DOUBLE));
+    }
+
+    @Test
+    @DisplayName("TagMap.Entry.create: Object")
+    public void createObject() {
+        Map<String, String> map = new HashMap<>();
+
+        test(
+                () -> TagMap.Entry.create("foo", map),
+                TagMap.Entry.ANY,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(map, entry),
+                        checkTrue(entry::isObject),
+                        checkFalse(entry::isNumber),
+                        checkType(TagMap.Entry.OBJECT, entry)));
+    }
+
+    @Test
+    @DisplayName("TagMap.Entry.create: null Object")
+    public void createEntryNullObject() {
+        assertNull(TagMap.Entry.create("foo", null));
+    }
+
+    @Test
+    @DisplayName("TagMap.Entry.create: CharSequence")
+    public void createCharSequence() {
+        test(
+                () -> TagMap.Entry.create("foo", "bar"),
+                TagMap.Entry.OBJECT,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue("bar", entry),
+                        checkEquals("bar", entry::stringValue),
+                        checkFalse(entry::isNumber),
+                        checkTrue(entry::isObject),
+                        checkType(TagMap.Entry.OBJECT, entry)));
+    }
+
+    @Test
+    @DisplayName("TagMap.Entry.create: null CharSequence")
+    public void createNullCharSequence() {
+        assertNull(TagMap.Entry.create("foo", (String) null));
+    }
+
+    @Test
+    @DisplayName("TagMap.Entry.create: empty CharSequence")
+    public void createEmptyCharSequence() {
+        assertNull(TagMap.Entry.create("foo", ""));
+    }
+
+    @Test
+    public void newObjectEntry() {
+        test(
+                () -> TagMap.Entry.newObjectEntry("foo", "bar"),
+                TagMap.Entry.OBJECT,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue("bar", entry),
+                        checkEquals("bar", entry::stringValue),
+                        checkFalse(entry::isNumber),
+                        checkTrue(entry::isObject),
+                        checkType(TagMap.Entry.OBJECT, entry)));
+    }
+
+    @Test
+    @DisplayName("newAnyEntry: Object")
+    public void anyEntryObject() {
+        test(
+                () -> TagMap.Entry.newAnyEntry("foo", "bar"),
+                TagMap.Entry.ANY,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue("bar", entry),
+                        checkTrue(entry::isObject),
+                        checkFalse(entry::isNumber),
+                        checkType(TagMap.EntryReader.OBJECT, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("TagMap.Entry.create: boolean")
+    @ValueSource(booleans = {false, true})
+    public void createBoolean(boolean value) {
+        test(
+                () -> TagMap.Entry.create("foo", value),
+                TagMap.Entry.BOOLEAN,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkFalse(entry::isNumericPrimitive),
+                        checkFalse(entry::isNumber),
+                        checkFalse(entry::isObject),
+                        checkType(TagMap.Entry.BOOLEAN, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("newBooleanEntry: boolean")
+    @ValueSource(booleans = {false, true})
+    public void newBooleanEntry(boolean value) {
+        test(
+                () -> TagMap.Entry.create("foo", value),
+                TagMap.Entry.BOOLEAN,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkFalse(entry::isNumericPrimitive),
+                        checkFalse(entry::isNumber),
+                        checkFalse(entry::isObject),
+                        checkType(TagMap.Entry.BOOLEAN, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("newBooleanEntry: Boolean")
+    @ValueSource(booleans = {false, true})
+    public void newBooleanEntryBoxed(boolean value) {
+        test(
+                () -> TagMap.Entry.newBooleanEntry("foo", Boolean.valueOf(value)),
+                TagMap.Entry.BOOLEAN,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkFalse(entry::isNumericPrimitive),
+                        checkFalse(entry::isNumber),
+                        checkFalse(entry::isObject),
+                        checkType(TagMap.Entry.BOOLEAN, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("newAnyEntry: Boolean")
+    @ValueSource(booleans = {false, true})
+    public void newAnyEntryBoolean(boolean value) {
+        test(
+                () -> TagMap.Entry.newAnyEntry("foo", Boolean.valueOf(value)),
+                TagMap.Entry.ANY,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkFalse(entry::isNumericPrimitive),
+                        checkFalse(entry::isNumber),
+                        checkFalse(entry::isObject),
+                        checkType(TagMap.Entry.BOOLEAN, entry),
+                        checkValue(value, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("TagMap.Entry.create: int")
+    @ValueSource(ints = {Integer.MIN_VALUE, -256, -128, -1, 0, 1, 128, 256, Integer.MAX_VALUE})
+    public void createInt(int value) {
+        test(
+                () -> TagMap.Entry.create("foo", value),
+                TagMap.Entry.INT,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkIsNumericPrimitive(entry),
+                        checkInstanceOf(Number.class, entry),
+                        checkType(TagMap.Entry.INT, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("newIntEntry: int")
+    @ValueSource(ints = {Integer.MIN_VALUE, -256, -128, -1, 0, 1, 128, 256, Integer.MAX_VALUE})
+    public void newIntEntry(int value) {
+        test(
+                () -> TagMap.Entry.newIntEntry("foo", value),
+                TagMap.Entry.INT,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkIsNumericPrimitive(entry),
+                        checkInstanceOf(Number.class, entry),
+                        checkType(TagMap.Entry.INT, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("newIntEntry: Integer")
+    @ValueSource(ints = {Integer.MIN_VALUE, -256, -128, -1, 0, 1, 128, 256, Integer.MAX_VALUE})
+    public void newIntEntryBoxed(int value) {
+        test(
+                () -> TagMap.Entry.newIntEntry("foo", Integer.valueOf(value)),
+                TagMap.Entry.INT,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkIsNumericPrimitive(entry),
+                        checkInstanceOf(Number.class, entry),
+                        checkType(TagMap.Entry.INT, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("newIntEntry: Short")
+    @ValueSource(shorts = {Short.MIN_VALUE, -256, -128, -1, 0, 1, 128, 256, Short.MAX_VALUE})
+    public void newIntEntryBoxedShort(short value) {
+        test(
+                () -> TagMap.Entry.newIntEntry("foo", Short.valueOf(value)),
+                TagMap.Entry.INT,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkIsNumericPrimitive(entry),
+                        checkInstanceOf(Number.class, entry),
+                        checkType(TagMap.Entry.INT, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("newIntEntry: Byte")
+    @ValueSource(bytes = {Byte.MIN_VALUE, -32, -1, 0, 1, 32, Byte.MAX_VALUE})
+    public void newIntEntryBoxedByte(byte value) {
+        test(
+                () -> TagMap.Entry.newIntEntry("foo", Byte.valueOf(value)),
+                TagMap.Entry.INT,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkIsNumericPrimitive(entry),
+                        checkInstanceOf(Number.class, entry),
+                        checkType(TagMap.Entry.INT, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("newAnyEntry: Integer")
+    @ValueSource(ints = {Integer.MIN_VALUE, -256, -128, -1, 0, 1, 128, 256, Integer.MAX_VALUE})
+    public void newAnyEntryInteger(int value) {
+        test(
+                () -> TagMap.Entry.newAnyEntry("foo", Integer.valueOf(value)),
+                TagMap.Entry.ANY,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkIsNumericPrimitive(entry),
+                        checkInstanceOf(Number.class, entry),
+                        checkType(TagMap.Entry.INT, entry),
+                        checkValue(value, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("TagMap.Entry.create: long")
+    @ValueSource(
+            longs = {
+                Long.MIN_VALUE,
+                Integer.MIN_VALUE,
+                -1_048_576L,
+                -256L,
+                -128L,
+                -1L,
+                0L,
+                1L,
+                128L,
+                256L,
+                1_048_576L,
+                Integer.MAX_VALUE,
+                Long.MAX_VALUE
+            })
+    public void createLong(long value) {
+        test(
+                () -> TagMap.Entry.create("foo", value),
+                TagMap.Entry.LONG,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkTrue(entry::isNumericPrimitive),
+                        checkType(TagMap.Entry.LONG, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("newLongEntry: long")
+    @ValueSource(
+            longs = {
+                Long.MIN_VALUE,
+                Integer.MIN_VALUE,
+                -1_048_576L,
+                -256L,
+                -128L,
+                -1L,
+                0L,
+                1L,
+                128L,
+                256L,
+                1_048_576L,
+                Integer.MAX_VALUE,
+                Long.MAX_VALUE
+            })
+    public void newLongEntry(long value) {
+        test(
+                () -> TagMap.Entry.newLongEntry("foo", value),
+                TagMap.Entry.LONG,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkTrue(entry::isNumericPrimitive),
+                        checkType(TagMap.Entry.LONG, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("newLongEntry: Long")
+    @ValueSource(
+            longs = {
+                Long.MIN_VALUE,
+                Integer.MIN_VALUE,
+                -1_048_576L,
+                -256L,
+                -128L,
+                -1L,
+                0L,
+                1L,
+                128L,
+                256L,
+                1_048_576L,
+                Integer.MAX_VALUE,
+                Long.MAX_VALUE
+            })
+    public void newLongEntryBoxed(long value) {
+        test(
+                () -> TagMap.Entry.newLongEntry("foo", Long.valueOf(value)),
+                TagMap.Entry.LONG,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkIsNumericPrimitive(entry),
+                        checkType(TagMap.Entry.LONG, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("newAnyEntry: Long")
+    @ValueSource(
+            longs = {
+                Long.MIN_VALUE,
+                Integer.MIN_VALUE,
+                -1_048_576L,
+                -256L,
+                -128L,
+                -1L,
+                0L,
+                1L,
+                128L,
+                256L,
+                1_048_576L,
+                Integer.MAX_VALUE,
+                Long.MAX_VALUE
+            })
+    public void newAnyEntryLong(long value) {
+        test(
+                () -> TagMap.Entry.newAnyEntry("foo", Long.valueOf(value)),
+                TagMap.Entry.ANY,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkIsNumericPrimitive(entry),
+                        checkTrue(() -> entry.is(TagMap.Entry.LONG)),
+                        checkValue(value, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("TagMap.Entry.create: float")
+    @ValueSource(floats = {Float.MIN_VALUE, -1F, 0F, 1F, 2.171828F, 3.1415F, Float.MAX_VALUE})
+    public void createFloat(float value) {
+        test(
+                () -> TagMap.Entry.create("foo", value),
+                TagMap.Entry.FLOAT,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkTrue(entry::isNumericPrimitive),
+                        checkType(TagMap.Entry.FLOAT, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("newFloatEntry: float")
+    @ValueSource(floats = {Float.MIN_VALUE, -1F, 0F, 1F, 2.171828F, 3.1415F, Float.MAX_VALUE})
+    public void newFloatEntry(float value) {
+        test(
+                () -> TagMap.Entry.newFloatEntry("foo", value),
+                TagMap.Entry.FLOAT,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkTrue(entry::isNumericPrimitive),
+                        checkType(TagMap.Entry.FLOAT, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("newFloatEntry: Float")
+    @ValueSource(floats = {Float.MIN_VALUE, -1F, 0F, 1F, 2.171828F, 3.1415F, Float.MAX_VALUE})
+    public void newFloatEntryBoxed(float value) {
+        test(
+                () -> TagMap.Entry.newFloatEntry("foo", Float.valueOf(value)),
+                TagMap.Entry.FLOAT,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkIsNumericPrimitive(entry),
+                        checkType(TagMap.Entry.FLOAT, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("newAnyEntry: Float")
+    @ValueSource(floats = {Float.MIN_VALUE, -1F, 0F, 1F, 2.171828F, 3.1415F, Float.MAX_VALUE})
+    public void newAnyEntryFloat(float value) {
+        test(
+                () -> TagMap.Entry.newAnyEntry("foo", Float.valueOf(value)),
+                TagMap.Entry.ANY,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkTrue(entry::isNumericPrimitive),
+                        checkType(TagMap.Entry.FLOAT, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("TagMap.Entry.create: double")
+    @ValueSource(doubles = {Double.MIN_VALUE, Float.MIN_VALUE, -1D, 0D, 1D, Math.E, Math.PI, Double.MAX_VALUE})
+    public void createDouble(double value) {
+        test(
+                () -> TagMap.Entry.create("foo", value),
+                TagMap.Entry.DOUBLE,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkIsNumericPrimitive(entry),
+                        checkType(TagMap.Entry.DOUBLE, entry)));
+    }
+
+    @ParameterizedTest
+    @ValueSource(doubles = {Double.MIN_VALUE, Float.MIN_VALUE, -1D, 0D, 1D, Math.E, Math.PI, Double.MAX_VALUE})
+    public void newDoubleEntry(double value) {
+        test(
+                () -> TagMap.Entry.newDoubleEntry("foo", value),
+                TagMap.Entry.DOUBLE,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkIsNumericPrimitive(entry),
+                        checkType(TagMap.Entry.DOUBLE, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("newDoubleEntry: Double")
+    @ValueSource(doubles = {Double.MIN_VALUE, Float.MIN_VALUE, -1D, 0D, 1D, Math.E, Math.PI, Double.MAX_VALUE})
+    public void newDoubleEntryBoxed(double value) {
+        test(
+                () -> TagMap.Entry.newDoubleEntry("foo", Double.valueOf(value)),
+                TagMap.Entry.DOUBLE,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkTrue(entry::isNumericPrimitive),
+                        checkType(TagMap.Entry.DOUBLE, entry)));
+    }
+
+    @ParameterizedTest
+    @DisplayName("newAnyEntry: Double")
+    @ValueSource(doubles = {Double.MIN_VALUE, Float.MIN_VALUE, -1D, 0D, 1D, Math.E, Math.PI, Double.MAX_VALUE})
+    public void newAnyEntryDouble(double value) {
+        test(
+                () -> TagMap.Entry.newAnyEntry("foo", Double.valueOf(value)),
+                TagMap.Entry.ANY,
+                (entry) -> multiCheck(
+                        checkKey("foo", entry),
+                        checkValue(value, entry),
+                        checkTrue(entry::isNumericPrimitive),
+                        checkType(TagMap.Entry.DOUBLE, entry),
+                        checkValue(value, entry)));
+    }
+
+    @Test
+    public void removalChange() {
+        TagMap.EntryChange removalChange = TagMap.EntryChange.newRemoval("foo");
+        assertTrue(removalChange.isRemoval());
+    }
+
+    static final int NUM_THREADS = 4;
+    static final ExecutorService EXECUTOR = Executors.newFixedThreadPool(NUM_THREADS, new ThreadFactory() {
+        @Override
+        public Thread newThread(Runnable r) {
+            Thread thread = new Thread(r, "multithreaded-test-runner");
+            thread.setDaemon(true);
+            return thread;
+        }
+    });
+
+    static final void test(Supplier<TagMap.Entry> entrySupplier, byte rawType, Function<Entry, Check> checkSupplier) {
+
+        Function<Entry, Check> combinedCheckSupplier = (entry) -> {
+            return multiCheck(
+                    checkSupplier.apply(entry), checkSame(entry, entry.entry()), checkSame(entry, entry.mapEntry()));
+        };
+
+        // repeat the test several times to exercise different orderings in this thread
+        for (int i = 0; i < 10; ++i) {
+            testSingleThreaded(entrySupplier, rawType, combinedCheckSupplier);
+        }
+
+        // same for multi-threaded
+        for (int i = 0; i < 5; ++i) {
+            testMultiThreaded(entrySupplier, rawType, combinedCheckSupplier);
+        }
+    }
+
+    static final void testSingleThreaded(
+            Supplier<TagMap.Entry> entrySupplier, byte rawType, Function<Entry, Check> checkSupplier) {
+        Entry entry = entrySupplier.get();
+        assertEquals(rawType, entry.rawType, "rawType");
+
+        Check checks = checkSupplier.apply(entry);
+        checks.check();
+    }
+
+    static final void testMultiThreaded(
+            Supplier<TagMap.Entry> entrySupplier, byte rawType, Function<Entry, Check> checkSupplier) {
+        Entry sharedEntry = entrySupplier.get();
+        assertEquals(rawType, sharedEntry.rawType, "rawType");
+
+        Check checks = checkSupplier.apply(sharedEntry);
+
+        List<Callable<Void>> callables = new ArrayList<>(NUM_THREADS);
+        for (int i = 0; i < NUM_THREADS; ++i) {
+            // Different shuffle for each thread
+            Check shuffledChecks = checks.shuffle();
+
+            callables.add(() -> {
+                shuffledChecks.check();
+
+                return null;
+            });
+        }
+
+        List<Future<Void>> futures;
+        try {
+            futures = EXECUTOR.invokeAll(callables);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+
+            throw new IllegalStateException(e);
+        }
+
+        for (Future<?> future : futures) {
+            try {
+                future.get();
+            } catch (InterruptedException e) {
+                throw new IllegalStateException(e);
+            } catch (ExecutionException e) {
+                Throwable cause = e.getCause();
+                if (cause instanceof Error) {
+                    throw (Error) cause;
+                } else if (cause instanceof RuntimeException) {
+                    throw (RuntimeException) cause;
+                } else {
+                    throw new IllegalStateException(cause);
+                }
+            }
+        }
+    }
+
+    static final void assertChecks(Check check) {
+        check.check();
+    }
+
+    static final Check checkKey(String expected, TagMap.Entry entry) {
+        return multiCheck(checkEquals(expected, entry::tag), checkEquals(expected, entry::getKey));
+    }
+
+    static final <T> Supplier<T> of(Supplier<T> supplier, String identifier) {
+        return new Supplier<T>() {
             @Override
-            public Thread newThread(Runnable r) {
-              Thread thread = new Thread(r, "multithreaded-test-runner");
-              thread.setDaemon(true);
-              return thread;
+            public T get() {
+                return supplier.get();
             }
-          });
 
-  static final void test(
-      Supplier<TagMap.Entry> entrySupplier, byte rawType, Function<Entry, Check> checkSupplier) {
+            @Override
+            public String toString() {
+                return identifier;
+            }
+        };
+    }
+
+    static final <I, O> Function<I, O> of(Function<I, O> func, String identifier) {
+        return new Function<I, O>() {
+            @Override
+            public O apply(I input) {
+                return func.apply(input);
+            }
 
-    Function<Entry, Check> combinedCheckSupplier =
-        (entry) -> {
-          return multiCheck(
-              checkSupplier.apply(entry),
-              checkSame(entry, entry.entry()),
-              checkSame(entry, entry.mapEntry()));
+            @Override
+            public String toString() {
+                return identifier;
+            }
         };
+    }
 
-    // repeat the test several times to exercise different orderings in this thread
-    for (int i = 0; i < 10; ++i) {
-      testSingleThreaded(entrySupplier, rawType, combinedCheckSupplier);
+    static final <I, O> Supplier<O> of(Function<I, O> output, Supplier<I> input) {
+        return of(output, input, output.toString() + "(" + input.toString() + ")");
     }
 
-    // same for multi-threaded
-    for (int i = 0; i < 5; ++i) {
-      testMultiThreaded(entrySupplier, rawType, combinedCheckSupplier);
+    static final <I, O> Supplier<O> of(Function<I, O> output, Supplier<I> input, String identifier) {
+        return of(() -> output.apply(input.get()), identifier);
     }
-  }
 
-  static final void testSingleThreaded(
-      Supplier<TagMap.Entry> entrySupplier, byte rawType, Function<Entry, Check> checkSupplier) {
-    Entry entry = entrySupplier.get();
-    assertEquals(rawType, entry.rawType, "rawType");
+    static final Check checkIsNumericPrimitive(TagMap.Entry entry) {
+        return multiCheck(
+                checkTrue(entry::isNumericPrimitive, "Entry::isNumericPrimitive"),
+                checkTrue(entry::isNumber, "Entry::isNumber"),
+                checkInstanceOf(Number.class, entry),
+                checkFalse(entry::isObject, "Entry::isObject"),
+                checkTrue(of(TagValueConversions::isNumber, entry::objectValue), "isNumber(Object)"),
+                checkTrue(
+                        of(TagValueConversions::isNumericPrimitive, entry::objectValue), "isNumericPrimitive(Object)"),
+                checkFalse(of(TagValueConversions::isObject, entry::objectValue), "isObject(Object)"));
+    }
 
-    Check checks = checkSupplier.apply(entry);
-    checks.check();
-  }
+    static final Check checkIsBigNumber(TagMap.Entry entry) {
+        return multiCheck(
+                checkFalse(entry::isNumericPrimitive, "Entry::isNumericPrimitive"),
+                checkFalse(
+                        of(TagValueConversions::isNumericPrimitive, entry::objectValue), "isNumericPrimitive(Object)"),
+                checkTrue(entry::isNumber, "Entry::isNumber"),
+                checkTrue(entry::isObject, "Entry::isObject"),
+                checkTrue(of(TagValueConversions::isNumber, entry::objectValue), "isNumber(Object)"),
+                checkInstanceOf(Number.class, entry));
+    }
 
-  static final void testMultiThreaded(
-      Supplier<TagMap.Entry> entrySupplier, byte rawType, Function<Entry, Check> checkSupplier) {
-    Entry sharedEntry = entrySupplier.get();
-    assertEquals(rawType, sharedEntry.rawType, "rawType");
+    static final Check checkValue(Object expected, TagMap.Entry entry) {
+        return multiCheck(
+                checkEquals(expected, entry::objectValue),
+                checkEquals(expected, entry::getValue),
+                checkEquals(expected.toString(), entry::stringValue));
+    }
 
-    Check checks = checkSupplier.apply(sharedEntry);
+    static final Check checkValue(boolean expected, TagMap.Entry entry) {
+        return multiCheck(
+                checkEquals(expected, entry::booleanValue, "Entry::booleanValue"),
+                checkEquals(Boolean.valueOf(expected), entry::objectValue, "Entry::objectValue"),
+                checkEquals(expected ? 1 : 0, entry::intValue, "Entry::intValue"),
+                checkEquals(expected ? 1 : 0, of(TagValueConversions::toInt, entry::objectValue), "toInt(Object)"),
+                checkEquals(expected ? 1L : 0L, entry::longValue, "Entry::longValue"),
+                checkEquals(expected ? 1L : 0L, of(TagValueConversions::toLong, entry::objectValue), "toLong(Object)"),
+                checkEquals(expected ? 1D : 0D, entry::doubleValue, "Entry::doubleValue"),
+                checkEquals(
+                        expected ? 1D : 0D, of(TagValueConversions::toDouble, entry::objectValue), "toDouble(Object)"),
+                checkEquals(expected ? 1F : 0F, entry::floatValue, "Entry::floatValue"),
+                checkEquals(
+                        expected ? 1F : 0F, of(TagValueConversions::toFloat, entry::objectValue), "toFloat(Object)"),
+                checkEquals(Boolean.toString(expected), entry::stringValue, "Entry::stringValue"),
+                checkEquals(
+                        Boolean.toString(expected),
+                        of(TagValueConversions::toString, entry::objectValue),
+                        "toString(Object)"));
+    }
 
-    List<Callable<Void>> callables = new ArrayList<>(NUM_THREADS);
-    for (int i = 0; i < NUM_THREADS; ++i) {
-      // Different shuffle for each thread
-      Check shuffledChecks = checks.shuffle();
+    static final Check checkValue(int expected, TagMap.Entry entry) {
+        return multiCheck(
+                checkEquals(expected, entry::intValue, "Entry::intValue"),
+                checkEquals(Integer.valueOf(expected), entry::objectValue, "Entry::objectValue"),
+                checkEquals((long) expected, entry::longValue, "Entry::longValue"),
+                checkEquals((long) expected, of(TagValueConversions::toLong, entry::objectValue), "toLong(Object)"),
+                checkEquals((float) expected, entry::floatValue, "Entry::floatValue"),
+                checkEquals((float) expected, of(TagValueConversions::toFloat, entry::objectValue), "toFloat(Object)"),
+                checkEquals((double) expected, entry::doubleValue, "Entry::doubleValue"),
+                checkEquals(
+                        (double) expected, of(TagValueConversions::toDouble, entry::objectValue), "toDouble(Object)"),
+                checkEquals(expected != 0, entry::booleanValue, "Entry::booleanValue"),
+                checkEquals(expected != 0, of(TagValueConversions::toBoolean, entry::objectValue), "toBoolean(Object)"),
+                checkEquals(Integer.toString(expected), entry::stringValue, "Entry::stringValue"),
+                checkEquals(
+                        Integer.toString(expected),
+                        of(TagValueConversions::toString, entry::objectValue),
+                        "toString(Object)"));
+    }
 
-      callables.add(
-          () -> {
-            shuffledChecks.check();
+    static final Check checkValue(long expected, TagMap.Entry entry) {
+        return multiCheck(
+                checkEquals(expected, entry::longValue, "Entry::longValue"),
+                checkEquals(Long.valueOf(expected), entry::objectValue, "Entry::objectValue"),
+                checkEquals((int) expected, entry::intValue, "Entry::intValue"),
+                checkEquals((int) expected, of(TagValueConversions::toInt, entry::objectValue), "toInt(Object)"),
+                checkEquals((float) expected, entry::floatValue, "Entry::floatValue"),
+                checkEquals((float) expected, of(TagValueConversions::toFloat, entry::objectValue), "toFloat(Object)"),
+                checkEquals((double) expected, entry::doubleValue, "Entry::doubleValue"),
+                checkEquals(
+                        (double) expected, of(TagValueConversions::toDouble, entry::objectValue), "toDouble(Object)"),
+                checkEquals(expected != 0L, entry::booleanValue, "Entry::booleanValue"),
+                checkEquals(
+                        expected != 0L, of(TagValueConversions::toBoolean, entry::objectValue), "toBoolean(Object)"),
+                checkEquals(Long.toString(expected), entry::stringValue, "Entry::stringValue"),
+                checkEquals(
+                        Long.toString(expected),
+                        of(TagValueConversions::toString, entry::objectValue),
+                        "toString(Object)"));
+    }
 
-            return null;
-          });
+    static final Check checkValue(double expected, TagMap.Entry entry) {
+        return multiCheck(
+                checkEquals(expected, entry::doubleValue, "Entry::doubleValue"),
+                checkEquals(Double.valueOf(expected), entry::objectValue, "Entry::objectValue"),
+                checkEquals((int) expected, entry::intValue, "Entry::intValue"),
+                checkEquals((int) expected, of(TagValueConversions::toInt, entry::objectValue), "toInt(Object)"),
+                checkEquals((long) expected, entry::longValue, "Entry::longValue"),
+                checkEquals((long) expected, of(TagValueConversions::toLong, entry::objectValue), "toLong(Object)"),
+                checkEquals((float) expected, entry::floatValue, "Entry::floatValue"),
+                checkEquals((float) expected, of(TagValueConversions::toFloat, entry::objectValue), "toFloat(Object)"),
+                checkEquals(expected != 0D, entry::booleanValue, "Entry::booleanValue"),
+                checkEquals(
+                        expected != 0D, of(TagValueConversions::toBoolean, entry::objectValue), "toBoolean(Object)"),
+                checkEquals(Double.toString(expected), entry::stringValue, "Entry::stringValue"),
+                checkEquals(
+                        Double.toString(expected),
+                        of(TagValueConversions::toString, entry::objectValue),
+                        "toString(Object)"));
     }
 
-    List<Future<Void>> futures;
-    try {
-      futures = EXECUTOR.invokeAll(callables);
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
+    static final Check checkValue(float expected, TagMap.Entry entry) {
+        return multiCheck(
+                checkEquals(expected, entry::floatValue, "Entry::floatValue"),
+                checkEquals(Float.valueOf(expected), entry::objectValue, "Entry::objectValue"),
+                checkEquals((int) expected, entry::intValue, "Entry::intValue"),
+                checkEquals((int) expected, of(TagValueConversions::toInt, entry::objectValue), "toInt(Object)"),
+                checkEquals((long) expected, entry::longValue, "Entry::longValue"),
+                checkEquals((long) expected, of(TagValueConversions::toLong, entry::objectValue), "toLong(Object)"),
+                checkEquals((double) expected, entry::doubleValue, "Entry::doubleValue"),
+                checkEquals(
+                        (double) expected, of(TagValueConversions::toDouble, entry::objectValue), "toDouble(Object)"),
+                checkEquals(expected != 0F, entry::booleanValue, "Entry::booleanValue"),
+                checkEquals(
+                        expected != 0F, of(TagValueConversions::toBoolean, entry::objectValue), "toBoolean(Object)"),
+                checkEquals(Float.toString(expected), entry::stringValue, "Entry::stringValue"),
+                checkEquals(
+                        Float.toString(expected),
+                        of(TagValueConversions::toString, entry::objectValue),
+                        "toString(Object)"));
+    }
 
-      throw new IllegalStateException(e);
+    public static Check checkNumber(Number number, TagMap.Entry entry) {
+        return multiCheck(
+                checkEquals(number, entry::objectValue),
+                checkEquals(number.intValue(), entry::intValue),
+                checkEquals(number.intValue(), of(TagValueConversions::toInt, entry::objectValue)),
+                checkEquals(number.longValue(), entry::longValue),
+                checkEquals(number.longValue(), of(TagValueConversions::toLong, entry::objectValue)),
+                checkEquals(number.floatValue(), entry::floatValue),
+                checkEquals(number.floatValue(), of(TagValueConversions::toFloat, entry::objectValue)),
+                checkEquals(number.doubleValue(), entry::doubleValue),
+                checkEquals(number.doubleValue(), of(TagValueConversions::toDouble, entry::objectValue)),
+                checkEquals(number.toString(), entry::stringValue),
+                checkEquals(number.toString(), of(TagValueConversions::toString, entry::objectValue)));
     }
 
-    for (Future<?> future : futures) {
-      try {
-        future.get();
-      } catch (InterruptedException e) {
-        throw new IllegalStateException(e);
-      } catch (ExecutionException e) {
-        Throwable cause = e.getCause();
-        if (cause instanceof Error) {
-          throw (Error) cause;
-        } else if (cause instanceof RuntimeException) {
-          throw (RuntimeException) cause;
-        } else {
-          throw new IllegalStateException(cause);
-        }
-      }
-    }
-  }
-
-  static final void assertChecks(Check check) {
-    check.check();
-  }
-
-  static final Check checkKey(String expected, TagMap.Entry entry) {
-    return multiCheck(checkEquals(expected, entry::tag), checkEquals(expected, entry::getKey));
-  }
-
-  static final <T> Supplier<T> of(Supplier<T> supplier, String identifier) {
-    return new Supplier<T>() {
-      @Override
-      public T get() {
-        return supplier.get();
-      }
-
-      @Override
-      public String toString() {
-        return identifier;
-      }
-    };
-  }
-
-  static final <I, O> Function<I, O> of(Function<I, O> func, String identifier) {
-    return new Function<I, O>() {
-      @Override
-      public O apply(I input) {
-        return func.apply(input);
-      }
-
-      @Override
-      public String toString() {
-        return identifier;
-      }
-    };
-  }
-
-  static final <I, O> Supplier<O> of(Function<I, O> output, Supplier<I> input) {
-    return of(output, input, output.toString() + "(" + input.toString() + ")");
-  }
-
-  static final <I, O> Supplier<O> of(Function<I, O> output, Supplier<I> input, String identifier) {
-    return of(() -> output.apply(input.get()), identifier);
-  }
-
-  static final Check checkIsNumericPrimitive(TagMap.Entry entry) {
-    return multiCheck(
-        checkTrue(entry::isNumericPrimitive, "Entry::isNumericPrimitive"),
-        checkTrue(entry::isNumber, "Entry::isNumber"),
-        checkInstanceOf(Number.class, entry),
-        checkFalse(entry::isObject, "Entry::isObject"),
-        checkTrue(of(TagValueConversions::isNumber, entry::objectValue), "isNumber(Object)"),
-        checkTrue(
-            of(TagValueConversions::isNumericPrimitive, entry::objectValue),
-            "isNumericPrimitive(Object)"),
-        checkFalse(of(TagValueConversions::isObject, entry::objectValue), "isObject(Object)"));
-  }
-
-  static final Check checkIsBigNumber(TagMap.Entry entry) {
-    return multiCheck(
-        checkFalse(entry::isNumericPrimitive, "Entry::isNumericPrimitive"),
-        checkFalse(
-            of(TagValueConversions::isNumericPrimitive, entry::objectValue),
-            "isNumericPrimitive(Object)"),
-        checkTrue(entry::isNumber, "Entry::isNumber"),
-        checkTrue(entry::isObject, "Entry::isObject"),
-        checkTrue(of(TagValueConversions::isNumber, entry::objectValue), "isNumber(Object)"),
-        checkInstanceOf(Number.class, entry));
-  }
-
-  static final Check checkValue(Object expected, TagMap.Entry entry) {
-    return multiCheck(
-        checkEquals(expected, entry::objectValue),
-        checkEquals(expected, entry::getValue),
-        checkEquals(expected.toString(), entry::stringValue));
-  }
-
-  static final Check checkValue(boolean expected, TagMap.Entry entry) {
-    return multiCheck(
-        checkEquals(expected, entry::booleanValue, "Entry::booleanValue"),
-        checkEquals(Boolean.valueOf(expected), entry::objectValue, "Entry::objectValue"),
-        checkEquals(expected ? 1 : 0, entry::intValue, "Entry::intValue"),
-        checkEquals(
-            expected ? 1 : 0, of(TagValueConversions::toInt, entry::objectValue), "toInt(Object)"),
-        checkEquals(expected ? 1L : 0L, entry::longValue, "Entry::longValue"),
-        checkEquals(
-            expected ? 1L : 0L,
-            of(TagValueConversions::toLong, entry::objectValue),
-            "toLong(Object)"),
-        checkEquals(expected ? 1D : 0D, entry::doubleValue, "Entry::doubleValue"),
-        checkEquals(
-            expected ? 1D : 0D,
-            of(TagValueConversions::toDouble, entry::objectValue),
-            "toDouble(Object)"),
-        checkEquals(expected ? 1F : 0F, entry::floatValue, "Entry::floatValue"),
-        checkEquals(
-            expected ? 1F : 0F,
-            of(TagValueConversions::toFloat, entry::objectValue),
-            "toFloat(Object)"),
-        checkEquals(Boolean.toString(expected), entry::stringValue, "Entry::stringValue"),
-        checkEquals(
-            Boolean.toString(expected),
-            of(TagValueConversions::toString, entry::objectValue),
-            "toString(Object)"));
-  }
-
-  static final Check checkValue(int expected, TagMap.Entry entry) {
-    return multiCheck(
-        checkEquals(expected, entry::intValue, "Entry::intValue"),
-        checkEquals(Integer.valueOf(expected), entry::objectValue, "Entry::objectValue"),
-        checkEquals((long) expected, entry::longValue, "Entry::longValue"),
-        checkEquals(
-            (long) expected, of(TagValueConversions::toLong, entry::objectValue), "toLong(Object)"),
-        checkEquals((float) expected, entry::floatValue, "Entry::floatValue"),
-        checkEquals(
-            (float) expected,
-            of(TagValueConversions::toFloat, entry::objectValue),
-            "toFloat(Object)"),
-        checkEquals((double) expected, entry::doubleValue, "Entry::doubleValue"),
-        checkEquals(
-            (double) expected,
-            of(TagValueConversions::toDouble, entry::objectValue),
-            "toDouble(Object)"),
-        checkEquals(expected != 0, entry::booleanValue, "Entry::booleanValue"),
-        checkEquals(
-            expected != 0,
-            of(TagValueConversions::toBoolean, entry::objectValue),
-            "toBoolean(Object)"),
-        checkEquals(Integer.toString(expected), entry::stringValue, "Entry::stringValue"),
-        checkEquals(
-            Integer.toString(expected),
-            of(TagValueConversions::toString, entry::objectValue),
-            "toString(Object)"));
-  }
-
-  static final Check checkValue(long expected, TagMap.Entry entry) {
-    return multiCheck(
-        checkEquals(expected, entry::longValue, "Entry::longValue"),
-        checkEquals(Long.valueOf(expected), entry::objectValue, "Entry::objectValue"),
-        checkEquals((int) expected, entry::intValue, "Entry::intValue"),
-        checkEquals(
-            (int) expected, of(TagValueConversions::toInt, entry::objectValue), "toInt(Object)"),
-        checkEquals((float) expected, entry::floatValue, "Entry::floatValue"),
-        checkEquals(
-            (float) expected,
-            of(TagValueConversions::toFloat, entry::objectValue),
-            "toFloat(Object)"),
-        checkEquals((double) expected, entry::doubleValue, "Entry::doubleValue"),
-        checkEquals(
-            (double) expected,
-            of(TagValueConversions::toDouble, entry::objectValue),
-            "toDouble(Object)"),
-        checkEquals(expected != 0L, entry::booleanValue, "Entry::booleanValue"),
-        checkEquals(
-            expected != 0L,
-            of(TagValueConversions::toBoolean, entry::objectValue),
-            "toBoolean(Object)"),
-        checkEquals(Long.toString(expected), entry::stringValue, "Entry::stringValue"),
-        checkEquals(
-            Long.toString(expected),
-            of(TagValueConversions::toString, entry::objectValue),
-            "toString(Object)"));
-  }
-
-  static final Check checkValue(double expected, TagMap.Entry entry) {
-    return multiCheck(
-        checkEquals(expected, entry::doubleValue, "Entry::doubleValue"),
-        checkEquals(Double.valueOf(expected), entry::objectValue, "Entry::objectValue"),
-        checkEquals((int) expected, entry::intValue, "Entry::intValue"),
-        checkEquals(
-            (int) expected, of(TagValueConversions::toInt, entry::objectValue), "toInt(Object)"),
-        checkEquals((long) expected, entry::longValue, "Entry::longValue"),
-        checkEquals(
-            (long) expected, of(TagValueConversions::toLong, entry::objectValue), "toLong(Object)"),
-        checkEquals((float) expected, entry::floatValue, "Entry::floatValue"),
-        checkEquals(
-            (float) expected,
-            of(TagValueConversions::toFloat, entry::objectValue),
-            "toFloat(Object)"),
-        checkEquals(expected != 0D, entry::booleanValue, "Entry::booleanValue"),
-        checkEquals(
-            expected != 0D,
-            of(TagValueConversions::toBoolean, entry::objectValue),
-            "toBoolean(Object)"),
-        checkEquals(Double.toString(expected), entry::stringValue, "Entry::stringValue"),
-        checkEquals(
-            Double.toString(expected),
-            of(TagValueConversions::toString, entry::objectValue),
-            "toString(Object)"));
-  }
-
-  static final Check checkValue(float expected, TagMap.Entry entry) {
-    return multiCheck(
-        checkEquals(expected, entry::floatValue, "Entry::floatValue"),
-        checkEquals(Float.valueOf(expected), entry::objectValue, "Entry::objectValue"),
-        checkEquals((int) expected, entry::intValue, "Entry::intValue"),
-        checkEquals(
-            (int) expected, of(TagValueConversions::toInt, entry::objectValue), "toInt(Object)"),
-        checkEquals((long) expected, entry::longValue, "Entry::longValue"),
-        checkEquals(
-            (long) expected, of(TagValueConversions::toLong, entry::objectValue), "toLong(Object)"),
-        checkEquals((double) expected, entry::doubleValue, "Entry::doubleValue"),
-        checkEquals(
-            (double) expected,
-            of(TagValueConversions::toDouble, entry::objectValue),
-            "toDouble(Object)"),
-        checkEquals(expected != 0F, entry::booleanValue, "Entry::booleanValue"),
-        checkEquals(
-            expected != 0F,
-            of(TagValueConversions::toBoolean, entry::objectValue),
-            "toBoolean(Object)"),
-        checkEquals(Float.toString(expected), entry::stringValue, "Entry::stringValue"),
-        checkEquals(
-            Float.toString(expected),
-            of(TagValueConversions::toString, entry::objectValue),
-            "toString(Object)"));
-  }
-
-  public static Check checkNumber(Number number, TagMap.Entry entry) {
-    return multiCheck(
-        checkEquals(number, entry::objectValue),
-        checkEquals(number.intValue(), entry::intValue),
-        checkEquals(number.intValue(), of(TagValueConversions::toInt, entry::objectValue)),
-        checkEquals(number.longValue(), entry::longValue),
-        checkEquals(number.longValue(), of(TagValueConversions::toLong, entry::objectValue)),
-        checkEquals(number.floatValue(), entry::floatValue),
-        checkEquals(number.floatValue(), of(TagValueConversions::toFloat, entry::objectValue)),
-        checkEquals(number.doubleValue(), entry::doubleValue),
-        checkEquals(number.doubleValue(), of(TagValueConversions::toDouble, entry::objectValue)),
-        checkEquals(number.toString(), entry::stringValue),
-        checkEquals(number.toString(), of(TagValueConversions::toString, entry::objectValue)));
-  }
-
-  static final Check checkInstanceOf(Class<?> klass, TagMap.Entry entry) {
-    return checkTrue(
-        () -> klass.isAssignableFrom(entry.objectValue().getClass()),
-        "instanceof " + klass.getSimpleName());
-  }
-
-  static final Check checkType(byte entryType, TagMap.Entry entry) {
-    // TODO: TVC checks
-    return multiCheck(
-        checkTrue(() -> entry.is(entryType), "Entry::is(type) type=" + entryType),
-        checkEquals(entryType, entry::type, "Entry::type check"));
-  }
-
-  static final Check multiCheck(Check... checks) {
-    return new MultipartCheck(checks);
-  }
-
-  static final Check checkSame(Object expected, Object actual) {
-    return () -> assertSame(expected, actual);
-  }
-
-  static final Check checkFalse(Supplier<Boolean> actual) {
-    return checkFalse(actual, actual.toString());
-  }
-
-  static final Check checkFalse(Supplier<Boolean> actual, String identifier) {
-    return () -> assertFalse(actual.get(), identifier);
-  }
-
-  static final Check checkTrue(Supplier<Boolean> actual) {
-    return checkTrue(actual, actual.toString());
-  }
-
-  static final Check checkTrue(Supplier<Boolean> actual, String identifier) {
-    return () -> assertTrue(actual.get(), identifier);
-  }
-
-  static final Check checkEquals(float expected, Supplier<Float> actual) {
-    return checkEquals(expected, actual, actual.toString());
-  }
-
-  static final Check checkEquals(float expected, Supplier<Float> actual, String identifier) {
-    return () -> assertEquals(expected, actual.get().floatValue(), identifier);
-  }
-
-  static final Check checkEquals(int expected, Supplier<Integer> actual) {
-    return checkEquals(expected, actual, actual.toString());
-  }
-
-  static final Check checkEquals(int expected, Supplier<Integer> actual, String identifier) {
-    return () -> assertEquals(expected, actual.get().intValue(), identifier);
-  }
-
-  static final Check checkEquals(double expected, Supplier<Double> actual) {
-    return checkEquals(expected, actual, actual.toString());
-  }
-
-  static final Check checkEquals(double expected, Supplier<Double> actual, String identifier) {
-    return () -> assertEquals(expected, actual.get().doubleValue(), identifier);
-  }
-
-  static final Check checkEquals(long expected, Supplier<Long> actual) {
-    return checkEquals(expected, actual, actual.toString());
-  }
-
-  static final Check checkEquals(long expected, Supplier<Long> actual, String identifier) {
-    return () -> assertEquals(expected, actual.get().longValue(), identifier);
-  }
-
-  static final Check checkEquals(boolean expected, Supplier<Boolean> actual) {
-    return checkEquals(expected, actual, actual.toString());
-  }
-
-  static final Check checkEquals(boolean expected, Supplier<Boolean> actual, String identifier) {
-    return () -> assertEquals(expected, actual.get().booleanValue(), identifier);
-  }
-
-  static final <T> Check checkEquals(T expected, Supplier<? extends T> actual) {
-    return checkEquals(expected, actual, actual.toString());
-  }
-
-  static final <T> Check checkEquals(T expected, Supplier<? extends T> actual, String identifier) {
-    return () -> assertEquals(expected, actual.get(), identifier);
-  }
+    static final Check checkInstanceOf(Class<?> klass, TagMap.Entry entry) {
+        return checkTrue(
+                () -> klass.isAssignableFrom(entry.objectValue().getClass()), "instanceof " + klass.getSimpleName());
+    }
 
-  @FunctionalInterface
-  interface Check {
-    void check();
+    static final Check checkType(byte entryType, TagMap.Entry entry) {
+        // TODO: TVC checks
+        return multiCheck(
+                checkTrue(() -> entry.is(entryType), "Entry::is(type) type=" + entryType),
+                checkEquals(entryType, entry::type, "Entry::type check"));
+    }
 
-    default Check shuffle() {
-      return this;
+    static final Check multiCheck(Check... checks) {
+        return new MultipartCheck(checks);
     }
 
-    default void flatten(List<Check> checkAccumulator) {
-      checkAccumulator.add(this);
+    static final Check checkSame(Object expected, Object actual) {
+        return () -> assertSame(expected, actual);
     }
-  }
 
-  static final class MultipartCheck implements Check {
-    private final Check[] checks;
+    static final Check checkFalse(Supplier<Boolean> actual) {
+        return checkFalse(actual, actual.toString());
+    }
 
-    MultipartCheck(Check... checks) {
-      this.checks = checks;
+    static final Check checkFalse(Supplier<Boolean> actual, String identifier) {
+        return () -> assertFalse(actual.get(), identifier);
     }
 
-    private List<Check> shuffleChecks() {
-      List<Check> checkAccumulator = new ArrayList<>();
-      for (Check check : this.checks) {
-        check.flatten(checkAccumulator);
-      }
+    static final Check checkTrue(Supplier<Boolean> actual) {
+        return checkTrue(actual, actual.toString());
+    }
 
-      Collections.shuffle(checkAccumulator);
-      return checkAccumulator;
+    static final Check checkTrue(Supplier<Boolean> actual, String identifier) {
+        return () -> assertTrue(actual.get(), identifier);
     }
 
-    @Override
-    public void check() {
-      for (Check check : this.shuffleChecks()) {
-        check.check();
-      }
+    static final Check checkEquals(float expected, Supplier<Float> actual) {
+        return checkEquals(expected, actual, actual.toString());
     }
 
-    @Override
-    public Check shuffle() {
-      List<Check> shuffled = this.shuffleChecks();
+    static final Check checkEquals(float expected, Supplier<Float> actual, String identifier) {
+        return () -> assertEquals(expected, actual.get().floatValue(), identifier);
+    }
+
+    static final Check checkEquals(int expected, Supplier<Integer> actual) {
+        return checkEquals(expected, actual, actual.toString());
+    }
+
+    static final Check checkEquals(int expected, Supplier<Integer> actual, String identifier) {
+        return () -> assertEquals(expected, actual.get().intValue(), identifier);
+    }
+
+    static final Check checkEquals(double expected, Supplier<Double> actual) {
+        return checkEquals(expected, actual, actual.toString());
+    }
+
+    static final Check checkEquals(double expected, Supplier<Double> actual, String identifier) {
+        return () -> assertEquals(expected, actual.get().doubleValue(), identifier);
+    }
+
+    static final Check checkEquals(long expected, Supplier<Long> actual) {
+        return checkEquals(expected, actual, actual.toString());
+    }
+
+    static final Check checkEquals(long expected, Supplier<Long> actual, String identifier) {
+        return () -> assertEquals(expected, actual.get().longValue(), identifier);
+    }
+
+    static final Check checkEquals(boolean expected, Supplier<Boolean> actual) {
+        return checkEquals(expected, actual, actual.toString());
+    }
+
+    static final Check checkEquals(boolean expected, Supplier<Boolean> actual, String identifier) {
+        return () -> assertEquals(expected, actual.get().booleanValue(), identifier);
+    }
+
+    static final <T> Check checkEquals(T expected, Supplier<? extends T> actual) {
+        return checkEquals(expected, actual, actual.toString());
+    }
+
+    static final <T> Check checkEquals(T expected, Supplier<? extends T> actual, String identifier) {
+        return () -> assertEquals(expected, actual.get(), identifier);
+    }
+
+    @FunctionalInterface
+    interface Check {
+        void check();
+
+        default Check shuffle() {
+            return this;
+        }
+
+        default void flatten(List<Check> checkAccumulator) {
+            checkAccumulator.add(this);
+        }
+    }
+
+    static final class MultipartCheck implements Check {
+        private final Check[] checks;
+
+        MultipartCheck(Check... checks) {
+            this.checks = checks;
+        }
+
+        private List<Check> shuffleChecks() {
+            List<Check> checkAccumulator = new ArrayList<>();
+            for (Check check : this.checks) {
+                check.flatten(checkAccumulator);
+            }
+
+            Collections.shuffle(checkAccumulator);
+            return checkAccumulator;
+        }
 
-      return new Check() {
         @Override
         public void check() {
-          for (Check check : shuffled) {
-            check.check();
-          }
+            for (Check check : this.shuffleChecks()) {
+                check.check();
+            }
+        }
+
+        @Override
+        public Check shuffle() {
+            List<Check> shuffled = this.shuffleChecks();
+
+            return new Check() {
+                @Override
+                public void check() {
+                    for (Check check : shuffled) {
+                        check.check();
+                    }
+                }
+            };
         }
-      };
-    }
 
-    @Override
-    public void flatten(List<Check> checkAccumulator) {
-      for (Check check : this.checks) {
-        check.flatten(checkAccumulator);
-      }
+        @Override
+        public void flatten(List<Check> checkAccumulator) {
+            for (Check check : this.checks) {
+                check.flatten(checkAccumulator);
+            }
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/TagMapFuzzTest.java b/internal-api/src/test/java/datadog/trace/api/TagMapFuzzTest.java
index 685dc1d9cdf..c8c038bbe18 100644
--- a/internal-api/src/test/java/datadog/trace/api/TagMapFuzzTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/TagMapFuzzTest.java
@@ -16,1539 +16,1532 @@
 import org.junit.jupiter.api.Test;
 
 public final class TagMapFuzzTest {
-  static final int NUM_KEYS = 128;
-  static final int MAX_NUM_ACTIONS = 32;
-  static final int MIN_NUM_ACTIONS = 8;
-
-  @Test
-  void test() {
-    test(generateTest());
-  }
-
-  @Test
-  void testMerge() {
-    TestCase mapACase = generateTest();
-    TestCase mapBCase = generateTest();
-
-    TagMap tagMapA = test(mapACase);
-    TagMap tagMapB = test(mapBCase);
-
-    HashMap<String, Object> hashMapA = new HashMap<>(tagMapA);
-    HashMap<String, Object> hashMapB = new HashMap<>(tagMapB);
-
-    tagMapA.putAll(tagMapB);
-    hashMapA.putAll(hashMapB);
-
-    assertMapEquals(hashMapA, tagMapA);
-  }
-
-  @Test
-  void priorFailingCase0() {
-    TagMap map =
-        makeTagMap(
-            remove("key-4"),
-            put("key-71", "values-443049055"),
-            put("key-2", "values-1227065898"),
-            put("key-25", "values-696891692"),
-            put("key-93", "values-763707175"),
-            put("key-23", "values--1514091210"),
-            put("key-16", "values--1388742686"));
-
-    MapAction failingAction =
-        putAllTagMap(
-            "key-17",
-            "values--2085338893",
-            "key-51",
-            "values-960243765",
-            "key-33",
-            "values-1493544499",
-            "key-46",
-            "values-697926849",
-            "key-70",
-            "values--184054454",
-            "key-67",
-            "values-374577326",
-            "key-9",
-            "values--742453833",
-            "key-11",
-            "values-1606950841",
-            "key-119",
-            "values--1914593057",
-            "key-53",
-            "values-375236438",
-            "key-96",
-            "values--107185569",
-            "key-47",
-            "values--1276407408",
-            "key-125",
-            "values--1627172151",
-            "key-110",
-            "values--1227150283",
-            "key-15",
-            "values-380379920",
-            "key-42",
-            "values--632271048",
-            "key-99",
-            "values--650090786",
-            "key-8",
-            "values--1990889145",
-            "key-103",
-            "values-1815698254",
-            "key-120",
-            "values-279025031",
-            "key-93",
-            "values-589795963",
-            "key-12",
-            "values--935895941",
-            "key-105",
-            "values-94976227",
-            "key-85",
-            "values--424609970",
-            "key-78",
-            "values-1231948102",
-            "key-115",
-            "values-88670282",
-            "key-26",
-            "values-733903384",
-            "key-100",
-            "values-2102967487",
-            "key-74",
-            "values-958598087",
-            "key-104",
-            "values-264458254",
-            "key-125",
-            "values--1781797927",
-            "key-27",
-            "values--562810078",
-            "key-7",
-            "values--376776745",
-            "key-111",
-            "values-263564677",
-            "key-50",
-            "values--859673100",
-            "key-57",
-            "values-1585057281",
-            "key-48",
-            "values--617889787",
-            "key-98",
-            "values--1878108220",
-            "key-9",
-            "values--227223375",
-            "key-59",
-            "values-1577082288",
-            "key-94",
-            "values--268049040",
-            "key-0",
-            "values-1708355496",
-            "key-62",
-            "values--733451297",
-            "key-14",
-            "values-232732747",
-            "key-4",
-            "values--406605642",
-            "key-58",
-            "values-1772476833",
-            "key-8",
-            "values--1155025225",
-            "key-101",
-            "values-144480545",
-            "key-66",
-            "values-355117269",
-            "key-121",
-            "values-1858008722",
-            "key-33",
-            "values-1947754079",
-            "key-1",
-            "values--1475603838",
-            "key-125",
-            "values--2146772243",
-            "key-117",
-            "values-852022714",
-            "key-53",
-            "values--2039348506",
-            "key-65",
-            "values-2011228657",
-            "key-108",
-            "values-1581592518",
-            "key-17",
-            "values-2129571020",
-            "key-5",
-            "values-1106900841",
-            "key-80",
-            "values-1791757923",
-            "key-18",
-            "values--1992962227",
-            "key-2",
-            "values-328863878",
-            "key-110",
-            "values-1182949334",
-            "key-5",
-            "values-1049403346",
-            "key-107",
-            "values-1246502060",
-            "key-115",
-            "values-2053931423",
-            "key-19",
-            "values--1731179633",
-            "key-104",
-            "values--1090790550",
-            "key-67",
-            "values--1312759979",
-            "key-10",
-            "values-1411135",
-            "key-109",
-            "values--1784920248",
-            "key-20",
-            "values--827644780",
-            "key-55",
-            "values--1610270998",
-            "key-60",
-            "values-1287959520",
-            "key-31",
-            "values-1686541667",
-            "key-41",
-            "values-399844058",
-            "key-115",
-            "values-2045201464",
-            "key-78",
-            "values-358081227",
-            "key-57",
-            "values--1374149269",
-            "key-65",
-            "values-1871734555",
-            "key-124",
-            "values--211494558",
-            "key-119",
-            "values-1757597102",
-            "key-32",
-            "values--336988038",
-            "key-85",
-            "values-1415155858",
-            "key-44",
-            "values-1455425178",
-            "key-48",
-            "values--325658059",
-            "key-68",
-            "values--793590840",
-            "key-96",
-            "values--2010766492",
-            "key-40",
-            "values-2007171160",
-            "key-29",
-            "values-186945230",
-            "key-63",
-            "values-1741962849",
-            "key-26",
-            "values-948582805",
-            "key-31",
-            "values-47004766",
-            "key-90",
-            "values-1304302008",
-            "key-69",
-            "values-2120328211",
-            "key-111",
-            "values-2053321468",
-            "key-69",
-            "values--498524858",
-            "key-125",
-            "values--193004619",
-            "key-30",
-            "values--1142090845",
-            "key-15",
-            "values--1334900170",
-            "key-33",
-            "values-1011001500",
-            "key-55",
-            "values-452401605",
-            "key-18",
-            "values-1260118555",
-            "key-44",
-            "values--1109396459",
-            "key-2",
-            "values--555647718",
-            "key-61",
-            "values-1060742038",
-            "key-51",
-            "values--827099230",
-            "key-62",
-            "values--1443716296",
-            "key-16",
-            "values-534556355",
-            "key-81",
-            "values--787910427",
-            "key-20",
-            "values-1429697120",
-            "key-36",
-            "values--1775988293",
-            "key-66",
-            "values-624669635",
-            "key-25",
-            "values--684183265",
-            "key-26",
-            "values-293626449",
-            "key-91",
-            "values--1212867803",
-            "key-6",
-            "values-1778251481",
-            "key-83",
-            "values-1257370908",
-            "key-92",
-            "values--1120490028",
-            "key-111",
-            "values-9646496",
-            "key-90",
-            "values-1485206899");
-    failingAction.applyToTestMap(map);
-    failingAction.verifyTestMap(map);
-  }
-
-  @Test
-  void priorFailingCase1() {
-    TagMap map = makeTagMap(put("key-68", "values--37178328"), put("key-93", "values--2093086281"));
-
-    MapAction failingAction =
-        putAllTagMap(
-            "key-36",
-            "values--1951535044",
-            "key-59",
-            "values--1045985660",
-            "key-68",
-            "values-1270827526",
-            "key-65",
-            "values-440073158",
-            "key-91",
-            "values-954365843",
-            "key-75",
-            "values-1014366449",
-            "key-117",
-            "values--1306617705",
-            "key-90",
-            "values-984567966",
-            "key-120",
-            "values--1802603599",
-            "key-56",
-            "values-319574488",
-            "key-78",
-            "values--711288173",
-            "key-103",
-            "values-694279462",
-            "key-84",
-            "values-1391260657",
-            "key-59",
-            "values--484807195",
-            "key-67",
-            "values-1675498322",
-            "key-91",
-            "values--227731796",
-            "key-105",
-            "values--1471022333",
-            "key-112",
-            "values--755617374",
-            "key-117",
-            "values--668324524",
-            "key-65",
-            "values-1165174761",
-            "key-13",
-            "values--1947081814",
-            "key-72",
-            "values-2032502631",
-            "key-106",
-            "values-256372025",
-            "key-71",
-            "values--995163162",
-            "key-92",
-            "values-972782926",
-            "key-116",
-            "values-25012447",
-            "key-23",
-            "values--979671053",
-            "key-94",
-            "values-367125724",
-            "key-48",
-            "values--2011523144",
-            "key-14",
-            "values-578926680",
-            "key-65",
-            "values-1325737627",
-            "key-89",
-            "values-1539092266",
-            "key-100",
-            "values--319629978",
-            "key-53",
-            "values-1125496255",
-            "key-2",
-            "values-1988036327",
-            "key-105",
-            "values--1333468536",
-            "key-37",
-            "values-351345678",
-            "key-4",
-            "values-683252782",
-            "key-62",
-            "values--1466612877",
-            "key-100",
-            "values-268100559",
-            "key-104",
-            "values-3517495",
-            "key-48",
-            "values--1588410835",
-            "key-42",
-            "values--180653405",
-            "key-118",
-            "values--1181647255",
-            "key-17",
-            "values-509279769",
-            "key-33",
-            "values-298668287",
-            "key-76",
-            "values-2062435628",
-            "key-18",
-            "values-287811864",
-            "key-46",
-            "values--1337930894",
-            "key-50",
-            "values-2089310564",
-            "key-24",
-            "values--1870293199",
-            "key-47",
-            "values--1155431370",
-            "key-81",
-            "values--1507929564",
-            "key-115",
-            "values-1149614815",
-            "key-57",
-            "values--334611395",
-            "key-86",
-            "values-146447703",
-            "key-107",
-            "values-938082683",
-            "key-38",
-            "values-338654203",
-            "key-40",
-            "values--376260149",
-            "key-20",
-            "values--860844060",
-            "key-20",
-            "values-2003129702",
-            "key-75",
-            "values--1787311067",
-            "key-39",
-            "values--1988768973",
-            "key-58",
-            "values--479797619",
-            "key-16",
-            "values-571033631",
-            "key-65",
-            "values--1867296166",
-            "key-56",
-            "values--2071960469",
-            "key-12",
-            "values-821930484",
-            "key-40",
-            "values--54692885",
-            "key-65",
-            "values-328817493",
-            "key-121",
-            "values-1276016318",
-            "key-33",
-            "values--2081652233",
-            "key-31",
-            "values-381335133",
-            "key-77",
-            "values-1486312656",
-            "key-48",
-            "values--1058365372",
-            "key-109",
-            "values--733344537",
-            "key-85",
-            "values-1236864082",
-            "key-35",
-            "values-2045087594",
-            "key-49",
-            "values-1990762822",
-            "key-38",
-            "values--1582706513",
-            "key-18",
-            "values--626997990",
-            "key-80",
-            "values--1995264473",
-            "key-126",
-            "values--558193472",
-            "key-83",
-            "values-415016167",
-            "key-53",
-            "values-1348674948",
-            "key-58",
-            "values-612738550",
-            "key-12",
-            "values-417676134",
-            "key-101",
-            "values--58098778",
-            "key-127",
-            "values-1658306930",
-            "key-17",
-            "values-985378289",
-            "key-68",
-            "values-686600535",
-            "key-36",
-            "values-365513638",
-            "key-87",
-            "values--1737233661",
-            "key-67",
-            "values--1840935230",
-            "key-8",
-            "values-540289596",
-            "key-11",
-            "values--2045114386",
-            "key-38",
-            "values--786598887",
-            "key-48",
-            "values-1877144385",
-            "key-5",
-            "values-65838542",
-            "key-18",
-            "values-263200779",
-            "key-120",
-            "values--1500947489",
-            "key-65",
-            "values-769990109",
-            "key-38",
-            "values-1886840000",
-            "key-29",
-            "values--48760205",
-            "key-61",
-            "values--1942966789");
-    failingAction.applyToTestMap(map);
-    failingAction.verifyTestMap(map);
-  }
-
-  @Test
-  void priorFailingCase2() {
-    TestCase testCase =
-        new TestCase(
-            remove("key-34"),
-            put("key-122", "values-1828753938"),
-            putAll(
-                "key-123",
-                "values--118789056",
-                "key-28",
-                "values--751841781",
-                "key-105",
-                "values-1663318183",
-                "key-63",
-                "values--2036414463",
-                "key-74",
-                "values-1584612783",
-                "key-118",
-                "values--414681411",
+    static final int NUM_KEYS = 128;
+    static final int MAX_NUM_ACTIONS = 32;
+    static final int MIN_NUM_ACTIONS = 8;
+
+    @Test
+    void test() {
+        test(generateTest());
+    }
+
+    @Test
+    void testMerge() {
+        TestCase mapACase = generateTest();
+        TestCase mapBCase = generateTest();
+
+        TagMap tagMapA = test(mapACase);
+        TagMap tagMapB = test(mapBCase);
+
+        HashMap<String, Object> hashMapA = new HashMap<>(tagMapA);
+        HashMap<String, Object> hashMapB = new HashMap<>(tagMapB);
+
+        tagMapA.putAll(tagMapB);
+        hashMapA.putAll(hashMapB);
+
+        assertMapEquals(hashMapA, tagMapA);
+    }
+
+    @Test
+    void priorFailingCase0() {
+        TagMap map = makeTagMap(
+                remove("key-4"),
+                put("key-71", "values-443049055"),
+                put("key-2", "values-1227065898"),
+                put("key-25", "values-696891692"),
+                put("key-93", "values-763707175"),
+                put("key-23", "values--1514091210"),
+                put("key-16", "values--1388742686"));
+
+        MapAction failingAction = putAllTagMap(
+                "key-17",
+                "values--2085338893",
+                "key-51",
+                "values-960243765",
+                "key-33",
+                "values-1493544499",
+                "key-46",
+                "values-697926849",
+                "key-70",
+                "values--184054454",
                 "key-67",
-                "values-1154668404",
-                "key-1",
-                "values--1755856616",
-                "key-89",
-                "values--344740102",
+                "values-374577326",
+                "key-9",
+                "values--742453833",
+                "key-11",
+                "values-1606950841",
+                "key-119",
+                "values--1914593057",
+                "key-53",
+                "values-375236438",
+                "key-96",
+                "values--107185569",
+                "key-47",
+                "values--1276407408",
+                "key-125",
+                "values--1627172151",
                 "key-110",
-                "values-1884649283",
-                "key-1",
-                "values--1420345075",
-                "key-22",
-                "values-1951712698",
-                "key-103",
-                "values-488559164",
+                "values--1227150283",
+                "key-15",
+                "values-380379920",
+                "key-42",
+                "values--632271048",
+                "key-99",
+                "values--650090786",
                 "key-8",
-                "values-1180668912",
-                "key-44",
-                "values-290310046",
+                "values--1990889145",
+                "key-103",
+                "values-1815698254",
+                "key-120",
+                "values-279025031",
+                "key-93",
+                "values-589795963",
+                "key-12",
+                "values--935895941",
                 "key-105",
-                "values--303926067",
+                "values-94976227",
+                "key-85",
+                "values--424609970",
+                "key-78",
+                "values-1231948102",
+                "key-115",
+                "values-88670282",
                 "key-26",
-                "values-910376351",
+                "values-733903384",
+                "key-100",
+                "values-2102967487",
+                "key-74",
+                "values-958598087",
+                "key-104",
+                "values-264458254",
+                "key-125",
+                "values--1781797927",
+                "key-27",
+                "values--562810078",
+                "key-7",
+                "values--376776745",
+                "key-111",
+                "values-263564677",
+                "key-50",
+                "values--859673100",
+                "key-57",
+                "values-1585057281",
+                "key-48",
+                "values--617889787",
+                "key-98",
+                "values--1878108220",
+                "key-9",
+                "values--227223375",
                 "key-59",
-                "values-1600204544",
-                "key-23",
-                "values-425861746",
-                "key-76",
-                "values--1045446587",
-                "key-21",
-                "values-453905226",
+                "values-1577082288",
+                "key-94",
+                "values--268049040",
+                "key-0",
+                "values-1708355496",
+                "key-62",
+                "values--733451297",
+                "key-14",
+                "values-232732747",
+                "key-4",
+                "values--406605642",
+                "key-58",
+                "values-1772476833",
+                "key-8",
+                "values--1155025225",
+                "key-101",
+                "values-144480545",
+                "key-66",
+                "values-355117269",
+                "key-121",
+                "values-1858008722",
+                "key-33",
+                "values-1947754079",
                 "key-1",
-                "values-286624672",
-                "key-69",
-                "values-934359656",
+                "values--1475603838",
+                "key-125",
+                "values--2146772243",
+                "key-117",
+                "values-852022714",
+                "key-53",
+                "values--2039348506",
+                "key-65",
+                "values-2011228657",
+                "key-108",
+                "values-1581592518",
+                "key-17",
+                "values-2129571020",
+                "key-5",
+                "values-1106900841",
+                "key-80",
+                "values-1791757923",
+                "key-18",
+                "values--1992962227",
+                "key-2",
+                "values-328863878",
+                "key-110",
+                "values-1182949334",
+                "key-5",
+                "values-1049403346",
+                "key-107",
+                "values-1246502060",
+                "key-115",
+                "values-2053931423",
+                "key-19",
+                "values--1731179633",
+                "key-104",
+                "values--1090790550",
+                "key-67",
+                "values--1312759979",
+                "key-10",
+                "values-1411135",
+                "key-109",
+                "values--1784920248",
+                "key-20",
+                "values--827644780",
+                "key-55",
+                "values--1610270998",
+                "key-60",
+                "values-1287959520",
+                "key-31",
+                "values-1686541667",
+                "key-41",
+                "values-399844058",
+                "key-115",
+                "values-2045201464",
+                "key-78",
+                "values-358081227",
                 "key-57",
-                "values--1890465763",
-                "key-13",
-                "values--1949062639",
+                "values--1374149269",
+                "key-65",
+                "values-1871734555",
+                "key-124",
+                "values--211494558",
+                "key-119",
+                "values-1757597102",
+                "key-32",
+                "values--336988038",
+                "key-85",
+                "values-1415155858",
+                "key-44",
+                "values-1455425178",
+                "key-48",
+                "values--325658059",
                 "key-68",
-                "values-242077328",
-                "key-42",
-                "values--1584075743",
-                "key-46",
-                "values--1306318288",
+                "values--793590840",
+                "key-96",
+                "values--2010766492",
+                "key-40",
+                "values-2007171160",
+                "key-29",
+                "values-186945230",
+                "key-63",
+                "values-1741962849",
+                "key-26",
+                "values-948582805",
                 "key-31",
-                "values--848418043",
-                "key-71",
-                "values--1547961101",
-                "key-121",
-                "values--1493693636",
-                "key-24",
-                "values-330660358",
-                "key-24",
-                "values--1466871690",
-                "key-91",
-                "values--995064376",
+                "values-47004766",
+                "key-90",
+                "values-1304302008",
+                "key-69",
+                "values-2120328211",
+                "key-111",
+                "values-2053321468",
+                "key-69",
+                "values--498524858",
+                "key-125",
+                "values--193004619",
+                "key-30",
+                "values--1142090845",
+                "key-15",
+                "values--1334900170",
+                "key-33",
+                "values-1011001500",
+                "key-55",
+                "values-452401605",
                 "key-18",
-                "values-1615316779",
-                "key-124",
-                "values--296191510",
-                "key-52",
-                "values-740309054",
-                "key-8",
-                "values-1777392898",
-                "key-73",
-                "values-92831985",
-                "key-13",
-                "values--1711360891",
-                "key-114",
-                "values-1960346620",
+                "values-1260118555",
                 "key-44",
-                "values--1599497099",
-                "key-107",
-                "values-668485357",
-                "key-116",
-                "values--1792788504"),
-            put("key-123", "values--1844485682"),
-            putAll(
-                "key-64",
-                "values--1694520036",
-                "key-17",
-                "values--469732912",
-                "key-79",
-                "values--1293521097",
-                "key-11",
-                "values--2000592955",
-                "key-98",
-                "values-517073723",
-                "key-28",
-                "values-1085152681",
-                "key-34",
-                "values-1943586726",
-                "key-3",
-                "values-216087991",
-                "key-97",
-                "values-222660872",
-                "key-41",
-                "values-90906196",
-                "key-63",
-                "values--934208984",
-                "key-57",
-                "values-327167184",
+                "values--1109396459",
+                "key-2",
+                "values--555647718",
+                "key-61",
+                "values-1060742038",
+                "key-51",
+                "values--827099230",
+                "key-62",
+                "values--1443716296",
+                "key-16",
+                "values-534556355",
+                "key-81",
+                "values--787910427",
+                "key-20",
+                "values-1429697120",
+                "key-36",
+                "values--1775988293",
+                "key-66",
+                "values-624669635",
+                "key-25",
+                "values--684183265",
+                "key-26",
+                "values-293626449",
+                "key-91",
+                "values--1212867803",
+                "key-6",
+                "values-1778251481",
+                "key-83",
+                "values-1257370908",
+                "key-92",
+                "values--1120490028",
                 "key-111",
-                "values--1059115125",
+                "values-9646496",
+                "key-90",
+                "values-1485206899");
+        failingAction.applyToTestMap(map);
+        failingAction.verifyTestMap(map);
+    }
+
+    @Test
+    void priorFailingCase1() {
+        TagMap map = makeTagMap(put("key-68", "values--37178328"), put("key-93", "values--2093086281"));
+
+        MapAction failingAction = putAllTagMap(
+                "key-36",
+                "values--1951535044",
+                "key-59",
+                "values--1045985660",
+                "key-68",
+                "values-1270827526",
+                "key-65",
+                "values-440073158",
+                "key-91",
+                "values-954365843",
                 "key-75",
-                "values--2031064209",
-                "key-8",
-                "values-1924310140",
-                "key-69",
-                "values--362514182",
+                "values-1014366449",
+                "key-117",
+                "values--1306617705",
                 "key-90",
-                "values-852043703",
-                "key-98",
-                "values--998302860",
-                "key-49",
-                "values-1658920804",
+                "values-984567966",
+                "key-120",
+                "values--1802603599",
+                "key-56",
+                "values-319574488",
+                "key-78",
+                "values--711288173",
+                "key-103",
+                "values-694279462",
+                "key-84",
+                "values-1391260657",
+                "key-59",
+                "values--484807195",
+                "key-67",
+                "values-1675498322",
+                "key-91",
+                "values--227731796",
+                "key-105",
+                "values--1471022333",
+                "key-112",
+                "values--755617374",
+                "key-117",
+                "values--668324524",
+                "key-65",
+                "values-1165174761",
+                "key-13",
+                "values--1947081814",
+                "key-72",
+                "values-2032502631",
                 "key-106",
-                "values--227162298",
-                "key-25",
-                "values-493046373",
-                "key-52",
-                "values--555623542",
-                "key-77",
-                "values--717275660",
-                "key-31",
-                "values-1930766287",
-                "key-69",
-                "values--1367213079",
-                "key-38",
-                "values--1112081116",
+                "values-256372025",
+                "key-71",
+                "values--995163162",
+                "key-92",
+                "values-972782926",
+                "key-116",
+                "values-25012447",
+                "key-23",
+                "values--979671053",
+                "key-94",
+                "values-367125724",
+                "key-48",
+                "values--2011523144",
+                "key-14",
+                "values-578926680",
                 "key-65",
-                "values--1916889923",
-                "key-96",
-                "values-157036191",
-                "key-127",
-                "values--302553995",
-                "key-38",
-                "values-485874872",
-                "key-110",
-                "values--855874569",
-                "key-39",
-                "values--390829775",
-                "key-7",
-                "values--452123269",
-                "key-63",
-                "values--527204905",
-                "key-101",
-                "values-166173307",
-                "key-126",
-                "values-1050454498",
+                "values-1325737627",
+                "key-89",
+                "values-1539092266",
+                "key-100",
+                "values--319629978",
+                "key-53",
+                "values-1125496255",
+                "key-2",
+                "values-1988036327",
+                "key-105",
+                "values--1333468536",
+                "key-37",
+                "values-351345678",
                 "key-4",
-                "values--215188400",
-                "key-25",
-                "values-947961204",
+                "values-683252782",
+                "key-62",
+                "values--1466612877",
+                "key-100",
+                "values-268100559",
+                "key-104",
+                "values-3517495",
+                "key-48",
+                "values--1588410835",
                 "key-42",
-                "values-145803888",
-                "key-1",
-                "values--970532578",
-                "key-43",
-                "values--1675493776",
-                "key-29",
-                "values-1193328809",
-                "key-108",
-                "values-1302659140",
-                "key-120",
-                "values--1722764270",
+                "values--180653405",
+                "key-118",
+                "values--1181647255",
+                "key-17",
+                "values-509279769",
+                "key-33",
+                "values-298668287",
+                "key-76",
+                "values-2062435628",
+                "key-18",
+                "values-287811864",
+                "key-46",
+                "values--1337930894",
+                "key-50",
+                "values-2089310564",
                 "key-24",
-                "values--483238806",
-                "key-53",
-                "values-611589672",
+                "values--1870293199",
+                "key-47",
+                "values--1155431370",
+                "key-81",
+                "values--1507929564",
+                "key-115",
+                "values-1149614815",
+                "key-57",
+                "values--334611395",
+                "key-86",
+                "values-146447703",
+                "key-107",
+                "values-938082683",
+                "key-38",
+                "values-338654203",
+                "key-40",
+                "values--376260149",
+                "key-20",
+                "values--860844060",
+                "key-20",
+                "values-2003129702",
+                "key-75",
+                "values--1787311067",
                 "key-39",
-                "values--229429656",
-                "key-29",
-                "values--733337788",
-                "key-9",
-                "values-736222322",
-                "key-74",
-                "values--950770749",
-                "key-91",
-                "values-202817768",
-                "key-95",
-                "values-500260096",
-                "key-71",
-                "values--1798188865",
+                "values--1988768973",
+                "key-58",
+                "values--479797619",
+                "key-16",
+                "values-571033631",
+                "key-65",
+                "values--1867296166",
+                "key-56",
+                "values--2071960469",
                 "key-12",
-                "values--1936098297",
-                "key-28",
-                "values--2116134632",
-                "key-21",
-                "values-799594067",
-                "key-68",
-                "values--333178107",
-                "key-50",
-                "values-445767791",
-                "key-88",
-                "values-1307699662",
-                "key-69",
-                "values--110615017",
-                "key-25",
-                "values-699603233",
-                "key-101",
-                "values--2093413536",
-                "key-91",
-                "values--2022040839",
-                "key-45",
-                "values-888546703",
+                "values-821930484",
                 "key-40",
-                "values--2140684954",
-                "key-1",
-                "values-371033654",
-                "key-68",
-                "values--20293415",
-                "key-59",
-                "values-697437101",
-                "key-43",
-                "values--1145022834",
-                "key-62",
-                "values--2125187195",
-                "key-15",
-                "values--1062944166",
-                "key-103",
-                "values--889634836",
-                "key-125",
-                "values-8694763",
-                "key-101",
-                "values--281475498",
-                "key-13",
-                "values-1972488719",
-                "key-32",
-                "values-1900833863",
-                "key-119",
-                "values--926978044",
-                "key-82",
-                "values-288820151",
-                "key-78",
-                "values--303310027",
-                "key-25",
-                "values--1284661437",
-                "key-47",
-                "values-1624726045",
-                "key-14",
-                "values-1658036950",
+                "values--54692885",
                 "key-65",
-                "values-1629683219",
-                "key-10",
-                "values-275264679",
-                "key-126",
-                "values--592085694",
-                "key-32",
-                "values-1844385705",
-                "key-85",
-                "values--1815321660",
-                "key-72",
-                "values-918231225",
-                "key-91",
-                "values-675699466",
+                "values-328817493",
                 "key-121",
-                "values--2008685332",
-                "key-61",
-                "values--1398921570",
-                "key-19",
-                "values-617817427",
-                "key-122",
-                "values--793708860",
-                "key-41",
-                "values--2027225350",
-                "key-41",
-                "values-1194206680",
-                "key-1",
-                "values-1116090448",
+                "values-1276016318",
+                "key-33",
+                "values--2081652233",
+                "key-31",
+                "values-381335133",
+                "key-77",
+                "values-1486312656",
+                "key-48",
+                "values--1058365372",
+                "key-109",
+                "values--733344537",
+                "key-85",
+                "values-1236864082",
+                "key-35",
+                "values-2045087594",
                 "key-49",
-                "values-1662444555",
-                "key-54",
-                "values-747436284",
-                "key-118",
-                "values--1367237858",
-                "key-65",
-                "values-133495093",
-                "key-73",
-                "values--1451855551",
-                "key-43",
-                "values--357794833",
-                "key-76",
-                "values-129403123",
-                "key-59",
-                "values--65688873",
-                "key-22",
-                "values-480031738",
-                "key-73",
-                "values--310815862",
-                "key-0",
-                "values--1734944386",
-                "key-56",
-                "values--540459893",
+                "values-1990762822",
                 "key-38",
-                "values-1308912555",
-                "key-2",
-                "values--2073028093",
-                "key-14",
-                "values--693713438",
-                "key-76",
-                "values-295450436",
-                "key-113",
-                "values--2065146687",
-                "key-0",
-                "values-2076623027",
+                "values--1582706513",
+                "key-18",
+                "values--626997990",
+                "key-80",
+                "values--1995264473",
+                "key-126",
+                "values--558193472",
+                "key-83",
+                "values-415016167",
+                "key-53",
+                "values-1348674948",
+                "key-58",
+                "values-612738550",
+                "key-12",
+                "values-417676134",
+                "key-101",
+                "values--58098778",
+                "key-127",
+                "values-1658306930",
                 "key-17",
-                "values--1394046356",
-                "key-78",
-                "values--2014478659",
+                "values-985378289",
+                "key-68",
+                "values-686600535",
+                "key-36",
+                "values-365513638",
+                "key-87",
+                "values--1737233661",
+                "key-67",
+                "values--1840935230",
+                "key-8",
+                "values-540289596",
+                "key-11",
+                "values--2045114386",
+                "key-38",
+                "values--786598887",
+                "key-48",
+                "values-1877144385",
                 "key-5",
-                "values--665180960"),
-            put("key-124", "values-460160716"),
-            put("key-112", "values--1828904046"),
-            put("key-41", "values--904162962"));
-
-    Map<String, Object> expected = makeMap(testCase);
-    TagMap actual = makeTagMap(testCase);
-
-    MapAction failingAction = remove("key-127");
-    failingAction.applyToExpectedMap(expected);
-
-    failingAction.applyToTestMap(actual);
-    failingAction.verifyTestMap(actual);
-
-    assertMapEquals(expected, actual);
-  }
-
-  public static final TagMap test(MapAction... actions) {
-    return test(new TestCase(Arrays.asList(actions)));
-  }
-
-  public static final Map<String, Object> makeMap(TestCase testCase) {
-    return makeMap(testCase.actions);
-  }
-
-  public static final Map<String, Object> makeMap(MapAction... actions) {
-    return makeMap(Arrays.asList(actions));
-  }
-
-  public static final Map<String, Object> makeMap(List<MapAction> actions) {
-    Map<String, Object> map = new HashMap<>();
-    for (MapAction action : actions) {
-      action.applyToExpectedMap(map);
+                "values-65838542",
+                "key-18",
+                "values-263200779",
+                "key-120",
+                "values--1500947489",
+                "key-65",
+                "values-769990109",
+                "key-38",
+                "values-1886840000",
+                "key-29",
+                "values--48760205",
+                "key-61",
+                "values--1942966789");
+        failingAction.applyToTestMap(map);
+        failingAction.verifyTestMap(map);
+    }
+
+    @Test
+    void priorFailingCase2() {
+        TestCase testCase = new TestCase(
+                remove("key-34"),
+                put("key-122", "values-1828753938"),
+                putAll(
+                        "key-123",
+                        "values--118789056",
+                        "key-28",
+                        "values--751841781",
+                        "key-105",
+                        "values-1663318183",
+                        "key-63",
+                        "values--2036414463",
+                        "key-74",
+                        "values-1584612783",
+                        "key-118",
+                        "values--414681411",
+                        "key-67",
+                        "values-1154668404",
+                        "key-1",
+                        "values--1755856616",
+                        "key-89",
+                        "values--344740102",
+                        "key-110",
+                        "values-1884649283",
+                        "key-1",
+                        "values--1420345075",
+                        "key-22",
+                        "values-1951712698",
+                        "key-103",
+                        "values-488559164",
+                        "key-8",
+                        "values-1180668912",
+                        "key-44",
+                        "values-290310046",
+                        "key-105",
+                        "values--303926067",
+                        "key-26",
+                        "values-910376351",
+                        "key-59",
+                        "values-1600204544",
+                        "key-23",
+                        "values-425861746",
+                        "key-76",
+                        "values--1045446587",
+                        "key-21",
+                        "values-453905226",
+                        "key-1",
+                        "values-286624672",
+                        "key-69",
+                        "values-934359656",
+                        "key-57",
+                        "values--1890465763",
+                        "key-13",
+                        "values--1949062639",
+                        "key-68",
+                        "values-242077328",
+                        "key-42",
+                        "values--1584075743",
+                        "key-46",
+                        "values--1306318288",
+                        "key-31",
+                        "values--848418043",
+                        "key-71",
+                        "values--1547961101",
+                        "key-121",
+                        "values--1493693636",
+                        "key-24",
+                        "values-330660358",
+                        "key-24",
+                        "values--1466871690",
+                        "key-91",
+                        "values--995064376",
+                        "key-18",
+                        "values-1615316779",
+                        "key-124",
+                        "values--296191510",
+                        "key-52",
+                        "values-740309054",
+                        "key-8",
+                        "values-1777392898",
+                        "key-73",
+                        "values-92831985",
+                        "key-13",
+                        "values--1711360891",
+                        "key-114",
+                        "values-1960346620",
+                        "key-44",
+                        "values--1599497099",
+                        "key-107",
+                        "values-668485357",
+                        "key-116",
+                        "values--1792788504"),
+                put("key-123", "values--1844485682"),
+                putAll(
+                        "key-64",
+                        "values--1694520036",
+                        "key-17",
+                        "values--469732912",
+                        "key-79",
+                        "values--1293521097",
+                        "key-11",
+                        "values--2000592955",
+                        "key-98",
+                        "values-517073723",
+                        "key-28",
+                        "values-1085152681",
+                        "key-34",
+                        "values-1943586726",
+                        "key-3",
+                        "values-216087991",
+                        "key-97",
+                        "values-222660872",
+                        "key-41",
+                        "values-90906196",
+                        "key-63",
+                        "values--934208984",
+                        "key-57",
+                        "values-327167184",
+                        "key-111",
+                        "values--1059115125",
+                        "key-75",
+                        "values--2031064209",
+                        "key-8",
+                        "values-1924310140",
+                        "key-69",
+                        "values--362514182",
+                        "key-90",
+                        "values-852043703",
+                        "key-98",
+                        "values--998302860",
+                        "key-49",
+                        "values-1658920804",
+                        "key-106",
+                        "values--227162298",
+                        "key-25",
+                        "values-493046373",
+                        "key-52",
+                        "values--555623542",
+                        "key-77",
+                        "values--717275660",
+                        "key-31",
+                        "values-1930766287",
+                        "key-69",
+                        "values--1367213079",
+                        "key-38",
+                        "values--1112081116",
+                        "key-65",
+                        "values--1916889923",
+                        "key-96",
+                        "values-157036191",
+                        "key-127",
+                        "values--302553995",
+                        "key-38",
+                        "values-485874872",
+                        "key-110",
+                        "values--855874569",
+                        "key-39",
+                        "values--390829775",
+                        "key-7",
+                        "values--452123269",
+                        "key-63",
+                        "values--527204905",
+                        "key-101",
+                        "values-166173307",
+                        "key-126",
+                        "values-1050454498",
+                        "key-4",
+                        "values--215188400",
+                        "key-25",
+                        "values-947961204",
+                        "key-42",
+                        "values-145803888",
+                        "key-1",
+                        "values--970532578",
+                        "key-43",
+                        "values--1675493776",
+                        "key-29",
+                        "values-1193328809",
+                        "key-108",
+                        "values-1302659140",
+                        "key-120",
+                        "values--1722764270",
+                        "key-24",
+                        "values--483238806",
+                        "key-53",
+                        "values-611589672",
+                        "key-39",
+                        "values--229429656",
+                        "key-29",
+                        "values--733337788",
+                        "key-9",
+                        "values-736222322",
+                        "key-74",
+                        "values--950770749",
+                        "key-91",
+                        "values-202817768",
+                        "key-95",
+                        "values-500260096",
+                        "key-71",
+                        "values--1798188865",
+                        "key-12",
+                        "values--1936098297",
+                        "key-28",
+                        "values--2116134632",
+                        "key-21",
+                        "values-799594067",
+                        "key-68",
+                        "values--333178107",
+                        "key-50",
+                        "values-445767791",
+                        "key-88",
+                        "values-1307699662",
+                        "key-69",
+                        "values--110615017",
+                        "key-25",
+                        "values-699603233",
+                        "key-101",
+                        "values--2093413536",
+                        "key-91",
+                        "values--2022040839",
+                        "key-45",
+                        "values-888546703",
+                        "key-40",
+                        "values--2140684954",
+                        "key-1",
+                        "values-371033654",
+                        "key-68",
+                        "values--20293415",
+                        "key-59",
+                        "values-697437101",
+                        "key-43",
+                        "values--1145022834",
+                        "key-62",
+                        "values--2125187195",
+                        "key-15",
+                        "values--1062944166",
+                        "key-103",
+                        "values--889634836",
+                        "key-125",
+                        "values-8694763",
+                        "key-101",
+                        "values--281475498",
+                        "key-13",
+                        "values-1972488719",
+                        "key-32",
+                        "values-1900833863",
+                        "key-119",
+                        "values--926978044",
+                        "key-82",
+                        "values-288820151",
+                        "key-78",
+                        "values--303310027",
+                        "key-25",
+                        "values--1284661437",
+                        "key-47",
+                        "values-1624726045",
+                        "key-14",
+                        "values-1658036950",
+                        "key-65",
+                        "values-1629683219",
+                        "key-10",
+                        "values-275264679",
+                        "key-126",
+                        "values--592085694",
+                        "key-32",
+                        "values-1844385705",
+                        "key-85",
+                        "values--1815321660",
+                        "key-72",
+                        "values-918231225",
+                        "key-91",
+                        "values-675699466",
+                        "key-121",
+                        "values--2008685332",
+                        "key-61",
+                        "values--1398921570",
+                        "key-19",
+                        "values-617817427",
+                        "key-122",
+                        "values--793708860",
+                        "key-41",
+                        "values--2027225350",
+                        "key-41",
+                        "values-1194206680",
+                        "key-1",
+                        "values-1116090448",
+                        "key-49",
+                        "values-1662444555",
+                        "key-54",
+                        "values-747436284",
+                        "key-118",
+                        "values--1367237858",
+                        "key-65",
+                        "values-133495093",
+                        "key-73",
+                        "values--1451855551",
+                        "key-43",
+                        "values--357794833",
+                        "key-76",
+                        "values-129403123",
+                        "key-59",
+                        "values--65688873",
+                        "key-22",
+                        "values-480031738",
+                        "key-73",
+                        "values--310815862",
+                        "key-0",
+                        "values--1734944386",
+                        "key-56",
+                        "values--540459893",
+                        "key-38",
+                        "values-1308912555",
+                        "key-2",
+                        "values--2073028093",
+                        "key-14",
+                        "values--693713438",
+                        "key-76",
+                        "values-295450436",
+                        "key-113",
+                        "values--2065146687",
+                        "key-0",
+                        "values-2076623027",
+                        "key-17",
+                        "values--1394046356",
+                        "key-78",
+                        "values--2014478659",
+                        "key-5",
+                        "values--665180960"),
+                put("key-124", "values-460160716"),
+                put("key-112", "values--1828904046"),
+                put("key-41", "values--904162962"));
+
+        Map<String, Object> expected = makeMap(testCase);
+        TagMap actual = makeTagMap(testCase);
+
+        MapAction failingAction = remove("key-127");
+        failingAction.applyToExpectedMap(expected);
+
+        failingAction.applyToTestMap(actual);
+        failingAction.verifyTestMap(actual);
+
+        assertMapEquals(expected, actual);
+    }
+
+    public static final TagMap test(MapAction... actions) {
+        return test(new TestCase(Arrays.asList(actions)));
+    }
+
+    public static final Map<String, Object> makeMap(TestCase testCase) {
+        return makeMap(testCase.actions);
+    }
+
+    public static final Map<String, Object> makeMap(MapAction... actions) {
+        return makeMap(Arrays.asList(actions));
+    }
+
+    public static final Map<String, Object> makeMap(List<MapAction> actions) {
+        Map<String, Object> map = new HashMap<>();
+        for (MapAction action : actions) {
+            action.applyToExpectedMap(map);
+        }
+        return map;
+    }
+
+    public static final TagMap makeTagMap(TestCase testCase) {
+        return makeTagMap(testCase.actions);
+    }
+
+    public static final TagMap makeTagMap(MapAction... actions) {
+        return makeTagMap(Arrays.asList(actions));
     }
-    return map;
-  }
-
-  public static final TagMap makeTagMap(TestCase testCase) {
-    return makeTagMap(testCase.actions);
-  }
 
-  public static final TagMap makeTagMap(MapAction... actions) {
-    return makeTagMap(Arrays.asList(actions));
-  }
-
-  public static final TagMap makeTagMap(List<MapAction> actions) {
-    TagMap map = new TagMap();
-    for (MapAction action : actions) {
-      action.applyToTestMap(map);
+    public static final TagMap makeTagMap(List<MapAction> actions) {
+        TagMap map = new TagMap();
+        for (MapAction action : actions) {
+            action.applyToTestMap(map);
+        }
+        return map;
     }
-    return map;
-  }
 
-  public static final TagMap test(TestCase test) {
-    List<MapAction> actions = test.actions();
+    public static final TagMap test(TestCase test) {
+        List<MapAction> actions = test.actions();
 
-    Map<String, Object> hashMap = new HashMap<>();
-    TagMap tagMap = new TagMap();
+        Map<String, Object> hashMap = new HashMap<>();
+        TagMap tagMap = new TagMap();
 
-    int actionIndex = 0;
-    try {
-      for (actionIndex = 0; actionIndex < actions.size(); ++actionIndex) {
-        MapAction action = actions.get(actionIndex);
+        int actionIndex = 0;
+        try {
+            for (actionIndex = 0; actionIndex < actions.size(); ++actionIndex) {
+                MapAction action = actions.get(actionIndex);
 
-        Object expected = action.applyToExpectedMap(hashMap);
-        Object actual = action.applyToTestMap(tagMap);
+                Object expected = action.applyToExpectedMap(hashMap);
+                Object actual = action.applyToTestMap(tagMap);
 
-        action.verifyResults(expected, actual);
+                action.verifyResults(expected, actual);
 
-        action.verifyTestMap(tagMap);
+                action.verifyTestMap(tagMap);
 
-        assertMapEquals(hashMap, tagMap);
-      }
-    } catch (Error e) {
-      System.err.println(new TestCase(actions.subList(0, actionIndex + 1)));
+                assertMapEquals(hashMap, tagMap);
+            }
+        } catch (Error e) {
+            System.err.println(new TestCase(actions.subList(0, actionIndex + 1)));
 
-      throw e;
-    }
-    return tagMap;
-  }
-
-  public static final TestCase generateTest() {
-    int numActions =
-        ThreadLocalRandom.current().nextInt(MAX_NUM_ACTIONS - MIN_NUM_ACTIONS) + MIN_NUM_ACTIONS;
-    return generateTest(numActions);
-  }
-
-  public static final TestCase generateTest(int size) {
-    List<MapAction> actions = new ArrayList<>(size);
-    for (int i = 0; i < size; ++i) {
-      actions.add(randomAction());
-    }
-    return new TestCase(actions);
-  }
-
-  public static final MapAction randomAction() {
-    float actionSelector = ThreadLocalRandom.current().nextFloat();
-
-    switch (randomChoice(0.02, 0.1, 0.2)) {
-      case 0:
-        return clear();
-
-      case 1:
-        return randomChoice(
-            () -> putAll(randomKeysAndValues()),
-            () -> putAllTagMap(randomKeysAndValues()),
-            () -> putAllLedger(randomKeysAndValues()));
-
-      case 2:
-        return randomChoice(
-            () -> remove(randomKey()),
-            () -> removeLight(randomKey()),
-            () -> getAndRemove(randomKey()));
-
-      default:
-        return randomChoice(
-            () -> put(randomKey(), randomValue()),
-            () -> set(randomKey(), randomValue()),
-            () -> getAndSet(randomKey(), randomValue()));
+            throw e;
+        }
+        return tagMap;
     }
-  }
-
-  public static final MapAction put(String key, String value) {
-    return new Put(key, value);
-  }
-
-  public static final MapAction set(String key, String value) {
-    return new Set(key, value);
-  }
-
-  public static final MapAction getAndSet(String key, String value) {
-    return new GetAndSet(key, value);
-  }
-
-  public static final MapAction putAll(String... keysAndValues) {
-    return new PutAll(keysAndValues);
-  }
-
-  public static final MapAction putAllTagMap(String... keysAndValues) {
-    return new PutAllTagMap(keysAndValues);
-  }
-
-  public static final MapAction putAllLedger(String... keysAndValues) {
-    return new PutAllLedger(keysAndValues);
-  }
-
-  public static final MapAction clear() {
-    return Clear.INSTANCE;
-  }
-
-  public static final MapAction remove(String key) {
-    return new Remove(key);
-  }
 
-  public static final MapAction removeLight(String key) {
-    return new RemoveLight(key);
-  }
-
-  public static final MapAction getAndRemove(String key) {
-    return new GetAndRemove(key);
-  }
-
-  static final void assertMapEquals(Map<String, Object> expected, TagMap actual) {
-    // checks entries in both directions to make sure there's full intersection
-
-    for (Map.Entry<String, Object> expectedEntry : expected.entrySet()) {
-      TagMap.Entry actualEntry = actual.getEntry(expectedEntry.getKey());
-      assertNotNull(actualEntry);
-      assertEquals(expectedEntry.getValue(), actualEntry.getValue());
+    public static final TestCase generateTest() {
+        int numActions = ThreadLocalRandom.current().nextInt(MAX_NUM_ACTIONS - MIN_NUM_ACTIONS) + MIN_NUM_ACTIONS;
+        return generateTest(numActions);
     }
 
-    for (TagMap.EntryReader actualEntry : actual) {
-      Object expectedValue = expected.get(actualEntry.tag());
-      assertEquals(expectedValue, actualEntry.objectValue());
+    public static final TestCase generateTest(int size) {
+        List<MapAction> actions = new ArrayList<>(size);
+        for (int i = 0; i < size; ++i) {
+            actions.add(randomAction());
+        }
+        return new TestCase(actions);
     }
 
-    actual.checkIntegrity();
-  }
-
-  static final float randomFloat() {
-    return ThreadLocalRandom.current().nextFloat();
-  }
-
-  static final int randomChoice(int numChoices) {
-    return ThreadLocalRandom.current().nextInt(numChoices);
-  }
-
-  static final <T> T randomChoice(Supplier<T>... choiceSuppliers) {
-    int choice = randomChoice(choiceSuppliers.length);
+    public static final MapAction randomAction() {
+        float actionSelector = ThreadLocalRandom.current().nextFloat();
 
-    return choiceSuppliers[choice].get();
-  }
+        switch (randomChoice(0.02, 0.1, 0.2)) {
+            case 0:
+                return clear();
 
-  static final int randomChoice(double... proportions) {
-    double selector = ThreadLocalRandom.current().nextDouble();
+            case 1:
+                return randomChoice(
+                        () -> putAll(randomKeysAndValues()),
+                        () -> putAllTagMap(randomKeysAndValues()),
+                        () -> putAllLedger(randomKeysAndValues()));
 
-    for (int i = 0; i < proportions.length; ++i) {
-      if (selector < proportions[i]) return i;
+            case 2:
+                return randomChoice(
+                        () -> remove(randomKey()), () -> removeLight(randomKey()), () -> getAndRemove(randomKey()));
 
-      selector -= proportions[i];
+            default:
+                return randomChoice(
+                        () -> put(randomKey(), randomValue()),
+                        () -> set(randomKey(), randomValue()),
+                        () -> getAndSet(randomKey(), randomValue()));
+        }
     }
-    return proportions.length;
-  }
 
-  static final String randomKey() {
-    return "key-" + ThreadLocalRandom.current().nextInt(NUM_KEYS);
-  }
-
-  static final String randomValue() {
-    return "values-" + ThreadLocalRandom.current().nextInt();
-  }
-
-  static final String[] randomKeysAndValues() {
-    int numEntries = ThreadLocalRandom.current().nextInt(NUM_KEYS);
-
-    String[] keysAndValues = new String[numEntries << 1];
-    for (int i = 0; i < keysAndValues.length; i += 2) {
-      keysAndValues[i] = randomKey();
-      keysAndValues[i + 1] = randomValue();
+    public static final MapAction put(String key, String value) {
+        return new Put(key, value);
     }
-    return keysAndValues;
-  }
-
-  static final String literal(String str) {
-    return "\"" + str + "\"";
-  }
-
-  static final String literalVarArgs(String... strs) {
-    StringBuilder builder = new StringBuilder();
-    for (String str : strs) {
-      if (builder.length() != 0) builder.append(',');
-      builder.append(literal(str));
-    }
-    return builder.toString();
-  }
-
-  static final Map<String, String> mapOf(String... keysAndValues) {
-    HashMap<String, String> map = new HashMap<>(keysAndValues.length >> 1);
-    for (int i = 0; i < keysAndValues.length; i += 2) {
-      String key = keysAndValues[i];
-      String value = keysAndValues[i + 1];
 
-      map.put(key, value);
+    public static final MapAction set(String key, String value) {
+        return new Set(key, value);
     }
-    return map;
-  }
 
-  static final TagMap tagMapOf(String... keysAndValues) {
-    TagMap map = new TagMap();
-    for (int i = 0; i < keysAndValues.length; i += 2) {
-      String key = keysAndValues[i];
-      String value = keysAndValues[i + 1];
-
-      map.set(key, value);
+    public static final MapAction getAndSet(String key, String value) {
+        return new GetAndSet(key, value);
     }
-    map.checkIntegrity();
-
-    return map;
-  }
-
-  static final TagMap.Ledger ledgerOf(String... keysAndValues) {
-    TagMap.Ledger ledger = TagMap.ledger();
-    for (int i = 0; i < keysAndValues.length; i += 2) {
-      String key = keysAndValues[i];
-      String value = keysAndValues[i + 1];
 
-      ledger.set(key, value);
+    public static final MapAction putAll(String... keysAndValues) {
+        return new PutAll(keysAndValues);
     }
-    return ledger;
-  }
 
-  static final class TestCase {
-    final List<MapAction> actions;
-
-    TestCase(MapAction... actions) {
-      this.actions = Arrays.asList(actions);
+    public static final MapAction putAllTagMap(String... keysAndValues) {
+        return new PutAllTagMap(keysAndValues);
     }
 
-    TestCase(List<MapAction> actions) {
-      this.actions = actions;
+    public static final MapAction putAllLedger(String... keysAndValues) {
+        return new PutAllLedger(keysAndValues);
     }
 
-    public final List<MapAction> actions() {
-      return this.actions;
+    public static final MapAction clear() {
+        return Clear.INSTANCE;
     }
 
-    @Override
-    public String toString() {
-      StringBuilder builder = new StringBuilder();
-      for (MapAction action : this.actions) {
-        builder.append(action).append(',').append('\n');
-      }
-      return builder.toString();
+    public static final MapAction remove(String key) {
+        return new Remove(key);
     }
-  }
-
-  abstract static class MapAction {
-    public abstract Object applyToTestMap(TagMap testMap);
-
-    public abstract Object applyToExpectedMap(Map<String, Object> expectedMap);
 
-    public abstract void verifyResults(Object expected, Object actual);
-
-    public abstract void verifyTestMap(TagMap testMap);
-
-    public abstract String toString();
-  }
-
-  abstract static class BasicAction extends MapAction {
-    @Override
-    public final Object applyToTestMap(TagMap testMap) {
-      _applyToTestMap(testMap);
-
-      return void.class;
+    public static final MapAction removeLight(String key) {
+        return new RemoveLight(key);
     }
 
-    protected abstract void _applyToTestMap(TagMap testMap);
-
-    @Override
-    public final Object applyToExpectedMap(Map<String, Object> expectedMap) {
-      _applyToExpectedMap(expectedMap);
-
-      return void.class;
-    }
-
-    protected abstract void _applyToExpectedMap(Map<String, Object> expectedMap);
-
-    public final void verifyResults(Object expected, Object actual) {}
-  }
-
-  abstract static class BasicReturningAction<TResult> extends MapAction {
-    @Override
-    public final TResult applyToTestMap(TagMap testMap) {
-      return _applyToTestMap(testMap);
+    public static final MapAction getAndRemove(String key) {
+        return new GetAndRemove(key);
     }
 
-    protected abstract TResult _applyToTestMap(TagMap testMap);
+    static final void assertMapEquals(Map<String, Object> expected, TagMap actual) {
+        // checks entries in both directions to make sure there's full intersection
 
-    @Override
-    public final TResult applyToExpectedMap(Map<String, Object> expectedMap) {
-      return _applyToExpectedMap(expectedMap);
-    }
+        for (Map.Entry<String, Object> expectedEntry : expected.entrySet()) {
+            TagMap.Entry actualEntry = actual.getEntry(expectedEntry.getKey());
+            assertNotNull(actualEntry);
+            assertEquals(expectedEntry.getValue(), actualEntry.getValue());
+        }
 
-    protected abstract TResult _applyToExpectedMap(Map<String, Object> expectedMap);
+        for (TagMap.EntryReader actualEntry : actual) {
+            Object expectedValue = expected.get(actualEntry.tag());
+            assertEquals(expectedValue, actualEntry.objectValue());
+        }
 
-    @SuppressWarnings("unchecked")
-    public final void verifyResults(Object expected, Object actual) {
-      assertEquals(expected, actual);
+        actual.checkIntegrity();
     }
-  }
 
-  abstract static class ReturningAction<TExpectedResult, TActualResult> extends MapAction {
-    @Override
-    public final TActualResult applyToTestMap(TagMap testMap) {
-      return _applyToTestMap(testMap);
+    static final float randomFloat() {
+        return ThreadLocalRandom.current().nextFloat();
     }
 
-    protected abstract TActualResult _applyToTestMap(TagMap testMap);
-
-    @Override
-    public final TExpectedResult applyToExpectedMap(Map<String, Object> expectedMap) {
-      return _applyToExpectedMap(expectedMap);
+    static final int randomChoice(int numChoices) {
+        return ThreadLocalRandom.current().nextInt(numChoices);
     }
 
-    protected abstract TExpectedResult _applyToExpectedMap(Map<String, Object> expectedMap);
+    static final <T> T randomChoice(Supplier<T>... choiceSuppliers) {
+        int choice = randomChoice(choiceSuppliers.length);
 
-    @SuppressWarnings("unchecked")
-    public final void verifyResults(Object expected, Object actual) {
-      _verifyResults((TExpectedResult) expected, (TActualResult) actual);
+        return choiceSuppliers[choice].get();
     }
 
-    protected abstract void _verifyResults(TExpectedResult expected, TActualResult actual);
-  }
+    static final int randomChoice(double... proportions) {
+        double selector = ThreadLocalRandom.current().nextDouble();
 
-  static final class Put extends BasicReturningAction<Object> {
-    final String key;
-    final String value;
+        for (int i = 0; i < proportions.length; ++i) {
+            if (selector < proportions[i]) return i;
 
-    Put(String key, String value) {
-      this.key = key;
-      this.value = value;
+            selector -= proportions[i];
+        }
+        return proportions.length;
     }
 
-    @Override
-    protected Object _applyToTestMap(TagMap testMap) {
-      return testMap.put(this.key, this.value);
+    static final String randomKey() {
+        return "key-" + ThreadLocalRandom.current().nextInt(NUM_KEYS);
     }
 
-    @Override
-    protected Object _applyToExpectedMap(Map<String, Object> expectedMap) {
-      return expectedMap.put(this.key, this.value);
+    static final String randomValue() {
+        return "values-" + ThreadLocalRandom.current().nextInt();
     }
 
-    @Override
-    public void verifyTestMap(TagMap testMap) {
-      assertEquals(this.value, testMap.get(this.key));
-    }
+    static final String[] randomKeysAndValues() {
+        int numEntries = ThreadLocalRandom.current().nextInt(NUM_KEYS);
 
-    @Override
-    public String toString() {
-      return String.format("put(%s,%s)", literal(this.key), literal(this.value));
+        String[] keysAndValues = new String[numEntries << 1];
+        for (int i = 0; i < keysAndValues.length; i += 2) {
+            keysAndValues[i] = randomKey();
+            keysAndValues[i + 1] = randomValue();
+        }
+        return keysAndValues;
     }
-  }
 
-  static final class Set extends BasicAction {
-    final String key;
-    final String value;
-
-    Set(String key, String value) {
-      this.key = key;
-      this.value = value;
+    static final String literal(String str) {
+        return "\"" + str + "\"";
     }
 
-    @Override
-    protected void _applyToTestMap(TagMap testMap) {
-      testMap.set(this.key, this.value);
+    static final String literalVarArgs(String... strs) {
+        StringBuilder builder = new StringBuilder();
+        for (String str : strs) {
+            if (builder.length() != 0) builder.append(',');
+            builder.append(literal(str));
+        }
+        return builder.toString();
     }
 
-    @Override
-    protected void _applyToExpectedMap(Map<String, Object> expectedMap) {
-      expectedMap.put(this.key, this.value);
-    }
+    static final Map<String, String> mapOf(String... keysAndValues) {
+        HashMap<String, String> map = new HashMap<>(keysAndValues.length >> 1);
+        for (int i = 0; i < keysAndValues.length; i += 2) {
+            String key = keysAndValues[i];
+            String value = keysAndValues[i + 1];
 
-    @Override
-    public void verifyTestMap(TagMap testMap) {
-      assertEquals(this.value, testMap.get(this.key));
+            map.put(key, value);
+        }
+        return map;
     }
 
-    @Override
-    public String toString() {
-      return String.format("set(%s,%s)", literal(this.key), literal(this.value));
-    }
-  }
+    static final TagMap tagMapOf(String... keysAndValues) {
+        TagMap map = new TagMap();
+        for (int i = 0; i < keysAndValues.length; i += 2) {
+            String key = keysAndValues[i];
+            String value = keysAndValues[i + 1];
 
-  static final class GetAndSet extends ReturningAction<Object, TagMap.Entry> {
-    final String key;
-    final String value;
+            map.set(key, value);
+        }
+        map.checkIntegrity();
 
-    GetAndSet(String key, String value) {
-      this.key = key;
-      this.value = value;
+        return map;
     }
 
-    @Override
-    protected TagMap.Entry _applyToTestMap(TagMap testMap) {
-      return testMap.getAndSet(this.key, this.value);
-    }
+    static final TagMap.Ledger ledgerOf(String... keysAndValues) {
+        TagMap.Ledger ledger = TagMap.ledger();
+        for (int i = 0; i < keysAndValues.length; i += 2) {
+            String key = keysAndValues[i];
+            String value = keysAndValues[i + 1];
 
-    @Override
-    protected Object _applyToExpectedMap(Map<String, Object> expectedMap) {
-      return expectedMap.put(this.key, this.value);
+            ledger.set(key, value);
+        }
+        return ledger;
     }
 
-    @Override
-    protected void _verifyResults(Object expected, TagMap.Entry actual) {
-      if (expected == null) {
-        assertNull(actual);
-      } else {
-        assertEquals(expected, actual.objectValue());
-      }
-    }
+    static final class TestCase {
+        final List<MapAction> actions;
 
-    @Override
-    public void verifyTestMap(TagMap testMap) {
-      assertEquals(this.value, testMap.get(this.key));
-    }
+        TestCase(MapAction... actions) {
+            this.actions = Arrays.asList(actions);
+        }
 
-    @Override
-    public String toString() {
-      return String.format("getAndSet(%s,%s)", literal(this.key), literal(this.value));
-    }
-  }
+        TestCase(List<MapAction> actions) {
+            this.actions = actions;
+        }
 
-  static final class PutAll extends BasicAction {
-    final String[] keysAndValues;
-    final Map<String, String> map;
+        public final List<MapAction> actions() {
+            return this.actions;
+        }
 
-    PutAll(String... keysAndValues) {
-      this.keysAndValues = keysAndValues;
-      this.map = mapOf(keysAndValues);
+        @Override
+        public String toString() {
+            StringBuilder builder = new StringBuilder();
+            for (MapAction action : this.actions) {
+                builder.append(action).append(',').append('\n');
+            }
+            return builder.toString();
+        }
     }
 
-    @Override
-    protected void _applyToTestMap(TagMap testMap) {
-      testMap.putAll(this.map);
-    }
+    abstract static class MapAction {
+        public abstract Object applyToTestMap(TagMap testMap);
 
-    @Override
-    public void _applyToExpectedMap(Map<String, Object> expectedMap) {
-      expectedMap.putAll(this.map);
-    }
+        public abstract Object applyToExpectedMap(Map<String, Object> expectedMap);
 
-    @Override
-    public void verifyTestMap(TagMap expectedMap) {
-      for (Map.Entry<String, String> entry : this.map.entrySet()) {
-        assertEquals(entry.getValue(), expectedMap.get(entry.getKey()));
-      }
-    }
+        public abstract void verifyResults(Object expected, Object actual);
 
-    @Override
-    public String toString() {
-      return String.format("putAll(%s)", literalVarArgs(this.keysAndValues));
-    }
-  }
+        public abstract void verifyTestMap(TagMap testMap);
 
-  static final class PutAllTagMap extends BasicAction {
-    final String[] keysAndValues;
-    final TagMap tagMap;
-
-    PutAllTagMap(String... keysAndValues) {
-      this.keysAndValues = keysAndValues;
-      this.tagMap = tagMapOf(keysAndValues);
+        public abstract String toString();
     }
 
-    @Override
-    protected void _applyToTestMap(TagMap testMap) {
-      testMap.putAll(this.tagMap);
-    }
+    abstract static class BasicAction extends MapAction {
+        @Override
+        public final Object applyToTestMap(TagMap testMap) {
+            _applyToTestMap(testMap);
 
-    @Override
-    protected void _applyToExpectedMap(Map<String, Object> expectedMap) {
-      expectedMap.putAll(this.tagMap);
-    }
-
-    @Override
-    public void verifyTestMap(TagMap expectedMap) {
-      for (TagMap.EntryReader entry : this.tagMap) {
-        assertEquals(entry.objectValue(), expectedMap.get(entry.tag()), "key=" + entry.tag());
-      }
-    }
-
-    @Override
-    public String toString() {
-      return String.format("putAllTagMap(%s)", literalVarArgs(this.keysAndValues));
-    }
-  }
+            return void.class;
+        }
 
-  static final class PutAllLedger extends BasicAction {
-    final String[] keysAndValues;
-    final TagMap.Ledger ledger;
+        protected abstract void _applyToTestMap(TagMap testMap);
 
-    PutAllLedger(String... keysAndValues) {
-      this.keysAndValues = keysAndValues;
-      this.ledger = ledgerOf(keysAndValues);
-    }
-
-    @Override
-    protected void _applyToTestMap(TagMap testMap) {
-      this.ledger.fill(testMap);
-    }
-
-    @Override
-    protected void _applyToExpectedMap(Map<String, Object> expectedMap) {
-      for (TagMap.EntryChange change : this.ledger) {
-        // ledgerOf - doesn't produce / removes, so this is safe
-        TagMap.Entry entry = (TagMap.Entry) change;
-        expectedMap.put(entry.tag(), entry.objectValue());
-      }
-    }
+        @Override
+        public final Object applyToExpectedMap(Map<String, Object> expectedMap) {
+            _applyToExpectedMap(expectedMap);
 
-    @Override
-    public void verifyTestMap(TagMap expectedMap) {
-      // ledger may contain multiple updates of the same key
-      // easier to produce a TagMap and check against it
+            return void.class;
+        }
 
-      for (TagMap.EntryReader entry : this.ledger.buildImmutable()) {
-        assertEquals(entry.objectValue(), expectedMap.get(entry.tag()), "key=" + entry.tag());
-      }
-    }
+        protected abstract void _applyToExpectedMap(Map<String, Object> expectedMap);
 
-    @Override
-    public String toString() {
-      return String.format("putAllLedger(%s)", literalVarArgs(this.keysAndValues));
+        public final void verifyResults(Object expected, Object actual) {}
     }
-  }
 
-  static final class Remove extends BasicReturningAction<Object> {
-    final String key;
+    abstract static class BasicReturningAction<TResult> extends MapAction {
+        @Override
+        public final TResult applyToTestMap(TagMap testMap) {
+            return _applyToTestMap(testMap);
+        }
 
-    Remove(String key) {
-      this.key = key;
-    }
+        protected abstract TResult _applyToTestMap(TagMap testMap);
 
-    @Override
-    protected Object _applyToTestMap(TagMap testMap) {
-      return testMap.remove((Object) this.key);
-    }
+        @Override
+        public final TResult applyToExpectedMap(Map<String, Object> expectedMap) {
+            return _applyToExpectedMap(expectedMap);
+        }
 
-    @Override
-    protected Object _applyToExpectedMap(Map<String, Object> expectedMap) {
-      return expectedMap.remove(this.key);
-    }
+        protected abstract TResult _applyToExpectedMap(Map<String, Object> expectedMap);
 
-    @Override
-    public void verifyTestMap(TagMap testMap) {
-      assertFalse(testMap.containsKey(this.key));
+        @SuppressWarnings("unchecked")
+        public final void verifyResults(Object expected, Object actual) {
+            assertEquals(expected, actual);
+        }
     }
 
-    @Override
-    public String toString() {
-      return String.format("remove(%s)", literal(this.key));
-    }
-  }
+    abstract static class ReturningAction<TExpectedResult, TActualResult> extends MapAction {
+        @Override
+        public final TActualResult applyToTestMap(TagMap testMap) {
+            return _applyToTestMap(testMap);
+        }
 
-  static final class RemoveLight extends ReturningAction<Object, Boolean> {
-    final String key;
+        protected abstract TActualResult _applyToTestMap(TagMap testMap);
 
-    RemoveLight(String key) {
-      this.key = key;
-    }
+        @Override
+        public final TExpectedResult applyToExpectedMap(Map<String, Object> expectedMap) {
+            return _applyToExpectedMap(expectedMap);
+        }
 
-    @Override
-    protected Boolean _applyToTestMap(TagMap testMap) {
-      return testMap.remove(this.key);
-    }
+        protected abstract TExpectedResult _applyToExpectedMap(Map<String, Object> expectedMap);
 
-    @Override
-    protected Object _applyToExpectedMap(Map<String, Object> expectedMap) {
-      return expectedMap.remove(this.key);
-    }
+        @SuppressWarnings("unchecked")
+        public final void verifyResults(Object expected, Object actual) {
+            _verifyResults((TExpectedResult) expected, (TActualResult) actual);
+        }
 
-    @Override
-    protected void _verifyResults(Object expected, Boolean actual) {
-      assertEquals((expected != null), actual);
+        protected abstract void _verifyResults(TExpectedResult expected, TActualResult actual);
     }
 
-    @Override
-    public void verifyTestMap(TagMap testMap) {
-      assertFalse(testMap.containsKey(this.key));
-    }
+    static final class Put extends BasicReturningAction<Object> {
+        final String key;
+        final String value;
 
-    @Override
-    public String toString() {
-      return String.format("removeLight(%s)", literal(this.key));
-    }
-  }
+        Put(String key, String value) {
+            this.key = key;
+            this.value = value;
+        }
 
-  static final class GetAndRemove extends ReturningAction<Object, TagMap.Entry> {
-    final String key;
+        @Override
+        protected Object _applyToTestMap(TagMap testMap) {
+            return testMap.put(this.key, this.value);
+        }
 
-    GetAndRemove(String key) {
-      this.key = key;
-    }
+        @Override
+        protected Object _applyToExpectedMap(Map<String, Object> expectedMap) {
+            return expectedMap.put(this.key, this.value);
+        }
 
-    @Override
-    protected TagMap.Entry _applyToTestMap(TagMap testMap) {
-      return testMap.getAndRemove(this.key);
-    }
-
-    @Override
-    protected Object _applyToExpectedMap(Map<String, Object> expectedMap) {
-      return expectedMap.remove(this.key);
-    }
-
-    @Override
-    protected void _verifyResults(Object expected, TagMap.Entry actual) {
-      if (expected == null) {
-        assertNull(actual);
-      } else {
-        assertEquals(expected, actual.objectValue());
-      }
-    }
+        @Override
+        public void verifyTestMap(TagMap testMap) {
+            assertEquals(this.value, testMap.get(this.key));
+        }
 
-    @Override
-    public void verifyTestMap(TagMap testMap) {
-      assertFalse(testMap.containsKey(this.key));
+        @Override
+        public String toString() {
+            return String.format("put(%s,%s)", literal(this.key), literal(this.value));
+        }
     }
 
-    @Override
-    public String toString() {
-      return String.format("getAndRemove(%s)", literal(this.key));
-    }
-  }
-
-  static final class Clear extends BasicAction {
-    static final Clear INSTANCE = new Clear();
+    static final class Set extends BasicAction {
+        final String key;
+        final String value;
 
-    private Clear() {}
+        Set(String key, String value) {
+            this.key = key;
+            this.value = value;
+        }
 
-    @Override
-    protected void _applyToTestMap(TagMap testMap) {
-      testMap.clear();
-    }
-
-    @Override
-    protected void _applyToExpectedMap(Map<String, Object> mapUnderTest) {
-      mapUnderTest.clear();
-    }
+        @Override
+        protected void _applyToTestMap(TagMap testMap) {
+            testMap.set(this.key, this.value);
+        }
 
-    @Override
-    public void verifyTestMap(TagMap testMap) {
-      assertTrue(testMap.isEmpty());
+        @Override
+        protected void _applyToExpectedMap(Map<String, Object> expectedMap) {
+            expectedMap.put(this.key, this.value);
+        }
+
+        @Override
+        public void verifyTestMap(TagMap testMap) {
+            assertEquals(this.value, testMap.get(this.key));
+        }
+
+        @Override
+        public String toString() {
+            return String.format("set(%s,%s)", literal(this.key), literal(this.value));
+        }
+    }
+
+    static final class GetAndSet extends ReturningAction<Object, TagMap.Entry> {
+        final String key;
+        final String value;
+
+        GetAndSet(String key, String value) {
+            this.key = key;
+            this.value = value;
+        }
+
+        @Override
+        protected TagMap.Entry _applyToTestMap(TagMap testMap) {
+            return testMap.getAndSet(this.key, this.value);
+        }
+
+        @Override
+        protected Object _applyToExpectedMap(Map<String, Object> expectedMap) {
+            return expectedMap.put(this.key, this.value);
+        }
+
+        @Override
+        protected void _verifyResults(Object expected, TagMap.Entry actual) {
+            if (expected == null) {
+                assertNull(actual);
+            } else {
+                assertEquals(expected, actual.objectValue());
+            }
+        }
+
+        @Override
+        public void verifyTestMap(TagMap testMap) {
+            assertEquals(this.value, testMap.get(this.key));
+        }
+
+        @Override
+        public String toString() {
+            return String.format("getAndSet(%s,%s)", literal(this.key), literal(this.value));
+        }
+    }
+
+    static final class PutAll extends BasicAction {
+        final String[] keysAndValues;
+        final Map<String, String> map;
+
+        PutAll(String... keysAndValues) {
+            this.keysAndValues = keysAndValues;
+            this.map = mapOf(keysAndValues);
+        }
+
+        @Override
+        protected void _applyToTestMap(TagMap testMap) {
+            testMap.putAll(this.map);
+        }
+
+        @Override
+        public void _applyToExpectedMap(Map<String, Object> expectedMap) {
+            expectedMap.putAll(this.map);
+        }
+
+        @Override
+        public void verifyTestMap(TagMap expectedMap) {
+            for (Map.Entry<String, String> entry : this.map.entrySet()) {
+                assertEquals(entry.getValue(), expectedMap.get(entry.getKey()));
+            }
+        }
+
+        @Override
+        public String toString() {
+            return String.format("putAll(%s)", literalVarArgs(this.keysAndValues));
+        }
+    }
+
+    static final class PutAllTagMap extends BasicAction {
+        final String[] keysAndValues;
+        final TagMap tagMap;
+
+        PutAllTagMap(String... keysAndValues) {
+            this.keysAndValues = keysAndValues;
+            this.tagMap = tagMapOf(keysAndValues);
+        }
+
+        @Override
+        protected void _applyToTestMap(TagMap testMap) {
+            testMap.putAll(this.tagMap);
+        }
+
+        @Override
+        protected void _applyToExpectedMap(Map<String, Object> expectedMap) {
+            expectedMap.putAll(this.tagMap);
+        }
+
+        @Override
+        public void verifyTestMap(TagMap expectedMap) {
+            for (TagMap.EntryReader entry : this.tagMap) {
+                assertEquals(entry.objectValue(), expectedMap.get(entry.tag()), "key=" + entry.tag());
+            }
+        }
+
+        @Override
+        public String toString() {
+            return String.format("putAllTagMap(%s)", literalVarArgs(this.keysAndValues));
+        }
+    }
+
+    static final class PutAllLedger extends BasicAction {
+        final String[] keysAndValues;
+        final TagMap.Ledger ledger;
+
+        PutAllLedger(String... keysAndValues) {
+            this.keysAndValues = keysAndValues;
+            this.ledger = ledgerOf(keysAndValues);
+        }
+
+        @Override
+        protected void _applyToTestMap(TagMap testMap) {
+            this.ledger.fill(testMap);
+        }
+
+        @Override
+        protected void _applyToExpectedMap(Map<String, Object> expectedMap) {
+            for (TagMap.EntryChange change : this.ledger) {
+                // ledgerOf - doesn't produce / removes, so this is safe
+                TagMap.Entry entry = (TagMap.Entry) change;
+                expectedMap.put(entry.tag(), entry.objectValue());
+            }
+        }
+
+        @Override
+        public void verifyTestMap(TagMap expectedMap) {
+            // ledger may contain multiple updates of the same key
+            // easier to produce a TagMap and check against it
+
+            for (TagMap.EntryReader entry : this.ledger.buildImmutable()) {
+                assertEquals(entry.objectValue(), expectedMap.get(entry.tag()), "key=" + entry.tag());
+            }
+        }
+
+        @Override
+        public String toString() {
+            return String.format("putAllLedger(%s)", literalVarArgs(this.keysAndValues));
+        }
+    }
+
+    static final class Remove extends BasicReturningAction<Object> {
+        final String key;
+
+        Remove(String key) {
+            this.key = key;
+        }
+
+        @Override
+        protected Object _applyToTestMap(TagMap testMap) {
+            return testMap.remove((Object) this.key);
+        }
+
+        @Override
+        protected Object _applyToExpectedMap(Map<String, Object> expectedMap) {
+            return expectedMap.remove(this.key);
+        }
+
+        @Override
+        public void verifyTestMap(TagMap testMap) {
+            assertFalse(testMap.containsKey(this.key));
+        }
+
+        @Override
+        public String toString() {
+            return String.format("remove(%s)", literal(this.key));
+        }
+    }
+
+    static final class RemoveLight extends ReturningAction<Object, Boolean> {
+        final String key;
+
+        RemoveLight(String key) {
+            this.key = key;
+        }
+
+        @Override
+        protected Boolean _applyToTestMap(TagMap testMap) {
+            return testMap.remove(this.key);
+        }
+
+        @Override
+        protected Object _applyToExpectedMap(Map<String, Object> expectedMap) {
+            return expectedMap.remove(this.key);
+        }
+
+        @Override
+        protected void _verifyResults(Object expected, Boolean actual) {
+            assertEquals((expected != null), actual);
+        }
+
+        @Override
+        public void verifyTestMap(TagMap testMap) {
+            assertFalse(testMap.containsKey(this.key));
+        }
+
+        @Override
+        public String toString() {
+            return String.format("removeLight(%s)", literal(this.key));
+        }
+    }
+
+    static final class GetAndRemove extends ReturningAction<Object, TagMap.Entry> {
+        final String key;
+
+        GetAndRemove(String key) {
+            this.key = key;
+        }
+
+        @Override
+        protected TagMap.Entry _applyToTestMap(TagMap testMap) {
+            return testMap.getAndRemove(this.key);
+        }
+
+        @Override
+        protected Object _applyToExpectedMap(Map<String, Object> expectedMap) {
+            return expectedMap.remove(this.key);
+        }
+
+        @Override
+        protected void _verifyResults(Object expected, TagMap.Entry actual) {
+            if (expected == null) {
+                assertNull(actual);
+            } else {
+                assertEquals(expected, actual.objectValue());
+            }
+        }
+
+        @Override
+        public void verifyTestMap(TagMap testMap) {
+            assertFalse(testMap.containsKey(this.key));
+        }
+
+        @Override
+        public String toString() {
+            return String.format("getAndRemove(%s)", literal(this.key));
+        }
     }
 
-    @Override
-    public String toString() {
-      return "clear()";
+    static final class Clear extends BasicAction {
+        static final Clear INSTANCE = new Clear();
+
+        private Clear() {}
+
+        @Override
+        protected void _applyToTestMap(TagMap testMap) {
+            testMap.clear();
+        }
+
+        @Override
+        protected void _applyToExpectedMap(Map<String, Object> mapUnderTest) {
+            mapUnderTest.clear();
+        }
+
+        @Override
+        public void verifyTestMap(TagMap testMap) {
+            assertTrue(testMap.isEmpty());
+        }
+
+        @Override
+        public String toString() {
+            return "clear()";
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/TagMapLedgerTest.java b/internal-api/src/test/java/datadog/trace/api/TagMapLedgerTest.java
index ddd7dccf2b4..e6a0e5f494a 100644
--- a/internal-api/src/test/java/datadog/trace/api/TagMapLedgerTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/TagMapLedgerTest.java
@@ -11,227 +11,227 @@
 import org.junit.jupiter.api.Test;
 
 public class TagMapLedgerTest {
-  static final int SIZE = 32;
+    static final int SIZE = 32;
 
-  @Test
-  public void inOrder() {
-    TagMap.Ledger ledger = TagMap.ledger();
-    for (int i = 0; i < SIZE; ++i) {
-      ledger.set(key(i), value(i));
-    }
-
-    assertEquals(SIZE, ledger.estimateSize());
+    @Test
+    public void inOrder() {
+        TagMap.Ledger ledger = TagMap.ledger();
+        for (int i = 0; i < SIZE; ++i) {
+            ledger.set(key(i), value(i));
+        }
 
-    int i = 0;
-    for (TagMap.EntryChange entryChange : ledger) {
-      TagMap.Entry entry = (TagMap.Entry) entryChange;
+        assertEquals(SIZE, ledger.estimateSize());
 
-      assertEquals(key(i), entry.tag());
-      assertEquals(value(i), entry.stringValue());
+        int i = 0;
+        for (TagMap.EntryChange entryChange : ledger) {
+            TagMap.Entry entry = (TagMap.Entry) entryChange;
 
-      ++i;
-    }
-  }
-
-  @Test
-  public void testTypes() {
-    TagMap.Ledger ledger = TagMap.ledger();
-    ledger.set("bool", true);
-    ledger.set("int", 1);
-    ledger.set("long", 1L);
-    ledger.set("float", 1F);
-    ledger.set("double", 1D);
-    ledger.set("object", (Object) "string");
-    ledger.set("string", "string");
-
-    assertEntryRawType(TagMap.Entry.BOOLEAN, ledger, "bool");
-    assertEntryRawType(TagMap.Entry.INT, ledger, "int");
-    assertEntryRawType(TagMap.Entry.LONG, ledger, "long");
-    assertEntryRawType(TagMap.Entry.FLOAT, ledger, "float");
-    assertEntryRawType(TagMap.Entry.DOUBLE, ledger, "double");
-    assertEntryRawType(TagMap.Entry.ANY, ledger, "object");
-    assertEntryRawType(TagMap.Entry.OBJECT, ledger, "string");
-  }
+            assertEquals(key(i), entry.tag());
+            assertEquals(value(i), entry.stringValue());
 
-  @Test
-  public void buildMutable() {
-    TagMap.Ledger ledger = TagMap.ledger();
-    for (int i = 0; i < SIZE; ++i) {
-      ledger.set(key(i), value(i));
+            ++i;
+        }
     }
 
-    assertEquals(SIZE, ledger.estimateSize());
-
-    TagMap map = ledger.build();
-    for (int i = 0; i < SIZE; ++i) {
-      assertEquals(value(i), map.getString(key(i)));
+    @Test
+    public void testTypes() {
+        TagMap.Ledger ledger = TagMap.ledger();
+        ledger.set("bool", true);
+        ledger.set("int", 1);
+        ledger.set("long", 1L);
+        ledger.set("float", 1F);
+        ledger.set("double", 1D);
+        ledger.set("object", (Object) "string");
+        ledger.set("string", "string");
+
+        assertEntryRawType(TagMap.Entry.BOOLEAN, ledger, "bool");
+        assertEntryRawType(TagMap.Entry.INT, ledger, "int");
+        assertEntryRawType(TagMap.Entry.LONG, ledger, "long");
+        assertEntryRawType(TagMap.Entry.FLOAT, ledger, "float");
+        assertEntryRawType(TagMap.Entry.DOUBLE, ledger, "double");
+        assertEntryRawType(TagMap.Entry.ANY, ledger, "object");
+        assertEntryRawType(TagMap.Entry.OBJECT, ledger, "string");
     }
-    assertEquals(SIZE, map.size());
 
-    // just proving that the map is mutable
-    map.set(key(1000), value(1000));
-  }
+    @Test
+    public void buildMutable() {
+        TagMap.Ledger ledger = TagMap.ledger();
+        for (int i = 0; i < SIZE; ++i) {
+            ledger.set(key(i), value(i));
+        }
 
-  @Test
-  public void buildImmutable() {
-    TagMap.Ledger ledger = TagMap.ledger();
-    for (int i = 0; i < SIZE; ++i) {
-      ledger.set(key(i), value(i));
-    }
+        assertEquals(SIZE, ledger.estimateSize());
 
-    assertEquals(SIZE, ledger.estimateSize());
+        TagMap map = ledger.build();
+        for (int i = 0; i < SIZE; ++i) {
+            assertEquals(value(i), map.getString(key(i)));
+        }
+        assertEquals(SIZE, map.size());
 
-    TagMap map = ledger.buildImmutable();
-    for (int i = 0; i < SIZE; ++i) {
-      assertEquals(value(i), map.getString(key(i)));
+        // just proving that the map is mutable
+        map.set(key(1000), value(1000));
     }
-    assertEquals(SIZE, map.size());
 
-    assertFrozen(map);
-  }
+    @Test
+    public void buildImmutable() {
+        TagMap.Ledger ledger = TagMap.ledger();
+        for (int i = 0; i < SIZE; ++i) {
+            ledger.set(key(i), value(i));
+        }
 
-  @Test
-  public void build_empty() {
-    TagMap.Ledger ledger = TagMap.ledger();
-    assertTrue(ledger.isDefinitelyEmpty());
-    assertNotSame(TagMap.EMPTY, ledger.build());
-  }
+        assertEquals(SIZE, ledger.estimateSize());
 
-  @Test
-  public void buildImmutable_empty() {
-    TagMap.Ledger ledger = TagMap.ledger();
-    assertTrue(ledger.isDefinitelyEmpty());
-    assertSame(TagMap.EMPTY, ledger.buildImmutable());
-  }
+        TagMap map = ledger.buildImmutable();
+        for (int i = 0; i < SIZE; ++i) {
+            assertEquals(value(i), map.getString(key(i)));
+        }
+        assertEquals(SIZE, map.size());
 
-  @Test
-  public void isDefinitelyEmpty_emptyMap() {
-    TagMap.Ledger ledger = TagMap.ledger();
-    ledger.set("foo", "bar");
-    ledger.remove("foo");
-
-    assertFalse(ledger.isDefinitelyEmpty());
-    TagMap map = ledger.build();
-    assertTrue(map.isEmpty());
-  }
-
-  @Test
-  public void builderExpansion() {
-    TagMap.Ledger ledger = TagMap.ledger();
-    for (int i = 0; i < 100; ++i) {
-      ledger.set(key(i), value(i));
+        assertFrozen(map);
     }
 
-    TagMap map = ledger.build();
-    for (int i = 0; i < 100; ++i) {
-      assertEquals(value(i), map.getString(key(i)));
+    @Test
+    public void build_empty() {
+        TagMap.Ledger ledger = TagMap.ledger();
+        assertTrue(ledger.isDefinitelyEmpty());
+        assertNotSame(TagMap.EMPTY, ledger.build());
     }
-  }
 
-  @Test
-  public void builderPresized() {
-    TagMap.Ledger ledger = TagMap.ledger(100);
-    for (int i = 0; i < 100; ++i) {
-      ledger.set(key(i), value(i));
+    @Test
+    public void buildImmutable_empty() {
+        TagMap.Ledger ledger = TagMap.ledger();
+        assertTrue(ledger.isDefinitelyEmpty());
+        assertSame(TagMap.EMPTY, ledger.buildImmutable());
     }
 
-    TagMap map = ledger.build();
-    for (int i = 0; i < 100; ++i) {
-      assertEquals(value(i), map.getString(key(i)));
+    @Test
+    public void isDefinitelyEmpty_emptyMap() {
+        TagMap.Ledger ledger = TagMap.ledger();
+        ledger.set("foo", "bar");
+        ledger.remove("foo");
+
+        assertFalse(ledger.isDefinitelyEmpty());
+        TagMap map = ledger.build();
+        assertTrue(map.isEmpty());
     }
-  }
 
-  @Test
-  public void buildWithRemoves() {
-    TagMap.Ledger ledger = TagMap.ledger();
-    for (int i = 0; i < SIZE; ++i) {
-      ledger.set(key(i), value(i));
+    @Test
+    public void builderExpansion() {
+        TagMap.Ledger ledger = TagMap.ledger();
+        for (int i = 0; i < 100; ++i) {
+            ledger.set(key(i), value(i));
+        }
+
+        TagMap map = ledger.build();
+        for (int i = 0; i < 100; ++i) {
+            assertEquals(value(i), map.getString(key(i)));
+        }
     }
 
-    for (int i = 0; i < SIZE; i += 2) {
-      ledger.remove(key(i));
+    @Test
+    public void builderPresized() {
+        TagMap.Ledger ledger = TagMap.ledger(100);
+        for (int i = 0; i < 100; ++i) {
+            ledger.set(key(i), value(i));
+        }
+
+        TagMap map = ledger.build();
+        for (int i = 0; i < 100; ++i) {
+            assertEquals(value(i), map.getString(key(i)));
+        }
     }
 
-    assertTrue(ledger.containsRemovals());
+    @Test
+    public void buildWithRemoves() {
+        TagMap.Ledger ledger = TagMap.ledger();
+        for (int i = 0; i < SIZE; ++i) {
+            ledger.set(key(i), value(i));
+        }
 
-    TagMap map = ledger.build();
-    for (int i = 0; i < SIZE; ++i) {
-      if ((i % 2) == 0) {
-        assertNull(map.getString(key(i)));
-      } else {
-        assertEquals(value(i), map.getString(key(i)));
-      }
-    }
+        for (int i = 0; i < SIZE; i += 2) {
+            ledger.remove(key(i));
+        }
 
-    ledger.reset();
+        assertTrue(ledger.containsRemovals());
 
-    assertFalse(ledger.containsRemovals());
-  }
+        TagMap map = ledger.build();
+        for (int i = 0; i < SIZE; ++i) {
+            if ((i % 2) == 0) {
+                assertNull(map.getString(key(i)));
+            } else {
+                assertEquals(value(i), map.getString(key(i)));
+            }
+        }
 
-  @Test
-  public void smartRemoval_existingCase() {
-    TagMap.Ledger ledger = TagMap.ledger();
-    ledger.set("foo", "bar");
-    ledger.smartRemove("foo");
+        ledger.reset();
 
-    assertTrue(ledger.containsRemovals());
+        assertFalse(ledger.containsRemovals());
+    }
 
-    ledger.reset();
+    @Test
+    public void smartRemoval_existingCase() {
+        TagMap.Ledger ledger = TagMap.ledger();
+        ledger.set("foo", "bar");
+        ledger.smartRemove("foo");
 
-    assertFalse(ledger.containsRemovals());
-  }
+        assertTrue(ledger.containsRemovals());
 
-  @Test
-  public void smartRemoval_missingCase() {
-    TagMap.Ledger ledger = TagMap.ledger();
-    ledger.smartRemove("foo");
+        ledger.reset();
 
-    assertFalse(ledger.containsRemovals());
+        assertFalse(ledger.containsRemovals());
+    }
 
-    ledger.reset();
+    @Test
+    public void smartRemoval_missingCase() {
+        TagMap.Ledger ledger = TagMap.ledger();
+        ledger.smartRemove("foo");
 
-    assertFalse(ledger.containsRemovals());
-  }
+        assertFalse(ledger.containsRemovals());
 
-  @Test
-  public void reset() {
-    TagMap.Ledger ledger = TagMap.ledger(2);
+        ledger.reset();
 
-    ledger.set(key(0), value(0));
-    TagMap map0 = ledger.build();
+        assertFalse(ledger.containsRemovals());
+    }
 
-    ledger.reset();
+    @Test
+    public void reset() {
+        TagMap.Ledger ledger = TagMap.ledger(2);
 
-    ledger.set(key(1), value(1));
-    TagMap map1 = ledger.build();
+        ledger.set(key(0), value(0));
+        TagMap map0 = ledger.build();
 
-    assertEquals(value(0), map0.getString(key(0)));
-    assertNull(map1.getString(key(0)));
+        ledger.reset();
 
-    assertNull(map0.getString(key(1)));
-    assertEquals(value(1), map1.getString(key(1)));
-  }
+        ledger.set(key(1), value(1));
+        TagMap map1 = ledger.build();
 
-  static final String key(int i) {
-    return "key-" + i;
-  }
+        assertEquals(value(0), map0.getString(key(0)));
+        assertNull(map1.getString(key(0)));
 
-  static final String value(int i) {
-    return "value-" + i;
-  }
+        assertNull(map0.getString(key(1)));
+        assertEquals(value(1), map1.getString(key(1)));
+    }
 
-  static final void assertEntryRawType(byte expectedType, TagMap.Ledger ledger, String tag) {
-    TagMap.Entry entry = ledger.findLastEntry(tag);
-    assertEquals(expectedType, entry.rawType);
-  }
+    static final String key(int i) {
+        return "key-" + i;
+    }
+
+    static final String value(int i) {
+        return "value-" + i;
+    }
+
+    static final void assertEntryRawType(byte expectedType, TagMap.Ledger ledger, String tag) {
+        TagMap.Entry entry = ledger.findLastEntry(tag);
+        assertEquals(expectedType, entry.rawType);
+    }
 
-  static final void assertFrozen(TagMap map) {
-    IllegalStateException ex = null;
-    try {
-      map.set("foo", "bar");
-    } catch (IllegalStateException e) {
-      ex = e;
+    static final void assertFrozen(TagMap map) {
+        IllegalStateException ex = null;
+        try {
+            map.set("foo", "bar");
+        } catch (IllegalStateException e) {
+            ex = e;
+        }
+        assertNotNull(ex);
     }
-    assertNotNull(ex);
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/TagMapNullToleranceTest.java b/internal-api/src/test/java/datadog/trace/api/TagMapNullToleranceTest.java
index b8764472847..34c7e63063a 100644
--- a/internal-api/src/test/java/datadog/trace/api/TagMapNullToleranceTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/TagMapNullToleranceTest.java
@@ -15,52 +15,52 @@
  */
 class TagMapNullToleranceTest {
 
-  @Test
-  void createReturnsNullForNullOrEmptyValue() {
-    // CharSequence overload: null or empty -> null
-    assertNull(TagMap.Entry.create("k", (CharSequence) null));
-    assertNull(TagMap.Entry.create("k", ""));
+    @Test
+    void createReturnsNullForNullOrEmptyValue() {
+        // CharSequence overload: null or empty -> null
+        assertNull(TagMap.Entry.create("k", (CharSequence) null));
+        assertNull(TagMap.Entry.create("k", ""));
 
-    // Object overload: null -> null, and an empty String typed as Object -> null (runtime check,
-    // so the convention holds regardless of the static type at the call site)
-    assertNull(TagMap.Entry.create("k", (Object) null));
-    assertNull(TagMap.Entry.create("k", (Object) ""));
+        // Object overload: null -> null, and an empty String typed as Object -> null (runtime check,
+        // so the convention holds regardless of the static type at the call site)
+        assertNull(TagMap.Entry.create("k", (Object) null));
+        assertNull(TagMap.Entry.create("k", (Object) ""));
 
-    // Non-empty values still produce an entry, whatever the static type
-    assertNotNull(TagMap.Entry.create("k", "v"));
-    assertNotNull(TagMap.Entry.create("k", (Object) "v"));
-    // Non-CharSequence Object has no notion of "empty" -> always an entry
-    assertNotNull(TagMap.Entry.create("k", (Object) Integer.valueOf(0)));
-  }
+        // Non-empty values still produce an entry, whatever the static type
+        assertNotNull(TagMap.Entry.create("k", "v"));
+        assertNotNull(TagMap.Entry.create("k", (Object) "v"));
+        // Non-CharSequence Object has no notion of "empty" -> always an entry
+        assertNotNull(TagMap.Entry.create("k", (Object) Integer.valueOf(0)));
+    }
 
-  @Test
-  void getAndSetToleratesNullEntry() {
-    TagMap map = TagMap.create();
-    assertNull(map.getAndSet((TagMap.Entry) null), "null entry is a no-op returning null");
-    assertEquals(0, map.size(), "no tag added");
-  }
+    @Test
+    void getAndSetToleratesNullEntry() {
+        TagMap map = TagMap.create();
+        assertNull(map.getAndSet((TagMap.Entry) null), "null entry is a no-op returning null");
+        assertEquals(0, map.size(), "no tag added");
+    }
 
-  @Test
-  void setToleratesNullReader() {
-    TagMap map = TagMap.create();
-    map.set((TagMap.EntryReader) null); // must not throw
-    assertEquals(0, map.size(), "no tag added");
-  }
+    @Test
+    void setToleratesNullReader() {
+        TagMap map = TagMap.create();
+        map.set((TagMap.EntryReader) null); // must not throw
+        assertEquals(0, map.size(), "no tag added");
+    }
 
-  @Test
-  void nullOrEmptyFlowsThroughTheEntryPathwayAsNoTag() {
-    TagMap map = TagMap.create();
+    @Test
+    void nullOrEmptyFlowsThroughTheEntryPathwayAsNoTag() {
+        TagMap map = TagMap.create();
 
-    // The seamless case: create(...) -> set(Entry) with a null/empty value, no caller guard.
-    map.set(TagMap.Entry.create("empty", ""));
-    map.set(TagMap.Entry.create("emptyObj", (Object) ""));
-    map.set(TagMap.Entry.create("nul", (CharSequence) null));
-    assertEquals(0, map.size(), "null/empty values leave no tags behind");
-    assertFalse(map.containsKey("empty"));
+        // The seamless case: create(...) -> set(Entry) with a null/empty value, no caller guard.
+        map.set(TagMap.Entry.create("empty", ""));
+        map.set(TagMap.Entry.create("emptyObj", (Object) ""));
+        map.set(TagMap.Entry.create("nul", (CharSequence) null));
+        assertEquals(0, map.size(), "null/empty values leave no tags behind");
+        assertFalse(map.containsKey("empty"));
 
-    // A real value still lands.
-    map.set(TagMap.Entry.create("present", "v"));
-    assertEquals(1, map.size());
-    assertTrue(map.containsKey("present"));
-  }
+        // A real value still lands.
+        map.set(TagMap.Entry.create("present", "v"));
+        assertEquals(1, map.size());
+        assertTrue(map.containsKey("present"));
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/TagMapReadThroughTest.java b/internal-api/src/test/java/datadog/trace/api/TagMapReadThroughTest.java
index b424c5793ce..9b5b81fe1ed 100644
--- a/internal-api/src/test/java/datadog/trace/api/TagMapReadThroughTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/TagMapReadThroughTest.java
@@ -20,699 +20,699 @@
  */
 class TagMapReadThroughTest {
 
-  private static TagMap frozenParent() {
-    TagMap parent = TagMap.create();
-    parent.set("a", "parent-a");
-    parent.set("b", "parent-b");
-    parent.freeze();
-    return parent;
-  }
-
-  @Test
-  void readsThroughToParentOnMiss() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.set("c", "child-c");
-
-    assertEquals("parent-a", child.getString("a")); // miss locally -> read through
-    assertEquals("parent-b", child.getString("b"));
-    assertEquals("child-c", child.getString("c")); // local
-    assertNull(child.getString("missing"));
-    assertTrue(child.containsKey("a"));
-    assertFalse(child.containsKey("missing"));
-  }
-
-  @Test
-  void localEntryShadowsParent() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.set("b", "child-b"); // same key as parent
-
-    assertEquals("child-b", child.getString("b")); // local wins
-    assertEquals("parent-a", child.getString("a")); // parent still visible
-  }
-
-  @Test
-  void estimateSizeIsUpperBound() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.set("b", "child-b"); // shadows parent "b"
-    child.set("c", "child-c");
-
-    // true union = {a, b, c} = 3; estimate over-counts the shadowed "b": local 2 + parent 2 = 4
-    assertEquals(4, child.estimateSize());
-    assertTrue(child.estimateSize() >= 3, "estimateSize must be an upper bound on the true size");
-  }
-
-  @Test
-  void emptinessSemantics() {
-    TagMap emptyOverEmpty = TagMap.createFromParent(TagMap.create().freeze());
-    assertTrue(emptyOverEmpty.isEmpty());
-    assertTrue(emptyOverEmpty.isDefinitelyEmpty());
-
-    TagMap emptyOverNonEmpty = TagMap.createFromParent(frozenParent());
-    assertFalse(emptyOverNonEmpty.isEmpty(), "a non-empty parent makes the map non-empty");
-    assertFalse(emptyOverNonEmpty.isDefinitelyEmpty());
-
-    assertTrue((TagMap.create()).isDefinitelyEmpty());
-  }
-
-  @Test
-  void parentMustBeFrozen() {
-    TagMap mutableParent = TagMap.create();
-    assertThrows(IllegalStateException.class, () -> TagMap.createFromParent(mutableParent));
-  }
-
-  @Test
-  void emptyParentIsDroppedNotAttached() {
-    TagMap emptyFrozen = TagMap.create();
-    emptyFrozen.freeze();
-
-    TagMap overEmpty = TagMap.createFromParent(emptyFrozen);
-    // an empty frozen parent contributes nothing and never will -> dropped, no read-through cost
-    assertNull(overEmpty.parent, "empty parent should be dropped");
-    assertTrue(overEmpty.isDefinitelyEmpty());
-    overEmpty.set("x", "x-val"); // still a normal mutable map
-    assertEquals("x-val", overEmpty.getString("x"));
-
-    // a non-empty parent is still attached
-    TagMap overNonEmpty = TagMap.createFromParent(frozenParent());
-    assertNotNull(overNonEmpty.parent, "non-empty parent must be attached");
-    assertEquals("parent-a", overNonEmpty.getString("a"));
-  }
-
-  // --- slice 2: removal / tombstones ---
-
-  @Test
-  void removingParentKeyHidesItFromChildButNotFromParent() {
-    TagMap parent = frozenParent();
-    TagMap child = TagMap.createFromParent(parent);
-
-    assertEquals("parent-a", child.getString("a")); // visible before removal
-    child.remove("a");
-
-    assertNull(child.getString("a")); // tombstoned: no longer reads through
-    assertFalse(child.containsKey("a"));
-    assertEquals("parent-b", child.getString("b")); // other parent keys unaffected
-    assertEquals("parent-a", parent.getString("a")); // frozen parent untouched
-  }
-
-  @Test
-  void removeReturnsPriorVisibleValueViaParent() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-
-    // Map.remove contract: the key was present (via read-through), so removal reports it.
-    assertTrue(child.remove("a"), "removing a parent-exposed key should report it was present");
-    assertNull(child.getString("a"));
-  }
-
-  @Test
-  void reSettingARemovedKeyRestoresVisibility() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-
-    child.remove("a");
-    assertNull(child.getString("a"));
-
-    child.set("a", "child-a"); // re-set clears the tombstone
-    assertEquals("child-a", child.getString("a"));
-  }
-
-  @Test
-  void removingAKeyThatIsBothLocalAndParentHidesBoth() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.set("b", "child-b"); // shadows parent "b"
-
-    assertEquals("child-b", child.getString("b"));
-    child.remove("b");
-
-    assertNull(child.getString("b"), "removal must hide both the local entry and the parent's");
-    assertEquals("parent-b", frozenParent().getString("b")); // parent still has it
-  }
-
-  // --- slice 3a: bulk forEach union + exact size/isEmpty ---
-
-  private static Map<String, Object> collect(TagMap map) {
-    Map<String, Object> out = new HashMap<>();
-    map.forEach(e -> out.put(e.tag(), e.objectValue()));
-    return out;
-  }
-
-  @Test
-  void forEachEmitsDedupedUnionLocalWins() {
-    TagMap child = TagMap.createFromParent(frozenParent()); // parent {a, b}
-    child.set("b", "child-b"); // shadows parent "b"
-    child.set("c", "child-c");
-
-    Map<String, Object> u = collect(child);
-    assertEquals(3, u.size(), "union {a, b, c} with b deduped");
-    assertEquals("parent-a", u.get("a")); // read-through
-    assertEquals("child-b", u.get("b")); // local wins (no duplicate emit)
-    assertEquals("child-c", u.get("c"));
-  }
-
-  @Test
-  void forEachSkipsTombstonedParentKeys() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.set("c", "child-c");
-    child.remove("a"); // tombstone parent's "a"
-
-    Map<String, Object> u = collect(child);
-    assertEquals(2, u.size());
-    assertFalse(u.containsKey("a"));
-    assertEquals("parent-b", u.get("b"));
-    assertEquals("child-c", u.get("c"));
-  }
-
-  @Test
-  void biConsumerForEachAlsoEmitsUnion() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.set("c", "child-c");
-
-    Map<String, Object> out = new HashMap<>();
-    child.forEach(out, (m, e) -> m.put(e.tag(), e.objectValue())); // non-capturing: alloc-free path
-    assertEquals(3, out.size());
-    assertEquals("parent-a", out.get("a"));
-    assertEquals("child-c", out.get("c"));
-  }
-
-  @Test
-  void sizeIsExactUnion() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.set("b", "child-b"); // shadows
-    child.set("c", "child-c");
-    assertEquals(3, child.size()); // {a, b, c} — b deduped, not 4
-
-    child.remove("a");
-    assertEquals(2, child.size()); // {b, c}
-  }
-
-  @Test
-  void isEmptyExactWhenAllParentKeysTombstonedAndNoLocal() {
-    TagMap child = TagMap.createFromParent(frozenParent()); // parent {a, b}
-    assertFalse(child.isEmpty());
-
-    child.remove("a");
-    child.remove("b");
-    assertTrue(child.isEmpty(), "all parent keys tombstoned and no local entries -> empty");
-    assertEquals(0, child.size());
-  }
-
-  // --- slice 3b: pull-based iterators / collection views ---
-
-  @Test
-  void iteratorEmitsDedupedUnion() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.set("b", "child-b"); // shadows parent "b"
-    child.set("c", "child-c");
-
-    Map<String, Object> u = new HashMap<>();
-    Iterator<TagMap.EntryReader> it = child.iterator();
-    while (it.hasNext()) {
-      TagMap.EntryReader e = it.next();
-      u.put(e.tag(), e.objectValue());
-    }
-    assertEquals(3, u.size());
-    assertEquals("parent-a", u.get("a"));
-    assertEquals("child-b", u.get("b")); // local wins, emitted once
-    assertEquals("child-c", u.get("c"));
-  }
-
-  @Test
-  void keySetReflectsUnionAndTombstones() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.set("c", "child-c");
-
-    Set<String> keys = child.keySet();
-    assertEquals(3, keys.size()); // a, b, c
-    assertTrue(keys.contains("a"));
-    assertTrue(keys.contains("c"));
-
-    child.remove("a");
-    assertEquals(2, child.keySet().size());
-    assertFalse(child.keySet().contains("a"));
-  }
-
-  @Test
-  void valuesAndEntrySetReflectUnion() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.set("b", "child-b"); // shadows parent "b"
-
-    assertEquals(2, child.entrySet().size()); // {a, b} — b deduped
-    assertTrue(child.values().contains("child-b")); // local-won value
-    assertTrue(child.values().contains("parent-a"));
-    assertFalse(child.values().contains("parent-b"), "shadowed parent value must not appear");
-  }
-
-  // --- slice 3c: putAll from a read-through source copies the visible union, not just locals ---
-
-  @Test
-  void putAllFromReadThroughSourceCopiesFullVisibleUnion() {
-    TagMap source = TagMap.createFromParent(frozenParent()); // parent {a, b}
-    source.set("b", "child-b"); // shadows parent b
-    source.set("c", "child-c");
-
-    TagMap dest = TagMap.create(); // empty -> putAllIntoEmptyMap path
-    dest.putAll(source);
-
-    // the parent-visible "a" must land too, not just source's local entries
-    assertEquals(3, dest.size());
-    assertEquals("parent-a", dest.getString("a"));
-    assertEquals("child-b", dest.getString("b")); // local-won value, deduped
-    assertEquals("child-c", dest.getString("c"));
-  }
-
-  @Test
-  void putAllMergeFromReadThroughSourceCopiesVisibleUnion() {
-    TagMap source = TagMap.createFromParent(frozenParent()); // {a, b}
-
-    TagMap dest = TagMap.create();
-    dest.set("z", "dest-z"); // dest non-empty -> putAllMerge path
-
-    dest.putAll(source);
-    assertEquals(3, dest.size()); // {a, b, z}
-    assertEquals("parent-a", dest.getString("a"));
-    assertEquals("parent-b", dest.getString("b"));
-    assertEquals("dest-z", dest.getString("z"));
-  }
-
-  @Test
-  void putAllFromReadThroughSourceHonorsTombstones() {
-    TagMap source = TagMap.createFromParent(frozenParent());
-    source.remove("a"); // tombstone parent's "a"
-
-    TagMap dest = TagMap.create();
-    dest.putAll(source);
-
-    assertEquals(1, dest.size());
-    assertFalse(dest.containsKey("a"), "tombstoned key must not be copied");
-    assertEquals("parent-b", dest.getString("b"));
-  }
-
-  // --- slice 4: behavior-identical to a copy-down / flat map ---
-
-  @Test
-  void copyIsObservationallyIdentical() {
-    TagMap child = TagMap.createFromParent(frozenParent()); // {a, b}
-    child.set("b", "child-b"); // shadows parent "b"
-    child.set("c", "child-c");
-
-    TagMap copy = child.copy();
-    assertEquals(child.size(), copy.size());
-    assertEquals("parent-a", copy.getString("a")); // copy still reads through
-    assertEquals("child-b", copy.getString("b"));
-    assertEquals("child-c", copy.getString("c"));
-    assertEquals(collect(child), collect(copy)); // same union
-  }
-
-  @Test
-  void copyIsIndependentlyMutable() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.set("c", "child-c");
-
-    TagMap copy = child.copy();
-    copy.set("c", "copy-c"); // mutate copy's local
-    copy.remove("a"); // tombstone on copy only
-
-    assertEquals("child-c", child.getString("c"), "original unaffected by copy mutation");
-    assertEquals("parent-a", child.getString("a"), "original still reads through a");
-    assertEquals("copy-c", copy.getString("c"));
-    assertNull(copy.getString("a"));
-  }
-
-  @Test
-  void copyPreservesTombstones() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.remove("a"); // tombstone "a"
-
-    TagMap copy = child.copy();
-    assertNull(copy.getString("a"), "tombstone must carry into the copy");
-    assertEquals("parent-b", copy.getString("b"));
-  }
-
-  /** The contract that lets the consumer flip mergedTracerTags to a parent. */
-  @Test
-  void readThroughMatchesAnEquivalentFlatMap() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.set("b", "child-b");
-    child.set("c", "child-c");
-
-    TagMap flat = TagMap.create();
-    flat.set("a", "parent-a");
-    flat.set("b", "child-b");
-    flat.set("c", "child-c");
-
-    assertEquals(flat.size(), child.size());
-    assertEquals(collect(flat), collect(child));
-    assertEquals(flat.keySet(), child.keySet());
-    for (String k : new String[] {"a", "b", "c", "missing"}) {
-      assertEquals(flat.getString(k), child.getString(k), "mismatch for key " + k);
-    }
-  }
-
-  @Test
-  void immutableCopyOfReadThroughIsFrozenAndStillReadsThrough() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.set("c", "child-c");
-
-    TagMap frozen = child.immutableCopy();
-    assertTrue(frozen.isFrozen());
-    assertEquals("parent-a", frozen.getString("a")); // union preserved
-    assertEquals("child-c", frozen.getString("c"));
-    assertThrows(IllegalStateException.class, () -> frozen.set("x", "y")); // frozen blocks writes
-  }
-
-  // --- slice 5: multi-level chains (baggage-style layering over more than one frozen parent) ---
-
-  /**
-   * Builds a 3-level chain leaf -&gt; mid -&gt; grandparent (both ancestors frozen) and returns the
-   * leaf. Visible union, nearest-level-wins: {a=gp-a, b=mid-b, c=leaf-c, d=mid-d, e=leaf-e}.
-   */
-  private static TagMap threeLevelLeaf() {
-    TagMap grandparent = TagMap.create();
-    grandparent.set("a", "gp-a");
-    grandparent.set("b", "gp-b");
-    grandparent.set("c", "gp-c");
-    grandparent.freeze();
-
-    TagMap mid = TagMap.createFromParent(grandparent);
-    mid.set("b", "mid-b"); // shadows grandparent b
-    mid.set("d", "mid-d");
-    mid.freeze();
-
-    TagMap leaf = TagMap.createFromParent(mid);
-    leaf.set("c", "leaf-c"); // shadows grandparent c (mid doesn't define c)
-    leaf.set("e", "leaf-e");
-    return leaf;
-  }
-
-  @Test
-  void getWalksTheWholeChainNearestWins() {
-    TagMap leaf = threeLevelLeaf();
-    assertEquals("gp-a", leaf.getString("a")); // only in grandparent (two levels up)
-    assertEquals("mid-b", leaf.getString("b")); // mid shadows grandparent
-    assertEquals("leaf-c", leaf.getString("c")); // leaf shadows grandparent
-    assertEquals("mid-d", leaf.getString("d"));
-    assertEquals("leaf-e", leaf.getString("e"));
-    assertNull(leaf.getString("missing"));
-  }
-
-  @Test
-  void sizeIsExactUnionAcrossChain() {
-    assertEquals(5, threeLevelLeaf().size()); // {a, b, c, d, e}, shadowed duplicates deduped
-  }
-
-  @Test
-  void forEachEmitsDedupedUnionAcrossChain() {
-    Map<String, Object> u = collect(threeLevelLeaf());
-    assertEquals(5, u.size());
-    assertEquals("gp-a", u.get("a"));
-    assertEquals("mid-b", u.get("b")); // nearest ancestor wins over grandparent
-    assertEquals("leaf-c", u.get("c")); // leaf wins
-    assertEquals("mid-d", u.get("d"));
-    assertEquals("leaf-e", u.get("e"));
-  }
-
-  @Test
-  void iteratorEmitsDedupedUnionAcrossChain() {
-    Map<String, Object> u = new HashMap<>();
-    Iterator<TagMap.EntryReader> it = threeLevelLeaf().iterator();
-    while (it.hasNext()) {
-      TagMap.EntryReader e = it.next();
-      u.put(e.tag(), e.objectValue());
-    }
-    assertEquals(5, u.size());
-    assertEquals("gp-a", u.get("a"));
-    assertEquals("mid-b", u.get("b"));
-    assertEquals("leaf-c", u.get("c"));
-  }
-
-  @Test
-  void keySetReflectsChainUnion() {
-    Set<String> keys = threeLevelLeaf().keySet();
-    assertEquals(5, keys.size());
-    for (String k : new String[] {"a", "b", "c", "d", "e"}) {
-      assertTrue(keys.contains(k), "missing key " + k);
-    }
-  }
-
-  @Test
-  void leafTombstoneHidesGrandparentOnlyKey() {
-    TagMap leaf = threeLevelLeaf();
-    leaf.remove("a"); // "a" lives only in the grandparent, two levels up
-    assertNull(leaf.getString("a"));
-    assertFalse(leaf.containsKey("a"));
-    assertFalse(leaf.keySet().contains("a"));
-    assertEquals(4, leaf.size()); // {b, c, d, e}
-  }
-
-  @Test
-  void intermediateAncestorTombstoneIsHonoredByBulkViews() {
-    // mid removes an inherited grandparent key, THEN is frozen and reused as a parent. A non-leaf
-    // level can therefore carry its own tombstones. Point lookups recurse through mid's tombstone
-    // (correct); the bulk views must agree and not re-emit the key.
-    TagMap grandparent = TagMap.create();
-    grandparent.set("a", "gp-a");
-    grandparent.set("b", "gp-b");
-    grandparent.freeze();
-
-    TagMap mid = TagMap.createFromParent(grandparent);
-    mid.remove("a"); // tombstone an inherited key before freezing
-    mid.freeze();
-
-    TagMap leaf = TagMap.createFromParent(mid);
-
-    // point lookups (recurse -> already correct)
-    assertNull(leaf.getString("a"));
-    assertFalse(leaf.containsKey("a"));
-    assertEquals("gp-b", leaf.getString("b"));
-
-    // bulk views must agree: mid's tombstone hides grandparent's "a"
-    assertEquals(1, leaf.size());
-    assertFalse(leaf.keySet().contains("a"));
-
-    Map<String, Object> viaForEach = collect(leaf);
-    assertEquals(1, viaForEach.size());
-    assertFalse(viaForEach.containsKey("a"));
-    assertEquals("gp-b", viaForEach.get("b"));
-
-    Map<String, Object> viaIterator = new HashMap<>();
-    Iterator<TagMap.EntryReader> it = leaf.iterator();
-    while (it.hasNext()) {
-      TagMap.EntryReader e = it.next();
-      viaIterator.put(e.tag(), e.objectValue());
-    }
-    assertEquals(1, viaIterator.size());
-    assertFalse(viaIterator.containsKey("a"));
-  }
-
-  @Test
-  void observationallyEmptyIntermediateParentIsDroppedNotAttached() {
-    // A frozen mid level with no local entries whose every inherited key is tombstoned is
-    // observationally empty even though a local (grandparent) level still holds entries.
-    // createFromParent must drop it (exact isEmpty), so the leaf stays consistent: isEmpty() must
-    // agree with size()/lookup/iteration.
-    TagMap grandparent = TagMap.create();
-    grandparent.set("a", "gp-a");
-    grandparent.freeze();
-
-    TagMap mid = TagMap.createFromParent(grandparent);
-    mid.remove("a"); // tombstone the only inherited key -> mid is observationally empty
-    mid.freeze();
-    assertTrue(mid.isEmpty());
-
-    TagMap leaf = TagMap.createFromParent(mid);
-    assertEquals(0, leaf.size());
-    assertTrue(leaf.isEmpty(), "isEmpty() must agree with size()==0");
-    assertNull(leaf.getString("a"));
-    assertTrue(collect(leaf).isEmpty());
-    assertFalse(leaf.iterator().hasNext());
-  }
-
-  @Test
-  void chainReadThroughMatchesEquivalentFlatMap() {
-    TagMap leaf = threeLevelLeaf();
-
-    TagMap flat = TagMap.create();
-    flat.set("a", "gp-a");
-    flat.set("b", "mid-b");
-    flat.set("c", "leaf-c");
-    flat.set("d", "mid-d");
-    flat.set("e", "leaf-e");
-
-    assertEquals(flat.size(), leaf.size());
-    assertEquals(collect(flat), collect(leaf));
-    assertEquals(flat.keySet(), leaf.keySet());
-    for (String k : new String[] {"a", "b", "c", "d", "e", "missing"}) {
-      assertEquals(flat.getString(k), leaf.getString(k), "mismatch for key " + k);
-    }
-  }
-
-  // --- slice 6: put/getAndSet report the prior visible value, including inherited ---
-
-  @Test
-  void putReturnsInheritedParentValueAsPrior() {
-    TagMap child = TagMap.createFromParent(frozenParent()); // parent {a, b}
-    Object prior = child.put("a", "child-a"); // "a" exists only in the parent
-    assertEquals("parent-a", prior, "put must report the inherited value as the previous mapping");
-    assertEquals("child-a", child.getString("a")); // new value stored locally
-  }
-
-  @Test
-  void putReturnsNullForAKeyInNeitherLocalNorParent() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    assertNull(child.put("brand-new", "v"));
-  }
-
-  @Test
-  void putReturnsLocalPriorWhenShadowingParent() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.set("a", "local-a"); // local now shadows the parent
-    assertEquals("local-a", child.put("a", "local-a2"), "the local prior wins over the parent's");
-  }
-
-  @Test
-  void putAfterRemoveReportsNoPriorNotTheParentValue() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.remove("a"); // tombstone the parent's "a": no longer visible
-    assertNull(child.put("a", "child-a"), "a tombstoned key had no visible prior value");
-    assertEquals("child-a", child.getString("a"));
-  }
-
-  @Test
-  void getAndSetReturnsInheritedEntryAsPrior() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    TagMap.Entry prior = child.getAndSet("b", "child-b");
-    assertEquals("parent-b", prior.objectValue());
-  }
-
-  @Test
-  void setDoesNotReportPriorButStillClearsTombstone() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.remove("b"); // tombstone
-    child.set("b", "child-b"); // void set: no prior lookup, but must clear the tombstone
-    assertEquals("child-b", child.getString("b"));
-  }
-
-  // --- slice 7: clear() removes inherited mappings too (detaches the parent) ---
-
-  @Test
-  void clearRemovesInheritedMappingsAndDetachesParent() {
-    TagMap child = TagMap.createFromParent(frozenParent()); // {a, b}
-    child.set("c", "child-c");
-
-    child.clear();
-
-    assertTrue(child.isEmpty(), "clear must remove local AND inherited mappings");
-    assertEquals(0, child.size());
-    assertNull(child.getString("a")); // inherited no longer visible
-    assertNull(child.getString("c"));
-    assertFalse(child.containsKey("a"));
-  }
-
-  @Test
-  void clearDoesNotAffectTheFrozenParent() {
-    TagMap parent = frozenParent();
-    TagMap child = TagMap.createFromParent(parent);
-    child.clear();
-    assertEquals("parent-a", parent.getString("a"), "the shared frozen parent is untouched");
-  }
-
-  @Test
-  void putAfterClearBehavesAsAPlainMap() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.clear();
-    child.set("x", "x-val");
-    assertEquals(1, child.size());
-    assertEquals("x-val", child.getString("x"));
-    assertNull(child.getString("a"), "no read-through after clear detached the parent");
-  }
-
-  // --- slice 8: fillMap/fillStringMap materialize the visible union, not just local entries ---
-
-  private static Map<String, Object> fillMapCollect(TagMap map) {
-    Map<String, Object> out = new HashMap<>();
-    map.fillMap(out);
-    return out;
-  }
-
-  private static Map<String, String> fillStringMapCollect(TagMap map) {
-    Map<String, String> out = new HashMap<>();
-    map.fillStringMap(out);
-    return out;
-  }
-
-  @Test
-  void fillMapMaterializesDedupedUnionLocalWins() {
-    TagMap child = TagMap.createFromParent(frozenParent()); // parent {a, b}
-    child.set("b", "child-b"); // shadows parent "b"
-    child.set("c", "child-c");
-
-    Map<String, Object> out = fillMapCollect(child);
-    assertEquals(3, out.size(), "union {a, b, c} with b deduped");
-    assertEquals("parent-a", out.get("a")); // inherited tag must not be dropped
-    assertEquals("child-b", out.get("b")); // local wins
-    assertEquals("child-c", out.get("c"));
-  }
-
-  @Test
-  void fillMapHonorsTombstonedParentKeys() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.set("c", "child-c");
-    child.remove("a"); // tombstone parent's "a"
-
-    Map<String, Object> out = fillMapCollect(child);
-    assertEquals(2, out.size());
-    assertFalse(out.containsKey("a"));
-    assertEquals("parent-b", out.get("b"));
-    assertEquals("child-c", out.get("c"));
-  }
-
-  @Test
-  void fillStringMapMaterializesDedupedUnionLocalWins() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.set("b", "child-b"); // shadows parent "b"
-    child.set("c", "child-c");
-
-    Map<String, String> out = fillStringMapCollect(child);
-    assertEquals(3, out.size());
-    assertEquals("parent-a", out.get("a")); // inherited tag preserved
-    assertEquals("child-b", out.get("b"));
-    assertEquals("child-c", out.get("c"));
-  }
-
-  @Test
-  void fillStringMapHonorsTombstonedParentKeys() {
-    TagMap child = TagMap.createFromParent(frozenParent());
-    child.remove("a"); // tombstone parent's "a"
-
-    Map<String, String> out = fillStringMapCollect(child);
-    assertEquals(1, out.size());
-    assertFalse(out.containsKey("a"));
-    assertEquals("parent-b", out.get("b"));
-  }
-
-  @Test
-  void fillMapAcrossChainMatchesEquivalentFlatMap() {
-    TagMap leaf = threeLevelLeaf();
-
-    TagMap flat = TagMap.create();
-    flat.set("a", "gp-a");
-    flat.set("b", "mid-b");
-    flat.set("c", "leaf-c");
-    flat.set("d", "mid-d");
-    flat.set("e", "leaf-e");
-
-    assertEquals(fillMapCollect(flat), fillMapCollect(leaf));
-    assertEquals(fillStringMapCollect(flat), fillStringMapCollect(leaf));
-  }
-
-  @Test
-  void fillMapWithoutParentFillsOnlyLocalEntries() {
-    // regression: the no-parent fast path is unchanged
-    TagMap flat = TagMap.create();
-    flat.set("x", "x-val");
-    flat.set("y", "y-val");
-
-    Map<String, Object> out = fillMapCollect(flat);
-    assertEquals(2, out.size());
-    assertEquals("x-val", out.get("x"));
-    assertEquals("y-val", out.get("y"));
-  }
+    private static TagMap frozenParent() {
+        TagMap parent = TagMap.create();
+        parent.set("a", "parent-a");
+        parent.set("b", "parent-b");
+        parent.freeze();
+        return parent;
+    }
+
+    @Test
+    void readsThroughToParentOnMiss() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.set("c", "child-c");
+
+        assertEquals("parent-a", child.getString("a")); // miss locally -> read through
+        assertEquals("parent-b", child.getString("b"));
+        assertEquals("child-c", child.getString("c")); // local
+        assertNull(child.getString("missing"));
+        assertTrue(child.containsKey("a"));
+        assertFalse(child.containsKey("missing"));
+    }
+
+    @Test
+    void localEntryShadowsParent() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.set("b", "child-b"); // same key as parent
+
+        assertEquals("child-b", child.getString("b")); // local wins
+        assertEquals("parent-a", child.getString("a")); // parent still visible
+    }
+
+    @Test
+    void estimateSizeIsUpperBound() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.set("b", "child-b"); // shadows parent "b"
+        child.set("c", "child-c");
+
+        // true union = {a, b, c} = 3; estimate over-counts the shadowed "b": local 2 + parent 2 = 4
+        assertEquals(4, child.estimateSize());
+        assertTrue(child.estimateSize() >= 3, "estimateSize must be an upper bound on the true size");
+    }
+
+    @Test
+    void emptinessSemantics() {
+        TagMap emptyOverEmpty = TagMap.createFromParent(TagMap.create().freeze());
+        assertTrue(emptyOverEmpty.isEmpty());
+        assertTrue(emptyOverEmpty.isDefinitelyEmpty());
+
+        TagMap emptyOverNonEmpty = TagMap.createFromParent(frozenParent());
+        assertFalse(emptyOverNonEmpty.isEmpty(), "a non-empty parent makes the map non-empty");
+        assertFalse(emptyOverNonEmpty.isDefinitelyEmpty());
+
+        assertTrue((TagMap.create()).isDefinitelyEmpty());
+    }
+
+    @Test
+    void parentMustBeFrozen() {
+        TagMap mutableParent = TagMap.create();
+        assertThrows(IllegalStateException.class, () -> TagMap.createFromParent(mutableParent));
+    }
+
+    @Test
+    void emptyParentIsDroppedNotAttached() {
+        TagMap emptyFrozen = TagMap.create();
+        emptyFrozen.freeze();
+
+        TagMap overEmpty = TagMap.createFromParent(emptyFrozen);
+        // an empty frozen parent contributes nothing and never will -> dropped, no read-through cost
+        assertNull(overEmpty.parent, "empty parent should be dropped");
+        assertTrue(overEmpty.isDefinitelyEmpty());
+        overEmpty.set("x", "x-val"); // still a normal mutable map
+        assertEquals("x-val", overEmpty.getString("x"));
+
+        // a non-empty parent is still attached
+        TagMap overNonEmpty = TagMap.createFromParent(frozenParent());
+        assertNotNull(overNonEmpty.parent, "non-empty parent must be attached");
+        assertEquals("parent-a", overNonEmpty.getString("a"));
+    }
+
+    // --- slice 2: removal / tombstones ---
+
+    @Test
+    void removingParentKeyHidesItFromChildButNotFromParent() {
+        TagMap parent = frozenParent();
+        TagMap child = TagMap.createFromParent(parent);
+
+        assertEquals("parent-a", child.getString("a")); // visible before removal
+        child.remove("a");
+
+        assertNull(child.getString("a")); // tombstoned: no longer reads through
+        assertFalse(child.containsKey("a"));
+        assertEquals("parent-b", child.getString("b")); // other parent keys unaffected
+        assertEquals("parent-a", parent.getString("a")); // frozen parent untouched
+    }
+
+    @Test
+    void removeReturnsPriorVisibleValueViaParent() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+
+        // Map.remove contract: the key was present (via read-through), so removal reports it.
+        assertTrue(child.remove("a"), "removing a parent-exposed key should report it was present");
+        assertNull(child.getString("a"));
+    }
+
+    @Test
+    void reSettingARemovedKeyRestoresVisibility() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+
+        child.remove("a");
+        assertNull(child.getString("a"));
+
+        child.set("a", "child-a"); // re-set clears the tombstone
+        assertEquals("child-a", child.getString("a"));
+    }
+
+    @Test
+    void removingAKeyThatIsBothLocalAndParentHidesBoth() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.set("b", "child-b"); // shadows parent "b"
+
+        assertEquals("child-b", child.getString("b"));
+        child.remove("b");
+
+        assertNull(child.getString("b"), "removal must hide both the local entry and the parent's");
+        assertEquals("parent-b", frozenParent().getString("b")); // parent still has it
+    }
+
+    // --- slice 3a: bulk forEach union + exact size/isEmpty ---
+
+    private static Map<String, Object> collect(TagMap map) {
+        Map<String, Object> out = new HashMap<>();
+        map.forEach(e -> out.put(e.tag(), e.objectValue()));
+        return out;
+    }
+
+    @Test
+    void forEachEmitsDedupedUnionLocalWins() {
+        TagMap child = TagMap.createFromParent(frozenParent()); // parent {a, b}
+        child.set("b", "child-b"); // shadows parent "b"
+        child.set("c", "child-c");
+
+        Map<String, Object> u = collect(child);
+        assertEquals(3, u.size(), "union {a, b, c} with b deduped");
+        assertEquals("parent-a", u.get("a")); // read-through
+        assertEquals("child-b", u.get("b")); // local wins (no duplicate emit)
+        assertEquals("child-c", u.get("c"));
+    }
+
+    @Test
+    void forEachSkipsTombstonedParentKeys() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.set("c", "child-c");
+        child.remove("a"); // tombstone parent's "a"
+
+        Map<String, Object> u = collect(child);
+        assertEquals(2, u.size());
+        assertFalse(u.containsKey("a"));
+        assertEquals("parent-b", u.get("b"));
+        assertEquals("child-c", u.get("c"));
+    }
+
+    @Test
+    void biConsumerForEachAlsoEmitsUnion() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.set("c", "child-c");
+
+        Map<String, Object> out = new HashMap<>();
+        child.forEach(out, (m, e) -> m.put(e.tag(), e.objectValue())); // non-capturing: alloc-free path
+        assertEquals(3, out.size());
+        assertEquals("parent-a", out.get("a"));
+        assertEquals("child-c", out.get("c"));
+    }
+
+    @Test
+    void sizeIsExactUnion() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.set("b", "child-b"); // shadows
+        child.set("c", "child-c");
+        assertEquals(3, child.size()); // {a, b, c} — b deduped, not 4
+
+        child.remove("a");
+        assertEquals(2, child.size()); // {b, c}
+    }
+
+    @Test
+    void isEmptyExactWhenAllParentKeysTombstonedAndNoLocal() {
+        TagMap child = TagMap.createFromParent(frozenParent()); // parent {a, b}
+        assertFalse(child.isEmpty());
+
+        child.remove("a");
+        child.remove("b");
+        assertTrue(child.isEmpty(), "all parent keys tombstoned and no local entries -> empty");
+        assertEquals(0, child.size());
+    }
+
+    // --- slice 3b: pull-based iterators / collection views ---
+
+    @Test
+    void iteratorEmitsDedupedUnion() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.set("b", "child-b"); // shadows parent "b"
+        child.set("c", "child-c");
+
+        Map<String, Object> u = new HashMap<>();
+        Iterator<TagMap.EntryReader> it = child.iterator();
+        while (it.hasNext()) {
+            TagMap.EntryReader e = it.next();
+            u.put(e.tag(), e.objectValue());
+        }
+        assertEquals(3, u.size());
+        assertEquals("parent-a", u.get("a"));
+        assertEquals("child-b", u.get("b")); // local wins, emitted once
+        assertEquals("child-c", u.get("c"));
+    }
+
+    @Test
+    void keySetReflectsUnionAndTombstones() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.set("c", "child-c");
+
+        Set<String> keys = child.keySet();
+        assertEquals(3, keys.size()); // a, b, c
+        assertTrue(keys.contains("a"));
+        assertTrue(keys.contains("c"));
+
+        child.remove("a");
+        assertEquals(2, child.keySet().size());
+        assertFalse(child.keySet().contains("a"));
+    }
+
+    @Test
+    void valuesAndEntrySetReflectUnion() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.set("b", "child-b"); // shadows parent "b"
+
+        assertEquals(2, child.entrySet().size()); // {a, b} — b deduped
+        assertTrue(child.values().contains("child-b")); // local-won value
+        assertTrue(child.values().contains("parent-a"));
+        assertFalse(child.values().contains("parent-b"), "shadowed parent value must not appear");
+    }
+
+    // --- slice 3c: putAll from a read-through source copies the visible union, not just locals ---
+
+    @Test
+    void putAllFromReadThroughSourceCopiesFullVisibleUnion() {
+        TagMap source = TagMap.createFromParent(frozenParent()); // parent {a, b}
+        source.set("b", "child-b"); // shadows parent b
+        source.set("c", "child-c");
+
+        TagMap dest = TagMap.create(); // empty -> putAllIntoEmptyMap path
+        dest.putAll(source);
+
+        // the parent-visible "a" must land too, not just source's local entries
+        assertEquals(3, dest.size());
+        assertEquals("parent-a", dest.getString("a"));
+        assertEquals("child-b", dest.getString("b")); // local-won value, deduped
+        assertEquals("child-c", dest.getString("c"));
+    }
+
+    @Test
+    void putAllMergeFromReadThroughSourceCopiesVisibleUnion() {
+        TagMap source = TagMap.createFromParent(frozenParent()); // {a, b}
+
+        TagMap dest = TagMap.create();
+        dest.set("z", "dest-z"); // dest non-empty -> putAllMerge path
+
+        dest.putAll(source);
+        assertEquals(3, dest.size()); // {a, b, z}
+        assertEquals("parent-a", dest.getString("a"));
+        assertEquals("parent-b", dest.getString("b"));
+        assertEquals("dest-z", dest.getString("z"));
+    }
+
+    @Test
+    void putAllFromReadThroughSourceHonorsTombstones() {
+        TagMap source = TagMap.createFromParent(frozenParent());
+        source.remove("a"); // tombstone parent's "a"
+
+        TagMap dest = TagMap.create();
+        dest.putAll(source);
+
+        assertEquals(1, dest.size());
+        assertFalse(dest.containsKey("a"), "tombstoned key must not be copied");
+        assertEquals("parent-b", dest.getString("b"));
+    }
+
+    // --- slice 4: behavior-identical to a copy-down / flat map ---
+
+    @Test
+    void copyIsObservationallyIdentical() {
+        TagMap child = TagMap.createFromParent(frozenParent()); // {a, b}
+        child.set("b", "child-b"); // shadows parent "b"
+        child.set("c", "child-c");
+
+        TagMap copy = child.copy();
+        assertEquals(child.size(), copy.size());
+        assertEquals("parent-a", copy.getString("a")); // copy still reads through
+        assertEquals("child-b", copy.getString("b"));
+        assertEquals("child-c", copy.getString("c"));
+        assertEquals(collect(child), collect(copy)); // same union
+    }
+
+    @Test
+    void copyIsIndependentlyMutable() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.set("c", "child-c");
+
+        TagMap copy = child.copy();
+        copy.set("c", "copy-c"); // mutate copy's local
+        copy.remove("a"); // tombstone on copy only
+
+        assertEquals("child-c", child.getString("c"), "original unaffected by copy mutation");
+        assertEquals("parent-a", child.getString("a"), "original still reads through a");
+        assertEquals("copy-c", copy.getString("c"));
+        assertNull(copy.getString("a"));
+    }
+
+    @Test
+    void copyPreservesTombstones() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.remove("a"); // tombstone "a"
+
+        TagMap copy = child.copy();
+        assertNull(copy.getString("a"), "tombstone must carry into the copy");
+        assertEquals("parent-b", copy.getString("b"));
+    }
+
+    /** The contract that lets the consumer flip mergedTracerTags to a parent. */
+    @Test
+    void readThroughMatchesAnEquivalentFlatMap() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.set("b", "child-b");
+        child.set("c", "child-c");
+
+        TagMap flat = TagMap.create();
+        flat.set("a", "parent-a");
+        flat.set("b", "child-b");
+        flat.set("c", "child-c");
+
+        assertEquals(flat.size(), child.size());
+        assertEquals(collect(flat), collect(child));
+        assertEquals(flat.keySet(), child.keySet());
+        for (String k : new String[] {"a", "b", "c", "missing"}) {
+            assertEquals(flat.getString(k), child.getString(k), "mismatch for key " + k);
+        }
+    }
+
+    @Test
+    void immutableCopyOfReadThroughIsFrozenAndStillReadsThrough() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.set("c", "child-c");
+
+        TagMap frozen = child.immutableCopy();
+        assertTrue(frozen.isFrozen());
+        assertEquals("parent-a", frozen.getString("a")); // union preserved
+        assertEquals("child-c", frozen.getString("c"));
+        assertThrows(IllegalStateException.class, () -> frozen.set("x", "y")); // frozen blocks writes
+    }
+
+    // --- slice 5: multi-level chains (baggage-style layering over more than one frozen parent) ---
+
+    /**
+     * Builds a 3-level chain leaf -&gt; mid -&gt; grandparent (both ancestors frozen) and returns the
+     * leaf. Visible union, nearest-level-wins: {a=gp-a, b=mid-b, c=leaf-c, d=mid-d, e=leaf-e}.
+     */
+    private static TagMap threeLevelLeaf() {
+        TagMap grandparent = TagMap.create();
+        grandparent.set("a", "gp-a");
+        grandparent.set("b", "gp-b");
+        grandparent.set("c", "gp-c");
+        grandparent.freeze();
+
+        TagMap mid = TagMap.createFromParent(grandparent);
+        mid.set("b", "mid-b"); // shadows grandparent b
+        mid.set("d", "mid-d");
+        mid.freeze();
+
+        TagMap leaf = TagMap.createFromParent(mid);
+        leaf.set("c", "leaf-c"); // shadows grandparent c (mid doesn't define c)
+        leaf.set("e", "leaf-e");
+        return leaf;
+    }
+
+    @Test
+    void getWalksTheWholeChainNearestWins() {
+        TagMap leaf = threeLevelLeaf();
+        assertEquals("gp-a", leaf.getString("a")); // only in grandparent (two levels up)
+        assertEquals("mid-b", leaf.getString("b")); // mid shadows grandparent
+        assertEquals("leaf-c", leaf.getString("c")); // leaf shadows grandparent
+        assertEquals("mid-d", leaf.getString("d"));
+        assertEquals("leaf-e", leaf.getString("e"));
+        assertNull(leaf.getString("missing"));
+    }
+
+    @Test
+    void sizeIsExactUnionAcrossChain() {
+        assertEquals(5, threeLevelLeaf().size()); // {a, b, c, d, e}, shadowed duplicates deduped
+    }
+
+    @Test
+    void forEachEmitsDedupedUnionAcrossChain() {
+        Map<String, Object> u = collect(threeLevelLeaf());
+        assertEquals(5, u.size());
+        assertEquals("gp-a", u.get("a"));
+        assertEquals("mid-b", u.get("b")); // nearest ancestor wins over grandparent
+        assertEquals("leaf-c", u.get("c")); // leaf wins
+        assertEquals("mid-d", u.get("d"));
+        assertEquals("leaf-e", u.get("e"));
+    }
+
+    @Test
+    void iteratorEmitsDedupedUnionAcrossChain() {
+        Map<String, Object> u = new HashMap<>();
+        Iterator<TagMap.EntryReader> it = threeLevelLeaf().iterator();
+        while (it.hasNext()) {
+            TagMap.EntryReader e = it.next();
+            u.put(e.tag(), e.objectValue());
+        }
+        assertEquals(5, u.size());
+        assertEquals("gp-a", u.get("a"));
+        assertEquals("mid-b", u.get("b"));
+        assertEquals("leaf-c", u.get("c"));
+    }
+
+    @Test
+    void keySetReflectsChainUnion() {
+        Set<String> keys = threeLevelLeaf().keySet();
+        assertEquals(5, keys.size());
+        for (String k : new String[] {"a", "b", "c", "d", "e"}) {
+            assertTrue(keys.contains(k), "missing key " + k);
+        }
+    }
+
+    @Test
+    void leafTombstoneHidesGrandparentOnlyKey() {
+        TagMap leaf = threeLevelLeaf();
+        leaf.remove("a"); // "a" lives only in the grandparent, two levels up
+        assertNull(leaf.getString("a"));
+        assertFalse(leaf.containsKey("a"));
+        assertFalse(leaf.keySet().contains("a"));
+        assertEquals(4, leaf.size()); // {b, c, d, e}
+    }
+
+    @Test
+    void intermediateAncestorTombstoneIsHonoredByBulkViews() {
+        // mid removes an inherited grandparent key, THEN is frozen and reused as a parent. A non-leaf
+        // level can therefore carry its own tombstones. Point lookups recurse through mid's tombstone
+        // (correct); the bulk views must agree and not re-emit the key.
+        TagMap grandparent = TagMap.create();
+        grandparent.set("a", "gp-a");
+        grandparent.set("b", "gp-b");
+        grandparent.freeze();
+
+        TagMap mid = TagMap.createFromParent(grandparent);
+        mid.remove("a"); // tombstone an inherited key before freezing
+        mid.freeze();
+
+        TagMap leaf = TagMap.createFromParent(mid);
+
+        // point lookups (recurse -> already correct)
+        assertNull(leaf.getString("a"));
+        assertFalse(leaf.containsKey("a"));
+        assertEquals("gp-b", leaf.getString("b"));
+
+        // bulk views must agree: mid's tombstone hides grandparent's "a"
+        assertEquals(1, leaf.size());
+        assertFalse(leaf.keySet().contains("a"));
+
+        Map<String, Object> viaForEach = collect(leaf);
+        assertEquals(1, viaForEach.size());
+        assertFalse(viaForEach.containsKey("a"));
+        assertEquals("gp-b", viaForEach.get("b"));
+
+        Map<String, Object> viaIterator = new HashMap<>();
+        Iterator<TagMap.EntryReader> it = leaf.iterator();
+        while (it.hasNext()) {
+            TagMap.EntryReader e = it.next();
+            viaIterator.put(e.tag(), e.objectValue());
+        }
+        assertEquals(1, viaIterator.size());
+        assertFalse(viaIterator.containsKey("a"));
+    }
+
+    @Test
+    void observationallyEmptyIntermediateParentIsDroppedNotAttached() {
+        // A frozen mid level with no local entries whose every inherited key is tombstoned is
+        // observationally empty even though a local (grandparent) level still holds entries.
+        // createFromParent must drop it (exact isEmpty), so the leaf stays consistent: isEmpty() must
+        // agree with size()/lookup/iteration.
+        TagMap grandparent = TagMap.create();
+        grandparent.set("a", "gp-a");
+        grandparent.freeze();
+
+        TagMap mid = TagMap.createFromParent(grandparent);
+        mid.remove("a"); // tombstone the only inherited key -> mid is observationally empty
+        mid.freeze();
+        assertTrue(mid.isEmpty());
+
+        TagMap leaf = TagMap.createFromParent(mid);
+        assertEquals(0, leaf.size());
+        assertTrue(leaf.isEmpty(), "isEmpty() must agree with size()==0");
+        assertNull(leaf.getString("a"));
+        assertTrue(collect(leaf).isEmpty());
+        assertFalse(leaf.iterator().hasNext());
+    }
+
+    @Test
+    void chainReadThroughMatchesEquivalentFlatMap() {
+        TagMap leaf = threeLevelLeaf();
+
+        TagMap flat = TagMap.create();
+        flat.set("a", "gp-a");
+        flat.set("b", "mid-b");
+        flat.set("c", "leaf-c");
+        flat.set("d", "mid-d");
+        flat.set("e", "leaf-e");
+
+        assertEquals(flat.size(), leaf.size());
+        assertEquals(collect(flat), collect(leaf));
+        assertEquals(flat.keySet(), leaf.keySet());
+        for (String k : new String[] {"a", "b", "c", "d", "e", "missing"}) {
+            assertEquals(flat.getString(k), leaf.getString(k), "mismatch for key " + k);
+        }
+    }
+
+    // --- slice 6: put/getAndSet report the prior visible value, including inherited ---
+
+    @Test
+    void putReturnsInheritedParentValueAsPrior() {
+        TagMap child = TagMap.createFromParent(frozenParent()); // parent {a, b}
+        Object prior = child.put("a", "child-a"); // "a" exists only in the parent
+        assertEquals("parent-a", prior, "put must report the inherited value as the previous mapping");
+        assertEquals("child-a", child.getString("a")); // new value stored locally
+    }
+
+    @Test
+    void putReturnsNullForAKeyInNeitherLocalNorParent() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        assertNull(child.put("brand-new", "v"));
+    }
+
+    @Test
+    void putReturnsLocalPriorWhenShadowingParent() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.set("a", "local-a"); // local now shadows the parent
+        assertEquals("local-a", child.put("a", "local-a2"), "the local prior wins over the parent's");
+    }
+
+    @Test
+    void putAfterRemoveReportsNoPriorNotTheParentValue() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.remove("a"); // tombstone the parent's "a": no longer visible
+        assertNull(child.put("a", "child-a"), "a tombstoned key had no visible prior value");
+        assertEquals("child-a", child.getString("a"));
+    }
+
+    @Test
+    void getAndSetReturnsInheritedEntryAsPrior() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        TagMap.Entry prior = child.getAndSet("b", "child-b");
+        assertEquals("parent-b", prior.objectValue());
+    }
+
+    @Test
+    void setDoesNotReportPriorButStillClearsTombstone() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.remove("b"); // tombstone
+        child.set("b", "child-b"); // void set: no prior lookup, but must clear the tombstone
+        assertEquals("child-b", child.getString("b"));
+    }
+
+    // --- slice 7: clear() removes inherited mappings too (detaches the parent) ---
+
+    @Test
+    void clearRemovesInheritedMappingsAndDetachesParent() {
+        TagMap child = TagMap.createFromParent(frozenParent()); // {a, b}
+        child.set("c", "child-c");
+
+        child.clear();
+
+        assertTrue(child.isEmpty(), "clear must remove local AND inherited mappings");
+        assertEquals(0, child.size());
+        assertNull(child.getString("a")); // inherited no longer visible
+        assertNull(child.getString("c"));
+        assertFalse(child.containsKey("a"));
+    }
+
+    @Test
+    void clearDoesNotAffectTheFrozenParent() {
+        TagMap parent = frozenParent();
+        TagMap child = TagMap.createFromParent(parent);
+        child.clear();
+        assertEquals("parent-a", parent.getString("a"), "the shared frozen parent is untouched");
+    }
+
+    @Test
+    void putAfterClearBehavesAsAPlainMap() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.clear();
+        child.set("x", "x-val");
+        assertEquals(1, child.size());
+        assertEquals("x-val", child.getString("x"));
+        assertNull(child.getString("a"), "no read-through after clear detached the parent");
+    }
+
+    // --- slice 8: fillMap/fillStringMap materialize the visible union, not just local entries ---
+
+    private static Map<String, Object> fillMapCollect(TagMap map) {
+        Map<String, Object> out = new HashMap<>();
+        map.fillMap(out);
+        return out;
+    }
+
+    private static Map<String, String> fillStringMapCollect(TagMap map) {
+        Map<String, String> out = new HashMap<>();
+        map.fillStringMap(out);
+        return out;
+    }
+
+    @Test
+    void fillMapMaterializesDedupedUnionLocalWins() {
+        TagMap child = TagMap.createFromParent(frozenParent()); // parent {a, b}
+        child.set("b", "child-b"); // shadows parent "b"
+        child.set("c", "child-c");
+
+        Map<String, Object> out = fillMapCollect(child);
+        assertEquals(3, out.size(), "union {a, b, c} with b deduped");
+        assertEquals("parent-a", out.get("a")); // inherited tag must not be dropped
+        assertEquals("child-b", out.get("b")); // local wins
+        assertEquals("child-c", out.get("c"));
+    }
+
+    @Test
+    void fillMapHonorsTombstonedParentKeys() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.set("c", "child-c");
+        child.remove("a"); // tombstone parent's "a"
+
+        Map<String, Object> out = fillMapCollect(child);
+        assertEquals(2, out.size());
+        assertFalse(out.containsKey("a"));
+        assertEquals("parent-b", out.get("b"));
+        assertEquals("child-c", out.get("c"));
+    }
+
+    @Test
+    void fillStringMapMaterializesDedupedUnionLocalWins() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.set("b", "child-b"); // shadows parent "b"
+        child.set("c", "child-c");
+
+        Map<String, String> out = fillStringMapCollect(child);
+        assertEquals(3, out.size());
+        assertEquals("parent-a", out.get("a")); // inherited tag preserved
+        assertEquals("child-b", out.get("b"));
+        assertEquals("child-c", out.get("c"));
+    }
+
+    @Test
+    void fillStringMapHonorsTombstonedParentKeys() {
+        TagMap child = TagMap.createFromParent(frozenParent());
+        child.remove("a"); // tombstone parent's "a"
+
+        Map<String, String> out = fillStringMapCollect(child);
+        assertEquals(1, out.size());
+        assertFalse(out.containsKey("a"));
+        assertEquals("parent-b", out.get("b"));
+    }
+
+    @Test
+    void fillMapAcrossChainMatchesEquivalentFlatMap() {
+        TagMap leaf = threeLevelLeaf();
+
+        TagMap flat = TagMap.create();
+        flat.set("a", "gp-a");
+        flat.set("b", "mid-b");
+        flat.set("c", "leaf-c");
+        flat.set("d", "mid-d");
+        flat.set("e", "leaf-e");
+
+        assertEquals(fillMapCollect(flat), fillMapCollect(leaf));
+        assertEquals(fillStringMapCollect(flat), fillStringMapCollect(leaf));
+    }
+
+    @Test
+    void fillMapWithoutParentFillsOnlyLocalEntries() {
+        // regression: the no-parent fast path is unchanged
+        TagMap flat = TagMap.create();
+        flat.set("x", "x-val");
+        flat.set("y", "y-val");
+
+        Map<String, Object> out = fillMapCollect(flat);
+        assertEquals(2, out.size());
+        assertEquals("x-val", out.get("x"));
+        assertEquals("y-val", out.get("y"));
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/TagMapScenario.java b/internal-api/src/test/java/datadog/trace/api/TagMapScenario.java
index 1c07b31c563..56bf99f06d0 100644
--- a/internal-api/src/test/java/datadog/trace/api/TagMapScenario.java
+++ b/internal-api/src/test/java/datadog/trace/api/TagMapScenario.java
@@ -1,27 +1,27 @@
 package datadog.trace.api;
 
 public enum TagMapScenario {
-  OPTIMIZED_EMPTY(0),
-  OPTIMIZED_XSMALL(5),
-  OPTIMIZED_SMALL(10),
-  OPTIMIZED_MEDIUM(25),
-  OPTIMIZED_LARGE(125);
+    OPTIMIZED_EMPTY(0),
+    OPTIMIZED_XSMALL(5),
+    OPTIMIZED_SMALL(10),
+    OPTIMIZED_MEDIUM(25),
+    OPTIMIZED_LARGE(125);
 
-  final int size;
+    final int size;
 
-  TagMapScenario(int size) {
-    this.size = size;
-  }
+    TagMapScenario(int size) {
+        this.size = size;
+    }
 
-  public final int size() {
-    return this.size;
-  }
+    public final int size() {
+        return this.size;
+    }
 
-  public final TagMap create() {
-    TagMap map = TagMap.create();
-    for (int i = 0; i < this.size; ++i) {
-      map.put("filler-key-" + i, "filler-value-" + i);
+    public final TagMap create() {
+        TagMap map = TagMap.create();
+        for (int i = 0; i < this.size; ++i) {
+            map.put("filler-key-" + i, "filler-value-" + i);
+        }
+        return map;
     }
-    return map;
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/TagMapTest.java b/internal-api/src/test/java/datadog/trace/api/TagMapTest.java
index 9a72b7bdd60..30600bcde8c 100644
--- a/internal-api/src/test/java/datadog/trace/api/TagMapTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/TagMapTest.java
@@ -22,1086 +22,1082 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 public class TagMapTest {
-  // size is chosen to make sure to stress all types of collisions in the Map
-  static final int MANY_SIZE = 256;
+    // size is chosen to make sure to stress all types of collisions in the Map
+    static final int MANY_SIZE = 256;
 
-  // static function tests - mostly exist to satisfy coverage checker
-  @Test
-  public void fromMap_emptyMap() {
-    Map<String, String> emptyMap = Collections.emptyMap();
+    // static function tests - mostly exist to satisfy coverage checker
+    @Test
+    public void fromMap_emptyMap() {
+        Map<String, String> emptyMap = Collections.emptyMap();
 
-    TagMap tagMap = TagMap.fromMap(emptyMap);
-    assertEquals(0, tagMap.size());
-    assertTrue(tagMap.isEmpty());
+        TagMap tagMap = TagMap.fromMap(emptyMap);
+        assertEquals(0, tagMap.size());
+        assertTrue(tagMap.isEmpty());
 
-    assertFalse(tagMap.isFrozen());
-  }
+        assertFalse(tagMap.isFrozen());
+    }
 
-  @Test
-  public void fromMap_nonEmptyMap() {
-    // mostly exists to satisfy coverage checker
-    HashMap<String, String> origMap = new HashMap<>();
-    origMap.put("foo", "bar");
-    origMap.put("baz", "quux");
+    @Test
+    public void fromMap_nonEmptyMap() {
+        // mostly exists to satisfy coverage checker
+        HashMap<String, String> origMap = new HashMap<>();
+        origMap.put("foo", "bar");
+        origMap.put("baz", "quux");
 
-    TagMap tagMap = TagMap.fromMap(origMap);
-    assertEquals(tagMap.size(), origMap.size());
-
-    assertEquals(tagMap.get("foo"), origMap.get("foo"));
-    assertEquals(tagMap.get("baz"), origMap.get("baz"));
-
-    assertFalse(tagMap.isFrozen());
-  }
+        TagMap tagMap = TagMap.fromMap(origMap);
+        assertEquals(tagMap.size(), origMap.size());
 
-  @Test
-  public void fromMapImmutable_empty() {
-    Map<String, String> emptyMap = Collections.emptyMap();
-
-    TagMap tagMap = TagMap.fromMapImmutable(emptyMap);
-    assertEquals(0, tagMap.size());
-    assertTrue(tagMap.isEmpty());
-
-    assertTrue(tagMap.isFrozen());
-  }
-
-  @Test
-  public void fromMapImmutable_nonEmptyMap() {
-    // mostly exists to satisfy coverage checker
-    HashMap<String, String> origMap = new HashMap<>();
-    origMap.put("foo", "bar");
-    origMap.put("baz", "quux");
-
-    TagMap tagMap = TagMap.fromMapImmutable(origMap);
-    assertEquals(tagMap.size(), origMap.size());
-
-    assertEquals(tagMap.get("foo"), origMap.get("foo"));
-    assertEquals(tagMap.get("baz"), origMap.get("baz"));
-
-    assertTrue(tagMap.isFrozen());
-  }
-
-  @ParameterizedTest
-  @EnumSource(TagMapScenario.class)
-  public void map_put(TagMapScenario scenario) {
-    TagMap map = scenario.create();
-
-    Object prev = map.put("foo", "bar");
-    assertNull(prev);
-
-    assertEntry("foo", "bar", map);
-
-    assertSize(scenario.size() + 1, map);
-    assertNotEmpty(map);
-
-    checkIntegrity(map);
-  }
-
-  @ParameterizedTest
-  @EnumSource(TagMapScenario.class)
-  public void booleanEntry(TagMapScenario scenario) {
-    String BOOL = "bool";
-    String UNSET = "unset";
-
-    boolean first = false;
-    boolean second = true;
-
-    TagMap map = scenario.create();
-    map.set(BOOL, first);
-
-    TagMap.Entry firstEntry = map.getEntry(BOOL);
-    assertEquals(TagMap.Entry.BOOLEAN, firstEntry.rawType);
-
-    assertEquals(first, firstEntry.booleanValue());
-    assertEquals(first, map.getBoolean(BOOL));
-
-    TagMap.Entry priorEntry = map.getAndSet(BOOL, second);
-    assertSame(priorEntry, firstEntry);
-    assertEquals(first, priorEntry.booleanValue());
-
-    TagMap.Entry newEntry = map.getEntry(BOOL);
-    assertEquals(second, newEntry.booleanValue());
-
-    assertEquals(false, map.getBoolean(UNSET));
-    assertEquals(true, map.getBooleanOrDefault(UNSET, true));
-
-    checkIntegrity(map);
-  }
-
-  @Test
-  public void numericZeroToBooleanCoercion() {
-    TagMap map =
-        TagMap.ledger()
-            .set("int", 0)
-            .set("intObj", Integer.valueOf(0))
-            .set("long", 0L)
-            .set("longObj", Long.valueOf(0L))
-            .set("float", 0F)
-            .set("floatObj", Float.valueOf(0F))
-            .set("double", 0D)
-            .set("doubleObj", Double.valueOf(0D))
-            .build();
-
-    assertBoolean(false, map, "int");
-    assertBoolean(false, map, "intObj");
-    assertBoolean(false, map, "long");
-    assertBoolean(false, map, "longObj");
-    assertBoolean(false, map, "float");
-    assertBoolean(false, map, "floatObj");
-    assertBoolean(false, map, "double");
-    assertBoolean(false, map, "doubleObj");
-
-    checkIntegrity(map);
-  }
-
-  @Test
-  public void numericNonZeroToBooleanCoercion() {
-    TagMap map =
-        TagMap.ledger()
-            .set("int", 1)
-            .set("intObj", Integer.valueOf(1))
-            .set("long", 1L)
-            .set("longObj", Long.valueOf(1L))
-            .set("float", 1F)
-            .set("floatObj", Float.valueOf(1F))
-            .set("double", 1D)
-            .set("doubleObj", Double.valueOf(1D))
-            .build();
-
-    assertBoolean(true, map, "int");
-    assertBoolean(true, map, "intObj");
-    assertBoolean(true, map, "long");
-    assertBoolean(true, map, "longObj");
-    assertBoolean(true, map, "float");
-    assertBoolean(true, map, "floatObj");
-    assertBoolean(true, map, "double");
-    assertBoolean(true, map, "doubleObj");
-
-    checkIntegrity(map);
-  }
-
-  @Test
-  public void objectToBooleanCoercion() {
-    TagMap map =
-        TagMap.ledger()
-            .set("obj", new Object())
-            .set("trueStr", "true")
-            .set("falseStr", "false")
-            .build();
-
-    assertBoolean(true, map, "obj");
-    assertBoolean(true, map, "trueStr");
-    assertBoolean(true, map, "falseStr");
-
-    checkIntegrity(map);
-  }
-
-  @Test
-  public void booleanToNumericCoercion_true() {
-    TagMap map = TagMap.ledger().set("true", true).build();
-
-    assertInt(1, map, "true");
-    assertLong(1L, map, "true");
-    assertFloat(1F, map, "true");
-    assertDouble(1D, map, "true");
-
-    checkIntegrity(map);
-  }
-
-  @Test
-  public void booleanToNumericCoercion_false() {
-    TagMap map = TagMap.ledger().set("false", false).build();
-
-    assertInt(0, map, "false");
-    assertLong(0L, map, "false");
-    assertFloat(0F, map, "false");
-    assertDouble(0D, map, "false");
-
-    checkIntegrity(map);
-  }
-
-  @Test
-  public void emptyToPrimitiveCoercion() {
-    TagMap map = TagMap.EMPTY;
-
-    // DQH - assert<type> helpers also check get<type>OrDefault, so they don't work here
-    assertEquals(false, map.getBoolean("dne"));
-    assertEquals(0, map.getInt("dne"));
-    assertEquals(0L, map.getLong("dne"));
-    assertEquals(0F, map.getFloat("dne"));
-    assertEquals(0D, map.getDouble("dne"));
-
-    checkIntegrity(map);
-  }
-
-  @ParameterizedTest
-  @EnumSource(TagMapScenario.class)
-  public void intEntry(TagMapScenario scenario) {
-    String INT = "int";
-    String UNSET = "unset";
-
-    int first = 3142;
-    int second = 2718;
-
-    TagMap map = scenario.create();
-    map.set(INT, first);
-
-    TagMap.Entry firstEntry = map.getEntry("int");
-    assertEquals(TagMap.Entry.INT, firstEntry.rawType);
-
-    assertEquals(first, firstEntry.intValue());
-    assertEquals(first, map.getInt("int"));
-
-    TagMap.Entry priorEntry = map.getAndSet("int", second);
-    assertSame(priorEntry, firstEntry);
-    assertEquals(first, priorEntry.intValue());
-
-    TagMap.Entry newEntry = map.getEntry("int");
-    assertEquals(second, newEntry.intValue());
-    assertEquals(0, map.getInt(UNSET));
-    assertEquals(21, map.getIntOrDefault(UNSET, 21));
+        assertEquals(tagMap.get("foo"), origMap.get("foo"));
+        assertEquals(tagMap.get("baz"), origMap.get("baz"));
 
-    checkIntegrity(map);
-  }
+        assertFalse(tagMap.isFrozen());
+    }
 
-  @ParameterizedTest
-  @EnumSource(TagMapScenario.class)
-  public void longEntry(TagMapScenario scenario) {
-    String LONG = "long";
-    String UNSET = "unset";
+    @Test
+    public void fromMapImmutable_empty() {
+        Map<String, String> emptyMap = Collections.emptyMap();
 
-    long first = 3142L;
-    long second = 2718L;
+        TagMap tagMap = TagMap.fromMapImmutable(emptyMap);
+        assertEquals(0, tagMap.size());
+        assertTrue(tagMap.isEmpty());
 
-    TagMap map = scenario.create();
-    map.set(LONG, first);
+        assertTrue(tagMap.isFrozen());
+    }
 
-    TagMap.Entry firstEntry = map.getEntry("long");
-    assertEquals(TagMap.Entry.LONG, firstEntry.rawType);
+    @Test
+    public void fromMapImmutable_nonEmptyMap() {
+        // mostly exists to satisfy coverage checker
+        HashMap<String, String> origMap = new HashMap<>();
+        origMap.put("foo", "bar");
+        origMap.put("baz", "quux");
 
-    assertEquals(first, firstEntry.longValue());
-    assertEquals(first, map.getLong("long"));
+        TagMap tagMap = TagMap.fromMapImmutable(origMap);
+        assertEquals(tagMap.size(), origMap.size());
 
-    TagMap.Entry priorEntry = map.getAndSet("long", second);
-    assertSame(priorEntry, firstEntry);
-    assertEquals(first, priorEntry.longValue());
+        assertEquals(tagMap.get("foo"), origMap.get("foo"));
+        assertEquals(tagMap.get("baz"), origMap.get("baz"));
 
-    TagMap.Entry newEntry = map.getEntry("long");
-    assertEquals(second, newEntry.longValue());
+        assertTrue(tagMap.isFrozen());
+    }
 
-    assertEquals(0L, map.getLong(UNSET));
-    assertEquals(21L, map.getLongOrDefault(UNSET, 21L));
+    @ParameterizedTest
+    @EnumSource(TagMapScenario.class)
+    public void map_put(TagMapScenario scenario) {
+        TagMap map = scenario.create();
 
-    checkIntegrity(map);
-  }
+        Object prev = map.put("foo", "bar");
+        assertNull(prev);
 
-  @ParameterizedTest
-  @EnumSource(TagMapScenario.class)
-  public void floatEntry(TagMapScenario scenario) {
-    String FLOAT = "float";
-    String UNSET = "unset";
+        assertEntry("foo", "bar", map);
 
-    float first = 3.14F;
-    float second = 2.718F;
+        assertSize(scenario.size() + 1, map);
+        assertNotEmpty(map);
 
-    TagMap map = scenario.create();
-    map.set(FLOAT, first);
+        checkIntegrity(map);
+    }
 
-    TagMap.Entry firstEntry = map.getEntry(FLOAT);
-    assertEquals(TagMap.Entry.FLOAT, firstEntry.rawType);
+    @ParameterizedTest
+    @EnumSource(TagMapScenario.class)
+    public void booleanEntry(TagMapScenario scenario) {
+        String BOOL = "bool";
+        String UNSET = "unset";
 
-    assertEquals(first, firstEntry.floatValue());
-    assertEquals(first, map.getFloat(FLOAT));
+        boolean first = false;
+        boolean second = true;
 
-    TagMap.Entry priorEntry = map.getAndSet(FLOAT, second);
-    assertSame(priorEntry, firstEntry);
-    assertEquals(first, priorEntry.floatValue());
+        TagMap map = scenario.create();
+        map.set(BOOL, first);
 
-    TagMap.Entry newEntry = map.getEntry(FLOAT);
-    assertEquals(second, newEntry.floatValue());
+        TagMap.Entry firstEntry = map.getEntry(BOOL);
+        assertEquals(TagMap.Entry.BOOLEAN, firstEntry.rawType);
 
-    assertEquals(0F, map.getFloat(UNSET));
-    assertEquals(2.718F, map.getFloatOrDefault(UNSET, 2.718F));
+        assertEquals(first, firstEntry.booleanValue());
+        assertEquals(first, map.getBoolean(BOOL));
 
-    checkIntegrity(map);
-  }
+        TagMap.Entry priorEntry = map.getAndSet(BOOL, second);
+        assertSame(priorEntry, firstEntry);
+        assertEquals(first, priorEntry.booleanValue());
 
-  @ParameterizedTest
-  @EnumSource(TagMapScenario.class)
-  public void doubleEntry(TagMapScenario scenario) {
-    String DOUBLE = "double";
-    String UNSET = "unset";
+        TagMap.Entry newEntry = map.getEntry(BOOL);
+        assertEquals(second, newEntry.booleanValue());
 
-    double first = Math.PI;
-    double second = Math.E;
+        assertEquals(false, map.getBoolean(UNSET));
+        assertEquals(true, map.getBooleanOrDefault(UNSET, true));
 
-    TagMap map = scenario.create();
-    map.set(DOUBLE, Math.PI);
+        checkIntegrity(map);
+    }
 
-    TagMap.Entry firstEntry = map.getEntry(DOUBLE);
-    assertEquals(TagMap.Entry.DOUBLE, firstEntry.rawType);
+    @Test
+    public void numericZeroToBooleanCoercion() {
+        TagMap map = TagMap.ledger()
+                .set("int", 0)
+                .set("intObj", Integer.valueOf(0))
+                .set("long", 0L)
+                .set("longObj", Long.valueOf(0L))
+                .set("float", 0F)
+                .set("floatObj", Float.valueOf(0F))
+                .set("double", 0D)
+                .set("doubleObj", Double.valueOf(0D))
+                .build();
+
+        assertBoolean(false, map, "int");
+        assertBoolean(false, map, "intObj");
+        assertBoolean(false, map, "long");
+        assertBoolean(false, map, "longObj");
+        assertBoolean(false, map, "float");
+        assertBoolean(false, map, "floatObj");
+        assertBoolean(false, map, "double");
+        assertBoolean(false, map, "doubleObj");
+
+        checkIntegrity(map);
+    }
 
-    assertEquals(first, firstEntry.doubleValue());
-    assertEquals(first, map.getDouble(DOUBLE));
+    @Test
+    public void numericNonZeroToBooleanCoercion() {
+        TagMap map = TagMap.ledger()
+                .set("int", 1)
+                .set("intObj", Integer.valueOf(1))
+                .set("long", 1L)
+                .set("longObj", Long.valueOf(1L))
+                .set("float", 1F)
+                .set("floatObj", Float.valueOf(1F))
+                .set("double", 1D)
+                .set("doubleObj", Double.valueOf(1D))
+                .build();
+
+        assertBoolean(true, map, "int");
+        assertBoolean(true, map, "intObj");
+        assertBoolean(true, map, "long");
+        assertBoolean(true, map, "longObj");
+        assertBoolean(true, map, "float");
+        assertBoolean(true, map, "floatObj");
+        assertBoolean(true, map, "double");
+        assertBoolean(true, map, "doubleObj");
+
+        checkIntegrity(map);
+    }
 
-    TagMap.Entry priorEntry = map.getAndSet(DOUBLE, second);
-    assertSame(priorEntry, firstEntry);
-    assertEquals(first, priorEntry.doubleValue());
+    @Test
+    public void objectToBooleanCoercion() {
+        TagMap map = TagMap.ledger()
+                .set("obj", new Object())
+                .set("trueStr", "true")
+                .set("falseStr", "false")
+                .build();
 
-    TagMap.Entry newEntry = map.getEntry(DOUBLE);
-    assertEquals(second, newEntry.doubleValue());
+        assertBoolean(true, map, "obj");
+        assertBoolean(true, map, "trueStr");
+        assertBoolean(true, map, "falseStr");
 
-    assertEquals(0D, map.getDouble(UNSET));
-    assertEquals(2.718D, map.getDoubleOrDefault(UNSET, 2.718D));
+        checkIntegrity(map);
+    }
 
-    checkIntegrity(map);
-  }
+    @Test
+    public void booleanToNumericCoercion_true() {
+        TagMap map = TagMap.ledger().set("true", true).build();
 
-  @Test
-  public void empty() {
-    TagMap empty = TagMap.EMPTY;
-    assertFrozen(empty);
+        assertInt(1, map, "true");
+        assertLong(1L, map, "true");
+        assertFloat(1F, map, "true");
+        assertDouble(1D, map, "true");
 
-    assertNull(empty.getEntry("foo"));
-    assertSize(0, empty);
-    assertEmpty(empty);
+        checkIntegrity(map);
+    }
 
-    checkIntegrity(empty);
-  }
+    @Test
+    public void booleanToNumericCoercion_false() {
+        TagMap map = TagMap.ledger().set("false", false).build();
 
-  @Test
-  public void putAll_empty() {
-    // TagMap.EMPTY breaks the rules and uses a different size bucket array
-    // This test is just to verify that the common use of putAll still works with EMPTY
-    TagMap newMap = TagMap.create();
-    newMap.putAll(TagMap.EMPTY);
+        assertInt(0, map, "false");
+        assertLong(0L, map, "false");
+        assertFloat(0F, map, "false");
+        assertDouble(0D, map, "false");
 
-    assertSize(0, newMap);
-    assertEmpty(newMap);
+        checkIntegrity(map);
+    }
 
-    checkIntegrity(newMap);
-  }
+    @Test
+    public void emptyToPrimitiveCoercion() {
+        TagMap map = TagMap.EMPTY;
 
-  @ParameterizedTest
-  @EnumSource(TagMapScenario.class)
-  public void clear(TagMapScenario scenario) {
-    TagMap map = scenario.create();
-    assertSize(scenario.size(), map);
+        // DQH - assert<type> helpers also check get<type>OrDefault, so they don't work here
+        assertEquals(false, map.getBoolean("dne"));
+        assertEquals(0, map.getInt("dne"));
+        assertEquals(0L, map.getLong("dne"));
+        assertEquals(0F, map.getFloat("dne"));
+        assertEquals(0D, map.getDouble("dne"));
 
-    assertEmptiness(scenario.size() == 0, map);
+        checkIntegrity(map);
+    }
 
-    map.clear();
-    assertSize(0, map);
-    assertEmpty(map);
+    @ParameterizedTest
+    @EnumSource(TagMapScenario.class)
+    public void intEntry(TagMapScenario scenario) {
+        String INT = "int";
+        String UNSET = "unset";
 
-    checkIntegrity(map);
-  }
+        int first = 3142;
+        int second = 2718;
 
-  @ParameterizedTest
-  @EnumSource(TagMapScenario.class)
-  public void map_put_replacement(TagMapScenario scenario) {
-    TagMap map = scenario.create();
-    Object prev1 = map.put("foo", "bar");
-    assertNull(prev1);
+        TagMap map = scenario.create();
+        map.set(INT, first);
 
-    assertEntry("foo", "bar", map);
-    assertSize(scenario.size() + 1, map);
-    assertNotEmpty(map);
+        TagMap.Entry firstEntry = map.getEntry("int");
+        assertEquals(TagMap.Entry.INT, firstEntry.rawType);
 
-    Object prev2 = map.put("foo", "baz");
-    assertSize(scenario.size() + 1, map);
-    assertEquals("bar", prev2);
+        assertEquals(first, firstEntry.intValue());
+        assertEquals(first, map.getInt("int"));
 
-    assertEntry("foo", "baz", map);
+        TagMap.Entry priorEntry = map.getAndSet("int", second);
+        assertSame(priorEntry, firstEntry);
+        assertEquals(first, priorEntry.intValue());
 
-    checkIntegrity(map);
-  }
+        TagMap.Entry newEntry = map.getEntry("int");
+        assertEquals(second, newEntry.intValue());
+        assertEquals(0, map.getInt(UNSET));
+        assertEquals(21, map.getIntOrDefault(UNSET, 21));
 
-  @ParameterizedTest
-  @EnumSource(TagMapScenario.class)
-  public void map_remove_Object(TagMapScenario scenario) {
-    TagMap map = scenario.create();
+        checkIntegrity(map);
+    }
 
-    Object prev = map.remove((Object) "foo");
-    assertNull(prev);
+    @ParameterizedTest
+    @EnumSource(TagMapScenario.class)
+    public void longEntry(TagMapScenario scenario) {
+        String LONG = "long";
+        String UNSET = "unset";
 
-    map.put("foo", "bar");
-    assertEntry("foo", "bar", map);
-    assertSize(scenario.size() + 1, map);
-    assertNotEmpty(map);
+        long first = 3142L;
+        long second = 2718L;
 
-    Object prev2 = map.remove((Object) "foo");
-    assertEquals("bar", prev2);
-    assertSize(scenario.size(), map);
-    assertEmptiness(scenario, map);
+        TagMap map = scenario.create();
+        map.set(LONG, first);
 
-    checkIntegrity(map);
-  }
+        TagMap.Entry firstEntry = map.getEntry("long");
+        assertEquals(TagMap.Entry.LONG, firstEntry.rawType);
 
-  @ParameterizedTest
-  @EnumSource(TagMapScenario.class)
-  public void map_remove_String(TagMapScenario scenario) {
-    TagMap map = scenario.create();
+        assertEquals(first, firstEntry.longValue());
+        assertEquals(first, map.getLong("long"));
 
-    boolean hadPrev1 = map.remove("foo");
-    assertFalse(hadPrev1);
+        TagMap.Entry priorEntry = map.getAndSet("long", second);
+        assertSame(priorEntry, firstEntry);
+        assertEquals(first, priorEntry.longValue());
 
-    map.put("foo", "bar");
-    assertEntry("foo", "bar", map);
-    assertSize(scenario.size() + 1, map);
-    assertNotEmpty(map);
+        TagMap.Entry newEntry = map.getEntry("long");
+        assertEquals(second, newEntry.longValue());
 
-    boolean hadPrev2 = map.remove("foo");
-    assertTrue(hadPrev2);
-    assertSize(scenario.size(), map);
-    assertEmptiness(scenario, map);
+        assertEquals(0L, map.getLong(UNSET));
+        assertEquals(21L, map.getLongOrDefault(UNSET, 21L));
 
-    checkIntegrity(map);
-  }
+        checkIntegrity(map);
+    }
 
-  @ParameterizedTest
-  @EnumSource(TagMapScenario.class)
-  public void map_getAndRemove(TagMapScenario scenario) {
-    TagMap map = scenario.create();
+    @ParameterizedTest
+    @EnumSource(TagMapScenario.class)
+    public void floatEntry(TagMapScenario scenario) {
+        String FLOAT = "float";
+        String UNSET = "unset";
 
-    TagMap.Entry prevEntry1 = map.getAndRemove("foo");
-    assertNull(prevEntry1);
+        float first = 3.14F;
+        float second = 2.718F;
 
-    map.put("foo", "bar");
-    assertEntry("foo", "bar", map);
-    assertSize(scenario.size() + 1, map);
-    assertNotEmpty(map);
+        TagMap map = scenario.create();
+        map.set(FLOAT, first);
 
-    TagMap.Entry prevEntry2 = map.getAndRemove("foo");
-    assertEquals("bar", prevEntry2.objectValue());
-    assertSize(scenario.size(), map);
-    assertEmptiness(scenario, map);
+        TagMap.Entry firstEntry = map.getEntry(FLOAT);
+        assertEquals(TagMap.Entry.FLOAT, firstEntry.rawType);
 
-    checkIntegrity(map);
-  }
+        assertEquals(first, firstEntry.floatValue());
+        assertEquals(first, map.getFloat(FLOAT));
 
-  @ParameterizedTest
-  @EnumSource(TagMapScenario.class)
-  public void freeze(TagMapScenario scenario) {
-    TagMap map = scenario.create();
-    map.put("foo", "bar");
+        TagMap.Entry priorEntry = map.getAndSet(FLOAT, second);
+        assertSame(priorEntry, firstEntry);
+        assertEquals(first, priorEntry.floatValue());
 
-    assertEntry("foo", "bar", map);
+        TagMap.Entry newEntry = map.getEntry(FLOAT);
+        assertEquals(second, newEntry.floatValue());
 
-    map.freeze();
+        assertEquals(0F, map.getFloat(UNSET));
+        assertEquals(2.718F, map.getFloatOrDefault(UNSET, 2.718F));
 
-    assertFrozen(
-        () -> {
-          map.remove("foo");
-        });
+        checkIntegrity(map);
+    }
 
-    assertEntry("foo", "bar", map);
+    @ParameterizedTest
+    @EnumSource(TagMapScenario.class)
+    public void doubleEntry(TagMapScenario scenario) {
+        String DOUBLE = "double";
+        String UNSET = "unset";
 
-    checkIntegrity(map);
-  }
+        double first = Math.PI;
+        double second = Math.E;
 
-  @Test
-  public void emptyMap() {
-    TagMap map = TagMap.EMPTY;
+        TagMap map = scenario.create();
+        map.set(DOUBLE, Math.PI);
 
-    assertSize(0, map);
-    assertEmpty(map);
+        TagMap.Entry firstEntry = map.getEntry(DOUBLE);
+        assertEquals(TagMap.Entry.DOUBLE, firstEntry.rawType);
 
-    assertFrozen(map);
+        assertEquals(first, firstEntry.doubleValue());
+        assertEquals(first, map.getDouble(DOUBLE));
 
-    checkIntegrity(map);
-  }
+        TagMap.Entry priorEntry = map.getAndSet(DOUBLE, second);
+        assertSame(priorEntry, firstEntry);
+        assertEquals(first, priorEntry.doubleValue());
 
-  @ParameterizedTest
-  @EnumSource(TagMapScenario.class)
-  public void putMany(TagMapScenario scenario) {
-    TagMap map = scenario.create();
+        TagMap.Entry newEntry = map.getEntry(DOUBLE);
+        assertEquals(second, newEntry.doubleValue());
 
-    int size = scenario.size();
-    fillMap(map, size);
+        assertEquals(0D, map.getDouble(UNSET));
+        assertEquals(2.718D, map.getDoubleOrDefault(UNSET, 2.718D));
 
-    for (int i = 0; i < size; ++i) {
-      assertEntry(key(i), value(i), map);
+        checkIntegrity(map);
     }
 
-    assertEmptiness(scenario, map);
-    assertSize(scenario.size() + size, map);
+    @Test
+    public void empty() {
+        TagMap empty = TagMap.EMPTY;
+        assertFrozen(empty);
 
-    checkIntegrity(map);
-  }
+        assertNull(empty.getEntry("foo"));
+        assertSize(0, empty);
+        assertEmpty(empty);
 
-  @ParameterizedTest
-  @EnumSource(TagMapScenario.class)
-  public void copyMany(TagMapScenario scenario) {
-    int size = scenario.size();
-    TagMap orig = scenario.create();
-    fillMap(orig, size);
+        checkIntegrity(empty);
+    }
 
-    assertSize(scenario.size() + size, orig);
+    @Test
+    public void putAll_empty() {
+        // TagMap.EMPTY breaks the rules and uses a different size bucket array
+        // This test is just to verify that the common use of putAll still works with EMPTY
+        TagMap newMap = TagMap.create();
+        newMap.putAll(TagMap.EMPTY);
 
-    TagMap copy = orig.copy();
-    orig.clear(); // doing this to make sure that copied isn't modified
+        assertSize(0, newMap);
+        assertEmpty(newMap);
 
-    for (int i = 0; i < size; ++i) {
-      assertEntry(key(i), value(i), copy);
+        checkIntegrity(newMap);
     }
-    assertSize(scenario.size() + size, copy);
 
-    checkIntegrity(orig);
-    checkIntegrity(copy);
-  }
+    @ParameterizedTest
+    @EnumSource(TagMapScenario.class)
+    public void clear(TagMapScenario scenario) {
+        TagMap map = scenario.create();
+        assertSize(scenario.size(), map);
 
-  @Test
-  public void immutableCopy() {
-    int size = randomSize();
-    TagMap orig = createTagMap(size);
+        assertEmptiness(scenario.size() == 0, map);
 
-    TagMap immutableCopy = orig.immutableCopy();
-    orig.clear(); // doing this to make sure that copied isn't modified
+        map.clear();
+        assertSize(0, map);
+        assertEmpty(map);
 
-    for (int i = 0; i < size; ++i) {
-      assertEntry(key(i), value(i), immutableCopy);
+        checkIntegrity(map);
     }
-    assertSize(size, immutableCopy);
-    assertFrozen(immutableCopy);
 
-    checkIntegrity(orig);
-    checkIntegrity(immutableCopy);
-  }
+    @ParameterizedTest
+    @EnumSource(TagMapScenario.class)
+    public void map_put_replacement(TagMapScenario scenario) {
+        TagMap map = scenario.create();
+        Object prev1 = map.put("foo", "bar");
+        assertNull(prev1);
 
-  @Test
-  public void replaceALot() {
-    int size = randomSize();
-    TagMap map = createTagMap(size);
+        assertEntry("foo", "bar", map);
+        assertSize(scenario.size() + 1, map);
+        assertNotEmpty(map);
 
-    for (int i = 0; i < size; ++i) {
-      int index = ThreadLocalRandom.current().nextInt(size);
+        Object prev2 = map.put("foo", "baz");
+        assertSize(scenario.size() + 1, map);
+        assertEquals("bar", prev2);
 
-      map.put(key(index), altValue(index));
-      assertEquals(altValue(index), map.get(key(index)));
+        assertEntry("foo", "baz", map);
+
+        checkIntegrity(map);
     }
 
-    checkIntegrity(map);
-  }
+    @ParameterizedTest
+    @EnumSource(TagMapScenario.class)
+    public void map_remove_Object(TagMapScenario scenario) {
+        TagMap map = scenario.create();
+
+        Object prev = map.remove((Object) "foo");
+        assertNull(prev);
 
-  @Test
-  public void shareEntry() {
-    TagMap orig = TagMap.create();
-    orig.set("foo", "bar");
+        map.put("foo", "bar");
+        assertEntry("foo", "bar", map);
+        assertSize(scenario.size() + 1, map);
+        assertNotEmpty(map);
+
+        Object prev2 = map.remove((Object) "foo");
+        assertEquals("bar", prev2);
+        assertSize(scenario.size(), map);
+        assertEmptiness(scenario, map);
+
+        checkIntegrity(map);
+    }
 
-    TagMap dest = TagMap.create();
-    dest.set(orig.getEntry("foo"));
+    @ParameterizedTest
+    @EnumSource(TagMapScenario.class)
+    public void map_remove_String(TagMapScenario scenario) {
+        TagMap map = scenario.create();
 
-    assertEquals(orig.getEntry("foo"), dest.getEntry("foo"));
-    assertSame(orig.getEntry("foo"), dest.getEntry("foo"));
+        boolean hadPrev1 = map.remove("foo");
+        assertFalse(hadPrev1);
 
-    checkIntegrity(orig);
-    checkIntegrity(dest);
-  }
+        map.put("foo", "bar");
+        assertEntry("foo", "bar", map);
+        assertSize(scenario.size() + 1, map);
+        assertNotEmpty(map);
 
-  @Test
-  public void putAll_clobberAll() {
-    int size = randomSize();
-    TagMap orig = createTagMap(size);
-    assertSize(size, orig);
+        boolean hadPrev2 = map.remove("foo");
+        assertTrue(hadPrev2);
+        assertSize(scenario.size(), map);
+        assertEmptiness(scenario, map);
 
-    TagMap dest = TagMap.create();
-    for (int i = size - 1; i >= 0; --i) {
-      dest.set(key(i), altValue(i));
+        checkIntegrity(map);
     }
 
-    // This should clobber all the values in dest
-    dest.putAll(orig);
+    @ParameterizedTest
+    @EnumSource(TagMapScenario.class)
+    public void map_getAndRemove(TagMapScenario scenario) {
+        TagMap map = scenario.create();
 
-    for (int i = 0; i < size; ++i) {
-      assertEntry(key(i), value(i), dest);
+        TagMap.Entry prevEntry1 = map.getAndRemove("foo");
+        assertNull(prevEntry1);
+
+        map.put("foo", "bar");
+        assertEntry("foo", "bar", map);
+        assertSize(scenario.size() + 1, map);
+        assertNotEmpty(map);
+
+        TagMap.Entry prevEntry2 = map.getAndRemove("foo");
+        assertEquals("bar", prevEntry2.objectValue());
+        assertSize(scenario.size(), map);
+        assertEmptiness(scenario, map);
+
+        checkIntegrity(map);
     }
-    assertSize(size, dest);
 
-    checkIntegrity(orig);
-    checkIntegrity(dest);
-  }
+    @ParameterizedTest
+    @EnumSource(TagMapScenario.class)
+    public void freeze(TagMapScenario scenario) {
+        TagMap map = scenario.create();
+        map.put("foo", "bar");
 
-  @ParameterizedTest
-  @EnumSource(TagMapScenario.class)
-  public void putAll_cloberAll(TagMapScenario scenario) {
-    int size = scenario.size();
-    TagMap orig = scenario.create();
-    assertSize(size, orig);
+        assertEntry("foo", "bar", map);
 
-    TagMap dest = scenario.create();
-    assertSize(size, dest);
+        map.freeze();
 
-    dest.putAll(orig);
+        assertFrozen(() -> {
+            map.remove("foo");
+        });
+
+        assertEntry("foo", "bar", map);
+
+        checkIntegrity(map);
+    }
 
-    assertSize(size, orig);
-    assertSize(size, dest);
+    @Test
+    public void emptyMap() {
+        TagMap map = TagMap.EMPTY;
 
-    checkIntegrity(orig);
-    checkIntegrity(dest);
-  }
+        assertSize(0, map);
+        assertEmpty(map);
 
-  @Test
-  public void putAll_clobberAndExtras() {
-    int size = randomSize();
-    TagMap orig = createTagMap(size);
-    assertSize(size, orig);
+        assertFrozen(map);
 
-    TagMap dest = TagMap.create();
-    for (int i = size / 2 - 1; i >= 0; --i) {
-      dest.set(key(i), altValue(i));
+        checkIntegrity(map);
     }
 
-    // This should clobber all the values in dest
-    dest.putAll(orig);
+    @ParameterizedTest
+    @EnumSource(TagMapScenario.class)
+    public void putMany(TagMapScenario scenario) {
+        TagMap map = scenario.create();
 
-    for (int i = 0; i < size; ++i) {
-      assertEntry(key(i), value(i), dest);
+        int size = scenario.size();
+        fillMap(map, size);
+
+        for (int i = 0; i < size; ++i) {
+            assertEntry(key(i), value(i), map);
+        }
+
+        assertEmptiness(scenario, map);
+        assertSize(scenario.size() + size, map);
+
+        checkIntegrity(map);
     }
 
-    assertSize(size, dest);
+    @ParameterizedTest
+    @EnumSource(TagMapScenario.class)
+    public void copyMany(TagMapScenario scenario) {
+        int size = scenario.size();
+        TagMap orig = scenario.create();
+        fillMap(orig, size);
+
+        assertSize(scenario.size() + size, orig);
 
-    checkIntegrity(orig);
-    checkIntegrity(dest);
-  }
+        TagMap copy = orig.copy();
+        orig.clear(); // doing this to make sure that copied isn't modified
 
-  @Test
-  public void removeMany() {
-    int size = randomSize();
-    TagMap map = createTagMap(size);
+        for (int i = 0; i < size; ++i) {
+            assertEntry(key(i), value(i), copy);
+        }
+        assertSize(scenario.size() + size, copy);
 
-    for (int i = 0; i < size; ++i) {
-      assertEntry(key(i), value(i), map);
+        checkIntegrity(orig);
+        checkIntegrity(copy);
     }
 
-    assertNotEmpty(map);
-    assertSize(size, map);
+    @Test
+    public void immutableCopy() {
+        int size = randomSize();
+        TagMap orig = createTagMap(size);
 
-    for (int i = 0; i < size; ++i) {
-      Object removedValue = map.remove((Object) key(i));
-      assertEquals(value(i), removedValue);
+        TagMap immutableCopy = orig.immutableCopy();
+        orig.clear(); // doing this to make sure that copied isn't modified
 
-      // not doing exhaustive size checks
-      assertEquals(size - i - 1, map.size());
+        for (int i = 0; i < size; ++i) {
+            assertEntry(key(i), value(i), immutableCopy);
+        }
+        assertSize(size, immutableCopy);
+        assertFrozen(immutableCopy);
+
+        checkIntegrity(orig);
+        checkIntegrity(immutableCopy);
     }
 
-    assertEmpty(map);
+    @Test
+    public void replaceALot() {
+        int size = randomSize();
+        TagMap map = createTagMap(size);
+
+        for (int i = 0; i < size; ++i) {
+            int index = ThreadLocalRandom.current().nextInt(size);
 
-    checkIntegrity(map);
-  }
+            map.put(key(index), altValue(index));
+            assertEquals(altValue(index), map.get(key(index)));
+        }
 
-  @Test
-  public void fillMap() {
-    int size = randomSize();
-    TagMap map = TagMap.create();
-    for (int i = 0; i < size; ++i) {
-      map.set(key(i), i);
+        checkIntegrity(map);
     }
 
-    HashMap<String, Object> hashMap = new HashMap<>();
-    map.fillMap(hashMap);
+    @Test
+    public void shareEntry() {
+        TagMap orig = TagMap.create();
+        orig.set("foo", "bar");
+
+        TagMap dest = TagMap.create();
+        dest.set(orig.getEntry("foo"));
 
-    for (int i = 0; i < size; ++i) {
-      assertEquals(Integer.valueOf(i), hashMap.remove(key(i)));
+        assertEquals(orig.getEntry("foo"), dest.getEntry("foo"));
+        assertSame(orig.getEntry("foo"), dest.getEntry("foo"));
+
+        checkIntegrity(orig);
+        checkIntegrity(dest);
     }
-    assertTrue(hashMap.isEmpty());
 
-    checkIntegrity(map);
-  }
+    @Test
+    public void putAll_clobberAll() {
+        int size = randomSize();
+        TagMap orig = createTagMap(size);
+        assertSize(size, orig);
+
+        TagMap dest = TagMap.create();
+        for (int i = size - 1; i >= 0; --i) {
+            dest.set(key(i), altValue(i));
+        }
+
+        // This should clobber all the values in dest
+        dest.putAll(orig);
+
+        for (int i = 0; i < size; ++i) {
+            assertEntry(key(i), value(i), dest);
+        }
+        assertSize(size, dest);
 
-  @Test
-  public void fillStringMap() {
-    int size = randomSize();
-    TagMap map = TagMap.create();
-    for (int i = 0; i < size; ++i) {
-      map.set(key(i), i);
+        checkIntegrity(orig);
+        checkIntegrity(dest);
     }
 
-    HashMap<String, String> hashMap = new HashMap<>();
-    map.fillStringMap(hashMap);
+    @ParameterizedTest
+    @EnumSource(TagMapScenario.class)
+    public void putAll_cloberAll(TagMapScenario scenario) {
+        int size = scenario.size();
+        TagMap orig = scenario.create();
+        assertSize(size, orig);
+
+        TagMap dest = scenario.create();
+        assertSize(size, dest);
+
+        dest.putAll(orig);
+
+        assertSize(size, orig);
+        assertSize(size, dest);
 
-    for (int i = 0; i < size; ++i) {
-      assertEquals(Integer.toString(i), hashMap.remove(key(i)));
+        checkIntegrity(orig);
+        checkIntegrity(dest);
     }
-    assertTrue(hashMap.isEmpty());
 
-    checkIntegrity(map);
-  }
+    @Test
+    public void putAll_clobberAndExtras() {
+        int size = randomSize();
+        TagMap orig = createTagMap(size);
+        assertSize(size, orig);
 
-  @Test
-  public void iterator() {
-    int size = randomSize();
-    TagMap map = createTagMap(size);
+        TagMap dest = TagMap.create();
+        for (int i = size / 2 - 1; i >= 0; --i) {
+            dest.set(key(i), altValue(i));
+        }
 
-    Set<String> keys = new HashSet<>();
-    for (TagMap.EntryReader entry : map) {
-      // makes sure that each key is visited once and only once
-      assertTrue(keys.add(entry.tag()));
+        // This should clobber all the values in dest
+        dest.putAll(orig);
+
+        for (int i = 0; i < size; ++i) {
+            assertEntry(key(i), value(i), dest);
+        }
+
+        assertSize(size, dest);
+
+        checkIntegrity(orig);
+        checkIntegrity(dest);
     }
 
-    for (int i = 0; i < size; ++i) {
-      // make sure the key was present
-      assertTrue(keys.remove(key(i)));
+    @Test
+    public void removeMany() {
+        int size = randomSize();
+        TagMap map = createTagMap(size);
+
+        for (int i = 0; i < size; ++i) {
+            assertEntry(key(i), value(i), map);
+        }
+
+        assertNotEmpty(map);
+        assertSize(size, map);
+
+        for (int i = 0; i < size; ++i) {
+            Object removedValue = map.remove((Object) key(i));
+            assertEquals(value(i), removedValue);
+
+            // not doing exhaustive size checks
+            assertEquals(size - i - 1, map.size());
+        }
+
+        assertEmpty(map);
+
+        checkIntegrity(map);
     }
 
-    // no extraneous keys
-    assertTrue(keys.isEmpty());
+    @Test
+    public void fillMap() {
+        int size = randomSize();
+        TagMap map = TagMap.create();
+        for (int i = 0; i < size; ++i) {
+            map.set(key(i), i);
+        }
 
-    checkIntegrity(map);
-  }
+        HashMap<String, Object> hashMap = new HashMap<>();
+        map.fillMap(hashMap);
 
-  @Test
-  public void forEachConsumer() {
-    int size = randomSize();
-    TagMap map = createTagMap(size);
+        for (int i = 0; i < size; ++i) {
+            assertEquals(Integer.valueOf(i), hashMap.remove(key(i)));
+        }
+        assertTrue(hashMap.isEmpty());
+
+        checkIntegrity(map);
+    }
 
-    Set<String> keys = new HashSet<>(size);
-    map.forEach((entry) -> keys.add(entry.tag()));
+    @Test
+    public void fillStringMap() {
+        int size = randomSize();
+        TagMap map = TagMap.create();
+        for (int i = 0; i < size; ++i) {
+            map.set(key(i), i);
+        }
 
-    for (int i = 0; i < size; ++i) {
-      // make sure the key was present
-      assertTrue(keys.remove(key(i)));
+        HashMap<String, String> hashMap = new HashMap<>();
+        map.fillStringMap(hashMap);
+
+        for (int i = 0; i < size; ++i) {
+            assertEquals(Integer.toString(i), hashMap.remove(key(i)));
+        }
+        assertTrue(hashMap.isEmpty());
+
+        checkIntegrity(map);
     }
 
-    // no extraneous keys
-    assertTrue(keys.isEmpty());
+    @Test
+    public void iterator() {
+        int size = randomSize();
+        TagMap map = createTagMap(size);
 
-    checkIntegrity(map);
-  }
+        Set<String> keys = new HashSet<>();
+        for (TagMap.EntryReader entry : map) {
+            // makes sure that each key is visited once and only once
+            assertTrue(keys.add(entry.tag()));
+        }
 
-  @Test
-  public void forEachBiConsumer() {
-    int size = randomSize();
-    TagMap map = createTagMap(size);
+        for (int i = 0; i < size; ++i) {
+            // make sure the key was present
+            assertTrue(keys.remove(key(i)));
+        }
 
-    Set<String> keys = new HashSet<>(size);
-    map.forEach(keys, (k, entry) -> k.add(entry.tag()));
+        // no extraneous keys
+        assertTrue(keys.isEmpty());
 
-    for (int i = 0; i < size; ++i) {
-      // make sure the key was present
-      assertTrue(keys.remove(key(i)));
+        checkIntegrity(map);
     }
 
-    // no extraneous keys
-    assertTrue(keys.isEmpty());
+    @Test
+    public void forEachConsumer() {
+        int size = randomSize();
+        TagMap map = createTagMap(size);
 
-    checkIntegrity(map);
-  }
+        Set<String> keys = new HashSet<>(size);
+        map.forEach((entry) -> keys.add(entry.tag()));
 
-  @Test
-  public void forEachTriConsumer() {
-    int size = randomSize();
-    TagMap map = createTagMap(size);
+        for (int i = 0; i < size; ++i) {
+            // make sure the key was present
+            assertTrue(keys.remove(key(i)));
+        }
 
-    Set<String> keys = new HashSet<>(size);
-    map.forEach(keys, "hi", (k, msg, entry) -> keys.add(entry.tag()));
+        // no extraneous keys
+        assertTrue(keys.isEmpty());
 
-    for (int i = 0; i < size; ++i) {
-      // make sure the key was present
-      assertTrue(keys.remove(key(i)));
+        checkIntegrity(map);
     }
 
-    // no extraneous keys
-    assertTrue(keys.isEmpty());
+    @Test
+    public void forEachBiConsumer() {
+        int size = randomSize();
+        TagMap map = createTagMap(size);
 
-    checkIntegrity(map);
-  }
+        Set<String> keys = new HashSet<>(size);
+        map.forEach(keys, (k, entry) -> k.add(entry.tag()));
 
-  @Test
-  public void entrySet() {
-    int size = randomSize();
-    TagMap map = createTagMap(size);
+        for (int i = 0; i < size; ++i) {
+            // make sure the key was present
+            assertTrue(keys.remove(key(i)));
+        }
 
-    Set<Map.Entry<String, Object>> actualEntries = map.entrySet();
-    assertEquals(size, actualEntries.size());
-    assertFalse(actualEntries.isEmpty());
+        // no extraneous keys
+        assertTrue(keys.isEmpty());
 
-    Set<String> expectedKeys = expectedKeys(size);
-    for (Map.Entry<String, Object> entry : actualEntries) {
-      assertTrue(expectedKeys.remove(entry.getKey()));
+        checkIntegrity(map);
     }
-    assertTrue(expectedKeys.isEmpty());
 
-    checkIntegrity(map);
-  }
+    @Test
+    public void forEachTriConsumer() {
+        int size = randomSize();
+        TagMap map = createTagMap(size);
+
+        Set<String> keys = new HashSet<>(size);
+        map.forEach(keys, "hi", (k, msg, entry) -> keys.add(entry.tag()));
 
-  @Test
-  public void keySet() {
-    int size = randomSize();
-    TagMap map = createTagMap(size);
+        for (int i = 0; i < size; ++i) {
+            // make sure the key was present
+            assertTrue(keys.remove(key(i)));
+        }
 
-    Set<String> actualKeys = map.keySet();
-    assertEquals(size, actualKeys.size());
-    assertFalse(actualKeys.isEmpty());
+        // no extraneous keys
+        assertTrue(keys.isEmpty());
 
-    Set<String> expectedKeys = expectedKeys(size);
-    for (String key : actualKeys) {
-      assertTrue(expectedKeys.remove(key));
+        checkIntegrity(map);
     }
-    assertTrue(expectedKeys.isEmpty());
 
-    checkIntegrity(map);
-  }
+    @Test
+    public void entrySet() {
+        int size = randomSize();
+        TagMap map = createTagMap(size);
 
-  @Test
-  public void values() {
-    int size = randomSize();
-    TagMap map = createTagMap(size);
+        Set<Map.Entry<String, Object>> actualEntries = map.entrySet();
+        assertEquals(size, actualEntries.size());
+        assertFalse(actualEntries.isEmpty());
 
-    Collection<Object> actualValues = map.values();
-    assertEquals(size, actualValues.size());
-    assertFalse(actualValues.isEmpty());
+        Set<String> expectedKeys = expectedKeys(size);
+        for (Map.Entry<String, Object> entry : actualEntries) {
+            assertTrue(expectedKeys.remove(entry.getKey()));
+        }
+        assertTrue(expectedKeys.isEmpty());
 
-    Set<String> expectedValues = expectedValues(size);
-    for (Object value : map.values()) {
-      assertTrue(expectedValues.remove(value));
+        checkIntegrity(map);
     }
-    assertTrue(expectedValues.isEmpty());
 
-    checkIntegrity(map);
-  }
+    @Test
+    public void keySet() {
+        int size = randomSize();
+        TagMap map = createTagMap(size);
 
-  @Test
-  public void _toString() {
-    int size = 4;
-    TagMap map = createTagMap(size);
+        Set<String> actualKeys = map.keySet();
+        assertEquals(size, actualKeys.size());
+        assertFalse(actualKeys.isEmpty());
 
-    String str = map.toString();
+        Set<String> expectedKeys = expectedKeys(size);
+        for (String key : actualKeys) {
+            assertTrue(expectedKeys.remove(key));
+        }
+        assertTrue(expectedKeys.isEmpty());
 
-    for (int i = 0; i < size; ++i) {
-      assertTrue(str.contains(key(i) + "=" + value(i)));
+        checkIntegrity(map);
     }
-  }
 
-  @Test
-  public void stream() {
-    int size = randomSize();
-    TagMap map = createTagMap(size);
+    @Test
+    public void values() {
+        int size = randomSize();
+        TagMap map = createTagMap(size);
 
-    Set<String> keys = map.stream().map(TagMap.EntryReader::tag).collect(Collectors.toSet());
+        Collection<Object> actualValues = map.values();
+        assertEquals(size, actualValues.size());
+        assertFalse(actualValues.isEmpty());
 
-    assertEquals(size, keys.size());
-    for (int i = 0; i < size; ++i) {
-      assertTrue(keys.contains(key(i)));
+        Set<String> expectedValues = expectedValues(size);
+        for (Object value : map.values()) {
+            assertTrue(expectedValues.remove(value));
+        }
+        assertTrue(expectedValues.isEmpty());
+
+        checkIntegrity(map);
+    }
+
+    @Test
+    public void _toString() {
+        int size = 4;
+        TagMap map = createTagMap(size);
+
+        String str = map.toString();
+
+        for (int i = 0; i < size; ++i) {
+            assertTrue(str.contains(key(i) + "=" + value(i)));
+        }
+    }
+
+    @Test
+    public void stream() {
+        int size = randomSize();
+        TagMap map = createTagMap(size);
+
+        Set<String> keys = map.stream().map(TagMap.EntryReader::tag).collect(Collectors.toSet());
+
+        assertEquals(size, keys.size());
+        for (int i = 0; i < size; ++i) {
+            assertTrue(keys.contains(key(i)));
+        }
+    }
+
+    @Test
+    public void compute() {
+        TagMap map = TagMap.create();
+        map.set("key", "original");
+
+        map.compute("key", (k, v) -> "updated");
+        assertEquals("updated", map.get("key"));
+
+        map.compute("new-key", (k, v) -> "created");
+        assertEquals("created", map.get("new-key"));
+    }
+
+    @Test
+    public void computeIfAbsent() {
+        TagMap map = TagMap.create();
+        map.set("key", "existing");
+
+        map.computeIfAbsent("key", k -> "ignored");
+        assertEquals("existing", map.get("key"));
+
+        map.computeIfAbsent("new-key", k -> "added");
+        assertEquals("added", map.get("new-key"));
+    }
+
+    @Test
+    public void computeIfPresent() {
+        TagMap map = TagMap.create();
+        map.set("key", "original");
+
+        map.computeIfPresent("key", (k, v) -> "updated");
+        assertEquals("updated", map.get("key"));
+
+        map.computeIfPresent("missing", (k, v) -> "never");
+        assertNull(map.get("missing"));
+    }
+
+    @ParameterizedTest
+    @ValueSource(ints = {0, 5, 25, 125})
+    public void _toInternalString(int size) {
+        TagMap tagMap = new TagMap();
+        fillMap(tagMap, size);
+
+        String str = tagMap.toInternalString();
+
+        for (int i = 0; i < size; ++i) {
+            assertTrue(str.contains(key(i) + "=" + value(i)));
+        }
+    }
+
+    static int randomSize() {
+        return ThreadLocalRandom.current().nextInt(16, MANY_SIZE);
+    }
+
+    static TagMap createTagMap() {
+        return createTagMap(randomSize());
+    }
+
+    static TagMap createTagMap(int size) {
+        TagMap map = TagMap.create();
+        fillMap(map, size);
+        return map;
+    }
+
+    static void fillMap(TagMap map, int size) {
+        for (int i = 0; i < size; ++i) {
+            map.set(key(i), value(i));
+        }
+    }
+
+    static Set<String> expectedKeys(int size) {
+        Set<String> set = new HashSet<String>(size);
+        for (int i = 0; i < size; ++i) {
+            set.add(key(i));
+        }
+        return set;
     }
-  }
 
-  @Test
-  public void compute() {
-    TagMap map = TagMap.create();
-    map.set("key", "original");
+    static Set<String> expectedValues(int size) {
+        Set<String> set = new HashSet<String>(size);
+        for (int i = 0; i < size; ++i) {
+            set.add(value(i));
+        }
+        return set;
+    }
 
-    map.compute("key", (k, v) -> "updated");
-    assertEquals("updated", map.get("key"));
+    static String key(int i) {
+        return "key-" + i;
+    }
 
-    map.compute("new-key", (k, v) -> "created");
-    assertEquals("created", map.get("new-key"));
-  }
+    static String value(int i) {
+        return "value-" + i;
+    }
 
-  @Test
-  public void computeIfAbsent() {
-    TagMap map = TagMap.create();
-    map.set("key", "existing");
+    static String altValue(int i) {
+        return "alt-value-" + i;
+    }
 
-    map.computeIfAbsent("key", k -> "ignored");
-    assertEquals("existing", map.get("key"));
+    static int count(Iterable<?> iterable) {
+        return count(iterable.iterator());
+    }
 
-    map.computeIfAbsent("new-key", k -> "added");
-    assertEquals("added", map.get("new-key"));
-  }
+    static int count(Iterator<?> iter) {
+        int count;
+        for (count = 0; iter.hasNext(); ++count) {
+            iter.next();
+        }
+        return count;
+    }
 
-  @Test
-  public void computeIfPresent() {
-    TagMap map = TagMap.create();
-    map.set("key", "original");
+    static final void assertBoolean(boolean expected, TagMap map, String key) {
+        assertEquals(expected, map.getBoolean(key));
+        assertEquals(expected, map.getBooleanOrDefault(key, !expected));
+    }
 
-    map.computeIfPresent("key", (k, v) -> "updated");
-    assertEquals("updated", map.get("key"));
+    static final void assertInt(int expected, TagMap map, String key) {
+        assertEquals(expected, map.getInt(key));
+        assertEquals(expected, map.getIntOrDefault(key, Integer.MAX_VALUE));
+    }
 
-    map.computeIfPresent("missing", (k, v) -> "never");
-    assertNull(map.get("missing"));
-  }
+    static final void assertLong(long expected, TagMap map, String key) {
+        assertEquals(expected, map.getLong(key));
+        assertEquals(expected, map.getLongOrDefault(key, Long.MAX_VALUE));
+    }
 
-  @ParameterizedTest
-  @ValueSource(ints = {0, 5, 25, 125})
-  public void _toInternalString(int size) {
-    TagMap tagMap = new TagMap();
-    fillMap(tagMap, size);
+    static final void assertFloat(float expected, TagMap map, String key) {
+        assertEquals(expected, map.getFloat(key));
+        assertEquals(expected, map.getFloatOrDefault(key, Float.MAX_VALUE));
+    }
 
-    String str = tagMap.toInternalString();
+    static final void assertDouble(double expected, TagMap map, String key) {
+        assertEquals(expected, map.getDouble(key));
+        assertEquals(expected, map.getDoubleOrDefault(key, Double.MAX_VALUE));
+    }
 
-    for (int i = 0; i < size; ++i) {
-      assertTrue(str.contains(key(i) + "=" + value(i)));
+    static final void assertString(String expected, TagMap map, String key) {
+        assertEquals(expected, map.getString(key));
     }
-  }
 
-  static int randomSize() {
-    return ThreadLocalRandom.current().nextInt(16, MANY_SIZE);
-  }
+    static final void assertEntry(String key, String value, TagMap map) {
+        TagMap.Entry entry = map.getEntry(key);
+        assertNotNull(entry);
 
-  static TagMap createTagMap() {
-    return createTagMap(randomSize());
-  }
+        assertEquals(key, entry.tag());
+        assertEquals(key, entry.getKey());
 
-  static TagMap createTagMap(int size) {
-    TagMap map = TagMap.create();
-    fillMap(map, size);
-    return map;
-  }
+        assertEquals(value, entry.objectValue());
+        assertTrue(entry.isObject());
+        assertEquals(value, entry.getValue());
 
-  static void fillMap(TagMap map, int size) {
-    for (int i = 0; i < size; ++i) {
-      map.set(key(i), value(i));
+        assertEquals(value, entry.stringValue());
+
+        assertTrue(map.containsKey(key));
+        assertTrue(map.keySet().contains(key));
+
+        assertTrue(map.containsValue(value));
+        assertTrue(map.values().contains(value));
     }
-  }
 
-  static Set<String> expectedKeys(int size) {
-    Set<String> set = new HashSet<String>(size);
-    for (int i = 0; i < size; ++i) {
-      set.add(key(i));
+    static final void assertSize(int size, TagMap map) {
+        assertEquals(size, map.computeSize());
+        assertEquals(size, map.size());
+
+        assertEquals(size, count(map));
+        assertEquals(size, map.keySet().size());
+        assertEquals(size, map.values().size());
+
+        assertEquals(size, count(map.keySet()));
+        assertEquals(size, count(map.tagIterator()));
+
+        assertEquals(size, count(map.values().iterator()));
+        assertEquals(size, count(map.valueIterator()));
+        assertEquals(size, count(map.values()));
     }
-    return set;
-  }
 
-  static Set<String> expectedValues(int size) {
-    Set<String> set = new HashSet<String>(size);
-    for (int i = 0; i < size; ++i) {
-      set.add(value(i));
+    static void assertEmptiness(TagMapScenario scenario, TagMap map) {
+        assertEmptiness(scenario.size() == 0, map);
     }
-    return set;
-  }
 
-  static String key(int i) {
-    return "key-" + i;
-  }
+    static void assertEmptiness(boolean expectEmpty, TagMap map) {
+        if (expectEmpty) {
+            assertEmpty(map);
+        } else {
+            assertNotEmpty(map);
+        }
+    }
 
-  static String value(int i) {
-    return "value-" + i;
-  }
+    static void assertNotEmpty(TagMap map) {
+        assertFalse(map.checkIfEmpty());
+        assertFalse(map.isEmpty());
+    }
 
-  static String altValue(int i) {
-    return "alt-value-" + i;
-  }
+    static void assertEmpty(TagMap map) {
+        assertTrue(map.checkIfEmpty());
+        assertTrue(map.isEmpty());
+    }
 
-  static int count(Iterable<?> iterable) {
-    return count(iterable.iterator());
-  }
-
-  static int count(Iterator<?> iter) {
-    int count;
-    for (count = 0; iter.hasNext(); ++count) {
-      iter.next();
+    static void assertFrozen(TagMap map) {
+        IllegalStateException ex = null;
+        try {
+            map.put("foo", "bar");
+        } catch (IllegalStateException e) {
+            ex = e;
+        }
+        assertNotNull(ex);
     }
-    return count;
-  }
-
-  static final void assertBoolean(boolean expected, TagMap map, String key) {
-    assertEquals(expected, map.getBoolean(key));
-    assertEquals(expected, map.getBooleanOrDefault(key, !expected));
-  }
-
-  static final void assertInt(int expected, TagMap map, String key) {
-    assertEquals(expected, map.getInt(key));
-    assertEquals(expected, map.getIntOrDefault(key, Integer.MAX_VALUE));
-  }
-
-  static final void assertLong(long expected, TagMap map, String key) {
-    assertEquals(expected, map.getLong(key));
-    assertEquals(expected, map.getLongOrDefault(key, Long.MAX_VALUE));
-  }
-
-  static final void assertFloat(float expected, TagMap map, String key) {
-    assertEquals(expected, map.getFloat(key));
-    assertEquals(expected, map.getFloatOrDefault(key, Float.MAX_VALUE));
-  }
 
-  static final void assertDouble(double expected, TagMap map, String key) {
-    assertEquals(expected, map.getDouble(key));
-    assertEquals(expected, map.getDoubleOrDefault(key, Double.MAX_VALUE));
-  }
-
-  static final void assertString(String expected, TagMap map, String key) {
-    assertEquals(expected, map.getString(key));
-  }
-
-  static final void assertEntry(String key, String value, TagMap map) {
-    TagMap.Entry entry = map.getEntry(key);
-    assertNotNull(entry);
+    static void assertFrozen(Runnable runnable) {
+        IllegalStateException ex = null;
+        try {
+            runnable.run();
+        } catch (IllegalStateException e) {
+            ex = e;
+        }
+        assertNotNull(ex);
+    }
 
-    assertEquals(key, entry.tag());
-    assertEquals(key, entry.getKey());
-
-    assertEquals(value, entry.objectValue());
-    assertTrue(entry.isObject());
-    assertEquals(value, entry.getValue());
-
-    assertEquals(value, entry.stringValue());
-
-    assertTrue(map.containsKey(key));
-    assertTrue(map.keySet().contains(key));
-
-    assertTrue(map.containsValue(value));
-    assertTrue(map.values().contains(value));
-  }
-
-  static final void assertSize(int size, TagMap map) {
-    assertEquals(size, map.computeSize());
-    assertEquals(size, map.size());
-
-    assertEquals(size, count(map));
-    assertEquals(size, map.keySet().size());
-    assertEquals(size, map.values().size());
-
-    assertEquals(size, count(map.keySet()));
-    assertEquals(size, count(map.tagIterator()));
-
-    assertEquals(size, count(map.values().iterator()));
-    assertEquals(size, count(map.valueIterator()));
-    assertEquals(size, count(map.values()));
-  }
-
-  static void assertEmptiness(TagMapScenario scenario, TagMap map) {
-    assertEmptiness(scenario.size() == 0, map);
-  }
-
-  static void assertEmptiness(boolean expectEmpty, TagMap map) {
-    if (expectEmpty) {
-      assertEmpty(map);
-    } else {
-      assertNotEmpty(map);
-    }
-  }
-
-  static void assertNotEmpty(TagMap map) {
-    assertFalse(map.checkIfEmpty());
-    assertFalse(map.isEmpty());
-  }
-
-  static void assertEmpty(TagMap map) {
-    assertTrue(map.checkIfEmpty());
-    assertTrue(map.isEmpty());
-  }
-
-  static void assertFrozen(TagMap map) {
-    IllegalStateException ex = null;
-    try {
-      map.put("foo", "bar");
-    } catch (IllegalStateException e) {
-      ex = e;
-    }
-    assertNotNull(ex);
-  }
-
-  static void assertFrozen(Runnable runnable) {
-    IllegalStateException ex = null;
-    try {
-      runnable.run();
-    } catch (IllegalStateException e) {
-      ex = e;
-    }
-    assertNotNull(ex);
-  }
-
-  static void checkIntegrity(TagMap map) {
-    map.checkIntegrity();
-  }
+    static void checkIntegrity(TagMap map) {
+        map.checkIntegrity();
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/TagValueConversionsTest.java b/internal-api/src/test/java/datadog/trace/api/TagValueConversionsTest.java
index 45815ddd881..e01ac0c74ea 100644
--- a/internal-api/src/test/java/datadog/trace/api/TagValueConversionsTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/TagValueConversionsTest.java
@@ -8,159 +8,158 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 public class TagValueConversionsTest {
-  @ParameterizedTest
-  @ValueSource(booleans = {false, true})
-  public void booleanConversions(boolean value) {
-    Boolean box = Boolean.valueOf(value);
-
-    assertEquals(TagMap.EntryReader.BOOLEAN, TagValueConversions.typeOf(box));
-    assertTrue(TagValueConversions.isA(box, TagMap.EntryReader.BOOLEAN));
-    assertFalse(TagValueConversions.isNumericPrimitive(box));
-    assertFalse(TagValueConversions.isNumber(box));
-    assertFalse(TagValueConversions.isObject(box));
-
-    assertEquals(value, TagValueConversions.toBoolean(box));
-    assertEquals(value ? 1 : 0, TagValueConversions.toInt(box));
-    assertEquals(value ? 1L : 0L, TagValueConversions.toLong(box));
-    assertEquals(value ? 1F : 0F, TagValueConversions.toFloat(box));
-    assertEquals(value ? 1D : 0D, TagValueConversions.toDouble(box));
-
-    assertEquals(Boolean.toString(value), TagValueConversions.toString(box));
-  }
-
-  @ParameterizedTest
-  @ValueSource(ints = {Integer.MIN_VALUE, -256, -128, -1, 0, 1, 128, 256, Integer.MAX_VALUE})
-  public void intConversions(int value) {
-    Integer box = Integer.valueOf(value);
-
-    assertEquals(TagMap.EntryReader.INT, TagValueConversions.typeOf(box));
-    assertTrue(TagValueConversions.isA(box, TagMap.EntryReader.INT));
-    assertTrue(TagValueConversions.isNumericPrimitive(box));
-    assertTrue(TagValueConversions.isNumber(box));
-    assertFalse(TagValueConversions.isObject(box));
-
-    assertEquals(value, TagValueConversions.toInt(box));
-    assertEquals((long) value, TagValueConversions.toLong(box));
-    assertEquals((float) value, TagValueConversions.toFloat(box));
-    assertEquals((double) value, TagValueConversions.toDouble(box));
-
-    assertEquals(value != 0, TagValueConversions.toBoolean(box));
-    assertEquals(Integer.toString(value), TagValueConversions.toString(box));
-  }
-
-  @ParameterizedTest
-  @ValueSource(bytes = {Byte.MIN_VALUE, -32, -1, 0, 1, 32, Byte.MAX_VALUE})
-  public void byteConversions(byte value) {
-    Byte box = Byte.valueOf(value);
-
-    assertEquals(TagMap.EntryReader.INT, TagValueConversions.typeOf(box));
-    assertTrue(TagValueConversions.isA(box, TagMap.EntryReader.INT));
-    assertTrue(TagValueConversions.isNumericPrimitive(box));
-    assertTrue(TagValueConversions.isNumber(box));
-    assertFalse(TagValueConversions.isObject(box));
-
-    assertEquals((int) value, TagValueConversions.toInt(box));
-    assertEquals((long) value, TagValueConversions.toLong(box));
-    assertEquals((float) value, TagValueConversions.toFloat(box));
-    assertEquals((double) value, TagValueConversions.toDouble(box));
-
-    assertEquals(value != 0, TagValueConversions.toBoolean(box));
-    assertEquals(Byte.toString(value), TagValueConversions.toString(box));
-  }
-
-  @ParameterizedTest
-  @ValueSource(shorts = {Short.MIN_VALUE, -256, -128, -1, 0, 1, 128, 256, Short.MAX_VALUE})
-  public void shortConversions(short value) {
-    Short box = Short.valueOf(value);
-
-    assertEquals(TagMap.EntryReader.INT, TagValueConversions.typeOf(box));
-    assertTrue(TagValueConversions.isA(box, TagMap.EntryReader.INT));
-    assertTrue(TagValueConversions.isNumericPrimitive(box));
-    assertTrue(TagValueConversions.isNumber(box));
-    assertFalse(TagValueConversions.isObject(box));
-
-    assertEquals((int) value, TagValueConversions.toInt(box));
-    assertEquals((long) value, TagValueConversions.toLong(box));
-    assertEquals((float) value, TagValueConversions.toFloat(box));
-    assertEquals((double) value, TagValueConversions.toDouble(box));
-
-    assertEquals(value != 0, TagValueConversions.toBoolean(box));
-    assertEquals(Short.toString(value), TagValueConversions.toString(box));
-  }
-
-  @ParameterizedTest
-  @ValueSource(
-      longs = {
-        Long.MIN_VALUE,
-        Integer.MIN_VALUE,
-        -1_048_576L,
-        -256L,
-        -128L,
-        -1L,
-        0L,
-        1L,
-        128L,
-        256L,
-        1_048_576L,
-        Integer.MAX_VALUE,
-        Long.MAX_VALUE
-      })
-  public void longConversions(long value) {
-    Long box = Long.valueOf(value);
-
-    assertEquals(TagMap.EntryReader.LONG, TagValueConversions.typeOf(box));
-    assertTrue(TagValueConversions.isA(box, TagMap.EntryReader.LONG));
-    assertTrue(TagValueConversions.isNumericPrimitive(box));
-    assertTrue(TagValueConversions.isNumber(box));
-    assertFalse(TagValueConversions.isObject(box));
-
-    assertEquals(value, TagValueConversions.toLong(box));
-    assertEquals((int) value, TagValueConversions.toInt(box));
-    assertEquals((float) value, TagValueConversions.toFloat(box));
-    assertEquals((double) value, TagValueConversions.toDouble(box));
-
-    assertEquals(value != 0L, TagValueConversions.toBoolean(box));
-    assertEquals(Long.toString(value), TagValueConversions.toString(box));
-  }
-
-  @ParameterizedTest
-  @ValueSource(floats = {Float.MIN_VALUE, -1F, 0F, 1F, 2.171828F, 3.1415F, Float.MAX_VALUE})
-  public void floatConversions(float value) {
-    Float box = Float.valueOf(value);
-
-    assertEquals(TagMap.EntryReader.FLOAT, TagValueConversions.typeOf(box));
-    assertTrue(TagValueConversions.isA(box, TagMap.EntryReader.FLOAT));
-    assertTrue(TagValueConversions.isNumericPrimitive(box));
-    assertTrue(TagValueConversions.isNumber(box));
-    assertFalse(TagValueConversions.isObject(box));
-
-    assertEquals(value, TagValueConversions.toFloat(box));
-    assertEquals((int) value, TagValueConversions.toInt(box));
-    assertEquals((long) value, TagValueConversions.toLong(box));
-    assertEquals((double) value, TagValueConversions.toDouble(box));
-
-    assertEquals(value != 0F, TagValueConversions.toBoolean(box));
-    assertEquals(Float.toString(value), TagValueConversions.toString(box));
-  }
-
-  @ParameterizedTest
-  @ValueSource(
-      doubles = {Double.MIN_VALUE, Float.MIN_VALUE, -1D, 0D, 1D, Math.E, Math.PI, Double.MAX_VALUE})
-  public void doubleConversions(double value) {
-    Double box = Double.valueOf(value);
-
-    assertEquals(TagMap.EntryReader.DOUBLE, TagValueConversions.typeOf(box));
-    assertTrue(TagValueConversions.isA(box, TagMap.EntryReader.DOUBLE));
-    assertTrue(TagValueConversions.isNumericPrimitive(box));
-    assertTrue(TagValueConversions.isNumber(box));
-    assertFalse(TagValueConversions.isObject(box));
-
-    assertEquals(value, TagValueConversions.toDouble(box));
-    assertEquals((int) value, TagValueConversions.toInt(box));
-    assertEquals((long) value, TagValueConversions.toLong(box));
-    assertEquals((float) value, TagValueConversions.toFloat(box));
-
-    assertEquals(value != 0D, TagValueConversions.toBoolean(box));
-    assertEquals(Double.toString(value), TagValueConversions.toString(box));
-  }
+    @ParameterizedTest
+    @ValueSource(booleans = {false, true})
+    public void booleanConversions(boolean value) {
+        Boolean box = Boolean.valueOf(value);
+
+        assertEquals(TagMap.EntryReader.BOOLEAN, TagValueConversions.typeOf(box));
+        assertTrue(TagValueConversions.isA(box, TagMap.EntryReader.BOOLEAN));
+        assertFalse(TagValueConversions.isNumericPrimitive(box));
+        assertFalse(TagValueConversions.isNumber(box));
+        assertFalse(TagValueConversions.isObject(box));
+
+        assertEquals(value, TagValueConversions.toBoolean(box));
+        assertEquals(value ? 1 : 0, TagValueConversions.toInt(box));
+        assertEquals(value ? 1L : 0L, TagValueConversions.toLong(box));
+        assertEquals(value ? 1F : 0F, TagValueConversions.toFloat(box));
+        assertEquals(value ? 1D : 0D, TagValueConversions.toDouble(box));
+
+        assertEquals(Boolean.toString(value), TagValueConversions.toString(box));
+    }
+
+    @ParameterizedTest
+    @ValueSource(ints = {Integer.MIN_VALUE, -256, -128, -1, 0, 1, 128, 256, Integer.MAX_VALUE})
+    public void intConversions(int value) {
+        Integer box = Integer.valueOf(value);
+
+        assertEquals(TagMap.EntryReader.INT, TagValueConversions.typeOf(box));
+        assertTrue(TagValueConversions.isA(box, TagMap.EntryReader.INT));
+        assertTrue(TagValueConversions.isNumericPrimitive(box));
+        assertTrue(TagValueConversions.isNumber(box));
+        assertFalse(TagValueConversions.isObject(box));
+
+        assertEquals(value, TagValueConversions.toInt(box));
+        assertEquals((long) value, TagValueConversions.toLong(box));
+        assertEquals((float) value, TagValueConversions.toFloat(box));
+        assertEquals((double) value, TagValueConversions.toDouble(box));
+
+        assertEquals(value != 0, TagValueConversions.toBoolean(box));
+        assertEquals(Integer.toString(value), TagValueConversions.toString(box));
+    }
+
+    @ParameterizedTest
+    @ValueSource(bytes = {Byte.MIN_VALUE, -32, -1, 0, 1, 32, Byte.MAX_VALUE})
+    public void byteConversions(byte value) {
+        Byte box = Byte.valueOf(value);
+
+        assertEquals(TagMap.EntryReader.INT, TagValueConversions.typeOf(box));
+        assertTrue(TagValueConversions.isA(box, TagMap.EntryReader.INT));
+        assertTrue(TagValueConversions.isNumericPrimitive(box));
+        assertTrue(TagValueConversions.isNumber(box));
+        assertFalse(TagValueConversions.isObject(box));
+
+        assertEquals((int) value, TagValueConversions.toInt(box));
+        assertEquals((long) value, TagValueConversions.toLong(box));
+        assertEquals((float) value, TagValueConversions.toFloat(box));
+        assertEquals((double) value, TagValueConversions.toDouble(box));
+
+        assertEquals(value != 0, TagValueConversions.toBoolean(box));
+        assertEquals(Byte.toString(value), TagValueConversions.toString(box));
+    }
+
+    @ParameterizedTest
+    @ValueSource(shorts = {Short.MIN_VALUE, -256, -128, -1, 0, 1, 128, 256, Short.MAX_VALUE})
+    public void shortConversions(short value) {
+        Short box = Short.valueOf(value);
+
+        assertEquals(TagMap.EntryReader.INT, TagValueConversions.typeOf(box));
+        assertTrue(TagValueConversions.isA(box, TagMap.EntryReader.INT));
+        assertTrue(TagValueConversions.isNumericPrimitive(box));
+        assertTrue(TagValueConversions.isNumber(box));
+        assertFalse(TagValueConversions.isObject(box));
+
+        assertEquals((int) value, TagValueConversions.toInt(box));
+        assertEquals((long) value, TagValueConversions.toLong(box));
+        assertEquals((float) value, TagValueConversions.toFloat(box));
+        assertEquals((double) value, TagValueConversions.toDouble(box));
+
+        assertEquals(value != 0, TagValueConversions.toBoolean(box));
+        assertEquals(Short.toString(value), TagValueConversions.toString(box));
+    }
+
+    @ParameterizedTest
+    @ValueSource(
+            longs = {
+                Long.MIN_VALUE,
+                Integer.MIN_VALUE,
+                -1_048_576L,
+                -256L,
+                -128L,
+                -1L,
+                0L,
+                1L,
+                128L,
+                256L,
+                1_048_576L,
+                Integer.MAX_VALUE,
+                Long.MAX_VALUE
+            })
+    public void longConversions(long value) {
+        Long box = Long.valueOf(value);
+
+        assertEquals(TagMap.EntryReader.LONG, TagValueConversions.typeOf(box));
+        assertTrue(TagValueConversions.isA(box, TagMap.EntryReader.LONG));
+        assertTrue(TagValueConversions.isNumericPrimitive(box));
+        assertTrue(TagValueConversions.isNumber(box));
+        assertFalse(TagValueConversions.isObject(box));
+
+        assertEquals(value, TagValueConversions.toLong(box));
+        assertEquals((int) value, TagValueConversions.toInt(box));
+        assertEquals((float) value, TagValueConversions.toFloat(box));
+        assertEquals((double) value, TagValueConversions.toDouble(box));
+
+        assertEquals(value != 0L, TagValueConversions.toBoolean(box));
+        assertEquals(Long.toString(value), TagValueConversions.toString(box));
+    }
+
+    @ParameterizedTest
+    @ValueSource(floats = {Float.MIN_VALUE, -1F, 0F, 1F, 2.171828F, 3.1415F, Float.MAX_VALUE})
+    public void floatConversions(float value) {
+        Float box = Float.valueOf(value);
+
+        assertEquals(TagMap.EntryReader.FLOAT, TagValueConversions.typeOf(box));
+        assertTrue(TagValueConversions.isA(box, TagMap.EntryReader.FLOAT));
+        assertTrue(TagValueConversions.isNumericPrimitive(box));
+        assertTrue(TagValueConversions.isNumber(box));
+        assertFalse(TagValueConversions.isObject(box));
+
+        assertEquals(value, TagValueConversions.toFloat(box));
+        assertEquals((int) value, TagValueConversions.toInt(box));
+        assertEquals((long) value, TagValueConversions.toLong(box));
+        assertEquals((double) value, TagValueConversions.toDouble(box));
+
+        assertEquals(value != 0F, TagValueConversions.toBoolean(box));
+        assertEquals(Float.toString(value), TagValueConversions.toString(box));
+    }
+
+    @ParameterizedTest
+    @ValueSource(doubles = {Double.MIN_VALUE, Float.MIN_VALUE, -1D, 0D, 1D, Math.E, Math.PI, Double.MAX_VALUE})
+    public void doubleConversions(double value) {
+        Double box = Double.valueOf(value);
+
+        assertEquals(TagMap.EntryReader.DOUBLE, TagValueConversions.typeOf(box));
+        assertTrue(TagValueConversions.isA(box, TagMap.EntryReader.DOUBLE));
+        assertTrue(TagValueConversions.isNumericPrimitive(box));
+        assertTrue(TagValueConversions.isNumber(box));
+        assertFalse(TagValueConversions.isObject(box));
+
+        assertEquals(value, TagValueConversions.toDouble(box));
+        assertEquals((int) value, TagValueConversions.toInt(box));
+        assertEquals((long) value, TagValueConversions.toLong(box));
+        assertEquals((float) value, TagValueConversions.toFloat(box));
+
+        assertEquals(value != 0D, TagValueConversions.toBoolean(box));
+        assertEquals(Double.toString(value), TagValueConversions.toString(box));
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/TraceStatsAdditionalTagsTest.java b/internal-api/src/test/java/datadog/trace/api/TraceStatsAdditionalTagsTest.java
index b8207dc56b9..3dbe956eeba 100644
--- a/internal-api/src/test/java/datadog/trace/api/TraceStatsAdditionalTagsTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/TraceStatsAdditionalTagsTest.java
@@ -9,44 +9,44 @@
 
 class TraceStatsAdditionalTagsTest {
 
-  private static Config configWith(String experimentalFeatures, String additionalTags) {
-    Properties props = new Properties();
-    if (experimentalFeatures != null) {
-      props.setProperty("trace.experimental.features.enabled", experimentalFeatures);
+    private static Config configWith(String experimentalFeatures, String additionalTags) {
+        Properties props = new Properties();
+        if (experimentalFeatures != null) {
+            props.setProperty("trace.experimental.features.enabled", experimentalFeatures);
+        }
+        if (additionalTags != null) {
+            props.setProperty("trace.stats.additional.tags", additionalTags);
+        }
+        return Config.get(props);
     }
-    if (additionalTags != null) {
-      props.setProperty("trace.stats.additional.tags", additionalTags);
+
+    @Test
+    void returnsConfiguredTagsWhenFeatureEnabled() {
+        Config config = configWith("DD_TRACE_STATS_ADDITIONAL_TAGS", "peer.hostname,messaging.system");
+        Set<String> tags = config.getTraceStatsAdditionalTags();
+        assertEquals(2, tags.size());
+        assertTrue(tags.contains("peer.hostname"));
+        assertTrue(tags.contains("messaging.system"));
+    }
+
+    @Test
+    void emptyWhenFeatureNotEnabled() {
+        // The value is configured but the experimental feature gate is closed.
+        Config config = configWith(null, "peer.hostname");
+        assertTrue(config.getTraceStatsAdditionalTags().isEmpty());
+    }
+
+    @Test
+    void returnsSameSnapshotInstanceOnEachCall() {
+        // The setting is snapshotted into a final field at construction, so repeated reads
+        // return the identical immutable instance rather than re-querying the config source.
+        Config config = configWith("DD_TRACE_STATS_ADDITIONAL_TAGS", "peer.hostname");
+        assertEquals(config.getTraceStatsAdditionalTags(), config.getTraceStatsAdditionalTags());
+    }
+
+    @Test
+    void includedInToString() {
+        Config config = configWith("DD_TRACE_STATS_ADDITIONAL_TAGS", "peer.hostname");
+        assertTrue(config.toString().contains("traceStatsAdditionalTags="));
     }
-    return Config.get(props);
-  }
-
-  @Test
-  void returnsConfiguredTagsWhenFeatureEnabled() {
-    Config config = configWith("DD_TRACE_STATS_ADDITIONAL_TAGS", "peer.hostname,messaging.system");
-    Set<String> tags = config.getTraceStatsAdditionalTags();
-    assertEquals(2, tags.size());
-    assertTrue(tags.contains("peer.hostname"));
-    assertTrue(tags.contains("messaging.system"));
-  }
-
-  @Test
-  void emptyWhenFeatureNotEnabled() {
-    // The value is configured but the experimental feature gate is closed.
-    Config config = configWith(null, "peer.hostname");
-    assertTrue(config.getTraceStatsAdditionalTags().isEmpty());
-  }
-
-  @Test
-  void returnsSameSnapshotInstanceOnEachCall() {
-    // The setting is snapshotted into a final field at construction, so repeated reads
-    // return the identical immutable instance rather than re-querying the config source.
-    Config config = configWith("DD_TRACE_STATS_ADDITIONAL_TAGS", "peer.hostname");
-    assertEquals(config.getTraceStatsAdditionalTags(), config.getTraceStatsAdditionalTags());
-  }
-
-  @Test
-  void includedInToString() {
-    Config config = configWith("DD_TRACE_STATS_ADDITIONAL_TAGS", "peer.hostname");
-    assertTrue(config.toString().contains("traceStatsAdditionalTags="));
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/TraceStatsCardinalityLimitTest.java b/internal-api/src/test/java/datadog/trace/api/TraceStatsCardinalityLimitTest.java
index effb4e12c24..7cd36f8f0c5 100644
--- a/internal-api/src/test/java/datadog/trace/api/TraceStatsCardinalityLimitTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/TraceStatsCardinalityLimitTest.java
@@ -7,51 +7,47 @@
 
 class TraceStatsCardinalityLimitTest {
 
-  private static final int DEFAULT = 1024;
-  // Mirrors Config.MAX_TRACE_STATS_CARDINALITY_LIMIT (package-private, not visible here).
-  private static final int MAX = 1 << 16;
-
-  private static Config configWith(String limit) {
-    Properties props = new Properties();
-    props.setProperty("trace.stats.resource.cardinality.limit", limit);
-    return Config.get(props);
-  }
-
-  @Test
-  void positiveValueIsUsed() {
-    assertEquals(256, configWith("256").getTraceStatsCardinalityLimit("resource", DEFAULT));
-  }
-
-  @Test
-  void zeroFallsBackToDefault() {
-    assertEquals(DEFAULT, configWith("0").getTraceStatsCardinalityLimit("resource", DEFAULT));
-  }
-
-  @Test
-  void negativeFallsBackToDefault() {
-    assertEquals(DEFAULT, configWith("-5").getTraceStatsCardinalityLimit("resource", DEFAULT));
-  }
-
-  @Test
-  void valueAtMaxIsUsed() {
-    // 1 << 16 is the largest accepted value; it is used verbatim.
-    assertEquals(
-        MAX, configWith(Integer.toString(MAX)).getTraceStatsCardinalityLimit("resource", DEFAULT));
-  }
-
-  @Test
-  void valueAboveMaxFallsBackToDefault() {
-    // One past the cap falls back rather than sizing an oversized handler table.
-    assertEquals(
-        DEFAULT,
-        configWith(Integer.toString(MAX + 1)).getTraceStatsCardinalityLimit("resource", DEFAULT));
-  }
-
-  @Test
-  void heapExhaustingValueFallsBackToDefault() {
-    // A value below TagCardinalityHandler's own 1<<29 guard but large enough to allocate
-    // multi-gigabyte handler tables must not reach the handler; it falls back to the default.
-    assertEquals(
-        DEFAULT, configWith("500000000").getTraceStatsCardinalityLimit("resource", DEFAULT));
-  }
+    private static final int DEFAULT = 1024;
+    // Mirrors Config.MAX_TRACE_STATS_CARDINALITY_LIMIT (package-private, not visible here).
+    private static final int MAX = 1 << 16;
+
+    private static Config configWith(String limit) {
+        Properties props = new Properties();
+        props.setProperty("trace.stats.resource.cardinality.limit", limit);
+        return Config.get(props);
+    }
+
+    @Test
+    void positiveValueIsUsed() {
+        assertEquals(256, configWith("256").getTraceStatsCardinalityLimit("resource", DEFAULT));
+    }
+
+    @Test
+    void zeroFallsBackToDefault() {
+        assertEquals(DEFAULT, configWith("0").getTraceStatsCardinalityLimit("resource", DEFAULT));
+    }
+
+    @Test
+    void negativeFallsBackToDefault() {
+        assertEquals(DEFAULT, configWith("-5").getTraceStatsCardinalityLimit("resource", DEFAULT));
+    }
+
+    @Test
+    void valueAtMaxIsUsed() {
+        // 1 << 16 is the largest accepted value; it is used verbatim.
+        assertEquals(MAX, configWith(Integer.toString(MAX)).getTraceStatsCardinalityLimit("resource", DEFAULT));
+    }
+
+    @Test
+    void valueAboveMaxFallsBackToDefault() {
+        // One past the cap falls back rather than sizing an oversized handler table.
+        assertEquals(DEFAULT, configWith(Integer.toString(MAX + 1)).getTraceStatsCardinalityLimit("resource", DEFAULT));
+    }
+
+    @Test
+    void heapExhaustingValueFallsBackToDefault() {
+        // A value below TagCardinalityHandler's own 1<<29 guard but large enough to allocate
+        // multi-gigabyte handler tables must not reach the handler; it falls back to the default.
+        assertEquals(DEFAULT, configWith("500000000").getTraceStatsCardinalityLimit("resource", DEFAULT));
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/WellKnownTagsTest.java b/internal-api/src/test/java/datadog/trace/api/WellKnownTagsTest.java
index f164ab7006d..81d59dc4b7d 100644
--- a/internal-api/src/test/java/datadog/trace/api/WellKnownTagsTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/WellKnownTagsTest.java
@@ -6,27 +6,27 @@
 
 class WellKnownTagsTest {
 
-  @Test
-  void wellKnownTagsDoesNotModifyInputs() {
-    WellKnownTags wellKnownTags =
-        new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
+    @Test
+    void wellKnownTagsDoesNotModifyInputs() {
+        WellKnownTags wellKnownTags =
+                new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
 
-    assertEquals("runtimeid", wellKnownTags.getRuntimeId().toString());
-    assertEquals("hostname", wellKnownTags.getHostname().toString());
-    assertEquals("env", wellKnownTags.getEnv().toString());
-    assertEquals("service", wellKnownTags.getService().toString());
-    assertEquals("version", wellKnownTags.getVersion().toString());
-    assertEquals("language", wellKnownTags.getLanguage().toString());
-  }
+        assertEquals("runtimeid", wellKnownTags.getRuntimeId().toString());
+        assertEquals("hostname", wellKnownTags.getHostname().toString());
+        assertEquals("env", wellKnownTags.getEnv().toString());
+        assertEquals("service", wellKnownTags.getService().toString());
+        assertEquals("version", wellKnownTags.getVersion().toString());
+        assertEquals("language", wellKnownTags.getLanguage().toString());
+    }
 
-  @Test
-  void toStringIncludesAllFields() {
-    WellKnownTags wellKnownTags =
-        new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
+    @Test
+    void toStringIncludesAllFields() {
+        WellKnownTags wellKnownTags =
+                new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language");
 
-    assertEquals(
-        "WellKnownTags{runtimeId=runtimeid, hostname=hostname, env=env,"
-            + " service=service, version=version, language=language}",
-        wellKnownTags.toString());
-  }
+        assertEquals(
+                "WellKnownTags{runtimeId=runtimeid, hostname=hostname, env=env,"
+                        + " service=service, version=version, language=language}",
+                wellKnownTags.toString());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/civisibility/config/BazelModeTest.java b/internal-api/src/test/java/datadog/trace/api/civisibility/config/BazelModeTest.java
index bfd60894414..c80261fca98 100644
--- a/internal-api/src/test/java/datadog/trace/api/civisibility/config/BazelModeTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/civisibility/config/BazelModeTest.java
@@ -23,208 +23,204 @@
 
 class BazelModeTest {
 
-  private EnvironmentVariables.EnvironmentVariablesProvider originalProvider;
-  private TestEnvironmentVariables envProvider;
-
-  @BeforeEach
-  void setUp() {
-    originalProvider = EnvironmentVariables.provider;
-    envProvider = new TestEnvironmentVariables();
-    EnvironmentVariables.provider = envProvider;
-    BazelMode.reset();
-  }
-
-  @AfterEach
-  void tearDown() {
-    EnvironmentVariables.provider = originalProvider;
-    BazelMode.reset();
-  }
-
-  @Test
-  void disabledWhenNoConfigProvided() {
-    BazelMode mode = new BazelMode(configWith(null, false));
-
-    assertFalse(mode.isEnabled());
-    assertFalse(mode.isManifestModeEnabled());
-    assertFalse(mode.isPayloadFilesEnabled());
-    assertNull(mode.getPayloadsDir());
-    assertNull(mode.getTestPayloadsDir());
-    assertNull(mode.getCoveragePayloadsDir());
-    assertNull(mode.getTelemetryPayloadsDir());
-    assertNull(mode.getSettingsPath());
-  }
-
-  @Test
-  void manifestModeEnabledWithCompatibleManifest(@TempDir Path tmp) throws IOException {
-    Path manifest = writeManifest(tmp, "1");
-
-    BazelMode mode = new BazelMode(configWith(manifest.toString(), false));
-
-    assertTrue(mode.isEnabled());
-    assertTrue(mode.isManifestModeEnabled());
-  }
-
-  @Test
-  void manifestModeDisabledForUnsupportedVersion(@TempDir Path tmp) throws IOException {
-    Path manifest = writeManifest(tmp, "999");
-
-    BazelMode mode = new BazelMode(configWith(manifest.toString(), false));
-
-    assertFalse(mode.isManifestModeEnabled());
-  }
-
-  @Test
-  void manifestModeDisabledForUnparseableVersion(@TempDir Path tmp) throws IOException {
-    Path manifest = writeManifest(tmp, "not-a-number");
-
-    BazelMode mode = new BazelMode(configWith(manifest.toString(), false));
-
-    assertFalse(mode.isManifestModeEnabled());
-  }
-
-  @Test
-  void manifestResolvedViaRunfilesDir(@TempDir Path tmp) throws IOException {
-    Path runfiles = Files.createDirectories(tmp.resolve("runfiles"));
-    Path manifest = writeManifest(runfiles.resolve(".testoptimization"), "1");
-    envProvider.set("RUNFILES_DIR", runfiles.toString());
-    String rlocation = runfiles.relativize(manifest).toString();
-
-    BazelMode mode = new BazelMode(configWith(rlocation, false));
-
-    assertTrue(mode.isManifestModeEnabled());
-  }
-
-  @Test
-  void manifestResolvedViaRunfilesManifestFile(@TempDir Path tmp) throws IOException {
-    Path actualManifest = writeManifest(tmp.resolve(".testoptimization"), "1");
-    Path runfilesManifest = tmp.resolve("runfiles.manifest");
-    Files.write(
-        runfilesManifest,
-        ("myproj/.testoptimization/manifest.txt " + actualManifest + "\n")
-            .getBytes(StandardCharsets.UTF_8));
-    envProvider.set("RUNFILES_MANIFEST_FILE", runfilesManifest.toString());
-
-    BazelMode mode = new BazelMode(configWith("myproj/.testoptimization/manifest.txt", false));
-
-    assertTrue(mode.isManifestModeEnabled());
-  }
-
-  @Test
-  void cachePathsResolveOnlyWhenFileExists(@TempDir Path tmp) throws IOException {
-    Path manifestDir = Files.createDirectories(tmp.resolve(".testoptimization"));
-    Path manifest = writeManifest(manifestDir, "1");
-    Path httpDir = Files.createDirectories(manifestDir.resolve("cache/http"));
-    Files.write(httpDir.resolve("settings.json"), "{}".getBytes(StandardCharsets.UTF_8));
-
-    BazelMode mode = new BazelMode(configWith(manifest.toString(), false));
-
-    assertNotNull(mode.getSettingsPath());
-    assertEquals(
-        httpDir.resolve("settings.json").toFile().getAbsolutePath(), mode.getSettingsPath());
-    // files that do not exist return null
-    assertNull(mode.getKnownTestsPath());
-    assertNull(mode.getTestManagementPath());
-    assertNull(mode.getFlakyTestsPath());
-  }
-
-  @Test
-  void payloadDirsDerivedFromUndeclaredOutputsDir(@TempDir Path tmp) {
-    envProvider.set("TEST_UNDECLARED_OUTPUTS_DIR", tmp.toString());
-
-    BazelMode mode = new BazelMode(configWith(null, true));
-
-    assertTrue(mode.isEnabled());
-    assertTrue(mode.isPayloadFilesEnabled());
-    assertEquals(tmp.resolve("payloads").toString(), mode.getPayloadsDir());
-    assertEquals(tmp.resolve("payloads").resolve("tests").toString(), mode.getTestPayloadsDir());
-    assertEquals(
-        tmp.resolve("payloads").resolve("coverage").toString(), mode.getCoveragePayloadsDir());
-    assertEquals(
-        tmp.resolve("payloads").resolve("telemetry").toString(), mode.getTelemetryPayloadsDir());
-  }
-
-  @Test
-  void payloadFilesDisabledWhenUndeclaredOutputsDirMissing() {
-    BazelMode mode = new BazelMode(configWith(null, true));
-
-    assertFalse(mode.isPayloadFilesEnabled());
-    assertNull(mode.getPayloadsDir());
-    assertNull(mode.getTestPayloadsDir());
-    assertNull(mode.getCoveragePayloadsDir());
-    assertNull(mode.getTelemetryPayloadsDir());
-  }
+    private EnvironmentVariables.EnvironmentVariablesProvider originalProvider;
+    private TestEnvironmentVariables envProvider;
+
+    @BeforeEach
+    void setUp() {
+        originalProvider = EnvironmentVariables.provider;
+        envProvider = new TestEnvironmentVariables();
+        EnvironmentVariables.provider = envProvider;
+        BazelMode.reset();
+    }
+
+    @AfterEach
+    void tearDown() {
+        EnvironmentVariables.provider = originalProvider;
+        BazelMode.reset();
+    }
+
+    @Test
+    void disabledWhenNoConfigProvided() {
+        BazelMode mode = new BazelMode(configWith(null, false));
+
+        assertFalse(mode.isEnabled());
+        assertFalse(mode.isManifestModeEnabled());
+        assertFalse(mode.isPayloadFilesEnabled());
+        assertNull(mode.getPayloadsDir());
+        assertNull(mode.getTestPayloadsDir());
+        assertNull(mode.getCoveragePayloadsDir());
+        assertNull(mode.getTelemetryPayloadsDir());
+        assertNull(mode.getSettingsPath());
+    }
+
+    @Test
+    void manifestModeEnabledWithCompatibleManifest(@TempDir Path tmp) throws IOException {
+        Path manifest = writeManifest(tmp, "1");
+
+        BazelMode mode = new BazelMode(configWith(manifest.toString(), false));
+
+        assertTrue(mode.isEnabled());
+        assertTrue(mode.isManifestModeEnabled());
+    }
+
+    @Test
+    void manifestModeDisabledForUnsupportedVersion(@TempDir Path tmp) throws IOException {
+        Path manifest = writeManifest(tmp, "999");
+
+        BazelMode mode = new BazelMode(configWith(manifest.toString(), false));
+
+        assertFalse(mode.isManifestModeEnabled());
+    }
+
+    @Test
+    void manifestModeDisabledForUnparseableVersion(@TempDir Path tmp) throws IOException {
+        Path manifest = writeManifest(tmp, "not-a-number");
+
+        BazelMode mode = new BazelMode(configWith(manifest.toString(), false));
+
+        assertFalse(mode.isManifestModeEnabled());
+    }
+
+    @Test
+    void manifestResolvedViaRunfilesDir(@TempDir Path tmp) throws IOException {
+        Path runfiles = Files.createDirectories(tmp.resolve("runfiles"));
+        Path manifest = writeManifest(runfiles.resolve(".testoptimization"), "1");
+        envProvider.set("RUNFILES_DIR", runfiles.toString());
+        String rlocation = runfiles.relativize(manifest).toString();
 
-  @Test
-  void repoRootResolvedViaTestSrcDir(@TempDir Path tmp) throws IOException {
-    Path workspace = Files.createDirectories(tmp.resolve("_main"));
-    envProvider.set("TEST_SRCDIR", tmp.toString());
-    envProvider.set("TEST_WORKSPACE", "_main");
+        BazelMode mode = new BazelMode(configWith(rlocation, false));
 
-    BazelMode mode = new BazelMode(configWith(null, false));
+        assertTrue(mode.isManifestModeEnabled());
+    }
+
+    @Test
+    void manifestResolvedViaRunfilesManifestFile(@TempDir Path tmp) throws IOException {
+        Path actualManifest = writeManifest(tmp.resolve(".testoptimization"), "1");
+        Path runfilesManifest = tmp.resolve("runfiles.manifest");
+        Files.write(
+                runfilesManifest,
+                ("myproj/.testoptimization/manifest.txt " + actualManifest + "\n").getBytes(StandardCharsets.UTF_8));
+        envProvider.set("RUNFILES_MANIFEST_FILE", runfilesManifest.toString());
+
+        BazelMode mode = new BazelMode(configWith("myproj/.testoptimization/manifest.txt", false));
 
-    assertEquals(workspace.toFile().getAbsolutePath(), mode.getRepoRoot());
-  }
+        assertTrue(mode.isManifestModeEnabled());
+    }
 
-  @Test
-  void repoRootResolvedViaRunfilesDirWhenTestSrcDirMissing(@TempDir Path tmp) throws IOException {
-    Path workspace = Files.createDirectories(tmp.resolve("_main"));
-    envProvider.set("RUNFILES_DIR", tmp.toString());
-    envProvider.set("TEST_WORKSPACE", "_main");
-
-    BazelMode mode = new BazelMode(configWith(null, false));
+    @Test
+    void cachePathsResolveOnlyWhenFileExists(@TempDir Path tmp) throws IOException {
+        Path manifestDir = Files.createDirectories(tmp.resolve(".testoptimization"));
+        Path manifest = writeManifest(manifestDir, "1");
+        Path httpDir = Files.createDirectories(manifestDir.resolve("cache/http"));
+        Files.write(httpDir.resolve("settings.json"), "{}".getBytes(StandardCharsets.UTF_8));
+
+        BazelMode mode = new BazelMode(configWith(manifest.toString(), false));
+
+        assertNotNull(mode.getSettingsPath());
+        assertEquals(httpDir.resolve("settings.json").toFile().getAbsolutePath(), mode.getSettingsPath());
+        // files that do not exist return null
+        assertNull(mode.getKnownTestsPath());
+        assertNull(mode.getTestManagementPath());
+        assertNull(mode.getFlakyTestsPath());
+    }
 
-    assertEquals(workspace.toFile().getAbsolutePath(), mode.getRepoRoot());
-  }
-
-  @Test
-  void repoRootNullWhenTestWorkspaceMissing(@TempDir Path tmp) throws IOException {
-    Files.createDirectories(tmp.resolve("_main"));
-    envProvider.set("TEST_SRCDIR", tmp.toString());
-
-    BazelMode mode = new BazelMode(configWith(null, false));
-
-    assertNull(mode.getRepoRoot());
-  }
-
-  @Test
-  void repoRootNullWhenWorkspaceDirMissing(@TempDir Path tmp) {
-    envProvider.set("TEST_SRCDIR", tmp.toString());
-    envProvider.set("TEST_WORKSPACE", "_main");
-
-    BazelMode mode = new BazelMode(configWith(null, false));
-
-    assertNull(mode.getRepoRoot());
-  }
-
-  private static Config configWith(String manifestRloc, boolean payloadsInFiles) {
-    Config config = mock(Config.class);
-    when(config.getTestOptimizationManifestFile()).thenReturn(manifestRloc);
-    when(config.isTestOptimizationPayloadsInFiles()).thenReturn(payloadsInFiles);
-    return config;
-  }
+    @Test
+    void payloadDirsDerivedFromUndeclaredOutputsDir(@TempDir Path tmp) {
+        envProvider.set("TEST_UNDECLARED_OUTPUTS_DIR", tmp.toString());
 
-  private static Path writeManifest(Path dir, String version) throws IOException {
-    Files.createDirectories(dir);
-    Path manifest = dir.resolve("manifest.txt");
-    Files.write(manifest, ("version=" + version).getBytes(StandardCharsets.UTF_8));
-    return manifest;
-  }
-
-  static class TestEnvironmentVariables extends EnvironmentVariables.EnvironmentVariablesProvider {
-    private final Map<String, String> env = new HashMap<>();
+        BazelMode mode = new BazelMode(configWith(null, true));
 
-    void set(String name, String value) {
-      env.put(name, value);
+        assertTrue(mode.isEnabled());
+        assertTrue(mode.isPayloadFilesEnabled());
+        assertEquals(tmp.resolve("payloads").toString(), mode.getPayloadsDir());
+        assertEquals(tmp.resolve("payloads").resolve("tests").toString(), mode.getTestPayloadsDir());
+        assertEquals(tmp.resolve("payloads").resolve("coverage").toString(), mode.getCoveragePayloadsDir());
+        assertEquals(tmp.resolve("payloads").resolve("telemetry").toString(), mode.getTelemetryPayloadsDir());
     }
 
-    @Override
-    public String get(String name) {
-      return env.get(name);
+    @Test
+    void payloadFilesDisabledWhenUndeclaredOutputsDirMissing() {
+        BazelMode mode = new BazelMode(configWith(null, true));
+
+        assertFalse(mode.isPayloadFilesEnabled());
+        assertNull(mode.getPayloadsDir());
+        assertNull(mode.getTestPayloadsDir());
+        assertNull(mode.getCoveragePayloadsDir());
+        assertNull(mode.getTelemetryPayloadsDir());
     }
 
-    @Override
-    public Map<String, String> getAll() {
-      return env;
+    @Test
+    void repoRootResolvedViaTestSrcDir(@TempDir Path tmp) throws IOException {
+        Path workspace = Files.createDirectories(tmp.resolve("_main"));
+        envProvider.set("TEST_SRCDIR", tmp.toString());
+        envProvider.set("TEST_WORKSPACE", "_main");
+
+        BazelMode mode = new BazelMode(configWith(null, false));
+
+        assertEquals(workspace.toFile().getAbsolutePath(), mode.getRepoRoot());
+    }
+
+    @Test
+    void repoRootResolvedViaRunfilesDirWhenTestSrcDirMissing(@TempDir Path tmp) throws IOException {
+        Path workspace = Files.createDirectories(tmp.resolve("_main"));
+        envProvider.set("RUNFILES_DIR", tmp.toString());
+        envProvider.set("TEST_WORKSPACE", "_main");
+
+        BazelMode mode = new BazelMode(configWith(null, false));
+
+        assertEquals(workspace.toFile().getAbsolutePath(), mode.getRepoRoot());
+    }
+
+    @Test
+    void repoRootNullWhenTestWorkspaceMissing(@TempDir Path tmp) throws IOException {
+        Files.createDirectories(tmp.resolve("_main"));
+        envProvider.set("TEST_SRCDIR", tmp.toString());
+
+        BazelMode mode = new BazelMode(configWith(null, false));
+
+        assertNull(mode.getRepoRoot());
+    }
+
+    @Test
+    void repoRootNullWhenWorkspaceDirMissing(@TempDir Path tmp) {
+        envProvider.set("TEST_SRCDIR", tmp.toString());
+        envProvider.set("TEST_WORKSPACE", "_main");
+
+        BazelMode mode = new BazelMode(configWith(null, false));
+
+        assertNull(mode.getRepoRoot());
+    }
+
+    private static Config configWith(String manifestRloc, boolean payloadsInFiles) {
+        Config config = mock(Config.class);
+        when(config.getTestOptimizationManifestFile()).thenReturn(manifestRloc);
+        when(config.isTestOptimizationPayloadsInFiles()).thenReturn(payloadsInFiles);
+        return config;
+    }
+
+    private static Path writeManifest(Path dir, String version) throws IOException {
+        Files.createDirectories(dir);
+        Path manifest = dir.resolve("manifest.txt");
+        Files.write(manifest, ("version=" + version).getBytes(StandardCharsets.UTF_8));
+        return manifest;
+    }
+
+    static class TestEnvironmentVariables extends EnvironmentVariables.EnvironmentVariablesProvider {
+        private final Map<String, String> env = new HashMap<>();
+
+        void set(String name, String value) {
+            env.put(name, value);
+        }
+
+        @Override
+        public String get(String name) {
+            return env.get(name);
+        }
+
+        @Override
+        public Map<String, String> getAll() {
+            return env;
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/civisibility/execution/ExecutionAggregationTest.java b/internal-api/src/test/java/datadog/trace/api/civisibility/execution/ExecutionAggregationTest.java
index a97badb0712..81bb1999a3d 100644
--- a/internal-api/src/test/java/datadog/trace/api/civisibility/execution/ExecutionAggregationTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/civisibility/execution/ExecutionAggregationTest.java
@@ -10,45 +10,45 @@
 
 class ExecutionAggregationTest {
 
-  @Test
-  void noneAfterFailIsOnlyFailed() {
-    assertEquals(ONLY_FAILED, NONE.withExecution(TestStatus.fail));
-  }
-
-  @Test
-  void noneAfterPassIsOnlyPassed() {
-    assertEquals(ONLY_PASSED, NONE.withExecution(TestStatus.pass));
-  }
-
-  @Test
-  void noneAfterSkipIsOnlyPassed() {
-    assertEquals(ONLY_PASSED, NONE.withExecution(TestStatus.skip));
-  }
-
-  @Test
-  void onlyFailedAfterFailStaysOnlyFailed() {
-    assertEquals(ONLY_FAILED, ONLY_FAILED.withExecution(TestStatus.fail));
-  }
-
-  @Test
-  void onlyFailedAfterPassIsMixed() {
-    assertEquals(MIXED, ONLY_FAILED.withExecution(TestStatus.pass));
-  }
-
-  @Test
-  void onlyPassedAfterPassStaysOnlyPassed() {
-    assertEquals(ONLY_PASSED, ONLY_PASSED.withExecution(TestStatus.pass));
-  }
-
-  @Test
-  void onlyPassedAfterFailIsMixed() {
-    assertEquals(MIXED, ONLY_PASSED.withExecution(TestStatus.fail));
-  }
-
-  @Test
-  void mixedAfterAnyStatusStaysMixed() {
-    assertEquals(MIXED, MIXED.withExecution(TestStatus.pass));
-    assertEquals(MIXED, MIXED.withExecution(TestStatus.fail));
-    assertEquals(MIXED, MIXED.withExecution(TestStatus.skip));
-  }
+    @Test
+    void noneAfterFailIsOnlyFailed() {
+        assertEquals(ONLY_FAILED, NONE.withExecution(TestStatus.fail));
+    }
+
+    @Test
+    void noneAfterPassIsOnlyPassed() {
+        assertEquals(ONLY_PASSED, NONE.withExecution(TestStatus.pass));
+    }
+
+    @Test
+    void noneAfterSkipIsOnlyPassed() {
+        assertEquals(ONLY_PASSED, NONE.withExecution(TestStatus.skip));
+    }
+
+    @Test
+    void onlyFailedAfterFailStaysOnlyFailed() {
+        assertEquals(ONLY_FAILED, ONLY_FAILED.withExecution(TestStatus.fail));
+    }
+
+    @Test
+    void onlyFailedAfterPassIsMixed() {
+        assertEquals(MIXED, ONLY_FAILED.withExecution(TestStatus.pass));
+    }
+
+    @Test
+    void onlyPassedAfterPassStaysOnlyPassed() {
+        assertEquals(ONLY_PASSED, ONLY_PASSED.withExecution(TestStatus.pass));
+    }
+
+    @Test
+    void onlyPassedAfterFailIsMixed() {
+        assertEquals(MIXED, ONLY_PASSED.withExecution(TestStatus.fail));
+    }
+
+    @Test
+    void mixedAfterAnyStatusStaysMixed() {
+        assertEquals(MIXED, MIXED.withExecution(TestStatus.pass));
+        assertEquals(MIXED, MIXED.withExecution(TestStatus.fail));
+        assertEquals(MIXED, MIXED.withExecution(TestStatus.skip));
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/debugger/DebuggerMetricCollectorTest.java b/internal-api/src/test/java/datadog/trace/api/debugger/DebuggerMetricCollectorTest.java
index 671a7b97d63..9b87829bf88 100644
--- a/internal-api/src/test/java/datadog/trace/api/debugger/DebuggerMetricCollectorTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/debugger/DebuggerMetricCollectorTest.java
@@ -15,105 +15,105 @@
 
 class DebuggerMetricCollectorTest {
 
-  private final DebuggerMetricCollector collector = DebuggerMetricCollector.get();
-
-  @BeforeEach
-  public void clearQueue() {
-    collector.drain();
-  }
-
-  @Test
-  public void drainWithoutRecordsReturnsEmpty() {
-    assertEquals(0, collector.drain().size());
-  }
-
-  @Test
-  public void prepareMetricsWithoutRecordsProducesNoMetric() {
-    collector.prepareMetrics();
-    assertEquals(0, collector.drain().size());
-  }
-
-  @Test
-  public void recordEventDroppedSurfacesOnPrepareAndDrain() {
-    collector.recordEventDropped(QUEUE_FULL);
-    collector.prepareMetrics();
-
-    Collection<DebuggerMetric> metrics = collector.drain();
-    assertEquals(1, metrics.size());
-    DebuggerMetric metric = metrics.iterator().next();
-    assertEquals("live_debugger", metric.namespace);
-    assertEquals("events.dropped", metric.metricName);
-    assertEquals("count", metric.type);
-    assertTrue(metric.common);
-    assertEquals(1L, metric.value);
-    assertEquals(Collections.singletonList("reason:queueFull"), metric.tags);
-  }
-
-  @Test
-  public void recordEventSkippedSurfacesOnPrepareAndDrain() {
-    collector.recordEventSkipped(EVALUATION_TIME_OUT);
-    collector.prepareMetrics();
-
-    Collection<DebuggerMetric> metrics = collector.drain();
-    assertEquals(1, metrics.size());
-    DebuggerMetric metric = metrics.iterator().next();
-    assertEquals("events.skipped", metric.metricName);
-    assertEquals(1L, metric.value);
-    assertEquals(Collections.singletonList("reason:evaluationTimeOut"), metric.tags);
-  }
-
-  @Test
-  public void countersAccumulateBeforePrepare() {
-    collector.recordEventDropped(QUEUE_FULL);
-    collector.recordEventDropped(QUEUE_FULL);
-    collector.recordEventDropped(QUEUE_FULL);
-    collector.prepareMetrics();
-
-    Collection<DebuggerMetric> metrics = collector.drain();
-    assertEquals(1, metrics.size());
-    assertEquals(3L, metrics.iterator().next().value);
-  }
-
-  @Test
-  public void distinctReasonsProduceDistinctMetrics() {
-    collector.recordEventDropped(QUEUE_FULL);
-    collector.recordEventDropped(PAYLOAD_TOO_LARGE);
-    collector.prepareMetrics();
-
-    Collection<DebuggerMetric> metrics = collector.drain();
-    assertEquals(2, metrics.size());
-    assertTrue(metrics.stream().anyMatch(m -> m.tags.contains("reason:queueFull")));
-    assertTrue(metrics.stream().anyMatch(m -> m.tags.contains("reason:payloadTooLarge")));
-  }
-
-  @Test
-  public void droppedAndSkippedReasonsAreIndependent() {
-    collector.recordEventDropped(QUEUE_FULL);
-    collector.recordEventSkipped(RATE_LIMIT);
-    collector.prepareMetrics();
-
-    Collection<DebuggerMetric> metrics = collector.drain();
-    assertEquals(2, metrics.size());
-    assertTrue(metrics.stream().anyMatch(m -> m.metricName.equals("events.dropped")));
-    assertTrue(metrics.stream().anyMatch(m -> m.metricName.equals("events.skipped")));
-  }
-
-  @Test
-  public void prepareMetricsResetsCountersAfterDrain() {
-    collector.recordEventDropped(QUEUE_FULL);
-    collector.prepareMetrics();
-    assertEquals(1, collector.drain().size());
-
-    // no new events recorded, so a second prepare/drain cycle should be empty
-    collector.prepareMetrics();
-    assertEquals(0, collector.drain().size());
-  }
-
-  @Test
-  public void drainClearsQueue() {
-    collector.recordEventDropped(QUEUE_FULL);
-    collector.prepareMetrics();
-    assertEquals(1, collector.drain().size());
-    assertEquals(0, collector.drain().size());
-  }
+    private final DebuggerMetricCollector collector = DebuggerMetricCollector.get();
+
+    @BeforeEach
+    public void clearQueue() {
+        collector.drain();
+    }
+
+    @Test
+    public void drainWithoutRecordsReturnsEmpty() {
+        assertEquals(0, collector.drain().size());
+    }
+
+    @Test
+    public void prepareMetricsWithoutRecordsProducesNoMetric() {
+        collector.prepareMetrics();
+        assertEquals(0, collector.drain().size());
+    }
+
+    @Test
+    public void recordEventDroppedSurfacesOnPrepareAndDrain() {
+        collector.recordEventDropped(QUEUE_FULL);
+        collector.prepareMetrics();
+
+        Collection<DebuggerMetric> metrics = collector.drain();
+        assertEquals(1, metrics.size());
+        DebuggerMetric metric = metrics.iterator().next();
+        assertEquals("live_debugger", metric.namespace);
+        assertEquals("events.dropped", metric.metricName);
+        assertEquals("count", metric.type);
+        assertTrue(metric.common);
+        assertEquals(1L, metric.value);
+        assertEquals(Collections.singletonList("reason:queueFull"), metric.tags);
+    }
+
+    @Test
+    public void recordEventSkippedSurfacesOnPrepareAndDrain() {
+        collector.recordEventSkipped(EVALUATION_TIME_OUT);
+        collector.prepareMetrics();
+
+        Collection<DebuggerMetric> metrics = collector.drain();
+        assertEquals(1, metrics.size());
+        DebuggerMetric metric = metrics.iterator().next();
+        assertEquals("events.skipped", metric.metricName);
+        assertEquals(1L, metric.value);
+        assertEquals(Collections.singletonList("reason:evaluationTimeOut"), metric.tags);
+    }
+
+    @Test
+    public void countersAccumulateBeforePrepare() {
+        collector.recordEventDropped(QUEUE_FULL);
+        collector.recordEventDropped(QUEUE_FULL);
+        collector.recordEventDropped(QUEUE_FULL);
+        collector.prepareMetrics();
+
+        Collection<DebuggerMetric> metrics = collector.drain();
+        assertEquals(1, metrics.size());
+        assertEquals(3L, metrics.iterator().next().value);
+    }
+
+    @Test
+    public void distinctReasonsProduceDistinctMetrics() {
+        collector.recordEventDropped(QUEUE_FULL);
+        collector.recordEventDropped(PAYLOAD_TOO_LARGE);
+        collector.prepareMetrics();
+
+        Collection<DebuggerMetric> metrics = collector.drain();
+        assertEquals(2, metrics.size());
+        assertTrue(metrics.stream().anyMatch(m -> m.tags.contains("reason:queueFull")));
+        assertTrue(metrics.stream().anyMatch(m -> m.tags.contains("reason:payloadTooLarge")));
+    }
+
+    @Test
+    public void droppedAndSkippedReasonsAreIndependent() {
+        collector.recordEventDropped(QUEUE_FULL);
+        collector.recordEventSkipped(RATE_LIMIT);
+        collector.prepareMetrics();
+
+        Collection<DebuggerMetric> metrics = collector.drain();
+        assertEquals(2, metrics.size());
+        assertTrue(metrics.stream().anyMatch(m -> m.metricName.equals("events.dropped")));
+        assertTrue(metrics.stream().anyMatch(m -> m.metricName.equals("events.skipped")));
+    }
+
+    @Test
+    public void prepareMetricsResetsCountersAfterDrain() {
+        collector.recordEventDropped(QUEUE_FULL);
+        collector.prepareMetrics();
+        assertEquals(1, collector.drain().size());
+
+        // no new events recorded, so a second prepare/drain cycle should be empty
+        collector.prepareMetrics();
+        assertEquals(0, collector.drain().size());
+    }
+
+    @Test
+    public void drainClearsQueue() {
+        collector.recordEventDropped(QUEUE_FULL);
+        collector.prepareMetrics();
+        assertEquals(1, collector.drain().size());
+        assertEquals(0, collector.drain().size());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/gateway/BlockResponseFunctionTest.java b/internal-api/src/test/java/datadog/trace/api/gateway/BlockResponseFunctionTest.java
index e07f49ceb12..39b8488d659 100644
--- a/internal-api/src/test/java/datadog/trace/api/gateway/BlockResponseFunctionTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/gateway/BlockResponseFunctionTest.java
@@ -20,122 +20,122 @@
  */
 class BlockResponseFunctionTest {
 
-  private static final Flow.Action.RequestBlockingAction RBA =
-      new Flow.Action.RequestBlockingAction(403, BlockingContentType.AUTO);
+    private static final Flow.Action.RequestBlockingAction RBA =
+            new Flow.Action.RequestBlockingAction(403, BlockingContentType.AUTO);
 
-  @Test
-  void doesNotReportBlockFailureWhenCommitSucceeds() {
-    CountingAppSecContext appSecCtx = new CountingAppSecContext();
-    TestRequestContext ctx = new TestRequestContext(appSecCtx);
-    TestBlockResponseFunction brf = new TestBlockResponseFunction(true);
+    @Test
+    void doesNotReportBlockFailureWhenCommitSucceeds() {
+        CountingAppSecContext appSecCtx = new CountingAppSecContext();
+        TestRequestContext ctx = new TestRequestContext(appSecCtx);
+        TestBlockResponseFunction brf = new TestBlockResponseFunction(true);
 
-    assertTrue(brf.tryCommitBlockingResponse(ctx, RBA));
+        assertTrue(brf.tryCommitBlockingResponse(ctx, RBA));
 
-    assertSame(ctx.traceSegment, brf.lastSegment);
-    assertEquals(403, brf.lastStatusCode);
-    assertEquals(BlockingContentType.AUTO, brf.lastTemplateType);
-    assertEquals(0, appSecCtx.blockFailures);
-  }
-
-  @Test
-  void reportsBlockFailureWhenCommitFails() {
-    CountingAppSecContext appSecCtx = new CountingAppSecContext();
-    TestRequestContext ctx = new TestRequestContext(appSecCtx);
-    TestBlockResponseFunction brf = new TestBlockResponseFunction(false);
-
-    assertFalse(brf.tryCommitBlockingResponse(ctx, RBA));
+        assertSame(ctx.traceSegment, brf.lastSegment);
+        assertEquals(403, brf.lastStatusCode);
+        assertEquals(BlockingContentType.AUTO, brf.lastTemplateType);
+        assertEquals(0, appSecCtx.blockFailures);
+    }
 
-    assertSame(ctx.traceSegment, brf.lastSegment);
-    assertEquals(1, appSecCtx.blockFailures);
-  }
+    @Test
+    void reportsBlockFailureWhenCommitFails() {
+        CountingAppSecContext appSecCtx = new CountingAppSecContext();
+        TestRequestContext ctx = new TestRequestContext(appSecCtx);
+        TestBlockResponseFunction brf = new TestBlockResponseFunction(false);
 
-  @Test
-  void doesNotThrowWhenAppSecSlotDoesNotHoldAnAppSecContext() {
-    TestBlockResponseFunction brf = new TestBlockResponseFunction(false);
+        assertFalse(brf.tryCommitBlockingResponse(ctx, RBA));
 
-    assertFalse(brf.tryCommitBlockingResponse(new TestRequestContext(null), RBA));
-    assertFalse(brf.tryCommitBlockingResponse(new TestRequestContext("not an AppSecContext"), RBA));
-  }
+        assertSame(ctx.traceSegment, brf.lastSegment);
+        assertEquals(1, appSecCtx.blockFailures);
+    }
 
-  private static final class CountingAppSecContext implements AppSecContext {
-    private int blockFailures;
+    @Test
+    void doesNotThrowWhenAppSecSlotDoesNotHoldAnAppSecContext() {
+        TestBlockResponseFunction brf = new TestBlockResponseFunction(false);
 
-    @Override
-    public boolean isManuallyKept() {
-      return false;
+        assertFalse(brf.tryCommitBlockingResponse(new TestRequestContext(null), RBA));
+        assertFalse(brf.tryCommitBlockingResponse(new TestRequestContext("not an AppSecContext"), RBA));
     }
 
-    @Override
-    public void reportBlockFailure() {
-      blockFailures++;
-    }
-  }
+    private static final class CountingAppSecContext implements AppSecContext {
+        private int blockFailures;
 
-  private static final class TestBlockResponseFunction implements BlockResponseFunction {
-    private final boolean committed;
-    private TraceSegment lastSegment;
-    private int lastStatusCode;
-    private BlockingContentType lastTemplateType;
+        @Override
+        public boolean isManuallyKept() {
+            return false;
+        }
 
-    private TestBlockResponseFunction(boolean committed) {
-      this.committed = committed;
+        @Override
+        public void reportBlockFailure() {
+            blockFailures++;
+        }
     }
 
-    @Override
-    public boolean tryCommitBlockingResponse(
-        TraceSegment segment,
-        int statusCode,
-        BlockingContentType templateType,
-        Map<String, String> extraHeaders,
-        String securityResponseId) {
-      this.lastSegment = segment;
-      this.lastStatusCode = statusCode;
-      this.lastTemplateType = templateType;
-      return committed;
+    private static final class TestBlockResponseFunction implements BlockResponseFunction {
+        private final boolean committed;
+        private TraceSegment lastSegment;
+        private int lastStatusCode;
+        private BlockingContentType lastTemplateType;
+
+        private TestBlockResponseFunction(boolean committed) {
+            this.committed = committed;
+        }
+
+        @Override
+        public boolean tryCommitBlockingResponse(
+                TraceSegment segment,
+                int statusCode,
+                BlockingContentType templateType,
+                Map<String, String> extraHeaders,
+                String securityResponseId) {
+            this.lastSegment = segment;
+            this.lastStatusCode = statusCode;
+            this.lastTemplateType = templateType;
+            return committed;
+        }
     }
-  }
 
-  private static final class TestRequestContext implements RequestContext {
-    private final Object appSecData;
-    private final TraceSegment traceSegment = TraceSegment.NoOp.INSTANCE;
+    private static final class TestRequestContext implements RequestContext {
+        private final Object appSecData;
+        private final TraceSegment traceSegment = TraceSegment.NoOp.INSTANCE;
 
-    private TestRequestContext(Object appSecData) {
-      this.appSecData = appSecData;
-    }
+        private TestRequestContext(Object appSecData) {
+            this.appSecData = appSecData;
+        }
 
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T> T getData(RequestContextSlot slot) {
-      return slot == RequestContextSlot.APPSEC ? (T) appSecData : null;
-    }
+        @SuppressWarnings("unchecked")
+        @Override
+        public <T> T getData(RequestContextSlot slot) {
+            return slot == RequestContextSlot.APPSEC ? (T) appSecData : null;
+        }
 
-    @Override
-    public TraceSegment getTraceSegment() {
-      return traceSegment;
-    }
+        @Override
+        public TraceSegment getTraceSegment() {
+            return traceSegment;
+        }
 
-    @Override
-    public void setBlockResponseFunction(BlockResponseFunction blockResponseFunction) {}
+        @Override
+        public void setBlockResponseFunction(BlockResponseFunction blockResponseFunction) {}
 
-    @Override
-    public BlockResponseFunction getBlockResponseFunction() {
-      return null;
-    }
+        @Override
+        public BlockResponseFunction getBlockResponseFunction() {
+            return null;
+        }
 
-    @Override
-    public <T> T getOrCreateMetaStructTop(String key, Function<String, T> defaultValue) {
-      return null;
-    }
+        @Override
+        public <T> T getOrCreateMetaStructTop(String key, Function<String, T> defaultValue) {
+            return null;
+        }
 
-    @Override
-    public void setClientIpAddressData(ClientIpAddressData clientIpAddressData) {}
+        @Override
+        public void setClientIpAddressData(ClientIpAddressData clientIpAddressData) {}
 
-    @Override
-    public ClientIpAddressData getClientIpAddressData() {
-      return null;
-    }
+        @Override
+        public ClientIpAddressData getClientIpAddressData() {
+            return null;
+        }
 
-    @Override
-    public void close() {}
-  }
+        @Override
+        public void close() {}
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/gateway/InferredProxySpanTests.java b/internal-api/src/test/java/datadog/trace/api/gateway/InferredProxySpanTests.java
index 309e8616080..2d89342af27 100644
--- a/internal-api/src/test/java/datadog/trace/api/gateway/InferredProxySpanTests.java
+++ b/internal-api/src/test/java/datadog/trace/api/gateway/InferredProxySpanTests.java
@@ -36,691 +36,688 @@
 
 @DisplayName("InferredProxyContext Tests")
 class InferredProxySpanTests {
-  @Test
-  @DisplayName("Valid headers should make valid span")
-  void testMapConstructor() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-
-    InferredProxySpan inferredProxySpan = InferredProxySpan.fromHeaders(headers);
-    assertTrue(inferredProxySpan.isValid());
-    assertNotNull(
-        inferredProxySpan.start(null), "inferred proxy span start and return new parent context");
-    assertNull(inferredProxySpan.start(null), "inferred proxy span not should start twice");
-    inferredProxySpan.finish();
-  }
-
-  @ParameterizedTest(name = "{0}")
-  @DisplayName("Invalid headers should make invalid span")
-  @MethodSource("invalidHeaders")
-  void testInvalidHeaders(String useCase, Map<String, String> headers) {
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertFalse(inferredProxySpan.isValid(), useCase + " should not be valid");
-    assertNull(inferredProxySpan.start(null), "Invalid inferred proxy span should not start");
-  }
-
-  static Stream<Arguments> invalidHeaders() { // Renamed
-    Map<String, String> missingSystem = new HashMap<>();
-    missingSystem.put(PROXY_START_TIME_MS, "12345");
-
-    Map<String, String> missingTime = new HashMap<>();
-    missingTime.put(PROXY_SYSTEM, "aws-apigateway");
-    Map<String, String> invalidSystem = new HashMap<>();
-    invalidSystem.put(PROXY_START_TIME_MS, "12345");
-    invalidSystem.put(PROXY_SYSTEM, "invalidSystem");
-
-    return Stream.of(
-        of("Missing system headers", missingSystem),
-        of("Missing start time headers", missingTime),
-        of("Invalid system headers", invalidSystem));
-  }
-
-  @Test
-  @DisplayName("Constructor with null should not crash")
-  void testNullMapConstructor() {
-    InferredProxySpan inferredProxySpan = fromHeaders(null);
-    assertNotNull(inferredProxySpan);
-    assertFalse(inferredProxySpan.isValid());
-  }
-
-  @Test
-  @DisplayName("Constructor with empty map should be invalid")
-  void testEmptyMapConstructor() {
-    InferredProxySpan inferredProxySpan = fromHeaders(emptyMap());
-    assertNotNull(inferredProxySpan);
-    assertFalse(inferredProxySpan.isValid());
-  }
-
-  @Test
-  @DisplayName("storeInto and fromContext should correctly attach and retrieve the context")
-  void testStoreAndFromContext() {
-    InferredProxySpan inferredProxySpan = fromHeaders(null);
-    Context context = inferredProxySpan.storeInto(root());
-    assertNotNull(context);
-
-    InferredProxySpan retrieved = fromContext(context);
-    assertNotNull(retrieved);
-
-    assertNull(fromContext(root()), "fromContext on empty context should be null");
-  }
-
-  @Test
-  @DisplayName("Invalid start time should return extracted context")
-  void testInvalidStartTime() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "invalid-number");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertTrue(inferredProxySpan.isValid());
-    assertNull(inferredProxySpan.start(null), "Invalid start time should return null");
-  }
-
-  @Test
-  @DisplayName("Service name should fallback to config when domain name is null")
-  void testServiceNameFallbackNull() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/test");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-    // Service name should use Config.get().getServiceName() when domain name is null
-  }
-
-  @Test
-  @DisplayName("Service name should fallback to config when domain name is empty")
-  void testServiceNameFallbackEmpty() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/test");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-    // Service name should use Config.get().getServiceName() when domain name is empty
-  }
-
-  @Test
-  @DisplayName("HTTP URL should use path only when domain name is null")
-  void testHttpUrlWithoutDomain() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/test");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-    // HTTP URL should be just the path when domain name is null
-  }
-
-  @Test
-  @DisplayName("Resource name should be null when httpMethod is null")
-  void testResourceNameNullMethod() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_PATH, "/test");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-    // Resource name should be null when httpMethod is null
-  }
-
-  @Test
-  @DisplayName("Resource name should be null when path is null")
-  void testResourceNameNullPath() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-    // Resource name should be null when path is null
-  }
-
-  @Test
-  @DisplayName("Finish should handle null span gracefully")
-  void testFinishWithNullSpan() {
-    InferredProxySpan inferredProxySpan = fromHeaders(null);
-    // Should not throw exception when span is null
-    inferredProxySpan.finish();
-    assertFalse(inferredProxySpan.isValid());
-  }
-
-  @Test
-  @DisplayName("Finish should clear span after finishing")
-  void testFinishClearsSpan() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-    inferredProxySpan.finish();
-    // Span should be cleared after finish, so calling finish again should be safe
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("aws-httpapi proxy type should be valid and create span")
-  void testAwsHttpApiProxyType() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-httpapi");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/test");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertTrue(inferredProxySpan.isValid(), "aws-httpapi should be a valid proxy system");
-    assertNotNull(inferredProxySpan.start(null), "aws-httpapi should create a span");
-    inferredProxySpan.finish();
-  }
-
-  @ParameterizedTest(name = "Proxy system: {0}")
-  @DisplayName("Both v1 and v2 proxy systems should be supported")
-  @MethodSource("supportedProxySystems")
-  void testSupportedProxySystems(String proxySystem, String expectedSpanName) {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, proxySystem);
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/api/users");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertTrue(inferredProxySpan.isValid(), proxySystem + " should be valid");
-    assertNotNull(inferredProxySpan.start(null), proxySystem + " should create span");
-    inferredProxySpan.finish();
-  }
-
-  static Stream<Arguments> supportedProxySystems() {
-    return Stream.of(
-        of("aws-apigateway", "aws.apigateway"),
-        of("aws-httpapi", "aws.httpapi"),
-        of("azure-apim", "azure.apim"));
-  }
-
-  @Test
-  @DisplayName("Inferred proxy span should have span.kind=server tag")
-  void testSpanKindServerTag() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/test");
-    headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("aws-httpapi span should also have span.kind=server tag")
-  void testAwsHttpApiSpanKindServerTag() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-httpapi");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "POST");
-    headers.put(InferredProxySpan.PROXY_PATH, "/api/v2/resource");
-    headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("http.url should include https:// scheme when domain name is present")
-  void testHttpUrlWithHttpsScheme() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/api/users");
-    headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    // Expected URL: https://api.example.com/api/users
-
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("http.url should be path only when domain name is null")
-  void testHttpUrlWithoutHttpsSchemeWhenNoDomain() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/api/users");
-    // No PROXY_DOMAIN_NAME
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    // Expected URL: /api/users (no scheme, just path)
-
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("http.url with https scheme should work for aws-httpapi")
-  void testAwsHttpApiHttpUrlWithHttpsScheme() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-httpapi");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "POST");
-    headers.put(InferredProxySpan.PROXY_PATH, "/v2/items");
-    headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "httpapi.example.com");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    // Expected URL: https://httpapi.example.com/v2/items
-
-    inferredProxySpan.finish();
-  }
-
-  // Task 13: Tests for http.route from resourcePath with fallback
-  @Test
-  @DisplayName("http.route should use resourcePath when x-dd-proxy-resource-path is present")
-  void testHttpRouteFromResourcePath() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/api/users/123");
-    headers.put(InferredProxySpan.PROXY_RESOURCE_PATH, "/api/users/{id}");
-    headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    // Expected http.route: /api/users/{id} (from resourcePath)
-
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("http.route should fallback to path when x-dd-proxy-resource-path is not present")
-  void testHttpRouteFallbackToPath() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/api/users/123");
-    // No PROXY_RESOURCE_PATH
-    headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    // Expected http.route: /api/users/123 (fallback to path for backwards compat)
-
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("http.route should use resourcePath for aws-httpapi")
-  void testAwsHttpApiHttpRouteFromResourcePath() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-httpapi");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "POST");
-    headers.put(InferredProxySpan.PROXY_PATH, "/v2/items/abc-123");
-    headers.put(InferredProxySpan.PROXY_RESOURCE_PATH, "/v2/items/{itemId}");
-    headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "httpapi.example.com");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    // Expected http.route: /v2/items/{itemId}
-
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("resource.name should prefer route when resourcePath is present")
-  void testResourceNamePrefersRoute() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/api/users/123");
-    headers.put(InferredProxySpan.PROXY_RESOURCE_PATH, "/api/users/{id}");
-    headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    // Expected resource.name: "GET /api/users/{id}" (uses route from resourcePath)
-
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("resource.name should use path when resourcePath is not present")
-  void testResourceNameFallbackToPath() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/api/users/123");
-    // No PROXY_RESOURCE_PATH
-    headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    // Expected resource.name: "GET /api/users/123" (uses path)
-
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("resource.name should prefer route for POST requests")
-  void testResourceNamePrefersRouteForPost() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-httpapi");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "POST");
-    headers.put(InferredProxySpan.PROXY_PATH, "/v2/orders/order-456");
-    headers.put(InferredProxySpan.PROXY_RESOURCE_PATH, "/v2/orders/{orderId}");
-    headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    // Expected resource.name: "POST /v2/orders/{orderId}"
-
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("resource.name should handle complex route patterns")
-  void testResourceNameWithComplexRoute() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "PUT");
-    headers.put(InferredProxySpan.PROXY_PATH, "/api/v1/users/123/posts/456/comments/789");
-    headers.put(
-        InferredProxySpan.PROXY_RESOURCE_PATH,
-        "/api/v1/users/{userId}/posts/{postId}/comments/{commentId}");
-    headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    // Expected resource.name: "PUT /api/v1/users/{userId}/posts/{postId}/comments/{commentId}"
-
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("resource.name should be null when both httpMethod and path are null")
-  void testResourceNameNullWhenBothNull() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    // No PROXY_HTTP_METHOD and no PROXY_PATH
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    // Expected resource.name: null
-
-    inferredProxySpan.finish();
-  }
-
-  // Note: These tests verify the copyAppSecTagsFromRoot() logic exists and doesn't crash.
-  // Full integration testing of AppSec tag propagation requires the actual tracer
-  // infrastructure and is better suited for integration tests.
-
-  @Test
-  @DisplayName("InferredProxySpan finish should not crash when no AppSec tags present")
-  void testFinishWithoutAppSecTags() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/test");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    // finish() should execute copyAppSecTagsFromRoot() without errors
-    // even when no AppSec tags are present
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("InferredProxySpan finish should handle null root span gracefully")
-  void testFinishWithNullRootSpan() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/test");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    // finish() should handle the case where getLocalRootSpan() might return null
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("InferredProxySpan finish should work for both v1 and v2 proxy types")
-  void testFinishWithDifferentProxyTypes() {
-    // Test with aws-apigateway (v1)
-    Map<String, String> headersV1 = new HashMap<>();
-    headersV1.put(PROXY_START_TIME_MS, "12345");
-    headersV1.put(PROXY_SYSTEM, "aws-apigateway");
-    headersV1.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headersV1.put(InferredProxySpan.PROXY_PATH, "/v1/test");
-
-    InferredProxySpan proxySpanV1 = fromHeaders(headersV1);
-    assertNotNull(proxySpanV1.start(null));
-    proxySpanV1.finish();
-
-    // Test with aws-httpapi (v2)
-    Map<String, String> headersV2 = new HashMap<>();
-    headersV2.put(PROXY_START_TIME_MS, "12345");
-    headersV2.put(PROXY_SYSTEM, "aws-httpapi");
-    headersV2.put(InferredProxySpan.PROXY_HTTP_METHOD, "POST");
-    headersV2.put(InferredProxySpan.PROXY_PATH, "/v2/test");
-
-    InferredProxySpan proxySpanV2 = fromHeaders(headersV2);
-    assertNotNull(proxySpanV2.start(null));
-    proxySpanV2.finish();
-  }
-
-  @Test
-  @DisplayName("InferredProxySpan finish should be idempotent")
-  void testFinishIsIdempotent() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/test");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    // Call finish multiple times - should not crash
-    inferredProxySpan.finish();
-    inferredProxySpan.finish();
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("InferredProxySpan with all headers should finish successfully")
-  void testFinishWithAllHeaders() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/api/users/123");
-    headers.put(InferredProxySpan.PROXY_RESOURCE_PATH, "/api/users/{id}");
-    headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
-    headers.put(InferredProxySpan.STAGE, "prod");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    // With all headers present, finish should work correctly
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("optional API Gateway metadata should exercise ARN tag computation")
-  void testStartWithOptionalApiGatewayMetadata() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers.put(InferredProxySpan.PROXY_PATH, "/api/users/123");
-    headers.put(InferredProxySpan.PROXY_API_ID, "api-id");
-    headers.put(InferredProxySpan.PROXY_REGION, "us-east-1");
-    headers.put(InferredProxySpan.PROXY_ACCOUNT_ID, "123456789012");
-
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-    assertNotNull(inferredProxySpan.start(null));
-
-    inferredProxySpan.finish();
-  }
-
-  @Test
-  @DisplayName("computeArn should support known proxy systems and reject unknown input")
-  void testComputeArn() {
-    InferredProxySpan inferredProxySpan = fromHeaders(null);
-
-    assertEquals(
-        "arn:aws:apigateway:us-east-1::/restapis/api-id",
-        inferredProxySpan.computeArn("aws-apigateway", "us-east-1", "api-id"));
-    assertEquals(
-        "arn:aws:apigateway:us-east-1::/apis/api-id",
-        inferredProxySpan.computeArn("aws-httpapi", "us-east-1", "api-id"));
-    assertNull(inferredProxySpan.computeArn("unknown", "us-east-1", "api-id"));
-    assertNull(inferredProxySpan.computeArn("aws-apigateway", null, "api-id"));
-    assertNull(inferredProxySpan.computeArn("aws-apigateway", "us-east-1", null));
-  }
-
-  @Test
-  @DisplayName("Multiple InferredProxySpan instances should finish independently")
-  void testMultipleProxySpansFinishIndependently() {
-    // Create first proxy span
-    Map<String, String> headers1 = new HashMap<>();
-    headers1.put(PROXY_START_TIME_MS, "12345");
-    headers1.put(PROXY_SYSTEM, "aws-apigateway");
-    headers1.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
-    headers1.put(InferredProxySpan.PROXY_PATH, "/test1");
-
-    InferredProxySpan proxySpan1 = fromHeaders(headers1);
-    assertNotNull(proxySpan1.start(null));
-
-    // Create second proxy span
-    Map<String, String> headers2 = new HashMap<>();
-    headers2.put(PROXY_START_TIME_MS, "12346");
-    headers2.put(PROXY_SYSTEM, "aws-httpapi");
-    headers2.put(InferredProxySpan.PROXY_HTTP_METHOD, "POST");
-    headers2.put(InferredProxySpan.PROXY_PATH, "/test2");
-
-    InferredProxySpan proxySpan2 = fromHeaders(headers2);
-    assertNotNull(proxySpan2.start(null));
-
-    // Finish both - should work independently
-    proxySpan1.finish();
-    proxySpan2.finish();
-  }
-
-  @Test
-  @DisplayName(
-      "finish forwards the Datadog scan/test markers from the service-entry span to the inferred span")
-  void testFinishForwardsSecurityTestingHeaders() throws Exception {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    InferredProxySpan inferredProxySpan = fromHeaders(headers);
-
-    // Replace the real (noop) inferred span with a mock we can verify against. Drive through
-    // the public finish() API so the test stays valid if the internal copy-helper is renamed.
-    AgentSpan mockInferredSpan = mock(AgentSpan.class);
-    // Keep this reflected field name in sync with InferredProxySpan.span.
-    Field spanField = InferredProxySpan.class.getDeclaredField("span");
-    spanField.setAccessible(true);
-    spanField.set(inferredProxySpan, mockInferredSpan);
-
-    AgentSpan serviceEntrySpan = mock(AgentSpan.class);
-    when(serviceEntrySpan.getTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN))
-        .thenReturn("scan-uuid");
-    when(serviceEntrySpan.getTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST))
-        .thenReturn("test-uuid");
-    inferredProxySpan.registerServiceEntrySpan(serviceEntrySpan);
-
-    inferredProxySpan.finish(serviceEntrySpan);
-
-    verify(mockInferredSpan).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN, "scan-uuid");
-    verify(mockInferredSpan).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST, "test-uuid");
-  }
-
-  @Test
-  @DisplayName("finish should phase child calls and publish after service-entry completion")
-  void testFinishPhasesChildCallAndPublishesOnServiceEntry() throws Exception {
-    InferredProxySpan inferredProxySpan = fromHeaders(validHeaders());
-
-    AgentSpan inferredSpan = mock(AgentSpan.class);
-    inferredProxySpan.span = inferredSpan;
-
-    AgentSpan childSpan = mock(AgentSpan.class);
-    when(childSpan.getTag("_dd.appsec.enabled")).thenReturn(Boolean.TRUE);
-    when(childSpan.getTag("_dd.appsec.json")).thenReturn("{\"triggers\":[]}");
-
-    AgentSpan serviceEntrySpan = mock(AgentSpan.class);
-    when(serviceEntrySpan.getHttpStatusCode()).thenReturn((short) 503);
-    when(serviceEntrySpan.getTag(HTTP_USER_AGENT)).thenReturn("curl/8.0");
-    when(serviceEntrySpan.getTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN))
-        .thenReturn("scan-uuid");
-    when(serviceEntrySpan.getTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST))
-        .thenReturn("test-uuid");
-
-    inferredProxySpan.registerServiceEntrySpan(serviceEntrySpan);
-
-    inferredProxySpan.finish(childSpan);
-    inferredProxySpan.finish(childSpan);
-    verify(inferredSpan).setMetric("_dd.appsec.enabled", 1);
-    verify(inferredSpan).setTag("_dd.appsec.json", "{\"triggers\":[]}");
-    verify(inferredSpan, times(1)).phasedFinish();
-    verify(inferredSpan, never()).finish();
-    verify(inferredSpan, never()).publish();
-
-    inferredProxySpan.finish(serviceEntrySpan);
-
-    verify(inferredSpan).setHttpStatusCode(503);
-    verify(inferredSpan).setError(true, HTTP_SERVER_DECORATOR);
-    verify(inferredSpan).setTag(HTTP_USER_AGENT, "curl/8.0");
-    verify(inferredSpan).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN, "scan-uuid");
-    verify(inferredSpan).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST, "test-uuid");
-    verify(inferredSpan).publish();
-    verify(inferredSpan, never()).finish();
-  }
-
-  private static Map<String, String> validHeaders() {
-    Map<String, String> headers = new HashMap<>();
-    headers.put(PROXY_START_TIME_MS, "12345");
-    headers.put(PROXY_SYSTEM, "aws-apigateway");
-    return headers;
-  }
+    @Test
+    @DisplayName("Valid headers should make valid span")
+    void testMapConstructor() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+
+        InferredProxySpan inferredProxySpan = InferredProxySpan.fromHeaders(headers);
+        assertTrue(inferredProxySpan.isValid());
+        assertNotNull(inferredProxySpan.start(null), "inferred proxy span start and return new parent context");
+        assertNull(inferredProxySpan.start(null), "inferred proxy span not should start twice");
+        inferredProxySpan.finish();
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @DisplayName("Invalid headers should make invalid span")
+    @MethodSource("invalidHeaders")
+    void testInvalidHeaders(String useCase, Map<String, String> headers) {
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertFalse(inferredProxySpan.isValid(), useCase + " should not be valid");
+        assertNull(inferredProxySpan.start(null), "Invalid inferred proxy span should not start");
+    }
+
+    static Stream<Arguments> invalidHeaders() { // Renamed
+        Map<String, String> missingSystem = new HashMap<>();
+        missingSystem.put(PROXY_START_TIME_MS, "12345");
+
+        Map<String, String> missingTime = new HashMap<>();
+        missingTime.put(PROXY_SYSTEM, "aws-apigateway");
+        Map<String, String> invalidSystem = new HashMap<>();
+        invalidSystem.put(PROXY_START_TIME_MS, "12345");
+        invalidSystem.put(PROXY_SYSTEM, "invalidSystem");
+
+        return Stream.of(
+                of("Missing system headers", missingSystem),
+                of("Missing start time headers", missingTime),
+                of("Invalid system headers", invalidSystem));
+    }
+
+    @Test
+    @DisplayName("Constructor with null should not crash")
+    void testNullMapConstructor() {
+        InferredProxySpan inferredProxySpan = fromHeaders(null);
+        assertNotNull(inferredProxySpan);
+        assertFalse(inferredProxySpan.isValid());
+    }
+
+    @Test
+    @DisplayName("Constructor with empty map should be invalid")
+    void testEmptyMapConstructor() {
+        InferredProxySpan inferredProxySpan = fromHeaders(emptyMap());
+        assertNotNull(inferredProxySpan);
+        assertFalse(inferredProxySpan.isValid());
+    }
+
+    @Test
+    @DisplayName("storeInto and fromContext should correctly attach and retrieve the context")
+    void testStoreAndFromContext() {
+        InferredProxySpan inferredProxySpan = fromHeaders(null);
+        Context context = inferredProxySpan.storeInto(root());
+        assertNotNull(context);
+
+        InferredProxySpan retrieved = fromContext(context);
+        assertNotNull(retrieved);
+
+        assertNull(fromContext(root()), "fromContext on empty context should be null");
+    }
+
+    @Test
+    @DisplayName("Invalid start time should return extracted context")
+    void testInvalidStartTime() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "invalid-number");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertTrue(inferredProxySpan.isValid());
+        assertNull(inferredProxySpan.start(null), "Invalid start time should return null");
+    }
+
+    @Test
+    @DisplayName("Service name should fallback to config when domain name is null")
+    void testServiceNameFallbackNull() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/test");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+        // Service name should use Config.get().getServiceName() when domain name is null
+    }
+
+    @Test
+    @DisplayName("Service name should fallback to config when domain name is empty")
+    void testServiceNameFallbackEmpty() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/test");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+        // Service name should use Config.get().getServiceName() when domain name is empty
+    }
+
+    @Test
+    @DisplayName("HTTP URL should use path only when domain name is null")
+    void testHttpUrlWithoutDomain() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/test");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+        // HTTP URL should be just the path when domain name is null
+    }
+
+    @Test
+    @DisplayName("Resource name should be null when httpMethod is null")
+    void testResourceNameNullMethod() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_PATH, "/test");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+        // Resource name should be null when httpMethod is null
+    }
+
+    @Test
+    @DisplayName("Resource name should be null when path is null")
+    void testResourceNameNullPath() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+        // Resource name should be null when path is null
+    }
+
+    @Test
+    @DisplayName("Finish should handle null span gracefully")
+    void testFinishWithNullSpan() {
+        InferredProxySpan inferredProxySpan = fromHeaders(null);
+        // Should not throw exception when span is null
+        inferredProxySpan.finish();
+        assertFalse(inferredProxySpan.isValid());
+    }
+
+    @Test
+    @DisplayName("Finish should clear span after finishing")
+    void testFinishClearsSpan() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+        inferredProxySpan.finish();
+        // Span should be cleared after finish, so calling finish again should be safe
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("aws-httpapi proxy type should be valid and create span")
+    void testAwsHttpApiProxyType() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-httpapi");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/test");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertTrue(inferredProxySpan.isValid(), "aws-httpapi should be a valid proxy system");
+        assertNotNull(inferredProxySpan.start(null), "aws-httpapi should create a span");
+        inferredProxySpan.finish();
+    }
+
+    @ParameterizedTest(name = "Proxy system: {0}")
+    @DisplayName("Both v1 and v2 proxy systems should be supported")
+    @MethodSource("supportedProxySystems")
+    void testSupportedProxySystems(String proxySystem, String expectedSpanName) {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, proxySystem);
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/api/users");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertTrue(inferredProxySpan.isValid(), proxySystem + " should be valid");
+        assertNotNull(inferredProxySpan.start(null), proxySystem + " should create span");
+        inferredProxySpan.finish();
+    }
+
+    static Stream<Arguments> supportedProxySystems() {
+        return Stream.of(
+                of("aws-apigateway", "aws.apigateway"),
+                of("aws-httpapi", "aws.httpapi"),
+                of("azure-apim", "azure.apim"));
+    }
+
+    @Test
+    @DisplayName("Inferred proxy span should have span.kind=server tag")
+    void testSpanKindServerTag() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/test");
+        headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("aws-httpapi span should also have span.kind=server tag")
+    void testAwsHttpApiSpanKindServerTag() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-httpapi");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "POST");
+        headers.put(InferredProxySpan.PROXY_PATH, "/api/v2/resource");
+        headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("http.url should include https:// scheme when domain name is present")
+    void testHttpUrlWithHttpsScheme() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/api/users");
+        headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        // Expected URL: https://api.example.com/api/users
+
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("http.url should be path only when domain name is null")
+    void testHttpUrlWithoutHttpsSchemeWhenNoDomain() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/api/users");
+        // No PROXY_DOMAIN_NAME
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        // Expected URL: /api/users (no scheme, just path)
+
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("http.url with https scheme should work for aws-httpapi")
+    void testAwsHttpApiHttpUrlWithHttpsScheme() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-httpapi");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "POST");
+        headers.put(InferredProxySpan.PROXY_PATH, "/v2/items");
+        headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "httpapi.example.com");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        // Expected URL: https://httpapi.example.com/v2/items
+
+        inferredProxySpan.finish();
+    }
+
+    // Task 13: Tests for http.route from resourcePath with fallback
+    @Test
+    @DisplayName("http.route should use resourcePath when x-dd-proxy-resource-path is present")
+    void testHttpRouteFromResourcePath() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/api/users/123");
+        headers.put(InferredProxySpan.PROXY_RESOURCE_PATH, "/api/users/{id}");
+        headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        // Expected http.route: /api/users/{id} (from resourcePath)
+
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("http.route should fallback to path when x-dd-proxy-resource-path is not present")
+    void testHttpRouteFallbackToPath() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/api/users/123");
+        // No PROXY_RESOURCE_PATH
+        headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        // Expected http.route: /api/users/123 (fallback to path for backwards compat)
+
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("http.route should use resourcePath for aws-httpapi")
+    void testAwsHttpApiHttpRouteFromResourcePath() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-httpapi");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "POST");
+        headers.put(InferredProxySpan.PROXY_PATH, "/v2/items/abc-123");
+        headers.put(InferredProxySpan.PROXY_RESOURCE_PATH, "/v2/items/{itemId}");
+        headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "httpapi.example.com");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        // Expected http.route: /v2/items/{itemId}
+
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("resource.name should prefer route when resourcePath is present")
+    void testResourceNamePrefersRoute() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/api/users/123");
+        headers.put(InferredProxySpan.PROXY_RESOURCE_PATH, "/api/users/{id}");
+        headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        // Expected resource.name: "GET /api/users/{id}" (uses route from resourcePath)
+
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("resource.name should use path when resourcePath is not present")
+    void testResourceNameFallbackToPath() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/api/users/123");
+        // No PROXY_RESOURCE_PATH
+        headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        // Expected resource.name: "GET /api/users/123" (uses path)
+
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("resource.name should prefer route for POST requests")
+    void testResourceNamePrefersRouteForPost() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-httpapi");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "POST");
+        headers.put(InferredProxySpan.PROXY_PATH, "/v2/orders/order-456");
+        headers.put(InferredProxySpan.PROXY_RESOURCE_PATH, "/v2/orders/{orderId}");
+        headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        // Expected resource.name: "POST /v2/orders/{orderId}"
+
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("resource.name should handle complex route patterns")
+    void testResourceNameWithComplexRoute() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "PUT");
+        headers.put(InferredProxySpan.PROXY_PATH, "/api/v1/users/123/posts/456/comments/789");
+        headers.put(
+                InferredProxySpan.PROXY_RESOURCE_PATH, "/api/v1/users/{userId}/posts/{postId}/comments/{commentId}");
+        headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        // Expected resource.name: "PUT /api/v1/users/{userId}/posts/{postId}/comments/{commentId}"
+
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("resource.name should be null when both httpMethod and path are null")
+    void testResourceNameNullWhenBothNull() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        // No PROXY_HTTP_METHOD and no PROXY_PATH
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        // Expected resource.name: null
+
+        inferredProxySpan.finish();
+    }
+
+    // Note: These tests verify the copyAppSecTagsFromRoot() logic exists and doesn't crash.
+    // Full integration testing of AppSec tag propagation requires the actual tracer
+    // infrastructure and is better suited for integration tests.
+
+    @Test
+    @DisplayName("InferredProxySpan finish should not crash when no AppSec tags present")
+    void testFinishWithoutAppSecTags() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/test");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        // finish() should execute copyAppSecTagsFromRoot() without errors
+        // even when no AppSec tags are present
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("InferredProxySpan finish should handle null root span gracefully")
+    void testFinishWithNullRootSpan() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/test");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        // finish() should handle the case where getLocalRootSpan() might return null
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("InferredProxySpan finish should work for both v1 and v2 proxy types")
+    void testFinishWithDifferentProxyTypes() {
+        // Test with aws-apigateway (v1)
+        Map<String, String> headersV1 = new HashMap<>();
+        headersV1.put(PROXY_START_TIME_MS, "12345");
+        headersV1.put(PROXY_SYSTEM, "aws-apigateway");
+        headersV1.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headersV1.put(InferredProxySpan.PROXY_PATH, "/v1/test");
+
+        InferredProxySpan proxySpanV1 = fromHeaders(headersV1);
+        assertNotNull(proxySpanV1.start(null));
+        proxySpanV1.finish();
+
+        // Test with aws-httpapi (v2)
+        Map<String, String> headersV2 = new HashMap<>();
+        headersV2.put(PROXY_START_TIME_MS, "12345");
+        headersV2.put(PROXY_SYSTEM, "aws-httpapi");
+        headersV2.put(InferredProxySpan.PROXY_HTTP_METHOD, "POST");
+        headersV2.put(InferredProxySpan.PROXY_PATH, "/v2/test");
+
+        InferredProxySpan proxySpanV2 = fromHeaders(headersV2);
+        assertNotNull(proxySpanV2.start(null));
+        proxySpanV2.finish();
+    }
+
+    @Test
+    @DisplayName("InferredProxySpan finish should be idempotent")
+    void testFinishIsIdempotent() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/test");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        // Call finish multiple times - should not crash
+        inferredProxySpan.finish();
+        inferredProxySpan.finish();
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("InferredProxySpan with all headers should finish successfully")
+    void testFinishWithAllHeaders() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/api/users/123");
+        headers.put(InferredProxySpan.PROXY_RESOURCE_PATH, "/api/users/{id}");
+        headers.put(InferredProxySpan.PROXY_DOMAIN_NAME, "api.example.com");
+        headers.put(InferredProxySpan.STAGE, "prod");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        // With all headers present, finish should work correctly
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("optional API Gateway metadata should exercise ARN tag computation")
+    void testStartWithOptionalApiGatewayMetadata() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers.put(InferredProxySpan.PROXY_PATH, "/api/users/123");
+        headers.put(InferredProxySpan.PROXY_API_ID, "api-id");
+        headers.put(InferredProxySpan.PROXY_REGION, "us-east-1");
+        headers.put(InferredProxySpan.PROXY_ACCOUNT_ID, "123456789012");
+
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+        assertNotNull(inferredProxySpan.start(null));
+
+        inferredProxySpan.finish();
+    }
+
+    @Test
+    @DisplayName("computeArn should support known proxy systems and reject unknown input")
+    void testComputeArn() {
+        InferredProxySpan inferredProxySpan = fromHeaders(null);
+
+        assertEquals(
+                "arn:aws:apigateway:us-east-1::/restapis/api-id",
+                inferredProxySpan.computeArn("aws-apigateway", "us-east-1", "api-id"));
+        assertEquals(
+                "arn:aws:apigateway:us-east-1::/apis/api-id",
+                inferredProxySpan.computeArn("aws-httpapi", "us-east-1", "api-id"));
+        assertNull(inferredProxySpan.computeArn("unknown", "us-east-1", "api-id"));
+        assertNull(inferredProxySpan.computeArn("aws-apigateway", null, "api-id"));
+        assertNull(inferredProxySpan.computeArn("aws-apigateway", "us-east-1", null));
+    }
+
+    @Test
+    @DisplayName("Multiple InferredProxySpan instances should finish independently")
+    void testMultipleProxySpansFinishIndependently() {
+        // Create first proxy span
+        Map<String, String> headers1 = new HashMap<>();
+        headers1.put(PROXY_START_TIME_MS, "12345");
+        headers1.put(PROXY_SYSTEM, "aws-apigateway");
+        headers1.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET");
+        headers1.put(InferredProxySpan.PROXY_PATH, "/test1");
+
+        InferredProxySpan proxySpan1 = fromHeaders(headers1);
+        assertNotNull(proxySpan1.start(null));
+
+        // Create second proxy span
+        Map<String, String> headers2 = new HashMap<>();
+        headers2.put(PROXY_START_TIME_MS, "12346");
+        headers2.put(PROXY_SYSTEM, "aws-httpapi");
+        headers2.put(InferredProxySpan.PROXY_HTTP_METHOD, "POST");
+        headers2.put(InferredProxySpan.PROXY_PATH, "/test2");
+
+        InferredProxySpan proxySpan2 = fromHeaders(headers2);
+        assertNotNull(proxySpan2.start(null));
+
+        // Finish both - should work independently
+        proxySpan1.finish();
+        proxySpan2.finish();
+    }
+
+    @Test
+    @DisplayName("finish forwards the Datadog scan/test markers from the service-entry span to the inferred span")
+    void testFinishForwardsSecurityTestingHeaders() throws Exception {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        InferredProxySpan inferredProxySpan = fromHeaders(headers);
+
+        // Replace the real (noop) inferred span with a mock we can verify against. Drive through
+        // the public finish() API so the test stays valid if the internal copy-helper is renamed.
+        AgentSpan mockInferredSpan = mock(AgentSpan.class);
+        // Keep this reflected field name in sync with InferredProxySpan.span.
+        Field spanField = InferredProxySpan.class.getDeclaredField("span");
+        spanField.setAccessible(true);
+        spanField.set(inferredProxySpan, mockInferredSpan);
+
+        AgentSpan serviceEntrySpan = mock(AgentSpan.class);
+        when(serviceEntrySpan.getTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN))
+                .thenReturn("scan-uuid");
+        when(serviceEntrySpan.getTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST))
+                .thenReturn("test-uuid");
+        inferredProxySpan.registerServiceEntrySpan(serviceEntrySpan);
+
+        inferredProxySpan.finish(serviceEntrySpan);
+
+        verify(mockInferredSpan).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN, "scan-uuid");
+        verify(mockInferredSpan).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST, "test-uuid");
+    }
+
+    @Test
+    @DisplayName("finish should phase child calls and publish after service-entry completion")
+    void testFinishPhasesChildCallAndPublishesOnServiceEntry() throws Exception {
+        InferredProxySpan inferredProxySpan = fromHeaders(validHeaders());
+
+        AgentSpan inferredSpan = mock(AgentSpan.class);
+        inferredProxySpan.span = inferredSpan;
+
+        AgentSpan childSpan = mock(AgentSpan.class);
+        when(childSpan.getTag("_dd.appsec.enabled")).thenReturn(Boolean.TRUE);
+        when(childSpan.getTag("_dd.appsec.json")).thenReturn("{\"triggers\":[]}");
+
+        AgentSpan serviceEntrySpan = mock(AgentSpan.class);
+        when(serviceEntrySpan.getHttpStatusCode()).thenReturn((short) 503);
+        when(serviceEntrySpan.getTag(HTTP_USER_AGENT)).thenReturn("curl/8.0");
+        when(serviceEntrySpan.getTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN))
+                .thenReturn("scan-uuid");
+        when(serviceEntrySpan.getTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST))
+                .thenReturn("test-uuid");
+
+        inferredProxySpan.registerServiceEntrySpan(serviceEntrySpan);
+
+        inferredProxySpan.finish(childSpan);
+        inferredProxySpan.finish(childSpan);
+        verify(inferredSpan).setMetric("_dd.appsec.enabled", 1);
+        verify(inferredSpan).setTag("_dd.appsec.json", "{\"triggers\":[]}");
+        verify(inferredSpan, times(1)).phasedFinish();
+        verify(inferredSpan, never()).finish();
+        verify(inferredSpan, never()).publish();
+
+        inferredProxySpan.finish(serviceEntrySpan);
+
+        verify(inferredSpan).setHttpStatusCode(503);
+        verify(inferredSpan).setError(true, HTTP_SERVER_DECORATOR);
+        verify(inferredSpan).setTag(HTTP_USER_AGENT, "curl/8.0");
+        verify(inferredSpan).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN, "scan-uuid");
+        verify(inferredSpan).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST, "test-uuid");
+        verify(inferredSpan).publish();
+        verify(inferredSpan, never()).finish();
+    }
+
+    private static Map<String, String> validHeaders() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(PROXY_START_TIME_MS, "12345");
+        headers.put(PROXY_SYSTEM, "aws-apigateway");
+        return headers;
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/gateway/InstrumentationGatewayTest.java b/internal-api/src/test/java/datadog/trace/api/gateway/InstrumentationGatewayTest.java
index 145b3b117f6..215a35e07ad 100644
--- a/internal-api/src/test/java/datadog/trace/api/gateway/InstrumentationGatewayTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/gateway/InstrumentationGatewayTest.java
@@ -26,659 +26,661 @@
 import org.junit.jupiter.api.Test;
 
 public class InstrumentationGatewayTest {
-  private InstrumentationGateway gateway;
-  private SubscriptionService ss;
-  private CallbackProvider cbp;
-  private RequestContext context;
-  private Flow<Void> flow;
-  private Callback callback;
-  private Events<Object> events;
-
-  @BeforeEach
-  public void setUp() {
-    gateway = new InstrumentationGateway();
-    ss = gateway.getSubscriptionService(RequestContextSlot.APPSEC);
-    cbp = gateway.getCallbackProvider(RequestContextSlot.APPSEC);
-    context =
-        new RequestContext() {
-          @Override
-          public void close() {}
-
-          @Override
-          public Object getData(RequestContextSlot slot) {
-            return this;
-          }
-
-          @Override
-          public TraceSegment getTraceSegment() {
-            return TraceSegment.NoOp.INSTANCE;
-          }
-
-          @Override
-          public void setBlockResponseFunction(BlockResponseFunction blockResponseFunction) {}
-
-          @Override
-          public BlockResponseFunction getBlockResponseFunction() {
-            return null;
-          }
-
-          @Override
-          public <T> T getOrCreateMetaStructTop(String key, Function<String, T> defaultValue) {
-            return null;
-          }
-
-          @Override
-          public void setClientIpAddressData(ClientIpAddressData clientIpAddressData) {}
-
-          @Override
-          public ClientIpAddressData getClientIpAddressData() {
-            return null;
-          }
-        };
-    flow = new Flow.ResultFlow<>(null);
-    callback = new Callback(context, flow);
-    events = Events.get();
-  }
-
-  @Test
-  public void testGetCallback() {
-    ss.registerCallback(events.requestStarted(), callback);
-    // check event without registered callback
-    assertNull(cbp.getCallback(events.requestEnded()));
-    // check event with registered callback
-    Supplier<Flow<Object>> cback = cbp.getCallback(events.requestStarted());
-    assertEquals(cback, callback);
-    Flow<Object> flow = cback.get();
-    assertEquals(Flow.Action.Noop.INSTANCE, flow.getAction());
-    assertEquals(context, flow.getResult());
-  }
-
-  @Test
-  public void testRegisterCallback() {
-    Subscription s1 = ss.registerCallback(events.requestStarted(), callback);
-    // check event without registered callback
-    assertNull(cbp.getCallback(events.requestEnded()));
-    // check event with registered callback
-    assertEquals(cbp.getCallback(events.requestStarted()), callback);
-    // check that we can register a callback
-    Callback cb = new Callback(context, flow);
-    Subscription s2 = ss.registerCallback(events.requestEnded(), cb);
-    assertNotNull(s2);
-    assertEquals(cbp.getCallback(events.requestEnded()), cb);
-    // check that we can cancel a callback
-    s1.cancel();
-    assertNull(cbp.getCallback(events.requestStarted()));
-    // check that we didn't remove the other callback
-    assertEquals(cbp.getCallback(events.requestEnded()), cb);
-  }
-
-  @Test
-  public void testDoubleRegistration() {
-    ss.registerCallback(events.requestStarted(), callback);
-    // check event with registered callback
-    assertEquals(cbp.getCallback(events.requestStarted()), callback);
-    // check that we can't overwrite the callback
-    IllegalStateException ex =
-        assertThrows(
-            IllegalStateException.class,
-            () -> ss.registerCallback(events.requestStarted(), callback));
-    assertAll(
-        () -> assertTrue(ex.getMessage().startsWith("Trying to overwrite existing callback ")),
-        () -> assertTrue(ex.getMessage().contains(events.requestStarted().toString())));
-  }
-
-  @Test
-  public void testDoubleCancel() {
-    Subscription s1 = ss.registerCallback(events.requestStarted(), callback);
-    // check event with registered callback
-    assertEquals(cbp.getCallback(events.requestStarted()), callback);
-    // check that we can cancel a callback
-    s1.cancel();
-    assertNull(cbp.getCallback(events.requestStarted()));
-    // check that we can cancel a callback
-    s1.cancel();
-    assertNull(cbp.getCallback(events.requestStarted()));
-  }
-
-  @Test
-  public void testNoopAction() {
-    assertFalse(Flow.Action.Noop.INSTANCE.isBlocking());
-  }
-
-  @Test
-  public void testRequestBlockingAction() {
-    Flow.Action.RequestBlockingAction rba =
-        new Flow.Action.RequestBlockingAction(400, BlockingContentType.HTML);
-    assertTrue(rba.isBlocking());
-    assertEquals(400, rba.getStatusCode());
-    assertEquals(BlockingContentType.HTML, rba.getBlockingContentType());
-
-    rba =
-        new Flow.Action.RequestBlockingAction(
-            400,
-            BlockingContentType.HTML,
-            Collections.singletonMap("Location", "https://www.google.com/"));
-    assertTrue(rba.isBlocking());
-    assertEquals(400, rba.getStatusCode());
-    assertEquals(BlockingContentType.HTML, rba.getBlockingContentType());
-    assertEquals("https://www.google.com/", rba.getExtraHeaders().get("Location"));
-
-    rba = Flow.Action.RequestBlockingAction.forRedirect(301, "https://www.google.com/");
-    assertTrue(rba.isBlocking());
-    assertEquals(301, rba.getStatusCode());
-    assertEquals(BlockingContentType.NONE, rba.getBlockingContentType());
-    assertEquals("https://www.google.com/", rba.getExtraHeaders().get("Location"));
-  }
-
-  @Test
-  public void blockResponseFunctionDefaultMethodDelegatesRequestBlockingAction() {
-    TraceSegment segment = TraceSegment.NoOp.INSTANCE;
-    Flow.Action.RequestBlockingAction action =
-        new Flow.Action.RequestBlockingAction(
-            451,
-            BlockingContentType.JSON,
-            Collections.singletonMap("x-blocked", "true"),
-            "security-response-id");
-
-    CapturingBlockResponseFunction blockResponseFunction = new CapturingBlockResponseFunction();
-
-    assertTrue(blockResponseFunction.tryCommitBlockingResponse(segment, action));
-    assertSame(segment, blockResponseFunction.segment);
-    assertEquals(451, blockResponseFunction.statusCode);
-    assertEquals(BlockingContentType.JSON, blockResponseFunction.templateType);
-    assertEquals("true", blockResponseFunction.extraHeaders.get("x-blocked"));
-    assertEquals("security-response-id", blockResponseFunction.securityResponseId);
-  }
-
-  @Test
-  public void testNormalCalls() {
-    // check that we pass through normal calls
-    ss.registerCallback(events.requestStarted(), callback);
-    assertEquals(context, cbp.getCallback(events.requestStarted()).get().getResult());
-    ss.registerCallback(events.requestEnded(), callback);
-    assertEquals(flow, cbp.getCallback(events.requestEnded()).apply(null, null));
-    ss.registerCallback(events.requestHeader(), callback);
-    cbp.getCallback(events.requestHeader()).accept(null, null, null);
-    ss.registerCallback(events.requestHeaderDone(), callback.function);
-    assertEquals(flow, cbp.getCallback(events.requestHeaderDone()).apply(null));
-    ss.registerCallback(events.requestMethodUriRaw(), callback);
-    assertEquals(flow, cbp.getCallback(events.requestMethodUriRaw()).apply(null, null, null));
-    ss.registerCallback(events.requestPathParams(), callback);
-    assertEquals(flow, cbp.getCallback(events.requestPathParams()).apply(null, null));
-    ss.registerCallback(events.requestClientSocketAddress(), callback.asClientSocketAddress());
-    assertEquals(
-        flow, cbp.getCallback(events.requestClientSocketAddress()).apply(null, null, null));
-    ss.registerCallback(events.requestInferredClientAddress(), callback);
-    assertEquals(flow, cbp.getCallback(events.requestInferredClientAddress()).apply(null, null));
-    ss.registerCallback(events.requestBodyStart(), callback.asRequestBodyStart());
-    assertNull(cbp.getCallback(events.requestBodyStart()).apply(null, null));
-    ss.registerCallback(events.requestBodyDone(), callback.asRequestBodyDone());
-    assertEquals(
-        Flow.Action.Noop.INSTANCE,
-        cbp.getCallback(events.requestBodyDone()).apply(null, null).getAction());
-    ss.registerCallback(events.requestBodyProcessed(), callback);
-    assertEquals(
-        Flow.Action.Noop.INSTANCE,
-        cbp.getCallback(events.requestBodyProcessed()).apply(null, null).getAction());
-    ss.registerCallback(events.responseBody(), callback);
-    assertEquals(
-        Flow.Action.Noop.INSTANCE,
-        cbp.getCallback(events.responseBody()).apply(null, null).getAction());
-    ss.registerCallback(events.grpcServerMethod(), callback);
-    assertEquals(
-        Flow.Action.Noop.INSTANCE,
-        cbp.getCallback(events.grpcServerMethod()).apply(null, null).getAction());
-    ss.registerCallback(events.grpcServerRequestMessage(), callback);
-    assertEquals(
-        Flow.Action.Noop.INSTANCE,
-        cbp.getCallback(events.grpcServerRequestMessage()).apply(null, null).getAction());
-    ss.registerCallback(events.responseStarted(), callback);
-    cbp.getCallback(events.responseStarted()).apply(null, null);
-    ss.registerCallback(events.responseHeader(), callback);
-    cbp.getCallback(events.responseHeader()).accept(null, null, null);
-    ss.registerCallback(events.responseHeaderDone(), callback.function);
-    cbp.getCallback(events.responseHeaderDone()).apply(null);
-    ss.registerCallback(events.graphqlServerRequestMessage(), callback);
-    assertEquals(
-        Flow.Action.Noop.INSTANCE,
-        cbp.getCallback(events.graphqlServerRequestMessage()).apply(null, null).getAction());
-    ss.registerCallback(events.databaseConnection(), callback);
-    cbp.getCallback(events.databaseConnection()).accept(null, null);
-    ss.registerCallback(events.databaseSqlQuery(), callback);
-    cbp.getCallback(events.databaseSqlQuery()).apply(null, null);
-    ss.registerCallback(events.httpClientRequest(), callback);
-    cbp.getCallback(events.httpClientRequest()).apply(null, null);
-    ss.registerCallback(events.httpClientResponse(), callback);
-    cbp.getCallback(events.httpClientResponse()).apply(null, null);
-    ss.registerCallback(events.httpClientSampling(), callback);
-    cbp.getCallback(events.httpClientSampling()).apply(null, null);
-    ss.registerCallback(events.fileLoaded(), callback);
-    cbp.getCallback(events.fileLoaded()).apply(null, null);
-    ss.registerCallback(events.user(), callback);
-    cbp.getCallback(events.user()).apply(null, null);
-    ss.registerCallback(events.loginEvent(), callback);
-    cbp.getCallback(events.loginEvent()).apply(null, null, null);
-    ss.registerCallback(events.requestSession(), callback);
-    cbp.getCallback(events.requestSession()).apply(null, null);
-    ss.registerCallback(events.execCmd(), callback);
-    cbp.getCallback(events.execCmd()).apply(null, null);
-    ss.registerCallback(events.shellCmd(), callback);
-    cbp.getCallback(events.shellCmd()).apply(null, null);
-    ss.registerCallback(events.httpRoute(), callback);
-    cbp.getCallback(events.httpRoute()).accept(null, null);
-    ss.registerCallback(events.requestFilesFilenames(), callback);
-    assertEquals(
-        Flow.Action.Noop.INSTANCE,
-        cbp.getCallback(events.requestFilesFilenames()).apply(null, null).getAction());
-    ss.registerCallback(events.requestFilesContent(), callback);
-    assertEquals(
-        Flow.Action.Noop.INSTANCE,
-        cbp.getCallback(events.requestFilesContent()).apply(null, null).getAction());
-    ss.registerCallback(events.fileWritten(), callback);
-    cbp.getCallback(events.fileWritten()).apply(null, null);
-    assertEquals(Events.MAX_EVENTS, callback.count);
-  }
-
-  @Test
-  public void testThrowableBlocking() {
-    Throwback throwback = new Throwback();
-    // check that we block the thrown exceptions
-    ss.registerCallback(events.requestStarted(), throwback);
-    assertEquals(Flow.ResultFlow.empty(), cbp.getCallback(events.requestStarted()).get());
-    ss.registerCallback(events.requestEnded(), throwback);
-    assertEquals(Flow.ResultFlow.empty(), cbp.getCallback(events.requestEnded()).apply(null, null));
-    ss.registerCallback(events.requestHeader(), throwback);
-    cbp.getCallback(events.requestHeader()).accept(null, null, null);
-    ss.registerCallback(events.requestHeaderDone(), throwback.function);
-    assertEquals(Flow.ResultFlow.empty(), cbp.getCallback(events.requestHeaderDone()).apply(null));
-    ss.registerCallback(events.requestMethodUriRaw(), throwback);
-    assertEquals(
-        Flow.ResultFlow.empty(),
-        cbp.getCallback(events.requestMethodUriRaw()).apply(null, null, null));
-    ss.registerCallback(events.requestPathParams(), throwback);
-    assertEquals(
-        Flow.ResultFlow.empty(), cbp.getCallback(events.requestPathParams()).apply(null, null));
-    ss.registerCallback(events.requestClientSocketAddress(), throwback.asClientSocketAddress());
-    assertEquals(
-        Flow.ResultFlow.empty(),
-        cbp.getCallback(events.requestClientSocketAddress()).apply(null, null, null));
-    ss.registerCallback(events.requestInferredClientAddress(), throwback.asInferredClientAddress());
-    assertEquals(
-        Flow.ResultFlow.empty(),
-        cbp.getCallback(events.requestInferredClientAddress()).apply(null, null));
-    ss.registerCallback(events.requestBodyStart(), throwback.asRequestBodyStart());
-    assertNull(cbp.getCallback(events.requestBodyStart()).apply(null, null));
-    ss.registerCallback(events.requestBodyDone(), throwback.asRequestBodyDone());
-    assertEquals(
-        Flow.Action.Noop.INSTANCE,
-        cbp.getCallback(events.requestBodyDone()).apply(null, null).getAction());
-    ss.registerCallback(events.requestBodyProcessed(), throwback);
-    assertEquals(
-        Flow.Action.Noop.INSTANCE,
-        cbp.getCallback(events.requestBodyProcessed()).apply(null, null).getAction());
-    ss.registerCallback(events.responseBody(), throwback);
-    assertEquals(
-        Flow.Action.Noop.INSTANCE,
-        cbp.getCallback(events.responseBody()).apply(null, null).getAction());
-    ss.registerCallback(events.grpcServerMethod(), throwback);
-    assertEquals(
-        Flow.Action.Noop.INSTANCE,
-        cbp.getCallback(events.grpcServerMethod()).apply(null, null).getAction());
-    ss.registerCallback(events.grpcServerRequestMessage(), throwback);
-    assertEquals(
-        Flow.Action.Noop.INSTANCE,
-        cbp.getCallback(events.grpcServerRequestMessage()).apply(null, null).getAction());
-    ss.registerCallback(events.responseStarted(), throwback);
-    cbp.getCallback(events.responseStarted()).apply(null, null);
-    ss.registerCallback(events.responseHeader(), throwback);
-    cbp.getCallback(events.responseHeader()).accept(null, null, null);
-    ss.registerCallback(events.responseHeaderDone(), throwback.function);
-    cbp.getCallback(events.responseHeaderDone()).apply(null);
-    ss.registerCallback(events.graphqlServerRequestMessage(), throwback);
-    assertEquals(
-        Flow.Action.Noop.INSTANCE,
-        cbp.getCallback(events.graphqlServerRequestMessage()).apply(null, null).getAction());
-    ss.registerCallback(events.databaseConnection(), throwback);
-    cbp.getCallback(events.databaseConnection()).accept(null, null);
-    ss.registerCallback(events.databaseSqlQuery(), throwback);
-    cbp.getCallback(events.databaseSqlQuery()).apply(null, null);
-    ss.registerCallback(events.httpClientRequest(), throwback);
-    cbp.getCallback(events.httpClientRequest()).apply(null, null);
-    ss.registerCallback(events.httpClientResponse(), throwback);
-    cbp.getCallback(events.httpClientResponse()).apply(null, null);
-    ss.registerCallback(events.httpClientSampling(), throwback);
-    cbp.getCallback(events.httpClientSampling()).apply(null, null);
-    ss.registerCallback(events.fileLoaded(), throwback);
-    cbp.getCallback(events.fileLoaded()).apply(null, null);
-    ss.registerCallback(events.user(), throwback);
-    cbp.getCallback(events.user()).apply(null, null);
-    ss.registerCallback(events.loginEvent(), throwback);
-    cbp.getCallback(events.loginEvent()).apply(null, null, null);
-    ss.registerCallback(events.requestSession(), throwback);
-    cbp.getCallback(events.requestSession()).apply(null, null);
-    ss.registerCallback(events.execCmd(), throwback);
-    cbp.getCallback(events.execCmd()).apply(null, null);
-    ss.registerCallback(events.shellCmd(), throwback);
-    cbp.getCallback(events.shellCmd()).apply(null, null);
-    ss.registerCallback(events.httpRoute(), throwback);
-    cbp.getCallback(events.httpRoute()).accept(null, null);
-    ss.registerCallback(events.requestFilesFilenames(), throwback);
-    assertEquals(
-        Flow.ResultFlow.empty(), cbp.getCallback(events.requestFilesFilenames()).apply(null, null));
-    ss.registerCallback(events.requestFilesContent(), throwback);
-    assertEquals(
-        Flow.ResultFlow.empty(), cbp.getCallback(events.requestFilesContent()).apply(null, null));
-    ss.registerCallback(events.fileWritten(), throwback);
-    cbp.getCallback(events.fileWritten()).apply(null, null);
-    assertEquals(Events.MAX_EVENTS, throwback.count);
-  }
-
-  @Test
-  public void iastRegistryOperatesIndependently() {
-    SubscriptionService ssIast = gateway.getSubscriptionService(RequestContextSlot.IAST);
-    CallbackProvider cbpIast = gateway.getCallbackProvider(RequestContextSlot.IAST);
-
-    ss.registerCallback(events.requestStarted(), callback);
-    assertNull(cbpIast.getCallback(events.requestStarted()));
-
-    ssIast.registerCallback(events.requestStarted(), callback);
-    assertNotNull(cbpIast.getCallback(events.requestStarted()));
-  }
-
-  @Test
-  public void resettingResetsAllSubsystems() {
-    SubscriptionService ssIast = gateway.getSubscriptionService(RequestContextSlot.IAST);
-    CallbackProvider cbpIast = gateway.getCallbackProvider(RequestContextSlot.IAST);
-
-    ss.registerCallback(events.requestStarted(), callback);
-    ssIast.registerCallback(events.requestStarted(), callback);
-
-    gateway.reset();
-
-    assertNull(cbp.getCallback(events.requestStarted()));
-    assertNull(cbpIast.getCallback(events.requestStarted()));
-  }
-
-  @Test
-  public void invalidRequestContextSlot() {
-    SubscriptionService ss = gateway.getSubscriptionService(null);
-    CallbackProvider cbp = gateway.getCallbackProvider(null);
-
-    assertSame(SubscriptionService.SubscriptionServiceNoop.INSTANCE, ss);
-    assertSame(CallbackProvider.CallbackProviderNoop.INSTANCE, cbp);
-  }
-
-  @Test
-  public void universalCallbackProviderForRequestEnded() {
-    SubscriptionService ssIast = gateway.getSubscriptionService(RequestContextSlot.IAST);
-    final int[] count = new int[1];
-    BiFunction<RequestContext, IGSpanInfo, Flow<Void>> cb =
-        (requestContext, igSpanInfo) -> {
-          assertSame(callback.ctx, requestContext);
-          assertSame(AgentTracer.noopSpan(), igSpanInfo);
-          count[0]++;
-          return new Flow.ResultFlow<>(null);
-        };
-    ss.registerCallback(events.requestEnded(), cb);
-    ssIast.registerCallback(events.requestEnded(), cb);
-    BiFunction<RequestContext, IGSpanInfo, Flow<Void>> uniCb =
-        gateway.getUniversalCallbackProvider().getCallback(events.requestEnded());
-    Flow<Void> res = uniCb.apply(callback.ctx, AgentTracer.noopSpan());
-
-    assertEquals(2, count[0]);
-    assertNotNull(res);
-
-    BiFunction<RequestContext, IGSpanInfo, Flow<Void>> uniCb2 =
-        gateway.getUniversalCallbackProvider().getCallback(events.requestEnded());
-    assertSame(uniCb2, uniCb);
-  }
-
-  @Test
-  public void universalCallbackWithOnlyAppSec() {
-    ss.registerCallback(events.requestEnded(), callback);
-
-    BiFunction<RequestContext, IGSpanInfo, Flow<Void>> uniCb =
-        gateway.getUniversalCallbackProvider().getCallback(events.requestEnded());
-    BiFunction<RequestContext, IGSpanInfo, Flow<Void>> appSecCb =
-        cbp.getCallback(events.requestEnded());
-    assertSame(uniCb, appSecCb);
-  }
-
-  @Test
-  public void universalCallbackWithOnlyIast() {
-    SubscriptionService ssIast = gateway.getSubscriptionService(RequestContextSlot.IAST);
-    CallbackProvider cbpIast = gateway.getCallbackProvider(RequestContextSlot.IAST);
-
-    ssIast.registerCallback(events.requestEnded(), callback);
-
-    BiFunction<RequestContext, IGSpanInfo, Flow<Void>> uniCb =
-        gateway.getUniversalCallbackProvider().getCallback(events.requestEnded());
-    BiFunction<RequestContext, IGSpanInfo, Flow<Void>> iastCb =
-        cbpIast.getCallback(events.requestEnded());
-    assertSame(uniCb, iastCb);
-  }
-
-  @Test
-  public void universalCallbackWithNoCallbacks() {
-    assertNull(gateway.getUniversalCallbackProvider().getCallback(events.requestEnded()));
-  }
-
-  @Test
-  public void mergeFlowIdenticalFlows() {
-    Flow<Void> flow = new Flow.ResultFlow<>(null);
-    Flow<Void> resFlow = InstrumentationGateway.mergeFlows(flow, flow);
-
-    assertSame(flow, resFlow);
-  }
-
-  @Test
-  public void mergeFlowBlockingActionHasPriority() {
-    Flow<Void> flow1 = new Flow.ResultFlow<>(null);
-    Flow<Void> flow2 =
-        new Flow.ResultFlow<Void>(null) {
-          @Override
-          public Action getAction() {
-            return new Action.RequestBlockingAction(410, BlockingContentType.AUTO);
-          }
+    private InstrumentationGateway gateway;
+    private SubscriptionService ss;
+    private CallbackProvider cbp;
+    private RequestContext context;
+    private Flow<Void> flow;
+    private Callback callback;
+    private Events<Object> events;
+
+    @BeforeEach
+    public void setUp() {
+        gateway = new InstrumentationGateway();
+        ss = gateway.getSubscriptionService(RequestContextSlot.APPSEC);
+        cbp = gateway.getCallbackProvider(RequestContextSlot.APPSEC);
+        context = new RequestContext() {
+            @Override
+            public void close() {}
+
+            @Override
+            public Object getData(RequestContextSlot slot) {
+                return this;
+            }
+
+            @Override
+            public TraceSegment getTraceSegment() {
+                return TraceSegment.NoOp.INSTANCE;
+            }
+
+            @Override
+            public void setBlockResponseFunction(BlockResponseFunction blockResponseFunction) {}
+
+            @Override
+            public BlockResponseFunction getBlockResponseFunction() {
+                return null;
+            }
+
+            @Override
+            public <T> T getOrCreateMetaStructTop(String key, Function<String, T> defaultValue) {
+                return null;
+            }
+
+            @Override
+            public void setClientIpAddressData(ClientIpAddressData clientIpAddressData) {}
+
+            @Override
+            public ClientIpAddressData getClientIpAddressData() {
+                return null;
+            }
         };
+        flow = new Flow.ResultFlow<>(null);
+        callback = new Callback(context, flow);
+        events = Events.get();
+    }
 
-    Flow<Void> resFlow1 = InstrumentationGateway.mergeFlows(flow1, flow2);
-    Flow<Void> resFlow2 = InstrumentationGateway.mergeFlows(flow2, flow1);
-
-    assertTrue(resFlow1.getAction().isBlocking());
-    assertTrue(resFlow2.getAction().isBlocking());
-  }
-
-  @Test
-  public void mergeFlowReturnsNonNullResult() {
-    Flow<Integer> flow1 = new Flow.ResultFlow<>(42);
-    Flow<Integer> flow2 = new Flow.ResultFlow<>(null);
-
-    Flow<Integer> resFlow1 = InstrumentationGateway.mergeFlows(flow1, flow2);
-    Flow<Integer> resFlow2 = InstrumentationGateway.mergeFlows(flow2, flow1);
-
-    assertEquals(42, resFlow1.getResult());
-    assertEquals(42, resFlow2.getResult());
-  }
-
-  @Test
-  public void mergeFlowReturnsLatestNonNullResult() {
-    Flow<Integer> flow1 = new Flow.ResultFlow<>(42);
-    Flow<Integer> flow2 = new Flow.ResultFlow<>(43);
-
-    Flow<Integer> resFlow1 = InstrumentationGateway.mergeFlows(flow1, flow2);
-    Flow<Integer> resFlow2 = InstrumentationGateway.mergeFlows(flow2, flow1);
-
-    assertEquals(43, resFlow1.getResult());
-    assertEquals(42, resFlow2.getResult());
-  }
-
-  private static class Callback<D, T>
-      implements Supplier<Flow<D>>,
-          BiConsumer<RequestContext, T>,
-          TriConsumer<RequestContext, T, T>,
-          BiFunction<RequestContext, T, Flow<Void>>,
-          TriFunction<RequestContext, T, T, Flow<Void>> {
-
-    private final RequestContext ctx;
-    private final Flow<Void> flow;
-    private int count = 0;
-    private final Function<RequestContext, Flow<Void>> function;
-
-    public Callback(RequestContext ctx, Flow<Void> flow) {
-      this.ctx = ctx;
-      this.flow = flow;
-      function =
-          input -> {
-            count++;
-            return flow;
-          };
+    @Test
+    public void testGetCallback() {
+        ss.registerCallback(events.requestStarted(), callback);
+        // check event without registered callback
+        assertNull(cbp.getCallback(events.requestEnded()));
+        // check event with registered callback
+        Supplier<Flow<Object>> cback = cbp.getCallback(events.requestStarted());
+        assertEquals(cback, callback);
+        Flow<Object> flow = cback.get();
+        assertEquals(Flow.Action.Noop.INSTANCE, flow.getAction());
+        assertEquals(context, flow.getResult());
     }
 
-    @Override
-    public Flow<Void> apply(RequestContext requestContext, T arg) {
-      count++;
-      return flow;
+    @Test
+    public void testRegisterCallback() {
+        Subscription s1 = ss.registerCallback(events.requestStarted(), callback);
+        // check event without registered callback
+        assertNull(cbp.getCallback(events.requestEnded()));
+        // check event with registered callback
+        assertEquals(cbp.getCallback(events.requestStarted()), callback);
+        // check that we can register a callback
+        Callback cb = new Callback(context, flow);
+        Subscription s2 = ss.registerCallback(events.requestEnded(), cb);
+        assertNotNull(s2);
+        assertEquals(cbp.getCallback(events.requestEnded()), cb);
+        // check that we can cancel a callback
+        s1.cancel();
+        assertNull(cbp.getCallback(events.requestStarted()));
+        // check that we didn't remove the other callback
+        assertEquals(cbp.getCallback(events.requestEnded()), cb);
     }
 
-    @Override
-    public Flow<D> get() {
-      count++;
-      return new Flow.ResultFlow<>((D) ctx);
+    @Test
+    public void testDoubleRegistration() {
+        ss.registerCallback(events.requestStarted(), callback);
+        // check event with registered callback
+        assertEquals(cbp.getCallback(events.requestStarted()), callback);
+        // check that we can't overwrite the callback
+        IllegalStateException ex =
+                assertThrows(IllegalStateException.class, () -> ss.registerCallback(events.requestStarted(), callback));
+        assertAll(
+                () -> assertTrue(ex.getMessage().startsWith("Trying to overwrite existing callback ")),
+                () -> assertTrue(
+                        ex.getMessage().contains(events.requestStarted().toString())));
     }
 
-    @Override
-    public void accept(RequestContext requestContext, T s, T s2) {
-      count++;
+    @Test
+    public void testDoubleCancel() {
+        Subscription s1 = ss.registerCallback(events.requestStarted(), callback);
+        // check event with registered callback
+        assertEquals(cbp.getCallback(events.requestStarted()), callback);
+        // check that we can cancel a callback
+        s1.cancel();
+        assertNull(cbp.getCallback(events.requestStarted()));
+        // check that we can cancel a callback
+        s1.cancel();
+        assertNull(cbp.getCallback(events.requestStarted()));
     }
 
-    public TriFunction<RequestContext, String, Short, Flow<Void>> asClientSocketAddress() {
-      return (requestContext, s, aShort) -> {
-        count++;
-        return flow;
-      };
+    @Test
+    public void testNoopAction() {
+        assertFalse(Flow.Action.Noop.INSTANCE.isBlocking());
     }
 
-    public BiFunction<RequestContext, StoredBodySupplier, Void> asRequestBodyStart() {
-      return (requestContext, storedBodySupplier) -> {
-        count++;
-        return null;
-      };
+    @Test
+    public void testRequestBlockingAction() {
+        Flow.Action.RequestBlockingAction rba = new Flow.Action.RequestBlockingAction(400, BlockingContentType.HTML);
+        assertTrue(rba.isBlocking());
+        assertEquals(400, rba.getStatusCode());
+        assertEquals(BlockingContentType.HTML, rba.getBlockingContentType());
+
+        rba = new Flow.Action.RequestBlockingAction(
+                400, BlockingContentType.HTML, Collections.singletonMap("Location", "https://www.google.com/"));
+        assertTrue(rba.isBlocking());
+        assertEquals(400, rba.getStatusCode());
+        assertEquals(BlockingContentType.HTML, rba.getBlockingContentType());
+        assertEquals("https://www.google.com/", rba.getExtraHeaders().get("Location"));
+
+        rba = Flow.Action.RequestBlockingAction.forRedirect(301, "https://www.google.com/");
+        assertTrue(rba.isBlocking());
+        assertEquals(301, rba.getStatusCode());
+        assertEquals(BlockingContentType.NONE, rba.getBlockingContentType());
+        assertEquals("https://www.google.com/", rba.getExtraHeaders().get("Location"));
     }
 
-    public BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> asRequestBodyDone() {
-      return (requestContext, storedBodySupplier) -> {
-        count++;
-        return new Flow.ResultFlow<>(null);
-      };
+    @Test
+    public void blockResponseFunctionDefaultMethodDelegatesRequestBlockingAction() {
+        TraceSegment segment = TraceSegment.NoOp.INSTANCE;
+        Flow.Action.RequestBlockingAction action = new Flow.Action.RequestBlockingAction(
+                451, BlockingContentType.JSON, Collections.singletonMap("x-blocked", "true"), "security-response-id");
+
+        CapturingBlockResponseFunction blockResponseFunction = new CapturingBlockResponseFunction();
+
+        assertTrue(blockResponseFunction.tryCommitBlockingResponse(segment, action));
+        assertSame(segment, blockResponseFunction.segment);
+        assertEquals(451, blockResponseFunction.statusCode);
+        assertEquals(BlockingContentType.JSON, blockResponseFunction.templateType);
+        assertEquals("true", blockResponseFunction.extraHeaders.get("x-blocked"));
+        assertEquals("security-response-id", blockResponseFunction.securityResponseId);
     }
 
-    @Override
-    public void accept(RequestContext requestContext, T t) {
-      count++;
+    @Test
+    public void testNormalCalls() {
+        // check that we pass through normal calls
+        ss.registerCallback(events.requestStarted(), callback);
+        assertEquals(context, cbp.getCallback(events.requestStarted()).get().getResult());
+        ss.registerCallback(events.requestEnded(), callback);
+        assertEquals(flow, cbp.getCallback(events.requestEnded()).apply(null, null));
+        ss.registerCallback(events.requestHeader(), callback);
+        cbp.getCallback(events.requestHeader()).accept(null, null, null);
+        ss.registerCallback(events.requestHeaderDone(), callback.function);
+        assertEquals(flow, cbp.getCallback(events.requestHeaderDone()).apply(null));
+        ss.registerCallback(events.requestMethodUriRaw(), callback);
+        assertEquals(flow, cbp.getCallback(events.requestMethodUriRaw()).apply(null, null, null));
+        ss.registerCallback(events.requestPathParams(), callback);
+        assertEquals(flow, cbp.getCallback(events.requestPathParams()).apply(null, null));
+        ss.registerCallback(events.requestClientSocketAddress(), callback.asClientSocketAddress());
+        assertEquals(flow, cbp.getCallback(events.requestClientSocketAddress()).apply(null, null, null));
+        ss.registerCallback(events.requestInferredClientAddress(), callback);
+        assertEquals(
+                flow, cbp.getCallback(events.requestInferredClientAddress()).apply(null, null));
+        ss.registerCallback(events.requestBodyStart(), callback.asRequestBodyStart());
+        assertNull(cbp.getCallback(events.requestBodyStart()).apply(null, null));
+        ss.registerCallback(events.requestBodyDone(), callback.asRequestBodyDone());
+        assertEquals(
+                Flow.Action.Noop.INSTANCE,
+                cbp.getCallback(events.requestBodyDone()).apply(null, null).getAction());
+        ss.registerCallback(events.requestBodyProcessed(), callback);
+        assertEquals(
+                Flow.Action.Noop.INSTANCE,
+                cbp.getCallback(events.requestBodyProcessed()).apply(null, null).getAction());
+        ss.registerCallback(events.responseBody(), callback);
+        assertEquals(
+                Flow.Action.Noop.INSTANCE,
+                cbp.getCallback(events.responseBody()).apply(null, null).getAction());
+        ss.registerCallback(events.grpcServerMethod(), callback);
+        assertEquals(
+                Flow.Action.Noop.INSTANCE,
+                cbp.getCallback(events.grpcServerMethod()).apply(null, null).getAction());
+        ss.registerCallback(events.grpcServerRequestMessage(), callback);
+        assertEquals(
+                Flow.Action.Noop.INSTANCE,
+                cbp.getCallback(events.grpcServerRequestMessage())
+                        .apply(null, null)
+                        .getAction());
+        ss.registerCallback(events.responseStarted(), callback);
+        cbp.getCallback(events.responseStarted()).apply(null, null);
+        ss.registerCallback(events.responseHeader(), callback);
+        cbp.getCallback(events.responseHeader()).accept(null, null, null);
+        ss.registerCallback(events.responseHeaderDone(), callback.function);
+        cbp.getCallback(events.responseHeaderDone()).apply(null);
+        ss.registerCallback(events.graphqlServerRequestMessage(), callback);
+        assertEquals(
+                Flow.Action.Noop.INSTANCE,
+                cbp.getCallback(events.graphqlServerRequestMessage())
+                        .apply(null, null)
+                        .getAction());
+        ss.registerCallback(events.databaseConnection(), callback);
+        cbp.getCallback(events.databaseConnection()).accept(null, null);
+        ss.registerCallback(events.databaseSqlQuery(), callback);
+        cbp.getCallback(events.databaseSqlQuery()).apply(null, null);
+        ss.registerCallback(events.httpClientRequest(), callback);
+        cbp.getCallback(events.httpClientRequest()).apply(null, null);
+        ss.registerCallback(events.httpClientResponse(), callback);
+        cbp.getCallback(events.httpClientResponse()).apply(null, null);
+        ss.registerCallback(events.httpClientSampling(), callback);
+        cbp.getCallback(events.httpClientSampling()).apply(null, null);
+        ss.registerCallback(events.fileLoaded(), callback);
+        cbp.getCallback(events.fileLoaded()).apply(null, null);
+        ss.registerCallback(events.user(), callback);
+        cbp.getCallback(events.user()).apply(null, null);
+        ss.registerCallback(events.loginEvent(), callback);
+        cbp.getCallback(events.loginEvent()).apply(null, null, null);
+        ss.registerCallback(events.requestSession(), callback);
+        cbp.getCallback(events.requestSession()).apply(null, null);
+        ss.registerCallback(events.execCmd(), callback);
+        cbp.getCallback(events.execCmd()).apply(null, null);
+        ss.registerCallback(events.shellCmd(), callback);
+        cbp.getCallback(events.shellCmd()).apply(null, null);
+        ss.registerCallback(events.httpRoute(), callback);
+        cbp.getCallback(events.httpRoute()).accept(null, null);
+        ss.registerCallback(events.requestFilesFilenames(), callback);
+        assertEquals(
+                Flow.Action.Noop.INSTANCE,
+                cbp.getCallback(events.requestFilesFilenames())
+                        .apply(null, null)
+                        .getAction());
+        ss.registerCallback(events.requestFilesContent(), callback);
+        assertEquals(
+                Flow.Action.Noop.INSTANCE,
+                cbp.getCallback(events.requestFilesContent()).apply(null, null).getAction());
+        ss.registerCallback(events.fileWritten(), callback);
+        cbp.getCallback(events.fileWritten()).apply(null, null);
+        assertEquals(Events.MAX_EVENTS, callback.count);
     }
 
-    @Override
-    public Flow<Void> apply(RequestContext requestContext, T t, T t2) {
-      count++;
-      return flow;
+    @Test
+    public void testThrowableBlocking() {
+        Throwback throwback = new Throwback();
+        // check that we block the thrown exceptions
+        ss.registerCallback(events.requestStarted(), throwback);
+        assertEquals(
+                Flow.ResultFlow.empty(),
+                cbp.getCallback(events.requestStarted()).get());
+        ss.registerCallback(events.requestEnded(), throwback);
+        assertEquals(
+                Flow.ResultFlow.empty(), cbp.getCallback(events.requestEnded()).apply(null, null));
+        ss.registerCallback(events.requestHeader(), throwback);
+        cbp.getCallback(events.requestHeader()).accept(null, null, null);
+        ss.registerCallback(events.requestHeaderDone(), throwback.function);
+        assertEquals(
+                Flow.ResultFlow.empty(),
+                cbp.getCallback(events.requestHeaderDone()).apply(null));
+        ss.registerCallback(events.requestMethodUriRaw(), throwback);
+        assertEquals(
+                Flow.ResultFlow.empty(),
+                cbp.getCallback(events.requestMethodUriRaw()).apply(null, null, null));
+        ss.registerCallback(events.requestPathParams(), throwback);
+        assertEquals(
+                Flow.ResultFlow.empty(),
+                cbp.getCallback(events.requestPathParams()).apply(null, null));
+        ss.registerCallback(events.requestClientSocketAddress(), throwback.asClientSocketAddress());
+        assertEquals(
+                Flow.ResultFlow.empty(),
+                cbp.getCallback(events.requestClientSocketAddress()).apply(null, null, null));
+        ss.registerCallback(events.requestInferredClientAddress(), throwback.asInferredClientAddress());
+        assertEquals(
+                Flow.ResultFlow.empty(),
+                cbp.getCallback(events.requestInferredClientAddress()).apply(null, null));
+        ss.registerCallback(events.requestBodyStart(), throwback.asRequestBodyStart());
+        assertNull(cbp.getCallback(events.requestBodyStart()).apply(null, null));
+        ss.registerCallback(events.requestBodyDone(), throwback.asRequestBodyDone());
+        assertEquals(
+                Flow.Action.Noop.INSTANCE,
+                cbp.getCallback(events.requestBodyDone()).apply(null, null).getAction());
+        ss.registerCallback(events.requestBodyProcessed(), throwback);
+        assertEquals(
+                Flow.Action.Noop.INSTANCE,
+                cbp.getCallback(events.requestBodyProcessed()).apply(null, null).getAction());
+        ss.registerCallback(events.responseBody(), throwback);
+        assertEquals(
+                Flow.Action.Noop.INSTANCE,
+                cbp.getCallback(events.responseBody()).apply(null, null).getAction());
+        ss.registerCallback(events.grpcServerMethod(), throwback);
+        assertEquals(
+                Flow.Action.Noop.INSTANCE,
+                cbp.getCallback(events.grpcServerMethod()).apply(null, null).getAction());
+        ss.registerCallback(events.grpcServerRequestMessage(), throwback);
+        assertEquals(
+                Flow.Action.Noop.INSTANCE,
+                cbp.getCallback(events.grpcServerRequestMessage())
+                        .apply(null, null)
+                        .getAction());
+        ss.registerCallback(events.responseStarted(), throwback);
+        cbp.getCallback(events.responseStarted()).apply(null, null);
+        ss.registerCallback(events.responseHeader(), throwback);
+        cbp.getCallback(events.responseHeader()).accept(null, null, null);
+        ss.registerCallback(events.responseHeaderDone(), throwback.function);
+        cbp.getCallback(events.responseHeaderDone()).apply(null);
+        ss.registerCallback(events.graphqlServerRequestMessage(), throwback);
+        assertEquals(
+                Flow.Action.Noop.INSTANCE,
+                cbp.getCallback(events.graphqlServerRequestMessage())
+                        .apply(null, null)
+                        .getAction());
+        ss.registerCallback(events.databaseConnection(), throwback);
+        cbp.getCallback(events.databaseConnection()).accept(null, null);
+        ss.registerCallback(events.databaseSqlQuery(), throwback);
+        cbp.getCallback(events.databaseSqlQuery()).apply(null, null);
+        ss.registerCallback(events.httpClientRequest(), throwback);
+        cbp.getCallback(events.httpClientRequest()).apply(null, null);
+        ss.registerCallback(events.httpClientResponse(), throwback);
+        cbp.getCallback(events.httpClientResponse()).apply(null, null);
+        ss.registerCallback(events.httpClientSampling(), throwback);
+        cbp.getCallback(events.httpClientSampling()).apply(null, null);
+        ss.registerCallback(events.fileLoaded(), throwback);
+        cbp.getCallback(events.fileLoaded()).apply(null, null);
+        ss.registerCallback(events.user(), throwback);
+        cbp.getCallback(events.user()).apply(null, null);
+        ss.registerCallback(events.loginEvent(), throwback);
+        cbp.getCallback(events.loginEvent()).apply(null, null, null);
+        ss.registerCallback(events.requestSession(), throwback);
+        cbp.getCallback(events.requestSession()).apply(null, null);
+        ss.registerCallback(events.execCmd(), throwback);
+        cbp.getCallback(events.execCmd()).apply(null, null);
+        ss.registerCallback(events.shellCmd(), throwback);
+        cbp.getCallback(events.shellCmd()).apply(null, null);
+        ss.registerCallback(events.httpRoute(), throwback);
+        cbp.getCallback(events.httpRoute()).accept(null, null);
+        ss.registerCallback(events.requestFilesFilenames(), throwback);
+        assertEquals(
+                Flow.ResultFlow.empty(),
+                cbp.getCallback(events.requestFilesFilenames()).apply(null, null));
+        ss.registerCallback(events.requestFilesContent(), throwback);
+        assertEquals(
+                Flow.ResultFlow.empty(),
+                cbp.getCallback(events.requestFilesContent()).apply(null, null));
+        ss.registerCallback(events.fileWritten(), throwback);
+        cbp.getCallback(events.fileWritten()).apply(null, null);
+        assertEquals(Events.MAX_EVENTS, throwback.count);
     }
-  }
-
-  private static final class CapturingBlockResponseFunction implements BlockResponseFunction {
-    private TraceSegment segment;
-    private int statusCode;
-    private BlockingContentType templateType;
-    private Map<String, String> extraHeaders;
-    private String securityResponseId;
-
-    @Override
-    public boolean tryCommitBlockingResponse(
-        TraceSegment segment,
-        int statusCode,
-        BlockingContentType templateType,
-        Map<String, String> extraHeaders,
-        String securityResponseId) {
-      this.segment = segment;
-      this.statusCode = statusCode;
-      this.templateType = templateType;
-      this.extraHeaders = extraHeaders;
-      this.securityResponseId = securityResponseId;
-      return true;
+
+    @Test
+    public void iastRegistryOperatesIndependently() {
+        SubscriptionService ssIast = gateway.getSubscriptionService(RequestContextSlot.IAST);
+        CallbackProvider cbpIast = gateway.getCallbackProvider(RequestContextSlot.IAST);
+
+        ss.registerCallback(events.requestStarted(), callback);
+        assertNull(cbpIast.getCallback(events.requestStarted()));
+
+        ssIast.registerCallback(events.requestStarted(), callback);
+        assertNotNull(cbpIast.getCallback(events.requestStarted()));
     }
-  }
 
-  private static class Throwback<D, T>
-      implements Supplier<Flow<D>>,
-          BiConsumer<RequestContext, T>,
-          TriConsumer<RequestContext, T, T>,
-          BiFunction<RequestContext, T, Flow<Void>>,
-          TriFunction<RequestContext, T, T, Flow<Void>> {
+    @Test
+    public void resettingResetsAllSubsystems() {
+        SubscriptionService ssIast = gateway.getSubscriptionService(RequestContextSlot.IAST);
+        CallbackProvider cbpIast = gateway.getCallbackProvider(RequestContextSlot.IAST);
+
+        ss.registerCallback(events.requestStarted(), callback);
+        ssIast.registerCallback(events.requestStarted(), callback);
+
+        gateway.reset();
+
+        assertNull(cbp.getCallback(events.requestStarted()));
+        assertNull(cbpIast.getCallback(events.requestStarted()));
+    }
 
-    private int count = 0;
+    @Test
+    public void invalidRequestContextSlot() {
+        SubscriptionService ss = gateway.getSubscriptionService(null);
+        CallbackProvider cbp = gateway.getCallbackProvider(null);
 
-    private final Function<RequestContext, Flow<Void>> function =
-        input -> {
-          count++;
-          throw new IllegalArgumentException();
+        assertSame(SubscriptionService.SubscriptionServiceNoop.INSTANCE, ss);
+        assertSame(CallbackProvider.CallbackProviderNoop.INSTANCE, cbp);
+    }
+
+    @Test
+    public void universalCallbackProviderForRequestEnded() {
+        SubscriptionService ssIast = gateway.getSubscriptionService(RequestContextSlot.IAST);
+        final int[] count = new int[1];
+        BiFunction<RequestContext, IGSpanInfo, Flow<Void>> cb = (requestContext, igSpanInfo) -> {
+            assertSame(callback.ctx, requestContext);
+            assertSame(AgentTracer.noopSpan(), igSpanInfo);
+            count[0]++;
+            return new Flow.ResultFlow<>(null);
         };
+        ss.registerCallback(events.requestEnded(), cb);
+        ssIast.registerCallback(events.requestEnded(), cb);
+        BiFunction<RequestContext, IGSpanInfo, Flow<Void>> uniCb =
+                gateway.getUniversalCallbackProvider().getCallback(events.requestEnded());
+        Flow<Void> res = uniCb.apply(callback.ctx, AgentTracer.noopSpan());
+
+        assertEquals(2, count[0]);
+        assertNotNull(res);
+
+        BiFunction<RequestContext, IGSpanInfo, Flow<Void>> uniCb2 =
+                gateway.getUniversalCallbackProvider().getCallback(events.requestEnded());
+        assertSame(uniCb2, uniCb);
+    }
+
+    @Test
+    public void universalCallbackWithOnlyAppSec() {
+        ss.registerCallback(events.requestEnded(), callback);
 
-    @Override
-    public Flow<Void> apply(RequestContext requestContext, T arg) {
-      count++;
-      throw new IllegalArgumentException();
+        BiFunction<RequestContext, IGSpanInfo, Flow<Void>> uniCb =
+                gateway.getUniversalCallbackProvider().getCallback(events.requestEnded());
+        BiFunction<RequestContext, IGSpanInfo, Flow<Void>> appSecCb = cbp.getCallback(events.requestEnded());
+        assertSame(uniCb, appSecCb);
     }
 
-    @Override
-    public Flow<D> get() {
-      count++;
-      throw new IllegalArgumentException();
+    @Test
+    public void universalCallbackWithOnlyIast() {
+        SubscriptionService ssIast = gateway.getSubscriptionService(RequestContextSlot.IAST);
+        CallbackProvider cbpIast = gateway.getCallbackProvider(RequestContextSlot.IAST);
+
+        ssIast.registerCallback(events.requestEnded(), callback);
+
+        BiFunction<RequestContext, IGSpanInfo, Flow<Void>> uniCb =
+                gateway.getUniversalCallbackProvider().getCallback(events.requestEnded());
+        BiFunction<RequestContext, IGSpanInfo, Flow<Void>> iastCb = cbpIast.getCallback(events.requestEnded());
+        assertSame(uniCb, iastCb);
     }
 
-    @Override
-    public void accept(RequestContext requestContext, T s, T s2) {
-      count++;
-      throw new IllegalArgumentException();
+    @Test
+    public void universalCallbackWithNoCallbacks() {
+        assertNull(gateway.getUniversalCallbackProvider().getCallback(events.requestEnded()));
     }
 
-    @Override
-    public void accept(RequestContext requestContext, T t) {
-      count++;
-      throw new IllegalArgumentException();
+    @Test
+    public void mergeFlowIdenticalFlows() {
+        Flow<Void> flow = new Flow.ResultFlow<>(null);
+        Flow<Void> resFlow = InstrumentationGateway.mergeFlows(flow, flow);
+
+        assertSame(flow, resFlow);
     }
 
-    public TriFunction<RequestContext, String, Short, Flow<Void>> asClientSocketAddress() {
-      return (requestContext, s, aShort) -> {
-        count++;
-        throw new IllegalArgumentException();
-      };
+    @Test
+    public void mergeFlowBlockingActionHasPriority() {
+        Flow<Void> flow1 = new Flow.ResultFlow<>(null);
+        Flow<Void> flow2 = new Flow.ResultFlow<Void>(null) {
+            @Override
+            public Action getAction() {
+                return new Action.RequestBlockingAction(410, BlockingContentType.AUTO);
+            }
+        };
+
+        Flow<Void> resFlow1 = InstrumentationGateway.mergeFlows(flow1, flow2);
+        Flow<Void> resFlow2 = InstrumentationGateway.mergeFlows(flow2, flow1);
+
+        assertTrue(resFlow1.getAction().isBlocking());
+        assertTrue(resFlow2.getAction().isBlocking());
     }
 
-    public BiFunction<RequestContext, String, Flow<Void>> asInferredClientAddress() {
-      return (requestContext, s) -> {
-        count++;
-        throw new IllegalArgumentException();
-      };
+    @Test
+    public void mergeFlowReturnsNonNullResult() {
+        Flow<Integer> flow1 = new Flow.ResultFlow<>(42);
+        Flow<Integer> flow2 = new Flow.ResultFlow<>(null);
+
+        Flow<Integer> resFlow1 = InstrumentationGateway.mergeFlows(flow1, flow2);
+        Flow<Integer> resFlow2 = InstrumentationGateway.mergeFlows(flow2, flow1);
+
+        assertEquals(42, resFlow1.getResult());
+        assertEquals(42, resFlow2.getResult());
     }
 
-    public BiFunction<RequestContext, StoredBodySupplier, Void> asRequestBodyStart() {
-      return (requestContext, storedBodySupplier) -> {
-        count++;
-        throw new IllegalArgumentException();
-      };
+    @Test
+    public void mergeFlowReturnsLatestNonNullResult() {
+        Flow<Integer> flow1 = new Flow.ResultFlow<>(42);
+        Flow<Integer> flow2 = new Flow.ResultFlow<>(43);
+
+        Flow<Integer> resFlow1 = InstrumentationGateway.mergeFlows(flow1, flow2);
+        Flow<Integer> resFlow2 = InstrumentationGateway.mergeFlows(flow2, flow1);
+
+        assertEquals(43, resFlow1.getResult());
+        assertEquals(42, resFlow2.getResult());
+    }
+
+    private static class Callback<D, T>
+            implements Supplier<Flow<D>>,
+                    BiConsumer<RequestContext, T>,
+                    TriConsumer<RequestContext, T, T>,
+                    BiFunction<RequestContext, T, Flow<Void>>,
+                    TriFunction<RequestContext, T, T, Flow<Void>> {
+
+        private final RequestContext ctx;
+        private final Flow<Void> flow;
+        private int count = 0;
+        private final Function<RequestContext, Flow<Void>> function;
+
+        public Callback(RequestContext ctx, Flow<Void> flow) {
+            this.ctx = ctx;
+            this.flow = flow;
+            function = input -> {
+                count++;
+                return flow;
+            };
+        }
+
+        @Override
+        public Flow<Void> apply(RequestContext requestContext, T arg) {
+            count++;
+            return flow;
+        }
+
+        @Override
+        public Flow<D> get() {
+            count++;
+            return new Flow.ResultFlow<>((D) ctx);
+        }
+
+        @Override
+        public void accept(RequestContext requestContext, T s, T s2) {
+            count++;
+        }
+
+        public TriFunction<RequestContext, String, Short, Flow<Void>> asClientSocketAddress() {
+            return (requestContext, s, aShort) -> {
+                count++;
+                return flow;
+            };
+        }
+
+        public BiFunction<RequestContext, StoredBodySupplier, Void> asRequestBodyStart() {
+            return (requestContext, storedBodySupplier) -> {
+                count++;
+                return null;
+            };
+        }
+
+        public BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> asRequestBodyDone() {
+            return (requestContext, storedBodySupplier) -> {
+                count++;
+                return new Flow.ResultFlow<>(null);
+            };
+        }
+
+        @Override
+        public void accept(RequestContext requestContext, T t) {
+            count++;
+        }
+
+        @Override
+        public Flow<Void> apply(RequestContext requestContext, T t, T t2) {
+            count++;
+            return flow;
+        }
     }
 
-    public BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> asRequestBodyDone() {
-      return (requestContext, storedBodySupplier) -> {
-        count++;
-        throw new IllegalArgumentException();
-      };
+    private static final class CapturingBlockResponseFunction implements BlockResponseFunction {
+        private TraceSegment segment;
+        private int statusCode;
+        private BlockingContentType templateType;
+        private Map<String, String> extraHeaders;
+        private String securityResponseId;
+
+        @Override
+        public boolean tryCommitBlockingResponse(
+                TraceSegment segment,
+                int statusCode,
+                BlockingContentType templateType,
+                Map<String, String> extraHeaders,
+                String securityResponseId) {
+            this.segment = segment;
+            this.statusCode = statusCode;
+            this.templateType = templateType;
+            this.extraHeaders = extraHeaders;
+            this.securityResponseId = securityResponseId;
+            return true;
+        }
     }
 
-    @Override
-    public Flow<Void> apply(RequestContext requestContext, T t, T t2) {
-      count++;
-      throw new IllegalArgumentException();
+    private static class Throwback<D, T>
+            implements Supplier<Flow<D>>,
+                    BiConsumer<RequestContext, T>,
+                    TriConsumer<RequestContext, T, T>,
+                    BiFunction<RequestContext, T, Flow<Void>>,
+                    TriFunction<RequestContext, T, T, Flow<Void>> {
+
+        private int count = 0;
+
+        private final Function<RequestContext, Flow<Void>> function = input -> {
+            count++;
+            throw new IllegalArgumentException();
+        };
+
+        @Override
+        public Flow<Void> apply(RequestContext requestContext, T arg) {
+            count++;
+            throw new IllegalArgumentException();
+        }
+
+        @Override
+        public Flow<D> get() {
+            count++;
+            throw new IllegalArgumentException();
+        }
+
+        @Override
+        public void accept(RequestContext requestContext, T s, T s2) {
+            count++;
+            throw new IllegalArgumentException();
+        }
+
+        @Override
+        public void accept(RequestContext requestContext, T t) {
+            count++;
+            throw new IllegalArgumentException();
+        }
+
+        public TriFunction<RequestContext, String, Short, Flow<Void>> asClientSocketAddress() {
+            return (requestContext, s, aShort) -> {
+                count++;
+                throw new IllegalArgumentException();
+            };
+        }
+
+        public BiFunction<RequestContext, String, Flow<Void>> asInferredClientAddress() {
+            return (requestContext, s) -> {
+                count++;
+                throw new IllegalArgumentException();
+            };
+        }
+
+        public BiFunction<RequestContext, StoredBodySupplier, Void> asRequestBodyStart() {
+            return (requestContext, storedBodySupplier) -> {
+                count++;
+                throw new IllegalArgumentException();
+            };
+        }
+
+        public BiFunction<RequestContext, StoredBodySupplier, Flow<Void>> asRequestBodyDone() {
+            return (requestContext, storedBodySupplier) -> {
+                count++;
+                throw new IllegalArgumentException();
+            };
+        }
+
+        @Override
+        public Flow<Void> apply(RequestContext requestContext, T t, T t2) {
+            count++;
+            throw new IllegalArgumentException();
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/http/MultipartContentDecoderTest.java b/internal-api/src/test/java/datadog/trace/api/http/MultipartContentDecoderTest.java
index cddffb6a7de..055ee1b10db 100644
--- a/internal-api/src/test/java/datadog/trace/api/http/MultipartContentDecoderTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/http/MultipartContentDecoderTest.java
@@ -15,209 +15,199 @@
 
 public class MultipartContentDecoderTest {
 
-  @Test
-  void decodeBytesUsesDeclaredUtf8Charset() {
-    String text = "héllo wörld";
-    byte[] bytes = text.getBytes(StandardCharsets.UTF_8);
-    assertEquals(
-        text,
-        MultipartContentDecoder.decodeBytes(bytes, bytes.length, "text/plain; charset=UTF-8"));
-  }
-
-  @Test
-  void decodeBytesUsesDeclaredIso88591Charset() {
-    String text = "café";
-    byte[] bytes = text.getBytes(StandardCharsets.ISO_8859_1);
-    assertEquals(
-        text,
-        MultipartContentDecoder.decodeBytes(bytes, bytes.length, "text/plain; charset=ISO-8859-1"));
-  }
-
-  @Test
-  void decodeBytesDefaultsToMachineDefaultWhenNoCharset() {
-    String text = "hello world";
-    byte[] bytes = text.getBytes(StandardCharsets.UTF_8);
-    assertEquals(text, MultipartContentDecoder.decodeBytes(bytes, bytes.length, "text/plain"));
-  }
-
-  @Test
-  void decodeBytesDefaultsToMachineDefaultWhenNullContentType() {
-    String text = "hello world";
-    byte[] bytes = text.getBytes(StandardCharsets.UTF_8);
-    assertEquals(text, MultipartContentDecoder.decodeBytes(bytes, bytes.length, null));
-  }
-
-  @Test
-  void decodeBytesRespectsLengthParameter() {
-    byte[] bytes = "hello world".getBytes(StandardCharsets.UTF_8);
-    assertEquals("hello", MultipartContentDecoder.decodeBytes(bytes, 5, null));
-  }
-
-  @Test
-  void decodeBytesReturnsEmptyStringForZeroLength() {
-    assertEquals("", MultipartContentDecoder.decodeBytes(new byte[16], 0, null));
-  }
-
-  @Test
-  void decodeBytesReplacesMalformedBytesWithReplacementCharacterUsingDeclaredCharset() {
-    // 0xE9 (ISO-8859-1 'é') is not valid UTF-8; REPLACE substitutes U+FFFD
-    byte[] bytes = "café".getBytes(StandardCharsets.ISO_8859_1);
-    assertEquals(
-        "caf�",
-        MultipartContentDecoder.decodeBytes(bytes, bytes.length, "text/plain; charset=UTF-8"));
-  }
-
-  @Test
-  void decodeBytesHandlesTruncationAtMultibyteCharacterBoundary() {
-    // "€" encodes as 3 bytes in UTF-8: E2 82 AC
-    byte[] complete = "hello€".getBytes(StandardCharsets.UTF_8); // 8 bytes
-    // Pass only 6 bytes: "hello" + first byte of "€" (incomplete sequence)
-    String result = MultipartContentDecoder.decodeBytes(complete, 6, "text/plain; charset=UTF-8");
-    // Incomplete sequence → U+FFFD with declared charset, not fallback to JVM default
-    assertEquals("hello�", result);
-  }
-
-  @ParameterizedTest
-  @NullAndEmptySource
-  void extractCharsetReturnsNullForNullOrEmptyContentType(String contentType) {
-    assertNull(MultipartContentDecoder.extractCharset(contentType));
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"text/plain", "image/jpeg", "application/octet-stream"})
-  void extractCharsetReturnsNullForContentTypeWithoutCharset(String contentType) {
-    assertNull(MultipartContentDecoder.extractCharset(contentType));
-  }
-
-  @Test
-  void extractCharsetReturnsNullForInvalidCharsetName() {
-    assertNull(MultipartContentDecoder.extractCharset("text/plain; charset=NOTACHARSET"));
-  }
-
-  @ParameterizedTest
-  @ValueSource(
-      strings = {
-        "text/plain; CHARSET=UTF-8",
-        "text/plain; Charset=UTF-8",
-        "text/plain; charset=utf-8"
-      })
-  void extractCharsetIsCaseInsensitive(String contentType) {
-    assertEquals("UTF-8", MultipartContentDecoder.extractCharset(contentType).name());
-  }
-
-  @ParameterizedTest
-  @CsvSource({"text/plain; charset=UTF-8, UTF-8", "text/xml; charset=ISO-8859-1, ISO-8859-1"})
-  void extractCharsetFromStandardContentType(String contentType, String expectedCharset) {
-    assertEquals(expectedCharset, MultipartContentDecoder.extractCharset(contentType).name());
-  }
-
-  @ParameterizedTest
-  @ValueSource(
-      strings = {
-        "text/plain;\tcharset=ISO-8859-1",
-        "text/plain; \tcharset=ISO-8859-1",
-        "text/plain;\t charset=ISO-8859-1"
-      })
-  void extractCharsetAcceptsTabAsParameterBoundary(String contentType) {
-    // RFC 7230 optional whitespace (OWS) allows both space and horizontal tab before a parameter
-    assertEquals("ISO-8859-1", MultipartContentDecoder.extractCharset(contentType).name());
-  }
-
-  @ParameterizedTest
-  @ValueSource(
-      strings = {
-        "text/plain; charset = ISO-8859-1",
-        "text/plain; charset =ISO-8859-1",
-        "text/plain; charset= ISO-8859-1"
-      })
-  void extractCharsetAcceptsWhitespaceAroundEqualsSign(String contentType) {
-    assertEquals("ISO-8859-1", MultipartContentDecoder.extractCharset(contentType).name());
-  }
-
-  @Test
-  void extractCharsetContinuesSearchAfterInvalidCharsetValue() {
-    // The first "charset" parameter is invalid; a later, valid one must still be found.
-    assertEquals(
-        "UTF-8",
-        MultipartContentDecoder.extractCharset("text/plain; charset=NOTACHARSET; charset=UTF-8")
-            .name());
-  }
-
-  @Test
-  void extractCharsetIgnoresCharsetLookingSubstringInsideQuotedParameterValue() {
-    // The quoted boundary value contains "charset=" but must be treated as opaque text, not a
-    // real charset parameter; the actual charset= that follows must be used.
-    assertEquals(
-        "UTF-8",
-        MultipartContentDecoder.extractCharset(
-                "text/plain; boundary=\"charset=oops\"; charset=UTF-8")
-            .name());
-  }
-
-  @Test
-  void extractCharsetReturnsNullWhenOnlyMatchIsInsideQuotedParameterValue() {
-    assertNull(MultipartContentDecoder.extractCharset("text/plain; boundary=\"charset=oops\""));
-  }
-
-  @Test
-  void extractCharsetIgnoresSubstringMatchInParameterName() {
-    // "xcharset=UTF-16" must not match; the real "charset=UTF-8" that follows must be used
-    assertEquals(
-        "UTF-8",
-        MultipartContentDecoder.extractCharset("text/plain; xcharset=UTF-16; charset=UTF-8")
-            .name());
-  }
-
-  @Test
-  void extractCharsetReturnsNullWhenOnlySubstringMatchExists() {
-    assertNull(MultipartContentDecoder.extractCharset("text/plain; xcharset=UTF-8"));
-  }
-
-  @Test
-  void extractCharsetHandlesAdditionalParameters() {
-    assertEquals(
-        "UTF-8",
-        MultipartContentDecoder.extractCharset("text/plain; charset=UTF-8; boundary=something")
-            .name());
-  }
-
-  @ParameterizedTest
-  @CsvSource({
-    "text/plain; charset=\"UTF-8\", UTF-8",
-    "text/xml; charset=\"ISO-8859-1\", ISO-8859-1"
-  })
-  void extractCharsetHandlesQuotedCharsetValue(String contentType, String expectedCharset) {
-    assertEquals(expectedCharset, MultipartContentDecoder.extractCharset(contentType).name());
-  }
-
-  @Test
-  void decodeBytesUsesQuotedDeclaredCharset() {
-    String text = "café";
-    byte[] bytes = text.getBytes(StandardCharsets.ISO_8859_1);
-    assertEquals(
-        text,
-        MultipartContentDecoder.decodeBytes(
-            bytes, bytes.length, "text/plain; charset=\"ISO-8859-1\""));
-  }
-
-  @Test
-  void readInputStreamTruncatesAtMaxBytes() throws IOException {
-    byte[] data = "hello world".getBytes(StandardCharsets.UTF_8);
-    assertEquals(
-        "hello", MultipartContentDecoder.readInputStream(new ByteArrayInputStream(data), 5, null));
-  }
-
-  @Test
-  void readInputStreamHandlesMultipleReadCallsToFillBuffer() throws IOException {
-    byte[] data = "hello world".getBytes(StandardCharsets.UTF_8);
-    // InputStream that returns 2 bytes per read() call to exercise the accumulation loop.
-    InputStream slow =
-        new ByteArrayInputStream(data) {
-          @Override
-          public synchronized int read(byte[] b, int off, int len) {
-            return super.read(b, off, Math.min(len, 2));
-          }
+    @Test
+    void decodeBytesUsesDeclaredUtf8Charset() {
+        String text = "héllo wörld";
+        byte[] bytes = text.getBytes(StandardCharsets.UTF_8);
+        assertEquals(text, MultipartContentDecoder.decodeBytes(bytes, bytes.length, "text/plain; charset=UTF-8"));
+    }
+
+    @Test
+    void decodeBytesUsesDeclaredIso88591Charset() {
+        String text = "café";
+        byte[] bytes = text.getBytes(StandardCharsets.ISO_8859_1);
+        assertEquals(text, MultipartContentDecoder.decodeBytes(bytes, bytes.length, "text/plain; charset=ISO-8859-1"));
+    }
+
+    @Test
+    void decodeBytesDefaultsToMachineDefaultWhenNoCharset() {
+        String text = "hello world";
+        byte[] bytes = text.getBytes(StandardCharsets.UTF_8);
+        assertEquals(text, MultipartContentDecoder.decodeBytes(bytes, bytes.length, "text/plain"));
+    }
+
+    @Test
+    void decodeBytesDefaultsToMachineDefaultWhenNullContentType() {
+        String text = "hello world";
+        byte[] bytes = text.getBytes(StandardCharsets.UTF_8);
+        assertEquals(text, MultipartContentDecoder.decodeBytes(bytes, bytes.length, null));
+    }
+
+    @Test
+    void decodeBytesRespectsLengthParameter() {
+        byte[] bytes = "hello world".getBytes(StandardCharsets.UTF_8);
+        assertEquals("hello", MultipartContentDecoder.decodeBytes(bytes, 5, null));
+    }
+
+    @Test
+    void decodeBytesReturnsEmptyStringForZeroLength() {
+        assertEquals("", MultipartContentDecoder.decodeBytes(new byte[16], 0, null));
+    }
+
+    @Test
+    void decodeBytesReplacesMalformedBytesWithReplacementCharacterUsingDeclaredCharset() {
+        // 0xE9 (ISO-8859-1 'é') is not valid UTF-8; REPLACE substitutes U+FFFD
+        byte[] bytes = "café".getBytes(StandardCharsets.ISO_8859_1);
+        assertEquals("caf�", MultipartContentDecoder.decodeBytes(bytes, bytes.length, "text/plain; charset=UTF-8"));
+    }
+
+    @Test
+    void decodeBytesHandlesTruncationAtMultibyteCharacterBoundary() {
+        // "€" encodes as 3 bytes in UTF-8: E2 82 AC
+        byte[] complete = "hello€".getBytes(StandardCharsets.UTF_8); // 8 bytes
+        // Pass only 6 bytes: "hello" + first byte of "€" (incomplete sequence)
+        String result = MultipartContentDecoder.decodeBytes(complete, 6, "text/plain; charset=UTF-8");
+        // Incomplete sequence → U+FFFD with declared charset, not fallback to JVM default
+        assertEquals("hello�", result);
+    }
+
+    @ParameterizedTest
+    @NullAndEmptySource
+    void extractCharsetReturnsNullForNullOrEmptyContentType(String contentType) {
+        assertNull(MultipartContentDecoder.extractCharset(contentType));
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"text/plain", "image/jpeg", "application/octet-stream"})
+    void extractCharsetReturnsNullForContentTypeWithoutCharset(String contentType) {
+        assertNull(MultipartContentDecoder.extractCharset(contentType));
+    }
+
+    @Test
+    void extractCharsetReturnsNullForInvalidCharsetName() {
+        assertNull(MultipartContentDecoder.extractCharset("text/plain; charset=NOTACHARSET"));
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"text/plain; CHARSET=UTF-8", "text/plain; Charset=UTF-8", "text/plain; charset=utf-8"})
+    void extractCharsetIsCaseInsensitive(String contentType) {
+        assertEquals(
+                "UTF-8", MultipartContentDecoder.extractCharset(contentType).name());
+    }
+
+    @ParameterizedTest
+    @CsvSource({"text/plain; charset=UTF-8, UTF-8", "text/xml; charset=ISO-8859-1, ISO-8859-1"})
+    void extractCharsetFromStandardContentType(String contentType, String expectedCharset) {
+        assertEquals(
+                expectedCharset,
+                MultipartContentDecoder.extractCharset(contentType).name());
+    }
+
+    @ParameterizedTest
+    @ValueSource(
+            strings = {
+                "text/plain;\tcharset=ISO-8859-1",
+                "text/plain; \tcharset=ISO-8859-1",
+                "text/plain;\t charset=ISO-8859-1"
+            })
+    void extractCharsetAcceptsTabAsParameterBoundary(String contentType) {
+        // RFC 7230 optional whitespace (OWS) allows both space and horizontal tab before a parameter
+        assertEquals(
+                "ISO-8859-1",
+                MultipartContentDecoder.extractCharset(contentType).name());
+    }
+
+    @ParameterizedTest
+    @ValueSource(
+            strings = {
+                "text/plain; charset = ISO-8859-1",
+                "text/plain; charset =ISO-8859-1",
+                "text/plain; charset= ISO-8859-1"
+            })
+    void extractCharsetAcceptsWhitespaceAroundEqualsSign(String contentType) {
+        assertEquals(
+                "ISO-8859-1",
+                MultipartContentDecoder.extractCharset(contentType).name());
+    }
+
+    @Test
+    void extractCharsetContinuesSearchAfterInvalidCharsetValue() {
+        // The first "charset" parameter is invalid; a later, valid one must still be found.
+        assertEquals(
+                "UTF-8",
+                MultipartContentDecoder.extractCharset("text/plain; charset=NOTACHARSET; charset=UTF-8")
+                        .name());
+    }
+
+    @Test
+    void extractCharsetIgnoresCharsetLookingSubstringInsideQuotedParameterValue() {
+        // The quoted boundary value contains "charset=" but must be treated as opaque text, not a
+        // real charset parameter; the actual charset= that follows must be used.
+        assertEquals(
+                "UTF-8",
+                MultipartContentDecoder.extractCharset("text/plain; boundary=\"charset=oops\"; charset=UTF-8")
+                        .name());
+    }
+
+    @Test
+    void extractCharsetReturnsNullWhenOnlyMatchIsInsideQuotedParameterValue() {
+        assertNull(MultipartContentDecoder.extractCharset("text/plain; boundary=\"charset=oops\""));
+    }
+
+    @Test
+    void extractCharsetIgnoresSubstringMatchInParameterName() {
+        // "xcharset=UTF-16" must not match; the real "charset=UTF-8" that follows must be used
+        assertEquals(
+                "UTF-8",
+                MultipartContentDecoder.extractCharset("text/plain; xcharset=UTF-16; charset=UTF-8")
+                        .name());
+    }
+
+    @Test
+    void extractCharsetReturnsNullWhenOnlySubstringMatchExists() {
+        assertNull(MultipartContentDecoder.extractCharset("text/plain; xcharset=UTF-8"));
+    }
+
+    @Test
+    void extractCharsetHandlesAdditionalParameters() {
+        assertEquals(
+                "UTF-8",
+                MultipartContentDecoder.extractCharset("text/plain; charset=UTF-8; boundary=something")
+                        .name());
+    }
+
+    @ParameterizedTest
+    @CsvSource({"text/plain; charset=\"UTF-8\", UTF-8", "text/xml; charset=\"ISO-8859-1\", ISO-8859-1"})
+    void extractCharsetHandlesQuotedCharsetValue(String contentType, String expectedCharset) {
+        assertEquals(
+                expectedCharset,
+                MultipartContentDecoder.extractCharset(contentType).name());
+    }
+
+    @Test
+    void decodeBytesUsesQuotedDeclaredCharset() {
+        String text = "café";
+        byte[] bytes = text.getBytes(StandardCharsets.ISO_8859_1);
+        assertEquals(
+                text, MultipartContentDecoder.decodeBytes(bytes, bytes.length, "text/plain; charset=\"ISO-8859-1\""));
+    }
+
+    @Test
+    void readInputStreamTruncatesAtMaxBytes() throws IOException {
+        byte[] data = "hello world".getBytes(StandardCharsets.UTF_8);
+        assertEquals("hello", MultipartContentDecoder.readInputStream(new ByteArrayInputStream(data), 5, null));
+    }
+
+    @Test
+    void readInputStreamHandlesMultipleReadCallsToFillBuffer() throws IOException {
+        byte[] data = "hello world".getBytes(StandardCharsets.UTF_8);
+        // InputStream that returns 2 bytes per read() call to exercise the accumulation loop.
+        InputStream slow = new ByteArrayInputStream(data) {
+            @Override
+            public synchronized int read(byte[] b, int off, int len) {
+                return super.read(b, off, Math.min(len, 2));
+            }
         };
-    assertEquals("hello world", MultipartContentDecoder.readInputStream(slow, data.length, null));
-  }
+        assertEquals("hello world", MultipartContentDecoder.readInputStream(slow, data.length, null));
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/iast/HttpReqquestEndModuleTestImpl.java b/internal-api/src/test/java/datadog/trace/api/iast/HttpReqquestEndModuleTestImpl.java
index ecaa2d010ef..08e287a4ecc 100644
--- a/internal-api/src/test/java/datadog/trace/api/iast/HttpReqquestEndModuleTestImpl.java
+++ b/internal-api/src/test/java/datadog/trace/api/iast/HttpReqquestEndModuleTestImpl.java
@@ -4,6 +4,6 @@
 import datadog.trace.api.iast.sink.HttpRequestEndModule;
 
 public class HttpReqquestEndModuleTestImpl implements HttpRequestEndModule {
-  @Override
-  public void onRequestEnd(IastContext ctx, IGSpanInfo span) {}
+    @Override
+    public void onRequestEnd(IastContext ctx, IGSpanInfo span) {}
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/llmobs/GenAiApmTagsTest.java b/internal-api/src/test/java/datadog/trace/api/llmobs/GenAiApmTagsTest.java
index 0fef8aaf1af..f7dff18910f 100644
--- a/internal-api/src/test/java/datadog/trace/api/llmobs/GenAiApmTagsTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/llmobs/GenAiApmTagsTest.java
@@ -18,210 +18,206 @@
 import org.junit.jupiter.api.Test;
 
 class GenAiApmTagsTest {
-  private static final String LLMOBS_TAG_PREFIX = "_ml_obs_tag.";
-  private static final String LLMOBS_METRIC_PREFIX = "_ml_obs_metric.";
-
-  private final Map<String, Object> tags = new HashMap<>();
-  private AgentSpan span;
-
-  @BeforeEach
-  void setUp() {
-    span = mock(AgentSpan.class);
-    when(span.getTag(anyString())).thenAnswer(call -> tags.get(call.<String>getArgument(0)));
-    when(span.setTag(anyString(), anyString()))
-        .thenAnswer(
-            call -> {
-              tags.put(call.getArgument(0), call.getArgument(1));
-              return span;
-            });
-    when(span.setMetric(any(CharSequence.class), anyDouble()))
-        .thenAnswer(
-            call -> {
-              tags.put(call.<CharSequence>getArgument(0).toString(), call.getArgument(1));
-              return span;
-            });
-  }
-
-  @Test
-  void llmSpanEmitsEveryScalarAndTokenUsage() {
-    llmObsTag(Tags.SPAN_KIND, Tags.LLMOBS_LLM_SPAN_KIND);
-    llmObsTag(LLMObsTags.MODEL_NAME, "gpt-4");
-    llmObsTag(LLMObsTags.MODEL_PROVIDER, "OpenAI");
-    llmObsTag(LLMObsTags.ML_APP, "my-app");
-    llmObsTag(LLMObsTags.SESSION_ID, "sess-1");
-    llmObsMetric("input_tokens", 10);
-    llmObsMetric("output_tokens", 20);
-    llmObsMetric("total_tokens", 30);
-    llmObsMetric("cache_read_input_tokens", 4);
-    llmObsMetric("cache_write_input_tokens", 5);
-    llmObsMetric("reasoning_output_tokens", 6);
-
-    GenAiApmTags.apply(span);
-
-    assertEquals(Tags.LLMOBS_LLM_SPAN_KIND, tags.get(GenAiApmTags.OPERATION_NAME));
-    assertEquals("gpt-4", tags.get(GenAiApmTags.REQUEST_MODEL));
-    assertEquals("openai", tags.get(GenAiApmTags.PROVIDER_NAME));
-    assertEquals("my-app", tags.get(GenAiApmTags.APPLICATION_NAME));
-    assertEquals("sess-1", tags.get(GenAiApmTags.CONVERSATION_ID));
-    assertEquals(10.0, tags.get(GenAiApmTags.USAGE_INPUT_TOKENS));
-    assertEquals(20.0, tags.get(GenAiApmTags.USAGE_OUTPUT_TOKENS));
-    assertEquals(30.0, tags.get(GenAiApmTags.USAGE_TOTAL_TOKENS));
-    assertEquals(4.0, tags.get(GenAiApmTags.USAGE_CACHE_READ_INPUT_TOKENS));
-    assertEquals(5.0, tags.get(GenAiApmTags.USAGE_CACHE_WRITE_INPUT_TOKENS));
-    assertEquals(6.0, tags.get(GenAiApmTags.USAGE_REASONING_OUTPUT_TOKENS));
-    assertEquals("true", tags.get(GenAiApmTags.ARTIFICIAL_TAGS));
-  }
-
-  @Test
-  void modelBackedSpanWithoutModelFallsBackToCustom() {
-    llmObsTag(Tags.SPAN_KIND, Tags.LLMOBS_EMBEDDING_SPAN_KIND);
-
-    GenAiApmTags.apply(span);
-
-    assertEquals("custom", tags.get(GenAiApmTags.REQUEST_MODEL));
-    assertEquals("custom", tags.get(GenAiApmTags.PROVIDER_NAME));
-  }
-
-  @Test
-  void emptyModelValuesAreTreatedAsAbsent() {
-    llmObsTag(Tags.SPAN_KIND, Tags.LLMOBS_LLM_SPAN_KIND);
-    llmObsTag(LLMObsTags.MODEL_NAME, "");
-    llmObsTag(LLMObsTags.MODEL_PROVIDER, "");
-    llmObsTag(LLMObsTags.ML_APP, "");
-    llmObsTag(LLMObsTags.SESSION_ID, "");
-
-    GenAiApmTags.apply(span);
-
-    assertEquals("custom", tags.get(GenAiApmTags.REQUEST_MODEL));
-    assertEquals("custom", tags.get(GenAiApmTags.PROVIDER_NAME));
-    assertNull(tags.get(GenAiApmTags.APPLICATION_NAME));
-    assertNull(tags.get(GenAiApmTags.CONVERSATION_ID));
-  }
-
-  @Test
-  void nonModelBackedSpanKeepsExplicitModelFieldsWithoutFallbacks() {
-    llmObsTag(Tags.SPAN_KIND, Tags.LLMOBS_AGENT_SPAN_KIND);
-    llmObsTag(LLMObsTags.MODEL_NAME, "gpt-4");
-    llmObsTag(LLMObsTags.MODEL_PROVIDER, "OpenAI");
-
-    GenAiApmTags.apply(span);
-
-    assertEquals(Tags.LLMOBS_AGENT_SPAN_KIND, tags.get(GenAiApmTags.OPERATION_NAME));
-    assertEquals("gpt-4", tags.get(GenAiApmTags.REQUEST_MODEL));
-    assertEquals("openai", tags.get(GenAiApmTags.PROVIDER_NAME));
-  }
-
-  @Test
-  void nonModelBackedSpanWithoutModelEmitsNoModelFields() {
-    llmObsTag(Tags.SPAN_KIND, Tags.LLMOBS_WORKFLOW_SPAN_KIND);
-
-    GenAiApmTags.apply(span);
-
-    assertFalse(tags.containsKey(GenAiApmTags.REQUEST_MODEL));
-    assertFalse(tags.containsKey(GenAiApmTags.PROVIDER_NAME));
-  }
-
-  @Test
-  void nonModelBackedSpanDropsTokenUsage() {
-    llmObsTag(Tags.SPAN_KIND, Tags.LLMOBS_TASK_SPAN_KIND);
-    llmObsMetric("input_tokens", 10);
-
-    GenAiApmTags.apply(span);
-
-    assertFalse(tags.containsKey(GenAiApmTags.USAGE_INPUT_TOKENS));
-  }
-
-  @Test
-  void nonNumericTokenMetricIsSkipped() {
-    llmObsTag(Tags.SPAN_KIND, Tags.LLMOBS_LLM_SPAN_KIND);
-    tags.put(LLMOBS_METRIC_PREFIX + "input_tokens", "not-a-number");
-
-    GenAiApmTags.apply(span);
-
-    assertFalse(tags.containsKey(GenAiApmTags.USAGE_INPUT_TOKENS));
-  }
-
-  @Test
-  void spanWithoutLlmObsKindEmitsNothing() {
-    llmObsTag(LLMObsTags.MODEL_NAME, "gpt-4");
-
-    GenAiApmTags.apply(span);
-
-    assertTrue(tags.keySet().stream().noneMatch(key -> key.startsWith("gen_ai.")));
-    assertFalse(tags.containsKey(GenAiApmTags.ARTIFICIAL_TAGS));
-  }
-
-  @Test
-  void nullSpanIsANoOp() {
-    GenAiApmTags.apply(null);
-    GenAiApmTags.apply(null, Tags.LLMOBS_LLM_SPAN_KIND, "gpt-4", "app");
-  }
-
-  @Test
-  void argumentsStandInForMissingLlmObsTags() {
-    llmObsTag(LLMObsTags.MODEL_PROVIDER, "OpenAI");
-
-    GenAiApmTags.apply(span, Tags.LLMOBS_LLM_SPAN_KIND, "gpt-4", "my-app");
-
-    assertEquals(Tags.LLMOBS_LLM_SPAN_KIND, tags.get(GenAiApmTags.OPERATION_NAME));
-    assertEquals("gpt-4", tags.get(GenAiApmTags.REQUEST_MODEL));
-    assertEquals("openai", tags.get(GenAiApmTags.PROVIDER_NAME));
-    assertEquals("my-app", tags.get(GenAiApmTags.APPLICATION_NAME));
-    assertFalse(tags.containsKey(GenAiApmTags.CONVERSATION_ID));
-    assertFalse(tags.containsKey(GenAiApmTags.USAGE_INPUT_TOKENS));
-  }
+    private static final String LLMOBS_TAG_PREFIX = "_ml_obs_tag.";
+    private static final String LLMOBS_METRIC_PREFIX = "_ml_obs_metric.";
+
+    private final Map<String, Object> tags = new HashMap<>();
+    private AgentSpan span;
+
+    @BeforeEach
+    void setUp() {
+        span = mock(AgentSpan.class);
+        when(span.getTag(anyString())).thenAnswer(call -> tags.get(call.<String>getArgument(0)));
+        when(span.setTag(anyString(), anyString())).thenAnswer(call -> {
+            tags.put(call.getArgument(0), call.getArgument(1));
+            return span;
+        });
+        when(span.setMetric(any(CharSequence.class), anyDouble())).thenAnswer(call -> {
+            tags.put(call.<CharSequence>getArgument(0).toString(), call.getArgument(1));
+            return span;
+        });
+    }
+
+    @Test
+    void llmSpanEmitsEveryScalarAndTokenUsage() {
+        llmObsTag(Tags.SPAN_KIND, Tags.LLMOBS_LLM_SPAN_KIND);
+        llmObsTag(LLMObsTags.MODEL_NAME, "gpt-4");
+        llmObsTag(LLMObsTags.MODEL_PROVIDER, "OpenAI");
+        llmObsTag(LLMObsTags.ML_APP, "my-app");
+        llmObsTag(LLMObsTags.SESSION_ID, "sess-1");
+        llmObsMetric("input_tokens", 10);
+        llmObsMetric("output_tokens", 20);
+        llmObsMetric("total_tokens", 30);
+        llmObsMetric("cache_read_input_tokens", 4);
+        llmObsMetric("cache_write_input_tokens", 5);
+        llmObsMetric("reasoning_output_tokens", 6);
+
+        GenAiApmTags.apply(span);
+
+        assertEquals(Tags.LLMOBS_LLM_SPAN_KIND, tags.get(GenAiApmTags.OPERATION_NAME));
+        assertEquals("gpt-4", tags.get(GenAiApmTags.REQUEST_MODEL));
+        assertEquals("openai", tags.get(GenAiApmTags.PROVIDER_NAME));
+        assertEquals("my-app", tags.get(GenAiApmTags.APPLICATION_NAME));
+        assertEquals("sess-1", tags.get(GenAiApmTags.CONVERSATION_ID));
+        assertEquals(10.0, tags.get(GenAiApmTags.USAGE_INPUT_TOKENS));
+        assertEquals(20.0, tags.get(GenAiApmTags.USAGE_OUTPUT_TOKENS));
+        assertEquals(30.0, tags.get(GenAiApmTags.USAGE_TOTAL_TOKENS));
+        assertEquals(4.0, tags.get(GenAiApmTags.USAGE_CACHE_READ_INPUT_TOKENS));
+        assertEquals(5.0, tags.get(GenAiApmTags.USAGE_CACHE_WRITE_INPUT_TOKENS));
+        assertEquals(6.0, tags.get(GenAiApmTags.USAGE_REASONING_OUTPUT_TOKENS));
+        assertEquals("true", tags.get(GenAiApmTags.ARTIFICIAL_TAGS));
+    }
+
+    @Test
+    void modelBackedSpanWithoutModelFallsBackToCustom() {
+        llmObsTag(Tags.SPAN_KIND, Tags.LLMOBS_EMBEDDING_SPAN_KIND);
+
+        GenAiApmTags.apply(span);
+
+        assertEquals("custom", tags.get(GenAiApmTags.REQUEST_MODEL));
+        assertEquals("custom", tags.get(GenAiApmTags.PROVIDER_NAME));
+    }
+
+    @Test
+    void emptyModelValuesAreTreatedAsAbsent() {
+        llmObsTag(Tags.SPAN_KIND, Tags.LLMOBS_LLM_SPAN_KIND);
+        llmObsTag(LLMObsTags.MODEL_NAME, "");
+        llmObsTag(LLMObsTags.MODEL_PROVIDER, "");
+        llmObsTag(LLMObsTags.ML_APP, "");
+        llmObsTag(LLMObsTags.SESSION_ID, "");
+
+        GenAiApmTags.apply(span);
+
+        assertEquals("custom", tags.get(GenAiApmTags.REQUEST_MODEL));
+        assertEquals("custom", tags.get(GenAiApmTags.PROVIDER_NAME));
+        assertNull(tags.get(GenAiApmTags.APPLICATION_NAME));
+        assertNull(tags.get(GenAiApmTags.CONVERSATION_ID));
+    }
+
+    @Test
+    void nonModelBackedSpanKeepsExplicitModelFieldsWithoutFallbacks() {
+        llmObsTag(Tags.SPAN_KIND, Tags.LLMOBS_AGENT_SPAN_KIND);
+        llmObsTag(LLMObsTags.MODEL_NAME, "gpt-4");
+        llmObsTag(LLMObsTags.MODEL_PROVIDER, "OpenAI");
+
+        GenAiApmTags.apply(span);
+
+        assertEquals(Tags.LLMOBS_AGENT_SPAN_KIND, tags.get(GenAiApmTags.OPERATION_NAME));
+        assertEquals("gpt-4", tags.get(GenAiApmTags.REQUEST_MODEL));
+        assertEquals("openai", tags.get(GenAiApmTags.PROVIDER_NAME));
+    }
+
+    @Test
+    void nonModelBackedSpanWithoutModelEmitsNoModelFields() {
+        llmObsTag(Tags.SPAN_KIND, Tags.LLMOBS_WORKFLOW_SPAN_KIND);
+
+        GenAiApmTags.apply(span);
+
+        assertFalse(tags.containsKey(GenAiApmTags.REQUEST_MODEL));
+        assertFalse(tags.containsKey(GenAiApmTags.PROVIDER_NAME));
+    }
+
+    @Test
+    void nonModelBackedSpanDropsTokenUsage() {
+        llmObsTag(Tags.SPAN_KIND, Tags.LLMOBS_TASK_SPAN_KIND);
+        llmObsMetric("input_tokens", 10);
+
+        GenAiApmTags.apply(span);
+
+        assertFalse(tags.containsKey(GenAiApmTags.USAGE_INPUT_TOKENS));
+    }
+
+    @Test
+    void nonNumericTokenMetricIsSkipped() {
+        llmObsTag(Tags.SPAN_KIND, Tags.LLMOBS_LLM_SPAN_KIND);
+        tags.put(LLMOBS_METRIC_PREFIX + "input_tokens", "not-a-number");
+
+        GenAiApmTags.apply(span);
+
+        assertFalse(tags.containsKey(GenAiApmTags.USAGE_INPUT_TOKENS));
+    }
+
+    @Test
+    void spanWithoutLlmObsKindEmitsNothing() {
+        llmObsTag(LLMObsTags.MODEL_NAME, "gpt-4");
+
+        GenAiApmTags.apply(span);
+
+        assertTrue(tags.keySet().stream().noneMatch(key -> key.startsWith("gen_ai.")));
+        assertFalse(tags.containsKey(GenAiApmTags.ARTIFICIAL_TAGS));
+    }
+
+    @Test
+    void nullSpanIsANoOp() {
+        GenAiApmTags.apply(null);
+        GenAiApmTags.apply(null, Tags.LLMOBS_LLM_SPAN_KIND, "gpt-4", "app");
+    }
+
+    @Test
+    void argumentsStandInForMissingLlmObsTags() {
+        llmObsTag(LLMObsTags.MODEL_PROVIDER, "OpenAI");
+
+        GenAiApmTags.apply(span, Tags.LLMOBS_LLM_SPAN_KIND, "gpt-4", "my-app");
+
+        assertEquals(Tags.LLMOBS_LLM_SPAN_KIND, tags.get(GenAiApmTags.OPERATION_NAME));
+        assertEquals("gpt-4", tags.get(GenAiApmTags.REQUEST_MODEL));
+        assertEquals("openai", tags.get(GenAiApmTags.PROVIDER_NAME));
+        assertEquals("my-app", tags.get(GenAiApmTags.APPLICATION_NAME));
+        assertFalse(tags.containsKey(GenAiApmTags.CONVERSATION_ID));
+        assertFalse(tags.containsKey(GenAiApmTags.USAGE_INPUT_TOKENS));
+    }
 
-  @Test
-  void argumentsTakePrecedenceOverLlmObsTags() {
-    llmObsTag(Tags.SPAN_KIND, Tags.LLMOBS_WORKFLOW_SPAN_KIND);
-    llmObsTag(LLMObsTags.MODEL_NAME, "gpt-3.5");
-    llmObsTag(LLMObsTags.ML_APP, "tagged-app");
-
-    GenAiApmTags.apply(span, Tags.LLMOBS_LLM_SPAN_KIND, "gpt-4", "my-app");
-
-    assertEquals(Tags.LLMOBS_LLM_SPAN_KIND, tags.get(GenAiApmTags.OPERATION_NAME));
-    assertEquals("gpt-4", tags.get(GenAiApmTags.REQUEST_MODEL));
-    assertEquals("my-app", tags.get(GenAiApmTags.APPLICATION_NAME));
-  }
-
-  @Test
-  void modelBackedArgumentsFallBackToCustom() {
-    GenAiApmTags.apply(span, Tags.LLMOBS_EMBEDDING_SPAN_KIND, null, "app");
+    @Test
+    void argumentsTakePrecedenceOverLlmObsTags() {
+        llmObsTag(Tags.SPAN_KIND, Tags.LLMOBS_WORKFLOW_SPAN_KIND);
+        llmObsTag(LLMObsTags.MODEL_NAME, "gpt-3.5");
+        llmObsTag(LLMObsTags.ML_APP, "tagged-app");
+
+        GenAiApmTags.apply(span, Tags.LLMOBS_LLM_SPAN_KIND, "gpt-4", "my-app");
+
+        assertEquals(Tags.LLMOBS_LLM_SPAN_KIND, tags.get(GenAiApmTags.OPERATION_NAME));
+        assertEquals("gpt-4", tags.get(GenAiApmTags.REQUEST_MODEL));
+        assertEquals("my-app", tags.get(GenAiApmTags.APPLICATION_NAME));
+    }
+
+    @Test
+    void modelBackedArgumentsFallBackToCustom() {
+        GenAiApmTags.apply(span, Tags.LLMOBS_EMBEDDING_SPAN_KIND, null, "app");
 
-    assertEquals("custom", tags.get(GenAiApmTags.REQUEST_MODEL));
-    assertEquals("custom", tags.get(GenAiApmTags.PROVIDER_NAME));
-  }
+        assertEquals("custom", tags.get(GenAiApmTags.REQUEST_MODEL));
+        assertEquals("custom", tags.get(GenAiApmTags.PROVIDER_NAME));
+    }
 
-  @Test
-  void spanWithNoResolvableOperationEmitsNothing() {
-    GenAiApmTags.apply(span, null, "gpt-4", "my-app");
+    @Test
+    void spanWithNoResolvableOperationEmitsNothing() {
+        GenAiApmTags.apply(span, null, "gpt-4", "my-app");
 
-    assertTrue(tags.keySet().stream().noneMatch(key -> key.startsWith("gen_ai.")));
-  }
+        assertTrue(tags.keySet().stream().noneMatch(key -> key.startsWith("gen_ai.")));
+    }
 
-  @Test
-  void usageWritesTheMappedGenAiMetric() {
-    GenAiApmTags.usage(span, LLMOBS_METRIC_PREFIX + "input_tokens", 11L);
-    GenAiApmTags.usage(span, LLMOBS_METRIC_PREFIX + "cache_read_input_tokens", 4);
+    @Test
+    void usageWritesTheMappedGenAiMetric() {
+        GenAiApmTags.usage(span, LLMOBS_METRIC_PREFIX + "input_tokens", 11L);
+        GenAiApmTags.usage(span, LLMOBS_METRIC_PREFIX + "cache_read_input_tokens", 4);
 
-    assertEquals(11.0, tags.get(GenAiApmTags.USAGE_INPUT_TOKENS));
-    assertEquals(4.0, tags.get(GenAiApmTags.USAGE_CACHE_READ_INPUT_TOKENS));
-  }
+        assertEquals(11.0, tags.get(GenAiApmTags.USAGE_INPUT_TOKENS));
+        assertEquals(4.0, tags.get(GenAiApmTags.USAGE_CACHE_READ_INPUT_TOKENS));
+    }
 
-  @Test
-  void usageIgnoresUnknownMetricsAndNulls() {
-    GenAiApmTags.usage(span, LLMOBS_METRIC_PREFIX + "time_to_first_token", 5L);
-    GenAiApmTags.usage(span, LLMOBS_METRIC_PREFIX + "input_tokens", null);
-    GenAiApmTags.usage(null, LLMOBS_METRIC_PREFIX + "input_tokens", 11L);
+    @Test
+    void usageIgnoresUnknownMetricsAndNulls() {
+        GenAiApmTags.usage(span, LLMOBS_METRIC_PREFIX + "time_to_first_token", 5L);
+        GenAiApmTags.usage(span, LLMOBS_METRIC_PREFIX + "input_tokens", null);
+        GenAiApmTags.usage(null, LLMOBS_METRIC_PREFIX + "input_tokens", 11L);
 
-    assertTrue(tags.keySet().stream().noneMatch(key -> key.startsWith("gen_ai.")));
-  }
+        assertTrue(tags.keySet().stream().noneMatch(key -> key.startsWith("gen_ai.")));
+    }
 
-  private void llmObsTag(String key, String value) {
-    tags.put(LLMOBS_TAG_PREFIX + key, value);
-  }
+    private void llmObsTag(String key, String value) {
+        tags.put(LLMOBS_TAG_PREFIX + key, value);
+    }
 
-  private void llmObsMetric(String key, Number value) {
-    tags.put(LLMOBS_METRIC_PREFIX + key, value);
-  }
+    private void llmObsMetric(String key, Number value) {
+        tags.put(LLMOBS_METRIC_PREFIX + key, value);
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/llmobs/LLMObsContextTest.java b/internal-api/src/test/java/datadog/trace/api/llmobs/LLMObsContextTest.java
index 20f91b51a8f..e9862e685bd 100644
--- a/internal-api/src/test/java/datadog/trace/api/llmobs/LLMObsContextTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/llmobs/LLMObsContextTest.java
@@ -9,349 +9,333 @@
 import org.junit.jupiter.api.Test;
 
 class LLMObsContextTest {
-  @Test
-  void rootSpanIdIsUndefined() {
-    assertEquals("undefined", LLMObsContext.ROOT_SPAN_ID);
-  }
-
-  @Test
-  void currentReturnsNullWhenNoContextAttached() {
-    assertNull(LLMObsContext.current());
-  }
-
-  @Test
-  void currentSessionIdReturnsNullWhenNoContextAttached() {
-    assertNull(LLMObsContext.currentSessionId());
-  }
-
-  @Test
-  void attachStoresSpanContext() {
-    AgentSpanContext ctx = mock(AgentSpanContext.class);
-    try (ContextScope scope = LLMObsContext.attach(ctx)) {
-      assertEquals(ctx, LLMObsContext.current());
+    @Test
+    void rootSpanIdIsUndefined() {
+        assertEquals("undefined", LLMObsContext.ROOT_SPAN_ID);
     }
-    assertNull(LLMObsContext.current());
-  }
-
-  @Test
-  void attachWithoutSessionIdLeavesSessionIdNull() {
-    AgentSpanContext ctx = mock(AgentSpanContext.class);
-    try (ContextScope scope = LLMObsContext.attach(ctx)) {
-      assertNull(LLMObsContext.currentSessionId());
+
+    @Test
+    void currentReturnsNullWhenNoContextAttached() {
+        assertNull(LLMObsContext.current());
     }
-  }
-
-  @Test
-  void attachWithSessionIdStoresBothContextAndSessionId() {
-    AgentSpanContext ctx = mock(AgentSpanContext.class);
-    try (ContextScope scope = LLMObsContext.attach(ctx, "session-123")) {
-      assertEquals(ctx, LLMObsContext.current());
-      assertEquals("session-123", LLMObsContext.currentSessionId());
+
+    @Test
+    void currentSessionIdReturnsNullWhenNoContextAttached() {
+        assertNull(LLMObsContext.currentSessionId());
     }
-    assertNull(LLMObsContext.current());
-    assertNull(LLMObsContext.currentSessionId());
-  }
-
-  @Test
-  void attachWithNullSessionIdIgnoresSessionId() {
-    AgentSpanContext ctx = mock(AgentSpanContext.class);
-    try (ContextScope scope = LLMObsContext.attach(ctx, null)) {
-      assertEquals(ctx, LLMObsContext.current());
-      assertNull(LLMObsContext.currentSessionId());
+
+    @Test
+    void attachStoresSpanContext() {
+        AgentSpanContext ctx = mock(AgentSpanContext.class);
+        try (ContextScope scope = LLMObsContext.attach(ctx)) {
+            assertEquals(ctx, LLMObsContext.current());
+        }
+        assertNull(LLMObsContext.current());
+    }
+
+    @Test
+    void attachWithoutSessionIdLeavesSessionIdNull() {
+        AgentSpanContext ctx = mock(AgentSpanContext.class);
+        try (ContextScope scope = LLMObsContext.attach(ctx)) {
+            assertNull(LLMObsContext.currentSessionId());
+        }
     }
-  }
-
-  @Test
-  void attachWithEmptySessionIdIgnoresSessionId() {
-    AgentSpanContext ctx = mock(AgentSpanContext.class);
-    try (ContextScope scope = LLMObsContext.attach(ctx, "")) {
-      assertEquals(ctx, LLMObsContext.current());
-      assertNull(LLMObsContext.currentSessionId());
+
+    @Test
+    void attachWithSessionIdStoresBothContextAndSessionId() {
+        AgentSpanContext ctx = mock(AgentSpanContext.class);
+        try (ContextScope scope = LLMObsContext.attach(ctx, "session-123")) {
+            assertEquals(ctx, LLMObsContext.current());
+            assertEquals("session-123", LLMObsContext.currentSessionId());
+        }
+        assertNull(LLMObsContext.current());
+        assertNull(LLMObsContext.currentSessionId());
     }
-  }
-
-  @Test
-  void nestedScopesRestoreParentContextOnClose() {
-    AgentSpanContext outer = mock(AgentSpanContext.class);
-    AgentSpanContext inner = mock(AgentSpanContext.class);
-    try (ContextScope outerScope = LLMObsContext.attach(outer, "outer-session")) {
-      assertEquals(outer, LLMObsContext.current());
-      assertEquals("outer-session", LLMObsContext.currentSessionId());
-      try (ContextScope innerScope = LLMObsContext.attach(inner, "inner-session")) {
-        assertEquals(inner, LLMObsContext.current());
-        assertEquals("inner-session", LLMObsContext.currentSessionId());
-      }
-      assertEquals(outer, LLMObsContext.current());
-      assertEquals("outer-session", LLMObsContext.currentSessionId());
+
+    @Test
+    void attachWithNullSessionIdIgnoresSessionId() {
+        AgentSpanContext ctx = mock(AgentSpanContext.class);
+        try (ContextScope scope = LLMObsContext.attach(ctx, null)) {
+            assertEquals(ctx, LLMObsContext.current());
+            assertNull(LLMObsContext.currentSessionId());
+        }
     }
-    assertNull(LLMObsContext.current());
-    assertNull(LLMObsContext.currentSessionId());
-  }
-
-  @Test
-  void childScopeInheritsParentSessionId() {
-    AgentSpanContext parent = mock(AgentSpanContext.class);
-    AgentSpanContext child = mock(AgentSpanContext.class);
-    try (ContextScope parentScope = LLMObsContext.attach(parent, "inherited-session")) {
-      try (ContextScope childScope = LLMObsContext.attach(child)) {
-        assertEquals(child, LLMObsContext.current());
-        assertEquals("inherited-session", LLMObsContext.currentSessionId());
-      }
+
+    @Test
+    void attachWithEmptySessionIdIgnoresSessionId() {
+        AgentSpanContext ctx = mock(AgentSpanContext.class);
+        try (ContextScope scope = LLMObsContext.attach(ctx, "")) {
+            assertEquals(ctx, LLMObsContext.current());
+            assertNull(LLMObsContext.currentSessionId());
+        }
     }
-  }
-
-  @Test
-  void currentAgentVersionReturnsNullWhenNoContextAttached() {
-    assertNull(LLMObsContext.currentAgentVersion());
-  }
-
-  @Test
-  void attachWithoutAgentVersionLeavesAgentVersionNull() {
-    AgentSpanContext ctx = mock(AgentSpanContext.class);
-    try (ContextScope scope = LLMObsContext.attach(ctx, null, null)) {
-      assertNull(LLMObsContext.currentAgentVersion());
+
+    @Test
+    void nestedScopesRestoreParentContextOnClose() {
+        AgentSpanContext outer = mock(AgentSpanContext.class);
+        AgentSpanContext inner = mock(AgentSpanContext.class);
+        try (ContextScope outerScope = LLMObsContext.attach(outer, "outer-session")) {
+            assertEquals(outer, LLMObsContext.current());
+            assertEquals("outer-session", LLMObsContext.currentSessionId());
+            try (ContextScope innerScope = LLMObsContext.attach(inner, "inner-session")) {
+                assertEquals(inner, LLMObsContext.current());
+                assertEquals("inner-session", LLMObsContext.currentSessionId());
+            }
+            assertEquals(outer, LLMObsContext.current());
+            assertEquals("outer-session", LLMObsContext.currentSessionId());
+        }
+        assertNull(LLMObsContext.current());
+        assertNull(LLMObsContext.currentSessionId());
     }
-  }
-
-  @Test
-  void attachWithAgentVersionStoresIt() {
-    AgentSpanContext ctx = mock(AgentSpanContext.class);
-    try (ContextScope scope = LLMObsContext.attach(ctx, null, "v3")) {
-      assertEquals(ctx, LLMObsContext.current());
-      assertEquals("v3", LLMObsContext.currentAgentVersion());
+
+    @Test
+    void childScopeInheritsParentSessionId() {
+        AgentSpanContext parent = mock(AgentSpanContext.class);
+        AgentSpanContext child = mock(AgentSpanContext.class);
+        try (ContextScope parentScope = LLMObsContext.attach(parent, "inherited-session")) {
+            try (ContextScope childScope = LLMObsContext.attach(child)) {
+                assertEquals(child, LLMObsContext.current());
+                assertEquals("inherited-session", LLMObsContext.currentSessionId());
+            }
+        }
     }
-    assertNull(LLMObsContext.currentAgentVersion());
-  }
-
-  @Test
-  void attachWithEmptyAgentVersionIgnoresAgentVersion() {
-    AgentSpanContext ctx = mock(AgentSpanContext.class);
-    try (ContextScope scope = LLMObsContext.attach(ctx, null, "")) {
-      assertNull(LLMObsContext.currentAgentVersion());
+
+    @Test
+    void currentAgentVersionReturnsNullWhenNoContextAttached() {
+        assertNull(LLMObsContext.currentAgentVersion());
     }
-  }
-
-  @Test
-  void nestedScopesRestoreParentAgentVersionOnClose() {
-    AgentSpanContext outer = mock(AgentSpanContext.class);
-    AgentSpanContext inner = mock(AgentSpanContext.class);
-    try (ContextScope outerScope = LLMObsContext.attach(outer, null, "v1")) {
-      assertEquals("v1", LLMObsContext.currentAgentVersion());
-      try (ContextScope innerScope = LLMObsContext.attach(inner, null, "v2")) {
-        assertEquals("v2", LLMObsContext.currentAgentVersion());
-      }
-      assertEquals("v1", LLMObsContext.currentAgentVersion());
+
+    @Test
+    void attachWithoutAgentVersionLeavesAgentVersionNull() {
+        AgentSpanContext ctx = mock(AgentSpanContext.class);
+        try (ContextScope scope = LLMObsContext.attach(ctx, null, null)) {
+            assertNull(LLMObsContext.currentAgentVersion());
+        }
     }
-    assertNull(LLMObsContext.currentAgentVersion());
-  }
-
-  @Test
-  void childScopeInheritsParentAgentVersion() {
-    AgentSpanContext parent = mock(AgentSpanContext.class);
-    AgentSpanContext child = mock(AgentSpanContext.class);
-    try (ContextScope parentScope = LLMObsContext.attach(parent, null, "v3")) {
-      try (ContextScope childScope = LLMObsContext.attach(child)) {
-        assertEquals(child, LLMObsContext.current());
-        assertEquals("v3", LLMObsContext.currentAgentVersion());
-      }
+
+    @Test
+    void attachWithAgentVersionStoresIt() {
+        AgentSpanContext ctx = mock(AgentSpanContext.class);
+        try (ContextScope scope = LLMObsContext.attach(ctx, null, "v3")) {
+            assertEquals(ctx, LLMObsContext.current());
+            assertEquals("v3", LLMObsContext.currentAgentVersion());
+        }
+        assertNull(LLMObsContext.currentAgentVersion());
     }
-  }
-
-  @Test
-  void samplingValuesReturnNullWhenNoContextAttached() {
-    assertNull(LLMObsContext.currentSamplingDecision());
-    assertNull(LLMObsContext.currentSampleRate());
-  }
-
-  @Test
-  void attachWithoutSamplingDecisionLeavesSamplingValuesNull() {
-    AgentSpanContext ctx = mock(AgentSpanContext.class);
-    try (ContextScope scope = LLMObsContext.attach(ctx, "session-123")) {
-      assertNull(LLMObsContext.currentSamplingDecision());
-      assertNull(LLMObsContext.currentSampleRate());
+
+    @Test
+    void attachWithEmptyAgentVersionIgnoresAgentVersion() {
+        AgentSpanContext ctx = mock(AgentSpanContext.class);
+        try (ContextScope scope = LLMObsContext.attach(ctx, null, "")) {
+            assertNull(LLMObsContext.currentAgentVersion());
+        }
     }
-  }
-
-  @Test
-  void attachWithSamplingDecisionStoresDecisionAndRate() {
-    AgentSpanContext ctx = mock(AgentSpanContext.class);
-    try (ContextScope scope =
-        LLMObsContext.attach(
-            ctx, null, null, "0.25", LLMObsContext.SAMPLING_DECISION_DROPPED, null, null)) {
-      assertEquals(
-          LLMObsContext.SAMPLING_DECISION_DROPPED, LLMObsContext.currentSamplingDecision());
-      assertEquals("0.25", LLMObsContext.currentSampleRate());
+
+    @Test
+    void nestedScopesRestoreParentAgentVersionOnClose() {
+        AgentSpanContext outer = mock(AgentSpanContext.class);
+        AgentSpanContext inner = mock(AgentSpanContext.class);
+        try (ContextScope outerScope = LLMObsContext.attach(outer, null, "v1")) {
+            assertEquals("v1", LLMObsContext.currentAgentVersion());
+            try (ContextScope innerScope = LLMObsContext.attach(inner, null, "v2")) {
+                assertEquals("v2", LLMObsContext.currentAgentVersion());
+            }
+            assertEquals("v1", LLMObsContext.currentAgentVersion());
+        }
+        assertNull(LLMObsContext.currentAgentVersion());
     }
-    assertNull(LLMObsContext.currentSamplingDecision());
-    assertNull(LLMObsContext.currentSampleRate());
-  }
-
-  @Test
-  void attachWithNullSamplingDecisionIgnoresSampleRate() {
-    AgentSpanContext ctx = mock(AgentSpanContext.class);
-    // The rate is only meaningful alongside a decision, so it is not stored on its own.
-    try (ContextScope scope = LLMObsContext.attach(ctx, null, null, "0.25", null, null, null)) {
-      assertNull(LLMObsContext.currentSamplingDecision());
-      assertNull(LLMObsContext.currentSampleRate());
+
+    @Test
+    void childScopeInheritsParentAgentVersion() {
+        AgentSpanContext parent = mock(AgentSpanContext.class);
+        AgentSpanContext child = mock(AgentSpanContext.class);
+        try (ContextScope parentScope = LLMObsContext.attach(parent, null, "v3")) {
+            try (ContextScope childScope = LLMObsContext.attach(child)) {
+                assertEquals(child, LLMObsContext.current());
+                assertEquals("v3", LLMObsContext.currentAgentVersion());
+            }
+        }
     }
-  }
-
-  @Test
-  void childScopeInheritsParentSamplingDecision() {
-    AgentSpanContext parent = mock(AgentSpanContext.class);
-    AgentSpanContext child = mock(AgentSpanContext.class);
-    try (ContextScope parentScope =
-        LLMObsContext.attach(
-            parent, null, null, "1", LLMObsContext.SAMPLING_DECISION_SAMPLED, null, null)) {
-      try (ContextScope childScope = LLMObsContext.attach(child)) {
-        assertEquals(child, LLMObsContext.current());
-        assertEquals(
-            LLMObsContext.SAMPLING_DECISION_SAMPLED, LLMObsContext.currentSamplingDecision());
-        assertEquals("1", LLMObsContext.currentSampleRate());
-      }
+
+    @Test
+    void samplingValuesReturnNullWhenNoContextAttached() {
+        assertNull(LLMObsContext.currentSamplingDecision());
+        assertNull(LLMObsContext.currentSampleRate());
     }
-  }
-
-  // ── full attach (session_id + agent_version + sampling + pagent attribution) ──
-
-  @Test
-  void currentParentAgentSpanIdReturnsNullWhenNoContextAttached() {
-    assertNull(LLMObsContext.currentParentAgentSpanId());
-  }
-
-  @Test
-  void currentParentAgentNameReturnsNullWhenNoContextAttached() {
-    assertNull(LLMObsContext.currentParentAgentName());
-  }
-
-  @Test
-  void fullAttachStoresAllFields() {
-    AgentSpanContext ctx = mock(AgentSpanContext.class);
-    try (ContextScope scope =
-        LLMObsContext.attach(
-            ctx,
-            "session-1",
-            "v2",
-            "0.5",
-            LLMObsContext.SAMPLING_DECISION_SAMPLED,
-            "span-99",
-            "my-agent")) {
-      assertEquals(ctx, LLMObsContext.current());
-      assertEquals("session-1", LLMObsContext.currentSessionId());
-      assertEquals("v2", LLMObsContext.currentAgentVersion());
-      assertEquals("0.5", LLMObsContext.currentSampleRate());
-      assertEquals(
-          LLMObsContext.SAMPLING_DECISION_SAMPLED, LLMObsContext.currentSamplingDecision());
-      assertEquals("span-99", LLMObsContext.currentParentAgentSpanId());
-      assertEquals("my-agent", LLMObsContext.currentParentAgentName());
+
+    @Test
+    void attachWithoutSamplingDecisionLeavesSamplingValuesNull() {
+        AgentSpanContext ctx = mock(AgentSpanContext.class);
+        try (ContextScope scope = LLMObsContext.attach(ctx, "session-123")) {
+            assertNull(LLMObsContext.currentSamplingDecision());
+            assertNull(LLMObsContext.currentSampleRate());
+        }
     }
-    assertNull(LLMObsContext.current());
-    assertNull(LLMObsContext.currentSessionId());
-    assertNull(LLMObsContext.currentAgentVersion());
-    assertNull(LLMObsContext.currentSampleRate());
-    assertNull(LLMObsContext.currentSamplingDecision());
-    assertNull(LLMObsContext.currentParentAgentSpanId());
-    assertNull(LLMObsContext.currentParentAgentName());
-  }
-
-  @Test
-  void fullAttachWithNullSessionIdIgnoresSessionId() {
-    AgentSpanContext ctx = mock(AgentSpanContext.class);
-    try (ContextScope scope = LLMObsContext.attach(ctx, null, null, null, null, null, null)) {
-      assertNull(LLMObsContext.currentSessionId());
-      assertNull(LLMObsContext.currentAgentVersion());
-      assertNull(LLMObsContext.currentParentAgentSpanId());
-      assertNull(LLMObsContext.currentParentAgentName());
+
+    @Test
+    void attachWithSamplingDecisionStoresDecisionAndRate() {
+        AgentSpanContext ctx = mock(AgentSpanContext.class);
+        try (ContextScope scope =
+                LLMObsContext.attach(ctx, null, null, "0.25", LLMObsContext.SAMPLING_DECISION_DROPPED, null, null)) {
+            assertEquals(LLMObsContext.SAMPLING_DECISION_DROPPED, LLMObsContext.currentSamplingDecision());
+            assertEquals("0.25", LLMObsContext.currentSampleRate());
+        }
+        assertNull(LLMObsContext.currentSamplingDecision());
+        assertNull(LLMObsContext.currentSampleRate());
     }
-  }
-
-  @Test
-  void fullAttachWithEmptySessionIdIgnoresSessionId() {
-    AgentSpanContext ctx = mock(AgentSpanContext.class);
-    try (ContextScope scope = LLMObsContext.attach(ctx, "", "", null, null, null, null)) {
-      assertNull(LLMObsContext.currentSessionId());
-      assertNull(LLMObsContext.currentAgentVersion());
+
+    @Test
+    void attachWithNullSamplingDecisionIgnoresSampleRate() {
+        AgentSpanContext ctx = mock(AgentSpanContext.class);
+        // The rate is only meaningful alongside a decision, so it is not stored on its own.
+        try (ContextScope scope = LLMObsContext.attach(ctx, null, null, "0.25", null, null, null)) {
+            assertNull(LLMObsContext.currentSamplingDecision());
+            assertNull(LLMObsContext.currentSampleRate());
+        }
     }
-  }
-
-  @Test
-  void fullAttachNullPagentClearsStaleValuesFromOuterScope() {
-    // When an inner (non-agent) span attaches with null pagent keys, the outer agent's
-    // pagent ID and name must not leak through to that span's descendants.
-    AgentSpanContext outer = mock(AgentSpanContext.class);
-    AgentSpanContext inner = mock(AgentSpanContext.class);
-    try (ContextScope outerScope =
-        LLMObsContext.attach(outer, "s", "v1", null, null, "agent-span-id", "outer-agent")) {
-      assertEquals("agent-span-id", LLMObsContext.currentParentAgentSpanId());
-      assertEquals("outer-agent", LLMObsContext.currentParentAgentName());
-
-      try (ContextScope innerScope =
-          LLMObsContext.attach(inner, null, null, null, null, null, null)) {
+
+    @Test
+    void childScopeInheritsParentSamplingDecision() {
+        AgentSpanContext parent = mock(AgentSpanContext.class);
+        AgentSpanContext child = mock(AgentSpanContext.class);
+        try (ContextScope parentScope =
+                LLMObsContext.attach(parent, null, null, "1", LLMObsContext.SAMPLING_DECISION_SAMPLED, null, null)) {
+            try (ContextScope childScope = LLMObsContext.attach(child)) {
+                assertEquals(child, LLMObsContext.current());
+                assertEquals(LLMObsContext.SAMPLING_DECISION_SAMPLED, LLMObsContext.currentSamplingDecision());
+                assertEquals("1", LLMObsContext.currentSampleRate());
+            }
+        }
+    }
+
+    // ── full attach (session_id + agent_version + sampling + pagent attribution) ──
+
+    @Test
+    void currentParentAgentSpanIdReturnsNullWhenNoContextAttached() {
         assertNull(LLMObsContext.currentParentAgentSpanId());
+    }
+
+    @Test
+    void currentParentAgentNameReturnsNullWhenNoContextAttached() {
         assertNull(LLMObsContext.currentParentAgentName());
-      }
+    }
 
-      // Outer values are restored after inner scope closes.
-      assertEquals("agent-span-id", LLMObsContext.currentParentAgentSpanId());
-      assertEquals("outer-agent", LLMObsContext.currentParentAgentName());
+    @Test
+    void fullAttachStoresAllFields() {
+        AgentSpanContext ctx = mock(AgentSpanContext.class);
+        try (ContextScope scope = LLMObsContext.attach(
+                ctx, "session-1", "v2", "0.5", LLMObsContext.SAMPLING_DECISION_SAMPLED, "span-99", "my-agent")) {
+            assertEquals(ctx, LLMObsContext.current());
+            assertEquals("session-1", LLMObsContext.currentSessionId());
+            assertEquals("v2", LLMObsContext.currentAgentVersion());
+            assertEquals("0.5", LLMObsContext.currentSampleRate());
+            assertEquals(LLMObsContext.SAMPLING_DECISION_SAMPLED, LLMObsContext.currentSamplingDecision());
+            assertEquals("span-99", LLMObsContext.currentParentAgentSpanId());
+            assertEquals("my-agent", LLMObsContext.currentParentAgentName());
+        }
+        assertNull(LLMObsContext.current());
+        assertNull(LLMObsContext.currentSessionId());
+        assertNull(LLMObsContext.currentAgentVersion());
+        assertNull(LLMObsContext.currentSampleRate());
+        assertNull(LLMObsContext.currentSamplingDecision());
+        assertNull(LLMObsContext.currentParentAgentSpanId());
+        assertNull(LLMObsContext.currentParentAgentName());
     }
-  }
-
-  @Test
-  void fullAttachInnerAgentOverridesOuterAgentForDescendants() {
-    AgentSpanContext outer = mock(AgentSpanContext.class);
-    AgentSpanContext inner = mock(AgentSpanContext.class);
-    try (ContextScope outerScope =
-        LLMObsContext.attach(outer, null, null, null, null, "outer-span-id", "outer-agent")) {
-      try (ContextScope innerScope =
-          LLMObsContext.attach(inner, null, null, null, null, "inner-span-id", "inner-agent")) {
-        assertEquals("inner-span-id", LLMObsContext.currentParentAgentSpanId());
-        assertEquals("inner-agent", LLMObsContext.currentParentAgentName());
-      }
-      assertEquals("outer-span-id", LLMObsContext.currentParentAgentSpanId());
-      assertEquals("outer-agent", LLMObsContext.currentParentAgentName());
+
+    @Test
+    void fullAttachWithNullSessionIdIgnoresSessionId() {
+        AgentSpanContext ctx = mock(AgentSpanContext.class);
+        try (ContextScope scope = LLMObsContext.attach(ctx, null, null, null, null, null, null)) {
+            assertNull(LLMObsContext.currentSessionId());
+            assertNull(LLMObsContext.currentAgentVersion());
+            assertNull(LLMObsContext.currentParentAgentSpanId());
+            assertNull(LLMObsContext.currentParentAgentName());
+        }
     }
-  }
-
-  @Test
-  void fullAttachNullPagentNameClearsNameButNotSpanId() {
-    // An agent with a null name (e.g. manifest not yet set) must not let outer agent's name
-    // leak into its scope — only the span ID is set.
-    AgentSpanContext outer = mock(AgentSpanContext.class);
-    AgentSpanContext inner = mock(AgentSpanContext.class);
-    try (ContextScope outerScope =
-        LLMObsContext.attach(outer, null, null, null, null, "outer-span-id", "outer-agent")) {
-      try (ContextScope innerScope =
-          LLMObsContext.attach(inner, null, null, null, null, "inner-span-id", null)) {
-        assertEquals("inner-span-id", LLMObsContext.currentParentAgentSpanId());
-        assertNull(LLMObsContext.currentParentAgentName());
-      }
+
+    @Test
+    void fullAttachWithEmptySessionIdIgnoresSessionId() {
+        AgentSpanContext ctx = mock(AgentSpanContext.class);
+        try (ContextScope scope = LLMObsContext.attach(ctx, "", "", null, null, null, null)) {
+            assertNull(LLMObsContext.currentSessionId());
+            assertNull(LLMObsContext.currentAgentVersion());
+        }
     }
-  }
-
-  @Test
-  void attachPropagatesAllFourMechanismsTogether() {
-    AgentSpanContext parent = mock(AgentSpanContext.class);
-    AgentSpanContext child = mock(AgentSpanContext.class);
-    // All four propagation mechanisms coexist on one context and are inherited together.
-    try (ContextScope parentScope =
-        LLMObsContext.attach(
-            parent,
-            "session-abc",
-            "v7",
-            "0.5",
-            LLMObsContext.SAMPLING_DECISION_SAMPLED,
-            "agent-span-7",
-            "agent-seven")) {
-      try (ContextScope childScope = LLMObsContext.attach(child)) {
-        assertEquals("session-abc", LLMObsContext.currentSessionId());
-        assertEquals("v7", LLMObsContext.currentAgentVersion());
-        assertEquals(
-            LLMObsContext.SAMPLING_DECISION_SAMPLED, LLMObsContext.currentSamplingDecision());
-        assertEquals("0.5", LLMObsContext.currentSampleRate());
-        assertEquals("agent-span-7", LLMObsContext.currentParentAgentSpanId());
-        assertEquals("agent-seven", LLMObsContext.currentParentAgentName());
-      }
+
+    @Test
+    void fullAttachNullPagentClearsStaleValuesFromOuterScope() {
+        // When an inner (non-agent) span attaches with null pagent keys, the outer agent's
+        // pagent ID and name must not leak through to that span's descendants.
+        AgentSpanContext outer = mock(AgentSpanContext.class);
+        AgentSpanContext inner = mock(AgentSpanContext.class);
+        try (ContextScope outerScope =
+                LLMObsContext.attach(outer, "s", "v1", null, null, "agent-span-id", "outer-agent")) {
+            assertEquals("agent-span-id", LLMObsContext.currentParentAgentSpanId());
+            assertEquals("outer-agent", LLMObsContext.currentParentAgentName());
+
+            try (ContextScope innerScope = LLMObsContext.attach(inner, null, null, null, null, null, null)) {
+                assertNull(LLMObsContext.currentParentAgentSpanId());
+                assertNull(LLMObsContext.currentParentAgentName());
+            }
+
+            // Outer values are restored after inner scope closes.
+            assertEquals("agent-span-id", LLMObsContext.currentParentAgentSpanId());
+            assertEquals("outer-agent", LLMObsContext.currentParentAgentName());
+        }
+    }
+
+    @Test
+    void fullAttachInnerAgentOverridesOuterAgentForDescendants() {
+        AgentSpanContext outer = mock(AgentSpanContext.class);
+        AgentSpanContext inner = mock(AgentSpanContext.class);
+        try (ContextScope outerScope =
+                LLMObsContext.attach(outer, null, null, null, null, "outer-span-id", "outer-agent")) {
+            try (ContextScope innerScope =
+                    LLMObsContext.attach(inner, null, null, null, null, "inner-span-id", "inner-agent")) {
+                assertEquals("inner-span-id", LLMObsContext.currentParentAgentSpanId());
+                assertEquals("inner-agent", LLMObsContext.currentParentAgentName());
+            }
+            assertEquals("outer-span-id", LLMObsContext.currentParentAgentSpanId());
+            assertEquals("outer-agent", LLMObsContext.currentParentAgentName());
+        }
+    }
+
+    @Test
+    void fullAttachNullPagentNameClearsNameButNotSpanId() {
+        // An agent with a null name (e.g. manifest not yet set) must not let outer agent's name
+        // leak into its scope — only the span ID is set.
+        AgentSpanContext outer = mock(AgentSpanContext.class);
+        AgentSpanContext inner = mock(AgentSpanContext.class);
+        try (ContextScope outerScope =
+                LLMObsContext.attach(outer, null, null, null, null, "outer-span-id", "outer-agent")) {
+            try (ContextScope innerScope = LLMObsContext.attach(inner, null, null, null, null, "inner-span-id", null)) {
+                assertEquals("inner-span-id", LLMObsContext.currentParentAgentSpanId());
+                assertNull(LLMObsContext.currentParentAgentName());
+            }
+        }
+    }
+
+    @Test
+    void attachPropagatesAllFourMechanismsTogether() {
+        AgentSpanContext parent = mock(AgentSpanContext.class);
+        AgentSpanContext child = mock(AgentSpanContext.class);
+        // All four propagation mechanisms coexist on one context and are inherited together.
+        try (ContextScope parentScope = LLMObsContext.attach(
+                parent,
+                "session-abc",
+                "v7",
+                "0.5",
+                LLMObsContext.SAMPLING_DECISION_SAMPLED,
+                "agent-span-7",
+                "agent-seven")) {
+            try (ContextScope childScope = LLMObsContext.attach(child)) {
+                assertEquals("session-abc", LLMObsContext.currentSessionId());
+                assertEquals("v7", LLMObsContext.currentAgentVersion());
+                assertEquals(LLMObsContext.SAMPLING_DECISION_SAMPLED, LLMObsContext.currentSamplingDecision());
+                assertEquals("0.5", LLMObsContext.currentSampleRate());
+                assertEquals("agent-span-7", LLMObsContext.currentParentAgentSpanId());
+                assertEquals("agent-seven", LLMObsContext.currentParentAgentName());
+            }
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/llmobs/LLMObsSamplerTest.java b/internal-api/src/test/java/datadog/trace/api/llmobs/LLMObsSamplerTest.java
index dcf683b31b9..b7ec9e96180 100644
--- a/internal-api/src/test/java/datadog/trace/api/llmobs/LLMObsSamplerTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/llmobs/LLMObsSamplerTest.java
@@ -12,95 +12,93 @@
 
 class LLMObsSamplerTest {
 
-  @Test
-  void keepsEverythingAtRateOne() {
-    LLMObsSampler sampler = new LLMObsSampler(1.0);
-    assertEquals("1", sampler.formattedRate());
-    for (long id : new long[] {0L, 1L, -1L, Long.MAX_VALUE, Long.MIN_VALUE, 1234567890123L}) {
-      assertTrue(sampler.sample(id));
+    @Test
+    void keepsEverythingAtRateOne() {
+        LLMObsSampler sampler = new LLMObsSampler(1.0);
+        assertEquals("1", sampler.formattedRate());
+        for (long id : new long[] {0L, 1L, -1L, Long.MAX_VALUE, Long.MIN_VALUE, 1234567890123L}) {
+            assertTrue(sampler.sample(id));
+        }
     }
-  }
 
-  @Test
-  void dropsEverythingAtRateZero() {
-    LLMObsSampler sampler = new LLMObsSampler(0.0);
-    assertEquals("0", sampler.formattedRate());
-    // 0 is the one sampling id whose Knuth product is the minimum value, so it sits exactly on the
-    // cutoff at rate 0. Every other id must be dropped.
-    for (long id : new long[] {1L, -1L, Long.MAX_VALUE, 1234567890123L}) {
-      assertFalse(sampler.sample(id));
+    @Test
+    void dropsEverythingAtRateZero() {
+        LLMObsSampler sampler = new LLMObsSampler(0.0);
+        assertEquals("0", sampler.formattedRate());
+        // 0 is the one sampling id whose Knuth product is the minimum value, so it sits exactly on the
+        // cutoff at rate 0. Every other id must be dropped.
+        for (long id : new long[] {1L, -1L, Long.MAX_VALUE, 1234567890123L}) {
+            assertFalse(sampler.sample(id));
+        }
     }
-  }
 
-  @ParameterizedTest
-  @ValueSource(doubles = {-1.0, -0.0001, 1.0001, 2.0, Double.NaN})
-  void outOfRangeRatesFallBackToKeepingEverything(double rate) {
-    LLMObsSampler sampler = new LLMObsSampler(rate);
-    // Including negatives and NaN: a bad rate must never be read as "drop everything".
-    assertEquals("1", sampler.formattedRate());
-    for (long id : new long[] {0L, 1L, -1L, Long.MAX_VALUE, Long.MIN_VALUE, 1234567890123L}) {
-      assertTrue(sampler.sample(id));
+    @ParameterizedTest
+    @ValueSource(doubles = {-1.0, -0.0001, 1.0001, 2.0, Double.NaN})
+    void outOfRangeRatesFallBackToKeepingEverything(double rate) {
+        LLMObsSampler sampler = new LLMObsSampler(rate);
+        // Including negatives and NaN: a bad rate must never be read as "drop everything".
+        assertEquals("1", sampler.formattedRate());
+        for (long id : new long[] {0L, 1L, -1L, Long.MAX_VALUE, Long.MIN_VALUE, 1234567890123L}) {
+            assertTrue(sampler.sample(id));
+        }
     }
-  }
 
-  @ParameterizedTest
-  @CsvSource({
-    "1.0, 1",
-    "0.0, 0",
-    "0.5, 0.5",
-    "0.25, 0.25",
-    "0.1, 0.1",
-    "0.123456, 0.123456",
-    // Beyond 6 digits of precision the rate rounds, matching the _dd.p.ksr format exactly.
-    "0.1234567, 0.123457",
-    "0.0000001, 0",
-    "0.999999, 0.999999",
-  })
-  void formatsRateLikeKnuthSamplingRateTag(double rate, String expected) {
-    assertEquals(expected, LLMObsSampler.formatRate(rate));
-  }
+    @ParameterizedTest
+    @CsvSource({
+        "1.0, 1",
+        "0.0, 0",
+        "0.5, 0.5",
+        "0.25, 0.25",
+        "0.1, 0.1",
+        "0.123456, 0.123456",
+        // Beyond 6 digits of precision the rate rounds, matching the _dd.p.ksr format exactly.
+        "0.1234567, 0.123457",
+        "0.0000001, 0",
+        "0.999999, 0.999999",
+    })
+    void formatsRateLikeKnuthSamplingRateTag(double rate, String expected) {
+        assertEquals(expected, LLMObsSampler.formatRate(rate));
+    }
 
-  @Test
-  void isDeterministicForTheSameSamplingId() {
-    LLMObsSampler sampler = new LLMObsSampler(0.5);
-    long id = 987654321987654321L;
-    boolean first = sampler.sample(id);
-    for (int i = 0; i < 100; i++) {
-      assertEquals(first, sampler.sample(id));
+    @Test
+    void isDeterministicForTheSameSamplingId() {
+        LLMObsSampler sampler = new LLMObsSampler(0.5);
+        long id = 987654321987654321L;
+        boolean first = sampler.sample(id);
+        for (int i = 0; i < 100; i++) {
+            assertEquals(first, sampler.sample(id));
+        }
+        // Two samplers configured with the same rate must agree, which is what lets independently
+        // configured services reach the same decision for a distributed trace.
+        assertEquals(first, new LLMObsSampler(0.5).sample(id));
     }
-    // Two samplers configured with the same rate must agree, which is what lets independently
-    // configured services reach the same decision for a distributed trace.
-    assertEquals(first, new LLMObsSampler(0.5).sample(id));
-  }
 
-  @ParameterizedTest
-  @ValueSource(doubles = {0.1, 0.25, 0.5, 0.75, 0.9})
-  void keepsRoughlyTheConfiguredFraction(double rate) {
-    LLMObsSampler sampler = new LLMObsSampler(rate);
-    int iterations = 100_000;
-    int kept = 0;
-    for (int i = 0; i < iterations; i++) {
-      if (sampler.sample(ThreadLocalRandom.current().nextLong())) {
-        kept++;
-      }
+    @ParameterizedTest
+    @ValueSource(doubles = {0.1, 0.25, 0.5, 0.75, 0.9})
+    void keepsRoughlyTheConfiguredFraction(double rate) {
+        LLMObsSampler sampler = new LLMObsSampler(rate);
+        int iterations = 100_000;
+        int kept = 0;
+        for (int i = 0; i < iterations; i++) {
+            if (sampler.sample(ThreadLocalRandom.current().nextLong())) {
+                kept++;
+            }
+        }
+        double observed = (double) kept / iterations;
+        assertTrue(Math.abs(observed - rate) < 0.02, "expected ~" + rate + " of traces kept but observed " + observed);
     }
-    double observed = (double) kept / iterations;
-    assertTrue(
-        Math.abs(observed - rate) < 0.02,
-        "expected ~" + rate + " of traces kept but observed " + observed);
-  }
 
-  @Test
-  void higherRatesAreASupersetOfLowerRates() {
-    // A trace kept at 10% must also be kept at 50%: the cutoff only moves outward as the rate
-    // rises. This is what makes a service configured at a higher rate safe to add to a trace.
-    LLMObsSampler low = new LLMObsSampler(0.1);
-    LLMObsSampler high = new LLMObsSampler(0.5);
-    for (int i = 0; i < 10_000; i++) {
-      long id = ThreadLocalRandom.current().nextLong();
-      if (low.sample(id)) {
-        assertTrue(high.sample(id), "id " + id + " kept at 0.1 but dropped at 0.5");
-      }
+    @Test
+    void higherRatesAreASupersetOfLowerRates() {
+        // A trace kept at 10% must also be kept at 50%: the cutoff only moves outward as the rate
+        // rises. This is what makes a service configured at a higher rate safe to add to a trace.
+        LLMObsSampler low = new LLMObsSampler(0.1);
+        LLMObsSampler high = new LLMObsSampler(0.5);
+        for (int i = 0; i < 10_000; i++) {
+            long id = ThreadLocalRandom.current().nextLong();
+            if (low.sample(id)) {
+                assertTrue(high.sample(id), "id " + id + " kept at 0.1 but dropped at 0.5");
+            }
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/metrics/StatsMetricsTest.java b/internal-api/src/test/java/datadog/trace/api/metrics/StatsMetricsTest.java
index abd1b782843..da163162c5b 100644
--- a/internal-api/src/test/java/datadog/trace/api/metrics/StatsMetricsTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/metrics/StatsMetricsTest.java
@@ -16,107 +16,107 @@
  */
 class StatsMetricsTest {
 
-  private static Map<String, StatsMetrics.TaggedCounter> countersByTag() {
-    return StatsMetrics.getInstance().getTaggedCounters().stream()
-        .collect(Collectors.toMap(StatsMetrics.TaggedCounter::getTag, Function.identity()));
-  }
-
-  @AfterEach
-  void drainDeltas() {
-    // StatsMetrics is a process-wide singleton; these tests leave per-reason deltas behind. Drain
-    // every counter so they do not leak into another collector's expectations when tests share a
-    // Gradle worker (e.g. CoreMetricCollectorTest asserting an exact span-metric count).
-    for (StatsMetrics.TaggedCounter counter : StatsMetrics.getInstance().getTaggedCounters()) {
-      counter.getValueAndReset();
+    private static Map<String, StatsMetrics.TaggedCounter> countersByTag() {
+        return StatsMetrics.getInstance().getTaggedCounters().stream()
+                .collect(Collectors.toMap(StatsMetrics.TaggedCounter::getTag, Function.identity()));
+    }
+
+    @AfterEach
+    void drainDeltas() {
+        // StatsMetrics is a process-wide singleton; these tests leave per-reason deltas behind. Drain
+        // every counter so they do not leak into another collector's expectations when tests share a
+        // Gradle worker (e.g. CoreMetricCollectorTest asserting an exact span-metric count).
+        for (StatsMetrics.TaggedCounter counter : StatsMetrics.getInstance().getTaggedCounters()) {
+            counter.getValueAndReset();
+        }
+    }
+
+    @Test
+    void accumulatesPerReasonAndEmitsResetDeltas() {
+        StatsMetrics metrics = StatsMetrics.getInstance();
+        String reason = "collapsed:test_accumulate";
+
+        metrics.onCollapsedSpans(reason, 3);
+        metrics.onCollapsedSpans(reason, 4);
+
+        StatsMetrics.TaggedCounter counter = countersByTag().get(reason);
+        assertEquals(StatsMetrics.COLLAPSED_SPANS, counter.getName());
+        assertEquals(reason, counter.getTag());
+        assertEquals(7, counter.getValue(), "getValue reports the running total");
+
+        // First drain returns the whole accumulated delta; a second drain with no activity returns 0.
+        assertEquals(7, counter.getValueAndReset(), "first drain returns the accumulated delta");
+        assertEquals(0, counter.getValueAndReset(), "no new activity -> zero delta");
+
+        metrics.onCollapsedSpans(reason, 5);
+        assertEquals(5, counter.getValueAndReset(), "only the post-drain increment is returned");
+    }
+
+    @Test
+    void separateReasonsGetSeparateCounters() {
+        StatsMetrics metrics = StatsMetrics.getInstance();
+        String collapsed = "collapsed:test_separate";
+        String oversized = "oversized:test_separate";
+
+        metrics.onCollapsedSpans(collapsed, 2);
+        metrics.onCollapsedSpans(oversized, 9);
+
+        Map<String, StatsMetrics.TaggedCounter> counters = countersByTag();
+        assertEquals(2, counters.get(collapsed).getValue());
+        assertEquals(9, counters.get(oversized).getValue());
+    }
+
+    @Test
+    void nonPositiveCountsAreIgnored() {
+        StatsMetrics metrics = StatsMetrics.getInstance();
+        String reason = "collapsed:test_nonpositive";
+
+        metrics.onCollapsedSpans(reason, 0);
+        metrics.onCollapsedSpans(reason, -5);
+
+        // No counter is created for a reason that never saw a positive count.
+        assertNull(countersByTag().get(reason), "no counter created for non-positive counts");
+
+        metrics.onCollapsedSpans(reason, 4);
+        assertEquals(4, countersByTag().get(reason).getValue());
+        // A later non-positive count leaves the running total untouched.
+        metrics.onCollapsedSpans(reason, -1);
+        assertEquals(4, countersByTag().get(reason).getValue());
+    }
+
+    @Test
+    void wholeKeyCollapseIncrementsPreCreatedCounter() {
+        StatsMetrics metrics = StatsMetrics.getInstance();
+
+        // The whole_key counter is pre-created at construction, so it is always present in the drain.
+        StatsMetrics.TaggedCounter counter = countersByTag().get(StatsMetrics.COLLAPSED_WHOLE_KEY);
+        assertEquals(StatsMetrics.COLLAPSED_SPANS, counter.getName());
+        assertEquals(StatsMetrics.COLLAPSED_WHOLE_KEY, counter.getTag());
+
+        long before = counter.getValue();
+        metrics.onWholeKeyCollapse();
+        metrics.onWholeKeyCollapse();
+        assertEquals(before + 2, counter.getValue(), "each call increments the counter by one");
+
+        // Routing the same tag through onCollapsedSpans hits the same pre-created counter instance.
+        assertTrue(
+                countersByTag().get(StatsMetrics.COLLAPSED_WHOLE_KEY) == counter,
+                "whole_key resolves to a single stable counter");
+        metrics.onCollapsedSpans(StatsMetrics.COLLAPSED_WHOLE_KEY, 3);
+        assertEquals(before + 5, counter.getValue());
+    }
+
+    @Test
+    void reasonCounterIsStableAcrossLookups() {
+        StatsMetrics metrics = StatsMetrics.getInstance();
+        String reason = "collapsed:test_stable";
+
+        metrics.onCollapsedSpans(reason, 1);
+        StatsMetrics.TaggedCounter first = countersByTag().get(reason);
+        metrics.onCollapsedSpans(reason, 1);
+        StatsMetrics.TaggedCounter second = countersByTag().get(reason);
+
+        assertTrue(first == second, "same reason maps to the same counter instance");
+        assertEquals(2, first.getValue());
     }
-  }
-
-  @Test
-  void accumulatesPerReasonAndEmitsResetDeltas() {
-    StatsMetrics metrics = StatsMetrics.getInstance();
-    String reason = "collapsed:test_accumulate";
-
-    metrics.onCollapsedSpans(reason, 3);
-    metrics.onCollapsedSpans(reason, 4);
-
-    StatsMetrics.TaggedCounter counter = countersByTag().get(reason);
-    assertEquals(StatsMetrics.COLLAPSED_SPANS, counter.getName());
-    assertEquals(reason, counter.getTag());
-    assertEquals(7, counter.getValue(), "getValue reports the running total");
-
-    // First drain returns the whole accumulated delta; a second drain with no activity returns 0.
-    assertEquals(7, counter.getValueAndReset(), "first drain returns the accumulated delta");
-    assertEquals(0, counter.getValueAndReset(), "no new activity -> zero delta");
-
-    metrics.onCollapsedSpans(reason, 5);
-    assertEquals(5, counter.getValueAndReset(), "only the post-drain increment is returned");
-  }
-
-  @Test
-  void separateReasonsGetSeparateCounters() {
-    StatsMetrics metrics = StatsMetrics.getInstance();
-    String collapsed = "collapsed:test_separate";
-    String oversized = "oversized:test_separate";
-
-    metrics.onCollapsedSpans(collapsed, 2);
-    metrics.onCollapsedSpans(oversized, 9);
-
-    Map<String, StatsMetrics.TaggedCounter> counters = countersByTag();
-    assertEquals(2, counters.get(collapsed).getValue());
-    assertEquals(9, counters.get(oversized).getValue());
-  }
-
-  @Test
-  void nonPositiveCountsAreIgnored() {
-    StatsMetrics metrics = StatsMetrics.getInstance();
-    String reason = "collapsed:test_nonpositive";
-
-    metrics.onCollapsedSpans(reason, 0);
-    metrics.onCollapsedSpans(reason, -5);
-
-    // No counter is created for a reason that never saw a positive count.
-    assertNull(countersByTag().get(reason), "no counter created for non-positive counts");
-
-    metrics.onCollapsedSpans(reason, 4);
-    assertEquals(4, countersByTag().get(reason).getValue());
-    // A later non-positive count leaves the running total untouched.
-    metrics.onCollapsedSpans(reason, -1);
-    assertEquals(4, countersByTag().get(reason).getValue());
-  }
-
-  @Test
-  void wholeKeyCollapseIncrementsPreCreatedCounter() {
-    StatsMetrics metrics = StatsMetrics.getInstance();
-
-    // The whole_key counter is pre-created at construction, so it is always present in the drain.
-    StatsMetrics.TaggedCounter counter = countersByTag().get(StatsMetrics.COLLAPSED_WHOLE_KEY);
-    assertEquals(StatsMetrics.COLLAPSED_SPANS, counter.getName());
-    assertEquals(StatsMetrics.COLLAPSED_WHOLE_KEY, counter.getTag());
-
-    long before = counter.getValue();
-    metrics.onWholeKeyCollapse();
-    metrics.onWholeKeyCollapse();
-    assertEquals(before + 2, counter.getValue(), "each call increments the counter by one");
-
-    // Routing the same tag through onCollapsedSpans hits the same pre-created counter instance.
-    assertTrue(
-        countersByTag().get(StatsMetrics.COLLAPSED_WHOLE_KEY) == counter,
-        "whole_key resolves to a single stable counter");
-    metrics.onCollapsedSpans(StatsMetrics.COLLAPSED_WHOLE_KEY, 3);
-    assertEquals(before + 5, counter.getValue());
-  }
-
-  @Test
-  void reasonCounterIsStableAcrossLookups() {
-    StatsMetrics metrics = StatsMetrics.getInstance();
-    String reason = "collapsed:test_stable";
-
-    metrics.onCollapsedSpans(reason, 1);
-    StatsMetrics.TaggedCounter first = countersByTag().get(reason);
-    metrics.onCollapsedSpans(reason, 1);
-    StatsMetrics.TaggedCounter second = countersByTag().get(reason);
-
-    assertTrue(first == second, "same reason maps to the same counter instance");
-    assertEquals(2, first.getValue());
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/profiling/ProfilerFlareLoggerTest.java b/internal-api/src/test/java/datadog/trace/api/profiling/ProfilerFlareLoggerTest.java
index f42747b5576..5c203445a05 100644
--- a/internal-api/src/test/java/datadog/trace/api/profiling/ProfilerFlareLoggerTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/profiling/ProfilerFlareLoggerTest.java
@@ -39,372 +39,365 @@
 
 class ProfilerFlareLoggerTest {
 
-  private ProfilerFlareLogger logger;
-
-  @BeforeEach
-  void setUp() throws Exception {
-    logger = ProfilerFlareLogger.getInstance();
-  }
-
-  @AfterEach
-  void tearDown() throws Exception {
-    logger.cleanup();
-  }
-
-  // Singleton Pattern Tests
-  @Test
-  void testSingletonConsistency() {
-    ProfilerFlareLogger instance1 = ProfilerFlareLogger.getInstance();
-    ProfilerFlareLogger instance2 = ProfilerFlareLogger.getInstance();
-
-    assertSame(instance1, instance2);
-  }
-
-  @Test
-  void testSingletonThreadSafety() throws Exception {
-    int threadCount = 10;
-    ExecutorService executor = Executors.newFixedThreadPool(threadCount);
-    List<Future<ProfilerFlareLogger>> futures = new ArrayList<>();
-
-    for (int i = 0; i < threadCount; i++) {
-      futures.add(executor.submit(ProfilerFlareLogger::getInstance));
-    }
-
-    ProfilerFlareLogger firstInstance = futures.get(0).get();
-    for (Future<ProfilerFlareLogger> future : futures) {
-      assertSame(firstInstance, future.get());
-    }
-
-    executor.shutdown();
-    assertTrue(executor.awaitTermination(5, TimeUnit.SECONDS));
-  }
-
-  @Test
-  void testTracerFlareReporterRegistration() {
-    try (MockedStatic<TracerFlare> mockedStatic = mockStatic(TracerFlare.class)) {
-      ProfilerFlareLogger loggerInstance = new ProfilerFlareLogger();
-      mockedStatic.verify(() -> TracerFlare.addReporter(loggerInstance));
-    }
-  }
-
-  // Logging Functionality Tests
-  @Test
-  void testBasicLogging() {
-    assertTrue(logger.log("Test message"));
-  }
-
-  @Test
-  void testLoggingWithArguments() {
-    assertTrue(logger.log("Test message with {} and {}", "arg1", 42));
-  }
-
-  @Test
-  void testLoggingWithException() {
-    Exception testException = new RuntimeException("Test exception");
-    assertTrue(logger.log("Error occurred: {}", "details", testException));
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"", "   ", "Simple message", "Message with special chars: !@#$%^&*()"})
-  void testLoggingVariousMessages(String message) {
-    assertTrue(logger.log(message));
-  }
-
-  @Test
-  void testLoggingNullMessage() {
-    assertTrue(logger.log(null));
-  }
-
-  @Test
-  void testLoggingNullArguments() {
-    assertTrue(logger.log("Message with null: {}", (Object) null));
-  }
-
-  @ParameterizedTest
-  @MethodSource("provideLogMessageFormats")
-  void testSLF4JFormatting(String format, Object[] args, String expectedSubstring) {
-    assertTrue(logger.log(format, args));
-    // Additional verification could be added if we can access the logged content
-  }
-
-  private static Stream<Arguments> provideLogMessageFormats() {
-    return Stream.of(
-        Arguments.of("Simple message", new Object[] {}, "Simple message"),
-        Arguments.of("Message with {}", new Object[] {"placeholder"}, "placeholder"),
-        Arguments.of("Multiple {} and {}", new Object[] {"first", "second"}, "first"),
-        Arguments.of("Number: {}", new Object[] {123}, "123"),
-        Arguments.of("Boolean: {}", new Object[] {true}, "true"));
-  }
-
-  // Capacity Management Tests
-  @Test
-  void testCapacityLimitEnforcement() throws Exception {
-    int capacity = logger.getMaxReportCapacity();
-
-    assertEquals(2 * 1024 * 1024, capacity); // 2MiB
-  }
-
-  @Test
-  void testLoggingWithinCapacity() {
-    for (int i = 0; i < 100; i++) {
-      assertTrue(logger.log("Message {}", i));
-    }
-  }
-
-  @Test
-  void testCapacityRejection() {
-    // Fill up capacity with large messages
-    StringBuilder largeMessage = new StringBuilder();
-    for (int i = 0; i < 10000; i++) {
-      largeMessage.append("Large message content ");
-    }
-
-    int iterations = logger.getMaxReportCapacity() / largeMessage.length();
-    String message = largeMessage.toString();
-
-    // We must accept all messages until capacity
-    for (int i = 0; i < iterations; i++) {
-      assertTrue(logger.log(message));
+    private ProfilerFlareLogger logger;
+
+    @BeforeEach
+    void setUp() throws Exception {
+        logger = ProfilerFlareLogger.getInstance();
+    }
+
+    @AfterEach
+    void tearDown() throws Exception {
+        logger.cleanup();
+    }
+
+    // Singleton Pattern Tests
+    @Test
+    void testSingletonConsistency() {
+        ProfilerFlareLogger instance1 = ProfilerFlareLogger.getInstance();
+        ProfilerFlareLogger instance2 = ProfilerFlareLogger.getInstance();
+
+        assertSame(instance1, instance2);
+    }
+
+    @Test
+    void testSingletonThreadSafety() throws Exception {
+        int threadCount = 10;
+        ExecutorService executor = Executors.newFixedThreadPool(threadCount);
+        List<Future<ProfilerFlareLogger>> futures = new ArrayList<>();
+
+        for (int i = 0; i < threadCount; i++) {
+            futures.add(executor.submit(ProfilerFlareLogger::getInstance));
+        }
+
+        ProfilerFlareLogger firstInstance = futures.get(0).get();
+        for (Future<ProfilerFlareLogger> future : futures) {
+            assertSame(firstInstance, future.get());
+        }
+
+        executor.shutdown();
+        assertTrue(executor.awaitTermination(5, TimeUnit.SECONDS));
+    }
+
+    @Test
+    void testTracerFlareReporterRegistration() {
+        try (MockedStatic<TracerFlare> mockedStatic = mockStatic(TracerFlare.class)) {
+            ProfilerFlareLogger loggerInstance = new ProfilerFlareLogger();
+            mockedStatic.verify(() -> TracerFlare.addReporter(loggerInstance));
+        }
+    }
+
+    // Logging Functionality Tests
+    @Test
+    void testBasicLogging() {
+        assertTrue(logger.log("Test message"));
+    }
+
+    @Test
+    void testLoggingWithArguments() {
+        assertTrue(logger.log("Test message with {} and {}", "arg1", 42));
+    }
+
+    @Test
+    void testLoggingWithException() {
+        Exception testException = new RuntimeException("Test exception");
+        assertTrue(logger.log("Error occurred: {}", "details", testException));
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"", "   ", "Simple message", "Message with special chars: !@#$%^&*()"})
+    void testLoggingVariousMessages(String message) {
+        assertTrue(logger.log(message));
+    }
+
+    @Test
+    void testLoggingNullMessage() {
+        assertTrue(logger.log(null));
     }
 
-    // Next message should be rejected
-    assertFalse(logger.log(message));
-  }
-
-  @Test
-  void testCapacityAccuracy() throws Exception {
-    String testMessage = "Test message";
-    logger.log(testMessage);
-
-    int usedCapacity = logger.getUsedReportCapacity();
-    assertTrue(usedCapacity > testMessage.length()); // Should include timestamp and formatting
-  }
-
-  // TracerFlare Integration Tests
-  @Test
-  void testAddReportToFlareWithEmptyLogs() throws Exception {
-    ZipOutputStream mockZip = mock(ZipOutputStream.class);
-
-    logger.addReportToFlare(mockZip);
-
-    // Should not add any entries for empty logs
-    verify(mockZip, never()).putNextEntry(any());
-  }
-
-  @Test
-  void testAddReportToFlareWithLogs() throws Exception {
-    ZipOutputStream mockZip = mock(ZipOutputStream.class);
-
-    logger.log("Test message 1");
-    logger.log("Test message 2");
-
-    try (MockedStatic<TracerFlare> mockedStatic = mockStatic(TracerFlare.class)) {
-      logger.addReportToFlare(mockZip);
-      mockedStatic.verify(
-          () -> TracerFlare.addText(eq(mockZip), eq("profiler_log.txt"), anyString()));
-    }
-  }
-
-  @Test
-  void testAddReportToFlareIOException() throws Exception {
-    ZipOutputStream mockZip = mock(ZipOutputStream.class);
-    logger.log("Test message");
-
-    try (MockedStatic<TracerFlare> mockedStatic = mockStatic(TracerFlare.class)) {
-      mockedStatic
-          .when(() -> TracerFlare.addText(any(), any(), any()))
-          .thenThrow(new IOException("Test IO exception"));
+    @Test
+    void testLoggingNullArguments() {
+        assertTrue(logger.log("Message with null: {}", (Object) null));
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideLogMessageFormats")
+    void testSLF4JFormatting(String format, Object[] args, String expectedSubstring) {
+        assertTrue(logger.log(format, args));
+        // Additional verification could be added if we can access the logged content
+    }
+
+    private static Stream<Arguments> provideLogMessageFormats() {
+        return Stream.of(
+                Arguments.of("Simple message", new Object[] {}, "Simple message"),
+                Arguments.of("Message with {}", new Object[] {"placeholder"}, "placeholder"),
+                Arguments.of("Multiple {} and {}", new Object[] {"first", "second"}, "first"),
+                Arguments.of("Number: {}", new Object[] {123}, "123"),
+                Arguments.of("Boolean: {}", new Object[] {true}, "true"));
+    }
+
+    // Capacity Management Tests
+    @Test
+    void testCapacityLimitEnforcement() throws Exception {
+        int capacity = logger.getMaxReportCapacity();
 
-      assertThrows(IOException.class, () -> logger.addReportToFlare(mockZip));
-    }
-  }
+        assertEquals(2 * 1024 * 1024, capacity); // 2MiB
+    }
+
+    @Test
+    void testLoggingWithinCapacity() {
+        for (int i = 0; i < 100; i++) {
+            assertTrue(logger.log("Message {}", i));
+        }
+    }
 
-  @Test
-  void testFlareContentFormat() throws Exception {
-    logger.log("Message 1");
-    logger.log("Message 2 with {}", "arg");
+    @Test
+    void testCapacityRejection() {
+        // Fill up capacity with large messages
+        StringBuilder largeMessage = new StringBuilder();
+        for (int i = 0; i < 10000; i++) {
+            largeMessage.append("Large message content ");
+        }
 
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    ZipOutputStream zip = new ZipOutputStream(baos);
+        int iterations = logger.getMaxReportCapacity() / largeMessage.length();
+        String message = largeMessage.toString();
+
+        // We must accept all messages until capacity
+        for (int i = 0; i < iterations; i++) {
+            assertTrue(logger.log(message));
+        }
+
+        // Next message should be rejected
+        assertFalse(logger.log(message));
+    }
+
+    @Test
+    void testCapacityAccuracy() throws Exception {
+        String testMessage = "Test message";
+        logger.log(testMessage);
+
+        int usedCapacity = logger.getUsedReportCapacity();
+        assertTrue(usedCapacity > testMessage.length()); // Should include timestamp and formatting
+    }
+
+    // TracerFlare Integration Tests
+    @Test
+    void testAddReportToFlareWithEmptyLogs() throws Exception {
+        ZipOutputStream mockZip = mock(ZipOutputStream.class);
+
+        logger.addReportToFlare(mockZip);
+
+        // Should not add any entries for empty logs
+        verify(mockZip, never()).putNextEntry(any());
+    }
+
+    @Test
+    void testAddReportToFlareWithLogs() throws Exception {
+        ZipOutputStream mockZip = mock(ZipOutputStream.class);
+
+        logger.log("Test message 1");
+        logger.log("Test message 2");
+
+        try (MockedStatic<TracerFlare> mockedStatic = mockStatic(TracerFlare.class)) {
+            logger.addReportToFlare(mockZip);
+            mockedStatic.verify(() -> TracerFlare.addText(eq(mockZip), eq("profiler_log.txt"), anyString()));
+        }
+    }
 
-    try (MockedStatic<TracerFlare> mockedStatic = mockStatic(TracerFlare.class)) {
-      mockedStatic
-          .when(() -> TracerFlare.addText(any(), any(), any()))
-          .then(
-              invocation -> {
+    @Test
+    void testAddReportToFlareIOException() throws Exception {
+        ZipOutputStream mockZip = mock(ZipOutputStream.class);
+        logger.log("Test message");
+
+        try (MockedStatic<TracerFlare> mockedStatic = mockStatic(TracerFlare.class)) {
+            mockedStatic
+                    .when(() -> TracerFlare.addText(any(), any(), any()))
+                    .thenThrow(new IOException("Test IO exception"));
+
+            assertThrows(IOException.class, () -> logger.addReportToFlare(mockZip));
+        }
+    }
+
+    @Test
+    void testFlareContentFormat() throws Exception {
+        logger.log("Message 1");
+        logger.log("Message 2 with {}", "arg");
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ZipOutputStream zip = new ZipOutputStream(baos);
+
+        try (MockedStatic<TracerFlare> mockedStatic = mockStatic(TracerFlare.class)) {
+            mockedStatic.when(() -> TracerFlare.addText(any(), any(), any())).then(invocation -> {
                 String content = invocation.getArgument(2);
                 assertTrue(content.contains("Message 1"));
                 assertTrue(content.contains("Message 2 with arg"));
                 assertTrue(content.contains("\n")); // Should have newlines between messages
                 return null;
-              });
-
-      logger.addReportToFlare(zip);
-    }
-  }
-
-  // Cleanup Tests
-  @Test
-  void testCleanup() throws Exception {
-    logger.log("Test message 1");
-    logger.log("Test message 2");
-
-    logger.cleanup();
-
-    assertEquals(0, logger.linesSize());
-    assertEquals(0, logger.getUsedReportCapacity());
-  }
-
-  @Test
-  void testLoggingAfterCleanup() {
-    logger.log("Before cleanup");
-    logger.cleanup();
-
-    assertTrue(logger.log("After cleanup"));
-  }
-
-  // Thread Safety Tests
-  @Test
-  void testConcurrentLogging() throws Exception {
-    int threadCount = 20;
-    int messagesPerThread = 50;
-    ExecutorService executor = Executors.newFixedThreadPool(threadCount);
-    CountDownLatch startLatch = new CountDownLatch(1);
-    CountDownLatch doneLatch = new CountDownLatch(threadCount);
-    AtomicInteger successCount = new AtomicInteger(0);
-
-    for (int i = 0; i < threadCount; i++) {
-      final int threadId = i;
-      executor.submit(
-          () -> {
-            try {
-              startLatch.await();
-              for (int j = 0; j < messagesPerThread; j++) {
-                if (logger.log("Thread {} message {}", threadId, j)) {
-                  successCount.incrementAndGet();
+            });
+
+            logger.addReportToFlare(zip);
+        }
+    }
+
+    // Cleanup Tests
+    @Test
+    void testCleanup() throws Exception {
+        logger.log("Test message 1");
+        logger.log("Test message 2");
+
+        logger.cleanup();
+
+        assertEquals(0, logger.linesSize());
+        assertEquals(0, logger.getUsedReportCapacity());
+    }
+
+    @Test
+    void testLoggingAfterCleanup() {
+        logger.log("Before cleanup");
+        logger.cleanup();
+
+        assertTrue(logger.log("After cleanup"));
+    }
+
+    // Thread Safety Tests
+    @Test
+    void testConcurrentLogging() throws Exception {
+        int threadCount = 20;
+        int messagesPerThread = 50;
+        ExecutorService executor = Executors.newFixedThreadPool(threadCount);
+        CountDownLatch startLatch = new CountDownLatch(1);
+        CountDownLatch doneLatch = new CountDownLatch(threadCount);
+        AtomicInteger successCount = new AtomicInteger(0);
+
+        for (int i = 0; i < threadCount; i++) {
+            final int threadId = i;
+            executor.submit(() -> {
+                try {
+                    startLatch.await();
+                    for (int j = 0; j < messagesPerThread; j++) {
+                        if (logger.log("Thread {} message {}", threadId, j)) {
+                            successCount.incrementAndGet();
+                        }
+                    }
+                } catch (Exception e) {
+                    fail("Exception in thread: " + e.getMessage());
+                } finally {
+                    doneLatch.countDown();
                 }
-              }
-            } catch (Exception e) {
-              fail("Exception in thread: " + e.getMessage());
-            } finally {
-              doneLatch.countDown();
+            });
+        }
+
+        startLatch.countDown();
+        assertTrue(doneLatch.await(10, TimeUnit.SECONDS));
+
+        // At least some messages should succeed
+        assertTrue(successCount.get() > 0);
+
+        executor.shutdown();
+        assertTrue(executor.awaitTermination(5, TimeUnit.SECONDS));
+    }
+
+    @Test
+    void testConcurrentCleanupAndLogging() throws Exception {
+        int iterations = 100;
+        ExecutorService executor = Executors.newFixedThreadPool(3);
+
+        for (int i = 0; i < iterations; i++) {
+            CountDownLatch latch = new CountDownLatch(2);
+
+            // Logger thread
+            executor.submit(() -> {
+                logger.log("Concurrent message");
+                latch.countDown();
+            });
+
+            // Cleanup thread
+            executor.submit(() -> {
+                logger.cleanup();
+                latch.countDown();
+            });
+
+            assertTrue(latch.await(1, TimeUnit.SECONDS));
+        }
+
+        executor.shutdown();
+        assertTrue(executor.awaitTermination(5, TimeUnit.SECONDS));
+    }
+
+    // Performance and Edge Case Tests
+    @Test
+    void testLargeMessageHandling() {
+        StringBuilder largeMessage = new StringBuilder();
+        for (int i = 0; i < 1000; i++) {
+            largeMessage.append("This is a large message with lots of content. ");
+        }
+
+        assertTrue(logger.log(largeMessage.toString()));
+    }
+
+    @Test
+    void testManySmallMessages() {
+        for (int i = 0; i < 10000; i++) {
+            if (!logger.log("Message {}", i)) {
+                // Hit capacity limit, which is expected
+                break;
             }
-          });
-    }
-
-    startLatch.countDown();
-    assertTrue(doneLatch.await(10, TimeUnit.SECONDS));
-
-    // At least some messages should succeed
-    assertTrue(successCount.get() > 0);
-
-    executor.shutdown();
-    assertTrue(executor.awaitTermination(5, TimeUnit.SECONDS));
-  }
-
-  @Test
-  void testConcurrentCleanupAndLogging() throws Exception {
-    int iterations = 100;
-    ExecutorService executor = Executors.newFixedThreadPool(3);
-
-    for (int i = 0; i < iterations; i++) {
-      CountDownLatch latch = new CountDownLatch(2);
-
-      // Logger thread
-      executor.submit(
-          () -> {
-            logger.log("Concurrent message");
-            latch.countDown();
-          });
-
-      // Cleanup thread
-      executor.submit(
-          () -> {
-            logger.cleanup();
-            latch.countDown();
-          });
-
-      assertTrue(latch.await(1, TimeUnit.SECONDS));
-    }
-
-    executor.shutdown();
-    assertTrue(executor.awaitTermination(5, TimeUnit.SECONDS));
-  }
-
-  // Performance and Edge Case Tests
-  @Test
-  void testLargeMessageHandling() {
-    StringBuilder largeMessage = new StringBuilder();
-    for (int i = 0; i < 1000; i++) {
-      largeMessage.append("This is a large message with lots of content. ");
-    }
-
-    assertTrue(logger.log(largeMessage.toString()));
-  }
-
-  @Test
-  void testManySmallMessages() {
-    for (int i = 0; i < 10000; i++) {
-      if (!logger.log("Message {}", i)) {
-        // Hit capacity limit, which is expected
-        break;
-      }
-    }
-    // Test should complete without throwing exceptions
-  }
-
-  @Test
-  void testTimestampFormatting() {
-    // Log a message and verify it doesn't throw exceptions during timestamp formatting
-    assertDoesNotThrow(() -> logger.log("Timestamp test"));
-  }
-
-  @Test
-  void testExceptionWithNullMessage() {
-    Exception testException = new RuntimeException();
-    assertTrue(logger.log("Exception: {}", testException));
-  }
-
-  @Test
-  void testSpecialCharacterHandling() {
-    assertTrue(logger.log("Special chars: \n\t\r\\\"'"));
-    assertTrue(logger.log("Unicode: \u2603 \u2764 \u1F44D"));
-  }
-
-  @Test
-  void testEmptyAndWhitespaceMessages() {
-    assertTrue(logger.log(""));
-    assertTrue(logger.log("   "));
-    assertTrue(logger.log("\t\n\r"));
-  }
-
-  @Test
-  void testMultipleExceptions() {
-    Exception cause = new IllegalStateException("Root cause");
-    Exception wrapper = new RuntimeException("Wrapper", cause);
-
-    assertTrue(logger.log("Nested exception: {}", wrapper));
-  }
-
-  @Test
-  void testLogAfterCapacityHit() {
-    // Fill to capacity
-    StringBuilder largeMessage = new StringBuilder();
-    for (int i = 0; i < 50000; i++) {
-      largeMessage.append("Large message ");
-    }
-
-    String message = largeMessage.toString();
-    while (logger.log(message)) {
-      // Keep adding until capacity is hit
-    }
-
-    // Verify subsequent messages are rejected
-    assertFalse(logger.log("Should be rejected: " + message));
-    assertFalse(logger.log("Also rejected: " + message));
-
-    // After cleanup, should accept messages again
-    logger.cleanup();
-    assertTrue(logger.log("After cleanup"));
-  }
+        }
+        // Test should complete without throwing exceptions
+    }
+
+    @Test
+    void testTimestampFormatting() {
+        // Log a message and verify it doesn't throw exceptions during timestamp formatting
+        assertDoesNotThrow(() -> logger.log("Timestamp test"));
+    }
+
+    @Test
+    void testExceptionWithNullMessage() {
+        Exception testException = new RuntimeException();
+        assertTrue(logger.log("Exception: {}", testException));
+    }
+
+    @Test
+    void testSpecialCharacterHandling() {
+        assertTrue(logger.log("Special chars: \n\t\r\\\"'"));
+        assertTrue(logger.log("Unicode: \u2603 \u2764 \u1F44D"));
+    }
+
+    @Test
+    void testEmptyAndWhitespaceMessages() {
+        assertTrue(logger.log(""));
+        assertTrue(logger.log("   "));
+        assertTrue(logger.log("\t\n\r"));
+    }
+
+    @Test
+    void testMultipleExceptions() {
+        Exception cause = new IllegalStateException("Root cause");
+        Exception wrapper = new RuntimeException("Wrapper", cause);
+
+        assertTrue(logger.log("Nested exception: {}", wrapper));
+    }
+
+    @Test
+    void testLogAfterCapacityHit() {
+        // Fill to capacity
+        StringBuilder largeMessage = new StringBuilder();
+        for (int i = 0; i < 50000; i++) {
+            largeMessage.append("Large message ");
+        }
+
+        String message = largeMessage.toString();
+        while (logger.log(message)) {
+            // Keep adding until capacity is hit
+        }
+
+        // Verify subsequent messages are rejected
+        assertFalse(logger.log("Should be rejected: " + message));
+        assertFalse(logger.log("Also rejected: " + message));
+
+        // After cleanup, should accept messages again
+        logger.cleanup();
+        assertTrue(logger.log("After cleanup"));
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/profiling/ProfilingEnablementTest.java b/internal-api/src/test/java/datadog/trace/api/profiling/ProfilingEnablementTest.java
index a1a4233766c..707ea61f4ad 100644
--- a/internal-api/src/test/java/datadog/trace/api/profiling/ProfilingEnablementTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/profiling/ProfilingEnablementTest.java
@@ -12,66 +12,66 @@
 
 class ProfilingEnablementTest {
 
-  @ParameterizedTest
-  @MethodSource("provideValues")
-  void of(String enabledValue, ProfilingEnablement expected) {
-    ProfilingEnablement.validate(enabledValue); // make jacoco happy
-    assertEquals(expected, ProfilingEnablement.of(enabledValue));
-  }
-
-  @ParameterizedTest
-  @MethodSource("provideValues1")
-  void from(String enabledValue, String ssi, ProfilingEnablement expected) {
-    Properties props = new Properties();
-    if (enabledValue != null) {
-      props.setProperty(ProfilingConfig.PROFILING_ENABLED, enabledValue);
+    @ParameterizedTest
+    @MethodSource("provideValues")
+    void of(String enabledValue, ProfilingEnablement expected) {
+        ProfilingEnablement.validate(enabledValue); // make jacoco happy
+        assertEquals(expected, ProfilingEnablement.of(enabledValue));
     }
-    if (ssi != null) {
-      props.setProperty("injection.enabled", ssi);
+
+    @ParameterizedTest
+    @MethodSource("provideValues1")
+    void from(String enabledValue, String ssi, ProfilingEnablement expected) {
+        Properties props = new Properties();
+        if (enabledValue != null) {
+            props.setProperty(ProfilingConfig.PROFILING_ENABLED, enabledValue);
+        }
+        if (ssi != null) {
+            props.setProperty("injection.enabled", ssi);
+        }
+        ConfigProvider config = ConfigProvider.withPropertiesOverride(props);
+        assertEquals(expected, ProfilingEnablement.from(config));
     }
-    ConfigProvider config = ConfigProvider.withPropertiesOverride(props);
-    assertEquals(expected, ProfilingEnablement.from(config));
-  }
 
-  private static Stream<Arguments> provideValues() {
-    return Stream.of(
-        Arguments.of("true", ProfilingEnablement.ENABLED),
-        Arguments.of("TRUE", ProfilingEnablement.ENABLED),
-        Arguments.of("tRuE", ProfilingEnablement.ENABLED),
-        Arguments.of("1", ProfilingEnablement.ENABLED),
-        Arguments.of("auto", ProfilingEnablement.AUTO),
-        Arguments.of("AUTO", ProfilingEnablement.AUTO),
-        Arguments.of("aUtO", ProfilingEnablement.AUTO),
-        Arguments.of("false", ProfilingEnablement.DISABLED),
-        Arguments.of("FALSE", ProfilingEnablement.DISABLED),
-        Arguments.of("fAlSe", ProfilingEnablement.DISABLED),
-        Arguments.of("0", ProfilingEnablement.DISABLED),
-        Arguments.of("anything", ProfilingEnablement.DISABLED),
-        Arguments.of(null, ProfilingEnablement.DISABLED));
-  }
+    private static Stream<Arguments> provideValues() {
+        return Stream.of(
+                Arguments.of("true", ProfilingEnablement.ENABLED),
+                Arguments.of("TRUE", ProfilingEnablement.ENABLED),
+                Arguments.of("tRuE", ProfilingEnablement.ENABLED),
+                Arguments.of("1", ProfilingEnablement.ENABLED),
+                Arguments.of("auto", ProfilingEnablement.AUTO),
+                Arguments.of("AUTO", ProfilingEnablement.AUTO),
+                Arguments.of("aUtO", ProfilingEnablement.AUTO),
+                Arguments.of("false", ProfilingEnablement.DISABLED),
+                Arguments.of("FALSE", ProfilingEnablement.DISABLED),
+                Arguments.of("fAlSe", ProfilingEnablement.DISABLED),
+                Arguments.of("0", ProfilingEnablement.DISABLED),
+                Arguments.of("anything", ProfilingEnablement.DISABLED),
+                Arguments.of(null, ProfilingEnablement.DISABLED));
+    }
 
-  private static Stream<Arguments> provideValues1() {
-    return Stream.of(
-        Arguments.of("true", null, ProfilingEnablement.ENABLED),
-        Arguments.of("true", "tracer", ProfilingEnablement.ENABLED),
-        Arguments.of("true", "tracer,profiler", ProfilingEnablement.ENABLED),
-        Arguments.of("1", null, ProfilingEnablement.ENABLED),
-        Arguments.of("1", "tracer", ProfilingEnablement.ENABLED),
-        Arguments.of("1", "tracer,profiler", ProfilingEnablement.ENABLED),
-        Arguments.of("auto", null, ProfilingEnablement.AUTO),
-        Arguments.of("auto", "tracer", ProfilingEnablement.AUTO),
-        Arguments.of("auto", "tracer,profiler", ProfilingEnablement.AUTO),
-        Arguments.of("false", null, ProfilingEnablement.DISABLED),
-        Arguments.of("false", "tracer", ProfilingEnablement.DISABLED),
-        Arguments.of("false", "tracer,profiler", ProfilingEnablement.INJECTED),
-        Arguments.of("0", null, ProfilingEnablement.DISABLED),
-        Arguments.of("0", "tracer", ProfilingEnablement.DISABLED),
-        Arguments.of("0", "tracer,profiler", ProfilingEnablement.INJECTED),
-        Arguments.of("anything", null, ProfilingEnablement.DISABLED),
-        Arguments.of("anything", "tracer", ProfilingEnablement.DISABLED),
-        Arguments.of("anything", "tracer,profiler", ProfilingEnablement.INJECTED),
-        Arguments.of(null, null, ProfilingEnablement.DISABLED),
-        Arguments.of(null, "tracer", ProfilingEnablement.DISABLED),
-        Arguments.of(null, "tracer,profiler", ProfilingEnablement.INJECTED));
-  }
+    private static Stream<Arguments> provideValues1() {
+        return Stream.of(
+                Arguments.of("true", null, ProfilingEnablement.ENABLED),
+                Arguments.of("true", "tracer", ProfilingEnablement.ENABLED),
+                Arguments.of("true", "tracer,profiler", ProfilingEnablement.ENABLED),
+                Arguments.of("1", null, ProfilingEnablement.ENABLED),
+                Arguments.of("1", "tracer", ProfilingEnablement.ENABLED),
+                Arguments.of("1", "tracer,profiler", ProfilingEnablement.ENABLED),
+                Arguments.of("auto", null, ProfilingEnablement.AUTO),
+                Arguments.of("auto", "tracer", ProfilingEnablement.AUTO),
+                Arguments.of("auto", "tracer,profiler", ProfilingEnablement.AUTO),
+                Arguments.of("false", null, ProfilingEnablement.DISABLED),
+                Arguments.of("false", "tracer", ProfilingEnablement.DISABLED),
+                Arguments.of("false", "tracer,profiler", ProfilingEnablement.INJECTED),
+                Arguments.of("0", null, ProfilingEnablement.DISABLED),
+                Arguments.of("0", "tracer", ProfilingEnablement.DISABLED),
+                Arguments.of("0", "tracer,profiler", ProfilingEnablement.INJECTED),
+                Arguments.of("anything", null, ProfilingEnablement.DISABLED),
+                Arguments.of("anything", "tracer", ProfilingEnablement.DISABLED),
+                Arguments.of("anything", "tracer,profiler", ProfilingEnablement.INJECTED),
+                Arguments.of(null, null, ProfilingEnablement.DISABLED),
+                Arguments.of(null, "tracer", ProfilingEnablement.DISABLED),
+                Arguments.of(null, "tracer,profiler", ProfilingEnablement.INJECTED));
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/profiling/RecordingInputStreamTest.java b/internal-api/src/test/java/datadog/trace/api/profiling/RecordingInputStreamTest.java
index 812586aa894..c659b641831 100644
--- a/internal-api/src/test/java/datadog/trace/api/profiling/RecordingInputStreamTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/profiling/RecordingInputStreamTest.java
@@ -8,18 +8,17 @@
 
 class RecordingInputStreamTest {
 
-  @Test
-  void isEmpty() throws Exception {
-    RecordingInputStream instance = new RecordingInputStream(new ByteArrayInputStream(new byte[0]));
-    assertTrue(instance.isEmpty());
-  }
+    @Test
+    void isEmpty() throws Exception {
+        RecordingInputStream instance = new RecordingInputStream(new ByteArrayInputStream(new byte[0]));
+        assertTrue(instance.isEmpty());
+    }
 
-  @Test
-  void isNotEmpty() throws Exception {
-    RecordingInputStream instance =
-        new RecordingInputStream(new ByteArrayInputStream(new byte[] {1, 2, 3}));
-    assertFalse(instance.isEmpty());
-    instance.read(new byte[3], 0, 3); // exhaust the stream
-    assertFalse(instance.isEmpty()); // still should not report as empty
-  }
+    @Test
+    void isNotEmpty() throws Exception {
+        RecordingInputStream instance = new RecordingInputStream(new ByteArrayInputStream(new byte[] {1, 2, 3}));
+        assertFalse(instance.isEmpty());
+        instance.read(new byte[3], 0, 3); // exhaust the stream
+        assertFalse(instance.isEmpty()); // still should not report as empty
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/propagation/W3CTraceParentTest.java b/internal-api/src/test/java/datadog/trace/api/propagation/W3CTraceParentTest.java
index 6a600cc9244..f1a285fc5e4 100644
--- a/internal-api/src/test/java/datadog/trace/api/propagation/W3CTraceParentTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/propagation/W3CTraceParentTest.java
@@ -17,75 +17,73 @@
 
 public class W3CTraceParentTest {
 
-  @ParameterizedTest(name = "{0}")
-  @MethodSource("buildProducesCorrectFormatArguments")
-  void buildProducesCorrectFormat(
-      String scenario, DDTraceId traceId, long spanId, boolean isSampled, String expected) {
-    assertEquals(expected, W3CTraceParent.from(traceId, spanId, isSampled));
-  }
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("buildProducesCorrectFormatArguments")
+    void buildProducesCorrectFormat(
+            String scenario, DDTraceId traceId, long spanId, boolean isSampled, String expected) {
+        assertEquals(expected, W3CTraceParent.from(traceId, spanId, isSampled));
+    }
 
-  static Stream<Arguments> buildProducesCorrectFormatArguments() {
-    return Stream.of(
-        arguments(
-            "sampled",
-            DDTraceId.from(1),
-            2L,
-            true,
-            "00-00000000000000000000000000000001-0000000000000002-01"),
-        arguments(
-            "not sampled",
-            DDTraceId.from(1),
-            2L,
-            false,
-            "00-00000000000000000000000000000001-0000000000000002-00"),
-        arguments(
-            "W3C example",
-            DDTraceId.fromHex("0af7651916cd43dd8448eb211c80319c"),
-            0x00f067aa0ba902b7L,
-            true,
-            "00-0af7651916cd43dd8448eb211c80319c-00f067aa0ba902b7-01"),
-        arguments(
-            "Long.MAX_VALUE ids",
-            DDTraceId.from(Long.MAX_VALUE),
-            Long.MAX_VALUE,
-            true,
-            "00-00000000000000007fffffffffffffff-7fffffffffffffff-01"));
-  }
+    static Stream<Arguments> buildProducesCorrectFormatArguments() {
+        return Stream.of(
+                arguments(
+                        "sampled",
+                        DDTraceId.from(1),
+                        2L,
+                        true,
+                        "00-00000000000000000000000000000001-0000000000000002-01"),
+                arguments(
+                        "not sampled",
+                        DDTraceId.from(1),
+                        2L,
+                        false,
+                        "00-00000000000000000000000000000001-0000000000000002-00"),
+                arguments(
+                        "W3C example",
+                        DDTraceId.fromHex("0af7651916cd43dd8448eb211c80319c"),
+                        0x00f067aa0ba902b7L,
+                        true,
+                        "00-0af7651916cd43dd8448eb211c80319c-00f067aa0ba902b7-01"),
+                arguments(
+                        "Long.MAX_VALUE ids",
+                        DDTraceId.from(Long.MAX_VALUE),
+                        Long.MAX_VALUE,
+                        true,
+                        "00-00000000000000007fffffffffffffff-7fffffffffffffff-01"));
+    }
 
-  @Test
-  void buildMatchesW3CTraceparentFormat() {
-    // W3C format: version-traceId(32 hex)-spanId(16 hex)-flags(2 hex)
-    String result = W3CTraceParent.from(DDTraceId.from(123456789L), 987654321L, true);
-    assertTrue(result.matches("00-[0-9a-f]{32}-[0-9a-f]{16}-(00|01)"));
-  }
+    @Test
+    void buildMatchesW3CTraceparentFormat() {
+        // W3C format: version-traceId(32 hex)-spanId(16 hex)-flags(2 hex)
+        String result = W3CTraceParent.from(DDTraceId.from(123456789L), 987654321L, true);
+        assertTrue(result.matches("00-[0-9a-f]{32}-[0-9a-f]{16}-(00|01)"));
+    }
 
-  @Test
-  void buildFromSpanSampled() {
-    AgentSpan span = mock(AgentSpan.class);
-    AgentSpanContext context = mock(AgentSpanContext.class);
-    DDTraceId traceId = DDTraceId.fromHex("0af7651916cd43dd8448eb211c80319c");
-    long spanId = 0x00f067aa0ba902b7L;
+    @Test
+    void buildFromSpanSampled() {
+        AgentSpan span = mock(AgentSpan.class);
+        AgentSpanContext context = mock(AgentSpanContext.class);
+        DDTraceId traceId = DDTraceId.fromHex("0af7651916cd43dd8448eb211c80319c");
+        long spanId = 0x00f067aa0ba902b7L;
 
-    when(span.getTraceId()).thenReturn(traceId);
-    when(span.getSpanId()).thenReturn(spanId);
-    when(span.spanContext()).thenReturn(context);
-    when(context.getSamplingPriority()).thenReturn(1);
+        when(span.getTraceId()).thenReturn(traceId);
+        when(span.getSpanId()).thenReturn(spanId);
+        when(span.spanContext()).thenReturn(context);
+        when(context.getSamplingPriority()).thenReturn(1);
 
-    assertEquals(
-        "00-0af7651916cd43dd8448eb211c80319c-00f067aa0ba902b7-01", W3CTraceParent.from(span));
-  }
+        assertEquals("00-0af7651916cd43dd8448eb211c80319c-00f067aa0ba902b7-01", W3CTraceParent.from(span));
+    }
 
-  @Test
-  void buildFromSpanNotSampled() {
-    AgentSpan span = mock(AgentSpan.class);
-    AgentSpanContext context = mock(AgentSpanContext.class);
+    @Test
+    void buildFromSpanNotSampled() {
+        AgentSpan span = mock(AgentSpan.class);
+        AgentSpanContext context = mock(AgentSpanContext.class);
 
-    when(span.getTraceId()).thenReturn(DDTraceId.from(1));
-    when(span.getSpanId()).thenReturn(2L);
-    when(span.spanContext()).thenReturn(context);
-    when(context.getSamplingPriority()).thenReturn(0);
+        when(span.getTraceId()).thenReturn(DDTraceId.from(1));
+        when(span.getSpanId()).thenReturn(2L);
+        when(span.spanContext()).thenReturn(context);
+        when(context.getSamplingPriority()).thenReturn(0);
 
-    assertEquals(
-        "00-00000000000000000000000000000001-0000000000000002-00", W3CTraceParent.from(span));
-  }
+        assertEquals("00-00000000000000000000000000000001-0000000000000002-00", W3CTraceParent.from(span));
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/rum/RumInjectorConfigTest.java b/internal-api/src/test/java/datadog/trace/api/rum/RumInjectorConfigTest.java
index ba561e2e40c..a37469ba9d3 100644
--- a/internal-api/src/test/java/datadog/trace/api/rum/RumInjectorConfigTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/rum/RumInjectorConfigTest.java
@@ -11,10 +11,10 @@
 
 class RumInjectorConfigTest {
 
-  @ParameterizedTest
-  @CsvSource(
-      value = {
-        // spotless:off
+    @ParameterizedTest
+    @CsvSource(
+            value = {
+                // spotless:off
       // Minimal configuration ID
       "appId | token | null              | null | null | 6 | null | null  | null  | null  | null | null  | null  | remote-config-id",
       // Using site
@@ -55,111 +55,110 @@ class RumInjectorConfigTest {
       "appId | token | null              | null | null | 6 | null | null  | null  | null  | null            | null  | 25.5  | remote-config-id",
       "appId | token | null              | null | null | 6 | null | null  | null  | null  | null            | null  | 100   | remote-config-id",
       // spotless:on
-      },
-      delimiterString = "|",
-      nullValues = "null")
-  void testValidConfig(
-      String applicationId,
-      String clientToken,
-      String site,
-      String service,
-      String env,
-      int majorVersion,
-      String version,
-      Boolean trackUserInteractions,
-      Boolean trackResources,
-      Boolean trackLongTask,
-      PrivacyLevel defaultPrivacyLevel,
-      Float sessionSampleRate,
-      Float sessionReplaySampleRate,
-      String remoteConfigurationId) {
-    RumInjectorConfig injectorConfig =
-        new RumInjectorConfig(
-            applicationId,
-            clientToken,
-            site,
-            service,
-            env,
-            majorVersion,
-            version,
-            trackUserInteractions,
-            trackResources,
-            trackLongTask,
-            defaultPrivacyLevel,
-            sessionSampleRate,
-            sessionReplaySampleRate,
-            remoteConfigurationId);
+            },
+            delimiterString = "|",
+            nullValues = "null")
+    void testValidConfig(
+            String applicationId,
+            String clientToken,
+            String site,
+            String service,
+            String env,
+            int majorVersion,
+            String version,
+            Boolean trackUserInteractions,
+            Boolean trackResources,
+            Boolean trackLongTask,
+            PrivacyLevel defaultPrivacyLevel,
+            Float sessionSampleRate,
+            Float sessionReplaySampleRate,
+            String remoteConfigurationId) {
+        RumInjectorConfig injectorConfig = new RumInjectorConfig(
+                applicationId,
+                clientToken,
+                site,
+                service,
+                env,
+                majorVersion,
+                version,
+                trackUserInteractions,
+                trackResources,
+                trackLongTask,
+                defaultPrivacyLevel,
+                sessionSampleRate,
+                sessionReplaySampleRate,
+                remoteConfigurationId);
 
-    String jsonPayload = injectorConfig.jsonPayload();
-    assertTrue(jsonPayload.contains(applicationId));
-    assertTrue(jsonPayload.contains("site"));
-    assertTrue(jsonPayload.contains(clientToken));
-    if (site == null) {
-      assertTrue(jsonPayload.contains(DEFAULT_RUM_SITE));
-    } else {
-      assertTrue(jsonPayload.contains(site));
-    }
-    if (service == null) {
-      assertFalse(jsonPayload.contains("service"));
-    } else {
-      assertTrue(jsonPayload.contains("service"));
-      assertTrue(jsonPayload.contains(service));
-    }
-    if (env == null) {
-      assertFalse(jsonPayload.contains("env"));
-    } else {
-      assertTrue(jsonPayload.contains("env"));
-      assertTrue(jsonPayload.contains(env));
-    }
-    if (version == null) {
-      assertFalse(jsonPayload.contains("version"));
-    } else {
-      assertTrue(jsonPayload.contains("version"));
-      assertTrue(jsonPayload.contains(version));
-    }
-    if (trackUserInteractions == null) {
-      assertFalse(jsonPayload.contains("trackUserInteractions"));
-    } else {
-      assertTrue(jsonPayload.contains("trackUserInteractions"));
-    }
-    if (trackResources == null) {
-      assertFalse(jsonPayload.contains("trackResources"));
-    } else {
-      assertTrue(jsonPayload.contains("trackResources"));
-    }
-    if (trackLongTask == null) {
-      assertFalse(jsonPayload.contains("trackLongTask"));
-    } else {
-      assertTrue(jsonPayload.contains("trackLongTask"));
+        String jsonPayload = injectorConfig.jsonPayload();
+        assertTrue(jsonPayload.contains(applicationId));
+        assertTrue(jsonPayload.contains("site"));
+        assertTrue(jsonPayload.contains(clientToken));
+        if (site == null) {
+            assertTrue(jsonPayload.contains(DEFAULT_RUM_SITE));
+        } else {
+            assertTrue(jsonPayload.contains(site));
+        }
+        if (service == null) {
+            assertFalse(jsonPayload.contains("service"));
+        } else {
+            assertTrue(jsonPayload.contains("service"));
+            assertTrue(jsonPayload.contains(service));
+        }
+        if (env == null) {
+            assertFalse(jsonPayload.contains("env"));
+        } else {
+            assertTrue(jsonPayload.contains("env"));
+            assertTrue(jsonPayload.contains(env));
+        }
+        if (version == null) {
+            assertFalse(jsonPayload.contains("version"));
+        } else {
+            assertTrue(jsonPayload.contains("version"));
+            assertTrue(jsonPayload.contains(version));
+        }
+        if (trackUserInteractions == null) {
+            assertFalse(jsonPayload.contains("trackUserInteractions"));
+        } else {
+            assertTrue(jsonPayload.contains("trackUserInteractions"));
+        }
+        if (trackResources == null) {
+            assertFalse(jsonPayload.contains("trackResources"));
+        } else {
+            assertTrue(jsonPayload.contains("trackResources"));
+        }
+        if (trackLongTask == null) {
+            assertFalse(jsonPayload.contains("trackLongTask"));
+        } else {
+            assertTrue(jsonPayload.contains("trackLongTask"));
+        }
+        if (defaultPrivacyLevel == null) {
+            assertFalse(jsonPayload.contains("defaultPrivacyLevel"));
+        } else {
+            assertTrue(jsonPayload.contains("defaultPrivacyLevel"));
+            assertTrue(jsonPayload.contains(defaultPrivacyLevel.toJson()));
+        }
+        if (sessionSampleRate == null) {
+            assertFalse(jsonPayload.contains("sessionSampleRate"));
+        } else {
+            assertTrue(jsonPayload.contains("sessionSampleRate"));
+        }
+        if (sessionReplaySampleRate == null) {
+            assertFalse(jsonPayload.contains("sessionReplaySampleRate"));
+        } else {
+            assertTrue(jsonPayload.contains("sessionReplaySampleRate"));
+        }
+        if (remoteConfigurationId == null) {
+            assertFalse(jsonPayload.contains("remoteConfigurationId"));
+        } else {
+            assertTrue(jsonPayload.contains("remoteConfigurationId"));
+            assertTrue(jsonPayload.contains(remoteConfigurationId));
+        }
     }
-    if (defaultPrivacyLevel == null) {
-      assertFalse(jsonPayload.contains("defaultPrivacyLevel"));
-    } else {
-      assertTrue(jsonPayload.contains("defaultPrivacyLevel"));
-      assertTrue(jsonPayload.contains(defaultPrivacyLevel.toJson()));
-    }
-    if (sessionSampleRate == null) {
-      assertFalse(jsonPayload.contains("sessionSampleRate"));
-    } else {
-      assertTrue(jsonPayload.contains("sessionSampleRate"));
-    }
-    if (sessionReplaySampleRate == null) {
-      assertFalse(jsonPayload.contains("sessionReplaySampleRate"));
-    } else {
-      assertTrue(jsonPayload.contains("sessionReplaySampleRate"));
-    }
-    if (remoteConfigurationId == null) {
-      assertFalse(jsonPayload.contains("remoteConfigurationId"));
-    } else {
-      assertTrue(jsonPayload.contains("remoteConfigurationId"));
-      assertTrue(jsonPayload.contains(remoteConfigurationId));
-    }
-  }
 
-  @ParameterizedTest
-  @CsvSource(
-      value = {
-        // spotless:off
+    @ParameterizedTest
+    @CsvSource(
+            value = {
+                // spotless:off
       // Invalid application ID
       "null  | token | datadoghq.com | null | null | 6 | null | true | true | true | null | null  | null  | remote-config-id",
       "''    | token | datadoghq.com | null | null | 6 | null | true | true | true | null | null  | null  | remote-config-id",
@@ -184,41 +183,40 @@ void testValidConfig(
       // Invalid rates and remote configuration id
       "appId | token | datadoghq.com | null | null | 6 | null | true | true | true | null | null  | null  | null",
       // spotless:on
-      },
-      delimiterString = "|",
-      nullValues = "null")
-  void testInvalidConfig(
-      String applicationId,
-      String clientToken,
-      String site,
-      String service,
-      String env,
-      int majorVersion,
-      String version,
-      boolean trackUserInteractions,
-      boolean trackResources,
-      boolean trackLongTask,
-      PrivacyLevel defaultPrivacyLevel,
-      Float sessionSampleRate,
-      Float sessionReplaySampleRate,
-      String remoteConfigurationId) {
-    assertThrows(
-        IllegalArgumentException.class,
-        () ->
-            new RumInjectorConfig(
-                applicationId,
-                clientToken,
-                site,
-                service,
-                env,
-                majorVersion,
-                version,
-                trackUserInteractions,
-                trackResources,
-                trackLongTask,
-                defaultPrivacyLevel,
-                sessionSampleRate,
-                sessionReplaySampleRate,
-                remoteConfigurationId));
-  }
+            },
+            delimiterString = "|",
+            nullValues = "null")
+    void testInvalidConfig(
+            String applicationId,
+            String clientToken,
+            String site,
+            String service,
+            String env,
+            int majorVersion,
+            String version,
+            boolean trackUserInteractions,
+            boolean trackResources,
+            boolean trackLongTask,
+            PrivacyLevel defaultPrivacyLevel,
+            Float sessionSampleRate,
+            Float sessionReplaySampleRate,
+            String remoteConfigurationId) {
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> new RumInjectorConfig(
+                        applicationId,
+                        clientToken,
+                        site,
+                        service,
+                        env,
+                        majorVersion,
+                        version,
+                        trackUserInteractions,
+                        trackResources,
+                        trackLongTask,
+                        defaultPrivacyLevel,
+                        sessionSampleRate,
+                        sessionReplaySampleRate,
+                        remoteConfigurationId));
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/sampling/AdaptiveSamplerTest.java b/internal-api/src/test/java/datadog/trace/api/sampling/AdaptiveSamplerTest.java
index 8b732467622..9d3548fa837 100644
--- a/internal-api/src/test/java/datadog/trace/api/sampling/AdaptiveSamplerTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/sampling/AdaptiveSamplerTest.java
@@ -43,570 +43,540 @@
  */
 @ExtendWith(MockitoExtension.class)
 class AdaptiveSamplerTest {
-  private static final Logger log = LoggerFactory.getLogger(AdaptiveSamplerTest.class);
-  private static final Duration WINDOW_DURATION = Duration.ofSeconds(1);
-
-  /** Generates windows with numbers of events according to Poisson distribution */
-  private static final class PoissonWindowEventsSupplier implements IntSupplier {
-    private final PoissonDistribution distribution;
+    private static final Logger log = LoggerFactory.getLogger(AdaptiveSamplerTest.class);
+    private static final Duration WINDOW_DURATION = Duration.ofSeconds(1);
+
+    /** Generates windows with numbers of events according to Poisson distribution */
+    private static final class PoissonWindowEventsSupplier implements IntSupplier {
+        private final PoissonDistribution distribution;
+
+        /**
+         * @param eventsPerWindowMean the average number of events per window
+         */
+        PoissonWindowEventsSupplier(final int eventsPerWindowMean) {
+            distribution = new PoissonDistribution(eventsPerWindowMean);
+            distribution.reseedRandomGenerator(12345671);
+        }
+
+        @Override
+        public int getAsInt() {
+            return distribution.sample();
+        }
+
+        @Override
+        public String toString() {
+            return "Poisson: ("
+                    + "mean="
+                    + distribution.getMean()
+                    + ", variance="
+                    + distribution.getNumericalVariance()
+                    + ")";
+        }
+    }
 
     /**
-     * @param eventsPerWindowMean the average number of events per window
+     * Generates bursty windows - some of the windows have extremely low number of events while the
+     * others have very hight number of events.
      */
-    PoissonWindowEventsSupplier(final int eventsPerWindowMean) {
-      distribution = new PoissonDistribution(eventsPerWindowMean);
-      distribution.reseedRandomGenerator(12345671);
+    private static final class BurstingWindowsEventsSupplier implements IntSupplier {
+        private final Random rnd = new Random(176431);
+
+        private final double burstProbability;
+        private final int minEvents;
+        private final int maxEvents;
+
+        /**
+         * @param burstProbability the probability of burst window happening
+         * @param nonBurstEvents number of events in non-burst window
+         * @param burstEvents number of events in burst window
+         */
+        BurstingWindowsEventsSupplier(final double burstProbability, final int nonBurstEvents, final int burstEvents) {
+            this.burstProbability = burstProbability;
+            this.minEvents = nonBurstEvents;
+            this.maxEvents = burstEvents;
+        }
+
+        @Override
+        public int getAsInt() {
+            if (rnd.nextDouble() <= burstProbability) {
+                return maxEvents;
+            } else {
+                return minEvents;
+            }
+        }
+
+        @Override
+        public String toString() {
+            return "Burst: ("
+                    + "probability="
+                    + burstProbability
+                    + ", minEvents="
+                    + minEvents
+                    + ", maxEvents="
+                    + maxEvents
+                    + ')';
+        }
     }
 
-    @Override
-    public int getAsInt() {
-      return distribution.sample();
+    /** Generates windows with constant number of events. */
+    private static final class ConstantWindowsEventsSupplier implements IntSupplier {
+        private final int events;
+
+        /**
+         * @param events number of events per window
+         */
+        ConstantWindowsEventsSupplier(final int events) {
+            this.events = events;
+        }
+
+        @Override
+        public int getAsInt() {
+            return events;
+        }
+
+        @Override
+        public String toString() {
+            return "Constant: (" + "events=" + events + ')';
+        }
     }
 
-    @Override
-    public String toString() {
-      return "Poisson: ("
-          + "mean="
-          + distribution.getMean()
-          + ", variance="
-          + distribution.getNumericalVariance()
-          + ")";
+    /** Generates a pre-configured repeating sequence of window events */
+    private static final class RepeatingWindowsEventsSupplier implements IntSupplier {
+        private final int[] eventsCounts;
+        private int pointer = 0;
+
+        /**
+         * @param windowEvents an array of number of events per each window in the sequence
+         */
+        RepeatingWindowsEventsSupplier(final int... windowEvents) {
+            this.eventsCounts = Arrays.copyOf(windowEvents, windowEvents.length);
+        }
+
+        @Override
+        public int getAsInt() {
+            try {
+                return eventsCounts[pointer];
+            } finally {
+                pointer = (pointer + 1) % eventsCounts.length;
+            }
+        }
+
+        @Override
+        public String toString() {
+            return "Repeating: (" + "definition=" + Arrays.toString(eventsCounts) + ')';
+        }
     }
-  }
 
-  /**
-   * Generates bursty windows - some of the windows have extremely low number of events while the
-   * others have very hight number of events.
-   */
-  private static final class BurstingWindowsEventsSupplier implements IntSupplier {
-    private final Random rnd = new Random(176431);
+    private static class WindowSamplingResult {
+        final int events;
+        final int samples;
+        final double sampleIndexSkew;
 
-    private final double burstProbability;
-    private final int minEvents;
-    private final int maxEvents;
+        WindowSamplingResult(int events, int samples, double sampleIndexSkew) {
+            this.events = events;
+            this.samples = samples;
+            this.sampleIndexSkew = sampleIndexSkew;
+        }
+    }
 
-    /**
-     * @param burstProbability the probability of burst window happening
-     * @param nonBurstEvents number of events in non-burst window
-     * @param burstEvents number of events in burst window
-     */
-    BurstingWindowsEventsSupplier(
-        final double burstProbability, final int nonBurstEvents, final int burstEvents) {
-      this.burstProbability = burstProbability;
-      this.minEvents = nonBurstEvents;
-      this.maxEvents = burstEvents;
+    private static final StandardDeviation STANDARD_DEVIATION = new StandardDeviation();
+    private static final int WINDOWS = 120;
+    private static final int SAMPLES_PER_WINDOW = 100;
+    private static final int AVERAGE_LOOKBACK = 30;
+    private static final int BUDGET_LOOKBACK = 16;
+
+    @Mock
+    AgentTaskScheduler taskScheduler;
+
+    @Captor
+    ArgumentCaptor<Task<AdaptiveSampler>> rollWindowTaskCaptor;
+
+    @Captor
+    ArgumentCaptor<AdaptiveSampler> rollWindowTargetCaptor;
+
+    @BeforeEach
+    public void setup() {
+        doNothing()
+                .when(taskScheduler)
+                .weakScheduleAtFixedRate(
+                        rollWindowTaskCaptor.capture(),
+                        rollWindowTargetCaptor.capture(),
+                        eq(WINDOW_DURATION.toNanos()),
+                        eq(WINDOW_DURATION.toNanos()),
+                        same(TimeUnit.NANOSECONDS));
     }
 
-    @Override
-    public int getAsInt() {
-      if (rnd.nextDouble() <= burstProbability) {
-        return maxEvents;
-      } else {
-        return minEvents;
-      }
+    @Test
+    public void testBurstLowProbability() throws Exception {
+        testSampler(new BurstingWindowsEventsSupplier(0.1d, 5, 5000), 40);
     }
 
-    @Override
-    public String toString() {
-      return "Burst: ("
-          + "probability="
-          + burstProbability
-          + ", minEvents="
-          + minEvents
-          + ", maxEvents="
-          + maxEvents
-          + ')';
+    @Test
+    public void testBurstHighProbability() throws Exception {
+        testSampler(new BurstingWindowsEventsSupplier(0.8d, 5, 5000), 20);
     }
-  }
 
-  /** Generates windows with constant number of events. */
-  private static final class ConstantWindowsEventsSupplier implements IntSupplier {
-    private final int events;
+    @Test
+    public void testPoissonLowFrequency() throws Exception {
+        testSampler(new PoissonWindowEventsSupplier(153), 15);
+    }
 
-    /**
-     * @param events number of events per window
-     */
-    ConstantWindowsEventsSupplier(final int events) {
-      this.events = events;
+    @Test
+    public void testPoissonMidFrequency() throws Exception {
+        testSampler(new PoissonWindowEventsSupplier(283), 15);
     }
 
-    @Override
-    public int getAsInt() {
-      return events;
+    @Test
+    public void testPoissonHighFrequency() throws Exception {
+        testSampler(new PoissonWindowEventsSupplier(1013), 15);
     }
 
-    @Override
-    public String toString() {
-      return "Constant: (" + "events=" + events + ')';
+    @Test
+    public void testConstantVeryLowLoad() throws Exception {
+        testSampler(new ConstantWindowsEventsSupplier(1), 10);
     }
-  }
 
-  /** Generates a pre-configured repeating sequence of window events */
-  private static final class RepeatingWindowsEventsSupplier implements IntSupplier {
-    private final int[] eventsCounts;
-    private int pointer = 0;
+    @Test
+    public void testConstantLowLoad() throws Exception {
+        testSampler(new ConstantWindowsEventsSupplier(153), 15);
+    }
 
-    /**
-     * @param windowEvents an array of number of events per each window in the sequence
-     */
-    RepeatingWindowsEventsSupplier(final int... windowEvents) {
-      this.eventsCounts = Arrays.copyOf(windowEvents, windowEvents.length);
+    @Test
+    public void testConstantMediumLoad() throws Exception {
+        testSampler(new ConstantWindowsEventsSupplier(713), 15);
     }
 
-    @Override
-    public int getAsInt() {
-      try {
-        return eventsCounts[pointer];
-      } finally {
-        pointer = (pointer + 1) % eventsCounts.length;
-      }
+    @Test
+    public void testConstantHighLoad() throws Exception {
+        testSampler(new ConstantWindowsEventsSupplier(5211), 15);
     }
 
-    @Override
-    public String toString() {
-      return "Repeating: (" + "definition=" + Arrays.toString(eventsCounts) + ')';
+    @Test
+    public void testRepeatingSemiRandom() throws Exception {
+        testSampler(new RepeatingWindowsEventsSupplier(180, 200, 0, 0, 0, 1500, 1000, 430, 200, 115, 115, 900), 15);
     }
-  }
 
-  private static class WindowSamplingResult {
-    final int events;
-    final int samples;
-    final double sampleIndexSkew;
+    @Test
+    public void testRepeatingRegularStartWithBurst() throws Exception {
+        testSampler(new RepeatingWindowsEventsSupplier(1000, 0, 1000, 0, 1000, 0), 15);
+    }
 
-    WindowSamplingResult(int events, int samples, double sampleIndexSkew) {
-      this.events = events;
-      this.samples = samples;
-      this.sampleIndexSkew = sampleIndexSkew;
+    @Test
+    public void testRepeatingRegularStartWithLow() throws Exception {
+        testSampler(new RepeatingWindowsEventsSupplier(0, 1000, 0, 1000, 0, 1000), 15);
     }
-  }
-
-  private static final StandardDeviation STANDARD_DEVIATION = new StandardDeviation();
-  private static final int WINDOWS = 120;
-  private static final int SAMPLES_PER_WINDOW = 100;
-  private static final int AVERAGE_LOOKBACK = 30;
-  private static final int BUDGET_LOOKBACK = 16;
-
-  @Mock AgentTaskScheduler taskScheduler;
-  @Captor ArgumentCaptor<Task<AdaptiveSampler>> rollWindowTaskCaptor;
-  @Captor ArgumentCaptor<AdaptiveSampler> rollWindowTargetCaptor;
-
-  @BeforeEach
-  public void setup() {
-    doNothing()
-        .when(taskScheduler)
-        .weakScheduleAtFixedRate(
-            rollWindowTaskCaptor.capture(),
-            rollWindowTargetCaptor.capture(),
-            eq(WINDOW_DURATION.toNanos()),
-            eq(WINDOW_DURATION.toNanos()),
-            same(TimeUnit.NANOSECONDS));
-  }
-
-  @Test
-  public void testBurstLowProbability() throws Exception {
-    testSampler(new BurstingWindowsEventsSupplier(0.1d, 5, 5000), 40);
-  }
-
-  @Test
-  public void testBurstHighProbability() throws Exception {
-    testSampler(new BurstingWindowsEventsSupplier(0.8d, 5, 5000), 20);
-  }
-
-  @Test
-  public void testPoissonLowFrequency() throws Exception {
-    testSampler(new PoissonWindowEventsSupplier(153), 15);
-  }
-
-  @Test
-  public void testPoissonMidFrequency() throws Exception {
-    testSampler(new PoissonWindowEventsSupplier(283), 15);
-  }
-
-  @Test
-  public void testPoissonHighFrequency() throws Exception {
-    testSampler(new PoissonWindowEventsSupplier(1013), 15);
-  }
-
-  @Test
-  public void testConstantVeryLowLoad() throws Exception {
-    testSampler(new ConstantWindowsEventsSupplier(1), 10);
-  }
-
-  @Test
-  public void testConstantLowLoad() throws Exception {
-    testSampler(new ConstantWindowsEventsSupplier(153), 15);
-  }
-
-  @Test
-  public void testConstantMediumLoad() throws Exception {
-    testSampler(new ConstantWindowsEventsSupplier(713), 15);
-  }
-
-  @Test
-  public void testConstantHighLoad() throws Exception {
-    testSampler(new ConstantWindowsEventsSupplier(5211), 15);
-  }
-
-  @Test
-  public void testRepeatingSemiRandom() throws Exception {
-    testSampler(
-        new RepeatingWindowsEventsSupplier(180, 200, 0, 0, 0, 1500, 1000, 430, 200, 115, 115, 900),
-        15);
-  }
-
-  @Test
-  public void testRepeatingRegularStartWithBurst() throws Exception {
-    testSampler(new RepeatingWindowsEventsSupplier(1000, 0, 1000, 0, 1000, 0), 15);
-  }
-
-  @Test
-  public void testRepeatingRegularStartWithLow() throws Exception {
-    testSampler(new RepeatingWindowsEventsSupplier(0, 1000, 0, 1000, 0, 1000), 15);
-  }
-
-  @Test
-  public void testKeep() {
-    final AdaptiveSampler sampler =
-        new AdaptiveSampler(WINDOW_DURATION, 1, 1, 1, null, taskScheduler, true);
-    long tests = sampler.testCount();
-    long samples = sampler.sampleCount();
-    assertTrue(sampler.keep());
-    assertEquals(tests + 1, sampler.testCount());
-    assertEquals(samples + 1, sampler.sampleCount());
-  }
-
-  @Test
-  public void testDrop() {
-    final AdaptiveSampler sampler =
-        new AdaptiveSampler(WINDOW_DURATION, 1, 1, 1, null, taskScheduler, true);
-    long tests = sampler.testCount();
-    long samples = sampler.sampleCount();
-    assertFalse(sampler.drop());
-    assertEquals(tests + 1, sampler.testCount());
-    assertEquals(samples, sampler.sampleCount());
-  }
-
-  @Test
-  void testConfigListener() throws Exception {
-    AtomicInteger counter = new AtomicInteger(0);
-    final AdaptiveSampler sampler =
-        new AdaptiveSampler(
-            WINDOW_DURATION,
-            2,
-            1,
-            1,
-            (totalCount, sampledCount, budget, totalAverage, probability) -> {
-              switch (counter.getAndIncrement()) {
-                case 0:
-                  {
-                    // initial config at the sampler instantiation
-                    assertEquals(0, totalCount);
-                    assertEquals(0, sampledCount);
-                    assertEquals(4, budget);
-                    assertEquals(0.0d, totalAverage);
-                    assertEquals(1.0d, probability);
-                    break;
-                  }
-                case 1:
-                  {
-                    // after first roll window
-                    assertEquals(2, totalCount);
-                    assertEquals(1, sampledCount);
-                    assertEquals(1, budget);
-                    assertEquals(2.0d, totalAverage);
-                    assertEquals(0.5d, probability);
-                    break;
-                  }
-                case 2:
-                  {
-                    // after second roll window
-                    assertEquals(3, totalCount);
-                    assertEquals(2, sampledCount);
-                    assertEquals(0, budget);
-                    assertEquals(3.0d, totalAverage);
-                    assertEquals(0.0d, probability);
-                    break;
-                  }
-                case 3:
-                  {
-                    // after third roll window
-                    assertEquals(3, totalCount);
-                    assertEquals(0, sampledCount);
-                    assertEquals(2, budget);
-                    assertEquals(3.0d, totalAverage);
-                    assertEquals(0.6666d, probability, 0.00007d);
-                    System.err.println(
-                        "==> "
-                            + totalCount
-                            + ", "
-                            + sampledCount
-                            + ", "
-                            + budget
-                            + ", "
-                            + totalAverage
-                            + ", "
-                            + probability);
-                    break;
-                  }
-              }
-            },
-            taskScheduler,
-            true);
-    sampler.keep();
-    sampler.drop();
-    rollWindow();
-    sampler.keep();
-    sampler.keep();
-    sampler.drop();
-    rollWindow();
-    sampler.drop();
-    sampler.drop();
-    sampler.drop();
-    rollWindow();
-  }
-
-  private void testSampler(final IntSupplier windowEventsSupplier, final int maxErrorPercent)
-      throws Exception {
-    int iterations =
-        Integer.parseInt(
-            System.getProperty("com.datadog.profiling.exceptions.test-iterations", "1"));
-    for (int i = 0; i < iterations; i++) {
-      testSamplerInline(windowEventsSupplier, maxErrorPercent);
-      for (int numOfThreads = 1; numOfThreads <= 64; numOfThreads *= 2) {
-        testSamplerConcurrently(numOfThreads, windowEventsSupplier, maxErrorPercent);
-      }
+
+    @Test
+    public void testKeep() {
+        final AdaptiveSampler sampler = new AdaptiveSampler(WINDOW_DURATION, 1, 1, 1, null, taskScheduler, true);
+        long tests = sampler.testCount();
+        long samples = sampler.sampleCount();
+        assertTrue(sampler.keep());
+        assertEquals(tests + 1, sampler.testCount());
+        assertEquals(samples + 1, sampler.sampleCount());
     }
-  }
-
-  private void testSamplerInline(
-      final IntSupplier windowEventsSupplier, final int maxErrorPercent) {
-    log.info(
-        "> mode: {}, windows: {}, SAMPLES_PER_WINDOW: {}, LOOKBACK: {}, max error: {}%",
-        windowEventsSupplier, WINDOWS, SAMPLES_PER_WINDOW, AVERAGE_LOOKBACK, maxErrorPercent);
-    final AdaptiveSampler sampler =
-        new AdaptiveSampler(
-            WINDOW_DURATION,
-            SAMPLES_PER_WINDOW,
-            AVERAGE_LOOKBACK,
-            BUDGET_LOOKBACK,
-            null,
-            taskScheduler,
-            true);
-
-    // simulate event generation and sampling for the given number of sampling windows
-    final long expectedSamples = WINDOWS * SAMPLES_PER_WINDOW;
-
-    long allSamples = 0L;
-    long allEvents = 0L;
-
-    final double[] samplesPerWindow = new double[WINDOWS];
-    final double[] sampleIndexSkewPerWindow = new double[WINDOWS];
-    final Mean mean = new Mean();
-    for (int w = 0; w < WINDOWS; w++) {
-      final long samplesBase = 0L;
-      WindowSamplingResult result =
-          generateWindowEventsAndSample(windowEventsSupplier, sampler, mean);
-      samplesPerWindow[w] =
-          (1 - abs((result.samples - samplesBase - expectedSamples) / (double) expectedSamples));
-      sampleIndexSkewPerWindow[w] = result.sampleIndexSkew;
-      allSamples += result.samples;
-      allEvents += result.events;
-
-      rollWindow();
+
+    @Test
+    public void testDrop() {
+        final AdaptiveSampler sampler = new AdaptiveSampler(WINDOW_DURATION, 1, 1, 1, null, taskScheduler, true);
+        long tests = sampler.testCount();
+        long samples = sampler.sampleCount();
+        assertFalse(sampler.drop());
+        assertEquals(tests + 1, sampler.testCount());
+        assertEquals(samples, sampler.sampleCount());
     }
 
-    /*
-     * Turn all events into samples if their number is <= than the expected number of samples.
-     */
-    final double targetSamples = Math.min(allEvents, expectedSamples);
+    @Test
+    void testConfigListener() throws Exception {
+        AtomicInteger counter = new AtomicInteger(0);
+        final AdaptiveSampler sampler = new AdaptiveSampler(
+                WINDOW_DURATION,
+                2,
+                1,
+                1,
+                (totalCount, sampledCount, budget, totalAverage, probability) -> {
+                    switch (counter.getAndIncrement()) {
+                        case 0: {
+                            // initial config at the sampler instantiation
+                            assertEquals(0, totalCount);
+                            assertEquals(0, sampledCount);
+                            assertEquals(4, budget);
+                            assertEquals(0.0d, totalAverage);
+                            assertEquals(1.0d, probability);
+                            break;
+                        }
+                        case 1: {
+                            // after first roll window
+                            assertEquals(2, totalCount);
+                            assertEquals(1, sampledCount);
+                            assertEquals(1, budget);
+                            assertEquals(2.0d, totalAverage);
+                            assertEquals(0.5d, probability);
+                            break;
+                        }
+                        case 2: {
+                            // after second roll window
+                            assertEquals(3, totalCount);
+                            assertEquals(2, sampledCount);
+                            assertEquals(0, budget);
+                            assertEquals(3.0d, totalAverage);
+                            assertEquals(0.0d, probability);
+                            break;
+                        }
+                        case 3: {
+                            // after third roll window
+                            assertEquals(3, totalCount);
+                            assertEquals(0, sampledCount);
+                            assertEquals(2, budget);
+                            assertEquals(3.0d, totalAverage);
+                            assertEquals(0.6666d, probability, 0.00007d);
+                            System.err.println("==> "
+                                    + totalCount
+                                    + ", "
+                                    + sampledCount
+                                    + ", "
+                                    + budget
+                                    + ", "
+                                    + totalAverage
+                                    + ", "
+                                    + probability);
+                            break;
+                        }
+                    }
+                },
+                taskScheduler,
+                true);
+        sampler.keep();
+        sampler.drop();
+        rollWindow();
+        sampler.keep();
+        sampler.keep();
+        sampler.drop();
+        rollWindow();
+        sampler.drop();
+        sampler.drop();
+        sampler.drop();
+        rollWindow();
+    }
 
-    /*
-     * Calculate the percentual error based on the expected and the observed number of samples.
-     */
-    final double percentualError = round(((targetSamples - allSamples) / targetSamples) * 100);
-
-    reportSampleStatistics(samplesPerWindow, targetSamples, percentualError);
-    reportSampleIndexSkew(sampleIndexSkewPerWindow);
-
-    assertTrue(
-        abs(percentualError) <= maxErrorPercent,
-        "abs(("
-            + targetSamples
-            + " - "
-            + allSamples
-            + ") / "
-            + targetSamples
-            + ")% > "
-            + maxErrorPercent
-            + "%");
-  }
-
-  private void reportSampleStatistics(
-      double[] samplesPerWindow, double targetSamples, double percentualError) {
-    final double samplesPerWindowMean = new Mean().evaluate(samplesPerWindow);
-    final double samplesPerWindowStdev =
-        STANDARD_DEVIATION.evaluate(samplesPerWindow, samplesPerWindowMean);
-
-    log.info(
-        "\t per window samples = (avg: {}, stdev: {}, estimated total: {})",
-        samplesPerWindowMean,
-        samplesPerWindowStdev,
-        targetSamples);
-
-    log.info("\t percentual error = {}%", percentualError);
-  }
-
-  private void reportSampleIndexSkew(double[] sampleIndexSkewPerWindow) {
-    Pair<Double, Double> skewIndicators = calculateSkewIndicators(sampleIndexSkewPerWindow);
-    log.info(
-        "\t avg window skew interval = <-{}%, {}%>",
-        round(skewIndicators.getFirst() * 100), round(skewIndicators.getSecond() * 100));
-  }
-
-  /**
-   * Simulate the number of events per window. Perform sampling and capture the number of observed
-   * events and samples.
-   *
-   * @param windowEventsSupplier events generator implementation
-   * @param sampler sampler instance
-   * @param mean a {@code Mean} instance for calculations
-   * @return a {@linkplain WindowSamplingResult} instance capturing the number of observed events,
-   *     samples and the sample index skew
-   */
-  private WindowSamplingResult generateWindowEventsAndSample(
-      IntSupplier windowEventsSupplier, AdaptiveSampler sampler, Mean mean) {
-    int samples = 0;
-    int events = windowEventsSupplier.getAsInt();
-    mean.clear();
-    for (int i = 0; i < events; i++) {
-      if (sampler.sample()) {
-        mean.increment(i);
-        samples++;
-      }
+    private void testSampler(final IntSupplier windowEventsSupplier, final int maxErrorPercent) throws Exception {
+        int iterations = Integer.parseInt(System.getProperty("com.datadog.profiling.exceptions.test-iterations", "1"));
+        for (int i = 0; i < iterations; i++) {
+            testSamplerInline(windowEventsSupplier, maxErrorPercent);
+            for (int numOfThreads = 1; numOfThreads <= 64; numOfThreads *= 2) {
+                testSamplerConcurrently(numOfThreads, windowEventsSupplier, maxErrorPercent);
+            }
+        }
     }
-    double sampleIndexMean = mean.getResult();
-    double sampleIndexSkew = events != 0 ? sampleIndexMean / events : 0;
-    return new WindowSamplingResult(events, samples, sampleIndexSkew);
-  }
-
-  /**
-   * Calculate the sample index skew boundaries. A 'sample index skew' is defined as the distance of
-   * the average sample index in each window from the mean event index in the same window. Given the
-   * range of the event indices 1..N, the event index mean M calculated as (N - 1)/2 and the sample
-   * index mean S the skew K is calculated as 'K = M - S'. This gives the skew range of &lt;-0.5,
-   * 0.5&gt;.
-   *
-   * <p>If the samples are spread out completely regularly the skew would be 0. If the beginning of
-   * the window is favored the skew would be negative and if the tail of the window is favored the
-   * skew would be positive.
-   *
-   * @param sampleIndexSkewPerWindow the index skew per window
-   * @return a min-max boundaries for the sample index skew
-   */
-  private Pair<Double, Double> calculateSkewIndicators(double[] sampleIndexSkewPerWindow) {
-    double skewPositiveAvg = 0d;
-    double skewNegativeAvg = 0d;
-    int negativeCount = 0;
-    for (final double skew : sampleIndexSkewPerWindow) {
-      if (skew >= 0.5d) {
-        skewPositiveAvg += skew - 0.5d;
-      } else {
-        negativeCount++;
-        skewNegativeAvg += 0.5d - skew;
-      }
+
+    private void testSamplerInline(final IntSupplier windowEventsSupplier, final int maxErrorPercent) {
+        log.info(
+                "> mode: {}, windows: {}, SAMPLES_PER_WINDOW: {}, LOOKBACK: {}, max error: {}%",
+                windowEventsSupplier, WINDOWS, SAMPLES_PER_WINDOW, AVERAGE_LOOKBACK, maxErrorPercent);
+        final AdaptiveSampler sampler = new AdaptiveSampler(
+                WINDOW_DURATION, SAMPLES_PER_WINDOW, AVERAGE_LOOKBACK, BUDGET_LOOKBACK, null, taskScheduler, true);
+
+        // simulate event generation and sampling for the given number of sampling windows
+        final long expectedSamples = WINDOWS * SAMPLES_PER_WINDOW;
+
+        long allSamples = 0L;
+        long allEvents = 0L;
+
+        final double[] samplesPerWindow = new double[WINDOWS];
+        final double[] sampleIndexSkewPerWindow = new double[WINDOWS];
+        final Mean mean = new Mean();
+        for (int w = 0; w < WINDOWS; w++) {
+            final long samplesBase = 0L;
+            WindowSamplingResult result = generateWindowEventsAndSample(windowEventsSupplier, sampler, mean);
+            samplesPerWindow[w] =
+                    (1 - abs((result.samples - samplesBase - expectedSamples) / (double) expectedSamples));
+            sampleIndexSkewPerWindow[w] = result.sampleIndexSkew;
+            allSamples += result.samples;
+            allEvents += result.events;
+
+            rollWindow();
+        }
+
+        /*
+         * Turn all events into samples if their number is <= than the expected number of samples.
+         */
+        final double targetSamples = Math.min(allEvents, expectedSamples);
+
+        /*
+         * Calculate the percentual error based on the expected and the observed number of samples.
+         */
+        final double percentualError = round(((targetSamples - allSamples) / targetSamples) * 100);
+
+        reportSampleStatistics(samplesPerWindow, targetSamples, percentualError);
+        reportSampleIndexSkew(sampleIndexSkewPerWindow);
+
+        assertTrue(
+                abs(percentualError) <= maxErrorPercent,
+                "abs(("
+                        + targetSamples
+                        + " - "
+                        + allSamples
+                        + ") / "
+                        + targetSamples
+                        + ")% > "
+                        + maxErrorPercent
+                        + "%");
     }
-    final int positiveCount = sampleIndexSkewPerWindow.length - negativeCount;
-    if (positiveCount > 0) {
-      skewPositiveAvg /= sampleIndexSkewPerWindow.length - negativeCount;
+
+    private void reportSampleStatistics(double[] samplesPerWindow, double targetSamples, double percentualError) {
+        final double samplesPerWindowMean = new Mean().evaluate(samplesPerWindow);
+        final double samplesPerWindowStdev = STANDARD_DEVIATION.evaluate(samplesPerWindow, samplesPerWindowMean);
+
+        log.info(
+                "\t per window samples = (avg: {}, stdev: {}, estimated total: {})",
+                samplesPerWindowMean,
+                samplesPerWindowStdev,
+                targetSamples);
+
+        log.info("\t percentual error = {}%", percentualError);
     }
-    if (negativeCount > 0) {
-      skewNegativeAvg /= negativeCount;
+
+    private void reportSampleIndexSkew(double[] sampleIndexSkewPerWindow) {
+        Pair<Double, Double> skewIndicators = calculateSkewIndicators(sampleIndexSkewPerWindow);
+        log.info(
+                "\t avg window skew interval = <-{}%, {}%>",
+                round(skewIndicators.getFirst() * 100), round(skewIndicators.getSecond() * 100));
     }
-    return new Pair<>(skewNegativeAvg, skewPositiveAvg);
-  }
-
-  private void testSamplerConcurrently(
-      final int threadCount, final IntSupplier windowEventsSupplier, final int maxErrorPercent)
-      throws Exception {
-    log.info(
-        "> threads: {}, mode: {}, windows: {}, SAMPLES_PER_WINDOW: {}, LOOKBACK: {}, max error: {}",
-        threadCount,
-        windowEventsSupplier,
-        WINDOWS,
-        SAMPLES_PER_WINDOW,
-        AVERAGE_LOOKBACK,
-        maxErrorPercent);
-
-    /*
-     * This test attempts to simulate concurrent computations by making sure that sampling requests and the window maintenance routine are run in parallel.
-     * It does not provide coverage of all possible execution sequences but should be good enough for getting the 'ballpark' numbers.
+
+    /**
+     * Simulate the number of events per window. Perform sampling and capture the number of observed
+     * events and samples.
+     *
+     * @param windowEventsSupplier events generator implementation
+     * @param sampler sampler instance
+     * @param mean a {@code Mean} instance for calculations
+     * @return a {@linkplain WindowSamplingResult} instance capturing the number of observed events,
+     *     samples and the sample index skew
      */
-    final long expectedSamples = SAMPLES_PER_WINDOW * WINDOWS;
-    final AtomicLong allSamples = new AtomicLong(0);
-    final AtomicLong receivedEvents = new AtomicLong(0);
-
-    final AdaptiveSampler sampler =
-        new AdaptiveSampler(
-            WINDOW_DURATION,
-            SAMPLES_PER_WINDOW,
-            AVERAGE_LOOKBACK,
-            BUDGET_LOOKBACK,
-            null,
-            taskScheduler,
-            true);
-    final CyclicBarrier startBarrier = new CyclicBarrier(threadCount);
-    final CyclicBarrier endBarrier = new CyclicBarrier(threadCount, this::rollWindow);
-    final Mean[] means = new Mean[threadCount];
-    final Thread[] threads = new Thread[threadCount];
-    for (int i = 0; i < threadCount; i++) {
-      means[i] = new Mean();
-      final Mean mean = means[i];
-      threads[i] =
-          new Thread(
-              () -> {
+    private WindowSamplingResult generateWindowEventsAndSample(
+            IntSupplier windowEventsSupplier, AdaptiveSampler sampler, Mean mean) {
+        int samples = 0;
+        int events = windowEventsSupplier.getAsInt();
+        mean.clear();
+        for (int i = 0; i < events; i++) {
+            if (sampler.sample()) {
+                mean.increment(i);
+                samples++;
+            }
+        }
+        double sampleIndexMean = mean.getResult();
+        double sampleIndexSkew = events != 0 ? sampleIndexMean / events : 0;
+        return new WindowSamplingResult(events, samples, sampleIndexSkew);
+    }
+
+    /**
+     * Calculate the sample index skew boundaries. A 'sample index skew' is defined as the distance of
+     * the average sample index in each window from the mean event index in the same window. Given the
+     * range of the event indices 1..N, the event index mean M calculated as (N - 1)/2 and the sample
+     * index mean S the skew K is calculated as 'K = M - S'. This gives the skew range of &lt;-0.5,
+     * 0.5&gt;.
+     *
+     * <p>If the samples are spread out completely regularly the skew would be 0. If the beginning of
+     * the window is favored the skew would be negative and if the tail of the window is favored the
+     * skew would be positive.
+     *
+     * @param sampleIndexSkewPerWindow the index skew per window
+     * @return a min-max boundaries for the sample index skew
+     */
+    private Pair<Double, Double> calculateSkewIndicators(double[] sampleIndexSkewPerWindow) {
+        double skewPositiveAvg = 0d;
+        double skewNegativeAvg = 0d;
+        int negativeCount = 0;
+        for (final double skew : sampleIndexSkewPerWindow) {
+            if (skew >= 0.5d) {
+                skewPositiveAvg += skew - 0.5d;
+            } else {
+                negativeCount++;
+                skewNegativeAvg += 0.5d - skew;
+            }
+        }
+        final int positiveCount = sampleIndexSkewPerWindow.length - negativeCount;
+        if (positiveCount > 0) {
+            skewPositiveAvg /= sampleIndexSkewPerWindow.length - negativeCount;
+        }
+        if (negativeCount > 0) {
+            skewNegativeAvg /= negativeCount;
+        }
+        return new Pair<>(skewNegativeAvg, skewPositiveAvg);
+    }
+
+    private void testSamplerConcurrently(
+            final int threadCount, final IntSupplier windowEventsSupplier, final int maxErrorPercent) throws Exception {
+        log.info(
+                "> threads: {}, mode: {}, windows: {}, SAMPLES_PER_WINDOW: {}, LOOKBACK: {}, max error: {}",
+                threadCount,
+                windowEventsSupplier,
+                WINDOWS,
+                SAMPLES_PER_WINDOW,
+                AVERAGE_LOOKBACK,
+                maxErrorPercent);
+
+        /*
+         * This test attempts to simulate concurrent computations by making sure that sampling requests and the window maintenance routine are run in parallel.
+         * It does not provide coverage of all possible execution sequences but should be good enough for getting the 'ballpark' numbers.
+         */
+        final long expectedSamples = SAMPLES_PER_WINDOW * WINDOWS;
+        final AtomicLong allSamples = new AtomicLong(0);
+        final AtomicLong receivedEvents = new AtomicLong(0);
+
+        final AdaptiveSampler sampler = new AdaptiveSampler(
+                WINDOW_DURATION, SAMPLES_PER_WINDOW, AVERAGE_LOOKBACK, BUDGET_LOOKBACK, null, taskScheduler, true);
+        final CyclicBarrier startBarrier = new CyclicBarrier(threadCount);
+        final CyclicBarrier endBarrier = new CyclicBarrier(threadCount, this::rollWindow);
+        final Mean[] means = new Mean[threadCount];
+        final Thread[] threads = new Thread[threadCount];
+        for (int i = 0; i < threadCount; i++) {
+            means[i] = new Mean();
+            final Mean mean = means[i];
+            threads[i] = new Thread(() -> {
                 try {
-                  for (int w = 0; w < WINDOWS; w++) {
-                    startBarrier.await(10, TimeUnit.SECONDS);
-                    WindowSamplingResult samplingResult =
-                        generateWindowEventsAndSample(windowEventsSupplier, sampler, mean);
-                    allSamples.addAndGet(samplingResult.samples);
-                    receivedEvents.addAndGet(samplingResult.events);
-                    endBarrier.await(10, TimeUnit.SECONDS);
-                  }
+                    for (int w = 0; w < WINDOWS; w++) {
+                        startBarrier.await(10, TimeUnit.SECONDS);
+                        WindowSamplingResult samplingResult =
+                                generateWindowEventsAndSample(windowEventsSupplier, sampler, mean);
+                        allSamples.addAndGet(samplingResult.samples);
+                        receivedEvents.addAndGet(samplingResult.events);
+                        endBarrier.await(10, TimeUnit.SECONDS);
+                    }
                 } catch (Throwable ignored) {
                 }
-              });
-      threads[i].start();
-    }
-    for (final Thread t : threads) {
-      t.join();
+            });
+            threads[i].start();
+        }
+        for (final Thread t : threads) {
+            t.join();
+        }
+
+        final long samples = allSamples.get();
+        /*
+         * Turn all events into samples if their number is <= than the expected number of samples.
+         */
+        final long targetSamples = Math.min(expectedSamples, receivedEvents.get());
+        /*
+         * Calculate the percentual error based on the expected and the observed number of samples.
+         */
+        final int percentualError = round(((targetSamples - samples) / (float) targetSamples) * 100);
+        log.info("\t percentual error = {}%", percentualError);
+
+        assertTrue(
+                abs(percentualError) <= maxErrorPercent,
+                "abs(("
+                        + expectedSamples
+                        + " - "
+                        + samples
+                        + ") / "
+                        + expectedSamples
+                        + ")% > "
+                        + maxErrorPercent
+                        + "%");
     }
 
-    final long samples = allSamples.get();
-    /*
-     * Turn all events into samples if their number is <= than the expected number of samples.
-     */
-    final long targetSamples = Math.min(expectedSamples, receivedEvents.get());
-    /*
-     * Calculate the percentual error based on the expected and the observed number of samples.
-     */
-    final int percentualError = round(((targetSamples - samples) / (float) targetSamples) * 100);
-    log.info("\t percentual error = {}%", percentualError);
-
-    assertTrue(
-        abs(percentualError) <= maxErrorPercent,
-        "abs(("
-            + expectedSamples
-            + " - "
-            + samples
-            + ") / "
-            + expectedSamples
-            + ")% > "
-            + maxErrorPercent
-            + "%");
-  }
-
-  private void rollWindow() {
-    rollWindowTaskCaptor.getValue().run(rollWindowTargetCaptor.getValue());
-  }
+    private void rollWindow() {
+        rollWindowTaskCaptor.getValue().run(rollWindowTargetCaptor.getValue());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/sampling/PerRecordingRateLimiterTest.java b/internal-api/src/test/java/datadog/trace/api/sampling/PerRecordingRateLimiterTest.java
index 2b32c9c2cb5..bd3c931f533 100644
--- a/internal-api/src/test/java/datadog/trace/api/sampling/PerRecordingRateLimiterTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/sampling/PerRecordingRateLimiterTest.java
@@ -9,26 +9,25 @@
 
 public class PerRecordingRateLimiterTest {
 
-  @Test
-  public void testLimitApplied() {
-    Duration window = Duration.ofMillis(100);
-    int limit = 20;
-    Duration recordingDurationSeconds = Duration.ofSeconds(1);
-    PerRecordingRateLimiter rateLimiter =
-        new PerRecordingRateLimiter(window, limit, recordingDurationSeconds, 5);
-    // no rate limiting is applied during the first window
-    int[] slots = new int[(int) (recordingDurationSeconds.toMillis() / window.toMillis())];
-    long start = System.nanoTime();
-    while (true) {
-      int slot = (int) (NANOSECONDS.toMillis(System.nanoTime() - start) / window.toMillis());
-      if (slot >= slots.length) {
-        break;
-      }
-      if (rateLimiter.permit()) {
-        slots[slot]++;
-      }
+    @Test
+    public void testLimitApplied() {
+        Duration window = Duration.ofMillis(100);
+        int limit = 20;
+        Duration recordingDurationSeconds = Duration.ofSeconds(1);
+        PerRecordingRateLimiter rateLimiter = new PerRecordingRateLimiter(window, limit, recordingDurationSeconds, 5);
+        // no rate limiting is applied during the first window
+        int[] slots = new int[(int) (recordingDurationSeconds.toMillis() / window.toMillis())];
+        long start = System.nanoTime();
+        while (true) {
+            int slot = (int) (NANOSECONDS.toMillis(System.nanoTime() - start) / window.toMillis());
+            if (slot >= slots.length) {
+                break;
+            }
+            if (rateLimiter.permit()) {
+                slots[slot]++;
+            }
+        }
+        assertTrue(Arrays.stream(slots).max().orElse(limit + 1) <= limit);
+        assertTrue(Arrays.stream(slots).sum() <= 2 * limit);
     }
-    assertTrue(Arrays.stream(slots).max().orElse(limit + 1) <= limit);
-    assertTrue(Arrays.stream(slots).sum() <= 2 * limit);
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/telemetry/CoreMetricCollectorQueueFullTest.java b/internal-api/src/test/java/datadog/trace/api/telemetry/CoreMetricCollectorQueueFullTest.java
index d9f32fdfc22..c3ea9db4c7e 100644
--- a/internal-api/src/test/java/datadog/trace/api/telemetry/CoreMetricCollectorQueueFullTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/telemetry/CoreMetricCollectorQueueFullTest.java
@@ -20,69 +20,67 @@
  */
 class CoreMetricCollectorQueueFullTest {
 
-  /**
-   * Fills the drain past its queue capacity and verifies that every counter's delta is reported
-   * exactly once across as many cycles as it takes to empty — none dropped while the queue is full.
-   *
-   * <p>{@link CoreMetricCollector} is a singleton over the global {@link SpanMetricRegistryImpl},
-   * so this test can't assume a clean registry. It stays robust by tagging its own instrumentations
-   * with a unique prefix and counting only those, and it drains cycle-by-cycle until the queue
-   * yields nothing at all (so it never terminates early just because a cycle happened to surface
-   * only unrelated counters left behind by other tests). The sum of our own metrics across all
-   * cycles must equal the number we created; a dropped delta would make the sum come up short.
-   */
-  @Test
-  void skippedCountersRetainDeltaAcrossCycles() {
-    SpanMetricRegistryImpl registry = SpanMetricRegistryImpl.getInstance();
-    CoreMetricCollector collector = CoreMetricCollector.getInstance();
+    /**
+     * Fills the drain past its queue capacity and verifies that every counter's delta is reported
+     * exactly once across as many cycles as it takes to empty — none dropped while the queue is full.
+     *
+     * <p>{@link CoreMetricCollector} is a singleton over the global {@link SpanMetricRegistryImpl},
+     * so this test can't assume a clean registry. It stays robust by tagging its own instrumentations
+     * with a unique prefix and counting only those, and it drains cycle-by-cycle until the queue
+     * yields nothing at all (so it never terminates early just because a cycle happened to surface
+     * only unrelated counters left behind by other tests). The sum of our own metrics across all
+     * cycles must equal the number we created; a dropped delta would make the sum come up short.
+     */
+    @Test
+    void skippedCountersRetainDeltaAcrossCycles() {
+        SpanMetricRegistryImpl registry = SpanMetricRegistryImpl.getInstance();
+        CoreMetricCollector collector = CoreMetricCollector.getInstance();
 
-    // Discard anything left in the queue by other tests sharing the singleton.
-    collector.drain();
+        // Discard anything left in the queue by other tests sharing the singleton.
+        collector.drain();
 
-    // Unique instrumentation-name prefix so we count only the instrumentations this test creates,
-    // regardless of whatever else has already polluted the shared registry. CoreMetricCollector
-    // emits these as "integration_name:<name>" tags.
-    String namePrefix = "queue-full-test-" + System.nanoTime() + "-";
-    String tagPrefix = "integration_name:" + namePrefix;
+        // Unique instrumentation-name prefix so we count only the instrumentations this test creates,
+        // regardless of whatever else has already polluted the shared registry. CoreMetricCollector
+        // emits these as "integration_name:<name>" tags.
+        String namePrefix = "queue-full-test-" + System.nanoTime() + "-";
+        String tagPrefix = "integration_name:" + namePrefix;
 
-    // Create more non-zero counters than the queue can hold so at least one collection cycle
-    // overflows. A single onSpanCreated() per instrumentation leaves exactly one non-zero counter
-    // (spans_created) each; the rest read as 0 and are skipped.
-    int created = RAW_QUEUE_SIZE + 200;
-    for (int i = 0; i < created; i++) {
-      registry.get(namePrefix + i).onSpanCreated();
-    }
+        // Create more non-zero counters than the queue can hold so at least one collection cycle
+        // overflows. A single onSpanCreated() per instrumentation leaves exactly one non-zero counter
+        // (spans_created) each; the rest read as 0 and are skipped.
+        int created = RAW_QUEUE_SIZE + 200;
+        for (int i = 0; i < created; i++) {
+            registry.get(namePrefix + i).onSpanCreated();
+        }
 
-    // Drain cycle-by-cycle until the queue is fully emptied, summing how many of our own metrics
-    // surface. Guard the loop so a bug that never converges fails loudly instead of hanging.
-    int seen = 0;
-    int cycles = 0;
-    while (true) {
-      collector.prepareMetrics();
-      Collection<CoreMetric> drained = collector.drain();
-      if (drained.isEmpty()) {
-        break;
-      }
-      for (CoreMetric metric : drained) {
-        if (isOurs(metric, tagPrefix)) {
-          seen++;
+        // Drain cycle-by-cycle until the queue is fully emptied, summing how many of our own metrics
+        // surface. Guard the loop so a bug that never converges fails loudly instead of hanging.
+        int seen = 0;
+        int cycles = 0;
+        while (true) {
+            collector.prepareMetrics();
+            Collection<CoreMetric> drained = collector.drain();
+            if (drained.isEmpty()) {
+                break;
+            }
+            for (CoreMetric metric : drained) {
+                if (isOurs(metric, tagPrefix)) {
+                    seen++;
+                }
+            }
+            assertTrue(++cycles < 20, "drain did not converge; possible lost/looping delta");
         }
-      }
-      assertTrue(++cycles < 20, "drain did not converge; possible lost/looping delta");
-    }
 
-    assertEquals(
-        created,
-        seen,
-        "every counter's delta must be reported exactly once; a full queue must not drop any");
-  }
+        assertEquals(
+                created, seen, "every counter's delta must be reported exactly once; a full queue must not drop any");
+    }
 
-  private static boolean isOurs(CoreMetric metric, String tagPrefix) {
-    for (String tag : metric.tags) {
-      if (tag.startsWith(tagPrefix)) {
-        return true;
-      }
+    private static boolean isOurs(CoreMetric metric, String tagPrefix) {
+        for (String tag : metric.tags) {
+            if (tag.startsWith(tagPrefix)) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/telemetry/LLMObsFeedbackMetricTest.java b/internal-api/src/test/java/datadog/trace/api/telemetry/LLMObsFeedbackMetricTest.java
index 5cfc28aaa84..3d196064962 100644
--- a/internal-api/src/test/java/datadog/trace/api/telemetry/LLMObsFeedbackMetricTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/telemetry/LLMObsFeedbackMetricTest.java
@@ -15,57 +15,57 @@
  */
 class LLMObsFeedbackMetricTest {
 
-  private LLMObsMetricCollector collector;
+    private LLMObsMetricCollector collector;
 
-  @BeforeEach
-  void setup() {
-    collector = LLMObsMetricCollector.get();
-    // The collector is a singleton shared with the rest of the suite.
-    collector.drain();
-  }
+    @BeforeEach
+    void setup() {
+        collector = LLMObsMetricCollector.get();
+        // The collector is a singleton shared with the rest of the suite.
+        collector.drain();
+    }
 
-  private LLMObsMetricCollector.LLMObsMetric drainOne() {
-    Collection<LLMObsMetricCollector.LLMObsMetric> drained = collector.drain();
-    assertEquals(1, drained.size(), drained.toString());
-    return drained.iterator().next();
-  }
+    private LLMObsMetricCollector.LLMObsMetric drainOne() {
+        Collection<LLMObsMetricCollector.LLMObsMetric> drained = collector.drain();
+        assertEquals(1, drained.size(), drained.toString());
+        return drained.iterator().next();
+    }
 
-  @Test
-  void testAnAcceptedSubmissionIsCountedWithoutError() {
-    collector.recordFeedbackSubmitted("boolean", "span_id", null);
+    @Test
+    void testAnAcceptedSubmissionIsCountedWithoutError() {
+        collector.recordFeedbackSubmitted("boolean", "span_id", null);
 
-    LLMObsMetricCollector.LLMObsMetric metric = drainOne();
-    assertEquals("mlobs", metric.namespace);
-    assertEquals("feedback_submitted", metric.metricName);
-    assertEquals("count", metric.type);
-    assertEquals(1L, metric.value.longValue());
+        LLMObsMetricCollector.LLMObsMetric metric = drainOne();
+        assertEquals("mlobs", metric.namespace);
+        assertEquals("feedback_submitted", metric.metricName);
+        assertEquals("count", metric.type);
+        assertEquals(1L, metric.value.longValue());
 
-    List<String> tags = metric.tags;
-    assertTrue(tags.contains("error:0"), tags.toString());
-    assertTrue(tags.contains("metric_type:boolean"), tags.toString());
-    assertTrue(tags.contains("target_type:span_id"), tags.toString());
-    assertFalse(tags.toString().contains("error_type"), tags.toString());
-  }
+        List<String> tags = metric.tags;
+        assertTrue(tags.contains("error:0"), tags.toString());
+        assertTrue(tags.contains("metric_type:boolean"), tags.toString());
+        assertTrue(tags.contains("target_type:span_id"), tags.toString());
+        assertFalse(tags.toString().contains("error_type"), tags.toString());
+    }
 
-  @Test
-  void testARejectedSubmissionCarriesItsErrorType() {
-    collector.recordFeedbackSubmitted("text", "feedback_join_key", "invalid_submitter");
+    @Test
+    void testARejectedSubmissionCarriesItsErrorType() {
+        collector.recordFeedbackSubmitted("text", "feedback_join_key", "invalid_submitter");
 
-    List<String> tags = drainOne().tags;
-    assertTrue(tags.contains("error:1"), tags.toString());
-    assertTrue(tags.contains("error_type:invalid_submitter"), tags.toString());
-    assertTrue(tags.contains("metric_type:text"), tags.toString());
-    assertTrue(tags.contains("target_type:feedback_join_key"), tags.toString());
-  }
+        List<String> tags = drainOne().tags;
+        assertTrue(tags.contains("error:1"), tags.toString());
+        assertTrue(tags.contains("error_type:invalid_submitter"), tags.toString());
+        assertTrue(tags.contains("metric_type:text"), tags.toString());
+        assertTrue(tags.contains("target_type:feedback_join_key"), tags.toString());
+    }
 
-  @Test
-  void testUndeterminedMetricAndTargetTypesFallBackToOther() {
-    // A feedback rejected before its target or value was set still gets counted.
-    collector.recordFeedbackSubmitted(null, null, "invalid_target_count");
+    @Test
+    void testUndeterminedMetricAndTargetTypesFallBackToOther() {
+        // A feedback rejected before its target or value was set still gets counted.
+        collector.recordFeedbackSubmitted(null, null, "invalid_target_count");
 
-    List<String> tags = drainOne().tags;
-    assertTrue(tags.contains("error:1"), tags.toString());
-    assertTrue(tags.contains("metric_type:other"), tags.toString());
-    assertTrue(tags.contains("target_type:other"), tags.toString());
-  }
+        List<String> tags = drainOne().tags;
+        assertTrue(tags.contains("error:1"), tags.toString());
+        assertTrue(tags.contains("metric_type:other"), tags.toString());
+        assertTrue(tags.contains("target_type:other"), tags.toString());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/telemetry/LLMObsMetricCollectorTest.java b/internal-api/src/test/java/datadog/trace/api/telemetry/LLMObsMetricCollectorTest.java
index efce543cee3..0608d37c5b7 100644
--- a/internal-api/src/test/java/datadog/trace/api/telemetry/LLMObsMetricCollectorTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/telemetry/LLMObsMetricCollectorTest.java
@@ -13,155 +13,151 @@
 import org.junit.jupiter.api.Test;
 
 class LLMObsMetricCollectorTest {
-  private final LLMObsMetricCollector collector = LLMObsMetricCollector.get();
-
-  @BeforeEach
-  void clearStaleMetrics() {
-    collector.resetForTesting();
-  }
-
-  @AfterEach
-  void clearMetrics() {
-    collector.resetForTesting();
-  }
-
-  @Test
-  void noMetricsDrainsEmptyList() {
-    collector.prepareMetrics();
-
-    assertTrue(collector.drain().isEmpty());
-  }
-
-  @Test
-  void recordsOneMetricPerDistinctTagCombination() {
-    collector.recordSpanFinished("openai", "llm", true, true, false, false);
-    collector.recordSpanFinished("openai", "llm", false, true, false, true);
-    collector.recordSpanFinished("anthropic", "embedding", true, false, true, false);
-    collector.prepareMetrics();
-
-    List<LLMObsMetricCollector.LLMObsMetric> metrics = sorted(collector.drain());
-
-    assertEquals(3, metrics.size());
-    for (LLMObsMetricCollector.LLMObsMetric metric : metrics) {
-      assertEquals("mlobs", metric.namespace);
-      assertEquals("span.finished", metric.metricName);
-      assertEquals("count", metric.type);
-      assertEquals(1L, metric.value);
+    private final LLMObsMetricCollector collector = LLMObsMetricCollector.get();
+
+    @BeforeEach
+    void clearStaleMetrics() {
+        collector.resetForTesting();
     }
-    assertEquals(
-        new HashSet<>(
-            Arrays.asList(
-                new HashSet<>(
-                    Arrays.asList(
-                        "integration:openai",
-                        "span_kind:llm",
-                        "is_root_span:1",
-                        "autoinstrumented:1",
-                        "error:0",
-                        "has_session_id:0")),
-                new HashSet<>(
-                    Arrays.asList(
-                        "integration:openai",
-                        "span_kind:llm",
-                        "is_root_span:0",
-                        "autoinstrumented:1",
-                        "error:0",
-                        "has_session_id:1")),
-                new HashSet<>(
-                    Arrays.asList(
-                        "integration:anthropic",
-                        "span_kind:embedding",
-                        "is_root_span:1",
-                        "autoinstrumented:0",
-                        "error:1",
-                        "has_session_id:0")))),
-        tagSets(metrics));
-  }
-
-  @Test
-  void aggregatesIdenticalTagCombinationsIntoASingleCount() {
-    collector.recordSpanFinished("openai", "llm", true, true, false, false);
-    collector.recordSpanFinished("openai", "llm", true, true, false, false);
-    collector.recordSpanFinished("openai", "llm", true, true, false, false);
-    collector.prepareMetrics();
-
-    Collection<LLMObsMetricCollector.LLMObsMetric> metrics = collector.drain();
-
-    assertEquals(1, metrics.size());
-    LLMObsMetricCollector.LLMObsMetric metric = metrics.iterator().next();
-    assertEquals("count", metric.type);
-    assertEquals(3L, metric.value);
-  }
-
-  /**
-   * Regression test for the reported ~100x under-count: emitting one raw metric per span both
-   * overflowed the bounded raw queue and collapsed to ~1/s per series at the metrics intake, since
-   * points are timestamped at second granularity. The count must survive well past {@link
-   * MetricCollector#RAW_QUEUE_SIZE} spans in a single interval.
-   */
-  @Test
-  void reportsExactCountWellBeyondRawQueueSize() {
-    int spans = MetricCollector.RAW_QUEUE_SIZE * 10;
-    for (int i = 0; i < spans; i++) {
-      collector.recordSpanFinished("openai", "llm", false, true, false, false);
+
+    @AfterEach
+    void clearMetrics() {
+        collector.resetForTesting();
     }
-    collector.prepareMetrics();
 
-    Collection<LLMObsMetricCollector.LLMObsMetric> metrics = collector.drain();
+    @Test
+    void noMetricsDrainsEmptyList() {
+        collector.prepareMetrics();
 
-    assertEquals(1, metrics.size());
-    assertEquals((long) spans, metrics.iterator().next().value);
-  }
+        assertTrue(collector.drain().isEmpty());
+    }
 
-  @Test
-  void countersResetBetweenIntervals() {
-    collector.recordSpanFinished("openai", "llm", true, true, false, false);
-    collector.prepareMetrics();
-    assertEquals(1, collector.drain().size());
+    @Test
+    void recordsOneMetricPerDistinctTagCombination() {
+        collector.recordSpanFinished("openai", "llm", true, true, false, false);
+        collector.recordSpanFinished("openai", "llm", false, true, false, true);
+        collector.recordSpanFinished("anthropic", "embedding", true, false, true, false);
+        collector.prepareMetrics();
+
+        List<LLMObsMetricCollector.LLMObsMetric> metrics = sorted(collector.drain());
+
+        assertEquals(3, metrics.size());
+        for (LLMObsMetricCollector.LLMObsMetric metric : metrics) {
+            assertEquals("mlobs", metric.namespace);
+            assertEquals("span.finished", metric.metricName);
+            assertEquals("count", metric.type);
+            assertEquals(1L, metric.value);
+        }
+        assertEquals(
+                new HashSet<>(Arrays.asList(
+                        new HashSet<>(Arrays.asList(
+                                "integration:openai",
+                                "span_kind:llm",
+                                "is_root_span:1",
+                                "autoinstrumented:1",
+                                "error:0",
+                                "has_session_id:0")),
+                        new HashSet<>(Arrays.asList(
+                                "integration:openai",
+                                "span_kind:llm",
+                                "is_root_span:0",
+                                "autoinstrumented:1",
+                                "error:0",
+                                "has_session_id:1")),
+                        new HashSet<>(Arrays.asList(
+                                "integration:anthropic",
+                                "span_kind:embedding",
+                                "is_root_span:1",
+                                "autoinstrumented:0",
+                                "error:1",
+                                "has_session_id:0")))),
+                tagSets(metrics));
+    }
 
-    collector.prepareMetrics();
+    @Test
+    void aggregatesIdenticalTagCombinationsIntoASingleCount() {
+        collector.recordSpanFinished("openai", "llm", true, true, false, false);
+        collector.recordSpanFinished("openai", "llm", true, true, false, false);
+        collector.recordSpanFinished("openai", "llm", true, true, false, false);
+        collector.prepareMetrics();
 
-    assertTrue(collector.drain().isEmpty(), "an idle interval must not re-report a stale count");
-  }
+        Collection<LLMObsMetricCollector.LLMObsMetric> metrics = collector.drain();
 
-  @Test
-  void reportsCountsAccumulatedAcrossIntervalsWithoutADrain() {
-    collector.recordSpanFinished("openai", "llm", true, true, false, false);
-    collector.prepareMetrics();
-    collector.recordSpanFinished("openai", "llm", true, true, false, false);
-    collector.recordSpanFinished("openai", "llm", true, true, false, false);
-    collector.prepareMetrics();
+        assertEquals(1, metrics.size());
+        LLMObsMetricCollector.LLMObsMetric metric = metrics.iterator().next();
+        assertEquals("count", metric.type);
+        assertEquals(3L, metric.value);
+    }
 
-    List<LLMObsMetricCollector.LLMObsMetric> metrics = sorted(collector.drain());
+    /**
+     * Regression test for the reported ~100x under-count: emitting one raw metric per span both
+     * overflowed the bounded raw queue and collapsed to ~1/s per series at the metrics intake, since
+     * points are timestamped at second granularity. The count must survive well past {@link
+     * MetricCollector#RAW_QUEUE_SIZE} spans in a single interval.
+     */
+    @Test
+    void reportsExactCountWellBeyondRawQueueSize() {
+        int spans = MetricCollector.RAW_QUEUE_SIZE * 10;
+        for (int i = 0; i < spans; i++) {
+            collector.recordSpanFinished("openai", "llm", false, true, false, false);
+        }
+        collector.prepareMetrics();
+
+        Collection<LLMObsMetricCollector.LLMObsMetric> metrics = collector.drain();
+
+        assertEquals(1, metrics.size());
+        assertEquals((long) spans, metrics.iterator().next().value);
+    }
+
+    @Test
+    void countersResetBetweenIntervals() {
+        collector.recordSpanFinished("openai", "llm", true, true, false, false);
+        collector.prepareMetrics();
+        assertEquals(1, collector.drain().size());
 
-    assertEquals(2, metrics.size());
-    assertEquals(1L, metrics.get(0).value);
-    assertEquals(2L, metrics.get(1).value);
-  }
+        collector.prepareMetrics();
 
-  @Test
-  void boundsTheNumberOfTrackedTagCombinations() {
-    for (int i = 0; i < LLMObsMetricCollector.MAX_TAG_COMBINATIONS * 2; i++) {
-      collector.recordSpanFinished("integration-" + i, "llm", true, true, false, false);
+        assertTrue(collector.drain().isEmpty(), "an idle interval must not re-report a stale count");
     }
-    collector.prepareMetrics();
-
-    assertEquals(LLMObsMetricCollector.MAX_TAG_COMBINATIONS, collector.drain().size());
-  }
-
-  private static List<LLMObsMetricCollector.LLMObsMetric> sorted(
-      Collection<LLMObsMetricCollector.LLMObsMetric> metrics) {
-    List<LLMObsMetricCollector.LLMObsMetric> sorted = new ArrayList<>(metrics);
-    sorted.sort((a, b) -> Long.compare(a.value.longValue(), b.value.longValue()));
-    return sorted;
-  }
-
-  private static HashSet<HashSet<String>> tagSets(
-      Collection<LLMObsMetricCollector.LLMObsMetric> metrics) {
-    HashSet<HashSet<String>> tagSets = new HashSet<>();
-    for (LLMObsMetricCollector.LLMObsMetric metric : metrics) {
-      tagSets.add(new HashSet<>(metric.tags));
+
+    @Test
+    void reportsCountsAccumulatedAcrossIntervalsWithoutADrain() {
+        collector.recordSpanFinished("openai", "llm", true, true, false, false);
+        collector.prepareMetrics();
+        collector.recordSpanFinished("openai", "llm", true, true, false, false);
+        collector.recordSpanFinished("openai", "llm", true, true, false, false);
+        collector.prepareMetrics();
+
+        List<LLMObsMetricCollector.LLMObsMetric> metrics = sorted(collector.drain());
+
+        assertEquals(2, metrics.size());
+        assertEquals(1L, metrics.get(0).value);
+        assertEquals(2L, metrics.get(1).value);
+    }
+
+    @Test
+    void boundsTheNumberOfTrackedTagCombinations() {
+        for (int i = 0; i < LLMObsMetricCollector.MAX_TAG_COMBINATIONS * 2; i++) {
+            collector.recordSpanFinished("integration-" + i, "llm", true, true, false, false);
+        }
+        collector.prepareMetrics();
+
+        assertEquals(
+                LLMObsMetricCollector.MAX_TAG_COMBINATIONS, collector.drain().size());
+    }
+
+    private static List<LLMObsMetricCollector.LLMObsMetric> sorted(
+            Collection<LLMObsMetricCollector.LLMObsMetric> metrics) {
+        List<LLMObsMetricCollector.LLMObsMetric> sorted = new ArrayList<>(metrics);
+        sorted.sort((a, b) -> Long.compare(a.value.longValue(), b.value.longValue()));
+        return sorted;
+    }
+
+    private static HashSet<HashSet<String>> tagSets(Collection<LLMObsMetricCollector.LLMObsMetric> metrics) {
+        HashSet<HashSet<String>> tagSets = new HashSet<>();
+        for (LLMObsMetricCollector.LLMObsMetric metric : metrics) {
+            tagSets.add(new HashSet<>(metric.tags));
+        }
+        return tagSets;
     }
-    return tagSets;
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/telemetry/LLMObsMetricCollectorUserProcessorTest.java b/internal-api/src/test/java/datadog/trace/api/telemetry/LLMObsMetricCollectorUserProcessorTest.java
index a5c2daff6a3..e5050969e83 100644
--- a/internal-api/src/test/java/datadog/trace/api/telemetry/LLMObsMetricCollectorUserProcessorTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/telemetry/LLMObsMetricCollectorUserProcessorTest.java
@@ -9,26 +9,26 @@
 import org.junit.jupiter.api.Test;
 
 class LLMObsMetricCollectorUserProcessorTest {
-  private final LLMObsMetricCollector collector = LLMObsMetricCollector.get();
+    private final LLMObsMetricCollector collector = LLMObsMetricCollector.get();
 
-  @BeforeEach
-  void clearMetrics() {
-    collector.drain();
-  }
+    @BeforeEach
+    void clearMetrics() {
+        collector.drain();
+    }
 
-  @Test
-  void recordsUserProcessorCalledMetrics() {
-    collector.recordUserProcessorCalled(false);
-    collector.recordUserProcessorCalled(true);
+    @Test
+    void recordsUserProcessorCalledMetrics() {
+        collector.recordUserProcessorCalled(false);
+        collector.recordUserProcessorCalled(true);
 
-    List<LLMObsMetricCollector.LLMObsMetric> metrics = new ArrayList<>(collector.drain());
+        List<LLMObsMetricCollector.LLMObsMetric> metrics = new ArrayList<>(collector.drain());
 
-    assertEquals(2, metrics.size());
-    assertEquals(LLMObsMetricCollector.USER_PROCESSOR_CALLED_METRIC, metrics.get(0).metricName);
-    assertEquals(LLMObsMetricCollector.COUNT_METRIC_TYPE, metrics.get(0).type);
-    assertEquals(singletonList("error:0"), metrics.get(0).tags);
-    assertEquals(LLMObsMetricCollector.USER_PROCESSOR_CALLED_METRIC, metrics.get(1).metricName);
-    assertEquals(LLMObsMetricCollector.COUNT_METRIC_TYPE, metrics.get(1).type);
-    assertEquals(singletonList("error:1"), metrics.get(1).tags);
-  }
+        assertEquals(2, metrics.size());
+        assertEquals(LLMObsMetricCollector.USER_PROCESSOR_CALLED_METRIC, metrics.get(0).metricName);
+        assertEquals(LLMObsMetricCollector.COUNT_METRIC_TYPE, metrics.get(0).type);
+        assertEquals(singletonList("error:0"), metrics.get(0).tags);
+        assertEquals(LLMObsMetricCollector.USER_PROCESSOR_CALLED_METRIC, metrics.get(1).metricName);
+        assertEquals(LLMObsMetricCollector.COUNT_METRIC_TYPE, metrics.get(1).type);
+        assertEquals(singletonList("error:1"), metrics.get(1).tags);
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/telemetry/LogCollectorTest.java b/internal-api/src/test/java/datadog/trace/api/telemetry/LogCollectorTest.java
index 05ab493fd86..b1a73602e3a 100644
--- a/internal-api/src/test/java/datadog/trace/api/telemetry/LogCollectorTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/telemetry/LogCollectorTest.java
@@ -16,375 +16,354 @@
 import org.junit.jupiter.api.Test;
 
 class LogCollectorTest {
-  private static final long TIMEOUT_SECONDS = 10;
-
-  @Test
-  void recordsLogGroupTimestamp() {
-    // Given
-    LogCollector logCollector = new LogCollector(1);
-    long before = System.currentTimeMillis() / 1000;
-
-    // When
-    logCollector.addLogMessage("ERROR", "Message 1", null);
-
-    long after = System.currentTimeMillis() / 1000;
-    LogCollector.RawLogMessage logGroup = singleLogGroup(logCollector.drain());
-
-    // Then
-    assertThat(logGroup.timestamp).isBetween(before, after);
-  }
-
-  @Test
-  void limitsLogGroupsToCapacity() {
-    // Given
-    LogCollector logCollector = new LogCollector(3);
-
-    // When
-    logCollector.addLogMessage("ERROR", "Message 1", null);
-    logCollector.addLogMessage("ERROR", "Message 2", null);
-    logCollector.addLogMessage("ERROR", "Message 3", null);
-    logCollector.addLogMessage("ERROR", "Message 4", null);
-
-    Collection<LogCollector.RawLogMessage> logGroups = logCollector.drain();
-
-    // Then
-    assertThat(logGroups).hasSize(3);
-    assertContainsLogGroup(logGroups, "Message 1", 1);
-    assertContainsLogGroup(logGroups, "Message 2", 1);
-    assertContainsLogGroup(logGroups, "Message 3", 1);
-    assertThat(logGroups).extracting(logGroup -> logGroup.message).doesNotContain("Message 4");
-  }
-
-  @Test
-  void groupsEquivalentMessages() {
-    // Given
-    LogCollector logCollector = new LogCollector(10);
-
-    // When
-    logCollector.addLogMessage("ERROR", "Foo Message", null);
-    logCollector.addLogMessage("ERROR", "Bar Message", null);
-    logCollector.addLogMessage("ERROR", "Baz Message", null);
-    logCollector.addLogMessage("ERROR", "Qux Message", null);
-    logCollector.addLogMessage("ERROR", "Bar Message", null);
-    logCollector.addLogMessage("ERROR", "Baz Message", null);
-    logCollector.addLogMessage("ERROR", "Qux Message", null);
-    logCollector.addLogMessage("ERROR", "Baz Message", null);
-    logCollector.addLogMessage("ERROR", "Qux Message", null);
-    logCollector.addLogMessage("ERROR", "Qux Message", null);
-
-    Collection<LogCollector.RawLogMessage> logGroups = logCollector.drain();
-
-    // Then
-    assertThat(logGroups).hasSize(4);
-    assertContainsLogGroup(logGroups, "Foo Message", 1);
-    assertContainsLogGroup(logGroups, "Bar Message", 2);
-    assertContainsLogGroup(logGroups, "Baz Message", 3);
-    assertContainsLogGroup(logGroups, "Qux Message", 4);
-  }
-
-  @Test
-  void countsEquivalentMessagesWhenTableIsFull() {
-    // Given
-    LogCollector logCollector = new LogCollector(1);
-    logCollector.addLogMessage("ERROR", "Message", null);
-
-    // When
-    logCollector.addLogMessage("ERROR", "Message", null);
-
-    // Then
-    assertThat(singleLogGroup(logCollector.drain()).count).isEqualTo(2);
-  }
-
-  @Test
-  void dropsNewLogGroupWhenTableIsFull() {
-    // Given
-    LogCollector logCollector = new LogCollector(1);
-    logCollector.addLogMessage("ERROR", "Existing message", null);
-
-    // When
-    logCollector.addLogMessage("ERROR", "New message", null);
-
-    // Then
-    assertThat(singleLogGroup(logCollector.drain()).message).isEqualTo("Existing message");
-  }
-
-  @Test
-  void reusesLogGroupCapacityAfterDrain() {
-    // Given
-    LogCollector logCollector = new LogCollector(1);
-
-    // When
-    logCollector.addLogMessage("ERROR", "First", null);
-
-    // Then
-    assertThat(singleLogGroup(logCollector.drain()).message).isEqualTo("First");
-
-    // When
-    logCollector.addLogMessage("ERROR", "Second", null);
-
-    // Then
-    assertThat(singleLogGroup(logCollector.drain()).message).isEqualTo("Second");
-    assertThat(logCollector.drain()).isEmpty();
-  }
-
-  @Test
-  void acceptsNewLogGroupAfterDrainDetachesFullBucket() throws Exception {
-    // Given
-    LogCollector logCollector = new LogCollector(1);
-    logCollector.addLogMessage("ERROR", "First", null);
-    ConcurrentHashtable.State<LogCollector.RawLogMessage> state = logCollector.rawLogMessages;
-    CountDownLatch bucketDetached = new CountDownLatch(1);
-    CountDownLatch releaseDrain = new CountDownLatch(1);
-    FutureTask<Collection<LogCollector.RawLogMessage>> drainTask =
-        new FutureTask<>(
-            () -> {
-              List<LogCollector.RawLogMessage> drainedLogGroups = new ArrayList<>();
-              ConcurrentHashtable.drain(
-                  state,
-                  drainedLogGroups,
-                  (logGroups, logGroup) -> {
-                    bucketDetached.countDown();
-                    await(releaseDrain);
-                    logGroups.add(logGroup);
-                  });
-              return drainedLogGroups;
-            });
-    Thread drainThread = new Thread(drainTask, "log-collector-drain");
-    FutureTask<Void> writerTask =
-        new FutureTask<>(
-            () -> {
-              logCollector.addLogMessage("ERROR", "Second", null);
-              return null;
+    private static final long TIMEOUT_SECONDS = 10;
+
+    @Test
+    void recordsLogGroupTimestamp() {
+        // Given
+        LogCollector logCollector = new LogCollector(1);
+        long before = System.currentTimeMillis() / 1000;
+
+        // When
+        logCollector.addLogMessage("ERROR", "Message 1", null);
+
+        long after = System.currentTimeMillis() / 1000;
+        LogCollector.RawLogMessage logGroup = singleLogGroup(logCollector.drain());
+
+        // Then
+        assertThat(logGroup.timestamp).isBetween(before, after);
+    }
+
+    @Test
+    void limitsLogGroupsToCapacity() {
+        // Given
+        LogCollector logCollector = new LogCollector(3);
+
+        // When
+        logCollector.addLogMessage("ERROR", "Message 1", null);
+        logCollector.addLogMessage("ERROR", "Message 2", null);
+        logCollector.addLogMessage("ERROR", "Message 3", null);
+        logCollector.addLogMessage("ERROR", "Message 4", null);
+
+        Collection<LogCollector.RawLogMessage> logGroups = logCollector.drain();
+
+        // Then
+        assertThat(logGroups).hasSize(3);
+        assertContainsLogGroup(logGroups, "Message 1", 1);
+        assertContainsLogGroup(logGroups, "Message 2", 1);
+        assertContainsLogGroup(logGroups, "Message 3", 1);
+        assertThat(logGroups).extracting(logGroup -> logGroup.message).doesNotContain("Message 4");
+    }
+
+    @Test
+    void groupsEquivalentMessages() {
+        // Given
+        LogCollector logCollector = new LogCollector(10);
+
+        // When
+        logCollector.addLogMessage("ERROR", "Foo Message", null);
+        logCollector.addLogMessage("ERROR", "Bar Message", null);
+        logCollector.addLogMessage("ERROR", "Baz Message", null);
+        logCollector.addLogMessage("ERROR", "Qux Message", null);
+        logCollector.addLogMessage("ERROR", "Bar Message", null);
+        logCollector.addLogMessage("ERROR", "Baz Message", null);
+        logCollector.addLogMessage("ERROR", "Qux Message", null);
+        logCollector.addLogMessage("ERROR", "Baz Message", null);
+        logCollector.addLogMessage("ERROR", "Qux Message", null);
+        logCollector.addLogMessage("ERROR", "Qux Message", null);
+
+        Collection<LogCollector.RawLogMessage> logGroups = logCollector.drain();
+
+        // Then
+        assertThat(logGroups).hasSize(4);
+        assertContainsLogGroup(logGroups, "Foo Message", 1);
+        assertContainsLogGroup(logGroups, "Bar Message", 2);
+        assertContainsLogGroup(logGroups, "Baz Message", 3);
+        assertContainsLogGroup(logGroups, "Qux Message", 4);
+    }
+
+    @Test
+    void countsEquivalentMessagesWhenTableIsFull() {
+        // Given
+        LogCollector logCollector = new LogCollector(1);
+        logCollector.addLogMessage("ERROR", "Message", null);
+
+        // When
+        logCollector.addLogMessage("ERROR", "Message", null);
+
+        // Then
+        assertThat(singleLogGroup(logCollector.drain()).count).isEqualTo(2);
+    }
+
+    @Test
+    void dropsNewLogGroupWhenTableIsFull() {
+        // Given
+        LogCollector logCollector = new LogCollector(1);
+        logCollector.addLogMessage("ERROR", "Existing message", null);
+
+        // When
+        logCollector.addLogMessage("ERROR", "New message", null);
+
+        // Then
+        assertThat(singleLogGroup(logCollector.drain()).message).isEqualTo("Existing message");
+    }
+
+    @Test
+    void reusesLogGroupCapacityAfterDrain() {
+        // Given
+        LogCollector logCollector = new LogCollector(1);
+
+        // When
+        logCollector.addLogMessage("ERROR", "First", null);
+
+        // Then
+        assertThat(singleLogGroup(logCollector.drain()).message).isEqualTo("First");
+
+        // When
+        logCollector.addLogMessage("ERROR", "Second", null);
+
+        // Then
+        assertThat(singleLogGroup(logCollector.drain()).message).isEqualTo("Second");
+        assertThat(logCollector.drain()).isEmpty();
+    }
+
+    @Test
+    void acceptsNewLogGroupAfterDrainDetachesFullBucket() throws Exception {
+        // Given
+        LogCollector logCollector = new LogCollector(1);
+        logCollector.addLogMessage("ERROR", "First", null);
+        ConcurrentHashtable.State<LogCollector.RawLogMessage> state = logCollector.rawLogMessages;
+        CountDownLatch bucketDetached = new CountDownLatch(1);
+        CountDownLatch releaseDrain = new CountDownLatch(1);
+        FutureTask<Collection<LogCollector.RawLogMessage>> drainTask = new FutureTask<>(() -> {
+            List<LogCollector.RawLogMessage> drainedLogGroups = new ArrayList<>();
+            ConcurrentHashtable.drain(state, drainedLogGroups, (logGroups, logGroup) -> {
+                bucketDetached.countDown();
+                await(releaseDrain);
+                logGroups.add(logGroup);
             });
-    Thread writerThread = new Thread(writerTask, "log-collector-writer");
-
-    // When
-    try {
-      drainThread.start();
-      await(bucketDetached);
-      // Capacity for the detached entry is released before its consumer runs, so the writer's
-      // lock-free isFull() check sees room and then waits for the table lock while the drain
-      // consumer remains paused.
-      writerThread.start();
-      new PollingConditions(TIMEOUT_SECONDS)
-          .eventually(() -> assertThat(writerThread.getState()).isEqualTo(Thread.State.WAITING));
-    } finally {
-      releaseDrain.countDown();
+            return drainedLogGroups;
+        });
+        Thread drainThread = new Thread(drainTask, "log-collector-drain");
+        FutureTask<Void> writerTask = new FutureTask<>(() -> {
+            logCollector.addLogMessage("ERROR", "Second", null);
+            return null;
+        });
+        Thread writerThread = new Thread(writerTask, "log-collector-writer");
+
+        // When
+        try {
+            drainThread.start();
+            await(bucketDetached);
+            // Capacity for the detached entry is released before its consumer runs, so the writer's
+            // lock-free isFull() check sees room and then waits for the table lock while the drain
+            // consumer remains paused.
+            writerThread.start();
+            new PollingConditions(TIMEOUT_SECONDS)
+                    .eventually(() -> assertThat(writerThread.getState()).isEqualTo(Thread.State.WAITING));
+        } finally {
+            releaseDrain.countDown();
+        }
+
+        // Then
+        Collection<LogCollector.RawLogMessage> firstDrainedLogGroups = await(drainTask);
+        await(writerTask);
+        assertThat(singleLogGroup(firstDrainedLogGroups).message).isEqualTo("First");
+        assertThat(singleLogGroup(logCollector.drain()).message).isEqualTo("Second");
     }
 
-    // Then
-    Collection<LogCollector.RawLogMessage> firstDrainedLogGroups = await(drainTask);
-    await(writerTask);
-    assertThat(singleLogGroup(firstDrainedLogGroups).message).isEqualTo("First");
-    assertThat(singleLogGroup(logCollector.drain()).message).isEqualTo("Second");
-  }
-
-  @Test
-  void groupsMessagesWithEquivalentThrowablesAndKeepsFirstMetadata() {
-    // Given
-    LogCollector logCollector = new LogCollector(2);
-    Throwable firstThrowable = throwableWithMethod("run", 10);
-    Throwable equivalentThrowable = throwableWithMethod("run", 10);
-
-    // When
-    logCollector.addLogMessage("ERROR", "Message", firstThrowable, "source:first");
-    logCollector.addLogMessage("ERROR", "Message", equivalentThrowable, "source:second");
-
-    LogCollector.RawLogMessage logGroup = singleLogGroup(logCollector.drain());
-
-    // Then
-    assertThat(logGroup.count).isEqualTo(2);
-    assertThat(logGroup.throwable).isSameAs(firstThrowable);
-    assertThat(logGroup.tags).isEqualTo("source:first");
-  }
-
-  @Test
-  void keepsMessagesWithDifferentStackTracesInSeparateGroups() {
-    // Given
-    LogCollector logCollector = new LogCollector(2);
-
-    // When
-    logCollector.addLogMessage("ERROR", "Message", throwableWithMethod("run", 10));
-    logCollector.addLogMessage("ERROR", "Message", throwableWithMethod("run", 20));
-
-    // Then
-    assertThat(logCollector.drain()).hasSize(2);
-  }
-
-  @Test
-  void rawLogMessageEqualityMatchesGrouping() {
-    // Given
-    LogCollector.RawLogMessage first =
-        new LogCollector.RawLogMessage(
-            "ERROR", "Message", throwableWithMethod("run", 10), "first", 1);
-    LogCollector.RawLogMessage equivalent =
-        new LogCollector.RawLogMessage(
-            "ERROR", "Message", throwableWithMethod("run", 10), "second", 2);
-    LogCollector.RawLogMessage different =
-        new LogCollector.RawLogMessage(
-            "ERROR", "Message", throwableWithMethod("runIt", 20), "first", 1);
-
-    // Then
-    assertThat(first).isEqualTo(equivalent);
-    assertThat(first).hasSameHashCodeAs(equivalent);
-    assertThat(first).isNotEqualTo(different);
-  }
-
-  @Test
-  void countsConcurrentEquivalentMessages() throws Exception {
-    // Given
-    int threadCount = 16;
-    int messagesPerThread = 1_000;
-    LogCollector logCollector = new LogCollector(2);
-    ExecutorService executor = Executors.newFixedThreadPool(threadCount);
-    CountDownLatch start = new CountDownLatch(1);
-    Future<?>[] futures = new Future<?>[threadCount];
-    try {
-      for (int i = 0; i < threadCount; i++) {
-        futures[i] =
-            executor.submit(
-                () -> {
-                  await(start);
-                  for (int occurrence = 0; occurrence < messagesPerThread; occurrence++) {
-                    logCollector.addLogMessage("ERROR", "Message", null);
-                  }
-                  return null;
+    @Test
+    void groupsMessagesWithEquivalentThrowablesAndKeepsFirstMetadata() {
+        // Given
+        LogCollector logCollector = new LogCollector(2);
+        Throwable firstThrowable = throwableWithMethod("run", 10);
+        Throwable equivalentThrowable = throwableWithMethod("run", 10);
+
+        // When
+        logCollector.addLogMessage("ERROR", "Message", firstThrowable, "source:first");
+        logCollector.addLogMessage("ERROR", "Message", equivalentThrowable, "source:second");
+
+        LogCollector.RawLogMessage logGroup = singleLogGroup(logCollector.drain());
+
+        // Then
+        assertThat(logGroup.count).isEqualTo(2);
+        assertThat(logGroup.throwable).isSameAs(firstThrowable);
+        assertThat(logGroup.tags).isEqualTo("source:first");
+    }
+
+    @Test
+    void keepsMessagesWithDifferentStackTracesInSeparateGroups() {
+        // Given
+        LogCollector logCollector = new LogCollector(2);
+
+        // When
+        logCollector.addLogMessage("ERROR", "Message", throwableWithMethod("run", 10));
+        logCollector.addLogMessage("ERROR", "Message", throwableWithMethod("run", 20));
+
+        // Then
+        assertThat(logCollector.drain()).hasSize(2);
+    }
+
+    @Test
+    void rawLogMessageEqualityMatchesGrouping() {
+        // Given
+        LogCollector.RawLogMessage first =
+                new LogCollector.RawLogMessage("ERROR", "Message", throwableWithMethod("run", 10), "first", 1);
+        LogCollector.RawLogMessage equivalent =
+                new LogCollector.RawLogMessage("ERROR", "Message", throwableWithMethod("run", 10), "second", 2);
+        LogCollector.RawLogMessage different =
+                new LogCollector.RawLogMessage("ERROR", "Message", throwableWithMethod("runIt", 20), "first", 1);
+
+        // Then
+        assertThat(first).isEqualTo(equivalent);
+        assertThat(first).hasSameHashCodeAs(equivalent);
+        assertThat(first).isNotEqualTo(different);
+    }
+
+    @Test
+    void countsConcurrentEquivalentMessages() throws Exception {
+        // Given
+        int threadCount = 16;
+        int messagesPerThread = 1_000;
+        LogCollector logCollector = new LogCollector(2);
+        ExecutorService executor = Executors.newFixedThreadPool(threadCount);
+        CountDownLatch start = new CountDownLatch(1);
+        Future<?>[] futures = new Future<?>[threadCount];
+        try {
+            for (int i = 0; i < threadCount; i++) {
+                futures[i] = executor.submit(() -> {
+                    await(start);
+                    for (int occurrence = 0; occurrence < messagesPerThread; occurrence++) {
+                        logCollector.addLogMessage("ERROR", "Message", null);
+                    }
+                    return null;
                 });
-      }
+            }
 
-      // When
-      release(start);
-      await(futures);
-    } finally {
-      shutdown(executor);
+            // When
+            release(start);
+            await(futures);
+        } finally {
+            shutdown(executor);
+        }
+
+        // Then
+        assertThat(singleLogGroup(logCollector.drain()).count).isEqualTo(threadCount * messagesPerThread);
     }
 
-    // Then
-    assertThat(singleLogGroup(logCollector.drain()).count)
-        .isEqualTo(threadCount * messagesPerThread);
-  }
-
-  @Test
-  void groupsConcurrentMessagesWithEquivalentThrowables() throws Exception {
-    // Given
-    int threadCount = 16;
-    LogCollector logCollector = new LogCollector(2);
-    Throwable firstThrowable = throwableWithMethod("run", 10);
-    logCollector.addLogMessage("ERROR", "Message", firstThrowable);
-    ExecutorService executor = Executors.newFixedThreadPool(threadCount);
-    CountDownLatch start = new CountDownLatch(1);
-    Future<?>[] futures = new Future<?>[threadCount];
-    try {
-      for (int i = 0; i < threadCount; i++) {
-        futures[i] =
-            executor.submit(
-                () -> {
-                  await(start);
-                  logCollector.addLogMessage("ERROR", "Message", throwableWithMethod("run", 10));
-                  return null;
+    @Test
+    void groupsConcurrentMessagesWithEquivalentThrowables() throws Exception {
+        // Given
+        int threadCount = 16;
+        LogCollector logCollector = new LogCollector(2);
+        Throwable firstThrowable = throwableWithMethod("run", 10);
+        logCollector.addLogMessage("ERROR", "Message", firstThrowable);
+        ExecutorService executor = Executors.newFixedThreadPool(threadCount);
+        CountDownLatch start = new CountDownLatch(1);
+        Future<?>[] futures = new Future<?>[threadCount];
+        try {
+            for (int i = 0; i < threadCount; i++) {
+                futures[i] = executor.submit(() -> {
+                    await(start);
+                    logCollector.addLogMessage("ERROR", "Message", throwableWithMethod("run", 10));
+                    return null;
                 });
-      }
+            }
+
+            // When
+            release(start);
+            await(futures);
+        } finally {
+            shutdown(executor);
+        }
+
+        LogCollector.RawLogMessage logGroup = singleLogGroup(logCollector.drain());
 
-      // When
-      release(start);
-      await(futures);
-    } finally {
-      shutdown(executor);
+        // Then
+        assertThat(logGroup.count).isEqualTo(threadCount + 1);
+        assertThat(logGroup.throwable).isSameAs(firstThrowable);
     }
 
-    LogCollector.RawLogMessage logGroup = singleLogGroup(logCollector.drain());
-
-    // Then
-    assertThat(logGroup.count).isEqualTo(threadCount + 1);
-    assertThat(logGroup.throwable).isSameAs(firstThrowable);
-  }
-
-  @Test
-  void limitsConcurrentLogGroupsToCapacity() throws Exception {
-    // Given
-    int capacity = 3;
-    int threadCount = 16;
-    LogCollector logCollector = new LogCollector(capacity);
-    ExecutorService executor = Executors.newFixedThreadPool(threadCount);
-    CountDownLatch start = new CountDownLatch(1);
-    Future<?>[] futures = new Future<?>[threadCount];
-    try {
-      for (int i = 0; i < threadCount; i++) {
-        String message = "Message " + i;
-        futures[i] =
-            executor.submit(
-                () -> {
-                  await(start);
-                  logCollector.addLogMessage("ERROR", message, null);
-                  return null;
+    @Test
+    void limitsConcurrentLogGroupsToCapacity() throws Exception {
+        // Given
+        int capacity = 3;
+        int threadCount = 16;
+        LogCollector logCollector = new LogCollector(capacity);
+        ExecutorService executor = Executors.newFixedThreadPool(threadCount);
+        CountDownLatch start = new CountDownLatch(1);
+        Future<?>[] futures = new Future<?>[threadCount];
+        try {
+            for (int i = 0; i < threadCount; i++) {
+                String message = "Message " + i;
+                futures[i] = executor.submit(() -> {
+                    await(start);
+                    logCollector.addLogMessage("ERROR", message, null);
+                    return null;
                 });
-      }
+            }
 
-      // When
-      release(start);
-      await(futures);
-    } finally {
-      shutdown(executor);
+            // When
+            release(start);
+            await(futures);
+        } finally {
+            shutdown(executor);
+        }
+
+        // Then
+        assertThat(logCollector.drain()).hasSize(capacity);
     }
 
-    // Then
-    assertThat(logCollector.drain()).hasSize(capacity);
-  }
+    private static Throwable throwableWithMethod(String methodName, int lineNumber) {
+        Throwable throwable = new IllegalStateException("ignored when grouping");
+        throwable.setStackTrace(
+                new StackTraceElement[] {new StackTraceElement("Example", methodName, "Example.java", lineNumber)});
+        return throwable;
+    }
 
-  private static Throwable throwableWithMethod(String methodName, int lineNumber) {
-    Throwable throwable = new IllegalStateException("ignored when grouping");
-    throwable.setStackTrace(
-        new StackTraceElement[] {
-          new StackTraceElement("Example", methodName, "Example.java", lineNumber)
-        });
-    return throwable;
-  }
-
-  private static void await(CountDownLatch latch) {
-    try {
-      assertThat(latch.await(TIMEOUT_SECONDS, SECONDS)).isTrue();
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      throw new AssertionError(e);
+    private static void await(CountDownLatch latch) {
+        try {
+            assertThat(latch.await(TIMEOUT_SECONDS, SECONDS)).isTrue();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new AssertionError(e);
+        }
     }
-  }
 
-  private static void release(CountDownLatch latch) {
-    latch.countDown();
-  }
+    private static void release(CountDownLatch latch) {
+        latch.countDown();
+    }
 
-  private static <T> T await(Future<T> future) throws Exception {
-    return future.get(TIMEOUT_SECONDS, SECONDS);
-  }
+    private static <T> T await(Future<T> future) throws Exception {
+        return future.get(TIMEOUT_SECONDS, SECONDS);
+    }
 
-  private static void await(Future<?>[] futures) throws Exception {
-    for (Future<?> future : futures) {
-      await(future);
+    private static void await(Future<?>[] futures) throws Exception {
+        for (Future<?> future : futures) {
+            await(future);
+        }
+    }
+
+    private static void shutdown(ExecutorService executor) throws InterruptedException {
+        executor.shutdownNow();
+        assertThat(executor.awaitTermination(TIMEOUT_SECONDS, SECONDS)).isTrue();
+    }
+
+    private static LogCollector.RawLogMessage singleLogGroup(Collection<LogCollector.RawLogMessage> logGroups) {
+        assertThat(logGroups).hasSize(1);
+        return logGroups.iterator().next();
+    }
+
+    private static void assertContainsLogGroup(
+            Collection<LogCollector.RawLogMessage> logGroups, String message, int count) {
+        assertThat(logGroups)
+                .as("log group for message %s", message)
+                .filteredOn(candidate -> message.equals(candidate.message))
+                .singleElement()
+                .satisfies(logGroup -> {
+                    assertThat(logGroup.logLevel).isEqualTo("ERROR");
+                    assertThat(logGroup.count).isEqualTo(count);
+                    assertThat(logGroup.throwable).isNull();
+                });
     }
-  }
-
-  private static void shutdown(ExecutorService executor) throws InterruptedException {
-    executor.shutdownNow();
-    assertThat(executor.awaitTermination(TIMEOUT_SECONDS, SECONDS)).isTrue();
-  }
-
-  private static LogCollector.RawLogMessage singleLogGroup(
-      Collection<LogCollector.RawLogMessage> logGroups) {
-    assertThat(logGroups).hasSize(1);
-    return logGroups.iterator().next();
-  }
-
-  private static void assertContainsLogGroup(
-      Collection<LogCollector.RawLogMessage> logGroups, String message, int count) {
-    assertThat(logGroups)
-        .as("log group for message %s", message)
-        .filteredOn(candidate -> message.equals(candidate.message))
-        .singleElement()
-        .satisfies(
-            logGroup -> {
-              assertThat(logGroup.logLevel).isEqualTo("ERROR");
-              assertThat(logGroup.count).isEqualTo(count);
-              assertThat(logGroup.throwable).isNull();
-            });
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/telemetry/OtelSpiCollectorTest.java b/internal-api/src/test/java/datadog/trace/api/telemetry/OtelSpiCollectorTest.java
index f1ddf2f2dea..95dea60ff5f 100644
--- a/internal-api/src/test/java/datadog/trace/api/telemetry/OtelSpiCollectorTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/telemetry/OtelSpiCollectorTest.java
@@ -10,60 +10,56 @@
 
 public class OtelSpiCollectorTest {
 
-  private final OtelSpiCollector collector = OtelSpiCollector.getInstance();
+    private final OtelSpiCollector collector = OtelSpiCollector.getInstance();
 
-  @BeforeEach
-  public void clearQueue() {
-    collector.drain();
-  }
+    @BeforeEach
+    public void clearQueue() {
+        collector.drain();
+    }
 
-  @Test
-  public void singletonReturnsSameInstance() {
-    assertSame(OtelSpiCollector.getInstance(), OtelSpiCollector.getInstance());
-  }
+    @Test
+    public void singletonReturnsSameInstance() {
+        assertSame(OtelSpiCollector.getInstance(), OtelSpiCollector.getInstance());
+    }
 
-  @Test
-  public void recordedMetricSurfacesOnDrain() {
-    collector.recordSpiDetected(
-        "io.opentelemetry.sdk.autoconfigure.spi.ConfigurablePropagatorProvider", "extensions_path");
+    @Test
+    public void recordedMetricSurfacesOnDrain() {
+        collector.recordSpiDetected(
+                "io.opentelemetry.sdk.autoconfigure.spi.ConfigurablePropagatorProvider", "extensions_path");
 
-    Iterator<OtelSpiCollector.OtelSpiMetric> drained = collector.drain().iterator();
-    assertTrue(drained.hasNext());
-    OtelSpiCollector.OtelSpiMetric metric = drained.next();
-    assertEquals("tracers", metric.namespace);
-    assertEquals("otel.spi.detected", metric.metricName);
-    assertEquals("count", metric.type);
-    assertTrue(metric.common);
-    assertEquals(1, metric.value);
-    assertTrue(
-        metric.tags.contains(
-            "spi_class:io.opentelemetry.sdk.autoconfigure.spi.ConfigurablePropagatorProvider"));
-    assertTrue(metric.tags.contains("source:extensions_path"));
-  }
+        Iterator<OtelSpiCollector.OtelSpiMetric> drained = collector.drain().iterator();
+        assertTrue(drained.hasNext());
+        OtelSpiCollector.OtelSpiMetric metric = drained.next();
+        assertEquals("tracers", metric.namespace);
+        assertEquals("otel.spi.detected", metric.metricName);
+        assertEquals("count", metric.type);
+        assertTrue(metric.common);
+        assertEquals(1, metric.value);
+        assertTrue(metric.tags.contains(
+                "spi_class:io.opentelemetry.sdk.autoconfigure.spi.ConfigurablePropagatorProvider"));
+        assertTrue(metric.tags.contains("source:extensions_path"));
+    }
 
-  @Test
-  public void multipleRecordsDrainAsDistinctMetrics() {
-    collector.recordSpiDetected(
-        "io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider", "app_classpath");
-    collector.recordSpiDetected(
-        "io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider", "app_classpath");
-    collector.recordSpiDetected(
-        "io.opentelemetry.sdk.autoconfigure.spi.ConfigurableSamplerProvider", "extensions_path");
+    @Test
+    public void multipleRecordsDrainAsDistinctMetrics() {
+        collector.recordSpiDetected("io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider", "app_classpath");
+        collector.recordSpiDetected("io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider", "app_classpath");
+        collector.recordSpiDetected(
+                "io.opentelemetry.sdk.autoconfigure.spi.ConfigurableSamplerProvider", "extensions_path");
 
-    assertEquals(3, collector.drain().size());
-  }
+        assertEquals(3, collector.drain().size());
+    }
 
-  @Test
-  public void drainWithoutRecordsReturnsEmpty() {
-    assertEquals(0, collector.drain().size());
-  }
+    @Test
+    public void drainWithoutRecordsReturnsEmpty() {
+        assertEquals(0, collector.drain().size());
+    }
 
-  @Test
-  public void drainClearsQueue() {
-    collector.recordSpiDetected(
-        "io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider",
-        "extensions_path");
-    assertEquals(1, collector.drain().size());
-    assertEquals(0, collector.drain().size());
-  }
+    @Test
+    public void drainClearsQueue() {
+        collector.recordSpiDetected(
+                "io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider", "extensions_path");
+        assertEquals(1, collector.drain().size());
+        assertEquals(0, collector.drain().size());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/telemetry/OtlpTelemetryTest.java b/internal-api/src/test/java/datadog/trace/api/telemetry/OtlpTelemetryTest.java
index 53877bd8dc6..d280b4f0d0f 100644
--- a/internal-api/src/test/java/datadog/trace/api/telemetry/OtlpTelemetryTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/telemetry/OtlpTelemetryTest.java
@@ -10,115 +10,115 @@
 import org.junit.jupiter.api.Test;
 
 class OtlpTelemetryTest {
-  private final OtlpTelemetry collector = OtlpTelemetry.getInstance();
-
-  @BeforeEach
-  void drainStaleMetrics() {
-    collector.prepareMetrics();
-    collector.drain();
-  }
-
-  @Test
-  void onTracesExportAttemptQueuesCountMetricWithTags() {
-    collector.onTracesExportAttempt();
-    collector.prepareMetrics();
-
-    Collection<OtlpTelemetry.OtlpMetric> metrics = collector.drain();
-
-    assertEquals(1, metrics.size());
-    OtlpTelemetry.OtlpMetric metric = metrics.iterator().next();
-    assertEquals("tracers", metric.namespace);
-    assertEquals("otel.traces_export_attempts", metric.metricName);
-    assertEquals("count", metric.type);
-    assertEquals(1L, metric.value);
-    assertEquals(2, metric.tags.size());
-    assertTrue(metric.tags.contains("protocol:http"));
-    assertTrue(metric.tags.contains("encoding:protobuf"));
-  }
-
-  @Test
-  void tracesExportMetricsUseExpectedNames() {
-    collector.onTracesExportAttempt();
-    collector.onTracesExportAttempt();
-    collector.onTracesExportComplete(true);
-    collector.onTracesExportComplete(false);
-    collector.prepareMetrics();
-
-    Map<String, Number> valuesByName = drainToMap();
-
-    assertEquals(3, valuesByName.size());
-    assertEquals(2L, valuesByName.get("otel.traces_export_attempts"));
-    assertEquals(1L, valuesByName.get("otel.traces_export_successes"));
-    assertEquals(1L, valuesByName.get("otel.traces_export_failures"));
-  }
-
-  @Test
-  void onMetricsExportAttemptQueuesCountMetricWithTags() {
-    collector.onMetricsExportAttempt();
-    collector.prepareMetrics();
-
-    Collection<OtlpTelemetry.OtlpMetric> metrics = collector.drain();
-
-    assertEquals(1, metrics.size());
-    OtlpTelemetry.OtlpMetric metric = metrics.iterator().next();
-    assertEquals("tracers", metric.namespace);
-    assertEquals("otel.metrics_export_attempts", metric.metricName);
-    assertEquals("count", metric.type);
-    assertEquals(1L, metric.value);
-    assertEquals(2, metric.tags.size());
-    assertTrue(metric.tags.contains("protocol:http"));
-    assertTrue(metric.tags.contains("encoding:protobuf"));
-  }
-
-  @Test
-  void metricsExportMetricsUseExpectedNames() {
-    collector.onMetricsExportAttempt();
-    collector.onMetricsExportAttempt();
-    collector.onMetricsExportComplete(true);
-    collector.onMetricsExportComplete(false);
-    collector.prepareMetrics();
-
-    Map<String, Number> valuesByName = drainToMap();
-
-    assertEquals(3, valuesByName.size());
-    assertEquals(2L, valuesByName.get("otel.metrics_export_attempts"));
-    assertEquals(1L, valuesByName.get("otel.metrics_export_successes"));
-    assertEquals(1L, valuesByName.get("otel.metrics_export_failures"));
-  }
-
-  @Test
-  void onLogRecordsSubmittedQueuesCountWithGivenValue() {
-    collector.onLogRecordsSubmitted(5);
-    collector.prepareMetrics();
-
-    Collection<OtlpTelemetry.OtlpMetric> metrics = collector.drain();
-
-    assertEquals(1, metrics.size());
-    OtlpTelemetry.OtlpMetric metric = metrics.iterator().next();
-    assertEquals("otel.log_records", metric.metricName);
-    assertEquals(5L, metric.value);
-    assertTrue(metric.tags.contains("protocol:http"));
-    assertTrue(metric.tags.contains("encoding:protobuf"));
-  }
-
-  @Test
-  void onLogRecordsSubmittedIgnoresNonPositiveCounts() {
-    collector.onLogRecordsSubmitted(0);
-    collector.onLogRecordsSubmitted(-1);
-
-    assertTrue(collector.drain().isEmpty());
-  }
-
-  @Test
-  void drainReturnsEmptyCollectionWhenNoMetricsQueued() {
-    assertTrue(collector.drain().isEmpty());
-  }
-
-  private Map<String, Number> drainToMap() {
-    Map<String, Number> valuesByName = new HashMap<>();
-    for (OtlpTelemetry.OtlpMetric metric : collector.drain()) {
-      valuesByName.put(metric.metricName, metric.value);
+    private final OtlpTelemetry collector = OtlpTelemetry.getInstance();
+
+    @BeforeEach
+    void drainStaleMetrics() {
+        collector.prepareMetrics();
+        collector.drain();
+    }
+
+    @Test
+    void onTracesExportAttemptQueuesCountMetricWithTags() {
+        collector.onTracesExportAttempt();
+        collector.prepareMetrics();
+
+        Collection<OtlpTelemetry.OtlpMetric> metrics = collector.drain();
+
+        assertEquals(1, metrics.size());
+        OtlpTelemetry.OtlpMetric metric = metrics.iterator().next();
+        assertEquals("tracers", metric.namespace);
+        assertEquals("otel.traces_export_attempts", metric.metricName);
+        assertEquals("count", metric.type);
+        assertEquals(1L, metric.value);
+        assertEquals(2, metric.tags.size());
+        assertTrue(metric.tags.contains("protocol:http"));
+        assertTrue(metric.tags.contains("encoding:protobuf"));
+    }
+
+    @Test
+    void tracesExportMetricsUseExpectedNames() {
+        collector.onTracesExportAttempt();
+        collector.onTracesExportAttempt();
+        collector.onTracesExportComplete(true);
+        collector.onTracesExportComplete(false);
+        collector.prepareMetrics();
+
+        Map<String, Number> valuesByName = drainToMap();
+
+        assertEquals(3, valuesByName.size());
+        assertEquals(2L, valuesByName.get("otel.traces_export_attempts"));
+        assertEquals(1L, valuesByName.get("otel.traces_export_successes"));
+        assertEquals(1L, valuesByName.get("otel.traces_export_failures"));
+    }
+
+    @Test
+    void onMetricsExportAttemptQueuesCountMetricWithTags() {
+        collector.onMetricsExportAttempt();
+        collector.prepareMetrics();
+
+        Collection<OtlpTelemetry.OtlpMetric> metrics = collector.drain();
+
+        assertEquals(1, metrics.size());
+        OtlpTelemetry.OtlpMetric metric = metrics.iterator().next();
+        assertEquals("tracers", metric.namespace);
+        assertEquals("otel.metrics_export_attempts", metric.metricName);
+        assertEquals("count", metric.type);
+        assertEquals(1L, metric.value);
+        assertEquals(2, metric.tags.size());
+        assertTrue(metric.tags.contains("protocol:http"));
+        assertTrue(metric.tags.contains("encoding:protobuf"));
+    }
+
+    @Test
+    void metricsExportMetricsUseExpectedNames() {
+        collector.onMetricsExportAttempt();
+        collector.onMetricsExportAttempt();
+        collector.onMetricsExportComplete(true);
+        collector.onMetricsExportComplete(false);
+        collector.prepareMetrics();
+
+        Map<String, Number> valuesByName = drainToMap();
+
+        assertEquals(3, valuesByName.size());
+        assertEquals(2L, valuesByName.get("otel.metrics_export_attempts"));
+        assertEquals(1L, valuesByName.get("otel.metrics_export_successes"));
+        assertEquals(1L, valuesByName.get("otel.metrics_export_failures"));
+    }
+
+    @Test
+    void onLogRecordsSubmittedQueuesCountWithGivenValue() {
+        collector.onLogRecordsSubmitted(5);
+        collector.prepareMetrics();
+
+        Collection<OtlpTelemetry.OtlpMetric> metrics = collector.drain();
+
+        assertEquals(1, metrics.size());
+        OtlpTelemetry.OtlpMetric metric = metrics.iterator().next();
+        assertEquals("otel.log_records", metric.metricName);
+        assertEquals(5L, metric.value);
+        assertTrue(metric.tags.contains("protocol:http"));
+        assertTrue(metric.tags.contains("encoding:protobuf"));
+    }
+
+    @Test
+    void onLogRecordsSubmittedIgnoresNonPositiveCounts() {
+        collector.onLogRecordsSubmitted(0);
+        collector.onLogRecordsSubmitted(-1);
+
+        assertTrue(collector.drain().isEmpty());
+    }
+
+    @Test
+    void drainReturnsEmptyCollectionWhenNoMetricsQueued() {
+        assertTrue(collector.drain().isEmpty());
+    }
+
+    private Map<String, Number> drainToMap() {
+        Map<String, Number> valuesByName = new HashMap<>();
+        for (OtlpTelemetry.OtlpMetric metric : collector.drain()) {
+            valuesByName.put(metric.metricName, metric.value);
+        }
+        return valuesByName;
     }
-    return valuesByName;
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/telemetry/ScaReachabilityDependencyRegistryTest.java b/internal-api/src/test/java/datadog/trace/api/telemetry/ScaReachabilityDependencyRegistryTest.java
index 3d022cc9144..474f2281889 100644
--- a/internal-api/src/test/java/datadog/trace/api/telemetry/ScaReachabilityDependencyRegistryTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/telemetry/ScaReachabilityDependencyRegistryTest.java
@@ -18,266 +18,261 @@
 
 class ScaReachabilityDependencyRegistryTest {
 
-  @BeforeEach
-  void setUp() {
-    ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
-  }
-
-  @AfterEach
-  void tearDown() {
-    ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
-  }
-
-  /**
-   * Regression test for the first-hit-wins thread-safety race.
-   *
-   * <p>Before the fix (volatile + check-then-set), two threads calling {@code recordHit} for the
-   * same CVE from different methods could both observe {@code hit == null} simultaneously and both
-   * write, with the second overwriting the first. The fix uses {@link
-   * java.util.concurrent.atomic.AtomicReference#compareAndSet} to guarantee exactly one thread
-   * wins.
-   *
-   * <p>This test starts N threads simultaneously, each recording a hit for the same CVE but from a
-   * different callsite. After all threads complete, exactly one callsite must be recorded.
-   */
-  @Test
-  void recordHit_concurrentCallsForSameCve_exactlyOneCallsiteStored() throws InterruptedException {
-    int threadCount = 20;
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-test");
-
-    CountDownLatch startLatch = new CountDownLatch(1);
-    CountDownLatch doneLatch = new CountDownLatch(threadCount);
-    ExecutorService pool = Executors.newFixedThreadPool(threadCount);
-
-    for (int i = 0; i < threadCount; i++) {
-      final int idx = i;
-      pool.submit(
-          () -> {
-            try {
-              startLatch.await(); // wait until all threads are ready
-              ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-                  "com.example:lib",
-                  "1.0.0",
-                  "GHSA-test",
-                  "com.myapp.Controller" + idx,
-                  "method" + idx,
-                  idx);
-            } catch (InterruptedException e) {
-              Thread.currentThread().interrupt();
-            } finally {
-              doneLatch.countDown();
+    @BeforeEach
+    void setUp() {
+        ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
+    }
+
+    @AfterEach
+    void tearDown() {
+        ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
+    }
+
+    /**
+     * Regression test for the first-hit-wins thread-safety race.
+     *
+     * <p>Before the fix (volatile + check-then-set), two threads calling {@code recordHit} for the
+     * same CVE from different methods could both observe {@code hit == null} simultaneously and both
+     * write, with the second overwriting the first. The fix uses {@link
+     * java.util.concurrent.atomic.AtomicReference#compareAndSet} to guarantee exactly one thread
+     * wins.
+     *
+     * <p>This test starts N threads simultaneously, each recording a hit for the same CVE but from a
+     * different callsite. After all threads complete, exactly one callsite must be recorded.
+     */
+    @Test
+    void recordHit_concurrentCallsForSameCve_exactlyOneCallsiteStored() throws InterruptedException {
+        int threadCount = 20;
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-test");
+
+        CountDownLatch startLatch = new CountDownLatch(1);
+        CountDownLatch doneLatch = new CountDownLatch(threadCount);
+        ExecutorService pool = Executors.newFixedThreadPool(threadCount);
+
+        for (int i = 0; i < threadCount; i++) {
+            final int idx = i;
+            pool.submit(() -> {
+                try {
+                    startLatch.await(); // wait until all threads are ready
+                    ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                            "com.example:lib", "1.0.0", "GHSA-test", "com.myapp.Controller" + idx, "method" + idx, idx);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                } finally {
+                    doneLatch.countDown();
+                }
+            });
+        }
+
+        startLatch.countDown(); // release all threads simultaneously
+        doneLatch.await(10, TimeUnit.SECONDS);
+        pool.shutdown();
+
+        List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
+                ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
+
+        assertEquals(1, snapshots.size(), "exactly one dep snapshot");
+        ScaReachabilityDependencyRegistry.DependencySnapshot dep = snapshots.get(0);
+        assertEquals(1, dep.cves.size(), "exactly one CVE");
+
+        ScaReachabilityDependencyRegistry.CveSnapshot cve = dep.cves.get(0);
+        assertNotNull(cve.hit, "exactly one hit must have been recorded");
+
+        // Verify the recorded callsite is one of the N valid options
+        String recordedClass = cve.hit.className();
+        String recordedSymbol = cve.hit.symbolName();
+        boolean isValidCallsite = false;
+        for (int i = 0; i < threadCount; i++) {
+            if (("com.myapp.Controller" + i).equals(recordedClass) && ("method" + i).equals(recordedSymbol)) {
+                isValidCallsite = true;
+                break;
             }
-          });
+        }
+        assertTrue(isValidCallsite, "recorded callsite must be one of the " + threadCount + " valid options");
     }
 
-    startLatch.countDown(); // release all threads simultaneously
-    doneLatch.await(10, TimeUnit.SECONDS);
-    pool.shutdown();
+    @Test
+    void registerCve_addsEntryAndMarksPending() {
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "2.0.0", "GHSA-0001");
 
-    List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
-        ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
+        List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
+                ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
 
-    assertEquals(1, snapshots.size(), "exactly one dep snapshot");
-    ScaReachabilityDependencyRegistry.DependencySnapshot dep = snapshots.get(0);
-    assertEquals(1, dep.cves.size(), "exactly one CVE");
-
-    ScaReachabilityDependencyRegistry.CveSnapshot cve = dep.cves.get(0);
-    assertNotNull(cve.hit, "exactly one hit must have been recorded");
-
-    // Verify the recorded callsite is one of the N valid options
-    String recordedClass = cve.hit.className();
-    String recordedSymbol = cve.hit.symbolName();
-    boolean isValidCallsite = false;
-    for (int i = 0; i < threadCount; i++) {
-      if (("com.myapp.Controller" + i).equals(recordedClass)
-          && ("method" + i).equals(recordedSymbol)) {
-        isValidCallsite = true;
-        break;
-      }
+        assertEquals(1, snapshots.size());
+        ScaReachabilityDependencyRegistry.DependencySnapshot dep = snapshots.get(0);
+        assertEquals("com.example:lib", dep.artifact);
+        assertEquals("2.0.0", dep.version);
+        assertEquals(1, dep.cves.size());
+        assertEquals("GHSA-0001", dep.cves.get(0).vulnId);
+        assertNull(dep.cves.get(0).hit, "class-load registration has no callsite yet");
     }
-    assertTrue(
-        isValidCallsite, "recorded callsite must be one of the " + threadCount + " valid options");
-  }
 
-  @Test
-  void registerCve_addsEntryAndMarksPending() {
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "2.0.0", "GHSA-0001");
+    @Test
+    void recordHit_snapshotContainsFullHitMetadata() {
+        ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                "com.example:lib", "2.0.0", "GHSA-0001", "com.myapp.Ctrl", "handle", 42);
+
+        List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
+                ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
+
+        assertEquals(1, snapshots.size());
+        ScaReachabilityDependencyRegistry.DependencySnapshot dep = snapshots.get(0);
+        assertEquals("com.example:lib", dep.artifact);
+        assertEquals("2.0.0", dep.version);
+        assertEquals(1, dep.cves.size());
+
+        ScaReachabilityDependencyRegistry.CveSnapshot cve = dep.cves.get(0);
+        assertEquals("GHSA-0001", cve.vulnId);
+        assertNotNull(cve.hit);
+        assertEquals("GHSA-0001", cve.hit.vulnId());
+        assertEquals("com.example:lib", cve.hit.artifact());
+        assertEquals("2.0.0", cve.hit.version());
+        assertEquals("com.myapp.Ctrl", cve.hit.className());
+        assertEquals("handle", cve.hit.symbolName());
+        assertEquals(42, cve.hit.line());
+    }
 
-    List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
-        ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
+    @Test
+    void peekSnapshot_returnsCurrentStateWithoutClearingPendingFlag() {
+        assertNull(ScaReachabilityDependencyRegistry.INSTANCE.peekSnapshot("missing", "1.0.0"));
 
-    assertEquals(1, snapshots.size());
-    ScaReachabilityDependencyRegistry.DependencySnapshot dep = snapshots.get(0);
-    assertEquals("com.example:lib", dep.artifact);
-    assertEquals("2.0.0", dep.version);
-    assertEquals(1, dep.cves.size());
-    assertEquals("GHSA-0001", dep.cves.get(0).vulnId);
-    assertNull(dep.cves.get(0).hit, "class-load registration has no callsite yet");
-  }
-
-  @Test
-  void recordHit_snapshotContainsFullHitMetadata() {
-    ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-        "com.example:lib", "2.0.0", "GHSA-0001", "com.myapp.Ctrl", "handle", 42);
-
-    List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
-        ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "2.0.0", "GHSA-0001");
+        ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                "com.example:lib", "2.0.0", "GHSA-0001", "com.myapp.Ctrl", "handle", 42);
 
-    assertEquals(1, snapshots.size());
-    ScaReachabilityDependencyRegistry.DependencySnapshot dep = snapshots.get(0);
-    assertEquals("com.example:lib", dep.artifact);
-    assertEquals("2.0.0", dep.version);
-    assertEquals(1, dep.cves.size());
-
-    ScaReachabilityDependencyRegistry.CveSnapshot cve = dep.cves.get(0);
-    assertEquals("GHSA-0001", cve.vulnId);
-    assertNotNull(cve.hit);
-    assertEquals("GHSA-0001", cve.hit.vulnId());
-    assertEquals("com.example:lib", cve.hit.artifact());
-    assertEquals("2.0.0", cve.hit.version());
-    assertEquals("com.myapp.Ctrl", cve.hit.className());
-    assertEquals("handle", cve.hit.symbolName());
-    assertEquals(42, cve.hit.line());
-  }
-
-  @Test
-  void peekSnapshot_returnsCurrentStateWithoutClearingPendingFlag() {
-    assertNull(ScaReachabilityDependencyRegistry.INSTANCE.peekSnapshot("missing", "1.0.0"));
-
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "2.0.0", "GHSA-0001");
-    ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-        "com.example:lib", "2.0.0", "GHSA-0001", "com.myapp.Ctrl", "handle", 42);
-
-    ScaReachabilityDependencyRegistry.DependencySnapshot peeked =
-        ScaReachabilityDependencyRegistry.INSTANCE.peekSnapshot("com.example:lib", "2.0.0");
-
-    assertNotNull(peeked);
-    assertEquals("com.example:lib", peeked.artifact);
-    assertEquals("2.0.0", peeked.version);
-    assertEquals(1, peeked.cves.size());
-    assertEquals("GHSA-0001", peeked.cves.get(0).vulnId);
-    assertNotNull(peeked.cves.get(0).hit);
-
-    List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
-        ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
-    assertEquals(1, snapshots.size(), "peek must not clear pending state");
-  }
+        ScaReachabilityDependencyRegistry.DependencySnapshot peeked =
+                ScaReachabilityDependencyRegistry.INSTANCE.peekSnapshot("com.example:lib", "2.0.0");
 
-  @Test
-  void drainPendingDependencies_secondDrainEmpty_untilNewHit() {
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "2.0.0", "GHSA-0001");
+        assertNotNull(peeked);
+        assertEquals("com.example:lib", peeked.artifact);
+        assertEquals("2.0.0", peeked.version);
+        assertEquals(1, peeked.cves.size());
+        assertEquals("GHSA-0001", peeked.cves.get(0).vulnId);
+        assertNotNull(peeked.cves.get(0).hit);
 
-    // First drain returns the pending dep
-    List<ScaReachabilityDependencyRegistry.DependencySnapshot> first =
-        ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
-    assertEquals(1, first.size());
+        List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
+                ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
+        assertEquals(1, snapshots.size(), "peek must not clear pending state");
+    }
 
-    // Second drain with no new state change returns empty
-    List<ScaReachabilityDependencyRegistry.DependencySnapshot> second =
-        ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
-    assertTrue(second.isEmpty(), "no pending changes since last drain");
+    @Test
+    void drainPendingDependencies_secondDrainEmpty_untilNewHit() {
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "2.0.0", "GHSA-0001");
+
+        // First drain returns the pending dep
+        List<ScaReachabilityDependencyRegistry.DependencySnapshot> first =
+                ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
+        assertEquals(1, first.size());
+
+        // Second drain with no new state change returns empty
+        List<ScaReachabilityDependencyRegistry.DependencySnapshot> second =
+                ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
+        assertTrue(second.isEmpty(), "no pending changes since last drain");
+
+        // A new hit marks the dep pending again
+        ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                "com.example:lib", "2.0.0", "GHSA-0001", "com.myapp.Ctrl", "handle", 42);
+        List<ScaReachabilityDependencyRegistry.DependencySnapshot> third =
+                ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
+        assertEquals(1, third.size(), "dep must be pending again after a hit");
+        assertNotNull(third.get(0).cves.get(0).hit, "hit callsite must be recorded");
+    }
 
-    // A new hit marks the dep pending again
-    ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-        "com.example:lib", "2.0.0", "GHSA-0001", "com.myapp.Ctrl", "handle", 42);
-    List<ScaReachabilityDependencyRegistry.DependencySnapshot> third =
+    @Test
+    void recordHit_firstHitWinsAndDuplicateDoesNotMarkPendingAgain() {
+        ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                "com.example:lib", "2.0.0", "GHSA-0001", "com.myapp.First", "first", 1);
         ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
-    assertEquals(1, third.size(), "dep must be pending again after a hit");
-    assertNotNull(third.get(0).cves.get(0).hit, "hit callsite must be recorded");
-  }
-
-  @Test
-  void recordHit_firstHitWinsAndDuplicateDoesNotMarkPendingAgain() {
-    ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-        "com.example:lib", "2.0.0", "GHSA-0001", "com.myapp.First", "first", 1);
-    ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
-
-    ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-        "com.example:lib", "2.0.0", "GHSA-0001", "com.myapp.Second", "second", 2);
-
-    assertTrue(
-        ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies().isEmpty(),
-        "duplicate hit for the same CVE must not mark the dependency pending");
-
-    ScaReachabilityDependencyRegistry.DependencySnapshot snapshot =
-        ScaReachabilityDependencyRegistry.INSTANCE.peekSnapshot("com.example:lib", "2.0.0");
-    assertNotNull(snapshot);
-    assertEquals("com.myapp.First", snapshot.cves.get(0).hit.className());
-    assertEquals("first", snapshot.cves.get(0).hit.symbolName());
-  }
-
-  @Test
-  void registerCve_atCap_newKeysRejected() {
-    int cap = Config.get().getAppSecScaMaxTrackedDependencies();
-
-    // Fill registry to cap
-    for (int i = 0; i < cap; i++) {
-      ScaReachabilityDependencyRegistry.INSTANCE.registerCve("art" + i, "1.0", "GHSA-" + i);
+
+        ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                "com.example:lib", "2.0.0", "GHSA-0001", "com.myapp.Second", "second", 2);
+
+        assertTrue(
+                ScaReachabilityDependencyRegistry.INSTANCE
+                        .drainPendingDependencies()
+                        .isEmpty(),
+                "duplicate hit for the same CVE must not mark the dependency pending");
+
+        ScaReachabilityDependencyRegistry.DependencySnapshot snapshot =
+                ScaReachabilityDependencyRegistry.INSTANCE.peekSnapshot("com.example:lib", "2.0.0");
+        assertNotNull(snapshot);
+        assertEquals("com.myapp.First", snapshot.cves.get(0).hit.className());
+        assertEquals("first", snapshot.cves.get(0).hit.symbolName());
     }
 
-    // One more unique key — must be rejected
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("art-over-cap", "1.0", "GHSA-over");
+    @Test
+    void registerCve_atCap_newKeysRejected() {
+        int cap = Config.get().getAppSecScaMaxTrackedDependencies();
 
-    List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
-        ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
-    assertEquals(cap, snapshots.size(), "registry must not exceed cap");
-    boolean found = snapshots.stream().anyMatch(s -> s.artifact.equals("art-over-cap"));
-    assertFalse(found, "over-cap dep must be rejected");
-  }
-
-  @Test
-  void registerCve_atCap_existingKeyStillUpdated() {
-    int cap = Config.get().getAppSecScaMaxTrackedDependencies();
-
-    // Fill registry to cap
-    for (int i = 0; i < cap; i++) {
-      ScaReachabilityDependencyRegistry.INSTANCE.registerCve("art" + i, "1.0", "GHSA-" + i);
+        // Fill registry to cap
+        for (int i = 0; i < cap; i++) {
+            ScaReachabilityDependencyRegistry.INSTANCE.registerCve("art" + i, "1.0", "GHSA-" + i);
+        }
+
+        // One more unique key — must be rejected
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("art-over-cap", "1.0", "GHSA-over");
+
+        List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
+                ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
+        assertEquals(cap, snapshots.size(), "registry must not exceed cap");
+        boolean found = snapshots.stream().anyMatch(s -> s.artifact.equals("art-over-cap"));
+        assertFalse(found, "over-cap dep must be rejected");
     }
-    ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
 
-    // Adding a NEW CVE to an EXISTING key must still succeed (key already present, cap not
-    // exceeded)
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("art0", "1.0", "GHSA-second-cve");
+    @Test
+    void registerCve_atCap_existingKeyStillUpdated() {
+        int cap = Config.get().getAppSecScaMaxTrackedDependencies();
 
-    List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
+        // Fill registry to cap
+        for (int i = 0; i < cap; i++) {
+            ScaReachabilityDependencyRegistry.INSTANCE.registerCve("art" + i, "1.0", "GHSA-" + i);
+        }
         ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
-    assertEquals(1, snapshots.size(), "only the updated dep must be pending");
-    assertEquals(2, snapshots.get(0).cves.size(), "both CVEs must be present");
-  }
 
-  @Test
-  void recordHit_atCap_newKeysRejectedButExistingKeyStillUpdated() {
-    int cap = Config.get().getAppSecScaMaxTrackedDependencies();
+        // Adding a NEW CVE to an EXISTING key must still succeed (key already present, cap not
+        // exceeded)
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("art0", "1.0", "GHSA-second-cve");
 
-    for (int i = 0; i < cap; i++) {
-      ScaReachabilityDependencyRegistry.INSTANCE.registerCve("art" + i, "1.0", "GHSA-" + i);
+        List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
+                ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
+        assertEquals(1, snapshots.size(), "only the updated dep must be pending");
+        assertEquals(2, snapshots.get(0).cves.size(), "both CVEs must be present");
     }
-    ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
 
-    ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-        "art-over-cap", "1.0", "GHSA-over", "com.myapp.Ctrl", "handle", 42);
-    assertTrue(
-        ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies().isEmpty(),
-        "over-cap hit for a new dependency must be rejected");
+    @Test
+    void recordHit_atCap_newKeysRejectedButExistingKeyStillUpdated() {
+        int cap = Config.get().getAppSecScaMaxTrackedDependencies();
 
-    ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-        "art0", "1.0", "GHSA-0", "com.myapp.Ctrl", "handle", 42);
-    List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
+        for (int i = 0; i < cap; i++) {
+            ScaReachabilityDependencyRegistry.INSTANCE.registerCve("art" + i, "1.0", "GHSA-" + i);
+        }
         ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
-    assertEquals(1, snapshots.size(), "existing dependency can still be updated at cap");
-    assertEquals("art0", snapshots.get(0).artifact);
-    assertNotNull(snapshots.get(0).cves.get(0).hit);
-  }
-
-  @Test
-  void resetForTesting_clearsPeriodicWorkCallback() {
-    ScaReachabilityDependencyRegistry.INSTANCE.setPeriodicWorkCallback(() -> {});
-    assertNotNull(ScaReachabilityDependencyRegistry.INSTANCE.getPeriodicWorkCallback());
-
-    ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
-
-    assertNull(
-        ScaReachabilityDependencyRegistry.INSTANCE.getPeriodicWorkCallback(),
-        "resetForTesting must clear periodicWorkCallback");
-  }
+
+        ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                "art-over-cap", "1.0", "GHSA-over", "com.myapp.Ctrl", "handle", 42);
+        assertTrue(
+                ScaReachabilityDependencyRegistry.INSTANCE
+                        .drainPendingDependencies()
+                        .isEmpty(),
+                "over-cap hit for a new dependency must be rejected");
+
+        ScaReachabilityDependencyRegistry.INSTANCE.recordHit("art0", "1.0", "GHSA-0", "com.myapp.Ctrl", "handle", 42);
+        List<ScaReachabilityDependencyRegistry.DependencySnapshot> snapshots =
+                ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
+        assertEquals(1, snapshots.size(), "existing dependency can still be updated at cap");
+        assertEquals("art0", snapshots.get(0).artifact);
+        assertNotNull(snapshots.get(0).cves.get(0).hit);
+    }
+
+    @Test
+    void resetForTesting_clearsPeriodicWorkCallback() {
+        ScaReachabilityDependencyRegistry.INSTANCE.setPeriodicWorkCallback(() -> {});
+        assertNotNull(ScaReachabilityDependencyRegistry.INSTANCE.getPeriodicWorkCallback());
+
+        ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
+
+        assertNull(
+                ScaReachabilityDependencyRegistry.INSTANCE.getPeriodicWorkCallback(),
+                "resetForTesting must clear periodicWorkCallback");
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/api/telemetry/WafMetricCollectorContextClosedRaceTest.java b/internal-api/src/test/java/datadog/trace/api/telemetry/WafMetricCollectorContextClosedRaceTest.java
index c1b8a06a99c..e3c3124a1d3 100644
--- a/internal-api/src/test/java/datadog/trace/api/telemetry/WafMetricCollectorContextClosedRaceTest.java
+++ b/internal-api/src/test/java/datadog/trace/api/telemetry/WafMetricCollectorContextClosedRaceTest.java
@@ -9,21 +9,22 @@
 
 class WafMetricCollectorContextClosedRaceTest {
 
-  @Test
-  void reportsContextClosedRaceCount() {
-    WafMetricCollector collector = WafMetricCollector.get();
+    @Test
+    void reportsContextClosedRaceCount() {
+        WafMetricCollector collector = WafMetricCollector.get();
 
-    collector.wafContextClosedRace();
-    collector.wafContextClosedRace();
-    collector.prepareMetrics();
+        collector.wafContextClosedRace();
+        collector.wafContextClosedRace();
+        collector.prepareMetrics();
 
-    Collection<WafMetricCollector.WafMetric> metrics = collector.drain();
-    Optional<WafMetricCollector.WafMetric> raceMetric =
-        metrics.stream().filter(m -> "waf.context_closed_race".equals(m.metricName)).findFirst();
+        Collection<WafMetricCollector.WafMetric> metrics = collector.drain();
+        Optional<WafMetricCollector.WafMetric> raceMetric = metrics.stream()
+                .filter(m -> "waf.context_closed_race".equals(m.metricName))
+                .findFirst();
 
-    assertTrue(raceMetric.isPresent(), "expected waf.context_closed_race to be reported");
-    assertEquals("count", raceMetric.get().type);
-    assertEquals("appsec", raceMetric.get().namespace);
-    assertEquals(2L, raceMetric.get().value.longValue());
-  }
+        assertTrue(raceMetric.isPresent(), "expected waf.context_closed_race to be reported");
+        assertEquals("count", raceMetric.get().type);
+        assertEquals("appsec", raceMetric.get().namespace);
+        assertEquals(2L, raceMetric.get().value.longValue());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/bootstrap/instrumentation/api/ExtractedSpanTest.java b/internal-api/src/test/java/datadog/trace/bootstrap/instrumentation/api/ExtractedSpanTest.java
index 852e0142ba2..70a52b5d6c0 100644
--- a/internal-api/src/test/java/datadog/trace/bootstrap/instrumentation/api/ExtractedSpanTest.java
+++ b/internal-api/src/test/java/datadog/trace/bootstrap/instrumentation/api/ExtractedSpanTest.java
@@ -17,75 +17,76 @@
 
 class ExtractedSpanTest {
 
-  @Test
-  void extractedSpanFromPartialTracingContext() {
-    Map<String, String> tagValues = new HashMap<>();
-    tagValues.put("tag-1", "value-1");
-    tagValues.put("tag-2", "value-2");
-    TagMap tags = TagMap.fromMap(tagValues);
-    Map<String, String> baggage = new HashMap<>();
-    baggage.put("baggage-1", "value-1");
-    baggage.put("baggage-2", "value-2");
-    DDTraceId traceId = DDTraceId.from(12345);
-    TagContext context = new TagContext("origin", tags, null, baggage, 0, null, null, traceId);
-    ExtractedSpan extractedSpan = new ExtractedSpan(context);
+    @Test
+    void extractedSpanFromPartialTracingContext() {
+        Map<String, String> tagValues = new HashMap<>();
+        tagValues.put("tag-1", "value-1");
+        tagValues.put("tag-2", "value-2");
+        TagMap tags = TagMap.fromMap(tagValues);
+        Map<String, String> baggage = new HashMap<>();
+        baggage.put("baggage-1", "value-1");
+        baggage.put("baggage-2", "value-2");
+        DDTraceId traceId = DDTraceId.from(12345);
+        TagContext context = new TagContext("origin", tags, null, baggage, 0, null, null, traceId);
+        ExtractedSpan extractedSpan = new ExtractedSpan(context);
 
-    assertEquals(traceId, extractedSpan.getTraceId());
-    assertEquals(context.getSpanId(), extractedSpan.getSpanId());
-    assertEquals(context, extractedSpan.spanContext());
-    assertEquals(tags, extractedSpan.getTags());
-    assertEquals("value-1", extractedSpan.getTag("tag-1"));
-    assertEquals("value-2", extractedSpan.getBaggageItem("baggage-2"));
-    assertTrue(extractedSpan.isSameTrace(new ExtractedSpan(context)));
-    assertNotNull(extractedSpan.toString());
+        assertEquals(traceId, extractedSpan.getTraceId());
+        assertEquals(context.getSpanId(), extractedSpan.getSpanId());
+        assertEquals(context, extractedSpan.spanContext());
+        assertEquals(tags, extractedSpan.getTags());
+        assertEquals("value-1", extractedSpan.getTag("tag-1"));
+        assertEquals("value-2", extractedSpan.getBaggageItem("baggage-2"));
+        assertTrue(extractedSpan.isSameTrace(new ExtractedSpan(context)));
+        assertNotNull(extractedSpan.toString());
 
-    extractedSpan.setTag("tag-1", "updated");
-    extractedSpan.setBaggageItem("baggage-2", "updated");
+        extractedSpan.setTag("tag-1", "updated");
+        extractedSpan.setBaggageItem("baggage-2", "updated");
 
-    assertEquals("value-1", extractedSpan.getTag("tag-1"));
-    assertEquals("value-2", extractedSpan.getBaggageItem("baggage-2"));
-  }
+        assertEquals("value-1", extractedSpan.getTag("tag-1"));
+        assertEquals("value-2", extractedSpan.getBaggageItem("baggage-2"));
+    }
 
-  @Test
-  void extractedSpanFromCustomSpanContext() {
-    AgentSpanContext context = mock(AgentSpanContext.class);
-    when(context.getTraceId()).thenReturn(DDTraceId.from(12345));
-    when(context.getSpanId()).thenReturn(67890L);
-    when(context.baggageItems()).thenReturn(Collections.<String, String>emptyMap().entrySet());
-    ExtractedSpan extractedSpan = new ExtractedSpan(context);
+    @Test
+    void extractedSpanFromCustomSpanContext() {
+        AgentSpanContext context = mock(AgentSpanContext.class);
+        when(context.getTraceId()).thenReturn(DDTraceId.from(12345));
+        when(context.getSpanId()).thenReturn(67890L);
+        when(context.baggageItems())
+                .thenReturn(Collections.<String, String>emptyMap().entrySet());
+        ExtractedSpan extractedSpan = new ExtractedSpan(context);
 
-    assertEquals(context.getTraceId(), extractedSpan.getTraceId());
-    assertEquals(context.getSpanId(), extractedSpan.getSpanId());
-    assertEquals(context, extractedSpan.spanContext());
-    assertTrue(extractedSpan.getTags().isEmpty());
-    assertNull(extractedSpan.getTag("tag-1"));
-    assertNull(extractedSpan.getBaggageItem("baggage-2"));
-    assertTrue(extractedSpan.isSameTrace(new ExtractedSpan(context)));
-    assertNotNull(extractedSpan.toString());
-  }
+        assertEquals(context.getTraceId(), extractedSpan.getTraceId());
+        assertEquals(context.getSpanId(), extractedSpan.getSpanId());
+        assertEquals(context, extractedSpan.spanContext());
+        assertTrue(extractedSpan.getTags().isEmpty());
+        assertNull(extractedSpan.getTag("tag-1"));
+        assertNull(extractedSpan.getBaggageItem("baggage-2"));
+        assertTrue(extractedSpan.isSameTrace(new ExtractedSpan(context)));
+        assertNotNull(extractedSpan.toString());
+    }
 
-  @Test
-  void traceConfigReturnsExtractedSnapshotWhenPresent() {
-    TraceConfig snapshot = mock(TraceConfig.class);
-    TagContext context = new TagContext(null, null, null, null, 0, snapshot, null, DDTraceId.ZERO);
-    ExtractedSpan extractedSpan = new ExtractedSpan(context);
+    @Test
+    void traceConfigReturnsExtractedSnapshotWhenPresent() {
+        TraceConfig snapshot = mock(TraceConfig.class);
+        TagContext context = new TagContext(null, null, null, null, 0, snapshot, null, DDTraceId.ZERO);
+        ExtractedSpan extractedSpan = new ExtractedSpan(context);
 
-    assertEquals(snapshot, extractedSpan.traceConfig());
-  }
+        assertEquals(snapshot, extractedSpan.traceConfig());
+    }
 
-  @Test
-  void traceConfigFallsBackToCurrentConfigWhenSnapshotAbsent() {
-    TagContext context = new TagContext();
-    ExtractedSpan extractedSpan = new ExtractedSpan(context);
+    @Test
+    void traceConfigFallsBackToCurrentConfigWhenSnapshotAbsent() {
+        TagContext context = new TagContext();
+        ExtractedSpan extractedSpan = new ExtractedSpan(context);
 
-    assertNotNull(extractedSpan.traceConfig());
-  }
+        assertNotNull(extractedSpan.traceConfig());
+    }
 
-  @Test
-  void traceConfigFallsBackToCurrentConfigForCustomSpanContext() {
-    AgentSpanContext context = mock(AgentSpanContext.class);
-    ExtractedSpan extractedSpan = new ExtractedSpan(context);
+    @Test
+    void traceConfigFallsBackToCurrentConfigForCustomSpanContext() {
+        AgentSpanContext context = mock(AgentSpanContext.class);
+        ExtractedSpan extractedSpan = new ExtractedSpan(context);
 
-    assertNotNull(extractedSpan.traceConfig());
-  }
+        assertNotNull(extractedSpan.traceConfig());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/bootstrap/instrumentation/api/KeyClassifierTest.java b/internal-api/src/test/java/datadog/trace/bootstrap/instrumentation/api/KeyClassifierTest.java
index 35e085a7892..35fb0b9ee3c 100644
--- a/internal-api/src/test/java/datadog/trace/bootstrap/instrumentation/api/KeyClassifierTest.java
+++ b/internal-api/src/test/java/datadog/trace/bootstrap/instrumentation/api/KeyClassifierTest.java
@@ -10,69 +10,62 @@
 
 class KeyClassifierTest {
 
-  static class RecordingClassifier implements AgentPropagation.KeyClassifier {
-    String lastKey;
-    String lastValue;
-    boolean returnValue;
-
-    RecordingClassifier(boolean returnValue) {
-      this.returnValue = returnValue;
+    static class RecordingClassifier implements AgentPropagation.KeyClassifier {
+        String lastKey;
+        String lastValue;
+        boolean returnValue;
+
+        RecordingClassifier(boolean returnValue) {
+            this.returnValue = returnValue;
+        }
+
+        @Override
+        public boolean accept(String key, String value) {
+            lastKey = key;
+            lastValue = value;
+            return returnValue;
+        }
     }
 
-    @Override
-    public boolean accept(String key, String value) {
-      lastKey = key;
-      lastValue = value;
-      return returnValue;
+    @Test
+    void defaultTransformerMethodAppliesTransformerAndDelegates() {
+        RecordingClassifier classifier = new RecordingClassifier(true);
+
+        boolean result = classifier.accept(
+                "my-key", "raw".getBytes(StandardCharsets.UTF_8), bytes -> new String(bytes, StandardCharsets.UTF_8));
+
+        assertEquals("my-key", classifier.lastKey);
+        assertEquals("raw", classifier.lastValue);
+        assertTrue(result);
     }
-  }
-
-  @Test
-  void defaultTransformerMethodAppliesTransformerAndDelegates() {
-    RecordingClassifier classifier = new RecordingClassifier(true);
-
-    boolean result =
-        classifier.accept(
-            "my-key",
-            "raw".getBytes(StandardCharsets.UTF_8),
-            bytes -> new String(bytes, StandardCharsets.UTF_8));
-
-    assertEquals("my-key", classifier.lastKey);
-    assertEquals("raw", classifier.lastValue);
-    assertTrue(result);
-  }
-
-  @Test
-  void transformerIsCalledExactlyOnce() {
-    AtomicInteger callCount = new AtomicInteger(0);
-    AtomicReference<String> transformed = new AtomicReference<>();
-
-    AgentPropagation.KeyClassifier classifier =
-        (key, value) -> {
-          transformed.set(value);
-          return true;
+
+    @Test
+    void transformerIsCalledExactlyOnce() {
+        AtomicInteger callCount = new AtomicInteger(0);
+        AtomicReference<String> transformed = new AtomicReference<>();
+
+        AgentPropagation.KeyClassifier classifier = (key, value) -> {
+            transformed.set(value);
+            return true;
         };
 
-    classifier.accept(
-        "key",
-        "input",
-        v -> {
-          callCount.incrementAndGet();
-          return v.toUpperCase();
+        classifier.accept("key", "input", v -> {
+            callCount.incrementAndGet();
+            return v.toUpperCase();
         });
 
-    assertEquals(1, callCount.get());
-    assertEquals("INPUT", transformed.get());
-  }
+        assertEquals(1, callCount.get());
+        assertEquals("INPUT", transformed.get());
+    }
 
-  @Test
-  void existingAcceptStringStringContractUnchanged() {
-    RecordingClassifier classifier = new RecordingClassifier(true);
+    @Test
+    void existingAcceptStringStringContractUnchanged() {
+        RecordingClassifier classifier = new RecordingClassifier(true);
 
-    boolean result = classifier.accept("trace-id", "abc123");
+        boolean result = classifier.accept("trace-id", "abc123");
 
-    assertEquals("trace-id", classifier.lastKey);
-    assertEquals("abc123", classifier.lastValue);
-    assertTrue(result);
-  }
+        assertEquals("trace-id", classifier.lastKey);
+        assertEquals("abc123", classifier.lastValue);
+        assertTrue(result);
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/bootstrap/instrumentation/api/SpanPrototypeTest.java b/internal-api/src/test/java/datadog/trace/bootstrap/instrumentation/api/SpanPrototypeTest.java
index e01ba8e8591..e5a38ae1c3b 100644
--- a/internal-api/src/test/java/datadog/trace/bootstrap/instrumentation/api/SpanPrototypeTest.java
+++ b/internal-api/src/test/java/datadog/trace/bootstrap/instrumentation/api/SpanPrototypeTest.java
@@ -9,172 +9,172 @@
 
 class SpanPrototypeTest {
 
-  @Test
-  void noneHasNoIdentityAndNoTags() {
-    assertNull(SpanPrototype.NONE.instrumentationName());
-    assertNull(SpanPrototype.NONE.operationName());
-    assertNull(SpanPrototype.NONE.spanType());
-    assertNull(SpanPrototype.NONE.integrationName());
-    assertTrue(SpanPrototype.NONE.tags().isEmpty());
-  }
-
-  @Test
-  void gettersReflectBuilderState() {
-    final SpanPrototype proto =
-        SpanPrototype.builder()
-            .initInstrumentationName("instr")
-            .initOperationName("op")
-            .initSpanType("web")
-            .initComponentAndIntegration("netty") // sets integration name + component tag
-            .build();
-
-    assertEquals("instr", proto.instrumentationName());
-    assertEquals("op", proto.operationName());
-    assertEquals("web", proto.spanType());
-    assertEquals("netty", proto.integrationName());
-    assertEquals("netty", proto.tags().getString(Tags.COMPONENT));
-  }
-
-  @Test
-  void initInstrumentationNamesTakesFirstElement() {
-    final SpanPrototype proto =
-        SpanPrototype.builder().initInstrumentationNames(new String[] {"first", "second"}).build();
-
-    assertEquals("first", proto.instrumentationName());
-  }
-
-  @Test
-  void initInstrumentationNamesNullArrayLeavesNameUnset() {
-    final SpanPrototype proto = SpanPrototype.builder().initInstrumentationNames(null).build();
-
-    assertNull(proto.instrumentationName());
-  }
-
-  @Test
-  void initInstrumentationNamesEmptyArrayLeavesNameUnset() {
-    final SpanPrototype proto =
-        SpanPrototype.builder().initInstrumentationNames(new String[0]).build();
-
-    assertNull(proto.instrumentationName());
-  }
-
-  @Test
-  void extendsNullBaseIsNoOp() {
-    final SpanPrototype proto = SpanPrototype.builder().extends_(null).build();
-
-    assertNull(proto.instrumentationName());
-    assertNull(proto.operationName());
-    assertNull(proto.spanType());
-    assertNull(proto.integrationName());
-    assertTrue(proto.tags().isEmpty());
-  }
-
-  @Test
-  void extendsCopiesAllIdentityAndTags() {
-    final SpanPrototype base =
-        SpanPrototype.builder()
-            .initInstrumentationName("base")
-            .initOperationName("base.op")
-            .initSpanType("base-type")
-            .initComponentAndIntegration("base-comp") // integration name + component tag
-            .initKind("server")
-            .build();
-    final SpanPrototype derived = SpanPrototype.builder().extends_(base).build();
-
-    assertEquals("base", derived.instrumentationName());
-    assertEquals("base.op", derived.operationName());
-    assertEquals("base-type", derived.spanType());
-    assertEquals("base-comp", derived.integrationName());
-    assertEquals("base-comp", derived.tags().getString(Tags.COMPONENT));
-    assertEquals("server", derived.tags().getString(Tags.SPAN_KIND));
-  }
-
-  @Test
-  void extendsInheritsBaseIdentityAndTagsThenOverrides() {
-    final SpanPrototype base =
-        SpanPrototype.builder()
-            .initInstrumentationName("base")
-            .initSpanType("base-type")
-            .initKind("server")
-            .build();
-    final SpanPrototype derived =
-        SpanPrototype.builder()
-            .extends_(base)
-            .initComponentOnly("netty")
-            .initSpanType("http")
-            .build();
-
-    assertEquals("base", derived.instrumentationName()); // inherited
-    assertEquals("http", derived.spanType()); // overridden
-    assertEquals("server", derived.tags().getString(Tags.SPAN_KIND)); // inherited tag
-    assertEquals("netty", derived.tags().getString(Tags.COMPONENT)); // added tag
-  }
-
-  @Test
-  void initComponentAndIntegrationSetsBothComponentTagAndIntegrationName() {
-    final SpanPrototype proto =
-        SpanPrototype.builder().initComponentAndIntegration("netty").build();
-
-    assertEquals("netty", proto.tags().getString(Tags.COMPONENT));
-    assertEquals("netty", proto.integrationName());
-  }
-
-  @Test
-  void initComponentAndIntegrationEmptyIsNoOpForBoth() {
-    final SpanPrototype proto = SpanPrototype.builder().initComponentAndIntegration("").build();
-
-    assertNull(proto.tags().getString(Tags.COMPONENT));
-    assertNull(proto.integrationName());
-  }
-
-  @Test
-  void initKindSetsSpanKindTag() {
-    final SpanPrototype proto = SpanPrototype.builder().initKind("client").build();
-
-    assertEquals("client", proto.tags().getString(Tags.SPAN_KIND));
-  }
-
-  @Test
-  void emptyOrNullConstantsAreDroppedNotBaked() {
-    // Match AgentSpan.setTag / the cached-Entry path: a null or empty constant is "no tag", not an
-    // empty tag. A raw tags.set would otherwise bake a tag that per-span stamping never emits.
-    final SpanPrototype proto =
-        SpanPrototype.builder()
-            .initComponentOnly("") // empty -> dropped
-            .initKind("") // empty -> dropped
-            .initTag("empty.cs", "") // empty CharSequence -> dropped
-            .initTag("null.cs", (CharSequence) null) // null -> dropped
-            .initTag("null.obj", (Object) null) // null -> dropped
-            .initTag("kept", "v") // non-empty -> present
-            .build();
-
-    assertNull(proto.tags().getString(Tags.COMPONENT));
-    assertNull(proto.tags().getString(Tags.SPAN_KIND));
-    assertNull(proto.tags().getString("empty.cs"));
-    assertNull(proto.tags().getString("null.cs"));
-    assertNull(proto.tags().getString("null.obj"));
-    assertEquals("v", proto.tags().getString("kept")); // sanity: non-empty still stored
-  }
-
-  @Test
-  void initTagObjectStoresNonEmptyValue() {
-    final SpanPrototype proto = SpanPrototype.builder().initTag("count", (Object) 42).build();
-
-    assertEquals(42, proto.tags().get("count"));
-  }
-
-  @Test
-  void initTagEntryReaderStoresEntry() {
-    final TagMap.EntryReader entry = TagMap.Entry.create("cached", "value");
-    final SpanPrototype proto = SpanPrototype.builder().initTag(entry).build();
-
-    assertEquals("value", proto.tags().getString("cached"));
-  }
-
-  @Test
-  void initTagNullEntryReaderIsNoOp() {
-    final SpanPrototype proto = SpanPrototype.builder().initTag((TagMap.EntryReader) null).build();
-
-    assertTrue(proto.tags().isEmpty());
-  }
+    @Test
+    void noneHasNoIdentityAndNoTags() {
+        assertNull(SpanPrototype.NONE.instrumentationName());
+        assertNull(SpanPrototype.NONE.operationName());
+        assertNull(SpanPrototype.NONE.spanType());
+        assertNull(SpanPrototype.NONE.integrationName());
+        assertTrue(SpanPrototype.NONE.tags().isEmpty());
+    }
+
+    @Test
+    void gettersReflectBuilderState() {
+        final SpanPrototype proto = SpanPrototype.builder()
+                .initInstrumentationName("instr")
+                .initOperationName("op")
+                .initSpanType("web")
+                .initComponentAndIntegration("netty") // sets integration name + component tag
+                .build();
+
+        assertEquals("instr", proto.instrumentationName());
+        assertEquals("op", proto.operationName());
+        assertEquals("web", proto.spanType());
+        assertEquals("netty", proto.integrationName());
+        assertEquals("netty", proto.tags().getString(Tags.COMPONENT));
+    }
+
+    @Test
+    void initInstrumentationNamesTakesFirstElement() {
+        final SpanPrototype proto = SpanPrototype.builder()
+                .initInstrumentationNames(new String[] {"first", "second"})
+                .build();
+
+        assertEquals("first", proto.instrumentationName());
+    }
+
+    @Test
+    void initInstrumentationNamesNullArrayLeavesNameUnset() {
+        final SpanPrototype proto =
+                SpanPrototype.builder().initInstrumentationNames(null).build();
+
+        assertNull(proto.instrumentationName());
+    }
+
+    @Test
+    void initInstrumentationNamesEmptyArrayLeavesNameUnset() {
+        final SpanPrototype proto =
+                SpanPrototype.builder().initInstrumentationNames(new String[0]).build();
+
+        assertNull(proto.instrumentationName());
+    }
+
+    @Test
+    void extendsNullBaseIsNoOp() {
+        final SpanPrototype proto = SpanPrototype.builder().extends_(null).build();
+
+        assertNull(proto.instrumentationName());
+        assertNull(proto.operationName());
+        assertNull(proto.spanType());
+        assertNull(proto.integrationName());
+        assertTrue(proto.tags().isEmpty());
+    }
+
+    @Test
+    void extendsCopiesAllIdentityAndTags() {
+        final SpanPrototype base = SpanPrototype.builder()
+                .initInstrumentationName("base")
+                .initOperationName("base.op")
+                .initSpanType("base-type")
+                .initComponentAndIntegration("base-comp") // integration name + component tag
+                .initKind("server")
+                .build();
+        final SpanPrototype derived = SpanPrototype.builder().extends_(base).build();
+
+        assertEquals("base", derived.instrumentationName());
+        assertEquals("base.op", derived.operationName());
+        assertEquals("base-type", derived.spanType());
+        assertEquals("base-comp", derived.integrationName());
+        assertEquals("base-comp", derived.tags().getString(Tags.COMPONENT));
+        assertEquals("server", derived.tags().getString(Tags.SPAN_KIND));
+    }
+
+    @Test
+    void extendsInheritsBaseIdentityAndTagsThenOverrides() {
+        final SpanPrototype base = SpanPrototype.builder()
+                .initInstrumentationName("base")
+                .initSpanType("base-type")
+                .initKind("server")
+                .build();
+        final SpanPrototype derived = SpanPrototype.builder()
+                .extends_(base)
+                .initComponentOnly("netty")
+                .initSpanType("http")
+                .build();
+
+        assertEquals("base", derived.instrumentationName()); // inherited
+        assertEquals("http", derived.spanType()); // overridden
+        assertEquals("server", derived.tags().getString(Tags.SPAN_KIND)); // inherited tag
+        assertEquals("netty", derived.tags().getString(Tags.COMPONENT)); // added tag
+    }
+
+    @Test
+    void initComponentAndIntegrationSetsBothComponentTagAndIntegrationName() {
+        final SpanPrototype proto =
+                SpanPrototype.builder().initComponentAndIntegration("netty").build();
+
+        assertEquals("netty", proto.tags().getString(Tags.COMPONENT));
+        assertEquals("netty", proto.integrationName());
+    }
+
+    @Test
+    void initComponentAndIntegrationEmptyIsNoOpForBoth() {
+        final SpanPrototype proto =
+                SpanPrototype.builder().initComponentAndIntegration("").build();
+
+        assertNull(proto.tags().getString(Tags.COMPONENT));
+        assertNull(proto.integrationName());
+    }
+
+    @Test
+    void initKindSetsSpanKindTag() {
+        final SpanPrototype proto = SpanPrototype.builder().initKind("client").build();
+
+        assertEquals("client", proto.tags().getString(Tags.SPAN_KIND));
+    }
+
+    @Test
+    void emptyOrNullConstantsAreDroppedNotBaked() {
+        // Match AgentSpan.setTag / the cached-Entry path: a null or empty constant is "no tag", not an
+        // empty tag. A raw tags.set would otherwise bake a tag that per-span stamping never emits.
+        final SpanPrototype proto = SpanPrototype.builder()
+                .initComponentOnly("") // empty -> dropped
+                .initKind("") // empty -> dropped
+                .initTag("empty.cs", "") // empty CharSequence -> dropped
+                .initTag("null.cs", (CharSequence) null) // null -> dropped
+                .initTag("null.obj", (Object) null) // null -> dropped
+                .initTag("kept", "v") // non-empty -> present
+                .build();
+
+        assertNull(proto.tags().getString(Tags.COMPONENT));
+        assertNull(proto.tags().getString(Tags.SPAN_KIND));
+        assertNull(proto.tags().getString("empty.cs"));
+        assertNull(proto.tags().getString("null.cs"));
+        assertNull(proto.tags().getString("null.obj"));
+        assertEquals("v", proto.tags().getString("kept")); // sanity: non-empty still stored
+    }
+
+    @Test
+    void initTagObjectStoresNonEmptyValue() {
+        final SpanPrototype proto =
+                SpanPrototype.builder().initTag("count", (Object) 42).build();
+
+        assertEquals(42, proto.tags().get("count"));
+    }
+
+    @Test
+    void initTagEntryReaderStoresEntry() {
+        final TagMap.EntryReader entry = TagMap.Entry.create("cached", "value");
+        final SpanPrototype proto = SpanPrototype.builder().initTag(entry).build();
+
+        assertEquals("value", proto.tags().getString("cached"));
+    }
+
+    @Test
+    void initTagNullEntryReaderIsNoOp() {
+        final SpanPrototype proto =
+                SpanPrototype.builder().initTag((TagMap.EntryReader) null).build();
+
+        assertTrue(proto.tags().isEmpty());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableD1Test.java b/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableD1Test.java
index 46963236366..b228b61c084 100644
--- a/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableD1Test.java
+++ b/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableD1Test.java
@@ -18,491 +18,451 @@
 
 class ConcurrentHashtableD1Test {
 
-  @Test
-  void getReturnsMappedEntry() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
-    StringEntry e = table.tryGetOrCreateOrNull("hello", k -> new StringEntry(k, 42));
-    assertSame(e, table.get("hello"));
-    assertNull(table.get("world"));
-  }
-
-  @Test
-  void getOrCreateOnMissBuildsEntry() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
-    int[] createCount = {0};
-    StringEntry created =
-        table.tryGetOrCreateOrNull(
-            "a",
-            k -> {
-              createCount[0]++;
-              return new StringEntry(k, 1);
-            });
-    assertNotNull(created);
-    assertEquals(1, table.size());
-    assertEquals(1, createCount[0]);
-    assertSame(created, table.get("a"));
-  }
-
-  @Test
-  void getOrCreateOnHitSkipsCreator() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
-    StringEntry seeded = table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 100));
-    int[] createCount = {0};
-    StringEntry got =
-        table.tryGetOrCreateOrNull(
-            "a",
-            k -> {
-              createCount[0]++;
-              return new StringEntry(k, 999);
-            });
-    assertSame(seeded, got);
-    assertEquals(1, table.size());
-    assertEquals(0, createCount[0]);
-  }
-
-  @Test
-  void nullKeyIsSupported() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
-    StringEntry e = table.tryGetOrCreateOrNull(null, k -> new StringEntry(k, 0));
-    assertNotNull(e);
-    assertSame(e, table.get(null));
-  }
-
-  @Test
-  void forEachVisitsAllEntries() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
-    table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 1));
-    table.tryGetOrCreateOrNull("b", k -> new StringEntry(k, 2));
-    table.tryGetOrCreateOrNull("c", k -> new StringEntry(k, 3));
-    Set<String> seen = new HashSet<>();
-    table.forEach(e -> seen.add(e.key()));
-    assertEquals(3, seen.size());
-    assertTrue(seen.contains("a"));
-    assertTrue(seen.contains("b"));
-    assertTrue(seen.contains("c"));
-  }
-
-  @Test
-  void forEachWithContextPassesContext() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
-    table.tryGetOrCreateOrNull("x", k -> new StringEntry(k, 10));
-    table.tryGetOrCreateOrNull("y", k -> new StringEntry(k, 20));
-    Set<String> seen = new HashSet<>();
-    table.forEach(seen, (ctx, e) -> ctx.add(e.key()));
-    assertEquals(2, seen.size());
-    assertTrue(seen.contains("x"));
-    assertTrue(seen.contains("y"));
-  }
-
-  @Test
-  void concurrentGetOrCreateProducesExactlyOneEntry() throws InterruptedException {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
-    int threads = 16;
-    CountDownLatch ready = new CountDownLatch(threads);
-    CountDownLatch go = new CountDownLatch(1);
-    AtomicInteger createCount = new AtomicInteger();
-
-    Thread[] workers = new Thread[threads];
-    for (int i = 0; i < threads; i++) {
-      workers[i] =
-          new Thread(
-              () -> {
+    @Test
+    void getReturnsMappedEntry() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
+        StringEntry e = table.tryGetOrCreateOrNull("hello", k -> new StringEntry(k, 42));
+        assertSame(e, table.get("hello"));
+        assertNull(table.get("world"));
+    }
+
+    @Test
+    void getOrCreateOnMissBuildsEntry() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
+        int[] createCount = {0};
+        StringEntry created = table.tryGetOrCreateOrNull("a", k -> {
+            createCount[0]++;
+            return new StringEntry(k, 1);
+        });
+        assertNotNull(created);
+        assertEquals(1, table.size());
+        assertEquals(1, createCount[0]);
+        assertSame(created, table.get("a"));
+    }
+
+    @Test
+    void getOrCreateOnHitSkipsCreator() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
+        StringEntry seeded = table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 100));
+        int[] createCount = {0};
+        StringEntry got = table.tryGetOrCreateOrNull("a", k -> {
+            createCount[0]++;
+            return new StringEntry(k, 999);
+        });
+        assertSame(seeded, got);
+        assertEquals(1, table.size());
+        assertEquals(0, createCount[0]);
+    }
+
+    @Test
+    void nullKeyIsSupported() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
+        StringEntry e = table.tryGetOrCreateOrNull(null, k -> new StringEntry(k, 0));
+        assertNotNull(e);
+        assertSame(e, table.get(null));
+    }
+
+    @Test
+    void forEachVisitsAllEntries() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
+        table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 1));
+        table.tryGetOrCreateOrNull("b", k -> new StringEntry(k, 2));
+        table.tryGetOrCreateOrNull("c", k -> new StringEntry(k, 3));
+        Set<String> seen = new HashSet<>();
+        table.forEach(e -> seen.add(e.key()));
+        assertEquals(3, seen.size());
+        assertTrue(seen.contains("a"));
+        assertTrue(seen.contains("b"));
+        assertTrue(seen.contains("c"));
+    }
+
+    @Test
+    void forEachWithContextPassesContext() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
+        table.tryGetOrCreateOrNull("x", k -> new StringEntry(k, 10));
+        table.tryGetOrCreateOrNull("y", k -> new StringEntry(k, 20));
+        Set<String> seen = new HashSet<>();
+        table.forEach(seen, (ctx, e) -> ctx.add(e.key()));
+        assertEquals(2, seen.size());
+        assertTrue(seen.contains("x"));
+        assertTrue(seen.contains("y"));
+    }
+
+    @Test
+    void concurrentGetOrCreateProducesExactlyOneEntry() throws InterruptedException {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
+        int threads = 16;
+        CountDownLatch ready = new CountDownLatch(threads);
+        CountDownLatch go = new CountDownLatch(1);
+        AtomicInteger createCount = new AtomicInteger();
+
+        Thread[] workers = new Thread[threads];
+        for (int i = 0; i < threads; i++) {
+            workers[i] = new Thread(() -> {
                 ready.countDown();
                 try {
-                  go.await();
+                    go.await();
                 } catch (InterruptedException ex) {
-                  Thread.currentThread().interrupt();
-                  return;
+                    Thread.currentThread().interrupt();
+                    return;
                 }
-                table.tryGetOrCreateOrNull(
-                    "shared",
-                    k -> {
-                      createCount.incrementAndGet();
-                      return new StringEntry(k, 1);
-                    });
-              });
-      workers[i].start();
-    }
-    ready.await();
-    go.countDown();
-    for (Thread w : workers) {
-      w.join();
+                table.tryGetOrCreateOrNull("shared", k -> {
+                    createCount.incrementAndGet();
+                    return new StringEntry(k, 1);
+                });
+            });
+            workers[i].start();
+        }
+        ready.await();
+        go.countDown();
+        for (Thread w : workers) {
+            w.join();
+        }
+
+        assertEquals(1, table.size());
+        assertEquals(1, createCount.get());
     }
 
-    assertEquals(1, table.size());
-    assertEquals(1, createCount.get());
-  }
-
-  @Test
-  void chainedEntriesInSameBucketAreAllReachable() {
-    // All three keys share hash 0, so they land in the same bucket regardless of table size.
-    ConcurrentHashtable.D1<CollidingKey, CollidingEntry> table =
-        ConcurrentHashtable.D1.createBounded(CollidingEntry.class, 8);
-    CollidingKey a = new CollidingKey("a", 0);
-    CollidingKey b = new CollidingKey("b", 0); // same bucket as a
-    CollidingKey c = new CollidingKey("c", 0); // same bucket
-    CollidingEntry ea = table.tryGetOrCreateOrNull(a, CollidingEntry::new);
-    CollidingEntry eb = table.tryGetOrCreateOrNull(b, CollidingEntry::new);
-    CollidingEntry ec = table.tryGetOrCreateOrNull(c, CollidingEntry::new);
-    assertEquals(3, table.size());
-    assertSame(ea, table.get(a));
-    assertSame(eb, table.get(b));
-    assertSame(ec, table.get(c));
-    assertNull(table.get(new CollidingKey("d", 0))); // same bucket, different label → miss
-  }
-
-  @Test
-  void concurrentDistinctKeyInsertionsAreAllRetained() throws InterruptedException {
-    int threads = 16;
-    String[] keys = new String[threads];
-    for (int i = 0; i < threads; i++) {
-      keys[i] = "key-" + i;
+    @Test
+    void chainedEntriesInSameBucketAreAllReachable() {
+        // All three keys share hash 0, so they land in the same bucket regardless of table size.
+        ConcurrentHashtable.D1<CollidingKey, CollidingEntry> table =
+                ConcurrentHashtable.D1.createBounded(CollidingEntry.class, 8);
+        CollidingKey a = new CollidingKey("a", 0);
+        CollidingKey b = new CollidingKey("b", 0); // same bucket as a
+        CollidingKey c = new CollidingKey("c", 0); // same bucket
+        CollidingEntry ea = table.tryGetOrCreateOrNull(a, CollidingEntry::new);
+        CollidingEntry eb = table.tryGetOrCreateOrNull(b, CollidingEntry::new);
+        CollidingEntry ec = table.tryGetOrCreateOrNull(c, CollidingEntry::new);
+        assertEquals(3, table.size());
+        assertSame(ea, table.get(a));
+        assertSame(eb, table.get(b));
+        assertSame(ec, table.get(c));
+        assertNull(table.get(new CollidingKey("d", 0))); // same bucket, different label → miss
     }
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, threads * 2);
-    CountDownLatch ready = new CountDownLatch(threads);
-    CountDownLatch go = new CountDownLatch(1);
-
-    Thread[] workers = new Thread[threads];
-    for (int i = 0; i < threads; i++) {
-      final String key = keys[i];
-      workers[i] =
-          new Thread(
-              () -> {
+
+    @Test
+    void concurrentDistinctKeyInsertionsAreAllRetained() throws InterruptedException {
+        int threads = 16;
+        String[] keys = new String[threads];
+        for (int i = 0; i < threads; i++) {
+            keys[i] = "key-" + i;
+        }
+        ConcurrentHashtable.D1<String, StringEntry> table =
+                ConcurrentHashtable.D1.createBounded(StringEntry.class, threads * 2);
+        CountDownLatch ready = new CountDownLatch(threads);
+        CountDownLatch go = new CountDownLatch(1);
+
+        Thread[] workers = new Thread[threads];
+        for (int i = 0; i < threads; i++) {
+            final String key = keys[i];
+            workers[i] = new Thread(() -> {
                 ready.countDown();
                 try {
-                  go.await();
+                    go.await();
                 } catch (InterruptedException ex) {
-                  Thread.currentThread().interrupt();
-                  return;
+                    Thread.currentThread().interrupt();
+                    return;
                 }
                 table.tryGetOrCreateOrNull(key, k -> new StringEntry(k, 1));
-              });
-      workers[i].start();
+            });
+            workers[i].start();
+        }
+        ready.await();
+        go.countDown();
+        for (Thread w : workers) {
+            w.join();
+        }
+
+        assertEquals(threads, table.size());
+        for (String key : keys) {
+            assertNotNull(table.get(key));
+        }
+    }
+
+    @Test
+    void removeReturnsEntryAndShrinks() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
+        StringEntry a = table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 1));
+        table.tryGetOrCreateOrNull("b", k -> new StringEntry(k, 2));
+        assertSame(a, table.remove("a"));
+        assertEquals(1, table.size());
+        assertNull(table.get("a"));
+        assertNotNull(table.get("b"));
+    }
+
+    @Test
+    void removeAbsentKeyReturnsNull() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
+        table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 1));
+        assertNull(table.remove("missing"));
+        assertEquals(1, table.size());
     }
-    ready.await();
-    go.countDown();
-    for (Thread w : workers) {
-      w.join();
+
+    @Test
+    void removeHeadMiddleAndTailOfSameBucketChain() {
+        // All three keys share hash 0, so a, b, c land in the same bucket and form one chain.
+        ConcurrentHashtable.D1<CollidingKey, CollidingEntry> table =
+                ConcurrentHashtable.D1.createBounded(CollidingEntry.class, 8);
+        CollidingKey a = new CollidingKey("a", 0);
+        CollidingKey b = new CollidingKey("b", 0);
+        CollidingKey c = new CollidingKey("c", 0);
+        table.tryGetOrCreateOrNull(a, CollidingEntry::new);
+        table.tryGetOrCreateOrNull(b, CollidingEntry::new);
+        table.tryGetOrCreateOrNull(c, CollidingEntry::new);
+
+        // Remove a middle element; the other two stay reachable.
+        assertNotNull(table.remove(b));
+        assertNull(table.get(b));
+        assertNotNull(table.get(a));
+        assertNotNull(table.get(c));
+        assertEquals(2, table.size());
+
+        // Drain the rest.
+        assertNotNull(table.remove(c));
+        assertNotNull(table.remove(a));
+        assertEquals(0, table.size());
+        assertNull(table.get(a));
     }
 
-    assertEquals(threads, table.size());
-    for (String key : keys) {
-      assertNotNull(table.get(key));
+    @Test
+    void removeIfRemovesMatchingEntries() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 16);
+        for (int i = 0; i < 10; i++) {
+            final int v = i;
+            table.tryGetOrCreateOrNull("k" + i, k -> new StringEntry(k, v));
+        }
+        boolean removed = table.removeIf(e -> e.value % 2 == 0); // removes values 0,2,4,6,8
+        assertTrue(removed);
+        assertEquals(5, table.size());
+        Set<String> seen = new HashSet<>();
+        table.forEach(e -> seen.add(e.key()));
+        assertEquals(5, seen.size());
+        for (String key : seen) {
+            assertNotNull(table.get(key));
+        }
     }
-  }
-
-  @Test
-  void removeReturnsEntryAndShrinks() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
-    StringEntry a = table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 1));
-    table.tryGetOrCreateOrNull("b", k -> new StringEntry(k, 2));
-    assertSame(a, table.remove("a"));
-    assertEquals(1, table.size());
-    assertNull(table.get("a"));
-    assertNotNull(table.get("b"));
-  }
-
-  @Test
-  void removeAbsentKeyReturnsNull() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
-    table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 1));
-    assertNull(table.remove("missing"));
-    assertEquals(1, table.size());
-  }
-
-  @Test
-  void removeHeadMiddleAndTailOfSameBucketChain() {
-    // All three keys share hash 0, so a, b, c land in the same bucket and form one chain.
-    ConcurrentHashtable.D1<CollidingKey, CollidingEntry> table =
-        ConcurrentHashtable.D1.createBounded(CollidingEntry.class, 8);
-    CollidingKey a = new CollidingKey("a", 0);
-    CollidingKey b = new CollidingKey("b", 0);
-    CollidingKey c = new CollidingKey("c", 0);
-    table.tryGetOrCreateOrNull(a, CollidingEntry::new);
-    table.tryGetOrCreateOrNull(b, CollidingEntry::new);
-    table.tryGetOrCreateOrNull(c, CollidingEntry::new);
-
-    // Remove a middle element; the other two stay reachable.
-    assertNotNull(table.remove(b));
-    assertNull(table.get(b));
-    assertNotNull(table.get(a));
-    assertNotNull(table.get(c));
-    assertEquals(2, table.size());
-
-    // Drain the rest.
-    assertNotNull(table.remove(c));
-    assertNotNull(table.remove(a));
-    assertEquals(0, table.size());
-    assertNull(table.get(a));
-  }
-
-  @Test
-  void removeIfRemovesMatchingEntries() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 16);
-    for (int i = 0; i < 10; i++) {
-      final int v = i;
-      table.tryGetOrCreateOrNull("k" + i, k -> new StringEntry(k, v));
+
+    @Test
+    void removeIfReturnsFalseWhenNothingMatches() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
+        table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 1));
+        assertFalse(table.removeIf(e -> false));
+        assertEquals(1, table.size());
     }
-    boolean removed = table.removeIf(e -> e.value % 2 == 0); // removes values 0,2,4,6,8
-    assertTrue(removed);
-    assertEquals(5, table.size());
-    Set<String> seen = new HashSet<>();
-    table.forEach(e -> seen.add(e.key()));
-    assertEquals(5, seen.size());
-    for (String key : seen) {
-      assertNotNull(table.get(key));
+
+    @Test
+    void clearEmptiesTableAndLeavesItUsable() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
+        table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 1));
+        table.tryGetOrCreateOrNull("b", k -> new StringEntry(k, 2));
+        table.clear();
+        assertEquals(0, table.size());
+        assertNull(table.get("a"));
+        assertNull(table.get("b"));
+        StringEntry c = table.tryGetOrCreateOrNull("c", k -> new StringEntry(k, 3));
+        assertSame(c, table.get("c"));
+        assertEquals(1, table.size());
     }
-  }
-
-  @Test
-  void removeIfReturnsFalseWhenNothingMatches() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
-    table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 1));
-    assertFalse(table.removeIf(e -> false));
-    assertEquals(1, table.size());
-  }
-
-  @Test
-  void clearEmptiesTableAndLeavesItUsable() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
-    table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 1));
-    table.tryGetOrCreateOrNull("b", k -> new StringEntry(k, 2));
-    table.clear();
-    assertEquals(0, table.size());
-    assertNull(table.get("a"));
-    assertNull(table.get("b"));
-    StringEntry c = table.tryGetOrCreateOrNull("c", k -> new StringEntry(k, 3));
-    assertSame(c, table.get("c"));
-    assertEquals(1, table.size());
-  }
-
-  @Test
-  void drainRemovesEveryEntryAndFeedsSink() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
-    table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 1));
-    table.tryGetOrCreateOrNull("b", k -> new StringEntry(k, 2));
-    table.tryGetOrCreateOrNull("c", k -> new StringEntry(k, 3));
-
-    Set<String> drained = new HashSet<>();
-    int[] sum = {0};
-    table.drain(
-        e -> {
-          drained.add(e.key());
-          sum[0] += e.value;
+
+    @Test
+    void drainRemovesEveryEntryAndFeedsSink() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
+        table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 1));
+        table.tryGetOrCreateOrNull("b", k -> new StringEntry(k, 2));
+        table.tryGetOrCreateOrNull("c", k -> new StringEntry(k, 3));
+
+        Set<String> drained = new HashSet<>();
+        int[] sum = {0};
+        table.drain(e -> {
+            drained.add(e.key());
+            sum[0] += e.value;
         });
 
-    assertEquals(new HashSet<>(Arrays.asList("a", "b", "c")), drained);
-    assertEquals(6, sum[0]);
-    assertEquals(0, table.size());
-    assertNull(table.get("a"));
-    // table remains usable after drain
-    StringEntry d = table.tryGetOrCreateOrNull("d", k -> new StringEntry(k, 4));
-    assertSame(d, table.get("d"));
-    assertEquals(1, table.size());
-  }
-
-  @Test
-  void drainWithContextFeedsSink() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
-    table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 1));
-    table.tryGetOrCreateOrNull("b", k -> new StringEntry(k, 2));
-
-    Set<String> drained = new HashSet<>();
-    table.drain(drained, (ctx, e) -> ctx.add(e.key()));
-
-    assertEquals(new HashSet<>(Arrays.asList("a", "b")), drained);
-    assertEquals(0, table.size());
-  }
-
-  @Test
-  void drainOnEmptyTableInvokesSinkZeroTimes() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
-    int[] count = {0};
-    table.drain(e -> count[0]++);
-    assertEquals(0, count[0]);
-    assertEquals(0, table.size());
-  }
-
-  /**
-   * Exercises the volatile-{@code next} removal contract: while one key is repeatedly removed and
-   * re-added in a shared collision chain, the other keys in that chain must remain continuously
-   * visible to a concurrent lock-free reader.
-   */
-  @Test
-  void concurrentReadsStaySafeWhileOneChainMemberChurns() throws InterruptedException {
-    // All keys share hash 0, putting every key in one bucket so removal splices a chain the
-    // reader is walking.
-    ConcurrentHashtable.D1<CollidingKey, CollidingEntry> table =
-        ConcurrentHashtable.D1.createBounded(CollidingEntry.class, 16);
-    int n = 8;
-    CollidingKey[] keys = new CollidingKey[n];
-    for (int i = 0; i < n; i++) {
-      keys[i] = new CollidingKey("k" + i, 0);
-      table.tryGetOrCreateOrNull(keys[i], CollidingEntry::new);
+        assertEquals(new HashSet<>(Arrays.asList("a", "b", "c")), drained);
+        assertEquals(6, sum[0]);
+        assertEquals(0, table.size());
+        assertNull(table.get("a"));
+        // table remains usable after drain
+        StringEntry d = table.tryGetOrCreateOrNull("d", k -> new StringEntry(k, 4));
+        assertSame(d, table.get("d"));
+        assertEquals(1, table.size());
+    }
+
+    @Test
+    void drainWithContextFeedsSink() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
+        table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 1));
+        table.tryGetOrCreateOrNull("b", k -> new StringEntry(k, 2));
+
+        Set<String> drained = new HashSet<>();
+        table.drain(drained, (ctx, e) -> ctx.add(e.key()));
+
+        assertEquals(new HashSet<>(Arrays.asList("a", "b")), drained);
+        assertEquals(0, table.size());
     }
-    CollidingKey churn = keys[0]; // keys[1..] are stable and must never vanish
-
-    AtomicBoolean stop = new AtomicBoolean(false);
-    AtomicInteger missed = new AtomicInteger();
-    Thread reader =
-        new Thread(
-            () -> {
-              while (!stop.get()) {
+
+    @Test
+    void drainOnEmptyTableInvokesSinkZeroTimes() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
+        int[] count = {0};
+        table.drain(e -> count[0]++);
+        assertEquals(0, count[0]);
+        assertEquals(0, table.size());
+    }
+
+    /**
+     * Exercises the volatile-{@code next} removal contract: while one key is repeatedly removed and
+     * re-added in a shared collision chain, the other keys in that chain must remain continuously
+     * visible to a concurrent lock-free reader.
+     */
+    @Test
+    void concurrentReadsStaySafeWhileOneChainMemberChurns() throws InterruptedException {
+        // All keys share hash 0, putting every key in one bucket so removal splices a chain the
+        // reader is walking.
+        ConcurrentHashtable.D1<CollidingKey, CollidingEntry> table =
+                ConcurrentHashtable.D1.createBounded(CollidingEntry.class, 16);
+        int n = 8;
+        CollidingKey[] keys = new CollidingKey[n];
+        for (int i = 0; i < n; i++) {
+            keys[i] = new CollidingKey("k" + i, 0);
+            table.tryGetOrCreateOrNull(keys[i], CollidingEntry::new);
+        }
+        CollidingKey churn = keys[0]; // keys[1..] are stable and must never vanish
+
+        AtomicBoolean stop = new AtomicBoolean(false);
+        AtomicInteger missed = new AtomicInteger();
+        Thread reader = new Thread(() -> {
+            while (!stop.get()) {
                 for (int i = 1; i < n; i++) {
-                  if (table.get(keys[i]) == null) {
-                    missed.incrementAndGet();
-                  }
+                    if (table.get(keys[i]) == null) {
+                        missed.incrementAndGet();
+                    }
                 }
-              }
-            });
-    reader.start();
-    for (int r = 0; r < 100_000; r++) {
-      table.remove(churn);
-      table.tryGetOrCreateOrNull(churn, CollidingEntry::new);
+            }
+        });
+        reader.start();
+        for (int r = 0; r < 100_000; r++) {
+            table.remove(churn);
+            table.tryGetOrCreateOrNull(churn, CollidingEntry::new);
+        }
+        stop.set(true);
+        reader.join();
+
+        assertEquals(0, missed.get(), "stable chain members must never be unreachable during removal");
     }
-    stop.set(true);
-    reader.join();
-
-    assertEquals(0, missed.get(), "stable chain members must never be unreachable during removal");
-  }
-
-  @Test
-  void tryGetOrCreateOrEvictInsertsWithoutEvictingWhenUnderCapacity() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
-    Maybe<StringEntry> created =
-        table.tryGetOrCreateOrEvict("a", k -> new StringEntry(k, 1), e -> true);
-    assertTrue(created.isPresent());
-    assertEquals(1, table.size());
-    assertSame(created.getOrNull(), table.get("a"));
-  }
-
-  @Test
-  void tryGetOrCreateOrEvictReturnsExistingEntryOnHitWithoutEvicting() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 1);
-    StringEntry a = table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 1));
-    Maybe<StringEntry> got =
-        table.tryGetOrCreateOrEvict(
-            "a",
-            k -> {
-              throw new AssertionError("creator must not run on a hit");
-            },
-            e -> {
-              throw new AssertionError("evictable must not run on a hit");
-            });
-    assertSame(a, got.getOrNull());
-    assertEquals(1, table.size());
-  }
-
-  @Test
-  void tryGetOrCreateOrEvictEvictsWhenFullAndInsertsNewEntry() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 1);
-    table.tryGetOrCreateOrNull("old", k -> new StringEntry(k, 1));
-    assertTrue(table.isFull());
-
-    Maybe<StringEntry> created =
-        table.tryGetOrCreateOrEvict("new", k -> new StringEntry(k, 2), e -> true);
-    assertTrue(created.isPresent());
-    assertEquals("new", created.getOrNull().key());
-    assertEquals(1, table.size());
-    assertNull(table.get("old"));
-    assertSame(created.getOrNull(), table.get("new"));
-  }
-
-  @Test
-  void tryGetOrCreateOrEvictOrNullRefusesWhenFullAndNothingEvictable() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 1);
-    table.tryGetOrCreateOrNull("old", k -> new StringEntry(k, 1));
-
-    StringEntry result =
-        table.tryGetOrCreateOrEvictOrNull("new", k -> new StringEntry(k, 2), e -> false);
-    assertNull(result);
-    assertEquals(1, table.size());
-    assertNotNull(table.get("old"));
-    assertNull(table.get("new"));
-  }
-
-  @Test
-  void tryGetOrCreateOrEvictOrNullEvictionRunsBeforeThrowingCreator() {
-    ConcurrentHashtable.D1<String, StringEntry> table =
-        ConcurrentHashtable.D1.createBounded(StringEntry.class, 1);
-    table.tryGetOrCreateOrNull("old", k -> new StringEntry(k, 1));
-
-    assertThrows(
-        RuntimeException.class,
-        () ->
-            table.tryGetOrCreateOrEvictOrNull(
-                "new",
+
+    @Test
+    void tryGetOrCreateOrEvictInsertsWithoutEvictingWhenUnderCapacity() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 8);
+        Maybe<StringEntry> created = table.tryGetOrCreateOrEvict("a", k -> new StringEntry(k, 1), e -> true);
+        assertTrue(created.isPresent());
+        assertEquals(1, table.size());
+        assertSame(created.getOrNull(), table.get("a"));
+    }
+
+    @Test
+    void tryGetOrCreateOrEvictReturnsExistingEntryOnHitWithoutEvicting() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 1);
+        StringEntry a = table.tryGetOrCreateOrNull("a", k -> new StringEntry(k, 1));
+        Maybe<StringEntry> got = table.tryGetOrCreateOrEvict(
+                "a",
                 k -> {
-                  throw new RuntimeException("boom");
+                    throw new AssertionError("creator must not run on a hit");
                 },
-                e -> true));
-
-    // Eviction already happened before the creator threw: the table is left one entry smaller,
-    // not corrupted or double-booked.
-    assertEquals(0, table.size());
-    assertNull(table.get("old"));
-    assertNull(table.get("new"));
-  }
-
-  /** Entry holding a key plus one mutable {@code int} payload. */
-  private static final class StringEntry extends ConcurrentHashtable.D1.Entry<String> {
-    volatile int value;
-
-    StringEntry(String key, int value) {
-      super(key);
-      this.value = value;
+                e -> {
+                    throw new AssertionError("evictable must not run on a hit");
+                });
+        assertSame(a, got.getOrNull());
+        assertEquals(1, table.size());
+    }
+
+    @Test
+    void tryGetOrCreateOrEvictEvictsWhenFullAndInsertsNewEntry() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 1);
+        table.tryGetOrCreateOrNull("old", k -> new StringEntry(k, 1));
+        assertTrue(table.isFull());
+
+        Maybe<StringEntry> created = table.tryGetOrCreateOrEvict("new", k -> new StringEntry(k, 2), e -> true);
+        assertTrue(created.isPresent());
+        assertEquals("new", created.getOrNull().key());
+        assertEquals(1, table.size());
+        assertNull(table.get("old"));
+        assertSame(created.getOrNull(), table.get("new"));
+    }
+
+    @Test
+    void tryGetOrCreateOrEvictOrNullRefusesWhenFullAndNothingEvictable() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 1);
+        table.tryGetOrCreateOrNull("old", k -> new StringEntry(k, 1));
+
+        StringEntry result = table.tryGetOrCreateOrEvictOrNull("new", k -> new StringEntry(k, 2), e -> false);
+        assertNull(result);
+        assertEquals(1, table.size());
+        assertNotNull(table.get("old"));
+        assertNull(table.get("new"));
     }
-  }
 
-  /** Entry with no payload, used for the bucket-chain/collision tests. */
-  private static final class CollidingEntry extends ConcurrentHashtable.D1.Entry<CollidingKey> {
-    CollidingEntry(CollidingKey key) {
-      super(key);
+    @Test
+    void tryGetOrCreateOrEvictOrNullEvictionRunsBeforeThrowingCreator() {
+        ConcurrentHashtable.D1<String, StringEntry> table = ConcurrentHashtable.D1.createBounded(StringEntry.class, 1);
+        table.tryGetOrCreateOrNull("old", k -> new StringEntry(k, 1));
+
+        assertThrows(
+                RuntimeException.class,
+                () -> table.tryGetOrCreateOrEvictOrNull(
+                        "new",
+                        k -> {
+                            throw new RuntimeException("boom");
+                        },
+                        e -> true));
+
+        // Eviction already happened before the creator threw: the table is left one entry smaller,
+        // not corrupted or double-booked.
+        assertEquals(0, table.size());
+        assertNull(table.get("old"));
+        assertNull(table.get("new"));
     }
-  }
 
-  /** Key with a fixed hashCode to force deterministic bucket placement. */
-  private static final class CollidingKey {
-    final String label;
-    final int fixedHash;
+    /** Entry holding a key plus one mutable {@code int} payload. */
+    private static final class StringEntry extends ConcurrentHashtable.D1.Entry<String> {
+        volatile int value;
 
-    CollidingKey(String label, int fixedHash) {
-      this.label = label;
-      this.fixedHash = fixedHash;
+        StringEntry(String key, int value) {
+            super(key);
+            this.value = value;
+        }
     }
 
-    @Override
-    public int hashCode() {
-      return fixedHash;
+    /** Entry with no payload, used for the bucket-chain/collision tests. */
+    private static final class CollidingEntry extends ConcurrentHashtable.D1.Entry<CollidingKey> {
+        CollidingEntry(CollidingKey key) {
+            super(key);
+        }
     }
 
-    @Override
-    public boolean equals(Object o) {
-      if (!(o instanceof CollidingKey)) {
-        return false;
-      }
-      CollidingKey that = (CollidingKey) o;
-      return fixedHash == that.fixedHash && label.equals(that.label);
+    /** Key with a fixed hashCode to force deterministic bucket placement. */
+    private static final class CollidingKey {
+        final String label;
+        final int fixedHash;
+
+        CollidingKey(String label, int fixedHash) {
+            this.label = label;
+            this.fixedHash = fixedHash;
+        }
+
+        @Override
+        public int hashCode() {
+            return fixedHash;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof CollidingKey)) {
+                return false;
+            }
+            CollidingKey that = (CollidingKey) o;
+            return fixedHash == that.fixedHash && label.equals(that.label);
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableD2Test.java b/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableD2Test.java
index e2b3f8dd353..adbfdcdc279 100644
--- a/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableD2Test.java
+++ b/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableD2Test.java
@@ -17,384 +17,367 @@
 
 class ConcurrentHashtableD2Test {
 
-  @Test
-  void pairKeysParticipateInIdentity() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
-    PairEntry ab = table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
-    PairEntry ac = table.tryGetOrCreateOrNull("a", 2, PairEntry::new);
-    PairEntry bb = table.tryGetOrCreateOrNull("b", 1, PairEntry::new);
-    assertEquals(3, table.size());
-    assertSame(ab, table.get("a", 1));
-    assertSame(ac, table.get("a", 2));
-    assertSame(bb, table.get("b", 1));
-    assertNull(table.get("a", 3));
-  }
-
-  @Test
-  void getOrCreateOnMissBuildsEntryViaCreator() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
-    int[] createCount = {0};
-    PairEntry created =
-        table.tryGetOrCreateOrNull(
-            "a",
-            1,
-            (k1, k2) -> {
-              createCount[0]++;
-              return new PairEntry(k1, k2);
-            });
-    assertNotNull(created);
-    assertEquals("a", created.key1());
-    assertEquals(Integer.valueOf(1), created.key2());
-    assertEquals(1, table.size());
-    assertEquals(1, createCount[0]);
-    assertSame(created, table.get("a", 1));
-  }
-
-  @Test
-  void getOrCreateOnHitSkipsCreator() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
-    PairEntry seeded = table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
-    int[] createCount = {0};
-    PairEntry got =
-        table.tryGetOrCreateOrNull(
-            "a",
-            1,
-            (k1, k2) -> {
-              createCount[0]++;
-              return new PairEntry(k1, k2);
-            });
-    assertSame(seeded, got);
-    assertEquals(1, table.size());
-    assertEquals(0, createCount[0]);
-  }
-
-  @Test
-  void forEachVisitsBothPairs() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
-    table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
-    table.tryGetOrCreateOrNull("b", 2, PairEntry::new);
-    Set<String> seen = new HashSet<>();
-    table.forEach(e -> seen.add(e.key1() + ":" + e.key2()));
-    assertEquals(2, seen.size());
-    assertTrue(seen.contains("a:1"));
-    assertTrue(seen.contains("b:2"));
-  }
-
-  @Test
-  void forEachWithContextPassesContextToConsumer() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
-    table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
-    table.tryGetOrCreateOrNull("b", 2, PairEntry::new);
-    Set<String> seen = new HashSet<>();
-    table.forEach(seen, (ctx, e) -> ctx.add(e.key1() + ":" + e.key2()));
-    assertEquals(2, seen.size());
-    assertTrue(seen.contains("a:1"));
-    assertTrue(seen.contains("b:2"));
-  }
-
-  @Test
-  void concurrentGetOrCreateProducesExactlyOneEntry() throws InterruptedException {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
-    int threads = 16;
-    CountDownLatch ready = new CountDownLatch(threads);
-    CountDownLatch go = new CountDownLatch(1);
-    AtomicInteger createCount = new AtomicInteger();
-
-    Thread[] workers = new Thread[threads];
-    for (int i = 0; i < threads; i++) {
-      workers[i] =
-          new Thread(
-              () -> {
+    @Test
+    void pairKeysParticipateInIdentity() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
+        PairEntry ab = table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
+        PairEntry ac = table.tryGetOrCreateOrNull("a", 2, PairEntry::new);
+        PairEntry bb = table.tryGetOrCreateOrNull("b", 1, PairEntry::new);
+        assertEquals(3, table.size());
+        assertSame(ab, table.get("a", 1));
+        assertSame(ac, table.get("a", 2));
+        assertSame(bb, table.get("b", 1));
+        assertNull(table.get("a", 3));
+    }
+
+    @Test
+    void getOrCreateOnMissBuildsEntryViaCreator() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
+        int[] createCount = {0};
+        PairEntry created = table.tryGetOrCreateOrNull("a", 1, (k1, k2) -> {
+            createCount[0]++;
+            return new PairEntry(k1, k2);
+        });
+        assertNotNull(created);
+        assertEquals("a", created.key1());
+        assertEquals(Integer.valueOf(1), created.key2());
+        assertEquals(1, table.size());
+        assertEquals(1, createCount[0]);
+        assertSame(created, table.get("a", 1));
+    }
+
+    @Test
+    void getOrCreateOnHitSkipsCreator() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
+        PairEntry seeded = table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
+        int[] createCount = {0};
+        PairEntry got = table.tryGetOrCreateOrNull("a", 1, (k1, k2) -> {
+            createCount[0]++;
+            return new PairEntry(k1, k2);
+        });
+        assertSame(seeded, got);
+        assertEquals(1, table.size());
+        assertEquals(0, createCount[0]);
+    }
+
+    @Test
+    void forEachVisitsBothPairs() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
+        table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
+        table.tryGetOrCreateOrNull("b", 2, PairEntry::new);
+        Set<String> seen = new HashSet<>();
+        table.forEach(e -> seen.add(e.key1() + ":" + e.key2()));
+        assertEquals(2, seen.size());
+        assertTrue(seen.contains("a:1"));
+        assertTrue(seen.contains("b:2"));
+    }
+
+    @Test
+    void forEachWithContextPassesContextToConsumer() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
+        table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
+        table.tryGetOrCreateOrNull("b", 2, PairEntry::new);
+        Set<String> seen = new HashSet<>();
+        table.forEach(seen, (ctx, e) -> ctx.add(e.key1() + ":" + e.key2()));
+        assertEquals(2, seen.size());
+        assertTrue(seen.contains("a:1"));
+        assertTrue(seen.contains("b:2"));
+    }
+
+    @Test
+    void concurrentGetOrCreateProducesExactlyOneEntry() throws InterruptedException {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
+        int threads = 16;
+        CountDownLatch ready = new CountDownLatch(threads);
+        CountDownLatch go = new CountDownLatch(1);
+        AtomicInteger createCount = new AtomicInteger();
+
+        Thread[] workers = new Thread[threads];
+        for (int i = 0; i < threads; i++) {
+            workers[i] = new Thread(() -> {
                 ready.countDown();
                 try {
-                  go.await();
+                    go.await();
                 } catch (InterruptedException ex) {
-                  Thread.currentThread().interrupt();
-                  return;
+                    Thread.currentThread().interrupt();
+                    return;
                 }
-                table.tryGetOrCreateOrNull(
-                    "shared",
-                    42,
-                    (k1, k2) -> {
-                      createCount.incrementAndGet();
-                      return new PairEntry(k1, k2);
-                    });
-              });
-      workers[i].start();
-    }
-    ready.await();
-    go.countDown();
-    for (Thread w : workers) {
-      w.join();
+                table.tryGetOrCreateOrNull("shared", 42, (k1, k2) -> {
+                    createCount.incrementAndGet();
+                    return new PairEntry(k1, k2);
+                });
+            });
+            workers[i].start();
+        }
+        ready.await();
+        go.countDown();
+        for (Thread w : workers) {
+            w.join();
+        }
+
+        assertEquals(1, table.size());
+        assertEquals(1, createCount.get());
     }
 
-    assertEquals(1, table.size());
-    assertEquals(1, createCount.get());
-  }
-
-  @Test
-  void chainedEntriesInSameBucketAreAllReachable() {
-    // key2 = -31 * key1.hashCode() zeroes the combined hash, so all four land in bucket 0
-    // regardless of table size.
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
-    PairEntry e1 = table.tryGetOrCreateOrNull("a", -31 * "a".hashCode(), PairEntry::new);
-    PairEntry e2 = table.tryGetOrCreateOrNull("b", -31 * "b".hashCode(), PairEntry::new);
-    PairEntry e3 = table.tryGetOrCreateOrNull("c", -31 * "c".hashCode(), PairEntry::new);
-    PairEntry e4 = table.tryGetOrCreateOrNull("d", -31 * "d".hashCode(), PairEntry::new);
-    assertEquals(4, table.size());
-    assertSame(e1, table.get("a", -31 * "a".hashCode()));
-    assertSame(e2, table.get("b", -31 * "b".hashCode()));
-    assertSame(e3, table.get("c", -31 * "c".hashCode()));
-    assertSame(e4, table.get("d", -31 * "d".hashCode()));
-    assertNull(table.get("a", 3));
-  }
-
-  @Test
-  void concurrentDistinctKeyInsertionsAreAllRetained() throws InterruptedException {
-    int threads = 16;
-    String[] k1s = new String[threads];
-    Integer[] k2s = new Integer[threads];
-    for (int i = 0; i < threads; i++) {
-      k1s[i] = "key-" + i;
-      k2s[i] = i;
+    @Test
+    void chainedEntriesInSameBucketAreAllReachable() {
+        // key2 = -31 * key1.hashCode() zeroes the combined hash, so all four land in bucket 0
+        // regardless of table size.
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
+        PairEntry e1 = table.tryGetOrCreateOrNull("a", -31 * "a".hashCode(), PairEntry::new);
+        PairEntry e2 = table.tryGetOrCreateOrNull("b", -31 * "b".hashCode(), PairEntry::new);
+        PairEntry e3 = table.tryGetOrCreateOrNull("c", -31 * "c".hashCode(), PairEntry::new);
+        PairEntry e4 = table.tryGetOrCreateOrNull("d", -31 * "d".hashCode(), PairEntry::new);
+        assertEquals(4, table.size());
+        assertSame(e1, table.get("a", -31 * "a".hashCode()));
+        assertSame(e2, table.get("b", -31 * "b".hashCode()));
+        assertSame(e3, table.get("c", -31 * "c".hashCode()));
+        assertSame(e4, table.get("d", -31 * "d".hashCode()));
+        assertNull(table.get("a", 3));
     }
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, threads * 2);
-    CountDownLatch ready = new CountDownLatch(threads);
-    CountDownLatch go = new CountDownLatch(1);
-
-    Thread[] workers = new Thread[threads];
-    for (int i = 0; i < threads; i++) {
-      final String k1 = k1s[i];
-      final Integer k2 = k2s[i];
-      workers[i] =
-          new Thread(
-              () -> {
+
+    @Test
+    void concurrentDistinctKeyInsertionsAreAllRetained() throws InterruptedException {
+        int threads = 16;
+        String[] k1s = new String[threads];
+        Integer[] k2s = new Integer[threads];
+        for (int i = 0; i < threads; i++) {
+            k1s[i] = "key-" + i;
+            k2s[i] = i;
+        }
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, threads * 2);
+        CountDownLatch ready = new CountDownLatch(threads);
+        CountDownLatch go = new CountDownLatch(1);
+
+        Thread[] workers = new Thread[threads];
+        for (int i = 0; i < threads; i++) {
+            final String k1 = k1s[i];
+            final Integer k2 = k2s[i];
+            workers[i] = new Thread(() -> {
                 ready.countDown();
                 try {
-                  go.await();
+                    go.await();
                 } catch (InterruptedException ex) {
-                  Thread.currentThread().interrupt();
-                  return;
+                    Thread.currentThread().interrupt();
+                    return;
                 }
                 table.tryGetOrCreateOrNull(k1, k2, PairEntry::new);
-              });
-      workers[i].start();
+            });
+            workers[i].start();
+        }
+        ready.await();
+        go.countDown();
+        for (Thread w : workers) {
+            w.join();
+        }
+
+        assertEquals(threads, table.size());
+        for (int i = 0; i < threads; i++) {
+            assertNotNull(table.get(k1s[i], k2s[i]));
+        }
     }
-    ready.await();
-    go.countDown();
-    for (Thread w : workers) {
-      w.join();
+
+    @Test
+    void removeReturnsEntryAndShrinks() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
+        PairEntry ab = table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
+        table.tryGetOrCreateOrNull("a", 2, PairEntry::new);
+        assertSame(ab, table.remove("a", 1));
+        assertEquals(1, table.size());
+        assertNull(table.get("a", 1));
+        assertNotNull(table.get("a", 2));
     }
 
-    assertEquals(threads, table.size());
-    for (int i = 0; i < threads; i++) {
-      assertNotNull(table.get(k1s[i], k2s[i]));
+    @Test
+    void removeAbsentKeyReturnsNull() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
+        table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
+        assertNull(table.remove("a", 99));
+        assertNull(table.remove("z", 1));
+        assertEquals(1, table.size());
     }
-  }
-
-  @Test
-  void removeReturnsEntryAndShrinks() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
-    PairEntry ab = table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
-    table.tryGetOrCreateOrNull("a", 2, PairEntry::new);
-    assertSame(ab, table.remove("a", 1));
-    assertEquals(1, table.size());
-    assertNull(table.get("a", 1));
-    assertNotNull(table.get("a", 2));
-  }
-
-  @Test
-  void removeAbsentKeyReturnsNull() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
-    table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
-    assertNull(table.remove("a", 99));
-    assertNull(table.remove("z", 1));
-    assertEquals(1, table.size());
-  }
-
-  @Test
-  void removeMiddleOfSameBucketChainKeepsOthersReachable() {
-    // key2 = -31 * key1.hashCode() zeroes the combined hash, so all three land in one bucket
-    // chain regardless of table size.
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
-    table.tryGetOrCreateOrNull("a", -31 * "a".hashCode(), PairEntry::new);
-    PairEntry mid = table.tryGetOrCreateOrNull("b", -31 * "b".hashCode(), PairEntry::new);
-    table.tryGetOrCreateOrNull("c", -31 * "c".hashCode(), PairEntry::new);
-
-    assertSame(mid, table.remove("b", -31 * "b".hashCode()));
-    assertNull(table.get("b", -31 * "b".hashCode()));
-    assertNotNull(table.get("a", -31 * "a".hashCode()));
-    assertNotNull(table.get("c", -31 * "c".hashCode()));
-    assertEquals(2, table.size());
-  }
-
-  @Test
-  void removeIfRemovesMatchingEntries() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 16);
-    for (int i = 0; i < 10; i++) {
-      table.tryGetOrCreateOrNull("k", i, PairEntry::new);
+
+    @Test
+    void removeMiddleOfSameBucketChainKeepsOthersReachable() {
+        // key2 = -31 * key1.hashCode() zeroes the combined hash, so all three land in one bucket
+        // chain regardless of table size.
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
+        table.tryGetOrCreateOrNull("a", -31 * "a".hashCode(), PairEntry::new);
+        PairEntry mid = table.tryGetOrCreateOrNull("b", -31 * "b".hashCode(), PairEntry::new);
+        table.tryGetOrCreateOrNull("c", -31 * "c".hashCode(), PairEntry::new);
+
+        assertSame(mid, table.remove("b", -31 * "b".hashCode()));
+        assertNull(table.get("b", -31 * "b".hashCode()));
+        assertNotNull(table.get("a", -31 * "a".hashCode()));
+        assertNotNull(table.get("c", -31 * "c".hashCode()));
+        assertEquals(2, table.size());
     }
-    boolean removed = table.removeIf(e -> e.key2() % 2 == 0); // removes key2 0,2,4,6,8
-    assertTrue(removed);
-    assertEquals(5, table.size());
-    Set<String> seen = new HashSet<>();
-    table.forEach(e -> seen.add(e.key1() + ":" + e.key2()));
-    assertEquals(5, seen.size());
-  }
-
-  @Test
-  void removeIfReturnsFalseWhenNothingMatches() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
-    table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
-    assertFalse(table.removeIf(e -> false));
-    assertEquals(1, table.size());
-  }
-
-  @Test
-  void clearEmptiesTableAndLeavesItUsable() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
-    table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
-    table.tryGetOrCreateOrNull("b", 2, PairEntry::new);
-    table.clear();
-    assertEquals(0, table.size());
-    assertNull(table.get("a", 1));
-    PairEntry c = table.tryGetOrCreateOrNull("c", 3, PairEntry::new);
-    assertSame(c, table.get("c", 3));
-    assertEquals(1, table.size());
-  }
-
-  @Test
-  void drainRemovesEveryEntryAndFeedsSink() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
-    table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
-    table.tryGetOrCreateOrNull("a", 2, PairEntry::new);
-    table.tryGetOrCreateOrNull("b", 1, PairEntry::new);
-
-    Set<String> drained = new HashSet<>();
-    table.drain(e -> drained.add(e.key1() + ":" + e.key2()));
-
-    assertEquals(new HashSet<>(Arrays.asList("a:1", "a:2", "b:1")), drained);
-    assertEquals(0, table.size());
-    assertNull(table.get("a", 1));
-    PairEntry c = table.tryGetOrCreateOrNull("c", 3, PairEntry::new);
-    assertSame(c, table.get("c", 3));
-    assertEquals(1, table.size());
-  }
-
-  @Test
-  void drainWithContextFeedsSink() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
-    table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
-    table.tryGetOrCreateOrNull("b", 2, PairEntry::new);
-
-    Set<String> drained = new HashSet<>();
-    table.drain(drained, (ctx, e) -> ctx.add(e.key1() + ":" + e.key2()));
-
-    assertEquals(new HashSet<>(Arrays.asList("a:1", "b:2")), drained);
-    assertEquals(0, table.size());
-  }
-
-  @Test
-  void tryGetOrCreateOrEvictInsertsWithoutEvictingWhenUnderCapacity() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
-    Maybe<PairEntry> created = table.tryGetOrCreateOrEvict("a", 1, PairEntry::new, e -> true);
-    assertTrue(created.isPresent());
-    assertEquals(1, table.size());
-    assertSame(created.getOrNull(), table.get("a", 1));
-  }
-
-  @Test
-  void tryGetOrCreateOrEvictReturnsExistingEntryOnHitWithoutEvicting() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 1);
-    PairEntry a = table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
-    Maybe<PairEntry> got =
-        table.tryGetOrCreateOrEvict(
-            "a",
-            1,
-            (k1, k2) -> {
-              throw new AssertionError("creator must not run on a hit");
-            },
-            e -> {
-              throw new AssertionError("evictable must not run on a hit");
-            });
-    assertSame(a, got.getOrNull());
-    assertEquals(1, table.size());
-  }
-
-  @Test
-  void tryGetOrCreateOrEvictEvictsWhenFullAndInsertsNewEntry() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 1);
-    table.tryGetOrCreateOrNull("old", 1, PairEntry::new);
-    assertTrue(table.isFull());
-
-    Maybe<PairEntry> created = table.tryGetOrCreateOrEvict("new", 2, PairEntry::new, e -> true);
-    assertTrue(created.isPresent());
-    assertEquals("new", created.getOrNull().key1());
-    assertEquals(1, table.size());
-    assertNull(table.get("old", 1));
-    assertSame(created.getOrNull(), table.get("new", 2));
-  }
-
-  @Test
-  void tryGetOrCreateOrEvictOrNullRefusesWhenFullAndNothingEvictable() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 1);
-    table.tryGetOrCreateOrNull("old", 1, PairEntry::new);
-
-    PairEntry result = table.tryGetOrCreateOrEvictOrNull("new", 2, PairEntry::new, e -> false);
-    assertNull(result);
-    assertEquals(1, table.size());
-    assertNotNull(table.get("old", 1));
-    assertNull(table.get("new", 2));
-  }
-
-  @Test
-  void tryGetOrCreateOrEvictOrNullEvictionRunsBeforeThrowingCreator() {
-    ConcurrentHashtable.D2<String, Integer, PairEntry> table =
-        ConcurrentHashtable.D2.createBounded(PairEntry.class, 1);
-    table.tryGetOrCreateOrNull("old", 1, PairEntry::new);
-
-    assertThrows(
-        RuntimeException.class,
-        () ->
-            table.tryGetOrCreateOrEvictOrNull(
-                "new",
-                2,
+
+    @Test
+    void removeIfRemovesMatchingEntries() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 16);
+        for (int i = 0; i < 10; i++) {
+            table.tryGetOrCreateOrNull("k", i, PairEntry::new);
+        }
+        boolean removed = table.removeIf(e -> e.key2() % 2 == 0); // removes key2 0,2,4,6,8
+        assertTrue(removed);
+        assertEquals(5, table.size());
+        Set<String> seen = new HashSet<>();
+        table.forEach(e -> seen.add(e.key1() + ":" + e.key2()));
+        assertEquals(5, seen.size());
+    }
+
+    @Test
+    void removeIfReturnsFalseWhenNothingMatches() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
+        table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
+        assertFalse(table.removeIf(e -> false));
+        assertEquals(1, table.size());
+    }
+
+    @Test
+    void clearEmptiesTableAndLeavesItUsable() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
+        table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
+        table.tryGetOrCreateOrNull("b", 2, PairEntry::new);
+        table.clear();
+        assertEquals(0, table.size());
+        assertNull(table.get("a", 1));
+        PairEntry c = table.tryGetOrCreateOrNull("c", 3, PairEntry::new);
+        assertSame(c, table.get("c", 3));
+        assertEquals(1, table.size());
+    }
+
+    @Test
+    void drainRemovesEveryEntryAndFeedsSink() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
+        table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
+        table.tryGetOrCreateOrNull("a", 2, PairEntry::new);
+        table.tryGetOrCreateOrNull("b", 1, PairEntry::new);
+
+        Set<String> drained = new HashSet<>();
+        table.drain(e -> drained.add(e.key1() + ":" + e.key2()));
+
+        assertEquals(new HashSet<>(Arrays.asList("a:1", "a:2", "b:1")), drained);
+        assertEquals(0, table.size());
+        assertNull(table.get("a", 1));
+        PairEntry c = table.tryGetOrCreateOrNull("c", 3, PairEntry::new);
+        assertSame(c, table.get("c", 3));
+        assertEquals(1, table.size());
+    }
+
+    @Test
+    void drainWithContextFeedsSink() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
+        table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
+        table.tryGetOrCreateOrNull("b", 2, PairEntry::new);
+
+        Set<String> drained = new HashSet<>();
+        table.drain(drained, (ctx, e) -> ctx.add(e.key1() + ":" + e.key2()));
+
+        assertEquals(new HashSet<>(Arrays.asList("a:1", "b:2")), drained);
+        assertEquals(0, table.size());
+    }
+
+    @Test
+    void tryGetOrCreateOrEvictInsertsWithoutEvictingWhenUnderCapacity() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 8);
+        Maybe<PairEntry> created = table.tryGetOrCreateOrEvict("a", 1, PairEntry::new, e -> true);
+        assertTrue(created.isPresent());
+        assertEquals(1, table.size());
+        assertSame(created.getOrNull(), table.get("a", 1));
+    }
+
+    @Test
+    void tryGetOrCreateOrEvictReturnsExistingEntryOnHitWithoutEvicting() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 1);
+        PairEntry a = table.tryGetOrCreateOrNull("a", 1, PairEntry::new);
+        Maybe<PairEntry> got = table.tryGetOrCreateOrEvict(
+                "a",
+                1,
                 (k1, k2) -> {
-                  throw new RuntimeException("boom");
+                    throw new AssertionError("creator must not run on a hit");
                 },
-                e -> true));
-
-    // Eviction already happened before the creator threw: the table is left one entry smaller,
-    // not corrupted or double-booked.
-    assertEquals(0, table.size());
-    assertNull(table.get("old", 1));
-    assertNull(table.get("new", 2));
-  }
-
-  /** Entry with no payload beyond its two key parts, used to exercise the D2 identity/API. */
-  private static final class PairEntry extends ConcurrentHashtable.D2.Entry<String, Integer> {
-    PairEntry(String key1, Integer key2) {
-      super(key1, key2);
+                e -> {
+                    throw new AssertionError("evictable must not run on a hit");
+                });
+        assertSame(a, got.getOrNull());
+        assertEquals(1, table.size());
+    }
+
+    @Test
+    void tryGetOrCreateOrEvictEvictsWhenFullAndInsertsNewEntry() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 1);
+        table.tryGetOrCreateOrNull("old", 1, PairEntry::new);
+        assertTrue(table.isFull());
+
+        Maybe<PairEntry> created = table.tryGetOrCreateOrEvict("new", 2, PairEntry::new, e -> true);
+        assertTrue(created.isPresent());
+        assertEquals("new", created.getOrNull().key1());
+        assertEquals(1, table.size());
+        assertNull(table.get("old", 1));
+        assertSame(created.getOrNull(), table.get("new", 2));
+    }
+
+    @Test
+    void tryGetOrCreateOrEvictOrNullRefusesWhenFullAndNothingEvictable() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 1);
+        table.tryGetOrCreateOrNull("old", 1, PairEntry::new);
+
+        PairEntry result = table.tryGetOrCreateOrEvictOrNull("new", 2, PairEntry::new, e -> false);
+        assertNull(result);
+        assertEquals(1, table.size());
+        assertNotNull(table.get("old", 1));
+        assertNull(table.get("new", 2));
+    }
+
+    @Test
+    void tryGetOrCreateOrEvictOrNullEvictionRunsBeforeThrowingCreator() {
+        ConcurrentHashtable.D2<String, Integer, PairEntry> table =
+                ConcurrentHashtable.D2.createBounded(PairEntry.class, 1);
+        table.tryGetOrCreateOrNull("old", 1, PairEntry::new);
+
+        assertThrows(
+                RuntimeException.class,
+                () -> table.tryGetOrCreateOrEvictOrNull(
+                        "new",
+                        2,
+                        (k1, k2) -> {
+                            throw new RuntimeException("boom");
+                        },
+                        e -> true));
+
+        // Eviction already happened before the creator threw: the table is left one entry smaller,
+        // not corrupted or double-booked.
+        assertEquals(0, table.size());
+        assertNull(table.get("old", 1));
+        assertNull(table.get("new", 2));
+    }
+
+    /** Entry with no payload beyond its two key parts, used to exercise the D2 identity/API. */
+    private static final class PairEntry extends ConcurrentHashtable.D2.Entry<String, Integer> {
+        PairEntry(String key1, Integer key2) {
+            super(key1, key2);
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableReservationTest.java b/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableReservationTest.java
index 2e8f2af118f..a43d9ac227d 100644
--- a/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableReservationTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableReservationTest.java
@@ -19,410 +19,380 @@
 /** Exercises {@link ConcurrentHashtable#tryReserve} and {@link ConcurrentHashtable.Reservation}. */
 class ConcurrentHashtableReservationTest {
 
-  private static final class TestEntry extends ConcurrentHashtable.Entry<TestEntry> {
-    final int value;
-
-    TestEntry(int value) {
-      super(value);
-      this.value = value;
-    }
-
-    @Override
-    public boolean matches(@Nonnull TestEntry other) {
-      return value == other.value;
-    }
-  }
-
-  @Test
-  void tryGetOrInsertOrNullInsertsOnMissAndFindsOnHit() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 4);
-
-    TestEntry first;
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
-      assertTrue(r.isReserved());
-      first = r.tryGetOrInsertOrNull(1, TestEntry::new);
-    }
-    assertEquals(1, first.value);
-    assertEquals(1, ConcurrentHashtable.estimateSize(state));
-
-    // Reserving again for a key that already exists should discard the reservation and return the
-    // existing entry, not double-insert or leak the claimed slot.
-    TestEntry second;
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
-      second = r.tryGetOrInsertOrNull(1, TestEntry::new);
-    }
-    assertSame(first, second);
-    assertEquals(1, ConcurrentHashtable.estimateSize(state));
-  }
-
-  @Test
-  void reserveOnFullTableIsAbsentAndSkipsTheFactory() {
-    // capacity 3 rounds up to 4 buckets, so one bucket stays empty once the table is full --
-    // that's what lets tryReserve rule out keyHash 4 without ever taking the write lock.
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 3);
-    for (int keyHash = 1; keyHash <= 3; keyHash++) {
-      try (ConcurrentHashtable.Reservation<TestEntry> r =
-          ConcurrentHashtable.tryReserve(state, keyHash)) {
-        r.tryGetOrInsertOrNull(keyHash, TestEntry::new);
-      }
-    }
-    assertTrue(ConcurrentHashtable.isFull(state));
-
-    AtomicInteger factoryCalls = new AtomicInteger();
-    TestEntry result;
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 4)) {
-      assertFalse(r.isReserved());
-      result =
-          r.tryGetOrInsertOrNull(
-              4,
-              v -> {
+    private static final class TestEntry extends ConcurrentHashtable.Entry<TestEntry> {
+        final int value;
+
+        TestEntry(int value) {
+            super(value);
+            this.value = value;
+        }
+
+        @Override
+        public boolean matches(@Nonnull TestEntry other) {
+            return value == other.value;
+        }
+    }
+
+    @Test
+    void tryGetOrInsertOrNullInsertsOnMissAndFindsOnHit() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 4);
+
+        TestEntry first;
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
+            assertTrue(r.isReserved());
+            first = r.tryGetOrInsertOrNull(1, TestEntry::new);
+        }
+        assertEquals(1, first.value);
+        assertEquals(1, ConcurrentHashtable.estimateSize(state));
+
+        // Reserving again for a key that already exists should discard the reservation and return the
+        // existing entry, not double-insert or leak the claimed slot.
+        TestEntry second;
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
+            second = r.tryGetOrInsertOrNull(1, TestEntry::new);
+        }
+        assertSame(first, second);
+        assertEquals(1, ConcurrentHashtable.estimateSize(state));
+    }
+
+    @Test
+    void reserveOnFullTableIsAbsentAndSkipsTheFactory() {
+        // capacity 3 rounds up to 4 buckets, so one bucket stays empty once the table is full --
+        // that's what lets tryReserve rule out keyHash 4 without ever taking the write lock.
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 3);
+        for (int keyHash = 1; keyHash <= 3; keyHash++) {
+            try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, keyHash)) {
+                r.tryGetOrInsertOrNull(keyHash, TestEntry::new);
+            }
+        }
+        assertTrue(ConcurrentHashtable.isFull(state));
+
+        AtomicInteger factoryCalls = new AtomicInteger();
+        TestEntry result;
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 4)) {
+            assertFalse(r.isReserved());
+            result = r.tryGetOrInsertOrNull(4, v -> {
                 factoryCalls.incrementAndGet();
                 return new TestEntry(v);
-              });
-    }
-    assertNull(result);
-    assertEquals(0, factoryCalls.get());
-    assertEquals(3, ConcurrentHashtable.estimateSize(state));
-  }
-
-  @Test
-  void closeCancelsAnUnconsumedReservation() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 1);
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
-      assertTrue(r.isReserved());
-      // Deliberately not consuming the reservation.
-    }
-    assertEquals(0, ConcurrentHashtable.estimateSize(state));
-    assertFalse(ConcurrentHashtable.isFull(state));
-  }
-
-  @Test
-  void tryGetOrInsertWrapsResultInMaybe() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 1);
-
-    Maybe<TestEntry> present;
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
-      present = r.tryGetOrInsert(1, TestEntry::new);
-    }
-    assertTrue(present.isPresent());
-    assertEquals(1, present.getOrNull().value);
-
-    Maybe<TestEntry> absent;
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 2)) {
-      absent = r.tryGetOrInsert(2, TestEntry::new);
-    }
-    assertFalse(absent.isPresent());
-    assertNull(absent.getOrNull());
-  }
-
-  @Test
-  void closeOnAnAbsentReservationIsANoOp() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 0);
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
-      assertFalse(r.isReserved());
-    }
-    assertEquals(0, ConcurrentHashtable.estimateSize(state));
-  }
-
-  private static final class TwoPartEntry extends ConcurrentHashtable.Entry<TwoPartEntry> {
-    final String a;
-    final String b;
-
-    TwoPartEntry(String a, String b) {
-      super(HashingUtils.hash(a, b));
-      this.a = a;
-      this.b = b;
-    }
-
-    @Override
-    public boolean matches(@Nonnull TwoPartEntry other) {
-      return a.equals(other.a) && b.equals(other.b);
-    }
-  }
-
-  private static final class ThreePartEntry extends ConcurrentHashtable.Entry<ThreePartEntry> {
-    final String a;
-    final String b;
-    final String c;
-
-    ThreePartEntry(String a, String b, String c) {
-      super(HashingUtils.hash(a, b, c));
-      this.a = a;
-      this.b = b;
-      this.c = c;
-    }
-
-    @Override
-    public boolean matches(@Nonnull ThreePartEntry other) {
-      return a.equals(other.a) && b.equals(other.b) && c.equals(other.c);
-    }
-  }
-
-  private static final class FourPartEntry extends ConcurrentHashtable.Entry<FourPartEntry> {
-    final String a;
-    final String b;
-    final String c;
-    final String d;
-
-    FourPartEntry(String a, String b, String c, String d) {
-      super(HashingUtils.hash(a, b, c, d));
-      this.a = a;
-      this.b = b;
-      this.c = c;
-      this.d = d;
-    }
-
-    @Override
-    public boolean matches(@Nonnull FourPartEntry other) {
-      return a.equals(other.a) && b.equals(other.b) && c.equals(other.c) && d.equals(other.d);
-    }
-  }
-
-  @Test
-  void tryGetOrInsertOrNullSupportsUpToFourComponents() {
-    ConcurrentHashtable.State<ThreePartEntry> state3 =
-        ConcurrentHashtable.createBounded(ThreePartEntry.class, 2);
-    ThreePartEntry three;
-    try (ConcurrentHashtable.Reservation<ThreePartEntry> r =
-        ConcurrentHashtable.tryReserve(state3, HashingUtils.hash("x", "y", "z"))) {
-      three = r.tryGetOrInsertOrNull("x", "y", "z", ThreePartEntry::new);
-    }
-    assertEquals("x", three.a);
-    assertEquals("y", three.b);
-    assertEquals("z", three.c);
-
-    ConcurrentHashtable.State<FourPartEntry> state4 =
-        ConcurrentHashtable.createBounded(FourPartEntry.class, 2);
-    FourPartEntry four;
-    try (ConcurrentHashtable.Reservation<FourPartEntry> r =
-        ConcurrentHashtable.tryReserve(state4, HashingUtils.hash("w", "x", "y", "z"))) {
-      four = r.tryGetOrInsertOrNull("w", "x", "y", "z", FourPartEntry::new);
-    }
-    assertEquals("w", four.a);
-    assertEquals("x", four.b);
-    assertEquals("y", four.c);
-    assertEquals("z", four.d);
-  }
-
-  @Test
-  void tryGetOrInsertOrNullSupportsTwoComponents() {
-    ConcurrentHashtable.State<TwoPartEntry> state =
-        ConcurrentHashtable.createBounded(TwoPartEntry.class, 2);
-    TwoPartEntry two;
-    try (ConcurrentHashtable.Reservation<TwoPartEntry> r =
-        ConcurrentHashtable.tryReserve(state, HashingUtils.hash("x", "y"))) {
-      two = r.tryGetOrInsertOrNull("x", "y", TwoPartEntry::new);
-    }
-    assertEquals("x", two.a);
-    assertEquals("y", two.b);
-  }
-
-  @Test
-  void tryGetOrInsertOrNullOnPrebuiltEntry() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 1);
-    TestEntry inserted;
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
-      inserted = r.tryGetOrInsertOrNull(new TestEntry(1));
-    }
-    assertEquals(1, inserted.value);
-    assertEquals(1, ConcurrentHashtable.estimateSize(state));
-  }
-
-  @Test
-  void tryGetOrInsertOnPrebuiltEntryWrapsResultInMaybe() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 1);
-
-    Maybe<TestEntry> present;
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
-      present = r.tryGetOrInsert(new TestEntry(1));
-    }
-    assertTrue(present.isPresent());
-    assertEquals(1, present.getOrNull().value);
-
-    Maybe<TestEntry> absent;
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 2)) {
-      absent = r.tryGetOrInsert(new TestEntry(2));
-    }
-    assertFalse(absent.isPresent());
-    assertNull(absent.getOrNull());
-  }
-
-  @Test
-  void tryGetOrInsertWrapsResultInMaybeForTwoThreeAndFourComponents() {
-    ConcurrentHashtable.State<TwoPartEntry> state2 =
-        ConcurrentHashtable.createBounded(TwoPartEntry.class, 2);
-    Maybe<TwoPartEntry> two;
-    try (ConcurrentHashtable.Reservation<TwoPartEntry> r =
-        ConcurrentHashtable.tryReserve(state2, HashingUtils.hash("x", "y"))) {
-      two = r.tryGetOrInsert("x", "y", TwoPartEntry::new);
-    }
-    assertTrue(two.isPresent());
-    assertEquals("x", two.getOrNull().a);
-    assertEquals("y", two.getOrNull().b);
-
-    ConcurrentHashtable.State<ThreePartEntry> state3 =
-        ConcurrentHashtable.createBounded(ThreePartEntry.class, 2);
-    Maybe<ThreePartEntry> three;
-    try (ConcurrentHashtable.Reservation<ThreePartEntry> r =
-        ConcurrentHashtable.tryReserve(state3, HashingUtils.hash("x", "y", "z"))) {
-      three = r.tryGetOrInsert("x", "y", "z", ThreePartEntry::new);
-    }
-    assertTrue(three.isPresent());
-    assertEquals("x", three.getOrNull().a);
-    assertEquals("y", three.getOrNull().b);
-    assertEquals("z", three.getOrNull().c);
-
-    ConcurrentHashtable.State<FourPartEntry> state4 =
-        ConcurrentHashtable.createBounded(FourPartEntry.class, 2);
-    Maybe<FourPartEntry> four;
-    try (ConcurrentHashtable.Reservation<FourPartEntry> r =
-        ConcurrentHashtable.tryReserve(state4, HashingUtils.hash("w", "x", "y", "z"))) {
-      four = r.tryGetOrInsert("w", "x", "y", "z", FourPartEntry::new);
-    }
-    assertTrue(four.isPresent());
-    assertEquals("w", four.getOrNull().a);
-    assertEquals("x", four.getOrNull().b);
-    assertEquals("y", four.getOrNull().c);
-    assertEquals("z", four.getOrNull().d);
-  }
-
-  @Test
-  void tryReserveSkipsTheLockWhenTheTargetBucketIsDefinitelyEmpty() {
-    // capacity 3 rounds up to 4 buckets, so one bucket stays empty once the table is full.
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 3);
-    for (int keyHash = 1; keyHash <= 3; keyHash++) {
-      try (ConcurrentHashtable.Reservation<TestEntry> r =
-          ConcurrentHashtable.tryReserve(state, keyHash)) {
-        r.tryGetOrInsertOrNull(keyHash, TestEntry::new);
-      }
-    }
-    assertTrue(ConcurrentHashtable.isFull(state));
-
-    AtomicInteger factoryCalls = new AtomicInteger();
-    TestEntry result;
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 4)) {
-      assertFalse(r.isReserved());
-      result =
-          r.tryGetOrInsertOrNull(
-              4,
-              v -> {
+            });
+        }
+        assertNull(result);
+        assertEquals(0, factoryCalls.get());
+        assertEquals(3, ConcurrentHashtable.estimateSize(state));
+    }
+
+    @Test
+    void closeCancelsAnUnconsumedReservation() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 1);
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
+            assertTrue(r.isReserved());
+            // Deliberately not consuming the reservation.
+        }
+        assertEquals(0, ConcurrentHashtable.estimateSize(state));
+        assertFalse(ConcurrentHashtable.isFull(state));
+    }
+
+    @Test
+    void tryGetOrInsertWrapsResultInMaybe() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 1);
+
+        Maybe<TestEntry> present;
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
+            present = r.tryGetOrInsert(1, TestEntry::new);
+        }
+        assertTrue(present.isPresent());
+        assertEquals(1, present.getOrNull().value);
+
+        Maybe<TestEntry> absent;
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 2)) {
+            absent = r.tryGetOrInsert(2, TestEntry::new);
+        }
+        assertFalse(absent.isPresent());
+        assertNull(absent.getOrNull());
+    }
+
+    @Test
+    void closeOnAnAbsentReservationIsANoOp() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 0);
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
+            assertFalse(r.isReserved());
+        }
+        assertEquals(0, ConcurrentHashtable.estimateSize(state));
+    }
+
+    private static final class TwoPartEntry extends ConcurrentHashtable.Entry<TwoPartEntry> {
+        final String a;
+        final String b;
+
+        TwoPartEntry(String a, String b) {
+            super(HashingUtils.hash(a, b));
+            this.a = a;
+            this.b = b;
+        }
+
+        @Override
+        public boolean matches(@Nonnull TwoPartEntry other) {
+            return a.equals(other.a) && b.equals(other.b);
+        }
+    }
+
+    private static final class ThreePartEntry extends ConcurrentHashtable.Entry<ThreePartEntry> {
+        final String a;
+        final String b;
+        final String c;
+
+        ThreePartEntry(String a, String b, String c) {
+            super(HashingUtils.hash(a, b, c));
+            this.a = a;
+            this.b = b;
+            this.c = c;
+        }
+
+        @Override
+        public boolean matches(@Nonnull ThreePartEntry other) {
+            return a.equals(other.a) && b.equals(other.b) && c.equals(other.c);
+        }
+    }
+
+    private static final class FourPartEntry extends ConcurrentHashtable.Entry<FourPartEntry> {
+        final String a;
+        final String b;
+        final String c;
+        final String d;
+
+        FourPartEntry(String a, String b, String c, String d) {
+            super(HashingUtils.hash(a, b, c, d));
+            this.a = a;
+            this.b = b;
+            this.c = c;
+            this.d = d;
+        }
+
+        @Override
+        public boolean matches(@Nonnull FourPartEntry other) {
+            return a.equals(other.a) && b.equals(other.b) && c.equals(other.c) && d.equals(other.d);
+        }
+    }
+
+    @Test
+    void tryGetOrInsertOrNullSupportsUpToFourComponents() {
+        ConcurrentHashtable.State<ThreePartEntry> state3 = ConcurrentHashtable.createBounded(ThreePartEntry.class, 2);
+        ThreePartEntry three;
+        try (ConcurrentHashtable.Reservation<ThreePartEntry> r =
+                ConcurrentHashtable.tryReserve(state3, HashingUtils.hash("x", "y", "z"))) {
+            three = r.tryGetOrInsertOrNull("x", "y", "z", ThreePartEntry::new);
+        }
+        assertEquals("x", three.a);
+        assertEquals("y", three.b);
+        assertEquals("z", three.c);
+
+        ConcurrentHashtable.State<FourPartEntry> state4 = ConcurrentHashtable.createBounded(FourPartEntry.class, 2);
+        FourPartEntry four;
+        try (ConcurrentHashtable.Reservation<FourPartEntry> r =
+                ConcurrentHashtable.tryReserve(state4, HashingUtils.hash("w", "x", "y", "z"))) {
+            four = r.tryGetOrInsertOrNull("w", "x", "y", "z", FourPartEntry::new);
+        }
+        assertEquals("w", four.a);
+        assertEquals("x", four.b);
+        assertEquals("y", four.c);
+        assertEquals("z", four.d);
+    }
+
+    @Test
+    void tryGetOrInsertOrNullSupportsTwoComponents() {
+        ConcurrentHashtable.State<TwoPartEntry> state = ConcurrentHashtable.createBounded(TwoPartEntry.class, 2);
+        TwoPartEntry two;
+        try (ConcurrentHashtable.Reservation<TwoPartEntry> r =
+                ConcurrentHashtable.tryReserve(state, HashingUtils.hash("x", "y"))) {
+            two = r.tryGetOrInsertOrNull("x", "y", TwoPartEntry::new);
+        }
+        assertEquals("x", two.a);
+        assertEquals("y", two.b);
+    }
+
+    @Test
+    void tryGetOrInsertOrNullOnPrebuiltEntry() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 1);
+        TestEntry inserted;
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
+            inserted = r.tryGetOrInsertOrNull(new TestEntry(1));
+        }
+        assertEquals(1, inserted.value);
+        assertEquals(1, ConcurrentHashtable.estimateSize(state));
+    }
+
+    @Test
+    void tryGetOrInsertOnPrebuiltEntryWrapsResultInMaybe() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 1);
+
+        Maybe<TestEntry> present;
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
+            present = r.tryGetOrInsert(new TestEntry(1));
+        }
+        assertTrue(present.isPresent());
+        assertEquals(1, present.getOrNull().value);
+
+        Maybe<TestEntry> absent;
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 2)) {
+            absent = r.tryGetOrInsert(new TestEntry(2));
+        }
+        assertFalse(absent.isPresent());
+        assertNull(absent.getOrNull());
+    }
+
+    @Test
+    void tryGetOrInsertWrapsResultInMaybeForTwoThreeAndFourComponents() {
+        ConcurrentHashtable.State<TwoPartEntry> state2 = ConcurrentHashtable.createBounded(TwoPartEntry.class, 2);
+        Maybe<TwoPartEntry> two;
+        try (ConcurrentHashtable.Reservation<TwoPartEntry> r =
+                ConcurrentHashtable.tryReserve(state2, HashingUtils.hash("x", "y"))) {
+            two = r.tryGetOrInsert("x", "y", TwoPartEntry::new);
+        }
+        assertTrue(two.isPresent());
+        assertEquals("x", two.getOrNull().a);
+        assertEquals("y", two.getOrNull().b);
+
+        ConcurrentHashtable.State<ThreePartEntry> state3 = ConcurrentHashtable.createBounded(ThreePartEntry.class, 2);
+        Maybe<ThreePartEntry> three;
+        try (ConcurrentHashtable.Reservation<ThreePartEntry> r =
+                ConcurrentHashtable.tryReserve(state3, HashingUtils.hash("x", "y", "z"))) {
+            three = r.tryGetOrInsert("x", "y", "z", ThreePartEntry::new);
+        }
+        assertTrue(three.isPresent());
+        assertEquals("x", three.getOrNull().a);
+        assertEquals("y", three.getOrNull().b);
+        assertEquals("z", three.getOrNull().c);
+
+        ConcurrentHashtable.State<FourPartEntry> state4 = ConcurrentHashtable.createBounded(FourPartEntry.class, 2);
+        Maybe<FourPartEntry> four;
+        try (ConcurrentHashtable.Reservation<FourPartEntry> r =
+                ConcurrentHashtable.tryReserve(state4, HashingUtils.hash("w", "x", "y", "z"))) {
+            four = r.tryGetOrInsert("w", "x", "y", "z", FourPartEntry::new);
+        }
+        assertTrue(four.isPresent());
+        assertEquals("w", four.getOrNull().a);
+        assertEquals("x", four.getOrNull().b);
+        assertEquals("y", four.getOrNull().c);
+        assertEquals("z", four.getOrNull().d);
+    }
+
+    @Test
+    void tryReserveSkipsTheLockWhenTheTargetBucketIsDefinitelyEmpty() {
+        // capacity 3 rounds up to 4 buckets, so one bucket stays empty once the table is full.
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 3);
+        for (int keyHash = 1; keyHash <= 3; keyHash++) {
+            try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, keyHash)) {
+                r.tryGetOrInsertOrNull(keyHash, TestEntry::new);
+            }
+        }
+        assertTrue(ConcurrentHashtable.isFull(state));
+
+        AtomicInteger factoryCalls = new AtomicInteger();
+        TestEntry result;
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 4)) {
+            assertFalse(r.isReserved());
+            result = r.tryGetOrInsertOrNull(4, v -> {
                 factoryCalls.incrementAndGet();
                 return new TestEntry(v);
-              });
-    }
-    assertNull(result);
-    assertEquals(0, factoryCalls.get());
-    assertEquals(3, ConcurrentHashtable.estimateSize(state));
-  }
-
-  @Test
-  void tryReserveFindsAConcurrentDuplicateEvenWhenTheTableLooksFull() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 3);
-    TestEntry existing;
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
-      existing = r.tryGetOrInsertOrNull(1, TestEntry::new);
-    }
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 2)) {
-      r.tryGetOrInsertOrNull(2, TestEntry::new);
-    }
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 3)) {
-      r.tryGetOrInsertOrNull(3, TestEntry::new);
-    }
-    assertTrue(ConcurrentHashtable.isFull(state));
-
-    // Reserving for the same keyHash again simulates a concurrent duplicate insert landing just
-    // before the caller's own reservation attempt.
-    TestEntry match;
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
-      assertTrue(r.isReserved());
-      match = r.tryGetOrInsertOrNull(new TestEntry(1));
-    }
-    assertSame(existing, match);
-    assertEquals(3, ConcurrentHashtable.estimateSize(state));
-  }
-
-  @Test
-  void tryReserveReturnsNullWithoutOvercountingWhenGenuinelyFull() {
-    // capacity 3 rounds up to 4 buckets; keyHash 1 and 5 collide on the same bucket (index 1) but
-    // are logically distinct keys (TestEntry.matches compares by value).
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 3);
-    for (int keyHash = 1; keyHash <= 3; keyHash++) {
-      try (ConcurrentHashtable.Reservation<TestEntry> r =
-          ConcurrentHashtable.tryReserve(state, keyHash)) {
-        r.tryGetOrInsertOrNull(keyHash, TestEntry::new);
-      }
-    }
-    assertTrue(ConcurrentHashtable.isFull(state));
-
-    TestEntry result;
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 5)) {
-      assertTrue(r.isReserved());
-      result = r.tryGetOrInsertOrNull(new TestEntry(5));
-    }
-    assertNull(result);
-    assertEquals(3, ConcurrentHashtable.estimateSize(state));
-  }
-
-  @Test
-  void tryReserveWaitsForAnInFlightReservationOnTheSameKeyBeforeRejecting() throws Exception {
-    // Capacity 1: the first reservation claims the table's only slot (so isFull() flips true)
-    // without yet linking its entry into the bucket -- exactly the window a lock-free "full +
-    // empty bucket" peek must not trust, since a concurrent duplicate could land there.
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 1);
-
-    ConcurrentHashtable.Reservation<TestEntry> first = ConcurrentHashtable.tryReserve(state, 1);
-    assertTrue(first.isReserved());
-    assertTrue(ConcurrentHashtable.isFull(state));
-
-    ExecutorService executor = Executors.newSingleThreadExecutor();
-    try {
-      Future<TestEntry> secondFuture =
-          executor.submit(
-              () -> {
-                try (ConcurrentHashtable.Reservation<TestEntry> second =
-                    ConcurrentHashtable.tryReserve(state, 1)) {
-                  return second.tryGetOrInsertOrNull(new TestEntry(1));
+            });
+        }
+        assertNull(result);
+        assertEquals(0, factoryCalls.get());
+        assertEquals(3, ConcurrentHashtable.estimateSize(state));
+    }
+
+    @Test
+    void tryReserveFindsAConcurrentDuplicateEvenWhenTheTableLooksFull() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 3);
+        TestEntry existing;
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
+            existing = r.tryGetOrInsertOrNull(1, TestEntry::new);
+        }
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 2)) {
+            r.tryGetOrInsertOrNull(2, TestEntry::new);
+        }
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 3)) {
+            r.tryGetOrInsertOrNull(3, TestEntry::new);
+        }
+        assertTrue(ConcurrentHashtable.isFull(state));
+
+        // Reserving for the same keyHash again simulates a concurrent duplicate insert landing just
+        // before the caller's own reservation attempt.
+        TestEntry match;
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
+            assertTrue(r.isReserved());
+            match = r.tryGetOrInsertOrNull(new TestEntry(1));
+        }
+        assertSame(existing, match);
+        assertEquals(3, ConcurrentHashtable.estimateSize(state));
+    }
+
+    @Test
+    void tryReserveReturnsNullWithoutOvercountingWhenGenuinelyFull() {
+        // capacity 3 rounds up to 4 buckets; keyHash 1 and 5 collide on the same bucket (index 1) but
+        // are logically distinct keys (TestEntry.matches compares by value).
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 3);
+        for (int keyHash = 1; keyHash <= 3; keyHash++) {
+            try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, keyHash)) {
+                r.tryGetOrInsertOrNull(keyHash, TestEntry::new);
+            }
+        }
+        assertTrue(ConcurrentHashtable.isFull(state));
+
+        TestEntry result;
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 5)) {
+            assertTrue(r.isReserved());
+            result = r.tryGetOrInsertOrNull(new TestEntry(5));
+        }
+        assertNull(result);
+        assertEquals(3, ConcurrentHashtable.estimateSize(state));
+    }
+
+    @Test
+    void tryReserveWaitsForAnInFlightReservationOnTheSameKeyBeforeRejecting() throws Exception {
+        // Capacity 1: the first reservation claims the table's only slot (so isFull() flips true)
+        // without yet linking its entry into the bucket -- exactly the window a lock-free "full +
+        // empty bucket" peek must not trust, since a concurrent duplicate could land there.
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 1);
+
+        ConcurrentHashtable.Reservation<TestEntry> first = ConcurrentHashtable.tryReserve(state, 1);
+        assertTrue(first.isReserved());
+        assertTrue(ConcurrentHashtable.isFull(state));
+
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        try {
+            Future<TestEntry> secondFuture = executor.submit(() -> {
+                try (ConcurrentHashtable.Reservation<TestEntry> second = ConcurrentHashtable.tryReserve(state, 1)) {
+                    return second.tryGetOrInsertOrNull(new TestEntry(1));
                 }
-              });
-
-      // A buggy fast-reject would complete this immediately (with a null result) instead of
-      // blocking on the still-held write lock.
-      assertThrows(TimeoutException.class, () -> secondFuture.get(200, TimeUnit.MILLISECONDS));
-
-      TestEntry inserted;
-      try {
-        inserted = first.tryGetOrInsertOrNull(new TestEntry(1));
-      } finally {
-        first.close();
-      }
-
-      TestEntry secondResult = secondFuture.get(5, TimeUnit.SECONDS);
-      assertSame(inserted, secondResult);
-      assertEquals(1, ConcurrentHashtable.estimateSize(state));
-    } finally {
-      executor.shutdown();
-    }
-  }
-
-  @Test
-  void reusingAReservationForASecondCompletionThrows() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 2);
-    try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
-      r.tryGetOrInsertOrNull(1, TestEntry::new);
-      assertThrows(IllegalStateException.class, () -> r.tryGetOrInsertOrNull(2, TestEntry::new));
+            });
+
+            // A buggy fast-reject would complete this immediately (with a null result) instead of
+            // blocking on the still-held write lock.
+            assertThrows(TimeoutException.class, () -> secondFuture.get(200, TimeUnit.MILLISECONDS));
+
+            TestEntry inserted;
+            try {
+                inserted = first.tryGetOrInsertOrNull(new TestEntry(1));
+            } finally {
+                first.close();
+            }
+
+            TestEntry secondResult = secondFuture.get(5, TimeUnit.SECONDS);
+            assertSame(inserted, secondResult);
+            assertEquals(1, ConcurrentHashtable.estimateSize(state));
+        } finally {
+            executor.shutdown();
+        }
+    }
+
+    @Test
+    void reusingAReservationForASecondCompletionThrows() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 2);
+        try (ConcurrentHashtable.Reservation<TestEntry> r = ConcurrentHashtable.tryReserve(state, 1)) {
+            r.tryGetOrInsertOrNull(1, TestEntry::new);
+            assertThrows(IllegalStateException.class, () -> r.tryGetOrInsertOrNull(2, TestEntry::new));
+        }
+        assertEquals(1, ConcurrentHashtable.estimateSize(state));
     }
-    assertEquals(1, ConcurrentHashtable.estimateSize(state));
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableSizeManagerTest.java b/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableSizeManagerTest.java
index cd6a6aafc1e..54f6a4f3039 100644
--- a/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableSizeManagerTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableSizeManagerTest.java
@@ -20,457 +20,436 @@
  */
 class ConcurrentHashtableSizeManagerTest {
 
-  @Test
-  void tryReserveSucceedsUnderCapacityAndFailsWhenFull() {
-    ConcurrentHashtable.SizeManager sizeManager = new ConcurrentHashtable.SizeManager(2);
-    assertEquals(0, sizeManager.estimateSize());
-    assertFalse(sizeManager.isFull());
-
-    assertTrue(sizeManager.tryReserve());
-    assertEquals(1, sizeManager.estimateSize());
-    assertFalse(sizeManager.isFull());
-
-    assertTrue(sizeManager.tryReserve());
-    assertEquals(2, sizeManager.estimateSize());
-    assertTrue(sizeManager.isFull());
-
-    assertFalse(sizeManager.tryReserve());
-    assertEquals(2, sizeManager.estimateSize());
-  }
-
-  @Test
-  void tryReserveOrEvictReservesDirectlyWhenUnderCapacity() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 2);
-
-    boolean reserved = tryReserveOrEvict(state, e -> true);
-    assertTrue(reserved);
-    assertEquals(1, state.sizeManager.estimateSize());
-    assertNull(state.buckets.get(0)); // nothing was evicted
-  }
-
-  @Test
-  void tryReserveOrEvictEvictsWhenFullAndSomethingMatches() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 1);
-    TestEntry existing = insertAt(state, 0, "existing");
-    assertTrue(state.sizeManager.tryReserve());
-    assertTrue(state.sizeManager.isFull());
-
-    boolean reserved = tryReserveOrEvict(state, e -> true);
-    assertTrue(reserved);
-    assertEquals(1, state.sizeManager.estimateSize()); // one evicted, one reserved: net unchanged
-    assertNull(state.buckets.get(0)); // existing was unlinked
-  }
-
-  @Test
-  void tryReserveOrEvictFailsAndLeavesTableUntouchedWhenNothingEvictable() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 1);
-    TestEntry existing = insertAt(state, 0, "existing");
-    assertTrue(state.sizeManager.tryReserve());
-
-    boolean reserved = tryReserveOrEvict(state, e -> false);
-    assertFalse(reserved);
-    assertEquals(1, state.sizeManager.estimateSize());
-    assertSame(existing, state.buckets.get(0));
-  }
-
-  @Test
-  void insertReservedSplicesWithoutTouchingTheCountAfterATryReserve() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 2);
-    assertTrue(state.sizeManager.tryReserve());
-    assertEquals(1, state.sizeManager.estimateSize());
-
-    TestEntry entry = new TestEntry(0, "reserved");
-    ReentrantLock lock = ConcurrentHashtable.getTableWriteLock(state);
-    lock.lock();
-    try {
-      ConcurrentHashtable.insertReserved(state, entry.keyHash, entry);
-    } finally {
-      lock.unlock();
+    @Test
+    void tryReserveSucceedsUnderCapacityAndFailsWhenFull() {
+        ConcurrentHashtable.SizeManager sizeManager = new ConcurrentHashtable.SizeManager(2);
+        assertEquals(0, sizeManager.estimateSize());
+        assertFalse(sizeManager.isFull());
+
+        assertTrue(sizeManager.tryReserve());
+        assertEquals(1, sizeManager.estimateSize());
+        assertFalse(sizeManager.isFull());
+
+        assertTrue(sizeManager.tryReserve());
+        assertEquals(2, sizeManager.estimateSize());
+        assertTrue(sizeManager.isFull());
+
+        assertFalse(sizeManager.tryReserve());
+        assertEquals(2, sizeManager.estimateSize());
     }
 
-    assertSame(entry, state.buckets.get(0));
-    // Count reflects only the earlier tryReserve() -- insertReserved must not increment again.
-    assertEquals(1, state.sizeManager.estimateSize());
-  }
-
-  @Test
-  void evictOneReturnsNullAndLeavesCountUnchangedWhenNothingMatches() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 4);
-    insertAt(state, 0, "a");
-    state.sizeManager.increment();
-
-    TestEntry evicted = evictOne(state, e -> false);
-    assertNull(evicted);
-    assertEquals(1, state.sizeManager.estimateSize());
-  }
-
-  @Test
-  void evictOneUnlinksMatchAndDecrementsCount() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 4);
-    TestEntry a = insertAt(state, 0, "a");
-    TestEntry b = insertAt(state, 1, "b");
-    state.sizeManager.increment();
-    state.sizeManager.increment();
-
-    TestEntry evicted = evictOne(state, e -> e.label.equals("a"));
-    assertSame(a, evicted);
-    assertNull(state.buckets.get(0));
-    assertSame(b, state.buckets.get(1)); // untouched
-    assertEquals(1, state.sizeManager.estimateSize());
-  }
-
-  /**
-   * Verifies the cursor-resume contract from {@link ConcurrentHashtable.SizeManager#evictOne}: each
-   * scan resumes where the previous eviction left off, so among several equally-matching candidates
-   * the one nearest (forward from the cursor, wrapping) is picked first -- not always the lowest
-   * bucket index.
-   */
-  @Test
-  void evictOneResumesFromLastEvictedBucketAndWrapsAround() {
-    // Bucket-array length 4: keyHash i lands in bucket i.
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 4);
-    TestEntry e0 = insertAt(state, 0, "e0");
-    insertAt(state, 2, "e2");
-    TestEntry e3 = insertAt(state, 3, "e3");
-    state.sizeManager.increment();
-    state.sizeManager.increment();
-    state.sizeManager.increment();
-
-    // First eviction: scan starts at cursor 0, finds bucket 2 first among evictable entries
-    // (only e2 matches here) -- sets the cursor to 2.
-    TestEntry firstEvicted = evictOne(state, e -> e.label.equals("e2"));
-    assertEquals("e2", firstEvicted.label);
-
-    // Second eviction: both e0 (bucket 0) and e3 (bucket 3) match. Scanning resumes at the
-    // cursor (2) and goes forward before wrapping, so bucket 3 (e3) is found before bucket 0.
-    TestEntry secondEvicted = evictOne(state, e -> true);
-    assertSame(e3, secondEvicted);
-    assertSame(e0, state.buckets.get(0)); // e0 not yet touched
-
-    // Third eviction: only e0 remains. The cursor is now past bucket 3, so the scan must wrap
-    // around to bucket 0 to find it.
-    TestEntry thirdEvicted = evictOne(state, e -> true);
-    assertSame(e0, thirdEvicted);
-    assertEquals(0, state.sizeManager.estimateSize());
-  }
-
-  @Test
-  void evictAllRemovesEveryMatchAndReturnsCount() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 8);
-    for (int i = 0; i < 6; i++) {
-      insertAt(state, i, "e" + i);
-      state.sizeManager.increment();
+    @Test
+    void tryReserveOrEvictReservesDirectlyWhenUnderCapacity() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 2);
+
+        boolean reserved = tryReserveOrEvict(state, e -> true);
+        assertTrue(reserved);
+        assertEquals(1, state.sizeManager.estimateSize());
+        assertNull(state.buckets.get(0)); // nothing was evicted
     }
-    // Evict everything except bucket 1 and bucket 4.
-    int count = evictAll(state, e -> !e.label.equals("e1") && !e.label.equals("e4"));
-
-    assertEquals(4, count);
-    assertEquals(2, state.sizeManager.estimateSize());
-    assertNotNullLabel(state, 1, "e1");
-    assertNotNullLabel(state, 4, "e4");
-    for (int i : new int[] {0, 2, 3, 5}) {
-      assertNull(state.buckets.get(i));
+
+    @Test
+    void tryReserveOrEvictEvictsWhenFullAndSomethingMatches() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 1);
+        TestEntry existing = insertAt(state, 0, "existing");
+        assertTrue(state.sizeManager.tryReserve());
+        assertTrue(state.sizeManager.isFull());
+
+        boolean reserved = tryReserveOrEvict(state, e -> true);
+        assertTrue(reserved);
+        assertEquals(1, state.sizeManager.estimateSize()); // one evicted, one reserved: net unchanged
+        assertNull(state.buckets.get(0)); // existing was unlinked
     }
-  }
-
-  @Test
-  void evictAllResetsCursorSoSubsequentEvictOneScansFromBucketZero() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 4);
-    insertAt(state, 2, "a");
-    state.sizeManager.increment();
-    // Advance the cursor away from 0 via a successful eviction at bucket 2.
-    evictOne(state, e -> true);
-
-    // A full pass that removes nothing still resets the scan position (per evictAll's contract).
-    int count = evictAll(state, e -> false);
-    assertEquals(0, count);
-
-    TestEntry e0 = insertAt(state, 0, "e0");
-    TestEntry e3 = insertAt(state, 3, "e3");
-    state.sizeManager.increment();
-    state.sizeManager.increment();
-
-    // With the cursor reset to 0, the forward scan reaches bucket 0 before bucket 3.
-    TestEntry evicted = evictOne(state, e -> true);
-    assertSame(e0, evicted);
-    assertSame(e3, state.buckets.get(3));
-  }
-
-  @Test
-  void releaseGivesBackRemovedSlotsAndRestartsScan() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 4);
-    insertAt(state, 2, "a");
-    state.sizeManager.increment();
-    evictOne(state, e -> true); // advances the cursor to 2, count back to 0
-    state.sizeManager.increment(); // pretend a fresh entry was inserted
-
-    // One entry is live and counted; releasing that one slot brings the count back to zero and
-    // restarts the scan -- unlike a blanket zeroing, this only gives back what was removed.
-    state.sizeManager.release(1);
-    assertEquals(0, state.sizeManager.estimateSize());
-
-    TestEntry e0 = insertAt(state, 0, "e0");
-    TestEntry e3 = insertAt(state, 3, "e3");
-    state.sizeManager.increment();
-    state.sizeManager.increment();
-    TestEntry evicted = evictOne(state, e -> true);
-    assertSame(e0, evicted); // scan restarted from bucket 0, per release()
-    assertSame(e3, state.buckets.get(3));
-  }
-
-  @Test
-  void stateCreateCappedBundlesBucketsAndSizeManager() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 3);
-    assertEquals(0, state.sizeManager.estimateSize());
-    assertEquals(3, state.sizeManager.capacity());
-    assertTrue(state.buckets.length() >= 3);
-  }
-
-  @Test
-  void stateLevelTryReserveOrEvictAndEvictOneAndEvictAllDelegateToSizeManager() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 1);
-    ReentrantLock lockAt0 = ConcurrentHashtable.getWriteLockAt(state, 0);
-    lockAt0.lock();
-    try {
-      ConcurrentHashtable.insertHeadEntryAt(state, 0, new TestEntry(0, "a"));
-    } finally {
-      lockAt0.unlock();
+
+    @Test
+    void tryReserveOrEvictFailsAndLeavesTableUntouchedWhenNothingEvictable() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 1);
+        TestEntry existing = insertAt(state, 0, "existing");
+        assertTrue(state.sizeManager.tryReserve());
+
+        boolean reserved = tryReserveOrEvict(state, e -> false);
+        assertFalse(reserved);
+        assertEquals(1, state.sizeManager.estimateSize());
+        assertSame(existing, state.buckets.get(0));
     }
-    state.sizeManager.increment();
-    assertTrue(ConcurrentHashtable.isFull(state));
-
-    // Table is full: tryReserveOrEvict evicts "a" and reserves the freed slot for the caller, who
-    // is now responsible for splicing in the entry that occupies it -- via insertReserved, since
-    // the reservation already happened and a plain insertHeadEntryAt/increment would double-count.
-    // Both steps go in ONE critical section: tryReserveOrEvict is self-locking, so on its own it
-    // leaves a window where a drain/clear could reset the count out from under the reservation.
-    ReentrantLock tableLock = ConcurrentHashtable.getTableWriteLock(state);
-    tableLock.lock();
-    try {
-      boolean reserved = ConcurrentHashtable.tryReserveOrEvict(state, e -> true);
-      assertTrue(reserved);
-      assertEquals(1, ConcurrentHashtable.estimateSize(state));
-      assertNull(state.buckets.get(0)); // "a" was evicted; the reserved slot has no entry yet
-      ConcurrentHashtable.insertReserved(state, 0, new TestEntry(0, "reserved"));
-    } finally {
-      tableLock.unlock();
+
+    @Test
+    void insertReservedSplicesWithoutTouchingTheCountAfterATryReserve() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 2);
+        assertTrue(state.sizeManager.tryReserve());
+        assertEquals(1, state.sizeManager.estimateSize());
+
+        TestEntry entry = new TestEntry(0, "reserved");
+        ReentrantLock lock = ConcurrentHashtable.getTableWriteLock(state);
+        lock.lock();
+        try {
+            ConcurrentHashtable.insertReserved(state, entry.keyHash, entry);
+        } finally {
+            lock.unlock();
+        }
+
+        assertSame(entry, state.buckets.get(0));
+        // Count reflects only the earlier tryReserve() -- insertReserved must not increment again.
+        assertEquals(1, state.sizeManager.estimateSize());
     }
 
-    int evicted = ConcurrentHashtable.evictAll(state, e -> true);
-    assertEquals(1, evicted);
-    assertEquals(0, ConcurrentHashtable.estimateSize(state));
-    assertFalse(ConcurrentHashtable.isFull(state));
+    @Test
+    void evictOneReturnsNullAndLeavesCountUnchangedWhenNothingMatches() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 4);
+        insertAt(state, 0, "a");
+        state.sizeManager.increment();
 
-    lockAt0.lock();
-    try {
-      ConcurrentHashtable.insertHeadEntryAt(state, 0, new TestEntry(0, "b"));
-    } finally {
-      lockAt0.unlock();
+        TestEntry evicted = evictOne(state, e -> false);
+        assertNull(evicted);
+        assertEquals(1, state.sizeManager.estimateSize());
     }
-    state.sizeManager.increment();
-    TestEntry viaEvictOne = ConcurrentHashtable.evictOne(state, e -> e.label.equals("b"));
-    assertNotNull(viaEvictOne);
-    assertEquals("b", viaEvictOne.label);
-    assertEquals(0, ConcurrentHashtable.estimateSize(state));
-  }
-
-  /**
-   * Holding the table lock across {@code tryReserveOrEvict} + {@code insertReserved} still keeps a
-   * concurrent {@link ConcurrentHashtable#clear(ConcurrentHashtable.State)} out of the gap -- the
-   * belt-and-braces version of the protocol. {@link
-   * #reservationSurvivesAClearLandingBetweenReserveAndInsert()} covers the case that matters more
-   * now: the pair does not actually need one critical section.
-   */
-  @Test
-  void clearCannotInterleaveBetweenReservationAndInsert() throws InterruptedException {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 1);
-    insertAt(state, 0, "a");
-    state.sizeManager.increment();
-    assertTrue(ConcurrentHashtable.isFull(state));
-
-    Thread clearer = new Thread(() -> ConcurrentHashtable.clear(state), "clearer");
-    ReentrantLock lock = ConcurrentHashtable.getTableWriteLock(state);
-    lock.lock();
-    try {
-      clearer.start();
-      // Wait until the clear is definitely queued on the lock we hold, so the interleaving under
-      // test is the one actually attempted rather than one the scheduler happened to avoid.
-      new PollingConditions()
-          .eventually(() -> assertEquals(Thread.State.WAITING, clearer.getState()));
-
-      assertTrue(ConcurrentHashtable.tryReserveOrEvict(state, e -> true));
-      ConcurrentHashtable.insertReserved(state, 0, new TestEntry(0, "reserved"));
-      assertEquals(1, ConcurrentHashtable.estimateSize(state));
-    } finally {
-      lock.unlock();
+
+    @Test
+    void evictOneUnlinksMatchAndDecrementsCount() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 4);
+        TestEntry a = insertAt(state, 0, "a");
+        TestEntry b = insertAt(state, 1, "b");
+        state.sizeManager.increment();
+        state.sizeManager.increment();
+
+        TestEntry evicted = evictOne(state, e -> e.label.equals("a"));
+        assertSame(a, evicted);
+        assertNull(state.buckets.get(0));
+        assertSame(b, state.buckets.get(1)); // untouched
+        assertEquals(1, state.sizeManager.estimateSize());
     }
-    clearer.join();
-
-    // The clear ran strictly after the pair, so the table is exactly post-clear: no entry, no
-    // count, and -- the point -- the two agree.
-    assertEquals(0, ConcurrentHashtable.estimateSize(state));
-    assertNull(state.buckets.get(0));
-    assertFalse(ConcurrentHashtable.isFull(state));
-  }
-
-  /**
-   * A clear landing squarely between the reservation and the insert must not void the reservation.
-   * It cannot, because {@link ConcurrentHashtable.SizeManager#release(int)} subtracts what the
-   * sweep removed instead of zeroing the count -- so the claim taken before the clear is still a
-   * claim after it, and the entry the caller then links is accounted for.
-   *
-   * <p>Zeroing would leave the count one below reality here, permanently: eviction decrements too,
-   * so nothing later repairs it, and a capped table admits one extra entry from then on.
-   */
-  @Test
-  void reservationSurvivesAClearLandingBetweenReserveAndInsert() {
-    ConcurrentHashtable.State<TestEntry> state =
-        ConcurrentHashtable.createBounded(TestEntry.class, 2);
-    insertAt(state, 0, "a");
-    state.sizeManager.increment();
-
-    // Reserve, with no lock held across what follows.
-    assertTrue(ConcurrentHashtable.tryReserveOrEvict(state, e -> false));
-    assertEquals(2, ConcurrentHashtable.estimateSize(state)); // "a" plus our reservation
-
-    // The sweep lands in the gap, removing the one entry that exists. Our slot is not its to give
-    // back, so the count drops by exactly one.
-    ConcurrentHashtable.clear(state);
-    assertEquals(1, ConcurrentHashtable.estimateSize(state));
-
-    // The reservation is still good, and filling it leaves the count matching the entries present.
-    ReentrantLock lockAt0 = ConcurrentHashtable.getWriteLockAt(state, 0);
-    lockAt0.lock();
-    try {
-      ConcurrentHashtable.insertReserved(state, 0, new TestEntry(0, "reserved"));
-    } finally {
-      lockAt0.unlock();
+
+    /**
+     * Verifies the cursor-resume contract from {@link ConcurrentHashtable.SizeManager#evictOne}: each
+     * scan resumes where the previous eviction left off, so among several equally-matching candidates
+     * the one nearest (forward from the cursor, wrapping) is picked first -- not always the lowest
+     * bucket index.
+     */
+    @Test
+    void evictOneResumesFromLastEvictedBucketAndWrapsAround() {
+        // Bucket-array length 4: keyHash i lands in bucket i.
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 4);
+        TestEntry e0 = insertAt(state, 0, "e0");
+        insertAt(state, 2, "e2");
+        TestEntry e3 = insertAt(state, 3, "e3");
+        state.sizeManager.increment();
+        state.sizeManager.increment();
+        state.sizeManager.increment();
+
+        // First eviction: scan starts at cursor 0, finds bucket 2 first among evictable entries
+        // (only e2 matches here) -- sets the cursor to 2.
+        TestEntry firstEvicted = evictOne(state, e -> e.label.equals("e2"));
+        assertEquals("e2", firstEvicted.label);
+
+        // Second eviction: both e0 (bucket 0) and e3 (bucket 3) match. Scanning resumes at the
+        // cursor (2) and goes forward before wrapping, so bucket 3 (e3) is found before bucket 0.
+        TestEntry secondEvicted = evictOne(state, e -> true);
+        assertSame(e3, secondEvicted);
+        assertSame(e0, state.buckets.get(0)); // e0 not yet touched
+
+        // Third eviction: only e0 remains. The cursor is now past bucket 3, so the scan must wrap
+        // around to bucket 0 to find it.
+        TestEntry thirdEvicted = evictOne(state, e -> true);
+        assertSame(e0, thirdEvicted);
+        assertEquals(0, state.sizeManager.estimateSize());
     }
-    assertEquals(1, ConcurrentHashtable.estimateSize(state));
-    assertNotNullLabel(state, 0, "reserved");
-    assertFalse(ConcurrentHashtable.isFull(state));
-  }
-
-  /**
-   * Two reservers racing at the cap cannot both get through: {@code tryReserve} claims first and
-   * refunds on overshoot, so the count is never left above {@link
-   * ConcurrentHashtable.SizeManager#capacity()} once both have finished -- and it achieves that
-   * without a lock.
-   */
-  @Test
-  void concurrentReserversCannotBothPassTheCap() throws InterruptedException {
-    for (int attempt = 0; attempt < 200; attempt++) {
-      ConcurrentHashtable.SizeManager sizeManager = new ConcurrentHashtable.SizeManager(1);
-      java.util.concurrent.atomic.AtomicInteger granted =
-          new java.util.concurrent.atomic.AtomicInteger();
-      java.util.concurrent.CountDownLatch start = new java.util.concurrent.CountDownLatch(1);
-      Runnable reserve =
-          () -> {
-            try {
-              start.await();
-            } catch (InterruptedException e) {
-              Thread.currentThread().interrupt();
-              return;
-            }
-            if (sizeManager.tryReserve()) {
-              granted.incrementAndGet();
-            }
-          };
-      Thread t1 = new Thread(reserve, "reserve-1");
-      Thread t2 = new Thread(reserve, "reserve-2");
-      t1.start();
-      t2.start();
-      start.countDown();
-      t1.join();
-      t2.join();
-
-      assertEquals(1, granted.get(), "exactly one reserver should win a capacity of 1");
-      assertEquals(1, sizeManager.estimateSize());
+
+    @Test
+    void evictAllRemovesEveryMatchAndReturnsCount() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 8);
+        for (int i = 0; i < 6; i++) {
+            insertAt(state, i, "e" + i);
+            state.sizeManager.increment();
+        }
+        // Evict everything except bucket 1 and bucket 4.
+        int count = evictAll(state, e -> !e.label.equals("e1") && !e.label.equals("e4"));
+
+        assertEquals(4, count);
+        assertEquals(2, state.sizeManager.estimateSize());
+        assertNotNullLabel(state, 1, "e1");
+        assertNotNullLabel(state, 4, "e4");
+        for (int i : new int[] {0, 2, 3, 5}) {
+            assertNull(state.buckets.get(i));
+        }
     }
-  }
-
-  private static void assertNotNullLabel(
-      ConcurrentHashtable.State<TestEntry> state, int index, String label) {
-    TestEntry e = state.buckets.get(index);
-    assertNotNull(e);
-    assertEquals(label, e.label);
-  }
-
-  /** Inserts a fresh entry at the given bucket index. Bucket-array length must exceed index. */
-  private static TestEntry insertAt(
-      ConcurrentHashtable.State<TestEntry> state, int index, String label) {
-    TestEntry entry = new TestEntry(index, label);
-    ReentrantLock lock = ConcurrentHashtable.getWriteLockAt(state, index);
-    lock.lock();
-    try {
-      ConcurrentHashtable.insertHeadEntryAt(state, index, entry);
-    } finally {
-      lock.unlock();
+
+    @Test
+    void evictAllResetsCursorSoSubsequentEvictOneScansFromBucketZero() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 4);
+        insertAt(state, 2, "a");
+        state.sizeManager.increment();
+        // Advance the cursor away from 0 via a successful eviction at bucket 2.
+        evictOne(state, e -> true);
+
+        // A full pass that removes nothing still resets the scan position (per evictAll's contract).
+        int count = evictAll(state, e -> false);
+        assertEquals(0, count);
+
+        TestEntry e0 = insertAt(state, 0, "e0");
+        TestEntry e3 = insertAt(state, 3, "e3");
+        state.sizeManager.increment();
+        state.sizeManager.increment();
+
+        // With the cursor reset to 0, the forward scan reaches bucket 0 before bucket 3.
+        TestEntry evicted = evictOne(state, e -> true);
+        assertSame(e0, evicted);
+        assertSame(e3, state.buckets.get(3));
     }
-    return entry;
-  }
-
-  /** {@code sizeManager.tryReserveOrEvict}, taking the write lock {@code @GuardedBy} requires. */
-  private static boolean tryReserveOrEvict(
-      ConcurrentHashtable.State<TestEntry> state, Predicate<TestEntry> evictable) {
-    ReentrantLock lock = ConcurrentHashtable.getTableWriteLock(state);
-    lock.lock();
-    try {
-      return state.sizeManager.tryReserveOrEvict(state.buckets, evictable);
-    } finally {
-      lock.unlock();
+
+    @Test
+    void releaseGivesBackRemovedSlotsAndRestartsScan() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 4);
+        insertAt(state, 2, "a");
+        state.sizeManager.increment();
+        evictOne(state, e -> true); // advances the cursor to 2, count back to 0
+        state.sizeManager.increment(); // pretend a fresh entry was inserted
+
+        // One entry is live and counted; releasing that one slot brings the count back to zero and
+        // restarts the scan -- unlike a blanket zeroing, this only gives back what was removed.
+        state.sizeManager.release(1);
+        assertEquals(0, state.sizeManager.estimateSize());
+
+        TestEntry e0 = insertAt(state, 0, "e0");
+        TestEntry e3 = insertAt(state, 3, "e3");
+        state.sizeManager.increment();
+        state.sizeManager.increment();
+        TestEntry evicted = evictOne(state, e -> true);
+        assertSame(e0, evicted); // scan restarted from bucket 0, per release()
+        assertSame(e3, state.buckets.get(3));
     }
-  }
-
-  /** {@code sizeManager.evictOne}, taking the write lock {@code @GuardedBy} requires. */
-  private static TestEntry evictOne(
-      ConcurrentHashtable.State<TestEntry> state, Predicate<TestEntry> evictable) {
-    ReentrantLock lock = ConcurrentHashtable.getTableWriteLock(state);
-    lock.lock();
-    try {
-      return state.sizeManager.evictOne(state.buckets, evictable);
-    } finally {
-      lock.unlock();
+
+    @Test
+    void stateCreateCappedBundlesBucketsAndSizeManager() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 3);
+        assertEquals(0, state.sizeManager.estimateSize());
+        assertEquals(3, state.sizeManager.capacity());
+        assertTrue(state.buckets.length() >= 3);
     }
-  }
-
-  /** {@code sizeManager.evictAll}, taking the write lock {@code @GuardedBy} requires. */
-  private static int evictAll(
-      ConcurrentHashtable.State<TestEntry> state, Predicate<TestEntry> evictable) {
-    ReentrantLock lock = ConcurrentHashtable.getTableWriteLock(state);
-    lock.lock();
-    try {
-      return state.sizeManager.evictAll(state.buckets, evictable);
-    } finally {
-      lock.unlock();
+
+    @Test
+    void stateLevelTryReserveOrEvictAndEvictOneAndEvictAllDelegateToSizeManager() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 1);
+        ReentrantLock lockAt0 = ConcurrentHashtable.getWriteLockAt(state, 0);
+        lockAt0.lock();
+        try {
+            ConcurrentHashtable.insertHeadEntryAt(state, 0, new TestEntry(0, "a"));
+        } finally {
+            lockAt0.unlock();
+        }
+        state.sizeManager.increment();
+        assertTrue(ConcurrentHashtable.isFull(state));
+
+        // Table is full: tryReserveOrEvict evicts "a" and reserves the freed slot for the caller, who
+        // is now responsible for splicing in the entry that occupies it -- via insertReserved, since
+        // the reservation already happened and a plain insertHeadEntryAt/increment would double-count.
+        // Both steps go in ONE critical section: tryReserveOrEvict is self-locking, so on its own it
+        // leaves a window where a drain/clear could reset the count out from under the reservation.
+        ReentrantLock tableLock = ConcurrentHashtable.getTableWriteLock(state);
+        tableLock.lock();
+        try {
+            boolean reserved = ConcurrentHashtable.tryReserveOrEvict(state, e -> true);
+            assertTrue(reserved);
+            assertEquals(1, ConcurrentHashtable.estimateSize(state));
+            assertNull(state.buckets.get(0)); // "a" was evicted; the reserved slot has no entry yet
+            ConcurrentHashtable.insertReserved(state, 0, new TestEntry(0, "reserved"));
+        } finally {
+            tableLock.unlock();
+        }
+
+        int evicted = ConcurrentHashtable.evictAll(state, e -> true);
+        assertEquals(1, evicted);
+        assertEquals(0, ConcurrentHashtable.estimateSize(state));
+        assertFalse(ConcurrentHashtable.isFull(state));
+
+        lockAt0.lock();
+        try {
+            ConcurrentHashtable.insertHeadEntryAt(state, 0, new TestEntry(0, "b"));
+        } finally {
+            lockAt0.unlock();
+        }
+        state.sizeManager.increment();
+        TestEntry viaEvictOne = ConcurrentHashtable.evictOne(state, e -> e.label.equals("b"));
+        assertNotNull(viaEvictOne);
+        assertEquals("b", viaEvictOne.label);
+        assertEquals(0, ConcurrentHashtable.estimateSize(state));
     }
-  }
 
-  /** Entry with a caller-controlled {@code keyHash} so tests can place it in an exact bucket. */
-  private static final class TestEntry extends ConcurrentHashtable.Entry<TestEntry> {
-    final String label;
+    /**
+     * Holding the table lock across {@code tryReserveOrEvict} + {@code insertReserved} still keeps a
+     * concurrent {@link ConcurrentHashtable#clear(ConcurrentHashtable.State)} out of the gap -- the
+     * belt-and-braces version of the protocol. {@link
+     * #reservationSurvivesAClearLandingBetweenReserveAndInsert()} covers the case that matters more
+     * now: the pair does not actually need one critical section.
+     */
+    @Test
+    void clearCannotInterleaveBetweenReservationAndInsert() throws InterruptedException {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 1);
+        insertAt(state, 0, "a");
+        state.sizeManager.increment();
+        assertTrue(ConcurrentHashtable.isFull(state));
+
+        Thread clearer = new Thread(() -> ConcurrentHashtable.clear(state), "clearer");
+        ReentrantLock lock = ConcurrentHashtable.getTableWriteLock(state);
+        lock.lock();
+        try {
+            clearer.start();
+            // Wait until the clear is definitely queued on the lock we hold, so the interleaving under
+            // test is the one actually attempted rather than one the scheduler happened to avoid.
+            new PollingConditions().eventually(() -> assertEquals(Thread.State.WAITING, clearer.getState()));
+
+            assertTrue(ConcurrentHashtable.tryReserveOrEvict(state, e -> true));
+            ConcurrentHashtable.insertReserved(state, 0, new TestEntry(0, "reserved"));
+            assertEquals(1, ConcurrentHashtable.estimateSize(state));
+        } finally {
+            lock.unlock();
+        }
+        clearer.join();
+
+        // The clear ran strictly after the pair, so the table is exactly post-clear: no entry, no
+        // count, and -- the point -- the two agree.
+        assertEquals(0, ConcurrentHashtable.estimateSize(state));
+        assertNull(state.buckets.get(0));
+        assertFalse(ConcurrentHashtable.isFull(state));
+    }
 
-    TestEntry(long keyHash, String label) {
-      super(keyHash);
-      this.label = label;
+    /**
+     * A clear landing squarely between the reservation and the insert must not void the reservation.
+     * It cannot, because {@link ConcurrentHashtable.SizeManager#release(int)} subtracts what the
+     * sweep removed instead of zeroing the count -- so the claim taken before the clear is still a
+     * claim after it, and the entry the caller then links is accounted for.
+     *
+     * <p>Zeroing would leave the count one below reality here, permanently: eviction decrements too,
+     * so nothing later repairs it, and a capped table admits one extra entry from then on.
+     */
+    @Test
+    void reservationSurvivesAClearLandingBetweenReserveAndInsert() {
+        ConcurrentHashtable.State<TestEntry> state = ConcurrentHashtable.createBounded(TestEntry.class, 2);
+        insertAt(state, 0, "a");
+        state.sizeManager.increment();
+
+        // Reserve, with no lock held across what follows.
+        assertTrue(ConcurrentHashtable.tryReserveOrEvict(state, e -> false));
+        assertEquals(2, ConcurrentHashtable.estimateSize(state)); // "a" plus our reservation
+
+        // The sweep lands in the gap, removing the one entry that exists. Our slot is not its to give
+        // back, so the count drops by exactly one.
+        ConcurrentHashtable.clear(state);
+        assertEquals(1, ConcurrentHashtable.estimateSize(state));
+
+        // The reservation is still good, and filling it leaves the count matching the entries present.
+        ReentrantLock lockAt0 = ConcurrentHashtable.getWriteLockAt(state, 0);
+        lockAt0.lock();
+        try {
+            ConcurrentHashtable.insertReserved(state, 0, new TestEntry(0, "reserved"));
+        } finally {
+            lockAt0.unlock();
+        }
+        assertEquals(1, ConcurrentHashtable.estimateSize(state));
+        assertNotNullLabel(state, 0, "reserved");
+        assertFalse(ConcurrentHashtable.isFull(state));
     }
 
-    @Override
-    public boolean matches(TestEntry other) {
-      return label.equals(other.label);
+    /**
+     * Two reservers racing at the cap cannot both get through: {@code tryReserve} claims first and
+     * refunds on overshoot, so the count is never left above {@link
+     * ConcurrentHashtable.SizeManager#capacity()} once both have finished -- and it achieves that
+     * without a lock.
+     */
+    @Test
+    void concurrentReserversCannotBothPassTheCap() throws InterruptedException {
+        for (int attempt = 0; attempt < 200; attempt++) {
+            ConcurrentHashtable.SizeManager sizeManager = new ConcurrentHashtable.SizeManager(1);
+            java.util.concurrent.atomic.AtomicInteger granted = new java.util.concurrent.atomic.AtomicInteger();
+            java.util.concurrent.CountDownLatch start = new java.util.concurrent.CountDownLatch(1);
+            Runnable reserve = () -> {
+                try {
+                    start.await();
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    return;
+                }
+                if (sizeManager.tryReserve()) {
+                    granted.incrementAndGet();
+                }
+            };
+            Thread t1 = new Thread(reserve, "reserve-1");
+            Thread t2 = new Thread(reserve, "reserve-2");
+            t1.start();
+            t2.start();
+            start.countDown();
+            t1.join();
+            t2.join();
+
+            assertEquals(1, granted.get(), "exactly one reserver should win a capacity of 1");
+            assertEquals(1, sizeManager.estimateSize());
+        }
+    }
+
+    private static void assertNotNullLabel(ConcurrentHashtable.State<TestEntry> state, int index, String label) {
+        TestEntry e = state.buckets.get(index);
+        assertNotNull(e);
+        assertEquals(label, e.label);
+    }
+
+    /** Inserts a fresh entry at the given bucket index. Bucket-array length must exceed index. */
+    private static TestEntry insertAt(ConcurrentHashtable.State<TestEntry> state, int index, String label) {
+        TestEntry entry = new TestEntry(index, label);
+        ReentrantLock lock = ConcurrentHashtable.getWriteLockAt(state, index);
+        lock.lock();
+        try {
+            ConcurrentHashtable.insertHeadEntryAt(state, index, entry);
+        } finally {
+            lock.unlock();
+        }
+        return entry;
+    }
+
+    /** {@code sizeManager.tryReserveOrEvict}, taking the write lock {@code @GuardedBy} requires. */
+    private static boolean tryReserveOrEvict(
+            ConcurrentHashtable.State<TestEntry> state, Predicate<TestEntry> evictable) {
+        ReentrantLock lock = ConcurrentHashtable.getTableWriteLock(state);
+        lock.lock();
+        try {
+            return state.sizeManager.tryReserveOrEvict(state.buckets, evictable);
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    /** {@code sizeManager.evictOne}, taking the write lock {@code @GuardedBy} requires. */
+    private static TestEntry evictOne(ConcurrentHashtable.State<TestEntry> state, Predicate<TestEntry> evictable) {
+        ReentrantLock lock = ConcurrentHashtable.getTableWriteLock(state);
+        lock.lock();
+        try {
+            return state.sizeManager.evictOne(state.buckets, evictable);
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    /** {@code sizeManager.evictAll}, taking the write lock {@code @GuardedBy} requires. */
+    private static int evictAll(ConcurrentHashtable.State<TestEntry> state, Predicate<TestEntry> evictable) {
+        ReentrantLock lock = ConcurrentHashtable.getTableWriteLock(state);
+        lock.lock();
+        try {
+            return state.sizeManager.evictAll(state.buckets, evictable);
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    /** Entry with a caller-controlled {@code keyHash} so tests can place it in an exact bucket. */
+    private static final class TestEntry extends ConcurrentHashtable.Entry<TestEntry> {
+        final String label;
+
+        TestEntry(long keyHash, String label) {
+            super(keyHash);
+            this.label = label;
+        }
+
+        @Override
+        public boolean matches(TestEntry other) {
+            return label.equals(other.label);
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableStaticsTest.java b/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableStaticsTest.java
index 8be6e791b9e..ee5074a8829 100644
--- a/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableStaticsTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/ConcurrentHashtableStaticsTest.java
@@ -26,409 +26,389 @@
  */
 class ConcurrentHashtableStaticsTest {
 
-  @Test
-  void sizeForRoundsUpToPowerOfTwo() {
-    assertEquals(1, ConcurrentHashtable.sizeFor(1));
-    assertEquals(8, ConcurrentHashtable.sizeFor(5));
-    assertEquals(8, ConcurrentHashtable.sizeFor(8));
-    assertEquals(16, ConcurrentHashtable.sizeFor(9));
-  }
-
-  @Test
-  void createFixedBucketsAllocatesPowerOfTwoSpine() {
-    AtomicReferenceArray<IntEntry> buckets =
-        ConcurrentHashtable.createFixedBuckets(IntEntry.class, 10);
-    assertEquals(16, buckets.length());
-    assertNull(buckets.get(0));
-  }
-
-  @Test
-  void getWriteLockIsStableAndNonNull() {
-    AtomicReferenceArray<IntEntry> buckets =
-        ConcurrentHashtable.createFixedBuckets(IntEntry.class, 8);
-    Object lock = ConcurrentHashtable.getWriteLock(buckets, 3L);
-    assertNotNull(lock);
-    assertSame(lock, ConcurrentHashtable.getWriteLock(buckets, 3L));
-    // The keyHash form is defined as the index form under bucketIndex.
-    assertSame(
-        lock,
-        ConcurrentHashtable.getWriteLockAt(buckets, ConcurrentHashtable.bucketIndex(buckets, 3L)));
-  }
-
-  /**
-   * The three accessors name three scopes, but a single-lock table answers all of them with one
-   * monitor. Asserting that pins today's granularity as a deliberate choice rather than an
-   * accident: if it ever changes, this is the test that says so, and callers that asked for the
-   * scope they actually mutate keep working.
-   */
-  @Test
-  void allWriteLockScopesResolveToOneMonitorToday() {
-    AtomicReferenceArray<IntEntry> buckets =
-        ConcurrentHashtable.createFixedBuckets(IntEntry.class, 8);
-    Object table = ConcurrentHashtable.getTableWriteLock(buckets);
-    assertNotNull(table);
-    for (int index = 0; index < buckets.length(); index++) {
-      assertSame(table, ConcurrentHashtable.getWriteLockAt(buckets, index));
-      assertSame(table, ConcurrentHashtable.getWriteLock(buckets, index));
+    @Test
+    void sizeForRoundsUpToPowerOfTwo() {
+        assertEquals(1, ConcurrentHashtable.sizeFor(1));
+        assertEquals(8, ConcurrentHashtable.sizeFor(5));
+        assertEquals(8, ConcurrentHashtable.sizeFor(8));
+        assertEquals(16, ConcurrentHashtable.sizeFor(9));
     }
-  }
-
-  @Test
-  void bucketIndexMasksToArrayLength() {
-    AtomicReferenceArray<IntEntry> buckets =
-        ConcurrentHashtable.createFixedBuckets(IntEntry.class, 8); // length 8, mask 7
-    assertEquals(0, ConcurrentHashtable.bucketIndex(buckets, 8L));
-    assertEquals(1, ConcurrentHashtable.bucketIndex(buckets, 9L));
-    assertEquals(7, ConcurrentHashtable.bucketIndex(buckets, 7L));
-  }
-
-  @Test
-  void insertGetAndRemoveViaStatics() {
-    IntTable table = new IntTable(8);
-    IntEntry a = table.getOrCreate(1, 100);
-    IntEntry b = table.getOrCreate(2, 200);
-    assertEquals(2, table.size.get());
-    assertSame(a, table.get(1));
-    assertSame(b, table.get(2));
-    assertNull(table.get(3));
-
-    // getOrCreate on a hit returns the existing entry, no new insert.
-    assertSame(a, table.getOrCreate(1, 999));
-    assertEquals(2, table.size.get());
-
-    assertSame(a, table.remove(1));
-    assertNull(table.get(1));
-    assertNull(table.remove(1)); // already gone
-    assertEquals(1, table.size.get());
-  }
-
-  @Test
-  void insertHeadEntryForPlacesInBucketMaskedFromKeyHash() {
-    AtomicReferenceArray<IntEntry> buckets =
-        ConcurrentHashtable.createFixedBuckets(IntEntry.class, 8); // mask 7
-    IntEntry e = new IntEntry(9, 1); // keyHash 9 → bucket 1
-    synchronized (ConcurrentHashtable.getWriteLock(buckets, e.keyHash)) {
-      ConcurrentHashtable.insertHeadEntryFor(buckets, e.keyHash, e);
+
+    @Test
+    void createFixedBucketsAllocatesPowerOfTwoSpine() {
+        AtomicReferenceArray<IntEntry> buckets = ConcurrentHashtable.createFixedBuckets(IntEntry.class, 10);
+        assertEquals(16, buckets.length());
+        assertNull(buckets.get(0));
+    }
+
+    @Test
+    void getWriteLockIsStableAndNonNull() {
+        AtomicReferenceArray<IntEntry> buckets = ConcurrentHashtable.createFixedBuckets(IntEntry.class, 8);
+        Object lock = ConcurrentHashtable.getWriteLock(buckets, 3L);
+        assertNotNull(lock);
+        assertSame(lock, ConcurrentHashtable.getWriteLock(buckets, 3L));
+        // The keyHash form is defined as the index form under bucketIndex.
+        assertSame(lock, ConcurrentHashtable.getWriteLockAt(buckets, ConcurrentHashtable.bucketIndex(buckets, 3L)));
     }
-    assertSame(e, ConcurrentHashtable.bucketFor(buckets, 9L)); // masks keyHash to the bucket index
-    assertSame(
-        e, ConcurrentHashtable.bucketAt(buckets, 1)); // same slot, addressed directly by index
-    assertNull(buckets.get(0));
-  }
-
-  @Test
-  void unlinkRemovesHeadMiddleAndTailOfChain() {
-    // Capacity 1 → mask 0 → every key lands in bucket 0, forming one chain.
-    IntTable table = new IntTable(1);
-    IntEntry a = table.getOrCreate(1, 1);
-    IntEntry b = table.getOrCreate(2, 2);
-    IntEntry c = table.getOrCreate(3, 3);
-    assertEquals(3, table.size.get());
-
-    // Remove the middle: head and tail stay reachable.
-    assertSame(b, table.remove(2));
-    assertNull(table.get(2));
-    assertSame(a, table.get(1));
-    assertSame(c, table.get(3));
-    assertEquals(2, table.size.get());
-
-    // Remove the head, then the last remaining.
-    assertSame(c, table.remove(3));
-    assertSame(a, table.remove(1));
-    assertEquals(0, table.size.get());
-    assertNull(table.get(1));
-  }
-
-  @Test
-  void staticRemoveIfRemovesMatchingAndDecrementsSize() {
-    IntTable table = new IntTable(16);
-    for (int i = 0; i < 10; i++) {
-      table.getOrCreate(i, i);
+
+    /**
+     * The three accessors name three scopes, but a single-lock table answers all of them with one
+     * monitor. Asserting that pins today's granularity as a deliberate choice rather than an
+     * accident: if it ever changes, this is the test that says so, and callers that asked for the
+     * scope they actually mutate keep working.
+     */
+    @Test
+    void allWriteLockScopesResolveToOneMonitorToday() {
+        AtomicReferenceArray<IntEntry> buckets = ConcurrentHashtable.createFixedBuckets(IntEntry.class, 8);
+        Object table = ConcurrentHashtable.getTableWriteLock(buckets);
+        assertNotNull(table);
+        for (int index = 0; index < buckets.length(); index++) {
+            assertSame(table, ConcurrentHashtable.getWriteLockAt(buckets, index));
+            assertSame(table, ConcurrentHashtable.getWriteLock(buckets, index));
+        }
+    }
+
+    @Test
+    void bucketIndexMasksToArrayLength() {
+        AtomicReferenceArray<IntEntry> buckets =
+                ConcurrentHashtable.createFixedBuckets(IntEntry.class, 8); // length 8, mask 7
+        assertEquals(0, ConcurrentHashtable.bucketIndex(buckets, 8L));
+        assertEquals(1, ConcurrentHashtable.bucketIndex(buckets, 9L));
+        assertEquals(7, ConcurrentHashtable.bucketIndex(buckets, 7L));
+    }
+
+    @Test
+    void insertGetAndRemoveViaStatics() {
+        IntTable table = new IntTable(8);
+        IntEntry a = table.getOrCreate(1, 100);
+        IntEntry b = table.getOrCreate(2, 200);
+        assertEquals(2, table.size.get());
+        assertSame(a, table.get(1));
+        assertSame(b, table.get(2));
+        assertNull(table.get(3));
+
+        // getOrCreate on a hit returns the existing entry, no new insert.
+        assertSame(a, table.getOrCreate(1, 999));
+        assertEquals(2, table.size.get());
+
+        assertSame(a, table.remove(1));
+        assertNull(table.get(1));
+        assertNull(table.remove(1)); // already gone
+        assertEquals(1, table.size.get());
     }
-    boolean removed =
-        ConcurrentHashtable.removeIf(table.buckets, table.size, e -> e.value % 2 == 0);
-    assertTrue(removed);
-    assertEquals(5, table.size.get());
-    for (int i = 0; i < 10; i++) {
-      if (i % 2 == 0) {
-        assertNull(table.get(i));
-      } else {
-        assertNotNull(table.get(i));
-      }
+
+    @Test
+    void insertHeadEntryForPlacesInBucketMaskedFromKeyHash() {
+        AtomicReferenceArray<IntEntry> buckets = ConcurrentHashtable.createFixedBuckets(IntEntry.class, 8); // mask 7
+        IntEntry e = new IntEntry(9, 1); // keyHash 9 → bucket 1
+        synchronized (ConcurrentHashtable.getWriteLock(buckets, e.keyHash)) {
+            ConcurrentHashtable.insertHeadEntryFor(buckets, e.keyHash, e);
+        }
+        assertSame(e, ConcurrentHashtable.bucketFor(buckets, 9L)); // masks keyHash to the bucket index
+        assertSame(e, ConcurrentHashtable.bucketAt(buckets, 1)); // same slot, addressed directly by index
+        assertNull(buckets.get(0));
+    }
+
+    @Test
+    void unlinkRemovesHeadMiddleAndTailOfChain() {
+        // Capacity 1 → mask 0 → every key lands in bucket 0, forming one chain.
+        IntTable table = new IntTable(1);
+        IntEntry a = table.getOrCreate(1, 1);
+        IntEntry b = table.getOrCreate(2, 2);
+        IntEntry c = table.getOrCreate(3, 3);
+        assertEquals(3, table.size.get());
+
+        // Remove the middle: head and tail stay reachable.
+        assertSame(b, table.remove(2));
+        assertNull(table.get(2));
+        assertSame(a, table.get(1));
+        assertSame(c, table.get(3));
+        assertEquals(2, table.size.get());
+
+        // Remove the head, then the last remaining.
+        assertSame(c, table.remove(3));
+        assertSame(a, table.remove(1));
+        assertEquals(0, table.size.get());
+        assertNull(table.get(1));
+    }
+
+    @Test
+    void staticRemoveIfRemovesMatchingAndDecrementsSize() {
+        IntTable table = new IntTable(16);
+        for (int i = 0; i < 10; i++) {
+            table.getOrCreate(i, i);
+        }
+        boolean removed = ConcurrentHashtable.removeIf(table.buckets, table.size, e -> e.value % 2 == 0);
+        assertTrue(removed);
+        assertEquals(5, table.size.get());
+        for (int i = 0; i < 10; i++) {
+            if (i % 2 == 0) {
+                assertNull(table.get(i));
+            } else {
+                assertNotNull(table.get(i));
+            }
+        }
     }
-  }
-
-  @Test
-  void staticRemoveIfReturnsFalseWhenNothingMatches() {
-    IntTable table = new IntTable(8);
-    table.getOrCreate(1, 1);
-    assertFalse(ConcurrentHashtable.removeIf(table.buckets, table.size, e -> false));
-    assertEquals(1, table.size.get());
-  }
-
-  @Test
-  void staticDrainRemovesEveryEntryAndFeedsSink() {
-    IntTable table = new IntTable(8);
-    table.getOrCreate(1, 10);
-    table.getOrCreate(2, 20);
-    table.getOrCreate(3, 30);
-
-    Set<Integer> keys = new HashSet<>();
-    int[] sum = {0};
-    ConcurrentHashtable.drain(
-        table.buckets,
-        e -> {
-          keys.add(e.key);
-          sum[0] += e.value;
+
+    @Test
+    void staticRemoveIfReturnsFalseWhenNothingMatches() {
+        IntTable table = new IntTable(8);
+        table.getOrCreate(1, 1);
+        assertFalse(ConcurrentHashtable.removeIf(table.buckets, table.size, e -> false));
+        assertEquals(1, table.size.get());
+    }
+
+    @Test
+    void staticDrainRemovesEveryEntryAndFeedsSink() {
+        IntTable table = new IntTable(8);
+        table.getOrCreate(1, 10);
+        table.getOrCreate(2, 20);
+        table.getOrCreate(3, 30);
+
+        Set<Integer> keys = new HashSet<>();
+        int[] sum = {0};
+        ConcurrentHashtable.drain(table.buckets, e -> {
+            keys.add(e.key);
+            sum[0] += e.value;
         });
 
-    assertEquals(new HashSet<>(java.util.Arrays.asList(1, 2, 3)), keys);
-    assertEquals(60, sum[0]);
-    // drain does not touch size accounting on the static path — the caller resets it.
-    for (int i = 1; i <= 3; i++) {
-      assertNull(table.get(i));
+        assertEquals(new HashSet<>(java.util.Arrays.asList(1, 2, 3)), keys);
+        assertEquals(60, sum[0]);
+        // drain does not touch size accounting on the static path — the caller resets it.
+        for (int i = 1; i <= 3; i++) {
+            assertNull(table.get(i));
+        }
+    }
+
+    @Test
+    void staticDrainWithContextFeedsSink() {
+        IntTable table = new IntTable(8);
+        table.getOrCreate(1, 10);
+        table.getOrCreate(2, 20);
+
+        Set<Integer> keys = new HashSet<>();
+        ConcurrentHashtable.drain(table.buckets, keys, (ctx, e) -> ctx.add(e.key));
+
+        assertEquals(new HashSet<>(java.util.Arrays.asList(1, 2)), keys);
+        assertNull(table.get(1));
     }
-  }
-
-  @Test
-  void staticDrainWithContextFeedsSink() {
-    IntTable table = new IntTable(8);
-    table.getOrCreate(1, 10);
-    table.getOrCreate(2, 20);
-
-    Set<Integer> keys = new HashSet<>();
-    ConcurrentHashtable.drain(table.buckets, keys, (ctx, e) -> ctx.add(e.key));
-
-    assertEquals(new HashSet<>(java.util.Arrays.asList(1, 2)), keys);
-    assertNull(table.get(1));
-  }
-
-  @Test
-  void staticClearEmptiesEveryBucket() {
-    IntTable table = new IntTable(8);
-    table.getOrCreate(1, 1);
-    table.getOrCreate(2, 2);
-    ConcurrentHashtable.clear(table.buckets);
-    assertNull(table.get(1));
-    assertNull(table.get(2));
-    for (int i = 0; i < table.buckets.length(); i++) {
-      assertNull(table.buckets.get(i));
+
+    @Test
+    void staticClearEmptiesEveryBucket() {
+        IntTable table = new IntTable(8);
+        table.getOrCreate(1, 1);
+        table.getOrCreate(2, 2);
+        ConcurrentHashtable.clear(table.buckets);
+        assertNull(table.get(1));
+        assertNull(table.get(2));
+        for (int i = 0; i < table.buckets.length(); i++) {
+            assertNull(table.buckets.get(i));
+        }
+    }
+
+    @Test
+    void staticForEachVisitsEveryEntry() {
+        IntTable table = new IntTable(8);
+        table.getOrCreate(1, 1);
+        table.getOrCreate(2, 2);
+        table.getOrCreate(3, 3);
+
+        Set<Integer> seen = new HashSet<>();
+        ConcurrentHashtable.forEach(table.buckets, e -> seen.add(e.key));
+        assertEquals(new HashSet<>(java.util.Arrays.asList(1, 2, 3)), seen);
+
+        Set<Integer> seenCtx = new HashSet<>();
+        ConcurrentHashtable.forEach(table.buckets, seenCtx, (ctx, e) -> ctx.add(e.key));
+        assertEquals(new HashSet<>(java.util.Arrays.asList(1, 2, 3)), seenCtx);
     }
-  }
-
-  @Test
-  void staticForEachVisitsEveryEntry() {
-    IntTable table = new IntTable(8);
-    table.getOrCreate(1, 1);
-    table.getOrCreate(2, 2);
-    table.getOrCreate(3, 3);
-
-    Set<Integer> seen = new HashSet<>();
-    ConcurrentHashtable.forEach(table.buckets, e -> seen.add(e.key));
-    assertEquals(new HashSet<>(java.util.Arrays.asList(1, 2, 3)), seen);
-
-    Set<Integer> seenCtx = new HashSet<>();
-    ConcurrentHashtable.forEach(table.buckets, seenCtx, (ctx, e) -> ctx.add(e.key));
-    assertEquals(new HashSet<>(java.util.Arrays.asList(1, 2, 3)), seenCtx);
-  }
-
-  @Test
-  void insertHeadEntryWithoutLockTripsAssertion() {
-    assumeTrue(assertionsEnabled(), "assert-guard test requires -ea");
-    AtomicReferenceArray<IntEntry> buckets =
-        ConcurrentHashtable.createFixedBuckets(IntEntry.class, 8);
-    assertThrows(
-        AssertionError.class,
-        () -> ConcurrentHashtable.insertHeadEntryAt(buckets, 0, new IntEntry(1, 1)));
-  }
-
-  @Test
-  void unlinkWithoutLockTripsAssertion() {
-    assumeTrue(assertionsEnabled(), "assert-guard test requires -ea");
-    AtomicReferenceArray<IntEntry> buckets =
-        ConcurrentHashtable.createFixedBuckets(IntEntry.class, 8);
-    IntEntry e = new IntEntry(1, 1);
-    synchronized (ConcurrentHashtable.getWriteLockAt(buckets, 0)) {
-      ConcurrentHashtable.insertHeadEntryAt(buckets, 0, e);
+
+    @Test
+    void insertHeadEntryWithoutLockTripsAssertion() {
+        assumeTrue(assertionsEnabled(), "assert-guard test requires -ea");
+        AtomicReferenceArray<IntEntry> buckets = ConcurrentHashtable.createFixedBuckets(IntEntry.class, 8);
+        assertThrows(AssertionError.class, () -> ConcurrentHashtable.insertHeadEntryAt(buckets, 0, new IntEntry(1, 1)));
     }
-    assertThrows(AssertionError.class, () -> ConcurrentHashtable.unlink(buckets, 0, null, e));
-  }
-
-  @Test
-  void concurrentGetOrCreateViaStaticsProducesExactlyOneEntry() throws InterruptedException {
-    IntTable table = new IntTable(8);
-    int threads = 16;
-    CountDownLatch ready = new CountDownLatch(threads);
-    CountDownLatch go = new CountDownLatch(1);
-    AtomicInteger createCount = new AtomicInteger();
-
-    Thread[] workers = new Thread[threads];
-    for (int i = 0; i < threads; i++) {
-      workers[i] =
-          new Thread(
-              () -> {
+
+    @Test
+    void unlinkWithoutLockTripsAssertion() {
+        assumeTrue(assertionsEnabled(), "assert-guard test requires -ea");
+        AtomicReferenceArray<IntEntry> buckets = ConcurrentHashtable.createFixedBuckets(IntEntry.class, 8);
+        IntEntry e = new IntEntry(1, 1);
+        synchronized (ConcurrentHashtable.getWriteLockAt(buckets, 0)) {
+            ConcurrentHashtable.insertHeadEntryAt(buckets, 0, e);
+        }
+        assertThrows(AssertionError.class, () -> ConcurrentHashtable.unlink(buckets, 0, null, e));
+    }
+
+    @Test
+    void concurrentGetOrCreateViaStaticsProducesExactlyOneEntry() throws InterruptedException {
+        IntTable table = new IntTable(8);
+        int threads = 16;
+        CountDownLatch ready = new CountDownLatch(threads);
+        CountDownLatch go = new CountDownLatch(1);
+        AtomicInteger createCount = new AtomicInteger();
+
+        Thread[] workers = new Thread[threads];
+        for (int i = 0; i < threads; i++) {
+            workers[i] = new Thread(() -> {
                 ready.countDown();
                 try {
-                  go.await();
+                    go.await();
                 } catch (InterruptedException ex) {
-                  Thread.currentThread().interrupt();
-                  return;
+                    Thread.currentThread().interrupt();
+                    return;
                 }
                 table.getOrCreateCounting(7, createCount);
-              });
-      workers[i].start();
-    }
-    ready.await();
-    go.countDown();
-    for (Thread w : workers) {
-      w.join();
-    }
+            });
+            workers[i].start();
+        }
+        ready.await();
+        go.countDown();
+        for (Thread w : workers) {
+            w.join();
+        }
 
-    assertEquals(1, table.size.get());
-    assertEquals(1, createCount.get());
-  }
-
-  @Test
-  void concurrentReadsStaySafeWhileOneChainMemberChurnsViaStatics() throws InterruptedException {
-    // Capacity 1 puts every key in one bucket so unlink splices a chain the reader is walking.
-    IntTable table = new IntTable(1);
-    int n = 8;
-    for (int i = 0; i < n; i++) {
-      table.getOrCreate(i, i);
+        assertEquals(1, table.size.get());
+        assertEquals(1, createCount.get());
     }
-    int churn = 0; // keys 1..n-1 are stable and must never vanish
-
-    AtomicBoolean stop = new AtomicBoolean(false);
-    AtomicInteger missed = new AtomicInteger();
-    Thread reader =
-        new Thread(
-            () -> {
-              while (!stop.get()) {
+
+    @Test
+    void concurrentReadsStaySafeWhileOneChainMemberChurnsViaStatics() throws InterruptedException {
+        // Capacity 1 puts every key in one bucket so unlink splices a chain the reader is walking.
+        IntTable table = new IntTable(1);
+        int n = 8;
+        for (int i = 0; i < n; i++) {
+            table.getOrCreate(i, i);
+        }
+        int churn = 0; // keys 1..n-1 are stable and must never vanish
+
+        AtomicBoolean stop = new AtomicBoolean(false);
+        AtomicInteger missed = new AtomicInteger();
+        Thread reader = new Thread(() -> {
+            while (!stop.get()) {
                 for (int i = 1; i < n; i++) {
-                  if (table.get(i) == null) {
-                    missed.incrementAndGet();
-                  }
+                    if (table.get(i) == null) {
+                        missed.incrementAndGet();
+                    }
                 }
-              }
-            });
-    reader.start();
-    for (int r = 0; r < 100_000; r++) {
-      table.remove(churn);
-      table.getOrCreate(churn, churn);
-    }
-    stop.set(true);
-    reader.join();
-
-    assertEquals(0, missed.get(), "stable chain members must never be unreachable during removal");
-  }
-
-  private static boolean assertionsEnabled() {
-    boolean enabled = false;
-    assert enabled = true;
-    return enabled;
-  }
-
-  /** Primitive-{@code int}-key entry: no boxing, keyHash is the key itself. */
-  private static final class IntEntry extends ConcurrentHashtable.Entry<IntEntry> {
-    final int key;
-    final int value;
-
-    IntEntry(int key, int value) {
-      super(key);
-      this.key = key;
-      this.value = value;
-    }
+            }
+        });
+        reader.start();
+        for (int r = 0; r < 100_000; r++) {
+            table.remove(churn);
+            table.getOrCreate(churn, churn);
+        }
+        stop.set(true);
+        reader.join();
 
-    boolean matches(int key) {
-      return this.key == key;
+        assertEquals(0, missed.get(), "stable chain members must never be unreachable during removal");
     }
 
-    @Override
-    public boolean matches(IntEntry other) {
-      return matches(other.key);
-    }
-  }
-
-  /**
-   * Minimal hand-written table over a caller-owned {@link AtomicReferenceArray}, following the
-   * documented recipe: lock-free pre-check, then re-check + mutate under {@code
-   * getWriteLock(buckets, keyHash)}.
-   */
-  private static final class IntTable {
-    final AtomicReferenceArray<IntEntry> buckets;
-    final AtomicInteger size = new AtomicInteger();
-
-    IntTable(int capacity) {
-      this.buckets = ConcurrentHashtable.createFixedBuckets(IntEntry.class, capacity);
+    private static boolean assertionsEnabled() {
+        boolean enabled = false;
+        assert enabled = true;
+        return enabled;
     }
 
-    IntEntry get(int key) {
-      for (IntEntry e = ConcurrentHashtable.bucketFor(buckets, (long) key);
-          e != null;
-          e = e.next()) {
-        if (e.matches(key)) {
-          return e;
+    /** Primitive-{@code int}-key entry: no boxing, keyHash is the key itself. */
+    private static final class IntEntry extends ConcurrentHashtable.Entry<IntEntry> {
+        final int key;
+        final int value;
+
+        IntEntry(int key, int value) {
+            super(key);
+            this.key = key;
+            this.value = value;
         }
-      }
-      return null;
-    }
 
-    IntEntry getOrCreate(int key, int value) {
-      int index = ConcurrentHashtable.bucketIndex(buckets, key);
-      for (IntEntry e = ConcurrentHashtable.bucketAt(buckets, index); e != null; e = e.next()) {
-        if (e.matches(key)) {
-          return e;
+        boolean matches(int key) {
+            return this.key == key;
         }
-      }
-      synchronized (ConcurrentHashtable.getWriteLockAt(buckets, index)) {
-        for (IntEntry e = ConcurrentHashtable.bucketAt(buckets, index); e != null; e = e.next()) {
-          if (e.matches(key)) {
-            return e;
-          }
+
+        @Override
+        public boolean matches(IntEntry other) {
+            return matches(other.key);
         }
-        IntEntry created = new IntEntry(key, value);
-        ConcurrentHashtable.insertHeadEntryAt(buckets, index, created);
-        size.incrementAndGet();
-        return created;
-      }
     }
 
-    /** {@link #getOrCreate} variant that counts real creations, for the exactly-once race test. */
-    IntEntry getOrCreateCounting(int key, AtomicInteger createCount) {
-      int index = ConcurrentHashtable.bucketIndex(buckets, key);
-      for (IntEntry e = ConcurrentHashtable.bucketAt(buckets, index); e != null; e = e.next()) {
-        if (e.matches(key)) {
-          return e;
+    /**
+     * Minimal hand-written table over a caller-owned {@link AtomicReferenceArray}, following the
+     * documented recipe: lock-free pre-check, then re-check + mutate under {@code
+     * getWriteLock(buckets, keyHash)}.
+     */
+    private static final class IntTable {
+        final AtomicReferenceArray<IntEntry> buckets;
+        final AtomicInteger size = new AtomicInteger();
+
+        IntTable(int capacity) {
+            this.buckets = ConcurrentHashtable.createFixedBuckets(IntEntry.class, capacity);
         }
-      }
-      synchronized (ConcurrentHashtable.getWriteLockAt(buckets, index)) {
-        for (IntEntry e = ConcurrentHashtable.bucketAt(buckets, index); e != null; e = e.next()) {
-          if (e.matches(key)) {
-            return e;
-          }
+
+        IntEntry get(int key) {
+            for (IntEntry e = ConcurrentHashtable.bucketFor(buckets, (long) key); e != null; e = e.next()) {
+                if (e.matches(key)) {
+                    return e;
+                }
+            }
+            return null;
+        }
+
+        IntEntry getOrCreate(int key, int value) {
+            int index = ConcurrentHashtable.bucketIndex(buckets, key);
+            for (IntEntry e = ConcurrentHashtable.bucketAt(buckets, index); e != null; e = e.next()) {
+                if (e.matches(key)) {
+                    return e;
+                }
+            }
+            synchronized (ConcurrentHashtable.getWriteLockAt(buckets, index)) {
+                for (IntEntry e = ConcurrentHashtable.bucketAt(buckets, index); e != null; e = e.next()) {
+                    if (e.matches(key)) {
+                        return e;
+                    }
+                }
+                IntEntry created = new IntEntry(key, value);
+                ConcurrentHashtable.insertHeadEntryAt(buckets, index, created);
+                size.incrementAndGet();
+                return created;
+            }
+        }
+
+        /** {@link #getOrCreate} variant that counts real creations, for the exactly-once race test. */
+        IntEntry getOrCreateCounting(int key, AtomicInteger createCount) {
+            int index = ConcurrentHashtable.bucketIndex(buckets, key);
+            for (IntEntry e = ConcurrentHashtable.bucketAt(buckets, index); e != null; e = e.next()) {
+                if (e.matches(key)) {
+                    return e;
+                }
+            }
+            synchronized (ConcurrentHashtable.getWriteLockAt(buckets, index)) {
+                for (IntEntry e = ConcurrentHashtable.bucketAt(buckets, index); e != null; e = e.next()) {
+                    if (e.matches(key)) {
+                        return e;
+                    }
+                }
+                createCount.incrementAndGet();
+                IntEntry created = new IntEntry(key, 0);
+                ConcurrentHashtable.insertHeadEntryAt(buckets, index, created);
+                size.incrementAndGet();
+                return created;
+            }
         }
-        createCount.incrementAndGet();
-        IntEntry created = new IntEntry(key, 0);
-        ConcurrentHashtable.insertHeadEntryAt(buckets, index, created);
-        size.incrementAndGet();
-        return created;
-      }
-    }
 
-    IntEntry remove(int key) {
-      int index = ConcurrentHashtable.bucketIndex(buckets, key);
-      synchronized (ConcurrentHashtable.getWriteLockAt(buckets, index)) {
-        IntEntry prev = null;
-        for (IntEntry e = ConcurrentHashtable.bucketAt(buckets, index); e != null; e = e.next()) {
-          if (e.matches(key)) {
-            ConcurrentHashtable.unlink(buckets, index, prev, e);
-            size.decrementAndGet();
-            return e;
-          }
-          prev = e;
+        IntEntry remove(int key) {
+            int index = ConcurrentHashtable.bucketIndex(buckets, key);
+            synchronized (ConcurrentHashtable.getWriteLockAt(buckets, index)) {
+                IntEntry prev = null;
+                for (IntEntry e = ConcurrentHashtable.bucketAt(buckets, index); e != null; e = e.next()) {
+                    if (e.matches(key)) {
+                        ConcurrentHashtable.unlink(buckets, index, prev, e);
+                        size.decrementAndGet();
+                        return e;
+                    }
+                    prev = e;
+                }
+                return null;
+            }
         }
-        return null;
-      }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/FlatHashtableD1Test.java b/internal-api/src/test/java/datadog/trace/util/FlatHashtableD1Test.java
index 4fc6838974b..79ed610a39e 100644
--- a/internal-api/src/test/java/datadog/trace/util/FlatHashtableD1Test.java
+++ b/internal-api/src/test/java/datadog/trace/util/FlatHashtableD1Test.java
@@ -13,256 +13,250 @@
 
 class FlatHashtableD1Test {
 
-  static final class StringIntEntry extends FlatHashtable.D1.Entry<String> {
-    int value;
+    static final class StringIntEntry extends FlatHashtable.D1.Entry<String> {
+        int value;
 
-    StringIntEntry(String key, int value) {
-      super(key);
-      this.value = value;
+        StringIntEntry(String key, int value) {
+            super(key);
+            this.value = value;
+        }
     }
-  }
 
-  /** Key whose hashCode is fully controllable, to force probe collisions deterministically. */
-  static final class CollidingKey {
-    final String label;
-    final int hash;
+    /** Key whose hashCode is fully controllable, to force probe collisions deterministically. */
+    static final class CollidingKey {
+        final String label;
+        final int hash;
 
-    CollidingKey(String label, int hash) {
-      this.label = label;
-      this.hash = hash;
-    }
+        CollidingKey(String label, int hash) {
+            this.label = label;
+            this.hash = hash;
+        }
 
-    @Override
-    public int hashCode() {
-      return hash;
-    }
+        @Override
+        public int hashCode() {
+            return hash;
+        }
 
-    @Override
-    public boolean equals(Object o) {
-      if (!(o instanceof CollidingKey)) {
-        return false;
-      }
-      CollidingKey that = (CollidingKey) o;
-      return hash == that.hash && label.equals(that.label);
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof CollidingKey)) {
+                return false;
+            }
+            CollidingKey that = (CollidingKey) o;
+            return hash == that.hash && label.equals(that.label);
+        }
     }
-  }
 
-  static final class CollidingKeyEntry extends FlatHashtable.D1.Entry<CollidingKey> {
-    int value;
+    static final class CollidingKeyEntry extends FlatHashtable.D1.Entry<CollidingKey> {
+        int value;
 
-    CollidingKeyEntry(CollidingKey key, int value) {
-      super(key);
-      this.value = value;
+        CollidingKeyEntry(CollidingKey key, int value) {
+            super(key);
+            this.value = value;
+        }
     }
-  }
-
-  private static FlatHashtable.D1<String, StringIntEntry> growable(int initialCapacity) {
-    return FlatHashtable.D1.createGrowable(StringIntEntry.class, initialCapacity);
-  }
 
-  private static FlatHashtable.D1<String, StringIntEntry> fixed(int maxCapacity) {
-    return FlatHashtable.D1.createFixed(StringIntEntry.class, maxCapacity);
-  }
+    private static FlatHashtable.D1<String, StringIntEntry> growable(int initialCapacity) {
+        return FlatHashtable.D1.createGrowable(StringIntEntry.class, initialCapacity);
+    }
 
-  @Test
-  void emptyTableLookupReturnsNull() {
-    FlatHashtable.D1<String, StringIntEntry> table = growable(8);
-    assertNull(table.get("missing"));
-    assertEquals(0, table.size());
-  }
+    private static FlatHashtable.D1<String, StringIntEntry> fixed(int maxCapacity) {
+        return FlatHashtable.D1.createFixed(StringIntEntry.class, maxCapacity);
+    }
 
-  @Test
-  void insertedEntryIsRetrievable() {
-    FlatHashtable.D1<String, StringIntEntry> table = growable(8);
-    StringIntEntry e = new StringIntEntry("foo", 1);
-    assertTrue(table.insert(e));
-    assertEquals(1, table.size());
-    assertSame(e, table.get("foo"));
-  }
+    @Test
+    void emptyTableLookupReturnsNull() {
+        FlatHashtable.D1<String, StringIntEntry> table = growable(8);
+        assertNull(table.get("missing"));
+        assertEquals(0, table.size());
+    }
 
-  @Test
-  void multipleInsertsRetrievableSeparately() {
-    FlatHashtable.D1<String, StringIntEntry> table = growable(16);
-    StringIntEntry a = new StringIntEntry("alpha", 1);
-    StringIntEntry b = new StringIntEntry("beta", 2);
-    StringIntEntry c = new StringIntEntry("gamma", 3);
-    table.insert(a);
-    table.insert(b);
-    table.insert(c);
-    assertEquals(3, table.size());
-    assertSame(a, table.get("alpha"));
-    assertSame(b, table.get("beta"));
-    assertSame(c, table.get("gamma"));
-  }
+    @Test
+    void insertedEntryIsRetrievable() {
+        FlatHashtable.D1<String, StringIntEntry> table = growable(8);
+        StringIntEntry e = new StringIntEntry("foo", 1);
+        assertTrue(table.insert(e));
+        assertEquals(1, table.size());
+        assertSame(e, table.get("foo"));
+    }
 
-  @Test
-  void keyAccessorExposesConstructionKey() {
-    StringIntEntry e = new StringIntEntry("foo", 1);
-    assertEquals("foo", e.key());
-  }
+    @Test
+    void multipleInsertsRetrievableSeparately() {
+        FlatHashtable.D1<String, StringIntEntry> table = growable(16);
+        StringIntEntry a = new StringIntEntry("alpha", 1);
+        StringIntEntry b = new StringIntEntry("beta", 2);
+        StringIntEntry c = new StringIntEntry("gamma", 3);
+        table.insert(a);
+        table.insert(b);
+        table.insert(c);
+        assertEquals(3, table.size());
+        assertSame(a, table.get("alpha"));
+        assertSame(b, table.get("beta"));
+        assertSame(c, table.get("gamma"));
+    }
 
-  @Test
-  void inPlaceMutationVisibleViaSubsequentGet() {
-    FlatHashtable.D1<String, StringIntEntry> table = growable(8);
-    table.insert(new StringIntEntry("counter", 0));
-    for (int i = 0; i < 10; i++) {
-      StringIntEntry e = table.get("counter");
-      e.value++;
+    @Test
+    void keyAccessorExposesConstructionKey() {
+        StringIntEntry e = new StringIntEntry("foo", 1);
+        assertEquals("foo", e.key());
     }
-    assertEquals(10, table.get("counter").value);
-  }
 
-  @Test
-  void clearEmptiesTheTable() {
-    FlatHashtable.D1<String, StringIntEntry> table = growable(8);
-    table.insert(new StringIntEntry("a", 1));
-    table.insert(new StringIntEntry("b", 2));
-    table.clear();
-    assertEquals(0, table.size());
-    assertNull(table.get("a"));
-    // Reinsertion works after clear.
-    table.insert(new StringIntEntry("a", 99));
-    assertEquals(99, table.get("a").value);
-  }
+    @Test
+    void inPlaceMutationVisibleViaSubsequentGet() {
+        FlatHashtable.D1<String, StringIntEntry> table = growable(8);
+        table.insert(new StringIntEntry("counter", 0));
+        for (int i = 0; i < 10; i++) {
+            StringIntEntry e = table.get("counter");
+            e.value++;
+        }
+        assertEquals(10, table.get("counter").value);
+    }
 
-  @Test
-  void forEachVisitsEveryInsertedEntry() {
-    FlatHashtable.D1<String, StringIntEntry> table = growable(8);
-    table.insert(new StringIntEntry("a", 1));
-    table.insert(new StringIntEntry("b", 2));
-    table.insert(new StringIntEntry("c", 3));
-    Map<String, Integer> seen = new HashMap<>();
-    table.forEach(e -> seen.put(e.key(), e.value));
-    assertEquals(3, seen.size());
-    assertEquals(1, seen.get("a"));
-    assertEquals(2, seen.get("b"));
-    assertEquals(3, seen.get("c"));
-  }
+    @Test
+    void clearEmptiesTheTable() {
+        FlatHashtable.D1<String, StringIntEntry> table = growable(8);
+        table.insert(new StringIntEntry("a", 1));
+        table.insert(new StringIntEntry("b", 2));
+        table.clear();
+        assertEquals(0, table.size());
+        assertNull(table.get("a"));
+        // Reinsertion works after clear.
+        table.insert(new StringIntEntry("a", 99));
+        assertEquals(99, table.get("a").value);
+    }
 
-  @Test
-  void forEachWithContextPassesContextToConsumer() {
-    FlatHashtable.D1<String, StringIntEntry> table = growable(8);
-    table.insert(new StringIntEntry("a", 10));
-    table.insert(new StringIntEntry("b", 20));
-    Map<String, Integer> seen = new HashMap<>();
-    table.forEach(seen, (ctx, e) -> ctx.put(e.key(), e.value));
-    assertEquals(2, seen.size());
-    assertEquals(10, seen.get("a"));
-    assertEquals(20, seen.get("b"));
-  }
+    @Test
+    void forEachVisitsEveryInsertedEntry() {
+        FlatHashtable.D1<String, StringIntEntry> table = growable(8);
+        table.insert(new StringIntEntry("a", 1));
+        table.insert(new StringIntEntry("b", 2));
+        table.insert(new StringIntEntry("c", 3));
+        Map<String, Integer> seen = new HashMap<>();
+        table.forEach(e -> seen.put(e.key(), e.value));
+        assertEquals(3, seen.size());
+        assertEquals(1, seen.get("a"));
+        assertEquals(2, seen.get("b"));
+        assertEquals(3, seen.get("c"));
+    }
 
-  @Test
-  void nullKeyIsPermittedAndDistinctFromAbsent() {
-    FlatHashtable.D1<String, StringIntEntry> table = growable(8);
-    assertNull(table.get(null));
-    StringIntEntry nullKeyed = new StringIntEntry(null, 7);
-    table.insert(nullKeyed);
-    assertSame(nullKeyed, table.get(null));
-    assertEquals(1, table.size());
-    // A real key that hashes to 0 must not collide with the null-key sentinel.
-    StringIntEntry zeroHashed = new StringIntEntry("", 0);
-    assertEquals(0, "".hashCode());
-    table.insert(zeroHashed);
-    assertSame(zeroHashed, table.get(""));
-    assertSame(nullKeyed, table.get(null));
-  }
+    @Test
+    void forEachWithContextPassesContextToConsumer() {
+        FlatHashtable.D1<String, StringIntEntry> table = growable(8);
+        table.insert(new StringIntEntry("a", 10));
+        table.insert(new StringIntEntry("b", 20));
+        Map<String, Integer> seen = new HashMap<>();
+        table.forEach(seen, (ctx, e) -> ctx.put(e.key(), e.value));
+        assertEquals(2, seen.size());
+        assertEquals(10, seen.get("a"));
+        assertEquals(20, seen.get("b"));
+    }
 
-  @Test
-  void hashCollisionsResolveByEquality() {
-    // Two distinct keys with the same hashCode: the probe must distinguish them via matches().
-    FlatHashtable.D1<CollidingKey, CollidingKeyEntry> table =
-        FlatHashtable.D1.createGrowable(CollidingKeyEntry.class, 4);
-    CollidingKey k1 = new CollidingKey("first", 17);
-    CollidingKey k2 = new CollidingKey("second", 17);
-    CollidingKeyEntry e1 = new CollidingKeyEntry(k1, 100);
-    CollidingKeyEntry e2 = new CollidingKeyEntry(k2, 200);
-    table.insert(e1);
-    table.insert(e2);
-    assertEquals(2, table.size());
-    assertSame(e1, table.get(k1));
-    assertSame(e2, table.get(k2));
-  }
+    @Test
+    void nullKeyIsPermittedAndDistinctFromAbsent() {
+        FlatHashtable.D1<String, StringIntEntry> table = growable(8);
+        assertNull(table.get(null));
+        StringIntEntry nullKeyed = new StringIntEntry(null, 7);
+        table.insert(nullKeyed);
+        assertSame(nullKeyed, table.get(null));
+        assertEquals(1, table.size());
+        // A real key that hashes to 0 must not collide with the null-key sentinel.
+        StringIntEntry zeroHashed = new StringIntEntry("", 0);
+        assertEquals(0, "".hashCode());
+        table.insert(zeroHashed);
+        assertSame(zeroHashed, table.get(""));
+        assertSame(nullKeyed, table.get(null));
+    }
 
-  @Test
-  void getOrCreateOnMissBuildsEntryViaCreator() {
-    FlatHashtable.D1<String, StringIntEntry> table = growable(8);
-    int[] createCount = {0};
-    StringIntEntry created =
-        table.getOrCreate(
-            "foo",
-            k -> {
-              createCount[0]++;
-              return new StringIntEntry(k, 42);
-            });
-    assertNotNull(created);
-    assertEquals("foo", created.key());
-    assertEquals(42, created.value);
-    assertEquals(1, table.size());
-    assertEquals(1, createCount[0]);
-    assertSame(created, table.get("foo"));
-  }
+    @Test
+    void hashCollisionsResolveByEquality() {
+        // Two distinct keys with the same hashCode: the probe must distinguish them via matches().
+        FlatHashtable.D1<CollidingKey, CollidingKeyEntry> table =
+                FlatHashtable.D1.createGrowable(CollidingKeyEntry.class, 4);
+        CollidingKey k1 = new CollidingKey("first", 17);
+        CollidingKey k2 = new CollidingKey("second", 17);
+        CollidingKeyEntry e1 = new CollidingKeyEntry(k1, 100);
+        CollidingKeyEntry e2 = new CollidingKeyEntry(k2, 200);
+        table.insert(e1);
+        table.insert(e2);
+        assertEquals(2, table.size());
+        assertSame(e1, table.get(k1));
+        assertSame(e2, table.get(k2));
+    }
 
-  @Test
-  void getOrCreateOnHitSkipsCreator() {
-    FlatHashtable.D1<String, StringIntEntry> table = growable(8);
-    StringIntEntry seeded = new StringIntEntry("foo", 1);
-    table.insert(seeded);
-    int[] createCount = {0};
-    StringIntEntry got =
-        table.getOrCreate(
-            "foo",
-            k -> {
-              createCount[0]++;
-              return new StringIntEntry(k, 999);
-            });
-    assertSame(seeded, got);
-    assertEquals(1, table.size());
-    assertEquals(0, createCount[0]);
-  }
+    @Test
+    void getOrCreateOnMissBuildsEntryViaCreator() {
+        FlatHashtable.D1<String, StringIntEntry> table = growable(8);
+        int[] createCount = {0};
+        StringIntEntry created = table.getOrCreate("foo", k -> {
+            createCount[0]++;
+            return new StringIntEntry(k, 42);
+        });
+        assertNotNull(created);
+        assertEquals("foo", created.key());
+        assertEquals(42, created.value);
+        assertEquals(1, table.size());
+        assertEquals(1, createCount[0]);
+        assertSame(created, table.get("foo"));
+    }
 
-  @Test
-  void growableGrowsPastInitialCapacity() {
-    // initialCapacity 1 => a tiny 2-slot table; inserting far past it must trigger growth.
-    FlatHashtable.D1<String, StringIntEntry> table = growable(1);
-    for (int i = 0; i < 50; i++) {
-      assertTrue(table.insert(new StringIntEntry("k" + i, i)));
+    @Test
+    void getOrCreateOnHitSkipsCreator() {
+        FlatHashtable.D1<String, StringIntEntry> table = growable(8);
+        StringIntEntry seeded = new StringIntEntry("foo", 1);
+        table.insert(seeded);
+        int[] createCount = {0};
+        StringIntEntry got = table.getOrCreate("foo", k -> {
+            createCount[0]++;
+            return new StringIntEntry(k, 999);
+        });
+        assertSame(seeded, got);
+        assertEquals(1, table.size());
+        assertEquals(0, createCount[0]);
     }
-    assertEquals(50, table.size());
-    for (int i = 0; i < 50; i++) {
-      assertEquals(i, table.get("k" + i).value);
+
+    @Test
+    void growableGrowsPastInitialCapacity() {
+        // initialCapacity 1 => a tiny 2-slot table; inserting far past it must trigger growth.
+        FlatHashtable.D1<String, StringIntEntry> table = growable(1);
+        for (int i = 0; i < 50; i++) {
+            assertTrue(table.insert(new StringIntEntry("k" + i, i)));
+        }
+        assertEquals(50, table.size());
+        for (int i = 0; i < 50; i++) {
+            assertEquals(i, table.get("k" + i).value);
+        }
     }
-  }
 
-  @Test
-  void growableGetOrCreateNeverReturnsNull() {
-    FlatHashtable.D1<String, StringIntEntry> table = growable(1);
-    for (int i = 0; i < 50; i++) {
-      StringIntEntry e = table.getOrCreate("k" + i, k -> new StringIntEntry(k, 0));
-      assertNotNull(e);
+    @Test
+    void growableGetOrCreateNeverReturnsNull() {
+        FlatHashtable.D1<String, StringIntEntry> table = growable(1);
+        for (int i = 0; i < 50; i++) {
+            StringIntEntry e = table.getOrCreate("k" + i, k -> new StringIntEntry(k, 0));
+            assertNotNull(e);
+        }
+        assertEquals(50, table.size());
     }
-    assertEquals(50, table.size());
-  }
 
-  @Test
-  void fixedGetOrCreateCapsWhenFull() {
-    FlatHashtable.D1<String, StringIntEntry> table = fixed(2);
-    assertNotNull(table.getOrCreate("a", k -> new StringIntEntry(k, 1)));
-    assertNotNull(table.getOrCreate("b", k -> new StringIntEntry(k, 2)));
-    assertEquals(2, table.size());
-    // At capacity, a new key can't be created -> null (caller's overflow default).
-    assertNull(table.getOrCreate("c", k -> new StringIntEntry(k, 3)));
-    assertEquals(2, table.size());
-    // ...but an existing key still resolves even at capacity (cap blocks creation, not lookup).
-    StringIntEntry a = table.get("a");
-    assertSame(a, table.getOrCreate("a", k -> new StringIntEntry(k, 99)));
-  }
+    @Test
+    void fixedGetOrCreateCapsWhenFull() {
+        FlatHashtable.D1<String, StringIntEntry> table = fixed(2);
+        assertNotNull(table.getOrCreate("a", k -> new StringIntEntry(k, 1)));
+        assertNotNull(table.getOrCreate("b", k -> new StringIntEntry(k, 2)));
+        assertEquals(2, table.size());
+        // At capacity, a new key can't be created -> null (caller's overflow default).
+        assertNull(table.getOrCreate("c", k -> new StringIntEntry(k, 3)));
+        assertEquals(2, table.size());
+        // ...but an existing key still resolves even at capacity (cap blocks creation, not lookup).
+        StringIntEntry a = table.get("a");
+        assertSame(a, table.getOrCreate("a", k -> new StringIntEntry(k, 99)));
+    }
 
-  @Test
-  void fixedInsertReturnsFalseWhenFull() {
-    FlatHashtable.D1<String, StringIntEntry> table = fixed(2);
-    assertTrue(table.insert(new StringIntEntry("a", 1)));
-    assertTrue(table.insert(new StringIntEntry("b", 2)));
-    assertFalse(table.insert(new StringIntEntry("c", 3)));
-    assertEquals(2, table.size());
-  }
+    @Test
+    void fixedInsertReturnsFalseWhenFull() {
+        FlatHashtable.D1<String, StringIntEntry> table = fixed(2);
+        assertTrue(table.insert(new StringIntEntry("a", 1)));
+        assertTrue(table.insert(new StringIntEntry("b", 2)));
+        assertFalse(table.insert(new StringIntEntry("c", 3)));
+        assertEquals(2, table.size());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/FlatHashtableD2Test.java b/internal-api/src/test/java/datadog/trace/util/FlatHashtableD2Test.java
index 5d19af4fecf..fe1ac73ea54 100644
--- a/internal-api/src/test/java/datadog/trace/util/FlatHashtableD2Test.java
+++ b/internal-api/src/test/java/datadog/trace/util/FlatHashtableD2Test.java
@@ -13,257 +13,249 @@
 
 class FlatHashtableD2Test {
 
-  static final class PairEntry extends FlatHashtable.D2.Entry<String, Integer> {
-    int value;
+    static final class PairEntry extends FlatHashtable.D2.Entry<String, Integer> {
+        int value;
 
-    PairEntry(String key1, Integer key2, int value) {
-      super(key1, key2);
-      this.value = value;
+        PairEntry(String key1, Integer key2, int value) {
+            super(key1, key2);
+            this.value = value;
+        }
     }
-  }
 
-  /** A key whose hash is fixed at construction so composite-hash collisions can be forced. */
-  static final class CollidingKey {
-    final String label;
-    final int hash;
+    /** A key whose hash is fixed at construction so composite-hash collisions can be forced. */
+    static final class CollidingKey {
+        final String label;
+        final int hash;
 
-    CollidingKey(String label, int hash) {
-      this.label = label;
-      this.hash = hash;
-    }
+        CollidingKey(String label, int hash) {
+            this.label = label;
+            this.hash = hash;
+        }
 
-    @Override
-    public int hashCode() {
-      return hash;
-    }
+        @Override
+        public int hashCode() {
+            return hash;
+        }
 
-    @Override
-    public boolean equals(Object o) {
-      if (!(o instanceof CollidingKey)) {
-        return false;
-      }
-      CollidingKey that = (CollidingKey) o;
-      return hash == that.hash && label.equals(that.label);
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof CollidingKey)) {
+                return false;
+            }
+            CollidingKey that = (CollidingKey) o;
+            return hash == that.hash && label.equals(that.label);
+        }
     }
-  }
 
-  static final class CollidingPairEntry extends FlatHashtable.D2.Entry<CollidingKey, CollidingKey> {
-    int value;
+    static final class CollidingPairEntry extends FlatHashtable.D2.Entry<CollidingKey, CollidingKey> {
+        int value;
 
-    CollidingPairEntry(CollidingKey key1, CollidingKey key2, int value) {
-      super(key1, key2);
-      this.value = value;
+        CollidingPairEntry(CollidingKey key1, CollidingKey key2, int value) {
+            super(key1, key2);
+            this.value = value;
+        }
     }
-  }
-
-  private static FlatHashtable.D2<String, Integer, PairEntry> growable(int initialCapacity) {
-    return FlatHashtable.D2.createGrowable(PairEntry.class, initialCapacity);
-  }
 
-  private static FlatHashtable.D2<String, Integer, PairEntry> fixed(int maxCapacity) {
-    return FlatHashtable.D2.createFixed(PairEntry.class, maxCapacity);
-  }
-
-  @Test
-  void emptyTableLookupReturnsNull() {
-    FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
-    assertNull(table.get("missing", 1));
-    assertEquals(0, table.size());
-  }
+    private static FlatHashtable.D2<String, Integer, PairEntry> growable(int initialCapacity) {
+        return FlatHashtable.D2.createGrowable(PairEntry.class, initialCapacity);
+    }
 
-  @Test
-  void insertedEntryIsRetrievableByBothParts() {
-    FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
-    PairEntry e = new PairEntry("a", 1, 100);
-    assertTrue(table.insert(e));
-    assertEquals(1, table.size());
-    assertSame(e, table.get("a", 1));
-  }
+    private static FlatHashtable.D2<String, Integer, PairEntry> fixed(int maxCapacity) {
+        return FlatHashtable.D2.createFixed(PairEntry.class, maxCapacity);
+    }
 
-  @Test
-  void distinctCompositeKeysStaySeparate() {
-    FlatHashtable.D2<String, Integer, PairEntry> table = growable(16);
-    PairEntry a1 = new PairEntry("a", 1, 10);
-    PairEntry a2 = new PairEntry("a", 2, 20); // same key1, different key2
-    PairEntry b1 = new PairEntry("b", 1, 30); // different key1, same key2
-    table.insert(a1);
-    table.insert(a2);
-    table.insert(b1);
-    assertEquals(3, table.size());
-    assertSame(a1, table.get("a", 1));
-    assertSame(a2, table.get("a", 2));
-    assertSame(b1, table.get("b", 1));
-    // A composite that was never inserted is absent.
-    assertNull(table.get("b", 2));
-  }
+    @Test
+    void emptyTableLookupReturnsNull() {
+        FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
+        assertNull(table.get("missing", 1));
+        assertEquals(0, table.size());
+    }
 
-  @Test
-  void keyAccessorsExposeConstructionKeys() {
-    PairEntry e = new PairEntry("a", 1, 100);
-    assertEquals("a", e.key1());
-    assertEquals(1, e.key2());
-  }
+    @Test
+    void insertedEntryIsRetrievableByBothParts() {
+        FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
+        PairEntry e = new PairEntry("a", 1, 100);
+        assertTrue(table.insert(e));
+        assertEquals(1, table.size());
+        assertSame(e, table.get("a", 1));
+    }
 
-  @Test
-  void inPlaceMutationVisibleViaSubsequentGet() {
-    FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
-    table.insert(new PairEntry("counter", 7, 0));
-    for (int i = 0; i < 10; i++) {
-      PairEntry e = table.get("counter", 7);
-      e.value++;
+    @Test
+    void distinctCompositeKeysStaySeparate() {
+        FlatHashtable.D2<String, Integer, PairEntry> table = growable(16);
+        PairEntry a1 = new PairEntry("a", 1, 10);
+        PairEntry a2 = new PairEntry("a", 2, 20); // same key1, different key2
+        PairEntry b1 = new PairEntry("b", 1, 30); // different key1, same key2
+        table.insert(a1);
+        table.insert(a2);
+        table.insert(b1);
+        assertEquals(3, table.size());
+        assertSame(a1, table.get("a", 1));
+        assertSame(a2, table.get("a", 2));
+        assertSame(b1, table.get("b", 1));
+        // A composite that was never inserted is absent.
+        assertNull(table.get("b", 2));
     }
-    assertEquals(10, table.get("counter", 7).value);
-  }
 
-  @Test
-  void clearEmptiesTheTable() {
-    FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
-    table.insert(new PairEntry("a", 1, 1));
-    table.insert(new PairEntry("b", 2, 2));
-    table.clear();
-    assertEquals(0, table.size());
-    assertNull(table.get("a", 1));
-  }
+    @Test
+    void keyAccessorsExposeConstructionKeys() {
+        PairEntry e = new PairEntry("a", 1, 100);
+        assertEquals("a", e.key1());
+        assertEquals(1, e.key2());
+    }
 
-  @Test
-  void forEachVisitsEveryInsertedEntry() {
-    FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
-    table.insert(new PairEntry("a", 1, 1));
-    table.insert(new PairEntry("b", 2, 2));
-    table.insert(new PairEntry("c", 3, 3));
-    Map<String, Integer> seen = new HashMap<>();
-    table.forEach(e -> seen.put(e.key1() + e.key2(), e.value));
-    assertEquals(3, seen.size());
-    assertEquals(1, seen.get("a1"));
-    assertEquals(2, seen.get("b2"));
-    assertEquals(3, seen.get("c3"));
-  }
+    @Test
+    void inPlaceMutationVisibleViaSubsequentGet() {
+        FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
+        table.insert(new PairEntry("counter", 7, 0));
+        for (int i = 0; i < 10; i++) {
+            PairEntry e = table.get("counter", 7);
+            e.value++;
+        }
+        assertEquals(10, table.get("counter", 7).value);
+    }
 
-  @Test
-  void forEachWithContextPassesContextToConsumer() {
-    FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
-    table.insert(new PairEntry("a", 1, 10));
-    table.insert(new PairEntry("b", 2, 20));
-    Map<String, Integer> seen = new HashMap<>();
-    table.forEach(seen, (ctx, e) -> ctx.put(e.key1() + e.key2(), e.value));
-    assertEquals(2, seen.size());
-    assertEquals(10, seen.get("a1"));
-    assertEquals(20, seen.get("b2"));
-  }
+    @Test
+    void clearEmptiesTheTable() {
+        FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
+        table.insert(new PairEntry("a", 1, 1));
+        table.insert(new PairEntry("b", 2, 2));
+        table.clear();
+        assertEquals(0, table.size());
+        assertNull(table.get("a", 1));
+    }
 
-  @Test
-  void nullKeyPartsArePermitted() {
-    FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
-    PairEntry bothNull = new PairEntry(null, null, 1);
-    table.insert(bothNull);
-    assertSame(bothNull, table.get(null, null));
-    assertNull(table.get("a", null));
-    assertNull(table.get(null, 1));
-    assertEquals(1, table.size());
-  }
+    @Test
+    void forEachVisitsEveryInsertedEntry() {
+        FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
+        table.insert(new PairEntry("a", 1, 1));
+        table.insert(new PairEntry("b", 2, 2));
+        table.insert(new PairEntry("c", 3, 3));
+        Map<String, Integer> seen = new HashMap<>();
+        table.forEach(e -> seen.put(e.key1() + e.key2(), e.value));
+        assertEquals(3, seen.size());
+        assertEquals(1, seen.get("a1"));
+        assertEquals(2, seen.get("b2"));
+        assertEquals(3, seen.get("c3"));
+    }
 
-  @Test
-  void getOrCreateOnMissBuildsEntryViaCreator() {
-    FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
-    int[] createCount = {0};
-    PairEntry created =
-        table.getOrCreate(
-            "foo",
-            1,
-            (k1, k2) -> {
-              createCount[0]++;
-              return new PairEntry(k1, k2, 42);
-            });
-    assertNotNull(created);
-    assertEquals("foo", created.key1());
-    assertEquals(1, created.key2());
-    assertEquals(42, created.value);
-    assertEquals(1, table.size());
-    assertEquals(1, createCount[0]);
-    assertSame(created, table.get("foo", 1));
-  }
+    @Test
+    void forEachWithContextPassesContextToConsumer() {
+        FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
+        table.insert(new PairEntry("a", 1, 10));
+        table.insert(new PairEntry("b", 2, 20));
+        Map<String, Integer> seen = new HashMap<>();
+        table.forEach(seen, (ctx, e) -> ctx.put(e.key1() + e.key2(), e.value));
+        assertEquals(2, seen.size());
+        assertEquals(10, seen.get("a1"));
+        assertEquals(20, seen.get("b2"));
+    }
 
-  @Test
-  void getOrCreateOnHitSkipsCreator() {
-    FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
-    PairEntry seeded = new PairEntry("foo", 1, 1);
-    table.insert(seeded);
-    int[] createCount = {0};
-    PairEntry got =
-        table.getOrCreate(
-            "foo",
-            1,
-            (k1, k2) -> {
-              createCount[0]++;
-              return new PairEntry(k1, k2, 999);
-            });
-    assertSame(seeded, got);
-    assertEquals(1, table.size());
-    assertEquals(0, createCount[0]);
-  }
+    @Test
+    void nullKeyPartsArePermitted() {
+        FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
+        PairEntry bothNull = new PairEntry(null, null, 1);
+        table.insert(bothNull);
+        assertSame(bothNull, table.get(null, null));
+        assertNull(table.get("a", null));
+        assertNull(table.get(null, 1));
+        assertEquals(1, table.size());
+    }
 
-  @Test
-  void growableGrowsPastInitialCapacity() {
-    FlatHashtable.D2<String, Integer, PairEntry> table = growable(1);
-    for (int i = 0; i < 50; i++) {
-      assertTrue(table.insert(new PairEntry("k", i, i)));
+    @Test
+    void getOrCreateOnMissBuildsEntryViaCreator() {
+        FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
+        int[] createCount = {0};
+        PairEntry created = table.getOrCreate("foo", 1, (k1, k2) -> {
+            createCount[0]++;
+            return new PairEntry(k1, k2, 42);
+        });
+        assertNotNull(created);
+        assertEquals("foo", created.key1());
+        assertEquals(1, created.key2());
+        assertEquals(42, created.value);
+        assertEquals(1, table.size());
+        assertEquals(1, createCount[0]);
+        assertSame(created, table.get("foo", 1));
     }
-    assertEquals(50, table.size());
-    for (int i = 0; i < 50; i++) {
-      assertEquals(i, table.get("k", i).value);
+
+    @Test
+    void getOrCreateOnHitSkipsCreator() {
+        FlatHashtable.D2<String, Integer, PairEntry> table = growable(8);
+        PairEntry seeded = new PairEntry("foo", 1, 1);
+        table.insert(seeded);
+        int[] createCount = {0};
+        PairEntry got = table.getOrCreate("foo", 1, (k1, k2) -> {
+            createCount[0]++;
+            return new PairEntry(k1, k2, 999);
+        });
+        assertSame(seeded, got);
+        assertEquals(1, table.size());
+        assertEquals(0, createCount[0]);
     }
-  }
 
-  @Test
-  void fixedGetOrCreateCapsWhenFull() {
-    FlatHashtable.D2<String, Integer, PairEntry> table = fixed(2);
-    assertNotNull(table.getOrCreate("a", 1, (k1, k2) -> new PairEntry(k1, k2, 1)));
-    assertNotNull(table.getOrCreate("b", 2, (k1, k2) -> new PairEntry(k1, k2, 2)));
-    assertEquals(2, table.size());
-    assertNull(table.getOrCreate("c", 3, (k1, k2) -> new PairEntry(k1, k2, 3)));
-    assertEquals(2, table.size());
-    PairEntry a = table.get("a", 1);
-    assertSame(a, table.getOrCreate("a", 1, (k1, k2) -> new PairEntry(k1, k2, 99)));
-  }
+    @Test
+    void growableGrowsPastInitialCapacity() {
+        FlatHashtable.D2<String, Integer, PairEntry> table = growable(1);
+        for (int i = 0; i < 50; i++) {
+            assertTrue(table.insert(new PairEntry("k", i, i)));
+        }
+        assertEquals(50, table.size());
+        for (int i = 0; i < 50; i++) {
+            assertEquals(i, table.get("k", i).value);
+        }
+    }
 
-  @Test
-  void fixedInsertReturnsFalseWhenFull() {
-    FlatHashtable.D2<String, Integer, PairEntry> table = fixed(2);
-    assertTrue(table.insert(new PairEntry("a", 1, 1)));
-    assertTrue(table.insert(new PairEntry("b", 2, 2)));
-    assertFalse(table.insert(new PairEntry("c", 3, 3)));
-    assertEquals(2, table.size());
-  }
+    @Test
+    void fixedGetOrCreateCapsWhenFull() {
+        FlatHashtable.D2<String, Integer, PairEntry> table = fixed(2);
+        assertNotNull(table.getOrCreate("a", 1, (k1, k2) -> new PairEntry(k1, k2, 1)));
+        assertNotNull(table.getOrCreate("b", 2, (k1, k2) -> new PairEntry(k1, k2, 2)));
+        assertEquals(2, table.size());
+        assertNull(table.getOrCreate("c", 3, (k1, k2) -> new PairEntry(k1, k2, 3)));
+        assertEquals(2, table.size());
+        PairEntry a = table.get("a", 1);
+        assertSame(a, table.getOrCreate("a", 1, (k1, k2) -> new PairEntry(k1, k2, 99)));
+    }
 
-  @Test
-  void hashCollisionsResolveByKeyEquality() {
-    FlatHashtable.D2<CollidingKey, CollidingKey, CollidingPairEntry> table =
-        FlatHashtable.D2.createGrowable(CollidingPairEntry.class, 8);
-    CollidingKey key1 = new CollidingKey("a", 7);
-    CollidingKey key2 = new CollidingKey("x", 3);
-    CollidingPairEntry e = new CollidingPairEntry(key1, key2, 100);
-    table.insert(e);
+    @Test
+    void fixedInsertReturnsFalseWhenFull() {
+        FlatHashtable.D2<String, Integer, PairEntry> table = fixed(2);
+        assertTrue(table.insert(new PairEntry("a", 1, 1)));
+        assertTrue(table.insert(new PairEntry("b", 2, 2)));
+        assertFalse(table.insert(new PairEntry("c", 3, 3)));
+        assertEquals(2, table.size());
+    }
 
-    // Same combined hash (31*7 + 3) as the stored entry, but key1 differs by equals: the entry's
-    // matches() must reject on key1, so the lookup misses rather than returning the wrong entry.
-    assertNull(table.get(new CollidingKey("b", 7), key2));
-    // Same combined hash again, key1 equal but key2 differs by equals: matches() must reject on
-    // key2.
-    assertNull(table.get(key1, new CollidingKey("y", 3)));
-    // The genuine key still resolves.
-    assertSame(e, table.get(key1, key2));
-  }
+    @Test
+    void hashCollisionsResolveByKeyEquality() {
+        FlatHashtable.D2<CollidingKey, CollidingKey, CollidingPairEntry> table =
+                FlatHashtable.D2.createGrowable(CollidingPairEntry.class, 8);
+        CollidingKey key1 = new CollidingKey("a", 7);
+        CollidingKey key2 = new CollidingKey("x", 3);
+        CollidingPairEntry e = new CollidingPairEntry(key1, key2, 100);
+        table.insert(e);
 
-  @Test
-  void growableGetOrCreateGrowsPastInitialCapacity() {
-    FlatHashtable.D2<String, Integer, PairEntry> table = growable(1);
-    for (int i = 0; i < 50; i++) {
-      PairEntry e = table.getOrCreate("k", i, (k1, k2) -> new PairEntry(k1, k2, k2));
-      assertNotNull(e);
+        // Same combined hash (31*7 + 3) as the stored entry, but key1 differs by equals: the entry's
+        // matches() must reject on key1, so the lookup misses rather than returning the wrong entry.
+        assertNull(table.get(new CollidingKey("b", 7), key2));
+        // Same combined hash again, key1 equal but key2 differs by equals: matches() must reject on
+        // key2.
+        assertNull(table.get(key1, new CollidingKey("y", 3)));
+        // The genuine key still resolves.
+        assertSame(e, table.get(key1, key2));
     }
-    assertEquals(50, table.size());
-    for (int i = 0; i < 50; i++) {
-      assertEquals(i, table.get("k", i).value);
+
+    @Test
+    void growableGetOrCreateGrowsPastInitialCapacity() {
+        FlatHashtable.D2<String, Integer, PairEntry> table = growable(1);
+        for (int i = 0; i < 50; i++) {
+            PairEntry e = table.getOrCreate("k", i, (k1, k2) -> new PairEntry(k1, k2, k2));
+            assertNotNull(e);
+        }
+        assertEquals(50, table.size());
+        for (int i = 0; i < 50; i++) {
+            assertEquals(i, table.get("k", i).value);
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/FlatHashtableTest.java b/internal-api/src/test/java/datadog/trace/util/FlatHashtableTest.java
index b1099210611..235e4654f53 100644
--- a/internal-api/src/test/java/datadog/trace/util/FlatHashtableTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/FlatHashtableTest.java
@@ -17,570 +17,558 @@
 
 class FlatHashtableTest {
 
-  /** Self-contained entry: carries its own key (the identity FlatHashtable relies on). */
-  static final class TestEntry {
-    final String key;
+    /** Self-contained entry: carries its own key (the identity FlatHashtable relies on). */
+    static final class TestEntry {
+        final String key;
 
-    TestEntry(String key) {
-      this.key = key;
+        TestEntry(String key) {
+            this.key = key;
+        }
     }
-  }
 
-  /**
-   * Stateless concrete strategy over String keys, exposed as a canonical {@code INSTANCE} singleton
-   * (private ctor) so the JIT can specialize each call site. {@code hashKey} defaults to {@code
-   * key.hashCode()}; {@code hashOf} recomputes from the entry's key (this entry doesn't cache it),
-   * consistently with that default.
-   */
-  static final class TestEntryStrategy extends FlatHashtable.EntryStrategy<TestEntry, String> {
-    static final TestEntryStrategy INSTANCE = new TestEntryStrategy();
+    /**
+     * Stateless concrete strategy over String keys, exposed as a canonical {@code INSTANCE} singleton
+     * (private ctor) so the JIT can specialize each call site. {@code hashKey} defaults to {@code
+     * key.hashCode()}; {@code hashOf} recomputes from the entry's key (this entry doesn't cache it),
+     * consistently with that default.
+     */
+    static final class TestEntryStrategy extends FlatHashtable.EntryStrategy<TestEntry, String> {
+        static final TestEntryStrategy INSTANCE = new TestEntryStrategy();
+
+        private TestEntryStrategy() {}
+
+        @Override
+        public boolean matches(TestEntry entry, String key) {
+            return key.equals(entry.key);
+        }
+
+        @Override
+        public long hashOf(TestEntry entry) {
+            return entry.key.hashCode(); // consistent with the default hashKey (key.hashCode())
+        }
+    }
+
+    /** Non-capturing create strategy (a constructor method ref => singleton-cached, alloc-free). */
+    private static final FlatHashtable.CreateStrategy<TestEntry, String> CREATE = TestEntry::new;
+
+    /** All keys/entries hash to slot 0, so inserts chain by linear probing — exercises the probe. */
+    static final class TestCollidingStrategy extends FlatHashtable.EntryStrategy<TestEntry, String> {
+        static final TestCollidingStrategy INSTANCE = new TestCollidingStrategy();
+
+        private TestCollidingStrategy() {}
+
+        @Override
+        public long hashKey(String key) {
+            return 0;
+        }
+
+        @Override
+        public boolean matches(TestEntry entry, String key) {
+            return key.equals(entry.key);
+        }
+
+        @Override
+        public long hashOf(TestEntry entry) {
+            return 0;
+        }
+    }
+
+    /**
+     * Smallest hash {@code >= 1} that the table places on {@code slot} of a {@code mask + 1} table.
+     */
+    private static long hashLandingOn(int slot, int mask) {
+        for (long h = 1; h < 1_000_000L; ++h) {
+            if (FlatHashtable.home(h, mask) == slot) {
+                return h;
+            }
+        }
+        throw new AssertionError("no hash found landing on slot " + slot);
+    }
+
+    /**
+     * All keys hash to the last slot of a 2-slot table (so probing wraps around to index 0). The
+     * table owns the spread now, so we compute a hash that lands there rather than assuming {@code -1
+     * & mask}.
+     */
+    static final class TestLastSlotStrategy extends FlatHashtable.EntryStrategy<TestEntry, String> {
+        static final TestLastSlotStrategy INSTANCE = new TestLastSlotStrategy();
+        private static final long LAST_SLOT_HASH = hashLandingOn(1, 1); // slot 1 of a 2-slot table
+
+        private TestLastSlotStrategy() {}
+
+        @Override
+        public long hashKey(String key) {
+            return LAST_SLOT_HASH;
+        }
+
+        @Override
+        public boolean matches(TestEntry entry, String key) {
+            return key.equals(entry.key);
+        }
+
+        @Override
+        public long hashOf(TestEntry entry) {
+            return LAST_SLOT_HASH;
+        }
+    }
+
+    /**
+     * Entry that caches its own hash (extends the Entry base) — for the entry-taking insert flavor.
+     */
+    static final class TestHashedEntry extends FlatHashtable.Entry {
+        final String key;
+
+        TestHashedEntry(String key) {
+            super(key.hashCode()); // cache the default hashKey (key.hashCode())
+            this.key = key;
+        }
+    }
+
+    /** Strategy for {@link TestHashedEntry}: {@code hashOf} reads the cached hash. */
+    static final class TestHashedStrategy extends FlatHashtable.EntryStrategy<TestHashedEntry, String> {
+        static final TestHashedStrategy INSTANCE = new TestHashedStrategy();
+
+        private TestHashedStrategy() {}
+
+        @Override
+        public boolean matches(TestHashedEntry entry, String key) {
+            return key.equals(entry.key);
+        }
+
+        @Override
+        public long hashOf(TestHashedEntry entry) {
+            return entry.hash;
+        }
+    }
 
-    private TestEntryStrategy() {}
+    /**
+     * Case-insensitive strategy: {@code hashKey} sealed by the CI base, {@code matches} folds case.
+     */
+    static final class TestCaseInsensitiveStrategy extends FlatHashtable.CaseInsensitiveStringStrategy<TestEntry> {
+        static final TestCaseInsensitiveStrategy INSTANCE = new TestCaseInsensitiveStrategy();
 
-    @Override
-    public boolean matches(TestEntry entry, String key) {
-      return key.equals(entry.key);
+        private TestCaseInsensitiveStrategy() {}
+
+        @Override
+        public boolean matches(TestEntry entry, String key) {
+            return key.equalsIgnoreCase(entry.key);
+        }
+
+        @Override
+        public long hashOf(TestEntry entry) {
+            return Strings.caseInsensitiveHashCode(entry.key);
+        }
+    }
+
+    @Test
+    void capacityFor_roundsToPowerOfTwoAtLeastTwiceLimit() {
+        assertEquals(2, FlatHashtable.capacityFor(1));
+        assertEquals(8, FlatHashtable.capacityFor(4));
+        assertEquals(16, FlatHashtable.capacityFor(6)); // 6*2-1=11 -> 8 -> 16
+    }
+
+    @Test
+    void capacityFor_rejectsNonPositive() {
+        assertThrows(IllegalArgumentException.class, () -> FlatHashtable.capacityFor(0));
+        assertThrows(IllegalArgumentException.class, () -> FlatHashtable.capacityFor(-1));
+    }
+
+    @Test
+    void create_allocatesTypedTableOfCapacity() {
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 4);
+        assertEquals(8, table.length);
+        assertEquals(TestEntry.class, table.getClass().getComponentType());
+    }
+
+    @Test
+    void getOrCreate_insertsOnceAndReturnsTheExistingEntry() {
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 8);
+        TestEntry first = FlatHashtable.getOrCreate(table, "a", TestEntryStrategy.INSTANCE, CREATE);
+        assertEquals("a", first.key);
+        // A second call must return the SAME instance, not mint a new one.
+        assertSame(first, FlatHashtable.getOrCreate(table, "a", TestEntryStrategy.INSTANCE, CREATE));
+        assertSame(first, FlatHashtable.get(table, "a", TestEntryStrategy.INSTANCE));
     }
 
-    @Override
-    public long hashOf(TestEntry entry) {
-      return entry.key.hashCode(); // consistent with the default hashKey (key.hashCode())
+    @Test
+    void get_returnsNullForAbsentKey() {
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 8);
+        assertNull(FlatHashtable.get(table, "missing", TestEntryStrategy.INSTANCE));
+        FlatHashtable.getOrCreate(table, "present", TestEntryStrategy.INSTANCE, CREATE);
+        assertNull(FlatHashtable.get(table, "still-missing", TestEntryStrategy.INSTANCE));
     }
-  }
 
-  /** Non-capturing create strategy (a constructor method ref => singleton-cached, alloc-free). */
-  private static final FlatHashtable.CreateStrategy<TestEntry, String> CREATE = TestEntry::new;
+    @Test
+    void getOrCreate_returnsNullWhenTableIsFull() {
+        // capacityFor(1) == 2 slots.
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 1);
+        assertTrue(FlatHashtable.getOrCreate(table, "k0", TestEntryStrategy.INSTANCE, CREATE) != null);
+        assertTrue(FlatHashtable.getOrCreate(table, "k1", TestEntryStrategy.INSTANCE, CREATE) != null);
+        // Both slots occupied by distinct keys -> a third distinct key finds no room.
+        assertNull(FlatHashtable.getOrCreate(table, "k2", TestEntryStrategy.INSTANCE, CREATE));
+        // ...but an existing key still resolves even when full.
+        assertSame(
+                FlatHashtable.get(table, "k0", TestEntryStrategy.INSTANCE),
+                FlatHashtable.getOrCreate(table, "k0", TestEntryStrategy.INSTANCE, CREATE));
+    }
+
+    @Test
+    void hashKey_isStableForEqualKeys() {
+        assertEquals(
+                TestEntryStrategy.INSTANCE.hashKey("route"), TestEntryStrategy.INSTANCE.hashKey(new String("route")));
+    }
+
+    @Test
+    void collision_probesPastOccupiedSlots_andResolvesEach() {
+        // 8 slots; COLLIDING sends all to slot 0
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 4);
+        TestEntry a = FlatHashtable.getOrCreate(table, "a", TestCollidingStrategy.INSTANCE, CREATE);
+        // slot 0 taken -> 1
+        TestEntry b = FlatHashtable.getOrCreate(table, "b", TestCollidingStrategy.INSTANCE, CREATE);
+        // -> slot 2
+        TestEntry c = FlatHashtable.getOrCreate(table, "c", TestCollidingStrategy.INSTANCE, CREATE);
+
+        assertNotSame(a, b);
+        assertNotSame(b, c);
+
+        // each resolves via probe-past-occupied + match-after-probe
+        assertSame(a, FlatHashtable.get(table, "a", TestCollidingStrategy.INSTANCE));
+        assertSame(b, FlatHashtable.get(table, "b", TestCollidingStrategy.INSTANCE));
+        assertSame(c, FlatHashtable.get(table, "c", TestCollidingStrategy.INSTANCE));
+
+        // existing colliding key: found after probing, no new entry minted
+        assertSame(b, FlatHashtable.getOrCreate(table, "b", TestCollidingStrategy.INSTANCE, CREATE));
+
+        // absent key: probe past the 3 occupied slots, hit an empty slot -> null
+        assertNull(FlatHashtable.get(table, "absent", TestCollidingStrategy.INSTANCE));
+    }
 
-  /** All keys/entries hash to slot 0, so inserts chain by linear probing — exercises the probe. */
-  static final class TestCollidingStrategy extends FlatHashtable.EntryStrategy<TestEntry, String> {
-    static final TestCollidingStrategy INSTANCE = new TestCollidingStrategy();
+    @Test
+    void collision_probeWrapsAroundToFront() {
+        // 2 slots (0,1), mask=1; LAST_SLOT starts at 1
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 1);
+        // -> slot 1
+        TestEntry k0 = FlatHashtable.getOrCreate(table, "k0", TestLastSlotStrategy.INSTANCE, CREATE);
+        // taken -> wraps to 0
+        TestEntry k1 = FlatHashtable.getOrCreate(table, "k1", TestLastSlotStrategy.INSTANCE, CREATE);
+
+        assertNotSame(k0, k1);
+        assertSame(k0, FlatHashtable.get(table, "k0", TestLastSlotStrategy.INSTANCE));
+        // start slot 1 is occupied (no match) -> probe wraps to slot 0 -> match
+        assertSame(k1, FlatHashtable.get(table, "k1", TestLastSlotStrategy.INSTANCE));
+    }
 
-    private TestCollidingStrategy() {}
+    @Test
+    void get_returnsNullWhenTableFullAndKeyAbsent() {
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 1); // 2 slots
+        FlatHashtable.getOrCreate(table, "k0", TestCollidingStrategy.INSTANCE, CREATE);
+        // fills slots 0 and 1
+        FlatHashtable.getOrCreate(table, "k1", TestCollidingStrategy.INSTANCE, CREATE);
 
-    @Override
-    public long hashKey(String key) {
-      return 0;
+        // get() probes both occupied slots, wraps back to start -> null (get's full-wrap branch)
+        assertNull(FlatHashtable.get(table, "absent", TestCollidingStrategy.INSTANCE));
     }
 
-    @Override
-    public boolean matches(TestEntry entry, String key) {
-      return key.equals(entry.key);
+    @Test
+    void insert_generalFlavor_placesViaHashOfAndResolves() {
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 8);
+        TestEntry e = new TestEntry("a");
+        // flavor 2: the home comes from TestEntryStrategy.INSTANCE.hashOf(e)
+        assertTrue(FlatHashtable.insert(table, e, TestEntryStrategy.INSTANCE));
+        assertSame(e, FlatHashtable.get(table, "a", TestEntryStrategy.INSTANCE));
     }
 
-    @Override
-    public long hashOf(TestEntry entry) {
-      return 0;
+    @Test
+    void insert_entryFlavor_placesViaCachedHashAndResolves() {
+        TestHashedEntry[] table = FlatHashtable.create(TestHashedEntry.class, 8);
+        TestHashedEntry e = new TestHashedEntry("a");
+        // flavor 1: the home comes from the Entry's own cached hash, no strategy needed
+        assertTrue(FlatHashtable.insert(table, e));
+        assertSame(e, FlatHashtable.get(table, "a", TestHashedStrategy.INSTANCE));
     }
-  }
 
-  /**
-   * Smallest hash {@code >= 1} that the table places on {@code slot} of a {@code mask + 1} table.
-   */
-  private static long hashLandingOn(int slot, int mask) {
-    for (long h = 1; h < 1_000_000L; ++h) {
-      if (FlatHashtable.home(h, mask) == slot) {
-        return h;
-      }
+    @Test
+    void insert_returnsFalseWhenFull() {
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 1); // 2 slots
+        assertTrue(FlatHashtable.insert(table, new TestEntry("k0"), TestEntryStrategy.INSTANCE));
+        assertTrue(FlatHashtable.insert(table, new TestEntry("k1"), TestEntryStrategy.INSTANCE));
+        // no room
+        assertFalse(FlatHashtable.insert(table, new TestEntry("k2"), TestEntryStrategy.INSTANCE));
     }
-    throw new AssertionError("no hash found landing on slot " + slot);
-  }
 
-  /**
-   * All keys hash to the last slot of a 2-slot table (so probing wraps around to index 0). The
-   * table owns the spread now, so we compute a hash that lands there rather than assuming {@code -1
-   * & mask}.
-   */
-  static final class TestLastSlotStrategy extends FlatHashtable.EntryStrategy<TestEntry, String> {
-    static final TestLastSlotStrategy INSTANCE = new TestLastSlotStrategy();
-    private static final long LAST_SLOT_HASH = hashLandingOn(1, 1); // slot 1 of a 2-slot table
+    @Test
+    void forEach_visitsEveryEntry() {
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 8);
+        FlatHashtable.getOrCreate(table, "a", TestEntryStrategy.INSTANCE, CREATE);
+        FlatHashtable.getOrCreate(table, "b", TestEntryStrategy.INSTANCE, CREATE);
+        FlatHashtable.getOrCreate(table, "c", TestEntryStrategy.INSTANCE, CREATE);
+
+        Set<String> seen = new HashSet<>();
+        FlatHashtable.forEach(table, e -> seen.add(e.key));
+        assertEquals(new HashSet<>(Arrays.asList("a", "b", "c")), seen);
+    }
 
-    private TestLastSlotStrategy() {}
+    @Test
+    void forEach_contextVariant_passesContextWithoutCapture() {
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 8);
+        FlatHashtable.getOrCreate(table, "a", TestEntryStrategy.INSTANCE, CREATE);
+        FlatHashtable.getOrCreate(table, "b", TestEntryStrategy.INSTANCE, CREATE);
 
-    @Override
-    public long hashKey(String key) {
-      return LAST_SLOT_HASH;
+        Set<String> seen = new HashSet<>();
+        FlatHashtable.forEach(table, seen, (ctx, e) -> ctx.add(e.key));
+        assertEquals(new HashSet<>(Arrays.asList("a", "b")), seen);
     }
 
-    @Override
-    public boolean matches(TestEntry entry, String key) {
-      return key.equals(entry.key);
+    @Test
+    void iterator_yieldsEveryEntrySharingTheHash() {
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 4); // COLLIDING sends all to slot 0
+        TestEntry a = FlatHashtable.getOrCreate(table, "a", TestCollidingStrategy.INSTANCE, CREATE);
+        TestEntry b = FlatHashtable.getOrCreate(table, "b", TestCollidingStrategy.INSTANCE, CREATE);
+        TestEntry c = FlatHashtable.getOrCreate(table, "c", TestCollidingStrategy.INSTANCE, CREATE);
+
+        Set<TestEntry> seen = new HashSet<>();
+        Iterator<TestEntry> it = FlatHashtable.iterator(table, 0, TestCollidingStrategy.INSTANCE);
+        while (it.hasNext()) {
+            seen.add(it.next());
+        }
+        assertEquals(new HashSet<>(Arrays.asList(a, b, c)), seen);
     }
 
-    @Override
-    public long hashOf(TestEntry entry) {
-      return LAST_SLOT_HASH;
+    @Test
+    void iterator_filtersOutEntriesWithADifferentHash() {
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 4); // entries at slot 0, hashOf == 0
+        FlatHashtable.getOrCreate(table, "a", TestCollidingStrategy.INSTANCE, CREATE);
+        FlatHashtable.getOrCreate(table, "b", TestCollidingStrategy.INSTANCE, CREATE);
+
+        // a hash that shares the entries' home slot (0) but that no stored entry has as its hashOf
+        long sameHomeOtherHash = hashLandingOn(0, table.length - 1);
+        Iterator<TestEntry> it = FlatHashtable.iterator(table, sameHomeOtherHash, TestCollidingStrategy.INSTANCE);
+        assertFalse(it.hasNext());
     }
-  }
 
-  /**
-   * Entry that caches its own hash (extends the Entry base) — for the entry-taking insert flavor.
-   */
-  static final class TestHashedEntry extends FlatHashtable.Entry {
-    final String key;
-
-    TestHashedEntry(String key) {
-      super(key.hashCode()); // cache the default hashKey (key.hashCode())
-      this.key = key;
-    }
-  }
-
-  /** Strategy for {@link TestHashedEntry}: {@code hashOf} reads the cached hash. */
-  static final class TestHashedStrategy
-      extends FlatHashtable.EntryStrategy<TestHashedEntry, String> {
-    static final TestHashedStrategy INSTANCE = new TestHashedStrategy();
-
-    private TestHashedStrategy() {}
-
-    @Override
-    public boolean matches(TestHashedEntry entry, String key) {
-      return key.equals(entry.key);
-    }
-
-    @Override
-    public long hashOf(TestHashedEntry entry) {
-      return entry.hash;
-    }
-  }
-
-  /**
-   * Case-insensitive strategy: {@code hashKey} sealed by the CI base, {@code matches} folds case.
-   */
-  static final class TestCaseInsensitiveStrategy
-      extends FlatHashtable.CaseInsensitiveStringStrategy<TestEntry> {
-    static final TestCaseInsensitiveStrategy INSTANCE = new TestCaseInsensitiveStrategy();
-
-    private TestCaseInsensitiveStrategy() {}
-
-    @Override
-    public boolean matches(TestEntry entry, String key) {
-      return key.equalsIgnoreCase(entry.key);
-    }
-
-    @Override
-    public long hashOf(TestEntry entry) {
-      return Strings.caseInsensitiveHashCode(entry.key);
-    }
-  }
-
-  @Test
-  void capacityFor_roundsToPowerOfTwoAtLeastTwiceLimit() {
-    assertEquals(2, FlatHashtable.capacityFor(1));
-    assertEquals(8, FlatHashtable.capacityFor(4));
-    assertEquals(16, FlatHashtable.capacityFor(6)); // 6*2-1=11 -> 8 -> 16
-  }
-
-  @Test
-  void capacityFor_rejectsNonPositive() {
-    assertThrows(IllegalArgumentException.class, () -> FlatHashtable.capacityFor(0));
-    assertThrows(IllegalArgumentException.class, () -> FlatHashtable.capacityFor(-1));
-  }
-
-  @Test
-  void create_allocatesTypedTableOfCapacity() {
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 4);
-    assertEquals(8, table.length);
-    assertEquals(TestEntry.class, table.getClass().getComponentType());
-  }
-
-  @Test
-  void getOrCreate_insertsOnceAndReturnsTheExistingEntry() {
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 8);
-    TestEntry first = FlatHashtable.getOrCreate(table, "a", TestEntryStrategy.INSTANCE, CREATE);
-    assertEquals("a", first.key);
-    // A second call must return the SAME instance, not mint a new one.
-    assertSame(first, FlatHashtable.getOrCreate(table, "a", TestEntryStrategy.INSTANCE, CREATE));
-    assertSame(first, FlatHashtable.get(table, "a", TestEntryStrategy.INSTANCE));
-  }
-
-  @Test
-  void get_returnsNullForAbsentKey() {
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 8);
-    assertNull(FlatHashtable.get(table, "missing", TestEntryStrategy.INSTANCE));
-    FlatHashtable.getOrCreate(table, "present", TestEntryStrategy.INSTANCE, CREATE);
-    assertNull(FlatHashtable.get(table, "still-missing", TestEntryStrategy.INSTANCE));
-  }
-
-  @Test
-  void getOrCreate_returnsNullWhenTableIsFull() {
-    // capacityFor(1) == 2 slots.
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 1);
-    assertTrue(FlatHashtable.getOrCreate(table, "k0", TestEntryStrategy.INSTANCE, CREATE) != null);
-    assertTrue(FlatHashtable.getOrCreate(table, "k1", TestEntryStrategy.INSTANCE, CREATE) != null);
-    // Both slots occupied by distinct keys -> a third distinct key finds no room.
-    assertNull(FlatHashtable.getOrCreate(table, "k2", TestEntryStrategy.INSTANCE, CREATE));
-    // ...but an existing key still resolves even when full.
-    assertSame(
-        FlatHashtable.get(table, "k0", TestEntryStrategy.INSTANCE),
-        FlatHashtable.getOrCreate(table, "k0", TestEntryStrategy.INSTANCE, CREATE));
-  }
-
-  @Test
-  void hashKey_isStableForEqualKeys() {
-    assertEquals(
-        TestEntryStrategy.INSTANCE.hashKey("route"),
-        TestEntryStrategy.INSTANCE.hashKey(new String("route")));
-  }
-
-  @Test
-  void collision_probesPastOccupiedSlots_andResolvesEach() {
-    // 8 slots; COLLIDING sends all to slot 0
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 4);
-    TestEntry a = FlatHashtable.getOrCreate(table, "a", TestCollidingStrategy.INSTANCE, CREATE);
-    // slot 0 taken -> 1
-    TestEntry b = FlatHashtable.getOrCreate(table, "b", TestCollidingStrategy.INSTANCE, CREATE);
-    // -> slot 2
-    TestEntry c = FlatHashtable.getOrCreate(table, "c", TestCollidingStrategy.INSTANCE, CREATE);
-
-    assertNotSame(a, b);
-    assertNotSame(b, c);
-
-    // each resolves via probe-past-occupied + match-after-probe
-    assertSame(a, FlatHashtable.get(table, "a", TestCollidingStrategy.INSTANCE));
-    assertSame(b, FlatHashtable.get(table, "b", TestCollidingStrategy.INSTANCE));
-    assertSame(c, FlatHashtable.get(table, "c", TestCollidingStrategy.INSTANCE));
-
-    // existing colliding key: found after probing, no new entry minted
-    assertSame(b, FlatHashtable.getOrCreate(table, "b", TestCollidingStrategy.INSTANCE, CREATE));
-
-    // absent key: probe past the 3 occupied slots, hit an empty slot -> null
-    assertNull(FlatHashtable.get(table, "absent", TestCollidingStrategy.INSTANCE));
-  }
-
-  @Test
-  void collision_probeWrapsAroundToFront() {
-    // 2 slots (0,1), mask=1; LAST_SLOT starts at 1
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 1);
-    // -> slot 1
-    TestEntry k0 = FlatHashtable.getOrCreate(table, "k0", TestLastSlotStrategy.INSTANCE, CREATE);
-    // taken -> wraps to 0
-    TestEntry k1 = FlatHashtable.getOrCreate(table, "k1", TestLastSlotStrategy.INSTANCE, CREATE);
-
-    assertNotSame(k0, k1);
-    assertSame(k0, FlatHashtable.get(table, "k0", TestLastSlotStrategy.INSTANCE));
-    // start slot 1 is occupied (no match) -> probe wraps to slot 0 -> match
-    assertSame(k1, FlatHashtable.get(table, "k1", TestLastSlotStrategy.INSTANCE));
-  }
-
-  @Test
-  void get_returnsNullWhenTableFullAndKeyAbsent() {
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 1); // 2 slots
-    FlatHashtable.getOrCreate(table, "k0", TestCollidingStrategy.INSTANCE, CREATE);
-    // fills slots 0 and 1
-    FlatHashtable.getOrCreate(table, "k1", TestCollidingStrategy.INSTANCE, CREATE);
-
-    // get() probes both occupied slots, wraps back to start -> null (get's full-wrap branch)
-    assertNull(FlatHashtable.get(table, "absent", TestCollidingStrategy.INSTANCE));
-  }
-
-  @Test
-  void insert_generalFlavor_placesViaHashOfAndResolves() {
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 8);
-    TestEntry e = new TestEntry("a");
-    // flavor 2: the home comes from TestEntryStrategy.INSTANCE.hashOf(e)
-    assertTrue(FlatHashtable.insert(table, e, TestEntryStrategy.INSTANCE));
-    assertSame(e, FlatHashtable.get(table, "a", TestEntryStrategy.INSTANCE));
-  }
-
-  @Test
-  void insert_entryFlavor_placesViaCachedHashAndResolves() {
-    TestHashedEntry[] table = FlatHashtable.create(TestHashedEntry.class, 8);
-    TestHashedEntry e = new TestHashedEntry("a");
-    // flavor 1: the home comes from the Entry's own cached hash, no strategy needed
-    assertTrue(FlatHashtable.insert(table, e));
-    assertSame(e, FlatHashtable.get(table, "a", TestHashedStrategy.INSTANCE));
-  }
-
-  @Test
-  void insert_returnsFalseWhenFull() {
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 1); // 2 slots
-    assertTrue(FlatHashtable.insert(table, new TestEntry("k0"), TestEntryStrategy.INSTANCE));
-    assertTrue(FlatHashtable.insert(table, new TestEntry("k1"), TestEntryStrategy.INSTANCE));
-    // no room
-    assertFalse(FlatHashtable.insert(table, new TestEntry("k2"), TestEntryStrategy.INSTANCE));
-  }
-
-  @Test
-  void forEach_visitsEveryEntry() {
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 8);
-    FlatHashtable.getOrCreate(table, "a", TestEntryStrategy.INSTANCE, CREATE);
-    FlatHashtable.getOrCreate(table, "b", TestEntryStrategy.INSTANCE, CREATE);
-    FlatHashtable.getOrCreate(table, "c", TestEntryStrategy.INSTANCE, CREATE);
-
-    Set<String> seen = new HashSet<>();
-    FlatHashtable.forEach(table, e -> seen.add(e.key));
-    assertEquals(new HashSet<>(Arrays.asList("a", "b", "c")), seen);
-  }
-
-  @Test
-  void forEach_contextVariant_passesContextWithoutCapture() {
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 8);
-    FlatHashtable.getOrCreate(table, "a", TestEntryStrategy.INSTANCE, CREATE);
-    FlatHashtable.getOrCreate(table, "b", TestEntryStrategy.INSTANCE, CREATE);
-
-    Set<String> seen = new HashSet<>();
-    FlatHashtable.forEach(table, seen, (ctx, e) -> ctx.add(e.key));
-    assertEquals(new HashSet<>(Arrays.asList("a", "b")), seen);
-  }
-
-  @Test
-  void iterator_yieldsEveryEntrySharingTheHash() {
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 4); // COLLIDING sends all to slot 0
-    TestEntry a = FlatHashtable.getOrCreate(table, "a", TestCollidingStrategy.INSTANCE, CREATE);
-    TestEntry b = FlatHashtable.getOrCreate(table, "b", TestCollidingStrategy.INSTANCE, CREATE);
-    TestEntry c = FlatHashtable.getOrCreate(table, "c", TestCollidingStrategy.INSTANCE, CREATE);
-
-    Set<TestEntry> seen = new HashSet<>();
-    Iterator<TestEntry> it = FlatHashtable.iterator(table, 0, TestCollidingStrategy.INSTANCE);
-    while (it.hasNext()) {
-      seen.add(it.next());
-    }
-    assertEquals(new HashSet<>(Arrays.asList(a, b, c)), seen);
-  }
-
-  @Test
-  void iterator_filtersOutEntriesWithADifferentHash() {
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 4); // entries at slot 0, hashOf == 0
-    FlatHashtable.getOrCreate(table, "a", TestCollidingStrategy.INSTANCE, CREATE);
-    FlatHashtable.getOrCreate(table, "b", TestCollidingStrategy.INSTANCE, CREATE);
-
-    // a hash that shares the entries' home slot (0) but that no stored entry has as its hashOf
-    long sameHomeOtherHash = hashLandingOn(0, table.length - 1);
-    Iterator<TestEntry> it =
-        FlatHashtable.iterator(table, sameHomeOtherHash, TestCollidingStrategy.INSTANCE);
-    assertFalse(it.hasNext());
-  }
-
-  @Test
-  void iterator_emptyRunHasNoNext() {
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 4);
-    Iterator<TestEntry> it = FlatHashtable.iterator(table, 0, TestCollidingStrategy.INSTANCE);
-    assertFalse(it.hasNext());
-    assertThrows(NoSuchElementException.class, it::next);
-  }
-
-  @Test
-  void iterator_fullTable_yieldsMatchesIncludingTheWrappingSlot() {
-    // 2 slots, both filled by colliding (hash 0) entries -> the probe has no empty slot to stop at,
-    // so the traversal must yield the entry on the wrapping slot and then terminate on wrap.
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 1);
-    TestEntry a = FlatHashtable.getOrCreate(table, "a", TestCollidingStrategy.INSTANCE, CREATE);
-    TestEntry b = FlatHashtable.getOrCreate(table, "b", TestCollidingStrategy.INSTANCE, CREATE);
-
-    Set<TestEntry> seen = new HashSet<>();
-    Iterator<TestEntry> it = FlatHashtable.iterator(table, 0, TestCollidingStrategy.INSTANCE);
-    while (it.hasNext()) {
-      seen.add(it.next());
-    }
-    assertEquals(new HashSet<>(Arrays.asList(a, b)), seen);
-  }
-
-  @Test
-  void iterator_fullTable_absentHash_terminatesOnWrap() {
-    // Full table, iterating a hash no stored entry has (all hashOf == 0) -> the traversal walks
-    // every slot and wraps without ever hitting an empty one, then reports no elements.
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 1);
-    FlatHashtable.getOrCreate(table, "a", TestCollidingStrategy.INSTANCE, CREATE);
-    FlatHashtable.getOrCreate(table, "b", TestCollidingStrategy.INSTANCE, CREATE);
-
-    Iterator<TestEntry> it = FlatHashtable.iterator(table, 5, TestCollidingStrategy.INSTANCE);
-    assertFalse(it.hasNext());
-  }
-
-  @Test
-  void capacityFor_honorsLoadFactor() {
-    // default 0.5 -> >= 2x; LOW 0.25 -> >= 4x.
-    assertEquals(8, FlatHashtable.capacityFor(4, FlatHashtable.DEFAULT_LOAD_FACTOR));
-    assertEquals(16, FlatHashtable.capacityFor(4, FlatHashtable.LOW_LOAD_FACTOR));
-    // capacityFor(cardinalityLimit) delegates to the default.
-    assertEquals(FlatHashtable.capacityFor(6), FlatHashtable.capacityFor(6, 0.5f));
-  }
-
-  @Test
-  void capacityFor_rejectsLoadFactorOutOfRange() {
-    assertThrows(IllegalArgumentException.class, () -> FlatHashtable.capacityFor(4, 0f));
-    assertThrows(IllegalArgumentException.class, () -> FlatHashtable.capacityFor(4, 1f));
-    assertThrows(IllegalArgumentException.class, () -> FlatHashtable.capacityFor(4, -0.1f));
-  }
-
-  @Test
-  void capacityFor_rejectsCardinalityRequiringCapacityAboveMaxInt() {
-    // 536870913 at 0.5 needs 2^31 slots, which overflows a signed int -> clear error, not
-    // an opaque NegativeArraySizeException from create().
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> FlatHashtable.capacityFor(536870913, FlatHashtable.DEFAULT_LOAD_FACTOR));
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> FlatHashtable.capacityFor(268435457, FlatHashtable.LOW_LOAD_FACTOR));
-  }
-
-  @Test
-  void grownLength_doublesNormally() {
-    assertEquals(8, FlatHashtable.grownLength(4));
-    assertEquals(1 << 30, FlatHashtable.grownLength(1 << 29));
-  }
-
-  @Test
-  void grownLength_rejectsOverflowingCurrentLength() {
-    // 1 << 30 doubled overflows a signed int -> clear error, not an opaque
-    // NegativeArraySizeException from Array.newInstance() deep inside resize()/grow().
-    assertThrows(IllegalStateException.class, () -> FlatHashtable.grownLength(1 << 30));
-  }
-
-  @Test
-  void create_honorsLoadFactor() {
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 4, FlatHashtable.LOW_LOAD_FACTOR);
-    assertEquals(16, table.length);
-  }
-
-  @Test
-  void resize_generalFlavor_growsAndKeepsEveryEntryFindable() {
-    // 8 slots with only 2 entries -> the rehash loop skips empty slots as well as copying entries.
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 4);
-    FlatHashtable.insert(table, new TestEntry("a"), TestEntryStrategy.INSTANCE);
-    FlatHashtable.insert(table, new TestEntry("b"), TestEntryStrategy.INSTANCE);
-
-    TestEntry[] grown = FlatHashtable.resize(table, TestEntryStrategy.INSTANCE);
-    assertEquals(16, grown.length);
-    assertNotSame(table, grown);
-    assertEquals("a", FlatHashtable.get(grown, "a", TestEntryStrategy.INSTANCE).key);
-    assertEquals("b", FlatHashtable.get(grown, "b", TestEntryStrategy.INSTANCE).key);
-  }
-
-  @Test
-  void resize_entryFlavor_growsAndKeepsEveryEntryFindable() {
-    TestHashedEntry[] table = FlatHashtable.create(TestHashedEntry.class, 4); // 8 slots, 2 entries
-    FlatHashtable.insert(table, new TestHashedEntry("a"));
-    FlatHashtable.insert(table, new TestHashedEntry("b"));
-
-    TestHashedEntry[] grown = FlatHashtable.resize(table);
-    assertEquals(16, grown.length);
-    assertEquals("a", FlatHashtable.get(grown, "a", TestHashedStrategy.INSTANCE).key);
-    assertEquals("b", FlatHashtable.get(grown, "b", TestHashedStrategy.INSTANCE).key);
-  }
-
-  @Test
-  void resizingInsert_generalFlavor_growsPastCapacityAndReturnsTheTable() {
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 1); // 2 slots
-    for (int i = 0; i < 10; ++i) {
-      table =
-          FlatHashtable.resizingInsert(table, new TestEntry("k" + i), TestEntryStrategy.INSTANCE);
-    }
-    assertTrue(table.length >= 16); // grew from 2 to hold 10 at load factor <= 0.5
-    for (int i = 0; i < 10; ++i) {
-      assertEquals("k" + i, FlatHashtable.get(table, "k" + i, TestEntryStrategy.INSTANCE).key);
-    }
-  }
-
-  @Test
-  void resizingInsert_entryFlavor_growsPastCapacityAndReturnsTheTable() {
-    TestHashedEntry[] table = FlatHashtable.create(TestHashedEntry.class, 1); // 2 slots
-    for (int i = 0; i < 10; ++i) {
-      table = FlatHashtable.resizingInsert(table, new TestHashedEntry("k" + i));
-    }
-    assertTrue(table.length >= 16);
-    for (int i = 0; i < 10; ++i) {
-      assertEquals("k" + i, FlatHashtable.get(table, "k" + i, TestHashedStrategy.INSTANCE).key);
-    }
-  }
-
-  /** Entry with an explicitly-set cached hash — lets a test force a shared-hash bucket. */
-  static final class TestHashEntry extends FlatHashtable.Entry {
-    final String key;
-
-    TestHashEntry(String key, long hash) {
-      super(hash);
-      this.key = key;
-    }
-  }
-
-  @Test
-  void entryIterator_yieldsEveryEntrySharingTheHash() {
-    TestHashEntry[] table = FlatHashtable.create(TestHashEntry.class, 4);
-    TestHashEntry a = new TestHashEntry("a", 0);
-    TestHashEntry b = new TestHashEntry("b", 0);
-    TestHashEntry c = new TestHashEntry("c", 0);
-    FlatHashtable.insert(table, a);
-    FlatHashtable.insert(table, b);
-    FlatHashtable.insert(table, c);
-
-    Set<TestHashEntry> seen = new HashSet<>();
-    // 2-arg Entry overload -> the specialized iterator (constant strategy, inlined hashOf).
-    Iterator<TestHashEntry> it = FlatHashtable.iterator(table, 0);
-    while (it.hasNext()) {
-      seen.add(it.next());
-    }
-    assertEquals(new HashSet<>(Arrays.asList(a, b, c)), seen);
-  }
-
-  @Test
-  void entryIterator_filtersOutEntriesWithADifferentHash() {
-    TestHashEntry[] table = FlatHashtable.create(TestHashEntry.class, 4); // 8 slots, mask 7
-    FlatHashtable.insert(table, new TestHashEntry("a", 0));
-    FlatHashtable.insert(table, new TestHashEntry("b", 0));
-    // shares the home slot (0) but a different hash -> must be filtered out
-    long otherHash = hashLandingOn(0, table.length - 1);
-    FlatHashtable.insert(table, new TestHashEntry("c", otherHash));
-
-    int yielded = 0;
-    Iterator<TestHashEntry> it = FlatHashtable.iterator(table, 0);
-    while (it.hasNext()) {
-      assertEquals(0, it.next().hash);
-      yielded++;
-    }
-    assertEquals(2, yielded);
-  }
-
-  @Test
-  void entryIterator_emptyRunHasNoNext() {
-    TestHashEntry[] table = FlatHashtable.create(TestHashEntry.class, 4);
-    Iterator<TestHashEntry> it = FlatHashtable.iterator(table, 0);
-    assertFalse(it.hasNext());
-    assertThrows(NoSuchElementException.class, it::next);
-  }
-
-  @Test
-  void caseInsensitiveStrategy_matchesRegardlessOfCase() {
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 4);
-    TestEntry stored =
-        FlatHashtable.getOrCreate(
-            table, "Content-Type", TestCaseInsensitiveStrategy.INSTANCE, CREATE);
-
-    // Look-ups in any case resolve to the same stored entry, allocation-free.
-    assertSame(
-        stored, FlatHashtable.get(table, "content-type", TestCaseInsensitiveStrategy.INSTANCE));
-    assertSame(
-        stored, FlatHashtable.get(table, "CONTENT-TYPE", TestCaseInsensitiveStrategy.INSTANCE));
-    assertSame(
-        stored, FlatHashtable.get(table, "cOnTeNt-TyPe", TestCaseInsensitiveStrategy.INSTANCE));
-    // getOrCreate with a differently-cased key does not mint a second entry.
-    assertSame(
-        stored,
-        FlatHashtable.getOrCreate(
-            table, "CONTENT-TYPE", TestCaseInsensitiveStrategy.INSTANCE, CREATE));
-    assertNull(FlatHashtable.get(table, "content-length", TestCaseInsensitiveStrategy.INSTANCE));
-  }
-
-  /**
-   * End-to-end regression for the supplementary-plane false-miss: a per-{@code char} hash fold
-   * hashed this pair differently even where {@code equalsIgnoreCase} treats them as equal (JDK 9+),
-   * so {@code get} would stop probing at the first empty slot and never find the stored entry.
-   * Folding by code point keeps the hash consistent with {@code matches}, so the lookup finds it.
-   * Guarded by {@code equalsIgnoreCase} itself so the test is correct on JDK 8 too, where the pair
-   * is merely a benign collision {@code matches} resolves to no match.
-   */
-  @Test
-  void caseInsensitiveStrategy_doesNotFalseMissOnSupplementaryCasePair() {
-    String s1 = new String(Character.toChars(0x10400)); // DESERET CAPITAL LETTER LONG I
-    String s2 = new String(Character.toChars(0x10428)); // DESERET SMALL LETTER LONG I
-    TestEntry[] table = FlatHashtable.create(TestEntry.class, 4);
-    TestEntry stored =
-        FlatHashtable.getOrCreate(table, s1, TestCaseInsensitiveStrategy.INSTANCE, CREATE);
-
-    if (s1.equalsIgnoreCase(s2)) {
-      assertSame(stored, FlatHashtable.get(table, s2, TestCaseInsensitiveStrategy.INSTANCE));
-    } else {
-      assertNull(FlatHashtable.get(table, s2, TestCaseInsensitiveStrategy.INSTANCE));
-    }
-  }
+    @Test
+    void iterator_emptyRunHasNoNext() {
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 4);
+        Iterator<TestEntry> it = FlatHashtable.iterator(table, 0, TestCollidingStrategy.INSTANCE);
+        assertFalse(it.hasNext());
+        assertThrows(NoSuchElementException.class, it::next);
+    }
+
+    @Test
+    void iterator_fullTable_yieldsMatchesIncludingTheWrappingSlot() {
+        // 2 slots, both filled by colliding (hash 0) entries -> the probe has no empty slot to stop at,
+        // so the traversal must yield the entry on the wrapping slot and then terminate on wrap.
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 1);
+        TestEntry a = FlatHashtable.getOrCreate(table, "a", TestCollidingStrategy.INSTANCE, CREATE);
+        TestEntry b = FlatHashtable.getOrCreate(table, "b", TestCollidingStrategy.INSTANCE, CREATE);
+
+        Set<TestEntry> seen = new HashSet<>();
+        Iterator<TestEntry> it = FlatHashtable.iterator(table, 0, TestCollidingStrategy.INSTANCE);
+        while (it.hasNext()) {
+            seen.add(it.next());
+        }
+        assertEquals(new HashSet<>(Arrays.asList(a, b)), seen);
+    }
+
+    @Test
+    void iterator_fullTable_absentHash_terminatesOnWrap() {
+        // Full table, iterating a hash no stored entry has (all hashOf == 0) -> the traversal walks
+        // every slot and wraps without ever hitting an empty one, then reports no elements.
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 1);
+        FlatHashtable.getOrCreate(table, "a", TestCollidingStrategy.INSTANCE, CREATE);
+        FlatHashtable.getOrCreate(table, "b", TestCollidingStrategy.INSTANCE, CREATE);
+
+        Iterator<TestEntry> it = FlatHashtable.iterator(table, 5, TestCollidingStrategy.INSTANCE);
+        assertFalse(it.hasNext());
+    }
+
+    @Test
+    void capacityFor_honorsLoadFactor() {
+        // default 0.5 -> >= 2x; LOW 0.25 -> >= 4x.
+        assertEquals(8, FlatHashtable.capacityFor(4, FlatHashtable.DEFAULT_LOAD_FACTOR));
+        assertEquals(16, FlatHashtable.capacityFor(4, FlatHashtable.LOW_LOAD_FACTOR));
+        // capacityFor(cardinalityLimit) delegates to the default.
+        assertEquals(FlatHashtable.capacityFor(6), FlatHashtable.capacityFor(6, 0.5f));
+    }
+
+    @Test
+    void capacityFor_rejectsLoadFactorOutOfRange() {
+        assertThrows(IllegalArgumentException.class, () -> FlatHashtable.capacityFor(4, 0f));
+        assertThrows(IllegalArgumentException.class, () -> FlatHashtable.capacityFor(4, 1f));
+        assertThrows(IllegalArgumentException.class, () -> FlatHashtable.capacityFor(4, -0.1f));
+    }
+
+    @Test
+    void capacityFor_rejectsCardinalityRequiringCapacityAboveMaxInt() {
+        // 536870913 at 0.5 needs 2^31 slots, which overflows a signed int -> clear error, not
+        // an opaque NegativeArraySizeException from create().
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> FlatHashtable.capacityFor(536870913, FlatHashtable.DEFAULT_LOAD_FACTOR));
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> FlatHashtable.capacityFor(268435457, FlatHashtable.LOW_LOAD_FACTOR));
+    }
+
+    @Test
+    void grownLength_doublesNormally() {
+        assertEquals(8, FlatHashtable.grownLength(4));
+        assertEquals(1 << 30, FlatHashtable.grownLength(1 << 29));
+    }
+
+    @Test
+    void grownLength_rejectsOverflowingCurrentLength() {
+        // 1 << 30 doubled overflows a signed int -> clear error, not an opaque
+        // NegativeArraySizeException from Array.newInstance() deep inside resize()/grow().
+        assertThrows(IllegalStateException.class, () -> FlatHashtable.grownLength(1 << 30));
+    }
+
+    @Test
+    void create_honorsLoadFactor() {
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 4, FlatHashtable.LOW_LOAD_FACTOR);
+        assertEquals(16, table.length);
+    }
+
+    @Test
+    void resize_generalFlavor_growsAndKeepsEveryEntryFindable() {
+        // 8 slots with only 2 entries -> the rehash loop skips empty slots as well as copying entries.
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 4);
+        FlatHashtable.insert(table, new TestEntry("a"), TestEntryStrategy.INSTANCE);
+        FlatHashtable.insert(table, new TestEntry("b"), TestEntryStrategy.INSTANCE);
+
+        TestEntry[] grown = FlatHashtable.resize(table, TestEntryStrategy.INSTANCE);
+        assertEquals(16, grown.length);
+        assertNotSame(table, grown);
+        assertEquals("a", FlatHashtable.get(grown, "a", TestEntryStrategy.INSTANCE).key);
+        assertEquals("b", FlatHashtable.get(grown, "b", TestEntryStrategy.INSTANCE).key);
+    }
+
+    @Test
+    void resize_entryFlavor_growsAndKeepsEveryEntryFindable() {
+        TestHashedEntry[] table = FlatHashtable.create(TestHashedEntry.class, 4); // 8 slots, 2 entries
+        FlatHashtable.insert(table, new TestHashedEntry("a"));
+        FlatHashtable.insert(table, new TestHashedEntry("b"));
+
+        TestHashedEntry[] grown = FlatHashtable.resize(table);
+        assertEquals(16, grown.length);
+        assertEquals("a", FlatHashtable.get(grown, "a", TestHashedStrategy.INSTANCE).key);
+        assertEquals("b", FlatHashtable.get(grown, "b", TestHashedStrategy.INSTANCE).key);
+    }
+
+    @Test
+    void resizingInsert_generalFlavor_growsPastCapacityAndReturnsTheTable() {
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 1); // 2 slots
+        for (int i = 0; i < 10; ++i) {
+            table = FlatHashtable.resizingInsert(table, new TestEntry("k" + i), TestEntryStrategy.INSTANCE);
+        }
+        assertTrue(table.length >= 16); // grew from 2 to hold 10 at load factor <= 0.5
+        for (int i = 0; i < 10; ++i) {
+            assertEquals("k" + i, FlatHashtable.get(table, "k" + i, TestEntryStrategy.INSTANCE).key);
+        }
+    }
+
+    @Test
+    void resizingInsert_entryFlavor_growsPastCapacityAndReturnsTheTable() {
+        TestHashedEntry[] table = FlatHashtable.create(TestHashedEntry.class, 1); // 2 slots
+        for (int i = 0; i < 10; ++i) {
+            table = FlatHashtable.resizingInsert(table, new TestHashedEntry("k" + i));
+        }
+        assertTrue(table.length >= 16);
+        for (int i = 0; i < 10; ++i) {
+            assertEquals("k" + i, FlatHashtable.get(table, "k" + i, TestHashedStrategy.INSTANCE).key);
+        }
+    }
+
+    /** Entry with an explicitly-set cached hash — lets a test force a shared-hash bucket. */
+    static final class TestHashEntry extends FlatHashtable.Entry {
+        final String key;
+
+        TestHashEntry(String key, long hash) {
+            super(hash);
+            this.key = key;
+        }
+    }
+
+    @Test
+    void entryIterator_yieldsEveryEntrySharingTheHash() {
+        TestHashEntry[] table = FlatHashtable.create(TestHashEntry.class, 4);
+        TestHashEntry a = new TestHashEntry("a", 0);
+        TestHashEntry b = new TestHashEntry("b", 0);
+        TestHashEntry c = new TestHashEntry("c", 0);
+        FlatHashtable.insert(table, a);
+        FlatHashtable.insert(table, b);
+        FlatHashtable.insert(table, c);
+
+        Set<TestHashEntry> seen = new HashSet<>();
+        // 2-arg Entry overload -> the specialized iterator (constant strategy, inlined hashOf).
+        Iterator<TestHashEntry> it = FlatHashtable.iterator(table, 0);
+        while (it.hasNext()) {
+            seen.add(it.next());
+        }
+        assertEquals(new HashSet<>(Arrays.asList(a, b, c)), seen);
+    }
+
+    @Test
+    void entryIterator_filtersOutEntriesWithADifferentHash() {
+        TestHashEntry[] table = FlatHashtable.create(TestHashEntry.class, 4); // 8 slots, mask 7
+        FlatHashtable.insert(table, new TestHashEntry("a", 0));
+        FlatHashtable.insert(table, new TestHashEntry("b", 0));
+        // shares the home slot (0) but a different hash -> must be filtered out
+        long otherHash = hashLandingOn(0, table.length - 1);
+        FlatHashtable.insert(table, new TestHashEntry("c", otherHash));
+
+        int yielded = 0;
+        Iterator<TestHashEntry> it = FlatHashtable.iterator(table, 0);
+        while (it.hasNext()) {
+            assertEquals(0, it.next().hash);
+            yielded++;
+        }
+        assertEquals(2, yielded);
+    }
+
+    @Test
+    void entryIterator_emptyRunHasNoNext() {
+        TestHashEntry[] table = FlatHashtable.create(TestHashEntry.class, 4);
+        Iterator<TestHashEntry> it = FlatHashtable.iterator(table, 0);
+        assertFalse(it.hasNext());
+        assertThrows(NoSuchElementException.class, it::next);
+    }
+
+    @Test
+    void caseInsensitiveStrategy_matchesRegardlessOfCase() {
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 4);
+        TestEntry stored =
+                FlatHashtable.getOrCreate(table, "Content-Type", TestCaseInsensitiveStrategy.INSTANCE, CREATE);
+
+        // Look-ups in any case resolve to the same stored entry, allocation-free.
+        assertSame(stored, FlatHashtable.get(table, "content-type", TestCaseInsensitiveStrategy.INSTANCE));
+        assertSame(stored, FlatHashtable.get(table, "CONTENT-TYPE", TestCaseInsensitiveStrategy.INSTANCE));
+        assertSame(stored, FlatHashtable.get(table, "cOnTeNt-TyPe", TestCaseInsensitiveStrategy.INSTANCE));
+        // getOrCreate with a differently-cased key does not mint a second entry.
+        assertSame(
+                stored, FlatHashtable.getOrCreate(table, "CONTENT-TYPE", TestCaseInsensitiveStrategy.INSTANCE, CREATE));
+        assertNull(FlatHashtable.get(table, "content-length", TestCaseInsensitiveStrategy.INSTANCE));
+    }
+
+    /**
+     * End-to-end regression for the supplementary-plane false-miss: a per-{@code char} hash fold
+     * hashed this pair differently even where {@code equalsIgnoreCase} treats them as equal (JDK 9+),
+     * so {@code get} would stop probing at the first empty slot and never find the stored entry.
+     * Folding by code point keeps the hash consistent with {@code matches}, so the lookup finds it.
+     * Guarded by {@code equalsIgnoreCase} itself so the test is correct on JDK 8 too, where the pair
+     * is merely a benign collision {@code matches} resolves to no match.
+     */
+    @Test
+    void caseInsensitiveStrategy_doesNotFalseMissOnSupplementaryCasePair() {
+        String s1 = new String(Character.toChars(0x10400)); // DESERET CAPITAL LETTER LONG I
+        String s2 = new String(Character.toChars(0x10428)); // DESERET SMALL LETTER LONG I
+        TestEntry[] table = FlatHashtable.create(TestEntry.class, 4);
+        TestEntry stored = FlatHashtable.getOrCreate(table, s1, TestCaseInsensitiveStrategy.INSTANCE, CREATE);
+
+        if (s1.equalsIgnoreCase(s2)) {
+            assertSame(stored, FlatHashtable.get(table, s2, TestCaseInsensitiveStrategy.INSTANCE));
+        } else {
+            assertNull(FlatHashtable.get(table, s2, TestCaseInsensitiveStrategy.INSTANCE));
+        }
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/HashingUtilsTest.java b/internal-api/src/test/java/datadog/trace/util/HashingUtilsTest.java
index a4997508f3b..a69376bf7a3 100644
--- a/internal-api/src/test/java/datadog/trace/util/HashingUtilsTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/HashingUtilsTest.java
@@ -9,265 +9,251 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 public class HashingUtilsTest {
-  @Test
-  public void hashCode_() {
-    assertEquals("bar".hashCode(), HashingUtils.hashCode("bar"));
-  }
-
-  @Test
-  public void hashCodeNull() {
-    assertEquals(0, HashingUtils.hash((Object) null));
-  }
-
-  @Test
-  public void hash1() {
-    assertEquals("foo".hashCode(), HashingUtils.hashCode("foo"));
-  }
-
-  @Test
-  public void hash1Null() {
-    assertEquals(0, HashingUtils.hashCode(null));
-  }
-
-  @Test
-  public void hash2() {
-    String str0 = "foo";
-    String str1 = "bar";
-
-    assertNotEquals(0, HashingUtils.hash(str0, str1));
-
-    String clone0 = clone(str0);
-    String clone1 = clone(str1);
-
-    assertEquals(HashingUtils.hash(str0, str1), HashingUtils.hash(clone0, clone1));
-  }
-
-  @Test
-  public void hash2Null() {
-    assertEquals(0, HashingUtils.hash(null, null));
-  }
-
-  @Test
-  public void hash3() {
-    String str0 = "foo";
-    String str2 = "quux";
-    String str1 = "bar";
-
-    assertNotEquals(0, HashingUtils.hash(str0, str1, str2));
-
-    String clone0 = clone(str0);
-    String clone1 = clone(str1);
-    String clone2 = clone(str2);
-
-    assertEquals(HashingUtils.hash(str0, str1, str2), HashingUtils.hash(clone0, clone1, clone2));
-  }
-
-  @Test
-  public void hash3Null() {
-    assertEquals(0, HashingUtils.hash(null, null, null));
-  }
-
-  @Test
-  public void hash4() {
-    String str0 = "foo";
-    String str1 = "bar";
-    String str2 = "quux";
-    String str3 = "foobar";
-
-    assertNotEquals(0, HashingUtils.hash(str0, str1, str2, str3));
-
-    String clone0 = clone(str0);
-    String clone1 = clone(str1);
-    String clone2 = clone(str2);
-    String clone3 = clone(str3);
-
-    assertEquals(
-        HashingUtils.hash(str0, str1, str2, str3),
-        HashingUtils.hash(clone0, clone1, clone2, clone3));
-  }
-
-  @Test
-  public void hash4Null() {
-    assertEquals(0, HashingUtils.hash(null, null, null, null));
-  }
-
-  @Test
-  public void hash5() {
-    String str0 = "foo";
-    String str1 = "bar";
-    String str2 = "quux";
-    String str3 = "foobar";
-    String str4 = "hello";
-
-    assertNotEquals(0, HashingUtils.hash(str0, str1, str2, str3, str4));
-
-    String clone0 = clone(str0);
-    String clone1 = clone(str1);
-    String clone2 = clone(str2);
-    String clone3 = clone(str3);
-    String clone4 = clone(str4);
-
-    assertEquals(
-        HashingUtils.hash(str0, str1, str2, str3, str4),
-        HashingUtils.hash(clone0, clone1, clone2, clone3, clone4));
-
-    // The 5th argument must actually affect the hash (regression for a missing-arg bug).
-    assertNotEquals(
-        HashingUtils.hash(str0, str1, str2, str3, str4),
-        HashingUtils.hash(str0, str1, str2, str3, "different"));
-  }
-
-  @Test
-  public void hash5Null() {
-    assertEquals(0, HashingUtils.hash(null, null, null, null, null));
-  }
-
-  @Test
-  public void hashArrayAndIterable() {
-    String str0 = "foo";
-    String str1 = "bar";
-    String str2 = "quux";
-    String str3 = "foobar";
-    String str4 = "foobaz";
-    String str5 = "hello";
-    String str6 = "world";
-
-    Object[] array = new Object[] {str0, str1, str2, str3, str4, str5, str6};
-
-    int hashArray = HashingUtils.hash(array);
-    assertNotEquals(0, hashArray);
-
-    int hashIterable = HashingUtils.hash(Arrays.asList(array));
-    assertNotEquals(0, hashIterable);
-
-    assertEquals(hashArray, hashIterable);
-  }
-
-  @Test
-  public void addToHashArrayFoldsFromSeedLikeChainedAddToHash() {
-    Object[] array = new Object[] {"foo", "bar", "quux"};
-
-    // Full-array overload folds every element onto the seed; from zero it matches hash(Object[]).
-    assertEquals(HashingUtils.hash(array), HashingUtils.addToHash(0, array));
-
-    // A non-zero seed carries through, so the result differs from the zero-seed fold.
-    assertNotEquals(HashingUtils.addToHash(0, array), HashingUtils.addToHash(1, array));
-  }
-
-  @Test
-  public void addToHashArrayRespectsLen() {
-    Object[] array = new Object[] {"foo", "bar", "quux"};
-
-    // The len override folds only the first len elements.
-    assertEquals(
-        HashingUtils.hash(new Object[] {"foo", "bar"}), HashingUtils.addToHash(0, array, 2));
-    assertNotEquals(HashingUtils.addToHash(0, array), HashingUtils.addToHash(0, array, 2));
-
-    // len==0 never enters the loop and returns the seed unchanged.
-    assertEquals(42, HashingUtils.addToHash(42, array, 0));
-  }
-
-  @ParameterizedTest
-  @ValueSource(booleans = {false, true})
-  public void booleans(boolean value) {
-    assertEquals(Boolean.hashCode(value), HashingUtils.hash(value));
-    assertEquals(Boolean.hashCode(value), HashingUtils.addToHash(0, value));
-  }
-
-  @ParameterizedTest
-  @ValueSource(chars = {Character.MIN_VALUE, 'a', 'A', '\0', 'z', 'Z', Character.MAX_VALUE})
-  public void chars(char value) {
-    assertEquals(Character.hashCode(value), HashingUtils.hash(value));
-    assertEquals(Character.hashCode(value), HashingUtils.addToHash(0, value));
-  }
-
-  @ParameterizedTest
-  @ValueSource(bytes = {Byte.MIN_VALUE, -1, 0, 1, Byte.MAX_VALUE})
-  public void bytes(byte value) {
-    assertEquals(Byte.hashCode(value), HashingUtils.hash(value));
-    assertEquals(Byte.hashCode(value), HashingUtils.addToHash(0, value));
-  }
-
-  @ParameterizedTest
-  @ValueSource(
-      shorts = {Short.MIN_VALUE, Byte.MIN_VALUE, -1, 0, 1, Byte.MAX_VALUE, Short.MAX_VALUE})
-  public void shorts(short value) {
-    assertEquals(Short.hashCode(value), HashingUtils.hash(value));
-    assertEquals(Short.hashCode(value), HashingUtils.addToHash(0, value));
-  }
-
-  @ParameterizedTest
-  @ValueSource(
-      ints = {
-        Integer.MIN_VALUE,
-        Short.MIN_VALUE,
-        Byte.MIN_VALUE,
-        -1,
-        0,
-        1,
-        Byte.MAX_VALUE,
-        Short.MAX_VALUE,
-        Integer.MAX_VALUE
-      })
-  public void ints(int value) {
-    assertEquals(Integer.hashCode(value), HashingUtils.hash(value));
-    assertEquals(Integer.hashCode(value), HashingUtils.addToHash(0, value));
-  }
-
-  @ParameterizedTest
-  @ValueSource(
-      longs = {
-        Long.MIN_VALUE,
-        Integer.MIN_VALUE,
-        Short.MIN_VALUE,
-        Byte.MIN_VALUE,
-        -1,
-        0,
-        1,
-        Byte.MAX_VALUE,
-        Short.MAX_VALUE,
-        Integer.MAX_VALUE,
-        Long.MAX_VALUE
-      })
-  public void longs(long value) {
-    assertEquals(Long.hashCode(value), HashingUtils.hash(value));
-    assertEquals(Long.hashCode(value), HashingUtils.addToHash(0, value));
-  }
-
-  @ParameterizedTest
-  @ValueSource(floats = {Float.MIN_VALUE, -1, 0, 1, 2.71828f, 3.1415f, Float.MAX_VALUE})
-  public void floats(float value) {
-    assertEquals(Float.hashCode(value), HashingUtils.hash(value));
-    assertEquals(Float.hashCode(value), HashingUtils.addToHash(0, value));
-  }
-
-  @ParameterizedTest
-  @ValueSource(
-      doubles = {
-        Double.MIN_VALUE,
-        Float.MIN_VALUE,
-        -1,
-        0,
-        1,
-        2.71828,
-        3.1415,
-        Float.MAX_VALUE,
-        Double.MAX_VALUE
-      })
-  public void floats(double value) {
-    assertEquals(Double.hashCode(value), HashingUtils.hash(value));
-    assertEquals(Double.hashCode(value), HashingUtils.addToHash(0, value));
-  }
-
-  static final String clone(String str) {
-    return new String(str);
-  }
-
-  static final String[] deepClone(String[] strings) {
-    String[] clones = new String[strings.length];
-    for (int i = 0; i < strings.length; ++i) {
-      clones[i] = clone(strings[i]);
+    @Test
+    public void hashCode_() {
+        assertEquals("bar".hashCode(), HashingUtils.hashCode("bar"));
+    }
+
+    @Test
+    public void hashCodeNull() {
+        assertEquals(0, HashingUtils.hash((Object) null));
+    }
+
+    @Test
+    public void hash1() {
+        assertEquals("foo".hashCode(), HashingUtils.hashCode("foo"));
+    }
+
+    @Test
+    public void hash1Null() {
+        assertEquals(0, HashingUtils.hashCode(null));
+    }
+
+    @Test
+    public void hash2() {
+        String str0 = "foo";
+        String str1 = "bar";
+
+        assertNotEquals(0, HashingUtils.hash(str0, str1));
+
+        String clone0 = clone(str0);
+        String clone1 = clone(str1);
+
+        assertEquals(HashingUtils.hash(str0, str1), HashingUtils.hash(clone0, clone1));
+    }
+
+    @Test
+    public void hash2Null() {
+        assertEquals(0, HashingUtils.hash(null, null));
+    }
+
+    @Test
+    public void hash3() {
+        String str0 = "foo";
+        String str2 = "quux";
+        String str1 = "bar";
+
+        assertNotEquals(0, HashingUtils.hash(str0, str1, str2));
+
+        String clone0 = clone(str0);
+        String clone1 = clone(str1);
+        String clone2 = clone(str2);
+
+        assertEquals(HashingUtils.hash(str0, str1, str2), HashingUtils.hash(clone0, clone1, clone2));
+    }
+
+    @Test
+    public void hash3Null() {
+        assertEquals(0, HashingUtils.hash(null, null, null));
+    }
+
+    @Test
+    public void hash4() {
+        String str0 = "foo";
+        String str1 = "bar";
+        String str2 = "quux";
+        String str3 = "foobar";
+
+        assertNotEquals(0, HashingUtils.hash(str0, str1, str2, str3));
+
+        String clone0 = clone(str0);
+        String clone1 = clone(str1);
+        String clone2 = clone(str2);
+        String clone3 = clone(str3);
+
+        assertEquals(HashingUtils.hash(str0, str1, str2, str3), HashingUtils.hash(clone0, clone1, clone2, clone3));
+    }
+
+    @Test
+    public void hash4Null() {
+        assertEquals(0, HashingUtils.hash(null, null, null, null));
+    }
+
+    @Test
+    public void hash5() {
+        String str0 = "foo";
+        String str1 = "bar";
+        String str2 = "quux";
+        String str3 = "foobar";
+        String str4 = "hello";
+
+        assertNotEquals(0, HashingUtils.hash(str0, str1, str2, str3, str4));
+
+        String clone0 = clone(str0);
+        String clone1 = clone(str1);
+        String clone2 = clone(str2);
+        String clone3 = clone(str3);
+        String clone4 = clone(str4);
+
+        assertEquals(
+                HashingUtils.hash(str0, str1, str2, str3, str4),
+                HashingUtils.hash(clone0, clone1, clone2, clone3, clone4));
+
+        // The 5th argument must actually affect the hash (regression for a missing-arg bug).
+        assertNotEquals(
+                HashingUtils.hash(str0, str1, str2, str3, str4),
+                HashingUtils.hash(str0, str1, str2, str3, "different"));
+    }
+
+    @Test
+    public void hash5Null() {
+        assertEquals(0, HashingUtils.hash(null, null, null, null, null));
+    }
+
+    @Test
+    public void hashArrayAndIterable() {
+        String str0 = "foo";
+        String str1 = "bar";
+        String str2 = "quux";
+        String str3 = "foobar";
+        String str4 = "foobaz";
+        String str5 = "hello";
+        String str6 = "world";
+
+        Object[] array = new Object[] {str0, str1, str2, str3, str4, str5, str6};
+
+        int hashArray = HashingUtils.hash(array);
+        assertNotEquals(0, hashArray);
+
+        int hashIterable = HashingUtils.hash(Arrays.asList(array));
+        assertNotEquals(0, hashIterable);
+
+        assertEquals(hashArray, hashIterable);
+    }
+
+    @Test
+    public void addToHashArrayFoldsFromSeedLikeChainedAddToHash() {
+        Object[] array = new Object[] {"foo", "bar", "quux"};
+
+        // Full-array overload folds every element onto the seed; from zero it matches hash(Object[]).
+        assertEquals(HashingUtils.hash(array), HashingUtils.addToHash(0, array));
+
+        // A non-zero seed carries through, so the result differs from the zero-seed fold.
+        assertNotEquals(HashingUtils.addToHash(0, array), HashingUtils.addToHash(1, array));
+    }
+
+    @Test
+    public void addToHashArrayRespectsLen() {
+        Object[] array = new Object[] {"foo", "bar", "quux"};
+
+        // The len override folds only the first len elements.
+        assertEquals(HashingUtils.hash(new Object[] {"foo", "bar"}), HashingUtils.addToHash(0, array, 2));
+        assertNotEquals(HashingUtils.addToHash(0, array), HashingUtils.addToHash(0, array, 2));
+
+        // len==0 never enters the loop and returns the seed unchanged.
+        assertEquals(42, HashingUtils.addToHash(42, array, 0));
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {false, true})
+    public void booleans(boolean value) {
+        assertEquals(Boolean.hashCode(value), HashingUtils.hash(value));
+        assertEquals(Boolean.hashCode(value), HashingUtils.addToHash(0, value));
+    }
+
+    @ParameterizedTest
+    @ValueSource(chars = {Character.MIN_VALUE, 'a', 'A', '\0', 'z', 'Z', Character.MAX_VALUE})
+    public void chars(char value) {
+        assertEquals(Character.hashCode(value), HashingUtils.hash(value));
+        assertEquals(Character.hashCode(value), HashingUtils.addToHash(0, value));
+    }
+
+    @ParameterizedTest
+    @ValueSource(bytes = {Byte.MIN_VALUE, -1, 0, 1, Byte.MAX_VALUE})
+    public void bytes(byte value) {
+        assertEquals(Byte.hashCode(value), HashingUtils.hash(value));
+        assertEquals(Byte.hashCode(value), HashingUtils.addToHash(0, value));
+    }
+
+    @ParameterizedTest
+    @ValueSource(shorts = {Short.MIN_VALUE, Byte.MIN_VALUE, -1, 0, 1, Byte.MAX_VALUE, Short.MAX_VALUE})
+    public void shorts(short value) {
+        assertEquals(Short.hashCode(value), HashingUtils.hash(value));
+        assertEquals(Short.hashCode(value), HashingUtils.addToHash(0, value));
+    }
+
+    @ParameterizedTest
+    @ValueSource(
+            ints = {
+                Integer.MIN_VALUE,
+                Short.MIN_VALUE,
+                Byte.MIN_VALUE,
+                -1,
+                0,
+                1,
+                Byte.MAX_VALUE,
+                Short.MAX_VALUE,
+                Integer.MAX_VALUE
+            })
+    public void ints(int value) {
+        assertEquals(Integer.hashCode(value), HashingUtils.hash(value));
+        assertEquals(Integer.hashCode(value), HashingUtils.addToHash(0, value));
+    }
+
+    @ParameterizedTest
+    @ValueSource(
+            longs = {
+                Long.MIN_VALUE,
+                Integer.MIN_VALUE,
+                Short.MIN_VALUE,
+                Byte.MIN_VALUE,
+                -1,
+                0,
+                1,
+                Byte.MAX_VALUE,
+                Short.MAX_VALUE,
+                Integer.MAX_VALUE,
+                Long.MAX_VALUE
+            })
+    public void longs(long value) {
+        assertEquals(Long.hashCode(value), HashingUtils.hash(value));
+        assertEquals(Long.hashCode(value), HashingUtils.addToHash(0, value));
+    }
+
+    @ParameterizedTest
+    @ValueSource(floats = {Float.MIN_VALUE, -1, 0, 1, 2.71828f, 3.1415f, Float.MAX_VALUE})
+    public void floats(float value) {
+        assertEquals(Float.hashCode(value), HashingUtils.hash(value));
+        assertEquals(Float.hashCode(value), HashingUtils.addToHash(0, value));
+    }
+
+    @ParameterizedTest
+    @ValueSource(
+            doubles = {Double.MIN_VALUE, Float.MIN_VALUE, -1, 0, 1, 2.71828, 3.1415, Float.MAX_VALUE, Double.MAX_VALUE})
+    public void floats(double value) {
+        assertEquals(Double.hashCode(value), HashingUtils.hash(value));
+        assertEquals(Double.hashCode(value), HashingUtils.addToHash(0, value));
+    }
+
+    static final String clone(String str) {
+        return new String(str);
+    }
+
+    static final String[] deepClone(String[] strings) {
+        String[] clones = new String[strings.length];
+        for (int i = 0; i < strings.length; ++i) {
+            clones[i] = clone(strings[i]);
+        }
+        return clones;
     }
-    return clones;
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/HashtableD1Test.java b/internal-api/src/test/java/datadog/trace/util/HashtableD1Test.java
index a3cd4c25247..e36fbaa2bfd 100644
--- a/internal-api/src/test/java/datadog/trace/util/HashtableD1Test.java
+++ b/internal-api/src/test/java/datadog/trace/util/HashtableD1Test.java
@@ -14,228 +14,222 @@
 
 class HashtableD1Test {
 
-  @Test
-  void emptyTableLookupReturnsNull() {
-    Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-    assertNull(table.get("missing"));
-    assertEquals(0, table.size());
-  }
-
-  @Test
-  void insertedEntryIsRetrievable() {
-    Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-    StringIntEntry e = new StringIntEntry("foo", 1);
-    table.insert(e);
-    assertEquals(1, table.size());
-    assertSame(e, table.get("foo"));
-  }
-
-  @Test
-  void keyExposesTheConstructionKey() {
-    StringIntEntry e = new StringIntEntry("foo", 1);
-    assertEquals("foo", e.key());
-  }
-
-  @Test
-  void multipleInsertsRetrievableSeparately() {
-    Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(16);
-    StringIntEntry a = new StringIntEntry("alpha", 1);
-    StringIntEntry b = new StringIntEntry("beta", 2);
-    StringIntEntry c = new StringIntEntry("gamma", 3);
-    table.insert(a);
-    table.insert(b);
-    table.insert(c);
-    assertEquals(3, table.size());
-    assertSame(a, table.get("alpha"));
-    assertSame(b, table.get("beta"));
-    assertSame(c, table.get("gamma"));
-  }
-
-  @Test
-  void inPlaceMutationVisibleViaSubsequentGet() {
-    Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-    table.insert(new StringIntEntry("counter", 0));
-    for (int i = 0; i < 10; i++) {
-      StringIntEntry e = table.get("counter");
-      e.value++;
-    }
-    assertEquals(10, table.get("counter").value);
-  }
-
-  @Test
-  void removeUnlinksEntryAndDecrementsSize() {
-    Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-    table.insert(new StringIntEntry("a", 1));
-    table.insert(new StringIntEntry("b", 2));
-    assertEquals(2, table.size());
-
-    StringIntEntry removed = table.remove("a");
-    assertNotNull(removed);
-    assertEquals("a", removed.key);
-    assertEquals(1, table.size());
-    assertNull(table.get("a"));
-    assertNotNull(table.get("b"));
-  }
-
-  @Test
-  void removeNonexistentReturnsNullAndDoesNotChangeSize() {
-    Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-    table.insert(new StringIntEntry("a", 1));
-    assertNull(table.remove("nope"));
-    assertEquals(1, table.size());
-  }
-
-  @Test
-  void insertOrReplaceReturnsPriorEntryOrNullOnInsert() {
-    Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-    StringIntEntry first = new StringIntEntry("k", 1);
-    assertNull(table.insertOrReplace(first), "fresh insert returns null");
-    assertEquals(1, table.size());
-
-    StringIntEntry second = new StringIntEntry("k", 2);
-    assertSame(first, table.insertOrReplace(second), "replace returns the prior entry");
-    assertEquals(1, table.size());
-    assertSame(second, table.get("k"), "new entry visible after replace");
-  }
-
-  @Test
-  void clearEmptiesTheTable() {
-    Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-    table.insert(new StringIntEntry("a", 1));
-    table.insert(new StringIntEntry("b", 2));
-    table.clear();
-    assertEquals(0, table.size());
-    assertNull(table.get("a"));
-    // Reinsertion works after clear
-    table.insert(new StringIntEntry("a", 99));
-    assertEquals(99, table.get("a").value);
-  }
-
-  @Test
-  void forEachVisitsEveryInsertedEntry() {
-    Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-    table.insert(new StringIntEntry("a", 1));
-    table.insert(new StringIntEntry("b", 2));
-    table.insert(new StringIntEntry("c", 3));
-    Map<String, Integer> seen = new HashMap<>();
-    table.forEach(e -> seen.put(e.key, e.value));
-    assertEquals(3, seen.size());
-    assertEquals(1, seen.get("a"));
-    assertEquals(2, seen.get("b"));
-    assertEquals(3, seen.get("c"));
-  }
-
-  @Test
-  void forEachWithContextPassesContextToConsumer() {
-    Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-    table.insert(new StringIntEntry("a", 10));
-    table.insert(new StringIntEntry("b", 20));
-    table.insert(new StringIntEntry("c", 30));
-    Map<String, Integer> seen = new HashMap<>();
-    table.forEach(seen, (ctx, e) -> ctx.put(e.key, e.value));
-    assertEquals(3, seen.size());
-    assertEquals(10, seen.get("a"));
-    assertEquals(20, seen.get("b"));
-    assertEquals(30, seen.get("c"));
-  }
-
-  @Test
-  void forEachWithContextOnEmptyTableDoesNothing() {
-    Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-    Map<String, Integer> seen = new HashMap<>();
-    table.forEach(seen, (ctx, e) -> ctx.put(e.key, e.value));
-    assertEquals(0, seen.size());
-  }
-
-  @Test
-  void nullKeyIsPermittedAndDistinctFromAbsent() {
-    Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-    assertNull(table.get(null));
-    StringIntEntry nullKeyed = new StringIntEntry(null, 7);
-    table.insert(nullKeyed);
-    assertSame(nullKeyed, table.get(null));
-    assertEquals(1, table.size());
-    assertSame(nullKeyed, table.remove(null));
-    assertEquals(0, table.size());
-  }
-
-  @Test
-  void hashCollisionsResolveByEquality() {
-    // Force two distinct keys with the same hashCode -- the chain must still distinguish them
-    // via matches().
-    Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(4);
-    CollidingKey k1 = new CollidingKey("first", 17);
-    CollidingKey k2 = new CollidingKey("second", 17);
-    CollidingKeyEntry e1 = new CollidingKeyEntry(k1, 100);
-    CollidingKeyEntry e2 = new CollidingKeyEntry(k2, 200);
-    table.insert(e1);
-    table.insert(e2);
-    assertEquals(2, table.size());
-    assertSame(e1, table.get(k1));
-    assertSame(e2, table.get(k2));
-  }
-
-  @Test
-  void hashCollisionsThenRemoveLeavesOtherIntact() {
-    Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(4);
-    CollidingKey k1 = new CollidingKey("first", 17);
-    CollidingKey k2 = new CollidingKey("second", 17);
-    CollidingKey k3 = new CollidingKey("third", 17);
-    table.insert(new CollidingKeyEntry(k1, 1));
-    table.insert(new CollidingKeyEntry(k2, 2));
-    table.insert(new CollidingKeyEntry(k3, 3));
-    table.remove(k2);
-    assertEquals(2, table.size());
-    assertNotNull(table.get(k1));
-    assertNull(table.get(k2));
-    assertNotNull(table.get(k3));
-  }
-
-  @Test
-  void getOrCreateOnMissBuildsEntryViaCreator() {
-    Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-    int[] createCount = {0};
-    StringIntEntry created =
-        table.getOrCreate(
-            "foo",
-            k -> {
-              createCount[0]++;
-              return new StringIntEntry(k, 42);
-            });
-    assertNotNull(created);
-    assertEquals("foo", created.key);
-    assertEquals(42, created.value);
-    assertEquals(1, table.size());
-    assertEquals(1, createCount[0]);
-    assertSame(created, table.get("foo"));
-  }
-
-  @Test
-  void getOrCreateOnHitSkipsCreator() {
-    Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-    StringIntEntry seeded = new StringIntEntry("foo", 1);
-    table.insert(seeded);
-    int[] createCount = {0};
-    StringIntEntry got =
-        table.getOrCreate(
-            "foo",
-            k -> {
-              createCount[0]++;
-              return new StringIntEntry(k, 999);
-            });
-    assertSame(seeded, got);
-    assertEquals(1, table.size());
-    assertEquals(0, createCount[0]);
-  }
-
-  @Test
-  void getOrCreateNullKeyIsPermitted() {
-    Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-    StringIntEntry created = table.getOrCreate(null, k -> new StringIntEntry(k, 7));
-    assertNotNull(created);
-    assertNull(created.key);
-    assertEquals(7, created.value);
-    assertSame(created, table.getOrCreate(null, k -> new StringIntEntry(k, 999)));
-    assertEquals(1, table.size());
-  }
+    @Test
+    void emptyTableLookupReturnsNull() {
+        Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+        assertNull(table.get("missing"));
+        assertEquals(0, table.size());
+    }
+
+    @Test
+    void insertedEntryIsRetrievable() {
+        Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+        StringIntEntry e = new StringIntEntry("foo", 1);
+        table.insert(e);
+        assertEquals(1, table.size());
+        assertSame(e, table.get("foo"));
+    }
+
+    @Test
+    void keyExposesTheConstructionKey() {
+        StringIntEntry e = new StringIntEntry("foo", 1);
+        assertEquals("foo", e.key());
+    }
+
+    @Test
+    void multipleInsertsRetrievableSeparately() {
+        Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(16);
+        StringIntEntry a = new StringIntEntry("alpha", 1);
+        StringIntEntry b = new StringIntEntry("beta", 2);
+        StringIntEntry c = new StringIntEntry("gamma", 3);
+        table.insert(a);
+        table.insert(b);
+        table.insert(c);
+        assertEquals(3, table.size());
+        assertSame(a, table.get("alpha"));
+        assertSame(b, table.get("beta"));
+        assertSame(c, table.get("gamma"));
+    }
+
+    @Test
+    void inPlaceMutationVisibleViaSubsequentGet() {
+        Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+        table.insert(new StringIntEntry("counter", 0));
+        for (int i = 0; i < 10; i++) {
+            StringIntEntry e = table.get("counter");
+            e.value++;
+        }
+        assertEquals(10, table.get("counter").value);
+    }
+
+    @Test
+    void removeUnlinksEntryAndDecrementsSize() {
+        Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+        table.insert(new StringIntEntry("a", 1));
+        table.insert(new StringIntEntry("b", 2));
+        assertEquals(2, table.size());
+
+        StringIntEntry removed = table.remove("a");
+        assertNotNull(removed);
+        assertEquals("a", removed.key);
+        assertEquals(1, table.size());
+        assertNull(table.get("a"));
+        assertNotNull(table.get("b"));
+    }
+
+    @Test
+    void removeNonexistentReturnsNullAndDoesNotChangeSize() {
+        Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+        table.insert(new StringIntEntry("a", 1));
+        assertNull(table.remove("nope"));
+        assertEquals(1, table.size());
+    }
+
+    @Test
+    void insertOrReplaceReturnsPriorEntryOrNullOnInsert() {
+        Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+        StringIntEntry first = new StringIntEntry("k", 1);
+        assertNull(table.insertOrReplace(first), "fresh insert returns null");
+        assertEquals(1, table.size());
+
+        StringIntEntry second = new StringIntEntry("k", 2);
+        assertSame(first, table.insertOrReplace(second), "replace returns the prior entry");
+        assertEquals(1, table.size());
+        assertSame(second, table.get("k"), "new entry visible after replace");
+    }
+
+    @Test
+    void clearEmptiesTheTable() {
+        Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+        table.insert(new StringIntEntry("a", 1));
+        table.insert(new StringIntEntry("b", 2));
+        table.clear();
+        assertEquals(0, table.size());
+        assertNull(table.get("a"));
+        // Reinsertion works after clear
+        table.insert(new StringIntEntry("a", 99));
+        assertEquals(99, table.get("a").value);
+    }
+
+    @Test
+    void forEachVisitsEveryInsertedEntry() {
+        Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+        table.insert(new StringIntEntry("a", 1));
+        table.insert(new StringIntEntry("b", 2));
+        table.insert(new StringIntEntry("c", 3));
+        Map<String, Integer> seen = new HashMap<>();
+        table.forEach(e -> seen.put(e.key, e.value));
+        assertEquals(3, seen.size());
+        assertEquals(1, seen.get("a"));
+        assertEquals(2, seen.get("b"));
+        assertEquals(3, seen.get("c"));
+    }
+
+    @Test
+    void forEachWithContextPassesContextToConsumer() {
+        Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+        table.insert(new StringIntEntry("a", 10));
+        table.insert(new StringIntEntry("b", 20));
+        table.insert(new StringIntEntry("c", 30));
+        Map<String, Integer> seen = new HashMap<>();
+        table.forEach(seen, (ctx, e) -> ctx.put(e.key, e.value));
+        assertEquals(3, seen.size());
+        assertEquals(10, seen.get("a"));
+        assertEquals(20, seen.get("b"));
+        assertEquals(30, seen.get("c"));
+    }
+
+    @Test
+    void forEachWithContextOnEmptyTableDoesNothing() {
+        Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+        Map<String, Integer> seen = new HashMap<>();
+        table.forEach(seen, (ctx, e) -> ctx.put(e.key, e.value));
+        assertEquals(0, seen.size());
+    }
+
+    @Test
+    void nullKeyIsPermittedAndDistinctFromAbsent() {
+        Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+        assertNull(table.get(null));
+        StringIntEntry nullKeyed = new StringIntEntry(null, 7);
+        table.insert(nullKeyed);
+        assertSame(nullKeyed, table.get(null));
+        assertEquals(1, table.size());
+        assertSame(nullKeyed, table.remove(null));
+        assertEquals(0, table.size());
+    }
+
+    @Test
+    void hashCollisionsResolveByEquality() {
+        // Force two distinct keys with the same hashCode -- the chain must still distinguish them
+        // via matches().
+        Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(4);
+        CollidingKey k1 = new CollidingKey("first", 17);
+        CollidingKey k2 = new CollidingKey("second", 17);
+        CollidingKeyEntry e1 = new CollidingKeyEntry(k1, 100);
+        CollidingKeyEntry e2 = new CollidingKeyEntry(k2, 200);
+        table.insert(e1);
+        table.insert(e2);
+        assertEquals(2, table.size());
+        assertSame(e1, table.get(k1));
+        assertSame(e2, table.get(k2));
+    }
+
+    @Test
+    void hashCollisionsThenRemoveLeavesOtherIntact() {
+        Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(4);
+        CollidingKey k1 = new CollidingKey("first", 17);
+        CollidingKey k2 = new CollidingKey("second", 17);
+        CollidingKey k3 = new CollidingKey("third", 17);
+        table.insert(new CollidingKeyEntry(k1, 1));
+        table.insert(new CollidingKeyEntry(k2, 2));
+        table.insert(new CollidingKeyEntry(k3, 3));
+        table.remove(k2);
+        assertEquals(2, table.size());
+        assertNotNull(table.get(k1));
+        assertNull(table.get(k2));
+        assertNotNull(table.get(k3));
+    }
+
+    @Test
+    void getOrCreateOnMissBuildsEntryViaCreator() {
+        Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+        int[] createCount = {0};
+        StringIntEntry created = table.getOrCreate("foo", k -> {
+            createCount[0]++;
+            return new StringIntEntry(k, 42);
+        });
+        assertNotNull(created);
+        assertEquals("foo", created.key);
+        assertEquals(42, created.value);
+        assertEquals(1, table.size());
+        assertEquals(1, createCount[0]);
+        assertSame(created, table.get("foo"));
+    }
+
+    @Test
+    void getOrCreateOnHitSkipsCreator() {
+        Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+        StringIntEntry seeded = new StringIntEntry("foo", 1);
+        table.insert(seeded);
+        int[] createCount = {0};
+        StringIntEntry got = table.getOrCreate("foo", k -> {
+            createCount[0]++;
+            return new StringIntEntry(k, 999);
+        });
+        assertSame(seeded, got);
+        assertEquals(1, table.size());
+        assertEquals(0, createCount[0]);
+    }
+
+    @Test
+    void getOrCreateNullKeyIsPermitted() {
+        Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+        StringIntEntry created = table.getOrCreate(null, k -> new StringIntEntry(k, 7));
+        assertNotNull(created);
+        assertNull(created.key);
+        assertEquals(7, created.value);
+        assertSame(created, table.getOrCreate(null, k -> new StringIntEntry(k, 999)));
+        assertEquals(1, table.size());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/HashtableD2Test.java b/internal-api/src/test/java/datadog/trace/util/HashtableD2Test.java
index fb621f89482..d33c3f7f23d 100644
--- a/internal-api/src/test/java/datadog/trace/util/HashtableD2Test.java
+++ b/internal-api/src/test/java/datadog/trace/util/HashtableD2Test.java
@@ -13,181 +13,173 @@
 
 class HashtableD2Test {
 
-  @Test
-  void pairKeysParticipateInIdentity() {
-    Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
-    PairEntry ab = new PairEntry("a", 1, 100);
-    PairEntry ac = new PairEntry("a", 2, 200);
-    PairEntry bb = new PairEntry("b", 1, 300);
-    table.insert(ab);
-    table.insert(ac);
-    table.insert(bb);
-    assertEquals(3, table.size());
-    assertSame(ab, table.get("a", 1));
-    assertSame(ac, table.get("a", 2));
-    assertSame(bb, table.get("b", 1));
-    assertNull(table.get("a", 3));
-  }
-
-  @Test
-  void removePairUnlinks() {
-    Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
-    PairEntry ab = new PairEntry("a", 1, 100);
-    PairEntry ac = new PairEntry("a", 2, 200);
-    table.insert(ab);
-    table.insert(ac);
-    assertSame(ab, table.remove("a", 1));
-    assertEquals(1, table.size());
-    assertNull(table.get("a", 1));
-    assertSame(ac, table.get("a", 2));
-  }
-
-  @Test
-  void insertOrReplaceMatchesOnBothKeys() {
-    Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
-    PairEntry first = new PairEntry("k", 7, 1);
-    assertNull(table.insertOrReplace(first));
-    PairEntry second = new PairEntry("k", 7, 2);
-    assertSame(first, table.insertOrReplace(second));
-    // Different second-key: should insert new, not replace
-    PairEntry third = new PairEntry("k", 8, 3);
-    assertNull(table.insertOrReplace(third));
-    assertEquals(2, table.size());
-  }
-
-  @Test
-  void forEachVisitsBothPairs() {
-    Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
-    table.insert(new PairEntry("a", 1, 100));
-    table.insert(new PairEntry("b", 2, 200));
-    Set<String> seen = new HashSet<>();
-    table.forEach(e -> seen.add(e.key1 + ":" + e.key2));
-    assertEquals(2, seen.size());
-    assertTrue(seen.contains("a:1"));
-    assertTrue(seen.contains("b:2"));
-  }
-
-  @Test
-  void forEachWithContextPassesContextToConsumer() {
-    Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
-    table.insert(new PairEntry("a", 1, 100));
-    table.insert(new PairEntry("b", 2, 200));
-    Set<String> seen = new HashSet<>();
-    table.forEach(seen, (ctx, e) -> ctx.add(e.key1 + ":" + e.key2));
-    assertEquals(2, seen.size());
-    assertTrue(seen.contains("a:1"));
-    assertTrue(seen.contains("b:2"));
-  }
-
-  @Test
-  void getOrCreateOnMissBuildsEntryViaCreator() {
-    Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
-    int[] createCount = {0};
-    PairEntry created =
-        table.getOrCreate(
-            "a",
-            1,
-            (k1, k2) -> {
-              createCount[0]++;
-              return new PairEntry(k1, k2, 100);
-            });
-    assertNotNull(created);
-    assertEquals("a", created.key1);
-    assertEquals(Integer.valueOf(1), created.key2);
-    assertEquals(100, created.value);
-    assertEquals(1, table.size());
-    assertEquals(1, createCount[0]);
-    assertSame(created, table.get("a", 1));
-  }
-
-  @Test
-  void getOrCreateOnHitSkipsCreator() {
-    Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
-    PairEntry seeded = new PairEntry("a", 1, 100);
-    table.insert(seeded);
-    int[] createCount = {0};
-    PairEntry got =
-        table.getOrCreate(
-            "a",
-            1,
-            (k1, k2) -> {
-              createCount[0]++;
-              return new PairEntry(k1, k2, 999);
-            });
-    assertSame(seeded, got);
-    assertEquals(1, table.size());
-    assertEquals(0, createCount[0]);
-  }
-
-  @Test
-  void entryMatchesTrueWhenBothKeysEqual() {
-    PairEntry entry = new PairEntry("a", 1, 100);
-    assertTrue(entry.matches("a", 1));
-  }
-
-  @Test
-  void entryMatchesFalseWhenKey1Differs() {
-    PairEntry entry = new PairEntry("a", 1, 100);
-    assertFalse(entry.matches("b", 1));
-  }
-
-  @Test
-  void entryMatchesFalseWhenKey2Differs() {
-    PairEntry entry = new PairEntry("a", 1, 100);
-    assertFalse(entry.matches("a", 2));
-  }
-
-  @Test
-  void keyAccessorsExposeConstructionKeys() {
-    PairEntry entry = new PairEntry("a", 1, 100);
-    assertEquals("a", entry.key1());
-    assertEquals(1, entry.key2());
-  }
-
-  @Test
-  void entryHashIsConsistentForSameKeys() {
-    long h1 = Hashtable.D2.Entry.hash("x", 42);
-    long h2 = Hashtable.D2.Entry.hash("x", 42);
-    assertEquals(h1, h2);
-  }
-
-  @Test
-  void entryHashDiffersForDifferentKeys() {
-    long h1 = Hashtable.D2.Entry.hash("x", 1);
-    long h2 = Hashtable.D2.Entry.hash("x", 2);
-    assertFalse(h1 == h2);
-  }
-
-  @Test
-  void removeReturnsNullForMissingKey() {
-    Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
-    table.insert(new PairEntry("a", 1, 100));
-
-    assertNull(table.remove("a", 2));
-    assertNull(table.remove("z", 1));
-    assertEquals(1, table.size());
-  }
-
-  @Test
-  void clearEmptiesTable() {
-    Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
-    table.insert(new PairEntry("a", 1, 100));
-    table.insert(new PairEntry("b", 2, 200));
-    assertEquals(2, table.size());
-
-    table.clear();
-
-    assertEquals(0, table.size());
-    assertNull(table.get("a", 1));
-    assertNull(table.get("b", 2));
-  }
-
-  private static final class PairEntry extends Hashtable.D2.Entry<String, Integer> {
-    int value;
-
-    PairEntry(String key1, Integer key2, int value) {
-      super(key1, key2);
-      this.value = value;
-    }
-  }
+    @Test
+    void pairKeysParticipateInIdentity() {
+        Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
+        PairEntry ab = new PairEntry("a", 1, 100);
+        PairEntry ac = new PairEntry("a", 2, 200);
+        PairEntry bb = new PairEntry("b", 1, 300);
+        table.insert(ab);
+        table.insert(ac);
+        table.insert(bb);
+        assertEquals(3, table.size());
+        assertSame(ab, table.get("a", 1));
+        assertSame(ac, table.get("a", 2));
+        assertSame(bb, table.get("b", 1));
+        assertNull(table.get("a", 3));
+    }
+
+    @Test
+    void removePairUnlinks() {
+        Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
+        PairEntry ab = new PairEntry("a", 1, 100);
+        PairEntry ac = new PairEntry("a", 2, 200);
+        table.insert(ab);
+        table.insert(ac);
+        assertSame(ab, table.remove("a", 1));
+        assertEquals(1, table.size());
+        assertNull(table.get("a", 1));
+        assertSame(ac, table.get("a", 2));
+    }
+
+    @Test
+    void insertOrReplaceMatchesOnBothKeys() {
+        Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
+        PairEntry first = new PairEntry("k", 7, 1);
+        assertNull(table.insertOrReplace(first));
+        PairEntry second = new PairEntry("k", 7, 2);
+        assertSame(first, table.insertOrReplace(second));
+        // Different second-key: should insert new, not replace
+        PairEntry third = new PairEntry("k", 8, 3);
+        assertNull(table.insertOrReplace(third));
+        assertEquals(2, table.size());
+    }
+
+    @Test
+    void forEachVisitsBothPairs() {
+        Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
+        table.insert(new PairEntry("a", 1, 100));
+        table.insert(new PairEntry("b", 2, 200));
+        Set<String> seen = new HashSet<>();
+        table.forEach(e -> seen.add(e.key1 + ":" + e.key2));
+        assertEquals(2, seen.size());
+        assertTrue(seen.contains("a:1"));
+        assertTrue(seen.contains("b:2"));
+    }
+
+    @Test
+    void forEachWithContextPassesContextToConsumer() {
+        Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
+        table.insert(new PairEntry("a", 1, 100));
+        table.insert(new PairEntry("b", 2, 200));
+        Set<String> seen = new HashSet<>();
+        table.forEach(seen, (ctx, e) -> ctx.add(e.key1 + ":" + e.key2));
+        assertEquals(2, seen.size());
+        assertTrue(seen.contains("a:1"));
+        assertTrue(seen.contains("b:2"));
+    }
+
+    @Test
+    void getOrCreateOnMissBuildsEntryViaCreator() {
+        Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
+        int[] createCount = {0};
+        PairEntry created = table.getOrCreate("a", 1, (k1, k2) -> {
+            createCount[0]++;
+            return new PairEntry(k1, k2, 100);
+        });
+        assertNotNull(created);
+        assertEquals("a", created.key1);
+        assertEquals(Integer.valueOf(1), created.key2);
+        assertEquals(100, created.value);
+        assertEquals(1, table.size());
+        assertEquals(1, createCount[0]);
+        assertSame(created, table.get("a", 1));
+    }
+
+    @Test
+    void getOrCreateOnHitSkipsCreator() {
+        Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
+        PairEntry seeded = new PairEntry("a", 1, 100);
+        table.insert(seeded);
+        int[] createCount = {0};
+        PairEntry got = table.getOrCreate("a", 1, (k1, k2) -> {
+            createCount[0]++;
+            return new PairEntry(k1, k2, 999);
+        });
+        assertSame(seeded, got);
+        assertEquals(1, table.size());
+        assertEquals(0, createCount[0]);
+    }
+
+    @Test
+    void entryMatchesTrueWhenBothKeysEqual() {
+        PairEntry entry = new PairEntry("a", 1, 100);
+        assertTrue(entry.matches("a", 1));
+    }
+
+    @Test
+    void entryMatchesFalseWhenKey1Differs() {
+        PairEntry entry = new PairEntry("a", 1, 100);
+        assertFalse(entry.matches("b", 1));
+    }
+
+    @Test
+    void entryMatchesFalseWhenKey2Differs() {
+        PairEntry entry = new PairEntry("a", 1, 100);
+        assertFalse(entry.matches("a", 2));
+    }
+
+    @Test
+    void keyAccessorsExposeConstructionKeys() {
+        PairEntry entry = new PairEntry("a", 1, 100);
+        assertEquals("a", entry.key1());
+        assertEquals(1, entry.key2());
+    }
+
+    @Test
+    void entryHashIsConsistentForSameKeys() {
+        long h1 = Hashtable.D2.Entry.hash("x", 42);
+        long h2 = Hashtable.D2.Entry.hash("x", 42);
+        assertEquals(h1, h2);
+    }
+
+    @Test
+    void entryHashDiffersForDifferentKeys() {
+        long h1 = Hashtable.D2.Entry.hash("x", 1);
+        long h2 = Hashtable.D2.Entry.hash("x", 2);
+        assertFalse(h1 == h2);
+    }
+
+    @Test
+    void removeReturnsNullForMissingKey() {
+        Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
+        table.insert(new PairEntry("a", 1, 100));
+
+        assertNull(table.remove("a", 2));
+        assertNull(table.remove("z", 1));
+        assertEquals(1, table.size());
+    }
+
+    @Test
+    void clearEmptiesTable() {
+        Hashtable.D2<String, Integer, PairEntry> table = new Hashtable.D2<>(8);
+        table.insert(new PairEntry("a", 1, 100));
+        table.insert(new PairEntry("b", 2, 200));
+        assertEquals(2, table.size());
+
+        table.clear();
+
+        assertEquals(0, table.size());
+        assertNull(table.get("a", 1));
+        assertNull(table.get("b", 2));
+    }
+
+    private static final class PairEntry extends Hashtable.D2.Entry<String, Integer> {
+        int value;
+
+        PairEntry(String key1, Integer key2, int value) {
+            super(key1, key2);
+            this.value = value;
+        }
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/HashtableTest.java b/internal-api/src/test/java/datadog/trace/util/HashtableTest.java
index 953453ca3aa..c745da61886 100644
--- a/internal-api/src/test/java/datadog/trace/util/HashtableTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/HashtableTest.java
@@ -23,390 +23,383 @@
 
 class HashtableTest {
 
-  // ============ Support ============
-
-  @Nested
-  class SupportTests {
-
-    @Test
-    void createRoundsCapacityUpToPowerOfTwo() {
-      // The Hashtable.D1 / D2 size() reflects entries, but the bucket array length is
-      // a power of two >= requestedCapacity. We can verify indirectly via bucketIndex masking.
-      Hashtable.Entry[] buckets = Support.create(5);
-      // Length must be a power of two >= 5
-      int len = buckets.length;
-      assertTrue(len >= 5);
-      assertEquals(0, len & (len - 1), "length must be a power of two");
-    }
+    // ============ Support ============
+
+    @Nested
+    class SupportTests {
+
+        @Test
+        void createRoundsCapacityUpToPowerOfTwo() {
+            // The Hashtable.D1 / D2 size() reflects entries, but the bucket array length is
+            // a power of two >= requestedCapacity. We can verify indirectly via bucketIndex masking.
+            Hashtable.Entry[] buckets = Support.create(5);
+            // Length must be a power of two >= 5
+            int len = buckets.length;
+            assertTrue(len >= 5);
+            assertEquals(0, len & (len - 1), "length must be a power of two");
+        }
 
-    @Test
-    void sizeForReturnsAtLeastOne() {
-      assertEquals(1, Support.sizeFor(0));
-      assertEquals(1, Support.sizeFor(1));
-    }
+        @Test
+        void sizeForReturnsAtLeastOne() {
+            assertEquals(1, Support.sizeFor(0));
+            assertEquals(1, Support.sizeFor(1));
+        }
 
-    @Test
-    void sizeForRoundsUpToPowerOfTwo() {
-      assertEquals(2, Support.sizeFor(2));
-      assertEquals(4, Support.sizeFor(3));
-      assertEquals(4, Support.sizeFor(4));
-      assertEquals(8, Support.sizeFor(5));
-      assertEquals(1 << 30, Support.sizeFor(1 << 30));
-    }
+        @Test
+        void sizeForRoundsUpToPowerOfTwo() {
+            assertEquals(2, Support.sizeFor(2));
+            assertEquals(4, Support.sizeFor(3));
+            assertEquals(4, Support.sizeFor(4));
+            assertEquals(8, Support.sizeFor(5));
+            assertEquals(1 << 30, Support.sizeFor(1 << 30));
+        }
 
-    @Test
-    void sizeForRejectsCapacityAboveMax() {
-      assertThrows(IllegalArgumentException.class, () -> Support.sizeFor((1 << 30) + 1));
-      assertThrows(IllegalArgumentException.class, () -> Support.sizeFor(Integer.MAX_VALUE));
-    }
+        @Test
+        void sizeForRejectsCapacityAboveMax() {
+            assertThrows(IllegalArgumentException.class, () -> Support.sizeFor((1 << 30) + 1));
+            assertThrows(IllegalArgumentException.class, () -> Support.sizeFor(Integer.MAX_VALUE));
+        }
 
-    @Test
-    void sizeForRejectsNegativeCapacity() {
-      assertThrows(IllegalArgumentException.class, () -> Support.sizeFor(-1));
-      assertThrows(IllegalArgumentException.class, () -> Support.sizeFor(Integer.MIN_VALUE));
-    }
+        @Test
+        void sizeForRejectsNegativeCapacity() {
+            assertThrows(IllegalArgumentException.class, () -> Support.sizeFor(-1));
+            assertThrows(IllegalArgumentException.class, () -> Support.sizeFor(Integer.MIN_VALUE));
+        }
 
-    @Test
-    void bucketIndexIsBoundedByArrayLength() {
-      Hashtable.Entry[] buckets = Support.create(16);
-      for (long h : new long[] {0L, 1L, -1L, Long.MIN_VALUE, Long.MAX_VALUE, 12345L}) {
-        int idx = Support.bucketIndex(buckets, h);
-        assertTrue(idx >= 0 && idx < buckets.length, "bucketIndex out of range for hash " + h);
-      }
-    }
+        @Test
+        void bucketIndexIsBoundedByArrayLength() {
+            Hashtable.Entry[] buckets = Support.create(16);
+            for (long h : new long[] {0L, 1L, -1L, Long.MIN_VALUE, Long.MAX_VALUE, 12345L}) {
+                int idx = Support.bucketIndex(buckets, h);
+                assertTrue(idx >= 0 && idx < buckets.length, "bucketIndex out of range for hash " + h);
+            }
+        }
 
-    @Test
-    void clearNullsAllBuckets() {
-      Hashtable.Entry[] buckets = Support.create(4);
-      buckets[0] = new StringIntEntry("x", 1);
-      buckets[1] = new StringIntEntry("y", 2);
-      Support.clear(buckets);
-      for (Hashtable.Entry b : buckets) {
-        assertNull(b);
-      }
-    }
+        @Test
+        void clearNullsAllBuckets() {
+            Hashtable.Entry[] buckets = Support.create(4);
+            buckets[0] = new StringIntEntry("x", 1);
+            buckets[1] = new StringIntEntry("y", 2);
+            Support.clear(buckets);
+            for (Hashtable.Entry b : buckets) {
+                assertNull(b);
+            }
+        }
 
-    @Test
-    void maxRatioScalesTargetForLoadFactor() {
-      // 75% load factor => bucket array sized at requestedSize * 4/3, rounded up to power of 2.
-      // 12 * (4/3) = 16 entries, rounded up to power-of-2 length = 16.
-      assertEquals(4.0f / 3.0f, Support.MAX_RATIO);
-      Hashtable.Entry[] buckets = Support.create(12, Support.MAX_RATIO);
-      assertEquals(16, buckets.length);
-    }
+        @Test
+        void maxRatioScalesTargetForLoadFactor() {
+            // 75% load factor => bucket array sized at requestedSize * 4/3, rounded up to power of 2.
+            // 12 * (4/3) = 16 entries, rounded up to power-of-2 length = 16.
+            assertEquals(4.0f / 3.0f, Support.MAX_RATIO);
+            Hashtable.Entry[] buckets = Support.create(12, Support.MAX_RATIO);
+            assertEquals(16, buckets.length);
+        }
 
-    @Test
-    void createWithScaleRoundsUpToPowerOfTwo() {
-      // 7 * 1.5 = 10.5 -> (int) 10 -> sizeFor rounds up to next power-of-two = 16
-      Hashtable.Entry[] buckets = Support.create(7, 1.5f);
-      assertEquals(16, buckets.length);
-    }
+        @Test
+        void createWithScaleRoundsUpToPowerOfTwo() {
+            // 7 * 1.5 = 10.5 -> (int) 10 -> sizeFor rounds up to next power-of-two = 16
+            Hashtable.Entry[] buckets = Support.create(7, 1.5f);
+            assertEquals(16, buckets.length);
+        }
 
-    @Test
-    void insertHeadEntrySplicesAsNewHead() {
-      Hashtable.Entry[] buckets = Support.create(4);
-      StringIntEntry a = new StringIntEntry("a", 1);
-      StringIntEntry b = new StringIntEntry("b", 2);
-      Support.insertHeadEntry(buckets, 0, a);
-      assertSame(a, buckets[0]);
-      assertNull(a.next());
-
-      Support.insertHeadEntry(buckets, 0, b);
-      assertSame(b, buckets[0]);
-      assertSame(a, b.next());
-      assertNull(a.next());
-    }
-  }
-
-  // ============ BucketIterator ============
-
-  @Nested
-  class BucketIteratorTests {
-
-    @Test
-    void walksOnlyMatchingHash() {
-      // Build a bucket array with two entries that share a bucket but have different hashes.
-      // Use Hashtable.D1 to seed; then call Support.bucketIterator directly with the matching
-      // hash and verify it only returns the matching entry.
-      Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(4);
-      CollidingKey k1 = new CollidingKey("first", 17);
-      CollidingKey k2 = new CollidingKey("second", 17);
-      CollidingKey k3 = new CollidingKey("third", 17);
-      table.insert(new CollidingKeyEntry(k1, 1));
-      table.insert(new CollidingKeyEntry(k2, 2));
-      table.insert(new CollidingKeyEntry(k3, 3));
-      // All three share the same hash (17), so a bucket iterator over hash=17 yields all three.
-      BucketIterator<CollidingKeyEntry> it = Support.bucketIterator(table.buckets, 17L);
-      int count = 0;
-      while (it.hasNext()) {
-        assertNotNull(it.next());
-        count++;
-      }
-      assertEquals(3, count);
+        @Test
+        void insertHeadEntrySplicesAsNewHead() {
+            Hashtable.Entry[] buckets = Support.create(4);
+            StringIntEntry a = new StringIntEntry("a", 1);
+            StringIntEntry b = new StringIntEntry("b", 2);
+            Support.insertHeadEntry(buckets, 0, a);
+            assertSame(a, buckets[0]);
+            assertNull(a.next());
+
+            Support.insertHeadEntry(buckets, 0, b);
+            assertSame(b, buckets[0]);
+            assertSame(a, b.next());
+            assertNull(a.next());
+        }
     }
 
-    @Test
-    void exhaustedIteratorThrowsNoSuchElement() {
-      Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(4);
-      table.insert(new StringIntEntry("only", 1));
-      long h = Hashtable.D1.Entry.hash("only");
-      BucketIterator<StringIntEntry> it = Support.bucketIterator(table.buckets, h);
-      it.next();
-      assertFalse(it.hasNext());
-      assertThrows(NoSuchElementException.class, it::next);
-    }
-  }
-
-  // ============ MutatingBucketIterator ============
-
-  @Nested
-  class MutatingBucketIteratorTests {
-
-    @Test
-    void removeFromHeadOfChainUnlinks() {
-      // Make three entries with the same hash so they chain in one bucket
-      Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(4);
-      CollidingKey k1 = new CollidingKey("first", 17);
-      CollidingKey k2 = new CollidingKey("second", 17);
-      CollidingKey k3 = new CollidingKey("third", 17);
-      table.insert(new CollidingKeyEntry(k1, 1));
-      table.insert(new CollidingKeyEntry(k2, 2));
-      table.insert(new CollidingKeyEntry(k3, 3));
-
-      MutatingBucketIterator<CollidingKeyEntry> it =
-          Support.mutatingBucketIterator(table.buckets, 17L);
-      it.next(); // first match (head of chain in insertion-reverse order)
-      it.remove();
-      // Two should remain
-      int remaining = 0;
-      while (it.hasNext()) {
-        it.next();
-        remaining++;
-      }
-      assertEquals(2, remaining);
-      // And the table still finds the survivors via get(...)
-      // (which entry was the head depends on insertion order; we just verify count + that two
-      // of the three keys are still retrievable.)
-      int found = 0;
-      for (CollidingKey k : new CollidingKey[] {k1, k2, k3}) {
-        if (table.get(k) != null) {
-          found++;
+    // ============ BucketIterator ============
+
+    @Nested
+    class BucketIteratorTests {
+
+        @Test
+        void walksOnlyMatchingHash() {
+            // Build a bucket array with two entries that share a bucket but have different hashes.
+            // Use Hashtable.D1 to seed; then call Support.bucketIterator directly with the matching
+            // hash and verify it only returns the matching entry.
+            Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(4);
+            CollidingKey k1 = new CollidingKey("first", 17);
+            CollidingKey k2 = new CollidingKey("second", 17);
+            CollidingKey k3 = new CollidingKey("third", 17);
+            table.insert(new CollidingKeyEntry(k1, 1));
+            table.insert(new CollidingKeyEntry(k2, 2));
+            table.insert(new CollidingKeyEntry(k3, 3));
+            // All three share the same hash (17), so a bucket iterator over hash=17 yields all three.
+            BucketIterator<CollidingKeyEntry> it = Support.bucketIterator(table.buckets, 17L);
+            int count = 0;
+            while (it.hasNext()) {
+                assertNotNull(it.next());
+                count++;
+            }
+            assertEquals(3, count);
         }
-      }
-      assertEquals(2, found);
-    }
 
-    @Test
-    void replaceSwapsEntryAndPreservesChain() {
-      Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(4);
-      CollidingKey k1 = new CollidingKey("first", 17);
-      CollidingKey k2 = new CollidingKey("second", 17);
-      CollidingKeyEntry e1 = new CollidingKeyEntry(k1, 1);
-      CollidingKeyEntry e2 = new CollidingKeyEntry(k2, 2);
-      table.insert(e1);
-      table.insert(e2);
-
-      MutatingBucketIterator<CollidingKeyEntry> it =
-          Support.mutatingBucketIterator(table.buckets, 17L);
-      CollidingKeyEntry first = it.next();
-      CollidingKeyEntry replacement = new CollidingKeyEntry(first.key, 999);
-      it.replace(replacement);
-      // Both entries still in the chain
-      assertNotNull(table.get(k1));
-      assertNotNull(table.get(k2));
-      // The replaced one now has value 999
-      assertEquals(999, table.get(first.key).value);
+        @Test
+        void exhaustedIteratorThrowsNoSuchElement() {
+            Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(4);
+            table.insert(new StringIntEntry("only", 1));
+            long h = Hashtable.D1.Entry.hash("only");
+            BucketIterator<StringIntEntry> it = Support.bucketIterator(table.buckets, h);
+            it.next();
+            assertFalse(it.hasNext());
+            assertThrows(NoSuchElementException.class, it::next);
+        }
     }
 
-    @Test
-    void removeWithoutNextThrows() {
-      Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(4);
-      table.insert(new StringIntEntry("a", 1));
-      MutatingBucketIterator<StringIntEntry> it =
-          Support.mutatingBucketIterator(table.buckets, Hashtable.D1.Entry.hash("a"));
-      assertThrows(IllegalStateException.class, it::remove);
-    }
-  }
-
-  // ============ MutatingTableIterator ============
-
-  @Nested
-  class MutatingTableIteratorTests {
-
-    @Test
-    void walksEveryEntryAcrossBuckets() {
-      Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(16);
-      table.insert(new StringIntEntry("a", 1));
-      table.insert(new StringIntEntry("b", 2));
-      table.insert(new StringIntEntry("c", 3));
-
-      Set<String> seen = new HashSet<>();
-      for (MutatingTableIterator<StringIntEntry> it = Support.mutatingTableIterator(table.buckets);
-          it.hasNext(); ) {
-        seen.add(it.next().key);
-      }
-      assertEquals(3, seen.size());
-      assertTrue(seen.contains("a"));
-      assertTrue(seen.contains("b"));
-      assertTrue(seen.contains("c"));
-    }
+    // ============ MutatingBucketIterator ============
+
+    @Nested
+    class MutatingBucketIteratorTests {
+
+        @Test
+        void removeFromHeadOfChainUnlinks() {
+            // Make three entries with the same hash so they chain in one bucket
+            Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(4);
+            CollidingKey k1 = new CollidingKey("first", 17);
+            CollidingKey k2 = new CollidingKey("second", 17);
+            CollidingKey k3 = new CollidingKey("third", 17);
+            table.insert(new CollidingKeyEntry(k1, 1));
+            table.insert(new CollidingKeyEntry(k2, 2));
+            table.insert(new CollidingKeyEntry(k3, 3));
+
+            MutatingBucketIterator<CollidingKeyEntry> it = Support.mutatingBucketIterator(table.buckets, 17L);
+            it.next(); // first match (head of chain in insertion-reverse order)
+            it.remove();
+            // Two should remain
+            int remaining = 0;
+            while (it.hasNext()) {
+                it.next();
+                remaining++;
+            }
+            assertEquals(2, remaining);
+            // And the table still finds the survivors via get(...)
+            // (which entry was the head depends on insertion order; we just verify count + that two
+            // of the three keys are still retrievable.)
+            int found = 0;
+            for (CollidingKey k : new CollidingKey[] {k1, k2, k3}) {
+                if (table.get(k) != null) {
+                    found++;
+                }
+            }
+            assertEquals(2, found);
+        }
 
-    @Test
-    void emptyTableIteratorIsExhausted() {
-      Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-      MutatingTableIterator<StringIntEntry> it = Support.mutatingTableIterator(table.buckets);
-      assertFalse(it.hasNext());
-      assertThrows(NoSuchElementException.class, it::next);
-    }
+        @Test
+        void replaceSwapsEntryAndPreservesChain() {
+            Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(4);
+            CollidingKey k1 = new CollidingKey("first", 17);
+            CollidingKey k2 = new CollidingKey("second", 17);
+            CollidingKeyEntry e1 = new CollidingKeyEntry(k1, 1);
+            CollidingKeyEntry e2 = new CollidingKeyEntry(k2, 2);
+            table.insert(e1);
+            table.insert(e2);
+
+            MutatingBucketIterator<CollidingKeyEntry> it = Support.mutatingBucketIterator(table.buckets, 17L);
+            CollidingKeyEntry first = it.next();
+            CollidingKeyEntry replacement = new CollidingKeyEntry(first.key, 999);
+            it.replace(replacement);
+            // Both entries still in the chain
+            assertNotNull(table.get(k1));
+            assertNotNull(table.get(k2));
+            // The replaced one now has value 999
+            assertEquals(999, table.get(first.key).value);
+        }
 
-    @Test
-    void removeUnlinksBucketHead() {
-      Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(4);
-      CollidingKey k1 = new CollidingKey("first", 17);
-      CollidingKey k2 = new CollidingKey("second", 17);
-      table.insert(new CollidingKeyEntry(k1, 1));
-      table.insert(new CollidingKeyEntry(k2, 2));
-
-      // The head of the chain is whichever was inserted last (insert prepends).
-      MutatingTableIterator<CollidingKeyEntry> it = Support.mutatingTableIterator(table.buckets);
-      CollidingKeyEntry head = it.next();
-      it.remove();
-
-      // Survivor still reachable via the table; removed one is not.
-      CollidingKey survivorKey = head.key.equals(k1) ? k2 : k1;
-      assertNotNull(table.get(survivorKey));
-      assertNull(table.get(head.key));
+        @Test
+        void removeWithoutNextThrows() {
+            Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(4);
+            table.insert(new StringIntEntry("a", 1));
+            MutatingBucketIterator<StringIntEntry> it =
+                    Support.mutatingBucketIterator(table.buckets, Hashtable.D1.Entry.hash("a"));
+            assertThrows(IllegalStateException.class, it::remove);
+        }
     }
 
-    @Test
-    void removeUnlinksMidChainEntry() {
-      Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(4);
-      CollidingKey k1 = new CollidingKey("first", 17);
-      CollidingKey k2 = new CollidingKey("second", 17);
-      CollidingKey k3 = new CollidingKey("third", 17);
-      table.insert(new CollidingKeyEntry(k1, 1));
-      table.insert(new CollidingKeyEntry(k2, 2));
-      table.insert(new CollidingKeyEntry(k3, 3));
-
-      // Walk to the second entry, remove it.
-      MutatingTableIterator<CollidingKeyEntry> it = Support.mutatingTableIterator(table.buckets);
-      it.next();
-      CollidingKeyEntry victim = it.next();
-      it.remove();
-
-      assertNull(table.get(victim.key));
-      // The remaining two keys still resolve.
-      int remaining = 0;
-      for (CollidingKey k : new CollidingKey[] {k1, k2, k3}) {
-        if (table.get(k) != null) {
-          remaining++;
+    // ============ MutatingTableIterator ============
+
+    @Nested
+    class MutatingTableIteratorTests {
+
+        @Test
+        void walksEveryEntryAcrossBuckets() {
+            Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(16);
+            table.insert(new StringIntEntry("a", 1));
+            table.insert(new StringIntEntry("b", 2));
+            table.insert(new StringIntEntry("c", 3));
+
+            Set<String> seen = new HashSet<>();
+            for (MutatingTableIterator<StringIntEntry> it = Support.mutatingTableIterator(table.buckets);
+                    it.hasNext(); ) {
+                seen.add(it.next().key);
+            }
+            assertEquals(3, seen.size());
+            assertTrue(seen.contains("a"));
+            assertTrue(seen.contains("b"));
+            assertTrue(seen.contains("c"));
         }
-      }
-      assertEquals(2, remaining);
 
-      // Iteration can continue past a remove and yield the third entry.
-      assertTrue(it.hasNext());
-      assertNotNull(it.next());
-      assertFalse(it.hasNext());
-    }
+        @Test
+        void emptyTableIteratorIsExhausted() {
+            Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+            MutatingTableIterator<StringIntEntry> it = Support.mutatingTableIterator(table.buckets);
+            assertFalse(it.hasNext());
+            assertThrows(NoSuchElementException.class, it::next);
+        }
 
-    @Test
-    void removeSkipsOverEmptyBuckets() {
-      // Three distinct keys that land in different buckets (low entry count vs large bucket array
-      // makes empty buckets between them very likely). Verify the iterator skips empties cleanly
-      // after a remove.
-      Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(64);
-      table.insert(new StringIntEntry("alpha", 1));
-      table.insert(new StringIntEntry("beta", 2));
-      table.insert(new StringIntEntry("gamma", 3));
-
-      MutatingTableIterator<StringIntEntry> it = Support.mutatingTableIterator(table.buckets);
-      it.next();
-      it.remove();
-      int remaining = 0;
-      while (it.hasNext()) {
-        it.next();
-        remaining++;
-      }
-      assertEquals(2, remaining);
-    }
+        @Test
+        void removeUnlinksBucketHead() {
+            Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(4);
+            CollidingKey k1 = new CollidingKey("first", 17);
+            CollidingKey k2 = new CollidingKey("second", 17);
+            table.insert(new CollidingKeyEntry(k1, 1));
+            table.insert(new CollidingKeyEntry(k2, 2));
+
+            // The head of the chain is whichever was inserted last (insert prepends).
+            MutatingTableIterator<CollidingKeyEntry> it = Support.mutatingTableIterator(table.buckets);
+            CollidingKeyEntry head = it.next();
+            it.remove();
+
+            // Survivor still reachable via the table; removed one is not.
+            CollidingKey survivorKey = head.key.equals(k1) ? k2 : k1;
+            assertNotNull(table.get(survivorKey));
+            assertNull(table.get(head.key));
+        }
 
-    @Test
-    void removeWithoutNextThrows() {
-      Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(4);
-      table.insert(new StringIntEntry("a", 1));
-      MutatingTableIterator<StringIntEntry> it = Support.mutatingTableIterator(table.buckets);
-      assertThrows(IllegalStateException.class, it::remove);
-    }
+        @Test
+        void removeUnlinksMidChainEntry() {
+            Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(4);
+            CollidingKey k1 = new CollidingKey("first", 17);
+            CollidingKey k2 = new CollidingKey("second", 17);
+            CollidingKey k3 = new CollidingKey("third", 17);
+            table.insert(new CollidingKeyEntry(k1, 1));
+            table.insert(new CollidingKeyEntry(k2, 2));
+            table.insert(new CollidingKeyEntry(k3, 3));
+
+            // Walk to the second entry, remove it.
+            MutatingTableIterator<CollidingKeyEntry> it = Support.mutatingTableIterator(table.buckets);
+            it.next();
+            CollidingKeyEntry victim = it.next();
+            it.remove();
+
+            assertNull(table.get(victim.key));
+            // The remaining two keys still resolve.
+            int remaining = 0;
+            for (CollidingKey k : new CollidingKey[] {k1, k2, k3}) {
+                if (table.get(k) != null) {
+                    remaining++;
+                }
+            }
+            assertEquals(2, remaining);
+
+            // Iteration can continue past a remove and yield the third entry.
+            assertTrue(it.hasNext());
+            assertNotNull(it.next());
+            assertFalse(it.hasNext());
+        }
 
-    @Test
-    void removeTwiceWithoutInterveningNextThrows() {
-      Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(4);
-      table.insert(new StringIntEntry("a", 1));
-      table.insert(new StringIntEntry("b", 2));
-      MutatingTableIterator<StringIntEntry> it = Support.mutatingTableIterator(table.buckets);
-      it.next();
-      it.remove();
-      assertThrows(IllegalStateException.class, it::remove);
-    }
+        @Test
+        void removeSkipsOverEmptyBuckets() {
+            // Three distinct keys that land in different buckets (low entry count vs large bucket array
+            // makes empty buckets between them very likely). Verify the iterator skips empties cleanly
+            // after a remove.
+            Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(64);
+            table.insert(new StringIntEntry("alpha", 1));
+            table.insert(new StringIntEntry("beta", 2));
+            table.insert(new StringIntEntry("gamma", 3));
+
+            MutatingTableIterator<StringIntEntry> it = Support.mutatingTableIterator(table.buckets);
+            it.next();
+            it.remove();
+            int remaining = 0;
+            while (it.hasNext()) {
+                it.next();
+                remaining++;
+            }
+            assertEquals(2, remaining);
+        }
 
-    @Test
-    void halfOpenRangeOmitsBucketsOutsideTheRange() {
-      // CollidingKey lets us pin entries to specific buckets via controlled hashCode. 16-slot
-      // table -> bucketIndex = hash & 15. Place entries in buckets 0, 5, and 10; iterate
-      // [5, 10) -- should see only bucket 5.
-      Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(16);
-      table.insert(new CollidingKeyEntry(new CollidingKey("b0", 0), 1));
-      table.insert(new CollidingKeyEntry(new CollidingKey("b5", 5), 2));
-      table.insert(new CollidingKeyEntry(new CollidingKey("b10", 10), 3));
-
-      Set<String> seen = new HashSet<>();
-      for (MutatingTableIterator<CollidingKeyEntry> it =
-              Support.mutatingTableIterator(table.buckets, 5, 10);
-          it.hasNext(); ) {
-        seen.add(it.next().key.label);
-      }
-      assertEquals(1, seen.size());
-      assertTrue(seen.contains("b5"));
-    }
+        @Test
+        void removeWithoutNextThrows() {
+            Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(4);
+            table.insert(new StringIntEntry("a", 1));
+            MutatingTableIterator<StringIntEntry> it = Support.mutatingTableIterator(table.buckets);
+            assertThrows(IllegalStateException.class, it::remove);
+        }
 
-    @Test
-    void emptyHalfOpenRangeIsExhausted() {
-      // start == end -> immediately-exhausted iterator. Important: this is the wrap-around
-      // pass [0, cursor) when cursor == 0 in resumable sweeps.
-      Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-      table.insert(new StringIntEntry("a", 1));
-      MutatingTableIterator<StringIntEntry> it = Support.mutatingTableIterator(table.buckets, 0, 0);
-      assertFalse(it.hasNext());
-    }
+        @Test
+        void removeTwiceWithoutInterveningNextThrows() {
+            Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(4);
+            table.insert(new StringIntEntry("a", 1));
+            table.insert(new StringIntEntry("b", 2));
+            MutatingTableIterator<StringIntEntry> it = Support.mutatingTableIterator(table.buckets);
+            it.next();
+            it.remove();
+            assertThrows(IllegalStateException.class, it::remove);
+        }
 
-    @Test
-    void rangeBoundsOutOfOrderThrows() {
-      Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
-      assertThrows(
-          IndexOutOfBoundsException.class,
-          () -> Support.mutatingTableIterator(table.buckets, -1, 4));
-      assertThrows(
-          IndexOutOfBoundsException.class,
-          () -> Support.mutatingTableIterator(table.buckets, 4, 2)); // end < start
-      assertThrows(
-          IndexOutOfBoundsException.class,
-          () ->
-              Support.mutatingTableIterator(
-                  table.buckets, 0, table.buckets.length + 1)); // end > len
-    }
+        @Test
+        void halfOpenRangeOmitsBucketsOutsideTheRange() {
+            // CollidingKey lets us pin entries to specific buckets via controlled hashCode. 16-slot
+            // table -> bucketIndex = hash & 15. Place entries in buckets 0, 5, and 10; iterate
+            // [5, 10) -- should see only bucket 5.
+            Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(16);
+            table.insert(new CollidingKeyEntry(new CollidingKey("b0", 0), 1));
+            table.insert(new CollidingKeyEntry(new CollidingKey("b5", 5), 2));
+            table.insert(new CollidingKeyEntry(new CollidingKey("b10", 10), 3));
+
+            Set<String> seen = new HashSet<>();
+            for (MutatingTableIterator<CollidingKeyEntry> it = Support.mutatingTableIterator(table.buckets, 5, 10);
+                    it.hasNext(); ) {
+                seen.add(it.next().key.label);
+            }
+            assertEquals(1, seen.size());
+            assertTrue(seen.contains("b5"));
+        }
+
+        @Test
+        void emptyHalfOpenRangeIsExhausted() {
+            // start == end -> immediately-exhausted iterator. Important: this is the wrap-around
+            // pass [0, cursor) when cursor == 0 in resumable sweeps.
+            Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+            table.insert(new StringIntEntry("a", 1));
+            MutatingTableIterator<StringIntEntry> it = Support.mutatingTableIterator(table.buckets, 0, 0);
+            assertFalse(it.hasNext());
+        }
 
-    @Test
-    void currentBucketReportsLandingIndex() {
-      // Pin one entry to a known bucket and check currentBucket() after next() reports that
-      // bucket. Before any next() (or after remove()), currentBucket() returns -1.
-      Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(16);
-      table.insert(new CollidingKeyEntry(new CollidingKey("b3", 3), 1));
-
-      MutatingTableIterator<CollidingKeyEntry> it = Support.mutatingTableIterator(table.buckets);
-      assertEquals(-1, it.currentBucket(), "before any next() currentBucket should be -1");
-      it.next();
-      assertEquals(3, it.currentBucket(), "currentBucket should report the entry's bucket");
+        @Test
+        void rangeBoundsOutOfOrderThrows() {
+            Hashtable.D1<String, StringIntEntry> table = new Hashtable.D1<>(8);
+            assertThrows(IndexOutOfBoundsException.class, () -> Support.mutatingTableIterator(table.buckets, -1, 4));
+            assertThrows(
+                    IndexOutOfBoundsException.class,
+                    () -> Support.mutatingTableIterator(table.buckets, 4, 2)); // end < start
+            assertThrows(
+                    IndexOutOfBoundsException.class,
+                    () -> Support.mutatingTableIterator(table.buckets, 0, table.buckets.length + 1)); // end > len
+        }
+
+        @Test
+        void currentBucketReportsLandingIndex() {
+            // Pin one entry to a known bucket and check currentBucket() after next() reports that
+            // bucket. Before any next() (or after remove()), currentBucket() returns -1.
+            Hashtable.D1<CollidingKey, CollidingKeyEntry> table = new Hashtable.D1<>(16);
+            table.insert(new CollidingKeyEntry(new CollidingKey("b3", 3), 1));
+
+            MutatingTableIterator<CollidingKeyEntry> it = Support.mutatingTableIterator(table.buckets);
+            assertEquals(-1, it.currentBucket(), "before any next() currentBucket should be -1");
+            it.next();
+            assertEquals(3, it.currentBucket(), "currentBucket should report the entry's bucket");
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/HashtableTestEntries.java b/internal-api/src/test/java/datadog/trace/util/HashtableTestEntries.java
index e657028ee8b..4769f0c11d4 100644
--- a/internal-api/src/test/java/datadog/trace/util/HashtableTestEntries.java
+++ b/internal-api/src/test/java/datadog/trace/util/HashtableTestEntries.java
@@ -2,53 +2,53 @@
 
 /** Shared test entry types for {@link HashtableTest}, {@link HashtableD1Test}, and friends. */
 final class HashtableTestEntries {
-  private HashtableTestEntries() {}
+    private HashtableTestEntries() {}
 
-  static final class StringIntEntry extends Hashtable.D1.Entry<String> {
-    int value;
+    static final class StringIntEntry extends Hashtable.D1.Entry<String> {
+        int value;
 
-    StringIntEntry(String key, int value) {
-      super(key);
-      this.value = value;
+        StringIntEntry(String key, int value) {
+            super(key);
+            this.value = value;
+        }
     }
-  }
 
-  /** Key whose hashCode is fully controllable, to force chain collisions deterministically. */
-  static final class CollidingKey {
-    final String label;
-    final int hash;
-
-    CollidingKey(String label, int hash) {
-      this.label = label;
-      this.hash = hash;
-    }
-
-    @Override
-    public int hashCode() {
-      return hash;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-      if (!(o instanceof CollidingKey)) {
-        return false;
-      }
-      CollidingKey that = (CollidingKey) o;
-      return hash == that.hash && label.equals(that.label);
-    }
-
-    @Override
-    public String toString() {
-      return "CollidingKey(" + label + ", " + hash + ")";
+    /** Key whose hashCode is fully controllable, to force chain collisions deterministically. */
+    static final class CollidingKey {
+        final String label;
+        final int hash;
+
+        CollidingKey(String label, int hash) {
+            this.label = label;
+            this.hash = hash;
+        }
+
+        @Override
+        public int hashCode() {
+            return hash;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof CollidingKey)) {
+                return false;
+            }
+            CollidingKey that = (CollidingKey) o;
+            return hash == that.hash && label.equals(that.label);
+        }
+
+        @Override
+        public String toString() {
+            return "CollidingKey(" + label + ", " + hash + ")";
+        }
     }
-  }
 
-  static final class CollidingKeyEntry extends Hashtable.D1.Entry<CollidingKey> {
-    int value;
+    static final class CollidingKeyEntry extends Hashtable.D1.Entry<CollidingKey> {
+        int value;
 
-    CollidingKeyEntry(CollidingKey key, int value) {
-      super(key);
-      this.value = value;
+        CollidingKeyEntry(CollidingKey key, int value) {
+            super(key);
+            this.value = value;
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/LongHashingUtilsTest.java b/internal-api/src/test/java/datadog/trace/util/LongHashingUtilsTest.java
index 2837fa9ff73..2df2980fc77 100644
--- a/internal-api/src/test/java/datadog/trace/util/LongHashingUtilsTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/LongHashingUtilsTest.java
@@ -11,182 +11,179 @@
 
 class LongHashingUtilsTest {
 
-  // ----- single-value overloads -----
-
-  @Test
-  void hashOfObjectReturnsHashCodeOrSentinelForNull() {
-    Object o = new Object();
-    assertEquals(o.hashCode(), hash(o));
-    assertEquals(Long.MIN_VALUE, hash((Object) null));
-  }
-
-  @Test
-  void primitiveOverloadsMatchBoxedHashCodes() {
-    assertEquals(Boolean.hashCode(true), hash(true));
-    assertEquals(Boolean.hashCode(false), hash(false));
-    assertEquals(Character.hashCode('x'), hash('x'));
-    assertEquals(Byte.hashCode((byte) 42), hash((byte) 42));
-    assertEquals(Short.hashCode((short) -7), hash((short) -7));
-    assertEquals(Integer.hashCode(123456), hash(123456));
-    assertEquals(123456L, hash(123456L));
-    assertEquals(Float.hashCode(3.14f), hash(3.14f));
-    assertEquals(Double.doubleToRawLongBits(2.71828), hash(2.71828));
-  }
-
-  // ----- multi-arg Object overloads vs chained addToHash -----
-
-  @Test
-  void twoArgHashMatchesChainedAddToHash() {
-    Object a = "alpha";
-    Object b = 42;
-    assertEquals(addToHash(addToHash(0L, a), b), hash(a, b));
-  }
-
-  @Test
-  void threeArgHashMatchesChainedAddToHash() {
-    Object a = "alpha";
-    Object b = 42;
-    Object c = true;
-    assertEquals(addToHash(addToHash(addToHash(0L, a), b), c), hash(a, b, c));
-  }
-
-  @Test
-  void fourArgHashMatchesChainedAddToHash() {
-    Object a = "alpha";
-    Object b = 42;
-    Object c = true;
-    Object d = 3.14;
-    assertEquals(addToHash(addToHash(addToHash(addToHash(0L, a), b), c), d), hash(a, b, c, d));
-  }
-
-  @Test
-  void fiveArgHashMatchesChainedAddToHash() {
-    Object a = "alpha";
-    Object b = 42;
-    Object c = true;
-    Object d = 3.14;
-    Object e = 'q';
-    assertEquals(
-        addToHash(addToHash(addToHash(addToHash(addToHash(0L, a), b), c), d), e),
-        hash(a, b, c, d, e));
-  }
-
-  @Test
-  void multiArgHashHandlesNullsConsistentlyWithChainedAddToHash() {
-    assertEquals(addToHash(addToHash(0L, (Object) null), "x"), hash(null, "x"));
-    assertEquals(
-        addToHash(addToHash(addToHash(0L, "x"), (Object) null), "y"), hash("x", null, "y"));
-  }
-
-  @Test
-  void differentInputsProduceDifferentHashes() {
-    // Sanity: ordering matters, and distinct values produce distinct results in general.
-    assertNotEquals(hash("a", "b"), hash("b", "a"));
-    assertNotEquals(hash("a", "b", "c"), hash("a", "c", "b"));
-  }
-
-  // ----- addToHash primitive overloads -----
-
-  @Test
-  void addToHashPrimitivesMatchObjectVersion() {
-    long seed = 100L;
-    assertEquals(addToHash(seed, Boolean.hashCode(true)), addToHash(seed, true));
-    assertEquals(addToHash(seed, Character.hashCode('z')), addToHash(seed, 'z'));
-    assertEquals(addToHash(seed, Byte.hashCode((byte) 9)), addToHash(seed, (byte) 9));
-    assertEquals(addToHash(seed, Short.hashCode((short) 5)), addToHash(seed, (short) 5));
-    assertEquals(addToHash(seed, Long.hashCode(999_999L)), addToHash(seed, 999_999L));
-    assertEquals(addToHash(seed, Float.hashCode(1.5f)), addToHash(seed, 1.5f));
-    assertEquals(addToHash(seed, Double.hashCode(2.5d)), addToHash(seed, 2.5d));
-  }
-
-  @Test
-  void addToHashIsLinearAcrossSteps() {
-    // 31*h + v formula -- verify by accumulating an explicit sequence.
-    long expected = 0L;
-    for (int v : new int[] {1, 2, 3, 4, 5}) {
-      expected = 31L * expected + v;
-    }
-    long actual = 0L;
-    for (int v : new int[] {1, 2, 3, 4, 5}) {
-      actual = addToHash(actual, v);
-    }
-    assertEquals(expected, actual);
-  }
-
-  // ----- iterable / array versions -----
-
-  @Test
-  void hashIterableMatchesChainedAddToHash() {
-    Iterable<Object> values = Arrays.asList("a", 1, true, null);
-    long expected = 0L;
-    for (Object o : values) {
-      expected = addToHash(expected, o);
-    }
-    assertEquals(expected, hash(values));
-  }
-
-  @Test
-  @SuppressWarnings("deprecation")
-  void deprecatedIntArrayHashMatchesChainedAddToHash() {
-    int[] hashes = new int[] {7, 13, 31, 1024};
-    long expected = 0L;
-    for (int h : hashes) {
-      expected = addToHash(expected, h);
-    }
-    assertEquals(expected, hash(hashes));
-  }
-
-  @Test
-  @SuppressWarnings("deprecation")
-  void deprecatedObjectArrayHashMatchesChainedAddToHash() {
-    Object[] objs = new Object[] {"alpha", 7, null, true};
-    long expected = 0L;
-    for (Object o : objs) {
-      expected = addToHash(expected, o);
-    }
-    assertEquals(expected, hash(objs));
-  }
-
-  @Test
-  void addToHashArrayFoldsFromSeedLikeChainedAddToHash() {
-    Object[] objs = new Object[] {"alpha", 7, null, true};
-
-    // Full-array overload folds every element onto the seed, matching an explicit chain.
-    long fromZero = 0L;
-    for (Object o : objs) {
-      fromZero = addToHash(fromZero, o);
-    }
-    assertEquals(fromZero, addToHash(0L, objs));
-
-    // A non-zero seed carries through, so the result differs from the zero-seed fold.
-    long fromSeed = 100L;
-    for (Object o : objs) {
-      fromSeed = addToHash(fromSeed, o);
-    }
-    assertEquals(fromSeed, addToHash(100L, objs));
-    assertNotEquals(addToHash(0L, objs), addToHash(100L, objs));
-  }
-
-  @Test
-  void addToHashArrayRespectsLen() {
-    Object[] objs = new Object[] {"alpha", 7, null, true};
-
-    // The len override folds only the first len elements.
-    long firstTwo = addToHash(addToHash(0L, objs[0]), objs[1]);
-    assertEquals(firstTwo, addToHash(0L, objs, 2));
-    assertNotEquals(addToHash(0L, objs), addToHash(0L, objs, 2));
-
-    // len==0 never enters the loop and returns the seed unchanged.
-    assertEquals(42L, addToHash(42L, objs, 0));
-  }
-
-  // ----- intHash null behavior is observable via multi-arg overloads -----
-
-  @Test
-  void multiArgHashTreatsNullAsZero() {
-    // hash(Object,Object) feeds intHash(...) which returns 0 for null.
-    // Verify: hash(null, "x") == 31L*0 + "x".hashCode()
-    int xHash = Objects.hashCode("x");
-    assertEquals(31L * 0 + xHash, hash(null, "x"));
-  }
+    // ----- single-value overloads -----
+
+    @Test
+    void hashOfObjectReturnsHashCodeOrSentinelForNull() {
+        Object o = new Object();
+        assertEquals(o.hashCode(), hash(o));
+        assertEquals(Long.MIN_VALUE, hash((Object) null));
+    }
+
+    @Test
+    void primitiveOverloadsMatchBoxedHashCodes() {
+        assertEquals(Boolean.hashCode(true), hash(true));
+        assertEquals(Boolean.hashCode(false), hash(false));
+        assertEquals(Character.hashCode('x'), hash('x'));
+        assertEquals(Byte.hashCode((byte) 42), hash((byte) 42));
+        assertEquals(Short.hashCode((short) -7), hash((short) -7));
+        assertEquals(Integer.hashCode(123456), hash(123456));
+        assertEquals(123456L, hash(123456L));
+        assertEquals(Float.hashCode(3.14f), hash(3.14f));
+        assertEquals(Double.doubleToRawLongBits(2.71828), hash(2.71828));
+    }
+
+    // ----- multi-arg Object overloads vs chained addToHash -----
+
+    @Test
+    void twoArgHashMatchesChainedAddToHash() {
+        Object a = "alpha";
+        Object b = 42;
+        assertEquals(addToHash(addToHash(0L, a), b), hash(a, b));
+    }
+
+    @Test
+    void threeArgHashMatchesChainedAddToHash() {
+        Object a = "alpha";
+        Object b = 42;
+        Object c = true;
+        assertEquals(addToHash(addToHash(addToHash(0L, a), b), c), hash(a, b, c));
+    }
+
+    @Test
+    void fourArgHashMatchesChainedAddToHash() {
+        Object a = "alpha";
+        Object b = 42;
+        Object c = true;
+        Object d = 3.14;
+        assertEquals(addToHash(addToHash(addToHash(addToHash(0L, a), b), c), d), hash(a, b, c, d));
+    }
+
+    @Test
+    void fiveArgHashMatchesChainedAddToHash() {
+        Object a = "alpha";
+        Object b = 42;
+        Object c = true;
+        Object d = 3.14;
+        Object e = 'q';
+        assertEquals(addToHash(addToHash(addToHash(addToHash(addToHash(0L, a), b), c), d), e), hash(a, b, c, d, e));
+    }
+
+    @Test
+    void multiArgHashHandlesNullsConsistentlyWithChainedAddToHash() {
+        assertEquals(addToHash(addToHash(0L, (Object) null), "x"), hash(null, "x"));
+        assertEquals(addToHash(addToHash(addToHash(0L, "x"), (Object) null), "y"), hash("x", null, "y"));
+    }
+
+    @Test
+    void differentInputsProduceDifferentHashes() {
+        // Sanity: ordering matters, and distinct values produce distinct results in general.
+        assertNotEquals(hash("a", "b"), hash("b", "a"));
+        assertNotEquals(hash("a", "b", "c"), hash("a", "c", "b"));
+    }
+
+    // ----- addToHash primitive overloads -----
+
+    @Test
+    void addToHashPrimitivesMatchObjectVersion() {
+        long seed = 100L;
+        assertEquals(addToHash(seed, Boolean.hashCode(true)), addToHash(seed, true));
+        assertEquals(addToHash(seed, Character.hashCode('z')), addToHash(seed, 'z'));
+        assertEquals(addToHash(seed, Byte.hashCode((byte) 9)), addToHash(seed, (byte) 9));
+        assertEquals(addToHash(seed, Short.hashCode((short) 5)), addToHash(seed, (short) 5));
+        assertEquals(addToHash(seed, Long.hashCode(999_999L)), addToHash(seed, 999_999L));
+        assertEquals(addToHash(seed, Float.hashCode(1.5f)), addToHash(seed, 1.5f));
+        assertEquals(addToHash(seed, Double.hashCode(2.5d)), addToHash(seed, 2.5d));
+    }
+
+    @Test
+    void addToHashIsLinearAcrossSteps() {
+        // 31*h + v formula -- verify by accumulating an explicit sequence.
+        long expected = 0L;
+        for (int v : new int[] {1, 2, 3, 4, 5}) {
+            expected = 31L * expected + v;
+        }
+        long actual = 0L;
+        for (int v : new int[] {1, 2, 3, 4, 5}) {
+            actual = addToHash(actual, v);
+        }
+        assertEquals(expected, actual);
+    }
+
+    // ----- iterable / array versions -----
+
+    @Test
+    void hashIterableMatchesChainedAddToHash() {
+        Iterable<Object> values = Arrays.asList("a", 1, true, null);
+        long expected = 0L;
+        for (Object o : values) {
+            expected = addToHash(expected, o);
+        }
+        assertEquals(expected, hash(values));
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    void deprecatedIntArrayHashMatchesChainedAddToHash() {
+        int[] hashes = new int[] {7, 13, 31, 1024};
+        long expected = 0L;
+        for (int h : hashes) {
+            expected = addToHash(expected, h);
+        }
+        assertEquals(expected, hash(hashes));
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    void deprecatedObjectArrayHashMatchesChainedAddToHash() {
+        Object[] objs = new Object[] {"alpha", 7, null, true};
+        long expected = 0L;
+        for (Object o : objs) {
+            expected = addToHash(expected, o);
+        }
+        assertEquals(expected, hash(objs));
+    }
+
+    @Test
+    void addToHashArrayFoldsFromSeedLikeChainedAddToHash() {
+        Object[] objs = new Object[] {"alpha", 7, null, true};
+
+        // Full-array overload folds every element onto the seed, matching an explicit chain.
+        long fromZero = 0L;
+        for (Object o : objs) {
+            fromZero = addToHash(fromZero, o);
+        }
+        assertEquals(fromZero, addToHash(0L, objs));
+
+        // A non-zero seed carries through, so the result differs from the zero-seed fold.
+        long fromSeed = 100L;
+        for (Object o : objs) {
+            fromSeed = addToHash(fromSeed, o);
+        }
+        assertEquals(fromSeed, addToHash(100L, objs));
+        assertNotEquals(addToHash(0L, objs), addToHash(100L, objs));
+    }
+
+    @Test
+    void addToHashArrayRespectsLen() {
+        Object[] objs = new Object[] {"alpha", 7, null, true};
+
+        // The len override folds only the first len elements.
+        long firstTwo = addToHash(addToHash(0L, objs[0]), objs[1]);
+        assertEquals(firstTwo, addToHash(0L, objs, 2));
+        assertNotEquals(addToHash(0L, objs), addToHash(0L, objs, 2));
+
+        // len==0 never enters the loop and returns the seed unchanged.
+        assertEquals(42L, addToHash(42L, objs, 0));
+    }
+
+    // ----- intHash null behavior is observable via multi-arg overloads -----
+
+    @Test
+    void multiArgHashTreatsNullAsZero() {
+        // hash(Object,Object) feeds intHash(...) which returns 0 for null.
+        // Verify: hash(null, "x") == 31L*0 + "x".hashCode()
+        int xHash = Objects.hashCode("x");
+        assertEquals(31L * 0 + xHash, hash(null, "x"));
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/MaybeTest.java b/internal-api/src/test/java/datadog/trace/util/MaybeTest.java
index 1799c4a2157..e8ed6c91d3f 100644
--- a/internal-api/src/test/java/datadog/trace/util/MaybeTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/MaybeTest.java
@@ -9,91 +9,91 @@
 
 public class MaybeTest {
 
-  static final class Widget {
-    long count;
-  }
-
-  @Test
-  public void ofPresent() {
-    Maybe<String> maybe = Maybe.of("value");
-    assertTrue(maybe.isPresent());
-    assertEquals("value", maybe.getOrNull());
-  }
-
-  @Test
-  public void ofAbsent() {
-    Maybe<String> maybe = Maybe.of(null);
-    assertFalse(maybe.isPresent());
-    assertNull(maybe.getOrNull());
-  }
-
-  @Test
-  public void ofReceiverFunctionPresent() {
-    Maybe<Integer> maybe = Maybe.of("value", String::length);
-    assertTrue(maybe.isPresent());
-    assertEquals(5, maybe.getOrNull());
-  }
-
-  @Test
-  public void ofReceiverFunctionAbsent() {
-    Maybe<Integer> maybe = Maybe.of("value", r -> null);
-    assertFalse(maybe.isPresent());
-    assertNull(maybe.getOrNull());
-  }
-
-  @Test
-  public void updateConsumerRunsWhenPresent() {
-    Widget w = new Widget();
-    Maybe.of(w).update(widget -> widget.count = 42);
-    assertEquals(42, w.count);
-  }
-
-  @Test
-  public void updateConsumerNoOpWhenAbsent() {
-    Maybe<Widget> maybe = Maybe.of(null);
-    maybe.update(widget -> widget.count = 42);
-    assertFalse(maybe.isPresent());
-  }
-
-  @Test
-  public void updateBiConsumerRunsWhenPresent() {
-    Widget w = new Widget();
-    Maybe.of(w).update("context", (widget, ctx) -> widget.count = ctx.length());
-    assertEquals(7, w.count);
-  }
-
-  @Test
-  public void updateBiConsumerNoOpWhenAbsent() {
-    Maybe<Widget> maybe = Maybe.of(null);
-    maybe.update("context", (widget, ctx) -> widget.count = ctx.length());
-    assertFalse(maybe.isPresent());
-  }
-
-  @Test
-  public void updateLongRunsWhenPresent() {
-    Widget w = new Widget();
-    Maybe.of(w).update(5L, (widget, delta) -> widget.count += delta);
-    assertEquals(5, w.count);
-  }
-
-  @Test
-  public void updateLongNoOpWhenAbsent() {
-    Maybe<Widget> maybe = Maybe.of(null);
-    maybe.update(5L, (widget, delta) -> widget.count += delta);
-    assertFalse(maybe.isPresent());
-  }
-
-  @Test
-  public void ifPresentOrElseRunsActionWhenPresent() {
-    StringBuilder sb = new StringBuilder();
-    Maybe.of("value").ifPresentOrElse(sb::append, () -> sb.append("empty"));
-    assertEquals("value", sb.toString());
-  }
-
-  @Test
-  public void ifPresentOrElseRunsEmptyActionWhenAbsent() {
-    StringBuilder sb = new StringBuilder();
-    Maybe.<String>of(null).ifPresentOrElse(sb::append, () -> sb.append("empty"));
-    assertEquals("empty", sb.toString());
-  }
+    static final class Widget {
+        long count;
+    }
+
+    @Test
+    public void ofPresent() {
+        Maybe<String> maybe = Maybe.of("value");
+        assertTrue(maybe.isPresent());
+        assertEquals("value", maybe.getOrNull());
+    }
+
+    @Test
+    public void ofAbsent() {
+        Maybe<String> maybe = Maybe.of(null);
+        assertFalse(maybe.isPresent());
+        assertNull(maybe.getOrNull());
+    }
+
+    @Test
+    public void ofReceiverFunctionPresent() {
+        Maybe<Integer> maybe = Maybe.of("value", String::length);
+        assertTrue(maybe.isPresent());
+        assertEquals(5, maybe.getOrNull());
+    }
+
+    @Test
+    public void ofReceiverFunctionAbsent() {
+        Maybe<Integer> maybe = Maybe.of("value", r -> null);
+        assertFalse(maybe.isPresent());
+        assertNull(maybe.getOrNull());
+    }
+
+    @Test
+    public void updateConsumerRunsWhenPresent() {
+        Widget w = new Widget();
+        Maybe.of(w).update(widget -> widget.count = 42);
+        assertEquals(42, w.count);
+    }
+
+    @Test
+    public void updateConsumerNoOpWhenAbsent() {
+        Maybe<Widget> maybe = Maybe.of(null);
+        maybe.update(widget -> widget.count = 42);
+        assertFalse(maybe.isPresent());
+    }
+
+    @Test
+    public void updateBiConsumerRunsWhenPresent() {
+        Widget w = new Widget();
+        Maybe.of(w).update("context", (widget, ctx) -> widget.count = ctx.length());
+        assertEquals(7, w.count);
+    }
+
+    @Test
+    public void updateBiConsumerNoOpWhenAbsent() {
+        Maybe<Widget> maybe = Maybe.of(null);
+        maybe.update("context", (widget, ctx) -> widget.count = ctx.length());
+        assertFalse(maybe.isPresent());
+    }
+
+    @Test
+    public void updateLongRunsWhenPresent() {
+        Widget w = new Widget();
+        Maybe.of(w).update(5L, (widget, delta) -> widget.count += delta);
+        assertEquals(5, w.count);
+    }
+
+    @Test
+    public void updateLongNoOpWhenAbsent() {
+        Maybe<Widget> maybe = Maybe.of(null);
+        maybe.update(5L, (widget, delta) -> widget.count += delta);
+        assertFalse(maybe.isPresent());
+    }
+
+    @Test
+    public void ifPresentOrElseRunsActionWhenPresent() {
+        StringBuilder sb = new StringBuilder();
+        Maybe.of("value").ifPresentOrElse(sb::append, () -> sb.append("empty"));
+        assertEquals("value", sb.toString());
+    }
+
+    @Test
+    public void ifPresentOrElseRunsEmptyActionWhenAbsent() {
+        StringBuilder sb = new StringBuilder();
+        Maybe.<String>of(null).ifPresentOrElse(sb::append, () -> sb.append("empty"));
+        assertEquals("empty", sb.toString());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/RandomUtilsTest.java b/internal-api/src/test/java/datadog/trace/util/RandomUtilsTest.java
index 1a3969a5a77..fad05b93aec 100644
--- a/internal-api/src/test/java/datadog/trace/util/RandomUtilsTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/RandomUtilsTest.java
@@ -6,20 +6,23 @@
 import org.junit.jupiter.api.Test;
 
 public class RandomUtilsTest {
-  private static final Pattern VERSION_4_UUID =
-      Pattern.compile("[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[8-9a-f][0-9a-f]{3}-[0-9a-f]{12}");
+    private static final Pattern VERSION_4_UUID =
+            Pattern.compile("[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[8-9a-f][0-9a-f]{3}-[0-9a-f]{12}");
 
-  @Test
-  public void testRandomUUIDMatchesSpec() {
-    for (int i = 0; i < 8; i++) {
-      assertTrue(VERSION_4_UUID.matcher(RandomUtils.randomUUID().toString()).matches());
+    @Test
+    public void testRandomUUIDMatchesSpec() {
+        for (int i = 0; i < 8; i++) {
+            assertTrue(
+                    VERSION_4_UUID.matcher(RandomUtils.randomUUID().toString()).matches());
+        }
     }
-  }
 
-  @Test
-  public void testSecureRandomUUIDMatchesSpec() {
-    for (int i = 0; i < 8; i++) {
-      assertTrue(VERSION_4_UUID.matcher(RandomUtils.secureRandomUUID().toString()).matches());
+    @Test
+    public void testSecureRandomUUIDMatchesSpec() {
+        for (int i = 0; i < 8; i++) {
+            assertTrue(VERSION_4_UUID
+                    .matcher(RandomUtils.secureRandomUUID().toString())
+                    .matches());
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/StringIndexFootprintTest.java b/internal-api/src/test/java/datadog/trace/util/StringIndexFootprintTest.java
index 63c62bc24f4..65e18dc95ff 100644
--- a/internal-api/src/test/java/datadog/trace/util/StringIndexFootprintTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/StringIndexFootprintTest.java
@@ -47,53 +47,49 @@
  */
 class StringIndexFootprintTest {
 
-  @BeforeAll
-  static void assumeNotJ9Jvm() {
-    // JOL's GraphLayout relies on HotSpot-specific Unsafe internals and throws
-    // IllegalStateException on J9-based JVMs (IBM/Semeru) — same guard as
-    // ScopeAndContinuationLayoutTest.
-    assumeFalse(JavaVirtualMachine.isJ9());
-  }
+    @BeforeAll
+    static void assumeNotJ9Jvm() {
+        // JOL's GraphLayout relies on HotSpot-specific Unsafe internals and throws
+        // IllegalStateException on J9-based JVMs (IBM/Semeru) — same guard as
+        // ScopeAndContinuationLayoutTest.
+        assumeFalse(JavaVirtualMachine.isJ9());
+    }
 
-  static String[] elements(int n) {
-    String[] a = new String[n];
-    for (int i = 0; i < n; ++i) {
-      a[i] = "element-key-" + i;
+    static String[] elements(int n) {
+        String[] a = new String[n];
+        for (int i = 0; i < n; ++i) {
+            a[i] = "element-key-" + i;
+        }
+        return a;
     }
-    return a;
-  }
 
-  static long bytes(Object root) {
-    return GraphLayout.parseInstance(root).totalSize();
-  }
+    static long bytes(Object root) {
+        return GraphLayout.parseInstance(root).totalSize();
+    }
 
-  @Test
-  void footprintComparison() {
-    System.out.printf(
-        "%-6s %12s %12s %12s %12s %12s%n",
-        "n", "array", "hashSet", "treeSet", "copyOf", "stringIndex");
-    System.out.printf(
-        "%-6s %12s %12s %12s %12s %12s   (overhead above array)%n", "", "", "", "", "", "");
+    @Test
+    void footprintComparison() {
+        System.out.printf(
+                "%-6s %12s %12s %12s %12s %12s%n", "n", "array", "hashSet", "treeSet", "copyOf", "stringIndex");
+        System.out.printf("%-6s %12s %12s %12s %12s %12s   (overhead above array)%n", "", "", "", "", "", "");
 
-    for (int n : new int[] {8, 32, 128}) {
-      String[] el = elements(n);
+        for (int n : new int[] {8, 32, 128}) {
+            String[] el = elements(n);
 
-      long array = bytes((Object) el); // baseline: strings + reference array
-      long hashSet = bytes(new HashSet<>(Arrays.asList(el)));
-      long treeSet = bytes(new TreeSet<>(Arrays.asList(el)));
-      Set<String> copy = CollectionUtils.tryMakeImmutableSet(Arrays.asList(el));
-      long copyOf = bytes(copy);
-      long stringIndex = bytes(StringIndex.of(el));
+            long array = bytes((Object) el); // baseline: strings + reference array
+            long hashSet = bytes(new HashSet<>(Arrays.asList(el)));
+            long treeSet = bytes(new TreeSet<>(Arrays.asList(el)));
+            Set<String> copy = CollectionUtils.tryMakeImmutableSet(Arrays.asList(el));
+            long copyOf = bytes(copy);
+            long stringIndex = bytes(StringIndex.of(el));
 
-      System.out.printf(
-          "%-6d %12d %12d %12d %12d %12d%n", n, array, hashSet, treeSet, copyOf, stringIndex);
-      System.out.printf(
-          "%-6s %12s %12d %12d %12d %12d%n",
-          "", "", hashSet - array, treeSet - array, copyOf - array, stringIndex - array);
+            System.out.printf("%-6d %12d %12d %12d %12d %12d%n", n, array, hashSet, treeSet, copyOf, stringIndex);
+            System.out.printf(
+                    "%-6s %12s %12d %12d %12d %12d%n",
+                    "", "", hashSet - array, treeSet - array, copyOf - array, stringIndex - array);
 
-      // Robust cross-JVM invariant: no per-element Node objects -> lighter than HashSet.
-      assertTrue(
-          stringIndex < hashSet, "StringIndex should retain fewer bytes than HashSet at n=" + n);
+            // Robust cross-JVM invariant: no per-element Node objects -> lighter than HashSet.
+            assertTrue(stringIndex < hashSet, "StringIndex should retain fewer bytes than HashSet at n=" + n);
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/StringIndexTest.java b/internal-api/src/test/java/datadog/trace/util/StringIndexTest.java
index 966d0d0d4ae..e4bda7e00b0 100644
--- a/internal-api/src/test/java/datadog/trace/util/StringIndexTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/StringIndexTest.java
@@ -13,218 +13,210 @@
 
 class StringIndexTest {
 
-  @Test
-  void hash_spread_and_zeroSentinel() {
-    // "".hashCode() == 0 -> remapped to the non-zero sentinel so 0 can mean "empty slot"
-    assertEquals(0xDD06, EmbeddingSupport.hash(""));
-
-    int raw = "foo".hashCode();
-    assertEquals(raw ^ (raw >>> 16), EmbeddingSupport.hash("foo"));
-    assertNotEquals(0, EmbeddingSupport.hash("foo"));
-  }
-
-  @Test
-  void capacityFor_isPow2_andAtLeastDoubled() {
-    assertEquals(2, EmbeddingSupport.capacityFor(0)); // empty set -> minimal table
-    assertEquals(2, EmbeddingSupport.capacityFor(1)); // >= 2x, smallest power of two
-    assertEquals(8, EmbeddingSupport.capacityFor(3)); // ceil(3/0.5)=6 -> 8
-    assertEquals(8, EmbeddingSupport.capacityFor(4)); // ceil(4/0.5)=8 -> 8 (was 16: tightened)
-    assertEquals(64, EmbeddingSupport.capacityFor(16, EmbeddingSupport.LOW_LOAD_FACTOR)); // 4x
-  }
-
-  @Test
-  void capacityFor_rejectsBadArgs() {
-    assertThrows(IllegalArgumentException.class, () -> EmbeddingSupport.capacityFor(-1));
-    assertThrows(IllegalArgumentException.class, () -> EmbeddingSupport.capacityFor(4, 0f));
-    assertThrows(IllegalArgumentException.class, () -> EmbeddingSupport.capacityFor(4, 1f));
-  }
-
-  @Test
-  void capacityFor_boundsAtMaxCapacity() {
-    // ceil(n / loadFactor) landing exactly on MAX_CAPACITY still succeeds.
-    int n = EmbeddingSupport.MAX_CAPACITY / 2; // ceil(n / 0.5) == MAX_CAPACITY
-    assertEquals(EmbeddingSupport.MAX_CAPACITY, EmbeddingSupport.capacityFor(n));
-  }
-
-  @Test
-  void capacityFor_rejectsCapacityAboveMax() {
-    // Required capacity exceeds MAX_CAPACITY: previously the double->int narrowing conversion
-    // saturated at Integer.MAX_VALUE and the subsequent << 1 wrapped to a negative array size.
-    assertThrows(IllegalArgumentException.class, () -> EmbeddingSupport.capacityFor(1, 1e-10f));
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> EmbeddingSupport.capacityFor(EmbeddingSupport.MAX_CAPACITY + 1));
-  }
-
-  @Test
-  void instance_contains_internedAndCopy_andMiss() {
-    StringIndex set = StringIndex.of("foo", "bar", "baz");
-
-    assertEquals(8, set.numSlots()); // 3 names -> capacityFor(3) == 8
-
-    assertTrue(set.contains("foo")); // interned literal -> == fast path in eq
-    assertTrue(set.contains(new String("bar"))); // non-interned -> .equals path
-    assertFalse(set.contains("nope"));
-
-    assertTrue(set.indexOf("baz") >= 0);
-    assertEquals(-1, set.indexOf("nope"));
-  }
-
-  @Test
-  void support_create_then_indexOf() {
-    Data d = EmbeddingSupport.create("x", "y");
-
-    int slot = EmbeddingSupport.indexOf(d.hashes, d.names, "x"); // 3-arg overload computes the hash
-    assertTrue(slot >= 0);
-    assertEquals("x", d.names[slot]);
-
-    assertEquals(-1, EmbeddingSupport.indexOf(d.hashes, d.names, "q"));
-  }
-
-  @Test
-  void support_contains_internedAndCopy_andMiss() {
-    Data d = EmbeddingSupport.create("foo", "bar", "baz");
-
-    assertTrue(
-        EmbeddingSupport.contains(d.hashes, d.names, "foo")); // interned literal -> == fast path
-    assertTrue(EmbeddingSupport.contains(d.hashes, d.names, new String("bar"))); // non-interned
-    assertFalse(EmbeddingSupport.contains(d.hashes, d.names, "nope"));
-  }
-
-  /** Controlled hashes force collision, linear-probe wraparound, and the already-present path. */
-  @Test
-  void put_and_indexOf_collisionAndWraparound() {
-    int[] hashes = new int[4]; // mask = 3
-    String[] names = new String[4];
-
-    assertEquals(3, EmbeddingSupport.put(hashes, names, "a", 7)); // 7 & 3 == 3
-    assertEquals(
-        0, EmbeddingSupport.put(hashes, names, "b", 7)); // collides at 3, probes (3+1)&3 == 0
-    assertEquals(
-        3, EmbeddingSupport.put(hashes, names, "a", 7)); // already present -> existing slot
-
-    assertEquals(3, EmbeddingSupport.indexOf(hashes, names, "a", 7)); // direct hit
-    assertEquals(
-        0, EmbeddingSupport.indexOf(hashes, names, "b", 7)); // hit after collision + wraparound
-    assertEquals(
-        -1,
-        EmbeddingSupport.indexOf(hashes, names, "c", 7)); // miss after probing 3 -> 0 -> 1(empty)
-    assertEquals(
-        -1, EmbeddingSupport.indexOf(hashes, names, "z", 6)); // 6 & 3 == 2, empty -> immediate miss
-  }
-
-  @Test
-  void put_throwsWhenFull() {
-    int[] hashes = new int[2]; // mask = 1
-    String[] names = new String[2];
-
-    EmbeddingSupport.put(hashes, names, "a", 4); // 4 & 1 == 0
-    EmbeddingSupport.put(hashes, names, "b", 5); // 5 & 1 == 1
-
-    // both slots occupied, no match -> probe exhausts -> throw
-    assertThrows(IllegalStateException.class, () -> EmbeddingSupport.put(hashes, names, "c", 6));
-  }
-
-  /** The documented usage: build a StringIndex, attach a parallel payload indexed by slot. */
-  @Test
-  void parallelPayloadBySlot() {
-    String[] names = {"a", "b", "c"};
-    Data d = EmbeddingSupport.create(names);
-
-    long[] ids = new long[d.names.length];
-    for (int j = 0; j < names.length; j++) {
-      ids[EmbeddingSupport.indexOf(d.hashes, d.names, names[j])] = j + 1L;
-    }
-
-    assertEquals(1L, ids[EmbeddingSupport.indexOf(d.hashes, d.names, "a")]);
-    assertEquals(2L, ids[EmbeddingSupport.indexOf(d.hashes, d.names, "b")]);
-    assertEquals(3L, ids[EmbeddingSupport.indexOf(d.hashes, d.names, "c")]);
-  }
-
-  @Test
-  void mapIntValues_slotAligned_andLookup() {
-    StringIndex idx = StringIndex.of("a", "b", "c");
-    // 1-based ids; 0 stays the empty-slot / not-found sentinel.
-    int[] ids = idx.mapIntValues(s -> s.charAt(0) - 'a' + 1);
-    assertEquals(idx.numSlots(), ids.length); // sized to the table, not the name count
-
-    assertEquals(1, idx.lookup(ids, "a"));
-    assertEquals(2, idx.lookup(ids, "b"));
-    assertEquals(3, idx.lookup(ids, "c"));
-    assertEquals(0, idx.lookup(ids, "z")); // miss -> 0
-    assertEquals(-1, idx.lookupOrDefault(ids, "z", -1)); // miss -> supplied default
-  }
-
-  @Test
-  void mapLongValues_slotAligned_andLookup() {
-    Data d = EmbeddingSupport.create("a", "b", "c");
-    long[] vals = EmbeddingSupport.mapLongValues(d.names, s -> s.charAt(0) - 'a' + 1L);
-
-    assertEquals(1L, EmbeddingSupport.lookup(d.hashes, d.names, vals, "a"));
-    assertEquals(3L, EmbeddingSupport.lookup(d.hashes, d.names, vals, "c"));
-    assertEquals(0L, EmbeddingSupport.lookup(d.hashes, d.names, vals, "z")); // miss -> 0
-    assertEquals(-1L, EmbeddingSupport.lookupOrDefault(d.hashes, d.names, vals, "z", -1L));
-  }
-
-  @Test
-  void mapValues_objects_typedArray_andLookup() {
-    StringIndex idx = StringIndex.of("a", "bb", "ccc");
-    Integer[] lengths = idx.mapValues(Integer.class, String::length);
-
-    // Class<T> drives a real Integer[], not an Object[].
-    assertEquals(Integer[].class, lengths.getClass());
-
-    assertEquals(Integer.valueOf(1), idx.lookup(lengths, "a"));
-    assertEquals(Integer.valueOf(3), idx.lookup(lengths, "ccc"));
-    assertNull(idx.lookup(lengths, "z")); // miss -> null
-    assertEquals(Integer.valueOf(-1), idx.lookupOrDefault(lengths, "z", -1));
-  }
-
-  @Test
-  void support_mapValues_objects_sizedToSlots_emptyStayNull() {
-    Data d = EmbeddingSupport.create("a", "b", "c");
-    String[] tagged = EmbeddingSupport.mapValues(d.names, String.class, s -> s + "!");
-
-    assertEquals(d.names.length, tagged.length); // sized to the table
-    int nonNull = 0;
-    for (String s : tagged) {
-      if (s != null) {
-        nonNull++;
-      }
-    }
-    assertEquals(3, nonNull); // only the placed names map; unfilled slots stay null
-
-    assertEquals("a!", EmbeddingSupport.lookup(d.hashes, d.names, tagged, "a"));
-    assertEquals("dflt", EmbeddingSupport.lookupOrDefault(d.hashes, d.names, tagged, "z", "dflt"));
-  }
-
-  @Test
-  void instance_lookup_delegatesToSupportArrays() {
-    StringIndex idx = StringIndex.of("x", "y");
-    int[] ids = idx.mapIntValues(s -> "x".equals(s) ? 7 : 9);
-
-    assertEquals(7, idx.lookup(ids, "x"));
-    assertEquals(9, idx.lookup(ids, "y"));
-    assertEquals(0, idx.lookup(ids, "missing"));
-    assertEquals(42, idx.lookupOrDefault(ids, "missing", 42));
-  }
-
-  @Test
-  void instance_longValues_mapAndLookup() {
-    StringIndex idx = StringIndex.of("a", "b", "c");
-    long[] vals = idx.mapLongValues(s -> s.charAt(0) - 'a' + 1L);
-    assertEquals(idx.numSlots(), vals.length); // sized to the table, not the name count
-
-    assertEquals(1L, idx.lookup(vals, "a"));
-    assertEquals(3L, idx.lookup(vals, "c"));
-    assertEquals(0L, idx.lookup(vals, "z")); // miss -> 0
-    assertEquals(2L, idx.lookupOrDefault(vals, "b", -1L)); // hit
-    assertEquals(-1L, idx.lookupOrDefault(vals, "z", -1L)); // miss -> supplied default
-  }
-
-  @Test
-  void support_numSlots_matchesTableSize() {
-    Data d = EmbeddingSupport.create("a", "b", "c");
-    assertEquals(d.hashes.length, EmbeddingSupport.numSlots(d.hashes));
-  }
+    @Test
+    void hash_spread_and_zeroSentinel() {
+        // "".hashCode() == 0 -> remapped to the non-zero sentinel so 0 can mean "empty slot"
+        assertEquals(0xDD06, EmbeddingSupport.hash(""));
+
+        int raw = "foo".hashCode();
+        assertEquals(raw ^ (raw >>> 16), EmbeddingSupport.hash("foo"));
+        assertNotEquals(0, EmbeddingSupport.hash("foo"));
+    }
+
+    @Test
+    void capacityFor_isPow2_andAtLeastDoubled() {
+        assertEquals(2, EmbeddingSupport.capacityFor(0)); // empty set -> minimal table
+        assertEquals(2, EmbeddingSupport.capacityFor(1)); // >= 2x, smallest power of two
+        assertEquals(8, EmbeddingSupport.capacityFor(3)); // ceil(3/0.5)=6 -> 8
+        assertEquals(8, EmbeddingSupport.capacityFor(4)); // ceil(4/0.5)=8 -> 8 (was 16: tightened)
+        assertEquals(64, EmbeddingSupport.capacityFor(16, EmbeddingSupport.LOW_LOAD_FACTOR)); // 4x
+    }
+
+    @Test
+    void capacityFor_rejectsBadArgs() {
+        assertThrows(IllegalArgumentException.class, () -> EmbeddingSupport.capacityFor(-1));
+        assertThrows(IllegalArgumentException.class, () -> EmbeddingSupport.capacityFor(4, 0f));
+        assertThrows(IllegalArgumentException.class, () -> EmbeddingSupport.capacityFor(4, 1f));
+    }
+
+    @Test
+    void capacityFor_boundsAtMaxCapacity() {
+        // ceil(n / loadFactor) landing exactly on MAX_CAPACITY still succeeds.
+        int n = EmbeddingSupport.MAX_CAPACITY / 2; // ceil(n / 0.5) == MAX_CAPACITY
+        assertEquals(EmbeddingSupport.MAX_CAPACITY, EmbeddingSupport.capacityFor(n));
+    }
+
+    @Test
+    void capacityFor_rejectsCapacityAboveMax() {
+        // Required capacity exceeds MAX_CAPACITY: previously the double->int narrowing conversion
+        // saturated at Integer.MAX_VALUE and the subsequent << 1 wrapped to a negative array size.
+        assertThrows(IllegalArgumentException.class, () -> EmbeddingSupport.capacityFor(1, 1e-10f));
+        assertThrows(
+                IllegalArgumentException.class, () -> EmbeddingSupport.capacityFor(EmbeddingSupport.MAX_CAPACITY + 1));
+    }
+
+    @Test
+    void instance_contains_internedAndCopy_andMiss() {
+        StringIndex set = StringIndex.of("foo", "bar", "baz");
+
+        assertEquals(8, set.numSlots()); // 3 names -> capacityFor(3) == 8
+
+        assertTrue(set.contains("foo")); // interned literal -> == fast path in eq
+        assertTrue(set.contains(new String("bar"))); // non-interned -> .equals path
+        assertFalse(set.contains("nope"));
+
+        assertTrue(set.indexOf("baz") >= 0);
+        assertEquals(-1, set.indexOf("nope"));
+    }
+
+    @Test
+    void support_create_then_indexOf() {
+        Data d = EmbeddingSupport.create("x", "y");
+
+        int slot = EmbeddingSupport.indexOf(d.hashes, d.names, "x"); // 3-arg overload computes the hash
+        assertTrue(slot >= 0);
+        assertEquals("x", d.names[slot]);
+
+        assertEquals(-1, EmbeddingSupport.indexOf(d.hashes, d.names, "q"));
+    }
+
+    @Test
+    void support_contains_internedAndCopy_andMiss() {
+        Data d = EmbeddingSupport.create("foo", "bar", "baz");
+
+        assertTrue(EmbeddingSupport.contains(d.hashes, d.names, "foo")); // interned literal -> == fast path
+        assertTrue(EmbeddingSupport.contains(d.hashes, d.names, new String("bar"))); // non-interned
+        assertFalse(EmbeddingSupport.contains(d.hashes, d.names, "nope"));
+    }
+
+    /** Controlled hashes force collision, linear-probe wraparound, and the already-present path. */
+    @Test
+    void put_and_indexOf_collisionAndWraparound() {
+        int[] hashes = new int[4]; // mask = 3
+        String[] names = new String[4];
+
+        assertEquals(3, EmbeddingSupport.put(hashes, names, "a", 7)); // 7 & 3 == 3
+        assertEquals(0, EmbeddingSupport.put(hashes, names, "b", 7)); // collides at 3, probes (3+1)&3 == 0
+        assertEquals(3, EmbeddingSupport.put(hashes, names, "a", 7)); // already present -> existing slot
+
+        assertEquals(3, EmbeddingSupport.indexOf(hashes, names, "a", 7)); // direct hit
+        assertEquals(0, EmbeddingSupport.indexOf(hashes, names, "b", 7)); // hit after collision + wraparound
+        assertEquals(-1, EmbeddingSupport.indexOf(hashes, names, "c", 7)); // miss after probing 3 -> 0 -> 1(empty)
+        assertEquals(-1, EmbeddingSupport.indexOf(hashes, names, "z", 6)); // 6 & 3 == 2, empty -> immediate miss
+    }
+
+    @Test
+    void put_throwsWhenFull() {
+        int[] hashes = new int[2]; // mask = 1
+        String[] names = new String[2];
+
+        EmbeddingSupport.put(hashes, names, "a", 4); // 4 & 1 == 0
+        EmbeddingSupport.put(hashes, names, "b", 5); // 5 & 1 == 1
+
+        // both slots occupied, no match -> probe exhausts -> throw
+        assertThrows(IllegalStateException.class, () -> EmbeddingSupport.put(hashes, names, "c", 6));
+    }
+
+    /** The documented usage: build a StringIndex, attach a parallel payload indexed by slot. */
+    @Test
+    void parallelPayloadBySlot() {
+        String[] names = {"a", "b", "c"};
+        Data d = EmbeddingSupport.create(names);
+
+        long[] ids = new long[d.names.length];
+        for (int j = 0; j < names.length; j++) {
+            ids[EmbeddingSupport.indexOf(d.hashes, d.names, names[j])] = j + 1L;
+        }
+
+        assertEquals(1L, ids[EmbeddingSupport.indexOf(d.hashes, d.names, "a")]);
+        assertEquals(2L, ids[EmbeddingSupport.indexOf(d.hashes, d.names, "b")]);
+        assertEquals(3L, ids[EmbeddingSupport.indexOf(d.hashes, d.names, "c")]);
+    }
+
+    @Test
+    void mapIntValues_slotAligned_andLookup() {
+        StringIndex idx = StringIndex.of("a", "b", "c");
+        // 1-based ids; 0 stays the empty-slot / not-found sentinel.
+        int[] ids = idx.mapIntValues(s -> s.charAt(0) - 'a' + 1);
+        assertEquals(idx.numSlots(), ids.length); // sized to the table, not the name count
+
+        assertEquals(1, idx.lookup(ids, "a"));
+        assertEquals(2, idx.lookup(ids, "b"));
+        assertEquals(3, idx.lookup(ids, "c"));
+        assertEquals(0, idx.lookup(ids, "z")); // miss -> 0
+        assertEquals(-1, idx.lookupOrDefault(ids, "z", -1)); // miss -> supplied default
+    }
+
+    @Test
+    void mapLongValues_slotAligned_andLookup() {
+        Data d = EmbeddingSupport.create("a", "b", "c");
+        long[] vals = EmbeddingSupport.mapLongValues(d.names, s -> s.charAt(0) - 'a' + 1L);
+
+        assertEquals(1L, EmbeddingSupport.lookup(d.hashes, d.names, vals, "a"));
+        assertEquals(3L, EmbeddingSupport.lookup(d.hashes, d.names, vals, "c"));
+        assertEquals(0L, EmbeddingSupport.lookup(d.hashes, d.names, vals, "z")); // miss -> 0
+        assertEquals(-1L, EmbeddingSupport.lookupOrDefault(d.hashes, d.names, vals, "z", -1L));
+    }
+
+    @Test
+    void mapValues_objects_typedArray_andLookup() {
+        StringIndex idx = StringIndex.of("a", "bb", "ccc");
+        Integer[] lengths = idx.mapValues(Integer.class, String::length);
+
+        // Class<T> drives a real Integer[], not an Object[].
+        assertEquals(Integer[].class, lengths.getClass());
+
+        assertEquals(Integer.valueOf(1), idx.lookup(lengths, "a"));
+        assertEquals(Integer.valueOf(3), idx.lookup(lengths, "ccc"));
+        assertNull(idx.lookup(lengths, "z")); // miss -> null
+        assertEquals(Integer.valueOf(-1), idx.lookupOrDefault(lengths, "z", -1));
+    }
+
+    @Test
+    void support_mapValues_objects_sizedToSlots_emptyStayNull() {
+        Data d = EmbeddingSupport.create("a", "b", "c");
+        String[] tagged = EmbeddingSupport.mapValues(d.names, String.class, s -> s + "!");
+
+        assertEquals(d.names.length, tagged.length); // sized to the table
+        int nonNull = 0;
+        for (String s : tagged) {
+            if (s != null) {
+                nonNull++;
+            }
+        }
+        assertEquals(3, nonNull); // only the placed names map; unfilled slots stay null
+
+        assertEquals("a!", EmbeddingSupport.lookup(d.hashes, d.names, tagged, "a"));
+        assertEquals("dflt", EmbeddingSupport.lookupOrDefault(d.hashes, d.names, tagged, "z", "dflt"));
+    }
+
+    @Test
+    void instance_lookup_delegatesToSupportArrays() {
+        StringIndex idx = StringIndex.of("x", "y");
+        int[] ids = idx.mapIntValues(s -> "x".equals(s) ? 7 : 9);
+
+        assertEquals(7, idx.lookup(ids, "x"));
+        assertEquals(9, idx.lookup(ids, "y"));
+        assertEquals(0, idx.lookup(ids, "missing"));
+        assertEquals(42, idx.lookupOrDefault(ids, "missing", 42));
+    }
+
+    @Test
+    void instance_longValues_mapAndLookup() {
+        StringIndex idx = StringIndex.of("a", "b", "c");
+        long[] vals = idx.mapLongValues(s -> s.charAt(0) - 'a' + 1L);
+        assertEquals(idx.numSlots(), vals.length); // sized to the table, not the name count
+
+        assertEquals(1L, idx.lookup(vals, "a"));
+        assertEquals(3L, idx.lookup(vals, "c"));
+        assertEquals(0L, idx.lookup(vals, "z")); // miss -> 0
+        assertEquals(2L, idx.lookupOrDefault(vals, "b", -1L)); // hit
+        assertEquals(-1L, idx.lookupOrDefault(vals, "z", -1L)); // miss -> supplied default
+    }
+
+    @Test
+    void support_numSlots_matchesTableSize() {
+        Data d = EmbeddingSupport.create("a", "b", "c");
+        assertEquals(d.hashes.length, EmbeddingSupport.numSlots(d.hashes));
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/StringsCaseInsensitiveHashCodeTest.java b/internal-api/src/test/java/datadog/trace/util/StringsCaseInsensitiveHashCodeTest.java
index 52195d73693..04173165ad8 100644
--- a/internal-api/src/test/java/datadog/trace/util/StringsCaseInsensitiveHashCodeTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/StringsCaseInsensitiveHashCodeTest.java
@@ -8,96 +8,93 @@
 
 class StringsCaseInsensitiveHashCodeTest {
 
-  @Test
-  void equalIgnoringCaseProducesEqualHash() {
-    assertEquals(caseInsensitiveHashCode("Content-Type"), caseInsensitiveHashCode("content-type"));
-    assertEquals(caseInsensitiveHashCode("Content-Type"), caseInsensitiveHashCode("CONTENT-TYPE"));
-    assertEquals(caseInsensitiveHashCode("Content-Type"), caseInsensitiveHashCode("cOnTeNt-TyPe"));
-  }
+    @Test
+    void equalIgnoringCaseProducesEqualHash() {
+        assertEquals(caseInsensitiveHashCode("Content-Type"), caseInsensitiveHashCode("content-type"));
+        assertEquals(caseInsensitiveHashCode("Content-Type"), caseInsensitiveHashCode("CONTENT-TYPE"));
+        assertEquals(caseInsensitiveHashCode("Content-Type"), caseInsensitiveHashCode("cOnTeNt-TyPe"));
+    }
 
-  @Test
-  void emptyStringHashesToZero() {
-    // Matches String.hashCode("") == 0.
-    assertEquals(0, caseInsensitiveHashCode(""));
-  }
+    @Test
+    void emptyStringHashesToZero() {
+        // Matches String.hashCode("") == 0.
+        assertEquals(0, caseInsensitiveHashCode(""));
+    }
 
-  @Test
-  void distinctContentHashesDiffer() {
-    // Not a guarantee in general, but these representative keys must not collide.
-    assertNotEquals(caseInsensitiveHashCode("foo"), caseInsensitiveHashCode("bar"));
-    assertNotEquals(caseInsensitiveHashCode("Accept"), caseInsensitiveHashCode("Host"));
-  }
+    @Test
+    void distinctContentHashesDiffer() {
+        // Not a guarantee in general, but these representative keys must not collide.
+        assertNotEquals(caseInsensitiveHashCode("foo"), caseInsensitiveHashCode("bar"));
+        assertNotEquals(caseInsensitiveHashCode("Accept"), caseInsensitiveHashCode("Host"));
+    }
 
-  @Test
-  void staysConsistentWithEqualsIgnoreCase() {
-    // For any pair, equalsIgnoreCase => equal hash. (The converse — unequal hash implies not
-    // equalsIgnoreCase — is what a table relies on to never miss a present key.)
-    String[] samples = {
-      "Accept",
-      "accept",
-      "ACCEPT",
-      "Accept-Encoding",
-      "accept-encoding",
-      "X-Forwarded-For",
-      "x-forwarded-for",
-      "Host",
-      "host"
-    };
-    for (String a : samples) {
-      for (String b : samples) {
-        if (a.equalsIgnoreCase(b)) {
-          assertEquals(
-              caseInsensitiveHashCode(a),
-              caseInsensitiveHashCode(b),
-              () -> "hash mismatch for equalIgnoreCase pair");
+    @Test
+    void staysConsistentWithEqualsIgnoreCase() {
+        // For any pair, equalsIgnoreCase => equal hash. (The converse — unequal hash implies not
+        // equalsIgnoreCase — is what a table relies on to never miss a present key.)
+        String[] samples = {
+            "Accept",
+            "accept",
+            "ACCEPT",
+            "Accept-Encoding",
+            "accept-encoding",
+            "X-Forwarded-For",
+            "x-forwarded-for",
+            "Host",
+            "host"
+        };
+        for (String a : samples) {
+            for (String b : samples) {
+                if (a.equalsIgnoreCase(b)) {
+                    assertEquals(
+                            caseInsensitiveHashCode(a),
+                            caseInsensitiveHashCode(b),
+                            () -> "hash mismatch for equalIgnoreCase pair");
+                }
+            }
         }
-      }
     }
-  }
 
-  /**
-   * A supplementary-plane pair that {@code equalsIgnoreCase} unifies on JDK 9+ (code-point-based
-   * folding) but a per-{@code char} hash fold kept distinct -- the bug this fold fixes. Folding by
-   * code point unifies the hash too, so this holds on every JDK regardless of what {@code
-   * equalsIgnoreCase} itself does with the pair on that JDK (see {@link
-   * #staysConsistentAcrossAllDefinedCodePoints} for the guarded, cross-JDK-safe version of this
-   * check).
-   */
-  @Test
-  void foldsSupplementaryCasePairTogether() {
-    String s1 = new String(Character.toChars(0x10400)); // DESERET CAPITAL LETTER LONG I
-    String s2 = new String(Character.toChars(0x10428)); // DESERET SMALL LETTER LONG I
-    assertEquals(caseInsensitiveHashCode(s1), caseInsensitiveHashCode(s2));
-  }
+    /**
+     * A supplementary-plane pair that {@code equalsIgnoreCase} unifies on JDK 9+ (code-point-based
+     * folding) but a per-{@code char} hash fold kept distinct -- the bug this fold fixes. Folding by
+     * code point unifies the hash too, so this holds on every JDK regardless of what {@code
+     * equalsIgnoreCase} itself does with the pair on that JDK (see {@link
+     * #staysConsistentAcrossAllDefinedCodePoints} for the guarded, cross-JDK-safe version of this
+     * check).
+     */
+    @Test
+    void foldsSupplementaryCasePairTogether() {
+        String s1 = new String(Character.toChars(0x10400)); // DESERET CAPITAL LETTER LONG I
+        String s2 = new String(Character.toChars(0x10428)); // DESERET SMALL LETTER LONG I
+        assertEquals(caseInsensitiveHashCode(s1), caseInsensitiveHashCode(s2));
+    }
 
-  /**
-   * Exhaustive sweep guarded by {@code equalsIgnoreCase} itself, so it stays portable across JDKs:
-   * on JDK 8 (no code-point reconstruction) the supplementary pairs above simply never enter the
-   * guard, and the sweep still passes.
-   */
-  @Test
-  void staysConsistentAcrossAllDefinedCodePoints() {
-    for (int cp = 0; cp <= Character.MAX_CODE_POINT; cp++) {
-      if (!Character.isDefined(cp) || Character.isSurrogate((char) cp)) continue;
-      String s = new String(Character.toChars(cp));
-      for (int variant :
-          new int[] {
-            Character.toUpperCase(cp), Character.toLowerCase(cp), Character.toTitleCase(cp)
-          }) {
-        String t = new String(Character.toChars(variant));
-        if (s.equalsIgnoreCase(t)) {
-          final String fs = s;
-          final String ft = t;
-          assertEquals(
-              caseInsensitiveHashCode(s),
-              caseInsensitiveHashCode(t),
-              () ->
-                  "hash mismatch for equalsIgnoreCase pair U+"
-                      + Integer.toHexString(fs.codePointAt(0))
-                      + " / U+"
-                      + Integer.toHexString(ft.codePointAt(0)));
+    /**
+     * Exhaustive sweep guarded by {@code equalsIgnoreCase} itself, so it stays portable across JDKs:
+     * on JDK 8 (no code-point reconstruction) the supplementary pairs above simply never enter the
+     * guard, and the sweep still passes.
+     */
+    @Test
+    void staysConsistentAcrossAllDefinedCodePoints() {
+        for (int cp = 0; cp <= Character.MAX_CODE_POINT; cp++) {
+            if (!Character.isDefined(cp) || Character.isSurrogate((char) cp)) continue;
+            String s = new String(Character.toChars(cp));
+            for (int variant :
+                    new int[] {Character.toUpperCase(cp), Character.toLowerCase(cp), Character.toTitleCase(cp)}) {
+                String t = new String(Character.toChars(variant));
+                if (s.equalsIgnoreCase(t)) {
+                    final String fs = s;
+                    final String ft = t;
+                    assertEquals(
+                            caseInsensitiveHashCode(s),
+                            caseInsensitiveHashCode(t),
+                            () -> "hash mismatch for equalsIgnoreCase pair U+"
+                                    + Integer.toHexString(fs.codePointAt(0))
+                                    + " / U+"
+                                    + Integer.toHexString(ft.codePointAt(0)));
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/StringsRegionContainsTest.java b/internal-api/src/test/java/datadog/trace/util/StringsRegionContainsTest.java
index 115fcd79a31..a4e8d87d7af 100644
--- a/internal-api/src/test/java/datadog/trace/util/StringsRegionContainsTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/StringsRegionContainsTest.java
@@ -9,45 +9,45 @@
 /** Boundary semantics of {@link Strings#regionContains(String, int, int, String)}. */
 class StringsRegionContainsTest {
 
-  // "abXYZcd": a0 b1 X2 Y3 Z4 c5 d6  -> "XYZ" spans [2,5).
-  private static final String S = "abXYZcd";
-
-  @Test
-  void foundFullyInside() {
-    assertTrue(regionContains(S, 0, S.length(), "XYZ"));
-  }
-
-  @Test
-  void notPresent() {
-    assertFalse(regionContains(S, 0, S.length(), "QQ"));
-  }
-
-  @Test
-  void exactFit() {
-    // idx == 2, idx + len == 5 == endIndex -> included.
-    assertTrue(regionContains(S, 2, 5, "XYZ"));
-  }
-
-  @Test
-  void straddlingEndIndexExcluded() {
-    // endIndex == 4 cuts off the trailing 'Z' -> not fully inside.
-    assertFalse(regionContains(S, 2, 4, "XYZ"));
-  }
-
-  @Test
-  void occurrenceBeforeBeginIndexExcluded() {
-    // beginIndex == 3 starts past the needle's first char -> no occurrence at/after beginIndex.
-    assertFalse(regionContains(S, 3, S.length(), "XYZ"));
-  }
-
-  @Test
-  void emptyRegion() {
-    assertFalse(regionContains(S, 2, 2, "XYZ"));
-  }
-
-  @Test
-  void matchesWholeStringContains() {
-    assertTrue(regionContains("hello", 0, 5, "ll"));
-    assertFalse(regionContains("hello", 0, 5, "z"));
-  }
+    // "abXYZcd": a0 b1 X2 Y3 Z4 c5 d6  -> "XYZ" spans [2,5).
+    private static final String S = "abXYZcd";
+
+    @Test
+    void foundFullyInside() {
+        assertTrue(regionContains(S, 0, S.length(), "XYZ"));
+    }
+
+    @Test
+    void notPresent() {
+        assertFalse(regionContains(S, 0, S.length(), "QQ"));
+    }
+
+    @Test
+    void exactFit() {
+        // idx == 2, idx + len == 5 == endIndex -> included.
+        assertTrue(regionContains(S, 2, 5, "XYZ"));
+    }
+
+    @Test
+    void straddlingEndIndexExcluded() {
+        // endIndex == 4 cuts off the trailing 'Z' -> not fully inside.
+        assertFalse(regionContains(S, 2, 4, "XYZ"));
+    }
+
+    @Test
+    void occurrenceBeforeBeginIndexExcluded() {
+        // beginIndex == 3 starts past the needle's first char -> no occurrence at/after beginIndex.
+        assertFalse(regionContains(S, 3, S.length(), "XYZ"));
+    }
+
+    @Test
+    void emptyRegion() {
+        assertFalse(regionContains(S, 2, 2, "XYZ"));
+    }
+
+    @Test
+    void matchesWholeStringContains() {
+        assertTrue(regionContains("hello", 0, 5, "ll"));
+        assertFalse(regionContains("hello", 0, 5, "z"));
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/StringsTest2.java b/internal-api/src/test/java/datadog/trace/util/StringsTest2.java
index c949da41a5d..177b2ff6f2f 100644
--- a/internal-api/src/test/java/datadog/trace/util/StringsTest2.java
+++ b/internal-api/src/test/java/datadog/trace/util/StringsTest2.java
@@ -9,108 +9,107 @@
 import org.junit.jupiter.api.Test;
 
 public class StringsTest2 {
-  @Test
-  @DisplayName("replaceAll - single replace")
-  public void replaceAllNoReplace() {
-    assertEquals("foobar", Strings.replaceAll("foobar", "dne", "unchanged"));
-  }
-
-  @Test
-  @DisplayName("replaceAll - single replace")
-  public void replaceAllSingleReplace() {
-    assertEquals("foobaz", Strings.replaceAll("foobar", "bar", "baz"));
-  }
-
-  @Test
-  @DisplayName("replaceAll - single replace")
-  public void replaceAllMultiReplace() {
-    assertEquals("foo=baz&quux=baz", Strings.replaceAll("foo=bar&quux=bar", "bar", "baz"));
-  }
-
-  @Test
-  @DisplayName("split - empty")
-  public void splitEmpty() {
-    Iterator<SubSequence> iter = Strings.split("", '&').iterator();
-    assertFalse(iter.hasNext());
-  }
-
-  @Test
-  @DisplayName("split - no separator")
-  public void splitNoSeparator() {
-    Iterator<SubSequence> iter = Strings.split("foo=bar", '&').iterator();
-    assertContentEquals("foo=bar", iter.next());
-    assertFalse(iter.hasNext());
-  }
-
-  @Test
-  @DisplayName("split - with separator")
-  public void splitWithSeparator() {
-    Iterator<SubSequence> iter = Strings.split("foo=bar&hello=world", '&').iterator();
-    assertContentEquals("foo=bar", iter.next());
-    assertContentEquals("hello=world", iter.next());
-    assertFalse(iter.hasNext());
-  }
-
-  @Test
-  @DisplayName("split - leading separator")
-  public void splitLeadingSeparator() {
-    Iterator<SubSequence> iter = Strings.split("&foo=bar", '&').iterator();
-    assertSubSeq("", 0, 0, iter.next()); // empty string before the separator
-    assertSubSeq("foo=bar", 1, 8, iter.next());
-    assertFalse(iter.hasNext());
-  }
-
-  @Test
-  @DisplayName("split - trailing separator")
-  public void splitTrailingSeparator() {
-    Iterator<SubSequence> iter = Strings.split("foo=bar&", '&').iterator();
-    assertSubSeq("foo=bar", 0, 7, iter.next());
-    assertSubSeq("", 8, 8, iter.next()); // empty string after the separator
-    assertFalse(iter.hasNext());
-  }
-
-  @Test
-  @DisplayName("split - only separator")
-  public void splitOnlySeparator() {
-    Iterator<SubSequence> iter = Strings.split("&", '&').iterator();
-    assertSubSeq("", 0, 0, iter.next()); // empty string before the separator
-    assertSubSeq("", 1, 1, iter.next()); // empty string after the separator
-    assertFalse(iter.hasNext());
-  }
-
-  @Test
-  @DisplayName("split - sanity check")
-  public void splitSanityCheck() {
-    String testStr = "foo=bar&hello=world&baz=quux&firstName=Jon&lastName=Doe";
-
-    String[] strSplit = testStr.split("\\&");
-    Iterable<SubSequence> iterable = Strings.split(testStr, '&');
-
-    Iterator<SubSequence> iter = iterable.iterator();
-    for (String expected : strSplit) {
-      assertTrue(iter.hasNext());
-      assertContentEquals(expected, iter.next());
+    @Test
+    @DisplayName("replaceAll - single replace")
+    public void replaceAllNoReplace() {
+        assertEquals("foobar", Strings.replaceAll("foobar", "dne", "unchanged"));
     }
-    assertFalse(iter.hasNext());
 
-    // repeat, just to check iterable functionality
-    Iterator<SubSequence> iter2 = iterable.iterator();
-    for (String expected : strSplit) {
-      assertTrue(iter2.hasNext());
-      assertContentEquals(expected, iter2.next());
+    @Test
+    @DisplayName("replaceAll - single replace")
+    public void replaceAllSingleReplace() {
+        assertEquals("foobaz", Strings.replaceAll("foobar", "bar", "baz"));
+    }
+
+    @Test
+    @DisplayName("replaceAll - single replace")
+    public void replaceAllMultiReplace() {
+        assertEquals("foo=baz&quux=baz", Strings.replaceAll("foo=bar&quux=bar", "bar", "baz"));
+    }
+
+    @Test
+    @DisplayName("split - empty")
+    public void splitEmpty() {
+        Iterator<SubSequence> iter = Strings.split("", '&').iterator();
+        assertFalse(iter.hasNext());
+    }
+
+    @Test
+    @DisplayName("split - no separator")
+    public void splitNoSeparator() {
+        Iterator<SubSequence> iter = Strings.split("foo=bar", '&').iterator();
+        assertContentEquals("foo=bar", iter.next());
+        assertFalse(iter.hasNext());
+    }
+
+    @Test
+    @DisplayName("split - with separator")
+    public void splitWithSeparator() {
+        Iterator<SubSequence> iter = Strings.split("foo=bar&hello=world", '&').iterator();
+        assertContentEquals("foo=bar", iter.next());
+        assertContentEquals("hello=world", iter.next());
+        assertFalse(iter.hasNext());
+    }
+
+    @Test
+    @DisplayName("split - leading separator")
+    public void splitLeadingSeparator() {
+        Iterator<SubSequence> iter = Strings.split("&foo=bar", '&').iterator();
+        assertSubSeq("", 0, 0, iter.next()); // empty string before the separator
+        assertSubSeq("foo=bar", 1, 8, iter.next());
+        assertFalse(iter.hasNext());
+    }
+
+    @Test
+    @DisplayName("split - trailing separator")
+    public void splitTrailingSeparator() {
+        Iterator<SubSequence> iter = Strings.split("foo=bar&", '&').iterator();
+        assertSubSeq("foo=bar", 0, 7, iter.next());
+        assertSubSeq("", 8, 8, iter.next()); // empty string after the separator
+        assertFalse(iter.hasNext());
+    }
+
+    @Test
+    @DisplayName("split - only separator")
+    public void splitOnlySeparator() {
+        Iterator<SubSequence> iter = Strings.split("&", '&').iterator();
+        assertSubSeq("", 0, 0, iter.next()); // empty string before the separator
+        assertSubSeq("", 1, 1, iter.next()); // empty string after the separator
+        assertFalse(iter.hasNext());
+    }
+
+    @Test
+    @DisplayName("split - sanity check")
+    public void splitSanityCheck() {
+        String testStr = "foo=bar&hello=world&baz=quux&firstName=Jon&lastName=Doe";
+
+        String[] strSplit = testStr.split("\\&");
+        Iterable<SubSequence> iterable = Strings.split(testStr, '&');
+
+        Iterator<SubSequence> iter = iterable.iterator();
+        for (String expected : strSplit) {
+            assertTrue(iter.hasNext());
+            assertContentEquals(expected, iter.next());
+        }
+        assertFalse(iter.hasNext());
+
+        // repeat, just to check iterable functionality
+        Iterator<SubSequence> iter2 = iterable.iterator();
+        for (String expected : strSplit) {
+            assertTrue(iter2.hasNext());
+            assertContentEquals(expected, iter2.next());
+        }
+        assertFalse(iter2.hasNext());
+    }
+
+    static void assertContentEquals(String expectedStr, SubSequence actualSeq) {
+        assertTrue(actualSeq.equals(expectedStr), "equals String");
+        assertEquals(expectedStr, actualSeq.toString(), "toString");
+    }
+
+    static void assertSubSeq(String expected, int expectedBeginIndex, int expectedEndIndex, SubSequence actualSeq) {
+        assertContentEquals(expected, actualSeq);
+        assertEquals(expectedBeginIndex, actualSeq.beginIndex(), "beginIndex");
+        assertEquals(expectedEndIndex, actualSeq.endIndex(), "endIndex");
     }
-    assertFalse(iter2.hasNext());
-  }
-
-  static void assertContentEquals(String expectedStr, SubSequence actualSeq) {
-    assertTrue(actualSeq.equals(expectedStr), "equals String");
-    assertEquals(expectedStr, actualSeq.toString(), "toString");
-  }
-
-  static void assertSubSeq(
-      String expected, int expectedBeginIndex, int expectedEndIndex, SubSequence actualSeq) {
-    assertContentEquals(expected, actualSeq);
-    assertEquals(expectedBeginIndex, actualSeq.beginIndex(), "beginIndex");
-    assertEquals(expectedEndIndex, actualSeq.endIndex(), "endIndex");
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/SubSequenceTest.java b/internal-api/src/test/java/datadog/trace/util/SubSequenceTest.java
index ddb03b3b115..8979f0b4875 100644
--- a/internal-api/src/test/java/datadog/trace/util/SubSequenceTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/SubSequenceTest.java
@@ -8,253 +8,253 @@
 import org.junit.jupiter.api.Test;
 
 public class SubSequenceTest {
-  static final String LOREM_IPSUM =
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
-
-  @Test
-  public void empty() {
-    SubSequence subSeq = SubSequence.EMPTY;
-    assertEquals("", subSeq.toString());
-    assertEquals("".hashCode(), subSeq.hashCode());
-
-    StringBuilder builder0 = new StringBuilder();
-    builder0.append(subSeq);
-    assertEquals("", builder0.toString());
-
-    StringBuilder builder1 = new StringBuilder();
-    subSeq.appendTo(builder1);
-    assertEquals("", builder1.toString());
-  }
-
-  @Test
-  public void emptyTail() {
-    // This is allowed to represent the logical empty string after a match at the end of
-    // backing string.  There is an important distinction from the canonical empty
-    // SubSequence which wouldn't have the correct beginIndex / endIndex pair.
-    SubSequence subSeq = new SubSequence("foo", "foo".length(), "foo".length());
-    assertEquals("foo".length(), subSeq.beginIndex());
-    assertEquals("foo".length(), subSeq.endIndex());
-    assertEquals("", subSeq.toString());
-    assertEquals("".hashCode(), subSeq.hashCode());
-
-    StringBuilder builder0 = new StringBuilder();
-    builder0.append(subSeq);
-    assertEquals("", builder0.toString());
-
-    StringBuilder builder1 = new StringBuilder();
-    subSeq.appendTo(builder1);
-    assertEquals("", builder1.toString());
-  }
-
-  @Test
-  public void subSequence() {
-    String str = LOREM_IPSUM;
-    int len = str.length();
-
-    for (int i = 0; i < str.length(); i += 100) {
-      int endIndex = Math.min(i + 100, len);
-
-      String subStr = str.substring(i, endIndex);
-      CharSequence subCharSeq = str.subSequence(i, endIndex);
-      SubSequence subSeq = SubSequence.of(str, i, endIndex);
-      SubSequence altSubSeq = Strings.subSequence(str, i, endIndex);
-
-      assertTrue(subSeq.equals(subStr));
-      assertEquals(subStr, subSeq.toString());
-      assertEquals(subStr.hashCode(), subSeq.hashCode());
-
-      assertTrue(subSeq.equals(subCharSeq));
-      assertEquals(subCharSeq.toString(), subSeq.toString());
-
-      assertEquals(subSeq, altSubSeq);
-
-      assertSame(subSeq.toString(), subSeq.toString());
+    static final String LOREM_IPSUM =
+            "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+
+    @Test
+    public void empty() {
+        SubSequence subSeq = SubSequence.EMPTY;
+        assertEquals("", subSeq.toString());
+        assertEquals("".hashCode(), subSeq.hashCode());
+
+        StringBuilder builder0 = new StringBuilder();
+        builder0.append(subSeq);
+        assertEquals("", builder0.toString());
+
+        StringBuilder builder1 = new StringBuilder();
+        subSeq.appendTo(builder1);
+        assertEquals("", builder1.toString());
     }
-  }
 
-  @Test
-  public void subSequenceToEnd() {
-    String str = LOREM_IPSUM;
-    int len = str.length();
+    @Test
+    public void emptyTail() {
+        // This is allowed to represent the logical empty string after a match at the end of
+        // backing string.  There is an important distinction from the canonical empty
+        // SubSequence which wouldn't have the correct beginIndex / endIndex pair.
+        SubSequence subSeq = new SubSequence("foo", "foo".length(), "foo".length());
+        assertEquals("foo".length(), subSeq.beginIndex());
+        assertEquals("foo".length(), subSeq.endIndex());
+        assertEquals("", subSeq.toString());
+        assertEquals("".hashCode(), subSeq.hashCode());
+
+        StringBuilder builder0 = new StringBuilder();
+        builder0.append(subSeq);
+        assertEquals("", builder0.toString());
+
+        StringBuilder builder1 = new StringBuilder();
+        subSeq.appendTo(builder1);
+        assertEquals("", builder1.toString());
+    }
+
+    @Test
+    public void subSequence() {
+        String str = LOREM_IPSUM;
+        int len = str.length();
+
+        for (int i = 0; i < str.length(); i += 100) {
+            int endIndex = Math.min(i + 100, len);
+
+            String subStr = str.substring(i, endIndex);
+            CharSequence subCharSeq = str.subSequence(i, endIndex);
+            SubSequence subSeq = SubSequence.of(str, i, endIndex);
+            SubSequence altSubSeq = Strings.subSequence(str, i, endIndex);
+
+            assertTrue(subSeq.equals(subStr));
+            assertEquals(subStr, subSeq.toString());
+            assertEquals(subStr.hashCode(), subSeq.hashCode());
+
+            assertTrue(subSeq.equals(subCharSeq));
+            assertEquals(subCharSeq.toString(), subSeq.toString());
+
+            assertEquals(subSeq, altSubSeq);
+
+            assertSame(subSeq.toString(), subSeq.toString());
+        }
+    }
+
+    @Test
+    public void subSequenceToEnd() {
+        String str = LOREM_IPSUM;
+        int len = str.length();
+
+        for (int i = 0; i < str.length(); i += 100) {
+            String subStr = str.substring(i);
+            SubSequence subSeq = SubSequence.of(str, i);
+            SubSequence altSubSeq = Strings.subSequence(str, i);
+
+            assertTrue(subSeq.equals(subStr));
+            assertEquals(subStr, subSeq.toString());
+            assertEquals(subStr.hashCode(), subSeq.hashCode());
+
+            assertEquals(subSeq, altSubSeq);
+
+            assertSame(subSeq.toString(), subSeq.toString());
+        }
+    }
+
+    @Test
+    public void appendToBuilder() {
+        SubSequence subSeq = SubSequence.of(LOREM_IPSUM, 50, 150);
+
+        StringBuilder expectedBuilder = new StringBuilder();
+        expectedBuilder.append(LOREM_IPSUM, 50, 150);
+
+        String expectedStr = expectedBuilder.toString();
+
+        StringBuilder builder0 = new StringBuilder();
+        builder0.append(subSeq);
+        assertEquals(expectedStr, builder0.toString());
+
+        StringBuilder builder1 = new StringBuilder();
+        subSeq.appendTo(builder1);
+        assertEquals(expectedStr, builder1.toString());
+    }
 
-    for (int i = 0; i < str.length(); i += 100) {
-      String subStr = str.substring(i);
-      SubSequence subSeq = SubSequence.of(str, i);
-      SubSequence altSubSeq = Strings.subSequence(str, i);
+    @Test
+    public void contains() {
+        // "/*ddps='svc',dde='x'*/ rest" -- the comment body "ddps='svc',dde='x'" spans [2, 20).
+        String s = "/*ddps='svc',dde='x'*/ rest";
+        SubSequence comment = SubSequence.of(s, 2, 20);
+        assertTrue(comment.contains("ddps="));
+        assertTrue(comment.contains("dde="));
+        assertFalse(comment.contains("ddh="));
+
+        // View-relative: a needle present in the backing string but outside this view is not found.
+        SubSequence dde = SubSequence.of(s, 13, 20); // "dde='x'"
+        assertFalse(dde.contains("ddps=")); // ddps= is before this view's range
+    }
+
+    @Test
+    public void subSequenceOfView() {
+        // Instance subSequence(start, end): start/end are in THIS view's coordinates (CharSequence
+        // contract), regardless of where the view sits in the backing string.
+        SubSequence view = SubSequence.of("abcdefghij", 2, 8); // "cdefgh"
+        SubSequence mid = view.subSequence(1, 4); // chars [1, 4) of "cdefgh" -> "def"
+        assertEquals("def", mid.toString());
+        assertEquals(3, mid.beginIndex()); // absolute begin = 2 + 1
+        assertEquals(6, mid.endIndex()); // absolute end = 2 + 4 (NOT 2 + 1 + 4)
+
+        // full window and empty are exact
+        assertEquals("cdefgh", view.subSequence(0, view.length()).toString());
+        assertEquals("", view.subSequence(2, 2).toString());
+
+        // nested: subSequence of a non-zero-start view stays correct (the case the old bug broke worst)
+        assertEquals("ef", mid.subSequence(1, 3).toString()); // chars [1, 3) of "def" -> "ef"
+    }
 
-      assertTrue(subSeq.equals(subStr));
-      assertEquals(subStr, subSeq.toString());
-      assertEquals(subStr.hashCode(), subSeq.hashCode());
+    @Test
+    public void equalsString() {
+        // "call" sits at [6, 10) inside the backing string, flanked by other text.
+        SubSequence call = SubSequence.of("xxxxx call yyyyy", 6, 10);
+        assertTrue(call.equals("call"));
+        assertFalse(call.equals("CALL")); // case-sensitive
+        assertFalse(call.equals("cal")); // shorter
+        assertFalse(call.equals("calls")); // longer (would overshoot endIndex)
+        assertFalse(call.equals((Object) null));
+
+        // equals(Object) routes a String through the region-compare fast path...
+        assertTrue(call.equals((Object) "call"));
+        // ...and any other CharSequence (incl. another SubSequence) through contentEquals.
+        assertTrue(call.equals((Object) new StringBuilder("call")));
+        assertTrue(call.equals((Object) SubSequence.of("xxxxx call yyyyy", 6, 10)));
+        assertFalse(call.equals((Object) Integer.valueOf(4)));
+    }
+
+    @Test
+    public void contentEqualsCharSequence() {
+        SubSequence call = SubSequence.of("xxxxx call yyyyy", 6, 10); // "call"
+        assertTrue(call.contentEquals("call")); // String is a CharSequence
+        assertTrue(call.contentEquals(new StringBuilder("call")));
+        assertTrue(call.contentEquals(SubSequence.of("a call b", 2, 6)));
+        assertFalse(call.contentEquals("CALL")); // case-sensitive
+        assertFalse(call.contentEquals("cal")); // length mismatch
+        assertFalse(call.contentEquals(null));
+    }
 
-      assertEquals(subSeq, altSubSeq);
+    @Test
+    public void equalsIgnoreCaseString() {
+        SubSequence call = SubSequence.of("xxxxx CaLl yyyyy", 6, 10);
+        assertTrue(call.equalsIgnoreCase("call"));
+        assertTrue(call.equalsIgnoreCase("CALL"));
+        assertFalse(call.equalsIgnoreCase("cal"));
+        assertFalse(call.equalsIgnoreCase("calls"));
+        assertFalse(call.equalsIgnoreCase(null)); // matches String.equalsIgnoreCase(null)
+    }
+
+    @Test
+    public void startsWithString() {
+        SubSequence view = SubSequence.of("xx{call}xx", 2, 8); // "{call}"
+        assertTrue(view.startsWith("{"));
+        assertTrue(view.startsWith("{call"));
+        assertTrue(view.startsWith("{call}"));
+        assertFalse(view.startsWith("call"));
+        assertFalse(view.startsWith("{call}x")); // overshoots endIndex even though backing has 'x'
+        assertTrue(view.startsWith("")); // empty prefix
+    }
+
+    @Test
+    public void endsWithString() {
+        SubSequence view = SubSequence.of("xx{call}xx", 2, 8); // "{call}"
+        assertTrue(view.endsWith("}"));
+        assertTrue(view.endsWith("call}"));
+        assertTrue(view.endsWith("{call}"));
+        assertFalse(view.endsWith("call"));
+        assertFalse(view.endsWith("x{call}")); // undershoots beginIndex even though backing has 'x'
+        assertTrue(view.endsWith("")); // empty suffix
+    }
+
+    @Test
+    public void indexOfString() {
+        SubSequence view = SubSequence.of("aa-bc-bc-aa", 3, 8); // "bc-bc"
+        assertEquals(0, view.indexOf("bc")); // window-relative offset of the first occurrence
+        assertEquals(2, view.indexOf("-bc")); // non-zero relative offset
+        assertEquals(2, view.indexOf("-"));
+        assertEquals(-1, view.indexOf("aa")); // present in backing string but outside the window
+        assertEquals(-1, view.indexOf("bc-bc-")); // overshoots endIndex
+    }
+
+    @Test
+    public void lastIndexOfString() {
+        SubSequence view = SubSequence.of("aa-bc-bc-aa", 3, 8); // "bc-bc"
+        assertEquals(3, view.lastIndexOf("bc")); // last "bc" -> relative 3
+        assertEquals(2, view.lastIndexOf("-"));
+        assertEquals(-1, view.lastIndexOf("aa")); // outside the window on both ends
+        assertEquals(-1, view.lastIndexOf("bc-bc-")); // overshoots endIndex
+    }
+
+    @Test
+    public void startsWithChar() {
+        SubSequence view = SubSequence.of("xx{call}xx", 2, 8); // "{call}"
+        assertTrue(view.startsWith('{'));
+        assertFalse(view.startsWith('c')); // 'c' is at offset 1, not the start
+        assertFalse(view.startsWith('x')); // backing char before beginIndex, outside the window
+        assertFalse(SubSequence.EMPTY.startsWith('x')); // empty window
+    }
+
+    @Test
+    public void endsWithChar() {
+        SubSequence view = SubSequence.of("xx{call}xx", 2, 8); // "{call}"
+        assertTrue(view.endsWith('}'));
+        assertFalse(view.endsWith('l')); // 'l' is one before the end
+        assertFalse(view.endsWith('x')); // backing char at endIndex, outside the window
+        assertFalse(SubSequence.EMPTY.endsWith('x')); // empty window
+    }
+
+    @Test
+    public void indexOfChar() {
+        SubSequence view = SubSequence.of("aa-bc-bc-aa", 3, 8); // "bc-bc"
+        assertEquals(0, view.indexOf('b')); // window-relative offset of the first occurrence
+        assertEquals(1, view.indexOf('c'));
+        assertEquals(2, view.indexOf('-'));
+        assertEquals(-1, view.indexOf('a')); // present in backing string but outside the window
+    }
 
-      assertSame(subSeq.toString(), subSeq.toString());
+    @Test
+    public void lastIndexOfChar() {
+        SubSequence view = SubSequence.of("aa-bc-bc-aa", 3, 8); // "bc-bc"
+        assertEquals(3, view.lastIndexOf('b')); // last 'b' -> relative 3
+        assertEquals(4, view.lastIndexOf('c'));
+        assertEquals(2, view.lastIndexOf('-'));
+        assertEquals(-1, view.lastIndexOf('a')); // outside the window on both ends
     }
-  }
-
-  @Test
-  public void appendToBuilder() {
-    SubSequence subSeq = SubSequence.of(LOREM_IPSUM, 50, 150);
-
-    StringBuilder expectedBuilder = new StringBuilder();
-    expectedBuilder.append(LOREM_IPSUM, 50, 150);
-
-    String expectedStr = expectedBuilder.toString();
-
-    StringBuilder builder0 = new StringBuilder();
-    builder0.append(subSeq);
-    assertEquals(expectedStr, builder0.toString());
-
-    StringBuilder builder1 = new StringBuilder();
-    subSeq.appendTo(builder1);
-    assertEquals(expectedStr, builder1.toString());
-  }
-
-  @Test
-  public void contains() {
-    // "/*ddps='svc',dde='x'*/ rest" -- the comment body "ddps='svc',dde='x'" spans [2, 20).
-    String s = "/*ddps='svc',dde='x'*/ rest";
-    SubSequence comment = SubSequence.of(s, 2, 20);
-    assertTrue(comment.contains("ddps="));
-    assertTrue(comment.contains("dde="));
-    assertFalse(comment.contains("ddh="));
-
-    // View-relative: a needle present in the backing string but outside this view is not found.
-    SubSequence dde = SubSequence.of(s, 13, 20); // "dde='x'"
-    assertFalse(dde.contains("ddps=")); // ddps= is before this view's range
-  }
-
-  @Test
-  public void subSequenceOfView() {
-    // Instance subSequence(start, end): start/end are in THIS view's coordinates (CharSequence
-    // contract), regardless of where the view sits in the backing string.
-    SubSequence view = SubSequence.of("abcdefghij", 2, 8); // "cdefgh"
-    SubSequence mid = view.subSequence(1, 4); // chars [1, 4) of "cdefgh" -> "def"
-    assertEquals("def", mid.toString());
-    assertEquals(3, mid.beginIndex()); // absolute begin = 2 + 1
-    assertEquals(6, mid.endIndex()); // absolute end = 2 + 4 (NOT 2 + 1 + 4)
-
-    // full window and empty are exact
-    assertEquals("cdefgh", view.subSequence(0, view.length()).toString());
-    assertEquals("", view.subSequence(2, 2).toString());
-
-    // nested: subSequence of a non-zero-start view stays correct (the case the old bug broke worst)
-    assertEquals("ef", mid.subSequence(1, 3).toString()); // chars [1, 3) of "def" -> "ef"
-  }
-
-  @Test
-  public void equalsString() {
-    // "call" sits at [6, 10) inside the backing string, flanked by other text.
-    SubSequence call = SubSequence.of("xxxxx call yyyyy", 6, 10);
-    assertTrue(call.equals("call"));
-    assertFalse(call.equals("CALL")); // case-sensitive
-    assertFalse(call.equals("cal")); // shorter
-    assertFalse(call.equals("calls")); // longer (would overshoot endIndex)
-    assertFalse(call.equals((Object) null));
-
-    // equals(Object) routes a String through the region-compare fast path...
-    assertTrue(call.equals((Object) "call"));
-    // ...and any other CharSequence (incl. another SubSequence) through contentEquals.
-    assertTrue(call.equals((Object) new StringBuilder("call")));
-    assertTrue(call.equals((Object) SubSequence.of("xxxxx call yyyyy", 6, 10)));
-    assertFalse(call.equals((Object) Integer.valueOf(4)));
-  }
-
-  @Test
-  public void contentEqualsCharSequence() {
-    SubSequence call = SubSequence.of("xxxxx call yyyyy", 6, 10); // "call"
-    assertTrue(call.contentEquals("call")); // String is a CharSequence
-    assertTrue(call.contentEquals(new StringBuilder("call")));
-    assertTrue(call.contentEquals(SubSequence.of("a call b", 2, 6)));
-    assertFalse(call.contentEquals("CALL")); // case-sensitive
-    assertFalse(call.contentEquals("cal")); // length mismatch
-    assertFalse(call.contentEquals(null));
-  }
-
-  @Test
-  public void equalsIgnoreCaseString() {
-    SubSequence call = SubSequence.of("xxxxx CaLl yyyyy", 6, 10);
-    assertTrue(call.equalsIgnoreCase("call"));
-    assertTrue(call.equalsIgnoreCase("CALL"));
-    assertFalse(call.equalsIgnoreCase("cal"));
-    assertFalse(call.equalsIgnoreCase("calls"));
-    assertFalse(call.equalsIgnoreCase(null)); // matches String.equalsIgnoreCase(null)
-  }
-
-  @Test
-  public void startsWithString() {
-    SubSequence view = SubSequence.of("xx{call}xx", 2, 8); // "{call}"
-    assertTrue(view.startsWith("{"));
-    assertTrue(view.startsWith("{call"));
-    assertTrue(view.startsWith("{call}"));
-    assertFalse(view.startsWith("call"));
-    assertFalse(view.startsWith("{call}x")); // overshoots endIndex even though backing has 'x'
-    assertTrue(view.startsWith("")); // empty prefix
-  }
-
-  @Test
-  public void endsWithString() {
-    SubSequence view = SubSequence.of("xx{call}xx", 2, 8); // "{call}"
-    assertTrue(view.endsWith("}"));
-    assertTrue(view.endsWith("call}"));
-    assertTrue(view.endsWith("{call}"));
-    assertFalse(view.endsWith("call"));
-    assertFalse(view.endsWith("x{call}")); // undershoots beginIndex even though backing has 'x'
-    assertTrue(view.endsWith("")); // empty suffix
-  }
-
-  @Test
-  public void indexOfString() {
-    SubSequence view = SubSequence.of("aa-bc-bc-aa", 3, 8); // "bc-bc"
-    assertEquals(0, view.indexOf("bc")); // window-relative offset of the first occurrence
-    assertEquals(2, view.indexOf("-bc")); // non-zero relative offset
-    assertEquals(2, view.indexOf("-"));
-    assertEquals(-1, view.indexOf("aa")); // present in backing string but outside the window
-    assertEquals(-1, view.indexOf("bc-bc-")); // overshoots endIndex
-  }
-
-  @Test
-  public void lastIndexOfString() {
-    SubSequence view = SubSequence.of("aa-bc-bc-aa", 3, 8); // "bc-bc"
-    assertEquals(3, view.lastIndexOf("bc")); // last "bc" -> relative 3
-    assertEquals(2, view.lastIndexOf("-"));
-    assertEquals(-1, view.lastIndexOf("aa")); // outside the window on both ends
-    assertEquals(-1, view.lastIndexOf("bc-bc-")); // overshoots endIndex
-  }
-
-  @Test
-  public void startsWithChar() {
-    SubSequence view = SubSequence.of("xx{call}xx", 2, 8); // "{call}"
-    assertTrue(view.startsWith('{'));
-    assertFalse(view.startsWith('c')); // 'c' is at offset 1, not the start
-    assertFalse(view.startsWith('x')); // backing char before beginIndex, outside the window
-    assertFalse(SubSequence.EMPTY.startsWith('x')); // empty window
-  }
-
-  @Test
-  public void endsWithChar() {
-    SubSequence view = SubSequence.of("xx{call}xx", 2, 8); // "{call}"
-    assertTrue(view.endsWith('}'));
-    assertFalse(view.endsWith('l')); // 'l' is one before the end
-    assertFalse(view.endsWith('x')); // backing char at endIndex, outside the window
-    assertFalse(SubSequence.EMPTY.endsWith('x')); // empty window
-  }
-
-  @Test
-  public void indexOfChar() {
-    SubSequence view = SubSequence.of("aa-bc-bc-aa", 3, 8); // "bc-bc"
-    assertEquals(0, view.indexOf('b')); // window-relative offset of the first occurrence
-    assertEquals(1, view.indexOf('c'));
-    assertEquals(2, view.indexOf('-'));
-    assertEquals(-1, view.indexOf('a')); // present in backing string but outside the window
-  }
-
-  @Test
-  public void lastIndexOfChar() {
-    SubSequence view = SubSequence.of("aa-bc-bc-aa", 3, 8); // "bc-bc"
-    assertEquals(3, view.lastIndexOf('b')); // last 'b' -> relative 3
-    assertEquals(4, view.lastIndexOf('c'));
-    assertEquals(2, view.lastIndexOf('-'));
-    assertEquals(-1, view.lastIndexOf('a')); // outside the window on both ends
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/TagsHelperTest.java b/internal-api/src/test/java/datadog/trace/util/TagsHelperTest.java
index 2ffe305a04e..b00721680b3 100644
--- a/internal-api/src/test/java/datadog/trace/util/TagsHelperTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/TagsHelperTest.java
@@ -8,61 +8,61 @@
 
 public class TagsHelperTest {
 
-  @Test
-  public void validTagDoesNotChange() {
-    String keyValue = "key:value";
-    String validChars = "abc..xyz1234567890-_./:";
-    assertEquals(keyValue, TagsHelper.sanitize(keyValue));
-    assertEquals(validChars, TagsHelper.sanitize(validChars));
-  }
+    @Test
+    public void validTagDoesNotChange() {
+        String keyValue = "key:value";
+        String validChars = "abc..xyz1234567890-_./:";
+        assertEquals(keyValue, TagsHelper.sanitize(keyValue));
+        assertEquals(validChars, TagsHelper.sanitize(validChars));
+    }
 
-  @Test
-  public void nullIsSupported() {
-    assertNull(TagsHelper.sanitize(null));
-  }
+    @Test
+    public void nullIsSupported() {
+        assertNull(TagsHelper.sanitize(null));
+    }
 
-  @Test
-  public void upperCase() {
-    assertEquals("key:value", TagsHelper.sanitize("key:VALUE"));
-  }
+    @Test
+    public void upperCase() {
+        assertEquals("key:value", TagsHelper.sanitize("key:VALUE"));
+    }
 
-  @Test
-  public void trimSpaces() {
-    assertEquals("service-name", TagsHelper.sanitize("    service-name  "));
-    assertEquals("service_name", TagsHelper.sanitize("    service name  "));
-  }
+    @Test
+    public void trimSpaces() {
+        assertEquals("service-name", TagsHelper.sanitize("    service-name  "));
+        assertEquals("service_name", TagsHelper.sanitize("    service name  "));
+    }
 
-  @Test
-  public void invalidCharsConvertedToUnderscore() {
-    assertEquals("my_email.com", TagsHelper.sanitize("my@email.com"));
-    assertEquals("smile_and__", TagsHelper.sanitize("smile and \u1234"));
-  }
+    @Test
+    public void invalidCharsConvertedToUnderscore() {
+        assertEquals("my_email.com", TagsHelper.sanitize("my@email.com"));
+        assertEquals("smile_and__", TagsHelper.sanitize("smile and \u1234"));
+    }
 
-  @Test
-  public void tagTrimmedToMaxLength() {
-    StringBuilder tag = new StringBuilder(401);
-    for (int i = 0; i < 400; i++) {
-      tag.append('a');
+    @Test
+    public void tagTrimmedToMaxLength() {
+        StringBuilder tag = new StringBuilder(401);
+        for (int i = 0; i < 400; i++) {
+            tag.append('a');
+        }
+        assertEquals(200, TagsHelper.sanitize(tag.toString()).length());
+        assertEquals(200, TagsHelper.sanitize(tag.toString()).getBytes(StandardCharsets.UTF_8).length);
     }
-    assertEquals(200, TagsHelper.sanitize(tag.toString()).length());
-    assertEquals(200, TagsHelper.sanitize(tag.toString()).getBytes(StandardCharsets.UTF_8).length);
-  }
 
-  @Test
-  public void tagTrimmedToMaxLengthWorkWithUnicode() {
-    StringBuilder tag = new StringBuilder(401);
-    for (int i = 0; i < 400; i++) {
-      tag.append("\u1234");
+    @Test
+    public void tagTrimmedToMaxLengthWorkWithUnicode() {
+        StringBuilder tag = new StringBuilder(401);
+        for (int i = 0; i < 400; i++) {
+            tag.append("\u1234");
+        }
+        assertEquals(200, TagsHelper.sanitize(tag.toString()).length());
+        assertEquals(200, TagsHelper.sanitize(tag.toString()).getBytes(StandardCharsets.UTF_8).length);
     }
-    assertEquals(200, TagsHelper.sanitize(tag.toString()).length());
-    assertEquals(200, TagsHelper.sanitize(tag.toString()).getBytes(StandardCharsets.UTF_8).length);
-  }
 
-  @Test
-  public void concat() {
-    assertEquals("", TagsHelper.concatTags());
-    assertEquals("", TagsHelper.concatTags(""));
-    assertEquals("foo:bar", TagsHelper.concatTags("foo:bar"));
-    assertEquals("foo0:bar0,foo1:bar1", TagsHelper.concatTags("foo0:bar0", "foo1:bar1"));
-  }
+    @Test
+    public void concat() {
+        assertEquals("", TagsHelper.concatTags());
+        assertEquals("", TagsHelper.concatTags(""));
+        assertEquals("foo:bar", TagsHelper.concatTags("foo:bar"));
+        assertEquals("foo0:bar0,foo1:bar1", TagsHelper.concatTags("foo0:bar0", "foo1:bar1"));
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/TempLocationManagerSecurityTest.java b/internal-api/src/test/java/datadog/trace/util/TempLocationManagerSecurityTest.java
index 7906ea0e009..75394af9416 100644
--- a/internal-api/src/test/java/datadog/trace/util/TempLocationManagerSecurityTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/TempLocationManagerSecurityTest.java
@@ -28,118 +28,113 @@
  */
 public class TempLocationManagerSecurityTest {
 
-  @TempDir Path baseDir;
-
-  @BeforeEach
-  void requirePosix() {
-    assumeTrue(
-        FileSystems.getDefault().supportedFileAttributeViews().contains("posix"),
-        "Skipping POSIX-only security tests on non-POSIX file system");
-  }
-
-  @Test
-  void freshTempDirIsCreatedWithOwnerOnlyPermissions() throws Exception {
-    TempLocationManager mgr = instance(baseDir);
-    Path tempDir = mgr.getTempDir();
-    assertNotNull(tempDir);
-    assertTrue0700(tempDir);
-  }
-
-  @Test
-  void preExistingOwnerOwnedSecureDirIsAccepted() throws Exception {
-    // Create the full per-process tree with 0700 before constructing the manager
-    Path baseTempSubdir = baseDir.resolve(TempLocationManager.getBaseTempDirName());
-    Files.createDirectories(
-        baseTempSubdir,
-        PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
-
-    String pid = PidHelper.getPid();
-    Path pidDir = baseTempSubdir.resolve("pid_" + pid);
-    Files.createDirectories(
-        pidDir, PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
-
-    // Manager must not throw and must return the pre-existing dir
-    TempLocationManager mgr = assertDoesNotThrow(() -> instance(baseDir));
-    Path tempDir = mgr.getTempDir();
-    assertNotNull(tempDir);
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"rwxrwxrwx", "rwxr-xr-x", "rwxrwx---"})
-  void preExistingDirWithGroupWorldBitsIsRejected(String perms) throws Exception {
-    Path baseTempSubdir = baseDir.resolve(TempLocationManager.getBaseTempDirName());
-    Files.createDirectories(
-        baseTempSubdir,
-        PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString(perms)));
-
-    assertThrows(IllegalStateException.class, () -> instance(baseDir));
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"rwxrwxrwx", "rwxr-xr-x", "rwxrwx---"})
-  void preExistingPidDirWithGroupWorldBitsIsRejected(String perms) throws Exception {
-    // Create baseTempSubdir with secure perms, but the pid subdir with insecure perms
-    Path baseTempSubdir = baseDir.resolve(TempLocationManager.getBaseTempDirName());
-    Files.createDirectories(
-        baseTempSubdir,
-        PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
-
-    String pid = PidHelper.getPid();
-    Path pidDir = baseTempSubdir.resolve("pid_" + pid);
-    Files.createDirectories(
-        pidDir, PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString(perms)));
-
-    assertThrows(IllegalStateException.class, () -> instance(baseDir));
-  }
-
-  @Test
-  void getTempDirWithExistingSubdirGroupWorldBitsIsRejected() throws Exception {
-    // First build a clean tree so the manager initialises without error
-    TempLocationManager mgr = instance(baseDir);
-    Path tempDir = mgr.getTempDir();
-
-    // Now plant an insecure subdir
-    Path subDir = tempDir.resolve("sub");
-    Files.createDirectories(
-        subDir, PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxrwxrwx")));
-
-    // getTempDir(subPath, false) should detect group/world bits and throw
-    assertThrows(
-        IllegalStateException.class, () -> mgr.getTempDir(tempDir.relativize(subDir), false));
-  }
-
-  @Test
-  void nonPosixBehaviourIsUnchanged() {
-    // Guard already applied in @BeforeEach; if we reach here the FS is POSIX.
-    // The non-POSIX case is covered by the assumeTrue skip above.
-    // Nothing to assert — the test documents the requirement.
-  }
-
-  private TempLocationManager instance(Path base) {
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_TEMP_DIR, base.toString());
-    props.put(ProfilingConfig.PROFILING_UPLOAD_PERIOD, "0");
-    return new TempLocationManager(
-        datadog.trace.bootstrap.config.provider.ConfigProvider.withPropertiesOverride(props),
-        false,
-        TempLocationManager.CleanupHook.EMPTY,
-        SystemTimeSource.INSTANCE);
-  }
-
-  private static void assertTrue0700(Path dir) throws IOException {
-    Set<PosixFilePermission> perms = Files.getPosixFilePermissions(dir);
-    for (PosixFilePermission bit :
-        new PosixFilePermission[] {
-          PosixFilePermission.GROUP_READ,
-          PosixFilePermission.GROUP_WRITE,
-          PosixFilePermission.GROUP_EXECUTE,
-          PosixFilePermission.OTHERS_READ,
-          PosixFilePermission.OTHERS_WRITE,
-          PosixFilePermission.OTHERS_EXECUTE
+    @TempDir
+    Path baseDir;
+
+    @BeforeEach
+    void requirePosix() {
+        assumeTrue(
+                FileSystems.getDefault().supportedFileAttributeViews().contains("posix"),
+                "Skipping POSIX-only security tests on non-POSIX file system");
+    }
+
+    @Test
+    void freshTempDirIsCreatedWithOwnerOnlyPermissions() throws Exception {
+        TempLocationManager mgr = instance(baseDir);
+        Path tempDir = mgr.getTempDir();
+        assertNotNull(tempDir);
+        assertTrue0700(tempDir);
+    }
+
+    @Test
+    void preExistingOwnerOwnedSecureDirIsAccepted() throws Exception {
+        // Create the full per-process tree with 0700 before constructing the manager
+        Path baseTempSubdir = baseDir.resolve(TempLocationManager.getBaseTempDirName());
+        Files.createDirectories(
+                baseTempSubdir, PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
+
+        String pid = PidHelper.getPid();
+        Path pidDir = baseTempSubdir.resolve("pid_" + pid);
+        Files.createDirectories(
+                pidDir, PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
+
+        // Manager must not throw and must return the pre-existing dir
+        TempLocationManager mgr = assertDoesNotThrow(() -> instance(baseDir));
+        Path tempDir = mgr.getTempDir();
+        assertNotNull(tempDir);
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"rwxrwxrwx", "rwxr-xr-x", "rwxrwx---"})
+    void preExistingDirWithGroupWorldBitsIsRejected(String perms) throws Exception {
+        Path baseTempSubdir = baseDir.resolve(TempLocationManager.getBaseTempDirName());
+        Files.createDirectories(
+                baseTempSubdir, PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString(perms)));
+
+        assertThrows(IllegalStateException.class, () -> instance(baseDir));
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"rwxrwxrwx", "rwxr-xr-x", "rwxrwx---"})
+    void preExistingPidDirWithGroupWorldBitsIsRejected(String perms) throws Exception {
+        // Create baseTempSubdir with secure perms, but the pid subdir with insecure perms
+        Path baseTempSubdir = baseDir.resolve(TempLocationManager.getBaseTempDirName());
+        Files.createDirectories(
+                baseTempSubdir, PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
+
+        String pid = PidHelper.getPid();
+        Path pidDir = baseTempSubdir.resolve("pid_" + pid);
+        Files.createDirectories(pidDir, PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString(perms)));
+
+        assertThrows(IllegalStateException.class, () -> instance(baseDir));
+    }
+
+    @Test
+    void getTempDirWithExistingSubdirGroupWorldBitsIsRejected() throws Exception {
+        // First build a clean tree so the manager initialises without error
+        TempLocationManager mgr = instance(baseDir);
+        Path tempDir = mgr.getTempDir();
+
+        // Now plant an insecure subdir
+        Path subDir = tempDir.resolve("sub");
+        Files.createDirectories(
+                subDir, PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxrwxrwx")));
+
+        // getTempDir(subPath, false) should detect group/world bits and throw
+        assertThrows(IllegalStateException.class, () -> mgr.getTempDir(tempDir.relativize(subDir), false));
+    }
+
+    @Test
+    void nonPosixBehaviourIsUnchanged() {
+        // Guard already applied in @BeforeEach; if we reach here the FS is POSIX.
+        // The non-POSIX case is covered by the assumeTrue skip above.
+        // Nothing to assert — the test documents the requirement.
+    }
+
+    private TempLocationManager instance(Path base) {
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_TEMP_DIR, base.toString());
+        props.put(ProfilingConfig.PROFILING_UPLOAD_PERIOD, "0");
+        return new TempLocationManager(
+                datadog.trace.bootstrap.config.provider.ConfigProvider.withPropertiesOverride(props),
+                false,
+                TempLocationManager.CleanupHook.EMPTY,
+                SystemTimeSource.INSTANCE);
+    }
+
+    private static void assertTrue0700(Path dir) throws IOException {
+        Set<PosixFilePermission> perms = Files.getPosixFilePermissions(dir);
+        for (PosixFilePermission bit : new PosixFilePermission[] {
+            PosixFilePermission.GROUP_READ,
+            PosixFilePermission.GROUP_WRITE,
+            PosixFilePermission.GROUP_EXECUTE,
+            PosixFilePermission.OTHERS_READ,
+            PosixFilePermission.OTHERS_WRITE,
+            PosixFilePermission.OTHERS_EXECUTE
         }) {
-      if (perms.contains(bit)) {
-        throw new AssertionError("Expected 0700 but found group/world bit " + bit + " on " + dir);
-      }
+            if (perms.contains(bit)) {
+                throw new AssertionError("Expected 0700 but found group/world bit " + bit + " on " + dir);
+            }
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/TempLocationManagerTest.java b/internal-api/src/test/java/datadog/trace/util/TempLocationManagerTest.java
index af22b5fe804..113c0e9915c 100644
--- a/internal-api/src/test/java/datadog/trace/util/TempLocationManagerTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/TempLocationManagerTest.java
@@ -35,302 +35,279 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 public class TempLocationManagerTest {
-  @ParameterizedTest
-  @ValueSource(strings = {"", "test1"})
-  void testDefault(String subPath) throws Exception {
-    TempLocationManager tempLocationManager = TempLocationManager.getInstance(true);
-    Path tempDir = tempLocationManager.getTempDir(Paths.get(subPath));
-    assertNotNull(tempDir);
-    assertTrue(Files.exists(tempDir));
-    assertTrue(Files.isDirectory(tempDir));
-    assertTrue(Files.isWritable(tempDir));
-    assertTrue(Files.isReadable(tempDir));
-    assertTrue(Files.isExecutable(tempDir));
-    assertTrue(tempDir.toString().contains("pid_" + PidHelper.getPid()));
-  }
+    @ParameterizedTest
+    @ValueSource(strings = {"", "test1"})
+    void testDefault(String subPath) throws Exception {
+        TempLocationManager tempLocationManager = TempLocationManager.getInstance(true);
+        Path tempDir = tempLocationManager.getTempDir(Paths.get(subPath));
+        assertNotNull(tempDir);
+        assertTrue(Files.exists(tempDir));
+        assertTrue(Files.isDirectory(tempDir));
+        assertTrue(Files.isWritable(tempDir));
+        assertTrue(Files.isReadable(tempDir));
+        assertTrue(Files.isExecutable(tempDir));
+        assertTrue(tempDir.toString().contains("pid_" + PidHelper.getPid()));
+    }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"", "test1"})
-  void testFromConfig(String subPath) throws Exception {
-    Path myDir =
-        Files.createTempDirectory(
-            "ddprof-test-",
-            PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
-    myDir.toFile().deleteOnExit();
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_TEMP_DIR, myDir.toString());
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-    TempLocationManager tempLocationManager = new TempLocationManager(configProvider);
-    Path tempDir = tempLocationManager.getTempDir(Paths.get(subPath));
-    assertNotNull(tempDir);
-    assertTrue(tempDir.toString().startsWith(myDir.toString()));
-  }
+    @ParameterizedTest
+    @ValueSource(strings = {"", "test1"})
+    void testFromConfig(String subPath) throws Exception {
+        Path myDir = Files.createTempDirectory(
+                "ddprof-test-", PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
+        myDir.toFile().deleteOnExit();
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_TEMP_DIR, myDir.toString());
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+        TempLocationManager tempLocationManager = new TempLocationManager(configProvider);
+        Path tempDir = tempLocationManager.getTempDir(Paths.get(subPath));
+        assertNotNull(tempDir);
+        assertTrue(tempDir.toString().startsWith(myDir.toString()));
+    }
 
-  @Test
-  void testFromConfigInvalid() {
-    Path myDir = Paths.get(System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString());
-    // do not create the directory - it should trigger an exception
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_TEMP_DIR, myDir.toString());
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-    assertThrows(IllegalStateException.class, () -> new TempLocationManager(configProvider));
-  }
+    @Test
+    void testFromConfigInvalid() {
+        Path myDir = Paths.get(
+                System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString());
+        // do not create the directory - it should trigger an exception
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_TEMP_DIR, myDir.toString());
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+        assertThrows(IllegalStateException.class, () -> new TempLocationManager(configProvider));
+    }
 
-  @Test
-  void testFromConfigNotWritable() throws Exception {
-    Path myDir =
-        Files.createTempDirectory(
-            "ddprof-test-",
-            PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("r-x------")));
-    myDir.toFile().deleteOnExit();
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_TEMP_DIR, myDir.toString());
-    ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
-    assertThrows(IllegalStateException.class, () -> new TempLocationManager(configProvider));
-  }
+    @Test
+    void testFromConfigNotWritable() throws Exception {
+        Path myDir = Files.createTempDirectory(
+                "ddprof-test-", PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("r-x------")));
+        myDir.toFile().deleteOnExit();
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_TEMP_DIR, myDir.toString());
+        ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
+        assertThrows(IllegalStateException.class, () -> new TempLocationManager(configProvider));
+    }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"", "test1"})
-  void testCleanup(String subPath) throws Exception {
-    Path myDir =
-        Files.createTempDirectory(
-            "ddprof-test-",
-            PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
-    myDir.toFile().deleteOnExit();
-    TempLocationManager tempLocationManager =
-        instance(myDir, false, TempLocationManager.CleanupHook.EMPTY);
-    Path tempDir = tempLocationManager.getTempDir(Paths.get(subPath));
-    assertNotNull(tempDir);
+    @ParameterizedTest
+    @ValueSource(strings = {"", "test1"})
+    void testCleanup(String subPath) throws Exception {
+        Path myDir = Files.createTempDirectory(
+                "ddprof-test-", PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
+        myDir.toFile().deleteOnExit();
+        TempLocationManager tempLocationManager = instance(myDir, false, TempLocationManager.CleanupHook.EMPTY);
+        Path tempDir = tempLocationManager.getTempDir(Paths.get(subPath));
+        assertNotNull(tempDir);
 
-    // fake temp location
-    Path fakeTempDir = myDir.resolve(TempLocationManager.getBaseTempDirName()).resolve("pid_fake");
-    Files.createDirectories(fakeTempDir);
-    Path tmpFile = Files.createFile(fakeTempDir.resolve("test.txt"));
-    tmpFile.toFile().deleteOnExit(); // make sure this is deleted at exit
-    fakeTempDir.toFile().deleteOnExit(); // also this one
-    boolean rslt = tempLocationManager.cleanup();
-    // fake temp location should be deleted, real temp location should be kept
-    assertTrue(rslt, "cleanup should succeed");
-    assertFalse(Files.exists(tmpFile), "stale pid file should be gone");
-    assertFalse(Files.exists(fakeTempDir), "stale pid dir should be gone");
-    assertTrue(Files.exists(tempDir));
-  }
+        // fake temp location
+        Path fakeTempDir =
+                myDir.resolve(TempLocationManager.getBaseTempDirName()).resolve("pid_fake");
+        Files.createDirectories(fakeTempDir);
+        Path tmpFile = Files.createFile(fakeTempDir.resolve("test.txt"));
+        tmpFile.toFile().deleteOnExit(); // make sure this is deleted at exit
+        fakeTempDir.toFile().deleteOnExit(); // also this one
+        boolean rslt = tempLocationManager.cleanup();
+        // fake temp location should be deleted, real temp location should be kept
+        assertTrue(rslt, "cleanup should succeed");
+        assertFalse(Files.exists(tmpFile), "stale pid file should be gone");
+        assertFalse(Files.exists(fakeTempDir), "stale pid dir should be gone");
+        assertTrue(Files.exists(tempDir));
+    }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"preVisitDirectory", "visitFile", "postVisitDirectory"})
-  void testConcurrentCleanup(String section) throws Exception {
-    /*
-     * This test simulates concurrent cleanup.
-     * It utilizes a special hook to create synchronization points in the filetree walking routine,
-     * allowing to delete the files at various points of execution.
-     * The test makes sure that the cleanup is not interrupted and the file and directory being
-     * deleted stays deleted.
-     *
-     * Synchronization uses CountDownLatch for deterministic coordination:
-     * 1. Cleanup thread reaches hook point, signals via hookReached latch
-     * 2. Main thread deletes file, signals via proceedSignal latch
-     * 3. Cleanup thread continues and completes
-     */
-    Path baseDir =
-        Files.createTempDirectory(
-            "ddprof-test-",
-            PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
-    baseDir.toFile().deleteOnExit();
+    @ParameterizedTest
+    @ValueSource(strings = {"preVisitDirectory", "visitFile", "postVisitDirectory"})
+    void testConcurrentCleanup(String section) throws Exception {
+        /*
+         * This test simulates concurrent cleanup.
+         * It utilizes a special hook to create synchronization points in the filetree walking routine,
+         * allowing to delete the files at various points of execution.
+         * The test makes sure that the cleanup is not interrupted and the file and directory being
+         * deleted stays deleted.
+         *
+         * Synchronization uses CountDownLatch for deterministic coordination:
+         * 1. Cleanup thread reaches hook point, signals via hookReached latch
+         * 2. Main thread deletes file, signals via proceedSignal latch
+         * 3. Cleanup thread continues and completes
+         */
+        Path baseDir = Files.createTempDirectory(
+                "ddprof-test-", PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
+        baseDir.toFile().deleteOnExit();
 
-    Path fakeTempDir =
-        baseDir.resolve(TempLocationManager.getBaseTempDirName() + "/pid_fake/scratch");
-    Files.createDirectories(
-        fakeTempDir,
-        PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
-    Path fakeTempFile = fakeTempDir.resolve("libxxx.so");
-    Files.createFile(fakeTempFile);
+        Path fakeTempDir = baseDir.resolve(TempLocationManager.getBaseTempDirName() + "/pid_fake/scratch");
+        Files.createDirectories(
+                fakeTempDir, PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
+        Path fakeTempFile = fakeTempDir.resolve("libxxx.so");
+        Files.createFile(fakeTempFile);
 
-    fakeTempDir.toFile().deleteOnExit();
-    fakeTempFile.toFile().deleteOnExit();
+        fakeTempDir.toFile().deleteOnExit();
+        fakeTempFile.toFile().deleteOnExit();
 
-    CountDownLatch hookReached = new CountDownLatch(1);
-    CountDownLatch proceedSignal = new CountDownLatch(1);
-    AtomicBoolean withTimeout = new AtomicBoolean(false);
-    AtomicReference<Throwable> cleanupError = new AtomicReference<>();
+        CountDownLatch hookReached = new CountDownLatch(1);
+        CountDownLatch proceedSignal = new CountDownLatch(1);
+        AtomicBoolean withTimeout = new AtomicBoolean(false);
+        AtomicReference<Throwable> cleanupError = new AtomicReference<>();
 
-    TempLocationManager.CleanupHook blocker =
-        new TempLocationManager.CleanupHook() {
-          private void syncPoint(boolean timeout) {
-            withTimeout.compareAndSet(false, timeout);
-            hookReached.countDown();
-            try {
-              if (!proceedSignal.await(30, TimeUnit.SECONDS)) {
-                cleanupError.set(
-                    new AssertionError("Cleanup thread: proceed signal timeout after 30s"));
-              }
-            } catch (InterruptedException e) {
-              Thread.currentThread().interrupt();
-              cleanupError.set(e);
+        TempLocationManager.CleanupHook blocker = new TempLocationManager.CleanupHook() {
+            private void syncPoint(boolean timeout) {
+                withTimeout.compareAndSet(false, timeout);
+                hookReached.countDown();
+                try {
+                    if (!proceedSignal.await(30, TimeUnit.SECONDS)) {
+                        cleanupError.set(new AssertionError("Cleanup thread: proceed signal timeout after 30s"));
+                    }
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    cleanupError.set(e);
+                }
             }
-          }
 
-          @Override
-          public FileVisitResult preVisitDirectory(
-              Path dir, BasicFileAttributes attrs, boolean timeout) throws IOException {
-            if (section.equals("preVisitDirectory") && dir.equals(fakeTempDir)) {
-              syncPoint(timeout);
+            @Override
+            public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs, boolean timeout)
+                    throws IOException {
+                if (section.equals("preVisitDirectory") && dir.equals(fakeTempDir)) {
+                    syncPoint(timeout);
+                }
+                return TempLocationManager.CleanupHook.super.preVisitDirectory(dir, attrs, timeout);
             }
-            return TempLocationManager.CleanupHook.super.preVisitDirectory(dir, attrs, timeout);
-          }
 
-          @Override
-          public FileVisitResult visitFile(Path file, BasicFileAttributes attrs, boolean timeout)
-              throws IOException {
-            if (section.equals("visitFile") && file.equals(fakeTempFile)) {
-              syncPoint(timeout);
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs, boolean timeout) throws IOException {
+                if (section.equals("visitFile") && file.equals(fakeTempFile)) {
+                    syncPoint(timeout);
+                }
+                return TempLocationManager.CleanupHook.super.visitFile(file, attrs, timeout);
             }
-            return TempLocationManager.CleanupHook.super.visitFile(file, attrs, timeout);
-          }
 
-          @Override
-          public FileVisitResult postVisitDirectory(Path dir, IOException exc, boolean timeout)
-              throws IOException {
-            if (section.equals("postVisitDirectory") && dir.equals(fakeTempDir)) {
-              syncPoint(timeout);
+            @Override
+            public FileVisitResult postVisitDirectory(Path dir, IOException exc, boolean timeout) throws IOException {
+                if (section.equals("postVisitDirectory") && dir.equals(fakeTempDir)) {
+                    syncPoint(timeout);
+                }
+                return TempLocationManager.CleanupHook.super.postVisitDirectory(dir, exc, timeout);
             }
-            return TempLocationManager.CleanupHook.super.postVisitDirectory(dir, exc, timeout);
-          }
         };
 
-    TempLocationManager mgr = instance(baseDir, false, blocker);
+        TempLocationManager mgr = instance(baseDir, false, blocker);
 
-    // Run cleanup on a dedicated thread instead of the shared AgentTaskScheduler
-    // worker, which can be queued behind cleanup tasks scheduled by other tests.
-    Thread cleanupThread = new Thread(mgr::cleanup, "test-cleanup");
-    cleanupThread.setDaemon(true);
-    cleanupThread.start();
+        // Run cleanup on a dedicated thread instead of the shared AgentTaskScheduler
+        // worker, which can be queued behind cleanup tasks scheduled by other tests.
+        Thread cleanupThread = new Thread(mgr::cleanup, "test-cleanup");
+        cleanupThread.setDaemon(true);
+        cleanupThread.start();
 
-    try {
-      assertTrue(
-          hookReached.await(30, TimeUnit.SECONDS),
-          "Cleanup thread should reach hook within 30 seconds");
-      // The visitor may have already deleted the file by this point; tolerate.
-      Files.deleteIfExists(fakeTempFile);
-      proceedSignal.countDown();
-      cleanupThread.join(TimeUnit.SECONDS.toMillis(30));
-      assertFalse(cleanupThread.isAlive(), "Cleanup should complete within 30s");
+        try {
+            assertTrue(hookReached.await(30, TimeUnit.SECONDS), "Cleanup thread should reach hook within 30 seconds");
+            // The visitor may have already deleted the file by this point; tolerate.
+            Files.deleteIfExists(fakeTempFile);
+            proceedSignal.countDown();
+            cleanupThread.join(TimeUnit.SECONDS.toMillis(30));
+            assertFalse(cleanupThread.isAlive(), "Cleanup should complete within 30s");
 
-      Throwable error = cleanupError.get();
-      if (error != null) {
-        throw new AssertionError("Cleanup thread encountered error", error);
-      }
+            Throwable error = cleanupError.get();
+            if (error != null) {
+                throw new AssertionError("Cleanup thread encountered error", error);
+            }
 
-      assertFalse(withTimeout.get(), "Cleanup should not have timed out");
-      assertFalse(Files.exists(fakeTempFile));
-      assertFalse(Files.exists(fakeTempDir));
-    } finally {
-      // Release the cleanup thread so it can drain on early assertion failure.
-      proceedSignal.countDown();
-      cleanupThread.join(TimeUnit.SECONDS.toMillis(5));
+            assertFalse(withTimeout.get(), "Cleanup should not have timed out");
+            assertFalse(Files.exists(fakeTempFile));
+            assertFalse(Files.exists(fakeTempDir));
+        } finally {
+            // Release the cleanup thread so it can drain on early assertion failure.
+            proceedSignal.countDown();
+            cleanupThread.join(TimeUnit.SECONDS.toMillis(5));
+        }
     }
-  }
 
-  @ParameterizedTest
-  @MethodSource("timeoutTestArguments")
-  void testCleanupWithTimeout(boolean shouldSucceed, String section) throws Exception {
-    /*
-     * Test that cleanup correctly handles timeout conditions.
-     * Uses a ControllableTimeSource for fully deterministic behavior:
-     * - Success case: time is never advanced, so timeout never occurs
-     * - Failure case: time is advanced past timeout on first matching hook call
-     *
-     * This approach is independent of how many times hooks are invoked.
-     */
-    long timeoutMs = 100;
-    ControllableTimeSource timeSource = new ControllableTimeSource();
+    @ParameterizedTest
+    @MethodSource("timeoutTestArguments")
+    void testCleanupWithTimeout(boolean shouldSucceed, String section) throws Exception {
+        /*
+         * Test that cleanup correctly handles timeout conditions.
+         * Uses a ControllableTimeSource for fully deterministic behavior:
+         * - Success case: time is never advanced, so timeout never occurs
+         * - Failure case: time is advanced past timeout on first matching hook call
+         *
+         * This approach is independent of how many times hooks are invoked.
+         */
+        long timeoutMs = 100;
+        ControllableTimeSource timeSource = new ControllableTimeSource();
 
-    AtomicBoolean withTimeout = new AtomicBoolean(false);
-    AtomicBoolean timeAdvanced = new AtomicBoolean(false);
-    TempLocationManager.CleanupHook delayer =
-        new TempLocationManager.CleanupHook() {
-          private void maybeAdvanceTime() {
-            // Only advance time once, and only for failure case
-            if (!shouldSucceed && timeAdvanced.compareAndSet(false, true)) {
-              // Advance well past the timeout
-              timeSource.advance(TimeUnit.MILLISECONDS.toNanos(timeoutMs * 10));
+        AtomicBoolean withTimeout = new AtomicBoolean(false);
+        AtomicBoolean timeAdvanced = new AtomicBoolean(false);
+        TempLocationManager.CleanupHook delayer = new TempLocationManager.CleanupHook() {
+            private void maybeAdvanceTime() {
+                // Only advance time once, and only for failure case
+                if (!shouldSucceed && timeAdvanced.compareAndSet(false, true)) {
+                    // Advance well past the timeout
+                    timeSource.advance(TimeUnit.MILLISECONDS.toNanos(timeoutMs * 10));
+                }
             }
-          }
 
-          @Override
-          public FileVisitResult preVisitDirectory(
-              Path dir, BasicFileAttributes attrs, boolean timeout) throws IOException {
-            withTimeout.compareAndSet(false, timeout);
-            if (section.equals("preVisitDirectory")) {
-              maybeAdvanceTime();
+            @Override
+            public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs, boolean timeout)
+                    throws IOException {
+                withTimeout.compareAndSet(false, timeout);
+                if (section.equals("preVisitDirectory")) {
+                    maybeAdvanceTime();
+                }
+                return TempLocationManager.CleanupHook.super.preVisitDirectory(dir, attrs, timeout);
             }
-            return TempLocationManager.CleanupHook.super.preVisitDirectory(dir, attrs, timeout);
-          }
 
-          @Override
-          public FileVisitResult postVisitDirectory(Path dir, IOException exc, boolean timeout)
-              throws IOException {
-            withTimeout.compareAndSet(false, timeout);
-            if (section.equals("postVisitDirectory")) {
-              maybeAdvanceTime();
+            @Override
+            public FileVisitResult postVisitDirectory(Path dir, IOException exc, boolean timeout) throws IOException {
+                withTimeout.compareAndSet(false, timeout);
+                if (section.equals("postVisitDirectory")) {
+                    maybeAdvanceTime();
+                }
+                return TempLocationManager.CleanupHook.super.postVisitDirectory(dir, exc, timeout);
             }
-            return TempLocationManager.CleanupHook.super.postVisitDirectory(dir, exc, timeout);
-          }
 
-          @Override
-          public FileVisitResult visitFile(Path file, BasicFileAttributes attrs, boolean timeout)
-              throws IOException {
-            withTimeout.compareAndSet(false, timeout);
-            if (section.equals("visitFile")) {
-              maybeAdvanceTime();
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs, boolean timeout) throws IOException {
+                withTimeout.compareAndSet(false, timeout);
+                if (section.equals("visitFile")) {
+                    maybeAdvanceTime();
+                }
+                return TempLocationManager.CleanupHook.super.visitFile(file, attrs, timeout);
             }
-            return TempLocationManager.CleanupHook.super.visitFile(file, attrs, timeout);
-          }
         };
-    Path baseDir =
-        Files.createTempDirectory(
-            "ddprof-test-",
-            PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
-    baseDir.toFile().deleteOnExit();
-    TempLocationManager instance = instance(baseDir, false, delayer, timeSource);
-    Path mytempdir = instance.getTempDir();
-    Path otherTempdir = mytempdir.getParent().resolve("pid_fake");
-    Files.createDirectories(otherTempdir);
-    Files.createFile(mytempdir.resolve("dummy"));
-    Files.createFile(otherTempdir.resolve("dummy"));
-    // Set controllable time AFTER files are created so their modification times are in the past
-    timeSource.set(TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis()));
-    boolean rslt = instance.cleanup(timeoutMs, TimeUnit.MILLISECONDS);
-    assertEquals(shouldSucceed, rslt);
-    assertNotEquals(shouldSucceed, withTimeout.get()); // timeout = !shouldSucceed
-  }
+        Path baseDir = Files.createTempDirectory(
+                "ddprof-test-", PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
+        baseDir.toFile().deleteOnExit();
+        TempLocationManager instance = instance(baseDir, false, delayer, timeSource);
+        Path mytempdir = instance.getTempDir();
+        Path otherTempdir = mytempdir.getParent().resolve("pid_fake");
+        Files.createDirectories(otherTempdir);
+        Files.createFile(mytempdir.resolve("dummy"));
+        Files.createFile(otherTempdir.resolve("dummy"));
+        // Set controllable time AFTER files are created so their modification times are in the past
+        timeSource.set(TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis()));
+        boolean rslt = instance.cleanup(timeoutMs, TimeUnit.MILLISECONDS);
+        assertEquals(shouldSucceed, rslt);
+        assertNotEquals(shouldSucceed, withTimeout.get()); // timeout = !shouldSucceed
+    }
 
-  private static Stream<Arguments> timeoutTestArguments() {
-    List<Arguments> argumentsList = new ArrayList<>();
-    for (String intercepted :
-        new String[] {"preVisitDirectory", "visitFile", "postVisitDirectory"}) {
-      argumentsList.add(Arguments.of(true, intercepted));
-      argumentsList.add(Arguments.of(false, intercepted));
+    private static Stream<Arguments> timeoutTestArguments() {
+        List<Arguments> argumentsList = new ArrayList<>();
+        for (String intercepted : new String[] {"preVisitDirectory", "visitFile", "postVisitDirectory"}) {
+            argumentsList.add(Arguments.of(true, intercepted));
+            argumentsList.add(Arguments.of(false, intercepted));
+        }
+        return argumentsList.stream();
     }
-    return argumentsList.stream();
-  }
 
-  private TempLocationManager instance(
-      Path baseDir, boolean withStartupCleanup, TempLocationManager.CleanupHook cleanupHook) {
-    return instance(baseDir, withStartupCleanup, cleanupHook, SystemTimeSource.INSTANCE);
-  }
+    private TempLocationManager instance(
+            Path baseDir, boolean withStartupCleanup, TempLocationManager.CleanupHook cleanupHook) {
+        return instance(baseDir, withStartupCleanup, cleanupHook, SystemTimeSource.INSTANCE);
+    }
 
-  private TempLocationManager instance(
-      Path baseDir,
-      boolean withStartupCleanup,
-      TempLocationManager.CleanupHook cleanupHook,
-      TimeSource timeSource) {
-    Properties props = new Properties();
-    props.put(ProfilingConfig.PROFILING_TEMP_DIR, baseDir.toString());
-    props.put(
-        ProfilingConfig.PROFILING_UPLOAD_PERIOD,
-        "0"); // to force immediate cleanup; must be a string value!
+    private TempLocationManager instance(
+            Path baseDir,
+            boolean withStartupCleanup,
+            TempLocationManager.CleanupHook cleanupHook,
+            TimeSource timeSource) {
+        Properties props = new Properties();
+        props.put(ProfilingConfig.PROFILING_TEMP_DIR, baseDir.toString());
+        props.put(ProfilingConfig.PROFILING_UPLOAD_PERIOD, "0"); // to force immediate cleanup; must be a string value!
 
-    return new TempLocationManager(
-        ConfigProvider.withPropertiesOverride(props), withStartupCleanup, cleanupHook, timeSource);
-  }
+        return new TempLocationManager(
+                ConfigProvider.withPropertiesOverride(props), withStartupCleanup, cleanupHook, timeSource);
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/stacktrace/DefaultStackWalkerTest.java b/internal-api/src/test/java/datadog/trace/util/stacktrace/DefaultStackWalkerTest.java
index f3e4944370e..e14aa3ab949 100644
--- a/internal-api/src/test/java/datadog/trace/util/stacktrace/DefaultStackWalkerTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/stacktrace/DefaultStackWalkerTest.java
@@ -17,46 +17,46 @@
 
 public class DefaultStackWalkerTest {
 
-  private final StackWalker stackWalker = new DefaultStackWalker();
-
-  @BeforeEach
-  void setUp() {
-    assumeFalse(
-        JavaVirtualMachine.isOracleJDK8(),
-        "Oracle JDK 1.8 did not merge the fix in JDK-8058322, leading to the JVM failing to correctly "
-            + "extract method parameters without args, when the code is compiled on a later JDK (targeting 8). "
-            + "This can manifest when creating mocks.");
-  }
-
-  @Test
-  public void defaultStackWalker_must_be_enabled() {
-    assertTrue(stackWalker.isEnabled());
-  }
-
-  @Test
-  public void walk_from_non_datadog_class() {
-    // When
-    final List<StackTraceElement> stack = getStackWalkFrom(stackWalker, NOT_DD_CLASS_NAME);
-    // Then
-    assertFalse(stack.isEmpty());
-    assertEquals(NOT_DD_CLASS_NAME, stack.get(0).getClassName());
-  }
-
-  @Test
-  public void walk_from_datadog_class() {
-    // When
-    final List<StackTraceElement> stack = getStackWalkFrom(stackWalker, DD_CLASS_NAME);
-    // Then
-    assertFalse(stack.isEmpty());
-    assertNotEquals(DD_CLASS_NAME, stack.get(0).getClassName());
-  }
-
-  @Test
-  public void walk_from_datadog_iast_class() {
-    // When
-    final List<StackTraceElement> stack = getStackWalkFrom(stackWalker, DD_IAST_CLASS_NAME);
-    // Then
-    assertFalse(stack.isEmpty());
-    assertNotEquals(DD_IAST_CLASS_NAME, stack.get(0).getClassName());
-  }
+    private final StackWalker stackWalker = new DefaultStackWalker();
+
+    @BeforeEach
+    void setUp() {
+        assumeFalse(
+                JavaVirtualMachine.isOracleJDK8(),
+                "Oracle JDK 1.8 did not merge the fix in JDK-8058322, leading to the JVM failing to correctly "
+                        + "extract method parameters without args, when the code is compiled on a later JDK (targeting 8). "
+                        + "This can manifest when creating mocks.");
+    }
+
+    @Test
+    public void defaultStackWalker_must_be_enabled() {
+        assertTrue(stackWalker.isEnabled());
+    }
+
+    @Test
+    public void walk_from_non_datadog_class() {
+        // When
+        final List<StackTraceElement> stack = getStackWalkFrom(stackWalker, NOT_DD_CLASS_NAME);
+        // Then
+        assertFalse(stack.isEmpty());
+        assertEquals(NOT_DD_CLASS_NAME, stack.get(0).getClassName());
+    }
+
+    @Test
+    public void walk_from_datadog_class() {
+        // When
+        final List<StackTraceElement> stack = getStackWalkFrom(stackWalker, DD_CLASS_NAME);
+        // Then
+        assertFalse(stack.isEmpty());
+        assertNotEquals(DD_CLASS_NAME, stack.get(0).getClassName());
+    }
+
+    @Test
+    public void walk_from_datadog_iast_class() {
+        // When
+        final List<StackTraceElement> stack = getStackWalkFrom(stackWalker, DD_IAST_CLASS_NAME);
+        // Then
+        assertFalse(stack.isEmpty());
+        assertNotEquals(DD_IAST_CLASS_NAME, stack.get(0).getClassName());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/stacktrace/HotSpotStackTraceIteratorTest.java b/internal-api/src/test/java/datadog/trace/util/stacktrace/HotSpotStackTraceIteratorTest.java
index 2fa440fd250..38b877c72a0 100644
--- a/internal-api/src/test/java/datadog/trace/util/stacktrace/HotSpotStackTraceIteratorTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/stacktrace/HotSpotStackTraceIteratorTest.java
@@ -12,37 +12,36 @@
 
 public class HotSpotStackTraceIteratorTest {
 
-  @BeforeAll
-  public static void setUp() {
-    assumeTrue(isRunningJDK8WithHotSpot());
-  }
-
-  @Test
-  public void hasNext() {
-    assertTrue(getTestIterator().hasNext());
-  }
-
-  @Test
-  public void next() {
-    assertNotNull(getTestIterator().next());
-  }
-
-  @Test
-  public void next_throws_NoSuchElementException_when_there_are_no_more_elements() {
-    HotSpotStackTraceIterator iterator = getTestIterator();
-    while (iterator.hasNext()) {
-      iterator.next();
+    @BeforeAll
+    public static void setUp() {
+        assumeTrue(isRunningJDK8WithHotSpot());
+    }
+
+    @Test
+    public void hasNext() {
+        assertTrue(getTestIterator().hasNext());
+    }
+
+    @Test
+    public void next() {
+        assertNotNull(getTestIterator().next());
+    }
+
+    @Test
+    public void next_throws_NoSuchElementException_when_there_are_no_more_elements() {
+        HotSpotStackTraceIterator iterator = getTestIterator();
+        while (iterator.hasNext()) {
+            iterator.next();
+        }
+        Assertions.assertThrows(NoSuchElementException.class, iterator::next);
+    }
+
+    @Test
+    public void remove_throws_UnsupportedOperationException() {
+        Assertions.assertThrows(UnsupportedOperationException.class, getTestIterator()::remove);
+    }
+
+    private HotSpotStackTraceIterator getTestIterator() {
+        return new HotSpotStackTraceIterator(new Throwable(), sun.misc.SharedSecrets.getJavaLangAccess());
     }
-    Assertions.assertThrows(NoSuchElementException.class, iterator::next);
-  }
-
-  @Test
-  public void remove_throws_UnsupportedOperationException() {
-    Assertions.assertThrows(UnsupportedOperationException.class, getTestIterator()::remove);
-  }
-
-  private HotSpotStackTraceIterator getTestIterator() {
-    return new HotSpotStackTraceIterator(
-        new Throwable(), sun.misc.SharedSecrets.getJavaLangAccess());
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/stacktrace/HotSpotStackWalkerTest.java b/internal-api/src/test/java/datadog/trace/util/stacktrace/HotSpotStackWalkerTest.java
index 3488a320edb..8a94f681c52 100644
--- a/internal-api/src/test/java/datadog/trace/util/stacktrace/HotSpotStackWalkerTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/stacktrace/HotSpotStackWalkerTest.java
@@ -24,82 +24,77 @@
 
 public class HotSpotStackWalkerTest {
 
-  private final StackWalker stackWalker = new HotSpotStackWalker();
+    private final StackWalker stackWalker = new HotSpotStackWalker();
 
-  @BeforeAll
-  public static void setUp() {
-    assumeTrue(isRunningJDK8WithHotSpot());
-    assumeFalse(
-        JavaVirtualMachine.isOracleJDK8(),
-        "Oracle JDK 1.8 did not merge the fix in JDK-8058322, leading to the JVM failing to correctly "
-            + "extract method parameters without args, when the code is compiled on a later JDK (targeting 8). "
-            + "This can manifest when creating mocks.");
-  }
+    @BeforeAll
+    public static void setUp() {
+        assumeTrue(isRunningJDK8WithHotSpot());
+        assumeFalse(
+                JavaVirtualMachine.isOracleJDK8(),
+                "Oracle JDK 1.8 did not merge the fix in JDK-8058322, leading to the JVM failing to correctly "
+                        + "extract method parameters without args, when the code is compiled on a later JDK (targeting 8). "
+                        + "This can manifest when creating mocks.");
+    }
 
-  @Test
-  public void hotSpotStackWalker_must_be_enabled_for_JDK8_with_hotspot() {
-    assertTrue(stackWalker.isEnabled());
-  }
+    @Test
+    public void hotSpotStackWalker_must_be_enabled_for_JDK8_with_hotspot() {
+        assertTrue(stackWalker.isEnabled());
+    }
 
-  @Test
-  public void walk_from_non_datadog_class() {
-    // When
-    final List<StackTraceElement> stack = getStackWalkFrom(stackWalker, NOT_DD_CLASS_NAME);
-    // Then
-    assertFalse(stack.isEmpty());
-    assertEquals(NOT_DD_CLASS_NAME, stack.get(0).getClassName());
-  }
+    @Test
+    public void walk_from_non_datadog_class() {
+        // When
+        final List<StackTraceElement> stack = getStackWalkFrom(stackWalker, NOT_DD_CLASS_NAME);
+        // Then
+        assertFalse(stack.isEmpty());
+        assertEquals(NOT_DD_CLASS_NAME, stack.get(0).getClassName());
+    }
 
-  @Test
-  public void walk_from_datadog_class() {
-    // When
-    final List<StackTraceElement> stack = getStackWalkFrom(stackWalker, DD_CLASS_NAME);
-    // Then
-    assertFalse(stack.isEmpty());
-    assertNotEquals(DD_CLASS_NAME, stack.get(0).getClassName());
-  }
+    @Test
+    public void walk_from_datadog_class() {
+        // When
+        final List<StackTraceElement> stack = getStackWalkFrom(stackWalker, DD_CLASS_NAME);
+        // Then
+        assertFalse(stack.isEmpty());
+        assertNotEquals(DD_CLASS_NAME, stack.get(0).getClassName());
+    }
 
-  @Test
-  public void walk_from_datadog_iast_class() {
-    // When
-    final List<StackTraceElement> stack = getStackWalkFrom(stackWalker, DD_IAST_CLASS_NAME);
-    // Then
-    assertFalse(stack.isEmpty());
-    assertNotEquals(DD_IAST_CLASS_NAME, stack.get(0).getClassName());
-  }
+    @Test
+    public void walk_from_datadog_iast_class() {
+        // When
+        final List<StackTraceElement> stack = getStackWalkFrom(stackWalker, DD_IAST_CLASS_NAME);
+        // Then
+        assertFalse(stack.isEmpty());
+        assertNotEquals(DD_IAST_CLASS_NAME, stack.get(0).getClassName());
+    }
 
-  @Test
-  public void is_not_enabled_when_access_throws_exception() {
-    // When
-    sun.misc.JavaLangAccess mockedAccess = mock(sun.misc.JavaLangAccess.class);
-    when(mockedAccess.getStackTraceElement(any(Throwable.class), eq(0)))
-        .thenThrow(new RuntimeException());
-    HotSpotStackWalker hotSpotStackWalker = new HotSpotStackWalker();
-    hotSpotStackWalker.access = mockedAccess;
-    // Then
-    assertFalse(hotSpotStackWalker.isEnabled());
-  }
+    @Test
+    public void is_not_enabled_when_access_throws_exception() {
+        // When
+        sun.misc.JavaLangAccess mockedAccess = mock(sun.misc.JavaLangAccess.class);
+        when(mockedAccess.getStackTraceElement(any(Throwable.class), eq(0))).thenThrow(new RuntimeException());
+        HotSpotStackWalker hotSpotStackWalker = new HotSpotStackWalker();
+        hotSpotStackWalker.access = mockedAccess;
+        // Then
+        assertFalse(hotSpotStackWalker.isEnabled());
+    }
 
-  @Test
-  public void is_not_enabled_when_access_is_null() {
-    // When
-    HotSpotStackWalker hotSpotStackWalker = new HotSpotStackWalker();
-    hotSpotStackWalker.access = null;
-    // Then
-    assertFalse(hotSpotStackWalker.isEnabled());
-  }
+    @Test
+    public void is_not_enabled_when_access_is_null() {
+        // When
+        HotSpotStackWalker hotSpotStackWalker = new HotSpotStackWalker();
+        hotSpotStackWalker.access = null;
+        // Then
+        assertFalse(hotSpotStackWalker.isEnabled());
+    }
 
-  @Test
-  public void iterable_from_HotSpotStackWalker_doGetStack_is_not_in_the_filtered_stack() {
-    // When
-    List<StackTraceElement> list = stackWalker.walk(s -> s.collect(Collectors.toList()));
-    // Then
-    assertFalse(
-        list.stream()
-            .anyMatch(
-                stackTraceElement ->
-                    stackTraceElement
-                        .toString()
-                        .equals("java.lang.Iterable.spliterator(Iterable.java:101)")));
-  }
+    @Test
+    public void iterable_from_HotSpotStackWalker_doGetStack_is_not_in_the_filtered_stack() {
+        // When
+        List<StackTraceElement> list = stackWalker.walk(s -> s.collect(Collectors.toList()));
+        // Then
+        assertFalse(list.stream()
+                .anyMatch(stackTraceElement ->
+                        stackTraceElement.toString().equals("java.lang.Iterable.spliterator(Iterable.java:101)")));
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/stacktrace/StackUtilsTest.java b/internal-api/src/test/java/datadog/trace/util/stacktrace/StackUtilsTest.java
index 2de4d2d0996..3c6c612a753 100644
--- a/internal-api/src/test/java/datadog/trace/util/stacktrace/StackUtilsTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/stacktrace/StackUtilsTest.java
@@ -26,159 +26,150 @@
 
 public class StackUtilsTest {
 
-  @Test
-  public void test_identity_function() {
-    final Throwable source = new RuntimeException();
-    final StackTraceElement[] expected = source.getStackTrace();
-
-    final Throwable updated = StackUtils.update(withStack(expected), Function.identity());
-    assertArrayEquals(expected, updated.getStackTrace());
-  }
-
-  @Test
-  public void test_filter_all_datadog() {
-    final StackTraceElement[] stack =
-        new StackTraceElement[] {
-          stack().className("org.junit.jupiter.api.Test").build(),
-          stack().className("datadog.trace.util.stacktrace.StackUtilsTest").build(),
-          stack().className("java.util.function.Function").build(),
-          stack().className("datadog.trace.util.stacktrace.StackUtils").build(),
-          stack().className("org.junit.jupiter.api.Assertions").build()
+    @Test
+    public void test_identity_function() {
+        final Throwable source = new RuntimeException();
+        final StackTraceElement[] expected = source.getStackTrace();
+
+        final Throwable updated = StackUtils.update(withStack(expected), Function.identity());
+        assertArrayEquals(expected, updated.getStackTrace());
+    }
+
+    @Test
+    public void test_filter_all_datadog() {
+        final StackTraceElement[] stack = new StackTraceElement[] {
+            stack().className("org.junit.jupiter.api.Test").build(),
+            stack().className("datadog.trace.util.stacktrace.StackUtilsTest").build(),
+            stack().className("java.util.function.Function").build(),
+            stack().className("datadog.trace.util.stacktrace.StackUtils").build(),
+            stack().className("org.junit.jupiter.api.Assertions").build()
         };
-    final StackTraceElement[] expected = new StackTraceElement[] {stack[0], stack[2], stack[4]};
-
-    final Throwable filtered =
-        StackUtils.filter(
-            withStack(stack), item -> !item.getClassName().startsWith("datadog.trace"));
-    assertArrayEquals(expected, filtered.getStackTrace());
-
-    final Throwable filtered2 = StackUtils.filterDatadog(withStack(stack));
-    assertArrayEquals(expected, filtered2.getStackTrace());
-  }
-
-  @Test
-  public void test_stack_filters() {
-    final StackTraceElement[] stack =
-        new StackTraceElement[] {
-          stack().className("org.junit.jupiter.api.Test").build(),
-          stack().className("datadog.trace.util.stacktrace.StackUtilsTest").build(),
-          stack().className("java.util.function.Function").build(),
-          stack().className("datadog.trace.util.stacktrace.StackUtils").build(),
-          stack().className("org.junit.jupiter.api.Assertions").build()
+        final StackTraceElement[] expected = new StackTraceElement[] {stack[0], stack[2], stack[4]};
+
+        final Throwable filtered =
+                StackUtils.filter(withStack(stack), item -> !item.getClassName().startsWith("datadog.trace"));
+        assertArrayEquals(expected, filtered.getStackTrace());
+
+        final Throwable filtered2 = StackUtils.filterDatadog(withStack(stack));
+        assertArrayEquals(expected, filtered2.getStackTrace());
+    }
+
+    @Test
+    public void test_stack_filters() {
+        final StackTraceElement[] stack = new StackTraceElement[] {
+            stack().className("org.junit.jupiter.api.Test").build(),
+            stack().className("datadog.trace.util.stacktrace.StackUtilsTest").build(),
+            stack().className("java.util.function.Function").build(),
+            stack().className("datadog.trace.util.stacktrace.StackUtils").build(),
+            stack().className("org.junit.jupiter.api.Assertions").build()
         };
-    final StackTraceElement[] expected =
-        new StackTraceElement[] {stack[0], stack[2], stack[3], stack[4]};
-
-    final Throwable filtered =
-        StackUtils.filterFirst(
-            withStack(stack), item -> !item.getClassName().startsWith("datadog.trace"));
-    assertArrayEquals(expected, filtered.getStackTrace());
-
-    final Throwable filtered2 = StackUtils.filterFirstDatadog(withStack(stack));
-    assertArrayEquals(expected, filtered2.getStackTrace());
-  }
-
-  @Test
-  public void test_filter_until() {
-    final StackTraceElement[] stack =
-        new StackTraceElement[] {
-          stack().className("org.junit.jupiter.api.Test").build(),
-          stack().className("datadog.trace.util.stacktrace.StackUtilsTest").build(),
-          stack().className("java.util.function.Function").build(),
-          stack().className("datadog.trace.util.stacktrace.StackUtils").build(),
-          stack().className("org.junit.jupiter.api.Assertions").build()
+        final StackTraceElement[] expected = new StackTraceElement[] {stack[0], stack[2], stack[3], stack[4]};
+
+        final Throwable filtered = StackUtils.filterFirst(
+                withStack(stack), item -> !item.getClassName().startsWith("datadog.trace"));
+        assertArrayEquals(expected, filtered.getStackTrace());
+
+        final Throwable filtered2 = StackUtils.filterFirstDatadog(withStack(stack));
+        assertArrayEquals(expected, filtered2.getStackTrace());
+    }
+
+    @Test
+    public void test_filter_until() {
+        final StackTraceElement[] stack = new StackTraceElement[] {
+            stack().className("org.junit.jupiter.api.Test").build(),
+            stack().className("datadog.trace.util.stacktrace.StackUtilsTest").build(),
+            stack().className("java.util.function.Function").build(),
+            stack().className("datadog.trace.util.stacktrace.StackUtils").build(),
+            stack().className("org.junit.jupiter.api.Assertions").build()
         };
 
-    final StackTraceElement[] expected = new StackTraceElement[] {stack[4]};
-    final Throwable removed =
-        StackUtils.filterUntil(
-            withStack(stack),
-            entry -> entry.getClassName().equals("datadog.trace.util.stacktrace.StackUtils"));
-    assertArrayEquals(expected, removed.getStackTrace());
-
-    final Throwable noRemoval = StackUtils.filterUntil(withStack(stack), entry -> false);
-    assertArrayEquals(stack, noRemoval.getStackTrace());
-  }
-
-  private static Stream<Arguments> test_generateUserCodeStackTrace_Params() {
-    return Stream.of(
-        Arguments.of((Predicate<StackTraceElement>) stack -> true, false),
-        Arguments.of(
-            (Predicate<StackTraceElement>) stack -> !stack.getClassName().startsWith("org.junit"),
-            true));
-  }
-
-  @ParameterizedTest(name = "[{index}]")
-  @MethodSource("test_generateUserCodeStackTrace_Params")
-  public void test_generateUserCodeStackTrace(
-      final Predicate<StackTraceElement> filter, final boolean expected) {
-    List<StackTraceFrame> userCodeStack = StackUtils.generateUserCodeStackTrace(filter);
-    assertNotNull(userCodeStack);
-    int junitFramesCounter = 0;
-    for (StackTraceFrame frame : userCodeStack) {
-      if (frame.getClass_name() != null && frame.getClass_name().startsWith("org.junit")) {
-        junitFramesCounter++;
-      }
+        final StackTraceElement[] expected = new StackTraceElement[] {stack[4]};
+        final Throwable removed = StackUtils.filterUntil(
+                withStack(stack), entry -> entry.getClassName().equals("datadog.trace.util.stacktrace.StackUtils"));
+        assertArrayEquals(expected, removed.getStackTrace());
+
+        final Throwable noRemoval = StackUtils.filterUntil(withStack(stack), entry -> false);
+        assertArrayEquals(stack, noRemoval.getStackTrace());
     }
-    if (expected) {
-      assertEquals(0, junitFramesCounter);
-    } else {
-      assertTrue(junitFramesCounter > 0);
+
+    private static Stream<Arguments> test_generateUserCodeStackTrace_Params() {
+        return Stream.of(
+                Arguments.of((Predicate<StackTraceElement>) stack -> true, false),
+                Arguments.of(
+                        (Predicate<StackTraceElement>)
+                                stack -> !stack.getClassName().startsWith("org.junit"),
+                        true));
     }
-  }
-
-  @Test
-  public void addStacktraceEventsToAvailableMetaStruct() {
-    final RequestContext reqCtx = mock(RequestContext.class);
-    final Map<String, List<StackTraceEvent>> batch = new HashMap<>();
-    when(reqCtx.getOrCreateMetaStructTop(eq(META_STRUCT_KEY), any())).thenReturn(batch);
-    final String productTest = "test";
-    final StackTraceEvent event = new StackTraceEvent(new ArrayList<>(0), "java", "id", "message");
-    StackUtils.addStacktraceEventsToMetaStruct(
-        reqCtx, productTest, Collections.singletonList(event));
-    assertTrue(batch.containsKey(productTest));
-    assertTrue(batch.get(productTest).contains(event));
-  }
-
-  private static Throwable withStack(final StackTraceElement... stack) {
-    final Exception exception = new RuntimeException();
-    exception.setStackTrace(stack);
-    return exception;
-  }
-
-  private static StackTraceBuilder stack() {
-    return new StackTraceBuilder();
-  }
-
-  private static class StackTraceBuilder {
-
-    private String className = "mock";
-    private String methodName = "mock";
-    private String fileName = "mock";
-    private int lineNumber;
-
-    public StackTraceBuilder className(final String className) {
-      this.className = className;
-      return this;
+
+    @ParameterizedTest(name = "[{index}]")
+    @MethodSource("test_generateUserCodeStackTrace_Params")
+    public void test_generateUserCodeStackTrace(final Predicate<StackTraceElement> filter, final boolean expected) {
+        List<StackTraceFrame> userCodeStack = StackUtils.generateUserCodeStackTrace(filter);
+        assertNotNull(userCodeStack);
+        int junitFramesCounter = 0;
+        for (StackTraceFrame frame : userCodeStack) {
+            if (frame.getClass_name() != null && frame.getClass_name().startsWith("org.junit")) {
+                junitFramesCounter++;
+            }
+        }
+        if (expected) {
+            assertEquals(0, junitFramesCounter);
+        } else {
+            assertTrue(junitFramesCounter > 0);
+        }
     }
 
-    public StackTraceBuilder methodName(final String methodName) {
-      this.methodName = methodName;
-      return this;
+    @Test
+    public void addStacktraceEventsToAvailableMetaStruct() {
+        final RequestContext reqCtx = mock(RequestContext.class);
+        final Map<String, List<StackTraceEvent>> batch = new HashMap<>();
+        when(reqCtx.getOrCreateMetaStructTop(eq(META_STRUCT_KEY), any())).thenReturn(batch);
+        final String productTest = "test";
+        final StackTraceEvent event = new StackTraceEvent(new ArrayList<>(0), "java", "id", "message");
+        StackUtils.addStacktraceEventsToMetaStruct(reqCtx, productTest, Collections.singletonList(event));
+        assertTrue(batch.containsKey(productTest));
+        assertTrue(batch.get(productTest).contains(event));
     }
 
-    public StackTraceBuilder fileName(final String fileName) {
-      this.fileName = fileName;
-      return this;
+    private static Throwable withStack(final StackTraceElement... stack) {
+        final Exception exception = new RuntimeException();
+        exception.setStackTrace(stack);
+        return exception;
     }
 
-    public StackTraceBuilder lineNumber(final int lineNumber) {
-      this.lineNumber = lineNumber;
-      return this;
+    private static StackTraceBuilder stack() {
+        return new StackTraceBuilder();
     }
 
-    public StackTraceElement build() {
-      return new StackTraceElement(className, methodName, fileName, lineNumber);
+    private static class StackTraceBuilder {
+
+        private String className = "mock";
+        private String methodName = "mock";
+        private String fileName = "mock";
+        private int lineNumber;
+
+        public StackTraceBuilder className(final String className) {
+            this.className = className;
+            return this;
+        }
+
+        public StackTraceBuilder methodName(final String methodName) {
+            this.methodName = methodName;
+            return this;
+        }
+
+        public StackTraceBuilder fileName(final String fileName) {
+            this.fileName = fileName;
+            return this;
+        }
+
+        public StackTraceBuilder lineNumber(final int lineNumber) {
+            this.lineNumber = lineNumber;
+            return this;
+        }
+
+        public StackTraceElement build() {
+            return new StackTraceElement(className, methodName, fileName, lineNumber);
+        }
     }
-  }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/stacktrace/StackWalkerFactoryTest.java b/internal-api/src/test/java/datadog/trace/util/stacktrace/StackWalkerFactoryTest.java
index 87c7c3bbf2c..bb62f976d03 100644
--- a/internal-api/src/test/java/datadog/trace/util/stacktrace/StackWalkerFactoryTest.java
+++ b/internal-api/src/test/java/datadog/trace/util/stacktrace/StackWalkerFactoryTest.java
@@ -6,11 +6,11 @@
 
 public class StackWalkerFactoryTest {
 
-  @Test
-  public void stackWalker_instance_must_be_enabled() {
-    // When
-    StackWalker stackWalker = StackWalkerFactory.INSTANCE;
-    // Then
-    assertTrue(stackWalker.isEnabled());
-  }
+    @Test
+    public void stackWalker_instance_must_be_enabled() {
+        // When
+        StackWalker stackWalker = StackWalkerFactory.INSTANCE;
+        // Then
+        assertTrue(stackWalker.isEnabled());
+    }
 }
diff --git a/internal-api/src/test/java/datadog/trace/util/stacktrace/StackWalkerTestUtil.java b/internal-api/src/test/java/datadog/trace/util/stacktrace/StackWalkerTestUtil.java
index 3ca823aa2d3..971085b108b 100644
--- a/internal-api/src/test/java/datadog/trace/util/stacktrace/StackWalkerTestUtil.java
+++ b/internal-api/src/test/java/datadog/trace/util/stacktrace/StackWalkerTestUtil.java
@@ -10,31 +10,28 @@
 
 public class StackWalkerTestUtil {
 
-  public static final String DD_CLASS_NAME = "datadog.trace.SynthTestClass";
+    public static final String DD_CLASS_NAME = "datadog.trace.SynthTestClass";
 
-  public static final String DD_IAST_CLASS_NAME = "com.datadog.iast.SynthTestClass";
+    public static final String DD_IAST_CLASS_NAME = "com.datadog.iast.SynthTestClass";
 
-  public static final String NOT_DD_CLASS_NAME = "external.test.SynthTestClass";
+    public static final String NOT_DD_CLASS_NAME = "external.test.SynthTestClass";
 
-  private StackWalkerTestUtil() {}
+    private StackWalkerTestUtil() {}
 
-  public static boolean isRunningJDK8WithHotSpot() {
-    try {
-      JavaLangAccess access = SharedSecrets.getJavaLangAccess();
-      return JavaVirtualMachine.isJavaVersion(8) && access != null;
-    } catch (Throwable throwable) {
-      return false;
+    public static boolean isRunningJDK8WithHotSpot() {
+        try {
+            JavaLangAccess access = SharedSecrets.getJavaLangAccess();
+            return JavaVirtualMachine.isJavaVersion(8) && access != null;
+        } catch (Throwable throwable) {
+            return false;
+        }
     }
-  }
-
-  public static List<StackTraceElement> getStackWalkFrom(
-      final StackWalker walker, final String clazz) {
-    final AtomicReference<List<StackTraceElement>> result = new AtomicReference<>();
-    AnyStackRunner.callWithinStack(
-        clazz,
-        () -> {
-          result.set(walker.walk(s -> s.collect(Collectors.toList())));
+
+    public static List<StackTraceElement> getStackWalkFrom(final StackWalker walker, final String clazz) {
+        final AtomicReference<List<StackTraceElement>> result = new AtomicReference<>();
+        AnyStackRunner.callWithinStack(clazz, () -> {
+            result.set(walker.walk(s -> s.collect(Collectors.toList())));
         });
-    return result.get();
-  }
+        return result.get();
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-agent/src/main/java/com/datadog/featureflag/FeatureFlaggingSystem.java b/products/feature-flagging/feature-flagging-agent/src/main/java/com/datadog/featureflag/FeatureFlaggingSystem.java
index 7f105d00213..92830b3bf60 100644
--- a/products/feature-flagging/feature-flagging-agent/src/main/java/com/datadog/featureflag/FeatureFlaggingSystem.java
+++ b/products/feature-flagging/feature-flagging-agent/src/main/java/com/datadog/featureflag/FeatureFlaggingSystem.java
@@ -14,200 +14,192 @@
 
 public class FeatureFlaggingSystem {
 
-  @FunctionalInterface
-  interface SystemInitializer {
-    void initialize(SharedCommunicationObjects sco, Config config);
-  }
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(FeatureFlaggingSystem.class);
-
-  private static volatile ConfigurationSourceService CONFIG_SERVICE;
-  private static volatile ExposureWriter EXPOSURE_WRITER;
-  private static volatile FlagEvaluationWriter FLAG_EVAL_WRITER;
-  private static volatile SpanEnrichmentWriter SPAN_ENRICHMENT_WRITER;
-  private static volatile FeatureFlaggingGateway.ActivationListener ACTIVATION_LISTENER;
-  private static volatile boolean STARTED;
-
-  private FeatureFlaggingSystem() {}
-
-  public static void start(final SharedCommunicationObjects sco) {
-    start(sco, FeatureFlaggingSystem::initializeSystem);
-  }
-
-  static synchronized void start(
-      final SharedCommunicationObjects sco, final SystemInitializer systemInitializer) {
-    if (STARTED) {
-      LOGGER.debug("Feature Flagging system already started");
-      return;
+    @FunctionalInterface
+    interface SystemInitializer {
+        void initialize(SharedCommunicationObjects sco, Config config);
     }
-    LOGGER.debug("Feature Flagging system starting");
-    final Config config = Config.get();
-    STARTED = true;
 
-    if (!config.isFeatureFlaggingProviderEnabled()) {
-      LOGGER.debug("Feature Flagging system disabled");
-      return;
+    private static final Logger LOGGER = LoggerFactory.getLogger(FeatureFlaggingSystem.class);
+
+    private static volatile ConfigurationSourceService CONFIG_SERVICE;
+    private static volatile ExposureWriter EXPOSURE_WRITER;
+    private static volatile FlagEvaluationWriter FLAG_EVAL_WRITER;
+    private static volatile SpanEnrichmentWriter SPAN_ENRICHMENT_WRITER;
+    private static volatile FeatureFlaggingGateway.ActivationListener ACTIVATION_LISTENER;
+    private static volatile boolean STARTED;
+
+    private FeatureFlaggingSystem() {}
+
+    public static void start(final SharedCommunicationObjects sco) {
+        start(sco, FeatureFlaggingSystem::initializeSystem);
     }
 
-    if (CONFIGURATION_SOURCE_AGENTLESS.equals(config.getFeatureFlaggingConfigurationSource())) {
-      final FeatureFlaggingGateway.ActivationListener activationListener =
-          () -> activateAgentless(sco, config, systemInitializer);
-      ACTIVATION_LISTENER = activationListener;
-      FeatureFlaggingGateway.addActivationListener(activationListener);
-      LOGGER.debug("Feature Flagging system awaiting application provider activation");
-      return;
+    static synchronized void start(final SharedCommunicationObjects sco, final SystemInitializer systemInitializer) {
+        if (STARTED) {
+            LOGGER.debug("Feature Flagging system already started");
+            return;
+        }
+        LOGGER.debug("Feature Flagging system starting");
+        final Config config = Config.get();
+        STARTED = true;
+
+        if (!config.isFeatureFlaggingProviderEnabled()) {
+            LOGGER.debug("Feature Flagging system disabled");
+            return;
+        }
+
+        if (CONFIGURATION_SOURCE_AGENTLESS.equals(config.getFeatureFlaggingConfigurationSource())) {
+            final FeatureFlaggingGateway.ActivationListener activationListener =
+                    () -> activateAgentless(sco, config, systemInitializer);
+            ACTIVATION_LISTENER = activationListener;
+            FeatureFlaggingGateway.addActivationListener(activationListener);
+            LOGGER.debug("Feature Flagging system awaiting application provider activation");
+            return;
+        }
+
+        initializeOrRollBack(sco, config, systemInitializer);
     }
 
-    initializeOrRollBack(sco, config, systemInitializer);
-  }
+    private static synchronized void activateAgentless(
+            final SharedCommunicationObjects sco, final Config config, final SystemInitializer systemInitializer) {
+        final FeatureFlaggingGateway.ActivationListener activationListener = ACTIVATION_LISTENER;
+        if (!STARTED || activationListener == null) {
+            return;
+        }
+        ACTIVATION_LISTENER = null;
+        FeatureFlaggingGateway.removeActivationListener(activationListener);
+        initializeOrRollBack(sco, config, systemInitializer);
+    }
 
-  private static synchronized void activateAgentless(
-      final SharedCommunicationObjects sco,
-      final Config config,
-      final SystemInitializer systemInitializer) {
-    final FeatureFlaggingGateway.ActivationListener activationListener = ACTIVATION_LISTENER;
-    if (!STARTED || activationListener == null) {
-      return;
+    // Any failure leaves the subsystem fully stopped: stop() releases whatever initializeSystem
+    // managed to publish before it threw, so a later start() begins from a clean state.
+    private static void initializeOrRollBack(
+            final SharedCommunicationObjects sco, final Config config, final SystemInitializer systemInitializer) {
+        try {
+            systemInitializer.initialize(sco, config);
+        } catch (final RuntimeException | Error e) {
+            stop();
+            throw e;
+        }
     }
-    ACTIVATION_LISTENER = null;
-    FeatureFlaggingGateway.removeActivationListener(activationListener);
-    initializeOrRollBack(sco, config, systemInitializer);
-  }
-
-  // Any failure leaves the subsystem fully stopped: stop() releases whatever initializeSystem
-  // managed to publish before it threw, so a later start() begins from a clean state.
-  private static void initializeOrRollBack(
-      final SharedCommunicationObjects sco,
-      final Config config,
-      final SystemInitializer systemInitializer) {
-    try {
-      systemInitializer.initialize(sco, config);
-    } catch (final RuntimeException | Error e) {
-      stop();
-      throw e;
+
+    private static void initializeSystem(final SharedCommunicationObjects sco, final Config config) {
+        final ConfigurationSourceService configService = createConfigurationSourceService(sco, config);
+        if (configService == null) {
+            LOGGER.debug("Feature Flagging system disabled by unsupported configuration source");
+            return;
+        }
+        final ExposureWriter exposureWriter = new ExposureWriterImpl(sco, config);
+        initialize(configService, exposureWriter);
+
+        final boolean evalCountsEnabled =
+                config.configProvider().getBoolean(FeatureFlaggingConfig.FLAGGING_EVALUATION_COUNTS_ENABLED, true);
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(evalCountsEnabled);
+        if (evalCountsEnabled) {
+            final FlagEvaluationWriterImpl evalWriter = new FlagEvaluationWriterImpl(sco, config);
+            // Publish before start() so a failed start is still reachable by the rollback in stop().
+            FLAG_EVAL_WRITER = evalWriter;
+            evalWriter.start();
+            LOGGER.debug("Flag evaluation EVP writer started");
+        } else {
+            FeatureFlaggingGateway.setFlagEvalWriter(null);
+            LOGGER.debug(
+                    "Flag evaluation EVP writer disabled ({}=false)",
+                    FeatureFlaggingConfig.FLAGGING_EVALUATION_COUNTS_ENABLED);
+        }
+
+        // APM span enrichment: agent-side listener for flag-evaluation seam events. Uses the process-
+        // wide singleton so a subsystem restart reuses the one already-registered trace interceptor
+        // (which the tracer cannot remove) instead of registering a second, rejected one. Cheap: it
+        // only accumulates once the provider's gate-on capture hook dispatches events, and registers
+        // its interceptor lazily on the first such event.
+        SPAN_ENRICHMENT_WRITER = SpanEnrichmentWriter.getInstance();
+        SPAN_ENRICHMENT_WRITER.init();
+
+        LOGGER.debug("Feature Flagging system started");
     }
-  }
 
-  private static void initializeSystem(final SharedCommunicationObjects sco, final Config config) {
-    final ConfigurationSourceService configService = createConfigurationSourceService(sco, config);
-    if (configService == null) {
-      LOGGER.debug("Feature Flagging system disabled by unsupported configuration source");
-      return;
+    static void initialize(final ConfigurationSourceService configService, final ExposureWriter exposureWriter) {
+        try {
+            if (configService != null) {
+                configService.init();
+            }
+            exposureWriter.init();
+            CONFIG_SERVICE = configService;
+            EXPOSURE_WRITER = exposureWriter;
+        } catch (final RuntimeException | Error e) {
+            try {
+                exposureWriter.close();
+            } finally {
+                if (configService != null) {
+                    configService.close();
+                }
+            }
+            throw e;
+        }
     }
-    final ExposureWriter exposureWriter = new ExposureWriterImpl(sco, config);
-    initialize(configService, exposureWriter);
-
-    final boolean evalCountsEnabled =
-        config
-            .configProvider()
-            .getBoolean(FeatureFlaggingConfig.FLAGGING_EVALUATION_COUNTS_ENABLED, true);
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(evalCountsEnabled);
-    if (evalCountsEnabled) {
-      final FlagEvaluationWriterImpl evalWriter = new FlagEvaluationWriterImpl(sco, config);
-      // Publish before start() so a failed start is still reachable by the rollback in stop().
-      FLAG_EVAL_WRITER = evalWriter;
-      evalWriter.start();
-      LOGGER.debug("Flag evaluation EVP writer started");
-    } else {
-      FeatureFlaggingGateway.setFlagEvalWriter(null);
-      LOGGER.debug(
-          "Flag evaluation EVP writer disabled ({}=false)",
-          FeatureFlaggingConfig.FLAGGING_EVALUATION_COUNTS_ENABLED);
+
+    static ConfigurationSourceService createConfigurationSourceService(
+            final SharedCommunicationObjects sco, final Config config) {
+        final String configurationSource = config.getFeatureFlaggingConfigurationSource();
+        if (CONFIGURATION_SOURCE_REMOTE_CONFIG.equals(configurationSource)) {
+            if (!config.isRemoteConfigEnabled()) {
+                throw new IllegalStateException("Feature Flagging system started without RC");
+            }
+            return new RemoteConfigServiceImpl(sco, config);
+        }
+        if (CONFIGURATION_SOURCE_AGENTLESS.equals(configurationSource)) {
+            return new AgentlessConfigurationSource(config);
+        }
+        return null;
     }
 
-    // APM span enrichment: agent-side listener for flag-evaluation seam events. Uses the process-
-    // wide singleton so a subsystem restart reuses the one already-registered trace interceptor
-    // (which the tracer cannot remove) instead of registering a second, rejected one. Cheap: it
-    // only accumulates once the provider's gate-on capture hook dispatches events, and registers
-    // its interceptor lazily on the first such event.
-    SPAN_ENRICHMENT_WRITER = SpanEnrichmentWriter.getInstance();
-    SPAN_ENRICHMENT_WRITER.init();
-
-    LOGGER.debug("Feature Flagging system started");
-  }
-
-  static void initialize(
-      final ConfigurationSourceService configService, final ExposureWriter exposureWriter) {
-    try {
-      if (configService != null) {
-        configService.init();
-      }
-      exposureWriter.init();
-      CONFIG_SERVICE = configService;
-      EXPOSURE_WRITER = exposureWriter;
-    } catch (final RuntimeException | Error e) {
-      try {
-        exposureWriter.close();
-      } finally {
-        if (configService != null) {
-          configService.close();
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification =
+                    "Agent-internal class; Class object does not escape to app code and lock only guards the subsystem lifecycle.")
+    public static synchronized void stop() {
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(false);
+        FeatureFlaggingGateway.setFlagEvalWriter(null);
+        final FeatureFlaggingGateway.ActivationListener activationListener = ACTIVATION_LISTENER;
+        final FlagEvaluationWriter flagEvalWriter = FLAG_EVAL_WRITER;
+        final SpanEnrichmentWriter spanEnrichmentWriter = SPAN_ENRICHMENT_WRITER;
+        final ExposureWriter exposureWriter = EXPOSURE_WRITER;
+        final ConfigurationSourceService configService = CONFIG_SERVICE;
+        STARTED = false;
+        ACTIVATION_LISTENER = null;
+        FLAG_EVAL_WRITER = null;
+        SPAN_ENRICHMENT_WRITER = null;
+        EXPOSURE_WRITER = null;
+        CONFIG_SERVICE = null;
+        if (activationListener != null) {
+            FeatureFlaggingGateway.removeActivationListener(activationListener);
         }
-      }
-      throw e;
+        closeQuietly(flagEvalWriter);
+        closeQuietly(spanEnrichmentWriter);
+        closeQuietly(exposureWriter);
+        closeQuietly(configService);
+        LOGGER.debug("Feature Flagging system stopped");
     }
-  }
-
-  static ConfigurationSourceService createConfigurationSourceService(
-      final SharedCommunicationObjects sco, final Config config) {
-    final String configurationSource = config.getFeatureFlaggingConfigurationSource();
-    if (CONFIGURATION_SOURCE_REMOTE_CONFIG.equals(configurationSource)) {
-      if (!config.isRemoteConfigEnabled()) {
-        throw new IllegalStateException("Feature Flagging system started without RC");
-      }
-      return new RemoteConfigServiceImpl(sco, config);
+
+    static boolean isAwaitingApplicationActivation() {
+        return ACTIVATION_LISTENER != null;
     }
-    if (CONFIGURATION_SOURCE_AGENTLESS.equals(configurationSource)) {
-      return new AgentlessConfigurationSource(config);
+
+    static boolean isExposureWriterStarted() {
+        return EXPOSURE_WRITER != null;
     }
-    return null;
-  }
-
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification =
-          "Agent-internal class; Class object does not escape to app code and lock only guards the subsystem lifecycle.")
-  public static synchronized void stop() {
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(false);
-    FeatureFlaggingGateway.setFlagEvalWriter(null);
-    final FeatureFlaggingGateway.ActivationListener activationListener = ACTIVATION_LISTENER;
-    final FlagEvaluationWriter flagEvalWriter = FLAG_EVAL_WRITER;
-    final SpanEnrichmentWriter spanEnrichmentWriter = SPAN_ENRICHMENT_WRITER;
-    final ExposureWriter exposureWriter = EXPOSURE_WRITER;
-    final ConfigurationSourceService configService = CONFIG_SERVICE;
-    STARTED = false;
-    ACTIVATION_LISTENER = null;
-    FLAG_EVAL_WRITER = null;
-    SPAN_ENRICHMENT_WRITER = null;
-    EXPOSURE_WRITER = null;
-    CONFIG_SERVICE = null;
-    if (activationListener != null) {
-      FeatureFlaggingGateway.removeActivationListener(activationListener);
+
+    static boolean isConfigurationSourceStarted() {
+        return CONFIG_SERVICE != null;
     }
-    closeQuietly(flagEvalWriter);
-    closeQuietly(spanEnrichmentWriter);
-    closeQuietly(exposureWriter);
-    closeQuietly(configService);
-    LOGGER.debug("Feature Flagging system stopped");
-  }
-
-  static boolean isAwaitingApplicationActivation() {
-    return ACTIVATION_LISTENER != null;
-  }
-
-  static boolean isExposureWriterStarted() {
-    return EXPOSURE_WRITER != null;
-  }
-
-  static boolean isConfigurationSourceStarted() {
-    return CONFIG_SERVICE != null;
-  }
-
-  private static void closeQuietly(final AutoCloseable resource) {
-    if (resource != null) {
-      try {
-        resource.close();
-      } catch (Exception ignored) {
-      }
+
+    private static void closeQuietly(final AutoCloseable resource) {
+        if (resource != null) {
+            try {
+                resource.close();
+            } catch (Exception ignored) {
+            }
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-agent/src/test/java/com/datadog/featureflag/FeatureFlaggingSystemTest.java b/products/feature-flagging/feature-flagging-agent/src/test/java/com/datadog/featureflag/FeatureFlaggingSystemTest.java
index 5b88389aefc..77aafb52bee 100644
--- a/products/feature-flagging/feature-flagging-agent/src/test/java/com/datadog/featureflag/FeatureFlaggingSystemTest.java
+++ b/products/feature-flagging/feature-flagging-agent/src/test/java/com/datadog/featureflag/FeatureFlaggingSystemTest.java
@@ -37,368 +37,355 @@
 import org.junit.jupiter.api.Test;
 
 class FeatureFlaggingSystemTest {
-  @AfterEach
-  void resetFlagEvaluationGateway() {
-    FeatureFlaggingSystem.stop();
-    FeatureFlaggingGateway.setFlagEvalWriter(null);
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
-  }
-
-  @Test
-  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "agentless")
-  @WithConfig(
-      key = FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL,
-      value = "http://127.0.0.1:1")
-  void agentlessStartWaitsForApplicationProviderActivationWithoutPreparingDelivery() {
-    SharedCommunicationObjects sharedCommunicationObjects = sharedCommunicationObjects();
-    clearInvocations(sharedCommunicationObjects);
-
-    try {
-      FeatureFlaggingSystem.start(sharedCommunicationObjects);
-
-      assertTrue(FeatureFlaggingSystem.isAwaitingApplicationActivation());
-      assertFalse(FeatureFlaggingSystem.isExposureWriterStarted());
-      assertFalse(FeatureFlaggingSystem.isConfigurationSourceStarted());
-      verifyNoInteractions(sharedCommunicationObjects);
-    } finally {
-      FeatureFlaggingSystem.stop();
+    @AfterEach
+    void resetFlagEvaluationGateway() {
+        FeatureFlaggingSystem.stop();
+        FeatureFlaggingGateway.setFlagEvalWriter(null);
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
     }
 
-    assertFalse(FeatureFlaggingSystem.isAwaitingApplicationActivation());
-    assertFalse(FeatureFlaggingSystem.isExposureWriterStarted());
-    assertFalse(FeatureFlaggingSystem.isConfigurationSourceStarted());
-  }
-
-  @Test
-  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "agentless")
-  void agentlessActivationInitializesSystemOnce() {
-    final SharedCommunicationObjects sharedCommunicationObjects = sharedCommunicationObjects();
-    final FeatureFlaggingSystem.SystemInitializer systemInitializer =
-        mock(FeatureFlaggingSystem.SystemInitializer.class);
-
-    FeatureFlaggingSystem.start(sharedCommunicationObjects, systemInitializer);
-
-    verifyNoInteractions(systemInitializer);
-    assertTrue(FeatureFlaggingSystem.isAwaitingApplicationActivation());
-
-    FeatureFlaggingGateway.activate();
-    FeatureFlaggingGateway.activate();
-
-    verify(systemInitializer).initialize(eq(sharedCommunicationObjects), any(Config.class));
-    assertFalse(FeatureFlaggingSystem.isAwaitingApplicationActivation());
-  }
-
-  @Test
-  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "agentless")
-  void agentlessInitializationFailureCleansUpAndAllowsRetry() {
-    final SharedCommunicationObjects sharedCommunicationObjects = sharedCommunicationObjects();
-    final FeatureFlaggingSystem.SystemInitializer failedInitializer =
-        mock(FeatureFlaggingSystem.SystemInitializer.class);
-    final IllegalStateException initializationFailure =
-        new IllegalStateException("system initialization failed");
-    doThrow(initializationFailure)
-        .when(failedInitializer)
-        .initialize(any(SharedCommunicationObjects.class), any(Config.class));
-
-    FeatureFlaggingSystem.start(sharedCommunicationObjects, failedInitializer);
-
-    final IllegalStateException thrown =
-        assertThrows(IllegalStateException.class, FeatureFlaggingGateway::activate);
-
-    assertSame(initializationFailure, thrown);
-    assertFalse(FeatureFlaggingSystem.isAwaitingApplicationActivation());
-    assertFalse(FeatureFlaggingSystem.isExposureWriterStarted());
-    assertFalse(FeatureFlaggingSystem.isConfigurationSourceStarted());
-
-    final FeatureFlaggingSystem.SystemInitializer retryInitializer =
-        mock(FeatureFlaggingSystem.SystemInitializer.class);
-    FeatureFlaggingSystem.start(sharedCommunicationObjects, retryInitializer);
-    FeatureFlaggingGateway.activate();
-
-    verify(retryInitializer).initialize(eq(sharedCommunicationObjects), any(Config.class));
-  }
-
-  @Test
-  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "agentless")
-  @WithConfig(
-      key = FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL,
-      value = "http://127.0.0.1:1")
-  void agentlessStopRemovesPendingApplicationProviderActivation() {
-    SharedCommunicationObjects sharedCommunicationObjects = sharedCommunicationObjects();
-    clearInvocations(sharedCommunicationObjects);
-
-    try {
-      FeatureFlaggingSystem.start(sharedCommunicationObjects);
-      assertTrue(FeatureFlaggingSystem.isAwaitingApplicationActivation());
-
-      FeatureFlaggingSystem.stop();
-      clearInvocations(sharedCommunicationObjects);
-      FeatureFlaggingGateway.activate();
-
-      assertFalse(FeatureFlaggingSystem.isAwaitingApplicationActivation());
-      verifyNoInteractions(sharedCommunicationObjects);
-    } finally {
-      FeatureFlaggingSystem.stop();
+    @Test
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "agentless")
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL, value = "http://127.0.0.1:1")
+    void agentlessStartWaitsForApplicationProviderActivationWithoutPreparingDelivery() {
+        SharedCommunicationObjects sharedCommunicationObjects = sharedCommunicationObjects();
+        clearInvocations(sharedCommunicationObjects);
+
+        try {
+            FeatureFlaggingSystem.start(sharedCommunicationObjects);
+
+            assertTrue(FeatureFlaggingSystem.isAwaitingApplicationActivation());
+            assertFalse(FeatureFlaggingSystem.isExposureWriterStarted());
+            assertFalse(FeatureFlaggingSystem.isConfigurationSourceStarted());
+            verifyNoInteractions(sharedCommunicationObjects);
+        } finally {
+            FeatureFlaggingSystem.stop();
+        }
+
+        assertFalse(FeatureFlaggingSystem.isAwaitingApplicationActivation());
+        assertFalse(FeatureFlaggingSystem.isExposureWriterStarted());
+        assertFalse(FeatureFlaggingSystem.isConfigurationSourceStarted());
     }
-  }
-
-  @Test
-  @WithConfig(key = FeatureFlaggingConfig.FLAGGING_EVALUATION_COUNTS_ENABLED, value = "true")
-  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "remote_config")
-  @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "true")
-  void testFeatureFlagSystemInitialization() {
-    ConfigurationPoller poller = mock(ConfigurationPoller.class);
-    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-    SharedCommunicationObjects sharedCommunicationObjects = mock(SharedCommunicationObjects.class);
-    when(discovery.supportsEvpProxy()).thenReturn(true);
-    when(discovery.getEvpProxyEndpoint()).thenReturn("/evp_proxy/");
-    when(sharedCommunicationObjects.configurationPoller(any(Config.class))).thenReturn(poller);
-    when(sharedCommunicationObjects.featuresDiscovery(any(Config.class))).thenReturn(discovery);
-    sharedCommunicationObjects.agentUrl = HttpUrl.get("http://localhost");
-    sharedCommunicationObjects.agentHttpClient = new OkHttpClient.Builder().build();
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(false);
-
-    FeatureFlaggingSystem.start(sharedCommunicationObjects);
-    FeatureFlaggingSystem.start(sharedCommunicationObjects);
-
-    verify(poller).addCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES);
-    verify(poller).addListener(eq(Product.FFE_FLAGS), any(ConfigurationDeserializer.class), any());
-    verify(poller).start();
-    assertTrue(FeatureFlaggingGateway.isFlagEvaluationEnqueueEnabled());
-    assertNotNull(FeatureFlaggingGateway.getFlagEvalWriter());
-
-    FeatureFlaggingSystem.stop();
-    assertFalse(FeatureFlaggingGateway.isFlagEvaluationEnqueueEnabled());
-    assertNull(FeatureFlaggingGateway.getFlagEvalWriter());
-    // stop() is idempotent: a second call must be a safe no-op.
-    FeatureFlaggingSystem.stop();
-
-    verify(poller).removeCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES);
-    verify(poller).removeListeners(Product.FFE_FLAGS);
-    verify(poller).stop();
-  }
-
-  @Test
-  @WithConfig(key = FeatureFlaggingConfig.FLAGGING_EVALUATION_COUNTS_ENABLED, value = "false")
-  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "agentless")
-  @WithConfig(
-      key = FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL,
-      value = "http://localhost:1/config")
-  void testFlagEvaluationWriterCanBeDisabled() {
-    SharedCommunicationObjects sharedCommunicationObjects = sharedCommunicationObjects();
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
-    FeatureFlaggingGateway.setFlagEvalWriter(mock(FlagEvaluationWriter.class));
-
-    try {
-      FeatureFlaggingSystem.start(sharedCommunicationObjects);
-      // Agentless defers initialization until the application provider activates.
-      FeatureFlaggingGateway.activate();
-
-      assertFalse(FeatureFlaggingGateway.isFlagEvaluationEnqueueEnabled());
-      assertNull(FeatureFlaggingGateway.getFlagEvalWriter());
-    } finally {
-      FeatureFlaggingSystem.stop();
+
+    @Test
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "agentless")
+    void agentlessActivationInitializesSystemOnce() {
+        final SharedCommunicationObjects sharedCommunicationObjects = sharedCommunicationObjects();
+        final FeatureFlaggingSystem.SystemInitializer systemInitializer =
+                mock(FeatureFlaggingSystem.SystemInitializer.class);
+
+        FeatureFlaggingSystem.start(sharedCommunicationObjects, systemInitializer);
+
+        verifyNoInteractions(systemInitializer);
+        assertTrue(FeatureFlaggingSystem.isAwaitingApplicationActivation());
+
+        FeatureFlaggingGateway.activate();
+        FeatureFlaggingGateway.activate();
+
+        verify(systemInitializer).initialize(eq(sharedCommunicationObjects), any(Config.class));
+        assertFalse(FeatureFlaggingSystem.isAwaitingApplicationActivation());
+    }
+
+    @Test
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "agentless")
+    void agentlessInitializationFailureCleansUpAndAllowsRetry() {
+        final SharedCommunicationObjects sharedCommunicationObjects = sharedCommunicationObjects();
+        final FeatureFlaggingSystem.SystemInitializer failedInitializer =
+                mock(FeatureFlaggingSystem.SystemInitializer.class);
+        final IllegalStateException initializationFailure = new IllegalStateException("system initialization failed");
+        doThrow(initializationFailure)
+                .when(failedInitializer)
+                .initialize(any(SharedCommunicationObjects.class), any(Config.class));
+
+        FeatureFlaggingSystem.start(sharedCommunicationObjects, failedInitializer);
+
+        final IllegalStateException thrown =
+                assertThrows(IllegalStateException.class, FeatureFlaggingGateway::activate);
+
+        assertSame(initializationFailure, thrown);
+        assertFalse(FeatureFlaggingSystem.isAwaitingApplicationActivation());
+        assertFalse(FeatureFlaggingSystem.isExposureWriterStarted());
+        assertFalse(FeatureFlaggingSystem.isConfigurationSourceStarted());
+
+        final FeatureFlaggingSystem.SystemInitializer retryInitializer =
+                mock(FeatureFlaggingSystem.SystemInitializer.class);
+        FeatureFlaggingSystem.start(sharedCommunicationObjects, retryInitializer);
+        FeatureFlaggingGateway.activate();
+
+        verify(retryInitializer).initialize(eq(sharedCommunicationObjects), any(Config.class));
+    }
+
+    @Test
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "agentless")
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL, value = "http://127.0.0.1:1")
+    void agentlessStopRemovesPendingApplicationProviderActivation() {
+        SharedCommunicationObjects sharedCommunicationObjects = sharedCommunicationObjects();
+        clearInvocations(sharedCommunicationObjects);
+
+        try {
+            FeatureFlaggingSystem.start(sharedCommunicationObjects);
+            assertTrue(FeatureFlaggingSystem.isAwaitingApplicationActivation());
+
+            FeatureFlaggingSystem.stop();
+            clearInvocations(sharedCommunicationObjects);
+            FeatureFlaggingGateway.activate();
+
+            assertFalse(FeatureFlaggingSystem.isAwaitingApplicationActivation());
+            verifyNoInteractions(sharedCommunicationObjects);
+        } finally {
+            FeatureFlaggingSystem.stop();
+        }
+    }
+
+    @Test
+    @WithConfig(key = FeatureFlaggingConfig.FLAGGING_EVALUATION_COUNTS_ENABLED, value = "true")
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "remote_config")
+    @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "true")
+    void testFeatureFlagSystemInitialization() {
+        ConfigurationPoller poller = mock(ConfigurationPoller.class);
+        DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+        SharedCommunicationObjects sharedCommunicationObjects = mock(SharedCommunicationObjects.class);
+        when(discovery.supportsEvpProxy()).thenReturn(true);
+        when(discovery.getEvpProxyEndpoint()).thenReturn("/evp_proxy/");
+        when(sharedCommunicationObjects.configurationPoller(any(Config.class))).thenReturn(poller);
+        when(sharedCommunicationObjects.featuresDiscovery(any(Config.class))).thenReturn(discovery);
+        sharedCommunicationObjects.agentUrl = HttpUrl.get("http://localhost");
+        sharedCommunicationObjects.agentHttpClient = new OkHttpClient.Builder().build();
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(false);
+
+        FeatureFlaggingSystem.start(sharedCommunicationObjects);
+        FeatureFlaggingSystem.start(sharedCommunicationObjects);
+
+        verify(poller).addCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES);
+        verify(poller).addListener(eq(Product.FFE_FLAGS), any(ConfigurationDeserializer.class), any());
+        verify(poller).start();
+        assertTrue(FeatureFlaggingGateway.isFlagEvaluationEnqueueEnabled());
+        assertNotNull(FeatureFlaggingGateway.getFlagEvalWriter());
+
+        FeatureFlaggingSystem.stop();
+        assertFalse(FeatureFlaggingGateway.isFlagEvaluationEnqueueEnabled());
+        assertNull(FeatureFlaggingGateway.getFlagEvalWriter());
+        // stop() is idempotent: a second call must be a safe no-op.
+        FeatureFlaggingSystem.stop();
+
+        verify(poller).removeCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES);
+        verify(poller).removeListeners(Product.FFE_FLAGS);
+        verify(poller).stop();
+    }
+
+    @Test
+    @WithConfig(key = FeatureFlaggingConfig.FLAGGING_EVALUATION_COUNTS_ENABLED, value = "false")
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "agentless")
+    @WithConfig(
+            key = FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL,
+            value = "http://localhost:1/config")
+    void testFlagEvaluationWriterCanBeDisabled() {
+        SharedCommunicationObjects sharedCommunicationObjects = sharedCommunicationObjects();
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
+        FeatureFlaggingGateway.setFlagEvalWriter(mock(FlagEvaluationWriter.class));
+
+        try {
+            FeatureFlaggingSystem.start(sharedCommunicationObjects);
+            // Agentless defers initialization until the application provider activates.
+            FeatureFlaggingGateway.activate();
+
+            assertFalse(FeatureFlaggingGateway.isFlagEvaluationEnqueueEnabled());
+            assertNull(FeatureFlaggingGateway.getFlagEvalWriter());
+        } finally {
+            FeatureFlaggingSystem.stop();
+        }
+    }
+
+    @Test
+    void testFeatureFlagSystemShutdownClearsGatewayState() {
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
+        FeatureFlaggingGateway.setFlagEvalWriter(mock(FlagEvaluationWriter.class));
+
+        FeatureFlaggingSystem.stop();
+
+        assertFalse(FeatureFlaggingGateway.isFlagEvaluationEnqueueEnabled());
+        assertNull(FeatureFlaggingGateway.getFlagEvalWriter());
+    }
+
+    @Test
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "remote_config")
+    @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "false")
+    void failedStartRollsBackPartiallyInitializedState() {
+        SharedCommunicationObjects sharedCommunicationObjects = mock(SharedCommunicationObjects.class);
+
+        assertThrows(IllegalStateException.class, () -> FeatureFlaggingSystem.start(sharedCommunicationObjects));
+
+        // A failed start must leave nothing behind: no listener awaiting activation, no gateway
+        // writer, and STARTED cleared so a later start() is not swallowed as "already started".
+        assertFalse(FeatureFlaggingSystem.isAwaitingApplicationActivation());
+        assertNull(FeatureFlaggingGateway.getFlagEvalWriter());
+        assertFalse(FeatureFlaggingGateway.isFlagEvaluationEnqueueEnabled());
+        assertThrows(IllegalStateException.class, () -> FeatureFlaggingSystem.start(sharedCommunicationObjects));
+    }
+
+    @Test
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "remote_config")
+    @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "false")
+    void testThatRemoteConfigIsRequired() {
+        SharedCommunicationObjects sharedCommunicationObjects = mock(SharedCommunicationObjects.class);
+
+        try {
+            assertThrows(IllegalStateException.class, () -> FeatureFlaggingSystem.start(sharedCommunicationObjects));
+        } finally {
+            FeatureFlaggingSystem.stop();
+        }
+    }
+
+    @Test
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "agentless")
+    @WithConfig(
+            key = FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL,
+            value = "http://localhost:1/config")
+    @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "false")
+    void agentlessConfigurationSourceUsesHttpServiceWithoutRemoteConfig() {
+        assertInstanceOf(
+                AgentlessConfigurationSource.class,
+                FeatureFlaggingSystem.createConfigurationSourceService(sharedCommunicationObjects(), Config.get()));
     }
-  }
-
-  @Test
-  void testFeatureFlagSystemShutdownClearsGatewayState() {
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
-    FeatureFlaggingGateway.setFlagEvalWriter(mock(FlagEvaluationWriter.class));
-
-    FeatureFlaggingSystem.stop();
-
-    assertFalse(FeatureFlaggingGateway.isFlagEvaluationEnqueueEnabled());
-    assertNull(FeatureFlaggingGateway.getFlagEvalWriter());
-  }
-
-  @Test
-  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "remote_config")
-  @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "false")
-  void failedStartRollsBackPartiallyInitializedState() {
-    SharedCommunicationObjects sharedCommunicationObjects = mock(SharedCommunicationObjects.class);
-
-    assertThrows(
-        IllegalStateException.class, () -> FeatureFlaggingSystem.start(sharedCommunicationObjects));
-
-    // A failed start must leave nothing behind: no listener awaiting activation, no gateway
-    // writer, and STARTED cleared so a later start() is not swallowed as "already started".
-    assertFalse(FeatureFlaggingSystem.isAwaitingApplicationActivation());
-    assertNull(FeatureFlaggingGateway.getFlagEvalWriter());
-    assertFalse(FeatureFlaggingGateway.isFlagEvaluationEnqueueEnabled());
-    assertThrows(
-        IllegalStateException.class, () -> FeatureFlaggingSystem.start(sharedCommunicationObjects));
-  }
-
-  @Test
-  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "remote_config")
-  @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "false")
-  void testThatRemoteConfigIsRequired() {
-    SharedCommunicationObjects sharedCommunicationObjects = mock(SharedCommunicationObjects.class);
-
-    try {
-      assertThrows(
-          IllegalStateException.class,
-          () -> FeatureFlaggingSystem.start(sharedCommunicationObjects));
-    } finally {
-      FeatureFlaggingSystem.stop();
+
+    @Test
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "agentless")
+    @WithConfig(
+            key = FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL,
+            value = "http://localhost:1/config")
+    @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "false")
+    @WithConfig(key = FeatureFlaggingConfig.FLAGGING_EVALUATION_COUNTS_ENABLED, value = "true")
+    void agentlessConfigurationSourceStartsTelemetryWritersWithoutRemoteConfig() {
+        try {
+            FeatureFlaggingSystem.start(sharedCommunicationObjects());
+            // Agentless defers initialization until the application provider activates.
+            FeatureFlaggingGateway.activate();
+
+            assertTrue(FeatureFlaggingSystem.isExposureWriterStarted());
+            assertTrue(FeatureFlaggingSystem.isConfigurationSourceStarted());
+            assertTrue(FeatureFlaggingGateway.isFlagEvaluationEnqueueEnabled());
+            assertNotNull(FeatureFlaggingGateway.getFlagEvalWriter());
+        } finally {
+            FeatureFlaggingSystem.stop();
+        }
     }
-  }
-
-  @Test
-  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "agentless")
-  @WithConfig(
-      key = FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL,
-      value = "http://localhost:1/config")
-  @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "false")
-  void agentlessConfigurationSourceUsesHttpServiceWithoutRemoteConfig() {
-    assertInstanceOf(
-        AgentlessConfigurationSource.class,
-        FeatureFlaggingSystem.createConfigurationSourceService(
-            sharedCommunicationObjects(), Config.get()));
-  }
-
-  @Test
-  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "agentless")
-  @WithConfig(
-      key = FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL,
-      value = "http://localhost:1/config")
-  @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "false")
-  @WithConfig(key = FeatureFlaggingConfig.FLAGGING_EVALUATION_COUNTS_ENABLED, value = "true")
-  void agentlessConfigurationSourceStartsTelemetryWritersWithoutRemoteConfig() {
-    try {
-      FeatureFlaggingSystem.start(sharedCommunicationObjects());
-      // Agentless defers initialization until the application provider activates.
-      FeatureFlaggingGateway.activate();
-
-      assertTrue(FeatureFlaggingSystem.isExposureWriterStarted());
-      assertTrue(FeatureFlaggingSystem.isConfigurationSourceStarted());
-      assertTrue(FeatureFlaggingGateway.isFlagEvaluationEnqueueEnabled());
-      assertNotNull(FeatureFlaggingGateway.getFlagEvalWriter());
-    } finally {
-      FeatureFlaggingSystem.stop();
+
+    @Test
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "remote_config")
+    @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "true")
+    void explicitRemoteConfigUsesRemoteConfigService() {
+        SharedCommunicationObjects sharedCommunicationObjects = sharedCommunicationObjects();
+        when(sharedCommunicationObjects.configurationPoller(any(Config.class)))
+                .thenReturn(mock(ConfigurationPoller.class));
+
+        assertInstanceOf(
+                RemoteConfigServiceImpl.class,
+                FeatureFlaggingSystem.createConfigurationSourceService(sharedCommunicationObjects, Config.get()));
     }
-  }
-
-  @Test
-  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "remote_config")
-  @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "true")
-  void explicitRemoteConfigUsesRemoteConfigService() {
-    SharedCommunicationObjects sharedCommunicationObjects = sharedCommunicationObjects();
-    when(sharedCommunicationObjects.configurationPoller(any(Config.class)))
-        .thenReturn(mock(ConfigurationPoller.class));
-
-    assertInstanceOf(
-        RemoteConfigServiceImpl.class,
-        FeatureFlaggingSystem.createConfigurationSourceService(
-            sharedCommunicationObjects, Config.get()));
-  }
-
-  @Test
-  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "offline")
-  void offlineConfigurationSourceDoesNotStartNetworkSource() {
-    assertNull(
-        FeatureFlaggingSystem.createConfigurationSourceService(
-            sharedCommunicationObjects(), Config.get()));
-  }
-
-  @Test
-  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "invalid")
-  void invalidConfigurationSourceDoesNotStartNetworkSource() {
-    assertNull(
-        FeatureFlaggingSystem.createConfigurationSourceService(
-            sharedCommunicationObjects(), Config.get()));
-  }
-
-  @Test
-  void unsupportedNormalizedConfigurationSourceDoesNotStartNetworkSource() {
-    Config config = mock(Config.class);
-    when(config.getFeatureFlaggingConfigurationSource()).thenReturn("invalid");
-
-    assertNull(
-        FeatureFlaggingSystem.createConfigurationSourceService(
-            sharedCommunicationObjects(), config));
-  }
-
-  @Test
-  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "offline")
-  void startWithOfflineConfigurationSourceDisablesSystem() {
-    SharedCommunicationObjects sharedCommunicationObjects = mock(SharedCommunicationObjects.class);
-
-    try {
-      assertDoesNotThrow(() -> FeatureFlaggingSystem.start(sharedCommunicationObjects));
-      verifyNoInteractions(sharedCommunicationObjects);
-    } finally {
-      FeatureFlaggingSystem.stop();
+
+    @Test
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "offline")
+    void offlineConfigurationSourceDoesNotStartNetworkSource() {
+        assertNull(FeatureFlaggingSystem.createConfigurationSourceService(sharedCommunicationObjects(), Config.get()));
     }
-  }
-
-  @Test
-  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "invalid")
-  void startWithInvalidConfigurationSourceDisablesSystem() {
-    SharedCommunicationObjects sharedCommunicationObjects = mock(SharedCommunicationObjects.class);
-
-    try {
-      assertDoesNotThrow(() -> FeatureFlaggingSystem.start(sharedCommunicationObjects));
-      verifyNoInteractions(sharedCommunicationObjects);
-    } finally {
-      FeatureFlaggingSystem.stop();
+
+    @Test
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "invalid")
+    void invalidConfigurationSourceDoesNotStartNetworkSource() {
+        assertNull(FeatureFlaggingSystem.createConfigurationSourceService(sharedCommunicationObjects(), Config.get()));
+    }
+
+    @Test
+    void unsupportedNormalizedConfigurationSourceDoesNotStartNetworkSource() {
+        Config config = mock(Config.class);
+        when(config.getFeatureFlaggingConfigurationSource()).thenReturn("invalid");
+
+        assertNull(FeatureFlaggingSystem.createConfigurationSourceService(sharedCommunicationObjects(), config));
+    }
+
+    @Test
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "offline")
+    void startWithOfflineConfigurationSourceDisablesSystem() {
+        SharedCommunicationObjects sharedCommunicationObjects = mock(SharedCommunicationObjects.class);
+
+        try {
+            assertDoesNotThrow(() -> FeatureFlaggingSystem.start(sharedCommunicationObjects));
+            verifyNoInteractions(sharedCommunicationObjects);
+        } finally {
+            FeatureFlaggingSystem.stop();
+        }
+    }
+
+    @Test
+    @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "invalid")
+    void startWithInvalidConfigurationSourceDisablesSystem() {
+        SharedCommunicationObjects sharedCommunicationObjects = mock(SharedCommunicationObjects.class);
+
+        try {
+            assertDoesNotThrow(() -> FeatureFlaggingSystem.start(sharedCommunicationObjects));
+            verifyNoInteractions(sharedCommunicationObjects);
+        } finally {
+            FeatureFlaggingSystem.stop();
+        }
+    }
+
+    @Test
+    void initializationFailureClosesConfigurationSourceAndExposureWriter() {
+        ConfigurationSourceService configService = mock(ConfigurationSourceService.class);
+        ExposureWriter exposureWriter = mock(ExposureWriter.class);
+        doThrow(new IllegalStateException("exposure init failed"))
+                .when(exposureWriter)
+                .init();
+
+        assertThrows(
+                IllegalStateException.class, () -> FeatureFlaggingSystem.initialize(configService, exposureWriter));
+
+        verify(configService).init();
+        verify(configService).close();
+        verify(exposureWriter).close();
+    }
+
+    @Test
+    void initializationFailureWithoutConfigurationSourceClosesExposureWriter() {
+        ExposureWriter exposureWriter = mock(ExposureWriter.class);
+        doThrow(new IllegalStateException("exposure init failed"))
+                .when(exposureWriter)
+                .init();
+
+        assertThrows(IllegalStateException.class, () -> FeatureFlaggingSystem.initialize(null, exposureWriter));
+
+        verify(exposureWriter).close();
+    }
+
+    @Test
+    void initializationFailureClosesConfigurationSourceWhenExposureWriterCloseFails() {
+        ConfigurationSourceService configService = mock(ConfigurationSourceService.class);
+        ExposureWriter exposureWriter = mock(ExposureWriter.class);
+        doThrow(new IllegalStateException("exposure init failed"))
+                .when(exposureWriter)
+                .init();
+        doThrow(new IllegalArgumentException("exposure close failed"))
+                .when(exposureWriter)
+                .close();
+
+        assertThrows(
+                IllegalArgumentException.class, () -> FeatureFlaggingSystem.initialize(configService, exposureWriter));
+
+        verify(configService).close();
+    }
+
+    private static SharedCommunicationObjects sharedCommunicationObjects() {
+        DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+        when(discovery.supportsEvpProxy()).thenReturn(true);
+        when(discovery.getEvpProxyEndpoint()).thenReturn("/evp_proxy/");
+        return sharedCommunicationObjects(discovery);
+    }
+
+    private static SharedCommunicationObjects sharedCommunicationObjects(final DDAgentFeaturesDiscovery discovery) {
+        SharedCommunicationObjects sharedCommunicationObjects = mock(SharedCommunicationObjects.class);
+        when(sharedCommunicationObjects.featuresDiscovery(any(Config.class))).thenReturn(discovery);
+        sharedCommunicationObjects.agentUrl = HttpUrl.get("http://localhost");
+        sharedCommunicationObjects.agentHttpClient = new OkHttpClient.Builder().build();
+        return sharedCommunicationObjects;
     }
-  }
-
-  @Test
-  void initializationFailureClosesConfigurationSourceAndExposureWriter() {
-    ConfigurationSourceService configService = mock(ConfigurationSourceService.class);
-    ExposureWriter exposureWriter = mock(ExposureWriter.class);
-    doThrow(new IllegalStateException("exposure init failed")).when(exposureWriter).init();
-
-    assertThrows(
-        IllegalStateException.class,
-        () -> FeatureFlaggingSystem.initialize(configService, exposureWriter));
-
-    verify(configService).init();
-    verify(configService).close();
-    verify(exposureWriter).close();
-  }
-
-  @Test
-  void initializationFailureWithoutConfigurationSourceClosesExposureWriter() {
-    ExposureWriter exposureWriter = mock(ExposureWriter.class);
-    doThrow(new IllegalStateException("exposure init failed")).when(exposureWriter).init();
-
-    assertThrows(
-        IllegalStateException.class, () -> FeatureFlaggingSystem.initialize(null, exposureWriter));
-
-    verify(exposureWriter).close();
-  }
-
-  @Test
-  void initializationFailureClosesConfigurationSourceWhenExposureWriterCloseFails() {
-    ConfigurationSourceService configService = mock(ConfigurationSourceService.class);
-    ExposureWriter exposureWriter = mock(ExposureWriter.class);
-    doThrow(new IllegalStateException("exposure init failed")).when(exposureWriter).init();
-    doThrow(new IllegalArgumentException("exposure close failed")).when(exposureWriter).close();
-
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> FeatureFlaggingSystem.initialize(configService, exposureWriter));
-
-    verify(configService).close();
-  }
-
-  private static SharedCommunicationObjects sharedCommunicationObjects() {
-    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-    when(discovery.supportsEvpProxy()).thenReturn(true);
-    when(discovery.getEvpProxyEndpoint()).thenReturn("/evp_proxy/");
-    return sharedCommunicationObjects(discovery);
-  }
-
-  private static SharedCommunicationObjects sharedCommunicationObjects(
-      final DDAgentFeaturesDiscovery discovery) {
-    SharedCommunicationObjects sharedCommunicationObjects = mock(SharedCommunicationObjects.class);
-    when(sharedCommunicationObjects.featuresDiscovery(any(Config.class))).thenReturn(discovery);
-    sharedCommunicationObjects.agentUrl = HttpUrl.get("http://localhost");
-    sharedCommunicationObjects.agentHttpClient = new OkHttpClient.Builder().build();
-    return sharedCommunicationObjects;
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-api/src/jmh/java/datadog/trace/api/openfeature/FlagEvalHookHotPathBenchmark.java b/products/feature-flagging/feature-flagging-api/src/jmh/java/datadog/trace/api/openfeature/FlagEvalHookHotPathBenchmark.java
index e292424e53e..3fecb1e943c 100644
--- a/products/feature-flagging/feature-flagging-api/src/jmh/java/datadog/trace/api/openfeature/FlagEvalHookHotPathBenchmark.java
+++ b/products/feature-flagging/feature-flagging-api/src/jmh/java/datadog/trace/api/openfeature/FlagEvalHookHotPathBenchmark.java
@@ -60,144 +60,135 @@
 @Fork(value = 1)
 public class FlagEvalHookHotPathBenchmark {
 
-  /**
-   * Context shapes. The three 100-leaf shapes (flat/100attrs, nested/10structs_10fields,
-   * list/10lists_10items) carry the same leaf count under different structure, so the spread
-   * between them isolates shape cost from leaf count.
-   */
-  @Param({
-    "flat/0attrs",
-    "flat/10attrs",
-    "flat/100attrs",
-    "nested/10structs_10fields",
-    "list/10lists_10items"
-  })
-  public String shape;
-
-  private HookContext<Object> hookContext;
-  private FlagEvaluationDetails<Object> consentOnDetails;
-  private FlagEvaluationDetails<Object> consentOffDetails;
-  private FlagEvalLoggingHook<Object> hook;
-
-  @Setup(Level.Trial)
-  public void setUp() {
-    final MutableContext ctx = buildContext(shape);
-    hookContext =
-        HookContext.builder()
-            .flagKey("bench-flag")
-            .type(FlagValueType.STRING)
-            .defaultValue("default")
-            .ctx(ctx)
-            .build();
-
-    consentOnDetails = details(true);
-    consentOffDetails = details(false);
-
-    // Discarding writer: isolates hook-inline cost from queue mechanics.
-    hook = new FlagEvalLoggingHook<>(new NoOpWriter());
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
-  }
-
-  @TearDown(Level.Trial)
-  public void tearDown() {
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(false);
-  }
-
-  /** Total inline cost under consent-on: scalar extraction, bounded context copy, and enqueue. */
-  @Benchmark
-  public void hookFinallyAfter() {
-    hook.finallyAfter(hookContext, consentOnDetails, Collections.emptyMap());
-  }
-
-  /** Protected-path floor: consent-off skips the context copy, leaving scalar work plus enqueue. */
-  @Benchmark
-  public void hookFinallyAfterConsentOff() {
-    hook.finallyAfter(hookContext, consentOffDetails, Collections.emptyMap());
-  }
-
-  /** The bounded context copy alone - the component that scales with context shape. */
-  @Benchmark
-  public void contextCopy(final Blackhole blackhole) {
-    blackhole.consume(DDEvaluator.copyPrunedContext(hookContext.getCtx()));
-  }
-
-  private static FlagEvaluationDetails<Object> details(final boolean observeFullEvaluationData) {
-    return FlagEvaluationDetails.builder()
-        .flagKey("bench-flag")
-        .value("on-value")
-        .variant("on")
-        .reason(Reason.TARGETING_MATCH.name())
-        .flagMetadata(
-            ImmutableMetadata.builder()
-                .addString("allocationKey", "alloc-1")
-                .addLong("__dd_eval_timestamp_ms", 1_700_000_000_000L)
-                .addBoolean(
-                    DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA, observeFullEvaluationData)
-                .build())
-        .build();
-  }
-
-  private static MutableContext buildContext(final String shape) {
-    final MutableContext ctx = new MutableContext("bench-user");
-    if ("flat/0attrs".equals(shape)) {
-      return ctx;
+    /**
+     * Context shapes. The three 100-leaf shapes (flat/100attrs, nested/10structs_10fields,
+     * list/10lists_10items) carry the same leaf count under different structure, so the spread
+     * between them isolates shape cost from leaf count.
+     */
+    @Param({"flat/0attrs", "flat/10attrs", "flat/100attrs", "nested/10structs_10fields", "list/10lists_10items"})
+    public String shape;
+
+    private HookContext<Object> hookContext;
+    private FlagEvaluationDetails<Object> consentOnDetails;
+    private FlagEvaluationDetails<Object> consentOffDetails;
+    private FlagEvalLoggingHook<Object> hook;
+
+    @Setup(Level.Trial)
+    public void setUp() {
+        final MutableContext ctx = buildContext(shape);
+        hookContext = HookContext.builder()
+                .flagKey("bench-flag")
+                .type(FlagValueType.STRING)
+                .defaultValue("default")
+                .ctx(ctx)
+                .build();
+
+        consentOnDetails = details(true);
+        consentOffDetails = details(false);
+
+        // Discarding writer: isolates hook-inline cost from queue mechanics.
+        hook = new FlagEvalLoggingHook<>(new NoOpWriter());
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
     }
-    if ("flat/10attrs".equals(shape)) {
-      return addFlat(ctx, 10);
+
+    @TearDown(Level.Trial)
+    public void tearDown() {
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(false);
     }
-    if ("flat/100attrs".equals(shape)) {
-      return addFlat(ctx, 100);
+
+    /** Total inline cost under consent-on: scalar extraction, bounded context copy, and enqueue. */
+    @Benchmark
+    public void hookFinallyAfter() {
+        hook.finallyAfter(hookContext, consentOnDetails, Collections.emptyMap());
     }
-    if ("nested/10structs_10fields".equals(shape)) {
-      for (int i = 0; i < 10; i++) {
-        final Map<String, Value> inner = new HashMap<>();
-        for (int j = 0; j < 10; j++) {
-          inner.put("field" + j, new Value("value" + j));
-        }
-        ctx.add("struct" + i, new ImmutableStructure(inner));
-      }
-      return ctx;
+
+    /** Protected-path floor: consent-off skips the context copy, leaving scalar work plus enqueue. */
+    @Benchmark
+    public void hookFinallyAfterConsentOff() {
+        hook.finallyAfter(hookContext, consentOffDetails, Collections.emptyMap());
     }
-    if ("list/10lists_10items".equals(shape)) {
-      for (int i = 0; i < 10; i++) {
-        final List<Value> items = new ArrayList<>(10);
-        for (int j = 0; j < 10; j++) {
-          items.add(new Value("value" + j));
-        }
-        ctx.add("list" + i, items);
-      }
-      return ctx;
+
+    /** The bounded context copy alone - the component that scales with context shape. */
+    @Benchmark
+    public void contextCopy(final Blackhole blackhole) {
+        blackhole.consume(DDEvaluator.copyPrunedContext(hookContext.getCtx()));
     }
-    throw new IllegalArgumentException("unknown benchmark shape: " + shape);
-  }
 
-  private static MutableContext addFlat(final MutableContext ctx, final int count) {
-    for (int i = 0; i < count; i++) {
-      ctx.add("field" + i, "value" + i);
+    private static FlagEvaluationDetails<Object> details(final boolean observeFullEvaluationData) {
+        return FlagEvaluationDetails.builder()
+                .flagKey("bench-flag")
+                .value("on-value")
+                .variant("on")
+                .reason(Reason.TARGETING_MATCH.name())
+                .flagMetadata(ImmutableMetadata.builder()
+                        .addString("allocationKey", "alloc-1")
+                        .addLong("__dd_eval_timestamp_ms", 1_700_000_000_000L)
+                        .addBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA, observeFullEvaluationData)
+                        .build())
+                .build();
     }
-    return ctx;
-  }
 
-  /** Discards events so only hook-inline work is measured. */
-  private static final class NoOpWriter implements FlagEvaluationWriter {
-    @Override
-    public void enqueue(final FlagEvalEvent event) {}
+    private static MutableContext buildContext(final String shape) {
+        final MutableContext ctx = new MutableContext("bench-user");
+        if ("flat/0attrs".equals(shape)) {
+            return ctx;
+        }
+        if ("flat/10attrs".equals(shape)) {
+            return addFlat(ctx, 10);
+        }
+        if ("flat/100attrs".equals(shape)) {
+            return addFlat(ctx, 100);
+        }
+        if ("nested/10structs_10fields".equals(shape)) {
+            for (int i = 0; i < 10; i++) {
+                final Map<String, Value> inner = new HashMap<>();
+                for (int j = 0; j < 10; j++) {
+                    inner.put("field" + j, new Value("value" + j));
+                }
+                ctx.add("struct" + i, new ImmutableStructure(inner));
+            }
+            return ctx;
+        }
+        if ("list/10lists_10items".equals(shape)) {
+            for (int i = 0; i < 10; i++) {
+                final List<Value> items = new ArrayList<>(10);
+                for (int j = 0; j < 10; j++) {
+                    items.add(new Value("value" + j));
+                }
+                ctx.add("list" + i, items);
+            }
+            return ctx;
+        }
+        throw new IllegalArgumentException("unknown benchmark shape: " + shape);
+    }
 
-    @Override
-    public boolean hasCapacityForEnqueue() {
-      return true;
+    private static MutableContext addFlat(final MutableContext ctx, final int count) {
+        for (int i = 0; i < count; i++) {
+            ctx.add("field" + i, "value" + i);
+        }
+        return ctx;
     }
 
-    @Override
-    public void countPreQueueOverflow() {}
+    /** Discards events so only hook-inline work is measured. */
+    private static final class NoOpWriter implements FlagEvaluationWriter {
+        @Override
+        public void enqueue(final FlagEvalEvent event) {}
 
-    @Override
-    public void countContextTruncated(final String reason) {}
+        @Override
+        public boolean hasCapacityForEnqueue() {
+            return true;
+        }
+
+        @Override
+        public void countPreQueueOverflow() {}
 
-    @Override
-    public void start() {}
+        @Override
+        public void countContextTruncated(final String reason) {}
 
-    @Override
-    public void close() {}
-  }
+        @Override
+        public void start() {}
+
+        @Override
+        public void close() {}
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/DDEvaluator.java b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/DDEvaluator.java
index 9bc55fe63e9..daed720f2a2 100644
--- a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/DDEvaluator.java
+++ b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/DDEvaluator.java
@@ -52,989 +52,967 @@
 
 class DDEvaluator implements Evaluator, FeatureFlaggingGateway.ConfigListener {
 
-  private static final Logger log = LoggerFactory.getLogger(DDEvaluator.class);
-  private static final Set<Class<?>> SUPPORTED_RESOLUTION_TYPES =
-      new HashSet<>(asList(String.class, Boolean.class, Integer.class, Double.class, Value.class));
-
-  static final AtomicBoolean SPLIT_SERIAL_ID_SUPPORTED =
-      new AtomicBoolean(splitSerialIdSupported(Split.class));
-
-  static final AtomicBoolean USE_LEGACY_EXPOSURE_API =
-      new AtomicBoolean(
-          !(SPLIT_SERIAL_ID_SUPPORTED.get() && exposureSerialIdSupported(ExposureEvent.class)));
-
-  static boolean splitSerialIdSupported(final Class<?> splitClass) {
-    try {
-      return splitClass.getField("serialId").getType() == Integer.class;
-    } catch (final NoSuchFieldException | LinkageError | RuntimeException e) {
-      log.warn(
-          "Feature flag serial ID reporting is unavailable with the installed Datadog Java "
-              + "agent, which does not carry a serial id on the flag configuration. Upgrade "
-              + "dd-java-agent to enable holdout attribution.");
-      log.debug("Unable to access the flag configuration serial ID", e);
-      return false;
-    }
-  }
-
-  static boolean exposureSerialIdSupported(final Class<?> eventClass) {
-    try {
-      eventClass.getConstructor(
-          long.class,
-          datadog.trace.api.featureflag.exposure.Allocation.class,
-          datadog.trace.api.featureflag.exposure.Flag.class,
-          datadog.trace.api.featureflag.exposure.Variant.class,
-          Subject.class,
-          Integer.class);
-      return true;
-    } catch (final NoSuchMethodException | LinkageError | RuntimeException e) {
-      log.warn(
-          "Feature flag exposure serial ID reporting is unavailable with the installed "
-              + "Datadog Java agent. Exposures are still reported, without the serial id, and "
-              + "span enrichment is unaffected. Upgrade dd-java-agent to enable holdout "
-              + "attribution on exposures.");
-      log.debug("Unable to access the exposure serial ID constructor", e);
-      return false;
-    }
-  }
-
-  /**
-   * Maximum evaluation-context nesting depth captured on the hot path. Recursion runs on the
-   * caller's evaluation thread over a caller-owned Value tree, so an arbitrarily deep
-   * list/structure would overflow that thread's stack - and a StackOverflowError is not caught by
-   * the LinkageError | Exception guards that keep telemetry from breaking an evaluation. Values
-   * below the limit are truncated to null, the same way the cycle guard truncates. Kept aligned
-   * with the cross-SDK RFC target (4).
-   */
-  static final int MAX_SNAPSHOT_DEPTH = 4;
-
-  /**
-   * Maximum number of top-level context fields retained by copyPrunedContext. Bounds the width of
-   * the caller-supplied context and, transitively, the size of every FlagEvalEvent sitting in the
-   * async hand-off queue. Kept aligned with the cross-SDK RFC.
-   */
-  static final int MAX_CONTEXT_FIELDS = 256;
-
-  /**
-   * Maximum character length for a single context KEY retained by copyPrunedContext. Keys are
-   * stored verbatim in every full-tier bucket, so an unbounded key size would let a single caller
-   * inflate steady-state heap use. Longer keys cause the field to be skipped.
-   */
-  static final int MAX_KEY_LENGTH = 256;
-
-  /**
-   * Maximum character length for a single context string VALUE retained by copyPrunedContext.
-   * Longer values cause the field to be skipped (matches previous pruneContext behavior).
-   * Non-string scalars are not length-bounded.
-   */
-  static final int MAX_VALUE_LENGTH = 256;
-
-  /**
-   * Maximum number of elements walked per list encountered during copyPrunedContext. Bounds the
-   * fan-out of a single wide list at capture time so one caller cannot inflate the hot path with a
-   * huge but shallow structure. Elements past the limit are skipped.
-   */
-  static final int MAX_LIST_ELEMENTS = 256;
-
-  /**
-   * Maximum number of properties walked per structure encountered during copyPrunedContext. Same
-   * intent as MAX_LIST_ELEMENTS for structures. Properties past the limit are skipped.
-   */
-  static final int MAX_STRUCTURE_PROPERTIES = 256;
-
-  // Evaluation-metadata keys consumed by the span-enrichment capture hook (see
-  // SpanEnrichmentHook). Emitted only when the span-enrichment gate is on.
-  static final String METADATA_SPLIT_SERIAL_ID = "__dd_split_serial_id";
-  static final String METADATA_DO_LOG = "__dd_do_log";
-
-  // Stamped on every DD-produced evaluation (including PROVIDER_NOT_READY, with false). Missing
-  // key = non-DD provider; the hook falls back to false (fail-closed).
-  static final String METADATA_OBSERVE_FULL_EVALUATION_DATA = "observe_full_evaluation_data";
-
-  // Read once: when off, the __dd_* span-enrichment metadata is not attached to evaluations, so an
-  // enabled provider pays nothing extra unless span enrichment is also enabled. The gate does not
-  // change at runtime, and this class is loaded lazily (well after startup) so config is ready.
-  private static final boolean SPAN_ENRICHMENT_ENABLED = SpanEnrichmentGate.isEnabled();
-
-  private final Runnable configCallback;
-  private final AtomicReference<ServerConfiguration> configuration = new AtomicReference<>();
-  private final CountDownLatch initializationLatch = new CountDownLatch(1);
-
-  public DDEvaluator(final Runnable configCallback) {
-    this.configCallback = configCallback;
-  }
-
-  @Override
-  public boolean initialize(
-      final long timeout, final TimeUnit unit, final EvaluationContext context) throws Exception {
-    FeatureFlaggingGateway.activate();
-    FeatureFlaggingGateway.addConfigListener(this);
-    return initializationLatch.await(timeout, unit) || hasConfiguration();
-  }
-
-  @Override
-  public boolean hasConfiguration() {
-    return configuration.get() != null;
-  }
-
-  @Override
-  public void shutdown() {
-    FeatureFlaggingGateway.removeConfigListener(this);
-  }
-
-  @Override
-  public void accept(final ServerConfiguration config) {
-    configuration.set(config);
-    if (config != null) {
-      initializationLatch.countDown();
-      configCallback.run();
-    } else if (initializationLatch.getCount() == 0) {
-      configCallback.run();
-    }
-  }
-
-  @Override
-  public <T> ProviderEvaluation<T> evaluate(
-      final Class<T> target,
-      final String key,
-      final T defaultValue,
-      final EvaluationContext context) {
-    // Snapshot the config once and thread observeFullEvaluationData through every
-    // ProviderEvaluation returned, so the hook's consent decision is pinned to this evaluation's
-    // config and cannot drift on a concurrent Remote Config swap.
-    final ServerConfiguration config = configuration.get();
-    // Boolean.TRUE.equals covers both null (privacy-preserving default) and Boolean.FALSE without
-    // an NPE — the field is boxed so a malformed UFC message doesn't abort the whole parse.
-    final boolean observeFullEvaluationData =
-        config != null && Boolean.TRUE.equals(config.observeFullEvaluationData);
-    try {
-      if (config == null) {
-        return error(defaultValue, ErrorCode.PROVIDER_NOT_READY, null, observeFullEvaluationData);
-      }
-
-      if (context == null) {
-        return error(defaultValue, ErrorCode.INVALID_CONTEXT, null, observeFullEvaluationData);
-      }
-
-      final Flag flag = config.flags.get(key);
-      if (flag == null) {
-        if (config.invalidFlags != null && config.invalidFlags.containsKey(key)) {
-          return error(
-              defaultValue,
-              ErrorCode.PARSE_ERROR,
-              "invalid configuration for flag " + key,
-              observeFullEvaluationData);
+    private static final Logger log = LoggerFactory.getLogger(DDEvaluator.class);
+    private static final Set<Class<?>> SUPPORTED_RESOLUTION_TYPES =
+            new HashSet<>(asList(String.class, Boolean.class, Integer.class, Double.class, Value.class));
+
+    static final AtomicBoolean SPLIT_SERIAL_ID_SUPPORTED = new AtomicBoolean(splitSerialIdSupported(Split.class));
+
+    static final AtomicBoolean USE_LEGACY_EXPOSURE_API =
+            new AtomicBoolean(!(SPLIT_SERIAL_ID_SUPPORTED.get() && exposureSerialIdSupported(ExposureEvent.class)));
+
+    static boolean splitSerialIdSupported(final Class<?> splitClass) {
+        try {
+            return splitClass.getField("serialId").getType() == Integer.class;
+        } catch (final NoSuchFieldException | LinkageError | RuntimeException e) {
+            log.warn("Feature flag serial ID reporting is unavailable with the installed Datadog Java "
+                    + "agent, which does not carry a serial id on the flag configuration. Upgrade "
+                    + "dd-java-agent to enable holdout attribution.");
+            log.debug("Unable to access the flag configuration serial ID", e);
+            return false;
         }
-        return error(defaultValue, ErrorCode.FLAG_NOT_FOUND, null, observeFullEvaluationData);
-      }
+    }
 
-      if (!flag.enabled) {
-        return ProviderEvaluation.<T>builder()
-            .value(defaultValue)
-            .reason(Reason.DISABLED.name())
-            .flagMetadata(consentMetadata(observeFullEvaluationData))
-            .build();
-      }
-
-      if (flag.allocations == null) {
-        return error(
-            defaultValue,
-            ErrorCode.GENERAL,
-            "Missing allocations for flag " + key,
-            observeFullEvaluationData);
-      }
-
-      final Instant now = Instant.now();
-      final long evalTimestampMs = now.toEpochMilli();
-      final String targetingKey = context.getTargetingKey();
-
-      for (final Allocation allocation : flag.allocations) {
-        if (!isAllocationActive(allocation, now)) {
-          continue;
+    static boolean exposureSerialIdSupported(final Class<?> eventClass) {
+        try {
+            eventClass.getConstructor(
+                    long.class,
+                    datadog.trace.api.featureflag.exposure.Allocation.class,
+                    datadog.trace.api.featureflag.exposure.Flag.class,
+                    datadog.trace.api.featureflag.exposure.Variant.class,
+                    Subject.class,
+                    Integer.class);
+            return true;
+        } catch (final NoSuchMethodException | LinkageError | RuntimeException e) {
+            log.warn("Feature flag exposure serial ID reporting is unavailable with the installed "
+                    + "Datadog Java agent. Exposures are still reported, without the serial id, and "
+                    + "span enrichment is unaffected. Upgrade dd-java-agent to enable holdout "
+                    + "attribution on exposures.");
+            log.debug("Unable to access the exposure serial ID constructor", e);
+            return false;
         }
+    }
 
-        if (!isEmpty(allocation.rules)) {
-          if (!evaluateRules(allocation.rules, context)) {
-            continue;
-          }
+    /**
+     * Maximum evaluation-context nesting depth captured on the hot path. Recursion runs on the
+     * caller's evaluation thread over a caller-owned Value tree, so an arbitrarily deep
+     * list/structure would overflow that thread's stack - and a StackOverflowError is not caught by
+     * the LinkageError | Exception guards that keep telemetry from breaking an evaluation. Values
+     * below the limit are truncated to null, the same way the cycle guard truncates. Kept aligned
+     * with the cross-SDK RFC target (4).
+     */
+    static final int MAX_SNAPSHOT_DEPTH = 4;
+
+    /**
+     * Maximum number of top-level context fields retained by copyPrunedContext. Bounds the width of
+     * the caller-supplied context and, transitively, the size of every FlagEvalEvent sitting in the
+     * async hand-off queue. Kept aligned with the cross-SDK RFC.
+     */
+    static final int MAX_CONTEXT_FIELDS = 256;
+
+    /**
+     * Maximum character length for a single context KEY retained by copyPrunedContext. Keys are
+     * stored verbatim in every full-tier bucket, so an unbounded key size would let a single caller
+     * inflate steady-state heap use. Longer keys cause the field to be skipped.
+     */
+    static final int MAX_KEY_LENGTH = 256;
+
+    /**
+     * Maximum character length for a single context string VALUE retained by copyPrunedContext.
+     * Longer values cause the field to be skipped (matches previous pruneContext behavior).
+     * Non-string scalars are not length-bounded.
+     */
+    static final int MAX_VALUE_LENGTH = 256;
+
+    /**
+     * Maximum number of elements walked per list encountered during copyPrunedContext. Bounds the
+     * fan-out of a single wide list at capture time so one caller cannot inflate the hot path with a
+     * huge but shallow structure. Elements past the limit are skipped.
+     */
+    static final int MAX_LIST_ELEMENTS = 256;
+
+    /**
+     * Maximum number of properties walked per structure encountered during copyPrunedContext. Same
+     * intent as MAX_LIST_ELEMENTS for structures. Properties past the limit are skipped.
+     */
+    static final int MAX_STRUCTURE_PROPERTIES = 256;
+
+    // Evaluation-metadata keys consumed by the span-enrichment capture hook (see
+    // SpanEnrichmentHook). Emitted only when the span-enrichment gate is on.
+    static final String METADATA_SPLIT_SERIAL_ID = "__dd_split_serial_id";
+    static final String METADATA_DO_LOG = "__dd_do_log";
+
+    // Stamped on every DD-produced evaluation (including PROVIDER_NOT_READY, with false). Missing
+    // key = non-DD provider; the hook falls back to false (fail-closed).
+    static final String METADATA_OBSERVE_FULL_EVALUATION_DATA = "observe_full_evaluation_data";
+
+    // Read once: when off, the __dd_* span-enrichment metadata is not attached to evaluations, so an
+    // enabled provider pays nothing extra unless span enrichment is also enabled. The gate does not
+    // change at runtime, and this class is loaded lazily (well after startup) so config is ready.
+    private static final boolean SPAN_ENRICHMENT_ENABLED = SpanEnrichmentGate.isEnabled();
+
+    private final Runnable configCallback;
+    private final AtomicReference<ServerConfiguration> configuration = new AtomicReference<>();
+    private final CountDownLatch initializationLatch = new CountDownLatch(1);
+
+    public DDEvaluator(final Runnable configCallback) {
+        this.configCallback = configCallback;
+    }
+
+    @Override
+    public boolean initialize(final long timeout, final TimeUnit unit, final EvaluationContext context)
+            throws Exception {
+        FeatureFlaggingGateway.activate();
+        FeatureFlaggingGateway.addConfigListener(this);
+        return initializationLatch.await(timeout, unit) || hasConfiguration();
+    }
+
+    @Override
+    public boolean hasConfiguration() {
+        return configuration.get() != null;
+    }
+
+    @Override
+    public void shutdown() {
+        FeatureFlaggingGateway.removeConfigListener(this);
+    }
+
+    @Override
+    public void accept(final ServerConfiguration config) {
+        configuration.set(config);
+        if (config != null) {
+            initializationLatch.countDown();
+            configCallback.run();
+        } else if (initializationLatch.getCount() == 0) {
+            configCallback.run();
         }
+    }
+
+    @Override
+    public <T> ProviderEvaluation<T> evaluate(
+            final Class<T> target, final String key, final T defaultValue, final EvaluationContext context) {
+        // Snapshot the config once and thread observeFullEvaluationData through every
+        // ProviderEvaluation returned, so the hook's consent decision is pinned to this evaluation's
+        // config and cannot drift on a concurrent Remote Config swap.
+        final ServerConfiguration config = configuration.get();
+        // Boolean.TRUE.equals covers both null (privacy-preserving default) and Boolean.FALSE without
+        // an NPE — the field is boxed so a malformed UFC message doesn't abort the whole parse.
+        final boolean observeFullEvaluationData =
+                config != null && Boolean.TRUE.equals(config.observeFullEvaluationData);
+        try {
+            if (config == null) {
+                return error(defaultValue, ErrorCode.PROVIDER_NOT_READY, null, observeFullEvaluationData);
+            }
+
+            if (context == null) {
+                return error(defaultValue, ErrorCode.INVALID_CONTEXT, null, observeFullEvaluationData);
+            }
 
-        if (!isEmpty(allocation.splits)) {
-          for (final Split split : allocation.splits) {
-            if (isEmpty(split.shards)) {
-              return resolveVariant(
-                  target,
-                  key,
-                  defaultValue,
-                  flag,
-                  split.variationKey,
-                  allocation,
-                  split,
-                  context,
-                  evalTimestampMs,
-                  observeFullEvaluationData);
-            } else {
-              if (targetingKey == null) {
+            final Flag flag = config.flags.get(key);
+            if (flag == null) {
+                if (config.invalidFlags != null && config.invalidFlags.containsKey(key)) {
+                    return error(
+                            defaultValue,
+                            ErrorCode.PARSE_ERROR,
+                            "invalid configuration for flag " + key,
+                            observeFullEvaluationData);
+                }
+                return error(defaultValue, ErrorCode.FLAG_NOT_FOUND, null, observeFullEvaluationData);
+            }
+
+            if (!flag.enabled) {
+                return ProviderEvaluation.<T>builder()
+                        .value(defaultValue)
+                        .reason(Reason.DISABLED.name())
+                        .flagMetadata(consentMetadata(observeFullEvaluationData))
+                        .build();
+            }
+
+            if (flag.allocations == null) {
                 return error(
-                    defaultValue, ErrorCode.TARGETING_KEY_MISSING, null, observeFullEvaluationData);
-              }
-              // To match a split, subject must match ALL underlying shards
-              boolean allShardsMatch = true;
-              for (final Shard shard : split.shards) {
-                if (!matchesShard(shard, targetingKey)) {
-                  allShardsMatch = false;
-                  break;
+                        defaultValue,
+                        ErrorCode.GENERAL,
+                        "Missing allocations for flag " + key,
+                        observeFullEvaluationData);
+            }
+
+            final Instant now = Instant.now();
+            final long evalTimestampMs = now.toEpochMilli();
+            final String targetingKey = context.getTargetingKey();
+
+            for (final Allocation allocation : flag.allocations) {
+                if (!isAllocationActive(allocation, now)) {
+                    continue;
+                }
+
+                if (!isEmpty(allocation.rules)) {
+                    if (!evaluateRules(allocation.rules, context)) {
+                        continue;
+                    }
+                }
+
+                if (!isEmpty(allocation.splits)) {
+                    for (final Split split : allocation.splits) {
+                        if (isEmpty(split.shards)) {
+                            return resolveVariant(
+                                    target,
+                                    key,
+                                    defaultValue,
+                                    flag,
+                                    split.variationKey,
+                                    allocation,
+                                    split,
+                                    context,
+                                    evalTimestampMs,
+                                    observeFullEvaluationData);
+                        } else {
+                            if (targetingKey == null) {
+                                return error(
+                                        defaultValue, ErrorCode.TARGETING_KEY_MISSING, null, observeFullEvaluationData);
+                            }
+                            // To match a split, subject must match ALL underlying shards
+                            boolean allShardsMatch = true;
+                            for (final Shard shard : split.shards) {
+                                if (!matchesShard(shard, targetingKey)) {
+                                    allShardsMatch = false;
+                                    break;
+                                }
+                            }
+                            if (allShardsMatch) {
+                                return resolveVariant(
+                                        target,
+                                        key,
+                                        defaultValue,
+                                        flag,
+                                        split.variationKey,
+                                        allocation,
+                                        split,
+                                        context,
+                                        evalTimestampMs,
+                                        observeFullEvaluationData);
+                            }
+                        }
+                    }
                 }
-              }
-              if (allShardsMatch) {
-                return resolveVariant(
-                    target,
-                    key,
-                    defaultValue,
-                    flag,
-                    split.variationKey,
-                    allocation,
-                    split,
-                    context,
-                    evalTimestampMs,
-                    observeFullEvaluationData);
-              }
             }
-          }
+
+            return ProviderEvaluation.<T>builder()
+                    .value(defaultValue)
+                    .reason(Reason.DEFAULT.name())
+                    .flagMetadata(consentMetadata(observeFullEvaluationData))
+                    .build();
+        } catch (final PatternSyntaxException e) {
+            return error(defaultValue, ErrorCode.PARSE_ERROR, e.getMessage(), observeFullEvaluationData);
+        } catch (final NumberFormatException e) {
+            return error(defaultValue, ErrorCode.TYPE_MISMATCH, e.getMessage(), observeFullEvaluationData);
+        } catch (final Exception e) {
+            return error(defaultValue, ErrorCode.GENERAL, e.getMessage(), observeFullEvaluationData);
         }
-      }
-
-      return ProviderEvaluation.<T>builder()
-          .value(defaultValue)
-          .reason(Reason.DEFAULT.name())
-          .flagMetadata(consentMetadata(observeFullEvaluationData))
-          .build();
-    } catch (final PatternSyntaxException e) {
-      return error(defaultValue, ErrorCode.PARSE_ERROR, e.getMessage(), observeFullEvaluationData);
-    } catch (final NumberFormatException e) {
-      return error(
-          defaultValue, ErrorCode.TYPE_MISMATCH, e.getMessage(), observeFullEvaluationData);
-    } catch (final Exception e) {
-      return error(defaultValue, ErrorCode.GENERAL, e.getMessage(), observeFullEvaluationData);
     }
-  }
-
-  private static ImmutableMetadata consentMetadata(final boolean observeFullEvaluationData) {
-    return ImmutableMetadata.builder()
-        .addBoolean(METADATA_OBSERVE_FULL_EVALUATION_DATA, observeFullEvaluationData)
-        .build();
-  }
-
-  private static <T> ProviderEvaluation<T> error(
-      final T defaultValue,
-      final ErrorCode code,
-      final String errorMessage,
-      final boolean observeFullEvaluationData) {
-    // Under consent-off the errorMessage is dropped: exception messages from the outer catch blocks
-    // (NumberFormatException, generic Exception) can echo raw evaluation-context values, so they
-    // must never reach any consumer of ProviderEvaluation.getErrorMessage() — not just our own
-    // wire hook. Downstream (FlagEvalLoggingHook) falls back to ErrorCode.name(), so operators
-    // still get a stable signal like "TYPE_MISMATCH".
-    return ProviderEvaluation.<T>builder()
-        .value(defaultValue)
-        .reason(Reason.ERROR.name())
-        .errorCode(code)
-        .errorMessage(observeFullEvaluationData ? errorMessage : null)
-        .flagMetadata(consentMetadata(observeFullEvaluationData))
-        .build();
-  }
-
-  private static boolean isEmpty(final List<?> list) {
-    return list == null || list.isEmpty();
-  }
-
-  static boolean isAllocationActive(final Allocation allocation, final Instant now) {
-    final Instant startDate = allocation.startAtInstant();
-    if (startDate != null && now.isBefore(startDate)) {
-      return false;
+
+    private static ImmutableMetadata consentMetadata(final boolean observeFullEvaluationData) {
+        return ImmutableMetadata.builder()
+                .addBoolean(METADATA_OBSERVE_FULL_EVALUATION_DATA, observeFullEvaluationData)
+                .build();
     }
 
-    final Instant endDate = allocation.endAtInstant();
-    if (endDate != null && now.isAfter(endDate)) {
-      return false;
+    private static <T> ProviderEvaluation<T> error(
+            final T defaultValue,
+            final ErrorCode code,
+            final String errorMessage,
+            final boolean observeFullEvaluationData) {
+        // Under consent-off the errorMessage is dropped: exception messages from the outer catch blocks
+        // (NumberFormatException, generic Exception) can echo raw evaluation-context values, so they
+        // must never reach any consumer of ProviderEvaluation.getErrorMessage() — not just our own
+        // wire hook. Downstream (FlagEvalLoggingHook) falls back to ErrorCode.name(), so operators
+        // still get a stable signal like "TYPE_MISMATCH".
+        return ProviderEvaluation.<T>builder()
+                .value(defaultValue)
+                .reason(Reason.ERROR.name())
+                .errorCode(code)
+                .errorMessage(observeFullEvaluationData ? errorMessage : null)
+                .flagMetadata(consentMetadata(observeFullEvaluationData))
+                .build();
     }
 
-    return true;
-  }
+    private static boolean isEmpty(final List<?> list) {
+        return list == null || list.isEmpty();
+    }
 
-  private static boolean evaluateRules(final List<Rule> rules, final EvaluationContext context) {
-    for (final Rule rule : rules) {
-      if (isEmpty(rule.conditions)) {
-        continue;
-      }
+    static boolean isAllocationActive(final Allocation allocation, final Instant now) {
+        final Instant startDate = allocation.startAtInstant();
+        if (startDate != null && now.isBefore(startDate)) {
+            return false;
+        }
 
-      boolean allConditionsMatch = true;
-      for (final ConditionConfiguration condition : rule.conditions) {
-        if (!evaluateCondition(condition, context)) {
-          allConditionsMatch = false;
-          break;
+        final Instant endDate = allocation.endAtInstant();
+        if (endDate != null && now.isAfter(endDate)) {
+            return false;
         }
-      }
 
-      if (allConditionsMatch) {
         return true;
-      }
-    }
-    return false;
-  }
-
-  private static boolean evaluateCondition(
-      final ConditionConfiguration condition, final EvaluationContext context) {
-    if (condition.operator == ConditionOperator.IS_NULL) {
-      final Object value = resolveAttribute(condition.attribute, context);
-      boolean isNull = value == null;
-      // condition.value determines if we're checking for null (true) or not null (false)
-      boolean expectedNull = condition.value instanceof Boolean ? (Boolean) condition.value : true;
-      return isNull == expectedNull;
     }
 
-    final Object attributeValue = resolveAttribute(condition.attribute, context);
-    if (attributeValue == null) {
-      return false;
-    }
+    private static boolean evaluateRules(final List<Rule> rules, final EvaluationContext context) {
+        for (final Rule rule : rules) {
+            if (isEmpty(rule.conditions)) {
+                continue;
+            }
+
+            boolean allConditionsMatch = true;
+            for (final ConditionConfiguration condition : rule.conditions) {
+                if (!evaluateCondition(condition, context)) {
+                    allConditionsMatch = false;
+                    break;
+                }
+            }
 
-    switch (condition.operator) {
-      case MATCHES:
-        return matchesRegex(attributeValue, condition.value);
-      case NOT_MATCHES:
-        return !matchesRegex(attributeValue, condition.value);
-      case ONE_OF:
-        return isOneOf(attributeValue, condition.value);
-      case NOT_ONE_OF:
-        return !isOneOf(attributeValue, condition.value);
-      case GTE:
-        return compareNumber(attributeValue, condition.value, (a, b) -> a >= b);
-      case GT:
-        return compareNumber(attributeValue, condition.value, (a, b) -> a > b);
-      case LTE:
-        return compareNumber(attributeValue, condition.value, (a, b) -> a <= b);
-      case LT:
-        return compareNumber(attributeValue, condition.value, (a, b) -> a < b);
-      case SEMVER_EQ:
-        return evaluateSemverCondition(attributeValue, condition.semverComparand, (o) -> o == 0);
-      case SEMVER_NEQ:
-        return evaluateSemverCondition(attributeValue, condition.semverComparand, (o) -> o != 0);
-      case SEMVER_LT:
-        return evaluateSemverCondition(attributeValue, condition.semverComparand, (o) -> o < 0);
-      case SEMVER_LTE:
-        return evaluateSemverCondition(attributeValue, condition.semverComparand, (o) -> o <= 0);
-      case SEMVER_GT:
-        return evaluateSemverCondition(attributeValue, condition.semverComparand, (o) -> o > 0);
-      case SEMVER_GTE:
-        return evaluateSemverCondition(attributeValue, condition.semverComparand, (o) -> o >= 0);
-      default:
+            if (allConditionsMatch) {
+                return true;
+            }
+        }
         return false;
     }
-  }
-
-  private static boolean matchesRegex(final Object attributeValue, final Object conditionValue) {
-    // PatternSyntaxException is intentionally not caught here so it propagates to evaluate(),
-    // which maps it to ErrorCode.PARSE_ERROR.
-    final Pattern pattern = Pattern.compile(normalizeRegex(String.valueOf(conditionValue)));
-    return pattern.matcher(String.valueOf(attributeValue)).find();
-  }
-
-  private static String normalizeRegex(final String regex) {
-    return regex
-        .replace("[:alnum:]", "\\p{Alnum}")
-        .replace("[:alpha:]", "\\p{Alpha}")
-        .replace("[:digit:]", "\\p{Digit}")
-        .replace("[:lower:]", "\\p{Lower}")
-        .replace("[:upper:]", "\\p{Upper}")
-        .replace("[:space:]", "\\p{Space}");
-  }
-
-  private static boolean isOneOf(final Object attributeValue, final Object conditionValue) {
-    if (!(conditionValue instanceof Iterable)) {
-      return false;
-    }
-    for (final Object value : (Iterable<?>) conditionValue) {
-      if (valuesEqual(attributeValue, value)) {
-        return true;
-      }
-    }
-    return false;
-  }
 
-  private static boolean valuesEqual(final Object a, final Object b) {
-    if (Objects.equals(a, b)) {
-      return true;
-    }
+    private static boolean evaluateCondition(final ConditionConfiguration condition, final EvaluationContext context) {
+        if (condition.operator == ConditionOperator.IS_NULL) {
+            final Object value = resolveAttribute(condition.attribute, context);
+            boolean isNull = value == null;
+            // condition.value determines if we're checking for null (true) or not null (false)
+            boolean expectedNull = condition.value instanceof Boolean ? (Boolean) condition.value : true;
+            return isNull == expectedNull;
+        }
 
-    if (a instanceof Number || b instanceof Number) {
-      return compareNumber(a, b, (first, second) -> first == second);
-    }
+        final Object attributeValue = resolveAttribute(condition.attribute, context);
+        if (attributeValue == null) {
+            return false;
+        }
 
-    return String.valueOf(a).equals(String.valueOf(b));
-  }
-
-  private static boolean compareNumber(
-      final Object attributeValue, final Object conditionValue, NumberComparator comparator) {
-    final double a = mapValue(Double.class, attributeValue);
-    final double b = mapValue(Double.class, conditionValue);
-    return comparator.compare(a, b);
-  }
-
-  /**
-   * Evaluates a semantic version comparison operator. The attribute value must be a string that is
-   * a valid semantic version, and the comparand must have been pre-parsed during configuration
-   * validation. If either is missing or invalid, the condition does not match.
-   */
-  private static boolean evaluateSemverCondition(
-      final Object attributeValue,
-      final ParsedSemver comparand,
-      final SemverComparator comparator) {
-    if (!(attributeValue instanceof String) || comparand == null) {
-      return false;
-    }
-    final ParsedSemver parsedAttribute = ParsedSemver.parse((String) attributeValue);
-    if (parsedAttribute == null) {
-      return false;
-    }
-    return comparator.compare(ParsedSemver.compare(parsedAttribute, comparand));
-  }
-
-  private static boolean matchesShard(final Shard shard, final String targetingKey) {
-    // The bootstrap model preserves its int ABI, so UFC uint32 values are stored as raw bits.
-    // Convert before arithmetic and comparison to retain their unsigned wire semantics.
-    final long totalShards = Integer.toUnsignedLong(shard.totalShards);
-    final long assignedShard = getShard(shard.salt, targetingKey, totalShards);
-    for (final ShardRange range : shard.ranges) {
-      final long rangeStart = Integer.toUnsignedLong(range.start);
-      final long rangeEnd = Integer.toUnsignedLong(range.end);
-      if (assignedShard >= rangeStart && assignedShard < rangeEnd) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  private static long getShard(
-      final String salt, final String targetingKey, final long totalShards) {
-    final String hashKey = salt + "-" + targetingKey;
-    final String md5Hash = getMD5Hash(hashKey);
-    final String first8Chars = md5Hash.substring(0, Math.min(8, md5Hash.length()));
-    final long intFromHash = Long.parseLong(first8Chars, 16);
-    return intFromHash % totalShards;
-  }
-
-  private static String getMD5Hash(final String input) {
-    try {
-      final MessageDigest md = MessageDigest.getInstance("MD5");
-      final byte[] hashBytes = md.digest(input.getBytes(StandardCharsets.UTF_8));
-      final StringBuilder hexString = new StringBuilder();
-      for (byte b : hashBytes) {
-        final String hex = Integer.toHexString(0xff & b);
-        if (hex.length() == 1) {
-          hexString.append('0');
+        switch (condition.operator) {
+            case MATCHES:
+                return matchesRegex(attributeValue, condition.value);
+            case NOT_MATCHES:
+                return !matchesRegex(attributeValue, condition.value);
+            case ONE_OF:
+                return isOneOf(attributeValue, condition.value);
+            case NOT_ONE_OF:
+                return !isOneOf(attributeValue, condition.value);
+            case GTE:
+                return compareNumber(attributeValue, condition.value, (a, b) -> a >= b);
+            case GT:
+                return compareNumber(attributeValue, condition.value, (a, b) -> a > b);
+            case LTE:
+                return compareNumber(attributeValue, condition.value, (a, b) -> a <= b);
+            case LT:
+                return compareNumber(attributeValue, condition.value, (a, b) -> a < b);
+            case SEMVER_EQ:
+                return evaluateSemverCondition(attributeValue, condition.semverComparand, (o) -> o == 0);
+            case SEMVER_NEQ:
+                return evaluateSemverCondition(attributeValue, condition.semverComparand, (o) -> o != 0);
+            case SEMVER_LT:
+                return evaluateSemverCondition(attributeValue, condition.semverComparand, (o) -> o < 0);
+            case SEMVER_LTE:
+                return evaluateSemverCondition(attributeValue, condition.semverComparand, (o) -> o <= 0);
+            case SEMVER_GT:
+                return evaluateSemverCondition(attributeValue, condition.semverComparand, (o) -> o > 0);
+            case SEMVER_GTE:
+                return evaluateSemverCondition(attributeValue, condition.semverComparand, (o) -> o >= 0);
+            default:
+                return false;
         }
-        hexString.append(hex);
-      }
-      return hexString.toString();
-    } catch (NoSuchAlgorithmException e) {
-      throw new RuntimeException("MD5 algorithm not available", e);
-    }
-  }
-
-  private static <T> ProviderEvaluation<T> resolveVariant(
-      final Class<T> target,
-      final String key,
-      final T defaultValue,
-      final Flag flag,
-      final String variationKey,
-      final Allocation allocation,
-      final Split split,
-      final EvaluationContext context,
-      final long evalTimestampMs,
-      final boolean observeFullEvaluationData) {
-    final Variant variant = flag.variations.get(variationKey);
-    if (variant == null) {
-      return error(
-          defaultValue,
-          ErrorCode.GENERAL,
-          "Variant not found for: " + variationKey,
-          observeFullEvaluationData);
     }
 
-    if (!isTypeCompatible(target, flag.variationType)) {
-      return error(
-          defaultValue,
-          ErrorCode.TYPE_MISMATCH,
-          "Requested type "
-              + target.getSimpleName()
-              + " does not match flag variationType "
-              + flag.variationType.name(),
-          observeFullEvaluationData);
+    private static boolean matchesRegex(final Object attributeValue, final Object conditionValue) {
+        // PatternSyntaxException is intentionally not caught here so it propagates to evaluate(),
+        // which maps it to ErrorCode.PARSE_ERROR.
+        final Pattern pattern = Pattern.compile(normalizeRegex(String.valueOf(conditionValue)));
+        return pattern.matcher(String.valueOf(attributeValue)).find();
     }
 
-    final T mappedValue;
-    try {
-      mappedValue = mapValue(target, variant.value);
-    } catch (final NumberFormatException e) {
-      return error(
-          defaultValue,
-          ErrorCode.PARSE_ERROR,
-          "Variant '"
-              + variant.key
-              + "' value does not match declared type "
-              + flag.variationType.name()
-              + ": "
-              + e.getMessage(),
-          observeFullEvaluationData);
+    private static String normalizeRegex(final String regex) {
+        return regex.replace("[:alnum:]", "\\p{Alnum}")
+                .replace("[:alpha:]", "\\p{Alpha}")
+                .replace("[:digit:]", "\\p{Digit}")
+                .replace("[:lower:]", "\\p{Lower}")
+                .replace("[:upper:]", "\\p{Upper}")
+                .replace("[:space:]", "\\p{Space}");
     }
 
-    // Stamp eval-time at the resolution point so first/last_evaluation reflect evaluation time,
-    // not hook-fire time. Passed to the hook via provider metadata "__dd_eval_timestamp_ms".
-    final ImmutableMetadata.ImmutableMetadataBuilder metadataBuilder =
-        ImmutableMetadata.builder()
-            .addString("flagKey", flag.key)
-            .addString("variationType", flag.variationType.name())
-            .addString("allocationKey", allocation.key)
-            .addLong("__dd_eval_timestamp_ms", evalTimestampMs)
-            .addBoolean(METADATA_OBSERVE_FULL_EVALUATION_DATA, observeFullEvaluationData);
-    // Surface the UFC split's serial id and the allocation's doLog flag for APM span enrichment —
-    // only when span enrichment is on, so a provider without enrichment pays nothing extra.
-    // __dd_split_serial_id is omitted when the split carries no serial id; __dd_do_log is always
-    // present (when enrichment is on) so the span-enrichment hook can decide whether to record the
-    // subject.
-    if (SPAN_ENRICHMENT_ENABLED) {
-      if (SPLIT_SERIAL_ID_SUPPORTED.get() && split.serialId != null) {
-        metadataBuilder.addInteger(METADATA_SPLIT_SERIAL_ID, split.serialId);
-      }
-      metadataBuilder.addBoolean(METADATA_DO_LOG, allocation.doLog != null && allocation.doLog);
-    }
-    final ProviderEvaluation<T> result =
-        ProviderEvaluation.<T>builder()
-            .value(mappedValue)
-            .reason(
-                !isEmpty(allocation.rules)
-                    ? Reason.TARGETING_MATCH.name()
-                    : allocation.startAt != null || allocation.endAt != null
-                        ? Reason.DEFAULT.name()
-                        : !isEmpty(split.shards) ? Reason.SPLIT.name() : Reason.STATIC.name())
-            .variant(variant.key)
-            .flagMetadata(metadataBuilder.build())
-            .build();
-    final boolean doLog = allocation.doLog != null && allocation.doLog;
-    if (doLog) {
-      dispatchExposure(key, result, context, split);
+    private static boolean isOneOf(final Object attributeValue, final Object conditionValue) {
+        if (!(conditionValue instanceof Iterable)) {
+            return false;
+        }
+        for (final Object value : (Iterable<?>) conditionValue) {
+            if (valuesEqual(attributeValue, value)) {
+                return true;
+            }
+        }
+        return false;
     }
-    return result;
-  }
 
-  private static Object resolveAttribute(final String name, final EvaluationContext context) {
-    // Special handling for "id" attribute: if not explicitly provided, use targeting key
-    if ("id".equals(name) && !context.keySet().contains(name)) {
-      return context.getTargetingKey();
-    }
-    final Value resolved = context.getValue(name);
-    return context.convertValue(resolved);
-  }
+    private static boolean valuesEqual(final Object a, final Object b) {
+        if (Objects.equals(a, b)) {
+            return true;
+        }
+
+        if (a instanceof Number || b instanceof Number) {
+            return compareNumber(a, b, (first, second) -> first == second);
+        }
 
-  private static boolean isTypeCompatible(final Class<?> target, final ValueType variationType) {
-    if (variationType == null) {
-      return true; // No type info — allow any
+        return String.valueOf(a).equals(String.valueOf(b));
     }
-    switch (variationType) {
-      case BOOLEAN:
-        return target == Boolean.class;
-      case STRING:
-        return target == String.class;
-      case INTEGER:
-        return target == Integer.class;
-      case NUMERIC:
-        return target == Double.class;
-      case JSON:
-        return target == Value.class;
-      default:
-        return true; // Unknown types pass through — mapValue errors caught as GENERAL
+
+    private static boolean compareNumber(
+            final Object attributeValue, final Object conditionValue, NumberComparator comparator) {
+        final double a = mapValue(Double.class, attributeValue);
+        final double b = mapValue(Double.class, conditionValue);
+        return comparator.compare(a, b);
     }
-  }
 
-  @SuppressWarnings("unchecked")
-  static <T> T mapValue(final Class<T> target, final Object value) {
-    if (value == null) {
-      return null;
+    /**
+     * Evaluates a semantic version comparison operator. The attribute value must be a string that is
+     * a valid semantic version, and the comparand must have been pre-parsed during configuration
+     * validation. If either is missing or invalid, the condition does not match.
+     */
+    private static boolean evaluateSemverCondition(
+            final Object attributeValue, final ParsedSemver comparand, final SemverComparator comparator) {
+        if (!(attributeValue instanceof String) || comparand == null) {
+            return false;
+        }
+        final ParsedSemver parsedAttribute = ParsedSemver.parse((String) attributeValue);
+        if (parsedAttribute == null) {
+            return false;
+        }
+        return comparator.compare(ParsedSemver.compare(parsedAttribute, comparand));
+    }
+
+    private static boolean matchesShard(final Shard shard, final String targetingKey) {
+        // The bootstrap model preserves its int ABI, so UFC uint32 values are stored as raw bits.
+        // Convert before arithmetic and comparison to retain their unsigned wire semantics.
+        final long totalShards = Integer.toUnsignedLong(shard.totalShards);
+        final long assignedShard = getShard(shard.salt, targetingKey, totalShards);
+        for (final ShardRange range : shard.ranges) {
+            final long rangeStart = Integer.toUnsignedLong(range.start);
+            final long rangeEnd = Integer.toUnsignedLong(range.end);
+            if (assignedShard >= rangeStart && assignedShard < rangeEnd) {
+                return true;
+            }
+        }
+        return false;
     }
-    if (!SUPPORTED_RESOLUTION_TYPES.contains(target)) {
-      throw new IllegalArgumentException("Type not supported: " + target);
+
+    private static long getShard(final String salt, final String targetingKey, final long totalShards) {
+        final String hashKey = salt + "-" + targetingKey;
+        final String md5Hash = getMD5Hash(hashKey);
+        final String first8Chars = md5Hash.substring(0, Math.min(8, md5Hash.length()));
+        final long intFromHash = Long.parseLong(first8Chars, 16);
+        return intFromHash % totalShards;
     }
-    if (target.isInstance(value)) {
-      return target.cast(value);
+
+    private static String getMD5Hash(final String input) {
+        try {
+            final MessageDigest md = MessageDigest.getInstance("MD5");
+            final byte[] hashBytes = md.digest(input.getBytes(StandardCharsets.UTF_8));
+            final StringBuilder hexString = new StringBuilder();
+            for (byte b : hashBytes) {
+                final String hex = Integer.toHexString(0xff & b);
+                if (hex.length() == 1) {
+                    hexString.append('0');
+                }
+                hexString.append(hex);
+            }
+            return hexString.toString();
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("MD5 algorithm not available", e);
+        }
     }
-    if (target == String.class) {
-      return (T) String.valueOf(value);
+
+    private static <T> ProviderEvaluation<T> resolveVariant(
+            final Class<T> target,
+            final String key,
+            final T defaultValue,
+            final Flag flag,
+            final String variationKey,
+            final Allocation allocation,
+            final Split split,
+            final EvaluationContext context,
+            final long evalTimestampMs,
+            final boolean observeFullEvaluationData) {
+        final Variant variant = flag.variations.get(variationKey);
+        if (variant == null) {
+            return error(
+                    defaultValue,
+                    ErrorCode.GENERAL,
+                    "Variant not found for: " + variationKey,
+                    observeFullEvaluationData);
+        }
+
+        if (!isTypeCompatible(target, flag.variationType)) {
+            return error(
+                    defaultValue,
+                    ErrorCode.TYPE_MISMATCH,
+                    "Requested type "
+                            + target.getSimpleName()
+                            + " does not match flag variationType "
+                            + flag.variationType.name(),
+                    observeFullEvaluationData);
+        }
+
+        final T mappedValue;
+        try {
+            mappedValue = mapValue(target, variant.value);
+        } catch (final NumberFormatException e) {
+            return error(
+                    defaultValue,
+                    ErrorCode.PARSE_ERROR,
+                    "Variant '"
+                            + variant.key
+                            + "' value does not match declared type "
+                            + flag.variationType.name()
+                            + ": "
+                            + e.getMessage(),
+                    observeFullEvaluationData);
+        }
+
+        // Stamp eval-time at the resolution point so first/last_evaluation reflect evaluation time,
+        // not hook-fire time. Passed to the hook via provider metadata "__dd_eval_timestamp_ms".
+        final ImmutableMetadata.ImmutableMetadataBuilder metadataBuilder = ImmutableMetadata.builder()
+                .addString("flagKey", flag.key)
+                .addString("variationType", flag.variationType.name())
+                .addString("allocationKey", allocation.key)
+                .addLong("__dd_eval_timestamp_ms", evalTimestampMs)
+                .addBoolean(METADATA_OBSERVE_FULL_EVALUATION_DATA, observeFullEvaluationData);
+        // Surface the UFC split's serial id and the allocation's doLog flag for APM span enrichment —
+        // only when span enrichment is on, so a provider without enrichment pays nothing extra.
+        // __dd_split_serial_id is omitted when the split carries no serial id; __dd_do_log is always
+        // present (when enrichment is on) so the span-enrichment hook can decide whether to record the
+        // subject.
+        if (SPAN_ENRICHMENT_ENABLED) {
+            if (SPLIT_SERIAL_ID_SUPPORTED.get() && split.serialId != null) {
+                metadataBuilder.addInteger(METADATA_SPLIT_SERIAL_ID, split.serialId);
+            }
+            metadataBuilder.addBoolean(METADATA_DO_LOG, allocation.doLog != null && allocation.doLog);
+        }
+        final ProviderEvaluation<T> result = ProviderEvaluation.<T>builder()
+                .value(mappedValue)
+                .reason(
+                        !isEmpty(allocation.rules)
+                                ? Reason.TARGETING_MATCH.name()
+                                : allocation.startAt != null || allocation.endAt != null
+                                        ? Reason.DEFAULT.name()
+                                        : !isEmpty(split.shards) ? Reason.SPLIT.name() : Reason.STATIC.name())
+                .variant(variant.key)
+                .flagMetadata(metadataBuilder.build())
+                .build();
+        final boolean doLog = allocation.doLog != null && allocation.doLog;
+        if (doLog) {
+            dispatchExposure(key, result, context, split);
+        }
+        return result;
     }
-    if (target == Boolean.class) {
-      if (value instanceof Number) {
-        return (T) (Boolean) (parseDouble(value) != 0);
-      }
-      return (T) Boolean.valueOf(value.toString());
+
+    private static Object resolveAttribute(final String name, final EvaluationContext context) {
+        // Special handling for "id" attribute: if not explicitly provided, use targeting key
+        if ("id".equals(name) && !context.keySet().contains(name)) {
+            return context.getTargetingKey();
+        }
+        final Value resolved = context.getValue(name);
+        return context.convertValue(resolved);
     }
-    if (target == Integer.class) {
-      final Double number = parseDouble(value);
-      return (T) (Integer) number.intValue();
+
+    private static boolean isTypeCompatible(final Class<?> target, final ValueType variationType) {
+        if (variationType == null) {
+            return true; // No type info — allow any
+        }
+        switch (variationType) {
+            case BOOLEAN:
+                return target == Boolean.class;
+            case STRING:
+                return target == String.class;
+            case INTEGER:
+                return target == Integer.class;
+            case NUMERIC:
+                return target == Double.class;
+            case JSON:
+                return target == Value.class;
+            default:
+                return true; // Unknown types pass through — mapValue errors caught as GENERAL
+        }
     }
-    if (target == Double.class) {
-      final Double number = parseDouble(value);
-      return (T) number;
+
+    @SuppressWarnings("unchecked")
+    static <T> T mapValue(final Class<T> target, final Object value) {
+        if (value == null) {
+            return null;
+        }
+        if (!SUPPORTED_RESOLUTION_TYPES.contains(target)) {
+            throw new IllegalArgumentException("Type not supported: " + target);
+        }
+        if (target.isInstance(value)) {
+            return target.cast(value);
+        }
+        if (target == String.class) {
+            return (T) String.valueOf(value);
+        }
+        if (target == Boolean.class) {
+            if (value instanceof Number) {
+                return (T) (Boolean) (parseDouble(value) != 0);
+            }
+            return (T) Boolean.valueOf(value.toString());
+        }
+        if (target == Integer.class) {
+            final Double number = parseDouble(value);
+            return (T) (Integer) number.intValue();
+        }
+        if (target == Double.class) {
+            final Double number = parseDouble(value);
+            return (T) number;
+        }
+        return (T) Value.objectToValue(value);
     }
-    return (T) Value.objectToValue(value);
-  }
 
-  private static Double parseDouble(final Object value) {
-    if (value instanceof Number) {
-      return ((Number) value).doubleValue();
+    private static Double parseDouble(final Object value) {
+        if (value instanceof Number) {
+            return ((Number) value).doubleValue();
+        }
+        return Double.parseDouble(String.valueOf(value));
+    }
+
+    private static <T> void dispatchExposure(
+            final String flag,
+            final ProviderEvaluation<T> evaluation,
+            final EvaluationContext context,
+            final Split split) {
+        final String allocationKey = allocationKey(evaluation);
+        final String variantKey = evaluation.getVariant();
+        if (allocationKey == null || variantKey == null) {
+            return;
+        }
+        final long timestamp = System.currentTimeMillis();
+        // Exposure types share names with the imported UFC Allocation, Flag, and Variant types.
+        final datadog.trace.api.featureflag.exposure.Allocation allocation =
+                new datadog.trace.api.featureflag.exposure.Allocation(allocationKey);
+        final datadog.trace.api.featureflag.exposure.Flag exposureFlag =
+                new datadog.trace.api.featureflag.exposure.Flag(flag);
+        final datadog.trace.api.featureflag.exposure.Variant variant =
+                new datadog.trace.api.featureflag.exposure.Variant(variantKey);
+        final Subject subject = new Subject(context.getTargetingKey(), flattenContext(context));
+
+        final ExposureEvent event = USE_LEGACY_EXPOSURE_API.get()
+                ? new ExposureEvent(timestamp, allocation, exposureFlag, variant, subject)
+                : new ExposureEvent(timestamp, allocation, exposureFlag, variant, subject, split.serialId);
+        FeatureFlaggingGateway.dispatch(event);
     }
-    return Double.parseDouble(String.valueOf(value));
-  }
-
-  private static <T> void dispatchExposure(
-      final String flag,
-      final ProviderEvaluation<T> evaluation,
-      final EvaluationContext context,
-      final Split split) {
-    final String allocationKey = allocationKey(evaluation);
-    final String variantKey = evaluation.getVariant();
-    if (allocationKey == null || variantKey == null) {
-      return;
+
+    private static <T> String allocationKey(final ProviderEvaluation<T> resolution) {
+        final ImmutableMetadata meta = resolution.getFlagMetadata();
+        return meta == null ? null : meta.getString("allocationKey");
     }
-    final long timestamp = System.currentTimeMillis();
-    // Exposure types share names with the imported UFC Allocation, Flag, and Variant types.
-    final datadog.trace.api.featureflag.exposure.Allocation allocation =
-        new datadog.trace.api.featureflag.exposure.Allocation(allocationKey);
-    final datadog.trace.api.featureflag.exposure.Flag exposureFlag =
-        new datadog.trace.api.featureflag.exposure.Flag(flag);
-    final datadog.trace.api.featureflag.exposure.Variant variant =
-        new datadog.trace.api.featureflag.exposure.Variant(variantKey);
-    final Subject subject = new Subject(context.getTargetingKey(), flattenContext(context));
-
-    final ExposureEvent event =
-        USE_LEGACY_EXPOSURE_API.get()
-            ? new ExposureEvent(timestamp, allocation, exposureFlag, variant, subject)
-            : new ExposureEvent(
-                timestamp, allocation, exposureFlag, variant, subject, split.serialId);
-    FeatureFlaggingGateway.dispatch(event);
-  }
-
-  private static <T> String allocationKey(final ProviderEvaluation<T> resolution) {
-    final ImmutableMetadata meta = resolution.getFlagMetadata();
-    return meta == null ? null : meta.getString("allocationKey");
-  }
-
-  static AbstractMap<String, Object> flattenContext(final EvaluationContext context) {
-    return flattenValues(snapshotValues(context));
-  }
-
-  static Map<String, Value> snapshotValues(final EvaluationContext context) {
-    final HashMap<String, Value> values = new HashMap<>();
-    final Set<Object> seenContainers = Collections.newSetFromMap(new IdentityHashMap<>());
-    for (final String key : context.keySet()) {
-      values.put(key, snapshotValue(context.getValue(key), seenContainers, 0));
+
+    static AbstractMap<String, Object> flattenContext(final EvaluationContext context) {
+        return flattenValues(snapshotValues(context));
     }
-    return values;
-  }
-
-  private static Value snapshotValue(
-      final Value value, final Set<Object> seenContainers, final int depth) {
-    if (value == null) {
-      return null;
-    } else if (value.isNull()) {
-      return new Value();
-    } else if (value.isBoolean()) {
-      return new Value(value.asBoolean());
-    } else if (value.isNumber()) {
-      final Object number = value.asObject();
-      return number instanceof Integer
-          ? new Value((Integer) number)
-          : new Value(((Number) number).doubleValue());
-    } else if (value.isString()) {
-      return new Value(value.asString());
-    } else if (value.isInstant()) {
-      return new Value(value.asInstant());
-    } else if (value.isList()) {
-      final List<Value> list = value.asList();
-      if (depth >= MAX_SNAPSHOT_DEPTH || !seenContainers.add(list)) {
-        return new Value();
-      }
-      final List<Value> snapshot = new ArrayList<>(list.size());
-      for (final Value item : list) {
-        snapshot.add(snapshotValue(item, seenContainers, depth + 1));
-      }
-      seenContainers.remove(list);
-      return new Value(Collections.unmodifiableList(snapshot));
-    } else if (value.isStructure()) {
-      final Structure structure = value.asStructure();
-      if (depth >= MAX_SNAPSHOT_DEPTH || !seenContainers.add(structure)) {
-        return new Value();
-      }
-      final Map<String, Value> snapshot = new HashMap<>();
-      for (final String key : structure.keySet()) {
-        snapshot.put(key, snapshotValue(structure.getValue(key), seenContainers, depth + 1));
-      }
-      seenContainers.remove(structure);
-      return new Value(new ImmutableStructure(snapshot));
+
+    static Map<String, Value> snapshotValues(final EvaluationContext context) {
+        final HashMap<String, Value> values = new HashMap<>();
+        final Set<Object> seenContainers = Collections.newSetFromMap(new IdentityHashMap<>());
+        for (final String key : context.keySet()) {
+            values.put(key, snapshotValue(context.getValue(key), seenContainers, 0));
+        }
+        return values;
     }
-    throw new IllegalArgumentException("Unsupported OpenFeature value type: " + value);
-  }
-
-  static AbstractMap<String, Object> flattenValues(final Map<String, Value> values) {
-    final HashMap<String, Object> result = new HashMap<>();
-    final Set<Object> seenContainers = Collections.newSetFromMap(new IdentityHashMap<>());
-    for (final Map.Entry<String, Value> root : values.entrySet()) {
-      final Deque<FlattenEntry> deque = new LinkedList<>();
-      deque.push(new FlattenEntry(root.getKey(), root.getValue()));
-      while (!deque.isEmpty()) {
-        final FlattenEntry entry = deque.pop();
-        final Value value = entry.value;
+
+    private static Value snapshotValue(final Value value, final Set<Object> seenContainers, final int depth) {
         if (value == null) {
-          result.put(entry.key, null);
+            return null;
+        } else if (value.isNull()) {
+            return new Value();
+        } else if (value.isBoolean()) {
+            return new Value(value.asBoolean());
+        } else if (value.isNumber()) {
+            final Object number = value.asObject();
+            return number instanceof Integer ? new Value((Integer) number) : new Value(((Number) number).doubleValue());
+        } else if (value.isString()) {
+            return new Value(value.asString());
+        } else if (value.isInstant()) {
+            return new Value(value.asInstant());
         } else if (value.isList()) {
-          final List<Value> list = value.asList();
-          if (seenContainers.add(list)) {
-            for (int i = 0; i < list.size(); i++) {
-              deque.push(new FlattenEntry(entry.key + "[" + i + "]", list.get(i)));
+            final List<Value> list = value.asList();
+            if (depth >= MAX_SNAPSHOT_DEPTH || !seenContainers.add(list)) {
+                return new Value();
             }
-          }
+            final List<Value> snapshot = new ArrayList<>(list.size());
+            for (final Value item : list) {
+                snapshot.add(snapshotValue(item, seenContainers, depth + 1));
+            }
+            seenContainers.remove(list);
+            return new Value(Collections.unmodifiableList(snapshot));
         } else if (value.isStructure()) {
-          final Structure structure = value.asStructure();
-          if (seenContainers.add(structure)) {
-            for (final String property : structure.keySet()) {
-              deque.push(
-                  new FlattenEntry(entry.key + "." + property, structure.getValue(property)));
+            final Structure structure = value.asStructure();
+            if (depth >= MAX_SNAPSHOT_DEPTH || !seenContainers.add(structure)) {
+                return new Value();
             }
-          }
-        } else {
-          result.put(entry.key, convertValue(value));
+            final Map<String, Value> snapshot = new HashMap<>();
+            for (final String key : structure.keySet()) {
+                snapshot.put(key, snapshotValue(structure.getValue(key), seenContainers, depth + 1));
+            }
+            seenContainers.remove(structure);
+            return new Value(new ImmutableStructure(snapshot));
         }
-      }
-    }
-    return result;
-  }
-
-  private static Object convertValue(final Value value) {
-    if (value == null || value.isNull()) {
-      return null;
-    } else if (value.isBoolean()) {
-      return value.asBoolean();
-    } else if (value.isNumber()) {
-      return value.asObject();
-    } else if (value.isString()) {
-      return value.asString();
-    } else if (value.isInstant()) {
-      return value.asInstant().toString();
-    }
-    throw new IllegalArgumentException("Unsupported OpenFeature value type: " + value);
-  }
-
-  // Reason-code bitmask constants used by copyPrunedContext to track which caps fired.
-  static final int REASON_MAX_CONTEXT_FIELDS = 1;
-  static final int REASON_MAX_KEY_LENGTH = 1 << 1;
-  static final int REASON_MAX_VALUE_LENGTH = 1 << 2;
-  static final int REASON_MAX_LIST_ELEMENTS = 1 << 3;
-  static final int REASON_MAX_STRUCTURE_PROPERTIES = 1 << 4;
-  static final int REASON_MAX_SNAPSHOT_DEPTH = 1 << 5;
-  static final int REASON_CYCLE = 1 << 6;
-
-  /** Sorted reason-code strings, indexed by their bit position in the bitmask. */
-  private static final String[] REASON_NAMES = {
-    "max_context_fields",
-    "max_key_length",
-    "max_value_length",
-    "max_list_elements",
-    "max_structure_properties",
-    "max_snapshot_depth",
-    "cycle",
-  };
-
-  /**
-   * Builds the sorted, comma-separated reason tag string from a bitmask of fired reason codes.
-   * Returns null when no reason bit is set (no truncation occurred). The returned string is ready
-   * to use directly as the "reason:..." tag value.
-   */
-  static String truncationReasonTag(final int reasonMask) {
-    if (reasonMask == 0) {
-      return null;
-    }
-    final StringBuilder sb = new StringBuilder();
-    for (int bit = 0; bit < REASON_NAMES.length; bit++) {
-      if ((reasonMask & (1 << bit)) != 0) {
-        if (sb.length() > 0) {
-          sb.append(',');
+        throw new IllegalArgumentException("Unsupported OpenFeature value type: " + value);
+    }
+
+    static AbstractMap<String, Object> flattenValues(final Map<String, Value> values) {
+        final HashMap<String, Object> result = new HashMap<>();
+        final Set<Object> seenContainers = Collections.newSetFromMap(new IdentityHashMap<>());
+        for (final Map.Entry<String, Value> root : values.entrySet()) {
+            final Deque<FlattenEntry> deque = new LinkedList<>();
+            deque.push(new FlattenEntry(root.getKey(), root.getValue()));
+            while (!deque.isEmpty()) {
+                final FlattenEntry entry = deque.pop();
+                final Value value = entry.value;
+                if (value == null) {
+                    result.put(entry.key, null);
+                } else if (value.isList()) {
+                    final List<Value> list = value.asList();
+                    if (seenContainers.add(list)) {
+                        for (int i = 0; i < list.size(); i++) {
+                            deque.push(new FlattenEntry(entry.key + "[" + i + "]", list.get(i)));
+                        }
+                    }
+                } else if (value.isStructure()) {
+                    final Structure structure = value.asStructure();
+                    if (seenContainers.add(structure)) {
+                        for (final String property : structure.keySet()) {
+                            deque.push(new FlattenEntry(entry.key + "." + property, structure.getValue(property)));
+                        }
+                    }
+                } else {
+                    result.put(entry.key, convertValue(value));
+                }
+            }
         }
-        sb.append(REASON_NAMES[bit]);
-      }
-    }
-    return sb.toString();
-  }
-
-  /**
-   * Result of copyPrunedContext: the pruned attribute map plus an optional reason tag describing
-   * which caps fired during the walk. truncatedReason is null when no truncation occurred, so
-   * callers can skip the telemetry path with a single null check.
-   */
-  static final class CopyResult {
-    final Map<String, Object> attrs;
-
-    /** Non-null when at least one cap fired; ready to use as the "reason:..." tag value. */
-    final String truncatedReason;
-
-    CopyResult(final Map<String, Object> attrs, final String truncatedReason) {
-      this.attrs = attrs;
-      this.truncatedReason = truncatedReason;
-    }
-  }
-
-  /**
-   * Single-pass bounded copy of a caller-owned EvaluationContext into the flattened, pruned map
-   * stored on a FlagEvalEvent and later canonicalized by the aggregator.
-   *
-   * <p>Every retained-size dimension is capped inline so the hot path performs work proportional to
-   * what is kept, never to what the caller supplied: MAX_CONTEXT_FIELDS - stop iterating the
-   * top-level context past this many retained fields MAX_KEY_LENGTH - skip fields whose flattened
-   * key exceeds this length (also enforced on every path segment produced by descending into
-   * lists/structures) MAX_VALUE_LENGTH - skip string values exceeding this length MAX_LIST_ELEMENTS
-   * - stop iterating a list past this many elements MAX_STRUCTURE_PROPERTIES - stop iterating a
-   * structure past this many properties MAX_SNAPSHOT_DEPTH - stop descending into lists/structures
-   * past this depth Cycle guard - identity-tracked containers currently on the recursion stack are
-   * treated as leaves
-   *
-   * <p>All numeric limits are named constants so they can be tuned independently.
-   *
-   * <p>Returns a CopyResult whose attrs is an empty map for null/empty input and whose
-   * truncatedReason is non-null when at least one cap fired. The returned map is a plain HashMap;
-   * canonical-key sorting happens once in the aggregator, off the hot path.
-   */
-  static CopyResult copyPrunedContext(final EvaluationContext context) {
-    if (context == null) {
-      return new CopyResult(Collections.emptyMap(), null);
-    }
-    final Set<String> keys = context.keySet();
-    if (keys.isEmpty()) {
-      return new CopyResult(Collections.emptyMap(), null);
-    }
-    final HashMap<String, Object> out = new HashMap<>();
-    final Set<Object> seen = Collections.newSetFromMap(new IdentityHashMap<>());
-    final int[] reasonMask = {0};
-    for (final String key : keys) {
-      if (out.size() >= MAX_CONTEXT_FIELDS) {
-        reasonMask[0] |= REASON_MAX_CONTEXT_FIELDS;
-        break;
-      }
-      if (EvaluationContext.TARGETING_KEY.equals(key)) {
-        continue;
-      }
-      copyPrunedValue(out, key, context.getValue(key), seen, 0, reasonMask);
-    }
-    final Map<String, Object> attrs = out.isEmpty() ? Collections.emptyMap() : out;
-    return new CopyResult(attrs, truncationReasonTag(reasonMask[0]));
-  }
-
-  private static void copyPrunedValue(
-      final Map<String, Object> out,
-      final String key,
-      final Value value,
-      final Set<Object> seen,
-      final int depth,
-      final int[] reasonMask) {
-    if (out.size() >= MAX_CONTEXT_FIELDS) {
-      reasonMask[0] |= REASON_MAX_CONTEXT_FIELDS;
-      return;
-    }
-    if (key.length() > MAX_KEY_LENGTH) {
-      reasonMask[0] |= REASON_MAX_KEY_LENGTH;
-      return;
-    }
-    if (value == null || value.isNull()) {
-      out.put(key, null);
-      return;
+        return result;
+    }
+
+    private static Object convertValue(final Value value) {
+        if (value == null || value.isNull()) {
+            return null;
+        } else if (value.isBoolean()) {
+            return value.asBoolean();
+        } else if (value.isNumber()) {
+            return value.asObject();
+        } else if (value.isString()) {
+            return value.asString();
+        } else if (value.isInstant()) {
+            return value.asInstant().toString();
+        }
+        throw new IllegalArgumentException("Unsupported OpenFeature value type: " + value);
+    }
+
+    // Reason-code bitmask constants used by copyPrunedContext to track which caps fired.
+    static final int REASON_MAX_CONTEXT_FIELDS = 1;
+    static final int REASON_MAX_KEY_LENGTH = 1 << 1;
+    static final int REASON_MAX_VALUE_LENGTH = 1 << 2;
+    static final int REASON_MAX_LIST_ELEMENTS = 1 << 3;
+    static final int REASON_MAX_STRUCTURE_PROPERTIES = 1 << 4;
+    static final int REASON_MAX_SNAPSHOT_DEPTH = 1 << 5;
+    static final int REASON_CYCLE = 1 << 6;
+
+    /** Sorted reason-code strings, indexed by their bit position in the bitmask. */
+    private static final String[] REASON_NAMES = {
+        "max_context_fields",
+        "max_key_length",
+        "max_value_length",
+        "max_list_elements",
+        "max_structure_properties",
+        "max_snapshot_depth",
+        "cycle",
+    };
+
+    /**
+     * Builds the sorted, comma-separated reason tag string from a bitmask of fired reason codes.
+     * Returns null when no reason bit is set (no truncation occurred). The returned string is ready
+     * to use directly as the "reason:..." tag value.
+     */
+    static String truncationReasonTag(final int reasonMask) {
+        if (reasonMask == 0) {
+            return null;
+        }
+        final StringBuilder sb = new StringBuilder();
+        for (int bit = 0; bit < REASON_NAMES.length; bit++) {
+            if ((reasonMask & (1 << bit)) != 0) {
+                if (sb.length() > 0) {
+                    sb.append(',');
+                }
+                sb.append(REASON_NAMES[bit]);
+            }
+        }
+        return sb.toString();
     }
-    if (value.isString()) {
-      final String s = value.asString();
-      if (s.length() > MAX_VALUE_LENGTH) {
-        reasonMask[0] |= REASON_MAX_VALUE_LENGTH;
-        return;
-      }
-      out.put(key, s);
-      return;
+
+    /**
+     * Result of copyPrunedContext: the pruned attribute map plus an optional reason tag describing
+     * which caps fired during the walk. truncatedReason is null when no truncation occurred, so
+     * callers can skip the telemetry path with a single null check.
+     */
+    static final class CopyResult {
+        final Map<String, Object> attrs;
+
+        /** Non-null when at least one cap fired; ready to use as the "reason:..." tag value. */
+        final String truncatedReason;
+
+        CopyResult(final Map<String, Object> attrs, final String truncatedReason) {
+            this.attrs = attrs;
+            this.truncatedReason = truncatedReason;
+        }
     }
-    if (value.isBoolean() || value.isNumber() || value.isInstant()) {
-      out.put(key, convertValue(value));
-      return;
+
+    /**
+     * Single-pass bounded copy of a caller-owned EvaluationContext into the flattened, pruned map
+     * stored on a FlagEvalEvent and later canonicalized by the aggregator.
+     *
+     * <p>Every retained-size dimension is capped inline so the hot path performs work proportional to
+     * what is kept, never to what the caller supplied: MAX_CONTEXT_FIELDS - stop iterating the
+     * top-level context past this many retained fields MAX_KEY_LENGTH - skip fields whose flattened
+     * key exceeds this length (also enforced on every path segment produced by descending into
+     * lists/structures) MAX_VALUE_LENGTH - skip string values exceeding this length MAX_LIST_ELEMENTS
+     * - stop iterating a list past this many elements MAX_STRUCTURE_PROPERTIES - stop iterating a
+     * structure past this many properties MAX_SNAPSHOT_DEPTH - stop descending into lists/structures
+     * past this depth Cycle guard - identity-tracked containers currently on the recursion stack are
+     * treated as leaves
+     *
+     * <p>All numeric limits are named constants so they can be tuned independently.
+     *
+     * <p>Returns a CopyResult whose attrs is an empty map for null/empty input and whose
+     * truncatedReason is non-null when at least one cap fired. The returned map is a plain HashMap;
+     * canonical-key sorting happens once in the aggregator, off the hot path.
+     */
+    static CopyResult copyPrunedContext(final EvaluationContext context) {
+        if (context == null) {
+            return new CopyResult(Collections.emptyMap(), null);
+        }
+        final Set<String> keys = context.keySet();
+        if (keys.isEmpty()) {
+            return new CopyResult(Collections.emptyMap(), null);
+        }
+        final HashMap<String, Object> out = new HashMap<>();
+        final Set<Object> seen = Collections.newSetFromMap(new IdentityHashMap<>());
+        final int[] reasonMask = {0};
+        for (final String key : keys) {
+            if (out.size() >= MAX_CONTEXT_FIELDS) {
+                reasonMask[0] |= REASON_MAX_CONTEXT_FIELDS;
+                break;
+            }
+            if (EvaluationContext.TARGETING_KEY.equals(key)) {
+                continue;
+            }
+            copyPrunedValue(out, key, context.getValue(key), seen, 0, reasonMask);
+        }
+        final Map<String, Object> attrs = out.isEmpty() ? Collections.emptyMap() : out;
+        return new CopyResult(attrs, truncationReasonTag(reasonMask[0]));
     }
-    if (value.isList()) {
-      final List<Value> list = value.asList();
-      if (depth >= MAX_SNAPSHOT_DEPTH) {
-        reasonMask[0] |= REASON_MAX_SNAPSHOT_DEPTH;
-        return;
-      }
-      if (!seen.add(list)) {
-        reasonMask[0] |= REASON_CYCLE;
-        return;
-      }
-      if (list.size() > MAX_LIST_ELEMENTS) {
-        reasonMask[0] |= REASON_MAX_LIST_ELEMENTS;
-      }
-      final int limit = Math.min(list.size(), MAX_LIST_ELEMENTS);
-      for (int i = 0; i < limit; i++) {
+
+    private static void copyPrunedValue(
+            final Map<String, Object> out,
+            final String key,
+            final Value value,
+            final Set<Object> seen,
+            final int depth,
+            final int[] reasonMask) {
         if (out.size() >= MAX_CONTEXT_FIELDS) {
-          reasonMask[0] |= REASON_MAX_CONTEXT_FIELDS;
-          break;
+            reasonMask[0] |= REASON_MAX_CONTEXT_FIELDS;
+            return;
         }
-        copyPrunedValue(out, key + "[" + i + "]", list.get(i), seen, depth + 1, reasonMask);
-      }
-      seen.remove(list);
-      return;
-    }
-    if (value.isStructure()) {
-      final Structure structure = value.asStructure();
-      if (depth >= MAX_SNAPSHOT_DEPTH) {
-        reasonMask[0] |= REASON_MAX_SNAPSHOT_DEPTH;
-        return;
-      }
-      if (!seen.add(structure)) {
-        reasonMask[0] |= REASON_CYCLE;
-        return;
-      }
-      int walked = 0;
-      for (final String property : structure.keySet()) {
-        if (walked >= MAX_STRUCTURE_PROPERTIES) {
-          reasonMask[0] |= REASON_MAX_STRUCTURE_PROPERTIES;
-          break;
+        if (key.length() > MAX_KEY_LENGTH) {
+            reasonMask[0] |= REASON_MAX_KEY_LENGTH;
+            return;
         }
-        if (out.size() >= MAX_CONTEXT_FIELDS) {
-          reasonMask[0] |= REASON_MAX_CONTEXT_FIELDS;
-          break;
+        if (value == null || value.isNull()) {
+            out.put(key, null);
+            return;
+        }
+        if (value.isString()) {
+            final String s = value.asString();
+            if (s.length() > MAX_VALUE_LENGTH) {
+                reasonMask[0] |= REASON_MAX_VALUE_LENGTH;
+                return;
+            }
+            out.put(key, s);
+            return;
+        }
+        if (value.isBoolean() || value.isNumber() || value.isInstant()) {
+            out.put(key, convertValue(value));
+            return;
+        }
+        if (value.isList()) {
+            final List<Value> list = value.asList();
+            if (depth >= MAX_SNAPSHOT_DEPTH) {
+                reasonMask[0] |= REASON_MAX_SNAPSHOT_DEPTH;
+                return;
+            }
+            if (!seen.add(list)) {
+                reasonMask[0] |= REASON_CYCLE;
+                return;
+            }
+            if (list.size() > MAX_LIST_ELEMENTS) {
+                reasonMask[0] |= REASON_MAX_LIST_ELEMENTS;
+            }
+            final int limit = Math.min(list.size(), MAX_LIST_ELEMENTS);
+            for (int i = 0; i < limit; i++) {
+                if (out.size() >= MAX_CONTEXT_FIELDS) {
+                    reasonMask[0] |= REASON_MAX_CONTEXT_FIELDS;
+                    break;
+                }
+                copyPrunedValue(out, key + "[" + i + "]", list.get(i), seen, depth + 1, reasonMask);
+            }
+            seen.remove(list);
+            return;
+        }
+        if (value.isStructure()) {
+            final Structure structure = value.asStructure();
+            if (depth >= MAX_SNAPSHOT_DEPTH) {
+                reasonMask[0] |= REASON_MAX_SNAPSHOT_DEPTH;
+                return;
+            }
+            if (!seen.add(structure)) {
+                reasonMask[0] |= REASON_CYCLE;
+                return;
+            }
+            int walked = 0;
+            for (final String property : structure.keySet()) {
+                if (walked >= MAX_STRUCTURE_PROPERTIES) {
+                    reasonMask[0] |= REASON_MAX_STRUCTURE_PROPERTIES;
+                    break;
+                }
+                if (out.size() >= MAX_CONTEXT_FIELDS) {
+                    reasonMask[0] |= REASON_MAX_CONTEXT_FIELDS;
+                    break;
+                }
+                walked++;
+                copyPrunedValue(out, key + "." + property, structure.getValue(property), seen, depth + 1, reasonMask);
+            }
+            seen.remove(structure);
         }
-        walked++;
-        copyPrunedValue(
-            out, key + "." + property, structure.getValue(property), seen, depth + 1, reasonMask);
-      }
-      seen.remove(structure);
     }
-  }
 
-  @FunctionalInterface
-  private interface NumberComparator {
-    boolean compare(double a, double b);
-  }
+    @FunctionalInterface
+    private interface NumberComparator {
+        boolean compare(double a, double b);
+    }
 
-  @FunctionalInterface
-  private interface SemverComparator {
-    boolean compare(int ordering);
-  }
+    @FunctionalInterface
+    private interface SemverComparator {
+        boolean compare(int ordering);
+    }
 
-  private static class FlattenEntry {
-    private final String key;
-    private final Value value;
+    private static class FlattenEntry {
+        private final String key;
+        private final Value value;
 
-    private FlattenEntry(final String key, final Value value) {
-      this.key = key;
-      this.value = value;
+        private FlattenEntry(final String key, final Value value) {
+            this.key = key;
+            this.value = value;
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/Evaluator.java b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/Evaluator.java
index f4c9cacffdb..e4ea53059ca 100644
--- a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/Evaluator.java
+++ b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/Evaluator.java
@@ -6,12 +6,11 @@
 
 interface Evaluator {
 
-  boolean initialize(long timeout, TimeUnit timeUnit, EvaluationContext context) throws Exception;
+    boolean initialize(long timeout, TimeUnit timeUnit, EvaluationContext context) throws Exception;
 
-  boolean hasConfiguration();
+    boolean hasConfiguration();
 
-  void shutdown();
+    void shutdown();
 
-  <T> ProviderEvaluation<T> evaluate(
-      Class<T> target, String key, T defaultValue, EvaluationContext context);
+    <T> ProviderEvaluation<T> evaluate(Class<T> target, String key, T defaultValue, EvaluationContext context);
 }
diff --git a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/FlagEvalLoggingHook.java b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/FlagEvalLoggingHook.java
index 322f11ac9e1..d7ea4fc19e7 100644
--- a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/FlagEvalLoggingHook.java
+++ b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/FlagEvalLoggingHook.java
@@ -33,136 +33,131 @@
  */
 class FlagEvalLoggingHook<T> implements Hook<T> {
 
-  /**
-   * Singleton instance: always registered when the provider is created; harmless when writer=null
-   * (killswitch off or not yet started).
-   */
-  static final FlagEvalLoggingHook<Object> INSTANCE = new FlagEvalLoggingHook<>();
-
-  /**
-   * Writer resolver. Production instances resolve through FeatureFlaggingGateway; tests can inject
-   * a direct writer or a resolver that simulates old-bootstrap linkage failures.
-   */
-  private final Supplier<FlagEvaluationWriter> writerSupplier;
-
-  /** Production constructor - resolves writer from gateway. */
-  FlagEvalLoggingHook() {
-    this(FeatureFlaggingGateway::getFlagEvalWriter);
-  }
-
-  /** Test-only constructor - injects a writer directly, bypassing the gateway. */
-  FlagEvalLoggingHook(final FlagEvaluationWriter writer) {
-    this(() -> writer);
-  }
-
-  /** Test-only constructor - injects a writer resolver directly, bypassing the gateway. */
-  FlagEvalLoggingHook(final Supplier<FlagEvaluationWriter> writerSupplier) {
-    this.writerSupplier = writerSupplier;
-  }
-
-  /**
-   * Capture + non-blocking enqueue only; no flattening, aggregation, or I/O. Runs at the finally
-   * stage so it covers success, error, and default-value paths.
-   *
-   * <p>The context snapshot taken here scales with context size/nesting - see the class javadoc for
-   * why it cannot be deferred.
-   */
-  @Override
-  public void finallyAfter(
-      final HookContext<T> ctx,
-      final FlagEvaluationDetails<T> details,
-      final Map<String, Object> hints) {
-    try {
-      if (details == null) {
-        return;
-      }
-      if (!FeatureFlaggingGateway.isFlagEvaluationEnqueueEnabled()) {
-        return;
-      }
-
-      final FlagEvaluationWriter w = writerSupplier.get();
-      if (w == null) {
-        return;
-      }
-
-      // Pre-queue guard: if the queue is already saturated, avoid the context-copy work whose
-      // result would be discarded on offer(). Best-effort — the queue can still be full at
-      // offer() time — but flips a full snapshot into an O(1) check on the drop path.
-      if (!w.hasCapacityForEnqueue()) {
-        w.countPreQueueOverflow();
-        return;
-      }
-
-      // Scalar extraction - individual typed metadata reads, no JSON, no flattening
-      final String flagKey = details.getFlagKey();
-      final ImmutableMetadata metadata = details.getFlagMetadata();
-
-      // allocationKey: "allocationKey" (camelCase) - consistent with FlagEvalMetricsHook.java
-      final String allocationKey = metadata != null ? metadata.getString("allocationKey") : null;
-
-      // eval-time: from flag metadata "__dd_eval_timestamp_ms" (Long), fallback to hook-fire time.
-      // ImmutableMetadata.getLong available since sdk 1.4+.
-      final Long evalTimeObj = metadata != null ? metadata.getLong("__dd_eval_timestamp_ms") : null;
-      final long evalTimeMs = evalTimeObj != null ? evalTimeObj : System.currentTimeMillis();
-
-      // variant: the OpenFeature variant key (same source as the OTel FlagEvalMetricsHook), NOT the
-      // evaluated value. A null variant means no variant was selected (runtime default).
-      final String variant = details.getVariant();
-
-      // targetingKey from evaluation context
-      final String targetingKey =
-          ctx != null && ctx.getCtx() != null ? ctx.getCtx().getTargetingKey() : null;
-
-      // Consent is read from metadata stamped by DDEvaluator (pinned to its ServerConfiguration).
-      // Missing key = non-DD provider → false, the privacy-preserving default.
-      final Boolean consentFromMetadata =
-          metadata != null
-              ? metadata.getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA)
-              : null;
-      final boolean observeFullEvaluationData = consentFromMetadata != null && consentFromMetadata;
-
-      // Error message: prefer the human-readable message under consent-on; under consent-off the
-      // provider's raw message can echo evaluation-context values (e.g. NumberFormatException:
-      // "For input string: \"jane.doe@...\""), so replace it with the ErrorCode name — a stable,
-      // PII-free signal. Same substitution path is used when the message is absent regardless of
-      // consent (some providers populate only the code). Null on success.
-      String errorMessage = observeFullEvaluationData ? details.getErrorMessage() : null;
-      if ((errorMessage == null || errorMessage.isEmpty()) && details.getErrorCode() != null) {
-        errorMessage = details.getErrorCode().name();
-      }
-      if (errorMessage != null && errorMessage.isEmpty()) {
-        errorMessage = null;
-      }
-
-      // On the protected path (consent-off) the evaluation context is dropped on emit and never
-      // consulted by the aggregator, so skip the bounded copy entirely — the copy cost only
-      // applies under consent-on.
-      final Map<String, Object> attrs;
-      if (observeFullEvaluationData && ctx != null && ctx.getCtx() != null) {
-        // Bounded copy of the caller's mutable context (see DDEvaluator.copyPrunedContext for
-        // every retained-size cap). Runs inline because the event is consumed asynchronously
-        // and the source context is caller-owned; work is proportional to what is retained.
-        final DDEvaluator.CopyResult copy = DDEvaluator.copyPrunedContext(ctx.getCtx());
-        if (copy.truncatedReason != null) {
-          w.countContextTruncated(copy.truncatedReason);
+    /**
+     * Singleton instance: always registered when the provider is created; harmless when writer=null
+     * (killswitch off or not yet started).
+     */
+    static final FlagEvalLoggingHook<Object> INSTANCE = new FlagEvalLoggingHook<>();
+
+    /**
+     * Writer resolver. Production instances resolve through FeatureFlaggingGateway; tests can inject
+     * a direct writer or a resolver that simulates old-bootstrap linkage failures.
+     */
+    private final Supplier<FlagEvaluationWriter> writerSupplier;
+
+    /** Production constructor - resolves writer from gateway. */
+    FlagEvalLoggingHook() {
+        this(FeatureFlaggingGateway::getFlagEvalWriter);
+    }
+
+    /** Test-only constructor - injects a writer directly, bypassing the gateway. */
+    FlagEvalLoggingHook(final FlagEvaluationWriter writer) {
+        this(() -> writer);
+    }
+
+    /** Test-only constructor - injects a writer resolver directly, bypassing the gateway. */
+    FlagEvalLoggingHook(final Supplier<FlagEvaluationWriter> writerSupplier) {
+        this.writerSupplier = writerSupplier;
+    }
+
+    /**
+     * Capture + non-blocking enqueue only; no flattening, aggregation, or I/O. Runs at the finally
+     * stage so it covers success, error, and default-value paths.
+     *
+     * <p>The context snapshot taken here scales with context size/nesting - see the class javadoc for
+     * why it cannot be deferred.
+     */
+    @Override
+    public void finallyAfter(
+            final HookContext<T> ctx, final FlagEvaluationDetails<T> details, final Map<String, Object> hints) {
+        try {
+            if (details == null) {
+                return;
+            }
+            if (!FeatureFlaggingGateway.isFlagEvaluationEnqueueEnabled()) {
+                return;
+            }
+
+            final FlagEvaluationWriter w = writerSupplier.get();
+            if (w == null) {
+                return;
+            }
+
+            // Pre-queue guard: if the queue is already saturated, avoid the context-copy work whose
+            // result would be discarded on offer(). Best-effort — the queue can still be full at
+            // offer() time — but flips a full snapshot into an O(1) check on the drop path.
+            if (!w.hasCapacityForEnqueue()) {
+                w.countPreQueueOverflow();
+                return;
+            }
+
+            // Scalar extraction - individual typed metadata reads, no JSON, no flattening
+            final String flagKey = details.getFlagKey();
+            final ImmutableMetadata metadata = details.getFlagMetadata();
+
+            // allocationKey: "allocationKey" (camelCase) - consistent with FlagEvalMetricsHook.java
+            final String allocationKey = metadata != null ? metadata.getString("allocationKey") : null;
+
+            // eval-time: from flag metadata "__dd_eval_timestamp_ms" (Long), fallback to hook-fire time.
+            // ImmutableMetadata.getLong available since sdk 1.4+.
+            final Long evalTimeObj = metadata != null ? metadata.getLong("__dd_eval_timestamp_ms") : null;
+            final long evalTimeMs = evalTimeObj != null ? evalTimeObj : System.currentTimeMillis();
+
+            // variant: the OpenFeature variant key (same source as the OTel FlagEvalMetricsHook), NOT the
+            // evaluated value. A null variant means no variant was selected (runtime default).
+            final String variant = details.getVariant();
+
+            // targetingKey from evaluation context
+            final String targetingKey =
+                    ctx != null && ctx.getCtx() != null ? ctx.getCtx().getTargetingKey() : null;
+
+            // Consent is read from metadata stamped by DDEvaluator (pinned to its ServerConfiguration).
+            // Missing key = non-DD provider → false, the privacy-preserving default.
+            final Boolean consentFromMetadata =
+                    metadata != null ? metadata.getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA) : null;
+            final boolean observeFullEvaluationData = consentFromMetadata != null && consentFromMetadata;
+
+            // Error message: prefer the human-readable message under consent-on; under consent-off the
+            // provider's raw message can echo evaluation-context values (e.g. NumberFormatException:
+            // "For input string: \"jane.doe@...\""), so replace it with the ErrorCode name — a stable,
+            // PII-free signal. Same substitution path is used when the message is absent regardless of
+            // consent (some providers populate only the code). Null on success.
+            String errorMessage = observeFullEvaluationData ? details.getErrorMessage() : null;
+            if ((errorMessage == null || errorMessage.isEmpty()) && details.getErrorCode() != null) {
+                errorMessage = details.getErrorCode().name();
+            }
+            if (errorMessage != null && errorMessage.isEmpty()) {
+                errorMessage = null;
+            }
+
+            // On the protected path (consent-off) the evaluation context is dropped on emit and never
+            // consulted by the aggregator, so skip the bounded copy entirely — the copy cost only
+            // applies under consent-on.
+            final Map<String, Object> attrs;
+            if (observeFullEvaluationData && ctx != null && ctx.getCtx() != null) {
+                // Bounded copy of the caller's mutable context (see DDEvaluator.copyPrunedContext for
+                // every retained-size cap). Runs inline because the event is consumed asynchronously
+                // and the source context is caller-owned; work is proportional to what is retained.
+                final DDEvaluator.CopyResult copy = DDEvaluator.copyPrunedContext(ctx.getCtx());
+                if (copy.truncatedReason != null) {
+                    w.countContextTruncated(copy.truncatedReason);
+                }
+                attrs = copy.attrs;
+            } else {
+                attrs = Collections.emptyMap();
+            }
+
+            w.enqueue(new FlagEvalEvent(
+                    flagKey,
+                    variant,
+                    allocationKey,
+                    targetingKey,
+                    errorMessage,
+                    evalTimeMs,
+                    observeFullEvaluationData,
+                    attrs));
+        } catch (LinkageError e) {
+            // Never let EVP recording break flag evaluation
         }
-        attrs = copy.attrs;
-      } else {
-        attrs = Collections.emptyMap();
-      }
-
-      w.enqueue(
-          new FlagEvalEvent(
-              flagKey,
-              variant,
-              allocationKey,
-              targetingKey,
-              errorMessage,
-              evalTimeMs,
-              observeFullEvaluationData,
-              attrs));
-    } catch (LinkageError e) {
-      // Never let EVP recording break flag evaluation
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/FlagEvalMetrics.java b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/FlagEvalMetrics.java
index eba3b7ba4b5..ba5c7c53a48 100644
--- a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/FlagEvalMetrics.java
+++ b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/FlagEvalMetrics.java
@@ -13,87 +13,83 @@
 
 class FlagEvalMetrics implements Closeable {
 
-  private static final Logger log = LoggerFactory.getLogger(FlagEvalMetrics.class);
+    private static final Logger log = LoggerFactory.getLogger(FlagEvalMetrics.class);
 
-  private static final String METER_NAME = "ddtrace.openfeature";
-  private static final String METRIC_NAME = "feature_flag.evaluations";
-  private static final String METRIC_UNIT = "{evaluation}";
-  private static final String METRIC_DESC = "Number of feature flag evaluations";
+    private static final String METER_NAME = "ddtrace.openfeature";
+    private static final String METRIC_NAME = "feature_flag.evaluations";
+    private static final String METRIC_UNIT = "{evaluation}";
+    private static final String METRIC_DESC = "Number of feature flag evaluations";
 
-  private static final AttributeKey<String> ATTR_FLAG_KEY =
-      AttributeKey.stringKey("feature_flag.key");
-  private static final AttributeKey<String> ATTR_VARIANT =
-      AttributeKey.stringKey("feature_flag.result.variant");
-  private static final AttributeKey<String> ATTR_REASON =
-      AttributeKey.stringKey("feature_flag.result.reason");
-  private static final AttributeKey<String> ATTR_ERROR_TYPE = AttributeKey.stringKey("error.type");
-  private static final AttributeKey<String> ATTR_ALLOCATION_KEY =
-      AttributeKey.stringKey("feature_flag.result.allocation_key");
+    private static final AttributeKey<String> ATTR_FLAG_KEY = AttributeKey.stringKey("feature_flag.key");
+    private static final AttributeKey<String> ATTR_VARIANT = AttributeKey.stringKey("feature_flag.result.variant");
+    private static final AttributeKey<String> ATTR_REASON = AttributeKey.stringKey("feature_flag.result.reason");
+    private static final AttributeKey<String> ATTR_ERROR_TYPE = AttributeKey.stringKey("error.type");
+    private static final AttributeKey<String> ATTR_ALLOCATION_KEY =
+            AttributeKey.stringKey("feature_flag.result.allocation_key");
 
-  private volatile LongCounter counter;
+    private volatile LongCounter counter;
 
-  FlagEvalMetrics() {
-    try {
-      Meter meter = GlobalOpenTelemetry.get().getMeterProvider().meterBuilder(METER_NAME).build();
-      counter =
-          meter
-              .counterBuilder(METRIC_NAME)
-              .setUnit(METRIC_UNIT)
-              .setDescription(METRIC_DESC)
-              .build();
+    FlagEvalMetrics() {
+        try {
+            Meter meter = GlobalOpenTelemetry.get()
+                    .getMeterProvider()
+                    .meterBuilder(METER_NAME)
+                    .build();
+            counter = meter.counterBuilder(METRIC_NAME)
+                    .setUnit(METRIC_UNIT)
+                    .setDescription(METRIC_DESC)
+                    .build();
 
-      log.debug("Flag evaluation metrics initialized");
-    } catch (NoClassDefFoundError e) {
-      log.error(
-          "OpenTelemetry API is not on the classpath — evaluation metrics disabled. Add"
-              + " opentelemetry-api to your dependencies and enable DD_METRICS_OTEL_ENABLED to"
-              + " export flag evaluation metrics through the Datadog Java agent.",
-          e);
-      counter = null;
-    } catch (Exception e) {
-      log.error("Failed to initialize flag evaluation metrics", e);
-      counter = null;
+            log.debug("Flag evaluation metrics initialized");
+        } catch (NoClassDefFoundError e) {
+            log.error(
+                    "OpenTelemetry API is not on the classpath — evaluation metrics disabled. Add"
+                            + " opentelemetry-api to your dependencies and enable DD_METRICS_OTEL_ENABLED to"
+                            + " export flag evaluation metrics through the Datadog Java agent.",
+                    e);
+            counter = null;
+        } catch (Exception e) {
+            log.error("Failed to initialize flag evaluation metrics", e);
+            counter = null;
+        }
     }
-  }
 
-  /** Package-private constructor for testing with a mock counter. */
-  FlagEvalMetrics(LongCounter counter) {
-    this.counter = counter;
-  }
-
-  void record(
-      String flagKey, String variant, String reason, ErrorCode errorCode, String allocationKey) {
-    LongCounter c = counter;
-    if (c == null) {
-      return;
+    /** Package-private constructor for testing with a mock counter. */
+    FlagEvalMetrics(LongCounter counter) {
+        this.counter = counter;
     }
-    try {
-      AttributesBuilder builder =
-          Attributes.builder()
-              .put(ATTR_FLAG_KEY, flagKey)
-              .put(ATTR_VARIANT, variant != null ? variant : "")
-              .put(ATTR_REASON, reason != null ? reason.toLowerCase() : "unknown");
 
-      if (errorCode != null) {
-        builder.put(ATTR_ERROR_TYPE, errorCode.name().toLowerCase());
-      }
+    void record(String flagKey, String variant, String reason, ErrorCode errorCode, String allocationKey) {
+        LongCounter c = counter;
+        if (c == null) {
+            return;
+        }
+        try {
+            AttributesBuilder builder = Attributes.builder()
+                    .put(ATTR_FLAG_KEY, flagKey)
+                    .put(ATTR_VARIANT, variant != null ? variant : "")
+                    .put(ATTR_REASON, reason != null ? reason.toLowerCase() : "unknown");
+
+            if (errorCode != null) {
+                builder.put(ATTR_ERROR_TYPE, errorCode.name().toLowerCase());
+            }
 
-      if (allocationKey != null && !allocationKey.isEmpty()) {
-        builder.put(ATTR_ALLOCATION_KEY, allocationKey);
-      }
+            if (allocationKey != null && !allocationKey.isEmpty()) {
+                builder.put(ATTR_ALLOCATION_KEY, allocationKey);
+            }
 
-      c.add(1, builder.build());
-    } catch (Exception e) {
-      log.debug("Failed to record flag evaluation metric for {}", flagKey, e);
+            c.add(1, builder.build());
+        } catch (Exception e) {
+            log.debug("Failed to record flag evaluation metric for {}", flagKey, e);
+        }
     }
-  }
 
-  @Override
-  public void close() {
-    shutdown();
-  }
+    @Override
+    public void close() {
+        shutdown();
+    }
 
-  void shutdown() {
-    counter = null;
-  }
+    void shutdown() {
+        counter = null;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/FlagEvalMetricsHook.java b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/FlagEvalMetricsHook.java
index a3e0dbfc83c..cb84f01b1a8 100644
--- a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/FlagEvalMetricsHook.java
+++ b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/FlagEvalMetricsHook.java
@@ -9,33 +9,33 @@
 
 class FlagEvalMetricsHook implements Hook<Object> {
 
-  private final FlagEvalMetrics metrics;
+    private final FlagEvalMetrics metrics;
 
-  FlagEvalMetricsHook(FlagEvalMetrics metrics) {
-    this.metrics = metrics;
-  }
-
-  @Override
-  public void finallyAfter(
-      HookContext<Object> ctx, FlagEvaluationDetails<Object> details, Map<String, Object> hints) {
-    if (metrics == null || details == null) {
-      return;
+    FlagEvalMetricsHook(FlagEvalMetrics metrics) {
+        this.metrics = metrics;
     }
-    try {
-      String flagKey = details.getFlagKey();
-      String variant = details.getVariant();
-      String reason = details.getReason();
-      ErrorCode errorCode = details.getErrorCode();
 
-      String allocationKey = null;
-      ImmutableMetadata metadata = details.getFlagMetadata();
-      if (metadata != null) {
-        allocationKey = metadata.getString("allocationKey");
-      }
+    @Override
+    public void finallyAfter(
+            HookContext<Object> ctx, FlagEvaluationDetails<Object> details, Map<String, Object> hints) {
+        if (metrics == null || details == null) {
+            return;
+        }
+        try {
+            String flagKey = details.getFlagKey();
+            String variant = details.getVariant();
+            String reason = details.getReason();
+            ErrorCode errorCode = details.getErrorCode();
+
+            String allocationKey = null;
+            ImmutableMetadata metadata = details.getFlagMetadata();
+            if (metadata != null) {
+                allocationKey = metadata.getString("allocationKey");
+            }
 
-      metrics.record(flagKey, variant, reason, errorCode, allocationKey);
-    } catch (Exception e) {
-      // Never let metrics recording break flag evaluation
+            metrics.record(flagKey, variant, reason, errorCode, allocationKey);
+        } catch (Exception e) {
+            // Never let metrics recording break flag evaluation
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/Provider.java b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/Provider.java
index 17009d9933a..d02bf51b64d 100644
--- a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/Provider.java
+++ b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/Provider.java
@@ -26,298 +26,289 @@
 
 public class Provider extends EventProvider implements Metadata {
 
-  private static final Logger log = LoggerFactory.getLogger(Provider.class);
-  static final String METADATA = "datadog-openfeature-provider";
-  private static final String EVALUATOR_IMPL = "datadog.trace.api.openfeature.DDEvaluator";
-
-  private static final Options DEFAULT_OPTIONS = new Options().initTimeout(30, SECONDS);
-  private volatile Evaluator evaluator;
-  private final Options options;
-  private final AtomicReference<InitializationState> initializationState =
-      new AtomicReference<>(InitializationState.NOT_STARTED);
-  private final FlagEvalMetrics flagEvalMetrics;
-  private final FlagEvalMetricsHook flagEvalMetricsHook;
-  // Span enrichment: null unless the gate is on, so the feature has no idle overhead when off.
-  private final SpanEnrichmentHook spanEnrichmentHook;
-  // Precomputed hook list returned by getProviderHooks() on every evaluation. Immutable and built
-  // once so gate-off evaluation allocates nothing on this hot path.
-  private final List<Hook> providerHooks;
-
-  public Provider() {
-    this(DEFAULT_OPTIONS, null);
-  }
-
-  public Provider(final Options options) {
-    this(options, null);
-  }
-
-  Provider(final Options options, final Evaluator evaluator) {
-    this(options, evaluator, null);
-  }
-
-  /**
-   * @param spanEnrichmentEnabledOverride when non-null, forces the span-enrichment gate (test
-   *     seam); when null, the gate is read via {@link SpanEnrichmentGate}.
-   */
-  Provider(
-      final Options options,
-      final Evaluator evaluator,
-      final Boolean spanEnrichmentEnabledOverride) {
-    this.options = options;
-    this.evaluator = evaluator;
-    FlagEvalMetrics metrics = null;
-    FlagEvalMetricsHook hook = null;
-    try {
-      metrics = new FlagEvalMetrics();
-      hook = new FlagEvalMetricsHook(metrics);
-    } catch (LinkageError | Exception e) {
-      // This outer catch fires when the metrics helper itself can't load (OTel API absent).
-      log.warn("Evaluation metrics unavailable — OTel API classes not on classpath", e);
+    private static final Logger log = LoggerFactory.getLogger(Provider.class);
+    static final String METADATA = "datadog-openfeature-provider";
+    private static final String EVALUATOR_IMPL = "datadog.trace.api.openfeature.DDEvaluator";
+
+    private static final Options DEFAULT_OPTIONS = new Options().initTimeout(30, SECONDS);
+    private volatile Evaluator evaluator;
+    private final Options options;
+    private final AtomicReference<InitializationState> initializationState =
+            new AtomicReference<>(InitializationState.NOT_STARTED);
+    private final FlagEvalMetrics flagEvalMetrics;
+    private final FlagEvalMetricsHook flagEvalMetricsHook;
+    // Span enrichment: null unless the gate is on, so the feature has no idle overhead when off.
+    private final SpanEnrichmentHook spanEnrichmentHook;
+    // Precomputed hook list returned by getProviderHooks() on every evaluation. Immutable and built
+    // once so gate-off evaluation allocates nothing on this hot path.
+    private final List<Hook> providerHooks;
+
+    public Provider() {
+        this(DEFAULT_OPTIONS, null);
     }
-    this.flagEvalMetrics = metrics;
-    this.flagEvalMetricsHook = hook;
-
-    // Span enrichment is wired ONLY when the gate is on — off means no capture hook and no idle
-    // per-evaluation overhead.
-    final boolean spanEnrichmentEnabled =
-        spanEnrichmentEnabledOverride != null
-            ? spanEnrichmentEnabledOverride
-            : SpanEnrichmentGate.isEnabled();
-    this.spanEnrichmentHook = spanEnrichmentEnabled ? new SpanEnrichmentHook() : null;
-
-    // Precompute the immutable hook list once so getProviderHooks() (called on every evaluation)
-    // allocates nothing, including when the gate is off.
-    final List<Hook> hooks = new ArrayList<>(3);
-    if (flagEvalMetricsHook != null) {
-      hooks.add(flagEvalMetricsHook);
+
+    public Provider(final Options options) {
+        this(options, null);
+    }
+
+    Provider(final Options options, final Evaluator evaluator) {
+        this(options, evaluator, null);
+    }
+
+    /**
+     * @param spanEnrichmentEnabledOverride when non-null, forces the span-enrichment gate (test
+     *     seam); when null, the gate is read via {@link SpanEnrichmentGate}.
+     */
+    Provider(final Options options, final Evaluator evaluator, final Boolean spanEnrichmentEnabledOverride) {
+        this.options = options;
+        this.evaluator = evaluator;
+        FlagEvalMetrics metrics = null;
+        FlagEvalMetricsHook hook = null;
+        try {
+            metrics = new FlagEvalMetrics();
+            hook = new FlagEvalMetricsHook(metrics);
+        } catch (LinkageError | Exception e) {
+            // This outer catch fires when the metrics helper itself can't load (OTel API absent).
+            log.warn("Evaluation metrics unavailable — OTel API classes not on classpath", e);
+        }
+        this.flagEvalMetrics = metrics;
+        this.flagEvalMetricsHook = hook;
+
+        // Span enrichment is wired ONLY when the gate is on — off means no capture hook and no idle
+        // per-evaluation overhead.
+        final boolean spanEnrichmentEnabled =
+                spanEnrichmentEnabledOverride != null ? spanEnrichmentEnabledOverride : SpanEnrichmentGate.isEnabled();
+        this.spanEnrichmentHook = spanEnrichmentEnabled ? new SpanEnrichmentHook() : null;
+
+        // Precompute the immutable hook list once so getProviderHooks() (called on every evaluation)
+        // allocates nothing, including when the gate is off.
+        final List<Hook> hooks = new ArrayList<>(3);
+        if (flagEvalMetricsHook != null) {
+            hooks.add(flagEvalMetricsHook);
+        }
+        // EVP flagevaluation hook: always registered; no-op when writer is absent (killswitch off).
+        // Writer is resolved lazily from FeatureFlaggingGateway.getFlagEvalWriter() on each call.
+        try {
+            final Hook flagEvalLoggingHook = buildFlagEvalLoggingHook();
+            if (flagEvalLoggingHook != null) {
+                hooks.add(flagEvalLoggingHook);
+            }
+        } catch (LinkageError | Exception e) {
+            // Keep older bootstrap/API combinations working: EVP recording is best-effort.
+        }
+        if (spanEnrichmentHook != null) {
+            hooks.add(spanEnrichmentHook);
+        }
+        this.providerHooks = hooks.isEmpty() ? Collections.emptyList() : Collections.unmodifiableList(hooks);
+
+        // Announce the span-enrichment state at startup (matches the reference implementation).
+        // "enabled" only when the gate is on (the capture hook was constructed), otherwise "disabled".
+        if (spanEnrichmentHook != null) {
+            log.info("{} span enrichment enabled", METADATA);
+        } else {
+            log.info("{} span enrichment disabled", METADATA);
+        }
+    }
+
+    @Override
+    public void initialize(final EvaluationContext context) throws Exception {
+        initializationState.set(InitializationState.INITIALIZING);
+        try {
+            evaluator = buildEvaluator();
+            if (!evaluator.initialize(options.getTimeout(), options.getUnit(), context)) {
+                if (markInitialConfigReceivedReady()) {
+                    return;
+                }
+                markInitializationError();
+                throw new ProviderNotReadyError("Provider timed-out while waiting for initial configuration");
+            }
+            if (!evaluator.hasConfiguration() || !markSuccessfulInitializationReady()) {
+                markInitializationError();
+                throw new ProviderNotReadyError("Provider timed-out while waiting for initial configuration");
+            }
+        } catch (final OpenFeatureError e) {
+            markInitializationError();
+            throw e;
+        } catch (final Throwable e) {
+            markInitializationError();
+            throw new FatalError("Failed to initialize provider, is the tracer configured?", e);
+        }
+    }
+
+    void onConfigurationChange() {
+        if (evaluator == null || !evaluator.hasConfiguration()) {
+            onConfigurationUnavailable();
+            return;
+        }
+
+        final InitializationState state = initializationState.get();
+        if (state == InitializationState.INITIALIZING) {
+            initializationState.compareAndSet(
+                    InitializationState.INITIALIZING, InitializationState.INITIAL_CONFIG_RECEIVED);
+            return;
+        }
+        if (state == InitializationState.INITIAL_CONFIG_RECEIVED) {
+            return;
+        }
+        if (state == InitializationState.ERROR
+                && initializationState.compareAndSet(InitializationState.ERROR, InitializationState.READY)) {
+            emit(
+                    ProviderEvent.PROVIDER_READY,
+                    ProviderEventDetails.builder().message("Provider ready").build());
+            return;
+        }
+        if (initializationState.get() != InitializationState.READY) {
+            return;
+        }
+        emit(
+                ProviderEvent.PROVIDER_CONFIGURATION_CHANGED,
+                ProviderEventDetails.builder()
+                        .message("New configuration received")
+                        .build());
+    }
+
+    private void onConfigurationUnavailable() {
+        if (initializationState.compareAndSet(InitializationState.INITIAL_CONFIG_RECEIVED, InitializationState.ERROR)) {
+            return;
+        }
+        if (!initializationState.compareAndSet(InitializationState.READY, InitializationState.ERROR)) {
+            return;
+        }
+        emit(
+                ProviderEvent.PROVIDER_ERROR,
+                ProviderEventDetails.builder()
+                        .message("Configuration unavailable")
+                        .errorCode(ErrorCode.PROVIDER_NOT_READY)
+                        .build());
     }
-    // EVP flagevaluation hook: always registered; no-op when writer is absent (killswitch off).
-    // Writer is resolved lazily from FeatureFlaggingGateway.getFlagEvalWriter() on each call.
-    try {
-      final Hook flagEvalLoggingHook = buildFlagEvalLoggingHook();
-      if (flagEvalLoggingHook != null) {
-        hooks.add(flagEvalLoggingHook);
-      }
-    } catch (LinkageError | Exception e) {
-      // Keep older bootstrap/API combinations working: EVP recording is best-effort.
+
+    private boolean markInitialConfigReceivedReady() {
+        return initializationState.get() == InitializationState.READY
+                || initializationState.compareAndSet(
+                        InitializationState.INITIAL_CONFIG_RECEIVED, InitializationState.READY);
     }
-    if (spanEnrichmentHook != null) {
-      hooks.add(spanEnrichmentHook);
+
+    private boolean markSuccessfulInitializationReady() {
+        return markInitialConfigReceivedReady()
+                || initializationState.compareAndSet(InitializationState.INITIALIZING, InitializationState.READY);
     }
-    this.providerHooks =
-        hooks.isEmpty() ? Collections.emptyList() : Collections.unmodifiableList(hooks);
-
-    // Announce the span-enrichment state at startup (matches the reference implementation).
-    // "enabled" only when the gate is on (the capture hook was constructed), otherwise "disabled".
-    if (spanEnrichmentHook != null) {
-      log.info("{} span enrichment enabled", METADATA);
-    } else {
-      log.info("{} span enrichment disabled", METADATA);
+
+    private void markInitializationError() {
+        InitializationState state = initializationState.get();
+        while (state != InitializationState.READY && state != InitializationState.ERROR) {
+            if (initializationState.compareAndSet(state, InitializationState.ERROR)) {
+                return;
+            }
+            state = initializationState.get();
+        }
     }
-  }
-
-  @Override
-  public void initialize(final EvaluationContext context) throws Exception {
-    initializationState.set(InitializationState.INITIALIZING);
-    try {
-      evaluator = buildEvaluator();
-      if (!evaluator.initialize(options.getTimeout(), options.getUnit(), context)) {
-        if (markInitialConfigReceivedReady()) {
-          return;
+
+    private Evaluator buildEvaluator() throws Exception {
+        if (evaluator != null) {
+            return evaluator;
         }
-        markInitializationError();
-        throw new ProviderNotReadyError(
-            "Provider timed-out while waiting for initial configuration");
-      }
-      if (!evaluator.hasConfiguration() || !markSuccessfulInitializationReady()) {
-        markInitializationError();
-        throw new ProviderNotReadyError(
-            "Provider timed-out while waiting for initial configuration");
-      }
-    } catch (final OpenFeatureError e) {
-      markInitializationError();
-      throw e;
-    } catch (final Throwable e) {
-      markInitializationError();
-      throw new FatalError("Failed to initialize provider, is the tracer configured?", e);
+        final Class<?> evaluatorClass = loadEvaluatorClass();
+        final Constructor<?> ctor = evaluatorClass.getConstructor(Runnable.class);
+        return (Evaluator) ctor.newInstance((Runnable) this::onConfigurationChange);
     }
-  }
 
-  void onConfigurationChange() {
-    if (evaluator == null || !evaluator.hasConfiguration()) {
-      onConfigurationUnavailable();
-      return;
+    @Override
+    public List<Hook> getProviderHooks() {
+        return providerHooks;
     }
 
-    final InitializationState state = initializationState.get();
-    if (state == InitializationState.INITIALIZING) {
-      initializationState.compareAndSet(
-          InitializationState.INITIALIZING, InitializationState.INITIAL_CONFIG_RECEIVED);
-      return;
+    Hook buildFlagEvalLoggingHook() {
+        return FlagEvalLoggingHook.INSTANCE;
     }
-    if (state == InitializationState.INITIAL_CONFIG_RECEIVED) {
-      return;
+
+    @Override
+    public void shutdown() {
+        if (flagEvalMetrics != null) {
+            flagEvalMetrics.shutdown();
+        }
+        // Span enrichment needs no provider-close cleanup here: the capture hook holds no tracer state.
+        // The agent-side write tier owns the interceptor and per-trace state and is torn down with the
+        // feature-flagging subsystem, not per provider.
+        if (evaluator != null) {
+            evaluator.shutdown();
+        }
     }
-    if (state == InitializationState.ERROR
-        && initializationState.compareAndSet(
-            InitializationState.ERROR, InitializationState.READY)) {
-      emit(
-          ProviderEvent.PROVIDER_READY,
-          ProviderEventDetails.builder().message("Provider ready").build());
-      return;
+
+    // Visible for tests: expose whether span enrichment is wired (gate-on) without leaking the impl.
+    SpanEnrichmentHook spanEnrichmentHook() {
+        return spanEnrichmentHook;
     }
-    if (initializationState.get() != InitializationState.READY) {
-      return;
+
+    @Override
+    public Metadata getMetadata() {
+        return this;
     }
-    emit(
-        ProviderEvent.PROVIDER_CONFIGURATION_CHANGED,
-        ProviderEventDetails.builder().message("New configuration received").build());
-  }
-
-  private void onConfigurationUnavailable() {
-    if (initializationState.compareAndSet(
-        InitializationState.INITIAL_CONFIG_RECEIVED, InitializationState.ERROR)) {
-      return;
+
+    @Override
+    public String getName() {
+        return METADATA;
     }
-    if (!initializationState.compareAndSet(InitializationState.READY, InitializationState.ERROR)) {
-      return;
+
+    @Override
+    public ProviderEvaluation<Boolean> getBooleanEvaluation(
+            final String key, final Boolean defaultValue, final EvaluationContext ctx) {
+        return evaluator.evaluate(Boolean.class, key, defaultValue, ctx);
     }
-    emit(
-        ProviderEvent.PROVIDER_ERROR,
-        ProviderEventDetails.builder()
-            .message("Configuration unavailable")
-            .errorCode(ErrorCode.PROVIDER_NOT_READY)
-            .build());
-  }
-
-  private boolean markInitialConfigReceivedReady() {
-    return initializationState.get() == InitializationState.READY
-        || initializationState.compareAndSet(
-            InitializationState.INITIAL_CONFIG_RECEIVED, InitializationState.READY);
-  }
-
-  private boolean markSuccessfulInitializationReady() {
-    return markInitialConfigReceivedReady()
-        || initializationState.compareAndSet(
-            InitializationState.INITIALIZING, InitializationState.READY);
-  }
-
-  private void markInitializationError() {
-    InitializationState state = initializationState.get();
-    while (state != InitializationState.READY && state != InitializationState.ERROR) {
-      if (initializationState.compareAndSet(state, InitializationState.ERROR)) {
-        return;
-      }
-      state = initializationState.get();
+
+    @Override
+    public ProviderEvaluation<String> getStringEvaluation(
+            final String key, final String defaultValue, final EvaluationContext ctx) {
+        return evaluator.evaluate(String.class, key, defaultValue, ctx);
     }
-  }
 
-  private Evaluator buildEvaluator() throws Exception {
-    if (evaluator != null) {
-      return evaluator;
+    @Override
+    public ProviderEvaluation<Integer> getIntegerEvaluation(
+            final String key, final Integer defaultValue, final EvaluationContext ctx) {
+        return evaluator.evaluate(Integer.class, key, defaultValue, ctx);
     }
-    final Class<?> evaluatorClass = loadEvaluatorClass();
-    final Constructor<?> ctor = evaluatorClass.getConstructor(Runnable.class);
-    return (Evaluator) ctor.newInstance((Runnable) this::onConfigurationChange);
-  }
-
-  @Override
-  public List<Hook> getProviderHooks() {
-    return providerHooks;
-  }
-
-  Hook buildFlagEvalLoggingHook() {
-    return FlagEvalLoggingHook.INSTANCE;
-  }
-
-  @Override
-  public void shutdown() {
-    if (flagEvalMetrics != null) {
-      flagEvalMetrics.shutdown();
+
+    @Override
+    public ProviderEvaluation<Double> getDoubleEvaluation(
+            final String key, final Double defaultValue, final EvaluationContext ctx) {
+        return evaluator.evaluate(Double.class, key, defaultValue, ctx);
     }
-    // Span enrichment needs no provider-close cleanup here: the capture hook holds no tracer state.
-    // The agent-side write tier owns the interceptor and per-trace state and is torn down with the
-    // feature-flagging subsystem, not per provider.
-    if (evaluator != null) {
-      evaluator.shutdown();
+
+    @Override
+    public ProviderEvaluation<Value> getObjectEvaluation(
+            final String key, final Value defaultValue, final EvaluationContext ctx) {
+        return evaluator.evaluate(Value.class, key, defaultValue, ctx);
     }
-  }
-
-  // Visible for tests: expose whether span enrichment is wired (gate-on) without leaking the impl.
-  SpanEnrichmentHook spanEnrichmentHook() {
-    return spanEnrichmentHook;
-  }
-
-  @Override
-  public Metadata getMetadata() {
-    return this;
-  }
-
-  @Override
-  public String getName() {
-    return METADATA;
-  }
-
-  @Override
-  public ProviderEvaluation<Boolean> getBooleanEvaluation(
-      final String key, final Boolean defaultValue, final EvaluationContext ctx) {
-    return evaluator.evaluate(Boolean.class, key, defaultValue, ctx);
-  }
-
-  @Override
-  public ProviderEvaluation<String> getStringEvaluation(
-      final String key, final String defaultValue, final EvaluationContext ctx) {
-    return evaluator.evaluate(String.class, key, defaultValue, ctx);
-  }
-
-  @Override
-  public ProviderEvaluation<Integer> getIntegerEvaluation(
-      final String key, final Integer defaultValue, final EvaluationContext ctx) {
-    return evaluator.evaluate(Integer.class, key, defaultValue, ctx);
-  }
-
-  @Override
-  public ProviderEvaluation<Double> getDoubleEvaluation(
-      final String key, final Double defaultValue, final EvaluationContext ctx) {
-    return evaluator.evaluate(Double.class, key, defaultValue, ctx);
-  }
-
-  @Override
-  public ProviderEvaluation<Value> getObjectEvaluation(
-      final String key, final Value defaultValue, final EvaluationContext ctx) {
-    return evaluator.evaluate(Value.class, key, defaultValue, ctx);
-  }
-
-  @SuppressForbidden // Class#forName(String) used to lazy-load the evaluator implementation
-  protected Class<?> loadEvaluatorClass() throws ClassNotFoundException {
-    return Class.forName(EVALUATOR_IMPL);
-  }
-
-  private enum InitializationState {
-    NOT_STARTED,
-    INITIALIZING,
-    INITIAL_CONFIG_RECEIVED,
-    READY,
-    ERROR
-  }
-
-  public static class Options {
-
-    private long timeout;
-    private TimeUnit unit;
-
-    public Options initTimeout(final long timeout, final TimeUnit unit) {
-      this.timeout = timeout;
-      this.unit = unit;
-      return this;
+
+    @SuppressForbidden // Class#forName(String) used to lazy-load the evaluator implementation
+    protected Class<?> loadEvaluatorClass() throws ClassNotFoundException {
+        return Class.forName(EVALUATOR_IMPL);
     }
 
-    public long getTimeout() {
-      return timeout;
+    private enum InitializationState {
+        NOT_STARTED,
+        INITIALIZING,
+        INITIAL_CONFIG_RECEIVED,
+        READY,
+        ERROR
     }
 
-    public TimeUnit getUnit() {
-      return unit;
+    public static class Options {
+
+        private long timeout;
+        private TimeUnit unit;
+
+        public Options initTimeout(final long timeout, final TimeUnit unit) {
+            this.timeout = timeout;
+            this.unit = unit;
+            return this;
+        }
+
+        public long getTimeout() {
+            return timeout;
+        }
+
+        public TimeUnit getUnit() {
+            return unit;
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/SpanEnrichmentGate.java b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/SpanEnrichmentGate.java
index 64739f0ad39..409eeedcea3 100644
--- a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/SpanEnrichmentGate.java
+++ b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/SpanEnrichmentGate.java
@@ -12,14 +12,14 @@
  */
 final class SpanEnrichmentGate {
 
-  private SpanEnrichmentGate() {}
+    private SpanEnrichmentGate() {}
 
-  static boolean isEnabled() {
-    try {
-      return ConfigProvider.getInstance()
-          .getBoolean(FeatureFlaggingConfig.EXPERIMENTAL_SPAN_ENRICHMENT_ENABLED, false);
-    } catch (final Throwable t) {
-      return false; // never let config reading break construction
+    static boolean isEnabled() {
+        try {
+            return ConfigProvider.getInstance()
+                    .getBoolean(FeatureFlaggingConfig.EXPERIMENTAL_SPAN_ENRICHMENT_ENABLED, false);
+        } catch (final Throwable t) {
+            return false; // never let config reading break construction
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/SpanEnrichmentHook.java b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/SpanEnrichmentHook.java
index 40e998a6546..5e72027214d 100644
--- a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/SpanEnrichmentHook.java
+++ b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/SpanEnrichmentHook.java
@@ -37,113 +37,111 @@
  */
 class SpanEnrichmentHook implements Hook<Object> {
 
-  private static final Logger log = LoggerFactory.getLogger(SpanEnrichmentHook.class);
+    private static final Logger log = LoggerFactory.getLogger(SpanEnrichmentHook.class);
 
-  // The metadata keys the DDEvaluator attaches for span enrichment (single source of truth there).
-  static final String METADATA_SERIAL_ID = DDEvaluator.METADATA_SPLIT_SERIAL_ID;
-  static final String METADATA_DO_LOG = DDEvaluator.METADATA_DO_LOG;
+    // The metadata keys the DDEvaluator attaches for span enrichment (single source of truth there).
+    static final String METADATA_SERIAL_ID = DDEvaluator.METADATA_SPLIT_SERIAL_ID;
+    static final String METADATA_DO_LOG = DDEvaluator.METADATA_DO_LOG;
 
-  @Override
-  public void finallyAfter(
-      final HookContext<Object> ctx,
-      final FlagEvaluationDetails<Object> details,
-      final Map<String, Object> hints) {
-    if (details == null) {
-      return;
-    }
-    try {
-      final ImmutableMetadata metadata = details.getFlagMetadata();
-      final Integer serialId = metadata != null ? metadata.getInteger(METADATA_SERIAL_ID) : null;
-      if (serialId != null) {
-        final boolean doLog = Boolean.TRUE.equals(metadata.getBoolean(METADATA_DO_LOG));
-        FeatureFlaggingGateway.dispatch(
-            SpanEnrichmentEvent.serialId(serialId, doLog, targetingKey(ctx)));
-      } else if (details.getVariant() == null) {
-        // Runtime-default detection = MISSING VARIANT (never a reason enum). Unwrap any OpenFeature
-        // Value to a native Java type here so the seam carries only JDK types.
-        FeatureFlaggingGateway.dispatch(
-            SpanEnrichmentEvent.runtimeDefault(
-                details.getFlagKey(), unwrapDefaultValue(details.getValue())));
-      }
-    } catch (final Throwable t) {
-      // Never let span enrichment break flag evaluation; a debug line aids diagnosis if it does.
-      log.debug("Span-enrichment capture failed for flag {}", details.getFlagKey(), t);
+    @Override
+    public void finallyAfter(
+            final HookContext<Object> ctx,
+            final FlagEvaluationDetails<Object> details,
+            final Map<String, Object> hints) {
+        if (details == null) {
+            return;
+        }
+        try {
+            final ImmutableMetadata metadata = details.getFlagMetadata();
+            final Integer serialId = metadata != null ? metadata.getInteger(METADATA_SERIAL_ID) : null;
+            if (serialId != null) {
+                final boolean doLog = Boolean.TRUE.equals(metadata.getBoolean(METADATA_DO_LOG));
+                FeatureFlaggingGateway.dispatch(SpanEnrichmentEvent.serialId(serialId, doLog, targetingKey(ctx)));
+            } else if (details.getVariant() == null) {
+                // Runtime-default detection = MISSING VARIANT (never a reason enum). Unwrap any OpenFeature
+                // Value to a native Java type here so the seam carries only JDK types.
+                FeatureFlaggingGateway.dispatch(SpanEnrichmentEvent.runtimeDefault(
+                        details.getFlagKey(), unwrapDefaultValue(details.getValue())));
+            }
+        } catch (final Throwable t) {
+            // Never let span enrichment break flag evaluation; a debug line aids diagnosis if it does.
+            log.debug("Span-enrichment capture failed for flag {}", details.getFlagKey(), t);
+        }
     }
-  }
 
-  private static String targetingKey(final HookContext<Object> ctx) {
-    if (ctx == null) {
-      return null;
-    }
-    final EvaluationContext evaluationContext = ctx.getCtx();
-    if (evaluationContext == null) {
-      return null;
+    private static String targetingKey(final HookContext<Object> ctx) {
+        if (ctx == null) {
+            return null;
+        }
+        final EvaluationContext evaluationContext = ctx.getCtx();
+        if (evaluationContext == null) {
+            return null;
+        }
+        final String key = evaluationContext.getTargetingKey();
+        return (key == null || key.isEmpty()) ? null : key;
     }
-    final String key = evaluationContext.getTargetingKey();
-    return (key == null || key.isEmpty()) ? null : key;
-  }
-
-  /**
-   * Unwraps an OpenFeature {@link Value} to a native Java representation so the runtime default can
-   * cross the (JDK-types-only) seam and be JSON-serialized on the write side exactly like Node's
-   * {@code JSON.stringify}. Non-{@code Value} inputs (already native) are returned as-is.
-   */
-  static Object unwrapDefaultValue(final Object value) {
-    return value instanceof Value ? unwrapValue((Value) value) : value;
-  }
 
-  /**
-   * Recursively unwraps an OpenFeature {@link Value} into its native Java representation:
-   * structures become {@code Map<String, Object>}, lists become {@code List<Object>}, and scalars
-   * become their boxed value (or {@code null}). Nested {@link Value}s are unwrapped at every level
-   * so a structure containing further structures/lists serializes correctly.
-   */
-  private static Object unwrapValue(final Value value) {
-    if (value == null || value.isNull()) {
-      return null;
+    /**
+     * Unwraps an OpenFeature {@link Value} to a native Java representation so the runtime default can
+     * cross the (JDK-types-only) seam and be JSON-serialized on the write side exactly like Node's
+     * {@code JSON.stringify}. Non-{@code Value} inputs (already native) are returned as-is.
+     */
+    static Object unwrapDefaultValue(final Object value) {
+        return value instanceof Value ? unwrapValue((Value) value) : value;
     }
-    if (value.isStructure()) {
-      final Structure structure = value.asStructure();
-      final Map<String, Object> map = new LinkedHashMap<>();
-      if (structure != null) {
-        for (final String key : structure.keySet()) {
-          map.put(key, unwrapValue(structure.getValue(key)));
+
+    /**
+     * Recursively unwraps an OpenFeature {@link Value} into its native Java representation:
+     * structures become {@code Map<String, Object>}, lists become {@code List<Object>}, and scalars
+     * become their boxed value (or {@code null}). Nested {@link Value}s are unwrapped at every level
+     * so a structure containing further structures/lists serializes correctly.
+     */
+    private static Object unwrapValue(final Value value) {
+        if (value == null || value.isNull()) {
+            return null;
         }
-      }
-      return map;
-    }
-    if (value.isList()) {
-      final List<Value> list = value.asList();
-      final List<Object> out = new ArrayList<>(list == null ? 0 : list.size());
-      if (list != null) {
-        for (final Value element : list) {
-          out.add(unwrapValue(element));
+        if (value.isStructure()) {
+            final Structure structure = value.asStructure();
+            final Map<String, Object> map = new LinkedHashMap<>();
+            if (structure != null) {
+                for (final String key : structure.keySet()) {
+                    map.put(key, unwrapValue(structure.getValue(key)));
+                }
+            }
+            return map;
         }
-      }
-      return out;
-    }
-    if (value.isBoolean()) {
-      return value.asBoolean();
-    }
-    if (value.isString()) {
-      return value.asString();
-    }
-    if (value.isNumber()) {
-      // Preserve integral vs fractional so the rendered JSON number matches Node.
-      final Double d = value.asDouble();
-      if (d != null && d == Math.rint(d) && !Double.isInfinite(d)) {
-        final Integer i = value.asInteger();
-        if (i != null) {
-          return i;
+        if (value.isList()) {
+            final List<Value> list = value.asList();
+            final List<Object> out = new ArrayList<>(list == null ? 0 : list.size());
+            if (list != null) {
+                for (final Value element : list) {
+                    out.add(unwrapValue(element));
+                }
+            }
+            return out;
         }
-      }
-      return d;
-    }
-    final Instant instant = value.asInstant();
-    if (instant != null) {
-      return instant.toString();
+        if (value.isBoolean()) {
+            return value.asBoolean();
+        }
+        if (value.isString()) {
+            return value.asString();
+        }
+        if (value.isNumber()) {
+            // Preserve integral vs fractional so the rendered JSON number matches Node.
+            final Double d = value.asDouble();
+            if (d != null && d == Math.rint(d) && !Double.isInfinite(d)) {
+                final Integer i = value.asInteger();
+                if (i != null) {
+                    return i;
+                }
+            }
+            return d;
+        }
+        final Instant instant = value.asInstant();
+        if (instant != null) {
+            return instant.toString();
+        }
+        // Unknown shape: fall back to the wrapped object's own representation.
+        return value.asObject();
     }
-    // Unknown shape: fall back to the wrapped object's own representation.
-    return value.asObject();
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorSpanEnrichmentForkedTest.java b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorSpanEnrichmentForkedTest.java
index 2e5a4c483bf..1e473447acf 100644
--- a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorSpanEnrichmentForkedTest.java
+++ b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorSpanEnrichmentForkedTest.java
@@ -30,69 +30,64 @@
  */
 class DDEvaluatorSpanEnrichmentForkedTest {
 
-  static {
-    System.setProperty("dd.experimental.flagging.provider.span.enrichment.enabled", "true");
-  }
+    static {
+        System.setProperty("dd.experimental.flagging.provider.span.enrichment.enabled", "true");
+    }
 
-  @Test
-  void enrichmentMetadataCarriesTheSplitSerialId() {
-    final ProviderEvaluation<?> result = evaluate(340132);
+    @Test
+    void enrichmentMetadataCarriesTheSplitSerialId() {
+        final ProviderEvaluation<?> result = evaluate(340132);
 
-    assertNotNull(
-        result.getFlagMetadata().getBoolean(DDEvaluator.METADATA_DO_LOG),
-        "span enrichment must be on, or the assertions below pass vacuously");
-    assertEquals(
-        Integer.valueOf(340132),
-        result.getFlagMetadata().getInteger(DDEvaluator.METADATA_SPLIT_SERIAL_ID));
-  }
+        assertNotNull(
+                result.getFlagMetadata().getBoolean(DDEvaluator.METADATA_DO_LOG),
+                "span enrichment must be on, or the assertions below pass vacuously");
+        assertEquals(
+                Integer.valueOf(340132), result.getFlagMetadata().getInteger(DDEvaluator.METADATA_SPLIT_SERIAL_ID));
+    }
 
-  /**
-   * Simulates legacy exposure support while Split.serialId remains available. Falling back to the
-   * five-argument exposure constructor must not suppress the serial id in enrichment metadata.
-   */
-  @Test
-  void enrichmentMetadataSurvivesAnAgentWithoutTheExposureConstructor() {
-    final boolean previous = DDEvaluator.USE_LEGACY_EXPOSURE_API.getAndSet(true);
-    try {
-      assertEquals(
-          Integer.valueOf(340132),
-          evaluate(340132).getFlagMetadata().getInteger(DDEvaluator.METADATA_SPLIT_SERIAL_ID));
-    } finally {
-      DDEvaluator.USE_LEGACY_EXPOSURE_API.set(previous);
+    /**
+     * Simulates legacy exposure support while Split.serialId remains available. Falling back to the
+     * five-argument exposure constructor must not suppress the serial id in enrichment metadata.
+     */
+    @Test
+    void enrichmentMetadataSurvivesAnAgentWithoutTheExposureConstructor() {
+        final boolean previous = DDEvaluator.USE_LEGACY_EXPOSURE_API.getAndSet(true);
+        try {
+            assertEquals(
+                    Integer.valueOf(340132),
+                    evaluate(340132).getFlagMetadata().getInteger(DDEvaluator.METADATA_SPLIT_SERIAL_ID));
+        } finally {
+            DDEvaluator.USE_LEGACY_EXPOSURE_API.set(previous);
+        }
     }
-  }
 
-  @Test
-  void enrichmentMetadataOmitsTheSerialIdWhenTheAgentSplitHasNoField() {
-    final boolean previous = DDEvaluator.SPLIT_SERIAL_ID_SUPPORTED.getAndSet(false);
-    try {
-      assertNull(
-          evaluate(340132).getFlagMetadata().getInteger(DDEvaluator.METADATA_SPLIT_SERIAL_ID));
-    } finally {
-      DDEvaluator.SPLIT_SERIAL_ID_SUPPORTED.set(previous);
+    @Test
+    void enrichmentMetadataOmitsTheSerialIdWhenTheAgentSplitHasNoField() {
+        final boolean previous = DDEvaluator.SPLIT_SERIAL_ID_SUPPORTED.getAndSet(false);
+        try {
+            assertNull(evaluate(340132).getFlagMetadata().getInteger(DDEvaluator.METADATA_SPLIT_SERIAL_ID));
+        } finally {
+            DDEvaluator.SPLIT_SERIAL_ID_SUPPORTED.set(previous);
+        }
     }
-  }
 
-  @Test
-  void enrichmentMetadataOmitsTheSerialIdWhenTheSplitHasNone() {
-    assertNull(evaluate(null).getFlagMetadata().getInteger(DDEvaluator.METADATA_SPLIT_SERIAL_ID));
-  }
+    @Test
+    void enrichmentMetadataOmitsTheSerialIdWhenTheSplitHasNone() {
+        assertNull(evaluate(null).getFlagMetadata().getInteger(DDEvaluator.METADATA_SPLIT_SERIAL_ID));
+    }
 
-  private static ProviderEvaluation<?> evaluate(final Integer serialId) {
-    final Map<String, Variant> variations = new HashMap<>();
-    variations.put("on", new Variant("on", 1));
-    final Split split = new Split(emptyList(), "on", emptyMap(), serialId);
-    final Allocation allocation =
-        new Allocation("alloc-1", null, null, null, singletonList(split), Boolean.FALSE);
-    final Map<String, Flag> flags = new HashMap<>();
-    flags.put(
-        "target",
-        new Flag("target", true, ValueType.INTEGER, variations, singletonList(allocation)));
+    private static ProviderEvaluation<?> evaluate(final Integer serialId) {
+        final Map<String, Variant> variations = new HashMap<>();
+        variations.put("on", new Variant("on", 1));
+        final Split split = new Split(emptyList(), "on", emptyMap(), serialId);
+        final Allocation allocation = new Allocation("alloc-1", null, null, null, singletonList(split), Boolean.FALSE);
+        final Map<String, Flag> flags = new HashMap<>();
+        flags.put("target", new Flag("target", true, ValueType.INTEGER, variations, singletonList(allocation)));
 
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    evaluator.accept(new ServerConfiguration("", "", true, null, flags));
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        evaluator.accept(new ServerConfiguration("", "", true, null, flags));
 
-    final EvaluationContext ctx = new MutableContext("target").setTargetingKey("user-1");
-    return evaluator.evaluate(Integer.class, "target", 23, ctx);
-  }
+        final EvaluationContext ctx = new MutableContext("target").setTargetingKey("user-1");
+        return evaluator.evaluate(Integer.class, "target", 23, ctx);
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorTest.java b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorTest.java
index 940c84998d4..db82b8b37ba 100644
--- a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorTest.java
+++ b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorTest.java
@@ -72,1373 +72,1314 @@
 
 public class DDEvaluatorTest {
 
-  private static final String CANONICAL_FIXTURE_PATH =
-      "dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data";
-  private static final Moshi MOSHI =
-      new Moshi.Builder()
-          .add(Date.class, new DateAdapter())
-          .add(ShardAdapter.FACTORY)
-          .add(FlagMapAdapter.FACTORY)
-          .build();
-  private static final JsonAdapter<ServerConfiguration> CONFIG_ADAPTER =
-      MOSHI.adapter(ServerConfiguration.class);
-  private static final Type FIXTURE_LIST_TYPE =
-      Types.newParameterizedType(List.class, FixtureCase.class);
-  private static final JsonAdapter<List<FixtureCase>> FIXTURE_LIST_ADAPTER =
-      MOSHI.adapter(FIXTURE_LIST_TYPE);
-  private static final ThreadLocal<Map<String, String>> INVALID_FLAGS_HOLDER =
-      ThreadLocal.withInitial(HashMap::new);
-  private static final long MAX_UNSIGNED_INT = 0xffff_ffffL;
-
-  @Test
-  public void testInitializeSignalsApplicationProviderActivation() throws Exception {
-    final FeatureFlaggingGateway.ActivationListener listener =
-        mock(FeatureFlaggingGateway.ActivationListener.class);
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    FeatureFlaggingGateway.addActivationListener(listener);
-    try {
-      evaluator.initialize(1, MILLISECONDS, mock(EvaluationContext.class));
-
-      verify(listener).activate();
-    } finally {
-      evaluator.shutdown();
-      FeatureFlaggingGateway.removeActivationListener(listener);
-    }
-  }
-
-  private static Arguments[] valueMappingTestCases() {
-    return new Arguments[] {
-      // String mappings
-      Arguments.of(String.class, "hello", "hello"),
-      Arguments.of(String.class, 123, "123"),
-      Arguments.of(String.class, true, "true"),
-      Arguments.of(String.class, 3.14, "3.14"),
-      Arguments.of(String.class, null, null),
-
-      // Boolean mappings
-      Arguments.of(Boolean.class, true, true),
-      Arguments.of(Boolean.class, false, false),
-      Arguments.of(Boolean.class, "true", true),
-      Arguments.of(Boolean.class, "false", false),
-      Arguments.of(Boolean.class, "TRUE", true),
-      Arguments.of(Boolean.class, "FALSE", false),
-      Arguments.of(Boolean.class, 1, true),
-      Arguments.of(Boolean.class, 0, false),
-      Arguments.of(Boolean.class, null, null),
-
-      // Integer mappings
-      Arguments.of(Integer.class, 42, 42),
-      Arguments.of(Integer.class, "42", 42),
-      Arguments.of(Integer.class, 3.14, 3),
-      Arguments.of(Integer.class, "3.14", 3),
-      Arguments.of(Integer.class, null, null),
-
-      // Double mappings
-      Arguments.of(Double.class, 3.14, 3.14),
-      Arguments.of(Double.class, "3.14", 3.14),
-      Arguments.of(Double.class, 42, 42.0),
-      Arguments.of(Double.class, "42", 42.0),
-      Arguments.of(Double.class, null, null),
-
-      // Value mappings (OpenFeature Value objects)
-      Arguments.of(Value.class, "hello", Value.objectToValue("hello")),
-      Arguments.of(Value.class, 42, Value.objectToValue(42)),
-      Arguments.of(Value.class, 3.14, Value.objectToValue(3.14)),
-      Arguments.of(Value.class, true, Value.objectToValue(true)),
-      Arguments.of(Value.class, null, null),
-
-      // Unsupported
-      Arguments.of(Long.class, 42L, IllegalArgumentException.class),
-    };
-  }
-
-  @ParameterizedTest
-  @MethodSource("valueMappingTestCases")
-  public void testValueMapping(final Class<?> target, final Object value, final Object expected) {
-    if (expected == IllegalArgumentException.class) {
-      assertThrows(IllegalArgumentException.class, () -> DDEvaluator.mapValue(target, value));
-    } else {
-      final Object result = DDEvaluator.mapValue(target, value);
-      assertThat(result, equalTo(expected));
-    }
-  }
-
-  @Test
-  public void testEvaluateNoConfig() {
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    final ProviderEvaluation<?> details =
-        evaluator.evaluate(Integer.class, "test", 23, mock(EvaluationContext.class));
-    assertThat(details.getValue(), equalTo(23));
-    assertThat(details.getReason(), equalTo(ERROR.name()));
-    assertThat(details.getErrorCode(), equalTo(ErrorCode.PROVIDER_NOT_READY));
-  }
-
-  @Test
-  public void testInitializeTimesOutWithoutConfig() throws Exception {
-    final Runnable configCallback = mock(Runnable.class);
-    final DDEvaluator evaluator = new DDEvaluator(configCallback);
-    evaluator.accept(null);
-    try {
-      assertThat(
-          evaluator.initialize(10, MILLISECONDS, mock(EvaluationContext.class)), equalTo(false));
-      verify(configCallback, times(0)).run();
-    } finally {
-      evaluator.shutdown();
-    }
-  }
-
-  @Test
-  public void testInitializeWaitsForNonNullConfig() throws Exception {
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    final ExecutorService executor = Executors.newSingleThreadExecutor();
-    try {
-      final Future<Boolean> initialized =
-          executor.submit(() -> evaluator.initialize(1, SECONDS, mock(EvaluationContext.class)));
-
-      evaluator.accept(null);
-      assertThat(initialized.isDone(), equalTo(false));
-
-      evaluator.accept(mock(ServerConfiguration.class));
-      assertThat(initialized.get(1, SECONDS), equalTo(true));
-    } finally {
-      executor.shutdownNow();
-      evaluator.shutdown();
-    }
-  }
-
-  @Test
-  public void testEvaluateNoContext() {
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    evaluator.accept(mock(ServerConfiguration.class));
-    final ProviderEvaluation<?> details = evaluator.evaluate(Integer.class, "test", 23, null);
-    assertThat(details.getValue(), equalTo(23));
-    assertThat(details.getReason(), equalTo(ERROR.name()));
-    assertThat(details.getErrorCode(), equalTo(ErrorCode.INVALID_CONTEXT));
-  }
-
-  @Test
-  public void testNoAllocations() {
-    final Map<String, Flag> flags = new HashMap<>();
-    flags.put("null-allocation", new Flag("target", true, null, null, null));
-    flags.put("empty-allocation", new Flag("target", true, null, null, emptyList()));
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    evaluator.accept(new ServerConfiguration("", "", false, null, flags));
-
-    final EvaluationContext ctx = new MutableContext("target").setTargetingKey("allocation");
-
-    ProviderEvaluation<?> details = evaluator.evaluate(Integer.class, "null-allocation", 23, ctx);
-    assertThat(details.getValue(), equalTo(23));
-    assertThat(details.getReason(), equalTo(ERROR.name()));
-    assertThat(details.getErrorCode(), equalTo(ErrorCode.GENERAL));
-
-    details = evaluator.evaluate(Integer.class, "empty-allocation", 23, ctx);
-    assertThat(details.getValue(), equalTo(23));
-    assertThat(details.getReason(), equalTo("DEFAULT"));
-    assertThat(details.getErrorCode(), nullValue());
-  }
-
-  @Test
-  public void testEvaluateUnsignedShardRange() {
-    final Map<String, Variant> variations = new HashMap<>();
-    variations.put("on", new Variant("on", 1));
-    // The selected shard is above Integer.MAX_VALUE, so this test proves that evaluation uses
-    // unsigned semantics after binary-compatible int storage.
-    final Shard shard =
-        new Shard(
-            "salt",
-            singletonList(new ShardRange((int) 3_699_531_192L, (int) 3_699_531_193L)),
-            (int) MAX_UNSIGNED_INT);
-    final Split split = new Split(singletonList(shard), "on", emptyMap(), null);
-    final Allocation allocation =
-        new Allocation("alloc-1", null, null, null, singletonList(split), Boolean.FALSE);
-    final Map<String, Flag> flags = new HashMap<>();
-    flags.put(
-        "target",
-        new Flag("target", true, ValueType.INTEGER, variations, singletonList(allocation)));
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    evaluator.accept(new ServerConfiguration("", "", false, null, flags));
-
-    final EvaluationContext context =
-        new MutableContext("target").setTargetingKey("high-shard-user");
-    final ProviderEvaluation<?> details = evaluator.evaluate(Integer.class, "target", 23, context);
-
-    assertThat(details.getValue(), equalTo(1));
-    assertThat(details.getReason(), equalTo("SPLIT"));
-    assertThat(details.getVariant(), equalTo("on"));
-  }
-
-  // ---- observeFullEvaluationData metadata is stamped from the evaluator's ServerConfiguration
-  // ----
-  //
-  // Every code path that returns a ProviderEvaluation must stamp the consent boolean so downstream
-  // hooks can honour it. These tests exercise each stamp site with both consent values (on/off) so
-  // a mutation to any stamp — deleting the line, hardcoding the value — flips at least one
-  // assertion.
-
-  // -- success path: resolveVariant (variant metadata builder) --
-
-  @Test
-  public void observeFullEvaluationDataStampedTrueOnResolvedVariant() {
-    final ProviderEvaluation<?> details = evaluateMatchingFlag(true);
-
-    assertThat(details.getReason(), equalTo("STATIC"));
-    assertThat(details.getVariant(), equalTo("on"));
-    assertThat(
-        details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA),
-        equalTo(true));
-  }
-
-  @Test
-  public void observeFullEvaluationDataStampedFalseOnResolvedVariant() {
-    // Symmetric consent-off assertion. Paired with the consent-on test above this pins the
-    // resolveVariant metadata line (DDEvaluator.java: METADATA_OBSERVE_FULL_EVALUATION_DATA) so
-    // deleting it or hardcoding either value would fail at least one assertion.
-    final ProviderEvaluation<?> details = evaluateMatchingFlag(false);
-
-    assertThat(details.getReason(), equalTo("STATIC"));
-    assertThat(details.getVariant(), equalTo("on"));
-    assertThat(
-        details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA),
-        equalTo(false));
-  }
-
-  // -- DISABLED path: flag.enabled=false --
-
-  @Test
-  public void observeFullEvaluationDataStampedTrueOnDisabledFlag() {
-    final ProviderEvaluation<?> details = evaluateDisabledFlag(true);
-
-    assertThat(details.getReason(), equalTo("DISABLED"));
-    assertThat(
-        details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA),
-        equalTo(true));
-  }
-
-  @Test
-  public void observeFullEvaluationDataStampedFalseOnDisabledFlag() {
-    final ProviderEvaluation<?> details = evaluateDisabledFlag(false);
-
-    assertThat(details.getReason(), equalTo("DISABLED"));
-    assertThat(
-        details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA),
-        equalTo(false));
-  }
-
-  // -- DEFAULT path: no allocation matches --
-
-  @Test
-  public void observeFullEvaluationDataStampedTrueOnDefault() {
-    // Allocation exists but has empty splits, so the loop finishes without returning and we fall
-    // through to the DEFAULT branch.
-    final ProviderEvaluation<?> details = evaluateWithEmptySplits(true);
-
-    assertThat(details.getReason(), equalTo("DEFAULT"));
-    assertThat(
-        details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA),
-        equalTo(true));
-  }
-
-  @Test
-  public void observeFullEvaluationDataStampedFalseOnDefault() {
-    final ProviderEvaluation<?> details = evaluateWithEmptySplits(false);
-
-    assertThat(details.getReason(), equalTo("DEFAULT"));
-    assertThat(
-        details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA),
-        equalTo(false));
-  }
-
-  // -- error paths: FLAG_NOT_FOUND / PROVIDER_NOT_READY (via consentMetadata in error()) --
-
-  @Test
-  public void observeFullEvaluationDataStampedOnFlagNotFoundError() {
-    // Was previously named "…OnSuccess" but actually exercises the error() helper's stamp via
-    // FLAG_NOT_FOUND — kept for that stamp site, correctly named.
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    evaluator.accept(new ServerConfiguration("", "", true, null, new HashMap<>()));
-
-    final EvaluationContext ctx = new MutableContext("target").setTargetingKey("k");
-    final ProviderEvaluation<?> details =
-        evaluator.evaluate(Integer.class, "unknown-flag", 23, ctx);
-
-    assertThat(details.getErrorCode(), equalTo(ErrorCode.FLAG_NOT_FOUND));
-    assertThat(
-        details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA),
-        equalTo(true));
-  }
-
-  @Test
-  public void observeFullEvaluationDataDefaultsToFalseWhenEvaluatorHasNoConfig() {
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    final ProviderEvaluation<?> details =
-        evaluator.evaluate(Integer.class, "test", 23, mock(EvaluationContext.class));
-    assertThat(details.getErrorCode(), equalTo(ErrorCode.PROVIDER_NOT_READY));
-    assertThat(
-        details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA),
-        equalTo(false));
-  }
-
-  @Test
-  public void observeFullEvaluationDataNullConfigFieldTreatedAsFalse() {
-    // The field is boxed so Moshi tolerates a malformed consent value in the UFC JSON without
-    // aborting the whole parse. The evaluator must then interpret null as the privacy-preserving
-    // default. An auto-unbox at the read site (config.observeFullEvaluationData) would NPE here.
-    final Map<String, Flag> flags = new HashMap<>();
-    flags.put("target", new Flag("target", true, ValueType.INTEGER, emptyMap(), emptyList()));
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    evaluator.accept(new ServerConfiguration("", "", null, null, flags));
-
-    final EvaluationContext ctx = new MutableContext("target").setTargetingKey("k");
-    final ProviderEvaluation<?> details = evaluator.evaluate(Integer.class, "target", 23, ctx);
-
-    // Flags still evaluate — availability preserved despite the malformed consent field.
-    assertThat(details.getReason(), equalTo("DEFAULT"));
-    assertThat(
-        details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA),
-        equalTo(false));
-  }
-
-  // ---- exposure events carry the split's serial id ----
-
-  @Test
-  public void exposureCarriesTheSplitSerialId() {
-    assertEquals(Integer.valueOf(340132), exposureFor(340132).serial_id);
-  }
-
-  @Test
-  public void exposureCarriesSerialIdZero() {
-    assertEquals(Integer.valueOf(0), exposureFor(0).serial_id);
-  }
-
-  @Test
-  public void exposureOmitsSerialIdWhenTheSplitHasNone() {
-    assertNull(exposureFor(null).serial_id);
-  }
-
-  @Test
-  public void legacyExposureApiDispatchesAnExposureWithoutSerialId() {
-    final boolean previous = DDEvaluator.USE_LEGACY_EXPOSURE_API.getAndSet(true);
-    try {
-      assertNull(exposureFor(7).serial_id);
-    } finally {
-      DDEvaluator.USE_LEGACY_EXPOSURE_API.set(previous);
-    }
-  }
-
-  // ---- old-agent bootstrap probe ----
-
-  /** A Split from an agent that predates the serial id: the field does not exist. */
-  static final class SplitWithoutSerialId {}
-
-  /** A Split whose serialId is not the Integer the dispatch site reads. */
-  static final class SplitWithWrongSerialIdType {
-    public long serialId;
-  }
-
-  /** An ExposureEvent from an agent that predates the serial id: only the five-arg constructor. */
-  static final class LegacyExposureEvent {
-    // Qualify exposure types that share names with the imported UFC types.
-    LegacyExposureEvent(
-        final long timestamp,
-        final datadog.trace.api.featureflag.exposure.Allocation allocation,
-        final datadog.trace.api.featureflag.exposure.Flag flag,
-        final datadog.trace.api.featureflag.exposure.Variant variant,
-        final Subject subject) {}
-  }
-
-  /**
-   * Positive control. The probe must agree with the bootstrap actually on the classpath, or the
-   * negative cases below would pass for the wrong reason and the feature would ship switched off.
-   */
-  @Test
-  public void probeAcceptsTheBootstrapOnTheClasspath() {
-    assertTrue(DDEvaluator.splitSerialIdSupported(Split.class));
-    assertTrue(DDEvaluator.exposureSerialIdSupported(ExposureEvent.class));
-    assertTrue(DDEvaluator.SPLIT_SERIAL_ID_SUPPORTED.get());
-    assertFalse(DDEvaluator.USE_LEGACY_EXPOSURE_API.get());
-  }
-
-  @Test
-  public void probeRejectsAnAgentWhoseSplitHasNoSerialId() {
-    assertFalse(DDEvaluator.splitSerialIdSupported(SplitWithoutSerialId.class));
-  }
-
-  @Test
-  public void probeRejectsAnAgentWhoseSerialIdIsNotAnInteger() {
-    assertFalse(DDEvaluator.splitSerialIdSupported(SplitWithWrongSerialIdType.class));
-  }
-
-  @Test
-  public void probeRejectsAnAgentWithoutTheSerialIdConstructor() {
-    assertFalse(DDEvaluator.exposureSerialIdSupported(LegacyExposureEvent.class));
-  }
-
-  /**
-   * Tests legacy bootstrap behavior when Split.serialId exists but the exposure event has only the
-   * five-argument constructor. Split support must remain independent of exposure constructor
-   * support.
-   */
-  @Test
-  public void probeKeepsSplitSupportWhenOnlyTheEventConstructorIsMissing() {
-    assertTrue(DDEvaluator.splitSerialIdSupported(Split.class));
-    assertFalse(DDEvaluator.exposureSerialIdSupported(LegacyExposureEvent.class));
-  }
-
-  /**
-   * Evaluates a logging allocation whose split carries the given serial id and returns the single
-   * dispatched exposure. Span enrichment is off here, as it is by default, so this also pins that
-   * the serial id does not travel via the enrichment-gated evaluation metadata.
-   */
-  private static ExposureEvent exposureFor(final Integer serialId) {
-    final List<ExposureEvent> dispatched = new ArrayList<>();
-    final FeatureFlaggingGateway.ExposureListener listener = dispatched::add;
-    FeatureFlaggingGateway.addExposureListener(listener);
-    try {
-      final Map<String, Variant> variations = new HashMap<>();
-      variations.put("on", new Variant("on", 1));
-      final Split split = new Split(emptyList(), "on", emptyMap(), serialId);
-      final Allocation allocation =
-          new Allocation("alloc-1", null, null, null, singletonList(split), Boolean.TRUE);
-      evaluateFlag(
-          new Flag("target", true, ValueType.INTEGER, variations, singletonList(allocation)), true);
-    } finally {
-      FeatureFlaggingGateway.removeExposureListener(listener);
-    }
-    assertEquals(1, dispatched.size());
-    return dispatched.get(0);
-  }
-
-  // Builds a flag that reaches resolveVariant: enabled, one allocation with no rules, one split
-  // with empty shards (so the shard-match branch is skipped and the split is picked immediately),
-  // and a single "on" variant whose value maps to the requested Integer type.
-  private static ProviderEvaluation<?> evaluateMatchingFlag(
-      final boolean observeFullEvaluationData) {
-    final Map<String, Variant> variations = new HashMap<>();
-    variations.put("on", new Variant("on", 1));
-    final Split split = new Split(emptyList(), "on", emptyMap(), null);
-    final Allocation allocation =
-        new Allocation("alloc-1", null, null, null, singletonList(split), Boolean.FALSE);
-    return evaluateFlag(
-        new Flag("target", true, ValueType.INTEGER, variations, singletonList(allocation)),
-        observeFullEvaluationData);
-  }
-
-  private static ProviderEvaluation<?> evaluateDisabledFlag(
-      final boolean observeFullEvaluationData) {
-    return evaluateFlag(
-        new Flag("target", false, ValueType.INTEGER, emptyMap(), null), observeFullEvaluationData);
-  }
-
-  private static ProviderEvaluation<?> evaluateWithEmptySplits(
-      final boolean observeFullEvaluationData) {
-    // Enabled, allocations present, allocation active, no rules, empty splits → falls through the
-    // for-loop to the DEFAULT return.
-    final Allocation allocation =
-        new Allocation("alloc-1", null, null, null, emptyList(), Boolean.FALSE);
-    return evaluateFlag(
-        new Flag("target", true, ValueType.INTEGER, emptyMap(), singletonList(allocation)),
-        observeFullEvaluationData);
-  }
-
-  private static ProviderEvaluation<?> evaluateFlag(
-      final Flag flag, final boolean observeFullEvaluationData) {
-    final Map<String, Flag> flags = new HashMap<>();
-    flags.put("target", flag);
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    evaluator.accept(new ServerConfiguration("", "", observeFullEvaluationData, null, flags));
-
-    final EvaluationContext ctx = new MutableContext("target").setTargetingKey("user-1");
-    return evaluator.evaluate(Integer.class, "target", 23, ctx);
-  }
-
-  // ---- error message redaction respects observeFullEvaluationData ----
-
-  @Test
-  public void numericConditionOnTargetingKeyDropsExceptionMessageUnderConsentOff() {
-    // Rule {attribute:"id", operator:GT, value:0} + "id" not in context →
-    // DDEvaluator.resolveAttribute
-    // falls back to the targeting key, so Double.parseDouble("jane.doe@datadoghq.com") throws
-    // NumberFormatException. The exception message echoes the raw context value verbatim, so it
-    // must be dropped when observeFullEvaluationData=false.
-    final ProviderEvaluation<?> details =
-        evaluateWithNumericRuleOnId("jane.doe@datadoghq.com", false);
-
-    assertThat(details.getErrorCode(), equalTo(ErrorCode.TYPE_MISMATCH));
-    assertNull(details.getErrorMessage(), "consent-off must not surface the raw exception message");
-  }
-
-  @Test
-  public void numericConditionOnTargetingKeyPreservesExceptionMessageUnderConsentOn() {
-    // Symmetric case: with consent on, the raw exception message flows through unchanged so
-    // operators keep the diagnostic detail they opted in to.
-    final ProviderEvaluation<?> details =
-        evaluateWithNumericRuleOnId("jane.doe@datadoghq.com", true);
-
-    assertThat(details.getErrorCode(), equalTo(ErrorCode.TYPE_MISMATCH));
-    assertThat(details.getErrorMessage(), equalTo("For input string: \"jane.doe@datadoghq.com\""));
-  }
-
-  @Test
-  public void numericConditionOnTargetingKeyErrorMessageNeverContainsPiiUnderConsentOff() {
-    // Belt-and-suspenders: independent of the exact null/empty form, the raw PII value must never
-    // appear in the message under consent-off. Guards against future changes that might replace
-    // null with a redacted string or a code-name suffix.
-    final ProviderEvaluation<?> details =
-        evaluateWithNumericRuleOnId("jane.doe@datadoghq.com", false);
-
-    final String message = details.getErrorMessage();
-    assertFalse(
-        message != null && message.contains("jane.doe@datadoghq.com"),
-        "consent-off errorMessage must not contain raw context values");
-  }
-
-  private static ProviderEvaluation<?> evaluateWithNumericRuleOnId(
-      final String targetingKey, final boolean observeFullEvaluationData) {
-    final Map<String, Flag> flags = new HashMap<>();
-    final List<Rule> rules =
-        singletonList(
-            new Rule(singletonList(new ConditionConfiguration(ConditionOperator.GT, "id", 0))));
-    // Split must be non-empty so the allocation is considered a match target; its contents don't
-    // matter because the rule throws before a split is picked.
-    final Allocation allocation =
-        new Allocation("alloc", rules, null, null, emptyList(), Boolean.FALSE);
-    flags.put(
-        "num-rule",
-        new Flag("num-rule", true, ValueType.INTEGER, emptyMap(), singletonList(allocation)));
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    evaluator.accept(new ServerConfiguration("", "", observeFullEvaluationData, null, flags));
-
-    final EvaluationContext ctx = new MutableContext(targetingKey);
-    return evaluator.evaluate(Integer.class, "num-rule", 23, ctx);
-  }
-
-  @Test
-  public void testAllocationDateAbiAndInstantAccessors() throws Exception {
-    final Date startAt = Date.from(Instant.parse("2024-01-01T00:00:00Z"));
-    final Date endAt = Date.from(Instant.parse("2024-12-31T23:59:59Z"));
-    final Allocation allocation =
-        new Allocation("allocation", emptyList(), startAt, endAt, emptyList(), true);
-
-    assertThat(Allocation.class.getField("startAt").getType(), equalTo(Date.class));
-    assertThat(Allocation.class.getField("endAt").getType(), equalTo(Date.class));
-    assertThat(allocation.startAtInstant(), equalTo(startAt.toInstant()));
-    assertThat(allocation.endAtInstant(), equalTo(endAt.toInstant()));
-  }
-
-  @Test
-  public void testAllocationWindowHonorsMicrosecondPrecision() {
-    final Instant startAt = Instant.parse("2024-01-01T00:00:00.123456Z");
-    final Instant endAt = Instant.parse("2024-01-01T00:00:00.987654Z");
-    final Allocation allocation =
-        Allocation.fromInstants("allocation", emptyList(), startAt, endAt, emptyList(), true);
-
-    assertThat(
-        DDEvaluator.isAllocationActive(allocation, startAt.minusNanos(1_000)), equalTo(false));
-    assertThat(DDEvaluator.isAllocationActive(allocation, startAt), equalTo(true));
-    assertThat(DDEvaluator.isAllocationActive(allocation, endAt), equalTo(true));
-    assertThat(DDEvaluator.isAllocationActive(allocation, endAt.plusNanos(1_000)), equalTo(false));
-  }
-
-  // --- SemVer condition evaluation tests (ported from Go evaluator_test.go) ---
-
-  private static Flag semverFlag(final ConditionOperator operator, final String comparand) {
-    final ParsedSemver parsed = ParsedSemver.parse(comparand);
-    final ConditionConfiguration condition =
-        new ConditionConfiguration(operator, "version", comparand);
-    condition.semverComparand = parsed;
-    final Rule rule = new Rule(singletonList(condition));
-    final Split split = new Split(emptyList(), "on", null, null);
-    final Allocation allocation =
-        Allocation.fromInstants(
-            "targeted", singletonList(rule), null, null, singletonList(split), false);
-    final Map<String, Variant> variations = new HashMap<>();
-    variations.put("on", new Variant("on", true));
-    return new Flag("test-flag", true, ValueType.BOOLEAN, variations, singletonList(allocation));
-  }
-
-  private static EvaluationContext semverContext(final Object version) {
-    final Map<String, Object> attributes = new HashMap<>();
-    if (version != null) {
-      attributes.put("version", version);
-    }
-    final MutableContext context =
-        new MutableContext(Value.objectToValue(attributes).asStructure().asMap());
-    context.setTargetingKey("subject");
-    return context;
-  }
-
-  static Arguments[] semverConditionTestCases() {
-    return new Arguments[] {
-      // Equal
-      Arguments.of(ConditionOperator.SEMVER_EQ, "1.2.3", "1.2.3", true),
-      Arguments.of(ConditionOperator.SEMVER_EQ, "1.2.4", "1.2.3", false),
-      Arguments.of(ConditionOperator.SEMVER_EQ, "1.2.3.4.5.6", "1.2.3.4.5.6", true),
-      Arguments.of(ConditionOperator.SEMVER_GT, "1.2.3.4.5.7", "1.2.3.4.5.6", true),
-      // Not equal
-      Arguments.of(ConditionOperator.SEMVER_NEQ, "1.2.4", "1.2.3", true),
-      Arguments.of(ConditionOperator.SEMVER_NEQ, "1.2.3", "1.2.3", false),
-      // Less than
-      Arguments.of(ConditionOperator.SEMVER_LT, "1.9.9", "2.0.0", true),
-      Arguments.of(ConditionOperator.SEMVER_LT, "2.0.0", "2.0.0", false),
-      // Less than or equal
-      Arguments.of(ConditionOperator.SEMVER_LTE, "2.0.0", "2.0.0", true),
-      Arguments.of(ConditionOperator.SEMVER_LTE, "2.0.1", "2.0.0", false),
-      // Greater than
-      Arguments.of(ConditionOperator.SEMVER_GT, "1.0.1", "1.0.0", true),
-      Arguments.of(ConditionOperator.SEMVER_GT, "1.0.0", "1.0.0", false),
-      // Greater than or equal
-      Arguments.of(ConditionOperator.SEMVER_GTE, "1.0.0", "1.0.0", true),
-      Arguments.of(ConditionOperator.SEMVER_GTE, "0.9.9", "1.0.0", false),
-      // Prerelease ordering
-      Arguments.of(ConditionOperator.SEMVER_LT, "1.0.0-beta.1", "1.0.0", true),
-      Arguments.of(ConditionOperator.SEMVER_LT, "1.0.0-beta.2", "1.0.0-beta.11", true),
-      // Build metadata is ignored
-      Arguments.of(ConditionOperator.SEMVER_EQ, "4.0.0+build.42", "4.0.0", true),
-      Arguments.of(ConditionOperator.SEMVER_EQ, "4.0.0+exp.sha.5114f85", "4.0.0", true),
-      Arguments.of(ConditionOperator.SEMVER_NEQ, "4.0.0+build.42", "4.0.0", false),
-      Arguments.of(ConditionOperator.SEMVER_LT, "4.0.0+build.42", "4.0.0", false),
-      Arguments.of(ConditionOperator.SEMVER_LTE, "4.0.0+build.42", "4.0.0", true),
-      Arguments.of(ConditionOperator.SEMVER_GT, "4.0.0+build.42", "4.0.0", false),
-      Arguments.of(ConditionOperator.SEMVER_GTE, "4.0.0+build.42", "4.0.0", true),
-      Arguments.of(ConditionOperator.SEMVER_EQ, "1.0.0+linux", "1.0.0+darwin", true),
-      // Invalid attribute does not match
-      Arguments.of(ConditionOperator.SEMVER_NEQ, "not-a-version", "1.0.0", false),
-      Arguments.of(ConditionOperator.SEMVER_GTE, "1.2", "1.0.0", true),
-      Arguments.of(ConditionOperator.SEMVER_GTE, "v1.2.3", "1.0.0", false),
-      Arguments.of(ConditionOperator.SEMVER_GTE, "18446744073709551616.0.0", "1.0.0", false),
-      // Non-string attribute does not match
-      Arguments.of(ConditionOperator.SEMVER_EQ, 1.2, "1.2.0", false),
-    };
-  }
-
-  @ParameterizedTest(name = "{0} attr={1} comparand={2} -> {3}")
-  @MethodSource("semverConditionTestCases")
-  public void testEvaluateSemverCondition(
-      final ConditionOperator operator,
-      final Object attribute,
-      final String comparand,
-      final boolean wantMatch) {
-    final Map<String, Flag> flags = new HashMap<>();
-    flags.put("test-flag", semverFlag(operator, comparand));
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    evaluator.accept(new ServerConfiguration("", "", null, null, flags));
-
-    final ProviderEvaluation<Boolean> details =
-        evaluator.evaluate(Boolean.class, "test-flag", false, semverContext(attribute));
-
-    if (wantMatch) {
-      assertThat(details.getValue(), equalTo(true));
-      assertThat(details.getReason(), equalTo("TARGETING_MATCH"));
-    } else {
-      assertThat(details.getValue(), equalTo(false));
-      assertThat(details.getReason(), equalTo("DEFAULT"));
-    }
-  }
-
-  @Test
-  public void testEvaluateSemverConditionMissingAttribute() {
-    final Map<String, Flag> flags = new HashMap<>();
-    flags.put("test-flag", semverFlag(ConditionOperator.SEMVER_EQ, "1.2.3"));
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    evaluator.accept(new ServerConfiguration("", "", null, null, flags));
-
-    final ProviderEvaluation<Boolean> details =
-        evaluator.evaluate(Boolean.class, "test-flag", false, semverContext(null));
-
-    assertThat(details.getValue(), equalTo(false));
-    assertThat(details.getReason(), equalTo("DEFAULT"));
-  }
-
-  @Test
-  public void testEvaluateSemverConditionInvalidComparandReturnsParseError() {
-    // A flag with an invalid semver comparand is dropped during parsing.
-    // The evaluator should return PARSE_ERROR when the flag is queried.
-    final Map<String, Flag> flags = new HashMap<>();
-    final Map<String, String> invalidFlags = new HashMap<>();
-    invalidFlags.put("invalid-semver", "invalid_semver_comparand");
-    final ServerConfiguration config = new ServerConfiguration("", "", null, null, flags);
-    config.invalidFlags = invalidFlags;
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    evaluator.accept(config);
-
-    final ProviderEvaluation<Boolean> details =
-        evaluator.evaluate(Boolean.class, "invalid-semver", false, semverContext("1.2.3"));
-
-    assertThat(details.getValue(), equalTo(false));
-    assertThat(details.getReason(), equalTo(ERROR.name()));
-    assertThat(details.getErrorCode(), equalTo(ErrorCode.PARSE_ERROR));
-  }
-
-  @Test
-  public void testEvaluateMalformedFlagReturnsParseError() {
-    final Map<String, Flag> flags = new HashMap<>();
-    final Map<String, String> invalidFlags = new HashMap<>();
-    invalidFlags.put("malformed-flag", "invalid_flag");
-    final ServerConfiguration config = new ServerConfiguration("", "", null, null, flags);
-    config.invalidFlags = invalidFlags;
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    evaluator.accept(config);
-
-    final ProviderEvaluation<Boolean> details =
-        evaluator.evaluate(Boolean.class, "malformed-flag", false, new MutableContext());
-
-    assertThat(details.getValue(), equalTo(false));
-    assertThat(details.getReason(), equalTo(ERROR.name()));
-    assertThat(details.getErrorCode(), equalTo(ErrorCode.PARSE_ERROR));
-  }
-
-  private static Arguments[] flatteningTestCases() {
-    final List<Arguments> arguments = new ArrayList<>();
-    arguments.add(Arguments.of(emptyMap(), emptyMap()));
-    arguments.add(
-        Arguments.of(
-            mapOf("integer", 1, "double", 23D, "boolean", true, "string", "string", "null", null),
-            mapOf("integer", 1, "double", 23D, "boolean", true, "string", "string", "null", null)));
-    arguments.add(
-        Arguments.of(
-            mapOf("list", asList(1, 2, singletonList(4))),
-            mapOf("list[0]", 1, "list[1]", 2, "list[2][0]", 4)));
-    arguments.add(
-        Arguments.of(
-            mapOf("map", mapOf("key1", 1, "key2", 2, "key3", mapOf("key4", 4))),
-            mapOf("map.key1", 1, "map.key2", 2, "map.key3.key4", 4)));
-    arguments.add(
-        Arguments.of(
-            mapOf("plan", "gold", "cohort", "gold"), mapOf("plan", "gold", "cohort", "gold")));
-    final Instant instant = Instant.parse("2026-07-10T12:34:56Z");
-    arguments.add(Arguments.of(mapOf("instant", instant), mapOf("instant", instant.toString())));
-    return arguments.toArray(new Arguments[0]);
-  }
-
-  @MethodSource("flatteningTestCases")
-  @ParameterizedTest
-  public void testFlattening(
-      final Map<String, Object> attributes, final Map<String, Object> expected) {
-    final EvaluationContext context =
-        new MutableContext(Value.objectToValue(attributes).asStructure().asMap());
-    final Map<String, Object> result = DDEvaluator.flattenContext(context);
-
-    assertThat(result.size(), equalTo(expected.size()));
-    for (final Map.Entry<String, Object> entry : expected.entrySet()) {
-      assertThat(result, hasEntry(entry.getKey(), entry.getValue()));
-    }
-  }
-
-  @Test
-  public void testDeeplyNestedContextIsTruncatedRatherThanOverflowingTheStack() {
-    Value nested = new Value("leaf");
-    for (int i = 0; i < 10_000; i++) {
-      nested = new Value(singletonList(nested));
-    }
-    final EvaluationContext context = new MutableContext().add("deep", singletonList(nested));
-
-    final Map<String, Object> result = DDEvaluator.flattenContext(context);
-
-    final StringBuilder truncatedKey = new StringBuilder("deep");
-    for (int i = 0; i < DDEvaluator.MAX_SNAPSHOT_DEPTH; i++) {
-      truncatedKey.append("[0]");
-    }
-    assertThat(result.size(), equalTo(1));
-    assertThat(result, hasEntry(truncatedKey.toString(), null));
-  }
-
-  @Test
-  public void testCopyPrunedContextCapsTopLevelFieldCount() {
-    final MutableContext context = new MutableContext();
-    for (int i = 0; i < DDEvaluator.MAX_CONTEXT_FIELDS + 100; i++) {
-      context.add(String.format("k%04d", i), "v");
-    }
-
-    final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
-
-    assertThat(result.attrs.size(), equalTo(DDEvaluator.MAX_CONTEXT_FIELDS));
-    assertThat(result.truncatedReason, equalTo("max_context_fields"));
-  }
-
-  @Test
-  public void testCopyPrunedContextSkipsOversizedStringValues() {
-    final char[] longChars = new char[DDEvaluator.MAX_VALUE_LENGTH + 1];
-    java.util.Arrays.fill(longChars, 'x');
-    final MutableContext context = new MutableContext();
-    context.add("keep", "ok");
-    context.add("drop", new String(longChars));
-
-    final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
-
-    assertThat(result.attrs, hasEntry("keep", "ok"));
-    assertThat(result.attrs.containsKey("drop"), equalTo(false));
-    assertThat(result.truncatedReason, equalTo("max_value_length"));
-  }
-
-  @Test
-  public void testCopyPrunedContextSkipsOversizedKeys() {
-    final char[] longKeyChars = new char[DDEvaluator.MAX_KEY_LENGTH + 1];
-    java.util.Arrays.fill(longKeyChars, 'k');
-    final MutableContext context = new MutableContext();
-    context.add("keep", "ok");
-    context.add(new String(longKeyChars), "drop");
-
-    final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
-
-    assertThat(result.attrs, hasEntry("keep", "ok"));
-    assertThat(result.attrs.size(), equalTo(1));
-    assertThat(result.truncatedReason, equalTo("max_key_length"));
-  }
-
-  @Test
-  public void testCopyPrunedContextCapsListWidth() {
-    final List<Value> wide = new java.util.ArrayList<>();
-    for (int i = 0; i < DDEvaluator.MAX_LIST_ELEMENTS + 50; i++) {
-      wide.add(Value.objectToValue("v" + i));
-    }
-    final EvaluationContext context = new MutableContext().add("list", wide);
-
-    final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
-
-    assertThat(result.attrs.containsKey("list[0]"), equalTo(true));
-    assertThat(
-        result.attrs.containsKey("list[" + (DDEvaluator.MAX_LIST_ELEMENTS - 1) + "]"),
-        equalTo(true));
-    assertThat(
-        result.attrs.containsKey("list[" + DDEvaluator.MAX_LIST_ELEMENTS + "]"), equalTo(false));
-    assertThat(result.truncatedReason, equalTo("max_list_elements"));
-  }
-
-  @Test
-  public void testCopyPrunedContextCapsStructureWidth() {
-    final dev.openfeature.sdk.MutableStructure wide = new dev.openfeature.sdk.MutableStructure();
-    for (int i = 0; i < DDEvaluator.MAX_STRUCTURE_PROPERTIES + 50; i++) {
-      wide.add(String.format("p%04d", i), "v");
-    }
-    final EvaluationContext context = new MutableContext().add("struct", wide);
-
-    final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
-
-    long structKeys = result.attrs.keySet().stream().filter(k -> k.startsWith("struct.")).count();
-    assertThat(structKeys, equalTo((long) DDEvaluator.MAX_STRUCTURE_PROPERTIES));
-    assertThat(result.truncatedReason, equalTo("max_structure_properties"));
-  }
-
-  @Test
-  public void testCopyPrunedContextTruncatesDeepNesting() {
-    Value nested = new Value("leaf");
-    for (int i = 0; i < 10_000; i++) {
-      nested = new Value(singletonList(nested));
-    }
-    final EvaluationContext context = new MutableContext().add("deep", singletonList(nested));
-
-    final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
-
-    final StringBuilder truncatedKey = new StringBuilder("deep");
-    for (int i = 0; i < DDEvaluator.MAX_SNAPSHOT_DEPTH; i++) {
-      truncatedKey.append("[0]");
-    }
-    // The recursion stops on the first list element at MAX_SNAPSHOT_DEPTH; deeper elements are
-    // never walked and no entry is emitted for them.
-    assertThat(result.attrs.containsKey(truncatedKey.toString()), equalTo(false));
-    assertThat(result.attrs.size(), equalTo(0));
-    assertThat(result.truncatedReason, equalTo("max_snapshot_depth"));
-  }
-
-  @Test
-  public void testCopyPrunedContextExcludesTargetingKey() {
-    final MutableContext context = new MutableContext("user-42").add("region", "us-east-1");
-
-    final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
-
-    assertThat(result.attrs, hasEntry("region", "us-east-1"));
-    assertThat(result.attrs.containsKey("targetingKey"), equalTo(false));
-    assertThat(result.truncatedReason, equalTo(null));
-  }
-
-  @Test
-  public void testCopyPrunedContextNoTruncationReturnsNullReason() {
-    final MutableContext context = new MutableContext("user-1");
-    context.add("region", "us-east-1");
-    context.add("tier", "gold");
-
-    final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
-
-    assertThat(result.attrs, hasEntry("region", "us-east-1"));
-    assertThat(result.truncatedReason, equalTo(null));
-  }
-
-  @Test
-  public void testCopyPrunedContextMultipleReasonsAreSortedAndDeduplicated() {
-    final char[] longChars = new char[DDEvaluator.MAX_VALUE_LENGTH + 1];
-    java.util.Arrays.fill(longChars, 'x');
-    final char[] longKeyChars = new char[DDEvaluator.MAX_KEY_LENGTH + 1];
-    java.util.Arrays.fill(longKeyChars, 'k');
-    final MutableContext context = new MutableContext();
-    context.add("keep", "ok");
-    context.add("dropValue", new String(longChars));
-    context.add(new String(longKeyChars), "dropKey");
-
-    final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
-
-    // Both max_key_length and max_value_length fired; sorted alphabetically, no duplicates.
-    assertThat(result.truncatedReason, equalTo("max_key_length,max_value_length"));
-  }
-
-  @Test
-  public void testCanonicalFixturesArePresent() throws IOException {
-    assertThat(canonicalTestCases().size(), greaterThan(0));
-  }
-
-  @MethodSource("canonicalTestCases")
-  @ParameterizedTest(name = "{0}")
-  public void testEvaluateCanonicalFixture(final FixtureCase testCase) throws IOException {
-    final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
-    evaluator.accept(loadCanonicalConfiguration());
-
-    final Class<?> targetType = targetType(testCase.variationType);
-    final Object defaultValue = mapFixtureValue(targetType, testCase.defaultValue);
-    final Object expectedValue = mapFixtureValue(targetType, testCase.result.value);
-    final ProviderEvaluation<?> details =
-        evaluate(evaluator, targetType, testCase.flag, defaultValue, context(testCase));
-
-    assertThat(details.getValue(), equalTo(expectedValue));
-    assertThat(details.getReason(), equalTo(testCase.result.reason));
-    if (testCase.result.variant != null) {
-      assertThat(details.getVariant(), equalTo(testCase.result.variant));
-    }
-    if (testCase.result.errorCode != null) {
-      assertThat(details.getErrorCode(), equalTo(ErrorCode.valueOf(testCase.result.errorCode)));
-    }
-    if (testCase.result.flagMetadata != null
-        && testCase.result.flagMetadata.get("allocationKey") != null) {
-      assertThat(
-          details.getFlagMetadata().getString("allocationKey"),
-          equalTo(String.valueOf(testCase.result.flagMetadata.get("allocationKey"))));
-    }
-  }
-
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  private static ProviderEvaluation<?> evaluate(
-      final DDEvaluator evaluator,
-      final Class<?> targetType,
-      final String flag,
-      final Object defaultValue,
-      final EvaluationContext context) {
-    return evaluator.evaluate((Class) targetType, flag, defaultValue, context);
-  }
-
-  private static ServerConfiguration loadCanonicalConfiguration() throws IOException {
-    INVALID_FLAGS_HOLDER.get().clear();
-    try {
-      final ServerConfiguration config =
-          CONFIG_ADAPTER.fromJson(read(fixtureRoot().resolve("ufc-config.json")));
-      final Map<String, String> invalidFlags = new HashMap<>(INVALID_FLAGS_HOLDER.get());
-      if (!invalidFlags.isEmpty()) {
+    private static final String CANONICAL_FIXTURE_PATH =
+            "dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data";
+    private static final Moshi MOSHI = new Moshi.Builder()
+            .add(Date.class, new DateAdapter())
+            .add(ShardAdapter.FACTORY)
+            .add(FlagMapAdapter.FACTORY)
+            .build();
+    private static final JsonAdapter<ServerConfiguration> CONFIG_ADAPTER = MOSHI.adapter(ServerConfiguration.class);
+    private static final Type FIXTURE_LIST_TYPE = Types.newParameterizedType(List.class, FixtureCase.class);
+    private static final JsonAdapter<List<FixtureCase>> FIXTURE_LIST_ADAPTER = MOSHI.adapter(FIXTURE_LIST_TYPE);
+    private static final ThreadLocal<Map<String, String>> INVALID_FLAGS_HOLDER = ThreadLocal.withInitial(HashMap::new);
+    private static final long MAX_UNSIGNED_INT = 0xffff_ffffL;
+
+    @Test
+    public void testInitializeSignalsApplicationProviderActivation() throws Exception {
+        final FeatureFlaggingGateway.ActivationListener listener =
+                mock(FeatureFlaggingGateway.ActivationListener.class);
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        FeatureFlaggingGateway.addActivationListener(listener);
+        try {
+            evaluator.initialize(1, MILLISECONDS, mock(EvaluationContext.class));
+
+            verify(listener).activate();
+        } finally {
+            evaluator.shutdown();
+            FeatureFlaggingGateway.removeActivationListener(listener);
+        }
+    }
+
+    private static Arguments[] valueMappingTestCases() {
+        return new Arguments[] {
+            // String mappings
+            Arguments.of(String.class, "hello", "hello"),
+            Arguments.of(String.class, 123, "123"),
+            Arguments.of(String.class, true, "true"),
+            Arguments.of(String.class, 3.14, "3.14"),
+            Arguments.of(String.class, null, null),
+
+            // Boolean mappings
+            Arguments.of(Boolean.class, true, true),
+            Arguments.of(Boolean.class, false, false),
+            Arguments.of(Boolean.class, "true", true),
+            Arguments.of(Boolean.class, "false", false),
+            Arguments.of(Boolean.class, "TRUE", true),
+            Arguments.of(Boolean.class, "FALSE", false),
+            Arguments.of(Boolean.class, 1, true),
+            Arguments.of(Boolean.class, 0, false),
+            Arguments.of(Boolean.class, null, null),
+
+            // Integer mappings
+            Arguments.of(Integer.class, 42, 42),
+            Arguments.of(Integer.class, "42", 42),
+            Arguments.of(Integer.class, 3.14, 3),
+            Arguments.of(Integer.class, "3.14", 3),
+            Arguments.of(Integer.class, null, null),
+
+            // Double mappings
+            Arguments.of(Double.class, 3.14, 3.14),
+            Arguments.of(Double.class, "3.14", 3.14),
+            Arguments.of(Double.class, 42, 42.0),
+            Arguments.of(Double.class, "42", 42.0),
+            Arguments.of(Double.class, null, null),
+
+            // Value mappings (OpenFeature Value objects)
+            Arguments.of(Value.class, "hello", Value.objectToValue("hello")),
+            Arguments.of(Value.class, 42, Value.objectToValue(42)),
+            Arguments.of(Value.class, 3.14, Value.objectToValue(3.14)),
+            Arguments.of(Value.class, true, Value.objectToValue(true)),
+            Arguments.of(Value.class, null, null),
+
+            // Unsupported
+            Arguments.of(Long.class, 42L, IllegalArgumentException.class),
+        };
+    }
+
+    @ParameterizedTest
+    @MethodSource("valueMappingTestCases")
+    public void testValueMapping(final Class<?> target, final Object value, final Object expected) {
+        if (expected == IllegalArgumentException.class) {
+            assertThrows(IllegalArgumentException.class, () -> DDEvaluator.mapValue(target, value));
+        } else {
+            final Object result = DDEvaluator.mapValue(target, value);
+            assertThat(result, equalTo(expected));
+        }
+    }
+
+    @Test
+    public void testEvaluateNoConfig() {
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        final ProviderEvaluation<?> details =
+                evaluator.evaluate(Integer.class, "test", 23, mock(EvaluationContext.class));
+        assertThat(details.getValue(), equalTo(23));
+        assertThat(details.getReason(), equalTo(ERROR.name()));
+        assertThat(details.getErrorCode(), equalTo(ErrorCode.PROVIDER_NOT_READY));
+    }
+
+    @Test
+    public void testInitializeTimesOutWithoutConfig() throws Exception {
+        final Runnable configCallback = mock(Runnable.class);
+        final DDEvaluator evaluator = new DDEvaluator(configCallback);
+        evaluator.accept(null);
+        try {
+            assertThat(evaluator.initialize(10, MILLISECONDS, mock(EvaluationContext.class)), equalTo(false));
+            verify(configCallback, times(0)).run();
+        } finally {
+            evaluator.shutdown();
+        }
+    }
+
+    @Test
+    public void testInitializeWaitsForNonNullConfig() throws Exception {
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        final ExecutorService executor = Executors.newSingleThreadExecutor();
+        try {
+            final Future<Boolean> initialized =
+                    executor.submit(() -> evaluator.initialize(1, SECONDS, mock(EvaluationContext.class)));
+
+            evaluator.accept(null);
+            assertThat(initialized.isDone(), equalTo(false));
+
+            evaluator.accept(mock(ServerConfiguration.class));
+            assertThat(initialized.get(1, SECONDS), equalTo(true));
+        } finally {
+            executor.shutdownNow();
+            evaluator.shutdown();
+        }
+    }
+
+    @Test
+    public void testEvaluateNoContext() {
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        evaluator.accept(mock(ServerConfiguration.class));
+        final ProviderEvaluation<?> details = evaluator.evaluate(Integer.class, "test", 23, null);
+        assertThat(details.getValue(), equalTo(23));
+        assertThat(details.getReason(), equalTo(ERROR.name()));
+        assertThat(details.getErrorCode(), equalTo(ErrorCode.INVALID_CONTEXT));
+    }
+
+    @Test
+    public void testNoAllocations() {
+        final Map<String, Flag> flags = new HashMap<>();
+        flags.put("null-allocation", new Flag("target", true, null, null, null));
+        flags.put("empty-allocation", new Flag("target", true, null, null, emptyList()));
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        evaluator.accept(new ServerConfiguration("", "", false, null, flags));
+
+        final EvaluationContext ctx = new MutableContext("target").setTargetingKey("allocation");
+
+        ProviderEvaluation<?> details = evaluator.evaluate(Integer.class, "null-allocation", 23, ctx);
+        assertThat(details.getValue(), equalTo(23));
+        assertThat(details.getReason(), equalTo(ERROR.name()));
+        assertThat(details.getErrorCode(), equalTo(ErrorCode.GENERAL));
+
+        details = evaluator.evaluate(Integer.class, "empty-allocation", 23, ctx);
+        assertThat(details.getValue(), equalTo(23));
+        assertThat(details.getReason(), equalTo("DEFAULT"));
+        assertThat(details.getErrorCode(), nullValue());
+    }
+
+    @Test
+    public void testEvaluateUnsignedShardRange() {
+        final Map<String, Variant> variations = new HashMap<>();
+        variations.put("on", new Variant("on", 1));
+        // The selected shard is above Integer.MAX_VALUE, so this test proves that evaluation uses
+        // unsigned semantics after binary-compatible int storage.
+        final Shard shard =
+                new Shard("salt", singletonList(new ShardRange((int) 3_699_531_192L, (int) 3_699_531_193L)), (int)
+                        MAX_UNSIGNED_INT);
+        final Split split = new Split(singletonList(shard), "on", emptyMap(), null);
+        final Allocation allocation = new Allocation("alloc-1", null, null, null, singletonList(split), Boolean.FALSE);
+        final Map<String, Flag> flags = new HashMap<>();
+        flags.put("target", new Flag("target", true, ValueType.INTEGER, variations, singletonList(allocation)));
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        evaluator.accept(new ServerConfiguration("", "", false, null, flags));
+
+        final EvaluationContext context = new MutableContext("target").setTargetingKey("high-shard-user");
+        final ProviderEvaluation<?> details = evaluator.evaluate(Integer.class, "target", 23, context);
+
+        assertThat(details.getValue(), equalTo(1));
+        assertThat(details.getReason(), equalTo("SPLIT"));
+        assertThat(details.getVariant(), equalTo("on"));
+    }
+
+    // ---- observeFullEvaluationData metadata is stamped from the evaluator's ServerConfiguration
+    // ----
+    //
+    // Every code path that returns a ProviderEvaluation must stamp the consent boolean so downstream
+    // hooks can honour it. These tests exercise each stamp site with both consent values (on/off) so
+    // a mutation to any stamp — deleting the line, hardcoding the value — flips at least one
+    // assertion.
+
+    // -- success path: resolveVariant (variant metadata builder) --
+
+    @Test
+    public void observeFullEvaluationDataStampedTrueOnResolvedVariant() {
+        final ProviderEvaluation<?> details = evaluateMatchingFlag(true);
+
+        assertThat(details.getReason(), equalTo("STATIC"));
+        assertThat(details.getVariant(), equalTo("on"));
+        assertThat(
+                details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA), equalTo(true));
+    }
+
+    @Test
+    public void observeFullEvaluationDataStampedFalseOnResolvedVariant() {
+        // Symmetric consent-off assertion. Paired with the consent-on test above this pins the
+        // resolveVariant metadata line (DDEvaluator.java: METADATA_OBSERVE_FULL_EVALUATION_DATA) so
+        // deleting it or hardcoding either value would fail at least one assertion.
+        final ProviderEvaluation<?> details = evaluateMatchingFlag(false);
+
+        assertThat(details.getReason(), equalTo("STATIC"));
+        assertThat(details.getVariant(), equalTo("on"));
+        assertThat(
+                details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA),
+                equalTo(false));
+    }
+
+    // -- DISABLED path: flag.enabled=false --
+
+    @Test
+    public void observeFullEvaluationDataStampedTrueOnDisabledFlag() {
+        final ProviderEvaluation<?> details = evaluateDisabledFlag(true);
+
+        assertThat(details.getReason(), equalTo("DISABLED"));
+        assertThat(
+                details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA), equalTo(true));
+    }
+
+    @Test
+    public void observeFullEvaluationDataStampedFalseOnDisabledFlag() {
+        final ProviderEvaluation<?> details = evaluateDisabledFlag(false);
+
+        assertThat(details.getReason(), equalTo("DISABLED"));
+        assertThat(
+                details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA),
+                equalTo(false));
+    }
+
+    // -- DEFAULT path: no allocation matches --
+
+    @Test
+    public void observeFullEvaluationDataStampedTrueOnDefault() {
+        // Allocation exists but has empty splits, so the loop finishes without returning and we fall
+        // through to the DEFAULT branch.
+        final ProviderEvaluation<?> details = evaluateWithEmptySplits(true);
+
+        assertThat(details.getReason(), equalTo("DEFAULT"));
+        assertThat(
+                details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA), equalTo(true));
+    }
+
+    @Test
+    public void observeFullEvaluationDataStampedFalseOnDefault() {
+        final ProviderEvaluation<?> details = evaluateWithEmptySplits(false);
+
+        assertThat(details.getReason(), equalTo("DEFAULT"));
+        assertThat(
+                details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA),
+                equalTo(false));
+    }
+
+    // -- error paths: FLAG_NOT_FOUND / PROVIDER_NOT_READY (via consentMetadata in error()) --
+
+    @Test
+    public void observeFullEvaluationDataStampedOnFlagNotFoundError() {
+        // Was previously named "…OnSuccess" but actually exercises the error() helper's stamp via
+        // FLAG_NOT_FOUND — kept for that stamp site, correctly named.
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        evaluator.accept(new ServerConfiguration("", "", true, null, new HashMap<>()));
+
+        final EvaluationContext ctx = new MutableContext("target").setTargetingKey("k");
+        final ProviderEvaluation<?> details = evaluator.evaluate(Integer.class, "unknown-flag", 23, ctx);
+
+        assertThat(details.getErrorCode(), equalTo(ErrorCode.FLAG_NOT_FOUND));
+        assertThat(
+                details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA), equalTo(true));
+    }
+
+    @Test
+    public void observeFullEvaluationDataDefaultsToFalseWhenEvaluatorHasNoConfig() {
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        final ProviderEvaluation<?> details =
+                evaluator.evaluate(Integer.class, "test", 23, mock(EvaluationContext.class));
+        assertThat(details.getErrorCode(), equalTo(ErrorCode.PROVIDER_NOT_READY));
+        assertThat(
+                details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA),
+                equalTo(false));
+    }
+
+    @Test
+    public void observeFullEvaluationDataNullConfigFieldTreatedAsFalse() {
+        // The field is boxed so Moshi tolerates a malformed consent value in the UFC JSON without
+        // aborting the whole parse. The evaluator must then interpret null as the privacy-preserving
+        // default. An auto-unbox at the read site (config.observeFullEvaluationData) would NPE here.
+        final Map<String, Flag> flags = new HashMap<>();
+        flags.put("target", new Flag("target", true, ValueType.INTEGER, emptyMap(), emptyList()));
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        evaluator.accept(new ServerConfiguration("", "", null, null, flags));
+
+        final EvaluationContext ctx = new MutableContext("target").setTargetingKey("k");
+        final ProviderEvaluation<?> details = evaluator.evaluate(Integer.class, "target", 23, ctx);
+
+        // Flags still evaluate — availability preserved despite the malformed consent field.
+        assertThat(details.getReason(), equalTo("DEFAULT"));
+        assertThat(
+                details.getFlagMetadata().getBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA),
+                equalTo(false));
+    }
+
+    // ---- exposure events carry the split's serial id ----
+
+    @Test
+    public void exposureCarriesTheSplitSerialId() {
+        assertEquals(Integer.valueOf(340132), exposureFor(340132).serial_id);
+    }
+
+    @Test
+    public void exposureCarriesSerialIdZero() {
+        assertEquals(Integer.valueOf(0), exposureFor(0).serial_id);
+    }
+
+    @Test
+    public void exposureOmitsSerialIdWhenTheSplitHasNone() {
+        assertNull(exposureFor(null).serial_id);
+    }
+
+    @Test
+    public void legacyExposureApiDispatchesAnExposureWithoutSerialId() {
+        final boolean previous = DDEvaluator.USE_LEGACY_EXPOSURE_API.getAndSet(true);
+        try {
+            assertNull(exposureFor(7).serial_id);
+        } finally {
+            DDEvaluator.USE_LEGACY_EXPOSURE_API.set(previous);
+        }
+    }
+
+    // ---- old-agent bootstrap probe ----
+
+    /** A Split from an agent that predates the serial id: the field does not exist. */
+    static final class SplitWithoutSerialId {}
+
+    /** A Split whose serialId is not the Integer the dispatch site reads. */
+    static final class SplitWithWrongSerialIdType {
+        public long serialId;
+    }
+
+    /** An ExposureEvent from an agent that predates the serial id: only the five-arg constructor. */
+    static final class LegacyExposureEvent {
+        // Qualify exposure types that share names with the imported UFC types.
+        LegacyExposureEvent(
+                final long timestamp,
+                final datadog.trace.api.featureflag.exposure.Allocation allocation,
+                final datadog.trace.api.featureflag.exposure.Flag flag,
+                final datadog.trace.api.featureflag.exposure.Variant variant,
+                final Subject subject) {}
+    }
+
+    /**
+     * Positive control. The probe must agree with the bootstrap actually on the classpath, or the
+     * negative cases below would pass for the wrong reason and the feature would ship switched off.
+     */
+    @Test
+    public void probeAcceptsTheBootstrapOnTheClasspath() {
+        assertTrue(DDEvaluator.splitSerialIdSupported(Split.class));
+        assertTrue(DDEvaluator.exposureSerialIdSupported(ExposureEvent.class));
+        assertTrue(DDEvaluator.SPLIT_SERIAL_ID_SUPPORTED.get());
+        assertFalse(DDEvaluator.USE_LEGACY_EXPOSURE_API.get());
+    }
+
+    @Test
+    public void probeRejectsAnAgentWhoseSplitHasNoSerialId() {
+        assertFalse(DDEvaluator.splitSerialIdSupported(SplitWithoutSerialId.class));
+    }
+
+    @Test
+    public void probeRejectsAnAgentWhoseSerialIdIsNotAnInteger() {
+        assertFalse(DDEvaluator.splitSerialIdSupported(SplitWithWrongSerialIdType.class));
+    }
+
+    @Test
+    public void probeRejectsAnAgentWithoutTheSerialIdConstructor() {
+        assertFalse(DDEvaluator.exposureSerialIdSupported(LegacyExposureEvent.class));
+    }
+
+    /**
+     * Tests legacy bootstrap behavior when Split.serialId exists but the exposure event has only the
+     * five-argument constructor. Split support must remain independent of exposure constructor
+     * support.
+     */
+    @Test
+    public void probeKeepsSplitSupportWhenOnlyTheEventConstructorIsMissing() {
+        assertTrue(DDEvaluator.splitSerialIdSupported(Split.class));
+        assertFalse(DDEvaluator.exposureSerialIdSupported(LegacyExposureEvent.class));
+    }
+
+    /**
+     * Evaluates a logging allocation whose split carries the given serial id and returns the single
+     * dispatched exposure. Span enrichment is off here, as it is by default, so this also pins that
+     * the serial id does not travel via the enrichment-gated evaluation metadata.
+     */
+    private static ExposureEvent exposureFor(final Integer serialId) {
+        final List<ExposureEvent> dispatched = new ArrayList<>();
+        final FeatureFlaggingGateway.ExposureListener listener = dispatched::add;
+        FeatureFlaggingGateway.addExposureListener(listener);
+        try {
+            final Map<String, Variant> variations = new HashMap<>();
+            variations.put("on", new Variant("on", 1));
+            final Split split = new Split(emptyList(), "on", emptyMap(), serialId);
+            final Allocation allocation =
+                    new Allocation("alloc-1", null, null, null, singletonList(split), Boolean.TRUE);
+            evaluateFlag(new Flag("target", true, ValueType.INTEGER, variations, singletonList(allocation)), true);
+        } finally {
+            FeatureFlaggingGateway.removeExposureListener(listener);
+        }
+        assertEquals(1, dispatched.size());
+        return dispatched.get(0);
+    }
+
+    // Builds a flag that reaches resolveVariant: enabled, one allocation with no rules, one split
+    // with empty shards (so the shard-match branch is skipped and the split is picked immediately),
+    // and a single "on" variant whose value maps to the requested Integer type.
+    private static ProviderEvaluation<?> evaluateMatchingFlag(final boolean observeFullEvaluationData) {
+        final Map<String, Variant> variations = new HashMap<>();
+        variations.put("on", new Variant("on", 1));
+        final Split split = new Split(emptyList(), "on", emptyMap(), null);
+        final Allocation allocation = new Allocation("alloc-1", null, null, null, singletonList(split), Boolean.FALSE);
+        return evaluateFlag(
+                new Flag("target", true, ValueType.INTEGER, variations, singletonList(allocation)),
+                observeFullEvaluationData);
+    }
+
+    private static ProviderEvaluation<?> evaluateDisabledFlag(final boolean observeFullEvaluationData) {
+        return evaluateFlag(new Flag("target", false, ValueType.INTEGER, emptyMap(), null), observeFullEvaluationData);
+    }
+
+    private static ProviderEvaluation<?> evaluateWithEmptySplits(final boolean observeFullEvaluationData) {
+        // Enabled, allocations present, allocation active, no rules, empty splits → falls through the
+        // for-loop to the DEFAULT return.
+        final Allocation allocation = new Allocation("alloc-1", null, null, null, emptyList(), Boolean.FALSE);
+        return evaluateFlag(
+                new Flag("target", true, ValueType.INTEGER, emptyMap(), singletonList(allocation)),
+                observeFullEvaluationData);
+    }
+
+    private static ProviderEvaluation<?> evaluateFlag(final Flag flag, final boolean observeFullEvaluationData) {
+        final Map<String, Flag> flags = new HashMap<>();
+        flags.put("target", flag);
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        evaluator.accept(new ServerConfiguration("", "", observeFullEvaluationData, null, flags));
+
+        final EvaluationContext ctx = new MutableContext("target").setTargetingKey("user-1");
+        return evaluator.evaluate(Integer.class, "target", 23, ctx);
+    }
+
+    // ---- error message redaction respects observeFullEvaluationData ----
+
+    @Test
+    public void numericConditionOnTargetingKeyDropsExceptionMessageUnderConsentOff() {
+        // Rule {attribute:"id", operator:GT, value:0} + "id" not in context →
+        // DDEvaluator.resolveAttribute
+        // falls back to the targeting key, so Double.parseDouble("jane.doe@datadoghq.com") throws
+        // NumberFormatException. The exception message echoes the raw context value verbatim, so it
+        // must be dropped when observeFullEvaluationData=false.
+        final ProviderEvaluation<?> details = evaluateWithNumericRuleOnId("jane.doe@datadoghq.com", false);
+
+        assertThat(details.getErrorCode(), equalTo(ErrorCode.TYPE_MISMATCH));
+        assertNull(details.getErrorMessage(), "consent-off must not surface the raw exception message");
+    }
+
+    @Test
+    public void numericConditionOnTargetingKeyPreservesExceptionMessageUnderConsentOn() {
+        // Symmetric case: with consent on, the raw exception message flows through unchanged so
+        // operators keep the diagnostic detail they opted in to.
+        final ProviderEvaluation<?> details = evaluateWithNumericRuleOnId("jane.doe@datadoghq.com", true);
+
+        assertThat(details.getErrorCode(), equalTo(ErrorCode.TYPE_MISMATCH));
+        assertThat(details.getErrorMessage(), equalTo("For input string: \"jane.doe@datadoghq.com\""));
+    }
+
+    @Test
+    public void numericConditionOnTargetingKeyErrorMessageNeverContainsPiiUnderConsentOff() {
+        // Belt-and-suspenders: independent of the exact null/empty form, the raw PII value must never
+        // appear in the message under consent-off. Guards against future changes that might replace
+        // null with a redacted string or a code-name suffix.
+        final ProviderEvaluation<?> details = evaluateWithNumericRuleOnId("jane.doe@datadoghq.com", false);
+
+        final String message = details.getErrorMessage();
+        assertFalse(
+                message != null && message.contains("jane.doe@datadoghq.com"),
+                "consent-off errorMessage must not contain raw context values");
+    }
+
+    private static ProviderEvaluation<?> evaluateWithNumericRuleOnId(
+            final String targetingKey, final boolean observeFullEvaluationData) {
+        final Map<String, Flag> flags = new HashMap<>();
+        final List<Rule> rules =
+                singletonList(new Rule(singletonList(new ConditionConfiguration(ConditionOperator.GT, "id", 0))));
+        // Split must be non-empty so the allocation is considered a match target; its contents don't
+        // matter because the rule throws before a split is picked.
+        final Allocation allocation = new Allocation("alloc", rules, null, null, emptyList(), Boolean.FALSE);
+        flags.put("num-rule", new Flag("num-rule", true, ValueType.INTEGER, emptyMap(), singletonList(allocation)));
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        evaluator.accept(new ServerConfiguration("", "", observeFullEvaluationData, null, flags));
+
+        final EvaluationContext ctx = new MutableContext(targetingKey);
+        return evaluator.evaluate(Integer.class, "num-rule", 23, ctx);
+    }
+
+    @Test
+    public void testAllocationDateAbiAndInstantAccessors() throws Exception {
+        final Date startAt = Date.from(Instant.parse("2024-01-01T00:00:00Z"));
+        final Date endAt = Date.from(Instant.parse("2024-12-31T23:59:59Z"));
+        final Allocation allocation = new Allocation("allocation", emptyList(), startAt, endAt, emptyList(), true);
+
+        assertThat(Allocation.class.getField("startAt").getType(), equalTo(Date.class));
+        assertThat(Allocation.class.getField("endAt").getType(), equalTo(Date.class));
+        assertThat(allocation.startAtInstant(), equalTo(startAt.toInstant()));
+        assertThat(allocation.endAtInstant(), equalTo(endAt.toInstant()));
+    }
+
+    @Test
+    public void testAllocationWindowHonorsMicrosecondPrecision() {
+        final Instant startAt = Instant.parse("2024-01-01T00:00:00.123456Z");
+        final Instant endAt = Instant.parse("2024-01-01T00:00:00.987654Z");
+        final Allocation allocation =
+                Allocation.fromInstants("allocation", emptyList(), startAt, endAt, emptyList(), true);
+
+        assertThat(DDEvaluator.isAllocationActive(allocation, startAt.minusNanos(1_000)), equalTo(false));
+        assertThat(DDEvaluator.isAllocationActive(allocation, startAt), equalTo(true));
+        assertThat(DDEvaluator.isAllocationActive(allocation, endAt), equalTo(true));
+        assertThat(DDEvaluator.isAllocationActive(allocation, endAt.plusNanos(1_000)), equalTo(false));
+    }
+
+    // --- SemVer condition evaluation tests (ported from Go evaluator_test.go) ---
+
+    private static Flag semverFlag(final ConditionOperator operator, final String comparand) {
+        final ParsedSemver parsed = ParsedSemver.parse(comparand);
+        final ConditionConfiguration condition = new ConditionConfiguration(operator, "version", comparand);
+        condition.semverComparand = parsed;
+        final Rule rule = new Rule(singletonList(condition));
+        final Split split = new Split(emptyList(), "on", null, null);
+        final Allocation allocation =
+                Allocation.fromInstants("targeted", singletonList(rule), null, null, singletonList(split), false);
+        final Map<String, Variant> variations = new HashMap<>();
+        variations.put("on", new Variant("on", true));
+        return new Flag("test-flag", true, ValueType.BOOLEAN, variations, singletonList(allocation));
+    }
+
+    private static EvaluationContext semverContext(final Object version) {
+        final Map<String, Object> attributes = new HashMap<>();
+        if (version != null) {
+            attributes.put("version", version);
+        }
+        final MutableContext context =
+                new MutableContext(Value.objectToValue(attributes).asStructure().asMap());
+        context.setTargetingKey("subject");
+        return context;
+    }
+
+    static Arguments[] semverConditionTestCases() {
+        return new Arguments[] {
+            // Equal
+            Arguments.of(ConditionOperator.SEMVER_EQ, "1.2.3", "1.2.3", true),
+            Arguments.of(ConditionOperator.SEMVER_EQ, "1.2.4", "1.2.3", false),
+            Arguments.of(ConditionOperator.SEMVER_EQ, "1.2.3.4.5.6", "1.2.3.4.5.6", true),
+            Arguments.of(ConditionOperator.SEMVER_GT, "1.2.3.4.5.7", "1.2.3.4.5.6", true),
+            // Not equal
+            Arguments.of(ConditionOperator.SEMVER_NEQ, "1.2.4", "1.2.3", true),
+            Arguments.of(ConditionOperator.SEMVER_NEQ, "1.2.3", "1.2.3", false),
+            // Less than
+            Arguments.of(ConditionOperator.SEMVER_LT, "1.9.9", "2.0.0", true),
+            Arguments.of(ConditionOperator.SEMVER_LT, "2.0.0", "2.0.0", false),
+            // Less than or equal
+            Arguments.of(ConditionOperator.SEMVER_LTE, "2.0.0", "2.0.0", true),
+            Arguments.of(ConditionOperator.SEMVER_LTE, "2.0.1", "2.0.0", false),
+            // Greater than
+            Arguments.of(ConditionOperator.SEMVER_GT, "1.0.1", "1.0.0", true),
+            Arguments.of(ConditionOperator.SEMVER_GT, "1.0.0", "1.0.0", false),
+            // Greater than or equal
+            Arguments.of(ConditionOperator.SEMVER_GTE, "1.0.0", "1.0.0", true),
+            Arguments.of(ConditionOperator.SEMVER_GTE, "0.9.9", "1.0.0", false),
+            // Prerelease ordering
+            Arguments.of(ConditionOperator.SEMVER_LT, "1.0.0-beta.1", "1.0.0", true),
+            Arguments.of(ConditionOperator.SEMVER_LT, "1.0.0-beta.2", "1.0.0-beta.11", true),
+            // Build metadata is ignored
+            Arguments.of(ConditionOperator.SEMVER_EQ, "4.0.0+build.42", "4.0.0", true),
+            Arguments.of(ConditionOperator.SEMVER_EQ, "4.0.0+exp.sha.5114f85", "4.0.0", true),
+            Arguments.of(ConditionOperator.SEMVER_NEQ, "4.0.0+build.42", "4.0.0", false),
+            Arguments.of(ConditionOperator.SEMVER_LT, "4.0.0+build.42", "4.0.0", false),
+            Arguments.of(ConditionOperator.SEMVER_LTE, "4.0.0+build.42", "4.0.0", true),
+            Arguments.of(ConditionOperator.SEMVER_GT, "4.0.0+build.42", "4.0.0", false),
+            Arguments.of(ConditionOperator.SEMVER_GTE, "4.0.0+build.42", "4.0.0", true),
+            Arguments.of(ConditionOperator.SEMVER_EQ, "1.0.0+linux", "1.0.0+darwin", true),
+            // Invalid attribute does not match
+            Arguments.of(ConditionOperator.SEMVER_NEQ, "not-a-version", "1.0.0", false),
+            Arguments.of(ConditionOperator.SEMVER_GTE, "1.2", "1.0.0", true),
+            Arguments.of(ConditionOperator.SEMVER_GTE, "v1.2.3", "1.0.0", false),
+            Arguments.of(ConditionOperator.SEMVER_GTE, "18446744073709551616.0.0", "1.0.0", false),
+            // Non-string attribute does not match
+            Arguments.of(ConditionOperator.SEMVER_EQ, 1.2, "1.2.0", false),
+        };
+    }
+
+    @ParameterizedTest(name = "{0} attr={1} comparand={2} -> {3}")
+    @MethodSource("semverConditionTestCases")
+    public void testEvaluateSemverCondition(
+            final ConditionOperator operator, final Object attribute, final String comparand, final boolean wantMatch) {
+        final Map<String, Flag> flags = new HashMap<>();
+        flags.put("test-flag", semverFlag(operator, comparand));
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        evaluator.accept(new ServerConfiguration("", "", null, null, flags));
+
+        final ProviderEvaluation<Boolean> details =
+                evaluator.evaluate(Boolean.class, "test-flag", false, semverContext(attribute));
+
+        if (wantMatch) {
+            assertThat(details.getValue(), equalTo(true));
+            assertThat(details.getReason(), equalTo("TARGETING_MATCH"));
+        } else {
+            assertThat(details.getValue(), equalTo(false));
+            assertThat(details.getReason(), equalTo("DEFAULT"));
+        }
+    }
+
+    @Test
+    public void testEvaluateSemverConditionMissingAttribute() {
+        final Map<String, Flag> flags = new HashMap<>();
+        flags.put("test-flag", semverFlag(ConditionOperator.SEMVER_EQ, "1.2.3"));
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        evaluator.accept(new ServerConfiguration("", "", null, null, flags));
+
+        final ProviderEvaluation<Boolean> details =
+                evaluator.evaluate(Boolean.class, "test-flag", false, semverContext(null));
+
+        assertThat(details.getValue(), equalTo(false));
+        assertThat(details.getReason(), equalTo("DEFAULT"));
+    }
+
+    @Test
+    public void testEvaluateSemverConditionInvalidComparandReturnsParseError() {
+        // A flag with an invalid semver comparand is dropped during parsing.
+        // The evaluator should return PARSE_ERROR when the flag is queried.
+        final Map<String, Flag> flags = new HashMap<>();
+        final Map<String, String> invalidFlags = new HashMap<>();
+        invalidFlags.put("invalid-semver", "invalid_semver_comparand");
+        final ServerConfiguration config = new ServerConfiguration("", "", null, null, flags);
+        config.invalidFlags = invalidFlags;
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        evaluator.accept(config);
+
+        final ProviderEvaluation<Boolean> details =
+                evaluator.evaluate(Boolean.class, "invalid-semver", false, semverContext("1.2.3"));
+
+        assertThat(details.getValue(), equalTo(false));
+        assertThat(details.getReason(), equalTo(ERROR.name()));
+        assertThat(details.getErrorCode(), equalTo(ErrorCode.PARSE_ERROR));
+    }
+
+    @Test
+    public void testEvaluateMalformedFlagReturnsParseError() {
+        final Map<String, Flag> flags = new HashMap<>();
+        final Map<String, String> invalidFlags = new HashMap<>();
+        invalidFlags.put("malformed-flag", "invalid_flag");
+        final ServerConfiguration config = new ServerConfiguration("", "", null, null, flags);
         config.invalidFlags = invalidFlags;
-      }
-      validateAndCacheSemverComparands(config);
-      return config;
-    } finally {
-      INVALID_FLAGS_HOLDER.get().clear();
-    }
-  }
-
-  /**
-   * Validates and caches SemVer comparands for all SEMVER_* conditions in the configuration. Flags
-   * with invalid comparands are removed from the flags map and tracked in invalidFlags, matching
-   * the behavior of {@link com.datadog.featureflag.UniversalFlagConfigParser}.
-   */
-  private static void validateAndCacheSemverComparands(final ServerConfiguration config) {
-    if (config.flags == null) {
-      return;
-    }
-    final Map<String, String> invalidFlags =
-        config.invalidFlags == null ? new HashMap<>() : new HashMap<>(config.invalidFlags);
-    final Map<String, Flag> flagsToRemove = new HashMap<>();
-    for (final Map.Entry<String, Flag> entry : config.flags.entrySet()) {
-      final String flagKey = entry.getKey();
-      final Flag flag = entry.getValue();
-      if (flag.allocations == null) {
-        continue;
-      }
-      boolean invalid = false;
-      for (final Allocation allocation : flag.allocations) {
-        if (allocation.rules == null) {
-          continue;
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        evaluator.accept(config);
+
+        final ProviderEvaluation<Boolean> details =
+                evaluator.evaluate(Boolean.class, "malformed-flag", false, new MutableContext());
+
+        assertThat(details.getValue(), equalTo(false));
+        assertThat(details.getReason(), equalTo(ERROR.name()));
+        assertThat(details.getErrorCode(), equalTo(ErrorCode.PARSE_ERROR));
+    }
+
+    private static Arguments[] flatteningTestCases() {
+        final List<Arguments> arguments = new ArrayList<>();
+        arguments.add(Arguments.of(emptyMap(), emptyMap()));
+        arguments.add(Arguments.of(
+                mapOf("integer", 1, "double", 23D, "boolean", true, "string", "string", "null", null),
+                mapOf("integer", 1, "double", 23D, "boolean", true, "string", "string", "null", null)));
+        arguments.add(Arguments.of(
+                mapOf("list", asList(1, 2, singletonList(4))), mapOf("list[0]", 1, "list[1]", 2, "list[2][0]", 4)));
+        arguments.add(Arguments.of(
+                mapOf("map", mapOf("key1", 1, "key2", 2, "key3", mapOf("key4", 4))),
+                mapOf("map.key1", 1, "map.key2", 2, "map.key3.key4", 4)));
+        arguments.add(Arguments.of(mapOf("plan", "gold", "cohort", "gold"), mapOf("plan", "gold", "cohort", "gold")));
+        final Instant instant = Instant.parse("2026-07-10T12:34:56Z");
+        arguments.add(Arguments.of(mapOf("instant", instant), mapOf("instant", instant.toString())));
+        return arguments.toArray(new Arguments[0]);
+    }
+
+    @MethodSource("flatteningTestCases")
+    @ParameterizedTest
+    public void testFlattening(final Map<String, Object> attributes, final Map<String, Object> expected) {
+        final EvaluationContext context =
+                new MutableContext(Value.objectToValue(attributes).asStructure().asMap());
+        final Map<String, Object> result = DDEvaluator.flattenContext(context);
+
+        assertThat(result.size(), equalTo(expected.size()));
+        for (final Map.Entry<String, Object> entry : expected.entrySet()) {
+            assertThat(result, hasEntry(entry.getKey(), entry.getValue()));
+        }
+    }
+
+    @Test
+    public void testDeeplyNestedContextIsTruncatedRatherThanOverflowingTheStack() {
+        Value nested = new Value("leaf");
+        for (int i = 0; i < 10_000; i++) {
+            nested = new Value(singletonList(nested));
+        }
+        final EvaluationContext context = new MutableContext().add("deep", singletonList(nested));
+
+        final Map<String, Object> result = DDEvaluator.flattenContext(context);
+
+        final StringBuilder truncatedKey = new StringBuilder("deep");
+        for (int i = 0; i < DDEvaluator.MAX_SNAPSHOT_DEPTH; i++) {
+            truncatedKey.append("[0]");
+        }
+        assertThat(result.size(), equalTo(1));
+        assertThat(result, hasEntry(truncatedKey.toString(), null));
+    }
+
+    @Test
+    public void testCopyPrunedContextCapsTopLevelFieldCount() {
+        final MutableContext context = new MutableContext();
+        for (int i = 0; i < DDEvaluator.MAX_CONTEXT_FIELDS + 100; i++) {
+            context.add(String.format("k%04d", i), "v");
+        }
+
+        final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
+
+        assertThat(result.attrs.size(), equalTo(DDEvaluator.MAX_CONTEXT_FIELDS));
+        assertThat(result.truncatedReason, equalTo("max_context_fields"));
+    }
+
+    @Test
+    public void testCopyPrunedContextSkipsOversizedStringValues() {
+        final char[] longChars = new char[DDEvaluator.MAX_VALUE_LENGTH + 1];
+        java.util.Arrays.fill(longChars, 'x');
+        final MutableContext context = new MutableContext();
+        context.add("keep", "ok");
+        context.add("drop", new String(longChars));
+
+        final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
+
+        assertThat(result.attrs, hasEntry("keep", "ok"));
+        assertThat(result.attrs.containsKey("drop"), equalTo(false));
+        assertThat(result.truncatedReason, equalTo("max_value_length"));
+    }
+
+    @Test
+    public void testCopyPrunedContextSkipsOversizedKeys() {
+        final char[] longKeyChars = new char[DDEvaluator.MAX_KEY_LENGTH + 1];
+        java.util.Arrays.fill(longKeyChars, 'k');
+        final MutableContext context = new MutableContext();
+        context.add("keep", "ok");
+        context.add(new String(longKeyChars), "drop");
+
+        final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
+
+        assertThat(result.attrs, hasEntry("keep", "ok"));
+        assertThat(result.attrs.size(), equalTo(1));
+        assertThat(result.truncatedReason, equalTo("max_key_length"));
+    }
+
+    @Test
+    public void testCopyPrunedContextCapsListWidth() {
+        final List<Value> wide = new java.util.ArrayList<>();
+        for (int i = 0; i < DDEvaluator.MAX_LIST_ELEMENTS + 50; i++) {
+            wide.add(Value.objectToValue("v" + i));
+        }
+        final EvaluationContext context = new MutableContext().add("list", wide);
+
+        final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
+
+        assertThat(result.attrs.containsKey("list[0]"), equalTo(true));
+        assertThat(result.attrs.containsKey("list[" + (DDEvaluator.MAX_LIST_ELEMENTS - 1) + "]"), equalTo(true));
+        assertThat(result.attrs.containsKey("list[" + DDEvaluator.MAX_LIST_ELEMENTS + "]"), equalTo(false));
+        assertThat(result.truncatedReason, equalTo("max_list_elements"));
+    }
+
+    @Test
+    public void testCopyPrunedContextCapsStructureWidth() {
+        final dev.openfeature.sdk.MutableStructure wide = new dev.openfeature.sdk.MutableStructure();
+        for (int i = 0; i < DDEvaluator.MAX_STRUCTURE_PROPERTIES + 50; i++) {
+            wide.add(String.format("p%04d", i), "v");
         }
-        for (final Rule rule : allocation.rules) {
-          if (rule.conditions == null) {
-            continue;
-          }
-          for (final ConditionConfiguration condition : rule.conditions) {
-            if (condition.operator == null) {
-              continue;
+        final EvaluationContext context = new MutableContext().add("struct", wide);
+
+        final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
+
+        long structKeys = result.attrs.keySet().stream()
+                .filter(k -> k.startsWith("struct."))
+                .count();
+        assertThat(structKeys, equalTo((long) DDEvaluator.MAX_STRUCTURE_PROPERTIES));
+        assertThat(result.truncatedReason, equalTo("max_structure_properties"));
+    }
+
+    @Test
+    public void testCopyPrunedContextTruncatesDeepNesting() {
+        Value nested = new Value("leaf");
+        for (int i = 0; i < 10_000; i++) {
+            nested = new Value(singletonList(nested));
+        }
+        final EvaluationContext context = new MutableContext().add("deep", singletonList(nested));
+
+        final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
+
+        final StringBuilder truncatedKey = new StringBuilder("deep");
+        for (int i = 0; i < DDEvaluator.MAX_SNAPSHOT_DEPTH; i++) {
+            truncatedKey.append("[0]");
+        }
+        // The recursion stops on the first list element at MAX_SNAPSHOT_DEPTH; deeper elements are
+        // never walked and no entry is emitted for them.
+        assertThat(result.attrs.containsKey(truncatedKey.toString()), equalTo(false));
+        assertThat(result.attrs.size(), equalTo(0));
+        assertThat(result.truncatedReason, equalTo("max_snapshot_depth"));
+    }
+
+    @Test
+    public void testCopyPrunedContextExcludesTargetingKey() {
+        final MutableContext context = new MutableContext("user-42").add("region", "us-east-1");
+
+        final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
+
+        assertThat(result.attrs, hasEntry("region", "us-east-1"));
+        assertThat(result.attrs.containsKey("targetingKey"), equalTo(false));
+        assertThat(result.truncatedReason, equalTo(null));
+    }
+
+    @Test
+    public void testCopyPrunedContextNoTruncationReturnsNullReason() {
+        final MutableContext context = new MutableContext("user-1");
+        context.add("region", "us-east-1");
+        context.add("tier", "gold");
+
+        final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
+
+        assertThat(result.attrs, hasEntry("region", "us-east-1"));
+        assertThat(result.truncatedReason, equalTo(null));
+    }
+
+    @Test
+    public void testCopyPrunedContextMultipleReasonsAreSortedAndDeduplicated() {
+        final char[] longChars = new char[DDEvaluator.MAX_VALUE_LENGTH + 1];
+        java.util.Arrays.fill(longChars, 'x');
+        final char[] longKeyChars = new char[DDEvaluator.MAX_KEY_LENGTH + 1];
+        java.util.Arrays.fill(longKeyChars, 'k');
+        final MutableContext context = new MutableContext();
+        context.add("keep", "ok");
+        context.add("dropValue", new String(longChars));
+        context.add(new String(longKeyChars), "dropKey");
+
+        final DDEvaluator.CopyResult result = DDEvaluator.copyPrunedContext(context);
+
+        // Both max_key_length and max_value_length fired; sorted alphabetically, no duplicates.
+        assertThat(result.truncatedReason, equalTo("max_key_length,max_value_length"));
+    }
+
+    @Test
+    public void testCanonicalFixturesArePresent() throws IOException {
+        assertThat(canonicalTestCases().size(), greaterThan(0));
+    }
+
+    @MethodSource("canonicalTestCases")
+    @ParameterizedTest(name = "{0}")
+    public void testEvaluateCanonicalFixture(final FixtureCase testCase) throws IOException {
+        final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class));
+        evaluator.accept(loadCanonicalConfiguration());
+
+        final Class<?> targetType = targetType(testCase.variationType);
+        final Object defaultValue = mapFixtureValue(targetType, testCase.defaultValue);
+        final Object expectedValue = mapFixtureValue(targetType, testCase.result.value);
+        final ProviderEvaluation<?> details =
+                evaluate(evaluator, targetType, testCase.flag, defaultValue, context(testCase));
+
+        assertThat(details.getValue(), equalTo(expectedValue));
+        assertThat(details.getReason(), equalTo(testCase.result.reason));
+        if (testCase.result.variant != null) {
+            assertThat(details.getVariant(), equalTo(testCase.result.variant));
+        }
+        if (testCase.result.errorCode != null) {
+            assertThat(details.getErrorCode(), equalTo(ErrorCode.valueOf(testCase.result.errorCode)));
+        }
+        if (testCase.result.flagMetadata != null && testCase.result.flagMetadata.get("allocationKey") != null) {
+            assertThat(
+                    details.getFlagMetadata().getString("allocationKey"),
+                    equalTo(String.valueOf(testCase.result.flagMetadata.get("allocationKey"))));
+        }
+    }
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private static ProviderEvaluation<?> evaluate(
+            final DDEvaluator evaluator,
+            final Class<?> targetType,
+            final String flag,
+            final Object defaultValue,
+            final EvaluationContext context) {
+        return evaluator.evaluate((Class) targetType, flag, defaultValue, context);
+    }
+
+    private static ServerConfiguration loadCanonicalConfiguration() throws IOException {
+        INVALID_FLAGS_HOLDER.get().clear();
+        try {
+            final ServerConfiguration config =
+                    CONFIG_ADAPTER.fromJson(read(fixtureRoot().resolve("ufc-config.json")));
+            final Map<String, String> invalidFlags = new HashMap<>(INVALID_FLAGS_HOLDER.get());
+            if (!invalidFlags.isEmpty()) {
+                config.invalidFlags = invalidFlags;
             }
-            switch (condition.operator) {
-              case SEMVER_EQ:
-              case SEMVER_NEQ:
-              case SEMVER_LT:
-              case SEMVER_LTE:
-              case SEMVER_GT:
-              case SEMVER_GTE:
-                if (!(condition.value instanceof String)) {
-                  invalid = true;
-                  break;
+            validateAndCacheSemverComparands(config);
+            return config;
+        } finally {
+            INVALID_FLAGS_HOLDER.get().clear();
+        }
+    }
+
+    /**
+     * Validates and caches SemVer comparands for all SEMVER_* conditions in the configuration. Flags
+     * with invalid comparands are removed from the flags map and tracked in invalidFlags, matching
+     * the behavior of {@link com.datadog.featureflag.UniversalFlagConfigParser}.
+     */
+    private static void validateAndCacheSemverComparands(final ServerConfiguration config) {
+        if (config.flags == null) {
+            return;
+        }
+        final Map<String, String> invalidFlags =
+                config.invalidFlags == null ? new HashMap<>() : new HashMap<>(config.invalidFlags);
+        final Map<String, Flag> flagsToRemove = new HashMap<>();
+        for (final Map.Entry<String, Flag> entry : config.flags.entrySet()) {
+            final String flagKey = entry.getKey();
+            final Flag flag = entry.getValue();
+            if (flag.allocations == null) {
+                continue;
+            }
+            boolean invalid = false;
+            for (final Allocation allocation : flag.allocations) {
+                if (allocation.rules == null) {
+                    continue;
                 }
-                final ParsedSemver parsed = ParsedSemver.parse((String) condition.value);
-                if (parsed == null) {
-                  invalid = true;
-                  break;
+                for (final Rule rule : allocation.rules) {
+                    if (rule.conditions == null) {
+                        continue;
+                    }
+                    for (final ConditionConfiguration condition : rule.conditions) {
+                        if (condition.operator == null) {
+                            continue;
+                        }
+                        switch (condition.operator) {
+                            case SEMVER_EQ:
+                            case SEMVER_NEQ:
+                            case SEMVER_LT:
+                            case SEMVER_LTE:
+                            case SEMVER_GT:
+                            case SEMVER_GTE:
+                                if (!(condition.value instanceof String)) {
+                                    invalid = true;
+                                    break;
+                                }
+                                final ParsedSemver parsed = ParsedSemver.parse((String) condition.value);
+                                if (parsed == null) {
+                                    invalid = true;
+                                    break;
+                                }
+                                condition.semverComparand = parsed;
+                                break;
+                            default:
+                                break;
+                        }
+                    }
                 }
-                condition.semverComparand = parsed;
-                break;
-              default:
-                break;
             }
-          }
+            if (invalid) {
+                flagsToRemove.put(flagKey, flag);
+                invalidFlags.put(flagKey, "invalid_semver_comparand");
+            }
         }
-      }
-      if (invalid) {
-        flagsToRemove.put(flagKey, flag);
-        invalidFlags.put(flagKey, "invalid_semver_comparand");
-      }
-    }
-    for (final String flagKey : flagsToRemove.keySet()) {
-      config.flags.remove(flagKey);
-    }
-    if (!invalidFlags.isEmpty()) {
-      config.invalidFlags = invalidFlags;
-    }
-  }
-
-  private static List<FixtureCase> canonicalTestCases() throws IOException {
-    final Path evaluationCases = fixtureRoot().resolve("evaluation-cases");
-    final List<FixtureCase> result = new ArrayList<>();
-
-    try (final Stream<Path> paths = Files.list(evaluationCases)) {
-      final List<Path> files =
-          paths
-              .filter(path -> path.getFileName().toString().endsWith(".json"))
-              .sorted((left, right) -> left.getFileName().compareTo(right.getFileName()))
-              .collect(Collectors.toList());
-      for (final Path file : files) {
-        final List<FixtureCase> testCases = FIXTURE_LIST_ADAPTER.fromJson(read(file));
-        if (testCases == null) {
-          throw new JsonDataException("Fixture file did not contain an array: " + file);
+        for (final String flagKey : flagsToRemove.keySet()) {
+            config.flags.remove(flagKey);
         }
-        for (int index = 0; index < testCases.size(); index++) {
-          final FixtureCase testCase = testCases.get(index);
-          testCase.fileName = file.getFileName().toString();
-          testCase.index = index;
-          result.add(testCase);
+        if (!invalidFlags.isEmpty()) {
+            config.invalidFlags = invalidFlags;
         }
-      }
-    }
-
-    assertThat(result.size(), greaterThan(0));
-    return result;
-  }
-
-  private static Path fixtureRoot() {
-    Path directory = Paths.get("").toAbsolutePath();
-    while (directory != null) {
-      final Path candidate = directory.resolve(CANONICAL_FIXTURE_PATH);
-      if (Files.exists(candidate.resolve("ufc-config.json"))
-          && Files.isDirectory(candidate.resolve("evaluation-cases"))) {
-        return candidate;
-      }
-      directory = directory.getParent();
-    }
-    throw new IllegalStateException("Unable to find canonical FFE fixtures");
-  }
-
-  private static String read(final Path path) throws IOException {
-    return new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
-  }
-
-  private static EvaluationContext context(final FixtureCase testCase) {
-    final Map<String, Object> attributes =
-        testCase.attributes == null ? emptyMap() : testCase.attributes;
-    final MutableContext context =
-        new MutableContext(Value.objectToValue(attributes).asStructure().asMap());
-    if (testCase.targetingKey != null) {
-      context.setTargetingKey(testCase.targetingKey);
-    }
-    return context;
-  }
-
-  private static Class<?> targetType(final String variationType) {
-    switch (variationType) {
-      case "BOOLEAN":
-        return Boolean.class;
-      case "INTEGER":
-        return Integer.class;
-      case "NUMERIC":
-        return Double.class;
-      case "STRING":
-        return String.class;
-      case "JSON":
-        return Value.class;
-      default:
-        throw new IllegalArgumentException("Unsupported variationType: " + variationType);
-    }
-  }
-
-  private static Object mapFixtureValue(final Class<?> targetType, final Object value) {
-    return DDEvaluator.mapValue(targetType, value);
-  }
-
-  private static Map<String, Object> mapOf(final Object... props) {
-    final Map<String, Object> result = new HashMap<>(props.length << 1);
-    int index = 0;
-    while (index < props.length) {
-      final String key = String.valueOf(props[index++]);
-      final Object value = props[index++];
-      result.put(key, value);
-    }
-    return result;
-  }
-
-  private static final class FixtureCase {
-    Map<String, Object> attributes = emptyMap();
-    Object defaultValue;
-    String flag;
-    FixtureResult result;
-    String targetingKey;
-    String variationType;
-    transient String fileName;
-    transient int index;
-
-    @Override
-    public String toString() {
-      return fileName + "[" + index + "] flag=" + flag;
-    }
-  }
-
-  private static final class FixtureResult {
-    Object value;
-    String reason;
-    String errorCode;
-    String variant;
-    Map<String, Object> flagMetadata = emptyMap();
-  }
-
-  /**
-   * Mirrors the production parser's binary-compatible uint32 representation for fixture parsing.
-   */
-  private static final class ShardAdapter extends JsonAdapter<Shard> {
-    private static final JsonAdapter.Factory FACTORY =
-        (type, annotations, moshi) -> {
-          if (!annotations.isEmpty() || type != Shard.class) {
-            return null;
-          }
-          return new ShardAdapter(moshi.adapter(ShardJson.class));
-        };
+    }
 
-    private final JsonAdapter<ShardJson> delegate;
-
-    private ShardAdapter(final JsonAdapter<ShardJson> delegate) {
-      this.delegate = delegate;
-    }
-
-    @Override
-    public Shard fromJson(final JsonReader reader) throws IOException {
-      final ShardJson shard = delegate.fromJson(reader);
-      if (shard == null) {
-        return null;
-      }
-      final List<ShardRange> ranges;
-      if (shard.ranges == null) {
-        ranges = null;
-      } else {
-        ranges = new ArrayList<>();
-        for (final ShardRangeJson range : shard.ranges) {
-          ranges.add(
-              range == null
-                  ? null
-                  : new ShardRange(
-                      toUnsignedInt(range.start, "range start"),
-                      toUnsignedInt(range.end, "range end")));
+    private static List<FixtureCase> canonicalTestCases() throws IOException {
+        final Path evaluationCases = fixtureRoot().resolve("evaluation-cases");
+        final List<FixtureCase> result = new ArrayList<>();
+
+        try (final Stream<Path> paths = Files.list(evaluationCases)) {
+            final List<Path> files = paths.filter(
+                            path -> path.getFileName().toString().endsWith(".json"))
+                    .sorted((left, right) -> left.getFileName().compareTo(right.getFileName()))
+                    .collect(Collectors.toList());
+            for (final Path file : files) {
+                final List<FixtureCase> testCases = FIXTURE_LIST_ADAPTER.fromJson(read(file));
+                if (testCases == null) {
+                    throw new JsonDataException("Fixture file did not contain an array: " + file);
+                }
+                for (int index = 0; index < testCases.size(); index++) {
+                    final FixtureCase testCase = testCases.get(index);
+                    testCase.fileName = file.getFileName().toString();
+                    testCase.index = index;
+                    result.add(testCase);
+                }
+            }
         }
-      }
-      return new Shard(shard.salt, ranges, toUnsignedInt(shard.totalShards, "totalShards"));
+
+        assertThat(result.size(), greaterThan(0));
+        return result;
     }
 
-    @Override
-    public void toJson(final JsonWriter writer, final Shard value) {
-      throw new UnsupportedOperationException("Reading only adapter");
+    private static Path fixtureRoot() {
+        Path directory = Paths.get("").toAbsolutePath();
+        while (directory != null) {
+            final Path candidate = directory.resolve(CANONICAL_FIXTURE_PATH);
+            if (Files.exists(candidate.resolve("ufc-config.json"))
+                    && Files.isDirectory(candidate.resolve("evaluation-cases"))) {
+                return candidate;
+            }
+            directory = directory.getParent();
+        }
+        throw new IllegalStateException("Unable to find canonical FFE fixtures");
+    }
+
+    private static String read(final Path path) throws IOException {
+        return new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
+    }
+
+    private static EvaluationContext context(final FixtureCase testCase) {
+        final Map<String, Object> attributes = testCase.attributes == null ? emptyMap() : testCase.attributes;
+        final MutableContext context =
+                new MutableContext(Value.objectToValue(attributes).asStructure().asMap());
+        if (testCase.targetingKey != null) {
+            context.setTargetingKey(testCase.targetingKey);
+        }
+        return context;
     }
-  }
 
-  private static int toUnsignedInt(final Long value, final String fieldName) {
-    if (value == null) {
-      return 0;
+    private static Class<?> targetType(final String variationType) {
+        switch (variationType) {
+            case "BOOLEAN":
+                return Boolean.class;
+            case "INTEGER":
+                return Integer.class;
+            case "NUMERIC":
+                return Double.class;
+            case "STRING":
+                return String.class;
+            case "JSON":
+                return Value.class;
+            default:
+                throw new IllegalArgumentException("Unsupported variationType: " + variationType);
+        }
     }
-    if (value < 0 || value > MAX_UNSIGNED_INT) {
-      throw new IllegalArgumentException("flag contains an invalid " + fieldName + " value");
+
+    private static Object mapFixtureValue(final Class<?> targetType, final Object value) {
+        return DDEvaluator.mapValue(targetType, value);
     }
-    return value.intValue();
-  }
 
-  private static final class ShardJson {
-    String salt;
-    List<ShardRangeJson> ranges;
-    Long totalShards;
-  }
+    private static Map<String, Object> mapOf(final Object... props) {
+        final Map<String, Object> result = new HashMap<>(props.length << 1);
+        int index = 0;
+        while (index < props.length) {
+            final String key = String.valueOf(props[index++]);
+            final Object value = props[index++];
+            result.put(key, value);
+        }
+        return result;
+    }
 
-  private static final class ShardRangeJson {
-    Long start;
-    Long end;
-  }
+    private static final class FixtureCase {
+        Map<String, Object> attributes = emptyMap();
+        Object defaultValue;
+        String flag;
+        FixtureResult result;
+        String targetingKey;
+        String variationType;
+        transient String fileName;
+        transient int index;
+
+        @Override
+        public String toString() {
+            return fileName + "[" + index + "] flag=" + flag;
+        }
+    }
 
-  /** Reads the flags map with per-flag failure isolation, matching the production parser. */
-  private static final class FlagMapAdapter extends JsonAdapter<Map<String, Flag>> {
-    private static final Type FLAGS_TYPE =
-        Types.newParameterizedType(Map.class, String.class, Flag.class);
+    private static final class FixtureResult {
+        Object value;
+        String reason;
+        String errorCode;
+        String variant;
+        Map<String, Object> flagMetadata = emptyMap();
+    }
 
-    private static final JsonAdapter.Factory FACTORY =
-        (type, annotations, moshi) -> {
-          if (!annotations.isEmpty() || !Types.equals(type, FLAGS_TYPE)) {
-            return null;
-          }
-          return new FlagMapAdapter(moshi.adapter(Flag.class));
+    /**
+     * Mirrors the production parser's binary-compatible uint32 representation for fixture parsing.
+     */
+    private static final class ShardAdapter extends JsonAdapter<Shard> {
+        private static final JsonAdapter.Factory FACTORY = (type, annotations, moshi) -> {
+            if (!annotations.isEmpty() || type != Shard.class) {
+                return null;
+            }
+            return new ShardAdapter(moshi.adapter(ShardJson.class));
         };
 
-    private final JsonAdapter<Flag> flagAdapter;
+        private final JsonAdapter<ShardJson> delegate;
+
+        private ShardAdapter(final JsonAdapter<ShardJson> delegate) {
+            this.delegate = delegate;
+        }
 
-    private FlagMapAdapter(final JsonAdapter<Flag> flagAdapter) {
-      this.flagAdapter = flagAdapter;
+        @Override
+        public Shard fromJson(final JsonReader reader) throws IOException {
+            final ShardJson shard = delegate.fromJson(reader);
+            if (shard == null) {
+                return null;
+            }
+            final List<ShardRange> ranges;
+            if (shard.ranges == null) {
+                ranges = null;
+            } else {
+                ranges = new ArrayList<>();
+                for (final ShardRangeJson range : shard.ranges) {
+                    ranges.add(
+                            range == null
+                                    ? null
+                                    : new ShardRange(
+                                            toUnsignedInt(range.start, "range start"),
+                                            toUnsignedInt(range.end, "range end")));
+                }
+            }
+            return new Shard(shard.salt, ranges, toUnsignedInt(shard.totalShards, "totalShards"));
+        }
+
+        @Override
+        public void toJson(final JsonWriter writer, final Shard value) {
+            throw new UnsupportedOperationException("Reading only adapter");
+        }
     }
 
-    @Override
-    public Map<String, Flag> fromJson(final JsonReader reader) throws IOException {
-      if (reader.peek() == JsonReader.Token.NULL) {
-        return reader.nextNull();
-      }
-      final Map<String, Flag> flags = new HashMap<>();
-      reader.beginObject();
-      while (reader.hasNext()) {
-        final String flagKey = reader.nextName();
-        final Object rawFlag = reader.readJsonValue();
-        try {
-          final Flag flag = flagAdapter.fromJsonValue(rawFlag);
-          if (flag != null) {
-            validateFlag(flagKey, flag);
-            flags.put(flagKey, flag);
-          }
-        } catch (JsonDataException | IllegalArgumentException ignored) {
-          INVALID_FLAGS_HOLDER.get().put(flagKey, "invalid_flag");
-          // A malformed flag must not prevent valid flags in the same configuration from loading.
+    private static int toUnsignedInt(final Long value, final String fieldName) {
+        if (value == null) {
+            return 0;
         }
-      }
-      reader.endObject();
-      return flags;
-    }
-
-    private static void validateFlag(final String flagKey, final Flag flag) {
-      if (flag.allocations == null) {
-        return;
-      }
-      for (final Allocation allocation : flag.allocations) {
-        if (allocation == null) {
-          continue;
+        if (value < 0 || value > MAX_UNSIGNED_INT) {
+            throw new IllegalArgumentException("flag contains an invalid " + fieldName + " value");
         }
-        validateConditionOperands(flagKey, allocation);
-        if (allocation.splits == null) {
-          continue;
+        return value.intValue();
+    }
+
+    private static final class ShardJson {
+        String salt;
+        List<ShardRangeJson> ranges;
+        Long totalShards;
+    }
+
+    private static final class ShardRangeJson {
+        Long start;
+        Long end;
+    }
+
+    /** Reads the flags map with per-flag failure isolation, matching the production parser. */
+    private static final class FlagMapAdapter extends JsonAdapter<Map<String, Flag>> {
+        private static final Type FLAGS_TYPE = Types.newParameterizedType(Map.class, String.class, Flag.class);
+
+        private static final JsonAdapter.Factory FACTORY = (type, annotations, moshi) -> {
+            if (!annotations.isEmpty() || !Types.equals(type, FLAGS_TYPE)) {
+                return null;
+            }
+            return new FlagMapAdapter(moshi.adapter(Flag.class));
+        };
+
+        private final JsonAdapter<Flag> flagAdapter;
+
+        private FlagMapAdapter(final JsonAdapter<Flag> flagAdapter) {
+            this.flagAdapter = flagAdapter;
         }
-        for (final Split split : allocation.splits) {
-          if (split == null) {
-            continue;
-          }
-          if (split.shards == null) {
-            throw new IllegalArgumentException(
-                "flag \"" + flagKey + "\" contains a split with missing shards");
-          }
-          for (final Shard shard : split.shards) {
-            if (shard == null
-                || Integer.toUnsignedLong(shard.totalShards) == 0
-                || shard.ranges == null) {
-              throw new IllegalArgumentException(
-                  "flag \"" + flagKey + "\" contains invalid shards");
+
+        @Override
+        public Map<String, Flag> fromJson(final JsonReader reader) throws IOException {
+            if (reader.peek() == JsonReader.Token.NULL) {
+                return reader.nextNull();
             }
-            for (final ShardRange range : shard.ranges) {
-              if (range == null) {
-                throw new IllegalArgumentException(
-                    "flag \"" + flagKey + "\" contains an invalid shard range");
-              }
+            final Map<String, Flag> flags = new HashMap<>();
+            reader.beginObject();
+            while (reader.hasNext()) {
+                final String flagKey = reader.nextName();
+                final Object rawFlag = reader.readJsonValue();
+                try {
+                    final Flag flag = flagAdapter.fromJsonValue(rawFlag);
+                    if (flag != null) {
+                        validateFlag(flagKey, flag);
+                        flags.put(flagKey, flag);
+                    }
+                } catch (JsonDataException | IllegalArgumentException ignored) {
+                    INVALID_FLAGS_HOLDER.get().put(flagKey, "invalid_flag");
+                    // A malformed flag must not prevent valid flags in the same configuration from loading.
+                }
             }
-          }
+            reader.endObject();
+            return flags;
+        }
+
+        private static void validateFlag(final String flagKey, final Flag flag) {
+            if (flag.allocations == null) {
+                return;
+            }
+            for (final Allocation allocation : flag.allocations) {
+                if (allocation == null) {
+                    continue;
+                }
+                validateConditionOperands(flagKey, allocation);
+                if (allocation.splits == null) {
+                    continue;
+                }
+                for (final Split split : allocation.splits) {
+                    if (split == null) {
+                        continue;
+                    }
+                    if (split.shards == null) {
+                        throw new IllegalArgumentException(
+                                "flag \"" + flagKey + "\" contains a split with missing shards");
+                    }
+                    for (final Shard shard : split.shards) {
+                        if (shard == null || Integer.toUnsignedLong(shard.totalShards) == 0 || shard.ranges == null) {
+                            throw new IllegalArgumentException("flag \"" + flagKey + "\" contains invalid shards");
+                        }
+                        for (final ShardRange range : shard.ranges) {
+                            if (range == null) {
+                                throw new IllegalArgumentException(
+                                        "flag \"" + flagKey + "\" contains an invalid shard range");
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private static void validateConditionOperands(final String flagKey, final Allocation allocation) {
+            if (allocation.rules == null) {
+                return;
+            }
+            for (final Rule rule : allocation.rules) {
+                if (rule == null || rule.conditions == null) {
+                    continue;
+                }
+                for (final ConditionConfiguration condition : rule.conditions) {
+                    if (condition == null || condition.operator == null) {
+                        continue;
+                    }
+                    switch (condition.operator) {
+                        case LT:
+                        case LTE:
+                        case GT:
+                        case GTE:
+                            if (!(condition.value instanceof Number)) {
+                                throw new IllegalArgumentException(
+                                        "flag \"" + flagKey + "\" has a non-numeric condition");
+                            }
+                            break;
+                        case ONE_OF:
+                        case NOT_ONE_OF:
+                            if (!(condition.value instanceof List)) {
+                                throw new IllegalArgumentException("flag \"" + flagKey + "\" has a non-list condition");
+                            }
+                            break;
+                        case IS_NULL:
+                            if (!(condition.value instanceof Boolean)) {
+                                throw new IllegalArgumentException(
+                                        "flag \"" + flagKey + "\" has a non-boolean condition");
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void toJson(final JsonWriter writer, final Map<String, Flag> value) {
+            throw new UnsupportedOperationException("Reading only adapter");
         }
-      }
     }
 
-    private static void validateConditionOperands(
-        final String flagKey, final Allocation allocation) {
-      if (allocation.rules == null) {
-        return;
-      }
-      for (final Rule rule : allocation.rules) {
-        if (rule == null || rule.conditions == null) {
-          continue;
+    private static final class DateAdapter extends JsonAdapter<Date> {
+        @Override
+        public Date fromJson(final JsonReader reader) throws IOException {
+            if (reader.peek() == JsonReader.Token.NULL) {
+                return reader.nextNull();
+            }
+            try {
+                return Date.from(DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(reader.nextString(), Instant::from));
+            } catch (final Exception ignored) {
+                return null;
+            }
         }
-        for (final ConditionConfiguration condition : rule.conditions) {
-          if (condition == null || condition.operator == null) {
-            continue;
-          }
-          switch (condition.operator) {
-            case LT:
-            case LTE:
-            case GT:
-            case GTE:
-              if (!(condition.value instanceof Number)) {
-                throw new IllegalArgumentException(
-                    "flag \"" + flagKey + "\" has a non-numeric condition");
-              }
-              break;
-            case ONE_OF:
-            case NOT_ONE_OF:
-              if (!(condition.value instanceof List)) {
-                throw new IllegalArgumentException(
-                    "flag \"" + flagKey + "\" has a non-list condition");
-              }
-              break;
-            case IS_NULL:
-              if (!(condition.value instanceof Boolean)) {
-                throw new IllegalArgumentException(
-                    "flag \"" + flagKey + "\" has a non-boolean condition");
-              }
-              break;
-            default:
-              break;
-          }
+
+        @Override
+        public void toJson(final JsonWriter writer, final Date value) throws IOException {
+            if (value == null) {
+                writer.nullValue();
+                return;
+            }
+            writer.value(value.toInstant().toString());
         }
-      }
-    }
-
-    @Override
-    public void toJson(final JsonWriter writer, final Map<String, Flag> value) {
-      throw new UnsupportedOperationException("Reading only adapter");
-    }
-  }
-
-  private static final class DateAdapter extends JsonAdapter<Date> {
-    @Override
-    public Date fromJson(final JsonReader reader) throws IOException {
-      if (reader.peek() == JsonReader.Token.NULL) {
-        return reader.nextNull();
-      }
-      try {
-        return Date.from(
-            DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(reader.nextString(), Instant::from));
-      } catch (final Exception ignored) {
-        return null;
-      }
-    }
-
-    @Override
-    public void toJson(final JsonWriter writer, final Date value) throws IOException {
-      if (value == null) {
-        writer.nullValue();
-        return;
-      }
-      writer.value(value.toInstant().toString());
-    }
-  }
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/FlagEvalLoggingHookTest.java b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/FlagEvalLoggingHookTest.java
index 3b7910d4712..b314d4a9daa 100644
--- a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/FlagEvalLoggingHookTest.java
+++ b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/FlagEvalLoggingHookTest.java
@@ -43,678 +43,640 @@
  */
 class FlagEvalLoggingHookTest {
 
-  @BeforeEach
-  void enableFlagEvaluationEnqueue() {
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
-  }
-
-  @AfterEach
-  void resetFlagEvaluationEnqueue() {
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
-    // Clear any dispatched UFC so an observeFullEvaluationData value can't leak into other tests
-    // that share the static gateway.
-    FeatureFlaggingGateway.dispatch((ServerConfiguration) null);
-  }
-
-  // ---- helpers ----
-
-  /**
-   * Creates a writer that captures the enqueued event for assertion. Uses an anonymous class since
-   * FlagEvaluationWriter has multiple abstract methods.
-   */
-  private FlagEvaluationWriter capturingWriter(final AtomicReference<FlagEvalEvent> ref) {
-    return new FlagEvaluationWriter() {
-      @Override
-      public void enqueue(final FlagEvalEvent event) {
-        ref.set(event);
-      }
-
-      @Override
-      public boolean hasCapacityForEnqueue() {
-        return true;
-      }
-
-      @Override
-      public void countPreQueueOverflow() {}
-
-      @Override
-      public void countContextTruncated(final String reason) {}
-
-      @Override
-      public void start() {}
-
-      @Override
-      public void close() {}
-    };
-  }
-
-  private static FlagEvalLoggingHook<Object> hookWithWriter(final FlagEvaluationWriter writer) {
-    return new FlagEvalLoggingHook<>(writer);
-  }
-
-  private static FlagEvaluationDetails<Object> details(
-      final String flagKey,
-      final Object value,
-      final String variant,
-      final String reason,
-      final ImmutableMetadata metadata) {
-    final FlagEvaluationDetails.FlagEvaluationDetailsBuilder<Object> builder =
-        FlagEvaluationDetails.<Object>builder().flagKey(flagKey).value(value).reason(reason);
-    if (variant != null) {
-      builder.variant(variant);
-    }
-    if (metadata != null) {
-      builder.flagMetadata(metadata);
-    }
-    return builder.build();
-  }
-
-  private static HookContext<Object> hookCtxWithTargetingKey(
-      final String flagKey, final String targetingKey) {
-    final MutableContext ctx = new MutableContext(targetingKey);
-    return HookContext.<Object>builder()
-        .flagKey(flagKey)
-        .type(FlagValueType.STRING)
-        .defaultValue("default")
-        .ctx(ctx)
-        .build();
-  }
-
-  // ---- test: hook calls writer.enqueue once with flagKey, variant, allocationKey ----
-
-  @Test
-  void finallyAfterEnqueuesEventWithAllBasicFields() {
-    final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
-
-    final FlagEvaluationDetails<Object> det =
-        details(
-            "my-flag",
-            "on-value",
-            "on",
-            Reason.TARGETING_MATCH.name(),
-            ImmutableMetadata.builder().addString("allocationKey", "alloc-1").build());
-
-    hook.finallyAfter(null, det, Collections.emptyMap());
-
-    assertNotNull(captured.get(), "writer.enqueue must be called once");
-    final FlagEvalEvent e = captured.get();
-    assertEquals("my-flag", e.flagKey);
-    assertEquals("on", e.variant, "variant must be the OpenFeature variant key");
-    assertEquals("alloc-1", e.allocationKey);
-  }
-
-  // ---- variant comes from details.getVariant(), NOT details.getValue() ----
-
-  @Test
-  void variantIsTheVariantKeyNotTheEvaluatedValue() {
-    final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
-
-    // value and variant DIFFER, so a value-vs-variant mistake is detectable.
-    final FlagEvaluationDetails<Object> det =
-        details(
-            "g1-flag",
-            "the-evaluated-value", // value
-            "the-variant-key", // variant
-            Reason.TARGETING_MATCH.name(),
-            null);
-
-    hook.finallyAfter(null, det, Collections.emptyMap());
-
-    assertNotNull(captured.get());
-    assertEquals(
-        "the-variant-key",
-        captured.get().variant,
-        "variant must be sourced from details.getVariant(), not details.getValue()");
-  }
-
-  // ---- test: evalTimeMs from metadata "__dd_eval_timestamp_ms" ----
-
-  @Test
-  void evalTimeMsComesFromMetadataWhenPresent() {
-    final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
-
-    final long expectedTimestamp = 1_700_000_000_000L;
-    final FlagEvaluationDetails<Object> det =
-        details(
-            "ts-flag",
-            "v",
-            "v",
-            Reason.SPLIT.name(),
-            ImmutableMetadata.builder()
-                .addString("allocationKey", "a")
-                .addLong("__dd_eval_timestamp_ms", expectedTimestamp)
-                .build());
-
-    hook.finallyAfter(null, det, Collections.emptyMap());
-
-    assertNotNull(captured.get());
-    assertEquals(
-        expectedTimestamp,
-        captured.get().evalTimeMs,
-        "evalTimeMs must come from __dd_eval_timestamp_ms metadata when present");
-  }
-
-  // ---- test: evalTimeMs falls back to System.currentTimeMillis() when absent ----
-
-  @Test
-  void evalTimeMsFallsBackToCurrentTimeWhenMetadataAbsent() {
-    final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
-
-    final long before = System.currentTimeMillis();
-    final FlagEvaluationDetails<Object> det =
-        details("ts-flag", "v", "v", Reason.SPLIT.name(), null);
-
-    hook.finallyAfter(null, det, Collections.emptyMap());
-
-    final long after = System.currentTimeMillis();
-    assertNotNull(captured.get());
-    final long ts = captured.get().evalTimeMs;
-    assertTrue(
-        ts >= before && ts <= after,
-        "evalTimeMs must fall back to hook-fire time when metadata absent. got: " + ts);
-  }
-
-  // ---- test: absent variant -> variant is null -> runtime default ----
-
-  @Test
-  void absentVariantProducesNullVariant() {
-    final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
-
-    // A runtime default returns the default value but no variant.
-    final FlagEvaluationDetails<Object> det =
-        details("def-flag", "default-value", null, Reason.DEFAULT.name(), null);
-
-    hook.finallyAfter(null, det, Collections.emptyMap());
-
-    assertNotNull(captured.get());
-    assertNull(captured.get().variant, "Absent variant must stay null (runtime default)");
-  }
-
-  // ---- test: error message captured from details (error object support) ----
-
-  @Test
-  void errorMessageCapturedFromDetailsUnderConsentOn() {
-    // With observeFullEvaluationData=true the provider's raw message is preserved verbatim so
-    // operators keep the diagnostic detail they opted in to.
-    final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
-
-    final FlagEvaluationDetails<Object> det =
-        FlagEvaluationDetails.<Object>builder()
-            .flagKey("err-flag")
-            .value("default")
-            .reason(Reason.ERROR.name())
-            .errorCode(ErrorCode.TYPE_MISMATCH)
-            .errorMessage("value does not match declared type")
-            .flagMetadata(consentOnMetadata())
-            .build();
-
-    hook.finallyAfter(null, det, Collections.emptyMap());
-
-    assertNotNull(captured.get());
-    assertEquals(
-        "value does not match declared type",
-        captured.get().errorMessage,
-        "errorMessage must be captured from the evaluation details under consent-on");
-  }
-
-  @Test
-  void errorMessageReplacedByErrorCodeUnderConsentOff() {
-    // Defense-in-depth: even if a provider hands us a raw message under consent-off (a bug in the
-    // provider, or a third-party provider that doesn't distinguish consent tiers), the hook must
-    // substitute the ErrorCode name so raw PII from exception messages never reaches the wire.
-    // Uses a PII-looking marker exactly like the wire-level guards in FlagEvaluationWriterImplTest.
-    final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
-
-    final FlagEvaluationDetails<Object> det =
-        FlagEvaluationDetails.<Object>builder()
-            .flagKey("err-flag")
-            .value("default")
-            .reason(Reason.ERROR.name())
-            .errorCode(ErrorCode.TYPE_MISMATCH)
-            .errorMessage("For input string: \"jane.doe@datadoghq.com\"")
-            .flagMetadata(consentOffMetadata())
-            .build();
-
-    hook.finallyAfter(null, det, Collections.emptyMap());
-
-    assertNotNull(captured.get());
-    assertEquals(
-        "TYPE_MISMATCH",
-        captured.get().errorMessage,
-        "consent-off must replace the raw message with the ErrorCode name");
-    assertFalse(
-        captured.get().errorMessage.contains("jane.doe@datadoghq.com"),
-        "raw PII must never survive into the enqueued event under consent-off");
-  }
-
-  @Test
-  void errorMessageDroppedWhenConsentOffAndNoErrorCode() {
-    // Edge case: no ErrorCode available (unusual — providers should set one for ERROR reason).
-    // Consent-off drops the message and there's nothing to substitute, so the enqueued event has
-    // no error message at all. This is the strictest privacy-preserving outcome.
-    final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
-
-    final FlagEvaluationDetails<Object> det =
-        FlagEvaluationDetails.<Object>builder()
-            .flagKey("err-flag")
-            .value("default")
-            .reason(Reason.ERROR.name())
-            .errorMessage("For input string: \"jane.doe@datadoghq.com\"")
-            .flagMetadata(consentOffMetadata())
-            .build();
-
-    hook.finallyAfter(null, det, Collections.emptyMap());
-
-    assertNotNull(captured.get());
-    assertNull(captured.get().errorMessage);
-  }
-
-  // ---- test: error code used as fallback message when error message is empty ----
-
-  @Test
-  void errorCodeUsedAsFallbackWhenMessageEmpty() {
-    final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
-
-    final FlagEvaluationDetails<Object> det =
-        FlagEvaluationDetails.<Object>builder()
-            .flagKey("err-flag")
-            .value("default")
-            .reason(Reason.ERROR.name())
-            .errorCode(ErrorCode.FLAG_NOT_FOUND)
-            .build();
-
-    hook.finallyAfter(null, det, Collections.emptyMap());
-
-    assertNotNull(captured.get());
-    assertEquals(
-        "FLAG_NOT_FOUND",
-        captured.get().errorMessage,
-        "error code name must be used when no error message is present");
-  }
-
-  // ---- test: success path has no error message ----
-
-  @Test
-  void successPathHasNullErrorMessage() {
-    final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
-
-    final FlagEvaluationDetails<Object> det =
-        details("ok-flag", "v", "v", Reason.TARGETING_MATCH.name(), null);
-
-    hook.finallyAfter(null, det, Collections.emptyMap());
-
-    assertNotNull(captured.get());
-    assertNull(captured.get().errorMessage, "success path must have no error message");
-  }
-
-  // ---- test: hook does NO aggregation on the hook thread ----
-
-  @Test
-  void finallyAfterOnlyCallsEnqueueAndCapacityCheckOnWriter() {
-    final FlagEvaluationWriter writer = mock(FlagEvaluationWriter.class);
-    when(writer.hasCapacityForEnqueue()).thenReturn(true);
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(writer);
-
-    final FlagEvaluationDetails<Object> det =
-        details("flag", "v", "v", Reason.TARGETING_MATCH.name(), null);
-
-    hook.finallyAfter(null, det, Collections.emptyMap());
-
-    // Capacity check gates the enqueue; exactly one enqueue call; no start/close.
-    verify(writer, times(1)).hasCapacityForEnqueue();
-    verify(writer, times(1)).enqueue(any(FlagEvalEvent.class));
-    verify(writer, never()).countPreQueueOverflow();
-    verify(writer, never()).countContextTruncated(any());
-    verify(writer, never()).close();
-    verify(writer, never()).start();
-  }
-
-  @Test
-  void finallyAfterSkipsEnqueueAndCountsDropWhenQueueSaturated() {
-    final FlagEvaluationWriter writer = mock(FlagEvaluationWriter.class);
-    when(writer.hasCapacityForEnqueue()).thenReturn(false);
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(writer);
-
-    final FlagEvaluationDetails<Object> det =
-        details("flag", "v", "v", Reason.TARGETING_MATCH.name(), null);
-
-    hook.finallyAfter(null, det, Collections.emptyMap());
-
-    // Pre-queue guard fires: one capacity check, one drop count, and no enqueue at all.
-    verify(writer, times(1)).hasCapacityForEnqueue();
-    verify(writer, times(1)).countPreQueueOverflow();
-    verify(writer, never()).enqueue(any(FlagEvalEvent.class));
-  }
-
-  @Test
-  void countContextTruncatedCalledWhenContextIsTruncated() {
-    final FlagEvaluationWriter writer = mock(FlagEvaluationWriter.class);
-    when(writer.hasCapacityForEnqueue()).thenReturn(true);
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(writer);
-
-    // Context with one oversized string value — triggers max_value_length.
-    final char[] longChars = new char[DDEvaluator.MAX_VALUE_LENGTH + 1];
-    java.util.Arrays.fill(longChars, 'x');
-    final MutableContext ctx = new MutableContext("user-1");
-    ctx.add("oversized", new String(longChars));
-    final HookContext<Object> hookCtx =
-        HookContext.<Object>builder()
-            .flagKey("flag")
-            .type(dev.openfeature.sdk.FlagValueType.STRING)
-            .defaultValue("default")
-            .ctx(ctx)
-            .build();
-    final FlagEvaluationDetails<Object> det =
-        details(
-            "flag",
-            "v",
-            "v",
-            dev.openfeature.sdk.Reason.TARGETING_MATCH.name(),
-            consentOnMetadata());
-
-    hook.finallyAfter(hookCtx, det, Collections.emptyMap());
-
-    verify(writer, times(1)).countContextTruncated("max_value_length");
-    verify(writer, times(1)).enqueue(any(FlagEvalEvent.class));
-  }
-
-  @Test
-  void countContextTruncatedNotCalledWhenNoTruncation() {
-    final FlagEvaluationWriter writer = mock(FlagEvaluationWriter.class);
-    when(writer.hasCapacityForEnqueue()).thenReturn(true);
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(writer);
-
-    final MutableContext ctx = new MutableContext("user-1");
-    ctx.add("region", "us-east-1");
-    final HookContext<Object> hookCtx =
-        HookContext.<Object>builder()
-            .flagKey("flag")
-            .type(dev.openfeature.sdk.FlagValueType.STRING)
-            .defaultValue("default")
-            .ctx(ctx)
-            .build();
-    final FlagEvaluationDetails<Object> det =
-        details(
-            "flag",
-            "v",
-            "v",
-            dev.openfeature.sdk.Reason.TARGETING_MATCH.name(),
-            consentOnMetadata());
-
-    hook.finallyAfter(hookCtx, det, Collections.emptyMap());
-
-    verify(writer, never()).countContextTruncated(any());
-    verify(writer, times(1)).enqueue(any(FlagEvalEvent.class));
-  }
-
-  @Test
-  void enqueueDisabledIsNoOpBeforeWriterLookup() {
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(false);
-    final AtomicReference<Boolean> writerResolved = new AtomicReference<>(false);
-    final FlagEvalLoggingHook<Object> hook =
-        new FlagEvalLoggingHook<>(
-            () -> {
-              writerResolved.set(true);
-              throw new AssertionError("writer should not be resolved when enqueue is disabled");
-            });
-    final FlagEvaluationDetails<Object> det =
-        details("flag", "v", "v", Reason.TARGETING_MATCH.name(), null);
-
-    hook.finallyAfter(hookCtxWithTargetingKey("flag", "user-1"), det, Collections.emptyMap());
-
-    assertFalse(writerResolved.get());
-  }
-
-  // ---- test: writer=null -> no-op (killswitch off / not yet started) ----
-
-  @Test
-  void writerNullIsNoOp() {
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(null);
-    final FlagEvaluationDetails<Object> det =
-        details("flag", "v", "v", Reason.TARGETING_MATCH.name(), null);
-
-    // Must not throw; nothing is enqueued
-    hook.finallyAfter(null, det, Collections.emptyMap());
-  }
-
-  @Test
-  void writerLookupLinkageErrorIsNoOp() {
-    final FlagEvalLoggingHook<Object> hook =
-        new FlagEvalLoggingHook<>(
-            () -> {
-              throw new NoSuchMethodError("old bootstrap");
-            });
-    final FlagEvaluationDetails<Object> det =
-        details("flag", "v", "v", Reason.TARGETING_MATCH.name(), null);
-
-    assertDoesNotThrow(() -> hook.finallyAfter(null, det, Collections.emptyMap()));
-  }
-
-  // ---- test: details=null -> no-op ----
-
-  @Test
-  void detailsNullIsNoOp() {
-    final FlagEvaluationWriter writer = mock(FlagEvaluationWriter.class);
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(writer);
-
-    // Should not throw
-    hook.finallyAfter(null, null, Collections.emptyMap());
-
-    verifyNoInteractions(writer);
-  }
-
-  // ---- test: targetingKey extracted from evaluation context ----
-
-  @Test
-  void targetingKeyExtractedFromContext() {
-    final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
-
-    final FlagEvaluationDetails<Object> det =
-        details("ctx-flag", "v", "v", Reason.SPLIT.name(), null);
-
-    final HookContext<Object> hookCtx = hookCtxWithTargetingKey("ctx-flag", "user-42");
-
-    hook.finallyAfter(hookCtx, det, Collections.emptyMap());
-
-    assertNotNull(captured.get());
-    assertEquals(
-        "user-42",
-        captured.get().targetingKey,
-        "targetingKey must be extracted from the evaluation context");
-  }
-
-  @Test
-  void contextAttributesAreFlattenedAndConvertedInline() {
-    final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
-
-    final Map<String, Object> profile = new HashMap<>();
-    profile.put("tier", "gold");
-    final Map<String, Object> attributes = new HashMap<>();
-    attributes.put("score", 42);
-    attributes.put("profile", profile);
-    final MutableContext context =
-        new MutableContext(Value.objectToValue(attributes).asStructure().asMap());
-    context.setTargetingKey("user-42");
-
-    final HookContext<Object> hookCtx =
-        HookContext.<Object>builder()
-            .flagKey("ctx-flag")
-            .type(FlagValueType.STRING)
-            .defaultValue("default")
-            .ctx(context)
-            .build();
-    final FlagEvaluationDetails<Object> det =
-        details("ctx-flag", "v", "v", Reason.TARGETING_MATCH.name(), consentOnMetadata());
-
-    hook.finallyAfter(hookCtx, det, Collections.emptyMap());
-
-    assertNotNull(captured.get());
-    // Flatten now happens inline in DDEvaluator#copyPrunedContext on the hot path, so the event
-    // arrives with attrs already populated (no deferred supplier).
-    final Map<String, Object> attrs = captured.get().attrs;
-    assertFalse(attrs.isEmpty(), "hook must flatten context inline");
-    assertEquals(42, attrs.get("score"));
-    assertEquals("gold", attrs.get("profile.tier"));
-    assertFalse(attrs.containsKey("targetingKey"));
-    assertTrue(
-        attrs.values().stream().noneMatch(Value.class::isInstance),
-        "context attrs must contain converted scalar values, not OpenFeature Value wrappers");
-  }
-
-  @Test
-  void contextAttributesUseEnqueueTimeSnapshot() {
-    final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
-
-    final MutableContext context = new MutableContext("user-42");
-    context.add("region", "us-east-1");
-    final MutableStructure profile = new MutableStructure();
-    profile.add("tier", "gold");
-    context.add("profile", profile);
-    final List<Value> cohorts = new ArrayList<>();
-    cohorts.add(Value.objectToValue("beta"));
-    context.add("cohorts", cohorts);
-
-    final HookContext<Object> hookCtx =
-        HookContext.<Object>builder()
-            .flagKey("ctx-flag")
-            .type(FlagValueType.STRING)
-            .defaultValue("default")
-            .ctx(context)
-            .build();
-    final FlagEvaluationDetails<Object> det =
-        details("ctx-flag", "v", "v", Reason.TARGETING_MATCH.name(), consentOnMetadata());
-
-    hook.finallyAfter(hookCtx, det, Collections.emptyMap());
-    context.add("region", "eu-west-1");
-    context.add("late", "ignored");
-    profile.add("tier", "platinum");
-    profile.add("late", "ignored");
-    cohorts.set(0, Value.objectToValue("ga"));
-    cohorts.add(Value.objectToValue("late"));
-
-    assertNotNull(captured.get());
-    final Map<String, Object> attrs = captured.get().attrs;
-    assertEquals("us-east-1", attrs.get("region"));
-    assertEquals("gold", attrs.get("profile.tier"));
-    assertEquals("beta", attrs.get("cohorts[0]"));
-    assertFalse(attrs.containsKey("late"));
-    assertFalse(attrs.containsKey("profile.late"));
-    assertFalse(attrs.containsKey("cohorts[1]"));
-  }
-
-  // ---- observeFullEvaluationData is read from evaluation metadata, never the gateway ----
-
-  @Test
-  void readsObserveFullEvaluationDataTrueFromEvaluationMetadata() {
-    assertTrue(enqueuedEventWithConsentMetadata(true).observeFullEvaluationData);
-  }
-
-  @Test
-  void readsObserveFullEvaluationDataFalseFromEvaluationMetadata() {
-    assertFalse(enqueuedEventWithConsentMetadata(false).observeFullEvaluationData);
-  }
-
-  @Test
-  void observeFullEvaluationDataDefaultsToFalseWhenMetadataAbsent() {
-    // No metadata at all: fail-closed toward privacy.
-    assertFalse(enqueuedEventWithConsentMetadata(null).observeFullEvaluationData);
-  }
-
-  @Test
-  void protectedPathSkipsEvaluationContextCapture() {
-    // Consent off → the hook must not snapshot the evaluation context at all. Verified by mutating
-    // the context after finallyAfter returns and asserting the enqueued event still sees nothing.
-    final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
-
-    final MutableContext context = new MutableContext("user-1");
-    context.add("region", "us-east-1");
-
-    final HookContext<Object> hookCtx =
-        HookContext.<Object>builder()
-            .flagKey("ctx-flag")
-            .type(FlagValueType.STRING)
-            .defaultValue("default")
-            .ctx(context)
-            .build();
-    final ImmutableMetadata consentOff =
-        ImmutableMetadata.builder()
-            .addBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA, false)
-            .build();
-
-    hook.finallyAfter(
-        hookCtx,
-        details("ctx-flag", "v", "v", Reason.TARGETING_MATCH.name(), consentOff),
-        Collections.emptyMap());
-    context.add("region", "eu-west-1");
-
-    assertNotNull(captured.get());
-    assertTrue(captured.get().attrs.isEmpty());
-  }
-
-  @Test
-  void ignoresGatewayConsentEvenWhenItDisagreesWithMetadata() {
-    // Gateway says on, metadata says off; hook must trust metadata.
-    FeatureFlaggingGateway.dispatch(observeConfig(true));
-    try {
-      assertFalse(enqueuedEventWithConsentMetadata(false).observeFullEvaluationData);
-    } finally {
-      FeatureFlaggingGateway.dispatch((ServerConfiguration) null);
-    }
-  }
-
-  /**
-   * Fires the hook once for a simple targeted evaluation whose metadata carries the given consent
-   * value ({@code null} = key absent) and returns the enqueued event.
-   */
-  private FlagEvalEvent enqueuedEventWithConsentMetadata(final Boolean consent) {
-    final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
-    final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
-    final ImmutableMetadata metadata =
-        consent == null
-            ? null
-            : ImmutableMetadata.builder()
-                .addBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA, consent)
+    @BeforeEach
+    void enableFlagEvaluationEnqueue() {
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
+    }
+
+    @AfterEach
+    void resetFlagEvaluationEnqueue() {
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
+        // Clear any dispatched UFC so an observeFullEvaluationData value can't leak into other tests
+        // that share the static gateway.
+        FeatureFlaggingGateway.dispatch((ServerConfiguration) null);
+    }
+
+    // ---- helpers ----
+
+    /**
+     * Creates a writer that captures the enqueued event for assertion. Uses an anonymous class since
+     * FlagEvaluationWriter has multiple abstract methods.
+     */
+    private FlagEvaluationWriter capturingWriter(final AtomicReference<FlagEvalEvent> ref) {
+        return new FlagEvaluationWriter() {
+            @Override
+            public void enqueue(final FlagEvalEvent event) {
+                ref.set(event);
+            }
+
+            @Override
+            public boolean hasCapacityForEnqueue() {
+                return true;
+            }
+
+            @Override
+            public void countPreQueueOverflow() {}
+
+            @Override
+            public void countContextTruncated(final String reason) {}
+
+            @Override
+            public void start() {}
+
+            @Override
+            public void close() {}
+        };
+    }
+
+    private static FlagEvalLoggingHook<Object> hookWithWriter(final FlagEvaluationWriter writer) {
+        return new FlagEvalLoggingHook<>(writer);
+    }
+
+    private static FlagEvaluationDetails<Object> details(
+            final String flagKey,
+            final Object value,
+            final String variant,
+            final String reason,
+            final ImmutableMetadata metadata) {
+        final FlagEvaluationDetails.FlagEvaluationDetailsBuilder<Object> builder =
+                FlagEvaluationDetails.<Object>builder()
+                        .flagKey(flagKey)
+                        .value(value)
+                        .reason(reason);
+        if (variant != null) {
+            builder.variant(variant);
+        }
+        if (metadata != null) {
+            builder.flagMetadata(metadata);
+        }
+        return builder.build();
+    }
+
+    private static HookContext<Object> hookCtxWithTargetingKey(final String flagKey, final String targetingKey) {
+        final MutableContext ctx = new MutableContext(targetingKey);
+        return HookContext.<Object>builder()
+                .flagKey(flagKey)
+                .type(FlagValueType.STRING)
+                .defaultValue("default")
+                .ctx(ctx)
+                .build();
+    }
+
+    // ---- test: hook calls writer.enqueue once with flagKey, variant, allocationKey ----
+
+    @Test
+    void finallyAfterEnqueuesEventWithAllBasicFields() {
+        final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
+
+        final FlagEvaluationDetails<Object> det = details(
+                "my-flag",
+                "on-value",
+                "on",
+                Reason.TARGETING_MATCH.name(),
+                ImmutableMetadata.builder()
+                        .addString("allocationKey", "alloc-1")
+                        .build());
+
+        hook.finallyAfter(null, det, Collections.emptyMap());
+
+        assertNotNull(captured.get(), "writer.enqueue must be called once");
+        final FlagEvalEvent e = captured.get();
+        assertEquals("my-flag", e.flagKey);
+        assertEquals("on", e.variant, "variant must be the OpenFeature variant key");
+        assertEquals("alloc-1", e.allocationKey);
+    }
+
+    // ---- variant comes from details.getVariant(), NOT details.getValue() ----
+
+    @Test
+    void variantIsTheVariantKeyNotTheEvaluatedValue() {
+        final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
+
+        // value and variant DIFFER, so a value-vs-variant mistake is detectable.
+        final FlagEvaluationDetails<Object> det = details(
+                "g1-flag",
+                "the-evaluated-value", // value
+                "the-variant-key", // variant
+                Reason.TARGETING_MATCH.name(),
+                null);
+
+        hook.finallyAfter(null, det, Collections.emptyMap());
+
+        assertNotNull(captured.get());
+        assertEquals(
+                "the-variant-key",
+                captured.get().variant,
+                "variant must be sourced from details.getVariant(), not details.getValue()");
+    }
+
+    // ---- test: evalTimeMs from metadata "__dd_eval_timestamp_ms" ----
+
+    @Test
+    void evalTimeMsComesFromMetadataWhenPresent() {
+        final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
+
+        final long expectedTimestamp = 1_700_000_000_000L;
+        final FlagEvaluationDetails<Object> det = details(
+                "ts-flag",
+                "v",
+                "v",
+                Reason.SPLIT.name(),
+                ImmutableMetadata.builder()
+                        .addString("allocationKey", "a")
+                        .addLong("__dd_eval_timestamp_ms", expectedTimestamp)
+                        .build());
+
+        hook.finallyAfter(null, det, Collections.emptyMap());
+
+        assertNotNull(captured.get());
+        assertEquals(
+                expectedTimestamp,
+                captured.get().evalTimeMs,
+                "evalTimeMs must come from __dd_eval_timestamp_ms metadata when present");
+    }
+
+    // ---- test: evalTimeMs falls back to System.currentTimeMillis() when absent ----
+
+    @Test
+    void evalTimeMsFallsBackToCurrentTimeWhenMetadataAbsent() {
+        final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
+
+        final long before = System.currentTimeMillis();
+        final FlagEvaluationDetails<Object> det = details("ts-flag", "v", "v", Reason.SPLIT.name(), null);
+
+        hook.finallyAfter(null, det, Collections.emptyMap());
+
+        final long after = System.currentTimeMillis();
+        assertNotNull(captured.get());
+        final long ts = captured.get().evalTimeMs;
+        assertTrue(
+                ts >= before && ts <= after,
+                "evalTimeMs must fall back to hook-fire time when metadata absent. got: " + ts);
+    }
+
+    // ---- test: absent variant -> variant is null -> runtime default ----
+
+    @Test
+    void absentVariantProducesNullVariant() {
+        final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
+
+        // A runtime default returns the default value but no variant.
+        final FlagEvaluationDetails<Object> det =
+                details("def-flag", "default-value", null, Reason.DEFAULT.name(), null);
+
+        hook.finallyAfter(null, det, Collections.emptyMap());
+
+        assertNotNull(captured.get());
+        assertNull(captured.get().variant, "Absent variant must stay null (runtime default)");
+    }
+
+    // ---- test: error message captured from details (error object support) ----
+
+    @Test
+    void errorMessageCapturedFromDetailsUnderConsentOn() {
+        // With observeFullEvaluationData=true the provider's raw message is preserved verbatim so
+        // operators keep the diagnostic detail they opted in to.
+        final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
+
+        final FlagEvaluationDetails<Object> det = FlagEvaluationDetails.<Object>builder()
+                .flagKey("err-flag")
+                .value("default")
+                .reason(Reason.ERROR.name())
+                .errorCode(ErrorCode.TYPE_MISMATCH)
+                .errorMessage("value does not match declared type")
+                .flagMetadata(consentOnMetadata())
+                .build();
+
+        hook.finallyAfter(null, det, Collections.emptyMap());
+
+        assertNotNull(captured.get());
+        assertEquals(
+                "value does not match declared type",
+                captured.get().errorMessage,
+                "errorMessage must be captured from the evaluation details under consent-on");
+    }
+
+    @Test
+    void errorMessageReplacedByErrorCodeUnderConsentOff() {
+        // Defense-in-depth: even if a provider hands us a raw message under consent-off (a bug in the
+        // provider, or a third-party provider that doesn't distinguish consent tiers), the hook must
+        // substitute the ErrorCode name so raw PII from exception messages never reaches the wire.
+        // Uses a PII-looking marker exactly like the wire-level guards in FlagEvaluationWriterImplTest.
+        final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
+
+        final FlagEvaluationDetails<Object> det = FlagEvaluationDetails.<Object>builder()
+                .flagKey("err-flag")
+                .value("default")
+                .reason(Reason.ERROR.name())
+                .errorCode(ErrorCode.TYPE_MISMATCH)
+                .errorMessage("For input string: \"jane.doe@datadoghq.com\"")
+                .flagMetadata(consentOffMetadata())
+                .build();
+
+        hook.finallyAfter(null, det, Collections.emptyMap());
+
+        assertNotNull(captured.get());
+        assertEquals(
+                "TYPE_MISMATCH",
+                captured.get().errorMessage,
+                "consent-off must replace the raw message with the ErrorCode name");
+        assertFalse(
+                captured.get().errorMessage.contains("jane.doe@datadoghq.com"),
+                "raw PII must never survive into the enqueued event under consent-off");
+    }
+
+    @Test
+    void errorMessageDroppedWhenConsentOffAndNoErrorCode() {
+        // Edge case: no ErrorCode available (unusual — providers should set one for ERROR reason).
+        // Consent-off drops the message and there's nothing to substitute, so the enqueued event has
+        // no error message at all. This is the strictest privacy-preserving outcome.
+        final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
+
+        final FlagEvaluationDetails<Object> det = FlagEvaluationDetails.<Object>builder()
+                .flagKey("err-flag")
+                .value("default")
+                .reason(Reason.ERROR.name())
+                .errorMessage("For input string: \"jane.doe@datadoghq.com\"")
+                .flagMetadata(consentOffMetadata())
+                .build();
+
+        hook.finallyAfter(null, det, Collections.emptyMap());
+
+        assertNotNull(captured.get());
+        assertNull(captured.get().errorMessage);
+    }
+
+    // ---- test: error code used as fallback message when error message is empty ----
+
+    @Test
+    void errorCodeUsedAsFallbackWhenMessageEmpty() {
+        final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
+
+        final FlagEvaluationDetails<Object> det = FlagEvaluationDetails.<Object>builder()
+                .flagKey("err-flag")
+                .value("default")
+                .reason(Reason.ERROR.name())
+                .errorCode(ErrorCode.FLAG_NOT_FOUND)
+                .build();
+
+        hook.finallyAfter(null, det, Collections.emptyMap());
+
+        assertNotNull(captured.get());
+        assertEquals(
+                "FLAG_NOT_FOUND",
+                captured.get().errorMessage,
+                "error code name must be used when no error message is present");
+    }
+
+    // ---- test: success path has no error message ----
+
+    @Test
+    void successPathHasNullErrorMessage() {
+        final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
+
+        final FlagEvaluationDetails<Object> det = details("ok-flag", "v", "v", Reason.TARGETING_MATCH.name(), null);
+
+        hook.finallyAfter(null, det, Collections.emptyMap());
+
+        assertNotNull(captured.get());
+        assertNull(captured.get().errorMessage, "success path must have no error message");
+    }
+
+    // ---- test: hook does NO aggregation on the hook thread ----
+
+    @Test
+    void finallyAfterOnlyCallsEnqueueAndCapacityCheckOnWriter() {
+        final FlagEvaluationWriter writer = mock(FlagEvaluationWriter.class);
+        when(writer.hasCapacityForEnqueue()).thenReturn(true);
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(writer);
+
+        final FlagEvaluationDetails<Object> det = details("flag", "v", "v", Reason.TARGETING_MATCH.name(), null);
+
+        hook.finallyAfter(null, det, Collections.emptyMap());
+
+        // Capacity check gates the enqueue; exactly one enqueue call; no start/close.
+        verify(writer, times(1)).hasCapacityForEnqueue();
+        verify(writer, times(1)).enqueue(any(FlagEvalEvent.class));
+        verify(writer, never()).countPreQueueOverflow();
+        verify(writer, never()).countContextTruncated(any());
+        verify(writer, never()).close();
+        verify(writer, never()).start();
+    }
+
+    @Test
+    void finallyAfterSkipsEnqueueAndCountsDropWhenQueueSaturated() {
+        final FlagEvaluationWriter writer = mock(FlagEvaluationWriter.class);
+        when(writer.hasCapacityForEnqueue()).thenReturn(false);
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(writer);
+
+        final FlagEvaluationDetails<Object> det = details("flag", "v", "v", Reason.TARGETING_MATCH.name(), null);
+
+        hook.finallyAfter(null, det, Collections.emptyMap());
+
+        // Pre-queue guard fires: one capacity check, one drop count, and no enqueue at all.
+        verify(writer, times(1)).hasCapacityForEnqueue();
+        verify(writer, times(1)).countPreQueueOverflow();
+        verify(writer, never()).enqueue(any(FlagEvalEvent.class));
+    }
+
+    @Test
+    void countContextTruncatedCalledWhenContextIsTruncated() {
+        final FlagEvaluationWriter writer = mock(FlagEvaluationWriter.class);
+        when(writer.hasCapacityForEnqueue()).thenReturn(true);
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(writer);
+
+        // Context with one oversized string value — triggers max_value_length.
+        final char[] longChars = new char[DDEvaluator.MAX_VALUE_LENGTH + 1];
+        java.util.Arrays.fill(longChars, 'x');
+        final MutableContext ctx = new MutableContext("user-1");
+        ctx.add("oversized", new String(longChars));
+        final HookContext<Object> hookCtx = HookContext.<Object>builder()
+                .flagKey("flag")
+                .type(dev.openfeature.sdk.FlagValueType.STRING)
+                .defaultValue("default")
+                .ctx(ctx)
                 .build();
-    hook.finallyAfter(
-        hookCtxWithTargetingKey("obs-flag", "user-1"),
-        details("obs-flag", "on", "on", Reason.TARGETING_MATCH.name(), metadata),
-        Collections.emptyMap());
-    assertNotNull(captured.get(), "writer.enqueue must be called once");
-    return captured.get();
-  }
-
-  private static ImmutableMetadata consentOnMetadata() {
-    return ImmutableMetadata.builder()
-        .addBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA, true)
-        .build();
-  }
-
-  private static ImmutableMetadata consentOffMetadata() {
-    return ImmutableMetadata.builder()
-        .addBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA, false)
-        .build();
-  }
-
-  private static ServerConfiguration observeConfig(final boolean observeFullEvaluationData) {
-    return new ServerConfiguration(
-        "2024-04-17T19:40:53.716Z",
-        "SERVER",
-        observeFullEvaluationData,
-        null,
-        Collections.emptyMap());
-  }
+        final FlagEvaluationDetails<Object> det =
+                details("flag", "v", "v", dev.openfeature.sdk.Reason.TARGETING_MATCH.name(), consentOnMetadata());
+
+        hook.finallyAfter(hookCtx, det, Collections.emptyMap());
+
+        verify(writer, times(1)).countContextTruncated("max_value_length");
+        verify(writer, times(1)).enqueue(any(FlagEvalEvent.class));
+    }
+
+    @Test
+    void countContextTruncatedNotCalledWhenNoTruncation() {
+        final FlagEvaluationWriter writer = mock(FlagEvaluationWriter.class);
+        when(writer.hasCapacityForEnqueue()).thenReturn(true);
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(writer);
+
+        final MutableContext ctx = new MutableContext("user-1");
+        ctx.add("region", "us-east-1");
+        final HookContext<Object> hookCtx = HookContext.<Object>builder()
+                .flagKey("flag")
+                .type(dev.openfeature.sdk.FlagValueType.STRING)
+                .defaultValue("default")
+                .ctx(ctx)
+                .build();
+        final FlagEvaluationDetails<Object> det =
+                details("flag", "v", "v", dev.openfeature.sdk.Reason.TARGETING_MATCH.name(), consentOnMetadata());
+
+        hook.finallyAfter(hookCtx, det, Collections.emptyMap());
+
+        verify(writer, never()).countContextTruncated(any());
+        verify(writer, times(1)).enqueue(any(FlagEvalEvent.class));
+    }
+
+    @Test
+    void enqueueDisabledIsNoOpBeforeWriterLookup() {
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(false);
+        final AtomicReference<Boolean> writerResolved = new AtomicReference<>(false);
+        final FlagEvalLoggingHook<Object> hook = new FlagEvalLoggingHook<>(() -> {
+            writerResolved.set(true);
+            throw new AssertionError("writer should not be resolved when enqueue is disabled");
+        });
+        final FlagEvaluationDetails<Object> det = details("flag", "v", "v", Reason.TARGETING_MATCH.name(), null);
+
+        hook.finallyAfter(hookCtxWithTargetingKey("flag", "user-1"), det, Collections.emptyMap());
+
+        assertFalse(writerResolved.get());
+    }
+
+    // ---- test: writer=null -> no-op (killswitch off / not yet started) ----
+
+    @Test
+    void writerNullIsNoOp() {
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(null);
+        final FlagEvaluationDetails<Object> det = details("flag", "v", "v", Reason.TARGETING_MATCH.name(), null);
+
+        // Must not throw; nothing is enqueued
+        hook.finallyAfter(null, det, Collections.emptyMap());
+    }
+
+    @Test
+    void writerLookupLinkageErrorIsNoOp() {
+        final FlagEvalLoggingHook<Object> hook = new FlagEvalLoggingHook<>(() -> {
+            throw new NoSuchMethodError("old bootstrap");
+        });
+        final FlagEvaluationDetails<Object> det = details("flag", "v", "v", Reason.TARGETING_MATCH.name(), null);
+
+        assertDoesNotThrow(() -> hook.finallyAfter(null, det, Collections.emptyMap()));
+    }
+
+    // ---- test: details=null -> no-op ----
+
+    @Test
+    void detailsNullIsNoOp() {
+        final FlagEvaluationWriter writer = mock(FlagEvaluationWriter.class);
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(writer);
+
+        // Should not throw
+        hook.finallyAfter(null, null, Collections.emptyMap());
+
+        verifyNoInteractions(writer);
+    }
+
+    // ---- test: targetingKey extracted from evaluation context ----
+
+    @Test
+    void targetingKeyExtractedFromContext() {
+        final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
+
+        final FlagEvaluationDetails<Object> det = details("ctx-flag", "v", "v", Reason.SPLIT.name(), null);
+
+        final HookContext<Object> hookCtx = hookCtxWithTargetingKey("ctx-flag", "user-42");
+
+        hook.finallyAfter(hookCtx, det, Collections.emptyMap());
+
+        assertNotNull(captured.get());
+        assertEquals(
+                "user-42", captured.get().targetingKey, "targetingKey must be extracted from the evaluation context");
+    }
+
+    @Test
+    void contextAttributesAreFlattenedAndConvertedInline() {
+        final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
+
+        final Map<String, Object> profile = new HashMap<>();
+        profile.put("tier", "gold");
+        final Map<String, Object> attributes = new HashMap<>();
+        attributes.put("score", 42);
+        attributes.put("profile", profile);
+        final MutableContext context =
+                new MutableContext(Value.objectToValue(attributes).asStructure().asMap());
+        context.setTargetingKey("user-42");
+
+        final HookContext<Object> hookCtx = HookContext.<Object>builder()
+                .flagKey("ctx-flag")
+                .type(FlagValueType.STRING)
+                .defaultValue("default")
+                .ctx(context)
+                .build();
+        final FlagEvaluationDetails<Object> det =
+                details("ctx-flag", "v", "v", Reason.TARGETING_MATCH.name(), consentOnMetadata());
+
+        hook.finallyAfter(hookCtx, det, Collections.emptyMap());
+
+        assertNotNull(captured.get());
+        // Flatten now happens inline in DDEvaluator#copyPrunedContext on the hot path, so the event
+        // arrives with attrs already populated (no deferred supplier).
+        final Map<String, Object> attrs = captured.get().attrs;
+        assertFalse(attrs.isEmpty(), "hook must flatten context inline");
+        assertEquals(42, attrs.get("score"));
+        assertEquals("gold", attrs.get("profile.tier"));
+        assertFalse(attrs.containsKey("targetingKey"));
+        assertTrue(
+                attrs.values().stream().noneMatch(Value.class::isInstance),
+                "context attrs must contain converted scalar values, not OpenFeature Value wrappers");
+    }
+
+    @Test
+    void contextAttributesUseEnqueueTimeSnapshot() {
+        final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
+
+        final MutableContext context = new MutableContext("user-42");
+        context.add("region", "us-east-1");
+        final MutableStructure profile = new MutableStructure();
+        profile.add("tier", "gold");
+        context.add("profile", profile);
+        final List<Value> cohorts = new ArrayList<>();
+        cohorts.add(Value.objectToValue("beta"));
+        context.add("cohorts", cohorts);
+
+        final HookContext<Object> hookCtx = HookContext.<Object>builder()
+                .flagKey("ctx-flag")
+                .type(FlagValueType.STRING)
+                .defaultValue("default")
+                .ctx(context)
+                .build();
+        final FlagEvaluationDetails<Object> det =
+                details("ctx-flag", "v", "v", Reason.TARGETING_MATCH.name(), consentOnMetadata());
+
+        hook.finallyAfter(hookCtx, det, Collections.emptyMap());
+        context.add("region", "eu-west-1");
+        context.add("late", "ignored");
+        profile.add("tier", "platinum");
+        profile.add("late", "ignored");
+        cohorts.set(0, Value.objectToValue("ga"));
+        cohorts.add(Value.objectToValue("late"));
+
+        assertNotNull(captured.get());
+        final Map<String, Object> attrs = captured.get().attrs;
+        assertEquals("us-east-1", attrs.get("region"));
+        assertEquals("gold", attrs.get("profile.tier"));
+        assertEquals("beta", attrs.get("cohorts[0]"));
+        assertFalse(attrs.containsKey("late"));
+        assertFalse(attrs.containsKey("profile.late"));
+        assertFalse(attrs.containsKey("cohorts[1]"));
+    }
+
+    // ---- observeFullEvaluationData is read from evaluation metadata, never the gateway ----
+
+    @Test
+    void readsObserveFullEvaluationDataTrueFromEvaluationMetadata() {
+        assertTrue(enqueuedEventWithConsentMetadata(true).observeFullEvaluationData);
+    }
+
+    @Test
+    void readsObserveFullEvaluationDataFalseFromEvaluationMetadata() {
+        assertFalse(enqueuedEventWithConsentMetadata(false).observeFullEvaluationData);
+    }
+
+    @Test
+    void observeFullEvaluationDataDefaultsToFalseWhenMetadataAbsent() {
+        // No metadata at all: fail-closed toward privacy.
+        assertFalse(enqueuedEventWithConsentMetadata(null).observeFullEvaluationData);
+    }
+
+    @Test
+    void protectedPathSkipsEvaluationContextCapture() {
+        // Consent off → the hook must not snapshot the evaluation context at all. Verified by mutating
+        // the context after finallyAfter returns and asserting the enqueued event still sees nothing.
+        final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
+
+        final MutableContext context = new MutableContext("user-1");
+        context.add("region", "us-east-1");
+
+        final HookContext<Object> hookCtx = HookContext.<Object>builder()
+                .flagKey("ctx-flag")
+                .type(FlagValueType.STRING)
+                .defaultValue("default")
+                .ctx(context)
+                .build();
+        final ImmutableMetadata consentOff = ImmutableMetadata.builder()
+                .addBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA, false)
+                .build();
+
+        hook.finallyAfter(
+                hookCtx,
+                details("ctx-flag", "v", "v", Reason.TARGETING_MATCH.name(), consentOff),
+                Collections.emptyMap());
+        context.add("region", "eu-west-1");
+
+        assertNotNull(captured.get());
+        assertTrue(captured.get().attrs.isEmpty());
+    }
+
+    @Test
+    void ignoresGatewayConsentEvenWhenItDisagreesWithMetadata() {
+        // Gateway says on, metadata says off; hook must trust metadata.
+        FeatureFlaggingGateway.dispatch(observeConfig(true));
+        try {
+            assertFalse(enqueuedEventWithConsentMetadata(false).observeFullEvaluationData);
+        } finally {
+            FeatureFlaggingGateway.dispatch((ServerConfiguration) null);
+        }
+    }
+
+    /**
+     * Fires the hook once for a simple targeted evaluation whose metadata carries the given consent
+     * value ({@code null} = key absent) and returns the enqueued event.
+     */
+    private FlagEvalEvent enqueuedEventWithConsentMetadata(final Boolean consent) {
+        final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
+        final FlagEvalLoggingHook<Object> hook = hookWithWriter(capturingWriter(captured));
+        final ImmutableMetadata metadata = consent == null
+                ? null
+                : ImmutableMetadata.builder()
+                        .addBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA, consent)
+                        .build();
+        hook.finallyAfter(
+                hookCtxWithTargetingKey("obs-flag", "user-1"),
+                details("obs-flag", "on", "on", Reason.TARGETING_MATCH.name(), metadata),
+                Collections.emptyMap());
+        assertNotNull(captured.get(), "writer.enqueue must be called once");
+        return captured.get();
+    }
+
+    private static ImmutableMetadata consentOnMetadata() {
+        return ImmutableMetadata.builder()
+                .addBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA, true)
+                .build();
+    }
+
+    private static ImmutableMetadata consentOffMetadata() {
+        return ImmutableMetadata.builder()
+                .addBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA, false)
+                .build();
+    }
+
+    private static ServerConfiguration observeConfig(final boolean observeFullEvaluationData) {
+        return new ServerConfiguration(
+                "2024-04-17T19:40:53.716Z", "SERVER", observeFullEvaluationData, null, Collections.emptyMap());
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/FlagEvalMetricsHookTest.java b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/FlagEvalMetricsHookTest.java
index 322a06d2de7..16f0a88b08f 100644
--- a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/FlagEvalMetricsHookTest.java
+++ b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/FlagEvalMetricsHookTest.java
@@ -15,112 +15,100 @@
 
 class FlagEvalMetricsHookTest {
 
-  @Test
-  void finallyAfterRecordsBasicEvaluation() {
-    FlagEvalMetrics metrics = mock(FlagEvalMetrics.class);
-    FlagEvalMetricsHook hook = new FlagEvalMetricsHook(metrics);
-
-    FlagEvaluationDetails<Object> details =
-        FlagEvaluationDetails.<Object>builder()
-            .flagKey("my-flag")
-            .value("on-value")
-            .variant("on")
-            .reason(Reason.TARGETING_MATCH.name())
-            .flagMetadata(
-                ImmutableMetadata.builder().addString("allocationKey", "default-alloc").build())
-            .build();
-
-    hook.finallyAfter(null, details, Collections.emptyMap());
-
-    verify(metrics)
-        .record(
-            eq("my-flag"),
-            eq("on"),
-            eq(Reason.TARGETING_MATCH.name()),
-            isNull(),
-            eq("default-alloc"));
-  }
-
-  @Test
-  void finallyAfterRecordsErrorEvaluation() {
-    FlagEvalMetrics metrics = mock(FlagEvalMetrics.class);
-    FlagEvalMetricsHook hook = new FlagEvalMetricsHook(metrics);
-
-    FlagEvaluationDetails<Object> details =
-        FlagEvaluationDetails.<Object>builder()
-            .flagKey("missing-flag")
-            .value("default")
-            .reason(Reason.ERROR.name())
-            .errorCode(ErrorCode.FLAG_NOT_FOUND)
-            .build();
-
-    hook.finallyAfter(null, details, Collections.emptyMap());
-
-    verify(metrics)
-        .record(
-            eq("missing-flag"),
-            isNull(),
-            eq(Reason.ERROR.name()),
-            eq(ErrorCode.FLAG_NOT_FOUND),
-            isNull());
-  }
-
-  @Test
-  void finallyAfterHandlesNullFlagMetadata() {
-    FlagEvalMetrics metrics = mock(FlagEvalMetrics.class);
-    FlagEvalMetricsHook hook = new FlagEvalMetricsHook(metrics);
-
-    FlagEvaluationDetails<Object> details =
-        FlagEvaluationDetails.<Object>builder()
-            .flagKey("my-flag")
-            .value(true)
-            .variant("on")
-            .reason(Reason.TARGETING_MATCH.name())
-            .build();
-
-    hook.finallyAfter(null, details, Collections.emptyMap());
-
-    verify(metrics)
-        .record(eq("my-flag"), eq("on"), eq(Reason.TARGETING_MATCH.name()), isNull(), isNull());
-  }
-
-  @Test
-  void finallyAfterHandlesNullVariantAndReason() {
-    FlagEvalMetrics metrics = mock(FlagEvalMetrics.class);
-    FlagEvalMetricsHook hook = new FlagEvalMetricsHook(metrics);
-
-    FlagEvaluationDetails<Object> details =
-        FlagEvaluationDetails.<Object>builder().flagKey("my-flag").value("default").build();
-
-    hook.finallyAfter(null, details, Collections.emptyMap());
-
-    verify(metrics).record(eq("my-flag"), isNull(), isNull(), isNull(), isNull());
-  }
-
-  @Test
-  void finallyAfterNeverThrows() {
-    FlagEvalMetrics metrics = mock(FlagEvalMetrics.class);
-    FlagEvalMetricsHook hook = new FlagEvalMetricsHook(metrics);
-
-    // Should not throw even with completely null inputs
-    hook.finallyAfter(null, null, null);
-
-    verifyNoInteractions(metrics);
-  }
-
-  @Test
-  void finallyAfterIsNoOpWhenMetricsIsNull() {
-    FlagEvalMetricsHook hook = new FlagEvalMetricsHook(null);
-
-    FlagEvaluationDetails<Object> details =
-        FlagEvaluationDetails.<Object>builder()
-            .flagKey("my-flag")
-            .value(true)
-            .variant("on")
-            .reason(Reason.TARGETING_MATCH.name())
-            .build();
-
-    // Should not throw
-    hook.finallyAfter(null, details, Collections.emptyMap());
-  }
+    @Test
+    void finallyAfterRecordsBasicEvaluation() {
+        FlagEvalMetrics metrics = mock(FlagEvalMetrics.class);
+        FlagEvalMetricsHook hook = new FlagEvalMetricsHook(metrics);
+
+        FlagEvaluationDetails<Object> details = FlagEvaluationDetails.<Object>builder()
+                .flagKey("my-flag")
+                .value("on-value")
+                .variant("on")
+                .reason(Reason.TARGETING_MATCH.name())
+                .flagMetadata(ImmutableMetadata.builder()
+                        .addString("allocationKey", "default-alloc")
+                        .build())
+                .build();
+
+        hook.finallyAfter(null, details, Collections.emptyMap());
+
+        verify(metrics)
+                .record(eq("my-flag"), eq("on"), eq(Reason.TARGETING_MATCH.name()), isNull(), eq("default-alloc"));
+    }
+
+    @Test
+    void finallyAfterRecordsErrorEvaluation() {
+        FlagEvalMetrics metrics = mock(FlagEvalMetrics.class);
+        FlagEvalMetricsHook hook = new FlagEvalMetricsHook(metrics);
+
+        FlagEvaluationDetails<Object> details = FlagEvaluationDetails.<Object>builder()
+                .flagKey("missing-flag")
+                .value("default")
+                .reason(Reason.ERROR.name())
+                .errorCode(ErrorCode.FLAG_NOT_FOUND)
+                .build();
+
+        hook.finallyAfter(null, details, Collections.emptyMap());
+
+        verify(metrics)
+                .record(eq("missing-flag"), isNull(), eq(Reason.ERROR.name()), eq(ErrorCode.FLAG_NOT_FOUND), isNull());
+    }
+
+    @Test
+    void finallyAfterHandlesNullFlagMetadata() {
+        FlagEvalMetrics metrics = mock(FlagEvalMetrics.class);
+        FlagEvalMetricsHook hook = new FlagEvalMetricsHook(metrics);
+
+        FlagEvaluationDetails<Object> details = FlagEvaluationDetails.<Object>builder()
+                .flagKey("my-flag")
+                .value(true)
+                .variant("on")
+                .reason(Reason.TARGETING_MATCH.name())
+                .build();
+
+        hook.finallyAfter(null, details, Collections.emptyMap());
+
+        verify(metrics).record(eq("my-flag"), eq("on"), eq(Reason.TARGETING_MATCH.name()), isNull(), isNull());
+    }
+
+    @Test
+    void finallyAfterHandlesNullVariantAndReason() {
+        FlagEvalMetrics metrics = mock(FlagEvalMetrics.class);
+        FlagEvalMetricsHook hook = new FlagEvalMetricsHook(metrics);
+
+        FlagEvaluationDetails<Object> details = FlagEvaluationDetails.<Object>builder()
+                .flagKey("my-flag")
+                .value("default")
+                .build();
+
+        hook.finallyAfter(null, details, Collections.emptyMap());
+
+        verify(metrics).record(eq("my-flag"), isNull(), isNull(), isNull(), isNull());
+    }
+
+    @Test
+    void finallyAfterNeverThrows() {
+        FlagEvalMetrics metrics = mock(FlagEvalMetrics.class);
+        FlagEvalMetricsHook hook = new FlagEvalMetricsHook(metrics);
+
+        // Should not throw even with completely null inputs
+        hook.finallyAfter(null, null, null);
+
+        verifyNoInteractions(metrics);
+    }
+
+    @Test
+    void finallyAfterIsNoOpWhenMetricsIsNull() {
+        FlagEvalMetricsHook hook = new FlagEvalMetricsHook(null);
+
+        FlagEvaluationDetails<Object> details = FlagEvaluationDetails.<Object>builder()
+                .flagKey("my-flag")
+                .value(true)
+                .variant("on")
+                .reason(Reason.TARGETING_MATCH.name())
+                .build();
+
+        // Should not throw
+        hook.finallyAfter(null, details, Collections.emptyMap());
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/FlagEvalMetricsTest.java b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/FlagEvalMetricsTest.java
index 214fadc7274..0486b2b055f 100644
--- a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/FlagEvalMetricsTest.java
+++ b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/FlagEvalMetricsTest.java
@@ -13,153 +13,153 @@
 
 class FlagEvalMetricsTest {
 
-  @Test
-  void recordBasicAttributes() {
-    LongCounter counter = mock(LongCounter.class);
-    FlagEvalMetrics metrics = new FlagEvalMetrics(counter);
-
-    metrics.record("my-flag", "on", "TARGETING_MATCH", null, null);
-
-    ArgumentCaptor<Attributes> captor = ArgumentCaptor.forClass(Attributes.class);
-    verify(counter).add(eq(1L), captor.capture());
-
-    Attributes attrs = captor.getValue();
-    assertAttribute(attrs, "feature_flag.key", "my-flag");
-    assertAttribute(attrs, "feature_flag.result.variant", "on");
-    assertAttribute(attrs, "feature_flag.result.reason", "targeting_match");
-    assertNoAttribute(attrs, "error.type");
-    assertNoAttribute(attrs, "feature_flag.result.allocation_key");
-  }
+    @Test
+    void recordBasicAttributes() {
+        LongCounter counter = mock(LongCounter.class);
+        FlagEvalMetrics metrics = new FlagEvalMetrics(counter);
+
+        metrics.record("my-flag", "on", "TARGETING_MATCH", null, null);
+
+        ArgumentCaptor<Attributes> captor = ArgumentCaptor.forClass(Attributes.class);
+        verify(counter).add(eq(1L), captor.capture());
+
+        Attributes attrs = captor.getValue();
+        assertAttribute(attrs, "feature_flag.key", "my-flag");
+        assertAttribute(attrs, "feature_flag.result.variant", "on");
+        assertAttribute(attrs, "feature_flag.result.reason", "targeting_match");
+        assertNoAttribute(attrs, "error.type");
+        assertNoAttribute(attrs, "feature_flag.result.allocation_key");
+    }
 
-  @Test
-  void recordErrorAttributes() {
-    LongCounter counter = mock(LongCounter.class);
-    FlagEvalMetrics metrics = new FlagEvalMetrics(counter);
+    @Test
+    void recordErrorAttributes() {
+        LongCounter counter = mock(LongCounter.class);
+        FlagEvalMetrics metrics = new FlagEvalMetrics(counter);
 
-    metrics.record("missing-flag", "", "ERROR", ErrorCode.FLAG_NOT_FOUND, null);
+        metrics.record("missing-flag", "", "ERROR", ErrorCode.FLAG_NOT_FOUND, null);
 
-    ArgumentCaptor<Attributes> captor = ArgumentCaptor.forClass(Attributes.class);
-    verify(counter).add(eq(1L), captor.capture());
+        ArgumentCaptor<Attributes> captor = ArgumentCaptor.forClass(Attributes.class);
+        verify(counter).add(eq(1L), captor.capture());
 
-    Attributes attrs = captor.getValue();
-    assertAttribute(attrs, "feature_flag.key", "missing-flag");
-    assertAttribute(attrs, "feature_flag.result.variant", "");
-    assertAttribute(attrs, "feature_flag.result.reason", "error");
-    assertAttribute(attrs, "error.type", "flag_not_found");
-    assertNoAttribute(attrs, "feature_flag.result.allocation_key");
-  }
+        Attributes attrs = captor.getValue();
+        assertAttribute(attrs, "feature_flag.key", "missing-flag");
+        assertAttribute(attrs, "feature_flag.result.variant", "");
+        assertAttribute(attrs, "feature_flag.result.reason", "error");
+        assertAttribute(attrs, "error.type", "flag_not_found");
+        assertNoAttribute(attrs, "feature_flag.result.allocation_key");
+    }
 
-  @Test
-  void recordTypeMismatchError() {
-    LongCounter counter = mock(LongCounter.class);
-    FlagEvalMetrics metrics = new FlagEvalMetrics(counter);
+    @Test
+    void recordTypeMismatchError() {
+        LongCounter counter = mock(LongCounter.class);
+        FlagEvalMetrics metrics = new FlagEvalMetrics(counter);
 
-    metrics.record("my-flag", "", "ERROR", ErrorCode.TYPE_MISMATCH, null);
+        metrics.record("my-flag", "", "ERROR", ErrorCode.TYPE_MISMATCH, null);
 
-    ArgumentCaptor<Attributes> captor = ArgumentCaptor.forClass(Attributes.class);
-    verify(counter).add(eq(1L), captor.capture());
+        ArgumentCaptor<Attributes> captor = ArgumentCaptor.forClass(Attributes.class);
+        verify(counter).add(eq(1L), captor.capture());
 
-    Attributes attrs = captor.getValue();
-    assertAttribute(attrs, "error.type", "type_mismatch");
-  }
+        Attributes attrs = captor.getValue();
+        assertAttribute(attrs, "error.type", "type_mismatch");
+    }
 
-  @Test
-  void recordWithAllocationKey() {
-    LongCounter counter = mock(LongCounter.class);
-    FlagEvalMetrics metrics = new FlagEvalMetrics(counter);
+    @Test
+    void recordWithAllocationKey() {
+        LongCounter counter = mock(LongCounter.class);
+        FlagEvalMetrics metrics = new FlagEvalMetrics(counter);
 
-    metrics.record("my-flag", "on", "TARGETING_MATCH", null, "default-allocation");
+        metrics.record("my-flag", "on", "TARGETING_MATCH", null, "default-allocation");
 
-    ArgumentCaptor<Attributes> captor = ArgumentCaptor.forClass(Attributes.class);
-    verify(counter).add(eq(1L), captor.capture());
+        ArgumentCaptor<Attributes> captor = ArgumentCaptor.forClass(Attributes.class);
+        verify(counter).add(eq(1L), captor.capture());
 
-    Attributes attrs = captor.getValue();
-    assertAttribute(attrs, "feature_flag.result.allocation_key", "default-allocation");
-  }
+        Attributes attrs = captor.getValue();
+        assertAttribute(attrs, "feature_flag.result.allocation_key", "default-allocation");
+    }
 
-  @Test
-  void recordOmitsEmptyAllocationKey() {
-    LongCounter counter = mock(LongCounter.class);
-    FlagEvalMetrics metrics = new FlagEvalMetrics(counter);
+    @Test
+    void recordOmitsEmptyAllocationKey() {
+        LongCounter counter = mock(LongCounter.class);
+        FlagEvalMetrics metrics = new FlagEvalMetrics(counter);
 
-    metrics.record("my-flag", "on", "TARGETING_MATCH", null, "");
+        metrics.record("my-flag", "on", "TARGETING_MATCH", null, "");
 
-    ArgumentCaptor<Attributes> captor = ArgumentCaptor.forClass(Attributes.class);
-    verify(counter).add(eq(1L), captor.capture());
+        ArgumentCaptor<Attributes> captor = ArgumentCaptor.forClass(Attributes.class);
+        verify(counter).add(eq(1L), captor.capture());
 
-    Attributes attrs = captor.getValue();
-    assertNoAttribute(attrs, "feature_flag.result.allocation_key");
-  }
+        Attributes attrs = captor.getValue();
+        assertNoAttribute(attrs, "feature_flag.result.allocation_key");
+    }
 
-  @Test
-  void recordNullVariantBecomesEmptyString() {
-    LongCounter counter = mock(LongCounter.class);
-    FlagEvalMetrics metrics = new FlagEvalMetrics(counter);
+    @Test
+    void recordNullVariantBecomesEmptyString() {
+        LongCounter counter = mock(LongCounter.class);
+        FlagEvalMetrics metrics = new FlagEvalMetrics(counter);
 
-    metrics.record("my-flag", null, "DEFAULT", null, null);
+        metrics.record("my-flag", null, "DEFAULT", null, null);
 
-    ArgumentCaptor<Attributes> captor = ArgumentCaptor.forClass(Attributes.class);
-    verify(counter).add(eq(1L), captor.capture());
+        ArgumentCaptor<Attributes> captor = ArgumentCaptor.forClass(Attributes.class);
+        verify(counter).add(eq(1L), captor.capture());
 
-    Attributes attrs = captor.getValue();
-    assertAttribute(attrs, "feature_flag.result.variant", "");
-  }
+        Attributes attrs = captor.getValue();
+        assertAttribute(attrs, "feature_flag.result.variant", "");
+    }
 
-  @Test
-  void recordNullReasonBecomesUnknown() {
-    LongCounter counter = mock(LongCounter.class);
-    FlagEvalMetrics metrics = new FlagEvalMetrics(counter);
+    @Test
+    void recordNullReasonBecomesUnknown() {
+        LongCounter counter = mock(LongCounter.class);
+        FlagEvalMetrics metrics = new FlagEvalMetrics(counter);
 
-    metrics.record("my-flag", "on", null, null, null);
+        metrics.record("my-flag", "on", null, null, null);
 
-    ArgumentCaptor<Attributes> captor = ArgumentCaptor.forClass(Attributes.class);
-    verify(counter).add(eq(1L), captor.capture());
+        ArgumentCaptor<Attributes> captor = ArgumentCaptor.forClass(Attributes.class);
+        verify(counter).add(eq(1L), captor.capture());
 
-    Attributes attrs = captor.getValue();
-    assertAttribute(attrs, "feature_flag.result.reason", "unknown");
-  }
+        Attributes attrs = captor.getValue();
+        assertAttribute(attrs, "feature_flag.result.reason", "unknown");
+    }
 
-  @Test
-  void recordIsNoOpWhenCounterIsNull() {
-    FlagEvalMetrics metrics = new FlagEvalMetrics((LongCounter) null);
-    // Should not throw
-    metrics.record("my-flag", "on", "TARGETING_MATCH", null, null);
-  }
+    @Test
+    void recordIsNoOpWhenCounterIsNull() {
+        FlagEvalMetrics metrics = new FlagEvalMetrics((LongCounter) null);
+        // Should not throw
+        metrics.record("my-flag", "on", "TARGETING_MATCH", null, null);
+    }
 
-  @Test
-  void shutdownClearsCounter() {
-    LongCounter counter = mock(LongCounter.class);
-    FlagEvalMetrics metrics = new FlagEvalMetrics(counter);
+    @Test
+    void shutdownClearsCounter() {
+        LongCounter counter = mock(LongCounter.class);
+        FlagEvalMetrics metrics = new FlagEvalMetrics(counter);
 
-    metrics.shutdown();
-    metrics.record("my-flag", "on", "TARGETING_MATCH", null, null);
+        metrics.shutdown();
+        metrics.record("my-flag", "on", "TARGETING_MATCH", null, null);
 
-    verifyNoInteractions(counter);
-  }
+        verifyNoInteractions(counter);
+    }
 
-  @Test
-  void defaultConstructorUsesOpenTelemetryApiOnly() {
-    try (FlagEvalMetrics metrics = new FlagEvalMetrics()) {
-      metrics.record("count-flag", "on", "STATIC", null, "default-alloc");
+    @Test
+    void defaultConstructorUsesOpenTelemetryApiOnly() {
+        try (FlagEvalMetrics metrics = new FlagEvalMetrics()) {
+            metrics.record("count-flag", "on", "STATIC", null, "default-alloc");
+        }
     }
-  }
-
-  private static void assertAttribute(Attributes attrs, String key, String expected) {
-    String value =
-        attrs.asMap().entrySet().stream()
-            .filter(e -> e.getKey().getKey().equals(key))
-            .map(e -> e.getValue().toString())
-            .findFirst()
-            .orElse(null);
-    if (!expected.equals(value)) {
-      throw new AssertionError("Expected attribute " + key + "=" + expected + " but got " + value);
+
+    private static void assertAttribute(Attributes attrs, String key, String expected) {
+        String value = attrs.asMap().entrySet().stream()
+                .filter(e -> e.getKey().getKey().equals(key))
+                .map(e -> e.getValue().toString())
+                .findFirst()
+                .orElse(null);
+        if (!expected.equals(value)) {
+            throw new AssertionError("Expected attribute " + key + "=" + expected + " but got " + value);
+        }
     }
-  }
 
-  private static void assertNoAttribute(Attributes attrs, String key) {
-    boolean present = attrs.asMap().keySet().stream().anyMatch(k -> k.getKey().equals(key));
-    if (present) {
-      throw new AssertionError("Expected no attribute " + key + " but it was present");
+    private static void assertNoAttribute(Attributes attrs, String key) {
+        boolean present =
+                attrs.asMap().keySet().stream().anyMatch(k -> k.getKey().equals(key));
+        if (present) {
+            throw new AssertionError("Expected no attribute " + key + " but it was present");
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/ProviderTest.java b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/ProviderTest.java
index d7adf645e74..318b6e175d2 100644
--- a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/ProviderTest.java
+++ b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/ProviderTest.java
@@ -54,455 +54,421 @@
 
 public class ProviderTest {
 
-  private static final long EVENT_TIMEOUT_SECONDS = 10;
-
-  private ExecutorService executor;
-
-  @BeforeEach
-  public void setup() {
-    executor = Executors.newSingleThreadExecutor();
-  }
-
-  @AfterEach
-  public void tearDown() {
-    executor.shutdownNow();
-    OpenFeatureAPI.getInstance().shutdown();
-    FeatureFlaggingGateway.dispatch((ServerConfiguration) null);
-    FeatureFlaggingGateway.setFlagEvalWriter(null);
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
-  }
-
-  @Test
-  public void testSetProvider() throws Exception {
-    final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
-    final CompletableFuture<EventDetails> readyEvent = new CompletableFuture<>();
-    api.onProviderReady(readyEvent::complete);
-    api.setProvider(new Provider());
-
-    final Client client = api.getClient();
-    assertThat(client.getProviderState(), equalTo(ProviderState.NOT_READY));
-
-    FeatureFlaggingGateway.dispatch(mock(ServerConfiguration.class));
-    readyEvent.get(EVENT_TIMEOUT_SECONDS, SECONDS);
-    assertThat(client.getProviderState(), equalTo(ProviderState.READY));
-  }
-
-  @Test
-  public void testSetProviderAndWait() throws Exception {
-    final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
-    final Future<?> provider = executor.submit(() -> api.setProviderAndWait(new Provider()));
-
-    final Client client = api.getClient();
-    assertThat(client.getProviderState(), equalTo(ProviderState.NOT_READY));
-
-    FeatureFlaggingGateway.dispatch(mock(ServerConfiguration.class));
-    provider.get(EVENT_TIMEOUT_SECONDS, SECONDS);
-    assertThat(client.getProviderState(), equalTo(ProviderState.READY));
-  }
-
-  @Test
-  public void testSetProviderAndWaitTimeoutRecoversWhenConfigurationArrives() throws Exception {
-    final CompletableFuture<EventDetails> readyEvent = new CompletableFuture<>();
-    final Consumer<EventDetails> readyEventHandler = completingHandler(readyEvent);
-    final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
-    final Client client = api.getClient();
-    client.on(ProviderEvent.PROVIDER_READY, readyEventHandler);
-
-    assertThrows(
-        ProviderNotReadyError.class,
-        () -> api.setProviderAndWait(new Provider(new Options().initTimeout(10, MILLISECONDS))));
-
-    assertThat(client.getProviderState(), equalTo(ProviderState.ERROR));
-    assertFalse(readyEvent.isDone());
-
-    FeatureFlaggingGateway.dispatch(mock(ServerConfiguration.class));
-
-    final EventDetails eventDetails = readyEvent.get(EVENT_TIMEOUT_SECONDS, SECONDS);
-    assertThat(client.getProviderState(), equalTo(ProviderState.READY));
-    assertThat(eventDetails.getProviderName(), equalTo(METADATA));
-    verify(readyEventHandler, times(1)).accept(any());
-  }
-
-  @Test
-  public void testSetProviderAndWaitCompletesWhenConfigurationArrivesAtTimeoutBoundary()
-      throws Exception {
-    final Provider[] providerRef = new Provider[1];
-    final Evaluator evaluator =
-        new Evaluator() {
-          private boolean hasConfiguration;
-
-          @Override
-          public boolean initialize(
-              final long timeout,
-              final java.util.concurrent.TimeUnit timeUnit,
-              final EvaluationContext context) {
-            hasConfiguration = true;
-            providerRef[0].onConfigurationChange();
-            return false;
-          }
-
-          @Override
-          public boolean hasConfiguration() {
-            return hasConfiguration;
-          }
-
-          @Override
-          public void shutdown() {}
-
-          @Override
-          public <T> ProviderEvaluation<T> evaluate(
-              final Class<T> target,
-              final String key,
-              final T defaultValue,
-              final EvaluationContext context) {
-            return ProviderEvaluation.<T>builder().value(defaultValue).build();
-          }
+    private static final long EVENT_TIMEOUT_SECONDS = 10;
+
+    private ExecutorService executor;
+
+    @BeforeEach
+    public void setup() {
+        executor = Executors.newSingleThreadExecutor();
+    }
+
+    @AfterEach
+    public void tearDown() {
+        executor.shutdownNow();
+        OpenFeatureAPI.getInstance().shutdown();
+        FeatureFlaggingGateway.dispatch((ServerConfiguration) null);
+        FeatureFlaggingGateway.setFlagEvalWriter(null);
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
+    }
+
+    @Test
+    public void testSetProvider() throws Exception {
+        final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
+        final CompletableFuture<EventDetails> readyEvent = new CompletableFuture<>();
+        api.onProviderReady(readyEvent::complete);
+        api.setProvider(new Provider());
+
+        final Client client = api.getClient();
+        assertThat(client.getProviderState(), equalTo(ProviderState.NOT_READY));
+
+        FeatureFlaggingGateway.dispatch(mock(ServerConfiguration.class));
+        readyEvent.get(EVENT_TIMEOUT_SECONDS, SECONDS);
+        assertThat(client.getProviderState(), equalTo(ProviderState.READY));
+    }
+
+    @Test
+    public void testSetProviderAndWait() throws Exception {
+        final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
+        final Future<?> provider = executor.submit(() -> api.setProviderAndWait(new Provider()));
+
+        final Client client = api.getClient();
+        assertThat(client.getProviderState(), equalTo(ProviderState.NOT_READY));
+
+        FeatureFlaggingGateway.dispatch(mock(ServerConfiguration.class));
+        provider.get(EVENT_TIMEOUT_SECONDS, SECONDS);
+        assertThat(client.getProviderState(), equalTo(ProviderState.READY));
+    }
+
+    @Test
+    public void testSetProviderAndWaitTimeoutRecoversWhenConfigurationArrives() throws Exception {
+        final CompletableFuture<EventDetails> readyEvent = new CompletableFuture<>();
+        final Consumer<EventDetails> readyEventHandler = completingHandler(readyEvent);
+        final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
+        final Client client = api.getClient();
+        client.on(ProviderEvent.PROVIDER_READY, readyEventHandler);
+
+        assertThrows(
+                ProviderNotReadyError.class,
+                () -> api.setProviderAndWait(new Provider(new Options().initTimeout(10, MILLISECONDS))));
+
+        assertThat(client.getProviderState(), equalTo(ProviderState.ERROR));
+        assertFalse(readyEvent.isDone());
+
+        FeatureFlaggingGateway.dispatch(mock(ServerConfiguration.class));
+
+        final EventDetails eventDetails = readyEvent.get(EVENT_TIMEOUT_SECONDS, SECONDS);
+        assertThat(client.getProviderState(), equalTo(ProviderState.READY));
+        assertThat(eventDetails.getProviderName(), equalTo(METADATA));
+        verify(readyEventHandler, times(1)).accept(any());
+    }
+
+    @Test
+    public void testSetProviderAndWaitCompletesWhenConfigurationArrivesAtTimeoutBoundary() throws Exception {
+        final Provider[] providerRef = new Provider[1];
+        final Evaluator evaluator = new Evaluator() {
+            private boolean hasConfiguration;
+
+            @Override
+            public boolean initialize(
+                    final long timeout, final java.util.concurrent.TimeUnit timeUnit, final EvaluationContext context) {
+                hasConfiguration = true;
+                providerRef[0].onConfigurationChange();
+                return false;
+            }
+
+            @Override
+            public boolean hasConfiguration() {
+                return hasConfiguration;
+            }
+
+            @Override
+            public void shutdown() {}
+
+            @Override
+            public <T> ProviderEvaluation<T> evaluate(
+                    final Class<T> target, final String key, final T defaultValue, final EvaluationContext context) {
+                return ProviderEvaluation.<T>builder().value(defaultValue).build();
+            }
         };
 
-    final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
-    providerRef[0] = new Provider(new Options().initTimeout(10, MILLISECONDS), evaluator);
-    api.setProviderAndWait(providerRef[0]);
-
-    final Client client = api.getClient();
-    assertThat(client.getProviderState(), equalTo(ProviderState.READY));
-  }
-
-  @Test
-  public void testSetProviderAndWaitFailsWhenConfigurationIsRemovedBeforeInitializationCompletes() {
-    final Provider[] providerRef = new Provider[1];
-    final Evaluator evaluator =
-        new Evaluator() {
-          private boolean hasConfiguration;
-
-          @Override
-          public boolean initialize(
-              final long timeout,
-              final java.util.concurrent.TimeUnit timeUnit,
-              final EvaluationContext context) {
-            hasConfiguration = true;
-            providerRef[0].onConfigurationChange();
-            hasConfiguration = false;
-            providerRef[0].onConfigurationChange();
-            return true;
-          }
-
-          @Override
-          public boolean hasConfiguration() {
-            return hasConfiguration;
-          }
-
-          @Override
-          public void shutdown() {}
-
-          @Override
-          public <T> ProviderEvaluation<T> evaluate(
-              final Class<T> target,
-              final String key,
-              final T defaultValue,
-              final EvaluationContext context) {
-            return ProviderEvaluation.<T>builder().value(defaultValue).build();
-          }
+        final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
+        providerRef[0] = new Provider(new Options().initTimeout(10, MILLISECONDS), evaluator);
+        api.setProviderAndWait(providerRef[0]);
+
+        final Client client = api.getClient();
+        assertThat(client.getProviderState(), equalTo(ProviderState.READY));
+    }
+
+    @Test
+    public void testSetProviderAndWaitFailsWhenConfigurationIsRemovedBeforeInitializationCompletes() {
+        final Provider[] providerRef = new Provider[1];
+        final Evaluator evaluator = new Evaluator() {
+            private boolean hasConfiguration;
+
+            @Override
+            public boolean initialize(
+                    final long timeout, final java.util.concurrent.TimeUnit timeUnit, final EvaluationContext context) {
+                hasConfiguration = true;
+                providerRef[0].onConfigurationChange();
+                hasConfiguration = false;
+                providerRef[0].onConfigurationChange();
+                return true;
+            }
+
+            @Override
+            public boolean hasConfiguration() {
+                return hasConfiguration;
+            }
+
+            @Override
+            public void shutdown() {}
+
+            @Override
+            public <T> ProviderEvaluation<T> evaluate(
+                    final Class<T> target, final String key, final T defaultValue, final EvaluationContext context) {
+                return ProviderEvaluation.<T>builder().value(defaultValue).build();
+            }
         };
 
-    final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
-    providerRef[0] = new Provider(new Options().initTimeout(10, MILLISECONDS), evaluator);
-
-    assertThrows(ProviderNotReadyError.class, () -> api.setProviderAndWait(providerRef[0]));
-
-    final Client client = api.getClient();
-    assertThat(client.getProviderState(), equalTo(ProviderState.ERROR));
-  }
-
-  @Test
-  public void testInitializationErrorDoesNotOverwriteRecoveredReadyState() throws Exception {
-    final Provider[] providerRef = new Provider[1];
-    final Evaluator evaluator =
-        new Evaluator() {
-          private boolean hasConfiguration;
-
-          @Override
-          public boolean initialize(
-              final long timeout,
-              final java.util.concurrent.TimeUnit timeUnit,
-              final EvaluationContext context) {
-            hasConfiguration = true;
-            providerRef[0].onConfigurationChange();
-            hasConfiguration = false;
-            providerRef[0].onConfigurationChange();
-            hasConfiguration = true;
-            providerRef[0].onConfigurationChange();
-            throw new ProviderNotReadyError(
-                "Provider timed-out while waiting for initial configuration");
-          }
-
-          @Override
-          public boolean hasConfiguration() {
-            return hasConfiguration;
-          }
-
-          @Override
-          public void shutdown() {}
-
-          @Override
-          public <T> ProviderEvaluation<T> evaluate(
-              final Class<T> target,
-              final String key,
-              final T defaultValue,
-              final EvaluationContext context) {
-            return ProviderEvaluation.<T>builder().value(defaultValue).build();
-          }
+        final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
+        providerRef[0] = new Provider(new Options().initTimeout(10, MILLISECONDS), evaluator);
+
+        assertThrows(ProviderNotReadyError.class, () -> api.setProviderAndWait(providerRef[0]));
+
+        final Client client = api.getClient();
+        assertThat(client.getProviderState(), equalTo(ProviderState.ERROR));
+    }
+
+    @Test
+    public void testInitializationErrorDoesNotOverwriteRecoveredReadyState() throws Exception {
+        final Provider[] providerRef = new Provider[1];
+        final Evaluator evaluator = new Evaluator() {
+            private boolean hasConfiguration;
+
+            @Override
+            public boolean initialize(
+                    final long timeout, final java.util.concurrent.TimeUnit timeUnit, final EvaluationContext context) {
+                hasConfiguration = true;
+                providerRef[0].onConfigurationChange();
+                hasConfiguration = false;
+                providerRef[0].onConfigurationChange();
+                hasConfiguration = true;
+                providerRef[0].onConfigurationChange();
+                throw new ProviderNotReadyError("Provider timed-out while waiting for initial configuration");
+            }
+
+            @Override
+            public boolean hasConfiguration() {
+                return hasConfiguration;
+            }
+
+            @Override
+            public void shutdown() {}
+
+            @Override
+            public <T> ProviderEvaluation<T> evaluate(
+                    final Class<T> target, final String key, final T defaultValue, final EvaluationContext context) {
+                return ProviderEvaluation.<T>builder().value(defaultValue).build();
+            }
         };
 
-    providerRef[0] = new Provider(new Options().initTimeout(10, MILLISECONDS), evaluator);
-
-    assertThrows(ProviderNotReadyError.class, () -> providerRef[0].initialize(null));
-
-    assertThat(initializationState(providerRef[0]), equalTo("READY"));
-  }
-
-  @Test
-  public void testNullConfigurationAfterReadyTransitionsToErrorAndRecovers() throws Exception {
-    final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
-    FeatureFlaggingGateway.dispatch(mock(ServerConfiguration.class));
-    api.setProviderAndWait(new Provider());
-    final Client client = api.getClient();
-    assertThat(client.getProviderState(), equalTo(ProviderState.READY));
-
-    final CompletableFuture<EventDetails> errorEvent = new CompletableFuture<>();
-    final CompletableFuture<EventDetails> readyEvent = new CompletableFuture<>();
-    final CompletableFuture<EventDetails> configChangedEvent = new CompletableFuture<>();
-    final Consumer<EventDetails> errorEventHandler = completingHandler(errorEvent);
-    final Consumer<EventDetails> readyEventHandler = completingHandler(readyEvent);
-    final Consumer<EventDetails> configChangedEventHandler = completingHandler(configChangedEvent);
-    client.on(ProviderEvent.PROVIDER_ERROR, errorEventHandler);
-    client.on(ProviderEvent.PROVIDER_CONFIGURATION_CHANGED, configChangedEventHandler);
-
-    FeatureFlaggingGateway.dispatch((ServerConfiguration) null);
-    final EventDetails eventDetails = errorEvent.get(EVENT_TIMEOUT_SECONDS, SECONDS);
-    assertThat(client.getProviderState(), equalTo(ProviderState.ERROR));
-    assertThat(eventDetails.getProviderName(), equalTo(METADATA));
-
-    final FlagEvaluationDetails<String> evalDetails = client.getStringDetails("missing", "default");
-    assertThat(evalDetails.getValue(), equalTo("default"));
-    assertThat(evalDetails.getErrorCode(), equalTo(ErrorCode.PROVIDER_NOT_READY));
-
-    client.on(ProviderEvent.PROVIDER_READY, readyEventHandler);
-    FeatureFlaggingGateway.dispatch(mock(ServerConfiguration.class));
-    readyEvent.get(EVENT_TIMEOUT_SECONDS, SECONDS);
-    assertThat(client.getProviderState(), equalTo(ProviderState.READY));
-
-    FeatureFlaggingGateway.dispatch(mock(ServerConfiguration.class));
-    configChangedEvent.get(EVENT_TIMEOUT_SECONDS, SECONDS);
-    verify(errorEventHandler, times(1)).accept(any());
-    verify(readyEventHandler, times(1)).accept(any());
-    verify(configChangedEventHandler, times(1)).accept(any());
-  }
-
-  @Test
-  public void testFailureToLoadInternalApi() {
-    @SuppressWarnings("unchecked")
-    final Consumer<EventDetails> consumer = mock(Consumer.class);
-
-    final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
-    api.onProviderError(consumer);
-
-    assertThrows(
-        FatalError.class,
-        () ->
-            api.setProviderAndWait(
-                new Provider() {
-                  @Override
-                  protected Class<?> loadEvaluatorClass() throws ClassNotFoundException {
-                    throw new ClassNotFoundException(
-                        "Class " + FeatureFlaggingGateway.class.getName() + " not found");
-                  }
+        providerRef[0] = new Provider(new Options().initTimeout(10, MILLISECONDS), evaluator);
+
+        assertThrows(ProviderNotReadyError.class, () -> providerRef[0].initialize(null));
+
+        assertThat(initializationState(providerRef[0]), equalTo("READY"));
+    }
+
+    @Test
+    public void testNullConfigurationAfterReadyTransitionsToErrorAndRecovers() throws Exception {
+        final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
+        FeatureFlaggingGateway.dispatch(mock(ServerConfiguration.class));
+        api.setProviderAndWait(new Provider());
+        final Client client = api.getClient();
+        assertThat(client.getProviderState(), equalTo(ProviderState.READY));
+
+        final CompletableFuture<EventDetails> errorEvent = new CompletableFuture<>();
+        final CompletableFuture<EventDetails> readyEvent = new CompletableFuture<>();
+        final CompletableFuture<EventDetails> configChangedEvent = new CompletableFuture<>();
+        final Consumer<EventDetails> errorEventHandler = completingHandler(errorEvent);
+        final Consumer<EventDetails> readyEventHandler = completingHandler(readyEvent);
+        final Consumer<EventDetails> configChangedEventHandler = completingHandler(configChangedEvent);
+        client.on(ProviderEvent.PROVIDER_ERROR, errorEventHandler);
+        client.on(ProviderEvent.PROVIDER_CONFIGURATION_CHANGED, configChangedEventHandler);
+
+        FeatureFlaggingGateway.dispatch((ServerConfiguration) null);
+        final EventDetails eventDetails = errorEvent.get(EVENT_TIMEOUT_SECONDS, SECONDS);
+        assertThat(client.getProviderState(), equalTo(ProviderState.ERROR));
+        assertThat(eventDetails.getProviderName(), equalTo(METADATA));
+
+        final FlagEvaluationDetails<String> evalDetails = client.getStringDetails("missing", "default");
+        assertThat(evalDetails.getValue(), equalTo("default"));
+        assertThat(evalDetails.getErrorCode(), equalTo(ErrorCode.PROVIDER_NOT_READY));
+
+        client.on(ProviderEvent.PROVIDER_READY, readyEventHandler);
+        FeatureFlaggingGateway.dispatch(mock(ServerConfiguration.class));
+        readyEvent.get(EVENT_TIMEOUT_SECONDS, SECONDS);
+        assertThat(client.getProviderState(), equalTo(ProviderState.READY));
+
+        FeatureFlaggingGateway.dispatch(mock(ServerConfiguration.class));
+        configChangedEvent.get(EVENT_TIMEOUT_SECONDS, SECONDS);
+        verify(errorEventHandler, times(1)).accept(any());
+        verify(readyEventHandler, times(1)).accept(any());
+        verify(configChangedEventHandler, times(1)).accept(any());
+    }
+
+    @Test
+    public void testFailureToLoadInternalApi() {
+        @SuppressWarnings("unchecked")
+        final Consumer<EventDetails> consumer = mock(Consumer.class);
+
+        final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
+        api.onProviderError(consumer);
+
+        assertThrows(
+                FatalError.class,
+                () -> api.setProviderAndWait(new Provider() {
+                    @Override
+                    protected Class<?> loadEvaluatorClass() throws ClassNotFoundException {
+                        throw new ClassNotFoundException(
+                                "Class " + FeatureFlaggingGateway.class.getName() + " not found");
+                    }
                 }));
-  }
-
-  @Test
-  public void testGetProviderHooksReturnsFlagEvalMetricsHook() {
-    Provider provider =
-        new Provider(new Options().initTimeout(10, MILLISECONDS), mock(Evaluator.class));
-    List<Hook> hooks = provider.getProviderHooks();
-    // Two hooks: OTel FlagEvalMetricsHook (index 0) + FlagEvalLoggingHook (index 1)
-    assertThat(hooks.size(), equalTo(2));
-    assertThat(hooks.get(0) instanceof FlagEvalMetricsHook, equalTo(true));
-    assertThat(hooks.get(1) instanceof FlagEvalLoggingHook, equalTo(true));
-  }
-
-  @Test
-  public void testGetProviderHooksSkipsFlagEvalLoggingHookOnLinkageFailure() {
-    Provider provider =
-        new Provider(new Options().initTimeout(10, MILLISECONDS), mock(Evaluator.class)) {
-          @Override
-          Hook buildFlagEvalLoggingHook() {
-            throw new NoClassDefFoundError("old bootstrap");
-          }
+    }
+
+    @Test
+    public void testGetProviderHooksReturnsFlagEvalMetricsHook() {
+        Provider provider = new Provider(new Options().initTimeout(10, MILLISECONDS), mock(Evaluator.class));
+        List<Hook> hooks = provider.getProviderHooks();
+        // Two hooks: OTel FlagEvalMetricsHook (index 0) + FlagEvalLoggingHook (index 1)
+        assertThat(hooks.size(), equalTo(2));
+        assertThat(hooks.get(0) instanceof FlagEvalMetricsHook, equalTo(true));
+        assertThat(hooks.get(1) instanceof FlagEvalLoggingHook, equalTo(true));
+    }
+
+    @Test
+    public void testGetProviderHooksSkipsFlagEvalLoggingHookOnLinkageFailure() {
+        Provider provider = new Provider(new Options().initTimeout(10, MILLISECONDS), mock(Evaluator.class)) {
+            @Override
+            Hook buildFlagEvalLoggingHook() {
+                throw new NoClassDefFoundError("old bootstrap");
+            }
+        };
+
+        List<Hook> hooks = provider.getProviderHooks();
+
+        assertThat(hooks.size(), equalTo(1));
+        assertThat(hooks.get(0) instanceof FlagEvalMetricsHook, equalTo(true));
+    }
+
+    @Test
+    public void testClientEvaluationRoutesThroughFlagEvalLoggingHook() throws Exception {
+        FeatureFlaggingGateway.dispatch(mock(ServerConfiguration.class));
+        final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
+        FeatureFlaggingGateway.setFlagEvalWriter(capturingWriter(captured));
+        final Evaluator evaluator = mock(Evaluator.class);
+        when(evaluator.initialize(eq(10L), eq(SECONDS), any())).thenReturn(true);
+        when(evaluator.hasConfiguration()).thenReturn(true);
+        when(evaluator.evaluate(eq(String.class), eq("logged-flag"), eq("default"), any()))
+                .thenReturn(ProviderEvaluation.<String>builder()
+                        .value("value")
+                        .reason("STATIC")
+                        .variant("variant-1")
+                        .flagMetadata(ImmutableMetadata.builder()
+                                .addString("allocationKey", "allocation-1")
+                                .addLong("__dd_eval_timestamp_ms", 1_700_000_000_000L)
+                                .addBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA, true)
+                                .build())
+                        .build());
+        final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
+        api.setProviderAndWait(new Provider(new Options().initTimeout(10, SECONDS), evaluator));
+        final MutableContext context = new MutableContext("user-1");
+        context.add("region", "us-east-1");
+
+        final FlagEvaluationDetails<String> details =
+                api.getClient().getStringDetails("logged-flag", "default", context);
+
+        assertThat(details.getValue(), equalTo("value"));
+        final FlagEvalEvent event = captured.get();
+        assertThat(event.flagKey, equalTo("logged-flag"));
+        assertThat(event.variant, equalTo("variant-1"));
+        assertThat(event.allocationKey, equalTo("allocation-1"));
+        assertThat(event.targetingKey, equalTo("user-1"));
+        assertThat(event.evalTimeMs, equalTo(1_700_000_000_000L));
+        assertThat(event.attrs.get("region"), equalTo("us-east-1"));
+    }
+
+    @Test
+    public void testGetProviderHooksReturnsFlagEvalMetricsHookWithAndWithoutSpanEnrichment() {
+        final Evaluator evaluator = mock(Evaluator.class);
+        final Provider providerWithoutSpanEnrichment = new Provider(new Options(), evaluator, Boolean.FALSE);
+        final Provider providerWithSpanEnrichment = new Provider(new Options(), evaluator, Boolean.TRUE);
+
+        assertHasFlagEvalMetricsHook(providerWithoutSpanEnrichment);
+        assertHasFlagEvalMetricsHook(providerWithSpanEnrichment);
+    }
+
+    @Test
+    public void testShutdownCleansUpEvaluator() throws Exception {
+        final Evaluator evaluator = mock(Evaluator.class);
+        when(evaluator.initialize(eq(10L), eq(MILLISECONDS), any())).thenReturn(true);
+        when(evaluator.hasConfiguration()).thenReturn(true);
+        final Provider provider = new Provider(new Options().initTimeout(10, MILLISECONDS), evaluator, Boolean.FALSE);
+
+        provider.initialize(null);
+        provider.shutdown();
+
+        verify(evaluator).shutdown();
+        // After shutdown, getProviderHooks still returns a list with both OTel + logging hooks
+        assertThat(provider.getProviderHooks().size(), equalTo(2));
+    }
+
+    private static void assertHasFlagEvalMetricsHook(final Provider provider) {
+        assertTrue(
+                provider.getProviderHooks().stream().anyMatch(FlagEvalMetricsHook.class::isInstance),
+                "flag evaluation metrics hook should be registered");
+    }
+
+    public interface EvaluateMethod<E> {
+        FlagEvaluationDetails<E> evaluate(Features client, String flag, E defaultValue);
+    }
+
+    private static Arguments[] providerMethods() {
+        return new Arguments[] {
+            Arguments.of("bool", false, (EvaluateMethod<Boolean>) Features::getBooleanDetails),
+            Arguments.of("string", "Hello!", (EvaluateMethod<String>) Features::getStringDetails),
+            Arguments.of("int", 23, (EvaluateMethod<Integer>) Features::getIntegerDetails),
+            Arguments.of("double", 3.14D, (EvaluateMethod<Double>) Features::getDoubleDetails),
+            Arguments.of("object", new Value(), (EvaluateMethod<Value>) Features::getObjectDetails)
         };
+    }
+
+    @MethodSource("providerMethods")
+    @ParameterizedTest
+    public <E> void testProviderEvaluation(final String flag, final E defaultValue, final EvaluateMethod<E> method)
+            throws Exception {
+        FeatureFlaggingGateway.dispatch(mock(ServerConfiguration.class));
+        final Evaluator evaluator = mock(Evaluator.class);
+        when(evaluator.initialize(eq(10L), eq(SECONDS), any())).thenReturn(true);
+        when(evaluator.hasConfiguration()).thenReturn(true);
+        when(evaluator.evaluate(any(), any(), any(), any()))
+                .thenAnswer(invocation -> ProviderEvaluation.builder()
+                        .value(invocation.getArgument(2))
+                        .reason("MOCK")
+                        .build());
+        final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
+        api.setProviderAndWait(new Provider(new Options().initTimeout(10, SECONDS), evaluator));
+        final Client client = api.getClient();
+        final FlagEvaluationDetails<E> result = method.evaluate(client, flag, defaultValue);
+        assertThat(result.getValue(), equalTo(defaultValue));
+        assertThat(result.getReason(), equalTo("MOCK"));
+        verify(evaluator, times(1)).initialize(eq(10L), eq(SECONDS), any());
+        verify(evaluator, times(1)).evaluate(any(), eq(flag), eq(defaultValue), any(EvaluationContext.class));
+    }
+
+    private static String initializationState(final Provider provider) throws Exception {
+        final Field stateField = Provider.class.getDeclaredField("initializationState");
+        stateField.setAccessible(true);
+        final AtomicReference<?> state = (AtomicReference<?>) stateField.get(provider);
+        return state.get().toString();
+    }
 
-    List<Hook> hooks = provider.getProviderHooks();
-
-    assertThat(hooks.size(), equalTo(1));
-    assertThat(hooks.get(0) instanceof FlagEvalMetricsHook, equalTo(true));
-  }
-
-  @Test
-  public void testClientEvaluationRoutesThroughFlagEvalLoggingHook() throws Exception {
-    FeatureFlaggingGateway.dispatch(mock(ServerConfiguration.class));
-    final AtomicReference<FlagEvalEvent> captured = new AtomicReference<>();
-    FeatureFlaggingGateway.setFlagEvalWriter(capturingWriter(captured));
-    final Evaluator evaluator = mock(Evaluator.class);
-    when(evaluator.initialize(eq(10L), eq(SECONDS), any())).thenReturn(true);
-    when(evaluator.hasConfiguration()).thenReturn(true);
-    when(evaluator.evaluate(eq(String.class), eq("logged-flag"), eq("default"), any()))
-        .thenReturn(
-            ProviderEvaluation.<String>builder()
-                .value("value")
-                .reason("STATIC")
-                .variant("variant-1")
-                .flagMetadata(
-                    ImmutableMetadata.builder()
-                        .addString("allocationKey", "allocation-1")
-                        .addLong("__dd_eval_timestamp_ms", 1_700_000_000_000L)
-                        .addBoolean(DDEvaluator.METADATA_OBSERVE_FULL_EVALUATION_DATA, true)
-                        .build())
-                .build());
-    final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
-    api.setProviderAndWait(new Provider(new Options().initTimeout(10, SECONDS), evaluator));
-    final MutableContext context = new MutableContext("user-1");
-    context.add("region", "us-east-1");
-
-    final FlagEvaluationDetails<String> details =
-        api.getClient().getStringDetails("logged-flag", "default", context);
-
-    assertThat(details.getValue(), equalTo("value"));
-    final FlagEvalEvent event = captured.get();
-    assertThat(event.flagKey, equalTo("logged-flag"));
-    assertThat(event.variant, equalTo("variant-1"));
-    assertThat(event.allocationKey, equalTo("allocation-1"));
-    assertThat(event.targetingKey, equalTo("user-1"));
-    assertThat(event.evalTimeMs, equalTo(1_700_000_000_000L));
-    assertThat(event.attrs.get("region"), equalTo("us-east-1"));
-  }
-
-  @Test
-  public void testGetProviderHooksReturnsFlagEvalMetricsHookWithAndWithoutSpanEnrichment() {
-    final Evaluator evaluator = mock(Evaluator.class);
-    final Provider providerWithoutSpanEnrichment =
-        new Provider(new Options(), evaluator, Boolean.FALSE);
-    final Provider providerWithSpanEnrichment =
-        new Provider(new Options(), evaluator, Boolean.TRUE);
-
-    assertHasFlagEvalMetricsHook(providerWithoutSpanEnrichment);
-    assertHasFlagEvalMetricsHook(providerWithSpanEnrichment);
-  }
-
-  @Test
-  public void testShutdownCleansUpEvaluator() throws Exception {
-    final Evaluator evaluator = mock(Evaluator.class);
-    when(evaluator.initialize(eq(10L), eq(MILLISECONDS), any())).thenReturn(true);
-    when(evaluator.hasConfiguration()).thenReturn(true);
-    final Provider provider =
-        new Provider(new Options().initTimeout(10, MILLISECONDS), evaluator, Boolean.FALSE);
-
-    provider.initialize(null);
-    provider.shutdown();
-
-    verify(evaluator).shutdown();
-    // After shutdown, getProviderHooks still returns a list with both OTel + logging hooks
-    assertThat(provider.getProviderHooks().size(), equalTo(2));
-  }
-
-  private static void assertHasFlagEvalMetricsHook(final Provider provider) {
-    assertTrue(
-        provider.getProviderHooks().stream().anyMatch(FlagEvalMetricsHook.class::isInstance),
-        "flag evaluation metrics hook should be registered");
-  }
-
-  public interface EvaluateMethod<E> {
-    FlagEvaluationDetails<E> evaluate(Features client, String flag, E defaultValue);
-  }
-
-  private static Arguments[] providerMethods() {
-    return new Arguments[] {
-      Arguments.of("bool", false, (EvaluateMethod<Boolean>) Features::getBooleanDetails),
-      Arguments.of("string", "Hello!", (EvaluateMethod<String>) Features::getStringDetails),
-      Arguments.of("int", 23, (EvaluateMethod<Integer>) Features::getIntegerDetails),
-      Arguments.of("double", 3.14D, (EvaluateMethod<Double>) Features::getDoubleDetails),
-      Arguments.of("object", new Value(), (EvaluateMethod<Value>) Features::getObjectDetails)
-    };
-  }
-
-  @MethodSource("providerMethods")
-  @ParameterizedTest
-  public <E> void testProviderEvaluation(
-      final String flag, final E defaultValue, final EvaluateMethod<E> method) throws Exception {
-    FeatureFlaggingGateway.dispatch(mock(ServerConfiguration.class));
-    final Evaluator evaluator = mock(Evaluator.class);
-    when(evaluator.initialize(eq(10L), eq(SECONDS), any())).thenReturn(true);
-    when(evaluator.hasConfiguration()).thenReturn(true);
-    when(evaluator.evaluate(any(), any(), any(), any()))
-        .thenAnswer(
-            invocation ->
-                ProviderEvaluation.builder()
-                    .value(invocation.getArgument(2))
-                    .reason("MOCK")
-                    .build());
-    final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
-    api.setProviderAndWait(new Provider(new Options().initTimeout(10, SECONDS), evaluator));
-    final Client client = api.getClient();
-    final FlagEvaluationDetails<E> result = method.evaluate(client, flag, defaultValue);
-    assertThat(result.getValue(), equalTo(defaultValue));
-    assertThat(result.getReason(), equalTo("MOCK"));
-    verify(evaluator, times(1)).initialize(eq(10L), eq(SECONDS), any());
-    verify(evaluator, times(1))
-        .evaluate(any(), eq(flag), eq(defaultValue), any(EvaluationContext.class));
-  }
-
-  private static String initializationState(final Provider provider) throws Exception {
-    final Field stateField = Provider.class.getDeclaredField("initializationState");
-    stateField.setAccessible(true);
-    final AtomicReference<?> state = (AtomicReference<?>) stateField.get(provider);
-    return state.get().toString();
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Consumer<EventDetails> completingHandler(
-      final CompletableFuture<EventDetails> event) {
-    final Consumer<EventDetails> handler = mock(Consumer.class);
-    doAnswer(
-            invocation -> {
-              event.complete(invocation.getArgument(0));
-              return null;
-            })
-        .when(handler)
-        .accept(any());
-    return handler;
-  }
-
-  private static FlagEvaluationWriter capturingWriter(final AtomicReference<FlagEvalEvent> ref) {
-    return new FlagEvaluationWriter() {
-      @Override
-      public void enqueue(final FlagEvalEvent event) {
-        ref.set(event);
-      }
-
-      @Override
-      public boolean hasCapacityForEnqueue() {
-        return true;
-      }
-
-      @Override
-      public void countPreQueueOverflow() {}
-
-      @Override
-      public void countContextTruncated(final String reason) {}
-
-      @Override
-      public void start() {}
-
-      @Override
-      public void close() {}
-    };
-  }
+    @SuppressWarnings("unchecked")
+    private static Consumer<EventDetails> completingHandler(final CompletableFuture<EventDetails> event) {
+        final Consumer<EventDetails> handler = mock(Consumer.class);
+        doAnswer(invocation -> {
+                    event.complete(invocation.getArgument(0));
+                    return null;
+                })
+                .when(handler)
+                .accept(any());
+        return handler;
+    }
+
+    private static FlagEvaluationWriter capturingWriter(final AtomicReference<FlagEvalEvent> ref) {
+        return new FlagEvaluationWriter() {
+            @Override
+            public void enqueue(final FlagEvalEvent event) {
+                ref.set(event);
+            }
+
+            @Override
+            public boolean hasCapacityForEnqueue() {
+                return true;
+            }
+
+            @Override
+            public void countPreQueueOverflow() {}
+
+            @Override
+            public void countContextTruncated(final String reason) {}
+
+            @Override
+            public void start() {}
+
+            @Override
+            public void close() {}
+        };
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/SpanEnrichmentHookTest.java b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/SpanEnrichmentHookTest.java
index 2ce0931e116..f11e1989d50 100644
--- a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/SpanEnrichmentHookTest.java
+++ b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/SpanEnrichmentHookTest.java
@@ -34,208 +34,203 @@
  */
 class SpanEnrichmentHookTest {
 
-  private final List<SpanEnrichmentEvent> captured = new ArrayList<>();
-  private final FeatureFlaggingGateway.SpanEnrichmentListener listener = captured::add;
-
-  @BeforeEach
-  void register() {
-    FeatureFlaggingGateway.addSpanEnrichmentListener(listener);
-  }
-
-  @AfterEach
-  void deregister() {
-    FeatureFlaggingGateway.removeSpanEnrichmentListener(listener);
-  }
-
-  // ---- helpers ----
-
-  private static FlagEvaluationDetails<Object> details(
-      final String flagKey,
-      final String variant,
-      final Object value,
-      final ImmutableMetadata metadata) {
-    return FlagEvaluationDetails.builder()
-        .flagKey(flagKey)
-        .variant(variant)
-        .value(value)
-        .flagMetadata(metadata)
-        .build();
-  }
-
-  private static ImmutableMetadata metadata(final Integer serialId, final boolean doLog) {
-    final ImmutableMetadata.ImmutableMetadataBuilder builder = ImmutableMetadata.builder();
-    if (serialId != null) {
-      builder.addInteger(SpanEnrichmentHook.METADATA_SERIAL_ID, serialId);
-    }
-    builder.addBoolean(SpanEnrichmentHook.METADATA_DO_LOG, doLog);
-    return builder.build();
-  }
-
-  private static HookContext<Object> ctx(final String flagKey, final String targetingKey) {
-    return HookContext.from(
-        flagKey,
-        FlagValueType.STRING,
-        null,
-        null,
-        targetingKey == null ? new ImmutableContext() : new ImmutableContext(targetingKey),
-        "default");
-  }
-
-  // ---- serial-id branch ----
-
-  @Test
-  void serialIdWithDoLogDispatchesSerialAndSubject() {
-    new SpanEnrichmentHook()
-        .finallyAfter(
-            ctx("flag", "user-1"),
-            details("flag", "on", "v", metadata(42, true)),
-            Collections.emptyMap());
-
-    assertEquals(1, captured.size());
-    final SpanEnrichmentEvent event = captured.get(0);
-    assertTrue(event.hasSerialId());
-    assertEquals(42, event.serialId());
-    assertTrue(event.doLog());
-    assertEquals("user-1", event.targetingKey());
-  }
-
-  @Test
-  void serialIdWithoutDoLogStillDispatchesSerialButNotDoLog() {
-    new SpanEnrichmentHook()
-        .finallyAfter(
-            ctx("flag", "user-1"),
-            details("flag", "on", "v", metadata(7, false)),
-            Collections.emptyMap());
-
-    assertEquals(1, captured.size());
-    final SpanEnrichmentEvent event = captured.get(0);
-    assertTrue(event.hasSerialId());
-    assertEquals(7, event.serialId());
-    assertFalse(
-        event.doLog(), "doLog=false must be carried through so the write side skips subject");
-  }
-
-  @Test
-  void wrongTypedSerialIdDispatchesNothing() {
-    // Defensive: a non-integer value under the serial-id key (wrong type) is ignored, not crashed.
-    final ImmutableMetadata bad =
-        ImmutableMetadata.builder()
-            .addString(SpanEnrichmentHook.METADATA_SERIAL_ID, "not-a-number")
-            .addBoolean(SpanEnrichmentHook.METADATA_DO_LOG, true)
-            .build();
-    new SpanEnrichmentHook()
-        .finallyAfter(
-            ctx("flag", "user-1"), details("flag", "on", "v", bad), Collections.emptyMap());
-    assertTrue(captured.isEmpty(), "a wrong-typed serial id must never break eval or dispatch");
-  }
-
-  // ---- runtime-default branch (missing variant) ----
-
-  @Test
-  void missingVariantDispatchesRuntimeDefaultWithNativeMap() {
-    final Map<String, Object> objectValue = Collections.singletonMap("k", "val");
-    new SpanEnrichmentHook()
-        .finallyAfter(
-            ctx("obj-flag", "user-1"),
-            details("obj-flag", null, objectValue, ImmutableMetadata.builder().build()),
-            Collections.emptyMap());
-
-    assertEquals(1, captured.size());
-    final SpanEnrichmentEvent event = captured.get(0);
-    assertFalse(event.hasSerialId());
-    assertEquals("obj-flag", event.flagKey());
-    assertEquals(
-        objectValue, event.defaultValue(), "a native map default passes through unchanged");
-  }
-
-  @Test
-  void missingVariantUnwrapsOpenFeatureValueStructureToNativeMap() {
-    final Map<String, Value> inner = new LinkedHashMap<>();
-    inner.put("enabled", new Value(true));
-    final Value structureDefault = new Value(new ImmutableStructure(inner));
-
-    new SpanEnrichmentHook()
-        .finallyAfter(
-            ctx("struct-flag", "user-1"),
-            details("struct-flag", null, structureDefault, ImmutableMetadata.builder().build()),
-            Collections.emptyMap());
-
-    assertEquals(1, captured.size());
-    final Object value = captured.get(0).defaultValue();
-    // Crucially a native Map, NOT an OpenFeature Value — the seam carries only JDK types.
-    final Map<?, ?> asMap = assertInstanceOf(Map.class, value);
-    assertEquals(Boolean.TRUE, asMap.get("enabled"));
-  }
-
-  // ---- unwrapDefaultValue (the Value -> native conversion) ----
-
-  @Test
-  void unwrapConvertsValueScalarsToNative() {
-    assertEquals("hello", SpanEnrichmentHook.unwrapDefaultValue(new Value("hello")));
-    assertEquals(Boolean.TRUE, SpanEnrichmentHook.unwrapDefaultValue(new Value(true)));
-    assertEquals(7, SpanEnrichmentHook.unwrapDefaultValue(new Value(7)));
-    assertNull(SpanEnrichmentHook.unwrapDefaultValue(new Value()));
-  }
-
-  @Test
-  void unwrapConvertsValueListToNativeList() {
-    final Value listDefault =
-        new Value(Arrays.asList(new Value("a"), new Value(2), new Value(true)));
-    final Object out = SpanEnrichmentHook.unwrapDefaultValue(listDefault);
-    assertEquals(Arrays.asList("a", 2, Boolean.TRUE), out);
-  }
-
-  @Test
-  void unwrapPassesNativeValuesThrough() {
-    final Map<String, Object> native0 = Collections.singletonMap("a", "b");
-    assertEquals(native0, SpanEnrichmentHook.unwrapDefaultValue(native0));
-    assertEquals("plain", SpanEnrichmentHook.unwrapDefaultValue("plain"));
-    assertNull(SpanEnrichmentHook.unwrapDefaultValue(null));
-  }
-
-  // ---- error isolation ----
-
-  @Test
-  void nullDetailsDispatchesNothing() {
-    new SpanEnrichmentHook().finallyAfter(null, null, null);
-    assertTrue(captured.isEmpty());
-  }
-
-  // ---- Provider gating ----
-
-  @Test
-  void gateOffConstructsNoHook() {
-    final Provider provider = new Provider(new Provider.Options(), null, Boolean.FALSE);
-    assertNull(provider.spanEnrichmentHook(), "gate off => no span-enrichment hook");
-    for (final Hook hook : provider.getProviderHooks()) {
-      assertFalse(
-          hook instanceof SpanEnrichmentHook, "gate off => SpanEnrichmentHook never registered");
-    }
-  }
-
-  @Test
-  void gateOnConstructsHookAndRegistersItInProviderHooks() {
-    final Provider provider = new Provider(new Provider.Options(), null, Boolean.TRUE);
-    assertTrue(provider.spanEnrichmentHook() != null, "gate on => hook constructed");
-    boolean registered = false;
-    for (final Hook hook : provider.getProviderHooks()) {
-      if (hook instanceof SpanEnrichmentHook) {
-        registered = true;
-      }
-    }
-    assertTrue(registered, "gate on => SpanEnrichmentHook registered in getProviderHooks");
-  }
-
-  @Test
-  void getProviderHooksReturnsSameInstanceEachCall() {
-    final Provider gateOff = new Provider(new Provider.Options(), null, Boolean.FALSE);
-    assertTrue(
-        gateOff.getProviderHooks() == gateOff.getProviderHooks(),
-        "gate off => getProviderHooks allocates nothing (same instance)");
-
-    final Provider gateOn = new Provider(new Provider.Options(), null, Boolean.TRUE);
-    assertTrue(
-        gateOn.getProviderHooks() == gateOn.getProviderHooks(),
-        "gate on => getProviderHooks allocates nothing (same instance)");
-  }
+    private final List<SpanEnrichmentEvent> captured = new ArrayList<>();
+    private final FeatureFlaggingGateway.SpanEnrichmentListener listener = captured::add;
+
+    @BeforeEach
+    void register() {
+        FeatureFlaggingGateway.addSpanEnrichmentListener(listener);
+    }
+
+    @AfterEach
+    void deregister() {
+        FeatureFlaggingGateway.removeSpanEnrichmentListener(listener);
+    }
+
+    // ---- helpers ----
+
+    private static FlagEvaluationDetails<Object> details(
+            final String flagKey, final String variant, final Object value, final ImmutableMetadata metadata) {
+        return FlagEvaluationDetails.builder()
+                .flagKey(flagKey)
+                .variant(variant)
+                .value(value)
+                .flagMetadata(metadata)
+                .build();
+    }
+
+    private static ImmutableMetadata metadata(final Integer serialId, final boolean doLog) {
+        final ImmutableMetadata.ImmutableMetadataBuilder builder = ImmutableMetadata.builder();
+        if (serialId != null) {
+            builder.addInteger(SpanEnrichmentHook.METADATA_SERIAL_ID, serialId);
+        }
+        builder.addBoolean(SpanEnrichmentHook.METADATA_DO_LOG, doLog);
+        return builder.build();
+    }
+
+    private static HookContext<Object> ctx(final String flagKey, final String targetingKey) {
+        return HookContext.from(
+                flagKey,
+                FlagValueType.STRING,
+                null,
+                null,
+                targetingKey == null ? new ImmutableContext() : new ImmutableContext(targetingKey),
+                "default");
+    }
+
+    // ---- serial-id branch ----
+
+    @Test
+    void serialIdWithDoLogDispatchesSerialAndSubject() {
+        new SpanEnrichmentHook()
+                .finallyAfter(
+                        ctx("flag", "user-1"), details("flag", "on", "v", metadata(42, true)), Collections.emptyMap());
+
+        assertEquals(1, captured.size());
+        final SpanEnrichmentEvent event = captured.get(0);
+        assertTrue(event.hasSerialId());
+        assertEquals(42, event.serialId());
+        assertTrue(event.doLog());
+        assertEquals("user-1", event.targetingKey());
+    }
+
+    @Test
+    void serialIdWithoutDoLogStillDispatchesSerialButNotDoLog() {
+        new SpanEnrichmentHook()
+                .finallyAfter(
+                        ctx("flag", "user-1"), details("flag", "on", "v", metadata(7, false)), Collections.emptyMap());
+
+        assertEquals(1, captured.size());
+        final SpanEnrichmentEvent event = captured.get(0);
+        assertTrue(event.hasSerialId());
+        assertEquals(7, event.serialId());
+        assertFalse(event.doLog(), "doLog=false must be carried through so the write side skips subject");
+    }
+
+    @Test
+    void wrongTypedSerialIdDispatchesNothing() {
+        // Defensive: a non-integer value under the serial-id key (wrong type) is ignored, not crashed.
+        final ImmutableMetadata bad = ImmutableMetadata.builder()
+                .addString(SpanEnrichmentHook.METADATA_SERIAL_ID, "not-a-number")
+                .addBoolean(SpanEnrichmentHook.METADATA_DO_LOG, true)
+                .build();
+        new SpanEnrichmentHook()
+                .finallyAfter(ctx("flag", "user-1"), details("flag", "on", "v", bad), Collections.emptyMap());
+        assertTrue(captured.isEmpty(), "a wrong-typed serial id must never break eval or dispatch");
+    }
+
+    // ---- runtime-default branch (missing variant) ----
+
+    @Test
+    void missingVariantDispatchesRuntimeDefaultWithNativeMap() {
+        final Map<String, Object> objectValue = Collections.singletonMap("k", "val");
+        new SpanEnrichmentHook()
+                .finallyAfter(
+                        ctx("obj-flag", "user-1"),
+                        details(
+                                "obj-flag",
+                                null,
+                                objectValue,
+                                ImmutableMetadata.builder().build()),
+                        Collections.emptyMap());
+
+        assertEquals(1, captured.size());
+        final SpanEnrichmentEvent event = captured.get(0);
+        assertFalse(event.hasSerialId());
+        assertEquals("obj-flag", event.flagKey());
+        assertEquals(objectValue, event.defaultValue(), "a native map default passes through unchanged");
+    }
+
+    @Test
+    void missingVariantUnwrapsOpenFeatureValueStructureToNativeMap() {
+        final Map<String, Value> inner = new LinkedHashMap<>();
+        inner.put("enabled", new Value(true));
+        final Value structureDefault = new Value(new ImmutableStructure(inner));
+
+        new SpanEnrichmentHook()
+                .finallyAfter(
+                        ctx("struct-flag", "user-1"),
+                        details(
+                                "struct-flag",
+                                null,
+                                structureDefault,
+                                ImmutableMetadata.builder().build()),
+                        Collections.emptyMap());
+
+        assertEquals(1, captured.size());
+        final Object value = captured.get(0).defaultValue();
+        // Crucially a native Map, NOT an OpenFeature Value — the seam carries only JDK types.
+        final Map<?, ?> asMap = assertInstanceOf(Map.class, value);
+        assertEquals(Boolean.TRUE, asMap.get("enabled"));
+    }
+
+    // ---- unwrapDefaultValue (the Value -> native conversion) ----
+
+    @Test
+    void unwrapConvertsValueScalarsToNative() {
+        assertEquals("hello", SpanEnrichmentHook.unwrapDefaultValue(new Value("hello")));
+        assertEquals(Boolean.TRUE, SpanEnrichmentHook.unwrapDefaultValue(new Value(true)));
+        assertEquals(7, SpanEnrichmentHook.unwrapDefaultValue(new Value(7)));
+        assertNull(SpanEnrichmentHook.unwrapDefaultValue(new Value()));
+    }
+
+    @Test
+    void unwrapConvertsValueListToNativeList() {
+        final Value listDefault = new Value(Arrays.asList(new Value("a"), new Value(2), new Value(true)));
+        final Object out = SpanEnrichmentHook.unwrapDefaultValue(listDefault);
+        assertEquals(Arrays.asList("a", 2, Boolean.TRUE), out);
+    }
+
+    @Test
+    void unwrapPassesNativeValuesThrough() {
+        final Map<String, Object> native0 = Collections.singletonMap("a", "b");
+        assertEquals(native0, SpanEnrichmentHook.unwrapDefaultValue(native0));
+        assertEquals("plain", SpanEnrichmentHook.unwrapDefaultValue("plain"));
+        assertNull(SpanEnrichmentHook.unwrapDefaultValue(null));
+    }
+
+    // ---- error isolation ----
+
+    @Test
+    void nullDetailsDispatchesNothing() {
+        new SpanEnrichmentHook().finallyAfter(null, null, null);
+        assertTrue(captured.isEmpty());
+    }
+
+    // ---- Provider gating ----
+
+    @Test
+    void gateOffConstructsNoHook() {
+        final Provider provider = new Provider(new Provider.Options(), null, Boolean.FALSE);
+        assertNull(provider.spanEnrichmentHook(), "gate off => no span-enrichment hook");
+        for (final Hook hook : provider.getProviderHooks()) {
+            assertFalse(hook instanceof SpanEnrichmentHook, "gate off => SpanEnrichmentHook never registered");
+        }
+    }
+
+    @Test
+    void gateOnConstructsHookAndRegistersItInProviderHooks() {
+        final Provider provider = new Provider(new Provider.Options(), null, Boolean.TRUE);
+        assertTrue(provider.spanEnrichmentHook() != null, "gate on => hook constructed");
+        boolean registered = false;
+        for (final Hook hook : provider.getProviderHooks()) {
+            if (hook instanceof SpanEnrichmentHook) {
+                registered = true;
+            }
+        }
+        assertTrue(registered, "gate on => SpanEnrichmentHook registered in getProviderHooks");
+    }
+
+    @Test
+    void getProviderHooksReturnsSameInstanceEachCall() {
+        final Provider gateOff = new Provider(new Provider.Options(), null, Boolean.FALSE);
+        assertTrue(
+                gateOff.getProviderHooks() == gateOff.getProviderHooks(),
+                "gate off => getProviderHooks allocates nothing (same instance)");
+
+        final Provider gateOn = new Provider(new Provider.Options(), null, Boolean.TRUE);
+        assertTrue(
+                gateOn.getProviderHooks() == gateOn.getProviderHooks(),
+                "gate on => getProviderHooks allocates nothing (same instance)");
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/FeatureFlaggingGateway.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/FeatureFlaggingGateway.java
index 2a823bd32ef..9c34979af54 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/FeatureFlaggingGateway.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/FeatureFlaggingGateway.java
@@ -10,122 +10,119 @@
 
 public abstract class FeatureFlaggingGateway {
 
-  public interface ConfigListener extends Consumer<ServerConfiguration> {}
-
-  public interface ActivationListener {
-    void activate();
-  }
-
-  public interface ExposureListener extends Consumer<ExposureEvent> {}
-
-  public interface SpanEnrichmentListener extends Consumer<SpanEnrichmentEvent> {}
-
-  private static final List<ConfigListener> CONFIG_LISTENERS = new CopyOnWriteArrayList<>();
-  private static final List<ActivationListener> ACTIVATION_LISTENERS = new CopyOnWriteArrayList<>();
-  private static final List<ExposureListener> EXPOSURE_LISTENERS = new CopyOnWriteArrayList<>();
-  private static final List<SpanEnrichmentListener> SPAN_ENRICHMENT_LISTENERS =
-      new CopyOnWriteArrayList<>();
-
-  private static final AtomicReference<ServerConfiguration> CURRENT_CONFIG =
-      new AtomicReference<>();
-
-  /**
-   * The active EVP flagevaluation writer. Registered by {@code FlagEvaluationWriterImpl.start()}
-   * when the killswitch {@code DD_FLAGGING_EVALUATION_COUNTS_ENABLED} is on (default). Read by
-   * {@code FlagEvalLoggingHook} to route evaluations into the two-tier aggregator. {@code null}
-   * when the EVP path is disabled.
-   */
-  private static final AtomicReference<FlagEvaluationWriter> FLAG_EVAL_WRITER =
-      new AtomicReference<>();
-
-  private static volatile boolean flagEvalEnqueueEnabled = true;
-
-  private FeatureFlaggingGateway() {}
-
-  public static void addConfigListener(final ConfigListener listener) {
-    CONFIG_LISTENERS.add(listener);
-    final ServerConfiguration current = CURRENT_CONFIG.get();
-    if (current != null) {
-      listener.accept(current);
-    }
-  }
-
-  public static void removeConfigListener(final ConfigListener listener) {
-    CONFIG_LISTENERS.remove(listener);
-  }
-
-  public static void dispatch(final ServerConfiguration config) {
-    CURRENT_CONFIG.set(config);
-    CONFIG_LISTENERS.forEach(listener -> listener.accept(config));
-  }
-
-  public static void addActivationListener(final ActivationListener listener) {
-    ACTIVATION_LISTENERS.add(listener);
-  }
-
-  public static void removeActivationListener(final ActivationListener listener) {
-    ACTIVATION_LISTENERS.remove(listener);
-  }
-
-  /** Signals that application code initialized the Datadog OpenFeature provider. */
-  public static void activate() {
-    ACTIVATION_LISTENERS.forEach(ActivationListener::activate);
-  }
-
-  public static void addExposureListener(final ExposureListener listener) {
-    EXPOSURE_LISTENERS.add(listener);
-  }
-
-  public static void removeExposureListener(final ExposureListener listener) {
-    EXPOSURE_LISTENERS.remove(listener);
-  }
-
-  public static void dispatch(final ExposureEvent event) {
-    EXPOSURE_LISTENERS.forEach(listener -> listener.accept(event));
-  }
-
-  /**
-   * Registers the active EVP flagevaluation writer. Called by {@code
-   * FlagEvaluationWriterImpl.start()} when the feature is enabled. Replaces any previously
-   * registered writer.
-   *
-   * @param writer the writer to register, or {@code null} to deregister
-   */
-  public static void setFlagEvalWriter(final FlagEvaluationWriter writer) {
-    FLAG_EVAL_WRITER.set(writer);
-  }
-
-  /**
-   * Enables or disables enqueueing EVP flagevaluation events on the OpenFeature hook path. This is
-   * populated from {@code DD_FLAGGING_EVALUATION_COUNTS_ENABLED} at feature-flagging startup and
-   * cleared during shutdown before the writer drains.
-   */
-  public static void setFlagEvaluationEnqueueEnabled(final boolean enabled) {
-    flagEvalEnqueueEnabled = enabled;
-  }
-
-  /**
-   * Returns the active EVP flagevaluation writer, or {@code null} when disabled (killswitch off or
-   * not yet started).
-   */
-  public static FlagEvaluationWriter getFlagEvalWriter() {
-    return FLAG_EVAL_WRITER.get();
-  }
-
-  /** Returns whether EVP flagevaluation hook events may be enqueued. */
-  public static boolean isFlagEvaluationEnqueueEnabled() {
-    return flagEvalEnqueueEnabled;
-  }
-
-  public static void addSpanEnrichmentListener(final SpanEnrichmentListener listener) {
-    SPAN_ENRICHMENT_LISTENERS.add(listener);
-  }
-
-  public static void removeSpanEnrichmentListener(final SpanEnrichmentListener listener) {
-    SPAN_ENRICHMENT_LISTENERS.remove(listener);
-  }
-
-  public static void dispatch(final SpanEnrichmentEvent event) {
-    SPAN_ENRICHMENT_LISTENERS.forEach(listener -> listener.accept(event));
-  }
+    public interface ConfigListener extends Consumer<ServerConfiguration> {}
+
+    public interface ActivationListener {
+        void activate();
+    }
+
+    public interface ExposureListener extends Consumer<ExposureEvent> {}
+
+    public interface SpanEnrichmentListener extends Consumer<SpanEnrichmentEvent> {}
+
+    private static final List<ConfigListener> CONFIG_LISTENERS = new CopyOnWriteArrayList<>();
+    private static final List<ActivationListener> ACTIVATION_LISTENERS = new CopyOnWriteArrayList<>();
+    private static final List<ExposureListener> EXPOSURE_LISTENERS = new CopyOnWriteArrayList<>();
+    private static final List<SpanEnrichmentListener> SPAN_ENRICHMENT_LISTENERS = new CopyOnWriteArrayList<>();
+
+    private static final AtomicReference<ServerConfiguration> CURRENT_CONFIG = new AtomicReference<>();
+
+    /**
+     * The active EVP flagevaluation writer. Registered by {@code FlagEvaluationWriterImpl.start()}
+     * when the killswitch {@code DD_FLAGGING_EVALUATION_COUNTS_ENABLED} is on (default). Read by
+     * {@code FlagEvalLoggingHook} to route evaluations into the two-tier aggregator. {@code null}
+     * when the EVP path is disabled.
+     */
+    private static final AtomicReference<FlagEvaluationWriter> FLAG_EVAL_WRITER = new AtomicReference<>();
+
+    private static volatile boolean flagEvalEnqueueEnabled = true;
+
+    private FeatureFlaggingGateway() {}
+
+    public static void addConfigListener(final ConfigListener listener) {
+        CONFIG_LISTENERS.add(listener);
+        final ServerConfiguration current = CURRENT_CONFIG.get();
+        if (current != null) {
+            listener.accept(current);
+        }
+    }
+
+    public static void removeConfigListener(final ConfigListener listener) {
+        CONFIG_LISTENERS.remove(listener);
+    }
+
+    public static void dispatch(final ServerConfiguration config) {
+        CURRENT_CONFIG.set(config);
+        CONFIG_LISTENERS.forEach(listener -> listener.accept(config));
+    }
+
+    public static void addActivationListener(final ActivationListener listener) {
+        ACTIVATION_LISTENERS.add(listener);
+    }
+
+    public static void removeActivationListener(final ActivationListener listener) {
+        ACTIVATION_LISTENERS.remove(listener);
+    }
+
+    /** Signals that application code initialized the Datadog OpenFeature provider. */
+    public static void activate() {
+        ACTIVATION_LISTENERS.forEach(ActivationListener::activate);
+    }
+
+    public static void addExposureListener(final ExposureListener listener) {
+        EXPOSURE_LISTENERS.add(listener);
+    }
+
+    public static void removeExposureListener(final ExposureListener listener) {
+        EXPOSURE_LISTENERS.remove(listener);
+    }
+
+    public static void dispatch(final ExposureEvent event) {
+        EXPOSURE_LISTENERS.forEach(listener -> listener.accept(event));
+    }
+
+    /**
+     * Registers the active EVP flagevaluation writer. Called by {@code
+     * FlagEvaluationWriterImpl.start()} when the feature is enabled. Replaces any previously
+     * registered writer.
+     *
+     * @param writer the writer to register, or {@code null} to deregister
+     */
+    public static void setFlagEvalWriter(final FlagEvaluationWriter writer) {
+        FLAG_EVAL_WRITER.set(writer);
+    }
+
+    /**
+     * Enables or disables enqueueing EVP flagevaluation events on the OpenFeature hook path. This is
+     * populated from {@code DD_FLAGGING_EVALUATION_COUNTS_ENABLED} at feature-flagging startup and
+     * cleared during shutdown before the writer drains.
+     */
+    public static void setFlagEvaluationEnqueueEnabled(final boolean enabled) {
+        flagEvalEnqueueEnabled = enabled;
+    }
+
+    /**
+     * Returns the active EVP flagevaluation writer, or {@code null} when disabled (killswitch off or
+     * not yet started).
+     */
+    public static FlagEvaluationWriter getFlagEvalWriter() {
+        return FLAG_EVAL_WRITER.get();
+    }
+
+    /** Returns whether EVP flagevaluation hook events may be enqueued. */
+    public static boolean isFlagEvaluationEnqueueEnabled() {
+        return flagEvalEnqueueEnabled;
+    }
+
+    public static void addSpanEnrichmentListener(final SpanEnrichmentListener listener) {
+        SPAN_ENRICHMENT_LISTENERS.add(listener);
+    }
+
+    public static void removeSpanEnrichmentListener(final SpanEnrichmentListener listener) {
+        SPAN_ENRICHMENT_LISTENERS.remove(listener);
+    }
+
+    public static void dispatch(final SpanEnrichmentEvent event) {
+        SPAN_ENRICHMENT_LISTENERS.forEach(listener -> listener.accept(event));
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/SpanEnrichmentEvent.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/SpanEnrichmentEvent.java
index a7518c71743..325744cb2fb 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/SpanEnrichmentEvent.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/SpanEnrichmentEvent.java
@@ -19,64 +19,63 @@
  */
 public final class SpanEnrichmentEvent {
 
-  private final boolean serialIdPresent;
-  private final int serialId;
-  private final boolean doLog;
-  private final String targetingKey;
-  private final String flagKey;
-  private final Object defaultValue;
+    private final boolean serialIdPresent;
+    private final int serialId;
+    private final boolean doLog;
+    private final String targetingKey;
+    private final String flagKey;
+    private final Object defaultValue;
 
-  private SpanEnrichmentEvent(
-      final boolean serialIdPresent,
-      final int serialId,
-      final boolean doLog,
-      final String targetingKey,
-      final String flagKey,
-      final Object defaultValue) {
-    this.serialIdPresent = serialIdPresent;
-    this.serialId = serialId;
-    this.doLog = doLog;
-    this.targetingKey = targetingKey;
-    this.flagKey = flagKey;
-    this.defaultValue = defaultValue;
-  }
+    private SpanEnrichmentEvent(
+            final boolean serialIdPresent,
+            final int serialId,
+            final boolean doLog,
+            final String targetingKey,
+            final String flagKey,
+            final Object defaultValue) {
+        this.serialIdPresent = serialIdPresent;
+        this.serialId = serialId;
+        this.doLog = doLog;
+        this.targetingKey = targetingKey;
+        this.flagKey = flagKey;
+        this.defaultValue = defaultValue;
+    }
 
-  /** A UFC split evaluation carrying a serial id (and, when {@code doLog}, a subject). */
-  public static SpanEnrichmentEvent serialId(
-      final int serialId, final boolean doLog, final String targetingKey) {
-    return new SpanEnrichmentEvent(true, serialId, doLog, targetingKey, null, null);
-  }
+    /** A UFC split evaluation carrying a serial id (and, when {@code doLog}, a subject). */
+    public static SpanEnrichmentEvent serialId(final int serialId, final boolean doLog, final String targetingKey) {
+        return new SpanEnrichmentEvent(true, serialId, doLog, targetingKey, null, null);
+    }
 
-  /**
-   * A runtime-default evaluation (missing variant). {@code value} must already be unwrapped to a
-   * native Java type (Map/List/scalar/null) by the caller.
-   */
-  public static SpanEnrichmentEvent runtimeDefault(final String flagKey, final Object value) {
-    return new SpanEnrichmentEvent(false, 0, false, null, flagKey, value);
-  }
+    /**
+     * A runtime-default evaluation (missing variant). {@code value} must already be unwrapped to a
+     * native Java type (Map/List/scalar/null) by the caller.
+     */
+    public static SpanEnrichmentEvent runtimeDefault(final String flagKey, final Object value) {
+        return new SpanEnrichmentEvent(false, 0, false, null, flagKey, value);
+    }
 
-  /** True for the serial-id shape; false for the runtime-default shape. */
-  public boolean hasSerialId() {
-    return serialIdPresent;
-  }
+    /** True for the serial-id shape; false for the runtime-default shape. */
+    public boolean hasSerialId() {
+        return serialIdPresent;
+    }
 
-  public int serialId() {
-    return serialId;
-  }
+    public int serialId() {
+        return serialId;
+    }
 
-  public boolean doLog() {
-    return doLog;
-  }
+    public boolean doLog() {
+        return doLog;
+    }
 
-  public String targetingKey() {
-    return targetingKey;
-  }
+    public String targetingKey() {
+        return targetingKey;
+    }
 
-  public String flagKey() {
-    return flagKey;
-  }
+    public String flagKey() {
+        return flagKey;
+    }
 
-  public Object defaultValue() {
-    return defaultValue;
-  }
+    public Object defaultValue() {
+        return defaultValue;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/Allocation.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/Allocation.java
index 53df4b4b512..e3504f44117 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/Allocation.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/Allocation.java
@@ -1,9 +1,9 @@
 package datadog.trace.api.featureflag.exposure;
 
 public class Allocation {
-  public final String key;
+    public final String key;
 
-  public Allocation(final String key) {
-    this.key = key;
-  }
+    public Allocation(final String key) {
+        this.key = key;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/ExposureEvent.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/ExposureEvent.java
index 4101b767760..f4b56561a2e 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/ExposureEvent.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/ExposureEvent.java
@@ -1,36 +1,36 @@
 package datadog.trace.api.featureflag.exposure;
 
 public class ExposureEvent {
-  // milliseconds since epoch as given by System.currentTimeMillis()
-  public final long timestamp;
-  public final Allocation allocation;
-  public final Flag flag;
-  public final Variant variant;
-  public final Subject subject;
+    // milliseconds since epoch as given by System.currentTimeMillis()
+    public final long timestamp;
+    public final Allocation allocation;
+    public final Flag flag;
+    public final Variant variant;
+    public final Subject subject;
 
-  public final Integer serial_id;
+    public final Integer serial_id;
 
-  public ExposureEvent(
-      final long timestamp,
-      final Allocation allocation,
-      final Flag flag,
-      final Variant variant,
-      final Subject subject) {
-    this(timestamp, allocation, flag, variant, subject, null);
-  }
+    public ExposureEvent(
+            final long timestamp,
+            final Allocation allocation,
+            final Flag flag,
+            final Variant variant,
+            final Subject subject) {
+        this(timestamp, allocation, flag, variant, subject, null);
+    }
 
-  public ExposureEvent(
-      final long timestamp,
-      final Allocation allocation,
-      final Flag flag,
-      final Variant variant,
-      final Subject subject,
-      final Integer serialId) {
-    this.timestamp = timestamp;
-    this.allocation = allocation;
-    this.flag = flag;
-    this.variant = variant;
-    this.subject = subject;
-    this.serial_id = serialId;
-  }
+    public ExposureEvent(
+            final long timestamp,
+            final Allocation allocation,
+            final Flag flag,
+            final Variant variant,
+            final Subject subject,
+            final Integer serialId) {
+        this.timestamp = timestamp;
+        this.allocation = allocation;
+        this.flag = flag;
+        this.variant = variant;
+        this.subject = subject;
+        this.serial_id = serialId;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/ExposuresRequest.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/ExposuresRequest.java
index 3b25028c245..9a84dd074f0 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/ExposuresRequest.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/ExposuresRequest.java
@@ -5,11 +5,11 @@
 
 public class ExposuresRequest {
 
-  public final Map<String, String> context;
-  public final List<ExposureEvent> exposures;
+    public final Map<String, String> context;
+    public final List<ExposureEvent> exposures;
 
-  public ExposuresRequest(final Map<String, String> context, final List<ExposureEvent> exposures) {
-    this.context = context;
-    this.exposures = exposures;
-  }
+    public ExposuresRequest(final Map<String, String> context, final List<ExposureEvent> exposures) {
+        this.context = context;
+        this.exposures = exposures;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/Flag.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/Flag.java
index c13b123ad6c..dda0b36470e 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/Flag.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/Flag.java
@@ -1,9 +1,9 @@
 package datadog.trace.api.featureflag.exposure;
 
 public class Flag {
-  public final String key;
+    public final String key;
 
-  public Flag(final String key) {
-    this.key = key;
-  }
+    public Flag(final String key) {
+        this.key = key;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/Subject.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/Subject.java
index ebd381e7069..5f48b0d6c58 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/Subject.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/Subject.java
@@ -3,11 +3,11 @@
 import java.util.Map;
 
 public class Subject {
-  public final String id;
-  public final Map<String, Object> attributes;
+    public final String id;
+    public final Map<String, Object> attributes;
 
-  public Subject(final String id, final Map<String, Object> attributes) {
-    this.id = id;
-    this.attributes = attributes;
-  }
+    public Subject(final String id, final Map<String, Object> attributes) {
+        this.id = id;
+        this.attributes = attributes;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/Variant.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/Variant.java
index dfc4cbe38c7..474b471f889 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/Variant.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/exposure/Variant.java
@@ -1,9 +1,9 @@
 package datadog.trace.api.featureflag.exposure;
 
 public class Variant {
-  public final String key;
+    public final String key;
 
-  public Variant(final String key) {
-    this.key = key;
-  }
+    public Variant(final String key) {
+        this.key = key;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/flagevaluation/FlagEvalEvent.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/flagevaluation/FlagEvalEvent.java
index f5f44b94d7b..871f6aa772c 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/flagevaluation/FlagEvalEvent.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/flagevaluation/FlagEvalEvent.java
@@ -14,85 +14,85 @@
  */
 public final class FlagEvalEvent {
 
-  /** The feature flag key. Never null. */
-  public final String flagKey;
+    /** The feature flag key. Never null. */
+    public final String flagKey;
 
-  /**
-   * The OpenFeature variant key selected for the evaluation. Null means the default value was
-   * returned (runtime default).
-   */
-  public final String variant;
+    /**
+     * The OpenFeature variant key selected for the evaluation. Null means the default value was
+     * returned (runtime default).
+     */
+    public final String variant;
 
-  /** The allocation key from flag metadata ("allocationKey"). May be null. */
-  public final String allocationKey;
+    /** The allocation key from flag metadata ("allocationKey"). May be null. */
+    public final String allocationKey;
 
-  /** The targeting key from the evaluation context. May be null. */
-  public final String targetingKey;
+    /** The targeting key from the evaluation context. May be null. */
+    public final String targetingKey;
 
-  /**
-   * The evaluation error message when the evaluation failed, else null. Sourced from the
-   * OpenFeature evaluation details (error message, falling back to the error code).
-   */
-  public final String errorMessage;
+    /**
+     * The evaluation error message when the evaluation failed, else null. Sourced from the
+     * OpenFeature evaluation details (error message, falling back to the error code).
+     */
+    public final String errorMessage;
 
-  /**
-   * Evaluation timestamp in milliseconds since epoch. Stamped at eval-entry time from flag metadata
-   * key __dd_eval_timestamp_ms, or falls back to hook-fire time when absent. This ensures
-   * first/last_evaluation reflect evaluation time, not hook-fire time.
-   */
-  public final long evalTimeMs;
+    /**
+     * Evaluation timestamp in milliseconds since epoch. Stamped at eval-entry time from flag metadata
+     * key __dd_eval_timestamp_ms, or falls back to hook-fire time when absent. This ensures
+     * first/last_evaluation reflect evaluation time, not hook-fire time.
+     */
+    public final long evalTimeMs;
 
-  /**
-   * Flattened evaluation context attributes. Used for the full-tier canonical context key. May be
-   * empty but never null.
-   */
-  public final Map<String, Object> attrs;
+    /**
+     * Flattened evaluation context attributes. Used for the full-tier canonical context key. May be
+     * empty but never null.
+     */
+    public final Map<String, Object> attrs;
 
-  /**
-   * PII consent from the ServerConfiguration used by the evaluation. When false (privacy-preserving
-   * default), the targeting key is hashed and the per-evaluation context is omitted on emission.
-   */
-  public final boolean observeFullEvaluationData;
+    /**
+     * PII consent from the ServerConfiguration used by the evaluation. When false (privacy-preserving
+     * default), the targeting key is hashed and the per-evaluation context is omitted on emission.
+     */
+    public final boolean observeFullEvaluationData;
 
-  /** Convenience constructor; consent defaults to the privacy-preserving false. */
-  public FlagEvalEvent(
-      final String flagKey,
-      final String variant,
-      final String allocationKey,
-      final String targetingKey,
-      final long evalTimeMs,
-      final Map<String, Object> attrs) {
-    this(flagKey, variant, allocationKey, targetingKey, null, evalTimeMs, false, attrs);
-  }
+    /** Convenience constructor; consent defaults to the privacy-preserving false. */
+    public FlagEvalEvent(
+            final String flagKey,
+            final String variant,
+            final String allocationKey,
+            final String targetingKey,
+            final long evalTimeMs,
+            final Map<String, Object> attrs) {
+        this(flagKey, variant, allocationKey, targetingKey, null, evalTimeMs, false, attrs);
+    }
 
-  /** Convenience constructor; consent defaults to the privacy-preserving false. */
-  public FlagEvalEvent(
-      final String flagKey,
-      final String variant,
-      final String allocationKey,
-      final String targetingKey,
-      final String errorMessage,
-      final long evalTimeMs,
-      final Map<String, Object> attrs) {
-    this(flagKey, variant, allocationKey, targetingKey, errorMessage, evalTimeMs, false, attrs);
-  }
+    /** Convenience constructor; consent defaults to the privacy-preserving false. */
+    public FlagEvalEvent(
+            final String flagKey,
+            final String variant,
+            final String allocationKey,
+            final String targetingKey,
+            final String errorMessage,
+            final long evalTimeMs,
+            final Map<String, Object> attrs) {
+        this(flagKey, variant, allocationKey, targetingKey, errorMessage, evalTimeMs, false, attrs);
+    }
 
-  public FlagEvalEvent(
-      final String flagKey,
-      final String variant,
-      final String allocationKey,
-      final String targetingKey,
-      final String errorMessage,
-      final long evalTimeMs,
-      final boolean observeFullEvaluationData,
-      final Map<String, Object> attrs) {
-    this.flagKey = flagKey;
-    this.variant = variant;
-    this.allocationKey = allocationKey;
-    this.targetingKey = targetingKey;
-    this.errorMessage = errorMessage;
-    this.evalTimeMs = evalTimeMs;
-    this.observeFullEvaluationData = observeFullEvaluationData;
-    this.attrs = attrs != null ? attrs : Collections.emptyMap();
-  }
+    public FlagEvalEvent(
+            final String flagKey,
+            final String variant,
+            final String allocationKey,
+            final String targetingKey,
+            final String errorMessage,
+            final long evalTimeMs,
+            final boolean observeFullEvaluationData,
+            final Map<String, Object> attrs) {
+        this.flagKey = flagKey;
+        this.variant = variant;
+        this.allocationKey = allocationKey;
+        this.targetingKey = targetingKey;
+        this.errorMessage = errorMessage;
+        this.evalTimeMs = evalTimeMs;
+        this.observeFullEvaluationData = observeFullEvaluationData;
+        this.attrs = attrs != null ? attrs : Collections.emptyMap();
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/flagevaluation/FlagEvaluationWriter.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/flagevaluation/FlagEvaluationWriter.java
index 65ffaf80591..122d7643b2b 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/flagevaluation/FlagEvaluationWriter.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/flagevaluation/FlagEvaluationWriter.java
@@ -10,37 +10,37 @@
  */
 public interface FlagEvaluationWriter extends AutoCloseable {
 
-  /**
-   * Non-blocking enqueue of a flag evaluation event. May silently drop the event if the internal
-   * bounded queue is full (best-effort, observable via drop counter).
-   */
-  void enqueue(FlagEvalEvent event);
+    /**
+     * Non-blocking enqueue of a flag evaluation event. May silently drop the event if the internal
+     * bounded queue is full (best-effort, observable via drop counter).
+     */
+    void enqueue(FlagEvalEvent event);
 
-  /**
-   * Reports whether the internal queue currently has room for another event. Producers should
-   * consult this before performing expensive context-copy work so a saturated queue is observed as
-   * an O(1) read rather than a full snapshot followed by a discarded offer.
-   *
-   * <p>Best-effort: the worker can drain (or a peer producer can fill) between this check and the
-   * next enqueue, so callers must still tolerate offer failure.
-   */
-  boolean hasCapacityForEnqueue();
+    /**
+     * Reports whether the internal queue currently has room for another event. Producers should
+     * consult this before performing expensive context-copy work so a saturated queue is observed as
+     * an O(1) read rather than a full snapshot followed by a discarded offer.
+     *
+     * <p>Best-effort: the worker can drain (or a peer producer can fill) between this check and the
+     * next enqueue, so callers must still tolerate offer failure.
+     */
+    boolean hasCapacityForEnqueue();
 
-  /** Counts one queue-overflow drop without offering an event. */
-  void countPreQueueOverflow();
+    /** Counts one queue-overflow drop without offering an event. */
+    void countPreQueueOverflow();
 
-  /**
-   * Counts one evaluation whose context was truncated by copyPrunedContext. The reason string is
-   * the sorted, comma-separated set of cap names that fired (e.g.
-   * "max_key_length,max_value_length"). Each unique reason string is counted separately so
-   * telemetry can distinguish which caps are hot.
-   */
-  void countContextTruncated(String reason);
+    /**
+     * Counts one evaluation whose context was truncated by copyPrunedContext. The reason string is
+     * the sorted, comma-separated set of cap names that fired (e.g.
+     * "max_key_length,max_value_length"). Each unique reason string is counted separately so
+     * telemetry can distinguish which caps are hot.
+     */
+    void countContextTruncated(String reason);
 
-  /** Starts the background serializing thread. Must be called once after construction. */
-  void start();
+    /** Starts the background serializing thread. Must be called once after construction. */
+    void start();
 
-  /** Stops the background thread and releases resources. */
-  @Override
-  void close();
+    /** Stops the background thread and releases resources. */
+    @Override
+    void close();
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Allocation.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Allocation.java
index b572e7e5aff..88a331e85d6 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Allocation.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Allocation.java
@@ -5,76 +5,76 @@
 import java.util.List;
 
 public class Allocation {
-  public final String key;
-  public final List<Rule> rules;
-  public final Date startAt;
-  public final Date endAt;
-  public final List<Split> splits;
-  public final Boolean doLog;
+    public final String key;
+    public final List<Rule> rules;
+    public final Date startAt;
+    public final Date endAt;
+    public final List<Split> splits;
+    public final Boolean doLog;
 
-  private final transient Instant preciseStartAt;
-  private final transient Instant preciseEndAt;
+    private final transient Instant preciseStartAt;
+    private final transient Instant preciseEndAt;
 
-  public Allocation(
-      final String key,
-      final List<Rule> rules,
-      final Date startAt,
-      final Date endAt,
-      final List<Split> splits,
-      final Boolean doLog) {
-    this(
-        key,
-        rules,
-        startAt,
-        endAt,
-        splits,
-        doLog,
-        startAt == null ? null : startAt.toInstant(),
-        endAt == null ? null : endAt.toInstant());
-  }
+    public Allocation(
+            final String key,
+            final List<Rule> rules,
+            final Date startAt,
+            final Date endAt,
+            final List<Split> splits,
+            final Boolean doLog) {
+        this(
+                key,
+                rules,
+                startAt,
+                endAt,
+                splits,
+                doLog,
+                startAt == null ? null : startAt.toInstant(),
+                endAt == null ? null : endAt.toInstant());
+    }
 
-  private Allocation(
-      final String key,
-      final List<Rule> rules,
-      final Date startAt,
-      final Date endAt,
-      final List<Split> splits,
-      final Boolean doLog,
-      final Instant preciseStartAt,
-      final Instant preciseEndAt) {
-    this.key = key;
-    this.rules = rules;
-    this.startAt = startAt;
-    this.endAt = endAt;
-    this.splits = splits;
-    this.doLog = doLog;
-    this.preciseStartAt = preciseStartAt;
-    this.preciseEndAt = preciseEndAt;
-  }
+    private Allocation(
+            final String key,
+            final List<Rule> rules,
+            final Date startAt,
+            final Date endAt,
+            final List<Split> splits,
+            final Boolean doLog,
+            final Instant preciseStartAt,
+            final Instant preciseEndAt) {
+        this.key = key;
+        this.rules = rules;
+        this.startAt = startAt;
+        this.endAt = endAt;
+        this.splits = splits;
+        this.doLog = doLog;
+        this.preciseStartAt = preciseStartAt;
+        this.preciseEndAt = preciseEndAt;
+    }
 
-  public static Allocation fromInstants(
-      final String key,
-      final List<Rule> rules,
-      final Instant startAt,
-      final Instant endAt,
-      final List<Split> splits,
-      final Boolean doLog) {
-    return new Allocation(
-        key,
-        rules,
-        startAt == null ? null : Date.from(startAt),
-        endAt == null ? null : Date.from(endAt),
-        splits,
-        doLog,
-        startAt,
-        endAt);
-  }
+    public static Allocation fromInstants(
+            final String key,
+            final List<Rule> rules,
+            final Instant startAt,
+            final Instant endAt,
+            final List<Split> splits,
+            final Boolean doLog) {
+        return new Allocation(
+                key,
+                rules,
+                startAt == null ? null : Date.from(startAt),
+                endAt == null ? null : Date.from(endAt),
+                splits,
+                doLog,
+                startAt,
+                endAt);
+    }
 
-  public Instant startAtInstant() {
-    return preciseStartAt != null ? preciseStartAt : startAt == null ? null : startAt.toInstant();
-  }
+    public Instant startAtInstant() {
+        return preciseStartAt != null ? preciseStartAt : startAt == null ? null : startAt.toInstant();
+    }
 
-  public Instant endAtInstant() {
-    return preciseEndAt != null ? preciseEndAt : endAt == null ? null : endAt.toInstant();
-  }
+    public Instant endAtInstant() {
+        return preciseEndAt != null ? preciseEndAt : endAt == null ? null : endAt.toInstant();
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ConditionConfiguration.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ConditionConfiguration.java
index ae693674acc..4f89c82e647 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ConditionConfiguration.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ConditionConfiguration.java
@@ -1,18 +1,17 @@
 package datadog.trace.api.featureflag.ufc.v1;
 
 public class ConditionConfiguration {
-  public final ConditionOperator operator;
-  public final String attribute;
-  public final Object value;
+    public final ConditionOperator operator;
+    public final String attribute;
+    public final Object value;
 
-  // The validated, parsed SemVer condition value. Set during configuration preprocessing
-  // (not from JSON) when the operator is a SEMVER_* operator.
-  public transient ParsedSemver semverComparand;
+    // The validated, parsed SemVer condition value. Set during configuration preprocessing
+    // (not from JSON) when the operator is a SEMVER_* operator.
+    public transient ParsedSemver semverComparand;
 
-  public ConditionConfiguration(
-      final ConditionOperator operator, final String attribute, final Object value) {
-    this.operator = operator;
-    this.attribute = attribute;
-    this.value = value;
-  }
+    public ConditionConfiguration(final ConditionOperator operator, final String attribute, final Object value) {
+        this.operator = operator;
+        this.attribute = attribute;
+        this.value = value;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ConditionOperator.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ConditionOperator.java
index 1e864da2b6a..c90459a5322 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ConditionOperator.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ConditionOperator.java
@@ -1,19 +1,19 @@
 package datadog.trace.api.featureflag.ufc.v1;
 
 public enum ConditionOperator {
-  LT,
-  LTE,
-  GT,
-  GTE,
-  MATCHES,
-  NOT_MATCHES,
-  ONE_OF,
-  NOT_ONE_OF,
-  IS_NULL,
-  SEMVER_EQ,
-  SEMVER_NEQ,
-  SEMVER_LT,
-  SEMVER_LTE,
-  SEMVER_GT,
-  SEMVER_GTE
+    LT,
+    LTE,
+    GT,
+    GTE,
+    MATCHES,
+    NOT_MATCHES,
+    ONE_OF,
+    NOT_ONE_OF,
+    IS_NULL,
+    SEMVER_EQ,
+    SEMVER_NEQ,
+    SEMVER_LT,
+    SEMVER_LTE,
+    SEMVER_GT,
+    SEMVER_GTE
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Environment.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Environment.java
index 86d04c7d8ef..59116b3f43a 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Environment.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Environment.java
@@ -1,9 +1,9 @@
 package datadog.trace.api.featureflag.ufc.v1;
 
 public class Environment {
-  public final String name;
+    public final String name;
 
-  public Environment(String name) {
-    this.name = name;
-  }
+    public Environment(String name) {
+        this.name = name;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Flag.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Flag.java
index 529e3145344..6470f2073f5 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Flag.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Flag.java
@@ -4,22 +4,22 @@
 import java.util.Map;
 
 public class Flag {
-  public final String key;
-  public final boolean enabled;
-  public final ValueType variationType;
-  public final Map<String, Variant> variations;
-  public final List<Allocation> allocations;
+    public final String key;
+    public final boolean enabled;
+    public final ValueType variationType;
+    public final Map<String, Variant> variations;
+    public final List<Allocation> allocations;
 
-  public Flag(
-      final String key,
-      final boolean enabled,
-      final ValueType variationType,
-      final Map<String, Variant> variations,
-      final List<Allocation> allocations) {
-    this.key = key;
-    this.enabled = enabled;
-    this.variationType = variationType;
-    this.variations = variations;
-    this.allocations = allocations;
-  }
+    public Flag(
+            final String key,
+            final boolean enabled,
+            final ValueType variationType,
+            final Map<String, Variant> variations,
+            final List<Allocation> allocations) {
+        this.key = key;
+        this.enabled = enabled;
+        this.variationType = variationType;
+        this.variations = variations;
+        this.allocations = allocations;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ParsedSemver.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ParsedSemver.java
index 03ef7590fa1..05fbc73ca99 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ParsedSemver.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ParsedSemver.java
@@ -14,305 +14,303 @@
  */
 public final class ParsedSemver {
 
-  /** Sentinel returned by {@link #parse(String)} when the input is not a valid semantic version. */
-  public static final ParsedSemver INVALID = null;
+    /** Sentinel returned by {@link #parse(String)} when the input is not a valid semantic version. */
+    public static final ParsedSemver INVALID = null;
 
-  private final long[] core; // unsigned, with omitted minor and patch normalized to zero
-  private final int coreLength;
-  private final String prerelease;
+    private final long[] core; // unsigned, with omitted minor and patch normalized to zero
+    private final int coreLength;
+    private final String prerelease;
 
-  ParsedSemver(final long[] core, final int coreLength, final String prerelease) {
-    this.core = core;
-    this.coreLength = coreLength;
-    this.prerelease = prerelease;
-  }
-
-  /**
-   * Parses a semantic version string using the syntax supported by FFE.
-   *
-   * @param version the version string to parse
-   * @return a {@link ParsedSemver} instance, or {@code null} if the input is not a valid semantic
-   *     version
-   */
-  public static ParsedSemver parse(final String version) {
-    long[] core = new long[3];
-    int coreSize = 0;
-    int next = 0;
-    while (true) {
-      final int end = coreIdentifierEnd(version, next);
-      if (end == -1) {
-        return INVALID;
-      }
-      final long component;
-      try {
-        component = Long.parseUnsignedLong(version.substring(next, end));
-      } catch (final NumberFormatException e) {
-        return INVALID; // overflow
-      }
-      if (coreSize == core.length) {
-        core = Arrays.copyOf(core, core.length * 2);
-      }
-      core[coreSize++] = component;
-      next = end;
-      if (next == version.length() || version.charAt(next) != '.') {
-        break;
-      }
-      next++;
-    }
-    final int coreLength = Math.max(3, coreSize);
-    if (next == version.length()) {
-      return new ParsedSemver(core, coreLength, "");
+    ParsedSemver(final long[] core, final int coreLength, final String prerelease) {
+        this.core = core;
+        this.coreLength = coreLength;
+        this.prerelease = prerelease;
     }
 
-    // Parse prerelease and/or build metadata.
-    String remainder = version.substring(next);
-    String prerelease = "";
-    if (remainder.charAt(0) == '-') {
-      remainder = remainder.substring(1);
-      final int buildStart = remainder.indexOf('+');
-      if (buildStart == -1) {
-        if (!validSemverIdentifiers(remainder, false)) {
-          return INVALID;
+    /**
+     * Parses a semantic version string using the syntax supported by FFE.
+     *
+     * @param version the version string to parse
+     * @return a {@link ParsedSemver} instance, or {@code null} if the input is not a valid semantic
+     *     version
+     */
+    public static ParsedSemver parse(final String version) {
+        long[] core = new long[3];
+        int coreSize = 0;
+        int next = 0;
+        while (true) {
+            final int end = coreIdentifierEnd(version, next);
+            if (end == -1) {
+                return INVALID;
+            }
+            final long component;
+            try {
+                component = Long.parseUnsignedLong(version.substring(next, end));
+            } catch (final NumberFormatException e) {
+                return INVALID; // overflow
+            }
+            if (coreSize == core.length) {
+                core = Arrays.copyOf(core, core.length * 2);
+            }
+            core[coreSize++] = component;
+            next = end;
+            if (next == version.length() || version.charAt(next) != '.') {
+                break;
+            }
+            next++;
         }
-        return new ParsedSemver(core, coreLength, remainder);
-      }
-      prerelease = remainder.substring(0, buildStart);
-      if (!validSemverIdentifiers(prerelease, false)) {
-        return INVALID;
-      }
-      remainder = remainder.substring(buildStart + 1);
-    } else if (remainder.charAt(0) == '+') {
-      remainder = remainder.substring(1);
-    } else {
-      return INVALID;
-    }
-    if (!validSemverIdentifiers(remainder, true)) {
-      return INVALID;
+        final int coreLength = Math.max(3, coreSize);
+        if (next == version.length()) {
+            return new ParsedSemver(core, coreLength, "");
+        }
+
+        // Parse prerelease and/or build metadata.
+        String remainder = version.substring(next);
+        String prerelease = "";
+        if (remainder.charAt(0) == '-') {
+            remainder = remainder.substring(1);
+            final int buildStart = remainder.indexOf('+');
+            if (buildStart == -1) {
+                if (!validSemverIdentifiers(remainder, false)) {
+                    return INVALID;
+                }
+                return new ParsedSemver(core, coreLength, remainder);
+            }
+            prerelease = remainder.substring(0, buildStart);
+            if (!validSemverIdentifiers(prerelease, false)) {
+                return INVALID;
+            }
+            remainder = remainder.substring(buildStart + 1);
+        } else if (remainder.charAt(0) == '+') {
+            remainder = remainder.substring(1);
+        } else {
+            return INVALID;
+        }
+        if (!validSemverIdentifiers(remainder, true)) {
+            return INVALID;
+        }
+        return new ParsedSemver(core, coreLength, prerelease);
     }
-    return new ParsedSemver(core, coreLength, prerelease);
-  }
 
-  /**
-   * Compares two parsed semantic versions by precedence. Build metadata is intentionally ignored.
-   *
-   * @param left the left operand
-   * @param right the right operand
-   * @return negative if {@code left} precedes {@code right}, positive if {@code left} follows
-   *     {@code right}, zero if they have equal precedence
-   */
-  public static int compare(final ParsedSemver left, final ParsedSemver right) {
-    final int coreLength = Math.max(left.coreLength, right.coreLength);
-    for (int i = 0; i < coreLength; i++) {
-      final int cmp = Long.compareUnsigned(left.coreComponent(i), right.coreComponent(i));
-      if (cmp != 0) {
-        return cmp;
-      }
+    /**
+     * Compares two parsed semantic versions by precedence. Build metadata is intentionally ignored.
+     *
+     * @param left the left operand
+     * @param right the right operand
+     * @return negative if {@code left} precedes {@code right}, positive if {@code left} follows
+     *     {@code right}, zero if they have equal precedence
+     */
+    public static int compare(final ParsedSemver left, final ParsedSemver right) {
+        final int coreLength = Math.max(left.coreLength, right.coreLength);
+        for (int i = 0; i < coreLength; i++) {
+            final int cmp = Long.compareUnsigned(left.coreComponent(i), right.coreComponent(i));
+            if (cmp != 0) {
+                return cmp;
+            }
+        }
+        return comparePrerelease(left.prerelease, right.prerelease);
     }
-    return comparePrerelease(left.prerelease, right.prerelease);
-  }
 
-  /**
-   * Finds the end of a core version identifier (major, minor, or patch), rejecting leading zeros
-   * except for the value zero itself.
-   */
-  private static int coreIdentifierEnd(final String version, final int start) {
-    if (start >= version.length() || !isASCIIDigit(version.charAt(start))) {
-      return -1;
+    /**
+     * Finds the end of a core version identifier (major, minor, or patch), rejecting leading zeros
+     * except for the value zero itself.
+     */
+    private static int coreIdentifierEnd(final String version, final int start) {
+        if (start >= version.length() || !isASCIIDigit(version.charAt(start))) {
+            return -1;
+        }
+        if (version.charAt(start) == '0') {
+            return start + 1;
+        }
+
+        int end = start;
+        while (end < version.length() && isASCIIDigit(version.charAt(end))) {
+            end++;
+        }
+        return end;
     }
-    if (version.charAt(start) == '0') {
-      return start + 1;
+
+    private long coreComponent(final int index) {
+        return index < coreLength ? core[index] : 0;
     }
 
-    int end = start;
-    while (end < version.length() && isASCIIDigit(version.charAt(end))) {
-      end++;
+    /**
+     * Returns the number of significant core components, excluding trailing zero components that
+     * {@link #compare} treats as equal to omitted components. This keeps {@link #equals} and {@link
+     * #hashCode} consistent with precedence comparison so that versions like {@code 1.2.3} and {@code
+     * 1.2.3.0} are equal and hash identically.
+     */
+    private int effectiveCoreLength() {
+        int length = coreLength;
+        while (length > 0 && core[length - 1] == 0L) {
+            length--;
+        }
+        return length;
     }
-    return end;
-  }
 
-  private long coreComponent(final int index) {
-    return index < coreLength ? core[index] : 0;
-  }
+    /**
+     * Validates dot-separated identifiers. Permits leading zeros for build metadata only; numeric
+     * prerelease identifiers reject them.
+     */
+    private static boolean validSemverIdentifiers(final String value, final boolean allowLeadingZeros) {
+        int identifierStart = 0;
+        boolean identifierNumeric = true;
+        for (int i = 0; i <= value.length(); i++) {
+            if (i == value.length() || value.charAt(i) == '.') {
+                if (i == identifierStart) {
+                    return false; // empty identifier
+                }
+                if (!allowLeadingZeros
+                        && identifierNumeric
+                        && i - identifierStart > 1
+                        && value.charAt(identifierStart) == '0') {
+                    return false; // leading zero in numeric identifier
+                }
+                identifierStart = i + 1;
+                identifierNumeric = true;
+                continue;
+            }
 
-  /**
-   * Returns the number of significant core components, excluding trailing zero components that
-   * {@link #compare} treats as equal to omitted components. This keeps {@link #equals} and {@link
-   * #hashCode} consistent with precedence comparison so that versions like {@code 1.2.3} and {@code
-   * 1.2.3.0} are equal and hash identically.
-   */
-  private int effectiveCoreLength() {
-    int length = coreLength;
-    while (length > 0 && core[length - 1] == 0L) {
-      length--;
+            final char c = value.charAt(i);
+            if (!isASCIIAlphanumeric(c) && c != '-') {
+                return false;
+            }
+            if (!isASCIIDigit(c)) {
+                identifierNumeric = false;
+            }
+        }
+        return true;
     }
-    return length;
-  }
 
-  /**
-   * Validates dot-separated identifiers. Permits leading zeros for build metadata only; numeric
-   * prerelease identifiers reject them.
-   */
-  private static boolean validSemverIdentifiers(
-      final String value, final boolean allowLeadingZeros) {
-    int identifierStart = 0;
-    boolean identifierNumeric = true;
-    for (int i = 0; i <= value.length(); i++) {
-      if (i == value.length() || value.charAt(i) == '.') {
-        if (i == identifierStart) {
-          return false; // empty identifier
+    private static int comparePrerelease(final String left, final String right) {
+        if (left.equals(right)) {
+            return 0;
         }
-        if (!allowLeadingZeros
-            && identifierNumeric
-            && i - identifierStart > 1
-            && value.charAt(identifierStart) == '0') {
-          return false; // leading zero in numeric identifier
+        if (left.isEmpty()) {
+            return 1; // release > prerelease
+        }
+        if (right.isEmpty()) {
+            return -1; // prerelease < release
         }
-        identifierStart = i + 1;
-        identifierNumeric = true;
-        continue;
-      }
-
-      final char c = value.charAt(i);
-      if (!isASCIIAlphanumeric(c) && c != '-') {
-        return false;
-      }
-      if (!isASCIIDigit(c)) {
-        identifierNumeric = false;
-      }
-    }
-    return true;
-  }
-
-  private static int comparePrerelease(final String left, final String right) {
-    if (left.equals(right)) {
-      return 0;
-    }
-    if (left.isEmpty()) {
-      return 1; // release > prerelease
-    }
-    if (right.isEmpty()) {
-      return -1; // prerelease < release
-    }
 
-    int leftPos = 0;
-    int rightPos = 0;
-    while (true) {
-      // Extract next identifier from each side
-      int leftDot = left.indexOf('.', leftPos);
-      int rightDot = right.indexOf('.', rightPos);
-      final String leftIdentifier =
-          leftDot == -1 ? left.substring(leftPos) : left.substring(leftPos, leftDot);
-      final String rightIdentifier =
-          rightDot == -1 ? right.substring(rightPos) : right.substring(rightPos, rightDot);
+        int leftPos = 0;
+        int rightPos = 0;
+        while (true) {
+            // Extract next identifier from each side
+            int leftDot = left.indexOf('.', leftPos);
+            int rightDot = right.indexOf('.', rightPos);
+            final String leftIdentifier = leftDot == -1 ? left.substring(leftPos) : left.substring(leftPos, leftDot);
+            final String rightIdentifier =
+                    rightDot == -1 ? right.substring(rightPos) : right.substring(rightPos, rightDot);
 
-      final int ordering = compareIdentifier(leftIdentifier, rightIdentifier);
-      if (ordering != 0) {
-        return ordering;
-      }
+            final int ordering = compareIdentifier(leftIdentifier, rightIdentifier);
+            if (ordering != 0) {
+                return ordering;
+            }
 
-      if (leftDot == -1) {
-        if (rightDot == -1) {
-          return 0;
+            if (leftDot == -1) {
+                if (rightDot == -1) {
+                    return 0;
+                }
+                return -1; // left has fewer identifiers
+            }
+            if (rightDot == -1) {
+                return 1; // right has fewer identifiers
+            }
+            leftPos = leftDot + 1;
+            rightPos = rightDot + 1;
         }
-        return -1; // left has fewer identifiers
-      }
-      if (rightDot == -1) {
-        return 1; // right has fewer identifiers
-      }
-      leftPos = leftDot + 1;
-      rightPos = rightDot + 1;
     }
-  }
 
-  private static int compareIdentifier(final String left, final String right) {
-    final boolean leftNumeric = isNumericIdentifier(left);
-    final boolean rightNumeric = isNumericIdentifier(right);
+    private static int compareIdentifier(final String left, final String right) {
+        final boolean leftNumeric = isNumericIdentifier(left);
+        final boolean rightNumeric = isNumericIdentifier(right);
 
-    if (leftNumeric && rightNumeric) {
-      // Numeric identifiers: compare by length first (longer = larger), then lexicographically
-      if (left.length() < right.length()) {
-        return -1;
-      }
-      if (left.length() > right.length()) {
-        return 1;
-      }
-      return left.compareTo(right);
-    } else if (leftNumeric) {
-      return -1; // numeric < alphanumeric
-    } else if (rightNumeric) {
-      return 1; // alphanumeric > numeric
+        if (leftNumeric && rightNumeric) {
+            // Numeric identifiers: compare by length first (longer = larger), then lexicographically
+            if (left.length() < right.length()) {
+                return -1;
+            }
+            if (left.length() > right.length()) {
+                return 1;
+            }
+            return left.compareTo(right);
+        } else if (leftNumeric) {
+            return -1; // numeric < alphanumeric
+        } else if (rightNumeric) {
+            return 1; // alphanumeric > numeric
+        }
+        return left.compareTo(right);
     }
-    return left.compareTo(right);
-  }
 
-  private static boolean isNumericIdentifier(final String value) {
-    for (int i = 0; i < value.length(); i++) {
-      if (!isASCIIDigit(value.charAt(i))) {
-        return false;
-      }
+    private static boolean isNumericIdentifier(final String value) {
+        for (int i = 0; i < value.length(); i++) {
+            if (!isASCIIDigit(value.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
     }
-    return true;
-  }
-
-  private static boolean isASCIIDigit(final char c) {
-    return c >= '0' && c <= '9';
-  }
 
-  private static boolean isASCIIAlphanumeric(final char c) {
-    return isASCIIDigit(c) || (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z');
-  }
+    private static boolean isASCIIDigit(final char c) {
+        return c >= '0' && c <= '9';
+    }
 
-  // --- Accessors for testing ---
+    private static boolean isASCIIAlphanumeric(final char c) {
+        return isASCIIDigit(c) || (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z');
+    }
 
-  long getMajor() {
-    return core[0];
-  }
+    // --- Accessors for testing ---
 
-  long getMinor() {
-    return core[1];
-  }
+    long getMajor() {
+        return core[0];
+    }
 
-  long getPatch() {
-    return core[2];
-  }
+    long getMinor() {
+        return core[1];
+    }
 
-  String getPrerelease() {
-    return prerelease;
-  }
+    long getPatch() {
+        return core[2];
+    }
 
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) {
-      return true;
+    String getPrerelease() {
+        return prerelease;
     }
-    if (!(o instanceof ParsedSemver)) {
-      return false;
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof ParsedSemver)) {
+            return false;
+        }
+        // Delegate to compare so equality matches precedence (SEMVER_EQ) and sorted collections, even
+        // when versions differ only by trailing zero components such as 1.2.3 and 1.2.3.0.
+        return compare(this, (ParsedSemver) o) == 0;
     }
-    // Delegate to compare so equality matches precedence (SEMVER_EQ) and sorted collections, even
-    // when versions differ only by trailing zero components such as 1.2.3 and 1.2.3.0.
-    return compare(this, (ParsedSemver) o) == 0;
-  }
 
-  @Override
-  public int hashCode() {
-    // Hash over the trailing-zero-stripped core so that compare-equal versions hash identically.
-    final int effectiveLength = effectiveCoreLength();
-    int result = 1;
-    for (int i = 0; i < effectiveLength; i++) {
-      result = 31 * result + Long.hashCode(core[i]);
+    @Override
+    public int hashCode() {
+        // Hash over the trailing-zero-stripped core so that compare-equal versions hash identically.
+        final int effectiveLength = effectiveCoreLength();
+        int result = 1;
+        for (int i = 0; i < effectiveLength; i++) {
+            result = 31 * result + Long.hashCode(core[i]);
+        }
+        return 31 * result + prerelease.hashCode();
     }
-    return 31 * result + prerelease.hashCode();
-  }
 
-  @Override
-  public String toString() {
-    final StringBuilder value = new StringBuilder();
-    for (int i = 0; i < coreLength; i++) {
-      if (i > 0) {
-        value.append('.');
-      }
-      value.append(Long.toUnsignedString(coreComponent(i)));
+    @Override
+    public String toString() {
+        final StringBuilder value = new StringBuilder();
+        for (int i = 0; i < coreLength; i++) {
+            if (i > 0) {
+                value.append('.');
+            }
+            value.append(Long.toUnsignedString(coreComponent(i)));
+        }
+        return value.append(prerelease.isEmpty() ? "" : "-" + prerelease).toString();
     }
-    return value.append(prerelease.isEmpty() ? "" : "-" + prerelease).toString();
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Rule.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Rule.java
index ed0fe60f366..926567fd579 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Rule.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Rule.java
@@ -3,9 +3,9 @@
 import java.util.List;
 
 public class Rule {
-  public final List<ConditionConfiguration> conditions;
+    public final List<ConditionConfiguration> conditions;
 
-  public Rule(final List<ConditionConfiguration> conditions) {
-    this.conditions = conditions;
-  }
+    public Rule(final List<ConditionConfiguration> conditions) {
+        this.conditions = conditions;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ServerConfiguration.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ServerConfiguration.java
index 60f39fc666f..6dad267b16a 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ServerConfiguration.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ServerConfiguration.java
@@ -4,31 +4,31 @@
 import java.util.Map;
 
 public class ServerConfiguration {
-  public final String createdAt;
-  public final String format;
-  // Boxed on purpose. Moshi's reflective adapter for a primitive boolean field aborts the whole
-  // UFC parse when the JSON value is null or not a boolean; with a Boolean field it tolerates
-  // null (and other malformed values are still caught locally) so a malformed consent field
-  // doesn't strand a fresh pod on PROVIDER_NOT_READY. Read sites must use
-  // Boolean.TRUE.equals(...) so null falls to the privacy-preserving default.
-  public final Boolean observeFullEvaluationData;
-  public final Environment environment;
-  public final Map<String, Flag> flags;
+    public final String createdAt;
+    public final String format;
+    // Boxed on purpose. Moshi's reflective adapter for a primitive boolean field aborts the whole
+    // UFC parse when the JSON value is null or not a boolean; with a Boolean field it tolerates
+    // null (and other malformed values are still caught locally) so a malformed consent field
+    // doesn't strand a fresh pod on PROVIDER_NOT_READY. Read sites must use
+    // Boolean.TRUE.equals(...) so null falls to the privacy-preserving default.
+    public final Boolean observeFullEvaluationData;
+    public final Environment environment;
+    public final Map<String, Flag> flags;
 
-  // Flags that could not be parsed or validated. The key is the flag key; the value is the error
-  // type (e.g. "invalid_semver_comparand"). Set during configuration preprocessing, not from JSON.
-  public transient Map<String, String> invalidFlags = Collections.emptyMap();
+    // Flags that could not be parsed or validated. The key is the flag key; the value is the error
+    // type (e.g. "invalid_semver_comparand"). Set during configuration preprocessing, not from JSON.
+    public transient Map<String, String> invalidFlags = Collections.emptyMap();
 
-  public ServerConfiguration(
-      final String createdAt,
-      final String format,
-      final Boolean observeFullEvaluationData,
-      final Environment environment,
-      final Map<String, Flag> flags) {
-    this.createdAt = createdAt;
-    this.format = format;
-    this.observeFullEvaluationData = observeFullEvaluationData;
-    this.environment = environment;
-    this.flags = flags;
-  }
+    public ServerConfiguration(
+            final String createdAt,
+            final String format,
+            final Boolean observeFullEvaluationData,
+            final Environment environment,
+            final Map<String, Flag> flags) {
+        this.createdAt = createdAt;
+        this.format = format;
+        this.observeFullEvaluationData = observeFullEvaluationData;
+        this.environment = environment;
+        this.flags = flags;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Shard.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Shard.java
index fef1e5f04b4..5f543edfc6d 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Shard.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Shard.java
@@ -10,13 +10,13 @@
  * before comparing it or using it for arithmetic.
  */
 public class Shard {
-  public final String salt;
-  public final List<ShardRange> ranges;
-  public final int totalShards;
+    public final String salt;
+    public final List<ShardRange> ranges;
+    public final int totalShards;
 
-  public Shard(final String salt, final List<ShardRange> ranges, final int totalShards) {
-    this.salt = salt;
-    this.ranges = ranges;
-    this.totalShards = totalShards;
-  }
+    public Shard(final String salt, final List<ShardRange> ranges, final int totalShards) {
+        this.salt = salt;
+        this.ranges = ranges;
+        this.totalShards = totalShards;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ShardRange.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ShardRange.java
index 4a8c5078daf..5d9fc13c838 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ShardRange.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ShardRange.java
@@ -8,11 +8,11 @@
  * Integer#toUnsignedLong(int)} before comparing them.
  */
 public class ShardRange {
-  public final int start;
-  public final int end;
+    public final int start;
+    public final int end;
 
-  public ShardRange(final int start, final int end) {
-    this.start = start;
-    this.end = end;
-  }
+    public ShardRange(final int start, final int end) {
+        this.start = start;
+        this.end = end;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Split.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Split.java
index 37f6909eeea..19e02622c19 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Split.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Split.java
@@ -4,22 +4,22 @@
 import java.util.Map;
 
 public class Split {
-  public final List<Shard> shards;
-  public final String variationKey;
-  public final Map<String, String> extraLogging;
-  // Nullable Integer (not primitive int): the serialId is absent in some UFC shapes. Populated by
-  // Moshi reflective deserialization from the UFC "serialId" JSON field. Surfaced as
-  // __dd_split_serial_id in eval metadata for APM span enrichment.
-  public final Integer serialId;
+    public final List<Shard> shards;
+    public final String variationKey;
+    public final Map<String, String> extraLogging;
+    // Nullable Integer (not primitive int): the serialId is absent in some UFC shapes. Populated by
+    // Moshi reflective deserialization from the UFC "serialId" JSON field. Surfaced as
+    // __dd_split_serial_id in eval metadata for APM span enrichment.
+    public final Integer serialId;
 
-  public Split(
-      final List<Shard> shards,
-      final String variationKey,
-      final Map<String, String> extraLogging,
-      final Integer serialId) {
-    this.shards = shards;
-    this.variationKey = variationKey;
-    this.extraLogging = extraLogging;
-    this.serialId = serialId;
-  }
+    public Split(
+            final List<Shard> shards,
+            final String variationKey,
+            final Map<String, String> extraLogging,
+            final Integer serialId) {
+        this.shards = shards;
+        this.variationKey = variationKey;
+        this.extraLogging = extraLogging;
+        this.serialId = serialId;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ValueType.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ValueType.java
index 6f0a973a379..747becf82ee 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ValueType.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/ValueType.java
@@ -1,9 +1,9 @@
 package datadog.trace.api.featureflag.ufc.v1;
 
 public enum ValueType {
-  BOOLEAN,
-  INTEGER,
-  NUMERIC,
-  STRING,
-  JSON
+    BOOLEAN,
+    INTEGER,
+    NUMERIC,
+    STRING,
+    JSON
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Variant.java b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Variant.java
index 26e30aa1aad..9e2738ad13b 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Variant.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/main/java/datadog/trace/api/featureflag/ufc/v1/Variant.java
@@ -1,11 +1,11 @@
 package datadog.trace.api.featureflag.ufc.v1;
 
 public class Variant {
-  public final String key;
-  public final Object value;
+    public final String key;
+    public final Object value;
 
-  public Variant(final String key, final Object value) {
-    this.key = key;
-    this.value = value;
-  }
+    public Variant(final String key, final Object value) {
+        this.key = key;
+        this.value = value;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/FeatureFlaggingGatewayTest.java b/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/FeatureFlaggingGatewayTest.java
index 887a153f0a1..e079ab0d920 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/FeatureFlaggingGatewayTest.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/FeatureFlaggingGatewayTest.java
@@ -12,104 +12,104 @@
 
 class FeatureFlaggingGatewayTest {
 
-  private FeatureFlaggingGateway.ConfigListener configListener;
-  private FeatureFlaggingGateway.ActivationListener activationListener;
-  private FeatureFlaggingGateway.ExposureListener exposureListener;
-  private FeatureFlaggingGateway.SpanEnrichmentListener spanEnrichmentListener;
-  private ServerConfiguration firstConfiguration;
-  private ServerConfiguration secondConfiguration;
-  private ExposureEvent firstExposure;
-  private ExposureEvent secondExposure;
-
-  @BeforeEach
-  void setUp() {
-    configListener = mock(FeatureFlaggingGateway.ConfigListener.class);
-    activationListener = mock(FeatureFlaggingGateway.ActivationListener.class);
-    exposureListener = mock(FeatureFlaggingGateway.ExposureListener.class);
-    spanEnrichmentListener = mock(FeatureFlaggingGateway.SpanEnrichmentListener.class);
-    firstConfiguration = mock(ServerConfiguration.class);
-    secondConfiguration = mock(ServerConfiguration.class);
-    firstExposure = mock(ExposureEvent.class);
-    secondExposure = mock(ExposureEvent.class);
-  }
-
-  @AfterEach
-  void tearDown() {
-    FeatureFlaggingGateway.removeConfigListener(configListener);
-    FeatureFlaggingGateway.removeActivationListener(activationListener);
-    FeatureFlaggingGateway.removeExposureListener(exposureListener);
-    FeatureFlaggingGateway.removeSpanEnrichmentListener(spanEnrichmentListener);
-    FeatureFlaggingGateway.setFlagEvalWriter(null);
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
-  }
-
-  @Test
-  void testProviderActivationListener() {
-    FeatureFlaggingGateway.addActivationListener(activationListener);
-
-    FeatureFlaggingGateway.activate();
-
-    verify(activationListener).activate();
-    verifyNoMoreInteractions(activationListener);
-  }
-
-  @Test
-  void testAttachingAConfigListener() {
-    clearCurrentServerConfiguration();
-
-    FeatureFlaggingGateway.addConfigListener(configListener);
-    FeatureFlaggingGateway.dispatch(firstConfiguration);
-
-    verify(configListener).accept(firstConfiguration);
-    verifyNoMoreInteractions(configListener);
-
-    FeatureFlaggingGateway.dispatch(secondConfiguration);
-
-    verify(configListener).accept(secondConfiguration);
-    verifyNoMoreInteractions(configListener);
-  }
-
-  @Test
-  void testAttachingAListenerAfterConfigured() {
-    FeatureFlaggingGateway.dispatch(firstConfiguration);
-    FeatureFlaggingGateway.addConfigListener(configListener);
-
-    verify(configListener).accept(firstConfiguration);
-    verifyNoMoreInteractions(configListener);
-  }
-
-  @Test
-  void testAttachingAnExposureListener() {
-    FeatureFlaggingGateway.addExposureListener(exposureListener);
-    FeatureFlaggingGateway.dispatch(firstExposure);
-
-    verify(exposureListener).accept(firstExposure);
-    verifyNoMoreInteractions(exposureListener);
-
-    FeatureFlaggingGateway.dispatch(secondExposure);
-
-    verify(exposureListener).accept(secondExposure);
-    verifyNoMoreInteractions(exposureListener);
-  }
-
-  @Test
-  void testAttachingASpanEnrichmentListener() {
-    final SpanEnrichmentEvent firstEvent = SpanEnrichmentEvent.serialId(42, true, "user-1");
-    final SpanEnrichmentEvent secondEvent = SpanEnrichmentEvent.runtimeDefault("flag", "value");
-
-    FeatureFlaggingGateway.addSpanEnrichmentListener(spanEnrichmentListener);
-    FeatureFlaggingGateway.dispatch(firstEvent);
-
-    verify(spanEnrichmentListener).accept(firstEvent);
-    verifyNoMoreInteractions(spanEnrichmentListener);
-
-    FeatureFlaggingGateway.dispatch(secondEvent);
-
-    verify(spanEnrichmentListener).accept(secondEvent);
-    verifyNoMoreInteractions(spanEnrichmentListener);
-  }
-
-  private static void clearCurrentServerConfiguration() {
-    FeatureFlaggingGateway.dispatch((ServerConfiguration) null);
-  }
+    private FeatureFlaggingGateway.ConfigListener configListener;
+    private FeatureFlaggingGateway.ActivationListener activationListener;
+    private FeatureFlaggingGateway.ExposureListener exposureListener;
+    private FeatureFlaggingGateway.SpanEnrichmentListener spanEnrichmentListener;
+    private ServerConfiguration firstConfiguration;
+    private ServerConfiguration secondConfiguration;
+    private ExposureEvent firstExposure;
+    private ExposureEvent secondExposure;
+
+    @BeforeEach
+    void setUp() {
+        configListener = mock(FeatureFlaggingGateway.ConfigListener.class);
+        activationListener = mock(FeatureFlaggingGateway.ActivationListener.class);
+        exposureListener = mock(FeatureFlaggingGateway.ExposureListener.class);
+        spanEnrichmentListener = mock(FeatureFlaggingGateway.SpanEnrichmentListener.class);
+        firstConfiguration = mock(ServerConfiguration.class);
+        secondConfiguration = mock(ServerConfiguration.class);
+        firstExposure = mock(ExposureEvent.class);
+        secondExposure = mock(ExposureEvent.class);
+    }
+
+    @AfterEach
+    void tearDown() {
+        FeatureFlaggingGateway.removeConfigListener(configListener);
+        FeatureFlaggingGateway.removeActivationListener(activationListener);
+        FeatureFlaggingGateway.removeExposureListener(exposureListener);
+        FeatureFlaggingGateway.removeSpanEnrichmentListener(spanEnrichmentListener);
+        FeatureFlaggingGateway.setFlagEvalWriter(null);
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
+    }
+
+    @Test
+    void testProviderActivationListener() {
+        FeatureFlaggingGateway.addActivationListener(activationListener);
+
+        FeatureFlaggingGateway.activate();
+
+        verify(activationListener).activate();
+        verifyNoMoreInteractions(activationListener);
+    }
+
+    @Test
+    void testAttachingAConfigListener() {
+        clearCurrentServerConfiguration();
+
+        FeatureFlaggingGateway.addConfigListener(configListener);
+        FeatureFlaggingGateway.dispatch(firstConfiguration);
+
+        verify(configListener).accept(firstConfiguration);
+        verifyNoMoreInteractions(configListener);
+
+        FeatureFlaggingGateway.dispatch(secondConfiguration);
+
+        verify(configListener).accept(secondConfiguration);
+        verifyNoMoreInteractions(configListener);
+    }
+
+    @Test
+    void testAttachingAListenerAfterConfigured() {
+        FeatureFlaggingGateway.dispatch(firstConfiguration);
+        FeatureFlaggingGateway.addConfigListener(configListener);
+
+        verify(configListener).accept(firstConfiguration);
+        verifyNoMoreInteractions(configListener);
+    }
+
+    @Test
+    void testAttachingAnExposureListener() {
+        FeatureFlaggingGateway.addExposureListener(exposureListener);
+        FeatureFlaggingGateway.dispatch(firstExposure);
+
+        verify(exposureListener).accept(firstExposure);
+        verifyNoMoreInteractions(exposureListener);
+
+        FeatureFlaggingGateway.dispatch(secondExposure);
+
+        verify(exposureListener).accept(secondExposure);
+        verifyNoMoreInteractions(exposureListener);
+    }
+
+    @Test
+    void testAttachingASpanEnrichmentListener() {
+        final SpanEnrichmentEvent firstEvent = SpanEnrichmentEvent.serialId(42, true, "user-1");
+        final SpanEnrichmentEvent secondEvent = SpanEnrichmentEvent.runtimeDefault("flag", "value");
+
+        FeatureFlaggingGateway.addSpanEnrichmentListener(spanEnrichmentListener);
+        FeatureFlaggingGateway.dispatch(firstEvent);
+
+        verify(spanEnrichmentListener).accept(firstEvent);
+        verifyNoMoreInteractions(spanEnrichmentListener);
+
+        FeatureFlaggingGateway.dispatch(secondEvent);
+
+        verify(spanEnrichmentListener).accept(secondEvent);
+        verifyNoMoreInteractions(spanEnrichmentListener);
+    }
+
+    private static void clearCurrentServerConfiguration() {
+        FeatureFlaggingGateway.dispatch((ServerConfiguration) null);
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/SpanEnrichmentEventTest.java b/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/SpanEnrichmentEventTest.java
index 55e7a8943ac..049f0d580d7 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/SpanEnrichmentEventTest.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/SpanEnrichmentEventTest.java
@@ -10,47 +10,47 @@
 
 class SpanEnrichmentEventTest {
 
-  @Test
-  void serialIdEventCarriesItsFields() {
-    final SpanEnrichmentEvent event = SpanEnrichmentEvent.serialId(42, true, "user-1");
-
-    assertTrue(event.hasSerialId());
-    assertEquals(42, event.serialId());
-    assertTrue(event.doLog());
-    assertEquals("user-1", event.targetingKey());
-    assertNull(event.flagKey());
-    assertNull(event.defaultValue());
-  }
-
-  @Test
-  void serialIdEventWithoutDoLogOrTargetingKey() {
-    final SpanEnrichmentEvent event = SpanEnrichmentEvent.serialId(7, false, null);
-
-    assertTrue(event.hasSerialId());
-    assertEquals(7, event.serialId());
-    assertFalse(event.doLog());
-    assertNull(event.targetingKey());
-  }
-
-  @Test
-  void runtimeDefaultEventCarriesItsFields() {
-    final Object value = Collections.singletonMap("k", "v");
-    final SpanEnrichmentEvent event = SpanEnrichmentEvent.runtimeDefault("flag", value);
-
-    assertFalse(event.hasSerialId());
-    assertEquals("flag", event.flagKey());
-    assertEquals(value, event.defaultValue());
-    assertEquals(0, event.serialId());
-    assertFalse(event.doLog());
-    assertNull(event.targetingKey());
-  }
-
-  @Test
-  void runtimeDefaultEventAllowsNullValue() {
-    final SpanEnrichmentEvent event = SpanEnrichmentEvent.runtimeDefault("flag", null);
-
-    assertFalse(event.hasSerialId());
-    assertEquals("flag", event.flagKey());
-    assertNull(event.defaultValue());
-  }
+    @Test
+    void serialIdEventCarriesItsFields() {
+        final SpanEnrichmentEvent event = SpanEnrichmentEvent.serialId(42, true, "user-1");
+
+        assertTrue(event.hasSerialId());
+        assertEquals(42, event.serialId());
+        assertTrue(event.doLog());
+        assertEquals("user-1", event.targetingKey());
+        assertNull(event.flagKey());
+        assertNull(event.defaultValue());
+    }
+
+    @Test
+    void serialIdEventWithoutDoLogOrTargetingKey() {
+        final SpanEnrichmentEvent event = SpanEnrichmentEvent.serialId(7, false, null);
+
+        assertTrue(event.hasSerialId());
+        assertEquals(7, event.serialId());
+        assertFalse(event.doLog());
+        assertNull(event.targetingKey());
+    }
+
+    @Test
+    void runtimeDefaultEventCarriesItsFields() {
+        final Object value = Collections.singletonMap("k", "v");
+        final SpanEnrichmentEvent event = SpanEnrichmentEvent.runtimeDefault("flag", value);
+
+        assertFalse(event.hasSerialId());
+        assertEquals("flag", event.flagKey());
+        assertEquals(value, event.defaultValue());
+        assertEquals(0, event.serialId());
+        assertFalse(event.doLog());
+        assertNull(event.targetingKey());
+    }
+
+    @Test
+    void runtimeDefaultEventAllowsNullValue() {
+        final SpanEnrichmentEvent event = SpanEnrichmentEvent.runtimeDefault("flag", null);
+
+        assertFalse(event.hasSerialId());
+        assertEquals("flag", event.flagKey());
+        assertNull(event.defaultValue());
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/flagevaluation/FlagEvalEventTest.java b/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/flagevaluation/FlagEvalEventTest.java
index cc614150178..3df44c6477d 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/flagevaluation/FlagEvalEventTest.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/flagevaluation/FlagEvalEventTest.java
@@ -12,43 +12,40 @@
 
 class FlagEvalEventTest {
 
-  @Test
-  void storesFieldsWithContextAttributes() {
-    final Map<String, Object> attrs = Collections.singletonMap("tier", "gold");
-
-    final FlagEvalEvent event =
-        new FlagEvalEvent("my-flag", "on", "allocation-1", "target-1", 123L, attrs);
-
-    assertEquals("my-flag", event.flagKey);
-    assertEquals("on", event.variant);
-    assertEquals("allocation-1", event.allocationKey);
-    assertEquals("target-1", event.targetingKey);
-    assertNull(event.errorMessage);
-    assertEquals(123L, event.evalTimeMs);
-    assertSame(attrs, event.attrs);
-  }
-
-  @Test
-  void storesErrorMessageAndDefaultsNullContextAttributes() {
-    final Map<String, Object> attrs = null;
-    final FlagEvalEvent event =
-        new FlagEvalEvent("my-flag", null, null, null, "type mismatch", 456L, attrs);
-
-    assertEquals("type mismatch", event.errorMessage);
-    assertTrue(event.attrs.isEmpty());
-  }
-
-  @Test
-  void observeFullEvaluationDataDefaultsToFalseOnConvenienceConstructors() {
-    final Map<String, Object> attrs = Collections.emptyMap();
-    assertFalse(new FlagEvalEvent("f", "on", "a", "t", 1L, attrs).observeFullEvaluationData);
-    assertFalse(new FlagEvalEvent("f", "on", "a", "t", null, 1L, attrs).observeFullEvaluationData);
-  }
-
-  @Test
-  void storesExplicitObserveFullEvaluationData() {
-    final Map<String, Object> attrs = Collections.emptyMap();
-    assertTrue(
-        new FlagEvalEvent("f", "on", "a", "t", null, 1L, true, attrs).observeFullEvaluationData);
-  }
+    @Test
+    void storesFieldsWithContextAttributes() {
+        final Map<String, Object> attrs = Collections.singletonMap("tier", "gold");
+
+        final FlagEvalEvent event = new FlagEvalEvent("my-flag", "on", "allocation-1", "target-1", 123L, attrs);
+
+        assertEquals("my-flag", event.flagKey);
+        assertEquals("on", event.variant);
+        assertEquals("allocation-1", event.allocationKey);
+        assertEquals("target-1", event.targetingKey);
+        assertNull(event.errorMessage);
+        assertEquals(123L, event.evalTimeMs);
+        assertSame(attrs, event.attrs);
+    }
+
+    @Test
+    void storesErrorMessageAndDefaultsNullContextAttributes() {
+        final Map<String, Object> attrs = null;
+        final FlagEvalEvent event = new FlagEvalEvent("my-flag", null, null, null, "type mismatch", 456L, attrs);
+
+        assertEquals("type mismatch", event.errorMessage);
+        assertTrue(event.attrs.isEmpty());
+    }
+
+    @Test
+    void observeFullEvaluationDataDefaultsToFalseOnConvenienceConstructors() {
+        final Map<String, Object> attrs = Collections.emptyMap();
+        assertFalse(new FlagEvalEvent("f", "on", "a", "t", 1L, attrs).observeFullEvaluationData);
+        assertFalse(new FlagEvalEvent("f", "on", "a", "t", null, 1L, attrs).observeFullEvaluationData);
+    }
+
+    @Test
+    void storesExplicitObserveFullEvaluationData() {
+        final Map<String, Object> attrs = Collections.emptyMap();
+        assertTrue(new FlagEvalEvent("f", "on", "a", "t", null, 1L, true, attrs).observeFullEvaluationData);
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/ufc/v1/ParsedSemverTest.java b/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/ufc/v1/ParsedSemverTest.java
index e3d78ac4b86..01cde560e8b 100644
--- a/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/ufc/v1/ParsedSemverTest.java
+++ b/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/ufc/v1/ParsedSemverTest.java
@@ -14,207 +14,192 @@
 
 class ParsedSemverTest {
 
-  // --- Parse tests (ported from Go semver_test.go TestParseSemver) ---
-
-  static Stream<Arguments> validVersions() {
-    return Stream.of(
-        Arguments.of("0.0.0", 0L, 0L, 0L, ""),
-        Arguments.of(
-            "18446744073709551615.18446744073709551615.18446744073709551615",
-            Long.parseUnsignedLong("18446744073709551615"),
-            Long.parseUnsignedLong("18446744073709551615"),
-            Long.parseUnsignedLong("18446744073709551615"),
-            ""),
-        Arguments.of("1.2.3-alpha.1", 1L, 2L, 3L, "alpha.1"),
-        Arguments.of("1.2.3-18446744073709551616", 1L, 2L, 3L, "18446744073709551616"),
-        Arguments.of("1.2.3+build.001", 1L, 2L, 3L, ""),
-        Arguments.of("1.2.3-alpha-1+build.001", 1L, 2L, 3L, "alpha-1"));
-  }
-
-  @ParameterizedTest(name = "valid: {0}")
-  @MethodSource("validVersions")
-  void testParseValid(
-      final String version,
-      final long major,
-      final long minor,
-      final long patch,
-      final String prerelease) {
-    final ParsedSemver parsed = ParsedSemver.parse(version);
-    assertTrue(parsed != null, "expected " + version + " to parse");
-    assertEquals(major, parsed.getMajor());
-    assertEquals(minor, parsed.getMinor());
-    assertEquals(patch, parsed.getPatch());
-    assertEquals(prerelease, parsed.getPrerelease());
-  }
-
-  static Stream<String> invalidVersions() {
-    return Stream.of(
-        "",
-        "x",
-        "v1.2.3",
-        "01.2.3",
-        "1.02.3",
-        "1.2.03",
-        "18446744073709551616.0.0",
-        "0.18446744073709551616.0",
-        "0.0.18446744073709551616",
-        "1.2.3-",
-        "1.2.3+",
-        "1.2.3-alpha..1",
-        "1.2.3+build..1",
-        "1.2.3-01",
-        "1.2.3-alpha_1",
-        "1.2.3-alpha+build+other",
-        "1.2.3-α",
-        " 1.2.3",
-        "1.2.3 ");
-  }
-
-  @ParameterizedTest(name = "invalid: {0}")
-  @MethodSource("invalidVersions")
-  void testParseInvalid(final String version) {
-    assertNull(ParsedSemver.parse(version), "expected " + version + " to be invalid");
-  }
-
-  // --- Compare tests (ported from Go semver_test.go TestCompareSemver) ---
-
-  /** The canonical SemVer precedence ordering from the spec. */
-  private static final String[] ORDERED_VERSIONS = {
-    "1.0.0-alpha",
-    "1.0.0-alpha.1",
-    "1.0.0-alpha.beta",
-    "1.0.0-beta",
-    "1.0.0-beta.2",
-    "1.0.0-beta.11",
-    "1.0.0-rc.1",
-    "1.0.0",
-    "1.0.1",
-    "1.1.0",
-    "2.0.0",
-  };
-
-  @Test
-  void normalizesMissingCorePartsAndComparesExtendedCoreParts() {
-    assertEquals(0, ParsedSemver.compare(ParsedSemver.parse("18"), ParsedSemver.parse("18.0.0")));
-    assertEquals(0, ParsedSemver.compare(ParsedSemver.parse("18.0"), ParsedSemver.parse("18.0.0")));
-    assertEquals(
-        0, ParsedSemver.compare(ParsedSemver.parse("1.2.3"), ParsedSemver.parse("1.2.3.0")));
-    assertEquals(
-        0, ParsedSemver.compare(ParsedSemver.parse("1.2.3"), ParsedSemver.parse("1.2.3.0.0")));
-    assertTrue(
-        ParsedSemver.compare(ParsedSemver.parse("1.2.3.4"), ParsedSemver.parse("1.2.3.5")) < 0);
-    assertTrue(ParsedSemver.parse("1.2.3.4.5.6") != null);
-    assertTrue(ParsedSemver.parse("1.2.3.4.5.6.7") != null);
-    assertTrue(
-        ParsedSemver.compare(ParsedSemver.parse("1.2.3.4.5"), ParsedSemver.parse("1.2.3.4.6")) < 0);
-    assertTrue(
-        ParsedSemver.compare(ParsedSemver.parse("1.2.3.4.5.6"), ParsedSemver.parse("1.2.3.4.5.7"))
-            < 0);
-    assertTrue(
-        ParsedSemver.compare(
-                ParsedSemver.parse("1.2.3.4.5.6.7"), ParsedSemver.parse("1.2.3.4.5.6.8"))
-            < 0);
-    assertTrue(
-        ParsedSemver.compare(ParsedSemver.parse("18.0.0.0"), ParsedSemver.parse("17.0.0")) > 0);
-    assertTrue(
-        ParsedSemver.compare(ParsedSemver.parse("18.0.0.0.0"), ParsedSemver.parse("17.0.0")) > 0);
-  }
-
-  @Test
-  void testCompareSemverOrdering() {
-    for (int i = 0; i < ORDERED_VERSIONS.length; i++) {
-      final ParsedSemver left = ParsedSemver.parse(ORDERED_VERSIONS[i]);
-      assertTrue(left != null, "left parse failed: " + ORDERED_VERSIONS[i]);
-      for (int j = 0; j < ORDERED_VERSIONS.length; j++) {
-        final ParsedSemver right = ParsedSemver.parse(ORDERED_VERSIONS[j]);
-        assertTrue(right != null, "right parse failed: " + ORDERED_VERSIONS[j]);
-        final int ordering = ParsedSemver.compare(left, right);
-        if (i < j) {
-          assertTrue(ordering < 0, ORDERED_VERSIONS[i] + " should precede " + ORDERED_VERSIONS[j]);
-        } else if (i > j) {
-          assertTrue(ordering > 0, ORDERED_VERSIONS[i] + " should follow " + ORDERED_VERSIONS[j]);
-        } else {
-          assertEquals(0, ordering);
+    // --- Parse tests (ported from Go semver_test.go TestParseSemver) ---
+
+    static Stream<Arguments> validVersions() {
+        return Stream.of(
+                Arguments.of("0.0.0", 0L, 0L, 0L, ""),
+                Arguments.of(
+                        "18446744073709551615.18446744073709551615.18446744073709551615",
+                        Long.parseUnsignedLong("18446744073709551615"),
+                        Long.parseUnsignedLong("18446744073709551615"),
+                        Long.parseUnsignedLong("18446744073709551615"),
+                        ""),
+                Arguments.of("1.2.3-alpha.1", 1L, 2L, 3L, "alpha.1"),
+                Arguments.of("1.2.3-18446744073709551616", 1L, 2L, 3L, "18446744073709551616"),
+                Arguments.of("1.2.3+build.001", 1L, 2L, 3L, ""),
+                Arguments.of("1.2.3-alpha-1+build.001", 1L, 2L, 3L, "alpha-1"));
+    }
+
+    @ParameterizedTest(name = "valid: {0}")
+    @MethodSource("validVersions")
+    void testParseValid(
+            final String version, final long major, final long minor, final long patch, final String prerelease) {
+        final ParsedSemver parsed = ParsedSemver.parse(version);
+        assertTrue(parsed != null, "expected " + version + " to parse");
+        assertEquals(major, parsed.getMajor());
+        assertEquals(minor, parsed.getMinor());
+        assertEquals(patch, parsed.getPatch());
+        assertEquals(prerelease, parsed.getPrerelease());
+    }
+
+    static Stream<String> invalidVersions() {
+        return Stream.of(
+                "",
+                "x",
+                "v1.2.3",
+                "01.2.3",
+                "1.02.3",
+                "1.2.03",
+                "18446744073709551616.0.0",
+                "0.18446744073709551616.0",
+                "0.0.18446744073709551616",
+                "1.2.3-",
+                "1.2.3+",
+                "1.2.3-alpha..1",
+                "1.2.3+build..1",
+                "1.2.3-01",
+                "1.2.3-alpha_1",
+                "1.2.3-alpha+build+other",
+                "1.2.3-α",
+                " 1.2.3",
+                "1.2.3 ");
+    }
+
+    @ParameterizedTest(name = "invalid: {0}")
+    @MethodSource("invalidVersions")
+    void testParseInvalid(final String version) {
+        assertNull(ParsedSemver.parse(version), "expected " + version + " to be invalid");
+    }
+
+    // --- Compare tests (ported from Go semver_test.go TestCompareSemver) ---
+
+    /** The canonical SemVer precedence ordering from the spec. */
+    private static final String[] ORDERED_VERSIONS = {
+        "1.0.0-alpha",
+        "1.0.0-alpha.1",
+        "1.0.0-alpha.beta",
+        "1.0.0-beta",
+        "1.0.0-beta.2",
+        "1.0.0-beta.11",
+        "1.0.0-rc.1",
+        "1.0.0",
+        "1.0.1",
+        "1.1.0",
+        "2.0.0",
+    };
+
+    @Test
+    void normalizesMissingCorePartsAndComparesExtendedCoreParts() {
+        assertEquals(0, ParsedSemver.compare(ParsedSemver.parse("18"), ParsedSemver.parse("18.0.0")));
+        assertEquals(0, ParsedSemver.compare(ParsedSemver.parse("18.0"), ParsedSemver.parse("18.0.0")));
+        assertEquals(0, ParsedSemver.compare(ParsedSemver.parse("1.2.3"), ParsedSemver.parse("1.2.3.0")));
+        assertEquals(0, ParsedSemver.compare(ParsedSemver.parse("1.2.3"), ParsedSemver.parse("1.2.3.0.0")));
+        assertTrue(ParsedSemver.compare(ParsedSemver.parse("1.2.3.4"), ParsedSemver.parse("1.2.3.5")) < 0);
+        assertTrue(ParsedSemver.parse("1.2.3.4.5.6") != null);
+        assertTrue(ParsedSemver.parse("1.2.3.4.5.6.7") != null);
+        assertTrue(ParsedSemver.compare(ParsedSemver.parse("1.2.3.4.5"), ParsedSemver.parse("1.2.3.4.6")) < 0);
+        assertTrue(ParsedSemver.compare(ParsedSemver.parse("1.2.3.4.5.6"), ParsedSemver.parse("1.2.3.4.5.7")) < 0);
+        assertTrue(ParsedSemver.compare(ParsedSemver.parse("1.2.3.4.5.6.7"), ParsedSemver.parse("1.2.3.4.5.6.8")) < 0);
+        assertTrue(ParsedSemver.compare(ParsedSemver.parse("18.0.0.0"), ParsedSemver.parse("17.0.0")) > 0);
+        assertTrue(ParsedSemver.compare(ParsedSemver.parse("18.0.0.0.0"), ParsedSemver.parse("17.0.0")) > 0);
+    }
+
+    @Test
+    void testCompareSemverOrdering() {
+        for (int i = 0; i < ORDERED_VERSIONS.length; i++) {
+            final ParsedSemver left = ParsedSemver.parse(ORDERED_VERSIONS[i]);
+            assertTrue(left != null, "left parse failed: " + ORDERED_VERSIONS[i]);
+            for (int j = 0; j < ORDERED_VERSIONS.length; j++) {
+                final ParsedSemver right = ParsedSemver.parse(ORDERED_VERSIONS[j]);
+                assertTrue(right != null, "right parse failed: " + ORDERED_VERSIONS[j]);
+                final int ordering = ParsedSemver.compare(left, right);
+                if (i < j) {
+                    assertTrue(ordering < 0, ORDERED_VERSIONS[i] + " should precede " + ORDERED_VERSIONS[j]);
+                } else if (i > j) {
+                    assertTrue(ordering > 0, ORDERED_VERSIONS[i] + " should follow " + ORDERED_VERSIONS[j]);
+                } else {
+                    assertEquals(0, ordering);
+                }
+            }
         }
-      }
     }
-  }
-
-  @Test
-  void testCompareSemverArbitrarilyLargeNumericPrerelease() {
-    final ParsedSemver left = ParsedSemver.parse("1.0.0-99999999999999999999");
-    assertTrue(left != null);
-    final ParsedSemver right = ParsedSemver.parse("1.0.0-100000000000000000000");
-    assertTrue(right != null);
-    assertTrue(ParsedSemver.compare(left, right) < 0);
-  }
-
-  @Test
-  void testValueObjectMethods() {
-    final ParsedSemver value = ParsedSemver.parse("1.2.3-alpha");
-    final ParsedSemver equalValue = ParsedSemver.parse("1.2.3-alpha");
-    final ParsedSemver release = ParsedSemver.parse("1.2.3");
-    assertTrue(value != null);
-    assertTrue(equalValue != null);
-    assertTrue(release != null);
-    assertTrue(value.equals(value));
-    assertTrue(value.equals(equalValue));
-    assertFalse(value.equals(null));
-    assertFalse(value.equals("1.2.3-alpha"));
-    assertEquals(value.hashCode(), equalValue.hashCode());
-    assertEquals("1.2.3-alpha", value.toString());
-    assertEquals("1.2.3", release.toString());
-  }
-
-  @Test
-  void testCompareSemverNumericPrereleaseIdentifiersLexicographically() {
-    final ParsedSemver left = ParsedSemver.parse("1.0.0-10");
-    assertTrue(left != null);
-    final ParsedSemver right = ParsedSemver.parse("1.0.0-11");
-    assertTrue(right != null);
-    assertTrue(ParsedSemver.compare(left, right) < 0);
-  }
-
-  @Test
-  void testEqualsAndHashCodeNormalizeTrailingZeroComponents() {
-    // Versions that compare as equal must also be equals() and share a hashCode, even when they
-    // differ only by trailing zero components (1.2.3 vs 1.2.3.0 vs 1.2.3.0.0).
-    final ParsedSemver base = ParsedSemver.parse("1.2.3");
-    final ParsedSemver trailingZero = ParsedSemver.parse("1.2.3.0");
-    final ParsedSemver trailingZeros = ParsedSemver.parse("1.2.3.0.0");
-    assertTrue(base != null);
-    assertTrue(trailingZero != null);
-    assertTrue(trailingZeros != null);
-    assertEquals(0, ParsedSemver.compare(base, trailingZero));
-    assertEquals(0, ParsedSemver.compare(base, trailingZeros));
-    assertEquals(base, trailingZero);
-    assertEquals(base, trailingZeros);
-    assertEquals(trailingZero, trailingZeros);
-    assertEquals(base.hashCode(), trailingZero.hashCode());
-    assertEquals(base.hashCode(), trailingZeros.hashCode());
-    assertEquals(trailingZero.hashCode(), trailingZeros.hashCode());
-
-    // All-zero versions of varying length are also compare-equal and must hash identically.
-    final ParsedSemver zero = ParsedSemver.parse("0");
-    final ParsedSemver zeroZero = ParsedSemver.parse("0.0.0.0");
-    assertTrue(zero != null);
-    assertTrue(zeroZero != null);
-    assertEquals(0, ParsedSemver.compare(zero, zeroZero));
-    assertEquals(zero, zeroZero);
-    assertEquals(zero.hashCode(), zeroZero.hashCode());
-
-    // Distinct versions must remain unequal and may differ in hash.
-    final ParsedSemver release = ParsedSemver.parse("1.2.4");
-    assertTrue(release != null);
-    assertNotEquals(base, release);
-  }
-
-  @Test
-  void testCompareSemverBuildMetadataIsIgnored() {
-    final ParsedSemver left = ParsedSemver.parse("1.0.0+build.1");
-    assertTrue(left != null);
-    final ParsedSemver right = ParsedSemver.parse("1.0.0+build.2");
-    assertTrue(right != null);
-    assertEquals(0, ParsedSemver.compare(left, right));
-  }
+
+    @Test
+    void testCompareSemverArbitrarilyLargeNumericPrerelease() {
+        final ParsedSemver left = ParsedSemver.parse("1.0.0-99999999999999999999");
+        assertTrue(left != null);
+        final ParsedSemver right = ParsedSemver.parse("1.0.0-100000000000000000000");
+        assertTrue(right != null);
+        assertTrue(ParsedSemver.compare(left, right) < 0);
+    }
+
+    @Test
+    void testValueObjectMethods() {
+        final ParsedSemver value = ParsedSemver.parse("1.2.3-alpha");
+        final ParsedSemver equalValue = ParsedSemver.parse("1.2.3-alpha");
+        final ParsedSemver release = ParsedSemver.parse("1.2.3");
+        assertTrue(value != null);
+        assertTrue(equalValue != null);
+        assertTrue(release != null);
+        assertTrue(value.equals(value));
+        assertTrue(value.equals(equalValue));
+        assertFalse(value.equals(null));
+        assertFalse(value.equals("1.2.3-alpha"));
+        assertEquals(value.hashCode(), equalValue.hashCode());
+        assertEquals("1.2.3-alpha", value.toString());
+        assertEquals("1.2.3", release.toString());
+    }
+
+    @Test
+    void testCompareSemverNumericPrereleaseIdentifiersLexicographically() {
+        final ParsedSemver left = ParsedSemver.parse("1.0.0-10");
+        assertTrue(left != null);
+        final ParsedSemver right = ParsedSemver.parse("1.0.0-11");
+        assertTrue(right != null);
+        assertTrue(ParsedSemver.compare(left, right) < 0);
+    }
+
+    @Test
+    void testEqualsAndHashCodeNormalizeTrailingZeroComponents() {
+        // Versions that compare as equal must also be equals() and share a hashCode, even when they
+        // differ only by trailing zero components (1.2.3 vs 1.2.3.0 vs 1.2.3.0.0).
+        final ParsedSemver base = ParsedSemver.parse("1.2.3");
+        final ParsedSemver trailingZero = ParsedSemver.parse("1.2.3.0");
+        final ParsedSemver trailingZeros = ParsedSemver.parse("1.2.3.0.0");
+        assertTrue(base != null);
+        assertTrue(trailingZero != null);
+        assertTrue(trailingZeros != null);
+        assertEquals(0, ParsedSemver.compare(base, trailingZero));
+        assertEquals(0, ParsedSemver.compare(base, trailingZeros));
+        assertEquals(base, trailingZero);
+        assertEquals(base, trailingZeros);
+        assertEquals(trailingZero, trailingZeros);
+        assertEquals(base.hashCode(), trailingZero.hashCode());
+        assertEquals(base.hashCode(), trailingZeros.hashCode());
+        assertEquals(trailingZero.hashCode(), trailingZeros.hashCode());
+
+        // All-zero versions of varying length are also compare-equal and must hash identically.
+        final ParsedSemver zero = ParsedSemver.parse("0");
+        final ParsedSemver zeroZero = ParsedSemver.parse("0.0.0.0");
+        assertTrue(zero != null);
+        assertTrue(zeroZero != null);
+        assertEquals(0, ParsedSemver.compare(zero, zeroZero));
+        assertEquals(zero, zeroZero);
+        assertEquals(zero.hashCode(), zeroZero.hashCode());
+
+        // Distinct versions must remain unequal and may differ in hash.
+        final ParsedSemver release = ParsedSemver.parse("1.2.4");
+        assertTrue(release != null);
+        assertNotEquals(base, release);
+    }
+
+    @Test
+    void testCompareSemverBuildMetadataIsIgnored() {
+        final ParsedSemver left = ParsedSemver.parse("1.0.0+build.1");
+        assertTrue(left != null);
+        final ParsedSemver right = ParsedSemver.parse("1.0.0+build.2");
+        assertTrue(right != null);
+        assertEquals(0, ParsedSemver.compare(left, right));
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-config/src/main/java/datadog/trace/api/featureflag/config/FeatureFlaggingConfig.java b/products/feature-flagging/feature-flagging-config/src/main/java/datadog/trace/api/featureflag/config/FeatureFlaggingConfig.java
index 1edfd5bcb26..54a3ce9dce2 100644
--- a/products/feature-flagging/feature-flagging-config/src/main/java/datadog/trace/api/featureflag/config/FeatureFlaggingConfig.java
+++ b/products/feature-flagging/feature-flagging-config/src/main/java/datadog/trace/api/featureflag/config/FeatureFlaggingConfig.java
@@ -2,99 +2,93 @@
 
 public class FeatureFlaggingConfig {
 
-  public static final String CONFIGURATION_SOURCE_AGENTLESS = "agentless";
-  public static final String CONFIGURATION_SOURCE_REMOTE_CONFIG = "remote_config";
+    public static final String CONFIGURATION_SOURCE_AGENTLESS = "agentless";
+    public static final String CONFIGURATION_SOURCE_REMOTE_CONFIG = "remote_config";
 
-  private static final Resolution DISABLED_RESOLUTION = new Resolution(false, null);
-  private static final Resolution AGENTLESS_CONFIGURATION =
-      new Resolution(true, CONFIGURATION_SOURCE_AGENTLESS);
-  private static final Resolution REMOTE_CONFIG_CONFIGURATION =
-      new Resolution(true, CONFIGURATION_SOURCE_REMOTE_CONFIG);
+    private static final Resolution DISABLED_RESOLUTION = new Resolution(false, null);
+    private static final Resolution AGENTLESS_CONFIGURATION = new Resolution(true, CONFIGURATION_SOURCE_AGENTLESS);
+    private static final Resolution REMOTE_CONFIG_CONFIGURATION =
+            new Resolution(true, CONFIGURATION_SOURCE_REMOTE_CONFIG);
 
-  public static final String FEATURE_FLAGS_ENABLED = "feature.flags.enabled";
-  public static final String EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED =
-      "experimental.flagging.provider.enabled";
+    public static final String FEATURE_FLAGS_ENABLED = "feature.flags.enabled";
+    public static final String EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED = "experimental.flagging.provider.enabled";
 
-  /**
-   * Opt-in gate for APM span enrichment with feature-flag evaluation metadata. DISTINCT from {@link
-   * #FEATURE_FLAGS_ENABLED} and OFF by default — enabling the provider does not enable span
-   * enrichment.
-   */
-  public static final String EXPERIMENTAL_SPAN_ENRICHMENT_ENABLED =
-      "experimental.flagging.provider.span.enrichment.enabled";
+    /**
+     * Opt-in gate for APM span enrichment with feature-flag evaluation metadata. DISTINCT from {@link
+     * #FEATURE_FLAGS_ENABLED} and OFF by default — enabling the provider does not enable span
+     * enrichment.
+     */
+    public static final String EXPERIMENTAL_SPAN_ENRICHMENT_ENABLED =
+            "experimental.flagging.provider.span.enrichment.enabled";
 
-  /**
-   * Killswitch for the EVP {@code flagevaluation} emission path. Default: enabled. Disabling it
-   * turns off EVP flag-evaluation counts while leaving the OTel {@code feature_flag.evaluations}
-   * metric path untouched. Maps to {@code DD_FLAGGING_EVALUATION_COUNTS_ENABLED}.
-   */
-  public static final String FLAGGING_EVALUATION_COUNTS_ENABLED =
-      "flagging.evaluation.counts.enabled";
+    /**
+     * Killswitch for the EVP {@code flagevaluation} emission path. Default: enabled. Disabling it
+     * turns off EVP flag-evaluation counts while leaving the OTel {@code feature_flag.evaluations}
+     * metric path untouched. Maps to {@code DD_FLAGGING_EVALUATION_COUNTS_ENABLED}.
+     */
+    public static final String FLAGGING_EVALUATION_COUNTS_ENABLED = "flagging.evaluation.counts.enabled";
 
-  public static final String FEATURE_FLAGS_CONFIGURATION_SOURCE =
-      "feature.flags.configuration.source";
-  public static final String FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL =
-      "feature.flags.configuration.source.agentless.base.url";
-  public static final String FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS =
-      "feature.flags.configuration.source.agentless.poll.interval.seconds";
-  public static final String FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS =
-      "feature.flags.configuration.source.agentless.request.timeout.seconds";
+    public static final String FEATURE_FLAGS_CONFIGURATION_SOURCE = "feature.flags.configuration.source";
+    public static final String FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL =
+            "feature.flags.configuration.source.agentless.base.url";
+    public static final String FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS =
+            "feature.flags.configuration.source.agentless.poll.interval.seconds";
+    public static final String FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS =
+            "feature.flags.configuration.source.agentless.request.timeout.seconds";
 
-  public static Resolution resolveConfiguration(
-      final Boolean providerEnabled,
-      final String explicitSource,
-      final Boolean legacyProviderEnabled) {
-    final String normalizedSource = normalizeConfigurationSource(explicitSource);
-    if (Boolean.FALSE.equals(providerEnabled)) {
-      return new Resolution(false, normalizedSource);
-    }
-    if (normalizedSource != null) {
-      if (CONFIGURATION_SOURCE_AGENTLESS.equals(normalizedSource)) {
+    public static Resolution resolveConfiguration(
+            final Boolean providerEnabled, final String explicitSource, final Boolean legacyProviderEnabled) {
+        final String normalizedSource = normalizeConfigurationSource(explicitSource);
+        if (Boolean.FALSE.equals(providerEnabled)) {
+            return new Resolution(false, normalizedSource);
+        }
+        if (normalizedSource != null) {
+            if (CONFIGURATION_SOURCE_AGENTLESS.equals(normalizedSource)) {
+                return AGENTLESS_CONFIGURATION;
+            }
+            if (CONFIGURATION_SOURCE_REMOTE_CONFIG.equals(normalizedSource)) {
+                return REMOTE_CONFIG_CONFIGURATION;
+            }
+            return new Resolution(false, normalizedSource);
+        }
+        if (legacyProviderEnabled != null) {
+            return legacyProviderEnabled ? REMOTE_CONFIG_CONFIGURATION : DISABLED_RESOLUTION;
+        }
         return AGENTLESS_CONFIGURATION;
-      }
-      if (CONFIGURATION_SOURCE_REMOTE_CONFIG.equals(normalizedSource)) {
-        return REMOTE_CONFIG_CONFIGURATION;
-      }
-      return new Resolution(false, normalizedSource);
-    }
-    if (legacyProviderEnabled != null) {
-      return legacyProviderEnabled ? REMOTE_CONFIG_CONFIGURATION : DISABLED_RESOLUTION;
     }
-    return AGENTLESS_CONFIGURATION;
-  }
 
-  public static boolean isSupportedConfigurationSource(final String source) {
-    final String normalizedSource = normalizeConfigurationSource(source);
-    return normalizedSource == null
-        || CONFIGURATION_SOURCE_AGENTLESS.equals(normalizedSource)
-        || CONFIGURATION_SOURCE_REMOTE_CONFIG.equals(normalizedSource);
-  }
+    public static boolean isSupportedConfigurationSource(final String source) {
+        final String normalizedSource = normalizeConfigurationSource(source);
+        return normalizedSource == null
+                || CONFIGURATION_SOURCE_AGENTLESS.equals(normalizedSource)
+                || CONFIGURATION_SOURCE_REMOTE_CONFIG.equals(normalizedSource);
+    }
 
-  private static String normalizeConfigurationSource(final String source) {
-    if (source == null) {
-      return null;
+    private static String normalizeConfigurationSource(final String source) {
+        if (source == null) {
+            return null;
+        }
+        final String normalized = source.trim().toLowerCase(java.util.Locale.ROOT);
+        return normalized.isEmpty() ? null : normalized;
     }
-    final String normalized = source.trim().toLowerCase(java.util.Locale.ROOT);
-    return normalized.isEmpty() ? null : normalized;
-  }
 
-  public static final class Resolution {
-    private final boolean enabled;
-    private final String source;
+    public static final class Resolution {
+        private final boolean enabled;
+        private final String source;
 
-    private Resolution(final boolean enabled, final String source) {
-      this.enabled = enabled;
-      this.source = source;
-    }
+        private Resolution(final boolean enabled, final String source) {
+            this.enabled = enabled;
+            this.source = source;
+        }
 
-    public boolean isEnabled() {
-      return enabled;
-    }
+        public boolean isEnabled() {
+            return enabled;
+        }
 
-    public String getSource() {
-      return source;
+        public String getSource() {
+            return source;
+        }
     }
-  }
 
-  private FeatureFlaggingConfig() {}
+    private FeatureFlaggingConfig() {}
 }
diff --git a/products/feature-flagging/feature-flagging-config/src/test/java/datadog/trace/api/featureflag/config/FeatureFlaggingConfigTest.java b/products/feature-flagging/feature-flagging-config/src/test/java/datadog/trace/api/featureflag/config/FeatureFlaggingConfigTest.java
index 16283869d71..381f6ba302a 100644
--- a/products/feature-flagging/feature-flagging-config/src/test/java/datadog/trace/api/featureflag/config/FeatureFlaggingConfigTest.java
+++ b/products/feature-flagging/feature-flagging-config/src/test/java/datadog/trace/api/featureflag/config/FeatureFlaggingConfigTest.java
@@ -13,43 +13,43 @@
 
 class FeatureFlaggingConfigTest {
 
-  @Test
-  void appliesConfigurationPrecedence() {
-    assertResolution(true, CONFIGURATION_SOURCE_AGENTLESS, null, null, null);
-    assertResolution(true, CONFIGURATION_SOURCE_AGENTLESS, null, " ", null);
-    assertResolution(true, CONFIGURATION_SOURCE_REMOTE_CONFIG, null, null, true);
-    assertResolution(false, null, null, null, false);
-    assertResolution(true, CONFIGURATION_SOURCE_AGENTLESS, null, "agentless", true);
-    assertResolution(true, CONFIGURATION_SOURCE_REMOTE_CONFIG, null, " remote_CONFIG ", false);
-    assertResolution(false, CONFIGURATION_SOURCE_AGENTLESS, false, "agentless", true);
-    assertResolution(false, "invalid", null, "invalid", null);
-    assertResolution(false, "offline", null, " OFFLINE ", true);
-  }
+    @Test
+    void appliesConfigurationPrecedence() {
+        assertResolution(true, CONFIGURATION_SOURCE_AGENTLESS, null, null, null);
+        assertResolution(true, CONFIGURATION_SOURCE_AGENTLESS, null, " ", null);
+        assertResolution(true, CONFIGURATION_SOURCE_REMOTE_CONFIG, null, null, true);
+        assertResolution(false, null, null, null, false);
+        assertResolution(true, CONFIGURATION_SOURCE_AGENTLESS, null, "agentless", true);
+        assertResolution(true, CONFIGURATION_SOURCE_REMOTE_CONFIG, null, " remote_CONFIG ", false);
+        assertResolution(false, CONFIGURATION_SOURCE_AGENTLESS, false, "agentless", true);
+        assertResolution(false, "invalid", null, "invalid", null);
+        assertResolution(false, "offline", null, " OFFLINE ", true);
+    }
 
-  @Test
-  void recognizesSupportedExplicitSources() {
-    assertTrue(isSupportedConfigurationSource(null));
-    assertTrue(isSupportedConfigurationSource(" "));
-    assertTrue(isSupportedConfigurationSource("agentless"));
-    assertTrue(isSupportedConfigurationSource(" REMOTE_CONFIG "));
-    assertFalse(isSupportedConfigurationSource("invalid"));
-    assertFalse(isSupportedConfigurationSource("offline"));
-  }
+    @Test
+    void recognizesSupportedExplicitSources() {
+        assertTrue(isSupportedConfigurationSource(null));
+        assertTrue(isSupportedConfigurationSource(" "));
+        assertTrue(isSupportedConfigurationSource("agentless"));
+        assertTrue(isSupportedConfigurationSource(" REMOTE_CONFIG "));
+        assertFalse(isSupportedConfigurationSource("invalid"));
+        assertFalse(isSupportedConfigurationSource("offline"));
+    }
 
-  private static void assertResolution(
-      final boolean enabled,
-      final String source,
-      final Boolean providerEnabled,
-      final String explicitSource,
-      final Boolean legacyProviderEnabled) {
-    final FeatureFlaggingConfig.Resolution resolution =
-        resolveConfiguration(providerEnabled, explicitSource, legacyProviderEnabled);
+    private static void assertResolution(
+            final boolean enabled,
+            final String source,
+            final Boolean providerEnabled,
+            final String explicitSource,
+            final Boolean legacyProviderEnabled) {
+        final FeatureFlaggingConfig.Resolution resolution =
+                resolveConfiguration(providerEnabled, explicitSource, legacyProviderEnabled);
 
-    assertEquals(enabled, resolution.isEnabled());
-    if (source == null) {
-      assertNull(resolution.getSource());
-    } else {
-      assertEquals(source, resolution.getSource());
+        assertEquals(enabled, resolution.isEnabled());
+        if (source == null) {
+            assertNull(resolution.getSource());
+        } else {
+            assertEquals(source, resolution.getSource());
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/jmh/java/com/datadog/featureflag/FlagEvaluationEnqueueContentionBenchmark.java b/products/feature-flagging/feature-flagging-lib/src/jmh/java/com/datadog/featureflag/FlagEvaluationEnqueueContentionBenchmark.java
index bbec5d65229..fad3d66ef5e 100644
--- a/products/feature-flagging/feature-flagging-lib/src/jmh/java/com/datadog/featureflag/FlagEvaluationEnqueueContentionBenchmark.java
+++ b/products/feature-flagging/feature-flagging-lib/src/jmh/java/com/datadog/featureflag/FlagEvaluationEnqueueContentionBenchmark.java
@@ -57,141 +57,139 @@
 @Fork(value = 1)
 public class FlagEvaluationEnqueueContentionBenchmark {
 
-  /** Events the single consumer drains per invocation, so it can keep up with N producers. */
-  static final int DRAIN_BATCH = 32;
-
-  private static final int NUM_FLAGS = 100;
-  private static final int NUM_USERS = 50;
-  private static final int NUM_FIELDS = 10;
-
-  private Map<String, Object> attrs;
-  private String[] flagKeys;
-  private String[] targetingKeys;
-  private FlagEvaluationWriterImpl writer;
-
-  /** Per-producer cursor: a shared counter would add its own cache-line contention. */
-  @State(Scope.Thread)
-  public static class ProducerCursor {
-    int cursor;
-  }
-
-  @Setup(Level.Iteration)
-  public void setUp() {
-    // enqueue() no-ops unless the gateway gate is on; set it explicitly so the benchmark is not
-    // silently measuring an early return.
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
-
-    attrs = new HashMap<>();
-    for (int i = 0; i < NUM_FIELDS; i++) {
-      attrs.put("field" + i, "value");
+    /** Events the single consumer drains per invocation, so it can keep up with N producers. */
+    static final int DRAIN_BATCH = 32;
+
+    private static final int NUM_FLAGS = 100;
+    private static final int NUM_USERS = 50;
+    private static final int NUM_FIELDS = 10;
+
+    private Map<String, Object> attrs;
+    private String[] flagKeys;
+    private String[] targetingKeys;
+    private FlagEvaluationWriterImpl writer;
+
+    /** Per-producer cursor: a shared counter would add its own cache-line contention. */
+    @State(Scope.Thread)
+    public static class ProducerCursor {
+        int cursor;
     }
-    flagKeys = keys("bench-flag-", NUM_FLAGS);
-    targetingKeys = keys("bench-user-", NUM_USERS);
-
-    final Config config = Config.get();
-    final BackendApiFactory factory = new BackendApiFactory(config, null);
-    // Capacity well above what the batch-draining consumer should ever let build up.
-    writer =
-        new FlagEvaluationWriterImpl(
-            1 << 20,
-            Long.MAX_VALUE,
-            NANOSECONDS,
-            () -> factory.createBackendApi(Intake.EVENT_PLATFORM, false),
-            config);
-  }
-
-  /**
-   * Reports queue overflow so a saturated run - where the consumer failed to keep up and the
-   * numbers no longer describe the enqueue path - is visible in the benchmark output.
-   */
-  @org.openjdk.jmh.annotations.TearDown(Level.Iteration)
-  @SuppressForbidden
-  public void reportOverflow() {
-    final long dropped = writer.droppedQueueOverflow();
-    if (dropped > 0) {
-      System.out.println(
-          "\nWARNING: queue overflowed "
-              + dropped
-              + " times - consumer could not keep up, enqueue timings for this iteration are"
-              + " measuring overflow accounting, not the enqueue path.");
+
+    @Setup(Level.Iteration)
+    public void setUp() {
+        // enqueue() no-ops unless the gateway gate is on; set it explicitly so the benchmark is not
+        // silently measuring an early return.
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
+
+        attrs = new HashMap<>();
+        for (int i = 0; i < NUM_FIELDS; i++) {
+            attrs.put("field" + i, "value");
+        }
+        flagKeys = keys("bench-flag-", NUM_FLAGS);
+        targetingKeys = keys("bench-user-", NUM_USERS);
+
+        final Config config = Config.get();
+        final BackendApiFactory factory = new BackendApiFactory(config, null);
+        // Capacity well above what the batch-draining consumer should ever let build up.
+        writer = new FlagEvaluationWriterImpl(
+                1 << 20,
+                Long.MAX_VALUE,
+                NANOSECONDS,
+                () -> factory.createBackendApi(Intake.EVENT_PLATFORM, false),
+                config);
+    }
+
+    /**
+     * Reports queue overflow so a saturated run - where the consumer failed to keep up and the
+     * numbers no longer describe the enqueue path - is visible in the benchmark output.
+     */
+    @org.openjdk.jmh.annotations.TearDown(Level.Iteration)
+    @SuppressForbidden
+    public void reportOverflow() {
+        final long dropped = writer.droppedQueueOverflow();
+        if (dropped > 0) {
+            System.out.println("\nWARNING: queue overflowed "
+                    + dropped
+                    + " times - consumer could not keep up, enqueue timings for this iteration are"
+                    + " measuring overflow accounting, not the enqueue path.");
+        }
+    }
+
+    // ---- 1 producer: uncontended baseline ----
+
+    @Benchmark
+    @Group("producers1")
+    @GroupThreads(1)
+    public void enqueue1(final ProducerCursor c) {
+        writer.enqueue(nextEvent(c));
+    }
+
+    @Benchmark
+    @Group("producers1")
+    @GroupThreads(1)
+    public void drain1(final Blackhole blackhole) {
+        drain(blackhole);
+    }
+
+    // ---- 4 producers ----
+
+    @Benchmark
+    @Group("producers4")
+    @GroupThreads(4)
+    public void enqueue4(final ProducerCursor c) {
+        writer.enqueue(nextEvent(c));
     }
-  }
-
-  // ---- 1 producer: uncontended baseline ----
-
-  @Benchmark
-  @Group("producers1")
-  @GroupThreads(1)
-  public void enqueue1(final ProducerCursor c) {
-    writer.enqueue(nextEvent(c));
-  }
-
-  @Benchmark
-  @Group("producers1")
-  @GroupThreads(1)
-  public void drain1(final Blackhole blackhole) {
-    drain(blackhole);
-  }
-
-  // ---- 4 producers ----
-
-  @Benchmark
-  @Group("producers4")
-  @GroupThreads(4)
-  public void enqueue4(final ProducerCursor c) {
-    writer.enqueue(nextEvent(c));
-  }
-
-  @Benchmark
-  @Group("producers4")
-  @GroupThreads(1)
-  public void drain4(final Blackhole blackhole) {
-    drain(blackhole);
-  }
-
-  // ---- 16 producers ----
-
-  @Benchmark
-  @Group("producers16")
-  @GroupThreads(16)
-  public void enqueue16(final ProducerCursor c) {
-    writer.enqueue(nextEvent(c));
-  }
-
-  @Benchmark
-  @Group("producers16")
-  @GroupThreads(1)
-  public void drain16(final Blackhole blackhole) {
-    drain(blackhole);
-  }
-
-  private void drain(final Blackhole blackhole) {
-    for (int i = 0; i < DRAIN_BATCH; i++) {
-      final FlagEvalEvent event = writer.pollQueuedEventForTest();
-      if (event == null) {
-        break;
-      }
-      blackhole.consume(event);
+
+    @Benchmark
+    @Group("producers4")
+    @GroupThreads(1)
+    public void drain4(final Blackhole blackhole) {
+        drain(blackhole);
+    }
+
+    // ---- 16 producers ----
+
+    @Benchmark
+    @Group("producers16")
+    @GroupThreads(16)
+    public void enqueue16(final ProducerCursor c) {
+        writer.enqueue(nextEvent(c));
+    }
+
+    @Benchmark
+    @Group("producers16")
+    @GroupThreads(1)
+    public void drain16(final Blackhole blackhole) {
+        drain(blackhole);
     }
-  }
-
-  private FlagEvalEvent nextEvent(final ProducerCursor c) {
-    final int i = c.cursor++;
-    return new FlagEvalEvent(
-        flagKeys[Math.floorMod(i, flagKeys.length)],
-        "variant-" + Math.floorMod(i, 4),
-        "alloc-" + Math.floorMod(i, flagKeys.length),
-        targetingKeys[Math.floorMod(i, targetingKeys.length)],
-        null,
-        1_700_000_000_000L + i,
-        attrs);
-  }
-
-  private static String[] keys(final String prefix, final int count) {
-    final String[] out = new String[count];
-    for (int i = 0; i < count; i++) {
-      out[i] = prefix + i;
+
+    private void drain(final Blackhole blackhole) {
+        for (int i = 0; i < DRAIN_BATCH; i++) {
+            final FlagEvalEvent event = writer.pollQueuedEventForTest();
+            if (event == null) {
+                break;
+            }
+            blackhole.consume(event);
+        }
+    }
+
+    private FlagEvalEvent nextEvent(final ProducerCursor c) {
+        final int i = c.cursor++;
+        return new FlagEvalEvent(
+                flagKeys[Math.floorMod(i, flagKeys.length)],
+                "variant-" + Math.floorMod(i, 4),
+                "alloc-" + Math.floorMod(i, flagKeys.length),
+                targetingKeys[Math.floorMod(i, targetingKeys.length)],
+                null,
+                1_700_000_000_000L + i,
+                attrs);
+    }
+
+    private static String[] keys(final String prefix, final int count) {
+        final String[] out = new String[count];
+        for (int i = 0; i < count; i++) {
+            out[i] = prefix + i;
+        }
+        return out;
     }
-    return out;
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/jmh/java/com/datadog/featureflag/FlagEvaluationHotPathBenchmark.java b/products/feature-flagging/feature-flagging-lib/src/jmh/java/com/datadog/featureflag/FlagEvaluationHotPathBenchmark.java
index fbd467b88d2..8c4f7e8fbae 100644
--- a/products/feature-flagging/feature-flagging-lib/src/jmh/java/com/datadog/featureflag/FlagEvaluationHotPathBenchmark.java
+++ b/products/feature-flagging/feature-flagging-lib/src/jmh/java/com/datadog/featureflag/FlagEvaluationHotPathBenchmark.java
@@ -50,119 +50,117 @@
 @Fork(value = 1)
 public class FlagEvaluationHotPathBenchmark {
 
-  @Param({
-    "typical/100flags_50users_10fields",
-    "stress/10flags_1000users_250fields",
-    "scale/2500flags_500users_20fields"
-  })
-  public String profile;
-
-  private Map<String, Object> attrs;
-  private String[] flagKeys;
-  private String[] targetingKeys;
-  private int cursor;
-  private FlagEvaluationWriterImpl writer;
-  private FlagEvaluationWriterImpl.SerializingHandlerForTest handler;
-
-  @Setup(Level.Iteration)
-  public void setUp() {
-    final Profile p = Profile.fromName(profile);
-
-    attrs = new HashMap<>();
-    for (int i = 0; i < p.numFields; i++) {
-      attrs.put("field" + i, "value");
+    @Param({
+        "typical/100flags_50users_10fields",
+        "stress/10flags_1000users_250fields",
+        "scale/2500flags_500users_20fields"
+    })
+    public String profile;
+
+    private Map<String, Object> attrs;
+    private String[] flagKeys;
+    private String[] targetingKeys;
+    private int cursor;
+    private FlagEvaluationWriterImpl writer;
+    private FlagEvaluationWriterImpl.SerializingHandlerForTest handler;
+
+    @Setup(Level.Iteration)
+    public void setUp() {
+        final Profile p = Profile.fromName(profile);
+
+        attrs = new HashMap<>();
+        for (int i = 0; i < p.numFields; i++) {
+            attrs.put("field" + i, "value");
+        }
+        flagKeys = keys("bench-flag-", p.numFlags);
+        targetingKeys = keys("bench-user-", p.numUsers);
+        cursor = 0;
+
+        final Config config = Config.get();
+        final BackendApiFactory factory = new BackendApiFactory(config, null);
+        final Map<String, String> ddContext = new HashMap<>();
+        ddContext.put("service", "bench-service");
+        handler = FlagEvaluationWriterImpl.createHandlerForTest(
+                () -> factory.createBackendApi(Intake.EVENT_PLATFORM, false), ddContext);
+
+        // Capacity large enough that the benchmark never overflows within a measurement window.
+        writer = new FlagEvaluationWriterImpl(
+                1 << 20,
+                Long.MAX_VALUE,
+                NANOSECONDS,
+                () -> factory.createBackendApi(Intake.EVENT_PLATFORM, false),
+                config);
     }
-    flagKeys = keys("bench-flag-", p.numFlags);
-    targetingKeys = keys("bench-user-", p.numUsers);
-    cursor = 0;
-
-    final Config config = Config.get();
-    final BackendApiFactory factory = new BackendApiFactory(config, null);
-    final Map<String, String> ddContext = new HashMap<>();
-    ddContext.put("service", "bench-service");
-    handler =
-        FlagEvaluationWriterImpl.createHandlerForTest(
-            () -> factory.createBackendApi(Intake.EVENT_PLATFORM, false), ddContext);
-
-    // Capacity large enough that the benchmark never overflows within a measurement window.
-    writer =
-        new FlagEvaluationWriterImpl(
-            1 << 20,
-            Long.MAX_VALUE,
-            NANOSECONDS,
-            () -> factory.createBackendApi(Intake.EVENT_PLATFORM, false),
-            config);
-  }
-
-  /**
-   * Queue-mechanics cost only: event allocation plus the non-blocking bounded-queue offer. Excludes
-   * the hook's inline context snapshot - see the class javadoc.
-   */
-  @Benchmark
-  public void writerEnqueue(final Blackhole blackhole) {
-    final FlagEvalEvent event = nextEvent();
-    writer.enqueue(event);
-    blackhole.consume(writer.pollQueuedEventForTest());
-    blackhole.consume(event);
-  }
-
-  /** Worker-thread cost: materialize context, prune, canonicalize, and aggregate. */
-  @Benchmark
-  public void workerAggregate(final Blackhole blackhole) {
-    final FlagEvalEvent event = nextEvent();
-    handler.aggregateEvent(event);
-    if ((cursor % 10_000) == 0) {
-      handler.clearAggregationForTest();
+
+    /**
+     * Queue-mechanics cost only: event allocation plus the non-blocking bounded-queue offer. Excludes
+     * the hook's inline context snapshot - see the class javadoc.
+     */
+    @Benchmark
+    public void writerEnqueue(final Blackhole blackhole) {
+        final FlagEvalEvent event = nextEvent();
+        writer.enqueue(event);
+        blackhole.consume(writer.pollQueuedEventForTest());
+        blackhole.consume(event);
     }
-    blackhole.consume(handler.fullTierSizeForTest());
-  }
-
-  private FlagEvalEvent nextEvent() {
-    final int i = cursor++;
-    // observeFullEvaluationData=true is required for this benchmark to mean anything: under the
-    // consent-off default the aggregator drops attrs and skips canonicalContextKey entirely, so
-    // every field-count profile would collapse to the same scalar-only cost.
-    return new FlagEvalEvent(
-        flagKeys[Math.floorMod(i, flagKeys.length)],
-        "variant-" + Math.floorMod(i, 4),
-        "alloc-" + Math.floorMod(i, flagKeys.length),
-        targetingKeys[Math.floorMod(i, targetingKeys.length)],
-        null,
-        1_700_000_000_000L + i,
-        true,
-        attrs);
-  }
-
-  private static String[] keys(final String prefix, final int count) {
-    final String[] out = new String[count];
-    for (int i = 0; i < count; i++) {
-      out[i] = prefix + i;
+
+    /** Worker-thread cost: materialize context, prune, canonicalize, and aggregate. */
+    @Benchmark
+    public void workerAggregate(final Blackhole blackhole) {
+        final FlagEvalEvent event = nextEvent();
+        handler.aggregateEvent(event);
+        if ((cursor % 10_000) == 0) {
+            handler.clearAggregationForTest();
+        }
+        blackhole.consume(handler.fullTierSizeForTest());
     }
-    return out;
-  }
-
-  private static final class Profile {
-    private final int numFlags;
-    private final int numUsers;
-    private final int numFields;
-
-    private Profile(final int numFlags, final int numUsers, final int numFields) {
-      this.numFlags = numFlags;
-      this.numUsers = numUsers;
-      this.numFields = numFields;
+
+    private FlagEvalEvent nextEvent() {
+        final int i = cursor++;
+        // observeFullEvaluationData=true is required for this benchmark to mean anything: under the
+        // consent-off default the aggregator drops attrs and skips canonicalContextKey entirely, so
+        // every field-count profile would collapse to the same scalar-only cost.
+        return new FlagEvalEvent(
+                flagKeys[Math.floorMod(i, flagKeys.length)],
+                "variant-" + Math.floorMod(i, 4),
+                "alloc-" + Math.floorMod(i, flagKeys.length),
+                targetingKeys[Math.floorMod(i, targetingKeys.length)],
+                null,
+                1_700_000_000_000L + i,
+                true,
+                attrs);
+    }
+
+    private static String[] keys(final String prefix, final int count) {
+        final String[] out = new String[count];
+        for (int i = 0; i < count; i++) {
+            out[i] = prefix + i;
+        }
+        return out;
     }
 
-    private static Profile fromName(final String name) {
-      if ("typical/100flags_50users_10fields".equals(name)) {
-        return new Profile(100, 50, 10);
-      }
-      if ("stress/10flags_1000users_250fields".equals(name)) {
-        return new Profile(10, 1_000, 250);
-      }
-      if ("scale/2500flags_500users_20fields".equals(name)) {
-        return new Profile(2_500, 500, 20);
-      }
-      throw new IllegalArgumentException("unknown benchmark profile: " + name);
+    private static final class Profile {
+        private final int numFlags;
+        private final int numUsers;
+        private final int numFields;
+
+        private Profile(final int numFlags, final int numUsers, final int numFields) {
+            this.numFlags = numFlags;
+            this.numUsers = numUsers;
+            this.numFields = numFields;
+        }
+
+        private static Profile fromName(final String name) {
+            if ("typical/100flags_50users_10fields".equals(name)) {
+                return new Profile(100, 50, 10);
+            }
+            if ("stress/10flags_1000users_250fields".equals(name)) {
+                return new Profile(10, 1_000, 250);
+            }
+            if ("scale/2500flags_500users_20fields".equals(name)) {
+                return new Profile(2_500, 500, 20);
+            }
+            throw new IllegalArgumentException("unknown benchmark profile: " + name);
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/AgentlessConfigurationSource.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/AgentlessConfigurationSource.java
index f4fc35cce30..5f715b2fb17 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/AgentlessConfigurationSource.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/AgentlessConfigurationSource.java
@@ -37,453 +37,433 @@
 import org.slf4j.LoggerFactory;
 
 final class AgentlessConfigurationSource implements ConfigurationSourceService {
-  private static final Logger LOGGER = LoggerFactory.getLogger(AgentlessConfigurationSource.class);
-
-  private static final String DATADOG_UFC_RULES_BASED_SERVER_PATH =
-      "/api/v2/feature-flagging/config/rules-based/server";
-  private static final int MAX_ATTEMPTS = 3;
-  private static final int MINUTES_BETWEEN_WARNINGS = 5;
-  private static final long FIRST_RETRY_MIN_MILLIS = 2_000;
-  private static final long FIRST_RETRY_MAX_MILLIS = 10_000;
-  private static final long SECOND_RETRY_MIN_MILLIS = 5_000;
-  private static final long SECOND_RETRY_MAX_MILLIS = 30_000;
-  private static final double RETRY_JITTER = 0.2;
-
-  private final HttpUrl endpoint;
-  private final Config config;
-  private final long pollIntervalMillis;
-  private final UfcHttpClient client;
-  private final ScheduledExecutorService executor;
-  private final RatelimitedLogger ratelimitedLogger;
-  private final Object lifecycleLock = new Object();
-  private final AtomicBoolean polling = new AtomicBoolean();
-  private final AtomicReference<Thread> pollingThread = new AtomicReference<>();
-  private volatile boolean closed;
-  private volatile boolean started;
-  private volatile ScheduledFuture<?> scheduledPoll;
-  private volatile String etag;
-
-  AgentlessConfigurationSource(final Config config) {
-    this(config, endpoint(config));
-  }
-
-  private AgentlessConfigurationSource(final Config config, final HttpUrl endpoint) {
-    this(
-        endpoint,
-        config,
-        millis(config.getFeatureFlaggingConfigurationSourcePollIntervalSeconds()),
-        new OkHttpUfcHttpClient(
-            OkHttpUtils.buildHttpClient(
-                endpoint,
-                millis(config.getFeatureFlaggingConfigurationSourceRequestTimeoutSeconds())),
-            millis(config.getFeatureFlaggingConfigurationSourcePollIntervalSeconds()),
-            TimeUnit.MILLISECONDS::sleep,
-            () -> ThreadLocalRandom.current().nextDouble(1 - RETRY_JITTER, 1 + RETRY_JITTER)),
-        Executors.newSingleThreadScheduledExecutor(
-            new AgentThreadFactory(FEATURE_FLAG_CONFIGURATION_POLLER)),
-        new RatelimitedLogger(LOGGER, MINUTES_BETWEEN_WARNINGS, TimeUnit.MINUTES));
-  }
-
-  AgentlessConfigurationSource(
-      final HttpUrl endpoint,
-      final Config config,
-      final long pollIntervalMillis,
-      final UfcHttpClient client,
-      final ScheduledExecutorService executor) {
-    this(
-        endpoint,
-        config,
-        pollIntervalMillis,
-        client,
-        executor,
-        new RatelimitedLogger(LOGGER, MINUTES_BETWEEN_WARNINGS, TimeUnit.MINUTES));
-  }
-
-  AgentlessConfigurationSource(
-      final HttpUrl endpoint,
-      final Config config,
-      final long pollIntervalMillis,
-      final UfcHttpClient client,
-      final ScheduledExecutorService executor,
-      final RatelimitedLogger ratelimitedLogger) {
-    this.endpoint = endpoint;
-    this.config = config;
-    this.pollIntervalMillis = pollIntervalMillis;
-    this.client = client;
-    this.executor = executor;
-    this.ratelimitedLogger = ratelimitedLogger;
-  }
-
-  @Override
-  public void init() {
-    synchronized (lifecycleLock) {
-      if (closed || started) {
-        return;
-      }
-      started = true;
+    private static final Logger LOGGER = LoggerFactory.getLogger(AgentlessConfigurationSource.class);
+
+    private static final String DATADOG_UFC_RULES_BASED_SERVER_PATH =
+            "/api/v2/feature-flagging/config/rules-based/server";
+    private static final int MAX_ATTEMPTS = 3;
+    private static final int MINUTES_BETWEEN_WARNINGS = 5;
+    private static final long FIRST_RETRY_MIN_MILLIS = 2_000;
+    private static final long FIRST_RETRY_MAX_MILLIS = 10_000;
+    private static final long SECOND_RETRY_MIN_MILLIS = 5_000;
+    private static final long SECOND_RETRY_MAX_MILLIS = 30_000;
+    private static final double RETRY_JITTER = 0.2;
+
+    private final HttpUrl endpoint;
+    private final Config config;
+    private final long pollIntervalMillis;
+    private final UfcHttpClient client;
+    private final ScheduledExecutorService executor;
+    private final RatelimitedLogger ratelimitedLogger;
+    private final Object lifecycleLock = new Object();
+    private final AtomicBoolean polling = new AtomicBoolean();
+    private final AtomicReference<Thread> pollingThread = new AtomicReference<>();
+    private volatile boolean closed;
+    private volatile boolean started;
+    private volatile ScheduledFuture<?> scheduledPoll;
+    private volatile String etag;
+
+    AgentlessConfigurationSource(final Config config) {
+        this(config, endpoint(config));
     }
 
-    // Complete the first poll cycle on the activation thread. This lets OpenFeature provider
-    // initialization observe a successful retry before it checks whether configuration is ready.
-    // No request occurs before application code activates the provider.
-    pollOnceSafely();
+    private AgentlessConfigurationSource(final Config config, final HttpUrl endpoint) {
+        this(
+                endpoint,
+                config,
+                millis(config.getFeatureFlaggingConfigurationSourcePollIntervalSeconds()),
+                new OkHttpUfcHttpClient(
+                        OkHttpUtils.buildHttpClient(
+                                endpoint, millis(config.getFeatureFlaggingConfigurationSourceRequestTimeoutSeconds())),
+                        millis(config.getFeatureFlaggingConfigurationSourcePollIntervalSeconds()),
+                        TimeUnit.MILLISECONDS::sleep,
+                        () -> ThreadLocalRandom.current().nextDouble(1 - RETRY_JITTER, 1 + RETRY_JITTER)),
+                Executors.newSingleThreadScheduledExecutor(new AgentThreadFactory(FEATURE_FLAG_CONFIGURATION_POLLER)),
+                new RatelimitedLogger(LOGGER, MINUTES_BETWEEN_WARNINGS, TimeUnit.MINUTES));
+    }
 
-    synchronized (lifecycleLock) {
-      if (!closed) {
-        scheduledPoll =
-            executor.scheduleWithFixedDelay(
-                this::pollOnceSafely,
-                pollIntervalMillis,
+    AgentlessConfigurationSource(
+            final HttpUrl endpoint,
+            final Config config,
+            final long pollIntervalMillis,
+            final UfcHttpClient client,
+            final ScheduledExecutorService executor) {
+        this(
+                endpoint,
+                config,
                 pollIntervalMillis,
-                TimeUnit.MILLISECONDS);
-      }
+                client,
+                executor,
+                new RatelimitedLogger(LOGGER, MINUTES_BETWEEN_WARNINGS, TimeUnit.MINUTES));
     }
-  }
 
-  boolean pollOnce() {
-    if (closed || !polling.compareAndSet(false, true)) {
-      return false;
-    }
-    pollingThread.set(Thread.currentThread());
-    try {
-      return fetchAndApply();
-    } finally {
-      pollingThread.compareAndSet(Thread.currentThread(), null);
-      polling.set(false);
-    }
-  }
-
-  @Override
-  public void close() {
-    final ScheduledFuture<?> poll;
-    synchronized (lifecycleLock) {
-      if (closed) {
-        return;
-      }
-      closed = true;
-      started = false;
-      poll = scheduledPoll;
-      scheduledPoll = null;
-    }
-    if (poll != null) {
-      poll.cancel(true);
-    }
-    client.cancel();
-    final Thread activePollingThread = pollingThread.get();
-    if (activePollingThread != null) {
-      activePollingThread.interrupt();
-    }
-    executor.shutdownNow();
-  }
-
-  private void pollOnceSafely() {
-    try {
-      pollOnce();
-    } catch (final RuntimeException e) {
-      LOGGER.debug("Unexpected error while polling Feature Flagging HTTP configuration source", e);
+    AgentlessConfigurationSource(
+            final HttpUrl endpoint,
+            final Config config,
+            final long pollIntervalMillis,
+            final UfcHttpClient client,
+            final ScheduledExecutorService executor,
+            final RatelimitedLogger ratelimitedLogger) {
+        this.endpoint = endpoint;
+        this.config = config;
+        this.pollIntervalMillis = pollIntervalMillis;
+        this.client = client;
+        this.executor = executor;
+        this.ratelimitedLogger = ratelimitedLogger;
     }
-  }
-
-  private boolean fetchAndApply() {
-    try {
-      final UfcHttpResponse response = client.fetch(endpoint, config, etag);
-      if (closed) {
-        return false;
-      }
-      if (isRetryableStatus(response.status)) {
-        ratelimitedLogger.warn(
-            "Feature Flagging agentless endpoint failed after {} attempts with HTTP {}",
-            MAX_ATTEMPTS,
-            response.status);
-        return false;
-      }
-      synchronized (lifecycleLock) {
-        return !closed && apply(response);
-      }
-    } catch (final IOException e) {
-      if (!closed) {
-        ratelimitedLogger.warn(
-            "Feature Flagging agentless endpoint request failed after {} attempts",
-            MAX_ATTEMPTS,
-            e);
-      }
-      return false;
-    }
-  }
 
-  private boolean apply(final UfcHttpResponse response) {
-    if (response.status == HttpURLConnection.HTTP_NOT_MODIFIED) {
-      return true;
-    }
-    if (response.status == HttpURLConnection.HTTP_UNAUTHORIZED
-        || response.status == HttpURLConnection.HTTP_FORBIDDEN) {
-      ratelimitedLogger.warn(
-          "Feature Flagging agentless endpoint returned HTTP {}; verify endpoint authentication",
-          response.status);
-      return false;
-    }
-    if (response.status != HttpURLConnection.HTTP_OK || response.body == null) {
-      return false;
-    }
-    final ServerConfiguration configuration;
-    try {
-      configuration = JsonApiUfcResponseParser.INSTANCE.parse(response.body);
-    } catch (final IOException | RuntimeException e) {
-      LOGGER.debug("Feature Flagging HTTP configuration source returned malformed UFC payload", e);
-      return false;
-    }
-    if (configuration == null) {
-      return false;
-    }
-    FeatureFlaggingGateway.dispatch(configuration);
-    updateEtag(response.etag);
-    return true;
-  }
-
-  private static boolean isRetryableStatus(final int status) {
-    return status == HttpURLConnection.HTTP_CLIENT_TIMEOUT
-        || status == 429
-        || (status >= 500 && status <= 599);
-  }
-
-  private void updateEtag(final String nextEtag) {
-    etag = isBlank(nextEtag) ? null : nextEtag;
-  }
-
-  static HttpUrl endpoint(final Config config) {
-    final String configuredBaseUrl = config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl();
-    return configuredBaseUrl == null
-        ? datadogApiServerDistributionEndpoint(config)
-        : endpointFromConfiguredBaseUrl(configuredBaseUrl);
-  }
-
-  private static HttpUrl endpointFromConfiguredBaseUrl(final String configuredBaseUrl) {
-    final HttpUrl parsed = HttpUrl.parse(configuredBaseUrl.trim());
-    if (parsed == null) {
-      throw new IllegalArgumentException(
-          "Invalid Feature Flagging HTTP configuration source URL: " + configuredBaseUrl);
-    }
-    if ("/".equals(parsed.encodedPath()) || parsed.encodedPath().isEmpty()) {
-      return parsed
-          .newBuilder()
-          .addPathSegments(DATADOG_UFC_RULES_BASED_SERVER_PATH.substring(1))
-          .build();
+    @Override
+    public void init() {
+        synchronized (lifecycleLock) {
+            if (closed || started) {
+                return;
+            }
+            started = true;
+        }
+
+        // Complete the first poll cycle on the activation thread. This lets OpenFeature provider
+        // initialization observe a successful retry before it checks whether configuration is ready.
+        // No request occurs before application code activates the provider.
+        pollOnceSafely();
+
+        synchronized (lifecycleLock) {
+            if (!closed) {
+                scheduledPoll = executor.scheduleWithFixedDelay(
+                        this::pollOnceSafely, pollIntervalMillis, pollIntervalMillis, TimeUnit.MILLISECONDS);
+            }
+        }
     }
-    return parsed;
-  }
-
-  private static HttpUrl datadogApiServerDistributionEndpoint(final Config config) {
-    final HttpUrl.Builder endpoint =
-        new HttpUrl.Builder()
-            .scheme("https")
-            .host("ufc-server.ff-cdn." + config.getSite())
-            .addPathSegments(DATADOG_UFC_RULES_BASED_SERVER_PATH.substring(1));
-    final String env = config.getEnv();
-    if (env != null && !env.isEmpty()) {
-      endpoint.addQueryParameter("dd_env", env);
+
+    boolean pollOnce() {
+        if (closed || !polling.compareAndSet(false, true)) {
+            return false;
+        }
+        pollingThread.set(Thread.currentThread());
+        try {
+            return fetchAndApply();
+        } finally {
+            pollingThread.compareAndSet(Thread.currentThread(), null);
+            polling.set(false);
+        }
     }
-    return endpoint.build();
-  }
-
-  static long millis(final int seconds) {
-    return TimeUnit.SECONDS.toMillis(seconds);
-  }
-
-  static long retryDelayMillis(
-      final long pollIntervalMillis, final int attempt, final double jitter) {
-    final long baseDelay;
-    if (attempt == 1) {
-      baseDelay = clamp(pollIntervalMillis / 6, FIRST_RETRY_MIN_MILLIS, FIRST_RETRY_MAX_MILLIS);
-    } else if (attempt == 2) {
-      baseDelay = clamp(pollIntervalMillis / 3, SECOND_RETRY_MIN_MILLIS, SECOND_RETRY_MAX_MILLIS);
-    } else {
-      throw new IllegalArgumentException("Unsupported Feature Flagging retry attempt: " + attempt);
+
+    @Override
+    public void close() {
+        final ScheduledFuture<?> poll;
+        synchronized (lifecycleLock) {
+            if (closed) {
+                return;
+            }
+            closed = true;
+            started = false;
+            poll = scheduledPoll;
+            scheduledPoll = null;
+        }
+        if (poll != null) {
+            poll.cancel(true);
+        }
+        client.cancel();
+        final Thread activePollingThread = pollingThread.get();
+        if (activePollingThread != null) {
+            activePollingThread.interrupt();
+        }
+        executor.shutdownNow();
     }
-    return Math.max(1, Math.round(baseDelay * jitter));
-  }
 
-  private static long clamp(final long value, final long minimum, final long maximum) {
-    return Math.max(minimum, Math.min(maximum, value));
-  }
+    private void pollOnceSafely() {
+        try {
+            pollOnce();
+        } catch (final RuntimeException e) {
+            LOGGER.debug("Unexpected error while polling Feature Flagging HTTP configuration source", e);
+        }
+    }
 
-  interface UfcHttpClient {
-    UfcHttpResponse fetch(HttpUrl endpoint, Config config, String etag) throws IOException;
+    private boolean fetchAndApply() {
+        try {
+            final UfcHttpResponse response = client.fetch(endpoint, config, etag);
+            if (closed) {
+                return false;
+            }
+            if (isRetryableStatus(response.status)) {
+                ratelimitedLogger.warn(
+                        "Feature Flagging agentless endpoint failed after {} attempts with HTTP {}",
+                        MAX_ATTEMPTS,
+                        response.status);
+                return false;
+            }
+            synchronized (lifecycleLock) {
+                return !closed && apply(response);
+            }
+        } catch (final IOException e) {
+            if (!closed) {
+                ratelimitedLogger.warn(
+                        "Feature Flagging agentless endpoint request failed after {} attempts", MAX_ATTEMPTS, e);
+            }
+            return false;
+        }
+    }
 
-    void cancel();
-  }
+    private boolean apply(final UfcHttpResponse response) {
+        if (response.status == HttpURLConnection.HTTP_NOT_MODIFIED) {
+            return true;
+        }
+        if (response.status == HttpURLConnection.HTTP_UNAUTHORIZED
+                || response.status == HttpURLConnection.HTTP_FORBIDDEN) {
+            ratelimitedLogger.warn(
+                    "Feature Flagging agentless endpoint returned HTTP {}; verify endpoint authentication",
+                    response.status);
+            return false;
+        }
+        if (response.status != HttpURLConnection.HTTP_OK || response.body == null) {
+            return false;
+        }
+        final ServerConfiguration configuration;
+        try {
+            configuration = JsonApiUfcResponseParser.INSTANCE.parse(response.body);
+        } catch (final IOException | RuntimeException e) {
+            LOGGER.debug("Feature Flagging HTTP configuration source returned malformed UFC payload", e);
+            return false;
+        }
+        if (configuration == null) {
+            return false;
+        }
+        FeatureFlaggingGateway.dispatch(configuration);
+        updateEtag(response.etag);
+        return true;
+    }
 
-  interface RetrySleeper {
-    void sleep(long delayMillis) throws InterruptedException;
-  }
+    private static boolean isRetryableStatus(final int status) {
+        return status == HttpURLConnection.HTTP_CLIENT_TIMEOUT || status == 429 || (status >= 500 && status <= 599);
+    }
 
-  static final class UfcHttpResponse {
-    final int status;
-    @Nullable final String etag;
-    @Nullable final byte[] body;
+    private void updateEtag(final String nextEtag) {
+        etag = isBlank(nextEtag) ? null : nextEtag;
+    }
 
-    UfcHttpResponse(final int status, @Nullable final String etag, @Nullable final byte[] body) {
-      this.status = status;
-      this.etag = etag;
-      this.body = body;
+    static HttpUrl endpoint(final Config config) {
+        final String configuredBaseUrl = config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl();
+        return configuredBaseUrl == null
+                ? datadogApiServerDistributionEndpoint(config)
+                : endpointFromConfiguredBaseUrl(configuredBaseUrl);
     }
-  }
 
-  static final class OkHttpUfcHttpClient implements UfcHttpClient {
-    private final OkHttpClient httpClient;
-    private final long pollIntervalMillis;
-    private final RetrySleeper retrySleeper;
-    private final DoubleSupplier jitter;
-    private final AtomicBoolean fetching = new AtomicBoolean();
-    private final AtomicBoolean cancelled = new AtomicBoolean();
-    private final AtomicReference<Call> activeCall = new AtomicReference<>();
-
-    OkHttpUfcHttpClient(final OkHttpClient httpClient) {
-      this(
-          httpClient,
-          TimeUnit.SECONDS.toMillis(30),
-          TimeUnit.MILLISECONDS::sleep,
-          () -> ThreadLocalRandom.current().nextDouble(1 - RETRY_JITTER, 1 + RETRY_JITTER));
+    private static HttpUrl endpointFromConfiguredBaseUrl(final String configuredBaseUrl) {
+        final HttpUrl parsed = HttpUrl.parse(configuredBaseUrl.trim());
+        if (parsed == null) {
+            throw new IllegalArgumentException(
+                    "Invalid Feature Flagging HTTP configuration source URL: " + configuredBaseUrl);
+        }
+        if ("/".equals(parsed.encodedPath()) || parsed.encodedPath().isEmpty()) {
+            return parsed.newBuilder()
+                    .addPathSegments(DATADOG_UFC_RULES_BASED_SERVER_PATH.substring(1))
+                    .build();
+        }
+        return parsed;
     }
 
-    OkHttpUfcHttpClient(
-        final OkHttpClient httpClient,
-        final long pollIntervalMillis,
-        final RetrySleeper retrySleeper,
-        final DoubleSupplier jitter) {
-      this.httpClient = httpClient;
-      this.pollIntervalMillis = pollIntervalMillis;
-      this.retrySleeper = retrySleeper;
-      this.jitter = jitter;
+    private static HttpUrl datadogApiServerDistributionEndpoint(final Config config) {
+        final HttpUrl.Builder endpoint = new HttpUrl.Builder()
+                .scheme("https")
+                .host("ufc-server.ff-cdn." + config.getSite())
+                .addPathSegments(DATADOG_UFC_RULES_BASED_SERVER_PATH.substring(1));
+        final String env = config.getEnv();
+        if (env != null && !env.isEmpty()) {
+            endpoint.addQueryParameter("dd_env", env);
+        }
+        return endpoint.build();
     }
 
-    @Override
-    public UfcHttpResponse fetch(final HttpUrl endpoint, final Config config, final String etag)
-        throws IOException {
-      final Map<String, String> headers = new HashMap<>();
-      if (etag != null) {
-        headers.put("If-None-Match", etag);
-      }
-      // Leave Accept-Encoding unset so OkHttp negotiates gzip and transparently decompresses it.
-      final Request request =
-          prepareRequest(endpoint, headers, config, isDatadogManagedEndpoint(endpoint, config))
-              .get()
-              .build();
-      if (!fetching.compareAndSet(false, true)) {
-        throw new IllegalStateException("Feature Flagging HTTP request already in flight");
-      }
-      if (cancelled.get()) {
-        fetching.set(false);
-        throw new InterruptedIOException("Feature Flagging HTTP client is closed");
-      }
-      try {
-        final HttpRetryPolicy.Factory retryPolicyFactory =
-            new HttpRetryPolicy.Factory(0, 0, 0) {
-              @Override
-              public HttpRetryPolicy create() {
-                return new AgentlessRetryPolicy(
-                    cancelled, pollIntervalMillis, retrySleeper, jitter);
-              }
-            };
-        final Call.Factory callFactory =
-            retryRequest -> {
-              final Call call = httpClient.newCall(retryRequest);
-              activeCall.set(call);
-              if (cancelled.get()) {
-                call.cancel();
-              }
-              return call;
-            };
-        return sendWithRetries(
-            callFactory,
-            retryPolicyFactory,
-            request,
-            response -> {
-              final int status = response.code();
-              final String responseEtag = response.header("ETag");
-              try (ResponseBody responseBody = response.body()) {
-                final byte[] body = responseBody != null ? responseBody.bytes() : null;
-                return new UfcHttpResponse(status, responseEtag, body);
-              }
-            });
-      } finally {
-        activeCall.set(null);
-        fetching.set(false);
-      }
+    static long millis(final int seconds) {
+        return TimeUnit.SECONDS.toMillis(seconds);
     }
 
-    @Override
-    public void cancel() {
-      cancelled.set(true);
-      final Call call = activeCall.get();
-      if (call != null) {
-        call.cancel();
-      }
+    static long retryDelayMillis(final long pollIntervalMillis, final int attempt, final double jitter) {
+        final long baseDelay;
+        if (attempt == 1) {
+            baseDelay = clamp(pollIntervalMillis / 6, FIRST_RETRY_MIN_MILLIS, FIRST_RETRY_MAX_MILLIS);
+        } else if (attempt == 2) {
+            baseDelay = clamp(pollIntervalMillis / 3, SECOND_RETRY_MIN_MILLIS, SECOND_RETRY_MAX_MILLIS);
+        } else {
+            throw new IllegalArgumentException("Unsupported Feature Flagging retry attempt: " + attempt);
+        }
+        return Math.max(1, Math.round(baseDelay * jitter));
     }
 
-    private static boolean isDatadogManagedEndpoint(final HttpUrl endpoint, final Config config) {
-      return config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl() == null
-          && endpoint.isHttps()
-          && endpoint.host().equalsIgnoreCase("ufc-server.ff-cdn." + config.getSite());
+    private static long clamp(final long value, final long minimum, final long maximum) {
+        return Math.max(minimum, Math.min(maximum, value));
     }
-  }
-
-  @SuppressFBWarnings(
-      value = "AT_NONATOMIC_OPERATIONS_ON_SHARED_VARIABLE",
-      justification =
-          "Each retry policy belongs to one synchronous HTTP request and is confined to one thread")
-  static final class AgentlessRetryPolicy extends HttpRetryPolicy {
-    private final AtomicBoolean cancelled;
-    private final long pollIntervalMillis;
-    private final RetrySleeper retrySleeper;
-    private final DoubleSupplier jitter;
-    private int retriesLeft = MAX_ATTEMPTS - 1;
-    private int retryAttempt;
-
-    AgentlessRetryPolicy(
-        final AtomicBoolean cancelled,
-        final long pollIntervalMillis,
-        final RetrySleeper retrySleeper,
-        final DoubleSupplier jitter) {
-      super(0, 0, 0, false);
-      this.cancelled = cancelled;
-      this.pollIntervalMillis = pollIntervalMillis;
-      this.retrySleeper = retrySleeper;
-      this.jitter = jitter;
+
+    interface UfcHttpClient {
+        UfcHttpResponse fetch(HttpUrl endpoint, Config config, String etag) throws IOException;
+
+        void cancel();
     }
 
-    @Override
-    public boolean shouldRetry(final Exception exception) {
-      return exception instanceof IOException
-          && !Thread.currentThread().isInterrupted()
-          && reserveRetry();
+    interface RetrySleeper {
+        void sleep(long delayMillis) throws InterruptedException;
     }
 
-    @Override
-    public boolean shouldRetry(@Nullable final Response response) {
-      return response != null && isRetryableStatus(response.code()) && reserveRetry();
+    static final class UfcHttpResponse {
+        final int status;
+
+        @Nullable
+        final String etag;
+
+        @Nullable
+        final byte[] body;
+
+        UfcHttpResponse(final int status, @Nullable final String etag, @Nullable final byte[] body) {
+            this.status = status;
+            this.etag = etag;
+            this.body = body;
+        }
     }
 
-    private boolean reserveRetry() {
-      if (cancelled.get() || retriesLeft == 0) {
-        return false;
-      }
-      retriesLeft--;
-      retryAttempt++;
-      return true;
+    static final class OkHttpUfcHttpClient implements UfcHttpClient {
+        private final OkHttpClient httpClient;
+        private final long pollIntervalMillis;
+        private final RetrySleeper retrySleeper;
+        private final DoubleSupplier jitter;
+        private final AtomicBoolean fetching = new AtomicBoolean();
+        private final AtomicBoolean cancelled = new AtomicBoolean();
+        private final AtomicReference<Call> activeCall = new AtomicReference<>();
+
+        OkHttpUfcHttpClient(final OkHttpClient httpClient) {
+            this(
+                    httpClient,
+                    TimeUnit.SECONDS.toMillis(30),
+                    TimeUnit.MILLISECONDS::sleep,
+                    () -> ThreadLocalRandom.current().nextDouble(1 - RETRY_JITTER, 1 + RETRY_JITTER));
+        }
+
+        OkHttpUfcHttpClient(
+                final OkHttpClient httpClient,
+                final long pollIntervalMillis,
+                final RetrySleeper retrySleeper,
+                final DoubleSupplier jitter) {
+            this.httpClient = httpClient;
+            this.pollIntervalMillis = pollIntervalMillis;
+            this.retrySleeper = retrySleeper;
+            this.jitter = jitter;
+        }
+
+        @Override
+        public UfcHttpResponse fetch(final HttpUrl endpoint, final Config config, final String etag)
+                throws IOException {
+            final Map<String, String> headers = new HashMap<>();
+            if (etag != null) {
+                headers.put("If-None-Match", etag);
+            }
+            // Leave Accept-Encoding unset so OkHttp negotiates gzip and transparently decompresses it.
+            final Request request = prepareRequest(
+                            endpoint, headers, config, isDatadogManagedEndpoint(endpoint, config))
+                    .get()
+                    .build();
+            if (!fetching.compareAndSet(false, true)) {
+                throw new IllegalStateException("Feature Flagging HTTP request already in flight");
+            }
+            if (cancelled.get()) {
+                fetching.set(false);
+                throw new InterruptedIOException("Feature Flagging HTTP client is closed");
+            }
+            try {
+                final HttpRetryPolicy.Factory retryPolicyFactory = new HttpRetryPolicy.Factory(0, 0, 0) {
+                    @Override
+                    public HttpRetryPolicy create() {
+                        return new AgentlessRetryPolicy(cancelled, pollIntervalMillis, retrySleeper, jitter);
+                    }
+                };
+                final Call.Factory callFactory = retryRequest -> {
+                    final Call call = httpClient.newCall(retryRequest);
+                    activeCall.set(call);
+                    if (cancelled.get()) {
+                        call.cancel();
+                    }
+                    return call;
+                };
+                return sendWithRetries(callFactory, retryPolicyFactory, request, response -> {
+                    final int status = response.code();
+                    final String responseEtag = response.header("ETag");
+                    try (ResponseBody responseBody = response.body()) {
+                        final byte[] body = responseBody != null ? responseBody.bytes() : null;
+                        return new UfcHttpResponse(status, responseEtag, body);
+                    }
+                });
+            } finally {
+                activeCall.set(null);
+                fetching.set(false);
+            }
+        }
+
+        @Override
+        public void cancel() {
+            cancelled.set(true);
+            final Call call = activeCall.get();
+            if (call != null) {
+                call.cancel();
+            }
+        }
+
+        private static boolean isDatadogManagedEndpoint(final HttpUrl endpoint, final Config config) {
+            return config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl() == null
+                    && endpoint.isHttps()
+                    && endpoint.host().equalsIgnoreCase("ufc-server.ff-cdn." + config.getSite());
+        }
     }
 
-    @Override
-    public void backoff() throws IOException {
-      if (cancelled.get()) {
-        throw new InterruptedIOException("Feature Flagging HTTP client is closed");
-      }
-      try {
-        retrySleeper.sleep(
-            retryDelayMillis(pollIntervalMillis, retryAttempt, jitter.getAsDouble()));
-      } catch (final InterruptedException e) {
-        Thread.currentThread().interrupt();
-        throw new InterruptedIOException("Feature Flagging retry interrupted");
-      }
+    @SuppressFBWarnings(
+            value = "AT_NONATOMIC_OPERATIONS_ON_SHARED_VARIABLE",
+            justification = "Each retry policy belongs to one synchronous HTTP request and is confined to one thread")
+    static final class AgentlessRetryPolicy extends HttpRetryPolicy {
+        private final AtomicBoolean cancelled;
+        private final long pollIntervalMillis;
+        private final RetrySleeper retrySleeper;
+        private final DoubleSupplier jitter;
+        private int retriesLeft = MAX_ATTEMPTS - 1;
+        private int retryAttempt;
+
+        AgentlessRetryPolicy(
+                final AtomicBoolean cancelled,
+                final long pollIntervalMillis,
+                final RetrySleeper retrySleeper,
+                final DoubleSupplier jitter) {
+            super(0, 0, 0, false);
+            this.cancelled = cancelled;
+            this.pollIntervalMillis = pollIntervalMillis;
+            this.retrySleeper = retrySleeper;
+            this.jitter = jitter;
+        }
+
+        @Override
+        public boolean shouldRetry(final Exception exception) {
+            return exception instanceof IOException && !Thread.currentThread().isInterrupted() && reserveRetry();
+        }
+
+        @Override
+        public boolean shouldRetry(@Nullable final Response response) {
+            return response != null && isRetryableStatus(response.code()) && reserveRetry();
+        }
+
+        private boolean reserveRetry() {
+            if (cancelled.get() || retriesLeft == 0) {
+                return false;
+            }
+            retriesLeft--;
+            retryAttempt++;
+            return true;
+        }
+
+        @Override
+        public void backoff() throws IOException {
+            if (cancelled.get()) {
+                throw new InterruptedIOException("Feature Flagging HTTP client is closed");
+            }
+            try {
+                retrySleeper.sleep(retryDelayMillis(pollIntervalMillis, retryAttempt, jitter.getAsDouble()));
+            } catch (final InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new InterruptedIOException("Feature Flagging retry interrupted");
+            }
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/AgentlessFeatureFlagBackendApi.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/AgentlessFeatureFlagBackendApi.java
index 769ebfd1dd1..fcbf588ba33 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/AgentlessFeatureFlagBackendApi.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/AgentlessFeatureFlagBackendApi.java
@@ -16,86 +16,81 @@
 /** Sends Feature Flag events through a local EVP proxy, with a safe direct intake fallback. */
 final class AgentlessFeatureFlagBackendApi implements BackendApi {
 
-  private static final Logger LOGGER =
-      LoggerFactory.getLogger(AgentlessFeatureFlagBackendApi.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AgentlessFeatureFlagBackendApi.class);
 
-  private final BackendApi proxyApi;
-  private final Supplier<BackendApi> directApiSupplier;
-  private final String eventType;
-  private volatile BackendApi activeApi;
-  private volatile boolean directApiCreationAttempted;
+    private final BackendApi proxyApi;
+    private final Supplier<BackendApi> directApiSupplier;
+    private final String eventType;
+    private volatile BackendApi activeApi;
+    private volatile boolean directApiCreationAttempted;
 
-  AgentlessFeatureFlagBackendApi(
-      final BackendApi proxyApi,
-      final Supplier<BackendApi> directApiSupplier,
-      final String eventType) {
-    this.proxyApi = proxyApi;
-    this.directApiSupplier = directApiSupplier;
-    this.eventType = eventType;
-    this.activeApi = proxyApi;
-  }
+    AgentlessFeatureFlagBackendApi(
+            final BackendApi proxyApi, final Supplier<BackendApi> directApiSupplier, final String eventType) {
+        this.proxyApi = proxyApi;
+        this.directApiSupplier = directApiSupplier;
+        this.eventType = eventType;
+        this.activeApi = proxyApi;
+    }
 
-  @Override
-  public <T> T post(
-      final String uri,
-      final RequestBody requestBody,
-      final IOThrowingFunction<InputStream, T> responseParser,
-      @Nullable final OkHttpUtils.CustomListener requestListener,
-      final boolean requestCompression)
-      throws IOException {
-    final BackendApi selectedApi = activeApi;
-    try {
-      return selectedApi.post(
-          uri, requestBody, responseParser, requestListener, requestCompression);
-    } catch (final IOException exception) {
-      if (selectedApi != proxyApi || !isDefinitiveRejection(exception)) {
-        throw exception;
-      }
+    @Override
+    public <T> T post(
+            final String uri,
+            final RequestBody requestBody,
+            final IOThrowingFunction<InputStream, T> responseParser,
+            @Nullable final OkHttpUtils.CustomListener requestListener,
+            final boolean requestCompression)
+            throws IOException {
+        final BackendApi selectedApi = activeApi;
+        try {
+            return selectedApi.post(uri, requestBody, responseParser, requestListener, requestCompression);
+        } catch (final IOException exception) {
+            if (selectedApi != proxyApi || !isDefinitiveRejection(exception)) {
+                throw exception;
+            }
 
-      final BackendApi directApi = getOrCreateDirectApi();
-      if (directApi == null) {
-        throw exception;
-      }
-      return directApi.post(uri, requestBody, responseParser, requestListener, requestCompression);
+            final BackendApi directApi = getOrCreateDirectApi();
+            if (directApi == null) {
+                throw exception;
+            }
+            return directApi.post(uri, requestBody, responseParser, requestListener, requestCompression);
+        }
     }
-  }
 
-  @Nullable
-  private BackendApi getOrCreateDirectApi() {
-    final BackendApi selectedApi = activeApi;
-    if (selectedApi != proxyApi) {
-      return selectedApi;
-    }
+    @Nullable
+    private BackendApi getOrCreateDirectApi() {
+        final BackendApi selectedApi = activeApi;
+        if (selectedApi != proxyApi) {
+            return selectedApi;
+        }
 
-    synchronized (this) {
-      final BackendApi currentApi = activeApi;
-      if (currentApi != proxyApi) {
-        return currentApi;
-      }
-      if (directApiCreationAttempted) {
-        return null;
-      }
+        synchronized (this) {
+            final BackendApi currentApi = activeApi;
+            if (currentApi != proxyApi) {
+                return currentApi;
+            }
+            if (directApiCreationAttempted) {
+                return null;
+            }
 
-      final BackendApi directApi = directApiSupplier.get();
-      if (directApi != null) {
-        LOGGER.debug(
-            "Switching Feature Flagging {} delivery from the local EVP proxy to direct intake",
-            eventType);
-        activeApi = directApi;
-      }
-      directApiCreationAttempted = true;
-      return directApi;
+            final BackendApi directApi = directApiSupplier.get();
+            if (directApi != null) {
+                LOGGER.debug(
+                        "Switching Feature Flagging {} delivery from the local EVP proxy to direct intake", eventType);
+                activeApi = directApi;
+            }
+            directApiCreationAttempted = true;
+            return directApi;
+        }
     }
-  }
 
-  private static boolean isDefinitiveRejection(final IOException exception) {
-    if (exception instanceof ConnectException) {
-      return true;
-    }
-    if (exception instanceof HttpResponseException) {
-      final int statusCode = ((HttpResponseException) exception).getStatusCode();
-      return statusCode == 403 || statusCode == 404 || statusCode == 405;
+    private static boolean isDefinitiveRejection(final IOException exception) {
+        if (exception instanceof ConnectException) {
+            return true;
+        }
+        if (exception instanceof HttpResponseException) {
+            final int statusCode = ((HttpResponseException) exception).getStatusCode();
+            return statusCode == 403 || statusCode == 404 || statusCode == 405;
+        }
+        return false;
     }
-    return false;
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ConfigurationSourceService.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ConfigurationSourceService.java
index 83495545717..f23116f9ba1 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ConfigurationSourceService.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ConfigurationSourceService.java
@@ -4,7 +4,7 @@
 
 public interface ConfigurationSourceService extends Closeable {
 
-  void init();
+    void init();
 
-  void close();
+    void close();
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ExposureCache.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ExposureCache.java
index 7125d009a69..d3904379e85 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ExposureCache.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ExposureCache.java
@@ -5,61 +5,61 @@
 
 public interface ExposureCache {
 
-  boolean add(ExposureEvent event);
+    boolean add(ExposureEvent event);
 
-  Value get(Key key);
+    Value get(Key key);
 
-  int size();
+    int size();
 
-  final class Key {
-    public final String flag;
-    public final String subject;
+    final class Key {
+        public final String flag;
+        public final String subject;
 
-    public Key(final ExposureEvent event) {
-      this.flag = event.flag == null ? null : event.flag.key;
-      this.subject = event.subject == null ? null : event.subject.id;
-    }
+        public Key(final ExposureEvent event) {
+            this.flag = event.flag == null ? null : event.flag.key;
+            this.subject = event.subject == null ? null : event.subject.id;
+        }
 
-    @Override
-    public boolean equals(final Object o) {
-      if (o == null || getClass() != o.getClass()) {
-        return false;
-      }
-      final Key key = (Key) o;
-      return Objects.equals(flag, key.flag) && Objects.equals(subject, key.subject);
-    }
+        @Override
+        public boolean equals(final Object o) {
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            final Key key = (Key) o;
+            return Objects.equals(flag, key.flag) && Objects.equals(subject, key.subject);
+        }
 
-    @Override
-    public int hashCode() {
-      return Objects.hash(flag, subject);
+        @Override
+        public int hashCode() {
+            return Objects.hash(flag, subject);
+        }
     }
-  }
 
-  final class Value {
-    public final String variant;
-    public final String allocation;
-    public final Integer serialId;
+    final class Value {
+        public final String variant;
+        public final String allocation;
+        public final Integer serialId;
 
-    public Value(final ExposureEvent event) {
-      this.variant = event.variant == null ? null : event.variant.key;
-      this.allocation = event.allocation == null ? null : event.allocation.key;
-      this.serialId = event.serial_id;
-    }
+        public Value(final ExposureEvent event) {
+            this.variant = event.variant == null ? null : event.variant.key;
+            this.allocation = event.allocation == null ? null : event.allocation.key;
+            this.serialId = event.serial_id;
+        }
 
-    @Override
-    public boolean equals(final Object o) {
-      if (o == null || getClass() != o.getClass()) {
-        return false;
-      }
-      final Value value = (Value) o;
-      return Objects.equals(variant, value.variant)
-          && Objects.equals(allocation, value.allocation)
-          && Objects.equals(serialId, value.serialId);
-    }
+        @Override
+        public boolean equals(final Object o) {
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            final Value value = (Value) o;
+            return Objects.equals(variant, value.variant)
+                    && Objects.equals(allocation, value.allocation)
+                    && Objects.equals(serialId, value.serialId);
+        }
 
-    @Override
-    public int hashCode() {
-      return Objects.hash(variant, allocation, serialId);
+        @Override
+        public int hashCode() {
+            return Objects.hash(variant, allocation, serialId);
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ExposureWriter.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ExposureWriter.java
index 4c9fa80ea0d..de3f3c49358 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ExposureWriter.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ExposureWriter.java
@@ -8,7 +8,7 @@
  */
 public interface ExposureWriter extends AutoCloseable, ExposureListener {
 
-  void init();
+    void init();
 
-  void close();
+    void close();
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ExposureWriterImpl.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ExposureWriterImpl.java
index fcd50e5dc34..4a65d24fe34 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ExposureWriterImpl.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ExposureWriterImpl.java
@@ -22,189 +22,182 @@
 
 public class ExposureWriterImpl implements ExposureWriter {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ExposureWriterImpl.class);
-  private static final int DEFAULT_CAPACITY = 1 << 16; // 65536 elements
-  private static final int DEFAULT_FLUSH_INTERVAL_IN_SECONDS = 1;
-  private static final int FLUSH_THRESHOLD = 100;
-  private static final String EXPOSURES_ROUTE = "exposures";
-
-  private final MessagePassingBlockingQueue<ExposureEvent> queue;
-  private final Thread serializerThread;
-
-  public ExposureWriterImpl(final SharedCommunicationObjects sco, final Config config) {
-    this(DEFAULT_CAPACITY, DEFAULT_FLUSH_INTERVAL_IN_SECONDS, SECONDS, sco, config);
-  }
-
-  ExposureWriterImpl(
-      final int capacity,
-      final long flushInterval,
-      final TimeUnit timeUnit,
-      final SharedCommunicationObjects sco,
-      final Config config) {
-    this(
-        capacity,
-        flushInterval,
-        timeUnit,
-        new FeatureFlagBackendApiFactory(config, sco, FeatureFlagEventType.EXPOSURE),
-        config);
-  }
-
-  ExposureWriterImpl(
-      final int capacity,
-      final long flushInterval,
-      final TimeUnit timeUnit,
-      final FeatureFlagBackendApiFactory backendApiFactory,
-      final Config config) {
-    this.queue = Queues.mpscBlockingConsumerArrayQueue(capacity);
-    final ExposureSerializingHandler serializer =
-        new ExposureSerializingHandler(
-            backendApiFactory,
-            queue,
-            flushInterval,
-            timeUnit,
-            FeatureFlagEvpContext.from(config),
-            this::close);
-    this.serializerThread = newAgentThread(FEATURE_FLAG_EXPOSURE_PROCESSOR, serializer);
-  }
-
-  @Override
-  public void init() {
-    FeatureFlaggingGateway.addExposureListener(this);
-    this.serializerThread.start();
-  }
-
-  @Override
-  public void close() {
-    FeatureFlaggingGateway.removeExposureListener(this);
-    if (this.serializerThread.isAlive()) {
-      this.serializerThread.interrupt();
-    }
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExposureWriterImpl.class);
+    private static final int DEFAULT_CAPACITY = 1 << 16; // 65536 elements
+    private static final int DEFAULT_FLUSH_INTERVAL_IN_SECONDS = 1;
+    private static final int FLUSH_THRESHOLD = 100;
+    private static final String EXPOSURES_ROUTE = "exposures";
 
-  @Override
-  public void accept(final ExposureEvent event) {
-    queue.offer(event);
-  }
+    private final MessagePassingBlockingQueue<ExposureEvent> queue;
+    private final Thread serializerThread;
 
-  @VisibleForTesting
-  boolean isSerializerThreadAlive() {
-    return serializerThread.isAlive();
-  }
+    public ExposureWriterImpl(final SharedCommunicationObjects sco, final Config config) {
+        this(DEFAULT_CAPACITY, DEFAULT_FLUSH_INTERVAL_IN_SECONDS, SECONDS, sco, config);
+    }
 
-  @VisibleForTesting
-  int queueSize() {
-    return queue.size();
-  }
+    ExposureWriterImpl(
+            final int capacity,
+            final long flushInterval,
+            final TimeUnit timeUnit,
+            final SharedCommunicationObjects sco,
+            final Config config) {
+        this(
+                capacity,
+                flushInterval,
+                timeUnit,
+                new FeatureFlagBackendApiFactory(config, sco, FeatureFlagEventType.EXPOSURE),
+                config);
+    }
 
-  private static class ExposureSerializingHandler implements Runnable {
-    private final MessagePassingBlockingQueue<ExposureEvent> queue;
-    private final long ticksRequiredToFlush;
-    private long lastTicks;
-
-    private final FeatureFlagEvpPublisher<ExposuresRequest> evpPublisher;
-    private final Map<String, String> context;
-    private final ExposureCache cache;
-
-    private final List<ExposureEvent> buffer = new ArrayList<>();
-    private final Runnable errorCallback;
-
-    ExposureSerializingHandler(
-        final FeatureFlagBackendApiFactory backendApiFactory,
-        final MessagePassingBlockingQueue<ExposureEvent> queue,
-        final long flushInterval,
-        final TimeUnit timeUnit,
-        final Map<String, String> context,
-        final Runnable errorCallback) {
-      this.queue = queue;
-      this.cache = new LRUExposureCache(queue.capacity());
-      this.evpPublisher =
-          new FeatureFlagEvpPublisher<>(backendApiFactory::create, ExposuresRequest.class);
-      this.context = context;
-
-      this.lastTicks = System.nanoTime();
-      this.ticksRequiredToFlush = timeUnit.toNanos(flushInterval);
-
-      this.errorCallback = errorCallback;
-
-      LOGGER.debug("starting exposure serializer");
+    ExposureWriterImpl(
+            final int capacity,
+            final long flushInterval,
+            final TimeUnit timeUnit,
+            final FeatureFlagBackendApiFactory backendApiFactory,
+            final Config config) {
+        this.queue = Queues.mpscBlockingConsumerArrayQueue(capacity);
+        final ExposureSerializingHandler serializer = new ExposureSerializingHandler(
+                backendApiFactory, queue, flushInterval, timeUnit, FeatureFlagEvpContext.from(config), this::close);
+        this.serializerThread = newAgentThread(FEATURE_FLAG_EXPOSURE_PROCESSOR, serializer);
     }
 
     @Override
-    public void run() {
-      if (!evpPublisher.start()) {
-        errorCallback.run();
-        LOGGER.warn("Feature Flagging exposure delivery is disabled");
-        return;
-      }
-      try {
-        runDutyCycle();
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      }
-      LOGGER.debug("exposure processor worker exited. submitting exposures stopped.");
+    public void init() {
+        FeatureFlaggingGateway.addExposureListener(this);
+        this.serializerThread.start();
     }
 
-    private void runDutyCycle() throws InterruptedException {
-      final Thread thread = Thread.currentThread();
-      while (!thread.isInterrupted()) {
-        ExposureEvent event;
-        while ((event = queue.poll(100, TimeUnit.MILLISECONDS)) != null) {
-          if (addToBuffer(event)) {
-            consumeBatch();
-            break;
-          }
+    @Override
+    public void close() {
+        FeatureFlaggingGateway.removeExposureListener(this);
+        if (this.serializerThread.isAlive()) {
+            this.serializerThread.interrupt();
         }
-        flushIfNecessary();
-      }
     }
 
-    private void consumeBatch() {
-      queue.drain(this::addToBuffer, queue.size());
+    @Override
+    public void accept(final ExposureEvent event) {
+        queue.offer(event);
     }
 
-    /** Adds an element to the buffer taking care of duplicated exposures thanks to the LRU cache */
-    private boolean addToBuffer(final ExposureEvent event) {
-      if (cache.add(event)) {
-        buffer.add(event);
-        return true;
-      }
-      return false;
+    @VisibleForTesting
+    boolean isSerializerThreadAlive() {
+        return serializerThread.isAlive();
     }
 
-    protected void flushIfNecessary() {
-      if (buffer.isEmpty()) {
-        return;
-      }
-      if (shouldFlush()) {
-        final byte[] payload;
-        try {
-          final ExposuresRequest exposures = new ExposuresRequest(this.context, this.buffer);
-          payload = evpPublisher.serialize(exposures);
-        } catch (RuntimeException e) {
-          LOGGER.error(EXCLUDE_TELEMETRY, "Could not serialize exposures; dropping batch", e);
-          this.buffer.clear();
-          return;
+    @VisibleForTesting
+    int queueSize() {
+        return queue.size();
+    }
+
+    private static class ExposureSerializingHandler implements Runnable {
+        private final MessagePassingBlockingQueue<ExposureEvent> queue;
+        private final long ticksRequiredToFlush;
+        private long lastTicks;
+
+        private final FeatureFlagEvpPublisher<ExposuresRequest> evpPublisher;
+        private final Map<String, String> context;
+        private final ExposureCache cache;
+
+        private final List<ExposureEvent> buffer = new ArrayList<>();
+        private final Runnable errorCallback;
+
+        ExposureSerializingHandler(
+                final FeatureFlagBackendApiFactory backendApiFactory,
+                final MessagePassingBlockingQueue<ExposureEvent> queue,
+                final long flushInterval,
+                final TimeUnit timeUnit,
+                final Map<String, String> context,
+                final Runnable errorCallback) {
+            this.queue = queue;
+            this.cache = new LRUExposureCache(queue.capacity());
+            this.evpPublisher = new FeatureFlagEvpPublisher<>(backendApiFactory::create, ExposuresRequest.class);
+            this.context = context;
+
+            this.lastTicks = System.nanoTime();
+            this.ticksRequiredToFlush = timeUnit.toNanos(flushInterval);
+
+            this.errorCallback = errorCallback;
+
+            LOGGER.debug("starting exposure serializer");
         }
-        try {
-          evpPublisher.post(EXPOSURES_ROUTE, payload);
-        } catch (Exception e) {
-          LOGGER.debug("Could not submit exposures", e);
-        } finally {
-          // Best-effort delivery must not retry an ambiguously accepted batch. A later definitive
-          // proxy rejection could otherwise replay the same exposures through direct intake.
-          this.buffer.clear();
+
+        @Override
+        public void run() {
+            if (!evpPublisher.start()) {
+                errorCallback.run();
+                LOGGER.warn("Feature Flagging exposure delivery is disabled");
+                return;
+            }
+            try {
+                runDutyCycle();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+            LOGGER.debug("exposure processor worker exited. submitting exposures stopped.");
         }
-      }
-    }
 
-    private boolean shouldFlush() {
-      long nanoTime = System.nanoTime();
-      long ticks = nanoTime - lastTicks;
-      if (ticks > ticksRequiredToFlush || queue.size() >= FLUSH_THRESHOLD) {
-        lastTicks = nanoTime;
-        return true;
-      }
-      return false;
+        private void runDutyCycle() throws InterruptedException {
+            final Thread thread = Thread.currentThread();
+            while (!thread.isInterrupted()) {
+                ExposureEvent event;
+                while ((event = queue.poll(100, TimeUnit.MILLISECONDS)) != null) {
+                    if (addToBuffer(event)) {
+                        consumeBatch();
+                        break;
+                    }
+                }
+                flushIfNecessary();
+            }
+        }
+
+        private void consumeBatch() {
+            queue.drain(this::addToBuffer, queue.size());
+        }
+
+        /** Adds an element to the buffer taking care of duplicated exposures thanks to the LRU cache */
+        private boolean addToBuffer(final ExposureEvent event) {
+            if (cache.add(event)) {
+                buffer.add(event);
+                return true;
+            }
+            return false;
+        }
+
+        protected void flushIfNecessary() {
+            if (buffer.isEmpty()) {
+                return;
+            }
+            if (shouldFlush()) {
+                final byte[] payload;
+                try {
+                    final ExposuresRequest exposures = new ExposuresRequest(this.context, this.buffer);
+                    payload = evpPublisher.serialize(exposures);
+                } catch (RuntimeException e) {
+                    LOGGER.error(EXCLUDE_TELEMETRY, "Could not serialize exposures; dropping batch", e);
+                    this.buffer.clear();
+                    return;
+                }
+                try {
+                    evpPublisher.post(EXPOSURES_ROUTE, payload);
+                } catch (Exception e) {
+                    LOGGER.debug("Could not submit exposures", e);
+                } finally {
+                    // Best-effort delivery must not retry an ambiguously accepted batch. A later definitive
+                    // proxy rejection could otherwise replay the same exposures through direct intake.
+                    this.buffer.clear();
+                }
+            }
+        }
+
+        private boolean shouldFlush() {
+            long nanoTime = System.nanoTime();
+            long ticks = nanoTime - lastTicks;
+            if (ticks > ticksRequiredToFlush || queue.size() >= FLUSH_THRESHOLD) {
+                lastTicks = nanoTime;
+                return true;
+            }
+            return false;
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FeatureFlagBackendApiFactory.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FeatureFlagBackendApiFactory.java
index 451b903ecc7..5c3bd66ccc5 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FeatureFlagBackendApiFactory.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FeatureFlagBackendApiFactory.java
@@ -15,86 +15,80 @@
 /** Selects the transport for Feature Flagging events. */
 final class FeatureFlagBackendApiFactory {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(FeatureFlagBackendApiFactory.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FeatureFlagBackendApiFactory.class);
 
-  private final Config config;
-  private final BackendApiFactory backendApiFactory;
-  private final FeatureFlagEventType eventType;
+    private final Config config;
+    private final BackendApiFactory backendApiFactory;
+    private final FeatureFlagEventType eventType;
 
-  FeatureFlagBackendApiFactory(
-      final Config config,
-      final SharedCommunicationObjects sharedCommunicationObjects,
-      final FeatureFlagEventType eventType) {
-    this(config, new BackendApiFactory(config, sharedCommunicationObjects), eventType);
-  }
-
-  FeatureFlagBackendApiFactory(
-      final Config config,
-      final BackendApiFactory backendApiFactory,
-      final FeatureFlagEventType eventType) {
-    this.config = config;
-    this.backendApiFactory = backendApiFactory;
-    this.eventType = eventType;
-  }
-
-  @Nullable
-  BackendApi create() {
-    final boolean directFallbackAvailable =
-        CONFIGURATION_SOURCE_AGENTLESS.equals(config.getFeatureFlaggingConfigurationSource())
-            && hasDirectCredentials();
-    final BackendApi proxyApi =
-        directFallbackAvailable
-            ? backendApiFactory.createEvpProxyApi(
-                Intake.EVENT_PLATFORM,
-                eventType.responseCompressionEnabled(),
-                HttpRetryPolicy.Factory.NEVER_RETRY)
-            : backendApiFactory.createEvpProxyApi(
-                Intake.EVENT_PLATFORM, eventType.responseCompressionEnabled());
-    if (!CONFIGURATION_SOURCE_AGENTLESS.equals(config.getFeatureFlaggingConfigurationSource())) {
-      if (proxyApi == null) {
-        LOGGER.warn(
-            "Feature Flagging {} delivery is disabled because the local Agent does not support the EVP proxy",
-            eventType.logName());
-      }
-      return proxyApi;
+    FeatureFlagBackendApiFactory(
+            final Config config,
+            final SharedCommunicationObjects sharedCommunicationObjects,
+            final FeatureFlagEventType eventType) {
+        this(config, new BackendApiFactory(config, sharedCommunicationObjects), eventType);
     }
 
-    if (proxyApi != null) {
-      if (directFallbackAvailable) {
-        return new AgentlessFeatureFlagBackendApi(
-            proxyApi, this::createDirectApi, eventType.logName());
-      }
-      return proxyApi;
+    FeatureFlagBackendApiFactory(
+            final Config config, final BackendApiFactory backendApiFactory, final FeatureFlagEventType eventType) {
+        this.config = config;
+        this.backendApiFactory = backendApiFactory;
+        this.eventType = eventType;
     }
 
-    final BackendApi directApi = createDirectApi();
-    if (directApi != null) {
-      return directApi;
-    }
+    @Nullable
+    BackendApi create() {
+        final boolean directFallbackAvailable =
+                CONFIGURATION_SOURCE_AGENTLESS.equals(config.getFeatureFlaggingConfigurationSource())
+                        && hasDirectCredentials();
+        final BackendApi proxyApi = directFallbackAvailable
+                ? backendApiFactory.createEvpProxyApi(
+                        Intake.EVENT_PLATFORM,
+                        eventType.responseCompressionEnabled(),
+                        HttpRetryPolicy.Factory.NEVER_RETRY)
+                : backendApiFactory.createEvpProxyApi(Intake.EVENT_PLATFORM, eventType.responseCompressionEnabled());
+        if (!CONFIGURATION_SOURCE_AGENTLESS.equals(config.getFeatureFlaggingConfigurationSource())) {
+            if (proxyApi == null) {
+                LOGGER.warn(
+                        "Feature Flagging {} delivery is disabled because the local Agent does not support the EVP proxy",
+                        eventType.logName());
+            }
+            return proxyApi;
+        }
 
-    LOGGER.warn(
-        "Feature Flagging {} delivery is disabled because no compatible local EVP proxy or direct intake credentials are available",
-        eventType.logName());
-    return null;
-  }
+        if (proxyApi != null) {
+            if (directFallbackAvailable) {
+                return new AgentlessFeatureFlagBackendApi(proxyApi, this::createDirectApi, eventType.logName());
+            }
+            return proxyApi;
+        }
 
-  private boolean hasDirectCredentials() {
-    final String apiKey = config.getApiKey();
-    return apiKey != null && !apiKey.isEmpty();
-  }
+        final BackendApi directApi = createDirectApi();
+        if (directApi != null) {
+            return directApi;
+        }
 
-  @Nullable
-  private BackendApi createDirectApi() {
-    if (!hasDirectCredentials()) {
-      return null;
+        LOGGER.warn(
+                "Feature Flagging {} delivery is disabled because no compatible local EVP proxy or direct intake credentials are available",
+                eventType.logName());
+        return null;
+    }
+
+    private boolean hasDirectCredentials() {
+        final String apiKey = config.getApiKey();
+        return apiKey != null && !apiKey.isEmpty();
     }
-    try {
-      return backendApiFactory.createDirectIntakeApi(
-          Intake.EVENT_PLATFORM, eventType.responseCompressionEnabled(), false);
-    } catch (final IllegalArgumentException exception) {
-      LOGGER.debug(
-          "Cannot configure direct Feature Flagging {} delivery", eventType.logName(), exception);
-      return null;
+
+    @Nullable
+    private BackendApi createDirectApi() {
+        if (!hasDirectCredentials()) {
+            return null;
+        }
+        try {
+            return backendApiFactory.createDirectIntakeApi(
+                    Intake.EVENT_PLATFORM, eventType.responseCompressionEnabled(), false);
+        } catch (final IllegalArgumentException exception) {
+            LOGGER.debug("Cannot configure direct Feature Flagging {} delivery", eventType.logName(), exception);
+            return null;
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FeatureFlagEventType.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FeatureFlagEventType.java
index dee8b424fa3..58ac329991c 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FeatureFlagEventType.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FeatureFlagEventType.java
@@ -2,25 +2,25 @@
 
 /** Defines event-specific transport behavior for Feature Flag delivery. */
 enum FeatureFlagEventType {
-  // Keep the established exposure transport behavior for compatibility.
-  EXPOSURE("exposure", true),
+    // Keep the established exposure transport behavior for compatibility.
+    EXPOSURE("exposure", true),
 
-  // Flag evaluation writers ignore successful response bodies, so gzip negotiation adds no value.
-  FLAG_EVALUATION("flag evaluation", false);
+    // Flag evaluation writers ignore successful response bodies, so gzip negotiation adds no value.
+    FLAG_EVALUATION("flag evaluation", false);
 
-  private final String logName;
-  private final boolean responseCompressionEnabled;
+    private final String logName;
+    private final boolean responseCompressionEnabled;
 
-  FeatureFlagEventType(final String logName, final boolean responseCompressionEnabled) {
-    this.logName = logName;
-    this.responseCompressionEnabled = responseCompressionEnabled;
-  }
+    FeatureFlagEventType(final String logName, final boolean responseCompressionEnabled) {
+        this.logName = logName;
+        this.responseCompressionEnabled = responseCompressionEnabled;
+    }
 
-  String logName() {
-    return logName;
-  }
+    String logName() {
+        return logName;
+    }
 
-  boolean responseCompressionEnabled() {
-    return responseCompressionEnabled;
-  }
+    boolean responseCompressionEnabled() {
+        return responseCompressionEnabled;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FeatureFlagEvpContext.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FeatureFlagEvpContext.java
index c964efa6c7f..ccea00a7619 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FeatureFlagEvpContext.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FeatureFlagEvpContext.java
@@ -6,17 +6,17 @@
 
 final class FeatureFlagEvpContext {
 
-  private FeatureFlagEvpContext() {}
+    private FeatureFlagEvpContext() {}
 
-  static Map<String, String> from(final Config config) {
-    final Map<String, String> context = new HashMap<>(4);
-    context.put("service", config.getServiceName() == null ? "unknown" : config.getServiceName());
-    if (config.getEnv() != null) {
-      context.put("env", config.getEnv());
+    static Map<String, String> from(final Config config) {
+        final Map<String, String> context = new HashMap<>(4);
+        context.put("service", config.getServiceName() == null ? "unknown" : config.getServiceName());
+        if (config.getEnv() != null) {
+            context.put("env", config.getEnv());
+        }
+        if (config.getVersion() != null) {
+            context.put("version", config.getVersion());
+        }
+        return context;
     }
-    if (config.getVersion() != null) {
-      context.put("version", config.getVersion());
-    }
-    return context;
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FeatureFlagEvpPublisher.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FeatureFlagEvpPublisher.java
index 8a024b52f43..d85c039428f 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FeatureFlagEvpPublisher.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FeatureFlagEvpPublisher.java
@@ -13,59 +13,54 @@
 
 final class FeatureFlagEvpPublisher<T> {
 
-  private static final MediaType JSON = MediaType.parse("application/json");
+    private static final MediaType JSON = MediaType.parse("application/json");
 
-  private final Supplier<BackendApi> backendApiSupplier;
-  private final JsonAdapter<T> jsonAdapter;
-  private BackendApi evp;
+    private final Supplier<BackendApi> backendApiSupplier;
+    private final JsonAdapter<T> jsonAdapter;
+    private BackendApi evp;
 
-  FeatureFlagEvpPublisher(final BackendApiFactory backendApiFactory, final Class<T> requestType) {
-    this(backendApiFactory, requestType, true);
-  }
+    FeatureFlagEvpPublisher(final BackendApiFactory backendApiFactory, final Class<T> requestType) {
+        this(backendApiFactory, requestType, true);
+    }
 
-  FeatureFlagEvpPublisher(
-      final BackendApiFactory backendApiFactory,
-      final Class<T> requestType,
-      final boolean responseCompression) {
-    this(
-        () -> backendApiFactory.createBackendApi(Intake.EVENT_PLATFORM, responseCompression),
-        requestType);
-  }
+    FeatureFlagEvpPublisher(
+            final BackendApiFactory backendApiFactory, final Class<T> requestType, final boolean responseCompression) {
+        this(() -> backendApiFactory.createBackendApi(Intake.EVENT_PLATFORM, responseCompression), requestType);
+    }
 
-  FeatureFlagEvpPublisher(
-      final Supplier<BackendApi> backendApiSupplier, final Class<T> requestType) {
-    this.backendApiSupplier = backendApiSupplier;
-    this.jsonAdapter = new Moshi.Builder().build().adapter(requestType);
-  }
+    FeatureFlagEvpPublisher(final Supplier<BackendApi> backendApiSupplier, final Class<T> requestType) {
+        this.backendApiSupplier = backendApiSupplier;
+        this.jsonAdapter = new Moshi.Builder().build().adapter(requestType);
+    }
 
-  boolean start() {
-    if (evp == null) {
-      evp = backendApiSupplier.get();
+    boolean start() {
+        if (evp == null) {
+            evp = backendApiSupplier.get();
+        }
+        return evp != null;
     }
-    return evp != null;
-  }
 
-  void post(final String route, final T request) throws IOException {
-    post(route, serialize(request));
-  }
+    void post(final String route, final T request) throws IOException {
+        post(route, serialize(request));
+    }
 
-  byte[] serialize(final T request) {
-    return utf8Bytes(jsonAdapter.toJson(request));
-  }
+    byte[] serialize(final T request) {
+        return utf8Bytes(jsonAdapter.toJson(request));
+    }
 
-  void post(final String route, final byte[] json) throws IOException {
-    if (!start()) {
-      throw new IllegalStateException("EVP Proxy not available");
+    void post(final String route, final byte[] json) throws IOException {
+        if (!start()) {
+            throw new IllegalStateException("EVP Proxy not available");
+        }
+        final RequestBody requestBody = RequestBody.create(JSON, json);
+        evp.post(route, requestBody, stream -> null, null, false);
     }
-    final RequestBody requestBody = RequestBody.create(JSON, json);
-    evp.post(route, requestBody, stream -> null, null, false);
-  }
 
-  static byte[] utf8Bytes(final String json) {
-    try {
-      return json.getBytes("UTF-8");
-    } catch (UnsupportedEncodingException e) {
-      throw new AssertionError("UTF-8 must be available", e);
+    static byte[] utf8Bytes(final String json) {
+        try {
+            return json.getBytes("UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new AssertionError("UTF-8 must be available", e);
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FlagEvaluationAggregator.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FlagEvaluationAggregator.java
index 5d0eeaa0e82..ab6db189f7f 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FlagEvaluationAggregator.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FlagEvaluationAggregator.java
@@ -13,442 +13,425 @@
 
 final class FlagEvaluationAggregator {
 
-  // Design assumptions — document the scale we sized for
-  static final int EXPECTED_FLAG_COUNT = 2_500;
-  static final int EXPECTED_FULL_BUCKETS_PER_FLAG = 50;
-  static final int EXPECTED_USERS_PER_FLAG = 1_000;
-  static final int PER_FLAG_HEADROOM_MULTIPLIER = 10;
-  static final int EXPECTED_DEGRADED_BUCKETS_PER_FLAG = 10;
-
-  // Derived sizing — show the math behind the bucket caps below
-  static final int FULL_BUCKET_SIZING_BASIS =
-      EXPECTED_FLAG_COUNT * EXPECTED_FULL_BUCKETS_PER_FLAG; // 125_000
-  static final int PER_FLAG_BUCKET_SIZING_BASIS =
-      PER_FLAG_HEADROOM_MULTIPLIER * EXPECTED_USERS_PER_FLAG; // 10_000
-  static final int DEGRADED_BUCKET_SIZING_BASIS =
-      EXPECTED_FLAG_COUNT * EXPECTED_DEGRADED_BUCKETS_PER_FLAG; // 25_000
-
-  // Enforced bucket caps
-  static final int GLOBAL_CAP = 131_072; // nearest power of two above FULL_BUCKET_SIZING_BASIS
-  static final int PER_FLAG_CAP = PER_FLAG_BUCKET_SIZING_BASIS;
-  static final int DEGRADED_CAP = 32_768; // nearest power of two above DEGRADED_BUCKET_SIZING_BASIS
-
-  private static final byte CTX_TAG_STRING = 's';
-  private static final byte CTX_TAG_BOOL = 'b';
-  private static final byte CTX_TAG_INT = 'i';
-  private static final byte CTX_TAG_LONG = 'l';
-  private static final byte CTX_TAG_FLOAT = 'f';
-  private static final byte CTX_TAG_DOUBLE = 'd';
-  private static final byte CTX_TAG_OTHER = 'o';
-
-  final Map<FullKey, EvalBucket> fullTier = new HashMap<>();
-  final Map<DegradedKey, EvalBucket> degradedTier = new HashMap<>();
-  final Map<String, Integer> perFlagCount = new HashMap<>();
-  final AtomicLong droppedDegradedOverflow = new AtomicLong(0);
-  final AtomicInteger globalFullCount = new AtomicInteger(0);
-
-  void aggregate(final FlagEvalEvent event) {
-    final boolean isDefault = event.variant == null;
-    final boolean observeFullEvaluationData = event.observeFullEvaluationData;
-    // On the protected path the context is dropped on emit, so it must not fragment buckets or be
-    // stored — otherwise a high-cardinality field (request_id, timestamp) blows out PER_FLAG_CAP
-    // and spills every subsequent evaluation into the degraded tier.
-    final Map<String, Object> prunedAttrs = observeFullEvaluationData ? event.attrs : null;
-    final String ctxKey = observeFullEvaluationData ? canonicalContextKey(prunedAttrs) : "";
-    final FullKey fullKey = buildFullKey(event, ctxKey);
-
-    EvalBucket bucket = fullTier.get(fullKey);
-    if (bucket != null) {
-      bucket.merge(event.evalTimeMs, isDefault);
-      bucket.observeFullEvaluationData &= observeFullEvaluationData;
-      return;
+    // Design assumptions — document the scale we sized for
+    static final int EXPECTED_FLAG_COUNT = 2_500;
+    static final int EXPECTED_FULL_BUCKETS_PER_FLAG = 50;
+    static final int EXPECTED_USERS_PER_FLAG = 1_000;
+    static final int PER_FLAG_HEADROOM_MULTIPLIER = 10;
+    static final int EXPECTED_DEGRADED_BUCKETS_PER_FLAG = 10;
+
+    // Derived sizing — show the math behind the bucket caps below
+    static final int FULL_BUCKET_SIZING_BASIS = EXPECTED_FLAG_COUNT * EXPECTED_FULL_BUCKETS_PER_FLAG; // 125_000
+    static final int PER_FLAG_BUCKET_SIZING_BASIS = PER_FLAG_HEADROOM_MULTIPLIER * EXPECTED_USERS_PER_FLAG; // 10_000
+    static final int DEGRADED_BUCKET_SIZING_BASIS = EXPECTED_FLAG_COUNT * EXPECTED_DEGRADED_BUCKETS_PER_FLAG; // 25_000
+
+    // Enforced bucket caps
+    static final int GLOBAL_CAP = 131_072; // nearest power of two above FULL_BUCKET_SIZING_BASIS
+    static final int PER_FLAG_CAP = PER_FLAG_BUCKET_SIZING_BASIS;
+    static final int DEGRADED_CAP = 32_768; // nearest power of two above DEGRADED_BUCKET_SIZING_BASIS
+
+    private static final byte CTX_TAG_STRING = 's';
+    private static final byte CTX_TAG_BOOL = 'b';
+    private static final byte CTX_TAG_INT = 'i';
+    private static final byte CTX_TAG_LONG = 'l';
+    private static final byte CTX_TAG_FLOAT = 'f';
+    private static final byte CTX_TAG_DOUBLE = 'd';
+    private static final byte CTX_TAG_OTHER = 'o';
+
+    final Map<FullKey, EvalBucket> fullTier = new HashMap<>();
+    final Map<DegradedKey, EvalBucket> degradedTier = new HashMap<>();
+    final Map<String, Integer> perFlagCount = new HashMap<>();
+    final AtomicLong droppedDegradedOverflow = new AtomicLong(0);
+    final AtomicInteger globalFullCount = new AtomicInteger(0);
+
+    void aggregate(final FlagEvalEvent event) {
+        final boolean isDefault = event.variant == null;
+        final boolean observeFullEvaluationData = event.observeFullEvaluationData;
+        // On the protected path the context is dropped on emit, so it must not fragment buckets or be
+        // stored — otherwise a high-cardinality field (request_id, timestamp) blows out PER_FLAG_CAP
+        // and spills every subsequent evaluation into the degraded tier.
+        final Map<String, Object> prunedAttrs = observeFullEvaluationData ? event.attrs : null;
+        final String ctxKey = observeFullEvaluationData ? canonicalContextKey(prunedAttrs) : "";
+        final FullKey fullKey = buildFullKey(event, ctxKey);
+
+        EvalBucket bucket = fullTier.get(fullKey);
+        if (bucket != null) {
+            bucket.merge(event.evalTimeMs, isDefault);
+            bucket.observeFullEvaluationData &= observeFullEvaluationData;
+            return;
+        }
+
+        final int flagCount = perFlagCount.getOrDefault(event.flagKey, 0);
+        if (globalFullCount.get() < GLOBAL_CAP && flagCount < PER_FLAG_CAP) {
+            fullTier.put(
+                    fullKey,
+                    new EvalBucket(
+                            event.flagKey,
+                            event.variant,
+                            event.allocationKey,
+                            event.targetingKey,
+                            event.errorMessage,
+                            event.evalTimeMs,
+                            isDefault,
+                            prunedAttrs,
+                            observeFullEvaluationData));
+            globalFullCount.incrementAndGet();
+            perFlagCount.put(event.flagKey, flagCount + 1);
+            return;
+        }
+
+        final DegradedKey degradedKey = buildDegradedKey(event);
+        bucket = degradedTier.get(degradedKey);
+        if (bucket != null) {
+            bucket.merge(event.evalTimeMs, isDefault);
+            bucket.observeFullEvaluationData &= observeFullEvaluationData;
+            return;
+        }
+
+        if (degradedTier.size() < DEGRADED_CAP) {
+            degradedTier.put(
+                    degradedKey,
+                    new EvalBucket(
+                            event.flagKey,
+                            event.variant,
+                            event.allocationKey,
+                            null,
+                            event.errorMessage,
+                            event.evalTimeMs,
+                            isDefault,
+                            null,
+                            observeFullEvaluationData));
+            return;
+        }
+
+        droppedDegradedOverflow.incrementAndGet();
     }
 
-    final int flagCount = perFlagCount.getOrDefault(event.flagKey, 0);
-    if (globalFullCount.get() < GLOBAL_CAP && flagCount < PER_FLAG_CAP) {
-      fullTier.put(
-          fullKey,
-          new EvalBucket(
-              event.flagKey,
-              event.variant,
-              event.allocationKey,
-              event.targetingKey,
-              event.errorMessage,
-              event.evalTimeMs,
-              isDefault,
-              prunedAttrs,
-              observeFullEvaluationData));
-      globalFullCount.incrementAndGet();
-      perFlagCount.put(event.flagKey, flagCount + 1);
-      return;
+    boolean isEmpty() {
+        return fullTier.isEmpty() && degradedTier.isEmpty();
     }
 
-    final DegradedKey degradedKey = buildDegradedKey(event);
-    bucket = degradedTier.get(degradedKey);
-    if (bucket != null) {
-      bucket.merge(event.evalTimeMs, isDefault);
-      bucket.observeFullEvaluationData &= observeFullEvaluationData;
-      return;
+    int fullTierSize() {
+        return fullTier.size();
     }
 
-    if (degradedTier.size() < DEGRADED_CAP) {
-      degradedTier.put(
-          degradedKey,
-          new EvalBucket(
-              event.flagKey,
-              event.variant,
-              event.allocationKey,
-              null,
-              event.errorMessage,
-              event.evalTimeMs,
-              isDefault,
-              null,
-              observeFullEvaluationData));
-      return;
+    long degradedEvaluationCount() {
+        long count = 0;
+        for (final EvalBucket bucket : degradedTier.values()) {
+            count += bucket.count;
+        }
+        return count;
     }
 
-    droppedDegradedOverflow.incrementAndGet();
-  }
-
-  boolean isEmpty() {
-    return fullTier.isEmpty() && degradedTier.isEmpty();
-  }
-
-  int fullTierSize() {
-    return fullTier.size();
-  }
+    int bucketCount() {
+        return fullTier.size() + degradedTier.size();
+    }
 
-  long degradedEvaluationCount() {
-    long count = 0;
-    for (final EvalBucket bucket : degradedTier.values()) {
-      count += bucket.count;
+    Iterable<EvalBucket> fullBuckets() {
+        return fullTier.values();
     }
-    return count;
-  }
-
-  int bucketCount() {
-    return fullTier.size() + degradedTier.size();
-  }
-
-  Iterable<EvalBucket> fullBuckets() {
-    return fullTier.values();
-  }
-
-  Iterable<EvalBucket> degradedBuckets() {
-    return degradedTier.values();
-  }
-
-  void clear() {
-    fullTier.clear();
-    degradedTier.clear();
-    perFlagCount.clear();
-    globalFullCount.set(0);
-  }
-
-  AggregatedState snapshot() {
-    return new AggregatedState(
-        new HashMap<>(fullTier), new HashMap<>(degradedTier), droppedDegradedOverflow.get());
-  }
-
-  void simulateFullTierAtCap() {
-    for (int i = globalFullCount.get(); i < GLOBAL_CAP; i++) {
-      final String key = "synthetic-full-" + i;
-      fullTier.put(
-          new FullKey(key, "on", "alloc", false, null, null, "", false),
-          new EvalBucket(key, "on", "alloc", null, null, 1L, false, null, false));
-      globalFullCount.incrementAndGet();
-      perFlagCount.merge(key, 1, Integer::sum);
+
+    Iterable<EvalBucket> degradedBuckets() {
+        return degradedTier.values();
     }
-  }
-
-  void simulateDegradedTierAtCap() {
-    for (int i = degradedTier.size(); i < DEGRADED_CAP; i++) {
-      final String key = "synthetic-dg-" + i;
-      degradedTier.put(
-          new DegradedKey(key, "on", "alloc", false, null),
-          new EvalBucket(key, "on", "alloc", null, null, 1L, false, null, false));
+
+    void clear() {
+        fullTier.clear();
+        degradedTier.clear();
+        perFlagCount.clear();
+        globalFullCount.set(0);
     }
-  }
-
-  void addDegradedBucketForTest(
-      final String flagKey,
-      final String variant,
-      final String allocationKey,
-      final String errorMessage,
-      final long evalTimeMs) {
-    degradedTier.put(
-        new DegradedKey(flagKey, variant, allocationKey, variant == null, errorMessage),
-        new EvalBucket(
-            flagKey,
-            variant,
-            allocationKey,
-            null,
-            errorMessage,
-            evalTimeMs,
-            variant == null,
-            null,
-            false));
-  }
-
-  private static FullKey buildFullKey(final FlagEvalEvent event, final String ctxKey) {
-    return new FullKey(
-        event.flagKey,
-        event.variant,
-        event.allocationKey,
-        event.variant == null,
-        event.errorMessage,
-        event.targetingKey,
-        ctxKey,
-        event.observeFullEvaluationData);
-  }
-
-  private static DegradedKey buildDegradedKey(final FlagEvalEvent event) {
-    return new DegradedKey(
-        event.flagKey,
-        event.variant,
-        event.allocationKey,
-        event.variant == null,
-        event.errorMessage);
-  }
-
-  static String canonicalContextKey(final Map<String, Object> prunedAttrs) {
-    if (prunedAttrs == null || prunedAttrs.isEmpty()) {
-      return "";
+
+    AggregatedState snapshot() {
+        return new AggregatedState(new HashMap<>(fullTier), new HashMap<>(degradedTier), droppedDegradedOverflow.get());
     }
-    final Map<String, Object> sorted =
-        (prunedAttrs instanceof TreeMap) ? prunedAttrs : new TreeMap<>(prunedAttrs);
-    final StringBuilder sb = new StringBuilder();
-    for (final Map.Entry<String, Object> entry : sorted.entrySet()) {
-      appendLengthDelimited(sb, entry.getKey());
-      appendContextValue(sb, entry.getValue());
+
+    void simulateFullTierAtCap() {
+        for (int i = globalFullCount.get(); i < GLOBAL_CAP; i++) {
+            final String key = "synthetic-full-" + i;
+            fullTier.put(
+                    new FullKey(key, "on", "alloc", false, null, null, "", false),
+                    new EvalBucket(key, "on", "alloc", null, null, 1L, false, null, false));
+            globalFullCount.incrementAndGet();
+            perFlagCount.merge(key, 1, Integer::sum);
+        }
     }
-    return sb.toString();
-  }
-
-  private static final String HEX_ZEROS = "00000000";
-
-  private static void appendLengthDelimited(final StringBuilder sb, final String s) {
-    // 8-char zero-padded hex length prefix, allocation-lean (no String.format on the hot path).
-    final String hexLength = Integer.toHexString(s.length());
-    sb.append(HEX_ZEROS, 0, 8 - hexLength.length());
-    sb.append(hexLength);
-    sb.append(s);
-  }
-
-  private static void appendContextValue(final StringBuilder sb, final Object v) {
-    if (v instanceof Boolean) {
-      sb.append((char) CTX_TAG_BOOL);
-      appendLengthDelimited(sb, v.toString());
-    } else if (v instanceof Long) {
-      sb.append((char) CTX_TAG_LONG);
-      appendLengthDelimited(sb, v.toString());
-    } else if (v instanceof Integer) {
-      sb.append((char) CTX_TAG_INT);
-      appendLengthDelimited(sb, v.toString());
-    } else if (v instanceof Float) {
-      sb.append((char) CTX_TAG_FLOAT);
-      appendLengthDelimited(sb, v.toString());
-    } else if (v instanceof Double) {
-      sb.append((char) CTX_TAG_DOUBLE);
-      appendLengthDelimited(sb, v.toString());
-    } else if (v instanceof String) {
-      sb.append((char) CTX_TAG_STRING);
-      appendLengthDelimited(sb, (String) v);
-    } else {
-      sb.append((char) CTX_TAG_OTHER);
-      appendLengthDelimited(sb, v == null ? "" : v.toString());
+
+    void simulateDegradedTierAtCap() {
+        for (int i = degradedTier.size(); i < DEGRADED_CAP; i++) {
+            final String key = "synthetic-dg-" + i;
+            degradedTier.put(
+                    new DegradedKey(key, "on", "alloc", false, null),
+                    new EvalBucket(key, "on", "alloc", null, null, 1L, false, null, false));
+        }
     }
-  }
-
-  static class EvalBucket {
-    long count;
-    long firstEvalMs;
-    long lastEvalMs;
-    boolean runtimeDefaultUsed;
-    String flagKey;
-    String variant;
-    String allocationKey;
-    String targetingKey;
-    String errorMessage;
-    Map<String, Object> prunedAttrs;
-    // Consent to emit raw PII. For full-tier buckets this is uniform (consent is a FullKey
-    // dimension) and the AND-fold on merge is defensive. For degraded-tier buckets consent is NOT
-    // a key dimension — mixed-consent events merge here — so the AND-fold produces false whenever
-    // any consent-off event lands in the bucket. That's benign because the degraded wire path
-    // drops the targeting key and context regardless of consent, so this field has no downstream
-    // effect for degraded rows.
-    boolean observeFullEvaluationData;
-
-    EvalBucket(
-        final String flagKey,
-        final String variant,
-        final String allocationKey,
-        final String targetingKey,
-        final String errorMessage,
-        final long evalTimeMs,
-        final boolean runtimeDefaultUsed,
-        final Map<String, Object> prunedAttrs,
-        final boolean observeFullEvaluationData) {
-      this.flagKey = flagKey;
-      this.variant = variant;
-      this.allocationKey = allocationKey;
-      this.targetingKey = targetingKey;
-      this.errorMessage = errorMessage;
-      this.firstEvalMs = evalTimeMs;
-      this.lastEvalMs = evalTimeMs;
-      this.count = 1;
-      this.runtimeDefaultUsed = runtimeDefaultUsed;
-      this.prunedAttrs = prunedAttrs;
-      this.observeFullEvaluationData = observeFullEvaluationData;
+
+    void addDegradedBucketForTest(
+            final String flagKey,
+            final String variant,
+            final String allocationKey,
+            final String errorMessage,
+            final long evalTimeMs) {
+        degradedTier.put(
+                new DegradedKey(flagKey, variant, allocationKey, variant == null, errorMessage),
+                new EvalBucket(
+                        flagKey, variant, allocationKey, null, errorMessage, evalTimeMs, variant == null, null, false));
     }
 
-    int prunedContextFieldCount() {
-      return prunedAttrs == null ? 0 : prunedAttrs.size();
+    private static FullKey buildFullKey(final FlagEvalEvent event, final String ctxKey) {
+        return new FullKey(
+                event.flagKey,
+                event.variant,
+                event.allocationKey,
+                event.variant == null,
+                event.errorMessage,
+                event.targetingKey,
+                ctxKey,
+                event.observeFullEvaluationData);
     }
 
-    void merge(final long evalTimeMs, final boolean isDefault) {
-      count++;
-      if (evalTimeMs < firstEvalMs) {
-        firstEvalMs = evalTimeMs;
-      }
-      if (evalTimeMs > lastEvalMs) {
-        lastEvalMs = evalTimeMs;
-      }
-      if (isDefault) {
-        runtimeDefaultUsed = true;
-      }
+    private static DegradedKey buildDegradedKey(final FlagEvalEvent event) {
+        return new DegradedKey(
+                event.flagKey, event.variant, event.allocationKey, event.variant == null, event.errorMessage);
     }
-  }
-
-  static final class FullKey {
-    private final String flagKey;
-    private final String variant;
-    private final String allocationKey;
-    private final boolean runtimeDefaultUsed;
-    private final String errorMessage;
-    private final String targetingKey;
-    private final String contextKey;
-    // Part of the key so consent-on and consent-off evaluations never share a bucket. The
-    // serializer branches on this to hash the targeting key and drop the context, so events with
-    // different consent produce different wire rows and belong in different buckets.
-    private final boolean observeFullEvaluationData;
-
-    FullKey(
-        final String flagKey,
-        final String variant,
-        final String allocationKey,
-        final boolean runtimeDefaultUsed,
-        final String errorMessage,
-        final String targetingKey,
-        final String contextKey,
-        final boolean observeFullEvaluationData) {
-      this.flagKey = flagKey;
-      this.variant = variant;
-      this.allocationKey = allocationKey;
-      this.runtimeDefaultUsed = runtimeDefaultUsed;
-      this.errorMessage = errorMessage;
-      this.targetingKey = targetingKey;
-      this.contextKey = contextKey;
-      this.observeFullEvaluationData = observeFullEvaluationData;
+
+    static String canonicalContextKey(final Map<String, Object> prunedAttrs) {
+        if (prunedAttrs == null || prunedAttrs.isEmpty()) {
+            return "";
+        }
+        final Map<String, Object> sorted = (prunedAttrs instanceof TreeMap) ? prunedAttrs : new TreeMap<>(prunedAttrs);
+        final StringBuilder sb = new StringBuilder();
+        for (final Map.Entry<String, Object> entry : sorted.entrySet()) {
+            appendLengthDelimited(sb, entry.getKey());
+            appendContextValue(sb, entry.getValue());
+        }
+        return sb.toString();
     }
 
-    @Override
-    public boolean equals(final Object o) {
-      if (this == o) {
-        return true;
-      }
-      if (!(o instanceof FullKey)) {
-        return false;
-      }
-      final FullKey fullKey = (FullKey) o;
-      return runtimeDefaultUsed == fullKey.runtimeDefaultUsed
-          && observeFullEvaluationData == fullKey.observeFullEvaluationData
-          && Objects.equals(flagKey, fullKey.flagKey)
-          && Objects.equals(variant, fullKey.variant)
-          && Objects.equals(allocationKey, fullKey.allocationKey)
-          && Objects.equals(errorMessage, fullKey.errorMessage)
-          && Objects.equals(targetingKey, fullKey.targetingKey)
-          && Objects.equals(contextKey, fullKey.contextKey);
+    private static final String HEX_ZEROS = "00000000";
+
+    private static void appendLengthDelimited(final StringBuilder sb, final String s) {
+        // 8-char zero-padded hex length prefix, allocation-lean (no String.format on the hot path).
+        final String hexLength = Integer.toHexString(s.length());
+        sb.append(HEX_ZEROS, 0, 8 - hexLength.length());
+        sb.append(hexLength);
+        sb.append(s);
     }
 
-    @Override
-    public int hashCode() {
-      // HashingUtils avoids the Object[] allocation and boolean boxing that Objects.hash performs
-      // on this hot bucket-lookup path.
-      int result = hash(flagKey, variant, allocationKey);
-      result = addToHash(result, runtimeDefaultUsed);
-      result = addToHash(result, errorMessage);
-      result = addToHash(result, targetingKey);
-      result = addToHash(result, contextKey);
-      return addToHash(result, observeFullEvaluationData);
+    private static void appendContextValue(final StringBuilder sb, final Object v) {
+        if (v instanceof Boolean) {
+            sb.append((char) CTX_TAG_BOOL);
+            appendLengthDelimited(sb, v.toString());
+        } else if (v instanceof Long) {
+            sb.append((char) CTX_TAG_LONG);
+            appendLengthDelimited(sb, v.toString());
+        } else if (v instanceof Integer) {
+            sb.append((char) CTX_TAG_INT);
+            appendLengthDelimited(sb, v.toString());
+        } else if (v instanceof Float) {
+            sb.append((char) CTX_TAG_FLOAT);
+            appendLengthDelimited(sb, v.toString());
+        } else if (v instanceof Double) {
+            sb.append((char) CTX_TAG_DOUBLE);
+            appendLengthDelimited(sb, v.toString());
+        } else if (v instanceof String) {
+            sb.append((char) CTX_TAG_STRING);
+            appendLengthDelimited(sb, (String) v);
+        } else {
+            sb.append((char) CTX_TAG_OTHER);
+            appendLengthDelimited(sb, v == null ? "" : v.toString());
+        }
     }
-  }
-
-  static final class DegradedKey {
-    // Unlike FullKey, consent is NOT a bucket dimension here: the wire serializer for degraded rows
-    // (FlagEvaluationPayloads.FlagEvaluationEvent.fromBucket with isFullTier=false) drops the
-    // targeting key and context unconditionally, so two degraded buckets differing only in consent
-    // would emit byte-identical JSON with evaluation_count split — halving effective DEGRADED_CAP
-    // for zero wire fidelity. Mixed-consent events merge into one bucket; the AND-fold on
-    // EvalBucket.observeFullEvaluationData still runs but has no downstream effect for degraded
-    // rows.
-    private final String flagKey;
-    private final String variant;
-    private final String allocationKey;
-    private final boolean runtimeDefaultUsed;
-    private final String errorMessage;
-
-    DegradedKey(
-        final String flagKey,
-        final String variant,
-        final String allocationKey,
-        final boolean runtimeDefaultUsed,
-        final String errorMessage) {
-      this.flagKey = flagKey;
-      this.variant = variant;
-      this.allocationKey = allocationKey;
-      this.runtimeDefaultUsed = runtimeDefaultUsed;
-      this.errorMessage = errorMessage;
+
+    static class EvalBucket {
+        long count;
+        long firstEvalMs;
+        long lastEvalMs;
+        boolean runtimeDefaultUsed;
+        String flagKey;
+        String variant;
+        String allocationKey;
+        String targetingKey;
+        String errorMessage;
+        Map<String, Object> prunedAttrs;
+        // Consent to emit raw PII. For full-tier buckets this is uniform (consent is a FullKey
+        // dimension) and the AND-fold on merge is defensive. For degraded-tier buckets consent is NOT
+        // a key dimension — mixed-consent events merge here — so the AND-fold produces false whenever
+        // any consent-off event lands in the bucket. That's benign because the degraded wire path
+        // drops the targeting key and context regardless of consent, so this field has no downstream
+        // effect for degraded rows.
+        boolean observeFullEvaluationData;
+
+        EvalBucket(
+                final String flagKey,
+                final String variant,
+                final String allocationKey,
+                final String targetingKey,
+                final String errorMessage,
+                final long evalTimeMs,
+                final boolean runtimeDefaultUsed,
+                final Map<String, Object> prunedAttrs,
+                final boolean observeFullEvaluationData) {
+            this.flagKey = flagKey;
+            this.variant = variant;
+            this.allocationKey = allocationKey;
+            this.targetingKey = targetingKey;
+            this.errorMessage = errorMessage;
+            this.firstEvalMs = evalTimeMs;
+            this.lastEvalMs = evalTimeMs;
+            this.count = 1;
+            this.runtimeDefaultUsed = runtimeDefaultUsed;
+            this.prunedAttrs = prunedAttrs;
+            this.observeFullEvaluationData = observeFullEvaluationData;
+        }
+
+        int prunedContextFieldCount() {
+            return prunedAttrs == null ? 0 : prunedAttrs.size();
+        }
+
+        void merge(final long evalTimeMs, final boolean isDefault) {
+            count++;
+            if (evalTimeMs < firstEvalMs) {
+                firstEvalMs = evalTimeMs;
+            }
+            if (evalTimeMs > lastEvalMs) {
+                lastEvalMs = evalTimeMs;
+            }
+            if (isDefault) {
+                runtimeDefaultUsed = true;
+            }
+        }
     }
 
-    @Override
-    public boolean equals(final Object o) {
-      if (this == o) {
-        return true;
-      }
-      if (!(o instanceof DegradedKey)) {
-        return false;
-      }
-      final DegradedKey that = (DegradedKey) o;
-      return runtimeDefaultUsed == that.runtimeDefaultUsed
-          && Objects.equals(flagKey, that.flagKey)
-          && Objects.equals(variant, that.variant)
-          && Objects.equals(allocationKey, that.allocationKey)
-          && Objects.equals(errorMessage, that.errorMessage);
+    static final class FullKey {
+        private final String flagKey;
+        private final String variant;
+        private final String allocationKey;
+        private final boolean runtimeDefaultUsed;
+        private final String errorMessage;
+        private final String targetingKey;
+        private final String contextKey;
+        // Part of the key so consent-on and consent-off evaluations never share a bucket. The
+        // serializer branches on this to hash the targeting key and drop the context, so events with
+        // different consent produce different wire rows and belong in different buckets.
+        private final boolean observeFullEvaluationData;
+
+        FullKey(
+                final String flagKey,
+                final String variant,
+                final String allocationKey,
+                final boolean runtimeDefaultUsed,
+                final String errorMessage,
+                final String targetingKey,
+                final String contextKey,
+                final boolean observeFullEvaluationData) {
+            this.flagKey = flagKey;
+            this.variant = variant;
+            this.allocationKey = allocationKey;
+            this.runtimeDefaultUsed = runtimeDefaultUsed;
+            this.errorMessage = errorMessage;
+            this.targetingKey = targetingKey;
+            this.contextKey = contextKey;
+            this.observeFullEvaluationData = observeFullEvaluationData;
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (!(o instanceof FullKey)) {
+                return false;
+            }
+            final FullKey fullKey = (FullKey) o;
+            return runtimeDefaultUsed == fullKey.runtimeDefaultUsed
+                    && observeFullEvaluationData == fullKey.observeFullEvaluationData
+                    && Objects.equals(flagKey, fullKey.flagKey)
+                    && Objects.equals(variant, fullKey.variant)
+                    && Objects.equals(allocationKey, fullKey.allocationKey)
+                    && Objects.equals(errorMessage, fullKey.errorMessage)
+                    && Objects.equals(targetingKey, fullKey.targetingKey)
+                    && Objects.equals(contextKey, fullKey.contextKey);
+        }
+
+        @Override
+        public int hashCode() {
+            // HashingUtils avoids the Object[] allocation and boolean boxing that Objects.hash performs
+            // on this hot bucket-lookup path.
+            int result = hash(flagKey, variant, allocationKey);
+            result = addToHash(result, runtimeDefaultUsed);
+            result = addToHash(result, errorMessage);
+            result = addToHash(result, targetingKey);
+            result = addToHash(result, contextKey);
+            return addToHash(result, observeFullEvaluationData);
+        }
     }
 
-    @Override
-    public int hashCode() {
-      // HashingUtils avoids the Object[] allocation and boolean boxing that Objects.hash performs
-      // on this hot bucket-lookup path.
-      int result = hash(flagKey, variant, allocationKey);
-      result = addToHash(result, runtimeDefaultUsed);
-      return addToHash(result, errorMessage);
+    static final class DegradedKey {
+        // Unlike FullKey, consent is NOT a bucket dimension here: the wire serializer for degraded rows
+        // (FlagEvaluationPayloads.FlagEvaluationEvent.fromBucket with isFullTier=false) drops the
+        // targeting key and context unconditionally, so two degraded buckets differing only in consent
+        // would emit byte-identical JSON with evaluation_count split — halving effective DEGRADED_CAP
+        // for zero wire fidelity. Mixed-consent events merge into one bucket; the AND-fold on
+        // EvalBucket.observeFullEvaluationData still runs but has no downstream effect for degraded
+        // rows.
+        private final String flagKey;
+        private final String variant;
+        private final String allocationKey;
+        private final boolean runtimeDefaultUsed;
+        private final String errorMessage;
+
+        DegradedKey(
+                final String flagKey,
+                final String variant,
+                final String allocationKey,
+                final boolean runtimeDefaultUsed,
+                final String errorMessage) {
+            this.flagKey = flagKey;
+            this.variant = variant;
+            this.allocationKey = allocationKey;
+            this.runtimeDefaultUsed = runtimeDefaultUsed;
+            this.errorMessage = errorMessage;
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (!(o instanceof DegradedKey)) {
+                return false;
+            }
+            final DegradedKey that = (DegradedKey) o;
+            return runtimeDefaultUsed == that.runtimeDefaultUsed
+                    && Objects.equals(flagKey, that.flagKey)
+                    && Objects.equals(variant, that.variant)
+                    && Objects.equals(allocationKey, that.allocationKey)
+                    && Objects.equals(errorMessage, that.errorMessage);
+        }
+
+        @Override
+        public int hashCode() {
+            // HashingUtils avoids the Object[] allocation and boolean boxing that Objects.hash performs
+            // on this hot bucket-lookup path.
+            int result = hash(flagKey, variant, allocationKey);
+            result = addToHash(result, runtimeDefaultUsed);
+            return addToHash(result, errorMessage);
+        }
     }
-  }
-
-  static class AggregatedState {
-    final Map<FullKey, EvalBucket> fullTier;
-    final Map<DegradedKey, EvalBucket> degradedTier;
-    final long droppedDegradedOverflow;
-
-    AggregatedState(
-        final Map<FullKey, EvalBucket> fullTier,
-        final Map<DegradedKey, EvalBucket> degradedTier,
-        final long droppedDegradedOverflow) {
-      this.fullTier = fullTier;
-      this.degradedTier = degradedTier;
-      this.droppedDegradedOverflow = droppedDegradedOverflow;
+
+    static class AggregatedState {
+        final Map<FullKey, EvalBucket> fullTier;
+        final Map<DegradedKey, EvalBucket> degradedTier;
+        final long droppedDegradedOverflow;
+
+        AggregatedState(
+                final Map<FullKey, EvalBucket> fullTier,
+                final Map<DegradedKey, EvalBucket> degradedTier,
+                final long droppedDegradedOverflow) {
+            this.fullTier = fullTier;
+            this.degradedTier = degradedTier;
+            this.droppedDegradedOverflow = droppedDegradedOverflow;
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FlagEvaluationPayloads.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FlagEvaluationPayloads.java
index 3a8734fd516..e15ed623a34 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FlagEvaluationPayloads.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FlagEvaluationPayloads.java
@@ -11,284 +11,275 @@
 
 final class FlagEvaluationPayloads {
 
-  private static final byte[] PAYLOAD_SUFFIX = FeatureFlagEvpPublisher.utf8Bytes("]}");
-  private static final byte[] JSON_COMMA = FeatureFlagEvpPublisher.utf8Bytes(",");
-
-  /**
-   * Wire prefix identifying a privacy-preserving, hashed targeting key. Emitted for full-tier rows
-   * when {@code observeFullEvaluationData} is off. The suffix is the lower-case hex SHA-256 of the
-   * UTF-8 targeting key (see {@link ULeb128Encoder#hashTargetingKey}). This is a cross-SDK wire
-   * contract - keep it in sync with the other server SDKs and the UFC/EVP spec.
-   */
-  private static final String HASHED_TARGETING_KEY_PREFIX = "sha256_";
-
-  private static final JsonAdapter<FlagEvaluationEvent> EVENT_JSON_ADAPTER;
-  private static final JsonAdapter<Map<String, String>> CONTEXT_JSON_ADAPTER;
-
-  static {
-    final Moshi moshi = new Moshi.Builder().build();
-    EVENT_JSON_ADAPTER = moshi.adapter(FlagEvaluationEvent.class);
-    final Type contextType = Types.newParameterizedType(Map.class, String.class, String.class);
-    CONTEXT_JSON_ADAPTER = moshi.adapter(contextType);
-  }
-
-  private FlagEvaluationPayloads() {}
-
-  static class FlagEvaluationsRequest {
-    public final Map<String, String> context;
-    public final List<FlagEvaluationEvent> flagEvaluations;
-
-    FlagEvaluationsRequest(
-        final Map<String, String> context, final List<FlagEvaluationEvent> flagEvaluations) {
-      this.context = context;
-      this.flagEvaluations = flagEvaluations;
+    private static final byte[] PAYLOAD_SUFFIX = FeatureFlagEvpPublisher.utf8Bytes("]}");
+    private static final byte[] JSON_COMMA = FeatureFlagEvpPublisher.utf8Bytes(",");
+
+    /**
+     * Wire prefix identifying a privacy-preserving, hashed targeting key. Emitted for full-tier rows
+     * when {@code observeFullEvaluationData} is off. The suffix is the lower-case hex SHA-256 of the
+     * UTF-8 targeting key (see {@link ULeb128Encoder#hashTargetingKey}). This is a cross-SDK wire
+     * contract - keep it in sync with the other server SDKs and the UFC/EVP spec.
+     */
+    private static final String HASHED_TARGETING_KEY_PREFIX = "sha256_";
+
+    private static final JsonAdapter<FlagEvaluationEvent> EVENT_JSON_ADAPTER;
+    private static final JsonAdapter<Map<String, String>> CONTEXT_JSON_ADAPTER;
+
+    static {
+        final Moshi moshi = new Moshi.Builder().build();
+        EVENT_JSON_ADAPTER = moshi.adapter(FlagEvaluationEvent.class);
+        final Type contextType = Types.newParameterizedType(Map.class, String.class, String.class);
+        CONTEXT_JSON_ADAPTER = moshi.adapter(contextType);
     }
-  }
-
-  static EncodedPayloads buildPayloads(
-      final List<FlagEvaluationEvent> events,
-      final Map<String, String> context,
-      final int payloadSizeLimitBytes) {
-    final byte[] prefix = payloadPrefix(context);
-    EncodedPayloadBuilder current = new EncodedPayloadBuilder(prefix);
-    final List<byte[]> payloads = new ArrayList<>();
-    long droppedPayloadLimit = 0;
-    long degradedPayloadLimit = 0;
-
-    for (final FlagEvaluationEvent event : events) {
-      byte[] eventBytes = encodeEvent(event);
-
-      if (!current.canAdd(eventBytes, payloadSizeLimitBytes) && !current.isEmpty()) {
-        payloads.add(current.toByteArray());
-        current = new EncodedPayloadBuilder(prefix);
-      }
-
-      if (current.canAdd(eventBytes, payloadSizeLimitBytes)) {
-        current.add(eventBytes);
-        continue;
-      }
-
-      final FlagEvaluationEvent degraded = event.withoutTargetingKeyAndContext();
-      if (degraded != null) {
-        eventBytes = encodeEvent(degraded);
-        if (!current.canAdd(eventBytes, payloadSizeLimitBytes) && !current.isEmpty()) {
-          payloads.add(current.toByteArray());
-          current = new EncodedPayloadBuilder(prefix);
+
+    private FlagEvaluationPayloads() {}
+
+    static class FlagEvaluationsRequest {
+        public final Map<String, String> context;
+        public final List<FlagEvaluationEvent> flagEvaluations;
+
+        FlagEvaluationsRequest(final Map<String, String> context, final List<FlagEvaluationEvent> flagEvaluations) {
+            this.context = context;
+            this.flagEvaluations = flagEvaluations;
         }
-        if (current.canAdd(eventBytes, payloadSizeLimitBytes)) {
-          current.add(eventBytes);
-          degradedPayloadLimit += event.evaluation_count;
-          continue;
+    }
+
+    static EncodedPayloads buildPayloads(
+            final List<FlagEvaluationEvent> events,
+            final Map<String, String> context,
+            final int payloadSizeLimitBytes) {
+        final byte[] prefix = payloadPrefix(context);
+        EncodedPayloadBuilder current = new EncodedPayloadBuilder(prefix);
+        final List<byte[]> payloads = new ArrayList<>();
+        long droppedPayloadLimit = 0;
+        long degradedPayloadLimit = 0;
+
+        for (final FlagEvaluationEvent event : events) {
+            byte[] eventBytes = encodeEvent(event);
+
+            if (!current.canAdd(eventBytes, payloadSizeLimitBytes) && !current.isEmpty()) {
+                payloads.add(current.toByteArray());
+                current = new EncodedPayloadBuilder(prefix);
+            }
+
+            if (current.canAdd(eventBytes, payloadSizeLimitBytes)) {
+                current.add(eventBytes);
+                continue;
+            }
+
+            final FlagEvaluationEvent degraded = event.withoutTargetingKeyAndContext();
+            if (degraded != null) {
+                eventBytes = encodeEvent(degraded);
+                if (!current.canAdd(eventBytes, payloadSizeLimitBytes) && !current.isEmpty()) {
+                    payloads.add(current.toByteArray());
+                    current = new EncodedPayloadBuilder(prefix);
+                }
+                if (current.canAdd(eventBytes, payloadSizeLimitBytes)) {
+                    current.add(eventBytes);
+                    degradedPayloadLimit += event.evaluation_count;
+                    continue;
+                }
+            }
+
+            droppedPayloadLimit += event.evaluation_count;
         }
-      }
 
-      droppedPayloadLimit += event.evaluation_count;
+        if (!current.isEmpty()) {
+            payloads.add(current.toByteArray());
+        }
+        return new EncodedPayloads(payloads, droppedPayloadLimit, degradedPayloadLimit);
     }
 
-    if (!current.isEmpty()) {
-      payloads.add(current.toByteArray());
+    private static byte[] payloadPrefix(final Map<String, String> context) {
+        return FeatureFlagEvpPublisher.utf8Bytes(
+                "{\"context\":" + CONTEXT_JSON_ADAPTER.toJson(context) + ",\"flagEvaluations\":[");
     }
-    return new EncodedPayloads(payloads, droppedPayloadLimit, degradedPayloadLimit);
-  }
-
-  private static byte[] payloadPrefix(final Map<String, String> context) {
-    return FeatureFlagEvpPublisher.utf8Bytes(
-        "{\"context\":" + CONTEXT_JSON_ADAPTER.toJson(context) + ",\"flagEvaluations\":[");
-  }
-
-  private static byte[] encodeEvent(final FlagEvaluationEvent event) {
-    return FeatureFlagEvpPublisher.utf8Bytes(EVENT_JSON_ADAPTER.toJson(event));
-  }
-
-  static final class EncodedPayloads {
-    final List<byte[]> bodies;
-    final long droppedPayloadLimit;
-    final long degradedPayloadLimit;
-
-    private EncodedPayloads(
-        final List<byte[]> bodies,
-        final long droppedPayloadLimit,
-        final long degradedPayloadLimit) {
-      this.bodies = bodies;
-      this.droppedPayloadLimit = droppedPayloadLimit;
-      this.degradedPayloadLimit = degradedPayloadLimit;
+
+    private static byte[] encodeEvent(final FlagEvaluationEvent event) {
+        return FeatureFlagEvpPublisher.utf8Bytes(EVENT_JSON_ADAPTER.toJson(event));
     }
-  }
 
-  private static final class EncodedPayloadBuilder {
-    private final byte[] prefix;
-    private final List<byte[]> events = new ArrayList<>();
-    private int eventBytes;
+    static final class EncodedPayloads {
+        final List<byte[]> bodies;
+        final long droppedPayloadLimit;
+        final long degradedPayloadLimit;
 
-    private EncodedPayloadBuilder(final byte[] prefix) {
-      this.prefix = prefix;
+        private EncodedPayloads(
+                final List<byte[]> bodies, final long droppedPayloadLimit, final long degradedPayloadLimit) {
+            this.bodies = bodies;
+            this.droppedPayloadLimit = droppedPayloadLimit;
+            this.degradedPayloadLimit = degradedPayloadLimit;
+        }
     }
 
-    private boolean isEmpty() {
-      return events.isEmpty();
-    }
+    private static final class EncodedPayloadBuilder {
+        private final byte[] prefix;
+        private final List<byte[]> events = new ArrayList<>();
+        private int eventBytes;
 
-    private boolean canAdd(final byte[] event, final int payloadSizeLimitBytes) {
-      return sizeWith(event) <= payloadSizeLimitBytes;
-    }
+        private EncodedPayloadBuilder(final byte[] prefix) {
+            this.prefix = prefix;
+        }
 
-    private int sizeWith(final byte[] event) {
-      return prefix.length + PAYLOAD_SUFFIX.length + eventBytes + event.length + events.size();
-    }
+        private boolean isEmpty() {
+            return events.isEmpty();
+        }
 
-    private void add(final byte[] event) {
-      events.add(event);
-      eventBytes += event.length;
-    }
+        private boolean canAdd(final byte[] event, final int payloadSizeLimitBytes) {
+            return sizeWith(event) <= payloadSizeLimitBytes;
+        }
 
-    private byte[] toByteArray() {
-      final int size = prefix.length + PAYLOAD_SUFFIX.length + eventBytes;
-      final ByteArrayOutputStream out = new ByteArrayOutputStream(size + events.size());
-      out.write(prefix, 0, prefix.length);
-      for (int i = 0; i < events.size(); i++) {
-        if (i > 0) {
-          out.write(JSON_COMMA, 0, JSON_COMMA.length);
+        private int sizeWith(final byte[] event) {
+            return prefix.length + PAYLOAD_SUFFIX.length + eventBytes + event.length + events.size();
         }
-        final byte[] event = events.get(i);
-        out.write(event, 0, event.length);
-      }
-      out.write(PAYLOAD_SUFFIX, 0, PAYLOAD_SUFFIX.length);
-      return out.toByteArray();
-    }
-  }
-
-  static class FlagEvaluationEvent {
-    public final long timestamp;
-    public final FlagKeyObject flag;
-    public final long first_evaluation;
-    public final long last_evaluation;
-    public final long evaluation_count;
-    public final KeyObject variant;
-    public final KeyObject allocation;
-    public final String targeting_key;
-    public final Boolean runtime_default_used;
-    public final EventContext context;
-    public final ErrorObject error;
-
-    FlagEvaluationEvent(
-        final long timestamp,
-        final String flagKey,
-        final long firstEvalMs,
-        final long lastEvalMs,
-        final long count,
-        final String variant,
-        final String allocation,
-        final String targetingKey,
-        final boolean runtimeDefaultUsed,
-        final String errorMessage,
-        final Map<String, Object> evaluationAttrs) {
-      this.timestamp = timestamp;
-      this.flag = new FlagKeyObject(flagKey);
-      this.first_evaluation = firstEvalMs;
-      this.last_evaluation = lastEvalMs;
-      this.evaluation_count = count;
-      this.variant = (variant != null && !variant.isEmpty()) ? new KeyObject(variant) : null;
-      this.allocation =
-          (allocation != null && !allocation.isEmpty()) ? new KeyObject(allocation) : null;
-      this.targeting_key = targetingKey;
-      this.runtime_default_used = runtimeDefaultUsed ? Boolean.TRUE : null;
-      this.context =
-          (evaluationAttrs != null && !evaluationAttrs.isEmpty())
-              ? new EventContext(evaluationAttrs)
-              : null;
-      this.error =
-          (errorMessage != null && !errorMessage.isEmpty()) ? new ErrorObject(errorMessage) : null;
-    }
 
-    static FlagEvaluationEvent fromBucket(
-        final FlagEvaluationAggregator.EvalBucket bucket,
-        final boolean isFullTier,
-        final boolean observeFullEvaluationData,
-        final long flushTimeMs) {
-      final boolean includeRawContext = isFullTier && observeFullEvaluationData;
-      return new FlagEvaluationEvent(
-          flushTimeMs,
-          bucket.flagKey,
-          bucket.firstEvalMs,
-          bucket.lastEvalMs,
-          bucket.count,
-          bucket.variant,
-          bucket.allocationKey,
-          resolveTargetingKey(bucket.targetingKey, isFullTier, observeFullEvaluationData),
-          bucket.runtimeDefaultUsed,
-          bucket.errorMessage,
-          includeRawContext ? bucket.prunedAttrs : null);
-    }
+        private void add(final byte[] event) {
+            events.add(event);
+            eventBytes += event.length;
+        }
 
-    private static String resolveTargetingKey(
-        final String rawTargetingKey,
-        final boolean isFullTier,
-        final boolean observeFullEvaluationData) {
-      if (!isFullTier || rawTargetingKey == null) {
-        return null;
-      }
-      if (observeFullEvaluationData) {
-        return rawTargetingKey;
-      }
-      return HASHED_TARGETING_KEY_PREFIX + ULeb128Encoder.hashTargetingKey(rawTargetingKey);
+        private byte[] toByteArray() {
+            final int size = prefix.length + PAYLOAD_SUFFIX.length + eventBytes;
+            final ByteArrayOutputStream out = new ByteArrayOutputStream(size + events.size());
+            out.write(prefix, 0, prefix.length);
+            for (int i = 0; i < events.size(); i++) {
+                if (i > 0) {
+                    out.write(JSON_COMMA, 0, JSON_COMMA.length);
+                }
+                final byte[] event = events.get(i);
+                out.write(event, 0, event.length);
+            }
+            out.write(PAYLOAD_SUFFIX, 0, PAYLOAD_SUFFIX.length);
+            return out.toByteArray();
+        }
     }
 
-    FlagEvaluationEvent withoutTargetingKeyAndContext() {
-      if (targeting_key == null && context == null) {
-        return null;
-      }
-      return new FlagEvaluationEvent(
-          timestamp,
-          flag.key,
-          first_evaluation,
-          last_evaluation,
-          evaluation_count,
-          keyOf(variant),
-          keyOf(allocation),
-          null,
-          Boolean.TRUE.equals(runtime_default_used),
-          messageOf(error),
-          null);
+    static class FlagEvaluationEvent {
+        public final long timestamp;
+        public final FlagKeyObject flag;
+        public final long first_evaluation;
+        public final long last_evaluation;
+        public final long evaluation_count;
+        public final KeyObject variant;
+        public final KeyObject allocation;
+        public final String targeting_key;
+        public final Boolean runtime_default_used;
+        public final EventContext context;
+        public final ErrorObject error;
+
+        FlagEvaluationEvent(
+                final long timestamp,
+                final String flagKey,
+                final long firstEvalMs,
+                final long lastEvalMs,
+                final long count,
+                final String variant,
+                final String allocation,
+                final String targetingKey,
+                final boolean runtimeDefaultUsed,
+                final String errorMessage,
+                final Map<String, Object> evaluationAttrs) {
+            this.timestamp = timestamp;
+            this.flag = new FlagKeyObject(flagKey);
+            this.first_evaluation = firstEvalMs;
+            this.last_evaluation = lastEvalMs;
+            this.evaluation_count = count;
+            this.variant = (variant != null && !variant.isEmpty()) ? new KeyObject(variant) : null;
+            this.allocation = (allocation != null && !allocation.isEmpty()) ? new KeyObject(allocation) : null;
+            this.targeting_key = targetingKey;
+            this.runtime_default_used = runtimeDefaultUsed ? Boolean.TRUE : null;
+            this.context =
+                    (evaluationAttrs != null && !evaluationAttrs.isEmpty()) ? new EventContext(evaluationAttrs) : null;
+            this.error = (errorMessage != null && !errorMessage.isEmpty()) ? new ErrorObject(errorMessage) : null;
+        }
+
+        static FlagEvaluationEvent fromBucket(
+                final FlagEvaluationAggregator.EvalBucket bucket,
+                final boolean isFullTier,
+                final boolean observeFullEvaluationData,
+                final long flushTimeMs) {
+            final boolean includeRawContext = isFullTier && observeFullEvaluationData;
+            return new FlagEvaluationEvent(
+                    flushTimeMs,
+                    bucket.flagKey,
+                    bucket.firstEvalMs,
+                    bucket.lastEvalMs,
+                    bucket.count,
+                    bucket.variant,
+                    bucket.allocationKey,
+                    resolveTargetingKey(bucket.targetingKey, isFullTier, observeFullEvaluationData),
+                    bucket.runtimeDefaultUsed,
+                    bucket.errorMessage,
+                    includeRawContext ? bucket.prunedAttrs : null);
+        }
+
+        private static String resolveTargetingKey(
+                final String rawTargetingKey, final boolean isFullTier, final boolean observeFullEvaluationData) {
+            if (!isFullTier || rawTargetingKey == null) {
+                return null;
+            }
+            if (observeFullEvaluationData) {
+                return rawTargetingKey;
+            }
+            return HASHED_TARGETING_KEY_PREFIX + ULeb128Encoder.hashTargetingKey(rawTargetingKey);
+        }
+
+        FlagEvaluationEvent withoutTargetingKeyAndContext() {
+            if (targeting_key == null && context == null) {
+                return null;
+            }
+            return new FlagEvaluationEvent(
+                    timestamp,
+                    flag.key,
+                    first_evaluation,
+                    last_evaluation,
+                    evaluation_count,
+                    keyOf(variant),
+                    keyOf(allocation),
+                    null,
+                    Boolean.TRUE.equals(runtime_default_used),
+                    messageOf(error),
+                    null);
+        }
     }
-  }
 
-  private static String keyOf(final KeyObject object) {
-    return object == null ? null : object.key;
-  }
+    private static String keyOf(final KeyObject object) {
+        return object == null ? null : object.key;
+    }
 
-  private static String messageOf(final ErrorObject object) {
-    return object == null ? null : object.message;
-  }
+    private static String messageOf(final ErrorObject object) {
+        return object == null ? null : object.message;
+    }
 
-  static class KeyObject {
-    public final String key;
+    static class KeyObject {
+        public final String key;
 
-    KeyObject(final String key) {
-      this.key = key;
+        KeyObject(final String key) {
+            this.key = key;
+        }
     }
-  }
 
-  static class FlagKeyObject {
-    public final String key;
+    static class FlagKeyObject {
+        public final String key;
 
-    FlagKeyObject(final String key) {
-      this.key = key;
+        FlagKeyObject(final String key) {
+            this.key = key;
+        }
     }
-  }
 
-  static class ErrorObject {
-    public final String message;
+    static class ErrorObject {
+        public final String message;
 
-    ErrorObject(final String message) {
-      this.message = message;
+        ErrorObject(final String message) {
+            this.message = message;
+        }
     }
-  }
 
-  static class EventContext {
-    public final Map<String, Object> evaluation;
+    static class EventContext {
+        public final Map<String, Object> evaluation;
 
-    EventContext(final Map<String, Object> evaluation) {
-      this.evaluation = evaluation;
+        EventContext(final Map<String, Object> evaluation) {
+            this.evaluation = evaluation;
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FlagEvaluationWriterImpl.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FlagEvaluationWriterImpl.java
index 2da8ffe0256..450f5db0eb7 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FlagEvaluationWriterImpl.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/FlagEvaluationWriterImpl.java
@@ -53,556 +53,541 @@
  */
 public class FlagEvaluationWriterImpl implements FlagEvaluationWriter {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(FlagEvaluationWriterImpl.class);
-
-  static final int DEFAULT_CAPACITY = 1 << 12; // 4096 elements, per cross-SDK RFC
-  static final int FLUSH_INTERVAL_SECONDS = 10;
-
-  static final int FLAG_EVALUATION_PAYLOAD_SIZE_LIMIT_BYTES = EvpProxy.PAYLOAD_SIZE_LIMIT_BYTES;
-  static final String FLAG_EVALUATION_DROPPED_METRIC = "flagevaluation.rows.dropped";
-  static final String FLAG_EVALUATION_DEGRADED_METRIC = "flagevaluation.rows.degraded";
-  static final String FLAG_EVALUATION_SPLITS_METRIC = "flagevaluation.payload.splits";
-  static final String FLAG_EVALUATION_CONTEXT_TRUNCATED_METRIC = "flagevaluation.context.truncated";
-  static final String DROP_REASON_QUEUE_OVERFLOW = "queue_overflow";
-  static final String DROP_REASON_CLOSED = "closed";
-  static final String DROP_REASON_DEGRADED_CAP = "degraded_cap";
-  static final String DROP_REASON_PAYLOAD_LIMIT = "payload_limit";
-  static final String DEGRADED_REASON_CARDINALITY_CAP = "cardinality_cap";
-  static final String DEGRADED_REASON_PAYLOAD_LIMIT = "payload_limit";
-  private static final String FLAG_EVALUATION_ROUTE = "flagevaluation";
-  private static final CoreMetricCollector CORE_METRICS = CoreMetricCollector.getInstance();
-
-  private final MessagePassingBlockingQueue<FlagEvalEvent> queue;
-  private final FlagEvaluationSerializingHandler serializer;
-  private final Thread serializerThread;
-  private final Object lifecycleLock = new Object();
-  private final AtomicBoolean closed = new AtomicBoolean(false);
-
-  private static void countMetric(final String metricName, final long value, final String reason) {
-    if (value <= 0) {
-      return;
-    }
-    CORE_METRICS.count(metricName, value, reason == null ? null : "reason:" + reason);
-  }
-
-  /**
-   * Observable counter for events dropped because the bounded hand-off queue was full when the hook
-   * tried to enqueue (backpressure). Incremented on the hook thread, surfaced on flush.
-   */
-  private final AtomicLong droppedQueueOverflow = new AtomicLong(0);
-
-  /**
-   * Per-reason-tag counters for evaluations whose context was truncated by copyPrunedContext. Keyed
-   * by the sorted comma-separated reason string (e.g. "max_key_length,max_value_length").
-   * Incremented on the hook thread, drained and emitted on flush.
-   */
-  private final ConcurrentHashMap<String, AtomicLong> contextTruncatedCounts =
-      new ConcurrentHashMap<>();
-
-  public FlagEvaluationWriterImpl(final SharedCommunicationObjects sco, final Config config) {
-    this(
-        DEFAULT_CAPACITY,
-        FLUSH_INTERVAL_SECONDS,
-        SECONDS,
-        new FeatureFlagBackendApiFactory(config, sco, FeatureFlagEventType.FLAG_EVALUATION)::create,
-        config);
-  }
-
-  FlagEvaluationWriterImpl(
-      final int capacity,
-      final long flushInterval,
-      final TimeUnit timeUnit,
-      final Supplier<BackendApi> backendApiSupplier,
-      final Config config) {
-    this.queue = Queues.mpscBlockingConsumerArrayQueue(capacity);
-    this.serializer =
-        new FlagEvaluationSerializingHandler(
-            backendApiSupplier,
-            queue,
-            flushInterval,
-            timeUnit,
-            FeatureFlagEvpContext.from(config),
-            droppedQueueOverflow,
-            contextTruncatedCounts,
-            this::close,
-            FLAG_EVALUATION_PAYLOAD_SIZE_LIMIT_BYTES);
-    this.serializerThread = newAgentThread(FEATURE_FLAG_EVALUATION_PROCESSOR, serializer);
-  }
-
-  @Override
-  public void start() {
-    synchronized (lifecycleLock) {
-      if (closed.get()) {
-        return;
-      }
-      // Register with the gateway so FlagEvalLoggingHook can route evaluations to this writer
-      FeatureFlaggingGateway.setFlagEvalWriter(this);
-      this.serializerThread.start();
-    }
-  }
-
-  /** Test seam: starts the worker thread WITHOUT registering with the global gateway. */
-  void startForTest() {
-    synchronized (lifecycleLock) {
-      if (closed.get()) {
-        return;
-      }
-      this.serializerThread.start();
-    }
-  }
-
-  /** Test seam: current full-tier bucket count in the worker's aggregator. */
-  int aggregatorFullTierSizeForTest() {
-    return serializer.aggregator.fullTierSize();
-  }
-
-  @Override
-  public void close() {
-    final boolean workerRunning;
-    synchronized (lifecycleLock) {
-      if (!closed.compareAndSet(false, true)) {
-        return;
-      }
-      // Disable and deregister from the gateway so no new events are enqueued.
-      FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(false);
-      FeatureFlaggingGateway.setFlagEvalWriter(null);
-      workerRunning = this.serializerThread.isAlive();
-      if (workerRunning) {
-        // Ask the worker to drain the queue and final-flush, then interrupt to wake it from poll().
-        serializer.requestShutdown();
-        this.serializerThread.interrupt();
-      }
-    }
-    if (Thread.currentThread() == this.serializerThread) {
-      return;
-    }
-    if (workerRunning) {
-      try {
-        // Bounded wait for the worker's final flush so queued events are not lost on shutdown.
-        this.serializerThread.join(TimeUnit.SECONDS.toMillis(5));
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      }
+    private static final Logger LOGGER = LoggerFactory.getLogger(FlagEvaluationWriterImpl.class);
+
+    static final int DEFAULT_CAPACITY = 1 << 12; // 4096 elements, per cross-SDK RFC
+    static final int FLUSH_INTERVAL_SECONDS = 10;
+
+    static final int FLAG_EVALUATION_PAYLOAD_SIZE_LIMIT_BYTES = EvpProxy.PAYLOAD_SIZE_LIMIT_BYTES;
+    static final String FLAG_EVALUATION_DROPPED_METRIC = "flagevaluation.rows.dropped";
+    static final String FLAG_EVALUATION_DEGRADED_METRIC = "flagevaluation.rows.degraded";
+    static final String FLAG_EVALUATION_SPLITS_METRIC = "flagevaluation.payload.splits";
+    static final String FLAG_EVALUATION_CONTEXT_TRUNCATED_METRIC = "flagevaluation.context.truncated";
+    static final String DROP_REASON_QUEUE_OVERFLOW = "queue_overflow";
+    static final String DROP_REASON_CLOSED = "closed";
+    static final String DROP_REASON_DEGRADED_CAP = "degraded_cap";
+    static final String DROP_REASON_PAYLOAD_LIMIT = "payload_limit";
+    static final String DEGRADED_REASON_CARDINALITY_CAP = "cardinality_cap";
+    static final String DEGRADED_REASON_PAYLOAD_LIMIT = "payload_limit";
+    private static final String FLAG_EVALUATION_ROUTE = "flagevaluation";
+    private static final CoreMetricCollector CORE_METRICS = CoreMetricCollector.getInstance();
+
+    private final MessagePassingBlockingQueue<FlagEvalEvent> queue;
+    private final FlagEvaluationSerializingHandler serializer;
+    private final Thread serializerThread;
+    private final Object lifecycleLock = new Object();
+    private final AtomicBoolean closed = new AtomicBoolean(false);
+
+    private static void countMetric(final String metricName, final long value, final String reason) {
+        if (value <= 0) {
+            return;
+        }
+        CORE_METRICS.count(metricName, value, reason == null ? null : "reason:" + reason);
     }
-    // enqueue() is lock-free, so a producer that passed the closed check before close() ran can
-    // still land an event after the worker's final drain. Sweep the remainder so that loss is
-    // counted rather than silently stranded in a queue nobody polls again. Only safe once the
-    // worker is gone: the queue is single-consumer, so sweeping alongside a live worker would
-    // break that contract. If join() timed out the worker is still draining, so skip the sweep.
-    if (!this.serializerThread.isAlive()) {
-      sweepAndCountResidualEvents();
+
+    /**
+     * Observable counter for events dropped because the bounded hand-off queue was full when the hook
+     * tried to enqueue (backpressure). Incremented on the hook thread, surfaced on flush.
+     */
+    private final AtomicLong droppedQueueOverflow = new AtomicLong(0);
+
+    /**
+     * Per-reason-tag counters for evaluations whose context was truncated by copyPrunedContext. Keyed
+     * by the sorted comma-separated reason string (e.g. "max_key_length,max_value_length").
+     * Incremented on the hook thread, drained and emitted on flush.
+     */
+    private final ConcurrentHashMap<String, AtomicLong> contextTruncatedCounts = new ConcurrentHashMap<>();
+
+    public FlagEvaluationWriterImpl(final SharedCommunicationObjects sco, final Config config) {
+        this(
+                DEFAULT_CAPACITY,
+                FLUSH_INTERVAL_SECONDS,
+                SECONDS,
+                new FeatureFlagBackendApiFactory(config, sco, FeatureFlagEventType.FLAG_EVALUATION)::create,
+                config);
     }
-  }
-
-  /**
-   * Counts events left in the queue after the worker has exited. Must only be called when the
-   * serializer thread is not alive - the queue permits a single consumer.
-   */
-  private void sweepAndCountResidualEvents() {
-    long residual = 0;
-    while (queue.poll() != null) {
-      residual++;
+
+    FlagEvaluationWriterImpl(
+            final int capacity,
+            final long flushInterval,
+            final TimeUnit timeUnit,
+            final Supplier<BackendApi> backendApiSupplier,
+            final Config config) {
+        this.queue = Queues.mpscBlockingConsumerArrayQueue(capacity);
+        this.serializer = new FlagEvaluationSerializingHandler(
+                backendApiSupplier,
+                queue,
+                flushInterval,
+                timeUnit,
+                FeatureFlagEvpContext.from(config),
+                droppedQueueOverflow,
+                contextTruncatedCounts,
+                this::close,
+                FLAG_EVALUATION_PAYLOAD_SIZE_LIMIT_BYTES);
+        this.serializerThread = newAgentThread(FEATURE_FLAG_EVALUATION_PROCESSOR, serializer);
     }
-    countMetric(FLAG_EVALUATION_DROPPED_METRIC, residual, DROP_REASON_CLOSED);
-  }
 
-  @Override
-  public void enqueue(final FlagEvalEvent event) {
-    if (event == null) {
-      return;
+    @Override
+    public void start() {
+        synchronized (lifecycleLock) {
+            if (closed.get()) {
+                return;
+            }
+            // Register with the gateway so FlagEvalLoggingHook can route evaluations to this writer
+            FeatureFlaggingGateway.setFlagEvalWriter(this);
+            this.serializerThread.start();
+        }
     }
-    if (isClosedOrEnqueueDisabled()) {
-      countClosedDrop();
-      return;
+
+    /** Test seam: starts the worker thread WITHOUT registering with the global gateway. */
+    void startForTest() {
+        synchronized (lifecycleLock) {
+            if (closed.get()) {
+                return;
+            }
+            this.serializerThread.start();
+        }
     }
-    // Deliberately lock-free: the hand-off queue is MPSC by design, so serializing producers on a
-    // monitor here would negate that and turn every evaluation in every application thread into
-    // contention on one lock. A producer that passed the check above can still offer after close()
-    // has started; that residue is accounted for by the worker's bounded post-drain passes and by
-    // close()'s post-join sweep, so shutdown loss stays observable.
-    //
-    // Safe publication of the event (including the context snapshot built by the hook) comes from
-    // the queue's own offer/poll ordering, not from any monitor held here.
-    //
-    // Non-blocking offer. Count overflow so loss is observable rather than silent; the count is
-    // surfaced on the next flush. The hook's pre-queue guard (see FlagEvalLoggingHook) samples the
-    // queue depth before doing any context-copy work, so a saturated queue costs an
-    // AtomicInteger.get(); the offer here still races with the worker and can legitimately fail.
-    if (!queue.offer(event)) {
-      droppedQueueOverflow.incrementAndGet();
+
+    /** Test seam: current full-tier bucket count in the worker's aggregator. */
+    int aggregatorFullTierSizeForTest() {
+        return serializer.aggregator.fullTierSize();
     }
-  }
-
-  /**
-   * Reports whether the async hand-off queue currently has room for another event. Producers
-   * consult this before performing any expensive context-copy work so a saturated queue is observed
-   * as an O(1) read rather than a full snapshot followed by a discarded offer. Best-effort only:
-   * the worker can drain (or a peer producer can fill) between this check and the subsequent
-   * enqueue, so callers must still tolerate offer failure.
-   */
-  public boolean hasCapacityForEnqueue() {
-    return queue.size() < queue.capacity();
-  }
-
-  /** Counts one queue-overflow drop without offering an event. */
-  public void countPreQueueOverflow() {
-    droppedQueueOverflow.incrementAndGet();
-  }
-
-  @Override
-  public void countContextTruncated(final String reason) {
-    contextTruncatedCounts.computeIfAbsent(reason, k -> new AtomicLong(0)).incrementAndGet();
-  }
-
-  private boolean isClosedOrEnqueueDisabled() {
-    return closed.get() || !FeatureFlaggingGateway.isFlagEvaluationEnqueueEnabled();
-  }
-
-  private void countClosedDrop() {
-    // Count the drop for any early exit from enqueue, whether closed=true or the gate was disabled
-    // by the surrounding subsystem. FeatureFlaggingSystem.stop() flips the gate before this
-    // writer's close() runs, so an in-flight enqueue could race that flip and see gate=false while
-    // closed=false. Counting on either condition keeps shutdown-loss observable.
-    countMetric(FLAG_EVALUATION_DROPPED_METRIC, 1, DROP_REASON_CLOSED);
-  }
-
-  /** Returns the count of events dropped due to queue-overflow backpressure (observable). */
-  long droppedQueueOverflow() {
-    return droppedQueueOverflow.get();
-  }
-
-  /** Test seam: returns one queued event without starting the worker. */
-  FlagEvalEvent pollQueuedEventForTest() {
-    return queue.poll();
-  }
-
-  /** Test seam: flushes serializer state without starting the worker. */
-  void flushForTest() {
-    serializer.flush();
-  }
-
-  // ---- Serializing handler (background thread logic) ----
-
-  static class FlagEvaluationSerializingHandler implements Runnable {
-    private final MessagePassingBlockingQueue<FlagEvalEvent> queue;
-    private final long ticksRequiredToFlush;
-
-    @SuppressFBWarnings(
-        value = "AT_NONATOMIC_64BIT_PRIMITIVE",
-        justification = "the field is confined to the single serializer thread")
-    private long lastTicks;
-
-    private final FeatureFlagEvpPublisher<FlagEvaluationPayloads.FlagEvaluationsRequest>
-        evpPublisher;
-    final Map<String, String> context;
-    private final AtomicLong droppedQueueOverflow;
-    private final ConcurrentHashMap<String, AtomicLong> contextTruncatedCounts;
-    private final Runnable errorCallback;
-    private final int payloadSizeLimitBytes;
-    final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
-
-    // Shutdown coordination: set by close(), drives a final drain+flush before the worker exits.
-    private final AtomicBoolean shutdownRequested = new AtomicBoolean(false);
-    private final CountDownLatch finalFlushDone = new CountDownLatch(1);
-
-    FlagEvaluationSerializingHandler(
-        final Supplier<BackendApi> backendApiSupplier,
-        final MessagePassingBlockingQueue<FlagEvalEvent> queue,
-        final long flushInterval,
-        final TimeUnit timeUnit,
-        final Map<String, String> context,
-        final AtomicLong droppedQueueOverflow,
-        final ConcurrentHashMap<String, AtomicLong> contextTruncatedCounts,
-        final Runnable errorCallback,
-        final int payloadSizeLimitBytes) {
-      this.queue = queue;
-      this.evpPublisher =
-          new FeatureFlagEvpPublisher<>(
-              backendApiSupplier, FlagEvaluationPayloads.FlagEvaluationsRequest.class);
-      this.context = context;
-      this.droppedQueueOverflow = droppedQueueOverflow;
-      this.contextTruncatedCounts = contextTruncatedCounts;
-      this.payloadSizeLimitBytes = payloadSizeLimitBytes;
-      this.lastTicks = System.nanoTime();
-      this.ticksRequiredToFlush = timeUnit.toNanos(flushInterval);
-      this.errorCallback = errorCallback;
-      LOGGER.debug("starting flag evaluation serializer");
+
+    @Override
+    public void close() {
+        final boolean workerRunning;
+        synchronized (lifecycleLock) {
+            if (!closed.compareAndSet(false, true)) {
+                return;
+            }
+            // Disable and deregister from the gateway so no new events are enqueued.
+            FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(false);
+            FeatureFlaggingGateway.setFlagEvalWriter(null);
+            workerRunning = this.serializerThread.isAlive();
+            if (workerRunning) {
+                // Ask the worker to drain the queue and final-flush, then interrupt to wake it from poll().
+                serializer.requestShutdown();
+                this.serializerThread.interrupt();
+            }
+        }
+        if (Thread.currentThread() == this.serializerThread) {
+            return;
+        }
+        if (workerRunning) {
+            try {
+                // Bounded wait for the worker's final flush so queued events are not lost on shutdown.
+                this.serializerThread.join(TimeUnit.SECONDS.toMillis(5));
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
+        // enqueue() is lock-free, so a producer that passed the closed check before close() ran can
+        // still land an event after the worker's final drain. Sweep the remainder so that loss is
+        // counted rather than silently stranded in a queue nobody polls again. Only safe once the
+        // worker is gone: the queue is single-consumer, so sweeping alongside a live worker would
+        // break that contract. If join() timed out the worker is still draining, so skip the sweep.
+        if (!this.serializerThread.isAlive()) {
+            sweepAndCountResidualEvents();
+        }
     }
 
-    /** Signals the worker to drain the queue and perform a final flush before exiting. */
-    void requestShutdown() {
-      shutdownRequested.set(true);
+    /**
+     * Counts events left in the queue after the worker has exited. Must only be called when the
+     * serializer thread is not alive - the queue permits a single consumer.
+     */
+    private void sweepAndCountResidualEvents() {
+        long residual = 0;
+        while (queue.poll() != null) {
+            residual++;
+        }
+        countMetric(FLAG_EVALUATION_DROPPED_METRIC, residual, DROP_REASON_CLOSED);
     }
 
     @Override
-    public void run() {
-      if (!evpPublisher.start()) {
-        finalFlushDone.countDown();
-        errorCallback.run();
-        throw new IllegalArgumentException("EVP Proxy not available");
-      }
-      try {
-        runDutyCycle();
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      } finally {
-        // On exit (interrupt or shutdown request), drain everything still buffered and flush it so
-        // queued events are not lost on shutdown.
+    public void enqueue(final FlagEvalEvent event) {
+        if (event == null) {
+            return;
+        }
+        if (isClosedOrEnqueueDisabled()) {
+            countClosedDrop();
+            return;
+        }
+        // Deliberately lock-free: the hand-off queue is MPSC by design, so serializing producers on a
+        // monitor here would negate that and turn every evaluation in every application thread into
+        // contention on one lock. A producer that passed the check above can still offer after close()
+        // has started; that residue is accounted for by the worker's bounded post-drain passes and by
+        // close()'s post-join sweep, so shutdown loss stays observable.
+        //
+        // Safe publication of the event (including the context snapshot built by the hook) comes from
+        // the queue's own offer/poll ordering, not from any monitor held here.
         //
-        // close() interrupts this thread to break it out of poll(). The final flush does socket
-        // I/O, and OkHttp fails fast on a thread whose interrupt flag is set, so clear the flag
-        // for the duration of the drain and restore it afterwards. Without this the flush that
-        // close() exists to guarantee throws IOException, the aggregated rows are discarded by
-        // the clear() in flush(), and the loss is invisible to the drop counters because those
-        // rows already left the queue.
-        final boolean wasInterrupted = Thread.interrupted();
-        try {
-          drainAndFlush();
-        } finally {
-          finalFlushDone.countDown();
-          if (wasInterrupted) {
-            Thread.currentThread().interrupt();
-          }
+        // Non-blocking offer. Count overflow so loss is observable rather than silent; the count is
+        // surfaced on the next flush. The hook's pre-queue guard (see FlagEvalLoggingHook) samples the
+        // queue depth before doing any context-copy work, so a saturated queue costs an
+        // AtomicInteger.get(); the offer here still races with the worker and can legitimately fail.
+        if (!queue.offer(event)) {
+            droppedQueueOverflow.incrementAndGet();
         }
-      }
-      LOGGER.debug("flag evaluation processor worker exited.");
     }
 
-    private void runDutyCycle() throws InterruptedException {
-      final Thread thread = Thread.currentThread();
-      while (!thread.isInterrupted() && !shutdownRequested.get()) {
-        final FlagEvalEvent event = queue.poll(100, TimeUnit.MILLISECONDS);
-        if (event != null) {
-          aggregateEvent(event);
-        }
-        flushIfNecessary();
-      }
+    /**
+     * Reports whether the async hand-off queue currently has room for another event. Producers
+     * consult this before performing any expensive context-copy work so a saturated queue is observed
+     * as an O(1) read rather than a full snapshot followed by a discarded offer. Best-effort only:
+     * the worker can drain (or a peer producer can fill) between this check and the subsequent
+     * enqueue, so callers must still tolerate offer failure.
+     */
+    public boolean hasCapacityForEnqueue() {
+        return queue.size() < queue.capacity();
     }
 
-    void drainAndFlush() {
-      FlagEvalEvent event;
-      while ((event = queue.poll()) != null) {
-        aggregateEvent(event);
-      }
-      flush();
+    /** Counts one queue-overflow drop without offering an event. */
+    public void countPreQueueOverflow() {
+        droppedQueueOverflow.incrementAndGet();
     }
 
-    // ---- Aggregation logic ----
+    @Override
+    public void countContextTruncated(final String reason) {
+        contextTruncatedCounts.computeIfAbsent(reason, k -> new AtomicLong(0)).incrementAndGet();
+    }
 
-    /** Routes an event into the full tier or degraded tier, or drops and counts on overflow. */
-    void aggregateEvent(final FlagEvalEvent event) {
-      try {
-        aggregator.aggregate(event);
-      } catch (LinkageError | RuntimeException e) {
-        LOGGER.debug("Could not aggregate flag evaluation event", e);
-      }
+    private boolean isClosedOrEnqueueDisabled() {
+        return closed.get() || !FeatureFlaggingGateway.isFlagEvaluationEnqueueEnabled();
     }
 
-    // ---- Flush logic ----
+    private void countClosedDrop() {
+        // Count the drop for any early exit from enqueue, whether closed=true or the gate was disabled
+        // by the surrounding subsystem. FeatureFlaggingSystem.stop() flips the gate before this
+        // writer's close() runs, so an in-flight enqueue could race that flip and see gate=false while
+        // closed=false. Counting on either condition keeps shutdown-loss observable.
+        countMetric(FLAG_EVALUATION_DROPPED_METRIC, 1, DROP_REASON_CLOSED);
+    }
 
-    void flushIfNecessary() {
-      if (shouldFlush()) {
-        flush();
-      }
+    /** Returns the count of events dropped due to queue-overflow backpressure (observable). */
+    long droppedQueueOverflow() {
+        return droppedQueueOverflow.get();
     }
 
-    void flush() {
-      // Surface backpressure (queue-overflow) drops as an observable warning even when there is
-      // nothing else to flush.
-      final long qDrops = droppedQueueOverflow.getAndSet(0);
-      countMetric(FLAG_EVALUATION_DROPPED_METRIC, qDrops, DROP_REASON_QUEUE_OVERFLOW);
-      if (qDrops > 0) {
-        LOGGER.warn(
-            "flag evaluation queue full - dropped {} evaluation(s) under backpressure"
-                + " (best-effort telemetry)",
-            qDrops);
-      }
-      final long dgDrops = aggregator.droppedDegradedOverflow.getAndSet(0);
-      countMetric(FLAG_EVALUATION_DROPPED_METRIC, dgDrops, DROP_REASON_DEGRADED_CAP);
-      if (dgDrops > 0) {
-        LOGGER.warn(
-            "degraded aggregation tier full - dropped {} evaluation(s); raise degraded cap"
-                + " (best-effort telemetry)",
-            dgDrops);
-      }
-
-      // Drain per-reason context-truncation counters and emit one metric per unique reason tag.
-      for (final Map.Entry<String, AtomicLong> entry : contextTruncatedCounts.entrySet()) {
-        final long count = entry.getValue().getAndSet(0);
-        if (count > 0) {
-          countMetric(FLAG_EVALUATION_CONTEXT_TRUNCATED_METRIC, count, entry.getKey());
-        }
-      }
-
-      if (aggregator.isEmpty()) {
-        return;
-      }
-      try {
-        countMetric(
-            FLAG_EVALUATION_DEGRADED_METRIC,
-            aggregator.degradedEvaluationCount(),
-            DEGRADED_REASON_CARDINALITY_CAP);
-        final List<FlagEvaluationPayloads.FlagEvaluationEvent> events = buildEventList();
-        if (events.isEmpty()) {
-          return;
-        }
-        final FlagEvaluationPayloads.EncodedPayloads payloads =
-            FlagEvaluationPayloads.buildPayloads(events, context, payloadSizeLimitBytes);
-        countMetric(
-            FLAG_EVALUATION_DROPPED_METRIC,
-            payloads.droppedPayloadLimit,
-            DROP_REASON_PAYLOAD_LIMIT);
-        countMetric(
-            FLAG_EVALUATION_DEGRADED_METRIC,
-            payloads.degradedPayloadLimit,
-            DEGRADED_REASON_PAYLOAD_LIMIT);
-        if (payloads.bodies.size() > 1) {
-          countMetric(FLAG_EVALUATION_SPLITS_METRIC, payloads.bodies.size() - 1, null);
+    /** Test seam: returns one queued event without starting the worker. */
+    FlagEvalEvent pollQueuedEventForTest() {
+        return queue.poll();
+    }
+
+    /** Test seam: flushes serializer state without starting the worker. */
+    void flushForTest() {
+        serializer.flush();
+    }
+
+    // ---- Serializing handler (background thread logic) ----
+
+    static class FlagEvaluationSerializingHandler implements Runnable {
+        private final MessagePassingBlockingQueue<FlagEvalEvent> queue;
+        private final long ticksRequiredToFlush;
+
+        @SuppressFBWarnings(
+                value = "AT_NONATOMIC_64BIT_PRIMITIVE",
+                justification = "the field is confined to the single serializer thread")
+        private long lastTicks;
+
+        private final FeatureFlagEvpPublisher<FlagEvaluationPayloads.FlagEvaluationsRequest> evpPublisher;
+        final Map<String, String> context;
+        private final AtomicLong droppedQueueOverflow;
+        private final ConcurrentHashMap<String, AtomicLong> contextTruncatedCounts;
+        private final Runnable errorCallback;
+        private final int payloadSizeLimitBytes;
+        final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
+
+        // Shutdown coordination: set by close(), drives a final drain+flush before the worker exits.
+        private final AtomicBoolean shutdownRequested = new AtomicBoolean(false);
+        private final CountDownLatch finalFlushDone = new CountDownLatch(1);
+
+        FlagEvaluationSerializingHandler(
+                final Supplier<BackendApi> backendApiSupplier,
+                final MessagePassingBlockingQueue<FlagEvalEvent> queue,
+                final long flushInterval,
+                final TimeUnit timeUnit,
+                final Map<String, String> context,
+                final AtomicLong droppedQueueOverflow,
+                final ConcurrentHashMap<String, AtomicLong> contextTruncatedCounts,
+                final Runnable errorCallback,
+                final int payloadSizeLimitBytes) {
+            this.queue = queue;
+            this.evpPublisher = new FeatureFlagEvpPublisher<>(
+                    backendApiSupplier, FlagEvaluationPayloads.FlagEvaluationsRequest.class);
+            this.context = context;
+            this.droppedQueueOverflow = droppedQueueOverflow;
+            this.contextTruncatedCounts = contextTruncatedCounts;
+            this.payloadSizeLimitBytes = payloadSizeLimitBytes;
+            this.lastTicks = System.nanoTime();
+            this.ticksRequiredToFlush = timeUnit.toNanos(flushInterval);
+            this.errorCallback = errorCallback;
+            LOGGER.debug("starting flag evaluation serializer");
         }
-        if (payloads.droppedPayloadLimit > 0) {
-          LOGGER.warn(
-              "flag evaluation payload too large - dropped {} evaluation(s)"
-                  + " (best-effort telemetry)",
-              payloads.droppedPayloadLimit);
+
+        /** Signals the worker to drain the queue and perform a final flush before exiting. */
+        void requestShutdown() {
+            shutdownRequested.set(true);
         }
-        for (final byte[] payload : payloads.bodies) {
-          evpPublisher.post(FLAG_EVALUATION_ROUTE, payload);
+
+        @Override
+        public void run() {
+            if (!evpPublisher.start()) {
+                finalFlushDone.countDown();
+                errorCallback.run();
+                throw new IllegalArgumentException("EVP Proxy not available");
+            }
+            try {
+                runDutyCycle();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            } finally {
+                // On exit (interrupt or shutdown request), drain everything still buffered and flush it so
+                // queued events are not lost on shutdown.
+                //
+                // close() interrupts this thread to break it out of poll(). The final flush does socket
+                // I/O, and OkHttp fails fast on a thread whose interrupt flag is set, so clear the flag
+                // for the duration of the drain and restore it afterwards. Without this the flush that
+                // close() exists to guarantee throws IOException, the aggregated rows are discarded by
+                // the clear() in flush(), and the loss is invisible to the drop counters because those
+                // rows already left the queue.
+                final boolean wasInterrupted = Thread.interrupted();
+                try {
+                    drainAndFlush();
+                } finally {
+                    finalFlushDone.countDown();
+                    if (wasInterrupted) {
+                        Thread.currentThread().interrupt();
+                    }
+                }
+            }
+            LOGGER.debug("flag evaluation processor worker exited.");
         }
-      } catch (Exception e) {
-        LOGGER.error("Could not submit flag evaluations", e);
-      } finally {
-        // Best-effort: always clear the aggregator after a flush attempt. Retaining buckets across
-        // flushes on encode failure would let one unserializable value (for example a NaN Double a
-        // customer put in the context) permanently block every subsequent flush.
-        aggregator.clear();
-        lastTicks = System.nanoTime();
-      }
-    }
 
-    private List<FlagEvaluationPayloads.FlagEvaluationEvent> buildEventList() {
-      final long flushTimeMs = System.currentTimeMillis();
-      // Consent is read per bucket from the value each event snapshotted at evaluation time, not
-      // from the gateway here: CURRENT_CONFIG may have been overwritten by a later RC update since
-      // these evaluations happened, and reading it at flush would apply the wrong config's consent.
-      final List<FlagEvaluationPayloads.FlagEvaluationEvent> events =
-          new ArrayList<>(aggregator.bucketCount());
-      for (final FlagEvaluationAggregator.EvalBucket bucket : aggregator.fullBuckets()) {
-        events.add(
-            FlagEvaluationPayloads.FlagEvaluationEvent.fromBucket(
-                bucket, true, bucket.observeFullEvaluationData, flushTimeMs));
-      }
-      for (final FlagEvaluationAggregator.EvalBucket bucket : aggregator.degradedBuckets()) {
-        events.add(
-            FlagEvaluationPayloads.FlagEvaluationEvent.fromBucket(
-                bucket, false, bucket.observeFullEvaluationData, flushTimeMs));
-      }
-      return events;
-    }
+        private void runDutyCycle() throws InterruptedException {
+            final Thread thread = Thread.currentThread();
+            while (!thread.isInterrupted() && !shutdownRequested.get()) {
+                final FlagEvalEvent event = queue.poll(100, TimeUnit.MILLISECONDS);
+                if (event != null) {
+                    aggregateEvent(event);
+                }
+                flushIfNecessary();
+            }
+        }
 
-    private boolean shouldFlush() {
-      if (aggregator.isEmpty() && droppedQueueOverflow.get() == 0) {
-        return false;
-      }
-      final long nanoTime = System.nanoTime();
-      final long ticks = nanoTime - lastTicks;
-      if (ticks > ticksRequiredToFlush) {
-        lastTicks = nanoTime;
-        return true;
-      }
-      return false;
-    }
-  }
+        void drainAndFlush() {
+            FlagEvalEvent event;
+            while ((event = queue.poll()) != null) {
+                aggregateEvent(event);
+            }
+            flush();
+        }
 
-  // ---- Test-seam inner class (package-private) ----
+        // ---- Aggregation logic ----
 
-  /**
-   * Test-accessible handler that exposes {@link #drainAndAggregate()} and {@link #flush()} without
-   * starting a real background thread.
-   */
-  static class SerializingHandlerForTest extends FlagEvaluationSerializingHandler {
+        /** Routes an event into the full tier or degraded tier, or drops and counts on overflow. */
+        void aggregateEvent(final FlagEvalEvent event) {
+            try {
+                aggregator.aggregate(event);
+            } catch (LinkageError | RuntimeException e) {
+                LOGGER.debug("Could not aggregate flag evaluation event", e);
+            }
+        }
 
-    SerializingHandlerForTest(
-        final Supplier<BackendApi> backendApiSupplier, final Map<String, String> context) {
-      this(backendApiSupplier, context, FLAG_EVALUATION_PAYLOAD_SIZE_LIMIT_BYTES);
-    }
+        // ---- Flush logic ----
 
-    SerializingHandlerForTest(
-        final Supplier<BackendApi> backendApiSupplier,
-        final Map<String, String> context,
-        final int payloadSizeLimitBytes) {
-      super(
-          backendApiSupplier,
-          Queues.mpscBlockingConsumerArrayQueue(DEFAULT_CAPACITY),
-          Long.MAX_VALUE, // effectively never auto-flush
-          TimeUnit.NANOSECONDS,
-          context,
-          new AtomicLong(0),
-          new ConcurrentHashMap<>(),
-          () -> {},
-          payloadSizeLimitBytes);
-    }
+        void flushIfNecessary() {
+            if (shouldFlush()) {
+                flush();
+            }
+        }
 
-    private final List<FlagEvalEvent> staged = new ArrayList<>();
+        void flush() {
+            // Surface backpressure (queue-overflow) drops as an observable warning even when there is
+            // nothing else to flush.
+            final long qDrops = droppedQueueOverflow.getAndSet(0);
+            countMetric(FLAG_EVALUATION_DROPPED_METRIC, qDrops, DROP_REASON_QUEUE_OVERFLOW);
+            if (qDrops > 0) {
+                LOGGER.warn(
+                        "flag evaluation queue full - dropped {} evaluation(s) under backpressure"
+                                + " (best-effort telemetry)",
+                        qDrops);
+            }
+            final long dgDrops = aggregator.droppedDegradedOverflow.getAndSet(0);
+            countMetric(FLAG_EVALUATION_DROPPED_METRIC, dgDrops, DROP_REASON_DEGRADED_CAP);
+            if (dgDrops > 0) {
+                LOGGER.warn(
+                        "degraded aggregation tier full - dropped {} evaluation(s); raise degraded cap"
+                                + " (best-effort telemetry)",
+                        dgDrops);
+            }
+
+            // Drain per-reason context-truncation counters and emit one metric per unique reason tag.
+            for (final Map.Entry<String, AtomicLong> entry : contextTruncatedCounts.entrySet()) {
+                final long count = entry.getValue().getAndSet(0);
+                if (count > 0) {
+                    countMetric(FLAG_EVALUATION_CONTEXT_TRUNCATED_METRIC, count, entry.getKey());
+                }
+            }
+
+            if (aggregator.isEmpty()) {
+                return;
+            }
+            try {
+                countMetric(
+                        FLAG_EVALUATION_DEGRADED_METRIC,
+                        aggregator.degradedEvaluationCount(),
+                        DEGRADED_REASON_CARDINALITY_CAP);
+                final List<FlagEvaluationPayloads.FlagEvaluationEvent> events = buildEventList();
+                if (events.isEmpty()) {
+                    return;
+                }
+                final FlagEvaluationPayloads.EncodedPayloads payloads =
+                        FlagEvaluationPayloads.buildPayloads(events, context, payloadSizeLimitBytes);
+                countMetric(FLAG_EVALUATION_DROPPED_METRIC, payloads.droppedPayloadLimit, DROP_REASON_PAYLOAD_LIMIT);
+                countMetric(
+                        FLAG_EVALUATION_DEGRADED_METRIC, payloads.degradedPayloadLimit, DEGRADED_REASON_PAYLOAD_LIMIT);
+                if (payloads.bodies.size() > 1) {
+                    countMetric(FLAG_EVALUATION_SPLITS_METRIC, payloads.bodies.size() - 1, null);
+                }
+                if (payloads.droppedPayloadLimit > 0) {
+                    LOGGER.warn(
+                            "flag evaluation payload too large - dropped {} evaluation(s)" + " (best-effort telemetry)",
+                            payloads.droppedPayloadLimit);
+                }
+                for (final byte[] payload : payloads.bodies) {
+                    evpPublisher.post(FLAG_EVALUATION_ROUTE, payload);
+                }
+            } catch (Exception e) {
+                LOGGER.error("Could not submit flag evaluations", e);
+            } finally {
+                // Best-effort: always clear the aggregator after a flush attempt. Retaining buckets across
+                // flushes on encode failure would let one unserializable value (for example a NaN Double a
+                // customer put in the context) permanently block every subsequent flush.
+                aggregator.clear();
+                lastTicks = System.nanoTime();
+            }
+        }
 
-    /** Adds an event to the staged list (simulates hook enqueue). */
-    void add(final FlagEvalEvent event) {
-      staged.add(event);
-    }
+        private List<FlagEvaluationPayloads.FlagEvaluationEvent> buildEventList() {
+            final long flushTimeMs = System.currentTimeMillis();
+            // Consent is read per bucket from the value each event snapshotted at evaluation time, not
+            // from the gateway here: CURRENT_CONFIG may have been overwritten by a later RC update since
+            // these evaluations happened, and reading it at flush would apply the wrong config's consent.
+            final List<FlagEvaluationPayloads.FlagEvaluationEvent> events = new ArrayList<>(aggregator.bucketCount());
+            for (final FlagEvaluationAggregator.EvalBucket bucket : aggregator.fullBuckets()) {
+                events.add(FlagEvaluationPayloads.FlagEvaluationEvent.fromBucket(
+                        bucket, true, bucket.observeFullEvaluationData, flushTimeMs));
+            }
+            for (final FlagEvaluationAggregator.EvalBucket bucket : aggregator.degradedBuckets()) {
+                events.add(FlagEvaluationPayloads.FlagEvaluationEvent.fromBucket(
+                        bucket, false, bucket.observeFullEvaluationData, flushTimeMs));
+            }
+            return events;
+        }
 
-    /** Aggregates all staged events and returns the current aggregation state. */
-    FlagEvaluationAggregator.AggregatedState drainAndAggregate() {
-      for (final FlagEvalEvent e : staged) {
-        aggregateEvent(e);
-      }
-      staged.clear();
-      return aggregator.snapshot();
+        private boolean shouldFlush() {
+            if (aggregator.isEmpty() && droppedQueueOverflow.get() == 0) {
+                return false;
+            }
+            final long nanoTime = System.nanoTime();
+            final long ticks = nanoTime - lastTicks;
+            if (ticks > ticksRequiredToFlush) {
+                lastTicks = nanoTime;
+                return true;
+            }
+            return false;
+        }
     }
 
-    /** Simulates filling the full tier to GLOBAL_CAP by injecting synthetic distinct buckets. */
-    void simulateFullTierAtCap() {
-      aggregator.simulateFullTierAtCap();
-    }
+    // ---- Test-seam inner class (package-private) ----
 
     /**
-     * Simulates filling the degraded tier to DEGRADED_CAP by injecting synthetic distinct buckets.
+     * Test-accessible handler that exposes {@link #drainAndAggregate()} and {@link #flush()} without
+     * starting a real background thread.
      */
-    void simulateDegradedTierAtCap() {
-      aggregator.simulateDegradedTierAtCap();
-    }
+    static class SerializingHandlerForTest extends FlagEvaluationSerializingHandler {
 
-    void addDroppedDegradedOverflowForTest(final long count) {
-      aggregator.droppedDegradedOverflow.addAndGet(count);
-    }
+        SerializingHandlerForTest(final Supplier<BackendApi> backendApiSupplier, final Map<String, String> context) {
+            this(backendApiSupplier, context, FLAG_EVALUATION_PAYLOAD_SIZE_LIMIT_BYTES);
+        }
+
+        SerializingHandlerForTest(
+                final Supplier<BackendApi> backendApiSupplier,
+                final Map<String, String> context,
+                final int payloadSizeLimitBytes) {
+            super(
+                    backendApiSupplier,
+                    Queues.mpscBlockingConsumerArrayQueue(DEFAULT_CAPACITY),
+                    Long.MAX_VALUE, // effectively never auto-flush
+                    TimeUnit.NANOSECONDS,
+                    context,
+                    new AtomicLong(0),
+                    new ConcurrentHashMap<>(),
+                    () -> {},
+                    payloadSizeLimitBytes);
+        }
+
+        private final List<FlagEvalEvent> staged = new ArrayList<>();
+
+        /** Adds an event to the staged list (simulates hook enqueue). */
+        void add(final FlagEvalEvent event) {
+            staged.add(event);
+        }
+
+        /** Aggregates all staged events and returns the current aggregation state. */
+        FlagEvaluationAggregator.AggregatedState drainAndAggregate() {
+            for (final FlagEvalEvent e : staged) {
+                aggregateEvent(e);
+            }
+            staged.clear();
+            return aggregator.snapshot();
+        }
+
+        /** Simulates filling the full tier to GLOBAL_CAP by injecting synthetic distinct buckets. */
+        void simulateFullTierAtCap() {
+            aggregator.simulateFullTierAtCap();
+        }
+
+        /**
+         * Simulates filling the degraded tier to DEGRADED_CAP by injecting synthetic distinct buckets.
+         */
+        void simulateDegradedTierAtCap() {
+            aggregator.simulateDegradedTierAtCap();
+        }
+
+        void addDroppedDegradedOverflowForTest(final long count) {
+            aggregator.droppedDegradedOverflow.addAndGet(count);
+        }
 
-    void addDegradedBucketForTest(
-        final String flagKey,
-        final String variant,
-        final String allocationKey,
-        final String errorMessage,
-        final long evalTimeMs) {
-      aggregator.addDegradedBucketForTest(
-          flagKey, variant, allocationKey, errorMessage, evalTimeMs);
+        void addDegradedBucketForTest(
+                final String flagKey,
+                final String variant,
+                final String allocationKey,
+                final String errorMessage,
+                final long evalTimeMs) {
+            aggregator.addDegradedBucketForTest(flagKey, variant, allocationKey, errorMessage, evalTimeMs);
+        }
+
+        void clearAggregationForTest() {
+            aggregator.clear();
+        }
+
+        int fullTierSizeForTest() {
+            return aggregator.fullTierSize();
+        }
     }
 
-    void clearAggregationForTest() {
-      aggregator.clear();
+    /** Factory method for test use - creates a SerializingHandlerForTest. */
+    static SerializingHandlerForTest createHandlerForTest(
+            final Supplier<BackendApi> backendApiSupplier, final Map<String, String> context) {
+        return new SerializingHandlerForTest(backendApiSupplier, context);
     }
 
-    int fullTierSizeForTest() {
-      return aggregator.fullTierSize();
+    static SerializingHandlerForTest createHandlerForTest(
+            final Supplier<BackendApi> backendApiSupplier,
+            final Map<String, String> context,
+            final int payloadSizeLimitBytes) {
+        return new SerializingHandlerForTest(backendApiSupplier, context, payloadSizeLimitBytes);
     }
-  }
-
-  /** Factory method for test use - creates a SerializingHandlerForTest. */
-  static SerializingHandlerForTest createHandlerForTest(
-      final Supplier<BackendApi> backendApiSupplier, final Map<String, String> context) {
-    return new SerializingHandlerForTest(backendApiSupplier, context);
-  }
-
-  static SerializingHandlerForTest createHandlerForTest(
-      final Supplier<BackendApi> backendApiSupplier,
-      final Map<String, String> context,
-      final int payloadSizeLimitBytes) {
-    return new SerializingHandlerForTest(backendApiSupplier, context, payloadSizeLimitBytes);
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/JsonApiUfcResponseParser.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/JsonApiUfcResponseParser.java
index 0a47d316075..f808efd2ef9 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/JsonApiUfcResponseParser.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/JsonApiUfcResponseParser.java
@@ -10,83 +10,79 @@
 
 final class JsonApiUfcResponseParser {
 
-  private static final String UNIVERSAL_FLAG_CONFIGURATION_TYPE = "universal-flag-configuration";
-  private static final JsonReader.Options RESPONSE_FIELDS = JsonReader.Options.of("data");
-  private static final JsonReader.Options DATA_FIELDS = JsonReader.Options.of("type", "attributes");
+    private static final String UNIVERSAL_FLAG_CONFIGURATION_TYPE = "universal-flag-configuration";
+    private static final JsonReader.Options RESPONSE_FIELDS = JsonReader.Options.of("data");
+    private static final JsonReader.Options DATA_FIELDS = JsonReader.Options.of("type", "attributes");
 
-  static final JsonApiUfcResponseParser INSTANCE =
-      new JsonApiUfcResponseParser(UniversalFlagConfigParser.INSTANCE);
+    static final JsonApiUfcResponseParser INSTANCE = new JsonApiUfcResponseParser(UniversalFlagConfigParser.INSTANCE);
 
-  private final UniversalFlagConfigParser ufcParser;
+    private final UniversalFlagConfigParser ufcParser;
 
-  JsonApiUfcResponseParser(final UniversalFlagConfigParser ufcParser) {
-    this.ufcParser = ufcParser;
-  }
+    JsonApiUfcResponseParser(final UniversalFlagConfigParser ufcParser) {
+        this.ufcParser = ufcParser;
+    }
 
-  @Nullable
-  ServerConfiguration parse(final byte[] content) throws IOException {
-    try (BufferedSource source = Okio.buffer(Okio.source(new ByteArrayInputStream(content)))) {
-      final JsonReader reader = JsonReader.of(source);
-      if (reader.peek() != JsonReader.Token.BEGIN_OBJECT) {
-        reader.skipValue();
-        return null;
-      }
-      ServerConfiguration configuration = null;
-      reader.beginObject();
-      while (reader.hasNext()) {
-        if (reader.selectName(RESPONSE_FIELDS) == 0) {
-          configuration = parseData(reader);
-        } else {
-          reader.skipName();
-          reader.skipValue();
+    @Nullable
+    ServerConfiguration parse(final byte[] content) throws IOException {
+        try (BufferedSource source = Okio.buffer(Okio.source(new ByteArrayInputStream(content)))) {
+            final JsonReader reader = JsonReader.of(source);
+            if (reader.peek() != JsonReader.Token.BEGIN_OBJECT) {
+                reader.skipValue();
+                return null;
+            }
+            ServerConfiguration configuration = null;
+            reader.beginObject();
+            while (reader.hasNext()) {
+                if (reader.selectName(RESPONSE_FIELDS) == 0) {
+                    configuration = parseData(reader);
+                } else {
+                    reader.skipName();
+                    reader.skipValue();
+                }
+            }
+            reader.endObject();
+            requireEndOfDocument(reader);
+            return configuration;
         }
-      }
-      reader.endObject();
-      requireEndOfDocument(reader);
-      return configuration;
     }
-  }
 
-  @Nullable
-  private ServerConfiguration parseData(final JsonReader reader) throws IOException {
-    if (reader.peek() != JsonReader.Token.BEGIN_OBJECT) {
-      reader.skipValue();
-      return null;
-    }
-    String type = null;
-    ServerConfiguration configuration = null;
-    reader.beginObject();
-    while (reader.hasNext()) {
-      switch (reader.selectName(DATA_FIELDS)) {
-        case 0:
-          if (reader.peek() == JsonReader.Token.STRING) {
-            type = reader.nextString();
-          } else {
+    @Nullable
+    private ServerConfiguration parseData(final JsonReader reader) throws IOException {
+        if (reader.peek() != JsonReader.Token.BEGIN_OBJECT) {
             reader.skipValue();
-          }
-          break;
-        case 1:
-          configuration = ufcParser.parse(reader);
-          break;
-        default:
-          reader.skipName();
-          reader.skipValue();
-      }
+            return null;
+        }
+        String type = null;
+        ServerConfiguration configuration = null;
+        reader.beginObject();
+        while (reader.hasNext()) {
+            switch (reader.selectName(DATA_FIELDS)) {
+                case 0:
+                    if (reader.peek() == JsonReader.Token.STRING) {
+                        type = reader.nextString();
+                    } else {
+                        reader.skipValue();
+                    }
+                    break;
+                case 1:
+                    configuration = ufcParser.parse(reader);
+                    break;
+                default:
+                    reader.skipName();
+                    reader.skipValue();
+            }
+        }
+        reader.endObject();
+        return UNIVERSAL_FLAG_CONFIGURATION_TYPE.equals(type) ? validConfiguration(configuration) : null;
     }
-    reader.endObject();
-    return UNIVERSAL_FLAG_CONFIGURATION_TYPE.equals(type)
-        ? validConfiguration(configuration)
-        : null;
-  }
 
-  @Nullable
-  private static ServerConfiguration validConfiguration(
-      @Nullable final ServerConfiguration configuration) {
-    return configuration != null && configuration.flags != null ? configuration : null;
-  }
+    @Nullable
+    private static ServerConfiguration validConfiguration(@Nullable final ServerConfiguration configuration) {
+        return configuration != null && configuration.flags != null ? configuration : null;
+    }
 
-  private static void requireEndOfDocument(final JsonReader reader) throws IOException {
-    // A strict JsonReader throws if another top-level value follows the parsed document.
-    reader.peek();
-  }
+    private static void requireEndOfDocument(final JsonReader reader) throws IOException {
+        // A strict JsonReader throws if another top-level value follows the parsed document.
+        reader.peek();
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/LRUExposureCache.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/LRUExposureCache.java
index e21752cc529..4a9e1482fd0 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/LRUExposureCache.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/LRUExposureCache.java
@@ -10,27 +10,27 @@
  */
 public class LRUExposureCache implements ExposureCache {
 
-  private final Map<Key, Value> cache;
+    private final Map<Key, Value> cache;
 
-  public LRUExposureCache(final int capacity) {
-    cache = new LRUCache<>(capacity);
-  }
+    public LRUExposureCache(final int capacity) {
+        cache = new LRUCache<>(capacity);
+    }
 
-  @Override
-  public boolean add(final ExposureEvent event) {
-    final Key key = new Key(event);
-    final Value value = new Value(event);
-    final Value oldValue = cache.put(key, value);
-    return oldValue == null || !oldValue.equals(value);
-  }
+    @Override
+    public boolean add(final ExposureEvent event) {
+        final Key key = new Key(event);
+        final Value value = new Value(event);
+        final Value oldValue = cache.put(key, value);
+        return oldValue == null || !oldValue.equals(value);
+    }
 
-  @Override
-  public Value get(final Key key) {
-    return cache.get(key);
-  }
+    @Override
+    public Value get(final Key key) {
+        return cache.get(key);
+    }
 
-  @Override
-  public int size() {
-    return cache.size();
-  }
+    @Override
+    public int size() {
+        return cache.size();
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/RemoteConfigServiceImpl.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/RemoteConfigServiceImpl.java
index e66a6231990..8b06548b4cc 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/RemoteConfigServiceImpl.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/RemoteConfigServiceImpl.java
@@ -12,33 +12,33 @@
 import javax.annotation.Nullable;
 
 public class RemoteConfigServiceImpl
-    implements ConfigurationSourceService, ConfigurationChangesTypedListener<ServerConfiguration> {
+        implements ConfigurationSourceService, ConfigurationChangesTypedListener<ServerConfiguration> {
 
-  private final ConfigurationPoller configurationPoller;
+    private final ConfigurationPoller configurationPoller;
 
-  public RemoteConfigServiceImpl(final SharedCommunicationObjects sco, final Config config) {
-    configurationPoller = sco.configurationPoller(config);
-  }
+    public RemoteConfigServiceImpl(final SharedCommunicationObjects sco, final Config config) {
+        configurationPoller = sco.configurationPoller(config);
+    }
 
-  @Override
-  public void init() {
-    configurationPoller.addCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES);
-    configurationPoller.addListener(Product.FFE_FLAGS, UniversalFlagConfigParser.INSTANCE, this);
-    configurationPoller.start();
-  }
+    @Override
+    public void init() {
+        configurationPoller.addCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES);
+        configurationPoller.addListener(Product.FFE_FLAGS, UniversalFlagConfigParser.INSTANCE, this);
+        configurationPoller.start();
+    }
 
-  @Override
-  public void close() {
-    configurationPoller.removeCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES);
-    configurationPoller.removeListeners(Product.FFE_FLAGS);
-    configurationPoller.stop();
-  }
+    @Override
+    public void close() {
+        configurationPoller.removeCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES);
+        configurationPoller.removeListeners(Product.FFE_FLAGS);
+        configurationPoller.stop();
+    }
 
-  @Override
-  public void accept(
-      final String configKey,
-      @Nullable final ServerConfiguration configuration,
-      final PollingRateHinter pollingRateHinter) {
-    FeatureFlaggingGateway.dispatch(configuration);
-  }
+    @Override
+    public void accept(
+            final String configKey,
+            @Nullable final ServerConfiguration configuration,
+            final PollingRateHinter pollingRateHinter) {
+        FeatureFlaggingGateway.dispatch(configuration);
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/SpanEnrichmentAccumulator.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/SpanEnrichmentAccumulator.java
index a14274432b0..0408ec149b9 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/SpanEnrichmentAccumulator.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/SpanEnrichmentAccumulator.java
@@ -34,224 +34,226 @@
  */
 final class SpanEnrichmentAccumulator {
 
-  static final int MAX_SERIAL_IDS = 200;
-  static final int MAX_SUBJECTS = 10;
-  static final int MAX_EXPERIMENTS_PER_SUBJECT = 20;
-  static final int MAX_DEFAULTS = 5;
-  static final int MAX_DEFAULT_VALUE_LENGTH = 64;
+    static final int MAX_SERIAL_IDS = 200;
+    static final int MAX_SUBJECTS = 10;
+    static final int MAX_EXPERIMENTS_PER_SUBJECT = 20;
+    static final int MAX_DEFAULTS = 5;
+    static final int MAX_DEFAULT_VALUE_LENGTH = 64;
 
-  static final String TAG_FLAGS_ENC = "ffe_flags_enc";
-  static final String TAG_SUBJECTS_ENC = "ffe_subjects_enc";
-  static final String TAG_RUNTIME_DEFAULTS = "ffe_runtime_defaults";
+    static final String TAG_FLAGS_ENC = "ffe_flags_enc";
+    static final String TAG_SUBJECTS_ENC = "ffe_subjects_enc";
+    static final String TAG_RUNTIME_DEFAULTS = "ffe_runtime_defaults";
 
-  // dedupe is structural (a Set); sorted for deterministic encoding.
-  private final TreeSet<Integer> serialIds = new TreeSet<>();
-  // sha256hex(targetingKey) -> serial ids. LinkedHashMap for stable iteration order.
-  private final Map<String, TreeSet<Integer>> subjects = new LinkedHashMap<>();
-  // flagKey -> value string (first-wins, truncated to MAX_DEFAULT_VALUE_LENGTH).
-  private final Map<String, String> defaults = new LinkedHashMap<>();
+    // dedupe is structural (a Set); sorted for deterministic encoding.
+    private final TreeSet<Integer> serialIds = new TreeSet<>();
+    // sha256hex(targetingKey) -> serial ids. LinkedHashMap for stable iteration order.
+    private final Map<String, TreeSet<Integer>> subjects = new LinkedHashMap<>();
+    // flagKey -> value string (first-wins, truncated to MAX_DEFAULT_VALUE_LENGTH).
+    private final Map<String, String> defaults = new LinkedHashMap<>();
 
-  /** Adds a serial id, dropping silently once {@link #MAX_SERIAL_IDS} is reached. */
-  synchronized void addSerialId(final int id) {
-    if (serialIds.size() >= MAX_SERIAL_IDS && !serialIds.contains(id)) {
-      return;
+    /** Adds a serial id, dropping silently once {@link #MAX_SERIAL_IDS} is reached. */
+    synchronized void addSerialId(final int id) {
+        if (serialIds.size() >= MAX_SERIAL_IDS && !serialIds.contains(id)) {
+            return;
+        }
+        serialIds.add(id);
     }
-    serialIds.add(id);
-  }
 
-  /**
-   * Records that the given targeting key was exposed to the experiment identified by {@code id}.
-   * The targeting key is SHA-256-hashed before storage. Enforces both the subject cap ({@link
-   * #MAX_SUBJECTS}) and the per-subject experiment cap ({@link #MAX_EXPERIMENTS_PER_SUBJECT}).
-   */
-  synchronized void addSubject(final String targetingKey, final int id) {
-    if (targetingKey == null) {
-      return;
+    /**
+     * Records that the given targeting key was exposed to the experiment identified by {@code id}.
+     * The targeting key is SHA-256-hashed before storage. Enforces both the subject cap ({@link
+     * #MAX_SUBJECTS}) and the per-subject experiment cap ({@link #MAX_EXPERIMENTS_PER_SUBJECT}).
+     */
+    synchronized void addSubject(final String targetingKey, final int id) {
+        if (targetingKey == null) {
+            return;
+        }
+        final String hashed = ULeb128Encoder.hashTargetingKey(targetingKey);
+        final TreeSet<Integer> existing = subjects.get(hashed);
+        if (existing != null) {
+            if (existing.size() >= MAX_EXPERIMENTS_PER_SUBJECT && !existing.contains(id)) {
+                return;
+            }
+            existing.add(id);
+            return;
+        }
+        if (subjects.size() >= MAX_SUBJECTS) {
+            return;
+        }
+        final TreeSet<Integer> ids = new TreeSet<>();
+        ids.add(id);
+        subjects.put(hashed, ids);
     }
-    final String hashed = ULeb128Encoder.hashTargetingKey(targetingKey);
-    final TreeSet<Integer> existing = subjects.get(hashed);
-    if (existing != null) {
-      if (existing.size() >= MAX_EXPERIMENTS_PER_SUBJECT && !existing.contains(id)) {
-        return;
-      }
-      existing.add(id);
-      return;
-    }
-    if (subjects.size() >= MAX_SUBJECTS) {
-      return;
-    }
-    final TreeSet<Integer> ids = new TreeSet<>();
-    ids.add(id);
-    subjects.put(hashed, ids);
-  }
 
-  /**
-   * Records a runtime-default value for {@code flagKey} (first-wins). Structured values (Map/List)
-   * are serialized to JSON (NOT {@code toString()}); the result is truncated to {@link
-   * #MAX_DEFAULT_VALUE_LENGTH}.
-   */
-  synchronized void addDefault(final String flagKey, final Object value) {
-    if (flagKey == null) {
-      return;
-    }
-    if (defaults.containsKey(flagKey)) {
-      return; // first-wins
-    }
-    if (defaults.size() >= MAX_DEFAULTS) {
-      return;
+    /**
+     * Records a runtime-default value for {@code flagKey} (first-wins). Structured values (Map/List)
+     * are serialized to JSON (NOT {@code toString()}); the result is truncated to {@link
+     * #MAX_DEFAULT_VALUE_LENGTH}.
+     */
+    synchronized void addDefault(final String flagKey, final Object value) {
+        if (flagKey == null) {
+            return;
+        }
+        if (defaults.containsKey(flagKey)) {
+            return; // first-wins
+        }
+        if (defaults.size() >= MAX_DEFAULTS) {
+            return;
+        }
+        String valueStr = stringifyDefault(value);
+        if (valueStr.length() > MAX_DEFAULT_VALUE_LENGTH) {
+            valueStr = utf8SafeTruncate(valueStr, MAX_DEFAULT_VALUE_LENGTH);
+        }
+        defaults.put(flagKey, valueStr);
     }
-    String valueStr = stringifyDefault(value);
-    if (valueStr.length() > MAX_DEFAULT_VALUE_LENGTH) {
-      valueStr = utf8SafeTruncate(valueStr, MAX_DEFAULT_VALUE_LENGTH);
-    }
-    defaults.put(flagKey, valueStr);
-  }
-
-  /**
-   * @return true when there is at least one serial id or runtime default to write. Subjects are not
-   *     checked because a subject is never recorded without its serial id.
-   */
-  synchronized boolean hasData() {
-    return !serialIds.isEmpty() || !defaults.isEmpty();
-  }
 
-  /**
-   * Builds the {@code ffe_*} span tags from the accumulated state. Empty groups are omitted.
-   *
-   * @return a map of tag name to tag value (a subset of {@code ffe_flags_enc}, {@code
-   *     ffe_subjects_enc}, {@code ffe_runtime_defaults})
-   */
-  synchronized Map<String, String> toSpanTags() {
-    final Map<String, String> tags = new LinkedHashMap<>();
-    if (!serialIds.isEmpty()) {
-      final String encoded = ULeb128Encoder.encodeDeltaVarint(serialIds);
-      if (!encoded.isEmpty()) {
-        tags.put(TAG_FLAGS_ENC, encoded);
-      }
-    }
-    if (!subjects.isEmpty()) {
-      final Map<String, String> encodedSubjects = new LinkedHashMap<>();
-      for (final Map.Entry<String, TreeSet<Integer>> entry : subjects.entrySet()) {
-        encodedSubjects.put(entry.getKey(), ULeb128Encoder.encodeDeltaVarint(entry.getValue()));
-      }
-      tags.put(TAG_SUBJECTS_ENC, toJsonObject(encodedSubjects));
+    /**
+     * @return true when there is at least one serial id or runtime default to write. Subjects are not
+     *     checked because a subject is never recorded without its serial id.
+     */
+    synchronized boolean hasData() {
+        return !serialIds.isEmpty() || !defaults.isEmpty();
     }
-    if (!defaults.isEmpty()) {
-      tags.put(TAG_RUNTIME_DEFAULTS, toJsonObject(defaults));
+
+    /**
+     * Builds the {@code ffe_*} span tags from the accumulated state. Empty groups are omitted.
+     *
+     * @return a map of tag name to tag value (a subset of {@code ffe_flags_enc}, {@code
+     *     ffe_subjects_enc}, {@code ffe_runtime_defaults})
+     */
+    synchronized Map<String, String> toSpanTags() {
+        final Map<String, String> tags = new LinkedHashMap<>();
+        if (!serialIds.isEmpty()) {
+            final String encoded = ULeb128Encoder.encodeDeltaVarint(serialIds);
+            if (!encoded.isEmpty()) {
+                tags.put(TAG_FLAGS_ENC, encoded);
+            }
+        }
+        if (!subjects.isEmpty()) {
+            final Map<String, String> encodedSubjects = new LinkedHashMap<>();
+            for (final Map.Entry<String, TreeSet<Integer>> entry : subjects.entrySet()) {
+                encodedSubjects.put(entry.getKey(), ULeb128Encoder.encodeDeltaVarint(entry.getValue()));
+            }
+            tags.put(TAG_SUBJECTS_ENC, toJsonObject(encodedSubjects));
+        }
+        if (!defaults.isEmpty()) {
+            tags.put(TAG_RUNTIME_DEFAULTS, toJsonObject(defaults));
+        }
+        return tags;
     }
-    return tags;
-  }
 
-  // ---- helpers (visible for tests) ----
+    // ---- helpers (visible for tests) ----
 
-  /**
-   * Mirrors the Node {@code (typeof value === 'object' && value !== null) ? JSON.stringify(value) :
-   * String(value)} rule: structured values (Map/List/array) are JSON-stringified; scalars use their
-   * string form; {@code null} becomes the bare {@code null}.
-   *
-   * <p>The value has already been unwrapped to a native Java type by the capture side (any
-   * OpenFeature {@code Value} is converted to Map/List/scalar before the seam), so no OpenFeature
-   * type ever reaches here.
-   */
-  static String stringifyDefault(final Object value) {
-    if (value == null) {
-      return "null";
-    }
-    if (value instanceof Map || value instanceof Iterable || value.getClass().isArray()) {
-      return toJsonValue(value);
+    /**
+     * Mirrors the Node {@code (typeof value === 'object' && value !== null) ? JSON.stringify(value) :
+     * String(value)} rule: structured values (Map/List/array) are JSON-stringified; scalars use their
+     * string form; {@code null} becomes the bare {@code null}.
+     *
+     * <p>The value has already been unwrapped to a native Java type by the capture side (any
+     * OpenFeature {@code Value} is converted to Map/List/scalar before the seam), so no OpenFeature
+     * type ever reaches here.
+     */
+    static String stringifyDefault(final Object value) {
+        if (value == null) {
+            return "null";
+        }
+        if (value instanceof Map
+                || value instanceof Iterable
+                || value.getClass().isArray()) {
+            return toJsonValue(value);
+        }
+        if (value instanceof CharSequence || value instanceof Character) {
+            return value.toString();
+        }
+        // Numbers / booleans — their string form matches what Node's String(value) emits for these
+        // scalar cases.
+        return String.valueOf(value);
     }
-    if (value instanceof CharSequence || value instanceof Character) {
-      return value.toString();
-    }
-    // Numbers / booleans — their string form matches what Node's String(value) emits for these
-    // scalar cases.
-    return String.valueOf(value);
-  }
 
-  /** UTF-8-safe truncation: never split a surrogate pair at the {@code maxChars} boundary. */
-  static String utf8SafeTruncate(final String value, final int maxChars) {
-    if (value.length() <= maxChars) {
-      return value;
-    }
-    int end = maxChars;
-    if (Character.isHighSurrogate(value.charAt(end - 1))) {
-      end--; // drop the dangling high surrogate rather than emit a broken pair
+    /** UTF-8-safe truncation: never split a surrogate pair at the {@code maxChars} boundary. */
+    static String utf8SafeTruncate(final String value, final int maxChars) {
+        if (value.length() <= maxChars) {
+            return value;
+        }
+        int end = maxChars;
+        if (Character.isHighSurrogate(value.charAt(end - 1))) {
+            end--; // drop the dangling high surrogate rather than emit a broken pair
+        }
+        return value.substring(0, end);
     }
-    return value.substring(0, end);
-  }
 
-  /**
-   * Serializes a String-&gt;String map to a compact JSON object string using the platform {@link
-   * JsonWriter}.
-   *
-   * <p>Consumers of these tags parse them as JSON (the backend enricher via Jackson, the parametric
-   * system-tests via {@code json.loads}), so the writer's escaping (e.g. {@code /} → {@code \/},
-   * non-ASCII → {@code \\uXXXX}) is round-trip-equivalent and byte-parity with the JS reference is
-   * not required.
-   */
-  static String toJsonObject(final Map<String, String> map) {
-    try (JsonWriter writer = new JsonWriter()) {
-      writer.beginObject();
-      for (final Map.Entry<String, String> entry : map.entrySet()) {
-        writer.name(entry.getKey()).value(entry.getValue());
-      }
-      writer.endObject();
-      return writer.toString();
+    /**
+     * Serializes a String-&gt;String map to a compact JSON object string using the platform {@link
+     * JsonWriter}.
+     *
+     * <p>Consumers of these tags parse them as JSON (the backend enricher via Jackson, the parametric
+     * system-tests via {@code json.loads}), so the writer's escaping (e.g. {@code /} → {@code \/},
+     * non-ASCII → {@code \\uXXXX}) is round-trip-equivalent and byte-parity with the JS reference is
+     * not required.
+     */
+    static String toJsonObject(final Map<String, String> map) {
+        try (JsonWriter writer = new JsonWriter()) {
+            writer.beginObject();
+            for (final Map.Entry<String, String> entry : map.entrySet()) {
+                writer.name(entry.getKey()).value(entry.getValue());
+            }
+            writer.endObject();
+            return writer.toString();
+        }
     }
-  }
 
-  private static String toJsonValue(final Object value) {
-    try (JsonWriter writer = new JsonWriter()) {
-      writeJsonValue(writer, value);
-      return writer.toString();
+    private static String toJsonValue(final Object value) {
+        try (JsonWriter writer = new JsonWriter()) {
+            writeJsonValue(writer, value);
+            return writer.toString();
+        }
     }
-  }
 
-  @SuppressWarnings("unchecked")
-  private static void writeJsonValue(final JsonWriter writer, final Object value) {
-    // Callers pass values already unwrapped to native form by the capture side, so no OpenFeature
-    // Value ever reaches here.
-    if (value == null) {
-      writer.nullValue();
-    } else if (value instanceof Map) {
-      writer.beginObject();
-      for (final Map.Entry<?, ?> entry : ((Map<?, ?>) value).entrySet()) {
-        writer.name(String.valueOf(entry.getKey()));
-        writeJsonValue(writer, entry.getValue());
-      }
-      writer.endObject();
-    } else if (value instanceof Iterable) {
-      writer.beginArray();
-      for (final Object element : (Iterable<Object>) value) {
-        writeJsonValue(writer, element);
-      }
-      writer.endArray();
-    } else if (value instanceof Boolean) {
-      writer.value((Boolean) value);
-    } else if (value instanceof Integer
-        || value instanceof Long
-        || value instanceof Short
-        || value instanceof Byte) {
-      writer.value(((Number) value).longValue());
-    } else if (value instanceof Number) {
-      writer.value(((Number) value).doubleValue());
-    } else {
-      // CharSequence / Character / anything else → string form.
-      writer.value(value.toString());
+    @SuppressWarnings("unchecked")
+    private static void writeJsonValue(final JsonWriter writer, final Object value) {
+        // Callers pass values already unwrapped to native form by the capture side, so no OpenFeature
+        // Value ever reaches here.
+        if (value == null) {
+            writer.nullValue();
+        } else if (value instanceof Map) {
+            writer.beginObject();
+            for (final Map.Entry<?, ?> entry : ((Map<?, ?>) value).entrySet()) {
+                writer.name(String.valueOf(entry.getKey()));
+                writeJsonValue(writer, entry.getValue());
+            }
+            writer.endObject();
+        } else if (value instanceof Iterable) {
+            writer.beginArray();
+            for (final Object element : (Iterable<Object>) value) {
+                writeJsonValue(writer, element);
+            }
+            writer.endArray();
+        } else if (value instanceof Boolean) {
+            writer.value((Boolean) value);
+        } else if (value instanceof Integer
+                || value instanceof Long
+                || value instanceof Short
+                || value instanceof Byte) {
+            writer.value(((Number) value).longValue());
+        } else if (value instanceof Number) {
+            writer.value(((Number) value).doubleValue());
+        } else {
+            // CharSequence / Character / anything else → string form.
+            writer.value(value.toString());
+        }
     }
-  }
 
-  // ---- test-only accessors ----
+    // ---- test-only accessors ----
 
-  synchronized Set<Integer> serialIdsView() {
-    return new TreeSet<>(serialIds);
-  }
+    synchronized Set<Integer> serialIdsView() {
+        return new TreeSet<>(serialIds);
+    }
 
-  synchronized int subjectCount() {
-    return subjects.size();
-  }
+    synchronized int subjectCount() {
+        return subjects.size();
+    }
 
-  synchronized int defaultCount() {
-    return defaults.size();
-  }
+    synchronized int defaultCount() {
+        return defaults.size();
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/SpanEnrichmentInterceptor.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/SpanEnrichmentInterceptor.java
index a82e194e248..ccd4efb8c1c 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/SpanEnrichmentInterceptor.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/SpanEnrichmentInterceptor.java
@@ -46,88 +46,86 @@
  */
 final class SpanEnrichmentInterceptor implements TraceInterceptor {
 
-  private static final Logger log = LoggerFactory.getLogger(SpanEnrichmentInterceptor.class);
+    private static final Logger log = LoggerFactory.getLogger(SpanEnrichmentInterceptor.class);
 
-  /**
-   * Unique priority in the "trace data enrichment" band, after {@code GIT_METADATA} (3) and before
-   * the custom-sampling band ({@code Integer.MAX_VALUE - 2}). Distinct from every value in {@code
-   * AbstractTraceInterceptor.Priority} and from the CI Visibility interceptors.
-   */
-  static final int PRIORITY = 4;
+    /**
+     * Unique priority in the "trace data enrichment" band, after {@code GIT_METADATA} (3) and before
+     * the custom-sampling band ({@code Integer.MAX_VALUE - 2}). Distinct from every value in {@code
+     * AbstractTraceInterceptor.Priority} and from the CI Visibility interceptors.
+     */
+    static final int PRIORITY = 4;
 
-  private final SpanEnrichmentStates states;
+    private final SpanEnrichmentStates states;
 
-  SpanEnrichmentInterceptor(final SpanEnrichmentStates states) {
-    this.states = states;
-  }
+    SpanEnrichmentInterceptor(final SpanEnrichmentStates states) {
+        this.states = states;
+    }
 
-  @Override
-  public Collection<? extends MutableSpan> onTraceComplete(
-      final Collection<? extends MutableSpan> trace) {
-    try {
-      // Fast path: no accumulated state at all → skip the per-flush scan + lock entirely. This is
-      // the common case for services that never evaluate a flag on a given trace.
-      if (trace == null || trace.isEmpty() || states.isEmpty()) {
-        return trace;
-      }
-      // Resolve the local root for this fragment, then require that the root is actually PRESENT in
-      // this collection. A partial flush excludes the still-open root, so its absence means "not
-      // the final write" — keep the accumulator and bail.
-      final MutableSpan localRoot = findLocalRootInFragment(trace);
-      if (!(localRoot instanceof AgentSpan)) {
-        return trace; // partial flush, or no resolvable in-fragment root: keep state untouched
-      }
-      // Key by the local-root span object to match the capture-side keying.
-      final SpanEnrichmentAccumulator state = states.remove((AgentSpan) localRoot);
-      if (state == null || !state.hasData()) {
+    @Override
+    public Collection<? extends MutableSpan> onTraceComplete(final Collection<? extends MutableSpan> trace) {
+        try {
+            // Fast path: no accumulated state at all → skip the per-flush scan + lock entirely. This is
+            // the common case for services that never evaluate a flag on a given trace.
+            if (trace == null || trace.isEmpty() || states.isEmpty()) {
+                return trace;
+            }
+            // Resolve the local root for this fragment, then require that the root is actually PRESENT in
+            // this collection. A partial flush excludes the still-open root, so its absence means "not
+            // the final write" — keep the accumulator and bail.
+            final MutableSpan localRoot = findLocalRootInFragment(trace);
+            if (!(localRoot instanceof AgentSpan)) {
+                return trace; // partial flush, or no resolvable in-fragment root: keep state untouched
+            }
+            // Key by the local-root span object to match the capture-side keying.
+            final SpanEnrichmentAccumulator state = states.remove((AgentSpan) localRoot);
+            if (state == null || !state.hasData()) {
+                return trace;
+            }
+            // toSpanTags() only ever returns present, non-empty values, so write them directly.
+            for (final Map.Entry<String, String> tag : state.toSpanTags().entrySet()) {
+                localRoot.setTag(tag.getKey(), tag.getValue());
+            }
+        } catch (final Throwable t) {
+            // Never let span enrichment break trace finish; a debug line aids diagnosis if it does.
+            log.debug("Span-enrichment tag write failed", t);
+        }
         return trace;
-      }
-      // toSpanTags() only ever returns present, non-empty values, so write them directly.
-      for (final Map.Entry<String, String> tag : state.toSpanTags().entrySet()) {
-        localRoot.setTag(tag.getKey(), tag.getValue());
-      }
-    } catch (final Throwable t) {
-      // Never let span enrichment break trace finish; a debug line aids diagnosis if it does.
-      log.debug("Span-enrichment tag write failed", t);
     }
-    return trace;
-  }
 
-  /**
-   * Resolves the local root span for this fragment and returns it ONLY if it is actually present in
-   * the fragment by reference identity. Returns {@code null} when the root is not in the collection
-   * (a partial flush excludes the still-open root) or when no root can be safely identified.
-   *
-   * <p>We never guess: a non-root span is never returned. If the first span reports a non-null
-   * local root, we accept it only after confirming that exact object is in the fragment; otherwise
-   * we look for a span that is provably its own local root and present.
-   */
-  private static MutableSpan findLocalRootInFragment(
-      final Collection<? extends MutableSpan> trace) {
-    final MutableSpan first = trace.iterator().next();
-    final MutableSpan candidate = first.getLocalRootSpan();
-    if (candidate != null) {
-      // Accept the reported local root only if it is genuinely part of THIS fragment. On a partial
-      // flush the root is reachable by reference but NOT in the collection → reject (keep state).
-      for (final MutableSpan span : trace) {
-        if (span == candidate) {
-          return candidate;
+    /**
+     * Resolves the local root span for this fragment and returns it ONLY if it is actually present in
+     * the fragment by reference identity. Returns {@code null} when the root is not in the collection
+     * (a partial flush excludes the still-open root) or when no root can be safely identified.
+     *
+     * <p>We never guess: a non-root span is never returned. If the first span reports a non-null
+     * local root, we accept it only after confirming that exact object is in the fragment; otherwise
+     * we look for a span that is provably its own local root and present.
+     */
+    private static MutableSpan findLocalRootInFragment(final Collection<? extends MutableSpan> trace) {
+        final MutableSpan first = trace.iterator().next();
+        final MutableSpan candidate = first.getLocalRootSpan();
+        if (candidate != null) {
+            // Accept the reported local root only if it is genuinely part of THIS fragment. On a partial
+            // flush the root is reachable by reference but NOT in the collection → reject (keep state).
+            for (final MutableSpan span : trace) {
+                if (span == candidate) {
+                    return candidate;
+                }
+            }
+            return null; // root excluded from this fragment → partial flush, do not flush/remove
         }
-      }
-      return null; // root excluded from this fragment → partial flush, do not flush/remove
-    }
-    // Local root unknown for the first span: only accept a span that is provably its own local root
-    // and present here. Never fall back to an arbitrary span.
-    for (final MutableSpan span : trace) {
-      if (span.getLocalRootSpan() == span) {
-        return span;
-      }
+        // Local root unknown for the first span: only accept a span that is provably its own local root
+        // and present here. Never fall back to an arbitrary span.
+        for (final MutableSpan span : trace) {
+            if (span.getLocalRootSpan() == span) {
+                return span;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Override
-  public int priority() {
-    return PRIORITY;
-  }
+    @Override
+    public int priority() {
+        return PRIORITY;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/SpanEnrichmentStates.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/SpanEnrichmentStates.java
index 7231466cd1b..953bb06b0fc 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/SpanEnrichmentStates.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/SpanEnrichmentStates.java
@@ -28,42 +28,42 @@
  */
 final class SpanEnrichmentStates {
 
-  // Weak keys: the accumulator is GC'd with its local-root span, so a trace that never completes
-  // cannot leak. Identity-keyed by the local-root AgentSpan object. guarded by 'this'.
-  private final Map<AgentSpan, SpanEnrichmentAccumulator> states = new WeakHashMap<>();
+    // Weak keys: the accumulator is GC'd with its local-root span, so a trace that never completes
+    // cannot leak. Identity-keyed by the local-root AgentSpan object. guarded by 'this'.
+    private final Map<AgentSpan, SpanEnrichmentAccumulator> states = new WeakHashMap<>();
 
-  /** Returns the accumulator for {@code root}, creating (and inserting) it if absent. */
-  synchronized SpanEnrichmentAccumulator getOrCreate(final AgentSpan root) {
-    SpanEnrichmentAccumulator existing = states.get(root);
-    if (existing != null) {
-      return existing;
+    /** Returns the accumulator for {@code root}, creating (and inserting) it if absent. */
+    synchronized SpanEnrichmentAccumulator getOrCreate(final AgentSpan root) {
+        SpanEnrichmentAccumulator existing = states.get(root);
+        if (existing != null) {
+            return existing;
+        }
+        final SpanEnrichmentAccumulator created = new SpanEnrichmentAccumulator();
+        states.put(root, created);
+        return created;
     }
-    final SpanEnrichmentAccumulator created = new SpanEnrichmentAccumulator();
-    states.put(root, created);
-    return created;
-  }
 
-  /** Removes and returns the accumulator for {@code root}, or {@code null} if absent. */
-  synchronized SpanEnrichmentAccumulator remove(final AgentSpan root) {
-    return states.remove(root);
-  }
+    /** Removes and returns the accumulator for {@code root}, or {@code null} if absent. */
+    synchronized SpanEnrichmentAccumulator remove(final AgentSpan root) {
+        return states.remove(root);
+    }
 
-  /** Clears all tracked state (cleanup on shutdown). */
-  synchronized void clear() {
-    states.clear();
-  }
+    /** Clears all tracked state (cleanup on shutdown). */
+    synchronized void clear() {
+        states.clear();
+    }
 
-  synchronized int size() {
-    return states.size();
-  }
+    synchronized int size() {
+        return states.size();
+    }
 
-  synchronized boolean isEmpty() {
-    return states.isEmpty();
-  }
+    synchronized boolean isEmpty() {
+        return states.isEmpty();
+    }
 
-  // ---- test-only accessor ----
+    // ---- test-only accessor ----
 
-  synchronized SpanEnrichmentAccumulator peek(final AgentSpan root) {
-    return states.get(root);
-  }
+    synchronized SpanEnrichmentAccumulator peek(final AgentSpan root) {
+        return states.get(root);
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/SpanEnrichmentWriter.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/SpanEnrichmentWriter.java
index f97259d9368..ae889d0506f 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/SpanEnrichmentWriter.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/SpanEnrichmentWriter.java
@@ -32,166 +32,163 @@
  *
  * <p>All work is wrapped in try/catch — enrichment must NEVER break flag evaluation.
  */
-public final class SpanEnrichmentWriter
-    implements FeatureFlaggingGateway.SpanEnrichmentListener, AutoCloseable {
-
-  private static final Logger log = LoggerFactory.getLogger(SpanEnrichmentWriter.class);
-
-  public static SpanEnrichmentWriter getInstance() {
-    return SingletonHolder.INSTANCE;
-  }
-
-  /**
-   * Resolves the local-root span for the active trace. Injectable so tests need no static mocks.
-   */
-  interface RootSpanResolver {
-    AgentSpan activeLocalRoot();
-  }
-
-  /**
-   * Registers the interceptor with the tracer, returning {@code true} when accepted. Injectable so
-   * tests are deterministic without a globally-installed tracer.
-   */
-  interface InterceptorRegistrar {
-    boolean register(SpanEnrichmentInterceptor interceptor);
-  }
-
-  private static final RootSpanResolver DEFAULT_RESOLVER =
-      () -> resolveLocalRoot(AgentTracer.activeSpan());
-
-  // Visible for tests: the local-root resolution, decoupled from the static AgentTracer so it can
-  // be exercised without a live tracer.
-  static AgentSpan resolveLocalRoot(final AgentSpan active) {
-    if (active == null) {
-      return null;
-    }
-    final AgentSpan localRoot = active.getLocalRootSpan();
-    return localRoot != null ? localRoot : active;
-  }
-
-  private static final InterceptorRegistrar DEFAULT_REGISTRAR =
-      interceptor -> GlobalTracer.get().addTraceInterceptor(interceptor);
-
-  private static final class SingletonHolder {
-    // Persisting this instance across FeatureFlaggingSystem start/stop keeps the single registered
-    // interceptor (and its state) alive, so a restart never re-registers.
-    private static final SpanEnrichmentWriter INSTANCE = new SpanEnrichmentWriter();
-  }
-
-  private final RootSpanResolver rootSpanResolver;
-  private final InterceptorRegistrar registrar;
-  private final SpanEnrichmentStates states;
-  private final SpanEnrichmentInterceptor interceptor;
-  // Registered with the tracer at most once, lazily on the first enrichment event with an active
-  // span. Once true it stays true for the life of this instance, so a subsystem restart (which
-  // reuses the singleton) never attempts a second, doomed registration.
-  private final AtomicBoolean interceptorRegistered = new AtomicBoolean(false);
-
-  private SpanEnrichmentWriter() {
-    this(DEFAULT_RESOLVER, DEFAULT_REGISTRAR);
-  }
-
-  // Visible for tests: an isolated writer (own state + interceptor) whose interceptor registration
-  // is assumed to succeed, bypassing the shared INSTANCE and any globally-installed tracer.
-  SpanEnrichmentWriter(final RootSpanResolver rootSpanResolver) {
-    this(rootSpanResolver, interceptor -> true);
-  }
-
-  // Visible for tests: also inject the registrar to exercise the not-registered path.
-  SpanEnrichmentWriter(
-      final RootSpanResolver rootSpanResolver, final InterceptorRegistrar registrar) {
-    this.rootSpanResolver = rootSpanResolver;
-    this.registrar = registrar;
-    this.states = new SpanEnrichmentStates();
-    this.interceptor = new SpanEnrichmentInterceptor(states);
-  }
-
-  /** Starts listening for enrichment events. Safe to call again after {@link #close()}. */
-  public void init() {
-    FeatureFlaggingGateway.addSpanEnrichmentListener(this);
-  }
-
-  /**
-   * Stops listening and drops any residual state. The interceptor stays registered with the tracer
-   * (it cannot be removed) but goes inert while the state is empty; a later {@link #init()} resumes
-   * enrichment on the same interceptor.
-   */
-  public void close() {
-    FeatureFlaggingGateway.removeSpanEnrichmentListener(this);
-    states.clear();
-  }
-
-  @Override
-  public void accept(final SpanEnrichmentEvent event) {
-    if (event == null) {
-      return;
-    }
-    try {
-      final AgentSpan root = rootSpanResolver.activeLocalRoot();
-      if (root == null) {
-        return; // no active span → nothing to enrich (and nothing to register the interceptor for)
-      }
-      if (!ensureInterceptorRegistered()) {
-        // The interceptor isn't registered (e.g. tracer absent), so nothing would ever flush this
-        // state — skip accumulating. A later event retries registration.
-        return;
-      }
-      final SpanEnrichmentAccumulator state = states.getOrCreate(root);
-      if (event.hasSerialId()) {
-        final int serialId = event.serialId();
-        state.addSerialId(serialId);
-        if (event.doLog() && event.targetingKey() != null) {
-          state.addSubject(event.targetingKey(), serialId);
+public final class SpanEnrichmentWriter implements FeatureFlaggingGateway.SpanEnrichmentListener, AutoCloseable {
+
+    private static final Logger log = LoggerFactory.getLogger(SpanEnrichmentWriter.class);
+
+    public static SpanEnrichmentWriter getInstance() {
+        return SingletonHolder.INSTANCE;
+    }
+
+    /**
+     * Resolves the local-root span for the active trace. Injectable so tests need no static mocks.
+     */
+    interface RootSpanResolver {
+        AgentSpan activeLocalRoot();
+    }
+
+    /**
+     * Registers the interceptor with the tracer, returning {@code true} when accepted. Injectable so
+     * tests are deterministic without a globally-installed tracer.
+     */
+    interface InterceptorRegistrar {
+        boolean register(SpanEnrichmentInterceptor interceptor);
+    }
+
+    private static final RootSpanResolver DEFAULT_RESOLVER = () -> resolveLocalRoot(AgentTracer.activeSpan());
+
+    // Visible for tests: the local-root resolution, decoupled from the static AgentTracer so it can
+    // be exercised without a live tracer.
+    static AgentSpan resolveLocalRoot(final AgentSpan active) {
+        if (active == null) {
+            return null;
         }
-      } else if (event.flagKey() != null) {
-        state.addDefault(event.flagKey(), event.defaultValue());
-      }
-    } catch (final Throwable t) {
-      // Never let span enrichment break flag evaluation; a debug line aids diagnosis if it does.
-      log.debug("Span-enrichment accumulation failed", t);
-    }
-  }
-
-  /**
-   * @return true once the interceptor is registered with the tracer.
-   */
-  private boolean ensureInterceptorRegistered() {
-    if (interceptorRegistered.get()) {
-      return true;
-    }
-    synchronized (this) {
-      if (interceptorRegistered.get()) {
-        return true;
-      }
-      try {
-        // register() returns false (without throwing) when the tracer rejects it — e.g. the global
-        // tracer is still the no-op placeholder. Only latch on success so a later event retries;
-        // otherwise a transient false would permanently disable enrichment.
-        if (registrar.register(interceptor)) {
-          interceptorRegistered.set(true);
+        final AgentSpan localRoot = active.getLocalRootSpan();
+        return localRoot != null ? localRoot : active;
+    }
+
+    private static final InterceptorRegistrar DEFAULT_REGISTRAR =
+            interceptor -> GlobalTracer.get().addTraceInterceptor(interceptor);
+
+    private static final class SingletonHolder {
+        // Persisting this instance across FeatureFlaggingSystem start/stop keeps the single registered
+        // interceptor (and its state) alive, so a restart never re-registers.
+        private static final SpanEnrichmentWriter INSTANCE = new SpanEnrichmentWriter();
+    }
+
+    private final RootSpanResolver rootSpanResolver;
+    private final InterceptorRegistrar registrar;
+    private final SpanEnrichmentStates states;
+    private final SpanEnrichmentInterceptor interceptor;
+    // Registered with the tracer at most once, lazily on the first enrichment event with an active
+    // span. Once true it stays true for the life of this instance, so a subsystem restart (which
+    // reuses the singleton) never attempts a second, doomed registration.
+    private final AtomicBoolean interceptorRegistered = new AtomicBoolean(false);
+
+    private SpanEnrichmentWriter() {
+        this(DEFAULT_RESOLVER, DEFAULT_REGISTRAR);
+    }
+
+    // Visible for tests: an isolated writer (own state + interceptor) whose interceptor registration
+    // is assumed to succeed, bypassing the shared INSTANCE and any globally-installed tracer.
+    SpanEnrichmentWriter(final RootSpanResolver rootSpanResolver) {
+        this(rootSpanResolver, interceptor -> true);
+    }
+
+    // Visible for tests: also inject the registrar to exercise the not-registered path.
+    SpanEnrichmentWriter(final RootSpanResolver rootSpanResolver, final InterceptorRegistrar registrar) {
+        this.rootSpanResolver = rootSpanResolver;
+        this.registrar = registrar;
+        this.states = new SpanEnrichmentStates();
+        this.interceptor = new SpanEnrichmentInterceptor(states);
+    }
+
+    /** Starts listening for enrichment events. Safe to call again after {@link #close()}. */
+    public void init() {
+        FeatureFlaggingGateway.addSpanEnrichmentListener(this);
+    }
+
+    /**
+     * Stops listening and drops any residual state. The interceptor stays registered with the tracer
+     * (it cannot be removed) but goes inert while the state is empty; a later {@link #init()} resumes
+     * enrichment on the same interceptor.
+     */
+    public void close() {
+        FeatureFlaggingGateway.removeSpanEnrichmentListener(this);
+        states.clear();
+    }
+
+    @Override
+    public void accept(final SpanEnrichmentEvent event) {
+        if (event == null) {
+            return;
+        }
+        try {
+            final AgentSpan root = rootSpanResolver.activeLocalRoot();
+            if (root == null) {
+                return; // no active span → nothing to enrich (and nothing to register the interceptor for)
+            }
+            if (!ensureInterceptorRegistered()) {
+                // The interceptor isn't registered (e.g. tracer absent), so nothing would ever flush this
+                // state — skip accumulating. A later event retries registration.
+                return;
+            }
+            final SpanEnrichmentAccumulator state = states.getOrCreate(root);
+            if (event.hasSerialId()) {
+                final int serialId = event.serialId();
+                state.addSerialId(serialId);
+                if (event.doLog() && event.targetingKey() != null) {
+                    state.addSubject(event.targetingKey(), serialId);
+                }
+            } else if (event.flagKey() != null) {
+                state.addDefault(event.flagKey(), event.defaultValue());
+            }
+        } catch (final Throwable t) {
+            // Never let span enrichment break flag evaluation; a debug line aids diagnosis if it does.
+            log.debug("Span-enrichment accumulation failed", t);
         }
-      } catch (final Throwable t) {
-        // Leave unregistered; a later event retries.
-      }
-      return interceptorRegistered.get();
     }
-  }
 
-  // ---- test-only accessors ----
+    /**
+     * @return true once the interceptor is registered with the tracer.
+     */
+    private boolean ensureInterceptorRegistered() {
+        if (interceptorRegistered.get()) {
+            return true;
+        }
+        synchronized (this) {
+            if (interceptorRegistered.get()) {
+                return true;
+            }
+            try {
+                // register() returns false (without throwing) when the tracer rejects it — e.g. the global
+                // tracer is still the no-op placeholder. Only latch on success so a later event retries;
+                // otherwise a transient false would permanently disable enrichment.
+                if (registrar.register(interceptor)) {
+                    interceptorRegistered.set(true);
+                }
+            } catch (final Throwable t) {
+                // Leave unregistered; a later event retries.
+            }
+            return interceptorRegistered.get();
+        }
+    }
+
+    // ---- test-only accessors ----
 
-  SpanEnrichmentStates states() {
-    return states;
-  }
+    SpanEnrichmentStates states() {
+        return states;
+    }
 
-  SpanEnrichmentInterceptor interceptor() {
-    return interceptor;
-  }
+    SpanEnrichmentInterceptor interceptor() {
+        return interceptor;
+    }
 
-  RootSpanResolver rootSpanResolver() {
-    return rootSpanResolver;
-  }
+    RootSpanResolver rootSpanResolver() {
+        return rootSpanResolver;
+    }
 
-  InterceptorRegistrar registrar() {
-    return registrar;
-  }
+    InterceptorRegistrar registrar() {
+        return registrar;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ULeb128Encoder.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ULeb128Encoder.java
index 7566cf8698d..79bb133ea22 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ULeb128Encoder.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ULeb128Encoder.java
@@ -24,74 +24,71 @@
  */
 final class ULeb128Encoder {
 
-  private ULeb128Encoder() {}
+    private ULeb128Encoder() {}
 
-  /**
-   * ULEB128 delta-varint encodes the given serial ids into a bare base64 string.
-   *
-   * @param serialIds the serial ids to encode (deduped + sorted ascending internally)
-   * @return the base64-encoded delta-varint bytes, or the empty string when {@code serialIds} is
-   *     empty or null
-   */
-  static String encodeDeltaVarint(final Set<Integer> serialIds) {
-    if (serialIds == null || serialIds.isEmpty()) {
-      // Empty set encodes to the empty string; the caller omits the tag.
-      return "";
-    }
-    final SortedSet<Integer> sorted =
-        serialIds instanceof SortedSet ? (SortedSet<Integer>) serialIds : new TreeSet<>(serialIds);
-    // Worst case: 5 bytes per 32-bit varint.
-    final byte[] buffer = new byte[sorted.size() * 5];
-    int length = 0;
-    int previous = 0;
-    for (final Integer id : sorted) {
-      long delta =
-          ((long) id) - previous; // long to stay safe; deltas are non-negative (sorted asc)
-      previous = id;
-      while (delta > 0x7FL) {
-        buffer[length++] = (byte) ((delta & 0x7FL) | 0x80L);
-        delta >>>= 7;
-      }
-      buffer[length++] = (byte) (delta & 0x7FL);
+    /**
+     * ULEB128 delta-varint encodes the given serial ids into a bare base64 string.
+     *
+     * @param serialIds the serial ids to encode (deduped + sorted ascending internally)
+     * @return the base64-encoded delta-varint bytes, or the empty string when {@code serialIds} is
+     *     empty or null
+     */
+    static String encodeDeltaVarint(final Set<Integer> serialIds) {
+        if (serialIds == null || serialIds.isEmpty()) {
+            // Empty set encodes to the empty string; the caller omits the tag.
+            return "";
+        }
+        final SortedSet<Integer> sorted =
+                serialIds instanceof SortedSet ? (SortedSet<Integer>) serialIds : new TreeSet<>(serialIds);
+        // Worst case: 5 bytes per 32-bit varint.
+        final byte[] buffer = new byte[sorted.size() * 5];
+        int length = 0;
+        int previous = 0;
+        for (final Integer id : sorted) {
+            long delta = ((long) id) - previous; // long to stay safe; deltas are non-negative (sorted asc)
+            previous = id;
+            while (delta > 0x7FL) {
+                buffer[length++] = (byte) ((delta & 0x7FL) | 0x80L);
+                delta >>>= 7;
+            }
+            buffer[length++] = (byte) (delta & 0x7FL);
+        }
+        final byte[] out = new byte[length];
+        System.arraycopy(buffer, 0, out, 0, length);
+        return Base64.getEncoder().encodeToString(out);
     }
-    final byte[] out = new byte[length];
-    System.arraycopy(buffer, 0, out, 0, length);
-    return Base64.getEncoder().encodeToString(out);
-  }
 
-  /**
-   * Lower-case hex SHA-256 of the given string. Used to hash subject targeting keys before they are
-   * emitted (privacy: subject keys are never emitted in clear text).
-   *
-   * @param value the value to hash
-   * @return the lower-case hex SHA-256 digest
-   */
-  static String hashTargetingKey(final String value) {
-    final MessageDigest digest = SHA_256.get();
-    digest.reset();
-    final byte[] hash = digest.digest(value.getBytes(StandardCharsets.UTF_8));
-    final StringBuilder hex = new StringBuilder(hash.length * 2);
-    for (final byte b : hash) {
-      final int v = b & 0xFF;
-      if (v < 0x10) {
-        hex.append('0');
-      }
-      hex.append(Integer.toHexString(v));
+    /**
+     * Lower-case hex SHA-256 of the given string. Used to hash subject targeting keys before they are
+     * emitted (privacy: subject keys are never emitted in clear text).
+     *
+     * @param value the value to hash
+     * @return the lower-case hex SHA-256 digest
+     */
+    static String hashTargetingKey(final String value) {
+        final MessageDigest digest = SHA_256.get();
+        digest.reset();
+        final byte[] hash = digest.digest(value.getBytes(StandardCharsets.UTF_8));
+        final StringBuilder hex = new StringBuilder(hash.length * 2);
+        for (final byte b : hash) {
+            final int v = b & 0xFF;
+            if (v < 0x10) {
+                hex.append('0');
+            }
+            hex.append(Integer.toHexString(v));
+        }
+        return hex.toString();
     }
-    return hex.toString();
-  }
 
-  // Per-thread SHA-256 instance: hashing runs on every doLog=true subject capture, so a
-  // ThreadLocal avoids a provider lookup + allocation per call on that hot path. digest() resets
-  // the instance after each hash; we also reset() defensively before use.
-  private static final ThreadLocal<MessageDigest> SHA_256 =
-      ThreadLocal.withInitial(
-          () -> {
-            try {
-              return MessageDigest.getInstance("SHA-256");
-            } catch (final NoSuchAlgorithmException e) {
-              // SHA-256 is mandated by the JLS on every JVM; unreachable in practice.
-              throw new IllegalStateException("SHA-256 algorithm not available", e);
-            }
-          });
+    // Per-thread SHA-256 instance: hashing runs on every doLog=true subject capture, so a
+    // ThreadLocal avoids a provider lookup + allocation per call on that hot path. digest() resets
+    // the instance after each hash; we also reset() defensively before use.
+    private static final ThreadLocal<MessageDigest> SHA_256 = ThreadLocal.withInitial(() -> {
+        try {
+            return MessageDigest.getInstance("SHA-256");
+        } catch (final NoSuchAlgorithmException e) {
+            // SHA-256 is mandated by the JLS on every JVM; unreachable in practice.
+            throw new IllegalStateException("SHA-256 algorithm not available", e);
+        }
+    });
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/UniversalFlagConfigParser.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/UniversalFlagConfigParser.java
index 9778d980179..920ed8647b5 100644
--- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/UniversalFlagConfigParser.java
+++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/UniversalFlagConfigParser.java
@@ -36,488 +36,469 @@
 
 final class UniversalFlagConfigParser implements ConfigurationDeserializer<ServerConfiguration> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(UniversalFlagConfigParser.class);
-
-  static final String INVALID_FLAG = "invalid_flag";
-  static final String INVALID_SEMVER_COMPARAND = "invalid_semver_comparand";
-  private static final long MAX_UNSIGNED_INT = 0xffff_ffffL;
-
-  /**
-   * Side-channel for tracking flags that failed semver comparand validation during parsing. Cleared
-   * and populated by {@link #parse(JsonReader)} so that {@link ServerConfiguration#invalidFlags}
-   * can be set after the Moshi adapter returns.
-   */
-  static final ThreadLocal<Map<String, String>> INVALID_FLAGS_HOLDER =
-      ThreadLocal.withInitial(HashMap::new);
-
-  static final UniversalFlagConfigParser INSTANCE = new UniversalFlagConfigParser();
-
-  private static final Moshi MOSHI =
-      new Moshi.Builder()
-          .add(Instant.class, new InstantAdapter())
-          .add(ShardAdapter.FACTORY)
-          .add(AllocationAdapter.FACTORY)
-          .add(FlagMapAdapter.FACTORY)
-          .add(LenientBooleanAdapter.FACTORY)
-          .build();
-  private static final JsonAdapter<ServerConfiguration> V1_ADAPTER =
-      MOSHI.adapter(ServerConfiguration.class);
-
-  private UniversalFlagConfigParser() {}
-
-  @Override
-  public ServerConfiguration deserialize(final byte[] content) throws IOException {
-    try (BufferedSource source = Okio.buffer(Okio.source(new ByteArrayInputStream(content)))) {
-      final JsonReader reader = JsonReader.of(source);
-      final ServerConfiguration configuration = parse(reader);
-      requireEndOfDocument(reader);
-      return configuration;
-    }
-  }
-
-  @Nullable
-  ServerConfiguration parse(final JsonReader reader) throws IOException {
-    INVALID_FLAGS_HOLDER.get().clear();
-    final ServerConfiguration configuration = V1_ADAPTER.fromJson(reader);
-    if (configuration != null) {
-      final Map<String, String> invalid = new HashMap<>(INVALID_FLAGS_HOLDER.get());
-      if (!invalid.isEmpty()) {
-        configuration.invalidFlags = invalid;
-      }
-    }
-    INVALID_FLAGS_HOLDER.get().clear();
-    return configuration;
-  }
-
-  private static void requireEndOfDocument(final JsonReader reader) throws IOException {
-    // A strict JsonReader throws if another top-level value follows the parsed document.
-    reader.peek();
-  }
-
-  /** Converts a UFC uint32 wire value to its binary-compatible int representation. */
-  private static int toUnsignedInt(@Nullable final Long value, final String fieldName) {
-    if (value == null) {
-      return 0;
+    private static final Logger LOGGER = LoggerFactory.getLogger(UniversalFlagConfigParser.class);
+
+    static final String INVALID_FLAG = "invalid_flag";
+    static final String INVALID_SEMVER_COMPARAND = "invalid_semver_comparand";
+    private static final long MAX_UNSIGNED_INT = 0xffff_ffffL;
+
+    /**
+     * Side-channel for tracking flags that failed semver comparand validation during parsing. Cleared
+     * and populated by {@link #parse(JsonReader)} so that {@link ServerConfiguration#invalidFlags}
+     * can be set after the Moshi adapter returns.
+     */
+    static final ThreadLocal<Map<String, String>> INVALID_FLAGS_HOLDER = ThreadLocal.withInitial(HashMap::new);
+
+    static final UniversalFlagConfigParser INSTANCE = new UniversalFlagConfigParser();
+
+    private static final Moshi MOSHI = new Moshi.Builder()
+            .add(Instant.class, new InstantAdapter())
+            .add(ShardAdapter.FACTORY)
+            .add(AllocationAdapter.FACTORY)
+            .add(FlagMapAdapter.FACTORY)
+            .add(LenientBooleanAdapter.FACTORY)
+            .build();
+    private static final JsonAdapter<ServerConfiguration> V1_ADAPTER = MOSHI.adapter(ServerConfiguration.class);
+
+    private UniversalFlagConfigParser() {}
+
+    @Override
+    public ServerConfiguration deserialize(final byte[] content) throws IOException {
+        try (BufferedSource source = Okio.buffer(Okio.source(new ByteArrayInputStream(content)))) {
+            final JsonReader reader = JsonReader.of(source);
+            final ServerConfiguration configuration = parse(reader);
+            requireEndOfDocument(reader);
+            return configuration;
+        }
     }
-    if (value < 0 || value > MAX_UNSIGNED_INT) {
-      throw new InvalidFlagException("flag contains an invalid " + fieldName + " value");
+
+    @Nullable
+    ServerConfiguration parse(final JsonReader reader) throws IOException {
+        INVALID_FLAGS_HOLDER.get().clear();
+        final ServerConfiguration configuration = V1_ADAPTER.fromJson(reader);
+        if (configuration != null) {
+            final Map<String, String> invalid = new HashMap<>(INVALID_FLAGS_HOLDER.get());
+            if (!invalid.isEmpty()) {
+                configuration.invalidFlags = invalid;
+            }
+        }
+        INVALID_FLAGS_HOLDER.get().clear();
+        return configuration;
     }
-    return value.intValue();
-  }
 
-  /** Validates the required nested UFC fields and SemVer comparands for a flag. */
-  private static void validateFlag(final String flagKey, final Flag flag) {
-    if (flag.allocations == null) {
-      return;
+    private static void requireEndOfDocument(final JsonReader reader) throws IOException {
+        // A strict JsonReader throws if another top-level value follows the parsed document.
+        reader.peek();
     }
-    for (final Allocation allocation : flag.allocations) {
-      if (allocation == null) {
-        continue;
-      }
-      validateConditionOperands(flagKey, allocation);
-      if (allocation.splits == null) {
-        continue;
-      }
-      for (final Split split : allocation.splits) {
-        if (split == null) {
-          continue;
-        }
-        if (split.shards == null) {
-          throw new InvalidFlagException(
-              "flag \"" + flagKey + "\" contains a split with missing shards");
+
+    /** Converts a UFC uint32 wire value to its binary-compatible int representation. */
+    private static int toUnsignedInt(@Nullable final Long value, final String fieldName) {
+        if (value == null) {
+            return 0;
         }
-        for (final Shard shard : split.shards) {
-          if (shard == null
-              || Integer.toUnsignedLong(shard.totalShards) == 0
-              || shard.ranges == null) {
-            throw new InvalidFlagException("flag \"" + flagKey + "\" contains invalid shards");
-          }
-          for (final ShardRange range : shard.ranges) {
-            if (range == null) {
-              throw new InvalidFlagException(
-                  "flag \"" + flagKey + "\" contains an invalid shard range");
-            }
-          }
+        if (value < 0 || value > MAX_UNSIGNED_INT) {
+            throw new InvalidFlagException("flag contains an invalid " + fieldName + " value");
         }
-      }
+        return value.intValue();
     }
-    validateAndCacheSemverComparands(flagKey, flag);
-  }
 
-  private static void validateConditionOperands(final String flagKey, final Allocation allocation) {
-    if (allocation.rules == null) {
-      return;
-    }
-    for (final Rule rule : allocation.rules) {
-      if (rule == null || rule.conditions == null) {
-        continue;
-      }
-      for (final ConditionConfiguration condition : rule.conditions) {
-        if (condition == null || condition.operator == null) {
-          continue;
+    /** Validates the required nested UFC fields and SemVer comparands for a flag. */
+    private static void validateFlag(final String flagKey, final Flag flag) {
+        if (flag.allocations == null) {
+            return;
         }
-        switch (condition.operator) {
-          case LT:
-          case LTE:
-          case GT:
-          case GTE:
-            if (!(condition.value instanceof Number)) {
-              throw new InvalidFlagException(
-                  "flag \"" + flagKey + "\" has a non-numeric condition");
+        for (final Allocation allocation : flag.allocations) {
+            if (allocation == null) {
+                continue;
             }
-            break;
-          case ONE_OF:
-          case NOT_ONE_OF:
-            if (!(condition.value instanceof List)) {
-              throw new InvalidFlagException("flag \"" + flagKey + "\" has a non-list condition");
+            validateConditionOperands(flagKey, allocation);
+            if (allocation.splits == null) {
+                continue;
             }
-            break;
-          case IS_NULL:
-            if (!(condition.value instanceof Boolean)) {
-              throw new InvalidFlagException(
-                  "flag \"" + flagKey + "\" has a non-boolean condition");
+            for (final Split split : allocation.splits) {
+                if (split == null) {
+                    continue;
+                }
+                if (split.shards == null) {
+                    throw new InvalidFlagException("flag \"" + flagKey + "\" contains a split with missing shards");
+                }
+                for (final Shard shard : split.shards) {
+                    if (shard == null || Integer.toUnsignedLong(shard.totalShards) == 0 || shard.ranges == null) {
+                        throw new InvalidFlagException("flag \"" + flagKey + "\" contains invalid shards");
+                    }
+                    for (final ShardRange range : shard.ranges) {
+                        if (range == null) {
+                            throw new InvalidFlagException("flag \"" + flagKey + "\" contains an invalid shard range");
+                        }
+                    }
+                }
             }
-            break;
-          default:
-            break;
         }
-      }
+        validateAndCacheSemverComparands(flagKey, flag);
     }
-  }
-
-  /**
-   * Validates and caches SemVer comparands for all SEMVER_* conditions in a flag. Throws {@link
-   * InvalidSemverComparandException} if any condition has an invalid or non-string comparand value.
-   */
-  private static void validateAndCacheSemverComparands(final String flagKey, final Flag flag) {
-    if (flag.allocations == null) {
-      return;
+
+    private static void validateConditionOperands(final String flagKey, final Allocation allocation) {
+        if (allocation.rules == null) {
+            return;
+        }
+        for (final Rule rule : allocation.rules) {
+            if (rule == null || rule.conditions == null) {
+                continue;
+            }
+            for (final ConditionConfiguration condition : rule.conditions) {
+                if (condition == null || condition.operator == null) {
+                    continue;
+                }
+                switch (condition.operator) {
+                    case LT:
+                    case LTE:
+                    case GT:
+                    case GTE:
+                        if (!(condition.value instanceof Number)) {
+                            throw new InvalidFlagException("flag \"" + flagKey + "\" has a non-numeric condition");
+                        }
+                        break;
+                    case ONE_OF:
+                    case NOT_ONE_OF:
+                        if (!(condition.value instanceof List)) {
+                            throw new InvalidFlagException("flag \"" + flagKey + "\" has a non-list condition");
+                        }
+                        break;
+                    case IS_NULL:
+                        if (!(condition.value instanceof Boolean)) {
+                            throw new InvalidFlagException("flag \"" + flagKey + "\" has a non-boolean condition");
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
     }
-    for (int allocIdx = 0; allocIdx < flag.allocations.size(); allocIdx++) {
-      final Allocation allocation = flag.allocations.get(allocIdx);
-      if (allocation.rules == null) {
-        continue;
-      }
-      for (final Rule rule : allocation.rules) {
-        if (rule.conditions == null) {
-          continue;
+
+    /**
+     * Validates and caches SemVer comparands for all SEMVER_* conditions in a flag. Throws {@link
+     * InvalidSemverComparandException} if any condition has an invalid or non-string comparand value.
+     */
+    private static void validateAndCacheSemverComparands(final String flagKey, final Flag flag) {
+        if (flag.allocations == null) {
+            return;
         }
-        for (final ConditionConfiguration condition : rule.conditions) {
-          if (condition.operator == null) {
-            continue;
-          }
-          switch (condition.operator) {
-            case SEMVER_EQ:
-            case SEMVER_NEQ:
-            case SEMVER_LT:
-            case SEMVER_LTE:
-            case SEMVER_GT:
-            case SEMVER_GTE:
-              if (!(condition.value instanceof String)) {
-                throw new InvalidSemverComparandException(
-                    "flag \""
-                        + flagKey
-                        + "\" allocation "
-                        + allocIdx
-                        + " rule has condition with operator \""
-                        + condition.operator
-                        + "\" that requires string value");
-              }
-              final ParsedSemver parsed = ParsedSemver.parse((String) condition.value);
-              if (parsed == null) {
-                throw new InvalidSemverComparandException(
-                    "flag \""
-                        + flagKey
-                        + "\" allocation "
-                        + allocIdx
-                        + " rule has condition with operator \""
-                        + condition.operator
-                        + "\" and invalid semantic version \""
-                        + condition.value
-                        + "\"");
-              }
-              condition.semverComparand = parsed;
-              break;
-            default:
-              // Non-semver operators are not validated here
-              break;
-          }
+        for (int allocIdx = 0; allocIdx < flag.allocations.size(); allocIdx++) {
+            final Allocation allocation = flag.allocations.get(allocIdx);
+            if (allocation.rules == null) {
+                continue;
+            }
+            for (final Rule rule : allocation.rules) {
+                if (rule.conditions == null) {
+                    continue;
+                }
+                for (final ConditionConfiguration condition : rule.conditions) {
+                    if (condition.operator == null) {
+                        continue;
+                    }
+                    switch (condition.operator) {
+                        case SEMVER_EQ:
+                        case SEMVER_NEQ:
+                        case SEMVER_LT:
+                        case SEMVER_LTE:
+                        case SEMVER_GT:
+                        case SEMVER_GTE:
+                            if (!(condition.value instanceof String)) {
+                                throw new InvalidSemverComparandException("flag \""
+                                        + flagKey
+                                        + "\" allocation "
+                                        + allocIdx
+                                        + " rule has condition with operator \""
+                                        + condition.operator
+                                        + "\" that requires string value");
+                            }
+                            final ParsedSemver parsed = ParsedSemver.parse((String) condition.value);
+                            if (parsed == null) {
+                                throw new InvalidSemverComparandException("flag \""
+                                        + flagKey
+                                        + "\" allocation "
+                                        + allocIdx
+                                        + " rule has condition with operator \""
+                                        + condition.operator
+                                        + "\" and invalid semantic version \""
+                                        + condition.value
+                                        + "\"");
+                            }
+                            condition.semverComparand = parsed;
+                            break;
+                        default:
+                            // Non-semver operators are not validated here
+                            break;
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  /** Thrown when a flag has an invalid UFC shape. */
-  static final class InvalidFlagException extends IllegalArgumentException {
-    InvalidFlagException(final String message) {
-      super(message);
+    /** Thrown when a flag has an invalid UFC shape. */
+    static final class InvalidFlagException extends IllegalArgumentException {
+        InvalidFlagException(final String message) {
+            super(message);
+        }
     }
-  }
 
-  /** Thrown when a SEMVER_* condition has an invalid or non-string comparand value. */
-  static final class InvalidSemverComparandException extends IllegalArgumentException {
-    InvalidSemverComparandException(final String message) {
-      super(message);
+    /** Thrown when a SEMVER_* condition has an invalid or non-string comparand value. */
+    static final class InvalidSemverComparandException extends IllegalArgumentException {
+        InvalidSemverComparandException(final String message) {
+            super(message);
+        }
     }
-  }
-
-  /**
-   * Reads UFC uint32 shard fields through Long first, then preserves the bootstrap model's int ABI
-   * by storing the accepted value as its two's-complement bit pattern.
-   */
-  static final class ShardAdapter extends JsonAdapter<Shard> {
-
-    static final Factory FACTORY =
-        new Factory() {
-          @Nullable
-          @Override
-          public JsonAdapter<?> create(
-              @Nonnull final Type type,
-              @Nonnull final Set<? extends Annotation> annotations,
-              @Nonnull final Moshi moshi) {
-            if (!annotations.isEmpty() || type != Shard.class) {
-              return null;
+
+    /**
+     * Reads UFC uint32 shard fields through Long first, then preserves the bootstrap model's int ABI
+     * by storing the accepted value as its two's-complement bit pattern.
+     */
+    static final class ShardAdapter extends JsonAdapter<Shard> {
+
+        static final Factory FACTORY = new Factory() {
+            @Nullable
+            @Override
+            public JsonAdapter<?> create(
+                    @Nonnull final Type type,
+                    @Nonnull final Set<? extends Annotation> annotations,
+                    @Nonnull final Moshi moshi) {
+                if (!annotations.isEmpty() || type != Shard.class) {
+                    return null;
+                }
+                return new ShardAdapter(moshi.adapter(ShardJson.class));
             }
-            return new ShardAdapter(moshi.adapter(ShardJson.class));
-          }
         };
 
-    private final JsonAdapter<ShardJson> delegate;
+        private final JsonAdapter<ShardJson> delegate;
 
-    ShardAdapter(final JsonAdapter<ShardJson> delegate) {
-      this.delegate = delegate;
-    }
+        ShardAdapter(final JsonAdapter<ShardJson> delegate) {
+            this.delegate = delegate;
+        }
 
-    @Nullable
-    @Override
-    public Shard fromJson(@Nonnull final JsonReader reader) throws IOException {
-      final ShardJson shard = delegate.fromJson(reader);
-      if (shard == null) {
-        return null;
-      }
-      final List<ShardRange> ranges;
-      if (shard.ranges == null) {
-        ranges = null;
-      } else {
-        ranges = new ArrayList<>();
-        for (final ShardRangeJson range : shard.ranges) {
-          ranges.add(
-              range == null
-                  ? null
-                  : new ShardRange(
-                      toUnsignedInt(range.start, "range start"),
-                      toUnsignedInt(range.end, "range end")));
+        @Nullable
+        @Override
+        public Shard fromJson(@Nonnull final JsonReader reader) throws IOException {
+            final ShardJson shard = delegate.fromJson(reader);
+            if (shard == null) {
+                return null;
+            }
+            final List<ShardRange> ranges;
+            if (shard.ranges == null) {
+                ranges = null;
+            } else {
+                ranges = new ArrayList<>();
+                for (final ShardRangeJson range : shard.ranges) {
+                    ranges.add(
+                            range == null
+                                    ? null
+                                    : new ShardRange(
+                                            toUnsignedInt(range.start, "range start"),
+                                            toUnsignedInt(range.end, "range end")));
+                }
+            }
+            return new Shard(shard.salt, ranges, toUnsignedInt(shard.totalShards, "totalShards"));
+        }
+
+        @Override
+        public void toJson(@Nonnull final JsonWriter writer, @Nullable final Shard value) {
+            throw new UnsupportedOperationException("Reading only adapter");
         }
-      }
-      return new Shard(shard.salt, ranges, toUnsignedInt(shard.totalShards, "totalShards"));
     }
 
-    @Override
-    public void toJson(@Nonnull final JsonWriter writer, @Nullable final Shard value) {
-      throw new UnsupportedOperationException("Reading only adapter");
+    static final class ShardJson {
+        String salt;
+        List<ShardRangeJson> ranges;
+        Long totalShards;
+    }
+
+    static final class ShardRangeJson {
+        Long start;
+        Long end;
     }
-  }
-
-  static final class ShardJson {
-    String salt;
-    List<ShardRangeJson> ranges;
-    Long totalShards;
-  }
-
-  static final class ShardRangeJson {
-    Long start;
-    Long end;
-  }
-
-  static final class FlagMapAdapter extends JsonAdapter<Map<String, Flag>> {
-
-    private static final Type FLAGS_TYPE =
-        Types.newParameterizedType(Map.class, String.class, Flag.class);
-
-    static final Factory FACTORY =
-        new Factory() {
-          @Nullable
-          @Override
-          public JsonAdapter<?> create(
-              @Nonnull final Type type,
-              @Nonnull final Set<? extends Annotation> annotations,
-              @Nonnull final Moshi moshi) {
-            if (!annotations.isEmpty() || !Types.equals(type, FLAGS_TYPE)) {
-              return null;
+
+    static final class FlagMapAdapter extends JsonAdapter<Map<String, Flag>> {
+
+        private static final Type FLAGS_TYPE = Types.newParameterizedType(Map.class, String.class, Flag.class);
+
+        static final Factory FACTORY = new Factory() {
+            @Nullable
+            @Override
+            public JsonAdapter<?> create(
+                    @Nonnull final Type type,
+                    @Nonnull final Set<? extends Annotation> annotations,
+                    @Nonnull final Moshi moshi) {
+                if (!annotations.isEmpty() || !Types.equals(type, FLAGS_TYPE)) {
+                    return null;
+                }
+                return new FlagMapAdapter(moshi.adapter(Flag.class));
             }
-            return new FlagMapAdapter(moshi.adapter(Flag.class));
-          }
         };
 
-    private final JsonAdapter<Flag> flagAdapter;
+        private final JsonAdapter<Flag> flagAdapter;
 
-    FlagMapAdapter(final JsonAdapter<Flag> flagAdapter) {
-      this.flagAdapter = flagAdapter;
-    }
+        FlagMapAdapter(final JsonAdapter<Flag> flagAdapter) {
+            this.flagAdapter = flagAdapter;
+        }
 
-    @Nullable
-    @Override
-    public Map<String, Flag> fromJson(@Nonnull final JsonReader reader) throws IOException {
-      if (reader.peek() == JsonReader.Token.NULL) {
-        return reader.nextNull();
-      }
-      final Map<String, Flag> flags = new HashMap<>();
-      reader.beginObject();
-      while (reader.hasNext()) {
-        final String flagKey = reader.nextName();
-        final Object rawFlag = reader.readJsonValue();
-        try {
-          final Flag flag = flagAdapter.fromJsonValue(rawFlag);
-          if (flag != null) {
-            validateFlag(flagKey, flag);
-            flags.put(flagKey, flag);
-          }
-        } catch (JsonDataException | IllegalArgumentException error) {
-          INVALID_FLAGS_HOLDER.get().put(flagKey, INVALID_FLAG);
-          if (error instanceof InvalidSemverComparandException) {
-            INVALID_FLAGS_HOLDER.get().put(flagKey, INVALID_SEMVER_COMPARAND);
-          }
-          LOGGER.warn(
-              "Dropping malformed FFE flag {} during remote config deserialization: {}",
-              flagKey,
-              error.toString());
+        @Nullable
+        @Override
+        public Map<String, Flag> fromJson(@Nonnull final JsonReader reader) throws IOException {
+            if (reader.peek() == JsonReader.Token.NULL) {
+                return reader.nextNull();
+            }
+            final Map<String, Flag> flags = new HashMap<>();
+            reader.beginObject();
+            while (reader.hasNext()) {
+                final String flagKey = reader.nextName();
+                final Object rawFlag = reader.readJsonValue();
+                try {
+                    final Flag flag = flagAdapter.fromJsonValue(rawFlag);
+                    if (flag != null) {
+                        validateFlag(flagKey, flag);
+                        flags.put(flagKey, flag);
+                    }
+                } catch (JsonDataException | IllegalArgumentException error) {
+                    INVALID_FLAGS_HOLDER.get().put(flagKey, INVALID_FLAG);
+                    if (error instanceof InvalidSemverComparandException) {
+                        INVALID_FLAGS_HOLDER.get().put(flagKey, INVALID_SEMVER_COMPARAND);
+                    }
+                    LOGGER.warn(
+                            "Dropping malformed FFE flag {} during remote config deserialization: {}",
+                            flagKey,
+                            error.toString());
+                }
+            }
+            reader.endObject();
+            return flags;
         }
-      }
-      reader.endObject();
-      return flags;
-    }
 
-    @Override
-    public void toJson(@Nonnull final JsonWriter writer, @Nullable final Map<String, Flag> value)
-        throws IOException {
-      throw new UnsupportedOperationException("Reading only adapter");
+        @Override
+        public void toJson(@Nonnull final JsonWriter writer, @Nullable final Map<String, Flag> value)
+                throws IOException {
+            throw new UnsupportedOperationException("Reading only adapter");
+        }
     }
-  }
-
-  /**
-   * Reads a boxed Boolean tolerantly: JSON null and wrong-typed values (string, number, object,
-   * array) map to null rather than aborting the enclosing object's parse. Downstream reads must use
-   * Boolean.TRUE.equals(field) so null resolves to the privacy-preserving default.
-   *
-   * <p>Only applies to Boolean.class (not primitive boolean), so mandatory primitive-boolean fields
-   * (e.g. Flag.enabled) keep their strict parse.
-   */
-  static final class LenientBooleanAdapter extends JsonAdapter<Boolean> {
-
-    static final Factory FACTORY =
-        new Factory() {
-          @Nullable
-          @Override
-          public JsonAdapter<?> create(
-              @Nonnull final Type type,
-              @Nonnull final Set<? extends Annotation> annotations,
-              @Nonnull final Moshi moshi) {
-            if (!annotations.isEmpty() || type != Boolean.class) {
-              return null;
+
+    /**
+     * Reads a boxed Boolean tolerantly: JSON null and wrong-typed values (string, number, object,
+     * array) map to null rather than aborting the enclosing object's parse. Downstream reads must use
+     * Boolean.TRUE.equals(field) so null resolves to the privacy-preserving default.
+     *
+     * <p>Only applies to Boolean.class (not primitive boolean), so mandatory primitive-boolean fields
+     * (e.g. Flag.enabled) keep their strict parse.
+     */
+    static final class LenientBooleanAdapter extends JsonAdapter<Boolean> {
+
+        static final Factory FACTORY = new Factory() {
+            @Nullable
+            @Override
+            public JsonAdapter<?> create(
+                    @Nonnull final Type type,
+                    @Nonnull final Set<? extends Annotation> annotations,
+                    @Nonnull final Moshi moshi) {
+                if (!annotations.isEmpty() || type != Boolean.class) {
+                    return null;
+                }
+                return new LenientBooleanAdapter();
             }
-            return new LenientBooleanAdapter();
-          }
         };
 
-    @Nullable
-    @Override
-    public Boolean fromJson(@Nonnull final JsonReader reader) throws IOException {
-      if (reader.peek() == JsonReader.Token.BOOLEAN) {
-        return reader.nextBoolean();
-      }
-      // null and every wrong-typed value collapse to null so the caller falls back to its default
-      // rather than the enclosing config being rejected wholesale.
-      reader.skipValue();
-      return null;
-    }
+        @Nullable
+        @Override
+        public Boolean fromJson(@Nonnull final JsonReader reader) throws IOException {
+            if (reader.peek() == JsonReader.Token.BOOLEAN) {
+                return reader.nextBoolean();
+            }
+            // null and every wrong-typed value collapse to null so the caller falls back to its default
+            // rather than the enclosing config being rejected wholesale.
+            reader.skipValue();
+            return null;
+        }
 
-    @Override
-    public void toJson(@Nonnull final JsonWriter writer, @Nullable final Boolean value)
-        throws IOException {
-      throw new UnsupportedOperationException("Reading only adapter");
+        @Override
+        public void toJson(@Nonnull final JsonWriter writer, @Nullable final Boolean value) throws IOException {
+            throw new UnsupportedOperationException("Reading only adapter");
+        }
     }
-  }
 
-  static final class InstantAdapter extends JsonAdapter<Instant> {
+    static final class InstantAdapter extends JsonAdapter<Instant> {
 
-    @Nullable
-    @Override
-    public Instant fromJson(@Nonnull final JsonReader reader) throws IOException {
-      if (reader.peek() == JsonReader.Token.NULL) {
-        return reader.nextNull();
-      }
-      return parseInstant(reader.nextString());
-    }
+        @Nullable
+        @Override
+        public Instant fromJson(@Nonnull final JsonReader reader) throws IOException {
+            if (reader.peek() == JsonReader.Token.NULL) {
+                return reader.nextNull();
+            }
+            return parseInstant(reader.nextString());
+        }
 
-    @Override
-    public void toJson(@Nonnull final JsonWriter writer, @Nullable final Instant value)
-        throws IOException {
-      throw new UnsupportedOperationException("Reading only adapter");
+        @Override
+        public void toJson(@Nonnull final JsonWriter writer, @Nullable final Instant value) throws IOException {
+            throw new UnsupportedOperationException("Reading only adapter");
+        }
     }
-  }
-
-  static final class AllocationAdapter extends JsonAdapter<Allocation> {
-
-    static final Factory FACTORY =
-        new Factory() {
-          @Nullable
-          @Override
-          public JsonAdapter<?> create(
-              @Nonnull final Type type,
-              @Nonnull final Set<? extends Annotation> annotations,
-              @Nonnull final Moshi moshi) {
-            if (!annotations.isEmpty() || !Types.equals(type, Allocation.class)) {
-              return null;
+
+    static final class AllocationAdapter extends JsonAdapter<Allocation> {
+
+        static final Factory FACTORY = new Factory() {
+            @Nullable
+            @Override
+            public JsonAdapter<?> create(
+                    @Nonnull final Type type,
+                    @Nonnull final Set<? extends Annotation> annotations,
+                    @Nonnull final Moshi moshi) {
+                if (!annotations.isEmpty() || !Types.equals(type, Allocation.class)) {
+                    return null;
+                }
+                return new AllocationAdapter(moshi.adapter(AllocationJson.class));
             }
-            return new AllocationAdapter(moshi.adapter(AllocationJson.class));
-          }
         };
 
-    private final JsonAdapter<AllocationJson> delegate;
+        private final JsonAdapter<AllocationJson> delegate;
 
-    AllocationAdapter(final JsonAdapter<AllocationJson> delegate) {
-      this.delegate = delegate;
-    }
+        AllocationAdapter(final JsonAdapter<AllocationJson> delegate) {
+            this.delegate = delegate;
+        }
 
-    @Nullable
-    @Override
-    public Allocation fromJson(@Nonnull final JsonReader reader) throws IOException {
-      final AllocationJson allocation = delegate.fromJson(reader);
-      if (allocation == null) {
-        return null;
-      }
-      return Allocation.fromInstants(
-          allocation.key,
-          allocation.rules,
-          allocation.startAt,
-          allocation.endAt,
-          allocation.splits,
-          allocation.doLog);
+        @Nullable
+        @Override
+        public Allocation fromJson(@Nonnull final JsonReader reader) throws IOException {
+            final AllocationJson allocation = delegate.fromJson(reader);
+            if (allocation == null) {
+                return null;
+            }
+            return Allocation.fromInstants(
+                    allocation.key,
+                    allocation.rules,
+                    allocation.startAt,
+                    allocation.endAt,
+                    allocation.splits,
+                    allocation.doLog);
+        }
+
+        @Override
+        public void toJson(@Nonnull final JsonWriter writer, @Nullable final Allocation value) throws IOException {
+            throw new UnsupportedOperationException("Reading only adapter");
+        }
     }
 
-    @Override
-    public void toJson(@Nonnull final JsonWriter writer, @Nullable final Allocation value)
-        throws IOException {
-      throw new UnsupportedOperationException("Reading only adapter");
+    static final class AllocationJson {
+        String key;
+        List<Rule> rules;
+        Instant startAt;
+        Instant endAt;
+        List<Split> splits;
+        Boolean doLog;
     }
-  }
-
-  static final class AllocationJson {
-    String key;
-    List<Rule> rules;
-    Instant startAt;
-    Instant endAt;
-    List<Split> splits;
-    Boolean doLog;
-  }
-
-  @Nullable
-  private static Instant parseInstant(final String date) {
-    try {
-      return DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(date, Instant::from);
-    } catch (Exception e) {
-      // ignore wrongly set dates
-      return null;
+
+    @Nullable
+    private static Instant parseInstant(final String date) {
+        try {
+            return DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(date, Instant::from);
+        } catch (Exception e) {
+            // ignore wrongly set dates
+            return null;
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/AgentlessConfigurationSourceTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/AgentlessConfigurationSourceTest.java
index b02bd05642b..ff1afa726d9 100644
--- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/AgentlessConfigurationSourceTest.java
+++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/AgentlessConfigurationSourceTest.java
@@ -58,1306 +58,1175 @@
 
 @ExtendWith(MockitoExtension.class)
 class AgentlessConfigurationSourceTest {
-  private static final String CONFIG_PATH = "/api/v2/feature-flagging/config/rules-based/server";
-
-  @Mock private FeatureFlaggingGateway.ConfigListener listener;
-
-  @AfterEach
-  void cleanup() {
-    FeatureFlaggingGateway.removeConfigListener(listener);
-    FeatureFlaggingGateway.dispatch((ServerConfiguration) null);
-  }
-
-  @Test
-  void derivesDatadogUfcCdnEndpointFromSiteAndEnv() {
-    final Config config = config("datad0g.com", "staging env");
-
-    assertEquals(
-        "https://ufc-server.ff-cdn.datad0g.com/api/v2/feature-flagging/config/rules-based/server?dd_env=staging%20env",
-        AgentlessConfigurationSource.endpoint(config).toString());
-  }
-
-  @Test
-  void derivesDatadogUfcCdnEndpointWithoutEnv() {
-    assertEquals(
-        "https://ufc-server.ff-cdn.datadoghq.com/api/v2/feature-flagging/config/rules-based/server",
-        AgentlessConfigurationSource.endpoint(config("datadoghq.com", "")).toString());
-    assertEquals(
-        "https://ufc-server.ff-cdn.datadoghq.com/api/v2/feature-flagging/config/rules-based/server",
-        AgentlessConfigurationSource.endpoint(config("datadoghq.com", null)).toString());
-  }
-
-  @Test
-  void appendsRulesBasedServerPathToConfiguredAgentlessBaseUrl() {
-    final Config config = config();
-    lenient()
-        .when(config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl())
-        .thenReturn("http://mock-backend:8080");
-
-    assertEquals(
-        "http://mock-backend:8080/api/v2/feature-flagging/config/rules-based/server",
-        AgentlessConfigurationSource.endpoint(config).toString());
-  }
-
-  @Test
-  void usesConfiguredAgentlessEndpointWithPathUnchanged() {
-    final Config config = config();
-    lenient()
-        .when(config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl())
-        .thenReturn("http://mock-backend:8080/custom/ufc?tenant=test");
-
-    assertEquals(
-        "http://mock-backend:8080/custom/ufc?tenant=test",
-        AgentlessConfigurationSource.endpoint(config).toString());
-  }
-
-  @Test
-  void rejectsInvalidConfiguredAgentlessBaseUrl() {
-    final Config config = config();
-    lenient()
-        .when(config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl())
-        .thenReturn("not a URL");
-
-    assertThrows(
-        IllegalArgumentException.class, () -> AgentlessConfigurationSource.endpoint(config));
-  }
-
-  @Test
-  void rejectsInvalidDatadogUfcCdnEndpoint() {
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> AgentlessConfigurationSource.endpoint(config("datadoghq.com:bad", "")));
-  }
-
-  @Test
-  void defaultConstructorBuildsHttpClientFromConfig() {
-    final AgentlessConfigurationSource service =
-        new AgentlessConfigurationSource(config("datad0g.com", "staging"));
-
-    service.close();
-  }
-
-  @Test
-  void realHttpClientDoesNotSendApiKeyOverHttp() throws Exception {
-    try (JavaTestHttpServer server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.get(
-                            CONFIG_PATH,
-                            api ->
-                                api.getResponse()
-                                    .addHeader("ETag", "etag-b")
-                                    .send(emptyConfig()))))) {
-      final OkHttpClient httpClient = new OkHttpClient.Builder().build();
-      final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-          new AgentlessConfigurationSource.OkHttpUfcHttpClient(httpClient);
-
-      try {
-        final AgentlessConfigurationSource.UfcHttpResponse response =
-            client.fetch(HttpUrl.get(server.getAddress().resolve(CONFIG_PATH)), config(), "etag-a");
+    private static final String CONFIG_PATH = "/api/v2/feature-flagging/config/rules-based/server";
+
+    @Mock
+    private FeatureFlaggingGateway.ConfigListener listener;
+
+    @AfterEach
+    void cleanup() {
+        FeatureFlaggingGateway.removeConfigListener(listener);
+        FeatureFlaggingGateway.dispatch((ServerConfiguration) null);
+    }
+
+    @Test
+    void derivesDatadogUfcCdnEndpointFromSiteAndEnv() {
+        final Config config = config("datad0g.com", "staging env");
+
+        assertEquals(
+                "https://ufc-server.ff-cdn.datad0g.com/api/v2/feature-flagging/config/rules-based/server?dd_env=staging%20env",
+                AgentlessConfigurationSource.endpoint(config).toString());
+    }
+
+    @Test
+    void derivesDatadogUfcCdnEndpointWithoutEnv() {
+        assertEquals(
+                "https://ufc-server.ff-cdn.datadoghq.com/api/v2/feature-flagging/config/rules-based/server",
+                AgentlessConfigurationSource.endpoint(config("datadoghq.com", ""))
+                        .toString());
+        assertEquals(
+                "https://ufc-server.ff-cdn.datadoghq.com/api/v2/feature-flagging/config/rules-based/server",
+                AgentlessConfigurationSource.endpoint(config("datadoghq.com", null))
+                        .toString());
+    }
+
+    @Test
+    void appendsRulesBasedServerPathToConfiguredAgentlessBaseUrl() {
+        final Config config = config();
+        lenient()
+                .when(config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl())
+                .thenReturn("http://mock-backend:8080");
+
+        assertEquals(
+                "http://mock-backend:8080/api/v2/feature-flagging/config/rules-based/server",
+                AgentlessConfigurationSource.endpoint(config).toString());
+    }
+
+    @Test
+    void usesConfiguredAgentlessEndpointWithPathUnchanged() {
+        final Config config = config();
+        lenient()
+                .when(config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl())
+                .thenReturn("http://mock-backend:8080/custom/ufc?tenant=test");
+
+        assertEquals(
+                "http://mock-backend:8080/custom/ufc?tenant=test",
+                AgentlessConfigurationSource.endpoint(config).toString());
+    }
+
+    @Test
+    void rejectsInvalidConfiguredAgentlessBaseUrl() {
+        final Config config = config();
+        lenient()
+                .when(config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl())
+                .thenReturn("not a URL");
+
+        assertThrows(IllegalArgumentException.class, () -> AgentlessConfigurationSource.endpoint(config));
+    }
+
+    @Test
+    void rejectsInvalidDatadogUfcCdnEndpoint() {
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> AgentlessConfigurationSource.endpoint(config("datadoghq.com:bad", "")));
+    }
+
+    @Test
+    void defaultConstructorBuildsHttpClientFromConfig() {
+        final AgentlessConfigurationSource service = new AgentlessConfigurationSource(config("datad0g.com", "staging"));
+
+        service.close();
+    }
+
+    @Test
+    void realHttpClientDoesNotSendApiKeyOverHttp() throws Exception {
+        try (JavaTestHttpServer server = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.get(
+                CONFIG_PATH,
+                api -> api.getResponse().addHeader("ETag", "etag-b").send(emptyConfig()))))) {
+            final OkHttpClient httpClient = new OkHttpClient.Builder().build();
+            final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
+                    new AgentlessConfigurationSource.OkHttpUfcHttpClient(httpClient);
+
+            try {
+                final AgentlessConfigurationSource.UfcHttpResponse response =
+                        client.fetch(HttpUrl.get(server.getAddress().resolve(CONFIG_PATH)), config(), "etag-a");
+
+                assertEquals(HttpURLConnection.HTTP_OK, response.status);
+                assertEquals("etag-b", response.etag);
+                assertEquals(emptyConfig(), new String(response.body, UTF_8));
+                assertNull(server.getLastRequest().getHeader("DD-API-KEY"));
+                assertEquals("etag-a", server.getLastRequest().getHeader("If-None-Match"));
+                assertEquals("java", server.getLastRequest().getHeader("Datadog-Meta-Lang"));
+                assertEquals("gzip", server.getLastRequest().getHeader("Accept-Encoding"));
+            } finally {
+                httpClient.dispatcher().executorService().shutdownNow();
+                httpClient.connectionPool().evictAll();
+            }
+        }
+    }
+
+    @Test
+    void sendsApiKeyToDefaultDatadogHttpsEndpoint() throws Exception {
+        final List<okhttp3.Request> requests = new ArrayList<>();
+        final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
+                scriptedClient(requests, delay -> {}, () -> 1.0, response(200, "etag-a", emptyConfig()));
+        final HttpUrl endpoint = HttpUrl.get("https://ufc-server.ff-cdn.datadoghq.com" + CONFIG_PATH);
+
+        client.fetch(endpoint, config(), null);
+
+        assertEquals("test-api-key", requests.get(0).header("DD-API-KEY"));
+    }
+
+    @Test
+    void stripsApiKeyFromCustomHttpsEndpoint() throws Exception {
+        final List<okhttp3.Request> requests = new ArrayList<>();
+        final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
+                scriptedClient(requests, delay -> {}, () -> 1.0, response(200, "etag-a", emptyConfig()));
+        final Config config = config();
+        lenient()
+                .when(config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl())
+                .thenReturn("https://flags.example.test/custom/ufc");
+        final HttpUrl endpoint = HttpUrl.get("https://flags.example.test/custom/ufc");
+
+        client.fetch(endpoint, config, null);
+
+        assertNull(requests.get(0).header("DD-API-KEY"));
+    }
+
+    @Test
+    void stripsApiKeyFromUnexpectedHttpsEndpoint() throws Exception {
+        final List<okhttp3.Request> requests = new ArrayList<>();
+        final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
+                scriptedClient(requests, delay -> {}, () -> 1.0, response(200, "etag-a", emptyConfig()));
+        final HttpUrl endpoint = HttpUrl.get("https://flags.example.test/custom/ufc");
+
+        client.fetch(endpoint, config(), null);
+
+        assertNull(requests.get(0).header("DD-API-KEY"));
+    }
+
+    @Test
+    void handlesGzipAndKeepsLastKnownGoodWhenNextResponseIsTruncated() throws Exception {
+        final byte[] compressedConfig = gzip(emptyConfig());
+        final byte[] truncatedConfig = Arrays.copyOf(compressedConfig, compressedConfig.length - 8);
+        final AtomicInteger responses = new AtomicInteger();
+        try (JavaTestHttpServer server = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.get(CONFIG_PATH, api -> {
+            final boolean firstResponse = responses.getAndIncrement() == 0;
+            final byte[] body = firstResponse ? compressedConfig : truncatedConfig;
+            api.getResponse()
+                    .addHeader("Content-Encoding", "gzip")
+                    .addHeader("ETag", firstResponse ? "etag-good" : "etag-bad")
+                    .sendWithType("application/json", body);
+        })))) {
+            final HttpUrl endpoint = HttpUrl.get(server.getAddress().resolve(CONFIG_PATH));
+            final OkHttpClient httpClient = new OkHttpClient.Builder().build();
+            final AgentlessConfigurationSource service = new AgentlessConfigurationSource(
+                    endpoint,
+                    config(),
+                    30_000,
+                    new AgentlessConfigurationSource.OkHttpUfcHttpClient(httpClient, 30_000, delay -> {}, () -> 1.0),
+                    Executors.newSingleThreadScheduledExecutor());
+            final ArgumentCaptor<ServerConfiguration> configuration =
+                    ArgumentCaptor.forClass(ServerConfiguration.class);
+            FeatureFlaggingGateway.addConfigListener(listener);
+
+            try {
+                assertTrue(service.pollOnce());
+                assertFalse(service.pollOnce());
+
+                verify(listener).accept(configuration.capture());
+                assertEquals("Staging", configuration.getValue().environment.name);
+                assertEquals(4, responses.get());
+                assertEquals("gzip", server.getLastRequest().getHeader("Accept-Encoding"));
+                assertEquals("etag-good", server.getLastRequest().getHeader("If-None-Match"));
+            } finally {
+                service.close();
+                httpClient.dispatcher().executorService().shutdownNow();
+                httpClient.connectionPool().evictAll();
+            }
+        }
+    }
+
+    @Test
+    void downloadsAndAppliesLargeUfcWithoutPayloadLimit() throws Exception {
+        final int flagCount = 5_000;
+        final String largeConfig = largeConfig(flagCount);
+        assertTrue(largeConfig.getBytes(UTF_8).length > 500_000);
+
+        try (JavaTestHttpServer server = JavaTestHttpServer.httpServer(s ->
+                s.handlers(h -> h.get(CONFIG_PATH, api -> api.getResponse().send(largeConfig))))) {
+            final HttpUrl endpoint = HttpUrl.get(server.getAddress().resolve(CONFIG_PATH));
+            final OkHttpClient httpClient = new OkHttpClient.Builder().build();
+            final AgentlessConfigurationSource service = new AgentlessConfigurationSource(
+                    endpoint,
+                    config(),
+                    30_000,
+                    new AgentlessConfigurationSource.OkHttpUfcHttpClient(httpClient),
+                    Executors.newSingleThreadScheduledExecutor());
+            final ArgumentCaptor<ServerConfiguration> configuration =
+                    ArgumentCaptor.forClass(ServerConfiguration.class);
+            FeatureFlaggingGateway.addConfigListener(listener);
+
+            try {
+                assertTrue(service.pollOnce());
+
+                verify(listener).accept(configuration.capture());
+                assertEquals(flagCount, configuration.getValue().flags.size());
+            } finally {
+                service.close();
+                httpClient.dispatcher().executorService().shutdownNow();
+                httpClient.connectionPool().evictAll();
+            }
+        }
+    }
+
+    @Test
+    void realHttpClientAllowsMissingEtagAndEmptyResponseBody() throws Exception {
+        try (JavaTestHttpServer server = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.get(
+                CONFIG_PATH,
+                api -> api.getResponse()
+                        .status(HttpURLConnection.HTTP_NO_CONTENT)
+                        .send())))) {
+            final OkHttpClient httpClient = new OkHttpClient.Builder().build();
+            final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
+                    new AgentlessConfigurationSource.OkHttpUfcHttpClient(httpClient);
+
+            try {
+                final AgentlessConfigurationSource.UfcHttpResponse response =
+                        client.fetch(HttpUrl.get(server.getAddress().resolve(CONFIG_PATH)), config(), null);
+
+                assertEquals(HttpURLConnection.HTTP_NO_CONTENT, response.status);
+                assertNull(response.etag);
+                assertEquals(0, response.body.length);
+                assertNull(server.getLastRequest().getHeader("If-None-Match"));
+            } finally {
+                httpClient.dispatcher().executorService().shutdownNow();
+                httpClient.connectionPool().evictAll();
+            }
+        }
+    }
+
+    @Test
+    void httpClientAdapterPreservesMissingResponseBody() throws Exception {
+        final OkHttpClient httpClient = mock(OkHttpClient.class);
+        final Call call = mock(Call.class);
+        final HttpUrl endpoint = HttpUrl.get("http://localhost");
+        final okhttp3.Request request =
+                new okhttp3.Request.Builder().url(endpoint).build();
+        final Response okHttpResponse = new Response.Builder()
+                .request(request)
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_OK)
+                .message("OK")
+                .build();
+        when(httpClient.newCall(any())).thenReturn(call);
+        when(call.execute()).thenReturn(okHttpResponse);
+        final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
+                new AgentlessConfigurationSource.OkHttpUfcHttpClient(httpClient);
+
+        final AgentlessConfigurationSource.UfcHttpResponse response = client.fetch(endpoint, config(), null);
 
         assertEquals(HttpURLConnection.HTTP_OK, response.status);
-        assertEquals("etag-b", response.etag);
-        assertEquals(emptyConfig(), new String(response.body, UTF_8));
-        assertNull(server.getLastRequest().getHeader("DD-API-KEY"));
-        assertEquals("etag-a", server.getLastRequest().getHeader("If-None-Match"));
-        assertEquals("java", server.getLastRequest().getHeader("Datadog-Meta-Lang"));
-        assertEquals("gzip", server.getLastRequest().getHeader("Accept-Encoding"));
-      } finally {
-        httpClient.dispatcher().executorService().shutdownNow();
-        httpClient.connectionPool().evictAll();
-      }
-    }
-  }
-
-  @Test
-  void sendsApiKeyToDefaultDatadogHttpsEndpoint() throws Exception {
-    final List<okhttp3.Request> requests = new ArrayList<>();
-    final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-        scriptedClient(requests, delay -> {}, () -> 1.0, response(200, "etag-a", emptyConfig()));
-    final HttpUrl endpoint = HttpUrl.get("https://ufc-server.ff-cdn.datadoghq.com" + CONFIG_PATH);
-
-    client.fetch(endpoint, config(), null);
-
-    assertEquals("test-api-key", requests.get(0).header("DD-API-KEY"));
-  }
-
-  @Test
-  void stripsApiKeyFromCustomHttpsEndpoint() throws Exception {
-    final List<okhttp3.Request> requests = new ArrayList<>();
-    final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-        scriptedClient(requests, delay -> {}, () -> 1.0, response(200, "etag-a", emptyConfig()));
-    final Config config = config();
-    lenient()
-        .when(config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl())
-        .thenReturn("https://flags.example.test/custom/ufc");
-    final HttpUrl endpoint = HttpUrl.get("https://flags.example.test/custom/ufc");
-
-    client.fetch(endpoint, config, null);
-
-    assertNull(requests.get(0).header("DD-API-KEY"));
-  }
-
-  @Test
-  void stripsApiKeyFromUnexpectedHttpsEndpoint() throws Exception {
-    final List<okhttp3.Request> requests = new ArrayList<>();
-    final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-        scriptedClient(requests, delay -> {}, () -> 1.0, response(200, "etag-a", emptyConfig()));
-    final HttpUrl endpoint = HttpUrl.get("https://flags.example.test/custom/ufc");
-
-    client.fetch(endpoint, config(), null);
-
-    assertNull(requests.get(0).header("DD-API-KEY"));
-  }
-
-  @Test
-  void handlesGzipAndKeepsLastKnownGoodWhenNextResponseIsTruncated() throws Exception {
-    final byte[] compressedConfig = gzip(emptyConfig());
-    final byte[] truncatedConfig = Arrays.copyOf(compressedConfig, compressedConfig.length - 8);
-    final AtomicInteger responses = new AtomicInteger();
-    try (JavaTestHttpServer server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.get(
-                            CONFIG_PATH,
-                            api -> {
-                              final boolean firstResponse = responses.getAndIncrement() == 0;
-                              final byte[] body =
-                                  firstResponse ? compressedConfig : truncatedConfig;
-                              api.getResponse()
-                                  .addHeader("Content-Encoding", "gzip")
-                                  .addHeader("ETag", firstResponse ? "etag-good" : "etag-bad")
-                                  .sendWithType("application/json", body);
-                            })))) {
-      final HttpUrl endpoint = HttpUrl.get(server.getAddress().resolve(CONFIG_PATH));
-      final OkHttpClient httpClient = new OkHttpClient.Builder().build();
-      final AgentlessConfigurationSource service =
-          new AgentlessConfigurationSource(
-              endpoint,
-              config(),
-              30_000,
-              new AgentlessConfigurationSource.OkHttpUfcHttpClient(
-                  httpClient, 30_000, delay -> {}, () -> 1.0),
-              Executors.newSingleThreadScheduledExecutor());
-      final ArgumentCaptor<ServerConfiguration> configuration =
-          ArgumentCaptor.forClass(ServerConfiguration.class);
-      FeatureFlaggingGateway.addConfigListener(listener);
-
-      try {
+        assertNull(response.etag);
+        assertNull(response.body);
+    }
+
+    @Test
+    void realHttpClientCancellationInterruptsInFlightRequest() throws Exception {
+        final CountDownLatch requestStarted = new CountDownLatch(1);
+        final CountDownLatch releaseRequest = new CountDownLatch(1);
+        try (JavaTestHttpServer server = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.get(CONFIG_PATH, api -> {
+            requestStarted.countDown();
+            assertTrue(releaseRequest.await(1, TimeUnit.SECONDS));
+            api.getResponse().send(emptyConfig());
+        })))) {
+            final OkHttpClient httpClient = new OkHttpClient.Builder().build();
+            final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
+                    new AgentlessConfigurationSource.OkHttpUfcHttpClient(httpClient);
+            final ExecutorService runner = Executors.newSingleThreadExecutor();
+
+            try {
+                final Future<AgentlessConfigurationSource.UfcHttpResponse> response = runner.submit(
+                        () -> client.fetch(HttpUrl.get(server.getAddress().resolve(CONFIG_PATH)), config(), null));
+                assertTrue(requestStarted.await(1, TimeUnit.SECONDS));
+                assertThrows(
+                        IllegalStateException.class,
+                        () -> client.fetch(HttpUrl.get(server.getAddress().resolve(CONFIG_PATH)), config(), null));
+
+                client.cancel();
+
+                final ExecutionException failure =
+                        assertThrows(ExecutionException.class, () -> response.get(1, TimeUnit.SECONDS));
+                assertInstanceOf(IOException.class, failure.getCause());
+            } finally {
+                releaseRequest.countDown();
+                runner.shutdownNow();
+                httpClient.dispatcher().executorService().shutdownNow();
+                httpClient.connectionPool().evictAll();
+            }
+        }
+    }
+
+    @Test
+    void realHttpClientCancellationBeforeFetchPreventsRequest() throws Exception {
+        try (JavaTestHttpServer server = JavaTestHttpServer.httpServer(s ->
+                s.handlers(h -> h.get(CONFIG_PATH, api -> api.getResponse().send(emptyConfig()))))) {
+            final OkHttpClient httpClient = new OkHttpClient.Builder().build();
+            final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
+                    new AgentlessConfigurationSource.OkHttpUfcHttpClient(httpClient);
+
+            try {
+                client.cancel();
+
+                assertThrows(
+                        IOException.class,
+                        () -> client.fetch(HttpUrl.get(server.getAddress().resolve(CONFIG_PATH)), config(), null));
+            } finally {
+                httpClient.dispatcher().executorService().shutdownNow();
+                httpClient.connectionPool().evictAll();
+            }
+        }
+    }
+
+    @Test
+    void realHttpClientTimesOutDelayedResponse() throws Exception {
+        try (JavaTestHttpServer server = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.get(CONFIG_PATH, api -> {
+            TimeUnit.MILLISECONDS.sleep(500);
+            api.getResponse().send(emptyConfig());
+        })))) {
+            final HttpUrl endpoint = HttpUrl.get(server.getAddress().resolve(CONFIG_PATH));
+            final OkHttpClient httpClient = OkHttpUtils.buildHttpClient(endpoint, 50);
+            final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
+                    new AgentlessConfigurationSource.OkHttpUfcHttpClient(httpClient, 30_000, delay -> {}, () -> 1.0);
+
+            try {
+                assertThrows(IOException.class, () -> client.fetch(endpoint, config(), null));
+            } finally {
+                httpClient.dispatcher().executorService().shutdownNow();
+                httpClient.connectionPool().evictAll();
+            }
+        }
+    }
+
+    @Test
+    void appliesAcceptedJsonApiUfcThroughGateway() throws Exception {
+        final FakeClient client = new FakeClient(response(200, "etag-a", emptyConfig()));
+        final AgentlessConfigurationSource service = service(client);
+        final ArgumentCaptor<ServerConfiguration> configuration = ArgumentCaptor.forClass(ServerConfiguration.class);
+        FeatureFlaggingGateway.addConfigListener(listener);
+
         assertTrue(service.pollOnce());
-        assertFalse(service.pollOnce());
 
         verify(listener).accept(configuration.capture());
+        assertEquals("2026-07-15T19:57:07.219869778Z", configuration.getValue().createdAt);
+        assertNull(configuration.getValue().format);
         assertEquals("Staging", configuration.getValue().environment.name);
-        assertEquals(4, responses.get());
-        assertEquals("gzip", server.getLastRequest().getHeader("Accept-Encoding"));
-        assertEquals("etag-good", server.getLastRequest().getHeader("If-None-Match"));
-      } finally {
-        service.close();
-        httpClient.dispatcher().executorService().shutdownNow();
-        httpClient.connectionPool().evictAll();
-      }
-    }
-  }
-
-  @Test
-  void downloadsAndAppliesLargeUfcWithoutPayloadLimit() throws Exception {
-    final int flagCount = 5_000;
-    final String largeConfig = largeConfig(flagCount);
-    assertTrue(largeConfig.getBytes(UTF_8).length > 500_000);
-
-    try (JavaTestHttpServer server =
-        JavaTestHttpServer.httpServer(
-            s -> s.handlers(h -> h.get(CONFIG_PATH, api -> api.getResponse().send(largeConfig))))) {
-      final HttpUrl endpoint = HttpUrl.get(server.getAddress().resolve(CONFIG_PATH));
-      final OkHttpClient httpClient = new OkHttpClient.Builder().build();
-      final AgentlessConfigurationSource service =
-          new AgentlessConfigurationSource(
-              endpoint,
-              config(),
-              30_000,
-              new AgentlessConfigurationSource.OkHttpUfcHttpClient(httpClient),
-              Executors.newSingleThreadScheduledExecutor());
-      final ArgumentCaptor<ServerConfiguration> configuration =
-          ArgumentCaptor.forClass(ServerConfiguration.class);
-      FeatureFlaggingGateway.addConfigListener(listener);
-
-      try {
+        assertTrue(configuration.getValue().flags.isEmpty());
+        assertNull(client.requests.get(0).etag);
+    }
+
+    @Test
+    void customEndpointRequiresJsonApiAndKeepsLastKnownGoodOnRawUfc() throws Exception {
+        final FakeClient client = new FakeClient(
+                response(200, "etag-good", emptyConfig()), response(200, "etag-raw", emptyConfigAttributes()));
+        final Config config = config();
+        lenient()
+                .when(config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl())
+                .thenReturn("http://custom-backend/custom/ufc");
+        final AgentlessConfigurationSource service = service(client, config);
+        final ArgumentCaptor<ServerConfiguration> configuration = ArgumentCaptor.forClass(ServerConfiguration.class);
+        FeatureFlaggingGateway.addConfigListener(listener);
+
         assertTrue(service.pollOnce());
+        assertFalse(service.pollOnce());
 
         verify(listener).accept(configuration.capture());
-        assertEquals(flagCount, configuration.getValue().flags.size());
-      } finally {
-        service.close();
-        httpClient.dispatcher().executorService().shutdownNow();
-        httpClient.connectionPool().evictAll();
-      }
-    }
-  }
-
-  @Test
-  void realHttpClientAllowsMissingEtagAndEmptyResponseBody() throws Exception {
-    try (JavaTestHttpServer server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.get(
-                            CONFIG_PATH,
-                            api ->
-                                api.getResponse()
-                                    .status(HttpURLConnection.HTTP_NO_CONTENT)
-                                    .send())))) {
-      final OkHttpClient httpClient = new OkHttpClient.Builder().build();
-      final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-          new AgentlessConfigurationSource.OkHttpUfcHttpClient(httpClient);
-
-      try {
-        final AgentlessConfigurationSource.UfcHttpResponse response =
-            client.fetch(HttpUrl.get(server.getAddress().resolve(CONFIG_PATH)), config(), null);
-
-        assertEquals(HttpURLConnection.HTTP_NO_CONTENT, response.status);
-        assertNull(response.etag);
-        assertEquals(0, response.body.length);
-        assertNull(server.getLastRequest().getHeader("If-None-Match"));
-      } finally {
-        httpClient.dispatcher().executorService().shutdownNow();
-        httpClient.connectionPool().evictAll();
-      }
-    }
-  }
-
-  @Test
-  void httpClientAdapterPreservesMissingResponseBody() throws Exception {
-    final OkHttpClient httpClient = mock(OkHttpClient.class);
-    final Call call = mock(Call.class);
-    final HttpUrl endpoint = HttpUrl.get("http://localhost");
-    final okhttp3.Request request = new okhttp3.Request.Builder().url(endpoint).build();
-    final Response okHttpResponse =
-        new Response.Builder()
-            .request(request)
-            .protocol(Protocol.HTTP_1_1)
-            .code(HttpURLConnection.HTTP_OK)
-            .message("OK")
-            .build();
-    when(httpClient.newCall(any())).thenReturn(call);
-    when(call.execute()).thenReturn(okHttpResponse);
-    final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-        new AgentlessConfigurationSource.OkHttpUfcHttpClient(httpClient);
-
-    final AgentlessConfigurationSource.UfcHttpResponse response =
-        client.fetch(endpoint, config(), null);
+        assertEquals("Staging", configuration.getValue().environment.name);
+        assertNull(client.requests.get(0).etag);
+        assertEquals("etag-good", client.requests.get(1).etag);
+    }
 
-    assertEquals(HttpURLConnection.HTTP_OK, response.status);
-    assertNull(response.etag);
-    assertNull(response.body);
-  }
-
-  @Test
-  void realHttpClientCancellationInterruptsInFlightRequest() throws Exception {
-    final CountDownLatch requestStarted = new CountDownLatch(1);
-    final CountDownLatch releaseRequest = new CountDownLatch(1);
-    try (JavaTestHttpServer server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.get(
-                            CONFIG_PATH,
-                            api -> {
-                              requestStarted.countDown();
-                              assertTrue(releaseRequest.await(1, TimeUnit.SECONDS));
-                              api.getResponse().send(emptyConfig());
-                            })))) {
-      final OkHttpClient httpClient = new OkHttpClient.Builder().build();
-      final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-          new AgentlessConfigurationSource.OkHttpUfcHttpClient(httpClient);
-      final ExecutorService runner = Executors.newSingleThreadExecutor();
-
-      try {
-        final Future<AgentlessConfigurationSource.UfcHttpResponse> response =
-            runner.submit(
-                () ->
-                    client.fetch(
-                        HttpUrl.get(server.getAddress().resolve(CONFIG_PATH)), config(), null));
-        assertTrue(requestStarted.await(1, TimeUnit.SECONDS));
-        assertThrows(
-            IllegalStateException.class,
-            () ->
-                client.fetch(
-                    HttpUrl.get(server.getAddress().resolve(CONFIG_PATH)), config(), null));
-
-        client.cancel();
-
-        final ExecutionException failure =
-            assertThrows(ExecutionException.class, () -> response.get(1, TimeUnit.SECONDS));
-        assertInstanceOf(IOException.class, failure.getCause());
-      } finally {
-        releaseRequest.countDown();
-        runner.shutdownNow();
-        httpClient.dispatcher().executorService().shutdownNow();
-        httpClient.connectionPool().evictAll();
-      }
-    }
-  }
-
-  @Test
-  void realHttpClientCancellationBeforeFetchPreventsRequest() throws Exception {
-    try (JavaTestHttpServer server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h -> h.get(CONFIG_PATH, api -> api.getResponse().send(emptyConfig()))))) {
-      final OkHttpClient httpClient = new OkHttpClient.Builder().build();
-      final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-          new AgentlessConfigurationSource.OkHttpUfcHttpClient(httpClient);
-
-      try {
-        client.cancel();
+    @Test
+    void ignoresBlankEtag() throws Exception {
+        final FakeClient client = new FakeClient(response(200, " ", emptyConfig()), response(304, null, null));
+        final AgentlessConfigurationSource service = service(client);
+        FeatureFlaggingGateway.addConfigListener(listener);
 
-        assertThrows(
-            IOException.class,
-            () ->
-                client.fetch(
-                    HttpUrl.get(server.getAddress().resolve(CONFIG_PATH)), config(), null));
-      } finally {
-        httpClient.dispatcher().executorService().shutdownNow();
-        httpClient.connectionPool().evictAll();
-      }
-    }
-  }
-
-  @Test
-  void realHttpClientTimesOutDelayedResponse() throws Exception {
-    try (JavaTestHttpServer server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.get(
-                            CONFIG_PATH,
-                            api -> {
-                              TimeUnit.MILLISECONDS.sleep(500);
-                              api.getResponse().send(emptyConfig());
-                            })))) {
-      final HttpUrl endpoint = HttpUrl.get(server.getAddress().resolve(CONFIG_PATH));
-      final OkHttpClient httpClient = OkHttpUtils.buildHttpClient(endpoint, 50);
-      final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-          new AgentlessConfigurationSource.OkHttpUfcHttpClient(
-              httpClient, 30_000, delay -> {}, () -> 1.0);
-
-      try {
-        assertThrows(IOException.class, () -> client.fetch(endpoint, config(), null));
-      } finally {
-        httpClient.dispatcher().executorService().shutdownNow();
-        httpClient.connectionPool().evictAll();
-      }
-    }
-  }
-
-  @Test
-  void appliesAcceptedJsonApiUfcThroughGateway() throws Exception {
-    final FakeClient client = new FakeClient(response(200, "etag-a", emptyConfig()));
-    final AgentlessConfigurationSource service = service(client);
-    final ArgumentCaptor<ServerConfiguration> configuration =
-        ArgumentCaptor.forClass(ServerConfiguration.class);
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    assertTrue(service.pollOnce());
-
-    verify(listener).accept(configuration.capture());
-    assertEquals("2026-07-15T19:57:07.219869778Z", configuration.getValue().createdAt);
-    assertNull(configuration.getValue().format);
-    assertEquals("Staging", configuration.getValue().environment.name);
-    assertTrue(configuration.getValue().flags.isEmpty());
-    assertNull(client.requests.get(0).etag);
-  }
-
-  @Test
-  void customEndpointRequiresJsonApiAndKeepsLastKnownGoodOnRawUfc() throws Exception {
-    final FakeClient client =
-        new FakeClient(
-            response(200, "etag-good", emptyConfig()),
-            response(200, "etag-raw", emptyConfigAttributes()));
-    final Config config = config();
-    lenient()
-        .when(config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl())
-        .thenReturn("http://custom-backend/custom/ufc");
-    final AgentlessConfigurationSource service = service(client, config);
-    final ArgumentCaptor<ServerConfiguration> configuration =
-        ArgumentCaptor.forClass(ServerConfiguration.class);
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    assertTrue(service.pollOnce());
-    assertFalse(service.pollOnce());
-
-    verify(listener).accept(configuration.capture());
-    assertEquals("Staging", configuration.getValue().environment.name);
-    assertNull(client.requests.get(0).etag);
-    assertEquals("etag-good", client.requests.get(1).etag);
-  }
-
-  @Test
-  void ignoresBlankEtag() throws Exception {
-    final FakeClient client =
-        new FakeClient(response(200, " ", emptyConfig()), response(304, null, null));
-    final AgentlessConfigurationSource service = service(client);
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    assertTrue(service.pollOnce());
-    assertTrue(service.pollOnce());
-
-    assertNull(client.requests.get(1).etag);
-    verify(listener).accept(any(ServerConfiguration.class));
-  }
-
-  @Test
-  void successfulResponseWithoutEtagClearsPreviousEtag() throws Exception {
-    final FakeClient client =
-        new FakeClient(
-            response(200, "etag-a", emptyConfig()),
-            response(200, null, emptyConfig()),
-            response(304, null, null));
-    final AgentlessConfigurationSource service = service(client);
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    assertTrue(service.pollOnce());
-    assertTrue(service.pollOnce());
-    assertTrue(service.pollOnce());
-
-    assertEquals("etag-a", client.requests.get(1).etag);
-    assertNull(client.requests.get(2).etag);
-    verify(listener, times(2)).accept(any(ServerConfiguration.class));
-  }
-
-  @Test
-  void usesEtagAndSkipsDispatchOnUnchangedConfig() throws Exception {
-    final FakeClient client =
-        new FakeClient(response(200, "etag-a", emptyConfig()), response(304, null, null));
-    final AgentlessConfigurationSource service = service(client);
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    assertTrue(service.pollOnce());
-    assertTrue(service.pollOnce());
-
-    verify(listener).accept(any(ServerConfiguration.class));
-    assertEquals("etag-a", client.requests.get(1).etag);
-  }
-
-  @Test
-  void coldNotModifiedDoesNotEstablishEtag() throws Exception {
-    final FakeClient client =
-        new FakeClient(response(304, "etag-cold", null), response(200, "etag-warm", emptyConfig()));
-    final AgentlessConfigurationSource service = service(client);
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    assertTrue(service.pollOnce());
-    assertTrue(service.pollOnce());
-
-    assertNull(client.requests.get(1).etag);
-    verify(listener).accept(any(ServerConfiguration.class));
-  }
-
-  @Test
-  void failedGatewayDispatchDoesNotAdvanceEtag() throws Exception {
-    final FakeClient client =
-        new FakeClient(
-            response(200, "etag-a", emptyConfig()), response(200, "etag-b", emptyConfig()));
-    final AgentlessConfigurationSource service = service(client);
-    final FeatureFlaggingGateway.ConfigListener failingListener =
-        configuration -> {
-          throw new IllegalStateException("listener rejected configuration");
+        assertTrue(service.pollOnce());
+        assertTrue(service.pollOnce());
+
+        assertNull(client.requests.get(1).etag);
+        verify(listener).accept(any(ServerConfiguration.class));
+    }
+
+    @Test
+    void successfulResponseWithoutEtagClearsPreviousEtag() throws Exception {
+        final FakeClient client = new FakeClient(
+                response(200, "etag-a", emptyConfig()), response(200, null, emptyConfig()), response(304, null, null));
+        final AgentlessConfigurationSource service = service(client);
+        FeatureFlaggingGateway.addConfigListener(listener);
+
+        assertTrue(service.pollOnce());
+        assertTrue(service.pollOnce());
+        assertTrue(service.pollOnce());
+
+        assertEquals("etag-a", client.requests.get(1).etag);
+        assertNull(client.requests.get(2).etag);
+        verify(listener, times(2)).accept(any(ServerConfiguration.class));
+    }
+
+    @Test
+    void usesEtagAndSkipsDispatchOnUnchangedConfig() throws Exception {
+        final FakeClient client = new FakeClient(response(200, "etag-a", emptyConfig()), response(304, null, null));
+        final AgentlessConfigurationSource service = service(client);
+        FeatureFlaggingGateway.addConfigListener(listener);
+
+        assertTrue(service.pollOnce());
+        assertTrue(service.pollOnce());
+
+        verify(listener).accept(any(ServerConfiguration.class));
+        assertEquals("etag-a", client.requests.get(1).etag);
+    }
+
+    @Test
+    void coldNotModifiedDoesNotEstablishEtag() throws Exception {
+        final FakeClient client =
+                new FakeClient(response(304, "etag-cold", null), response(200, "etag-warm", emptyConfig()));
+        final AgentlessConfigurationSource service = service(client);
+        FeatureFlaggingGateway.addConfigListener(listener);
+
+        assertTrue(service.pollOnce());
+        assertTrue(service.pollOnce());
+
+        assertNull(client.requests.get(1).etag);
+        verify(listener).accept(any(ServerConfiguration.class));
+    }
+
+    @Test
+    void failedGatewayDispatchDoesNotAdvanceEtag() throws Exception {
+        final FakeClient client =
+                new FakeClient(response(200, "etag-a", emptyConfig()), response(200, "etag-b", emptyConfig()));
+        final AgentlessConfigurationSource service = service(client);
+        final FeatureFlaggingGateway.ConfigListener failingListener = configuration -> {
+            throw new IllegalStateException("listener rejected configuration");
         };
-    FeatureFlaggingGateway.addConfigListener(failingListener);
-
-    try {
-      assertThrows(IllegalStateException.class, service::pollOnce);
-      FeatureFlaggingGateway.removeConfigListener(failingListener);
-
-      assertTrue(service.pollOnce());
-
-      assertNull(client.requests.get(1).etag);
-    } finally {
-      FeatureFlaggingGateway.removeConfigListener(failingListener);
-    }
-  }
-
-  @Test
-  void keepsLastKnownGoodOnAuthFailureAndMalformedPayload() throws Exception {
-    final FakeClient client =
-        new FakeClient(
-            response(200, "etag-good", emptyConfig()),
-            response(401, null, null),
-            response(200, null, "{not-json}"),
-            response(200, null, "{\"flags\":[]}"));
-    final AgentlessConfigurationSource service = service(client);
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    assertTrue(service.pollOnce());
-    assertFalse(service.pollOnce());
-    assertFalse(service.pollOnce());
-    assertFalse(service.pollOnce());
-
-    verify(listener).accept(any(ServerConfiguration.class));
-    assertEquals("etag-good", client.requests.get(1).etag);
-    assertEquals("etag-good", client.requests.get(2).etag);
-    assertEquals("etag-good", client.requests.get(3).etag);
-  }
-
-  @Test
-  void rejectsForbiddenNonOkMissingBodyAndNullConfiguration() throws Exception {
-    final FakeClient client =
-        new FakeClient(
-            response(403, null, null),
-            response(404, null, null),
-            response(600, null, null),
-            response(200, null, null),
-            response(200, null, "null"),
-            response(200, null, jsonApiResponse("other-configuration", emptyConfigAttributes())),
-            response(200, null, "{\"data\":null}"),
-            response(
-                200, null, "{\"data\":{\"id\":\"1\",\"type\":\"universal-flag-configuration\"}}"),
-            response(200, null, emptyConfigAttributes()));
-    final AgentlessConfigurationSource service = service(client);
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    assertFalse(service.pollOnce());
-    assertFalse(service.pollOnce());
-    assertFalse(service.pollOnce());
-    assertFalse(service.pollOnce());
-    assertFalse(service.pollOnce());
-    assertFalse(service.pollOnce());
-    assertFalse(service.pollOnce());
-    assertFalse(service.pollOnce());
-    assertFalse(service.pollOnce());
-
-    verifyNoInteractions(listener);
-  }
-
-  @Test
-  void warnsRateLimitedOnUnauthorizedAndForbidden() throws Exception {
-    final RatelimitedLogger ratelimitedLogger = mock(RatelimitedLogger.class);
-    final FakeClient client = new FakeClient(response(401, null, null), response(403, null, null));
-    final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
-    final AgentlessConfigurationSource service =
-        new AgentlessConfigurationSource(
-            HttpUrl.get("http://localhost" + CONFIG_PATH),
-            config(),
-            30_000,
-            client,
-            executor,
-            ratelimitedLogger);
-
-    try {
-      assertFalse(service.pollOnce());
-      assertFalse(service.pollOnce());
-
-      verify(ratelimitedLogger)
-          .warn(
-              "Feature Flagging agentless endpoint returned HTTP {}; verify endpoint authentication",
-              HttpURLConnection.HTTP_UNAUTHORIZED);
-      verify(ratelimitedLogger)
-          .warn(
-              "Feature Flagging agentless endpoint returned HTTP {}; verify endpoint authentication",
-              HttpURLConnection.HTTP_FORBIDDEN);
-    } finally {
-      service.close();
-    }
-  }
-
-  @Test
-  void retriesTimeoutBeforeApplyingConfig() throws Exception {
-    final List<okhttp3.Request> requests = new ArrayList<>();
-    final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-        scriptedClient(
-            requests,
-            delay -> {},
-            () -> 1.0,
-            new SocketTimeoutException("slow HTTP configuration source"),
-            new SocketTimeoutException("slow HTTP configuration source"),
-            response(200, "etag-a", emptyConfig()));
-    final AgentlessConfigurationSource service = service(client);
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    assertTrue(service.pollOnce());
-
-    assertEquals(3, requests.size());
-    verify(listener).accept(any(ServerConfiguration.class));
-  }
-
-  @Test
-  void retriesClientTimeoutAndRateLimitStatusBeforeApplyingConfig() throws Exception {
-    final List<okhttp3.Request> requests = new ArrayList<>();
-    final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-        scriptedClient(
-            requests,
-            delay -> {},
-            () -> 1.0,
-            response(408, null, null),
-            response(200, "etag-a", emptyConfig()),
-            response(429, null, null),
-            response(200, "etag-b", emptyConfig()));
-    final AgentlessConfigurationSource service = service(client);
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    assertTrue(service.pollOnce());
-    assertTrue(service.pollOnce());
-
-    assertEquals(4, requests.size());
-    verify(listener, times(2)).accept(any(ServerConfiguration.class));
-  }
-
-  @Test
-  void retriesServerErrorThenKeepsColdStateOnNotModified() throws Exception {
-    final List<okhttp3.Request> requests = new ArrayList<>();
-    final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-        scriptedClient(
-            requests, delay -> {}, () -> 1.0, response(500, null, null), response(304, null, null));
-    final AgentlessConfigurationSource service = service(client);
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    assertTrue(service.pollOnce());
-
-    assertEquals(2, requests.size());
-    verifyNoInteractions(listener);
-  }
-
-  @Test
-  void warnsRateLimitedAfterRetryableFailuresAreExhausted() throws Exception {
-    final RatelimitedLogger ratelimitedLogger = mock(RatelimitedLogger.class);
-    final List<okhttp3.Request> requests = new ArrayList<>();
-    final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-        scriptedClient(
-            requests,
-            delay -> {},
-            () -> 1.0,
-            response(503, null, null),
-            response(503, null, null),
-            response(503, null, null));
-    final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
-    final AgentlessConfigurationSource service =
-        new AgentlessConfigurationSource(
-            HttpUrl.get("http://localhost" + CONFIG_PATH),
-            config(),
-            30_000,
-            client,
-            executor,
-            ratelimitedLogger);
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    try {
-      assertFalse(service.pollOnce());
-
-      assertEquals(3, requests.size());
-      verify(ratelimitedLogger)
-          .warn(
-              "Feature Flagging agentless endpoint failed after {} attempts with HTTP {}", 3, 503);
-      verifyNoInteractions(listener);
-    } finally {
-      service.close();
-    }
-  }
-
-  @Test
-  void warnsRateLimitedAfterIoFailuresAreExhausted() throws Exception {
-    final RatelimitedLogger ratelimitedLogger = mock(RatelimitedLogger.class);
-    final SocketTimeoutException finalFailure =
-        new SocketTimeoutException("slow HTTP configuration source");
-    final List<okhttp3.Request> requests = new ArrayList<>();
-    final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-        scriptedClient(
-            requests,
-            delay -> {},
-            () -> 1.0,
-            new SocketTimeoutException("slow HTTP configuration source"),
-            new SocketTimeoutException("slow HTTP configuration source"),
-            finalFailure);
-    final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
-    final AgentlessConfigurationSource service =
-        new AgentlessConfigurationSource(
-            HttpUrl.get("http://localhost" + CONFIG_PATH),
-            config(),
-            30_000,
-            client,
-            executor,
-            ratelimitedLogger);
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    try {
-      assertFalse(service.pollOnce());
-
-      assertEquals(3, requests.size());
-      verify(ratelimitedLogger)
-          .warn(
-              "Feature Flagging agentless endpoint request failed after {} attempts",
-              3,
-              finalFailure);
-      verifyNoInteractions(listener);
-    } finally {
-      service.close();
-    }
-  }
-
-  @Test
-  void usesIntervalAwareRetryBackoff() throws Exception {
-    final List<Long> delays = new ArrayList<>();
-    final List<okhttp3.Request> requests = new ArrayList<>();
-    final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-        scriptedClient(
-            requests,
-            delays::add,
-            () -> 1.0,
-            response(503, null, null),
-            new SocketTimeoutException("slow HTTP configuration source"),
-            response(200, "etag-a", emptyConfig()));
-    final AgentlessConfigurationSource service = service(client);
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    assertTrue(service.pollOnce());
-
-    assertEquals(Arrays.asList(5_000L, 10_000L), delays);
-    assertEquals(3, requests.size());
-    verify(listener).accept(any(ServerConfiguration.class));
-  }
-
-  @Test
-  void retryPolicyRejectsNonIoAndInterruptedIoFailures() {
-    final AgentlessConfigurationSource.AgentlessRetryPolicy policy =
-        retryPolicy(new AtomicBoolean());
-
-    assertFalse(policy.shouldRetry(new IllegalStateException("not an I/O failure")));
-
-    Thread.currentThread().interrupt();
-    try {
-      assertFalse(policy.shouldRetry(new IOException("interrupted")));
-    } finally {
-      assertTrue(Thread.interrupted());
-    }
-  }
-
-  @Test
-  void retryPolicyRejectsMissingResponse() {
-    final AgentlessConfigurationSource.AgentlessRetryPolicy policy =
-        retryPolicy(new AtomicBoolean());
-
-    assertFalse(policy.shouldRetry((Response) null));
-  }
-
-  @Test
-  void cancelledRetryPolicyRejectsBackoff() {
-    final AgentlessConfigurationSource.AgentlessRetryPolicy policy =
-        retryPolicy(new AtomicBoolean(true));
-
-    assertThrows(InterruptedIOException.class, policy::backoff);
-  }
-
-  @Test
-  void clampsAndJittersRetryBackoff() {
-    assertEquals(2_000, AgentlessConfigurationSource.retryDelayMillis(1_000, 1, 1.0));
-    assertEquals(5_000, AgentlessConfigurationSource.retryDelayMillis(1_000, 2, 1.0));
-    assertEquals(10_000, AgentlessConfigurationSource.retryDelayMillis(600_000, 1, 1.0));
-    assertEquals(30_000, AgentlessConfigurationSource.retryDelayMillis(600_000, 2, 1.0));
-    assertEquals(6_000, AgentlessConfigurationSource.retryDelayMillis(30_000, 1, 1.2));
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> AgentlessConfigurationSource.retryDelayMillis(30_000, 3, 1.0));
-  }
-
-  @Test
-  void rejectsOverlappingPolls() throws Exception {
-    final CountDownLatch requestStarted = new CountDownLatch(1);
-    final CountDownLatch releaseRequest = new CountDownLatch(1);
-    final FakeClient client = new FakeClient(response(200, "etag-a", emptyConfig()));
-    client.block(requestStarted, releaseRequest);
-    final AgentlessConfigurationSource service = service(client);
-    final ExecutorService runner = Executors.newFixedThreadPool(2);
-
-    try {
-      final Future<Boolean> first = runner.submit(service::pollOnce);
-      assertTrue(requestStarted.await(1, TimeUnit.SECONDS));
-      final Future<Boolean> second = runner.submit(service::pollOnce);
-
-      assertFalse(second.get(1, TimeUnit.SECONDS));
-      releaseRequest.countDown();
-      assertTrue(first.get(1, TimeUnit.SECONDS));
-      assertEquals(1, client.calls.get());
-    } finally {
-      releaseRequest.countDown();
-      runner.shutdownNow();
-    }
-  }
-
-  @Test
-  void initCompletesFirstPollAndCloseCancelsScheduledFuture() throws Exception {
-    final FakeClient client = new FakeClient(response(200, "etag-a", emptyConfig()));
-    final AgentlessConfigurationSource service =
-        new AgentlessConfigurationSource(
-            HttpUrl.get("http://localhost" + CONFIG_PATH),
-            config(),
-            60_000,
-            client,
-            Executors.newSingleThreadScheduledExecutor());
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    service.init();
-    assertEquals(1, client.calls.get());
-    service.close();
-
-    verify(listener).accept(any(ServerConfiguration.class));
-  }
-
-  @Test
-  void initCompletesInitialRetryCycleBeforeReturning() throws Exception {
-    final List<okhttp3.Request> requests = new ArrayList<>();
-    final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-        scriptedClient(
-            requests,
-            delay -> {},
-            () -> 1.0,
-            response(500, null, null),
-            response(200, "etag-a", emptyConfig()));
-    final AgentlessConfigurationSource service =
-        new AgentlessConfigurationSource(
-            HttpUrl.get("http://localhost" + CONFIG_PATH),
-            config(),
-            60_000,
-            client,
-            Executors.newSingleThreadScheduledExecutor());
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    try {
-      service.init();
-
-      assertEquals(2, requests.size());
-      verify(listener).accept(any(ServerConfiguration.class));
-    } finally {
-      service.close();
-    }
-  }
-
-  @Test
-  void repeatedInitStartsOnlyOnePoller() throws Exception {
-    final FakeClient client = new FakeClient(response(200, "etag-a", emptyConfig()));
-    final AgentlessConfigurationSource service = service(client);
-
-    service.init();
-    service.init();
-    awaitCalls(client, 1);
-    service.close();
-
-    assertEquals(1, client.calls.get());
-  }
-
-  @Test
-  void scheduledPollContinuesAfterListenerRuntimeException() throws Exception {
-    final FakeClient client =
-        new FakeClient(
-            response(200, "etag-a", emptyConfig()), response(200, "etag-b", emptyConfig()));
-    final AgentlessConfigurationSource service =
-        new AgentlessConfigurationSource(
-            HttpUrl.get("http://localhost" + CONFIG_PATH),
-            config(),
-            10,
-            client,
-            Executors.newSingleThreadScheduledExecutor());
-    final AtomicInteger listenerCalls = new AtomicInteger();
-    // Wait on the listener rather than on FakeClient.calls: the call counter is incremented when
-    // a request starts, so it reaches 2 before the second configuration has been applied.
-    final CountDownLatch listenerNotified = new CountDownLatch(2);
-    final FeatureFlaggingGateway.ConfigListener flakyListener =
-        configuration -> {
-          final int call = listenerCalls.incrementAndGet();
-          listenerNotified.countDown();
-          if (call == 1) {
-            throw new IllegalStateException("listener rejected first configuration");
-          }
+        FeatureFlaggingGateway.addConfigListener(failingListener);
+
+        try {
+            assertThrows(IllegalStateException.class, service::pollOnce);
+            FeatureFlaggingGateway.removeConfigListener(failingListener);
+
+            assertTrue(service.pollOnce());
+
+            assertNull(client.requests.get(1).etag);
+        } finally {
+            FeatureFlaggingGateway.removeConfigListener(failingListener);
+        }
+    }
+
+    @Test
+    void keepsLastKnownGoodOnAuthFailureAndMalformedPayload() throws Exception {
+        final FakeClient client = new FakeClient(
+                response(200, "etag-good", emptyConfig()),
+                response(401, null, null),
+                response(200, null, "{not-json}"),
+                response(200, null, "{\"flags\":[]}"));
+        final AgentlessConfigurationSource service = service(client);
+        FeatureFlaggingGateway.addConfigListener(listener);
+
+        assertTrue(service.pollOnce());
+        assertFalse(service.pollOnce());
+        assertFalse(service.pollOnce());
+        assertFalse(service.pollOnce());
+
+        verify(listener).accept(any(ServerConfiguration.class));
+        assertEquals("etag-good", client.requests.get(1).etag);
+        assertEquals("etag-good", client.requests.get(2).etag);
+        assertEquals("etag-good", client.requests.get(3).etag);
+    }
+
+    @Test
+    void rejectsForbiddenNonOkMissingBodyAndNullConfiguration() throws Exception {
+        final FakeClient client = new FakeClient(
+                response(403, null, null),
+                response(404, null, null),
+                response(600, null, null),
+                response(200, null, null),
+                response(200, null, "null"),
+                response(200, null, jsonApiResponse("other-configuration", emptyConfigAttributes())),
+                response(200, null, "{\"data\":null}"),
+                response(200, null, "{\"data\":{\"id\":\"1\",\"type\":\"universal-flag-configuration\"}}"),
+                response(200, null, emptyConfigAttributes()));
+        final AgentlessConfigurationSource service = service(client);
+        FeatureFlaggingGateway.addConfigListener(listener);
+
+        assertFalse(service.pollOnce());
+        assertFalse(service.pollOnce());
+        assertFalse(service.pollOnce());
+        assertFalse(service.pollOnce());
+        assertFalse(service.pollOnce());
+        assertFalse(service.pollOnce());
+        assertFalse(service.pollOnce());
+        assertFalse(service.pollOnce());
+        assertFalse(service.pollOnce());
+
+        verifyNoInteractions(listener);
+    }
+
+    @Test
+    void warnsRateLimitedOnUnauthorizedAndForbidden() throws Exception {
+        final RatelimitedLogger ratelimitedLogger = mock(RatelimitedLogger.class);
+        final FakeClient client = new FakeClient(response(401, null, null), response(403, null, null));
+        final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
+        final AgentlessConfigurationSource service = new AgentlessConfigurationSource(
+                HttpUrl.get("http://localhost" + CONFIG_PATH), config(), 30_000, client, executor, ratelimitedLogger);
+
+        try {
+            assertFalse(service.pollOnce());
+            assertFalse(service.pollOnce());
+
+            verify(ratelimitedLogger)
+                    .warn(
+                            "Feature Flagging agentless endpoint returned HTTP {}; verify endpoint authentication",
+                            HttpURLConnection.HTTP_UNAUTHORIZED);
+            verify(ratelimitedLogger)
+                    .warn(
+                            "Feature Flagging agentless endpoint returned HTTP {}; verify endpoint authentication",
+                            HttpURLConnection.HTTP_FORBIDDEN);
+        } finally {
+            service.close();
+        }
+    }
+
+    @Test
+    void retriesTimeoutBeforeApplyingConfig() throws Exception {
+        final List<okhttp3.Request> requests = new ArrayList<>();
+        final AgentlessConfigurationSource.OkHttpUfcHttpClient client = scriptedClient(
+                requests,
+                delay -> {},
+                () -> 1.0,
+                new SocketTimeoutException("slow HTTP configuration source"),
+                new SocketTimeoutException("slow HTTP configuration source"),
+                response(200, "etag-a", emptyConfig()));
+        final AgentlessConfigurationSource service = service(client);
+        FeatureFlaggingGateway.addConfigListener(listener);
+
+        assertTrue(service.pollOnce());
+
+        assertEquals(3, requests.size());
+        verify(listener).accept(any(ServerConfiguration.class));
+    }
+
+    @Test
+    void retriesClientTimeoutAndRateLimitStatusBeforeApplyingConfig() throws Exception {
+        final List<okhttp3.Request> requests = new ArrayList<>();
+        final AgentlessConfigurationSource.OkHttpUfcHttpClient client = scriptedClient(
+                requests,
+                delay -> {},
+                () -> 1.0,
+                response(408, null, null),
+                response(200, "etag-a", emptyConfig()),
+                response(429, null, null),
+                response(200, "etag-b", emptyConfig()));
+        final AgentlessConfigurationSource service = service(client);
+        FeatureFlaggingGateway.addConfigListener(listener);
+
+        assertTrue(service.pollOnce());
+        assertTrue(service.pollOnce());
+
+        assertEquals(4, requests.size());
+        verify(listener, times(2)).accept(any(ServerConfiguration.class));
+    }
+
+    @Test
+    void retriesServerErrorThenKeepsColdStateOnNotModified() throws Exception {
+        final List<okhttp3.Request> requests = new ArrayList<>();
+        final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
+                scriptedClient(requests, delay -> {}, () -> 1.0, response(500, null, null), response(304, null, null));
+        final AgentlessConfigurationSource service = service(client);
+        FeatureFlaggingGateway.addConfigListener(listener);
+
+        assertTrue(service.pollOnce());
+
+        assertEquals(2, requests.size());
+        verifyNoInteractions(listener);
+    }
+
+    @Test
+    void warnsRateLimitedAfterRetryableFailuresAreExhausted() throws Exception {
+        final RatelimitedLogger ratelimitedLogger = mock(RatelimitedLogger.class);
+        final List<okhttp3.Request> requests = new ArrayList<>();
+        final AgentlessConfigurationSource.OkHttpUfcHttpClient client = scriptedClient(
+                requests,
+                delay -> {},
+                () -> 1.0,
+                response(503, null, null),
+                response(503, null, null),
+                response(503, null, null));
+        final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
+        final AgentlessConfigurationSource service = new AgentlessConfigurationSource(
+                HttpUrl.get("http://localhost" + CONFIG_PATH), config(), 30_000, client, executor, ratelimitedLogger);
+        FeatureFlaggingGateway.addConfigListener(listener);
+
+        try {
+            assertFalse(service.pollOnce());
+
+            assertEquals(3, requests.size());
+            verify(ratelimitedLogger)
+                    .warn("Feature Flagging agentless endpoint failed after {} attempts with HTTP {}", 3, 503);
+            verifyNoInteractions(listener);
+        } finally {
+            service.close();
+        }
+    }
+
+    @Test
+    void warnsRateLimitedAfterIoFailuresAreExhausted() throws Exception {
+        final RatelimitedLogger ratelimitedLogger = mock(RatelimitedLogger.class);
+        final SocketTimeoutException finalFailure = new SocketTimeoutException("slow HTTP configuration source");
+        final List<okhttp3.Request> requests = new ArrayList<>();
+        final AgentlessConfigurationSource.OkHttpUfcHttpClient client = scriptedClient(
+                requests,
+                delay -> {},
+                () -> 1.0,
+                new SocketTimeoutException("slow HTTP configuration source"),
+                new SocketTimeoutException("slow HTTP configuration source"),
+                finalFailure);
+        final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
+        final AgentlessConfigurationSource service = new AgentlessConfigurationSource(
+                HttpUrl.get("http://localhost" + CONFIG_PATH), config(), 30_000, client, executor, ratelimitedLogger);
+        FeatureFlaggingGateway.addConfigListener(listener);
+
+        try {
+            assertFalse(service.pollOnce());
+
+            assertEquals(3, requests.size());
+            verify(ratelimitedLogger)
+                    .warn("Feature Flagging agentless endpoint request failed after {} attempts", 3, finalFailure);
+            verifyNoInteractions(listener);
+        } finally {
+            service.close();
+        }
+    }
+
+    @Test
+    void usesIntervalAwareRetryBackoff() throws Exception {
+        final List<Long> delays = new ArrayList<>();
+        final List<okhttp3.Request> requests = new ArrayList<>();
+        final AgentlessConfigurationSource.OkHttpUfcHttpClient client = scriptedClient(
+                requests,
+                delays::add,
+                () -> 1.0,
+                response(503, null, null),
+                new SocketTimeoutException("slow HTTP configuration source"),
+                response(200, "etag-a", emptyConfig()));
+        final AgentlessConfigurationSource service = service(client);
+        FeatureFlaggingGateway.addConfigListener(listener);
+
+        assertTrue(service.pollOnce());
+
+        assertEquals(Arrays.asList(5_000L, 10_000L), delays);
+        assertEquals(3, requests.size());
+        verify(listener).accept(any(ServerConfiguration.class));
+    }
+
+    @Test
+    void retryPolicyRejectsNonIoAndInterruptedIoFailures() {
+        final AgentlessConfigurationSource.AgentlessRetryPolicy policy = retryPolicy(new AtomicBoolean());
+
+        assertFalse(policy.shouldRetry(new IllegalStateException("not an I/O failure")));
+
+        Thread.currentThread().interrupt();
+        try {
+            assertFalse(policy.shouldRetry(new IOException("interrupted")));
+        } finally {
+            assertTrue(Thread.interrupted());
+        }
+    }
+
+    @Test
+    void retryPolicyRejectsMissingResponse() {
+        final AgentlessConfigurationSource.AgentlessRetryPolicy policy = retryPolicy(new AtomicBoolean());
+
+        assertFalse(policy.shouldRetry((Response) null));
+    }
+
+    @Test
+    void cancelledRetryPolicyRejectsBackoff() {
+        final AgentlessConfigurationSource.AgentlessRetryPolicy policy = retryPolicy(new AtomicBoolean(true));
+
+        assertThrows(InterruptedIOException.class, policy::backoff);
+    }
+
+    @Test
+    void clampsAndJittersRetryBackoff() {
+        assertEquals(2_000, AgentlessConfigurationSource.retryDelayMillis(1_000, 1, 1.0));
+        assertEquals(5_000, AgentlessConfigurationSource.retryDelayMillis(1_000, 2, 1.0));
+        assertEquals(10_000, AgentlessConfigurationSource.retryDelayMillis(600_000, 1, 1.0));
+        assertEquals(30_000, AgentlessConfigurationSource.retryDelayMillis(600_000, 2, 1.0));
+        assertEquals(6_000, AgentlessConfigurationSource.retryDelayMillis(30_000, 1, 1.2));
+        assertThrows(
+                IllegalArgumentException.class, () -> AgentlessConfigurationSource.retryDelayMillis(30_000, 3, 1.0));
+    }
+
+    @Test
+    void rejectsOverlappingPolls() throws Exception {
+        final CountDownLatch requestStarted = new CountDownLatch(1);
+        final CountDownLatch releaseRequest = new CountDownLatch(1);
+        final FakeClient client = new FakeClient(response(200, "etag-a", emptyConfig()));
+        client.block(requestStarted, releaseRequest);
+        final AgentlessConfigurationSource service = service(client);
+        final ExecutorService runner = Executors.newFixedThreadPool(2);
+
+        try {
+            final Future<Boolean> first = runner.submit(service::pollOnce);
+            assertTrue(requestStarted.await(1, TimeUnit.SECONDS));
+            final Future<Boolean> second = runner.submit(service::pollOnce);
+
+            assertFalse(second.get(1, TimeUnit.SECONDS));
+            releaseRequest.countDown();
+            assertTrue(first.get(1, TimeUnit.SECONDS));
+            assertEquals(1, client.calls.get());
+        } finally {
+            releaseRequest.countDown();
+            runner.shutdownNow();
+        }
+    }
+
+    @Test
+    void initCompletesFirstPollAndCloseCancelsScheduledFuture() throws Exception {
+        final FakeClient client = new FakeClient(response(200, "etag-a", emptyConfig()));
+        final AgentlessConfigurationSource service = new AgentlessConfigurationSource(
+                HttpUrl.get("http://localhost" + CONFIG_PATH),
+                config(),
+                60_000,
+                client,
+                Executors.newSingleThreadScheduledExecutor());
+        FeatureFlaggingGateway.addConfigListener(listener);
+
+        service.init();
+        assertEquals(1, client.calls.get());
+        service.close();
+
+        verify(listener).accept(any(ServerConfiguration.class));
+    }
+
+    @Test
+    void initCompletesInitialRetryCycleBeforeReturning() throws Exception {
+        final List<okhttp3.Request> requests = new ArrayList<>();
+        final AgentlessConfigurationSource.OkHttpUfcHttpClient client = scriptedClient(
+                requests, delay -> {}, () -> 1.0, response(500, null, null), response(200, "etag-a", emptyConfig()));
+        final AgentlessConfigurationSource service = new AgentlessConfigurationSource(
+                HttpUrl.get("http://localhost" + CONFIG_PATH),
+                config(),
+                60_000,
+                client,
+                Executors.newSingleThreadScheduledExecutor());
+        FeatureFlaggingGateway.addConfigListener(listener);
+
+        try {
+            service.init();
+
+            assertEquals(2, requests.size());
+            verify(listener).accept(any(ServerConfiguration.class));
+        } finally {
+            service.close();
+        }
+    }
+
+    @Test
+    void repeatedInitStartsOnlyOnePoller() throws Exception {
+        final FakeClient client = new FakeClient(response(200, "etag-a", emptyConfig()));
+        final AgentlessConfigurationSource service = service(client);
+
+        service.init();
+        service.init();
+        awaitCalls(client, 1);
+        service.close();
+
+        assertEquals(1, client.calls.get());
+    }
+
+    @Test
+    void scheduledPollContinuesAfterListenerRuntimeException() throws Exception {
+        final FakeClient client =
+                new FakeClient(response(200, "etag-a", emptyConfig()), response(200, "etag-b", emptyConfig()));
+        final AgentlessConfigurationSource service = new AgentlessConfigurationSource(
+                HttpUrl.get("http://localhost" + CONFIG_PATH),
+                config(),
+                10,
+                client,
+                Executors.newSingleThreadScheduledExecutor());
+        final AtomicInteger listenerCalls = new AtomicInteger();
+        // Wait on the listener rather than on FakeClient.calls: the call counter is incremented when
+        // a request starts, so it reaches 2 before the second configuration has been applied.
+        final CountDownLatch listenerNotified = new CountDownLatch(2);
+        final FeatureFlaggingGateway.ConfigListener flakyListener = configuration -> {
+            final int call = listenerCalls.incrementAndGet();
+            listenerNotified.countDown();
+            if (call == 1) {
+                throw new IllegalStateException("listener rejected first configuration");
+            }
         };
-    FeatureFlaggingGateway.addConfigListener(flakyListener);
-
-    try {
-      service.init();
-      assertTrue(listenerNotified.await(5, TimeUnit.SECONDS));
-
-      assertEquals(2, listenerCalls.get());
-      assertNull(client.requests.get(1).etag);
-    } finally {
-      service.close();
-      FeatureFlaggingGateway.removeConfigListener(flakyListener);
-    }
-  }
-
-  @Test
-  void closeCancelsInFlightRequestAndIgnoresLateSuccess() throws Exception {
-    final CountDownLatch requestStarted = new CountDownLatch(1);
-    final CountDownLatch releaseRequest = new CountDownLatch(1);
-    final FakeClient client = new FakeClient(response(200, "etag-a", emptyConfig()));
-    client.block(requestStarted, releaseRequest);
-    final AgentlessConfigurationSource service = service(client);
-    final ExecutorService runner = Executors.newSingleThreadExecutor();
-    FeatureFlaggingGateway.addConfigListener(listener);
-
-    try {
-      final Future<Boolean> poll = runner.submit(service::pollOnce);
-      assertTrue(requestStarted.await(1, TimeUnit.SECONDS));
-
-      service.close();
-
-      assertFalse(poll.get(1, TimeUnit.SECONDS));
-      assertEquals(1, client.cancelCalls.get());
-      assertEquals(1, client.calls.get());
-      verifyNoInteractions(listener);
-    } finally {
-      releaseRequest.countDown();
-      runner.shutdownNow();
-    }
-  }
-
-  @Test
-  void closeDuringIoFailurePreventsRetry() throws Exception {
-    final CountDownLatch requestStarted = new CountDownLatch(1);
-    final CountDownLatch releaseRequest = new CountDownLatch(1);
-    final FakeClient client =
-        new FakeClient(new SocketTimeoutException("slow HTTP configuration source"));
-    client.block(requestStarted, releaseRequest);
-    final AgentlessConfigurationSource service = service(client);
-    final ExecutorService runner = Executors.newSingleThreadExecutor();
-
-    try {
-      final Future<Boolean> poll = runner.submit(service::pollOnce);
-      assertTrue(requestStarted.await(1, TimeUnit.SECONDS));
-
-      service.close();
-
-      assertFalse(poll.get(1, TimeUnit.SECONDS));
-      assertEquals(1, client.calls.get());
-    } finally {
-      releaseRequest.countDown();
-      runner.shutdownNow();
-    }
-  }
-
-  @Test
-  void closeInterruptsRetryBackoff() throws Exception {
-    final CountDownLatch backoffStarted = new CountDownLatch(1);
-    final List<okhttp3.Request> requests = new ArrayList<>();
-    final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
-    final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-        scriptedClient(
-            requests,
-            delay -> {
-              backoffStarted.countDown();
-              TimeUnit.MINUTES.sleep(1);
-            },
-            () -> 1.0,
-            new SocketTimeoutException("slow HTTP configuration source"),
-            response(200, "etag-a", emptyConfig()));
-    final AgentlessConfigurationSource service =
-        new AgentlessConfigurationSource(
-            HttpUrl.get("http://localhost" + CONFIG_PATH), config(), 30_000, client, executor);
-    final ExecutorService runner = Executors.newSingleThreadExecutor();
-
-    try {
-      final Future<?> initialization = runner.submit(service::init);
-      assertTrue(backoffStarted.await(1, TimeUnit.SECONDS));
-
-      service.close();
-
-      initialization.get(1, TimeUnit.SECONDS);
-      assertTrue(executor.awaitTermination(1, TimeUnit.SECONDS));
-      assertEquals(1, requests.size());
-    } finally {
-      runner.shutdownNow();
-    }
-  }
-
-  @Test
-  void closePreventsFurtherPolls() throws Exception {
-    final FakeClient client = new FakeClient(response(200, "etag-a", emptyConfig()));
-    final AgentlessConfigurationSource service = service(client);
-
-    service.close();
-
-    assertFalse(service.pollOnce());
-    assertEquals(0, client.calls.get());
-  }
-
-  @Test
-  void initAfterCloseDoesNotSchedulePoll() throws Exception {
-    final FakeClient client = new FakeClient(response(200, "etag-a", emptyConfig()));
-    final AgentlessConfigurationSource service = service(client);
-
-    service.close();
-    service.init();
-
-    assertEquals(0, client.calls.get());
-  }
-
-  @Nested
-  class SystemTestParity {
+        FeatureFlaggingGateway.addConfigListener(flakyListener);
+
+        try {
+            service.init();
+            assertTrue(listenerNotified.await(5, TimeUnit.SECONDS));
+
+            assertEquals(2, listenerCalls.get());
+            assertNull(client.requests.get(1).etag);
+        } finally {
+            service.close();
+            FeatureFlaggingGateway.removeConfigListener(flakyListener);
+        }
+    }
+
+    @Test
+    void closeCancelsInFlightRequestAndIgnoresLateSuccess() throws Exception {
+        final CountDownLatch requestStarted = new CountDownLatch(1);
+        final CountDownLatch releaseRequest = new CountDownLatch(1);
+        final FakeClient client = new FakeClient(response(200, "etag-a", emptyConfig()));
+        client.block(requestStarted, releaseRequest);
+        final AgentlessConfigurationSource service = service(client);
+        final ExecutorService runner = Executors.newSingleThreadExecutor();
+        FeatureFlaggingGateway.addConfigListener(listener);
+
+        try {
+            final Future<Boolean> poll = runner.submit(service::pollOnce);
+            assertTrue(requestStarted.await(1, TimeUnit.SECONDS));
+
+            service.close();
+
+            assertFalse(poll.get(1, TimeUnit.SECONDS));
+            assertEquals(1, client.cancelCalls.get());
+            assertEquals(1, client.calls.get());
+            verifyNoInteractions(listener);
+        } finally {
+            releaseRequest.countDown();
+            runner.shutdownNow();
+        }
+    }
+
+    @Test
+    void closeDuringIoFailurePreventsRetry() throws Exception {
+        final CountDownLatch requestStarted = new CountDownLatch(1);
+        final CountDownLatch releaseRequest = new CountDownLatch(1);
+        final FakeClient client = new FakeClient(new SocketTimeoutException("slow HTTP configuration source"));
+        client.block(requestStarted, releaseRequest);
+        final AgentlessConfigurationSource service = service(client);
+        final ExecutorService runner = Executors.newSingleThreadExecutor();
+
+        try {
+            final Future<Boolean> poll = runner.submit(service::pollOnce);
+            assertTrue(requestStarted.await(1, TimeUnit.SECONDS));
+
+            service.close();
+
+            assertFalse(poll.get(1, TimeUnit.SECONDS));
+            assertEquals(1, client.calls.get());
+        } finally {
+            releaseRequest.countDown();
+            runner.shutdownNow();
+        }
+    }
+
+    @Test
+    void closeInterruptsRetryBackoff() throws Exception {
+        final CountDownLatch backoffStarted = new CountDownLatch(1);
+        final List<okhttp3.Request> requests = new ArrayList<>();
+        final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
+        final AgentlessConfigurationSource.OkHttpUfcHttpClient client = scriptedClient(
+                requests,
+                delay -> {
+                    backoffStarted.countDown();
+                    TimeUnit.MINUTES.sleep(1);
+                },
+                () -> 1.0,
+                new SocketTimeoutException("slow HTTP configuration source"),
+                response(200, "etag-a", emptyConfig()));
+        final AgentlessConfigurationSource service = new AgentlessConfigurationSource(
+                HttpUrl.get("http://localhost" + CONFIG_PATH), config(), 30_000, client, executor);
+        final ExecutorService runner = Executors.newSingleThreadExecutor();
+
+        try {
+            final Future<?> initialization = runner.submit(service::init);
+            assertTrue(backoffStarted.await(1, TimeUnit.SECONDS));
+
+            service.close();
+
+            initialization.get(1, TimeUnit.SECONDS);
+            assertTrue(executor.awaitTermination(1, TimeUnit.SECONDS));
+            assertEquals(1, requests.size());
+        } finally {
+            runner.shutdownNow();
+        }
+    }
+
+    @Test
+    void closePreventsFurtherPolls() throws Exception {
+        final FakeClient client = new FakeClient(response(200, "etag-a", emptyConfig()));
+        final AgentlessConfigurationSource service = service(client);
+
+        service.close();
+
+        assertFalse(service.pollOnce());
+        assertEquals(0, client.calls.get());
+    }
+
     @Test
-    void preservesSystemTestSourceTransitionsAndLastKnownGoodState() throws Exception {
-      final List<okhttp3.Request> requests = new ArrayList<>();
-      final AgentlessConfigurationSource.OkHttpUfcHttpClient client =
-          scriptedClient(
-              requests,
-              delay -> {},
-              () -> 1.0,
-              response(200, "etag-a", emptyConfig()),
-              response(304, "etag-must-not-replace-a", null),
-              response(509, null, null),
-              response(200, "etag-b", emptyConfig()),
-              response(200, "etag-c", "{not-json}"),
-              response(401, null, null));
-      final AgentlessConfigurationSource service = service(client);
-      FeatureFlaggingGateway.addConfigListener(listener);
-
-      assertTrue(service.pollOnce());
-      assertTrue(service.pollOnce());
-      assertTrue(service.pollOnce());
-      assertFalse(service.pollOnce());
-      assertFalse(service.pollOnce());
-
-      verify(listener, times(2)).accept(any(ServerConfiguration.class));
-      assertEquals("etag-a", requests.get(1).header("If-None-Match"));
-      assertEquals("etag-a", requests.get(2).header("If-None-Match"));
-      assertEquals("etag-a", requests.get(3).header("If-None-Match"));
-      assertEquals("etag-b", requests.get(4).header("If-None-Match"));
-      assertEquals("etag-b", requests.get(5).header("If-None-Match"));
-    }
-  }
-
-  private static AgentlessConfigurationSource service(
-      final AgentlessConfigurationSource.UfcHttpClient client) {
-    return new AgentlessConfigurationSource(
-        HttpUrl.get("http://localhost" + CONFIG_PATH),
-        config(),
-        30_000,
-        client,
-        Executors.newSingleThreadScheduledExecutor());
-  }
-
-  private static AgentlessConfigurationSource service(
-      final FakeClient client, final Config config) {
-    return new AgentlessConfigurationSource(
-        HttpUrl.get("http://localhost" + CONFIG_PATH),
-        config,
-        30_000,
-        client,
-        Executors.newSingleThreadScheduledExecutor());
-  }
-
-  private static AgentlessConfigurationSource.OkHttpUfcHttpClient scriptedClient(
-      final List<okhttp3.Request> requests,
-      final AgentlessConfigurationSource.RetrySleeper retrySleeper,
-      final java.util.function.DoubleSupplier jitter,
-      final Object... outcomes)
-      throws IOException {
-    final BlockingQueue<Object> scriptedOutcomes = new LinkedBlockingQueue<>();
-    scriptedOutcomes.addAll(Arrays.asList(outcomes));
-    final OkHttpClient httpClient = mock(OkHttpClient.class);
-    when(httpClient.newCall(any()))
-        .thenAnswer(
-            invocation -> {
-              final okhttp3.Request request = invocation.getArgument(0);
-              requests.add(request);
-              final Object outcome = scriptedOutcomes.remove();
-              final Call call = mock(Call.class);
-              when(call.execute())
-                  .thenAnswer(
-                      ignored -> {
-                        if (outcome instanceof IOException) {
-                          throw (IOException) outcome;
-                        }
-                        return okHttpResponse(
-                            request, (AgentlessConfigurationSource.UfcHttpResponse) outcome);
-                      });
-              return call;
+    void initAfterCloseDoesNotSchedulePoll() throws Exception {
+        final FakeClient client = new FakeClient(response(200, "etag-a", emptyConfig()));
+        final AgentlessConfigurationSource service = service(client);
+
+        service.close();
+        service.init();
+
+        assertEquals(0, client.calls.get());
+    }
+
+    @Nested
+    class SystemTestParity {
+        @Test
+        void preservesSystemTestSourceTransitionsAndLastKnownGoodState() throws Exception {
+            final List<okhttp3.Request> requests = new ArrayList<>();
+            final AgentlessConfigurationSource.OkHttpUfcHttpClient client = scriptedClient(
+                    requests,
+                    delay -> {},
+                    () -> 1.0,
+                    response(200, "etag-a", emptyConfig()),
+                    response(304, "etag-must-not-replace-a", null),
+                    response(509, null, null),
+                    response(200, "etag-b", emptyConfig()),
+                    response(200, "etag-c", "{not-json}"),
+                    response(401, null, null));
+            final AgentlessConfigurationSource service = service(client);
+            FeatureFlaggingGateway.addConfigListener(listener);
+
+            assertTrue(service.pollOnce());
+            assertTrue(service.pollOnce());
+            assertTrue(service.pollOnce());
+            assertFalse(service.pollOnce());
+            assertFalse(service.pollOnce());
+
+            verify(listener, times(2)).accept(any(ServerConfiguration.class));
+            assertEquals("etag-a", requests.get(1).header("If-None-Match"));
+            assertEquals("etag-a", requests.get(2).header("If-None-Match"));
+            assertEquals("etag-a", requests.get(3).header("If-None-Match"));
+            assertEquals("etag-b", requests.get(4).header("If-None-Match"));
+            assertEquals("etag-b", requests.get(5).header("If-None-Match"));
+        }
+    }
+
+    private static AgentlessConfigurationSource service(final AgentlessConfigurationSource.UfcHttpClient client) {
+        return new AgentlessConfigurationSource(
+                HttpUrl.get("http://localhost" + CONFIG_PATH),
+                config(),
+                30_000,
+                client,
+                Executors.newSingleThreadScheduledExecutor());
+    }
+
+    private static AgentlessConfigurationSource service(final FakeClient client, final Config config) {
+        return new AgentlessConfigurationSource(
+                HttpUrl.get("http://localhost" + CONFIG_PATH),
+                config,
+                30_000,
+                client,
+                Executors.newSingleThreadScheduledExecutor());
+    }
+
+    private static AgentlessConfigurationSource.OkHttpUfcHttpClient scriptedClient(
+            final List<okhttp3.Request> requests,
+            final AgentlessConfigurationSource.RetrySleeper retrySleeper,
+            final java.util.function.DoubleSupplier jitter,
+            final Object... outcomes)
+            throws IOException {
+        final BlockingQueue<Object> scriptedOutcomes = new LinkedBlockingQueue<>();
+        scriptedOutcomes.addAll(Arrays.asList(outcomes));
+        final OkHttpClient httpClient = mock(OkHttpClient.class);
+        when(httpClient.newCall(any())).thenAnswer(invocation -> {
+            final okhttp3.Request request = invocation.getArgument(0);
+            requests.add(request);
+            final Object outcome = scriptedOutcomes.remove();
+            final Call call = mock(Call.class);
+            when(call.execute()).thenAnswer(ignored -> {
+                if (outcome instanceof IOException) {
+                    throw (IOException) outcome;
+                }
+                return okHttpResponse(request, (AgentlessConfigurationSource.UfcHttpResponse) outcome);
             });
-    return new AgentlessConfigurationSource.OkHttpUfcHttpClient(
-        httpClient, 30_000, retrySleeper, jitter);
-  }
-
-  private static AgentlessConfigurationSource.AgentlessRetryPolicy retryPolicy(
-      final AtomicBoolean cancelled) {
-    return new AgentlessConfigurationSource.AgentlessRetryPolicy(
-        cancelled, 30_000, delay -> {}, () -> 1.0);
-  }
-
-  private static Response okHttpResponse(
-      final okhttp3.Request request, final AgentlessConfigurationSource.UfcHttpResponse response) {
-    final Response.Builder builder =
-        new Response.Builder()
-            .request(request)
-            .protocol(Protocol.HTTP_1_1)
-            .code(response.status)
-            .message(Integer.toString(response.status));
-    if (response.etag != null) {
-      builder.header("ETag", response.etag);
-    }
-    if (response.body != null) {
-      builder.body(ResponseBody.create(MediaType.get("application/json"), response.body));
-    }
-    return builder.build();
-  }
-
-  private static Config config() {
-    return config("datadoghq.com", "");
-  }
-
-  private static Config config(final String site, final String env) {
-    final Config config = mock(Config.class);
-    lenient()
-        .when(config.getFeatureFlaggingConfigurationSourcePollIntervalSeconds())
-        .thenReturn(30);
-    lenient()
-        .when(config.getFeatureFlaggingConfigurationSourceRequestTimeoutSeconds())
-        .thenReturn(5);
-    lenient().when(config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl()).thenReturn(null);
-    lenient().when(config.getApiKey()).thenReturn("test-api-key");
-    lenient().when(config.getSite()).thenReturn(site);
-    lenient().when(config.getEnv()).thenReturn(env);
-    return config;
-  }
-
-  private static AgentlessConfigurationSource.UfcHttpResponse response(
-      final int status, final String etag, final String body) {
-    return new AgentlessConfigurationSource.UfcHttpResponse(
-        status, etag, body == null ? null : body.getBytes(UTF_8));
-  }
-
-  private static String emptyConfig() {
-    return jsonApiResponse("universal-flag-configuration", emptyConfigAttributes());
-  }
-
-  private static String emptyConfigAttributes() {
-    return "{"
-        + "\"createdAt\":\"2026-07-15T19:57:07.219869778Z\","
-        + "\"environment\":{\"name\":\"Staging\"},"
-        + "\"flags\":{}"
-        + "}";
-  }
-
-  private static String jsonApiResponse(final String type, final String attributes) {
-    return "{\"data\":{"
-        + "\"id\":\"1\","
-        + "\"type\":\""
-        + type
-        + "\","
-        + "\"attributes\":"
-        + attributes
-        + "}}";
-  }
-
-  private static String largeConfig(final int flagCount) {
-    final StringBuilder json =
-        new StringBuilder(
-            "{\"createdAt\":\"2026-07-15T19:57:07.219869778Z\","
+            return call;
+        });
+        return new AgentlessConfigurationSource.OkHttpUfcHttpClient(httpClient, 30_000, retrySleeper, jitter);
+    }
+
+    private static AgentlessConfigurationSource.AgentlessRetryPolicy retryPolicy(final AtomicBoolean cancelled) {
+        return new AgentlessConfigurationSource.AgentlessRetryPolicy(cancelled, 30_000, delay -> {}, () -> 1.0);
+    }
+
+    private static Response okHttpResponse(
+            final okhttp3.Request request, final AgentlessConfigurationSource.UfcHttpResponse response) {
+        final Response.Builder builder = new Response.Builder()
+                .request(request)
+                .protocol(Protocol.HTTP_1_1)
+                .code(response.status)
+                .message(Integer.toString(response.status));
+        if (response.etag != null) {
+            builder.header("ETag", response.etag);
+        }
+        if (response.body != null) {
+            builder.body(ResponseBody.create(MediaType.get("application/json"), response.body));
+        }
+        return builder.build();
+    }
+
+    private static Config config() {
+        return config("datadoghq.com", "");
+    }
+
+    private static Config config(final String site, final String env) {
+        final Config config = mock(Config.class);
+        lenient()
+                .when(config.getFeatureFlaggingConfigurationSourcePollIntervalSeconds())
+                .thenReturn(30);
+        lenient()
+                .when(config.getFeatureFlaggingConfigurationSourceRequestTimeoutSeconds())
+                .thenReturn(5);
+        lenient()
+                .when(config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl())
+                .thenReturn(null);
+        lenient().when(config.getApiKey()).thenReturn("test-api-key");
+        lenient().when(config.getSite()).thenReturn(site);
+        lenient().when(config.getEnv()).thenReturn(env);
+        return config;
+    }
+
+    private static AgentlessConfigurationSource.UfcHttpResponse response(
+            final int status, final String etag, final String body) {
+        return new AgentlessConfigurationSource.UfcHttpResponse(
+                status, etag, body == null ? null : body.getBytes(UTF_8));
+    }
+
+    private static String emptyConfig() {
+        return jsonApiResponse("universal-flag-configuration", emptyConfigAttributes());
+    }
+
+    private static String emptyConfigAttributes() {
+        return "{"
+                + "\"createdAt\":\"2026-07-15T19:57:07.219869778Z\","
+                + "\"environment\":{\"name\":\"Staging\"},"
+                + "\"flags\":{}"
+                + "}";
+    }
+
+    private static String jsonApiResponse(final String type, final String attributes) {
+        return "{\"data\":{" + "\"id\":\"1\"," + "\"type\":\"" + type + "\"," + "\"attributes\":" + attributes + "}}";
+    }
+
+    private static String largeConfig(final int flagCount) {
+        final StringBuilder json = new StringBuilder("{\"createdAt\":\"2026-07-15T19:57:07.219869778Z\","
                 + "\"environment\":{\"name\":\"Large Test\"},"
                 + "\"flags\":{");
-    for (int index = 0; index < flagCount; index++) {
-      if (index > 0) {
-        json.append(',');
-      }
-      final String flagKey = "large-flag-" + index;
-      json.append('"')
-          .append(flagKey)
-          .append("\":{\"key\":\"")
-          .append(flagKey)
-          .append(
-              "\",\"enabled\":true,\"variationType\":\"STRING\","
-                  + "\"variations\":{\"on\":{\"key\":\"on\",\"value\":\"on\"}},"
-                  + "\"allocations\":[]}");
-    }
-    return jsonApiResponse("universal-flag-configuration", json.append("}}").toString());
-  }
-
-  private static byte[] gzip(final String value) throws IOException {
-    final ByteArrayOutputStream output = new ByteArrayOutputStream();
-    try (GZIPOutputStream gzip = new GZIPOutputStream(output)) {
-      gzip.write(value.getBytes(UTF_8));
-    }
-    return output.toByteArray();
-  }
-
-  private static void awaitCalls(final FakeClient client, final int count) throws Exception {
-    for (int i = 0; i < 100; i++) {
-      if (client.calls.get() >= count) {
-        return;
-      }
-      TimeUnit.MILLISECONDS.sleep(10);
-    }
-    assertEquals(count, client.calls.get());
-  }
-
-  private static final class FakeClient implements AgentlessConfigurationSource.UfcHttpClient {
-    private final AtomicInteger calls = new AtomicInteger();
-    private final AtomicInteger cancelCalls = new AtomicInteger();
-    private final List<Request> requests = new ArrayList<>();
-    private final BlockingQueue<Object> responses = new LinkedBlockingQueue<>();
-    private CountDownLatch requestStarted;
-    private CountDownLatch releaseRequest;
-
-    private FakeClient(final Object... responses) {
-      for (final Object response : responses) {
-        this.responses.add(response);
-      }
-    }
-
-    private void block(final CountDownLatch requestStarted, final CountDownLatch releaseRequest) {
-      this.requestStarted = requestStarted;
-      this.releaseRequest = releaseRequest;
-    }
-
-    @Override
-    public AgentlessConfigurationSource.UfcHttpResponse fetch(
-        final HttpUrl endpoint, final Config config, final String etag) throws IOException {
-      calls.incrementAndGet();
-      requests.add(new Request(etag));
-      if (requestStarted != null) {
-        requestStarted.countDown();
-      }
-      if (releaseRequest != null) {
-        await(releaseRequest);
-      }
-      final Object response = responses.remove();
-      if (response instanceof IOException) {
-        throw (IOException) response;
-      }
-      if (response instanceof RuntimeException) {
-        throw (RuntimeException) response;
-      }
-      return (AgentlessConfigurationSource.UfcHttpResponse) response;
-    }
-
-    @Override
-    public void cancel() {
-      cancelCalls.incrementAndGet();
-      if (releaseRequest != null) {
-        releaseRequest.countDown();
-      }
-    }
-
-    private static void await(final CountDownLatch latch) throws IOException {
-      try {
-        if (!latch.await(1, TimeUnit.SECONDS)) {
-          throw new SocketTimeoutException("test request did not release");
+        for (int index = 0; index < flagCount; index++) {
+            if (index > 0) {
+                json.append(',');
+            }
+            final String flagKey = "large-flag-" + index;
+            json.append('"')
+                    .append(flagKey)
+                    .append("\":{\"key\":\"")
+                    .append(flagKey)
+                    .append("\",\"enabled\":true,\"variationType\":\"STRING\","
+                            + "\"variations\":{\"on\":{\"key\":\"on\",\"value\":\"on\"}},"
+                            + "\"allocations\":[]}");
         }
-      } catch (final InterruptedException e) {
-        Thread.currentThread().interrupt();
-        throw new IOException(e);
-      }
+        return jsonApiResponse("universal-flag-configuration", json.append("}}").toString());
     }
-  }
 
-  private static final class Request {
-    private final String etag;
+    private static byte[] gzip(final String value) throws IOException {
+        final ByteArrayOutputStream output = new ByteArrayOutputStream();
+        try (GZIPOutputStream gzip = new GZIPOutputStream(output)) {
+            gzip.write(value.getBytes(UTF_8));
+        }
+        return output.toByteArray();
+    }
+
+    private static void awaitCalls(final FakeClient client, final int count) throws Exception {
+        for (int i = 0; i < 100; i++) {
+            if (client.calls.get() >= count) {
+                return;
+            }
+            TimeUnit.MILLISECONDS.sleep(10);
+        }
+        assertEquals(count, client.calls.get());
+    }
+
+    private static final class FakeClient implements AgentlessConfigurationSource.UfcHttpClient {
+        private final AtomicInteger calls = new AtomicInteger();
+        private final AtomicInteger cancelCalls = new AtomicInteger();
+        private final List<Request> requests = new ArrayList<>();
+        private final BlockingQueue<Object> responses = new LinkedBlockingQueue<>();
+        private CountDownLatch requestStarted;
+        private CountDownLatch releaseRequest;
+
+        private FakeClient(final Object... responses) {
+            for (final Object response : responses) {
+                this.responses.add(response);
+            }
+        }
+
+        private void block(final CountDownLatch requestStarted, final CountDownLatch releaseRequest) {
+            this.requestStarted = requestStarted;
+            this.releaseRequest = releaseRequest;
+        }
 
-    private Request(final String etag) {
-      this.etag = etag;
+        @Override
+        public AgentlessConfigurationSource.UfcHttpResponse fetch(
+                final HttpUrl endpoint, final Config config, final String etag) throws IOException {
+            calls.incrementAndGet();
+            requests.add(new Request(etag));
+            if (requestStarted != null) {
+                requestStarted.countDown();
+            }
+            if (releaseRequest != null) {
+                await(releaseRequest);
+            }
+            final Object response = responses.remove();
+            if (response instanceof IOException) {
+                throw (IOException) response;
+            }
+            if (response instanceof RuntimeException) {
+                throw (RuntimeException) response;
+            }
+            return (AgentlessConfigurationSource.UfcHttpResponse) response;
+        }
+
+        @Override
+        public void cancel() {
+            cancelCalls.incrementAndGet();
+            if (releaseRequest != null) {
+                releaseRequest.countDown();
+            }
+        }
+
+        private static void await(final CountDownLatch latch) throws IOException {
+            try {
+                if (!latch.await(1, TimeUnit.SECONDS)) {
+                    throw new SocketTimeoutException("test request did not release");
+                }
+            } catch (final InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new IOException(e);
+            }
+        }
+    }
+
+    private static final class Request {
+        private final String etag;
+
+        private Request(final String etag) {
+            this.etag = etag;
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/AgentlessFeatureFlagBackendApiTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/AgentlessFeatureFlagBackendApiTest.java
index 117c72ba2a1..bb5123e78bf 100644
--- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/AgentlessFeatureFlagBackendApiTest.java
+++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/AgentlessFeatureFlagBackendApiTest.java
@@ -28,169 +28,157 @@
 
 class AgentlessFeatureFlagBackendApiTest {
 
-  @ParameterizedTest
-  @ValueSource(ints = {403, 404, 405})
-  void replaysRejectedBatchDirectlyAndKeepsDirectRoute(final int statusCode) throws Exception {
-    final RecordingBackendApi local =
-        new RecordingBackendApi(new HttpResponseException(statusCode, "rejected"));
-    final RecordingBackendApi direct = new RecordingBackendApi();
-    final AtomicInteger directApiCreations = new AtomicInteger();
-    final AgentlessFeatureFlagBackendApi api =
-        new AgentlessFeatureFlagBackendApi(
-            local,
-            () -> {
-              directApiCreations.incrementAndGet();
-              return direct;
-            },
-            "flag evaluation");
-    final RequestBody firstBody = requestBody("first");
-    final RequestBody secondBody = requestBody("second");
-
-    assertEquals(0, directApiCreations.get());
-    api.post("flagevaluation", firstBody, stream -> null, null, false);
-    api.post("flagevaluation", secondBody, stream -> null, null, false);
-
-    assertEquals(1, directApiCreations.get());
-    assertEquals(1, local.calls);
-    assertEquals(2, direct.calls);
-    assertSame(firstBody, local.requestBodies.get(0));
-    assertSame(firstBody, direct.requestBodies.get(0));
-    assertSame(secondBody, direct.requestBodies.get(1));
-  }
-
-  @ParameterizedTest
-  @MethodSource("featureFlagRoutes")
-  void fallsBackAfterConnectionRefusal(final String route, final String eventType)
-      throws Exception {
-    final RecordingBackendApi local =
-        new RecordingBackendApi(new ConnectException("connection refused"));
-    final RecordingBackendApi direct = new RecordingBackendApi();
-    final AgentlessFeatureFlagBackendApi api =
-        new AgentlessFeatureFlagBackendApi(local, () -> direct, eventType);
-
-    api.post(route, requestBody(eventType), stream -> null, null, false);
-
-    assertEquals(1, local.calls);
-    assertEquals(1, direct.calls);
-  }
-
-  @Test
-  void doesNotReturnToLocalRouteAfterSwitchingToDirectIntake() throws Exception {
-    final RecordingBackendApi local =
-        new RecordingBackendApi(new ConnectException("connection refused"));
-    final RecordingBackendApi direct = new RecordingBackendApi();
-    final AgentlessFeatureFlagBackendApi api =
-        new AgentlessFeatureFlagBackendApi(local, () -> direct, "exposure");
-
-    api.post("exposures", requestBody("first"), stream -> null, null, false);
-    direct.failure = new IOException("direct intake failed");
-
-    assertThrows(
-        IOException.class,
-        () -> api.post("exposures", requestBody("second"), stream -> null, null, false));
-    assertEquals(1, local.calls);
-    assertEquals(2, direct.calls);
-  }
-
-  @ParameterizedTest
-  @ValueSource(ints = {429, 500})
-  void doesNotReplayAmbiguousHttpFailure(final int statusCode) {
-    assertNoDirectReplay(new HttpResponseException(statusCode, "ambiguous"));
-  }
-
-  @Test
-  void doesNotReplayTimeout() {
-    assertNoDirectReplay(new SocketTimeoutException("timed out"));
-  }
-
-  @Test
-  void doesNotReplayConnectionReset() {
-    assertNoDirectReplay(new SocketException("connection reset"));
-  }
-
-  @Test
-  void doesNotRetryDirectApiCreationWhenFallbackIsUnavailable() {
-    final RecordingBackendApi local =
-        new RecordingBackendApi(new HttpResponseException(404, "rejected"));
-    final AtomicInteger directApiCreations = new AtomicInteger();
-    final AgentlessFeatureFlagBackendApi api =
-        new AgentlessFeatureFlagBackendApi(
-            local,
-            () -> {
-              directApiCreations.incrementAndGet();
-              return null;
-            },
-            "exposure");
-
-    assertThrows(
-        HttpResponseException.class,
-        () -> api.post("exposures", requestBody("first"), stream -> null, null, false));
-    assertThrows(
-        HttpResponseException.class,
-        () -> api.post("exposures", requestBody("second"), stream -> null, null, false));
-
-    assertEquals(2, local.calls);
-    assertEquals(1, directApiCreations.get());
-  }
-
-  private static void assertNoDirectReplay(final IOException failure) {
-    final RecordingBackendApi local = new RecordingBackendApi(failure);
-    final RecordingBackendApi direct = new RecordingBackendApi();
-    final AtomicInteger directApiCreations = new AtomicInteger();
-    final AgentlessFeatureFlagBackendApi api =
-        new AgentlessFeatureFlagBackendApi(
-            local,
-            () -> {
-              directApiCreations.incrementAndGet();
-              return direct;
-            },
-            "flag evaluation");
-
-    assertThrows(
-        IOException.class,
-        () -> api.post("flagevaluation", requestBody("evaluation"), stream -> null, null, false));
-
-    assertEquals(1, local.calls);
-    assertEquals(0, direct.calls);
-    assertEquals(0, directApiCreations.get());
-  }
-
-  private static RequestBody requestBody(final String value) {
-    return RequestBody.create(MediaType.parse("application/json"), value);
-  }
-
-  private static Stream<Arguments> featureFlagRoutes() {
-    return Stream.of(
-        Arguments.of("exposures", "exposure"), Arguments.of("flagevaluation", "flag evaluation"));
-  }
-
-  private static final class RecordingBackendApi implements BackendApi {
-    private IOException failure;
-    private final List<RequestBody> requestBodies = new ArrayList<>();
-    private int calls;
-
-    private RecordingBackendApi() {
-      this(null);
+    @ParameterizedTest
+    @ValueSource(ints = {403, 404, 405})
+    void replaysRejectedBatchDirectlyAndKeepsDirectRoute(final int statusCode) throws Exception {
+        final RecordingBackendApi local = new RecordingBackendApi(new HttpResponseException(statusCode, "rejected"));
+        final RecordingBackendApi direct = new RecordingBackendApi();
+        final AtomicInteger directApiCreations = new AtomicInteger();
+        final AgentlessFeatureFlagBackendApi api = new AgentlessFeatureFlagBackendApi(
+                local,
+                () -> {
+                    directApiCreations.incrementAndGet();
+                    return direct;
+                },
+                "flag evaluation");
+        final RequestBody firstBody = requestBody("first");
+        final RequestBody secondBody = requestBody("second");
+
+        assertEquals(0, directApiCreations.get());
+        api.post("flagevaluation", firstBody, stream -> null, null, false);
+        api.post("flagevaluation", secondBody, stream -> null, null, false);
+
+        assertEquals(1, directApiCreations.get());
+        assertEquals(1, local.calls);
+        assertEquals(2, direct.calls);
+        assertSame(firstBody, local.requestBodies.get(0));
+        assertSame(firstBody, direct.requestBodies.get(0));
+        assertSame(secondBody, direct.requestBodies.get(1));
     }
 
-    private RecordingBackendApi(@Nullable final IOException failure) {
-      this.failure = failure;
+    @ParameterizedTest
+    @MethodSource("featureFlagRoutes")
+    void fallsBackAfterConnectionRefusal(final String route, final String eventType) throws Exception {
+        final RecordingBackendApi local = new RecordingBackendApi(new ConnectException("connection refused"));
+        final RecordingBackendApi direct = new RecordingBackendApi();
+        final AgentlessFeatureFlagBackendApi api = new AgentlessFeatureFlagBackendApi(local, () -> direct, eventType);
+
+        api.post(route, requestBody(eventType), stream -> null, null, false);
+
+        assertEquals(1, local.calls);
+        assertEquals(1, direct.calls);
+    }
+
+    @Test
+    void doesNotReturnToLocalRouteAfterSwitchingToDirectIntake() throws Exception {
+        final RecordingBackendApi local = new RecordingBackendApi(new ConnectException("connection refused"));
+        final RecordingBackendApi direct = new RecordingBackendApi();
+        final AgentlessFeatureFlagBackendApi api = new AgentlessFeatureFlagBackendApi(local, () -> direct, "exposure");
+
+        api.post("exposures", requestBody("first"), stream -> null, null, false);
+        direct.failure = new IOException("direct intake failed");
+
+        assertThrows(
+                IOException.class, () -> api.post("exposures", requestBody("second"), stream -> null, null, false));
+        assertEquals(1, local.calls);
+        assertEquals(2, direct.calls);
+    }
+
+    @ParameterizedTest
+    @ValueSource(ints = {429, 500})
+    void doesNotReplayAmbiguousHttpFailure(final int statusCode) {
+        assertNoDirectReplay(new HttpResponseException(statusCode, "ambiguous"));
+    }
+
+    @Test
+    void doesNotReplayTimeout() {
+        assertNoDirectReplay(new SocketTimeoutException("timed out"));
+    }
+
+    @Test
+    void doesNotReplayConnectionReset() {
+        assertNoDirectReplay(new SocketException("connection reset"));
+    }
+
+    @Test
+    void doesNotRetryDirectApiCreationWhenFallbackIsUnavailable() {
+        final RecordingBackendApi local = new RecordingBackendApi(new HttpResponseException(404, "rejected"));
+        final AtomicInteger directApiCreations = new AtomicInteger();
+        final AgentlessFeatureFlagBackendApi api = new AgentlessFeatureFlagBackendApi(
+                local,
+                () -> {
+                    directApiCreations.incrementAndGet();
+                    return null;
+                },
+                "exposure");
+
+        assertThrows(
+                HttpResponseException.class,
+                () -> api.post("exposures", requestBody("first"), stream -> null, null, false));
+        assertThrows(
+                HttpResponseException.class,
+                () -> api.post("exposures", requestBody("second"), stream -> null, null, false));
+
+        assertEquals(2, local.calls);
+        assertEquals(1, directApiCreations.get());
+    }
+
+    private static void assertNoDirectReplay(final IOException failure) {
+        final RecordingBackendApi local = new RecordingBackendApi(failure);
+        final RecordingBackendApi direct = new RecordingBackendApi();
+        final AtomicInteger directApiCreations = new AtomicInteger();
+        final AgentlessFeatureFlagBackendApi api = new AgentlessFeatureFlagBackendApi(
+                local,
+                () -> {
+                    directApiCreations.incrementAndGet();
+                    return direct;
+                },
+                "flag evaluation");
+
+        assertThrows(
+                IOException.class,
+                () -> api.post("flagevaluation", requestBody("evaluation"), stream -> null, null, false));
+
+        assertEquals(1, local.calls);
+        assertEquals(0, direct.calls);
+        assertEquals(0, directApiCreations.get());
+    }
+
+    private static RequestBody requestBody(final String value) {
+        return RequestBody.create(MediaType.parse("application/json"), value);
+    }
+
+    private static Stream<Arguments> featureFlagRoutes() {
+        return Stream.of(Arguments.of("exposures", "exposure"), Arguments.of("flagevaluation", "flag evaluation"));
     }
 
-    @Override
-    public <T> T post(
-        final String uri,
-        final RequestBody requestBody,
-        final IOThrowingFunction<InputStream, T> responseParser,
-        @Nullable final OkHttpUtils.CustomListener requestListener,
-        final boolean requestCompression)
-        throws IOException {
-      calls++;
-      requestBodies.add(requestBody);
-      if (failure != null) {
-        throw failure;
-      }
-      return null;
+    private static final class RecordingBackendApi implements BackendApi {
+        private IOException failure;
+        private final List<RequestBody> requestBodies = new ArrayList<>();
+        private int calls;
+
+        private RecordingBackendApi() {
+            this(null);
+        }
+
+        private RecordingBackendApi(@Nullable final IOException failure) {
+            this.failure = failure;
+        }
+
+        @Override
+        public <T> T post(
+                final String uri,
+                final RequestBody requestBody,
+                final IOThrowingFunction<InputStream, T> responseParser,
+                @Nullable final OkHttpUtils.CustomListener requestListener,
+                final boolean requestCompression)
+                throws IOException {
+            calls++;
+            requestBodies.add(requestBody);
+            if (failure != null) {
+                throw failure;
+            }
+            return null;
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/ExposureWriterTests.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/ExposureWriterTests.java
index f70a4ff0fa1..ee0bba67064 100644
--- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/ExposureWriterTests.java
+++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/ExposureWriterTests.java
@@ -72,475 +72,448 @@
 
 class ExposureWriterTests {
 
-  private static final String EXPOSURES_ENDPOINT = "/evp_proxy/api/v2/exposures";
-  private static final String DIRECT_EXPOSURES_ENDPOINT = "/api/v2/exposures";
-  private static final String API_KEY = "test-api-key";
-  private static final double TIMEOUT_SECONDS = 5;
-
-  private final PollingConditions poll = new PollingConditions(TIMEOUT_SECONDS);
-  private Queue<ExposuresRequest> requests;
-  private Set<String> failed;
-  private JavaTestHttpServer server;
-  private SharedCommunicationObjects sharedCommunicationObjects;
-
-  @BeforeEach
-  void setUp() {
-    requests = new ConcurrentLinkedQueue<>();
-    failed = Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>());
-    JsonAdapter<ExposuresRequest> adapter =
-        new Moshi.Builder().build().adapter(ExposuresRequest.class);
-    server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h -> {
-                      h.prefix(EXPOSURES_ENDPOINT, api -> handleExposureRequest(api, adapter));
-                      h.prefix(
-                          DIRECT_EXPOSURES_ENDPOINT, api -> handleExposureRequest(api, adapter));
-                    }));
-    sharedCommunicationObjects = sharedCommunicationObjects(true);
-  }
-
-  @AfterEach
-  void cleanup() {
-    if (server != null) {
-      server.close();
+    private static final String EXPOSURES_ENDPOINT = "/evp_proxy/api/v2/exposures";
+    private static final String DIRECT_EXPOSURES_ENDPOINT = "/api/v2/exposures";
+    private static final String API_KEY = "test-api-key";
+    private static final double TIMEOUT_SECONDS = 5;
+
+    private final PollingConditions poll = new PollingConditions(TIMEOUT_SECONDS);
+    private Queue<ExposuresRequest> requests;
+    private Set<String> failed;
+    private JavaTestHttpServer server;
+    private SharedCommunicationObjects sharedCommunicationObjects;
+
+    @BeforeEach
+    void setUp() {
+        requests = new ConcurrentLinkedQueue<>();
+        failed = Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>());
+        JsonAdapter<ExposuresRequest> adapter = new Moshi.Builder().build().adapter(ExposuresRequest.class);
+        server = JavaTestHttpServer.httpServer(s -> s.handlers(h -> {
+            h.prefix(EXPOSURES_ENDPOINT, api -> handleExposureRequest(api, adapter));
+            h.prefix(DIRECT_EXPOSURES_ENDPOINT, api -> handleExposureRequest(api, adapter));
+        }));
+        sharedCommunicationObjects = sharedCommunicationObjects(true);
     }
-  }
-
-  private void handleExposureRequest(HandlerApi api, JsonAdapter<ExposuresRequest> adapter)
-      throws Exception {
-    ExposuresRequest exposuresRequest =
-        adapter.fromJson(
-            Okio.buffer(Okio.source(new ByteArrayInputStream(api.getRequest().getBody()))));
-    String serviceName = exposuresRequest.context.get("service");
-    boolean failForever = "fail-forever".equals(serviceName);
-    boolean fail = serviceName.startsWith("fail") && (failed.add(serviceName) || failForever);
-    if (fail) {
-      api.getResponse().status(500).send("Boom!!!");
-    } else {
-      requests.add(exposuresRequest);
-      api.getResponse().status(200).send("OK");
+
+    @AfterEach
+    void cleanup() {
+        if (server != null) {
+            server.close();
+        }
+    }
+
+    private void handleExposureRequest(HandlerApi api, JsonAdapter<ExposuresRequest> adapter) throws Exception {
+        ExposuresRequest exposuresRequest = adapter.fromJson(Okio.buffer(
+                Okio.source(new ByteArrayInputStream(api.getRequest().getBody()))));
+        String serviceName = exposuresRequest.context.get("service");
+        boolean failForever = "fail-forever".equals(serviceName);
+        boolean fail = serviceName.startsWith("fail") && (failed.add(serviceName) || failForever);
+        if (fail) {
+            api.getResponse().status(500).send("Boom!!!");
+        } else {
+            requests.add(exposuresRequest);
+            api.getResponse().status(200).send("OK");
+        }
     }
-  }
-
-  @TableTest({
-    "service        | env    | version",
-    "               |        |        ",
-    "'test-service' | 'test' | '23'   ",
-    "'test-service' |        | '23'   ",
-    "'test-service' | 'test' |        "
-  })
-  void testExposureEventWrites(String service, String env, String version) throws Exception {
-    Config config = mockConfig(service, env, version);
-    List<ExposureEvent> exposures = buildExposures(5);
-
-    try (ExposureWriterImpl writer =
-        new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, sharedCommunicationObjects, config)) {
-      writer.init();
-      for (ExposureEvent exposure : exposures) {
-        writer.accept(exposure);
-      }
-
-      poll.eventually(
-          () -> {
-            assertFalse(requests.isEmpty());
-            for (ExposuresRequest request : requests) {
-              assertContext(request.context, service, env, version);
+
+    @TableTest({
+      "service        | env    | version",
+      "               |        |        ",
+      "'test-service' | 'test' | '23'   ",
+      "'test-service' |        | '23'   ",
+      "'test-service' | 'test' |        "
+    })
+    void testExposureEventWrites(String service, String env, String version) throws Exception {
+        Config config = mockConfig(service, env, version);
+        List<ExposureEvent> exposures = buildExposures(5);
+
+        try (ExposureWriterImpl writer =
+                new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, sharedCommunicationObjects, config)) {
+            writer.init();
+            for (ExposureEvent exposure : exposures) {
+                writer.accept(exposure);
             }
-            assertExposures(allExposures(), exposures);
-          });
+
+            poll.eventually(() -> {
+                assertFalse(requests.isEmpty());
+                for (ExposuresRequest request : requests) {
+                    assertContext(request.context, service, env, version);
+                }
+                assertExposures(allExposures(), exposures);
+            });
+        }
     }
-  }
-
-  @Test
-  void testAgentlessExposureEventWritesDirectlyWithApiKey() throws Exception {
-    Config config = mockConfig("test-service");
-    when(config.getFeatureFlaggingConfigurationSource()).thenReturn(CONFIGURATION_SOURCE_AGENTLESS);
-    when(config.getApiKey()).thenReturn(API_KEY);
-    BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
-    IntakeApi directApi =
-        new IntakeApi(
-            HttpUrl.get(server.getAddress()).resolve("/api/v2/"),
-            API_KEY,
-            "123",
-            HttpRetryPolicy.Factory.NEVER_RETRY,
-            new OkHttpClient.Builder().build(),
-            false);
-    when(backendApiFactory.createDirectIntakeApi(
-            eq(datadog.trace.api.intake.Intake.EVENT_PLATFORM), eq(true), eq(false)))
-        .thenReturn(directApi);
-    FeatureFlagBackendApiFactory exposureBackendApiFactory =
-        new FeatureFlagBackendApiFactory(config, backendApiFactory, FeatureFlagEventType.EXPOSURE);
-    List<ExposureEvent> exposures = buildExposures(5);
-
-    try (ExposureWriterImpl writer =
-        new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, exposureBackendApiFactory, config)) {
-      writer.init();
-      for (ExposureEvent exposure : exposures) {
-        writer.accept(exposure);
-      }
-
-      poll.eventually(
-          () -> {
-            assertEquals(DIRECT_EXPOSURES_ENDPOINT, server.getLastRequest().getPath());
-            assertEquals(API_KEY, server.getLastRequest().getHeader("dd-api-key"));
-            assertNull(server.getLastRequest().getHeader("X-Datadog-EVP-Subdomain"));
-            assertExposures(allExposures(), exposures);
-          });
+
+    @Test
+    void testAgentlessExposureEventWritesDirectlyWithApiKey() throws Exception {
+        Config config = mockConfig("test-service");
+        when(config.getFeatureFlaggingConfigurationSource()).thenReturn(CONFIGURATION_SOURCE_AGENTLESS);
+        when(config.getApiKey()).thenReturn(API_KEY);
+        BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
+        IntakeApi directApi = new IntakeApi(
+                HttpUrl.get(server.getAddress()).resolve("/api/v2/"),
+                API_KEY,
+                "123",
+                HttpRetryPolicy.Factory.NEVER_RETRY,
+                new OkHttpClient.Builder().build(),
+                false);
+        when(backendApiFactory.createDirectIntakeApi(
+                        eq(datadog.trace.api.intake.Intake.EVENT_PLATFORM), eq(true), eq(false)))
+                .thenReturn(directApi);
+        FeatureFlagBackendApiFactory exposureBackendApiFactory =
+                new FeatureFlagBackendApiFactory(config, backendApiFactory, FeatureFlagEventType.EXPOSURE);
+        List<ExposureEvent> exposures = buildExposures(5);
+
+        try (ExposureWriterImpl writer =
+                new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, exposureBackendApiFactory, config)) {
+            writer.init();
+            for (ExposureEvent exposure : exposures) {
+                writer.accept(exposure);
+            }
+
+            poll.eventually(() -> {
+                assertEquals(DIRECT_EXPOSURES_ENDPOINT, server.getLastRequest().getPath());
+                assertEquals(API_KEY, server.getLastRequest().getHeader("dd-api-key"));
+                assertNull(server.getLastRequest().getHeader("X-Datadog-EVP-Subdomain"));
+                assertExposures(allExposures(), exposures);
+            });
+        }
     }
-  }
-
-  @Test
-  void testLruCache() throws Exception {
-    Config config = mockConfig("test-service");
-    List<ExposureEvent> exposures = buildExposures(6);
-
-    try (ExposureWriterImpl writer =
-        new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, sharedCommunicationObjects, config)) {
-      writer.init();
-      // populating the cache
-      for (ExposureEvent exposure : exposures) {
-        writer.accept(exposure);
-      }
-
-      // all events are written
-      poll.eventually(() -> assertEquals(exposures.size(), allExposures().size()));
-
-      // publishing duplicate events
-      for (ExposureEvent exposure : exposures) {
-        writer.accept(exposure);
-      }
-
-      // no events are written
-      MILLISECONDS.sleep(300); // wait until a flush happens
-      assertEquals(exposures.size(), allExposures().size());
-
-      // a new event is generated
-      writer.accept(buildExposure());
-
-      // oldest event is evicted and the new one is submitted
-      poll.eventually(() -> assertEquals(exposures.size() + 1, allExposures().size()));
+
+    @Test
+    void testLruCache() throws Exception {
+        Config config = mockConfig("test-service");
+        List<ExposureEvent> exposures = buildExposures(6);
+
+        try (ExposureWriterImpl writer =
+                new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, sharedCommunicationObjects, config)) {
+            writer.init();
+            // populating the cache
+            for (ExposureEvent exposure : exposures) {
+                writer.accept(exposure);
+            }
+
+            // all events are written
+            poll.eventually(() -> assertEquals(exposures.size(), allExposures().size()));
+
+            // publishing duplicate events
+            for (ExposureEvent exposure : exposures) {
+                writer.accept(exposure);
+            }
+
+            // no events are written
+            MILLISECONDS.sleep(300); // wait until a flush happens
+            assertEquals(exposures.size(), allExposures().size());
+
+            // a new event is generated
+            writer.accept(buildExposure());
+
+            // oldest event is evicted and the new one is submitted
+            poll.eventually(
+                    () -> assertEquals(exposures.size() + 1, allExposures().size()));
+        }
     }
-  }
-
-  @Test
-  void testHighLoadScenario() throws Exception {
-    Config config = mockConfig("test-service");
-    int exposuresPerThread = 100;
-    Random random = new Random();
-    int threads = Runtime.getRuntime().availableProcessors();
-    ExecutorService executor = Executors.newFixedThreadPool(threads);
-    List<ExposureEvent> exposures = buildExposures(threads * exposuresPerThread);
-    CountDownLatch latch = new CountDownLatch(1);
-
-    try (ExposureWriterImpl writer = new ExposureWriterImpl(sharedCommunicationObjects, config)) {
-      writer.init();
-      List<Future<Boolean>> futures = new ArrayList<>();
-      for (int index = 0; index < exposures.size(); index += exposuresPerThread) {
-        List<ExposureEvent> partition =
-            exposures.subList(index, Math.min(index + exposuresPerThread, exposures.size()));
-        futures.add(
-            executor.submit(
-                () -> {
-                  latch.await();
-                  for (ExposureEvent exposure : partition) {
-                    MILLISECONDS.sleep(random.nextInt(2));
-                    writer.accept(exposure);
-                  }
-                  return true;
+
+    @Test
+    void testHighLoadScenario() throws Exception {
+        Config config = mockConfig("test-service");
+        int exposuresPerThread = 100;
+        Random random = new Random();
+        int threads = Runtime.getRuntime().availableProcessors();
+        ExecutorService executor = Executors.newFixedThreadPool(threads);
+        List<ExposureEvent> exposures = buildExposures(threads * exposuresPerThread);
+        CountDownLatch latch = new CountDownLatch(1);
+
+        try (ExposureWriterImpl writer = new ExposureWriterImpl(sharedCommunicationObjects, config)) {
+            writer.init();
+            List<Future<Boolean>> futures = new ArrayList<>();
+            for (int index = 0; index < exposures.size(); index += exposuresPerThread) {
+                List<ExposureEvent> partition =
+                        exposures.subList(index, Math.min(index + exposuresPerThread, exposures.size()));
+                futures.add(executor.submit(() -> {
+                    latch.await();
+                    for (ExposureEvent exposure : partition) {
+                        MILLISECONDS.sleep(random.nextInt(2));
+                        writer.accept(exposure);
+                    }
+                    return true;
                 }));
-      }
-      latch.countDown(); // start threads
-
-      for (Future<Boolean> future : futures) {
-        assertTrue(future.get()); // wait for all threads to finish
-      }
-      poll.eventually(() -> assertExposures(allExposures(), exposures));
-    } finally {
-      executor.shutdownNow();
+            }
+            latch.countDown(); // start threads
+
+            for (Future<Boolean> future : futures) {
+                assertTrue(future.get()); // wait for all threads to finish
+            }
+            poll.eventually(() -> assertExposures(allExposures(), exposures));
+        } finally {
+            executor.shutdownNow();
+        }
     }
-  }
-
-  @ParameterizedTest
-  @ValueSource(booleans = {false, true})
-  void testFailuresAreRetried(boolean finallyFail) throws Exception {
-    String serviceName = finallyFail ? "fail-forever" : "fail-once";
-    Config config = mockConfig(serviceName);
-
-    try (ExposureWriterImpl writer =
-        new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, sharedCommunicationObjects, config)) {
-      writer.init();
-      writer.accept(buildExposure());
-
-      MILLISECONDS.sleep(500); // wait for a flush to happen
-      ExposuresRequest found = findRequest(serviceName);
-      if (finallyFail) {
-        assertNull(found, requests.toString());
-      } else {
-        poll.eventually(() -> assertNotNull(findRequest(serviceName), requests.toString()));
-      }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {false, true})
+    void testFailuresAreRetried(boolean finallyFail) throws Exception {
+        String serviceName = finallyFail ? "fail-forever" : "fail-once";
+        Config config = mockConfig(serviceName);
+
+        try (ExposureWriterImpl writer =
+                new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, sharedCommunicationObjects, config)) {
+            writer.init();
+            writer.accept(buildExposure());
+
+            MILLISECONDS.sleep(500); // wait for a flush to happen
+            ExposuresRequest found = findRequest(serviceName);
+            if (finallyFail) {
+                assertNull(found, requests.toString());
+            } else {
+                poll.eventually(() -> assertNotNull(findRequest(serviceName), requests.toString()));
+            }
+        }
     }
-  }
 
-  @Test
-  void testSerializationFailureDoesNotPoisonFollowingExposures() throws Exception {
-    Config config = mockConfig("test-service");
-    ExposureEvent validExposure = buildExposure();
+    @Test
+    void testSerializationFailureDoesNotPoisonFollowingExposures() throws Exception {
+        Config config = mockConfig("test-service");
+        ExposureEvent validExposure = buildExposure();
 
-    try (ExposureWriterImpl writer =
-        new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, sharedCommunicationObjects, config)) {
-      writer.init();
-      writer.accept(buildExposure(singletonMap("invalid", (Object) Double.NaN)));
+        try (ExposureWriterImpl writer =
+                new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, sharedCommunicationObjects, config)) {
+            writer.init();
+            writer.accept(buildExposure(singletonMap("invalid", (Object) Double.NaN)));
 
-      MILLISECONDS.sleep(300); // wait for the invalid batch to be dropped
-      writer.accept(validExposure);
+            MILLISECONDS.sleep(300); // wait for the invalid batch to be dropped
+            writer.accept(validExposure);
 
-      poll.eventually(() -> assertExposures(allExposures(), singletonList(validExposure)));
+            poll.eventually(() -> assertExposures(allExposures(), singletonList(validExposure)));
+        }
     }
-  }
-
-  @Test
-  void testAmbiguousExposureBatchIsNotRetriedOrReplayedDirectly() throws Exception {
-    final Config config = mockConfig("test-service");
-    when(config.getFeatureFlaggingConfigurationSource()).thenReturn(CONFIGURATION_SOURCE_AGENTLESS);
-    when(config.getApiKey()).thenReturn(API_KEY);
-    final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
-    final BackendApi proxyApi = mock(BackendApi.class);
-    final BackendApi directApi = mock(BackendApi.class);
-    when(backendApiFactory.createEvpProxyApi(
-            Intake.EVENT_PLATFORM, true, HttpRetryPolicy.Factory.NEVER_RETRY))
-        .thenReturn(proxyApi);
-    when(backendApiFactory.createDirectIntakeApi(eq(Intake.EVENT_PLATFORM), eq(true), eq(false)))
-        .thenReturn(directApi);
-    when(proxyApi.post(eq("exposures"), any(RequestBody.class), any(), any(), eq(false)))
-        .thenThrow(new SocketTimeoutException("ambiguous timeout"))
-        .thenThrow(new ConnectException("definitive refusal"));
-    final FeatureFlagBackendApiFactory featureFlagBackendApiFactory =
-        new FeatureFlagBackendApiFactory(config, backendApiFactory, FeatureFlagEventType.EXPOSURE);
-    final List<ExposureEvent> exposures = buildExposures(2);
-
-    try (ExposureWriterImpl writer =
-        new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, featureFlagBackendApiFactory, config)) {
-      writer.init();
-      writer.accept(exposures.get(0));
-
-      poll.eventually(
-          () ->
-              verify(proxyApi)
-                  .post(eq("exposures"), any(RequestBody.class), any(), any(), eq(false)));
-      MILLISECONDS.sleep(300);
-      verify(proxyApi, times(1))
-          .post(eq("exposures"), any(RequestBody.class), any(), any(), eq(false));
-      verify(directApi, never())
-          .post(eq("exposures"), any(RequestBody.class), any(), any(), eq(false));
-
-      writer.accept(exposures.get(1));
-      poll.eventually(
-          () ->
-              verify(directApi)
-                  .post(eq("exposures"), any(RequestBody.class), any(), any(), eq(false)));
-
-      final ArgumentCaptor<RequestBody> directBody = ArgumentCaptor.forClass(RequestBody.class);
-      verify(directApi).post(eq("exposures"), directBody.capture(), any(), any(), eq(false));
-      final Buffer buffer = new Buffer();
-      directBody.getValue().writeTo(buffer);
-      final ExposuresRequest directRequest =
-          new Moshi.Builder().build().adapter(ExposuresRequest.class).fromJson(buffer.readUtf8());
-      assertNotNull(directRequest);
-      assertExposures(directRequest.exposures, singletonList(exposures.get(1)));
+
+    @Test
+    void testAmbiguousExposureBatchIsNotRetriedOrReplayedDirectly() throws Exception {
+        final Config config = mockConfig("test-service");
+        when(config.getFeatureFlaggingConfigurationSource()).thenReturn(CONFIGURATION_SOURCE_AGENTLESS);
+        when(config.getApiKey()).thenReturn(API_KEY);
+        final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
+        final BackendApi proxyApi = mock(BackendApi.class);
+        final BackendApi directApi = mock(BackendApi.class);
+        when(backendApiFactory.createEvpProxyApi(Intake.EVENT_PLATFORM, true, HttpRetryPolicy.Factory.NEVER_RETRY))
+                .thenReturn(proxyApi);
+        when(backendApiFactory.createDirectIntakeApi(eq(Intake.EVENT_PLATFORM), eq(true), eq(false)))
+                .thenReturn(directApi);
+        when(proxyApi.post(eq("exposures"), any(RequestBody.class), any(), any(), eq(false)))
+                .thenThrow(new SocketTimeoutException("ambiguous timeout"))
+                .thenThrow(new ConnectException("definitive refusal"));
+        final FeatureFlagBackendApiFactory featureFlagBackendApiFactory =
+                new FeatureFlagBackendApiFactory(config, backendApiFactory, FeatureFlagEventType.EXPOSURE);
+        final List<ExposureEvent> exposures = buildExposures(2);
+
+        try (ExposureWriterImpl writer =
+                new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, featureFlagBackendApiFactory, config)) {
+            writer.init();
+            writer.accept(exposures.get(0));
+
+            poll.eventually(
+                    () -> verify(proxyApi).post(eq("exposures"), any(RequestBody.class), any(), any(), eq(false)));
+            MILLISECONDS.sleep(300);
+            verify(proxyApi, times(1)).post(eq("exposures"), any(RequestBody.class), any(), any(), eq(false));
+            verify(directApi, never()).post(eq("exposures"), any(RequestBody.class), any(), any(), eq(false));
+
+            writer.accept(exposures.get(1));
+            poll.eventually(
+                    () -> verify(directApi).post(eq("exposures"), any(RequestBody.class), any(), any(), eq(false)));
+
+            final ArgumentCaptor<RequestBody> directBody = ArgumentCaptor.forClass(RequestBody.class);
+            verify(directApi).post(eq("exposures"), directBody.capture(), any(), any(), eq(false));
+            final Buffer buffer = new Buffer();
+            directBody.getValue().writeTo(buffer);
+            final ExposuresRequest directRequest =
+                    new Moshi.Builder().build().adapter(ExposuresRequest.class).fromJson(buffer.readUtf8());
+            assertNotNull(directRequest);
+            assertExposures(directRequest.exposures, singletonList(exposures.get(1)));
+        }
     }
-  }
 
-  @Test
-  void testWriterStopsReceivingExposuresIfEvpProxyIsNotAvailable() throws Exception {
-    SharedCommunicationObjects sharedCommunicationObjects = sharedCommunicationObjects(false);
+    @Test
+    void testWriterStopsReceivingExposuresIfEvpProxyIsNotAvailable() throws Exception {
+        SharedCommunicationObjects sharedCommunicationObjects = sharedCommunicationObjects(false);
 
-    try (ExposureWriterImpl writer =
-        new ExposureWriterImpl(sharedCommunicationObjects, Config.get())) {
-      writer.init();
-      poll.eventually(() -> assertFalse(writer.isSerializerThreadAlive()));
+        try (ExposureWriterImpl writer = new ExposureWriterImpl(sharedCommunicationObjects, Config.get())) {
+            writer.init();
+            poll.eventually(() -> assertFalse(writer.isSerializerThreadAlive()));
 
-      FeatureFlaggingGateway.dispatch(buildExposure());
+            FeatureFlaggingGateway.dispatch(buildExposure());
 
-      assertEquals(0, writer.queueSize());
+            assertEquals(0, writer.queueSize());
+        }
     }
-  }
-
-  private static Config mockConfig(String serviceName) {
-    return mockConfig(serviceName, "test", "0.0.0");
-  }
-
-  private static Config mockConfig(String serviceName, String env, String version) {
-    Config config = mock(Config.class);
-    when(config.getIdGenerationStrategy()).thenReturn(IdGenerationStrategy.fromName("RANDOM"));
-    when(config.getServiceName()).thenReturn(serviceName);
-    when(config.getEnv()).thenReturn(env);
-    when(config.getVersion()).thenReturn(version);
-    return config;
-  }
-
-  private SharedCommunicationObjects sharedCommunicationObjects(boolean evpProxyAvailable) {
-    DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
-    when(discovery.supportsEvpProxy()).thenReturn(evpProxyAvailable);
-    if (evpProxyAvailable) {
-      when(discovery.getEvpProxyEndpoint()).thenReturn("/evp_proxy/");
+
+    private static Config mockConfig(String serviceName) {
+        return mockConfig(serviceName, "test", "0.0.0");
     }
 
-    SharedCommunicationObjects sharedCommunicationObjects = new SharedCommunicationObjects();
-    sharedCommunicationObjects.setFeaturesDiscovery(discovery);
-    sharedCommunicationObjects.agentUrl = HttpUrl.get(server.getAddress());
-    sharedCommunicationObjects.agentHttpClient = new OkHttpClient.Builder().build();
-    return sharedCommunicationObjects;
-  }
-
-  private static void assertContext(
-      Map<String, String> context, String service, String env, String version) {
-    assertEquals(service == null ? "unknown" : service, context.get("service"));
-    assertOptionalContextValue(context, "env", env);
-    assertOptionalContextValue(context, "version", version);
-  }
-
-  private static void assertOptionalContextValue(
-      Map<String, String> context, String key, String value) {
-    if (value == null) {
-      assertFalse(context.containsKey(key));
-    } else {
-      assertEquals(value, context.get(key));
+    private static Config mockConfig(String serviceName, String env, String version) {
+        Config config = mock(Config.class);
+        when(config.getIdGenerationStrategy()).thenReturn(IdGenerationStrategy.fromName("RANDOM"));
+        when(config.getServiceName()).thenReturn(serviceName);
+        when(config.getEnv()).thenReturn(env);
+        when(config.getVersion()).thenReturn(version);
+        return config;
     }
-  }
 
-  private ExposuresRequest findRequest(String serviceName) {
-    for (ExposuresRequest request : requests) {
-      if (serviceName.equals(request.context.get("service"))) {
-        return request;
-      }
+    private SharedCommunicationObjects sharedCommunicationObjects(boolean evpProxyAvailable) {
+        DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class);
+        when(discovery.supportsEvpProxy()).thenReturn(evpProxyAvailable);
+        if (evpProxyAvailable) {
+            when(discovery.getEvpProxyEndpoint()).thenReturn("/evp_proxy/");
+        }
+
+        SharedCommunicationObjects sharedCommunicationObjects = new SharedCommunicationObjects();
+        sharedCommunicationObjects.setFeaturesDiscovery(discovery);
+        sharedCommunicationObjects.agentUrl = HttpUrl.get(server.getAddress());
+        sharedCommunicationObjects.agentHttpClient = new OkHttpClient.Builder().build();
+        return sharedCommunicationObjects;
     }
-    return null;
-  }
 
-  private List<ExposureEvent> allExposures() {
-    List<ExposureEvent> exposures = new ArrayList<>();
-    for (ExposuresRequest request : requests) {
-      exposures.addAll(request.exposures);
+    private static void assertContext(Map<String, String> context, String service, String env, String version) {
+        assertEquals(service == null ? "unknown" : service, context.get("service"));
+        assertOptionalContextValue(context, "env", env);
+        assertOptionalContextValue(context, "version", version);
     }
-    return exposures;
-  }
-
-  private static void assertExposures(
-      List<ExposureEvent> receivedExposures, List<ExposureEvent> expectedExposures) {
-    assertEquals(expectedExposures.size(), receivedExposures.size());
-    TreeSet<ExposureEvent> received = new TreeSet<>(ExposureWriterTests::compare);
-    received.addAll(receivedExposures);
-    assertTrue(received.containsAll(expectedExposures));
-  }
-
-  private static int compare(ExposureEvent first, ExposureEvent second) {
-    if (first == second) {
-      return 0;
+
+    private static void assertOptionalContextValue(Map<String, String> context, String key, String value) {
+        if (value == null) {
+            assertFalse(context.containsKey(key));
+        } else {
+            assertEquals(value, context.get(key));
+        }
     }
-    if (first == null) {
-      return -1;
+
+    private ExposuresRequest findRequest(String serviceName) {
+        for (ExposuresRequest request : requests) {
+            if (serviceName.equals(request.context.get("service"))) {
+                return request;
+            }
+        }
+        return null;
     }
-    if (second == null) {
-      return 1;
+
+    private List<ExposureEvent> allExposures() {
+        List<ExposureEvent> exposures = new ArrayList<>();
+        for (ExposuresRequest request : requests) {
+            exposures.addAll(request.exposures);
+        }
+        return exposures;
     }
 
-    int result = Long.compare(first.timestamp, second.timestamp);
-    if (result != 0) {
-      return result;
+    private static void assertExposures(List<ExposureEvent> receivedExposures, List<ExposureEvent> expectedExposures) {
+        assertEquals(expectedExposures.size(), receivedExposures.size());
+        TreeSet<ExposureEvent> received = new TreeSet<>(ExposureWriterTests::compare);
+        received.addAll(receivedExposures);
+        assertTrue(received.containsAll(expectedExposures));
     }
 
-    result = compareNullableString(first.flag == null ? null : first.flag.key, second.flag);
-    if (result != 0) {
-      return result;
+    private static int compare(ExposureEvent first, ExposureEvent second) {
+        if (first == second) {
+            return 0;
+        }
+        if (first == null) {
+            return -1;
+        }
+        if (second == null) {
+            return 1;
+        }
+
+        int result = Long.compare(first.timestamp, second.timestamp);
+        if (result != 0) {
+            return result;
+        }
+
+        result = compareNullableString(first.flag == null ? null : first.flag.key, second.flag);
+        if (result != 0) {
+            return result;
+        }
+
+        result = compareNullableString(first.variant == null ? null : first.variant.key, second.variant);
+        if (result != 0) {
+            return result;
+        }
+
+        result = compareNullableString(first.allocation == null ? null : first.allocation.key, second.allocation);
+        if (result != 0) {
+            return result;
+        }
+
+        result = compareNullableString(first.subject == null ? null : first.subject.id, second.subject);
+        if (result != 0) {
+            return result;
+        }
+
+        Map.Entry<String, Object> firstEntry = firstEntry(first.subject);
+        Map.Entry<String, Object> secondEntry = firstEntry(second.subject);
+        result = compareNullableString(
+                firstEntry == null ? null : firstEntry.getKey(), secondEntry == null ? null : secondEntry.getKey());
+        if (result != 0) {
+            return result;
+        }
+        return compareNullableString(
+                firstEntry == null ? null : String.valueOf(firstEntry.getValue()),
+                secondEntry == null ? null : String.valueOf(secondEntry.getValue()));
     }
 
-    result =
-        compareNullableString(first.variant == null ? null : first.variant.key, second.variant);
-    if (result != 0) {
-      return result;
+    private static int compareNullableString(String first, Flag second) {
+        return compareNullableString(first, second == null ? null : second.key);
     }
 
-    result =
-        compareNullableString(
-            first.allocation == null ? null : first.allocation.key, second.allocation);
-    if (result != 0) {
-      return result;
+    private static int compareNullableString(String first, Variant second) {
+        return compareNullableString(first, second == null ? null : second.key);
     }
 
-    result = compareNullableString(first.subject == null ? null : first.subject.id, second.subject);
-    if (result != 0) {
-      return result;
+    private static int compareNullableString(String first, Allocation second) {
+        return compareNullableString(first, second == null ? null : second.key);
     }
 
-    Map.Entry<String, Object> firstEntry = firstEntry(first.subject);
-    Map.Entry<String, Object> secondEntry = firstEntry(second.subject);
-    result =
-        compareNullableString(
-            firstEntry == null ? null : firstEntry.getKey(),
-            secondEntry == null ? null : secondEntry.getKey());
-    if (result != 0) {
-      return result;
+    private static int compareNullableString(String first, Subject second) {
+        return compareNullableString(first, second == null ? null : second.id);
     }
-    return compareNullableString(
-        firstEntry == null ? null : String.valueOf(firstEntry.getValue()),
-        secondEntry == null ? null : String.valueOf(secondEntry.getValue()));
-  }
-
-  private static int compareNullableString(String first, Flag second) {
-    return compareNullableString(first, second == null ? null : second.key);
-  }
-
-  private static int compareNullableString(String first, Variant second) {
-    return compareNullableString(first, second == null ? null : second.key);
-  }
-
-  private static int compareNullableString(String first, Allocation second) {
-    return compareNullableString(first, second == null ? null : second.key);
-  }
-
-  private static int compareNullableString(String first, Subject second) {
-    return compareNullableString(first, second == null ? null : second.id);
-  }
-
-  private static int compareNullableString(String first, String second) {
-    String firstValue = first == null ? "" : first;
-    String secondValue = second == null ? "" : second;
-    return firstValue.compareTo(secondValue);
-  }
-
-  private static Map.Entry<String, Object> firstEntry(Subject subject) {
-    if (subject == null || subject.attributes == null) {
-      return null;
+
+    private static int compareNullableString(String first, String second) {
+        String firstValue = first == null ? "" : first;
+        String secondValue = second == null ? "" : second;
+        return firstValue.compareTo(secondValue);
     }
-    Iterator<Map.Entry<String, Object>> iterator = subject.attributes.entrySet().iterator();
-    return iterator.hasNext() ? iterator.next() : null;
-  }
-
-  private static List<ExposureEvent> buildExposures(int count) {
-    List<ExposureEvent> exposures = new ArrayList<>();
-    for (int index = 0; index < count; index++) {
-      exposures.add(buildExposure());
+
+    private static Map.Entry<String, Object> firstEntry(Subject subject) {
+        if (subject == null || subject.attributes == null) {
+            return null;
+        }
+        Iterator<Map.Entry<String, Object>> iterator =
+                subject.attributes.entrySet().iterator();
+        return iterator.hasNext() ? iterator.next() : null;
+    }
+
+    private static List<ExposureEvent> buildExposures(int count) {
+        List<ExposureEvent> exposures = new ArrayList<>();
+        for (int index = 0; index < count; index++) {
+            exposures.add(buildExposure());
+        }
+        return exposures;
+    }
+
+    private static ExposureEvent buildExposure() {
+        String id = UUID.randomUUID().toString();
+        return buildExposure(id, singletonMap("key_" + id, (Object) ("value_" + id)));
+    }
+
+    private static ExposureEvent buildExposure(Map<String, Object> attributes) {
+        return buildExposure(UUID.randomUUID().toString(), attributes);
+    }
+
+    private static ExposureEvent buildExposure(String id, Map<String, Object> attributes) {
+        return new ExposureEvent(
+                System.currentTimeMillis(),
+                new Allocation("Allocation_" + id),
+                new Flag("Flag_" + id),
+                new Variant("Variant_" + id),
+                new Subject("Subject_" + id, attributes));
     }
-    return exposures;
-  }
-
-  private static ExposureEvent buildExposure() {
-    String id = UUID.randomUUID().toString();
-    return buildExposure(id, singletonMap("key_" + id, (Object) ("value_" + id)));
-  }
-
-  private static ExposureEvent buildExposure(Map<String, Object> attributes) {
-    return buildExposure(UUID.randomUUID().toString(), attributes);
-  }
-
-  private static ExposureEvent buildExposure(String id, Map<String, Object> attributes) {
-    return new ExposureEvent(
-        System.currentTimeMillis(),
-        new Allocation("Allocation_" + id),
-        new Flag("Flag_" + id),
-        new Variant("Variant_" + id),
-        new Subject("Subject_" + id, attributes));
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FeatureFlagBackendApiFactoryTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FeatureFlagBackendApiFactoryTest.java
index b89cf3ce2b1..ea271bfa890 100644
--- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FeatureFlagBackendApiFactoryTest.java
+++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FeatureFlagBackendApiFactoryTest.java
@@ -21,138 +21,133 @@
 
 class FeatureFlagBackendApiFactoryTest {
 
-  @Test
-  void remoteConfigUsesOnlyLocalEvpProxy() {
-    final Config config = config(CONFIGURATION_SOURCE_REMOTE_CONFIG, "api-key");
-    final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
-    final BackendApi proxyApi = mock(BackendApi.class);
-    when(backendApiFactory.createEvpProxyApi(Intake.EVENT_PLATFORM, false)).thenReturn(proxyApi);
-
-    final BackendApi selected =
-        new FeatureFlagBackendApiFactory(config, backendApiFactory, FLAG_EVALUATION).create();
-
-    assertSame(proxyApi, selected);
-    verify(backendApiFactory, never()).createDirectIntakeApi(Intake.EVENT_PLATFORM, false, false);
-  }
-
-  @Test
-  void remoteConfigDisablesDeliveryWhenLocalEvpProxyIsUnavailable() {
-    final Config config = config(CONFIGURATION_SOURCE_REMOTE_CONFIG, "api-key");
-    final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
-
-    final BackendApi selected =
-        new FeatureFlagBackendApiFactory(config, backendApiFactory, EXPOSURE).create();
-
-    assertNull(selected);
-    verify(backendApiFactory).createEvpProxyApi(Intake.EVENT_PLATFORM, true);
-    verify(backendApiFactory, never()).createDirectIntakeApi(Intake.EVENT_PLATFORM, true, false);
-  }
-
-  @Test
-  void agentlessPrefersLocalEvpProxyWithDirectFallback() {
-    final Config config = config(CONFIGURATION_SOURCE_AGENTLESS, "api-key");
-    final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
-    when(backendApiFactory.createEvpProxyApi(
-            Intake.EVENT_PLATFORM, false, HttpRetryPolicy.Factory.NEVER_RETRY))
-        .thenReturn(mock(BackendApi.class));
-    when(backendApiFactory.createDirectIntakeApi(Intake.EVENT_PLATFORM, false, false))
-        .thenReturn(mock(BackendApi.class));
-
-    final BackendApi selected =
-        new FeatureFlagBackendApiFactory(config, backendApiFactory, FLAG_EVALUATION).create();
-
-    assertInstanceOf(AgentlessFeatureFlagBackendApi.class, selected);
-    verify(backendApiFactory)
-        .createEvpProxyApi(Intake.EVENT_PLATFORM, false, HttpRetryPolicy.Factory.NEVER_RETRY);
-    verify(backendApiFactory, never()).createDirectIntakeApi(Intake.EVENT_PLATFORM, false, false);
-  }
-
-  @Test
-  void agentlessUsesDirectIntakeWhenLocalEvpProxyIsUnavailable() {
-    final Config config = config(CONFIGURATION_SOURCE_AGENTLESS, "api-key");
-    final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
-    final BackendApi directApi = mock(BackendApi.class);
-    when(backendApiFactory.createDirectIntakeApi(Intake.EVENT_PLATFORM, false, false))
-        .thenReturn(directApi);
-
-    final BackendApi selected =
-        new FeatureFlagBackendApiFactory(config, backendApiFactory, FLAG_EVALUATION).create();
-
-    assertSame(directApi, selected);
-  }
-
-  @Test
-  void agentlessUsesLocalEvpProxyWhenApiKeyIsUnavailable() {
-    final Config config = config(CONFIGURATION_SOURCE_AGENTLESS, null);
-    final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
-    final BackendApi proxyApi = mock(BackendApi.class);
-    when(backendApiFactory.createEvpProxyApi(Intake.EVENT_PLATFORM, false)).thenReturn(proxyApi);
-
-    final BackendApi selected =
-        new FeatureFlagBackendApiFactory(config, backendApiFactory, FLAG_EVALUATION).create();
-
-    assertSame(proxyApi, selected);
-    verify(backendApiFactory, never()).createDirectIntakeApi(Intake.EVENT_PLATFORM, false, false);
-  }
-
-  @Test
-  void agentlessDisablesDeliveryWhenNoRouteIsAvailable() {
-    final Config config = config(CONFIGURATION_SOURCE_AGENTLESS, null);
-    final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
-
-    final BackendApi selected =
-        new FeatureFlagBackendApiFactory(config, backendApiFactory, FLAG_EVALUATION).create();
-
-    assertNull(selected);
-  }
-
-  @Test
-  void agentlessDisablesDeliveryWhenApiKeyIsEmpty() {
-    final Config config = config(CONFIGURATION_SOURCE_AGENTLESS, "");
-    final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
-
-    final BackendApi selected =
-        new FeatureFlagBackendApiFactory(config, backendApiFactory, EXPOSURE).create();
-
-    assertNull(selected);
-    verify(backendApiFactory, never()).createDirectIntakeApi(Intake.EVENT_PLATFORM, true, false);
-  }
-
-  @Test
-  void agentlessDoesNotValidateDirectUrlWhileLocalRouteIsAvailable() {
-    final Config config = config(CONFIGURATION_SOURCE_AGENTLESS, "api-key");
-    final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
-    final BackendApi proxyApi = mock(BackendApi.class);
-    when(backendApiFactory.createEvpProxyApi(
-            Intake.EVENT_PLATFORM, false, HttpRetryPolicy.Factory.NEVER_RETRY))
-        .thenReturn(proxyApi);
-    when(backendApiFactory.createDirectIntakeApi(Intake.EVENT_PLATFORM, false, false))
-        .thenThrow(new IllegalArgumentException("invalid URL"));
-
-    final BackendApi selected =
-        new FeatureFlagBackendApiFactory(config, backendApiFactory, FLAG_EVALUATION).create();
-
-    assertInstanceOf(AgentlessFeatureFlagBackendApi.class, selected);
-    verify(backendApiFactory, never()).createDirectIntakeApi(Intake.EVENT_PLATFORM, false, false);
-  }
-
-  @Test
-  void agentlessDisablesDeliveryWhenDirectUrlIsInvalidAndLocalRouteIsUnavailable() {
-    final Config config = config(CONFIGURATION_SOURCE_AGENTLESS, "api-key");
-    final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
-    when(backendApiFactory.createDirectIntakeApi(Intake.EVENT_PLATFORM, false, false))
-        .thenThrow(new IllegalArgumentException("invalid URL"));
-
-    final BackendApi selected =
-        new FeatureFlagBackendApiFactory(config, backendApiFactory, FLAG_EVALUATION).create();
-
-    assertNull(selected);
-  }
-
-  private static Config config(final String source, final String apiKey) {
-    final Config config = mock(Config.class);
-    when(config.getFeatureFlaggingConfigurationSource()).thenReturn(source);
-    when(config.getApiKey()).thenReturn(apiKey);
-    return config;
-  }
+    @Test
+    void remoteConfigUsesOnlyLocalEvpProxy() {
+        final Config config = config(CONFIGURATION_SOURCE_REMOTE_CONFIG, "api-key");
+        final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
+        final BackendApi proxyApi = mock(BackendApi.class);
+        when(backendApiFactory.createEvpProxyApi(Intake.EVENT_PLATFORM, false)).thenReturn(proxyApi);
+
+        final BackendApi selected =
+                new FeatureFlagBackendApiFactory(config, backendApiFactory, FLAG_EVALUATION).create();
+
+        assertSame(proxyApi, selected);
+        verify(backendApiFactory, never()).createDirectIntakeApi(Intake.EVENT_PLATFORM, false, false);
+    }
+
+    @Test
+    void remoteConfigDisablesDeliveryWhenLocalEvpProxyIsUnavailable() {
+        final Config config = config(CONFIGURATION_SOURCE_REMOTE_CONFIG, "api-key");
+        final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
+
+        final BackendApi selected = new FeatureFlagBackendApiFactory(config, backendApiFactory, EXPOSURE).create();
+
+        assertNull(selected);
+        verify(backendApiFactory).createEvpProxyApi(Intake.EVENT_PLATFORM, true);
+        verify(backendApiFactory, never()).createDirectIntakeApi(Intake.EVENT_PLATFORM, true, false);
+    }
+
+    @Test
+    void agentlessPrefersLocalEvpProxyWithDirectFallback() {
+        final Config config = config(CONFIGURATION_SOURCE_AGENTLESS, "api-key");
+        final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
+        when(backendApiFactory.createEvpProxyApi(Intake.EVENT_PLATFORM, false, HttpRetryPolicy.Factory.NEVER_RETRY))
+                .thenReturn(mock(BackendApi.class));
+        when(backendApiFactory.createDirectIntakeApi(Intake.EVENT_PLATFORM, false, false))
+                .thenReturn(mock(BackendApi.class));
+
+        final BackendApi selected =
+                new FeatureFlagBackendApiFactory(config, backendApiFactory, FLAG_EVALUATION).create();
+
+        assertInstanceOf(AgentlessFeatureFlagBackendApi.class, selected);
+        verify(backendApiFactory).createEvpProxyApi(Intake.EVENT_PLATFORM, false, HttpRetryPolicy.Factory.NEVER_RETRY);
+        verify(backendApiFactory, never()).createDirectIntakeApi(Intake.EVENT_PLATFORM, false, false);
+    }
+
+    @Test
+    void agentlessUsesDirectIntakeWhenLocalEvpProxyIsUnavailable() {
+        final Config config = config(CONFIGURATION_SOURCE_AGENTLESS, "api-key");
+        final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
+        final BackendApi directApi = mock(BackendApi.class);
+        when(backendApiFactory.createDirectIntakeApi(Intake.EVENT_PLATFORM, false, false))
+                .thenReturn(directApi);
+
+        final BackendApi selected =
+                new FeatureFlagBackendApiFactory(config, backendApiFactory, FLAG_EVALUATION).create();
+
+        assertSame(directApi, selected);
+    }
+
+    @Test
+    void agentlessUsesLocalEvpProxyWhenApiKeyIsUnavailable() {
+        final Config config = config(CONFIGURATION_SOURCE_AGENTLESS, null);
+        final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
+        final BackendApi proxyApi = mock(BackendApi.class);
+        when(backendApiFactory.createEvpProxyApi(Intake.EVENT_PLATFORM, false)).thenReturn(proxyApi);
+
+        final BackendApi selected =
+                new FeatureFlagBackendApiFactory(config, backendApiFactory, FLAG_EVALUATION).create();
+
+        assertSame(proxyApi, selected);
+        verify(backendApiFactory, never()).createDirectIntakeApi(Intake.EVENT_PLATFORM, false, false);
+    }
+
+    @Test
+    void agentlessDisablesDeliveryWhenNoRouteIsAvailable() {
+        final Config config = config(CONFIGURATION_SOURCE_AGENTLESS, null);
+        final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
+
+        final BackendApi selected =
+                new FeatureFlagBackendApiFactory(config, backendApiFactory, FLAG_EVALUATION).create();
+
+        assertNull(selected);
+    }
+
+    @Test
+    void agentlessDisablesDeliveryWhenApiKeyIsEmpty() {
+        final Config config = config(CONFIGURATION_SOURCE_AGENTLESS, "");
+        final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
+
+        final BackendApi selected = new FeatureFlagBackendApiFactory(config, backendApiFactory, EXPOSURE).create();
+
+        assertNull(selected);
+        verify(backendApiFactory, never()).createDirectIntakeApi(Intake.EVENT_PLATFORM, true, false);
+    }
+
+    @Test
+    void agentlessDoesNotValidateDirectUrlWhileLocalRouteIsAvailable() {
+        final Config config = config(CONFIGURATION_SOURCE_AGENTLESS, "api-key");
+        final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
+        final BackendApi proxyApi = mock(BackendApi.class);
+        when(backendApiFactory.createEvpProxyApi(Intake.EVENT_PLATFORM, false, HttpRetryPolicy.Factory.NEVER_RETRY))
+                .thenReturn(proxyApi);
+        when(backendApiFactory.createDirectIntakeApi(Intake.EVENT_PLATFORM, false, false))
+                .thenThrow(new IllegalArgumentException("invalid URL"));
+
+        final BackendApi selected =
+                new FeatureFlagBackendApiFactory(config, backendApiFactory, FLAG_EVALUATION).create();
+
+        assertInstanceOf(AgentlessFeatureFlagBackendApi.class, selected);
+        verify(backendApiFactory, never()).createDirectIntakeApi(Intake.EVENT_PLATFORM, false, false);
+    }
+
+    @Test
+    void agentlessDisablesDeliveryWhenDirectUrlIsInvalidAndLocalRouteIsUnavailable() {
+        final Config config = config(CONFIGURATION_SOURCE_AGENTLESS, "api-key");
+        final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
+        when(backendApiFactory.createDirectIntakeApi(Intake.EVENT_PLATFORM, false, false))
+                .thenThrow(new IllegalArgumentException("invalid URL"));
+
+        final BackendApi selected =
+                new FeatureFlagBackendApiFactory(config, backendApiFactory, FLAG_EVALUATION).create();
+
+        assertNull(selected);
+    }
+
+    private static Config config(final String source, final String apiKey) {
+        final Config config = mock(Config.class);
+        when(config.getFeatureFlaggingConfigurationSource()).thenReturn(source);
+        when(config.getApiKey()).thenReturn(apiKey);
+        return config;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FeatureFlagEvpPublisherTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FeatureFlagEvpPublisherTest.java
index 711e1b90e29..e5c5533cabe 100644
--- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FeatureFlagEvpPublisherTest.java
+++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FeatureFlagEvpPublisherTest.java
@@ -28,101 +28,97 @@
 
 class FeatureFlagEvpPublisherTest {
 
-  @Test
-  void defaultPublisherRequestsResponseCompression() {
-    final BackendApi backendApi = mock(BackendApi.class);
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(Intake.EVENT_PLATFORM, true)).thenReturn(backendApi);
-
-    final FeatureFlagEvpPublisher<TestRequest> publisher =
-        new FeatureFlagEvpPublisher<>(factory, TestRequest.class);
-
-    publisher.start();
-
-    verify(factory).createBackendApi(Intake.EVENT_PLATFORM, true);
-    verifyNoMoreInteractions(factory);
-  }
-
-  @Test
-  void responseCompressionCanBeDisabled() throws Exception {
-    final BackendApi backendApi = mock(BackendApi.class);
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(Intake.EVENT_PLATFORM, false)).thenReturn(backendApi);
-
-    final FeatureFlagEvpPublisher<TestRequest> publisher =
-        new FeatureFlagEvpPublisher<>(factory, TestRequest.class, false);
-
-    publisher.post("flagevaluation", new TestRequest("value"));
-
-    verify(factory).createBackendApi(Intake.EVENT_PLATFORM, false);
-    verify(backendApi)
-        .post(eq("flagevaluation"), any(RequestBody.class), any(), isNull(), eq(false));
-  }
-
-  @Test
-  void postThrowsWhenEvpBackendApiCannotBeCreated() {
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    final FeatureFlagEvpPublisher<TestRequest> publisher =
-        new FeatureFlagEvpPublisher<>(factory, TestRequest.class);
-
-    assertFalse(publisher.start());
-    assertThrows(
-        IllegalStateException.class,
-        () -> publisher.post("flagevaluation", FeatureFlagEvpPublisher.utf8Bytes("{}")));
-  }
-
-  @Test
-  void serializesSerialIdUnderTheIntakeWireKey() {
-    assertTrue(exposureJson(340132).contains("\"serial_id\":340132"));
-  }
-
-  @Test
-  void serializesSerialIdZeroRatherThanOmittingIt() {
-    assertTrue(exposureJson(0).contains("\"serial_id\":0"));
-  }
-
-  @Test
-  void omitsSerialIdKeyWhenAbsent() {
-    assertFalse(exposureJson(null).contains("serial_id"));
-  }
-
-  @Test
-  void omitsSerialIdKeyForAnEventBuiltWithoutOne() {
-    final ExposureEvent event =
-        new ExposureEvent(
-            1234L,
-            new Allocation("allocation"),
-            new Flag("flag"),
-            new Variant("variant"),
-            new Subject("subject", emptyMap()));
-
-    assertFalse(exposureJsonOf(event).contains("serial_id"));
-  }
-
-  private static String exposureJson(final Integer serialId) {
-    return exposureJsonOf(
-        new ExposureEvent(
-            1234L,
-            new Allocation("allocation"),
-            new Flag("flag"),
-            new Variant("variant"),
-            new Subject("subject", emptyMap()),
-            serialId));
-  }
-
-  private static String exposureJsonOf(final ExposureEvent event) {
-    final FeatureFlagEvpPublisher<ExposuresRequest> publisher =
-        new FeatureFlagEvpPublisher<>(mock(BackendApiFactory.class), ExposuresRequest.class);
-    return new String(
-        publisher.serialize(new ExposuresRequest(emptyMap(), singletonList(event))),
-        StandardCharsets.UTF_8);
-  }
-
-  static class TestRequest {
-    public final String value;
-
-    TestRequest(final String value) {
-      this.value = value;
+    @Test
+    void defaultPublisherRequestsResponseCompression() {
+        final BackendApi backendApi = mock(BackendApi.class);
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(Intake.EVENT_PLATFORM, true)).thenReturn(backendApi);
+
+        final FeatureFlagEvpPublisher<TestRequest> publisher =
+                new FeatureFlagEvpPublisher<>(factory, TestRequest.class);
+
+        publisher.start();
+
+        verify(factory).createBackendApi(Intake.EVENT_PLATFORM, true);
+        verifyNoMoreInteractions(factory);
+    }
+
+    @Test
+    void responseCompressionCanBeDisabled() throws Exception {
+        final BackendApi backendApi = mock(BackendApi.class);
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(Intake.EVENT_PLATFORM, false)).thenReturn(backendApi);
+
+        final FeatureFlagEvpPublisher<TestRequest> publisher =
+                new FeatureFlagEvpPublisher<>(factory, TestRequest.class, false);
+
+        publisher.post("flagevaluation", new TestRequest("value"));
+
+        verify(factory).createBackendApi(Intake.EVENT_PLATFORM, false);
+        verify(backendApi).post(eq("flagevaluation"), any(RequestBody.class), any(), isNull(), eq(false));
+    }
+
+    @Test
+    void postThrowsWhenEvpBackendApiCannotBeCreated() {
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        final FeatureFlagEvpPublisher<TestRequest> publisher =
+                new FeatureFlagEvpPublisher<>(factory, TestRequest.class);
+
+        assertFalse(publisher.start());
+        assertThrows(
+                IllegalStateException.class,
+                () -> publisher.post("flagevaluation", FeatureFlagEvpPublisher.utf8Bytes("{}")));
+    }
+
+    @Test
+    void serializesSerialIdUnderTheIntakeWireKey() {
+        assertTrue(exposureJson(340132).contains("\"serial_id\":340132"));
+    }
+
+    @Test
+    void serializesSerialIdZeroRatherThanOmittingIt() {
+        assertTrue(exposureJson(0).contains("\"serial_id\":0"));
+    }
+
+    @Test
+    void omitsSerialIdKeyWhenAbsent() {
+        assertFalse(exposureJson(null).contains("serial_id"));
+    }
+
+    @Test
+    void omitsSerialIdKeyForAnEventBuiltWithoutOne() {
+        final ExposureEvent event = new ExposureEvent(
+                1234L,
+                new Allocation("allocation"),
+                new Flag("flag"),
+                new Variant("variant"),
+                new Subject("subject", emptyMap()));
+
+        assertFalse(exposureJsonOf(event).contains("serial_id"));
+    }
+
+    private static String exposureJson(final Integer serialId) {
+        return exposureJsonOf(new ExposureEvent(
+                1234L,
+                new Allocation("allocation"),
+                new Flag("flag"),
+                new Variant("variant"),
+                new Subject("subject", emptyMap()),
+                serialId));
+    }
+
+    private static String exposureJsonOf(final ExposureEvent event) {
+        final FeatureFlagEvpPublisher<ExposuresRequest> publisher =
+                new FeatureFlagEvpPublisher<>(mock(BackendApiFactory.class), ExposuresRequest.class);
+        return new String(
+                publisher.serialize(new ExposuresRequest(emptyMap(), singletonList(event))), StandardCharsets.UTF_8);
+    }
+
+    static class TestRequest {
+        public final String value;
+
+        TestRequest(final String value) {
+            this.value = value;
+        }
     }
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FlagEvaluationAggregatorTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FlagEvaluationAggregatorTest.java
index 06faeadefea..7e705183bb8 100644
--- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FlagEvaluationAggregatorTest.java
+++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FlagEvaluationAggregatorTest.java
@@ -14,412 +14,395 @@
 
 class FlagEvaluationAggregatorTest {
 
-  @Test
-  void identicalEventsAggregateIntoOneBucketWithCount2() {
-    final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
-
-    aggregator.aggregate(event("flag-a", "on", "alloc1", "user-1", 1000L, emptyMap()));
-    aggregator.aggregate(event("flag-a", "on", "alloc1", "user-1", 2000L, emptyMap()));
-
-    final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
-    assertEquals(1, state.fullTier.size());
-    final FlagEvaluationAggregator.EvalBucket bucket = state.fullTier.values().iterator().next();
-    assertEquals(2, bucket.count);
-    assertEquals(1000L, bucket.firstEvalMs);
-    assertEquals(2000L, bucket.lastEvalMs);
-    assertTrue(bucket.firstEvalMs <= bucket.lastEvalMs);
-  }
-
-  @Test
-  void differentValueTypesProduceDifferentBuckets() {
-    final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
-    final Map<String, Object> attrsInt = new HashMap<>();
-    attrsInt.put("score", 1);
-    final Map<String, Object> attrsStr = new HashMap<>();
-    attrsStr.put("score", "1");
-
-    aggregator.aggregate(event("flag-b", "on", "alloc1", "user-1", 1000L, true, attrsInt));
-    aggregator.aggregate(event("flag-b", "on", "alloc1", "user-1", 1000L, true, attrsStr));
-
-    final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
-    assertEquals(2, state.fullTier.size());
-  }
-
-  @Test
-  void nulCharactersInKeyFieldsDoNotCollide() {
-    final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
-
-    aggregator.aggregate(event("a\0b", "c", "alloc1", "user-1", 1000L, emptyMap()));
-    aggregator.aggregate(event("a", "b\0c", "alloc1", "user-1", 1000L, emptyMap()));
-
-    final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
-    assertEquals(2, state.fullTier.size());
-  }
-
-  @Test
-  void globalCapOverflowRoutesToDegradedTier() {
-    final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
-
-    aggregator.simulateFullTierAtCap();
-    aggregator.aggregate(simpleEvent("extra-flag", "on"));
-
-    final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
-    assertTrue(state.degradedTier.size() > 0);
-    assertEquals(0, state.droppedDegradedOverflow);
-  }
-
-  @Test
-  void degradedCapOverflowIncrementsDroppedCounter() {
-    final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
-
-    aggregator.simulateFullTierAtCap();
-    aggregator.simulateDegradedTierAtCap();
-    aggregator.aggregate(simpleEvent("drop-flag", "on"));
-
-    final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
-    assertTrue(state.droppedDegradedOverflow > 0);
-  }
-
-  @Test
-  void perFlagCapOverflowRoutesToDegradedTierAndMergesSameDegradedKey() {
-    final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
-    aggregator.perFlagCount.put("hot-flag", FlagEvaluationAggregator.PER_FLAG_CAP);
-
-    aggregator.aggregate(event("hot-flag", "on", "alloc1", "user-1", 1000L, emptyMap()));
-    aggregator.aggregate(event("hot-flag", "on", "alloc1", "user-2", 2000L, emptyMap()));
-
-    final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
-    assertEquals(0, state.fullTier.size());
-    assertEquals(1, state.degradedTier.size());
-    final FlagEvaluationAggregator.EvalBucket bucket =
-        state.degradedTier.values().iterator().next();
-    assertEquals(2, bucket.count);
-    assertEquals(1000L, bucket.firstEvalMs);
-    assertEquals(2000L, bucket.lastEvalMs);
-  }
-
-  @Test
-  void mixedConsentDegradedEvaluationsMergeIntoOneBucket() {
-    // Mirror of mixedConsentEvaluationsForSameSubjectLandInDistinctBuckets, but for the degraded
-    // tier: the wire serializer for degraded rows drops the targeting key and context regardless
-    // of consent, so two events differing only in consent emit byte-identical JSON. They must
-    // share a bucket, otherwise DEGRADED_CAP is effectively halved for zero wire fidelity gain.
-    // The AND-fold on EvalBucket.observeFullEvaluationData still runs but the value has no
-    // downstream effect for degraded rows.
-    final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
-    aggregator.perFlagCount.put("hot-flag", FlagEvaluationAggregator.PER_FLAG_CAP);
-
-    aggregator.aggregate(event("hot-flag", "on", "alloc1", "user-1", 1000L, true, emptyMap()));
-    aggregator.aggregate(event("hot-flag", "on", "alloc1", "user-2", 2000L, false, emptyMap()));
-
-    final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
-    assertEquals(0, state.fullTier.size());
-    assertEquals(1, state.degradedTier.size());
-    final FlagEvaluationAggregator.EvalBucket bucket =
-        state.degradedTier.values().iterator().next();
-    assertEquals(2, bucket.count);
-    // AND-fold collapses to consent-off; benign for degraded rows but a documented invariant.
-    assertFalse(bucket.observeFullEvaluationData);
-  }
-
-  @Test
-  void absentVariantSetsRuntimeDefaultUsed() {
-    final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
-
-    aggregator.aggregate(event("flag-c", null, "alloc1", "user-1", 1000L, emptyMap()));
-
-    final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
-    assertEquals(1, state.fullTier.size());
-    final FlagEvaluationAggregator.EvalBucket bucket = state.fullTier.values().iterator().next();
-    assertTrue(bucket.runtimeDefaultUsed);
-  }
-
-  @Test
-  void aggregatorStoresPrunedAttrsVerbatim() {
-    // Hot-path hook (DDEvaluator#copyPrunedContext) now delivers an already-pruned map.
-    // The aggregator no longer re-prunes; it stores what it is given.
-    final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
-    final Map<String, Object> preprunedAttrs = new HashMap<>();
-    for (int i = 0; i < 100; i++) {
-      preprunedAttrs.put("key" + i, "v" + i);
+    @Test
+    void identicalEventsAggregateIntoOneBucketWithCount2() {
+        final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
+
+        aggregator.aggregate(event("flag-a", "on", "alloc1", "user-1", 1000L, emptyMap()));
+        aggregator.aggregate(event("flag-a", "on", "alloc1", "user-1", 2000L, emptyMap()));
+
+        final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
+        assertEquals(1, state.fullTier.size());
+        final FlagEvaluationAggregator.EvalBucket bucket =
+                state.fullTier.values().iterator().next();
+        assertEquals(2, bucket.count);
+        assertEquals(1000L, bucket.firstEvalMs);
+        assertEquals(2000L, bucket.lastEvalMs);
+        assertTrue(bucket.firstEvalMs <= bucket.lastEvalMs);
     }
 
-    aggregator.aggregate(event("flag-d", "on", "alloc1", "user-1", 1000L, true, preprunedAttrs));
-
-    final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
-    final FlagEvaluationAggregator.EvalBucket bucket = state.fullTier.values().iterator().next();
-    assertEquals(100, bucket.prunedContextFieldCount());
-    assertEquals(100, bucket.prunedAttrs.size());
-  }
-
-  @Test
-  void emptyContextInputsProduceEmptyCanonicalKey() {
-    assertEquals("", FlagEvaluationAggregator.canonicalContextKey(null));
-    assertEquals("", FlagEvaluationAggregator.canonicalContextKey(emptyMap()));
-  }
-
-  @Test
-  void canonicalContextKeyEncodesSupportedValueTypes() {
-    final Map<String, Object> attrs = new HashMap<>();
-    attrs.put("bool", true);
-    attrs.put("double", 1.5d);
-    attrs.put("float", 1.25f);
-    attrs.put("int", 1);
-    attrs.put("long", 2L);
-    attrs.put("null", null);
-    attrs.put("object", new StringBuilder("other"));
-    attrs.put("string", "value");
-
-    final String key = FlagEvaluationAggregator.canonicalContextKey(attrs);
-
-    assertEquals(key, FlagEvaluationAggregator.canonicalContextKey(new HashMap<>(attrs)));
-    assertTrue(key.contains("bool"));
-    assertTrue(key.contains("string"));
-    assertTrue(key.contains("other"));
-  }
-
-  @Test
-  void aggregatorStoresPrePrunedAttrsWithoutRePruning() {
-    // Value-length pruning moved to DDEvaluator#copyPrunedContext (hot path). The aggregator
-    // stores what it is given, so any long value present in the input remains present.
-    final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
-    final Map<String, Object> preprunedAttrs = new HashMap<>();
-    preprunedAttrs.put("short-val", "ok");
-
-    aggregator.aggregate(event("flag-e", "on", "alloc1", "user-1", 1000L, true, preprunedAttrs));
-
-    final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
-    final FlagEvaluationAggregator.EvalBucket bucket = state.fullTier.values().iterator().next();
-    assertTrue(bucket.prunedAttrs.containsKey("short-val"));
-  }
-
-  @Test
-  void capSizingUsesNamedScaleConstants() {
-    assertEquals(125_000, FlagEvaluationAggregator.FULL_BUCKET_SIZING_BASIS);
-    assertEquals(10_000, FlagEvaluationAggregator.PER_FLAG_BUCKET_SIZING_BASIS);
-    assertEquals(25_000, FlagEvaluationAggregator.DEGRADED_BUCKET_SIZING_BASIS);
-    assertEquals(131_072, FlagEvaluationAggregator.GLOBAL_CAP);
-    assertEquals(10_000, FlagEvaluationAggregator.PER_FLAG_CAP);
-    assertEquals(32_768, FlagEvaluationAggregator.DEGRADED_CAP);
-  }
-
-  @Test
-  void flagEvalEventDoesNotCarryReason() {
-    final boolean hasReasonField =
-        Arrays.stream(
-                datadog.trace.api.featureflag.flagevaluation.FlagEvalEvent.class
-                    .getDeclaredFields())
-            .anyMatch(field -> field.getName().equals("reason"));
-
-    assertFalse(hasReasonField);
-  }
-
-  @Test
-  void evalBucketTracksBoundsDefaultStateAndNullContextFieldCount() {
-    final FlagEvaluationAggregator.EvalBucket bucket =
-        new FlagEvaluationAggregator.EvalBucket(
-            "bucket-flag", "on", "alloc1", "user-1", null, 1000L, false, null, false);
-
-    assertEquals(0, bucket.prunedContextFieldCount());
-
-    bucket.merge(900L, true);
-    bucket.merge(1100L, false);
-    bucket.merge(1000L, false);
-
-    assertEquals(4, bucket.count);
-    assertEquals(900L, bucket.firstEvalMs);
-    assertEquals(1100L, bucket.lastEvalMs);
-    assertTrue(bucket.runtimeDefaultUsed);
-  }
-
-  @Test
-  void fullKeyEqualityUsesEveryDimension() {
-    final FlagEvaluationAggregator.FullKey base =
-        fullKey("flag", "on", "alloc", false, "error", "user", "ctx");
-    final FlagEvaluationAggregator.FullKey same =
-        fullKey("flag", "on", "alloc", false, "error", "user", "ctx");
-
-    assertEquals(base, base);
-    assertEquals(base, same);
-    assertEquals(base.hashCode(), same.hashCode());
-    assertNotEquals(base, null);
-    assertNotEquals(base, "not-a-key");
-    assertNotEquals(base, fullKey("other", "on", "alloc", false, "error", "user", "ctx"));
-    assertNotEquals(base, fullKey("flag", "off", "alloc", false, "error", "user", "ctx"));
-    assertNotEquals(base, fullKey("flag", "on", "other", false, "error", "user", "ctx"));
-    assertNotEquals(base, fullKey("flag", "on", "alloc", true, "error", "user", "ctx"));
-    assertNotEquals(base, fullKey("flag", "on", "alloc", false, "other", "user", "ctx"));
-    assertNotEquals(base, fullKey("flag", "on", "alloc", false, "error", "other", "ctx"));
-    assertNotEquals(base, fullKey("flag", "on", "alloc", false, "error", "user", "other"));
-  }
-
-  @Test
-  void degradedKeyEqualityUsesEveryDimension() {
-    final FlagEvaluationAggregator.DegradedKey base =
-        degradedKey("flag", "on", "alloc", false, "error");
-    final FlagEvaluationAggregator.DegradedKey same =
-        degradedKey("flag", "on", "alloc", false, "error");
-
-    assertEquals(base, base);
-    assertEquals(base, same);
-    assertEquals(base.hashCode(), same.hashCode());
-    assertNotEquals(base, null);
-    assertNotEquals(base, "not-a-key");
-    assertNotEquals(base, degradedKey("other", "on", "alloc", false, "error"));
-    assertNotEquals(base, degradedKey("flag", "off", "alloc", false, "error"));
-    assertNotEquals(base, degradedKey("flag", "on", "other", false, "error"));
-    assertNotEquals(base, degradedKey("flag", "on", "alloc", true, "error"));
-    assertNotEquals(base, degradedKey("flag", "on", "alloc", false, "other"));
-  }
-
-  @Test
-  void mixedConsentEvaluationsForSameSubjectLandInDistinctBuckets() {
-    // Consent is part of FullKey: two evaluations that differ only in consent produce different
-    // wire rows (raw vs hashed targeting key, context vs no context) and belong in different
-    // buckets. Merging them would silently downgrade the consent-on row to the protected shape.
-    final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
-    aggregator.aggregate(event("fold-flag", "on", "alloc1", "user-1", 1000L, true, emptyMap()));
-    aggregator.aggregate(event("fold-flag", "on", "alloc1", "user-1", 2000L, false, emptyMap()));
-
-    assertEquals(2, aggregator.fullTierSize());
-    int onCount = 0;
-    int offCount = 0;
-    for (final FlagEvaluationAggregator.EvalBucket bucket :
-        aggregator.snapshot().fullTier.values()) {
-      if (bucket.observeFullEvaluationData) {
-        onCount++;
-      } else {
-        offCount++;
-      }
+    @Test
+    void differentValueTypesProduceDifferentBuckets() {
+        final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
+        final Map<String, Object> attrsInt = new HashMap<>();
+        attrsInt.put("score", 1);
+        final Map<String, Object> attrsStr = new HashMap<>();
+        attrsStr.put("score", "1");
+
+        aggregator.aggregate(event("flag-b", "on", "alloc1", "user-1", 1000L, true, attrsInt));
+        aggregator.aggregate(event("flag-b", "on", "alloc1", "user-1", 1000L, true, attrsStr));
+
+        final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
+        assertEquals(2, state.fullTier.size());
+    }
+
+    @Test
+    void nulCharactersInKeyFieldsDoNotCollide() {
+        final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
+
+        aggregator.aggregate(event("a\0b", "c", "alloc1", "user-1", 1000L, emptyMap()));
+        aggregator.aggregate(event("a", "b\0c", "alloc1", "user-1", 1000L, emptyMap()));
+
+        final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
+        assertEquals(2, state.fullTier.size());
+    }
+
+    @Test
+    void globalCapOverflowRoutesToDegradedTier() {
+        final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
+
+        aggregator.simulateFullTierAtCap();
+        aggregator.aggregate(simpleEvent("extra-flag", "on"));
+
+        final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
+        assertTrue(state.degradedTier.size() > 0);
+        assertEquals(0, state.droppedDegradedOverflow);
+    }
+
+    @Test
+    void degradedCapOverflowIncrementsDroppedCounter() {
+        final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
+
+        aggregator.simulateFullTierAtCap();
+        aggregator.simulateDegradedTierAtCap();
+        aggregator.aggregate(simpleEvent("drop-flag", "on"));
+
+        final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
+        assertTrue(state.droppedDegradedOverflow > 0);
+    }
+
+    @Test
+    void perFlagCapOverflowRoutesToDegradedTierAndMergesSameDegradedKey() {
+        final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
+        aggregator.perFlagCount.put("hot-flag", FlagEvaluationAggregator.PER_FLAG_CAP);
+
+        aggregator.aggregate(event("hot-flag", "on", "alloc1", "user-1", 1000L, emptyMap()));
+        aggregator.aggregate(event("hot-flag", "on", "alloc1", "user-2", 2000L, emptyMap()));
+
+        final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
+        assertEquals(0, state.fullTier.size());
+        assertEquals(1, state.degradedTier.size());
+        final FlagEvaluationAggregator.EvalBucket bucket =
+                state.degradedTier.values().iterator().next();
+        assertEquals(2, bucket.count);
+        assertEquals(1000L, bucket.firstEvalMs);
+        assertEquals(2000L, bucket.lastEvalMs);
+    }
+
+    @Test
+    void mixedConsentDegradedEvaluationsMergeIntoOneBucket() {
+        // Mirror of mixedConsentEvaluationsForSameSubjectLandInDistinctBuckets, but for the degraded
+        // tier: the wire serializer for degraded rows drops the targeting key and context regardless
+        // of consent, so two events differing only in consent emit byte-identical JSON. They must
+        // share a bucket, otherwise DEGRADED_CAP is effectively halved for zero wire fidelity gain.
+        // The AND-fold on EvalBucket.observeFullEvaluationData still runs but the value has no
+        // downstream effect for degraded rows.
+        final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
+        aggregator.perFlagCount.put("hot-flag", FlagEvaluationAggregator.PER_FLAG_CAP);
+
+        aggregator.aggregate(event("hot-flag", "on", "alloc1", "user-1", 1000L, true, emptyMap()));
+        aggregator.aggregate(event("hot-flag", "on", "alloc1", "user-2", 2000L, false, emptyMap()));
+
+        final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
+        assertEquals(0, state.fullTier.size());
+        assertEquals(1, state.degradedTier.size());
+        final FlagEvaluationAggregator.EvalBucket bucket =
+                state.degradedTier.values().iterator().next();
+        assertEquals(2, bucket.count);
+        // AND-fold collapses to consent-off; benign for degraded rows but a documented invariant.
+        assertFalse(bucket.observeFullEvaluationData);
+    }
+
+    @Test
+    void absentVariantSetsRuntimeDefaultUsed() {
+        final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
+
+        aggregator.aggregate(event("flag-c", null, "alloc1", "user-1", 1000L, emptyMap()));
+
+        final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
+        assertEquals(1, state.fullTier.size());
+        final FlagEvaluationAggregator.EvalBucket bucket =
+                state.fullTier.values().iterator().next();
+        assertTrue(bucket.runtimeDefaultUsed);
+    }
+
+    @Test
+    void aggregatorStoresPrunedAttrsVerbatim() {
+        // Hot-path hook (DDEvaluator#copyPrunedContext) now delivers an already-pruned map.
+        // The aggregator no longer re-prunes; it stores what it is given.
+        final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
+        final Map<String, Object> preprunedAttrs = new HashMap<>();
+        for (int i = 0; i < 100; i++) {
+            preprunedAttrs.put("key" + i, "v" + i);
+        }
+
+        aggregator.aggregate(event("flag-d", "on", "alloc1", "user-1", 1000L, true, preprunedAttrs));
+
+        final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
+        final FlagEvaluationAggregator.EvalBucket bucket =
+                state.fullTier.values().iterator().next();
+        assertEquals(100, bucket.prunedContextFieldCount());
+        assertEquals(100, bucket.prunedAttrs.size());
+    }
+
+    @Test
+    void emptyContextInputsProduceEmptyCanonicalKey() {
+        assertEquals("", FlagEvaluationAggregator.canonicalContextKey(null));
+        assertEquals("", FlagEvaluationAggregator.canonicalContextKey(emptyMap()));
+    }
+
+    @Test
+    void canonicalContextKeyEncodesSupportedValueTypes() {
+        final Map<String, Object> attrs = new HashMap<>();
+        attrs.put("bool", true);
+        attrs.put("double", 1.5d);
+        attrs.put("float", 1.25f);
+        attrs.put("int", 1);
+        attrs.put("long", 2L);
+        attrs.put("null", null);
+        attrs.put("object", new StringBuilder("other"));
+        attrs.put("string", "value");
+
+        final String key = FlagEvaluationAggregator.canonicalContextKey(attrs);
+
+        assertEquals(key, FlagEvaluationAggregator.canonicalContextKey(new HashMap<>(attrs)));
+        assertTrue(key.contains("bool"));
+        assertTrue(key.contains("string"));
+        assertTrue(key.contains("other"));
+    }
+
+    @Test
+    void aggregatorStoresPrePrunedAttrsWithoutRePruning() {
+        // Value-length pruning moved to DDEvaluator#copyPrunedContext (hot path). The aggregator
+        // stores what it is given, so any long value present in the input remains present.
+        final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
+        final Map<String, Object> preprunedAttrs = new HashMap<>();
+        preprunedAttrs.put("short-val", "ok");
+
+        aggregator.aggregate(event("flag-e", "on", "alloc1", "user-1", 1000L, true, preprunedAttrs));
+
+        final FlagEvaluationAggregator.AggregatedState state = aggregator.snapshot();
+        final FlagEvaluationAggregator.EvalBucket bucket =
+                state.fullTier.values().iterator().next();
+        assertTrue(bucket.prunedAttrs.containsKey("short-val"));
+    }
+
+    @Test
+    void capSizingUsesNamedScaleConstants() {
+        assertEquals(125_000, FlagEvaluationAggregator.FULL_BUCKET_SIZING_BASIS);
+        assertEquals(10_000, FlagEvaluationAggregator.PER_FLAG_BUCKET_SIZING_BASIS);
+        assertEquals(25_000, FlagEvaluationAggregator.DEGRADED_BUCKET_SIZING_BASIS);
+        assertEquals(131_072, FlagEvaluationAggregator.GLOBAL_CAP);
+        assertEquals(10_000, FlagEvaluationAggregator.PER_FLAG_CAP);
+        assertEquals(32_768, FlagEvaluationAggregator.DEGRADED_CAP);
+    }
+
+    @Test
+    void flagEvalEventDoesNotCarryReason() {
+        final boolean hasReasonField = Arrays.stream(
+                        datadog.trace.api.featureflag.flagevaluation.FlagEvalEvent.class.getDeclaredFields())
+                .anyMatch(field -> field.getName().equals("reason"));
+
+        assertFalse(hasReasonField);
+    }
+
+    @Test
+    void evalBucketTracksBoundsDefaultStateAndNullContextFieldCount() {
+        final FlagEvaluationAggregator.EvalBucket bucket = new FlagEvaluationAggregator.EvalBucket(
+                "bucket-flag", "on", "alloc1", "user-1", null, 1000L, false, null, false);
+
+        assertEquals(0, bucket.prunedContextFieldCount());
+
+        bucket.merge(900L, true);
+        bucket.merge(1100L, false);
+        bucket.merge(1000L, false);
+
+        assertEquals(4, bucket.count);
+        assertEquals(900L, bucket.firstEvalMs);
+        assertEquals(1100L, bucket.lastEvalMs);
+        assertTrue(bucket.runtimeDefaultUsed);
+    }
+
+    @Test
+    void fullKeyEqualityUsesEveryDimension() {
+        final FlagEvaluationAggregator.FullKey base = fullKey("flag", "on", "alloc", false, "error", "user", "ctx");
+        final FlagEvaluationAggregator.FullKey same = fullKey("flag", "on", "alloc", false, "error", "user", "ctx");
+
+        assertEquals(base, base);
+        assertEquals(base, same);
+        assertEquals(base.hashCode(), same.hashCode());
+        assertNotEquals(base, null);
+        assertNotEquals(base, "not-a-key");
+        assertNotEquals(base, fullKey("other", "on", "alloc", false, "error", "user", "ctx"));
+        assertNotEquals(base, fullKey("flag", "off", "alloc", false, "error", "user", "ctx"));
+        assertNotEquals(base, fullKey("flag", "on", "other", false, "error", "user", "ctx"));
+        assertNotEquals(base, fullKey("flag", "on", "alloc", true, "error", "user", "ctx"));
+        assertNotEquals(base, fullKey("flag", "on", "alloc", false, "other", "user", "ctx"));
+        assertNotEquals(base, fullKey("flag", "on", "alloc", false, "error", "other", "ctx"));
+        assertNotEquals(base, fullKey("flag", "on", "alloc", false, "error", "user", "other"));
+    }
+
+    @Test
+    void degradedKeyEqualityUsesEveryDimension() {
+        final FlagEvaluationAggregator.DegradedKey base = degradedKey("flag", "on", "alloc", false, "error");
+        final FlagEvaluationAggregator.DegradedKey same = degradedKey("flag", "on", "alloc", false, "error");
+
+        assertEquals(base, base);
+        assertEquals(base, same);
+        assertEquals(base.hashCode(), same.hashCode());
+        assertNotEquals(base, null);
+        assertNotEquals(base, "not-a-key");
+        assertNotEquals(base, degradedKey("other", "on", "alloc", false, "error"));
+        assertNotEquals(base, degradedKey("flag", "off", "alloc", false, "error"));
+        assertNotEquals(base, degradedKey("flag", "on", "other", false, "error"));
+        assertNotEquals(base, degradedKey("flag", "on", "alloc", true, "error"));
+        assertNotEquals(base, degradedKey("flag", "on", "alloc", false, "other"));
+    }
+
+    @Test
+    void mixedConsentEvaluationsForSameSubjectLandInDistinctBuckets() {
+        // Consent is part of FullKey: two evaluations that differ only in consent produce different
+        // wire rows (raw vs hashed targeting key, context vs no context) and belong in different
+        // buckets. Merging them would silently downgrade the consent-on row to the protected shape.
+        final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
+        aggregator.aggregate(event("fold-flag", "on", "alloc1", "user-1", 1000L, true, emptyMap()));
+        aggregator.aggregate(event("fold-flag", "on", "alloc1", "user-1", 2000L, false, emptyMap()));
+
+        assertEquals(2, aggregator.fullTierSize());
+        int onCount = 0;
+        int offCount = 0;
+        for (final FlagEvaluationAggregator.EvalBucket bucket :
+                aggregator.snapshot().fullTier.values()) {
+            if (bucket.observeFullEvaluationData) {
+                onCount++;
+            } else {
+                offCount++;
+            }
+        }
+        assertEquals(1, onCount);
+        assertEquals(1, offCount);
+    }
+
+    @Test
+    void sameConsentEvaluationsForSameSubjectMergeIntoOneBucket() {
+        final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
+        aggregator.aggregate(event("fold-flag", "on", "alloc1", "user-1", 1000L, true, emptyMap()));
+        aggregator.aggregate(event("fold-flag", "on", "alloc1", "user-1", 2000L, true, emptyMap()));
+
+        final FlagEvaluationAggregator.EvalBucket bucket =
+                aggregator.snapshot().fullTier.values().iterator().next();
+        assertEquals(2, bucket.count);
+        assertTrue(bucket.observeFullEvaluationData);
+    }
+
+    @Test
+    void protectedPathCollapsesDifferingContextIntoOneBucket() {
+        // Same subject, different request-id contexts, consent off: the context is dropped on emit so
+        // it must not fragment full-tier buckets or the per-flag cap blows out under real traffic.
+        final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
+        final Map<String, Object> ctx1 = new HashMap<>();
+        ctx1.put("request_id", "req-1");
+        final Map<String, Object> ctx2 = new HashMap<>();
+        ctx2.put("request_id", "req-2");
+        final Map<String, Object> ctx3 = new HashMap<>();
+        ctx3.put("request_id", "req-3");
+
+        aggregator.aggregate(event("checkout", "on", "alloc1", "alice", 1000L, false, ctx1));
+        aggregator.aggregate(event("checkout", "on", "alloc1", "alice", 2000L, false, ctx2));
+        aggregator.aggregate(event("checkout", "on", "alloc1", "alice", 3000L, false, ctx3));
+
+        assertEquals(1, aggregator.fullTierSize());
+        final FlagEvaluationAggregator.EvalBucket bucket =
+                aggregator.snapshot().fullTier.values().iterator().next();
+        assertEquals(3, bucket.count);
+        assertFalse(bucket.observeFullEvaluationData);
+        assertEquals(0, bucket.prunedContextFieldCount());
+    }
+
+    @Test
+    void protectedPathSeparatesDifferentSubjects() {
+        // Different targeting keys must still fall into distinct buckets on the protected path — the
+        // (hashed) targeting key stays part of the aggregation identity.
+        final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
+        aggregator.aggregate(event("checkout", "on", "alloc1", "alice", 1000L, false, emptyMap()));
+        aggregator.aggregate(event("checkout", "on", "alloc1", "bob", 2000L, false, emptyMap()));
+
+        assertEquals(2, aggregator.fullTierSize());
+    }
+
+    @Test
+    void fullPathStillSplitsBucketsOnDifferingContext() {
+        // Consent-on preserves the previous behaviour: distinct contexts remain distinct buckets so
+        // each raw context is emitted verbatim.
+        final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
+        final Map<String, Object> ctx1 = new HashMap<>();
+        ctx1.put("plan", "pro");
+        ctx1.put("request_id", "req-1");
+        final Map<String, Object> ctx2 = new HashMap<>();
+        ctx2.put("plan", "pro");
+        ctx2.put("request_id", "req-2");
+
+        aggregator.aggregate(event("checkout", "on", "alloc1", "alice", 1000L, true, ctx1));
+        aggregator.aggregate(event("checkout", "on", "alloc1", "alice", 2000L, true, ctx2));
+
+        assertEquals(2, aggregator.fullTierSize());
+    }
+
+    private static FlagEvalEvent event(
+            final String flagKey,
+            final String variant,
+            final String allocationKey,
+            final String targetingKey,
+            final long evalTimeMs,
+            final boolean observeFullEvaluationData,
+            final Map<String, Object> attrs) {
+        return new FlagEvalEvent(
+                flagKey, variant, allocationKey, targetingKey, null, evalTimeMs, observeFullEvaluationData, attrs);
+    }
+
+    private static FlagEvalEvent event(
+            final String flagKey,
+            final String variant,
+            final String allocationKey,
+            final String targetingKey,
+            final long evalTimeMs,
+            final Map<String, Object> attrs) {
+        return new FlagEvalEvent(flagKey, variant, allocationKey, targetingKey, evalTimeMs, attrs);
+    }
+
+    private static FlagEvalEvent simpleEvent(final String flagKey, final String variant) {
+        return event(flagKey, variant, "alloc1", "user-1", 1000L, emptyMap());
+    }
+
+    private static FlagEvaluationAggregator.FullKey fullKey(
+            final String flagKey,
+            final String variant,
+            final String allocationKey,
+            final boolean runtimeDefaultUsed,
+            final String errorMessage,
+            final String targetingKey,
+            final String contextKey) {
+        return new FlagEvaluationAggregator.FullKey(
+                flagKey, variant, allocationKey, runtimeDefaultUsed, errorMessage, targetingKey, contextKey, false);
+    }
+
+    private static FlagEvaluationAggregator.DegradedKey degradedKey(
+            final String flagKey,
+            final String variant,
+            final String allocationKey,
+            final boolean runtimeDefaultUsed,
+            final String errorMessage) {
+        return new FlagEvaluationAggregator.DegradedKey(
+                flagKey, variant, allocationKey, runtimeDefaultUsed, errorMessage);
     }
-    assertEquals(1, onCount);
-    assertEquals(1, offCount);
-  }
-
-  @Test
-  void sameConsentEvaluationsForSameSubjectMergeIntoOneBucket() {
-    final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
-    aggregator.aggregate(event("fold-flag", "on", "alloc1", "user-1", 1000L, true, emptyMap()));
-    aggregator.aggregate(event("fold-flag", "on", "alloc1", "user-1", 2000L, true, emptyMap()));
-
-    final FlagEvaluationAggregator.EvalBucket bucket =
-        aggregator.snapshot().fullTier.values().iterator().next();
-    assertEquals(2, bucket.count);
-    assertTrue(bucket.observeFullEvaluationData);
-  }
-
-  @Test
-  void protectedPathCollapsesDifferingContextIntoOneBucket() {
-    // Same subject, different request-id contexts, consent off: the context is dropped on emit so
-    // it must not fragment full-tier buckets or the per-flag cap blows out under real traffic.
-    final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
-    final Map<String, Object> ctx1 = new HashMap<>();
-    ctx1.put("request_id", "req-1");
-    final Map<String, Object> ctx2 = new HashMap<>();
-    ctx2.put("request_id", "req-2");
-    final Map<String, Object> ctx3 = new HashMap<>();
-    ctx3.put("request_id", "req-3");
-
-    aggregator.aggregate(event("checkout", "on", "alloc1", "alice", 1000L, false, ctx1));
-    aggregator.aggregate(event("checkout", "on", "alloc1", "alice", 2000L, false, ctx2));
-    aggregator.aggregate(event("checkout", "on", "alloc1", "alice", 3000L, false, ctx3));
-
-    assertEquals(1, aggregator.fullTierSize());
-    final FlagEvaluationAggregator.EvalBucket bucket =
-        aggregator.snapshot().fullTier.values().iterator().next();
-    assertEquals(3, bucket.count);
-    assertFalse(bucket.observeFullEvaluationData);
-    assertEquals(0, bucket.prunedContextFieldCount());
-  }
-
-  @Test
-  void protectedPathSeparatesDifferentSubjects() {
-    // Different targeting keys must still fall into distinct buckets on the protected path — the
-    // (hashed) targeting key stays part of the aggregation identity.
-    final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
-    aggregator.aggregate(event("checkout", "on", "alloc1", "alice", 1000L, false, emptyMap()));
-    aggregator.aggregate(event("checkout", "on", "alloc1", "bob", 2000L, false, emptyMap()));
-
-    assertEquals(2, aggregator.fullTierSize());
-  }
-
-  @Test
-  void fullPathStillSplitsBucketsOnDifferingContext() {
-    // Consent-on preserves the previous behaviour: distinct contexts remain distinct buckets so
-    // each raw context is emitted verbatim.
-    final FlagEvaluationAggregator aggregator = new FlagEvaluationAggregator();
-    final Map<String, Object> ctx1 = new HashMap<>();
-    ctx1.put("plan", "pro");
-    ctx1.put("request_id", "req-1");
-    final Map<String, Object> ctx2 = new HashMap<>();
-    ctx2.put("plan", "pro");
-    ctx2.put("request_id", "req-2");
-
-    aggregator.aggregate(event("checkout", "on", "alloc1", "alice", 1000L, true, ctx1));
-    aggregator.aggregate(event("checkout", "on", "alloc1", "alice", 2000L, true, ctx2));
-
-    assertEquals(2, aggregator.fullTierSize());
-  }
-
-  private static FlagEvalEvent event(
-      final String flagKey,
-      final String variant,
-      final String allocationKey,
-      final String targetingKey,
-      final long evalTimeMs,
-      final boolean observeFullEvaluationData,
-      final Map<String, Object> attrs) {
-    return new FlagEvalEvent(
-        flagKey,
-        variant,
-        allocationKey,
-        targetingKey,
-        null,
-        evalTimeMs,
-        observeFullEvaluationData,
-        attrs);
-  }
-
-  private static FlagEvalEvent event(
-      final String flagKey,
-      final String variant,
-      final String allocationKey,
-      final String targetingKey,
-      final long evalTimeMs,
-      final Map<String, Object> attrs) {
-    return new FlagEvalEvent(flagKey, variant, allocationKey, targetingKey, evalTimeMs, attrs);
-  }
-
-  private static FlagEvalEvent simpleEvent(final String flagKey, final String variant) {
-    return event(flagKey, variant, "alloc1", "user-1", 1000L, emptyMap());
-  }
-
-  private static FlagEvaluationAggregator.FullKey fullKey(
-      final String flagKey,
-      final String variant,
-      final String allocationKey,
-      final boolean runtimeDefaultUsed,
-      final String errorMessage,
-      final String targetingKey,
-      final String contextKey) {
-    return new FlagEvaluationAggregator.FullKey(
-        flagKey,
-        variant,
-        allocationKey,
-        runtimeDefaultUsed,
-        errorMessage,
-        targetingKey,
-        contextKey,
-        false);
-  }
-
-  private static FlagEvaluationAggregator.DegradedKey degradedKey(
-      final String flagKey,
-      final String variant,
-      final String allocationKey,
-      final boolean runtimeDefaultUsed,
-      final String errorMessage) {
-    return new FlagEvaluationAggregator.DegradedKey(
-        flagKey, variant, allocationKey, runtimeDefaultUsed, errorMessage);
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FlagEvaluationPayloadsTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FlagEvaluationPayloadsTest.java
index d4ca517fffd..a0818ccdad6 100644
--- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FlagEvaluationPayloadsTest.java
+++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FlagEvaluationPayloadsTest.java
@@ -19,435 +19,349 @@
 
 class FlagEvaluationPayloadsTest {
 
-  private static final long EVAL_MS = 1_760_000_000_000L;
-  private static final Map<String, String> CONTEXT = context();
-  private static final JsonAdapter<Map<String, Object>> JSON_MAP;
-
-  static {
-    final Moshi moshi = new Moshi.Builder().build();
-    final Type type = Types.newParameterizedType(Map.class, String.class, Object.class);
-    JSON_MAP = moshi.adapter(type);
-  }
-
-  @Test
-  void fullTierPayloadUsesWorkerWireShape() throws Exception {
-    final Map<String, Object> attrs = new HashMap<>();
-    attrs.put("region", "us-east-1");
-
-    final Map<String, Object> json =
-        firstPayload(
-            FlagEvaluationPayloads.buildPayloads(
-                java.util.Collections.singletonList(
-                    event("my-flag", "on", "alloc-x", "user-1", 1, attrs)),
+    private static final long EVAL_MS = 1_760_000_000_000L;
+    private static final Map<String, String> CONTEXT = context();
+    private static final JsonAdapter<Map<String, Object>> JSON_MAP;
+
+    static {
+        final Moshi moshi = new Moshi.Builder().build();
+        final Type type = Types.newParameterizedType(Map.class, String.class, Object.class);
+        JSON_MAP = moshi.adapter(type);
+    }
+
+    @Test
+    void fullTierPayloadUsesWorkerWireShape() throws Exception {
+        final Map<String, Object> attrs = new HashMap<>();
+        attrs.put("region", "us-east-1");
+
+        final Map<String, Object> json = firstPayload(FlagEvaluationPayloads.buildPayloads(
+                java.util.Collections.singletonList(event("my-flag", "on", "alloc-x", "user-1", 1, attrs)),
                 CONTEXT,
                 1_000_000));
 
-    final Map<String, Object> ev = firstEvent(json);
-    assertObjectWithKey(ev.get("variant"), "on");
-    assertObjectWithKey(ev.get("allocation"), "alloc-x");
-    assertObjectWithKey(ev.get("flag"), "my-flag");
-    final Map<?, ?> ctx = (Map<?, ?>) ev.get("context");
-    assertNotNull(ctx);
-    final Map<?, ?> evalAttrs = (Map<?, ?>) ctx.get("evaluation");
-    assertNotNull(evalAttrs);
-    assertEquals("us-east-1", evalAttrs.get("region"));
-    assertFalse(ev.containsKey("reason"));
-  }
-
-  @Test
-  void eventFromFullBucketUsesFlushTimeAndEvaluationBounds() throws Exception {
-    final FlagEvaluationAggregator.EvalBucket bucket =
-        new FlagEvaluationAggregator.EvalBucket(
-            "ts-flag", "on", "alloc1", "user-1", null, EVAL_MS, false, emptyMap(), true);
-    bucket.merge(EVAL_MS + 10, false);
-    final long flushTimeMs = EVAL_MS + 5_000;
-
-    final Map<String, Object> json =
-        firstPayload(
-            FlagEvaluationPayloads.buildPayloads(
+        final Map<String, Object> ev = firstEvent(json);
+        assertObjectWithKey(ev.get("variant"), "on");
+        assertObjectWithKey(ev.get("allocation"), "alloc-x");
+        assertObjectWithKey(ev.get("flag"), "my-flag");
+        final Map<?, ?> ctx = (Map<?, ?>) ev.get("context");
+        assertNotNull(ctx);
+        final Map<?, ?> evalAttrs = (Map<?, ?>) ctx.get("evaluation");
+        assertNotNull(evalAttrs);
+        assertEquals("us-east-1", evalAttrs.get("region"));
+        assertFalse(ev.containsKey("reason"));
+    }
+
+    @Test
+    void eventFromFullBucketUsesFlushTimeAndEvaluationBounds() throws Exception {
+        final FlagEvaluationAggregator.EvalBucket bucket = new FlagEvaluationAggregator.EvalBucket(
+                "ts-flag", "on", "alloc1", "user-1", null, EVAL_MS, false, emptyMap(), true);
+        bucket.merge(EVAL_MS + 10, false);
+        final long flushTimeMs = EVAL_MS + 5_000;
+
+        final Map<String, Object> json = firstPayload(FlagEvaluationPayloads.buildPayloads(
                 java.util.Collections.singletonList(
-                    FlagEvaluationPayloads.FlagEvaluationEvent.fromBucket(
-                        bucket, true, true, flushTimeMs)),
+                        FlagEvaluationPayloads.FlagEvaluationEvent.fromBucket(bucket, true, true, flushTimeMs)),
                 CONTEXT,
                 1_000_000));
 
-    final Map<String, Object> ev = firstEvent(json);
-    assertEquals((double) flushTimeMs, ((Number) ev.get("timestamp")).doubleValue());
-    assertEquals((double) EVAL_MS, ((Number) ev.get("first_evaluation")).doubleValue());
-    assertEquals((double) (EVAL_MS + 10), ((Number) ev.get("last_evaluation")).doubleValue());
-    assertEquals(2.0, ((Number) ev.get("evaluation_count")).doubleValue());
-  }
-
-  @Test
-  void degradedTierEventOmitsTargetingKeyAndContext() throws Exception {
-    final FlagEvaluationAggregator.EvalBucket bucket =
-        new FlagEvaluationAggregator.EvalBucket(
-            "dg-flag", "on", "alloc1", null, null, EVAL_MS, false, null, false);
-
-    final Map<String, Object> json =
-        firstPayload(
-            FlagEvaluationPayloads.buildPayloads(
+        final Map<String, Object> ev = firstEvent(json);
+        assertEquals((double) flushTimeMs, ((Number) ev.get("timestamp")).doubleValue());
+        assertEquals((double) EVAL_MS, ((Number) ev.get("first_evaluation")).doubleValue());
+        assertEquals((double) (EVAL_MS + 10), ((Number) ev.get("last_evaluation")).doubleValue());
+        assertEquals(2.0, ((Number) ev.get("evaluation_count")).doubleValue());
+    }
+
+    @Test
+    void degradedTierEventOmitsTargetingKeyAndContext() throws Exception {
+        final FlagEvaluationAggregator.EvalBucket bucket = new FlagEvaluationAggregator.EvalBucket(
+                "dg-flag", "on", "alloc1", null, null, EVAL_MS, false, null, false);
+
+        final Map<String, Object> json = firstPayload(FlagEvaluationPayloads.buildPayloads(
                 java.util.Collections.singletonList(
-                    FlagEvaluationPayloads.FlagEvaluationEvent.fromBucket(
-                        bucket, false, true, EVAL_MS)),
+                        FlagEvaluationPayloads.FlagEvaluationEvent.fromBucket(bucket, false, true, EVAL_MS)),
                 CONTEXT,
                 1_000_000));
 
-    final Map<String, Object> ev = firstEvent(json);
-    assertNull(ev.get("targeting_key"));
-    assertNull(ev.get("context"));
-  }
-
-  @Test
-  void fullTierWithObserveFullEvaluationDataTrueEmitsRawTargetingKeyAndContext() throws Exception {
-    final Map<String, Object> attrs = new HashMap<>();
-    attrs.put("region", "us-east-1");
-    final FlagEvaluationAggregator.EvalBucket bucket =
-        new FlagEvaluationAggregator.EvalBucket(
-            "pii-flag",
-            "on",
-            "alloc1",
-            "jane.doe@datadoghq.com",
-            null,
-            EVAL_MS,
-            false,
-            attrs,
-            true);
-
-    final Map<String, Object> json =
-        firstPayload(
-            FlagEvaluationPayloads.buildPayloads(
+        final Map<String, Object> ev = firstEvent(json);
+        assertNull(ev.get("targeting_key"));
+        assertNull(ev.get("context"));
+    }
+
+    @Test
+    void fullTierWithObserveFullEvaluationDataTrueEmitsRawTargetingKeyAndContext() throws Exception {
+        final Map<String, Object> attrs = new HashMap<>();
+        attrs.put("region", "us-east-1");
+        final FlagEvaluationAggregator.EvalBucket bucket = new FlagEvaluationAggregator.EvalBucket(
+                "pii-flag", "on", "alloc1", "jane.doe@datadoghq.com", null, EVAL_MS, false, attrs, true);
+
+        final Map<String, Object> json = firstPayload(FlagEvaluationPayloads.buildPayloads(
                 java.util.Collections.singletonList(
-                    FlagEvaluationPayloads.FlagEvaluationEvent.fromBucket(
-                        bucket, true, true, EVAL_MS)),
+                        FlagEvaluationPayloads.FlagEvaluationEvent.fromBucket(bucket, true, true, EVAL_MS)),
                 CONTEXT,
                 1_000_000));
 
-    final Map<String, Object> ev = firstEvent(json);
-    assertEquals("jane.doe@datadoghq.com", ev.get("targeting_key"));
-    final Map<?, ?> ctx = (Map<?, ?>) ev.get("context");
-    assertNotNull(ctx);
-    final Map<?, ?> evalAttrs = (Map<?, ?>) ctx.get("evaluation");
-    assertNotNull(evalAttrs);
-    assertEquals("us-east-1", evalAttrs.get("region"));
-  }
-
-  @Test
-  void fullTierWithObserveFullEvaluationDataFalseHashesTargetingKeyAndOmitsContext()
-      throws Exception {
-    final Map<String, Object> attrs = new HashMap<>();
-    attrs.put("region", "us-east-1");
-    final FlagEvaluationAggregator.EvalBucket bucket =
-        new FlagEvaluationAggregator.EvalBucket(
-            "pii-flag",
-            "on",
-            "alloc1",
-            "jane.doe@datadoghq.com",
-            null,
-            EVAL_MS,
-            false,
-            attrs,
-            false);
-
-    final FlagEvaluationPayloads.EncodedPayloads payloads =
-        FlagEvaluationPayloads.buildPayloads(
-            java.util.Collections.singletonList(
-                FlagEvaluationPayloads.FlagEvaluationEvent.fromBucket(
-                    bucket, true, false, EVAL_MS)),
-            CONTEXT,
-            1_000_000);
-    final String rawJson =
-        new String(payloads.bodies.get(0), java.nio.charset.StandardCharsets.UTF_8);
-
-    // The raw wire bytes must carry the hashed key and must not leak the raw PII value or the
-    // per-event evaluation context — these are the exact properties system-tests asserts over the
-    // wire. (The batch envelope has its own top-level "context" field, so we guard on the nested
-    // "evaluation" key instead, which only appears inside a per-event context object.)
-    assertTrue(
-        rawJson.contains(
-            "sha256_b4698f9b6d186781fa8dc59e533578fa2d8379a46b1cf6db85cda6aa9c99e51b"));
-    assertFalse(rawJson.contains("jane.doe@datadoghq.com"));
-    assertFalse(rawJson.contains("\"evaluation\":"));
-
-    final Map<String, Object> ev = firstEvent(parse(payloads.bodies.get(0)));
-    assertEquals(
-        "sha256_b4698f9b6d186781fa8dc59e533578fa2d8379a46b1cf6db85cda6aa9c99e51b",
-        ev.get("targeting_key"));
-    assertFalse(ev.containsKey("context"));
-  }
-
-  @Test
-  void splitPayloadsByEncodedSize() throws Exception {
-    final Map<String, Object> attrs = new HashMap<>();
-    attrs.put("payload", repeat('x', 180));
-    final java.util.ArrayList<FlagEvaluationPayloads.FlagEvaluationEvent> events =
-        new java.util.ArrayList<>();
-    for (int i = 0; i < 4; i++) {
-      events.add(event("split-flag-" + i, "on", "alloc1", "user-" + i, 1, attrs));
+        final Map<String, Object> ev = firstEvent(json);
+        assertEquals("jane.doe@datadoghq.com", ev.get("targeting_key"));
+        final Map<?, ?> ctx = (Map<?, ?>) ev.get("context");
+        assertNotNull(ctx);
+        final Map<?, ?> evalAttrs = (Map<?, ?>) ctx.get("evaluation");
+        assertNotNull(evalAttrs);
+        assertEquals("us-east-1", evalAttrs.get("region"));
+    }
+
+    @Test
+    void fullTierWithObserveFullEvaluationDataFalseHashesTargetingKeyAndOmitsContext() throws Exception {
+        final Map<String, Object> attrs = new HashMap<>();
+        attrs.put("region", "us-east-1");
+        final FlagEvaluationAggregator.EvalBucket bucket = new FlagEvaluationAggregator.EvalBucket(
+                "pii-flag", "on", "alloc1", "jane.doe@datadoghq.com", null, EVAL_MS, false, attrs, false);
+
+        final FlagEvaluationPayloads.EncodedPayloads payloads = FlagEvaluationPayloads.buildPayloads(
+                java.util.Collections.singletonList(
+                        FlagEvaluationPayloads.FlagEvaluationEvent.fromBucket(bucket, true, false, EVAL_MS)),
+                CONTEXT,
+                1_000_000);
+        final String rawJson = new String(payloads.bodies.get(0), java.nio.charset.StandardCharsets.UTF_8);
+
+        // The raw wire bytes must carry the hashed key and must not leak the raw PII value or the
+        // per-event evaluation context — these are the exact properties system-tests asserts over the
+        // wire. (The batch envelope has its own top-level "context" field, so we guard on the nested
+        // "evaluation" key instead, which only appears inside a per-event context object.)
+        assertTrue(rawJson.contains("sha256_b4698f9b6d186781fa8dc59e533578fa2d8379a46b1cf6db85cda6aa9c99e51b"));
+        assertFalse(rawJson.contains("jane.doe@datadoghq.com"));
+        assertFalse(rawJson.contains("\"evaluation\":"));
+
+        final Map<String, Object> ev = firstEvent(parse(payloads.bodies.get(0)));
+        assertEquals(
+                "sha256_b4698f9b6d186781fa8dc59e533578fa2d8379a46b1cf6db85cda6aa9c99e51b", ev.get("targeting_key"));
+        assertFalse(ev.containsKey("context"));
+    }
+
+    @Test
+    void splitPayloadsByEncodedSize() throws Exception {
+        final Map<String, Object> attrs = new HashMap<>();
+        attrs.put("payload", repeat('x', 180));
+        final java.util.ArrayList<FlagEvaluationPayloads.FlagEvaluationEvent> events = new java.util.ArrayList<>();
+        for (int i = 0; i < 4; i++) {
+            events.add(event("split-flag-" + i, "on", "alloc1", "user-" + i, 1, attrs));
+        }
+
+        final FlagEvaluationPayloads.EncodedPayloads payloads =
+                FlagEvaluationPayloads.buildPayloads(events, CONTEXT, 1_100);
+
+        assertTrue(payloads.bodies.size() > 1);
+        int eventCount = 0;
+        for (final byte[] body : payloads.bodies) {
+            assertTrue(body.length <= 1_100);
+            eventCount += eventCount(parse(body));
+        }
+        assertEquals(4, eventCount);
+        assertEquals(0, payloads.droppedPayloadLimit);
+        assertEquals(0, payloads.degradedPayloadLimit);
     }
 
-    final FlagEvaluationPayloads.EncodedPayloads payloads =
-        FlagEvaluationPayloads.buildPayloads(events, CONTEXT, 1_100);
+    @Test
+    void oversizedFullPayloadRowIsDegradedBeforeDrop() throws Exception {
+        final Map<String, Object> attrs = new HashMap<>();
+        for (int i = 0; i < 4; i++) {
+            attrs.put("payload-" + i, repeat('x', 200));
+        }
 
-    assertTrue(payloads.bodies.size() > 1);
-    int eventCount = 0;
-    for (final byte[] body : payloads.bodies) {
-      assertTrue(body.length <= 1_100);
-      eventCount += eventCount(parse(body));
+        final FlagEvaluationPayloads.EncodedPayloads payloads = FlagEvaluationPayloads.buildPayloads(
+                java.util.Collections.singletonList(event("oversized-full", "on", "alloc1", "user-1", 2, attrs)),
+                CONTEXT,
+                512);
+
+        assertEquals(1, payloads.bodies.size());
+        assertTrue(payloads.bodies.get(0).length <= 512);
+        assertEquals(0, payloads.droppedPayloadLimit);
+        assertEquals(2, payloads.degradedPayloadLimit);
+        final Map<String, Object> ev = firstEvent(parse(payloads.bodies.get(0)));
+        assertEquals(2.0, ((Number) ev.get("evaluation_count")).doubleValue());
+        assertNull(ev.get("targeting_key"));
+        assertNull(ev.get("context"));
     }
-    assertEquals(4, eventCount);
-    assertEquals(0, payloads.droppedPayloadLimit);
-    assertEquals(0, payloads.degradedPayloadLimit);
-  }
-
-  @Test
-  void oversizedFullPayloadRowIsDegradedBeforeDrop() throws Exception {
-    final Map<String, Object> attrs = new HashMap<>();
-    for (int i = 0; i < 4; i++) {
-      attrs.put("payload-" + i, repeat('x', 200));
+
+    @Test
+    void oversizedFullPayloadRowStartsNewPayloadWhenDegradedRowFitsByItself() throws Exception {
+        final FlagEvaluationPayloads.FlagEvaluationEvent first =
+                event("first-flag", "on", "alloc1", "user-1", 1, emptyMap());
+        final Map<String, Object> attrs = new HashMap<>();
+        attrs.put("payload", repeat('x', 400));
+        final FlagEvaluationPayloads.FlagEvaluationEvent second =
+                event("second-flag", "on", "alloc1", "user-2", 3, attrs);
+        final FlagEvaluationPayloads.FlagEvaluationEvent degradedSecond = second.withoutTargetingKeyAndContext();
+        assertNotNull(degradedSecond);
+
+        final int firstPayloadSize = FlagEvaluationPayloads.buildPayloads(
+                        java.util.Collections.singletonList(first), CONTEXT, 1_000_000)
+                .bodies
+                .get(0)
+                .length;
+        final int degradedPayloadSize = FlagEvaluationPayloads.buildPayloads(
+                        java.util.Collections.singletonList(degradedSecond), CONTEXT, 1_000_000)
+                .bodies
+                .get(0)
+                .length;
+        final int limit = Math.max(firstPayloadSize, degradedPayloadSize);
+
+        final FlagEvaluationPayloads.EncodedPayloads payloads =
+                FlagEvaluationPayloads.buildPayloads(Arrays.asList(first, second), CONTEXT, limit);
+
+        assertEquals(2, payloads.bodies.size());
+        assertEquals(0, payloads.droppedPayloadLimit);
+        assertEquals(3, payloads.degradedPayloadLimit);
+        assertEquals(1, eventCount(parse(payloads.bodies.get(0))));
+        final Map<String, Object> ev = firstEvent(parse(payloads.bodies.get(1)));
+        assertObjectWithKey(ev.get("flag"), "second-flag");
+        assertNull(ev.get("targeting_key"));
+        assertNull(ev.get("context"));
     }
 
-    final FlagEvaluationPayloads.EncodedPayloads payloads =
-        FlagEvaluationPayloads.buildPayloads(
-            java.util.Collections.singletonList(
-                event("oversized-full", "on", "alloc1", "user-1", 2, attrs)),
-            CONTEXT,
-            512);
-
-    assertEquals(1, payloads.bodies.size());
-    assertTrue(payloads.bodies.get(0).length <= 512);
-    assertEquals(0, payloads.droppedPayloadLimit);
-    assertEquals(2, payloads.degradedPayloadLimit);
-    final Map<String, Object> ev = firstEvent(parse(payloads.bodies.get(0)));
-    assertEquals(2.0, ((Number) ev.get("evaluation_count")).doubleValue());
-    assertNull(ev.get("targeting_key"));
-    assertNull(ev.get("context"));
-  }
-
-  @Test
-  void oversizedFullPayloadRowStartsNewPayloadWhenDegradedRowFitsByItself() throws Exception {
-    final FlagEvaluationPayloads.FlagEvaluationEvent first =
-        event("first-flag", "on", "alloc1", "user-1", 1, emptyMap());
-    final Map<String, Object> attrs = new HashMap<>();
-    attrs.put("payload", repeat('x', 400));
-    final FlagEvaluationPayloads.FlagEvaluationEvent second =
-        event("second-flag", "on", "alloc1", "user-2", 3, attrs);
-    final FlagEvaluationPayloads.FlagEvaluationEvent degradedSecond =
-        second.withoutTargetingKeyAndContext();
-    assertNotNull(degradedSecond);
-
-    final int firstPayloadSize =
-        FlagEvaluationPayloads.buildPayloads(
-                java.util.Collections.singletonList(first), CONTEXT, 1_000_000)
-            .bodies
-            .get(0)
-            .length;
-    final int degradedPayloadSize =
-        FlagEvaluationPayloads.buildPayloads(
-                java.util.Collections.singletonList(degradedSecond), CONTEXT, 1_000_000)
-            .bodies
-            .get(0)
-            .length;
-    final int limit = Math.max(firstPayloadSize, degradedPayloadSize);
-
-    final FlagEvaluationPayloads.EncodedPayloads payloads =
-        FlagEvaluationPayloads.buildPayloads(Arrays.asList(first, second), CONTEXT, limit);
-
-    assertEquals(2, payloads.bodies.size());
-    assertEquals(0, payloads.droppedPayloadLimit);
-    assertEquals(3, payloads.degradedPayloadLimit);
-    assertEquals(1, eventCount(parse(payloads.bodies.get(0))));
-    final Map<String, Object> ev = firstEvent(parse(payloads.bodies.get(1)));
-    assertObjectWithKey(ev.get("flag"), "second-flag");
-    assertNull(ev.get("targeting_key"));
-    assertNull(ev.get("context"));
-  }
-
-  @Test
-  void oversizedDegradedPayloadRowIsDropped() {
-    final FlagEvaluationPayloads.EncodedPayloads payloads =
-        FlagEvaluationPayloads.buildPayloads(
-            java.util.Collections.singletonList(
-                event(repeat('f', 512), "on", "alloc1", null, 2, emptyMap())),
-            CONTEXT,
-            128);
-
-    assertTrue(payloads.bodies.isEmpty());
-    assertEquals(2, payloads.droppedPayloadLimit);
-    assertEquals(0, payloads.degradedPayloadLimit);
-  }
-
-  @Test
-  void oversizedFullPayloadRowIsDroppedWhenDegradedRowStillExceedsLimit() {
-    final FlagEvaluationPayloads.EncodedPayloads payloads =
-        FlagEvaluationPayloads.buildPayloads(
-            java.util.Collections.singletonList(
-                event(repeat('f', 512), "on", "alloc1", "user-1", 2, emptyMap())),
-            CONTEXT,
-            128);
-
-    assertTrue(payloads.bodies.isEmpty());
-    assertEquals(2, payloads.droppedPayloadLimit);
-    assertEquals(0, payloads.degradedPayloadLimit);
-  }
-
-  @Test
-  void errorPayloadSerializesErrorObject() throws Exception {
-    final Map<String, Object> json =
-        firstPayload(
-            FlagEvaluationPayloads.buildPayloads(
-                java.util.Collections.singletonList(
-                    new FlagEvaluationPayloads.FlagEvaluationEvent(
-                        EVAL_MS,
-                        "err-flag",
-                        EVAL_MS,
-                        EVAL_MS,
-                        1,
-                        null,
-                        null,
-                        null,
-                        true,
-                        "type mismatch",
-                        null)),
+    @Test
+    void oversizedDegradedPayloadRowIsDropped() {
+        final FlagEvaluationPayloads.EncodedPayloads payloads = FlagEvaluationPayloads.buildPayloads(
+                java.util.Collections.singletonList(event(repeat('f', 512), "on", "alloc1", null, 2, emptyMap())),
+                CONTEXT,
+                128);
+
+        assertTrue(payloads.bodies.isEmpty());
+        assertEquals(2, payloads.droppedPayloadLimit);
+        assertEquals(0, payloads.degradedPayloadLimit);
+    }
+
+    @Test
+    void oversizedFullPayloadRowIsDroppedWhenDegradedRowStillExceedsLimit() {
+        final FlagEvaluationPayloads.EncodedPayloads payloads = FlagEvaluationPayloads.buildPayloads(
+                java.util.Collections.singletonList(event(repeat('f', 512), "on", "alloc1", "user-1", 2, emptyMap())),
+                CONTEXT,
+                128);
+
+        assertTrue(payloads.bodies.isEmpty());
+        assertEquals(2, payloads.droppedPayloadLimit);
+        assertEquals(0, payloads.degradedPayloadLimit);
+    }
+
+    @Test
+    void errorPayloadSerializesErrorObject() throws Exception {
+        final Map<String, Object> json = firstPayload(FlagEvaluationPayloads.buildPayloads(
+                java.util.Collections.singletonList(new FlagEvaluationPayloads.FlagEvaluationEvent(
+                        EVAL_MS, "err-flag", EVAL_MS, EVAL_MS, 1, null, null, null, true, "type mismatch", null)),
                 CONTEXT,
                 1_000_000));
 
-    final Map<String, Object> ev = firstEvent(json);
-    final Map<?, ?> error = (Map<?, ?>) ev.get("error");
-    assertNotNull(error);
-    assertEquals("type mismatch", error.get("message"));
-    assertEquals(Boolean.TRUE, ev.get("runtime_default_used"));
-  }
-
-  @Test
-  void emptyEventListProducesNoPayloads() {
-    final FlagEvaluationPayloads.EncodedPayloads payloads =
-        FlagEvaluationPayloads.buildPayloads(java.util.Collections.emptyList(), CONTEXT, 1_000_000);
-
-    assertTrue(payloads.bodies.isEmpty());
-    assertEquals(0, payloads.droppedPayloadLimit);
-    assertEquals(0, payloads.degradedPayloadLimit);
-  }
-
-  @Test
-  void requestDtoStoresContextAndEvents() {
-    final List<FlagEvaluationPayloads.FlagEvaluationEvent> events =
-        java.util.Collections.singletonList(
-            event("dto-flag", "on", "alloc1", "user-1", 1, emptyMap()));
-
-    final FlagEvaluationPayloads.FlagEvaluationsRequest request =
-        new FlagEvaluationPayloads.FlagEvaluationsRequest(CONTEXT, events);
-
-    assertEquals(CONTEXT, request.context);
-    assertEquals(events, request.flagEvaluations);
-  }
-
-  @Test
-  void degradingEventWithMissingOptionalFieldsKeepsOptionalObjectsAbsent() {
-    final FlagEvaluationPayloads.FlagEvaluationEvent degraded =
-        new FlagEvaluationPayloads.FlagEvaluationEvent(
-                EVAL_MS,
-                "default-flag",
-                EVAL_MS,
-                EVAL_MS,
-                1,
-                null,
-                null,
-                "user-1",
-                true,
-                null,
-                null)
-            .withoutTargetingKeyAndContext();
-
-    assertNotNull(degraded);
-    assertNull(degraded.variant);
-    assertNull(degraded.allocation);
-    assertNull(degraded.targeting_key);
-    assertNull(degraded.context);
-    assertNull(degraded.error);
-    assertEquals(Boolean.TRUE, degraded.runtime_default_used);
-  }
-
-  @Test
-  void emptyOptionalStringsAreTreatedAsAbsentWhenContextIsPresent() {
-    final Map<String, Object> attrs = new HashMap<>();
-    attrs.put("tier", "gold");
-    final FlagEvaluationPayloads.FlagEvaluationEvent event =
-        new FlagEvaluationPayloads.FlagEvaluationEvent(
-            EVAL_MS, "empty-optionals", EVAL_MS, EVAL_MS, 1, "", "", null, false, "", attrs);
-
-    assertNull(event.variant);
-    assertNull(event.allocation);
-    assertNull(event.error);
-    assertNotNull(event.context);
-
-    final FlagEvaluationPayloads.FlagEvaluationEvent degraded =
-        event.withoutTargetingKeyAndContext();
-    assertNotNull(degraded);
-    assertNull(degraded.targeting_key);
-    assertNull(degraded.context);
-  }
-
-  private static FlagEvaluationPayloads.FlagEvaluationEvent event(
-      final String flagKey,
-      final String variant,
-      final String allocation,
-      final String targetingKey,
-      final long count,
-      final Map<String, Object> attrs) {
-    return new FlagEvaluationPayloads.FlagEvaluationEvent(
-        EVAL_MS,
-        flagKey,
-        EVAL_MS,
-        EVAL_MS,
-        count,
-        variant,
-        allocation,
-        targetingKey,
-        false,
-        null,
-        attrs);
-  }
-
-  private static Map<String, Object> firstPayload(
-      final FlagEvaluationPayloads.EncodedPayloads payloads) throws Exception {
-    assertEquals(1, payloads.bodies.size());
-    return parse(payloads.bodies.get(0));
-  }
-
-  private static Map<String, Object> parse(final byte[] body) throws Exception {
-    return JSON_MAP.fromJson(new String(body, java.nio.charset.StandardCharsets.UTF_8));
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> firstEvent(final Map<String, Object> batch) {
-    final List<Object> events = (List<Object>) batch.get("flagEvaluations");
-    assertNotNull(events);
-    assertFalse(events.isEmpty());
-    return (Map<String, Object>) events.get(0);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static int eventCount(final Map<String, Object> batch) {
-    final List<Object> events = (List<Object>) batch.get("flagEvaluations");
-    assertNotNull(events);
-    return events.size();
-  }
-
-  private static void assertObjectWithKey(final Object object, final String expectedKey) {
-    assertTrue(object instanceof Map);
-    assertEquals(expectedKey, ((Map<?, ?>) object).get("key"));
-  }
-
-  private static String repeat(final char c, final int count) {
-    final char[] chars = new char[count];
-    java.util.Arrays.fill(chars, c);
-    return new String(chars);
-  }
-
-  private static Map<String, String> context() {
-    final Map<String, String> context = new HashMap<>();
-    context.put("service", "test-service");
-    return context;
-  }
+        final Map<String, Object> ev = firstEvent(json);
+        final Map<?, ?> error = (Map<?, ?>) ev.get("error");
+        assertNotNull(error);
+        assertEquals("type mismatch", error.get("message"));
+        assertEquals(Boolean.TRUE, ev.get("runtime_default_used"));
+    }
+
+    @Test
+    void emptyEventListProducesNoPayloads() {
+        final FlagEvaluationPayloads.EncodedPayloads payloads =
+                FlagEvaluationPayloads.buildPayloads(java.util.Collections.emptyList(), CONTEXT, 1_000_000);
+
+        assertTrue(payloads.bodies.isEmpty());
+        assertEquals(0, payloads.droppedPayloadLimit);
+        assertEquals(0, payloads.degradedPayloadLimit);
+    }
+
+    @Test
+    void requestDtoStoresContextAndEvents() {
+        final List<FlagEvaluationPayloads.FlagEvaluationEvent> events =
+                java.util.Collections.singletonList(event("dto-flag", "on", "alloc1", "user-1", 1, emptyMap()));
+
+        final FlagEvaluationPayloads.FlagEvaluationsRequest request =
+                new FlagEvaluationPayloads.FlagEvaluationsRequest(CONTEXT, events);
+
+        assertEquals(CONTEXT, request.context);
+        assertEquals(events, request.flagEvaluations);
+    }
+
+    @Test
+    void degradingEventWithMissingOptionalFieldsKeepsOptionalObjectsAbsent() {
+        final FlagEvaluationPayloads.FlagEvaluationEvent degraded = new FlagEvaluationPayloads.FlagEvaluationEvent(
+                        EVAL_MS, "default-flag", EVAL_MS, EVAL_MS, 1, null, null, "user-1", true, null, null)
+                .withoutTargetingKeyAndContext();
+
+        assertNotNull(degraded);
+        assertNull(degraded.variant);
+        assertNull(degraded.allocation);
+        assertNull(degraded.targeting_key);
+        assertNull(degraded.context);
+        assertNull(degraded.error);
+        assertEquals(Boolean.TRUE, degraded.runtime_default_used);
+    }
+
+    @Test
+    void emptyOptionalStringsAreTreatedAsAbsentWhenContextIsPresent() {
+        final Map<String, Object> attrs = new HashMap<>();
+        attrs.put("tier", "gold");
+        final FlagEvaluationPayloads.FlagEvaluationEvent event = new FlagEvaluationPayloads.FlagEvaluationEvent(
+                EVAL_MS, "empty-optionals", EVAL_MS, EVAL_MS, 1, "", "", null, false, "", attrs);
+
+        assertNull(event.variant);
+        assertNull(event.allocation);
+        assertNull(event.error);
+        assertNotNull(event.context);
+
+        final FlagEvaluationPayloads.FlagEvaluationEvent degraded = event.withoutTargetingKeyAndContext();
+        assertNotNull(degraded);
+        assertNull(degraded.targeting_key);
+        assertNull(degraded.context);
+    }
+
+    private static FlagEvaluationPayloads.FlagEvaluationEvent event(
+            final String flagKey,
+            final String variant,
+            final String allocation,
+            final String targetingKey,
+            final long count,
+            final Map<String, Object> attrs) {
+        return new FlagEvaluationPayloads.FlagEvaluationEvent(
+                EVAL_MS, flagKey, EVAL_MS, EVAL_MS, count, variant, allocation, targetingKey, false, null, attrs);
+    }
+
+    private static Map<String, Object> firstPayload(final FlagEvaluationPayloads.EncodedPayloads payloads)
+            throws Exception {
+        assertEquals(1, payloads.bodies.size());
+        return parse(payloads.bodies.get(0));
+    }
+
+    private static Map<String, Object> parse(final byte[] body) throws Exception {
+        return JSON_MAP.fromJson(new String(body, java.nio.charset.StandardCharsets.UTF_8));
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> firstEvent(final Map<String, Object> batch) {
+        final List<Object> events = (List<Object>) batch.get("flagEvaluations");
+        assertNotNull(events);
+        assertFalse(events.isEmpty());
+        return (Map<String, Object>) events.get(0);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static int eventCount(final Map<String, Object> batch) {
+        final List<Object> events = (List<Object>) batch.get("flagEvaluations");
+        assertNotNull(events);
+        return events.size();
+    }
+
+    private static void assertObjectWithKey(final Object object, final String expectedKey) {
+        assertTrue(object instanceof Map);
+        assertEquals(expectedKey, ((Map<?, ?>) object).get("key"));
+    }
+
+    private static String repeat(final char c, final int count) {
+        final char[] chars = new char[count];
+        java.util.Arrays.fill(chars, c);
+        return new String(chars);
+    }
+
+    private static Map<String, String> context() {
+        final Map<String, String> context = new HashMap<>();
+        context.put("service", "test-service");
+        return context;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FlagEvaluationTestSupport.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FlagEvaluationTestSupport.java
index 502f0e76c69..62dabeb9317 100644
--- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FlagEvaluationTestSupport.java
+++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FlagEvaluationTestSupport.java
@@ -32,215 +32,202 @@
 
 final class FlagEvaluationTestSupport {
 
-  static final long REALISTIC_EVAL_MS = 1_760_000_000_000L;
-  static final JsonAdapter<Map<String, Object>> JSON_MAP;
-
-  static {
-    final Moshi moshi = new Moshi.Builder().build();
-    final Type type = Types.newParameterizedType(Map.class, String.class, Object.class);
-    JSON_MAP = moshi.adapter(type);
-  }
-
-  private FlagEvaluationTestSupport() {}
-
-  static Supplier<BackendApi> backendApiSupplier(final BackendApiFactory factory) {
-    return () -> factory.createBackendApi(Intake.EVENT_PLATFORM, false);
-  }
-
-  static void clearCoreMetrics() {
-    CoreMetricCollector.getInstance().drain();
-  }
-
-  static FlagEvalEvent event(
-      final String flagKey,
-      final String variant,
-      final String allocationKey,
-      final String targetingKey,
-      final long evalTimeMs,
-      final Map<String, Object> attrs) {
-    return new FlagEvalEvent(flagKey, variant, allocationKey, targetingKey, evalTimeMs, attrs);
-  }
-
-  static FlagEvalEvent event(
-      final String flagKey,
-      final String variant,
-      final String allocationKey,
-      final String targetingKey,
-      final long evalTimeMs,
-      final boolean observeFullEvaluationData,
-      final Map<String, Object> attrs) {
-    return new FlagEvalEvent(
-        flagKey,
-        variant,
-        allocationKey,
-        targetingKey,
-        null,
-        evalTimeMs,
-        observeFullEvaluationData,
-        attrs);
-  }
-
-  static FlagEvalEvent errorEvent(
-      final String flagKey, final String errorMessage, final long evalTimeMs) {
-    return new FlagEvalEvent(
-        flagKey, null, null, null, errorMessage, evalTimeMs, java.util.Collections.emptyMap());
-  }
-
-  static FlagEvalEvent simpleEvent(final String flagKey, final String variant) {
-    return event(flagKey, variant, "alloc1", "user-1", 1000L, java.util.Collections.emptyMap());
-  }
-
-  static String repeat(final char c, final int count) {
-    final char[] chars = new char[count];
-    Arrays.fill(chars, c);
-    return new String(chars);
-  }
-
-  static TestWriterSetup buildTestWriter(final BackendApi mockEvp) {
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
-
-    final Map<String, String> context = new HashMap<>();
-    context.put("service", "test-service");
-
-    final FlagEvaluationWriterImpl.SerializingHandlerForTest handler =
-        FlagEvaluationWriterImpl.createHandlerForTest(backendApiSupplier(factory), context);
-
-    return new TestWriterSetup(handler, mockEvp, factory);
-  }
-
-  static TestWriterSetup buildTestWriter(
-      final BackendApi mockEvp, final int payloadSizeLimitBytes) {
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
-
-    final Map<String, String> context = new HashMap<>();
-    context.put("service", "test-service");
-
-    final FlagEvaluationWriterImpl.SerializingHandlerForTest handler =
-        FlagEvaluationWriterImpl.createHandlerForTest(
-            backendApiSupplier(factory), context, payloadSizeLimitBytes);
-
-    return new TestWriterSetup(handler, mockEvp, factory);
-  }
-
-  static CapturedJson flushAndCapture(final TestWriterSetup setup) throws Exception {
-    final List<CapturedJson> captured = flushAndCaptureAll(setup);
-    assertEquals(1, captured.size(), "Expected exactly one posted payload");
-    return captured.get(0);
-  }
-
-  static List<CapturedJson> flushAndCaptureAll(final TestWriterSetup setup) throws Exception {
-    final List<RequestBody> captured = new ArrayList<>();
-    when(setup.mockEvp.post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false)))
-        .thenAnswer(
-            inv -> {
-              captured.add(inv.getArgument(1));
-              return null;
-            });
-    setup.handler.drainAndAggregate();
-    setup.handler.flush();
-    final List<CapturedJson> json = new ArrayList<>();
-    for (final RequestBody body : captured) {
-      json.add(readJson(body));
-    }
-    return json;
-  }
-
-  static CapturedJson readJson(final RequestBody body) throws Exception {
-    assertNotNull(body, "RequestBody must have been posted");
-    final Buffer buf = new Buffer();
-    body.writeTo(buf);
-    final String raw = buf.readUtf8();
-    return new CapturedJson(raw, JSON_MAP.fromJson(raw));
-  }
-
-  static Map<String, Object> flushAndCaptureJson(final TestWriterSetup setup) throws Exception {
-    return flushAndCapture(setup).parsed;
-  }
-
-  static long metricSum(
-      final Collection<? extends MetricCollector.Metric> metrics,
-      final String metricName,
-      final String tag) {
-    long sum = 0;
-    for (final MetricCollector.Metric metric : metrics) {
-      if (!metricName.equals(metric.metricName)) {
-        continue;
-      }
-      if (tag == null) {
-        if (!metric.tags.isEmpty()) {
-          continue;
+    static final long REALISTIC_EVAL_MS = 1_760_000_000_000L;
+    static final JsonAdapter<Map<String, Object>> JSON_MAP;
+
+    static {
+        final Moshi moshi = new Moshi.Builder().build();
+        final Type type = Types.newParameterizedType(Map.class, String.class, Object.class);
+        JSON_MAP = moshi.adapter(type);
+    }
+
+    private FlagEvaluationTestSupport() {}
+
+    static Supplier<BackendApi> backendApiSupplier(final BackendApiFactory factory) {
+        return () -> factory.createBackendApi(Intake.EVENT_PLATFORM, false);
+    }
+
+    static void clearCoreMetrics() {
+        CoreMetricCollector.getInstance().drain();
+    }
+
+    static FlagEvalEvent event(
+            final String flagKey,
+            final String variant,
+            final String allocationKey,
+            final String targetingKey,
+            final long evalTimeMs,
+            final Map<String, Object> attrs) {
+        return new FlagEvalEvent(flagKey, variant, allocationKey, targetingKey, evalTimeMs, attrs);
+    }
+
+    static FlagEvalEvent event(
+            final String flagKey,
+            final String variant,
+            final String allocationKey,
+            final String targetingKey,
+            final long evalTimeMs,
+            final boolean observeFullEvaluationData,
+            final Map<String, Object> attrs) {
+        return new FlagEvalEvent(
+                flagKey, variant, allocationKey, targetingKey, null, evalTimeMs, observeFullEvaluationData, attrs);
+    }
+
+    static FlagEvalEvent errorEvent(final String flagKey, final String errorMessage, final long evalTimeMs) {
+        return new FlagEvalEvent(flagKey, null, null, null, errorMessage, evalTimeMs, java.util.Collections.emptyMap());
+    }
+
+    static FlagEvalEvent simpleEvent(final String flagKey, final String variant) {
+        return event(flagKey, variant, "alloc1", "user-1", 1000L, java.util.Collections.emptyMap());
+    }
+
+    static String repeat(final char c, final int count) {
+        final char[] chars = new char[count];
+        Arrays.fill(chars, c);
+        return new String(chars);
+    }
+
+    static TestWriterSetup buildTestWriter(final BackendApi mockEvp) {
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
+
+        final Map<String, String> context = new HashMap<>();
+        context.put("service", "test-service");
+
+        final FlagEvaluationWriterImpl.SerializingHandlerForTest handler =
+                FlagEvaluationWriterImpl.createHandlerForTest(backendApiSupplier(factory), context);
+
+        return new TestWriterSetup(handler, mockEvp, factory);
+    }
+
+    static TestWriterSetup buildTestWriter(final BackendApi mockEvp, final int payloadSizeLimitBytes) {
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
+
+        final Map<String, String> context = new HashMap<>();
+        context.put("service", "test-service");
+
+        final FlagEvaluationWriterImpl.SerializingHandlerForTest handler =
+                FlagEvaluationWriterImpl.createHandlerForTest(
+                        backendApiSupplier(factory), context, payloadSizeLimitBytes);
+
+        return new TestWriterSetup(handler, mockEvp, factory);
+    }
+
+    static CapturedJson flushAndCapture(final TestWriterSetup setup) throws Exception {
+        final List<CapturedJson> captured = flushAndCaptureAll(setup);
+        assertEquals(1, captured.size(), "Expected exactly one posted payload");
+        return captured.get(0);
+    }
+
+    static List<CapturedJson> flushAndCaptureAll(final TestWriterSetup setup) throws Exception {
+        final List<RequestBody> captured = new ArrayList<>();
+        when(setup.mockEvp.post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false)))
+                .thenAnswer(inv -> {
+                    captured.add(inv.getArgument(1));
+                    return null;
+                });
+        setup.handler.drainAndAggregate();
+        setup.handler.flush();
+        final List<CapturedJson> json = new ArrayList<>();
+        for (final RequestBody body : captured) {
+            json.add(readJson(body));
+        }
+        return json;
+    }
+
+    static CapturedJson readJson(final RequestBody body) throws Exception {
+        assertNotNull(body, "RequestBody must have been posted");
+        final Buffer buf = new Buffer();
+        body.writeTo(buf);
+        final String raw = buf.readUtf8();
+        return new CapturedJson(raw, JSON_MAP.fromJson(raw));
+    }
+
+    static Map<String, Object> flushAndCaptureJson(final TestWriterSetup setup) throws Exception {
+        return flushAndCapture(setup).parsed;
+    }
+
+    static long metricSum(
+            final Collection<? extends MetricCollector.Metric> metrics, final String metricName, final String tag) {
+        long sum = 0;
+        for (final MetricCollector.Metric metric : metrics) {
+            if (!metricName.equals(metric.metricName)) {
+                continue;
+            }
+            if (tag == null) {
+                if (!metric.tags.isEmpty()) {
+                    continue;
+                }
+            } else if (!metric.tags.contains(tag)) {
+                continue;
+            }
+            sum += metric.value.longValue();
+        }
+        return sum;
+    }
+
+    static datadog.trace.api.Config cfg() {
+        final datadog.trace.api.Config config = mock(datadog.trace.api.Config.class);
+        when(config.getServiceName()).thenReturn("test-service");
+        return config;
+    }
+
+    static void assertObjectWithKey(final Object o, final String expectedKey, final String msg) {
+        assertTrue(o instanceof Map, msg + " (must be a JSON object, not a bare string)");
+        assertEquals(expectedKey, ((Map<?, ?>) o).get("key"), msg);
+    }
+
+    @SuppressWarnings("unchecked")
+    static Map<String, Object> firstEvent(final Map<String, Object> batch) {
+        final List<Object> events = (List<Object>) batch.get("flagEvaluations");
+        assertNotNull(events, "flagEvaluations array must be present");
+        assertFalse(events.isEmpty(), "flagEvaluations must not be empty");
+        return (Map<String, Object>) events.get(0);
+    }
+
+    @SuppressWarnings("unchecked")
+    static int eventCount(final Map<String, Object> batch) {
+        final List<Object> events = (List<Object>) batch.get("flagEvaluations");
+        assertNotNull(events, "flagEvaluations array must be present");
+        return events.size();
+    }
+
+    @SuppressWarnings("unchecked")
+    static Map<String, Object> eventForFlag(final Map<String, Object> batch, final String flagKey) {
+        final List<Object> events = (List<Object>) batch.get("flagEvaluations");
+        for (final Object o : events) {
+            final Map<String, Object> ev = (Map<String, Object>) o;
+            final Map<?, ?> flag = (Map<?, ?>) ev.get("flag");
+            if (flag != null && flagKey.equals(flag.get("key"))) {
+                return ev;
+            }
+        }
+        return null;
+    }
+
+    static class TestWriterSetup {
+        final FlagEvaluationWriterImpl.SerializingHandlerForTest handler;
+        final BackendApi mockEvp;
+        final BackendApiFactory factory;
+
+        TestWriterSetup(
+                final FlagEvaluationWriterImpl.SerializingHandlerForTest handler,
+                final BackendApi mockEvp,
+                final BackendApiFactory factory) {
+            this.handler = handler;
+            this.mockEvp = mockEvp;
+            this.factory = factory;
         }
-      } else if (!metric.tags.contains(tag)) {
-        continue;
-      }
-      sum += metric.value.longValue();
-    }
-    return sum;
-  }
-
-  static datadog.trace.api.Config cfg() {
-    final datadog.trace.api.Config config = mock(datadog.trace.api.Config.class);
-    when(config.getServiceName()).thenReturn("test-service");
-    return config;
-  }
-
-  static void assertObjectWithKey(final Object o, final String expectedKey, final String msg) {
-    assertTrue(o instanceof Map, msg + " (must be a JSON object, not a bare string)");
-    assertEquals(expectedKey, ((Map<?, ?>) o).get("key"), msg);
-  }
-
-  @SuppressWarnings("unchecked")
-  static Map<String, Object> firstEvent(final Map<String, Object> batch) {
-    final List<Object> events = (List<Object>) batch.get("flagEvaluations");
-    assertNotNull(events, "flagEvaluations array must be present");
-    assertFalse(events.isEmpty(), "flagEvaluations must not be empty");
-    return (Map<String, Object>) events.get(0);
-  }
-
-  @SuppressWarnings("unchecked")
-  static int eventCount(final Map<String, Object> batch) {
-    final List<Object> events = (List<Object>) batch.get("flagEvaluations");
-    assertNotNull(events, "flagEvaluations array must be present");
-    return events.size();
-  }
-
-  @SuppressWarnings("unchecked")
-  static Map<String, Object> eventForFlag(final Map<String, Object> batch, final String flagKey) {
-    final List<Object> events = (List<Object>) batch.get("flagEvaluations");
-    for (final Object o : events) {
-      final Map<String, Object> ev = (Map<String, Object>) o;
-      final Map<?, ?> flag = (Map<?, ?>) ev.get("flag");
-      if (flag != null && flagKey.equals(flag.get("key"))) {
-        return ev;
-      }
-    }
-    return null;
-  }
-
-  static class TestWriterSetup {
-    final FlagEvaluationWriterImpl.SerializingHandlerForTest handler;
-    final BackendApi mockEvp;
-    final BackendApiFactory factory;
-
-    TestWriterSetup(
-        final FlagEvaluationWriterImpl.SerializingHandlerForTest handler,
-        final BackendApi mockEvp,
-        final BackendApiFactory factory) {
-      this.handler = handler;
-      this.mockEvp = mockEvp;
-      this.factory = factory;
-    }
-  }
-
-  static class CapturedJson {
-    final String raw;
-    final Map<String, Object> parsed;
-
-    CapturedJson(final String raw, final Map<String, Object> parsed) {
-      this.raw = raw;
-      this.parsed = parsed;
-    }
-  }
+    }
+
+    static class CapturedJson {
+        final String raw;
+        final Map<String, Object> parsed;
+
+        CapturedJson(final String raw, final Map<String, Object> parsed) {
+            this.raw = raw;
+            this.parsed = parsed;
+        }
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FlagEvaluationWriterImplTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FlagEvaluationWriterImplTest.java
index 75a767c5c3f..24b4dc5e568 100644
--- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FlagEvaluationWriterImplTest.java
+++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/FlagEvaluationWriterImplTest.java
@@ -63,799 +63,752 @@
 
 class FlagEvaluationWriterImplTest {
 
-  private static final String DIRECT_FLAG_EVALUATION_ENDPOINT = "/api/v2/flagevaluation";
-  private static final String API_KEY = "test-api-key";
-  private static final double TIMEOUT_SECONDS = 5;
-
-  @BeforeEach
-  void clearCoreMetricsBefore() {
-    clearCoreMetrics();
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
-  }
-
-  @AfterEach
-  void clearCoreMetricsAfter() {
-    clearCoreMetrics();
-    FeatureFlaggingGateway.setFlagEvalWriter(null);
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
-    // Reset the dispatched UFC state so observeFullEvaluationData can't leak into other tests.
-    FeatureFlaggingGateway.dispatch((ServerConfiguration) null);
-  }
-
-  @Test
-  void degradedCapOverflowTelemetryIsEmittedOnFlush() {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
-
-    setup.handler.addDroppedDegradedOverflowForTest(3);
-    setup.handler.flush();
-
-    final Collection<? extends MetricCollector.Metric> metrics =
-        CoreMetricCollector.getInstance().drain();
-    assertEquals(
-        3,
-        metricSum(
-            metrics,
-            FlagEvaluationWriterImpl.FLAG_EVALUATION_DROPPED_METRIC,
-            "reason:" + FlagEvaluationWriterImpl.DROP_REASON_DEGRADED_CAP));
-  }
-
-  @Test
-  void startRegistersWriterAndCloseDeregistersIt() {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
-    final FlagEvaluationWriterImpl writer =
-        new FlagEvaluationWriterImpl(
-            16, Long.MAX_VALUE, TimeUnit.NANOSECONDS, backendApiSupplier(factory), cfg());
-
-    writer.start();
-    assertEquals(writer, FeatureFlaggingGateway.getFlagEvalWriter());
-
-    writer.close();
-    writer.close();
-    writer.start();
-
-    assertNull(FeatureFlaggingGateway.getFlagEvalWriter());
-  }
-
-  @Test
-  void queueOverflowIncrementsObservableDropCounter() {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
-    final FlagEvaluationWriterImpl writer =
-        new FlagEvaluationWriterImpl(2, 10L, TimeUnit.SECONDS, backendApiSupplier(factory), cfg());
-
-    for (int i = 0; i < 100; i++) {
-      writer.enqueue(simpleEvent("of-flag", "on"));
-    }
-
-    assertTrue(writer.droppedQueueOverflow() > 0);
-    final long queueDrops = writer.droppedQueueOverflow();
-    writer.flushForTest();
-    final Collection<? extends MetricCollector.Metric> metrics =
-        CoreMetricCollector.getInstance().drain();
-    assertEquals(
-        queueDrops,
-        metricSum(
-            metrics,
-            FlagEvaluationWriterImpl.FLAG_EVALUATION_DROPPED_METRIC,
-            "reason:" + FlagEvaluationWriterImpl.DROP_REASON_QUEUE_OVERFLOW));
-  }
-
-  @Test
-  void enqueueAfterCloseIsDroppedAndCounted() {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
-    final FlagEvaluationWriterImpl writer =
-        new FlagEvaluationWriterImpl(
-            16, Long.MAX_VALUE, TimeUnit.NANOSECONDS, backendApiSupplier(factory), cfg());
-
-    writer.close();
-    writer.enqueue(simpleEvent("closed-flag", "on"));
-
-    final Collection<? extends MetricCollector.Metric> metrics =
-        CoreMetricCollector.getInstance().drain();
-    assertEquals(
-        1,
-        metricSum(
-            metrics,
-            FlagEvaluationWriterImpl.FLAG_EVALUATION_DROPPED_METRIC,
-            "reason:" + FlagEvaluationWriterImpl.DROP_REASON_CLOSED));
-    assertNull(writer.pollQueuedEventForTest());
-  }
-
-  @Test
-  void enqueueDisabledDropsAndCountsAsClosedDrop() {
-    // FeatureFlaggingSystem.stop() flips the gate before this writer's close() runs. Producers
-    // that race the gate flip must count the drop, otherwise shutdown loss stays invisible.
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
-    final FlagEvaluationWriterImpl writer =
-        new FlagEvaluationWriterImpl(
-            16, Long.MAX_VALUE, TimeUnit.NANOSECONDS, backendApiSupplier(factory), cfg());
-
-    FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(false);
-    writer.enqueue(simpleEvent("disabled-flag", "on"));
-
-    final Collection<? extends MetricCollector.Metric> metrics =
-        CoreMetricCollector.getInstance().drain();
-    assertEquals(
-        1,
-        metricSum(
-            metrics,
-            FlagEvaluationWriterImpl.FLAG_EVALUATION_DROPPED_METRIC,
-            "reason:" + FlagEvaluationWriterImpl.DROP_REASON_CLOSED));
-    assertNull(writer.pollQueuedEventForTest());
-  }
-
-  @Test
-  void closeSweepsAndCountsEventsLeftInTheQueue() {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
-    final FlagEvaluationWriterImpl writer =
-        new FlagEvaluationWriterImpl(
-            16, Long.MAX_VALUE, TimeUnit.NANOSECONDS, backendApiSupplier(factory), cfg());
-
-    // The worker is never started, so nothing drains these; close() must account for them rather
-    // than leave them silently stranded. Stands in for the narrow window where a lock-free
-    // producer offers after the worker's final drain.
-    writer.enqueue(simpleEvent("residual-flag-1", "on"));
-    writer.enqueue(simpleEvent("residual-flag-2", "on"));
-    writer.close();
-
-    final Collection<? extends MetricCollector.Metric> metrics =
-        CoreMetricCollector.getInstance().drain();
-    assertEquals(
-        2,
-        metricSum(
-            metrics,
-            FlagEvaluationWriterImpl.FLAG_EVALUATION_DROPPED_METRIC,
-            "reason:" + FlagEvaluationWriterImpl.DROP_REASON_CLOSED));
-    assertNull(writer.pollQueuedEventForTest());
-  }
-
-  @Test
-  void enqueueIgnoresNullEvent() {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
-    final FlagEvaluationWriterImpl writer =
-        new FlagEvaluationWriterImpl(
-            16, Long.MAX_VALUE, TimeUnit.NANOSECONDS, backendApiSupplier(factory), cfg());
-
-    writer.enqueue(null);
-
-    assertNull(writer.pollQueuedEventForTest());
-    assertEquals(0, writer.droppedQueueOverflow());
-  }
-
-  @Test
-  void enqueueDoesNotAggregateOnTheCallingThread() {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
-    final FlagEvaluationWriterImpl writer =
-        new FlagEvaluationWriterImpl(
-            16, Long.MAX_VALUE, TimeUnit.NANOSECONDS, backendApiSupplier(factory), cfg());
-
-    writer.enqueue(simpleEvent("g2-flag", "on"));
-    writer.enqueue(simpleEvent("g2-flag", "on"));
-
-    assertEquals(0, writer.aggregatorFullTierSizeForTest());
-    assertEquals(0, writer.droppedQueueOverflow());
-  }
-
-  @Test
-  void handlerRunFailsFastWhenEvpProxyIsUnavailable() {
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    final FlagEvaluationWriterImpl.SerializingHandlerForTest handler =
-        FlagEvaluationWriterImpl.createHandlerForTest(backendApiSupplier(factory), context());
-
-    assertThrows(IllegalArgumentException.class, handler::run);
-  }
-
-  @Test
-  void flushIfNecessarySkipsEmptyStateAndWaitsForInterval() {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
-
-    setup.handler.flushIfNecessary();
-    setup.handler.add(simpleEvent("pending-flag", "on"));
-    setup.handler.drainAndAggregate();
-    setup.handler.flushIfNecessary();
-
-    assertEquals(1, setup.handler.fullTierSizeForTest());
-  }
-
-  @Test
-  void flushIfNecessaryDoesNotReturnEarlyWhenOnlyQueueDropsArePending() {
-    final AtomicLong queueDrops = new AtomicLong(1);
-    final FlagEvaluationWriterImpl.FlagEvaluationSerializingHandler handler =
-        new FlagEvaluationWriterImpl.FlagEvaluationSerializingHandler(
-            () -> null,
-            Queues.<FlagEvalEvent>mpscBlockingConsumerArrayQueue(16),
-            Long.MAX_VALUE,
-            TimeUnit.NANOSECONDS,
-            context(),
-            queueDrops,
-            new java.util.concurrent.ConcurrentHashMap<>(),
-            () -> {},
-            FlagEvaluationWriterImpl.FLAG_EVALUATION_PAYLOAD_SIZE_LIMIT_BYTES);
-
-    handler.flushIfNecessary();
-
-    assertEquals(1, queueDrops.get());
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void workerHandlesEmptyPolls() throws Exception {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
-    final MessagePassingBlockingQueue<FlagEvalEvent> queue =
-        mock(MessagePassingBlockingQueue.class);
-    when(queue.poll(100, TimeUnit.MILLISECONDS))
-        .thenAnswer(
-            invocation -> {
-              Thread.currentThread().interrupt();
-              return null;
-            });
-    final FlagEvaluationWriterImpl.FlagEvaluationSerializingHandler handler =
-        new FlagEvaluationWriterImpl.FlagEvaluationSerializingHandler(
-            backendApiSupplier(factory),
-            queue,
-            Long.MAX_VALUE,
-            TimeUnit.NANOSECONDS,
-            context(),
-            new AtomicLong(0),
-            new java.util.concurrent.ConcurrentHashMap<>(),
-            () -> {},
-            FlagEvaluationWriterImpl.FLAG_EVALUATION_PAYLOAD_SIZE_LIMIT_BYTES);
-
-    handler.run();
-
-    assertTrue(Thread.interrupted());
-  }
-
-  @Test
-  void degradedBucketsAreSerializedWithoutTargetingKeyOrContext() throws Exception {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
-    setup.handler.addDegradedBucketForTest("degraded-flag", "on", "alloc1", null, 1000L);
-
-    final Map<String, Object> json = flushAndCaptureJson(setup);
-
-    final Map<String, Object> ev = eventForFlag(json, "degraded-flag");
-    assertNotNull(ev);
-    assertNull(ev.get("targeting_key"));
-    assertNull(ev.get("context"));
-  }
-
-  @Test
-  void testHandlerCanSimulateAndClearDegradedTierAtCap() {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
-
-    setup.handler.simulateDegradedTierAtCap();
-    setup.handler.clearAggregationForTest();
-    setup.handler.add(simpleEvent("after-clear", "on"));
-    setup.handler.drainAndAggregate();
-
-    assertEquals(1, setup.handler.fullTierSizeForTest());
-  }
-
-  @Test
-  void payloadLimitDropsAreCountedOnFlush() {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp, 128);
-    setup.handler.add(event(repeat('f', 512), "on", "alloc1", "user-1", 1000L, emptyMap()));
-
-    setup.handler.drainAndAggregate();
-    setup.handler.flush();
-
-    final Collection<? extends MetricCollector.Metric> metrics =
-        CoreMetricCollector.getInstance().drain();
-    assertEquals(
-        1,
-        metricSum(
-            metrics,
-            FlagEvaluationWriterImpl.FLAG_EVALUATION_DROPPED_METRIC,
-            "reason:" + FlagEvaluationWriterImpl.DROP_REASON_PAYLOAD_LIMIT));
-  }
-
-  @Test
-  void finalFlushRunsWithoutTheInterruptFlagSet() throws Exception {
-    // close() interrupts the worker to break it out of poll(). The final flush does socket I/O,
-    // and OkHttp fails fast on an interrupted thread, so the flag must be clear by the time the
-    // publisher is called. A mock publisher ignores the flag, so assert on it directly.
-    final java.util.concurrent.CountDownLatch posted = new java.util.concurrent.CountDownLatch(1);
-    final boolean[] interruptedDuringPost = {true};
-    final BackendApi mockEvp = mock(BackendApi.class);
-    when(mockEvp.post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false)))
-        .thenAnswer(
-            inv -> {
-              interruptedDuringPost[0] = Thread.currentThread().isInterrupted();
-              posted.countDown();
-              return null;
-            });
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
-    final FlagEvaluationWriterImpl writer =
-        new FlagEvaluationWriterImpl(
-            64, TimeUnit.DAYS.toSeconds(1), TimeUnit.SECONDS, backendApiSupplier(factory), cfg());
-
-    writer.startForTest();
-    writer.enqueue(simpleEvent("interrupt-flag", "on"));
-    writer.close();
-
-    assertTrue(posted.await(5, TimeUnit.SECONDS));
-    assertFalse(
-        interruptedDuringPost[0],
-        "final flush must not run on an interrupted thread; OkHttp fails fast and the drained"
-            + " rows are lost without being counted");
-  }
-
-  @Test
-  void closeDrainsAndFinalFlushesQueuedEvents() throws Exception {
-    final java.util.concurrent.CountDownLatch posted = new java.util.concurrent.CountDownLatch(1);
-    final RequestBody[] captured = {null};
-    final BackendApi mockEvp = mock(BackendApi.class);
-    when(mockEvp.post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false)))
-        .thenAnswer(
-            inv -> {
-              captured[0] = inv.getArgument(1);
-              posted.countDown();
-              return null;
-            });
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
-    final FlagEvaluationWriterImpl writer =
-        new FlagEvaluationWriterImpl(
-            64, TimeUnit.DAYS.toSeconds(1), TimeUnit.SECONDS, backendApiSupplier(factory), cfg());
-
-    writer.startForTest();
-    writer.enqueue(simpleEvent("shutdown-flag", "on"));
-    writer.close();
-
-    assertTrue(posted.await(5, TimeUnit.SECONDS));
-    assertNotNull(captured[0]);
-    final Buffer buf = new Buffer();
-    captured[0].writeTo(buf);
-    final Map<String, Object> json = JSON_MAP.fromJson(buf.readUtf8());
-    assertNotNull(eventForFlag(json, "shutdown-flag"));
-  }
-
-  @Test
-  void continuousTrafficFlushesWithoutWaitingForIdle() throws Exception {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
-    final FlagEvaluationWriterImpl writer =
-        new FlagEvaluationWriterImpl(
-            1 << 12, 1, TimeUnit.MILLISECONDS, backendApiSupplier(factory), cfg());
-
-    writer.startForTest();
-    boolean posted = false;
-    try {
-      final long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(2);
-      while (System.nanoTime() < deadline) {
-        writer.enqueue(simpleEvent("busy-flag", "on"));
+    private static final String DIRECT_FLAG_EVALUATION_ENDPOINT = "/api/v2/flagevaluation";
+    private static final String API_KEY = "test-api-key";
+    private static final double TIMEOUT_SECONDS = 5;
+
+    @BeforeEach
+    void clearCoreMetricsBefore() {
+        clearCoreMetrics();
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
+    }
+
+    @AfterEach
+    void clearCoreMetricsAfter() {
+        clearCoreMetrics();
+        FeatureFlaggingGateway.setFlagEvalWriter(null);
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(true);
+        // Reset the dispatched UFC state so observeFullEvaluationData can't leak into other tests.
+        FeatureFlaggingGateway.dispatch((ServerConfiguration) null);
+    }
+
+    @Test
+    void degradedCapOverflowTelemetryIsEmittedOnFlush() {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
+
+        setup.handler.addDroppedDegradedOverflowForTest(3);
+        setup.handler.flush();
+
+        final Collection<? extends MetricCollector.Metric> metrics =
+                CoreMetricCollector.getInstance().drain();
+        assertEquals(
+                3,
+                metricSum(
+                        metrics,
+                        FlagEvaluationWriterImpl.FLAG_EVALUATION_DROPPED_METRIC,
+                        "reason:" + FlagEvaluationWriterImpl.DROP_REASON_DEGRADED_CAP));
+    }
+
+    @Test
+    void startRegistersWriterAndCloseDeregistersIt() {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
+        final FlagEvaluationWriterImpl writer = new FlagEvaluationWriterImpl(
+                16, Long.MAX_VALUE, TimeUnit.NANOSECONDS, backendApiSupplier(factory), cfg());
+
+        writer.start();
+        assertEquals(writer, FeatureFlaggingGateway.getFlagEvalWriter());
+
+        writer.close();
+        writer.close();
+        writer.start();
+
+        assertNull(FeatureFlaggingGateway.getFlagEvalWriter());
+    }
+
+    @Test
+    void queueOverflowIncrementsObservableDropCounter() {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
+        final FlagEvaluationWriterImpl writer =
+                new FlagEvaluationWriterImpl(2, 10L, TimeUnit.SECONDS, backendApiSupplier(factory), cfg());
+
+        for (int i = 0; i < 100; i++) {
+            writer.enqueue(simpleEvent("of-flag", "on"));
+        }
+
+        assertTrue(writer.droppedQueueOverflow() > 0);
+        final long queueDrops = writer.droppedQueueOverflow();
+        writer.flushForTest();
+        final Collection<? extends MetricCollector.Metric> metrics =
+                CoreMetricCollector.getInstance().drain();
+        assertEquals(
+                queueDrops,
+                metricSum(
+                        metrics,
+                        FlagEvaluationWriterImpl.FLAG_EVALUATION_DROPPED_METRIC,
+                        "reason:" + FlagEvaluationWriterImpl.DROP_REASON_QUEUE_OVERFLOW));
+    }
+
+    @Test
+    void enqueueAfterCloseIsDroppedAndCounted() {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
+        final FlagEvaluationWriterImpl writer = new FlagEvaluationWriterImpl(
+                16, Long.MAX_VALUE, TimeUnit.NANOSECONDS, backendApiSupplier(factory), cfg());
+
+        writer.close();
+        writer.enqueue(simpleEvent("closed-flag", "on"));
+
+        final Collection<? extends MetricCollector.Metric> metrics =
+                CoreMetricCollector.getInstance().drain();
+        assertEquals(
+                1,
+                metricSum(
+                        metrics,
+                        FlagEvaluationWriterImpl.FLAG_EVALUATION_DROPPED_METRIC,
+                        "reason:" + FlagEvaluationWriterImpl.DROP_REASON_CLOSED));
+        assertNull(writer.pollQueuedEventForTest());
+    }
+
+    @Test
+    void enqueueDisabledDropsAndCountsAsClosedDrop() {
+        // FeatureFlaggingSystem.stop() flips the gate before this writer's close() runs. Producers
+        // that race the gate flip must count the drop, otherwise shutdown loss stays invisible.
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
+        final FlagEvaluationWriterImpl writer = new FlagEvaluationWriterImpl(
+                16, Long.MAX_VALUE, TimeUnit.NANOSECONDS, backendApiSupplier(factory), cfg());
+
+        FeatureFlaggingGateway.setFlagEvaluationEnqueueEnabled(false);
+        writer.enqueue(simpleEvent("disabled-flag", "on"));
+
+        final Collection<? extends MetricCollector.Metric> metrics =
+                CoreMetricCollector.getInstance().drain();
+        assertEquals(
+                1,
+                metricSum(
+                        metrics,
+                        FlagEvaluationWriterImpl.FLAG_EVALUATION_DROPPED_METRIC,
+                        "reason:" + FlagEvaluationWriterImpl.DROP_REASON_CLOSED));
+        assertNull(writer.pollQueuedEventForTest());
+    }
+
+    @Test
+    void closeSweepsAndCountsEventsLeftInTheQueue() {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
+        final FlagEvaluationWriterImpl writer = new FlagEvaluationWriterImpl(
+                16, Long.MAX_VALUE, TimeUnit.NANOSECONDS, backendApiSupplier(factory), cfg());
+
+        // The worker is never started, so nothing drains these; close() must account for them rather
+        // than leave them silently stranded. Stands in for the narrow window where a lock-free
+        // producer offers after the worker's final drain.
+        writer.enqueue(simpleEvent("residual-flag-1", "on"));
+        writer.enqueue(simpleEvent("residual-flag-2", "on"));
+        writer.close();
+
+        final Collection<? extends MetricCollector.Metric> metrics =
+                CoreMetricCollector.getInstance().drain();
+        assertEquals(
+                2,
+                metricSum(
+                        metrics,
+                        FlagEvaluationWriterImpl.FLAG_EVALUATION_DROPPED_METRIC,
+                        "reason:" + FlagEvaluationWriterImpl.DROP_REASON_CLOSED));
+        assertNull(writer.pollQueuedEventForTest());
+    }
+
+    @Test
+    void enqueueIgnoresNullEvent() {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
+        final FlagEvaluationWriterImpl writer = new FlagEvaluationWriterImpl(
+                16, Long.MAX_VALUE, TimeUnit.NANOSECONDS, backendApiSupplier(factory), cfg());
+
+        writer.enqueue(null);
+
+        assertNull(writer.pollQueuedEventForTest());
+        assertEquals(0, writer.droppedQueueOverflow());
+    }
+
+    @Test
+    void enqueueDoesNotAggregateOnTheCallingThread() {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
+        final FlagEvaluationWriterImpl writer = new FlagEvaluationWriterImpl(
+                16, Long.MAX_VALUE, TimeUnit.NANOSECONDS, backendApiSupplier(factory), cfg());
+
+        writer.enqueue(simpleEvent("g2-flag", "on"));
+        writer.enqueue(simpleEvent("g2-flag", "on"));
+
+        assertEquals(0, writer.aggregatorFullTierSizeForTest());
+        assertEquals(0, writer.droppedQueueOverflow());
+    }
+
+    @Test
+    void handlerRunFailsFastWhenEvpProxyIsUnavailable() {
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        final FlagEvaluationWriterImpl.SerializingHandlerForTest handler =
+                FlagEvaluationWriterImpl.createHandlerForTest(backendApiSupplier(factory), context());
+
+        assertThrows(IllegalArgumentException.class, handler::run);
+    }
+
+    @Test
+    void flushIfNecessarySkipsEmptyStateAndWaitsForInterval() {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
+
+        setup.handler.flushIfNecessary();
+        setup.handler.add(simpleEvent("pending-flag", "on"));
+        setup.handler.drainAndAggregate();
+        setup.handler.flushIfNecessary();
+
+        assertEquals(1, setup.handler.fullTierSizeForTest());
+    }
+
+    @Test
+    void flushIfNecessaryDoesNotReturnEarlyWhenOnlyQueueDropsArePending() {
+        final AtomicLong queueDrops = new AtomicLong(1);
+        final FlagEvaluationWriterImpl.FlagEvaluationSerializingHandler handler =
+                new FlagEvaluationWriterImpl.FlagEvaluationSerializingHandler(
+                        () -> null,
+                        Queues.<FlagEvalEvent>mpscBlockingConsumerArrayQueue(16),
+                        Long.MAX_VALUE,
+                        TimeUnit.NANOSECONDS,
+                        context(),
+                        queueDrops,
+                        new java.util.concurrent.ConcurrentHashMap<>(),
+                        () -> {},
+                        FlagEvaluationWriterImpl.FLAG_EVALUATION_PAYLOAD_SIZE_LIMIT_BYTES);
+
+        handler.flushIfNecessary();
+
+        assertEquals(1, queueDrops.get());
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void workerHandlesEmptyPolls() throws Exception {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
+        final MessagePassingBlockingQueue<FlagEvalEvent> queue = mock(MessagePassingBlockingQueue.class);
+        when(queue.poll(100, TimeUnit.MILLISECONDS)).thenAnswer(invocation -> {
+            Thread.currentThread().interrupt();
+            return null;
+        });
+        final FlagEvaluationWriterImpl.FlagEvaluationSerializingHandler handler =
+                new FlagEvaluationWriterImpl.FlagEvaluationSerializingHandler(
+                        backendApiSupplier(factory),
+                        queue,
+                        Long.MAX_VALUE,
+                        TimeUnit.NANOSECONDS,
+                        context(),
+                        new AtomicLong(0),
+                        new java.util.concurrent.ConcurrentHashMap<>(),
+                        () -> {},
+                        FlagEvaluationWriterImpl.FLAG_EVALUATION_PAYLOAD_SIZE_LIMIT_BYTES);
+
+        handler.run();
+
+        assertTrue(Thread.interrupted());
+    }
+
+    @Test
+    void degradedBucketsAreSerializedWithoutTargetingKeyOrContext() throws Exception {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
+        setup.handler.addDegradedBucketForTest("degraded-flag", "on", "alloc1", null, 1000L);
+
+        final Map<String, Object> json = flushAndCaptureJson(setup);
+
+        final Map<String, Object> ev = eventForFlag(json, "degraded-flag");
+        assertNotNull(ev);
+        assertNull(ev.get("targeting_key"));
+        assertNull(ev.get("context"));
+    }
+
+    @Test
+    void testHandlerCanSimulateAndClearDegradedTierAtCap() {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
+
+        setup.handler.simulateDegradedTierAtCap();
+        setup.handler.clearAggregationForTest();
+        setup.handler.add(simpleEvent("after-clear", "on"));
+        setup.handler.drainAndAggregate();
+
+        assertEquals(1, setup.handler.fullTierSizeForTest());
+    }
+
+    @Test
+    void payloadLimitDropsAreCountedOnFlush() {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp, 128);
+        setup.handler.add(event(repeat('f', 512), "on", "alloc1", "user-1", 1000L, emptyMap()));
+
+        setup.handler.drainAndAggregate();
+        setup.handler.flush();
+
+        final Collection<? extends MetricCollector.Metric> metrics =
+                CoreMetricCollector.getInstance().drain();
+        assertEquals(
+                1,
+                metricSum(
+                        metrics,
+                        FlagEvaluationWriterImpl.FLAG_EVALUATION_DROPPED_METRIC,
+                        "reason:" + FlagEvaluationWriterImpl.DROP_REASON_PAYLOAD_LIMIT));
+    }
+
+    @Test
+    void finalFlushRunsWithoutTheInterruptFlagSet() throws Exception {
+        // close() interrupts the worker to break it out of poll(). The final flush does socket I/O,
+        // and OkHttp fails fast on an interrupted thread, so the flag must be clear by the time the
+        // publisher is called. A mock publisher ignores the flag, so assert on it directly.
+        final java.util.concurrent.CountDownLatch posted = new java.util.concurrent.CountDownLatch(1);
+        final boolean[] interruptedDuringPost = {true};
+        final BackendApi mockEvp = mock(BackendApi.class);
+        when(mockEvp.post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false)))
+                .thenAnswer(inv -> {
+                    interruptedDuringPost[0] = Thread.currentThread().isInterrupted();
+                    posted.countDown();
+                    return null;
+                });
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
+        final FlagEvaluationWriterImpl writer = new FlagEvaluationWriterImpl(
+                64, TimeUnit.DAYS.toSeconds(1), TimeUnit.SECONDS, backendApiSupplier(factory), cfg());
+
+        writer.startForTest();
+        writer.enqueue(simpleEvent("interrupt-flag", "on"));
+        writer.close();
+
+        assertTrue(posted.await(5, TimeUnit.SECONDS));
+        assertFalse(
+                interruptedDuringPost[0],
+                "final flush must not run on an interrupted thread; OkHttp fails fast and the drained"
+                        + " rows are lost without being counted");
+    }
+
+    @Test
+    void closeDrainsAndFinalFlushesQueuedEvents() throws Exception {
+        final java.util.concurrent.CountDownLatch posted = new java.util.concurrent.CountDownLatch(1);
+        final RequestBody[] captured = {null};
+        final BackendApi mockEvp = mock(BackendApi.class);
+        when(mockEvp.post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false)))
+                .thenAnswer(inv -> {
+                    captured[0] = inv.getArgument(1);
+                    posted.countDown();
+                    return null;
+                });
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
+        final FlagEvaluationWriterImpl writer = new FlagEvaluationWriterImpl(
+                64, TimeUnit.DAYS.toSeconds(1), TimeUnit.SECONDS, backendApiSupplier(factory), cfg());
+
+        writer.startForTest();
+        writer.enqueue(simpleEvent("shutdown-flag", "on"));
+        writer.close();
+
+        assertTrue(posted.await(5, TimeUnit.SECONDS));
+        assertNotNull(captured[0]);
+        final Buffer buf = new Buffer();
+        captured[0].writeTo(buf);
+        final Map<String, Object> json = JSON_MAP.fromJson(buf.readUtf8());
+        assertNotNull(eventForFlag(json, "shutdown-flag"));
+    }
+
+    @Test
+    void continuousTrafficFlushesWithoutWaitingForIdle() throws Exception {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
+        final FlagEvaluationWriterImpl writer =
+                new FlagEvaluationWriterImpl(1 << 12, 1, TimeUnit.MILLISECONDS, backendApiSupplier(factory), cfg());
+
+        writer.startForTest();
+        boolean posted = false;
         try {
-          verify(mockEvp, atLeastOnce())
-              .post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false));
-          posted = true;
-          break;
-        } catch (AssertionError ignored) {
-          // Keep the worker busy until the deadline.
+            final long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(2);
+            while (System.nanoTime() < deadline) {
+                writer.enqueue(simpleEvent("busy-flag", "on"));
+                try {
+                    verify(mockEvp, atLeastOnce())
+                            .post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false));
+                    posted = true;
+                    break;
+                } catch (AssertionError ignored) {
+                    // Keep the worker busy until the deadline.
+                }
+            }
+        } finally {
+            writer.close();
+        }
+
+        assertTrue(posted);
+    }
+
+    @Test
+    void flushPostsToFlagevaluationEndpoint() throws Exception {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
+
+        setup.handler.add(event("flag-f", "on", "alloc1", "user-1", 1000L, emptyMap()));
+        setup.handler.drainAndAggregate();
+        setup.handler.flush();
+
+        verify(setup.factory).createBackendApi(Intake.EVENT_PLATFORM, false);
+        verify(mockEvp).post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false));
+    }
+
+    @Test
+    void splitPostFailureDoesNotRetryAlreadySentPayloads() throws Exception {
+        final int limit = 1_100;
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp, limit);
+        final AtomicInteger posts = new AtomicInteger();
+        doAnswer(invocation -> {
+                    if (posts.incrementAndGet() == 2) {
+                        throw new IOException("boom");
+                    }
+                    return null;
+                })
+                .when(mockEvp)
+                .post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false));
+
+        for (int i = 0; i < 4; i++) {
+            final Map<String, Object> attrs = new HashMap<>();
+            attrs.put("payload", repeat('x', 180));
+            setup.handler.add(event("split-failure-" + i, "on", "alloc1", "user-" + i, 1000L, attrs));
+        }
+
+        setup.handler.drainAndAggregate();
+        setup.handler.flush();
+        assertEquals(2, posts.get());
+        setup.handler.flush();
+        assertEquals(2, posts.get());
+    }
+
+    private static final String HASHED_JANE_DOE =
+            "sha256_b4698f9b6d186781fa8dc59e533578fa2d8379a46b1cf6db85cda6aa9c99e51b";
+
+    @Test
+    void observeFullEvaluationDataTrueEmitsRawTargetingKeyAndContext() throws Exception {
+        // Consent travels on the event (snapshotted by the hook at evaluation time); the writer honours
+        // it verbatim and never consults the gateway.
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
+        setup.handler.add(piiEvent(true));
+
+        final Map<String, Object> json = flushAndCapture(setup).parsed;
+
+        final Map<String, Object> ev = eventForFlag(json, "pii-flag");
+        assertNotNull(ev);
+        assertEquals("jane.doe@datadoghq.com", ev.get("targeting_key"));
+        final Map<?, ?> ctx = (Map<?, ?>) ev.get("context");
+        assertNotNull(ctx);
+        final Map<?, ?> evalAttrs = (Map<?, ?>) ctx.get("evaluation");
+        assertNotNull(evalAttrs);
+        assertEquals("us-east-1", evalAttrs.get("region"));
+    }
+
+    @Test
+    void observeFullEvaluationDataFalseHashesTargetingKeyAndOmitsContext() throws Exception {
+        assertHashedTargetingKeyAndOmittedContext(piiEvent(false));
+    }
+
+    @Test
+    void flagEvalEventDefaultConsentHashesTargetingKeyAndOmitsContext() throws Exception {
+        // An event built without an explicit consent value defaults to the privacy-preserving false, so
+        // it must behave exactly like the explicit "false" case. This is the state the hook produces
+        // when no UFC has been dispatched (the gateway reports false).
+        assertHashedTargetingKeyAndOmittedContext(piiEventDefaultConsent());
+    }
+
+    @Test
+    void eventConsentFalseStaysHashedEvenWhenGatewayLaterReportsTrue() throws Exception {
+        // Regression guard: consent is decided by the value the event carried at evaluation time, never
+        // re-read from the gateway at flush. An event evaluated under consent=false must stay hashed
+        // even if a later RC update turns the gateway's consent on before the flush drains.
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
+        setup.handler.add(piiEvent(false));
+
+        // Flip the gateway's consent on before both aggregation and flush; the event's evaluation-time
+        // snapshot (false) must win at every downstream step, so neither may consult the gateway.
+        dispatchObserveFullEvaluationData(true);
+        setup.handler.drainAndAggregate();
+
+        final java.util.List<RequestBody> captured = new java.util.ArrayList<>();
+        when(mockEvp.post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false)))
+                .thenAnswer(inv -> {
+                    captured.add(inv.getArgument(1));
+                    return null;
+                });
+        setup.handler.flush();
+
+        assertEquals(1, captured.size());
+        final FlagEvaluationTestSupport.CapturedJson json = FlagEvaluationTestSupport.readJson(captured.get(0));
+        final Map<String, Object> ev = eventForFlag(json.parsed, "pii-flag");
+        assertNotNull(ev);
+        assertEquals(HASHED_JANE_DOE, ev.get("targeting_key"));
+        assertFalse(ev.containsKey("context"));
+        assertTrue(json.raw.contains(HASHED_JANE_DOE));
+        assertFalse(json.raw.contains("jane.doe@datadoghq.com"));
+    }
+
+    @Test
+    void eventConsentTrueStaysRawEvenWhenGatewayLaterReportsFalse() throws Exception {
+        // Symmetric guard: an event evaluated under consent=true must stay raw even if a later RC
+        // update
+        // turns the gateway's consent off before aggregation and flush. Together with the false-stays-
+        // hashed test this pins that neither aggregation nor flush ever consults the gateway.
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
+        setup.handler.add(piiEvent(true));
+
+        dispatchObserveFullEvaluationData(false);
+        setup.handler.drainAndAggregate();
+
+        final java.util.List<RequestBody> captured = new java.util.ArrayList<>();
+        when(mockEvp.post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false)))
+                .thenAnswer(inv -> {
+                    captured.add(inv.getArgument(1));
+                    return null;
+                });
+        setup.handler.flush();
+
+        assertEquals(1, captured.size());
+        final Map<String, Object> ev =
+                eventForFlag(FlagEvaluationTestSupport.readJson(captured.get(0)).parsed, "pii-flag");
+        assertNotNull(ev);
+        assertEquals("jane.doe@datadoghq.com", ev.get("targeting_key"));
+        final Map<?, ?> ctx = (Map<?, ?>) ev.get("context");
+        assertNotNull(ctx);
+        assertNotNull(ctx.get("evaluation"));
+    }
+
+    @Test
+    void consentOffPreservesErrorCodeSignalAndNeverLeaksPiiInErrorMessage() throws Exception {
+        // Upstream contract: the hook substitutes the ErrorCode name for the raw exception message
+        // under consent-off (see
+        // FlagEvalLoggingHookTest#errorMessageReplacedByErrorCodeUnderConsentOff).
+        // This wire-level guard pins that a properly-formed consent-off event (a) still surfaces the
+        // stable ErrorCode signal for operators and (b) never lets a PII-shaped string escape onto the
+        // wire. Mirrors the existing PII guards on the targeting_key axis.
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
+        setup.handler.add(new FlagEvalEvent(
+                "err-flag", null, "alloc1", "jane.doe@datadoghq.com", "TYPE_MISMATCH", 1000L, false, emptyMap()));
+
+        final FlagEvaluationTestSupport.CapturedJson captured = flushAndCapture(setup);
+
+        final Map<String, Object> ev = eventForFlag(captured.parsed, "err-flag");
+        assertNotNull(ev);
+        final Map<?, ?> error = (Map<?, ?>) ev.get("error");
+        assertNotNull(error, "error object must be present so operators keep the ErrorCode signal");
+        assertEquals("TYPE_MISMATCH", error.get("message"));
+        assertEquals(HASHED_JANE_DOE, ev.get("targeting_key"));
+        assertFalse(captured.raw.contains("jane.doe@datadoghq.com"));
+        assertFalse(
+                captured.raw.contains("For input string"),
+                "no exception-message-shaped text may reach the wire under consent-off");
+    }
+
+    @Test
+    void encodeFailureClearsAggregatorSoLaterFlushesRecover() throws Exception {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
+
+        // Moshi rejects non-finite JSON numbers. A NaN in the context poisons buildPayloads for this
+        // bucket. Before the fix, the aggregator kept the bucket and every later flush re-threw.
+        final Map<String, Object> poison = new HashMap<>();
+        poison.put("bad-number", Double.NaN);
+        setup.handler.add(event("poison-flag", "on", "alloc1", "user-1", 1000L, true, poison));
+        setup.handler.drainAndAggregate();
+        setup.handler.flush();
+        verify(mockEvp, org.mockito.Mockito.never())
+                .post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false));
+
+        // The bucket must not survive the failed flush. A follow-up healthy event flushes cleanly.
+        setup.handler.add(simpleEvent("healthy-flag", "on"));
+        setup.handler.drainAndAggregate();
+        setup.handler.flush();
+        verify(mockEvp).post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false));
+    }
+
+    @Test
+    void scoConstructorCreatesUsableWriter() {
+        final FlagEvaluationWriterImpl writer = new FlagEvaluationWriterImpl(new SharedCommunicationObjects(), cfg());
+        writer.enqueue(simpleEvent("sco-flag", "on"));
+        assertNotNull(writer.pollQueuedEventForTest());
+        writer.close();
+    }
+
+    @Test
+    void agentlessWritesFlagEvaluationsDirectlyWhenLocalProxyIsUnavailable() throws Exception {
+        try (JavaTestHttpServer server = JavaTestHttpServer.httpServer(s -> s.handlers(h -> h.prefix(
+                DIRECT_FLAG_EVALUATION_ENDPOINT,
+                api -> api.getResponse().status(200).send("OK"))))) {
+            final Config config = cfg();
+            when(config.getFeatureFlaggingConfigurationSource()).thenReturn(CONFIGURATION_SOURCE_AGENTLESS);
+            when(config.getApiKey()).thenReturn(API_KEY);
+            final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
+            final OkHttpClient client = new OkHttpClient.Builder().build();
+            try {
+                final IntakeApi directApi = new IntakeApi(
+                        HttpUrl.get(server.getAddress()).resolve("/api/v2/"),
+                        API_KEY,
+                        "123",
+                        HttpRetryPolicy.Factory.NEVER_RETRY,
+                        client,
+                        false);
+                when(backendApiFactory.createDirectIntakeApi(eq(Intake.EVENT_PLATFORM), eq(false), eq(false)))
+                        .thenReturn(directApi);
+                final FeatureFlagBackendApiFactory featureFlagBackendApiFactory = new FeatureFlagBackendApiFactory(
+                        config, backendApiFactory, FeatureFlagEventType.FLAG_EVALUATION);
+                final PollingConditions poll = new PollingConditions(TIMEOUT_SECONDS);
+
+                try (FlagEvaluationWriterImpl writer = new FlagEvaluationWriterImpl(
+                        16, 1, TimeUnit.MILLISECONDS, featureFlagBackendApiFactory::create, config)) {
+                    writer.startForTest();
+                    writer.enqueue(simpleEvent("direct-flag", "on"));
+
+                    poll.eventually(() -> {
+                        assertNotNull(server.getLastRequest());
+                        assertEquals(
+                                DIRECT_FLAG_EVALUATION_ENDPOINT,
+                                server.getLastRequest().getPath());
+                        assertEquals(API_KEY, server.getLastRequest().getHeader("dd-api-key"));
+                        assertNull(server.getLastRequest().getHeader("X-Datadog-EVP-Subdomain"));
+                        assertTrue(server.getLastRequest().getBody().length > 0);
+                    });
+                }
+            } finally {
+                client.dispatcher().executorService().shutdownNow();
+                client.connectionPool().evictAll();
+            }
         }
-      }
-    } finally {
-      writer.close();
-    }
-
-    assertTrue(posted);
-  }
-
-  @Test
-  void flushPostsToFlagevaluationEndpoint() throws Exception {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
-
-    setup.handler.add(event("flag-f", "on", "alloc1", "user-1", 1000L, emptyMap()));
-    setup.handler.drainAndAggregate();
-    setup.handler.flush();
-
-    verify(setup.factory).createBackendApi(Intake.EVENT_PLATFORM, false);
-    verify(mockEvp).post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false));
-  }
-
-  @Test
-  void splitPostFailureDoesNotRetryAlreadySentPayloads() throws Exception {
-    final int limit = 1_100;
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp, limit);
-    final AtomicInteger posts = new AtomicInteger();
-    doAnswer(
-            invocation -> {
-              if (posts.incrementAndGet() == 2) {
-                throw new IOException("boom");
-              }
-              return null;
-            })
-        .when(mockEvp)
-        .post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false));
-
-    for (int i = 0; i < 4; i++) {
-      final Map<String, Object> attrs = new HashMap<>();
-      attrs.put("payload", repeat('x', 180));
-      setup.handler.add(event("split-failure-" + i, "on", "alloc1", "user-" + i, 1000L, attrs));
-    }
-
-    setup.handler.drainAndAggregate();
-    setup.handler.flush();
-    assertEquals(2, posts.get());
-    setup.handler.flush();
-    assertEquals(2, posts.get());
-  }
-
-  private static final String HASHED_JANE_DOE =
-      "sha256_b4698f9b6d186781fa8dc59e533578fa2d8379a46b1cf6db85cda6aa9c99e51b";
-
-  @Test
-  void observeFullEvaluationDataTrueEmitsRawTargetingKeyAndContext() throws Exception {
-    // Consent travels on the event (snapshotted by the hook at evaluation time); the writer honours
-    // it verbatim and never consults the gateway.
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
-    setup.handler.add(piiEvent(true));
-
-    final Map<String, Object> json = flushAndCapture(setup).parsed;
-
-    final Map<String, Object> ev = eventForFlag(json, "pii-flag");
-    assertNotNull(ev);
-    assertEquals("jane.doe@datadoghq.com", ev.get("targeting_key"));
-    final Map<?, ?> ctx = (Map<?, ?>) ev.get("context");
-    assertNotNull(ctx);
-    final Map<?, ?> evalAttrs = (Map<?, ?>) ctx.get("evaluation");
-    assertNotNull(evalAttrs);
-    assertEquals("us-east-1", evalAttrs.get("region"));
-  }
-
-  @Test
-  void observeFullEvaluationDataFalseHashesTargetingKeyAndOmitsContext() throws Exception {
-    assertHashedTargetingKeyAndOmittedContext(piiEvent(false));
-  }
-
-  @Test
-  void flagEvalEventDefaultConsentHashesTargetingKeyAndOmitsContext() throws Exception {
-    // An event built without an explicit consent value defaults to the privacy-preserving false, so
-    // it must behave exactly like the explicit "false" case. This is the state the hook produces
-    // when no UFC has been dispatched (the gateway reports false).
-    assertHashedTargetingKeyAndOmittedContext(piiEventDefaultConsent());
-  }
-
-  @Test
-  void eventConsentFalseStaysHashedEvenWhenGatewayLaterReportsTrue() throws Exception {
-    // Regression guard: consent is decided by the value the event carried at evaluation time, never
-    // re-read from the gateway at flush. An event evaluated under consent=false must stay hashed
-    // even if a later RC update turns the gateway's consent on before the flush drains.
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
-    setup.handler.add(piiEvent(false));
-
-    // Flip the gateway's consent on before both aggregation and flush; the event's evaluation-time
-    // snapshot (false) must win at every downstream step, so neither may consult the gateway.
-    dispatchObserveFullEvaluationData(true);
-    setup.handler.drainAndAggregate();
-
-    final java.util.List<RequestBody> captured = new java.util.ArrayList<>();
-    when(mockEvp.post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false)))
-        .thenAnswer(
-            inv -> {
-              captured.add(inv.getArgument(1));
-              return null;
-            });
-    setup.handler.flush();
-
-    assertEquals(1, captured.size());
-    final FlagEvaluationTestSupport.CapturedJson json =
-        FlagEvaluationTestSupport.readJson(captured.get(0));
-    final Map<String, Object> ev = eventForFlag(json.parsed, "pii-flag");
-    assertNotNull(ev);
-    assertEquals(HASHED_JANE_DOE, ev.get("targeting_key"));
-    assertFalse(ev.containsKey("context"));
-    assertTrue(json.raw.contains(HASHED_JANE_DOE));
-    assertFalse(json.raw.contains("jane.doe@datadoghq.com"));
-  }
-
-  @Test
-  void eventConsentTrueStaysRawEvenWhenGatewayLaterReportsFalse() throws Exception {
-    // Symmetric guard: an event evaluated under consent=true must stay raw even if a later RC
-    // update
-    // turns the gateway's consent off before aggregation and flush. Together with the false-stays-
-    // hashed test this pins that neither aggregation nor flush ever consults the gateway.
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
-    setup.handler.add(piiEvent(true));
-
-    dispatchObserveFullEvaluationData(false);
-    setup.handler.drainAndAggregate();
-
-    final java.util.List<RequestBody> captured = new java.util.ArrayList<>();
-    when(mockEvp.post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false)))
-        .thenAnswer(
-            inv -> {
-              captured.add(inv.getArgument(1));
-              return null;
-            });
-    setup.handler.flush();
-
-    assertEquals(1, captured.size());
-    final Map<String, Object> ev =
-        eventForFlag(FlagEvaluationTestSupport.readJson(captured.get(0)).parsed, "pii-flag");
-    assertNotNull(ev);
-    assertEquals("jane.doe@datadoghq.com", ev.get("targeting_key"));
-    final Map<?, ?> ctx = (Map<?, ?>) ev.get("context");
-    assertNotNull(ctx);
-    assertNotNull(ctx.get("evaluation"));
-  }
-
-  @Test
-  void consentOffPreservesErrorCodeSignalAndNeverLeaksPiiInErrorMessage() throws Exception {
-    // Upstream contract: the hook substitutes the ErrorCode name for the raw exception message
-    // under consent-off (see
-    // FlagEvalLoggingHookTest#errorMessageReplacedByErrorCodeUnderConsentOff).
-    // This wire-level guard pins that a properly-formed consent-off event (a) still surfaces the
-    // stable ErrorCode signal for operators and (b) never lets a PII-shaped string escape onto the
-    // wire. Mirrors the existing PII guards on the targeting_key axis.
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
-    setup.handler.add(
-        new FlagEvalEvent(
-            "err-flag",
-            null,
-            "alloc1",
-            "jane.doe@datadoghq.com",
-            "TYPE_MISMATCH",
-            1000L,
-            false,
-            emptyMap()));
-
-    final FlagEvaluationTestSupport.CapturedJson captured = flushAndCapture(setup);
-
-    final Map<String, Object> ev = eventForFlag(captured.parsed, "err-flag");
-    assertNotNull(ev);
-    final Map<?, ?> error = (Map<?, ?>) ev.get("error");
-    assertNotNull(error, "error object must be present so operators keep the ErrorCode signal");
-    assertEquals("TYPE_MISMATCH", error.get("message"));
-    assertEquals(HASHED_JANE_DOE, ev.get("targeting_key"));
-    assertFalse(captured.raw.contains("jane.doe@datadoghq.com"));
-    assertFalse(
-        captured.raw.contains("For input string"),
-        "no exception-message-shaped text may reach the wire under consent-off");
-  }
-
-  @Test
-  void encodeFailureClearsAggregatorSoLaterFlushesRecover() throws Exception {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
-
-    // Moshi rejects non-finite JSON numbers. A NaN in the context poisons buildPayloads for this
-    // bucket. Before the fix, the aggregator kept the bucket and every later flush re-threw.
-    final Map<String, Object> poison = new HashMap<>();
-    poison.put("bad-number", Double.NaN);
-    setup.handler.add(event("poison-flag", "on", "alloc1", "user-1", 1000L, true, poison));
-    setup.handler.drainAndAggregate();
-    setup.handler.flush();
-    verify(mockEvp, org.mockito.Mockito.never())
-        .post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false));
-
-    // The bucket must not survive the failed flush. A follow-up healthy event flushes cleanly.
-    setup.handler.add(simpleEvent("healthy-flag", "on"));
-    setup.handler.drainAndAggregate();
-    setup.handler.flush();
-    verify(mockEvp).post(eq("flagevaluation"), any(RequestBody.class), any(), any(), eq(false));
-  }
-
-  @Test
-  void scoConstructorCreatesUsableWriter() {
-    final FlagEvaluationWriterImpl writer =
-        new FlagEvaluationWriterImpl(new SharedCommunicationObjects(), cfg());
-    writer.enqueue(simpleEvent("sco-flag", "on"));
-    assertNotNull(writer.pollQueuedEventForTest());
-    writer.close();
-  }
-
-  @Test
-  void agentlessWritesFlagEvaluationsDirectlyWhenLocalProxyIsUnavailable() throws Exception {
-    try (JavaTestHttpServer server =
-        JavaTestHttpServer.httpServer(
-            s ->
-                s.handlers(
-                    h ->
-                        h.prefix(
-                            DIRECT_FLAG_EVALUATION_ENDPOINT,
-                            api -> api.getResponse().status(200).send("OK"))))) {
-      final Config config = cfg();
-      when(config.getFeatureFlaggingConfigurationSource())
-          .thenReturn(CONFIGURATION_SOURCE_AGENTLESS);
-      when(config.getApiKey()).thenReturn(API_KEY);
-      final BackendApiFactory backendApiFactory = mock(BackendApiFactory.class);
-      final OkHttpClient client = new OkHttpClient.Builder().build();
-      try {
-        final IntakeApi directApi =
-            new IntakeApi(
-                HttpUrl.get(server.getAddress()).resolve("/api/v2/"),
-                API_KEY,
-                "123",
-                HttpRetryPolicy.Factory.NEVER_RETRY,
-                client,
-                false);
-        when(backendApiFactory.createDirectIntakeApi(
-                eq(Intake.EVENT_PLATFORM), eq(false), eq(false)))
-            .thenReturn(directApi);
-        final FeatureFlagBackendApiFactory featureFlagBackendApiFactory =
-            new FeatureFlagBackendApiFactory(
-                config, backendApiFactory, FeatureFlagEventType.FLAG_EVALUATION);
-        final PollingConditions poll = new PollingConditions(TIMEOUT_SECONDS);
-
-        try (FlagEvaluationWriterImpl writer =
-            new FlagEvaluationWriterImpl(
-                16, 1, TimeUnit.MILLISECONDS, featureFlagBackendApiFactory::create, config)) {
-          writer.startForTest();
-          writer.enqueue(simpleEvent("direct-flag", "on"));
-
-          poll.eventually(
-              () -> {
-                assertNotNull(server.getLastRequest());
-                assertEquals(DIRECT_FLAG_EVALUATION_ENDPOINT, server.getLastRequest().getPath());
-                assertEquals(API_KEY, server.getLastRequest().getHeader("dd-api-key"));
-                assertNull(server.getLastRequest().getHeader("X-Datadog-EVP-Subdomain"));
-                assertTrue(server.getLastRequest().getBody().length > 0);
-              });
+    }
+
+    @Test
+    void countContextTruncatedAccumulatesPerReason() {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
+        final FlagEvaluationWriterImpl writer = new FlagEvaluationWriterImpl(
+                16, Long.MAX_VALUE, TimeUnit.NANOSECONDS, backendApiSupplier(factory), cfg());
+
+        writer.countContextTruncated("field_count");
+        writer.countContextTruncated("field_count");
+        writer.countContextTruncated("field_length");
+        writer.flushForTest();
+
+        final Collection<? extends MetricCollector.Metric> metrics =
+                CoreMetricCollector.getInstance().drain();
+        assertEquals(
+                2,
+                metricSum(
+                        metrics,
+                        FlagEvaluationWriterImpl.FLAG_EVALUATION_CONTEXT_TRUNCATED_METRIC,
+                        "reason:field_count"));
+        assertEquals(
+                1,
+                metricSum(
+                        metrics,
+                        FlagEvaluationWriterImpl.FLAG_EVALUATION_CONTEXT_TRUNCATED_METRIC,
+                        "reason:field_length"));
+    }
+
+    @Test
+    void hasCapacityForEnqueueReflectsQueueSaturationAndCountsPreQueueOverflow() {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final BackendApiFactory factory = mock(BackendApiFactory.class);
+        when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
+        final int capacity = 2;
+        final FlagEvaluationWriterImpl writer = new FlagEvaluationWriterImpl(
+                capacity, Long.MAX_VALUE, TimeUnit.NANOSECONDS, backendApiSupplier(factory), cfg());
+
+        assertTrue(writer.hasCapacityForEnqueue());
+
+        // Saturate the hand-off queue without starting the worker so no drain can free slots.
+        for (int i = 0; i < capacity; i++) {
+            writer.enqueue(simpleEvent("cap-flag-" + i, "on"));
         }
-      } finally {
-        client.dispatcher().executorService().shutdownNow();
-        client.connectionPool().evictAll();
-      }
-    }
-  }
-
-  @Test
-  void countContextTruncatedAccumulatesPerReason() {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
-    final FlagEvaluationWriterImpl writer =
-        new FlagEvaluationWriterImpl(
-            16, Long.MAX_VALUE, TimeUnit.NANOSECONDS, backendApiSupplier(factory), cfg());
-
-    writer.countContextTruncated("field_count");
-    writer.countContextTruncated("field_count");
-    writer.countContextTruncated("field_length");
-    writer.flushForTest();
-
-    final Collection<? extends MetricCollector.Metric> metrics =
-        CoreMetricCollector.getInstance().drain();
-    assertEquals(
-        2,
-        metricSum(
-            metrics,
-            FlagEvaluationWriterImpl.FLAG_EVALUATION_CONTEXT_TRUNCATED_METRIC,
-            "reason:field_count"));
-    assertEquals(
-        1,
-        metricSum(
-            metrics,
-            FlagEvaluationWriterImpl.FLAG_EVALUATION_CONTEXT_TRUNCATED_METRIC,
-            "reason:field_length"));
-  }
-
-  @Test
-  void hasCapacityForEnqueueReflectsQueueSaturationAndCountsPreQueueOverflow() {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final BackendApiFactory factory = mock(BackendApiFactory.class);
-    when(factory.createBackendApi(any(), anyBoolean())).thenReturn(mockEvp);
-    final int capacity = 2;
-    final FlagEvaluationWriterImpl writer =
-        new FlagEvaluationWriterImpl(
-            capacity, Long.MAX_VALUE, TimeUnit.NANOSECONDS, backendApiSupplier(factory), cfg());
-
-    assertTrue(writer.hasCapacityForEnqueue());
-
-    // Saturate the hand-off queue without starting the worker so no drain can free slots.
-    for (int i = 0; i < capacity; i++) {
-      writer.enqueue(simpleEvent("cap-flag-" + i, "on"));
-    }
-    assertFalse(writer.hasCapacityForEnqueue());
-
-    // Simulate a pre-queue overflow account by the hook and surface it on flush.
-    writer.countPreQueueOverflow();
-    writer.flushForTest();
-
-    final Collection<? extends MetricCollector.Metric> metrics =
-        CoreMetricCollector.getInstance().drain();
-    assertEquals(
-        1,
-        metricSum(
-            metrics,
-            FlagEvaluationWriterImpl.FLAG_EVALUATION_DROPPED_METRIC,
-            "reason:" + FlagEvaluationWriterImpl.DROP_REASON_QUEUE_OVERFLOW));
-
-    writer.close();
-  }
-
-  private void assertHashedTargetingKeyAndOmittedContext(final FlagEvalEvent piiEvent)
-      throws Exception {
-    final BackendApi mockEvp = mock(BackendApi.class);
-    final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
-    setup.handler.add(piiEvent);
-
-    final FlagEvaluationTestSupport.CapturedJson captured = flushAndCapture(setup);
-
-    final Map<String, Object> ev = eventForFlag(captured.parsed, "pii-flag");
-    assertNotNull(ev);
-    assertEquals(HASHED_JANE_DOE, ev.get("targeting_key"));
-    assertFalse(ev.containsKey("context"));
-    // The raw wire bytes must carry the hashed key and never leak the raw PII value or a per-event
-    // evaluation context (the batch envelope owns the top-level "context" key, so guard on the
-    // nested "evaluation" field instead).
-    assertTrue(captured.raw.contains(HASHED_JANE_DOE));
-    assertFalse(captured.raw.contains("jane.doe@datadoghq.com"));
-    assertFalse(captured.raw.contains("\"evaluation\":"));
-  }
-
-  private static FlagEvalEvent piiEvent(final boolean observeFullEvaluationData) {
-    return event(
-        "pii-flag",
-        "on",
-        "alloc1",
-        "jane.doe@datadoghq.com",
-        1000L,
-        observeFullEvaluationData,
-        piiAttrs());
-  }
-
-  private static FlagEvalEvent piiEventDefaultConsent() {
-    return event("pii-flag", "on", "alloc1", "jane.doe@datadoghq.com", 1000L, piiAttrs());
-  }
-
-  private static Map<String, Object> piiAttrs() {
-    final Map<String, Object> attrs = new HashMap<>();
-    attrs.put("region", "us-east-1");
-    return attrs;
-  }
-
-  private static void dispatchObserveFullEvaluationData(final boolean value) {
-    FeatureFlaggingGateway.dispatch(
-        new ServerConfiguration(
-            "2024-04-17T19:40:53.716Z", "SERVER", value, null, java.util.Collections.emptyMap()));
-  }
-
-  private static Object lifecycleLock(final FlagEvaluationWriterImpl writer) throws Exception {
-    final Field field = FlagEvaluationWriterImpl.class.getDeclaredField("lifecycleLock");
-    field.setAccessible(true);
-    return field.get(writer);
-  }
-
-  private static void awaitThreadState(final Thread thread, final Thread.State state)
-      throws InterruptedException {
-    final long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(5);
-    while (thread.getState() != state && System.nanoTime() < deadline) {
-      Thread.sleep(10);
-    }
-    assertEquals(state, thread.getState());
-  }
-
-  private static Map<String, String> context() {
-    final Map<String, String> context = new HashMap<>();
-    context.put("service", "test-service");
-    return context;
-  }
+        assertFalse(writer.hasCapacityForEnqueue());
+
+        // Simulate a pre-queue overflow account by the hook and surface it on flush.
+        writer.countPreQueueOverflow();
+        writer.flushForTest();
+
+        final Collection<? extends MetricCollector.Metric> metrics =
+                CoreMetricCollector.getInstance().drain();
+        assertEquals(
+                1,
+                metricSum(
+                        metrics,
+                        FlagEvaluationWriterImpl.FLAG_EVALUATION_DROPPED_METRIC,
+                        "reason:" + FlagEvaluationWriterImpl.DROP_REASON_QUEUE_OVERFLOW));
+
+        writer.close();
+    }
+
+    private void assertHashedTargetingKeyAndOmittedContext(final FlagEvalEvent piiEvent) throws Exception {
+        final BackendApi mockEvp = mock(BackendApi.class);
+        final FlagEvaluationTestSupport.TestWriterSetup setup = buildTestWriter(mockEvp);
+        setup.handler.add(piiEvent);
+
+        final FlagEvaluationTestSupport.CapturedJson captured = flushAndCapture(setup);
+
+        final Map<String, Object> ev = eventForFlag(captured.parsed, "pii-flag");
+        assertNotNull(ev);
+        assertEquals(HASHED_JANE_DOE, ev.get("targeting_key"));
+        assertFalse(ev.containsKey("context"));
+        // The raw wire bytes must carry the hashed key and never leak the raw PII value or a per-event
+        // evaluation context (the batch envelope owns the top-level "context" key, so guard on the
+        // nested "evaluation" field instead).
+        assertTrue(captured.raw.contains(HASHED_JANE_DOE));
+        assertFalse(captured.raw.contains("jane.doe@datadoghq.com"));
+        assertFalse(captured.raw.contains("\"evaluation\":"));
+    }
+
+    private static FlagEvalEvent piiEvent(final boolean observeFullEvaluationData) {
+        return event(
+                "pii-flag", "on", "alloc1", "jane.doe@datadoghq.com", 1000L, observeFullEvaluationData, piiAttrs());
+    }
+
+    private static FlagEvalEvent piiEventDefaultConsent() {
+        return event("pii-flag", "on", "alloc1", "jane.doe@datadoghq.com", 1000L, piiAttrs());
+    }
+
+    private static Map<String, Object> piiAttrs() {
+        final Map<String, Object> attrs = new HashMap<>();
+        attrs.put("region", "us-east-1");
+        return attrs;
+    }
+
+    private static void dispatchObserveFullEvaluationData(final boolean value) {
+        FeatureFlaggingGateway.dispatch(new ServerConfiguration(
+                "2024-04-17T19:40:53.716Z", "SERVER", value, null, java.util.Collections.emptyMap()));
+    }
+
+    private static Object lifecycleLock(final FlagEvaluationWriterImpl writer) throws Exception {
+        final Field field = FlagEvaluationWriterImpl.class.getDeclaredField("lifecycleLock");
+        field.setAccessible(true);
+        return field.get(writer);
+    }
+
+    private static void awaitThreadState(final Thread thread, final Thread.State state) throws InterruptedException {
+        final long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(5);
+        while (thread.getState() != state && System.nanoTime() < deadline) {
+            Thread.sleep(10);
+        }
+        assertEquals(state, thread.getState());
+    }
+
+    private static Map<String, String> context() {
+        final Map<String, String> context = new HashMap<>();
+        context.put("service", "test-service");
+        return context;
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/JsonApiUfcResponseParserTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/JsonApiUfcResponseParserTest.java
index fae2631ce2f..688f30cb161 100644
--- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/JsonApiUfcResponseParserTest.java
+++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/JsonApiUfcResponseParserTest.java
@@ -24,11 +24,9 @@
 
 class JsonApiUfcResponseParserTest {
 
-  @Test
-  void parsesJsonApiMembersInAnyOrder() throws Exception {
-    final ServerConfiguration configuration =
-        parse(
-            "{"
+    @Test
+    void parsesJsonApiMembersInAnyOrder() throws Exception {
+        final ServerConfiguration configuration = parse("{"
                 + "\"meta\":{\"ignored\":true},"
                 + "\"data\":{"
                 + "\"attributes\":"
@@ -38,426 +36,390 @@ void parsesJsonApiMembersInAnyOrder() throws Exception {
                 + "}"
                 + "}");
 
-    assertNotNull(configuration);
-    assertEquals("Test", configuration.environment.name);
-    assertTrue(configuration.flags.isEmpty());
-  }
-
-  @Test
-  void rejectsRawUfc() throws Exception {
-    assertNull(parse(emptyConfig()));
-  }
-
-  @Test
-  void rejectsUnexpectedJsonApiType() throws Exception {
-    assertNull(parse("{\"data\":{\"type\":\"other-type\",\"attributes\":" + emptyConfig() + "}}"));
-  }
-
-  @Test
-  void rejectsNonStringJsonApiType() throws Exception {
-    assertNull(parse("{\"data\":{\"type\":null,\"attributes\":" + emptyConfig() + "}}"));
-  }
-
-  @Test
-  void rejectsConfigurationWithoutFlags() throws Exception {
-    assertNull(
-        parse(
-            "{\"data\":{"
+        assertNotNull(configuration);
+        assertEquals("Test", configuration.environment.name);
+        assertTrue(configuration.flags.isEmpty());
+    }
+
+    @Test
+    void rejectsRawUfc() throws Exception {
+        assertNull(parse(emptyConfig()));
+    }
+
+    @Test
+    void rejectsUnexpectedJsonApiType() throws Exception {
+        assertNull(parse("{\"data\":{\"type\":\"other-type\",\"attributes\":" + emptyConfig() + "}}"));
+    }
+
+    @Test
+    void rejectsNonStringJsonApiType() throws Exception {
+        assertNull(parse("{\"data\":{\"type\":null,\"attributes\":" + emptyConfig() + "}}"));
+    }
+
+    @Test
+    void rejectsConfigurationWithoutFlags() throws Exception {
+        assertNull(parse("{\"data\":{"
                 + "\"type\":\"universal-flag-configuration\","
                 + "\"attributes\":{\"environment\":{\"name\":\"Test\"}}"
                 + "}}"));
-  }
-
-  @Test
-  void rejectsNonObjectData() throws Exception {
-    assertNull(parse("{\"data\":[]}"));
-  }
-
-  @Test
-  void rejectsTrailingJson() {
-    assertThrows(
-        IOException.class,
-        () ->
-            parse(
-                "{\"data\":{\"type\":\"universal-flag-configuration\",\"attributes\":"
-                    + emptyConfig()
-                    + "}}{}"));
-  }
-
-  @Test
-  void preprocessesSemverComparandsAndDropsMalformedFlags() throws Exception {
-    final ServerConfiguration configuration =
-        parse(
-            wrap(
-                configWithFlags(
-                    booleanFlag("no-allocations", ""),
-                    booleanFlag(
-                        "no-splits", ",\"allocations\":[{\"key\":\"no-splits\",\"rules\":[]}]"),
-                    booleanFlag(
-                        "null-split",
-                        ",\"allocations\":[{\"key\":\"null-split\",\"rules\":[],\"splits\":[null]}]"),
-                    booleanFlag("no-rules", allocation("no-rules", "")),
-                    booleanFlag("no-conditions", allocation("no-conditions", "[{}]")),
-                    booleanFlag(
-                        "no-operator", allocation("no-operator", "[{\"conditions\":[{}]}]")),
-                    booleanFlag(
+    }
+
+    @Test
+    void rejectsNonObjectData() throws Exception {
+        assertNull(parse("{\"data\":[]}"));
+    }
+
+    @Test
+    void rejectsTrailingJson() {
+        assertThrows(
+                IOException.class,
+                () -> parse("{\"data\":{\"type\":\"universal-flag-configuration\",\"attributes\":"
+                        + emptyConfig()
+                        + "}}{}"));
+    }
+
+    @Test
+    void preprocessesSemverComparandsAndDropsMalformedFlags() throws Exception {
+        final ServerConfiguration configuration = parse(wrap(configWithFlags(
+                booleanFlag("no-allocations", ""),
+                booleanFlag("no-splits", ",\"allocations\":[{\"key\":\"no-splits\",\"rules\":[]}]"),
+                booleanFlag("null-split", ",\"allocations\":[{\"key\":\"null-split\",\"rules\":[],\"splits\":[null]}]"),
+                booleanFlag("no-rules", allocation("no-rules", "")),
+                booleanFlag("no-conditions", allocation("no-conditions", "[{}]")),
+                booleanFlag("no-operator", allocation("no-operator", "[{\"conditions\":[{}]}]")),
+                booleanFlag(
                         "non-semver",
                         allocation(
-                            "non-semver",
-                            "[{\"conditions\":[{\"attribute\":\"version\",\"operator\":\"MATCHES\",\"value\":\"1\"}]}]")),
-                    booleanFlag(
+                                "non-semver",
+                                "[{\"conditions\":[{\"attribute\":\"version\",\"operator\":\"MATCHES\",\"value\":\"1\"}]}]")),
+                booleanFlag(
                         "valid-semver",
                         allocation(
-                            "valid-semver",
-                            "[{\"conditions\":[{\"attribute\":\"version\",\"operator\":\"SEMVER_EQ\",\"value\":\"1.2\"}]}]")),
-                    booleanFlag(
+                                "valid-semver",
+                                "[{\"conditions\":[{\"attribute\":\"version\",\"operator\":\"SEMVER_EQ\",\"value\":\"1.2\"}]}]")),
+                booleanFlag(
                         "invalid-semver",
                         allocation(
-                            "invalid-semver",
-                            "[{\"conditions\":[{\"attribute\":\"version\",\"operator\":\"SEMVER_EQ\",\"value\":\"1.02\"}]}]")),
-                    booleanFlag(
+                                "invalid-semver",
+                                "[{\"conditions\":[{\"attribute\":\"version\",\"operator\":\"SEMVER_EQ\",\"value\":\"1.02\"}]}]")),
+                booleanFlag(
                         "non-string-semver",
                         allocation(
-                            "non-string-semver",
-                            "[{\"conditions\":[{\"attribute\":\"version\",\"operator\":\"SEMVER_EQ\",\"value\":1}]}]")),
-                    "\"null-flag\":null")));
-
-    assertNotNull(configuration);
-    assertTrue(configuration.flags.containsKey("no-allocations"));
-    assertTrue(configuration.flags.containsKey("no-splits"));
-    assertTrue(configuration.flags.containsKey("null-split"));
-    assertTrue(configuration.flags.containsKey("no-rules"));
-    assertTrue(configuration.flags.containsKey("no-conditions"));
-    assertTrue(configuration.flags.containsKey("no-operator"));
-    assertTrue(configuration.flags.containsKey("non-semver"));
-    assertTrue(configuration.flags.containsKey("valid-semver"));
-    assertFalse(configuration.flags.containsKey("invalid-semver"));
-    assertFalse(configuration.flags.containsKey("non-string-semver"));
-    assertFalse(configuration.flags.containsKey("null-flag"));
-    assertEquals(2, configuration.invalidFlags.size());
-    assertEquals("invalid_semver_comparand", configuration.invalidFlags.get("invalid-semver"));
-    assertEquals("invalid_semver_comparand", configuration.invalidFlags.get("non-string-semver"));
-
-    assertNotNull(
-        configuration
-            .flags
-            .get("valid-semver")
-            .allocations
-            .get(0)
-            .rules
-            .get(0)
-            .conditions
-            .get(0)
-            .semverComparand);
-  }
-
-  @Test
-  void dropsFlagWithMalformedAllocationsWithoutRejectingConfig() throws Exception {
-    final ServerConfiguration configuration =
-        parse(
-            wrap(
-                configWithFlags(
-                    booleanFlag("malformed-allocations", ",\"allocations\":\"not-a-list\""),
-                    booleanFlag("valid-sibling", ""))));
-
-    assertNotNull(configuration);
-    assertFalse(configuration.flags.containsKey("malformed-allocations"));
-    assertTrue(configuration.flags.containsKey("valid-sibling"));
-    assertEquals("invalid_flag", configuration.invalidFlags.get("malformed-allocations"));
-  }
-
-  @Test
-  void dropsFlagWithMissingSplitShards() throws Exception {
-    final ServerConfiguration configuration =
-        parse(
-            wrap(
-                configWithFlags(
-                    booleanFlag(
+                                "non-string-semver",
+                                "[{\"conditions\":[{\"attribute\":\"version\",\"operator\":\"SEMVER_EQ\",\"value\":1}]}]")),
+                "\"null-flag\":null")));
+
+        assertNotNull(configuration);
+        assertTrue(configuration.flags.containsKey("no-allocations"));
+        assertTrue(configuration.flags.containsKey("no-splits"));
+        assertTrue(configuration.flags.containsKey("null-split"));
+        assertTrue(configuration.flags.containsKey("no-rules"));
+        assertTrue(configuration.flags.containsKey("no-conditions"));
+        assertTrue(configuration.flags.containsKey("no-operator"));
+        assertTrue(configuration.flags.containsKey("non-semver"));
+        assertTrue(configuration.flags.containsKey("valid-semver"));
+        assertFalse(configuration.flags.containsKey("invalid-semver"));
+        assertFalse(configuration.flags.containsKey("non-string-semver"));
+        assertFalse(configuration.flags.containsKey("null-flag"));
+        assertEquals(2, configuration.invalidFlags.size());
+        assertEquals("invalid_semver_comparand", configuration.invalidFlags.get("invalid-semver"));
+        assertEquals("invalid_semver_comparand", configuration.invalidFlags.get("non-string-semver"));
+
+        assertNotNull(configuration
+                .flags
+                .get("valid-semver")
+                .allocations
+                .get(0)
+                .rules
+                .get(0)
+                .conditions
+                .get(0)
+                .semverComparand);
+    }
+
+    @Test
+    void dropsFlagWithMalformedAllocationsWithoutRejectingConfig() throws Exception {
+        final ServerConfiguration configuration = parse(wrap(configWithFlags(
+                booleanFlag("malformed-allocations", ",\"allocations\":\"not-a-list\""),
+                booleanFlag("valid-sibling", ""))));
+
+        assertNotNull(configuration);
+        assertFalse(configuration.flags.containsKey("malformed-allocations"));
+        assertTrue(configuration.flags.containsKey("valid-sibling"));
+        assertEquals("invalid_flag", configuration.invalidFlags.get("malformed-allocations"));
+    }
+
+    @Test
+    void dropsFlagWithMissingSplitShards() throws Exception {
+        final ServerConfiguration configuration = parse(wrap(configWithFlags(
+                booleanFlag(
                         "missing-shards",
                         ",\"allocations\":[{\"key\":\"missing-shards\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\"}]}]"),
-                    booleanFlag("valid-sibling", ""))));
-
-    assertNotNull(configuration);
-    assertFalse(configuration.flags.containsKey("missing-shards"));
-    assertTrue(configuration.flags.containsKey("valid-sibling"));
-    assertEquals("invalid_flag", configuration.invalidFlags.get("missing-shards"));
-  }
-
-  @Test
-  void dropsFlagsWithInvalidConditionOperandsAndShardBounds() throws Exception {
-    final ServerConfiguration configuration =
-        parse(
-            wrap(
-                configWithFlags(
-                    booleanFlag(
+                booleanFlag("valid-sibling", ""))));
+
+        assertNotNull(configuration);
+        assertFalse(configuration.flags.containsKey("missing-shards"));
+        assertTrue(configuration.flags.containsKey("valid-sibling"));
+        assertEquals("invalid_flag", configuration.invalidFlags.get("missing-shards"));
+    }
+
+    @Test
+    void dropsFlagsWithInvalidConditionOperandsAndShardBounds() throws Exception {
+        final ServerConfiguration configuration = parse(wrap(configWithFlags(
+                booleanFlag(
                         "non-numeric-gt",
                         allocation(
-                            "non-numeric-gt",
-                            "[{\"conditions\":[{\"attribute\":\"age\",\"operator\":\"GT\",\"value\":\"bad\"}]}]")),
-                    booleanFlag(
+                                "non-numeric-gt",
+                                "[{\"conditions\":[{\"attribute\":\"age\",\"operator\":\"GT\",\"value\":\"bad\"}]}]")),
+                booleanFlag(
                         "non-list-one-of",
                         allocation(
-                            "non-list-one-of",
-                            "[{\"conditions\":[{\"attribute\":\"role\",\"operator\":\"ONE_OF\",\"value\":\"admin\"}]}]")),
-                    booleanFlag(
+                                "non-list-one-of",
+                                "[{\"conditions\":[{\"attribute\":\"role\",\"operator\":\"ONE_OF\",\"value\":\"admin\"}]}]")),
+                booleanFlag(
                         "negative-shard-range",
                         ",\"allocations\":[{\"key\":\"negative-shard-range\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":100,\"ranges\":[{\"start\":-1,\"end\":1}]}]}]}]"),
-                    booleanFlag("valid-sibling", ""))));
-
-    assertNotNull(configuration);
-    assertFalse(configuration.flags.containsKey("non-numeric-gt"));
-    assertFalse(configuration.flags.containsKey("non-list-one-of"));
-    assertFalse(configuration.flags.containsKey("negative-shard-range"));
-    assertTrue(configuration.flags.containsKey("valid-sibling"));
-    assertEquals("invalid_flag", configuration.invalidFlags.get("non-numeric-gt"));
-    assertEquals("invalid_flag", configuration.invalidFlags.get("non-list-one-of"));
-    assertEquals("invalid_flag", configuration.invalidFlags.get("negative-shard-range"));
-  }
-
-  @Test
-  void dropsFlagsWithInvalidShardBoundsAndConditionOperands() throws Exception {
-    final ServerConfiguration configuration =
-        parse(
-            wrap(
-                configWithFlags(
-                    booleanFlag(
-                        "zero-total-shards",
-                        ",\"allocations\":[{\"key\":\"zero-total-shards\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":0,\"ranges\":[]}]}]}]"),
-                    booleanFlag(
-                        "unsigned-total-shards",
-                        ",\"allocations\":[{\"key\":\"unsigned-total-shards\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":2147483648,\"ranges\":[{\"start\":2147483648,\"end\":2147483649}]}]}]}]"),
-                    booleanFlag(
-                        "too-many-shards",
-                        ",\"allocations\":[{\"key\":\"too-many-shards\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":4294967296,\"ranges\":[]}]}]}]"),
-                    booleanFlag(
-                        "missing-ranges",
-                        ",\"allocations\":[{\"key\":\"missing-ranges\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":1}]}]}]"),
-                    booleanFlag(
-                        "null-shard",
-                        ",\"allocations\":[{\"key\":\"null-shard\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[null]}]}]"),
-                    booleanFlag(
-                        "null-range",
-                        ",\"allocations\":[{\"key\":\"null-range\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":1,\"ranges\":[null]}]}]}]"),
-                    booleanFlag(
-                        "negative-range-end",
-                        ",\"allocations\":[{\"key\":\"negative-range-end\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":1,\"ranges\":[{\"start\":0,\"end\":-1}]}]}]}]"),
-                    booleanFlag(
-                        "non-boolean-is-null",
-                        allocation(
-                            "non-boolean-is-null",
-                            "[{\"conditions\":[{\"attribute\":\"enabled\",\"operator\":\"IS_NULL\",\"value\":\"false\"}]}]")),
-                    booleanFlag(
-                        "valid-condition-operands",
-                        allocation(
-                            "valid-condition-operands",
-                            "[{\"conditions\":[{\"attribute\":\"age\",\"operator\":\"LT\",\"value\":1},{\"attribute\":\"role\",\"operator\":\"ONE_OF\",\"value\":[\"admin\"]},{\"attribute\":\"enabled\",\"operator\":\"IS_NULL\",\"value\":true}]}]")))));
-
-    assertNotNull(configuration);
-    assertFalse(configuration.flags.containsKey("zero-total-shards"));
-    assertTrue(configuration.flags.containsKey("unsigned-total-shards"));
-    assertEquals(
-        2_147_483_648L,
-        Integer.toUnsignedLong(
-            configuration
-                .flags
-                .get("unsigned-total-shards")
-                .allocations
-                .get(0)
-                .splits
-                .get(0)
-                .shards
-                .get(0)
-                .totalShards));
-    assertEquals(
-        2_147_483_648L,
-        Integer.toUnsignedLong(
-            configuration
-                .flags
-                .get("unsigned-total-shards")
-                .allocations
-                .get(0)
-                .splits
-                .get(0)
-                .shards
-                .get(0)
-                .ranges
-                .get(0)
-                .start));
-    assertEquals(
-        2_147_483_649L,
-        Integer.toUnsignedLong(
-            configuration
-                .flags
-                .get("unsigned-total-shards")
-                .allocations
-                .get(0)
-                .splits
-                .get(0)
-                .shards
-                .get(0)
-                .ranges
-                .get(0)
-                .end));
-    assertFalse(configuration.flags.containsKey("too-many-shards"));
-    assertFalse(configuration.flags.containsKey("missing-ranges"));
-    assertFalse(configuration.flags.containsKey("null-shard"));
-    assertFalse(configuration.flags.containsKey("null-range"));
-    assertFalse(configuration.flags.containsKey("negative-range-end"));
-    assertFalse(configuration.flags.containsKey("non-boolean-is-null"));
-    assertTrue(configuration.flags.containsKey("valid-condition-operands"));
-  }
-
-  @Test
-  void shardAdapterFactoryRejectsQualifiedShard() {
-    assertNull(
-        UniversalFlagConfigParser.ShardAdapter.FACTORY.create(
-            Shard.class,
-            Collections.singleton(QualifiedShard.class.getAnnotation(ShardQualifier.class)),
-            new Moshi.Builder().build()));
-  }
-
-  @JsonQualifier
-  @Retention(RetentionPolicy.RUNTIME)
-  @Target(ElementType.TYPE)
-  private @interface ShardQualifier {}
-
-  @ShardQualifier
-  private static final class QualifiedShard {}
-
-  @Test
-  void nullAttributesAreRejectedWithoutInvokingTheFlagParser() throws Exception {
-    assertNull(parse("{\"data\":{\"type\":\"universal-flag-configuration\",\"attributes\":null}}"));
-  }
-
-  @Test
-  void observeFullEvaluationDataDefaultsToFalseWhenAbsent() throws Exception {
-    // Absent → Moshi leaves the boxed field null; the read site's Boolean.TRUE.equals(...) then
-    // resolves to the privacy-preserving default (consent-off). Either null-or-false is the
-    // documented invariant; assert the field never reads as true.
-    final ServerConfiguration configuration = parse(wrap(emptyConfig()));
-    assertNotNull(configuration);
-    assertFalse(Boolean.TRUE.equals(configuration.observeFullEvaluationData));
-  }
-
-  @ParameterizedTest
-  @ValueSource(booleans = {true, false})
-  void observeFullEvaluationDataParsesExplicitValue(final boolean value) throws Exception {
-    final ServerConfiguration configuration =
-        parse(wrap(configWithObserveFullEvaluationData(value)));
-    assertNotNull(configuration);
-    assertEquals(value, configuration.observeFullEvaluationData);
-  }
-
-  @Test
-  void observeFullEvaluationDataExplicitNullDefaultsToFalseWithoutRejectingConfig()
-      throws Exception {
-    // An explicit null (or a wrong-typed value) for this field must not abort the whole UFC parse.
-    // A pod that starts after a malformed UFC has no last-known-good, so aborting would strand
-    // every flag on PROVIDER_NOT_READY (its default value). We fail closed on privacy (consent
-    // stays false) but preserve availability: flags parse and evaluate.
-    final ServerConfiguration configuration =
-        parse(wrap(configWithRawObserveFullEvaluationData("null")));
-
-    assertNotNull(configuration);
-    assertFalse(
-        configuration.observeFullEvaluationData != null && configuration.observeFullEvaluationData);
-    assertNotNull(configuration.flags);
-  }
-
-  @Test
-  void observeFullEvaluationDataWrongTypedStringDefaultsToFalse() throws Exception {
-    // Moshi tolerates a stringified boolean like "true" via nullSafe/boxed handling: it either
-    // parses as null or throws locally and leaves the field null. Either way, downstream reads
-    // via Boolean.TRUE.equals(...) treat it as consent-off. The rest of the config must parse.
-    final ServerConfiguration configuration =
-        parse(wrap(configWithRawObserveFullEvaluationData("\"true\"")));
-
-    assertNotNull(configuration);
-    assertFalse(
-        configuration.observeFullEvaluationData != null && configuration.observeFullEvaluationData);
-    assertNotNull(configuration.flags);
-  }
-
-  @Test
-  void observeFullEvaluationDataWrongTypedNumberDefaultsToFalse() throws Exception {
-    final ServerConfiguration configuration =
-        parse(wrap(configWithRawObserveFullEvaluationData("1")));
-
-    assertNotNull(configuration);
-    assertFalse(
-        configuration.observeFullEvaluationData != null && configuration.observeFullEvaluationData);
-    assertNotNull(configuration.flags);
-  }
-
-  private static ServerConfiguration parse(final String json) throws Exception {
-    return JsonApiUfcResponseParser.INSTANCE.parse(json.getBytes(UTF_8));
-  }
-
-  private static String wrap(final String attributes) {
-    return "{\"data\":{\"type\":\"universal-flag-configuration\",\"attributes\":"
-        + attributes
-        + "}}";
-  }
-
-  private static String configWithObserveFullEvaluationData(final boolean value) {
-    return "{"
-        + "\"createdAt\":\"2024-04-17T19:40:53.716Z\","
-        + "\"observeFullEvaluationData\":"
-        + value
-        + ","
-        + "\"environment\":{\"name\":\"Test\"},"
-        + "\"flags\":{}"
-        + "}";
-  }
-
-  private static String configWithRawObserveFullEvaluationData(final String rawJsonValue) {
-    // Emit the field with a caller-controlled raw JSON value (null / "true" / 1 / ...) so we can
-    // assert the parser's tolerance of malformed shapes without going through configWith's
-    // boolean-typed helper.
-    return "{"
-        + "\"createdAt\":\"2024-04-17T19:40:53.716Z\","
-        + "\"observeFullEvaluationData\":"
-        + rawJsonValue
-        + ","
-        + "\"environment\":{\"name\":\"Test\"},"
-        + "\"flags\":{}"
-        + "}";
-  }
-
-  private static String configWithFlags(final String... flags) {
-    return "{"
-        + "\"createdAt\":\"2024-04-17T19:40:53.716Z\","
-        + "\"environment\":{\"name\":\"Test\"},"
-        + "\"flags\":{"
-        + String.join(",", flags)
-        + "}}";
-  }
-
-  private static String booleanFlag(final String key, final String allocations) {
-    return "\""
-        + key
-        + "\":{"
-        + "\"key\":\""
-        + key
-        + "\",\"enabled\":true,\"variationType\":\"BOOLEAN\","
-        + "\"variations\":{\"on\":{\"key\":\"on\",\"value\":true}}"
-        + allocations
-        + "}";
-  }
-
-  private static String allocation(final String key, final String rules) {
-    return ",\"allocations\":[{\"key\":\""
-        + key
-        + "\""
-        + (rules.isEmpty() ? "" : ",\"rules\":" + rules)
-        + ",\"splits\":[]}]";
-  }
-
-  private static String emptyConfig() {
-    return "{"
-        + "\"createdAt\":\"2024-04-17T19:40:53.716Z\","
-        + "\"environment\":{\"name\":\"Test\"},"
-        + "\"flags\":{}"
-        + "}";
-  }
+                booleanFlag("valid-sibling", ""))));
+
+        assertNotNull(configuration);
+        assertFalse(configuration.flags.containsKey("non-numeric-gt"));
+        assertFalse(configuration.flags.containsKey("non-list-one-of"));
+        assertFalse(configuration.flags.containsKey("negative-shard-range"));
+        assertTrue(configuration.flags.containsKey("valid-sibling"));
+        assertEquals("invalid_flag", configuration.invalidFlags.get("non-numeric-gt"));
+        assertEquals("invalid_flag", configuration.invalidFlags.get("non-list-one-of"));
+        assertEquals("invalid_flag", configuration.invalidFlags.get("negative-shard-range"));
+    }
+
+    @Test
+    void dropsFlagsWithInvalidShardBoundsAndConditionOperands() throws Exception {
+        final ServerConfiguration configuration = parse(
+                wrap(
+                        configWithFlags(
+                                booleanFlag(
+                                        "zero-total-shards",
+                                        ",\"allocations\":[{\"key\":\"zero-total-shards\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":0,\"ranges\":[]}]}]}]"),
+                                booleanFlag(
+                                        "unsigned-total-shards",
+                                        ",\"allocations\":[{\"key\":\"unsigned-total-shards\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":2147483648,\"ranges\":[{\"start\":2147483648,\"end\":2147483649}]}]}]}]"),
+                                booleanFlag(
+                                        "too-many-shards",
+                                        ",\"allocations\":[{\"key\":\"too-many-shards\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":4294967296,\"ranges\":[]}]}]}]"),
+                                booleanFlag(
+                                        "missing-ranges",
+                                        ",\"allocations\":[{\"key\":\"missing-ranges\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":1}]}]}]"),
+                                booleanFlag(
+                                        "null-shard",
+                                        ",\"allocations\":[{\"key\":\"null-shard\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[null]}]}]"),
+                                booleanFlag(
+                                        "null-range",
+                                        ",\"allocations\":[{\"key\":\"null-range\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":1,\"ranges\":[null]}]}]}]"),
+                                booleanFlag(
+                                        "negative-range-end",
+                                        ",\"allocations\":[{\"key\":\"negative-range-end\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":1,\"ranges\":[{\"start\":0,\"end\":-1}]}]}]}]"),
+                                booleanFlag(
+                                        "non-boolean-is-null",
+                                        allocation(
+                                                "non-boolean-is-null",
+                                                "[{\"conditions\":[{\"attribute\":\"enabled\",\"operator\":\"IS_NULL\",\"value\":\"false\"}]}]")),
+                                booleanFlag(
+                                        "valid-condition-operands",
+                                        allocation(
+                                                "valid-condition-operands",
+                                                "[{\"conditions\":[{\"attribute\":\"age\",\"operator\":\"LT\",\"value\":1},{\"attribute\":\"role\",\"operator\":\"ONE_OF\",\"value\":[\"admin\"]},{\"attribute\":\"enabled\",\"operator\":\"IS_NULL\",\"value\":true}]}]")))));
+
+        assertNotNull(configuration);
+        assertFalse(configuration.flags.containsKey("zero-total-shards"));
+        assertTrue(configuration.flags.containsKey("unsigned-total-shards"));
+        assertEquals(
+                2_147_483_648L,
+                Integer.toUnsignedLong(configuration
+                        .flags
+                        .get("unsigned-total-shards")
+                        .allocations
+                        .get(0)
+                        .splits
+                        .get(0)
+                        .shards
+                        .get(0)
+                        .totalShards));
+        assertEquals(
+                2_147_483_648L,
+                Integer.toUnsignedLong(configuration
+                        .flags
+                        .get("unsigned-total-shards")
+                        .allocations
+                        .get(0)
+                        .splits
+                        .get(0)
+                        .shards
+                        .get(0)
+                        .ranges
+                        .get(0)
+                        .start));
+        assertEquals(
+                2_147_483_649L,
+                Integer.toUnsignedLong(configuration
+                        .flags
+                        .get("unsigned-total-shards")
+                        .allocations
+                        .get(0)
+                        .splits
+                        .get(0)
+                        .shards
+                        .get(0)
+                        .ranges
+                        .get(0)
+                        .end));
+        assertFalse(configuration.flags.containsKey("too-many-shards"));
+        assertFalse(configuration.flags.containsKey("missing-ranges"));
+        assertFalse(configuration.flags.containsKey("null-shard"));
+        assertFalse(configuration.flags.containsKey("null-range"));
+        assertFalse(configuration.flags.containsKey("negative-range-end"));
+        assertFalse(configuration.flags.containsKey("non-boolean-is-null"));
+        assertTrue(configuration.flags.containsKey("valid-condition-operands"));
+    }
+
+    @Test
+    void shardAdapterFactoryRejectsQualifiedShard() {
+        assertNull(UniversalFlagConfigParser.ShardAdapter.FACTORY.create(
+                Shard.class,
+                Collections.singleton(QualifiedShard.class.getAnnotation(ShardQualifier.class)),
+                new Moshi.Builder().build()));
+    }
+
+    @JsonQualifier
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.TYPE)
+    private @interface ShardQualifier {}
+
+    @ShardQualifier
+    private static final class QualifiedShard {}
+
+    @Test
+    void nullAttributesAreRejectedWithoutInvokingTheFlagParser() throws Exception {
+        assertNull(parse("{\"data\":{\"type\":\"universal-flag-configuration\",\"attributes\":null}}"));
+    }
+
+    @Test
+    void observeFullEvaluationDataDefaultsToFalseWhenAbsent() throws Exception {
+        // Absent → Moshi leaves the boxed field null; the read site's Boolean.TRUE.equals(...) then
+        // resolves to the privacy-preserving default (consent-off). Either null-or-false is the
+        // documented invariant; assert the field never reads as true.
+        final ServerConfiguration configuration = parse(wrap(emptyConfig()));
+        assertNotNull(configuration);
+        assertFalse(Boolean.TRUE.equals(configuration.observeFullEvaluationData));
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void observeFullEvaluationDataParsesExplicitValue(final boolean value) throws Exception {
+        final ServerConfiguration configuration = parse(wrap(configWithObserveFullEvaluationData(value)));
+        assertNotNull(configuration);
+        assertEquals(value, configuration.observeFullEvaluationData);
+    }
+
+    @Test
+    void observeFullEvaluationDataExplicitNullDefaultsToFalseWithoutRejectingConfig() throws Exception {
+        // An explicit null (or a wrong-typed value) for this field must not abort the whole UFC parse.
+        // A pod that starts after a malformed UFC has no last-known-good, so aborting would strand
+        // every flag on PROVIDER_NOT_READY (its default value). We fail closed on privacy (consent
+        // stays false) but preserve availability: flags parse and evaluate.
+        final ServerConfiguration configuration = parse(wrap(configWithRawObserveFullEvaluationData("null")));
+
+        assertNotNull(configuration);
+        assertFalse(configuration.observeFullEvaluationData != null && configuration.observeFullEvaluationData);
+        assertNotNull(configuration.flags);
+    }
+
+    @Test
+    void observeFullEvaluationDataWrongTypedStringDefaultsToFalse() throws Exception {
+        // Moshi tolerates a stringified boolean like "true" via nullSafe/boxed handling: it either
+        // parses as null or throws locally and leaves the field null. Either way, downstream reads
+        // via Boolean.TRUE.equals(...) treat it as consent-off. The rest of the config must parse.
+        final ServerConfiguration configuration = parse(wrap(configWithRawObserveFullEvaluationData("\"true\"")));
+
+        assertNotNull(configuration);
+        assertFalse(configuration.observeFullEvaluationData != null && configuration.observeFullEvaluationData);
+        assertNotNull(configuration.flags);
+    }
+
+    @Test
+    void observeFullEvaluationDataWrongTypedNumberDefaultsToFalse() throws Exception {
+        final ServerConfiguration configuration = parse(wrap(configWithRawObserveFullEvaluationData("1")));
+
+        assertNotNull(configuration);
+        assertFalse(configuration.observeFullEvaluationData != null && configuration.observeFullEvaluationData);
+        assertNotNull(configuration.flags);
+    }
+
+    private static ServerConfiguration parse(final String json) throws Exception {
+        return JsonApiUfcResponseParser.INSTANCE.parse(json.getBytes(UTF_8));
+    }
+
+    private static String wrap(final String attributes) {
+        return "{\"data\":{\"type\":\"universal-flag-configuration\",\"attributes\":" + attributes + "}}";
+    }
+
+    private static String configWithObserveFullEvaluationData(final boolean value) {
+        return "{"
+                + "\"createdAt\":\"2024-04-17T19:40:53.716Z\","
+                + "\"observeFullEvaluationData\":"
+                + value
+                + ","
+                + "\"environment\":{\"name\":\"Test\"},"
+                + "\"flags\":{}"
+                + "}";
+    }
+
+    private static String configWithRawObserveFullEvaluationData(final String rawJsonValue) {
+        // Emit the field with a caller-controlled raw JSON value (null / "true" / 1 / ...) so we can
+        // assert the parser's tolerance of malformed shapes without going through configWith's
+        // boolean-typed helper.
+        return "{"
+                + "\"createdAt\":\"2024-04-17T19:40:53.716Z\","
+                + "\"observeFullEvaluationData\":"
+                + rawJsonValue
+                + ","
+                + "\"environment\":{\"name\":\"Test\"},"
+                + "\"flags\":{}"
+                + "}";
+    }
+
+    private static String configWithFlags(final String... flags) {
+        return "{"
+                + "\"createdAt\":\"2024-04-17T19:40:53.716Z\","
+                + "\"environment\":{\"name\":\"Test\"},"
+                + "\"flags\":{"
+                + String.join(",", flags)
+                + "}}";
+    }
+
+    private static String booleanFlag(final String key, final String allocations) {
+        return "\""
+                + key
+                + "\":{"
+                + "\"key\":\""
+                + key
+                + "\",\"enabled\":true,\"variationType\":\"BOOLEAN\","
+                + "\"variations\":{\"on\":{\"key\":\"on\",\"value\":true}}"
+                + allocations
+                + "}";
+    }
+
+    private static String allocation(final String key, final String rules) {
+        return ",\"allocations\":[{\"key\":\""
+                + key
+                + "\""
+                + (rules.isEmpty() ? "" : ",\"rules\":" + rules)
+                + ",\"splits\":[]}]";
+    }
+
+    private static String emptyConfig() {
+        return "{"
+                + "\"createdAt\":\"2024-04-17T19:40:53.716Z\","
+                + "\"environment\":{\"name\":\"Test\"},"
+                + "\"flags\":{}"
+                + "}";
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/LRUExposureCacheTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/LRUExposureCacheTest.java
index 7d43c7a8b51..b733c90f256 100644
--- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/LRUExposureCacheTest.java
+++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/LRUExposureCacheTest.java
@@ -18,294 +18,291 @@
 
 class LRUExposureCacheTest {
 
-  @Test
-  void testAddingElements() {
-    LRUExposureCache cache = new LRUExposureCache(5);
-    ExposureEvent event = createEvent("flag", "subject", "variant", "allocation");
-
-    boolean added = cache.add(event);
-
-    assertTrue(added);
-    assertEquals(1, cache.size());
-  }
-
-  @Test
-  void testAddingDuplicateEventsReturnsFalse() {
-    LRUExposureCache cache = new LRUExposureCache(5);
-    ExposureEvent event = createEvent("flag", "subject", "variant", "allocation");
-
-    cache.add(event);
-    boolean duplicateAdded = cache.add(event);
-
-    assertFalse(duplicateAdded);
-    assertEquals(1, cache.size());
-  }
-
-  @Test
-  void testAddingEventsWithSameKeyButDifferentDetailsUpdatesCache() {
-    LRUExposureCache cache = new LRUExposureCache(5);
-    ExposureEvent event1 = createEvent("flag", "subject", "variant1", "allocation1");
-    ExposureEvent event2 = createEvent("flag", "subject", "variant2", "allocation2");
-    ExposureCache.Key key = new ExposureCache.Key(event1);
-
-    boolean added1 = cache.add(event1);
-    boolean added2 = cache.add(event2);
-    ExposureCache.Value retrieved = cache.get(key);
-
-    assertTrue(added1);
-    assertTrue(added2);
-    assertEquals(1, cache.size());
-    assertEquals("variant2", retrieved.variant);
-    assertEquals("allocation2", retrieved.allocation);
-  }
-
-  @Test
-  void testSerialIdAppearingEmitsANewExposure() {
-    assertEquals(2, emissions(null, 7));
-  }
-
-  @Test
-  void testSerialIdDisappearingEmitsANewExposure() {
-    assertEquals(2, emissions(7, null));
-  }
-
-  @Test
-  void testSerialIdChangingEmitsANewExposure() {
-    assertEquals(2, emissions(7, 8));
-  }
-
-  @Test
-  void testSerialIdCycleEmitsAnExposurePerTransition() {
-    assertEquals(3, emissions(7, 8, 7));
-  }
-
-  @Test
-  void testUnchangedSerialIdIsDeduplicated() {
-    assertEquals(1, emissions(7, 7));
-  }
-
-  @Test
-  void testUnchangedAbsentSerialIdIsDeduplicated() {
-    assertEquals(1, emissions(null, null));
-  }
-
-  @Test
-  void testSerialIdZeroIsDistinguishedFromAbsent() {
-    assertEquals(2, emissions(null, 0));
-    assertEquals(2, emissions(0, null));
-  }
-
-  @Test
-  void testSerialIdIsRetainedOnTheCachedValue() {
-    LRUExposureCache cache = new LRUExposureCache(5);
-    ExposureEvent event = createEvent("flag", "subject", "variant", "allocation", 0);
-
-    cache.add(event);
-
-    assertEquals(Integer.valueOf(0), cache.get(new ExposureCache.Key(event)).serialId);
-  }
-
-  @Test
-  void testLruEvictionWhenCapacityExceeded() {
-    LRUExposureCache cache = new LRUExposureCache(2);
-    ExposureEvent event1 = createEvent("flag1", "subject1", "variant1", "allocation1");
-    ExposureEvent event2 = createEvent("flag2", "subject2", "variant2", "allocation2");
-    ExposureEvent event3 = createEvent("flag3", "subject3", "variant3", "allocation3");
-    ExposureCache.Key key1 = new ExposureCache.Key(event1);
-    ExposureCache.Key key3 = new ExposureCache.Key(event3);
-
-    cache.add(event1);
-    cache.add(event2);
-    cache.add(event3);
-
-    assertEquals(2, cache.size());
-    assertNull(cache.get(key1)); // event1 should be evicted
-    assertNotNull(cache.get(key3)); // event3 should be present
-    assertEquals("variant3", cache.get(key3).variant);
-    assertEquals("allocation3", cache.get(key3).allocation);
-  }
-
-  @Test
-  void testSingleCapacityCache() {
-    LRUExposureCache cache = new LRUExposureCache(1);
-    ExposureEvent event1 = createEvent("flag1", "subject1", "variant1", "allocation1");
-    ExposureEvent event2 = createEvent("flag2", "subject2", "variant2", "allocation2");
-
-    cache.add(event1);
-    cache.add(event2);
-
-    assertEquals(1, cache.size());
-  }
-
-  @Test
-  void testZeroCapacityCache() {
-    LRUExposureCache cache = new LRUExposureCache(0);
-    ExposureEvent event = createEvent("flag", "subject", "variant", "allocation");
-
-    boolean added = cache.add(event);
-
-    assertTrue(added);
-    assertEquals(0, cache.size());
-  }
-
-  @Test
-  void testEmptyCacheSize() {
-    LRUExposureCache cache = new LRUExposureCache(5);
-
-    assertEquals(0, cache.size());
-  }
-
-  @Test
-  void testMultipleAdditionsWithSameFlagDifferentSubjects() {
-    LRUExposureCache cache = new LRUExposureCache(10);
-    List<ExposureEvent> events = new ArrayList<>();
-    for (int index = 0; index < 5; index++) {
-      events.add(createEvent("flag", "subject" + index, "variant", "allocation"));
+    @Test
+    void testAddingElements() {
+        LRUExposureCache cache = new LRUExposureCache(5);
+        ExposureEvent event = createEvent("flag", "subject", "variant", "allocation");
+
+        boolean added = cache.add(event);
+
+        assertTrue(added);
+        assertEquals(1, cache.size());
+    }
+
+    @Test
+    void testAddingDuplicateEventsReturnsFalse() {
+        LRUExposureCache cache = new LRUExposureCache(5);
+        ExposureEvent event = createEvent("flag", "subject", "variant", "allocation");
+
+        cache.add(event);
+        boolean duplicateAdded = cache.add(event);
+
+        assertFalse(duplicateAdded);
+        assertEquals(1, cache.size());
+    }
+
+    @Test
+    void testAddingEventsWithSameKeyButDifferentDetailsUpdatesCache() {
+        LRUExposureCache cache = new LRUExposureCache(5);
+        ExposureEvent event1 = createEvent("flag", "subject", "variant1", "allocation1");
+        ExposureEvent event2 = createEvent("flag", "subject", "variant2", "allocation2");
+        ExposureCache.Key key = new ExposureCache.Key(event1);
+
+        boolean added1 = cache.add(event1);
+        boolean added2 = cache.add(event2);
+        ExposureCache.Value retrieved = cache.get(key);
+
+        assertTrue(added1);
+        assertTrue(added2);
+        assertEquals(1, cache.size());
+        assertEquals("variant2", retrieved.variant);
+        assertEquals("allocation2", retrieved.allocation);
+    }
+
+    @Test
+    void testSerialIdAppearingEmitsANewExposure() {
+        assertEquals(2, emissions(null, 7));
+    }
+
+    @Test
+    void testSerialIdDisappearingEmitsANewExposure() {
+        assertEquals(2, emissions(7, null));
+    }
+
+    @Test
+    void testSerialIdChangingEmitsANewExposure() {
+        assertEquals(2, emissions(7, 8));
+    }
+
+    @Test
+    void testSerialIdCycleEmitsAnExposurePerTransition() {
+        assertEquals(3, emissions(7, 8, 7));
+    }
+
+    @Test
+    void testUnchangedSerialIdIsDeduplicated() {
+        assertEquals(1, emissions(7, 7));
+    }
+
+    @Test
+    void testUnchangedAbsentSerialIdIsDeduplicated() {
+        assertEquals(1, emissions(null, null));
+    }
+
+    @Test
+    void testSerialIdZeroIsDistinguishedFromAbsent() {
+        assertEquals(2, emissions(null, 0));
+        assertEquals(2, emissions(0, null));
+    }
+
+    @Test
+    void testSerialIdIsRetainedOnTheCachedValue() {
+        LRUExposureCache cache = new LRUExposureCache(5);
+        ExposureEvent event = createEvent("flag", "subject", "variant", "allocation", 0);
+
+        cache.add(event);
+
+        assertEquals(Integer.valueOf(0), cache.get(new ExposureCache.Key(event)).serialId);
     }
 
-    for (ExposureEvent event : events) {
-      assertTrue(cache.add(event));
+    @Test
+    void testLruEvictionWhenCapacityExceeded() {
+        LRUExposureCache cache = new LRUExposureCache(2);
+        ExposureEvent event1 = createEvent("flag1", "subject1", "variant1", "allocation1");
+        ExposureEvent event2 = createEvent("flag2", "subject2", "variant2", "allocation2");
+        ExposureEvent event3 = createEvent("flag3", "subject3", "variant3", "allocation3");
+        ExposureCache.Key key1 = new ExposureCache.Key(event1);
+        ExposureCache.Key key3 = new ExposureCache.Key(event3);
+
+        cache.add(event1);
+        cache.add(event2);
+        cache.add(event3);
+
+        assertEquals(2, cache.size());
+        assertNull(cache.get(key1)); // event1 should be evicted
+        assertNotNull(cache.get(key3)); // event3 should be present
+        assertEquals("variant3", cache.get(key3).variant);
+        assertEquals("allocation3", cache.get(key3).allocation);
     }
 
-    assertEquals(5, cache.size());
-  }
+    @Test
+    void testSingleCapacityCache() {
+        LRUExposureCache cache = new LRUExposureCache(1);
+        ExposureEvent event1 = createEvent("flag1", "subject1", "variant1", "allocation1");
+        ExposureEvent event2 = createEvent("flag2", "subject2", "variant2", "allocation2");
+
+        cache.add(event1);
+        cache.add(event2);
+
+        assertEquals(1, cache.size());
+    }
+
+    @Test
+    void testZeroCapacityCache() {
+        LRUExposureCache cache = new LRUExposureCache(0);
+        ExposureEvent event = createEvent("flag", "subject", "variant", "allocation");
+
+        boolean added = cache.add(event);
+
+        assertTrue(added);
+        assertEquals(0, cache.size());
+    }
+
+    @Test
+    void testEmptyCacheSize() {
+        LRUExposureCache cache = new LRUExposureCache(5);
+
+        assertEquals(0, cache.size());
+    }
+
+    @Test
+    void testMultipleAdditionsWithSameFlagDifferentSubjects() {
+        LRUExposureCache cache = new LRUExposureCache(10);
+        List<ExposureEvent> events = new ArrayList<>();
+        for (int index = 0; index < 5; index++) {
+            events.add(createEvent("flag", "subject" + index, "variant", "allocation"));
+        }
+
+        for (ExposureEvent event : events) {
+            assertTrue(cache.add(event));
+        }
+
+        assertEquals(5, cache.size());
+    }
+
+    @Test
+    void testMultipleAdditionsWithSameSubjectDifferentFlags() {
+        LRUExposureCache cache = new LRUExposureCache(10);
+        List<ExposureEvent> events = new ArrayList<>();
+        for (int index = 0; index < 5; index++) {
+            events.add(createEvent("flag" + index, "subject", "variant", "allocation"));
+        }
+
+        for (ExposureEvent event : events) {
+            assertTrue(cache.add(event));
+        }
+
+        assertEquals(5, cache.size());
+    }
+
+    @Test
+    void testKeyEqualityWithNullValues() {
+        LRUExposureCache cache = new LRUExposureCache(5);
+        ExposureEvent event1 = new ExposureEvent(
+                System.currentTimeMillis(),
+                new Allocation("allocation"),
+                new Flag(null),
+                new Variant("variant"),
+                new Subject(null, emptyMap()));
+        ExposureEvent event2 = new ExposureEvent(
+                System.currentTimeMillis(),
+                new Allocation("allocation"),
+                new Flag(null),
+                new Variant("variant"),
+                new Subject(null, emptyMap()));
+
+        cache.add(event1);
+        boolean duplicateAdded = cache.add(event2);
+
+        assertFalse(duplicateAdded);
+        assertEquals(1, cache.size());
+    }
+
+    @Test
+    void testUpdatingExistingKeyMaintainsLruPosition() {
+        LRUExposureCache cache = new LRUExposureCache(3);
+        ExposureEvent event1 = createEvent("flag1", "subject1", "variant1", "allocation1");
+        ExposureEvent event2 = createEvent("flag2", "subject2", "variant2", "allocation2");
+        ExposureEvent event3 = createEvent("flag3", "subject3", "variant3", "allocation3");
+        ExposureEvent event1Updated = createEvent("flag1", "subject1", "variant2", "allocation2");
+        ExposureEvent event4 = createEvent("flag4", "subject4", "variant4", "allocation4");
+        ExposureCache.Key key1 = new ExposureCache.Key(event1);
+        ExposureCache.Key key2 = new ExposureCache.Key(event2);
+        ExposureCache.Key key4 = new ExposureCache.Key(event4);
+
+        cache.add(event1);
+        cache.add(event2);
+        cache.add(event3);
+        cache.add(event1Updated); // Updates event1, moves to most recent
+        cache.add(event4); // Should evict event2, not event1
+
+        assertEquals(3, cache.size());
+        assertNotNull(cache.get(key1)); // event1 should be updated and present
+        assertEquals("variant2", cache.get(key1).variant); // verify it was updated
+        assertEquals("allocation2", cache.get(key1).allocation);
+        assertNull(cache.get(key2)); // event2 should be evicted
+        assertNotNull(cache.get(key4)); // event4 should be present
+        assertEquals("variant4", cache.get(key4).variant);
+    }
+
+    @Test
+    void testDuplicateExposureKeepsSubjectHotInLruOrder() {
+        LRUExposureCache cache = new LRUExposureCache(3);
+        ExposureEvent event1 = createEvent("flag1", "subject1", "variant1", "allocation1");
+        ExposureEvent event2 = createEvent("flag2", "subject2", "variant2", "allocation2");
+        ExposureEvent event3 = createEvent("flag3", "subject3", "variant3", "allocation3");
+        // same key + same details as event1: will go through the "duplicate" path
+        ExposureEvent event1Duplicate = createEvent("flag1", "subject1", "variant1", "allocation1");
+        ExposureEvent event4 = createEvent("flag4", "subject4", "variant4", "allocation4");
+
+        ExposureCache.Key key1 = new ExposureCache.Key(event1);
+        ExposureCache.Key key2 = new ExposureCache.Key(event2);
+        ExposureCache.Key key4 = new ExposureCache.Key(event4);
+
+        // Fill cache
+        boolean added1 = cache.add(event1);
+        boolean added2 = cache.add(event2);
+        boolean added3 = cache.add(event3);
+
+        // Duplicate exposure for subject1: should *not* change size, but *should* bump recency
+        boolean duplicateAdded = cache.add(event1Duplicate);
+
+        // Now push over capacity: the least recently used *non-hot* entry (event2) should be evicted
+        boolean added4 = cache.add(event4);
+
+        assertTrue(added1);
+        assertTrue(added2);
+        assertTrue(added3);
+        assertFalse(duplicateAdded); // dedup correctly
+        assertTrue(added4);
+
+        assertEquals(3, cache.size());
+
+        assertNotNull(cache.get(key1)); // hot subject1 should still be present
+        assertNull(cache.get(key2)); // subject2 should be evicted
+        assertNotNull(cache.get(key4)); // newest subject4 should be present
+
+        assertEquals("variant1", cache.get(key1).variant);
+        assertEquals("allocation1", cache.get(key1).allocation);
+    }
 
-  @Test
-  void testMultipleAdditionsWithSameSubjectDifferentFlags() {
-    LRUExposureCache cache = new LRUExposureCache(10);
-    List<ExposureEvent> events = new ArrayList<>();
-    for (int index = 0; index < 5; index++) {
-      events.add(createEvent("flag" + index, "subject", "variant", "allocation"));
+    private static ExposureEvent createEvent(String flag, String subject, String variant, String allocation) {
+        return createEvent(flag, subject, variant, allocation, null);
     }
 
-    for (ExposureEvent event : events) {
-      assertTrue(cache.add(event));
+    private static ExposureEvent createEvent(
+            String flag, String subject, String variant, String allocation, Integer serialId) {
+        return new ExposureEvent(
+                System.currentTimeMillis(),
+                new Allocation(allocation),
+                new Flag(flag),
+                new Variant(variant),
+                new Subject(subject, emptyMap()),
+                serialId);
     }
 
-    assertEquals(5, cache.size());
-  }
-
-  @Test
-  void testKeyEqualityWithNullValues() {
-    LRUExposureCache cache = new LRUExposureCache(5);
-    ExposureEvent event1 =
-        new ExposureEvent(
-            System.currentTimeMillis(),
-            new Allocation("allocation"),
-            new Flag(null),
-            new Variant("variant"),
-            new Subject(null, emptyMap()));
-    ExposureEvent event2 =
-        new ExposureEvent(
-            System.currentTimeMillis(),
-            new Allocation("allocation"),
-            new Flag(null),
-            new Variant("variant"),
-            new Subject(null, emptyMap()));
-
-    cache.add(event1);
-    boolean duplicateAdded = cache.add(event2);
-
-    assertFalse(duplicateAdded);
-    assertEquals(1, cache.size());
-  }
-
-  @Test
-  void testUpdatingExistingKeyMaintainsLruPosition() {
-    LRUExposureCache cache = new LRUExposureCache(3);
-    ExposureEvent event1 = createEvent("flag1", "subject1", "variant1", "allocation1");
-    ExposureEvent event2 = createEvent("flag2", "subject2", "variant2", "allocation2");
-    ExposureEvent event3 = createEvent("flag3", "subject3", "variant3", "allocation3");
-    ExposureEvent event1Updated = createEvent("flag1", "subject1", "variant2", "allocation2");
-    ExposureEvent event4 = createEvent("flag4", "subject4", "variant4", "allocation4");
-    ExposureCache.Key key1 = new ExposureCache.Key(event1);
-    ExposureCache.Key key2 = new ExposureCache.Key(event2);
-    ExposureCache.Key key4 = new ExposureCache.Key(event4);
-
-    cache.add(event1);
-    cache.add(event2);
-    cache.add(event3);
-    cache.add(event1Updated); // Updates event1, moves to most recent
-    cache.add(event4); // Should evict event2, not event1
-
-    assertEquals(3, cache.size());
-    assertNotNull(cache.get(key1)); // event1 should be updated and present
-    assertEquals("variant2", cache.get(key1).variant); // verify it was updated
-    assertEquals("allocation2", cache.get(key1).allocation);
-    assertNull(cache.get(key2)); // event2 should be evicted
-    assertNotNull(cache.get(key4)); // event4 should be present
-    assertEquals("variant4", cache.get(key4).variant);
-  }
-
-  @Test
-  void testDuplicateExposureKeepsSubjectHotInLruOrder() {
-    LRUExposureCache cache = new LRUExposureCache(3);
-    ExposureEvent event1 = createEvent("flag1", "subject1", "variant1", "allocation1");
-    ExposureEvent event2 = createEvent("flag2", "subject2", "variant2", "allocation2");
-    ExposureEvent event3 = createEvent("flag3", "subject3", "variant3", "allocation3");
-    // same key + same details as event1: will go through the "duplicate" path
-    ExposureEvent event1Duplicate = createEvent("flag1", "subject1", "variant1", "allocation1");
-    ExposureEvent event4 = createEvent("flag4", "subject4", "variant4", "allocation4");
-
-    ExposureCache.Key key1 = new ExposureCache.Key(event1);
-    ExposureCache.Key key2 = new ExposureCache.Key(event2);
-    ExposureCache.Key key4 = new ExposureCache.Key(event4);
-
-    // Fill cache
-    boolean added1 = cache.add(event1);
-    boolean added2 = cache.add(event2);
-    boolean added3 = cache.add(event3);
-
-    // Duplicate exposure for subject1: should *not* change size, but *should* bump recency
-    boolean duplicateAdded = cache.add(event1Duplicate);
-
-    // Now push over capacity: the least recently used *non-hot* entry (event2) should be evicted
-    boolean added4 = cache.add(event4);
-
-    assertTrue(added1);
-    assertTrue(added2);
-    assertTrue(added3);
-    assertFalse(duplicateAdded); // dedup correctly
-    assertTrue(added4);
-
-    assertEquals(3, cache.size());
-
-    assertNotNull(cache.get(key1)); // hot subject1 should still be present
-    assertNull(cache.get(key2)); // subject2 should be evicted
-    assertNotNull(cache.get(key4)); // newest subject4 should be present
-
-    assertEquals("variant1", cache.get(key1).variant);
-    assertEquals("allocation1", cache.get(key1).allocation);
-  }
-
-  private static ExposureEvent createEvent(
-      String flag, String subject, String variant, String allocation) {
-    return createEvent(flag, subject, variant, allocation, null);
-  }
-
-  private static ExposureEvent createEvent(
-      String flag, String subject, String variant, String allocation, Integer serialId) {
-    return new ExposureEvent(
-        System.currentTimeMillis(),
-        new Allocation(allocation),
-        new Flag(flag),
-        new Variant(variant),
-        new Subject(subject, emptyMap()),
-        serialId);
-  }
-
-  /**
-   * Number of exposures a run of same-flag, same-subject evaluations emits: the cache reports true
-   * only for the ones it does not suppress as duplicates.
-   */
-  private static int emissions(final Integer... serialIds) {
-    LRUExposureCache cache = new LRUExposureCache(5);
-    int emitted = 0;
-    for (Integer serialId : serialIds) {
-      if (cache.add(createEvent("flag", "subject", "variant", "allocation", serialId))) {
-        emitted++;
-      }
+    /**
+     * Number of exposures a run of same-flag, same-subject evaluations emits: the cache reports true
+     * only for the ones it does not suppress as duplicates.
+     */
+    private static int emissions(final Integer... serialIds) {
+        LRUExposureCache cache = new LRUExposureCache(5);
+        int emitted = 0;
+        for (Integer serialId : serialIds) {
+            if (cache.add(createEvent("flag", "subject", "variant", "allocation", serialId))) {
+                emitted++;
+            }
+        }
+        return emitted;
     }
-    return emitted;
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/RemoteConfigServiceImplTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/RemoteConfigServiceImplTest.java
index f37599feeb0..03250d38262 100644
--- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/RemoteConfigServiceImplTest.java
+++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/RemoteConfigServiceImplTest.java
@@ -54,350 +54,333 @@
 @ExtendWith(MockitoExtension.class)
 class RemoteConfigServiceImplTest {
 
-  @Mock private FeatureFlaggingGateway.ConfigListener listener;
-  @Captor private ArgumentCaptor<ConfigurationDeserializer> deserializerCaptor;
-
-  @AfterEach
-  void cleanup() {
-    FeatureFlaggingGateway.removeConfigListener(listener);
-  }
-
-  @Test
-  void testNewConfigReceived() throws Exception {
-    final ConfigurationPoller poller = mock(ConfigurationPoller.class);
-    final SharedCommunicationObjects sco = mock(SharedCommunicationObjects.class);
-    when(sco.configurationPoller(any(Config.class))).thenReturn(poller);
-    FeatureFlaggingGateway.addConfigListener(listener);
-    final RemoteConfigServiceImpl service = new RemoteConfigServiceImpl(sco, Config.get());
-
-    service.init();
-
-    verify(poller).addCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES);
-    verify(poller).addListener(eq(Product.FFE_FLAGS), deserializerCaptor.capture(), eq(service));
-
-    final ServerConfiguration config = deserializer().deserialize(emptyConfig().getBytes(UTF_8));
-    service.accept("test", config, mock(PollingRateHinter.class));
-
-    verify(listener).accept(any(ServerConfiguration.class));
-
-    service.close();
-
-    verify(poller).removeCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES);
-    verify(poller).removeListeners(Product.FFE_FLAGS);
-  }
-
-  @Test
-  void skipsMalformedFlagAllocationsAndKeepsValidFlag() throws Exception {
-    final ServerConfiguration config = deserialize(resource("malformed-allocations.json"));
-
-    assertNotNull(config);
-    assertFalse(config.flags.containsKey("malformed-flag"));
-    assertTrue(config.flags.containsKey("valid-flag"));
-    assertEquals("expected", config.flags.get("valid-flag").variations.get("expected").value);
-  }
-
-  @Test
-  void parsesSplitSerialId() throws Exception {
-    final ServerConfiguration config = deserialize(configWithSerialId("340132"));
-
-    assertNotNull(config);
-    assertEquals(Integer.valueOf(340132), serialIdOf(config));
-  }
-
-  @Test
-  void parsesSplitSerialIdZero() throws Exception {
-    final ServerConfiguration config = deserialize(configWithSerialId("0"));
-
-    assertNotNull(config);
-    assertEquals(Integer.valueOf(0), serialIdOf(config));
-  }
-
-  @Test
-  void parsesAbsentSplitSerialIdAsNull() throws Exception {
-    final ServerConfiguration config = deserialize(configWithSerialId(null));
-
-    assertNotNull(config);
-    assertNull(serialIdOf(config));
-  }
-
-  @Test
-  void parsesNullSplitSerialIdAsNull() throws Exception {
-    final ServerConfiguration config = deserialize(configWithSerialId("null"));
-
-    assertNotNull(config);
-    assertNull(serialIdOf(config));
-  }
-
-  @Test
-  void skipsFlagWithUncoercibleSerialIdAndKeepsSiblingFlag() throws Exception {
-    final ServerConfiguration config = deserialize(configWithSiblingSerialIds("true"));
-
-    assertNotNull(config);
-    assertFalse(config.flags.containsKey("malformed-flag"));
-    assertEquals("invalid_flag", config.invalidFlags.get("malformed-flag"));
-    assertTrue(config.flags.containsKey("valid-flag"));
-    assertEquals(Integer.valueOf(7), serialIdOf(config));
-  }
-
-  /**
-   * Records how leniently the per-flag value reader coerces a serial id, so a future change to the
-   * parse path is visible here. The values come from the compiler-validated UFC, so the SDK adds no
-   * validation of its own; what matters is that a bad one never rejects the sibling flag.
-   */
-  @ParameterizedTest
-  @CsvSource({"\"340132\", 340132", "1.5, 1", "-1, -1", "2147483648, 2147483647"})
-  void coercesSerialIdWithoutRejectingTheFlag(final String wireValue, final int expected)
-      throws Exception {
-    final ServerConfiguration config = deserialize(configWithSerialId(wireValue));
-
-    assertNotNull(config);
-    assertEquals(Integer.valueOf(expected), serialIdOf(config));
-  }
-
-  private static Integer serialIdOf(final ServerConfiguration config) {
-    return config.flags.get("valid-flag").allocations.get(0).splits.get(0).serialId;
-  }
-
-  private static String configWithSerialId(final String serialIdJson) throws IOException {
-    return withSerialId(resource("serial-id.json"), serialIdJson);
-  }
-
-  /** A malformed serial id must bind to its own flag and leave the sibling flag intact. */
-  private static String configWithSiblingSerialIds(final String malformedSerialIdJson)
-      throws IOException {
-    return withSerialId(resource("sibling-serial-ids.json"), malformedSerialIdJson);
-  }
-
-  /** Inserts the raw wire value so the parser sees its original JSON type; null omits the key. */
-  private static String withSerialId(final String json, final String serialIdJson) {
-    return serialIdJson == null
-        ? json.replace("\"serialId\": \"${serialId}\",", "")
-        : json.replace("\"${serialId}\"", serialIdJson);
-  }
-
-  @Test
-  void ignoresUnknownTopLevelFields() throws Exception {
-    final ServerConfiguration config = deserialize(resource("unknown-top-level-fields.json"));
-
-    assertNotNull(config);
-    assertEquals("2024-04-17T19:40:53.716Z", config.createdAt);
-    assertEquals("SERVER", config.format);
-    assertNotNull(config.environment);
-    assertEquals("Test", config.environment.name);
-    assertTrue(config.flags.isEmpty());
-  }
-
-  @Test
-  void parsesAllocationWindowDatesAsDateFieldsWithInstantAccessors() throws Exception {
-    final ServerConfiguration config = deserialize(resource("allocation-window-dates.json"));
-
-    final Allocation allocation = config.flags.get("dated-flag").allocations.get(0);
-    assertEquals(Date.class, Allocation.class.getField("startAt").getType());
-    assertEquals(Date.class, Allocation.class.getField("endAt").getType());
-    assertEquals(Instant.parse("2023-01-01T00:00:00.123Z"), allocation.startAt.toInstant());
-    assertEquals(Instant.parse("2023-01-02T00:00:00.987Z"), allocation.endAt.toInstant());
-    assertEquals(Instant.parse("2023-01-01T00:00:00.123456Z"), allocation.startAtInstant());
-    assertEquals(Instant.parse("2023-01-02T00:00:00.987654Z"), allocation.endAtInstant());
-  }
-
-  @Test
-  void rejectsTrailingJson() {
-    assertThrows(IOException.class, () -> deserialize(emptyConfig() + "{}"));
-  }
-
-  @Test
-  void skipsUnknownOperatorFlagAndKeepsValidFlag() throws Exception {
-    final ServerConfiguration config = deserialize(resource("unknown-operator.json"));
-
-    assertNotNull(config);
-    assertFalse(config.flags.containsKey("operator-grease-flag"));
-    assertTrue(config.flags.containsKey("valid-flag"));
-    assertEquals("expected", config.flags.get("valid-flag").variations.get("expected").value);
-  }
-
-  @Test
-  void flagMapAdapterFactoryOnlyCreatesFlagMapAdapterForFlagMapType() {
-    final Moshi moshi = moshi();
-    final Type flagsType = Types.newParameterizedType(Map.class, String.class, Flag.class);
-
-    final JsonAdapter<?> adapter =
-        UniversalFlagConfigParser.FlagMapAdapter.FACTORY.create(flagsType, emptySet(), moshi);
-
-    assertNotNull(adapter);
-    assertTrue(adapter instanceof UniversalFlagConfigParser.FlagMapAdapter);
-    assertNull(
-        UniversalFlagConfigParser.FlagMapAdapter.FACTORY.create(String.class, emptySet(), moshi));
-    assertNull(
-        UniversalFlagConfigParser.FlagMapAdapter.FACTORY.create(
-            flagsType, singleton(mock(Annotation.class)), moshi));
-  }
-
-  @Test
-  void lenientBooleanAdapterFactoryOnlyCreatesAdapterForUnannotatedBoxedBoolean() {
-    final Moshi moshi = moshi();
-
-    final JsonAdapter<?> adapter =
-        UniversalFlagConfigParser.LenientBooleanAdapter.FACTORY.create(
-            Boolean.class, emptySet(), moshi);
-
-    assertNotNull(adapter);
-    assertTrue(adapter instanceof UniversalFlagConfigParser.LenientBooleanAdapter);
-    // Primitive boolean keeps Moshi's strict adapter so mandatory fields still reject bad values.
-    assertNull(
-        UniversalFlagConfigParser.LenientBooleanAdapter.FACTORY.create(
-            boolean.class, emptySet(), moshi));
-    // A qualified Boolean belongs to whichever adapter declared the qualifier, not to this one.
-    assertNull(
-        UniversalFlagConfigParser.LenientBooleanAdapter.FACTORY.create(
-            Boolean.class, singleton(mock(Annotation.class)), moshi));
-  }
-
-  @Test
-  void lenientBooleanAdapterIsReadOnly() {
-    final UniversalFlagConfigParser.LenientBooleanAdapter adapter =
-        new UniversalFlagConfigParser.LenientBooleanAdapter();
-
-    assertThrows(
-        UnsupportedOperationException.class, () -> adapter.toJson(mock(JsonWriter.class), true));
-  }
-
-  @Test
-  void allowsNullFlagMap() throws Exception {
-    final ServerConfiguration config = deserialize(resource("null-flags.json"));
-
-    assertNotNull(config);
-    assertNull(config.flags);
-  }
-
-  @Test
-  void skipsNullFlagAndKeepsValidFlag() throws Exception {
-    final ServerConfiguration config = deserialize(resource("null-flag.json"));
-
-    assertNotNull(config);
-    assertFalse(config.flags.containsKey("null-flag"));
-    assertTrue(config.flags.containsKey("valid-flag"));
-    assertEquals("expected", config.flags.get("valid-flag").variations.get("expected").value);
-  }
-
-  @Test
-  void flagMapAdapterIsReadOnly() {
-    final UniversalFlagConfigParser.FlagMapAdapter adapter =
-        new UniversalFlagConfigParser.FlagMapAdapter(moshi().adapter(Flag.class));
-
-    assertThrows(
-        UnsupportedOperationException.class,
-        () -> adapter.toJson(mock(JsonWriter.class), emptyMap()));
-  }
-
-  @Test
-  void allocationAdapterFactoryOnlyCreatesAllocationAdapterForAllocationType() {
-    final Moshi moshi = moshi();
-
-    final JsonAdapter<?> adapter =
-        UniversalFlagConfigParser.AllocationAdapter.FACTORY.create(
-            Allocation.class, emptySet(), moshi);
-
-    assertNotNull(adapter);
-    assertTrue(adapter instanceof UniversalFlagConfigParser.AllocationAdapter);
-    assertNull(
-        UniversalFlagConfigParser.AllocationAdapter.FACTORY.create(
-            String.class, emptySet(), moshi));
-    assertNull(
-        UniversalFlagConfigParser.AllocationAdapter.FACTORY.create(
-            Allocation.class, singleton(mock(Annotation.class)), moshi));
-  }
-
-  @Test
-  void allocationAdapterHandlesNullAndIsReadOnly() throws Exception {
-    final UniversalFlagConfigParser.AllocationAdapter adapter =
-        new UniversalFlagConfigParser.AllocationAdapter(
-            moshi().adapter(UniversalFlagConfigParser.AllocationJson.class));
-
-    assertNull(adapter.fromJson("null"));
-    assertThrows(
-        UnsupportedOperationException.class, () -> adapter.toJson(mock(JsonWriter.class), null));
-  }
-
-  @TableTest({
-    "scenario                       | value                            | expectedInstant                 ",
-    "utc second                     | '2023-01-01T00:00:00Z'           | '2023-01-01T00:00:00Z'          ",
-    "utc end of year                | '2023-12-31T23:59:59Z'           | '2023-12-31T23:59:59Z'          ",
-    "leap day                       | '2024-02-29T12:00:00Z'           | '2024-02-29T12:00:00Z'          ",
-    "millisecond precision          | '2023-01-01T00:00:00.000Z'       | '2023-01-01T00:00:00Z'          ",
-    "three fractional digits        | '2023-06-15T14:30:45.123Z'       | '2023-06-15T14:30:45.123Z'      ",
-    "six fractional digits          | '2023-06-15T14:30:45.123456Z'    | '2023-06-15T14:30:45.123456Z'   ",
-    "six fractional digits distinct | '2023-06-15T14:30:45.235982Z'    | '2023-06-15T14:30:45.235982Z'   ",
-    "nine fractional digits         | '2023-06-15T14:30:45.123456789Z' | '2023-06-15T14:30:45.123456789Z'",
-    "one fractional digit           | '2023-06-15T14:30:45.1Z'         | '2023-06-15T14:30:45.100Z'      ",
-    "two fractional digits          | '2023-06-15T14:30:45.12Z'        | '2023-06-15T14:30:45.120Z'      ",
-    "positive offset                | '2023-01-01T01:00:00+01:00'      | '2023-01-01T00:00:00Z'          ",
-    "negative offset                | '2023-01-01T00:00:00-05:00'      | '2023-01-01T05:00:00Z'          ",
-    "date only                      | '2023-01-01'                     |                                 ",
-    "invalid                        | 'invalid-date'                   |                                 ",
-    "empty string                   | ''                               |                                 ",
-    "not a date                     | 'not-a-date'                     |                                 ",
-    "slash date                     | '2023/01/01T00:00:00Z'           |                                 ",
-    "null                           |                                  |                                 "
-  })
-  void testInstantParsing(final String value, final String expectedInstant) throws Exception {
-    final JsonReader reader = mock(JsonReader.class);
-    if (value == null) {
-      when(reader.peek()).thenReturn(JsonReader.Token.NULL);
-      when(reader.nextNull()).thenReturn(null);
-    } else {
-      when(reader.peek()).thenReturn(JsonReader.Token.STRING);
-      when(reader.nextString()).thenReturn(value);
-    }
-    final UniversalFlagConfigParser.InstantAdapter adapter =
-        new UniversalFlagConfigParser.InstantAdapter();
-
-    final Instant parsed = adapter.fromJson(reader);
-    if (value == null) {
-      verify(reader).nextNull();
-    }
-    if (expectedInstant == null) {
-      assertNull(parsed);
-    } else {
-      assertNotNull(parsed);
-      assertEquals(expectedInstant, parsed.toString());
-    }
-  }
-
-  @Test
-  void testParsingOnlyAdapter() {
-    final UniversalFlagConfigParser.InstantAdapter adapter =
-        new UniversalFlagConfigParser.InstantAdapter();
-
-    assertThrows(
-        UnsupportedOperationException.class,
-        () -> adapter.toJson(mock(JsonWriter.class), Instant.EPOCH));
-  }
-
-  @SuppressWarnings("unchecked")
-  private ConfigurationDeserializer<ServerConfiguration> deserializer() {
-    return deserializerCaptor.getValue();
-  }
-
-  private static ServerConfiguration deserialize(final String json) throws Exception {
-    return UniversalFlagConfigParser.INSTANCE.deserialize(json.getBytes(UTF_8));
-  }
-
-  private static Moshi moshi() {
-    return new Moshi.Builder()
-        .add(Instant.class, new UniversalFlagConfigParser.InstantAdapter())
-        .add(UniversalFlagConfigParser.AllocationAdapter.FACTORY)
-        .build();
-  }
-
-  private static String emptyConfig() throws IOException {
-    return resource("empty-config.json");
-  }
-
-  private static String resource(final String name) throws IOException {
-    try (final InputStream stream =
-        RemoteConfigServiceImplTest.class.getResourceAsStream("/remote-config/" + name)) {
-      assertNotNull(stream, "Missing remote-config fixture: " + name);
-      return new Buffer().readFrom(stream).readUtf8();
-    }
-  }
+    @Mock
+    private FeatureFlaggingGateway.ConfigListener listener;
+
+    @Captor
+    private ArgumentCaptor<ConfigurationDeserializer> deserializerCaptor;
+
+    @AfterEach
+    void cleanup() {
+        FeatureFlaggingGateway.removeConfigListener(listener);
+    }
+
+    @Test
+    void testNewConfigReceived() throws Exception {
+        final ConfigurationPoller poller = mock(ConfigurationPoller.class);
+        final SharedCommunicationObjects sco = mock(SharedCommunicationObjects.class);
+        when(sco.configurationPoller(any(Config.class))).thenReturn(poller);
+        FeatureFlaggingGateway.addConfigListener(listener);
+        final RemoteConfigServiceImpl service = new RemoteConfigServiceImpl(sco, Config.get());
+
+        service.init();
+
+        verify(poller).addCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES);
+        verify(poller).addListener(eq(Product.FFE_FLAGS), deserializerCaptor.capture(), eq(service));
+
+        final ServerConfiguration config =
+                deserializer().deserialize(emptyConfig().getBytes(UTF_8));
+        service.accept("test", config, mock(PollingRateHinter.class));
+
+        verify(listener).accept(any(ServerConfiguration.class));
+
+        service.close();
+
+        verify(poller).removeCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES);
+        verify(poller).removeListeners(Product.FFE_FLAGS);
+    }
+
+    @Test
+    void skipsMalformedFlagAllocationsAndKeepsValidFlag() throws Exception {
+        final ServerConfiguration config = deserialize(resource("malformed-allocations.json"));
+
+        assertNotNull(config);
+        assertFalse(config.flags.containsKey("malformed-flag"));
+        assertTrue(config.flags.containsKey("valid-flag"));
+        assertEquals("expected", config.flags.get("valid-flag").variations.get("expected").value);
+    }
+
+    @Test
+    void parsesSplitSerialId() throws Exception {
+        final ServerConfiguration config = deserialize(configWithSerialId("340132"));
+
+        assertNotNull(config);
+        assertEquals(Integer.valueOf(340132), serialIdOf(config));
+    }
+
+    @Test
+    void parsesSplitSerialIdZero() throws Exception {
+        final ServerConfiguration config = deserialize(configWithSerialId("0"));
+
+        assertNotNull(config);
+        assertEquals(Integer.valueOf(0), serialIdOf(config));
+    }
+
+    @Test
+    void parsesAbsentSplitSerialIdAsNull() throws Exception {
+        final ServerConfiguration config = deserialize(configWithSerialId(null));
+
+        assertNotNull(config);
+        assertNull(serialIdOf(config));
+    }
+
+    @Test
+    void parsesNullSplitSerialIdAsNull() throws Exception {
+        final ServerConfiguration config = deserialize(configWithSerialId("null"));
+
+        assertNotNull(config);
+        assertNull(serialIdOf(config));
+    }
+
+    @Test
+    void skipsFlagWithUncoercibleSerialIdAndKeepsSiblingFlag() throws Exception {
+        final ServerConfiguration config = deserialize(configWithSiblingSerialIds("true"));
+
+        assertNotNull(config);
+        assertFalse(config.flags.containsKey("malformed-flag"));
+        assertEquals("invalid_flag", config.invalidFlags.get("malformed-flag"));
+        assertTrue(config.flags.containsKey("valid-flag"));
+        assertEquals(Integer.valueOf(7), serialIdOf(config));
+    }
+
+    /**
+     * Records how leniently the per-flag value reader coerces a serial id, so a future change to the
+     * parse path is visible here. The values come from the compiler-validated UFC, so the SDK adds no
+     * validation of its own; what matters is that a bad one never rejects the sibling flag.
+     */
+    @ParameterizedTest
+    @CsvSource({"\"340132\", 340132", "1.5, 1", "-1, -1", "2147483648, 2147483647"})
+    void coercesSerialIdWithoutRejectingTheFlag(final String wireValue, final int expected) throws Exception {
+        final ServerConfiguration config = deserialize(configWithSerialId(wireValue));
+
+        assertNotNull(config);
+        assertEquals(Integer.valueOf(expected), serialIdOf(config));
+    }
+
+    private static Integer serialIdOf(final ServerConfiguration config) {
+        return config.flags.get("valid-flag").allocations.get(0).splits.get(0).serialId;
+    }
+
+    private static String configWithSerialId(final String serialIdJson) throws IOException {
+        return withSerialId(resource("serial-id.json"), serialIdJson);
+    }
+
+    /** A malformed serial id must bind to its own flag and leave the sibling flag intact. */
+    private static String configWithSiblingSerialIds(final String malformedSerialIdJson) throws IOException {
+        return withSerialId(resource("sibling-serial-ids.json"), malformedSerialIdJson);
+    }
+
+    /** Inserts the raw wire value so the parser sees its original JSON type; null omits the key. */
+    private static String withSerialId(final String json, final String serialIdJson) {
+        return serialIdJson == null
+                ? json.replace("\"serialId\": \"${serialId}\",", "")
+                : json.replace("\"${serialId}\"", serialIdJson);
+    }
+
+    @Test
+    void ignoresUnknownTopLevelFields() throws Exception {
+        final ServerConfiguration config = deserialize(resource("unknown-top-level-fields.json"));
+
+        assertNotNull(config);
+        assertEquals("2024-04-17T19:40:53.716Z", config.createdAt);
+        assertEquals("SERVER", config.format);
+        assertNotNull(config.environment);
+        assertEquals("Test", config.environment.name);
+        assertTrue(config.flags.isEmpty());
+    }
+
+    @Test
+    void parsesAllocationWindowDatesAsDateFieldsWithInstantAccessors() throws Exception {
+        final ServerConfiguration config = deserialize(resource("allocation-window-dates.json"));
+
+        final Allocation allocation = config.flags.get("dated-flag").allocations.get(0);
+        assertEquals(Date.class, Allocation.class.getField("startAt").getType());
+        assertEquals(Date.class, Allocation.class.getField("endAt").getType());
+        assertEquals(Instant.parse("2023-01-01T00:00:00.123Z"), allocation.startAt.toInstant());
+        assertEquals(Instant.parse("2023-01-02T00:00:00.987Z"), allocation.endAt.toInstant());
+        assertEquals(Instant.parse("2023-01-01T00:00:00.123456Z"), allocation.startAtInstant());
+        assertEquals(Instant.parse("2023-01-02T00:00:00.987654Z"), allocation.endAtInstant());
+    }
+
+    @Test
+    void rejectsTrailingJson() {
+        assertThrows(IOException.class, () -> deserialize(emptyConfig() + "{}"));
+    }
+
+    @Test
+    void skipsUnknownOperatorFlagAndKeepsValidFlag() throws Exception {
+        final ServerConfiguration config = deserialize(resource("unknown-operator.json"));
+
+        assertNotNull(config);
+        assertFalse(config.flags.containsKey("operator-grease-flag"));
+        assertTrue(config.flags.containsKey("valid-flag"));
+        assertEquals("expected", config.flags.get("valid-flag").variations.get("expected").value);
+    }
+
+    @Test
+    void flagMapAdapterFactoryOnlyCreatesFlagMapAdapterForFlagMapType() {
+        final Moshi moshi = moshi();
+        final Type flagsType = Types.newParameterizedType(Map.class, String.class, Flag.class);
+
+        final JsonAdapter<?> adapter =
+                UniversalFlagConfigParser.FlagMapAdapter.FACTORY.create(flagsType, emptySet(), moshi);
+
+        assertNotNull(adapter);
+        assertTrue(adapter instanceof UniversalFlagConfigParser.FlagMapAdapter);
+        assertNull(UniversalFlagConfigParser.FlagMapAdapter.FACTORY.create(String.class, emptySet(), moshi));
+        assertNull(UniversalFlagConfigParser.FlagMapAdapter.FACTORY.create(
+                flagsType, singleton(mock(Annotation.class)), moshi));
+    }
+
+    @Test
+    void lenientBooleanAdapterFactoryOnlyCreatesAdapterForUnannotatedBoxedBoolean() {
+        final Moshi moshi = moshi();
+
+        final JsonAdapter<?> adapter =
+                UniversalFlagConfigParser.LenientBooleanAdapter.FACTORY.create(Boolean.class, emptySet(), moshi);
+
+        assertNotNull(adapter);
+        assertTrue(adapter instanceof UniversalFlagConfigParser.LenientBooleanAdapter);
+        // Primitive boolean keeps Moshi's strict adapter so mandatory fields still reject bad values.
+        assertNull(UniversalFlagConfigParser.LenientBooleanAdapter.FACTORY.create(boolean.class, emptySet(), moshi));
+        // A qualified Boolean belongs to whichever adapter declared the qualifier, not to this one.
+        assertNull(UniversalFlagConfigParser.LenientBooleanAdapter.FACTORY.create(
+                Boolean.class, singleton(mock(Annotation.class)), moshi));
+    }
+
+    @Test
+    void lenientBooleanAdapterIsReadOnly() {
+        final UniversalFlagConfigParser.LenientBooleanAdapter adapter =
+                new UniversalFlagConfigParser.LenientBooleanAdapter();
+
+        assertThrows(UnsupportedOperationException.class, () -> adapter.toJson(mock(JsonWriter.class), true));
+    }
+
+    @Test
+    void allowsNullFlagMap() throws Exception {
+        final ServerConfiguration config = deserialize(resource("null-flags.json"));
+
+        assertNotNull(config);
+        assertNull(config.flags);
+    }
+
+    @Test
+    void skipsNullFlagAndKeepsValidFlag() throws Exception {
+        final ServerConfiguration config = deserialize(resource("null-flag.json"));
+
+        assertNotNull(config);
+        assertFalse(config.flags.containsKey("null-flag"));
+        assertTrue(config.flags.containsKey("valid-flag"));
+        assertEquals("expected", config.flags.get("valid-flag").variations.get("expected").value);
+    }
+
+    @Test
+    void flagMapAdapterIsReadOnly() {
+        final UniversalFlagConfigParser.FlagMapAdapter adapter =
+                new UniversalFlagConfigParser.FlagMapAdapter(moshi().adapter(Flag.class));
+
+        assertThrows(UnsupportedOperationException.class, () -> adapter.toJson(mock(JsonWriter.class), emptyMap()));
+    }
+
+    @Test
+    void allocationAdapterFactoryOnlyCreatesAllocationAdapterForAllocationType() {
+        final Moshi moshi = moshi();
+
+        final JsonAdapter<?> adapter =
+                UniversalFlagConfigParser.AllocationAdapter.FACTORY.create(Allocation.class, emptySet(), moshi);
+
+        assertNotNull(adapter);
+        assertTrue(adapter instanceof UniversalFlagConfigParser.AllocationAdapter);
+        assertNull(UniversalFlagConfigParser.AllocationAdapter.FACTORY.create(String.class, emptySet(), moshi));
+        assertNull(UniversalFlagConfigParser.AllocationAdapter.FACTORY.create(
+                Allocation.class, singleton(mock(Annotation.class)), moshi));
+    }
+
+    @Test
+    void allocationAdapterHandlesNullAndIsReadOnly() throws Exception {
+        final UniversalFlagConfigParser.AllocationAdapter adapter = new UniversalFlagConfigParser.AllocationAdapter(
+                moshi().adapter(UniversalFlagConfigParser.AllocationJson.class));
+
+        assertNull(adapter.fromJson("null"));
+        assertThrows(UnsupportedOperationException.class, () -> adapter.toJson(mock(JsonWriter.class), null));
+    }
+
+    @TableTest({
+      "scenario                       | value                            | expectedInstant                 ",
+      "utc second                     | '2023-01-01T00:00:00Z'           | '2023-01-01T00:00:00Z'          ",
+      "utc end of year                | '2023-12-31T23:59:59Z'           | '2023-12-31T23:59:59Z'          ",
+      "leap day                       | '2024-02-29T12:00:00Z'           | '2024-02-29T12:00:00Z'          ",
+      "millisecond precision          | '2023-01-01T00:00:00.000Z'       | '2023-01-01T00:00:00Z'          ",
+      "three fractional digits        | '2023-06-15T14:30:45.123Z'       | '2023-06-15T14:30:45.123Z'      ",
+      "six fractional digits          | '2023-06-15T14:30:45.123456Z'    | '2023-06-15T14:30:45.123456Z'   ",
+      "six fractional digits distinct | '2023-06-15T14:30:45.235982Z'    | '2023-06-15T14:30:45.235982Z'   ",
+      "nine fractional digits         | '2023-06-15T14:30:45.123456789Z' | '2023-06-15T14:30:45.123456789Z'",
+      "one fractional digit           | '2023-06-15T14:30:45.1Z'         | '2023-06-15T14:30:45.100Z'      ",
+      "two fractional digits          | '2023-06-15T14:30:45.12Z'        | '2023-06-15T14:30:45.120Z'      ",
+      "positive offset                | '2023-01-01T01:00:00+01:00'      | '2023-01-01T00:00:00Z'          ",
+      "negative offset                | '2023-01-01T00:00:00-05:00'      | '2023-01-01T05:00:00Z'          ",
+      "date only                      | '2023-01-01'                     |                                 ",
+      "invalid                        | 'invalid-date'                   |                                 ",
+      "empty string                   | ''                               |                                 ",
+      "not a date                     | 'not-a-date'                     |                                 ",
+      "slash date                     | '2023/01/01T00:00:00Z'           |                                 ",
+      "null                           |                                  |                                 "
+    })
+    void testInstantParsing(final String value, final String expectedInstant) throws Exception {
+        final JsonReader reader = mock(JsonReader.class);
+        if (value == null) {
+            when(reader.peek()).thenReturn(JsonReader.Token.NULL);
+            when(reader.nextNull()).thenReturn(null);
+        } else {
+            when(reader.peek()).thenReturn(JsonReader.Token.STRING);
+            when(reader.nextString()).thenReturn(value);
+        }
+        final UniversalFlagConfigParser.InstantAdapter adapter = new UniversalFlagConfigParser.InstantAdapter();
+
+        final Instant parsed = adapter.fromJson(reader);
+        if (value == null) {
+            verify(reader).nextNull();
+        }
+        if (expectedInstant == null) {
+            assertNull(parsed);
+        } else {
+            assertNotNull(parsed);
+            assertEquals(expectedInstant, parsed.toString());
+        }
+    }
+
+    @Test
+    void testParsingOnlyAdapter() {
+        final UniversalFlagConfigParser.InstantAdapter adapter = new UniversalFlagConfigParser.InstantAdapter();
+
+        assertThrows(UnsupportedOperationException.class, () -> adapter.toJson(mock(JsonWriter.class), Instant.EPOCH));
+    }
+
+    @SuppressWarnings("unchecked")
+    private ConfigurationDeserializer<ServerConfiguration> deserializer() {
+        return deserializerCaptor.getValue();
+    }
+
+    private static ServerConfiguration deserialize(final String json) throws Exception {
+        return UniversalFlagConfigParser.INSTANCE.deserialize(json.getBytes(UTF_8));
+    }
+
+    private static Moshi moshi() {
+        return new Moshi.Builder()
+                .add(Instant.class, new UniversalFlagConfigParser.InstantAdapter())
+                .add(UniversalFlagConfigParser.AllocationAdapter.FACTORY)
+                .build();
+    }
+
+    private static String emptyConfig() throws IOException {
+        return resource("empty-config.json");
+    }
+
+    private static String resource(final String name) throws IOException {
+        try (final InputStream stream =
+                RemoteConfigServiceImplTest.class.getResourceAsStream("/remote-config/" + name)) {
+            assertNotNull(stream, "Missing remote-config fixture: " + name);
+            return new Buffer().readFrom(stream).readUtf8();
+        }
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/SpanEnrichmentAccumulatorTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/SpanEnrichmentAccumulatorTest.java
index ce6df50cfc0..d8318d3eaa7 100644
--- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/SpanEnrichmentAccumulatorTest.java
+++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/SpanEnrichmentAccumulatorTest.java
@@ -18,230 +18,218 @@
  */
 class SpanEnrichmentAccumulatorTest {
 
-  // Test-only decode oracle for the ULEB128 delta-varint codec — the production code only encodes.
-  private static SortedSet<Integer> decodeDeltaVarint(final String encoded) {
-    final SortedSet<Integer> result = new TreeSet<>();
-    if (encoded == null || encoded.isEmpty()) {
-      return result;
-    }
-    final byte[] bytes = Base64.getDecoder().decode(encoded);
-    int previous = 0;
-    int index = 0;
-    while (index < bytes.length) {
-      long value = 0;
-      int shift = 0;
-      while (true) {
-        final byte b = bytes[index++];
-        value |= ((long) (b & 0x7F)) << shift;
-        if ((b & 0x80) == 0) {
-          break;
+    // Test-only decode oracle for the ULEB128 delta-varint codec — the production code only encodes.
+    private static SortedSet<Integer> decodeDeltaVarint(final String encoded) {
+        final SortedSet<Integer> result = new TreeSet<>();
+        if (encoded == null || encoded.isEmpty()) {
+            return result;
+        }
+        final byte[] bytes = Base64.getDecoder().decode(encoded);
+        int previous = 0;
+        int index = 0;
+        while (index < bytes.length) {
+            long value = 0;
+            int shift = 0;
+            while (true) {
+                final byte b = bytes[index++];
+                value |= ((long) (b & 0x7F)) << shift;
+                if ((b & 0x80) == 0) {
+                    break;
+                }
+                shift += 7;
+            }
+            previous += (int) value;
+            result.add(previous);
         }
-        shift += 7;
-      }
-      previous += (int) value;
-      result.add(previous);
+        return result;
     }
-    return result;
-  }
-
-  @Test
-  void codecGoldenVectorAndRoundTrip() {
-    final SortedSet<Integer> ids = new TreeSet<>();
-    ids.add(100);
-    ids.add(108);
-    ids.add(128);
-    ids.add(130);
-    final String encoded = ULeb128Encoder.encodeDeltaVarint(ids);
-    assertEquals("ZAgUAg==", encoded, "golden vector must match the frozen Node contract");
-    assertEquals(ids, decodeDeltaVarint(encoded));
-    assertEquals("", ULeb128Encoder.encodeDeltaVarint(Collections.emptySet()));
-    final SortedSet<Integer> withDup = new TreeSet<>(ids);
-    withDup.add(100);
-    assertEquals(
-        encoded, ULeb128Encoder.encodeDeltaVarint(withDup), "duplicates do not change bytes");
-  }
-
-  @Test
-  void flagsEncTagFromAccumulatedSerialIds() {
-    final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
-    acc.addSerialId(100);
-    acc.addSerialId(108);
-    acc.addSerialId(128);
-    acc.addSerialId(130);
-    acc.addSerialId(100); // dedupe
-    assertTrue(acc.hasData());
-    assertEquals("ZAgUAg==", acc.toSpanTags().get(SpanEnrichmentAccumulator.TAG_FLAGS_ENC));
-  }
-
-  @Test
-  void max200SerialIdsEnforced() {
-    final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
-    for (int i = 0; i < 300; i++) {
-      acc.addSerialId(i);
+
+    @Test
+    void codecGoldenVectorAndRoundTrip() {
+        final SortedSet<Integer> ids = new TreeSet<>();
+        ids.add(100);
+        ids.add(108);
+        ids.add(128);
+        ids.add(130);
+        final String encoded = ULeb128Encoder.encodeDeltaVarint(ids);
+        assertEquals("ZAgUAg==", encoded, "golden vector must match the frozen Node contract");
+        assertEquals(ids, decodeDeltaVarint(encoded));
+        assertEquals("", ULeb128Encoder.encodeDeltaVarint(Collections.emptySet()));
+        final SortedSet<Integer> withDup = new TreeSet<>(ids);
+        withDup.add(100);
+        assertEquals(encoded, ULeb128Encoder.encodeDeltaVarint(withDup), "duplicates do not change bytes");
     }
-    assertEquals(
-        SpanEnrichmentAccumulator.MAX_SERIAL_IDS,
-        acc.serialIdsView().size(),
-        "serial ids must be capped at 200");
-  }
-
-  @Test
-  void subjectAndPerSubjectExperimentCaps() {
-    // per-subject experiment cap: 20 max
-    final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
-    for (int i = 0; i < 25; i++) {
-      acc.addSubject("subjectX", i);
+
+    @Test
+    void flagsEncTagFromAccumulatedSerialIds() {
+        final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
+        acc.addSerialId(100);
+        acc.addSerialId(108);
+        acc.addSerialId(128);
+        acc.addSerialId(130);
+        acc.addSerialId(100); // dedupe
+        assertTrue(acc.hasData());
+        assertEquals("ZAgUAg==", acc.toSpanTags().get(SpanEnrichmentAccumulator.TAG_FLAGS_ENC));
+    }
+
+    @Test
+    void max200SerialIdsEnforced() {
+        final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
+        for (int i = 0; i < 300; i++) {
+            acc.addSerialId(i);
+        }
+        assertEquals(
+                SpanEnrichmentAccumulator.MAX_SERIAL_IDS,
+                acc.serialIdsView().size(),
+                "serial ids must be capped at 200");
     }
-    final SortedSet<Integer> decoded =
-        decodeDeltaVarint(
-            acc.toSpanTags()
+
+    @Test
+    void subjectAndPerSubjectExperimentCaps() {
+        // per-subject experiment cap: 20 max
+        final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
+        for (int i = 0; i < 25; i++) {
+            acc.addSubject("subjectX", i);
+        }
+        final SortedSet<Integer> decoded = decodeDeltaVarint(acc.toSpanTags()
                 .get(SpanEnrichmentAccumulator.TAG_SUBJECTS_ENC)
                 .replaceAll("^\\{\"[a-f0-9]+\":\"", "")
                 .replaceAll("\"\\}$", ""));
-    assertEquals(SpanEnrichmentAccumulator.MAX_EXPERIMENTS_PER_SUBJECT, decoded.size());
+        assertEquals(SpanEnrichmentAccumulator.MAX_EXPERIMENTS_PER_SUBJECT, decoded.size());
+
+        // subject cap: 10 max distinct subjects
+        final SpanEnrichmentAccumulator acc2 = new SpanEnrichmentAccumulator();
+        for (int i = 0; i < 15; i++) {
+            acc2.addSubject("subject-" + i, i);
+        }
+        assertEquals(SpanEnrichmentAccumulator.MAX_SUBJECTS, acc2.subjectCount());
+    }
+
+    @Test
+    void runtimeDefaultJsonStringifyAndTruncation() {
+        // native object -> JSON, not toString
+        assertEquals("{\"a\":\"b\"}", SpanEnrichmentAccumulator.stringifyDefault(Collections.singletonMap("a", "b")));
+        // scalar string -> as-is
+        assertEquals("hello", SpanEnrichmentAccumulator.stringifyDefault("hello"));
+        // null -> "null"
+        assertEquals("null", SpanEnrichmentAccumulator.stringifyDefault(null));
+        // native list -> JSON array
+        assertEquals(
+                "[\"a\",2,true]", SpanEnrichmentAccumulator.stringifyDefault(java.util.Arrays.asList("a", 2, true)));
+
+        // 64-char truncation
+        final StringBuilder longValue = new StringBuilder();
+        for (int i = 0; i < 100; i++) {
+            longValue.append('x');
+        }
+        final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
+        acc.addDefault("flag", longValue.toString());
+        final String tag = acc.toSpanTags().get(SpanEnrichmentAccumulator.TAG_RUNTIME_DEFAULTS);
+        final String expectedValue = longValue.substring(0, SpanEnrichmentAccumulator.MAX_DEFAULT_VALUE_LENGTH);
+        assertEquals("{\"flag\":\"" + expectedValue + "\"}", tag);
+
+        // first-wins
+        acc.addDefault("flag", "second");
+        assertEquals(1, acc.defaultCount());
+    }
+
+    @Test
+    void jsonUsesPlatformWriterEscaping() {
+        // The platform JsonWriter escapes '/' as backslash-slash and non-ASCII as a backslash-u escape.
+        // That differs from the JS reference bytes but is round-trip-equivalent: all consumers
+        // JSON-parse these tags (backend Jackson, system-tests json.loads), so byte-parity is not
+        // required. '/' matters in practice because ffe_subjects_enc values are base64 (may contain
+        // '/').
+        assertEquals("{\"h\":\"a\\/b\"}", SpanEnrichmentAccumulator.toJsonObject(Collections.singletonMap("h", "a/b")));
+        assertEquals(
+                "{\"k\":\"caf\\u00E9\"}",
+                SpanEnrichmentAccumulator.toJsonObject(Collections.singletonMap("k", "café")));
+        // nested structured runtime default goes through the same writer
+        assertEquals(
+                "{\"a\":\"x\\/y\"}", SpanEnrichmentAccumulator.stringifyDefault(Collections.singletonMap("a", "x/y")));
+    }
 
-    // subject cap: 10 max distinct subjects
-    final SpanEnrichmentAccumulator acc2 = new SpanEnrichmentAccumulator();
-    for (int i = 0; i < 15; i++) {
-      acc2.addSubject("subject-" + i, i);
+    @Test
+    void maxDefaultsEnforced() {
+        final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
+        for (int i = 0; i < 10; i++) {
+            acc.addDefault("flag-" + i, "v");
+        }
+        assertEquals(SpanEnrichmentAccumulator.MAX_DEFAULTS, acc.defaultCount());
     }
-    assertEquals(SpanEnrichmentAccumulator.MAX_SUBJECTS, acc2.subjectCount());
-  }
-
-  @Test
-  void runtimeDefaultJsonStringifyAndTruncation() {
-    // native object -> JSON, not toString
-    assertEquals(
-        "{\"a\":\"b\"}",
-        SpanEnrichmentAccumulator.stringifyDefault(Collections.singletonMap("a", "b")));
-    // scalar string -> as-is
-    assertEquals("hello", SpanEnrichmentAccumulator.stringifyDefault("hello"));
-    // null -> "null"
-    assertEquals("null", SpanEnrichmentAccumulator.stringifyDefault(null));
-    // native list -> JSON array
-    assertEquals(
-        "[\"a\",2,true]",
-        SpanEnrichmentAccumulator.stringifyDefault(java.util.Arrays.asList("a", 2, true)));
-
-    // 64-char truncation
-    final StringBuilder longValue = new StringBuilder();
-    for (int i = 0; i < 100; i++) {
-      longValue.append('x');
+
+    @Test
+    void encoderNullAndNonSortedInput() {
+        assertEquals("", ULeb128Encoder.encodeDeltaVarint(null), "null → empty string");
+        // A non-SortedSet input must still encode identically (it is sorted internally).
+        final java.util.Set<Integer> unsorted = new java.util.HashSet<>(java.util.Arrays.asList(130, 100, 128, 108));
+        assertEquals("ZAgUAg==", ULeb128Encoder.encodeDeltaVarint(unsorted));
+    }
+
+    @Test
+    void serialIdDedupeAtCap() {
+        final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
+        for (int i = 0; i < SpanEnrichmentAccumulator.MAX_SERIAL_IDS; i++) {
+            acc.addSerialId(i);
+        }
+        acc.addSerialId(0); // already present + at cap → no-op, not dropped as "new"
+        acc.addSerialId(9999); // new + at cap → dropped
+        assertEquals(
+                SpanEnrichmentAccumulator.MAX_SERIAL_IDS, acc.serialIdsView().size());
+        assertTrue(acc.serialIdsView().contains(0));
+        assertFalse(acc.serialIdsView().contains(9999));
     }
-    final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
-    acc.addDefault("flag", longValue.toString());
-    final String tag = acc.toSpanTags().get(SpanEnrichmentAccumulator.TAG_RUNTIME_DEFAULTS);
-    final String expectedValue =
-        longValue.substring(0, SpanEnrichmentAccumulator.MAX_DEFAULT_VALUE_LENGTH);
-    assertEquals("{\"flag\":\"" + expectedValue + "\"}", tag);
-
-    // first-wins
-    acc.addDefault("flag", "second");
-    assertEquals(1, acc.defaultCount());
-  }
-
-  @Test
-  void jsonUsesPlatformWriterEscaping() {
-    // The platform JsonWriter escapes '/' as backslash-slash and non-ASCII as a backslash-u escape.
-    // That differs from the JS reference bytes but is round-trip-equivalent: all consumers
-    // JSON-parse these tags (backend Jackson, system-tests json.loads), so byte-parity is not
-    // required. '/' matters in practice because ffe_subjects_enc values are base64 (may contain
-    // '/').
-    assertEquals(
-        "{\"h\":\"a\\/b\"}",
-        SpanEnrichmentAccumulator.toJsonObject(Collections.singletonMap("h", "a/b")));
-    assertEquals(
-        "{\"k\":\"caf\\u00E9\"}",
-        SpanEnrichmentAccumulator.toJsonObject(Collections.singletonMap("k", "café")));
-    // nested structured runtime default goes through the same writer
-    assertEquals(
-        "{\"a\":\"x\\/y\"}",
-        SpanEnrichmentAccumulator.stringifyDefault(Collections.singletonMap("a", "x/y")));
-  }
-
-  @Test
-  void maxDefaultsEnforced() {
-    final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
-    for (int i = 0; i < 10; i++) {
-      acc.addDefault("flag-" + i, "v");
+
+    @Test
+    void subjectNullKeyIgnoredAndPerSubjectDedupeAtCap() {
+        final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
+        acc.addSubject(null, 1); // null targeting key → ignored
+        assertEquals(0, acc.subjectCount());
+        for (int i = 0; i < SpanEnrichmentAccumulator.MAX_EXPERIMENTS_PER_SUBJECT; i++) {
+            acc.addSubject("s", i);
+        }
+        acc.addSubject("s", 0); // existing subject, at exp cap, id present → no-op
+        acc.addSubject("s", 9999); // existing subject, at exp cap, id new → dropped
+        assertEquals(1, acc.subjectCount());
     }
-    assertEquals(SpanEnrichmentAccumulator.MAX_DEFAULTS, acc.defaultCount());
-  }
-
-  @Test
-  void encoderNullAndNonSortedInput() {
-    assertEquals("", ULeb128Encoder.encodeDeltaVarint(null), "null → empty string");
-    // A non-SortedSet input must still encode identically (it is sorted internally).
-    final java.util.Set<Integer> unsorted =
-        new java.util.HashSet<>(java.util.Arrays.asList(130, 100, 128, 108));
-    assertEquals("ZAgUAg==", ULeb128Encoder.encodeDeltaVarint(unsorted));
-  }
-
-  @Test
-  void serialIdDedupeAtCap() {
-    final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
-    for (int i = 0; i < SpanEnrichmentAccumulator.MAX_SERIAL_IDS; i++) {
-      acc.addSerialId(i);
+
+    @Test
+    void stringifyDefaultCoversAllNativeShapes() {
+        // list containing Double, Long, Short, Byte, null, and a nested Map — exercises every
+        // writeJsonValue branch (Number/double, Integer|Long|Short|Byte/long, null, Map, Iterable).
+        final Object nested =
+                java.util.Arrays.asList(1.5d, 3L, (short) 7, (byte) 2, null, Collections.singletonMap("k", "v"));
+        assertEquals("[1.5,3,7,2,null,{\"k\":\"v\"}]", SpanEnrichmentAccumulator.stringifyDefault(nested));
+
+        // Java array routes through isArray → serialized via its (non-JSON) string form, but must not
+        // throw; assert it produced a quoted string.
+        final String arr = SpanEnrichmentAccumulator.stringifyDefault(new int[] {1, 2});
+        assertTrue(arr.startsWith("\"") && arr.endsWith("\""));
+
+        // Character scalar (CharSequence/Character branch).
+        assertEquals("x", SpanEnrichmentAccumulator.stringifyDefault('x'));
     }
-    acc.addSerialId(0); // already present + at cap → no-op, not dropped as "new"
-    acc.addSerialId(9999); // new + at cap → dropped
-    assertEquals(SpanEnrichmentAccumulator.MAX_SERIAL_IDS, acc.serialIdsView().size());
-    assertTrue(acc.serialIdsView().contains(0));
-    assertFalse(acc.serialIdsView().contains(9999));
-  }
-
-  @Test
-  void subjectNullKeyIgnoredAndPerSubjectDedupeAtCap() {
-    final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
-    acc.addSubject(null, 1); // null targeting key → ignored
-    assertEquals(0, acc.subjectCount());
-    for (int i = 0; i < SpanEnrichmentAccumulator.MAX_EXPERIMENTS_PER_SUBJECT; i++) {
-      acc.addSubject("s", i);
+
+    @Test
+    void runtimeDefaultTruncationIsSurrogateSafe() {
+        // 63 ASCII chars then an astral emoji (a surrogate pair): truncating to 64 would split the
+        // pair at index 63, so utf8SafeTruncate must drop the dangling high surrogate → 63 chars.
+        final StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 63; i++) {
+            sb.append('a');
+        }
+        sb.append("😀"); // 😀 (high + low surrogate)
+        final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
+        acc.addDefault("flag", sb.toString());
+        final String tag = acc.toSpanTags().get(SpanEnrichmentAccumulator.TAG_RUNTIME_DEFAULTS);
+        assertEquals("{\"flag\":\"" + sb.substring(0, 63) + "\"}", tag);
     }
-    acc.addSubject("s", 0); // existing subject, at exp cap, id present → no-op
-    acc.addSubject("s", 9999); // existing subject, at exp cap, id new → dropped
-    assertEquals(1, acc.subjectCount());
-  }
-
-  @Test
-  void stringifyDefaultCoversAllNativeShapes() {
-    // list containing Double, Long, Short, Byte, null, and a nested Map — exercises every
-    // writeJsonValue branch (Number/double, Integer|Long|Short|Byte/long, null, Map, Iterable).
-    final Object nested =
-        java.util.Arrays.asList(
-            1.5d, 3L, (short) 7, (byte) 2, null, Collections.singletonMap("k", "v"));
-    assertEquals(
-        "[1.5,3,7,2,null,{\"k\":\"v\"}]", SpanEnrichmentAccumulator.stringifyDefault(nested));
-
-    // Java array routes through isArray → serialized via its (non-JSON) string form, but must not
-    // throw; assert it produced a quoted string.
-    final String arr = SpanEnrichmentAccumulator.stringifyDefault(new int[] {1, 2});
-    assertTrue(arr.startsWith("\"") && arr.endsWith("\""));
-
-    // Character scalar (CharSequence/Character branch).
-    assertEquals("x", SpanEnrichmentAccumulator.stringifyDefault('x'));
-  }
-
-  @Test
-  void runtimeDefaultTruncationIsSurrogateSafe() {
-    // 63 ASCII chars then an astral emoji (a surrogate pair): truncating to 64 would split the
-    // pair at index 63, so utf8SafeTruncate must drop the dangling high surrogate → 63 chars.
-    final StringBuilder sb = new StringBuilder();
-    for (int i = 0; i < 63; i++) {
-      sb.append('a');
+
+    @Test
+    void noDataWhenEmpty() {
+        final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
+        assertFalse(acc.hasData());
+        final Map<String, String> tags = acc.toSpanTags();
+        assertTrue(tags.isEmpty());
     }
-    sb.append("😀"); // 😀 (high + low surrogate)
-    final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
-    acc.addDefault("flag", sb.toString());
-    final String tag = acc.toSpanTags().get(SpanEnrichmentAccumulator.TAG_RUNTIME_DEFAULTS);
-    assertEquals("{\"flag\":\"" + sb.substring(0, 63) + "\"}", tag);
-  }
-
-  @Test
-  void noDataWhenEmpty() {
-    final SpanEnrichmentAccumulator acc = new SpanEnrichmentAccumulator();
-    assertFalse(acc.hasData());
-    final Map<String, String> tags = acc.toSpanTags();
-    assertTrue(tags.isEmpty());
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/SpanEnrichmentInterceptorTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/SpanEnrichmentInterceptorTest.java
index becbf4cd464..06c3824f302 100644
--- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/SpanEnrichmentInterceptorTest.java
+++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/SpanEnrichmentInterceptorTest.java
@@ -26,192 +26,192 @@
  */
 class SpanEnrichmentInterceptorTest {
 
-  /** A mock local-root span reporting itself as its own local root. */
-  private static AgentSpan rootSpan() {
-    final AgentSpan root = mock(AgentSpan.class);
-    when(root.getLocalRootSpan()).thenReturn(root);
-    return root;
-  }
-
-  /** A mock child span whose local root is {@code root} but which is itself NOT the root. */
-  private static AgentSpan childOf(final AgentSpan root) {
-    final AgentSpan child = mock(AgentSpan.class);
-    when(child.getLocalRootSpan()).thenReturn(root);
-    return child;
-  }
-
-  @Test
-  void priorityIsUnique() {
-    assertEquals(4, new SpanEnrichmentInterceptor(new SpanEnrichmentStates()).priority());
-  }
-
-  @Test
-  void emptyOrNoStateIsANoOpFastPath() {
-    final SpanEnrichmentStates states = new SpanEnrichmentStates();
-    final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
-    // empty trace
-    assertTrue(interceptor.onTraceComplete(Collections.emptyList()).isEmpty());
-    // no accumulated state => fast path, never touches the span
-    final AgentSpan root = rootSpan();
-    interceptor.onTraceComplete(Collections.singletonList(root));
-    verify(root, never()).setTag(anyString(), anyString());
-  }
-
-  @Test
-  void finalFlushWithRootPresentWritesTags() {
-    final SpanEnrichmentStates states = new SpanEnrichmentStates();
-    final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
-    final AgentSpan root = rootSpan();
-    states.getOrCreate(root).addSerialId(5);
-
-    interceptor.onTraceComplete(Collections.singletonList(root));
-
-    verify(root).setTag(SpanEnrichmentAccumulator.TAG_FLAGS_ENC, "BQ=="); // {5} -> 0x05
-    assertTrue(states.isEmpty(), "state must be removed on the final flush");
-  }
-
-  @Test
-  void partialFlushExcludingRootPreservesState() {
-    final SpanEnrichmentStates states = new SpanEnrichmentStates();
-    final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
-    final AgentSpan root = rootSpan();
-    states.getOrCreate(root).addSerialId(100);
-    states.getOrCreate(root).addSerialId(108);
-
-    // PARTIAL flush: a fragment of children only — the open root is NOT in the collection.
-    final AgentSpan child1 = childOf(root);
-    final AgentSpan child2 = childOf(root);
-    interceptor.onTraceComplete(Arrays.asList(child1, child2));
-
-    verify(child1, never()).setTag(anyString(), anyString());
-    verify(child2, never()).setTag(anyString(), anyString());
-    verify(root, never()).setTag(anyString(), anyString());
-    final SpanEnrichmentAccumulator surviving = states.peek(root);
-    assertNotNull(surviving, "partial flush must NOT remove the accumulator");
-    assertTrue(surviving.serialIdsView().contains(100) && surviving.serialIdsView().contains(108));
-
-    // more evaluations, then the FINAL flush with the root present
-    states.getOrCreate(root).addSerialId(128);
-    states.getOrCreate(root).addSerialId(130);
-    final AgentSpan lateChild = childOf(root);
-    interceptor.onTraceComplete(Arrays.asList(lateChild, root));
-
-    verify(root).setTag(SpanEnrichmentAccumulator.TAG_FLAGS_ENC, "ZAgUAg=="); // {100,108,128,130}
-    assertTrue(states.isEmpty(), "state removed only on the final flush");
-  }
-
-  @Test
-  void childOnlyFragmentNeverTagsAChildSpan() {
-    final SpanEnrichmentStates states = new SpanEnrichmentStates();
-    final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
-    final AgentSpan root = rootSpan();
-    states.getOrCreate(root).addSerialId(7);
-
-    final AgentSpan child = childOf(root);
-    interceptor.onTraceComplete(Collections.singletonList(child));
-
-    verify(child, never()).setTag(anyString(), anyString());
-    verify(root, never()).setTag(anyString(), anyString());
-    assertNotNull(states.peek(root), "child-only fragment must keep state");
-  }
-
-  @Test
-  void distinctTracesDoNotMerge() {
-    final SpanEnrichmentStates states = new SpanEnrichmentStates();
-    final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
-    final AgentSpan rootA = rootSpan();
-    final AgentSpan rootB = rootSpan();
-    states.getOrCreate(rootA).addSerialId(100);
-    states.getOrCreate(rootB).addSerialId(130);
-    assertEquals(2, states.size(), "distinct root spans must not share an accumulator");
-
-    interceptor.onTraceComplete(Collections.singletonList(rootA));
-    verify(rootA).setTag(SpanEnrichmentAccumulator.TAG_FLAGS_ENC, "ZA=="); // {100} -> 0x64
-    interceptor.onTraceComplete(Collections.singletonList(rootB));
-    verify(rootB).setTag(SpanEnrichmentAccumulator.TAG_FLAGS_ENC, "ggE="); // {130} -> 0x82 0x01
-  }
-
-  @Test
-  void neverCompletingTracesAreNotCapped() {
-    // No cap / eviction: while their local-root spans are reachable, every never-completing trace
-    // keeps its accumulator. Weak-key reclamation (not a fixed count) bounds memory.
-    final SpanEnrichmentStates states = new SpanEnrichmentStates();
-    final int churn = 20_000; // well beyond the old 4096 cap
-    final List<AgentSpan> liveRoots = new ArrayList<>(churn);
-    for (int i = 0; i < churn; i++) {
-      final AgentSpan root = rootSpan();
-      liveRoots.add(root);
-      states.getOrCreate(root).addSerialId(i % 1000 + 1);
+    /** A mock local-root span reporting itself as its own local root. */
+    private static AgentSpan rootSpan() {
+        final AgentSpan root = mock(AgentSpan.class);
+        when(root.getLocalRootSpan()).thenReturn(root);
+        return root;
+    }
+
+    /** A mock child span whose local root is {@code root} but which is itself NOT the root. */
+    private static AgentSpan childOf(final AgentSpan root) {
+        final AgentSpan child = mock(AgentSpan.class);
+        when(child.getLocalRootSpan()).thenReturn(root);
+        return child;
+    }
+
+    @Test
+    void priorityIsUnique() {
+        assertEquals(4, new SpanEnrichmentInterceptor(new SpanEnrichmentStates()).priority());
+    }
+
+    @Test
+    void emptyOrNoStateIsANoOpFastPath() {
+        final SpanEnrichmentStates states = new SpanEnrichmentStates();
+        final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
+        // empty trace
+        assertTrue(interceptor.onTraceComplete(Collections.emptyList()).isEmpty());
+        // no accumulated state => fast path, never touches the span
+        final AgentSpan root = rootSpan();
+        interceptor.onTraceComplete(Collections.singletonList(root));
+        verify(root, never()).setTag(anyString(), anyString());
+    }
+
+    @Test
+    void finalFlushWithRootPresentWritesTags() {
+        final SpanEnrichmentStates states = new SpanEnrichmentStates();
+        final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
+        final AgentSpan root = rootSpan();
+        states.getOrCreate(root).addSerialId(5);
+
+        interceptor.onTraceComplete(Collections.singletonList(root));
+
+        verify(root).setTag(SpanEnrichmentAccumulator.TAG_FLAGS_ENC, "BQ=="); // {5} -> 0x05
+        assertTrue(states.isEmpty(), "state must be removed on the final flush");
+    }
+
+    @Test
+    void partialFlushExcludingRootPreservesState() {
+        final SpanEnrichmentStates states = new SpanEnrichmentStates();
+        final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
+        final AgentSpan root = rootSpan();
+        states.getOrCreate(root).addSerialId(100);
+        states.getOrCreate(root).addSerialId(108);
+
+        // PARTIAL flush: a fragment of children only — the open root is NOT in the collection.
+        final AgentSpan child1 = childOf(root);
+        final AgentSpan child2 = childOf(root);
+        interceptor.onTraceComplete(Arrays.asList(child1, child2));
+
+        verify(child1, never()).setTag(anyString(), anyString());
+        verify(child2, never()).setTag(anyString(), anyString());
+        verify(root, never()).setTag(anyString(), anyString());
+        final SpanEnrichmentAccumulator surviving = states.peek(root);
+        assertNotNull(surviving, "partial flush must NOT remove the accumulator");
+        assertTrue(surviving.serialIdsView().contains(100)
+                && surviving.serialIdsView().contains(108));
+
+        // more evaluations, then the FINAL flush with the root present
+        states.getOrCreate(root).addSerialId(128);
+        states.getOrCreate(root).addSerialId(130);
+        final AgentSpan lateChild = childOf(root);
+        interceptor.onTraceComplete(Arrays.asList(lateChild, root));
+
+        verify(root).setTag(SpanEnrichmentAccumulator.TAG_FLAGS_ENC, "ZAgUAg=="); // {100,108,128,130}
+        assertTrue(states.isEmpty(), "state removed only on the final flush");
+    }
+
+    @Test
+    void childOnlyFragmentNeverTagsAChildSpan() {
+        final SpanEnrichmentStates states = new SpanEnrichmentStates();
+        final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
+        final AgentSpan root = rootSpan();
+        states.getOrCreate(root).addSerialId(7);
+
+        final AgentSpan child = childOf(root);
+        interceptor.onTraceComplete(Collections.singletonList(child));
+
+        verify(child, never()).setTag(anyString(), anyString());
+        verify(root, never()).setTag(anyString(), anyString());
+        assertNotNull(states.peek(root), "child-only fragment must keep state");
+    }
+
+    @Test
+    void distinctTracesDoNotMerge() {
+        final SpanEnrichmentStates states = new SpanEnrichmentStates();
+        final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
+        final AgentSpan rootA = rootSpan();
+        final AgentSpan rootB = rootSpan();
+        states.getOrCreate(rootA).addSerialId(100);
+        states.getOrCreate(rootB).addSerialId(130);
+        assertEquals(2, states.size(), "distinct root spans must not share an accumulator");
+
+        interceptor.onTraceComplete(Collections.singletonList(rootA));
+        verify(rootA).setTag(SpanEnrichmentAccumulator.TAG_FLAGS_ENC, "ZA=="); // {100} -> 0x64
+        interceptor.onTraceComplete(Collections.singletonList(rootB));
+        verify(rootB).setTag(SpanEnrichmentAccumulator.TAG_FLAGS_ENC, "ggE="); // {130} -> 0x82 0x01
+    }
+
+    @Test
+    void neverCompletingTracesAreNotCapped() {
+        // No cap / eviction: while their local-root spans are reachable, every never-completing trace
+        // keeps its accumulator. Weak-key reclamation (not a fixed count) bounds memory.
+        final SpanEnrichmentStates states = new SpanEnrichmentStates();
+        final int churn = 20_000; // well beyond the old 4096 cap
+        final List<AgentSpan> liveRoots = new ArrayList<>(churn);
+        for (int i = 0; i < churn; i++) {
+            final AgentSpan root = rootSpan();
+            liveRoots.add(root);
+            states.getOrCreate(root).addSerialId(i % 1000 + 1);
+        }
+        assertEquals(churn, states.size(), "no cap/eviction: every live root keeps its accumulator");
+    }
+
+    @Test
+    void nullTraceIsANoOp() {
+        final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(new SpanEnrichmentStates());
+        assertNull(interceptor.onTraceComplete(null));
+    }
+
+    @Test
+    void rootPresentButNoAccumulatorEntryWritesNothing() {
+        // states is non-empty (has rootA) but we flush rootB which has no entry → remove returns null.
+        final SpanEnrichmentStates states = new SpanEnrichmentStates();
+        final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
+        final AgentSpan rootA = rootSpan();
+        states.getOrCreate(rootA).addSerialId(1);
+        final AgentSpan rootB = rootSpan();
+        interceptor.onTraceComplete(Collections.singletonList(rootB));
+        verify(rootB, never()).setTag(anyString(), anyString());
+    }
+
+    @Test
+    void emptyAccumulatorWritesNoTags() {
+        final SpanEnrichmentStates states = new SpanEnrichmentStates();
+        final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
+        final AgentSpan root = rootSpan();
+        states.getOrCreate(root); // entry exists but has no data
+        interceptor.onTraceComplete(Collections.singletonList(root));
+        verify(root, never()).setTag(anyString(), anyString());
+        assertTrue(states.isEmpty(), "empty accumulator is still removed on the final flush");
+    }
+
+    @Test
+    void fallbackResolvesSelfRootWhenFirstSpanReportsNoLocalRoot() {
+        // First span reports a null local root; a later span that is its own local root is chosen.
+        final SpanEnrichmentStates states = new SpanEnrichmentStates();
+        final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
+        final AgentSpan noRootFirst = mock(AgentSpan.class);
+        when(noRootFirst.getLocalRootSpan()).thenReturn(null);
+        final AgentSpan root = rootSpan();
+        states.getOrCreate(root).addSerialId(5);
+        interceptor.onTraceComplete(Arrays.<MutableSpan>asList(noRootFirst, root));
+        verify(root).setTag(SpanEnrichmentAccumulator.TAG_FLAGS_ENC, "BQ==");
+    }
+
+    @Test
+    void neverThrowsWhenSetTagFails() {
+        final SpanEnrichmentStates states = new SpanEnrichmentStates();
+        final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
+        final AgentSpan root = rootSpan();
+        when(root.setTag(anyString(), anyString())).thenThrow(new RuntimeException("boom"));
+        states.getOrCreate(root).addSerialId(5);
+        // Must swallow the exception — enrichment can never break trace finish.
+        interceptor.onTraceComplete(Collections.singletonList(root));
+    }
+
+    @Test
+    void keyingSymmetryRootResolvedFromFragmentMatchesCapturedRoot() {
+        final SpanEnrichmentStates states = new SpanEnrichmentStates();
+        final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
+        final AgentSpan root = rootSpan();
+        states.getOrCreate(root).addSerialId(5);
+
+        // The interceptor resolves the root from the fragment (root + a late child); it must be the
+        // same object so the remove hits the captured accumulator.
+        final AgentSpan child = childOf(root);
+        interceptor.onTraceComplete(Arrays.<MutableSpan>asList(child, root));
+        verify(root).setTag(SpanEnrichmentAccumulator.TAG_FLAGS_ENC, "BQ=="); // {5} -> 0x05
+        assertTrue(states.isEmpty());
     }
-    assertEquals(churn, states.size(), "no cap/eviction: every live root keeps its accumulator");
-  }
-
-  @Test
-  void nullTraceIsANoOp() {
-    final SpanEnrichmentInterceptor interceptor =
-        new SpanEnrichmentInterceptor(new SpanEnrichmentStates());
-    assertNull(interceptor.onTraceComplete(null));
-  }
-
-  @Test
-  void rootPresentButNoAccumulatorEntryWritesNothing() {
-    // states is non-empty (has rootA) but we flush rootB which has no entry → remove returns null.
-    final SpanEnrichmentStates states = new SpanEnrichmentStates();
-    final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
-    final AgentSpan rootA = rootSpan();
-    states.getOrCreate(rootA).addSerialId(1);
-    final AgentSpan rootB = rootSpan();
-    interceptor.onTraceComplete(Collections.singletonList(rootB));
-    verify(rootB, never()).setTag(anyString(), anyString());
-  }
-
-  @Test
-  void emptyAccumulatorWritesNoTags() {
-    final SpanEnrichmentStates states = new SpanEnrichmentStates();
-    final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
-    final AgentSpan root = rootSpan();
-    states.getOrCreate(root); // entry exists but has no data
-    interceptor.onTraceComplete(Collections.singletonList(root));
-    verify(root, never()).setTag(anyString(), anyString());
-    assertTrue(states.isEmpty(), "empty accumulator is still removed on the final flush");
-  }
-
-  @Test
-  void fallbackResolvesSelfRootWhenFirstSpanReportsNoLocalRoot() {
-    // First span reports a null local root; a later span that is its own local root is chosen.
-    final SpanEnrichmentStates states = new SpanEnrichmentStates();
-    final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
-    final AgentSpan noRootFirst = mock(AgentSpan.class);
-    when(noRootFirst.getLocalRootSpan()).thenReturn(null);
-    final AgentSpan root = rootSpan();
-    states.getOrCreate(root).addSerialId(5);
-    interceptor.onTraceComplete(Arrays.<MutableSpan>asList(noRootFirst, root));
-    verify(root).setTag(SpanEnrichmentAccumulator.TAG_FLAGS_ENC, "BQ==");
-  }
-
-  @Test
-  void neverThrowsWhenSetTagFails() {
-    final SpanEnrichmentStates states = new SpanEnrichmentStates();
-    final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
-    final AgentSpan root = rootSpan();
-    when(root.setTag(anyString(), anyString())).thenThrow(new RuntimeException("boom"));
-    states.getOrCreate(root).addSerialId(5);
-    // Must swallow the exception — enrichment can never break trace finish.
-    interceptor.onTraceComplete(Collections.singletonList(root));
-  }
-
-  @Test
-  void keyingSymmetryRootResolvedFromFragmentMatchesCapturedRoot() {
-    final SpanEnrichmentStates states = new SpanEnrichmentStates();
-    final SpanEnrichmentInterceptor interceptor = new SpanEnrichmentInterceptor(states);
-    final AgentSpan root = rootSpan();
-    states.getOrCreate(root).addSerialId(5);
-
-    // The interceptor resolves the root from the fragment (root + a late child); it must be the
-    // same object so the remove hits the captured accumulator.
-    final AgentSpan child = childOf(root);
-    interceptor.onTraceComplete(Arrays.<MutableSpan>asList(child, root));
-    verify(root).setTag(SpanEnrichmentAccumulator.TAG_FLAGS_ENC, "BQ=="); // {5} -> 0x05
-    assertTrue(states.isEmpty());
-  }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/SpanEnrichmentWriterTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/SpanEnrichmentWriterTest.java
index 662fe928658..bda7d089ac1 100644
--- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/SpanEnrichmentWriterTest.java
+++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/SpanEnrichmentWriterTest.java
@@ -23,190 +23,183 @@
  */
 class SpanEnrichmentWriterTest {
 
-  private static AgentSpan rootSpan() {
-    final AgentSpan root = mock(AgentSpan.class);
-    when(root.getLocalRootSpan()).thenReturn(root);
-    return root;
-  }
-
-  private static SpanEnrichmentWriter writerFor(final AgentSpan root) {
-    return new SpanEnrichmentWriter(() -> root);
-  }
-
-  @Test
-  void serialIdWithDoLogAndTargetingKeyRecordsSerialAndSubject() {
-    final AgentSpan root = rootSpan();
-    final SpanEnrichmentWriter writer = writerFor(root);
-    writer.accept(SpanEnrichmentEvent.serialId(42, true, "user-1"));
-
-    final SpanEnrichmentAccumulator state = writer.states().peek(root);
-    assertNotNull(state);
-    assertTrue(state.serialIdsView().contains(42));
-    assertEquals(1, state.subjectCount(), "doLog=true + targeting key => subject recorded");
-  }
-
-  @Test
-  void serialIdWithoutDoLogRecordsNoSubject() {
-    final AgentSpan root = rootSpan();
-    final SpanEnrichmentWriter writer = writerFor(root);
-    writer.accept(SpanEnrichmentEvent.serialId(7, false, "user-1"));
-
-    final SpanEnrichmentAccumulator state = writer.states().peek(root);
-    assertTrue(state.serialIdsView().contains(7));
-    assertEquals(0, state.subjectCount(), "doLog=false must not record a subject");
-  }
-
-  @Test
-  void serialIdWithNullTargetingKeyRecordsNoSubject() {
-    final AgentSpan root = rootSpan();
-    final SpanEnrichmentWriter writer = writerFor(root);
-    writer.accept(SpanEnrichmentEvent.serialId(9, true, null));
-
-    final SpanEnrichmentAccumulator state = writer.states().peek(root);
-    assertTrue(state.serialIdsView().contains(9));
-    assertEquals(0, state.subjectCount(), "no targeting key => no subject");
-  }
-
-  @Test
-  void runtimeDefaultRecordsDefault() {
-    final AgentSpan root = rootSpan();
-    final SpanEnrichmentWriter writer = writerFor(root);
-    writer.accept(SpanEnrichmentEvent.runtimeDefault("flag", Collections.singletonMap("k", "v")));
-
-    final SpanEnrichmentAccumulator state = writer.states().peek(root);
-    assertNotNull(state);
-    assertEquals(1, state.defaultCount());
-  }
-
-  @Test
-  void noActiveSpanAccumulatesNothing() {
-    final SpanEnrichmentWriter writer = new SpanEnrichmentWriter(() -> null);
-    writer.accept(SpanEnrichmentEvent.serialId(1, true, "user-1"));
-    assertTrue(writer.states().isEmpty(), "no active span => no accumulator state");
-  }
-
-  @Test
-  void nullEventIsANoOp() {
-    final AgentSpan root = rootSpan();
-    final SpanEnrichmentWriter writer = writerFor(root);
-    writer.accept(null);
-    assertTrue(writer.states().isEmpty());
-  }
-
-  @Test
-  void endToEndAccumulateThenFlush() {
-    final AgentSpan root = rootSpan();
-    final SpanEnrichmentWriter writer = writerFor(root);
-    writer.accept(SpanEnrichmentEvent.serialId(5, false, null));
-
-    writer.interceptor().onTraceComplete(Collections.singletonList(root));
-    verify(root).setTag(SpanEnrichmentAccumulator.TAG_FLAGS_ENC, "BQ=="); // {5} -> 0x05
-    assertTrue(writer.states().isEmpty(), "flush removes the accumulated state");
-  }
-
-  @Test
-  void doesNotAccumulateWhenInterceptorCannotRegister() {
-    final AgentSpan root = rootSpan();
-    // Registrar always rejects → nothing would ever flush the state, so we must not accumulate.
-    final SpanEnrichmentWriter writer = new SpanEnrichmentWriter(() -> root, interceptor -> false);
-    writer.accept(SpanEnrichmentEvent.serialId(5, false, null));
-    assertTrue(
-        writer.states().isEmpty(), "no accumulation when the interceptor cannot be registered");
-  }
-
-  @Test
-  void agentSingletonIsStableAcrossRestarts() {
-    // FeatureFlaggingSystem reuses this one instance across start/stop, so the (unremovable) trace
-    // interceptor is registered exactly once and never re-registered on restart.
-    final SpanEnrichmentWriter first = SpanEnrichmentWriter.getInstance();
-    final SpanEnrichmentWriter second = SpanEnrichmentWriter.getInstance();
-    assertSame(first, second, "agent wiring must reuse one writer across restarts");
-    assertSame(first.interceptor(), second.interceptor(), "same interceptor across restarts");
-    assertSame(first.states(), second.states(), "same state store across restarts");
-  }
-
-  @Test
-  void agentSingletonUsesProductionDependencies() {
-    final SpanEnrichmentWriter writer = SpanEnrichmentWriter.getInstance();
-    assertNotNull(writer.rootSpanResolver());
-    assertNotNull(writer.registrar());
-  }
-
-  @Test
-  void resolveLocalRootLogic() {
-    assertNull(SpanEnrichmentWriter.resolveLocalRoot(null));
-
-    final AgentSpan root = rootSpan(); // reports itself as its own local root
-    assertSame(root, SpanEnrichmentWriter.resolveLocalRoot(root));
-
-    final AgentSpan child = mock(AgentSpan.class);
-    final AgentSpan childRoot = rootSpan();
-    when(child.getLocalRootSpan()).thenReturn(childRoot);
-    assertSame(childRoot, SpanEnrichmentWriter.resolveLocalRoot(child));
-
-    final AgentSpan noLocal = mock(AgentSpan.class);
-    when(noLocal.getLocalRootSpan()).thenReturn(null);
-    assertSame(
-        noLocal, SpanEnrichmentWriter.resolveLocalRoot(noLocal), "no local root → active span");
-  }
-
-  @Test
-  void initSubscribesAndCloseClearsState() {
-    final AgentSpan root = rootSpan();
-    final SpanEnrichmentWriter writer = writerFor(root);
-    writer.init();
-    try {
-      writer.accept(SpanEnrichmentEvent.serialId(5, false, null));
-      assertNotNull(writer.states().peek(root));
-    } finally {
-      writer.close();
-    }
-    assertTrue(writer.states().isEmpty(), "close() clears accumulated state");
-  }
-
-  @Test
-  void runtimeDefaultWithNullFlagKeyIsIgnored() {
-    final AgentSpan root = rootSpan();
-    final SpanEnrichmentWriter writer = writerFor(root);
-    writer.accept(SpanEnrichmentEvent.runtimeDefault(null, "v"));
-    // No serial id and null flag key → nothing recorded (getOrCreate ran, but no data added).
-    final SpanEnrichmentAccumulator state = writer.states().peek(root);
-    assertTrue(state == null || !state.hasData());
-  }
-
-  @Test
-  void acceptSwallowsResolverErrors() {
-    final SpanEnrichmentWriter writer =
-        new SpanEnrichmentWriter(
-            () -> {
-              throw new RuntimeException("resolver boom");
-            });
-    // Must not propagate — enrichment can never break flag evaluation.
-    writer.accept(SpanEnrichmentEvent.serialId(5, false, null));
-    assertTrue(writer.states().isEmpty());
-  }
-
-  @Test
-  void registrarErrorIsSwallowedAndNotLatched() {
-    final AgentSpan root = rootSpan();
-    final SpanEnrichmentWriter writer =
-        new SpanEnrichmentWriter(
-            () -> root,
-            interceptor -> {
-              throw new RuntimeException("register boom");
-            });
-    // Registration throws → swallowed, not latched, and nothing accumulates (never flushable).
-    writer.accept(SpanEnrichmentEvent.serialId(5, false, null));
-    assertTrue(writer.states().isEmpty());
-  }
-
-  @Test
-  void distinctEventsUnderSameRootShareAccumulator() {
-    final AgentSpan root = rootSpan();
-    final SpanEnrichmentWriter writer = writerFor(root);
-    writer.accept(SpanEnrichmentEvent.serialId(100, false, null));
-    writer.accept(SpanEnrichmentEvent.serialId(108, false, null));
-    assertEquals(1, writer.states().size(), "same root => one shared accumulator");
-    verify(root, never()).setTag(anyString(), anyString());
-  }
+    private static AgentSpan rootSpan() {
+        final AgentSpan root = mock(AgentSpan.class);
+        when(root.getLocalRootSpan()).thenReturn(root);
+        return root;
+    }
+
+    private static SpanEnrichmentWriter writerFor(final AgentSpan root) {
+        return new SpanEnrichmentWriter(() -> root);
+    }
+
+    @Test
+    void serialIdWithDoLogAndTargetingKeyRecordsSerialAndSubject() {
+        final AgentSpan root = rootSpan();
+        final SpanEnrichmentWriter writer = writerFor(root);
+        writer.accept(SpanEnrichmentEvent.serialId(42, true, "user-1"));
+
+        final SpanEnrichmentAccumulator state = writer.states().peek(root);
+        assertNotNull(state);
+        assertTrue(state.serialIdsView().contains(42));
+        assertEquals(1, state.subjectCount(), "doLog=true + targeting key => subject recorded");
+    }
+
+    @Test
+    void serialIdWithoutDoLogRecordsNoSubject() {
+        final AgentSpan root = rootSpan();
+        final SpanEnrichmentWriter writer = writerFor(root);
+        writer.accept(SpanEnrichmentEvent.serialId(7, false, "user-1"));
+
+        final SpanEnrichmentAccumulator state = writer.states().peek(root);
+        assertTrue(state.serialIdsView().contains(7));
+        assertEquals(0, state.subjectCount(), "doLog=false must not record a subject");
+    }
+
+    @Test
+    void serialIdWithNullTargetingKeyRecordsNoSubject() {
+        final AgentSpan root = rootSpan();
+        final SpanEnrichmentWriter writer = writerFor(root);
+        writer.accept(SpanEnrichmentEvent.serialId(9, true, null));
+
+        final SpanEnrichmentAccumulator state = writer.states().peek(root);
+        assertTrue(state.serialIdsView().contains(9));
+        assertEquals(0, state.subjectCount(), "no targeting key => no subject");
+    }
+
+    @Test
+    void runtimeDefaultRecordsDefault() {
+        final AgentSpan root = rootSpan();
+        final SpanEnrichmentWriter writer = writerFor(root);
+        writer.accept(SpanEnrichmentEvent.runtimeDefault("flag", Collections.singletonMap("k", "v")));
+
+        final SpanEnrichmentAccumulator state = writer.states().peek(root);
+        assertNotNull(state);
+        assertEquals(1, state.defaultCount());
+    }
+
+    @Test
+    void noActiveSpanAccumulatesNothing() {
+        final SpanEnrichmentWriter writer = new SpanEnrichmentWriter(() -> null);
+        writer.accept(SpanEnrichmentEvent.serialId(1, true, "user-1"));
+        assertTrue(writer.states().isEmpty(), "no active span => no accumulator state");
+    }
+
+    @Test
+    void nullEventIsANoOp() {
+        final AgentSpan root = rootSpan();
+        final SpanEnrichmentWriter writer = writerFor(root);
+        writer.accept(null);
+        assertTrue(writer.states().isEmpty());
+    }
+
+    @Test
+    void endToEndAccumulateThenFlush() {
+        final AgentSpan root = rootSpan();
+        final SpanEnrichmentWriter writer = writerFor(root);
+        writer.accept(SpanEnrichmentEvent.serialId(5, false, null));
+
+        writer.interceptor().onTraceComplete(Collections.singletonList(root));
+        verify(root).setTag(SpanEnrichmentAccumulator.TAG_FLAGS_ENC, "BQ=="); // {5} -> 0x05
+        assertTrue(writer.states().isEmpty(), "flush removes the accumulated state");
+    }
+
+    @Test
+    void doesNotAccumulateWhenInterceptorCannotRegister() {
+        final AgentSpan root = rootSpan();
+        // Registrar always rejects → nothing would ever flush the state, so we must not accumulate.
+        final SpanEnrichmentWriter writer = new SpanEnrichmentWriter(() -> root, interceptor -> false);
+        writer.accept(SpanEnrichmentEvent.serialId(5, false, null));
+        assertTrue(writer.states().isEmpty(), "no accumulation when the interceptor cannot be registered");
+    }
+
+    @Test
+    void agentSingletonIsStableAcrossRestarts() {
+        // FeatureFlaggingSystem reuses this one instance across start/stop, so the (unremovable) trace
+        // interceptor is registered exactly once and never re-registered on restart.
+        final SpanEnrichmentWriter first = SpanEnrichmentWriter.getInstance();
+        final SpanEnrichmentWriter second = SpanEnrichmentWriter.getInstance();
+        assertSame(first, second, "agent wiring must reuse one writer across restarts");
+        assertSame(first.interceptor(), second.interceptor(), "same interceptor across restarts");
+        assertSame(first.states(), second.states(), "same state store across restarts");
+    }
+
+    @Test
+    void agentSingletonUsesProductionDependencies() {
+        final SpanEnrichmentWriter writer = SpanEnrichmentWriter.getInstance();
+        assertNotNull(writer.rootSpanResolver());
+        assertNotNull(writer.registrar());
+    }
+
+    @Test
+    void resolveLocalRootLogic() {
+        assertNull(SpanEnrichmentWriter.resolveLocalRoot(null));
+
+        final AgentSpan root = rootSpan(); // reports itself as its own local root
+        assertSame(root, SpanEnrichmentWriter.resolveLocalRoot(root));
+
+        final AgentSpan child = mock(AgentSpan.class);
+        final AgentSpan childRoot = rootSpan();
+        when(child.getLocalRootSpan()).thenReturn(childRoot);
+        assertSame(childRoot, SpanEnrichmentWriter.resolveLocalRoot(child));
+
+        final AgentSpan noLocal = mock(AgentSpan.class);
+        when(noLocal.getLocalRootSpan()).thenReturn(null);
+        assertSame(noLocal, SpanEnrichmentWriter.resolveLocalRoot(noLocal), "no local root → active span");
+    }
+
+    @Test
+    void initSubscribesAndCloseClearsState() {
+        final AgentSpan root = rootSpan();
+        final SpanEnrichmentWriter writer = writerFor(root);
+        writer.init();
+        try {
+            writer.accept(SpanEnrichmentEvent.serialId(5, false, null));
+            assertNotNull(writer.states().peek(root));
+        } finally {
+            writer.close();
+        }
+        assertTrue(writer.states().isEmpty(), "close() clears accumulated state");
+    }
+
+    @Test
+    void runtimeDefaultWithNullFlagKeyIsIgnored() {
+        final AgentSpan root = rootSpan();
+        final SpanEnrichmentWriter writer = writerFor(root);
+        writer.accept(SpanEnrichmentEvent.runtimeDefault(null, "v"));
+        // No serial id and null flag key → nothing recorded (getOrCreate ran, but no data added).
+        final SpanEnrichmentAccumulator state = writer.states().peek(root);
+        assertTrue(state == null || !state.hasData());
+    }
+
+    @Test
+    void acceptSwallowsResolverErrors() {
+        final SpanEnrichmentWriter writer = new SpanEnrichmentWriter(() -> {
+            throw new RuntimeException("resolver boom");
+        });
+        // Must not propagate — enrichment can never break flag evaluation.
+        writer.accept(SpanEnrichmentEvent.serialId(5, false, null));
+        assertTrue(writer.states().isEmpty());
+    }
+
+    @Test
+    void registrarErrorIsSwallowedAndNotLatched() {
+        final AgentSpan root = rootSpan();
+        final SpanEnrichmentWriter writer = new SpanEnrichmentWriter(() -> root, interceptor -> {
+            throw new RuntimeException("register boom");
+        });
+        // Registration throws → swallowed, not latched, and nothing accumulates (never flushable).
+        writer.accept(SpanEnrichmentEvent.serialId(5, false, null));
+        assertTrue(writer.states().isEmpty());
+    }
+
+    @Test
+    void distinctEventsUnderSameRootShareAccumulator() {
+        final AgentSpan root = rootSpan();
+        final SpanEnrichmentWriter writer = writerFor(root);
+        writer.accept(SpanEnrichmentEvent.serialId(100, false, null));
+        writer.accept(SpanEnrichmentEvent.serialId(108, false, null));
+        assertEquals(1, writer.states().size(), "same root => one shared accumulator");
+        verify(root, never()).setTag(anyString(), anyString());
+    }
 }
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/ULeb128EncoderTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/ULeb128EncoderTest.java
index f47fdeaef1c..b1b634ca9b8 100644
--- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/ULeb128EncoderTest.java
+++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/ULeb128EncoderTest.java
@@ -8,32 +8,32 @@
 
 class ULeb128EncoderTest {
 
-  @Test
-  void hashTargetingKeyMatchesCanonicalPiiVector() {
-    // Canonical vector shared across all SDK implementations — see system-tests PR #7316.
-    assertEquals(
-        "b4698f9b6d186781fa8dc59e533578fa2d8379a46b1cf6db85cda6aa9c99e51b",
-        ULeb128Encoder.hashTargetingKey("jane.doe@datadoghq.com"));
-  }
+    @Test
+    void hashTargetingKeyMatchesCanonicalPiiVector() {
+        // Canonical vector shared across all SDK implementations — see system-tests PR #7316.
+        assertEquals(
+                "b4698f9b6d186781fa8dc59e533578fa2d8379a46b1cf6db85cda6aa9c99e51b",
+                ULeb128Encoder.hashTargetingKey("jane.doe@datadoghq.com"));
+    }
 
-  @Test
-  void hashTargetingKeyPreservesWhitespaceExactly() {
-    assertNotEquals(
-        ULeb128Encoder.hashTargetingKey("jane.doe@datadoghq.com"),
-        ULeb128Encoder.hashTargetingKey(" jane.doe@datadoghq.com "));
-  }
+    @Test
+    void hashTargetingKeyPreservesWhitespaceExactly() {
+        assertNotEquals(
+                ULeb128Encoder.hashTargetingKey("jane.doe@datadoghq.com"),
+                ULeb128Encoder.hashTargetingKey(" jane.doe@datadoghq.com "));
+    }
 
-  @Test
-  void hashTargetingKeyPreservesCaseExactly() {
-    assertNotEquals(
-        ULeb128Encoder.hashTargetingKey("jane.doe@datadoghq.com"),
-        ULeb128Encoder.hashTargetingKey("JANE.DOE@DATADOGHQ.COM"));
-  }
+    @Test
+    void hashTargetingKeyPreservesCaseExactly() {
+        assertNotEquals(
+                ULeb128Encoder.hashTargetingKey("jane.doe@datadoghq.com"),
+                ULeb128Encoder.hashTargetingKey("JANE.DOE@DATADOGHQ.COM"));
+    }
 
-  @Test
-  void hashTargetingKeyIsLowercase64CharHex() {
-    final String hash = ULeb128Encoder.hashTargetingKey("some-arbitrary-key");
-    assertEquals(64, hash.length());
-    assertTrue(hash.matches("[0-9a-f]{64}"));
-  }
+    @Test
+    void hashTargetingKeyIsLowercase64CharHex() {
+        final String hash = ULeb128Encoder.hashTargetingKey("some-arbitrary-key");
+        assertEquals(64, hash.length());
+        assertTrue(hash.matches("[0-9a-f]{64}"));
+    }
 }
diff --git a/products/metrics/metrics-agent/src/main/java/datadog/metrics/agent/AgentMeter.java b/products/metrics/metrics-agent/src/main/java/datadog/metrics/agent/AgentMeter.java
index 2ad193dfeda..bd5659e85d7 100644
--- a/products/metrics/metrics-agent/src/main/java/datadog/metrics/agent/AgentMeter.java
+++ b/products/metrics/metrics-agent/src/main/java/datadog/metrics/agent/AgentMeter.java
@@ -8,31 +8,30 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public class AgentMeter {
-  private static volatile StatsDClient statsdClient = StatsDClient.NO_OP;
-  private static volatile Monitoring monitoring = DISABLED;
+    private static volatile StatsDClient statsdClient = StatsDClient.NO_OP;
+    private static volatile Monitoring monitoring = DISABLED;
 
-  // StatsD client connection
-  public static StatsDClient statsDClient() {
-    return statsdClient;
-  }
-
-  // Health metrics monitoring
-  public static Monitoring monitoring() {
-    return monitoring;
-  }
+    // StatsD client connection
+    public static StatsDClient statsDClient() {
+        return statsdClient;
+    }
 
-  @SuppressFBWarnings(
-      value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
-      justification =
-          "Agent-internal holder; AgentMeter.class is not exposed to instrumented app code")
-  public static synchronized void registerIfAbsent(
-      StatsDClient statsDClient, Monitoring monitoring, Histograms.Factory historgramFactory) {
-    if (statsDClient != null && AgentMeter.statsdClient == StatsDClient.NO_OP) {
-      AgentMeter.statsdClient = statsDClient;
+    // Health metrics monitoring
+    public static Monitoring monitoring() {
+        return monitoring;
     }
-    if (monitoring != null && monitoring != DISABLED) {
-      AgentMeter.monitoring = monitoring;
+
+    @SuppressFBWarnings(
+            value = "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION",
+            justification = "Agent-internal holder; AgentMeter.class is not exposed to instrumented app code")
+    public static synchronized void registerIfAbsent(
+            StatsDClient statsDClient, Monitoring monitoring, Histograms.Factory historgramFactory) {
+        if (statsDClient != null && AgentMeter.statsdClient == StatsDClient.NO_OP) {
+            AgentMeter.statsdClient = statsDClient;
+        }
+        if (monitoring != null && monitoring != DISABLED) {
+            AgentMeter.monitoring = monitoring;
+        }
+        Histograms.register(historgramFactory);
     }
-    Histograms.register(historgramFactory);
-  }
 }
diff --git a/products/metrics/metrics-api/src/jmh/java/datadog/metrics/api/AccumulatorBenchmark.java b/products/metrics/metrics-api/src/jmh/java/datadog/metrics/api/AccumulatorBenchmark.java
index f5ab5147c1c..801aa32708c 100644
--- a/products/metrics/metrics-api/src/jmh/java/datadog/metrics/api/AccumulatorBenchmark.java
+++ b/products/metrics/metrics-api/src/jmh/java/datadog/metrics/api/AccumulatorBenchmark.java
@@ -133,383 +133,383 @@
 @Fork(5)
 public class AccumulatorBenchmark {
 
-  enum Counter {
-    HITS
-  }
-
-  /**
-   * An 8-constant counterpart to {@link Counter}, used only by the {@code *8_*} benchmarks below.
-   * Unlike {@link Counter}, where every thread hits the single {@code HITS} constant (the worst
-   * case for {@code longAdderGroup}'s per-counter locking -- one lock shared by every thread,
-   * regardless of core count), these benchmarks spread writes across all 8 constants: each JMH
-   * worker thread is pinned to one fixed counter for its lifetime (see {@link
-   * #threadCounterIndex}), so under high contention, threads split into up to 8 groups each
-   * contending on their own lock instead of all threads sharing one. This is the topology where
-   * {@code longAdderGroup}'s distributed locking should actually pay off, and where {@link
-   * Accumulator}'s thread-striped design has to earn its win on the write side rather than facing a
-   * single-counter worst case. {@code accumulateAndReset}/{@code groupAccumulateAnd} also now walk
-   * 8 slots per drain instead of 1, sizing the drain cost closer to {@code TracerHealthMetric}'s
-   * 54-constant production shape.
-   */
-  enum Counter8 {
-    COUNTER_0,
-    COUNTER_1,
-    COUNTER_2,
-    COUNTER_3,
-    COUNTER_4,
-    COUNTER_5,
-    COUNTER_6,
-    COUNTER_7
-  }
-
-  private static final Counter8[] COUNTER8_VALUES = Counter8.values();
-
-  private final LongAdder adder = new LongAdder();
-  private final LongAdder deltaAdder = new LongAdder();
-  private long deltaPrevious;
-  private final Accumulator<Counter> accumulator = Accumulator.of(Counter.class);
-  private final Accumulator<Counter8> accumulator8 = Accumulator.of(Counter8.class);
-  private final ConcurrentHashMap<String, AtomicLong> chm = new ConcurrentHashMap<>();
-  private final AtomicLongArray atomicLongArray = new AtomicLongArray(1);
-  private final AtomicLongArray atomicLongArray8 = new AtomicLongArray(8);
-  private final LongAdder[] longAdderGroup = {new LongAdder()};
-  private final LongAdder[] longAdderGroup8 = {
-    new LongAdder(),
-    new LongAdder(),
-    new LongAdder(),
-    new LongAdder(),
-    new LongAdder(),
-    new LongAdder(),
-    new LongAdder(),
-    new LongAdder()
-  };
-
-  /**
-   * Assigns each JMH worker thread a fixed {@code Counter8} index (round-robin over 8) the first
-   * time it calls into any {@code *8_*} benchmark, and keeps returning that same index for the
-   * thread's lifetime -- so under {@code Threads.MAX}, writes spread across all 8 counters instead
-   * of every thread hammering one.
-   */
-  private final AtomicInteger threadIndexAssigner = new AtomicInteger();
-
-  private final ThreadLocal<Integer> threadCounterIndex =
-      ThreadLocal.withInitial(() -> threadIndexAssigner.getAndIncrement() % COUNTER8_VALUES.length);
-
-  /**
-   * The natural "just use LongAdder" fix for the reset hazard: one {@code LongAdder} per counter,
-   * with a per-counter lock guarding both the increment and the drain -- external locking around
-   * only the drain does nothing, since {@code sumThenReset()}'s internal race is against the {@code
-   * LongAdder}'s own CAS-based {@code add()}, not against any lock a caller takes. This is the fair
-   * comparison point: it closes the same reset hazard {@link Accumulator} does, but stripes by
-   * <em>counter</em> (one lock per enum constant) instead of by <em>thread</em> (one shared table
-   * across all counters) -- so N threads hammering the *same* counter contend on one lock
-   * regardless of core count, with no thread-bucket distribution at all.
-   */
-  private static void groupInc(LongAdder[] group, int ordinal) {
-    LongAdder counter = group[ordinal];
-    synchronized (counter) {
-      counter.add(1L);
-    }
-  }
-
-  private static long[] groupAccumulateAnd(LongAdder[] group) {
-    long[] acc = new long[group.length];
-    for (int i = 0; i < group.length; i++) {
-      LongAdder counter = group[i];
-      synchronized (counter) {
-        acc[i] = counter.sumThenReset();
-      }
-    }
-    return acc;
-  }
-
-  /**
-   * The unstriped baseline: a single shared {@code AtomicLongArray}, one slot per counter, with no
-   * per-thread distribution at all -- isolates the cost of {@link Accumulator}'s thread-striping
-   * itself from the cost of correctness (unlike {@code longAdderGroup}, this has no lock: {@code
-   * getAndAdd} and {@code getAndSet} are each already atomic per-slot, so no coordination is needed
-   * to give the same "no increment lost across a drain" guarantee).
-   */
-  private static long[] arrayAccumulateAndReset(AtomicLongArray array) {
-    long[] acc = new long[array.length()];
-    for (int i = 0; i < array.length(); i++) {
-      acc[i] = array.getAndSet(i, 0L);
-    }
-    return acc;
-  }
-
-  /**
-   * The safe, lock-free alternative to {@code sumThenReset()} that pre-migration {@code
-   * TracerHealthMetrics} actually used (via {@code previousCounts}/{@code countIndex}): never reset
-   * the {@code LongAdder} at all, and have a single differ thread track the last observed {@code
-   * sum()} to compute its own delta. {@code sum()} alone never loses an update permanently -- a
-   * miss just shows up in the next {@code sum()} -- so this closes {@code sumThenReset()}'s reset
-   * race without any lock, at the cost of one extra subtraction per drain. The catch is the "single
-   * differ" part: {@code deltaPrevious} is unsynchronized plain state, correct only because exactly
-   * one thread ever calls this method between increments. Unlike {@code sumThenReset()}, which
-   * degrades gracefully (just an occasional dropped delta) if called from multiple threads at once,
-   * concurrent callers here would race on {@code deltaPrevious} itself and corrupt it -- so there
-   * is deliberately no {@code longAdderDelta_highContention} mirroring {@code
-   * longAdderSumThenReset_highContention}'s "every thread both writes and drains" shape; see {@code
-   * longAdderDeltaMixed_write}/{@code _drain} below for the one topology (many writers, one
-   * dedicated drainer) this baseline is actually valid under.
-   */
-  private long deltaSumAndReset() {
-    long current = deltaAdder.sum();
-    long delta = current - deltaPrevious;
-    deltaPrevious = current;
-    return delta;
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void longAdderIncrement_lowContention() {
-    adder.increment();
-  }
-
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void longAdderIncrement_highContention() {
-    adder.increment();
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void accumulatorIncrement_lowContention() {
-    accumulator.inc(Counter.HITS);
-  }
-
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void accumulatorIncrement_highContention() {
-    accumulator.inc(Counter.HITS);
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void chmAtomicLongIncrement_lowContention() {
-    chm.computeIfAbsent("hits", k -> new AtomicLong()).incrementAndGet();
-  }
-
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void chmAtomicLongIncrement_highContention() {
-    chm.computeIfAbsent("hits", k -> new AtomicLong()).incrementAndGet();
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void longAdderSumThenReset_lowContention(Blackhole blackhole) {
-    adder.increment();
-    blackhole.consume(adder.sumThenReset());
-  }
-
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void longAdderSumThenReset_highContention(Blackhole blackhole) {
-    adder.increment();
-    blackhole.consume(adder.sumThenReset());
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void longAdderDelta_lowContention(Blackhole blackhole) {
-    deltaAdder.increment();
-    blackhole.consume(deltaSumAndReset());
-  }
-
-  /**
-   * The realistic, valid topology for {@link #deltaSumAndReset} -- many writers, one dedicated
-   * differ -- mirroring {@code accumulatorMixed_write}/{@code _drain} below so the two can be
-   * compared directly: this is the fairest single-counter match for {@link Accumulator}, since both
-   * are lock-free on the write side and both give the same no-lost-update guarantee, just by
-   * different means (per-slot atomic {@code getAndSet} vs. a single differ's own bookkeeping).
-   */
-  @Benchmark
-  @Group("longAdderDeltaMixed")
-  @GroupThreads(4)
-  public void longAdderDeltaMixed_write() {
-    deltaAdder.increment();
-  }
-
-  @Benchmark
-  @Group("longAdderDeltaMixed")
-  @GroupThreads(1)
-  public void longAdderDeltaMixed_drain(Blackhole blackhole) {
-    blackhole.consume(deltaSumAndReset());
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void accumulatorAccumulateAndReset_lowContention(Blackhole blackhole) {
-    accumulator.inc(Counter.HITS);
-    blackhole.consume(accumulator.accumulateAndReset());
-  }
-
-  /**
-   * A deliberately pessimistic topology: every thread both writes and drains on every op, so {@code
-   * Threads.MAX} threads are all draining concurrently. Real callers don't do this -- see {@code
-   * accumulatorMixed-write}/{@code accumulatorMixed-drain} below for the "many writers, one rare
-   * drainer" shape this class actually targets. Kept as the worst-case upper bound: no production
-   * topology should be more contended on {@link Accumulator#accumulateAndReset} than this.
-   */
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void accumulatorAccumulateAndReset_highContention(Blackhole blackhole) {
-    accumulator.inc(Counter.HITS);
-    blackhole.consume(accumulator.accumulateAndReset());
-  }
-
-  /**
-   * The realistic counterpart to {@code accumulatorAccumulateAndReset_highContention}: many writer
-   * threads incrementing, and a single dedicated thread polling {@link
-   * Accumulator#accumulateAndReset} -- not every thread doing both on every op. {@code
-   * accumulatorMixed-write} measures increment cost while a drain is actively running; {@code
-   * accumulatorMixed-drain} measures the drain's own cost under that same live write pressure. The
-   * 4:1 writer:drainer ratio is illustrative of "many writers, rare drain," not tuned to a specific
-   * core count.
-   */
-  @Benchmark
-  @Group("accumulatorMixed")
-  @GroupThreads(4)
-  public void accumulatorMixed_write() {
-    accumulator.inc(Counter.HITS);
-  }
-
-  @Benchmark
-  @Group("accumulatorMixed")
-  @GroupThreads(1)
-  public void accumulatorMixed_drain(Blackhole blackhole) {
-    blackhole.consume(accumulator.accumulateAndReset());
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void longAdderGroupIncrement_lowContention() {
-    groupInc(longAdderGroup, Counter.HITS.ordinal());
-  }
-
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void longAdderGroupIncrement_highContention() {
-    groupInc(longAdderGroup, Counter.HITS.ordinal());
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void longAdderGroupAccumulateAnd_lowContention(Blackhole blackhole) {
-    groupInc(longAdderGroup, Counter.HITS.ordinal());
-    blackhole.consume(groupAccumulateAnd(longAdderGroup));
-  }
-
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void longAdderGroupAccumulateAnd_highContention(Blackhole blackhole) {
-    groupInc(longAdderGroup, Counter.HITS.ordinal());
-    blackhole.consume(groupAccumulateAnd(longAdderGroup));
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void atomicLongArrayIncrement_lowContention() {
-    atomicLongArray.getAndAdd(Counter.HITS.ordinal(), 1L);
-  }
-
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void atomicLongArrayIncrement_highContention() {
-    atomicLongArray.getAndAdd(Counter.HITS.ordinal(), 1L);
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void atomicLongArrayAccumulateAndReset_lowContention(Blackhole blackhole) {
-    atomicLongArray.getAndAdd(Counter.HITS.ordinal(), 1L);
-    blackhole.consume(arrayAccumulateAndReset(atomicLongArray));
-  }
-
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void atomicLongArrayAccumulateAndReset_highContention(Blackhole blackhole) {
-    atomicLongArray.getAndAdd(Counter.HITS.ordinal(), 1L);
-    blackhole.consume(arrayAccumulateAndReset(atomicLongArray));
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void atomicLongArrayIncrement8_lowContention() {
-    atomicLongArray8.getAndAdd(threadCounterIndex.get(), 1L);
-  }
-
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void atomicLongArrayIncrement8_highContention() {
-    atomicLongArray8.getAndAdd(threadCounterIndex.get(), 1L);
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void atomicLongArrayAccumulateAndReset8_lowContention(Blackhole blackhole) {
-    atomicLongArray8.getAndAdd(threadCounterIndex.get(), 1L);
-    blackhole.consume(arrayAccumulateAndReset(atomicLongArray8));
-  }
-
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void atomicLongArrayAccumulateAndReset8_highContention(Blackhole blackhole) {
-    atomicLongArray8.getAndAdd(threadCounterIndex.get(), 1L);
-    blackhole.consume(arrayAccumulateAndReset(atomicLongArray8));
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void accumulatorIncrement8_lowContention() {
-    accumulator8.inc(COUNTER8_VALUES[threadCounterIndex.get()]);
-  }
-
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void accumulatorIncrement8_highContention() {
-    accumulator8.inc(COUNTER8_VALUES[threadCounterIndex.get()]);
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void accumulatorAccumulateAndReset8_lowContention(Blackhole blackhole) {
-    accumulator8.inc(COUNTER8_VALUES[threadCounterIndex.get()]);
-    blackhole.consume(accumulator8.accumulateAndReset());
-  }
-
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void accumulatorAccumulateAndReset8_highContention(Blackhole blackhole) {
-    accumulator8.inc(COUNTER8_VALUES[threadCounterIndex.get()]);
-    blackhole.consume(accumulator8.accumulateAndReset());
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void longAdderGroupIncrement8_lowContention() {
-    groupInc(longAdderGroup8, threadCounterIndex.get());
-  }
-
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void longAdderGroupIncrement8_highContention() {
-    groupInc(longAdderGroup8, threadCounterIndex.get());
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void longAdderGroupAccumulateAnd8_lowContention(Blackhole blackhole) {
-    groupInc(longAdderGroup8, threadCounterIndex.get());
-    blackhole.consume(groupAccumulateAnd(longAdderGroup8));
-  }
-
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void longAdderGroupAccumulateAnd8_highContention(Blackhole blackhole) {
-    groupInc(longAdderGroup8, threadCounterIndex.get());
-    blackhole.consume(groupAccumulateAnd(longAdderGroup8));
-  }
+    enum Counter {
+        HITS
+    }
+
+    /**
+     * An 8-constant counterpart to {@link Counter}, used only by the {@code *8_*} benchmarks below.
+     * Unlike {@link Counter}, where every thread hits the single {@code HITS} constant (the worst
+     * case for {@code longAdderGroup}'s per-counter locking -- one lock shared by every thread,
+     * regardless of core count), these benchmarks spread writes across all 8 constants: each JMH
+     * worker thread is pinned to one fixed counter for its lifetime (see {@link
+     * #threadCounterIndex}), so under high contention, threads split into up to 8 groups each
+     * contending on their own lock instead of all threads sharing one. This is the topology where
+     * {@code longAdderGroup}'s distributed locking should actually pay off, and where {@link
+     * Accumulator}'s thread-striped design has to earn its win on the write side rather than facing a
+     * single-counter worst case. {@code accumulateAndReset}/{@code groupAccumulateAnd} also now walk
+     * 8 slots per drain instead of 1, sizing the drain cost closer to {@code TracerHealthMetric}'s
+     * 54-constant production shape.
+     */
+    enum Counter8 {
+        COUNTER_0,
+        COUNTER_1,
+        COUNTER_2,
+        COUNTER_3,
+        COUNTER_4,
+        COUNTER_5,
+        COUNTER_6,
+        COUNTER_7
+    }
+
+    private static final Counter8[] COUNTER8_VALUES = Counter8.values();
+
+    private final LongAdder adder = new LongAdder();
+    private final LongAdder deltaAdder = new LongAdder();
+    private long deltaPrevious;
+    private final Accumulator<Counter> accumulator = Accumulator.of(Counter.class);
+    private final Accumulator<Counter8> accumulator8 = Accumulator.of(Counter8.class);
+    private final ConcurrentHashMap<String, AtomicLong> chm = new ConcurrentHashMap<>();
+    private final AtomicLongArray atomicLongArray = new AtomicLongArray(1);
+    private final AtomicLongArray atomicLongArray8 = new AtomicLongArray(8);
+    private final LongAdder[] longAdderGroup = {new LongAdder()};
+    private final LongAdder[] longAdderGroup8 = {
+        new LongAdder(),
+        new LongAdder(),
+        new LongAdder(),
+        new LongAdder(),
+        new LongAdder(),
+        new LongAdder(),
+        new LongAdder(),
+        new LongAdder()
+    };
+
+    /**
+     * Assigns each JMH worker thread a fixed {@code Counter8} index (round-robin over 8) the first
+     * time it calls into any {@code *8_*} benchmark, and keeps returning that same index for the
+     * thread's lifetime -- so under {@code Threads.MAX}, writes spread across all 8 counters instead
+     * of every thread hammering one.
+     */
+    private final AtomicInteger threadIndexAssigner = new AtomicInteger();
+
+    private final ThreadLocal<Integer> threadCounterIndex =
+            ThreadLocal.withInitial(() -> threadIndexAssigner.getAndIncrement() % COUNTER8_VALUES.length);
+
+    /**
+     * The natural "just use LongAdder" fix for the reset hazard: one {@code LongAdder} per counter,
+     * with a per-counter lock guarding both the increment and the drain -- external locking around
+     * only the drain does nothing, since {@code sumThenReset()}'s internal race is against the {@code
+     * LongAdder}'s own CAS-based {@code add()}, not against any lock a caller takes. This is the fair
+     * comparison point: it closes the same reset hazard {@link Accumulator} does, but stripes by
+     * <em>counter</em> (one lock per enum constant) instead of by <em>thread</em> (one shared table
+     * across all counters) -- so N threads hammering the *same* counter contend on one lock
+     * regardless of core count, with no thread-bucket distribution at all.
+     */
+    private static void groupInc(LongAdder[] group, int ordinal) {
+        LongAdder counter = group[ordinal];
+        synchronized (counter) {
+            counter.add(1L);
+        }
+    }
+
+    private static long[] groupAccumulateAnd(LongAdder[] group) {
+        long[] acc = new long[group.length];
+        for (int i = 0; i < group.length; i++) {
+            LongAdder counter = group[i];
+            synchronized (counter) {
+                acc[i] = counter.sumThenReset();
+            }
+        }
+        return acc;
+    }
+
+    /**
+     * The unstriped baseline: a single shared {@code AtomicLongArray}, one slot per counter, with no
+     * per-thread distribution at all -- isolates the cost of {@link Accumulator}'s thread-striping
+     * itself from the cost of correctness (unlike {@code longAdderGroup}, this has no lock: {@code
+     * getAndAdd} and {@code getAndSet} are each already atomic per-slot, so no coordination is needed
+     * to give the same "no increment lost across a drain" guarantee).
+     */
+    private static long[] arrayAccumulateAndReset(AtomicLongArray array) {
+        long[] acc = new long[array.length()];
+        for (int i = 0; i < array.length(); i++) {
+            acc[i] = array.getAndSet(i, 0L);
+        }
+        return acc;
+    }
+
+    /**
+     * The safe, lock-free alternative to {@code sumThenReset()} that pre-migration {@code
+     * TracerHealthMetrics} actually used (via {@code previousCounts}/{@code countIndex}): never reset
+     * the {@code LongAdder} at all, and have a single differ thread track the last observed {@code
+     * sum()} to compute its own delta. {@code sum()} alone never loses an update permanently -- a
+     * miss just shows up in the next {@code sum()} -- so this closes {@code sumThenReset()}'s reset
+     * race without any lock, at the cost of one extra subtraction per drain. The catch is the "single
+     * differ" part: {@code deltaPrevious} is unsynchronized plain state, correct only because exactly
+     * one thread ever calls this method between increments. Unlike {@code sumThenReset()}, which
+     * degrades gracefully (just an occasional dropped delta) if called from multiple threads at once,
+     * concurrent callers here would race on {@code deltaPrevious} itself and corrupt it -- so there
+     * is deliberately no {@code longAdderDelta_highContention} mirroring {@code
+     * longAdderSumThenReset_highContention}'s "every thread both writes and drains" shape; see {@code
+     * longAdderDeltaMixed_write}/{@code _drain} below for the one topology (many writers, one
+     * dedicated drainer) this baseline is actually valid under.
+     */
+    private long deltaSumAndReset() {
+        long current = deltaAdder.sum();
+        long delta = current - deltaPrevious;
+        deltaPrevious = current;
+        return delta;
+    }
+
+    @Benchmark
+    @Threads(1)
+    public void longAdderIncrement_lowContention() {
+        adder.increment();
+    }
+
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void longAdderIncrement_highContention() {
+        adder.increment();
+    }
+
+    @Benchmark
+    @Threads(1)
+    public void accumulatorIncrement_lowContention() {
+        accumulator.inc(Counter.HITS);
+    }
+
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void accumulatorIncrement_highContention() {
+        accumulator.inc(Counter.HITS);
+    }
+
+    @Benchmark
+    @Threads(1)
+    public void chmAtomicLongIncrement_lowContention() {
+        chm.computeIfAbsent("hits", k -> new AtomicLong()).incrementAndGet();
+    }
+
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void chmAtomicLongIncrement_highContention() {
+        chm.computeIfAbsent("hits", k -> new AtomicLong()).incrementAndGet();
+    }
+
+    @Benchmark
+    @Threads(1)
+    public void longAdderSumThenReset_lowContention(Blackhole blackhole) {
+        adder.increment();
+        blackhole.consume(adder.sumThenReset());
+    }
+
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void longAdderSumThenReset_highContention(Blackhole blackhole) {
+        adder.increment();
+        blackhole.consume(adder.sumThenReset());
+    }
+
+    @Benchmark
+    @Threads(1)
+    public void longAdderDelta_lowContention(Blackhole blackhole) {
+        deltaAdder.increment();
+        blackhole.consume(deltaSumAndReset());
+    }
+
+    /**
+     * The realistic, valid topology for {@link #deltaSumAndReset} -- many writers, one dedicated
+     * differ -- mirroring {@code accumulatorMixed_write}/{@code _drain} below so the two can be
+     * compared directly: this is the fairest single-counter match for {@link Accumulator}, since both
+     * are lock-free on the write side and both give the same no-lost-update guarantee, just by
+     * different means (per-slot atomic {@code getAndSet} vs. a single differ's own bookkeeping).
+     */
+    @Benchmark
+    @Group("longAdderDeltaMixed")
+    @GroupThreads(4)
+    public void longAdderDeltaMixed_write() {
+        deltaAdder.increment();
+    }
+
+    @Benchmark
+    @Group("longAdderDeltaMixed")
+    @GroupThreads(1)
+    public void longAdderDeltaMixed_drain(Blackhole blackhole) {
+        blackhole.consume(deltaSumAndReset());
+    }
+
+    @Benchmark
+    @Threads(1)
+    public void accumulatorAccumulateAndReset_lowContention(Blackhole blackhole) {
+        accumulator.inc(Counter.HITS);
+        blackhole.consume(accumulator.accumulateAndReset());
+    }
+
+    /**
+     * A deliberately pessimistic topology: every thread both writes and drains on every op, so {@code
+     * Threads.MAX} threads are all draining concurrently. Real callers don't do this -- see {@code
+     * accumulatorMixed-write}/{@code accumulatorMixed-drain} below for the "many writers, one rare
+     * drainer" shape this class actually targets. Kept as the worst-case upper bound: no production
+     * topology should be more contended on {@link Accumulator#accumulateAndReset} than this.
+     */
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void accumulatorAccumulateAndReset_highContention(Blackhole blackhole) {
+        accumulator.inc(Counter.HITS);
+        blackhole.consume(accumulator.accumulateAndReset());
+    }
+
+    /**
+     * The realistic counterpart to {@code accumulatorAccumulateAndReset_highContention}: many writer
+     * threads incrementing, and a single dedicated thread polling {@link
+     * Accumulator#accumulateAndReset} -- not every thread doing both on every op. {@code
+     * accumulatorMixed-write} measures increment cost while a drain is actively running; {@code
+     * accumulatorMixed-drain} measures the drain's own cost under that same live write pressure. The
+     * 4:1 writer:drainer ratio is illustrative of "many writers, rare drain," not tuned to a specific
+     * core count.
+     */
+    @Benchmark
+    @Group("accumulatorMixed")
+    @GroupThreads(4)
+    public void accumulatorMixed_write() {
+        accumulator.inc(Counter.HITS);
+    }
+
+    @Benchmark
+    @Group("accumulatorMixed")
+    @GroupThreads(1)
+    public void accumulatorMixed_drain(Blackhole blackhole) {
+        blackhole.consume(accumulator.accumulateAndReset());
+    }
+
+    @Benchmark
+    @Threads(1)
+    public void longAdderGroupIncrement_lowContention() {
+        groupInc(longAdderGroup, Counter.HITS.ordinal());
+    }
+
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void longAdderGroupIncrement_highContention() {
+        groupInc(longAdderGroup, Counter.HITS.ordinal());
+    }
+
+    @Benchmark
+    @Threads(1)
+    public void longAdderGroupAccumulateAnd_lowContention(Blackhole blackhole) {
+        groupInc(longAdderGroup, Counter.HITS.ordinal());
+        blackhole.consume(groupAccumulateAnd(longAdderGroup));
+    }
+
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void longAdderGroupAccumulateAnd_highContention(Blackhole blackhole) {
+        groupInc(longAdderGroup, Counter.HITS.ordinal());
+        blackhole.consume(groupAccumulateAnd(longAdderGroup));
+    }
+
+    @Benchmark
+    @Threads(1)
+    public void atomicLongArrayIncrement_lowContention() {
+        atomicLongArray.getAndAdd(Counter.HITS.ordinal(), 1L);
+    }
+
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void atomicLongArrayIncrement_highContention() {
+        atomicLongArray.getAndAdd(Counter.HITS.ordinal(), 1L);
+    }
+
+    @Benchmark
+    @Threads(1)
+    public void atomicLongArrayAccumulateAndReset_lowContention(Blackhole blackhole) {
+        atomicLongArray.getAndAdd(Counter.HITS.ordinal(), 1L);
+        blackhole.consume(arrayAccumulateAndReset(atomicLongArray));
+    }
+
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void atomicLongArrayAccumulateAndReset_highContention(Blackhole blackhole) {
+        atomicLongArray.getAndAdd(Counter.HITS.ordinal(), 1L);
+        blackhole.consume(arrayAccumulateAndReset(atomicLongArray));
+    }
+
+    @Benchmark
+    @Threads(1)
+    public void atomicLongArrayIncrement8_lowContention() {
+        atomicLongArray8.getAndAdd(threadCounterIndex.get(), 1L);
+    }
+
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void atomicLongArrayIncrement8_highContention() {
+        atomicLongArray8.getAndAdd(threadCounterIndex.get(), 1L);
+    }
+
+    @Benchmark
+    @Threads(1)
+    public void atomicLongArrayAccumulateAndReset8_lowContention(Blackhole blackhole) {
+        atomicLongArray8.getAndAdd(threadCounterIndex.get(), 1L);
+        blackhole.consume(arrayAccumulateAndReset(atomicLongArray8));
+    }
+
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void atomicLongArrayAccumulateAndReset8_highContention(Blackhole blackhole) {
+        atomicLongArray8.getAndAdd(threadCounterIndex.get(), 1L);
+        blackhole.consume(arrayAccumulateAndReset(atomicLongArray8));
+    }
+
+    @Benchmark
+    @Threads(1)
+    public void accumulatorIncrement8_lowContention() {
+        accumulator8.inc(COUNTER8_VALUES[threadCounterIndex.get()]);
+    }
+
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void accumulatorIncrement8_highContention() {
+        accumulator8.inc(COUNTER8_VALUES[threadCounterIndex.get()]);
+    }
+
+    @Benchmark
+    @Threads(1)
+    public void accumulatorAccumulateAndReset8_lowContention(Blackhole blackhole) {
+        accumulator8.inc(COUNTER8_VALUES[threadCounterIndex.get()]);
+        blackhole.consume(accumulator8.accumulateAndReset());
+    }
+
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void accumulatorAccumulateAndReset8_highContention(Blackhole blackhole) {
+        accumulator8.inc(COUNTER8_VALUES[threadCounterIndex.get()]);
+        blackhole.consume(accumulator8.accumulateAndReset());
+    }
+
+    @Benchmark
+    @Threads(1)
+    public void longAdderGroupIncrement8_lowContention() {
+        groupInc(longAdderGroup8, threadCounterIndex.get());
+    }
+
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void longAdderGroupIncrement8_highContention() {
+        groupInc(longAdderGroup8, threadCounterIndex.get());
+    }
+
+    @Benchmark
+    @Threads(1)
+    public void longAdderGroupAccumulateAnd8_lowContention(Blackhole blackhole) {
+        groupInc(longAdderGroup8, threadCounterIndex.get());
+        blackhole.consume(groupAccumulateAnd(longAdderGroup8));
+    }
+
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void longAdderGroupAccumulateAnd8_highContention(Blackhole blackhole) {
+        groupInc(longAdderGroup8, threadCounterIndex.get());
+        blackhole.consume(groupAccumulateAnd(longAdderGroup8));
+    }
 }
diff --git a/products/metrics/metrics-api/src/jmh/java/datadog/metrics/api/AccumulatorVsCounterBenchmark.java b/products/metrics/metrics-api/src/jmh/java/datadog/metrics/api/AccumulatorVsCounterBenchmark.java
index 46306a4fffc..da2e2935743 100644
--- a/products/metrics/metrics-api/src/jmh/java/datadog/metrics/api/AccumulatorVsCounterBenchmark.java
+++ b/products/metrics/metrics-api/src/jmh/java/datadog/metrics/api/AccumulatorVsCounterBenchmark.java
@@ -74,119 +74,118 @@
 @Fork(5)
 public class AccumulatorVsCounterBenchmark {
 
-  enum Metric {
-    HITS
-  }
-
-  private final Accumulator<Metric> accumulator = Accumulator.of(Metric.class);
-  private final Counter counter = new SynchronousStatsDCounter("hits", new LockingStatsDClient());
-
-  /**
-   * Mirrors {@code StatsDCounter}'s real shape: every {@link #increment} forwards straight to the
-   * client, with no batching of its own. Reimplemented here rather than depending on {@code
-   * metrics-lib} because {@code StatsDCounter}'s constructor is package-private.
-   */
-  private static final class SynchronousStatsDCounter implements Counter {
-    private static final String[] NO_TAGS = new String[0];
-    private final String name;
-    private final StatsDClient statsd;
-
-    SynchronousStatsDCounter(String name, StatsDClient statsd) {
-      this.name = name;
-      this.statsd = statsd;
+    enum Metric {
+        HITS
     }
 
-    @Override
-    public void increment(int delta) {
-      statsd.count(name, delta, NO_TAGS);
+    private final Accumulator<Metric> accumulator = Accumulator.of(Metric.class);
+    private final Counter counter = new SynchronousStatsDCounter("hits", new LockingStatsDClient());
+
+    /**
+     * Mirrors {@code StatsDCounter}'s real shape: every {@link #increment} forwards straight to the
+     * client, with no batching of its own. Reimplemented here rather than depending on {@code
+     * metrics-lib} because {@code StatsDCounter}'s constructor is package-private.
+     */
+    private static final class SynchronousStatsDCounter implements Counter {
+        private static final String[] NO_TAGS = new String[0];
+        private final String name;
+        private final StatsDClient statsd;
+
+        SynchronousStatsDCounter(String name, StatsDClient statsd) {
+            this.name = name;
+            this.statsd = statsd;
+        }
+
+        @Override
+        public void increment(int delta) {
+            statsd.count(name, delta, NO_TAGS);
+        }
+
+        @Override
+        public void incrementErrorCount(String cause, int delta) {
+            statsd.count(name, delta, new String[] {"cause:" + cause});
+        }
     }
 
-    @Override
-    public void incrementErrorCount(String cause, int delta) {
-      statsd.count(name, delta, new String[] {"cause:" + cause});
-    }
-  }
-
-  /**
-   * A {@link StatsDClient} stand-in that pays a real, serialized per-call cost instead of a true
-   * no-op: every real {@code StatsDClient} forwards {@code count} through one shared connection (a
-   * lock or an offer to a single non-blocking queue), so a true no-op would measure only
-   * virtual-dispatch overhead and understate the cost this benchmark exists to isolate. A {@code
-   * synchronized} increment of a shared counter is a reasonable stand-in for that shared
-   * serialization point without pulling in a real socket/queue implementation this benchmark
-   * doesn't need.
-   */
-  private static final class LockingStatsDClient implements StatsDClient {
-    private final Object lock = new Object();
-    private long total;
-
-    @Override
-    public void incrementCounter(String metricName, String... tags) {
-      count(metricName, 1L, tags);
+    /**
+     * A {@link StatsDClient} stand-in that pays a real, serialized per-call cost instead of a true
+     * no-op: every real {@code StatsDClient} forwards {@code count} through one shared connection (a
+     * lock or an offer to a single non-blocking queue), so a true no-op would measure only
+     * virtual-dispatch overhead and understate the cost this benchmark exists to isolate. A {@code
+     * synchronized} increment of a shared counter is a reasonable stand-in for that shared
+     * serialization point without pulling in a real socket/queue implementation this benchmark
+     * doesn't need.
+     */
+    private static final class LockingStatsDClient implements StatsDClient {
+        private final Object lock = new Object();
+        private long total;
+
+        @Override
+        public void incrementCounter(String metricName, String... tags) {
+            count(metricName, 1L, tags);
+        }
+
+        @Override
+        public void count(String metricName, long delta, String... tags) {
+            synchronized (lock) {
+                total += delta;
+            }
+        }
+
+        @Override
+        public void gauge(String metricName, long value, String... tags) {}
+
+        @Override
+        public void gauge(String metricName, double value, String... tags) {}
+
+        @Override
+        public void histogram(String metricName, long value, String... tags) {}
+
+        @Override
+        public void histogram(String metricName, double value, String... tags) {}
+
+        @Override
+        public void distribution(String metricName, long value, String... tags) {}
+
+        @Override
+        public void distribution(String metricName, double value, String... tags) {}
+
+        @Override
+        public void serviceCheck(String serviceCheckName, String status, String message, String... tags) {}
+
+        @Override
+        public void error(Exception error) {}
+
+        @Override
+        public int getErrorCount() {
+            return 0;
+        }
+
+        @Override
+        public void close() {}
     }
 
-    @Override
-    public void count(String metricName, long delta, String... tags) {
-      synchronized (lock) {
-        total += delta;
-      }
+    @Benchmark
+    @Threads(1)
+    public void accumulatorIncrement_lowContention() {
+        accumulator.inc(Metric.HITS);
     }
 
-    @Override
-    public void gauge(String metricName, long value, String... tags) {}
-
-    @Override
-    public void gauge(String metricName, double value, String... tags) {}
-
-    @Override
-    public void histogram(String metricName, long value, String... tags) {}
-
-    @Override
-    public void histogram(String metricName, double value, String... tags) {}
-
-    @Override
-    public void distribution(String metricName, long value, String... tags) {}
-
-    @Override
-    public void distribution(String metricName, double value, String... tags) {}
-
-    @Override
-    public void serviceCheck(
-        String serviceCheckName, String status, String message, String... tags) {}
-
-    @Override
-    public void error(Exception error) {}
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void accumulatorIncrement_highContention() {
+        accumulator.inc(Metric.HITS);
+    }
 
-    @Override
-    public int getErrorCount() {
-      return 0;
+    @Benchmark
+    @Threads(1)
+    public void counterIncrement_lowContention() {
+        counter.increment(1);
     }
 
-    @Override
-    public void close() {}
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void accumulatorIncrement_lowContention() {
-    accumulator.inc(Metric.HITS);
-  }
-
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void accumulatorIncrement_highContention() {
-    accumulator.inc(Metric.HITS);
-  }
-
-  @Benchmark
-  @Threads(1)
-  public void counterIncrement_lowContention() {
-    counter.increment(1);
-  }
-
-  @Benchmark
-  @Threads(Threads.MAX)
-  public void counterIncrement_highContention() {
-    counter.increment(1);
-  }
+    @Benchmark
+    @Threads(Threads.MAX)
+    public void counterIncrement_highContention() {
+        counter.increment(1);
+    }
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Accumulator.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Accumulator.java
index 4f2c618534e..e220922c2ec 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Accumulator.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Accumulator.java
@@ -37,252 +37,252 @@
  */
 @ThreadSafe
 public final class Accumulator<E extends Enum<E>> {
-  /** One full cache line of {@code long}s (64 bytes), used to pad each stripe row. */
-  private static final int CACHE_LINE_LONGS = 8;
+    /** One full cache line of {@code long}s (64 bytes), used to pad each stripe row. */
+    private static final int CACHE_LINE_LONGS = 8;
 
-  /** Upper bound on {@link #stripeCount()}, regardless of core count. */
-  private static final int MAX_STRIPES = 64;
+    /** Upper bound on {@link #stripeCount()}, regardless of core count. */
+    private static final int MAX_STRIPES = 64;
 
-  private final AtomicLongArray[] data;
-  private final int width;
-  private final E[] keys;
-
-  private Accumulator(AtomicLongArray[] data, int width, E[] keys) {
-    this.data = data;
-    this.width = width;
-    this.keys = keys;
-  }
-
-  /**
-   * @param enumType the enum naming each counter, e.g. {@code MyCounters.class}
-   */
-  public static <E extends Enum<E>> Accumulator<E> of(Class<E> enumType) {
-    E[] keys = enumType.getEnumConstants();
-    int width = keys.length;
-    int paddedWidth = paddedWidth(width);
-    int stripes = stripeCount();
-    AtomicLongArray[] data = new AtomicLongArray[stripes];
-    for (int i = 0; i < stripes; i++) {
-      data[i] = new AtomicLongArray(paddedWidth);
-    }
-    return new Accumulator<>(data, width, keys);
-  }
-
-  /** Increments the counter named by {@code key} in the calling thread's stripe by one. */
-  public void inc(E key) {
-    add(key, 1L);
-  }
-
-  /** Adds {@code delta} to the counter named by {@code key} in the calling thread's stripe. */
-  public void add(E key, long delta) {
-    stripeOf(data).getAndAdd(key.ordinal(), delta);
-  }
-
-  /**
-   * Combines and resets every stripe, returning the sum as a typed view. Each counter is
-   * read-and-zeroed with one atomic {@code getAndSet} -- see the class-level note on what atomicity
-   * this does and doesn't provide across different counters.
-   *
-   * @return the sum, keyed by the enum's {@code ordinal()}
-   */
-  public Counts<E> accumulateAndReset() {
-    long[] acc = new long[width];
-    for (AtomicLongArray stripe : data) {
-      for (int i = 0; i < width; i++) {
-        acc[i] += stripe.getAndSet(i, 0L);
-      }
-    }
-    return new Counts<>(acc, keys);
-  }
-
-  /**
-   * Combines every stripe without resetting it, returning the sum as a typed view -- a live,
-   * non-destructive snapshot for a diagnostic read (e.g. {@code summary()}) that must not perturb
-   * the delta a concurrent {@link #accumulateAndReset} on a reporting cadence is about to report.
-   *
-   * @return the sum, keyed by the enum's {@code ordinal()}
-   */
-  public Counts<E> sum() {
-    long[] acc = new long[width];
-    for (AtomicLongArray stripe : data) {
-      for (int i = 0; i < width; i++) {
-        acc[i] += stripe.get(i);
-      }
-    }
-    return new Counts<>(acc, keys);
-  }
-
-  /**
-   * A typed view over a drained snapshot, returned by {@link #accumulateAndReset} or {@link #sum}:
-   * the same enum-ordinal type checking {@link Accumulator} provides on writes, applied to the read
-   * side too.
-   */
-  public static final class Counts<E extends Enum<E>> {
-    private final long[] counts;
+    private final AtomicLongArray[] data;
+    private final int width;
     private final E[] keys;
 
-    private Counts(long[] counts, E[] keys) {
-      this.counts = counts;
-      this.keys = keys;
+    private Accumulator(AtomicLongArray[] data, int width, E[] keys) {
+        this.data = data;
+        this.width = width;
+        this.keys = keys;
     }
 
     /**
-     * An all-zero {@link Counts}, sized for {@code enumType} -- for seeding a running total before
-     * any real drain has happened, without needing a scratch {@link Accumulator} just to call
-     * {@link Accumulator#sum()} on it.
-     *
      * @param enumType the enum naming each counter, e.g. {@code MyCounters.class}
      */
-    public static <E extends Enum<E>> Counts<E> create(Class<E> enumType) {
-      E[] keys = enumType.getEnumConstants();
-      return new Counts<>(new long[keys.length], keys);
+    public static <E extends Enum<E>> Accumulator<E> of(Class<E> enumType) {
+        E[] keys = enumType.getEnumConstants();
+        int width = keys.length;
+        int paddedWidth = paddedWidth(width);
+        int stripes = stripeCount();
+        AtomicLongArray[] data = new AtomicLongArray[stripes];
+        for (int i = 0; i < stripes; i++) {
+            data[i] = new AtomicLongArray(paddedWidth);
+        }
+        return new Accumulator<>(data, width, keys);
     }
 
-    /** The counter named by {@code key}. */
-    public long get(E key) {
-      return counts[key.ordinal()];
+    /** Increments the counter named by {@code key} in the calling thread's stripe by one. */
+    public void inc(E key) {
+        add(key, 1L);
+    }
+
+    /** Adds {@code delta} to the counter named by {@code key} in the calling thread's stripe. */
+    public void add(E key, long delta) {
+        stripeOf(data).getAndAdd(key.ordinal(), delta);
     }
 
     /**
-     * The enum constants this {@link Counts} is keyed by, in declaration order -- for a caller that
-     * wants to iterate every counter (e.g. reporting each one) without separately having to pass
-     * {@code E.values()} alongside this object. An unmodifiable view over the same backing array
-     * every {@link Counts} from the same {@link Accumulator} shares -- no copy, but a caller can't
-     * corrupt that shared array's ordering for every other snapshot the way a raw array reference
-     * would let it.
+     * Combines and resets every stripe, returning the sum as a typed view. Each counter is
+     * read-and-zeroed with one atomic {@code getAndSet} -- see the class-level note on what atomicity
+     * this does and doesn't provide across different counters.
+     *
+     * @return the sum, keyed by the enum's {@code ordinal()}
      */
-    public List<E> keys() {
-      return Collections.unmodifiableList(Arrays.asList(keys));
+    public Counts<E> accumulateAndReset() {
+        long[] acc = new long[width];
+        for (AtomicLongArray stripe : data) {
+            for (int i = 0; i < width; i++) {
+                acc[i] += stripe.getAndSet(i, 0L);
+            }
+        }
+        return new Counts<>(acc, keys);
     }
 
     /**
-     * Adds {@code other} to this, key by key, returning a new {@link Counts} rather than mutating
-     * either input -- combines a stored running total with a fresh, non-destructive {@link #sum} to
-     * answer "what's the live total right now" without ever resetting anything.
+     * Combines every stripe without resetting it, returning the sum as a typed view -- a live,
+     * non-destructive snapshot for a diagnostic read (e.g. {@code summary()}) that must not perturb
+     * the delta a concurrent {@link #accumulateAndReset} on a reporting cadence is about to report.
+     *
+     * @return the sum, keyed by the enum's {@code ordinal()}
      */
-    public Counts<E> plus(Counts<E> other) {
-      long[] combined = counts.clone();
-      for (int i = 0; i < combined.length; i++) {
-        combined[i] += other.counts[i];
-      }
-      return new Counts<>(combined, keys);
+    public Counts<E> sum() {
+        long[] acc = new long[width];
+        for (AtomicLongArray stripe : data) {
+            for (int i = 0; i < width; i++) {
+                acc[i] += stripe.get(i);
+            }
+        }
+        return new Counts<>(acc, keys);
     }
 
     /**
-     * A copy of this {@link Counts} with every entry before {@code keys()[fromIndex]} zeroed out --
-     * for a caller that partially delivered a batch downstream and wants to represent "what's left"
-     * to retry, without re-counting the part that already made it.
+     * A typed view over a drained snapshot, returned by {@link #accumulateAndReset} or {@link #sum}:
+     * the same enum-ordinal type checking {@link Accumulator} provides on writes, applied to the read
+     * side too.
      */
-    public Counts<E> from(int fromIndex) {
-      long[] remaining = new long[counts.length];
-      System.arraycopy(counts, fromIndex, remaining, fromIndex, counts.length - fromIndex);
-      return new Counts<>(remaining, keys);
-    }
-  }
+    public static final class Counts<E extends Enum<E>> {
+        private final long[] counts;
+        private final E[] keys;
+
+        private Counts(long[] counts, E[] keys) {
+            this.counts = counts;
+            this.keys = keys;
+        }
+
+        /**
+         * An all-zero {@link Counts}, sized for {@code enumType} -- for seeding a running total before
+         * any real drain has happened, without needing a scratch {@link Accumulator} just to call
+         * {@link Accumulator#sum()} on it.
+         *
+         * @param enumType the enum naming each counter, e.g. {@code MyCounters.class}
+         */
+        public static <E extends Enum<E>> Counts<E> create(Class<E> enumType) {
+            E[] keys = enumType.getEnumConstants();
+            return new Counts<>(new long[keys.length], keys);
+        }
+
+        /** The counter named by {@code key}. */
+        public long get(E key) {
+            return counts[key.ordinal()];
+        }
 
-  /**
-   * An opt-in, safe-by-default composition for the one recurring shape {@link Accumulator} itself
-   * deliberately doesn't try to make safe on its own: a periodic destructive drain for reporting
-   * (e.g. to statsd) alongside a separate, non-destructive live read for diagnostics (e.g. a {@code
-   * summary()} or {@code toString()}). Read independently, {@link #drain} and {@link #live} are
-   * each individually correct -- the hazard is between them: a {@link #live} call landing between a
-   * {@link #drain}'s reset and its caller publishing the delta into a running total would combine
-   * the pre-publish total with the post-drain (zeroed) {@link #sum}, silently under-reporting by
-   * the just-drained delta. {@code RunningTotal} closes that gap with one lock shared by {@link
-   * #drain} and {@link #live} -- most callers don't need this (a plain drain-only reporter, or a
-   * live-read-only diagnostic, needs no coordination at all), so it's a separate, opt-in type
-   * rather than baked into every {@link Accumulator}.
-   */
-  @ThreadSafe
-  public static final class RunningTotal<E extends Enum<E>> {
-    private final Accumulator<E> accumulator;
-    private final Object lock = new Object();
-    private Counts<E> total;
+        /**
+         * The enum constants this {@link Counts} is keyed by, in declaration order -- for a caller that
+         * wants to iterate every counter (e.g. reporting each one) without separately having to pass
+         * {@code E.values()} alongside this object. An unmodifiable view over the same backing array
+         * every {@link Counts} from the same {@link Accumulator} shares -- no copy, but a caller can't
+         * corrupt that shared array's ordering for every other snapshot the way a raw array reference
+         * would let it.
+         */
+        public List<E> keys() {
+            return Collections.unmodifiableList(Arrays.asList(keys));
+        }
 
-    private RunningTotal(Accumulator<E> accumulator) {
-      this.accumulator = accumulator;
-      // accumulateAndReset(), not sum() -- sum() doesn't reset, so seeding from it would double
-      // count whatever's already there once a later live() adds a fresh sum() on top of it.
-      this.total = accumulator.accumulateAndReset();
+        /**
+         * Adds {@code other} to this, key by key, returning a new {@link Counts} rather than mutating
+         * either input -- combines a stored running total with a fresh, non-destructive {@link #sum} to
+         * answer "what's the live total right now" without ever resetting anything.
+         */
+        public Counts<E> plus(Counts<E> other) {
+            long[] combined = counts.clone();
+            for (int i = 0; i < combined.length; i++) {
+                combined[i] += other.counts[i];
+            }
+            return new Counts<>(combined, keys);
+        }
+
+        /**
+         * A copy of this {@link Counts} with every entry before {@code keys()[fromIndex]} zeroed out --
+         * for a caller that partially delivered a batch downstream and wants to represent "what's left"
+         * to retry, without re-counting the part that already made it.
+         */
+        public Counts<E> from(int fromIndex) {
+            long[] remaining = new long[counts.length];
+            System.arraycopy(counts, fromIndex, remaining, fromIndex, counts.length - fromIndex);
+            return new Counts<>(remaining, keys);
+        }
     }
 
     /**
-     * Wraps {@code accumulator}, seeding the running total from a drain of whatever it currently
-     * holds. That seed becomes visible through {@link #live}, but -- being folded in at
-     * construction, before any caller can observe it -- it is never returned by a later {@link
-     * #drain}. A caller that reports each {@link #drain} delta (e.g. to statsd) would therefore
-     * silently never report pre-existing counts. Always construct this from a freshly created
-     * {@code accumulator} (as every current caller does) so there is nothing to seed.
+     * An opt-in, safe-by-default composition for the one recurring shape {@link Accumulator} itself
+     * deliberately doesn't try to make safe on its own: a periodic destructive drain for reporting
+     * (e.g. to statsd) alongside a separate, non-destructive live read for diagnostics (e.g. a {@code
+     * summary()} or {@code toString()}). Read independently, {@link #drain} and {@link #live} are
+     * each individually correct -- the hazard is between them: a {@link #live} call landing between a
+     * {@link #drain}'s reset and its caller publishing the delta into a running total would combine
+     * the pre-publish total with the post-drain (zeroed) {@link #sum}, silently under-reporting by
+     * the just-drained delta. {@code RunningTotal} closes that gap with one lock shared by {@link
+     * #drain} and {@link #live} -- most callers don't need this (a plain drain-only reporter, or a
+     * live-read-only diagnostic, needs no coordination at all), so it's a separate, opt-in type
+     * rather than baked into every {@link Accumulator}.
      */
-    public static <E extends Enum<E>> RunningTotal<E> of(Accumulator<E> accumulator) {
-      return new RunningTotal<>(accumulator);
+    @ThreadSafe
+    public static final class RunningTotal<E extends Enum<E>> {
+        private final Accumulator<E> accumulator;
+        private final Object lock = new Object();
+        private Counts<E> total;
+
+        private RunningTotal(Accumulator<E> accumulator) {
+            this.accumulator = accumulator;
+            // accumulateAndReset(), not sum() -- sum() doesn't reset, so seeding from it would double
+            // count whatever's already there once a later live() adds a fresh sum() on top of it.
+            this.total = accumulator.accumulateAndReset();
+        }
+
+        /**
+         * Wraps {@code accumulator}, seeding the running total from a drain of whatever it currently
+         * holds. That seed becomes visible through {@link #live}, but -- being folded in at
+         * construction, before any caller can observe it -- it is never returned by a later {@link
+         * #drain}. A caller that reports each {@link #drain} delta (e.g. to statsd) would therefore
+         * silently never report pre-existing counts. Always construct this from a freshly created
+         * {@code accumulator} (as every current caller does) so there is nothing to seed.
+         */
+        public static <E extends Enum<E>> RunningTotal<E> of(Accumulator<E> accumulator) {
+            return new RunningTotal<>(accumulator);
+        }
+
+        /**
+         * Atomically drains the accumulator and folds the delta into the running total -- call this
+         * right before reporting the delta to a downstream sink on a reporting cadence.
+         *
+         * @return the delta just drained
+         */
+        public Counts<E> drain() {
+            synchronized (lock) {
+                Counts<E> delta = accumulator.accumulateAndReset();
+                total = total.plus(delta);
+                return delta;
+            }
+        }
+
+        /**
+         * The live total: the running total as of the last {@link #drain}, folded with whatever's
+         * accumulated since -- never resets anything, safe to call at any time without perturbing a
+         * concurrent {@link #drain}.
+         */
+        public Counts<E> live() {
+            synchronized (lock) {
+                return total.plus(accumulator.sum());
+            }
+        }
     }
 
     /**
-     * Atomically drains the accumulator and folds the delta into the running total -- call this
-     * right before reporting the delta to a downstream sink on a reporting cadence.
+     * The calling thread's stripe: cheap masking, no allocation, no map lookup.
      *
-     * @return the delta just drained
+     * <p>Multiple threads can map to the same stripe (this is masking, not a bijection); each
+     * counter's own atomic slot makes that safe, just not maximally scalable under a hash collision.
      */
-    public Counts<E> drain() {
-      synchronized (lock) {
-        Counts<E> delta = accumulator.accumulateAndReset();
-        total = total.plus(delta);
-        return delta;
-      }
+    private static AtomicLongArray stripeOf(AtomicLongArray[] data) {
+        int mask = data.length - 1;
+        int idx = (int) (ThreadSupport.threadId() & mask);
+        return data[idx];
     }
 
     /**
-     * The live total: the running total as of the last {@link #drain}, folded with whatever's
-     * accumulated since -- never resets anything, safe to call at any time without perturbing a
-     * concurrent {@link #drain}.
+     * A fixed, power-of-two stripe count deliberately oversized to roughly 2x {@link
+     * Runtime#availableProcessors()} (minimum 4, maximum {@link #MAX_STRIPES}). Not exposed as a
+     * per-call override: a mandatory sizing knob on every caller fails the "print test" of
+     * self-explanatory API design.
+     *
+     * <p>Sizing to exactly the core count leaves stripe collisions likely under real contention
+     * (birthday-paradox math: with {@code n} contending threads and {@code m} stripes, expected
+     * colliding pairs are {@code n(n-1)/(2m)}) -- and a collision costs CAS-retry/cache-line-bounce
+     * cost, the same problem {@code LongAdder}'s own {@code Cell[]} table exists to avoid. Doubling
+     * the stripe count roughly halves that collision count for a one-time, per-accumulator memory
+     * cost, at the price of a slightly more expensive (but far rarer) {@link #accumulateAndReset}
+     * drain -- the right trade given {@link #inc}/{@link #add} run on every call while {@link
+     * #accumulateAndReset} runs on a reporting cadence.
+     *
+     * <p>Capped at {@link #MAX_STRIPES} so a single {@link Accumulator} on a very-high-core-count
+     * host can't grow its fixed table without bound: past that many contending threads, collision
+     * math has already flattened out, so the memory cost of chasing it further isn't worth paying.
      */
-    public Counts<E> live() {
-      synchronized (lock) {
-        return total.plus(accumulator.sum());
-      }
+    private static int stripeCount() {
+        int cpus = Runtime.getRuntime().availableProcessors();
+        return Math.min(MAX_STRIPES, Math.max(4, 2 * Integer.highestOneBit(Math.max(1, cpus))));
     }
-  }
 
-  /**
-   * The calling thread's stripe: cheap masking, no allocation, no map lookup.
-   *
-   * <p>Multiple threads can map to the same stripe (this is masking, not a bijection); each
-   * counter's own atomic slot makes that safe, just not maximally scalable under a hash collision.
-   */
-  private static AtomicLongArray stripeOf(AtomicLongArray[] data) {
-    int mask = data.length - 1;
-    int idx = (int) (ThreadSupport.threadId() & mask);
-    return data[idx];
-  }
-
-  /**
-   * A fixed, power-of-two stripe count deliberately oversized to roughly 2x {@link
-   * Runtime#availableProcessors()} (minimum 4, maximum {@link #MAX_STRIPES}). Not exposed as a
-   * per-call override: a mandatory sizing knob on every caller fails the "print test" of
-   * self-explanatory API design.
-   *
-   * <p>Sizing to exactly the core count leaves stripe collisions likely under real contention
-   * (birthday-paradox math: with {@code n} contending threads and {@code m} stripes, expected
-   * colliding pairs are {@code n(n-1)/(2m)}) -- and a collision costs CAS-retry/cache-line-bounce
-   * cost, the same problem {@code LongAdder}'s own {@code Cell[]} table exists to avoid. Doubling
-   * the stripe count roughly halves that collision count for a one-time, per-accumulator memory
-   * cost, at the price of a slightly more expensive (but far rarer) {@link #accumulateAndReset}
-   * drain -- the right trade given {@link #inc}/{@link #add} run on every call while {@link
-   * #accumulateAndReset} runs on a reporting cadence.
-   *
-   * <p>Capped at {@link #MAX_STRIPES} so a single {@link Accumulator} on a very-high-core-count
-   * host can't grow its fixed table without bound: past that many contending threads, collision
-   * math has already flattened out, so the memory cost of chasing it further isn't worth paying.
-   */
-  private static int stripeCount() {
-    int cpus = Runtime.getRuntime().availableProcessors();
-    return Math.min(MAX_STRIPES, Math.max(4, 2 * Integer.highestOneBit(Math.max(1, cpus))));
-  }
-
-  /** Rounds {@code width} up to a whole number of cache lines, plus one full trailing line. */
-  private static int paddedWidth(int width) {
-    int wholeLines = ((width + CACHE_LINE_LONGS - 1) / CACHE_LINE_LONGS) * CACHE_LINE_LONGS;
-    return wholeLines + CACHE_LINE_LONGS;
-  }
+    /** Rounds {@code width} up to a whole number of cache lines, plus one full trailing line. */
+    private static int paddedWidth(int width) {
+        int wholeLines = ((width + CACHE_LINE_LONGS - 1) / CACHE_LINE_LONGS) * CACHE_LINE_LONGS;
+        return wholeLines + CACHE_LINE_LONGS;
+    }
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Counter.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Counter.java
index 4adc603753f..465d0d5fc76 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Counter.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Counter.java
@@ -2,7 +2,7 @@
 
 public interface Counter {
 
-  void increment(int delta);
+    void increment(int delta);
 
-  void incrementErrorCount(String cause, int delta);
+    void incrementErrorCount(String cause, int delta);
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Histogram.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Histogram.java
index db2ecfdd9e9..0063d4085fa 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Histogram.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Histogram.java
@@ -5,45 +5,45 @@
 
 public interface Histogram {
 
-  double getCount();
+    double getCount();
 
-  boolean isEmpty();
+    boolean isEmpty();
 
-  void accept(double value);
+    void accept(double value);
 
-  void accept(double value, double count);
+    void accept(double value, double count);
 
-  double getValueAtQuantile(double quantile);
+    double getValueAtQuantile(double quantile);
 
-  double getMinValue();
+    double getMinValue();
 
-  double getMaxValue();
+    double getMaxValue();
 
-  List<Double> getBinBoundaries();
+    List<Double> getBinBoundaries();
 
-  List<Double> getBinCounts();
+    List<Double> getBinCounts();
 
-  void clear();
+    void clear();
 
-  ByteBuffer serialize();
+    ByteBuffer serialize();
 
-  static Histogram newHistogram() {
-    return Histograms.factory.newHistogram();
-  }
+    static Histogram newHistogram() {
+        return Histograms.factory.newHistogram();
+    }
 
-  static Histogram newLogHistogram() {
-    return Histograms.factory.newLogHistogram();
-  }
+    static Histogram newLogHistogram() {
+        return Histograms.factory.newLogHistogram();
+    }
 
-  static Histogram newHistogram(double relativeAccuracy, int maxNumBins) {
-    return Histograms.factory.newHistogram(relativeAccuracy, maxNumBins);
-  }
+    static Histogram newHistogram(double relativeAccuracy, int maxNumBins) {
+        return Histograms.factory.newHistogram(relativeAccuracy, maxNumBins);
+    }
 
-  static HistogramWithSum newHistogramWithSum(double relativeAccuracy, int maxNumBins) {
-    return Histograms.factory.newHistogramWithSum(relativeAccuracy, maxNumBins);
-  }
+    static HistogramWithSum newHistogramWithSum(double relativeAccuracy, int maxNumBins) {
+        return Histograms.factory.newHistogramWithSum(relativeAccuracy, maxNumBins);
+    }
 
-  static HistogramWithSum newHistogramWithSum(List<Double> binBoundaries) {
-    return Histograms.factory.newHistogramWithSum(binBoundaries);
-  }
+    static HistogramWithSum newHistogramWithSum(List<Double> binBoundaries) {
+        return Histograms.factory.newHistogramWithSum(binBoundaries);
+    }
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/HistogramWithSum.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/HistogramWithSum.java
index c71dee53d55..1e2928d8c1c 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/HistogramWithSum.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/HistogramWithSum.java
@@ -2,5 +2,5 @@
 
 /** Adds exact summary statistics to the histogram */
 public interface HistogramWithSum extends Histogram {
-  double getSum();
+    double getSum();
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Histograms.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Histograms.java
index ff7a2cd33f9..fef01d73c2f 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Histograms.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Histograms.java
@@ -3,28 +3,28 @@
 import java.util.List;
 
 public class Histograms {
-  static final Factory NO_OP = new NoOpHistogramsFactory();
-  static volatile Factory factory = NO_OP;
-
-  /**
-   * Register a Histograms implementation. This is called by metrics-lib to provide the DDSketch
-   * implementation.
-   */
-  public static void register(Factory histograms) {
-    if (histograms != null) {
-      Histograms.factory = histograms;
+    static final Factory NO_OP = new NoOpHistogramsFactory();
+    static volatile Factory factory = NO_OP;
+
+    /**
+     * Register a Histograms implementation. This is called by metrics-lib to provide the DDSketch
+     * implementation.
+     */
+    public static void register(Factory histograms) {
+        if (histograms != null) {
+            Histograms.factory = histograms;
+        }
     }
-  }
 
-  public interface Factory {
-    Histogram newHistogram();
+    public interface Factory {
+        Histogram newHistogram();
 
-    Histogram newLogHistogram();
+        Histogram newLogHistogram();
 
-    Histogram newHistogram(double relativeAccuracy, int maxNumBins);
+        Histogram newHistogram(double relativeAccuracy, int maxNumBins);
 
-    HistogramWithSum newHistogramWithSum(double relativeAccuracy, int maxNumBins);
+        HistogramWithSum newHistogramWithSum(double relativeAccuracy, int maxNumBins);
 
-    HistogramWithSum newHistogramWithSum(List<Double> binBoundaries);
-  }
+        HistogramWithSum newHistogramWithSum(List<Double> binBoundaries);
+    }
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Monitoring.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Monitoring.java
index 9ea3741403e..825ea6f2ea1 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Monitoring.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Monitoring.java
@@ -1,13 +1,13 @@
 package datadog.metrics.api;
 
 public interface Monitoring {
-  Monitoring DISABLED = new NoOpMonitoring();
+    Monitoring DISABLED = new NoOpMonitoring();
 
-  Recording newTimer(String name);
+    Recording newTimer(String name);
 
-  Recording newTimer(String name, String... tags);
+    Recording newTimer(String name, String... tags);
 
-  Recording newThreadLocalTimer(String name);
+    Recording newThreadLocalTimer(String name);
 
-  Counter newCounter(String name);
+    Counter newCounter(String name);
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpCounter.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpCounter.java
index fd627ad15cf..588b1201da3 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpCounter.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpCounter.java
@@ -2,9 +2,9 @@
 
 final class NoOpCounter implements Counter {
 
-  public static final Counter NO_OP = new NoOpCounter();
+    public static final Counter NO_OP = new NoOpCounter();
 
-  public void increment(int delta) {}
+    public void increment(int delta) {}
 
-  public void incrementErrorCount(String cause, int delta) {}
+    public void incrementErrorCount(String cause, int delta) {}
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpHistogram.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpHistogram.java
index cbe214aafcd..f6a020adc4a 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpHistogram.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpHistogram.java
@@ -5,59 +5,59 @@
 import java.util.List;
 
 class NoOpHistogram implements HistogramWithSum {
-  public static final HistogramWithSum INSTANCE = new NoOpHistogram();
-
-  @Override
-  public double getCount() {
-    return 0;
-  }
-
-  @Override
-  public double getSum() {
-    return 0;
-  }
-
-  @Override
-  public boolean isEmpty() {
-    return true;
-  }
-
-  @Override
-  public void accept(double value) {}
-
-  @Override
-  public void accept(double value, double count) {}
-
-  @Override
-  public double getValueAtQuantile(double quantile) {
-    return 0;
-  }
-
-  @Override
-  public double getMinValue() {
-    return 0;
-  }
-
-  @Override
-  public double getMaxValue() {
-    return 0;
-  }
-
-  @Override
-  public List<Double> getBinBoundaries() {
-    return Collections.emptyList();
-  }
-
-  @Override
-  public List<Double> getBinCounts() {
-    return Collections.emptyList();
-  }
-
-  @Override
-  public void clear() {}
-
-  @Override
-  public ByteBuffer serialize() {
-    return ByteBuffer.allocate(0);
-  }
+    public static final HistogramWithSum INSTANCE = new NoOpHistogram();
+
+    @Override
+    public double getCount() {
+        return 0;
+    }
+
+    @Override
+    public double getSum() {
+        return 0;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return true;
+    }
+
+    @Override
+    public void accept(double value) {}
+
+    @Override
+    public void accept(double value, double count) {}
+
+    @Override
+    public double getValueAtQuantile(double quantile) {
+        return 0;
+    }
+
+    @Override
+    public double getMinValue() {
+        return 0;
+    }
+
+    @Override
+    public double getMaxValue() {
+        return 0;
+    }
+
+    @Override
+    public List<Double> getBinBoundaries() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<Double> getBinCounts() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public void clear() {}
+
+    @Override
+    public ByteBuffer serialize() {
+        return ByteBuffer.allocate(0);
+    }
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpHistogramsFactory.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpHistogramsFactory.java
index 83e31b0e7fa..993f1abe7af 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpHistogramsFactory.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpHistogramsFactory.java
@@ -3,28 +3,28 @@
 import java.util.List;
 
 final class NoOpHistogramsFactory implements Histograms.Factory {
-  @Override
-  public Histogram newHistogram() {
-    return NoOpHistogram.INSTANCE;
-  }
+    @Override
+    public Histogram newHistogram() {
+        return NoOpHistogram.INSTANCE;
+    }
 
-  @Override
-  public Histogram newLogHistogram() {
-    return NoOpHistogram.INSTANCE;
-  }
+    @Override
+    public Histogram newLogHistogram() {
+        return NoOpHistogram.INSTANCE;
+    }
 
-  @Override
-  public Histogram newHistogram(double relativeAccuracy, int maxNumBins) {
-    return NoOpHistogram.INSTANCE;
-  }
+    @Override
+    public Histogram newHistogram(double relativeAccuracy, int maxNumBins) {
+        return NoOpHistogram.INSTANCE;
+    }
 
-  @Override
-  public HistogramWithSum newHistogramWithSum(double relativeAccuracy, int maxNumBins) {
-    return NoOpHistogram.INSTANCE;
-  }
+    @Override
+    public HistogramWithSum newHistogramWithSum(double relativeAccuracy, int maxNumBins) {
+        return NoOpHistogram.INSTANCE;
+    }
 
-  @Override
-  public HistogramWithSum newHistogramWithSum(List<Double> binBoundaries) {
-    return NoOpHistogram.INSTANCE;
-  }
+    @Override
+    public HistogramWithSum newHistogramWithSum(List<Double> binBoundaries) {
+        return NoOpHistogram.INSTANCE;
+    }
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpMonitoring.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpMonitoring.java
index e9f63723a77..63bf2599284 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpMonitoring.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpMonitoring.java
@@ -1,25 +1,25 @@
 package datadog.metrics.api;
 
 final class NoOpMonitoring implements Monitoring {
-  NoOpMonitoring() {}
+    NoOpMonitoring() {}
 
-  @Override
-  public Recording newTimer(String name) {
-    return NoOpRecording.NO_OP;
-  }
+    @Override
+    public Recording newTimer(String name) {
+        return NoOpRecording.NO_OP;
+    }
 
-  @Override
-  public Recording newTimer(String name, String... tags) {
-    return NoOpRecording.NO_OP;
-  }
+    @Override
+    public Recording newTimer(String name, String... tags) {
+        return NoOpRecording.NO_OP;
+    }
 
-  @Override
-  public Recording newThreadLocalTimer(String name) {
-    return NoOpRecording.NO_OP;
-  }
+    @Override
+    public Recording newThreadLocalTimer(String name) {
+        return NoOpRecording.NO_OP;
+    }
 
-  @Override
-  public Counter newCounter(String name) {
-    return NoOpCounter.NO_OP;
-  }
+    @Override
+    public Counter newCounter(String name) {
+        return NoOpCounter.NO_OP;
+    }
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpRecording.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpRecording.java
index fa09c1f69ab..7b2fd2eb3e5 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpRecording.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/NoOpRecording.java
@@ -2,19 +2,19 @@
 
 final class NoOpRecording extends Recording {
 
-  public static final Recording NO_OP = new NoOpRecording();
+    public static final Recording NO_OP = new NoOpRecording();
 
-  @Override
-  public Recording start() {
-    return this;
-  }
+    @Override
+    public Recording start() {
+        return this;
+    }
 
-  @Override
-  public void reset() {}
+    @Override
+    public void reset() {}
 
-  @Override
-  public void stop() {}
+    @Override
+    public void stop() {}
 
-  @Override
-  public void flush() {}
+    @Override
+    public void flush() {}
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Recording.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Recording.java
index a367e308bf0..bf394d610b7 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Recording.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Recording.java
@@ -1,16 +1,16 @@
 package datadog.metrics.api;
 
 public abstract class Recording implements AutoCloseable {
-  @Override
-  public void close() {
-    stop();
-  }
+    @Override
+    public void close() {
+        stop();
+    }
 
-  public abstract Recording start();
+    public abstract Recording start();
 
-  public abstract void reset();
+    public abstract void reset();
 
-  public abstract void stop();
+    public abstract void stop();
 
-  public abstract void flush();
+    public abstract void flush();
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/NoOpStatsDClient.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/NoOpStatsDClient.java
index adab664fa2d..12229b414e6 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/NoOpStatsDClient.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/NoOpStatsDClient.java
@@ -2,45 +2,42 @@
 
 final class NoOpStatsDClient implements StatsDClient {
 
-  @Override
-  public void incrementCounter(final String metricName, final String... tags) {}
+    @Override
+    public void incrementCounter(final String metricName, final String... tags) {}
 
-  @Override
-  public void count(final String metricName, final long delta, final String... tags) {}
+    @Override
+    public void count(final String metricName, final long delta, final String... tags) {}
 
-  @Override
-  public void gauge(final String metricName, final long value, final String... tags) {}
+    @Override
+    public void gauge(final String metricName, final long value, final String... tags) {}
 
-  @Override
-  public void gauge(final String metricName, final double value, final String... tags) {}
+    @Override
+    public void gauge(final String metricName, final double value, final String... tags) {}
 
-  @Override
-  public void histogram(final String metricName, final long value, final String... tags) {}
+    @Override
+    public void histogram(final String metricName, final long value, final String... tags) {}
 
-  @Override
-  public void histogram(final String metricName, final double value, final String... tags) {}
+    @Override
+    public void histogram(final String metricName, final double value, final String... tags) {}
 
-  @Override
-  public void distribution(String metricName, long value, String... tags) {}
+    @Override
+    public void distribution(String metricName, long value, String... tags) {}
 
-  @Override
-  public void distribution(String metricName, double value, String... tags) {}
+    @Override
+    public void distribution(String metricName, double value, String... tags) {}
 
-  @Override
-  public void serviceCheck(
-      final String serviceCheckName,
-      final String status,
-      final String message,
-      final String... tags) {}
+    @Override
+    public void serviceCheck(
+            final String serviceCheckName, final String status, final String message, final String... tags) {}
 
-  @Override
-  public void error(Exception error) {}
+    @Override
+    public void error(Exception error) {}
 
-  @Override
-  public int getErrorCount() {
-    return 0;
-  }
+    @Override
+    public int getErrorCount() {
+        return 0;
+    }
 
-  @Override
-  public void close() {}
+    @Override
+    public void close() {}
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDClient.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDClient.java
index 5947fb6656f..5f0dffd607c 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDClient.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDClient.java
@@ -3,42 +3,41 @@
 import java.io.Closeable;
 
 public interface StatsDClient extends Closeable {
-  StatsDClient NO_OP = new NoOpStatsDClient();
+    StatsDClient NO_OP = new NoOpStatsDClient();
 
-  void incrementCounter(String metricName, String... tags);
+    void incrementCounter(String metricName, String... tags);
 
-  void count(String metricName, long delta, String... tags);
+    void count(String metricName, long delta, String... tags);
 
-  void gauge(String metricName, long value, String... tags);
+    void gauge(String metricName, long value, String... tags);
 
-  void gauge(String metricName, double value, String... tags);
+    void gauge(String metricName, double value, String... tags);
 
-  void histogram(String metricName, long value, String... tags);
+    void histogram(String metricName, long value, String... tags);
 
-  void histogram(String metricName, double value, String... tags);
+    void histogram(String metricName, double value, String... tags);
 
-  void distribution(String metricName, long value, String... tags);
+    void distribution(String metricName, long value, String... tags);
 
-  void distribution(String metricName, double value, String... tags);
+    void distribution(String metricName, double value, String... tags);
 
-  void serviceCheck(String serviceCheckName, String status, String message, String... tags);
+    void serviceCheck(String serviceCheckName, String status, String message, String... tags);
 
-  void error(Exception error);
+    void error(Exception error);
 
-  int getErrorCount();
+    int getErrorCount();
 
-  /**
-   * Record a statsd event
-   *
-   * @param type the type of event (error, warning, info, success - @see Event.AlertType)
-   * @param source the source of the event (e.g. java, myapp, CrashTracking, Telemetry, etc)
-   * @param eventName the name of the event (or title)
-   * @param message the message of the event
-   * @param tags the tags to attach to the event
-   */
-  default void recordEvent(
-      String type, String source, String eventName, String message, String... tags) {}
+    /**
+     * Record a statsd event
+     *
+     * @param type the type of event (error, warning, info, success - @see Event.AlertType)
+     * @param source the source of the event (e.g. java, myapp, CrashTracking, Telemetry, etc)
+     * @param eventName the name of the event (or title)
+     * @param message the message of the event
+     * @param tags the tags to attach to the event
+     */
+    default void recordEvent(String type, String source, String eventName, String message, String... tags) {}
 
-  @Override
-  void close();
+    @Override
+    void close();
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDClientManager.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDClientManager.java
index 55fd11e3b05..be77a0210be 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDClientManager.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDClientManager.java
@@ -1,16 +1,16 @@
 package datadog.metrics.api.statsd;
 
 public interface StatsDClientManager {
-  default StatsDClient statsDClient(
-      String host, Integer port, String namedPipe, String namespace, String[] constantTags) {
-    return statsDClient(host, port, namedPipe, namespace, constantTags, true);
-  }
+    default StatsDClient statsDClient(
+            String host, Integer port, String namedPipe, String namespace, String[] constantTags) {
+        return statsDClient(host, port, namedPipe, namespace, constantTags, true);
+    }
 
-  StatsDClient statsDClient(
-      String host,
-      Integer port,
-      String namedPipe,
-      String namespace,
-      String[] constantTags,
-      boolean useAggregation);
+    StatsDClient statsDClient(
+            String host,
+            Integer port,
+            String namedPipe,
+            String namespace,
+            String[] constantTags,
+            boolean useAggregation);
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDCountReporter.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDCountReporter.java
index b149b422f4c..b611fa68c86 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDCountReporter.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDCountReporter.java
@@ -29,94 +29,90 @@
  */
 @ThreadSafe
 public final class StatsDCountReporter<E extends Enum<E> & StatsDCounterKey> {
-  private static final Logger log = LoggerFactory.getLogger(StatsDCountReporter.class);
+    private static final Logger log = LoggerFactory.getLogger(StatsDCountReporter.class);
 
-  private final StatsDClient statsDClient;
-  private final Accumulator<E> accumulator;
-  private final Accumulator.RunningTotal<E> runningTotal;
+    private final StatsDClient statsDClient;
+    private final Accumulator<E> accumulator;
+    private final Accumulator.RunningTotal<E> runningTotal;
 
-  /** Undelivered from the last {@link #flush}, to retry on the next one; {@code null} if none. */
-  private Accumulator.Counts<E> pending;
+    /** Undelivered from the last {@link #flush}, to retry on the next one; {@code null} if none. */
+    private Accumulator.Counts<E> pending;
 
-  /**
-   * @param enumType the enum naming each counter, e.g. {@code MyCounters.class}
-   */
-  public static <E extends Enum<E> & StatsDCounterKey> StatsDCountReporter<E> of(
-      StatsDClient statsDClient, Class<E> enumType) {
-    return new StatsDCountReporter<>(statsDClient, Accumulator.of(enumType));
-  }
+    /**
+     * @param enumType the enum naming each counter, e.g. {@code MyCounters.class}
+     */
+    public static <E extends Enum<E> & StatsDCounterKey> StatsDCountReporter<E> of(
+            StatsDClient statsDClient, Class<E> enumType) {
+        return new StatsDCountReporter<>(statsDClient, Accumulator.of(enumType));
+    }
 
-  private StatsDCountReporter(StatsDClient statsDClient, Accumulator<E> accumulator) {
-    this.statsDClient = statsDClient;
-    this.accumulator = accumulator;
-    this.runningTotal = Accumulator.RunningTotal.of(accumulator);
-  }
+    private StatsDCountReporter(StatsDClient statsDClient, Accumulator<E> accumulator) {
+        this.statsDClient = statsDClient;
+        this.accumulator = accumulator;
+        this.runningTotal = Accumulator.RunningTotal.of(accumulator);
+    }
 
-  /** Increments the counter named by {@code key} by one. */
-  public void inc(E key) {
-    accumulator.inc(key);
-  }
+    /** Increments the counter named by {@code key} by one. */
+    public void inc(E key) {
+        accumulator.inc(key);
+    }
 
-  /** Adds {@code delta} to the counter named by {@code key}. */
-  public void add(E key, long delta) {
-    accumulator.add(key, delta);
-  }
+    /** Adds {@code delta} to the counter named by {@code key}. */
+    public void add(E key, long delta) {
+        accumulator.add(key, delta);
+    }
 
-  /**
-   * The live total -- see {@link Accumulator.RunningTotal#live}. For a diagnostic read (e.g. a
-   * {@code summary()}), never for deciding what to report: {@link #flush} owns that.
-   */
-  public Accumulator.Counts<E> live() {
-    return runningTotal.live();
-  }
+    /**
+     * The live total -- see {@link Accumulator.RunningTotal#live}. For a diagnostic read (e.g. a
+     * {@code summary()}), never for deciding what to report: {@link #flush} owns that.
+     */
+    public Accumulator.Counts<E> live() {
+        return runningTotal.live();
+    }
 
-  /**
-   * Drains the accumulator and reports the delta (plus anything still owed from a prior failed
-   * attempt), holding onto whatever isn't confirmed delivered this time for the next {@link
-   * #flush}.
-   */
-  public void flush() {
-    Accumulator.Counts<E> drained = runningTotal.drain();
-    Accumulator.Counts<E> toReport = pending == null ? drained : pending.plus(drained);
-    pending = report(toReport);
-  }
+    /**
+     * Drains the accumulator and reports the delta (plus anything still owed from a prior failed
+     * attempt), holding onto whatever isn't confirmed delivered this time for the next {@link
+     * #flush}.
+     */
+    public void flush() {
+        Accumulator.Counts<E> drained = runningTotal.drain();
+        Accumulator.Counts<E> toReport = pending == null ? drained : pending.plus(drained);
+        pending = report(toReport);
+    }
 
-  /**
-   * @return {@code null} if every counter was delivered, otherwise a {@link Accumulator.Counts}
-   *     holding whatever wasn't attempted or confirmed sent
-   */
-  private Accumulator.Counts<E> report(Accumulator.Counts<E> counts) {
-    List<E> keys = counts.keys();
-    for (int i = 0; i < keys.size(); i++) {
-      E key = keys.get(i);
-      long delta = counts.get(key);
-      if (delta != 0) {
-        try {
-          statsDClient.count(key.getMetricName(), delta, key.getTags());
-        } catch (RuntimeException e) {
-          log.debug(
-              "Failed to report {}, compensating {} undelivered counter(s)",
-              key,
-              keys.size() - i,
-              e);
-          return counts.from(i);
+    /**
+     * @return {@code null} if every counter was delivered, otherwise a {@link Accumulator.Counts}
+     *     holding whatever wasn't attempted or confirmed sent
+     */
+    private Accumulator.Counts<E> report(Accumulator.Counts<E> counts) {
+        List<E> keys = counts.keys();
+        for (int i = 0; i < keys.size(); i++) {
+            E key = keys.get(i);
+            long delta = counts.get(key);
+            if (delta != 0) {
+                try {
+                    statsDClient.count(key.getMetricName(), delta, key.getTags());
+                } catch (RuntimeException e) {
+                    log.debug("Failed to report {}, compensating {} undelivered counter(s)", key, keys.size() - i, e);
+                    return counts.from(i);
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
 
-  /**
-   * Reports every nonzero entry of {@code values}/{@code counts} directly -- no accumulator, no
-   * compensation.
-   */
-  public static <E extends Enum<E> & StatsDCounterKey> void report(
-      StatsDClient statsDClient, E[] values, ToLongFunction<E> counts) {
-    for (E value : values) {
-      long delta = counts.applyAsLong(value);
-      if (delta != 0) {
-        statsDClient.count(value.getMetricName(), delta, value.getTags());
-      }
+    /**
+     * Reports every nonzero entry of {@code values}/{@code counts} directly -- no accumulator, no
+     * compensation.
+     */
+    public static <E extends Enum<E> & StatsDCounterKey> void report(
+            StatsDClient statsDClient, E[] values, ToLongFunction<E> counts) {
+        for (E value : values) {
+            long delta = counts.applyAsLong(value);
+            if (delta != 0) {
+                statsDClient.count(value.getMetricName(), delta, value.getTags());
+            }
+        }
     }
-  }
 }
diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDCounterKey.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDCounterKey.java
index 3aadbfc24f5..6e539526243 100644
--- a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDCounterKey.java
+++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDCounterKey.java
@@ -2,7 +2,7 @@
 
 /** A counter identity: the dogstatsd metric name and tags a batch of counts should report under. */
 public interface StatsDCounterKey {
-  String getMetricName();
+    String getMetricName();
 
-  String[] getTags();
+    String[] getTags();
 }
diff --git a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/AccumulatorFootprintTest.java b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/AccumulatorFootprintTest.java
index b0b2f7b59fd..dc1a69be64f 100644
--- a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/AccumulatorFootprintTest.java
+++ b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/AccumulatorFootprintTest.java
@@ -38,103 +38,102 @@
  */
 class AccumulatorFootprintTest {
 
-  enum Counters {
-    REQUESTS,
-    ERRORS,
-    RETRIES,
-    BYTES_SENT
-  }
+    enum Counters {
+        REQUESTS,
+        ERRORS,
+        RETRIES,
+        BYTES_SENT
+    }
 
-  @BeforeAll
-  static void assumeNotJ9Jvm() {
-    // JOL's GraphLayout relies on HotSpot-specific Unsafe internals and throws
-    // IllegalStateException on J9-based JVMs (IBM/Semeru) -- same guard as
-    // StringIndexFootprintTest / ScopeAndContinuationLayoutTest.
-    assumeFalse(JavaVirtualMachine.isJ9());
-  }
+    @BeforeAll
+    static void assumeNotJ9Jvm() {
+        // JOL's GraphLayout relies on HotSpot-specific Unsafe internals and throws
+        // IllegalStateException on J9-based JVMs (IBM/Semeru) -- same guard as
+        // StringIndexFootprintTest / ScopeAndContinuationLayoutTest.
+        assumeFalse(JavaVirtualMachine.isJ9());
+    }
 
-  static long bytes(Object root) {
-    return GraphLayout.parseInstance(root).totalSize();
-  }
+    static long bytes(Object root) {
+        return GraphLayout.parseInstance(root).totalSize();
+    }
 
-  static LongAdder[] freshAdders() {
-    LongAdder[] adders = new LongAdder[Counters.values().length];
-    for (int i = 0; i < adders.length; i++) {
-      adders[i] = new LongAdder();
+    static LongAdder[] freshAdders() {
+        LongAdder[] adders = new LongAdder[Counters.values().length];
+        for (int i = 0; i < adders.length; i++) {
+            adders[i] = new LongAdder();
+        }
+        return adders;
     }
-    return adders;
-  }
 
-  @Test
-  void freshFootprint() {
-    LongAdder[] adders = freshAdders();
-    Accumulator<Counters> accumulator = Accumulator.of(Counters.class);
+    @Test
+    void freshFootprint() {
+        LongAdder[] adders = freshAdders();
+        Accumulator<Counters> accumulator = Accumulator.of(Counters.class);
 
-    long adderBytes = bytes((Object) adders);
-    long accumulatorBytes = bytes(accumulator);
+        long adderBytes = bytes((Object) adders);
+        long accumulatorBytes = bytes(accumulator);
 
-    System.out.printf(
-        "fresh:      %d LongAdders = %6d bytes, Accumulator = %6d bytes%n",
-        adders.length, adderBytes, accumulatorBytes);
-  }
+        System.out.printf(
+                "fresh:      %d LongAdders = %6d bytes, Accumulator = %6d bytes%n",
+                adders.length, adderBytes, accumulatorBytes);
+    }
 
-  /**
-   * Drives real multi-threaded contention against a fresh set of {@code LongAdder}s to force their
-   * {@code Cell[]} tables to grow, then compares against {@link Accumulator}'s fixed footprint --
-   * the realistic comparison, since production callers write to these counters concurrently rather
-   * than leaving them untouched.
-   *
-   * <p>Cell-table growth is driven by JVM-internal CAS-collision detection, not something this test
-   * controls directly, so the exact grown size can vary by run/JVM; the one invariant asserted is
-   * monotonic growth (a contended footprint can only be at least the fresh one).
-   */
-  @Test
-  void contendedFootprint() throws InterruptedException {
-    LongAdder[] adders = freshAdders();
-    long freshAdderBytes = bytes((Object) adders);
+    /**
+     * Drives real multi-threaded contention against a fresh set of {@code LongAdder}s to force their
+     * {@code Cell[]} tables to grow, then compares against {@link Accumulator}'s fixed footprint --
+     * the realistic comparison, since production callers write to these counters concurrently rather
+     * than leaving them untouched.
+     *
+     * <p>Cell-table growth is driven by JVM-internal CAS-collision detection, not something this test
+     * controls directly, so the exact grown size can vary by run/JVM; the one invariant asserted is
+     * monotonic growth (a contended footprint can only be at least the fresh one).
+     */
+    @Test
+    void contendedFootprint() throws InterruptedException {
+        LongAdder[] adders = freshAdders();
+        long freshAdderBytes = bytes((Object) adders);
 
-    int threads = Math.min(16, Math.max(4, Runtime.getRuntime().availableProcessors()));
-    ExecutorService pool = Executors.newFixedThreadPool(threads);
-    CountDownLatch start = new CountDownLatch(1);
-    CountDownLatch done = new CountDownLatch(threads);
-    try {
-      for (int t = 0; t < threads; t++) {
-        pool.execute(
-            () -> {
-              try {
-                start.await();
-                long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(2);
-                while (System.nanoTime() < deadline) {
-                  for (LongAdder adder : adders) {
-                    adder.increment();
-                  }
-                }
-              } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-              } finally {
-                done.countDown();
-              }
-            });
-      }
-      start.countDown();
-      assertTrue(done.await(30, TimeUnit.SECONDS));
-    } finally {
-      pool.shutdown();
-    }
+        int threads = Math.min(16, Math.max(4, Runtime.getRuntime().availableProcessors()));
+        ExecutorService pool = Executors.newFixedThreadPool(threads);
+        CountDownLatch start = new CountDownLatch(1);
+        CountDownLatch done = new CountDownLatch(threads);
+        try {
+            for (int t = 0; t < threads; t++) {
+                pool.execute(() -> {
+                    try {
+                        start.await();
+                        long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(2);
+                        while (System.nanoTime() < deadline) {
+                            for (LongAdder adder : adders) {
+                                adder.increment();
+                            }
+                        }
+                    } catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
+                    } finally {
+                        done.countDown();
+                    }
+                });
+            }
+            start.countDown();
+            assertTrue(done.await(30, TimeUnit.SECONDS));
+        } finally {
+            pool.shutdown();
+        }
 
-    long contendedAdderBytes = bytes((Object) adders);
-    Accumulator<Counters> accumulator = Accumulator.of(Counters.class);
-    long accumulatorBytes = bytes(accumulator);
+        long contendedAdderBytes = bytes((Object) adders);
+        Accumulator<Counters> accumulator = Accumulator.of(Counters.class);
+        long accumulatorBytes = bytes(accumulator);
 
-    System.out.printf(
-        "contended:  %d LongAdders = %6d bytes, Accumulator = %6d bytes%n",
-        adders.length, contendedAdderBytes, accumulatorBytes);
+        System.out.printf(
+                "contended:  %d LongAdders = %6d bytes, Accumulator = %6d bytes%n",
+                adders.length, contendedAdderBytes, accumulatorBytes);
 
-    assertTrue(
-        contendedAdderBytes >= freshAdderBytes,
-        "contended LongAdder footprint should never shrink below the fresh footprint");
-    assertTrue(
-        accumulatorBytes < contendedAdderBytes,
-        "Accumulator's fixed footprint should be smaller than N contended LongAdders");
-  }
+        assertTrue(
+                contendedAdderBytes >= freshAdderBytes,
+                "contended LongAdder footprint should never shrink below the fresh footprint");
+        assertTrue(
+                accumulatorBytes < contendedAdderBytes,
+                "Accumulator's fixed footprint should be smaller than N contended LongAdders");
+    }
 }
diff --git a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/AccumulatorTest.java b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/AccumulatorTest.java
index adb203fdd1c..23022b4ef69 100644
--- a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/AccumulatorTest.java
+++ b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/AccumulatorTest.java
@@ -16,281 +16,277 @@
 
 class AccumulatorTest {
 
-  enum Counters {
-    FOO,
-    BAR,
-    BAZ
-  }
-
-  @Test
-  void freshAccumulatorSumsToZero() {
-    Accumulator<Counters> counters = Accumulator.of(Counters.class);
-    Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
-    for (Counters c : Counters.values()) {
-      assertEquals(0L, drained.get(c));
+    enum Counters {
+        FOO,
+        BAR,
+        BAZ
     }
-  }
-
-  @Test
-  void incIncrementsByOne() {
-    Accumulator<Counters> counters = Accumulator.of(Counters.class);
-    counters.inc(Counters.FOO);
-    counters.inc(Counters.FOO);
-    counters.inc(Counters.BAR);
-
-    Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
-    assertEquals(2L, drained.get(Counters.FOO));
-    assertEquals(1L, drained.get(Counters.BAR));
-    assertEquals(0L, drained.get(Counters.BAZ));
-  }
-
-  @Test
-  void addAppliesArbitraryDelta() {
-    Accumulator<Counters> counters = Accumulator.of(Counters.class);
-    counters.add(Counters.BAZ, 41L);
-    counters.add(Counters.BAZ, 1L);
-
-    Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
-    assertEquals(42L, drained.get(Counters.BAZ));
-  }
-
-  @Test
-  void accumulateAndResetsSoASecondDrainIsZero() {
-    Accumulator<Counters> counters = Accumulator.of(Counters.class);
-    counters.inc(Counters.FOO);
-
-    Accumulator.Counts<Counters> first = counters.accumulateAndReset();
-    assertEquals(1L, first.get(Counters.FOO));
-
-    Accumulator.Counts<Counters> second = counters.accumulateAndReset();
-    for (Counters c : Counters.values()) {
-      assertEquals(0L, second.get(c));
+
+    @Test
+    void freshAccumulatorSumsToZero() {
+        Accumulator<Counters> counters = Accumulator.of(Counters.class);
+        Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
+        for (Counters c : Counters.values()) {
+            assertEquals(0L, drained.get(c));
+        }
     }
-  }
-
-  @Test
-  void concurrentIncrementsAreNotLost() throws InterruptedException {
-    Accumulator<Counters> counters = Accumulator.of(Counters.class);
-    int threadCount = 16;
-    int incrementsPerThread = 10_000;
-
-    ExecutorService pool = Executors.newFixedThreadPool(threadCount);
-    CountDownLatch start = new CountDownLatch(1);
-    CountDownLatch done = new CountDownLatch(threadCount);
-    try {
-      for (int t = 0; t < threadCount; t++) {
-        pool.execute(
-            () -> {
-              try {
-                start.await();
-                for (int i = 0; i < incrementsPerThread; i++) {
-                  counters.inc(Counters.FOO);
-                }
-              } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-              } finally {
-                done.countDown();
-              }
-            });
-      }
-      start.countDown();
-      assertTrue(done.await(30, TimeUnit.SECONDS));
-    } finally {
-      pool.shutdown();
+
+    @Test
+    void incIncrementsByOne() {
+        Accumulator<Counters> counters = Accumulator.of(Counters.class);
+        counters.inc(Counters.FOO);
+        counters.inc(Counters.FOO);
+        counters.inc(Counters.BAR);
+
+        Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
+        assertEquals(2L, drained.get(Counters.FOO));
+        assertEquals(1L, drained.get(Counters.BAR));
+        assertEquals(0L, drained.get(Counters.BAZ));
+    }
+
+    @Test
+    void addAppliesArbitraryDelta() {
+        Accumulator<Counters> counters = Accumulator.of(Counters.class);
+        counters.add(Counters.BAZ, 41L);
+        counters.add(Counters.BAZ, 1L);
+
+        Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
+        assertEquals(42L, drained.get(Counters.BAZ));
+    }
+
+    @Test
+    void accumulateAndResetsSoASecondDrainIsZero() {
+        Accumulator<Counters> counters = Accumulator.of(Counters.class);
+        counters.inc(Counters.FOO);
+
+        Accumulator.Counts<Counters> first = counters.accumulateAndReset();
+        assertEquals(1L, first.get(Counters.FOO));
+
+        Accumulator.Counts<Counters> second = counters.accumulateAndReset();
+        for (Counters c : Counters.values()) {
+            assertEquals(0L, second.get(c));
+        }
+    }
+
+    @Test
+    void concurrentIncrementsAreNotLost() throws InterruptedException {
+        Accumulator<Counters> counters = Accumulator.of(Counters.class);
+        int threadCount = 16;
+        int incrementsPerThread = 10_000;
+
+        ExecutorService pool = Executors.newFixedThreadPool(threadCount);
+        CountDownLatch start = new CountDownLatch(1);
+        CountDownLatch done = new CountDownLatch(threadCount);
+        try {
+            for (int t = 0; t < threadCount; t++) {
+                pool.execute(() -> {
+                    try {
+                        start.await();
+                        for (int i = 0; i < incrementsPerThread; i++) {
+                            counters.inc(Counters.FOO);
+                        }
+                    } catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
+                    } finally {
+                        done.countDown();
+                    }
+                });
+            }
+            start.countDown();
+            assertTrue(done.await(30, TimeUnit.SECONDS));
+        } finally {
+            pool.shutdown();
+        }
+
+        Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
+        assertEquals((long) threadCount * incrementsPerThread, drained.get(Counters.FOO));
     }
 
-    Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
-    assertEquals((long) threadCount * incrementsPerThread, drained.get(Counters.FOO));
-  }
-
-  @Test
-  void concurrentAccumulateAndDuringWritesNeverExceedsWritten()
-      throws InterruptedException, ExecutionException, TimeoutException {
-    Accumulator<Counters> counters = Accumulator.of(Counters.class);
-    int threadCount = 8;
-    int incrementsPerThread = 5_000;
-
-    ExecutorService pool = Executors.newFixedThreadPool(threadCount + 1);
-    CountDownLatch done = new CountDownLatch(threadCount);
-    AtomicBoolean stop = new AtomicBoolean(false);
-    long[] runningTotal = {0L};
-
-    try {
-      Future<?> drainer =
-          pool.submit(
-              () -> {
+    @Test
+    void concurrentAccumulateAndDuringWritesNeverExceedsWritten()
+            throws InterruptedException, ExecutionException, TimeoutException {
+        Accumulator<Counters> counters = Accumulator.of(Counters.class);
+        int threadCount = 8;
+        int incrementsPerThread = 5_000;
+
+        ExecutorService pool = Executors.newFixedThreadPool(threadCount + 1);
+        CountDownLatch done = new CountDownLatch(threadCount);
+        AtomicBoolean stop = new AtomicBoolean(false);
+        long[] runningTotal = {0L};
+
+        try {
+            Future<?> drainer = pool.submit(() -> {
                 while (!stop.get()) {
-                  Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
-                  synchronized (runningTotal) {
-                    runningTotal[0] += drained.get(Counters.FOO);
-                  }
+                    Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
+                    synchronized (runningTotal) {
+                        runningTotal[0] += drained.get(Counters.FOO);
+                    }
                 }
-              });
-
-      for (int t = 0; t < threadCount; t++) {
-        pool.execute(
-            () -> {
-              for (int i = 0; i < incrementsPerThread; i++) {
-                counters.inc(Counters.FOO);
-              }
-              done.countDown();
             });
-      }
 
-      assertTrue(done.await(30, TimeUnit.SECONDS));
-      stop.set(true);
-      drainer.get(30, TimeUnit.SECONDS);
+            for (int t = 0; t < threadCount; t++) {
+                pool.execute(() -> {
+                    for (int i = 0; i < incrementsPerThread; i++) {
+                        counters.inc(Counters.FOO);
+                    }
+                    done.countDown();
+                });
+            }
+
+            assertTrue(done.await(30, TimeUnit.SECONDS));
+            stop.set(true);
+            drainer.get(30, TimeUnit.SECONDS);
+
+            Accumulator.Counts<Counters> finalDrain = counters.accumulateAndReset();
+            synchronized (runningTotal) {
+                runningTotal[0] += finalDrain.get(Counters.FOO);
+            }
+
+            assertEquals((long) threadCount * incrementsPerThread, runningTotal[0]);
+        } finally {
+            pool.shutdown();
+        }
+    }
+
+    @Test
+    void sumDoesNotResetStripes() {
+        Accumulator<Counters> counters = Accumulator.of(Counters.class);
+        counters.inc(Counters.FOO);
+
+        Accumulator.Counts<Counters> first = counters.sum();
+        assertEquals(1L, first.get(Counters.FOO));
+
+        // sum() didn't reset anything, so a second sum() sees the same total
+        Accumulator.Counts<Counters> second = counters.sum();
+        assertEquals(1L, second.get(Counters.FOO));
+
+        // and a real drain afterwards still sees the value sum() didn't consume
+        Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
+        assertEquals(1L, drained.get(Counters.FOO));
+    }
+
+    @Test
+    void sumReflectsIncrementsMadeAfterAnEarlierSum() {
+        Accumulator<Counters> counters = Accumulator.of(Counters.class);
+        counters.inc(Counters.FOO);
+        counters.sum();
+
+        counters.inc(Counters.FOO);
+        Accumulator.Counts<Counters> second = counters.sum();
+        assertEquals(2L, second.get(Counters.FOO));
+    }
+
+    @Test
+    void createSeedsAnAllZeroCountsWithoutAScratchAccumulator() {
+        Accumulator.Counts<Counters> zero = Accumulator.Counts.create(Counters.class);
+        assertEquals(0L, zero.get(Counters.FOO));
+        assertEquals(0L, zero.get(Counters.BAR));
+
+        Accumulator<Counters> counters = Accumulator.of(Counters.class);
+        counters.inc(Counters.FOO);
 
-      Accumulator.Counts<Counters> finalDrain = counters.accumulateAndReset();
-      synchronized (runningTotal) {
-        runningTotal[0] += finalDrain.get(Counters.FOO);
-      }
+        Accumulator.Counts<Counters> live = zero.plus(counters.sum());
+        assertEquals(1L, live.get(Counters.FOO));
+    }
+
+    @Test
+    void countsExposesItsOwnKeysWithoutASeparateValuesArray() {
+        Accumulator<Counters> counters = Accumulator.of(Counters.class);
+        counters.inc(Counters.FOO);
+        counters.add(Counters.BAR, 5L);
+
+        Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
+        assertEquals(Counters.values().length, drained.keys().size());
+
+        long total = 0L;
+        for (Counters c : drained.keys()) {
+            total += drained.get(c);
+        }
+        assertEquals(6L, total);
+    }
+
+    @Test
+    void keysIsUnmodifiable() {
+        Accumulator<Counters> counters = Accumulator.of(Counters.class);
+        Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
+        assertThrows(UnsupportedOperationException.class, () -> drained.keys().set(0, Counters.BAZ));
+    }
+
+    @Test
+    void plusCombinesAStoredRunningTotalWithALiveSumWithoutMutatingEither() {
+        Accumulator<Counters> counters = Accumulator.of(Counters.class);
+        counters.inc(Counters.FOO);
+        counters.add(Counters.BAR, 5L);
+
+        // drain once, e.g. as if a reporting cycle already ran and stored this total
+        Accumulator.Counts<Counters> storedTotal = counters.accumulateAndReset();
+
+        // more activity happens after that drain, before the next one
+        counters.inc(Counters.FOO);
+
+        Accumulator.Counts<Counters> live = storedTotal.plus(counters.sum());
+        assertEquals(2L, live.get(Counters.FOO));
+        assertEquals(5L, live.get(Counters.BAR));
+
+        // neither input was mutated by combining them
+        assertEquals(1L, storedTotal.get(Counters.FOO));
+        assertEquals(1L, counters.sum().get(Counters.FOO));
+    }
 
-      assertEquals((long) threadCount * incrementsPerThread, runningTotal[0]);
-    } finally {
-      pool.shutdown();
+    @Test
+    void fromZeroesEveryEntryBeforeTheGivenIndex() {
+        Accumulator<Counters> counters = Accumulator.of(Counters.class);
+        counters.inc(Counters.FOO);
+        counters.add(Counters.BAR, 4L);
+        counters.add(Counters.BAZ, 2L);
+
+        Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
+        Accumulator.Counts<Counters> remaining = drained.from(Counters.BAR.ordinal());
+
+        assertEquals(0L, remaining.get(Counters.FOO));
+        assertEquals(4L, remaining.get(Counters.BAR));
+        assertEquals(2L, remaining.get(Counters.BAZ));
+
+        // the original Counts is untouched by taking a remainder from it
+        assertEquals(1L, drained.get(Counters.FOO));
     }
-  }
-
-  @Test
-  void sumDoesNotResetStripes() {
-    Accumulator<Counters> counters = Accumulator.of(Counters.class);
-    counters.inc(Counters.FOO);
-
-    Accumulator.Counts<Counters> first = counters.sum();
-    assertEquals(1L, first.get(Counters.FOO));
-
-    // sum() didn't reset anything, so a second sum() sees the same total
-    Accumulator.Counts<Counters> second = counters.sum();
-    assertEquals(1L, second.get(Counters.FOO));
-
-    // and a real drain afterwards still sees the value sum() didn't consume
-    Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
-    assertEquals(1L, drained.get(Counters.FOO));
-  }
-
-  @Test
-  void sumReflectsIncrementsMadeAfterAnEarlierSum() {
-    Accumulator<Counters> counters = Accumulator.of(Counters.class);
-    counters.inc(Counters.FOO);
-    counters.sum();
-
-    counters.inc(Counters.FOO);
-    Accumulator.Counts<Counters> second = counters.sum();
-    assertEquals(2L, second.get(Counters.FOO));
-  }
-
-  @Test
-  void createSeedsAnAllZeroCountsWithoutAScratchAccumulator() {
-    Accumulator.Counts<Counters> zero = Accumulator.Counts.create(Counters.class);
-    assertEquals(0L, zero.get(Counters.FOO));
-    assertEquals(0L, zero.get(Counters.BAR));
-
-    Accumulator<Counters> counters = Accumulator.of(Counters.class);
-    counters.inc(Counters.FOO);
-
-    Accumulator.Counts<Counters> live = zero.plus(counters.sum());
-    assertEquals(1L, live.get(Counters.FOO));
-  }
-
-  @Test
-  void countsExposesItsOwnKeysWithoutASeparateValuesArray() {
-    Accumulator<Counters> counters = Accumulator.of(Counters.class);
-    counters.inc(Counters.FOO);
-    counters.add(Counters.BAR, 5L);
-
-    Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
-    assertEquals(Counters.values().length, drained.keys().size());
-
-    long total = 0L;
-    for (Counters c : drained.keys()) {
-      total += drained.get(c);
+
+    @Test
+    void runningTotalSeedsFromTheAccumulatorsCurrentSum() {
+        Accumulator<Counters> counters = Accumulator.of(Counters.class);
+        counters.inc(Counters.FOO);
+
+        Accumulator.RunningTotal<Counters> runningTotal = Accumulator.RunningTotal.of(counters);
+        assertEquals(1L, runningTotal.live().get(Counters.FOO));
+    }
+
+    @Test
+    void runningTotalDrainReturnsTheDeltaAndFoldsItIntoTheTotal() {
+        Accumulator<Counters> counters = Accumulator.of(Counters.class);
+        Accumulator.RunningTotal<Counters> runningTotal = Accumulator.RunningTotal.of(counters);
+
+        counters.inc(Counters.FOO);
+        Accumulator.Counts<Counters> delta = runningTotal.drain();
+        assertEquals(1L, delta.get(Counters.FOO));
+        assertEquals(1L, runningTotal.live().get(Counters.FOO));
+
+        counters.inc(Counters.FOO);
+        Accumulator.Counts<Counters> secondDelta = runningTotal.drain();
+        assertEquals(1L, secondDelta.get(Counters.FOO));
+        assertEquals(2L, runningTotal.live().get(Counters.FOO));
+    }
+
+    @Test
+    void runningTotalLiveReflectsActivitySinceTheLastDrainWithoutDraining() {
+        Accumulator<Counters> counters = Accumulator.of(Counters.class);
+        Accumulator.RunningTotal<Counters> runningTotal = Accumulator.RunningTotal.of(counters);
+
+        counters.inc(Counters.FOO);
+        runningTotal.drain();
+
+        counters.inc(Counters.FOO);
+        assertEquals(2L, runningTotal.live().get(Counters.FOO));
+        // live() didn't drain anything, so a real drain afterwards still sees the pending increment
+        assertEquals(1L, runningTotal.drain().get(Counters.FOO));
     }
-    assertEquals(6L, total);
-  }
-
-  @Test
-  void keysIsUnmodifiable() {
-    Accumulator<Counters> counters = Accumulator.of(Counters.class);
-    Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
-    assertThrows(UnsupportedOperationException.class, () -> drained.keys().set(0, Counters.BAZ));
-  }
-
-  @Test
-  void plusCombinesAStoredRunningTotalWithALiveSumWithoutMutatingEither() {
-    Accumulator<Counters> counters = Accumulator.of(Counters.class);
-    counters.inc(Counters.FOO);
-    counters.add(Counters.BAR, 5L);
-
-    // drain once, e.g. as if a reporting cycle already ran and stored this total
-    Accumulator.Counts<Counters> storedTotal = counters.accumulateAndReset();
-
-    // more activity happens after that drain, before the next one
-    counters.inc(Counters.FOO);
-
-    Accumulator.Counts<Counters> live = storedTotal.plus(counters.sum());
-    assertEquals(2L, live.get(Counters.FOO));
-    assertEquals(5L, live.get(Counters.BAR));
-
-    // neither input was mutated by combining them
-    assertEquals(1L, storedTotal.get(Counters.FOO));
-    assertEquals(1L, counters.sum().get(Counters.FOO));
-  }
-
-  @Test
-  void fromZeroesEveryEntryBeforeTheGivenIndex() {
-    Accumulator<Counters> counters = Accumulator.of(Counters.class);
-    counters.inc(Counters.FOO);
-    counters.add(Counters.BAR, 4L);
-    counters.add(Counters.BAZ, 2L);
-
-    Accumulator.Counts<Counters> drained = counters.accumulateAndReset();
-    Accumulator.Counts<Counters> remaining = drained.from(Counters.BAR.ordinal());
-
-    assertEquals(0L, remaining.get(Counters.FOO));
-    assertEquals(4L, remaining.get(Counters.BAR));
-    assertEquals(2L, remaining.get(Counters.BAZ));
-
-    // the original Counts is untouched by taking a remainder from it
-    assertEquals(1L, drained.get(Counters.FOO));
-  }
-
-  @Test
-  void runningTotalSeedsFromTheAccumulatorsCurrentSum() {
-    Accumulator<Counters> counters = Accumulator.of(Counters.class);
-    counters.inc(Counters.FOO);
-
-    Accumulator.RunningTotal<Counters> runningTotal = Accumulator.RunningTotal.of(counters);
-    assertEquals(1L, runningTotal.live().get(Counters.FOO));
-  }
-
-  @Test
-  void runningTotalDrainReturnsTheDeltaAndFoldsItIntoTheTotal() {
-    Accumulator<Counters> counters = Accumulator.of(Counters.class);
-    Accumulator.RunningTotal<Counters> runningTotal = Accumulator.RunningTotal.of(counters);
-
-    counters.inc(Counters.FOO);
-    Accumulator.Counts<Counters> delta = runningTotal.drain();
-    assertEquals(1L, delta.get(Counters.FOO));
-    assertEquals(1L, runningTotal.live().get(Counters.FOO));
-
-    counters.inc(Counters.FOO);
-    Accumulator.Counts<Counters> secondDelta = runningTotal.drain();
-    assertEquals(1L, secondDelta.get(Counters.FOO));
-    assertEquals(2L, runningTotal.live().get(Counters.FOO));
-  }
-
-  @Test
-  void runningTotalLiveReflectsActivitySinceTheLastDrainWithoutDraining() {
-    Accumulator<Counters> counters = Accumulator.of(Counters.class);
-    Accumulator.RunningTotal<Counters> runningTotal = Accumulator.RunningTotal.of(counters);
-
-    counters.inc(Counters.FOO);
-    runningTotal.drain();
-
-    counters.inc(Counters.FOO);
-    assertEquals(2L, runningTotal.live().get(Counters.FOO));
-    // live() didn't drain anything, so a real drain afterwards still sees the pending increment
-    assertEquals(1L, runningTotal.drain().get(Counters.FOO));
-  }
 }
diff --git a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/HistogramsTest.java b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/HistogramsTest.java
index ae5b4c783bb..ba6938b1a5b 100644
--- a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/HistogramsTest.java
+++ b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/HistogramsTest.java
@@ -12,52 +12,52 @@
 
 class HistogramsTest {
 
-  @AfterEach
-  void resetFactory() {
-    Histograms.factory = Histograms.NO_OP;
-  }
-
-  @Test
-  void constructorIsUsable() {
-    assertNotNull(new Histograms());
-  }
-
-  @Test
-  void registerIgnoresNull() {
-    Histograms.Factory before = Histograms.factory;
-    Histograms.register(null);
-    assertSame(before, Histograms.factory);
-  }
-
-  @Test
-  void registerReplacesFactory() {
-    Histograms.Factory factory = mock(Histograms.Factory.class);
-    Histograms.register(factory);
-    assertSame(factory, Histograms.factory);
-  }
-
-  @Test
-  void staticFactoryMethodsDelegateToRegisteredFactory() {
-    Histograms.Factory factory = mock(Histograms.Factory.class);
-    Histogram histogram = mock(Histogram.class);
-    Histogram logHistogram = mock(Histogram.class);
-    Histogram histogramWithBins = mock(Histogram.class);
-    HistogramWithSum histogramWithSum = mock(HistogramWithSum.class);
-    HistogramWithSum histogramWithSumFromBoundaries = mock(HistogramWithSum.class);
-
-    when(factory.newHistogram()).thenReturn(histogram);
-    when(factory.newLogHistogram()).thenReturn(logHistogram);
-    when(factory.newHistogram(0.01, 10)).thenReturn(histogramWithBins);
-    when(factory.newHistogramWithSum(0.01, 10)).thenReturn(histogramWithSum);
-    List<Double> boundaries = Arrays.asList(1.0, 2.0);
-    when(factory.newHistogramWithSum(boundaries)).thenReturn(histogramWithSumFromBoundaries);
-
-    Histograms.register(factory);
-
-    assertSame(histogram, Histogram.newHistogram());
-    assertSame(logHistogram, Histogram.newLogHistogram());
-    assertSame(histogramWithBins, Histogram.newHistogram(0.01, 10));
-    assertSame(histogramWithSum, Histogram.newHistogramWithSum(0.01, 10));
-    assertSame(histogramWithSumFromBoundaries, Histogram.newHistogramWithSum(boundaries));
-  }
+    @AfterEach
+    void resetFactory() {
+        Histograms.factory = Histograms.NO_OP;
+    }
+
+    @Test
+    void constructorIsUsable() {
+        assertNotNull(new Histograms());
+    }
+
+    @Test
+    void registerIgnoresNull() {
+        Histograms.Factory before = Histograms.factory;
+        Histograms.register(null);
+        assertSame(before, Histograms.factory);
+    }
+
+    @Test
+    void registerReplacesFactory() {
+        Histograms.Factory factory = mock(Histograms.Factory.class);
+        Histograms.register(factory);
+        assertSame(factory, Histograms.factory);
+    }
+
+    @Test
+    void staticFactoryMethodsDelegateToRegisteredFactory() {
+        Histograms.Factory factory = mock(Histograms.Factory.class);
+        Histogram histogram = mock(Histogram.class);
+        Histogram logHistogram = mock(Histogram.class);
+        Histogram histogramWithBins = mock(Histogram.class);
+        HistogramWithSum histogramWithSum = mock(HistogramWithSum.class);
+        HistogramWithSum histogramWithSumFromBoundaries = mock(HistogramWithSum.class);
+
+        when(factory.newHistogram()).thenReturn(histogram);
+        when(factory.newLogHistogram()).thenReturn(logHistogram);
+        when(factory.newHistogram(0.01, 10)).thenReturn(histogramWithBins);
+        when(factory.newHistogramWithSum(0.01, 10)).thenReturn(histogramWithSum);
+        List<Double> boundaries = Arrays.asList(1.0, 2.0);
+        when(factory.newHistogramWithSum(boundaries)).thenReturn(histogramWithSumFromBoundaries);
+
+        Histograms.register(factory);
+
+        assertSame(histogram, Histogram.newHistogram());
+        assertSame(logHistogram, Histogram.newLogHistogram());
+        assertSame(histogramWithBins, Histogram.newHistogram(0.01, 10));
+        assertSame(histogramWithSum, Histogram.newHistogramWithSum(0.01, 10));
+        assertSame(histogramWithSumFromBoundaries, Histogram.newHistogramWithSum(boundaries));
+    }
 }
diff --git a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/RecordingTest.java b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/RecordingTest.java
index a4c4906cd2d..ebe84f5ab36 100644
--- a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/RecordingTest.java
+++ b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/RecordingTest.java
@@ -6,32 +6,32 @@
 
 class RecordingTest {
 
-  @Test
-  void closeDelegatesToStop() {
-    StoppableRecording recording = new StoppableRecording();
+    @Test
+    void closeDelegatesToStop() {
+        StoppableRecording recording = new StoppableRecording();
 
-    recording.close();
+        recording.close();
 
-    assertTrue(recording.stopped);
-  }
+        assertTrue(recording.stopped);
+    }
 
-  private static final class StoppableRecording extends Recording {
-    boolean stopped;
+    private static final class StoppableRecording extends Recording {
+        boolean stopped;
 
-    @Override
-    public Recording start() {
-      return this;
-    }
+        @Override
+        public Recording start() {
+            return this;
+        }
 
-    @Override
-    public void reset() {}
+        @Override
+        public void reset() {}
 
-    @Override
-    public void stop() {
-      stopped = true;
-    }
+        @Override
+        public void stop() {
+            stopped = true;
+        }
 
-    @Override
-    public void flush() {}
-  }
+        @Override
+        public void flush() {}
+    }
 }
diff --git a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/RecordingStatsDClient.java b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/RecordingStatsDClient.java
index f017a134086..8584905d0ee 100644
--- a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/RecordingStatsDClient.java
+++ b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/RecordingStatsDClient.java
@@ -6,58 +6,57 @@
 /** Test fake that records every {@link #count} call for assertion. */
 final class RecordingStatsDClient implements StatsDClient {
 
-  static final class Count {
-    final String metricName;
-    final long delta;
-    final String[] tags;
-
-    Count(String metricName, long delta, String[] tags) {
-      this.metricName = metricName;
-      this.delta = delta;
-      this.tags = tags;
+    static final class Count {
+        final String metricName;
+        final long delta;
+        final String[] tags;
+
+        Count(String metricName, long delta, String[] tags) {
+            this.metricName = metricName;
+            this.delta = delta;
+            this.tags = tags;
+        }
     }
-  }
 
-  final List<Count> counts = new ArrayList<>();
+    final List<Count> counts = new ArrayList<>();
 
-  @Override
-  public void incrementCounter(String metricName, String... tags) {}
+    @Override
+    public void incrementCounter(String metricName, String... tags) {}
 
-  @Override
-  public void count(String metricName, long delta, String... tags) {
-    counts.add(new Count(metricName, delta, tags));
-  }
+    @Override
+    public void count(String metricName, long delta, String... tags) {
+        counts.add(new Count(metricName, delta, tags));
+    }
 
-  @Override
-  public void gauge(String metricName, long value, String... tags) {}
+    @Override
+    public void gauge(String metricName, long value, String... tags) {}
 
-  @Override
-  public void gauge(String metricName, double value, String... tags) {}
+    @Override
+    public void gauge(String metricName, double value, String... tags) {}
 
-  @Override
-  public void histogram(String metricName, long value, String... tags) {}
+    @Override
+    public void histogram(String metricName, long value, String... tags) {}
 
-  @Override
-  public void histogram(String metricName, double value, String... tags) {}
+    @Override
+    public void histogram(String metricName, double value, String... tags) {}
 
-  @Override
-  public void distribution(String metricName, long value, String... tags) {}
+    @Override
+    public void distribution(String metricName, long value, String... tags) {}
 
-  @Override
-  public void distribution(String metricName, double value, String... tags) {}
+    @Override
+    public void distribution(String metricName, double value, String... tags) {}
 
-  @Override
-  public void serviceCheck(
-      String serviceCheckName, String status, String message, String... tags) {}
+    @Override
+    public void serviceCheck(String serviceCheckName, String status, String message, String... tags) {}
 
-  @Override
-  public void error(Exception error) {}
+    @Override
+    public void error(Exception error) {}
 
-  @Override
-  public int getErrorCount() {
-    return 0;
-  }
+    @Override
+    public int getErrorCount() {
+        return 0;
+    }
 
-  @Override
-  public void close() {}
+    @Override
+    public void close() {}
 }
diff --git a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDClientManagerTest.java b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDClientManagerTest.java
index e37497e8293..98f0a21ede9 100644
--- a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDClientManagerTest.java
+++ b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDClientManagerTest.java
@@ -6,35 +6,35 @@
 
 class StatsDClientManagerTest {
 
-  @Test
-  void defaultFiveArgOverloadDelegatesWithAggregationEnabled() {
-    StatsDClient client = StatsDClient.NO_OP;
-    RecordingStatsDClientManager manager = new RecordingStatsDClientManager(client);
+    @Test
+    void defaultFiveArgOverloadDelegatesWithAggregationEnabled() {
+        StatsDClient client = StatsDClient.NO_OP;
+        RecordingStatsDClientManager manager = new RecordingStatsDClientManager(client);
 
-    StatsDClient result = manager.statsDClient("host", 8125, null, "ns", new String[] {"tag"});
+        StatsDClient result = manager.statsDClient("host", 8125, null, "ns", new String[] {"tag"});
 
-    assertSame(client, result);
-    assertSame(Boolean.TRUE, manager.lastUseAggregation);
-  }
-
-  private static final class RecordingStatsDClientManager implements StatsDClientManager {
-    private final StatsDClient client;
-    private Boolean lastUseAggregation;
-
-    RecordingStatsDClientManager(StatsDClient client) {
-      this.client = client;
+        assertSame(client, result);
+        assertSame(Boolean.TRUE, manager.lastUseAggregation);
     }
 
-    @Override
-    public StatsDClient statsDClient(
-        String host,
-        Integer port,
-        String namedPipe,
-        String namespace,
-        String[] constantTags,
-        boolean useAggregation) {
-      this.lastUseAggregation = useAggregation;
-      return client;
+    private static final class RecordingStatsDClientManager implements StatsDClientManager {
+        private final StatsDClient client;
+        private Boolean lastUseAggregation;
+
+        RecordingStatsDClientManager(StatsDClient client) {
+            this.client = client;
+        }
+
+        @Override
+        public StatsDClient statsDClient(
+                String host,
+                Integer port,
+                String namedPipe,
+                String namespace,
+                String[] constantTags,
+                boolean useAggregation) {
+            this.lastUseAggregation = useAggregation;
+            return client;
+        }
     }
-  }
 }
diff --git a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDClientTest.java b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDClientTest.java
index 9624e7b41bf..981da1da3e0 100644
--- a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDClientTest.java
+++ b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDClientTest.java
@@ -6,56 +6,55 @@
 
 class StatsDClientTest {
 
-  @Test
-  void noOpConstantIsUsable() {
-    assertNotNull(StatsDClient.NO_OP);
-  }
+    @Test
+    void noOpConstantIsUsable() {
+        assertNotNull(StatsDClient.NO_OP);
+    }
+
+    @Test
+    void defaultRecordEventIsNoOp() {
+        StatsDClient client = new MinimalStatsDClient();
 
-  @Test
-  void defaultRecordEventIsNoOp() {
-    StatsDClient client = new MinimalStatsDClient();
+        client.recordEvent("type", "source", "eventName", "message", "tag");
+    }
 
-    client.recordEvent("type", "source", "eventName", "message", "tag");
-  }
+    private static final class MinimalStatsDClient implements StatsDClient {
+        @Override
+        public void incrementCounter(String metricName, String... tags) {}
 
-  private static final class MinimalStatsDClient implements StatsDClient {
-    @Override
-    public void incrementCounter(String metricName, String... tags) {}
+        @Override
+        public void count(String metricName, long delta, String... tags) {}
 
-    @Override
-    public void count(String metricName, long delta, String... tags) {}
+        @Override
+        public void gauge(String metricName, long value, String... tags) {}
 
-    @Override
-    public void gauge(String metricName, long value, String... tags) {}
+        @Override
+        public void gauge(String metricName, double value, String... tags) {}
 
-    @Override
-    public void gauge(String metricName, double value, String... tags) {}
+        @Override
+        public void histogram(String metricName, long value, String... tags) {}
 
-    @Override
-    public void histogram(String metricName, long value, String... tags) {}
+        @Override
+        public void histogram(String metricName, double value, String... tags) {}
 
-    @Override
-    public void histogram(String metricName, double value, String... tags) {}
+        @Override
+        public void distribution(String metricName, long value, String... tags) {}
 
-    @Override
-    public void distribution(String metricName, long value, String... tags) {}
+        @Override
+        public void distribution(String metricName, double value, String... tags) {}
 
-    @Override
-    public void distribution(String metricName, double value, String... tags) {}
+        @Override
+        public void serviceCheck(String serviceCheckName, String status, String message, String... tags) {}
 
-    @Override
-    public void serviceCheck(
-        String serviceCheckName, String status, String message, String... tags) {}
+        @Override
+        public void error(Exception error) {}
 
-    @Override
-    public void error(Exception error) {}
+        @Override
+        public int getErrorCount() {
+            return 0;
+        }
 
-    @Override
-    public int getErrorCount() {
-      return 0;
+        @Override
+        public void close() {}
     }
-
-    @Override
-    public void close() {}
-  }
 }
diff --git a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDCountReporterTest.java b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDCountReporterTest.java
index 9324fa62aa3..2ab0fd518f9 100644
--- a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDCountReporterTest.java
+++ b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDCountReporterTest.java
@@ -14,194 +14,192 @@
 
 class StatsDCountReporterTest {
 
-  private static final String[] TAG_A = {"env:a"};
-  private static final String[] TAG_B = {"env:b"};
+    private static final String[] TAG_A = {"env:a"};
+    private static final String[] TAG_B = {"env:b"};
+
+    enum Counters implements StatsDCounterKey {
+        FOO("foo.total", TAG_A),
+        BAR("bar.total", TAG_A),
+        SHARED_A("shared.total", TAG_A),
+        SHARED_B("shared.total", TAG_B);
+
+        private final String metricName;
+        private final String[] tags;
+
+        Counters(String metricName, String[] tags) {
+            this.metricName = metricName;
+            this.tags = tags;
+        }
+
+        @Override
+        public String getMetricName() {
+            return metricName;
+        }
+
+        @Override
+        public String[] getTags() {
+            return tags;
+        }
+    }
+
+    @Test
+    void reportsNonZeroCounterWithItsOwnMetricNameAndTags() {
+        RecordingStatsDClient statsD = new RecordingStatsDClient();
+        Map<Counters, Long> deltas = new HashMap<>();
+        deltas.put(Counters.FOO, 3L);
+
+        StatsDCountReporter.report(statsD, Counters.values(), c -> deltas.getOrDefault(c, 0L));
+
+        assertEquals(1, statsD.counts.size());
+        RecordingStatsDClient.Count count = statsD.counts.get(0);
+        assertEquals("foo.total", count.metricName);
+        assertEquals(3L, count.delta);
+        assertArrayEquals(TAG_A, count.tags);
+    }
+
+    @Test
+    void skipsZeroDeltaCounters() {
+        RecordingStatsDClient statsD = new RecordingStatsDClient();
 
-  enum Counters implements StatsDCounterKey {
-    FOO("foo.total", TAG_A),
-    BAR("bar.total", TAG_A),
-    SHARED_A("shared.total", TAG_A),
-    SHARED_B("shared.total", TAG_B);
+        StatsDCountReporter.report(statsD, Counters.values(), c -> 0L);
 
-    private final String metricName;
-    private final String[] tags;
+        assertTrue(statsD.counts.isEmpty());
+    }
+
+    @Test
+    void reportsNothingWhenEveryCounterIsZero() {
+        RecordingStatsDClient statsD = new RecordingStatsDClient();
+        Map<Counters, Long> deltas = new HashMap<>();
+
+        StatsDCountReporter.report(statsD, Counters.values(), c -> deltas.getOrDefault(c, 0L));
 
-    Counters(String metricName, String[] tags) {
-      this.metricName = metricName;
-      this.tags = tags;
+        assertTrue(statsD.counts.isEmpty());
     }
 
-    @Override
-    public String getMetricName() {
-      return metricName;
+    @Test
+    void reportsConstantsSharingAMetricNameIndependentlyByTag() {
+        RecordingStatsDClient statsD = new RecordingStatsDClient();
+        Map<Counters, Long> deltas = new HashMap<>();
+        deltas.put(Counters.SHARED_A, 5L);
+        deltas.put(Counters.SHARED_B, 7L);
+
+        StatsDCountReporter.report(statsD, Counters.values(), c -> deltas.getOrDefault(c, 0L));
+
+        assertEquals(2, statsD.counts.size());
+        RecordingStatsDClient.Count a = statsD.counts.get(0);
+        RecordingStatsDClient.Count b = statsD.counts.get(1);
+        assertEquals("shared.total", a.metricName);
+        assertEquals(5L, a.delta);
+        assertArrayEquals(TAG_A, a.tags);
+        assertEquals("shared.total", b.metricName);
+        assertEquals(7L, b.delta);
+        assertArrayEquals(TAG_B, b.tags);
     }
 
-    @Override
-    public String[] getTags() {
-      return tags;
+    @Test
+    void flushDrainsAndReportsWithoutPerturbingTheCumulativeLiveTotal() {
+        RecordingStatsDClient statsD = new RecordingStatsDClient();
+        StatsDCountReporter<Counters> reporter = StatsDCountReporter.of(statsD, Counters.class);
+        reporter.inc(Counters.FOO);
+        reporter.add(Counters.BAR, 4L);
+
+        reporter.flush();
+
+        assertEquals(2, statsD.counts.size());
+        // live() is a cumulative total (real events observed), not "since the last flush" -- it
+        // doesn't reset just because a flush drained and reported the delta.
+        Accumulator.Counts<Counters> live = reporter.live();
+        assertEquals(1L, live.get(Counters.FOO));
+        assertEquals(4L, live.get(Counters.BAR));
+
+        reporter.flush();
+
+        // a second flush with nothing new to report doesn't inflate the cumulative total either.
+        assertEquals(2, statsD.counts.size());
+        live = reporter.live();
+        assertEquals(1L, live.get(Counters.FOO));
+        assertEquals(4L, live.get(Counters.BAR));
     }
-  }
-
-  @Test
-  void reportsNonZeroCounterWithItsOwnMetricNameAndTags() {
-    RecordingStatsDClient statsD = new RecordingStatsDClient();
-    Map<Counters, Long> deltas = new HashMap<>();
-    deltas.put(Counters.FOO, 3L);
-
-    StatsDCountReporter.report(statsD, Counters.values(), c -> deltas.getOrDefault(c, 0L));
-
-    assertEquals(1, statsD.counts.size());
-    RecordingStatsDClient.Count count = statsD.counts.get(0);
-    assertEquals("foo.total", count.metricName);
-    assertEquals(3L, count.delta);
-    assertArrayEquals(TAG_A, count.tags);
-  }
-
-  @Test
-  void skipsZeroDeltaCounters() {
-    RecordingStatsDClient statsD = new RecordingStatsDClient();
-
-    StatsDCountReporter.report(statsD, Counters.values(), c -> 0L);
-
-    assertTrue(statsD.counts.isEmpty());
-  }
-
-  @Test
-  void reportsNothingWhenEveryCounterIsZero() {
-    RecordingStatsDClient statsD = new RecordingStatsDClient();
-    Map<Counters, Long> deltas = new HashMap<>();
-
-    StatsDCountReporter.report(statsD, Counters.values(), c -> deltas.getOrDefault(c, 0L));
-
-    assertTrue(statsD.counts.isEmpty());
-  }
-
-  @Test
-  void reportsConstantsSharingAMetricNameIndependentlyByTag() {
-    RecordingStatsDClient statsD = new RecordingStatsDClient();
-    Map<Counters, Long> deltas = new HashMap<>();
-    deltas.put(Counters.SHARED_A, 5L);
-    deltas.put(Counters.SHARED_B, 7L);
-
-    StatsDCountReporter.report(statsD, Counters.values(), c -> deltas.getOrDefault(c, 0L));
-
-    assertEquals(2, statsD.counts.size());
-    RecordingStatsDClient.Count a = statsD.counts.get(0);
-    RecordingStatsDClient.Count b = statsD.counts.get(1);
-    assertEquals("shared.total", a.metricName);
-    assertEquals(5L, a.delta);
-    assertArrayEquals(TAG_A, a.tags);
-    assertEquals("shared.total", b.metricName);
-    assertEquals(7L, b.delta);
-    assertArrayEquals(TAG_B, b.tags);
-  }
-
-  @Test
-  void flushDrainsAndReportsWithoutPerturbingTheCumulativeLiveTotal() {
-    RecordingStatsDClient statsD = new RecordingStatsDClient();
-    StatsDCountReporter<Counters> reporter = StatsDCountReporter.of(statsD, Counters.class);
-    reporter.inc(Counters.FOO);
-    reporter.add(Counters.BAR, 4L);
-
-    reporter.flush();
-
-    assertEquals(2, statsD.counts.size());
-    // live() is a cumulative total (real events observed), not "since the last flush" -- it
-    // doesn't reset just because a flush drained and reported the delta.
-    Accumulator.Counts<Counters> live = reporter.live();
-    assertEquals(1L, live.get(Counters.FOO));
-    assertEquals(4L, live.get(Counters.BAR));
-
-    reporter.flush();
-
-    // a second flush with nothing new to report doesn't inflate the cumulative total either.
-    assertEquals(2, statsD.counts.size());
-    live = reporter.live();
-    assertEquals(1L, live.get(Counters.FOO));
-    assertEquals(4L, live.get(Counters.BAR));
-  }
-
-  @Test
-  void flushCompensatesCountersNotConfirmedDeliveredAfterAnException() {
-    List<RecordingStatsDClient.Count> delivered = new ArrayList<>();
-    AtomicBoolean failNextBar = new AtomicBoolean(true);
-    StatsDClient failsOnBarOnce =
-        new StatsDClient() {
-          @Override
-          public void incrementCounter(String metricName, String... tags) {}
-
-          @Override
-          public void count(String metricName, long delta, String... tags) {
-            if (metricName.equals("bar.total") && failNextBar.compareAndSet(true, false)) {
-              throw new RuntimeException("boom");
+
+    @Test
+    void flushCompensatesCountersNotConfirmedDeliveredAfterAnException() {
+        List<RecordingStatsDClient.Count> delivered = new ArrayList<>();
+        AtomicBoolean failNextBar = new AtomicBoolean(true);
+        StatsDClient failsOnBarOnce = new StatsDClient() {
+            @Override
+            public void incrementCounter(String metricName, String... tags) {}
+
+            @Override
+            public void count(String metricName, long delta, String... tags) {
+                if (metricName.equals("bar.total") && failNextBar.compareAndSet(true, false)) {
+                    throw new RuntimeException("boom");
+                }
+                delivered.add(new RecordingStatsDClient.Count(metricName, delta, tags));
             }
-            delivered.add(new RecordingStatsDClient.Count(metricName, delta, tags));
-          }
 
-          @Override
-          public void gauge(String metricName, long value, String... tags) {}
+            @Override
+            public void gauge(String metricName, long value, String... tags) {}
 
-          @Override
-          public void gauge(String metricName, double value, String... tags) {}
+            @Override
+            public void gauge(String metricName, double value, String... tags) {}
 
-          @Override
-          public void histogram(String metricName, long value, String... tags) {}
+            @Override
+            public void histogram(String metricName, long value, String... tags) {}
 
-          @Override
-          public void histogram(String metricName, double value, String... tags) {}
+            @Override
+            public void histogram(String metricName, double value, String... tags) {}
 
-          @Override
-          public void distribution(String metricName, long value, String... tags) {}
+            @Override
+            public void distribution(String metricName, long value, String... tags) {}
 
-          @Override
-          public void distribution(String metricName, double value, String... tags) {}
+            @Override
+            public void distribution(String metricName, double value, String... tags) {}
 
-          @Override
-          public void serviceCheck(
-              String serviceCheckName, String status, String message, String... tags) {}
+            @Override
+            public void serviceCheck(String serviceCheckName, String status, String message, String... tags) {}
 
-          @Override
-          public void error(Exception error) {}
+            @Override
+            public void error(Exception error) {}
 
-          @Override
-          public int getErrorCount() {
-            return 0;
-          }
+            @Override
+            public int getErrorCount() {
+                return 0;
+            }
 
-          @Override
-          public void close() {}
+            @Override
+            public void close() {}
         };
 
-    StatsDCountReporter<Counters> reporter = StatsDCountReporter.of(failsOnBarOnce, Counters.class);
-    reporter.inc(Counters.FOO);
-    reporter.add(Counters.BAR, 4L);
-    reporter.add(Counters.SHARED_A, 2L);
-
-    reporter.flush();
-
-    assertEquals(1, delivered.size());
-    assertEquals("foo.total", delivered.get(0).metricName);
-
-    // the cumulative live total counts every real event exactly once, whether or not statsd ever
-    // received it -- compensating for the failed send must not inflate this.
-    Accumulator.Counts<Counters> live = reporter.live();
-    assertEquals(1L, live.get(Counters.FOO));
-    assertEquals(4L, live.get(Counters.BAR));
-    assertEquals(2L, live.get(Counters.SHARED_A));
-
-    delivered.clear();
-    reporter.flush();
-
-    assertEquals(2, delivered.size());
-    assertEquals("bar.total", delivered.get(0).metricName);
-    assertEquals(4L, delivered.get(0).delta);
-    assertEquals("shared.total", delivered.get(1).metricName);
-    assertEquals(2L, delivered.get(1).delta);
-
-    // still exactly-once in the cumulative total after the retry succeeds.
-    live = reporter.live();
-    assertEquals(1L, live.get(Counters.FOO));
-    assertEquals(4L, live.get(Counters.BAR));
-    assertEquals(2L, live.get(Counters.SHARED_A));
-  }
+        StatsDCountReporter<Counters> reporter = StatsDCountReporter.of(failsOnBarOnce, Counters.class);
+        reporter.inc(Counters.FOO);
+        reporter.add(Counters.BAR, 4L);
+        reporter.add(Counters.SHARED_A, 2L);
+
+        reporter.flush();
+
+        assertEquals(1, delivered.size());
+        assertEquals("foo.total", delivered.get(0).metricName);
+
+        // the cumulative live total counts every real event exactly once, whether or not statsd ever
+        // received it -- compensating for the failed send must not inflate this.
+        Accumulator.Counts<Counters> live = reporter.live();
+        assertEquals(1L, live.get(Counters.FOO));
+        assertEquals(4L, live.get(Counters.BAR));
+        assertEquals(2L, live.get(Counters.SHARED_A));
+
+        delivered.clear();
+        reporter.flush();
+
+        assertEquals(2, delivered.size());
+        assertEquals("bar.total", delivered.get(0).metricName);
+        assertEquals(4L, delivered.get(0).delta);
+        assertEquals("shared.total", delivered.get(1).metricName);
+        assertEquals(2L, delivered.get(1).delta);
+
+        // still exactly-once in the cumulative total after the retry succeeds.
+        live = reporter.live();
+        assertEquals(1L, live.get(Counters.FOO));
+        assertEquals(4L, live.get(Counters.BAR));
+        assertEquals(2L, live.get(Counters.SHARED_A));
+    }
 }
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/DDSketchHistogram.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/DDSketchHistogram.java
index bbfab62e3b4..bc491be7172 100644
--- a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/DDSketchHistogram.java
+++ b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/DDSketchHistogram.java
@@ -11,96 +11,96 @@
 
 /** Wrapper around the DDSketch library so that it can be used in an instrumentation */
 public class DDSketchHistogram implements Histogram {
-  private final DDSketch sketch;
+    private final DDSketch sketch;
 
-  public DDSketchHistogram(DDSketch sketch) {
-    this.sketch = sketch;
-  }
+    public DDSketchHistogram(DDSketch sketch) {
+        this.sketch = sketch;
+    }
 
-  @Override
-  public final double getCount() {
-    return sketch.getCount();
-  }
+    @Override
+    public final double getCount() {
+        return sketch.getCount();
+    }
 
-  @Override
-  public final boolean isEmpty() {
-    return sketch.isEmpty();
-  }
+    @Override
+    public final boolean isEmpty() {
+        return sketch.isEmpty();
+    }
 
-  @Override
-  public void accept(double value) {
-    sketch.accept(value);
-  }
+    @Override
+    public void accept(double value) {
+        sketch.accept(value);
+    }
 
-  @Override
-  public void accept(double value, double count) {
-    sketch.accept(value, count);
-  }
+    @Override
+    public void accept(double value, double count) {
+        sketch.accept(value, count);
+    }
 
-  @Override
-  public final double getValueAtQuantile(double quantile) {
-    return sketch.getValueAtQuantile(quantile);
-  }
+    @Override
+    public final double getValueAtQuantile(double quantile) {
+        return sketch.getValueAtQuantile(quantile);
+    }
 
-  @Override
-  public double getMinValue() {
-    return sketch.getMinValue();
-  }
+    @Override
+    public double getMinValue() {
+        return sketch.getMinValue();
+    }
 
-  @Override
-  public double getMaxValue() {
-    return sketch.getMaxValue();
-  }
+    @Override
+    public double getMaxValue() {
+        return sketch.getMaxValue();
+    }
 
-  @Override
-  public final List<Double> getBinBoundaries() {
-    List<Double> boundaries = new ArrayList<>();
-    // Bin boundaries are defined as a sequence of upper bounds. When our sketch contains gaps we
-    // must introduce extra bounds to represent the lower bound of any bins after a gap; otherwise
-    // it would look like that bin covers not just its original range, but the gap as well.
-    int lastBinIndex = -1;
-    IndexMapping indexMapping = sketch.getIndexMapping();
-    Iterator<Bin> bins = sketch.getPositiveValueStore().getAscendingIterator();
-    while (bins.hasNext()) {
-      Bin bin = bins.next();
-      int binIndex = bin.getIndex();
-      if (lastBinIndex < binIndex - 1) {
-        // gap detected, introduce boundary representing current bin's lower bound
-        boundaries.add(indexMapping.upperBound(binIndex - 1));
-      }
-      boundaries.add(indexMapping.upperBound(binIndex));
-      lastBinIndex = binIndex;
+    @Override
+    public final List<Double> getBinBoundaries() {
+        List<Double> boundaries = new ArrayList<>();
+        // Bin boundaries are defined as a sequence of upper bounds. When our sketch contains gaps we
+        // must introduce extra bounds to represent the lower bound of any bins after a gap; otherwise
+        // it would look like that bin covers not just its original range, but the gap as well.
+        int lastBinIndex = -1;
+        IndexMapping indexMapping = sketch.getIndexMapping();
+        Iterator<Bin> bins = sketch.getPositiveValueStore().getAscendingIterator();
+        while (bins.hasNext()) {
+            Bin bin = bins.next();
+            int binIndex = bin.getIndex();
+            if (lastBinIndex < binIndex - 1) {
+                // gap detected, introduce boundary representing current bin's lower bound
+                boundaries.add(indexMapping.upperBound(binIndex - 1));
+            }
+            boundaries.add(indexMapping.upperBound(binIndex));
+            lastBinIndex = binIndex;
+        }
+        return boundaries;
     }
-    return boundaries;
-  }
 
-  @Override
-  public final List<Double> getBinCounts() {
-    List<Double> counts = new ArrayList<>();
-    // to maintain alignment with getBoundaries we must introduce zero counts for
-    // boundaries inserted to represent the lower bound of any bins after a gap.
-    int lastBinIndex = -1;
-    Iterator<Bin> bins = sketch.getPositiveValueStore().getAscendingIterator();
-    while (bins.hasNext()) {
-      Bin bin = bins.next();
-      int binIndex = bin.getIndex();
-      if (lastBinIndex < binIndex - 1) {
-        // gap detected, insert zero count for boundary introduced by getBoundaries
-        counts.add(0d);
-      }
-      counts.add(bin.getCount());
-      lastBinIndex = binIndex;
+    @Override
+    public final List<Double> getBinCounts() {
+        List<Double> counts = new ArrayList<>();
+        // to maintain alignment with getBoundaries we must introduce zero counts for
+        // boundaries inserted to represent the lower bound of any bins after a gap.
+        int lastBinIndex = -1;
+        Iterator<Bin> bins = sketch.getPositiveValueStore().getAscendingIterator();
+        while (bins.hasNext()) {
+            Bin bin = bins.next();
+            int binIndex = bin.getIndex();
+            if (lastBinIndex < binIndex - 1) {
+                // gap detected, insert zero count for boundary introduced by getBoundaries
+                counts.add(0d);
+            }
+            counts.add(bin.getCount());
+            lastBinIndex = binIndex;
+        }
+        return counts;
     }
-    return counts;
-  }
 
-  @Override
-  public void clear() {
-    sketch.clear();
-  }
+    @Override
+    public void clear() {
+        sketch.clear();
+    }
 
-  @Override
-  public final ByteBuffer serialize() {
-    return sketch.serialize();
-  }
+    @Override
+    public final ByteBuffer serialize() {
+        return sketch.serialize();
+    }
 }
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/DDSketchHistogramWithSum.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/DDSketchHistogramWithSum.java
index 1837ee4e1b2..804aea157c4 100644
--- a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/DDSketchHistogramWithSum.java
+++ b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/DDSketchHistogramWithSum.java
@@ -6,80 +6,80 @@
 
 /** Adds exact summary statistics to the DDSketch wrapper */
 public final class DDSketchHistogramWithSum extends DDSketchHistogram implements HistogramWithSum {
-  private double sum;
-  // We use a compensated sum to avoid accumulating rounding errors.
-  // See https://en.wikipedia.org/wiki/Kahan_summation_algorithm.
-  private double sumCompensation; // Low order bits of sum
-  private double simpleSum; // Used to compute right sum for non-finite inputs
-  private double min = Double.POSITIVE_INFINITY;
-  private double max = Double.NEGATIVE_INFINITY;
+    private double sum;
+    // We use a compensated sum to avoid accumulating rounding errors.
+    // See https://en.wikipedia.org/wiki/Kahan_summation_algorithm.
+    private double sumCompensation; // Low order bits of sum
+    private double simpleSum; // Used to compute right sum for non-finite inputs
+    private double min = Double.POSITIVE_INFINITY;
+    private double max = Double.NEGATIVE_INFINITY;
 
-  public DDSketchHistogramWithSum(DDSketch sketch) {
-    super(sketch);
-  }
+    public DDSketchHistogramWithSum(DDSketch sketch) {
+        super(sketch);
+    }
 
-  @Override
-  public double getSum() {
-    // Better error bounds to add both terms as the final sum
-    final double tmp = sum + sumCompensation;
-    if (Double.isNaN(tmp) && Double.isInfinite(simpleSum)) {
-      // If the compensated sum is spuriously NaN from accumulating one or more same-signed infinite
-      // values, return the correctly-signed infinity stored in simpleSum.
-      return simpleSum;
-    } else {
-      return tmp;
+    @Override
+    public double getSum() {
+        // Better error bounds to add both terms as the final sum
+        final double tmp = sum + sumCompensation;
+        if (Double.isNaN(tmp) && Double.isInfinite(simpleSum)) {
+            // If the compensated sum is spuriously NaN from accumulating one or more same-signed infinite
+            // values, return the correctly-signed infinity stored in simpleSum.
+            return simpleSum;
+        } else {
+            return tmp;
+        }
     }
-  }
 
-  @Override
-  public double getMinValue() {
-    if (isEmpty()) {
-      throw new NoSuchElementException();
+    @Override
+    public double getMinValue() {
+        if (isEmpty()) {
+            throw new NoSuchElementException();
+        }
+        return min;
     }
-    return min;
-  }
 
-  @Override
-  public double getMaxValue() {
-    if (isEmpty()) {
-      throw new NoSuchElementException();
+    @Override
+    public double getMaxValue() {
+        if (isEmpty()) {
+            throw new NoSuchElementException();
+        }
+        return max;
     }
-    return max;
-  }
 
-  @Override
-  public void accept(double value) {
-    super.accept(value);
-    updateSummaryStats(value);
-  }
+    @Override
+    public void accept(double value) {
+        super.accept(value);
+        updateSummaryStats(value);
+    }
 
-  @Override
-  public void accept(double value, double count) {
-    super.accept(value, count);
-    updateSummaryStats(value * count);
-  }
+    @Override
+    public void accept(double value, double count) {
+        super.accept(value, count);
+        updateSummaryStats(value * count);
+    }
 
-  @Override
-  public void clear() {
-    super.clear();
-    sum = 0;
-    simpleSum = 0;
-    sumCompensation = 0;
-    min = Double.POSITIVE_INFINITY;
-    max = Double.NEGATIVE_INFINITY;
-  }
+    @Override
+    public void clear() {
+        super.clear();
+        sum = 0;
+        simpleSum = 0;
+        sumCompensation = 0;
+        min = Double.POSITIVE_INFINITY;
+        max = Double.NEGATIVE_INFINITY;
+    }
 
-  private void updateSummaryStats(double value) {
-    simpleSum += value;
-    sumWithCompensation(value);
-    min = Math.min(min, value);
-    max = Math.max(max, value);
-  }
+    private void updateSummaryStats(double value) {
+        simpleSum += value;
+        sumWithCompensation(value);
+        min = Math.min(min, value);
+        max = Math.max(max, value);
+    }
 
-  private void sumWithCompensation(double value) {
-    final double tmp = value - sumCompensation;
-    final double velvel = sum + tmp; // Little wolf of rounding error
-    sumCompensation = (velvel - sum) - tmp;
-    sum = velvel;
-  }
+    private void sumWithCompensation(double value) {
+        final double tmp = value - sumCompensation;
+        final double velvel = sum + tmp; // Little wolf of rounding error
+        sumCompensation = (velvel - sum) - tmp;
+        sum = velvel;
+    }
 }
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/DDSketchHistograms.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/DDSketchHistograms.java
index 8c68013474f..e8bd19a2e21 100644
--- a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/DDSketchHistograms.java
+++ b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/DDSketchHistograms.java
@@ -16,146 +16,141 @@
 import java.util.List;
 
 public final class DDSketchHistograms implements Histograms.Factory {
-  private static final BitwiseLinearlyInterpolatedMapping INDEX_MAPPING =
-      new BitwiseLinearlyInterpolatedMapping(1.0 / 128.0);
-  // use the same gamma and index offset as the Datadog backend, to avoid doing
-  // any conversions in the backend that would lead to a loss of precision
-  private static final LogarithmicMapping LOG_INDEX_MAPPING =
-      new LogarithmicMapping(1.015625, 1.8761281912861705);
-  public static final Histograms.Factory FACTORY = new DDSketchHistograms();
-
-  private DDSketchHistograms() {}
-
-  @Override
-  public Histogram newHistogram() {
-    DDSketch sketch = new DDSketch(INDEX_MAPPING, () -> new CollapsingLowestDenseStore(1024));
-    return new DDSketchHistogram(sketch);
-  }
-
-  @Override
-  public Histogram newLogHistogram() {
-    DDSketch sketch = new DDSketch(LOG_INDEX_MAPPING, () -> new CollapsingLowestDenseStore(1024));
-    return new DDSketchHistogram(sketch);
-  }
-
-  @Override
-  public Histogram newHistogram(double relativeAccuracy, int maxNumBins) {
-    DDSketch sketch = DDSketches.logarithmicCollapsingLowestDense(relativeAccuracy, maxNumBins);
-    return new DDSketchHistogram(sketch);
-  }
-
-  @Override
-  public HistogramWithSum newHistogramWithSum(double relativeAccuracy, int maxNumBins) {
-    DDSketch sketch = DDSketches.logarithmicCollapsingLowestDense(relativeAccuracy, maxNumBins);
-    return new DDSketchHistogramWithSum(sketch);
-  }
-
-  @Override
-  public HistogramWithSum newHistogramWithSum(List<Double> binBoundaries) {
-    validateBoundaries(binBoundaries);
-    DDSketch sketch =
-        new DDSketch(
-            new ExplicitBoundaries(binBoundaries),
-            () -> new CollapsingLowestDenseStore(0), // negative store not used
-            () -> new CollapsingLowestDenseStore(binBoundaries.size() + 1),
-            Double.NEGATIVE_INFINITY); // assign all negative/zero values to first bin
-    return new DDSketchHistogramWithSum(sketch);
-  }
-
-  static void validateBoundaries(List<Double> boundaries) {
-    if (boundaries.isEmpty()) {
-      return;
-    }
-    Double previousBoundary = null;
-    for (Double boundary : boundaries) {
-      if (boundary == null) {
-        throw new IllegalArgumentException("invalid bucket boundary: null");
-      }
-      if (boundary.isNaN()) {
-        throw new IllegalArgumentException("invalid bucket boundary: NaN");
-      }
-      if (previousBoundary != null && previousBoundary >= boundary) {
-        throw new IllegalArgumentException(
-            "Bucket boundaries must be in increasing order: "
-                + previousBoundary
-                + " >= "
-                + boundary);
-      }
-      previousBoundary = boundary;
-    }
-    if (boundaries.get(0) < 0) {
-      throw new IllegalArgumentException("invalid bucket boundary: " + boundaries.get(0));
-    }
-    if (boundaries.get(boundaries.size() - 1) == Double.POSITIVE_INFINITY) {
-      throw new IllegalArgumentException("invalid bucket boundary: +Infinity");
-    }
-  }
+    private static final BitwiseLinearlyInterpolatedMapping INDEX_MAPPING =
+            new BitwiseLinearlyInterpolatedMapping(1.0 / 128.0);
+    // use the same gamma and index offset as the Datadog backend, to avoid doing
+    // any conversions in the backend that would lead to a loss of precision
+    private static final LogarithmicMapping LOG_INDEX_MAPPING = new LogarithmicMapping(1.015625, 1.8761281912861705);
+    public static final Histograms.Factory FACTORY = new DDSketchHistograms();
 
-  static final class ExplicitBoundaries implements IndexMapping {
-    private final List<Double> binBoundaries;
-
-    ExplicitBoundaries(List<Double> binBoundaries) {
-      this.binBoundaries = binBoundaries;
-    }
+    private DDSketchHistograms() {}
 
     @Override
-    public int index(double value) {
-      // negative index means no exact match, use '~' to find the closest index
-      int index = binarySearch(binBoundaries, value);
-      return index >= 0 ? index : ~index;
+    public Histogram newHistogram() {
+        DDSketch sketch = new DDSketch(INDEX_MAPPING, () -> new CollapsingLowestDenseStore(1024));
+        return new DDSketchHistogram(sketch);
     }
 
     @Override
-    public double lowerBound(int index) {
-      if (index == 0) {
-        return Double.NEGATIVE_INFINITY;
-      } else {
-        return binBoundaries.get(index - 1);
-      }
+    public Histogram newLogHistogram() {
+        DDSketch sketch = new DDSketch(LOG_INDEX_MAPPING, () -> new CollapsingLowestDenseStore(1024));
+        return new DDSketchHistogram(sketch);
     }
 
     @Override
-    public double upperBound(int index) {
-      if (index < binBoundaries.size()) {
-        return binBoundaries.get(index);
-      } else {
-        return Double.POSITIVE_INFINITY;
-      }
+    public Histogram newHistogram(double relativeAccuracy, int maxNumBins) {
+        DDSketch sketch = DDSketches.logarithmicCollapsingLowestDense(relativeAccuracy, maxNumBins);
+        return new DDSketchHistogram(sketch);
     }
 
     @Override
-    public double minIndexableValue() {
-      return Double.NEGATIVE_INFINITY;
+    public HistogramWithSum newHistogramWithSum(double relativeAccuracy, int maxNumBins) {
+        DDSketch sketch = DDSketches.logarithmicCollapsingLowestDense(relativeAccuracy, maxNumBins);
+        return new DDSketchHistogramWithSum(sketch);
     }
 
     @Override
-    public double maxIndexableValue() {
-      return Double.POSITIVE_INFINITY;
+    public HistogramWithSum newHistogramWithSum(List<Double> binBoundaries) {
+        validateBoundaries(binBoundaries);
+        DDSketch sketch = new DDSketch(
+                new ExplicitBoundaries(binBoundaries),
+                () -> new CollapsingLowestDenseStore(0), // negative store not used
+                () -> new CollapsingLowestDenseStore(binBoundaries.size() + 1),
+                Double.NEGATIVE_INFINITY); // assign all negative/zero values to first bin
+        return new DDSketchHistogramWithSum(sketch);
     }
 
-    @Override
-    public double value(int index) {
-      throw new UnsupportedOperationException();
+    static void validateBoundaries(List<Double> boundaries) {
+        if (boundaries.isEmpty()) {
+            return;
+        }
+        Double previousBoundary = null;
+        for (Double boundary : boundaries) {
+            if (boundary == null) {
+                throw new IllegalArgumentException("invalid bucket boundary: null");
+            }
+            if (boundary.isNaN()) {
+                throw new IllegalArgumentException("invalid bucket boundary: NaN");
+            }
+            if (previousBoundary != null && previousBoundary >= boundary) {
+                throw new IllegalArgumentException(
+                        "Bucket boundaries must be in increasing order: " + previousBoundary + " >= " + boundary);
+            }
+            previousBoundary = boundary;
+        }
+        if (boundaries.get(0) < 0) {
+            throw new IllegalArgumentException("invalid bucket boundary: " + boundaries.get(0));
+        }
+        if (boundaries.get(boundaries.size() - 1) == Double.POSITIVE_INFINITY) {
+            throw new IllegalArgumentException("invalid bucket boundary: +Infinity");
+        }
     }
 
-    @Override
-    public double relativeAccuracy() {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void encode(Output output) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int serializedSize() {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void serialize(Serializer serializer) {
-      throw new UnsupportedOperationException();
+    static final class ExplicitBoundaries implements IndexMapping {
+        private final List<Double> binBoundaries;
+
+        ExplicitBoundaries(List<Double> binBoundaries) {
+            this.binBoundaries = binBoundaries;
+        }
+
+        @Override
+        public int index(double value) {
+            // negative index means no exact match, use '~' to find the closest index
+            int index = binarySearch(binBoundaries, value);
+            return index >= 0 ? index : ~index;
+        }
+
+        @Override
+        public double lowerBound(int index) {
+            if (index == 0) {
+                return Double.NEGATIVE_INFINITY;
+            } else {
+                return binBoundaries.get(index - 1);
+            }
+        }
+
+        @Override
+        public double upperBound(int index) {
+            if (index < binBoundaries.size()) {
+                return binBoundaries.get(index);
+            } else {
+                return Double.POSITIVE_INFINITY;
+            }
+        }
+
+        @Override
+        public double minIndexableValue() {
+            return Double.NEGATIVE_INFINITY;
+        }
+
+        @Override
+        public double maxIndexableValue() {
+            return Double.POSITIVE_INFINITY;
+        }
+
+        @Override
+        public double value(int index) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public double relativeAccuracy() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void encode(Output output) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public int serializedSize() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void serialize(Serializer serializer) {
+            throw new UnsupportedOperationException();
+        }
     }
-  }
 }
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/MonitoringImpl.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/MonitoringImpl.java
index 95dc6dee6e7..45f4230276d 100644
--- a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/MonitoringImpl.java
+++ b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/MonitoringImpl.java
@@ -7,33 +7,32 @@
 import java.util.concurrent.TimeUnit;
 
 public final class MonitoringImpl implements Monitoring {
-  private final StatsDClient statsd;
-  private final long flushAfterNanos;
+    private final StatsDClient statsd;
+    private final long flushAfterNanos;
 
-  public MonitoringImpl(final StatsDClient statsd, long flushInterval, TimeUnit flushUnit) {
-    this.statsd = statsd;
-    this.flushAfterNanos = flushUnit.toNanos(flushInterval);
-  }
+    public MonitoringImpl(final StatsDClient statsd, long flushInterval, TimeUnit flushUnit) {
+        this.statsd = statsd;
+        this.flushAfterNanos = flushUnit.toNanos(flushInterval);
+    }
 
-  @Override
-  public Recording newTimer(final String name) {
-    return new Timer(name, statsd, flushAfterNanos);
-  }
+    @Override
+    public Recording newTimer(final String name) {
+        return new Timer(name, statsd, flushAfterNanos);
+    }
 
-  @Override
-  public Recording newTimer(final String name, final String... tags) {
-    return new Timer(name, tags, statsd, flushAfterNanos);
-  }
+    @Override
+    public Recording newTimer(final String name, final String... tags) {
+        return new Timer(name, tags, statsd, flushAfterNanos);
+    }
 
-  @Override
-  public Recording newThreadLocalTimer(final String name) {
-    return new ThreadLocalRecording(
-        ThreadLocal.withInitial(
-            () -> newTimer(name, "thread:" + Thread.currentThread().getName())));
-  }
+    @Override
+    public Recording newThreadLocalTimer(final String name) {
+        return new ThreadLocalRecording(ThreadLocal.withInitial(
+                () -> newTimer(name, "thread:" + Thread.currentThread().getName())));
+    }
 
-  @Override
-  public Counter newCounter(final String name) {
-    return new StatsDCounter(name, statsd);
-  }
+    @Override
+    public Counter newCounter(final String name) {
+        return new StatsDCounter(name, statsd);
+    }
 }
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/StatsDCounter.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/StatsDCounter.java
index de597a3a50d..d16a37b7c16 100644
--- a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/StatsDCounter.java
+++ b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/StatsDCounter.java
@@ -7,21 +7,21 @@
 
 public final class StatsDCounter implements Counter {
 
-  private final String name;
-  private final String[] tags;
-  private final StatsDClient statsd;
+    private final String name;
+    private final String[] tags;
+    private final StatsDClient statsd;
 
-  StatsDCounter(String name, StatsDClient statsd) {
-    this.name = name;
-    this.tags = new String[0];
-    this.statsd = statsd;
-  }
+    StatsDCounter(String name, StatsDClient statsd) {
+        this.name = name;
+        this.tags = new String[0];
+        this.statsd = statsd;
+    }
 
-  public void increment(int delta) {
-    statsd.count(name, delta, tags);
-  }
+    public void increment(int delta) {
+        statsd.count(name, delta, tags);
+    }
 
-  public void incrementErrorCount(String cause, int delta) {
-    statsd.count(name, delta, mergeTags(tags, new String[] {"cause:" + cause.replace(' ', '_')}));
-  }
+    public void incrementErrorCount(String cause, int delta) {
+        statsd.count(name, delta, mergeTags(tags, new String[] {"cause:" + cause.replace(' ', '_')}));
+    }
 }
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/ThreadLocalRecording.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/ThreadLocalRecording.java
index 0785bcbe7dd..7c37491e308 100644
--- a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/ThreadLocalRecording.java
+++ b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/ThreadLocalRecording.java
@@ -4,29 +4,29 @@
 
 public class ThreadLocalRecording extends Recording {
 
-  private final ThreadLocal<Recording> tls;
-
-  public ThreadLocalRecording(ThreadLocal<Recording> tls) {
-    this.tls = tls;
-  }
-
-  @Override
-  public Recording start() {
-    return tls.get().start();
-  }
-
-  @Override
-  public void reset() {
-    tls.get().reset();
-  }
-
-  @Override
-  public void stop() {
-    tls.get().stop();
-  }
-
-  @Override
-  public void flush() {
-    tls.get().flush();
-  }
+    private final ThreadLocal<Recording> tls;
+
+    public ThreadLocalRecording(ThreadLocal<Recording> tls) {
+        this.tls = tls;
+    }
+
+    @Override
+    public Recording start() {
+        return tls.get().start();
+    }
+
+    @Override
+    public void reset() {
+        tls.get().reset();
+    }
+
+    @Override
+    public void stop() {
+        tls.get().stop();
+    }
+
+    @Override
+    public void flush() {
+        tls.get().flush();
+    }
 }
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/Timer.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/Timer.java
index 7d6e0e86351..c6aa96e6265 100644
--- a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/Timer.java
+++ b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/Timer.java
@@ -14,76 +14,76 @@
  */
 public class Timer extends Recording {
 
-  private static final long THIRTY_SECONDS_AS_MICROS = SECONDS.toMicros(30);
+    private static final long THIRTY_SECONDS_AS_MICROS = SECONDS.toMicros(30);
 
-  private static final String[] P_50 = new String[] {"stat:p50"};
-  private static final String[] P_99 = new String[] {"stat:p99"};
-  private static final String[] MAX = new String[] {"stat:max"};
+    private static final String[] P_50 = new String[] {"stat:p50"};
+    private static final String[] P_99 = new String[] {"stat:p99"};
+    private static final String[] MAX = new String[] {"stat:max"};
 
-  private final String name;
-  private final StatsDClient statsd;
-  private final Histogram histogram;
-  private final long flushAfterNanos;
+    private final String name;
+    private final StatsDClient statsd;
+    private final Histogram histogram;
+    private final long flushAfterNanos;
 
-  private final String[] p50Tags;
-  private final String[] p99Tags;
-  private final String[] maxTags;
+    private final String[] p50Tags;
+    private final String[] p99Tags;
+    private final String[] maxTags;
 
-  private long start;
-  private long lastFlush = 0;
+    private long start;
+    private long lastFlush = 0;
 
-  Timer(final String name, final String[] tags, final StatsDClient statsd, long flushAfterNanos) {
-    this.name = name;
-    this.statsd = statsd;
-    this.flushAfterNanos = flushAfterNanos;
-    this.histogram = Histogram.newHistogram();
-    this.p50Tags = mergeTags(P_50, tags);
-    this.p99Tags = mergeTags(P_99, tags);
-    this.maxTags = mergeTags(MAX, tags);
-  }
+    Timer(final String name, final String[] tags, final StatsDClient statsd, long flushAfterNanos) {
+        this.name = name;
+        this.statsd = statsd;
+        this.flushAfterNanos = flushAfterNanos;
+        this.histogram = Histogram.newHistogram();
+        this.p50Tags = mergeTags(P_50, tags);
+        this.p99Tags = mergeTags(P_99, tags);
+        this.maxTags = mergeTags(MAX, tags);
+    }
 
-  Timer(final String name, final StatsDClient statsd, long flushAfterNanos) {
-    this(name, null, statsd, flushAfterNanos);
-  }
+    Timer(final String name, final StatsDClient statsd, long flushAfterNanos) {
+        this(name, null, statsd, flushAfterNanos);
+    }
 
-  @Override
-  public Recording start() {
-    start = System.nanoTime();
-    return this;
-  }
+    @Override
+    public Recording start() {
+        start = System.nanoTime();
+        return this;
+    }
 
-  @Override
-  public void reset() {
-    long now = System.nanoTime();
-    record(now);
-    start = now;
-  }
+    @Override
+    public void reset() {
+        long now = System.nanoTime();
+        record(now);
+        start = now;
+    }
 
-  @Override
-  public void stop() {
-    record(System.nanoTime());
-  }
+    @Override
+    public void stop() {
+        record(System.nanoTime());
+    }
 
-  private void record(long now) {
-    // if it's longer than 30s, we have bigger problems
-    histogram.accept(Math.min(NANOSECONDS.toMicros(now - start), THIRTY_SECONDS_AS_MICROS));
-    if (now - lastFlush > flushAfterNanos) {
-      lastFlush = now;
-      flush();
+    private void record(long now) {
+        // if it's longer than 30s, we have bigger problems
+        histogram.accept(Math.min(NANOSECONDS.toMicros(now - start), THIRTY_SECONDS_AS_MICROS));
+        if (now - lastFlush > flushAfterNanos) {
+            lastFlush = now;
+            flush();
+        }
     }
-  }
 
-  @Override
-  public void flush() {
-    if (histogram.isEmpty()) {
-      statsd.gauge(name, 0D, p50Tags);
-      statsd.gauge(name, 0D, p99Tags);
-      statsd.gauge(name, 0D, maxTags);
-    } else {
-      statsd.gauge(name, histogram.getValueAtQuantile(0.50), p50Tags);
-      statsd.gauge(name, histogram.getValueAtQuantile(0.99), p99Tags);
-      statsd.gauge(name, histogram.getMaxValue(), maxTags);
+    @Override
+    public void flush() {
+        if (histogram.isEmpty()) {
+            statsd.gauge(name, 0D, p50Tags);
+            statsd.gauge(name, 0D, p99Tags);
+            statsd.gauge(name, 0D, maxTags);
+        } else {
+            statsd.gauge(name, histogram.getValueAtQuantile(0.50), p50Tags);
+            statsd.gauge(name, histogram.getValueAtQuantile(0.99), p99Tags);
+            statsd.gauge(name, histogram.getMaxValue(), maxTags);
+        }
+        histogram.clear();
     }
-    histogram.clear();
-  }
 }
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/Utils.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/Utils.java
index 7a8bb098d34..86b3a240725 100644
--- a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/Utils.java
+++ b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/Utils.java
@@ -3,14 +3,14 @@
 import java.util.Arrays;
 
 public final class Utils {
-  private Utils() {}
+    private Utils() {}
 
-  static String[] mergeTags(String[] left, String[] right) {
-    if (null == right) {
-      return left;
+    static String[] mergeTags(String[] left, String[] right) {
+        if (null == right) {
+            return left;
+        }
+        String[] merged = Arrays.copyOf(left, left.length + right.length);
+        System.arraycopy(right, 0, merged, left.length, right.length);
+        return merged;
     }
-    String[] merged = Arrays.copyOf(left, left.length + right.length);
-    System.arraycopy(right, 0, merged, left.length, right.length);
-    return merged;
-  }
 }
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/statsd/DDAgentStatsDClient.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/statsd/DDAgentStatsDClient.java
index 8f319cdef91..94631d75a42 100644
--- a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/statsd/DDAgentStatsDClient.java
+++ b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/statsd/DDAgentStatsDClient.java
@@ -8,127 +8,115 @@
 import org.slf4j.LoggerFactory;
 
 public final class DDAgentStatsDClient implements StatsDClient {
-  private static final Logger log = LoggerFactory.getLogger(DDAgentStatsDClient.class);
-  private final DDAgentStatsDConnection connection;
-  private final Function<String, String> nameMapping;
-  private final Function<String[], String[]> tagMapping;
-
-  DDAgentStatsDClient(
-      final DDAgentStatsDConnection connection,
-      final Function<String, String> nameMapping,
-      final Function<String[], String[]> tagMapping) {
-    this.connection = connection;
-    this.nameMapping = nameMapping;
-    this.tagMapping = tagMapping;
-
-    connection.acquire();
-  }
-
-  @Override
-  public void incrementCounter(final String metricName, final String... tags) {
-    connection.statsd.count(nameMapping.apply(metricName), 1L, tagMapping.apply(tags));
-  }
-
-  @Override
-  public void count(final String metricName, final long value, final String... tags) {
-    connection.statsd.count(nameMapping.apply(metricName), value, tagMapping.apply(tags));
-  }
-
-  @Override
-  public void gauge(final String metricName, final long value, final String... tags) {
-    connection.statsd.recordGaugeValue(
-        nameMapping.apply(metricName), value, tagMapping.apply(tags));
-  }
-
-  @Override
-  public void gauge(final String metricName, final double value, final String... tags) {
-    connection.statsd.recordGaugeValue(
-        nameMapping.apply(metricName), value, tagMapping.apply(tags));
-  }
-
-  @Override
-  public void histogram(final String metricName, final long value, final String... tags) {
-    connection.statsd.recordHistogramValue(
-        nameMapping.apply(metricName), value, tagMapping.apply(tags));
-  }
-
-  @Override
-  public void histogram(final String metricName, final double value, final String... tags) {
-    connection.statsd.recordHistogramValue(
-        nameMapping.apply(metricName), value, tagMapping.apply(tags));
-  }
-
-  @Override
-  public void distribution(String metricName, long value, String... tags) {
-    connection.statsd.recordDistributionValue(
-        nameMapping.apply(metricName), value, tagMapping.apply(tags));
-  }
-
-  @Override
-  public void distribution(String metricName, double value, String... tags) {
-    connection.statsd.recordDistributionValue(
-        nameMapping.apply(metricName), value, tagMapping.apply(tags));
-  }
-
-  @Override
-  public void serviceCheck(
-      final String serviceCheckName,
-      final String status,
-      final String message,
-      final String... tags) {
-
-    ServiceCheck serviceCheck =
-        ServiceCheck.builder()
-            .withName(nameMapping.apply(serviceCheckName))
-            .withStatus(serviceCheckStatus(status))
-            .withMessage(message)
-            .withTags(tagMapping.apply(tags))
-            .build();
-
-    connection.statsd.recordServiceCheckRun(serviceCheck);
-  }
-
-  @Override
-  public void recordEvent(
-      String type, String source, String eventName, String message, String... tags) {
-    Event.AlertType alertType = Event.AlertType.valueOf(type.toUpperCase());
-    Event.Builder eventBuilder =
-        Event.builder()
-            .withTitle(eventName)
-            .withText(message)
-            .withSourceTypeName(source)
-            .withDate(System.currentTimeMillis())
-            .withAlertType(alertType);
-    connection.statsd.recordEvent(eventBuilder.build(), tagMapping.apply(tags));
-  }
-
-  static ServiceCheck.Status serviceCheckStatus(final String status) {
-    switch (status) {
-      case "OK":
-        return ServiceCheck.Status.OK;
-      case "WARN":
-      case "WARNING":
-        return ServiceCheck.Status.WARNING;
-      case "CRITICAL":
-      case "ERROR":
-        return ServiceCheck.Status.CRITICAL;
-      default:
-        return ServiceCheck.Status.UNKNOWN;
+    private static final Logger log = LoggerFactory.getLogger(DDAgentStatsDClient.class);
+    private final DDAgentStatsDConnection connection;
+    private final Function<String, String> nameMapping;
+    private final Function<String[], String[]> tagMapping;
+
+    DDAgentStatsDClient(
+            final DDAgentStatsDConnection connection,
+            final Function<String, String> nameMapping,
+            final Function<String[], String[]> tagMapping) {
+        this.connection = connection;
+        this.nameMapping = nameMapping;
+        this.tagMapping = tagMapping;
+
+        connection.acquire();
+    }
+
+    @Override
+    public void incrementCounter(final String metricName, final String... tags) {
+        connection.statsd.count(nameMapping.apply(metricName), 1L, tagMapping.apply(tags));
+    }
+
+    @Override
+    public void count(final String metricName, final long value, final String... tags) {
+        connection.statsd.count(nameMapping.apply(metricName), value, tagMapping.apply(tags));
+    }
+
+    @Override
+    public void gauge(final String metricName, final long value, final String... tags) {
+        connection.statsd.recordGaugeValue(nameMapping.apply(metricName), value, tagMapping.apply(tags));
+    }
+
+    @Override
+    public void gauge(final String metricName, final double value, final String... tags) {
+        connection.statsd.recordGaugeValue(nameMapping.apply(metricName), value, tagMapping.apply(tags));
+    }
+
+    @Override
+    public void histogram(final String metricName, final long value, final String... tags) {
+        connection.statsd.recordHistogramValue(nameMapping.apply(metricName), value, tagMapping.apply(tags));
+    }
+
+    @Override
+    public void histogram(final String metricName, final double value, final String... tags) {
+        connection.statsd.recordHistogramValue(nameMapping.apply(metricName), value, tagMapping.apply(tags));
+    }
+
+    @Override
+    public void distribution(String metricName, long value, String... tags) {
+        connection.statsd.recordDistributionValue(nameMapping.apply(metricName), value, tagMapping.apply(tags));
+    }
+
+    @Override
+    public void distribution(String metricName, double value, String... tags) {
+        connection.statsd.recordDistributionValue(nameMapping.apply(metricName), value, tagMapping.apply(tags));
+    }
+
+    @Override
+    public void serviceCheck(
+            final String serviceCheckName, final String status, final String message, final String... tags) {
+
+        ServiceCheck serviceCheck = ServiceCheck.builder()
+                .withName(nameMapping.apply(serviceCheckName))
+                .withStatus(serviceCheckStatus(status))
+                .withMessage(message)
+                .withTags(tagMapping.apply(tags))
+                .build();
+
+        connection.statsd.recordServiceCheckRun(serviceCheck);
+    }
+
+    @Override
+    public void recordEvent(String type, String source, String eventName, String message, String... tags) {
+        Event.AlertType alertType = Event.AlertType.valueOf(type.toUpperCase());
+        Event.Builder eventBuilder = Event.builder()
+                .withTitle(eventName)
+                .withText(message)
+                .withSourceTypeName(source)
+                .withDate(System.currentTimeMillis())
+                .withAlertType(alertType);
+        connection.statsd.recordEvent(eventBuilder.build(), tagMapping.apply(tags));
+    }
+
+    static ServiceCheck.Status serviceCheckStatus(final String status) {
+        switch (status) {
+            case "OK":
+                return ServiceCheck.Status.OK;
+            case "WARN":
+            case "WARNING":
+                return ServiceCheck.Status.WARNING;
+            case "CRITICAL":
+            case "ERROR":
+                return ServiceCheck.Status.CRITICAL;
+            default:
+                return ServiceCheck.Status.UNKNOWN;
+        }
+    }
+
+    @Override
+    public void error(final Exception error) {
+        connection.handle(error);
+    }
+
+    @Override
+    public int getErrorCount() {
+        return connection.getErrorCount();
+    }
+
+    @Override
+    public void close() {
+        connection.release();
     }
-  }
-
-  @Override
-  public void error(final Exception error) {
-    connection.handle(error);
-  }
-
-  @Override
-  public int getErrorCount() {
-    return connection.getErrorCount();
-  }
-
-  @Override
-  public void close() {
-    connection.release();
-  }
 }
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/statsd/DDAgentStatsDClientManager.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/statsd/DDAgentStatsDClientManager.java
index 91407f1b7b8..40ddfeb9f92 100644
--- a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/statsd/DDAgentStatsDClientManager.java
+++ b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/statsd/DDAgentStatsDClientManager.java
@@ -14,174 +14,170 @@
 import java.util.function.Function;
 
 public final class DDAgentStatsDClientManager implements StatsDClientManager {
-  private static final DDAgentStatsDClientManager INSTANCE = new DDAgentStatsDClientManager();
+    private static final DDAgentStatsDClientManager INSTANCE = new DDAgentStatsDClientManager();
 
-  private DDAgentStatsDClientManager() {}
+    private DDAgentStatsDClientManager() {}
 
-  private static final boolean USE_LOGGING_CLIENT =
-      LOGGING_WRITER_TYPE.equals(Config.get().getWriterType());
+    private static final boolean USE_LOGGING_CLIENT =
+            LOGGING_WRITER_TYPE.equals(Config.get().getWriterType());
 
-  public static StatsDClientManager statsDClientManager() {
-    return INSTANCE;
-  }
+    public static StatsDClientManager statsDClientManager() {
+        return INSTANCE;
+    }
 
-  private static final AtomicInteger defaultStatsDPort =
-      new AtomicInteger(Config.get().getDogsStatsDPort());
+    private static final AtomicInteger defaultStatsDPort =
+            new AtomicInteger(Config.get().getDogsStatsDPort());
 
-  public static void setDefaultStatsDPort(final int newPort) {
-    if (newPort > 0 && defaultStatsDPort.getAndSet(newPort) != newPort) {
-      INSTANCE.handleDefaultPortChange(newPort);
+    public static void setDefaultStatsDPort(final int newPort) {
+        if (newPort > 0 && defaultStatsDPort.getAndSet(newPort) != newPort) {
+            INSTANCE.handleDefaultPortChange(newPort);
+        }
     }
-  }
-
-  public static int getDefaultStatsDPort() {
-    return defaultStatsDPort.get();
-  }
-
-  private final ConcurrentHashMap<String, DDAgentStatsDConnection> connectionPool =
-      new ConcurrentHashMap<>(4);
-
-  @Override
-  public StatsDClient statsDClient(
-      final String host,
-      final Integer port,
-      final String namedPipe,
-      final String namespace,
-      final String[] constantTags,
-      final boolean useAggregation) {
-    Function<String, String> nameMapping = Function.identity();
-    Function<String[], String[]> tagMapping = Function.identity();
-
-    if (null != namespace) {
-      nameMapping = new NameResolver(namespace);
+
+    public static int getDefaultStatsDPort() {
+        return defaultStatsDPort.get();
     }
 
-    final List<String> processTags = ProcessTags.getTagsAsStringList();
-    final int processTagSize = processTags != null ? processTags.size() : 0;
-    String[] finalConstantTags = constantTags;
-    if (processTagSize > 0) {
-      final int constantTagSize = constantTags != null ? constantTags.length : 0;
-      if (constantTagSize == 0) {
-        finalConstantTags = processTags.toArray(new String[0]);
-      } else {
-        final int tagSizeSum = processTagSize + constantTagSize;
-        finalConstantTags = new String[tagSizeSum];
-        int pos = 0;
-        // copy constant tags
-        for (; pos < constantTagSize; pos++) {
-          finalConstantTags[pos] = constantTags[pos];
+    private final ConcurrentHashMap<String, DDAgentStatsDConnection> connectionPool = new ConcurrentHashMap<>(4);
+
+    @Override
+    public StatsDClient statsDClient(
+            final String host,
+            final Integer port,
+            final String namedPipe,
+            final String namespace,
+            final String[] constantTags,
+            final boolean useAggregation) {
+        Function<String, String> nameMapping = Function.identity();
+        Function<String[], String[]> tagMapping = Function.identity();
+
+        if (null != namespace) {
+            nameMapping = new NameResolver(namespace);
         }
-        // copy process tags
-        for (int i = 0; i < processTagSize; i++) {
-          finalConstantTags[pos + i] = processTags.get(i);
+
+        final List<String> processTags = ProcessTags.getTagsAsStringList();
+        final int processTagSize = processTags != null ? processTags.size() : 0;
+        String[] finalConstantTags = constantTags;
+        if (processTagSize > 0) {
+            final int constantTagSize = constantTags != null ? constantTags.length : 0;
+            if (constantTagSize == 0) {
+                finalConstantTags = processTags.toArray(new String[0]);
+            } else {
+                final int tagSizeSum = processTagSize + constantTagSize;
+                finalConstantTags = new String[tagSizeSum];
+                int pos = 0;
+                // copy constant tags
+                for (; pos < constantTagSize; pos++) {
+                    finalConstantTags[pos] = constantTags[pos];
+                }
+                // copy process tags
+                for (int i = 0; i < processTagSize; i++) {
+                    finalConstantTags[pos + i] = processTags.get(i);
+                }
+            }
         }
-      }
-    }
 
-    if (null != finalConstantTags && finalConstantTags.length > 0) {
-      tagMapping = new TagCombiner(finalConstantTags);
-    }
+        if (null != finalConstantTags && finalConstantTags.length > 0) {
+            tagMapping = new TagCombiner(finalConstantTags);
+        }
 
-    if (USE_LOGGING_CLIENT) {
-      return new LoggingStatsDClient(nameMapping, tagMapping);
-    } else {
-      return new DDAgentStatsDClient(
-          getConnection(host, port, namedPipe, useAggregation), nameMapping, tagMapping);
+        if (USE_LOGGING_CLIENT) {
+            return new LoggingStatsDClient(nameMapping, tagMapping);
+        } else {
+            return new DDAgentStatsDClient(
+                    getConnection(host, port, namedPipe, useAggregation), nameMapping, tagMapping);
+        }
     }
-  }
-
-  private DDAgentStatsDConnection getConnection(
-      final String host, final Integer port, final String namedPipe, boolean useAggregation) {
-    String connectionKey = getConnectionKey(host, port, namedPipe, useAggregation);
-    DDAgentStatsDConnection connection = connectionPool.get(connectionKey);
-    if (null == connection) {
-      DDAgentStatsDConnection newConnection =
-          new DDAgentStatsDConnection(host, port, namedPipe, useAggregation);
-      connection = connectionPool.putIfAbsent(connectionKey, newConnection);
-      if (null == connection) {
-        connection = newConnection;
-      }
+
+    private DDAgentStatsDConnection getConnection(
+            final String host, final Integer port, final String namedPipe, boolean useAggregation) {
+        String connectionKey = getConnectionKey(host, port, namedPipe, useAggregation);
+        DDAgentStatsDConnection connection = connectionPool.get(connectionKey);
+        if (null == connection) {
+            DDAgentStatsDConnection newConnection = new DDAgentStatsDConnection(host, port, namedPipe, useAggregation);
+            connection = connectionPool.putIfAbsent(connectionKey, newConnection);
+            if (null == connection) {
+                connection = newConnection;
+            }
+        }
+        return connection;
     }
-    return connection;
-  }
 
-  private static String getConnectionKey(
-      final String host, final Integer port, final String namedPipe, boolean useAggregation) {
-    if (namedPipe != null) {
-      return namedPipe + (useAggregation ? "" : ":no_aggregation");
+    private static String getConnectionKey(
+            final String host, final Integer port, final String namedPipe, boolean useAggregation) {
+        if (namedPipe != null) {
+            return namedPipe + (useAggregation ? "" : ":no_aggregation");
+        }
+        return (null != host ? host : "?")
+                + ":"
+                + (null != port ? port : "?")
+                + (useAggregation ? "" : ":no_aggregation");
     }
-    return (null != host ? host : "?")
-        + ":"
-        + (null != port ? port : "?")
-        + (useAggregation ? "" : ":no_aggregation");
-  }
-
-  private void handleDefaultPortChange(final int newPort) {
-    for (DDAgentStatsDConnection connection : connectionPool.values()) {
-      connection.handleDefaultPortChange(newPort);
+
+    private void handleDefaultPortChange(final int newPort) {
+        for (DDAgentStatsDConnection connection : connectionPool.values()) {
+            connection.handleDefaultPortChange(newPort);
+        }
     }
-  }
 
-  /** Resolves metrics names by prepending a namespace prefix. */
-  static final class NameResolver implements Function<String, String> {
-    private final DDCache<String, String> resolvedNames = DDCaches.newFixedSizeCache(32);
-    private final Function<String, String> namePrefixer;
+    /** Resolves metrics names by prepending a namespace prefix. */
+    static final class NameResolver implements Function<String, String> {
+        private final DDCache<String, String> resolvedNames = DDCaches.newFixedSizeCache(32);
+        private final Function<String, String> namePrefixer;
 
-    NameResolver(final String namespace) {
-      this.namePrefixer =
-          new Function<String, String>() {
-            private final String prefix = namespace + '.';
+        NameResolver(final String namespace) {
+            this.namePrefixer = new Function<String, String>() {
+                private final String prefix = namespace + '.';
 
-            @Override
-            public String apply(final String metricName) {
-              return prefix + metricName;
-            }
-          };
-    }
+                @Override
+                public String apply(final String metricName) {
+                    return prefix + metricName;
+                }
+            };
+        }
 
-    @Override
-    public String apply(final String metricName) {
-      return resolvedNames.computeIfAbsent(metricName, namePrefixer);
-    }
-  }
-
-  /** Combines per-call metrics tags with pre-packed constant tags. */
-  static final class TagCombiner implements Function<String[], String[]> {
-    private final DDCache<String[], String[]> combinedTags = DDCaches.newFixedSizeArrayKeyCache(64);
-    // single-element array containing the pre-packed constant tags
-    private final String[] packedTags;
-    private final Function<String[], String[]> tagsInserter;
-
-    public TagCombiner(final String[] constantTags) {
-      this.packedTags = pack(constantTags);
-      this.tagsInserter =
-          tags -> {
-            // extend per-call array by one to add the pre-packed constant tags
-            String[] result = new String[tags.length + 1];
-            System.arraycopy(tags, 0, result, 1, tags.length);
-            result[0] = packedTags[0];
-            return result;
-          };
+        @Override
+        public String apply(final String metricName) {
+            return resolvedNames.computeIfAbsent(metricName, namePrefixer);
+        }
     }
 
-    @Override
-    public String[] apply(final String[] tags) {
-      if (null == tags || tags.length == 0) {
-        return packedTags; // no per-call tags so we can use the pre-packed array
-      } else {
-        return combinedTags.computeIfAbsent(tags, tagsInserter);
-      }
-    }
+    /** Combines per-call metrics tags with pre-packed constant tags. */
+    static final class TagCombiner implements Function<String[], String[]> {
+        private final DDCache<String[], String[]> combinedTags = DDCaches.newFixedSizeArrayKeyCache(64);
+        // single-element array containing the pre-packed constant tags
+        private final String[] packedTags;
+        private final Function<String[], String[]> tagsInserter;
+
+        public TagCombiner(final String[] constantTags) {
+            this.packedTags = pack(constantTags);
+            this.tagsInserter = tags -> {
+                // extend per-call array by one to add the pre-packed constant tags
+                String[] result = new String[tags.length + 1];
+                System.arraycopy(tags, 0, result, 1, tags.length);
+                result[0] = packedTags[0];
+                return result;
+            };
+        }
 
-    /**
-     * Packs the constant tags into a single element array using the same separator as DogStatsD.
-     */
-    private static String[] pack(final String[] tags) {
-      StringBuilder buf = new StringBuilder(tags[0]);
-      for (int i = 1; i < tags.length; i++) {
-        buf.append(',').append(tags[i]);
-      }
-      return new String[] {buf.toString()};
+        @Override
+        public String[] apply(final String[] tags) {
+            if (null == tags || tags.length == 0) {
+                return packedTags; // no per-call tags so we can use the pre-packed array
+            } else {
+                return combinedTags.computeIfAbsent(tags, tagsInserter);
+            }
+        }
+
+        /**
+         * Packs the constant tags into a single element array using the same separator as DogStatsD.
+         */
+        private static String[] pack(final String[] tags) {
+            StringBuilder buf = new StringBuilder(tags[0]);
+            for (int i = 1; i < tags.length; i++) {
+                buf.append(',').append(tags[i]);
+            }
+            return new String[] {buf.toString()};
+        }
     }
-  }
 }
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/statsd/DDAgentStatsDConnection.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/statsd/DDAgentStatsDConnection.java
index f64fdbd285c..31018821bf3 100644
--- a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/statsd/DDAgentStatsDConnection.java
+++ b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/statsd/DDAgentStatsDConnection.java
@@ -21,255 +21,246 @@
 import org.slf4j.LoggerFactory;
 
 final class DDAgentStatsDConnection implements StatsDClientErrorHandler {
-  private static final Logger log = LoggerFactory.getLogger(DDAgentStatsDConnection.class);
-  private static final IOLogger ioLogger = new IOLogger(log);
+    private static final Logger log = LoggerFactory.getLogger(DDAgentStatsDConnection.class);
+    private static final IOLogger ioLogger = new IOLogger(log);
 
-  private static final com.timgroup.statsd.StatsDClient NO_OP = new NoOpDirectStatsDClient();
+    private static final com.timgroup.statsd.StatsDClient NO_OP = new NoOpDirectStatsDClient();
 
-  private static final String UNIX_DOMAIN_SOCKET_PREFIX = "unix://";
+    private static final String UNIX_DOMAIN_SOCKET_PREFIX = "unix://";
 
-  private static final AgentThreadFactory STATSD_CLIENT_THREAD_FACTORY =
-      new AgentThreadFactory(STATSD_CLIENT);
+    private static final AgentThreadFactory STATSD_CLIENT_THREAD_FACTORY = new AgentThreadFactory(STATSD_CLIENT);
 
-  private static final int RETRY_DELAY = 10;
-  private static final int MAX_RETRIES = 20;
+    private static final int RETRY_DELAY = 10;
+    private static final int MAX_RETRIES = 20;
 
-  private boolean usingDefaultPort;
-  private volatile String host;
-  private volatile Integer port;
-  private final String namedPipe;
-  private final boolean useAggregation;
+    private boolean usingDefaultPort;
+    private volatile String host;
+    private volatile Integer port;
+    private final String namedPipe;
+    private final boolean useAggregation;
 
-  private final AtomicInteger clientCount = new AtomicInteger(0);
-  private final AtomicInteger errorCount = new AtomicInteger(0);
-  private final AtomicInteger retries = new AtomicInteger(0);
+    private final AtomicInteger clientCount = new AtomicInteger(0);
+    private final AtomicInteger errorCount = new AtomicInteger(0);
+    private final AtomicInteger retries = new AtomicInteger(0);
 
-  volatile com.timgroup.statsd.StatsDClient statsd = NO_OP;
+    volatile com.timgroup.statsd.StatsDClient statsd = NO_OP;
 
-  DDAgentStatsDConnection(
-      final String host, final Integer port, final String namedPipe, boolean useAggregation) {
-    this.host = host;
-    this.port = port;
-    this.namedPipe = namedPipe;
-    this.useAggregation = useAggregation;
-  }
-
-  @Override
-  public void handle(final Exception e) {
-    errorCount.incrementAndGet();
-    String message = e.getClass().getSimpleName() + " in StatsD client - " + statsDAddress();
-    ioLogger.error(message, e);
-  }
-
-  public void acquire() {
-    if (clientCount.getAndIncrement() == 0) {
-      scheduleConnect();
+    DDAgentStatsDConnection(final String host, final Integer port, final String namedPipe, boolean useAggregation) {
+        this.host = host;
+        this.port = port;
+        this.namedPipe = namedPipe;
+        this.useAggregation = useAggregation;
     }
-  }
 
-  public void release() {
-    if (clientCount.decrementAndGet() == 0) {
-      doClose();
-    }
-  }
-
-  public int getErrorCount() {
-    return errorCount.get();
-  }
-
-  private void scheduleConnect() {
-    long remainingDelay =
-        Config.get().getDogStatsDStartDelay()
-            - MILLISECONDS.toSeconds(
-                System.currentTimeMillis() - Config.get().getStartTimeMillis());
-
-    if (remainingDelay > 0) {
-      if (log.isDebugEnabled()) {
-        log.debug(
-            "Scheduling StatsD connection in {} seconds - {}", remainingDelay, statsDAddress());
-      }
-      AgentTaskScheduler.get()
-          .scheduleWithJitter(ConnectTask.INSTANCE, this, remainingDelay, SECONDS);
-    } else {
-      doConnect();
+    @Override
+    public void handle(final Exception e) {
+        errorCount.incrementAndGet();
+        String message = e.getClass().getSimpleName() + " in StatsD client - " + statsDAddress();
+        ioLogger.error(message, e);
     }
-  }
-
-  private void doConnect() {
-    synchronized (this) {
-      if (NO_OP == statsd && clientCount.get() > 0) {
-        discoverConnectionSettings();
-        if (log.isDebugEnabled()) {
-          log.debug("Creating StatsD client - {}", statsDAddress());
-        }
 
-        NonBlockingStatsDClientBuilder clientBuilder =
-            new NonBlockingStatsDClientBuilder()
-                .threadFactory(STATSD_CLIENT_THREAD_FACTORY)
-                .enableTelemetry(false)
-                .enableAggregation(useAggregation)
-                .hostname(host)
-                .port(port)
-                .namedPipe(namedPipe)
-                .errorHandler(this);
-
-        // when using UDS, set "entity-id" to "none" to avoid having the DogStatsD
-        // server add origin tags (see https://github.com/DataDog/jmxfetch/pull/264)
-        if (this.port == 0) {
-          clientBuilder.entityID("none");
-        } else {
-          clientBuilder.entityID(null);
+    public void acquire() {
+        if (clientCount.getAndIncrement() == 0) {
+            scheduleConnect();
         }
+    }
 
-        Integer queueSize = Config.get().getStatsDClientQueueSize();
-        if (queueSize != null) {
-          clientBuilder.queueSize(queueSize);
+    public void release() {
+        if (clientCount.decrementAndGet() == 0) {
+            doClose();
         }
+    }
 
-        // when using UDS set the datagram size to 8k (2k on Mac due to lower OS default)
-        // but also make sure packet size isn't larger than the configured socket buffer
-        if (this.port == 0) {
-          Integer timeout = Config.get().getStatsDClientSocketTimeout();
-          if (timeout != null) {
-            clientBuilder.timeout(timeout);
-          }
-          Integer bufferSize = Config.get().getStatsDClientSocketBuffer();
-          if (bufferSize != null) {
-            clientBuilder.socketBufferSize(bufferSize);
-          }
-          int packetSize = OperatingSystem.isMacOs() ? 2048 : 8192;
-          if (bufferSize != null && bufferSize < packetSize) {
-            packetSize = bufferSize;
-          }
-          clientBuilder.maxPacketSizeBytes(packetSize);
-        }
+    public int getErrorCount() {
+        return errorCount.get();
+    }
 
-        if (log.isDebugEnabled()) {
-          if (this.port == 0) {
-            log.debug(
-                "Configured StatsD client - queueSize={}, maxPacketSize={}, socketBuffer={}, socketTimeout={}",
-                clientBuilder.queueSize,
-                clientBuilder.maxPacketSizeBytes,
-                clientBuilder.socketBufferSize,
-                clientBuilder.timeout);
-          } else {
-            log.debug("Configured StatsD client - queueSize={}", clientBuilder.queueSize);
-          }
-        }
+    private void scheduleConnect() {
+        long remainingDelay = Config.get().getDogStatsDStartDelay()
+                - MILLISECONDS.toSeconds(
+                        System.currentTimeMillis() - Config.get().getStartTimeMillis());
 
-        try {
-          statsd = clientBuilder.build();
-          if (log.isDebugEnabled()) {
-            log.debug("StatsD connected to {}", statsDAddress());
-          }
-        } catch (final Exception e) {
-          if (retries.getAndIncrement() < MAX_RETRIES) {
+        if (remainingDelay > 0) {
             if (log.isDebugEnabled()) {
-              log.debug(
-                  "Scheduling StatsD connection in {} seconds - {}", RETRY_DELAY, statsDAddress());
+                log.debug("Scheduling StatsD connection in {} seconds - {}", remainingDelay, statsDAddress());
             }
-            AgentTaskScheduler.get()
-                .scheduleWithJitter(ConnectTask.INSTANCE, this, RETRY_DELAY, SECONDS);
-          } else {
-            log.debug("Max retries have been reached. Will not attempt again.");
-          }
-        } catch (Throwable t) {
-          if (log.isDebugEnabled()) {
-            // Display full stack traces on debug logs
-            log.warn("Unable to create StatsD client - {} - Will not retry", statsDAddress(), t);
-          } else {
-            Throwable rootCause = t;
-            int i = 100; // arbitrary limit to avoid infinite loops with cycling causes
-            do {
-              rootCause = rootCause.getCause();
-              i--;
-            } while (rootCause.getCause() != null && i > 0);
-            log.warn(
-                "Unable to create StatsD client - {} - Will not retry: {}, {}",
-                statsDAddress(),
-                t.getMessage(),
-                rootCause.getMessage());
-          }
+            AgentTaskScheduler.get().scheduleWithJitter(ConnectTask.INSTANCE, this, remainingDelay, SECONDS);
+        } else {
+            doConnect();
         }
-      }
     }
-  }
 
-  @SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
-  private void discoverConnectionSettings() {
-    if (namedPipe != null) {
-      return;
+    private void doConnect() {
+        synchronized (this) {
+            if (NO_OP == statsd && clientCount.get() > 0) {
+                discoverConnectionSettings();
+                if (log.isDebugEnabled()) {
+                    log.debug("Creating StatsD client - {}", statsDAddress());
+                }
+
+                NonBlockingStatsDClientBuilder clientBuilder = new NonBlockingStatsDClientBuilder()
+                        .threadFactory(STATSD_CLIENT_THREAD_FACTORY)
+                        .enableTelemetry(false)
+                        .enableAggregation(useAggregation)
+                        .hostname(host)
+                        .port(port)
+                        .namedPipe(namedPipe)
+                        .errorHandler(this);
+
+                // when using UDS, set "entity-id" to "none" to avoid having the DogStatsD
+                // server add origin tags (see https://github.com/DataDog/jmxfetch/pull/264)
+                if (this.port == 0) {
+                    clientBuilder.entityID("none");
+                } else {
+                    clientBuilder.entityID(null);
+                }
+
+                Integer queueSize = Config.get().getStatsDClientQueueSize();
+                if (queueSize != null) {
+                    clientBuilder.queueSize(queueSize);
+                }
+
+                // when using UDS set the datagram size to 8k (2k on Mac due to lower OS default)
+                // but also make sure packet size isn't larger than the configured socket buffer
+                if (this.port == 0) {
+                    Integer timeout = Config.get().getStatsDClientSocketTimeout();
+                    if (timeout != null) {
+                        clientBuilder.timeout(timeout);
+                    }
+                    Integer bufferSize = Config.get().getStatsDClientSocketBuffer();
+                    if (bufferSize != null) {
+                        clientBuilder.socketBufferSize(bufferSize);
+                    }
+                    int packetSize = OperatingSystem.isMacOs() ? 2048 : 8192;
+                    if (bufferSize != null && bufferSize < packetSize) {
+                        packetSize = bufferSize;
+                    }
+                    clientBuilder.maxPacketSizeBytes(packetSize);
+                }
+
+                if (log.isDebugEnabled()) {
+                    if (this.port == 0) {
+                        log.debug(
+                                "Configured StatsD client - queueSize={}, maxPacketSize={}, socketBuffer={}, socketTimeout={}",
+                                clientBuilder.queueSize,
+                                clientBuilder.maxPacketSizeBytes,
+                                clientBuilder.socketBufferSize,
+                                clientBuilder.timeout);
+                    } else {
+                        log.debug("Configured StatsD client - queueSize={}", clientBuilder.queueSize);
+                    }
+                }
+
+                try {
+                    statsd = clientBuilder.build();
+                    if (log.isDebugEnabled()) {
+                        log.debug("StatsD connected to {}", statsDAddress());
+                    }
+                } catch (final Exception e) {
+                    if (retries.getAndIncrement() < MAX_RETRIES) {
+                        if (log.isDebugEnabled()) {
+                            log.debug("Scheduling StatsD connection in {} seconds - {}", RETRY_DELAY, statsDAddress());
+                        }
+                        AgentTaskScheduler.get().scheduleWithJitter(ConnectTask.INSTANCE, this, RETRY_DELAY, SECONDS);
+                    } else {
+                        log.debug("Max retries have been reached. Will not attempt again.");
+                    }
+                } catch (Throwable t) {
+                    if (log.isDebugEnabled()) {
+                        // Display full stack traces on debug logs
+                        log.warn("Unable to create StatsD client - {} - Will not retry", statsDAddress(), t);
+                    } else {
+                        Throwable rootCause = t;
+                        int i = 100; // arbitrary limit to avoid infinite loops with cycling causes
+                        do {
+                            rootCause = rootCause.getCause();
+                            i--;
+                        } while (rootCause.getCause() != null && i > 0);
+                        log.warn(
+                                "Unable to create StatsD client - {} - Will not retry: {}, {}",
+                                statsDAddress(),
+                                t.getMessage(),
+                                rootCause.getMessage());
+                    }
+                }
+            }
+        }
     }
 
-    if (null == host) {
-      if (!OperatingSystem.isWindows() && Files.exists(new File(DEFAULT_DOGSTATSD_SOCKET_PATH))) {
-        log.info("Detected {}. Using it to send StatsD data.", DEFAULT_DOGSTATSD_SOCKET_PATH);
-        host = DEFAULT_DOGSTATSD_SOCKET_PATH;
-        port = 0; // tells dogstatsd client to treat host as a socket path
-      } else {
-        host = Config.get().getAgentHost();
-      }
-    }
+    @SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
+    private void discoverConnectionSettings() {
+        if (namedPipe != null) {
+            return;
+        }
 
-    if (host.startsWith(UNIX_DOMAIN_SOCKET_PREFIX)) {
-      host = host.substring(UNIX_DOMAIN_SOCKET_PREFIX.length());
-      port = 0; // tells dogstatsd client to treat host as a socket path
-    }
-    if (null == port) {
-      port = DDAgentStatsDClientManager.getDefaultStatsDPort();
-      usingDefaultPort = true;
-    }
-  }
+        if (null == host) {
+            if (!OperatingSystem.isWindows() && Files.exists(new File(DEFAULT_DOGSTATSD_SOCKET_PATH))) {
+                log.info("Detected {}. Using it to send StatsD data.", DEFAULT_DOGSTATSD_SOCKET_PATH);
+                host = DEFAULT_DOGSTATSD_SOCKET_PATH;
+                port = 0; // tells dogstatsd client to treat host as a socket path
+            } else {
+                host = Config.get().getAgentHost();
+            }
+        }
 
-  void handleDefaultPortChange(final int newPort) {
-    synchronized (this) {
-      if (NO_OP != statsd && usingDefaultPort && newPort != port) {
-        if (log.isDebugEnabled()) {
-          log.debug("Closing StatsD client - {}", statsDAddress());
+        if (host.startsWith(UNIX_DOMAIN_SOCKET_PREFIX)) {
+            host = host.substring(UNIX_DOMAIN_SOCKET_PREFIX.length());
+            port = 0; // tells dogstatsd client to treat host as a socket path
         }
-        try {
-          statsd.close();
-        } finally {
-          statsd = NO_OP;
-          port = null; // clear so it will pickup latest default
-          doConnect();
+        if (null == port) {
+            port = DDAgentStatsDClientManager.getDefaultStatsDPort();
+            usingDefaultPort = true;
         }
-      }
     }
-  }
 
-  private void doClose() {
-    synchronized (this) {
-      if (NO_OP != statsd && 0 == clientCount.get()) {
-        if (log.isDebugEnabled()) {
-          log.debug("Closing StatsD client - {}", statsDAddress());
-        }
-        try {
-          statsd.close();
-        } catch (final Exception e) {
-          log.debug("Problem closing StatsD client - {}", statsDAddress(), e);
-        } finally {
-          statsd = NO_OP;
+    void handleDefaultPortChange(final int newPort) {
+        synchronized (this) {
+            if (NO_OP != statsd && usingDefaultPort && newPort != port) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Closing StatsD client - {}", statsDAddress());
+                }
+                try {
+                    statsd.close();
+                } finally {
+                    statsd = NO_OP;
+                    port = null; // clear so it will pickup latest default
+                    doConnect();
+                }
+            }
         }
-      }
     }
-  }
 
-  private String statsDAddress() {
-    if (namedPipe != null) {
-      return namedPipe;
+    private void doClose() {
+        synchronized (this) {
+            if (NO_OP != statsd && 0 == clientCount.get()) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Closing StatsD client - {}", statsDAddress());
+                }
+                try {
+                    statsd.close();
+                } catch (final Exception e) {
+                    log.debug("Problem closing StatsD client - {}", statsDAddress(), e);
+                } finally {
+                    statsd = NO_OP;
+                }
+            }
+        }
     }
 
-    return (null != host ? host : "<auto-detect>") + (null != port && port > 0 ? ":" + port : "");
-  }
+    private String statsDAddress() {
+        if (namedPipe != null) {
+            return namedPipe;
+        }
 
-  private static final class ConnectTask
-      implements AgentTaskScheduler.Task<DDAgentStatsDConnection> {
-    public static final ConnectTask INSTANCE = new ConnectTask();
+        return (null != host ? host : "<auto-detect>") + (null != port && port > 0 ? ":" + port : "");
+    }
 
-    @Override
-    public void run(final DDAgentStatsDConnection target) {
-      target.doConnect();
+    private static final class ConnectTask implements AgentTaskScheduler.Task<DDAgentStatsDConnection> {
+        public static final ConnectTask INSTANCE = new ConnectTask();
+
+        @Override
+        public void run(final DDAgentStatsDConnection target) {
+            target.doConnect();
+        }
     }
-  }
 }
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/statsd/LoggingStatsDClient.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/statsd/LoggingStatsDClient.java
index 547f5fad0b4..b7786f553df 100644
--- a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/statsd/LoggingStatsDClient.java
+++ b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/statsd/LoggingStatsDClient.java
@@ -9,124 +9,119 @@
 import org.slf4j.LoggerFactory;
 
 public final class LoggingStatsDClient implements StatsDClient {
-  private static final Logger log = LoggerFactory.getLogger(LoggingStatsDClient.class);
-
-  // logging format is based on the StatsD datagram format
-  private static final String COUNT_FORMAT = "{}:{}|c{}";
-  private static final String GAUGE_FORMAT = "{}:{}|g{}";
-  private static final String HISTOGRAM_FORMAT = "{}:{}|h{}";
-  private static final String DISTRIBUTION_FORMAT = "{}:{}|d{}";
-  private static final String SERVICE_CHECK_FORMAT = "_sc|{}|{}{}{}";
-  private static final String EVENT_FORMAT = "_e|{}|{}|{}|{}|{}";
-
-  private static final DecimalFormat DECIMAL_FORMAT;
-
-  static {
-    DECIMAL_FORMAT = new DecimalFormat("0", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
-    DECIMAL_FORMAT.setMaximumFractionDigits(6);
-  }
-
-  private final Function<String, String> nameMapping;
-  private final Function<String[], String[]> tagMapping;
-
-  public LoggingStatsDClient(
-      final Function<String, String> nameMapping, final Function<String[], String[]> tagMapping) {
-    this.nameMapping = nameMapping;
-    this.tagMapping = tagMapping;
-  }
-
-  @Override
-  public void incrementCounter(final String metricName, final String... tags) {
-    log.info(COUNT_FORMAT, nameMapping.apply(metricName), 1, join(tagMapping.apply(tags)));
-  }
-
-  @Override
-  public void count(final String metricName, final long delta, final String... tags) {
-    log.info(COUNT_FORMAT, nameMapping.apply(metricName), delta, join(tagMapping.apply(tags)));
-  }
-
-  @Override
-  public void gauge(final String metricName, final long value, final String... tags) {
-    log.info(GAUGE_FORMAT, nameMapping.apply(metricName), value, join(tagMapping.apply(tags)));
-  }
-
-  @Override
-  public void gauge(final String metricName, final double value, final String... tags) {
-    log.info(
-        GAUGE_FORMAT,
-        nameMapping.apply(metricName),
-        DECIMAL_FORMAT.format(value),
-        join(tagMapping.apply(tags)));
-  }
-
-  @Override
-  public void histogram(final String metricName, final long value, final String... tags) {
-    log.info(HISTOGRAM_FORMAT, nameMapping.apply(metricName), value, join(tagMapping.apply(tags)));
-  }
-
-  @Override
-  public void histogram(final String metricName, final double value, final String... tags) {
-    log.info(
-        HISTOGRAM_FORMAT,
-        nameMapping.apply(metricName),
-        DECIMAL_FORMAT.format(value),
-        join(tagMapping.apply(tags)));
-  }
-
-  @Override
-  public void distribution(String metricName, long value, String... tags) {
-    log.info(
-        DISTRIBUTION_FORMAT, nameMapping.apply(metricName), value, join(tagMapping.apply(tags)));
-  }
-
-  @Override
-  public void distribution(String metricName, double value, String... tags) {
-    log.info(
-        DISTRIBUTION_FORMAT,
-        nameMapping.apply(metricName),
-        DECIMAL_FORMAT.format(value),
-        join(tagMapping.apply(tags)));
-  }
-
-  @Override
-  public void serviceCheck(
-      final String serviceCheckName,
-      final String status,
-      final String message,
-      final String... tags) {
-    log.info(
-        SERVICE_CHECK_FORMAT,
-        nameMapping.apply(serviceCheckName),
-        DDAgentStatsDClient.serviceCheckStatus(status).ordinal(),
-        join(tagMapping.apply(tags)),
-        null != message ? "|m:" + message : "");
-  }
-
-  @Override
-  public void error(final Exception error) {}
-
-  @Override
-  public int getErrorCount() {
-    return 0;
-  }
-
-  @Override
-  public void recordEvent(
-      String type, String source, String eventName, String message, String... tags) {
-    log.info(EVENT_FORMAT, type, source, eventName, message, join(tagMapping.apply(tags)));
-  }
-
-  @Override
-  public void close() {}
-
-  private static String join(final String... tags) {
-    if (null == tags || tags.length == 0) {
-      return "";
+    private static final Logger log = LoggerFactory.getLogger(LoggingStatsDClient.class);
+
+    // logging format is based on the StatsD datagram format
+    private static final String COUNT_FORMAT = "{}:{}|c{}";
+    private static final String GAUGE_FORMAT = "{}:{}|g{}";
+    private static final String HISTOGRAM_FORMAT = "{}:{}|h{}";
+    private static final String DISTRIBUTION_FORMAT = "{}:{}|d{}";
+    private static final String SERVICE_CHECK_FORMAT = "_sc|{}|{}{}{}";
+    private static final String EVENT_FORMAT = "_e|{}|{}|{}|{}|{}";
+
+    private static final DecimalFormat DECIMAL_FORMAT;
+
+    static {
+        DECIMAL_FORMAT = new DecimalFormat("0", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
+        DECIMAL_FORMAT.setMaximumFractionDigits(6);
+    }
+
+    private final Function<String, String> nameMapping;
+    private final Function<String[], String[]> tagMapping;
+
+    public LoggingStatsDClient(
+            final Function<String, String> nameMapping, final Function<String[], String[]> tagMapping) {
+        this.nameMapping = nameMapping;
+        this.tagMapping = tagMapping;
+    }
+
+    @Override
+    public void incrementCounter(final String metricName, final String... tags) {
+        log.info(COUNT_FORMAT, nameMapping.apply(metricName), 1, join(tagMapping.apply(tags)));
+    }
+
+    @Override
+    public void count(final String metricName, final long delta, final String... tags) {
+        log.info(COUNT_FORMAT, nameMapping.apply(metricName), delta, join(tagMapping.apply(tags)));
+    }
+
+    @Override
+    public void gauge(final String metricName, final long value, final String... tags) {
+        log.info(GAUGE_FORMAT, nameMapping.apply(metricName), value, join(tagMapping.apply(tags)));
+    }
+
+    @Override
+    public void gauge(final String metricName, final double value, final String... tags) {
+        log.info(
+                GAUGE_FORMAT,
+                nameMapping.apply(metricName),
+                DECIMAL_FORMAT.format(value),
+                join(tagMapping.apply(tags)));
+    }
+
+    @Override
+    public void histogram(final String metricName, final long value, final String... tags) {
+        log.info(HISTOGRAM_FORMAT, nameMapping.apply(metricName), value, join(tagMapping.apply(tags)));
+    }
+
+    @Override
+    public void histogram(final String metricName, final double value, final String... tags) {
+        log.info(
+                HISTOGRAM_FORMAT,
+                nameMapping.apply(metricName),
+                DECIMAL_FORMAT.format(value),
+                join(tagMapping.apply(tags)));
+    }
+
+    @Override
+    public void distribution(String metricName, long value, String... tags) {
+        log.info(DISTRIBUTION_FORMAT, nameMapping.apply(metricName), value, join(tagMapping.apply(tags)));
+    }
+
+    @Override
+    public void distribution(String metricName, double value, String... tags) {
+        log.info(
+                DISTRIBUTION_FORMAT,
+                nameMapping.apply(metricName),
+                DECIMAL_FORMAT.format(value),
+                join(tagMapping.apply(tags)));
     }
-    StringBuilder buf = new StringBuilder("|#").append(tags[0]);
-    for (int i = 1; i < tags.length; i++) {
-      buf.append(',').append(tags[i]);
+
+    @Override
+    public void serviceCheck(
+            final String serviceCheckName, final String status, final String message, final String... tags) {
+        log.info(
+                SERVICE_CHECK_FORMAT,
+                nameMapping.apply(serviceCheckName),
+                DDAgentStatsDClient.serviceCheckStatus(status).ordinal(),
+                join(tagMapping.apply(tags)),
+                null != message ? "|m:" + message : "");
+    }
+
+    @Override
+    public void error(final Exception error) {}
+
+    @Override
+    public int getErrorCount() {
+        return 0;
+    }
+
+    @Override
+    public void recordEvent(String type, String source, String eventName, String message, String... tags) {
+        log.info(EVENT_FORMAT, type, source, eventName, message, join(tagMapping.apply(tags)));
+    }
+
+    @Override
+    public void close() {}
+
+    private static String join(final String... tags) {
+        if (null == tags || tags.length == 0) {
+            return "";
+        }
+        StringBuilder buf = new StringBuilder("|#").append(tags[0]);
+        for (int i = 1; i < tags.length; i++) {
+            buf.append(',').append(tags[i]);
+        }
+        return buf.toString();
     }
-    return buf.toString();
-  }
 }
diff --git a/products/metrics/metrics-lib/src/test/java/datadog/metrics/impl/DDSketchHistogramsTest.java b/products/metrics/metrics-lib/src/test/java/datadog/metrics/impl/DDSketchHistogramsTest.java
index d5e87846495..dccefdd1bda 100644
--- a/products/metrics/metrics-lib/src/test/java/datadog/metrics/impl/DDSketchHistogramsTest.java
+++ b/products/metrics/metrics-lib/src/test/java/datadog/metrics/impl/DDSketchHistogramsTest.java
@@ -10,82 +10,82 @@
 
 class DDSketchHistogramsTest {
 
-  // boundaries define 4 bins:
-  //   bin 0: (-inf, 10]
-  //   bin 1: (10,   20]
-  //   bin 2: (20,   30]
-  //   bin 3: (30,  +inf)
-  private static final List<Double> BOUNDARIES = asList(10.0, 20.0, 30.0);
+    // boundaries define 4 bins:
+    //   bin 0: (-inf, 10]
+    //   bin 1: (10,   20]
+    //   bin 2: (20,   30]
+    //   bin 3: (30,  +inf)
+    private static final List<Double> BOUNDARIES = asList(10.0, 20.0, 30.0);
 
-  @Test
-  void indexBelowFirstBoundary() {
-    ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
-    assertEquals(0, eb.index(5.0));
-  }
+    @Test
+    void indexBelowFirstBoundary() {
+        ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
+        assertEquals(0, eb.index(5.0));
+    }
 
-  @Test
-  void indexOnBoundary() {
-    ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
-    assertEquals(0, eb.index(10.0));
-    assertEquals(1, eb.index(20.0));
-    assertEquals(2, eb.index(30.0));
-  }
+    @Test
+    void indexOnBoundary() {
+        ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
+        assertEquals(0, eb.index(10.0));
+        assertEquals(1, eb.index(20.0));
+        assertEquals(2, eb.index(30.0));
+    }
 
-  @Test
-  void indexBetweenBoundaries() {
-    ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
-    assertEquals(1, eb.index(15.0));
-    assertEquals(2, eb.index(25.0));
-  }
+    @Test
+    void indexBetweenBoundaries() {
+        ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
+        assertEquals(1, eb.index(15.0));
+        assertEquals(2, eb.index(25.0));
+    }
 
-  @Test
-  void indexAboveLastBoundary() {
-    ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
-    assertEquals(3, eb.index(35.0));
-  }
+    @Test
+    void indexAboveLastBoundary() {
+        ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
+        assertEquals(3, eb.index(35.0));
+    }
 
-  @Test
-  void lowerBoundOfFirstBinIsNegativeInfinity() {
-    ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
-    assertEquals(Double.NEGATIVE_INFINITY, eb.lowerBound(0));
-  }
+    @Test
+    void lowerBoundOfFirstBinIsNegativeInfinity() {
+        ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
+        assertEquals(Double.NEGATIVE_INFINITY, eb.lowerBound(0));
+    }
 
-  @Test
-  void lowerBoundMapsToPreceeedingBoundary() {
-    ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
-    assertEquals(10.0, eb.lowerBound(1));
-    assertEquals(20.0, eb.lowerBound(2));
-    assertEquals(30.0, eb.lowerBound(3));
-  }
+    @Test
+    void lowerBoundMapsToPreceeedingBoundary() {
+        ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
+        assertEquals(10.0, eb.lowerBound(1));
+        assertEquals(20.0, eb.lowerBound(2));
+        assertEquals(30.0, eb.lowerBound(3));
+    }
 
-  @Test
-  void upperBoundMapsToCorrespondingBoundary() {
-    ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
-    assertEquals(10.0, eb.upperBound(0));
-    assertEquals(20.0, eb.upperBound(1));
-    assertEquals(30.0, eb.upperBound(2));
-  }
+    @Test
+    void upperBoundMapsToCorrespondingBoundary() {
+        ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
+        assertEquals(10.0, eb.upperBound(0));
+        assertEquals(20.0, eb.upperBound(1));
+        assertEquals(30.0, eb.upperBound(2));
+    }
 
-  @Test
-  void upperBoundOfLastBinIsPositiveInfinity() {
-    ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
-    assertEquals(Double.POSITIVE_INFINITY, eb.upperBound(3));
-  }
+    @Test
+    void upperBoundOfLastBinIsPositiveInfinity() {
+        ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
+        assertEquals(Double.POSITIVE_INFINITY, eb.upperBound(3));
+    }
 
-  @Test
-  void extremeIndexableValues() {
-    ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
-    assertEquals(Double.NEGATIVE_INFINITY, eb.minIndexableValue());
-    assertEquals(Double.POSITIVE_INFINITY, eb.maxIndexableValue());
-  }
+    @Test
+    void extremeIndexableValues() {
+        ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
+        assertEquals(Double.NEGATIVE_INFINITY, eb.minIndexableValue());
+        assertEquals(Double.POSITIVE_INFINITY, eb.maxIndexableValue());
+    }
 
-  @Test
-  void unsupportedOperationsThrow() {
-    ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
-    assertThrows(UnsupportedOperationException.class, () -> eb.value(0));
-    assertThrows(UnsupportedOperationException.class, eb::relativeAccuracy);
-    assertThrows(UnsupportedOperationException.class, () -> eb.encode(null));
-    assertThrows(UnsupportedOperationException.class, eb::serializedSize);
-    assertThrows(UnsupportedOperationException.class, () -> eb.serialize(null));
-  }
+    @Test
+    void unsupportedOperationsThrow() {
+        ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES);
+        assertThrows(UnsupportedOperationException.class, () -> eb.value(0));
+        assertThrows(UnsupportedOperationException.class, eb::relativeAccuracy);
+        assertThrows(UnsupportedOperationException.class, () -> eb.encode(null));
+        assertThrows(UnsupportedOperationException.class, eb::serializedSize);
+        assertThrows(UnsupportedOperationException.class, () -> eb.serialize(null));
+    }
 }
diff --git a/products/metrics/metrics-lib/src/test/java/datadog/metrics/impl/ThreadLocalRecordingTest.java b/products/metrics/metrics-lib/src/test/java/datadog/metrics/impl/ThreadLocalRecordingTest.java
index f533355eb89..7ffc409bc6f 100644
--- a/products/metrics/metrics-lib/src/test/java/datadog/metrics/impl/ThreadLocalRecordingTest.java
+++ b/products/metrics/metrics-lib/src/test/java/datadog/metrics/impl/ThreadLocalRecordingTest.java
@@ -13,74 +13,70 @@
 
 class ThreadLocalRecordingTest {
 
-  @Test
-  void delegatesPerThread() throws Exception {
-    Map<Thread, List<String>> callsByThread = new ConcurrentHashMap<>();
+    @Test
+    void delegatesPerThread() throws Exception {
+        Map<Thread, List<String>> callsByThread = new ConcurrentHashMap<>();
 
-    ThreadLocal<Recording> sink =
-        ThreadLocal.withInitial(
-            () -> {
-              List<String> calls = new ArrayList<>();
-              callsByThread.put(Thread.currentThread(), calls);
-              return recordCalls(calls);
-            });
+        ThreadLocal<Recording> sink = ThreadLocal.withInitial(() -> {
+            List<String> calls = new ArrayList<>();
+            callsByThread.put(Thread.currentThread(), calls);
+            return recordCalls(calls);
+        });
 
-    Recording recording = new ThreadLocalRecording(sink);
+        Recording recording = new ThreadLocalRecording(sink);
 
-    int threadCount = 4;
-    CountDownLatch ready = new CountDownLatch(threadCount);
-    CountDownLatch done = new CountDownLatch(threadCount);
-    Thread[] threads = new Thread[threadCount];
+        int threadCount = 4;
+        CountDownLatch ready = new CountDownLatch(threadCount);
+        CountDownLatch done = new CountDownLatch(threadCount);
+        Thread[] threads = new Thread[threadCount];
 
-    for (int i = 0; i < threadCount; i++) {
-      threads[i] =
-          new Thread(
-              () -> {
+        for (int i = 0; i < threadCount; i++) {
+            threads[i] = new Thread(() -> {
                 ready.countDown();
                 try {
-                  ready.await();
+                    ready.await();
                 } catch (InterruptedException e) {
-                  Thread.currentThread().interrupt();
-                  return;
+                    Thread.currentThread().interrupt();
+                    return;
                 }
                 recording.start();
                 recording.reset();
                 recording.stop();
                 recording.flush();
                 done.countDown();
-              });
-      threads[i].start();
-    }
-    done.await();
+            });
+            threads[i].start();
+        }
+        done.await();
 
-    assertEquals(threadCount, callsByThread.size(), "each thread should have its own Recording");
-    for (List<String> calls : callsByThread.values()) {
-      assertEquals(asList("start", "reset", "stop", "flush"), calls);
+        assertEquals(threadCount, callsByThread.size(), "each thread should have its own Recording");
+        for (List<String> calls : callsByThread.values()) {
+            assertEquals(asList("start", "reset", "stop", "flush"), calls);
+        }
     }
-  }
 
-  private static Recording recordCalls(List<String> calls) {
-    return new Recording() {
-      @Override
-      public Recording start() {
-        calls.add("start");
-        return this;
-      }
+    private static Recording recordCalls(List<String> calls) {
+        return new Recording() {
+            @Override
+            public Recording start() {
+                calls.add("start");
+                return this;
+            }
 
-      @Override
-      public void reset() {
-        calls.add("reset");
-      }
+            @Override
+            public void reset() {
+                calls.add("reset");
+            }
 
-      @Override
-      public void stop() {
-        calls.add("stop");
-      }
+            @Override
+            public void stop() {
+                calls.add("stop");
+            }
 
-      @Override
-      public void flush() {
-        calls.add("flush");
-      }
-    };
-  }
+            @Override
+            public void flush() {
+                calls.add("flush");
+            }
+        };
+    }
 }
diff --git a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/Capabilities.java b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/Capabilities.java
index ce76e59000a..b1652d8f129 100644
--- a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/Capabilities.java
+++ b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/Capabilities.java
@@ -1,50 +1,50 @@
 package datadog.remoteconfig;
 
 public interface Capabilities {
-  // This bitset is reserved according to the Remote Config spec.
-  long CAPABILITY_ASM_ACTIVATION = 1 << 1;
-  long CAPABILITY_ASM_IP_BLOCKING = 1 << 2;
-  long CAPABILITY_ASM_DD_RULES = 1 << 3;
-  long CAPABILITY_ASM_EXCLUSIONS = 1 << 4;
-  long CAPABILITY_ASM_REQUEST_BLOCKING = 1 << 5;
-  long CAPABILITY_ASM_RESPONSE_BLOCKING = 1 << 6;
-  long CAPABILITY_ASM_USER_BLOCKING = 1 << 7;
-  long CAPABILITY_ASM_CUSTOM_RULES = 1 << 8;
-  long CAPABILITY_ASM_CUSTOM_BLOCKING_RESPONSE = 1 << 9;
-  long CAPABILITY_ASM_TRUSTED_IPS = 1 << 10;
-  long CAPABILITY_ASM_API_SECURITY_SAMPLE_RATE = 1 << 11;
-  long CAPABILITY_APM_TRACING_SAMPLE_RATE = 1 << 12;
-  long CAPABILITY_APM_LOGS_INJECTION = 1 << 13;
-  long CAPABILITY_APM_HTTP_HEADER_TAGS = 1 << 14;
-  long CAPABILITY_APM_CUSTOM_TAGS = 1 << 15;
-  long CAPABILITY_ASM_PROCESSOR_OVERRIDES = 1 << 16;
-  long CAPABILITY_ASM_CUSTOM_DATA_SCANNERS = 1 << 17;
-  long CAPABILITY_ASM_EXCLUSION_DATA = 1 << 18;
-  long CAPABILITY_APM_TRACING_TRACING_ENABLED = 1 << 19;
-  long CAPABILITY_APM_TRACING_DATA_STREAMS_ENABLED = 1 << 20;
-  long CAPABILITY_ASM_RASP_SQLI = 1 << 21;
-  long CAPABILITY_ASM_RASP_LFI = 1 << 22;
-  long CAPABILITY_ASM_RASP_SSRF = 1 << 23;
-  long CAPABILITY_ASM_RASP_SHI = 1 << 24;
-  long CAPABILITY_ASM_RASP_XXE = 1 << 25;
-  long CAPABILITY_ASM_RASP_RCE = 1 << 26;
-  long CAPABILITY_ASM_RASP_NOSQLI = 1 << 27;
-  long CAPABILITY_ASM_RASP_XSS = 1 << 28;
-  long CAPABILITY_APM_TRACING_SAMPLE_RULES = 1 << 29;
-  long CAPABILITY_CSM_ACTIVATION = 1 << 30;
-  long CAPABILITY_ASM_AUTO_USER_INSTRUM_MODE = 1L << 31;
-  long CAPABILITY_ENDPOINT_FINGERPRINT = 1L << 32;
-  long CAPABILITY_ASM_SESSION_FINGERPRINT = 1L << 33;
-  long CAPABILITY_ASM_NETWORK_FINGERPRINT = 1L << 34;
-  long CAPABILITY_ASM_HEADER_FINGERPRINT = 1L << 35;
-  long CAPABILITY_ASM_RASP_CMDI = 1L << 37;
-  long CAPABILITY_APM_TRACING_ENABLE_DYNAMIC_INSTRUMENTATION = 1L << 38;
-  long CAPABILITY_APM_TRACING_ENABLE_EXCEPTION_REPLAY = 1L << 39;
-  long CAPABILITY_APM_TRACING_ENABLE_CODE_ORIGIN = 1L << 40;
-  long CAPABILITY_APM_TRACING_ENABLE_LIVE_DEBUGGING = 1L << 41;
-  long CAPABILITY_ASM_DD_MULTICONFIG = 1L << 42;
-  long CAPABILITY_ASM_TRACE_TAGGING_RULES = 1L << 43;
-  long CAPABILITY_ASM_EXTENDED_DATA_COLLECTION = 1L << 44;
-  long CAPABILITY_APM_TRACING_MULTICONFIG = 1L << 45;
-  long CAPABILITY_FFE_FLAG_CONFIGURATION_RULES = 1L << 46;
+    // This bitset is reserved according to the Remote Config spec.
+    long CAPABILITY_ASM_ACTIVATION = 1 << 1;
+    long CAPABILITY_ASM_IP_BLOCKING = 1 << 2;
+    long CAPABILITY_ASM_DD_RULES = 1 << 3;
+    long CAPABILITY_ASM_EXCLUSIONS = 1 << 4;
+    long CAPABILITY_ASM_REQUEST_BLOCKING = 1 << 5;
+    long CAPABILITY_ASM_RESPONSE_BLOCKING = 1 << 6;
+    long CAPABILITY_ASM_USER_BLOCKING = 1 << 7;
+    long CAPABILITY_ASM_CUSTOM_RULES = 1 << 8;
+    long CAPABILITY_ASM_CUSTOM_BLOCKING_RESPONSE = 1 << 9;
+    long CAPABILITY_ASM_TRUSTED_IPS = 1 << 10;
+    long CAPABILITY_ASM_API_SECURITY_SAMPLE_RATE = 1 << 11;
+    long CAPABILITY_APM_TRACING_SAMPLE_RATE = 1 << 12;
+    long CAPABILITY_APM_LOGS_INJECTION = 1 << 13;
+    long CAPABILITY_APM_HTTP_HEADER_TAGS = 1 << 14;
+    long CAPABILITY_APM_CUSTOM_TAGS = 1 << 15;
+    long CAPABILITY_ASM_PROCESSOR_OVERRIDES = 1 << 16;
+    long CAPABILITY_ASM_CUSTOM_DATA_SCANNERS = 1 << 17;
+    long CAPABILITY_ASM_EXCLUSION_DATA = 1 << 18;
+    long CAPABILITY_APM_TRACING_TRACING_ENABLED = 1 << 19;
+    long CAPABILITY_APM_TRACING_DATA_STREAMS_ENABLED = 1 << 20;
+    long CAPABILITY_ASM_RASP_SQLI = 1 << 21;
+    long CAPABILITY_ASM_RASP_LFI = 1 << 22;
+    long CAPABILITY_ASM_RASP_SSRF = 1 << 23;
+    long CAPABILITY_ASM_RASP_SHI = 1 << 24;
+    long CAPABILITY_ASM_RASP_XXE = 1 << 25;
+    long CAPABILITY_ASM_RASP_RCE = 1 << 26;
+    long CAPABILITY_ASM_RASP_NOSQLI = 1 << 27;
+    long CAPABILITY_ASM_RASP_XSS = 1 << 28;
+    long CAPABILITY_APM_TRACING_SAMPLE_RULES = 1 << 29;
+    long CAPABILITY_CSM_ACTIVATION = 1 << 30;
+    long CAPABILITY_ASM_AUTO_USER_INSTRUM_MODE = 1L << 31;
+    long CAPABILITY_ENDPOINT_FINGERPRINT = 1L << 32;
+    long CAPABILITY_ASM_SESSION_FINGERPRINT = 1L << 33;
+    long CAPABILITY_ASM_NETWORK_FINGERPRINT = 1L << 34;
+    long CAPABILITY_ASM_HEADER_FINGERPRINT = 1L << 35;
+    long CAPABILITY_ASM_RASP_CMDI = 1L << 37;
+    long CAPABILITY_APM_TRACING_ENABLE_DYNAMIC_INSTRUMENTATION = 1L << 38;
+    long CAPABILITY_APM_TRACING_ENABLE_EXCEPTION_REPLAY = 1L << 39;
+    long CAPABILITY_APM_TRACING_ENABLE_CODE_ORIGIN = 1L << 40;
+    long CAPABILITY_APM_TRACING_ENABLE_LIVE_DEBUGGING = 1L << 41;
+    long CAPABILITY_ASM_DD_MULTICONFIG = 1L << 42;
+    long CAPABILITY_ASM_TRACE_TAGGING_RULES = 1L << 43;
+    long CAPABILITY_ASM_EXTENDED_DATA_COLLECTION = 1L << 44;
+    long CAPABILITY_APM_TRACING_MULTICONFIG = 1L << 45;
+    long CAPABILITY_FFE_FLAG_CONFIGURATION_RULES = 1L << 46;
 }
diff --git a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationChangesListener.java b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationChangesListener.java
index 60850d5f92e..e0758289699 100644
--- a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationChangesListener.java
+++ b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationChangesListener.java
@@ -9,15 +9,14 @@
  */
 @FunctionalInterface
 public interface ConfigurationChangesListener {
-  /**
-   * Notifies a new configuration value change.
-   *
-   * @param configKey The configuration key that changed.
-   * @param content The new configuration value, might be {@code null} to "unapply" the
-   *     configuration.
-   * @param pollingRateHinter The callback to hint about the expected polling rate.
-   * @throws IOException If the configuration could not be deserialized.
-   */
-  void accept(String configKey, @Nullable byte[] content, PollingRateHinter pollingRateHinter)
-      throws IOException;
+    /**
+     * Notifies a new configuration value change.
+     *
+     * @param configKey The configuration key that changed.
+     * @param content The new configuration value, might be {@code null} to "unapply" the
+     *     configuration.
+     * @param pollingRateHinter The callback to hint about the expected polling rate.
+     * @throws IOException If the configuration could not be deserialized.
+     */
+    void accept(String configKey, @Nullable byte[] content, PollingRateHinter pollingRateHinter) throws IOException;
 }
diff --git a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationChangesTypedListener.java b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationChangesTypedListener.java
index 6da20b34e2a..069b8a33487 100644
--- a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationChangesTypedListener.java
+++ b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationChangesTypedListener.java
@@ -5,42 +5,42 @@
 /** This interface describes a configuration strongly-typed value change. */
 @FunctionalInterface
 public interface ConfigurationChangesTypedListener<T> {
-  /**
-   * Notifies a new configuration value change.
-   *
-   * @param configKey The configuration key that changed.
-   * @param configuration The new configuration value, might be {@code null} to "unapply" the
-   *     configuration.
-   * @param pollingRateHinter The callback to hint about the expected polling rate.
-   */
-  void accept(
-      String configKey,
-      @Nullable T configuration, // null to "unapply" the configuration
-      PollingRateHinter pollingRateHinter);
-
-  class Builder {
     /**
-     * Creates a {@link ConfigurationChangesListener} for a strongly-typed configuration.
+     * Notifies a new configuration value change.
      *
-     * @param deserializer The configuration value deserializer.
-     * @param listener The strongly-typed listener to delegate the notification.
-     * @return The resulting {@link ConfigurationChangesListener} instance.
-     * @param <K> The type of the configuration value.
+     * @param configKey The configuration key that changed.
+     * @param configuration The new configuration value, might be {@code null} to "unapply" the
+     *     configuration.
+     * @param pollingRateHinter The callback to hint about the expected polling rate.
      */
-    static <K> ConfigurationChangesListener useDeserializer(
-        ConfigurationDeserializer<K> deserializer, ConfigurationChangesTypedListener<K> listener) {
-      return (configKey, content, pollingRateHinter) -> {
-        K configuration = null;
+    void accept(
+            String configKey,
+            @Nullable T configuration, // null to "unapply" the configuration
+            PollingRateHinter pollingRateHinter);
+
+    class Builder {
+        /**
+         * Creates a {@link ConfigurationChangesListener} for a strongly-typed configuration.
+         *
+         * @param deserializer The configuration value deserializer.
+         * @param listener The strongly-typed listener to delegate the notification.
+         * @return The resulting {@link ConfigurationChangesListener} instance.
+         * @param <K> The type of the configuration value.
+         */
+        static <K> ConfigurationChangesListener useDeserializer(
+                ConfigurationDeserializer<K> deserializer, ConfigurationChangesTypedListener<K> listener) {
+            return (configKey, content, pollingRateHinter) -> {
+                K configuration = null;
 
-        if (content != null) {
-          configuration = deserializer.deserialize(content);
-          // ensure deserializer return a value.
-          if (configuration == null) {
-            throw new RuntimeException("Configuration deserializer didn't provide a configuration");
-          }
+                if (content != null) {
+                    configuration = deserializer.deserialize(content);
+                    // ensure deserializer return a value.
+                    if (configuration == null) {
+                        throw new RuntimeException("Configuration deserializer didn't provide a configuration");
+                    }
+                }
+                listener.accept(configKey, configuration, pollingRateHinter);
+            };
         }
-        listener.accept(configKey, configuration, pollingRateHinter);
-      };
     }
-  }
 }
diff --git a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationDeserializer.java b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationDeserializer.java
index a6e136c0616..01638623b7e 100644
--- a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationDeserializer.java
+++ b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationDeserializer.java
@@ -9,12 +9,12 @@
  */
 @FunctionalInterface
 public interface ConfigurationDeserializer<T> {
-  /**
-   * Deserializes a configuration value.
-   *
-   * @param content The binary representation of the configuration value.
-   * @return The deserialized typed configuration value.
-   * @throws IOException If the configuration value cannot be deserialized.
-   */
-  T deserialize(byte[] content) throws IOException;
+    /**
+     * Deserializes a configuration value.
+     *
+     * @param content The binary representation of the configuration value.
+     * @return The deserialized typed configuration value.
+     * @throws IOException If the configuration value cannot be deserialized.
+     */
+    T deserialize(byte[] content) throws IOException;
 }
diff --git a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationEndListener.java b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationEndListener.java
index 12f55c01f46..9e653c8071a 100644
--- a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationEndListener.java
+++ b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationEndListener.java
@@ -3,6 +3,6 @@
 /** This interface defines a listener of the configuration change. */
 @FunctionalInterface
 public interface ConfigurationEndListener {
-  /** Notifies the listener that new configuration was applied. */
-  void onConfigurationEnd();
+    /** Notifies the listener that new configuration was applied. */
+    void onConfigurationEnd();
 }
diff --git a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationPoller.java b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationPoller.java
index f358b0e457e..a35e28e968f 100644
--- a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationPoller.java
+++ b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationPoller.java
@@ -3,34 +3,32 @@
 import datadog.remoteconfig.state.ProductListener;
 
 public interface ConfigurationPoller {
-  void addListener(Product product, ProductListener listener);
+    void addListener(Product product, ProductListener listener);
 
-  <T> void addListener(
-      Product product,
-      ConfigurationDeserializer<T> deserializer,
-      ConfigurationChangesTypedListener<T> listener);
+    <T> void addListener(
+            Product product, ConfigurationDeserializer<T> deserializer, ConfigurationChangesTypedListener<T> listener);
 
-  void addListener(Product product, String configKey, ProductListener listener);
+    void addListener(Product product, String configKey, ProductListener listener);
 
-  <T> void addListener(
-      Product product,
-      String configKey,
-      ConfigurationDeserializer<T> deserializer,
-      ConfigurationChangesTypedListener<T> listener);
+    <T> void addListener(
+            Product product,
+            String configKey,
+            ConfigurationDeserializer<T> deserializer,
+            ConfigurationChangesTypedListener<T> listener);
 
-  void addListener(Product product, ConfigurationChangesListener configurationChangesListener);
+    void addListener(Product product, ConfigurationChangesListener configurationChangesListener);
 
-  void removeListeners(Product product);
+    void removeListeners(Product product);
 
-  void addConfigurationEndListener(ConfigurationEndListener listener);
+    void addConfigurationEndListener(ConfigurationEndListener listener);
 
-  void removeConfigurationEndListener(ConfigurationEndListener listener);
+    void removeConfigurationEndListener(ConfigurationEndListener listener);
 
-  void addCapabilities(long flags);
+    void addCapabilities(long flags);
 
-  void removeCapabilities(long flags);
+    void removeCapabilities(long flags);
 
-  void start();
+    void start();
 
-  void stop();
+    void stop();
 }
diff --git a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/PollingRateHinter.java b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/PollingRateHinter.java
index 1b86f8ce3ae..8db98dcddc5 100644
--- a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/PollingRateHinter.java
+++ b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/PollingRateHinter.java
@@ -4,5 +4,5 @@
 
 @FunctionalInterface
 public interface PollingRateHinter {
-  void suggestPollingRate(Duration duration);
+    void suggestPollingRate(Duration duration);
 }
diff --git a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/Product.java b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/Product.java
index c018205d958..af03157579e 100644
--- a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/Product.java
+++ b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/Product.java
@@ -2,15 +2,15 @@
 
 /* The order of these products is the same as the order in which they're processed */
 public enum Product {
-  AGENT_CONFIG,
-  AGENT_TASK,
-  APM_TRACING,
-  LIVE_DEBUGGING,
-  LIVE_DEBUGGING_SYMBOL_DB,
-  ASM_DD,
-  ASM,
-  ASM_DATA,
-  ASM_FEATURES,
-  FFE_FLAGS,
-  _UNKNOWN,
+    AGENT_CONFIG,
+    AGENT_TASK,
+    APM_TRACING,
+    LIVE_DEBUGGING,
+    LIVE_DEBUGGING_SYMBOL_DB,
+    ASM_DD,
+    ASM,
+    ASM_DATA,
+    ASM_FEATURES,
+    FFE_FLAGS,
+    _UNKNOWN,
 }
diff --git a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/state/ConfigKey.java b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/state/ConfigKey.java
index 9a76753577c..7f0232e2d20 100644
--- a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/state/ConfigKey.java
+++ b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/state/ConfigKey.java
@@ -4,14 +4,14 @@
 import javax.annotation.Nullable;
 
 public interface ConfigKey {
-  Product getProduct();
+    Product getProduct();
 
-  String getProductName();
+    String getProductName();
 
-  String getOrg();
+    String getOrg();
 
-  @Nullable
-  Integer getVersion();
+    @Nullable
+    Integer getVersion();
 
-  String getConfigId();
+    String getConfigId();
 }
diff --git a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/state/ProductListener.java b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/state/ProductListener.java
index 588ffa300f3..8c35b820598 100644
--- a/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/state/ProductListener.java
+++ b/remote-config/remote-config-api/src/main/java/datadog/remoteconfig/state/ProductListener.java
@@ -4,10 +4,9 @@
 import java.io.IOException;
 
 public interface ProductListener {
-  void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollingRateHinter)
-      throws IOException;
+    void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollingRateHinter) throws IOException;
 
-  void remove(ConfigKey configKey, PollingRateHinter pollingRateHinter) throws IOException;
+    void remove(ConfigKey configKey, PollingRateHinter pollingRateHinter) throws IOException;
 
-  void commit(PollingRateHinter pollingRateHinter);
+    void commit(PollingRateHinter pollingRateHinter);
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/DefaultConfigurationPoller.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/DefaultConfigurationPoller.java
index 76ef06740b7..4ec02d74dd2 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/DefaultConfigurationPoller.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/DefaultConfigurationPoller.java
@@ -55,533 +55,509 @@
 
 /** Handles polling debugger configuration from datadog agent/Remote Configuration */
 public class DefaultConfigurationPoller
-    implements ConfigurationPoller,
-        PollingRateHinter,
-        AgentTaskScheduler.Target<ConfigurationPoller> {
-  private static final Logger log = LoggerFactory.getLogger(ConfigurationPoller.class);
-  private static final int MINUTES_BETWEEN_ERROR_LOG = 5;
-
-  private final String keyId;
-  private final Ed25519PublicKey key;
-  private final Config config;
-  private final String tracerVersion;
-  private final String containerId;
-  private final String entityId;
-  private final OkHttpClient httpClient;
-  private final RatelimitedLogger ratelimitedLogger;
-  private final Supplier<String> urlSupplier;
-  private final PollerScheduler scheduler;
-  private final long maxPayloadSize;
-  private final boolean integrityChecks;
-
-  private final Map<Product, ProductState> productStates = new EnumMap<>(Product.class);
-  private final Map<File, ConfigurationChangesListener> fileListeners = new HashMap<>();
-  private final List<ConfigurationEndListener> configurationEndListeners = new ArrayList<>();
-
-  private final ClientState nextClientState = new ClientState();
-  private final AtomicInteger startCount = new AtomicInteger(0);
-  private long capabilities;
-  private Duration durationHint;
-  private PollerRequestFactory requestFactory;
-  private RemoteConfigResponse.Factory responseFactory;
-  private boolean fatalOnInitialization = false;
-
-  public DefaultConfigurationPoller(
-      Config config,
-      String tracerVersion,
-      String containerId,
-      String entityId,
-      Supplier<String> urlSupplier,
-      OkHttpClient client) {
-    this(
-        config,
-        tracerVersion,
-        containerId,
-        entityId,
-        urlSupplier,
-        client,
-        new AgentTaskScheduler(AgentThreadFactory.AgentThread.REMOTE_CONFIG));
-  }
-
-  // for testing
-  public DefaultConfigurationPoller(
-      Config config,
-      String tracerVersion,
-      String containerId,
-      String entityId,
-      Supplier<String> urlSupplier,
-      OkHttpClient httpClient,
-      AgentTaskScheduler taskScheduler) {
-    this.config = config;
-    this.tracerVersion = tracerVersion;
-    this.containerId = containerId;
-    this.entityId = entityId;
-    this.urlSupplier = urlSupplier;
-    this.keyId = config.getRemoteConfigTargetsKeyId();
-    String keyStr = config.getRemoteConfigTargetsKey();
-    try {
-      this.key = Ed25519PublicKey.fromByteArray(HexUtils.fromHexString(keyStr));
-    } catch (InvalidEncodingException e) {
-      throw new IllegalArgumentException("Bad public key: " + keyStr, e);
-    }
-
-    this.scheduler = new PollerScheduler(config, this, taskScheduler);
-    log.debug("Started remote config poller every {} ms", scheduler.getInitialPollInterval());
-    this.ratelimitedLogger =
-        new RatelimitedLogger(log, MINUTES_BETWEEN_ERROR_LOG, TimeUnit.MINUTES);
-    this.maxPayloadSize = config.getRemoteConfigMaxPayloadSizeBytes();
-    this.integrityChecks = config.isRemoteConfigIntegrityCheckEnabled();
-    this.httpClient = httpClient;
-  }
-
-  @Override
-  public synchronized void addListener(
-      Product product, ConfigurationChangesListener configurationChangesListener) {
-    this.addListener(product, new SimpleProductListener(configurationChangesListener));
-  }
-
-  @Override
-  public synchronized void addListener(Product product, ProductListener listener) {
-    ProductState productState =
-        this.productStates.computeIfAbsent(product, p -> new ProductState(product));
-    productState.addProductListener(listener);
-  }
-
-  @Override
-  public synchronized <T> void addListener(
-      Product product,
-      ConfigurationDeserializer<T> deserializer,
-      ConfigurationChangesTypedListener<T> listener) {
-    this.addListener(product, new SimpleProductListener(useDeserializer(deserializer, listener)));
-  }
-
-  @Override
-  public synchronized void addListener(
-      Product product, String configKey, ProductListener listener) {
-    ProductState productState =
-        this.productStates.computeIfAbsent(product, p -> new ProductState(product));
-    productState.addProductListener(configKey, listener);
-  }
-
-  @Override
-  public synchronized <T> void addListener(
-      Product product,
-      String configKey,
-      ConfigurationDeserializer<T> deserializer,
-      ConfigurationChangesTypedListener<T> listener) {
-    this.addListener(
-        product, configKey, new SimpleProductListener(useDeserializer(deserializer, listener)));
-  }
-
-  @Override
-  public synchronized void removeListeners(Product product) {
-    this.productStates.remove(product);
-  }
-
-  public synchronized <T> void addFileListener(
-      File file,
-      ConfigurationDeserializer<T> deserializer,
-      ConfigurationChangesTypedListener<T> listener) {
-    this.fileListeners.put(file, useDeserializer(deserializer, listener));
-  }
-
-  @Override
-  public synchronized void addConfigurationEndListener(ConfigurationEndListener listener) {
-    this.configurationEndListeners.add(listener);
-  }
-
-  @Override
-  public synchronized void removeConfigurationEndListener(ConfigurationEndListener listener) {
-    this.configurationEndListeners.removeIf(l -> l == listener);
-  }
-
-  @Override
-  public synchronized void addCapabilities(long flags) {
-    capabilities |= flags;
-  }
-
-  @Override
-  public synchronized void removeCapabilities(long flags) {
-    capabilities &= ~flags;
-  }
-
-  @Override
-  public ConfigurationPoller get() {
-    return this;
-  }
-
-  @Override
-  public void start() {
-    int prevCount = this.startCount.getAndIncrement();
-    if (prevCount == 0) {
-      scheduler.start();
-    }
-  }
-
-  @Override
-  public void stop() {
-    int newCount = this.startCount.decrementAndGet();
-    if (newCount == 0) {
-      scheduler.stop();
-    }
-  }
-
-  synchronized void poll(ConfigurationPoller poller) {
-    for (Map.Entry<File, ConfigurationChangesListener> e : this.fileListeners.entrySet()) {
-      loadFromFile(e.getKey(), e.getValue());
-    }
-
-    if (!this.productStates.isEmpty()) {
-
-      if (!initialize()) {
-        // Do not log anything before initialization to avoid excessive verboseness when remote
-        // config is disabled in the agent. The urlSupplier will log failed attempts whenever it
-        // actually makes requests to feature discovery (at a higher polling interval).
-        return;
-      }
-
-      try {
-        sendRequest(this::handleAgentResponse);
-      } catch (InterruptedIOException ignored) {
-      } catch (IOException | RuntimeException ex) {
-        ExceptionHelper.rateLimitedLogException(
-            ratelimitedLogger,
-            log,
-            ex,
-            "Failed to poll remote configuration from {}",
-            requestFactory.url.toString());
-      }
-    }
-  }
-
-  /** Tries to initialize remote config, and returns true if it is ready to run. */
-  private boolean initialize() {
-    if (fatalOnInitialization) {
-      return false;
-    }
-
-    if (requestFactory != null && responseFactory != null) {
-      return true;
-    }
-
-    final String url = urlSupplier.get();
-    if (url == null) {
-      return false;
-    }
-
-    try {
-      // Initialization of these is delayed until the remote config URL is available.
-      // See #initialize().
-      Moshi moshi =
-          new Moshi.Builder()
-              .add(Instant.class, new InstantJsonAdapter())
-              .add(ByteString.class, new RawJsonAdapter())
-              .build();
-      this.responseFactory = new RemoteConfigResponse.Factory(moshi);
-      this.requestFactory =
-          new PollerRequestFactory(config, tracerVersion, containerId, entityId, url, moshi);
-    } catch (Exception e) {
-      // We can't recover from this, so we'll not try to initialize again.
-      fatalOnInitialization = true;
-      log.error("Remote configuration poller initialization failed", e);
-    }
-    return true;
-  }
-
-  private Response fetchConfiguration() throws IOException {
-    Request request =
-        this.requestFactory.newConfigurationRequest(
-            getSubscribedProductNames(),
-            this.nextClientState,
-            getCachedTargetFiles(),
-            capabilities);
-    if (request == null) {
-      throw new IOException("Endpoint has not been discovered yet");
-    }
-    log.debug("Sending Remote configuration request: {}", request);
-    Call call = this.httpClient.newCall(request);
-    return call.execute();
-  }
-
-  private Collection<String> getSubscribedProductNames() {
-    return this.productStates.keySet().stream().map(Enum::name).collect(Collectors.toList());
-  }
-
-  List<RemoteConfigRequest.CachedTargetFile> getCachedTargetFiles() {
-    List<RemoteConfigRequest.CachedTargetFile> cachedTargetFiles = new ArrayList<>();
-
-    for (ProductState state : productStates.values()) {
-      cachedTargetFiles.addAll(state.getCachedTargetFiles());
-    }
-    return cachedTargetFiles;
-  }
-
-  List<ConfigState> getConfigState() {
-    List<ConfigState> configStates = new ArrayList<>();
-
-    for (ProductState state : productStates.values()) {
-      configStates.addAll(state.getConfigStates());
-    }
-    return configStates;
-  }
-
-  void sendRequest(Consumer<ResponseBody> responseBodyConsumer) throws IOException {
-    try (Response response = fetchConfiguration()) {
-      if (response.code() == 404) {
-        log.debug("Remote configuration endpoint is disabled");
-        return;
-      }
-      if (response.code() == 204) {
-        log.debug("No configuration changes (HTTP 204 No Content)");
-        return;
-      }
-      ResponseBody body = response.body();
-      if (response.isSuccessful()) {
-        if (body == null) {
-          ratelimitedLogger.warn("No body content while retrieving remote configuration");
-          return;
+        implements ConfigurationPoller, PollingRateHinter, AgentTaskScheduler.Target<ConfigurationPoller> {
+    private static final Logger log = LoggerFactory.getLogger(ConfigurationPoller.class);
+    private static final int MINUTES_BETWEEN_ERROR_LOG = 5;
+
+    private final String keyId;
+    private final Ed25519PublicKey key;
+    private final Config config;
+    private final String tracerVersion;
+    private final String containerId;
+    private final String entityId;
+    private final OkHttpClient httpClient;
+    private final RatelimitedLogger ratelimitedLogger;
+    private final Supplier<String> urlSupplier;
+    private final PollerScheduler scheduler;
+    private final long maxPayloadSize;
+    private final boolean integrityChecks;
+
+    private final Map<Product, ProductState> productStates = new EnumMap<>(Product.class);
+    private final Map<File, ConfigurationChangesListener> fileListeners = new HashMap<>();
+    private final List<ConfigurationEndListener> configurationEndListeners = new ArrayList<>();
+
+    private final ClientState nextClientState = new ClientState();
+    private final AtomicInteger startCount = new AtomicInteger(0);
+    private long capabilities;
+    private Duration durationHint;
+    private PollerRequestFactory requestFactory;
+    private RemoteConfigResponse.Factory responseFactory;
+    private boolean fatalOnInitialization = false;
+
+    public DefaultConfigurationPoller(
+            Config config,
+            String tracerVersion,
+            String containerId,
+            String entityId,
+            Supplier<String> urlSupplier,
+            OkHttpClient client) {
+        this(
+                config,
+                tracerVersion,
+                containerId,
+                entityId,
+                urlSupplier,
+                client,
+                new AgentTaskScheduler(AgentThreadFactory.AgentThread.REMOTE_CONFIG));
+    }
+
+    // for testing
+    public DefaultConfigurationPoller(
+            Config config,
+            String tracerVersion,
+            String containerId,
+            String entityId,
+            Supplier<String> urlSupplier,
+            OkHttpClient httpClient,
+            AgentTaskScheduler taskScheduler) {
+        this.config = config;
+        this.tracerVersion = tracerVersion;
+        this.containerId = containerId;
+        this.entityId = entityId;
+        this.urlSupplier = urlSupplier;
+        this.keyId = config.getRemoteConfigTargetsKeyId();
+        String keyStr = config.getRemoteConfigTargetsKey();
+        try {
+            this.key = Ed25519PublicKey.fromByteArray(HexUtils.fromHexString(keyStr));
+        } catch (InvalidEncodingException e) {
+            throw new IllegalArgumentException("Bad public key: " + keyStr, e);
+        }
+
+        this.scheduler = new PollerScheduler(config, this, taskScheduler);
+        log.debug("Started remote config poller every {} ms", scheduler.getInitialPollInterval());
+        this.ratelimitedLogger = new RatelimitedLogger(log, MINUTES_BETWEEN_ERROR_LOG, TimeUnit.MINUTES);
+        this.maxPayloadSize = config.getRemoteConfigMaxPayloadSizeBytes();
+        this.integrityChecks = config.isRemoteConfigIntegrityCheckEnabled();
+        this.httpClient = httpClient;
+    }
+
+    @Override
+    public synchronized void addListener(Product product, ConfigurationChangesListener configurationChangesListener) {
+        this.addListener(product, new SimpleProductListener(configurationChangesListener));
+    }
+
+    @Override
+    public synchronized void addListener(Product product, ProductListener listener) {
+        ProductState productState = this.productStates.computeIfAbsent(product, p -> new ProductState(product));
+        productState.addProductListener(listener);
+    }
+
+    @Override
+    public synchronized <T> void addListener(
+            Product product, ConfigurationDeserializer<T> deserializer, ConfigurationChangesTypedListener<T> listener) {
+        this.addListener(product, new SimpleProductListener(useDeserializer(deserializer, listener)));
+    }
+
+    @Override
+    public synchronized void addListener(Product product, String configKey, ProductListener listener) {
+        ProductState productState = this.productStates.computeIfAbsent(product, p -> new ProductState(product));
+        productState.addProductListener(configKey, listener);
+    }
+
+    @Override
+    public synchronized <T> void addListener(
+            Product product,
+            String configKey,
+            ConfigurationDeserializer<T> deserializer,
+            ConfigurationChangesTypedListener<T> listener) {
+        this.addListener(product, configKey, new SimpleProductListener(useDeserializer(deserializer, listener)));
+    }
+
+    @Override
+    public synchronized void removeListeners(Product product) {
+        this.productStates.remove(product);
+    }
+
+    public synchronized <T> void addFileListener(
+            File file, ConfigurationDeserializer<T> deserializer, ConfigurationChangesTypedListener<T> listener) {
+        this.fileListeners.put(file, useDeserializer(deserializer, listener));
+    }
+
+    @Override
+    public synchronized void addConfigurationEndListener(ConfigurationEndListener listener) {
+        this.configurationEndListeners.add(listener);
+    }
+
+    @Override
+    public synchronized void removeConfigurationEndListener(ConfigurationEndListener listener) {
+        this.configurationEndListeners.removeIf(l -> l == listener);
+    }
+
+    @Override
+    public synchronized void addCapabilities(long flags) {
+        capabilities |= flags;
+    }
+
+    @Override
+    public synchronized void removeCapabilities(long flags) {
+        capabilities &= ~flags;
+    }
+
+    @Override
+    public ConfigurationPoller get() {
+        return this;
+    }
+
+    @Override
+    public void start() {
+        int prevCount = this.startCount.getAndIncrement();
+        if (prevCount == 0) {
+            scheduler.start();
+        }
+    }
+
+    @Override
+    public void stop() {
+        int newCount = this.startCount.decrementAndGet();
+        if (newCount == 0) {
+            scheduler.stop();
+        }
+    }
+
+    synchronized void poll(ConfigurationPoller poller) {
+        for (Map.Entry<File, ConfigurationChangesListener> e : this.fileListeners.entrySet()) {
+            loadFromFile(e.getKey(), e.getValue());
+        }
+
+        if (!this.productStates.isEmpty()) {
+
+            if (!initialize()) {
+                // Do not log anything before initialization to avoid excessive verboseness when remote
+                // config is disabled in the agent. The urlSupplier will log failed attempts whenever it
+                // actually makes requests to feature discovery (at a higher polling interval).
+                return;
+            }
+
+            try {
+                sendRequest(this::handleAgentResponse);
+            } catch (InterruptedIOException ignored) {
+            } catch (IOException | RuntimeException ex) {
+                ExceptionHelper.rateLimitedLogException(
+                        ratelimitedLogger,
+                        log,
+                        ex,
+                        "Failed to poll remote configuration from {}",
+                        requestFactory.url.toString());
+            }
+        }
+    }
+
+    /** Tries to initialize remote config, and returns true if it is ready to run. */
+    private boolean initialize() {
+        if (fatalOnInitialization) {
+            return false;
+        }
+
+        if (requestFactory != null && responseFactory != null) {
+            return true;
+        }
+
+        final String url = urlSupplier.get();
+        if (url == null) {
+            return false;
+        }
+
+        try {
+            // Initialization of these is delayed until the remote config URL is available.
+            // See #initialize().
+            Moshi moshi = new Moshi.Builder()
+                    .add(Instant.class, new InstantJsonAdapter())
+                    .add(ByteString.class, new RawJsonAdapter())
+                    .build();
+            this.responseFactory = new RemoteConfigResponse.Factory(moshi);
+            this.requestFactory = new PollerRequestFactory(config, tracerVersion, containerId, entityId, url, moshi);
+        } catch (Exception e) {
+            // We can't recover from this, so we'll not try to initialize again.
+            fatalOnInitialization = true;
+            log.error("Remote configuration poller initialization failed", e);
+        }
+        return true;
+    }
+
+    private Response fetchConfiguration() throws IOException {
+        Request request = this.requestFactory.newConfigurationRequest(
+                getSubscribedProductNames(), this.nextClientState, getCachedTargetFiles(), capabilities);
+        if (request == null) {
+            throw new IOException("Endpoint has not been discovered yet");
+        }
+        log.debug("Sending Remote configuration request: {}", request);
+        Call call = this.httpClient.newCall(request);
+        return call.execute();
+    }
+
+    private Collection<String> getSubscribedProductNames() {
+        return this.productStates.keySet().stream().map(Enum::name).collect(Collectors.toList());
+    }
+
+    List<RemoteConfigRequest.CachedTargetFile> getCachedTargetFiles() {
+        List<RemoteConfigRequest.CachedTargetFile> cachedTargetFiles = new ArrayList<>();
+
+        for (ProductState state : productStates.values()) {
+            cachedTargetFiles.addAll(state.getCachedTargetFiles());
+        }
+        return cachedTargetFiles;
+    }
+
+    List<ConfigState> getConfigState() {
+        List<ConfigState> configStates = new ArrayList<>();
+
+        for (ProductState state : productStates.values()) {
+            configStates.addAll(state.getConfigStates());
+        }
+        return configStates;
+    }
+
+    void sendRequest(Consumer<ResponseBody> responseBodyConsumer) throws IOException {
+        try (Response response = fetchConfiguration()) {
+            if (response.code() == 404) {
+                log.debug("Remote configuration endpoint is disabled");
+                return;
+            }
+            if (response.code() == 204) {
+                log.debug("No configuration changes (HTTP 204 No Content)");
+                return;
+            }
+            ResponseBody body = response.body();
+            if (response.isSuccessful()) {
+                if (body == null) {
+                    ratelimitedLogger.warn("No body content while retrieving remote configuration");
+                    return;
+                }
+                responseBodyConsumer.accept(body);
+                return;
+            }
+            // Retrieve body content for detailed error messages
+            if (body != null) {
+                try {
+                    ratelimitedLogger.warn(
+                            "Failed to retrieve remote configuration: unexpected response code {} {} {}",
+                            response.message(),
+                            response.code(),
+                            body.string());
+                } catch (IOException ex) {
+                    ExceptionHelper.rateLimitedLogException(
+                            ratelimitedLogger, log, ex, "Error while getting error message body");
+                }
+            } else {
+                ratelimitedLogger.warn(
+                        "Failed to retrieve remote configuration: unexpected response code {} {}",
+                        response.message(),
+                        response.code());
+            }
+        }
+    }
+
+    private void handleAgentResponse(ResponseBody body) {
+        RemoteConfigResponse fleetResponse;
+
+        try (InputStream inputStream = new SizeCheckedInputStream(body.byteStream(), maxPayloadSize)) {
+            Optional<RemoteConfigResponse> maybeFleetResp;
+            maybeFleetResp = this.responseFactory.fromInputStream(inputStream);
+            if (!maybeFleetResp.isPresent()) {
+                log.debug("No configuration changes");
+                return;
+            }
+
+            fleetResponse = maybeFleetResp.get();
+        } catch (Exception e) {
+            // no error can be reported, as we don't have the data client.state.targets_version avail
+            if (e instanceof ClosedSelectorException) {
+                // expected when the selector is closed mid-poll, e.g. during pod shutdown
+                ratelimitedLogger.warn(
+                        "Error parsing remote config response, which is expected when the selector is closed mid-poll: {}",
+                        e.getMessage());
+            } else {
+                ratelimitedLogger.warn("Error parsing remote config response", e);
+            }
+            return;
+        }
+
+        if (log.isDebugEnabled() && fleetResponse.getTargetsSigned() != null) {
+            log.debug("Got configuration with targets version {}", fleetResponse.getTargetsSigned().version);
         }
-        responseBodyConsumer.accept(body);
-        return;
-      }
-      // Retrieve body content for detailed error messages
-      if (body != null) {
+
         try {
-          ratelimitedLogger.warn(
-              "Failed to retrieve remote configuration: unexpected response code {} {} {}",
-              response.message(),
-              response.code(),
-              body.string());
-        } catch (IOException ex) {
-          ExceptionHelper.rateLimitedLogException(
-              ratelimitedLogger, log, ex, "Error while getting error message body");
+            verifyTargetsSignature(fleetResponse);
+            verifyTargetsPresence(fleetResponse);
+        } catch (RuntimeException rte) {
+            ratelimitedLogger.warn("Error doing initial verifications: {}", rte.getMessage(), rte);
+            this.nextClientState.hasError = true;
+            this.nextClientState.error = rte.getMessage();
+            return;
+        }
+
+        List<ReportableException> errors = new ArrayList<>();
+
+        Map<Product, List<ParsedConfigKey>> parsedKeysByProduct = new HashMap<>();
+
+        for (String configKey : fleetResponse.getClientConfigs()) {
+            try {
+                ParsedConfigKey parsedConfigKey = ParsedConfigKey.parse(configKey);
+                Product product = parsedConfigKey.getProduct();
+                if (!(productStates.containsKey(product))) {
+                    throw new ReportableException("Told to handle config key "
+                            + configKey
+                            + ", but the product "
+                            + parsedConfigKey.getProductName()
+                            + " is not being handled");
+                }
+                parsedKeysByProduct
+                        .computeIfAbsent(product, k -> new ArrayList<>())
+                        .add(parsedConfigKey);
+            } catch (ReportableException e) {
+                errors.add(e);
+            }
         }
-      } else {
-        ratelimitedLogger.warn(
-            "Failed to retrieve remote configuration: unexpected response code {} {}",
-            response.message(),
-            response.code());
-      }
-    }
-  }
-
-  private void handleAgentResponse(ResponseBody body) {
-    RemoteConfigResponse fleetResponse;
-
-    try (InputStream inputStream = new SizeCheckedInputStream(body.byteStream(), maxPayloadSize)) {
-      Optional<RemoteConfigResponse> maybeFleetResp;
-      maybeFleetResp = this.responseFactory.fromInputStream(inputStream);
-      if (!maybeFleetResp.isPresent()) {
-        log.debug("No configuration changes");
-        return;
-      }
-
-      fleetResponse = maybeFleetResp.get();
-    } catch (Exception e) {
-      // no error can be reported, as we don't have the data client.state.targets_version avail
-      if (e instanceof ClosedSelectorException) {
-        // expected when the selector is closed mid-poll, e.g. during pod shutdown
-        ratelimitedLogger.warn(
-            "Error parsing remote config response, which is expected when the selector is closed mid-poll: {}",
-            e.getMessage());
-      } else {
-        ratelimitedLogger.warn("Error parsing remote config response", e);
-      }
-      return;
-    }
-
-    if (log.isDebugEnabled() && fleetResponse.getTargetsSigned() != null) {
-      log.debug(
-          "Got configuration with targets version {}", fleetResponse.getTargetsSigned().version);
-    }
-
-    try {
-      verifyTargetsSignature(fleetResponse);
-      verifyTargetsPresence(fleetResponse);
-    } catch (RuntimeException rte) {
-      ratelimitedLogger.warn("Error doing initial verifications: {}", rte.getMessage(), rte);
-      this.nextClientState.hasError = true;
-      this.nextClientState.error = rte.getMessage();
-      return;
-    }
-
-    List<ReportableException> errors = new ArrayList<>();
-
-    Map<Product, List<ParsedConfigKey>> parsedKeysByProduct = new HashMap<>();
-
-    for (String configKey : fleetResponse.getClientConfigs()) {
-      try {
-        ParsedConfigKey parsedConfigKey = ParsedConfigKey.parse(configKey);
-        Product product = parsedConfigKey.getProduct();
-        if (!(productStates.containsKey(product))) {
-          throw new ReportableException(
-              "Told to handle config key "
-                  + configKey
-                  + ", but the product "
-                  + parsedConfigKey.getProductName()
-                  + " is not being handled");
+
+        boolean appliedAny = false;
+        for (Map.Entry<Product, ProductState> entry : productStates.entrySet()) {
+            Product product = entry.getKey();
+            ProductState state = entry.getValue();
+            List<ParsedConfigKey> relevantKeys = parsedKeysByProduct.getOrDefault(product, Collections.EMPTY_LIST);
+            appliedAny = state.apply(fleetResponse, relevantKeys, this) || appliedAny;
+            if (state.hasError()) {
+                errors.addAll(state.getErrors());
+            }
+        }
+
+        if (appliedAny) {
+            for (ConfigurationEndListener listener : this.configurationEndListeners) {
+                runConfigurationEndListener(listener, errors);
+            }
         }
-        parsedKeysByProduct.computeIfAbsent(product, k -> new ArrayList<>()).add(parsedConfigKey);
-      } catch (ReportableException e) {
-        errors.add(e);
-      }
-    }
-
-    boolean appliedAny = false;
-    for (Map.Entry<Product, ProductState> entry : productStates.entrySet()) {
-      Product product = entry.getKey();
-      ProductState state = entry.getValue();
-      List<ParsedConfigKey> relevantKeys =
-          parsedKeysByProduct.getOrDefault(product, Collections.EMPTY_LIST);
-      appliedAny = state.apply(fleetResponse, relevantKeys, this) || appliedAny;
-      if (state.hasError()) {
-        errors.addAll(state.getErrors());
-      }
-    }
-
-    if (appliedAny) {
-      for (ConfigurationEndListener listener : this.configurationEndListeners) {
-        runConfigurationEndListener(listener, errors);
-      }
-    }
-
-    updateNextState(fleetResponse, buildErrorMessage(errors));
-
-    rescheduleBaseOnConfiguration(this.durationHint);
-  }
-
-  private void runConfigurationEndListener(
-      ConfigurationEndListener listener, List<ReportableException> errors) {
-    try {
-      listener.onConfigurationEnd();
-    } catch (ReportableException re) {
-      errors.add(re);
-    } catch (RuntimeException rte) {
-      // XXX: we have no way to report this error back
-      // This is because errors are scoped to a specific config key and this listener
-      // is about combining configuration from different products
-      ratelimitedLogger.warn(
-          "Error running configuration listener {}: {}", listener, rte.getMessage(), rte);
-    }
-  }
-
-  private String buildErrorMessage(List<ReportableException> errors) {
-    if (errors.isEmpty()) {
-      return null;
-    }
-    if (errors.size() == 1) {
-      return errors.get(0).getMessage();
-    }
-    StringBuilder aggregateMessage = new StringBuilder();
-    aggregateMessage.append(
-        String.format("Failed to apply configuration due to %d errors:%n", errors.size()));
-    for (int i = 0; i < errors.size(); i++) {
-      aggregateMessage.append(String.format(" (%d) %s%n", i + 1, errors.get(i).getMessage()));
-    }
-    return aggregateMessage.toString();
-  }
-
-  /**
-   * @param fleetResponse the response the agent sent
-   * @param error a procedural error that occurred during the update; it does not include errors
-   *     during registered deserializers and config listeners. If there is an error, the
-   *     targets_version in client.state is not updated (but the rest is).
-   */
-  private void updateNextState(RemoteConfigResponse fleetResponse, String error) {
-    RemoteConfigResponse.Targets.TargetsSigned targetsSigned = fleetResponse.getTargetsSigned();
-
-    long newTargetsVersion = targetsSigned.version;
-    this.nextClientState.setState(
-        // if there was an error, we did not apply the configurations fully
-        // the system tests expect here the targets version not to be updated
-        error == null ? newTargetsVersion : this.nextClientState.targetsVersion,
-        getConfigState(),
-        error,
-        targetsSigned.custom != null ? targetsSigned.custom.opaqueBackendState : null);
-  }
-
-  private void rescheduleBaseOnConfiguration(Duration hint) {
-    if (hint == null) {
-      return;
-    }
-
-    scheduler.reschedule(hint.toMillis());
-  }
-
-  private void loadFromFile(File file, ConfigurationChangesListener listener) {
-    log.debug("Loading configuration from file {}", file);
-
-    try (InputStream inputStream =
-        new SizeCheckedInputStream(Files.newInputStream(file.toPath()), maxPayloadSize)) {
-      byte[] buffer = new byte[4096];
-      ByteArrayOutputStream outputStream = new ByteArrayOutputStream(4096);
-      int bytesRead;
-      do {
-        bytesRead = inputStream.read(buffer);
-        if (bytesRead > -1) {
-          outputStream.write(buffer, 0, bytesRead);
+
+        updateNextState(fleetResponse, buildErrorMessage(errors));
+
+        rescheduleBaseOnConfiguration(this.durationHint);
+    }
+
+    private void runConfigurationEndListener(ConfigurationEndListener listener, List<ReportableException> errors) {
+        try {
+            listener.onConfigurationEnd();
+        } catch (ReportableException re) {
+            errors.add(re);
+        } catch (RuntimeException rte) {
+            // XXX: we have no way to report this error back
+            // This is because errors are scoped to a specific config key and this listener
+            // is about combining configuration from different products
+            ratelimitedLogger.warn("Error running configuration listener {}: {}", listener, rte.getMessage(), rte);
         }
-      } while (bytesRead > -1);
-
-      try {
-        listener.accept(file.getAbsolutePath(), outputStream.toByteArray(), NOOP);
-        log.debug("Loaded configuration from file {}", file);
-      } catch (Exception ex) {
-        ratelimitedLogger.warn(
-            "Failed reading or applying configuration from {}: {}", file, ex.getMessage());
-      }
-    } catch (IOException | RuntimeException ex) {
-      ExceptionHelper.rateLimitedLogException(
-          ratelimitedLogger, log, ex, "Unable to load config file: {}.", file);
-    }
-  }
-
-  @Override
-  public void suggestPollingRate(Duration duration) {
-    if (durationHint == null) {
-      durationHint = duration;
-    } else if (duration.compareTo(durationHint) < 0) {
-      durationHint = duration;
-    }
-  }
-
-  private void verifyTargetsSignature(RemoteConfigResponse resp) {
-    if (!integrityChecks) {
-      return;
-    }
-
-    Ed25519Signature sig;
-    byte[] canonicalTargetsSigned;
-    try {
-      {
-        String targetsSignatureStr = resp.getTargetsSignature(this.keyId);
-        sig = Ed25519Signature.fromByteArray(HexUtils.fromHexString(targetsSignatureStr));
-      }
-      {
-        Map<String, Object> untypedTargetsSigned = resp.getUntypedTargetsSigned();
-        canonicalTargetsSigned = JsonCanonicalizer.canonicalize(untypedTargetsSigned);
-      }
-    } catch (RuntimeException rte) {
-      throw new ReportableException(
-          "Error reading signature or canonicalizing targets.signed: " + rte.getMessage(), rte);
-    }
-    boolean valid = this.key.verify(canonicalTargetsSigned, sig);
-    if (!valid) {
-      throw new ReportableException(
-          "Signature verification failed for targets.signed. Key id: " + this.keyId);
-    }
-  }
-
-  private void verifyTargetsPresence(RemoteConfigResponse resp) {
-    if (resp.targetFiles == null) {
-      return;
-    }
-    for (RemoteConfigResponse.TargetFile file : resp.targetFiles) {
-      RemoteConfigResponse.Targets.ConfigTarget target = resp.getTarget(file.path);
-      if (target == null) {
-        throw new ReportableException(
-            "Path " + file.path + " is in target_files, but not in targets.signed");
-      }
-    }
-  }
+    }
+
+    private String buildErrorMessage(List<ReportableException> errors) {
+        if (errors.isEmpty()) {
+            return null;
+        }
+        if (errors.size() == 1) {
+            return errors.get(0).getMessage();
+        }
+        StringBuilder aggregateMessage = new StringBuilder();
+        aggregateMessage.append(String.format("Failed to apply configuration due to %d errors:%n", errors.size()));
+        for (int i = 0; i < errors.size(); i++) {
+            aggregateMessage.append(
+                    String.format(" (%d) %s%n", i + 1, errors.get(i).getMessage()));
+        }
+        return aggregateMessage.toString();
+    }
+
+    /**
+     * @param fleetResponse the response the agent sent
+     * @param error a procedural error that occurred during the update; it does not include errors
+     *     during registered deserializers and config listeners. If there is an error, the
+     *     targets_version in client.state is not updated (but the rest is).
+     */
+    private void updateNextState(RemoteConfigResponse fleetResponse, String error) {
+        RemoteConfigResponse.Targets.TargetsSigned targetsSigned = fleetResponse.getTargetsSigned();
+
+        long newTargetsVersion = targetsSigned.version;
+        this.nextClientState.setState(
+                // if there was an error, we did not apply the configurations fully
+                // the system tests expect here the targets version not to be updated
+                error == null ? newTargetsVersion : this.nextClientState.targetsVersion,
+                getConfigState(),
+                error,
+                targetsSigned.custom != null ? targetsSigned.custom.opaqueBackendState : null);
+    }
+
+    private void rescheduleBaseOnConfiguration(Duration hint) {
+        if (hint == null) {
+            return;
+        }
+
+        scheduler.reschedule(hint.toMillis());
+    }
+
+    private void loadFromFile(File file, ConfigurationChangesListener listener) {
+        log.debug("Loading configuration from file {}", file);
+
+        try (InputStream inputStream =
+                new SizeCheckedInputStream(Files.newInputStream(file.toPath()), maxPayloadSize)) {
+            byte[] buffer = new byte[4096];
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream(4096);
+            int bytesRead;
+            do {
+                bytesRead = inputStream.read(buffer);
+                if (bytesRead > -1) {
+                    outputStream.write(buffer, 0, bytesRead);
+                }
+            } while (bytesRead > -1);
+
+            try {
+                listener.accept(file.getAbsolutePath(), outputStream.toByteArray(), NOOP);
+                log.debug("Loaded configuration from file {}", file);
+            } catch (Exception ex) {
+                ratelimitedLogger.warn("Failed reading or applying configuration from {}: {}", file, ex.getMessage());
+            }
+        } catch (IOException | RuntimeException ex) {
+            ExceptionHelper.rateLimitedLogException(
+                    ratelimitedLogger, log, ex, "Unable to load config file: {}.", file);
+        }
+    }
+
+    @Override
+    public void suggestPollingRate(Duration duration) {
+        if (durationHint == null) {
+            durationHint = duration;
+        } else if (duration.compareTo(durationHint) < 0) {
+            durationHint = duration;
+        }
+    }
+
+    private void verifyTargetsSignature(RemoteConfigResponse resp) {
+        if (!integrityChecks) {
+            return;
+        }
+
+        Ed25519Signature sig;
+        byte[] canonicalTargetsSigned;
+        try {
+            {
+                String targetsSignatureStr = resp.getTargetsSignature(this.keyId);
+                sig = Ed25519Signature.fromByteArray(HexUtils.fromHexString(targetsSignatureStr));
+            }
+            {
+                Map<String, Object> untypedTargetsSigned = resp.getUntypedTargetsSigned();
+                canonicalTargetsSigned = JsonCanonicalizer.canonicalize(untypedTargetsSigned);
+            }
+        } catch (RuntimeException rte) {
+            throw new ReportableException(
+                    "Error reading signature or canonicalizing targets.signed: " + rte.getMessage(), rte);
+        }
+        boolean valid = this.key.verify(canonicalTargetsSigned, sig);
+        if (!valid) {
+            throw new ReportableException("Signature verification failed for targets.signed. Key id: " + this.keyId);
+        }
+    }
+
+    private void verifyTargetsPresence(RemoteConfigResponse resp) {
+        if (resp.targetFiles == null) {
+            return;
+        }
+        for (RemoteConfigResponse.TargetFile file : resp.targetFiles) {
+            RemoteConfigResponse.Targets.ConfigTarget target = resp.getTarget(file.path);
+            if (target == null) {
+                throw new ReportableException("Path " + file.path + " is in target_files, but not in targets.signed");
+            }
+        }
+    }
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/ExceptionHelper.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/ExceptionHelper.java
index edb303992f3..7fca2398310 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/ExceptionHelper.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/ExceptionHelper.java
@@ -6,31 +6,27 @@
 
 /** Helper class for rate limiting & logging exceptions */
 public class ExceptionHelper {
-  private static final Object[] EMPTY_ARRAY = new Object[0];
+    private static final Object[] EMPTY_ARRAY = new Object[0];
 
-  public static void logException(Logger log, Throwable ex, String message, Object... params) {
-    if (log.isDebugEnabled()) {
-      if (params == null) {
-        params = EMPTY_ARRAY;
-      }
-      Object[] fullParams = Arrays.copyOf(params, params.length + 1);
-      fullParams[params.length] = ex;
-      log.debug(message, fullParams);
-    } else {
-      log.warn(message + " " + ex.toString(), params);
+    public static void logException(Logger log, Throwable ex, String message, Object... params) {
+        if (log.isDebugEnabled()) {
+            if (params == null) {
+                params = EMPTY_ARRAY;
+            }
+            Object[] fullParams = Arrays.copyOf(params, params.length + 1);
+            fullParams[params.length] = ex;
+            log.debug(message, fullParams);
+        } else {
+            log.warn(message + " " + ex.toString(), params);
+        }
     }
-  }
 
-  public static void rateLimitedLogException(
-      RatelimitedLogger ratelimitedLogger,
-      Logger log,
-      Throwable ex,
-      String message,
-      Object... params) {
-    if (log.isDebugEnabled()) {
-      logException(log, ex, message, params);
-    } else {
-      ratelimitedLogger.warn(message + " " + ex.toString(), params);
+    public static void rateLimitedLogException(
+            RatelimitedLogger ratelimitedLogger, Logger log, Throwable ex, String message, Object... params) {
+        if (log.isDebugEnabled()) {
+            logException(log, ex, message, params);
+        } else {
+            ratelimitedLogger.warn(message + " " + ex.toString(), params);
+        }
     }
-  }
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/HexUtils.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/HexUtils.java
index e21937b07d6..408f8350e0b 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/HexUtils.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/HexUtils.java
@@ -3,47 +3,45 @@
 import java.util.Arrays;
 
 public class HexUtils {
-  private static final int[] DEC =
-      new int[] {
-        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1,
-        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-        -1, 10, 11, 12, 13, 14, 15
-      };
-
-  private HexUtils() {}
-
-  // only accepts 128 or 256 bit input
-  public static byte[] fromHexString(String input) {
-    if (input == null) {
-      return null;
+    private static final int[] DEC = new int[] {
+        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15
+    };
+
+    private HexUtils() {}
+
+    // only accepts 128 or 256 bit input
+    public static byte[] fromHexString(String input) {
+        if (input == null) {
+            return null;
+        }
+
+        int bufferSize = input.length() / 2 > 32 ? 64 : 32;
+        int diff = bufferSize * 2 - input.length();
+        char[] inputChars;
+        if (diff < 0) {
+            throw new IllegalArgumentException("Hex data is too large");
+        } else if (diff > 0) {
+            inputChars = new char[diff + input.length()];
+            Arrays.fill(inputChars, 0, diff, '0');
+            System.arraycopy(input.toCharArray(), 0, inputChars, diff, input.length());
+        } else {
+            inputChars = input.toCharArray();
+        }
+        byte[] result = new byte[inputChars.length / 2];
+
+        for (int i = 0; i < result.length; ++i) {
+            result[i] = (byte) ((getDec(inputChars[2 * i]) << 4) + getDec(inputChars[2 * i + 1]));
+        }
+
+        return result;
     }
 
-    int bufferSize = input.length() / 2 > 32 ? 64 : 32;
-    int diff = bufferSize * 2 - input.length();
-    char[] inputChars;
-    if (diff < 0) {
-      throw new IllegalArgumentException("Hex data is too large");
-    } else if (diff > 0) {
-      inputChars = new char[diff + input.length()];
-      Arrays.fill(inputChars, 0, diff, '0');
-      System.arraycopy(input.toCharArray(), 0, inputChars, diff, input.length());
-    } else {
-      inputChars = input.toCharArray();
+    private static int getDec(int index) {
+        int lookupIdx = index - 48;
+        if (lookupIdx < 0 || lookupIdx >= DEC.length) {
+            return -1;
+        }
+        return DEC[lookupIdx];
     }
-    byte[] result = new byte[inputChars.length / 2];
-
-    for (int i = 0; i < result.length; ++i) {
-      result[i] = (byte) ((getDec(inputChars[2 * i]) << 4) + getDec(inputChars[2 * i + 1]));
-    }
-
-    return result;
-  }
-
-  private static int getDec(int index) {
-    int lookupIdx = index - 48;
-    if (lookupIdx < 0 || lookupIdx >= DEC.length) {
-      return -1;
-    }
-    return DEC[lookupIdx];
-  }
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/JsonCanonicalizer.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/JsonCanonicalizer.java
index 081e99eab9b..9274c433daf 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/JsonCanonicalizer.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/JsonCanonicalizer.java
@@ -6,102 +6,99 @@
 import java.util.Map;
 
 public class JsonCanonicalizer {
-  private static final byte[] TRUE_CONSTANT = {'t', 'r', 'u', 'e'};
-  private static final byte[] FALSE_CONSTANT = {'f', 'a', 'l', 's', 'e'};
-  private static final byte[] NULL_CONSTANT = {'n', 'u', 'l', 'l'};
+    private static final byte[] TRUE_CONSTANT = {'t', 'r', 'u', 'e'};
+    private static final byte[] FALSE_CONSTANT = {'f', 'a', 'l', 's', 'e'};
+    private static final byte[] NULL_CONSTANT = {'n', 'u', 'l', 'l'};
 
-  public static byte[] canonicalize(Map<String, Object> map) {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    serialize(baos, map);
-    return baos.toByteArray();
-  }
+    public static byte[] canonicalize(Map<String, Object> map) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        serialize(baos, map);
+        return baos.toByteArray();
+    }
 
-  private static void serialize(ByteArrayOutputStream os, Object o) {
-    if (o == null) {
-      os.write(NULL_CONSTANT, 0, NULL_CONSTANT.length);
-    } else if (o instanceof String) {
-      serialize(os, (String) o);
-    } else if (o instanceof Number) {
-      serialize(os, ((Number) o).longValue());
-    } else if (o instanceof Boolean) {
-      serialize(os, (Boolean) o);
-    } else if (o instanceof List) {
-      serialize(os, (List) o);
-    } else if (o instanceof Map) {
-      serialize(os, (Map) o);
-    } else {
-      throw new RuntimeException("Unexpected type for: " + o);
+    private static void serialize(ByteArrayOutputStream os, Object o) {
+        if (o == null) {
+            os.write(NULL_CONSTANT, 0, NULL_CONSTANT.length);
+        } else if (o instanceof String) {
+            serialize(os, (String) o);
+        } else if (o instanceof Number) {
+            serialize(os, ((Number) o).longValue());
+        } else if (o instanceof Boolean) {
+            serialize(os, (Boolean) o);
+        } else if (o instanceof List) {
+            serialize(os, (List) o);
+        } else if (o instanceof Map) {
+            serialize(os, (Map) o);
+        } else {
+            throw new RuntimeException("Unexpected type for: " + o);
+        }
     }
-  }
 
-  private static void serialize(ByteArrayOutputStream os, String s) {
-    os.write('"');
-    s.codePoints()
-        .forEach(
-            codepoint -> {
-              if (codepoint == '\\' || codepoint == '"') {
+    private static void serialize(ByteArrayOutputStream os, String s) {
+        os.write('"');
+        s.codePoints().forEach(codepoint -> {
+            if (codepoint == '\\' || codepoint == '"') {
                 os.write('\\');
-              }
-              if (codepoint < 0x80) {
+            }
+            if (codepoint < 0x80) {
                 os.write(codepoint);
-              } else if (codepoint < 0x800) {
+            } else if (codepoint < 0x800) {
                 os.write(0xc0 | (codepoint >> 6));
                 os.write(0x80 | (codepoint & 0x3f));
-              } else if (codepoint < 0x10000) {
+            } else if (codepoint < 0x10000) {
                 os.write(0xe0 | ((codepoint >> 12)));
                 os.write(0x80 | ((codepoint >> 6) & 0x3f));
                 os.write(0x80 | (codepoint & 0x3f));
-              } else {
+            } else {
                 os.write(0xf0 | ((codepoint >> 18)));
                 os.write(0x80 | ((codepoint >> 12) & 0x3f));
                 os.write(0x80 | ((codepoint >> 6) & 0x3f));
                 os.write(0x80 | (codepoint & 0x3f));
-              }
-            });
-    os.write('"');
-  }
+            }
+        });
+        os.write('"');
+    }
 
-  private static void serialize(ByteArrayOutputStream os, long l) {
-    byte[] bytes = Long.toString(l).getBytes(StandardCharsets.US_ASCII);
-    os.write(bytes, 0, bytes.length);
-  }
+    private static void serialize(ByteArrayOutputStream os, long l) {
+        byte[] bytes = Long.toString(l).getBytes(StandardCharsets.US_ASCII);
+        os.write(bytes, 0, bytes.length);
+    }
 
-  private static void serialize(ByteArrayOutputStream os, Boolean b) {
-    byte[] arr = b.booleanValue() ? TRUE_CONSTANT : FALSE_CONSTANT;
-    os.write(arr, 0, arr.length);
-  }
+    private static void serialize(ByteArrayOutputStream os, Boolean b) {
+        byte[] arr = b.booleanValue() ? TRUE_CONSTANT : FALSE_CONSTANT;
+        os.write(arr, 0, arr.length);
+    }
 
-  private static void serialize(ByteArrayOutputStream os, List<Object> list) {
-    os.write('[');
-    for (int i = 0; i < list.size(); i++) {
-      if (i != 0) {
-        os.write(',');
-      }
-      serialize(os, list.get(i));
+    private static void serialize(ByteArrayOutputStream os, List<Object> list) {
+        os.write('[');
+        for (int i = 0; i < list.size(); i++) {
+            if (i != 0) {
+                os.write(',');
+            }
+            serialize(os, list.get(i));
+        }
+        os.write(']');
     }
-    os.write(']');
-  }
 
-  private static void serialize(ByteArrayOutputStream os, Map<String, Object> map) {
-    os.write('{');
+    private static void serialize(ByteArrayOutputStream os, Map<String, Object> map) {
+        os.write('{');
 
-    boolean[] first = new boolean[] {true};
-    map.entrySet().stream()
-        // the canonical json spec only says "keys are lexicographically sorted"
-        .sorted((e1, e2) -> String.CASE_INSENSITIVE_ORDER.compare(e1.getKey(), e2.getKey()))
-        .forEach(
-            e -> {
-              if (first[0]) {
-                first[0] = false;
-              } else {
-                os.write(',');
-              }
+        boolean[] first = new boolean[] {true};
+        map.entrySet().stream()
+                // the canonical json spec only says "keys are lexicographically sorted"
+                .sorted((e1, e2) -> String.CASE_INSENSITIVE_ORDER.compare(e1.getKey(), e2.getKey()))
+                .forEach(e -> {
+                    if (first[0]) {
+                        first[0] = false;
+                    } else {
+                        os.write(',');
+                    }
 
-              serialize(os, e.getKey());
-              os.write(':');
-              serialize(os, e.getValue());
-            });
+                    serialize(os, e.getKey());
+                    os.write(':');
+                    serialize(os, e.getValue());
+                });
 
-    os.write('}');
-  }
+        os.write('}');
+    }
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/PollerRequestFactory.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/PollerRequestFactory.java
index f4714afd973..986e130d9b5 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/PollerRequestFactory.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/PollerRequestFactory.java
@@ -24,142 +24,132 @@
 
 /** Factory for creating OkHttp requests */
 public class PollerRequestFactory {
-  private static final String HEADER_DD_API_KEY = "DD-API-KEY";
-  private static final String HEADER_CONTAINER_ID = "Datadog-Container-ID";
-  private static final String HEADER_ENTITY_ID = "Datadog-Entity-ID";
+    private static final String HEADER_DD_API_KEY = "DD-API-KEY";
+    private static final String HEADER_CONTAINER_ID = "Datadog-Container-ID";
+    private static final String HEADER_ENTITY_ID = "Datadog-Entity-ID";
 
-  private static final Logger log = LoggerFactory.getLogger(PollerRequestFactory.class);
+    private static final Logger log = LoggerFactory.getLogger(PollerRequestFactory.class);
 
-  private final String clientId = RandomUtils.randomUUID().toString();
-  private final String runtimeId;
-  private final String serviceName;
-  private final String apiKey;
-  private final String env;
-  private final String ddVersion;
-  private final String hostName;
-  private final String tracerVersion;
-  private final String containerId;
-  private final String entityId;
-  private final Moshi moshi;
-  final HttpUrl url;
+    private final String clientId = RandomUtils.randomUUID().toString();
+    private final String runtimeId;
+    private final String serviceName;
+    private final String apiKey;
+    private final String env;
+    private final String ddVersion;
+    private final String hostName;
+    private final String tracerVersion;
+    private final String containerId;
+    private final String entityId;
+    private final Moshi moshi;
+    final HttpUrl url;
 
-  public PollerRequestFactory(
-      Config config,
-      String tracerVersion,
-      String containerId,
-      String entityId,
-      String url,
-      Moshi moshi) {
-    this.runtimeId = getRuntimeId(config);
-    this.serviceName = TagsHelper.sanitize(config.getServiceName());
-    this.apiKey = config.getApiKey();
-    this.env = TagsHelper.sanitize(config.getEnv());
-    this.ddVersion = TagsHelper.sanitize(config.getVersion());
-    this.hostName = config.getHostName();
-    // Semantic Versioning requires build separated with `+`
-    this.tracerVersion = tracerVersion.replace('~', '+');
-    this.containerId = containerId;
-    this.entityId = entityId;
-    this.url = parseUrl(url);
-    this.moshi = moshi;
-  }
-
-  private static String getRuntimeId(Config config) {
-    String runtimeId = config.getRuntimeId();
-    if (runtimeId == null || runtimeId.isEmpty()) {
-      log.debug("runtimeId not configured, generating a new UUID");
-      runtimeId = RandomUtils.randomUUID().toString();
+    public PollerRequestFactory(
+            Config config, String tracerVersion, String containerId, String entityId, String url, Moshi moshi) {
+        this.runtimeId = getRuntimeId(config);
+        this.serviceName = TagsHelper.sanitize(config.getServiceName());
+        this.apiKey = config.getApiKey();
+        this.env = TagsHelper.sanitize(config.getEnv());
+        this.ddVersion = TagsHelper.sanitize(config.getVersion());
+        this.hostName = config.getHostName();
+        // Semantic Versioning requires build separated with `+`
+        this.tracerVersion = tracerVersion.replace('~', '+');
+        this.containerId = containerId;
+        this.entityId = entityId;
+        this.url = parseUrl(url);
+        this.moshi = moshi;
     }
-    return runtimeId;
-  }
 
-  private static HttpUrl parseUrl(String url) {
-    HttpUrl httpUrl = HttpUrl.parse(url);
-    if (httpUrl == null) {
-      throw new IllegalArgumentException("Cannot parse url");
+    private static String getRuntimeId(Config config) {
+        String runtimeId = config.getRuntimeId();
+        if (runtimeId == null || runtimeId.isEmpty()) {
+            log.debug("runtimeId not configured, generating a new UUID");
+            runtimeId = RandomUtils.randomUUID().toString();
+        }
+        return runtimeId;
     }
-    return httpUrl;
-  }
 
-  public Request newConfigurationRequest(
-      Collection<String> productNames,
-      ClientState clientState,
-      Collection<CachedTargetFile> cachedTargetFiles,
-      long capabilities) {
-    Request.Builder requestBuilder = new Request.Builder().url(this.url).get();
-    MediaType applicationJson = MediaType.parse("application/json");
-    RequestBody requestBody =
-        RequestBody.create(
-            applicationJson,
-            buildRemoteConfigRequestJson(
-                productNames, clientState, cachedTargetFiles, capabilities));
-    requestBuilder.post(requestBody);
-    if (this.apiKey != null) {
-      requestBuilder.addHeader(HEADER_DD_API_KEY, this.apiKey);
+    private static HttpUrl parseUrl(String url) {
+        HttpUrl httpUrl = HttpUrl.parse(url);
+        if (httpUrl == null) {
+            throw new IllegalArgumentException("Cannot parse url");
+        }
+        return httpUrl;
     }
-    if (containerId != null) {
-      requestBuilder.addHeader(HEADER_CONTAINER_ID, containerId);
+
+    public Request newConfigurationRequest(
+            Collection<String> productNames,
+            ClientState clientState,
+            Collection<CachedTargetFile> cachedTargetFiles,
+            long capabilities) {
+        Request.Builder requestBuilder = new Request.Builder().url(this.url).get();
+        MediaType applicationJson = MediaType.parse("application/json");
+        RequestBody requestBody = RequestBody.create(
+                applicationJson,
+                buildRemoteConfigRequestJson(productNames, clientState, cachedTargetFiles, capabilities));
+        requestBuilder.post(requestBody);
+        if (this.apiKey != null) {
+            requestBuilder.addHeader(HEADER_DD_API_KEY, this.apiKey);
+        }
+        if (containerId != null) {
+            requestBuilder.addHeader(HEADER_CONTAINER_ID, containerId);
+        }
+        if (entityId != null) {
+            requestBuilder.addHeader(HEADER_ENTITY_ID, entityId);
+        }
+        return requestBuilder.build();
     }
-    if (entityId != null) {
-      requestBuilder.addHeader(HEADER_ENTITY_ID, entityId);
+
+    private String buildRemoteConfigRequestJson(
+            Collection<String> productNames,
+            ClientState clientState,
+            Collection<CachedTargetFile> cachedTargetFiles,
+            long capabilities) {
+        RemoteConfigRequest rcRequest = buildRemoteConfigRequest(
+                productNames, clientState, cachedTargetFiles, capabilities, ServiceNameCollector.get());
+        return moshi.adapter(RemoteConfigRequest.class).toJson(rcRequest);
     }
-    return requestBuilder.build();
-  }
 
-  private String buildRemoteConfigRequestJson(
-      Collection<String> productNames,
-      ClientState clientState,
-      Collection<CachedTargetFile> cachedTargetFiles,
-      long capabilities) {
-    RemoteConfigRequest rcRequest =
-        buildRemoteConfigRequest(
-            productNames, clientState, cachedTargetFiles, capabilities, ServiceNameCollector.get());
-    return moshi.adapter(RemoteConfigRequest.class).toJson(rcRequest);
-  }
+    /** For testing purposes only. */
+    public RemoteConfigRequest buildRemoteConfigRequest(
+            Collection<String> productNames,
+            ClientState clientState,
+            Collection<CachedTargetFile> cachedTargetFiles,
+            long capabilities,
+            ServiceNameCollector serviceNameCollector) {
+        return RemoteConfigRequest.newRequest(
+                this.clientId,
+                this.runtimeId,
+                this.tracerVersion,
+                productNames,
+                this.serviceName,
+                serviceNameCollector.getServices(),
+                this.env,
+                this.ddVersion,
+                buildRequestTags(),
+                clientState,
+                cachedTargetFiles,
+                capabilities);
+    }
 
-  /** For testing purposes only. */
-  public RemoteConfigRequest buildRemoteConfigRequest(
-      Collection<String> productNames,
-      ClientState clientState,
-      Collection<CachedTargetFile> cachedTargetFiles,
-      long capabilities,
-      ServiceNameCollector serviceNameCollector) {
-    return RemoteConfigRequest.newRequest(
-        this.clientId,
-        this.runtimeId,
-        this.tracerVersion,
-        productNames,
-        this.serviceName,
-        serviceNameCollector.getServices(),
-        this.env,
-        this.ddVersion,
-        buildRequestTags(),
-        clientState,
-        cachedTargetFiles,
-        capabilities);
-  }
+    private List<String> buildRequestTags() {
+        List<String> tags = Config.get().getGlobalTags().entrySet().stream()
+                .map(entry -> entry.getKey() + ":" + entry.getValue())
+                .collect(Collectors.toList());
+        GitInfo gitInfo = GitInfoProvider.INSTANCE.getGitInfo();
+        String repositoryURL = gitInfo.getRepositoryURL();
+        if (repositoryURL != null) {
+            tags.add(Tags.GIT_REPOSITORY_URL + ":" + repositoryURL);
+        }
+        String sha = gitInfo.getCommit().getSha();
+        if (sha != null) {
+            tags.add(Tags.GIT_COMMIT_SHA + ":" + sha);
+        }
+        tags.addAll(Arrays.asList(
+                "env:" + this.env,
+                "version:" + this.ddVersion,
+                "tracer_version:" + this.tracerVersion,
+                "host_name:" + this.hostName));
 
-  private List<String> buildRequestTags() {
-    List<String> tags =
-        Config.get().getGlobalTags().entrySet().stream()
-            .map(entry -> entry.getKey() + ":" + entry.getValue())
-            .collect(Collectors.toList());
-    GitInfo gitInfo = GitInfoProvider.INSTANCE.getGitInfo();
-    String repositoryURL = gitInfo.getRepositoryURL();
-    if (repositoryURL != null) {
-      tags.add(Tags.GIT_REPOSITORY_URL + ":" + repositoryURL);
-    }
-    String sha = gitInfo.getCommit().getSha();
-    if (sha != null) {
-      tags.add(Tags.GIT_COMMIT_SHA + ":" + sha);
+        return tags;
     }
-    tags.addAll(
-        Arrays.asList(
-            "env:" + this.env,
-            "version:" + this.ddVersion,
-            "tracer_version:" + this.tracerVersion,
-            "host_name:" + this.hostName));
-
-    return tags;
-  }
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/PollerScheduler.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/PollerScheduler.java
index 93a47be51f0..56e675b0d91 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/PollerScheduler.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/PollerScheduler.java
@@ -10,56 +10,54 @@
 /** Handles scheduling scheme for polling configuration */
 @SuppressFBWarnings("AT_NONATOMIC_64BIT_PRIMITIVE")
 class PollerScheduler {
-  private static final Logger LOGGER = LoggerFactory.getLogger(PollerScheduler.class);
-
-  private final long initialPollInterval;
-  private long currentPollInterval;
-  private final DefaultConfigurationPoller poller;
-  private final AgentTaskScheduler taskScheduler;
-  private volatile AgentTaskScheduler.Scheduled<ConfigurationPoller> scheduled;
-
-  public PollerScheduler(
-      Config config, DefaultConfigurationPoller poller, AgentTaskScheduler taskScheduler) {
-    // TODO add a jitter to avoid herd issue
-    this.initialPollInterval = (long) (config.getRemoteConfigPollIntervalSeconds() * 1000);
-    this.poller = poller;
-    this.taskScheduler = taskScheduler;
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(PollerScheduler.class);
+
+    private final long initialPollInterval;
+    private long currentPollInterval;
+    private final DefaultConfigurationPoller poller;
+    private final AgentTaskScheduler taskScheduler;
+    private volatile AgentTaskScheduler.Scheduled<ConfigurationPoller> scheduled;
+
+    public PollerScheduler(Config config, DefaultConfigurationPoller poller, AgentTaskScheduler taskScheduler) {
+        // TODO add a jitter to avoid herd issue
+        this.initialPollInterval = (long) (config.getRemoteConfigPollIntervalSeconds() * 1000);
+        this.poller = poller;
+        this.taskScheduler = taskScheduler;
+    }
 
-  void start() {
-    currentPollInterval = initialPollInterval;
-    reschedule();
-  }
+    void start() {
+        currentPollInterval = initialPollInterval;
+        reschedule();
+    }
 
-  void stop() {
-    AgentTaskScheduler.Scheduled<ConfigurationPoller> localScheduled = this.scheduled;
-    if (localScheduled != null) {
-      localScheduled.cancel();
+    void stop() {
+        AgentTaskScheduler.Scheduled<ConfigurationPoller> localScheduled = this.scheduled;
+        if (localScheduled != null) {
+            localScheduled.cancel();
+        }
     }
-  }
 
-  long getInitialPollInterval() {
-    return initialPollInterval;
-  }
+    long getInitialPollInterval() {
+        return initialPollInterval;
+    }
 
-  void reschedule(long newInterval) {
-    if (currentPollInterval != newInterval) {
-      LOGGER.debug("Setting polling interval to {}ms, and rescheduling", newInterval);
-      currentPollInterval = newInterval;
-      reschedule();
+    void reschedule(long newInterval) {
+        if (currentPollInterval != newInterval) {
+            LOGGER.debug("Setting polling interval to {}ms, and rescheduling", newInterval);
+            currentPollInterval = newInterval;
+            reschedule();
+        }
     }
-  }
 
-  private void reschedule() {
-    AgentTaskScheduler.Scheduled<ConfigurationPoller> localScheduled = this.scheduled;
-    long initialDelay = currentPollInterval;
-    if (localScheduled != null) {
-      localScheduled.cancel();
-    } else {
-      initialDelay = 0;
+    private void reschedule() {
+        AgentTaskScheduler.Scheduled<ConfigurationPoller> localScheduled = this.scheduled;
+        long initialDelay = currentPollInterval;
+        if (localScheduled != null) {
+            localScheduled.cancel();
+        } else {
+            initialDelay = 0;
+        }
+        this.scheduled = taskScheduler.scheduleAtFixedRate(
+                poller::poll, poller, initialDelay, currentPollInterval, TimeUnit.MILLISECONDS);
     }
-    this.scheduled =
-        taskScheduler.scheduleAtFixedRate(
-            poller::poll, poller, initialDelay, currentPollInterval, TimeUnit.MILLISECONDS);
-  }
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/PollingHinterNoop.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/PollingHinterNoop.java
index 357357ac136..8aa23e107ff 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/PollingHinterNoop.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/PollingHinterNoop.java
@@ -3,10 +3,10 @@
 import java.time.Duration;
 
 public final class PollingHinterNoop implements PollingRateHinter {
-  public static final PollingRateHinter NOOP = new PollingHinterNoop();
+    public static final PollingRateHinter NOOP = new PollingHinterNoop();
 
-  private PollingHinterNoop() {}
+    private PollingHinterNoop() {}
 
-  @Override
-  public void suggestPollingRate(Duration duration) {}
+    @Override
+    public void suggestPollingRate(Duration duration) {}
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/ReportableException.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/ReportableException.java
index cc3288fda03..2220bf9d458 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/ReportableException.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/ReportableException.java
@@ -2,11 +2,11 @@
 
 /* An exception that should be reported in client.state.error */
 public class ReportableException extends RuntimeException {
-  public ReportableException(String message) {
-    super(message);
-  }
+    public ReportableException(String message) {
+        super(message);
+    }
 
-  public ReportableException(String message, Throwable t) {
-    super(message, t);
-  }
+    public ReportableException(String message, Throwable t) {
+        super(message, t);
+    }
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/ParsedConfigKey.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/ParsedConfigKey.java
index 4554471d357..97f2edaa06c 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/ParsedConfigKey.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/ParsedConfigKey.java
@@ -9,87 +9,85 @@
 
 public class ParsedConfigKey implements ConfigKey {
 
-  private static final Pattern EXTRACT_PRODUCT_REGEX =
-      Pattern.compile("([^/]+)(/\\d+)?/([^/]+)/([^/]+)/[^/]+");
-
-  private final String originalKey;
-  private final String org;
-  private final Integer version;
-  private final String productName;
-  private final String configId;
-  private final Product product;
-
-  ParsedConfigKey(
-      String originalKey, String org, Integer version, String productName, String configId) {
-    this.originalKey = originalKey;
-    this.org = org;
-    this.version = version;
-    this.productName = productName;
-    this.configId = configId;
-
-    Product parsedProduct = Product._UNKNOWN;
-    try {
-      parsedProduct = Product.valueOf(productName.toUpperCase(Locale.ROOT));
-    } catch (IllegalArgumentException iae) {
+    private static final Pattern EXTRACT_PRODUCT_REGEX = Pattern.compile("([^/]+)(/\\d+)?/([^/]+)/([^/]+)/[^/]+");
+
+    private final String originalKey;
+    private final String org;
+    private final Integer version;
+    private final String productName;
+    private final String configId;
+    private final Product product;
+
+    ParsedConfigKey(String originalKey, String org, Integer version, String productName, String configId) {
+        this.originalKey = originalKey;
+        this.org = org;
+        this.version = version;
+        this.productName = productName;
+        this.configId = configId;
+
+        Product parsedProduct = Product._UNKNOWN;
+        try {
+            parsedProduct = Product.valueOf(productName.toUpperCase(Locale.ROOT));
+        } catch (IllegalArgumentException iae) {
+        }
+        this.product = parsedProduct;
     }
-    this.product = parsedProduct;
-  }
 
-  public static ParsedConfigKey parse(String configKey) {
-    Matcher matcher = EXTRACT_PRODUCT_REGEX.matcher(configKey);
-    if (!matcher.matches()) {
-      throw new ReportableException("Not a valid config key: " + configKey);
+    public static ParsedConfigKey parse(String configKey) {
+        Matcher matcher = EXTRACT_PRODUCT_REGEX.matcher(configKey);
+        if (!matcher.matches()) {
+            throw new ReportableException("Not a valid config key: " + configKey);
+        }
+        String org = matcher.group(1);
+        String version = matcher.group(2);
+        // version group can be null or "/" + number. so if it is not null, parse int without first char
+        Integer parsedVersion = version != null ? Integer.parseInt(version.substring(1)) : null;
+        String product = matcher.group(3);
+        String configId = matcher.group(4);
+
+        return new ParsedConfigKey(configKey, org, parsedVersion, product, configId);
+    }
+
+    @Override
+    public Product getProduct() {
+        return product;
+    }
+
+    @Override
+    public String getProductName() {
+        return productName;
+    }
+
+    @Override
+    public String getOrg() {
+        return org;
+    }
+
+    @Override
+    public Integer getVersion() {
+        return version;
+    }
+
+    @Override
+    public String getConfigId() {
+        return configId;
+    }
+
+    @Override
+    public String toString() {
+        return originalKey;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ParsedConfigKey that = (ParsedConfigKey) o;
+        return Objects.equals(originalKey, that.originalKey);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(originalKey);
     }
-    String org = matcher.group(1);
-    String version = matcher.group(2);
-    // version group can be null or "/" + number. so if it is not null, parse int without first char
-    Integer parsedVersion = version != null ? Integer.parseInt(version.substring(1)) : null;
-    String product = matcher.group(3);
-    String configId = matcher.group(4);
-
-    return new ParsedConfigKey(configKey, org, parsedVersion, product, configId);
-  }
-
-  @Override
-  public Product getProduct() {
-    return product;
-  }
-
-  @Override
-  public String getProductName() {
-    return productName;
-  }
-
-  @Override
-  public String getOrg() {
-    return org;
-  }
-
-  @Override
-  public Integer getVersion() {
-    return version;
-  }
-
-  @Override
-  public String getConfigId() {
-    return configId;
-  }
-
-  @Override
-  public String toString() {
-    return originalKey;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    ParsedConfigKey that = (ParsedConfigKey) o;
-    return Objects.equals(originalKey, that.originalKey);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(originalKey);
-  }
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/ProductState.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/ProductState.java
index ccce0dab21c..dc4876f9fed 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/ProductState.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/ProductState.java
@@ -19,256 +19,241 @@
 import org.slf4j.LoggerFactory;
 
 public class ProductState {
-  private static final Logger log = LoggerFactory.getLogger(ProductState.class);
-  private static final int MINUTES_BETWEEN_ERROR_LOG = 5;
-  private final RatelimitedLogger ratelimitedLogger;
-
-  final Product product;
-
-  private final Map<ParsedConfigKey, RemoteConfigRequest.CachedTargetFile> cachedTargetFiles =
-      new HashMap<>();
-  private final Map<ParsedConfigKey, RemoteConfigRequest.ClientInfo.ClientState.ConfigState>
-      configStates = new HashMap<>();
-  private final List<ProductListener> productListeners;
-  private final Map<String, ProductListener> configListeners;
-
-  List<ReportableException> errors = null;
-
-  public ProductState(Product product) {
-    this.product = product;
-    this.productListeners = new ArrayList<>();
-    this.configListeners = new HashMap<>();
-
-    this.ratelimitedLogger =
-        new RatelimitedLogger(log, MINUTES_BETWEEN_ERROR_LOG, TimeUnit.MINUTES);
-  }
-
-  public void addProductListener(ProductListener listener) {
-    productListeners.add(listener);
-  }
-
-  public void addProductListener(String configId, ProductListener listener) {
-    configListeners.put(configId, listener);
-  }
-
-  public boolean apply(
-      RemoteConfigResponse fleetResponse,
-      List<ParsedConfigKey> relevantKeys,
-      PollingRateHinter hinter) {
-    errors = null;
-
-    List<ParsedConfigKey> configBeenUsedByProduct = new ArrayList<>();
-    List<ParsedConfigKey> changedKeys = new ArrayList<>();
-    boolean changesDetected = false;
-
-    // Step 1: Detect all changes
-    for (ParsedConfigKey configKey : relevantKeys) {
-      try {
-        RemoteConfigResponse.Targets.ConfigTarget target =
-            getTargetOrThrow(fleetResponse, configKey);
-        configBeenUsedByProduct.add(configKey);
-
-        if (isTargetChanged(configKey, target)) {
-          changesDetected = true;
-          changedKeys.add(configKey);
+    private static final Logger log = LoggerFactory.getLogger(ProductState.class);
+    private static final int MINUTES_BETWEEN_ERROR_LOG = 5;
+    private final RatelimitedLogger ratelimitedLogger;
+
+    final Product product;
+
+    private final Map<ParsedConfigKey, RemoteConfigRequest.CachedTargetFile> cachedTargetFiles = new HashMap<>();
+    private final Map<ParsedConfigKey, RemoteConfigRequest.ClientInfo.ClientState.ConfigState> configStates =
+            new HashMap<>();
+    private final List<ProductListener> productListeners;
+    private final Map<String, ProductListener> configListeners;
+
+    List<ReportableException> errors = null;
+
+    public ProductState(Product product) {
+        this.product = product;
+        this.productListeners = new ArrayList<>();
+        this.configListeners = new HashMap<>();
+
+        this.ratelimitedLogger = new RatelimitedLogger(log, MINUTES_BETWEEN_ERROR_LOG, TimeUnit.MINUTES);
+    }
+
+    public void addProductListener(ProductListener listener) {
+        productListeners.add(listener);
+    }
+
+    public void addProductListener(String configId, ProductListener listener) {
+        configListeners.put(configId, listener);
+    }
+
+    public boolean apply(
+            RemoteConfigResponse fleetResponse, List<ParsedConfigKey> relevantKeys, PollingRateHinter hinter) {
+        errors = null;
+
+        List<ParsedConfigKey> configBeenUsedByProduct = new ArrayList<>();
+        List<ParsedConfigKey> changedKeys = new ArrayList<>();
+        boolean changesDetected = false;
+
+        // Step 1: Detect all changes
+        for (ParsedConfigKey configKey : relevantKeys) {
+            try {
+                RemoteConfigResponse.Targets.ConfigTarget target = getTargetOrThrow(fleetResponse, configKey);
+                configBeenUsedByProduct.add(configKey);
+
+                if (isTargetChanged(configKey, target)) {
+                    changesDetected = true;
+                    changedKeys.add(configKey);
+                }
+            } catch (ReportableException e) {
+                recordError(e);
+            }
+        }
+
+        // Step 2: For products other than ASM_DD, apply changes immediately
+        if (product != Product.ASM_DD) {
+            for (ParsedConfigKey configKey : changedKeys) {
+                try {
+                    byte[] content = getTargetFileContent(fleetResponse, configKey);
+                    callListenerApplyTarget(fleetResponse, hinter, configKey, content);
+                } catch (ReportableException e) {
+                    recordError(e);
+                }
+            }
+        }
+
+        // Step 3: Remove obsolete configurations (for all products)
+        // For ASM_DD, this is critical: removes MUST happen before applies to prevent
+        // duplicate rule warnings from the ddwaf rule parser and causing memory spikes.
+        List<ParsedConfigKey> keysToRemove = cachedTargetFiles.keySet().stream()
+                .filter(configKey -> !configBeenUsedByProduct.contains(configKey))
+                .collect(Collectors.toList());
+
+        for (ParsedConfigKey configKey : keysToRemove) {
+            changesDetected = true;
+            callListenerRemoveTarget(hinter, configKey);
+        }
+
+        // Step 4: For ASM_DD, apply changes AFTER removes
+        // TODO: This is a temporary solution. The proper fix requires better synchronization
+        // between remove and add/update operations. This should be discussed
+        // with the guild to determine the best long-term design approach.
+        if (product == Product.ASM_DD) {
+            for (ParsedConfigKey configKey : changedKeys) {
+                try {
+                    byte[] content = getTargetFileContent(fleetResponse, configKey);
+                    callListenerApplyTarget(fleetResponse, hinter, configKey, content);
+                } catch (ReportableException e) {
+                    recordError(e);
+                }
+            }
+        }
+
+        // Step 5: Commit if there were changes
+        if (changesDetected) {
+            try {
+                callListenerCommit(hinter);
+            } catch (Exception ex) {
+                log.error("Error committing changes for product {}", product, ex);
+            }
         }
-      } catch (ReportableException e) {
-        recordError(e);
-      }
+
+        return changesDetected;
     }
 
-    // Step 2: For products other than ASM_DD, apply changes immediately
-    if (product != Product.ASM_DD) {
-      for (ParsedConfigKey configKey : changedKeys) {
+    private void callListenerApplyTarget(
+            RemoteConfigResponse fleetResponse, PollingRateHinter hinter, ParsedConfigKey configKey, byte[] content) {
+
         try {
-          byte[] content = getTargetFileContent(fleetResponse, configKey);
-          callListenerApplyTarget(fleetResponse, hinter, configKey, content);
+            for (ProductListener listener : productListeners) {
+                listener.accept(configKey, content, hinter);
+            }
+            ProductListener listener = configListeners.get(configKey.getConfigId());
+            if (listener != null) {
+                listener.accept(configKey, content, hinter);
+            }
+
+            updateConfigState(fleetResponse, configKey, null);
         } catch (ReportableException e) {
-          recordError(e);
+            recordError(e);
+        } catch (Exception ex) {
+            updateConfigState(fleetResponse, configKey, ex);
+            if (!(ex instanceof InterruptedIOException)) {
+                ratelimitedLogger.warn("Error processing config key {}: {}", configKey, ex.getMessage(), ex);
+            }
         }
-      }
     }
 
-    // Step 3: Remove obsolete configurations (for all products)
-    // For ASM_DD, this is critical: removes MUST happen before applies to prevent
-    // duplicate rule warnings from the ddwaf rule parser and causing memory spikes.
-    List<ParsedConfigKey> keysToRemove =
-        cachedTargetFiles.keySet().stream()
-            .filter(configKey -> !configBeenUsedByProduct.contains(configKey))
-            .collect(Collectors.toList());
-
-    for (ParsedConfigKey configKey : keysToRemove) {
-      changesDetected = true;
-      callListenerRemoveTarget(hinter, configKey);
+    private void callListenerRemoveTarget(PollingRateHinter hinter, ParsedConfigKey configKey) {
+        try {
+            for (ProductListener listener : productListeners) {
+                listener.remove(configKey, hinter);
+            }
+            ProductListener listener = configListeners.get(configKey.getConfigId());
+            if (listener != null) {
+                listener.remove(configKey, hinter);
+            }
+        } catch (Exception ex) {
+            ratelimitedLogger.warn("Error handling configuration removal for {}", configKey, ex);
+        }
+        cachedTargetFiles.remove(configKey);
+        configStates.remove(configKey);
     }
 
-    // Step 4: For ASM_DD, apply changes AFTER removes
-    // TODO: This is a temporary solution. The proper fix requires better synchronization
-    // between remove and add/update operations. This should be discussed
-    // with the guild to determine the best long-term design approach.
-    if (product == Product.ASM_DD) {
-      for (ParsedConfigKey configKey : changedKeys) {
+    private void callListenerCommit(PollingRateHinter hinter) {
         try {
-          byte[] content = getTargetFileContent(fleetResponse, configKey);
-          callListenerApplyTarget(fleetResponse, hinter, configKey, content);
+            for (ProductListener listener : productListeners) {
+                listener.commit(hinter);
+            }
+            for (ProductListener listener : configListeners.values()) {
+                listener.commit(hinter);
+            }
         } catch (ReportableException e) {
-          recordError(e);
+            recordError(e);
+        } catch (Exception ex) {
+            ratelimitedLogger.warn("Error committing changes for product {}: {}", product, ex.getMessage(), ex);
         }
-      }
     }
 
-    // Step 5: Commit if there were changes
-    if (changesDetected) {
-      try {
-        callListenerCommit(hinter);
-      } catch (Exception ex) {
-        log.error("Error committing changes for product {}", product, ex);
-      }
+    RemoteConfigResponse.Targets.ConfigTarget getTargetOrThrow(
+            RemoteConfigResponse fleetResponse, ParsedConfigKey configKey) {
+        RemoteConfigResponse.Targets.ConfigTarget target = fleetResponse.getTarget(configKey.toString());
+        if (target == null) {
+            throw new ReportableException("Told to apply config for "
+                    + configKey
+                    + " but no corresponding entry exists in targets.targets_signed.targets");
+        }
+        return target;
     }
 
-    return changesDetected;
-  }
-
-  private void callListenerApplyTarget(
-      RemoteConfigResponse fleetResponse,
-      PollingRateHinter hinter,
-      ParsedConfigKey configKey,
-      byte[] content) {
-
-    try {
-      for (ProductListener listener : productListeners) {
-        listener.accept(configKey, content, hinter);
-      }
-      ProductListener listener = configListeners.get(configKey.getConfigId());
-      if (listener != null) {
-        listener.accept(configKey, content, hinter);
-      }
-
-      updateConfigState(fleetResponse, configKey, null);
-    } catch (ReportableException e) {
-      recordError(e);
-    } catch (Exception ex) {
-      updateConfigState(fleetResponse, configKey, ex);
-      if (!(ex instanceof InterruptedIOException)) {
-        ratelimitedLogger.warn(
-            "Error processing config key {}: {}", configKey, ex.getMessage(), ex);
-      }
-    }
-  }
-
-  private void callListenerRemoveTarget(PollingRateHinter hinter, ParsedConfigKey configKey) {
-    try {
-      for (ProductListener listener : productListeners) {
-        listener.remove(configKey, hinter);
-      }
-      ProductListener listener = configListeners.get(configKey.getConfigId());
-      if (listener != null) {
-        listener.remove(configKey, hinter);
-      }
-    } catch (Exception ex) {
-      ratelimitedLogger.warn("Error handling configuration removal for {}", configKey, ex);
-    }
-    cachedTargetFiles.remove(configKey);
-    configStates.remove(configKey);
-  }
-
-  private void callListenerCommit(PollingRateHinter hinter) {
-    try {
-      for (ProductListener listener : productListeners) {
-        listener.commit(hinter);
-      }
-      for (ProductListener listener : configListeners.values()) {
-        listener.commit(hinter);
-      }
-    } catch (ReportableException e) {
-      recordError(e);
-    } catch (Exception ex) {
-      ratelimitedLogger.warn(
-          "Error committing changes for product {}: {}", product, ex.getMessage(), ex);
+    boolean isTargetChanged(ParsedConfigKey parsedConfigKey, RemoteConfigResponse.Targets.ConfigTarget target) {
+        RemoteConfigRequest.CachedTargetFile cachedTargetFile = cachedTargetFiles.get(parsedConfigKey);
+        if (cachedTargetFile != null && cachedTargetFile.hashesMatch(target.hashes)) {
+            log.debug("No change in configuration for key {}", parsedConfigKey);
+            return false;
+        }
+        return true;
     }
-  }
-
-  RemoteConfigResponse.Targets.ConfigTarget getTargetOrThrow(
-      RemoteConfigResponse fleetResponse, ParsedConfigKey configKey) {
-    RemoteConfigResponse.Targets.ConfigTarget target =
-        fleetResponse.getTarget(configKey.toString());
-    if (target == null) {
-      throw new ReportableException(
-          "Told to apply config for "
-              + configKey
-              + " but no corresponding entry exists in targets.targets_signed.targets");
+
+    byte[] getTargetFileContent(RemoteConfigResponse fleetResponse, ParsedConfigKey configKey) {
+        // fetch the content
+        byte[] maybeFileContent;
+        try {
+            maybeFileContent = fleetResponse.getFileContents(configKey.toString());
+        } catch (MissingContentException e) {
+            if (cachedTargetFiles.containsKey(configKey)) {
+                throw new ReportableException("Told to apply config "
+                        + configKey
+                        + " but content not present even though hash differs from that of 'cached file'");
+            }
+            throw new ReportableException(e.getMessage());
+        } catch (Exception e) {
+            throw new ReportableException(e.getMessage());
+        }
+
+        return maybeFileContent;
     }
-    return target;
-  }
-
-  boolean isTargetChanged(
-      ParsedConfigKey parsedConfigKey, RemoteConfigResponse.Targets.ConfigTarget target) {
-    RemoteConfigRequest.CachedTargetFile cachedTargetFile = cachedTargetFiles.get(parsedConfigKey);
-    if (cachedTargetFile != null && cachedTargetFile.hashesMatch(target.hashes)) {
-      log.debug("No change in configuration for key {}", parsedConfigKey);
-      return false;
+
+    private void updateConfigState(
+            RemoteConfigResponse fleetResponse, ParsedConfigKey parsedConfigKey, Exception error) {
+        String configKey = parsedConfigKey.toString();
+        RemoteConfigResponse.Targets.ConfigTarget target = fleetResponse.getTarget(configKey);
+        RemoteConfigRequest.ClientInfo.ClientState.ConfigState newState =
+                new RemoteConfigRequest.ClientInfo.ClientState.ConfigState();
+        newState.setState(
+                parsedConfigKey.getConfigId(),
+                target.custom.version,
+                product.name(),
+                error != null ? error.getMessage() : null);
+        configStates.put(parsedConfigKey, newState);
+
+        RemoteConfigRequest.CachedTargetFile newCTF =
+                new RemoteConfigRequest.CachedTargetFile(configKey, target.length, target.hashes);
+        cachedTargetFiles.put(parsedConfigKey, newCTF);
     }
-    return true;
-  }
-
-  byte[] getTargetFileContent(RemoteConfigResponse fleetResponse, ParsedConfigKey configKey) {
-    // fetch the content
-    byte[] maybeFileContent;
-    try {
-      maybeFileContent = fleetResponse.getFileContents(configKey.toString());
-    } catch (MissingContentException e) {
-      if (cachedTargetFiles.containsKey(configKey)) {
-        throw new ReportableException(
-            "Told to apply config "
-                + configKey
-                + " but content not present even though hash differs from that of 'cached file'");
-      }
-      throw new ReportableException(e.getMessage());
-    } catch (Exception e) {
-      throw new ReportableException(e.getMessage());
+
+    public boolean hasError() {
+        return errors != null;
     }
 
-    return maybeFileContent;
-  }
-
-  private void updateConfigState(
-      RemoteConfigResponse fleetResponse, ParsedConfigKey parsedConfigKey, Exception error) {
-    String configKey = parsedConfigKey.toString();
-    RemoteConfigResponse.Targets.ConfigTarget target = fleetResponse.getTarget(configKey);
-    RemoteConfigRequest.ClientInfo.ClientState.ConfigState newState =
-        new RemoteConfigRequest.ClientInfo.ClientState.ConfigState();
-    newState.setState(
-        parsedConfigKey.getConfigId(),
-        target.custom.version,
-        product.name(),
-        error != null ? error.getMessage() : null);
-    configStates.put(parsedConfigKey, newState);
-
-    RemoteConfigRequest.CachedTargetFile newCTF =
-        new RemoteConfigRequest.CachedTargetFile(configKey, target.length, target.hashes);
-    cachedTargetFiles.put(parsedConfigKey, newCTF);
-  }
-
-  public boolean hasError() {
-    return errors != null;
-  }
-
-  public void recordError(ReportableException error) {
-    if (errors == null) {
-      errors = new ArrayList<>();
+    public void recordError(ReportableException error) {
+        if (errors == null) {
+            errors = new ArrayList<>();
+        }
+        errors.add(error);
     }
-    errors.add(error);
-  }
 
-  public Collection<ReportableException> getErrors() {
-    return errors;
-  }
+    public Collection<ReportableException> getErrors() {
+        return errors;
+    }
 
-  public Collection<RemoteConfigRequest.CachedTargetFile> getCachedTargetFiles() {
-    return cachedTargetFiles.values();
-  }
+    public Collection<RemoteConfigRequest.CachedTargetFile> getCachedTargetFiles() {
+        return cachedTargetFiles.values();
+    }
 
-  public Collection<RemoteConfigRequest.ClientInfo.ClientState.ConfigState> getConfigStates() {
-    return configStates.values();
-  }
+    public Collection<RemoteConfigRequest.ClientInfo.ClientState.ConfigState> getConfigStates() {
+        return configStates.values();
+    }
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/SimpleProductListener.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/SimpleProductListener.java
index 58fc697949a..e431a7f82bb 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/SimpleProductListener.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/SimpleProductListener.java
@@ -5,23 +5,22 @@
 import java.io.IOException;
 
 public class SimpleProductListener implements ProductListener {
-  private final ConfigurationChangesListener listener;
+    private final ConfigurationChangesListener listener;
 
-  public SimpleProductListener(ConfigurationChangesListener listener) {
-    this.listener = listener;
-  }
+    public SimpleProductListener(ConfigurationChangesListener listener) {
+        this.listener = listener;
+    }
 
-  @Override
-  public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollingRateHinter)
-      throws IOException {
-    listener.accept(configKey.toString(), content, pollingRateHinter);
-  }
+    @Override
+    public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollingRateHinter) throws IOException {
+        listener.accept(configKey.toString(), content, pollingRateHinter);
+    }
 
-  @Override
-  public void remove(ConfigKey configKey, PollingRateHinter pollingRateHinter) throws IOException {
-    listener.accept(configKey.toString(), null, pollingRateHinter);
-  }
+    @Override
+    public void remove(ConfigKey configKey, PollingRateHinter pollingRateHinter) throws IOException {
+        listener.accept(configKey.toString(), null, pollingRateHinter);
+    }
 
-  @Override
-  public void commit(PollingRateHinter pollingRateHinter) {}
+    @Override
+    public void commit(PollingRateHinter pollingRateHinter) {}
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/InstantJsonAdapter.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/InstantJsonAdapter.java
index 886a8dd6816..1b22394e5fa 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/InstantJsonAdapter.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/InstantJsonAdapter.java
@@ -9,15 +9,15 @@
 import javax.annotation.Nullable;
 
 public class InstantJsonAdapter extends JsonAdapter<Instant> {
-  @Nullable
-  @Override
-  public Instant fromJson(JsonReader reader) throws IOException {
-    String s = reader.nextString();
-    return OffsetDateTime.parse(s).toInstant();
-  }
+    @Nullable
+    @Override
+    public Instant fromJson(JsonReader reader) throws IOException {
+        String s = reader.nextString();
+        return OffsetDateTime.parse(s).toInstant();
+    }
 
-  @Override
-  public void toJson(JsonWriter writer, @Nullable Instant value) throws IOException {
-    throw new UnsupportedOperationException();
-  }
+    @Override
+    public void toJson(JsonWriter writer, @Nullable Instant value) throws IOException {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/IntegrityCheckException.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/IntegrityCheckException.java
index 3a45ec8cd1f..45e7e25057d 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/IntegrityCheckException.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/IntegrityCheckException.java
@@ -2,11 +2,11 @@
 
 /** Exception when checking configuration integrity */
 public class IntegrityCheckException extends RuntimeException {
-  public IntegrityCheckException(String message) {
-    super(message);
-  }
+    public IntegrityCheckException(String message) {
+        super(message);
+    }
 
-  public IntegrityCheckException(String message, Throwable cause) {
-    super(message, cause);
-  }
+    public IntegrityCheckException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/MissingContentException.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/MissingContentException.java
index acb5ccb2faf..d8247cd6872 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/MissingContentException.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/MissingContentException.java
@@ -1,7 +1,7 @@
 package datadog.remoteconfig.tuf;
 
 public class MissingContentException extends RuntimeException {
-  public MissingContentException(String message) {
-    super(message);
-  }
+    public MissingContentException(String message) {
+        super(message);
+    }
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/RawJsonAdapter.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/RawJsonAdapter.java
index fb7d5f420b2..fbd79791bfd 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/RawJsonAdapter.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/RawJsonAdapter.java
@@ -9,15 +9,15 @@
 import okio.Okio;
 
 public class RawJsonAdapter extends JsonAdapter<ByteString> {
-  public void toJson(JsonWriter writer, ByteString value) throws IOException {
-    if (value == null) {
-      writer.nullValue();
-      return;
+    public void toJson(JsonWriter writer, ByteString value) throws IOException {
+        if (value == null) {
+            writer.nullValue();
+            return;
+        }
+        writer.value(Okio.buffer(Okio.source(new ByteArrayInputStream(value.toByteArray()))));
     }
-    writer.value(Okio.buffer(Okio.source(new ByteArrayInputStream(value.toByteArray()))));
-  }
 
-  public ByteString fromJson(JsonReader reader) throws IOException {
-    return reader.nextSource().readByteString();
-  }
+    public ByteString fromJson(JsonReader reader) throws IOException {
+        return reader.nextSource().readByteString();
+    }
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/RemoteConfigRequest.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/RemoteConfigRequest.java
index c8b6c388d41..9023c788664 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/RemoteConfigRequest.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/RemoteConfigRequest.java
@@ -11,278 +11,270 @@
 /** Handles requests to Remote Configuration */
 public class RemoteConfigRequest {
 
-  public static RemoteConfigRequest newRequest(
-      String clientId,
-      String runtimeId,
-      String tracerVersion,
-      Collection<String> productNames,
-      String serviceName,
-      List<String> extraServices,
-      String serviceEnv,
-      String serviceVersion,
-      List<String> tags,
-      ClientInfo.ClientState clientState,
-      Collection<CachedTargetFile> cachedTargetFiles,
-      long capabilities) {
-
-    ClientInfo.TracerInfo tracerInfo =
-        new RemoteConfigRequest.ClientInfo.TracerInfo(
-            runtimeId,
-            tracerVersion,
-            serviceName,
-            extraServices,
-            serviceEnv,
-            serviceVersion,
-            tags,
-            ProcessTags.getTagsAsStringList());
-
-    ClientInfo clientInfo =
-        new RemoteConfigRequest.ClientInfo(
-            clientState, clientId, productNames, tracerInfo, capabilities);
-
-    return new RemoteConfigRequest(clientInfo, cachedTargetFiles);
-  }
-
-  private final ClientInfo client;
-
-  @Json(name = "cached_target_files")
-  private final Collection<CachedTargetFile> cachedTargetFiles;
-
-  public RemoteConfigRequest(ClientInfo client, Collection<CachedTargetFile> cachedTargetFiles) {
-    this.client = client;
-    // system tests expect this to be null if we're not holding anything cached
-    this.cachedTargetFiles =
-        (cachedTargetFiles != null && cachedTargetFiles.isEmpty()) ? null : cachedTargetFiles;
-  }
-
-  public ClientInfo getClient() {
-    return this.client;
-  }
-
-  /** Stores client information for Remote Configuration */
-  public static class ClientInfo {
-    @Json(name = "state")
-    private final ClientState clientState;
-
-    private final String id;
-    private final Collection<String> products;
-
-    @Json(name = "client_tracer")
-    private final TracerInfo tracerInfo;
-
-    @Json(name = "client_agent")
-    private final AgentInfo agentInfo = null; // MUST NOT be set
-
-    @Json(name = "is_tracer")
-    private final boolean isTracer = true;
-
-    @Json(name = "is_agent")
-    private final Boolean isAgent = null; // MUST NOT be set;
-
-    private final byte[] capabilities;
-
-    public ClientInfo(
-        ClientState clientState,
-        String id,
-        Collection<String> productNames,
-        TracerInfo tracerInfo,
-        final long capabilities) {
-      this.clientState = clientState;
-      this.id = id;
-      this.products = productNames;
-      this.tracerInfo = tracerInfo;
-
-      // Big-endian encoding of the `long` capabilities, stripping any trailing zero bytes
-      // (except the first one)
-      final int size = Math.max(1, Long.BYTES - Long.numberOfLeadingZeros(capabilities) / 8);
-      this.capabilities = new byte[size];
-      for (int i = size - 1; i >= 0; i--) {
-        this.capabilities[size - i - 1] = (byte) (capabilities >>> (i * 8));
-      }
+    public static RemoteConfigRequest newRequest(
+            String clientId,
+            String runtimeId,
+            String tracerVersion,
+            Collection<String> productNames,
+            String serviceName,
+            List<String> extraServices,
+            String serviceEnv,
+            String serviceVersion,
+            List<String> tags,
+            ClientInfo.ClientState clientState,
+            Collection<CachedTargetFile> cachedTargetFiles,
+            long capabilities) {
+
+        ClientInfo.TracerInfo tracerInfo = new RemoteConfigRequest.ClientInfo.TracerInfo(
+                runtimeId,
+                tracerVersion,
+                serviceName,
+                extraServices,
+                serviceEnv,
+                serviceVersion,
+                tags,
+                ProcessTags.getTagsAsStringList());
+
+        ClientInfo clientInfo =
+                new RemoteConfigRequest.ClientInfo(clientState, clientId, productNames, tracerInfo, capabilities);
+
+        return new RemoteConfigRequest(clientInfo, cachedTargetFiles);
     }
 
-    public TracerInfo getTracerInfo() {
-      return this.tracerInfo;
+    private final ClientInfo client;
+
+    @Json(name = "cached_target_files")
+    private final Collection<CachedTargetFile> cachedTargetFiles;
+
+    public RemoteConfigRequest(ClientInfo client, Collection<CachedTargetFile> cachedTargetFiles) {
+        this.client = client;
+        // system tests expect this to be null if we're not holding anything cached
+        this.cachedTargetFiles = (cachedTargetFiles != null && cachedTargetFiles.isEmpty()) ? null : cachedTargetFiles;
     }
 
-    public static class ClientState {
-      @Json(name = "root_version")
-      public long rootVersion = 1L;
+    public ClientInfo getClient() {
+        return this.client;
+    }
+
+    /** Stores client information for Remote Configuration */
+    public static class ClientInfo {
+        @Json(name = "state")
+        private final ClientState clientState;
+
+        private final String id;
+        private final Collection<String> products;
+
+        @Json(name = "client_tracer")
+        private final TracerInfo tracerInfo;
+
+        @Json(name = "client_agent")
+        private final AgentInfo agentInfo = null; // MUST NOT be set
+
+        @Json(name = "is_tracer")
+        private final boolean isTracer = true;
+
+        @Json(name = "is_agent")
+        private final Boolean isAgent = null; // MUST NOT be set;
+
+        private final byte[] capabilities;
+
+        public ClientInfo(
+                ClientState clientState,
+                String id,
+                Collection<String> productNames,
+                TracerInfo tracerInfo,
+                final long capabilities) {
+            this.clientState = clientState;
+            this.id = id;
+            this.products = productNames;
+            this.tracerInfo = tracerInfo;
+
+            // Big-endian encoding of the `long` capabilities, stripping any trailing zero bytes
+            // (except the first one)
+            final int size = Math.max(1, Long.BYTES - Long.numberOfLeadingZeros(capabilities) / 8);
+            this.capabilities = new byte[size];
+            for (int i = size - 1; i >= 0; i--) {
+                this.capabilities[size - i - 1] = (byte) (capabilities >>> (i * 8));
+            }
+        }
+
+        public TracerInfo getTracerInfo() {
+            return this.tracerInfo;
+        }
+
+        public static class ClientState {
+            @Json(name = "root_version")
+            public long rootVersion = 1L;
 
-      @Json(name = "targets_version")
-      public long targetsVersion;
+            @Json(name = "targets_version")
+            public long targetsVersion;
 
-      @Json(name = "config_states")
-      public List<ConfigState> configStates = new ArrayList<>();
+            @Json(name = "config_states")
+            public List<ConfigState> configStates = new ArrayList<>();
 
-      @Json(name = "has_error")
-      public boolean hasError;
+            @Json(name = "has_error")
+            public boolean hasError;
 
-      public String error;
+            public String error;
 
-      @Json(name = "backend_client_state")
-      public String backendClientState;
+            @Json(name = "backend_client_state")
+            public String backendClientState;
 
-      public void setState(
-          long targetsVersion,
-          List<ConfigState> configStates,
-          String error,
-          String backendClientState) {
-        this.targetsVersion = targetsVersion;
-        this.configStates = configStates;
-        this.error = error;
-        this.hasError = error != null && !error.isEmpty();
-        this.backendClientState = backendClientState;
-      }
+            public void setState(
+                    long targetsVersion, List<ConfigState> configStates, String error, String backendClientState) {
+                this.targetsVersion = targetsVersion;
+                this.configStates = configStates;
+                this.error = error;
+                this.hasError = error != null && !error.isEmpty();
+                this.backendClientState = backendClientState;
+            }
 
-      public static class ConfigState {
-        public static final int APPLY_STATE_ACKNOWLEDGED = 2;
-        public static final int APPLY_STATE_ERROR = 3;
+            public static class ConfigState {
+                public static final int APPLY_STATE_ACKNOWLEDGED = 2;
+                public static final int APPLY_STATE_ERROR = 3;
 
-        private String id;
-        private long version;
-        public String product;
+                private String id;
+                private long version;
+                public String product;
 
-        @Json(name = "apply_state")
-        public int applyState;
+                @Json(name = "apply_state")
+                public int applyState;
 
-        @Json(name = "apply_error")
-        public String applyError;
+                @Json(name = "apply_error")
+                public String applyError;
 
-        public void setState(String id, long version, String product, String error) {
-          this.id = id;
-          this.version = version;
-          this.product = product;
-          this.applyState = error == null ? APPLY_STATE_ACKNOWLEDGED : APPLY_STATE_ERROR;
-          this.applyError = error;
+                public void setState(String id, long version, String product, String error) {
+                    this.id = id;
+                    this.version = version;
+                    this.product = product;
+                    this.applyState = error == null ? APPLY_STATE_ACKNOWLEDGED : APPLY_STATE_ERROR;
+                    this.applyError = error;
+                }
+            }
         }
-      }
-    }
 
-    public static class TracerInfo {
-      @Json(name = "runtime_id")
-      private final String runtimeId;
-
-      private final String language = "java";
-
-      private final List<String> tags;
-
-      @Json(name = "tracer_version")
-      private final String tracerVersion;
-
-      @Json(name = "service")
-      private final String serviceName;
-
-      @Json(name = "extra_services")
-      private final List<String> extraServices;
-
-      @Json(name = "env")
-      private final String serviceEnv;
-
-      @Json(name = "app_version")
-      private final String serviceVersion;
-
-      @Json(name = "process_tags")
-      private final List<String> processTags;
-
-      public TracerInfo(
-          String runtimeId,
-          String tracerVersion,
-          String serviceName,
-          List<String> extraServices,
-          String serviceEnv,
-          String serviceVersion,
-          List<String> tags,
-          List<String> processTags) {
-        this.runtimeId = runtimeId;
-        this.tracerVersion = tracerVersion;
-        this.serviceName = serviceName;
-        this.extraServices = extraServices;
-        this.serviceEnv = serviceEnv;
-        this.serviceVersion = serviceVersion;
-        this.tags = tags;
-        this.processTags = processTags;
-      }
-
-      public String getServiceName() {
-        return this.serviceName;
-      }
-
-      public List<String> getExtraServices() {
-        return extraServices;
-      }
-
-      public String getServiceEnv() {
-        return this.serviceEnv;
-      }
-
-      public String getServiceVersion() {
-        return this.serviceVersion;
-      }
-
-      public List<String> getTags() {
-        return tags;
-      }
-
-      public List<String> getProcessTags() {
-        return processTags;
-      }
-    }
+        public static class TracerInfo {
+            @Json(name = "runtime_id")
+            private final String runtimeId;
+
+            private final String language = "java";
+
+            private final List<String> tags;
+
+            @Json(name = "tracer_version")
+            private final String tracerVersion;
+
+            @Json(name = "service")
+            private final String serviceName;
+
+            @Json(name = "extra_services")
+            private final List<String> extraServices;
+
+            @Json(name = "env")
+            private final String serviceEnv;
+
+            @Json(name = "app_version")
+            private final String serviceVersion;
+
+            @Json(name = "process_tags")
+            private final List<String> processTags;
+
+            public TracerInfo(
+                    String runtimeId,
+                    String tracerVersion,
+                    String serviceName,
+                    List<String> extraServices,
+                    String serviceEnv,
+                    String serviceVersion,
+                    List<String> tags,
+                    List<String> processTags) {
+                this.runtimeId = runtimeId;
+                this.tracerVersion = tracerVersion;
+                this.serviceName = serviceName;
+                this.extraServices = extraServices;
+                this.serviceEnv = serviceEnv;
+                this.serviceVersion = serviceVersion;
+                this.tags = tags;
+                this.processTags = processTags;
+            }
+
+            public String getServiceName() {
+                return this.serviceName;
+            }
+
+            public List<String> getExtraServices() {
+                return extraServices;
+            }
+
+            public String getServiceEnv() {
+                return this.serviceEnv;
+            }
+
+            public String getServiceVersion() {
+                return this.serviceVersion;
+            }
+
+            public List<String> getTags() {
+                return tags;
+            }
+
+            public List<String> getProcessTags() {
+                return processTags;
+            }
+        }
 
-    private static class AgentInfo {
-      private final String name;
-      private final String version;
+        private static class AgentInfo {
+            private final String name;
+            private final String version;
 
-      private AgentInfo(String name, String version) {
-        this.name = name;
-        this.version = version;
-      }
-    }
-  }
-
-  public static class CachedTargetFile {
-    public final String path;
-    public final long length;
-    public final List<TargetFileHash> hashes;
-
-    public CachedTargetFile(
-        String path, long length, Map<String /*algo*/, String /*digest*/> hashes) {
-      this.path = path;
-      this.length = length;
-      List<TargetFileHash> hashesList =
-          hashes.entrySet().stream()
-              .map(e -> new TargetFileHash(e.getKey(), e.getValue()))
-              .collect(Collectors.toList());
-      this.hashes = hashesList;
+            private AgentInfo(String name, String version) {
+                this.name = name;
+                this.version = version;
+            }
+        }
     }
 
-    public boolean hashesMatch(Map<String /*algo*/, String /*digest*/> hashesMap) {
-      if (this.hashes == null) {
-        return false;
-      }
+    public static class CachedTargetFile {
+        public final String path;
+        public final long length;
+        public final List<TargetFileHash> hashes;
+
+        public CachedTargetFile(String path, long length, Map<String /*algo*/, String /*digest*/> hashes) {
+            this.path = path;
+            this.length = length;
+            List<TargetFileHash> hashesList = hashes.entrySet().stream()
+                    .map(e -> new TargetFileHash(e.getKey(), e.getValue()))
+                    .collect(Collectors.toList());
+            this.hashes = hashesList;
+        }
 
-      if (hashesMap.size() != this.hashes.size()) {
-        return false;
-      }
+        public boolean hashesMatch(Map<String /*algo*/, String /*digest*/> hashesMap) {
+            if (this.hashes == null) {
+                return false;
+            }
 
-      for (TargetFileHash tfh : hashes) {
-        String digest = hashesMap.get(tfh.algorithm);
-        if (!digest.equals(tfh.hash)) {
-          return false;
-        }
-      }
+            if (hashesMap.size() != this.hashes.size()) {
+                return false;
+            }
 
-      return true;
-    }
+            for (TargetFileHash tfh : hashes) {
+                String digest = hashesMap.get(tfh.algorithm);
+                if (!digest.equals(tfh.hash)) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
 
-    public static class TargetFileHash {
-      public final String algorithm;
-      public final String hash;
+        public static class TargetFileHash {
+            public final String algorithm;
+            public final String hash;
 
-      public TargetFileHash(String algorithm, String hash) {
-        this.algorithm = algorithm;
-        this.hash = hash;
-      }
+            public TargetFileHash(String algorithm, String hash) {
+                this.algorithm = algorithm;
+                this.hash = hash;
+            }
+        }
     }
-  }
 }
diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/RemoteConfigResponse.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/RemoteConfigResponse.java
index 0fcb8482ab8..2cc3a737706 100644
--- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/RemoteConfigResponse.java
+++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/tuf/RemoteConfigResponse.java
@@ -25,211 +25,206 @@
 
 /** Handles responses from Remote Configuration */
 public class RemoteConfigResponse {
-  private static final Logger log = LoggerFactory.getLogger(RemoteConfigResponse.class);
+    private static final Logger log = LoggerFactory.getLogger(RemoteConfigResponse.class);
 
-  @Json(name = "client_configs")
-  public List<String> clientConfigs;
+    @Json(name = "client_configs")
+    public List<String> clientConfigs;
 
-  @Json(name = "targets")
-  private String targetsJson;
+    @Json(name = "targets")
+    private String targetsJson;
 
-  private transient Targets targets;
+    private transient Targets targets;
 
-  @Json(name = "target_files")
-  public List<TargetFile> targetFiles;
+    @Json(name = "target_files")
+    public List<TargetFile> targetFiles;
 
-  public static class Factory {
-    private final JsonAdapter<RemoteConfigResponse> adapterRC;
-    private final JsonAdapter<Targets> adapterTargets;
+    public static class Factory {
+        private final JsonAdapter<RemoteConfigResponse> adapterRC;
+        private final JsonAdapter<Targets> adapterTargets;
 
-    public Factory(Moshi moshi) {
-      this.adapterRC = moshi.adapter(RemoteConfigResponse.class);
-      this.adapterTargets = moshi.adapter(Targets.class);
-    }
-
-    public Optional<RemoteConfigResponse> fromInputStream(InputStream inputStream) {
-      try {
-        RemoteConfigResponse response = adapterRC.fromJson(Okio.buffer(Okio.source(inputStream)));
-        String targetsJsonBase64 = response.targetsJson;
-        if (targetsJsonBase64 == null) {
-          return Optional.empty(); // empty response -- no change
+        public Factory(Moshi moshi) {
+            this.adapterRC = moshi.adapter(RemoteConfigResponse.class);
+            this.adapterTargets = moshi.adapter(Targets.class);
         }
-        byte[] targetsJsonDecoded =
-            Base64.getDecoder().decode(targetsJsonBase64.getBytes(StandardCharsets.ISO_8859_1));
-        if (targetsJsonDecoded.length > 0) {
-          response.targets =
-              adapterTargets.fromJson(
-                  Okio.buffer(Okio.source(new ByteArrayInputStream(targetsJsonDecoded))));
-          response.targets.targetsSignedUntyped = extractUntypedSignedField(targetsJsonDecoded);
+
+        public Optional<RemoteConfigResponse> fromInputStream(InputStream inputStream) {
+            try {
+                RemoteConfigResponse response = adapterRC.fromJson(Okio.buffer(Okio.source(inputStream)));
+                String targetsJsonBase64 = response.targetsJson;
+                if (targetsJsonBase64 == null) {
+                    return Optional.empty(); // empty response -- no change
+                }
+                byte[] targetsJsonDecoded =
+                        Base64.getDecoder().decode(targetsJsonBase64.getBytes(StandardCharsets.ISO_8859_1));
+                if (targetsJsonDecoded.length > 0) {
+                    response.targets = adapterTargets.fromJson(
+                            Okio.buffer(Okio.source(new ByteArrayInputStream(targetsJsonDecoded))));
+                    response.targets.targetsSignedUntyped = extractUntypedSignedField(targetsJsonDecoded);
+                }
+                response.targetsJson = null;
+                return Optional.of(response);
+            } catch (InterruptedIOException ignored) {
+                return Optional.empty();
+            } catch (IOException | RuntimeException e) {
+                throw new RuntimeException("Failed to parse fleet response: " + e.getMessage(), e);
+            }
         }
-        response.targetsJson = null;
-        return Optional.of(response);
-      } catch (InterruptedIOException ignored) {
-        return Optional.empty();
-      } catch (IOException | RuntimeException e) {
-        throw new RuntimeException("Failed to parse fleet response: " + e.getMessage(), e);
-      }
-    }
 
-    private Map<String, Object> extractUntypedSignedField(byte[] targetsJsonDecoded)
-        throws IOException {
-      JsonReader reader =
-          JsonReader.of(Okio.buffer(Okio.source(new ByteArrayInputStream(targetsJsonDecoded))));
-      reader.beginObject();
-      while (reader.peek() == JsonReader.Token.NAME) {
-        String curName = reader.nextName();
-        if (curName.equals("signed")) {
-          return (Map<String, Object>) reader.readJsonValue();
-        } else {
-          reader.skipValue();
+        private Map<String, Object> extractUntypedSignedField(byte[] targetsJsonDecoded) throws IOException {
+            JsonReader reader = JsonReader.of(Okio.buffer(Okio.source(new ByteArrayInputStream(targetsJsonDecoded))));
+            reader.beginObject();
+            while (reader.peek() == JsonReader.Token.NAME) {
+                String curName = reader.nextName();
+                if (curName.equals("signed")) {
+                    return (Map<String, Object>) reader.readJsonValue();
+                } else {
+                    reader.skipValue();
+                }
+            }
+            return null;
         }
-      }
-      return null;
     }
-  }
-
-  public Targets.ConfigTarget getTarget(String configKey) {
-    return this.targets.targetsSigned.targets.get(configKey);
-  }
 
-  public String getTargetsSignature(String keyId) {
-    for (Targets.Signature signature : this.targets.signatures) {
-      if (keyId.equals(signature.keyId)) {
-        return signature.signature;
-      }
+    public Targets.ConfigTarget getTarget(String configKey) {
+        return this.targets.targetsSigned.targets.get(configKey);
     }
 
-    throw new IntegrityCheckException("Missing signature for key " + keyId);
-  }
-
-  public Targets.TargetsSigned getTargetsSigned() {
-    return this.targets.targetsSigned;
-  }
+    public String getTargetsSignature(String keyId) {
+        for (Targets.Signature signature : this.targets.signatures) {
+            if (keyId.equals(signature.keyId)) {
+                return signature.signature;
+            }
+        }
 
-  public Map<String, Object> getUntypedTargetsSigned() {
-    return this.targets.targetsSignedUntyped;
-  }
+        throw new IntegrityCheckException("Missing signature for key " + keyId);
+    }
 
-  public byte[] getFileContents(String configKey) {
+    public Targets.TargetsSigned getTargetsSigned() {
+        return this.targets.targetsSigned;
+    }
 
-    if (targetFiles == null) {
-      throw new MissingContentException("No content for " + configKey);
+    public Map<String, Object> getUntypedTargetsSigned() {
+        return this.targets.targetsSignedUntyped;
     }
 
-    try {
-      for (TargetFile targetFile : this.targetFiles) {
-        if (!configKey.equals(targetFile.path)) {
-          continue;
-        }
+    public byte[] getFileContents(String configKey) {
 
-        Targets.ConfigTarget configTarget = getTarget(configKey);
-        String hashStr;
-        if (configTarget == null
-            || configTarget.hashes == null
-            || (hashStr = configTarget.hashes.get("sha256")) == null) {
-          throw new IntegrityCheckException("No sha256 hash present for " + configKey);
-        }
-        BigInteger expectedHash = new BigInteger(hashStr, 16);
-
-        String raw = targetFile.raw;
-        byte[] decode = Base64.getDecoder().decode(raw);
-        BigInteger gottenHash = sha256(decode);
-        if (!expectedHash.equals(gottenHash)) {
-          throw new IntegrityCheckException(
-              "File "
-                  + configKey
-                  + " does not "
-                  + "have the expected sha256 hash: Expected "
-                  + expectedHash.toString(16)
-                  + ", but got "
-                  + gottenHash.toString(16));
+        if (targetFiles == null) {
+            throw new MissingContentException("No content for " + configKey);
         }
-        if (decode.length != configTarget.length) {
-          throw new IntegrityCheckException(
-              "File "
-                  + configKey
-                  + " does not "
-                  + "have the expected length: Expected "
-                  + configTarget.length
-                  + ", but got "
-                  + decode.length);
+
+        try {
+            for (TargetFile targetFile : this.targetFiles) {
+                if (!configKey.equals(targetFile.path)) {
+                    continue;
+                }
+
+                Targets.ConfigTarget configTarget = getTarget(configKey);
+                String hashStr;
+                if (configTarget == null
+                        || configTarget.hashes == null
+                        || (hashStr = configTarget.hashes.get("sha256")) == null) {
+                    throw new IntegrityCheckException("No sha256 hash present for " + configKey);
+                }
+                BigInteger expectedHash = new BigInteger(hashStr, 16);
+
+                String raw = targetFile.raw;
+                byte[] decode = Base64.getDecoder().decode(raw);
+                BigInteger gottenHash = sha256(decode);
+                if (!expectedHash.equals(gottenHash)) {
+                    throw new IntegrityCheckException("File "
+                            + configKey
+                            + " does not "
+                            + "have the expected sha256 hash: Expected "
+                            + expectedHash.toString(16)
+                            + ", but got "
+                            + gottenHash.toString(16));
+                }
+                if (decode.length != configTarget.length) {
+                    throw new IntegrityCheckException("File "
+                            + configKey
+                            + " does not "
+                            + "have the expected length: Expected "
+                            + configTarget.length
+                            + ", but got "
+                            + decode.length);
+                }
+
+                return decode;
+            }
+        } catch (IntegrityCheckException e) {
+            throw e;
+        } catch (Exception exception) {
+            throw new IntegrityCheckException(
+                    "Could not get file contents from remote config, file " + configKey, exception);
         }
 
-        return decode;
-      }
-    } catch (IntegrityCheckException e) {
-      throw e;
-    } catch (Exception exception) {
-      throw new IntegrityCheckException(
-          "Could not get file contents from remote config, file " + configKey, exception);
+        throw new MissingContentException("No content for " + configKey);
     }
 
-    throw new MissingContentException("No content for " + configKey);
-  }
-
-  private static BigInteger sha256(byte[] bytes) {
-    try {
-      MessageDigest digest = MessageDigest.getInstance("SHA-256");
-      byte[] hash = digest.digest(bytes);
-      return new BigInteger(1, hash);
-    } catch (NoSuchAlgorithmException e) {
-      throw new UndeclaredThrowableException(e);
+    private static BigInteger sha256(byte[] bytes) {
+        try {
+            MessageDigest digest = MessageDigest.getInstance("SHA-256");
+            byte[] hash = digest.digest(bytes);
+            return new BigInteger(1, hash);
+        } catch (NoSuchAlgorithmException e) {
+            throw new UndeclaredThrowableException(e);
+        }
     }
-  }
 
-  public List<String> getClientConfigs() {
-    return this.clientConfigs != null ? this.clientConfigs : Collections.emptyList();
-  }
+    public List<String> getClientConfigs() {
+        return this.clientConfigs != null ? this.clientConfigs : Collections.emptyList();
+    }
 
-  public static class Targets {
-    public List<Signature> signatures;
+    public static class Targets {
+        public List<Signature> signatures;
 
-    @Json(name = "signed")
-    public TargetsSigned targetsSigned;
+        @Json(name = "signed")
+        public TargetsSigned targetsSigned;
 
-    public transient Map<String, Object> targetsSignedUntyped;
+        public transient Map<String, Object> targetsSignedUntyped;
 
-    public static class Signature {
-      @Json(name = "keyid")
-      public String keyId;
+        public static class Signature {
+            @Json(name = "keyid")
+            public String keyId;
 
-      @Json(name = "sig")
-      public String signature;
-    }
+            @Json(name = "sig")
+            public String signature;
+        }
 
-    public static class TargetsSigned {
-      @Json(name = "_type")
-      public String type;
+        public static class TargetsSigned {
+            @Json(name = "_type")
+            public String type;
 
-      public TargetsCustom custom;
-      public Instant expires;
+            public TargetsCustom custom;
+            public Instant expires;
 
-      @Json(name = "spec_version")
-      public String specVersion;
+            @Json(name = "spec_version")
+            public String specVersion;
 
-      public long version;
-      public Map<String, ConfigTarget> targets;
+            public long version;
+            public Map<String, ConfigTarget> targets;
 
-      public static class TargetsCustom {
-        @Json(name = "opaque_backend_state")
-        public String opaqueBackendState;
-      }
-    }
+            public static class TargetsCustom {
+                @Json(name = "opaque_backend_state")
+                public String opaqueBackendState;
+            }
+        }
 
-    public static class ConfigTarget {
-      public ConfigTargetCustom custom;
-      public Map<String, String> hashes;
-      public long length;
+        public static class ConfigTarget {
+            public ConfigTargetCustom custom;
+            public Map<String, String> hashes;
+            public long length;
 
-      public static class ConfigTargetCustom {
-        @Json(name = "v")
-        public long version;
-      }
+            public static class ConfigTargetCustom {
+                @Json(name = "v")
+                public long version;
+            }
+        }
     }
-  }
 
-  public static class TargetFile {
-    public String path;
-    public String raw;
-  }
+    public static class TargetFile {
+        public String path;
+        public String raw;
+    }
 }
diff --git a/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/DefaultConfigurationPollerSpecification.java b/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/DefaultConfigurationPollerSpecification.java
index 51922d9cbfa..de8cfb10301 100644
--- a/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/DefaultConfigurationPollerSpecification.java
+++ b/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/DefaultConfigurationPollerSpecification.java
@@ -72,1417 +72,1350 @@
 @WithConfig(key = "env", value = "my_env")
 @WithConfig(key = "remote_config.integrity_check.enabled", value = "true")
 class DefaultConfigurationPollerSpecification extends DDJavaSpecification {
-  private static final HttpUrl URL = HttpUrl.get("https://example.com/v0.7/config");
-  private static final Request REQUEST = new Request.Builder().url("https://example.com").build();
-  private static final int DEFAULT_POLL_PERIOD = 5000;
-  private static final String KEY_ID = "TEST_KEY_ID";
-  private static final Ed25519PrivateKey PRIVATE_KEY =
-      Ed25519PrivateKey.generate(new SecureRandom());
-  private static final Ed25519PublicKey PUBLIC_KEY = PRIVATE_KEY.derivePublic();
-
-  private static final Moshi MOSHI = new Moshi.Builder().build();
-
-  private final OkHttpClient okHttpClient = mock(OkHttpClient.class);
-  private final AgentTaskScheduler scheduler = mock(AgentTaskScheduler.class);
-
-  @SuppressWarnings("unchecked")
-  private final AgentTaskScheduler.Scheduled<ConfigurationPoller> scheduled =
-      mock(AgentTaskScheduler.Scheduled.class);
-
-  private final Call call = mock(Call.class);
-
-  private DefaultConfigurationPoller poller;
-  private AgentTaskScheduler.Task<ConfigurationPoller> task;
-  private Request request;
-  private Supplier<String> configUrlSupplier = URL::toString;
-
-  private Response buildOKResponse(String bodyStr) {
-    ResponseBody body = ResponseBody.create(MediaType.get("application/json"), bodyStr);
-    return new Response.Builder()
-        .request(REQUEST)
-        .protocol(Protocol.HTTP_1_1)
-        .message("OK")
-        .body(body)
-        .code(200)
-        .build();
-  }
-
-  @BeforeEach
-  void setup() {
-    // value derived from the randomly generated keypair, so it cannot be a @WithConfig literal
-    injectSysConfig("dd.rc.targets.key", new BigInteger(1, PUBLIC_KEY.toByteArray()).toString(16));
-    poller =
-        new DefaultConfigurationPoller(
-            Config.get(), "0.0.0", "", "", () -> configUrlSupplier.get(), okHttpClient, scheduler);
-  }
-
-  // ----- Tests -----
-
-  @Test
-  void issuesNoRequestIfThereAreNoSubscriptions() {
-    start();
-
-    task.run(poller);
-    verify(okHttpClient, never()).newCall(any());
-
-    poller.addListener(
-        Product.ASM_DD,
-        deserializerThrowing("should not be called"),
-        (configKey, config, hinter) -> {});
-    poller.removeListeners(Product.ASM_DD);
-    task.run(poller);
-    verify(okHttpClient, never()).newCall(any());
-
-    poller.stop();
-    verify(scheduled).cancel();
-  }
-
-  @Test
-  void issuesRequestIfThereIsASubscription() throws IOException {
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-
-    poller.addListener(Product.ASM_DD, parseDeserializer(), listener);
-    start();
-
-    stubHttp(buildOKResponse(SAMPLE_RESP_BODY));
-    task.run(poller);
-
-    verify(listener).accept(any(), any(), any());
-
-    String json = bodyJson();
-    assertThatJson(json).node("cached_target_files").isAbsent();
-    assertThatJson(json).node("client.client_tracer.app_version").isEqualTo("");
-    assertThatJson(json).node("client.client_tracer.env").isEqualTo("my_env");
-    assertThatJson(json).node("client.client_tracer.language").isEqualTo("java");
-    assertThatJson(json).node("client.client_tracer.runtime_id").isString().isNotEmpty();
-    assertThatJson(json).node("client.client_tracer.service").isEqualTo("my_service");
-    assertThatJson(json).node("client.client_tracer.tracer_version").isEqualTo("0.0.0");
-    assertThatJson(json).node("client.id").isString().hasSize(36);
-    assertThatJson(json).node("client.is_tracer").isEqualTo(true);
-    assertThatJson(json).node("client.products").isArray().containsExactly("ASM_DD");
-    assertThatJson(json).node("client.state.config_states").isArray().isEmpty();
-    assertThatJson(json).node("client.state.has_error").isEqualTo(false);
-    assertThatJson(json).node("client.state.root_version").isEqualTo(1);
-    assertThatJson(json).node("client.state.targets_version").isEqualTo(0);
-  }
-
-  @Test
-  void issuesNoRequestIfTheConfigUrlSupplierReturnsNull() {
-    ConfigurationDeserializer<Object> deserializer = deserializerMock();
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-    configUrlSupplier = () -> null;
-
-    poller.addListener(Product.ASM_DD, deserializer, listener);
-    start();
-
-    task.run(poller);
-
-    verify(okHttpClient, never()).newCall(any());
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  void onceTheSupplierProvidesAUrlItIsNotCalledAnymore() throws IOException {
-    ConfigurationDeserializer<Object> deserializer = deserializerMock();
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-    configUrlSupplier = mock(Supplier.class);
-    when(configUrlSupplier.get()).thenReturn(URL.toString());
-
-    poller.addListener(Product.ASM_DD, deserializer, listener);
-    start();
-
-    when(deserializer.deserialize(any())).thenReturn(true);
-    stubHttp(buildOKResponse(SAMPLE_RESP_BODY), buildOKResponse(SAMPLE_RESP_BODY));
-    task.run(poller);
-    task.run(poller);
-
-    verify(configUrlSupplier, times(1)).get();
-    verify(okHttpClient, times(2)).newCall(any());
-    verify(deserializer, times(1)).deserialize(any());
-    verify(listener, times(1)).accept(any(), any(), any());
-  }
-
-  @Test
-  void handleProductListenersPerConfig() throws IOException {
-    ConfigurationDeserializer<Object> deserializer = deserializerMock();
-    ConfigurationChangesTypedListener<Object> activationListener = typedListener();
-    ConfigurationChangesTypedListener<Object> sampleRateListener = typedListener();
-
-    String activationKey = "datadog/2/ASM_FEATURES/asm_features_activation/config";
-    String sampleRateKey = "datadog/2/ASM_FEATURES/api_security/sample_rate";
-
-    String respBody =
-        toJson(
-            map(
+    private static final HttpUrl URL = HttpUrl.get("https://example.com/v0.7/config");
+    private static final Request REQUEST =
+            new Request.Builder().url("https://example.com").build();
+    private static final int DEFAULT_POLL_PERIOD = 5000;
+    private static final String KEY_ID = "TEST_KEY_ID";
+    private static final Ed25519PrivateKey PRIVATE_KEY = Ed25519PrivateKey.generate(new SecureRandom());
+    private static final Ed25519PublicKey PUBLIC_KEY = PRIVATE_KEY.derivePublic();
+
+    private static final Moshi MOSHI = new Moshi.Builder().build();
+
+    private final OkHttpClient okHttpClient = mock(OkHttpClient.class);
+    private final AgentTaskScheduler scheduler = mock(AgentTaskScheduler.class);
+
+    @SuppressWarnings("unchecked")
+    private final AgentTaskScheduler.Scheduled<ConfigurationPoller> scheduled =
+            mock(AgentTaskScheduler.Scheduled.class);
+
+    private final Call call = mock(Call.class);
+
+    private DefaultConfigurationPoller poller;
+    private AgentTaskScheduler.Task<ConfigurationPoller> task;
+    private Request request;
+    private Supplier<String> configUrlSupplier = URL::toString;
+
+    private Response buildOKResponse(String bodyStr) {
+        ResponseBody body = ResponseBody.create(MediaType.get("application/json"), bodyStr);
+        return new Response.Builder()
+                .request(REQUEST)
+                .protocol(Protocol.HTTP_1_1)
+                .message("OK")
+                .body(body)
+                .code(200)
+                .build();
+    }
+
+    @BeforeEach
+    void setup() {
+        // value derived from the randomly generated keypair, so it cannot be a @WithConfig literal
+        injectSysConfig("dd.rc.targets.key", new BigInteger(1, PUBLIC_KEY.toByteArray()).toString(16));
+        poller = new DefaultConfigurationPoller(
+                Config.get(), "0.0.0", "", "", () -> configUrlSupplier.get(), okHttpClient, scheduler);
+    }
+
+    // ----- Tests -----
+
+    @Test
+    void issuesNoRequestIfThereAreNoSubscriptions() {
+        start();
+
+        task.run(poller);
+        verify(okHttpClient, never()).newCall(any());
+
+        poller.addListener(
+                Product.ASM_DD, deserializerThrowing("should not be called"), (configKey, config, hinter) -> {});
+        poller.removeListeners(Product.ASM_DD);
+        task.run(poller);
+        verify(okHttpClient, never()).newCall(any());
+
+        poller.stop();
+        verify(scheduled).cancel();
+    }
+
+    @Test
+    void issuesRequestIfThereIsASubscription() throws IOException {
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+
+        poller.addListener(Product.ASM_DD, parseDeserializer(), listener);
+        start();
+
+        stubHttp(buildOKResponse(SAMPLE_RESP_BODY));
+        task.run(poller);
+
+        verify(listener).accept(any(), any(), any());
+
+        String json = bodyJson();
+        assertThatJson(json).node("cached_target_files").isAbsent();
+        assertThatJson(json).node("client.client_tracer.app_version").isEqualTo("");
+        assertThatJson(json).node("client.client_tracer.env").isEqualTo("my_env");
+        assertThatJson(json).node("client.client_tracer.language").isEqualTo("java");
+        assertThatJson(json).node("client.client_tracer.runtime_id").isString().isNotEmpty();
+        assertThatJson(json).node("client.client_tracer.service").isEqualTo("my_service");
+        assertThatJson(json).node("client.client_tracer.tracer_version").isEqualTo("0.0.0");
+        assertThatJson(json).node("client.id").isString().hasSize(36);
+        assertThatJson(json).node("client.is_tracer").isEqualTo(true);
+        assertThatJson(json).node("client.products").isArray().containsExactly("ASM_DD");
+        assertThatJson(json).node("client.state.config_states").isArray().isEmpty();
+        assertThatJson(json).node("client.state.has_error").isEqualTo(false);
+        assertThatJson(json).node("client.state.root_version").isEqualTo(1);
+        assertThatJson(json).node("client.state.targets_version").isEqualTo(0);
+    }
+
+    @Test
+    void issuesNoRequestIfTheConfigUrlSupplierReturnsNull() {
+        ConfigurationDeserializer<Object> deserializer = deserializerMock();
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+        configUrlSupplier = () -> null;
+
+        poller.addListener(Product.ASM_DD, deserializer, listener);
+        start();
+
+        task.run(poller);
+
+        verify(okHttpClient, never()).newCall(any());
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void onceTheSupplierProvidesAUrlItIsNotCalledAnymore() throws IOException {
+        ConfigurationDeserializer<Object> deserializer = deserializerMock();
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+        configUrlSupplier = mock(Supplier.class);
+        when(configUrlSupplier.get()).thenReturn(URL.toString());
+
+        poller.addListener(Product.ASM_DD, deserializer, listener);
+        start();
+
+        when(deserializer.deserialize(any())).thenReturn(true);
+        stubHttp(buildOKResponse(SAMPLE_RESP_BODY), buildOKResponse(SAMPLE_RESP_BODY));
+        task.run(poller);
+        task.run(poller);
+
+        verify(configUrlSupplier, times(1)).get();
+        verify(okHttpClient, times(2)).newCall(any());
+        verify(deserializer, times(1)).deserialize(any());
+        verify(listener, times(1)).accept(any(), any(), any());
+    }
+
+    @Test
+    void handleProductListenersPerConfig() throws IOException {
+        ConfigurationDeserializer<Object> deserializer = deserializerMock();
+        ConfigurationChangesTypedListener<Object> activationListener = typedListener();
+        ConfigurationChangesTypedListener<Object> sampleRateListener = typedListener();
+
+        String activationKey = "datadog/2/ASM_FEATURES/asm_features_activation/config";
+        String sampleRateKey = "datadog/2/ASM_FEATURES/api_security/sample_rate";
+
+        String respBody = toJson(map(
                 "client_configs", list(activationKey, sampleRateKey),
                 "roots", list(),
                 "target_files",
-                    list(
-                        map("path", activationKey, "raw", b64("{\"asm\":{\"enabled\":true}}")),
-                        map(
-                            "path",
-                            sampleRateKey,
-                            "raw",
-                            b64("{\"api_security\": {\"request_sample_rate\": 0.1}"))),
+                        list(
+                                map("path", activationKey, "raw", b64("{\"asm\":{\"enabled\":true}}")),
+                                map(
+                                        "path",
+                                        sampleRateKey,
+                                        "raw",
+                                        b64("{\"api_security\": {\"request_sample_rate\": 0.1}"))),
                 "targets",
-                    signAndBase64EncodeTargets(
-                        map(
-                            "signed",
-                            map(
-                                "expires",
-                                "2022-09-17T12:49:15Z",
-                                "spec_version",
-                                "1.0.0",
-                                "targets",
+                        signAndBase64EncodeTargets(map(
+                                "signed",
                                 map(
-                                    activationKey,
+                                        "expires",
+                                        "2022-09-17T12:49:15Z",
+                                        "spec_version",
+                                        "1.0.0",
+                                        "targets",
                                         map(
-                                            "custom", map("v", 1),
-                                            "hashes",
-                                                map(
-                                                    "sha256",
-                                                    "159658ab85be7207761a4111172b01558394bfc74a1fe1d314f2023f7c656db"),
-                                            "length", 24),
-                                    sampleRateKey,
-                                        map(
-                                            "custom", map("v", 1),
-                                            "hashes",
-                                                map(
-                                                    "sha256",
-                                                    "bc898b7eb75d9fd0ddee1c1a556bc3c528dd41382950aa86e48816f792d01494"),
-                                            "length", 45)),
-                                "version",
-                                1)))));
-
-    String noConfigs = withClientConfigs(SAMPLE_RESP_BODY, list());
-
-    poller.addListener(
-        Product.ASM_FEATURES, "asm_features_activation", deserializer, activationListener);
-    poller.addListener(Product.ASM_FEATURES, "api_security", deserializer, sampleRateListener);
-    start();
-
-    when(deserializer.deserialize(any())).thenReturn(true);
-    stubHttp(buildOKResponse(respBody), buildOKResponse(noConfigs));
-
-    task.run(poller); // apply
-    task.run(poller); // remove all configurations
-
-    // 2 deserializations on apply; accept called once per run (apply + remove) on each listener
-    verify(deserializer, times(2)).deserialize(any());
-    verify(activationListener, times(2)).accept(eq(activationKey), any(), any());
-    verify(sampleRateListener, times(2)).accept(eq(sampleRateKey), any(), any());
-  }
-
-  @Test
-  void processingHappensForAllListeners() throws IOException {
-    ConfigurationDeserializer<Object> deserializer = deserializerMock();
-    List<ConfigurationChangesTypedListener<Object>> listeners = new ArrayList<>();
-    for (int i = 0; i < 5; i++) {
-      listeners.add(typedListener());
-    }
-
-    String respBody =
-        toJson(
-            map(
+                                                activationKey,
+                                                        map(
+                                                                "custom", map("v", 1),
+                                                                "hashes",
+                                                                        map(
+                                                                                "sha256",
+                                                                                "159658ab85be7207761a4111172b01558394bfc74a1fe1d314f2023f7c656db"),
+                                                                "length", 24),
+                                                sampleRateKey,
+                                                        map(
+                                                                "custom", map("v", 1),
+                                                                "hashes",
+                                                                        map(
+                                                                                "sha256",
+                                                                                "bc898b7eb75d9fd0ddee1c1a556bc3c528dd41382950aa86e48816f792d01494"),
+                                                                "length", 45)),
+                                        "version",
+                                        1)))));
+
+        String noConfigs = withClientConfigs(SAMPLE_RESP_BODY, list());
+
+        poller.addListener(Product.ASM_FEATURES, "asm_features_activation", deserializer, activationListener);
+        poller.addListener(Product.ASM_FEATURES, "api_security", deserializer, sampleRateListener);
+        start();
+
+        when(deserializer.deserialize(any())).thenReturn(true);
+        stubHttp(buildOKResponse(respBody), buildOKResponse(noConfigs));
+
+        task.run(poller); // apply
+        task.run(poller); // remove all configurations
+
+        // 2 deserializations on apply; accept called once per run (apply + remove) on each listener
+        verify(deserializer, times(2)).deserialize(any());
+        verify(activationListener, times(2)).accept(eq(activationKey), any(), any());
+        verify(sampleRateListener, times(2)).accept(eq(sampleRateKey), any(), any());
+    }
+
+    @Test
+    void processingHappensForAllListeners() throws IOException {
+        ConfigurationDeserializer<Object> deserializer = deserializerMock();
+        List<ConfigurationChangesTypedListener<Object>> listeners = new ArrayList<>();
+        for (int i = 0; i < 5; i++) {
+            listeners.add(typedListener());
+        }
+
+        String respBody = toJson(map(
                 "client_configs",
-                    list(
-                        "datadog/2/ASM_FEATURES/asm_features_activation/config",
-                        "foo/ASM_DD/bar/config",
-                        "foo/ASM/bar/config",
-                        "foo/ASM_DATA/bar/config",
-                        "foo/LIVE_DEBUGGING/bar/config"),
+                        list(
+                                "datadog/2/ASM_FEATURES/asm_features_activation/config",
+                                "foo/ASM_DD/bar/config",
+                                "foo/ASM/bar/config",
+                                "foo/ASM_DATA/bar/config",
+                                "foo/LIVE_DEBUGGING/bar/config"),
                 "roots", list(),
                 "target_files",
-                    list(
-                        map(
-                            "path",
-                            "datadog/2/ASM_FEATURES/asm_features_activation/config",
-                            "raw",
-                            b64("{\"asm\":{\"enabled\":true}}")),
-                        map("path", "foo/ASM_DD/bar/config", "raw", ""),
-                        map("path", "foo/ASM/bar/config", "raw", ""),
-                        map("path", "foo/ASM_DATA/bar/config", "raw", ""),
-                        map("path", "foo/LIVE_DEBUGGING/bar/config", "raw", "")),
+                        list(
+                                map(
+                                        "path",
+                                        "datadog/2/ASM_FEATURES/asm_features_activation/config",
+                                        "raw",
+                                        b64("{\"asm\":{\"enabled\":true}}")),
+                                map("path", "foo/ASM_DD/bar/config", "raw", ""),
+                                map("path", "foo/ASM/bar/config", "raw", ""),
+                                map("path", "foo/ASM_DATA/bar/config", "raw", ""),
+                                map("path", "foo/LIVE_DEBUGGING/bar/config", "raw", "")),
                 "targets",
-                    signAndBase64EncodeTargets(
-                        map(
-                            "signed",
-                            map(
-                                "expires",
-                                "2022-09-17T12:49:15Z",
-                                "spec_version",
-                                "1.0.0",
-                                "targets",
+                        signAndBase64EncodeTargets(map(
+                                "signed",
                                 map(
-                                    "datadog/2/ASM_FEATURES/asm_features_activation/config",
+                                        "expires",
+                                        "2022-09-17T12:49:15Z",
+                                        "spec_version",
+                                        "1.0.0",
+                                        "targets",
                                         map(
-                                            "custom", map("v", 1),
-                                            "hashes",
-                                                map(
-                                                    "sha256",
-                                                    "159658ab85be7207761a4111172b01558394bfc74a1fe1d314f2023f7c656db"),
-                                            "length", 24),
-                                    "foo/ASM_DD/bar/config", emptyTarget(),
-                                    "foo/ASM/bar/config", emptyTarget(),
-                                    "foo/ASM_DATA/bar/config", emptyTarget(),
-                                    "foo/LIVE_DEBUGGING/bar/config", emptyTarget()),
-                                "version",
-                                1)))));
-
-    poller.addListener(Product.ASM_DD, deserializer, listeners.get(1));
-    poller.addListener(Product.ASM, deserializer, listeners.get(2));
-    poller.addListener(Product.ASM_DATA, deserializer, listeners.get(3));
-    poller.addListener(Product.LIVE_DEBUGGING, deserializer, listeners.get(0));
-    poller.addListener(Product.ASM_FEATURES, deserializer, listeners.get(4));
-    start();
-
-    when(deserializer.deserialize(any())).thenReturn(true);
-    stubHttp(buildOKResponse(respBody));
-    task.run(poller);
-
-    verify(deserializer, times(5)).deserialize(any());
-    for (ConfigurationChangesTypedListener<Object> listener : listeners) {
-      verify(listener).accept(any(), any(), any());
-    }
-  }
-
-  @Test
-  void reschedulesIfInstructedToDoSo() throws IOException {
-    poller.addListener(
-        Product.ASM_DD,
-        parseDeserializer(),
-        (configKey, config, hinter) -> {
-          hinter.suggestPollingRate(Duration.ofMillis(124));
-          hinter.suggestPollingRate(Duration.ofMillis(123));
-          hinter.suggestPollingRate(Duration.ofMillis(1230)); // higher is ignored
-        });
-    start();
-
-    when(scheduler.scheduleAtFixedRate(any(), eq(poller), eq(123L), eq(123L), eq(MILLISECONDS)))
-        .thenAnswer(invocation -> scheduled);
-    stubHttp(buildOKResponse(SAMPLE_RESP_BODY));
-    task.run(poller);
-
-    verify(scheduler).scheduleAtFixedRate(any(), eq(poller), eq(123L), eq(123L), eq(MILLISECONDS));
-    verify(scheduled).cancel();
-  }
-
-  @Test
-  void setsCachedFilesAndConfigStateOnSecondRequest() throws IOException {
-    poller.addListener(Product.ASM_DD, parseDeserializer(), (configKey, config, hinter) -> {});
-    start();
-
-    stubHttp(buildOKResponse(SAMPLE_RESP_BODY), buildOKResponse(SAMPLE_RESP_BODY));
-    task.run(poller);
-    task.run(poller);
-
-    verify(okHttpClient, times(2)).newCall(any());
-
-    Map<String, Object> body = parseBody();
-    List<Object> cachedTargetFiles = asList(body.get("cached_target_files"));
-    assertEquals(1, cachedTargetFiles.size());
-    Map<String, Object> cached = asMap(cachedTargetFiles.get(0));
-    assertEquals(
-        list(
-            map(
-                "algorithm",
-                "sha256",
-                "hash",
-                "6302258236e6051216b950583ec7136d946b463c17cbe64384ba5d566324819")),
-        cached.get("hashes"));
-    assertEquals(919L, asLong(cached.get("length")));
-    assertEquals("employee/ASM_DD/1.recommended.json/config", cached.get("path"));
-
-    Map<String, Object> state = clientState(body);
-    assertEquals("foobar", state.get("backend_client_state"));
-    List<Object> configStates = asList(state.get("config_states"));
-    assertEquals(1, configStates.size());
-    Map<String, Object> configState = asMap(configStates.get(0));
-    assertEquals("1.recommended.json", configState.get("id"));
-    assertEquals("ASM_DD", configState.get("product"));
-    assertEquals(1L, asLong(configState.get("version")));
-  }
-
-  @Test
-  void removesCachedFileIfConfigurationIsPulled() throws IOException {
-    poller.addListener(Product.ASM_DD, parseDeserializer(), (configKey, config, hinter) -> {});
-    start();
-
-    String noConfigs = withClientConfigs(SAMPLE_RESP_BODY, list());
-    stubHttp(
-        buildOKResponse(SAMPLE_RESP_BODY),
-        buildOKResponse(noConfigs),
-        buildOKResponse(SAMPLE_RESP_BODY));
-    task.run(poller);
-    task.run(poller);
-    task.run(poller);
-
-    Map<String, Object> body = parseBody();
-    assertNull(body.get("cached_target_files"));
-  }
-
-  @Test
-  void doesNotUpdateTargetsVersionNumberIfThereIsAnError() throws IOException {
-    poller.addListener(Product.ASM_DD, parseDeserializer(), (configKey, config, hinter) -> {});
-    start();
-
-    Map<String, Object> errored = parseMap(SAMPLE_RESP_BODY);
-    errored.put("target_files", list());
-    Map<String, Object> targets = decodeTargets(errored.get("targets"));
-    asMap(asMap(targets.get("signed")).get("targets"))
-        .remove("employee/ASM_DD/1.recommended.json/config");
-    asMap(targets.get("signed")).put("version", 42);
-    errored.put("targets", signAndBase64EncodeTargets(targets));
-
-    stubHttp(
-        buildOKResponse(SAMPLE_RESP_BODY),
-        buildOKResponse(toJson(errored)),
-        buildOKResponse(SAMPLE_RESP_BODY));
-    task.run(poller);
-    task.run(poller);
-    task.run(poller);
-
-    Map<String, Object> body = parseBody();
-    assertNull(body.get("cached_target_files")); // previous hash should be cleared too
-    Map<String, Object> state = clientState(body);
-    assertEquals("foobar", state.get("backend_client_state"));
-    assertTrue(asList(state.get("config_states")).isEmpty());
-    assertEquals(Boolean.TRUE, state.get("has_error"));
-    assertEquals(
-        "Told to apply config for employee/ASM_DD/1.recommended.json/config but no corresponding entry "
-            + "exists in targets.targets_signed.targets",
-        state.get("error"));
-    assertEquals(1L, asLong(state.get("root_version")));
-    assertEquals(23337393L, asLong(state.get("targets_version")));
-  }
-
-  @Test
-  void appliesConfigurationOnlyIfTheHashHasChanged() throws IOException {
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-    String configKey = "employee/ASM_DD/1.recommended.json/config";
-
-    poller.addListener(Product.ASM_DD, parseDeserializer(), listener);
-    start();
-
-    Map<String, Object> changed = parseMap(SAMPLE_RESP_BODY);
-    List<Object> targetFiles = asList(changed.get("target_files"));
-    byte[] fileDecoded = Base64.getDecoder().decode((String) asMap(targetFiles.get(0)).get("raw"));
-    byte[] newFile = Arrays.copyOf(fileDecoded, fileDecoded.length + 1);
-    newFile[fileDecoded.length] = '\n';
-    asMap(targetFiles.get(0)).put("raw", Base64.getEncoder().encodeToString(newFile));
-    Map<String, Object> targets = decodeTargets(changed.get("targets"));
-    Map<String, Object> targetEntry =
-        asMap(asMap(asMap(targets.get("signed")).get("targets")).get(configKey));
-    asMap(targetEntry.get("hashes")).put("sha256", sha256(newFile).toString(16));
-    targetEntry.put("length", asLong(targetEntry.get("length")) + 1);
-    changed.put("targets", signAndBase64EncodeTargets(targets));
-
-    stubHttp(
-        buildOKResponse(SAMPLE_RESP_BODY),
-        buildOKResponse(SAMPLE_RESP_BODY),
-        buildOKResponse(toJson(changed)));
-    task.run(poller);
-    task.run(poller);
-    task.run(poller);
-
-    // applied once on the first run (unchanged hash on the second), once again when the hash
-    // changed
-    verify(listener, times(2)).accept(eq(configKey), notNull(), any());
-  }
-
-  @Test
-  void configurationCannotBeAppliedWithoutHashes() throws IOException {
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-    String configKey = "employee/ASM_DD/1.recommended.json/config";
-
-    poller.addListener(Product.ASM_DD, parseDeserializer(), listener);
-    start();
-
-    Map<String, Object> noHashes = parseMap(SAMPLE_RESP_BODY);
-    Map<String, Object> targets = decodeTargets(noHashes.get("targets"));
-    asMap(asMap(asMap(asMap(targets.get("signed")).get("targets")).get(configKey)).get("hashes"))
-        .remove("sha256");
-    noHashes.put("targets", signAndBase64EncodeTargets(targets));
-
-    stubHttp(buildOKResponse(toJson(noHashes)), buildOKResponse(SAMPLE_RESP_BODY));
-    task.run(poller);
-    task.run(poller);
-
-    verify(listener).accept(eq(configKey), any(), any());
-
-    Map<String, Object> state = clientState(parseBody());
-    assertEquals(0, asList(state.get("config_states")).size());
-    assertEquals("No sha256 hash present for " + configKey, state.get("error"));
-    assertEquals(0L, asLong(state.get("targets_version")));
-  }
-
-  @Test
-  void encodedFileIsNotValidBase64Data() throws IOException {
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-
-    poller.addListener(Product.ASM_DD, parseDeserializer(), listener);
-    start();
-
-    Map<String, Object> badBase64 = parseMap(SAMPLE_RESP_BODY);
-    List<Object> targetFiles = asList(badBase64.get("target_files"));
-    byte[] fileDecoded = Base64.getDecoder().decode((String) asMap(targetFiles.get(0)).get("raw"));
-    asMap(targetFiles.get(0)).put("raw", Base64.getEncoder().encodeToString(fileDecoded) + "##");
-
-    stubHttp(buildOKResponse(toJson(badBase64)), buildOKResponse(SAMPLE_RESP_BODY));
-    task.run(poller);
-    task.run(poller);
-
-    verify(listener).accept(any(), any(), any());
-
-    Map<String, Object> state = clientState(parseBody());
-    assertEquals(
-        "Could not get file contents from remote config, file employee/ASM_DD/1.recommended.json/config",
-        state.get("error"));
-  }
-
-  @Test
-  void deserializerCanReturnNullToIndicateNoConfigShouldBeApplied() throws IOException {
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-
-    poller.addListener(Product.ASM_DD, content -> null, listener);
-    start();
-
-    stubHttp(buildOKResponse(SAMPLE_RESP_BODY));
-    task.run(poller);
-
-    verify(listener, never()).accept(any(), any(), any());
-  }
-
-  @Test
-  void rejectsConfigurationIfTheHashIsWrong() throws IOException {
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-    String configKey = "employee/ASM_DD/1.recommended.json/config";
-
-    poller.addListener(Product.ASM_DD, parseDeserializer(), listener);
-    start();
-
-    Map<String, Object> wrongHash = parseMap(SAMPLE_RESP_BODY);
-    Map<String, Object> targets = decodeTargets(wrongHash.get("targets"));
-    asMap(asMap(asMap(asMap(targets.get("signed")).get("targets")).get(configKey)).get("hashes"))
-        .put("sha256", "0");
-    wrongHash.put("targets", signAndBase64EncodeTargets(targets));
-
-    stubHttp(buildOKResponse(toJson(wrongHash)));
-    task.run(poller);
-
-    verify(listener, never()).accept(any(), any(), any());
-  }
-
-  @Test
-  void acceptsAnEmptyObjectAsAResponseToIndicateNoChanges() throws IOException {
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-    ConfigurationDeserializer<Object> deserializer = deserializerMock();
-
-    poller.addListener(Product.ASM_DD, deserializer, listener);
-    start();
-
-    stubHttp(buildOKResponse("{}"));
-    task.run(poller);
-
-    verifyNoInteractions(deserializer);
-    verifyNoInteractions(listener);
-  }
-
-  @Test
-  void acceptsHttp204AsAResponseToIndicateNoChanges() throws IOException {
-    Response resp =
-        new Response.Builder()
-            .request(REQUEST)
-            .protocol(Protocol.HTTP_1_1)
-            .message("No Content")
-            .body(ResponseBody.create(MediaType.parse("application/json"), ""))
-            .code(204)
-            .build();
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-    ConfigurationDeserializer<Object> deserializer = deserializerMock();
-
-    poller.addListener(Product.ASM_DD, deserializer, listener);
-    start();
-
-    stubHttp(resp);
-    task.run(poller);
-
-    verifyNoInteractions(deserializer);
-    verifyNoInteractions(listener);
-  }
-
-  @Test
-  void appliesAndRemoveCalledForProductListener() throws IOException {
-    ProductListener listener = mock(ProductListener.class);
-    String cfgWithoutAsm = cfgWithoutAsm();
-
-    poller.addListener(Product.ASM_DD, listener);
-    start();
-
-    stubHttp(
-        buildOKResponse(SAMPLE_RESP_BODY),
-        buildOKResponse(SAMPLE_RESP_BODY),
-        buildOKResponse(cfgWithoutAsm),
-        buildOKResponse(cfgWithoutAsm));
-    task.run(poller); // accept + commit
-    task.run(poller); // no commit, no change
-    task.run(poller); // remove + commit
-    task.run(poller); // no commit, no change
-
-    verify(listener, times(1)).accept(any(), notNull(), any());
-    verify(listener, times(1)).remove(any(), any());
-    verify(listener, times(2)).commit(any());
-  }
-
-  @Test
-  void unappliesConfigurationsItHasStoppedSeeing() throws IOException {
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-    String cfgWithoutAsm = cfgWithoutAsm();
-
-    poller.addListener(Product.ASM_DD, parseDeserializer(), listener);
-    start();
-
-    stubHttp(
-        buildOKResponse(SAMPLE_RESP_BODY),
-        buildOKResponse(cfgWithoutAsm),
-        buildOKResponse(cfgWithoutAsm));
-    task.run(poller); // accept with non-null config
-    task.run(poller); // unapply (accept with null config)
-    task.run(poller); // nothing more
-
-    verify(listener, times(1)).accept(any(), notNull(), any());
-    verify(listener, times(1)).accept(any(), isNull(), any());
-  }
-
-  @Test
-  void supportMultipleConfigurations() throws IOException {
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-    String recommended = "employee/ASM_DD/1.recommended.json/config";
-    String suggested = "employee/ASM_DD/2.suggested.json/config";
-    String multiConfigs = withClientConfigs(SAMPLE_RESP_BODY, list(recommended, suggested));
-    String noConfigs = withClientConfigs(SAMPLE_RESP_BODY, list());
-
-    poller.addListener(Product.ASM_DD, parseDeserializer(), listener);
-    start();
-
-    stubHttp(
-        buildOKResponse(SAMPLE_RESP_BODY), // apply first configuration
-        buildOKResponse(multiConfigs), // apply second configuration
-        buildOKResponse(SAMPLE_RESP_BODY), // remove second configuration
-        buildOKResponse(noConfigs)); // remove all configurations
-    task.run(poller);
-    task.run(poller);
-    task.run(poller);
-    task.run(poller);
-
-    verify(listener, times(1)).accept(eq(recommended), notNull(), any());
-    verify(listener, times(1)).accept(eq(suggested), notNull(), any());
-    verify(listener, times(1)).accept(eq(suggested), isNull(), any());
-    verify(listener, times(1)).accept(eq(recommended), isNull(), any());
-  }
-
-  @Test
-  void exceptionApplyingOneConfigShouldNotPreventOthersFromBeingApplied() throws IOException {
-    String newConfigId = "1ba66cc9-146a-3479-9e66-2b63fd580f48";
-    String newConfigKey = "datadog/2/LIVE_DEBUGGING/" + newConfigId + "/config";
-
-    poller.addListener(
-        Product.ASM_DD,
-        parseDeserializer(),
-        (configKey, config, hinter) -> {
-          throw new RuntimeException("throw here");
+                                                "datadog/2/ASM_FEATURES/asm_features_activation/config",
+                                                        map(
+                                                                "custom", map("v", 1),
+                                                                "hashes",
+                                                                        map(
+                                                                                "sha256",
+                                                                                "159658ab85be7207761a4111172b01558394bfc74a1fe1d314f2023f7c656db"),
+                                                                "length", 24),
+                                                "foo/ASM_DD/bar/config", emptyTarget(),
+                                                "foo/ASM/bar/config", emptyTarget(),
+                                                "foo/ASM_DATA/bar/config", emptyTarget(),
+                                                "foo/LIVE_DEBUGGING/bar/config", emptyTarget()),
+                                        "version",
+                                        1)))));
+
+        poller.addListener(Product.ASM_DD, deserializer, listeners.get(1));
+        poller.addListener(Product.ASM, deserializer, listeners.get(2));
+        poller.addListener(Product.ASM_DATA, deserializer, listeners.get(3));
+        poller.addListener(Product.LIVE_DEBUGGING, deserializer, listeners.get(0));
+        poller.addListener(Product.ASM_FEATURES, deserializer, listeners.get(4));
+        start();
+
+        when(deserializer.deserialize(any())).thenReturn(true);
+        stubHttp(buildOKResponse(respBody));
+        task.run(poller);
+
+        verify(deserializer, times(5)).deserialize(any());
+        for (ConfigurationChangesTypedListener<Object> listener : listeners) {
+            verify(listener).accept(any(), any(), any());
+        }
+    }
+
+    @Test
+    void reschedulesIfInstructedToDoSo() throws IOException {
+        poller.addListener(Product.ASM_DD, parseDeserializer(), (configKey, config, hinter) -> {
+            hinter.suggestPollingRate(Duration.ofMillis(124));
+            hinter.suggestPollingRate(Duration.ofMillis(123));
+            hinter.suggestPollingRate(Duration.ofMillis(1230)); // higher is ignored
         });
-    poller.addListener(
-        Product.LIVE_DEBUGGING, parseDeserializer(), (configKey, config, hinter) -> {});
-    start();
-
-    Map<String, Object> withExtra = parseMap(SAMPLE_RESP_BODY);
-    asList(withExtra.get("client_configs")).add(newConfigKey);
-    Map<String, Object> targets = decodeTargets(withExtra.get("targets"));
-    asMap(asMap(targets.get("signed")).get("targets"))
-        .put(
-            newConfigKey,
-            map(
-                "custom", map("v", 3),
-                "hashes",
-                    map(
+        start();
+
+        when(scheduler.scheduleAtFixedRate(any(), eq(poller), eq(123L), eq(123L), eq(MILLISECONDS)))
+                .thenAnswer(invocation -> scheduled);
+        stubHttp(buildOKResponse(SAMPLE_RESP_BODY));
+        task.run(poller);
+
+        verify(scheduler).scheduleAtFixedRate(any(), eq(poller), eq(123L), eq(123L), eq(MILLISECONDS));
+        verify(scheduled).cancel();
+    }
+
+    @Test
+    void setsCachedFilesAndConfigStateOnSecondRequest() throws IOException {
+        poller.addListener(Product.ASM_DD, parseDeserializer(), (configKey, config, hinter) -> {});
+        start();
+
+        stubHttp(buildOKResponse(SAMPLE_RESP_BODY), buildOKResponse(SAMPLE_RESP_BODY));
+        task.run(poller);
+        task.run(poller);
+
+        verify(okHttpClient, times(2)).newCall(any());
+
+        Map<String, Object> body = parseBody();
+        List<Object> cachedTargetFiles = asList(body.get("cached_target_files"));
+        assertEquals(1, cachedTargetFiles.size());
+        Map<String, Object> cached = asMap(cachedTargetFiles.get(0));
+        assertEquals(
+                list(map(
+                        "algorithm",
                         "sha256",
-                        "7a38bf81f383f69433ad6e900d35b3e2385593f76a7b7ab5d4355b8ba41ee24b"),
-                "length", "{\"foo\":\"bar\"}".length()));
-    asList(withExtra.get("target_files"))
-        .add(map("path", newConfigKey, "raw", b64("{\"foo\":\"bar\"}")));
-    withExtra.put("targets", signAndBase64EncodeTargets(targets));
-
-    stubHttp(buildOKResponse(toJson(withExtra)), buildOKResponse(SAMPLE_RESP_BODY));
-    task.run(poller);
-    task.run(poller);
-
-    Map<String, Object> body = parseBody();
-    List<Object> configStates = asList(clientState(body).get("config_states"));
-    assertEquals(2, configStates.size());
-    Map<String, Object> liveDebuggingConfig = findConfigState(configStates, "LIVE_DEBUGGING");
-    Map<String, Object> asmConfig = findConfigState(configStates, "ASM_DD");
-    assertEquals(newConfigId, liveDebuggingConfig.get("id"));
-    assertEquals("LIVE_DEBUGGING", liveDebuggingConfig.get("product"));
-    assertEquals(3L, asLong(liveDebuggingConfig.get("version")));
-    assertNull(liveDebuggingConfig.get("apply_error"));
-    assertEquals("1.recommended.json", asmConfig.get("id"));
-    assertEquals("ASM_DD", asmConfig.get("product"));
-    assertEquals(1L, asLong(asmConfig.get("version")));
-    assertEquals(APPLY_STATE_ERROR, asInt(asmConfig.get("apply_state")));
-    assertEquals("throw here", asmConfig.get("apply_error"));
-  }
-
-  static Stream<Arguments> badResponsesArguments() {
-    return Stream.of(
-        arguments(
-            "404 with body",
-            new Response.Builder()
-                .request(REQUEST)
-                .protocol(Protocol.HTTP_1_1)
-                .message("Not Found")
-                .code(404)
-                .body(ResponseBody.create(MediaType.get("text/plain"), "not found!"))
-                .build()),
-        arguments(
-            "404 without body",
-            new Response.Builder()
-                .request(REQUEST)
-                .protocol(Protocol.HTTP_1_1)
-                .message("Not Found")
-                .code(404)
-                .build()),
-        arguments(
-            "success, no body",
-            new Response.Builder()
-                .request(REQUEST)
-                .protocol(Protocol.HTTP_1_1)
-                .message("Created")
-                .code(201)
-                .build()),
-        arguments(
-            "not json",
-            new Response.Builder()
+                        "hash",
+                        "6302258236e6051216b950583ec7136d946b463c17cbe64384ba5d566324819")),
+                cached.get("hashes"));
+        assertEquals(919L, asLong(cached.get("length")));
+        assertEquals("employee/ASM_DD/1.recommended.json/config", cached.get("path"));
+
+        Map<String, Object> state = clientState(body);
+        assertEquals("foobar", state.get("backend_client_state"));
+        List<Object> configStates = asList(state.get("config_states"));
+        assertEquals(1, configStates.size());
+        Map<String, Object> configState = asMap(configStates.get(0));
+        assertEquals("1.recommended.json", configState.get("id"));
+        assertEquals("ASM_DD", configState.get("product"));
+        assertEquals(1L, asLong(configState.get("version")));
+    }
+
+    @Test
+    void removesCachedFileIfConfigurationIsPulled() throws IOException {
+        poller.addListener(Product.ASM_DD, parseDeserializer(), (configKey, config, hinter) -> {});
+        start();
+
+        String noConfigs = withClientConfigs(SAMPLE_RESP_BODY, list());
+        stubHttp(buildOKResponse(SAMPLE_RESP_BODY), buildOKResponse(noConfigs), buildOKResponse(SAMPLE_RESP_BODY));
+        task.run(poller);
+        task.run(poller);
+        task.run(poller);
+
+        Map<String, Object> body = parseBody();
+        assertNull(body.get("cached_target_files"));
+    }
+
+    @Test
+    void doesNotUpdateTargetsVersionNumberIfThereIsAnError() throws IOException {
+        poller.addListener(Product.ASM_DD, parseDeserializer(), (configKey, config, hinter) -> {});
+        start();
+
+        Map<String, Object> errored = parseMap(SAMPLE_RESP_BODY);
+        errored.put("target_files", list());
+        Map<String, Object> targets = decodeTargets(errored.get("targets"));
+        asMap(asMap(targets.get("signed")).get("targets")).remove("employee/ASM_DD/1.recommended.json/config");
+        asMap(targets.get("signed")).put("version", 42);
+        errored.put("targets", signAndBase64EncodeTargets(targets));
+
+        stubHttp(
+                buildOKResponse(SAMPLE_RESP_BODY), buildOKResponse(toJson(errored)), buildOKResponse(SAMPLE_RESP_BODY));
+        task.run(poller);
+        task.run(poller);
+        task.run(poller);
+
+        Map<String, Object> body = parseBody();
+        assertNull(body.get("cached_target_files")); // previous hash should be cleared too
+        Map<String, Object> state = clientState(body);
+        assertEquals("foobar", state.get("backend_client_state"));
+        assertTrue(asList(state.get("config_states")).isEmpty());
+        assertEquals(Boolean.TRUE, state.get("has_error"));
+        assertEquals(
+                "Told to apply config for employee/ASM_DD/1.recommended.json/config but no corresponding entry "
+                        + "exists in targets.targets_signed.targets",
+                state.get("error"));
+        assertEquals(1L, asLong(state.get("root_version")));
+        assertEquals(23337393L, asLong(state.get("targets_version")));
+    }
+
+    @Test
+    void appliesConfigurationOnlyIfTheHashHasChanged() throws IOException {
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+        String configKey = "employee/ASM_DD/1.recommended.json/config";
+
+        poller.addListener(Product.ASM_DD, parseDeserializer(), listener);
+        start();
+
+        Map<String, Object> changed = parseMap(SAMPLE_RESP_BODY);
+        List<Object> targetFiles = asList(changed.get("target_files"));
+        byte[] fileDecoded =
+                Base64.getDecoder().decode((String) asMap(targetFiles.get(0)).get("raw"));
+        byte[] newFile = Arrays.copyOf(fileDecoded, fileDecoded.length + 1);
+        newFile[fileDecoded.length] = '\n';
+        asMap(targetFiles.get(0)).put("raw", Base64.getEncoder().encodeToString(newFile));
+        Map<String, Object> targets = decodeTargets(changed.get("targets"));
+        Map<String, Object> targetEntry =
+                asMap(asMap(asMap(targets.get("signed")).get("targets")).get(configKey));
+        asMap(targetEntry.get("hashes")).put("sha256", sha256(newFile).toString(16));
+        targetEntry.put("length", asLong(targetEntry.get("length")) + 1);
+        changed.put("targets", signAndBase64EncodeTargets(targets));
+
+        stubHttp(
+                buildOKResponse(SAMPLE_RESP_BODY), buildOKResponse(SAMPLE_RESP_BODY), buildOKResponse(toJson(changed)));
+        task.run(poller);
+        task.run(poller);
+        task.run(poller);
+
+        // applied once on the first run (unchanged hash on the second), once again when the hash
+        // changed
+        verify(listener, times(2)).accept(eq(configKey), notNull(), any());
+    }
+
+    @Test
+    void configurationCannotBeAppliedWithoutHashes() throws IOException {
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+        String configKey = "employee/ASM_DD/1.recommended.json/config";
+
+        poller.addListener(Product.ASM_DD, parseDeserializer(), listener);
+        start();
+
+        Map<String, Object> noHashes = parseMap(SAMPLE_RESP_BODY);
+        Map<String, Object> targets = decodeTargets(noHashes.get("targets"));
+        asMap(asMap(asMap(asMap(targets.get("signed")).get("targets")).get(configKey))
+                        .get("hashes"))
+                .remove("sha256");
+        noHashes.put("targets", signAndBase64EncodeTargets(targets));
+
+        stubHttp(buildOKResponse(toJson(noHashes)), buildOKResponse(SAMPLE_RESP_BODY));
+        task.run(poller);
+        task.run(poller);
+
+        verify(listener).accept(eq(configKey), any(), any());
+
+        Map<String, Object> state = clientState(parseBody());
+        assertEquals(0, asList(state.get("config_states")).size());
+        assertEquals("No sha256 hash present for " + configKey, state.get("error"));
+        assertEquals(0L, asLong(state.get("targets_version")));
+    }
+
+    @Test
+    void encodedFileIsNotValidBase64Data() throws IOException {
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+
+        poller.addListener(Product.ASM_DD, parseDeserializer(), listener);
+        start();
+
+        Map<String, Object> badBase64 = parseMap(SAMPLE_RESP_BODY);
+        List<Object> targetFiles = asList(badBase64.get("target_files"));
+        byte[] fileDecoded =
+                Base64.getDecoder().decode((String) asMap(targetFiles.get(0)).get("raw"));
+        asMap(targetFiles.get(0)).put("raw", Base64.getEncoder().encodeToString(fileDecoded) + "##");
+
+        stubHttp(buildOKResponse(toJson(badBase64)), buildOKResponse(SAMPLE_RESP_BODY));
+        task.run(poller);
+        task.run(poller);
+
+        verify(listener).accept(any(), any(), any());
+
+        Map<String, Object> state = clientState(parseBody());
+        assertEquals(
+                "Could not get file contents from remote config, file employee/ASM_DD/1.recommended.json/config",
+                state.get("error"));
+    }
+
+    @Test
+    void deserializerCanReturnNullToIndicateNoConfigShouldBeApplied() throws IOException {
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+
+        poller.addListener(Product.ASM_DD, content -> null, listener);
+        start();
+
+        stubHttp(buildOKResponse(SAMPLE_RESP_BODY));
+        task.run(poller);
+
+        verify(listener, never()).accept(any(), any(), any());
+    }
+
+    @Test
+    void rejectsConfigurationIfTheHashIsWrong() throws IOException {
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+        String configKey = "employee/ASM_DD/1.recommended.json/config";
+
+        poller.addListener(Product.ASM_DD, parseDeserializer(), listener);
+        start();
+
+        Map<String, Object> wrongHash = parseMap(SAMPLE_RESP_BODY);
+        Map<String, Object> targets = decodeTargets(wrongHash.get("targets"));
+        asMap(asMap(asMap(asMap(targets.get("signed")).get("targets")).get(configKey))
+                        .get("hashes"))
+                .put("sha256", "0");
+        wrongHash.put("targets", signAndBase64EncodeTargets(targets));
+
+        stubHttp(buildOKResponse(toJson(wrongHash)));
+        task.run(poller);
+
+        verify(listener, never()).accept(any(), any(), any());
+    }
+
+    @Test
+    void acceptsAnEmptyObjectAsAResponseToIndicateNoChanges() throws IOException {
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+        ConfigurationDeserializer<Object> deserializer = deserializerMock();
+
+        poller.addListener(Product.ASM_DD, deserializer, listener);
+        start();
+
+        stubHttp(buildOKResponse("{}"));
+        task.run(poller);
+
+        verifyNoInteractions(deserializer);
+        verifyNoInteractions(listener);
+    }
+
+    @Test
+    void acceptsHttp204AsAResponseToIndicateNoChanges() throws IOException {
+        Response resp = new Response.Builder()
                 .request(REQUEST)
                 .protocol(Protocol.HTTP_1_1)
-                .message("OK")
-                .body(ResponseBody.create(MediaType.get("text/plain"), SAMPLE_RESP_BODY))
-                .code(200)
-                .build()));
-  }
-
-  // autoCloseArguments disabled: a body-less okhttp Response throws on close()
-  @ParameterizedTest(name = "bad responses: {0}", autoCloseArguments = false)
-  @MethodSource("badResponsesArguments")
-  void badResponses(String scenario, Response resp) throws IOException {
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-
-    poller.addListener(Product.ASM_DD, deserializerThrowing("should not be called"), listener);
-    start();
-
-    stubHttp(resp);
-    task.run(poller);
-
-    // a single request is made and no configuration is applied
-    verify(okHttpClient, times(1)).newCall(any());
-    verifyNoInteractions(listener);
-  }
-
-  static Stream<Arguments> bodyDoesNotSatisfyFormatArguments() {
-    return Stream.of(
-        arguments("targets not a string", "{\"targets\": []}"),
-        arguments("targets not base64", "{\"targets\": \"ZZZZ=\"}"),
-        arguments(
-            "signed not an object", "{\"targets\": \"" + b64("{\"signed\": \"string\"}") + "\"}"));
-  }
-
-  @ParameterizedTest(name = "body does not satisfy format: {0}")
-  @MethodSource("bodyDoesNotSatisfyFormatArguments")
-  void bodyDoesNotSatisfyFormat(String scenario, String bodyStr) throws IOException {
-    ConfigurationDeserializer<Object> deserializer = deserializerMock();
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-
-    poller.addListener(Product.ASM_DD, deserializer, listener);
-    start();
-
-    stubHttp(buildOKResponse(bodyStr));
-    task.run(poller);
-
-    verifyNoInteractions(deserializer);
-    verifyNoInteractions(listener);
-  }
-
-  static Stream<Arguments> reportableErrorsArguments() {
-    // not a valid key
-    Map<String, Object> notValidKey = parseMap(SAMPLE_RESP_BODY);
-    asList(notValidKey.get("client_configs")).set(0, "foobar");
-
-    // no file for the given key
-    Map<String, Object> noFile = parseMap(SAMPLE_RESP_BODY);
-    noFile.put("target_files", list());
-
-    // two reportable errors
-    Map<String, Object> twoErrors = parseMap(SAMPLE_RESP_BODY);
-    twoErrors.put("client_configs", list("foobar", "employee/ASM_DD/1.recommended.json/config"));
-    twoErrors.put("target_files", list());
-
-    // in target_files, but not targets.signed.targets
-    Map<String, Object> notInTargets = parseMap(SAMPLE_RESP_BODY);
-    Map<String, Object> targetsNotInTargets = decodeTargets(notInTargets.get("targets"));
-    asMap(targetsNotInTargets.get("signed")).put("targets", map());
-    notInTargets.put("targets", signAndBase64EncodeTargets(targetsNotInTargets));
-
-    // told to apply config that is not subscribed
-    Map<String, Object> notSubscribed = parseMap(SAMPLE_RESP_BODY);
-    notSubscribed.put(
-        "client_configs",
-        list("datadog/2/LIVE_DEBUGGING/1ba66cc9-146a-3479-9e66-2b63fd580f48/config"));
-
-    // invalid signature
-    Map<String, Object> invalidSignature = parseMap(SAMPLE_RESP_BODY);
-    Map<String, Object> invalidSigTargets = decodeTargets(invalidSignature.get("targets"));
-    asMap(asList(invalidSigTargets.get("signatures")).get(0))
-        .put(
-            "sig",
-            "59a6478aba87d171261e6995faaa8e36c95c3e75436c4e82f11ac625220e13b703ce9b912ee0731415121b5a47aa2abdb398a60656b7701b15e606c6327c880e");
-    invalidSignature.put(
-        "targets", Base64.getEncoder().encodeToString(toJson(invalidSigTargets).getBytes(UTF_8)));
-
-    // structurally invalid signature
-    Map<String, Object> structurallyInvalid = parseMap(SAMPLE_RESP_BODY);
-    Map<String, Object> structurallyInvalidTargets =
-        decodeTargets(structurallyInvalid.get("targets"));
-    asMap(asList(structurallyInvalidTargets.get("signatures")).get(0)).put("sig", repeat("a", 128));
-    structurallyInvalid.put(
-        "targets",
-        Base64.getEncoder().encodeToString(toJson(structurallyInvalidTargets).getBytes(UTF_8)));
-
-    return Stream.of(
-        arguments("not a valid key", toJson(notValidKey), "Not a valid config key: foobar"),
-        arguments(
-            "no file for key",
-            toJson(noFile),
-            "No content for employee/ASM_DD/1.recommended.json/config"),
-        arguments(
-            "two reportable errors",
-            toJson(twoErrors),
-            "Failed to apply configuration due to 2 errors:\n (1) Not a valid config key: foobar\n"
-                + " (2) No content for employee/ASM_DD/1.recommended.json/config\n"),
-        arguments(
-            "in target_files but not signed",
-            toJson(notInTargets),
-            "Path employee/ASM_DD/1.recommended.json/config is in target_files, but not in targets.signed"),
-        arguments(
-            "config not subscribed",
-            toJson(notSubscribed),
-            "Told to handle config key datadog/2/LIVE_DEBUGGING/1ba66cc9-146a-3479-9e66-2b63fd580f48/config,"
-                + " but the product LIVE_DEBUGGING is not being handled"),
-        arguments(
-            "invalid signature",
-            toJson(invalidSignature),
-            "Signature verification failed for targets.signed. Key id: TEST_KEY_ID"),
-        arguments(
-            "structurally invalid signature",
-            toJson(structurallyInvalid),
-            "Error reading signature or canonicalizing targets.signed: Invalid scalar representation"));
-  }
-
-  @ParameterizedTest(name = "reportable errors: {0}")
-  @MethodSource("reportableErrorsArguments")
-  void reportableErrors(String scenario, String bodyStr, String errorMsg) throws IOException {
-    poller.addListener(
-        Product.ASM_DD,
-        deserializerThrowing("should not be called"),
-        (configKey, config, hinter) -> {});
-    start();
-
-    stubHttp(buildOKResponse(bodyStr), buildOKResponse(SAMPLE_RESP_BODY));
-    task.run(poller);
-    task.run(poller);
-
-    Map<String, Object> state = clientState(parseBody());
-    assertTrue(asList(state.get("config_states")).isEmpty());
-    assertEquals(Boolean.TRUE, state.get("has_error"));
-    assertEquals(errorMsg, state.get("error"));
-  }
-
-  @Test
-  void reportsErrorDuringDeserialization() throws IOException {
-    poller.addListener(
-        Product.ASM_DD,
-        content -> {
-          throw new RuntimeException("my deserializer error");
-        },
-        (configKey, config, hinter) -> {});
-    start();
-
-    stubHttp(buildOKResponse(SAMPLE_RESP_BODY), buildOKResponse(SAMPLE_RESP_BODY));
-    task.run(poller);
-    task.run(poller);
-
-    Map<String, Object> configState =
-        asMap(asList(clientState(parseBody()).get("config_states")).get(0));
-    assertEquals(APPLY_STATE_ERROR, asInt(configState.get("apply_state")));
-    assertEquals("my deserializer error", configState.get("apply_error"));
-  }
-
-  @Test
-  void reportsErrorApplyingConfiguration() throws IOException {
-    poller.addListener(
-        Product.ASM_DD,
-        content -> true,
-        (configKey, config, hinter) -> {
-          throw new RuntimeException("error applying config");
+                .message("No Content")
+                .body(ResponseBody.create(MediaType.parse("application/json"), ""))
+                .code(204)
+                .build();
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+        ConfigurationDeserializer<Object> deserializer = deserializerMock();
+
+        poller.addListener(Product.ASM_DD, deserializer, listener);
+        start();
+
+        stubHttp(resp);
+        task.run(poller);
+
+        verifyNoInteractions(deserializer);
+        verifyNoInteractions(listener);
+    }
+
+    @Test
+    void appliesAndRemoveCalledForProductListener() throws IOException {
+        ProductListener listener = mock(ProductListener.class);
+        String cfgWithoutAsm = cfgWithoutAsm();
+
+        poller.addListener(Product.ASM_DD, listener);
+        start();
+
+        stubHttp(
+                buildOKResponse(SAMPLE_RESP_BODY),
+                buildOKResponse(SAMPLE_RESP_BODY),
+                buildOKResponse(cfgWithoutAsm),
+                buildOKResponse(cfgWithoutAsm));
+        task.run(poller); // accept + commit
+        task.run(poller); // no commit, no change
+        task.run(poller); // remove + commit
+        task.run(poller); // no commit, no change
+
+        verify(listener, times(1)).accept(any(), notNull(), any());
+        verify(listener, times(1)).remove(any(), any());
+        verify(listener, times(2)).commit(any());
+    }
+
+    @Test
+    void unappliesConfigurationsItHasStoppedSeeing() throws IOException {
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+        String cfgWithoutAsm = cfgWithoutAsm();
+
+        poller.addListener(Product.ASM_DD, parseDeserializer(), listener);
+        start();
+
+        stubHttp(buildOKResponse(SAMPLE_RESP_BODY), buildOKResponse(cfgWithoutAsm), buildOKResponse(cfgWithoutAsm));
+        task.run(poller); // accept with non-null config
+        task.run(poller); // unapply (accept with null config)
+        task.run(poller); // nothing more
+
+        verify(listener, times(1)).accept(any(), notNull(), any());
+        verify(listener, times(1)).accept(any(), isNull(), any());
+    }
+
+    @Test
+    void supportMultipleConfigurations() throws IOException {
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+        String recommended = "employee/ASM_DD/1.recommended.json/config";
+        String suggested = "employee/ASM_DD/2.suggested.json/config";
+        String multiConfigs = withClientConfigs(SAMPLE_RESP_BODY, list(recommended, suggested));
+        String noConfigs = withClientConfigs(SAMPLE_RESP_BODY, list());
+
+        poller.addListener(Product.ASM_DD, parseDeserializer(), listener);
+        start();
+
+        stubHttp(
+                buildOKResponse(SAMPLE_RESP_BODY), // apply first configuration
+                buildOKResponse(multiConfigs), // apply second configuration
+                buildOKResponse(SAMPLE_RESP_BODY), // remove second configuration
+                buildOKResponse(noConfigs)); // remove all configurations
+        task.run(poller);
+        task.run(poller);
+        task.run(poller);
+        task.run(poller);
+
+        verify(listener, times(1)).accept(eq(recommended), notNull(), any());
+        verify(listener, times(1)).accept(eq(suggested), notNull(), any());
+        verify(listener, times(1)).accept(eq(suggested), isNull(), any());
+        verify(listener, times(1)).accept(eq(recommended), isNull(), any());
+    }
+
+    @Test
+    void exceptionApplyingOneConfigShouldNotPreventOthersFromBeingApplied() throws IOException {
+        String newConfigId = "1ba66cc9-146a-3479-9e66-2b63fd580f48";
+        String newConfigKey = "datadog/2/LIVE_DEBUGGING/" + newConfigId + "/config";
+
+        poller.addListener(Product.ASM_DD, parseDeserializer(), (configKey, config, hinter) -> {
+            throw new RuntimeException("throw here");
         });
-    start();
-
-    stubHttp(buildOKResponse(SAMPLE_RESP_BODY), buildOKResponse(SAMPLE_RESP_BODY));
-    task.run(poller);
-    task.run(poller);
-
-    Map<String, Object> configState =
-        asMap(asList(clientState(parseBody()).get("config_states")).get(0));
-    assertEquals(APPLY_STATE_ERROR, asInt(configState.get("apply_state")));
-    assertEquals("error applying config", configState.get("apply_error"));
-  }
-
-  @Test
-  void theMaxSizeIsExceeded() throws IOException {
-    ConfigurationDeserializer<Object> deserializer = deserializerMock();
-
-    poller.addListener(
-        Product.ASM_DD, deserializer, (configKey, config, hinter) -> fail("should not be called"));
-    start();
-
-    Map<String, Object> oversized = parseMap(SAMPLE_RESP_BODY);
-    asList(oversized.get("target_files"))
-        .add(
-            map(
-                "path",
-                "foo/bar",
-                "raw",
-                repeat("a", (int) Config.get().getRemoteConfigMaxPayloadSizeBytes())));
-
-    stubHttp(buildOKResponse(toJson(oversized)));
-    task.run(poller);
-
-    verifyNoInteractions(deserializer);
-  }
-
-  @Test
-  void canListenForChangesInALocalFile() throws IOException {
-    File file = Files.createTempFile(null, ".json").toFile();
-    AtomicReference<Object> savedConf = new AtomicReference<>();
-
-    poller.addFileListener(file, parseDeserializer(), (path, conf, hinter) -> savedConf.set(conf));
-    start();
-    Files.write(file.toPath(), "{\"foo\":\"bar\"}".getBytes(UTF_8));
-
-    task.run(poller);
-    assertEquals("bar", asMap(savedConf.get()).get("foo"));
-
-    file.delete();
-    Files.write(file.toPath(), "{\"foo\":\"xpto\"}".getBytes(UTF_8));
-    task.run(poller);
-    assertEquals("xpto", asMap(savedConf.get()).get("foo"));
-
-    file.delete();
-  }
-
-  @Test
-  void distributesFeatures() throws IOException {
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-
-    poller.addListener(Product.ASM_FEATURES, parseDeserializer(), listener);
-    start();
-
-    stubHttp(buildOKResponse(FEATURES_RESP_BODY));
-    task.run(poller);
-
-    verify(listener)
-        .accept(
-            any(),
-            cfgMatches(cfg -> Boolean.TRUE.equals(asMap(cfg.get("asm")).get("enabled"))),
-            any());
-  }
-
-  @Test
-  void distributesFeaturesUponSubscribing() throws IOException {
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-
-    poller.addListener(
-        Product.ASM_FEATURES,
-        deserializerThrowing("should not be called"),
-        (configKey, config, hinter) -> {
-          throw new RuntimeException("should not be called");
+        poller.addListener(Product.LIVE_DEBUGGING, parseDeserializer(), (configKey, config, hinter) -> {});
+        start();
+
+        Map<String, Object> withExtra = parseMap(SAMPLE_RESP_BODY);
+        asList(withExtra.get("client_configs")).add(newConfigKey);
+        Map<String, Object> targets = decodeTargets(withExtra.get("targets"));
+        asMap(asMap(targets.get("signed")).get("targets"))
+                .put(
+                        newConfigKey,
+                        map(
+                                "custom", map("v", 3),
+                                "hashes",
+                                        map(
+                                                "sha256",
+                                                "7a38bf81f383f69433ad6e900d35b3e2385593f76a7b7ab5d4355b8ba41ee24b"),
+                                "length", "{\"foo\":\"bar\"}".length()));
+        asList(withExtra.get("target_files")).add(map("path", newConfigKey, "raw", b64("{\"foo\":\"bar\"}")));
+        withExtra.put("targets", signAndBase64EncodeTargets(targets));
+
+        stubHttp(buildOKResponse(toJson(withExtra)), buildOKResponse(SAMPLE_RESP_BODY));
+        task.run(poller);
+        task.run(poller);
+
+        Map<String, Object> body = parseBody();
+        List<Object> configStates = asList(clientState(body).get("config_states"));
+        assertEquals(2, configStates.size());
+        Map<String, Object> liveDebuggingConfig = findConfigState(configStates, "LIVE_DEBUGGING");
+        Map<String, Object> asmConfig = findConfigState(configStates, "ASM_DD");
+        assertEquals(newConfigId, liveDebuggingConfig.get("id"));
+        assertEquals("LIVE_DEBUGGING", liveDebuggingConfig.get("product"));
+        assertEquals(3L, asLong(liveDebuggingConfig.get("version")));
+        assertNull(liveDebuggingConfig.get("apply_error"));
+        assertEquals("1.recommended.json", asmConfig.get("id"));
+        assertEquals("ASM_DD", asmConfig.get("product"));
+        assertEquals(1L, asLong(asmConfig.get("version")));
+        assertEquals(APPLY_STATE_ERROR, asInt(asmConfig.get("apply_state")));
+        assertEquals("throw here", asmConfig.get("apply_error"));
+    }
+
+    static Stream<Arguments> badResponsesArguments() {
+        return Stream.of(
+                arguments(
+                        "404 with body",
+                        new Response.Builder()
+                                .request(REQUEST)
+                                .protocol(Protocol.HTTP_1_1)
+                                .message("Not Found")
+                                .code(404)
+                                .body(ResponseBody.create(MediaType.get("text/plain"), "not found!"))
+                                .build()),
+                arguments(
+                        "404 without body",
+                        new Response.Builder()
+                                .request(REQUEST)
+                                .protocol(Protocol.HTTP_1_1)
+                                .message("Not Found")
+                                .code(404)
+                                .build()),
+                arguments(
+                        "success, no body",
+                        new Response.Builder()
+                                .request(REQUEST)
+                                .protocol(Protocol.HTTP_1_1)
+                                .message("Created")
+                                .code(201)
+                                .build()),
+                arguments(
+                        "not json",
+                        new Response.Builder()
+                                .request(REQUEST)
+                                .protocol(Protocol.HTTP_1_1)
+                                .message("OK")
+                                .body(ResponseBody.create(MediaType.get("text/plain"), SAMPLE_RESP_BODY))
+                                .code(200)
+                                .build()));
+    }
+
+    // autoCloseArguments disabled: a body-less okhttp Response throws on close()
+    @ParameterizedTest(name = "bad responses: {0}", autoCloseArguments = false)
+    @MethodSource("badResponsesArguments")
+    void badResponses(String scenario, Response resp) throws IOException {
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+
+        poller.addListener(Product.ASM_DD, deserializerThrowing("should not be called"), listener);
+        start();
+
+        stubHttp(resp);
+        task.run(poller);
+
+        // a single request is made and no configuration is applied
+        verify(okHttpClient, times(1)).newCall(any());
+        verifyNoInteractions(listener);
+    }
+
+    static Stream<Arguments> bodyDoesNotSatisfyFormatArguments() {
+        return Stream.of(
+                arguments("targets not a string", "{\"targets\": []}"),
+                arguments("targets not base64", "{\"targets\": \"ZZZZ=\"}"),
+                arguments("signed not an object", "{\"targets\": \"" + b64("{\"signed\": \"string\"}") + "\"}"));
+    }
+
+    @ParameterizedTest(name = "body does not satisfy format: {0}")
+    @MethodSource("bodyDoesNotSatisfyFormatArguments")
+    void bodyDoesNotSatisfyFormat(String scenario, String bodyStr) throws IOException {
+        ConfigurationDeserializer<Object> deserializer = deserializerMock();
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+
+        poller.addListener(Product.ASM_DD, deserializer, listener);
+        start();
+
+        stubHttp(buildOKResponse(bodyStr));
+        task.run(poller);
+
+        verifyNoInteractions(deserializer);
+        verifyNoInteractions(listener);
+    }
+
+    static Stream<Arguments> reportableErrorsArguments() {
+        // not a valid key
+        Map<String, Object> notValidKey = parseMap(SAMPLE_RESP_BODY);
+        asList(notValidKey.get("client_configs")).set(0, "foobar");
+
+        // no file for the given key
+        Map<String, Object> noFile = parseMap(SAMPLE_RESP_BODY);
+        noFile.put("target_files", list());
+
+        // two reportable errors
+        Map<String, Object> twoErrors = parseMap(SAMPLE_RESP_BODY);
+        twoErrors.put("client_configs", list("foobar", "employee/ASM_DD/1.recommended.json/config"));
+        twoErrors.put("target_files", list());
+
+        // in target_files, but not targets.signed.targets
+        Map<String, Object> notInTargets = parseMap(SAMPLE_RESP_BODY);
+        Map<String, Object> targetsNotInTargets = decodeTargets(notInTargets.get("targets"));
+        asMap(targetsNotInTargets.get("signed")).put("targets", map());
+        notInTargets.put("targets", signAndBase64EncodeTargets(targetsNotInTargets));
+
+        // told to apply config that is not subscribed
+        Map<String, Object> notSubscribed = parseMap(SAMPLE_RESP_BODY);
+        notSubscribed.put(
+                "client_configs", list("datadog/2/LIVE_DEBUGGING/1ba66cc9-146a-3479-9e66-2b63fd580f48/config"));
+
+        // invalid signature
+        Map<String, Object> invalidSignature = parseMap(SAMPLE_RESP_BODY);
+        Map<String, Object> invalidSigTargets = decodeTargets(invalidSignature.get("targets"));
+        asMap(asList(invalidSigTargets.get("signatures")).get(0))
+                .put(
+                        "sig",
+                        "59a6478aba87d171261e6995faaa8e36c95c3e75436c4e82f11ac625220e13b703ce9b912ee0731415121b5a47aa2abdb398a60656b7701b15e606c6327c880e");
+        invalidSignature.put(
+                "targets",
+                Base64.getEncoder().encodeToString(toJson(invalidSigTargets).getBytes(UTF_8)));
+
+        // structurally invalid signature
+        Map<String, Object> structurallyInvalid = parseMap(SAMPLE_RESP_BODY);
+        Map<String, Object> structurallyInvalidTargets = decodeTargets(structurallyInvalid.get("targets"));
+        asMap(asList(structurallyInvalidTargets.get("signatures")).get(0)).put("sig", repeat("a", 128));
+        structurallyInvalid.put(
+                "targets",
+                Base64.getEncoder()
+                        .encodeToString(toJson(structurallyInvalidTargets).getBytes(UTF_8)));
+
+        return Stream.of(
+                arguments("not a valid key", toJson(notValidKey), "Not a valid config key: foobar"),
+                arguments(
+                        "no file for key", toJson(noFile), "No content for employee/ASM_DD/1.recommended.json/config"),
+                arguments(
+                        "two reportable errors",
+                        toJson(twoErrors),
+                        "Failed to apply configuration due to 2 errors:\n (1) Not a valid config key: foobar\n"
+                                + " (2) No content for employee/ASM_DD/1.recommended.json/config\n"),
+                arguments(
+                        "in target_files but not signed",
+                        toJson(notInTargets),
+                        "Path employee/ASM_DD/1.recommended.json/config is in target_files, but not in targets.signed"),
+                arguments(
+                        "config not subscribed",
+                        toJson(notSubscribed),
+                        "Told to handle config key datadog/2/LIVE_DEBUGGING/1ba66cc9-146a-3479-9e66-2b63fd580f48/config,"
+                                + " but the product LIVE_DEBUGGING is not being handled"),
+                arguments(
+                        "invalid signature",
+                        toJson(invalidSignature),
+                        "Signature verification failed for targets.signed. Key id: TEST_KEY_ID"),
+                arguments(
+                        "structurally invalid signature",
+                        toJson(structurallyInvalid),
+                        "Error reading signature or canonicalizing targets.signed: Invalid scalar representation"));
+    }
+
+    @ParameterizedTest(name = "reportable errors: {0}")
+    @MethodSource("reportableErrorsArguments")
+    void reportableErrors(String scenario, String bodyStr, String errorMsg) throws IOException {
+        poller.addListener(
+                Product.ASM_DD, deserializerThrowing("should not be called"), (configKey, config, hinter) -> {});
+        start();
+
+        stubHttp(buildOKResponse(bodyStr), buildOKResponse(SAMPLE_RESP_BODY));
+        task.run(poller);
+        task.run(poller);
+
+        Map<String, Object> state = clientState(parseBody());
+        assertTrue(asList(state.get("config_states")).isEmpty());
+        assertEquals(Boolean.TRUE, state.get("has_error"));
+        assertEquals(errorMsg, state.get("error"));
+    }
+
+    @Test
+    void reportsErrorDuringDeserialization() throws IOException {
+        poller.addListener(
+                Product.ASM_DD,
+                content -> {
+                    throw new RuntimeException("my deserializer error");
+                },
+                (configKey, config, hinter) -> {});
+        start();
+
+        stubHttp(buildOKResponse(SAMPLE_RESP_BODY), buildOKResponse(SAMPLE_RESP_BODY));
+        task.run(poller);
+        task.run(poller);
+
+        Map<String, Object> configState =
+                asMap(asList(clientState(parseBody()).get("config_states")).get(0));
+        assertEquals(APPLY_STATE_ERROR, asInt(configState.get("apply_state")));
+        assertEquals("my deserializer error", configState.get("apply_error"));
+    }
+
+    @Test
+    void reportsErrorApplyingConfiguration() throws IOException {
+        poller.addListener(Product.ASM_DD, content -> true, (configKey, config, hinter) -> {
+            throw new RuntimeException("error applying config");
         });
-    start();
-
-    poller.removeListeners(Product.ASM_FEATURES);
-
-    poller.addListener(Product.ASM_FEATURES, parseDeserializer(), listener);
-    stubHttp(buildOKResponse(FEATURES_RESP_BODY));
-    task.run(poller);
-
-    verify(listener)
-        .accept(
-            any(),
-            cfgMatches(cfg -> Boolean.TRUE.equals(asMap(cfg.get("asm")).get("enabled"))),
-            any());
-  }
-
-  @Test
-  void distributeConfigAcrossMultipleListenersForSameSubscriber() throws IOException {
-    ConfigurationChangesTypedListener<Object> listener1 = typedListener();
-    ConfigurationChangesTypedListener<Object> listener2 = typedListener();
-
-    poller.addListener(Product.ASM_FEATURES, parseDeserializer(), listener1);
-    poller.addListener(Product.ASM_FEATURES, parseDeserializer(), listener2);
-    start();
-
-    stubHttp(buildOKResponse(FEATURES_RESP_BODY));
-    task.run(poller);
-
-    verify(listener1)
-        .accept(
-            any(),
-            cfgMatches(cfg -> Boolean.TRUE.equals(asMap(cfg.get("asm")).get("enabled"))),
-            any());
-    verify(listener2)
-        .accept(
-            any(),
-            cfgMatches(
-                cfg ->
-                    Double.valueOf(0.1)
-                        .equals(asMap(cfg.get("api_security")).get("request_sample_rate"))),
-            any());
-  }
-
-  @Test
-  void errorApplyingFeatures() throws IOException {
-    AtomicBoolean called = new AtomicBoolean(false);
-
-    poller.addListener(
-        Product.ASM_FEATURES,
-        content -> true,
-        (configKey, config, hinter) -> {
-          called.set(true);
-          throw new RuntimeException("throws");
+        start();
+
+        stubHttp(buildOKResponse(SAMPLE_RESP_BODY), buildOKResponse(SAMPLE_RESP_BODY));
+        task.run(poller);
+        task.run(poller);
+
+        Map<String, Object> configState =
+                asMap(asList(clientState(parseBody()).get("config_states")).get(0));
+        assertEquals(APPLY_STATE_ERROR, asInt(configState.get("apply_state")));
+        assertEquals("error applying config", configState.get("apply_error"));
+    }
+
+    @Test
+    void theMaxSizeIsExceeded() throws IOException {
+        ConfigurationDeserializer<Object> deserializer = deserializerMock();
+
+        poller.addListener(Product.ASM_DD, deserializer, (configKey, config, hinter) -> fail("should not be called"));
+        start();
+
+        Map<String, Object> oversized = parseMap(SAMPLE_RESP_BODY);
+        asList(oversized.get("target_files")).add(map("path", "foo/bar", "raw", repeat("a", (int)
+                Config.get().getRemoteConfigMaxPayloadSizeBytes())));
+
+        stubHttp(buildOKResponse(toJson(oversized)));
+        task.run(poller);
+
+        verifyNoInteractions(deserializer);
+    }
+
+    @Test
+    void canListenForChangesInALocalFile() throws IOException {
+        File file = Files.createTempFile(null, ".json").toFile();
+        AtomicReference<Object> savedConf = new AtomicReference<>();
+
+        poller.addFileListener(file, parseDeserializer(), (path, conf, hinter) -> savedConf.set(conf));
+        start();
+        Files.write(file.toPath(), "{\"foo\":\"bar\"}".getBytes(UTF_8));
+
+        task.run(poller);
+        assertEquals("bar", asMap(savedConf.get()).get("foo"));
+
+        file.delete();
+        Files.write(file.toPath(), "{\"foo\":\"xpto\"}".getBytes(UTF_8));
+        task.run(poller);
+        assertEquals("xpto", asMap(savedConf.get()).get("foo"));
+
+        file.delete();
+    }
+
+    @Test
+    void distributesFeatures() throws IOException {
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+
+        poller.addListener(Product.ASM_FEATURES, parseDeserializer(), listener);
+        start();
+
+        stubHttp(buildOKResponse(FEATURES_RESP_BODY));
+        task.run(poller);
+
+        verify(listener)
+                .accept(
+                        any(),
+                        cfgMatches(
+                                cfg -> Boolean.TRUE.equals(asMap(cfg.get("asm")).get("enabled"))),
+                        any());
+    }
+
+    @Test
+    void distributesFeaturesUponSubscribing() throws IOException {
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+
+        poller.addListener(
+                Product.ASM_FEATURES, deserializerThrowing("should not be called"), (configKey, config, hinter) -> {
+                    throw new RuntimeException("should not be called");
+                });
+        start();
+
+        poller.removeListeners(Product.ASM_FEATURES);
+
+        poller.addListener(Product.ASM_FEATURES, parseDeserializer(), listener);
+        stubHttp(buildOKResponse(FEATURES_RESP_BODY));
+        task.run(poller);
+
+        verify(listener)
+                .accept(
+                        any(),
+                        cfgMatches(
+                                cfg -> Boolean.TRUE.equals(asMap(cfg.get("asm")).get("enabled"))),
+                        any());
+    }
+
+    @Test
+    void distributeConfigAcrossMultipleListenersForSameSubscriber() throws IOException {
+        ConfigurationChangesTypedListener<Object> listener1 = typedListener();
+        ConfigurationChangesTypedListener<Object> listener2 = typedListener();
+
+        poller.addListener(Product.ASM_FEATURES, parseDeserializer(), listener1);
+        poller.addListener(Product.ASM_FEATURES, parseDeserializer(), listener2);
+        start();
+
+        stubHttp(buildOKResponse(FEATURES_RESP_BODY));
+        task.run(poller);
+
+        verify(listener1)
+                .accept(
+                        any(),
+                        cfgMatches(
+                                cfg -> Boolean.TRUE.equals(asMap(cfg.get("asm")).get("enabled"))),
+                        any());
+        verify(listener2)
+                .accept(
+                        any(),
+                        cfgMatches(cfg -> Double.valueOf(0.1)
+                                .equals(asMap(cfg.get("api_security")).get("request_sample_rate"))),
+                        any());
+    }
+
+    @Test
+    void errorApplyingFeatures() throws IOException {
+        AtomicBoolean called = new AtomicBoolean(false);
+
+        poller.addListener(Product.ASM_FEATURES, content -> true, (configKey, config, hinter) -> {
+            called.set(true);
+            throw new RuntimeException("throws");
         });
-    start();
+        start();
+
+        stubHttp(buildOKResponse(FEATURES_RESP_BODY));
+        task.run(poller);
+
+        assertTrue(called.get());
+        // error does not escape
+    }
+
+    @Test
+    void removingFeatureListeners() throws IOException {
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+
+        poller.addListener(
+                Product._UNKNOWN, deserializerThrowing("should not be called"), (configKey, config, hinter) -> {
+                    throw new RuntimeException("should not be called");
+                });
+        poller.addListener(Product.ASM_FEATURES, content -> null, listener);
+        poller.removeListeners(Product.ASM_FEATURES);
+        start();
+
+        stubHttp(buildOKResponse(FEATURES_RESP_BODY));
+        task.run(poller);
+
+        verify(listener, never()).accept(any(), any(), any()); // listener is not called
+
+        poller.removeListeners(Product._UNKNOWN);
+        task.run(poller);
+
+        verify(okHttpClient, times(1)).newCall(any()); // not even a request is made the second time
+    }
+
+    @Test
+    void checkSettingOfCapabilitiesNegativeTest() throws IOException {
+        ConfigurationChangesTypedListener<Object> listener = typedListener();
+
+        poller.addListener(Product._UNKNOWN, content -> true, listener);
+        start();
+
+        stubHttp(buildOKResponse(FEATURES_RESP_BODY));
+        task.run(poller);
+
+        List<Object> capabilities = asList(asMap(parseBody().get("client")).get("capabilities"));
+        assertEquals(0L, asLong(capabilities.get(0)));
+    }
 
-    stubHttp(buildOKResponse(FEATURES_RESP_BODY));
-    task.run(poller);
+    static Stream<Arguments> checkSettingOfCapabilitiesPositiveTestArguments() {
+        return Stream.of(
+                arguments("zero", 0L, new byte[] {0}),
+                arguments("fourteen", 14L, new byte[] {14}),
+                arguments("1 << 8", 1L << 8, new byte[] {1, 0}),
+                arguments("1 << 9", 1L << 9, new byte[] {2, 0}),
+                arguments("long min plus one", -9223372036854775807L, new byte[] {(byte) 128, 0, 0, 0, 0, 0, 0, 1}));
+    }
 
-    assertTrue(called.get());
-    // error does not escape
-  }
+    @ParameterizedTest(name = "check setting of capabilities positive test: {0}")
+    @MethodSource("checkSettingOfCapabilitiesPositiveTestArguments")
+    void checkSettingOfCapabilitiesPositiveTest(String scenario, long capabilities, byte[] encoded) throws IOException {
+        poller.addListener(Product._UNKNOWN, content -> true, (configKey, config, hinter) -> {});
+        poller.addCapabilities(capabilities);
+        start();
+
+        stubHttp(buildOKResponse(FEATURES_RESP_BODY));
+        task.run(poller);
+
+        List<Object> capabilitiesList = asList(asMap(parseBody().get("client")).get("capabilities"));
+        byte[] actual = new byte[capabilitiesList.size()];
+        for (int i = 0; i < actual.length; i++) {
+            actual[i] = (byte) asLong(capabilitiesList.get(i));
+        }
+        assertArrayEquals(encoded, actual);
+    }
 
-  @Test
-  void removingFeatureListeners() throws IOException {
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
+    // ----- Helper methods -----
 
-    poller.addListener(
-        Product._UNKNOWN,
-        deserializerThrowing("should not be called"),
-        (configKey, config, hinter) -> {
-          throw new RuntimeException("should not be called");
+    private void start() {
+        when(scheduler.scheduleAtFixedRate(any(), eq(poller), eq(0L), eq((long) DEFAULT_POLL_PERIOD), eq(MILLISECONDS)))
+                .thenAnswer(invocation -> {
+                    task = invocation.getArgument(0);
+                    return scheduled;
+                });
+        poller.start();
+        assertNotNull(task);
+    }
+
+    private void stubHttp(Response... responses) throws IOException {
+        when(okHttpClient.newCall(any(Request.class))).thenAnswer(invocation -> {
+            request = invocation.getArgument(0);
+            return call;
         });
-    poller.addListener(Product.ASM_FEATURES, content -> null, listener);
-    poller.removeListeners(Product.ASM_FEATURES);
-    start();
-
-    stubHttp(buildOKResponse(FEATURES_RESP_BODY));
-    task.run(poller);
-
-    verify(listener, never()).accept(any(), any(), any()); // listener is not called
-
-    poller.removeListeners(Product._UNKNOWN);
-    task.run(poller);
-
-    verify(okHttpClient, times(1)).newCall(any()); // not even a request is made the second time
-  }
-
-  @Test
-  void checkSettingOfCapabilitiesNegativeTest() throws IOException {
-    ConfigurationChangesTypedListener<Object> listener = typedListener();
-
-    poller.addListener(Product._UNKNOWN, content -> true, listener);
-    start();
-
-    stubHttp(buildOKResponse(FEATURES_RESP_BODY));
-    task.run(poller);
-
-    List<Object> capabilities = asList(asMap(parseBody().get("client")).get("capabilities"));
-    assertEquals(0L, asLong(capabilities.get(0)));
-  }
-
-  static Stream<Arguments> checkSettingOfCapabilitiesPositiveTestArguments() {
-    return Stream.of(
-        arguments("zero", 0L, new byte[] {0}),
-        arguments("fourteen", 14L, new byte[] {14}),
-        arguments("1 << 8", 1L << 8, new byte[] {1, 0}),
-        arguments("1 << 9", 1L << 9, new byte[] {2, 0}),
-        arguments(
-            "long min plus one",
-            -9223372036854775807L,
-            new byte[] {(byte) 128, 0, 0, 0, 0, 0, 0, 1}));
-  }
-
-  @ParameterizedTest(name = "check setting of capabilities positive test: {0}")
-  @MethodSource("checkSettingOfCapabilitiesPositiveTestArguments")
-  void checkSettingOfCapabilitiesPositiveTest(String scenario, long capabilities, byte[] encoded)
-      throws IOException {
-    poller.addListener(Product._UNKNOWN, content -> true, (configKey, config, hinter) -> {});
-    poller.addCapabilities(capabilities);
-    start();
-
-    stubHttp(buildOKResponse(FEATURES_RESP_BODY));
-    task.run(poller);
-
-    List<Object> capabilitiesList = asList(asMap(parseBody().get("client")).get("capabilities"));
-    byte[] actual = new byte[capabilitiesList.size()];
-    for (int i = 0; i < actual.length; i++) {
-      actual[i] = (byte) asLong(capabilitiesList.get(i));
-    }
-    assertArrayEquals(encoded, actual);
-  }
-
-  // ----- Helper methods -----
-
-  private void start() {
-    when(scheduler.scheduleAtFixedRate(
-            any(), eq(poller), eq(0L), eq((long) DEFAULT_POLL_PERIOD), eq(MILLISECONDS)))
-        .thenAnswer(
-            invocation -> {
-              task = invocation.getArgument(0);
-              return scheduled;
-            });
-    poller.start();
-    assertNotNull(task);
-  }
-
-  private void stubHttp(Response... responses) throws IOException {
-    when(okHttpClient.newCall(any(Request.class)))
-        .thenAnswer(
-            invocation -> {
-              request = invocation.getArgument(0);
-              return call;
-            });
-    OngoingStubbing<Response> stubbing = when(call.execute());
-    for (Response response : responses) {
-      stubbing = stubbing.thenReturn(response);
-    }
-  }
-
-  private String bodyJson() throws IOException {
-    Buffer buffer = new Buffer();
-    request.body().writeTo(buffer);
-    return new String(buffer.readByteArray(), UTF_8);
-  }
-
-  private Map<String, Object> parseBody() throws IOException {
-    return parseMap(bodyJson());
-  }
-
-  private static Map<String, Object> clientState(Map<String, Object> body) {
-    return asMap(asMap(body.get("client")).get("state"));
-  }
-
-  private static Map<String, Object> findConfigState(List<Object> configStates, String product) {
-    for (Object configState : configStates) {
-      Map<String, Object> map = asMap(configState);
-      if (product.equals(map.get("product"))) {
+        OngoingStubbing<Response> stubbing = when(call.execute());
+        for (Response response : responses) {
+            stubbing = stubbing.thenReturn(response);
+        }
+    }
+
+    private String bodyJson() throws IOException {
+        Buffer buffer = new Buffer();
+        request.body().writeTo(buffer);
+        return new String(buffer.readByteArray(), UTF_8);
+    }
+
+    private Map<String, Object> parseBody() throws IOException {
+        return parseMap(bodyJson());
+    }
+
+    private static Map<String, Object> clientState(Map<String, Object> body) {
+        return asMap(asMap(body.get("client")).get("state"));
+    }
+
+    private static Map<String, Object> findConfigState(List<Object> configStates, String product) {
+        for (Object configState : configStates) {
+            Map<String, Object> map = asMap(configState);
+            if (product.equals(map.get("product"))) {
+                return map;
+            }
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static ConfigurationChangesTypedListener<Object> typedListener() {
+        return mock(ConfigurationChangesTypedListener.class);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static ConfigurationDeserializer<Object> deserializerMock() {
+        return mock(ConfigurationDeserializer.class);
+    }
+
+    private static ConfigurationDeserializer<Object> parseDeserializer() {
+        return content -> parse(new String(content, UTF_8));
+    }
+
+    private static ConfigurationDeserializer<Object> deserializerThrowing(String message) {
+        return content -> {
+            throw new RuntimeException(message);
+        };
+    }
+
+    private static Object cfgMatches(Predicate<Map<String, Object>> predicate) {
+        return argThat(arg -> arg != null && predicate.test(asMap(arg)));
+    }
+
+    private static String cfgWithoutAsm() {
+        Map<String, Object> map = parseMap(SAMPLE_RESP_BODY);
+        map.put("client_configs", list());
+        Map<String, Object> targets = decodeTargets(map.get("targets"));
+        asMap(asMap(asMap(targets.get("signed")).get("targets")).get("employee/ASM_DD/1.recommended.json/config"))
+                .put("hashes", map("sha256", "aec070645fe53ee3b3763059376134f058cc337247c978add178b6ccdfb0019f"));
+        map.put("targets", signAndBase64EncodeTargets(targets));
+        return toJson(map);
+    }
+
+    private static String withClientConfigs(String body, List<Object> clientConfigs) {
+        Map<String, Object> map = parseMap(body);
+        map.put("client_configs", clientConfigs);
+        return toJson(map);
+    }
+
+    private static Map<String, Object> emptyTarget() {
+        return map(
+                "custom",
+                map("v", 1),
+                "hashes",
+                map("sha256", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"),
+                "length",
+                0);
+    }
+
+    private static String signAndBase64EncodeTargets(Map<String, Object> targets) {
+        Map<String, Object> targetsSigned = asMap(targets.get("signed"));
+        if (targetsSigned != null) {
+            byte[] canonicalTargetsSigned = JsonCanonicalizer.canonicalize(targetsSigned);
+            Ed25519Signature signature = PRIVATE_KEY.expand().sign(canonicalTargetsSigned, PUBLIC_KEY);
+            String sigBase16 = new BigInteger(1, signature.toByteArray()).toString(16);
+            targets.put("signatures", list(map("keyid", KEY_ID, "sig", sigBase16)));
+        }
+        return Base64.getEncoder().encodeToString(toJson(targets).getBytes(UTF_8));
+    }
+
+    private static Map<String, Object> decodeTargets(Object base64Targets) {
+        byte[] decoded = Base64.getDecoder().decode((String) base64Targets);
+        return parseMap(new String(decoded, UTF_8));
+    }
+
+    private static BigInteger sha256(byte[] bytes) {
+        try {
+            return new BigInteger(MessageDigest.getInstance("SHA-256").digest(bytes));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static String b64(String value) {
+        return Base64.getEncoder().encodeToString(value.getBytes(UTF_8));
+    }
+
+    private static String repeat(String value, int count) {
+        StringBuilder builder = new StringBuilder(value.length() * count);
+        for (int i = 0; i < count; i++) {
+            builder.append(value);
+        }
+        return builder.toString();
+    }
+
+    private static long asLong(Object value) {
+        return ((Number) value).longValue();
+    }
+
+    private static int asInt(Object value) {
+        return ((Number) value).intValue();
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> asMap(Object value) {
+        return (Map<String, Object>) value;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static List<Object> asList(Object value) {
+        return (List<Object>) value;
+    }
+
+    private static Map<String, Object> map(Object... keyValues) {
+        Map<String, Object> map = new LinkedHashMap<>();
+        for (int i = 0; i < keyValues.length; i += 2) {
+            map.put((String) keyValues[i], keyValues[i + 1]);
+        }
         return map;
-      }
-    }
-    return null;
-  }
-
-  @SuppressWarnings("unchecked")
-  private static ConfigurationChangesTypedListener<Object> typedListener() {
-    return mock(ConfigurationChangesTypedListener.class);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static ConfigurationDeserializer<Object> deserializerMock() {
-    return mock(ConfigurationDeserializer.class);
-  }
-
-  private static ConfigurationDeserializer<Object> parseDeserializer() {
-    return content -> parse(new String(content, UTF_8));
-  }
-
-  private static ConfigurationDeserializer<Object> deserializerThrowing(String message) {
-    return content -> {
-      throw new RuntimeException(message);
-    };
-  }
-
-  private static Object cfgMatches(Predicate<Map<String, Object>> predicate) {
-    return argThat(arg -> arg != null && predicate.test(asMap(arg)));
-  }
-
-  private static String cfgWithoutAsm() {
-    Map<String, Object> map = parseMap(SAMPLE_RESP_BODY);
-    map.put("client_configs", list());
-    Map<String, Object> targets = decodeTargets(map.get("targets"));
-    asMap(
-            asMap(asMap(targets.get("signed")).get("targets"))
-                .get("employee/ASM_DD/1.recommended.json/config"))
-        .put(
-            "hashes",
-            map("sha256", "aec070645fe53ee3b3763059376134f058cc337247c978add178b6ccdfb0019f"));
-    map.put("targets", signAndBase64EncodeTargets(targets));
-    return toJson(map);
-  }
-
-  private static String withClientConfigs(String body, List<Object> clientConfigs) {
-    Map<String, Object> map = parseMap(body);
-    map.put("client_configs", clientConfigs);
-    return toJson(map);
-  }
-
-  private static Map<String, Object> emptyTarget() {
-    return map(
-        "custom",
-        map("v", 1),
-        "hashes",
-        map("sha256", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"),
-        "length",
-        0);
-  }
-
-  private static String signAndBase64EncodeTargets(Map<String, Object> targets) {
-    Map<String, Object> targetsSigned = asMap(targets.get("signed"));
-    if (targetsSigned != null) {
-      byte[] canonicalTargetsSigned = JsonCanonicalizer.canonicalize(targetsSigned);
-      Ed25519Signature signature = PRIVATE_KEY.expand().sign(canonicalTargetsSigned, PUBLIC_KEY);
-      String sigBase16 = new BigInteger(1, signature.toByteArray()).toString(16);
-      targets.put("signatures", list(map("keyid", KEY_ID, "sig", sigBase16)));
-    }
-    return Base64.getEncoder().encodeToString(toJson(targets).getBytes(UTF_8));
-  }
-
-  private static Map<String, Object> decodeTargets(Object base64Targets) {
-    byte[] decoded = Base64.getDecoder().decode((String) base64Targets);
-    return parseMap(new String(decoded, UTF_8));
-  }
-
-  private static BigInteger sha256(byte[] bytes) {
-    try {
-      return new BigInteger(MessageDigest.getInstance("SHA-256").digest(bytes));
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private static String b64(String value) {
-    return Base64.getEncoder().encodeToString(value.getBytes(UTF_8));
-  }
-
-  private static String repeat(String value, int count) {
-    StringBuilder builder = new StringBuilder(value.length() * count);
-    for (int i = 0; i < count; i++) {
-      builder.append(value);
-    }
-    return builder.toString();
-  }
-
-  private static long asLong(Object value) {
-    return ((Number) value).longValue();
-  }
-
-  private static int asInt(Object value) {
-    return ((Number) value).intValue();
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> asMap(Object value) {
-    return (Map<String, Object>) value;
-  }
-
-  @SuppressWarnings("unchecked")
-  private static List<Object> asList(Object value) {
-    return (List<Object>) value;
-  }
-
-  private static Map<String, Object> map(Object... keyValues) {
-    Map<String, Object> map = new LinkedHashMap<>();
-    for (int i = 0; i < keyValues.length; i += 2) {
-      map.put((String) keyValues[i], keyValues[i + 1]);
-    }
-    return map;
-  }
-
-  private static List<Object> list(Object... items) {
-    return new ArrayList<>(Arrays.asList(items));
-  }
-
-  private static Object parse(String json) {
-    try {
-      return MOSHI.adapter(Object.class).fromJson(json);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private static Map<String, Object> parseMap(String json) {
-    return asMap(parse(json));
-  }
-
-  private static String toJson(Object value) {
-    return MOSHI.adapter(Object.class).toJson(value);
-  }
-
-  private static final String SAMPLE_APPSEC_CONFIG =
-      "\n"
-          + "{\n"
-          + "    \"version\": \"2.2\",\n"
-          + "    \"metadata\": {\n"
-          + "        \"rules_version\": \"1.3.1\"\n"
-          + "    },\n"
-          + "    \"rules\": [\n"
-          + "        {\n"
-          + "            \"id\": \"crs-913-110\",\n"
-          + "            \"name\": \"Acunetix\",\n"
-          + "            \"tags\": {\n"
-          + "                \"type\": \"security_scanner\",\n"
-          + "                \"crs_id\": \"913110\",\n"
-          + "                \"category\": \"attack_attempt\"\n"
-          + "            },\n"
-          + "            \"conditions\": [\n"
-          + "                {\n"
-          + "                    \"parameters\": {\n"
-          + "                        \"inputs\": [\n"
-          + "                            {\n"
-          + "                                \"address\": \"server.request.headers.no_cookies\"\n"
-          + "                            }\n"
-          + "                        ],\n"
-          + "                        \"list\": [\n"
-          + "                            \"acunetix-product\"\n"
-          + "                        ]\n"
-          + "                    },\n"
-          + "                    \"operator\": \"phrase_match\"\n"
-          + "                }\n"
-          + "            ],\n"
-          + "            \"transformers\": [\n"
-          + "                \"lowercase\"\n"
-          + "            ]\n"
-          + "        }\n"
-          + "    ]\n"
-          + "}\n";
-
-  private static final String SAMPLE_TARGETS =
-      "\n"
-          + "{\n"
-          + "   \"signatures\" : [\n"
-          + "      {\n"
-          + "         \"keyid\" : \"5c4ece41241a1bb513f6e3e5df74ab7d5183dfffbd71bfd43127920d880569fd\",\n"
-          + "         \"sig\" : \"766871ed1acc60ef35f9f24262682283a55e79334f5154486176033b67568aed82fe8139a1f78689b96473537f0a2e55c8365d50bff345ea9ac350d57b90390d\"\n"
-          + "      }\n"
-          + "   ],\n"
-          + "   \"signed\" : {\n"
-          + "      \"_type\" : \"targets\",\n"
-          + "      \"custom\" : {\n"
-          + "         \"opaque_backend_state\" : \"foobar\"\n"
-          + "      },\n"
-          + "      \"expires\" : \"2022-09-17T12:49:15Z\",\n"
-          + "      \"spec_version\" : \"1.0.0\",\n"
-          + "      \"targets\" : {\n"
-          + "         \"employee/ASM_DD/1.recommended.json/config\" : {\n"
-          + "            \"custom\" : {\n"
-          + "               \"v\" : 1\n"
-          + "            },\n"
-          + "            \"hashes\" : {\n"
-          + "               \"sha256\" : \"6302258236e6051216b950583ec7136d946b463c17cbe64384ba5d566324819\"\n"
-          + "            },\n"
-          + "            \"length\" : 919\n"
-          + "         },\n"
-          + "         \"employee/ASM_DD/2.suggested.json/config\" : {\n"
-          + "            \"custom\" : {\n"
-          + "               \"v\" : 1\n"
-          + "            },\n"
-          + "            \"hashes\" : {\n"
-          + "               \"sha256\" : \"6302258236e6051216b950583ec7136d946b463c17cbe64384ba5d566324819\"\n"
-          + "            },\n"
-          + "            \"length\" : 919\n"
-          + "         },\n"
-          + "         \"employee/CWS_DD/2.default.policy/config\" : {\n"
-          + "            \"custom\" : {\n"
-          + "               \"v\" : 2\n"
-          + "            },\n"
-          + "            \"hashes\" : {\n"
-          + "               \"sha256\" : \"2f075fcaa9bdfc96bfc30d5a18711fbebf59d2cb3f3b5258d41ebdc1b1a54569\"\n"
-          + "            },\n"
-          + "            \"length\" : 34805\n"
-          + "         }\n"
-          + "      },\n"
-          + "      \"version\" : 23337393\n"
-          + "   }\n"
-          + "}\n";
-
-  private static final String SAMPLE_RESP_BODY =
-      "{\n"
-          + "   \"client_configs\" : [\n"
-          + "      \"employee/ASM_DD/1.recommended.json/config\"\n"
-          + "   ],\n"
-          + "   \"roots\" : [],\n"
-          + "   \"target_files\" : [\n"
-          + "      {\n"
-          + "         \"path\" : \"employee/ASM_DD/1.recommended.json/config\",\n"
-          + "         \"raw\" : \""
-          + b64(SAMPLE_APPSEC_CONFIG)
-          + "\"\n"
-          + "      },\n"
-          + "      {\n"
-          + "         \"path\" : \"employee/ASM_DD/2.suggested.json/config\",\n"
-          + "         \"raw\" : \""
-          + b64(SAMPLE_APPSEC_CONFIG)
-          + "\"\n"
-          + "      }\n"
-          + "   ],\n"
-          + "   \"targets\" : \""
-          + signAndBase64EncodeTargets(SAMPLE_TARGETS)
-          + "\"\n"
-          + "}\n";
-
-  private static final String FEATURES_RESP_BODY =
-      toJson(
-          map(
-              "client_configs", list("datadog/2/ASM_FEATURES/asm_features_activation/config"),
-              "roots", list(),
-              "target_files",
-                  list(
-                      map(
-                          "path",
-                          "datadog/2/ASM_FEATURES/asm_features_activation/config",
-                          "raw",
-                          b64(
-                              "{\"asm\":{\"enabled\":true},\"api_security\":{\"request_sample_rate\":0.1}}"))),
-              "targets",
-                  signAndBase64EncodeTargets(
-                      map(
-                          "signed",
-                          map(
-                              "expires",
-                              "2022-09-17T12:49:15Z",
-                              "spec_version",
-                              "1.0.0",
-                              "targets",
-                              map(
-                                  "datadog/2/ASM_FEATURES/asm_features_activation/config",
-                                  map(
-                                      "custom", map("v", 1),
-                                      "hashes",
-                                          map(
-                                              "sha256",
-                                              "b01cb68f140fbfb7a2bb0ce39a473aa59c33664aca0c871cf07b8f4e09e3e360"),
-                                      "length", 67)),
-                              "version",
-                              23337393)))));
-
-  private static String signAndBase64EncodeTargets(String targetsJson) {
-    return signAndBase64EncodeTargets(parseMap(targetsJson));
-  }
+    }
+
+    private static List<Object> list(Object... items) {
+        return new ArrayList<>(Arrays.asList(items));
+    }
+
+    private static Object parse(String json) {
+        try {
+            return MOSHI.adapter(Object.class).fromJson(json);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static Map<String, Object> parseMap(String json) {
+        return asMap(parse(json));
+    }
+
+    private static String toJson(Object value) {
+        return MOSHI.adapter(Object.class).toJson(value);
+    }
+
+    private static final String SAMPLE_APPSEC_CONFIG = "\n"
+            + "{\n"
+            + "    \"version\": \"2.2\",\n"
+            + "    \"metadata\": {\n"
+            + "        \"rules_version\": \"1.3.1\"\n"
+            + "    },\n"
+            + "    \"rules\": [\n"
+            + "        {\n"
+            + "            \"id\": \"crs-913-110\",\n"
+            + "            \"name\": \"Acunetix\",\n"
+            + "            \"tags\": {\n"
+            + "                \"type\": \"security_scanner\",\n"
+            + "                \"crs_id\": \"913110\",\n"
+            + "                \"category\": \"attack_attempt\"\n"
+            + "            },\n"
+            + "            \"conditions\": [\n"
+            + "                {\n"
+            + "                    \"parameters\": {\n"
+            + "                        \"inputs\": [\n"
+            + "                            {\n"
+            + "                                \"address\": \"server.request.headers.no_cookies\"\n"
+            + "                            }\n"
+            + "                        ],\n"
+            + "                        \"list\": [\n"
+            + "                            \"acunetix-product\"\n"
+            + "                        ]\n"
+            + "                    },\n"
+            + "                    \"operator\": \"phrase_match\"\n"
+            + "                }\n"
+            + "            ],\n"
+            + "            \"transformers\": [\n"
+            + "                \"lowercase\"\n"
+            + "            ]\n"
+            + "        }\n"
+            + "    ]\n"
+            + "}\n";
+
+    private static final String SAMPLE_TARGETS = "\n"
+            + "{\n"
+            + "   \"signatures\" : [\n"
+            + "      {\n"
+            + "         \"keyid\" : \"5c4ece41241a1bb513f6e3e5df74ab7d5183dfffbd71bfd43127920d880569fd\",\n"
+            + "         \"sig\" : \"766871ed1acc60ef35f9f24262682283a55e79334f5154486176033b67568aed82fe8139a1f78689b96473537f0a2e55c8365d50bff345ea9ac350d57b90390d\"\n"
+            + "      }\n"
+            + "   ],\n"
+            + "   \"signed\" : {\n"
+            + "      \"_type\" : \"targets\",\n"
+            + "      \"custom\" : {\n"
+            + "         \"opaque_backend_state\" : \"foobar\"\n"
+            + "      },\n"
+            + "      \"expires\" : \"2022-09-17T12:49:15Z\",\n"
+            + "      \"spec_version\" : \"1.0.0\",\n"
+            + "      \"targets\" : {\n"
+            + "         \"employee/ASM_DD/1.recommended.json/config\" : {\n"
+            + "            \"custom\" : {\n"
+            + "               \"v\" : 1\n"
+            + "            },\n"
+            + "            \"hashes\" : {\n"
+            + "               \"sha256\" : \"6302258236e6051216b950583ec7136d946b463c17cbe64384ba5d566324819\"\n"
+            + "            },\n"
+            + "            \"length\" : 919\n"
+            + "         },\n"
+            + "         \"employee/ASM_DD/2.suggested.json/config\" : {\n"
+            + "            \"custom\" : {\n"
+            + "               \"v\" : 1\n"
+            + "            },\n"
+            + "            \"hashes\" : {\n"
+            + "               \"sha256\" : \"6302258236e6051216b950583ec7136d946b463c17cbe64384ba5d566324819\"\n"
+            + "            },\n"
+            + "            \"length\" : 919\n"
+            + "         },\n"
+            + "         \"employee/CWS_DD/2.default.policy/config\" : {\n"
+            + "            \"custom\" : {\n"
+            + "               \"v\" : 2\n"
+            + "            },\n"
+            + "            \"hashes\" : {\n"
+            + "               \"sha256\" : \"2f075fcaa9bdfc96bfc30d5a18711fbebf59d2cb3f3b5258d41ebdc1b1a54569\"\n"
+            + "            },\n"
+            + "            \"length\" : 34805\n"
+            + "         }\n"
+            + "      },\n"
+            + "      \"version\" : 23337393\n"
+            + "   }\n"
+            + "}\n";
+
+    private static final String SAMPLE_RESP_BODY = "{\n"
+            + "   \"client_configs\" : [\n"
+            + "      \"employee/ASM_DD/1.recommended.json/config\"\n"
+            + "   ],\n"
+            + "   \"roots\" : [],\n"
+            + "   \"target_files\" : [\n"
+            + "      {\n"
+            + "         \"path\" : \"employee/ASM_DD/1.recommended.json/config\",\n"
+            + "         \"raw\" : \""
+            + b64(SAMPLE_APPSEC_CONFIG)
+            + "\"\n"
+            + "      },\n"
+            + "      {\n"
+            + "         \"path\" : \"employee/ASM_DD/2.suggested.json/config\",\n"
+            + "         \"raw\" : \""
+            + b64(SAMPLE_APPSEC_CONFIG)
+            + "\"\n"
+            + "      }\n"
+            + "   ],\n"
+            + "   \"targets\" : \""
+            + signAndBase64EncodeTargets(SAMPLE_TARGETS)
+            + "\"\n"
+            + "}\n";
+
+    private static final String FEATURES_RESP_BODY = toJson(map(
+            "client_configs", list("datadog/2/ASM_FEATURES/asm_features_activation/config"),
+            "roots", list(),
+            "target_files",
+                    list(map(
+                            "path",
+                            "datadog/2/ASM_FEATURES/asm_features_activation/config",
+                            "raw",
+                            b64("{\"asm\":{\"enabled\":true},\"api_security\":{\"request_sample_rate\":0.1}}"))),
+            "targets",
+                    signAndBase64EncodeTargets(map(
+                            "signed",
+                            map(
+                                    "expires",
+                                    "2022-09-17T12:49:15Z",
+                                    "spec_version",
+                                    "1.0.0",
+                                    "targets",
+                                    map(
+                                            "datadog/2/ASM_FEATURES/asm_features_activation/config",
+                                            map(
+                                                    "custom", map("v", 1),
+                                                    "hashes",
+                                                            map(
+                                                                    "sha256",
+                                                                    "b01cb68f140fbfb7a2bb0ce39a473aa59c33664aca0c871cf07b8f4e09e3e360"),
+                                                    "length", 67)),
+                                    "version",
+                                    23337393)))));
+
+    private static String signAndBase64EncodeTargets(String targetsJson) {
+        return signAndBase64EncodeTargets(parseMap(targetsJson));
+    }
 }
diff --git a/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/JsonCanonicalizerTests.java b/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/JsonCanonicalizerTests.java
index 48bf459b521..a36e67ee26b 100644
Binary files a/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/JsonCanonicalizerTests.java and b/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/JsonCanonicalizerTests.java differ
diff --git a/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/PollerRequestFactoryTest.java b/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/PollerRequestFactoryTest.java
index 9d5280e4783..332188566a1 100644
--- a/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/PollerRequestFactoryTest.java
+++ b/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/PollerRequestFactoryTest.java
@@ -25,99 +25,98 @@
 
 class PollerRequestFactoryTest extends DDJavaSpecification {
 
-  static final String TRACER_VERSION = "v1.2.3";
-  static final String CONTAINER_ID = "456";
-  static final String ENTITY_ID = "32423";
-  static final String INVALID_REMOTE_CONFIG_URL = "https://invalid.example.com/";
+    static final String TRACER_VERSION = "v1.2.3";
+    static final String CONTAINER_ID = "456";
+    static final String ENTITY_ID = "32423";
+    static final String INVALID_REMOTE_CONFIG_URL = "https://invalid.example.com/";
 
-  @Test
-  @WithConfig(key = "service", value = "Service Name")
-  @WithConfig(key = "env", value = "PROD")
-  @WithConfig(key = "tags", value = "version:1.0.0-SNAPSHOT")
-  @WithConfig(
-      key = "trace.global.tags",
-      value =
-          Tags.GIT_REPOSITORY_URL
-              + ":https://github.com/DataDog/dd-trace-java,"
-              + Tags.GIT_COMMIT_SHA
-              + ":1234")
-  void remoteConfigRequestFieldsBeenSanitized() {
-    PollerRequestFactory factory =
-        new PollerRequestFactory(
-            Config.get(), TRACER_VERSION, CONTAINER_ID, ENTITY_ID, INVALID_REMOTE_CONFIG_URL, null);
+    @Test
+    @WithConfig(key = "service", value = "Service Name")
+    @WithConfig(key = "env", value = "PROD")
+    @WithConfig(key = "tags", value = "version:1.0.0-SNAPSHOT")
+    @WithConfig(
+            key = "trace.global.tags",
+            value = Tags.GIT_REPOSITORY_URL
+                    + ":https://github.com/DataDog/dd-trace-java,"
+                    + Tags.GIT_COMMIT_SHA
+                    + ":1234")
+    void remoteConfigRequestFieldsBeenSanitized() {
+        PollerRequestFactory factory = new PollerRequestFactory(
+                Config.get(), TRACER_VERSION, CONTAINER_ID, ENTITY_ID, INVALID_REMOTE_CONFIG_URL, null);
 
-    RemoteConfigRequest request =
-        factory.buildRemoteConfigRequest(
-            Collections.singletonList("ASM"), null, null, 0, ServiceNameCollector.get());
+        RemoteConfigRequest request = factory.buildRemoteConfigRequest(
+                Collections.singletonList("ASM"), null, null, 0, ServiceNameCollector.get());
 
-    RemoteConfigRequest.ClientInfo.TracerInfo tracerInfo = request.getClient().getTracerInfo();
-    assertEquals("service_name", tracerInfo.getServiceName());
-    assertEquals("prod", tracerInfo.getServiceEnv());
-    assertEquals("1.0.0-snapshot", tracerInfo.getServiceVersion());
-    assertTrue(tracerInfo.getTags().contains("env:PROD"));
-    assertTrue(
-        tracerInfo
-            .getTags()
-            .contains(Tags.GIT_REPOSITORY_URL + ":https://github.com/DataDog/dd-trace-java"));
-    assertTrue(tracerInfo.getTags().contains(Tags.GIT_COMMIT_SHA + ":1234"));
-  }
-
-  @Test
-  @WithConfig(key = "service", value = "Service Name")
-  @WithConfig(key = "env", value = "PROD")
-  @WithConfig(key = "tags", value = "version:1.0.0-SNAPSHOT")
-  void remoteConfigRequestExtraServices() {
-    String extraService = "fakeExtraService";
-    ServiceNameCollector extraServicesProvider = ServiceNameCollector.get();
-    extraServicesProvider.clear();
-    extraServicesProvider.addService(extraService);
-    PollerRequestFactory factory =
-        new PollerRequestFactory(
-            Config.get(), TRACER_VERSION, CONTAINER_ID, ENTITY_ID, INVALID_REMOTE_CONFIG_URL, null);
+        RemoteConfigRequest.ClientInfo.TracerInfo tracerInfo =
+                request.getClient().getTracerInfo();
+        assertEquals("service_name", tracerInfo.getServiceName());
+        assertEquals("prod", tracerInfo.getServiceEnv());
+        assertEquals("1.0.0-snapshot", tracerInfo.getServiceVersion());
+        assertTrue(tracerInfo.getTags().contains("env:PROD"));
+        assertTrue(
+                tracerInfo.getTags().contains(Tags.GIT_REPOSITORY_URL + ":https://github.com/DataDog/dd-trace-java"));
+        assertTrue(tracerInfo.getTags().contains(Tags.GIT_COMMIT_SHA + ":1234"));
+    }
 
-    RemoteConfigRequest request =
-        factory.buildRemoteConfigRequest(
-            Collections.singletonList("ASM"), null, null, 0, extraServicesProvider);
+    @Test
+    @WithConfig(key = "service", value = "Service Name")
+    @WithConfig(key = "env", value = "PROD")
+    @WithConfig(key = "tags", value = "version:1.0.0-SNAPSHOT")
+    void remoteConfigRequestExtraServices() {
+        String extraService = "fakeExtraService";
+        ServiceNameCollector extraServicesProvider = ServiceNameCollector.get();
+        extraServicesProvider.clear();
+        extraServicesProvider.addService(extraService);
+        PollerRequestFactory factory = new PollerRequestFactory(
+                Config.get(), TRACER_VERSION, CONTAINER_ID, ENTITY_ID, INVALID_REMOTE_CONFIG_URL, null);
 
-    assertTrue(request.getClient().getTracerInfo().getExtraServices().contains(extraService));
-  }
+        RemoteConfigRequest request = factory.buildRemoteConfigRequest(
+                Collections.singletonList("ASM"), null, null, 0, extraServicesProvider);
 
-  @ParameterizedTest(name = "remote config provides process tags when enabled = {0}")
-  @ValueSource(booleans = {true, false})
-  void remoteConfigProvidesProcessTagsWhenEnabled(boolean enabled) throws Exception {
-    if (!enabled) {
-      injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "false");
+        assertTrue(request.getClient().getTracerInfo().getExtraServices().contains(extraService));
     }
-    ProcessTags.reset(Config.get());
-    PollerRequestFactory factory =
-        new PollerRequestFactory(
-            Config.get(), TRACER_VERSION, CONTAINER_ID, ENTITY_ID, INVALID_REMOTE_CONFIG_URL, null);
 
-    RemoteConfigRequest request =
-        factory.buildRemoteConfigRequest(
-            Collections.singletonList("ASM"), null, null, 0, ServiceNameCollector.get());
-    String json = new Moshi.Builder().build().adapter(RemoteConfigRequest.class).toJson(request);
+    @ParameterizedTest(name = "remote config provides process tags when enabled = {0}")
+    @ValueSource(booleans = {true, false})
+    void remoteConfigProvidesProcessTagsWhenEnabled(boolean enabled) throws Exception {
+        if (!enabled) {
+            injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "false");
+        }
+        ProcessTags.reset(Config.get());
+        PollerRequestFactory factory = new PollerRequestFactory(
+                Config.get(), TRACER_VERSION, CONTAINER_ID, ENTITY_ID, INVALID_REMOTE_CONFIG_URL, null);
+
+        RemoteConfigRequest request = factory.buildRemoteConfigRequest(
+                Collections.singletonList("ASM"), null, null, 0, ServiceNameCollector.get());
+        String json =
+                new Moshi.Builder().build().adapter(RemoteConfigRequest.class).toJson(request);
 
-    List<String> processTags = request.getClient().getTracerInfo().getProcessTags();
-    String entrypointName = findMatching(processTags, "entrypoint.name:.+");
-    String workingDir = findMatching(processTags, "entrypoint.workdir:.+");
+        List<String> processTags = request.getClient().getTracerInfo().getProcessTags();
+        String entrypointName = findMatching(processTags, "entrypoint.name:.+");
+        String workingDir = findMatching(processTags, "entrypoint.workdir:.+");
 
-    if (enabled) {
-      assertNotNull(workingDir);
-      assertNotNull(entrypointName);
-      assertThatJson(json).node("client.client_tracer.process_tags").isArray().isNotEmpty();
-    } else {
-      assertNull(workingDir);
-      assertNull(entrypointName);
-      assertThatJson(json).node("client.client_tracer.process_tags").isAbsent();
+        if (enabled) {
+            assertNotNull(workingDir);
+            assertNotNull(entrypointName);
+            assertThatJson(json)
+                    .node("client.client_tracer.process_tags")
+                    .isArray()
+                    .isNotEmpty();
+        } else {
+            assertNull(workingDir);
+            assertNull(entrypointName);
+            assertThatJson(json).node("client.client_tracer.process_tags").isAbsent();
+        }
     }
-  }
 
-  private static String findMatching(List<String> tags, String regex) {
-    if (tags == null) {
-      return null;
+    private static String findMatching(List<String> tags, String regex) {
+        if (tags == null) {
+            return null;
+        }
+        Pattern pattern = Pattern.compile(regex);
+        return tags.stream()
+                .filter(tag -> pattern.matcher(tag).find())
+                .findFirst()
+                .orElse(null);
     }
-    Pattern pattern = Pattern.compile(regex);
-    return tags.stream().filter(tag -> pattern.matcher(tag).find()).findFirst().orElse(null);
-  }
 }
diff --git a/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/Rcte1TestVectorsSpecification.java b/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/Rcte1TestVectorsSpecification.java
index 8cd8b03d3ed..2e0c08cec4c 100644
--- a/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/Rcte1TestVectorsSpecification.java
+++ b/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/Rcte1TestVectorsSpecification.java
@@ -34,137 +34,125 @@
 import org.junit.jupiter.api.Test;
 import org.tabletest.junit.TableTest;
 
-@WithConfig(
-    key = "rc.targets.key.id",
-    value = "ed7672c9a24abda78872ee32ee71c7cb1d5235e8db4ecbf1ca28b9c50eb75d9e")
-@WithConfig(
-    key = "rc.targets.key",
-    value = "7d3102e39abe71044d207550bda239c71380d013ec5a115f79f51622630054e6")
+@WithConfig(key = "rc.targets.key.id", value = "ed7672c9a24abda78872ee32ee71c7cb1d5235e8db4ecbf1ca28b9c50eb75d9e")
+@WithConfig(key = "rc.targets.key", value = "7d3102e39abe71044d207550bda239c71380d013ec5a115f79f51622630054e6")
 @WithConfig(key = "remote_config.integrity_check.enabled", value = "true")
 class Rcte1TestVectorsSpecification extends DDJavaSpecification {
-  private static final int DEFAULT_POLL_PERIOD = 5000;
-
-  private static final HttpUrl URL = HttpUrl.get("https://example.com/v0.7/config");
-  private static final Request REQUEST = new Request.Builder().url("https://example.com").build();
-
-  private final Moshi moshi = new Moshi.Builder().build();
-
-  private final OkHttpClient okHttpClient = mock(OkHttpClient.class);
-  private final AgentTaskScheduler scheduler = mock(AgentTaskScheduler.class);
-
-  @SuppressWarnings("unchecked")
-  private final AgentTaskScheduler.Scheduled<ConfigurationPoller> scheduled =
-      mock(AgentTaskScheduler.Scheduled.class);
-
-  private final Call call = mock(Call.class);
-
-  private ConfigurationPoller poller;
-  private AgentTaskScheduler.Task<ConfigurationPoller> task;
-  private Request request;
-
-  private Response buildOKResponse(String bodyStr) {
-    ResponseBody body = ResponseBody.create(MediaType.get("application/json"), bodyStr);
-    return new Response.Builder()
-        .request(REQUEST)
-        .protocol(Protocol.HTTP_1_1)
-        .message("OK")
-        .body(body)
-        .code(200)
-        .build();
-  }
-
-  @BeforeEach
-  void setup() {
-    Supplier<String> urlSupplier = URL::toString;
-    poller =
-        new DefaultConfigurationPoller(
-            Config.get(), "0.0.0", "containerid", "entityid", urlSupplier, okHttpClient, scheduler);
-  }
-
-  private static String getFileContents(String baseFileName) throws IOException {
-    return new String(
-        Files.readAllBytes(Paths.get("src/test/resources/rcte1/" + baseFileName + ".json")),
-        StandardCharsets.UTF_8);
-  }
-
-  private static String bodyToString(RequestBody body) throws IOException {
-    Buffer buffer = new Buffer();
-    body.writeTo(buffer);
-    return buffer.readUtf8();
-  }
-
-  private void stubScheduling() {
-    when(scheduler.scheduleAtFixedRate(
-            any(), eq(poller), eq(0L), eq((long) DEFAULT_POLL_PERIOD), eq(TimeUnit.MILLISECONDS)))
-        .thenAnswer(
-            invocation -> {
-              task = invocation.getArgument(0);
-              return scheduled;
-            });
-  }
-
-  @Test
-  void validFile() throws IOException {
-    AtomicReference<Object> savedConfig = new AtomicReference<>();
-    ConfigurationDeserializer<Object> deserializer =
-        content ->
-            moshi.adapter(Object.class).fromJson(new String(content, StandardCharsets.UTF_8));
-    ConfigurationChangesTypedListener<Object> listener =
-        (configKey, config, hinter) -> savedConfig.set(config);
-    poller.addListener(Product.ASM_DD, deserializer, listener);
-
-    stubScheduling();
-    poller.start();
-    assertNotNull(task);
-
-    when(okHttpClient.newCall(any(Request.class)))
-        .thenAnswer(
-            invocation -> {
-              request = invocation.getArgument(0);
-              return call;
-            });
-    when(call.execute()).thenReturn(buildOKResponse(getFileContents("validOneFile")));
-
-    task.run(poller);
-
-    assertNotNull(savedConfig.get());
-  }
-
-  @TableTest({
-    "scenario            | baseFileName                    | message                                                                                     ",
-    "invalid signing key | targetsSignedWithInvalidKey     | 'Missing signature for key ed7672c9a24abda78872ee32ee71c7cb1d5235e8db4ecbf1ca28b9c50eb75d9e'",
-    "invalid signature   | tufTargetsInvalidSignature      | 'Signature verification failed for targets.signed'                                          ",
-    "invalid file hash   | tufTargetsInvalidTargetFileHash | 'does not have the expected sha256 hash'                                                    ",
-    "missing target file | tufTargetsMissingTargetFile     | 'is in target_files, but not in targets.signed'                                             "
-  })
-  void invalidFile(String baseFileName, String message) throws IOException {
-    ConfigurationDeserializer<Object> deserializer =
-        content -> {
-          fail("should never be called");
-          return null;
+    private static final int DEFAULT_POLL_PERIOD = 5000;
+
+    private static final HttpUrl URL = HttpUrl.get("https://example.com/v0.7/config");
+    private static final Request REQUEST =
+            new Request.Builder().url("https://example.com").build();
+
+    private final Moshi moshi = new Moshi.Builder().build();
+
+    private final OkHttpClient okHttpClient = mock(OkHttpClient.class);
+    private final AgentTaskScheduler scheduler = mock(AgentTaskScheduler.class);
+
+    @SuppressWarnings("unchecked")
+    private final AgentTaskScheduler.Scheduled<ConfigurationPoller> scheduled =
+            mock(AgentTaskScheduler.Scheduled.class);
+
+    private final Call call = mock(Call.class);
+
+    private ConfigurationPoller poller;
+    private AgentTaskScheduler.Task<ConfigurationPoller> task;
+    private Request request;
+
+    private Response buildOKResponse(String bodyStr) {
+        ResponseBody body = ResponseBody.create(MediaType.get("application/json"), bodyStr);
+        return new Response.Builder()
+                .request(REQUEST)
+                .protocol(Protocol.HTTP_1_1)
+                .message("OK")
+                .body(body)
+                .code(200)
+                .build();
+    }
+
+    @BeforeEach
+    void setup() {
+        Supplier<String> urlSupplier = URL::toString;
+        poller = new DefaultConfigurationPoller(
+                Config.get(), "0.0.0", "containerid", "entityid", urlSupplier, okHttpClient, scheduler);
+    }
+
+    private static String getFileContents(String baseFileName) throws IOException {
+        return new String(
+                Files.readAllBytes(Paths.get("src/test/resources/rcte1/" + baseFileName + ".json")),
+                StandardCharsets.UTF_8);
+    }
+
+    private static String bodyToString(RequestBody body) throws IOException {
+        Buffer buffer = new Buffer();
+        body.writeTo(buffer);
+        return buffer.readUtf8();
+    }
+
+    private void stubScheduling() {
+        when(scheduler.scheduleAtFixedRate(
+                        any(), eq(poller), eq(0L), eq((long) DEFAULT_POLL_PERIOD), eq(TimeUnit.MILLISECONDS)))
+                .thenAnswer(invocation -> {
+                    task = invocation.getArgument(0);
+                    return scheduled;
+                });
+    }
+
+    @Test
+    void validFile() throws IOException {
+        AtomicReference<Object> savedConfig = new AtomicReference<>();
+        ConfigurationDeserializer<Object> deserializer =
+                content -> moshi.adapter(Object.class).fromJson(new String(content, StandardCharsets.UTF_8));
+        ConfigurationChangesTypedListener<Object> listener = (configKey, config, hinter) -> savedConfig.set(config);
+        poller.addListener(Product.ASM_DD, deserializer, listener);
+
+        stubScheduling();
+        poller.start();
+        assertNotNull(task);
+
+        when(okHttpClient.newCall(any(Request.class))).thenAnswer(invocation -> {
+            request = invocation.getArgument(0);
+            return call;
+        });
+        when(call.execute()).thenReturn(buildOKResponse(getFileContents("validOneFile")));
+
+        task.run(poller);
+
+        assertNotNull(savedConfig.get());
+    }
+
+    @TableTest({
+      "scenario            | baseFileName                    | message                                                                                     ",
+      "invalid signing key | targetsSignedWithInvalidKey     | 'Missing signature for key ed7672c9a24abda78872ee32ee71c7cb1d5235e8db4ecbf1ca28b9c50eb75d9e'",
+      "invalid signature   | tufTargetsInvalidSignature      | 'Signature verification failed for targets.signed'                                          ",
+      "invalid file hash   | tufTargetsInvalidTargetFileHash | 'does not have the expected sha256 hash'                                                    ",
+      "missing target file | tufTargetsMissingTargetFile     | 'is in target_files, but not in targets.signed'                                             "
+    })
+    void invalidFile(String baseFileName, String message) throws IOException {
+        ConfigurationDeserializer<Object> deserializer = content -> {
+            fail("should never be called");
+            return null;
         };
-    ConfigurationChangesTypedListener<Object> listener = (configKey, config, hinter) -> {};
-    poller.addListener(Product.ASM_DD, deserializer, listener);
-
-    stubScheduling();
-    poller.start();
-    assertNotNull(task);
-
-    when(okHttpClient.newCall(any(Request.class)))
-        .thenAnswer(
-            invocation -> {
-              request = invocation.getArgument(0);
-              return call;
-            });
-    when(call.execute())
-        .thenReturn(buildOKResponse(getFileContents(baseFileName)))
-        .thenReturn(buildOKResponse("validOneFile"));
-
-    task.run(poller);
-    task.run(poller);
-
-    String bodyJson = bodyToString(request.body());
-    assertThatJson(bodyJson).node("client.state.has_error").isEqualTo(true);
-    assertThatJson(bodyJson).node("client.state.error").asString().contains(message);
-  }
+        ConfigurationChangesTypedListener<Object> listener = (configKey, config, hinter) -> {};
+        poller.addListener(Product.ASM_DD, deserializer, listener);
+
+        stubScheduling();
+        poller.start();
+        assertNotNull(task);
+
+        when(okHttpClient.newCall(any(Request.class))).thenAnswer(invocation -> {
+            request = invocation.getArgument(0);
+            return call;
+        });
+        when(call.execute())
+                .thenReturn(buildOKResponse(getFileContents(baseFileName)))
+                .thenReturn(buildOKResponse("validOneFile"));
+
+        task.run(poller);
+        task.run(poller);
+
+        String bodyJson = bodyToString(request.body());
+        assertThatJson(bodyJson).node("client.state.has_error").isEqualTo(true);
+        assertThatJson(bodyJson).node("client.state.error").asString().contains(message);
+    }
 }
diff --git a/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/state/ParsedConfigKeyTests.java b/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/state/ParsedConfigKeyTests.java
index d0677adcbf2..2f429b27d08 100644
--- a/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/state/ParsedConfigKeyTests.java
+++ b/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/state/ParsedConfigKeyTests.java
@@ -10,27 +10,25 @@
 
 class ParsedConfigKeyTests {
 
-  @TableTest({
-    "scenario        | configKey                                                                  | org      | version | product        | configId                                     ",
-    "no version      | employee/ASM_DD/1.recommended.json/config                                  | employee |         | ASM_DD         | 1.recommended.json                           ",
-    "live debugging  | datadog/2/LIVE_DEBUGGING/Snapshot_1ba66cc9-146a-3479-9e66-2b63fd580f48/dog | datadog  | 2       | LIVE_DEBUGGING | Snapshot_1ba66cc9-146a-3479-9e66-2b63fd580f48",
-    "unknown product | datadog/2/NOT_REAL_PRODUCT/123/dogoz                                       | datadog  | 2       | _UNKNOWN       | 123                                          "
-  })
-  void parseExtractsRightSegments(
-      String configKey, String org, Integer version, Product product, String configId) {
-    ParsedConfigKey parsed = ParsedConfigKey.parse(configKey);
+    @TableTest({
+      "scenario        | configKey                                                                  | org      | version | product        | configId                                     ",
+      "no version      | employee/ASM_DD/1.recommended.json/config                                  | employee |         | ASM_DD         | 1.recommended.json                           ",
+      "live debugging  | datadog/2/LIVE_DEBUGGING/Snapshot_1ba66cc9-146a-3479-9e66-2b63fd580f48/dog | datadog  | 2       | LIVE_DEBUGGING | Snapshot_1ba66cc9-146a-3479-9e66-2b63fd580f48",
+      "unknown product | datadog/2/NOT_REAL_PRODUCT/123/dogoz                                       | datadog  | 2       | _UNKNOWN       | 123                                          "
+    })
+    void parseExtractsRightSegments(String configKey, String org, Integer version, Product product, String configId) {
+        ParsedConfigKey parsed = ParsedConfigKey.parse(configKey);
 
-    assertEquals(org, parsed.getOrg());
-    assertEquals(version, parsed.getVersion());
-    assertEquals(product, parsed.getProduct());
-    assertEquals(configId, parsed.getConfigId());
-    assertEquals(configKey, parsed.toString());
-  }
+        assertEquals(org, parsed.getOrg());
+        assertEquals(version, parsed.getVersion());
+        assertEquals(product, parsed.getProduct());
+        assertEquals(configId, parsed.getConfigId());
+        assertEquals(configKey, parsed.toString());
+    }
 
-  @Test
-  void wrongFormatConfigKeyFails() {
-    ReportableException exception =
-        assertThrows(ReportableException.class, () -> ParsedConfigKey.parse("foo"));
-    assertEquals("Not a valid config key: foo", exception.getMessage());
-  }
+    @Test
+    void wrongFormatConfigKeyFails() {
+        ReportableException exception = assertThrows(ReportableException.class, () -> ParsedConfigKey.parse("foo"));
+        assertEquals("Not a valid config key: foo", exception.getMessage());
+    }
 }
diff --git a/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/state/ProductStateSpecification.java b/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/state/ProductStateSpecification.java
index 360c2d0a99c..1057f5584dc 100644
--- a/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/state/ProductStateSpecification.java
+++ b/remote-config/remote-config-core/src/test/java/datadog/remoteconfig/state/ProductStateSpecification.java
@@ -25,359 +25,343 @@
 
 class ProductStateSpecification {
 
-  private final PollingRateHinter hinter = mock(PollingRateHinter.class);
-
-  @Test
-  void testApplyForNonAsmDdProductAppliesChangesBeforeRemoves() {
-    // a ProductState for ASM_DATA
-    ProductState productState = new ProductState(Product.ASM_DATA);
-    OrderRecordingListener listener = new OrderRecordingListener();
-    productState.addProductListener(listener);
-
-    // first apply with config1 to cache it
-    RemoteConfigResponse response1 =
-        buildResponse(targets("org/ASM_DATA/config1/foo", new TargetSpec(1, 8, "oldhash1")));
-    ParsedConfigKey key1 = ParsedConfigKey.parse("org/ASM_DATA/config1/foo");
-    productState.apply(response1, Collections.singletonList(key1), hinter);
-    listener.operations.clear(); // Clear for the actual test
-
-    // a new response with config1 (changed hash) and config2 (new)
-    RemoteConfigResponse response2 =
-        buildResponse(
-            targets(
+    private final PollingRateHinter hinter = mock(PollingRateHinter.class);
+
+    @Test
+    void testApplyForNonAsmDdProductAppliesChangesBeforeRemoves() {
+        // a ProductState for ASM_DATA
+        ProductState productState = new ProductState(Product.ASM_DATA);
+        OrderRecordingListener listener = new OrderRecordingListener();
+        productState.addProductListener(listener);
+
+        // first apply with config1 to cache it
+        RemoteConfigResponse response1 =
+                buildResponse(targets("org/ASM_DATA/config1/foo", new TargetSpec(1, 8, "oldhash1")));
+        ParsedConfigKey key1 = ParsedConfigKey.parse("org/ASM_DATA/config1/foo");
+        productState.apply(response1, Collections.singletonList(key1), hinter);
+        listener.operations.clear(); // Clear for the actual test
+
+        // a new response with config1 (changed hash) and config2 (new)
+        RemoteConfigResponse response2 = buildResponse(targets(
                 "org/ASM_DATA/config1/foo", new TargetSpec(2, 8, "newhash1"),
                 "org/ASM_DATA/config2/foo", new TargetSpec(1, 8, "hash2")));
-    ParsedConfigKey key2 = ParsedConfigKey.parse("org/ASM_DATA/config2/foo");
-
-    // apply is called
-    boolean changed = productState.apply(response2, Arrays.asList(key1, key2), hinter);
-
-    // changes are detected
-    assertTrue(changed);
-
-    // operations happen in order: apply config1, apply config2, commit (no removes)
-    assertEquals(
-        Arrays.asList(
-            "accept:org/ASM_DATA/config1/foo", "accept:org/ASM_DATA/config2/foo", "commit"),
-        listener.operations);
-  }
-
-  @Test
-  void testApplyForAsmDdProductAppliesChangesAfterRemoves() {
-    // a ProductState for ASM_DD
-    ProductState productState = new ProductState(Product.ASM_DD);
-    OrderRecordingListener listener = new OrderRecordingListener();
-    productState.addProductListener(listener);
-
-    // first apply with config1 and config2 to cache them
-    RemoteConfigResponse response1 =
-        buildResponse(
-            targets(
+        ParsedConfigKey key2 = ParsedConfigKey.parse("org/ASM_DATA/config2/foo");
+
+        // apply is called
+        boolean changed = productState.apply(response2, Arrays.asList(key1, key2), hinter);
+
+        // changes are detected
+        assertTrue(changed);
+
+        // operations happen in order: apply config1, apply config2, commit (no removes)
+        assertEquals(
+                Arrays.asList("accept:org/ASM_DATA/config1/foo", "accept:org/ASM_DATA/config2/foo", "commit"),
+                listener.operations);
+    }
+
+    @Test
+    void testApplyForAsmDdProductAppliesChangesAfterRemoves() {
+        // a ProductState for ASM_DD
+        ProductState productState = new ProductState(Product.ASM_DD);
+        OrderRecordingListener listener = new OrderRecordingListener();
+        productState.addProductListener(listener);
+
+        // first apply with config1 and config2 to cache them
+        RemoteConfigResponse response1 = buildResponse(targets(
                 "org/ASM_DD/config1/foo", new TargetSpec(1, 8, "oldhash1"),
                 "org/ASM_DD/config2/foo", new TargetSpec(1, 8, "hash2")));
-    ParsedConfigKey key1 = ParsedConfigKey.parse("org/ASM_DD/config1/foo");
-    ParsedConfigKey key2 = ParsedConfigKey.parse("org/ASM_DD/config2/foo");
-    productState.apply(response1, Arrays.asList(key1, key2), hinter);
-    listener.operations.clear(); // Clear for the actual test
-
-    // a new response with only config1 (changed hash) - config2 will be removed
-    RemoteConfigResponse response2 =
-        buildResponse(targets("org/ASM_DD/config1/foo", new TargetSpec(2, 8, "newhash1")));
-
-    // apply is called
-    boolean changed = productState.apply(response2, Collections.singletonList(key1), hinter);
-
-    // changes are detected
-    assertTrue(changed);
-
-    // operations happen in order: remove config2 FIRST, then apply config1, then commit
-    assertEquals(
-        Arrays.asList("remove:org/ASM_DD/config2/foo", "accept:org/ASM_DD/config1/foo", "commit"),
-        listener.operations);
-  }
-
-  @Test
-  void testAsmDdWithMultipleNewConfigsRemovesBeforeAppliesAll() {
-    // a ProductState for ASM_DD
-    ProductState productState = new ProductState(Product.ASM_DD);
-    OrderRecordingListener listener = new OrderRecordingListener();
-    productState.addProductListener(listener);
-
-    // first apply with old configs
-    RemoteConfigResponse response1 =
-        buildResponse(
-            targets(
+        ParsedConfigKey key1 = ParsedConfigKey.parse("org/ASM_DD/config1/foo");
+        ParsedConfigKey key2 = ParsedConfigKey.parse("org/ASM_DD/config2/foo");
+        productState.apply(response1, Arrays.asList(key1, key2), hinter);
+        listener.operations.clear(); // Clear for the actual test
+
+        // a new response with only config1 (changed hash) - config2 will be removed
+        RemoteConfigResponse response2 =
+                buildResponse(targets("org/ASM_DD/config1/foo", new TargetSpec(2, 8, "newhash1")));
+
+        // apply is called
+        boolean changed = productState.apply(response2, Collections.singletonList(key1), hinter);
+
+        // changes are detected
+        assertTrue(changed);
+
+        // operations happen in order: remove config2 FIRST, then apply config1, then commit
+        assertEquals(
+                Arrays.asList("remove:org/ASM_DD/config2/foo", "accept:org/ASM_DD/config1/foo", "commit"),
+                listener.operations);
+    }
+
+    @Test
+    void testAsmDdWithMultipleNewConfigsRemovesBeforeAppliesAll() {
+        // a ProductState for ASM_DD
+        ProductState productState = new ProductState(Product.ASM_DD);
+        OrderRecordingListener listener = new OrderRecordingListener();
+        productState.addProductListener(listener);
+
+        // first apply with old configs
+        RemoteConfigResponse response1 = buildResponse(targets(
                 "org/ASM_DD/old1/foo", new TargetSpec(1, 8, "hash_old1"),
                 "org/ASM_DD/old2/foo", new TargetSpec(1, 8, "hash_old2")));
-    ParsedConfigKey oldKey1 = ParsedConfigKey.parse("org/ASM_DD/old1/foo");
-    ParsedConfigKey oldKey2 = ParsedConfigKey.parse("org/ASM_DD/old2/foo");
-    productState.apply(response1, Arrays.asList(oldKey1, oldKey2), hinter);
-    listener.operations.clear(); // Clear for the actual test
-
-    // a response with completely new configs
-    RemoteConfigResponse response2 =
-        buildResponse(
-            targets(
+        ParsedConfigKey oldKey1 = ParsedConfigKey.parse("org/ASM_DD/old1/foo");
+        ParsedConfigKey oldKey2 = ParsedConfigKey.parse("org/ASM_DD/old2/foo");
+        productState.apply(response1, Arrays.asList(oldKey1, oldKey2), hinter);
+        listener.operations.clear(); // Clear for the actual test
+
+        // a response with completely new configs
+        RemoteConfigResponse response2 = buildResponse(targets(
                 "org/ASM_DD/new1/foo", new TargetSpec(1, 8, "hash_new1"),
                 "org/ASM_DD/new2/foo", new TargetSpec(1, 8, "hash_new2")));
-    ParsedConfigKey newKey1 = ParsedConfigKey.parse("org/ASM_DD/new1/foo");
-    ParsedConfigKey newKey2 = ParsedConfigKey.parse("org/ASM_DD/new2/foo");
-
-    // apply is called
-    boolean changed = productState.apply(response2, Arrays.asList(newKey1, newKey2), hinter);
-
-    // changes are detected
-    assertTrue(changed);
-
-    // all removes happen before all applies
-    assertEquals(5, listener.operations.size()); // 2 removes + 2 accepts + 1 commit
-    assertEquals(2, countStartingWith(listener.operations, "remove:"));
-    assertEquals(2, countStartingWith(listener.operations, "accept:"));
-
-    // removes come before accepts
-    int lastRemoveIdx = lastIndexStartingWith(listener.operations, "remove:");
-    int firstAcceptIdx = firstIndexStartingWith(listener.operations, "accept:");
-    assertTrue(lastRemoveIdx < firstAcceptIdx);
-  }
-
-  @Test
-  void testNoChangesDetectedWhenConfigHashesMatch() {
-    // a ProductState
-    ProductState productState = new ProductState(Product.ASM_DATA);
-    OrderRecordingListener listener = new OrderRecordingListener();
-    productState.addProductListener(listener);
-
-    // first apply with a config
-    RemoteConfigResponse response =
-        buildResponse(targets("org/ASM_DATA/config1/foo", new TargetSpec(1, 8, "hash1")));
-    ParsedConfigKey key1 = ParsedConfigKey.parse("org/ASM_DATA/config1/foo");
-    productState.apply(response, Collections.singletonList(key1), hinter);
-    listener.operations.clear(); // Clear for the actual test
-
-    // apply is called again with the same hash
-    boolean changed = productState.apply(response, Collections.singletonList(key1), hinter);
-
-    // no changes are detected
-    assertFalse(changed);
-
-    // no listener operations occurred
-    assertTrue(listener.operations.isEmpty());
-  }
-
-  @Test
-  void testErrorHandlingDuringApply() throws Exception {
-    // a ProductState
-    ProductState productState = new ProductState(Product.ASM_DATA);
-    ProductListener listener = mock(ProductListener.class);
-    productState.addProductListener(listener);
-
-    // a response with a config
-    RemoteConfigResponse response =
-        buildResponse(targets("org/ASM_DATA/config1/foo", new TargetSpec(1, 8, "hash1")));
-
-    // listener throws an exception
-    doThrow(new RuntimeException("Listener error")).when(listener).accept(any(), any(), any());
-
-    ParsedConfigKey key1 = ParsedConfigKey.parse("org/ASM_DATA/config1/foo");
-
-    // apply is called
-    boolean changed = productState.apply(response, Collections.singletonList(key1), hinter);
-
-    // changes are still detected
-    assertTrue(changed);
-
-    // commit is still called despite the error
-    verify(listener).commit(hinter);
-  }
-
-  @Test
-  void testReportableExceptionIsRecorded() throws Exception {
-    // a ProductState
-    ProductState productState = new ProductState(Product.ASM_DATA);
-    ProductListener listener = mock(ProductListener.class);
-    productState.addProductListener(listener);
-
-    // a response with a config
-    RemoteConfigResponse response =
-        buildResponse(targets("org/ASM_DATA/config1/foo", new TargetSpec(1, 8, "hash1")));
-
-    // listener throws a ReportableException
-    ReportableException exception = new ReportableException("Test error");
-    doThrow(exception).when(listener).accept(any(), any(), any());
-
-    ParsedConfigKey key1 = ParsedConfigKey.parse("org/ASM_DATA/config1/foo");
-
-    // apply is called
-    productState.apply(response, Collections.singletonList(key1), hinter);
-
-    // error is recorded
-    assertTrue(productState.hasError());
-    assertTrue(productState.getErrors().contains(exception));
-  }
-
-  @Test
-  void testConfigListenersAreCalledInAdditionToProductListeners() {
-    // a ProductState
-    ProductState productState = new ProductState(Product.ASM_DATA);
-    OrderRecordingListener productListener = new OrderRecordingListener();
-    OrderRecordingListener configListener = new OrderRecordingListener();
-    productState.addProductListener(productListener);
-    productState.addProductListener("config1", configListener);
-
-    // a response with two configs
-    RemoteConfigResponse response =
-        buildResponse(
-            targets(
+        ParsedConfigKey newKey1 = ParsedConfigKey.parse("org/ASM_DD/new1/foo");
+        ParsedConfigKey newKey2 = ParsedConfigKey.parse("org/ASM_DD/new2/foo");
+
+        // apply is called
+        boolean changed = productState.apply(response2, Arrays.asList(newKey1, newKey2), hinter);
+
+        // changes are detected
+        assertTrue(changed);
+
+        // all removes happen before all applies
+        assertEquals(5, listener.operations.size()); // 2 removes + 2 accepts + 1 commit
+        assertEquals(2, countStartingWith(listener.operations, "remove:"));
+        assertEquals(2, countStartingWith(listener.operations, "accept:"));
+
+        // removes come before accepts
+        int lastRemoveIdx = lastIndexStartingWith(listener.operations, "remove:");
+        int firstAcceptIdx = firstIndexStartingWith(listener.operations, "accept:");
+        assertTrue(lastRemoveIdx < firstAcceptIdx);
+    }
+
+    @Test
+    void testNoChangesDetectedWhenConfigHashesMatch() {
+        // a ProductState
+        ProductState productState = new ProductState(Product.ASM_DATA);
+        OrderRecordingListener listener = new OrderRecordingListener();
+        productState.addProductListener(listener);
+
+        // first apply with a config
+        RemoteConfigResponse response =
+                buildResponse(targets("org/ASM_DATA/config1/foo", new TargetSpec(1, 8, "hash1")));
+        ParsedConfigKey key1 = ParsedConfigKey.parse("org/ASM_DATA/config1/foo");
+        productState.apply(response, Collections.singletonList(key1), hinter);
+        listener.operations.clear(); // Clear for the actual test
+
+        // apply is called again with the same hash
+        boolean changed = productState.apply(response, Collections.singletonList(key1), hinter);
+
+        // no changes are detected
+        assertFalse(changed);
+
+        // no listener operations occurred
+        assertTrue(listener.operations.isEmpty());
+    }
+
+    @Test
+    void testErrorHandlingDuringApply() throws Exception {
+        // a ProductState
+        ProductState productState = new ProductState(Product.ASM_DATA);
+        ProductListener listener = mock(ProductListener.class);
+        productState.addProductListener(listener);
+
+        // a response with a config
+        RemoteConfigResponse response =
+                buildResponse(targets("org/ASM_DATA/config1/foo", new TargetSpec(1, 8, "hash1")));
+
+        // listener throws an exception
+        doThrow(new RuntimeException("Listener error")).when(listener).accept(any(), any(), any());
+
+        ParsedConfigKey key1 = ParsedConfigKey.parse("org/ASM_DATA/config1/foo");
+
+        // apply is called
+        boolean changed = productState.apply(response, Collections.singletonList(key1), hinter);
+
+        // changes are still detected
+        assertTrue(changed);
+
+        // commit is still called despite the error
+        verify(listener).commit(hinter);
+    }
+
+    @Test
+    void testReportableExceptionIsRecorded() throws Exception {
+        // a ProductState
+        ProductState productState = new ProductState(Product.ASM_DATA);
+        ProductListener listener = mock(ProductListener.class);
+        productState.addProductListener(listener);
+
+        // a response with a config
+        RemoteConfigResponse response =
+                buildResponse(targets("org/ASM_DATA/config1/foo", new TargetSpec(1, 8, "hash1")));
+
+        // listener throws a ReportableException
+        ReportableException exception = new ReportableException("Test error");
+        doThrow(exception).when(listener).accept(any(), any(), any());
+
+        ParsedConfigKey key1 = ParsedConfigKey.parse("org/ASM_DATA/config1/foo");
+
+        // apply is called
+        productState.apply(response, Collections.singletonList(key1), hinter);
+
+        // error is recorded
+        assertTrue(productState.hasError());
+        assertTrue(productState.getErrors().contains(exception));
+    }
+
+    @Test
+    void testConfigListenersAreCalledInAdditionToProductListeners() {
+        // a ProductState
+        ProductState productState = new ProductState(Product.ASM_DATA);
+        OrderRecordingListener productListener = new OrderRecordingListener();
+        OrderRecordingListener configListener = new OrderRecordingListener();
+        productState.addProductListener(productListener);
+        productState.addProductListener("config1", configListener);
+
+        // a response with two configs
+        RemoteConfigResponse response = buildResponse(targets(
                 "org/ASM_DATA/config1/foo", new TargetSpec(1, 8, "hash1"),
                 "org/ASM_DATA/config2/foo", new TargetSpec(1, 8, "hash2")));
 
-    ParsedConfigKey key1 = ParsedConfigKey.parse("org/ASM_DATA/config1/foo");
-    ParsedConfigKey key2 = ParsedConfigKey.parse("org/ASM_DATA/config2/foo");
-
-    // apply is called
-    productState.apply(response, Arrays.asList(key1, key2), hinter);
-
-    // productListener received both configs
-    assertEquals(2, countStartingWith(productListener.operations, "accept:"));
-
-    // configListener only received config1
-    assertEquals(
-        Arrays.asList("accept:org/ASM_DATA/config1/foo", "commit"), configListener.operations);
-  }
-
-  @Test
-  void testRemoveOperationsCleanupCachedData() throws Exception {
-    // a ProductState
-    ProductState productState = new ProductState(Product.ASM_DATA);
-    ProductListener listener = mock(ProductListener.class);
-    productState.addProductListener(listener);
-
-    // first apply with a config to cache it
-    RemoteConfigResponse response1 =
-        buildResponse(targets("org/ASM_DATA/config1/foo", new TargetSpec(1, 8, "hash1")));
-    ParsedConfigKey key1 = ParsedConfigKey.parse("org/ASM_DATA/config1/foo");
-    productState.apply(response1, Collections.singletonList(key1), hinter);
-
-    // an empty response (config should be removed)
-    RemoteConfigResponse response2 = buildResponse(Collections.emptyMap());
-
-    // apply is called
-    boolean changed =
-        productState.apply(response2, Collections.<ParsedConfigKey>emptyList(), hinter);
-
-    // changes are detected
-    assertTrue(changed);
-
-    // listener remove was called
-    verify(listener).remove(key1, hinter);
-
-    // cached data is cleaned up
-    assertTrue(productState.getCachedTargetFiles().isEmpty());
-    assertTrue(productState.getConfigStates().isEmpty());
-  }
-
-  // Helper methods
-
-  private static Map<String, TargetSpec> targets(String path, TargetSpec spec) {
-    return Collections.singletonMap(path, spec);
-  }
-
-  private static Map<String, TargetSpec> targets(
-      String path1, TargetSpec spec1, String path2, TargetSpec spec2) {
-    Map<String, TargetSpec> targets = new HashMap<>();
-    targets.put(path1, spec1);
-    targets.put(path2, spec2);
-    return targets;
-  }
-
-  private static RemoteConfigResponse buildResponse(Map<String, TargetSpec> targets) {
-    RemoteConfigResponse response = mock(RemoteConfigResponse.class);
-
-    for (Map.Entry<String, TargetSpec> entry : targets.entrySet()) {
-      String path = entry.getKey();
-      TargetSpec targetData = entry.getValue();
-
-      RemoteConfigResponse.Targets.ConfigTarget target =
-          new RemoteConfigResponse.Targets.ConfigTarget();
-      target.hashes = singletonMap("sha256", targetData.hash);
-      target.length = targetData.length;
-
-      RemoteConfigResponse.Targets.ConfigTarget.ConfigTargetCustom custom =
-          new RemoteConfigResponse.Targets.ConfigTarget.ConfigTargetCustom();
-      custom.version = targetData.version;
-      target.custom = custom;
-
-      when(response.getTarget(path)).thenReturn(target);
-      when(response.getFileContents(path))
-          .thenReturn(("content_" + targetData.hash).getBytes(UTF_8));
+        ParsedConfigKey key1 = ParsedConfigKey.parse("org/ASM_DATA/config1/foo");
+        ParsedConfigKey key2 = ParsedConfigKey.parse("org/ASM_DATA/config2/foo");
+
+        // apply is called
+        productState.apply(response, Arrays.asList(key1, key2), hinter);
+
+        // productListener received both configs
+        assertEquals(2, countStartingWith(productListener.operations, "accept:"));
+
+        // configListener only received config1
+        assertEquals(Arrays.asList("accept:org/ASM_DATA/config1/foo", "commit"), configListener.operations);
     }
 
-    // Handle empty targets case
-    if (targets.isEmpty()) {
-      when(response.getTarget(any())).thenReturn(null);
+    @Test
+    void testRemoveOperationsCleanupCachedData() throws Exception {
+        // a ProductState
+        ProductState productState = new ProductState(Product.ASM_DATA);
+        ProductListener listener = mock(ProductListener.class);
+        productState.addProductListener(listener);
+
+        // first apply with a config to cache it
+        RemoteConfigResponse response1 =
+                buildResponse(targets("org/ASM_DATA/config1/foo", new TargetSpec(1, 8, "hash1")));
+        ParsedConfigKey key1 = ParsedConfigKey.parse("org/ASM_DATA/config1/foo");
+        productState.apply(response1, Collections.singletonList(key1), hinter);
+
+        // an empty response (config should be removed)
+        RemoteConfigResponse response2 = buildResponse(Collections.emptyMap());
+
+        // apply is called
+        boolean changed = productState.apply(response2, Collections.<ParsedConfigKey>emptyList(), hinter);
+
+        // changes are detected
+        assertTrue(changed);
+
+        // listener remove was called
+        verify(listener).remove(key1, hinter);
+
+        // cached data is cleaned up
+        assertTrue(productState.getCachedTargetFiles().isEmpty());
+        assertTrue(productState.getConfigStates().isEmpty());
     }
 
-    return response;
-  }
+    // Helper methods
 
-  private static int countStartingWith(List<String> operations, String prefix) {
-    int count = 0;
-    for (String operation : operations) {
-      if (operation.startsWith(prefix)) {
-        count++;
-      }
+    private static Map<String, TargetSpec> targets(String path, TargetSpec spec) {
+        return Collections.singletonMap(path, spec);
     }
-    return count;
-  }
-
-  private static int firstIndexStartingWith(List<String> operations, String prefix) {
-    for (int index = 0; index < operations.size(); index++) {
-      if (operations.get(index).startsWith(prefix)) {
-        return index;
-      }
+
+    private static Map<String, TargetSpec> targets(String path1, TargetSpec spec1, String path2, TargetSpec spec2) {
+        Map<String, TargetSpec> targets = new HashMap<>();
+        targets.put(path1, spec1);
+        targets.put(path2, spec2);
+        return targets;
     }
-    return -1;
-  }
-
-  private static int lastIndexStartingWith(List<String> operations, String prefix) {
-    for (int index = operations.size() - 1; index >= 0; index--) {
-      if (operations.get(index).startsWith(prefix)) {
-        return index;
-      }
+
+    private static RemoteConfigResponse buildResponse(Map<String, TargetSpec> targets) {
+        RemoteConfigResponse response = mock(RemoteConfigResponse.class);
+
+        for (Map.Entry<String, TargetSpec> entry : targets.entrySet()) {
+            String path = entry.getKey();
+            TargetSpec targetData = entry.getValue();
+
+            RemoteConfigResponse.Targets.ConfigTarget target = new RemoteConfigResponse.Targets.ConfigTarget();
+            target.hashes = singletonMap("sha256", targetData.hash);
+            target.length = targetData.length;
+
+            RemoteConfigResponse.Targets.ConfigTarget.ConfigTargetCustom custom =
+                    new RemoteConfigResponse.Targets.ConfigTarget.ConfigTargetCustom();
+            custom.version = targetData.version;
+            target.custom = custom;
+
+            when(response.getTarget(path)).thenReturn(target);
+            when(response.getFileContents(path)).thenReturn(("content_" + targetData.hash).getBytes(UTF_8));
+        }
+
+        // Handle empty targets case
+        if (targets.isEmpty()) {
+            when(response.getTarget(any())).thenReturn(null);
+        }
+
+        return response;
     }
-    return -1;
-  }
-
-  // Light structure describing a target's metadata for the mocked response
-  private static final class TargetSpec {
-    final long version;
-    final long length;
-    final String hash;
-
-    TargetSpec(long version, long length, String hash) {
-      this.version = version;
-      this.length = length;
-      this.hash = hash;
+
+    private static int countStartingWith(List<String> operations, String prefix) {
+        int count = 0;
+        for (String operation : operations) {
+            if (operation.startsWith(prefix)) {
+                count++;
+            }
+        }
+        return count;
     }
-  }
 
-  // Test helper class to record operation order
-  static class OrderRecordingListener implements ProductListener {
-    final List<String> operations = new ArrayList<>();
+    private static int firstIndexStartingWith(List<String> operations, String prefix) {
+        for (int index = 0; index < operations.size(); index++) {
+            if (operations.get(index).startsWith(prefix)) {
+                return index;
+            }
+        }
+        return -1;
+    }
 
-    @Override
-    public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollingRateHinter) {
-      operations.add("accept:" + configKey.toString());
+    private static int lastIndexStartingWith(List<String> operations, String prefix) {
+        for (int index = operations.size() - 1; index >= 0; index--) {
+            if (operations.get(index).startsWith(prefix)) {
+                return index;
+            }
+        }
+        return -1;
     }
 
-    @Override
-    public void remove(ConfigKey configKey, PollingRateHinter pollingRateHinter) {
-      operations.add("remove:" + configKey.toString());
+    // Light structure describing a target's metadata for the mocked response
+    private static final class TargetSpec {
+        final long version;
+        final long length;
+        final String hash;
+
+        TargetSpec(long version, long length, String hash) {
+            this.version = version;
+            this.length = length;
+            this.hash = hash;
+        }
     }
 
-    @Override
-    public void commit(PollingRateHinter pollingRateHinter) {
-      operations.add("commit");
+    // Test helper class to record operation order
+    static class OrderRecordingListener implements ProductListener {
+        final List<String> operations = new ArrayList<>();
+
+        @Override
+        public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollingRateHinter) {
+            operations.add("accept:" + configKey.toString());
+        }
+
+        @Override
+        public void remove(ConfigKey configKey, PollingRateHinter pollingRateHinter) {
+            operations.add("remove:" + configKey.toString());
+        }
+
+        @Override
+        public void commit(PollingRateHinter pollingRateHinter) {
+            operations.add("commit");
+        }
     }
-  }
 }
diff --git a/telemetry/src/jmh/java/datadog/telemetry/dependency/DependencyResolverBenchmark.java b/telemetry/src/jmh/java/datadog/telemetry/dependency/DependencyResolverBenchmark.java
index c0b6d4dd7db..470c08d5bae 100644
--- a/telemetry/src/jmh/java/datadog/telemetry/dependency/DependencyResolverBenchmark.java
+++ b/telemetry/src/jmh/java/datadog/telemetry/dependency/DependencyResolverBenchmark.java
@@ -20,29 +20,25 @@
 @State(Scope.Benchmark)
 public class DependencyResolverBenchmark {
 
-  private static final String PROJECT_DIR = System.getProperty("user.dir");
-
-  private static final URI SIMPLE_JAR_URI =
-      URI.create(
-          "file://"
-              + PROJECT_DIR
-              + "/src/test/resources/datadog/telemetry/dependencies/bson-4.2.0.jar");
-
-  private static final URI NESTED_SPRING_BOOT_JAR_URI =
-      URI.create(
-          "jar:file://"
-              + PROJECT_DIR
-              + "/src/test/resources/datadog/telemetry/dependencies/spring-boot-app.jar!/BOOT-INF/lib/opentracing-util-0.33.0.jar!/");
-
-  @Benchmark
-  public void resolveSimpleJar() {
-    final List<Dependency> result = DependencyResolver.resolve(SIMPLE_JAR_URI);
-    assert !result.isEmpty();
-  }
-
-  @Benchmark
-  public void resolveNestedSpringBootJar() {
-    final List<Dependency> result = DependencyResolver.resolve(NESTED_SPRING_BOOT_JAR_URI);
-    assert !result.isEmpty();
-  }
+    private static final String PROJECT_DIR = System.getProperty("user.dir");
+
+    private static final URI SIMPLE_JAR_URI =
+            URI.create("file://" + PROJECT_DIR + "/src/test/resources/datadog/telemetry/dependencies/bson-4.2.0.jar");
+
+    private static final URI NESTED_SPRING_BOOT_JAR_URI = URI.create(
+            "jar:file://"
+                    + PROJECT_DIR
+                    + "/src/test/resources/datadog/telemetry/dependencies/spring-boot-app.jar!/BOOT-INF/lib/opentracing-util-0.33.0.jar!/");
+
+    @Benchmark
+    public void resolveSimpleJar() {
+        final List<Dependency> result = DependencyResolver.resolve(SIMPLE_JAR_URI);
+        assert !result.isEmpty();
+    }
+
+    @Benchmark
+    public void resolveNestedSpringBootJar() {
+        final List<Dependency> result = DependencyResolver.resolve(NESTED_SPRING_BOOT_JAR_URI);
+        assert !result.isEmpty();
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/BufferedEvents.java b/telemetry/src/main/java/datadog/telemetry/BufferedEvents.java
index e118b82303a..a4f5649ff28 100644
--- a/telemetry/src/main/java/datadog/telemetry/BufferedEvents.java
+++ b/telemetry/src/main/java/datadog/telemetry/BufferedEvents.java
@@ -15,165 +15,164 @@
  * telemetry request attempt or telemetry metric calculation.
  */
 public final class BufferedEvents implements EventSource, EventSink {
-  private static final int INITIAL_CAPACITY = 32;
-  private ArrayList<ConfigSetting> configChangeEvents;
-  private int configChangeIndex;
-  private ArrayList<Integration> integrationEvents;
-  private int integrationIndex;
-  private ArrayList<Dependency> dependencyEvents;
-  private int dependencyIndex;
-  private ArrayList<Metric> metricEvents;
-  private int metricIndex;
-  private ArrayList<DistributionSeries> distributionSeriesEvents;
-  private int distributionSeriesIndex;
-  private ArrayList<LogMessage> logMessageEvents;
-  private int logMessageIndex;
-  private ArrayList<ProductChange> productChangeEvents;
-  private int productChangeIndex;
-  private ArrayList<Endpoint> endpointEvents;
-  private int endpointIndex;
-
-  public void addConfigChangeEvent(ConfigSetting event) {
-    if (configChangeEvents == null) {
-      configChangeEvents = new ArrayList<>(INITIAL_CAPACITY);
-    }
-    configChangeEvents.add(event);
-  }
-
-  @Override
-  public void addIntegrationEvent(Integration event) {
-    if (integrationEvents == null) {
-      integrationEvents = new ArrayList<>(INITIAL_CAPACITY);
-    }
-    integrationEvents.add(event);
-  }
-
-  @Override
-  public void addDependencyEvent(Dependency event) {
-    if (dependencyEvents == null) {
-      dependencyEvents = new ArrayList<>(INITIAL_CAPACITY);
-    }
-    dependencyEvents.add(event);
-  }
-
-  @Override
-  public void addMetricEvent(Metric event) {
-    if (metricEvents == null) {
-      metricEvents = new ArrayList<>(INITIAL_CAPACITY);
-    }
-    metricEvents.add(event);
-  }
-
-  @Override
-  public void addDistributionSeriesEvent(DistributionSeries event) {
-    if (distributionSeriesEvents == null) {
-      distributionSeriesEvents = new ArrayList<>(INITIAL_CAPACITY);
-    }
-    distributionSeriesEvents.add(event);
-  }
-
-  @Override
-  public void addLogMessageEvent(LogMessage event) {
-    if (logMessageEvents == null) {
-      logMessageEvents = new ArrayList<>(INITIAL_CAPACITY);
-    }
-    logMessageEvents.add(event);
-  }
-
-  @Override
-  public void addProductChangeEvent(ProductChange event) {
-    if (productChangeEvents == null) {
-      productChangeEvents = new ArrayList<>(INITIAL_CAPACITY);
-    }
-    productChangeEvents.add(event);
-  }
-
-  @Override
-  public void addEndpointEvent(final Endpoint event) {
-    if (endpointEvents == null) {
-      endpointEvents = new ArrayList<>(INITIAL_CAPACITY);
-    }
-    endpointEvents.add(event);
-  }
-
-  @Override
-  public boolean hasConfigChangeEvent() {
-    return configChangeEvents != null && configChangeIndex < configChangeEvents.size();
-  }
-
-  @Override
-  public ConfigSetting nextConfigChangeEvent() {
-    return configChangeEvents.get(configChangeIndex++);
-  }
-
-  @Override
-  public boolean hasIntegrationEvent() {
-    return integrationEvents != null && integrationIndex < integrationEvents.size();
-  }
-
-  @Override
-  public Integration nextIntegrationEvent() {
-    return integrationEvents.get(integrationIndex++);
-  }
-
-  @Override
-  public boolean hasDependencyEvent() {
-    return dependencyEvents != null && dependencyIndex < dependencyEvents.size();
-  }
-
-  @Override
-  public Dependency nextDependencyEvent() {
-    return dependencyEvents.get(dependencyIndex++);
-  }
-
-  @Override
-  public boolean hasMetricEvent() {
-    return metricEvents != null && metricIndex < metricEvents.size();
-  }
-
-  @Override
-  public Metric nextMetricEvent() {
-    return metricEvents.get(metricIndex++);
-  }
-
-  @Override
-  public boolean hasDistributionSeriesEvent() {
-    return distributionSeriesEvents != null
-        && distributionSeriesIndex < distributionSeriesEvents.size();
-  }
-
-  @Override
-  public DistributionSeries nextDistributionSeriesEvent() {
-    return distributionSeriesEvents.get(distributionSeriesIndex++);
-  }
-
-  @Override
-  public boolean hasLogMessageEvent() {
-    return logMessageEvents != null && logMessageIndex < logMessageEvents.size();
-  }
-
-  @Override
-  public LogMessage nextLogMessageEvent() {
-    return logMessageEvents.get(logMessageIndex++);
-  }
-
-  @Override
-  public boolean hasProductChangeEvent() {
-    return productChangeEvents != null && productChangeIndex < productChangeEvents.size();
-  }
-
-  @Override
-  public ProductChange nextProductChangeEvent() {
-    return productChangeEvents.get(productChangeIndex++);
-  }
-
-  @Override
-  public boolean hasEndpoint() {
-    return endpointEvents != null && endpointIndex < endpointEvents.size();
-  }
-
-  @Override
-  public Endpoint nextEndpoint() {
-    return endpointEvents.get(endpointIndex++);
-  }
+    private static final int INITIAL_CAPACITY = 32;
+    private ArrayList<ConfigSetting> configChangeEvents;
+    private int configChangeIndex;
+    private ArrayList<Integration> integrationEvents;
+    private int integrationIndex;
+    private ArrayList<Dependency> dependencyEvents;
+    private int dependencyIndex;
+    private ArrayList<Metric> metricEvents;
+    private int metricIndex;
+    private ArrayList<DistributionSeries> distributionSeriesEvents;
+    private int distributionSeriesIndex;
+    private ArrayList<LogMessage> logMessageEvents;
+    private int logMessageIndex;
+    private ArrayList<ProductChange> productChangeEvents;
+    private int productChangeIndex;
+    private ArrayList<Endpoint> endpointEvents;
+    private int endpointIndex;
+
+    public void addConfigChangeEvent(ConfigSetting event) {
+        if (configChangeEvents == null) {
+            configChangeEvents = new ArrayList<>(INITIAL_CAPACITY);
+        }
+        configChangeEvents.add(event);
+    }
+
+    @Override
+    public void addIntegrationEvent(Integration event) {
+        if (integrationEvents == null) {
+            integrationEvents = new ArrayList<>(INITIAL_CAPACITY);
+        }
+        integrationEvents.add(event);
+    }
+
+    @Override
+    public void addDependencyEvent(Dependency event) {
+        if (dependencyEvents == null) {
+            dependencyEvents = new ArrayList<>(INITIAL_CAPACITY);
+        }
+        dependencyEvents.add(event);
+    }
+
+    @Override
+    public void addMetricEvent(Metric event) {
+        if (metricEvents == null) {
+            metricEvents = new ArrayList<>(INITIAL_CAPACITY);
+        }
+        metricEvents.add(event);
+    }
+
+    @Override
+    public void addDistributionSeriesEvent(DistributionSeries event) {
+        if (distributionSeriesEvents == null) {
+            distributionSeriesEvents = new ArrayList<>(INITIAL_CAPACITY);
+        }
+        distributionSeriesEvents.add(event);
+    }
+
+    @Override
+    public void addLogMessageEvent(LogMessage event) {
+        if (logMessageEvents == null) {
+            logMessageEvents = new ArrayList<>(INITIAL_CAPACITY);
+        }
+        logMessageEvents.add(event);
+    }
+
+    @Override
+    public void addProductChangeEvent(ProductChange event) {
+        if (productChangeEvents == null) {
+            productChangeEvents = new ArrayList<>(INITIAL_CAPACITY);
+        }
+        productChangeEvents.add(event);
+    }
+
+    @Override
+    public void addEndpointEvent(final Endpoint event) {
+        if (endpointEvents == null) {
+            endpointEvents = new ArrayList<>(INITIAL_CAPACITY);
+        }
+        endpointEvents.add(event);
+    }
+
+    @Override
+    public boolean hasConfigChangeEvent() {
+        return configChangeEvents != null && configChangeIndex < configChangeEvents.size();
+    }
+
+    @Override
+    public ConfigSetting nextConfigChangeEvent() {
+        return configChangeEvents.get(configChangeIndex++);
+    }
+
+    @Override
+    public boolean hasIntegrationEvent() {
+        return integrationEvents != null && integrationIndex < integrationEvents.size();
+    }
+
+    @Override
+    public Integration nextIntegrationEvent() {
+        return integrationEvents.get(integrationIndex++);
+    }
+
+    @Override
+    public boolean hasDependencyEvent() {
+        return dependencyEvents != null && dependencyIndex < dependencyEvents.size();
+    }
+
+    @Override
+    public Dependency nextDependencyEvent() {
+        return dependencyEvents.get(dependencyIndex++);
+    }
+
+    @Override
+    public boolean hasMetricEvent() {
+        return metricEvents != null && metricIndex < metricEvents.size();
+    }
+
+    @Override
+    public Metric nextMetricEvent() {
+        return metricEvents.get(metricIndex++);
+    }
+
+    @Override
+    public boolean hasDistributionSeriesEvent() {
+        return distributionSeriesEvents != null && distributionSeriesIndex < distributionSeriesEvents.size();
+    }
+
+    @Override
+    public DistributionSeries nextDistributionSeriesEvent() {
+        return distributionSeriesEvents.get(distributionSeriesIndex++);
+    }
+
+    @Override
+    public boolean hasLogMessageEvent() {
+        return logMessageEvents != null && logMessageIndex < logMessageEvents.size();
+    }
+
+    @Override
+    public LogMessage nextLogMessageEvent() {
+        return logMessageEvents.get(logMessageIndex++);
+    }
+
+    @Override
+    public boolean hasProductChangeEvent() {
+        return productChangeEvents != null && productChangeIndex < productChangeEvents.size();
+    }
+
+    @Override
+    public ProductChange nextProductChangeEvent() {
+        return productChangeEvents.get(productChangeIndex++);
+    }
+
+    @Override
+    public boolean hasEndpoint() {
+        return endpointEvents != null && endpointIndex < endpointEvents.size();
+    }
+
+    @Override
+    public Endpoint nextEndpoint() {
+        return endpointEvents.get(endpointIndex++);
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/EventSink.java b/telemetry/src/main/java/datadog/telemetry/EventSink.java
index 58464184e38..adc88d9f74b 100644
--- a/telemetry/src/main/java/datadog/telemetry/EventSink.java
+++ b/telemetry/src/main/java/datadog/telemetry/EventSink.java
@@ -15,49 +15,49 @@
  * failing attempt.
  */
 interface EventSink {
-  void addConfigChangeEvent(ConfigSetting event);
+    void addConfigChangeEvent(ConfigSetting event);
 
-  void addIntegrationEvent(Integration event);
+    void addIntegrationEvent(Integration event);
 
-  void addDependencyEvent(Dependency event);
+    void addDependencyEvent(Dependency event);
 
-  void addMetricEvent(Metric event);
+    void addMetricEvent(Metric event);
 
-  void addDistributionSeriesEvent(DistributionSeries event);
+    void addDistributionSeriesEvent(DistributionSeries event);
 
-  void addLogMessageEvent(LogMessage event);
+    void addLogMessageEvent(LogMessage event);
 
-  void addProductChangeEvent(ProductChange event);
+    void addProductChangeEvent(ProductChange event);
 
-  void addEndpointEvent(Endpoint event);
+    void addEndpointEvent(Endpoint event);
 
-  EventSink NOOP = new Noop();
+    EventSink NOOP = new Noop();
 
-  class Noop implements EventSink {
-    private Noop() {}
+    class Noop implements EventSink {
+        private Noop() {}
 
-    @Override
-    public void addConfigChangeEvent(ConfigSetting event) {}
+        @Override
+        public void addConfigChangeEvent(ConfigSetting event) {}
 
-    @Override
-    public void addIntegrationEvent(Integration event) {}
+        @Override
+        public void addIntegrationEvent(Integration event) {}
 
-    @Override
-    public void addDependencyEvent(Dependency event) {}
+        @Override
+        public void addDependencyEvent(Dependency event) {}
 
-    @Override
-    public void addMetricEvent(Metric event) {}
+        @Override
+        public void addMetricEvent(Metric event) {}
 
-    @Override
-    public void addDistributionSeriesEvent(DistributionSeries event) {}
+        @Override
+        public void addDistributionSeriesEvent(DistributionSeries event) {}
 
-    @Override
-    public void addLogMessageEvent(LogMessage event) {}
+        @Override
+        public void addLogMessageEvent(LogMessage event) {}
 
-    @Override
-    public void addProductChangeEvent(ProductChange event) {}
+        @Override
+        public void addProductChangeEvent(ProductChange event) {}
 
-    @Override
-    public void addEndpointEvent(Endpoint event) {}
-  }
+        @Override
+        public void addEndpointEvent(Endpoint event) {}
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/EventSource.java b/telemetry/src/main/java/datadog/telemetry/EventSource.java
index b0088474c21..d84f1ed57a3 100644
--- a/telemetry/src/main/java/datadog/telemetry/EventSource.java
+++ b/telemetry/src/main/java/datadog/telemetry/EventSource.java
@@ -16,156 +16,156 @@
  * buffered for a retry
  */
 interface EventSource {
-  boolean hasConfigChangeEvent();
+    boolean hasConfigChangeEvent();
 
-  ConfigSetting nextConfigChangeEvent();
+    ConfigSetting nextConfigChangeEvent();
 
-  boolean hasIntegrationEvent();
+    boolean hasIntegrationEvent();
 
-  Integration nextIntegrationEvent();
+    Integration nextIntegrationEvent();
 
-  boolean hasDependencyEvent();
+    boolean hasDependencyEvent();
 
-  Dependency nextDependencyEvent();
+    Dependency nextDependencyEvent();
 
-  boolean hasMetricEvent();
+    boolean hasMetricEvent();
 
-  Metric nextMetricEvent();
+    Metric nextMetricEvent();
+
+    boolean hasDistributionSeriesEvent();
 
-  boolean hasDistributionSeriesEvent();
+    DistributionSeries nextDistributionSeriesEvent();
+
+    boolean hasLogMessageEvent();
 
-  DistributionSeries nextDistributionSeriesEvent();
-
-  boolean hasLogMessageEvent();
-
-  LogMessage nextLogMessageEvent();
-
-  boolean hasProductChangeEvent();
-
-  ProductChange nextProductChangeEvent();
-
-  boolean hasEndpoint();
-
-  Endpoint nextEndpoint();
-
-  default boolean isEmpty() {
-    return !hasConfigChangeEvent()
-        && !hasIntegrationEvent()
-        && !hasDependencyEvent()
-        && !hasMetricEvent()
-        && !hasDistributionSeriesEvent()
-        && !hasLogMessageEvent()
-        && !hasProductChangeEvent()
-        && !hasEndpoint();
-  }
-
-  final class Queued implements EventSource {
-    private final Queue<ConfigSetting> configChangeQueue;
-    private final Queue<Integration> integrationQueue;
-    private final Queue<Dependency> dependencyQueue;
-    private final Queue<Metric> metricQueue;
-    private final Queue<DistributionSeries> distributionSeriesQueue;
-    private final Queue<LogMessage> logMessageQueue;
-    private final Queue<ProductChange> productChanges;
-    private final Queue<Endpoint> endpoints;
-
-    Queued(
-        Queue<ConfigSetting> configChangeQueue,
-        Queue<Integration> integrationQueue,
-        Queue<Dependency> dependencyQueue,
-        Queue<Metric> metricQueue,
-        Queue<DistributionSeries> distributionSeriesQueue,
-        Queue<LogMessage> logMessageQueue,
-        Queue<ProductChange> productChanges,
-        Queue<Endpoint> endpoints) {
-      this.configChangeQueue = configChangeQueue;
-      this.integrationQueue = integrationQueue;
-      this.dependencyQueue = dependencyQueue;
-      this.metricQueue = metricQueue;
-      this.distributionSeriesQueue = distributionSeriesQueue;
-      this.logMessageQueue = logMessageQueue;
-      this.productChanges = productChanges;
-      this.endpoints = endpoints;
-    }
-
-    @Override
-    public boolean hasConfigChangeEvent() {
-      return !configChangeQueue.isEmpty();
-    }
-
-    @Override
-    public ConfigSetting nextConfigChangeEvent() {
-      return configChangeQueue.poll();
-    }
-
-    @Override
-    public boolean hasIntegrationEvent() {
-      return !integrationQueue.isEmpty();
-    }
-
-    @Override
-    public Integration nextIntegrationEvent() {
-      return integrationQueue.poll();
-    }
-
-    @Override
-    public boolean hasDependencyEvent() {
-      return !dependencyQueue.isEmpty();
-    }
-
-    @Override
-    public Dependency nextDependencyEvent() {
-      return dependencyQueue.poll();
-    }
-
-    @Override
-    public boolean hasMetricEvent() {
-      return !metricQueue.isEmpty();
-    }
-
-    @Override
-    public Metric nextMetricEvent() {
-      return metricQueue.poll();
-    }
-
-    @Override
-    public boolean hasDistributionSeriesEvent() {
-      return !distributionSeriesQueue.isEmpty();
-    }
-
-    @Override
-    public DistributionSeries nextDistributionSeriesEvent() {
-      return distributionSeriesQueue.poll();
-    }
-
-    @Override
-    public boolean hasLogMessageEvent() {
-      return !logMessageQueue.isEmpty();
-    }
-
-    @Override
-    public LogMessage nextLogMessageEvent() {
-      return logMessageQueue.poll();
-    }
-
-    @Override
-    public boolean hasProductChangeEvent() {
-      return !productChanges.isEmpty();
-    }
-
-    @Override
-    public ProductChange nextProductChangeEvent() {
-      return productChanges.poll();
-    }
-
-    @Override
-    public boolean hasEndpoint() {
-      return !endpoints.isEmpty();
-    }
-
-    @Override
-    public Endpoint nextEndpoint() {
-      return endpoints.poll();
+    LogMessage nextLogMessageEvent();
+
+    boolean hasProductChangeEvent();
+
+    ProductChange nextProductChangeEvent();
+
+    boolean hasEndpoint();
+
+    Endpoint nextEndpoint();
+
+    default boolean isEmpty() {
+        return !hasConfigChangeEvent()
+                && !hasIntegrationEvent()
+                && !hasDependencyEvent()
+                && !hasMetricEvent()
+                && !hasDistributionSeriesEvent()
+                && !hasLogMessageEvent()
+                && !hasProductChangeEvent()
+                && !hasEndpoint();
+    }
+
+    final class Queued implements EventSource {
+        private final Queue<ConfigSetting> configChangeQueue;
+        private final Queue<Integration> integrationQueue;
+        private final Queue<Dependency> dependencyQueue;
+        private final Queue<Metric> metricQueue;
+        private final Queue<DistributionSeries> distributionSeriesQueue;
+        private final Queue<LogMessage> logMessageQueue;
+        private final Queue<ProductChange> productChanges;
+        private final Queue<Endpoint> endpoints;
+
+        Queued(
+                Queue<ConfigSetting> configChangeQueue,
+                Queue<Integration> integrationQueue,
+                Queue<Dependency> dependencyQueue,
+                Queue<Metric> metricQueue,
+                Queue<DistributionSeries> distributionSeriesQueue,
+                Queue<LogMessage> logMessageQueue,
+                Queue<ProductChange> productChanges,
+                Queue<Endpoint> endpoints) {
+            this.configChangeQueue = configChangeQueue;
+            this.integrationQueue = integrationQueue;
+            this.dependencyQueue = dependencyQueue;
+            this.metricQueue = metricQueue;
+            this.distributionSeriesQueue = distributionSeriesQueue;
+            this.logMessageQueue = logMessageQueue;
+            this.productChanges = productChanges;
+            this.endpoints = endpoints;
+        }
+
+        @Override
+        public boolean hasConfigChangeEvent() {
+            return !configChangeQueue.isEmpty();
+        }
+
+        @Override
+        public ConfigSetting nextConfigChangeEvent() {
+            return configChangeQueue.poll();
+        }
+
+        @Override
+        public boolean hasIntegrationEvent() {
+            return !integrationQueue.isEmpty();
+        }
+
+        @Override
+        public Integration nextIntegrationEvent() {
+            return integrationQueue.poll();
+        }
+
+        @Override
+        public boolean hasDependencyEvent() {
+            return !dependencyQueue.isEmpty();
+        }
+
+        @Override
+        public Dependency nextDependencyEvent() {
+            return dependencyQueue.poll();
+        }
+
+        @Override
+        public boolean hasMetricEvent() {
+            return !metricQueue.isEmpty();
+        }
+
+        @Override
+        public Metric nextMetricEvent() {
+            return metricQueue.poll();
+        }
+
+        @Override
+        public boolean hasDistributionSeriesEvent() {
+            return !distributionSeriesQueue.isEmpty();
+        }
+
+        @Override
+        public DistributionSeries nextDistributionSeriesEvent() {
+            return distributionSeriesQueue.poll();
+        }
+
+        @Override
+        public boolean hasLogMessageEvent() {
+            return !logMessageQueue.isEmpty();
+        }
+
+        @Override
+        public LogMessage nextLogMessageEvent() {
+            return logMessageQueue.poll();
+        }
+
+        @Override
+        public boolean hasProductChangeEvent() {
+            return !productChanges.isEmpty();
+        }
+
+        @Override
+        public ProductChange nextProductChangeEvent() {
+            return productChanges.poll();
+        }
+
+        @Override
+        public boolean hasEndpoint() {
+            return !endpoints.isEmpty();
+        }
+
+        @Override
+        public Endpoint nextEndpoint() {
+            return endpoints.poll();
+        }
     }
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/ExtendedHeartbeatData.java b/telemetry/src/main/java/datadog/telemetry/ExtendedHeartbeatData.java
index 75c26b4db9d..57a322e53c5 100644
--- a/telemetry/src/main/java/datadog/telemetry/ExtendedHeartbeatData.java
+++ b/telemetry/src/main/java/datadog/telemetry/ExtendedHeartbeatData.java
@@ -11,126 +11,126 @@
 import java.util.ArrayList;
 
 public class ExtendedHeartbeatData {
-  private static final int DEFAULT_DEPENDENCIES_LIMIT = 2000;
-  private static final int INITIAL_CAPACITY = 32;
-
-  private final int dependenciesLimit;
-  private final ArrayList<ConfigSetting> configuration;
-  private final ArrayList<Dependency> dependencies;
-  private final ArrayList<Integration> integrations;
-
-  public ExtendedHeartbeatData() {
-    this(DEFAULT_DEPENDENCIES_LIMIT);
-  }
-
-  ExtendedHeartbeatData(int dependenciesLimit) {
-    this.dependenciesLimit = dependenciesLimit;
-    configuration = new ArrayList<>(INITIAL_CAPACITY);
-    dependencies = new ArrayList<>(INITIAL_CAPACITY);
-    integrations = new ArrayList<>(INITIAL_CAPACITY);
-  }
-
-  public void pushConfigSetting(ConfigSetting cs) {
-    configuration.add(cs);
-  }
-
-  public void pushDependency(Dependency d) {
-    if (dependencies.size() < dependenciesLimit) {
-      dependencies.add(d);
-    }
-  }
-
-  public void pushIntegration(Integration i) {
-    integrations.add(i);
-  }
-
-  public EventSource snapshot() {
-    return new Snapshot();
-  }
+    private static final int DEFAULT_DEPENDENCIES_LIMIT = 2000;
+    private static final int INITIAL_CAPACITY = 32;
 
-  private final class Snapshot implements EventSource {
-    private int configIndex;
-    private int dependencyIndex;
-    private int integrationIndex;
+    private final int dependenciesLimit;
+    private final ArrayList<ConfigSetting> configuration;
+    private final ArrayList<Dependency> dependencies;
+    private final ArrayList<Integration> integrations;
 
-    @Override
-    public boolean hasConfigChangeEvent() {
-      return configIndex < configuration.size();
+    public ExtendedHeartbeatData() {
+        this(DEFAULT_DEPENDENCIES_LIMIT);
     }
 
-    @Override
-    public ConfigSetting nextConfigChangeEvent() {
-      return configuration.get(configIndex++);
+    ExtendedHeartbeatData(int dependenciesLimit) {
+        this.dependenciesLimit = dependenciesLimit;
+        configuration = new ArrayList<>(INITIAL_CAPACITY);
+        dependencies = new ArrayList<>(INITIAL_CAPACITY);
+        integrations = new ArrayList<>(INITIAL_CAPACITY);
     }
 
-    @Override
-    public boolean hasIntegrationEvent() {
-      return integrationIndex < integrations.size();
+    public void pushConfigSetting(ConfigSetting cs) {
+        configuration.add(cs);
     }
 
-    @Override
-    public Integration nextIntegrationEvent() {
-      return integrations.get(integrationIndex++);
+    public void pushDependency(Dependency d) {
+        if (dependencies.size() < dependenciesLimit) {
+            dependencies.add(d);
+        }
     }
 
-    @Override
-    public boolean hasDependencyEvent() {
-      return dependencyIndex < dependencies.size();
+    public void pushIntegration(Integration i) {
+        integrations.add(i);
     }
 
-    @Override
-    public Dependency nextDependencyEvent() {
-      return dependencies.get(dependencyIndex++);
+    public EventSource snapshot() {
+        return new Snapshot();
     }
 
-    @Override
-    public boolean hasMetricEvent() {
-      return false;
-    }
+    private final class Snapshot implements EventSource {
+        private int configIndex;
+        private int dependencyIndex;
+        private int integrationIndex;
 
-    @Override
-    public Metric nextMetricEvent() {
-      return null;
-    }
+        @Override
+        public boolean hasConfigChangeEvent() {
+            return configIndex < configuration.size();
+        }
 
-    @Override
-    public boolean hasDistributionSeriesEvent() {
-      return false;
-    }
+        @Override
+        public ConfigSetting nextConfigChangeEvent() {
+            return configuration.get(configIndex++);
+        }
 
-    @Override
-    public DistributionSeries nextDistributionSeriesEvent() {
-      return null;
-    }
+        @Override
+        public boolean hasIntegrationEvent() {
+            return integrationIndex < integrations.size();
+        }
 
-    @Override
-    public boolean hasLogMessageEvent() {
-      return false;
-    }
+        @Override
+        public Integration nextIntegrationEvent() {
+            return integrations.get(integrationIndex++);
+        }
 
-    @Override
-    public LogMessage nextLogMessageEvent() {
-      return null;
-    }
+        @Override
+        public boolean hasDependencyEvent() {
+            return dependencyIndex < dependencies.size();
+        }
 
-    @Override
-    public boolean hasProductChangeEvent() {
-      return false;
-    }
+        @Override
+        public Dependency nextDependencyEvent() {
+            return dependencies.get(dependencyIndex++);
+        }
 
-    @Override
-    public ProductChange nextProductChangeEvent() {
-      return null;
-    }
+        @Override
+        public boolean hasMetricEvent() {
+            return false;
+        }
 
-    @Override
-    public boolean hasEndpoint() {
-      return false;
-    }
+        @Override
+        public Metric nextMetricEvent() {
+            return null;
+        }
+
+        @Override
+        public boolean hasDistributionSeriesEvent() {
+            return false;
+        }
+
+        @Override
+        public DistributionSeries nextDistributionSeriesEvent() {
+            return null;
+        }
+
+        @Override
+        public boolean hasLogMessageEvent() {
+            return false;
+        }
+
+        @Override
+        public LogMessage nextLogMessageEvent() {
+            return null;
+        }
+
+        @Override
+        public boolean hasProductChangeEvent() {
+            return false;
+        }
+
+        @Override
+        public ProductChange nextProductChangeEvent() {
+            return null;
+        }
+
+        @Override
+        public boolean hasEndpoint() {
+            return false;
+        }
 
-    @Override
-    public Endpoint nextEndpoint() {
-      return null;
+        @Override
+        public Endpoint nextEndpoint() {
+            return null;
+        }
     }
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/FileBasedTelemetryClient.java b/telemetry/src/main/java/datadog/telemetry/FileBasedTelemetryClient.java
index 83bd1ed1352..dab8b639672 100644
--- a/telemetry/src/main/java/datadog/telemetry/FileBasedTelemetryClient.java
+++ b/telemetry/src/main/java/datadog/telemetry/FileBasedTelemetryClient.java
@@ -20,72 +20,70 @@
  */
 public class FileBasedTelemetryClient extends TelemetryClient {
 
-  private static final Logger log = LoggerFactory.getLogger(FileBasedTelemetryClient.class);
+    private static final Logger log = LoggerFactory.getLogger(FileBasedTelemetryClient.class);
 
-  private static final String DD_TELEMETRY_REQUEST_TYPE = "DD-Telemetry-Request-Type";
-  private static final HttpUrl PLACEHOLDER_URL =
-      HttpUrl.get("http://localhost/bazel-file-telemetry");
+    private static final String DD_TELEMETRY_REQUEST_TYPE = "DD-Telemetry-Request-Type";
+    private static final HttpUrl PLACEHOLDER_URL = HttpUrl.get("http://localhost/bazel-file-telemetry");
 
-  private final File outputDir;
-  private final AtomicLong sequence = new AtomicLong(0);
+    private final File outputDir;
+    private final AtomicLong sequence = new AtomicLong(0);
 
-  public FileBasedTelemetryClient(String outputDirPath) {
-    super(null, null, PLACEHOLDER_URL, null);
-    this.outputDir = new File(outputDirPath);
-  }
+    public FileBasedTelemetryClient(String outputDirPath) {
+        super(null, null, PLACEHOLDER_URL, null);
+        this.outputDir = new File(outputDirPath);
+    }
 
-  @Override
-  public Result sendHttpRequest(Request.Builder httpRequestBuilder) {
-    Request request = httpRequestBuilder.url(PLACEHOLDER_URL).build();
-    String requestType = request.header(DD_TELEMETRY_REQUEST_TYPE);
+    @Override
+    public Result sendHttpRequest(Request.Builder httpRequestBuilder) {
+        Request request = httpRequestBuilder.url(PLACEHOLDER_URL).build();
+        String requestType = request.header(DD_TELEMETRY_REQUEST_TYPE);
 
-    try {
-      ensureOutputDir();
-      byte[] bytes = readBody(request);
-      writeFileAtomically(bytes);
-      if (log.isDebugEnabled()) {
-        log.debug(
-            "[bazel mode] Wrote telemetry payload {} ({} bytes) to {}",
-            requestType,
-            bytes.length,
-            outputDir);
-      }
-      return Result.SUCCESS;
-    } catch (IOException e) {
-      log.error(
-          "[bazel mode] Failed to write telemetry payload {} to {}", requestType, outputDir, e);
-      return Result.FAILURE;
+        try {
+            ensureOutputDir();
+            byte[] bytes = readBody(request);
+            writeFileAtomically(bytes);
+            if (log.isDebugEnabled()) {
+                log.debug(
+                        "[bazel mode] Wrote telemetry payload {} ({} bytes) to {}",
+                        requestType,
+                        bytes.length,
+                        outputDir);
+            }
+            return Result.SUCCESS;
+        } catch (IOException e) {
+            log.error("[bazel mode] Failed to write telemetry payload {} to {}", requestType, outputDir, e);
+            return Result.FAILURE;
+        }
     }
-  }
 
-  private void ensureOutputDir() throws IOException {
-    if (!outputDir.exists() && !outputDir.mkdirs() && !outputDir.exists()) {
-      throw new IOException("Failed to create output directory: " + outputDir);
+    private void ensureOutputDir() throws IOException {
+        if (!outputDir.exists() && !outputDir.mkdirs() && !outputDir.exists()) {
+            throw new IOException("Failed to create output directory: " + outputDir);
+        }
     }
-  }
 
-  private static byte[] readBody(Request request) throws IOException {
-    if (request.body() == null) {
-      return new byte[0];
+    private static byte[] readBody(Request request) throws IOException {
+        if (request.body() == null) {
+            return new byte[0];
+        }
+        Buffer buffer = new Buffer();
+        request.body().writeTo(buffer);
+        return buffer.readByteArray();
     }
-    Buffer buffer = new Buffer();
-    request.body().writeTo(buffer);
-    return buffer.readByteArray();
-  }
 
-  private void writeFileAtomically(byte[] data) throws IOException {
-    long seq = sequence.getAndIncrement();
-    String pid = PidHelper.getPid();
-    String filename = String.format("telemetry-%020d-%s.json", seq, pid);
-    File target = new File(outputDir, filename);
-    File tmp = new File(outputDir, filename + ".tmp");
+    private void writeFileAtomically(byte[] data) throws IOException {
+        long seq = sequence.getAndIncrement();
+        String pid = PidHelper.getPid();
+        String filename = String.format("telemetry-%020d-%s.json", seq, pid);
+        File target = new File(outputDir, filename);
+        File tmp = new File(outputDir, filename + ".tmp");
 
-    try (FileOutputStream out = new FileOutputStream(tmp)) {
-      out.write(data);
-    }
-    if (!tmp.renameTo(target)) {
-      tmp.delete();
-      throw new IOException("Failed to rename " + tmp + " to " + target);
+        try (FileOutputStream out = new FileOutputStream(tmp)) {
+            out.write(data);
+        }
+        if (!tmp.renameTo(target)) {
+            tmp.delete();
+            throw new IOException("Failed to rename " + tmp + " to " + target);
+        }
     }
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/HostInfo.java b/telemetry/src/main/java/datadog/telemetry/HostInfo.java
index 1d950ece8e2..a7a772b2be0 100644
--- a/telemetry/src/main/java/datadog/telemetry/HostInfo.java
+++ b/telemetry/src/main/java/datadog/telemetry/HostInfo.java
@@ -17,126 +17,125 @@
 import org.slf4j.LoggerFactory;
 
 public class HostInfo {
-  private static final Path PROC_VERSION = FileSystems.getDefault().getPath("/proc/version");
-  private static final Logger log = LoggerFactory.getLogger(TelemetryRequestBody.class);
+    private static final Path PROC_VERSION = FileSystems.getDefault().getPath("/proc/version");
+    private static final Logger log = LoggerFactory.getLogger(TelemetryRequestBody.class);
 
-  private static String hostname;
-  private static String osName;
-  private static String osVersion;
-  private static String kernelRelease;
-  private static String kernelVersion;
-  private static String architecture;
+    private static String hostname;
+    private static String osName;
+    private static String osVersion;
+    private static String kernelRelease;
+    private static String kernelVersion;
+    private static String architecture;
 
-  public static String getHostname() {
-    if (hostname != null) {
-      return hostname;
+    public static String getHostname() {
+        if (hostname != null) {
+            return hostname;
+        }
+        HostInfo.hostname = Config.get().getHostName();
+        return hostname;
     }
-    HostInfo.hostname = Config.get().getHostName();
-    return hostname;
-  }
 
-  public static String getOsName() {
-    if (osName == null) {
-      if (OperatingSystem.isMacOs()) {
-        // os.name == Mac OS X, while uanme -s == Darwin. We'll hardcode it to Darwin.
-        osName = "Darwin";
-      } else {
-        osName = SystemProperties.get("os.name");
-      }
+    public static String getOsName() {
+        if (osName == null) {
+            if (OperatingSystem.isMacOs()) {
+                // os.name == Mac OS X, while uanme -s == Darwin. We'll hardcode it to Darwin.
+                osName = "Darwin";
+            } else {
+                osName = SystemProperties.get("os.name");
+            }
+        }
+        return osName;
     }
-    return osName;
-  }
 
-  public static String getOsVersion() {
-    if (osVersion == null) {
-      osVersion = Os.getOsVersion();
+    public static String getOsVersion() {
+        if (osVersion == null) {
+            osVersion = Os.getOsVersion();
+        }
+        return osVersion;
     }
-    return osVersion;
-  }
 
-  public static String getKernelName() {
-    return getOsName();
-  }
+    public static String getKernelName() {
+        return getOsName();
+    }
 
-  public static String getKernelRelease() {
-    if (kernelRelease == null) {
-      // In Linux, os.version == uname -r
-      kernelRelease = SystemProperties.get("os.version");
+    public static String getKernelRelease() {
+        if (kernelRelease == null) {
+            // In Linux, os.version == uname -r
+            kernelRelease = SystemProperties.get("os.version");
+        }
+        return kernelRelease;
     }
-    return kernelRelease;
-  }
 
-  public static String getKernelVersion() {
-    if (kernelVersion == null) {
-      // This is not really equivalent to uname -v in Linux, it has some additional info at the end,
-      // like arch.
-      String version = tryReadFile(PROC_VERSION);
-      if (version != null) {
-        version = version.trim();
-        final int dashIdx = version.indexOf('#');
-        if (dashIdx > 0) {
-          version = version.substring(dashIdx);
+    public static String getKernelVersion() {
+        if (kernelVersion == null) {
+            // This is not really equivalent to uname -v in Linux, it has some additional info at the end,
+            // like arch.
+            String version = tryReadFile(PROC_VERSION);
+            if (version != null) {
+                version = version.trim();
+                final int dashIdx = version.indexOf('#');
+                if (dashIdx > 0) {
+                    version = version.substring(dashIdx);
+                }
+                kernelVersion = version;
+            } else {
+                kernelVersion = SystemProperties.get("os.version");
+            }
         }
-        kernelVersion = version;
-      } else {
-        kernelVersion = SystemProperties.get("os.version");
-      }
+        return kernelVersion;
     }
-    return kernelVersion;
-  }
 
-  public static String getArchitecture() {
-    if (architecture == null) {
-      // In Linux, os.arch == uname -me
-      architecture = SystemProperties.get("os.arch");
+    public static String getArchitecture() {
+        if (architecture == null) {
+            // In Linux, os.arch == uname -me
+            architecture = SystemProperties.get("os.arch");
+        }
+        return architecture;
     }
-    return architecture;
-  }
 
-  private static String tryReadFile(Path file) {
-    String content = null;
-    if (Files.isRegularFile(file)) {
-      try {
-        byte[] bytes = Files.readAllBytes(file);
-        content = new String(bytes, StandardCharsets.ISO_8859_1);
-      } catch (IOException | AccessControlException e) {
-        log.debug("Could not read {}", file, e);
-      }
+    private static String tryReadFile(Path file) {
+        String content = null;
+        if (Files.isRegularFile(file)) {
+            try {
+                byte[] bytes = Files.readAllBytes(file);
+                content = new String(bytes, StandardCharsets.ISO_8859_1);
+            } catch (IOException | AccessControlException e) {
+                log.debug("Could not read {}", file, e);
+            }
+        }
+        return content;
     }
-    return content;
-  }
 
-  private static class Os {
-    private static final Pattern OS_RELEASE_PATTERN =
-        Pattern.compile("(?<name>[A-Z]+)=\"(?<value>[^\"]+)\"");
-    private static final Path OS_RELEASE_PATH = Paths.get("/etc/os-release");
+    private static class Os {
+        private static final Pattern OS_RELEASE_PATTERN = Pattern.compile("(?<name>[A-Z]+)=\"(?<value>[^\"]+)\"");
+        private static final Path OS_RELEASE_PATH = Paths.get("/etc/os-release");
 
-    public static String getOsVersion() {
-      if (Files.isRegularFile(OS_RELEASE_PATH)) {
-        String name = null;
-        String version = null;
-        try {
-          List<String> lines = Files.readAllLines(OS_RELEASE_PATH, StandardCharsets.ISO_8859_1);
-          for (String l : lines) {
-            Matcher matcher = OS_RELEASE_PATTERN.matcher(l);
-            if (!matcher.matches()) {
-              continue;
-            }
-            String nameGroup = matcher.group("name");
-            if ("NAME".equals(nameGroup)) {
-              name = matcher.group("value");
-            } else if ("VERSION".equals(nameGroup)) {
-              version = matcher.group("value");
+        public static String getOsVersion() {
+            if (Files.isRegularFile(OS_RELEASE_PATH)) {
+                String name = null;
+                String version = null;
+                try {
+                    List<String> lines = Files.readAllLines(OS_RELEASE_PATH, StandardCharsets.ISO_8859_1);
+                    for (String l : lines) {
+                        Matcher matcher = OS_RELEASE_PATTERN.matcher(l);
+                        if (!matcher.matches()) {
+                            continue;
+                        }
+                        String nameGroup = matcher.group("name");
+                        if ("NAME".equals(nameGroup)) {
+                            name = matcher.group("value");
+                        } else if ("VERSION".equals(nameGroup)) {
+                            version = matcher.group("value");
+                        }
+                    }
+                } catch (IOException | AccessControlException e) {
+                    log.debug("Could not read {}", OS_RELEASE_PATH, e);
+                }
+                if (name != null && version != null) {
+                    return name + " " + version;
+                }
             }
-          }
-        } catch (IOException | AccessControlException e) {
-          log.debug("Could not read {}", OS_RELEASE_PATH, e);
-        }
-        if (name != null && version != null) {
-          return name + " " + version;
+            return SystemProperties.get("os.version");
         }
-      }
-      return SystemProperties.get("os.version");
     }
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/TelemetryClient.java b/telemetry/src/main/java/datadog/telemetry/TelemetryClient.java
index c13411e0e69..a8c1297752e 100644
--- a/telemetry/src/main/java/datadog/telemetry/TelemetryClient.java
+++ b/telemetry/src/main/java/datadog/telemetry/TelemetryClient.java
@@ -15,110 +15,102 @@
 
 public class TelemetryClient {
 
-  public enum Result {
-    SUCCESS,
-    FAILURE,
-    NOT_FOUND,
-    INTERRUPTED
-  }
-
-  public static TelemetryClient buildAgentClient(
-      OkHttpClient okHttpClient, HttpUrl agentUrl, HttpRetryPolicy.Factory httpRetryPolicy) {
-    HttpUrl agentTelemetryUrl =
-        agentUrl.newBuilder().addPathSegments(AGENT_TELEMETRY_API_ENDPOINT).build();
-    return new TelemetryClient(okHttpClient, httpRetryPolicy, agentTelemetryUrl, null);
-  }
-
-  public static TelemetryClient buildIntakeClient(
-      Config config, HttpRetryPolicy.Factory httpRetryPolicy) {
-    String apiKey = config.getApiKey();
-    if (apiKey == null) {
-      log.debug("Cannot create Telemetry Intake because DD_API_KEY unspecified.");
-      return null;
+    public enum Result {
+        SUCCESS,
+        FAILURE,
+        NOT_FOUND,
+        INTERRUPTED
     }
 
-    String telemetryUrl = buildIntakeTelemetryUrl(config);
-    HttpUrl url;
-    try {
-      url = HttpUrl.get(telemetryUrl);
-    } catch (IllegalArgumentException e) {
-      log.error("Can't create Telemetry URL for {}", telemetryUrl);
-      return null;
+    public static TelemetryClient buildAgentClient(
+            OkHttpClient okHttpClient, HttpUrl agentUrl, HttpRetryPolicy.Factory httpRetryPolicy) {
+        HttpUrl agentTelemetryUrl = agentUrl.newBuilder()
+                .addPathSegments(AGENT_TELEMETRY_API_ENDPOINT)
+                .build();
+        return new TelemetryClient(okHttpClient, httpRetryPolicy, agentTelemetryUrl, null);
     }
 
-    long timeoutMillis = TimeUnit.SECONDS.toMillis(config.getAgentTimeout());
-    OkHttpClient httpClient = OkHttpUtils.buildHttpClient(url, timeoutMillis);
-    return new TelemetryClient(httpClient, httpRetryPolicy, url, apiKey);
-  }
-
-  private static String buildIntakeTelemetryUrl(Config config) {
-    if (config.isCiVisibilityEnabled() && config.isCiVisibilityAgentlessEnabled()) {
-      String agentlessUrl = config.getCiVisibilityAgentlessUrl();
-      if (Strings.isNotBlank(agentlessUrl)) {
-        return agentlessUrl + "/api/v2/apmtelemetry";
-      }
+    public static TelemetryClient buildIntakeClient(Config config, HttpRetryPolicy.Factory httpRetryPolicy) {
+        String apiKey = config.getApiKey();
+        if (apiKey == null) {
+            log.debug("Cannot create Telemetry Intake because DD_API_KEY unspecified.");
+            return null;
+        }
+
+        String telemetryUrl = buildIntakeTelemetryUrl(config);
+        HttpUrl url;
+        try {
+            url = HttpUrl.get(telemetryUrl);
+        } catch (IllegalArgumentException e) {
+            log.error("Can't create Telemetry URL for {}", telemetryUrl);
+            return null;
+        }
+
+        long timeoutMillis = TimeUnit.SECONDS.toMillis(config.getAgentTimeout());
+        OkHttpClient httpClient = OkHttpUtils.buildHttpClient(url, timeoutMillis);
+        return new TelemetryClient(httpClient, httpRetryPolicy, url, apiKey);
     }
-    return config.getDefaultTelemetryUrl();
-  }
-
-  private static final Logger log = LoggerFactory.getLogger(TelemetryClient.class);
-
-  private static final String AGENT_TELEMETRY_API_ENDPOINT = "telemetry/proxy/api/v2/apmtelemetry";
-  private static final String DD_TELEMETRY_REQUEST_TYPE = "DD-Telemetry-Request-Type";
-
-  private final OkHttpClient okHttpClient;
-  private final HttpRetryPolicy.Factory httpRetryPolicy;
-  private final HttpUrl url;
-  private final String apiKey;
-
-  public TelemetryClient(
-      OkHttpClient okHttpClient,
-      HttpRetryPolicy.Factory httpRetryPolicy,
-      HttpUrl url,
-      String apiKey) {
-    this.okHttpClient = okHttpClient;
-    this.httpRetryPolicy = httpRetryPolicy;
-    this.url = url;
-    this.apiKey = apiKey;
-  }
-
-  public HttpUrl getUrl() {
-    return url;
-  }
-
-  public Result sendHttpRequest(Request.Builder httpRequestBuilder) {
-    httpRequestBuilder.url(url);
-    if (apiKey != null) {
-      httpRequestBuilder.addHeader("DD-API-KEY", apiKey);
+
+    private static String buildIntakeTelemetryUrl(Config config) {
+        if (config.isCiVisibilityEnabled() && config.isCiVisibilityAgentlessEnabled()) {
+            String agentlessUrl = config.getCiVisibilityAgentlessUrl();
+            if (Strings.isNotBlank(agentlessUrl)) {
+                return agentlessUrl + "/api/v2/apmtelemetry";
+            }
+        }
+        return config.getDefaultTelemetryUrl();
     }
 
-    Request httpRequest = httpRequestBuilder.build();
-    String requestType = httpRequest.header(DD_TELEMETRY_REQUEST_TYPE);
-
-    try (okhttp3.Response response =
-        OkHttpUtils.sendWithRetries(okHttpClient, httpRetryPolicy, httpRequest)) {
-      if (response.code() == 404) {
-        log.debug("Telemetry endpoint is disabled, dropping {} message.", requestType);
-        return Result.NOT_FOUND;
-      }
-      if (!response.isSuccessful()) {
-        log.debug(
-            "Telemetry message {} failed with: {} {}.",
-            requestType,
-            response.code(),
-            response.message());
-        return Result.FAILURE;
-      }
-    } catch (InterruptedIOException e) {
-      log.debug("Telemetry message {} sending interrupted: {}.", requestType, e.toString());
-      return Result.INTERRUPTED;
-
-    } catch (IOException e) {
-      log.debug("Telemetry message {} failed with exception: {}.", requestType, e.toString());
-      return Result.FAILURE;
+    private static final Logger log = LoggerFactory.getLogger(TelemetryClient.class);
+
+    private static final String AGENT_TELEMETRY_API_ENDPOINT = "telemetry/proxy/api/v2/apmtelemetry";
+    private static final String DD_TELEMETRY_REQUEST_TYPE = "DD-Telemetry-Request-Type";
+
+    private final OkHttpClient okHttpClient;
+    private final HttpRetryPolicy.Factory httpRetryPolicy;
+    private final HttpUrl url;
+    private final String apiKey;
+
+    public TelemetryClient(
+            OkHttpClient okHttpClient, HttpRetryPolicy.Factory httpRetryPolicy, HttpUrl url, String apiKey) {
+        this.okHttpClient = okHttpClient;
+        this.httpRetryPolicy = httpRetryPolicy;
+        this.url = url;
+        this.apiKey = apiKey;
     }
 
-    log.debug("Telemetry message {} sent successfully to {}.", requestType, url);
-    return Result.SUCCESS;
-  }
+    public HttpUrl getUrl() {
+        return url;
+    }
+
+    public Result sendHttpRequest(Request.Builder httpRequestBuilder) {
+        httpRequestBuilder.url(url);
+        if (apiKey != null) {
+            httpRequestBuilder.addHeader("DD-API-KEY", apiKey);
+        }
+
+        Request httpRequest = httpRequestBuilder.build();
+        String requestType = httpRequest.header(DD_TELEMETRY_REQUEST_TYPE);
+
+        try (okhttp3.Response response = OkHttpUtils.sendWithRetries(okHttpClient, httpRetryPolicy, httpRequest)) {
+            if (response.code() == 404) {
+                log.debug("Telemetry endpoint is disabled, dropping {} message.", requestType);
+                return Result.NOT_FOUND;
+            }
+            if (!response.isSuccessful()) {
+                log.debug("Telemetry message {} failed with: {} {}.", requestType, response.code(), response.message());
+                return Result.FAILURE;
+            }
+        } catch (InterruptedIOException e) {
+            log.debug("Telemetry message {} sending interrupted: {}.", requestType, e.toString());
+            return Result.INTERRUPTED;
+
+        } catch (IOException e) {
+            log.debug("Telemetry message {} failed with exception: {}.", requestType, e.toString());
+            return Result.FAILURE;
+        }
+
+        log.debug("Telemetry message {} sent successfully to {}.", requestType, url);
+        return Result.SUCCESS;
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/TelemetryRequest.java b/telemetry/src/main/java/datadog/telemetry/TelemetryRequest.java
index 5c756d73ad1..1b724123678 100644
--- a/telemetry/src/main/java/datadog/telemetry/TelemetryRequest.java
+++ b/telemetry/src/main/java/datadog/telemetry/TelemetryRequest.java
@@ -27,249 +27,248 @@
 
 public class TelemetryRequest {
 
-  private static final Logger log = LoggerFactory.getLogger(TelemetryRequest.class);
+    private static final Logger log = LoggerFactory.getLogger(TelemetryRequest.class);
 
-  static final String API_VERSION = "v2";
-  static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+    static final String API_VERSION = "v2";
+    static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
 
-  private final EventSource eventSource;
-  private final EventSink eventSink;
-  private final long messageBytesSoftLimit;
-  private final RequestType requestType;
-  private final boolean debug;
-  private final TelemetryRequestBody requestBody;
+    private final EventSource eventSource;
+    private final EventSink eventSink;
+    private final long messageBytesSoftLimit;
+    private final RequestType requestType;
+    private final boolean debug;
+    private final TelemetryRequestBody requestBody;
 
-  TelemetryRequest(
-      EventSource eventSource,
-      EventSink eventSink,
-      long messageBytesSoftLimit,
-      RequestType requestType,
-      boolean debug) {
-    this.eventSource = eventSource;
-    this.eventSink = eventSink;
-    this.messageBytesSoftLimit = messageBytesSoftLimit;
-    this.requestType = requestType;
-    this.debug = debug;
-    this.requestBody = new TelemetryRequestBody(requestType);
-    this.requestBody.beginRequest(debug);
-  }
+    TelemetryRequest(
+            EventSource eventSource,
+            EventSink eventSink,
+            long messageBytesSoftLimit,
+            RequestType requestType,
+            boolean debug) {
+        this.eventSource = eventSource;
+        this.eventSink = eventSink;
+        this.messageBytesSoftLimit = messageBytesSoftLimit;
+        this.requestType = requestType;
+        this.debug = debug;
+        this.requestBody = new TelemetryRequestBody(requestType);
+        this.requestBody.beginRequest(debug);
+    }
 
-  public Request.Builder httpRequest() {
-    long bodySize = requestBody.endRequest();
+    public Request.Builder httpRequest() {
+        long bodySize = requestBody.endRequest();
 
-    Request.Builder builder =
-        new Request.Builder()
-            .addHeader("Content-Type", String.valueOf(JSON))
-            .addHeader("Content-Length", String.valueOf(bodySize))
-            .addHeader("DD-Telemetry-API-Version", API_VERSION)
-            .addHeader("DD-Telemetry-Request-Type", String.valueOf(this.requestType))
-            .addHeader("DD-Client-Library-Language", DDTags.LANGUAGE_TAG_VALUE)
-            .addHeader("DD-Client-Library-Version", TracerVersion.TRACER_VERSION)
-            .post(requestBody);
+        Request.Builder builder = new Request.Builder()
+                .addHeader("Content-Type", String.valueOf(JSON))
+                .addHeader("Content-Length", String.valueOf(bodySize))
+                .addHeader("DD-Telemetry-API-Version", API_VERSION)
+                .addHeader("DD-Telemetry-Request-Type", String.valueOf(this.requestType))
+                .addHeader("DD-Client-Library-Language", DDTags.LANGUAGE_TAG_VALUE)
+                .addHeader("DD-Client-Library-Version", TracerVersion.TRACER_VERSION)
+                .post(requestBody);
 
-    final String containerId = ContainerInfo.get().getContainerId();
-    if (containerId != null) {
-      builder.addHeader("Datadog-Container-ID", containerId);
-    }
-    final String entityId = ContainerInfo.getEntityId();
-    if (entityId != null) {
-      builder.addHeader("Datadog-Entity-ID", entityId);
-    }
-
-    if (debug) {
-      builder.addHeader("DD-Telemetry-Debug-Enabled", "true");
-    }
+        final String containerId = ContainerInfo.get().getContainerId();
+        if (containerId != null) {
+            builder.addHeader("Datadog-Container-ID", containerId);
+        }
+        final String entityId = ContainerInfo.getEntityId();
+        if (entityId != null) {
+            builder.addHeader("Datadog-Entity-ID", entityId);
+        }
 
-    Config config = Config.get();
-    String sessionId = config.getRuntimeId();
-    if (sessionId != null && !sessionId.isEmpty()) {
-      builder.addHeader("DD-Session-ID", sessionId);
-    }
-    String rootSessionId = config.getRootSessionId();
-    if (rootSessionId != null && !rootSessionId.equals(sessionId)) {
-      builder.addHeader("DD-Root-Session-ID", rootSessionId);
-    }
+        if (debug) {
+            builder.addHeader("DD-Telemetry-Debug-Enabled", "true");
+        }
 
-    return builder;
-  }
+        Config config = Config.get();
+        String sessionId = config.getRuntimeId();
+        if (sessionId != null && !sessionId.isEmpty()) {
+            builder.addHeader("DD-Session-ID", sessionId);
+        }
+        String rootSessionId = config.getRootSessionId();
+        if (rootSessionId != null && !rootSessionId.equals(sessionId)) {
+            builder.addHeader("DD-Root-Session-ID", rootSessionId);
+        }
 
-  public void writeConfigurations() {
-    if (!isWithinSizeLimits() || !eventSource.hasConfigChangeEvent()) {
-      return;
+        return builder;
     }
-    try {
-      requestBody.beginConfiguration();
-      while (eventSource.hasConfigChangeEvent() && isWithinSizeLimits()) {
-        ConfigSetting event = eventSource.nextConfigChangeEvent();
-        requestBody.writeConfiguration(event);
-        eventSink.addConfigChangeEvent(event);
-      }
-      requestBody.endConfiguration();
-    } catch (IOException e) {
-      throw new TelemetryRequestBody.SerializationException("configuration-object", e);
+
+    public void writeConfigurations() {
+        if (!isWithinSizeLimits() || !eventSource.hasConfigChangeEvent()) {
+            return;
+        }
+        try {
+            requestBody.beginConfiguration();
+            while (eventSource.hasConfigChangeEvent() && isWithinSizeLimits()) {
+                ConfigSetting event = eventSource.nextConfigChangeEvent();
+                requestBody.writeConfiguration(event);
+                eventSink.addConfigChangeEvent(event);
+            }
+            requestBody.endConfiguration();
+        } catch (IOException e) {
+            throw new TelemetryRequestBody.SerializationException("configuration-object", e);
+        }
     }
-  }
 
-  public void writeProducts() {
-    try {
-      requestBody.writeProducts(
-          InstrumenterConfig.get().getAppSecActivation() != ProductActivation.FULLY_DISABLED,
-          InstrumenterConfig.get().isProfilingEnabled(),
-          Config.get().isDynamicInstrumentationEnabled());
-    } catch (IOException e) {
-      throw new TelemetryRequestBody.SerializationException("products", e);
+    public void writeProducts() {
+        try {
+            requestBody.writeProducts(
+                    InstrumenterConfig.get().getAppSecActivation() != ProductActivation.FULLY_DISABLED,
+                    InstrumenterConfig.get().isProfilingEnabled(),
+                    Config.get().isDynamicInstrumentationEnabled());
+        } catch (IOException e) {
+            throw new TelemetryRequestBody.SerializationException("products", e);
+        }
     }
-  }
 
-  public void writeInstallSignature() {
-    String installId = ConfigHelper.env("DD_INSTRUMENTATION_INSTALL_ID");
-    String installType = ConfigHelper.env("DD_INSTRUMENTATION_INSTALL_TYPE");
-    String installTime = ConfigHelper.env("DD_INSTRUMENTATION_INSTALL_TIME");
+    public void writeInstallSignature() {
+        String installId = ConfigHelper.env("DD_INSTRUMENTATION_INSTALL_ID");
+        String installType = ConfigHelper.env("DD_INSTRUMENTATION_INSTALL_TYPE");
+        String installTime = ConfigHelper.env("DD_INSTRUMENTATION_INSTALL_TIME");
 
-    try {
-      requestBody.writeInstallSignature(installId, installType, installTime);
-    } catch (IOException e) {
-      throw new TelemetryRequestBody.SerializationException("install-signature", e);
+        try {
+            requestBody.writeInstallSignature(installId, installType, installTime);
+        } catch (IOException e) {
+            throw new TelemetryRequestBody.SerializationException("install-signature", e);
+        }
     }
-  }
 
-  public void writeIntegrations() {
-    if (!isWithinSizeLimits() || !eventSource.hasIntegrationEvent()) {
-      return;
-    }
-    try {
-      requestBody.beginIntegrations();
-      while (eventSource.hasIntegrationEvent() && isWithinSizeLimits()) {
-        Integration event = eventSource.nextIntegrationEvent();
-        requestBody.writeIntegration(event);
-        eventSink.addIntegrationEvent(event);
-      }
-      requestBody.endIntegrations();
-    } catch (IOException e) {
-      throw new TelemetryRequestBody.SerializationException("integrations-message", e);
+    public void writeIntegrations() {
+        if (!isWithinSizeLimits() || !eventSource.hasIntegrationEvent()) {
+            return;
+        }
+        try {
+            requestBody.beginIntegrations();
+            while (eventSource.hasIntegrationEvent() && isWithinSizeLimits()) {
+                Integration event = eventSource.nextIntegrationEvent();
+                requestBody.writeIntegration(event);
+                eventSink.addIntegrationEvent(event);
+            }
+            requestBody.endIntegrations();
+        } catch (IOException e) {
+            throw new TelemetryRequestBody.SerializationException("integrations-message", e);
+        }
     }
-  }
 
-  public void writeDependencies() {
-    if (!isWithinSizeLimits() || !eventSource.hasDependencyEvent()) {
-      return;
-    }
-    try {
-      requestBody.beginDependencies();
-      while (eventSource.hasDependencyEvent() && isWithinSizeLimits()) {
-        Dependency event = eventSource.nextDependencyEvent();
-        requestBody.writeDependency(event);
-        eventSink.addDependencyEvent(event);
-      }
-      requestBody.endDependencies();
-    } catch (IOException e) {
-      throw new TelemetryRequestBody.SerializationException("dependencies-message", e);
+    public void writeDependencies() {
+        if (!isWithinSizeLimits() || !eventSource.hasDependencyEvent()) {
+            return;
+        }
+        try {
+            requestBody.beginDependencies();
+            while (eventSource.hasDependencyEvent() && isWithinSizeLimits()) {
+                Dependency event = eventSource.nextDependencyEvent();
+                requestBody.writeDependency(event);
+                eventSink.addDependencyEvent(event);
+            }
+            requestBody.endDependencies();
+        } catch (IOException e) {
+            throw new TelemetryRequestBody.SerializationException("dependencies-message", e);
+        }
     }
-  }
 
-  public void writeMetrics() {
-    if (!isWithinSizeLimits() || !eventSource.hasMetricEvent()) {
-      return;
-    }
-    try {
-      requestBody.beginMetrics();
-      while (eventSource.hasMetricEvent() && isWithinSizeLimits()) {
-        Metric event = eventSource.nextMetricEvent();
-        requestBody.writeMetric(event);
-        eventSink.addMetricEvent(event);
-      }
-      requestBody.endMetrics();
-    } catch (IOException e) {
-      throw new TelemetryRequestBody.SerializationException("metrics-message", e);
+    public void writeMetrics() {
+        if (!isWithinSizeLimits() || !eventSource.hasMetricEvent()) {
+            return;
+        }
+        try {
+            requestBody.beginMetrics();
+            while (eventSource.hasMetricEvent() && isWithinSizeLimits()) {
+                Metric event = eventSource.nextMetricEvent();
+                requestBody.writeMetric(event);
+                eventSink.addMetricEvent(event);
+            }
+            requestBody.endMetrics();
+        } catch (IOException e) {
+            throw new TelemetryRequestBody.SerializationException("metrics-message", e);
+        }
     }
-  }
 
-  public void writeDistributions() {
-    if (!isWithinSizeLimits() || !eventSource.hasDistributionSeriesEvent()) {
-      return;
-    }
-    try {
-      requestBody.beginDistributions();
-      while (eventSource.hasDistributionSeriesEvent() && isWithinSizeLimits()) {
-        DistributionSeries event = eventSource.nextDistributionSeriesEvent();
-        requestBody.writeDistribution(event);
-        eventSink.addDistributionSeriesEvent(event);
-      }
-      requestBody.endDistributions();
-    } catch (IOException e) {
-      throw new TelemetryRequestBody.SerializationException("distributions-message", e);
+    public void writeDistributions() {
+        if (!isWithinSizeLimits() || !eventSource.hasDistributionSeriesEvent()) {
+            return;
+        }
+        try {
+            requestBody.beginDistributions();
+            while (eventSource.hasDistributionSeriesEvent() && isWithinSizeLimits()) {
+                DistributionSeries event = eventSource.nextDistributionSeriesEvent();
+                requestBody.writeDistribution(event);
+                eventSink.addDistributionSeriesEvent(event);
+            }
+            requestBody.endDistributions();
+        } catch (IOException e) {
+            throw new TelemetryRequestBody.SerializationException("distributions-message", e);
+        }
     }
-  }
 
-  public void writeLogs() {
-    if (!isWithinSizeLimits() || !eventSource.hasLogMessageEvent()) {
-      return;
-    }
-    try {
-      requestBody.beginLogs();
-      while (eventSource.hasLogMessageEvent() && isWithinSizeLimits()) {
-        LogMessage event = eventSource.nextLogMessageEvent();
-        requestBody.writeLog(event);
-        eventSink.addLogMessageEvent(event);
-      }
-      requestBody.endLogs();
-    } catch (IOException e) {
-      throw new TelemetryRequestBody.SerializationException("logs-message", e);
+    public void writeLogs() {
+        if (!isWithinSizeLimits() || !eventSource.hasLogMessageEvent()) {
+            return;
+        }
+        try {
+            requestBody.beginLogs();
+            while (eventSource.hasLogMessageEvent() && isWithinSizeLimits()) {
+                LogMessage event = eventSource.nextLogMessageEvent();
+                requestBody.writeLog(event);
+                eventSink.addLogMessageEvent(event);
+            }
+            requestBody.endLogs();
+        } catch (IOException e) {
+            throw new TelemetryRequestBody.SerializationException("logs-message", e);
+        }
     }
-  }
 
-  public void writeChangedProducts() {
-    if (!isWithinSizeLimits() || !eventSource.hasProductChangeEvent()) {
-      return;
-    }
-    try {
-      log.debug("Writing changed products");
-      requestBody.beginProducts();
-      Map<ProductType, Boolean> products = new EnumMap<>(ProductType.class);
-      while (eventSource.hasProductChangeEvent() && isWithinSizeLimits()) {
-        ProductChange event = eventSource.nextProductChangeEvent();
-        products.put(event.getProductType(), event.isEnabled());
-        eventSink.addProductChangeEvent(event);
-      }
-      requestBody.writeProducts(products);
-      requestBody.endProducts();
-    } catch (IOException e) {
-      throw new TelemetryRequestBody.SerializationException("changed-products", e);
+    public void writeChangedProducts() {
+        if (!isWithinSizeLimits() || !eventSource.hasProductChangeEvent()) {
+            return;
+        }
+        try {
+            log.debug("Writing changed products");
+            requestBody.beginProducts();
+            Map<ProductType, Boolean> products = new EnumMap<>(ProductType.class);
+            while (eventSource.hasProductChangeEvent() && isWithinSizeLimits()) {
+                ProductChange event = eventSource.nextProductChangeEvent();
+                products.put(event.getProductType(), event.isEnabled());
+                eventSink.addProductChangeEvent(event);
+            }
+            requestBody.writeProducts(products);
+            requestBody.endProducts();
+        } catch (IOException e) {
+            throw new TelemetryRequestBody.SerializationException("changed-products", e);
+        }
     }
-  }
 
-  public void writeEndpoints() {
-    if (!isWithinSizeLimits() || !eventSource.hasEndpoint()) {
-      return;
-    }
-    try {
-      log.debug("Writing endpoints");
-      requestBody.beginEndpoints();
-      boolean first = false;
-      int remaining = Config.get().getApiSecurityEndpointCollectionMessageLimit();
-      while (eventSource.hasEndpoint() && remaining > 0) {
-        final Endpoint event = eventSource.nextEndpoint();
-        remaining--;
-        if (event.isFirst()) {
-          first = true;
+    public void writeEndpoints() {
+        if (!isWithinSizeLimits() || !eventSource.hasEndpoint()) {
+            return;
         }
-        requestBody.writeEndpoint(event);
-        eventSink.addEndpointEvent(event);
-        if (!isWithinSizeLimits()) {
-          break;
+        try {
+            log.debug("Writing endpoints");
+            requestBody.beginEndpoints();
+            boolean first = false;
+            int remaining = Config.get().getApiSecurityEndpointCollectionMessageLimit();
+            while (eventSource.hasEndpoint() && remaining > 0) {
+                final Endpoint event = eventSource.nextEndpoint();
+                remaining--;
+                if (event.isFirst()) {
+                    first = true;
+                }
+                requestBody.writeEndpoint(event);
+                eventSink.addEndpointEvent(event);
+                if (!isWithinSizeLimits()) {
+                    break;
+                }
+            }
+            requestBody.endEndpoints(first);
+        } catch (IOException e) {
+            throw new TelemetryRequestBody.SerializationException("asm-endpoints", e);
         }
-      }
-      requestBody.endEndpoints(first);
-    } catch (IOException e) {
-      throw new TelemetryRequestBody.SerializationException("asm-endpoints", e);
     }
-  }
 
-  public void writeHeartbeat() {
-    requestBody.writeHeartbeatEvent();
-  }
+    public void writeHeartbeat() {
+        requestBody.writeHeartbeatEvent();
+    }
 
-  private boolean isWithinSizeLimits() {
-    return requestBody.size() < messageBytesSoftLimit;
-  }
+    private boolean isWithinSizeLimits() {
+        return requestBody.size() < messageBytesSoftLimit;
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/TelemetryRequestBody.java b/telemetry/src/main/java/datadog/telemetry/TelemetryRequestBody.java
index 1926c3ff8c8..8f7970a351e 100644
--- a/telemetry/src/main/java/datadog/telemetry/TelemetryRequestBody.java
+++ b/telemetry/src/main/java/datadog/telemetry/TelemetryRequestBody.java
@@ -27,405 +27,403 @@
 
 public class TelemetryRequestBody extends RequestBody {
 
-  public static class SerializationException extends RuntimeException {
-    public SerializationException(String requestPartName, Throwable cause) {
-      super("Failed serializing Telemetry " + requestPartName + " part!", cause);
-    }
-  }
-
-  private static final AtomicLong SEQ_ID = new AtomicLong();
-  private static final String TELEMETRY_NAMESPACE_TAG_TRACER = "tracers";
-
-  private final RequestType requestType;
-  private final Buffer body;
-  private final JsonWriter bodyWriter;
-
-  /** Exists in a separate class to avoid startup toll */
-  private static class CommonData {
-    final Config config = Config.get();
-    final String env = config.getEnv();
-    final String langVersion = JavaVirtualMachine.getLangVersion();
-    final String runtimeName = JavaVirtualMachine.getRuntimeVendor();
-    final String runtimePatches = JavaVirtualMachine.getRuntimePatches();
-    final String runtimeVersion = JavaVirtualMachine.getRuntimeVersion();
-    final String serviceName = config.getServiceName();
-    final String serviceVersion = config.getVersion();
-    final String runtimeId = config.getRuntimeId();
-    final String architecture = HostInfo.getArchitecture();
-    final String hostname = HostInfo.getHostname();
-    final String kernelName = HostInfo.getKernelName();
-    final String kernelRelease = HostInfo.getKernelRelease();
-    final String kernelVersion = HostInfo.getKernelVersion();
-    final String osName = HostInfo.getOsName();
-    final String osVersion = HostInfo.getOsVersion();
-  }
-
-  private static final CommonData commonData = new CommonData();
-
-  TelemetryRequestBody(RequestType requestType) {
-    this.requestType = requestType;
-    this.body = new Buffer();
-    this.bodyWriter = JsonWriter.of(body);
-  }
-
-  public void beginRequest(boolean debug) {
-    try {
-      bodyWriter.beginObject();
-      bodyWriter.name("api_version").value(TelemetryRequest.API_VERSION);
-      // naming_schema_version - optional
-      bodyWriter.name("runtime_id").value(commonData.runtimeId);
-      bodyWriter.name("seq_id").value(SEQ_ID.incrementAndGet());
-      bodyWriter.name("tracer_time").value(System.currentTimeMillis() / 1000L);
-
-      bodyWriter.name("application");
-      bodyWriter.beginObject();
-      bodyWriter.name("service_name").value(commonData.serviceName);
-      bodyWriter.name("env").value(commonData.env);
-      bodyWriter.name("service_version").value(commonData.serviceVersion);
-      bodyWriter.name("tracer_version").value(TracerVersion.TRACER_VERSION);
-      bodyWriter.name("language_name").value(DDTags.LANGUAGE_TAG_VALUE);
-      bodyWriter.name("language_version").value(commonData.langVersion);
-      bodyWriter.name("runtime_name").value(commonData.runtimeName);
-      bodyWriter.name("runtime_version").value(commonData.runtimeVersion);
-      bodyWriter.name("runtime_patches").value(commonData.runtimePatches); // optional
-      final CharSequence processTags = ProcessTags.getTagsForSerialization();
-      if (processTags != null) {
-        bodyWriter.name("process_tags").value(processTags.toString());
-      }
-      bodyWriter.endObject();
-
-      if (debug) {
-        bodyWriter.name("debug").value(true);
-      }
-      bodyWriter.name("host");
-      bodyWriter.beginObject();
-      bodyWriter.name("hostname").value(commonData.hostname);
-      bodyWriter.name("os").value(commonData.osName);
-      bodyWriter.name("os_version").value(commonData.osVersion); // optional
-      bodyWriter.name("architecture").value(commonData.architecture);
-      // only applicable to UNIX based OS
-      bodyWriter.name("kernel_name").value(commonData.kernelName);
-      bodyWriter.name("kernel_release").value(commonData.kernelRelease);
-      bodyWriter.name("kernel_version").value(commonData.kernelVersion);
-      bodyWriter.endObject();
-
-      bodyWriter.name("request_type").value(this.requestType.toString());
-
-      switch (this.requestType) {
-        case APP_STARTED:
-        case APP_EXTENDED_HEARTBEAT:
-          bodyWriter.name("payload");
-          bodyWriter.beginObject();
-          break;
-        case MESSAGE_BATCH:
-          bodyWriter.name("payload");
-          bodyWriter.beginArray();
-          break;
-        default:
-      }
-    } catch (Exception ex) {
-      throw new SerializationException("begin-request", ex);
-    }
-  }
-
-  /**
-   * @return body size in bytes
-   */
-  public long endRequest() {
-    try {
-      switch (this.requestType) {
-        case APP_STARTED:
-        case APP_EXTENDED_HEARTBEAT:
-          bodyWriter.endObject(); // payload
-          break;
-        case MESSAGE_BATCH:
-          bodyWriter.endArray(); // payloads
-          break;
-        default:
-      }
-      bodyWriter.endObject(); // request
-      return body.size();
-    } catch (Exception ex) {
-      throw new SerializationException("end-request", ex);
-    }
-  }
-
-  public void writeHeartbeatEvent() {
-    beginMessageIfBatch(RequestType.APP_HEARTBEAT);
-    endMessageIfBatch(RequestType.APP_HEARTBEAT);
-  }
-
-  public void beginMetrics() throws IOException {
-    beginMessageIfBatch(RequestType.GENERATE_METRICS);
-    bodyWriter.name("namespace").value(TELEMETRY_NAMESPACE_TAG_TRACER);
-    bodyWriter.name("series").beginArray();
-  }
-
-  public void writeMetric(Metric m) throws IOException {
-    bodyWriter.beginObject();
-    bodyWriter.name("metric").value(m.getMetric());
-    bodyWriter.name("points").jsonValue(m.getPoints());
-    // interval - optional
-    if (m.getType() != null) bodyWriter.name("type").value(m.getType().toString());
-    bodyWriter.name("tags").jsonValue(m.getTags()); // optional
-    bodyWriter.name("common").value(m.getCommon()); // optional
-    bodyWriter.name("namespace").value(m.getNamespace()); // optional
-    bodyWriter.endObject();
-  }
-
-  public void endMetrics() throws IOException {
-    bodyWriter.endArray();
-    endMessageIfBatch(RequestType.GENERATE_METRICS);
-  }
-
-  public void beginDistributions() throws IOException {
-    beginMessageIfBatch(RequestType.DISTRIBUTIONS);
-    bodyWriter.name("namespace").value(TELEMETRY_NAMESPACE_TAG_TRACER);
-    bodyWriter.name("series").beginArray();
-  }
-
-  public void writeDistribution(DistributionSeries ds) throws IOException {
-    bodyWriter.beginObject();
-    bodyWriter.name("metric").value(ds.getMetric());
-    bodyWriter.name("points").jsonValue(ds.getPoints());
-    bodyWriter.name("tags").jsonValue(ds.getTags());
-    bodyWriter.name("common").value(ds.getCommon());
-    bodyWriter.name("namespace").value(ds.getNamespace());
-    bodyWriter.endObject();
-  }
-
-  public void endDistributions() throws IOException {
-    bodyWriter.endArray();
-    endMessageIfBatch(RequestType.DISTRIBUTIONS);
-  }
-
-  public void beginLogs() throws IOException {
-    beginMessageIfBatch(RequestType.LOGS);
-    bodyWriter.name("logs").beginArray();
-  }
-
-  public void writeLog(LogMessage m) throws IOException {
-    bodyWriter.beginObject();
-    bodyWriter.name("message").value(m.getMessage());
-    bodyWriter.name("level").value(String.valueOf(m.getLevel()));
-    bodyWriter.name("tags").value(m.getTags()); // optional
-    bodyWriter.name("stack_trace").value(m.getStackTrace()); // optional
-    bodyWriter.name("tracer_time").value(m.getTracerTime()); // optional
-    bodyWriter.name("count").value(m.getCount()); // optional
-    bodyWriter.endObject();
-  }
-
-  public void endLogs() throws IOException {
-    bodyWriter.endArray();
-    endMessageIfBatch(RequestType.LOGS);
-  }
-
-  public void beginConfiguration() throws IOException {
-    beginMessageIfBatch(RequestType.APP_CLIENT_CONFIGURATION_CHANGE);
-    bodyWriter.name("configuration").beginArray();
-  }
-
-  public void writeConfiguration(ConfigSetting configSetting) throws IOException {
-    bodyWriter.beginObject();
-    bodyWriter.name("name").value(configSetting.key);
-    bodyWriter.setSerializeNulls(true);
-    bodyWriter.name("value").value(configSetting.stringValue());
-    bodyWriter.setSerializeNulls(false);
-    bodyWriter.name("origin").value(configSetting.origin.value);
-    bodyWriter.name("seq_id").value(configSetting.seqId);
-    if (configSetting.configId != null) {
-      bodyWriter.name("config_id").value(configSetting.configId);
-    }
-    bodyWriter.endObject();
-  }
-
-  public void endConfiguration() throws IOException {
-    bodyWriter.endArray();
-    endMessageIfBatch(RequestType.APP_CLIENT_CONFIGURATION_CHANGE);
-  }
-
-  public void beginIntegrations() throws IOException {
-    beginMessageIfBatch(RequestType.APP_INTEGRATIONS_CHANGE);
-    bodyWriter.name("integrations").beginArray();
-  }
-
-  public void writeIntegration(Integration i) throws IOException {
-    bodyWriter.beginObject();
-    bodyWriter.name("enabled").value(i.enabled);
-    bodyWriter.name("name").value(i.name);
-    bodyWriter.endObject();
-  }
-
-  public void endIntegrations() throws IOException {
-    bodyWriter.endArray();
-    endMessageIfBatch(RequestType.APP_INTEGRATIONS_CHANGE);
-  }
-
-  public void beginDependencies() throws IOException {
-    beginMessageIfBatch(RequestType.APP_DEPENDENCIES_LOADED);
-    bodyWriter.name("dependencies").beginArray();
-  }
-
-  public void writeDependency(Dependency d) throws IOException {
-    bodyWriter.beginObject();
-    bodyWriter.name("hash").value(d.hash); // optional
-    bodyWriter.name("name").value(d.name);
-    bodyWriter.name("version").value(d.version); // optional
-    if (d.reachabilityMetadata != null) {
-      // Write metadata array even when empty: empty list signals "SCA is active for this dep"
-      // (RFC: all deps get metadata:[] at startup when DD_APPSEC_SCA_ENABLED=true).
-      // Null means SCA is disabled; empty list means SCA is enabled but no CVEs detected yet.
-      bodyWriter.name("metadata").beginArray();
-      for (String value : d.reachabilityMetadata) {
+    public static class SerializationException extends RuntimeException {
+        public SerializationException(String requestPartName, Throwable cause) {
+            super("Failed serializing Telemetry " + requestPartName + " part!", cause);
+        }
+    }
+
+    private static final AtomicLong SEQ_ID = new AtomicLong();
+    private static final String TELEMETRY_NAMESPACE_TAG_TRACER = "tracers";
+
+    private final RequestType requestType;
+    private final Buffer body;
+    private final JsonWriter bodyWriter;
+
+    /** Exists in a separate class to avoid startup toll */
+    private static class CommonData {
+        final Config config = Config.get();
+        final String env = config.getEnv();
+        final String langVersion = JavaVirtualMachine.getLangVersion();
+        final String runtimeName = JavaVirtualMachine.getRuntimeVendor();
+        final String runtimePatches = JavaVirtualMachine.getRuntimePatches();
+        final String runtimeVersion = JavaVirtualMachine.getRuntimeVersion();
+        final String serviceName = config.getServiceName();
+        final String serviceVersion = config.getVersion();
+        final String runtimeId = config.getRuntimeId();
+        final String architecture = HostInfo.getArchitecture();
+        final String hostname = HostInfo.getHostname();
+        final String kernelName = HostInfo.getKernelName();
+        final String kernelRelease = HostInfo.getKernelRelease();
+        final String kernelVersion = HostInfo.getKernelVersion();
+        final String osName = HostInfo.getOsName();
+        final String osVersion = HostInfo.getOsVersion();
+    }
+
+    private static final CommonData commonData = new CommonData();
+
+    TelemetryRequestBody(RequestType requestType) {
+        this.requestType = requestType;
+        this.body = new Buffer();
+        this.bodyWriter = JsonWriter.of(body);
+    }
+
+    public void beginRequest(boolean debug) {
+        try {
+            bodyWriter.beginObject();
+            bodyWriter.name("api_version").value(TelemetryRequest.API_VERSION);
+            // naming_schema_version - optional
+            bodyWriter.name("runtime_id").value(commonData.runtimeId);
+            bodyWriter.name("seq_id").value(SEQ_ID.incrementAndGet());
+            bodyWriter.name("tracer_time").value(System.currentTimeMillis() / 1000L);
+
+            bodyWriter.name("application");
+            bodyWriter.beginObject();
+            bodyWriter.name("service_name").value(commonData.serviceName);
+            bodyWriter.name("env").value(commonData.env);
+            bodyWriter.name("service_version").value(commonData.serviceVersion);
+            bodyWriter.name("tracer_version").value(TracerVersion.TRACER_VERSION);
+            bodyWriter.name("language_name").value(DDTags.LANGUAGE_TAG_VALUE);
+            bodyWriter.name("language_version").value(commonData.langVersion);
+            bodyWriter.name("runtime_name").value(commonData.runtimeName);
+            bodyWriter.name("runtime_version").value(commonData.runtimeVersion);
+            bodyWriter.name("runtime_patches").value(commonData.runtimePatches); // optional
+            final CharSequence processTags = ProcessTags.getTagsForSerialization();
+            if (processTags != null) {
+                bodyWriter.name("process_tags").value(processTags.toString());
+            }
+            bodyWriter.endObject();
+
+            if (debug) {
+                bodyWriter.name("debug").value(true);
+            }
+            bodyWriter.name("host");
+            bodyWriter.beginObject();
+            bodyWriter.name("hostname").value(commonData.hostname);
+            bodyWriter.name("os").value(commonData.osName);
+            bodyWriter.name("os_version").value(commonData.osVersion); // optional
+            bodyWriter.name("architecture").value(commonData.architecture);
+            // only applicable to UNIX based OS
+            bodyWriter.name("kernel_name").value(commonData.kernelName);
+            bodyWriter.name("kernel_release").value(commonData.kernelRelease);
+            bodyWriter.name("kernel_version").value(commonData.kernelVersion);
+            bodyWriter.endObject();
+
+            bodyWriter.name("request_type").value(this.requestType.toString());
+
+            switch (this.requestType) {
+                case APP_STARTED:
+                case APP_EXTENDED_HEARTBEAT:
+                    bodyWriter.name("payload");
+                    bodyWriter.beginObject();
+                    break;
+                case MESSAGE_BATCH:
+                    bodyWriter.name("payload");
+                    bodyWriter.beginArray();
+                    break;
+                default:
+            }
+        } catch (Exception ex) {
+            throw new SerializationException("begin-request", ex);
+        }
+    }
+
+    /**
+     * @return body size in bytes
+     */
+    public long endRequest() {
+        try {
+            switch (this.requestType) {
+                case APP_STARTED:
+                case APP_EXTENDED_HEARTBEAT:
+                    bodyWriter.endObject(); // payload
+                    break;
+                case MESSAGE_BATCH:
+                    bodyWriter.endArray(); // payloads
+                    break;
+                default:
+            }
+            bodyWriter.endObject(); // request
+            return body.size();
+        } catch (Exception ex) {
+            throw new SerializationException("end-request", ex);
+        }
+    }
+
+    public void writeHeartbeatEvent() {
+        beginMessageIfBatch(RequestType.APP_HEARTBEAT);
+        endMessageIfBatch(RequestType.APP_HEARTBEAT);
+    }
+
+    public void beginMetrics() throws IOException {
+        beginMessageIfBatch(RequestType.GENERATE_METRICS);
+        bodyWriter.name("namespace").value(TELEMETRY_NAMESPACE_TAG_TRACER);
+        bodyWriter.name("series").beginArray();
+    }
+
+    public void writeMetric(Metric m) throws IOException {
+        bodyWriter.beginObject();
+        bodyWriter.name("metric").value(m.getMetric());
+        bodyWriter.name("points").jsonValue(m.getPoints());
+        // interval - optional
+        if (m.getType() != null) bodyWriter.name("type").value(m.getType().toString());
+        bodyWriter.name("tags").jsonValue(m.getTags()); // optional
+        bodyWriter.name("common").value(m.getCommon()); // optional
+        bodyWriter.name("namespace").value(m.getNamespace()); // optional
+        bodyWriter.endObject();
+    }
+
+    public void endMetrics() throws IOException {
+        bodyWriter.endArray();
+        endMessageIfBatch(RequestType.GENERATE_METRICS);
+    }
+
+    public void beginDistributions() throws IOException {
+        beginMessageIfBatch(RequestType.DISTRIBUTIONS);
+        bodyWriter.name("namespace").value(TELEMETRY_NAMESPACE_TAG_TRACER);
+        bodyWriter.name("series").beginArray();
+    }
+
+    public void writeDistribution(DistributionSeries ds) throws IOException {
         bodyWriter.beginObject();
-        bodyWriter.name("type").value("reachability");
-        bodyWriter.name("value").value(value); // stringified JSON per RFC
+        bodyWriter.name("metric").value(ds.getMetric());
+        bodyWriter.name("points").jsonValue(ds.getPoints());
+        bodyWriter.name("tags").jsonValue(ds.getTags());
+        bodyWriter.name("common").value(ds.getCommon());
+        bodyWriter.name("namespace").value(ds.getNamespace());
         bodyWriter.endObject();
-      }
-      bodyWriter.endArray();
     }
-    bodyWriter.endObject();
-  }
-
-  public void endDependencies() throws IOException {
-    bodyWriter.endArray();
-    endMessageIfBatch(RequestType.APP_DEPENDENCIES_LOADED);
-  }
-
-  public void beginProducts() throws IOException {
-    beginMessageIfBatch(RequestType.APP_PRODUCT_CHANGE);
-  }
-
-  public void writeProducts(final Map<ProductType, Boolean> products) throws IOException {
-
-    if (products == null || products.isEmpty()) {
-      return;
-    }
-    bodyWriter.name("products");
-    bodyWriter.beginObject();
-
-    for (Map.Entry<ProductType, Boolean> entry : products.entrySet()) {
-      bodyWriter.name(entry.getKey().getName());
-      bodyWriter.beginObject();
-      bodyWriter.name("enabled").value(entry.getValue());
-      bodyWriter.endObject();
-    }
-
-    bodyWriter.endObject();
-  }
-
-  public void writeProducts(
-      boolean appsecEnabled, boolean profilerEnabled, boolean dynamicInstrumentationEnabled)
-      throws IOException {
-    Map<ProductType, Boolean> products = new EnumMap<>(ProductType.class);
-    products.put(ProductType.APPSEC, appsecEnabled);
-    products.put(ProductType.PROFILER, profilerEnabled);
-    products.put(ProductType.DYNAMIC_INSTRUMENTATION, dynamicInstrumentationEnabled);
-    writeProducts(products);
-  }
-
-  public void endProducts() throws IOException {
-    endMessageIfBatch(RequestType.APP_PRODUCT_CHANGE);
-  }
-
-  public void beginEndpoints() throws IOException {
-    beginMessageIfBatch(RequestType.APP_ENDPOINTS);
-    bodyWriter.name("endpoints");
-    bodyWriter.beginArray();
-  }
-
-  public void writeEndpoint(final Endpoint endpoint) throws IOException {
-    bodyWriter.beginObject();
-    if (endpoint.getType() != null) {
-      bodyWriter.name("type").value(endpoint.getType());
-    }
-    if (endpoint.getMethod() != null) {
-      bodyWriter.name("method").value(endpoint.getMethod());
-    }
-    if (endpoint.getPath() != null) {
-      bodyWriter.name("path").value(endpoint.getPath());
-    }
-    bodyWriter.name("operation_name").value(endpoint.getOperation());
-    bodyWriter.name("resource_name").value(endpoint.getResource());
-    if (endpoint.getRequestBodyType() != null) {
-      bodyWriter.name("request_body_type").jsonValue(endpoint.getRequestBodyType());
-    }
-    if (endpoint.getResponseBodyType() != null) {
-      bodyWriter.name("response_body_type").jsonValue(endpoint.getResponseBodyType());
-    }
-    if (endpoint.getResponseCode() != null) {
-      bodyWriter.name("response_code").jsonValue(endpoint.getResponseCode());
-    }
-    if (endpoint.getAuthentication() != null) {
-      bodyWriter.name("authentication").jsonValue(endpoint.getAuthentication());
-    }
-    if (endpoint.getMetadata() != null) {
-      bodyWriter.name("metadata").jsonValue(endpoint.getMetadata());
-    }
-    bodyWriter.endObject();
-  }
-
-  public void endEndpoints(final boolean first) throws IOException {
-    bodyWriter.endArray();
-    bodyWriter.name("is_first").value(first);
-    endMessageIfBatch(RequestType.APP_ENDPOINTS);
-  }
-
-  public void writeInstallSignature(String installId, String installType, String installTime)
-      throws IOException {
-    if (installId == null && installType == null && installTime == null) {
-      return;
-    }
-    bodyWriter.name("install_signature");
-    bodyWriter.beginObject();
-    bodyWriter.name("install_id").value(installId);
-    bodyWriter.name("install_type").value(installType);
-    bodyWriter.name("install_time").value(installTime);
-    bodyWriter.endObject();
-  }
-
-  @Nullable
-  @Override
-  public MediaType contentType() {
-    return TelemetryRequest.JSON;
-  }
-
-  @Override
-  public void writeTo(BufferedSink sink) throws IOException {
-    sink.write(body, body.size());
-  }
-
-  public long size() {
-    return body.size();
-  }
-
-  private void beginMessageIfBatch(RequestType messageType) {
-    if (requestType != RequestType.MESSAGE_BATCH) {
-      return;
-    }
-    try {
-      bodyWriter.beginObject();
-      bodyWriter.name("request_type").value(String.valueOf(messageType));
-      if (messageType != RequestType.APP_HEARTBEAT) {
-        bodyWriter.name("payload");
+
+    public void endDistributions() throws IOException {
+        bodyWriter.endArray();
+        endMessageIfBatch(RequestType.DISTRIBUTIONS);
+    }
+
+    public void beginLogs() throws IOException {
+        beginMessageIfBatch(RequestType.LOGS);
+        bodyWriter.name("logs").beginArray();
+    }
+
+    public void writeLog(LogMessage m) throws IOException {
+        bodyWriter.beginObject();
+        bodyWriter.name("message").value(m.getMessage());
+        bodyWriter.name("level").value(String.valueOf(m.getLevel()));
+        bodyWriter.name("tags").value(m.getTags()); // optional
+        bodyWriter.name("stack_trace").value(m.getStackTrace()); // optional
+        bodyWriter.name("tracer_time").value(m.getTracerTime()); // optional
+        bodyWriter.name("count").value(m.getCount()); // optional
+        bodyWriter.endObject();
+    }
+
+    public void endLogs() throws IOException {
+        bodyWriter.endArray();
+        endMessageIfBatch(RequestType.LOGS);
+    }
+
+    public void beginConfiguration() throws IOException {
+        beginMessageIfBatch(RequestType.APP_CLIENT_CONFIGURATION_CHANGE);
+        bodyWriter.name("configuration").beginArray();
+    }
+
+    public void writeConfiguration(ConfigSetting configSetting) throws IOException {
         bodyWriter.beginObject();
-      }
-    } catch (Exception ex) {
-      throw new SerializationException("begin-message", ex);
+        bodyWriter.name("name").value(configSetting.key);
+        bodyWriter.setSerializeNulls(true);
+        bodyWriter.name("value").value(configSetting.stringValue());
+        bodyWriter.setSerializeNulls(false);
+        bodyWriter.name("origin").value(configSetting.origin.value);
+        bodyWriter.name("seq_id").value(configSetting.seqId);
+        if (configSetting.configId != null) {
+            bodyWriter.name("config_id").value(configSetting.configId);
+        }
+        bodyWriter.endObject();
+    }
+
+    public void endConfiguration() throws IOException {
+        bodyWriter.endArray();
+        endMessageIfBatch(RequestType.APP_CLIENT_CONFIGURATION_CHANGE);
     }
-  }
 
-  private void endMessageIfBatch(RequestType messageType) {
-    if (requestType != RequestType.MESSAGE_BATCH) {
-      return;
+    public void beginIntegrations() throws IOException {
+        beginMessageIfBatch(RequestType.APP_INTEGRATIONS_CHANGE);
+        bodyWriter.name("integrations").beginArray();
     }
-    try {
-      if (messageType != RequestType.APP_HEARTBEAT) {
-        bodyWriter.endObject(); // payload
-      }
-      bodyWriter.endObject(); // message
-    } catch (Exception ex) {
-      throw new SerializationException("end-message", ex);
+
+    public void writeIntegration(Integration i) throws IOException {
+        bodyWriter.beginObject();
+        bodyWriter.name("enabled").value(i.enabled);
+        bodyWriter.name("name").value(i.name);
+        bodyWriter.endObject();
+    }
+
+    public void endIntegrations() throws IOException {
+        bodyWriter.endArray();
+        endMessageIfBatch(RequestType.APP_INTEGRATIONS_CHANGE);
+    }
+
+    public void beginDependencies() throws IOException {
+        beginMessageIfBatch(RequestType.APP_DEPENDENCIES_LOADED);
+        bodyWriter.name("dependencies").beginArray();
+    }
+
+    public void writeDependency(Dependency d) throws IOException {
+        bodyWriter.beginObject();
+        bodyWriter.name("hash").value(d.hash); // optional
+        bodyWriter.name("name").value(d.name);
+        bodyWriter.name("version").value(d.version); // optional
+        if (d.reachabilityMetadata != null) {
+            // Write metadata array even when empty: empty list signals "SCA is active for this dep"
+            // (RFC: all deps get metadata:[] at startup when DD_APPSEC_SCA_ENABLED=true).
+            // Null means SCA is disabled; empty list means SCA is enabled but no CVEs detected yet.
+            bodyWriter.name("metadata").beginArray();
+            for (String value : d.reachabilityMetadata) {
+                bodyWriter.beginObject();
+                bodyWriter.name("type").value("reachability");
+                bodyWriter.name("value").value(value); // stringified JSON per RFC
+                bodyWriter.endObject();
+            }
+            bodyWriter.endArray();
+        }
+        bodyWriter.endObject();
+    }
+
+    public void endDependencies() throws IOException {
+        bodyWriter.endArray();
+        endMessageIfBatch(RequestType.APP_DEPENDENCIES_LOADED);
+    }
+
+    public void beginProducts() throws IOException {
+        beginMessageIfBatch(RequestType.APP_PRODUCT_CHANGE);
+    }
+
+    public void writeProducts(final Map<ProductType, Boolean> products) throws IOException {
+
+        if (products == null || products.isEmpty()) {
+            return;
+        }
+        bodyWriter.name("products");
+        bodyWriter.beginObject();
+
+        for (Map.Entry<ProductType, Boolean> entry : products.entrySet()) {
+            bodyWriter.name(entry.getKey().getName());
+            bodyWriter.beginObject();
+            bodyWriter.name("enabled").value(entry.getValue());
+            bodyWriter.endObject();
+        }
+
+        bodyWriter.endObject();
+    }
+
+    public void writeProducts(boolean appsecEnabled, boolean profilerEnabled, boolean dynamicInstrumentationEnabled)
+            throws IOException {
+        Map<ProductType, Boolean> products = new EnumMap<>(ProductType.class);
+        products.put(ProductType.APPSEC, appsecEnabled);
+        products.put(ProductType.PROFILER, profilerEnabled);
+        products.put(ProductType.DYNAMIC_INSTRUMENTATION, dynamicInstrumentationEnabled);
+        writeProducts(products);
+    }
+
+    public void endProducts() throws IOException {
+        endMessageIfBatch(RequestType.APP_PRODUCT_CHANGE);
+    }
+
+    public void beginEndpoints() throws IOException {
+        beginMessageIfBatch(RequestType.APP_ENDPOINTS);
+        bodyWriter.name("endpoints");
+        bodyWriter.beginArray();
+    }
+
+    public void writeEndpoint(final Endpoint endpoint) throws IOException {
+        bodyWriter.beginObject();
+        if (endpoint.getType() != null) {
+            bodyWriter.name("type").value(endpoint.getType());
+        }
+        if (endpoint.getMethod() != null) {
+            bodyWriter.name("method").value(endpoint.getMethod());
+        }
+        if (endpoint.getPath() != null) {
+            bodyWriter.name("path").value(endpoint.getPath());
+        }
+        bodyWriter.name("operation_name").value(endpoint.getOperation());
+        bodyWriter.name("resource_name").value(endpoint.getResource());
+        if (endpoint.getRequestBodyType() != null) {
+            bodyWriter.name("request_body_type").jsonValue(endpoint.getRequestBodyType());
+        }
+        if (endpoint.getResponseBodyType() != null) {
+            bodyWriter.name("response_body_type").jsonValue(endpoint.getResponseBodyType());
+        }
+        if (endpoint.getResponseCode() != null) {
+            bodyWriter.name("response_code").jsonValue(endpoint.getResponseCode());
+        }
+        if (endpoint.getAuthentication() != null) {
+            bodyWriter.name("authentication").jsonValue(endpoint.getAuthentication());
+        }
+        if (endpoint.getMetadata() != null) {
+            bodyWriter.name("metadata").jsonValue(endpoint.getMetadata());
+        }
+        bodyWriter.endObject();
+    }
+
+    public void endEndpoints(final boolean first) throws IOException {
+        bodyWriter.endArray();
+        bodyWriter.name("is_first").value(first);
+        endMessageIfBatch(RequestType.APP_ENDPOINTS);
+    }
+
+    public void writeInstallSignature(String installId, String installType, String installTime) throws IOException {
+        if (installId == null && installType == null && installTime == null) {
+            return;
+        }
+        bodyWriter.name("install_signature");
+        bodyWriter.beginObject();
+        bodyWriter.name("install_id").value(installId);
+        bodyWriter.name("install_type").value(installType);
+        bodyWriter.name("install_time").value(installTime);
+        bodyWriter.endObject();
+    }
+
+    @Nullable
+    @Override
+    public MediaType contentType() {
+        return TelemetryRequest.JSON;
+    }
+
+    @Override
+    public void writeTo(BufferedSink sink) throws IOException {
+        sink.write(body, body.size());
+    }
+
+    public long size() {
+        return body.size();
+    }
+
+    private void beginMessageIfBatch(RequestType messageType) {
+        if (requestType != RequestType.MESSAGE_BATCH) {
+            return;
+        }
+        try {
+            bodyWriter.beginObject();
+            bodyWriter.name("request_type").value(String.valueOf(messageType));
+            if (messageType != RequestType.APP_HEARTBEAT) {
+                bodyWriter.name("payload");
+                bodyWriter.beginObject();
+            }
+        } catch (Exception ex) {
+            throw new SerializationException("begin-message", ex);
+        }
+    }
+
+    private void endMessageIfBatch(RequestType messageType) {
+        if (requestType != RequestType.MESSAGE_BATCH) {
+            return;
+        }
+        try {
+            if (messageType != RequestType.APP_HEARTBEAT) {
+                bodyWriter.endObject(); // payload
+            }
+            bodyWriter.endObject(); // message
+        } catch (Exception ex) {
+            throw new SerializationException("end-message", ex);
+        }
     }
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/TelemetryRouter.java b/telemetry/src/main/java/datadog/telemetry/TelemetryRouter.java
index 9a7192f9375..faa9496a8c3 100644
--- a/telemetry/src/main/java/datadog/telemetry/TelemetryRouter.java
+++ b/telemetry/src/main/java/datadog/telemetry/TelemetryRouter.java
@@ -8,85 +8,89 @@
 import org.slf4j.LoggerFactory;
 
 public class TelemetryRouter {
-  private static final Logger log = LoggerFactory.getLogger(TelemetryRouter.class);
+    private static final Logger log = LoggerFactory.getLogger(TelemetryRouter.class);
 
-  @Nullable private final DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery;
-  private final TelemetryClient agentClient;
-  @Nullable private final TelemetryClient intakeClient;
-  private final boolean useIntakeClientByDefault;
-  private TelemetryClient currentClient;
-  private boolean errorReported;
+    @Nullable
+    private final DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery;
 
-  public TelemetryRouter(
-      DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery,
-      TelemetryClient agentClient,
-      @Nullable TelemetryClient intakeClient,
-      boolean useIntakeClientByDefault) {
-    this.ddAgentFeaturesDiscovery = ddAgentFeaturesDiscovery;
-    this.agentClient = agentClient;
-    this.intakeClient = intakeClient;
-    this.useIntakeClientByDefault = useIntakeClientByDefault;
-    this.currentClient = useIntakeClientByDefault ? intakeClient : agentClient;
-  }
+    private final TelemetryClient agentClient;
 
-  /**
-   * Single-client constructor used for CiVis' Bazel mode file-based telemetry. Feature discovery
-   * and client-switching logic are skipped.
-   */
-  public TelemetryRouter(TelemetryClient singleClient) {
-    this.ddAgentFeaturesDiscovery = null;
-    this.agentClient = singleClient;
-    this.intakeClient = null;
-    this.useIntakeClientByDefault = false;
-    this.currentClient = singleClient;
-  }
+    @Nullable
+    private final TelemetryClient intakeClient;
 
-  public TelemetryClient.Result sendRequest(TelemetryRequest request) {
-    if (ddAgentFeaturesDiscovery == null) {
-      return currentClient.sendHttpRequest(request.httpRequest());
+    private final boolean useIntakeClientByDefault;
+    private TelemetryClient currentClient;
+    private boolean errorReported;
+
+    public TelemetryRouter(
+            DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery,
+            TelemetryClient agentClient,
+            @Nullable TelemetryClient intakeClient,
+            boolean useIntakeClientByDefault) {
+        this.ddAgentFeaturesDiscovery = ddAgentFeaturesDiscovery;
+        this.agentClient = agentClient;
+        this.intakeClient = intakeClient;
+        this.useIntakeClientByDefault = useIntakeClientByDefault;
+        this.currentClient = useIntakeClientByDefault ? intakeClient : agentClient;
     }
-    ddAgentFeaturesDiscovery.discoverIfOutdated();
-    boolean agentSupportsTelemetryProxy = ddAgentFeaturesDiscovery.supportsTelemetryProxy();
 
-    Request.Builder httpRequestBuilder = request.httpRequest();
-    TelemetryClient.Result result = currentClient.sendHttpRequest(httpRequestBuilder);
+    /**
+     * Single-client constructor used for CiVis' Bazel mode file-based telemetry. Feature discovery
+     * and client-switching logic are skipped.
+     */
+    public TelemetryRouter(TelemetryClient singleClient) {
+        this.ddAgentFeaturesDiscovery = null;
+        this.agentClient = singleClient;
+        this.intakeClient = null;
+        this.useIntakeClientByDefault = false;
+        this.currentClient = singleClient;
+    }
 
-    boolean requestFailed =
-        result != TelemetryClient.Result.SUCCESS
-            // interrupted request is most likely due to telemetry system shutdown,
-            // we do not want to log errors and reattempt in this case
-            && result != TelemetryClient.Result.INTERRUPTED;
-    if (currentClient == agentClient) {
-      if (requestFailed) {
-        reportErrorOnce(currentClient.getUrl(), result);
-        if (intakeClient != null) {
-          log.info("Agent Telemetry endpoint failed. Telemetry will be sent to Intake.");
-          errorReported = false;
-          currentClient = intakeClient;
+    public TelemetryClient.Result sendRequest(TelemetryRequest request) {
+        if (ddAgentFeaturesDiscovery == null) {
+            return currentClient.sendHttpRequest(request.httpRequest());
         }
-      }
-    } else {
-      if (requestFailed) {
-        reportErrorOnce(currentClient.getUrl(), result);
-      }
-      if ((agentSupportsTelemetryProxy && !useIntakeClientByDefault) || requestFailed) {
-        errorReported = false;
-        if (requestFailed) {
-          log.info("Intake Telemetry endpoint failed. Telemetry will be sent to Agent.");
+        ddAgentFeaturesDiscovery.discoverIfOutdated();
+        boolean agentSupportsTelemetryProxy = ddAgentFeaturesDiscovery.supportsTelemetryProxy();
+
+        Request.Builder httpRequestBuilder = request.httpRequest();
+        TelemetryClient.Result result = currentClient.sendHttpRequest(httpRequestBuilder);
+
+        boolean requestFailed = result != TelemetryClient.Result.SUCCESS
+                // interrupted request is most likely due to telemetry system shutdown,
+                // we do not want to log errors and reattempt in this case
+                && result != TelemetryClient.Result.INTERRUPTED;
+        if (currentClient == agentClient) {
+            if (requestFailed) {
+                reportErrorOnce(currentClient.getUrl(), result);
+                if (intakeClient != null) {
+                    log.info("Agent Telemetry endpoint failed. Telemetry will be sent to Intake.");
+                    errorReported = false;
+                    currentClient = intakeClient;
+                }
+            }
         } else {
-          log.info("Agent Telemetry endpoint is now available. Telemetry will be sent to Agent.");
+            if (requestFailed) {
+                reportErrorOnce(currentClient.getUrl(), result);
+            }
+            if ((agentSupportsTelemetryProxy && !useIntakeClientByDefault) || requestFailed) {
+                errorReported = false;
+                if (requestFailed) {
+                    log.info("Intake Telemetry endpoint failed. Telemetry will be sent to Agent.");
+                } else {
+                    log.info("Agent Telemetry endpoint is now available. Telemetry will be sent to Agent.");
+                }
+                currentClient = agentClient;
+            }
         }
-        currentClient = agentClient;
-      }
-    }
 
-    return result;
-  }
+        return result;
+    }
 
-  private void reportErrorOnce(HttpUrl requestUrl, TelemetryClient.Result result) {
-    if (!errorReported) {
-      log.warn("Got {} sending telemetry request to {}.", result, requestUrl);
-      errorReported = true;
+    private void reportErrorOnce(HttpUrl requestUrl, TelemetryClient.Result result) {
+        if (!errorReported) {
+            log.warn("Got {} sending telemetry request to {}.", result, requestUrl);
+            errorReported = true;
+        }
     }
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/TelemetryRunnable.java b/telemetry/src/main/java/datadog/telemetry/TelemetryRunnable.java
index e991ee5ee52..e215b76e4f6 100644
--- a/telemetry/src/main/java/datadog/telemetry/TelemetryRunnable.java
+++ b/telemetry/src/main/java/datadog/telemetry/TelemetryRunnable.java
@@ -15,257 +15,252 @@
 
 public class TelemetryRunnable implements Runnable {
 
-  private static final Logger log = LoggerFactory.getLogger(TelemetryRunnable.class);
-  private static final int APP_STARTED_RETRIES = 3;
-  private static final int APP_STARTED_PAUSE_BETWEEN_RETRIES_MILLIS = 500;
-  private static final int MAX_CONSECUTIVE_REQUESTS = 3;
-
-  private final TelemetryService telemetryService;
-  private final List<TelemetryPeriodicAction> actions;
-  private final List<MetricPeriodicAction> actionsAtMetricsInterval;
-  private final Scheduler scheduler;
-  private boolean startupEventSent;
-
-  public TelemetryRunnable(
-      final TelemetryService telemetryService, final List<TelemetryPeriodicAction> actions) {
-    this(telemetryService, actions, new ThreadSleeperImpl(), SystemTimeSource.INSTANCE);
-  }
-
-  TelemetryRunnable(
-      final TelemetryService telemetryService,
-      final List<TelemetryPeriodicAction> actions,
-      final ThreadSleeper sleeper,
-      final TimeSource timeSource) {
-    this.telemetryService = telemetryService;
-    this.actions = actions;
-    this.actionsAtMetricsInterval = findMetricPeriodicActions(actions);
-    this.scheduler =
-        new Scheduler(
-            timeSource,
-            sleeper,
-            (long) (Config.get().getTelemetryHeartbeatInterval() * 1000),
-            (long) (Config.get().getTelemetryMetricsInterval() * 1000),
-            Config.get().getTelemetryExtendedHeartbeatInterval() * 1000);
-  }
-
-  private List<MetricPeriodicAction> findMetricPeriodicActions(
-      final List<TelemetryPeriodicAction> actions) {
-    return actions.stream()
-        .filter(MetricPeriodicAction.class::isInstance)
-        .map(it -> (MetricPeriodicAction) it)
-        .collect(Collectors.toList());
-  }
-
-  @Override
-  public void run() {
-    // Ensure that Config has been initialized, so ConfigCollector can collect all settings first.
-    Config.get();
-
-    collectConfigChanges();
-
-    scheduler.init();
-
-    while (!Thread.interrupted()) {
-      try {
-        if (!startupEventSent) {
-          startupEventSent = sendAppStartedEvent();
-        }
-        if (startupEventSent) {
-          mainLoopIteration();
-        } else {
-          // wait until next heartbeat interval before reattempting startup event
-          scheduler.shouldRunHeartbeat();
-        }
-        scheduler.sleepUntilNextIteration();
-      } catch (InterruptedException e) {
-        log.debug("Interrupted; finishing telemetry thread");
-        Thread.currentThread().interrupt();
-      }
+    private static final Logger log = LoggerFactory.getLogger(TelemetryRunnable.class);
+    private static final int APP_STARTED_RETRIES = 3;
+    private static final int APP_STARTED_PAUSE_BETWEEN_RETRIES_MILLIS = 500;
+    private static final int MAX_CONSECUTIVE_REQUESTS = 3;
+
+    private final TelemetryService telemetryService;
+    private final List<TelemetryPeriodicAction> actions;
+    private final List<MetricPeriodicAction> actionsAtMetricsInterval;
+    private final Scheduler scheduler;
+    private boolean startupEventSent;
+
+    public TelemetryRunnable(final TelemetryService telemetryService, final List<TelemetryPeriodicAction> actions) {
+        this(telemetryService, actions, new ThreadSleeperImpl(), SystemTimeSource.INSTANCE);
     }
 
-    if (startupEventSent) {
-      flushPendingTelemetryData();
-      telemetryService.sendAppClosingEvent();
+    TelemetryRunnable(
+            final TelemetryService telemetryService,
+            final List<TelemetryPeriodicAction> actions,
+            final ThreadSleeper sleeper,
+            final TimeSource timeSource) {
+        this.telemetryService = telemetryService;
+        this.actions = actions;
+        this.actionsAtMetricsInterval = findMetricPeriodicActions(actions);
+        this.scheduler = new Scheduler(
+                timeSource,
+                sleeper,
+                (long) (Config.get().getTelemetryHeartbeatInterval() * 1000),
+                (long) (Config.get().getTelemetryMetricsInterval() * 1000),
+                Config.get().getTelemetryExtendedHeartbeatInterval() * 1000);
     }
-    log.debug("Telemetry thread finished");
-  }
-
-  /**
-   * Attempts to send an app-started event.
-   *
-   * @return `true` - if attempt was successful and `false` otherwise
-   */
-  private boolean sendAppStartedEvent() throws InterruptedException {
-    int attempt = 0;
-    while (attempt < APP_STARTED_RETRIES && !telemetryService.sendAppStartedEvent()) {
-      attempt += 1;
-      log.debug(
-          "Couldn't send an app-started event on {} attempt out of {}.",
-          attempt,
-          APP_STARTED_RETRIES);
-      // Sleep between retries to allow OkHttp to release a non-daemon writer thread that would
-      // otherwise prevent the application from exiting.
-      Thread.sleep(APP_STARTED_PAUSE_BETWEEN_RETRIES_MILLIS);
+
+    private List<MetricPeriodicAction> findMetricPeriodicActions(final List<TelemetryPeriodicAction> actions) {
+        return actions.stream()
+                .filter(MetricPeriodicAction.class::isInstance)
+                .map(it -> (MetricPeriodicAction) it)
+                .collect(Collectors.toList());
     }
-    return attempt < APP_STARTED_RETRIES;
-  }
 
-  private void mainLoopIteration() throws InterruptedException {
-    collectConfigChanges();
+    @Override
+    public void run() {
+        // Ensure that Config has been initialized, so ConfigCollector can collect all settings first.
+        Config.get();
+
+        collectConfigChanges();
+
+        scheduler.init();
+
+        while (!Thread.interrupted()) {
+            try {
+                if (!startupEventSent) {
+                    startupEventSent = sendAppStartedEvent();
+                }
+                if (startupEventSent) {
+                    mainLoopIteration();
+                } else {
+                    // wait until next heartbeat interval before reattempting startup event
+                    scheduler.shouldRunHeartbeat();
+                }
+                scheduler.sleepUntilNextIteration();
+            } catch (InterruptedException e) {
+                log.debug("Interrupted; finishing telemetry thread");
+                Thread.currentThread().interrupt();
+            }
+        }
 
-    // Collect request metrics every N seconds (default 10s)
-    if (scheduler.shouldRunMetrics()) {
-      for (MetricPeriodicAction action : actionsAtMetricsInterval) {
-        action.collector().prepareMetrics();
-      }
+        if (startupEventSent) {
+            flushPendingTelemetryData();
+            telemetryService.sendAppClosingEvent();
+        }
+        log.debug("Telemetry thread finished");
     }
 
-    if (scheduler.shouldRunHeartbeat()) {
-      for (final TelemetryPeriodicAction action : this.actions) {
-        action.doIteration(this.telemetryService);
-      }
-      for (int i = 0; i < MAX_CONSECUTIVE_REQUESTS; i++) {
-        if (!telemetryService.sendTelemetryEvents()) {
-          // stop if there is no more data to be sent, or it failed to send a request
-          break;
+    /**
+     * Attempts to send an app-started event.
+     *
+     * @return `true` - if attempt was successful and `false` otherwise
+     */
+    private boolean sendAppStartedEvent() throws InterruptedException {
+        int attempt = 0;
+        while (attempt < APP_STARTED_RETRIES && !telemetryService.sendAppStartedEvent()) {
+            attempt += 1;
+            log.debug("Couldn't send an app-started event on {} attempt out of {}.", attempt, APP_STARTED_RETRIES);
+            // Sleep between retries to allow OkHttp to release a non-daemon writer thread that would
+            // otherwise prevent the application from exiting.
+            Thread.sleep(APP_STARTED_PAUSE_BETWEEN_RETRIES_MILLIS);
         }
-      }
+        return attempt < APP_STARTED_RETRIES;
     }
 
-    if (scheduler.shouldRunExtendedHeartbeat()) {
-      if (telemetryService.sendExtendedHeartbeat()) {
-        // advance next extended-heartbeat only if request was successful, otherwise reattempt it
-        // next heartbeat interval
-        scheduler.scheduleNextExtendedHeartbeat();
-      }
-    }
-  }
+    private void mainLoopIteration() throws InterruptedException {
+        collectConfigChanges();
 
-  private void collectConfigChanges() {
-    Map<ConfigOrigin, Map<String, ConfigSetting>> collectedConfig = ConfigCollector.get().collect();
-    if (!collectedConfig.isEmpty()) {
-      telemetryService.addConfiguration(collectedConfig);
-    }
-  }
+        // Collect request metrics every N seconds (default 10s)
+        if (scheduler.shouldRunMetrics()) {
+            for (MetricPeriodicAction action : actionsAtMetricsInterval) {
+                action.collector().prepareMetrics();
+            }
+        }
 
-  private void flushPendingTelemetryData() {
-    collectConfigChanges();
+        if (scheduler.shouldRunHeartbeat()) {
+            for (final TelemetryPeriodicAction action : this.actions) {
+                action.doIteration(this.telemetryService);
+            }
+            for (int i = 0; i < MAX_CONSECUTIVE_REQUESTS; i++) {
+                if (!telemetryService.sendTelemetryEvents()) {
+                    // stop if there is no more data to be sent, or it failed to send a request
+                    break;
+                }
+            }
+        }
 
-    for (MetricPeriodicAction action : actionsAtMetricsInterval) {
-      action.collector().prepareMetrics();
+        if (scheduler.shouldRunExtendedHeartbeat()) {
+            if (telemetryService.sendExtendedHeartbeat()) {
+                // advance next extended-heartbeat only if request was successful, otherwise reattempt it
+                // next heartbeat interval
+                scheduler.scheduleNextExtendedHeartbeat();
+            }
+        }
     }
 
-    for (final TelemetryPeriodicAction action : actions) {
-      action.doIteration(telemetryService);
+    private void collectConfigChanges() {
+        Map<ConfigOrigin, Map<String, ConfigSetting>> collectedConfig =
+                ConfigCollector.get().collect();
+        if (!collectedConfig.isEmpty()) {
+            telemetryService.addConfiguration(collectedConfig);
+        }
     }
-    telemetryService.sendTelemetryEvents();
-  }
 
-  interface ThreadSleeper {
-    void sleep(long timeoutMs);
-  }
+    private void flushPendingTelemetryData() {
+        collectConfigChanges();
 
-  static class ThreadSleeperImpl implements ThreadSleeper {
-    @Override
-    public void sleep(long timeoutMs) {
-      try {
-        Thread.sleep(timeoutMs);
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      }
-    }
-  }
-
-  public interface TelemetryPeriodicAction {
-    void doIteration(TelemetryService service);
-  }
-
-  static class Scheduler {
-    private final TimeSource timeSource;
-    private final ThreadSleeper sleeper;
-    private final long heartbeatIntervalMs;
-    private final long extendedHeartbeatIntervalMs;
-    private final long metricsIntervalMs;
-    private long nextHeartbeatIntervalMs;
-    private long nextExtendedHeartbeatIntervalMs;
-    private long nextMetricsIntervalMs;
-    private long currentTime;
-
-    public Scheduler(
-        final TimeSource timeSource,
-        final ThreadSleeper sleeper,
-        final long heartbeatIntervalMs,
-        final long metricsIntervalMs,
-        final long extendedHeartbeatIntervalMs) {
-      this.timeSource = timeSource;
-      this.sleeper = sleeper;
-      this.heartbeatIntervalMs = heartbeatIntervalMs;
-      this.metricsIntervalMs = metricsIntervalMs;
-      this.extendedHeartbeatIntervalMs = extendedHeartbeatIntervalMs;
-      nextHeartbeatIntervalMs = 0;
-      nextMetricsIntervalMs = 0;
-      nextExtendedHeartbeatIntervalMs = 0;
-      currentTime = 0;
-    }
+        for (MetricPeriodicAction action : actionsAtMetricsInterval) {
+            action.collector().prepareMetrics();
+        }
 
-    public void init() {
-      final long currentTime = timeSource.getCurrentTimeMillis();
-      this.currentTime = currentTime;
-      nextMetricsIntervalMs = currentTime;
-      nextHeartbeatIntervalMs = currentTime;
-      scheduleNextExtendedHeartbeat();
+        for (final TelemetryPeriodicAction action : actions) {
+            action.doIteration(telemetryService);
+        }
+        telemetryService.sendTelemetryEvents();
     }
 
-    public boolean shouldRunMetrics() {
-      if (currentTime >= nextMetricsIntervalMs) {
-        nextMetricsIntervalMs += metricsIntervalMs;
-        return true;
-      }
-      return false;
+    interface ThreadSleeper {
+        void sleep(long timeoutMs);
     }
 
-    public boolean shouldRunHeartbeat() {
-      if (currentTime >= nextHeartbeatIntervalMs) {
-        nextHeartbeatIntervalMs += heartbeatIntervalMs;
-        return true;
-      }
-      return false;
+    static class ThreadSleeperImpl implements ThreadSleeper {
+        @Override
+        public void sleep(long timeoutMs) {
+            try {
+                Thread.sleep(timeoutMs);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
     }
 
-    public boolean shouldRunExtendedHeartbeat() {
-      return currentTime >= nextExtendedHeartbeatIntervalMs;
+    public interface TelemetryPeriodicAction {
+        void doIteration(TelemetryService service);
     }
 
-    public void scheduleNextExtendedHeartbeat() {
-      // schedule very first extended-heartbeat only after interval elapses
-      nextExtendedHeartbeatIntervalMs = currentTime + extendedHeartbeatIntervalMs;
-    }
+    static class Scheduler {
+        private final TimeSource timeSource;
+        private final ThreadSleeper sleeper;
+        private final long heartbeatIntervalMs;
+        private final long extendedHeartbeatIntervalMs;
+        private final long metricsIntervalMs;
+        private long nextHeartbeatIntervalMs;
+        private long nextExtendedHeartbeatIntervalMs;
+        private long nextMetricsIntervalMs;
+        private long currentTime;
+
+        public Scheduler(
+                final TimeSource timeSource,
+                final ThreadSleeper sleeper,
+                final long heartbeatIntervalMs,
+                final long metricsIntervalMs,
+                final long extendedHeartbeatIntervalMs) {
+            this.timeSource = timeSource;
+            this.sleeper = sleeper;
+            this.heartbeatIntervalMs = heartbeatIntervalMs;
+            this.metricsIntervalMs = metricsIntervalMs;
+            this.extendedHeartbeatIntervalMs = extendedHeartbeatIntervalMs;
+            nextHeartbeatIntervalMs = 0;
+            nextMetricsIntervalMs = 0;
+            nextExtendedHeartbeatIntervalMs = 0;
+            currentTime = 0;
+        }
+
+        public void init() {
+            final long currentTime = timeSource.getCurrentTimeMillis();
+            this.currentTime = currentTime;
+            nextMetricsIntervalMs = currentTime;
+            nextHeartbeatIntervalMs = currentTime;
+            scheduleNextExtendedHeartbeat();
+        }
+
+        public boolean shouldRunMetrics() {
+            if (currentTime >= nextMetricsIntervalMs) {
+                nextMetricsIntervalMs += metricsIntervalMs;
+                return true;
+            }
+            return false;
+        }
+
+        public boolean shouldRunHeartbeat() {
+            if (currentTime >= nextHeartbeatIntervalMs) {
+                nextHeartbeatIntervalMs += heartbeatIntervalMs;
+                return true;
+            }
+            return false;
+        }
+
+        public boolean shouldRunExtendedHeartbeat() {
+            return currentTime >= nextExtendedHeartbeatIntervalMs;
+        }
+
+        public void scheduleNextExtendedHeartbeat() {
+            // schedule very first extended-heartbeat only after interval elapses
+            nextExtendedHeartbeatIntervalMs = currentTime + extendedHeartbeatIntervalMs;
+        }
 
-    public void sleepUntilNextIteration() {
-      currentTime = timeSource.getCurrentTimeMillis();
-
-      if (currentTime >= nextHeartbeatIntervalMs) {
-        // We are probably under high load or, more likely (?) slow network and the time to send
-        // telemetry has overrun the interval. In this case, we reset metrics and heartbeat interval
-        // to trigger them immediately.
-        nextMetricsIntervalMs = currentTime;
-        nextHeartbeatIntervalMs = currentTime;
-        log.debug(
-            "Time to run telemetry actions exceeded the interval, triggering the next iteration immediately");
-        return;
-      }
-
-      while (currentTime >= nextMetricsIntervalMs) {
-        // If metric collection exceeded the interval, something went really wrong. Either there's a
-        // very short interval (not default), or metric collection is taking abnormally long. We
-        // skip intervals in this case.
-        nextMetricsIntervalMs += metricsIntervalMs;
-      }
-
-      long nextIntervalMs = Math.min(nextMetricsIntervalMs, nextHeartbeatIntervalMs);
-      final long waitMs = nextIntervalMs - currentTime;
-      sleeper.sleep(waitMs);
-      currentTime = timeSource.getCurrentTimeMillis();
+        public void sleepUntilNextIteration() {
+            currentTime = timeSource.getCurrentTimeMillis();
+
+            if (currentTime >= nextHeartbeatIntervalMs) {
+                // We are probably under high load or, more likely (?) slow network and the time to send
+                // telemetry has overrun the interval. In this case, we reset metrics and heartbeat interval
+                // to trigger them immediately.
+                nextMetricsIntervalMs = currentTime;
+                nextHeartbeatIntervalMs = currentTime;
+                log.debug(
+                        "Time to run telemetry actions exceeded the interval, triggering the next iteration immediately");
+                return;
+            }
+
+            while (currentTime >= nextMetricsIntervalMs) {
+                // If metric collection exceeded the interval, something went really wrong. Either there's a
+                // very short interval (not default), or metric collection is taking abnormally long. We
+                // skip intervals in this case.
+                nextMetricsIntervalMs += metricsIntervalMs;
+            }
+
+            long nextIntervalMs = Math.min(nextMetricsIntervalMs, nextHeartbeatIntervalMs);
+            final long waitMs = nextIntervalMs - currentTime;
+            sleeper.sleep(waitMs);
+            currentTime = timeSource.getCurrentTimeMillis();
+        }
     }
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/TelemetryService.java b/telemetry/src/main/java/datadog/telemetry/TelemetryService.java
index a5490e0649c..e6b9764dc27 100644
--- a/telemetry/src/main/java/datadog/telemetry/TelemetryService.java
+++ b/telemetry/src/main/java/datadog/telemetry/TelemetryService.java
@@ -19,261 +19,243 @@
 
 public class TelemetryService {
 
-  private static final Logger log = LoggerFactory.getLogger(TelemetryService.class);
-
-  private static final long DEFAULT_MESSAGE_BYTES_SOFT_LIMIT = Math.round(5 * 1024 * 1024 * 0.75);
-
-  private final TelemetryRouter telemetryRouter;
-  private final BlockingQueue<ConfigSetting> configurations = new LinkedBlockingQueue<>();
-  private final BlockingQueue<Integration> integrations = new LinkedBlockingQueue<>();
-  private final BlockingQueue<Dependency> dependencies = new LinkedBlockingQueue<>();
-  private final BlockingQueue<Metric> metrics =
-      new LinkedBlockingQueue<>(1024); // recommended capacity?
-
-  private final BlockingQueue<LogMessage> logMessages = new LinkedBlockingQueue<>(1024);
-
-  private final BlockingQueue<DistributionSeries> distributionSeries =
-      new LinkedBlockingQueue<>(1024);
-
-  private final BlockingQueue<ProductChange> productChanges = new LinkedBlockingQueue<>();
-
-  private final ExtendedHeartbeatData extendedHeartbeatData = new ExtendedHeartbeatData();
-
-  private final BlockingQueue<Endpoint> endpoints = new LinkedBlockingQueue<>();
-
-  private final EventSource.Queued eventSource =
-      new EventSource.Queued(
-          configurations,
-          integrations,
-          dependencies,
-          metrics,
-          distributionSeries,
-          logMessages,
-          productChanges,
-          endpoints);
-
-  private final long messageBytesSoftLimit;
-  private final boolean debug;
-
-  /*
-   * Keep track of Open Tracing and Open Telemetry integrations activation as they are mutually exclusive.
-   */
-  private boolean openTracingIntegrationEnabled;
-  private boolean openTelemetryIntegrationEnabled;
-
-  public static TelemetryService build(
-      DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery,
-      TelemetryClient agentClient,
-      TelemetryClient intakeClient,
-      boolean useIntakeClientByDefault,
-      boolean debug) {
-    TelemetryRouter telemetryRouter =
-        new TelemetryRouter(
-            ddAgentFeaturesDiscovery, agentClient, intakeClient, useIntakeClientByDefault);
-    return new TelemetryService(telemetryRouter, DEFAULT_MESSAGE_BYTES_SOFT_LIMIT, debug);
-  }
-
-  public static TelemetryService buildFileBased(FileBasedTelemetryClient client, boolean debug) {
-    TelemetryRouter telemetryRouter = new TelemetryRouter(client);
-    return new TelemetryService(telemetryRouter, DEFAULT_MESSAGE_BYTES_SOFT_LIMIT, debug);
-  }
-
-  // For testing purposes
-  TelemetryService(
-      final TelemetryRouter telemetryRouter,
-      final long messageBytesSoftLimit,
-      final boolean debug) {
-    this.telemetryRouter = telemetryRouter;
-    this.openTracingIntegrationEnabled = false;
-    this.openTelemetryIntegrationEnabled = false;
-    this.messageBytesSoftLimit = messageBytesSoftLimit;
-    this.debug = debug;
-  }
-
-  public boolean addConfiguration(Map<ConfigOrigin, Map<String, ConfigSetting>> configuration) {
-    for (Map<String, ConfigSetting> settings : configuration.values()) {
-      for (ConfigSetting cs : settings.values()) {
-        extendedHeartbeatData.pushConfigSetting(cs);
-        if (!this.configurations.offer(cs)) {
-          return false;
+    private static final Logger log = LoggerFactory.getLogger(TelemetryService.class);
+
+    private static final long DEFAULT_MESSAGE_BYTES_SOFT_LIMIT = Math.round(5 * 1024 * 1024 * 0.75);
+
+    private final TelemetryRouter telemetryRouter;
+    private final BlockingQueue<ConfigSetting> configurations = new LinkedBlockingQueue<>();
+    private final BlockingQueue<Integration> integrations = new LinkedBlockingQueue<>();
+    private final BlockingQueue<Dependency> dependencies = new LinkedBlockingQueue<>();
+    private final BlockingQueue<Metric> metrics = new LinkedBlockingQueue<>(1024); // recommended capacity?
+
+    private final BlockingQueue<LogMessage> logMessages = new LinkedBlockingQueue<>(1024);
+
+    private final BlockingQueue<DistributionSeries> distributionSeries = new LinkedBlockingQueue<>(1024);
+
+    private final BlockingQueue<ProductChange> productChanges = new LinkedBlockingQueue<>();
+
+    private final ExtendedHeartbeatData extendedHeartbeatData = new ExtendedHeartbeatData();
+
+    private final BlockingQueue<Endpoint> endpoints = new LinkedBlockingQueue<>();
+
+    private final EventSource.Queued eventSource = new EventSource.Queued(
+            configurations,
+            integrations,
+            dependencies,
+            metrics,
+            distributionSeries,
+            logMessages,
+            productChanges,
+            endpoints);
+
+    private final long messageBytesSoftLimit;
+    private final boolean debug;
+
+    /*
+     * Keep track of Open Tracing and Open Telemetry integrations activation as they are mutually exclusive.
+     */
+    private boolean openTracingIntegrationEnabled;
+    private boolean openTelemetryIntegrationEnabled;
+
+    public static TelemetryService build(
+            DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery,
+            TelemetryClient agentClient,
+            TelemetryClient intakeClient,
+            boolean useIntakeClientByDefault,
+            boolean debug) {
+        TelemetryRouter telemetryRouter =
+                new TelemetryRouter(ddAgentFeaturesDiscovery, agentClient, intakeClient, useIntakeClientByDefault);
+        return new TelemetryService(telemetryRouter, DEFAULT_MESSAGE_BYTES_SOFT_LIMIT, debug);
+    }
+
+    public static TelemetryService buildFileBased(FileBasedTelemetryClient client, boolean debug) {
+        TelemetryRouter telemetryRouter = new TelemetryRouter(client);
+        return new TelemetryService(telemetryRouter, DEFAULT_MESSAGE_BYTES_SOFT_LIMIT, debug);
+    }
+
+    // For testing purposes
+    TelemetryService(final TelemetryRouter telemetryRouter, final long messageBytesSoftLimit, final boolean debug) {
+        this.telemetryRouter = telemetryRouter;
+        this.openTracingIntegrationEnabled = false;
+        this.openTelemetryIntegrationEnabled = false;
+        this.messageBytesSoftLimit = messageBytesSoftLimit;
+        this.debug = debug;
+    }
+
+    public boolean addConfiguration(Map<ConfigOrigin, Map<String, ConfigSetting>> configuration) {
+        for (Map<String, ConfigSetting> settings : configuration.values()) {
+            for (ConfigSetting cs : settings.values()) {
+                extendedHeartbeatData.pushConfigSetting(cs);
+                if (!this.configurations.offer(cs)) {
+                    return false;
+                }
+            }
         }
-      }
+        return true;
     }
-    return true;
-  }
 
-  public boolean addDependency(Dependency dependency) {
-    extendedHeartbeatData.pushDependency(dependency);
-    return this.dependencies.offer(dependency);
-  }
+    public boolean addDependency(Dependency dependency) {
+        extendedHeartbeatData.pushDependency(dependency);
+        return this.dependencies.offer(dependency);
+    }
 
-  public boolean addIntegration(Integration integration) {
-    if ("opentelemetry-1".equals(integration.name)) {
-      openTelemetryIntegrationEnabled = integration.enabled;
+    public boolean addIntegration(Integration integration) {
+        if ("opentelemetry-1".equals(integration.name)) {
+            openTelemetryIntegrationEnabled = integration.enabled;
+        }
+        if ("opentracing".equals(integration.name)) {
+            openTracingIntegrationEnabled = integration.enabled;
+        }
+        if (openTelemetryIntegrationEnabled && openTracingIntegrationEnabled) {
+            warnAboutExclusiveIntegrations();
+        }
+        extendedHeartbeatData.pushIntegration(integration);
+        return this.integrations.offer(integration);
     }
-    if ("opentracing".equals(integration.name)) {
-      openTracingIntegrationEnabled = integration.enabled;
+
+    public boolean addMetric(Metric metric) {
+        return this.metrics.offer(metric);
     }
-    if (openTelemetryIntegrationEnabled && openTracingIntegrationEnabled) {
-      warnAboutExclusiveIntegrations();
+
+    public boolean addLogMessage(LogMessage message) {
+        return this.logMessages.offer(message);
     }
-    extendedHeartbeatData.pushIntegration(integration);
-    return this.integrations.offer(integration);
-  }
-
-  public boolean addMetric(Metric metric) {
-    return this.metrics.offer(metric);
-  }
-
-  public boolean addLogMessage(LogMessage message) {
-    return this.logMessages.offer(message);
-  }
-
-  public boolean addProductChange(ProductChange productChange) {
-    return this.productChanges.offer(productChange);
-  }
-
-  public boolean addDistributionSeries(DistributionSeries series) {
-    return this.distributionSeries.offer(series);
-  }
-
-  public boolean addEndpoint(final Endpoint endpoint) {
-    return this.endpoints.offer(endpoint);
-  }
-
-  public void sendAppClosingEvent() {
-    TelemetryRequest telemetryRequest =
-        new TelemetryRequest(
-            this.eventSource,
-            EventSink.NOOP,
-            messageBytesSoftLimit,
-            RequestType.APP_CLOSING,
-            debug);
-    if (telemetryRouter.sendRequest(telemetryRequest) != TelemetryClient.Result.SUCCESS) {
-      log.warn("Couldn't send app-closing event!");
+
+    public boolean addProductChange(ProductChange productChange) {
+        return this.productChanges.offer(productChange);
     }
-  }
-
-  // keeps track of unsent events from the previous attempt
-  private BufferedEvents bufferedEvents;
-
-  /**
-   * @return true - if an app-started event has been successfully sent, false - otherwise
-   */
-  public boolean sendAppStartedEvent() {
-    EventSource eventSource;
-    EventSink eventSink;
-    if (bufferedEvents == null) {
-      eventSource = this.eventSource;
-    } else {
-      log.debug(
-          "Sending buffered telemetry events that couldn't have been sent on previous attempt");
-      eventSource = bufferedEvents;
+
+    public boolean addDistributionSeries(DistributionSeries series) {
+        return this.distributionSeries.offer(series);
     }
-    // use a buffer as a sink, so we can retry on the next attempt in case of a request failure
-    bufferedEvents = new BufferedEvents();
-    eventSink = bufferedEvents;
-
-    log.debug("Preparing app-started request");
-    TelemetryRequest request =
-        new TelemetryRequest(
-            eventSource, eventSink, messageBytesSoftLimit, RequestType.APP_STARTED, debug);
-
-    request.writeProducts();
-    request.writeConfigurations();
-    request.writeInstallSignature();
-    if (telemetryRouter.sendRequest(request) == TelemetryClient.Result.SUCCESS) {
-      // discard already sent buffered event on the successful attempt
-      bufferedEvents = null;
-      return true;
+
+    public boolean addEndpoint(final Endpoint endpoint) {
+        return this.endpoints.offer(endpoint);
     }
-    return false;
-  }
-
-  /**
-   * @return true - only part of data has been sent because of the request size limit false - all
-   *     data has been sent, or it has failed sending a request
-   */
-  public boolean sendTelemetryEvents() {
-    EventSource eventSource;
-    EventSink eventSink;
-    if (bufferedEvents == null) {
-      log.debug("Sending telemetry events");
-      eventSource = this.eventSource;
-      // use a buffer as a sink, so we can retry on the next attempt in case of a request failure
-      bufferedEvents = new BufferedEvents();
-      eventSink = bufferedEvents;
-    } else {
-      log.debug(
-          "Sending buffered telemetry events that couldn't have been sent on previous attempt");
-      eventSource = bufferedEvents;
-      eventSink = EventSink.NOOP; // TODO collect metrics for unsent events
+
+    public void sendAppClosingEvent() {
+        TelemetryRequest telemetryRequest = new TelemetryRequest(
+                this.eventSource, EventSink.NOOP, messageBytesSoftLimit, RequestType.APP_CLOSING, debug);
+        if (telemetryRouter.sendRequest(telemetryRequest) != TelemetryClient.Result.SUCCESS) {
+            log.warn("Couldn't send app-closing event!");
+        }
     }
-    TelemetryRequest request;
-    boolean isMoreDataAvailable = false;
-    if (eventSource.isEmpty()) {
-      log.debug("Preparing app-heartbeat request");
-      request =
-          new TelemetryRequest(
-              eventSource, eventSink, messageBytesSoftLimit, RequestType.APP_HEARTBEAT, debug);
-    } else {
-      log.debug("Preparing message-batch request");
-      request =
-          new TelemetryRequest(
-              eventSource, eventSink, messageBytesSoftLimit, RequestType.MESSAGE_BATCH, debug);
-      request.writeHeartbeat();
-      request.writeConfigurations();
-      request.writeIntegrations();
-      request.writeDependencies();
-      request.writeMetrics();
-      request.writeDistributions();
-      request.writeLogs();
-      request.writeChangedProducts();
-      request.writeEndpoints();
-      isMoreDataAvailable = !this.eventSource.isEmpty();
+
+    // keeps track of unsent events from the previous attempt
+    private BufferedEvents bufferedEvents;
+
+    /**
+     * @return true - if an app-started event has been successfully sent, false - otherwise
+     */
+    public boolean sendAppStartedEvent() {
+        EventSource eventSource;
+        EventSink eventSink;
+        if (bufferedEvents == null) {
+            eventSource = this.eventSource;
+        } else {
+            log.debug("Sending buffered telemetry events that couldn't have been sent on previous attempt");
+            eventSource = bufferedEvents;
+        }
+        // use a buffer as a sink, so we can retry on the next attempt in case of a request failure
+        bufferedEvents = new BufferedEvents();
+        eventSink = bufferedEvents;
+
+        log.debug("Preparing app-started request");
+        TelemetryRequest request =
+                new TelemetryRequest(eventSource, eventSink, messageBytesSoftLimit, RequestType.APP_STARTED, debug);
+
+        request.writeProducts();
+        request.writeConfigurations();
+        request.writeInstallSignature();
+        if (telemetryRouter.sendRequest(request) == TelemetryClient.Result.SUCCESS) {
+            // discard already sent buffered event on the successful attempt
+            bufferedEvents = null;
+            return true;
+        }
+        return false;
     }
 
-    TelemetryClient.Result result = telemetryRouter.sendRequest(request);
-    if (result == TelemetryClient.Result.SUCCESS) {
-      log.debug("Telemetry request has been sent successfully.");
-      bufferedEvents = null;
-      return isMoreDataAvailable;
-    } else {
-      log.debug("Telemetry request has failed: {}", result);
-      if (eventSource == bufferedEvents) {
-        // TODO report metrics for discarded events
-        bufferedEvents = null;
-      }
+    /**
+     * @return true - only part of data has been sent because of the request size limit false - all
+     *     data has been sent, or it has failed sending a request
+     */
+    public boolean sendTelemetryEvents() {
+        EventSource eventSource;
+        EventSink eventSink;
+        if (bufferedEvents == null) {
+            log.debug("Sending telemetry events");
+            eventSource = this.eventSource;
+            // use a buffer as a sink, so we can retry on the next attempt in case of a request failure
+            bufferedEvents = new BufferedEvents();
+            eventSink = bufferedEvents;
+        } else {
+            log.debug("Sending buffered telemetry events that couldn't have been sent on previous attempt");
+            eventSource = bufferedEvents;
+            eventSink = EventSink.NOOP; // TODO collect metrics for unsent events
+        }
+        TelemetryRequest request;
+        boolean isMoreDataAvailable = false;
+        if (eventSource.isEmpty()) {
+            log.debug("Preparing app-heartbeat request");
+            request = new TelemetryRequest(
+                    eventSource, eventSink, messageBytesSoftLimit, RequestType.APP_HEARTBEAT, debug);
+        } else {
+            log.debug("Preparing message-batch request");
+            request = new TelemetryRequest(
+                    eventSource, eventSink, messageBytesSoftLimit, RequestType.MESSAGE_BATCH, debug);
+            request.writeHeartbeat();
+            request.writeConfigurations();
+            request.writeIntegrations();
+            request.writeDependencies();
+            request.writeMetrics();
+            request.writeDistributions();
+            request.writeLogs();
+            request.writeChangedProducts();
+            request.writeEndpoints();
+            isMoreDataAvailable = !this.eventSource.isEmpty();
+        }
+
+        TelemetryClient.Result result = telemetryRouter.sendRequest(request);
+        if (result == TelemetryClient.Result.SUCCESS) {
+            log.debug("Telemetry request has been sent successfully.");
+            bufferedEvents = null;
+            return isMoreDataAvailable;
+        } else {
+            log.debug("Telemetry request has failed: {}", result);
+            if (eventSource == bufferedEvents) {
+                // TODO report metrics for discarded events
+                bufferedEvents = null;
+            }
+        }
+        return false;
     }
-    return false;
-  }
-
-  /**
-   * @return true - if extended heartbeat request sent successfully, otherwise false
-   */
-  public boolean sendExtendedHeartbeat() {
-    log.debug("Preparing message-batch request");
-    EventSource extendedHeartbeatDataSnapshot = extendedHeartbeatData.snapshot();
-    TelemetryRequest request =
-        new TelemetryRequest(
-            extendedHeartbeatDataSnapshot,
-            EventSink.NOOP,
-            messageBytesSoftLimit,
-            RequestType.APP_EXTENDED_HEARTBEAT,
-            debug);
-    request.writeConfigurations();
-    request.writeDependencies();
-    request.writeIntegrations();
-
-    TelemetryClient.Result result = telemetryRouter.sendRequest(request);
-    if (!extendedHeartbeatDataSnapshot.isEmpty()) {
-      log.warn("Telemetry Extended Heartbeat data does NOT fit in one request.");
+
+    /**
+     * @return true - if extended heartbeat request sent successfully, otherwise false
+     */
+    public boolean sendExtendedHeartbeat() {
+        log.debug("Preparing message-batch request");
+        EventSource extendedHeartbeatDataSnapshot = extendedHeartbeatData.snapshot();
+        TelemetryRequest request = new TelemetryRequest(
+                extendedHeartbeatDataSnapshot,
+                EventSink.NOOP,
+                messageBytesSoftLimit,
+                RequestType.APP_EXTENDED_HEARTBEAT,
+                debug);
+        request.writeConfigurations();
+        request.writeDependencies();
+        request.writeIntegrations();
+
+        TelemetryClient.Result result = telemetryRouter.sendRequest(request);
+        if (!extendedHeartbeatDataSnapshot.isEmpty()) {
+            log.warn("Telemetry Extended Heartbeat data does NOT fit in one request.");
+        }
+        return result == TelemetryClient.Result.SUCCESS;
     }
-    return result == TelemetryClient.Result.SUCCESS;
-  }
 
-  void warnAboutExclusiveIntegrations() {
-    log.warn(
-        "Both OpenTracing and OpenTelemetry integrations are enabled but mutually exclusive. Tracing performance can be degraded.");
-  }
+    void warnAboutExclusiveIntegrations() {
+        log.warn(
+                "Both OpenTracing and OpenTelemetry integrations are enabled but mutually exclusive. Tracing performance can be degraded.");
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/TelemetrySystem.java b/telemetry/src/main/java/datadog/telemetry/TelemetrySystem.java
index 4b233aa3037..e8ab8097e7c 100644
--- a/telemetry/src/main/java/datadog/telemetry/TelemetrySystem.java
+++ b/telemetry/src/main/java/datadog/telemetry/TelemetrySystem.java
@@ -37,144 +37,135 @@
 
 public class TelemetrySystem {
 
-  private static final long TELEMETRY_STOP_WAIT_MILLIS = 5000L;
-  private static final Logger log = LoggerFactory.getLogger(TelemetrySystem.class);
-
-  private static volatile Thread TELEMETRY_THREAD;
-  private static volatile DependencyService DEPENDENCY_SERVICE;
-
-  static DependencyService createDependencyService(Instrumentation instrumentation) {
-    if (instrumentation != null && Config.get().isTelemetryDependencyServiceEnabled()) {
-      DependencyService dependencyService = new DependencyService();
-      dependencyService.installOn(instrumentation);
-      dependencyService.schedulePeriodicResolution();
-      return dependencyService;
-    }
-    return null;
-  }
-
-  static Thread createTelemetryRunnable(
-      TelemetryService telemetryService,
-      DependencyService dependencyService,
-      boolean telemetryMetricsEnabled) {
-    DEPENDENCY_SERVICE = dependencyService;
-    List<TelemetryPeriodicAction> actions = new ArrayList<>();
-    if (telemetryMetricsEnabled) {
-      actions.add(new CoreMetricsPeriodicAction());
-      actions.add(new OtelEnvMetricPeriodicAction());
-      if (InstrumenterConfig.get().getTraceExtensionsPath() != null) {
-        actions.add(new OtelSpiMetricPeriodicAction());
-      }
-      actions.add(new ConfigInversionMetricPeriodicAction());
-      actions.add(new IntegrationPeriodicAction());
-      actions.add(new WafMetricPeriodicAction());
-      actions.add(new OtlpTelemetryPeriodicAction());
-      actions.add(new DebuggerMetricPeriodicAction());
-      if (Verbosity.OFF != Config.get().getIastTelemetryVerbosity()) {
-        actions.add(new IastMetricPeriodicAction());
-      }
-      if (Config.get().isCiVisibilityEnabled() && Config.get().isCiVisibilityTelemetryEnabled()) {
-        actions.add(new CiVisibilityMetricPeriodicAction());
-      }
-      if (Config.get().isLlmObsEnabled()) {
-        actions.add(new LLMObsMetricPeriodicAction());
-      }
-    }
-    if (null != dependencyService) {
-      if (Config.get().isAppSecScaEnabled()) {
-        // ScaReachabilityPeriodicAction takes over all dep reporting when SCA is enabled:
-        // it merges DependencyService drains with CVE registry state into one entry per dep.
-        // DependencyPeriodicAction is skipped to avoid duplicate app-dependencies-loaded entries.
-        actions.add(new ScaReachabilityPeriodicAction(dependencyService));
-      } else {
-        actions.add(new DependencyPeriodicAction(dependencyService));
-      }
-    }
-    if (Config.get().isTelemetryLogCollectionEnabled()) {
-      actions.add(new LogPeriodicAction());
-      log.debug("Telemetry log collection enabled");
-    }
-    if (InstrumenterConfig.get().isRumEnabled()) {
-      RumInjector.enableTelemetry();
-      actions.add(new RumPeriodicAction(RumInjector.getTelemetryCollector()));
-    }
-    actions.add(new ProductChangeAction());
-    if (Config.get().isApiSecurityEndpointCollectionEnabled()) {
-      actions.add(new EndpointPeriodicAction());
+    private static final long TELEMETRY_STOP_WAIT_MILLIS = 5000L;
+    private static final Logger log = LoggerFactory.getLogger(TelemetrySystem.class);
+
+    private static volatile Thread TELEMETRY_THREAD;
+    private static volatile DependencyService DEPENDENCY_SERVICE;
+
+    static DependencyService createDependencyService(Instrumentation instrumentation) {
+        if (instrumentation != null && Config.get().isTelemetryDependencyServiceEnabled()) {
+            DependencyService dependencyService = new DependencyService();
+            dependencyService.installOn(instrumentation);
+            dependencyService.schedulePeriodicResolution();
+            return dependencyService;
+        }
+        return null;
     }
 
-    TelemetryRunnable telemetryRunnable = new TelemetryRunnable(telemetryService, actions);
-    return AgentThreadFactory.newAgentThread(
-        AgentThreadFactory.AgentThread.TELEMETRY, telemetryRunnable);
-  }
-
-  /** Called by reflection (see Agent.startTelemetry) */
-  public static void startTelemetry(
-      Instrumentation instrumentation, SharedCommunicationObjects sco) {
-    Config config = Config.get();
-    boolean debug = config.isTelemetryDebugRequestsEnabled();
-    boolean telemetryMetricsEnabled = config.isTelemetryMetricsEnabled();
-
-    // CI Visibility bazel mode writes telemetry to files instead of the network
-    if (config.isCiVisibilityEnabled() && BazelMode.get().isPayloadFilesEnabled()) {
-      String telemetryDir = BazelMode.get().getTelemetryPayloadsDir();
-      log.info("[bazel mode] Writing telemetry payloads to {}", telemetryDir);
-      DependencyService dependencyService = createDependencyService(instrumentation);
-      TelemetryService telemetryService =
-          TelemetryService.buildFileBased(new FileBasedTelemetryClient(telemetryDir), debug);
-      TELEMETRY_THREAD =
-          createTelemetryRunnable(telemetryService, dependencyService, telemetryMetricsEnabled);
-      TELEMETRY_THREAD.start();
-      return;
+    static Thread createTelemetryRunnable(
+            TelemetryService telemetryService, DependencyService dependencyService, boolean telemetryMetricsEnabled) {
+        DEPENDENCY_SERVICE = dependencyService;
+        List<TelemetryPeriodicAction> actions = new ArrayList<>();
+        if (telemetryMetricsEnabled) {
+            actions.add(new CoreMetricsPeriodicAction());
+            actions.add(new OtelEnvMetricPeriodicAction());
+            if (InstrumenterConfig.get().getTraceExtensionsPath() != null) {
+                actions.add(new OtelSpiMetricPeriodicAction());
+            }
+            actions.add(new ConfigInversionMetricPeriodicAction());
+            actions.add(new IntegrationPeriodicAction());
+            actions.add(new WafMetricPeriodicAction());
+            actions.add(new OtlpTelemetryPeriodicAction());
+            actions.add(new DebuggerMetricPeriodicAction());
+            if (Verbosity.OFF != Config.get().getIastTelemetryVerbosity()) {
+                actions.add(new IastMetricPeriodicAction());
+            }
+            if (Config.get().isCiVisibilityEnabled() && Config.get().isCiVisibilityTelemetryEnabled()) {
+                actions.add(new CiVisibilityMetricPeriodicAction());
+            }
+            if (Config.get().isLlmObsEnabled()) {
+                actions.add(new LLMObsMetricPeriodicAction());
+            }
+        }
+        if (null != dependencyService) {
+            if (Config.get().isAppSecScaEnabled()) {
+                // ScaReachabilityPeriodicAction takes over all dep reporting when SCA is enabled:
+                // it merges DependencyService drains with CVE registry state into one entry per dep.
+                // DependencyPeriodicAction is skipped to avoid duplicate app-dependencies-loaded entries.
+                actions.add(new ScaReachabilityPeriodicAction(dependencyService));
+            } else {
+                actions.add(new DependencyPeriodicAction(dependencyService));
+            }
+        }
+        if (Config.get().isTelemetryLogCollectionEnabled()) {
+            actions.add(new LogPeriodicAction());
+            log.debug("Telemetry log collection enabled");
+        }
+        if (InstrumenterConfig.get().isRumEnabled()) {
+            RumInjector.enableTelemetry();
+            actions.add(new RumPeriodicAction(RumInjector.getTelemetryCollector()));
+        }
+        actions.add(new ProductChangeAction());
+        if (Config.get().isApiSecurityEndpointCollectionEnabled()) {
+            actions.add(new EndpointPeriodicAction());
+        }
+
+        TelemetryRunnable telemetryRunnable = new TelemetryRunnable(telemetryService, actions);
+        return AgentThreadFactory.newAgentThread(AgentThreadFactory.AgentThread.TELEMETRY, telemetryRunnable);
     }
 
-    sco.createRemaining(config);
-    DependencyService dependencyService = createDependencyService(instrumentation);
-    DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery = sco.featuresDiscovery(config);
-
-    HttpRetryPolicy.Factory httpRetryPolicy =
-        config.isCiVisibilityEnabled()
-            ? new HttpRetryPolicy.Factory(2, 100, 2.0, true)
-            : HttpRetryPolicy.Factory.NEVER_RETRY;
-
-    TelemetryClient agentClient =
-        TelemetryClient.buildAgentClient(sco.agentHttpClient, sco.agentUrl, httpRetryPolicy);
-    TelemetryClient intakeClient = TelemetryClient.buildIntakeClient(config, httpRetryPolicy);
-
-    boolean useIntakeClientByDefault =
-        config.isCiVisibilityEnabled() && config.isCiVisibilityAgentlessEnabled();
-    TelemetryService telemetryService =
-        TelemetryService.build(
-            ddAgentFeaturesDiscovery, agentClient, intakeClient, useIntakeClientByDefault, debug);
-
-    TELEMETRY_THREAD =
-        createTelemetryRunnable(telemetryService, dependencyService, telemetryMetricsEnabled);
-    TELEMETRY_THREAD.start();
-  }
-
-  /** Called by reflection (see Agent.stopTelemetry) */
-  public static void stop() {
-    DependencyService dependencyService = DEPENDENCY_SERVICE;
-    if (dependencyService != null) {
-      dependencyService.stop();
+    /** Called by reflection (see Agent.startTelemetry) */
+    public static void startTelemetry(Instrumentation instrumentation, SharedCommunicationObjects sco) {
+        Config config = Config.get();
+        boolean debug = config.isTelemetryDebugRequestsEnabled();
+        boolean telemetryMetricsEnabled = config.isTelemetryMetricsEnabled();
+
+        // CI Visibility bazel mode writes telemetry to files instead of the network
+        if (config.isCiVisibilityEnabled() && BazelMode.get().isPayloadFilesEnabled()) {
+            String telemetryDir = BazelMode.get().getTelemetryPayloadsDir();
+            log.info("[bazel mode] Writing telemetry payloads to {}", telemetryDir);
+            DependencyService dependencyService = createDependencyService(instrumentation);
+            TelemetryService telemetryService =
+                    TelemetryService.buildFileBased(new FileBasedTelemetryClient(telemetryDir), debug);
+            TELEMETRY_THREAD = createTelemetryRunnable(telemetryService, dependencyService, telemetryMetricsEnabled);
+            TELEMETRY_THREAD.start();
+            return;
+        }
+
+        sco.createRemaining(config);
+        DependencyService dependencyService = createDependencyService(instrumentation);
+        DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery = sco.featuresDiscovery(config);
+
+        HttpRetryPolicy.Factory httpRetryPolicy = config.isCiVisibilityEnabled()
+                ? new HttpRetryPolicy.Factory(2, 100, 2.0, true)
+                : HttpRetryPolicy.Factory.NEVER_RETRY;
+
+        TelemetryClient agentClient =
+                TelemetryClient.buildAgentClient(sco.agentHttpClient, sco.agentUrl, httpRetryPolicy);
+        TelemetryClient intakeClient = TelemetryClient.buildIntakeClient(config, httpRetryPolicy);
+
+        boolean useIntakeClientByDefault = config.isCiVisibilityEnabled() && config.isCiVisibilityAgentlessEnabled();
+        TelemetryService telemetryService = TelemetryService.build(
+                ddAgentFeaturesDiscovery, agentClient, intakeClient, useIntakeClientByDefault, debug);
+
+        TELEMETRY_THREAD = createTelemetryRunnable(telemetryService, dependencyService, telemetryMetricsEnabled);
+        TELEMETRY_THREAD.start();
     }
 
-    Thread telemetryThread = TELEMETRY_THREAD;
-    if (telemetryThread != null) {
-      telemetryThread.interrupt();
-      try {
-        telemetryThread.join(TELEMETRY_STOP_WAIT_MILLIS);
-      } catch (InterruptedException e) {
-        log.warn("Telemetry thread join was interrupted");
-      }
-      if (telemetryThread.isAlive()) {
-        log.warn("Telemetry thread join was not completed");
-      }
+    /** Called by reflection (see Agent.stopTelemetry) */
+    public static void stop() {
+        DependencyService dependencyService = DEPENDENCY_SERVICE;
+        if (dependencyService != null) {
+            dependencyService.stop();
+        }
+
+        Thread telemetryThread = TELEMETRY_THREAD;
+        if (telemetryThread != null) {
+            telemetryThread.interrupt();
+            try {
+                telemetryThread.join(TELEMETRY_STOP_WAIT_MILLIS);
+            } catch (InterruptedException e) {
+                log.warn("Telemetry thread join was interrupted");
+            }
+            if (telemetryThread.isAlive()) {
+                log.warn("Telemetry thread join was not completed");
+            }
+        }
     }
-  }
 
-  @VisibleForTesting
-  static Thread getTelemetryThread() {
-    return TELEMETRY_THREAD;
-  }
+    @VisibleForTesting
+    static Thread getTelemetryThread() {
+        return TELEMETRY_THREAD;
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/api/DistributionSeries.java b/telemetry/src/main/java/datadog/telemetry/api/DistributionSeries.java
index fb13421b773..330c0289ac6 100644
--- a/telemetry/src/main/java/datadog/telemetry/api/DistributionSeries.java
+++ b/telemetry/src/main/java/datadog/telemetry/api/DistributionSeries.java
@@ -4,58 +4,58 @@
 import java.util.List;
 
 public class DistributionSeries {
-  private String metric;
-  private List<Integer> points = new ArrayList<>();
-  private List<String> tags = new ArrayList<>();
-  private Boolean common;
-  private String namespace;
-
-  public String getMetric() {
-    return metric;
-  }
-
-  public DistributionSeries metric(String metric) {
-    this.metric = metric;
-    return this;
-  }
-
-  public List<Integer> getPoints() {
-    return points;
-  }
-
-  public DistributionSeries points(List<Integer> points) {
-    this.points = points;
-    return this;
-  }
-
-  public void addPoint(int point) {
-    points.add(point);
-  }
-
-  public List<String> getTags() {
-    return tags;
-  }
-
-  public DistributionSeries tags(List<String> tags) {
-    this.tags = tags;
-    return this;
-  }
-
-  public Boolean getCommon() {
-    return common;
-  }
-
-  public DistributionSeries common(Boolean common) {
-    this.common = common;
-    return this;
-  }
-
-  public String getNamespace() {
-    return namespace;
-  }
-
-  public DistributionSeries namespace(String namespace) {
-    this.namespace = namespace;
-    return this;
-  }
+    private String metric;
+    private List<Integer> points = new ArrayList<>();
+    private List<String> tags = new ArrayList<>();
+    private Boolean common;
+    private String namespace;
+
+    public String getMetric() {
+        return metric;
+    }
+
+    public DistributionSeries metric(String metric) {
+        this.metric = metric;
+        return this;
+    }
+
+    public List<Integer> getPoints() {
+        return points;
+    }
+
+    public DistributionSeries points(List<Integer> points) {
+        this.points = points;
+        return this;
+    }
+
+    public void addPoint(int point) {
+        points.add(point);
+    }
+
+    public List<String> getTags() {
+        return tags;
+    }
+
+    public DistributionSeries tags(List<String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+    public Boolean getCommon() {
+        return common;
+    }
+
+    public DistributionSeries common(Boolean common) {
+        this.common = common;
+        return this;
+    }
+
+    public String getNamespace() {
+        return namespace;
+    }
+
+    public DistributionSeries namespace(String namespace) {
+        this.namespace = namespace;
+        return this;
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/api/Integration.java b/telemetry/src/main/java/datadog/telemetry/api/Integration.java
index 4b550e8b998..adfa13a386f 100644
--- a/telemetry/src/main/java/datadog/telemetry/api/Integration.java
+++ b/telemetry/src/main/java/datadog/telemetry/api/Integration.java
@@ -1,11 +1,11 @@
 package datadog.telemetry.api;
 
 public final class Integration {
-  public final String name;
-  public final boolean enabled;
+    public final String name;
+    public final boolean enabled;
 
-  public Integration(String name, boolean enabled) {
-    this.name = name;
-    this.enabled = enabled;
-  }
+    public Integration(String name, boolean enabled) {
+        this.name = name;
+        this.enabled = enabled;
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/api/LogMessage.java b/telemetry/src/main/java/datadog/telemetry/api/LogMessage.java
index 67e63bdf6d1..7a15817d8f9 100644
--- a/telemetry/src/main/java/datadog/telemetry/api/LogMessage.java
+++ b/telemetry/src/main/java/datadog/telemetry/api/LogMessage.java
@@ -1,64 +1,64 @@
 package datadog.telemetry.api;
 
 public class LogMessage {
-  private String message;
-  private LogMessageLevel level;
-  private String tags;
-  private String stackTrace;
-  private Long tracerTime;
-  private int count;
+    private String message;
+    private LogMessageLevel level;
+    private String tags;
+    private String stackTrace;
+    private Long tracerTime;
+    private int count;
 
-  public String getMessage() {
-    return message;
-  }
+    public String getMessage() {
+        return message;
+    }
 
-  public LogMessage message(String message) {
-    this.message = message;
-    return this;
-  }
+    public LogMessage message(String message) {
+        this.message = message;
+        return this;
+    }
 
-  public LogMessageLevel getLevel() {
-    return level;
-  }
+    public LogMessageLevel getLevel() {
+        return level;
+    }
 
-  public LogMessage level(LogMessageLevel level) {
-    this.level = level;
-    return this;
-  }
+    public LogMessage level(LogMessageLevel level) {
+        this.level = level;
+        return this;
+    }
 
-  public String getTags() {
-    return tags;
-  }
+    public String getTags() {
+        return tags;
+    }
 
-  public LogMessage tags(String tags) {
-    this.tags = tags;
-    return this;
-  }
+    public LogMessage tags(String tags) {
+        this.tags = tags;
+        return this;
+    }
 
-  public String getStackTrace() {
-    return stackTrace;
-  }
+    public String getStackTrace() {
+        return stackTrace;
+    }
 
-  public LogMessage stackTrace(String stackTrace) {
-    this.stackTrace = stackTrace;
-    return this;
-  }
+    public LogMessage stackTrace(String stackTrace) {
+        this.stackTrace = stackTrace;
+        return this;
+    }
 
-  public Long getTracerTime() {
-    return tracerTime;
-  }
+    public Long getTracerTime() {
+        return tracerTime;
+    }
 
-  public LogMessage tracerTime(Long tracerTime) {
-    this.tracerTime = tracerTime;
-    return this;
-  }
+    public LogMessage tracerTime(Long tracerTime) {
+        this.tracerTime = tracerTime;
+        return this;
+    }
 
-  public LogMessage count(int count) {
-    this.count = count;
-    return this;
-  }
+    public LogMessage count(int count) {
+        this.count = count;
+        return this;
+    }
 
-  public int getCount() {
-    return count;
-  }
+    public int getCount() {
+        return count;
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/api/LogMessageLevel.java b/telemetry/src/main/java/datadog/telemetry/api/LogMessageLevel.java
index 5cb9ae30c27..5a4a8bd062e 100644
--- a/telemetry/src/main/java/datadog/telemetry/api/LogMessageLevel.java
+++ b/telemetry/src/main/java/datadog/telemetry/api/LogMessageLevel.java
@@ -3,21 +3,21 @@
 import javax.annotation.Nullable;
 
 public enum LogMessageLevel {
-  ERROR,
-  WARN,
-  DEBUG;
+    ERROR,
+    WARN,
+    DEBUG;
 
-  @Nullable
-  public static LogMessageLevel fromString(String value) {
-    switch (value) {
-      case "ERROR":
-        return ERROR;
-      case "WARN":
-        return WARN;
-      case "DEBUG":
-        return DEBUG;
-      default:
-        return null;
+    @Nullable
+    public static LogMessageLevel fromString(String value) {
+        switch (value) {
+            case "ERROR":
+                return ERROR;
+            case "WARN":
+                return WARN;
+            case "DEBUG":
+                return DEBUG;
+            default:
+                return null;
+        }
     }
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/api/Metric.java b/telemetry/src/main/java/datadog/telemetry/api/Metric.java
index 03097bda3d8..eba024bb7ca 100644
--- a/telemetry/src/main/java/datadog/telemetry/api/Metric.java
+++ b/telemetry/src/main/java/datadog/telemetry/api/Metric.java
@@ -4,119 +4,119 @@
 import java.util.List;
 
 public class Metric {
-  private String namespace;
-  private Boolean common;
-  private String metric;
-  private List<List<Number>> points = new ArrayList<>();
-  private List<String> tags = new ArrayList<>();
+    private String namespace;
+    private Boolean common;
+    private String metric;
+    private List<List<Number>> points = new ArrayList<>();
+    private List<String> tags = new ArrayList<>();
 
-  public enum TypeEnum {
-    GAUGE("gauge"),
+    public enum TypeEnum {
+        GAUGE("gauge"),
 
-    @com.squareup.moshi.Json(name = "rate")
-    RATE("rate"),
+        @com.squareup.moshi.Json(name = "rate")
+        RATE("rate"),
 
-    @com.squareup.moshi.Json(name = "count")
-    COUNT("count");
+        @com.squareup.moshi.Json(name = "count")
+        COUNT("count");
 
-    final String value;
+        final String value;
 
-    TypeEnum(String v) {
-      value = v;
-    }
+        TypeEnum(String v) {
+            value = v;
+        }
 
-    public String value() {
-      return value;
-    }
+        public String value() {
+            return value;
+        }
 
-    @Override
-    public String toString() {
-      return value;
+        @Override
+        public String toString() {
+            return value;
+        }
     }
-  }
 
-  private TypeEnum type;
+    private TypeEnum type;
 
-  public Boolean getCommon() {
-    return common;
-  }
+    public Boolean getCommon() {
+        return common;
+    }
 
-  public void setCommon(boolean common) {
-    common(common);
-  }
+    public void setCommon(boolean common) {
+        common(common);
+    }
 
-  public Metric common(Boolean common) {
-    this.common = common;
-    return this;
-  }
+    public Metric common(Boolean common) {
+        this.common = common;
+        return this;
+    }
 
-  public String getMetric() {
-    return metric;
-  }
+    public String getMetric() {
+        return metric;
+    }
 
-  public void setMetric(String metric) {
-    this.metric = metric;
-  }
+    public void setMetric(String metric) {
+        this.metric = metric;
+    }
 
-  public Metric metric(String metric) {
-    this.metric = metric;
-    return this;
-  }
+    public Metric metric(String metric) {
+        this.metric = metric;
+        return this;
+    }
 
-  public List<List<Number>> getPoints() {
-    return points;
-  }
+    public List<List<Number>> getPoints() {
+        return points;
+    }
 
-  public void setPoints(List<List<Number>> points) {
-    this.points = points;
-  }
+    public void setPoints(List<List<Number>> points) {
+        this.points = points;
+    }
 
-  public Metric points(List<List<Number>> points) {
-    this.points = points;
-    return this;
-  }
+    public Metric points(List<List<Number>> points) {
+        this.points = points;
+        return this;
+    }
 
-  public Metric addPointsItem(List<Number> pointsItem) {
-    this.points.add(pointsItem);
-    return this;
-  }
+    public Metric addPointsItem(List<Number> pointsItem) {
+        this.points.add(pointsItem);
+        return this;
+    }
 
-  public List<String> getTags() {
-    return tags;
-  }
+    public List<String> getTags() {
+        return tags;
+    }
 
-  public void setTags(List<String> tags) {
-    tags(tags);
-  }
+    public void setTags(List<String> tags) {
+        tags(tags);
+    }
 
-  public Metric tags(List<String> tags) {
-    this.tags = tags;
-    return this;
-  }
+    public Metric tags(List<String> tags) {
+        this.tags = tags;
+        return this;
+    }
 
-  public TypeEnum getType() {
-    return type;
-  }
+    public TypeEnum getType() {
+        return type;
+    }
 
-  public void setType(TypeEnum type) {
-    type(type);
-  }
+    public void setType(TypeEnum type) {
+        type(type);
+    }
 
-  public Metric type(TypeEnum type) {
-    this.type = type;
-    return this;
-  }
+    public Metric type(TypeEnum type) {
+        this.type = type;
+        return this;
+    }
 
-  public Metric namespace(final String namespace) {
-    setNamespace(namespace);
-    return this;
-  }
+    public Metric namespace(final String namespace) {
+        setNamespace(namespace);
+        return this;
+    }
 
-  public void setNamespace(final String namespace) {
-    this.namespace = namespace;
-  }
+    public void setNamespace(final String namespace) {
+        this.namespace = namespace;
+    }
 
-  public String getNamespace() {
-    return namespace;
-  }
+    public String getNamespace() {
+        return namespace;
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/api/RequestType.java b/telemetry/src/main/java/datadog/telemetry/api/RequestType.java
index 1ea613d9e90..a27ff63db26 100644
--- a/telemetry/src/main/java/datadog/telemetry/api/RequestType.java
+++ b/telemetry/src/main/java/datadog/telemetry/api/RequestType.java
@@ -1,28 +1,28 @@
 package datadog.telemetry.api;
 
 public enum RequestType {
-  APP_STARTED("app-started"),
-  APP_DEPENDENCIES_LOADED("app-dependencies-loaded"),
-  APP_INTEGRATIONS_CHANGE("app-integrations-change"),
-  APP_CLIENT_CONFIGURATION_CHANGE("app-client-configuration-change"),
-  APP_HEARTBEAT("app-heartbeat"),
-  APP_EXTENDED_HEARTBEAT("app-extended-heartbeat"),
-  APP_CLOSING("app-closing"),
-  APP_PRODUCT_CHANGE("app-product-change"),
-  GENERATE_METRICS("generate-metrics"),
-  LOGS("logs"),
-  DISTRIBUTIONS("distributions"),
-  MESSAGE_BATCH("message-batch"),
-  APP_ENDPOINTS("app-endpoints");
+    APP_STARTED("app-started"),
+    APP_DEPENDENCIES_LOADED("app-dependencies-loaded"),
+    APP_INTEGRATIONS_CHANGE("app-integrations-change"),
+    APP_CLIENT_CONFIGURATION_CHANGE("app-client-configuration-change"),
+    APP_HEARTBEAT("app-heartbeat"),
+    APP_EXTENDED_HEARTBEAT("app-extended-heartbeat"),
+    APP_CLOSING("app-closing"),
+    APP_PRODUCT_CHANGE("app-product-change"),
+    GENERATE_METRICS("generate-metrics"),
+    LOGS("logs"),
+    DISTRIBUTIONS("distributions"),
+    MESSAGE_BATCH("message-batch"),
+    APP_ENDPOINTS("app-endpoints");
 
-  private final String value;
+    private final String value;
 
-  RequestType(String value) {
-    this.value = value;
-  }
+    RequestType(String value) {
+        this.value = value;
+    }
 
-  @Override
-  public String toString() {
-    return value;
-  }
+    @Override
+    public String toString() {
+        return value;
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/dependency/Dependency.java b/telemetry/src/main/java/datadog/telemetry/dependency/Dependency.java
index 6765f77f4de..46f2fde7bc3 100644
--- a/telemetry/src/main/java/datadog/telemetry/dependency/Dependency.java
+++ b/telemetry/src/main/java/datadog/telemetry/dependency/Dependency.java
@@ -22,252 +22,250 @@
 
 public final class Dependency {
 
-  private static final Logger log = LoggerFactory.getLogger(Dependency.class);
+    private static final Logger log = LoggerFactory.getLogger(Dependency.class);
 
-  private static final Pattern FILE_REGEX =
-      Pattern.compile("^(.+?)(?:-([0-9][^-]+(?:-\\w+)?))?\\.jar$");
+    private static final Pattern FILE_REGEX = Pattern.compile("^(.+?)(?:-([0-9][^-]+(?:-\\w+)?))?\\.jar$");
 
-  private static final byte[] buf = new byte[8192];
+    private static final byte[] buf = new byte[8192];
 
-  private static final MessageDigest md;
+    private static final MessageDigest md;
 
-  static {
-    MessageDigest digest = null;
-    try {
-      digest = MessageDigest.getInstance("SHA-1");
-    } catch (NoSuchAlgorithmException e) {
-      // should not happen
-      log.error("Unable to create cipher", e);
+    static {
+        MessageDigest digest = null;
+        try {
+            digest = MessageDigest.getInstance("SHA-1");
+        } catch (NoSuchAlgorithmException e) {
+            // should not happen
+            log.error("Unable to create cipher", e);
+        }
+        md = digest;
     }
-    md = digest;
-  }
-
-  public final String name;
-  public final String version;
-  public final String source;
-  public final String hash;
-
-  /**
-   * Optional SCA reachability metadata. Each entry is a stringified JSON object conforming to the
-   * RFC reachability payload: {@code
-   * {"id":"GHSA-xxx","reached":[{"path":"...","symbol":"<clinit>","line":1}]}}. Null for regular
-   * dependencies; non-null only when injected by {@code ScaReachabilityPeriodicAction}. Not
-   * serialized by the telemetry pipeline unless explicitly written by {@link
-   * datadog.telemetry.TelemetryRequestBody#writeDependency}.
-   */
-  @Nullable public final List<String> reachabilityMetadata;
-
-  public Dependency(String name, String version, String source, @Nullable String hash) {
-    this(name, version, source, hash, null);
-  }
 
-  public Dependency(
-      String name,
-      String version,
-      String source,
-      @Nullable String hash,
-      @Nullable List<String> reachabilityMetadata) {
-    this.name = name;
-    this.version = version;
-    this.source = source;
-    this.hash = hash;
-    this.reachabilityMetadata =
-        reachabilityMetadata != null ? Collections.unmodifiableList(reachabilityMetadata) : null;
-  }
+    public final String name;
+    public final String version;
+    public final String source;
+    public final String hash;
 
-  @Override
-  public String toString() {
-    return "Dependency{"
-        + "name='"
-        + name
-        + '\''
-        + ", version='"
-        + version
-        + '\''
-        + ", source='"
-        + source
-        + '\''
-        + ", hash='"
-        + hash
-        + '\''
-        + '}';
-  }
+    /**
+     * Optional SCA reachability metadata. Each entry is a stringified JSON object conforming to the
+     * RFC reachability payload: {@code
+     * {"id":"GHSA-xxx","reached":[{"path":"...","symbol":"<clinit>","line":1}]}}. Null for regular
+     * dependencies; non-null only when injected by {@code ScaReachabilityPeriodicAction}. Not
+     * serialized by the telemetry pipeline unless explicitly written by {@link
+     * datadog.telemetry.TelemetryRequestBody#writeDependency}.
+     */
+    @Nullable
+    public final List<String> reachabilityMetadata;
 
-  public static List<Dependency> fromMavenPom(
-      final String jar, Map<String, Properties> pomProperties) {
-    if (pomProperties == null) {
-      return Collections.emptyList();
+    public Dependency(String name, String version, String source, @Nullable String hash) {
+        this(name, version, source, hash, null);
     }
-    List<Dependency> dependencies = new ArrayList<>(pomProperties.size());
-    for (final Map.Entry<String, Properties> entry : pomProperties.entrySet()) {
-      final Properties properties = entry.getValue();
-      final String groupId = properties.getProperty("groupId");
-      final String artifactId = properties.getProperty("artifactId");
-      final String version = properties.getProperty("version");
-      final String name = groupId + ":" + artifactId;
 
-      if (groupId == null || artifactId == null || version == null) {
-        log.debug(
-            "pom.properties does not have all the required properties: "
-                + "jar={}, entry={}, groupId={}, artifactId={}, version={}",
-            jar,
-            entry.getKey(),
-            groupId,
-            artifactId,
-            version);
-      } else {
-        log.debug(
-            "dependency found in pom.properties: "
-                + "jar={}, entry={}, groupId={}, artifactId={}, version={}",
-            jar,
-            entry.getKey(),
-            groupId,
-            artifactId,
-            version);
-        dependencies.add(new Dependency(name, version, jar, null));
-      }
+    public Dependency(
+            String name,
+            String version,
+            String source,
+            @Nullable String hash,
+            @Nullable List<String> reachabilityMetadata) {
+        this.name = name;
+        this.version = version;
+        this.source = source;
+        this.hash = hash;
+        this.reachabilityMetadata =
+                reachabilityMetadata != null ? Collections.unmodifiableList(reachabilityMetadata) : null;
     }
-    return dependencies;
-  }
 
-  @SuppressFBWarnings(
-      value = {"USO_UNSAFE_METHOD_SYNCHRONIZATION", "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION"},
-      justification =
-          "Static synchronized method guards the shared static MessageDigest and byte[] buffer; the"
-              + " Dependency.class lock is internal and not exposed to application code.")
-  public static synchronized Dependency guessFallbackNoPom(
-      Attributes manifest, String source, InputStream is) throws IOException {
-    final int slashIndex = source.lastIndexOf('/');
-    if (slashIndex >= 0) {
-      source = source.substring(slashIndex + 1);
+    @Override
+    public String toString() {
+        return "Dependency{"
+                + "name='"
+                + name
+                + '\''
+                + ", version='"
+                + version
+                + '\''
+                + ", source='"
+                + source
+                + '\''
+                + ", hash='"
+                + hash
+                + '\''
+                + '}';
     }
 
-    String artifactId;
-    String groupId = null;
-    String version;
-    String hash = null;
+    public static List<Dependency> fromMavenPom(final String jar, Map<String, Properties> pomProperties) {
+        if (pomProperties == null) {
+            return Collections.emptyList();
+        }
+        List<Dependency> dependencies = new ArrayList<>(pomProperties.size());
+        for (final Map.Entry<String, Properties> entry : pomProperties.entrySet()) {
+            final Properties properties = entry.getValue();
+            final String groupId = properties.getProperty("groupId");
+            final String artifactId = properties.getProperty("artifactId");
+            final String version = properties.getProperty("version");
+            final String name = groupId + ":" + artifactId;
 
-    // Guess from manifest
-    String bundleSymbolicName = null;
-    String implementationTitle = null;
-    String bundleName = null;
-    String bundleVersion = null;
-    String implementationVersion = null;
-    if (manifest != null) {
-      bundleSymbolicName = manifest.getValue("bundle-symbolicname");
-      bundleName = manifest.getValue("bundle-name");
-      bundleVersion = manifest.getValue("bundle-version");
-      implementationTitle = manifest.getValue("implementation-title");
-      implementationVersion = manifest.getValue("implementation-version");
+            if (groupId == null || artifactId == null || version == null) {
+                log.debug(
+                        "pom.properties does not have all the required properties: "
+                                + "jar={}, entry={}, groupId={}, artifactId={}, version={}",
+                        jar,
+                        entry.getKey(),
+                        groupId,
+                        artifactId,
+                        version);
+            } else {
+                log.debug(
+                        "dependency found in pom.properties: "
+                                + "jar={}, entry={}, groupId={}, artifactId={}, version={}",
+                        jar,
+                        entry.getKey(),
+                        groupId,
+                        artifactId,
+                        version);
+                dependencies.add(new Dependency(name, version, jar, null));
+            }
+        }
+        return dependencies;
     }
 
-    // Guess from file name
-    String fileNameArtifact = null;
-    String fileNameVersion = null;
-    Matcher m = FILE_REGEX.matcher(source);
-    if (m.matches()) {
-      fileNameArtifact = m.group(1);
-      fileNameVersion = m.group(2);
-    } else {
-      // This code path should not be exercised right now, although it might in the future (e.g.
-      // Knopflerfish uses
-      // a jar storage without .jar extension). We used to strip the extension here, but if we
-      // unexpectedly get here,
-      // it would be better to get something informative even if weird. So just fallback to the full
-      // name.
-      fileNameArtifact = source;
-    }
+    @SuppressFBWarnings(
+            value = {"USO_UNSAFE_METHOD_SYNCHRONIZATION", "USO_UNSAFE_STATIC_METHOD_SYNCHRONIZATION"},
+            justification = "Static synchronized method guards the shared static MessageDigest and byte[] buffer; the"
+                    + " Dependency.class lock is internal and not exposed to application code.")
+    public static synchronized Dependency guessFallbackNoPom(Attributes manifest, String source, InputStream is)
+            throws IOException {
+        final int slashIndex = source.lastIndexOf('/');
+        if (slashIndex >= 0) {
+            source = source.substring(slashIndex + 1);
+        }
 
-    // Find for the most suitable name (based on priority)
-    if (isValidArtifactId(bundleName)) {
-      artifactId = bundleName;
-    } else if (isValidArtifactId(implementationTitle)) {
-      artifactId = implementationTitle;
-    } else {
-      artifactId = fileNameArtifact;
-    }
+        String artifactId;
+        String groupId = null;
+        String version;
+        String hash = null;
 
-    // Bundle-Version and Implementation-Version have precedence only if they are equal.
-    if (equalsNonNull(bundleVersion, implementationVersion)) {
-      version = bundleVersion;
-    } else if (hasText(fileNameVersion)) {
-      version = fileNameVersion;
-    } else if (hasText(bundleVersion)) {
-      version = bundleVersion;
-    } else if (hasText(implementationVersion)) {
-      version = implementationVersion;
-    } else {
-      version = "";
-    }
+        // Guess from manifest
+        String bundleSymbolicName = null;
+        String implementationTitle = null;
+        String bundleName = null;
+        String bundleVersion = null;
+        String implementationVersion = null;
+        if (manifest != null) {
+            bundleSymbolicName = manifest.getValue("bundle-symbolicname");
+            bundleName = manifest.getValue("bundle-name");
+            bundleVersion = manifest.getValue("bundle-version");
+            implementationTitle = manifest.getValue("implementation-title");
+            implementationVersion = manifest.getValue("implementation-version");
+        }
 
-    // Try to get groupId from bundleSymbolicName and bundleName (or artifact id)
-    if (hasText(bundleSymbolicName)) {
-      groupId = parseGroupId(bundleSymbolicName, fileNameArtifact);
-      if (!isValidGroupId(groupId)) {
-        groupId = parseGroupId(bundleSymbolicName, bundleName);
+        // Guess from file name
+        String fileNameArtifact = null;
+        String fileNameVersion = null;
+        Matcher m = FILE_REGEX.matcher(source);
+        if (m.matches()) {
+            fileNameArtifact = m.group(1);
+            fileNameVersion = m.group(2);
+        } else {
+            // This code path should not be exercised right now, although it might in the future (e.g.
+            // Knopflerfish uses
+            // a jar storage without .jar extension). We used to strip the extension here, but if we
+            // unexpectedly get here,
+            // it would be better to get something informative even if weird. So just fallback to the full
+            // name.
+            fileNameArtifact = source;
+        }
 
-        if (!isValidGroupId(groupId)) {
-          groupId = null;
+        // Find for the most suitable name (based on priority)
+        if (isValidArtifactId(bundleName)) {
+            artifactId = bundleName;
+        } else if (isValidArtifactId(implementationTitle)) {
+            artifactId = implementationTitle;
+        } else {
+            artifactId = fileNameArtifact;
         }
-      }
-    }
-    String name = artifactId;
-    if (groupId != null) {
-      name = groupId + ":" + artifactId;
-    }
 
-    if (md != null) {
-      // Compute hash for all dependencies that have no pom
-      // No reliable version calculate hash and use any version
-      md.reset();
-      is = new DigestInputStream(is, md);
-      while (is.read(buf, 0, buf.length) > 0) {}
-      hash = String.format("%040X", new BigInteger(1, md.digest()));
-    }
-    log.debug("No maven dependency added {}.{} jar name {} hash {}", name, version, source, hash);
-    return new Dependency(name, version, source, hash);
-  }
+        // Bundle-Version and Implementation-Version have precedence only if they are equal.
+        if (equalsNonNull(bundleVersion, implementationVersion)) {
+            version = bundleVersion;
+        } else if (hasText(fileNameVersion)) {
+            version = fileNameVersion;
+        } else if (hasText(bundleVersion)) {
+            version = bundleVersion;
+        } else if (hasText(implementationVersion)) {
+            version = implementationVersion;
+        } else {
+            version = "";
+        }
 
-  private static boolean isValidArtifactId(String artifactId) {
-    return hasText(artifactId)
-        && !artifactId.contains(" ")
-        && !artifactId.contains(".")
-        && artifactId.toLowerCase(Locale.ROOT).equals(artifactId);
-  }
+        // Try to get groupId from bundleSymbolicName and bundleName (or artifact id)
+        if (hasText(bundleSymbolicName)) {
+            groupId = parseGroupId(bundleSymbolicName, fileNameArtifact);
+            if (!isValidGroupId(groupId)) {
+                groupId = parseGroupId(bundleSymbolicName, bundleName);
 
-  private static boolean isValidGroupId(String group) {
-    return hasText(group)
-        && !group.contains(" ")
-        && group.contains(".")
-        && group.toLowerCase(Locale.ROOT).equals(group);
-  }
+                if (!isValidGroupId(groupId)) {
+                    groupId = null;
+                }
+            }
+        }
+        String name = artifactId;
+        if (groupId != null) {
+            name = groupId + ":" + artifactId;
+        }
 
-  private static boolean hasText(final String value) {
-    return value != null && !value.isEmpty();
-  }
+        if (md != null) {
+            // Compute hash for all dependencies that have no pom
+            // No reliable version calculate hash and use any version
+            md.reset();
+            is = new DigestInputStream(is, md);
+            while (is.read(buf, 0, buf.length) > 0) {}
+            hash = String.format("%040X", new BigInteger(1, md.digest()));
+        }
+        log.debug("No maven dependency added {}.{} jar name {} hash {}", name, version, source, hash);
+        return new Dependency(name, version, source, hash);
+    }
 
-  private static boolean equalsNonNull(String s1, String s2) {
-    return s1 != null && s1.equals(s2);
-  }
+    private static boolean isValidArtifactId(String artifactId) {
+        return hasText(artifactId)
+                && !artifactId.contains(" ")
+                && !artifactId.contains(".")
+                && artifactId.toLowerCase(Locale.ROOT).equals(artifactId);
+    }
 
-  private static String parseGroupId(String bundleSymbolicName, String bundleName) {
-    // Some tools create Bundle-Symbolicname as `groupId.artifactid`.
-    // We'll try to infer group id based on that.
-    final String bundleNameWithPrefix = "." + bundleName;
-    if (!bundleSymbolicName.endsWith(bundleNameWithPrefix)) {
-      return null;
+    private static boolean isValidGroupId(String group) {
+        return hasText(group)
+                && !group.contains(" ")
+                && group.contains(".")
+                && group.toLowerCase(Locale.ROOT).equals(group);
     }
 
-    final int truncateLen = bundleSymbolicName.length() - bundleNameWithPrefix.length();
-    final String groupId = bundleSymbolicName.substring(0, truncateLen);
+    private static boolean hasText(final String value) {
+        return value != null && !value.isEmpty();
+    }
 
-    // Sometimes this will lead to an incorrect group id, in cases like com.opencsv / opencsv, which
-    // are frequent.
-    // This will trim both single word group ids, as well as prefixes suck as `uk.ac`.
-    if (groupId.contains(".") && groupId.length() > 5) {
-      return groupId;
+    private static boolean equalsNonNull(String s1, String s2) {
+        return s1 != null && s1.equals(s2);
     }
 
-    return null;
-  }
+    private static String parseGroupId(String bundleSymbolicName, String bundleName) {
+        // Some tools create Bundle-Symbolicname as `groupId.artifactid`.
+        // We'll try to infer group id based on that.
+        final String bundleNameWithPrefix = "." + bundleName;
+        if (!bundleSymbolicName.endsWith(bundleNameWithPrefix)) {
+            return null;
+        }
+
+        final int truncateLen = bundleSymbolicName.length() - bundleNameWithPrefix.length();
+        final String groupId = bundleSymbolicName.substring(0, truncateLen);
+
+        // Sometimes this will lead to an incorrect group id, in cases like com.opencsv / opencsv, which
+        // are frequent.
+        // This will trim both single word group ids, as well as prefixes suck as `uk.ac`.
+        if (groupId.contains(".") && groupId.length() > 5) {
+            return groupId;
+        }
+
+        return null;
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/dependency/DependencyPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/dependency/DependencyPeriodicAction.java
index d25716c1f15..f6346e74f1d 100644
--- a/telemetry/src/main/java/datadog/telemetry/dependency/DependencyPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/dependency/DependencyPeriodicAction.java
@@ -4,17 +4,17 @@
 import datadog.telemetry.TelemetryService;
 
 public class DependencyPeriodicAction implements TelemetryRunnable.TelemetryPeriodicAction {
-  private final DependencyService dependencyService;
+    private final DependencyService dependencyService;
 
-  public DependencyPeriodicAction(DependencyService dependencyService) {
-    this.dependencyService = dependencyService;
-  }
+    public DependencyPeriodicAction(DependencyService dependencyService) {
+        this.dependencyService = dependencyService;
+    }
 
-  @Override
-  public void doIteration(TelemetryService telService) {
-    // TODO Could just consume from the original queue instead?
-    for (Dependency dep : dependencyService.drainDeterminedDependencies()) {
-      telService.addDependency(dep);
+    @Override
+    public void doIteration(TelemetryService telService) {
+        // TODO Could just consume from the original queue instead?
+        for (Dependency dep : dependencyService.drainDeterminedDependencies()) {
+            telService.addDependency(dep);
+        }
     }
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/dependency/DependencyResolver.java b/telemetry/src/main/java/datadog/telemetry/dependency/DependencyResolver.java
index 91ec8c52162..5dbd9e170b1 100644
--- a/telemetry/src/main/java/datadog/telemetry/dependency/DependencyResolver.java
+++ b/telemetry/src/main/java/datadog/telemetry/dependency/DependencyResolver.java
@@ -11,87 +11,85 @@
 
 public class DependencyResolver {
 
-  private static final Logger log = LoggerFactory.getLogger(DependencyResolver.class);
+    private static final Logger log = LoggerFactory.getLogger(DependencyResolver.class);
 
-  public static List<Dependency> resolve(URI uri) {
-    try {
-      return internalResolve(uri);
-    } catch (Throwable t) {
-      log.debug("Failed to determine dependency for uri {}", uri, t);
+    public static List<Dependency> resolve(URI uri) {
+        try {
+            return internalResolve(uri);
+        } catch (Throwable t) {
+            log.debug("Failed to determine dependency for uri {}", uri, t);
+        }
+        return Collections.emptyList();
     }
-    return Collections.emptyList();
-  }
 
-  static List<Dependency> internalResolve(final URI uri) throws IOException {
-    final String scheme = uri.getScheme();
-    JarReader.Extracted metadata = null;
-    switch (scheme) {
-      case "file":
-        final File f = uri.isOpaque() ? new File(uri.getSchemeSpecificPart()) : new File(uri);
-        final String path = f.getAbsolutePath();
-        metadata = JarReader.readJarFile(path);
-        break;
-      case "jar":
-        metadata = resolveNestedJar(uri);
-        break;
-      default:
+    static List<Dependency> internalResolve(final URI uri) throws IOException {
+        final String scheme = uri.getScheme();
+        JarReader.Extracted metadata = null;
+        switch (scheme) {
+            case "file":
+                final File f = uri.isOpaque() ? new File(uri.getSchemeSpecificPart()) : new File(uri);
+                final String path = f.getAbsolutePath();
+                metadata = JarReader.readJarFile(path);
+                break;
+            case "jar":
+                metadata = resolveNestedJar(uri);
+                break;
+            default:
+        }
+        if (metadata == null) {
+            log.debug("unsupported dependency type: {}", uri);
+            return Collections.emptyList();
+        }
+        if (metadata.isDirectory) {
+            log.debug("Extracting dependencies from directories is not supported: {}", uri);
+            return Collections.emptyList();
+        }
+        final List<Dependency> dependencies = Dependency.fromMavenPom(metadata.jarName, metadata.pomProperties);
+        if (!dependencies.isEmpty()) {
+            return dependencies;
+        }
+        try (final InputStream is = metadata.inputStreamSupplier.get()) {
+            return Collections.singletonList(Dependency.guessFallbackNoPom(metadata.manifest, metadata.jarName, is));
+        }
     }
-    if (metadata == null) {
-      log.debug("unsupported dependency type: {}", uri);
-      return Collections.emptyList();
-    }
-    if (metadata.isDirectory) {
-      log.debug("Extracting dependencies from directories is not supported: {}", uri);
-      return Collections.emptyList();
-    }
-    final List<Dependency> dependencies =
-        Dependency.fromMavenPom(metadata.jarName, metadata.pomProperties);
-    if (!dependencies.isEmpty()) {
-      return dependencies;
-    }
-    try (final InputStream is = metadata.inputStreamSupplier.get()) {
-      return Collections.singletonList(
-          Dependency.guessFallbackNoPom(metadata.manifest, metadata.jarName, is));
-    }
-  }
 
-  private static JarReader.Extracted resolveNestedJar(final URI uri) throws IOException {
-    String path = uri.getSchemeSpecificPart();
+    private static JarReader.Extracted resolveNestedJar(final URI uri) throws IOException {
+        String path = uri.getSchemeSpecificPart();
 
-    // Strip optional trailing '!' or '!/'.
-    if (path.endsWith("!")) {
-      path = path.substring(0, path.length() - 1);
-    } else if (path.endsWith("!/")) {
-      path = path.substring(0, path.length() - 2);
-    }
+        // Strip optional trailing '!' or '!/'.
+        if (path.endsWith("!")) {
+            path = path.substring(0, path.length() - 1);
+        } else if (path.endsWith("!/")) {
+            path = path.substring(0, path.length() - 2);
+        }
 
-    if (path.startsWith("file:")) {
-      // Old style nested dependencies, as seen in Spring Boot 2 and others.
-      // These look like jar:file:/path/to.jar!/path/to/nested.jar!/
-      path = path.substring("file:".length());
-      final int sepIdx = path.indexOf("!/");
-      if (sepIdx == -1) {
-        // JBoss may use the "jar:file" format to reference jar files instead of nested jars.
-        // These look like: jar:file:/path/to.jar!/
-        return JarReader.readJarFile(path);
-      }
-      final String outerPath = path.substring(0, sepIdx);
-      final String innerPath = path.substring(sepIdx + 2);
-      return JarReader.readNestedJarFile(outerPath, innerPath);
-    } else if (path.startsWith("nested:")) {
-      // New style nested dependencies, for Spring 3.2+.
-      // These look like jar:nested:/path/to.jar/!path/to/nested.jar!/ (yes, /!, not !/).
-      // See https://docs.spring.io/spring-boot/specification/executable-jar/jarfile-class.html
-      path = path.substring("nested:".length());
-      final int sepIdx = path.indexOf("/!");
-      if (sepIdx == -1) {
-        throw new IllegalArgumentException("Invalid nested jar path: " + path);
-      }
-      final String outerPath = path.substring(0, sepIdx);
-      final String innerPath = path.substring(sepIdx + 2);
-      return JarReader.readNestedJarFile(outerPath, innerPath);
-    } else {
-      return null;
+        if (path.startsWith("file:")) {
+            // Old style nested dependencies, as seen in Spring Boot 2 and others.
+            // These look like jar:file:/path/to.jar!/path/to/nested.jar!/
+            path = path.substring("file:".length());
+            final int sepIdx = path.indexOf("!/");
+            if (sepIdx == -1) {
+                // JBoss may use the "jar:file" format to reference jar files instead of nested jars.
+                // These look like: jar:file:/path/to.jar!/
+                return JarReader.readJarFile(path);
+            }
+            final String outerPath = path.substring(0, sepIdx);
+            final String innerPath = path.substring(sepIdx + 2);
+            return JarReader.readNestedJarFile(outerPath, innerPath);
+        } else if (path.startsWith("nested:")) {
+            // New style nested dependencies, for Spring 3.2+.
+            // These look like jar:nested:/path/to.jar/!path/to/nested.jar!/ (yes, /!, not !/).
+            // See https://docs.spring.io/spring-boot/specification/executable-jar/jarfile-class.html
+            path = path.substring("nested:".length());
+            final int sepIdx = path.indexOf("/!");
+            if (sepIdx == -1) {
+                throw new IllegalArgumentException("Invalid nested jar path: " + path);
+            }
+            final String outerPath = path.substring(0, sepIdx);
+            final String innerPath = path.substring(sepIdx + 2);
+            return JarReader.readNestedJarFile(outerPath, innerPath);
+        } else {
+            return null;
+        }
     }
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/dependency/DependencyResolverQueue.java b/telemetry/src/main/java/datadog/telemetry/dependency/DependencyResolverQueue.java
index 875a2d57c29..1b1edbd1809 100644
--- a/telemetry/src/main/java/datadog/telemetry/dependency/DependencyResolverQueue.java
+++ b/telemetry/src/main/java/datadog/telemetry/dependency/DependencyResolverQueue.java
@@ -13,81 +13,80 @@
 
 public class DependencyResolverQueue {
 
-  private static final Logger log = LoggerFactory.getLogger(DependencyResolverQueue.class);
+    private static final Logger log = LoggerFactory.getLogger(DependencyResolverQueue.class);
 
-  private final Queue<URI> newUrlsQueue;
-  private final Set<URI> processedUrlsSet; // guarded by this
-  private static int MAX_QUEUE_SIZE = Config.get().getTelemetryDependencyResolutionQueueSize();
+    private final Queue<URI> newUrlsQueue;
+    private final Set<URI> processedUrlsSet; // guarded by this
+    private static int MAX_QUEUE_SIZE = Config.get().getTelemetryDependencyResolutionQueueSize();
 
-  private boolean resolverQueueDisabled = false;
+    private boolean resolverQueueDisabled = false;
 
-  public DependencyResolverQueue() {
-    newUrlsQueue = new ConcurrentLinkedQueue<>();
-    processedUrlsSet = new HashSet<>();
-  }
-
-  // This constructor is intended for testing purposes only
-  public DependencyResolverQueue(int maxQueueSize) {
-    MAX_QUEUE_SIZE = maxQueueSize;
-    newUrlsQueue = new ConcurrentLinkedQueue<>();
-    processedUrlsSet = new HashSet<>();
-  }
-
-  public void queueURI(URI uri) {
-    if (resolverQueueDisabled || uri == null) {
-      return;
+    public DependencyResolverQueue() {
+        newUrlsQueue = new ConcurrentLinkedQueue<>();
+        processedUrlsSet = new HashSet<>();
     }
 
-    // once the queue reaches MAX_QUEUE_SIZE, we have reached the user-defined limit of
-    // unique dependencies to queue and we will disable the resolver queue from adding any more
-    // URI's.
-    if (processedUrlsSet.size() >= MAX_QUEUE_SIZE || newUrlsQueue.size() >= MAX_QUEUE_SIZE) {
-      resolverQueueDisabled = true;
-
-      log.warn(
-          "DependencyResolverQueue limit has been reached, additional dependencies will not be queued");
-
-      // this resolver will be disabled so we can clear the stored URIs from processedUrlsSet
-      // since they will no longer be checked against for duplicates
-      synchronized (this) {
-        processedUrlsSet.clear();
-      }
-      return;
+    // This constructor is intended for testing purposes only
+    public DependencyResolverQueue(int maxQueueSize) {
+        MAX_QUEUE_SIZE = maxQueueSize;
+        newUrlsQueue = new ConcurrentLinkedQueue<>();
+        processedUrlsSet = new HashSet<>();
     }
 
-    // we ignore .class files directly within webapp folder (they aren't part of dependencies)
-    String path = uri.getPath();
-    if (path != null && path.endsWith(".class")) {
-      return;
+    public void queueURI(URI uri) {
+        if (resolverQueueDisabled || uri == null) {
+            return;
+        }
+
+        // once the queue reaches MAX_QUEUE_SIZE, we have reached the user-defined limit of
+        // unique dependencies to queue and we will disable the resolver queue from adding any more
+        // URI's.
+        if (processedUrlsSet.size() >= MAX_QUEUE_SIZE || newUrlsQueue.size() >= MAX_QUEUE_SIZE) {
+            resolverQueueDisabled = true;
+
+            log.warn("DependencyResolverQueue limit has been reached, additional dependencies will not be queued");
+
+            // this resolver will be disabled so we can clear the stored URIs from processedUrlsSet
+            // since they will no longer be checked against for duplicates
+            synchronized (this) {
+                processedUrlsSet.clear();
+            }
+            return;
+        }
+
+        // we ignore .class files directly within webapp folder (they aren't part of dependencies)
+        String path = uri.getPath();
+        if (path != null && path.endsWith(".class")) {
+            return;
+        }
+
+        // ignore already processed url
+        synchronized (this) {
+            if (!processedUrlsSet.add(uri)) {
+                return;
+            }
+        }
+
+        newUrlsQueue.add(uri);
     }
 
-    // ignore already processed url
-    synchronized (this) {
-      if (!processedUrlsSet.add(uri)) {
-        return;
-      }
-    }
+    public List<Dependency> pollDependency() {
+        URI uri = newUrlsQueue.poll();
 
-    newUrlsQueue.add(uri);
-  }
+        // no new deps
+        if (uri == null) {
+            return Collections.emptyList();
+        }
 
-  public List<Dependency> pollDependency() {
-    URI uri = newUrlsQueue.poll();
+        List<Dependency> dep = DependencyResolver.resolve(uri);
+        if (dep.isEmpty()) {
+            log.debug("unable to detect dependency for URI {}", uri);
+            return Collections.emptyList();
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("dependency detected {} for {}", dep, uri);
+        }
 
-    // no new deps
-    if (uri == null) {
-      return Collections.emptyList();
+        return dep;
     }
-
-    List<Dependency> dep = DependencyResolver.resolve(uri);
-    if (dep.isEmpty()) {
-      log.debug("unable to detect dependency for URI {}", uri);
-      return Collections.emptyList();
-    }
-    if (log.isDebugEnabled()) {
-      log.debug("dependency detected {} for {}", dep, uri);
-    }
-
-    return dep;
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/dependency/DependencyService.java b/telemetry/src/main/java/datadog/telemetry/dependency/DependencyService.java
index 0e0e95423f2..e07bfc02878 100644
--- a/telemetry/src/main/java/datadog/telemetry/dependency/DependencyService.java
+++ b/telemetry/src/main/java/datadog/telemetry/dependency/DependencyService.java
@@ -22,92 +22,91 @@
  */
 public class DependencyService implements Runnable {
 
-  private static final Logger log = LoggerFactory.getLogger(DependencyService.class);
-
-  private final DependencyResolverQueue resolverQueue = new DependencyResolverQueue();
-
-  private final BlockingQueue<Dependency> newDependencies = new LinkedBlockingQueue<>();
-
-  private AgentTaskScheduler.Scheduled<Runnable> scheduledTask;
-
-  public void schedulePeriodicResolution() {
-    scheduledTask =
-        AgentTaskScheduler.get()
-            .scheduleAtFixedRate(
-                AgentTaskScheduler.RunnableTask.INSTANCE,
-                this,
-                0,
-                Config.get().getDependecyResolutionPeriodMillis(),
-                TimeUnit.MILLISECONDS);
-  }
-
-  public void resolveOneDependency() {
-    List<Dependency> dependencies = resolverQueue.pollDependency();
-    if (!dependencies.isEmpty()) {
-      for (Dependency dependency : dependencies) {
-        log.debug("Resolved dependency {}", dependency.name);
-        newDependencies.add(dependency);
-      }
+    private static final Logger log = LoggerFactory.getLogger(DependencyService.class);
+
+    private final DependencyResolverQueue resolverQueue = new DependencyResolverQueue();
+
+    private final BlockingQueue<Dependency> newDependencies = new LinkedBlockingQueue<>();
+
+    private AgentTaskScheduler.Scheduled<Runnable> scheduledTask;
+
+    public void schedulePeriodicResolution() {
+        scheduledTask = AgentTaskScheduler.get()
+                .scheduleAtFixedRate(
+                        AgentTaskScheduler.RunnableTask.INSTANCE,
+                        this,
+                        0,
+                        Config.get().getDependecyResolutionPeriodMillis(),
+                        TimeUnit.MILLISECONDS);
+    }
+
+    public void resolveOneDependency() {
+        List<Dependency> dependencies = resolverQueue.pollDependency();
+        if (!dependencies.isEmpty()) {
+            for (Dependency dependency : dependencies) {
+                log.debug("Resolved dependency {}", dependency.name);
+                newDependencies.add(dependency);
+            }
+        }
     }
-  }
-
-  /**
-   * Registers this service as a no-op class file transformer.
-   *
-   * @param instrumentation instrumentation instance to register on
-   */
-  public void installOn(Instrumentation instrumentation) {
-    instrumentation.addTransformer(new LocationsCollectingTransformer(this));
-  }
-
-  public Collection<Dependency> drainDeterminedDependencies() {
-    List<Dependency> list = new LinkedList<>();
-    int drained = newDependencies.drainTo(list);
-    if (drained > 0) {
-      return list;
+
+    /**
+     * Registers this service as a no-op class file transformer.
+     *
+     * @param instrumentation instrumentation instance to register on
+     */
+    public void installOn(Instrumentation instrumentation) {
+        instrumentation.addTransformer(new LocationsCollectingTransformer(this));
     }
-    return Collections.emptyList();
-  }
-
-  public void addURL(URL url) {
-    resolverQueue.queueURI(convertToURI(url));
-  }
-
-  @VisibleForTesting
-  URI convertToURI(URL location) {
-    URI uri = null;
-
-    if (location.getProtocol().equals("vfs")) {
-      // resolve jboss virtual file system
-      try {
-        uri = JbossVirtualFileHelper.getJbossVfsPath(location);
-      } catch (RuntimeException rte) {
-        log.debug("Error in call to getJbossVfsPath", rte);
-        return null;
-      }
+
+    public Collection<Dependency> drainDeterminedDependencies() {
+        List<Dependency> list = new LinkedList<>();
+        int drained = newDependencies.drainTo(list);
+        if (drained > 0) {
+            return list;
+        }
+        return Collections.emptyList();
     }
 
-    if (uri == null) {
-      try {
-        uri = new URI(location.toString().replace(" ", "%20"));
-      } catch (URISyntaxException e) {
-        log.warn("Error converting URL to URI", e);
-        // silently ignored
-      }
+    public void addURL(URL url) {
+        resolverQueue.queueURI(convertToURI(url));
     }
 
-    return uri;
-  }
+    @VisibleForTesting
+    URI convertToURI(URL location) {
+        URI uri = null;
+
+        if (location.getProtocol().equals("vfs")) {
+            // resolve jboss virtual file system
+            try {
+                uri = JbossVirtualFileHelper.getJbossVfsPath(location);
+            } catch (RuntimeException rte) {
+                log.debug("Error in call to getJbossVfsPath", rte);
+                return null;
+            }
+        }
+
+        if (uri == null) {
+            try {
+                uri = new URI(location.toString().replace(" ", "%20"));
+            } catch (URISyntaxException e) {
+                log.warn("Error converting URL to URI", e);
+                // silently ignored
+            }
+        }
+
+        return uri;
+    }
 
-  @Override
-  public void run() {
-    resolveOneDependency();
-  }
+    @Override
+    public void run() {
+        resolveOneDependency();
+    }
 
-  public void stop() {
-    if (scheduledTask != null) {
-      scheduledTask.cancel();
-      scheduledTask = null;
+    public void stop() {
+        if (scheduledTask != null) {
+            scheduledTask.cancel();
+            scheduledTask = null;
+        }
     }
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/dependency/JarReader.java b/telemetry/src/main/java/datadog/telemetry/dependency/JarReader.java
index ebbedc96a49..ab175c63d8b 100644
--- a/telemetry/src/main/java/datadog/telemetry/dependency/JarReader.java
+++ b/telemetry/src/main/java/datadog/telemetry/dependency/JarReader.java
@@ -17,121 +17,118 @@
 import java.util.zip.ZipEntry;
 
 class JarReader {
-  static class Extracted {
-    final String jarName;
-    final Map<String, Properties> pomProperties;
-    final Attributes manifest;
-    final boolean isDirectory;
-    final InputStreamSupplier inputStreamSupplier;
+    static class Extracted {
+        final String jarName;
+        final Map<String, Properties> pomProperties;
+        final Attributes manifest;
+        final boolean isDirectory;
+        final InputStreamSupplier inputStreamSupplier;
 
-    public Extracted(
-        final String jarName,
-        final Map<String, Properties> pomProperties,
-        final Attributes manifest,
-        final boolean isDirectory,
-        final InputStreamSupplier inputStreamSupplier) {
-      this.jarName = jarName;
-      this.pomProperties = pomProperties;
-      this.manifest = manifest;
-      this.isDirectory = isDirectory;
-      this.inputStreamSupplier = inputStreamSupplier;
-    }
+        public Extracted(
+                final String jarName,
+                final Map<String, Properties> pomProperties,
+                final Attributes manifest,
+                final boolean isDirectory,
+                final InputStreamSupplier inputStreamSupplier) {
+            this.jarName = jarName;
+            this.pomProperties = pomProperties;
+            this.manifest = manifest;
+            this.isDirectory = isDirectory;
+            this.inputStreamSupplier = inputStreamSupplier;
+        }
 
-    public interface InputStreamSupplier {
-      InputStream get() throws IOException;
+        public interface InputStreamSupplier {
+            InputStream get() throws IOException;
+        }
     }
-  }
 
-  public static Extracted readJarFile(String jarPath) throws IOException {
-    final File jarFile = new File(jarPath);
-    if (jarFile.isDirectory()) {
-      return new Extracted(jarFile.getName(), new HashMap<>(), new Attributes(), true, () -> null);
-    }
-    try (final JarFile jar = new JarFile(jarPath, false /* no verify */)) {
-      final Map<String, Properties> pomProperties = new HashMap<>();
-      final Enumeration<? extends ZipEntry> entries = jar.entries();
-      while (entries.hasMoreElements()) {
-        final ZipEntry entry = entries.nextElement();
-        if (entry.getName().endsWith("pom.properties")) {
-          try (final InputStream is = jar.getInputStream(entry)) {
-            final Properties properties = new Properties();
-            properties.load(is);
-            pomProperties.put(entry.getName(), properties);
-          }
+    public static Extracted readJarFile(String jarPath) throws IOException {
+        final File jarFile = new File(jarPath);
+        if (jarFile.isDirectory()) {
+            return new Extracted(jarFile.getName(), new HashMap<>(), new Attributes(), true, () -> null);
+        }
+        try (final JarFile jar = new JarFile(jarPath, false /* no verify */)) {
+            final Map<String, Properties> pomProperties = new HashMap<>();
+            final Enumeration<? extends ZipEntry> entries = jar.entries();
+            while (entries.hasMoreElements()) {
+                final ZipEntry entry = entries.nextElement();
+                if (entry.getName().endsWith("pom.properties")) {
+                    try (final InputStream is = jar.getInputStream(entry)) {
+                        final Properties properties = new Properties();
+                        properties.load(is);
+                        pomProperties.put(entry.getName(), properties);
+                    }
+                }
+            }
+            final Manifest manifest = jar.getManifest();
+            final Attributes attributes = (manifest == null) ? new Attributes() : manifest.getMainAttributes();
+            return new Extracted(
+                    new File(jar.getName()).getName(),
+                    pomProperties,
+                    attributes,
+                    false,
+                    () -> Files.newInputStream(Paths.get(jarPath)));
         }
-      }
-      final Manifest manifest = jar.getManifest();
-      final Attributes attributes =
-          (manifest == null) ? new Attributes() : manifest.getMainAttributes();
-      return new Extracted(
-          new File(jar.getName()).getName(),
-          pomProperties,
-          attributes,
-          false,
-          () -> Files.newInputStream(Paths.get(jarPath)));
     }
-  }
 
-  public static Extracted readNestedJarFile(final String outerJarPath, final String innerJarPath)
-      throws IOException {
-    try (final JarFile outerJar = new JarFile(outerJarPath, false /* no verify */)) {
-      final ZipEntry entry = outerJar.getEntry(innerJarPath);
-      if (entry == null) {
-        throw new NoSuchFileException("Nested jar not found: " + innerJarPath);
-      }
-      if (entry.isDirectory()) {
-        return new Extracted(
-            new File(innerJarPath).getName(), new HashMap<>(), new Attributes(), true, () -> null);
-      }
-      try (final InputStream is = outerJar.getInputStream(entry);
-          final JarInputStream innerJar = new JarInputStream(is, false /* no verify */)) {
-        final Map<String, Properties> pomProperties = new HashMap<>();
-        ZipEntry innerEntry;
-        while ((innerEntry = innerJar.getNextEntry()) != null) {
-          if (innerEntry.getName().endsWith("pom.properties")) {
-            final Properties properties = new Properties();
-            properties.load(innerJar);
-            pomProperties.put(innerEntry.getName(), properties);
-          }
+    public static Extracted readNestedJarFile(final String outerJarPath, final String innerJarPath) throws IOException {
+        try (final JarFile outerJar = new JarFile(outerJarPath, false /* no verify */)) {
+            final ZipEntry entry = outerJar.getEntry(innerJarPath);
+            if (entry == null) {
+                throw new NoSuchFileException("Nested jar not found: " + innerJarPath);
+            }
+            if (entry.isDirectory()) {
+                return new Extracted(
+                        new File(innerJarPath).getName(), new HashMap<>(), new Attributes(), true, () -> null);
+            }
+            try (final InputStream is = outerJar.getInputStream(entry);
+                    final JarInputStream innerJar = new JarInputStream(is, false /* no verify */)) {
+                final Map<String, Properties> pomProperties = new HashMap<>();
+                ZipEntry innerEntry;
+                while ((innerEntry = innerJar.getNextEntry()) != null) {
+                    if (innerEntry.getName().endsWith("pom.properties")) {
+                        final Properties properties = new Properties();
+                        properties.load(innerJar);
+                        pomProperties.put(innerEntry.getName(), properties);
+                    }
+                }
+                final Manifest manifest = innerJar.getManifest();
+                final Attributes attributes = (manifest == null) ? new Attributes() : manifest.getMainAttributes();
+                return new Extracted(
+                        new File(innerJarPath).getName(),
+                        pomProperties,
+                        attributes,
+                        false,
+                        () -> new NestedJarInputStream(outerJarPath, innerJarPath));
+            }
         }
-        final Manifest manifest = innerJar.getManifest();
-        final Attributes attributes =
-            (manifest == null) ? new Attributes() : manifest.getMainAttributes();
-        return new Extracted(
-            new File(innerJarPath).getName(),
-            pomProperties,
-            attributes,
-            false,
-            () -> new NestedJarInputStream(outerJarPath, innerJarPath));
-      }
     }
-  }
 
-  static class NestedJarInputStream extends InputStream implements AutoCloseable {
-    private final JarFile outerJar;
-    private final InputStream innerInputStream;
+    static class NestedJarInputStream extends InputStream implements AutoCloseable {
+        private final JarFile outerJar;
+        private final InputStream innerInputStream;
 
-    public NestedJarInputStream(final String outerPath, final String innerPath) throws IOException {
-      super();
-      this.outerJar = new JarFile(outerPath, false /* no verify */);
-      final ZipEntry entry = outerJar.getEntry(innerPath);
-      this.innerInputStream = outerJar.getInputStream(entry);
-    }
+        public NestedJarInputStream(final String outerPath, final String innerPath) throws IOException {
+            super();
+            this.outerJar = new JarFile(outerPath, false /* no verify */);
+            final ZipEntry entry = outerJar.getEntry(innerPath);
+            this.innerInputStream = outerJar.getInputStream(entry);
+        }
 
-    @Override
-    public int read() throws IOException {
-      return this.innerInputStream.read();
-    }
+        @Override
+        public int read() throws IOException {
+            return this.innerInputStream.read();
+        }
 
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-      return this.innerInputStream.read(b, off, len);
-    }
+        @Override
+        public int read(byte[] b, int off, int len) throws IOException {
+            return this.innerInputStream.read(b, off, len);
+        }
 
-    @Override
-    public void close() throws IOException {
-      this.innerInputStream.close();
-      this.outerJar.close();
+        @Override
+        public void close() throws IOException {
+            this.innerInputStream.close();
+            this.outerJar.close();
+        }
     }
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/dependency/JbossVirtualFileHelper.java b/telemetry/src/main/java/datadog/telemetry/dependency/JbossVirtualFileHelper.java
index 80b79d90ddb..ee03bab7793 100644
--- a/telemetry/src/main/java/datadog/telemetry/dependency/JbossVirtualFileHelper.java
+++ b/telemetry/src/main/java/datadog/telemetry/dependency/JbossVirtualFileHelper.java
@@ -15,109 +15,106 @@
 
 public class JbossVirtualFileHelper {
 
-  private final MethodHandle getPhysicalFile;
-  private final MethodHandle getName;
-  private final Field fileField;
-
-  private static JbossVirtualFileHelper jbossVirtualFileHelper;
-  public static final JbossVirtualFileHelper FAILED_HELPER = new JbossVirtualFileHelper();
-
-  private static final Logger log = LoggerFactory.getLogger(JbossVirtualFileHelper.class);
-
-  public JbossVirtualFileHelper(ClassLoader loader) throws Exception {
-    MethodHandles.Lookup lookup = MethodHandles.lookup();
-    Class<?> virtualFileCls = loader.loadClass("org.jboss.vfs.VirtualFile");
-    getPhysicalFile =
-        lookup.findVirtual(virtualFileCls, "getPhysicalFile", MethodType.methodType(File.class));
-    getName = lookup.findVirtual(virtualFileCls, "getName", MethodType.methodType(String.class));
-    Class<?> vfsFileUrlConnectionCls =
-        loader.loadClass("org.jboss.vfs.protocol.VirtualFileURLConnection");
-    fileField = vfsFileUrlConnectionCls.getDeclaredField("file");
-    fileField.setAccessible(true);
-  }
-
-  private JbossVirtualFileHelper() {
-    getPhysicalFile = null;
-    getName = null;
-    fileField = null;
-  }
-
-  public Object getVirtualFile(final URLConnection connection) {
-    try {
-      if (connection.getContentType() == null) {
-        return connection.getContent();
-      } else {
-        return fileField.get(connection);
-      }
-    } catch (Throwable e) {
-      throw new UndeclaredThrowableException(e);
+    private final MethodHandle getPhysicalFile;
+    private final MethodHandle getName;
+    private final Field fileField;
+
+    private static JbossVirtualFileHelper jbossVirtualFileHelper;
+    public static final JbossVirtualFileHelper FAILED_HELPER = new JbossVirtualFileHelper();
+
+    private static final Logger log = LoggerFactory.getLogger(JbossVirtualFileHelper.class);
+
+    public JbossVirtualFileHelper(ClassLoader loader) throws Exception {
+        MethodHandles.Lookup lookup = MethodHandles.lookup();
+        Class<?> virtualFileCls = loader.loadClass("org.jboss.vfs.VirtualFile");
+        getPhysicalFile = lookup.findVirtual(virtualFileCls, "getPhysicalFile", MethodType.methodType(File.class));
+        getName = lookup.findVirtual(virtualFileCls, "getName", MethodType.methodType(String.class));
+        Class<?> vfsFileUrlConnectionCls = loader.loadClass("org.jboss.vfs.protocol.VirtualFileURLConnection");
+        fileField = vfsFileUrlConnectionCls.getDeclaredField("file");
+        fileField.setAccessible(true);
     }
-  }
 
-  public File getPhysicalFile(Object virtualFile) {
-    try {
-      return (File) getPhysicalFile.invoke(virtualFile);
-    } catch (Throwable e) {
-      throw new UndeclaredThrowableException(e);
+    private JbossVirtualFileHelper() {
+        getPhysicalFile = null;
+        getName = null;
+        fileField = null;
     }
-  }
 
-  public String getName(Object virtualFile) {
-    try {
-      return (String) getName.invoke(virtualFile);
-    } catch (Throwable e) {
-      throw new UndeclaredThrowableException(e);
+    public Object getVirtualFile(final URLConnection connection) {
+        try {
+            if (connection.getContentType() == null) {
+                return connection.getContent();
+            } else {
+                return fileField.get(connection);
+            }
+        } catch (Throwable e) {
+            throw new UndeclaredThrowableException(e);
+        }
     }
-  }
 
-  public static URI getJbossVfsPath(URL location) {
-    JbossVirtualFileHelper jbossVirtualFileHelper = JbossVirtualFileHelper.jbossVirtualFileHelper;
-    if (jbossVirtualFileHelper == JbossVirtualFileHelper.FAILED_HELPER) {
-      return null;
+    public File getPhysicalFile(Object virtualFile) {
+        try {
+            return (File) getPhysicalFile.invoke(virtualFile);
+        } catch (Throwable e) {
+            throw new UndeclaredThrowableException(e);
+        }
     }
 
-    URLConnection connection;
-    try {
-      connection = location.openConnection();
-    } catch (IOException e) {
-      // silently ignored
-      return null;
-    }
-    if (connection == null) {
-      return null;
+    public String getName(Object virtualFile) {
+        try {
+            return (String) getName.invoke(virtualFile);
+        } catch (Throwable e) {
+            throw new UndeclaredThrowableException(e);
+        }
     }
 
-    if (jbossVirtualFileHelper == null) {
-      try {
-        jbossVirtualFileHelper =
-            JbossVirtualFileHelper.jbossVirtualFileHelper =
-                new JbossVirtualFileHelper(connection.getClass().getClassLoader());
-      } catch (Exception e) {
-        log.debug("Error preparing for inspection of jboss virtual files", e);
+    public static URI getJbossVfsPath(URL location) {
+        JbossVirtualFileHelper jbossVirtualFileHelper = JbossVirtualFileHelper.jbossVirtualFileHelper;
+        if (jbossVirtualFileHelper == JbossVirtualFileHelper.FAILED_HELPER) {
+            return null;
+        }
+
+        URLConnection connection;
+        try {
+            connection = location.openConnection();
+        } catch (IOException e) {
+            // silently ignored
+            return null;
+        }
+        if (connection == null) {
+            return null;
+        }
+
+        if (jbossVirtualFileHelper == null) {
+            try {
+                jbossVirtualFileHelper = JbossVirtualFileHelper.jbossVirtualFileHelper =
+                        new JbossVirtualFileHelper(connection.getClass().getClassLoader());
+            } catch (Exception e) {
+                log.debug("Error preparing for inspection of jboss virtual files", e);
+                return null;
+            }
+        }
+
+        final Object virtualFile = jbossVirtualFileHelper.getVirtualFile(connection);
+
+        // call VirtualFile.getPhysicalFile
+        File physicalFile = jbossVirtualFileHelper.getPhysicalFile(virtualFile);
+        if (physicalFile.isFile() && physicalFile.getName().endsWith(".jar")) {
+            return physicalFile.toURI();
+        } else {
+            log.debug("Physical file {} is not a jar", physicalFile);
+        }
+
+        // not sure what this is about, but it's what the old code used to do
+        // this is not correct as a general matter, since getName returns the virtual name,
+        // which may not match the physical name
+        // The original comment reads:
+        // "physical file returns 'content' folder, we manually resolve to the actual jar location"
+        String fileName = jbossVirtualFileHelper.getName(virtualFile);
+        physicalFile = new File(physicalFile.getParentFile(), fileName);
+        if (physicalFile.isFile()) {
+            return physicalFile.toURI();
+        }
         return null;
-      }
-    }
-
-    final Object virtualFile = jbossVirtualFileHelper.getVirtualFile(connection);
-
-    // call VirtualFile.getPhysicalFile
-    File physicalFile = jbossVirtualFileHelper.getPhysicalFile(virtualFile);
-    if (physicalFile.isFile() && physicalFile.getName().endsWith(".jar")) {
-      return physicalFile.toURI();
-    } else {
-      log.debug("Physical file {} is not a jar", physicalFile);
-    }
-
-    // not sure what this is about, but it's what the old code used to do
-    // this is not correct as a general matter, since getName returns the virtual name,
-    // which may not match the physical name
-    // The original comment reads:
-    // "physical file returns 'content' folder, we manually resolve to the actual jar location"
-    String fileName = jbossVirtualFileHelper.getName(virtualFile);
-    physicalFile = new File(physicalFile.getParentFile(), fileName);
-    if (physicalFile.isFile()) {
-      return physicalFile.toURI();
     }
-    return null;
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/dependency/LocationsCollectingTransformer.java b/telemetry/src/main/java/datadog/telemetry/dependency/LocationsCollectingTransformer.java
index a001917dab6..4e1cb81cea0 100644
--- a/telemetry/src/main/java/datadog/telemetry/dependency/LocationsCollectingTransformer.java
+++ b/telemetry/src/main/java/datadog/telemetry/dependency/LocationsCollectingTransformer.java
@@ -10,39 +10,38 @@
 import org.slf4j.LoggerFactory;
 
 class LocationsCollectingTransformer implements ClassFileTransformer {
-  private static final Logger log = LoggerFactory.getLogger(LocationsCollectingTransformer.class);
+    private static final Logger log = LoggerFactory.getLogger(LocationsCollectingTransformer.class);
 
-  private static final int MAX_CACHED_JARS = 1024;
-  private final DependencyService dependencyService;
-  private final DDCache<ProtectionDomain, Boolean> seenDomains =
-      DDCaches.newFixedSizeWeakKeyCache(MAX_CACHED_JARS);
+    private static final int MAX_CACHED_JARS = 1024;
+    private final DependencyService dependencyService;
+    private final DDCache<ProtectionDomain, Boolean> seenDomains = DDCaches.newFixedSizeWeakKeyCache(MAX_CACHED_JARS);
 
-  public LocationsCollectingTransformer(DependencyService dependencyService) {
-    this.dependencyService = dependencyService;
-  }
+    public LocationsCollectingTransformer(DependencyService dependencyService) {
+        this.dependencyService = dependencyService;
+    }
 
-  @Override
-  public byte[] transform(
-      ClassLoader loader,
-      String className,
-      Class<?> classBeingRedefined,
-      ProtectionDomain protectionDomain,
-      byte[] classfileBuffer) {
-    if (protectionDomain != null) {
-      seenDomains.computeIfAbsent(protectionDomain, this::addDependency);
+    @Override
+    public byte[] transform(
+            ClassLoader loader,
+            String className,
+            Class<?> classBeingRedefined,
+            ProtectionDomain protectionDomain,
+            byte[] classfileBuffer) {
+        if (protectionDomain != null) {
+            seenDomains.computeIfAbsent(protectionDomain, this::addDependency);
+        }
+        // returning 'null' is the best way to indicate that no transformation has been done.
+        return null;
     }
-    // returning 'null' is the best way to indicate that no transformation has been done.
-    return null;
-  }
 
-  private boolean addDependency(final ProtectionDomain domain) {
-    final CodeSource codeSource = domain.getCodeSource();
-    final URL location = codeSource != null ? codeSource.getLocation() : null;
-    final ClassLoader classLoader = domain.getClassLoader();
-    log.debug("New protection domain with location {} and class loader {}", location, classLoader);
-    if (location != null) {
-      dependencyService.addURL(location);
+    private boolean addDependency(final ProtectionDomain domain) {
+        final CodeSource codeSource = domain.getCodeSource();
+        final URL location = codeSource != null ? codeSource.getLocation() : null;
+        final ClassLoader classLoader = domain.getClassLoader();
+        log.debug("New protection domain with location {} and class loader {}", location, classLoader);
+        if (location != null) {
+            dependencyService.addURL(location);
+        }
+        return true;
     }
-    return true;
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/endpoint/EndpointPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/endpoint/EndpointPeriodicAction.java
index f555dfefb40..acd340d9608 100644
--- a/telemetry/src/main/java/datadog/telemetry/endpoint/EndpointPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/endpoint/EndpointPeriodicAction.java
@@ -8,50 +8,50 @@
 
 public class EndpointPeriodicAction implements TelemetryRunnable.TelemetryPeriodicAction {
 
-  private final EndpointCollector collector;
-
-  public EndpointPeriodicAction() {
-    this(EndpointCollector.get());
-  }
-
-  public EndpointPeriodicAction(EndpointCollector collector) {
-    this.collector = collector;
-  }
-
-  @Override
-  public void doIteration(final TelemetryService service) {
-    for (final Iterator<Endpoint> it = collector.drain(); it.hasNext(); ) {
-      final Endpoint endpoint = it.next();
-      if (!service.addEndpoint(endpoint)) {
-        collector.supplier(new HeadAndTailIterator(endpoint, it)); // try again latter
-        break;
-      }
-    }
-  }
+    private final EndpointCollector collector;
 
-  private static final class HeadAndTailIterator implements Iterator<Endpoint> {
-    private final Endpoint head;
-    private final Iterator<Endpoint> tail;
-    private boolean first;
+    public EndpointPeriodicAction() {
+        this(EndpointCollector.get());
+    }
 
-    private HeadAndTailIterator(final Endpoint head, final Iterator<Endpoint> tail) {
-      this.head = head;
-      this.tail = tail;
-      first = true;
+    public EndpointPeriodicAction(EndpointCollector collector) {
+        this.collector = collector;
     }
 
     @Override
-    public boolean hasNext() {
-      return first || tail.hasNext();
+    public void doIteration(final TelemetryService service) {
+        for (final Iterator<Endpoint> it = collector.drain(); it.hasNext(); ) {
+            final Endpoint endpoint = it.next();
+            if (!service.addEndpoint(endpoint)) {
+                collector.supplier(new HeadAndTailIterator(endpoint, it)); // try again latter
+                break;
+            }
+        }
     }
 
-    @Override
-    public Endpoint next() {
-      if (first) {
-        first = false;
-        return head;
-      }
-      return tail.next();
+    private static final class HeadAndTailIterator implements Iterator<Endpoint> {
+        private final Endpoint head;
+        private final Iterator<Endpoint> tail;
+        private boolean first;
+
+        private HeadAndTailIterator(final Endpoint head, final Iterator<Endpoint> tail) {
+            this.head = head;
+            this.tail = tail;
+            first = true;
+        }
+
+        @Override
+        public boolean hasNext() {
+            return first || tail.hasNext();
+        }
+
+        @Override
+        public Endpoint next() {
+            if (first) {
+                first = false;
+                return head;
+            }
+            return tail.next();
+        }
     }
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/integration/IntegrationPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/integration/IntegrationPeriodicAction.java
index 2e5b8b2b25f..4d630f8f8ce 100644
--- a/telemetry/src/main/java/datadog/telemetry/integration/IntegrationPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/integration/IntegrationPeriodicAction.java
@@ -8,14 +8,14 @@
 
 public class IntegrationPeriodicAction implements TelemetryRunnable.TelemetryPeriodicAction {
 
-  @Override
-  public void doIteration(TelemetryService service) {
-    Map<String, Boolean> integrations = IntegrationsCollector.get().drain();
+    @Override
+    public void doIteration(TelemetryService service) {
+        Map<String, Boolean> integrations = IntegrationsCollector.get().drain();
 
-    for (Map.Entry<String, Boolean> entry : integrations.entrySet()) {
-      String name = entry.getKey();
-      Boolean enabled = entry.getValue();
-      service.addIntegration(new Integration(name, Boolean.TRUE.equals(enabled)));
+        for (Map.Entry<String, Boolean> entry : integrations.entrySet()) {
+            String name = entry.getKey();
+            Boolean enabled = entry.getValue();
+            service.addIntegration(new Integration(name, Boolean.TRUE.equals(enabled)));
+        }
     }
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/log/LogPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/log/LogPeriodicAction.java
index e949782b4ba..67ac846769e 100644
--- a/telemetry/src/main/java/datadog/telemetry/log/LogPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/log/LogPeriodicAction.java
@@ -8,129 +8,120 @@
 
 public class LogPeriodicAction implements TelemetryRunnable.TelemetryPeriodicAction {
 
-  /**
-   * The current list of packages passed in is small, but if it kept growing and this did become a
-   * performance issue then we could consider using ClassNameTrie instead (ie. use the builder to
-   * create the trie and store it as a constant in LogPeriodicAction to be passed in here and used
-   * as a filter)
-   */
-  static final String[] PACKAGE_ALLOW_LIST = {
-    "datadog.",
-    "com.datadog.",
-    "java.",
-    "javax.",
-    "jakarta.",
-    "jdk.",
-    "sun.",
-    "com.sun.",
-    "com.datadog.ddwaf."
-  };
-
-  private static final String UNKNOWN = "<unknown>";
-
-  @Override
-  public void doIteration(TelemetryService service) {
-    for (LogCollector.RawLogMessage rawLogMsg : LogCollector.get().drain()) {
-
-      LogMessage logMessage =
-          new LogMessage()
-              .message(rawLogMsg.message)
-              .tracerTime(rawLogMsg.timestamp)
-              .tags(rawLogMsg.tags)
-              .count(rawLogMsg.count);
-
-      if (rawLogMsg.logLevel != null) {
-        logMessage.level(LogMessageLevel.fromString(rawLogMsg.logLevel));
-      }
-
-      if (rawLogMsg.throwable != null) {
-        logMessage.stackTrace(renderStackTrace(rawLogMsg.throwable));
-      }
-
-      service.addLogMessage(logMessage);
-    }
-  }
-
-  private static String renderStackTrace(Throwable t) {
-    StringBuilder result = new StringBuilder();
-
-    StackTraceElement[] previousStackTrace = null;
-
-    while (t != null) {
-      String name = t.getClass().getCanonicalName();
-      if (name == null || name.isEmpty()) {
-        result.append(UNKNOWN);
-      } else {
-        result.append(name);
-      }
-      result.append('\n');
-
-      final StackTraceElement[] stacktrace = t.getStackTrace();
-      int pendingRedacted = 0;
-      if (stacktrace != null) {
-        int commonFrames = 0;
-        if (previousStackTrace != null) {
-          commonFrames = countCommonFrames(previousStackTrace, stacktrace);
-        }
-        int maxIndex = stacktrace.length - commonFrames;
-
-        for (int i = 0; i < maxIndex; i++) {
-          final StackTraceElement frame = stacktrace[i];
-          final String className = frame.getClassName();
-          if (shouldRedactClass(className)) {
-            pendingRedacted++;
-          } else {
-            writePendingRedacted(result, pendingRedacted);
-            pendingRedacted = 0;
-            result.append("  at ").append(frame).append('\n');
-          }
+    /**
+     * The current list of packages passed in is small, but if it kept growing and this did become a
+     * performance issue then we could consider using ClassNameTrie instead (ie. use the builder to
+     * create the trie and store it as a constant in LogPeriodicAction to be passed in here and used
+     * as a filter)
+     */
+    static final String[] PACKAGE_ALLOW_LIST = {
+        "datadog.", "com.datadog.", "java.", "javax.", "jakarta.", "jdk.", "sun.", "com.sun.", "com.datadog.ddwaf."
+    };
+
+    private static final String UNKNOWN = "<unknown>";
+
+    @Override
+    public void doIteration(TelemetryService service) {
+        for (LogCollector.RawLogMessage rawLogMsg : LogCollector.get().drain()) {
+
+            LogMessage logMessage = new LogMessage()
+                    .message(rawLogMsg.message)
+                    .tracerTime(rawLogMsg.timestamp)
+                    .tags(rawLogMsg.tags)
+                    .count(rawLogMsg.count);
+
+            if (rawLogMsg.logLevel != null) {
+                logMessage.level(LogMessageLevel.fromString(rawLogMsg.logLevel));
+            }
+
+            if (rawLogMsg.throwable != null) {
+                logMessage.stackTrace(renderStackTrace(rawLogMsg.throwable));
+            }
+
+            service.addLogMessage(logMessage);
         }
-        writePendingRedacted(result, pendingRedacted);
+    }
 
-        if (commonFrames > 0) {
-          result.append("  ... ").append(commonFrames).append(" more\n");
+    private static String renderStackTrace(Throwable t) {
+        StringBuilder result = new StringBuilder();
+
+        StackTraceElement[] previousStackTrace = null;
+
+        while (t != null) {
+            String name = t.getClass().getCanonicalName();
+            if (name == null || name.isEmpty()) {
+                result.append(UNKNOWN);
+            } else {
+                result.append(name);
+            }
+            result.append('\n');
+
+            final StackTraceElement[] stacktrace = t.getStackTrace();
+            int pendingRedacted = 0;
+            if (stacktrace != null) {
+                int commonFrames = 0;
+                if (previousStackTrace != null) {
+                    commonFrames = countCommonFrames(previousStackTrace, stacktrace);
+                }
+                int maxIndex = stacktrace.length - commonFrames;
+
+                for (int i = 0; i < maxIndex; i++) {
+                    final StackTraceElement frame = stacktrace[i];
+                    final String className = frame.getClassName();
+                    if (shouldRedactClass(className)) {
+                        pendingRedacted++;
+                    } else {
+                        writePendingRedacted(result, pendingRedacted);
+                        pendingRedacted = 0;
+                        result.append("  at ").append(frame).append('\n');
+                    }
+                }
+                writePendingRedacted(result, pendingRedacted);
+
+                if (commonFrames > 0) {
+                    result.append("  ... ").append(commonFrames).append(" more\n");
+                }
+            }
+
+            previousStackTrace = stacktrace;
+            t = t.getCause();
+            if (t != null) {
+                result.append("Caused by: ");
+            }
         }
-      }
 
-      previousStackTrace = stacktrace;
-      t = t.getCause();
-      if (t != null) {
-        result.append("Caused by: ");
-      }
+        return result.toString();
     }
 
-    return result.toString();
-  }
-
-  private static int countCommonFrames(
-      StackTraceElement[] previousStackTrace, StackTraceElement[] currentStackTrace) {
-    int previousIndex = previousStackTrace.length - 1;
-    int currentIndex = currentStackTrace.length - 1;
-    int count = 0;
-    while (previousIndex >= 0
-        && currentIndex >= 0
-        && previousStackTrace[previousIndex].equals(currentStackTrace[currentIndex])) {
-      count++;
-      previousIndex--;
-      currentIndex--;
+    private static int countCommonFrames(
+            StackTraceElement[] previousStackTrace, StackTraceElement[] currentStackTrace) {
+        int previousIndex = previousStackTrace.length - 1;
+        int currentIndex = currentStackTrace.length - 1;
+        int count = 0;
+        while (previousIndex >= 0
+                && currentIndex >= 0
+                && previousStackTrace[previousIndex].equals(currentStackTrace[currentIndex])) {
+            count++;
+            previousIndex--;
+            currentIndex--;
+        }
+        return count;
     }
-    return count;
-  }
-
-  private static boolean shouldRedactClass(final String className) {
-    for (final String prefix : PACKAGE_ALLOW_LIST) {
-      if (className.startsWith(prefix)) {
-        return false;
-      }
+
+    private static boolean shouldRedactClass(final String className) {
+        for (final String prefix : PACKAGE_ALLOW_LIST) {
+            if (className.startsWith(prefix)) {
+                return false;
+            }
+        }
+        return true;
     }
-    return true;
-  }
-
-  private static void writePendingRedacted(final StringBuilder result, final int pendingRedacted) {
-    if (pendingRedacted == 1) {
-      result.append("  at ").append("(redacted)\n");
-    } else if (pendingRedacted > 1) {
-      result.append("  at (redacted: ").append(pendingRedacted).append(" frames)\n");
+
+    private static void writePendingRedacted(final StringBuilder result, final int pendingRedacted) {
+        if (pendingRedacted == 1) {
+            result.append("  at ").append("(redacted)\n");
+        } else if (pendingRedacted > 1) {
+            result.append("  at (redacted: ").append(pendingRedacted).append(" frames)\n");
+        }
     }
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/metric/CiVisibilityMetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/CiVisibilityMetricPeriodicAction.java
index 15d40436a89..845ef61e076 100644
--- a/telemetry/src/main/java/datadog/telemetry/metric/CiVisibilityMetricPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/metric/CiVisibilityMetricPeriodicAction.java
@@ -5,9 +5,9 @@
 import javax.annotation.Nonnull;
 
 public class CiVisibilityMetricPeriodicAction extends MetricPeriodicAction {
-  @Nonnull
-  @Override
-  public MetricCollector collector() {
-    return InstrumentationBridge.getMetricCollector();
-  }
+    @Nonnull
+    @Override
+    public MetricCollector collector() {
+        return InstrumentationBridge.getMetricCollector();
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/metric/ConfigInversionMetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/ConfigInversionMetricPeriodicAction.java
index d115aa9abeb..9a58f68986f 100644
--- a/telemetry/src/main/java/datadog/telemetry/metric/ConfigInversionMetricPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/metric/ConfigInversionMetricPeriodicAction.java
@@ -5,9 +5,9 @@
 import javax.annotation.Nonnull;
 
 public class ConfigInversionMetricPeriodicAction extends MetricPeriodicAction {
-  @Override
-  @Nonnull
-  public MetricCollector collector() {
-    return ConfigInversionMetricCollectorImpl.getInstance();
-  }
+    @Override
+    @Nonnull
+    public MetricCollector collector() {
+        return ConfigInversionMetricCollectorImpl.getInstance();
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/metric/CoreMetricsPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/CoreMetricsPeriodicAction.java
index f7475929ba7..9d306d9f03e 100644
--- a/telemetry/src/main/java/datadog/telemetry/metric/CoreMetricsPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/metric/CoreMetricsPeriodicAction.java
@@ -5,9 +5,9 @@
 import javax.annotation.Nonnull;
 
 public class CoreMetricsPeriodicAction extends MetricPeriodicAction {
-  @Nonnull
-  @Override
-  public MetricCollector collector() {
-    return CoreMetricCollector.getInstance();
-  }
+    @Nonnull
+    @Override
+    public MetricCollector collector() {
+        return CoreMetricCollector.getInstance();
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/metric/DebuggerMetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/DebuggerMetricPeriodicAction.java
index 00ddf9a8554..b883b06208f 100644
--- a/telemetry/src/main/java/datadog/telemetry/metric/DebuggerMetricPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/metric/DebuggerMetricPeriodicAction.java
@@ -5,8 +5,8 @@
 
 public class DebuggerMetricPeriodicAction extends MetricPeriodicAction {
 
-  @Override
-  public MetricCollector collector() {
-    return DebuggerMetricCollector.get();
-  }
+    @Override
+    public MetricCollector collector() {
+        return DebuggerMetricCollector.get();
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/metric/IastMetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/IastMetricPeriodicAction.java
index a4f434f5b82..ca32d893317 100644
--- a/telemetry/src/main/java/datadog/telemetry/metric/IastMetricPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/metric/IastMetricPeriodicAction.java
@@ -6,9 +6,9 @@
 
 public class IastMetricPeriodicAction extends MetricPeriodicAction {
 
-  @Override
-  @Nonnull
-  public MetricCollector collector() {
-    return IastMetricCollector.get();
-  }
+    @Override
+    @Nonnull
+    public MetricCollector collector() {
+        return IastMetricCollector.get();
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/metric/LLMObsMetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/LLMObsMetricPeriodicAction.java
index 91e3cb69eec..0150ba3e5c9 100644
--- a/telemetry/src/main/java/datadog/telemetry/metric/LLMObsMetricPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/metric/LLMObsMetricPeriodicAction.java
@@ -5,9 +5,9 @@
 import javax.annotation.Nonnull;
 
 public class LLMObsMetricPeriodicAction extends MetricPeriodicAction {
-  @Nonnull
-  @Override
-  public MetricCollector collector() {
-    return LLMObsMetricCollector.get();
-  }
+    @Nonnull
+    @Override
+    public MetricCollector collector() {
+        return LLMObsMetricCollector.get();
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/metric/MetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/MetricPeriodicAction.java
index 579eb6c761d..c9776d0364b 100644
--- a/telemetry/src/main/java/datadog/telemetry/metric/MetricPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/metric/MetricPeriodicAction.java
@@ -12,71 +12,68 @@
 import javax.annotation.Nonnull;
 
 public abstract class MetricPeriodicAction implements TelemetryRunnable.TelemetryPeriodicAction {
-  @Override
-  public final void doIteration(final TelemetryService service) {
-    final Collection<MetricCollector.Metric> rawMetrics = collector().drain();
-    // Convert raw metrics to telemetry metrics and join points of common metrics
-    toTelemetryMetrics(rawMetrics).forEach(service::addMetric);
+    @Override
+    public final void doIteration(final TelemetryService service) {
+        final Collection<MetricCollector.Metric> rawMetrics = collector().drain();
+        // Convert raw metrics to telemetry metrics and join points of common metrics
+        toTelemetryMetrics(rawMetrics).forEach(service::addMetric);
 
-    Collection<MetricCollector.DistributionSeriesPoint> rawDistributionSeriesPoints =
-        collector().drainDistributionSeries();
-    toDistributionSeries(rawDistributionSeriesPoints).forEach(service::addDistributionSeries);
-  }
+        Collection<MetricCollector.DistributionSeriesPoint> rawDistributionSeriesPoints =
+                collector().drainDistributionSeries();
+        toDistributionSeries(rawDistributionSeriesPoints).forEach(service::addDistributionSeries);
+    }
 
-  @Nonnull
-  public abstract MetricCollector<MetricCollector.Metric> collector();
+    @Nonnull
+    public abstract MetricCollector<MetricCollector.Metric> collector();
 
-  private Collection<Metric> toTelemetryMetrics(final Collection<MetricCollector.Metric> metrics) {
-    // Use an intermediate map to quickly find telemetry metric related to a metric
-    Map<MetricCollector.Metric, Metric> telemetryMetrics = new HashMap<>();
-    // Aggregate equal metrics into a single telemetry metric with multiple points
-    for (MetricCollector.Metric metric : metrics) {
-      Metric telemetryMetric =
-          telemetryMetrics.computeIfAbsent(metric, this::convertToTelemetryMetric);
-      ArrayList<Number> point = new ArrayList<>(2);
-      point.add(metric.timestamp);
-      point.add(metric.value);
-      telemetryMetric.addPointsItem(point);
+    private Collection<Metric> toTelemetryMetrics(final Collection<MetricCollector.Metric> metrics) {
+        // Use an intermediate map to quickly find telemetry metric related to a metric
+        Map<MetricCollector.Metric, Metric> telemetryMetrics = new HashMap<>();
+        // Aggregate equal metrics into a single telemetry metric with multiple points
+        for (MetricCollector.Metric metric : metrics) {
+            Metric telemetryMetric = telemetryMetrics.computeIfAbsent(metric, this::convertToTelemetryMetric);
+            ArrayList<Number> point = new ArrayList<>(2);
+            point.add(metric.timestamp);
+            point.add(metric.value);
+            telemetryMetric.addPointsItem(point);
+        }
+        return telemetryMetrics.values();
     }
-    return telemetryMetrics.values();
-  }
 
-  private Metric convertToTelemetryMetric(MetricCollector.Metric raw) {
-    return new Metric()
-        .namespace(raw.namespace)
-        .metric(raw.metricName)
-        .type(typeFromValue(raw.type))
-        .common(raw.common)
-        .tags(raw.tags);
-  }
+    private Metric convertToTelemetryMetric(MetricCollector.Metric raw) {
+        return new Metric()
+                .namespace(raw.namespace)
+                .metric(raw.metricName)
+                .type(typeFromValue(raw.type))
+                .common(raw.common)
+                .tags(raw.tags);
+    }
 
-  private static Metric.TypeEnum typeFromValue(String value) {
-    for (Metric.TypeEnum typeEnum : Metric.TypeEnum.values()) {
-      if (typeEnum.value().equals(value)) {
-        return typeEnum;
-      }
+    private static Metric.TypeEnum typeFromValue(String value) {
+        for (Metric.TypeEnum typeEnum : Metric.TypeEnum.values()) {
+            if (typeEnum.value().equals(value)) {
+                return typeEnum;
+            }
+        }
+        throw new IllegalArgumentException("Invalid metric type value: " + value);
     }
-    throw new IllegalArgumentException("Invalid metric type value: " + value);
-  }
 
-  private Collection<DistributionSeries> toDistributionSeries(
-      Collection<MetricCollector.DistributionSeriesPoint> rawDistributionSeriesPoints) {
-    Map<MetricCollector.DistributionSeriesPoint, DistributionSeries> distributionSeries =
-        new HashMap<>();
-    for (MetricCollector.DistributionSeriesPoint point : rawDistributionSeriesPoints) {
-      distributionSeries
-          .computeIfAbsent(point, this::convertToDistributionSeries)
-          .addPoint(point.value);
+    private Collection<DistributionSeries> toDistributionSeries(
+            Collection<MetricCollector.DistributionSeriesPoint> rawDistributionSeriesPoints) {
+        Map<MetricCollector.DistributionSeriesPoint, DistributionSeries> distributionSeries = new HashMap<>();
+        for (MetricCollector.DistributionSeriesPoint point : rawDistributionSeriesPoints) {
+            distributionSeries
+                    .computeIfAbsent(point, this::convertToDistributionSeries)
+                    .addPoint(point.value);
+        }
+        return distributionSeries.values();
     }
-    return distributionSeries.values();
-  }
 
-  private DistributionSeries convertToDistributionSeries(
-      MetricCollector.DistributionSeriesPoint point) {
-    return new DistributionSeries()
-        .namespace(point.namespace)
-        .metric(point.metricName)
-        .common(point.common)
-        .tags(point.tags);
-  }
+    private DistributionSeries convertToDistributionSeries(MetricCollector.DistributionSeriesPoint point) {
+        return new DistributionSeries()
+                .namespace(point.namespace)
+                .metric(point.metricName)
+                .common(point.common)
+                .tags(point.tags);
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/metric/OtelEnvMetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/OtelEnvMetricPeriodicAction.java
index 2729d48ff2d..cef60fd7444 100644
--- a/telemetry/src/main/java/datadog/telemetry/metric/OtelEnvMetricPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/metric/OtelEnvMetricPeriodicAction.java
@@ -5,9 +5,9 @@
 import javax.annotation.Nonnull;
 
 public class OtelEnvMetricPeriodicAction extends MetricPeriodicAction {
-  @Override
-  @Nonnull
-  public MetricCollector collector() {
-    return OtelEnvMetricCollectorImpl.getInstance();
-  }
+    @Override
+    @Nonnull
+    public MetricCollector collector() {
+        return OtelEnvMetricCollectorImpl.getInstance();
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/metric/OtelSpiMetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/OtelSpiMetricPeriodicAction.java
index 6016f71d195..180291ae4c2 100644
--- a/telemetry/src/main/java/datadog/telemetry/metric/OtelSpiMetricPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/metric/OtelSpiMetricPeriodicAction.java
@@ -5,9 +5,9 @@
 import javax.annotation.Nonnull;
 
 public class OtelSpiMetricPeriodicAction extends MetricPeriodicAction {
-  @Override
-  @Nonnull
-  public MetricCollector collector() {
-    return OtelSpiCollector.getInstance();
-  }
+    @Override
+    @Nonnull
+    public MetricCollector collector() {
+        return OtelSpiCollector.getInstance();
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/metric/OtlpTelemetryPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/OtlpTelemetryPeriodicAction.java
index 0464a353541..c84f0c703bb 100644
--- a/telemetry/src/main/java/datadog/telemetry/metric/OtlpTelemetryPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/metric/OtlpTelemetryPeriodicAction.java
@@ -6,9 +6,9 @@
 
 public class OtlpTelemetryPeriodicAction extends MetricPeriodicAction {
 
-  @Override
-  @Nonnull
-  public MetricCollector collector() {
-    return OtlpTelemetry.getInstance();
-  }
+    @Override
+    @Nonnull
+    public MetricCollector collector() {
+        return OtlpTelemetry.getInstance();
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/metric/WafMetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/WafMetricPeriodicAction.java
index 90dcedc9f97..d9da44920a3 100644
--- a/telemetry/src/main/java/datadog/telemetry/metric/WafMetricPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/metric/WafMetricPeriodicAction.java
@@ -6,9 +6,9 @@
 
 public class WafMetricPeriodicAction extends MetricPeriodicAction {
 
-  @Override
-  @Nonnull
-  public MetricCollector collector() {
-    return WafMetricCollector.get();
-  }
+    @Override
+    @Nonnull
+    public MetricCollector collector() {
+        return WafMetricCollector.get();
+    }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/products/ProductChangeAction.java b/telemetry/src/main/java/datadog/telemetry/products/ProductChangeAction.java
index 534044539e4..80910383a7a 100644
--- a/telemetry/src/main/java/datadog/telemetry/products/ProductChangeAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/products/ProductChangeAction.java
@@ -8,11 +8,11 @@
 
 public class ProductChangeAction implements TelemetryRunnable.TelemetryPeriodicAction {
 
-  @Override
-  public void doIteration(TelemetryService service) {
-    List<ProductChange> productChanges = ProductChangeCollector.get().drain();
-    for (ProductChange productChange : productChanges) {
-      service.addProductChange(productChange);
+    @Override
+    public void doIteration(TelemetryService service) {
+        List<ProductChange> productChanges = ProductChangeCollector.get().drain();
+        for (ProductChange productChange : productChanges) {
+            service.addProductChange(productChange);
+        }
     }
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/rum/RumPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/rum/RumPeriodicAction.java
index afcd8872933..f4fea0db5c7 100644
--- a/telemetry/src/main/java/datadog/telemetry/rum/RumPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/rum/RumPeriodicAction.java
@@ -12,47 +12,45 @@
 /** RUM version of IntegrationPeriodicAction that sends RUM telemetry metrics. */
 public class RumPeriodicAction implements TelemetryRunnable.TelemetryPeriodicAction {
 
-  private final RumTelemetryCollector telemetryCollector;
-
-  public RumPeriodicAction(RumTelemetryCollector telemetryCollector) {
-    this.telemetryCollector = telemetryCollector;
-  }
-
-  @Override
-  public void doIteration(TelemetryService service) {
-    Collection<MetricCollector.Metric> counts = telemetryCollector.drain();
-    for (MetricCollector.Metric metric : counts) {
-      Metric telemetryMetric = convertToTelemetryMetric(metric);
-      service.addMetric(telemetryMetric);
+    private final RumTelemetryCollector telemetryCollector;
+
+    public RumPeriodicAction(RumTelemetryCollector telemetryCollector) {
+        this.telemetryCollector = telemetryCollector;
+    }
+
+    @Override
+    public void doIteration(TelemetryService service) {
+        Collection<MetricCollector.Metric> counts = telemetryCollector.drain();
+        for (MetricCollector.Metric metric : counts) {
+            Metric telemetryMetric = convertToTelemetryMetric(metric);
+            service.addMetric(telemetryMetric);
+        }
+
+        Collection<MetricCollector.DistributionSeriesPoint> distributions =
+                telemetryCollector.drainDistributionSeries();
+        for (MetricCollector.DistributionSeriesPoint distribution : distributions) {
+            DistributionSeries telemetryDistribution = convertToDistributionSeries(distribution);
+            service.addDistributionSeries(telemetryDistribution);
+        }
+    }
+
+    private Metric convertToTelemetryMetric(MetricCollector.Metric raw) {
+        return new Metric()
+                .namespace(raw.namespace)
+                .metric(raw.metricName)
+                .type(Metric.TypeEnum.COUNT)
+                .common(raw.common)
+                .tags(raw.tags)
+                .addPointsItem(Arrays.asList(raw.timestamp, raw.value));
     }
 
-    Collection<MetricCollector.DistributionSeriesPoint> distributions =
-        telemetryCollector.drainDistributionSeries();
-    for (MetricCollector.DistributionSeriesPoint distribution : distributions) {
-      DistributionSeries telemetryDistribution = convertToDistributionSeries(distribution);
-      service.addDistributionSeries(telemetryDistribution);
+    private DistributionSeries convertToDistributionSeries(MetricCollector.DistributionSeriesPoint point) {
+        DistributionSeries distribution = new DistributionSeries()
+                .namespace(point.namespace)
+                .metric(point.metricName)
+                .common(point.common)
+                .tags(point.tags);
+        distribution.addPoint(point.value);
+        return distribution;
     }
-  }
-
-  private Metric convertToTelemetryMetric(MetricCollector.Metric raw) {
-    return new Metric()
-        .namespace(raw.namespace)
-        .metric(raw.metricName)
-        .type(Metric.TypeEnum.COUNT)
-        .common(raw.common)
-        .tags(raw.tags)
-        .addPointsItem(Arrays.asList(raw.timestamp, raw.value));
-  }
-
-  private DistributionSeries convertToDistributionSeries(
-      MetricCollector.DistributionSeriesPoint point) {
-    DistributionSeries distribution =
-        new DistributionSeries()
-            .namespace(point.namespace)
-            .metric(point.metricName)
-            .common(point.common)
-            .tags(point.tags);
-    distribution.addPoint(point.value);
-    return distribution;
-  }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/sca/ScaReachabilityPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/sca/ScaReachabilityPeriodicAction.java
index b1dd6b416a9..ae2f6220059 100644
--- a/telemetry/src/main/java/datadog/telemetry/sca/ScaReachabilityPeriodicAction.java
+++ b/telemetry/src/main/java/datadog/telemetry/sca/ScaReachabilityPeriodicAction.java
@@ -50,192 +50,186 @@
  * it pending again. This prevents emitting {@code metadata:[]} and overwriting the CVE state the
  * backend already received.
  */
-public final class ScaReachabilityPeriodicAction
-    implements TelemetryRunnable.TelemetryPeriodicAction {
+public final class ScaReachabilityPeriodicAction implements TelemetryRunnable.TelemetryPeriodicAction {
 
-  private final DependencyService dependencyService;
+    private final DependencyService dependencyService;
 
-  /**
-   * Persistent across heartbeats: accumulates every dep resolved by {@link DependencyService}.
-   * Keyed by {@link ScaReachabilityDependencyRegistry#depKey(String, String)}.
-   *
-   * <p>This cache allows Step 3 to enrich CVE snapshots with {@code source} and {@code hash} even
-   * when the dep was drained from {@link DependencyService} in an earlier heartbeat than the CVE
-   * hit.
-   */
-  private final Map<String, Dependency> knownDeps = new HashMap<>();
+    /**
+     * Persistent across heartbeats: accumulates every dep resolved by {@link DependencyService}.
+     * Keyed by {@link ScaReachabilityDependencyRegistry#depKey(String, String)}.
+     *
+     * <p>This cache allows Step 3 to enrich CVE snapshots with {@code source} and {@code hash} even
+     * when the dep was drained from {@link DependencyService} in an earlier heartbeat than the CVE
+     * hit.
+     */
+    private final Map<String, Dependency> knownDeps = new HashMap<>();
 
-  public ScaReachabilityPeriodicAction(DependencyService dependencyService) {
-    this.dependencyService = dependencyService;
-  }
-
-  /**
-   * Pre-populates {@link #knownDeps} with a dep entry. Used in tests to simulate a dep that was
-   * resolved by {@link DependencyService} in a prior heartbeat without running a full iteration.
-   */
-  @VisibleForTesting
-  void addKnownDepForTesting(String name, String version) {
-    knownDeps.put(
-        ScaReachabilityDependencyRegistry.depKey(name, version),
-        new Dependency(name, version, null, null));
-  }
-
-  @Override
-  public void doIteration(TelemetryService telService) {
-    // Trigger pending retransformations (method-level symbols on already-loaded classes, or
-    // classes where JAR version resolution failed at load time and needs a retry).
-    Runnable work = ScaReachabilityDependencyRegistry.INSTANCE.getPeriodicWorkCallback();
-    if (work != null) {
-      work.run();
+    public ScaReachabilityPeriodicAction(DependencyService dependencyService) {
+        this.dependencyService = dependencyService;
     }
 
-    // Step 1: drain registry → map keyed by "artifact@version" for O(1) lookup below.
-    List<DependencySnapshot> pending =
-        ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
-    Map<String, DependencySnapshot> snapshotByKey = new HashMap<>(pending.size() * 2);
-    for (DependencySnapshot snapshot : pending) {
-      snapshotByKey.put(
-          ScaReachabilityDependencyRegistry.depKey(snapshot.artifact, snapshot.version), snapshot);
+    /**
+     * Pre-populates {@link #knownDeps} with a dep entry. Used in tests to simulate a dep that was
+     * resolved by {@link DependencyService} in a prior heartbeat without running a full iteration.
+     */
+    @VisibleForTesting
+    void addKnownDepForTesting(String name, String version) {
+        knownDeps.put(
+                ScaReachabilityDependencyRegistry.depKey(name, version), new Dependency(name, version, null, null));
     }
 
-    // Step 2: drain DependencyService (newly detected JARs this heartbeat).
-    // Store each dep in knownDeps regardless of whether it has a CVE match — future heartbeats
-    // with CVE hits will look it up in Step 3.
-    if (dependencyService != null) {
-      for (Dependency dep : dependencyService.drainDeterminedDependencies()) {
-        String key = ScaReachabilityDependencyRegistry.depKey(dep.name, dep.version);
-        Dependency previous = knownDeps.put(key, dep);
-        DependencySnapshot snapshot = snapshotByKey.remove(key);
-        if (snapshot == null && isNewPhysicalCopy(previous, dep)) {
-          // First detection of this physical JAR: peek CVE state so we can enrich the emission
-          // instead of overwriting the backend's state with metadata:[]. Skip when the same
-          // physical copy is re-detected (same source/hash from a different classloader) —
-          // peekSnapshot would re-emit a stale hit already reported.
-          snapshot = ScaReachabilityDependencyRegistry.INSTANCE.peekSnapshot(dep.name, dep.version);
+    @Override
+    public void doIteration(TelemetryService telService) {
+        // Trigger pending retransformations (method-level symbols on already-loaded classes, or
+        // classes where JAR version resolution failed at load time and needs a retry).
+        Runnable work = ScaReachabilityDependencyRegistry.INSTANCE.getPeriodicWorkCallback();
+        if (work != null) {
+            work.run();
         }
-        if (snapshot != null) {
-          telService.addDependency(
-              new Dependency(dep.name, dep.version, dep.source, dep.hash, buildMetadata(snapshot)));
-        } else if (isNewPhysicalCopy(previous, dep)) {
-          // First detection of this physical copy, no CVE state yet — metadata:[] signals "SCA is
-          // monitoring this dep".
-          telService.addDependency(
-              new Dependency(dep.name, dep.version, dep.source, dep.hash, Collections.emptyList()));
+
+        // Step 1: drain registry → map keyed by "artifact@version" for O(1) lookup below.
+        List<DependencySnapshot> pending = ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies();
+        Map<String, DependencySnapshot> snapshotByKey = new HashMap<>(pending.size() * 2);
+        for (DependencySnapshot snapshot : pending) {
+            snapshotByKey.put(ScaReachabilityDependencyRegistry.depKey(snapshot.artifact, snapshot.version), snapshot);
         }
-        // Re-detection of the same physical copy (same source/hash) with no state change: nothing
-        // to emit. The backend already received this dep.
-      }
-    }
 
-    // Step 3: handle CVE state changes for deps not in DependencyService this heartbeat.
-    // Always emit — never block CVE data. Use knownDeps for source/hash enrichment when the JAR
-    // was resolved in a prior heartbeat; otherwise emit without source/hash so the backend still
-    // receives the CVE state (it may correlate by name:version alone, and subsequent emissions
-    // for the same dep — triggered by method hits — will carry source/hash once knownDeps is
-    // populated).
-    for (DependencySnapshot snapshot : snapshotByKey.values()) {
-      String key = ScaReachabilityDependencyRegistry.depKey(snapshot.artifact, snapshot.version);
-      Dependency known = knownDeps.get(key);
-      if (known != null) {
-        // Dep was resolved in a prior heartbeat — emit enriched with source/hash.
-        telService.addDependency(
-            new Dependency(
-                known.name, known.version, known.source, known.hash, buildMetadata(snapshot)));
-      } else {
-        // Dep not yet resolved — emit without source/hash so CVE data is not delayed.
-        // When the dep is eventually resolved (stored in knownDeps via Step 2), subsequent
-        // CVE emissions (e.g., after a method hit) will include source/hash automatically.
-        telService.addDependency(
-            new Dependency(
-                snapshot.artifact, snapshot.version, null, null, buildMetadata(snapshot)));
-      }
-    }
-  }
+        // Step 2: drain DependencyService (newly detected JARs this heartbeat).
+        // Store each dep in knownDeps regardless of whether it has a CVE match — future heartbeats
+        // with CVE hits will look it up in Step 3.
+        if (dependencyService != null) {
+            for (Dependency dep : dependencyService.drainDeterminedDependencies()) {
+                String key = ScaReachabilityDependencyRegistry.depKey(dep.name, dep.version);
+                Dependency previous = knownDeps.put(key, dep);
+                DependencySnapshot snapshot = snapshotByKey.remove(key);
+                if (snapshot == null && isNewPhysicalCopy(previous, dep)) {
+                    // First detection of this physical JAR: peek CVE state so we can enrich the emission
+                    // instead of overwriting the backend's state with metadata:[]. Skip when the same
+                    // physical copy is re-detected (same source/hash from a different classloader) —
+                    // peekSnapshot would re-emit a stale hit already reported.
+                    snapshot = ScaReachabilityDependencyRegistry.INSTANCE.peekSnapshot(dep.name, dep.version);
+                }
+                if (snapshot != null) {
+                    telService.addDependency(
+                            new Dependency(dep.name, dep.version, dep.source, dep.hash, buildMetadata(snapshot)));
+                } else if (isNewPhysicalCopy(previous, dep)) {
+                    // First detection of this physical copy, no CVE state yet — metadata:[] signals "SCA is
+                    // monitoring this dep".
+                    telService.addDependency(
+                            new Dependency(dep.name, dep.version, dep.source, dep.hash, Collections.emptyList()));
+                }
+                // Re-detection of the same physical copy (same source/hash) with no state change: nothing
+                // to emit. The backend already received this dep.
+            }
+        }
 
-  /**
-   * Decides whether {@code dep} represents a new physical copy of an artifact that the backend has
-   * not yet seen, as opposed to a re-detection of a JAR already reported.
-   *
-   * <p>A "new physical copy" is a distinct file on disk. Two copies share the same {@code
-   * name@version} key but differ in {@code source} (the path/URI the JAR was loaded from) and/or
-   * {@code hash} (the content digest). A "re-detection" is the exact same physical file surfacing
-   * again, carrying an identical {@code source} and {@code hash}.
-   *
-   * <p>Returns {@code true} when:
-   *
-   * <ul>
-   *   <li>{@code previous == null} — first time we see this {@code name@version} key, or
-   *   <li>{@code dep.source} differs from {@code previous.source}, or
-   *   <li>{@code dep.hash} differs from {@code previous.hash}.
-   * </ul>
-   *
-   * <p>{@link Objects#equals} is used for both comparisons because {@code source} and {@code hash}
-   * may legitimately be {@code null} (e.g. JARs whose origin or digest could not be resolved), and
-   * a plain {@code ==}/{@code .equals} would either NPE or misclassify two null values.
-   *
-   * <p>Case this protects (must emit both): a Tomcat container running two webapps that each ship
-   * their own physical copy of the same artifact under different {@code WEB-INF/lib} paths. The
-   * copies have different {@code source}/{@code hash}, so both are reported — matching the behavior
-   * of the legacy {@link datadog.telemetry.dependency.DependencyPeriodicAction}.
-   *
-   * <p>Case this suppresses (re-detection, do not re-emit): a Spring Boot fat JAR where {@code
-   * LaunchedURLClassLoader} reports the same nested JAR from the same URI on multiple heartbeats.
-   * The {@code source}/{@code hash} are identical, so the dep is emitted only once.
-   */
-  private static boolean isNewPhysicalCopy(Dependency previous, Dependency dep) {
-    if (previous == null) {
-      return true;
+        // Step 3: handle CVE state changes for deps not in DependencyService this heartbeat.
+        // Always emit — never block CVE data. Use knownDeps for source/hash enrichment when the JAR
+        // was resolved in a prior heartbeat; otherwise emit without source/hash so the backend still
+        // receives the CVE state (it may correlate by name:version alone, and subsequent emissions
+        // for the same dep — triggered by method hits — will carry source/hash once knownDeps is
+        // populated).
+        for (DependencySnapshot snapshot : snapshotByKey.values()) {
+            String key = ScaReachabilityDependencyRegistry.depKey(snapshot.artifact, snapshot.version);
+            Dependency known = knownDeps.get(key);
+            if (known != null) {
+                // Dep was resolved in a prior heartbeat — emit enriched with source/hash.
+                telService.addDependency(
+                        new Dependency(known.name, known.version, known.source, known.hash, buildMetadata(snapshot)));
+            } else {
+                // Dep not yet resolved — emit without source/hash so CVE data is not delayed.
+                // When the dep is eventually resolved (stored in knownDeps via Step 2), subsequent
+                // CVE emissions (e.g., after a method hit) will include source/hash automatically.
+                telService.addDependency(
+                        new Dependency(snapshot.artifact, snapshot.version, null, null, buildMetadata(snapshot)));
+            }
+        }
     }
-    if (!Objects.equals(dep.source, previous.source)) {
-      return true;
+
+    /**
+     * Decides whether {@code dep} represents a new physical copy of an artifact that the backend has
+     * not yet seen, as opposed to a re-detection of a JAR already reported.
+     *
+     * <p>A "new physical copy" is a distinct file on disk. Two copies share the same {@code
+     * name@version} key but differ in {@code source} (the path/URI the JAR was loaded from) and/or
+     * {@code hash} (the content digest). A "re-detection" is the exact same physical file surfacing
+     * again, carrying an identical {@code source} and {@code hash}.
+     *
+     * <p>Returns {@code true} when:
+     *
+     * <ul>
+     *   <li>{@code previous == null} — first time we see this {@code name@version} key, or
+     *   <li>{@code dep.source} differs from {@code previous.source}, or
+     *   <li>{@code dep.hash} differs from {@code previous.hash}.
+     * </ul>
+     *
+     * <p>{@link Objects#equals} is used for both comparisons because {@code source} and {@code hash}
+     * may legitimately be {@code null} (e.g. JARs whose origin or digest could not be resolved), and
+     * a plain {@code ==}/{@code .equals} would either NPE or misclassify two null values.
+     *
+     * <p>Case this protects (must emit both): a Tomcat container running two webapps that each ship
+     * their own physical copy of the same artifact under different {@code WEB-INF/lib} paths. The
+     * copies have different {@code source}/{@code hash}, so both are reported — matching the behavior
+     * of the legacy {@link datadog.telemetry.dependency.DependencyPeriodicAction}.
+     *
+     * <p>Case this suppresses (re-detection, do not re-emit): a Spring Boot fat JAR where {@code
+     * LaunchedURLClassLoader} reports the same nested JAR from the same URI on multiple heartbeats.
+     * The {@code source}/{@code hash} are identical, so the dep is emitted only once.
+     */
+    private static boolean isNewPhysicalCopy(Dependency previous, Dependency dep) {
+        if (previous == null) {
+            return true;
+        }
+        if (!Objects.equals(dep.source, previous.source)) {
+            return true;
+        }
+        return !Objects.equals(dep.hash, previous.hash);
     }
-    return !Objects.equals(dep.hash, previous.hash);
-  }
 
-  private static List<String> buildMetadata(DependencySnapshot snapshot) {
-    List<String> metadataValues = new ArrayList<>(snapshot.cves.size());
-    for (CveSnapshot cve : snapshot.cves) {
-      metadataValues.add(buildMetadataValue(cve));
+    private static List<String> buildMetadata(DependencySnapshot snapshot) {
+        List<String> metadataValues = new ArrayList<>(snapshot.cves.size());
+        for (CveSnapshot cve : snapshot.cves) {
+            metadataValues.add(buildMetadataValue(cve));
+        }
+        return metadataValues;
     }
-    return metadataValues;
-  }
 
-  /**
-   * Builds the stringified JSON value for one CVE snapshot, per RFC:
-   *
-   * <ul>
-   *   <li>Not yet reached: {@code {"id":"GHSA-xxx","reached":[]}}
-   *   <li>Reached: {@code
-   *       {"id":"GHSA-xxx","reached":[{"path":"com.foo.Bar","symbol":"...","line":N}]}}
-   * </ul>
-   *
-   * <p>Values are JSON-escaped via {@link #jsonEscape} even though GHSA IDs, JVM class names, and
-   * method names are structurally guaranteed not to contain {@code "} or {@code \} by the JVM spec.
-   * The escaping is a safety net against future changes to the value sources.
-   */
-  static String buildMetadataValue(CveSnapshot cve) {
-    ScaReachabilityHit hit = cve.hit;
-    if (hit == null) {
-      // CVE known but no callsite yet - signals "monitoring, not reached"
-      return "{\"id\":\"" + jsonEscape(cve.vulnId) + "\",\"reached\":[]}";
+    /**
+     * Builds the stringified JSON value for one CVE snapshot, per RFC:
+     *
+     * <ul>
+     *   <li>Not yet reached: {@code {"id":"GHSA-xxx","reached":[]}}
+     *   <li>Reached: {@code
+     *       {"id":"GHSA-xxx","reached":[{"path":"com.foo.Bar","symbol":"...","line":N}]}}
+     * </ul>
+     *
+     * <p>Values are JSON-escaped via {@link #jsonEscape} even though GHSA IDs, JVM class names, and
+     * method names are structurally guaranteed not to contain {@code "} or {@code \} by the JVM spec.
+     * The escaping is a safety net against future changes to the value sources.
+     */
+    static String buildMetadataValue(CveSnapshot cve) {
+        ScaReachabilityHit hit = cve.hit;
+        if (hit == null) {
+            // CVE known but no callsite yet - signals "monitoring, not reached"
+            return "{\"id\":\"" + jsonEscape(cve.vulnId) + "\",\"reached\":[]}";
+        }
+        // CVE has been reached - include the callsite
+        return "{\"id\":\""
+                + jsonEscape(hit.vulnId())
+                + "\",\"reached\":[{\"path\":\""
+                + jsonEscape(hit.className())
+                + "\",\"symbol\":\""
+                + jsonEscape(hit.symbolName())
+                + "\",\"line\":"
+                + hit.line()
+                + "}]}";
     }
-    // CVE has been reached - include the callsite
-    return "{\"id\":\""
-        + jsonEscape(hit.vulnId())
-        + "\",\"reached\":[{\"path\":\""
-        + jsonEscape(hit.className())
-        + "\",\"symbol\":\""
-        + jsonEscape(hit.symbolName())
-        + "\",\"line\":"
-        + hit.line()
-        + "}]}";
-  }
 
-  /** Escapes a string for embedding in a JSON string literal. */
-  private static String jsonEscape(String value) {
-    if (value.indexOf('"') == -1 && value.indexOf('\\') == -1) {
-      return value; // fast path: no escaping needed (the common case)
+    /** Escapes a string for embedding in a JSON string literal. */
+    private static String jsonEscape(String value) {
+        if (value.indexOf('"') == -1 && value.indexOf('\\') == -1) {
+            return value; // fast path: no escaping needed (the common case)
+        }
+        return value.replace("\\", "\\\\").replace("\"", "\\\"");
     }
-    return value.replace("\\", "\\\\").replace("\"", "\\\"");
-  }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/BufferedEventsTest.java b/telemetry/src/test/java/datadog/telemetry/BufferedEventsTest.java
index a85206287f5..73c0155af53 100644
--- a/telemetry/src/test/java/datadog/telemetry/BufferedEventsTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/BufferedEventsTest.java
@@ -16,112 +16,112 @@
 
 class BufferedEventsTest {
 
-  @Test
-  void emptyEvents() {
-    BufferedEvents events = new BufferedEvents();
-
-    assertTrue(events.isEmpty());
-    assertFalse(events.hasConfigChangeEvent());
-    assertFalse(events.hasDependencyEvent());
-    assertFalse(events.hasDistributionSeriesEvent());
-    assertFalse(events.hasIntegrationEvent());
-    assertFalse(events.hasLogMessageEvent());
-    assertFalse(events.hasMetricEvent());
-    assertFalse(events.hasEndpoint());
-  }
-
-  @Test
-  void returnAddedEvents() {
-    BufferedEvents events = new BufferedEvents();
-    ConfigSetting configSetting = ConfigSetting.of("key", "value", ConfigOrigin.DEFAULT);
-    Dependency dependency = new Dependency("name", "version", "source", "hash");
-    DistributionSeries series = new DistributionSeries();
-    Integration integration = new Integration("integration-name", true);
-    LogMessage logMessage = new LogMessage();
-    Metric metric = new Metric();
-    Endpoint endpoint = new Endpoint();
-
-    // when
-    events.addConfigChangeEvent(configSetting);
-
-    // then
-    assertFalse(events.isEmpty());
-    assertTrue(events.hasConfigChangeEvent());
-    assertEquals(configSetting, events.nextConfigChangeEvent());
-    assertFalse(events.hasConfigChangeEvent());
-    assertTrue(events.isEmpty());
-
-    // when
-    events.addDependencyEvent(dependency);
-
-    // then
-    assertFalse(events.isEmpty());
-    assertTrue(events.hasDependencyEvent());
-    assertEquals(dependency, events.nextDependencyEvent());
-    assertFalse(events.hasDependencyEvent());
-    assertTrue(events.isEmpty());
-
-    // when
-    events.addDistributionSeriesEvent(series);
-
-    // then
-    assertFalse(events.isEmpty());
-    assertTrue(events.hasDistributionSeriesEvent());
-    assertEquals(series, events.nextDistributionSeriesEvent());
-    assertFalse(events.hasDistributionSeriesEvent());
-    assertTrue(events.isEmpty());
-
-    // when
-    events.addIntegrationEvent(integration);
-
-    // then
-    assertFalse(events.isEmpty());
-    assertTrue(events.hasIntegrationEvent());
-    assertEquals(integration, events.nextIntegrationEvent());
-    assertFalse(events.hasIntegrationEvent());
-    assertTrue(events.isEmpty());
-
-    // when
-    events.addLogMessageEvent(logMessage);
-
-    // then
-    assertFalse(events.isEmpty());
-    assertTrue(events.hasLogMessageEvent());
-    assertEquals(logMessage, events.nextLogMessageEvent());
-    assertFalse(events.hasLogMessageEvent());
-    assertTrue(events.isEmpty());
-
-    // when
-    events.addMetricEvent(metric);
-
-    // then
-    assertFalse(events.isEmpty());
-    assertTrue(events.hasMetricEvent());
-    assertEquals(metric, events.nextMetricEvent());
-    assertFalse(events.hasMetricEvent());
-    assertTrue(events.isEmpty());
-
-    // when
-    events.addEndpointEvent(endpoint);
-
-    // then
-    assertFalse(events.isEmpty());
-    assertTrue(events.hasEndpoint());
-    assertEquals(endpoint, events.nextEndpoint());
-    assertFalse(events.hasEndpoint());
-    assertTrue(events.isEmpty());
-  }
-
-  @Test
-  void noopSink() {
-    EventSink sink = EventSink.NOOP;
-
-    sink.addMetricEvent(null);
-    sink.addLogMessageEvent(null);
-    sink.addIntegrationEvent(null);
-    sink.addDistributionSeriesEvent(null);
-    sink.addDependencyEvent(null);
-    sink.addConfigChangeEvent(null);
-    sink.addEndpointEvent(null);
-  }
+    @Test
+    void emptyEvents() {
+        BufferedEvents events = new BufferedEvents();
+
+        assertTrue(events.isEmpty());
+        assertFalse(events.hasConfigChangeEvent());
+        assertFalse(events.hasDependencyEvent());
+        assertFalse(events.hasDistributionSeriesEvent());
+        assertFalse(events.hasIntegrationEvent());
+        assertFalse(events.hasLogMessageEvent());
+        assertFalse(events.hasMetricEvent());
+        assertFalse(events.hasEndpoint());
+    }
+
+    @Test
+    void returnAddedEvents() {
+        BufferedEvents events = new BufferedEvents();
+        ConfigSetting configSetting = ConfigSetting.of("key", "value", ConfigOrigin.DEFAULT);
+        Dependency dependency = new Dependency("name", "version", "source", "hash");
+        DistributionSeries series = new DistributionSeries();
+        Integration integration = new Integration("integration-name", true);
+        LogMessage logMessage = new LogMessage();
+        Metric metric = new Metric();
+        Endpoint endpoint = new Endpoint();
+
+        // when
+        events.addConfigChangeEvent(configSetting);
+
+        // then
+        assertFalse(events.isEmpty());
+        assertTrue(events.hasConfigChangeEvent());
+        assertEquals(configSetting, events.nextConfigChangeEvent());
+        assertFalse(events.hasConfigChangeEvent());
+        assertTrue(events.isEmpty());
+
+        // when
+        events.addDependencyEvent(dependency);
+
+        // then
+        assertFalse(events.isEmpty());
+        assertTrue(events.hasDependencyEvent());
+        assertEquals(dependency, events.nextDependencyEvent());
+        assertFalse(events.hasDependencyEvent());
+        assertTrue(events.isEmpty());
+
+        // when
+        events.addDistributionSeriesEvent(series);
+
+        // then
+        assertFalse(events.isEmpty());
+        assertTrue(events.hasDistributionSeriesEvent());
+        assertEquals(series, events.nextDistributionSeriesEvent());
+        assertFalse(events.hasDistributionSeriesEvent());
+        assertTrue(events.isEmpty());
+
+        // when
+        events.addIntegrationEvent(integration);
+
+        // then
+        assertFalse(events.isEmpty());
+        assertTrue(events.hasIntegrationEvent());
+        assertEquals(integration, events.nextIntegrationEvent());
+        assertFalse(events.hasIntegrationEvent());
+        assertTrue(events.isEmpty());
+
+        // when
+        events.addLogMessageEvent(logMessage);
+
+        // then
+        assertFalse(events.isEmpty());
+        assertTrue(events.hasLogMessageEvent());
+        assertEquals(logMessage, events.nextLogMessageEvent());
+        assertFalse(events.hasLogMessageEvent());
+        assertTrue(events.isEmpty());
+
+        // when
+        events.addMetricEvent(metric);
+
+        // then
+        assertFalse(events.isEmpty());
+        assertTrue(events.hasMetricEvent());
+        assertEquals(metric, events.nextMetricEvent());
+        assertFalse(events.hasMetricEvent());
+        assertTrue(events.isEmpty());
+
+        // when
+        events.addEndpointEvent(endpoint);
+
+        // then
+        assertFalse(events.isEmpty());
+        assertTrue(events.hasEndpoint());
+        assertEquals(endpoint, events.nextEndpoint());
+        assertFalse(events.hasEndpoint());
+        assertTrue(events.isEmpty());
+    }
+
+    @Test
+    void noopSink() {
+        EventSink sink = EventSink.NOOP;
+
+        sink.addMetricEvent(null);
+        sink.addLogMessageEvent(null);
+        sink.addIntegrationEvent(null);
+        sink.addDistributionSeriesEvent(null);
+        sink.addDependencyEvent(null);
+        sink.addConfigChangeEvent(null);
+        sink.addEndpointEvent(null);
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/DisabledDependencyServiceTest.java b/telemetry/src/test/java/datadog/telemetry/DisabledDependencyServiceTest.java
index b019bba1738..b0187f92ffd 100644
--- a/telemetry/src/test/java/datadog/telemetry/DisabledDependencyServiceTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/DisabledDependencyServiceTest.java
@@ -16,13 +16,13 @@
 @WithConfig(key = TELEMETRY_DEPENDENCY_COLLECTION_ENABLED, value = "false")
 class DisabledDependencyServiceTest {
 
-  @Test
-  void installsDisabledDependencyServiceAndVerifyTransformer() {
-    Instrumentation instrumentation = mock(Instrumentation.class);
+    @Test
+    void installsDisabledDependencyServiceAndVerifyTransformer() {
+        Instrumentation instrumentation = mock(Instrumentation.class);
 
-    DependencyService dependencyService = TelemetrySystem.createDependencyService(instrumentation);
+        DependencyService dependencyService = TelemetrySystem.createDependencyService(instrumentation);
 
-    verifyNoInteractions(instrumentation);
-    assertNull(dependencyService);
-  }
+        verifyNoInteractions(instrumentation);
+        assertNull(dependencyService);
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/EventSourceTest.java b/telemetry/src/test/java/datadog/telemetry/EventSourceTest.java
index 3625f0a04df..d2186bc5c75 100644
--- a/telemetry/src/test/java/datadog/telemetry/EventSourceTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/EventSourceTest.java
@@ -23,85 +23,81 @@
 
 class EventSourceTest {
 
-  private static class EventQueues {
-    final Queue<ConfigSetting> configChangeQueue = new LinkedBlockingQueue<>();
-    final Queue<Integration> integrationQueue = new LinkedBlockingQueue<>();
-    final Queue<Dependency> dependencyQueue = new LinkedBlockingQueue<>();
-    final Queue<Metric> metricQueue = new LinkedBlockingQueue<>();
-    final Queue<DistributionSeries> distributionSeriesQueue = new LinkedBlockingQueue<>();
-    final Queue<LogMessage> logMessageQueue = new LinkedBlockingQueue<>();
-    final Queue<ProductChange> productChanges = new LinkedBlockingQueue<>();
-    final Queue<Endpoint> endpointQueue = new LinkedBlockingQueue<>();
-  }
+    private static class EventQueues {
+        final Queue<ConfigSetting> configChangeQueue = new LinkedBlockingQueue<>();
+        final Queue<Integration> integrationQueue = new LinkedBlockingQueue<>();
+        final Queue<Dependency> dependencyQueue = new LinkedBlockingQueue<>();
+        final Queue<Metric> metricQueue = new LinkedBlockingQueue<>();
+        final Queue<DistributionSeries> distributionSeriesQueue = new LinkedBlockingQueue<>();
+        final Queue<LogMessage> logMessageQueue = new LinkedBlockingQueue<>();
+        final Queue<ProductChange> productChanges = new LinkedBlockingQueue<>();
+        final Queue<Endpoint> endpointQueue = new LinkedBlockingQueue<>();
+    }
 
-  @SuppressWarnings("unchecked")
-  private static <T> void addInstance(Queue<T> queue, Object instance) {
-    queue.add((T) instance);
-  }
+    @SuppressWarnings("unchecked")
+    private static <T> void addInstance(Queue<T> queue, Object instance) {
+        queue.add((T) instance);
+    }
 
-  @ParameterizedTest(name = "test isEmpty when adding and clearing {0}")
-  @MethodSource("testIsEmptyWhenAddingAndClearingArguments")
-  void testIsEmptyWhenAddingAndClearing(
-      String eventType, Function<EventQueues, Queue<?>> queueSelector, Object eventInstance) {
-    EventQueues eventQueues = new EventQueues();
-    EventSource eventSource =
-        new EventSource.Queued(
-            eventQueues.configChangeQueue,
-            eventQueues.integrationQueue,
-            eventQueues.dependencyQueue,
-            eventQueues.metricQueue,
-            eventQueues.distributionSeriesQueue,
-            eventQueues.logMessageQueue,
-            eventQueues.productChanges,
-            eventQueues.endpointQueue);
+    @ParameterizedTest(name = "test isEmpty when adding and clearing {0}")
+    @MethodSource("testIsEmptyWhenAddingAndClearingArguments")
+    void testIsEmptyWhenAddingAndClearing(
+            String eventType, Function<EventQueues, Queue<?>> queueSelector, Object eventInstance) {
+        EventQueues eventQueues = new EventQueues();
+        EventSource eventSource = new EventSource.Queued(
+                eventQueues.configChangeQueue,
+                eventQueues.integrationQueue,
+                eventQueues.dependencyQueue,
+                eventQueues.metricQueue,
+                eventQueues.distributionSeriesQueue,
+                eventQueues.logMessageQueue,
+                eventQueues.productChanges,
+                eventQueues.endpointQueue);
 
-    assertTrue(eventSource.isEmpty());
+        assertTrue(eventSource.isEmpty());
 
-    // add an event to the queue
-    Queue<?> queue = queueSelector.apply(eventQueues);
-    addInstance(queue, eventInstance);
+        // add an event to the queue
+        Queue<?> queue = queueSelector.apply(eventQueues);
+        addInstance(queue, eventInstance);
 
-    // eventSource should not be empty
-    assertFalse(eventSource.isEmpty());
+        // eventSource should not be empty
+        assertFalse(eventSource.isEmpty());
 
-    // clear the queue
-    queue.clear();
+        // clear the queue
+        queue.clear();
 
-    // eventSource should be empty again
-    assertTrue(eventSource.isEmpty());
-  }
+        // eventSource should be empty again
+        assertTrue(eventSource.isEmpty());
+    }
 
-  private static Stream<Arguments> testIsEmptyWhenAddingAndClearingArguments() {
-    return Stream.of(
-        arguments(
-            "Config Change",
-            (Function<EventQueues, Queue<?>>) queues -> queues.configChangeQueue,
-            ConfigSetting.of("key", "value", ConfigOrigin.ENV)),
-        arguments(
-            "Integration",
-            (Function<EventQueues, Queue<?>>) queues -> queues.integrationQueue,
-            new Integration("name", true)),
-        arguments(
-            "Dependency",
-            (Function<EventQueues, Queue<?>>) queues -> queues.dependencyQueue,
-            new Dependency("name", "version", "type", null)),
-        arguments(
-            "Metric", (Function<EventQueues, Queue<?>>) queues -> queues.metricQueue, new Metric()),
-        arguments(
-            "Distribution Series",
-            (Function<EventQueues, Queue<?>>) queues -> queues.distributionSeriesQueue,
-            new DistributionSeries()),
-        arguments(
-            "Log Message",
-            (Function<EventQueues, Queue<?>>) queues -> queues.logMessageQueue,
-            new LogMessage()),
-        arguments(
-            "Product Change",
-            (Function<EventQueues, Queue<?>>) queues -> queues.productChanges,
-            new ProductChange()),
-        arguments(
-            "Endpoint",
-            (Function<EventQueues, Queue<?>>) queues -> queues.endpointQueue,
-            new Endpoint()));
-  }
+    private static Stream<Arguments> testIsEmptyWhenAddingAndClearingArguments() {
+        return Stream.of(
+                arguments(
+                        "Config Change",
+                        (Function<EventQueues, Queue<?>>) queues -> queues.configChangeQueue,
+                        ConfigSetting.of("key", "value", ConfigOrigin.ENV)),
+                arguments(
+                        "Integration",
+                        (Function<EventQueues, Queue<?>>) queues -> queues.integrationQueue,
+                        new Integration("name", true)),
+                arguments(
+                        "Dependency",
+                        (Function<EventQueues, Queue<?>>) queues -> queues.dependencyQueue,
+                        new Dependency("name", "version", "type", null)),
+                arguments("Metric", (Function<EventQueues, Queue<?>>) queues -> queues.metricQueue, new Metric()),
+                arguments(
+                        "Distribution Series",
+                        (Function<EventQueues, Queue<?>>) queues -> queues.distributionSeriesQueue,
+                        new DistributionSeries()),
+                arguments(
+                        "Log Message",
+                        (Function<EventQueues, Queue<?>>) queues -> queues.logMessageQueue,
+                        new LogMessage()),
+                arguments(
+                        "Product Change",
+                        (Function<EventQueues, Queue<?>>) queues -> queues.productChanges,
+                        new ProductChange()),
+                arguments(
+                        "Endpoint", (Function<EventQueues, Queue<?>>) queues -> queues.endpointQueue, new Endpoint()));
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/ExtendedHeartbeatDataTest.java b/telemetry/src/test/java/datadog/telemetry/ExtendedHeartbeatDataTest.java
index 057972fabc2..e7d2e0341c9 100644
--- a/telemetry/src/test/java/datadog/telemetry/ExtendedHeartbeatDataTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/ExtendedHeartbeatDataTest.java
@@ -13,77 +13,76 @@
 
 class ExtendedHeartbeatDataTest {
 
-  private final Dependency dependency = new Dependency("name", "version", "source", "hash");
-  private final ConfigSetting configSetting =
-      ConfigSetting.of("key", "value", ConfigOrigin.DEFAULT);
-  private final Integration integration = new Integration("integration", true);
-
-  @TableTest({
-    "scenario    | limit",
-    "no limit    | 0    ",
-    "small limit | 2    ",
-    "large limit | 10   "
-  })
-  void discardDependenciesAfterExceedingLimit(int limit) {
-    ExtendedHeartbeatData extHeartbeatData = new ExtendedHeartbeatData(limit);
-
-    for (int pushed = 0; pushed < limit + 1; pushed++) {
-      extHeartbeatData.pushDependency(dependency);
+    private final Dependency dependency = new Dependency("name", "version", "source", "hash");
+    private final ConfigSetting configSetting = ConfigSetting.of("key", "value", ConfigOrigin.DEFAULT);
+    private final Integration integration = new Integration("integration", true);
+
+    @TableTest({
+      "scenario    | limit",
+      "no limit    | 0    ",
+      "small limit | 2    ",
+      "large limit | 10   "
+    })
+    void discardDependenciesAfterExceedingLimit(int limit) {
+        ExtendedHeartbeatData extHeartbeatData = new ExtendedHeartbeatData(limit);
+
+        for (int pushed = 0; pushed < limit + 1; pushed++) {
+            extHeartbeatData.pushDependency(dependency);
+        }
+
+        EventSource snapshot = extHeartbeatData.snapshot();
+        int dependencyCount = 0;
+        while (snapshot.hasDependencyEvent()) {
+            snapshot.nextDependencyEvent();
+            dependencyCount++;
+        }
+        assertEquals(limit, dependencyCount);
     }
 
-    EventSource snapshot = extHeartbeatData.snapshot();
-    int dependencyCount = 0;
-    while (snapshot.hasDependencyEvent()) {
-      snapshot.nextDependencyEvent();
-      dependencyCount++;
-    }
-    assertEquals(limit, dependencyCount);
-  }
-
-  @Test
-  void returnAllCollectedData() {
-    ExtendedHeartbeatData extHeartbeatData = new ExtendedHeartbeatData();
+    @Test
+    void returnAllCollectedData() {
+        ExtendedHeartbeatData extHeartbeatData = new ExtendedHeartbeatData();
 
-    // when
-    EventSource emptySnapshot = extHeartbeatData.snapshot();
-    // then
-    assertTrue(emptySnapshot.isEmpty());
+        // when
+        EventSource emptySnapshot = extHeartbeatData.snapshot();
+        // then
+        assertTrue(emptySnapshot.isEmpty());
 
-    // when
-    extHeartbeatData.pushDependency(dependency);
-    extHeartbeatData.pushConfigSetting(configSetting);
-    extHeartbeatData.pushIntegration(integration);
+        // when
+        extHeartbeatData.pushDependency(dependency);
+        extHeartbeatData.pushConfigSetting(configSetting);
+        extHeartbeatData.pushIntegration(integration);
 
-    // then
-    EventSource snapshot = extHeartbeatData.snapshot();
+        // then
+        EventSource snapshot = extHeartbeatData.snapshot();
 
-    assertFalse(snapshot.isEmpty());
+        assertFalse(snapshot.isEmpty());
 
-    assertTrue(snapshot.hasDependencyEvent());
-    assertEquals(dependency, snapshot.nextDependencyEvent());
-    assertFalse(snapshot.hasDependencyEvent());
+        assertTrue(snapshot.hasDependencyEvent());
+        assertEquals(dependency, snapshot.nextDependencyEvent());
+        assertFalse(snapshot.hasDependencyEvent());
 
-    assertFalse(snapshot.isEmpty());
+        assertFalse(snapshot.isEmpty());
 
-    assertTrue(snapshot.hasConfigChangeEvent());
-    assertEquals(configSetting, snapshot.nextConfigChangeEvent());
-    assertFalse(snapshot.hasConfigChangeEvent());
+        assertTrue(snapshot.hasConfigChangeEvent());
+        assertEquals(configSetting, snapshot.nextConfigChangeEvent());
+        assertFalse(snapshot.hasConfigChangeEvent());
 
-    assertFalse(snapshot.isEmpty());
+        assertFalse(snapshot.isEmpty());
 
-    assertTrue(snapshot.hasIntegrationEvent());
-    assertEquals(integration, snapshot.nextIntegrationEvent());
-    assertFalse(snapshot.hasIntegrationEvent());
+        assertTrue(snapshot.hasIntegrationEvent());
+        assertEquals(integration, snapshot.nextIntegrationEvent());
+        assertFalse(snapshot.hasIntegrationEvent());
 
-    assertTrue(snapshot.isEmpty());
+        assertTrue(snapshot.isEmpty());
 
-    // when another snapshot includes all data
-    EventSource anotherSnapshot = extHeartbeatData.snapshot();
+        // when another snapshot includes all data
+        EventSource anotherSnapshot = extHeartbeatData.snapshot();
 
-    // then
-    assertFalse(anotherSnapshot.isEmpty());
-    assertTrue(anotherSnapshot.hasDependencyEvent());
-    assertTrue(anotherSnapshot.hasConfigChangeEvent());
-    assertTrue(anotherSnapshot.hasIntegrationEvent());
-  }
+        // then
+        assertFalse(anotherSnapshot.isEmpty());
+        assertTrue(anotherSnapshot.hasDependencyEvent());
+        assertTrue(anotherSnapshot.hasConfigChangeEvent());
+        assertTrue(anotherSnapshot.hasIntegrationEvent());
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/FileBasedTelemetryClientTest.java b/telemetry/src/test/java/datadog/telemetry/FileBasedTelemetryClientTest.java
index 1104d3549d5..9cb084ead3b 100644
--- a/telemetry/src/test/java/datadog/telemetry/FileBasedTelemetryClientTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/FileBasedTelemetryClientTest.java
@@ -21,123 +21,121 @@
 
 class FileBasedTelemetryClientTest {
 
-  private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-
-  @Test
-  void writesRequestBodyToFile(@TempDir Path tmp) throws IOException {
-    Path outputDir = tmp.resolve("payloads/telemetry");
-    FileBasedTelemetryClient client = new FileBasedTelemetryClient(outputDir.toString());
-    byte[] body = "{\"request_type\":\"app-started\"}".getBytes(StandardCharsets.UTF_8);
-
-    TelemetryClient.Result result = client.sendHttpRequest(requestBuilder("app-started", body));
-
-    assertEquals(TelemetryClient.Result.SUCCESS, result);
-    List<Path> files = listFiles(outputDir);
-    assertEquals(1, files.size());
-    assertArrayEquals(body, Files.readAllBytes(files.get(0)));
-  }
-
-  @Test
-  void createsOutputDirectoryIfMissing(@TempDir Path tmp) {
-    Path outputDir = tmp.resolve("does/not/exist/yet");
-    assertFalse(Files.exists(outputDir));
-
-    FileBasedTelemetryClient client = new FileBasedTelemetryClient(outputDir.toString());
-    TelemetryClient.Result result =
-        client.sendHttpRequest(
-            requestBuilder("app-heartbeat", "{}".getBytes(StandardCharsets.UTF_8)));
-
-    assertEquals(TelemetryClient.Result.SUCCESS, result);
-    assertTrue(Files.isDirectory(outputDir));
-  }
-
-  @Test
-  void filenameFollowsTelemetryConvention(@TempDir Path tmp) throws IOException {
-    FileBasedTelemetryClient client = new FileBasedTelemetryClient(tmp.toString());
-
-    client.sendHttpRequest(requestBuilder("app-started", "{}".getBytes(StandardCharsets.UTF_8)));
-
-    List<Path> files = listFiles(tmp);
-    assertEquals(1, files.size());
-    String expected = String.format("telemetry-%020d-%s.json", 0L, PidHelper.getPid());
-    assertEquals(expected, files.get(0).getFileName().toString());
-  }
-
-  @Test
-  void sequenceIncrementsPerRequest(@TempDir Path tmp) throws IOException {
-    FileBasedTelemetryClient client = new FileBasedTelemetryClient(tmp.toString());
-
-    for (int i = 0; i < 3; i++) {
-      client.sendHttpRequest(
-          requestBuilder("app-heartbeat", "{}".getBytes(StandardCharsets.UTF_8)));
+    private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+
+    @Test
+    void writesRequestBodyToFile(@TempDir Path tmp) throws IOException {
+        Path outputDir = tmp.resolve("payloads/telemetry");
+        FileBasedTelemetryClient client = new FileBasedTelemetryClient(outputDir.toString());
+        byte[] body = "{\"request_type\":\"app-started\"}".getBytes(StandardCharsets.UTF_8);
+
+        TelemetryClient.Result result = client.sendHttpRequest(requestBuilder("app-started", body));
+
+        assertEquals(TelemetryClient.Result.SUCCESS, result);
+        List<Path> files = listFiles(outputDir);
+        assertEquals(1, files.size());
+        assertArrayEquals(body, Files.readAllBytes(files.get(0)));
+    }
+
+    @Test
+    void createsOutputDirectoryIfMissing(@TempDir Path tmp) {
+        Path outputDir = tmp.resolve("does/not/exist/yet");
+        assertFalse(Files.exists(outputDir));
+
+        FileBasedTelemetryClient client = new FileBasedTelemetryClient(outputDir.toString());
+        TelemetryClient.Result result =
+                client.sendHttpRequest(requestBuilder("app-heartbeat", "{}".getBytes(StandardCharsets.UTF_8)));
+
+        assertEquals(TelemetryClient.Result.SUCCESS, result);
+        assertTrue(Files.isDirectory(outputDir));
+    }
+
+    @Test
+    void filenameFollowsTelemetryConvention(@TempDir Path tmp) throws IOException {
+        FileBasedTelemetryClient client = new FileBasedTelemetryClient(tmp.toString());
+
+        client.sendHttpRequest(requestBuilder("app-started", "{}".getBytes(StandardCharsets.UTF_8)));
+
+        List<Path> files = listFiles(tmp);
+        assertEquals(1, files.size());
+        String expected = String.format("telemetry-%020d-%s.json", 0L, PidHelper.getPid());
+        assertEquals(expected, files.get(0).getFileName().toString());
+    }
+
+    @Test
+    void sequenceIncrementsPerRequest(@TempDir Path tmp) throws IOException {
+        FileBasedTelemetryClient client = new FileBasedTelemetryClient(tmp.toString());
+
+        for (int i = 0; i < 3; i++) {
+            client.sendHttpRequest(requestBuilder("app-heartbeat", "{}".getBytes(StandardCharsets.UTF_8)));
+        }
+
+        List<Path> files = listFiles(tmp);
+        assertEquals(3, files.size());
+        String pid = PidHelper.getPid();
+        for (int i = 0; i < files.size(); i++) {
+            // files are unsorted from DirectoryStream — build expected set, check contains
+            String expected = String.format("telemetry-%020d-%s.json", (long) i, pid);
+            assertTrue(
+                    files.stream().anyMatch(p -> p.getFileName().toString().equals(expected)),
+                    "Missing file with sequence " + i + ": " + expected);
+        }
     }
 
-    List<Path> files = listFiles(tmp);
-    assertEquals(3, files.size());
-    String pid = PidHelper.getPid();
-    for (int i = 0; i < files.size(); i++) {
-      // files are unsorted from DirectoryStream — build expected set, check contains
-      String expected = String.format("telemetry-%020d-%s.json", (long) i, pid);
-      assertTrue(
-          files.stream().anyMatch(p -> p.getFileName().toString().equals(expected)),
-          "Missing file with sequence " + i + ": " + expected);
+    @Test
+    void handlesNullRequestBody(@TempDir Path tmp) throws IOException {
+        FileBasedTelemetryClient client = new FileBasedTelemetryClient(tmp.toString());
+        Request.Builder builder = new Request.Builder()
+                .addHeader("DD-Telemetry-Request-Type", "app-closing")
+                .get();
+
+        TelemetryClient.Result result = client.sendHttpRequest(builder);
+
+        assertEquals(TelemetryClient.Result.SUCCESS, result);
+        List<Path> files = listFiles(tmp);
+        assertEquals(1, files.size());
+        assertEquals(0, Files.size(files.get(0)));
     }
-  }
-
-  @Test
-  void handlesNullRequestBody(@TempDir Path tmp) throws IOException {
-    FileBasedTelemetryClient client = new FileBasedTelemetryClient(tmp.toString());
-    Request.Builder builder =
-        new Request.Builder().addHeader("DD-Telemetry-Request-Type", "app-closing").get();
-
-    TelemetryClient.Result result = client.sendHttpRequest(builder);
-
-    assertEquals(TelemetryClient.Result.SUCCESS, result);
-    List<Path> files = listFiles(tmp);
-    assertEquals(1, files.size());
-    assertEquals(0, Files.size(files.get(0)));
-  }
-
-  @Test
-  void returnsFailureWhenOutputDirIsNotWritable(@TempDir Path tmp) throws IOException {
-    // Create a regular file at the expected output-dir path so createDirectories fails.
-    Path collision = tmp.resolve("not-a-dir");
-    Files.createFile(collision);
-    FileBasedTelemetryClient client =
-        new FileBasedTelemetryClient(collision.resolve("sub").toString());
-
-    TelemetryClient.Result result =
-        client.sendHttpRequest(
-            requestBuilder("app-heartbeat", "{}".getBytes(StandardCharsets.UTF_8)));
-
-    assertEquals(TelemetryClient.Result.FAILURE, result);
-  }
-
-  @Test
-  void leavesNoLingeringTempFiles(@TempDir Path tmp) throws IOException {
-    FileBasedTelemetryClient client = new FileBasedTelemetryClient(tmp.toString());
-
-    client.sendHttpRequest(requestBuilder("app-started", "{}".getBytes(StandardCharsets.UTF_8)));
-
-    List<Path> files = listFiles(tmp);
-    assertFalse(
-        files.stream().anyMatch(p -> p.getFileName().toString().endsWith(".tmp")),
-        "Found leftover .tmp file: " + files);
-  }
-
-  private static Request.Builder requestBuilder(String requestType, byte[] body) {
-    return new Request.Builder()
-        .addHeader("DD-Telemetry-Request-Type", requestType)
-        .post(RequestBody.create(JSON, body));
-  }
-
-  private static List<Path> listFiles(Path dir) throws IOException {
-    List<Path> files = new ArrayList<>();
-    try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
-      for (Path p : stream) {
-        files.add(p);
-      }
+
+    @Test
+    void returnsFailureWhenOutputDirIsNotWritable(@TempDir Path tmp) throws IOException {
+        // Create a regular file at the expected output-dir path so createDirectories fails.
+        Path collision = tmp.resolve("not-a-dir");
+        Files.createFile(collision);
+        FileBasedTelemetryClient client =
+                new FileBasedTelemetryClient(collision.resolve("sub").toString());
+
+        TelemetryClient.Result result =
+                client.sendHttpRequest(requestBuilder("app-heartbeat", "{}".getBytes(StandardCharsets.UTF_8)));
+
+        assertEquals(TelemetryClient.Result.FAILURE, result);
+    }
+
+    @Test
+    void leavesNoLingeringTempFiles(@TempDir Path tmp) throws IOException {
+        FileBasedTelemetryClient client = new FileBasedTelemetryClient(tmp.toString());
+
+        client.sendHttpRequest(requestBuilder("app-started", "{}".getBytes(StandardCharsets.UTF_8)));
+
+        List<Path> files = listFiles(tmp);
+        assertFalse(
+                files.stream().anyMatch(p -> p.getFileName().toString().endsWith(".tmp")),
+                "Found leftover .tmp file: " + files);
+    }
+
+    private static Request.Builder requestBuilder(String requestType, byte[] body) {
+        return new Request.Builder()
+                .addHeader("DD-Telemetry-Request-Type", requestType)
+                .post(RequestBody.create(JSON, body));
+    }
+
+    private static List<Path> listFiles(Path dir) throws IOException {
+        List<Path> files = new ArrayList<>();
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
+            for (Path p : stream) {
+                files.add(p);
+            }
+        }
+        return files;
     }
-    return files;
-  }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/HostInfoTest.java b/telemetry/src/test/java/datadog/telemetry/HostInfoTest.java
index d4266fa7bfb..4877e38fe7c 100644
--- a/telemetry/src/test/java/datadog/telemetry/HostInfoTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/HostInfoTest.java
@@ -17,64 +17,63 @@
 
 class HostInfoTest {
 
-  @Test
-  void getHostname() {
-    String hostname = HostInfo.getHostname();
+    @Test
+    void getHostname() {
+        String hostname = HostInfo.getHostname();
 
-    assertNotNull(hostname);
-    assertFalse(hostname.trim().isEmpty());
-  }
+        assertNotNull(hostname);
+        assertFalse(hostname.trim().isEmpty());
+    }
 
-  @Test
-  void getOsName() {
-    String osName = HostInfo.getOsName();
+    @Test
+    void getOsName() {
+        String osName = HostInfo.getOsName();
 
-    assertTrue(Arrays.asList("Linux", "Windows", "Darwin").contains(osName));
-  }
+        assertTrue(Arrays.asList("Linux", "Windows", "Darwin").contains(osName));
+    }
 
-  @Test
-  void getOsVersion() {
-    String osVersion = HostInfo.getOsVersion();
+    @Test
+    void getOsVersion() {
+        String osVersion = HostInfo.getOsVersion();
 
-    assertNotNull(osVersion);
-    assertFalse(osVersion.trim().isEmpty());
-  }
+        assertNotNull(osVersion);
+        assertFalse(osVersion.trim().isEmpty());
+    }
 
-  @Test
-  void compareToUname() throws IOException, InterruptedException {
-    assumeTrue(exitCode("uname", "-a") == 0);
+    @Test
+    void compareToUname() throws IOException, InterruptedException {
+        assumeTrue(exitCode("uname", "-a") == 0);
 
-    assertEquals(runCommand("uname", "-n"), HostInfo.getHostname());
-    assertEquals(runCommand("uname", "-s"), HostInfo.getOsName());
-    assertEquals(runCommand("uname", "-s"), HostInfo.getKernelName());
-    if (OperatingSystem.isMacOs()) {
-      // uname -r will return X.Y.Z version, while JVM will report just X.Y
-      // disabled, the uname -r gives the Kernel version which is different from Mac OS version
-      // assertTrue(runCommand("uname", "-r").startsWith(HostInfo.getKernelRelease()));
+        assertEquals(runCommand("uname", "-n"), HostInfo.getHostname());
+        assertEquals(runCommand("uname", "-s"), HostInfo.getOsName());
+        assertEquals(runCommand("uname", "-s"), HostInfo.getKernelName());
+        if (OperatingSystem.isMacOs()) {
+            // uname -r will return X.Y.Z version, while JVM will report just X.Y
+            // disabled, the uname -r gives the Kernel version which is different from Mac OS version
+            // assertTrue(runCommand("uname", "-r").startsWith(HostInfo.getKernelRelease()));
 
-      // No /proc in macOS, so using property os.version like for KernelRelease
-      assertEquals(HostInfo.getKernelRelease(), HostInfo.getKernelVersion());
-    } else {
-      assertEquals(runCommand("uname", "-r"), HostInfo.getKernelRelease());
-      // Ideally, this would be equal, but for now, we'll compromise to startWith.
-      assertTrue(runCommand("uname", "-v").startsWith(HostInfo.getKernelVersion()));
+            // No /proc in macOS, so using property os.version like for KernelRelease
+            assertEquals(HostInfo.getKernelRelease(), HostInfo.getKernelVersion());
+        } else {
+            assertEquals(runCommand("uname", "-r"), HostInfo.getKernelRelease());
+            // Ideally, this would be equal, but for now, we'll compromise to startWith.
+            assertTrue(runCommand("uname", "-v").startsWith(HostInfo.getKernelVersion()));
+        }
     }
-  }
 
-  private static String runCommand(String... command) throws IOException, InterruptedException {
-    Process process = new ProcessBuilder(command).start();
-    String output;
-    try (BufferedReader reader =
-        new BufferedReader(
-            new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8))) {
-      output = reader.lines().collect(Collectors.joining("\n"));
+    private static String runCommand(String... command) throws IOException, InterruptedException {
+        Process process = new ProcessBuilder(command).start();
+        String output;
+        try (BufferedReader reader =
+                new BufferedReader(new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8))) {
+            output = reader.lines().collect(Collectors.joining("\n"));
+        }
+        process.waitFor();
+        return output.trim();
     }
-    process.waitFor();
-    return output.trim();
-  }
 
-  private static int exitCode(String... command) throws IOException, InterruptedException {
-    Process process = new ProcessBuilder(command).start();
-    return process.waitFor();
-  }
+    private static int exitCode(String... command) throws IOException, InterruptedException {
+        Process process = new ProcessBuilder(command).start();
+        return process.waitFor();
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/TelemetryClientTest.java b/telemetry/src/test/java/datadog/telemetry/TelemetryClientTest.java
index 37f5a54dbc2..f2ca62e9e9b 100644
--- a/telemetry/src/test/java/datadog/telemetry/TelemetryClientTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/TelemetryClientTest.java
@@ -21,56 +21,50 @@
 
 class TelemetryClientTest {
 
-  @TableTest({
-    "scenario                            | ciVisEnabled | ciVisAgentlessEnabled | ciVisAgentlessUrl                  | expectedUrl                                                 ",
-    "ci visibility agentless enabled     | true         | true                  | http://ci.visibility.agentless.url | http://ci.visibility.agentless.url/api/v2/apmtelemetry      ",
-    "ci visibility disabled              | false        | true                  | http://ci.visibility.agentless.url | https://all-http-intake.logs.datad0g.com/api/v2/apmtelemetry",
-    "ci visibility agentless disabled    | true         | false                 | http://ci.visibility.agentless.url | https://all-http-intake.logs.datad0g.com/api/v2/apmtelemetry",
-    "ci visibility agentless url is null | true         | true                  |                                    | https://all-http-intake.logs.datad0g.com/api/v2/apmtelemetry"
-  })
-  void intakeClientUsesCiVisibilityAgentlessUrlIfConfiguredToDoSo(
-      boolean ciVisEnabled,
-      boolean ciVisAgentlessEnabled,
-      String ciVisAgentlessUrl,
-      String expectedUrl) {
-    Config config = spy(Config.get());
-    doReturn("dummy-key").when(config).getApiKey();
-    doReturn(123).when(config).getAgentTimeout();
-    doReturn("datad0g.com").when(config).getSite();
-    doReturn(ciVisEnabled).when(config).isCiVisibilityEnabled();
-    doReturn(ciVisAgentlessEnabled).when(config).isCiVisibilityAgentlessEnabled();
-    doReturn(ciVisAgentlessUrl).when(config).getCiVisibilityAgentlessUrl();
+    @TableTest({
+      "scenario                            | ciVisEnabled | ciVisAgentlessEnabled | ciVisAgentlessUrl                  | expectedUrl                                                 ",
+      "ci visibility agentless enabled     | true         | true                  | http://ci.visibility.agentless.url | http://ci.visibility.agentless.url/api/v2/apmtelemetry      ",
+      "ci visibility disabled              | false        | true                  | http://ci.visibility.agentless.url | https://all-http-intake.logs.datad0g.com/api/v2/apmtelemetry",
+      "ci visibility agentless disabled    | true         | false                 | http://ci.visibility.agentless.url | https://all-http-intake.logs.datad0g.com/api/v2/apmtelemetry",
+      "ci visibility agentless url is null | true         | true                  |                                    | https://all-http-intake.logs.datad0g.com/api/v2/apmtelemetry"
+    })
+    void intakeClientUsesCiVisibilityAgentlessUrlIfConfiguredToDoSo(
+            boolean ciVisEnabled, boolean ciVisAgentlessEnabled, String ciVisAgentlessUrl, String expectedUrl) {
+        Config config = spy(Config.get());
+        doReturn("dummy-key").when(config).getApiKey();
+        doReturn(123).when(config).getAgentTimeout();
+        doReturn("datad0g.com").when(config).getSite();
+        doReturn(ciVisEnabled).when(config).isCiVisibilityEnabled();
+        doReturn(ciVisAgentlessEnabled).when(config).isCiVisibilityAgentlessEnabled();
+        doReturn(ciVisAgentlessUrl).when(config).getCiVisibilityAgentlessUrl();
 
-    TelemetryClient intakeClient =
-        TelemetryClient.buildIntakeClient(config, HttpRetryPolicy.Factory.NEVER_RETRY);
+        TelemetryClient intakeClient = TelemetryClient.buildIntakeClient(config, HttpRetryPolicy.Factory.NEVER_RETRY);
 
-    assertEquals(expectedUrl, intakeClient.getUrl().toString());
-  }
+        assertEquals(expectedUrl, intakeClient.getUrl().toString());
+    }
 
-  @Test
-  void intakeClientRetriesTelemetryRequestIfConfiguredToDoSo() {
-    OkHttpClient httpClient = mock(OkHttpClient.class);
-    HttpRetryPolicy.Factory httpRetryPolicy = new HttpRetryPolicy.Factory(2, 50, 1.5, true);
-    HttpUrl httpUrl = HttpUrl.get("https://intake.example.com");
-    TelemetryClient intakeClient =
-        new TelemetryClient(httpClient, httpRetryPolicy, httpUrl, "dummy-api-key");
+    @Test
+    void intakeClientRetriesTelemetryRequestIfConfiguredToDoSo() {
+        OkHttpClient httpClient = mock(OkHttpClient.class);
+        HttpRetryPolicy.Factory httpRetryPolicy = new HttpRetryPolicy.Factory(2, 50, 1.5, true);
+        HttpUrl httpUrl = HttpUrl.get("https://intake.example.com");
+        TelemetryClient intakeClient = new TelemetryClient(httpClient, httpRetryPolicy, httpUrl, "dummy-api-key");
 
-    doAnswer(
-            invocation -> {
-              throw new ConnectException("exception");
-            })
-        .when(httpClient)
-        .newCall(any());
+        doAnswer(invocation -> {
+                    throw new ConnectException("exception");
+                })
+                .when(httpClient)
+                .newCall(any());
 
-    intakeClient.sendHttpRequest(dummyRequest());
+        intakeClient.sendHttpRequest(dummyRequest());
 
-    // original request + 2 retries
-    verify(httpClient, times(3)).newCall(any());
-  }
+        // original request + 2 retries
+        verify(httpClient, times(3)).newCall(any());
+    }
 
-  private Request.Builder dummyRequest() {
-    return new TelemetryRequest(
-            mock(EventSource.class), mock(EventSink.class), 1000, RequestType.APP_STARTED, false)
-        .httpRequest();
-  }
+    private Request.Builder dummyRequest() {
+        return new TelemetryRequest(
+                        mock(EventSource.class), mock(EventSink.class), 1000, RequestType.APP_STARTED, false)
+                .httpRequest();
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/TelemetryRequestBodyDependencyMetadataTest.java b/telemetry/src/test/java/datadog/telemetry/TelemetryRequestBodyDependencyMetadataTest.java
index 9751aaf68d6..418b76cad03 100644
--- a/telemetry/src/test/java/datadog/telemetry/TelemetryRequestBodyDependencyMetadataTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/TelemetryRequestBodyDependencyMetadataTest.java
@@ -18,79 +18,75 @@
  */
 class TelemetryRequestBodyDependencyMetadataTest {
 
-  @Test
-  void writeDependency_includesMetadataArrayWhenPresent() throws IOException {
-    String metadataValue =
-        "{\"id\":\"GHSA-645p-88qh-w398\","
-            + "\"reached\":[{\"path\":\"com.fasterxml.jackson.databind.ObjectMapper\","
-            + "\"symbol\":\"<clinit>\",\"line\":1}]}";
-    Dependency dep =
-        new Dependency(
-            "com.fasterxml.jackson.core:jackson-databind",
-            "2.8.5",
-            null,
-            null,
-            Collections.singletonList(metadataValue));
-
-    String json = serializeDependency(dep);
-
-    assertTrue(json.contains("\"metadata\""), "metadata array must be present");
-    assertTrue(json.contains("\"type\":\"reachability\""), "type field must be reachability");
-    assertTrue(json.contains("\"value\":"), "value field must be present");
-    assertTrue(json.contains("GHSA-645p-88qh-w398"), "GHSA ID must appear in value");
-  }
-
-  @Test
-  void writeDependency_includesAllMetadataEntriesForMultipleCves() throws IOException {
-    Dependency dep =
-        new Dependency(
-            "com.example:lib",
-            "1.0.0",
-            null,
-            null,
-            Arrays.asList(
-                "{\"id\":\"GHSA-aaa-1111-2222\",\"reached\":[]}",
-                "{\"id\":\"GHSA-bbb-3333-4444\",\"reached\":[]}"));
-
-    String json = serializeDependency(dep);
-
-    assertTrue(json.contains("GHSA-aaa-1111-2222"), "first CVE must be present");
-    assertTrue(json.contains("GHSA-bbb-3333-4444"), "second CVE must be present");
-  }
-
-  @Test
-  void writeDependency_omitsMetadataFieldWhenNull() throws IOException {
-    Dependency dep = new Dependency("com.example:lib", "1.0.0", null, null);
-
-    String json = serializeDependency(dep);
-
-    assertFalse(json.contains("\"metadata\""), "metadata field must be absent when null");
-  }
-
-  @Test
-  void writeDependency_includesEmptyMetadataArrayWhenListIsEmpty() throws IOException {
-    // RFC: metadata:[] (non-null, empty) means "SCA is active for this dep but no CVEs detected".
-    // Must be written so the backend knows SCA is monitoring the dependency.
-    Dependency dep =
-        new Dependency("com.example:lib", "1.0.0", null, null, Collections.emptyList());
-
-    String json = serializeDependency(dep);
-
-    assertTrue(json.contains("\"metadata\":[]"), "metadata:[] must be present when list is empty");
-  }
-
-  private static String serializeDependency(Dependency dep) throws IOException {
-    TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_DEPENDENCIES_LOADED);
-    req.beginRequest(false);
-    req.beginDependencies();
-    req.writeDependency(dep);
-    req.endDependencies();
-    req.endRequest();
-
-    Buffer buf = new Buffer();
-    req.writeTo(buf);
-    byte[] bytes = new byte[(int) buf.size()];
-    buf.read(bytes);
-    return new String(bytes, StandardCharsets.UTF_8);
-  }
+    @Test
+    void writeDependency_includesMetadataArrayWhenPresent() throws IOException {
+        String metadataValue = "{\"id\":\"GHSA-645p-88qh-w398\","
+                + "\"reached\":[{\"path\":\"com.fasterxml.jackson.databind.ObjectMapper\","
+                + "\"symbol\":\"<clinit>\",\"line\":1}]}";
+        Dependency dep = new Dependency(
+                "com.fasterxml.jackson.core:jackson-databind",
+                "2.8.5",
+                null,
+                null,
+                Collections.singletonList(metadataValue));
+
+        String json = serializeDependency(dep);
+
+        assertTrue(json.contains("\"metadata\""), "metadata array must be present");
+        assertTrue(json.contains("\"type\":\"reachability\""), "type field must be reachability");
+        assertTrue(json.contains("\"value\":"), "value field must be present");
+        assertTrue(json.contains("GHSA-645p-88qh-w398"), "GHSA ID must appear in value");
+    }
+
+    @Test
+    void writeDependency_includesAllMetadataEntriesForMultipleCves() throws IOException {
+        Dependency dep = new Dependency(
+                "com.example:lib",
+                "1.0.0",
+                null,
+                null,
+                Arrays.asList(
+                        "{\"id\":\"GHSA-aaa-1111-2222\",\"reached\":[]}",
+                        "{\"id\":\"GHSA-bbb-3333-4444\",\"reached\":[]}"));
+
+        String json = serializeDependency(dep);
+
+        assertTrue(json.contains("GHSA-aaa-1111-2222"), "first CVE must be present");
+        assertTrue(json.contains("GHSA-bbb-3333-4444"), "second CVE must be present");
+    }
+
+    @Test
+    void writeDependency_omitsMetadataFieldWhenNull() throws IOException {
+        Dependency dep = new Dependency("com.example:lib", "1.0.0", null, null);
+
+        String json = serializeDependency(dep);
+
+        assertFalse(json.contains("\"metadata\""), "metadata field must be absent when null");
+    }
+
+    @Test
+    void writeDependency_includesEmptyMetadataArrayWhenListIsEmpty() throws IOException {
+        // RFC: metadata:[] (non-null, empty) means "SCA is active for this dep but no CVEs detected".
+        // Must be written so the backend knows SCA is monitoring the dependency.
+        Dependency dep = new Dependency("com.example:lib", "1.0.0", null, null, Collections.emptyList());
+
+        String json = serializeDependency(dep);
+
+        assertTrue(json.contains("\"metadata\":[]"), "metadata:[] must be present when list is empty");
+    }
+
+    private static String serializeDependency(Dependency dep) throws IOException {
+        TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_DEPENDENCIES_LOADED);
+        req.beginRequest(false);
+        req.beginDependencies();
+        req.writeDependency(dep);
+        req.endDependencies();
+        req.endRequest();
+
+        Buffer buf = new Buffer();
+        req.writeTo(buf);
+        byte[] bytes = new byte[(int) buf.size()];
+        buf.read(bytes);
+        return new String(bytes, StandardCharsets.UTF_8);
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/TelemetryRequestBodyTest.java b/telemetry/src/test/java/datadog/telemetry/TelemetryRequestBodyTest.java
index b1c4600eaa5..a6b54bde5eb 100644
--- a/telemetry/src/test/java/datadog/telemetry/TelemetryRequestBodyTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/TelemetryRequestBodyTest.java
@@ -37,186 +37,177 @@
 @ExtendWith(WithConfigExtension.class)
 class TelemetryRequestBodyTest {
 
-  @AfterEach
-  void resetProcessTags() {
-    ProcessTags.reset(Config.get());
-  }
-
-  @Test
-  void throwSerializationExceptionInCaseOfJsonNestingProblem() {
-    TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_STARTED);
-
-    req.beginRequest(false);
-    TelemetryRequestBody.SerializationException exception =
-        assertThrows(
-            TelemetryRequestBody.SerializationException.class, () -> req.beginRequest(false));
-
-    assertEquals("Failed serializing Telemetry begin-request part!", exception.getMessage());
-    assertNotNull(exception.getCause());
-  }
-
-  @Test
-  void throwSerializationExceptionInCaseOfMoreThanOneTopLevelJsonValue() {
-    TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_STARTED);
-
-    req.beginRequest(false);
-    req.endRequest();
-    TelemetryRequestBody.SerializationException exception =
-        assertThrows(
-            TelemetryRequestBody.SerializationException.class, () -> req.beginRequest(false));
-
-    assertEquals("Failed serializing Telemetry begin-request part!", exception.getMessage());
-    assertNotNull(exception.getCause());
-  }
-
-  @Test
-  void writeConfigMustSupportValuesOfBooleanStringNumberAndNull() throws IOException {
-    TelemetryRequestBody req =
-        new TelemetryRequestBody(RequestType.APP_CLIENT_CONFIGURATION_CHANGE);
-    Map<String, Object> map = new HashMap<>();
-    map.put("key1", "value1");
-    map.put("key2", Double.parseDouble("432.32"));
-    map.put("key3", 324);
-
-    req.beginRequest(false);
-    // exclude request header to simplify assertion
-    drainToString(req);
-
-    req.beginConfiguration();
-    List<ConfigSetting> configSettings =
-        Arrays.asList(
-            ConfigSetting.of("string", "bar", ConfigOrigin.REMOTE),
-            ConfigSetting.of("int", 2342, ConfigOrigin.DEFAULT),
-            ConfigSetting.of("double", Double.valueOf("123.456"), ConfigOrigin.ENV),
-            ConfigSetting.of("map", map, ConfigOrigin.JVM_PROP),
-            ConfigSetting.of("list", Arrays.asList("1", "2", 3), ConfigOrigin.DEFAULT),
-            // make sure null values are serialized
-            ConfigSetting.of("null", null, ConfigOrigin.DEFAULT));
-    for (ConfigSetting configSetting : configSettings) {
-      req.writeConfiguration(configSetting);
+    @AfterEach
+    void resetProcessTags() {
+        ProcessTags.reset(Config.get());
     }
-    req.endConfiguration();
-
-    String expectedJson =
-        ",\"configuration\":["
-            + "{\"name\":\"DD_STRING\",\"value\":\"bar\",\"origin\":\"remote_config\",\"seq_id\":0},"
-            + "{\"name\":\"DD_INT\",\"value\":\"2342\",\"origin\":\"default\",\"seq_id\":0},"
-            + "{\"name\":\"DD_DOUBLE\",\"value\":\"123.456\",\"origin\":\"env_var\",\"seq_id\":0},"
-            + "{\"name\":\"DD_MAP\",\"value\":\"key1:value1,key2:432.32,key3:324\",\"origin\":\"jvm_prop\",\"seq_id\":0},"
-            + "{\"name\":\"DD_LIST\",\"value\":\"1,2,3\",\"origin\":\"default\",\"seq_id\":0},"
-            + "{\"name\":\"DD_NULL\",\"value\":null,\"origin\":\"default\",\"seq_id\":0}]";
-    assertEquals(expectedJson, drainToString(req));
-  }
-
-  @Test
-  void useEnvironmentVariableForSettingKeys() throws IOException {
-    TelemetryRequestBody req =
-        new TelemetryRequestBody(RequestType.APP_CLIENT_CONFIGURATION_CHANGE);
-
-    req.beginRequest(false);
-    // exclude request header to simplify assertion
-    drainToString(req);
-
-    req.beginConfiguration();
-    req.writeConfiguration(ConfigSetting.of("this.is.a.key", "value", ConfigOrigin.REMOTE));
-    req.endConfiguration();
-
-    assertEquals(
-        ",\"configuration\":[{\"name\":\"DD_THIS_IS_A_KEY\",\"value\":\"value\",\"origin\":\"remote_config\",\"seq_id\":0}]",
-        drainToString(req));
-  }
-
-  @Test
-  void addDebugFlag() throws IOException {
-    TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_STARTED);
-
-    req.beginRequest(true);
-    req.endRequest();
-
-    assertTrue(drainToString(req).contains("\"debug\":true"));
-  }
-
-  @TableTest({
-    "scenario                                          | appsecChange | profilerChange | dynamicInstrumentationChange | appsecEnabled | profilerEnabled | dynamicInstrumentationEnabled",
-    "all products changed and enabled                  | true         | true           | true                         | true          | true            | true                         ",
-    "all products changed and disabled                 | true         | true           | true                         | false         | false           | false                        ",
-    "no product changed                                | false        | false          | false                        | true          | true            | true                         ",
-    "only profiler and dynamic instrumentation changed | false        | true           | true                         | true          | true            | true                         ",
-    "only appsec and dynamic instrumentation changed   | true         | false          | true                         | true          | true            | true                         ",
-    "only appsec and profiler changed                  | true         | true           | false                        | true          | true            | true                         "
-  })
-  void writeProducts(
-      boolean appsecChange,
-      boolean profilerChange,
-      boolean dynamicInstrumentationChange,
-      boolean appsecEnabled,
-      boolean profilerEnabled,
-      boolean dynamicInstrumentationEnabled)
-      throws IOException {
-    TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_PRODUCT_CHANGE);
-    Map<ProductType, Boolean> products = new EnumMap<>(ProductType.class);
-    if (appsecChange) {
-      products.put(APPSEC, appsecEnabled);
+
+    @Test
+    void throwSerializationExceptionInCaseOfJsonNestingProblem() {
+        TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_STARTED);
+
+        req.beginRequest(false);
+        TelemetryRequestBody.SerializationException exception =
+                assertThrows(TelemetryRequestBody.SerializationException.class, () -> req.beginRequest(false));
+
+        assertEquals("Failed serializing Telemetry begin-request part!", exception.getMessage());
+        assertNotNull(exception.getCause());
+    }
+
+    @Test
+    void throwSerializationExceptionInCaseOfMoreThanOneTopLevelJsonValue() {
+        TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_STARTED);
+
+        req.beginRequest(false);
+        req.endRequest();
+        TelemetryRequestBody.SerializationException exception =
+                assertThrows(TelemetryRequestBody.SerializationException.class, () -> req.beginRequest(false));
+
+        assertEquals("Failed serializing Telemetry begin-request part!", exception.getMessage());
+        assertNotNull(exception.getCause());
+    }
+
+    @Test
+    void writeConfigMustSupportValuesOfBooleanStringNumberAndNull() throws IOException {
+        TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_CLIENT_CONFIGURATION_CHANGE);
+        Map<String, Object> map = new HashMap<>();
+        map.put("key1", "value1");
+        map.put("key2", Double.parseDouble("432.32"));
+        map.put("key3", 324);
+
+        req.beginRequest(false);
+        // exclude request header to simplify assertion
+        drainToString(req);
+
+        req.beginConfiguration();
+        List<ConfigSetting> configSettings = Arrays.asList(
+                ConfigSetting.of("string", "bar", ConfigOrigin.REMOTE),
+                ConfigSetting.of("int", 2342, ConfigOrigin.DEFAULT),
+                ConfigSetting.of("double", Double.valueOf("123.456"), ConfigOrigin.ENV),
+                ConfigSetting.of("map", map, ConfigOrigin.JVM_PROP),
+                ConfigSetting.of("list", Arrays.asList("1", "2", 3), ConfigOrigin.DEFAULT),
+                // make sure null values are serialized
+                ConfigSetting.of("null", null, ConfigOrigin.DEFAULT));
+        for (ConfigSetting configSetting : configSettings) {
+            req.writeConfiguration(configSetting);
+        }
+        req.endConfiguration();
+
+        String expectedJson = ",\"configuration\":["
+                + "{\"name\":\"DD_STRING\",\"value\":\"bar\",\"origin\":\"remote_config\",\"seq_id\":0},"
+                + "{\"name\":\"DD_INT\",\"value\":\"2342\",\"origin\":\"default\",\"seq_id\":0},"
+                + "{\"name\":\"DD_DOUBLE\",\"value\":\"123.456\",\"origin\":\"env_var\",\"seq_id\":0},"
+                + "{\"name\":\"DD_MAP\",\"value\":\"key1:value1,key2:432.32,key3:324\",\"origin\":\"jvm_prop\",\"seq_id\":0},"
+                + "{\"name\":\"DD_LIST\",\"value\":\"1,2,3\",\"origin\":\"default\",\"seq_id\":0},"
+                + "{\"name\":\"DD_NULL\",\"value\":null,\"origin\":\"default\",\"seq_id\":0}]";
+        assertEquals(expectedJson, drainToString(req));
+    }
+
+    @Test
+    void useEnvironmentVariableForSettingKeys() throws IOException {
+        TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_CLIENT_CONFIGURATION_CHANGE);
+
+        req.beginRequest(false);
+        // exclude request header to simplify assertion
+        drainToString(req);
+
+        req.beginConfiguration();
+        req.writeConfiguration(ConfigSetting.of("this.is.a.key", "value", ConfigOrigin.REMOTE));
+        req.endConfiguration();
+
+        assertEquals(
+                ",\"configuration\":[{\"name\":\"DD_THIS_IS_A_KEY\",\"value\":\"value\",\"origin\":\"remote_config\",\"seq_id\":0}]",
+                drainToString(req));
+    }
+
+    @Test
+    void addDebugFlag() throws IOException {
+        TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_STARTED);
+
+        req.beginRequest(true);
+        req.endRequest();
+
+        assertTrue(drainToString(req).contains("\"debug\":true"));
     }
-    if (profilerChange) {
-      products.put(PROFILER, profilerEnabled);
+
+    @TableTest({
+      "scenario                                          | appsecChange | profilerChange | dynamicInstrumentationChange | appsecEnabled | profilerEnabled | dynamicInstrumentationEnabled",
+      "all products changed and enabled                  | true         | true           | true                         | true          | true            | true                         ",
+      "all products changed and disabled                 | true         | true           | true                         | false         | false           | false                        ",
+      "no product changed                                | false        | false          | false                        | true          | true            | true                         ",
+      "only profiler and dynamic instrumentation changed | false        | true           | true                         | true          | true            | true                         ",
+      "only appsec and dynamic instrumentation changed   | true         | false          | true                         | true          | true            | true                         ",
+      "only appsec and profiler changed                  | true         | true           | false                        | true          | true            | true                         "
+    })
+    void writeProducts(
+            boolean appsecChange,
+            boolean profilerChange,
+            boolean dynamicInstrumentationChange,
+            boolean appsecEnabled,
+            boolean profilerEnabled,
+            boolean dynamicInstrumentationEnabled)
+            throws IOException {
+        TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_PRODUCT_CHANGE);
+        Map<ProductType, Boolean> products = new EnumMap<>(ProductType.class);
+        if (appsecChange) {
+            products.put(APPSEC, appsecEnabled);
+        }
+        if (profilerChange) {
+            products.put(PROFILER, profilerEnabled);
+        }
+        if (dynamicInstrumentationChange) {
+            products.put(DYNAMIC_INSTRUMENTATION, dynamicInstrumentationEnabled);
+        }
+
+        req.beginRequest(false);
+        req.writeProducts(products);
+        req.endRequest();
+
+        String result = drainToString(req);
+        assertEquals(appsecChange, result.contains("\"appsec\":{\"enabled\":" + appsecEnabled + "}"));
+        assertEquals(profilerChange, result.contains("\"profiler\":{\"enabled\":" + profilerEnabled + "}"));
+        assertEquals(
+                dynamicInstrumentationChange,
+                result.contains("\"dynamic_instrumentation\":{\"enabled\":" + dynamicInstrumentationEnabled + "}"));
     }
-    if (dynamicInstrumentationChange) {
-      products.put(DYNAMIC_INSTRUMENTATION, dynamicInstrumentationEnabled);
+
+    @TableTest({
+      "scenario | processTagsEnabled",
+      "enabled  | true              ",
+      "disabled | false             "
+    })
+    @SuppressWarnings("unchecked")
+    void shouldPropagateProcessTagsWhenEnabled(boolean processTagsEnabled) throws IOException {
+        WithConfigExtension.injectSysConfig(
+                EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, String.valueOf(processTagsEnabled));
+        try {
+            ProcessTags.reset(Config.get());
+            TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_STARTED);
+
+            req.beginRequest(true);
+            req.endRequest();
+
+            JsonAdapter<Object> adapter = new Moshi.Builder()
+                    .build()
+                    .adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
+            Map<String, Object> parsed = (Map<String, Object>) adapter.fromJson(drainToString(req));
+            Map<String, Object> application = (Map<String, Object>) parsed.get("application");
+            Object parsedTags = application.get("process_tags");
+            if (processTagsEnabled) {
+                assertEquals(ProcessTags.getTagsForSerialization().toString(), parsedTags);
+            } else {
+                assertNull(parsedTags);
+            }
+        } finally {
+            WithConfigExtension.injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "false");
+        }
     }
 
-    req.beginRequest(false);
-    req.writeProducts(products);
-    req.endRequest();
-
-    String result = drainToString(req);
-    assertEquals(appsecChange, result.contains("\"appsec\":{\"enabled\":" + appsecEnabled + "}"));
-    assertEquals(
-        profilerChange, result.contains("\"profiler\":{\"enabled\":" + profilerEnabled + "}"));
-    assertEquals(
-        dynamicInstrumentationChange,
-        result.contains(
-            "\"dynamic_instrumentation\":{\"enabled\":" + dynamicInstrumentationEnabled + "}"));
-  }
-
-  @TableTest({
-    "scenario | processTagsEnabled",
-    "enabled  | true              ",
-    "disabled | false             "
-  })
-  @SuppressWarnings("unchecked")
-  void shouldPropagateProcessTagsWhenEnabled(boolean processTagsEnabled) throws IOException {
-    WithConfigExtension.injectSysConfig(
-        EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, String.valueOf(processTagsEnabled));
-    try {
-      ProcessTags.reset(Config.get());
-      TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_STARTED);
-
-      req.beginRequest(true);
-      req.endRequest();
-
-      JsonAdapter<Object> adapter =
-          new Moshi.Builder()
-              .build()
-              .adapter(Types.newParameterizedType(Map.class, String.class, Object.class));
-      Map<String, Object> parsed = (Map<String, Object>) adapter.fromJson(drainToString(req));
-      Map<String, Object> application = (Map<String, Object>) parsed.get("application");
-      Object parsedTags = application.get("process_tags");
-      if (processTagsEnabled) {
-        assertEquals(ProcessTags.getTagsForSerialization().toString(), parsedTags);
-      } else {
-        assertNull(parsedTags);
-      }
-    } finally {
-      WithConfigExtension.injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "false");
+    private static String drainToString(RequestBody body) throws IOException {
+        Buffer buf = new Buffer();
+        body.writeTo(buf);
+        byte[] bytes = new byte[(int) buf.size()];
+        buf.read(bytes);
+        return new String(bytes);
     }
-  }
-
-  private static String drainToString(RequestBody body) throws IOException {
-    Buffer buf = new Buffer();
-    body.writeTo(buf);
-    byte[] bytes = new byte[(int) buf.size()];
-    buf.read(bytes);
-    return new String(bytes);
-  }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/TelemetryRouterTest.java b/telemetry/src/test/java/datadog/telemetry/TelemetryRouterTest.java
index 5cc474ce23a..ae728c686a6 100644
--- a/telemetry/src/test/java/datadog/telemetry/TelemetryRouterTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/TelemetryRouterTest.java
@@ -33,492 +33,479 @@
 
 class TelemetryRouterTest {
 
-  private static final HttpUrl AGENT_URL = HttpUrl.get("https://agent.example.com");
-  private static final HttpUrl AGENT_TELEMETRY_URL =
-      AGENT_URL.resolve("telemetry/proxy/api/v2/apmtelemetry");
-  private static final HttpUrl INTAKE_URL = HttpUrl.get("https://intake.example.com");
-  private static final String API_KEY = "api-key";
-  private static final String API_KEY_HEADER = "DD-API-KEY";
-
-  private final OkHttpClient okHttpClient = mock(OkHttpClient.class);
-  private final DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery =
-      mock(DDAgentFeaturesDiscovery.class);
-
-  private TelemetryClient agentTelemetryClient;
-  private TelemetryClient intakeTelemetryClient;
-  private TelemetryRouter router;
-
-  @BeforeEach
-  void setup() {
-    agentTelemetryClient = TelemetryClient.buildAgentClient(okHttpClient, AGENT_URL, NEVER_RETRY);
-    intakeTelemetryClient = new TelemetryClient(okHttpClient, NEVER_RETRY, INTAKE_URL, API_KEY);
-    router =
-        new TelemetryRouter(
-            ddAgentFeaturesDiscovery, agentTelemetryClient, intakeTelemetryClient, false);
-  }
-
-  @TableTest({
-    "scenario                          | httpCode | sendResult",
-    "informational status is a failure | 100      | FAILURE   ",
-    "accepted status is a success      | 202      | SUCCESS   ",
-    "not found status is not found     | 404      | NOT_FOUND ",
-    "server error status is a failure  | 500      | FAILURE   "
-  })
-  void mapAnHttpStatusCodeToTheCorrectSendResult(int httpCode, String sendResult) {
-    stubNewCallReturning(httpCode);
-
-    TelemetryClient.Result result = router.sendRequest(dummyRequest());
-
-    assertEquals(TelemetryClient.Result.valueOf(sendResult), result);
-    verify(okHttpClient, times(1)).newCall(any());
-  }
-
-  @Test
-  void catchIOExceptionFromOkHttpClientAndReturnFailure() {
-    stubNewCallThrowing(new IOException("exception"));
-
-    TelemetryClient.Result result = router.sendRequest(dummyRequest());
-
-    assertEquals(FAILURE, result);
-    verify(okHttpClient, times(1)).newCall(any());
-  }
-
-  @Test
-  void catchInterruptedIOExceptionFromOkHttpClientAndReturnInterrupted() {
-    stubNewCallThrowing(new InterruptedIOException("interrupted"));
-
-    TelemetryClient.Result result = router.sendRequest(dummyRequest());
-
-    assertEquals(TelemetryClient.Result.INTERRUPTED, result);
-    verify(okHttpClient, times(1)).newCall(any());
-  }
-
-  @TableTest({
-    "returnCode",
-    "200       ",
-    "404       ",
-    "500       "
-  })
-  void keepTryingToSendTelemetryToAgentDespiteOfReturnCodeWhenIntakeClientIsNull(int returnCode) {
-    TelemetryRouter agentOnlyRouter =
-        new TelemetryRouter(ddAgentFeaturesDiscovery, agentTelemetryClient, null, false);
-    Request[] capturedRequest = new Request[1];
-    stubNewCallCapturingRequest(capturedRequest, returnCode);
-    when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(true);
-
-    agentOnlyRouter.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
-    assertNull(capturedRequest[0].header(API_KEY_HEADER));
-    clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
-
-    when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(false);
-
-    agentOnlyRouter.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
-    assertNull(capturedRequest[0].header(API_KEY_HEADER));
-  }
-
-  @TableTest({
-    "returnCode",
-    "404       ",
-    "500       "
-  })
-  void switchToIntakeWhenAgentStopsSupportingTelemetryProxyAndTelemetryRequestsStartFailing(
-      int returnCode) {
-    Request[] capturedRequest = new Request[1];
-    stubNewCallCapturingRequest(capturedRequest, returnCode);
-    when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(true);
-
-    router.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
-    assertNull(capturedRequest[0].header(API_KEY_HEADER));
-    clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
-
-    when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(false);
-
-    router.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(INTAKE_URL, capturedRequest[0].url());
-    assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
-  }
-
-  @Test
-  void whenConfiguredToPreferIntakeUseIntakeClientFromTheStart() {
-    TelemetryRouter telemetryRouter =
-        new TelemetryRouter(
-            ddAgentFeaturesDiscovery, agentTelemetryClient, intakeTelemetryClient, true);
-    Request[] capturedRequest = new Request[1];
-    stubNewCallCapturingRequest(capturedRequest, 200);
-    when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(false);
-
-    telemetryRouter.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(INTAKE_URL, capturedRequest[0].url());
-    assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
-  }
-
-  @Test
-  void
-      whenConfiguredToPreferIntakeDoNotSwitchToAgentIfIntakeRequestSucceedsEvenIfAgentSupportsTelemetryProxy() {
-    TelemetryRouter telemetryRouter =
-        new TelemetryRouter(
-            ddAgentFeaturesDiscovery, agentTelemetryClient, intakeTelemetryClient, true);
-    Request[] capturedRequest = new Request[1];
-    stubNewCallCapturingRequest(capturedRequest, 200);
-    when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(true);
-
-    telemetryRouter.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(INTAKE_URL, capturedRequest[0].url());
-    assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
-    clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
-
-    telemetryRouter.sendRequest(dummyRequest());
-
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(INTAKE_URL, capturedRequest[0].url());
-    assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
-  }
-
-  @Test
-  void whenConfiguredToPreferIntakeDoNotSwitchToAgentIfRequestIsInterrupted() {
-    TelemetryRouter telemetryRouter =
-        new TelemetryRouter(
-            ddAgentFeaturesDiscovery, agentTelemetryClient, intakeTelemetryClient, true);
-    Request[] capturedRequest = new Request[1];
-    doAnswer(
-            invocation -> {
-              capturedRequest[0] = invocation.getArgument(0);
-              throw new InterruptedIOException("interrupted");
-            })
-        .when(okHttpClient)
-        .newCall(any());
-    when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(true);
-
-    telemetryRouter.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(INTAKE_URL, capturedRequest[0].url());
-    assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
-    clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
-
-    stubNewCallCapturingRequest(capturedRequest, 200);
-
-    telemetryRouter.sendRequest(dummyRequest());
-
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(INTAKE_URL, capturedRequest[0].url());
-    assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
-  }
-
-  @Test
-  void whenConfiguredToPreferIntakeSwitchToAgentIfIntakeRequestFails() {
-    TelemetryRouter telemetryRouter =
-        new TelemetryRouter(
-            ddAgentFeaturesDiscovery, agentTelemetryClient, intakeTelemetryClient, true);
-    Request[] capturedRequest = new Request[1];
-    stubNewCallCapturingRequest(capturedRequest, 403);
-    when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(true);
-
-    telemetryRouter.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(INTAKE_URL, capturedRequest[0].url());
-    assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
-    clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
-
-    stubNewCallCapturingRequest(capturedRequest, 200);
-
-    telemetryRouter.sendRequest(dummyRequest());
-
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
-    assertNull(capturedRequest[0].header(API_KEY_HEADER));
-  }
-
-  @Test
-  void doNotSwitchToIntakeWhenAgentStopsSupportingTelemetryProxyButAcceptsTelemetryRequests() {
-    Request[] capturedRequest = new Request[1];
-    stubNewCallCapturingRequest(capturedRequest, 200);
-    when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(true);
-
-    router.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
-    assertNull(capturedRequest[0].header(API_KEY_HEADER));
-    clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
-
-    stubNewCallCapturingRequest(capturedRequest, 201);
-    when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(false);
-
-    router.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
-    assertNull(capturedRequest[0].header(API_KEY_HEADER));
-  }
-
-  @TableTest({
-    "returnCode",
-    "404       ",
-    "500       "
-  })
-  void switchToIntakeWhenAgentFailsToReceiveTelemetryRequests(int returnCode) {
-    Request[] capturedRequest = new Request[1];
-    stubNewCallCapturingRequest(capturedRequest, returnCode);
-    when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(true, false);
-
-    router.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
-    assertNull(capturedRequest[0].header(API_KEY_HEADER));
-    clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
-
-    router.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(INTAKE_URL, capturedRequest[0].url());
-    assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
-  }
-
-  @TableTest({
-    "returnCode | expectedApiKey | expectedUrlIsAgent",
-    "404        |                | true              ",
-    "500        |                | true              "
-  })
-  void useAgentWhenIntakeIsNotAvailable(
-      int returnCode, String expectedApiKey, boolean expectedUrlIsAgent) {
-    HttpUrl expectedUrl = expectedUrlIsAgent ? AGENT_TELEMETRY_URL : INTAKE_URL;
-    TelemetryRouter agentOnlyRouter =
-        new TelemetryRouter(ddAgentFeaturesDiscovery, agentTelemetryClient, null, false);
-    Request[] capturedRequest = new Request[1];
-    stubNewCallCapturingRequest(capturedRequest, returnCode);
-    when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(false);
-
-    agentOnlyRouter.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(expectedUrl, capturedRequest[0].url());
-    assertEquals(expectedApiKey, capturedRequest[0].header(API_KEY_HEADER));
-    clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
-
-    agentOnlyRouter.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
-    assertNull(capturedRequest[0].header(API_KEY_HEADER));
-    clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
-
-    agentOnlyRouter.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(expectedUrl, capturedRequest[0].url());
-    assertEquals(expectedApiKey, capturedRequest[0].header(API_KEY_HEADER));
-  }
-
-  @TableTest({
-    "returnCode",
-    "404       ",
-    "500       "
-  })
-  void switchToIntakeThenBackToAgentWhenBothFailToReceiveTelemetryRequests(int returnCode) {
-    Request[] capturedRequest = new Request[1];
-    stubNewCallCapturingRequest(capturedRequest, returnCode);
-    when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(false);
-
-    // always send first telemetry request to Agent
-    router.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
-    assertNull(capturedRequest[0].header(API_KEY_HEADER));
-    clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
-
-    // switch to Intake if sending a telemetry request to Agent failed or Agent supports
-    // telemetry proxy
-    router.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(INTAKE_URL, capturedRequest[0].url());
-    assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
-    clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
-
-    // switch back to Agent if Intake request fails
-    router.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
-    assertNull(capturedRequest[0].header(API_KEY_HEADER));
-  }
-
-  @Test
-  void singleClientConstructorSkipsFeatureDiscoveryAndDelegatesToTheGivenClient() {
-    TelemetryClient singleClient = mock(TelemetryClient.class);
-    TelemetryRouter singleClientRouter = new TelemetryRouter(singleClient);
-    when(singleClient.sendHttpRequest(any())).thenReturn(SUCCESS);
-
-    TelemetryClient.Result result = singleClientRouter.sendRequest(dummyRequest());
-
-    assertEquals(SUCCESS, result);
-    verify(singleClient, times(1)).sendHttpRequest(any());
-    verify(ddAgentFeaturesDiscovery, never()).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, never()).supportsTelemetryProxy();
-  }
-
-  @Test
-  void singleClientConstructorDoesNotSwitchClientsOnFailure() {
-    TelemetryClient singleClient = mock(TelemetryClient.class);
-    TelemetryRouter singleClientRouter = new TelemetryRouter(singleClient);
-
-    // first request fails
-    when(singleClient.sendHttpRequest(any())).thenReturn(FAILURE);
-    TelemetryClient.Result firstResult = singleClientRouter.sendRequest(dummyRequest());
-
-    assertEquals(FAILURE, firstResult);
-    verify(singleClient, times(1)).sendHttpRequest(any());
-
-    // second request goes to the same client
-    when(singleClient.sendHttpRequest(any())).thenReturn(SUCCESS);
-    TelemetryClient.Result secondResult = singleClientRouter.sendRequest(dummyRequest());
-
-    assertEquals(SUCCESS, secondResult);
-    verify(singleClient, times(2)).sendHttpRequest(any());
-    verifyNoMoreInteractions(ddAgentFeaturesDiscovery);
-  }
-
-  @TableTest({
-    "returnCode",
-    "404       ",
-    "500       "
-  })
-  void switchBackToAgentIfItStartsSupportingTelemetry(int returnCode) {
-    Request[] capturedRequest = new Request[1];
-    stubNewCallCapturingRequest(capturedRequest, returnCode);
-    when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(false);
-
-    // always send first telemetry request to Agent
-    router.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
-    assertNull(capturedRequest[0].header(API_KEY_HEADER));
-    clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
-
-    // switch to Intake if sending a telemetry request to Agent failed or Agent supports
-    // telemetry proxy
-    stubNewCallCapturingRequest(capturedRequest, 201);
-    when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(true);
-
-    router.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(INTAKE_URL, capturedRequest[0].url());
-    assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
-    clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
-
-    // switch back to Agent if it starts supporting telemetry proxy
-    stubNewCallCapturingRequest(capturedRequest, returnCode);
-    when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(false);
-
-    router.sendRequest(dummyRequest());
-
-    verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
-    verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
-    verify(okHttpClient, times(1)).newCall(any());
-    assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
-    assertNull(capturedRequest[0].header(API_KEY_HEADER));
-  }
-
-  private TelemetryRequest dummyRequest() {
-    return new TelemetryRequest(
-        mock(EventSource.class), mock(EventSink.class), 1000, RequestType.APP_STARTED, false);
-  }
-
-  private static Call mockCall(int code) throws IOException {
-    Call call = mock(Call.class);
-    when(call.execute())
-        .thenReturn(
-            new Response.Builder()
-                .request(new Request.Builder().url(HttpUrl.get("https://example.com")).build())
-                .protocol(Protocol.HTTP_1_1)
-                .message("OK")
-                .body(ResponseBody.create(MediaType.get("text/plain"), "OK"))
-                .code(code)
-                .build());
-    return call;
-  }
-
-  // stubs newCall() via doAnswer rather than when().thenAnswer() so that re-stubbing across
-  // multiple stages of the same test does not trigger a previously configured throwing answer
-  private void stubNewCallReturning(int code) {
-    doAnswer(invocation -> mockCall(code)).when(okHttpClient).newCall(any());
-  }
-
-  private void stubNewCallCapturingRequest(Request[] capturedRequest, int code) {
-    doAnswer(
-            invocation -> {
-              capturedRequest[0] = invocation.getArgument(0);
-              return mockCall(code);
-            })
-        .when(okHttpClient)
-        .newCall(any());
-  }
-
-  private void stubNewCallThrowing(IOException exception) {
-    doAnswer(
-            invocation -> {
-              throw exception;
-            })
-        .when(okHttpClient)
-        .newCall(any());
-  }
+    private static final HttpUrl AGENT_URL = HttpUrl.get("https://agent.example.com");
+    private static final HttpUrl AGENT_TELEMETRY_URL = AGENT_URL.resolve("telemetry/proxy/api/v2/apmtelemetry");
+    private static final HttpUrl INTAKE_URL = HttpUrl.get("https://intake.example.com");
+    private static final String API_KEY = "api-key";
+    private static final String API_KEY_HEADER = "DD-API-KEY";
+
+    private final OkHttpClient okHttpClient = mock(OkHttpClient.class);
+    private final DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery = mock(DDAgentFeaturesDiscovery.class);
+
+    private TelemetryClient agentTelemetryClient;
+    private TelemetryClient intakeTelemetryClient;
+    private TelemetryRouter router;
+
+    @BeforeEach
+    void setup() {
+        agentTelemetryClient = TelemetryClient.buildAgentClient(okHttpClient, AGENT_URL, NEVER_RETRY);
+        intakeTelemetryClient = new TelemetryClient(okHttpClient, NEVER_RETRY, INTAKE_URL, API_KEY);
+        router = new TelemetryRouter(ddAgentFeaturesDiscovery, agentTelemetryClient, intakeTelemetryClient, false);
+    }
+
+    @TableTest({
+      "scenario                          | httpCode | sendResult",
+      "informational status is a failure | 100      | FAILURE   ",
+      "accepted status is a success      | 202      | SUCCESS   ",
+      "not found status is not found     | 404      | NOT_FOUND ",
+      "server error status is a failure  | 500      | FAILURE   "
+    })
+    void mapAnHttpStatusCodeToTheCorrectSendResult(int httpCode, String sendResult) {
+        stubNewCallReturning(httpCode);
+
+        TelemetryClient.Result result = router.sendRequest(dummyRequest());
+
+        assertEquals(TelemetryClient.Result.valueOf(sendResult), result);
+        verify(okHttpClient, times(1)).newCall(any());
+    }
+
+    @Test
+    void catchIOExceptionFromOkHttpClientAndReturnFailure() {
+        stubNewCallThrowing(new IOException("exception"));
+
+        TelemetryClient.Result result = router.sendRequest(dummyRequest());
+
+        assertEquals(FAILURE, result);
+        verify(okHttpClient, times(1)).newCall(any());
+    }
+
+    @Test
+    void catchInterruptedIOExceptionFromOkHttpClientAndReturnInterrupted() {
+        stubNewCallThrowing(new InterruptedIOException("interrupted"));
+
+        TelemetryClient.Result result = router.sendRequest(dummyRequest());
+
+        assertEquals(TelemetryClient.Result.INTERRUPTED, result);
+        verify(okHttpClient, times(1)).newCall(any());
+    }
+
+    @TableTest({
+      "returnCode",
+      "200       ",
+      "404       ",
+      "500       "
+    })
+    void keepTryingToSendTelemetryToAgentDespiteOfReturnCodeWhenIntakeClientIsNull(int returnCode) {
+        TelemetryRouter agentOnlyRouter =
+                new TelemetryRouter(ddAgentFeaturesDiscovery, agentTelemetryClient, null, false);
+        Request[] capturedRequest = new Request[1];
+        stubNewCallCapturingRequest(capturedRequest, returnCode);
+        when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(true);
+
+        agentOnlyRouter.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
+        assertNull(capturedRequest[0].header(API_KEY_HEADER));
+        clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
+
+        when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(false);
+
+        agentOnlyRouter.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
+        assertNull(capturedRequest[0].header(API_KEY_HEADER));
+    }
+
+    @TableTest({
+      "returnCode",
+      "404       ",
+      "500       "
+    })
+    void switchToIntakeWhenAgentStopsSupportingTelemetryProxyAndTelemetryRequestsStartFailing(int returnCode) {
+        Request[] capturedRequest = new Request[1];
+        stubNewCallCapturingRequest(capturedRequest, returnCode);
+        when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(true);
+
+        router.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
+        assertNull(capturedRequest[0].header(API_KEY_HEADER));
+        clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
+
+        when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(false);
+
+        router.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(INTAKE_URL, capturedRequest[0].url());
+        assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
+    }
+
+    @Test
+    void whenConfiguredToPreferIntakeUseIntakeClientFromTheStart() {
+        TelemetryRouter telemetryRouter =
+                new TelemetryRouter(ddAgentFeaturesDiscovery, agentTelemetryClient, intakeTelemetryClient, true);
+        Request[] capturedRequest = new Request[1];
+        stubNewCallCapturingRequest(capturedRequest, 200);
+        when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(false);
+
+        telemetryRouter.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(INTAKE_URL, capturedRequest[0].url());
+        assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
+    }
+
+    @Test
+    void whenConfiguredToPreferIntakeDoNotSwitchToAgentIfIntakeRequestSucceedsEvenIfAgentSupportsTelemetryProxy() {
+        TelemetryRouter telemetryRouter =
+                new TelemetryRouter(ddAgentFeaturesDiscovery, agentTelemetryClient, intakeTelemetryClient, true);
+        Request[] capturedRequest = new Request[1];
+        stubNewCallCapturingRequest(capturedRequest, 200);
+        when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(true);
+
+        telemetryRouter.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(INTAKE_URL, capturedRequest[0].url());
+        assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
+        clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
+
+        telemetryRouter.sendRequest(dummyRequest());
+
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(INTAKE_URL, capturedRequest[0].url());
+        assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
+    }
+
+    @Test
+    void whenConfiguredToPreferIntakeDoNotSwitchToAgentIfRequestIsInterrupted() {
+        TelemetryRouter telemetryRouter =
+                new TelemetryRouter(ddAgentFeaturesDiscovery, agentTelemetryClient, intakeTelemetryClient, true);
+        Request[] capturedRequest = new Request[1];
+        doAnswer(invocation -> {
+                    capturedRequest[0] = invocation.getArgument(0);
+                    throw new InterruptedIOException("interrupted");
+                })
+                .when(okHttpClient)
+                .newCall(any());
+        when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(true);
+
+        telemetryRouter.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(INTAKE_URL, capturedRequest[0].url());
+        assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
+        clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
+
+        stubNewCallCapturingRequest(capturedRequest, 200);
+
+        telemetryRouter.sendRequest(dummyRequest());
+
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(INTAKE_URL, capturedRequest[0].url());
+        assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
+    }
+
+    @Test
+    void whenConfiguredToPreferIntakeSwitchToAgentIfIntakeRequestFails() {
+        TelemetryRouter telemetryRouter =
+                new TelemetryRouter(ddAgentFeaturesDiscovery, agentTelemetryClient, intakeTelemetryClient, true);
+        Request[] capturedRequest = new Request[1];
+        stubNewCallCapturingRequest(capturedRequest, 403);
+        when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(true);
+
+        telemetryRouter.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(INTAKE_URL, capturedRequest[0].url());
+        assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
+        clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
+
+        stubNewCallCapturingRequest(capturedRequest, 200);
+
+        telemetryRouter.sendRequest(dummyRequest());
+
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
+        assertNull(capturedRequest[0].header(API_KEY_HEADER));
+    }
+
+    @Test
+    void doNotSwitchToIntakeWhenAgentStopsSupportingTelemetryProxyButAcceptsTelemetryRequests() {
+        Request[] capturedRequest = new Request[1];
+        stubNewCallCapturingRequest(capturedRequest, 200);
+        when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(true);
+
+        router.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
+        assertNull(capturedRequest[0].header(API_KEY_HEADER));
+        clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
+
+        stubNewCallCapturingRequest(capturedRequest, 201);
+        when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(false);
+
+        router.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
+        assertNull(capturedRequest[0].header(API_KEY_HEADER));
+    }
+
+    @TableTest({
+      "returnCode",
+      "404       ",
+      "500       "
+    })
+    void switchToIntakeWhenAgentFailsToReceiveTelemetryRequests(int returnCode) {
+        Request[] capturedRequest = new Request[1];
+        stubNewCallCapturingRequest(capturedRequest, returnCode);
+        when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(true, false);
+
+        router.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
+        assertNull(capturedRequest[0].header(API_KEY_HEADER));
+        clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
+
+        router.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(INTAKE_URL, capturedRequest[0].url());
+        assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
+    }
+
+    @TableTest({
+      "returnCode | expectedApiKey | expectedUrlIsAgent",
+      "404        |                | true              ",
+      "500        |                | true              "
+    })
+    void useAgentWhenIntakeIsNotAvailable(int returnCode, String expectedApiKey, boolean expectedUrlIsAgent) {
+        HttpUrl expectedUrl = expectedUrlIsAgent ? AGENT_TELEMETRY_URL : INTAKE_URL;
+        TelemetryRouter agentOnlyRouter =
+                new TelemetryRouter(ddAgentFeaturesDiscovery, agentTelemetryClient, null, false);
+        Request[] capturedRequest = new Request[1];
+        stubNewCallCapturingRequest(capturedRequest, returnCode);
+        when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(false);
+
+        agentOnlyRouter.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(expectedUrl, capturedRequest[0].url());
+        assertEquals(expectedApiKey, capturedRequest[0].header(API_KEY_HEADER));
+        clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
+
+        agentOnlyRouter.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
+        assertNull(capturedRequest[0].header(API_KEY_HEADER));
+        clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
+
+        agentOnlyRouter.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(expectedUrl, capturedRequest[0].url());
+        assertEquals(expectedApiKey, capturedRequest[0].header(API_KEY_HEADER));
+    }
+
+    @TableTest({
+      "returnCode",
+      "404       ",
+      "500       "
+    })
+    void switchToIntakeThenBackToAgentWhenBothFailToReceiveTelemetryRequests(int returnCode) {
+        Request[] capturedRequest = new Request[1];
+        stubNewCallCapturingRequest(capturedRequest, returnCode);
+        when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(false);
+
+        // always send first telemetry request to Agent
+        router.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
+        assertNull(capturedRequest[0].header(API_KEY_HEADER));
+        clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
+
+        // switch to Intake if sending a telemetry request to Agent failed or Agent supports
+        // telemetry proxy
+        router.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(INTAKE_URL, capturedRequest[0].url());
+        assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
+        clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
+
+        // switch back to Agent if Intake request fails
+        router.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
+        assertNull(capturedRequest[0].header(API_KEY_HEADER));
+    }
+
+    @Test
+    void singleClientConstructorSkipsFeatureDiscoveryAndDelegatesToTheGivenClient() {
+        TelemetryClient singleClient = mock(TelemetryClient.class);
+        TelemetryRouter singleClientRouter = new TelemetryRouter(singleClient);
+        when(singleClient.sendHttpRequest(any())).thenReturn(SUCCESS);
+
+        TelemetryClient.Result result = singleClientRouter.sendRequest(dummyRequest());
+
+        assertEquals(SUCCESS, result);
+        verify(singleClient, times(1)).sendHttpRequest(any());
+        verify(ddAgentFeaturesDiscovery, never()).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, never()).supportsTelemetryProxy();
+    }
+
+    @Test
+    void singleClientConstructorDoesNotSwitchClientsOnFailure() {
+        TelemetryClient singleClient = mock(TelemetryClient.class);
+        TelemetryRouter singleClientRouter = new TelemetryRouter(singleClient);
+
+        // first request fails
+        when(singleClient.sendHttpRequest(any())).thenReturn(FAILURE);
+        TelemetryClient.Result firstResult = singleClientRouter.sendRequest(dummyRequest());
+
+        assertEquals(FAILURE, firstResult);
+        verify(singleClient, times(1)).sendHttpRequest(any());
+
+        // second request goes to the same client
+        when(singleClient.sendHttpRequest(any())).thenReturn(SUCCESS);
+        TelemetryClient.Result secondResult = singleClientRouter.sendRequest(dummyRequest());
+
+        assertEquals(SUCCESS, secondResult);
+        verify(singleClient, times(2)).sendHttpRequest(any());
+        verifyNoMoreInteractions(ddAgentFeaturesDiscovery);
+    }
+
+    @TableTest({
+      "returnCode",
+      "404       ",
+      "500       "
+    })
+    void switchBackToAgentIfItStartsSupportingTelemetry(int returnCode) {
+        Request[] capturedRequest = new Request[1];
+        stubNewCallCapturingRequest(capturedRequest, returnCode);
+        when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(false);
+
+        // always send first telemetry request to Agent
+        router.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
+        assertNull(capturedRequest[0].header(API_KEY_HEADER));
+        clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
+
+        // switch to Intake if sending a telemetry request to Agent failed or Agent supports
+        // telemetry proxy
+        stubNewCallCapturingRequest(capturedRequest, 201);
+        when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(true);
+
+        router.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(INTAKE_URL, capturedRequest[0].url());
+        assertEquals(API_KEY, capturedRequest[0].header(API_KEY_HEADER));
+        clearInvocations(okHttpClient, ddAgentFeaturesDiscovery);
+
+        // switch back to Agent if it starts supporting telemetry proxy
+        stubNewCallCapturingRequest(capturedRequest, returnCode);
+        when(ddAgentFeaturesDiscovery.supportsTelemetryProxy()).thenReturn(false);
+
+        router.sendRequest(dummyRequest());
+
+        verify(ddAgentFeaturesDiscovery, times(1)).discoverIfOutdated();
+        verify(ddAgentFeaturesDiscovery, times(1)).supportsTelemetryProxy();
+        verify(okHttpClient, times(1)).newCall(any());
+        assertEquals(AGENT_TELEMETRY_URL, capturedRequest[0].url());
+        assertNull(capturedRequest[0].header(API_KEY_HEADER));
+    }
+
+    private TelemetryRequest dummyRequest() {
+        return new TelemetryRequest(
+                mock(EventSource.class), mock(EventSink.class), 1000, RequestType.APP_STARTED, false);
+    }
+
+    private static Call mockCall(int code) throws IOException {
+        Call call = mock(Call.class);
+        when(call.execute())
+                .thenReturn(new Response.Builder()
+                        .request(new Request.Builder()
+                                .url(HttpUrl.get("https://example.com"))
+                                .build())
+                        .protocol(Protocol.HTTP_1_1)
+                        .message("OK")
+                        .body(ResponseBody.create(MediaType.get("text/plain"), "OK"))
+                        .code(code)
+                        .build());
+        return call;
+    }
+
+    // stubs newCall() via doAnswer rather than when().thenAnswer() so that re-stubbing across
+    // multiple stages of the same test does not trigger a previously configured throwing answer
+    private void stubNewCallReturning(int code) {
+        doAnswer(invocation -> mockCall(code)).when(okHttpClient).newCall(any());
+    }
+
+    private void stubNewCallCapturingRequest(Request[] capturedRequest, int code) {
+        doAnswer(invocation -> {
+                    capturedRequest[0] = invocation.getArgument(0);
+                    return mockCall(code);
+                })
+                .when(okHttpClient)
+                .newCall(any());
+    }
+
+    private void stubNewCallThrowing(IOException exception) {
+        doAnswer(invocation -> {
+                    throw exception;
+                })
+                .when(okHttpClient)
+                .newCall(any());
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/TelemetryRunnableTest.java b/telemetry/src/test/java/datadog/telemetry/TelemetryRunnableTest.java
index 25b4d30f064..023527ae293 100644
--- a/telemetry/src/test/java/datadog/telemetry/TelemetryRunnableTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/TelemetryRunnableTest.java
@@ -27,411 +27,399 @@
 
 class TelemetryRunnableTest {
 
-  private Thread thread;
+    private Thread thread;
+
+    @AfterEach
+    void cleanup() throws InterruptedException {
+        if (thread != null && thread.isAlive()) {
+            thread.interrupt();
+            thread.join();
+        }
+    }
 
-  @AfterEach
-  void cleanup() throws InterruptedException {
-    if (thread != null && thread.isAlive()) {
-      thread.interrupt();
-      thread.join();
+    @Test
+    @WithConfig(key = "TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL", value = "65", env = true)
+    void happyPath() throws InterruptedException, BrokenBarrierException, TimeoutException {
+        TelemetryRunnable.ThreadSleeper sleeperMock = mock(TelemetryRunnable.ThreadSleeper.class);
+        TickSleeper sleeper = new TickSleeper(sleeperMock);
+        TimeSource timeSource = mock(TimeSource.class);
+        TelemetryService telemetryService = mock(TelemetryService.class);
+        MetricCollector<MetricCollector.Metric> metricCollector = mock(MetricCollector.class);
+        MetricPeriodicAction metricAction = mock(MetricPeriodicAction.class);
+        when(metricAction.collector()).thenReturn(metricCollector);
+        TelemetryRunnable.TelemetryPeriodicAction periodicAction =
+                mock(TelemetryRunnable.TelemetryPeriodicAction.class);
+        TelemetryRunnable runnable =
+                new TelemetryRunnable(telemetryService, asList(metricAction, periodicAction), sleeper, timeSource);
+        thread = new Thread(runnable);
+
+        // when initial iteration before the first sleep (metrics and heartbeat)
+        when(telemetryService.sendAppStartedEvent()).thenReturn(false, false, true);
+        when(timeSource.getCurrentTimeMillis()).thenReturn(60L * 1000, 60L * 1000 + 1);
+        when(metricCollector.drain()).thenReturn(asList());
+        when(metricCollector.drainDistributionSeries()).thenReturn(asList());
+        when(telemetryService.sendTelemetryEvents()).thenReturn(true, true, false);
+        thread.start();
+        sleeper.sleeped.await(10, TimeUnit.SECONDS);
+
+        // then two unsuccessful attempts to send app-started with the following successful attempt
+        verify(telemetryService, times(3)).sendAppStartedEvent();
+        verify(timeSource, times(2)).getCurrentTimeMillis();
+        // then two partial and one final telemetry data requests
+        verify(metricCollector, times(1)).prepareMetrics();
+        verify(metricCollector, times(1)).drain();
+        verify(metricCollector, times(1)).drainDistributionSeries();
+        verify(periodicAction, times(1)).doIteration(telemetryService);
+        verify(telemetryService, times(3)).sendTelemetryEvents();
+        verify(sleeperMock, times(1)).sleep(9999);
+        verify(telemetryService, atLeast(0)).addConfiguration(any());
+        verifyNoMoreInteractions(telemetryService, timeSource, sleeperMock, metricCollector, periodicAction);
+        clearInvocations(telemetryService, timeSource, metricCollector, periodicAction, sleeperMock);
+
+        // when second iteration (10 seconds, metrics)
+        when(timeSource.getCurrentTimeMillis()).thenReturn(70L * 1000, 70L * 1000 + 2);
+        sleeper.go.await(10, TimeUnit.SECONDS);
+        sleeper.sleeped.await(10, TimeUnit.SECONDS);
+
+        // then
+        verify(timeSource, times(2)).getCurrentTimeMillis();
+        verify(metricCollector, times(1)).prepareMetrics();
+        verify(sleeperMock, times(1)).sleep(9998);
+        verifyNoMoreInteractions(telemetryService, timeSource, sleeperMock, metricCollector, periodicAction);
+        clearInvocations(telemetryService, timeSource, metricCollector, periodicAction, sleeperMock);
+
+        // when third iteration (20 seconds, metrics)
+        when(timeSource.getCurrentTimeMillis()).thenReturn(80L * 1000, 80L * 1000 + 3);
+        sleeper.go.await(10, TimeUnit.SECONDS);
+        sleeper.sleeped.await(10, TimeUnit.SECONDS);
+
+        // then
+        verify(timeSource, times(2)).getCurrentTimeMillis();
+        verify(metricCollector, times(1)).prepareMetrics();
+        verify(sleeperMock, times(1)).sleep(9997);
+        verifyNoMoreInteractions(telemetryService, timeSource, sleeperMock, metricCollector, periodicAction);
+        clearInvocations(telemetryService, timeSource, metricCollector, periodicAction, sleeperMock);
+
+        // when fourth iteration (30 seconds, metrics)
+        when(timeSource.getCurrentTimeMillis()).thenReturn(90L * 1000, 90L * 1000 + 4);
+        sleeper.go.await(10, TimeUnit.SECONDS);
+        sleeper.sleeped.await(10, TimeUnit.SECONDS);
+
+        // then
+        verify(timeSource, times(2)).getCurrentTimeMillis();
+        verify(metricCollector, times(1)).prepareMetrics();
+        verify(sleeperMock, times(1)).sleep(9996);
+        verifyNoMoreInteractions(telemetryService, timeSource, sleeperMock, metricCollector, periodicAction);
+        clearInvocations(telemetryService, timeSource, metricCollector, periodicAction, sleeperMock);
+
+        // when fifth iteration (40 seconds, metrics)
+        when(timeSource.getCurrentTimeMillis()).thenReturn(100L * 1000, 100L * 1000 + 5);
+        sleeper.go.await(10, TimeUnit.SECONDS);
+        sleeper.sleeped.await(10, TimeUnit.SECONDS);
+
+        // then
+        verify(timeSource, times(2)).getCurrentTimeMillis();
+        verify(metricCollector, times(1)).prepareMetrics();
+        verify(sleeperMock, times(1)).sleep(9995);
+        verifyNoMoreInteractions(telemetryService, timeSource, sleeperMock, metricCollector, periodicAction);
+        clearInvocations(telemetryService, timeSource, metricCollector, periodicAction, sleeperMock);
+
+        // when sixth iteration (50 seconds, metrics)
+        when(timeSource.getCurrentTimeMillis()).thenReturn(110L * 1000, 110L * 1000 + 6);
+        sleeper.go.await(10, TimeUnit.SECONDS);
+        sleeper.sleeped.await(10, TimeUnit.SECONDS);
+
+        // then
+        verify(timeSource, times(2)).getCurrentTimeMillis();
+        verify(metricCollector, times(1)).prepareMetrics();
+        verify(sleeperMock, times(1)).sleep(9994);
+        verifyNoMoreInteractions(telemetryService, timeSource, sleeperMock, metricCollector, periodicAction);
+        clearInvocations(telemetryService, timeSource, metricCollector, periodicAction, sleeperMock);
+
+        // when seventh iteration (60 seconds, metrics, heartbeat)
+        when(timeSource.getCurrentTimeMillis()).thenReturn(120L * 1000, 120L * 1000 + 7);
+        sleeper.go.await(10, TimeUnit.SECONDS);
+        sleeper.sleeped.await(10, TimeUnit.SECONDS);
+
+        // then
+        verify(timeSource, times(2)).getCurrentTimeMillis();
+        verify(metricCollector, times(1)).prepareMetrics();
+        verify(metricCollector, times(1)).drain();
+        verify(metricCollector, times(1)).drainDistributionSeries();
+        verify(periodicAction, times(1)).doIteration(telemetryService);
+        verify(telemetryService, times(1)).sendTelemetryEvents();
+        verify(sleeperMock, times(1)).sleep(9993);
+        clearInvocations(telemetryService, timeSource, metricCollector, periodicAction, sleeperMock);
+
+        // when eighth iteration (65 seconds, extended-heartbeat)
+        when(timeSource.getCurrentTimeMillis()).thenReturn(125L * 1000, 125L * 1000 + 8);
+        sleeper.go.await(5, TimeUnit.SECONDS);
+        sleeper.sleeped.await(5, TimeUnit.SECONDS);
+
+        // then
+        verify(timeSource, times(2)).getCurrentTimeMillis();
+        verify(telemetryService, times(1)).sendExtendedHeartbeat();
+        verify(sleeperMock, times(1)).sleep(4992);
+        verifyNoMoreInteractions(telemetryService, timeSource, sleeperMock, metricCollector, periodicAction);
+        clearInvocations(telemetryService, timeSource, metricCollector, periodicAction, sleeperMock);
+
+        // when
+        thread.interrupt();
+        thread.join();
+
+        // then
+        // flush pending data before shutdown
+        verify(metricCollector, times(1)).prepareMetrics();
+        verify(metricCollector, times(1)).drain();
+        verify(metricCollector, times(1)).drainDistributionSeries();
+        verify(periodicAction, times(1)).doIteration(telemetryService);
+        verify(telemetryService, times(1)).sendTelemetryEvents();
+        verify(telemetryService, times(1)).sendAppClosingEvent();
+        verifyNoMoreInteractions(telemetryService, timeSource, sleeperMock, metricCollector, periodicAction);
     }
-  }
-
-  @Test
-  @WithConfig(key = "TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL", value = "65", env = true)
-  void happyPath() throws InterruptedException, BrokenBarrierException, TimeoutException {
-    TelemetryRunnable.ThreadSleeper sleeperMock = mock(TelemetryRunnable.ThreadSleeper.class);
-    TickSleeper sleeper = new TickSleeper(sleeperMock);
-    TimeSource timeSource = mock(TimeSource.class);
-    TelemetryService telemetryService = mock(TelemetryService.class);
-    MetricCollector<MetricCollector.Metric> metricCollector = mock(MetricCollector.class);
-    MetricPeriodicAction metricAction = mock(MetricPeriodicAction.class);
-    when(metricAction.collector()).thenReturn(metricCollector);
-    TelemetryRunnable.TelemetryPeriodicAction periodicAction =
-        mock(TelemetryRunnable.TelemetryPeriodicAction.class);
-    TelemetryRunnable runnable =
-        new TelemetryRunnable(
-            telemetryService, asList(metricAction, periodicAction), sleeper, timeSource);
-    thread = new Thread(runnable);
-
-    // when initial iteration before the first sleep (metrics and heartbeat)
-    when(telemetryService.sendAppStartedEvent()).thenReturn(false, false, true);
-    when(timeSource.getCurrentTimeMillis()).thenReturn(60L * 1000, 60L * 1000 + 1);
-    when(metricCollector.drain()).thenReturn(asList());
-    when(metricCollector.drainDistributionSeries()).thenReturn(asList());
-    when(telemetryService.sendTelemetryEvents()).thenReturn(true, true, false);
-    thread.start();
-    sleeper.sleeped.await(10, TimeUnit.SECONDS);
-
-    // then two unsuccessful attempts to send app-started with the following successful attempt
-    verify(telemetryService, times(3)).sendAppStartedEvent();
-    verify(timeSource, times(2)).getCurrentTimeMillis();
-    // then two partial and one final telemetry data requests
-    verify(metricCollector, times(1)).prepareMetrics();
-    verify(metricCollector, times(1)).drain();
-    verify(metricCollector, times(1)).drainDistributionSeries();
-    verify(periodicAction, times(1)).doIteration(telemetryService);
-    verify(telemetryService, times(3)).sendTelemetryEvents();
-    verify(sleeperMock, times(1)).sleep(9999);
-    verify(telemetryService, atLeast(0)).addConfiguration(any());
-    verifyNoMoreInteractions(
-        telemetryService, timeSource, sleeperMock, metricCollector, periodicAction);
-    clearInvocations(telemetryService, timeSource, metricCollector, periodicAction, sleeperMock);
-
-    // when second iteration (10 seconds, metrics)
-    when(timeSource.getCurrentTimeMillis()).thenReturn(70L * 1000, 70L * 1000 + 2);
-    sleeper.go.await(10, TimeUnit.SECONDS);
-    sleeper.sleeped.await(10, TimeUnit.SECONDS);
-
-    // then
-    verify(timeSource, times(2)).getCurrentTimeMillis();
-    verify(metricCollector, times(1)).prepareMetrics();
-    verify(sleeperMock, times(1)).sleep(9998);
-    verifyNoMoreInteractions(
-        telemetryService, timeSource, sleeperMock, metricCollector, periodicAction);
-    clearInvocations(telemetryService, timeSource, metricCollector, periodicAction, sleeperMock);
-
-    // when third iteration (20 seconds, metrics)
-    when(timeSource.getCurrentTimeMillis()).thenReturn(80L * 1000, 80L * 1000 + 3);
-    sleeper.go.await(10, TimeUnit.SECONDS);
-    sleeper.sleeped.await(10, TimeUnit.SECONDS);
-
-    // then
-    verify(timeSource, times(2)).getCurrentTimeMillis();
-    verify(metricCollector, times(1)).prepareMetrics();
-    verify(sleeperMock, times(1)).sleep(9997);
-    verifyNoMoreInteractions(
-        telemetryService, timeSource, sleeperMock, metricCollector, periodicAction);
-    clearInvocations(telemetryService, timeSource, metricCollector, periodicAction, sleeperMock);
-
-    // when fourth iteration (30 seconds, metrics)
-    when(timeSource.getCurrentTimeMillis()).thenReturn(90L * 1000, 90L * 1000 + 4);
-    sleeper.go.await(10, TimeUnit.SECONDS);
-    sleeper.sleeped.await(10, TimeUnit.SECONDS);
-
-    // then
-    verify(timeSource, times(2)).getCurrentTimeMillis();
-    verify(metricCollector, times(1)).prepareMetrics();
-    verify(sleeperMock, times(1)).sleep(9996);
-    verifyNoMoreInteractions(
-        telemetryService, timeSource, sleeperMock, metricCollector, periodicAction);
-    clearInvocations(telemetryService, timeSource, metricCollector, periodicAction, sleeperMock);
-
-    // when fifth iteration (40 seconds, metrics)
-    when(timeSource.getCurrentTimeMillis()).thenReturn(100L * 1000, 100L * 1000 + 5);
-    sleeper.go.await(10, TimeUnit.SECONDS);
-    sleeper.sleeped.await(10, TimeUnit.SECONDS);
-
-    // then
-    verify(timeSource, times(2)).getCurrentTimeMillis();
-    verify(metricCollector, times(1)).prepareMetrics();
-    verify(sleeperMock, times(1)).sleep(9995);
-    verifyNoMoreInteractions(
-        telemetryService, timeSource, sleeperMock, metricCollector, periodicAction);
-    clearInvocations(telemetryService, timeSource, metricCollector, periodicAction, sleeperMock);
-
-    // when sixth iteration (50 seconds, metrics)
-    when(timeSource.getCurrentTimeMillis()).thenReturn(110L * 1000, 110L * 1000 + 6);
-    sleeper.go.await(10, TimeUnit.SECONDS);
-    sleeper.sleeped.await(10, TimeUnit.SECONDS);
-
-    // then
-    verify(timeSource, times(2)).getCurrentTimeMillis();
-    verify(metricCollector, times(1)).prepareMetrics();
-    verify(sleeperMock, times(1)).sleep(9994);
-    verifyNoMoreInteractions(
-        telemetryService, timeSource, sleeperMock, metricCollector, periodicAction);
-    clearInvocations(telemetryService, timeSource, metricCollector, periodicAction, sleeperMock);
-
-    // when seventh iteration (60 seconds, metrics, heartbeat)
-    when(timeSource.getCurrentTimeMillis()).thenReturn(120L * 1000, 120L * 1000 + 7);
-    sleeper.go.await(10, TimeUnit.SECONDS);
-    sleeper.sleeped.await(10, TimeUnit.SECONDS);
-
-    // then
-    verify(timeSource, times(2)).getCurrentTimeMillis();
-    verify(metricCollector, times(1)).prepareMetrics();
-    verify(metricCollector, times(1)).drain();
-    verify(metricCollector, times(1)).drainDistributionSeries();
-    verify(periodicAction, times(1)).doIteration(telemetryService);
-    verify(telemetryService, times(1)).sendTelemetryEvents();
-    verify(sleeperMock, times(1)).sleep(9993);
-    clearInvocations(telemetryService, timeSource, metricCollector, periodicAction, sleeperMock);
-
-    // when eighth iteration (65 seconds, extended-heartbeat)
-    when(timeSource.getCurrentTimeMillis()).thenReturn(125L * 1000, 125L * 1000 + 8);
-    sleeper.go.await(5, TimeUnit.SECONDS);
-    sleeper.sleeped.await(5, TimeUnit.SECONDS);
-
-    // then
-    verify(timeSource, times(2)).getCurrentTimeMillis();
-    verify(telemetryService, times(1)).sendExtendedHeartbeat();
-    verify(sleeperMock, times(1)).sleep(4992);
-    verifyNoMoreInteractions(
-        telemetryService, timeSource, sleeperMock, metricCollector, periodicAction);
-    clearInvocations(telemetryService, timeSource, metricCollector, periodicAction, sleeperMock);
-
-    // when
-    thread.interrupt();
-    thread.join();
-
-    // then
-    // flush pending data before shutdown
-    verify(metricCollector, times(1)).prepareMetrics();
-    verify(metricCollector, times(1)).drain();
-    verify(metricCollector, times(1)).drainDistributionSeries();
-    verify(periodicAction, times(1)).doIteration(telemetryService);
-    verify(telemetryService, times(1)).sendTelemetryEvents();
-    verify(telemetryService, times(1)).sendAppClosingEvent();
-    verifyNoMoreInteractions(
-        telemetryService, timeSource, sleeperMock, metricCollector, periodicAction);
-  }
-
-  @Test
-  void doNotReattemptAppStartedEventUntilNextCycle()
-      throws InterruptedException, BrokenBarrierException, TimeoutException {
-    TelemetryRunnable.ThreadSleeper sleeperMock = mock(TelemetryRunnable.ThreadSleeper.class);
-    TickSleeper sleeper = new TickSleeper(sleeperMock);
-    TimeSource timeSource = mock(TimeSource.class);
-    TelemetryService telemetryService = mock(TelemetryService.class);
-    MetricCollector<MetricCollector.Metric> metricCollector = mock(MetricCollector.class);
-    MetricPeriodicAction metricAction = mock(MetricPeriodicAction.class);
-    when(metricAction.collector()).thenReturn(metricCollector);
-    TelemetryRunnable.TelemetryPeriodicAction periodicAction =
-        mock(TelemetryRunnable.TelemetryPeriodicAction.class);
-    TelemetryRunnable runnable =
-        new TelemetryRunnable(
-            telemetryService, asList(metricAction, periodicAction), sleeper, timeSource);
-    thread = new Thread(runnable);
-
-    // three unsuccessful attempts to send app-started (TelemetryRunnable.MAX_APP_STARTED_RETRIES)
-    when(telemetryService.sendAppStartedEvent()).thenReturn(false, false, false);
-    when(timeSource.getCurrentTimeMillis()).thenReturn(60L * 1000);
-
-    thread.start();
-    sleeper.sleeped.await(10, TimeUnit.SECONDS);
-
-    verify(telemetryService, times(3)).sendAppStartedEvent();
-    verify(timeSource, times(2)).getCurrentTimeMillis();
-    verify(sleeperMock, times(1)).sleep(10000);
-  }
-
-  @Test
-  void schedulerSkipsMetricsIntervals() {
-    TimeSource timeSource = mock(TimeSource.class);
-    TelemetryRunnable.ThreadSleeper sleeper = mock(TelemetryRunnable.ThreadSleeper.class);
-    TelemetryRunnable.Scheduler scheduler =
-        new TelemetryRunnable.Scheduler(timeSource, sleeper, 60 * 1000, 10 * 1000, 0);
-
-    // first iteration: run everything
-    when(timeSource.getCurrentTimeMillis()).thenReturn(0L);
-
-    scheduler.init();
-
-    assertTrue(scheduler.shouldRunMetrics());
-    assertTrue(scheduler.shouldRunHeartbeat());
-    verify(timeSource, times(1)).getCurrentTimeMillis();
-    verifyNoMoreInteractions(timeSource, sleeper);
-    clearInvocations(timeSource, sleeper);
-
-    when(timeSource.getCurrentTimeMillis()).thenReturn(1L, 10L * 1000);
-
-    scheduler.sleepUntilNextIteration();
-
-    verify(timeSource, times(2)).getCurrentTimeMillis();
-    verify(sleeper, times(1)).sleep(10 * 1000 - 1);
-    verifyNoMoreInteractions(timeSource, sleeper);
-    clearInvocations(timeSource, sleeper);
-
-    // one metrics interval is exceeded
-    assertTrue(scheduler.shouldRunMetrics());
-    assertFalse(scheduler.shouldRunHeartbeat());
-
-    when(timeSource.getCurrentTimeMillis()).thenReturn(20L * 1000 + 1, 30L * 1000);
-
-    scheduler.sleepUntilNextIteration();
-
-    verify(timeSource, times(2)).getCurrentTimeMillis();
-    verify(sleeper, times(1)).sleep(9999);
-    verifyNoMoreInteractions(timeSource, sleeper);
-    clearInvocations(timeSource, sleeper);
-
-    // two metrics intervals are exceeded
-    assertTrue(scheduler.shouldRunMetrics());
-    assertFalse(scheduler.shouldRunHeartbeat());
-
-    when(timeSource.getCurrentTimeMillis()).thenReturn(50L * 1000 + 2, 60L * 1000);
-
-    scheduler.sleepUntilNextIteration();
-
-    verify(timeSource, times(2)).getCurrentTimeMillis();
-    verify(sleeper, times(1)).sleep(9998);
-    verifyNoMoreInteractions(timeSource, sleeper);
-    assertTrue(scheduler.shouldRunMetrics());
-    assertTrue(scheduler.shouldRunHeartbeat());
-  }
-
-  @Test
-  void schedulerSkipsHeartbeatIntervals() {
-    TimeSource timeSource = mock(TimeSource.class);
-    TelemetryRunnable.ThreadSleeper sleeper = mock(TelemetryRunnable.ThreadSleeper.class);
-    TelemetryRunnable.Scheduler scheduler =
-        new TelemetryRunnable.Scheduler(timeSource, sleeper, 60 * 1000, 10 * 1000, 0);
-
-    // first iteration
-    when(timeSource.getCurrentTimeMillis()).thenReturn(0L);
-    scheduler.init();
-
-    // run everything
-    assertTrue(scheduler.shouldRunMetrics());
-    assertTrue(scheduler.shouldRunHeartbeat());
-    verify(timeSource, times(1)).getCurrentTimeMillis();
-    verifyNoMoreInteractions(timeSource, sleeper);
-    clearInvocations(timeSource, sleeper);
-
-    // when
-    when(timeSource.getCurrentTimeMillis()).thenReturn(1L, 10L * 1000);
-    scheduler.sleepUntilNextIteration();
-
-    // then
-    verify(timeSource, times(2)).getCurrentTimeMillis();
-    verify(sleeper, times(1)).sleep(10 * 1000 - 1);
-    verifyNoMoreInteractions(timeSource, sleeper);
-    clearInvocations(timeSource, sleeper);
-
-    // when heartbeat interval is exceeded
-    assertTrue(scheduler.shouldRunMetrics());
-    assertFalse(scheduler.shouldRunHeartbeat());
-    when(timeSource.getCurrentTimeMillis()).thenReturn(70L * 1000);
-    scheduler.sleepUntilNextIteration();
-
-    // then
-    verify(timeSource, times(1)).getCurrentTimeMillis();
-    verifyNoMoreInteractions(timeSource, sleeper);
-    assertTrue(scheduler.shouldRunMetrics());
-    assertTrue(scheduler.shouldRunHeartbeat());
-    clearInvocations(timeSource, sleeper);
-
-    // when metrics interval has been adjusted
-    when(timeSource.getCurrentTimeMillis()).thenReturn(70L * 1000 + 1, 80L * 1000);
-    scheduler.sleepUntilNextIteration();
-
-    // then
-    verify(timeSource, times(2)).getCurrentTimeMillis();
-    verify(sleeper, times(1)).sleep(10 * 1000 - 1);
-    verifyNoMoreInteractions(timeSource, sleeper);
-    assertTrue(scheduler.shouldRunMetrics());
-    assertFalse(scheduler.shouldRunHeartbeat());
-  }
-
-  @TableTest({
-    "scenario                                              | iters | metricsSecs | heartbeatSecs | extHeartbeatSecs | expectedMetrics | expectedHeartbeats | expectedExtHeartbeats",
-    "no intervals configured                               | 10    | 0           | 0             | 0                | 10              | 10                 | 10                   ",
-    "one second intervals                                  | 10    | 1           | 1             | 1                | 10              | 10                 | 9                    ",
-    "metrics runs more frequently than heartbeat           | 12    | 10          | 60            | 60               | 12              | 2                  | 1                    ",
-    "heartbeat runs more frequently than metrics           | 12    | 60          | 10            | 10               | 2               | 12                 | 11                   ",
-    "metrics and heartbeat intervals close together (3, 5) | 6     | 3           | 5             | 5                | 4               | 3                  | 2                    ",
-    "metrics and heartbeat intervals close together (5, 3) | 6     | 5           | 3             | 3                | 3               | 4                  | 3                    "
-  })
-  void schedulerWithHeartbeatMetricsAndExtendedHeartbeatIntervals(
-      int iters,
-      int metricsSecs,
-      int heartbeatSecs,
-      int extHeartbeatSecs,
-      int expectedMetrics,
-      int expectedHeartbeats,
-      int expectedExtHeartbeats) {
-    TimeSourceAndSleeper timing = new TimeSourceAndSleeper();
-    TelemetryRunnable.Scheduler scheduler =
-        new TelemetryRunnable.Scheduler(
-            timing, timing, heartbeatSecs * 1000L, metricsSecs * 1000L, extHeartbeatSecs * 1000L);
-    int metricsRunCount = 0;
-    int heartbeatsRunCount = 0;
-    int extHeartbeatsRunCount = 0;
-
-    scheduler.init();
-    for (int i = 0; i < iters; i++) {
-      if (scheduler.shouldRunMetrics()) {
-        metricsRunCount++;
-      }
-      if (scheduler.shouldRunHeartbeat()) {
-        heartbeatsRunCount++;
-      }
-      boolean runExtHeartbeat = scheduler.shouldRunExtendedHeartbeat();
-      if (runExtHeartbeat) {
-        extHeartbeatsRunCount++;
-        // need to manually advance to retry next iteration if extended-heartbeat request failed
-        scheduler.scheduleNextExtendedHeartbeat();
-      }
-      scheduler.sleepUntilNextIteration();
+
+    @Test
+    void doNotReattemptAppStartedEventUntilNextCycle()
+            throws InterruptedException, BrokenBarrierException, TimeoutException {
+        TelemetryRunnable.ThreadSleeper sleeperMock = mock(TelemetryRunnable.ThreadSleeper.class);
+        TickSleeper sleeper = new TickSleeper(sleeperMock);
+        TimeSource timeSource = mock(TimeSource.class);
+        TelemetryService telemetryService = mock(TelemetryService.class);
+        MetricCollector<MetricCollector.Metric> metricCollector = mock(MetricCollector.class);
+        MetricPeriodicAction metricAction = mock(MetricPeriodicAction.class);
+        when(metricAction.collector()).thenReturn(metricCollector);
+        TelemetryRunnable.TelemetryPeriodicAction periodicAction =
+                mock(TelemetryRunnable.TelemetryPeriodicAction.class);
+        TelemetryRunnable runnable =
+                new TelemetryRunnable(telemetryService, asList(metricAction, periodicAction), sleeper, timeSource);
+        thread = new Thread(runnable);
+
+        // three unsuccessful attempts to send app-started (TelemetryRunnable.MAX_APP_STARTED_RETRIES)
+        when(telemetryService.sendAppStartedEvent()).thenReturn(false, false, false);
+        when(timeSource.getCurrentTimeMillis()).thenReturn(60L * 1000);
+
+        thread.start();
+        sleeper.sleeped.await(10, TimeUnit.SECONDS);
+
+        verify(telemetryService, times(3)).sendAppStartedEvent();
+        verify(timeSource, times(2)).getCurrentTimeMillis();
+        verify(sleeperMock, times(1)).sleep(10000);
     }
 
-    assertEquals(expectedMetrics, metricsRunCount);
-    assertEquals(expectedHeartbeats, heartbeatsRunCount);
-    assertEquals(expectedExtHeartbeats, extHeartbeatsRunCount);
-  }
+    @Test
+    void schedulerSkipsMetricsIntervals() {
+        TimeSource timeSource = mock(TimeSource.class);
+        TelemetryRunnable.ThreadSleeper sleeper = mock(TelemetryRunnable.ThreadSleeper.class);
+        TelemetryRunnable.Scheduler scheduler =
+                new TelemetryRunnable.Scheduler(timeSource, sleeper, 60 * 1000, 10 * 1000, 0);
 
-  // wraps a ThreadSleeper delegate with two barriers so the test thread can step the background
-  // runnable one iteration at a time
-  private static final class TickSleeper implements TelemetryRunnable.ThreadSleeper {
-    final CyclicBarrier sleeped = new CyclicBarrier(2);
-    final CyclicBarrier go = new CyclicBarrier(2);
-    final TelemetryRunnable.ThreadSleeper delegate;
+        // first iteration: run everything
+        when(timeSource.getCurrentTimeMillis()).thenReturn(0L);
 
-    TickSleeper(TelemetryRunnable.ThreadSleeper delegate) {
-      this.delegate = delegate;
-    }
+        scheduler.init();
 
-    @Override
-    public void sleep(long timeoutMs) {
-      if (delegate != null) {
-        delegate.sleep(timeoutMs);
-      }
-      try {
-        sleeped.await(10, TimeUnit.SECONDS);
-        go.await(10, TimeUnit.SECONDS);
-      } catch (InterruptedException | BrokenBarrierException | TimeoutException e) {
-        // Thread.interrupt() on the background thread trips this barrier; rethrow the real
-        // exception unchecked so it reaches TelemetryRunnable.run()'s catch (InterruptedException)
-        // block exactly like the interrupted CyclicBarrier.await() would in the JVM.
-        sneakyThrow(e);
-      }
-    }
+        assertTrue(scheduler.shouldRunMetrics());
+        assertTrue(scheduler.shouldRunHeartbeat());
+        verify(timeSource, times(1)).getCurrentTimeMillis();
+        verifyNoMoreInteractions(timeSource, sleeper);
+        clearInvocations(timeSource, sleeper);
 
-    @SuppressWarnings("unchecked")
-    private static <T extends Throwable> void sneakyThrow(Throwable t) throws T {
-      throw (T) t;
-    }
-  }
+        when(timeSource.getCurrentTimeMillis()).thenReturn(1L, 10L * 1000);
+
+        scheduler.sleepUntilNextIteration();
+
+        verify(timeSource, times(2)).getCurrentTimeMillis();
+        verify(sleeper, times(1)).sleep(10 * 1000 - 1);
+        verifyNoMoreInteractions(timeSource, sleeper);
+        clearInvocations(timeSource, sleeper);
+
+        // one metrics interval is exceeded
+        assertTrue(scheduler.shouldRunMetrics());
+        assertFalse(scheduler.shouldRunHeartbeat());
+
+        when(timeSource.getCurrentTimeMillis()).thenReturn(20L * 1000 + 1, 30L * 1000);
 
-  private static final class TimeSourceAndSleeper
-      implements TimeSource, TelemetryRunnable.ThreadSleeper {
+        scheduler.sleepUntilNextIteration();
 
-    private long currentTime = 0;
+        verify(timeSource, times(2)).getCurrentTimeMillis();
+        verify(sleeper, times(1)).sleep(9999);
+        verifyNoMoreInteractions(timeSource, sleeper);
+        clearInvocations(timeSource, sleeper);
 
-    @Override
-    public void sleep(long timeoutMs) {
-      currentTime += timeoutMs;
+        // two metrics intervals are exceeded
+        assertTrue(scheduler.shouldRunMetrics());
+        assertFalse(scheduler.shouldRunHeartbeat());
+
+        when(timeSource.getCurrentTimeMillis()).thenReturn(50L * 1000 + 2, 60L * 1000);
+
+        scheduler.sleepUntilNextIteration();
+
+        verify(timeSource, times(2)).getCurrentTimeMillis();
+        verify(sleeper, times(1)).sleep(9998);
+        verifyNoMoreInteractions(timeSource, sleeper);
+        assertTrue(scheduler.shouldRunMetrics());
+        assertTrue(scheduler.shouldRunHeartbeat());
     }
 
-    @Override
-    public long getCurrentTimeMillis() {
-      return currentTime;
+    @Test
+    void schedulerSkipsHeartbeatIntervals() {
+        TimeSource timeSource = mock(TimeSource.class);
+        TelemetryRunnable.ThreadSleeper sleeper = mock(TelemetryRunnable.ThreadSleeper.class);
+        TelemetryRunnable.Scheduler scheduler =
+                new TelemetryRunnable.Scheduler(timeSource, sleeper, 60 * 1000, 10 * 1000, 0);
+
+        // first iteration
+        when(timeSource.getCurrentTimeMillis()).thenReturn(0L);
+        scheduler.init();
+
+        // run everything
+        assertTrue(scheduler.shouldRunMetrics());
+        assertTrue(scheduler.shouldRunHeartbeat());
+        verify(timeSource, times(1)).getCurrentTimeMillis();
+        verifyNoMoreInteractions(timeSource, sleeper);
+        clearInvocations(timeSource, sleeper);
+
+        // when
+        when(timeSource.getCurrentTimeMillis()).thenReturn(1L, 10L * 1000);
+        scheduler.sleepUntilNextIteration();
+
+        // then
+        verify(timeSource, times(2)).getCurrentTimeMillis();
+        verify(sleeper, times(1)).sleep(10 * 1000 - 1);
+        verifyNoMoreInteractions(timeSource, sleeper);
+        clearInvocations(timeSource, sleeper);
+
+        // when heartbeat interval is exceeded
+        assertTrue(scheduler.shouldRunMetrics());
+        assertFalse(scheduler.shouldRunHeartbeat());
+        when(timeSource.getCurrentTimeMillis()).thenReturn(70L * 1000);
+        scheduler.sleepUntilNextIteration();
+
+        // then
+        verify(timeSource, times(1)).getCurrentTimeMillis();
+        verifyNoMoreInteractions(timeSource, sleeper);
+        assertTrue(scheduler.shouldRunMetrics());
+        assertTrue(scheduler.shouldRunHeartbeat());
+        clearInvocations(timeSource, sleeper);
+
+        // when metrics interval has been adjusted
+        when(timeSource.getCurrentTimeMillis()).thenReturn(70L * 1000 + 1, 80L * 1000);
+        scheduler.sleepUntilNextIteration();
+
+        // then
+        verify(timeSource, times(2)).getCurrentTimeMillis();
+        verify(sleeper, times(1)).sleep(10 * 1000 - 1);
+        verifyNoMoreInteractions(timeSource, sleeper);
+        assertTrue(scheduler.shouldRunMetrics());
+        assertFalse(scheduler.shouldRunHeartbeat());
     }
 
-    @Override
-    public long getNanoTicks() {
-      throw new UnsupportedOperationException("NOT IMPLEMENTED");
+    @TableTest({
+      "scenario                                              | iters | metricsSecs | heartbeatSecs | extHeartbeatSecs | expectedMetrics | expectedHeartbeats | expectedExtHeartbeats",
+      "no intervals configured                               | 10    | 0           | 0             | 0                | 10              | 10                 | 10                   ",
+      "one second intervals                                  | 10    | 1           | 1             | 1                | 10              | 10                 | 9                    ",
+      "metrics runs more frequently than heartbeat           | 12    | 10          | 60            | 60               | 12              | 2                  | 1                    ",
+      "heartbeat runs more frequently than metrics           | 12    | 60          | 10            | 10               | 2               | 12                 | 11                   ",
+      "metrics and heartbeat intervals close together (3, 5) | 6     | 3           | 5             | 5                | 4               | 3                  | 2                    ",
+      "metrics and heartbeat intervals close together (5, 3) | 6     | 5           | 3             | 3                | 3               | 4                  | 3                    "
+    })
+    void schedulerWithHeartbeatMetricsAndExtendedHeartbeatIntervals(
+            int iters,
+            int metricsSecs,
+            int heartbeatSecs,
+            int extHeartbeatSecs,
+            int expectedMetrics,
+            int expectedHeartbeats,
+            int expectedExtHeartbeats) {
+        TimeSourceAndSleeper timing = new TimeSourceAndSleeper();
+        TelemetryRunnable.Scheduler scheduler = new TelemetryRunnable.Scheduler(
+                timing, timing, heartbeatSecs * 1000L, metricsSecs * 1000L, extHeartbeatSecs * 1000L);
+        int metricsRunCount = 0;
+        int heartbeatsRunCount = 0;
+        int extHeartbeatsRunCount = 0;
+
+        scheduler.init();
+        for (int i = 0; i < iters; i++) {
+            if (scheduler.shouldRunMetrics()) {
+                metricsRunCount++;
+            }
+            if (scheduler.shouldRunHeartbeat()) {
+                heartbeatsRunCount++;
+            }
+            boolean runExtHeartbeat = scheduler.shouldRunExtendedHeartbeat();
+            if (runExtHeartbeat) {
+                extHeartbeatsRunCount++;
+                // need to manually advance to retry next iteration if extended-heartbeat request failed
+                scheduler.scheduleNextExtendedHeartbeat();
+            }
+            scheduler.sleepUntilNextIteration();
+        }
+
+        assertEquals(expectedMetrics, metricsRunCount);
+        assertEquals(expectedHeartbeats, heartbeatsRunCount);
+        assertEquals(expectedExtHeartbeats, extHeartbeatsRunCount);
     }
 
-    @Override
-    public long getCurrentTimeMicros() {
-      throw new UnsupportedOperationException("NOT IMPLEMENTED");
+    // wraps a ThreadSleeper delegate with two barriers so the test thread can step the background
+    // runnable one iteration at a time
+    private static final class TickSleeper implements TelemetryRunnable.ThreadSleeper {
+        final CyclicBarrier sleeped = new CyclicBarrier(2);
+        final CyclicBarrier go = new CyclicBarrier(2);
+        final TelemetryRunnable.ThreadSleeper delegate;
+
+        TickSleeper(TelemetryRunnable.ThreadSleeper delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void sleep(long timeoutMs) {
+            if (delegate != null) {
+                delegate.sleep(timeoutMs);
+            }
+            try {
+                sleeped.await(10, TimeUnit.SECONDS);
+                go.await(10, TimeUnit.SECONDS);
+            } catch (InterruptedException | BrokenBarrierException | TimeoutException e) {
+                // Thread.interrupt() on the background thread trips this barrier; rethrow the real
+                // exception unchecked so it reaches TelemetryRunnable.run()'s catch (InterruptedException)
+                // block exactly like the interrupted CyclicBarrier.await() would in the JVM.
+                sneakyThrow(e);
+            }
+        }
+
+        @SuppressWarnings("unchecked")
+        private static <T extends Throwable> void sneakyThrow(Throwable t) throws T {
+            throw (T) t;
+        }
     }
 
-    @Override
-    public long getCurrentTimeNanos() {
-      throw new UnsupportedOperationException("NOT IMPLEMENTED");
+    private static final class TimeSourceAndSleeper implements TimeSource, TelemetryRunnable.ThreadSleeper {
+
+        private long currentTime = 0;
+
+        @Override
+        public void sleep(long timeoutMs) {
+            currentTime += timeoutMs;
+        }
+
+        @Override
+        public long getCurrentTimeMillis() {
+            return currentTime;
+        }
+
+        @Override
+        public long getNanoTicks() {
+            throw new UnsupportedOperationException("NOT IMPLEMENTED");
+        }
+
+        @Override
+        public long getCurrentTimeMicros() {
+            throw new UnsupportedOperationException("NOT IMPLEMENTED");
+        }
+
+        @Override
+        public long getCurrentTimeNanos() {
+            throw new UnsupportedOperationException("NOT IMPLEMENTED");
+        }
     }
-  }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/TelemetryServiceTest.java b/telemetry/src/test/java/datadog/telemetry/TelemetryServiceTest.java
index 661ef36f474..c8a4aab6823 100644
--- a/telemetry/src/test/java/datadog/telemetry/TelemetryServiceTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/TelemetryServiceTest.java
@@ -50,637 +50,626 @@
 @ExtendWith(WithConfigExtension.class)
 class TelemetryServiceTest {
 
-  private final ConfigOrigin confKeyOrigin = ConfigOrigin.DEFAULT;
-  private final ConfigSetting confKeyValue =
-      ConfigSetting.of("confkey", "confvalue", confKeyOrigin);
-  private final Map<ConfigOrigin, Map<String, ConfigSetting>> configuration =
-      singletonMap(confKeyOrigin, singletonMap("confkey", confKeyValue));
-  private final Integration integration = new Integration("integration", true);
-  private final Dependency dependency = new Dependency("dependency", "1.0.0", "src", "hash");
-  private final Metric metric =
-      new Metric()
-          .namespace("tracers")
-          .metric("metric")
-          .points(Collections.<List<Number>>singletonList(Arrays.<Number>asList(1, 2)))
-          .tags(Arrays.asList("tag1", "tag2"));
-  private final DistributionSeries distribution =
-      new DistributionSeries()
-          .namespace("tracers")
-          .metric("distro")
-          .points(Arrays.asList(1, 2, 3))
-          .tags(Arrays.asList("tag1", "tag2"))
-          .common(false);
-  private final LogMessage logMessage =
-      new LogMessage()
-          .message("log-message")
-          .tags("tag1:tag2")
-          .level(LogMessageLevel.DEBUG)
-          .stackTrace("stack-trace")
-          .tracerTime(32423L)
-          .count(1);
-  private final ProductChange productChange =
-      new ProductChange().productType(ProductChange.ProductType.APPSEC).enabled(true);
-  private final Endpoint endpoint =
-      new Endpoint()
-          .first(true)
-          .type("REST")
-          .method("GET")
-          .operation("http.request")
-          .resource("GET /test")
-          .path("/test")
-          .requestBodyType(singletonList("application/json"))
-          .responseBodyType(singletonList("application/json"))
-          .responseCode(singletonList(200))
-          .authentication(singletonList("JWT"));
-
-  @Test
-  void happyPathWithoutData() throws IOException {
-    TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
-    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
-
-    // first iteration
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendAppStartedEvent();
-
-    // app-started
-    testHttpClient.assertRequestBody(APP_STARTED).assertPayload().products();
-    testHttpClient.assertNoMoreRequests();
-
-    // second iteration
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendTelemetryEvents();
-
-    // app-heartbeat only
-    testHttpClient.assertRequestBody(APP_HEARTBEAT);
-    testHttpClient.assertNoMoreRequests();
-
-    // third iteration
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendTelemetryEvents();
-
-    // app-heartbeat only
-    testHttpClient.assertRequestBody(APP_HEARTBEAT);
-    testHttpClient.assertNoMoreRequests();
-  }
-
-  @Test
-  void happyPathWithData() throws IOException {
-    TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
-    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
-
-    // add data before first iteration
-    telemetryService.addConfiguration(configuration);
-    telemetryService.addIntegration(integration);
-    telemetryService.addDependency(dependency);
-    telemetryService.addMetric(metric);
-    telemetryService.addDistributionSeries(distribution);
-    telemetryService.addLogMessage(logMessage);
-    telemetryService.addProductChange(productChange);
-    telemetryService.addEndpoint(endpoint);
-
-    // send messages
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendAppStartedEvent();
-
-    testHttpClient
-        .assertRequestBody(APP_STARTED)
-        .assertPayload()
-        .products()
-        .configuration(singletonList(confKeyValue));
-
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendTelemetryEvents();
-
-    testHttpClient
-        .assertRequestBody(MESSAGE_BATCH)
-        .assertBatch(8)
-        .assertFirstMessage(APP_HEARTBEAT)
-        .hasNoPayload()
-        // no configuration here as it has already been sent with the app-started event
-        .assertNextMessage(APP_INTEGRATIONS_CHANGE)
-        .hasPayload()
-        .integrations(singletonList(integration))
-        .assertNextMessage(APP_DEPENDENCIES_LOADED)
-        .hasPayload()
-        .dependencies(singletonList(dependency))
-        .assertNextMessage(GENERATE_METRICS)
-        .hasPayload()
-        .namespace("tracers")
-        .metrics(singletonList(metric))
-        .assertNextMessage(DISTRIBUTIONS)
-        .hasPayload()
-        .namespace("tracers")
-        .distributionSeries(singletonList(distribution))
-        .assertNextMessage(LOGS)
-        .hasPayload()
-        .logs(singletonList(logMessage))
-        .assertNextMessage(APP_PRODUCT_CHANGE)
-        .hasPayload()
-        .productChange(productChange)
-        .assertNextMessage(APP_ENDPOINTS)
-        .hasPayload()
-        .endpoint(endpoint)
-        .assertNoMoreMessages();
-    testHttpClient.assertNoMoreRequests();
-
-    // second iteration heartbeat only
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendTelemetryEvents();
-
-    testHttpClient.assertRequestBody(APP_HEARTBEAT).assertNoPayload();
-    testHttpClient.assertNoMoreRequests();
-
-    // third iteration metrics data
-    telemetryService.addMetric(metric);
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendTelemetryEvents();
-
-    testHttpClient
-        .assertRequestBody(MESSAGE_BATCH)
-        .assertBatch(2)
-        .assertFirstMessage(APP_HEARTBEAT)
-        .hasNoPayload()
-        .assertNextMessage(GENERATE_METRICS)
-        .hasPayload()
-        .namespace("tracers")
-        .metrics(singletonList(metric))
-        .assertNoMoreMessages();
-    testHttpClient.assertNoMoreRequests();
-  }
-
-  @Test
-  void happyPathWithDataAfterAppStarted() throws IOException {
-    TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
-    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
-
-    // send messages
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendAppStartedEvent();
-
-    testHttpClient.assertRequestBody(APP_STARTED).assertPayload().products();
-    testHttpClient.assertNoMoreRequests();
-
-    // add data after first iteration
-    telemetryService.addConfiguration(configuration);
-    telemetryService.addIntegration(integration);
-    telemetryService.addDependency(dependency);
-    telemetryService.addMetric(metric);
-    telemetryService.addDistributionSeries(distribution);
-    telemetryService.addLogMessage(logMessage);
-    telemetryService.addProductChange(productChange);
-    telemetryService.addEndpoint(endpoint);
-
-    // send messages
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendTelemetryEvents();
-
-    testHttpClient
-        .assertRequestBody(MESSAGE_BATCH)
-        .assertBatch(9)
-        .assertFirstMessage(APP_HEARTBEAT)
-        .hasNoPayload()
-        .assertNextMessage(RequestType.APP_CLIENT_CONFIGURATION_CHANGE)
-        .hasPayload()
-        .configuration(singletonList(confKeyValue))
-        .assertNextMessage(APP_INTEGRATIONS_CHANGE)
-        .hasPayload()
-        .integrations(singletonList(integration))
-        .assertNextMessage(APP_DEPENDENCIES_LOADED)
-        .hasPayload()
-        .dependencies(singletonList(dependency))
-        .assertNextMessage(GENERATE_METRICS)
-        .hasPayload()
-        .namespace("tracers")
-        .metrics(singletonList(metric))
-        .assertNextMessage(DISTRIBUTIONS)
-        .hasPayload()
-        .namespace("tracers")
-        .distributionSeries(singletonList(distribution))
-        .assertNextMessage(LOGS)
-        .hasPayload()
-        .logs(singletonList(logMessage))
-        .assertNextMessage(APP_PRODUCT_CHANGE)
-        .hasPayload()
-        .productChange(productChange)
-        .assertNextMessage(APP_ENDPOINTS)
-        .hasPayload()
-        .endpoint(endpoint)
-        .assertNoMoreMessages();
-    testHttpClient.assertNoMoreRequests();
-  }
-
-  @Test
-  void doNotDiscardDataForAppStartedEventUntilItHasBeenSuccessfullySent() throws IOException {
-    TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
-    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
-    telemetryService.addConfiguration(configuration);
-
-    // attempt with 404 error
-    testHttpClient.expectRequest(NOT_FOUND);
-    assertFalse(telemetryService.sendAppStartedEvent());
-
-    // app-started is attempted
-    testHttpClient
-        .assertRequestBody(APP_STARTED)
-        .assertPayload()
-        .products()
-        .configuration(singletonList(confKeyValue));
-    testHttpClient.assertNoMoreRequests();
-
-    // attempt with 500 error
-    testHttpClient.expectRequest(FAILURE);
-    assertFalse(telemetryService.sendAppStartedEvent());
-
-    // app-started is attempted
-    testHttpClient
-        .assertRequestBody(APP_STARTED)
-        .assertPayload()
-        .products()
-        .configuration(singletonList(confKeyValue));
-    testHttpClient.assertNoMoreRequests();
-
-    // attempt with unexpected FAILURE (not valid)
-    testHttpClient.expectRequest(FAILURE);
-    assertFalse(telemetryService.sendAppStartedEvent());
-
-    // app-started is attempted
-    testHttpClient
-        .assertRequestBody(APP_STARTED)
-        .assertPayload()
-        .products()
-        .configuration(singletonList(confKeyValue));
-    testHttpClient.assertNoMoreRequests();
-
-    // attempt with success
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendAppStartedEvent();
-
-    // app-started is attempted
-    testHttpClient
-        .assertRequestBody(APP_STARTED)
-        .assertPayload()
-        .products()
-        .configuration(singletonList(confKeyValue));
-    testHttpClient.assertNoMoreRequests();
-  }
-
-  @Test
-  void resendDataOnSuccessfulAttemptAfterAFailure() throws IOException {
-    TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
-    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
-
-    telemetryService.addConfiguration(configuration);
-    telemetryService.addIntegration(integration);
-    telemetryService.addDependency(dependency);
-    telemetryService.addMetric(metric);
-    telemetryService.addDistributionSeries(distribution);
-    telemetryService.addLogMessage(logMessage);
-    telemetryService.addProductChange(productChange);
-    telemetryService.addEndpoint(endpoint);
-
-    // attempt with NOT_FOUND error
-    testHttpClient.expectRequest(NOT_FOUND);
-    assertFalse(telemetryService.sendAppStartedEvent());
-
-    // app-started attempted with config
-    testHttpClient
-        .assertRequestBody(APP_STARTED)
-        .assertPayload()
-        .products()
-        .configuration(singletonList(confKeyValue));
-    testHttpClient.assertNoMoreRequests();
-
-    // successful app-started attempt
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendAppStartedEvent();
-
-    // attempt app-started with SUCCESS
-    testHttpClient
-        .assertRequestBody(APP_STARTED)
-        .assertPayload()
-        .products()
-        .configuration(singletonList(confKeyValue));
-
-    // successful batch attempt
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendTelemetryEvents();
-
-    // attempt batch with SUCCESS
-    testHttpClient
-        .assertRequestBody(MESSAGE_BATCH)
-        .assertBatch(8)
-        .assertFirstMessage(APP_HEARTBEAT)
-        .hasNoPayload()
-        // no configuration here as it has already been sent with the app-started event
-        .assertNextMessage(APP_INTEGRATIONS_CHANGE)
-        .hasPayload()
-        .integrations(singletonList(integration))
-        .assertNextMessage(APP_DEPENDENCIES_LOADED)
-        .hasPayload()
-        .dependencies(singletonList(dependency))
-        .assertNextMessage(GENERATE_METRICS)
-        .hasPayload()
-        .namespace("tracers")
-        .metrics(singletonList(metric))
-        .assertNextMessage(DISTRIBUTIONS)
-        .hasPayload()
-        .namespace("tracers")
-        .distributionSeries(singletonList(distribution))
-        .assertNextMessage(LOGS)
-        .hasPayload()
-        .logs(singletonList(logMessage))
-        .assertNextMessage(APP_PRODUCT_CHANGE)
-        .hasPayload()
-        .productChange(productChange)
-        .assertNextMessage(APP_ENDPOINTS)
-        .hasPayload()
-        .endpoint(endpoint)
-        .assertNoMoreMessages();
-    testHttpClient.assertNoMoreRequests();
-
-    // attempt with NOT_FOUND error
-    testHttpClient.expectRequest(NOT_FOUND);
-    telemetryService.sendTelemetryEvents();
-
-    // message-batch attempted with heartbeat
-    testHttpClient.assertRequestBody(APP_HEARTBEAT).assertNoPayload();
-    testHttpClient.assertNoMoreRequests();
-  }
-
-  @Test
-  void sendClosingEventRequest() throws IOException {
-    TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
-    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
-
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendAppClosingEvent();
-
-    testHttpClient.assertRequestBody(RequestType.APP_CLOSING);
-    testHttpClient.assertNoMoreRequests();
-  }
-
-  @TableTest({
-    "scenario                    | otelEnabled | otEnabled | expectedWarnings",
-    "both otel and ot enabled    | true        | true      | 1               ",
-    "only otel enabled           | true        | false     | 0               ",
-    "only ot enabled             | false       | true      | 0               ",
-    "neither otel nor ot enabled | false       | false     | 0               "
-  })
-  void reportWhenBothOTelAndOTAreEnabled(
-      boolean otelEnabled, boolean otEnabled, int expectedWarnings) {
-    TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
-    TelemetryService telemetryService = spy(new TelemetryService(testHttpClient, 1000, false));
-    Integration otel = new Integration("opentelemetry-1", otelEnabled);
-    Integration ot = new Integration("opentracing", otEnabled);
-
-    telemetryService.addIntegration(otel);
-
-    verify(telemetryService, times(0)).warnAboutExclusiveIntegrations();
-
-    telemetryService.addIntegration(ot);
-
-    verify(telemetryService, times(expectedWarnings)).warnAboutExclusiveIntegrations();
-  }
-
-  @Test
-  void splitTelemetryRequestsIfTheSizeAboveTheLimit() throws IOException {
-    TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
-    TelemetryService telemetryService = new TelemetryService(testHttpClient, 5000, false);
-
-    // send a heartbeat request without telemetry data to measure body size to set stable request
-    // size limit
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendTelemetryEvents();
-
-    // get body size
-    int bodySize = testHttpClient.assertRequestBody(APP_HEARTBEAT).bodySize();
-    assertTrue(bodySize > 0);
-
-    // sending first part of data
-    telemetryService = new TelemetryService(testHttpClient, bodySize + 512, false);
-
-    telemetryService.addConfiguration(configuration);
-    telemetryService.addIntegration(integration);
-    telemetryService.addDependency(dependency);
-    telemetryService.addMetric(metric);
-    telemetryService.addDistributionSeries(distribution);
-    telemetryService.addLogMessage(logMessage);
-    telemetryService.addProductChange(productChange);
-    telemetryService.addEndpoint(endpoint);
-
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendTelemetryEvents();
-
-    // attempt with SUCCESS
-    testHttpClient
-        .assertRequestBody(MESSAGE_BATCH)
-        .assertBatch(5)
-        .assertFirstMessage(APP_HEARTBEAT)
-        .hasNoPayload()
-        .assertNextMessage(RequestType.APP_CLIENT_CONFIGURATION_CHANGE)
-        .hasPayload()
-        .configuration(singletonList(confKeyValue))
-        .assertNextMessage(APP_INTEGRATIONS_CHANGE)
-        .hasPayload()
-        .integrations(singletonList(integration))
-        .assertNextMessage(APP_DEPENDENCIES_LOADED)
-        .hasPayload()
-        .dependencies(singletonList(dependency))
-        .assertNextMessage(GENERATE_METRICS)
-        .hasPayload()
-        .namespace("tracers")
-        .metrics(singletonList(metric))
-        // no more data fit this message is sent in the next message
-        .assertNoMoreMessages();
-
-    // sending second part of data
-    testHttpClient.expectRequest(SUCCESS);
-    assertFalse(telemetryService.sendTelemetryEvents());
-
-    testHttpClient
-        .assertRequestBody(MESSAGE_BATCH)
-        .assertBatch(5)
-        .assertFirstMessage(APP_HEARTBEAT)
-        .hasNoPayload()
-        .assertNextMessage(DISTRIBUTIONS)
-        .hasPayload()
-        .namespace("tracers")
-        .distributionSeries(singletonList(distribution))
-        .assertNextMessage(LOGS)
-        .hasPayload()
-        .logs(singletonList(logMessage))
-        .assertNextMessage(APP_PRODUCT_CHANGE)
-        .hasPayload()
-        .productChange(productChange)
-        .assertNextMessage(APP_ENDPOINTS)
-        .hasPayload()
-        .endpoint(endpoint)
-        .assertNoMoreMessages();
-    testHttpClient.assertNoMoreRequests();
-  }
-
-  @Test
-  void sendAllCollectedDataWithExtendedHeartbeatRequestEveryTime() throws IOException {
-    TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
-    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
-
-    telemetryService.addConfiguration(configuration);
-    telemetryService.addIntegration(integration);
-    telemetryService.addDependency(dependency);
-
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendExtendedHeartbeat();
-
-    testHttpClient
-        .assertRequestBody(APP_EXTENDED_HEARTBEAT)
-        .assertPayload()
-        .configuration(singletonList(confKeyValue))
-        .integrations(singletonList(integration))
-        .dependencies(singletonList(dependency));
-    testHttpClient.assertNoMoreRequests();
-
-    telemetryService.addConfiguration(configuration);
-    telemetryService.addIntegration(integration);
-    telemetryService.addDependency(dependency);
-
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendExtendedHeartbeat();
-
-    testHttpClient
-        .assertRequestBody(APP_EXTENDED_HEARTBEAT)
-        .assertPayload()
-        .configuration(Arrays.asList(confKeyValue, confKeyValue))
-        .integrations(Arrays.asList(integration, integration))
-        .dependencies(Arrays.asList(dependency, dependency));
-    testHttpClient.assertNoMoreRequests();
-  }
-
-  @TableTest({
-    "scenario | resultCode",
-    "success  | SUCCESS   ",
-    "failure  | FAILURE   ",
-    "notFound | NOT_FOUND "
-  })
-  void
-      sendExtendedHeartbeatRequestEvenIfDataAlreadyHasBeenSentOrAttemptedAsPartOfAnotherTelemetryEvents(
-          String resultCode) throws IOException {
-    TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
-    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
-
-    telemetryService.addConfiguration(configuration);
-    telemetryService.addIntegration(integration);
-    telemetryService.addDependency(dependency);
-
-    testHttpClient.expectRequest(TelemetryClient.Result.valueOf(resultCode));
-    telemetryService.sendTelemetryEvents();
-
-    testHttpClient.assertRequestBody(MESSAGE_BATCH);
-
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendExtendedHeartbeat();
-
-    testHttpClient
-        .assertRequestBody(APP_EXTENDED_HEARTBEAT)
-        .assertPayload()
-        .configuration(singletonList(confKeyValue))
-        .integrations(singletonList(integration))
-        .dependencies(singletonList(dependency));
-    testHttpClient.assertNoMoreRequests();
-  }
-
-  @TableTest({
-    "scenario    | id ",
-    "with value  | foo",
-    "null value  |    ",
-    "empty value | '' "
-  })
-  void appCanPropagateConfigurationId(String id) throws IOException {
-    String instrumentationConfigIdKey = "instrumentation_config_id";
-    TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
-    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
-    Map<String, ConfigSetting> configMap =
-        singletonMap(
-            instrumentationConfigIdKey,
-            ConfigSetting.of(instrumentationConfigIdKey, id, ConfigOrigin.ENV));
-    telemetryService.addConfiguration(singletonMap(ConfigOrigin.ENV, configMap));
-
-    // first iteration
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendAppStartedEvent();
-
-    // app-started
-    testHttpClient.assertRequestBody(APP_STARTED).assertPayload().instrumentationConfigId(id);
-    testHttpClient.assertNoMoreRequests();
-  }
-
-  @TableTest({
-    "scenario                  | installId                            | installType     | installTime",
-    "no install data           |                                      |                 |            ",
-    "install time only         |                                      |                 | 1703188334 ",
-    "install type only         |                                      | k8s_single_step |            ",
-    "install type and time     |                                      | k8s_single_step | 1703188212 ",
-    "install id only           | 68e75c99-57ca-4a12-adfc-575c4b05fcbe |                 |            ",
-    "install id and time       | 68e75c48-57ca-4a12-adfc-575c4b05bfff |                 | 1704183412 ",
-    "install id and type       | 68e75c55-57ca-4a12-adfc-575c4b05aaaa | k8s_single_step |            ",
-    "install id, type and time | 68e75c77-57ca-4a12-adfc-575c4b05fc44 | k8s_single_step | 1993188215 "
-  })
-  void appStartedMustHaveInstallSignature(String installId, String installType, String installTime)
-      throws IOException {
-    WithConfigExtension.injectEnvConfig("INSTRUMENTATION_INSTALL_ID", installId);
-    WithConfigExtension.injectEnvConfig("INSTRUMENTATION_INSTALL_TYPE", installType);
-    WithConfigExtension.injectEnvConfig("INSTRUMENTATION_INSTALL_TIME", installTime);
-
-    TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
-    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
-
-    // first iteration
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendAppStartedEvent();
-
-    // app-started
-    testHttpClient
-        .assertRequestBody(APP_STARTED)
-        .assertPayload()
-        .installSignature(installId, installType, installTime);
-    testHttpClient.assertNoMoreRequests();
-  }
-
-  @TableTest({
-    "scenario                              | appsecConfig | appsecEnabled | profilingConfig | profilingEnabled | dynInstrConfig | dynInstrEnabled",
-    "all products enabled                  | 1            | true          | 1               | true             | 1              | true           ",
-    "dynamic instrumentation disabled      | 1            | true          | 1               | true             | 0              | false          ",
-    "profiling disabled                    | 1            | true          | 0               | false            | 1              | true           ",
-    "profiling and dyn instr disabled      | 1            | true          | 0               | false            | 0              | false          ",
-    "all products disabled                 | 0            | false         | 0               | false            | 0              | false          ",
-    "appsec inactive value treated enabled | inactive     | true          | 0               | false            | 0              | false          "
-  })
-  void appStartedMustIncludeActivatedProductsInfo(
-      String appsecConfig,
-      boolean appsecEnabled,
-      String profilingConfig,
-      boolean profilingEnabled,
-      String dynInstrConfig,
-      boolean dynInstrEnabled)
-      throws IOException {
-    WithConfigExtension.injectEnvConfig(
-        ConfigStrings.toEnvVar(AppSecConfig.APPSEC_ENABLED), appsecConfig);
-    WithConfigExtension.injectEnvConfig(
-        ConfigStrings.toEnvVar(ProfilingConfig.PROFILING_ENABLED), profilingConfig);
-    WithConfigExtension.injectEnvConfig(
-        ConfigStrings.toEnvVar(DebuggerConfig.DYNAMIC_INSTRUMENTATION_ENABLED), dynInstrConfig);
-
-    TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
-    TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
-
-    // first iteration
-    testHttpClient.expectRequest(SUCCESS);
-    telemetryService.sendAppStartedEvent();
-
-    // app-started
-    testHttpClient
-        .assertRequestBody(APP_STARTED)
-        .assertPayload()
-        .products(appsecEnabled, profilingEnabled, dynInstrEnabled);
-    testHttpClient.assertNoMoreRequests();
-  }
+    private final ConfigOrigin confKeyOrigin = ConfigOrigin.DEFAULT;
+    private final ConfigSetting confKeyValue = ConfigSetting.of("confkey", "confvalue", confKeyOrigin);
+    private final Map<ConfigOrigin, Map<String, ConfigSetting>> configuration =
+            singletonMap(confKeyOrigin, singletonMap("confkey", confKeyValue));
+    private final Integration integration = new Integration("integration", true);
+    private final Dependency dependency = new Dependency("dependency", "1.0.0", "src", "hash");
+    private final Metric metric = new Metric()
+            .namespace("tracers")
+            .metric("metric")
+            .points(Collections.<List<Number>>singletonList(Arrays.<Number>asList(1, 2)))
+            .tags(Arrays.asList("tag1", "tag2"));
+    private final DistributionSeries distribution = new DistributionSeries()
+            .namespace("tracers")
+            .metric("distro")
+            .points(Arrays.asList(1, 2, 3))
+            .tags(Arrays.asList("tag1", "tag2"))
+            .common(false);
+    private final LogMessage logMessage = new LogMessage()
+            .message("log-message")
+            .tags("tag1:tag2")
+            .level(LogMessageLevel.DEBUG)
+            .stackTrace("stack-trace")
+            .tracerTime(32423L)
+            .count(1);
+    private final ProductChange productChange =
+            new ProductChange().productType(ProductChange.ProductType.APPSEC).enabled(true);
+    private final Endpoint endpoint = new Endpoint()
+            .first(true)
+            .type("REST")
+            .method("GET")
+            .operation("http.request")
+            .resource("GET /test")
+            .path("/test")
+            .requestBodyType(singletonList("application/json"))
+            .responseBodyType(singletonList("application/json"))
+            .responseCode(singletonList(200))
+            .authentication(singletonList("JWT"));
+
+    @Test
+    void happyPathWithoutData() throws IOException {
+        TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
+        TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
+
+        // first iteration
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendAppStartedEvent();
+
+        // app-started
+        testHttpClient.assertRequestBody(APP_STARTED).assertPayload().products();
+        testHttpClient.assertNoMoreRequests();
+
+        // second iteration
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendTelemetryEvents();
+
+        // app-heartbeat only
+        testHttpClient.assertRequestBody(APP_HEARTBEAT);
+        testHttpClient.assertNoMoreRequests();
+
+        // third iteration
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendTelemetryEvents();
+
+        // app-heartbeat only
+        testHttpClient.assertRequestBody(APP_HEARTBEAT);
+        testHttpClient.assertNoMoreRequests();
+    }
+
+    @Test
+    void happyPathWithData() throws IOException {
+        TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
+        TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
+
+        // add data before first iteration
+        telemetryService.addConfiguration(configuration);
+        telemetryService.addIntegration(integration);
+        telemetryService.addDependency(dependency);
+        telemetryService.addMetric(metric);
+        telemetryService.addDistributionSeries(distribution);
+        telemetryService.addLogMessage(logMessage);
+        telemetryService.addProductChange(productChange);
+        telemetryService.addEndpoint(endpoint);
+
+        // send messages
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendAppStartedEvent();
+
+        testHttpClient
+                .assertRequestBody(APP_STARTED)
+                .assertPayload()
+                .products()
+                .configuration(singletonList(confKeyValue));
+
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendTelemetryEvents();
+
+        testHttpClient
+                .assertRequestBody(MESSAGE_BATCH)
+                .assertBatch(8)
+                .assertFirstMessage(APP_HEARTBEAT)
+                .hasNoPayload()
+                // no configuration here as it has already been sent with the app-started event
+                .assertNextMessage(APP_INTEGRATIONS_CHANGE)
+                .hasPayload()
+                .integrations(singletonList(integration))
+                .assertNextMessage(APP_DEPENDENCIES_LOADED)
+                .hasPayload()
+                .dependencies(singletonList(dependency))
+                .assertNextMessage(GENERATE_METRICS)
+                .hasPayload()
+                .namespace("tracers")
+                .metrics(singletonList(metric))
+                .assertNextMessage(DISTRIBUTIONS)
+                .hasPayload()
+                .namespace("tracers")
+                .distributionSeries(singletonList(distribution))
+                .assertNextMessage(LOGS)
+                .hasPayload()
+                .logs(singletonList(logMessage))
+                .assertNextMessage(APP_PRODUCT_CHANGE)
+                .hasPayload()
+                .productChange(productChange)
+                .assertNextMessage(APP_ENDPOINTS)
+                .hasPayload()
+                .endpoint(endpoint)
+                .assertNoMoreMessages();
+        testHttpClient.assertNoMoreRequests();
+
+        // second iteration heartbeat only
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendTelemetryEvents();
+
+        testHttpClient.assertRequestBody(APP_HEARTBEAT).assertNoPayload();
+        testHttpClient.assertNoMoreRequests();
+
+        // third iteration metrics data
+        telemetryService.addMetric(metric);
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendTelemetryEvents();
+
+        testHttpClient
+                .assertRequestBody(MESSAGE_BATCH)
+                .assertBatch(2)
+                .assertFirstMessage(APP_HEARTBEAT)
+                .hasNoPayload()
+                .assertNextMessage(GENERATE_METRICS)
+                .hasPayload()
+                .namespace("tracers")
+                .metrics(singletonList(metric))
+                .assertNoMoreMessages();
+        testHttpClient.assertNoMoreRequests();
+    }
+
+    @Test
+    void happyPathWithDataAfterAppStarted() throws IOException {
+        TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
+        TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
+
+        // send messages
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendAppStartedEvent();
+
+        testHttpClient.assertRequestBody(APP_STARTED).assertPayload().products();
+        testHttpClient.assertNoMoreRequests();
+
+        // add data after first iteration
+        telemetryService.addConfiguration(configuration);
+        telemetryService.addIntegration(integration);
+        telemetryService.addDependency(dependency);
+        telemetryService.addMetric(metric);
+        telemetryService.addDistributionSeries(distribution);
+        telemetryService.addLogMessage(logMessage);
+        telemetryService.addProductChange(productChange);
+        telemetryService.addEndpoint(endpoint);
+
+        // send messages
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendTelemetryEvents();
+
+        testHttpClient
+                .assertRequestBody(MESSAGE_BATCH)
+                .assertBatch(9)
+                .assertFirstMessage(APP_HEARTBEAT)
+                .hasNoPayload()
+                .assertNextMessage(RequestType.APP_CLIENT_CONFIGURATION_CHANGE)
+                .hasPayload()
+                .configuration(singletonList(confKeyValue))
+                .assertNextMessage(APP_INTEGRATIONS_CHANGE)
+                .hasPayload()
+                .integrations(singletonList(integration))
+                .assertNextMessage(APP_DEPENDENCIES_LOADED)
+                .hasPayload()
+                .dependencies(singletonList(dependency))
+                .assertNextMessage(GENERATE_METRICS)
+                .hasPayload()
+                .namespace("tracers")
+                .metrics(singletonList(metric))
+                .assertNextMessage(DISTRIBUTIONS)
+                .hasPayload()
+                .namespace("tracers")
+                .distributionSeries(singletonList(distribution))
+                .assertNextMessage(LOGS)
+                .hasPayload()
+                .logs(singletonList(logMessage))
+                .assertNextMessage(APP_PRODUCT_CHANGE)
+                .hasPayload()
+                .productChange(productChange)
+                .assertNextMessage(APP_ENDPOINTS)
+                .hasPayload()
+                .endpoint(endpoint)
+                .assertNoMoreMessages();
+        testHttpClient.assertNoMoreRequests();
+    }
+
+    @Test
+    void doNotDiscardDataForAppStartedEventUntilItHasBeenSuccessfullySent() throws IOException {
+        TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
+        TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
+        telemetryService.addConfiguration(configuration);
+
+        // attempt with 404 error
+        testHttpClient.expectRequest(NOT_FOUND);
+        assertFalse(telemetryService.sendAppStartedEvent());
+
+        // app-started is attempted
+        testHttpClient
+                .assertRequestBody(APP_STARTED)
+                .assertPayload()
+                .products()
+                .configuration(singletonList(confKeyValue));
+        testHttpClient.assertNoMoreRequests();
+
+        // attempt with 500 error
+        testHttpClient.expectRequest(FAILURE);
+        assertFalse(telemetryService.sendAppStartedEvent());
+
+        // app-started is attempted
+        testHttpClient
+                .assertRequestBody(APP_STARTED)
+                .assertPayload()
+                .products()
+                .configuration(singletonList(confKeyValue));
+        testHttpClient.assertNoMoreRequests();
+
+        // attempt with unexpected FAILURE (not valid)
+        testHttpClient.expectRequest(FAILURE);
+        assertFalse(telemetryService.sendAppStartedEvent());
+
+        // app-started is attempted
+        testHttpClient
+                .assertRequestBody(APP_STARTED)
+                .assertPayload()
+                .products()
+                .configuration(singletonList(confKeyValue));
+        testHttpClient.assertNoMoreRequests();
+
+        // attempt with success
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendAppStartedEvent();
+
+        // app-started is attempted
+        testHttpClient
+                .assertRequestBody(APP_STARTED)
+                .assertPayload()
+                .products()
+                .configuration(singletonList(confKeyValue));
+        testHttpClient.assertNoMoreRequests();
+    }
+
+    @Test
+    void resendDataOnSuccessfulAttemptAfterAFailure() throws IOException {
+        TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
+        TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
+
+        telemetryService.addConfiguration(configuration);
+        telemetryService.addIntegration(integration);
+        telemetryService.addDependency(dependency);
+        telemetryService.addMetric(metric);
+        telemetryService.addDistributionSeries(distribution);
+        telemetryService.addLogMessage(logMessage);
+        telemetryService.addProductChange(productChange);
+        telemetryService.addEndpoint(endpoint);
+
+        // attempt with NOT_FOUND error
+        testHttpClient.expectRequest(NOT_FOUND);
+        assertFalse(telemetryService.sendAppStartedEvent());
+
+        // app-started attempted with config
+        testHttpClient
+                .assertRequestBody(APP_STARTED)
+                .assertPayload()
+                .products()
+                .configuration(singletonList(confKeyValue));
+        testHttpClient.assertNoMoreRequests();
+
+        // successful app-started attempt
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendAppStartedEvent();
+
+        // attempt app-started with SUCCESS
+        testHttpClient
+                .assertRequestBody(APP_STARTED)
+                .assertPayload()
+                .products()
+                .configuration(singletonList(confKeyValue));
+
+        // successful batch attempt
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendTelemetryEvents();
+
+        // attempt batch with SUCCESS
+        testHttpClient
+                .assertRequestBody(MESSAGE_BATCH)
+                .assertBatch(8)
+                .assertFirstMessage(APP_HEARTBEAT)
+                .hasNoPayload()
+                // no configuration here as it has already been sent with the app-started event
+                .assertNextMessage(APP_INTEGRATIONS_CHANGE)
+                .hasPayload()
+                .integrations(singletonList(integration))
+                .assertNextMessage(APP_DEPENDENCIES_LOADED)
+                .hasPayload()
+                .dependencies(singletonList(dependency))
+                .assertNextMessage(GENERATE_METRICS)
+                .hasPayload()
+                .namespace("tracers")
+                .metrics(singletonList(metric))
+                .assertNextMessage(DISTRIBUTIONS)
+                .hasPayload()
+                .namespace("tracers")
+                .distributionSeries(singletonList(distribution))
+                .assertNextMessage(LOGS)
+                .hasPayload()
+                .logs(singletonList(logMessage))
+                .assertNextMessage(APP_PRODUCT_CHANGE)
+                .hasPayload()
+                .productChange(productChange)
+                .assertNextMessage(APP_ENDPOINTS)
+                .hasPayload()
+                .endpoint(endpoint)
+                .assertNoMoreMessages();
+        testHttpClient.assertNoMoreRequests();
+
+        // attempt with NOT_FOUND error
+        testHttpClient.expectRequest(NOT_FOUND);
+        telemetryService.sendTelemetryEvents();
+
+        // message-batch attempted with heartbeat
+        testHttpClient.assertRequestBody(APP_HEARTBEAT).assertNoPayload();
+        testHttpClient.assertNoMoreRequests();
+    }
+
+    @Test
+    void sendClosingEventRequest() throws IOException {
+        TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
+        TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
+
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendAppClosingEvent();
+
+        testHttpClient.assertRequestBody(RequestType.APP_CLOSING);
+        testHttpClient.assertNoMoreRequests();
+    }
+
+    @TableTest({
+      "scenario                    | otelEnabled | otEnabled | expectedWarnings",
+      "both otel and ot enabled    | true        | true      | 1               ",
+      "only otel enabled           | true        | false     | 0               ",
+      "only ot enabled             | false       | true      | 0               ",
+      "neither otel nor ot enabled | false       | false     | 0               "
+    })
+    void reportWhenBothOTelAndOTAreEnabled(boolean otelEnabled, boolean otEnabled, int expectedWarnings) {
+        TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
+        TelemetryService telemetryService = spy(new TelemetryService(testHttpClient, 1000, false));
+        Integration otel = new Integration("opentelemetry-1", otelEnabled);
+        Integration ot = new Integration("opentracing", otEnabled);
+
+        telemetryService.addIntegration(otel);
+
+        verify(telemetryService, times(0)).warnAboutExclusiveIntegrations();
+
+        telemetryService.addIntegration(ot);
+
+        verify(telemetryService, times(expectedWarnings)).warnAboutExclusiveIntegrations();
+    }
+
+    @Test
+    void splitTelemetryRequestsIfTheSizeAboveTheLimit() throws IOException {
+        TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
+        TelemetryService telemetryService = new TelemetryService(testHttpClient, 5000, false);
+
+        // send a heartbeat request without telemetry data to measure body size to set stable request
+        // size limit
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendTelemetryEvents();
+
+        // get body size
+        int bodySize = testHttpClient.assertRequestBody(APP_HEARTBEAT).bodySize();
+        assertTrue(bodySize > 0);
+
+        // sending first part of data
+        telemetryService = new TelemetryService(testHttpClient, bodySize + 512, false);
+
+        telemetryService.addConfiguration(configuration);
+        telemetryService.addIntegration(integration);
+        telemetryService.addDependency(dependency);
+        telemetryService.addMetric(metric);
+        telemetryService.addDistributionSeries(distribution);
+        telemetryService.addLogMessage(logMessage);
+        telemetryService.addProductChange(productChange);
+        telemetryService.addEndpoint(endpoint);
+
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendTelemetryEvents();
+
+        // attempt with SUCCESS
+        testHttpClient
+                .assertRequestBody(MESSAGE_BATCH)
+                .assertBatch(5)
+                .assertFirstMessage(APP_HEARTBEAT)
+                .hasNoPayload()
+                .assertNextMessage(RequestType.APP_CLIENT_CONFIGURATION_CHANGE)
+                .hasPayload()
+                .configuration(singletonList(confKeyValue))
+                .assertNextMessage(APP_INTEGRATIONS_CHANGE)
+                .hasPayload()
+                .integrations(singletonList(integration))
+                .assertNextMessage(APP_DEPENDENCIES_LOADED)
+                .hasPayload()
+                .dependencies(singletonList(dependency))
+                .assertNextMessage(GENERATE_METRICS)
+                .hasPayload()
+                .namespace("tracers")
+                .metrics(singletonList(metric))
+                // no more data fit this message is sent in the next message
+                .assertNoMoreMessages();
+
+        // sending second part of data
+        testHttpClient.expectRequest(SUCCESS);
+        assertFalse(telemetryService.sendTelemetryEvents());
+
+        testHttpClient
+                .assertRequestBody(MESSAGE_BATCH)
+                .assertBatch(5)
+                .assertFirstMessage(APP_HEARTBEAT)
+                .hasNoPayload()
+                .assertNextMessage(DISTRIBUTIONS)
+                .hasPayload()
+                .namespace("tracers")
+                .distributionSeries(singletonList(distribution))
+                .assertNextMessage(LOGS)
+                .hasPayload()
+                .logs(singletonList(logMessage))
+                .assertNextMessage(APP_PRODUCT_CHANGE)
+                .hasPayload()
+                .productChange(productChange)
+                .assertNextMessage(APP_ENDPOINTS)
+                .hasPayload()
+                .endpoint(endpoint)
+                .assertNoMoreMessages();
+        testHttpClient.assertNoMoreRequests();
+    }
+
+    @Test
+    void sendAllCollectedDataWithExtendedHeartbeatRequestEveryTime() throws IOException {
+        TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
+        TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
+
+        telemetryService.addConfiguration(configuration);
+        telemetryService.addIntegration(integration);
+        telemetryService.addDependency(dependency);
+
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendExtendedHeartbeat();
+
+        testHttpClient
+                .assertRequestBody(APP_EXTENDED_HEARTBEAT)
+                .assertPayload()
+                .configuration(singletonList(confKeyValue))
+                .integrations(singletonList(integration))
+                .dependencies(singletonList(dependency));
+        testHttpClient.assertNoMoreRequests();
+
+        telemetryService.addConfiguration(configuration);
+        telemetryService.addIntegration(integration);
+        telemetryService.addDependency(dependency);
+
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendExtendedHeartbeat();
+
+        testHttpClient
+                .assertRequestBody(APP_EXTENDED_HEARTBEAT)
+                .assertPayload()
+                .configuration(Arrays.asList(confKeyValue, confKeyValue))
+                .integrations(Arrays.asList(integration, integration))
+                .dependencies(Arrays.asList(dependency, dependency));
+        testHttpClient.assertNoMoreRequests();
+    }
+
+    @TableTest({
+      "scenario | resultCode",
+      "success  | SUCCESS   ",
+      "failure  | FAILURE   ",
+      "notFound | NOT_FOUND "
+    })
+    void sendExtendedHeartbeatRequestEvenIfDataAlreadyHasBeenSentOrAttemptedAsPartOfAnotherTelemetryEvents(
+            String resultCode) throws IOException {
+        TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
+        TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
+
+        telemetryService.addConfiguration(configuration);
+        telemetryService.addIntegration(integration);
+        telemetryService.addDependency(dependency);
+
+        testHttpClient.expectRequest(TelemetryClient.Result.valueOf(resultCode));
+        telemetryService.sendTelemetryEvents();
+
+        testHttpClient.assertRequestBody(MESSAGE_BATCH);
+
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendExtendedHeartbeat();
+
+        testHttpClient
+                .assertRequestBody(APP_EXTENDED_HEARTBEAT)
+                .assertPayload()
+                .configuration(singletonList(confKeyValue))
+                .integrations(singletonList(integration))
+                .dependencies(singletonList(dependency));
+        testHttpClient.assertNoMoreRequests();
+    }
+
+    @TableTest({
+      "scenario    | id ",
+      "with value  | foo",
+      "null value  |    ",
+      "empty value | '' "
+    })
+    void appCanPropagateConfigurationId(String id) throws IOException {
+        String instrumentationConfigIdKey = "instrumentation_config_id";
+        TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
+        TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
+        Map<String, ConfigSetting> configMap = singletonMap(
+                instrumentationConfigIdKey, ConfigSetting.of(instrumentationConfigIdKey, id, ConfigOrigin.ENV));
+        telemetryService.addConfiguration(singletonMap(ConfigOrigin.ENV, configMap));
+
+        // first iteration
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendAppStartedEvent();
+
+        // app-started
+        testHttpClient.assertRequestBody(APP_STARTED).assertPayload().instrumentationConfigId(id);
+        testHttpClient.assertNoMoreRequests();
+    }
+
+    @TableTest({
+      "scenario                  | installId                            | installType     | installTime",
+      "no install data           |                                      |                 |            ",
+      "install time only         |                                      |                 | 1703188334 ",
+      "install type only         |                                      | k8s_single_step |            ",
+      "install type and time     |                                      | k8s_single_step | 1703188212 ",
+      "install id only           | 68e75c99-57ca-4a12-adfc-575c4b05fcbe |                 |            ",
+      "install id and time       | 68e75c48-57ca-4a12-adfc-575c4b05bfff |                 | 1704183412 ",
+      "install id and type       | 68e75c55-57ca-4a12-adfc-575c4b05aaaa | k8s_single_step |            ",
+      "install id, type and time | 68e75c77-57ca-4a12-adfc-575c4b05fc44 | k8s_single_step | 1993188215 "
+    })
+    void appStartedMustHaveInstallSignature(String installId, String installType, String installTime)
+            throws IOException {
+        WithConfigExtension.injectEnvConfig("INSTRUMENTATION_INSTALL_ID", installId);
+        WithConfigExtension.injectEnvConfig("INSTRUMENTATION_INSTALL_TYPE", installType);
+        WithConfigExtension.injectEnvConfig("INSTRUMENTATION_INSTALL_TIME", installTime);
+
+        TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
+        TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
+
+        // first iteration
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendAppStartedEvent();
+
+        // app-started
+        testHttpClient
+                .assertRequestBody(APP_STARTED)
+                .assertPayload()
+                .installSignature(installId, installType, installTime);
+        testHttpClient.assertNoMoreRequests();
+    }
+
+    @TableTest({
+      "scenario                              | appsecConfig | appsecEnabled | profilingConfig | profilingEnabled | dynInstrConfig | dynInstrEnabled",
+      "all products enabled                  | 1            | true          | 1               | true             | 1              | true           ",
+      "dynamic instrumentation disabled      | 1            | true          | 1               | true             | 0              | false          ",
+      "profiling disabled                    | 1            | true          | 0               | false            | 1              | true           ",
+      "profiling and dyn instr disabled      | 1            | true          | 0               | false            | 0              | false          ",
+      "all products disabled                 | 0            | false         | 0               | false            | 0              | false          ",
+      "appsec inactive value treated enabled | inactive     | true          | 0               | false            | 0              | false          "
+    })
+    void appStartedMustIncludeActivatedProductsInfo(
+            String appsecConfig,
+            boolean appsecEnabled,
+            String profilingConfig,
+            boolean profilingEnabled,
+            String dynInstrConfig,
+            boolean dynInstrEnabled)
+            throws IOException {
+        WithConfigExtension.injectEnvConfig(ConfigStrings.toEnvVar(AppSecConfig.APPSEC_ENABLED), appsecConfig);
+        WithConfigExtension.injectEnvConfig(ConfigStrings.toEnvVar(ProfilingConfig.PROFILING_ENABLED), profilingConfig);
+        WithConfigExtension.injectEnvConfig(
+                ConfigStrings.toEnvVar(DebuggerConfig.DYNAMIC_INSTRUMENTATION_ENABLED), dynInstrConfig);
+
+        TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
+        TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
+
+        // first iteration
+        testHttpClient.expectRequest(SUCCESS);
+        telemetryService.sendAppStartedEvent();
+
+        // app-started
+        testHttpClient
+                .assertRequestBody(APP_STARTED)
+                .assertPayload()
+                .products(appsecEnabled, profilingEnabled, dynInstrEnabled);
+        testHttpClient.assertNoMoreRequests();
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/TelemetrySystemTest.java b/telemetry/src/test/java/datadog/telemetry/TelemetrySystemTest.java
index 76c57f9d842..f443147fba4 100644
--- a/telemetry/src/test/java/datadog/telemetry/TelemetrySystemTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/TelemetrySystemTest.java
@@ -23,63 +23,61 @@
 
 class TelemetrySystemTest {
 
-  @AfterEach
-  void cleanup() {
-    TelemetrySystem.stop();
-  }
+    @AfterEach
+    void cleanup() {
+        TelemetrySystem.stop();
+    }
 
-  @Test
-  void installsDependenciesTransformer() {
-    Instrumentation instrumentation = mock(Instrumentation.class);
+    @Test
+    void installsDependenciesTransformer() {
+        Instrumentation instrumentation = mock(Instrumentation.class);
 
-    DependencyService dependencyService = TelemetrySystem.createDependencyService(instrumentation);
-    try {
-      ArgumentCaptor<ClassFileTransformer> transformerCaptor =
-          ArgumentCaptor.forClass(ClassFileTransformer.class);
-      verify(instrumentation, times(1)).addTransformer(transformerCaptor.capture());
-      assertEquals(
-          "datadog.telemetry.dependency.LocationsCollectingTransformer",
-          transformerCaptor.getValue().getClass().getName());
-    } finally {
-      dependencyService.stop();
+        DependencyService dependencyService = TelemetrySystem.createDependencyService(instrumentation);
+        try {
+            ArgumentCaptor<ClassFileTransformer> transformerCaptor =
+                    ArgumentCaptor.forClass(ClassFileTransformer.class);
+            verify(instrumentation, times(1)).addTransformer(transformerCaptor.capture());
+            assertEquals(
+                    "datadog.telemetry.dependency.LocationsCollectingTransformer",
+                    transformerCaptor.getValue().getClass().getName());
+        } finally {
+            dependencyService.stop();
+        }
     }
-  }
 
-  @Test
-  void createTelemetryThread() {
-    TelemetryService telemetryService = mock(TelemetryService.class);
-    DependencyService dependencyService = mock(DependencyService.class);
+    @Test
+    void createTelemetryThread() {
+        TelemetryService telemetryService = mock(TelemetryService.class);
+        DependencyService dependencyService = mock(DependencyService.class);
 
-    Thread thread =
-        TelemetrySystem.createTelemetryRunnable(telemetryService, dependencyService, true);
+        Thread thread = TelemetrySystem.createTelemetryRunnable(telemetryService, dependencyService, true);
 
-    assertNotNull(thread);
-  }
+        assertNotNull(thread);
+    }
 
-  @Test
-  @WithConfig(key = GeneralConfig.SITE, value = "datad0g.com")
-  @WithConfig(key = GeneralConfig.API_KEY, value = "api-key")
-  void startStopTelemetrySystem() {
-    Instrumentation instrumentation = mock(Instrumentation.class);
+    @Test
+    @WithConfig(key = GeneralConfig.SITE, value = "datad0g.com")
+    @WithConfig(key = GeneralConfig.API_KEY, value = "api-key")
+    void startStopTelemetrySystem() {
+        Instrumentation instrumentation = mock(Instrumentation.class);
 
-    TelemetrySystem.startTelemetry(instrumentation, sharedCommunicationObjects());
+        TelemetrySystem.startTelemetry(instrumentation, sharedCommunicationObjects());
 
-    assertNotNull(TelemetrySystem.getTelemetryThread());
+        assertNotNull(TelemetrySystem.getTelemetryThread());
 
-    TelemetrySystem.stop();
+        TelemetrySystem.stop();
 
-    assertTrue(
-        TelemetrySystem.getTelemetryThread() == null
-            || TelemetrySystem.getTelemetryThread().isInterrupted()
-            || !TelemetrySystem.getTelemetryThread().isAlive());
-  }
+        assertTrue(TelemetrySystem.getTelemetryThread() == null
+                || TelemetrySystem.getTelemetryThread().isInterrupted()
+                || !TelemetrySystem.getTelemetryThread().isAlive());
+    }
 
-  private SharedCommunicationObjects sharedCommunicationObjects() {
-    SharedCommunicationObjects sco = new SharedCommunicationObjects();
-    sco.agentHttpClient = mock(OkHttpClient.class);
-    sco.monitoring = mock(Monitoring.class);
-    sco.agentUrl = HttpUrl.get("https://example.com");
-    sco.setFeaturesDiscovery(mock(DDAgentFeaturesDiscovery.class));
-    return sco;
-  }
+    private SharedCommunicationObjects sharedCommunicationObjects() {
+        SharedCommunicationObjects sco = new SharedCommunicationObjects();
+        sco.agentHttpClient = mock(OkHttpClient.class);
+        sco.monitoring = mock(Monitoring.class);
+        sco.agentUrl = HttpUrl.get("https://example.com");
+        sco.setFeaturesDiscovery(mock(DDAgentFeaturesDiscovery.class));
+        return sco;
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/TestTelemetryRouter.java b/telemetry/src/test/java/datadog/telemetry/TestTelemetryRouter.java
index 5038614045d..0824821de07 100644
--- a/telemetry/src/test/java/datadog/telemetry/TestTelemetryRouter.java
+++ b/telemetry/src/test/java/datadog/telemetry/TestTelemetryRouter.java
@@ -32,482 +32,470 @@
 import okio.Buffer;
 
 class TestTelemetryRouter extends TelemetryRouter {
-  private final Queue<TelemetryClient.Result> mockResults = new LinkedList<>();
-  private final Queue<RequestAssertions> requests = new LinkedList<>();
-
-  TestTelemetryRouter() {
-    super(null, null, null, false);
-  }
-
-  @Override
-  public TelemetryClient.Result sendRequest(TelemetryRequest request) {
-    if (mockResults.isEmpty()) {
-      throw new IllegalStateException(
-          "Unexpected request has been sent. State expectations with `expectRequests` prior sending requests.");
-    }
+    private final Queue<TelemetryClient.Result> mockResults = new LinkedList<>();
+    private final Queue<RequestAssertions> requests = new LinkedList<>();
 
-    Request.Builder requestBuilder = request.httpRequest();
-    requestBuilder.url("https://example.com");
-    requests.add(new RequestAssertions(requestBuilder.build()));
-    return mockResults.poll();
-  }
+    TestTelemetryRouter() {
+        super(null, null, null, false);
+    }
 
-  void expectRequest(TelemetryClient.Result mockResult) {
-    expectRequests(1, mockResult);
-  }
+    @Override
+    public TelemetryClient.Result sendRequest(TelemetryRequest request) {
+        if (mockResults.isEmpty()) {
+            throw new IllegalStateException(
+                    "Unexpected request has been sent. State expectations with `expectRequests` prior sending requests.");
+        }
 
-  void expectRequests(int requestNumber, TelemetryClient.Result mockResult) {
-    for (int i = 0; i < requestNumber; i++) {
-      mockResults.add(mockResult);
+        Request.Builder requestBuilder = request.httpRequest();
+        requestBuilder.url("https://example.com");
+        requests.add(new RequestAssertions(requestBuilder.build()));
+        return mockResults.poll();
     }
-  }
 
-  RequestAssertions assertRequest() {
-    if (!mockResults.isEmpty()) {
-      throw new IllegalStateException("Expected " + mockResults.size() + " more sendRequest calls");
+    void expectRequest(TelemetryClient.Result mockResult) {
+        expectRequests(1, mockResult);
     }
-    if (requests.isEmpty()) {
-      throw new IllegalStateException("No more requests have been sent.");
-    }
-    return requests.poll();
-  }
-
-  BodyAssertions assertRequestBody(RequestType requestType) throws IOException {
-    return assertRequest().headers(requestType).assertBody().commonParts(requestType);
-  }
 
-  void assertNoMoreRequests() {
-    if (!mockResults.isEmpty()) {
-      throw new IllegalStateException("Still expect " + mockResults.size() + " request(s)");
-    }
-    if (!requests.isEmpty()) {
-      throw new IllegalStateException(
-          "Still have " + requests.size() + " requests when none expected.");
+    void expectRequests(int requestNumber, TelemetryClient.Result mockResult) {
+        for (int i = 0; i < requestNumber; i++) {
+            mockResults.add(mockResult);
+        }
     }
-  }
 
-  private static List<Double> toDoubles(List<? extends Number> numbers) {
-    if (numbers == null) {
-      return null;
-    }
-    List<Double> doubles = new ArrayList<>(numbers.size());
-    for (Number number : numbers) {
-      doubles.add(number.doubleValue());
+    RequestAssertions assertRequest() {
+        if (!mockResults.isEmpty()) {
+            throw new IllegalStateException("Expected " + mockResults.size() + " more sendRequest calls");
+        }
+        if (requests.isEmpty()) {
+            throw new IllegalStateException("No more requests have been sent.");
+        }
+        return requests.poll();
     }
-    return doubles;
-  }
-
-  static class RequestAssertions {
-    private final Request request;
 
-    RequestAssertions(Request request) {
-      this.request = request;
+    BodyAssertions assertRequestBody(RequestType requestType) throws IOException {
+        return assertRequest().headers(requestType).assertBody().commonParts(requestType);
     }
 
-    RequestAssertions headers(RequestType requestType) {
-      assertEquals("POST", request.method());
-      assertTrue(
-          request
-              .headers()
-              .names()
-              .containsAll(
-                  Arrays.asList(
-                      "Content-Type",
-                      "Content-Length",
-                      "DD-Client-Library-Language",
-                      "DD-Client-Library-Version",
-                      "DD-Telemetry-API-Version",
-                      "DD-Telemetry-Request-Type",
-                      "DD-Session-ID")));
-      assertEquals("application/json; charset=utf-8", request.header("Content-Type"));
-      assertTrue(Integer.parseInt(request.header("Content-Length")) > 0);
-      assertEquals("jvm", request.header("DD-Client-Library-Language"));
-      assertEquals(TracerVersion.TRACER_VERSION, request.header("DD-Client-Library-Version"));
-      assertEquals("v2", request.header("DD-Telemetry-API-Version"));
-      assertEquals(requestType.toString(), request.header("DD-Telemetry-Request-Type"));
-      String entityId = request.header("Datadog-Entity-ID");
-      assertTrue(entityId == null || entityId.startsWith("in-") || entityId.startsWith("cin-"));
-      String sessionId = request.header("DD-Session-ID");
-      assertTrue(
-          sessionId != null && sessionId.matches("[\\da-f]{8}-([\\da-f]{4}-){3}[\\da-f]{12}"));
-      assertEquals(Config.get().getRuntimeId(), sessionId);
-      // DD-Root-Session-ID should only be present when inherited from a parent process
-      // (i.e., when rootSessionId != runtimeId). In normal test context, they're equal.
-      String rootSessionId = request.header("DD-Root-Session-ID");
-      if (Config.get().getRootSessionId().equals(Config.get().getRuntimeId())) {
-        assertNull(rootSessionId);
-      } else {
-        assertEquals(Config.get().getRootSessionId(), rootSessionId);
-      }
-      return this;
+    void assertNoMoreRequests() {
+        if (!mockResults.isEmpty()) {
+            throw new IllegalStateException("Still expect " + mockResults.size() + " request(s)");
+        }
+        if (!requests.isEmpty()) {
+            throw new IllegalStateException("Still have " + requests.size() + " requests when none expected.");
+        }
     }
 
-    @SuppressWarnings("unchecked")
-    BodyAssertions assertBody() throws IOException {
-      Buffer buf = new Buffer();
-      request.body().writeTo(buf);
-      byte[] bytes = new byte[(int) buf.size()];
-      buf.read(bytes);
-      Map<String, Object> parsed =
-          (Map<String, Object>)
-              new Moshi.Builder()
-                  .build()
-                  .adapter(Types.newParameterizedType(Map.class, String.class, Object.class))
-                  .fromJson(new String(bytes, StandardCharsets.UTF_8));
-      return new BodyAssertions(parsed, bytes);
+    private static List<Double> toDoubles(List<? extends Number> numbers) {
+        if (numbers == null) {
+            return null;
+        }
+        List<Double> doubles = new ArrayList<>(numbers.size());
+        for (Number number : numbers) {
+            doubles.add(number.doubleValue());
+        }
+        return doubles;
     }
-  }
 
-  static class BodyAssertions {
-    private final Map<String, Object> body;
-    private final byte[] bodyBytes;
+    static class RequestAssertions {
+        private final Request request;
 
-    BodyAssertions(Map<String, Object> body, byte[] bodyBytes) {
-      this.body = body;
-      this.bodyBytes = bodyBytes;
-    }
+        RequestAssertions(Request request) {
+            this.request = request;
+        }
 
-    int bodySize() {
-      return bodyBytes.length;
-    }
+        RequestAssertions headers(RequestType requestType) {
+            assertEquals("POST", request.method());
+            assertTrue(request.headers()
+                    .names()
+                    .containsAll(Arrays.asList(
+                            "Content-Type",
+                            "Content-Length",
+                            "DD-Client-Library-Language",
+                            "DD-Client-Library-Version",
+                            "DD-Telemetry-API-Version",
+                            "DD-Telemetry-Request-Type",
+                            "DD-Session-ID")));
+            assertEquals("application/json; charset=utf-8", request.header("Content-Type"));
+            assertTrue(Integer.parseInt(request.header("Content-Length")) > 0);
+            assertEquals("jvm", request.header("DD-Client-Library-Language"));
+            assertEquals(TracerVersion.TRACER_VERSION, request.header("DD-Client-Library-Version"));
+            assertEquals("v2", request.header("DD-Telemetry-API-Version"));
+            assertEquals(requestType.toString(), request.header("DD-Telemetry-Request-Type"));
+            String entityId = request.header("Datadog-Entity-ID");
+            assertTrue(entityId == null || entityId.startsWith("in-") || entityId.startsWith("cin-"));
+            String sessionId = request.header("DD-Session-ID");
+            assertTrue(sessionId != null && sessionId.matches("[\\da-f]{8}-([\\da-f]{4}-){3}[\\da-f]{12}"));
+            assertEquals(Config.get().getRuntimeId(), sessionId);
+            // DD-Root-Session-ID should only be present when inherited from a parent process
+            // (i.e., when rootSessionId != runtimeId). In normal test context, they're equal.
+            String rootSessionId = request.header("DD-Root-Session-ID");
+            if (Config.get().getRootSessionId().equals(Config.get().getRuntimeId())) {
+                assertNull(rootSessionId);
+            } else {
+                assertEquals(Config.get().getRootSessionId(), rootSessionId);
+            }
+            return this;
+        }
 
-    @SuppressWarnings("unchecked")
-    BodyAssertions commonParts(RequestType requestType) {
-      assertEquals("v2", body.get("api_version"));
-
-      Map<String, Object> app = (Map<String, Object>) body.get("application");
-      assertNotNull(app.get("env"));
-      assertEquals("jvm", app.get("language_name"));
-      assertTrue(((String) app.get("language_version")).matches("\\d+.*"));
-      assertNotNull(app.get("runtime_name"));
-      assertNotNull(app.get("runtime_version"));
-      assertNotNull(app.get("service_name"));
-      assertEquals("0.42.0", app.get("tracer_version"));
-
-      Map<String, Object> host = (Map<String, Object>) body.get("host");
-      assertNotNull(host.get("hostname"));
-      assertNotNull(host.get("os"));
-      assertNotNull(host.get("os_version"));
-      assertNotNull(host.get("kernel_name"));
-      assertNotNull(host.get("kernel_release"));
-      assertNotNull(host.get("kernel_version"));
-
-      assertTrue(
-          ((String) body.get("runtime_id")).matches("[\\da-f]{8}-([\\da-f]{4}-){3}[\\da-f]{12}"));
-      assertTrue(((Number) body.get("seq_id")).doubleValue() > 0);
-      assertTrue(((Number) body.get("tracer_time")).doubleValue() > 0);
-      assertEquals(requestType.toString(), body.get("request_type"));
-      return this;
+        @SuppressWarnings("unchecked")
+        BodyAssertions assertBody() throws IOException {
+            Buffer buf = new Buffer();
+            request.body().writeTo(buf);
+            byte[] bytes = new byte[(int) buf.size()];
+            buf.read(bytes);
+            Map<String, Object> parsed = (Map<String, Object>) new Moshi.Builder()
+                    .build()
+                    .adapter(Types.newParameterizedType(Map.class, String.class, Object.class))
+                    .fromJson(new String(bytes, StandardCharsets.UTF_8));
+            return new BodyAssertions(parsed, bytes);
+        }
     }
 
-    @SuppressWarnings("unchecked")
-    PayloadAssertions assertPayload() {
-      Map<String, Object> payload = (Map<String, Object>) body.get("payload");
-      assertNotNull(payload);
-      return new PayloadAssertions(payload);
-    }
+    static class BodyAssertions {
+        private final Map<String, Object> body;
+        private final byte[] bodyBytes;
 
-    @SuppressWarnings("unchecked")
-    BatchAssertions assertBatch(int expectedNumberOfPayloads) {
-      List<Map<String, Object>> payloads = (List<Map<String, Object>>) body.get("payload");
-      assertNotNull(payloads);
-      assertEquals(expectedNumberOfPayloads, payloads.size());
-      return new BatchAssertions(payloads);
-    }
+        BodyAssertions(Map<String, Object> body, byte[] bodyBytes) {
+            this.body = body;
+            this.bodyBytes = bodyBytes;
+        }
 
-    void assertNoPayload() {
-      assertNull(body.get("payload"));
-    }
-  }
+        int bodySize() {
+            return bodyBytes.length;
+        }
 
-  static class BatchAssertions {
-    private final List<Map<String, Object>> messages;
+        @SuppressWarnings("unchecked")
+        BodyAssertions commonParts(RequestType requestType) {
+            assertEquals("v2", body.get("api_version"));
+
+            Map<String, Object> app = (Map<String, Object>) body.get("application");
+            assertNotNull(app.get("env"));
+            assertEquals("jvm", app.get("language_name"));
+            assertTrue(((String) app.get("language_version")).matches("\\d+.*"));
+            assertNotNull(app.get("runtime_name"));
+            assertNotNull(app.get("runtime_version"));
+            assertNotNull(app.get("service_name"));
+            assertEquals("0.42.0", app.get("tracer_version"));
+
+            Map<String, Object> host = (Map<String, Object>) body.get("host");
+            assertNotNull(host.get("hostname"));
+            assertNotNull(host.get("os"));
+            assertNotNull(host.get("os_version"));
+            assertNotNull(host.get("kernel_name"));
+            assertNotNull(host.get("kernel_release"));
+            assertNotNull(host.get("kernel_version"));
+
+            assertTrue(((String) body.get("runtime_id")).matches("[\\da-f]{8}-([\\da-f]{4}-){3}[\\da-f]{12}"));
+            assertTrue(((Number) body.get("seq_id")).doubleValue() > 0);
+            assertTrue(((Number) body.get("tracer_time")).doubleValue() > 0);
+            assertEquals(requestType.toString(), body.get("request_type"));
+            return this;
+        }
 
-    BatchAssertions(List<Map<String, Object>> messages) {
-      this.messages = messages;
-    }
+        @SuppressWarnings("unchecked")
+        PayloadAssertions assertPayload() {
+            Map<String, Object> payload = (Map<String, Object>) body.get("payload");
+            assertNotNull(payload);
+            return new PayloadAssertions(payload);
+        }
 
-    BatchMessageAssertions assertFirstMessage(RequestType expected) {
-      return assertMessage(0, expected);
-    }
+        @SuppressWarnings("unchecked")
+        BatchAssertions assertBatch(int expectedNumberOfPayloads) {
+            List<Map<String, Object>> payloads = (List<Map<String, Object>>) body.get("payload");
+            assertNotNull(payloads);
+            assertEquals(expectedNumberOfPayloads, payloads.size());
+            return new BatchAssertions(payloads);
+        }
 
-    private BatchMessageAssertions assertMessage(int index, RequestType expected) {
-      if (index > messages.size()) {
-        throw new IllegalStateException(
-            "Asserted more messages than available (" + messages.size() + ") in the batch");
-      }
-      Map<String, Object> message = messages.get(index);
-      assertEquals(String.valueOf(expected), message.get("request_type"));
-      return new BatchMessageAssertions(this, index, message);
-    }
-  }
-
-  static class BatchMessageAssertions {
-    private final BatchAssertions batchAssertions;
-    private int messageIndex;
-    private final Map<String, Object> message;
-
-    BatchMessageAssertions(
-        BatchAssertions batchAssertions, int messageIndex, Map<String, Object> message) {
-      this.batchAssertions = batchAssertions;
-      this.messageIndex = messageIndex;
-      this.message = message;
+        void assertNoPayload() {
+            assertNull(body.get("payload"));
+        }
     }
 
-    BatchMessageAssertions hasNoPayload() {
-      assertNull(message.get("payload"));
-      return this;
-    }
+    static class BatchAssertions {
+        private final List<Map<String, Object>> messages;
 
-    BatchMessageAssertions assertNextMessage(RequestType expected) {
-      messageIndex += 1;
-      if (messageIndex >= batchAssertions.messages.size()) {
-        throw new IllegalStateException("No more messages available");
-      }
-      return batchAssertions.assertMessage(messageIndex, expected);
-    }
+        BatchAssertions(List<Map<String, Object>> messages) {
+            this.messages = messages;
+        }
 
-    @SuppressWarnings("unchecked")
-    PayloadAssertions hasPayload() {
-      Map<String, Object> payload = (Map<String, Object>) message.get("payload");
-      assertNotNull(payload);
-      return new PayloadAssertions(payload, this);
-    }
+        BatchMessageAssertions assertFirstMessage(RequestType expected) {
+            return assertMessage(0, expected);
+        }
 
-    void assertNoMoreMessages() {
-      assertEquals(batchAssertions.messages.size() - 1, messageIndex);
+        private BatchMessageAssertions assertMessage(int index, RequestType expected) {
+            if (index > messages.size()) {
+                throw new IllegalStateException(
+                        "Asserted more messages than available (" + messages.size() + ") in the batch");
+            }
+            Map<String, Object> message = messages.get(index);
+            assertEquals(String.valueOf(expected), message.get("request_type"));
+            return new BatchMessageAssertions(this, index, message);
+        }
     }
-  }
 
-  static class PayloadAssertions {
-    private final Map<String, Object> payload;
-    private final BatchMessageAssertions batch;
+    static class BatchMessageAssertions {
+        private final BatchAssertions batchAssertions;
+        private int messageIndex;
+        private final Map<String, Object> message;
 
-    PayloadAssertions(Map<String, Object> payload) {
-      this(payload, null);
-    }
+        BatchMessageAssertions(BatchAssertions batchAssertions, int messageIndex, Map<String, Object> message) {
+            this.batchAssertions = batchAssertions;
+            this.messageIndex = messageIndex;
+            this.message = message;
+        }
 
-    PayloadAssertions(Map<String, Object> payload, BatchMessageAssertions batch) {
-      this.payload = payload;
-      this.batch = batch;
-    }
+        BatchMessageAssertions hasNoPayload() {
+            assertNull(message.get("payload"));
+            return this;
+        }
 
-    PayloadAssertions configuration(List<ConfigSetting> configuration) {
-      List<Map<String, Object>> expected = configuration == null ? null : new ArrayList<>();
-      if (configuration != null) {
-        for (ConfigSetting cs : configuration) {
-          Map<String, Object> item = new HashMap<>();
-          item.put("name", cs.key);
-          item.put("value", cs.stringValue());
-          item.put("origin", cs.origin.value);
-          item.put("seq_id", (double) cs.seqId);
-          expected.add(item);
-        }
-      }
-      assertEquals(expected, payload.get("configuration"));
-      return this;
-    }
+        BatchMessageAssertions assertNextMessage(RequestType expected) {
+            messageIndex += 1;
+            if (messageIndex >= batchAssertions.messages.size()) {
+                throw new IllegalStateException("No more messages available");
+            }
+            return batchAssertions.assertMessage(messageIndex, expected);
+        }
 
-    @SuppressWarnings("unchecked")
-    PayloadAssertions instrumentationConfigId(String id) {
-      boolean checked = false;
-      List<Map<String, Object>> configuration =
-          (List<Map<String, Object>>) payload.get("configuration");
-      for (Map<String, Object> entry : configuration) {
-        if ("DD_INSTRUMENTATION_CONFIG_ID".equals(entry.get("name"))) {
-          assertEquals(id, entry.get("value"));
-          checked = true;
-        }
-      }
-      if (!checked) {
-        assertNull(id);
-      }
-      return this;
-    }
+        @SuppressWarnings("unchecked")
+        PayloadAssertions hasPayload() {
+            Map<String, Object> payload = (Map<String, Object>) message.get("payload");
+            assertNotNull(payload);
+            return new PayloadAssertions(payload, this);
+        }
 
-    PayloadAssertions productChange(ProductChange product) {
-      String name = product.getProductType().getName();
-      Map<String, Object> expected = new HashMap<>();
-      expected.put(name, Collections.singletonMap("enabled", product.isEnabled()));
-      assertEquals(expected, payload.get("products"));
-      return this;
+        void assertNoMoreMessages() {
+            assertEquals(batchAssertions.messages.size() - 1, messageIndex);
+        }
     }
 
-    PayloadAssertions endpoint(Endpoint... endpoints) {
-      List<Map<String, Object>> expected = new ArrayList<>();
-      for (Endpoint endpoint : endpoints) {
-        Map<String, Object> item = new HashMap<>();
-        item.put("operation_name", endpoint.getOperation());
-        item.put("resource_name", endpoint.getMethod() + " " + endpoint.getPath());
-        if (endpoint.getType() != null) {
-          item.put("type", endpoint.getType());
-        }
-        if (endpoint.getMethod() != null) {
-          item.put("method", endpoint.getMethod());
-        }
-        if (endpoint.getPath() != null) {
-          item.put("path", endpoint.getPath());
+    static class PayloadAssertions {
+        private final Map<String, Object> payload;
+        private final BatchMessageAssertions batch;
+
+        PayloadAssertions(Map<String, Object> payload) {
+            this(payload, null);
         }
-        if (endpoint.getRequestBodyType() != null) {
-          item.put("request_body_type", endpoint.getRequestBodyType());
+
+        PayloadAssertions(Map<String, Object> payload, BatchMessageAssertions batch) {
+            this.payload = payload;
+            this.batch = batch;
         }
-        if (endpoint.getResponseBodyType() != null) {
-          item.put("response_body_type", endpoint.getResponseBodyType());
+
+        PayloadAssertions configuration(List<ConfigSetting> configuration) {
+            List<Map<String, Object>> expected = configuration == null ? null : new ArrayList<>();
+            if (configuration != null) {
+                for (ConfigSetting cs : configuration) {
+                    Map<String, Object> item = new HashMap<>();
+                    item.put("name", cs.key);
+                    item.put("value", cs.stringValue());
+                    item.put("origin", cs.origin.value);
+                    item.put("seq_id", (double) cs.seqId);
+                    expected.add(item);
+                }
+            }
+            assertEquals(expected, payload.get("configuration"));
+            return this;
         }
-        if (endpoint.getAuthentication() != null) {
-          item.put("authentication", endpoint.getAuthentication());
+
+        @SuppressWarnings("unchecked")
+        PayloadAssertions instrumentationConfigId(String id) {
+            boolean checked = false;
+            List<Map<String, Object>> configuration = (List<Map<String, Object>>) payload.get("configuration");
+            for (Map<String, Object> entry : configuration) {
+                if ("DD_INSTRUMENTATION_CONFIG_ID".equals(entry.get("name"))) {
+                    assertEquals(id, entry.get("value"));
+                    checked = true;
+                }
+            }
+            if (!checked) {
+                assertNull(id);
+            }
+            return this;
         }
-        if (endpoint.getResponseCode() != null) {
-          item.put("response_code", toDoubles(endpoint.getResponseCode()));
+
+        PayloadAssertions productChange(ProductChange product) {
+            String name = product.getProductType().getName();
+            Map<String, Object> expected = new HashMap<>();
+            expected.put(name, Collections.singletonMap("enabled", product.isEnabled()));
+            assertEquals(expected, payload.get("products"));
+            return this;
         }
-        if (endpoint.getMetadata() != null) {
-          item.put("metadata", endpoint.getMetadata());
+
+        PayloadAssertions endpoint(Endpoint... endpoints) {
+            List<Map<String, Object>> expected = new ArrayList<>();
+            for (Endpoint endpoint : endpoints) {
+                Map<String, Object> item = new HashMap<>();
+                item.put("operation_name", endpoint.getOperation());
+                item.put("resource_name", endpoint.getMethod() + " " + endpoint.getPath());
+                if (endpoint.getType() != null) {
+                    item.put("type", endpoint.getType());
+                }
+                if (endpoint.getMethod() != null) {
+                    item.put("method", endpoint.getMethod());
+                }
+                if (endpoint.getPath() != null) {
+                    item.put("path", endpoint.getPath());
+                }
+                if (endpoint.getRequestBodyType() != null) {
+                    item.put("request_body_type", endpoint.getRequestBodyType());
+                }
+                if (endpoint.getResponseBodyType() != null) {
+                    item.put("response_body_type", endpoint.getResponseBodyType());
+                }
+                if (endpoint.getAuthentication() != null) {
+                    item.put("authentication", endpoint.getAuthentication());
+                }
+                if (endpoint.getResponseCode() != null) {
+                    item.put("response_code", toDoubles(endpoint.getResponseCode()));
+                }
+                if (endpoint.getMetadata() != null) {
+                    item.put("metadata", endpoint.getMetadata());
+                }
+                expected.add(item);
+            }
+            assertEquals(expected, payload.get("endpoints"));
+            return this;
         }
-        expected.add(item);
-      }
-      assertEquals(expected, payload.get("endpoints"));
-      return this;
-    }
 
-    PayloadAssertions products() {
-      return products(true, false, false);
-    }
+        PayloadAssertions products() {
+            return products(true, false, false);
+        }
 
-    PayloadAssertions products(boolean appsecEnabled) {
-      return products(appsecEnabled, false, false);
-    }
+        PayloadAssertions products(boolean appsecEnabled) {
+            return products(appsecEnabled, false, false);
+        }
 
-    PayloadAssertions products(boolean appsecEnabled, boolean profilerEnabled) {
-      return products(appsecEnabled, profilerEnabled, false);
-    }
+        PayloadAssertions products(boolean appsecEnabled, boolean profilerEnabled) {
+            return products(appsecEnabled, profilerEnabled, false);
+        }
 
-    PayloadAssertions products(
-        boolean appsecEnabled, boolean profilerEnabled, boolean dynamicInstrumentationEnabled) {
-      Map<String, Object> expected = new HashMap<>();
-      expected.put("appsec", Collections.singletonMap("enabled", appsecEnabled));
-      expected.put("profiler", Collections.singletonMap("enabled", profilerEnabled));
-      expected.put(
-          "dynamic_instrumentation",
-          Collections.singletonMap("enabled", dynamicInstrumentationEnabled));
-      assertEquals(expected, payload.get("products"));
-      return this;
-    }
+        PayloadAssertions products(
+                boolean appsecEnabled, boolean profilerEnabled, boolean dynamicInstrumentationEnabled) {
+            Map<String, Object> expected = new HashMap<>();
+            expected.put("appsec", Collections.singletonMap("enabled", appsecEnabled));
+            expected.put("profiler", Collections.singletonMap("enabled", profilerEnabled));
+            expected.put("dynamic_instrumentation", Collections.singletonMap("enabled", dynamicInstrumentationEnabled));
+            assertEquals(expected, payload.get("products"));
+            return this;
+        }
 
-    PayloadAssertions dependencies(List<Dependency> dependencies) {
-      List<Map<String, Object>> expected = new ArrayList<>();
-      for (Dependency dependency : dependencies) {
-        Map<String, Object> item = new HashMap<>();
-        item.put("hash", dependency.hash);
-        item.put("name", dependency.name);
-        item.put("version", dependency.version);
-        expected.add(item);
-      }
-      assertEquals(expected, payload.get("dependencies"));
-      return this;
-    }
+        PayloadAssertions dependencies(List<Dependency> dependencies) {
+            List<Map<String, Object>> expected = new ArrayList<>();
+            for (Dependency dependency : dependencies) {
+                Map<String, Object> item = new HashMap<>();
+                item.put("hash", dependency.hash);
+                item.put("name", dependency.name);
+                item.put("version", dependency.version);
+                expected.add(item);
+            }
+            assertEquals(expected, payload.get("dependencies"));
+            return this;
+        }
 
-    PayloadAssertions integrations(List<Integration> integrations) {
-      List<Map<String, Object>> expected = new ArrayList<>();
-      for (Integration integration : integrations) {
-        Map<String, Object> item = new HashMap<>();
-        item.put("enabled", integration.enabled);
-        item.put("name", integration.name);
-        expected.add(item);
-      }
-      assertEquals(expected, payload.get("integrations"));
-      return this;
-    }
+        PayloadAssertions integrations(List<Integration> integrations) {
+            List<Map<String, Object>> expected = new ArrayList<>();
+            for (Integration integration : integrations) {
+                Map<String, Object> item = new HashMap<>();
+                item.put("enabled", integration.enabled);
+                item.put("name", integration.name);
+                expected.add(item);
+            }
+            assertEquals(expected, payload.get("integrations"));
+            return this;
+        }
 
-    PayloadAssertions namespace(String namespace) {
-      assertEquals(namespace, payload.get("namespace"));
-      return this;
-    }
+        PayloadAssertions namespace(String namespace) {
+            assertEquals(namespace, payload.get("namespace"));
+            return this;
+        }
 
-    PayloadAssertions metrics(List<Metric> metrics) {
-      List<Map<String, Object>> expected = new ArrayList<>();
-      for (Metric metric : metrics) {
-        Map<String, Object> item = new HashMap<>();
-        item.put("namespace", metric.getNamespace());
-        if (metric.getCommon() != null) {
-          item.put("common", metric.getCommon());
-        }
-        item.put("metric", metric.getMetric());
-        List<List<Double>> points = new ArrayList<>();
-        for (List<Number> point : metric.getPoints()) {
-          points.add(toDoubles(point));
-        }
-        item.put("points", points);
-        if (metric.getType() != null) {
-          item.put("type", metric.getType());
-        }
-        item.put("tags", metric.getTags());
-        expected.add(item);
-      }
-      assertEquals(expected, payload.get("series"));
-      return this;
-    }
+        PayloadAssertions metrics(List<Metric> metrics) {
+            List<Map<String, Object>> expected = new ArrayList<>();
+            for (Metric metric : metrics) {
+                Map<String, Object> item = new HashMap<>();
+                item.put("namespace", metric.getNamespace());
+                if (metric.getCommon() != null) {
+                    item.put("common", metric.getCommon());
+                }
+                item.put("metric", metric.getMetric());
+                List<List<Double>> points = new ArrayList<>();
+                for (List<Number> point : metric.getPoints()) {
+                    points.add(toDoubles(point));
+                }
+                item.put("points", points);
+                if (metric.getType() != null) {
+                    item.put("type", metric.getType());
+                }
+                item.put("tags", metric.getTags());
+                expected.add(item);
+            }
+            assertEquals(expected, payload.get("series"));
+            return this;
+        }
 
-    PayloadAssertions distributionSeries(List<DistributionSeries> distributionSeriesList) {
-      List<Map<String, Object>> expected = new ArrayList<>();
-      for (DistributionSeries distribution : distributionSeriesList) {
-        Map<String, Object> item = new HashMap<>();
-        item.put("namespace", distribution.getNamespace());
-        if (distribution.getCommon() != null) {
-          item.put("common", distribution.getCommon());
-        }
-        item.put("metric", distribution.getMetric());
-        item.put("points", toDoubles(distribution.getPoints()));
-        item.put("tags", distribution.getTags());
-        expected.add(item);
-      }
-      assertEquals(expected, payload.get("series"));
-      return this;
-    }
+        PayloadAssertions distributionSeries(List<DistributionSeries> distributionSeriesList) {
+            List<Map<String, Object>> expected = new ArrayList<>();
+            for (DistributionSeries distribution : distributionSeriesList) {
+                Map<String, Object> item = new HashMap<>();
+                item.put("namespace", distribution.getNamespace());
+                if (distribution.getCommon() != null) {
+                    item.put("common", distribution.getCommon());
+                }
+                item.put("metric", distribution.getMetric());
+                item.put("points", toDoubles(distribution.getPoints()));
+                item.put("tags", distribution.getTags());
+                expected.add(item);
+            }
+            assertEquals(expected, payload.get("series"));
+            return this;
+        }
 
-    PayloadAssertions logs(List<LogMessage> logMessages) {
-      List<Map<String, Object>> expected = new ArrayList<>();
-      for (LogMessage logMessage : logMessages) {
-        Map<String, Object> item = new HashMap<>();
-        item.put("message", logMessage.getMessage());
-        item.put("level", logMessage.getLevel().toString());
-        item.put("tags", logMessage.getTags());
-        if (logMessage.getStackTrace() != null) {
-          item.put("stack_trace", logMessage.getStackTrace());
-        }
-        if (logMessage.getTracerTime() != null) {
-          item.put("tracer_time", logMessage.getTracerTime().doubleValue());
-        }
-        item.put("count", (double) logMessage.getCount());
-        expected.add(item);
-      }
-      assertEquals(expected, payload.get("logs"));
-      return this;
-    }
+        PayloadAssertions logs(List<LogMessage> logMessages) {
+            List<Map<String, Object>> expected = new ArrayList<>();
+            for (LogMessage logMessage : logMessages) {
+                Map<String, Object> item = new HashMap<>();
+                item.put("message", logMessage.getMessage());
+                item.put("level", logMessage.getLevel().toString());
+                item.put("tags", logMessage.getTags());
+                if (logMessage.getStackTrace() != null) {
+                    item.put("stack_trace", logMessage.getStackTrace());
+                }
+                if (logMessage.getTracerTime() != null) {
+                    item.put("tracer_time", logMessage.getTracerTime().doubleValue());
+                }
+                item.put("count", (double) logMessage.getCount());
+                expected.add(item);
+            }
+            assertEquals(expected, payload.get("logs"));
+            return this;
+        }
 
-    BatchMessageAssertions assertNextMessage(RequestType requestType) {
-      return batch.assertNextMessage(requestType);
-    }
+        BatchMessageAssertions assertNextMessage(RequestType requestType) {
+            return batch.assertNextMessage(requestType);
+        }
 
-    void assertNoMoreMessages() {
-      batch.assertNoMoreMessages();
-    }
+        void assertNoMoreMessages() {
+            batch.assertNoMoreMessages();
+        }
 
-    void installSignature(String installId, String installType, String installTime) {
-      if (installId == null && installType == null && installTime == null) {
-        assertNull(payload.get("install_signature"));
-        return;
-      }
-      Map<String, String> expected = new HashMap<>();
-      if (installId != null) {
-        expected.put("install_id", installId);
-      }
-      if (installType != null) {
-        expected.put("install_type", installType);
-      }
-      if (installTime != null) {
-        expected.put("install_time", installTime);
-      }
-      assertEquals(expected, payload.get("install_signature"));
+        void installSignature(String installId, String installType, String installTime) {
+            if (installId == null && installType == null && installTime == null) {
+                assertNull(payload.get("install_signature"));
+                return;
+            }
+            Map<String, String> expected = new HashMap<>();
+            if (installId != null) {
+                expected.put("install_id", installId);
+            }
+            if (installType != null) {
+                expected.put("install_type", installType);
+            }
+            if (installTime != null) {
+                expected.put("install_time", installTime);
+            }
+            assertEquals(expected, payload.get("install_signature"));
+        }
     }
-  }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/dependency/DependencyPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/dependency/DependencyPeriodicActionTest.java
index 4190c2edf76..d9f4be9a09d 100644
--- a/telemetry/src/test/java/datadog/telemetry/dependency/DependencyPeriodicActionTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/dependency/DependencyPeriodicActionTest.java
@@ -14,26 +14,26 @@
 
 class DependencyPeriodicActionTest {
 
-  private final DependencyService depService = mock(DependencyService.class);
-  private final DependencyPeriodicAction periodicAction = new DependencyPeriodicAction(depService);
-  private final TelemetryService telemetryService = mock(TelemetryService.class);
+    private final DependencyService depService = mock(DependencyService.class);
+    private final DependencyPeriodicAction periodicAction = new DependencyPeriodicAction(depService);
+    private final TelemetryService telemetryService = mock(TelemetryService.class);
 
-  @Test
-  void transformsDependenciesAndPushesThemToTheTelemetryService() {
-    Dependency dependency = new Dependency("name", "1.2.3", "name-1.2.3.jar", "DEADBEEF");
-    when(depService.drainDeterminedDependencies()).thenReturn(singletonList(dependency));
+    @Test
+    void transformsDependenciesAndPushesThemToTheTelemetryService() {
+        Dependency dependency = new Dependency("name", "1.2.3", "name-1.2.3.jar", "DEADBEEF");
+        when(depService.drainDeterminedDependencies()).thenReturn(singletonList(dependency));
 
-    periodicAction.doIteration(telemetryService);
+        periodicAction.doIteration(telemetryService);
 
-    verify(depService).drainDeterminedDependencies();
-    verifyNoMoreInteractions(depService);
-    ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
-    verify(telemetryService).addDependency(captor.capture());
-    verifyNoMoreInteractions(telemetryService);
-    Dependency addedDependency = captor.getValue();
-    assertEquals("name", addedDependency.name);
-    assertEquals("1.2.3", addedDependency.version);
-    assertEquals("DEADBEEF", addedDependency.hash);
-    assertNull(addedDependency.reachabilityMetadata);
-  }
+        verify(depService).drainDeterminedDependencies();
+        verifyNoMoreInteractions(depService);
+        ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
+        verify(telemetryService).addDependency(captor.capture());
+        verifyNoMoreInteractions(telemetryService);
+        Dependency addedDependency = captor.getValue();
+        assertEquals("name", addedDependency.name);
+        assertEquals("1.2.3", addedDependency.version);
+        assertEquals("DEADBEEF", addedDependency.hash);
+        assertNull(addedDependency.reachabilityMetadata);
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/dependency/DependencyResolverQueueTest.java b/telemetry/src/test/java/datadog/telemetry/dependency/DependencyResolverQueueTest.java
index 96989675f18..00f314bf8f9 100644
--- a/telemetry/src/test/java/datadog/telemetry/dependency/DependencyResolverQueueTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/dependency/DependencyResolverQueueTest.java
@@ -10,75 +10,75 @@
 
 class DependencyResolverQueueTest {
 
-  private DependencyResolverQueue resolverQueue = new DependencyResolverQueue();
+    private DependencyResolverQueue resolverQueue = new DependencyResolverQueue();
 
-  @Test
-  void resolveSetOfDependencies() {
-    resolverQueue.queueURI(getJar("junit-4.12.jar").toURI());
-    resolverQueue.queueURI(getJar("asm-util-9.2.jar").toURI());
-    resolverQueue.queueURI(getJar("bson-4.2.0.jar").toURI());
+    @Test
+    void resolveSetOfDependencies() {
+        resolverQueue.queueURI(getJar("junit-4.12.jar").toURI());
+        resolverQueue.queueURI(getJar("asm-util-9.2.jar").toURI());
+        resolverQueue.queueURI(getJar("bson-4.2.0.jar").toURI());
 
-    Dependency dep = resolverQueue.pollDependency().get(0);
-    assertNotNull(dep);
-    assertEquals("junit", dep.name);
-    assertEquals("4.12", dep.version);
-    assertEquals("junit-4.12.jar", dep.source);
-    assertEquals("4376590587C49AC6DA6935564233F36B092412AE", dep.hash);
+        Dependency dep = resolverQueue.pollDependency().get(0);
+        assertNotNull(dep);
+        assertEquals("junit", dep.name);
+        assertEquals("4.12", dep.version);
+        assertEquals("junit-4.12.jar", dep.source);
+        assertEquals("4376590587C49AC6DA6935564233F36B092412AE", dep.hash);
 
-    dep = resolverQueue.pollDependency().get(0);
-    assertNotNull(dep);
-    assertEquals("asm-util", dep.name);
-    assertEquals("9.2", dep.version);
-    assertEquals("asm-util-9.2.jar", dep.source);
-    assertEquals("9A5AEC2CB852B8BD20DAF5D2CE9174891267FE27", dep.hash);
+        dep = resolverQueue.pollDependency().get(0);
+        assertNotNull(dep);
+        assertEquals("asm-util", dep.name);
+        assertEquals("9.2", dep.version);
+        assertEquals("asm-util-9.2.jar", dep.source);
+        assertEquals("9A5AEC2CB852B8BD20DAF5D2CE9174891267FE27", dep.hash);
 
-    dep = resolverQueue.pollDependency().get(0);
-    assertNotNull(dep);
-    assertEquals("org.mongodb:bson", dep.name);
-    assertEquals("4.2.0", dep.version);
-    assertEquals("bson-4.2.0.jar", dep.source);
-    assertEquals("F87C3A90DA4BB1DA6D3A73CA18004545AD2EF06A", dep.hash);
+        dep = resolverQueue.pollDependency().get(0);
+        assertNotNull(dep);
+        assertEquals("org.mongodb:bson", dep.name);
+        assertEquals("4.2.0", dep.version);
+        assertEquals("bson-4.2.0.jar", dep.source);
+        assertEquals("F87C3A90DA4BB1DA6D3A73CA18004545AD2EF06A", dep.hash);
 
-    List<Dependency> deps = resolverQueue.pollDependency();
-    assertTrue(deps.isEmpty());
+        List<Dependency> deps = resolverQueue.pollDependency();
+        assertTrue(deps.isEmpty());
 
-    // a repeated dependency is added: it has no effect
-    resolverQueue.queueURI(getJar("junit-4.12.jar").toURI());
-    deps = resolverQueue.pollDependency();
-    assertTrue(deps.isEmpty());
-  }
+        // a repeated dependency is added: it has no effect
+        resolverQueue.queueURI(getJar("junit-4.12.jar").toURI());
+        deps = resolverQueue.pollDependency();
+        assertTrue(deps.isEmpty());
+    }
 
-  @Test
-  void resolveSetOfDependenciesWithQueueLimit() {
-    resolverQueue = new DependencyResolverQueue(3);
-    resolverQueue.queueURI(getJar("junit-4.12.jar").toURI());
-    resolverQueue.queueURI(getJar("asm-util-9.2.jar").toURI());
-    resolverQueue.queueURI(getJar("bson-4.2.0.jar").toURI());
-    // this dependency should be dropped
-    resolverQueue.queueURI(getJar("commons-logging-1.2.jar").toURI());
+    @Test
+    void resolveSetOfDependenciesWithQueueLimit() {
+        resolverQueue = new DependencyResolverQueue(3);
+        resolverQueue.queueURI(getJar("junit-4.12.jar").toURI());
+        resolverQueue.queueURI(getJar("asm-util-9.2.jar").toURI());
+        resolverQueue.queueURI(getJar("bson-4.2.0.jar").toURI());
+        // this dependency should be dropped
+        resolverQueue.queueURI(getJar("commons-logging-1.2.jar").toURI());
 
-    Dependency dep = resolverQueue.pollDependency().get(0);
-    assertNotNull(dep);
-    assertEquals("junit", dep.name);
-    assertEquals("4.12", dep.version);
-    assertEquals("junit-4.12.jar", dep.source);
-    assertEquals("4376590587C49AC6DA6935564233F36B092412AE", dep.hash);
+        Dependency dep = resolverQueue.pollDependency().get(0);
+        assertNotNull(dep);
+        assertEquals("junit", dep.name);
+        assertEquals("4.12", dep.version);
+        assertEquals("junit-4.12.jar", dep.source);
+        assertEquals("4376590587C49AC6DA6935564233F36B092412AE", dep.hash);
 
-    dep = resolverQueue.pollDependency().get(0);
-    assertNotNull(dep);
-    assertEquals("asm-util", dep.name);
-    assertEquals("9.2", dep.version);
-    assertEquals("asm-util-9.2.jar", dep.source);
-    assertEquals("9A5AEC2CB852B8BD20DAF5D2CE9174891267FE27", dep.hash);
+        dep = resolverQueue.pollDependency().get(0);
+        assertNotNull(dep);
+        assertEquals("asm-util", dep.name);
+        assertEquals("9.2", dep.version);
+        assertEquals("asm-util-9.2.jar", dep.source);
+        assertEquals("9A5AEC2CB852B8BD20DAF5D2CE9174891267FE27", dep.hash);
 
-    dep = resolverQueue.pollDependency().get(0);
-    assertNotNull(dep);
-    assertEquals("org.mongodb:bson", dep.name);
-    assertEquals("4.2.0", dep.version);
-    assertEquals("bson-4.2.0.jar", dep.source);
-    assertEquals("F87C3A90DA4BB1DA6D3A73CA18004545AD2EF06A", dep.hash);
+        dep = resolverQueue.pollDependency().get(0);
+        assertNotNull(dep);
+        assertEquals("org.mongodb:bson", dep.name);
+        assertEquals("4.2.0", dep.version);
+        assertEquals("bson-4.2.0.jar", dep.source);
+        assertEquals("F87C3A90DA4BB1DA6D3A73CA18004545AD2EF06A", dep.hash);
 
-    List<Dependency> deps = resolverQueue.pollDependency();
-    assertTrue(deps.isEmpty());
-  }
+        List<Dependency> deps = resolverQueue.pollDependency();
+        assertTrue(deps.isEmpty());
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/dependency/DependencyResolverTest.java b/telemetry/src/test/java/datadog/telemetry/dependency/DependencyResolverTest.java
index 26b8c57408f..a5fc47ea479 100644
--- a/telemetry/src/test/java/datadog/telemetry/dependency/DependencyResolverTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/dependency/DependencyResolverTest.java
@@ -25,376 +25,366 @@
 
 class DependencyResolverTest {
 
-  @TempDir File testDir;
-
-  @TableTest({
-    "scenario                                    | bundleSymbolicName                          | bundleName                      | bundleVersion              | implementationTitle               | implementationVersion | filename                           | expectedName                                | expectedVersion    ",
-    "agrona                                      | 'org.agrona.core'                           | 'org.agrona.core'               | '1.7.2'                    | 'Agrona'                          | '1.7.2'               | 'agrona-1.7.2.jar'                 | 'agrona'                                    | '1.7.2'            ",
-    "asm-util                                    | 'org.objectweb.asm.util'                    | 'org.objectweb.asm.util'        | '9.2.0'                    | 'Utilities for ASM'               | '9.2'                 | 'asm-util-9.2.jar'                 | 'asm-util'                                  | '9.2'              ",
-    "bson                                        | 'org.mongodb.bson'                          | 'bson'                          | '4.2.0'                    |                                   |                       | 'bson-4.2.0.jar'                   | 'org.mongodb:bson'                          | '4.2.0'            ",
-    "bson4jackson                                | 'de.undercouch.bson4jackson'                | 'bson4jackson'                  | '2.11.0'                   |                                   |                       | 'bson4jackson-2.11.0.jar'          | 'de.undercouch:bson4jackson'                | '2.11.0'           ",
-    "caffeine                                    | 'com.github.ben-manes.caffeine'             | 'com.github.ben-manes.caffeine' | '2.8.5'                    |                                   |                       | 'caffeine-2.8.5.jar'               | 'com.github.ben-manes:caffeine'             | '2.8.5'            ",
-    "commons logging                             | 'org.apache.commons.logging'                | 'Apache Commons Logging'        | '1.2.0'                    | 'Apache Commons Logging'          | '1.2'                 | 'commons-logging-1.2.jar'          | 'commons-logging'                           | '1.2'              ",
-    "freemarker                                  | 'org.freemarker.freemarker'                 | 'org.freemarker.freemarker'     | '2.3.27.stable-incubating' | 'FreeMarker'                      | '2.3.27'              | 'freemarker-2.3.27-incubating.jar' | 'org.freemarker:freemarker'                 | '2.3.27-incubating'",
-    "groovy with implementation version          | 'groovy'                                    | 'Groovy Runtime'                | '2.4.12'                   |                                   |                       | 'groovy-2.4.12.jar'                | 'groovy'                                    | '2.4.12'           ",
-    "groovy without version in filename          | 'groovy'                                    | 'Groovy Runtime'                | '2.4.12'                   |                                   |                       | 'groovy.jar'                       | 'groovy'                                    | ''                 ",
-    "hsqldb                                      | 'org.hsqldb.hsqldb'                         | 'HSQLDB'                        | '2.3.5'                    | 'Standard runtime'                | '2.3.5'               | 'hsqldb-2.3.5-jdk6debug.jar'       | 'org.hsqldb:hsqldb'                         | '2.3.5-jdk6debug'  ",
-    "jakarta inject                              | 'org.glassfish.hk2.external.jakarta.inject' | 'javax.inject:1 as OSGi bundle' | '2.6.1'                    |                                   |                       | 'jakarta.inject-2.6.1.jar'         | 'org.glassfish.hk2.external:jakarta.inject' | '2.6.1'            ",
-    "junit with implementation version           |                                             |                                 |                            | 'JUnit'                           | '4.12'                | 'junit-4.12.jar'                   | 'junit'                                     | '4.12'             ",
-    "junit without version in filename           |                                             |                                 |                            | 'JUnit'                           | '4.12'                | 'junit.jar'                        | 'junit'                                     | ''                 ",
-    "multiverse-core with version in filename    |                                             |                                 |                            |                                   |                       | 'multiverse-core-0.7.0.jar'        | 'multiverse-core'                           | '0.7.0'            ",
-    "multiverse-core without version in filename |                                             |                                 |                            |                                   |                       | 'multiverse-core.jar'              | 'multiverse-core'                           | ''                 ",
-    "spring webmvc                               | 'org.springframework.web.servlet'           | 'Spring Web Servlet'            | '3.0.0.RELEASE'            | 'org.springframework.web.servlet' | '3.0.0.RELEASE'       | 'spring-webmvc.jar'                | 'spring-webmvc'                             | '3.0.0.RELEASE'    ",
-    "opencsv                                     | 'com.opencsv'                               | 'opencsv'                       | '4.1.0'                    |                                   |                       | 'opencsv-4.1.jar'                  | 'opencsv'                                   | '4.1'              ",
-    "liquibase core                              | 'org.liquibase.core'                        | 'liquibase-core'                | '0.0.0.SNAPSHOT'           |                                   |                       | 'liquibase-core-4.6.2.jar'         | 'liquibase-core'                            | '4.6.2'            ",
-    "roaring bitmap                              | 'org.roaringbitmap.RoaringBitmap'           | 'RoaringBitmap'                 | '0.0.1'                    |                                   |                       | 'RoaringBitmap-0.0.1.jar'          | 'org.roaringbitmap:RoaringBitmap'           | '0.0.1'            ",
-    "jmustache                                   | 'com.samskivert.jmustache'                  | 'jmustache'                     | '1.14.0'                   |                                   |                       | 'jmustache-1.14.jar'               | 'com.samskivert:jmustache'                  | '1.14'             "
-  })
-  @ParameterizedTest(name = "resolve from manifest and filename fallbacks [{index}] {0}")
-  void resolveFromManifestAndFilenameFallbacks(
-      String bundleSymbolicName,
-      String bundleName,
-      String bundleVersion,
-      String implementationTitle,
-      String implementationVersion,
-      String filename,
-      String expectedName,
-      String expectedVersion)
-      throws IOException {
-    File file =
-        prepareJar(
-            filename,
-            bundleSymbolicName,
-            bundleName,
-            bundleVersion,
-            implementationTitle,
-            implementationVersion);
-
-    List<Dependency> dependencies = DependencyResolver.resolve(file.toURI());
-
-    assertEquals(1, dependencies.size());
-    Dependency dependency = dependencies.get(0);
-    assertEquals(expectedName, dependency.name);
-    assertEquals(expectedVersion, dependency.version);
-    assertEquals(filename, dependency.source);
-    assertNotNull(dependency.hash);
-    assertFalse(dependency.hash.isEmpty());
-  }
-
-  private File prepareJar(
-      String filename,
-      String bundleSymbolicName,
-      String bundleName,
-      String bundleVersion,
-      String implementationTitle,
-      String implementationVersion)
-      throws IOException {
-    File file = new File(testDir, filename);
-    StringBuilder manifest = new StringBuilder();
-    appendManifestLine(manifest, "Bundle-SymbolicName", bundleSymbolicName);
-    appendManifestLine(manifest, "Bundle-Name", bundleName);
-    appendManifestLine(manifest, "Bundle-Version", bundleVersion);
-    appendManifestLine(manifest, "Implementation-Title", implementationTitle);
-    appendManifestLine(manifest, "Implementation-Version", implementationVersion);
-    try (ZipOutputStream out = new ZipOutputStream(new FileOutputStream(file))) {
-      out.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF"));
-      out.write(manifest.toString().getBytes(UTF_8));
-      out.closeEntry();
+    @TempDir
+    File testDir;
+
+    @TableTest({
+      "scenario                                    | bundleSymbolicName                          | bundleName                      | bundleVersion              | implementationTitle               | implementationVersion | filename                           | expectedName                                | expectedVersion    ",
+      "agrona                                      | 'org.agrona.core'                           | 'org.agrona.core'               | '1.7.2'                    | 'Agrona'                          | '1.7.2'               | 'agrona-1.7.2.jar'                 | 'agrona'                                    | '1.7.2'            ",
+      "asm-util                                    | 'org.objectweb.asm.util'                    | 'org.objectweb.asm.util'        | '9.2.0'                    | 'Utilities for ASM'               | '9.2'                 | 'asm-util-9.2.jar'                 | 'asm-util'                                  | '9.2'              ",
+      "bson                                        | 'org.mongodb.bson'                          | 'bson'                          | '4.2.0'                    |                                   |                       | 'bson-4.2.0.jar'                   | 'org.mongodb:bson'                          | '4.2.0'            ",
+      "bson4jackson                                | 'de.undercouch.bson4jackson'                | 'bson4jackson'                  | '2.11.0'                   |                                   |                       | 'bson4jackson-2.11.0.jar'          | 'de.undercouch:bson4jackson'                | '2.11.0'           ",
+      "caffeine                                    | 'com.github.ben-manes.caffeine'             | 'com.github.ben-manes.caffeine' | '2.8.5'                    |                                   |                       | 'caffeine-2.8.5.jar'               | 'com.github.ben-manes:caffeine'             | '2.8.5'            ",
+      "commons logging                             | 'org.apache.commons.logging'                | 'Apache Commons Logging'        | '1.2.0'                    | 'Apache Commons Logging'          | '1.2'                 | 'commons-logging-1.2.jar'          | 'commons-logging'                           | '1.2'              ",
+      "freemarker                                  | 'org.freemarker.freemarker'                 | 'org.freemarker.freemarker'     | '2.3.27.stable-incubating' | 'FreeMarker'                      | '2.3.27'              | 'freemarker-2.3.27-incubating.jar' | 'org.freemarker:freemarker'                 | '2.3.27-incubating'",
+      "groovy with implementation version          | 'groovy'                                    | 'Groovy Runtime'                | '2.4.12'                   |                                   |                       | 'groovy-2.4.12.jar'                | 'groovy'                                    | '2.4.12'           ",
+      "groovy without version in filename          | 'groovy'                                    | 'Groovy Runtime'                | '2.4.12'                   |                                   |                       | 'groovy.jar'                       | 'groovy'                                    | ''                 ",
+      "hsqldb                                      | 'org.hsqldb.hsqldb'                         | 'HSQLDB'                        | '2.3.5'                    | 'Standard runtime'                | '2.3.5'               | 'hsqldb-2.3.5-jdk6debug.jar'       | 'org.hsqldb:hsqldb'                         | '2.3.5-jdk6debug'  ",
+      "jakarta inject                              | 'org.glassfish.hk2.external.jakarta.inject' | 'javax.inject:1 as OSGi bundle' | '2.6.1'                    |                                   |                       | 'jakarta.inject-2.6.1.jar'         | 'org.glassfish.hk2.external:jakarta.inject' | '2.6.1'            ",
+      "junit with implementation version           |                                             |                                 |                            | 'JUnit'                           | '4.12'                | 'junit-4.12.jar'                   | 'junit'                                     | '4.12'             ",
+      "junit without version in filename           |                                             |                                 |                            | 'JUnit'                           | '4.12'                | 'junit.jar'                        | 'junit'                                     | ''                 ",
+      "multiverse-core with version in filename    |                                             |                                 |                            |                                   |                       | 'multiverse-core-0.7.0.jar'        | 'multiverse-core'                           | '0.7.0'            ",
+      "multiverse-core without version in filename |                                             |                                 |                            |                                   |                       | 'multiverse-core.jar'              | 'multiverse-core'                           | ''                 ",
+      "spring webmvc                               | 'org.springframework.web.servlet'           | 'Spring Web Servlet'            | '3.0.0.RELEASE'            | 'org.springframework.web.servlet' | '3.0.0.RELEASE'       | 'spring-webmvc.jar'                | 'spring-webmvc'                             | '3.0.0.RELEASE'    ",
+      "opencsv                                     | 'com.opencsv'                               | 'opencsv'                       | '4.1.0'                    |                                   |                       | 'opencsv-4.1.jar'                  | 'opencsv'                                   | '4.1'              ",
+      "liquibase core                              | 'org.liquibase.core'                        | 'liquibase-core'                | '0.0.0.SNAPSHOT'           |                                   |                       | 'liquibase-core-4.6.2.jar'         | 'liquibase-core'                            | '4.6.2'            ",
+      "roaring bitmap                              | 'org.roaringbitmap.RoaringBitmap'           | 'RoaringBitmap'                 | '0.0.1'                    |                                   |                       | 'RoaringBitmap-0.0.1.jar'          | 'org.roaringbitmap:RoaringBitmap'           | '0.0.1'            ",
+      "jmustache                                   | 'com.samskivert.jmustache'                  | 'jmustache'                     | '1.14.0'                   |                                   |                       | 'jmustache-1.14.jar'               | 'com.samskivert:jmustache'                  | '1.14'             "
+    })
+    @ParameterizedTest(name = "resolve from manifest and filename fallbacks [{index}] {0}")
+    void resolveFromManifestAndFilenameFallbacks(
+            String bundleSymbolicName,
+            String bundleName,
+            String bundleVersion,
+            String implementationTitle,
+            String implementationVersion,
+            String filename,
+            String expectedName,
+            String expectedVersion)
+            throws IOException {
+        File file = prepareJar(
+                filename, bundleSymbolicName, bundleName, bundleVersion, implementationTitle, implementationVersion);
+
+        List<Dependency> dependencies = DependencyResolver.resolve(file.toURI());
+
+        assertEquals(1, dependencies.size());
+        Dependency dependency = dependencies.get(0);
+        assertEquals(expectedName, dependency.name);
+        assertEquals(expectedVersion, dependency.version);
+        assertEquals(filename, dependency.source);
+        assertNotNull(dependency.hash);
+        assertFalse(dependency.hash.isEmpty());
     }
-    return file;
-  }
 
-  private static void appendManifestLine(StringBuilder manifest, String key, String value) {
-    if (value == null) {
-      return;
+    private File prepareJar(
+            String filename,
+            String bundleSymbolicName,
+            String bundleName,
+            String bundleVersion,
+            String implementationTitle,
+            String implementationVersion)
+            throws IOException {
+        File file = new File(testDir, filename);
+        StringBuilder manifest = new StringBuilder();
+        appendManifestLine(manifest, "Bundle-SymbolicName", bundleSymbolicName);
+        appendManifestLine(manifest, "Bundle-Name", bundleName);
+        appendManifestLine(manifest, "Bundle-Version", bundleVersion);
+        appendManifestLine(manifest, "Implementation-Title", implementationTitle);
+        appendManifestLine(manifest, "Implementation-Version", implementationVersion);
+        try (ZipOutputStream out = new ZipOutputStream(new FileOutputStream(file))) {
+            out.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF"));
+            out.write(manifest.toString().getBytes(UTF_8));
+            out.closeEntry();
+        }
+        return file;
     }
-    if (manifest.length() > 0) {
-      manifest.append('\n');
+
+    private static void appendManifestLine(StringBuilder manifest, String key, String value) {
+        if (value == null) {
+            return;
+        }
+        if (manifest.length() > 0) {
+            manifest.append('\n');
+        }
+        manifest.append(key).append(": ").append(value);
+    }
+
+    @TableTest({
+      "scenario     | jar                       | expectedName                 | expectedHash                               | expectedVersion",
+      "bson4jackson | 'bson4jackson-2.11.0.jar' | 'de.undercouch:bson4jackson' | '428A23E33D19DACD6E04CA7DD746206849861A95' | '2.11.0'       ",
+      "bson         | 'bson-4.2.0.jar'          | 'org.mongodb:bson'           | 'F87C3A90DA4BB1DA6D3A73CA18004545AD2EF06A' | '4.2.0'        "
+    })
+    @ParameterizedTest(name = "jar without pom.properties get resolved with hash [{index}] {0}")
+    void jarWithoutPomPropertiesGetResolvedWithHash(
+            String jar, String expectedName, String expectedHash, String expectedVersion) throws IOException {
+        knownJarCheck(jar, expectedName, expectedVersion, expectedHash);
     }
-    manifest.append(key).append(": ").append(value);
-  }
-
-  @TableTest({
-    "scenario     | jar                       | expectedName                 | expectedHash                               | expectedVersion",
-    "bson4jackson | 'bson4jackson-2.11.0.jar' | 'de.undercouch:bson4jackson' | '428A23E33D19DACD6E04CA7DD746206849861A95' | '2.11.0'       ",
-    "bson         | 'bson-4.2.0.jar'          | 'org.mongodb:bson'           | 'F87C3A90DA4BB1DA6D3A73CA18004545AD2EF06A' | '4.2.0'        "
-  })
-  @ParameterizedTest(name = "jar without pom.properties get resolved with hash [{index}] {0}")
-  void jarWithoutPomPropertiesGetResolvedWithHash(
-      String jar, String expectedName, String expectedHash, String expectedVersion)
-      throws IOException {
-    knownJarCheck(jar, expectedName, expectedVersion, expectedHash);
-  }
-
-  @Test
-  void jarWithPomPropertiesIsResolved() throws IOException {
-    knownJarCheck("commons-logging-1.2.jar", "commons-logging:commons-logging", "1.2", null);
-  }
-
-  @Test
-  void jarWithDdJavaAgentPomPropertiesResolvesToComDatadoghqDdJavaAgent() throws IOException {
-    // a jar containing META-INF/maven/com.datadoghq/dd-java-agent/pom.properties
-    File file = new File(testDir, "dd-java-agent.jar");
-    try (ZipOutputStream out = new ZipOutputStream(new FileOutputStream(file))) {
-      out.putNextEntry(new ZipEntry("META-INF/maven/com.datadoghq/dd-java-agent/pom.properties"));
-      out.write("groupId=com.datadoghq\nartifactId=dd-java-agent\nversion=1.0.0\n".getBytes(UTF_8));
-      out.closeEntry();
+
+    @Test
+    void jarWithPomPropertiesIsResolved() throws IOException {
+        knownJarCheck("commons-logging-1.2.jar", "commons-logging:commons-logging", "1.2", null);
+    }
+
+    @Test
+    void jarWithDdJavaAgentPomPropertiesResolvesToComDatadoghqDdJavaAgent() throws IOException {
+        // a jar containing META-INF/maven/com.datadoghq/dd-java-agent/pom.properties
+        File file = new File(testDir, "dd-java-agent.jar");
+        try (ZipOutputStream out = new ZipOutputStream(new FileOutputStream(file))) {
+            out.putNextEntry(new ZipEntry("META-INF/maven/com.datadoghq/dd-java-agent/pom.properties"));
+            out.write("groupId=com.datadoghq\nartifactId=dd-java-agent\nversion=1.0.0\n".getBytes(UTF_8));
+            out.closeEntry();
+        }
+
+        List<Dependency> deps = DependencyResolver.resolve(file.toURI());
+
+        assertEquals(1, deps.size());
+        assertEquals("com.datadoghq:dd-java-agent", deps.get(0).name);
+        assertEquals("1.0.0", deps.get(0).version);
+        assertNull(deps.get(0).hash);
     }
 
-    List<Dependency> deps = DependencyResolver.resolve(file.toURI());
-
-    assertEquals(1, deps.size());
-    assertEquals("com.datadoghq:dd-java-agent", deps.get(0).name);
-    assertEquals("1.0.0", deps.get(0).version);
-    assertNull(deps.get(0).hash);
-  }
-
-  @Test
-  void jarWithoutManifestAndNoVersionInFilenameGetsResolved() throws IOException {
-    knownJarCheck(
-        "groovy-no-manifest-info.jar",
-        "groovy-no-manifest-info",
-        "",
-        "1C1C8E5547A54F593B97584D45F3636F479B9498");
-  }
-
-  @Test
-  void tryToDetermineLibName() throws IOException {
-    File temp = File.createTempFile("temp", ".zip");
-    try {
-      assertTrue(DependencyResolver.resolve(temp.toURI()).isEmpty());
-    } finally {
-      temp.delete();
+    @Test
+    void jarWithoutManifestAndNoVersionInFilenameGetsResolved() throws IOException {
+        knownJarCheck(
+                "groovy-no-manifest-info.jar",
+                "groovy-no-manifest-info",
+                "",
+                "1C1C8E5547A54F593B97584D45F3636F479B9498");
     }
-  }
 
-  @Test
-  void tryToDetermineNonExistingLibName() throws IOException {
-    File temp = File.createTempFile("temp", ".zip");
-    temp.delete();
+    @Test
+    void tryToDetermineLibName() throws IOException {
+        File temp = File.createTempFile("temp", ".zip");
+        try {
+            assertTrue(DependencyResolver.resolve(temp.toURI()).isEmpty());
+        } finally {
+            temp.delete();
+        }
+    }
 
-    assertTrue(DependencyResolver.resolve(temp.toURI()).isEmpty());
-  }
+    @Test
+    void tryToDetermineNonExistingLibName() throws IOException {
+        File temp = File.createTempFile("temp", ".zip");
+        temp.delete();
 
-  @Test
-  void tryToDetermineInvalidJarLib() throws IOException {
-    File temp = File.createTempFile("temp", ".jar");
-    try (FileOutputStream out = new FileOutputStream(temp)) {
-      out.write("just a text file".getBytes(UTF_8));
+        assertTrue(DependencyResolver.resolve(temp.toURI()).isEmpty());
     }
 
-    assertTrue(DependencyResolver.resolve(temp.toURI()).isEmpty());
-  }
+    @Test
+    void tryToDetermineInvalidJarLib() throws IOException {
+        File temp = File.createTempFile("temp", ".jar");
+        try (FileOutputStream out = new FileOutputStream(temp)) {
+            out.write("just a text file".getBytes(UTF_8));
+        }
 
-  @Test
-  void springBootDependency() throws URISyntaxException {
-    URI zipPath = zipPath("datadog/telemetry/dependencies/spring-boot-app.jar");
-    URI uri = new URI("jar:" + zipPath + "!/BOOT-INF/lib/opentracing-util-0.33.0.jar!/");
+        assertTrue(DependencyResolver.resolve(temp.toURI()).isEmpty());
+    }
 
-    Dependency dep = DependencyResolver.resolve(uri).get(0);
+    @Test
+    void springBootDependency() throws URISyntaxException {
+        URI zipPath = zipPath("datadog/telemetry/dependencies/spring-boot-app.jar");
+        URI uri = new URI("jar:" + zipPath + "!/BOOT-INF/lib/opentracing-util-0.33.0.jar!/");
 
-    assertNotNull(dep);
-    assertEquals("io.opentracing:opentracing-util", dep.name);
-    assertEquals("0.33.0", dep.version);
-    assertNull(dep.hash);
-    assertEquals("opentracing-util-0.33.0.jar", dep.source);
-  }
+        Dependency dep = DependencyResolver.resolve(uri).get(0);
 
-  @Test
-  void springBootDependencyWithoutTrailingSlash() throws URISyntaxException {
-    URI zipPath = zipPath("datadog/telemetry/dependencies/spring-boot-app.jar");
-    URI uri = new URI("jar:" + zipPath + "!/BOOT-INF/lib/opentracing-util-0.33.0.jar!");
+        assertNotNull(dep);
+        assertEquals("io.opentracing:opentracing-util", dep.name);
+        assertEquals("0.33.0", dep.version);
+        assertNull(dep.hash);
+        assertEquals("opentracing-util-0.33.0.jar", dep.source);
+    }
 
-    Dependency dep = DependencyResolver.resolve(uri).get(0);
+    @Test
+    void springBootDependencyWithoutTrailingSlash() throws URISyntaxException {
+        URI zipPath = zipPath("datadog/telemetry/dependencies/spring-boot-app.jar");
+        URI uri = new URI("jar:" + zipPath + "!/BOOT-INF/lib/opentracing-util-0.33.0.jar!");
 
-    assertNotNull(dep);
-    assertEquals("io.opentracing:opentracing-util", dep.name);
-    assertEquals("0.33.0", dep.version);
-    assertNull(dep.hash);
-    assertEquals("opentracing-util-0.33.0.jar", dep.source);
-  }
+        Dependency dep = DependencyResolver.resolve(uri).get(0);
 
-  @Test
-  void springBootDependencyNewStyle() throws URISyntaxException {
-    String zipPath =
-        zipPath("datadog/telemetry/dependencies/spring-boot-app.jar")
-            .toString()
-            .replace("file:", "nested:");
-    URI uri = new URI("jar:" + zipPath + "/!BOOT-INF/lib/opentracing-util-0.33.0.jar!/");
+        assertNotNull(dep);
+        assertEquals("io.opentracing:opentracing-util", dep.name);
+        assertEquals("0.33.0", dep.version);
+        assertNull(dep.hash);
+        assertEquals("opentracing-util-0.33.0.jar", dep.source);
+    }
 
-    Dependency dep = DependencyResolver.resolve(uri).get(0);
+    @Test
+    void springBootDependencyNewStyle() throws URISyntaxException {
+        String zipPath = zipPath("datadog/telemetry/dependencies/spring-boot-app.jar")
+                .toString()
+                .replace("file:", "nested:");
+        URI uri = new URI("jar:" + zipPath + "/!BOOT-INF/lib/opentracing-util-0.33.0.jar!/");
 
-    assertNotNull(dep);
-    assertEquals("io.opentracing:opentracing-util", dep.name);
-    assertEquals("0.33.0", dep.version);
-    assertNull(dep.hash);
-    assertEquals("opentracing-util-0.33.0.jar", dep.source);
-  }
+        Dependency dep = DependencyResolver.resolve(uri).get(0);
 
-  @Test
-  void springBootDependencyNewStyleEmptyPath() throws URISyntaxException {
-    URI uri = new URI("jar:nested:");
+        assertNotNull(dep);
+        assertEquals("io.opentracing:opentracing-util", dep.name);
+        assertEquals("0.33.0", dep.version);
+        assertNull(dep.hash);
+        assertEquals("opentracing-util-0.33.0.jar", dep.source);
+    }
 
-    List<Dependency> deps = DependencyResolver.resolve(uri);
+    @Test
+    void springBootDependencyNewStyleEmptyPath() throws URISyntaxException {
+        URI uri = new URI("jar:nested:");
 
-    assertTrue(deps.isEmpty());
-  }
+        List<Dependency> deps = DependencyResolver.resolve(uri);
 
-  @Test
-  void springBootDependencyOldStyleEmptyPath() throws URISyntaxException {
-    URI uri = new URI("jar:file:");
+        assertTrue(deps.isEmpty());
+    }
 
-    List<Dependency> deps = DependencyResolver.resolve(uri);
+    @Test
+    void springBootDependencyOldStyleEmptyPath() throws URISyntaxException {
+        URI uri = new URI("jar:file:");
 
-    assertTrue(deps.isEmpty());
-  }
+        List<Dependency> deps = DependencyResolver.resolve(uri);
 
-  @Test
-  void jarUnknown() throws URISyntaxException {
-    URI uri = new URI("jar:unknown");
+        assertTrue(deps.isEmpty());
+    }
 
-    List<Dependency> deps = DependencyResolver.resolve(uri);
+    @Test
+    void jarUnknown() throws URISyntaxException {
+        URI uri = new URI("jar:unknown");
 
-    assertTrue(deps.isEmpty());
-  }
+        List<Dependency> deps = DependencyResolver.resolve(uri);
 
-  @Test
-  void springBootDependencyWithoutMavenMetadata() throws IOException, URISyntaxException {
-    ByteArrayOutputStream innerJarData = new ByteArrayOutputStream();
-    try (ZipOutputStream out = new ZipOutputStream(innerJarData)) {
-      out.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF"));
-      out.closeEntry();
+        assertTrue(deps.isEmpty());
     }
 
-    File file = new File(testDir, "app.jar");
-    try (ZipOutputStream out = new ZipOutputStream(new FileOutputStream(file))) {
-      out.putNextEntry(new ZipEntry("BOOT-INF/lib/lib-1.0.jar"));
-      out.write(innerJarData.toByteArray());
-      out.closeEntry();
+    @Test
+    void springBootDependencyWithoutMavenMetadata() throws IOException, URISyntaxException {
+        ByteArrayOutputStream innerJarData = new ByteArrayOutputStream();
+        try (ZipOutputStream out = new ZipOutputStream(innerJarData)) {
+            out.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF"));
+            out.closeEntry();
+        }
+
+        File file = new File(testDir, "app.jar");
+        try (ZipOutputStream out = new ZipOutputStream(new FileOutputStream(file))) {
+            out.putNextEntry(new ZipEntry("BOOT-INF/lib/lib-1.0.jar"));
+            out.write(innerJarData.toByteArray());
+            out.closeEntry();
+        }
+
+        URI uri = new URI("jar:file:" + file.getAbsolutePath() + "!/BOOT-INF/lib/lib-1.0.jar!/");
+        List<Dependency> deps = DependencyResolver.resolve(uri);
+
+        assertEquals(1, deps.size());
+        assertEquals("lib-1.0.jar", deps.get(0).source);
+        assertNotNull(deps.get(0).hash);
     }
 
-    URI uri = new URI("jar:file:" + file.getAbsolutePath() + "!/BOOT-INF/lib/lib-1.0.jar!/");
-    List<Dependency> deps = DependencyResolver.resolve(uri);
+    @Test
+    void fatJarWithMultiplePomProperties() throws URISyntaxException {
+        URI uri = zipPath("datadog/telemetry/dependencies/budgetapp.jar");
+
+        List<Dependency> deps = DependencyResolver.resolve(uri);
 
-    assertEquals(1, deps.size());
-    assertEquals("lib-1.0.jar", deps.get(0).source);
-    assertNotNull(deps.get(0).hash);
-  }
+        assertEquals(105, deps.size());
+        for (Dependency dep : deps) {
+            assertNull(dep.hash);
+        }
+    }
 
-  @Test
-  void fatJarWithMultiplePomProperties() throws URISyntaxException {
-    URI uri = zipPath("datadog/telemetry/dependencies/budgetapp.jar");
+    @Test
+    void fatJarWithTwoPomProperties() throws URISyntaxException {
+        URI uri = zipPath("datadog/telemetry/dependencies/budgetappreduced.jar");
 
-    List<Dependency> deps = DependencyResolver.resolve(uri);
+        List<Dependency> deps = DependencyResolver.resolve(uri);
+        Dependency dep1 = deps.get(0);
+        Dependency dep2 = deps.get(1);
 
-    assertEquals(105, deps.size());
-    for (Dependency dep : deps) {
-      assertNull(dep.hash);
+        assertEquals(2, deps.size());
+        assertTrue(dep1.name.equals("org.yaml:snakeyaml") || dep2.name.equals("org.yaml:snakeyaml"));
+        for (Dependency dep : deps) {
+            assertNull(dep.hash);
+        }
     }
-  }
 
-  @Test
-  void fatJarWithTwoPomProperties() throws URISyntaxException {
-    URI uri = zipPath("datadog/telemetry/dependencies/budgetappreduced.jar");
+    @Test
+    void fatJarWithTwoPomPropertiesOneOfThemBad() throws URISyntaxException {
+        URI uri = zipPath("datadog/telemetry/dependencies/budgetappreducedbadproperties.jar");
 
-    List<Dependency> deps = DependencyResolver.resolve(uri);
-    Dependency dep1 = deps.get(0);
-    Dependency dep2 = deps.get(1);
+        List<Dependency> deps = DependencyResolver.resolve(uri);
+        Dependency dep1 = deps.get(0);
 
-    assertEquals(2, deps.size());
-    assertTrue(dep1.name.equals("org.yaml:snakeyaml") || dep2.name.equals("org.yaml:snakeyaml"));
-    for (Dependency dep : deps) {
-      assertNull(dep.hash);
+        assertEquals(1, deps.size());
+        assertEquals("org.yaml:snakeyaml", dep1.name);
+        for (Dependency dep : deps) {
+            assertNull(dep.hash);
+        }
     }
-  }
 
-  @Test
-  void fatJarWithTwoPomPropertiesOneOfThemBad() throws URISyntaxException {
-    URI uri = zipPath("datadog/telemetry/dependencies/budgetappreducedbadproperties.jar");
+    @Test
+    void invalidPomPropertiesResultsInFallback() throws IOException {
+        // this jar has an invalid pom.properties and it should be resolved with its file name
+        knownJarCheck(
+                "invalidpomproperties.jar", "invalidpomproperties", "", "6438819DAB9C9AC18D8A6922C8A923C2ADAEA85D");
+    }
 
-    List<Dependency> deps = DependencyResolver.resolve(uri);
-    Dependency dep1 = deps.get(0);
+    @Test
+    void attemptToExtractDependenciesFromDirectory() throws IOException {
+        File dir = new File(testDir, "dir");
+        dir.mkdirs();
 
-    assertEquals(1, deps.size());
-    assertEquals("org.yaml:snakeyaml", dep1.name);
-    for (Dependency dep : deps) {
-      assertNull(dep.hash);
-    }
-  }
-
-  @Test
-  void invalidPomPropertiesResultsInFallback() throws IOException {
-    // this jar has an invalid pom.properties and it should be resolved with its file name
-    knownJarCheck(
-        "invalidpomproperties.jar",
-        "invalidpomproperties",
-        "",
-        "6438819DAB9C9AC18D8A6922C8A923C2ADAEA85D");
-  }
-
-  @Test
-  void attemptToExtractDependenciesFromDirectory() throws IOException {
-    File dir = new File(testDir, "dir");
-    dir.mkdirs();
-
-    List<Dependency> deps = DependencyResolver.resolve(dir.toURI());
-
-    assertTrue(deps.isEmpty());
-
-    // resolve without catching exceptions: it does not throw
-    deps = DependencyResolver.internalResolve(dir.toURI());
-
-    assertTrue(deps.isEmpty());
-  }
-
-  @Test
-  void attemptToExtractDependenciesFromDirectoryWithinJar() throws IOException {
-    File file = new File(testDir, "app.jar");
-    try (ZipOutputStream out = new ZipOutputStream(new FileOutputStream(file))) {
-      out.putNextEntry(new ZipEntry("classes/"));
-      out.closeEntry();
+        List<Dependency> deps = DependencyResolver.resolve(dir.toURI());
+
+        assertTrue(deps.isEmpty());
+
+        // resolve without catching exceptions: it does not throw
+        deps = DependencyResolver.internalResolve(dir.toURI());
+
+        assertTrue(deps.isEmpty());
     }
 
-    URI uri = URI.create("jar:file:" + file.getAbsolutePath() + "!/classes!/");
-    List<Dependency> deps = DependencyResolver.resolve(uri);
+    @Test
+    void attemptToExtractDependenciesFromDirectoryWithinJar() throws IOException {
+        File file = new File(testDir, "app.jar");
+        try (ZipOutputStream out = new ZipOutputStream(new FileOutputStream(file))) {
+            out.putNextEntry(new ZipEntry("classes/"));
+            out.closeEntry();
+        }
 
-    assertTrue(deps.isEmpty());
+        URI uri = URI.create("jar:file:" + file.getAbsolutePath() + "!/classes!/");
+        List<Dependency> deps = DependencyResolver.resolve(uri);
 
-    // resolve without catching exceptions: it does not throw
-    deps = DependencyResolver.internalResolve(uri);
+        assertTrue(deps.isEmpty());
 
-    assertTrue(deps.isEmpty());
-  }
+        // resolve without catching exceptions: it does not throw
+        deps = DependencyResolver.internalResolve(uri);
 
-  private static void knownJarCheck(
-      String jarName, String expectedName, String expectedVersion, String expectedHash) {
-    File jarFile = getJar(jarName);
-    List<Dependency> deps = DependencyResolver.resolve(jarFile.toURI());
+        assertTrue(deps.isEmpty());
+    }
 
-    assertEquals(1, deps.size());
-    Dependency dep = deps.get(0);
-    assertNotNull(dep);
-    assertEquals(jarName, dep.source);
-    assertEquals(expectedName, dep.name);
-    assertEquals(expectedVersion, dep.version);
-    assertEquals(expectedHash, dep.hash);
-  }
+    private static void knownJarCheck(
+            String jarName, String expectedName, String expectedVersion, String expectedHash) {
+        File jarFile = getJar(jarName);
+        List<Dependency> deps = DependencyResolver.resolve(jarFile.toURI());
+
+        assertEquals(1, deps.size());
+        Dependency dep = deps.get(0);
+        assertNotNull(dep);
+        assertEquals(jarName, dep.source);
+        assertEquals(expectedName, dep.name);
+        assertEquals(expectedVersion, dep.version);
+        assertEquals(expectedHash, dep.hash);
+    }
 
-  @Test
-  void jbossMayUseTheJarFileFormatToReferenceJarFilesInsteadOfNestedJars() throws IOException {
-    File file = prepareJar("junit-4.12.jar", null, null, null, "JUnit", "4.12");
-    URI uri = URI.create("jar:" + file.toURI() + "!/");
+    @Test
+    void jbossMayUseTheJarFileFormatToReferenceJarFilesInsteadOfNestedJars() throws IOException {
+        File file = prepareJar("junit-4.12.jar", null, null, null, "JUnit", "4.12");
+        URI uri = URI.create("jar:" + file.toURI() + "!/");
 
-    List<Dependency> deps = DependencyResolver.resolve(uri);
+        List<Dependency> deps = DependencyResolver.resolve(uri);
 
-    assertEquals(1, deps.size());
-  }
+        assertEquals(1, deps.size());
+    }
 
-  private static URI zipPath(String outerJar) throws URISyntaxException {
-    URL outerJarUrl = Thread.currentThread().getContextClassLoader().getResource(outerJar);
+    private static URI zipPath(String outerJar) throws URISyntaxException {
+        URL outerJarUrl = Thread.currentThread().getContextClassLoader().getResource(outerJar);
 
-    assertNotNull(outerJarUrl, "Resource not found: " + outerJar);
+        assertNotNull(outerJarUrl, "Resource not found: " + outerJar);
 
-    return outerJarUrl.toURI();
-  }
+        return outerJarUrl.toURI();
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/dependency/DependencyServiceTest.java b/telemetry/src/test/java/datadog/telemetry/dependency/DependencyServiceTest.java
index b94bb187f85..a9af587b9b2 100644
--- a/telemetry/src/test/java/datadog/telemetry/dependency/DependencyServiceTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/dependency/DependencyServiceTest.java
@@ -28,172 +28,163 @@
 
 class DependencyServiceTest {
 
-  private final DependencyService depService = new DependencyService();
-
-  @Test
-  void noUrisPushedShouldResultInEmptyList() {
-    depService.resolveOneDependency();
-
-    Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
-
-    assertTrue(dependencies.isEmpty());
-  }
-
-  @Test
-  void nullUriResultsInNPE() {
-    assertThrows(NullPointerException.class, () -> depService.addURL(null));
-  }
-
-  @Test
-  void classFilesAreIgnoredAsDependencies() throws MalformedURLException {
-    depService.addURL(new URL("file:///tmp/toto.class"));
-    depService.resolveOneDependency();
-
-    assertTrue(depService.drainDeterminedDependencies().isEmpty());
-  }
-
-  @Test
-  void addMissingJarUrlDependency() throws MalformedURLException {
-    // this URI comes from a spring-boot application
-    URL url =
-        new URL(
-            "jar:file:/tmp//spring-petclinic-2.1.0.BUILD-SNAPSHOT.jar!/BOOT-INF/lib/spring-boot-2.1.0.BUILD-SNAPSHOT.jar!//");
-    depService.addURL(url);
-    depService.resolveOneDependency();
-
-    assertTrue(depService.drainDeterminedDependencies().isEmpty());
-  }
-
-  @Test
-  void invalidJarNamesAreIgnored() throws IOException {
-    depService.addURL(new File(".zip").toURI().toURL());
-    depService.resolveOneDependency();
-
-    assertTrue(depService.drainDeterminedDependencies().isEmpty());
-  }
-
-  @Test
-  void buildDependencySetFromKnownJar() throws IOException {
-    File junitJar = getJar("junit-4.12.jar");
-
-    depService.addURL(junitJar.toURI().toURL());
-    depService.resolveOneDependency();
-
-    Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
-    assertEquals(1, dependencies.size());
-    Dependency dependency = dependencies.iterator().next();
-    assertEquals("junit", dependency.name);
-    assertEquals("4.12", dependency.version);
-  }
-
-  @Test
-  void convertToURIWorksWithASpacedURL() throws MalformedURLException {
-    URI uri =
-        depService.convertToURI(
-            new URL(
-                "file:/C:/Program Files/IBM/WebSphere/AppServer_1/plugins/com.ibm.cds_2.1.0.jar"));
-
-    assertEquals(
-        "/C:/Program Files/IBM/WebSphere/AppServer_1/plugins/com.ibm.cds_2.1.0.jar", uri.getPath());
-  }
-
-  @Test
-  void convertToURIWorksWithANestedURL() throws MalformedURLException {
-    URI uri =
-        depService.convertToURI(
-            new URL("jar:file:/Users/test/spring-petclinic.jar!/BOOT-INF/classes!/"));
-
-    assertEquals(
-        "file:/Users/test/spring-petclinic.jar!/BOOT-INF/classes!/", uri.getSchemeSpecificPart());
-  }
-
-  @Test
-  void buildDependencySetFromAFatJar() throws IOException {
-    File budgetappJar = getJar("budgetapp.jar");
-
-    depService.addURL(budgetappJar.toURI().toURL());
-    depService.resolveOneDependency();
-
-    Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
-    assertEquals(105, dependencies.size());
-  }
-
-  @Test
-  void buildDependencySetFromASmallFatJar() throws IOException {
-    File budgetappJar = getJar("budgetappreduced.jar");
-
-    depService.addURL(budgetappJar.toURI().toURL());
-    depService.resolveOneDependency();
-
-    Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
-    assertEquals(2, dependencies.size());
-    Map<String, Dependency> dependenciesByName = dependenciesByName(dependencies);
-    assertEquals("3.2.4", dependenciesByName.get("cglib:cglib").version);
-    assertEquals("1.17", dependenciesByName.get("org.yaml:snakeyaml").version);
-  }
-
-  @Test
-  void buildDependencySetFromASmallFatJarWithOneIncorrectPomProperties() throws IOException {
-    File budgetappJar = getJar("budgetappreducedbadproperties.jar");
-
-    depService.addURL(budgetappJar.toURI().toURL());
-    depService.resolveOneDependency();
-
-    Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
-    assertEquals(1, dependencies.size());
-    Dependency dependency = dependencies.iterator().next();
-    assertEquals("org.yaml:snakeyaml", dependency.name);
-    assertEquals("1.17", dependency.version);
-  }
-
-  @Test
-  void transformerInvalidCodeSource() throws MalformedURLException, IllegalClassFormatException {
-    Instrumentation instrumentation = mock(Instrumentation.class);
-
-    depService.installOn(instrumentation);
-
-    ArgumentCaptor<ClassFileTransformer> transformerCaptor =
-        ArgumentCaptor.forClass(ClassFileTransformer.class);
-    verify(instrumentation).addTransformer(transformerCaptor.capture());
-    ClassFileTransformer transformer = transformerCaptor.getValue();
-    assertNotNull(transformer);
-
-    // null protection domain
-    transformer.transform(null, null, null, null, null);
-    depService.resolveOneDependency();
-    assertTrue(depService.drainDeterminedDependencies().isEmpty());
-
-    // null code source
-    ProtectionDomain protectionDomainWithoutCodeSource =
-        new ProtectionDomain(null, null, null, null);
-    transformer.transform(null, null, null, protectionDomainWithoutCodeSource, null);
-    depService.resolveOneDependency();
-    assertTrue(depService.drainDeterminedDependencies().isEmpty());
-
-    // null code source location
-    CodeSource codeSourceWithoutLocation = new CodeSource(null, (CodeSigner[]) null);
-    ProtectionDomain protectionDomainWithoutLocation =
-        new ProtectionDomain(codeSourceWithoutLocation, null, null, null);
-    transformer.transform(null, null, null, protectionDomainWithoutLocation, null);
-    depService.resolveOneDependency();
-    assertNull(codeSourceWithoutLocation.getLocation());
-    assertTrue(depService.drainDeterminedDependencies().isEmpty());
-
-    // null or invalid URI syntax
-    URL invalidUrl = new URL("http:// "); // this url is known to not be a valid URI
-    CodeSource codeSourceWithInvalidUrl = new CodeSource(invalidUrl, (CodeSigner[]) null);
-    ProtectionDomain protectionDomainWithInvalidUrl =
-        new ProtectionDomain(codeSourceWithInvalidUrl, null, null, null);
-    transformer.transform(null, null, null, protectionDomainWithInvalidUrl, null);
-    depService.resolveOneDependency();
-    assertTrue(depService.drainDeterminedDependencies().isEmpty());
-  }
-
-  private static Map<String, Dependency> dependenciesByName(Collection<Dependency> dependencies) {
-    Map<String, Dependency> dependenciesByName = new HashMap<>();
-    for (Dependency dependency : dependencies) {
-      dependenciesByName.put(dependency.name, dependency);
+    private final DependencyService depService = new DependencyService();
+
+    @Test
+    void noUrisPushedShouldResultInEmptyList() {
+        depService.resolveOneDependency();
+
+        Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
+
+        assertTrue(dependencies.isEmpty());
+    }
+
+    @Test
+    void nullUriResultsInNPE() {
+        assertThrows(NullPointerException.class, () -> depService.addURL(null));
+    }
+
+    @Test
+    void classFilesAreIgnoredAsDependencies() throws MalformedURLException {
+        depService.addURL(new URL("file:///tmp/toto.class"));
+        depService.resolveOneDependency();
+
+        assertTrue(depService.drainDeterminedDependencies().isEmpty());
+    }
+
+    @Test
+    void addMissingJarUrlDependency() throws MalformedURLException {
+        // this URI comes from a spring-boot application
+        URL url = new URL(
+                "jar:file:/tmp//spring-petclinic-2.1.0.BUILD-SNAPSHOT.jar!/BOOT-INF/lib/spring-boot-2.1.0.BUILD-SNAPSHOT.jar!//");
+        depService.addURL(url);
+        depService.resolveOneDependency();
+
+        assertTrue(depService.drainDeterminedDependencies().isEmpty());
+    }
+
+    @Test
+    void invalidJarNamesAreIgnored() throws IOException {
+        depService.addURL(new File(".zip").toURI().toURL());
+        depService.resolveOneDependency();
+
+        assertTrue(depService.drainDeterminedDependencies().isEmpty());
+    }
+
+    @Test
+    void buildDependencySetFromKnownJar() throws IOException {
+        File junitJar = getJar("junit-4.12.jar");
+
+        depService.addURL(junitJar.toURI().toURL());
+        depService.resolveOneDependency();
+
+        Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
+        assertEquals(1, dependencies.size());
+        Dependency dependency = dependencies.iterator().next();
+        assertEquals("junit", dependency.name);
+        assertEquals("4.12", dependency.version);
+    }
+
+    @Test
+    void convertToURIWorksWithASpacedURL() throws MalformedURLException {
+        URI uri = depService.convertToURI(
+                new URL("file:/C:/Program Files/IBM/WebSphere/AppServer_1/plugins/com.ibm.cds_2.1.0.jar"));
+
+        assertEquals("/C:/Program Files/IBM/WebSphere/AppServer_1/plugins/com.ibm.cds_2.1.0.jar", uri.getPath());
+    }
+
+    @Test
+    void convertToURIWorksWithANestedURL() throws MalformedURLException {
+        URI uri = depService.convertToURI(new URL("jar:file:/Users/test/spring-petclinic.jar!/BOOT-INF/classes!/"));
+
+        assertEquals("file:/Users/test/spring-petclinic.jar!/BOOT-INF/classes!/", uri.getSchemeSpecificPart());
+    }
+
+    @Test
+    void buildDependencySetFromAFatJar() throws IOException {
+        File budgetappJar = getJar("budgetapp.jar");
+
+        depService.addURL(budgetappJar.toURI().toURL());
+        depService.resolveOneDependency();
+
+        Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
+        assertEquals(105, dependencies.size());
+    }
+
+    @Test
+    void buildDependencySetFromASmallFatJar() throws IOException {
+        File budgetappJar = getJar("budgetappreduced.jar");
+
+        depService.addURL(budgetappJar.toURI().toURL());
+        depService.resolveOneDependency();
+
+        Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
+        assertEquals(2, dependencies.size());
+        Map<String, Dependency> dependenciesByName = dependenciesByName(dependencies);
+        assertEquals("3.2.4", dependenciesByName.get("cglib:cglib").version);
+        assertEquals("1.17", dependenciesByName.get("org.yaml:snakeyaml").version);
+    }
+
+    @Test
+    void buildDependencySetFromASmallFatJarWithOneIncorrectPomProperties() throws IOException {
+        File budgetappJar = getJar("budgetappreducedbadproperties.jar");
+
+        depService.addURL(budgetappJar.toURI().toURL());
+        depService.resolveOneDependency();
+
+        Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
+        assertEquals(1, dependencies.size());
+        Dependency dependency = dependencies.iterator().next();
+        assertEquals("org.yaml:snakeyaml", dependency.name);
+        assertEquals("1.17", dependency.version);
+    }
+
+    @Test
+    void transformerInvalidCodeSource() throws MalformedURLException, IllegalClassFormatException {
+        Instrumentation instrumentation = mock(Instrumentation.class);
+
+        depService.installOn(instrumentation);
+
+        ArgumentCaptor<ClassFileTransformer> transformerCaptor = ArgumentCaptor.forClass(ClassFileTransformer.class);
+        verify(instrumentation).addTransformer(transformerCaptor.capture());
+        ClassFileTransformer transformer = transformerCaptor.getValue();
+        assertNotNull(transformer);
+
+        // null protection domain
+        transformer.transform(null, null, null, null, null);
+        depService.resolveOneDependency();
+        assertTrue(depService.drainDeterminedDependencies().isEmpty());
+
+        // null code source
+        ProtectionDomain protectionDomainWithoutCodeSource = new ProtectionDomain(null, null, null, null);
+        transformer.transform(null, null, null, protectionDomainWithoutCodeSource, null);
+        depService.resolveOneDependency();
+        assertTrue(depService.drainDeterminedDependencies().isEmpty());
+
+        // null code source location
+        CodeSource codeSourceWithoutLocation = new CodeSource(null, (CodeSigner[]) null);
+        ProtectionDomain protectionDomainWithoutLocation =
+                new ProtectionDomain(codeSourceWithoutLocation, null, null, null);
+        transformer.transform(null, null, null, protectionDomainWithoutLocation, null);
+        depService.resolveOneDependency();
+        assertNull(codeSourceWithoutLocation.getLocation());
+        assertTrue(depService.drainDeterminedDependencies().isEmpty());
+
+        // null or invalid URI syntax
+        URL invalidUrl = new URL("http:// "); // this url is known to not be a valid URI
+        CodeSource codeSourceWithInvalidUrl = new CodeSource(invalidUrl, (CodeSigner[]) null);
+        ProtectionDomain protectionDomainWithInvalidUrl =
+                new ProtectionDomain(codeSourceWithInvalidUrl, null, null, null);
+        transformer.transform(null, null, null, protectionDomainWithInvalidUrl, null);
+        depService.resolveOneDependency();
+        assertTrue(depService.drainDeterminedDependencies().isEmpty());
+    }
+
+    private static Map<String, Dependency> dependenciesByName(Collection<Dependency> dependencies) {
+        Map<String, Dependency> dependenciesByName = new HashMap<>();
+        for (Dependency dependency : dependencies) {
+            dependenciesByName.put(dependency.name, dependency);
+        }
+        return dependenciesByName;
     }
-    return dependenciesByName;
-  }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/dependency/DependencyServiceTests.java b/telemetry/src/test/java/datadog/telemetry/dependency/DependencyServiceTests.java
index 63d327b4aae..a2e73a2e61b 100644
--- a/telemetry/src/test/java/datadog/telemetry/dependency/DependencyServiceTests.java
+++ b/telemetry/src/test/java/datadog/telemetry/dependency/DependencyServiceTests.java
@@ -25,116 +25,110 @@
 import org.junit.jupiter.api.Test;
 
 public class DependencyServiceTests {
-  DependencyService depService = new DependencyService();
-  Closeable assemblyHandle;
-  TempFileProvider tempFileProvider;
-
-  @AfterEach
-  public void teardown() throws IOException {
-    if (assemblyHandle != null) {
-      assemblyHandle.close();
+    DependencyService depService = new DependencyService();
+    Closeable assemblyHandle;
+    TempFileProvider tempFileProvider;
+
+    @AfterEach
+    public void teardown() throws IOException {
+        if (assemblyHandle != null) {
+            assemblyHandle.close();
+        }
+        if (tempFileProvider != null) {
+            tempFileProvider.close();
+        }
     }
-    if (tempFileProvider != null) {
-      tempFileProvider.close();
-    }
-  }
 
-  private ClassFileTransformer captureTransformer() {
-    final ClassFileTransformer[] t = {null};
-    Instrumentation instrumentation =
-        (Instrumentation)
-            Proxy.newProxyInstance(
+    private ClassFileTransformer captureTransformer() {
+        final ClassFileTransformer[] t = {null};
+        Instrumentation instrumentation = (Instrumentation) Proxy.newProxyInstance(
                 DependencyServiceTests.class.getClassLoader(),
                 new Class<?>[] {Instrumentation.class},
                 (proxy, method, args) -> {
-                  if (method.getName().equals("addTransformer")) {
-                    t[0] = (ClassFileTransformer) args[0];
-                  } else {
-                    throw new UnsupportedOperationException();
-                  }
-                  return null;
+                    if (method.getName().equals("addTransformer")) {
+                        t[0] = (ClassFileTransformer) args[0];
+                    } else {
+                        throw new UnsupportedOperationException();
+                    }
+                    return null;
                 });
 
-    depService.installOn(instrumentation);
-    assert t[0] != null;
-    return t[0];
-  }
+        depService.installOn(instrumentation);
+        assert t[0] != null;
+        return t[0];
+    }
+
+    private Dependency identifyDependency(ClassFileTransformer t, String url)
+            throws MalformedURLException, IllegalClassFormatException {
+        VirtualFile virtualGroovyJar = VFS.getChild(url);
+        URL groovyJarURL = virtualGroovyJar.toURL();
 
-  private Dependency identifyDependency(ClassFileTransformer t, String url)
-      throws MalformedURLException, IllegalClassFormatException {
-    VirtualFile virtualGroovyJar = VFS.getChild(url);
-    URL groovyJarURL = virtualGroovyJar.toURL();
+        CodeSource codeSource = new CodeSource(groovyJarURL, (Certificate[]) null);
+        ProtectionDomain domain = new ProtectionDomain(codeSource, null);
+        t.transform(getClass().getClassLoader(), "class.name", Object.class, domain, new byte[0]);
+        depService.run(); // for test enforce instant dependency resolution
+        Collection<Dependency> deps = depService.drainDeterminedDependencies();
 
-    CodeSource codeSource = new CodeSource(groovyJarURL, (Certificate[]) null);
-    ProtectionDomain domain = new ProtectionDomain(codeSource, null);
-    t.transform(getClass().getClassLoader(), "class.name", Object.class, domain, new byte[0]);
-    depService.run(); // for test enforce instant dependency resolution
-    Collection<Dependency> deps = depService.drainDeterminedDependencies();
+        if (deps.isEmpty()) {
+            return null;
+        }
 
-    if (deps.isEmpty()) {
-      return null;
+        return deps.iterator().next();
     }
 
-    return deps.iterator().next();
-  }
-
-  @Test
-  public void jboss_vfs_url() throws IOException, IllegalClassFormatException {
-    ClassFileTransformer t = captureTransformer();
+    @Test
+    public void jboss_vfs_url() throws IOException, IllegalClassFormatException {
+        ClassFileTransformer t = captureTransformer();
 
-    VirtualFileAssembly assembly = new VirtualFileAssembly();
-    VirtualFile assemblyLocation = VFS.getChild("assembly.jar");
-    assemblyHandle = VFS.mountAssembly(assembly, assemblyLocation);
+        VirtualFileAssembly assembly = new VirtualFileAssembly();
+        VirtualFile assemblyLocation = VFS.getChild("assembly.jar");
+        assemblyHandle = VFS.mountAssembly(assembly, assemblyLocation);
 
-    VirtualFile virtualDir =
-        VFS.getChild(
-            ClassLoader.getSystemClassLoader()
+        VirtualFile virtualDir = VFS.getChild(ClassLoader.getSystemClassLoader()
                 .getResource("datadog/telemetry/dependencies/")
                 .getPath());
-    assembly.add("/groovy.jar", virtualDir.getChild("groovy-manifest.jar"));
-
-    Dependency dep = identifyDependency(t, "assembly.jar/groovy.jar");
-    assertNotNull(dep);
-
-    // XXX: This should be `groovy` instead of `groovy-manifest` (ideally). However, we only
-    // have the bundle symbolic name with `groovy` and it is not always reliable.
-    assertEquals("groovy-manifest", dep.name);
-    assertEquals("2.4.12", dep.version);
-    assertEquals("groovy-manifest.jar", dep.source);
-    assertEquals("04DF0875A66F111880217FE1C5C59CA877403239", dep.hash);
-  }
-
-  @Test
-  public void jboss_vfs_zip_url() throws IOException, IllegalClassFormatException {
-    ClassFileTransformer t = captureTransformer();
-
-    VirtualFile zipFile =
-        VFS.getChild(
-            ClassLoader.getSystemClassLoader()
+        assembly.add("/groovy.jar", virtualDir.getChild("groovy-manifest.jar"));
+
+        Dependency dep = identifyDependency(t, "assembly.jar/groovy.jar");
+        assertNotNull(dep);
+
+        // XXX: This should be `groovy` instead of `groovy-manifest` (ideally). However, we only
+        // have the bundle symbolic name with `groovy` and it is not always reliable.
+        assertEquals("groovy-manifest", dep.name);
+        assertEquals("2.4.12", dep.version);
+        assertEquals("groovy-manifest.jar", dep.source);
+        assertEquals("04DF0875A66F111880217FE1C5C59CA877403239", dep.hash);
+    }
+
+    @Test
+    public void jboss_vfs_zip_url() throws IOException, IllegalClassFormatException {
+        ClassFileTransformer t = captureTransformer();
+
+        VirtualFile zipFile = VFS.getChild(ClassLoader.getSystemClassLoader()
                 .getResource("datadog/telemetry/dependencies/junit.zip")
                 .getPath());
-    VirtualFile mountPoint = VFS.getChild("foo.zip");
-    tempFileProvider = TempFileProvider.create("test", new ScheduledThreadPoolExecutor(2));
-    assemblyHandle = VFS.mountZip(zipFile, mountPoint, tempFileProvider);
-
-    Dependency dep = identifyDependency(t, "foo.zip/junit-4.12.jar");
-    assertNotNull(dep);
-
-    assertEquals("junit", dep.name);
-    assertEquals("4.12", dep.version);
-    assertEquals("junit-4.12.jar", dep.source);
-    assertEquals("4376590587C49AC6DA6935564233F36B092412AE", dep.hash);
-  }
-
-  @Test
-  public void jboss_nonexistent_file() throws IOException, IllegalClassFormatException {
-    ClassFileTransformer t = captureTransformer();
-
-    VirtualFileAssembly assembly = new VirtualFileAssembly();
-    VirtualFile assemblyLocation = VFS.getChild("assembly.jar");
-    assemblyHandle = VFS.mountAssembly(assembly, assemblyLocation);
-
-    Dependency dep = identifyDependency(t, "assembly.jar/nonexistent-1.2.3.jar");
-    assertNull(dep);
-  }
+        VirtualFile mountPoint = VFS.getChild("foo.zip");
+        tempFileProvider = TempFileProvider.create("test", new ScheduledThreadPoolExecutor(2));
+        assemblyHandle = VFS.mountZip(zipFile, mountPoint, tempFileProvider);
+
+        Dependency dep = identifyDependency(t, "foo.zip/junit-4.12.jar");
+        assertNotNull(dep);
+
+        assertEquals("junit", dep.name);
+        assertEquals("4.12", dep.version);
+        assertEquals("junit-4.12.jar", dep.source);
+        assertEquals("4376590587C49AC6DA6935564233F36B092412AE", dep.hash);
+    }
+
+    @Test
+    public void jboss_nonexistent_file() throws IOException, IllegalClassFormatException {
+        ClassFileTransformer t = captureTransformer();
+
+        VirtualFileAssembly assembly = new VirtualFileAssembly();
+        VirtualFile assemblyLocation = VFS.getChild("assembly.jar");
+        assemblyHandle = VFS.mountAssembly(assembly, assemblyLocation);
+
+        Dependency dep = identifyDependency(t, "assembly.jar/nonexistent-1.2.3.jar");
+        assertNull(dep);
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/dependency/DependencyTestHelper.java b/telemetry/src/test/java/datadog/telemetry/dependency/DependencyTestHelper.java
index 009b00e5012..a60a749ad8e 100644
--- a/telemetry/src/test/java/datadog/telemetry/dependency/DependencyTestHelper.java
+++ b/telemetry/src/test/java/datadog/telemetry/dependency/DependencyTestHelper.java
@@ -6,15 +6,14 @@
 
 class DependencyTestHelper {
 
-  private DependencyTestHelper() {}
+    private DependencyTestHelper() {}
 
-  static File getJar(String jarName) {
-    String path =
-        ClassLoader.getSystemClassLoader()
-            .getResource("datadog/telemetry/dependencies/" + jarName)
-            .getPath();
-    File jarFile = new File(path);
-    assertTrue(jarFile.isFile());
-    return jarFile;
-  }
+    static File getJar(String jarName) {
+        String path = ClassLoader.getSystemClassLoader()
+                .getResource("datadog/telemetry/dependencies/" + jarName)
+                .getPath();
+        File jarFile = new File(path);
+        assertTrue(jarFile.isFile());
+        return jarFile;
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/dependency/JarReaderTest.java b/telemetry/src/test/java/datadog/telemetry/dependency/JarReaderTest.java
index 391a8590d87..6ad2cfc62a2 100644
--- a/telemetry/src/test/java/datadog/telemetry/dependency/JarReaderTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/dependency/JarReaderTest.java
@@ -12,101 +12,95 @@
 
 class JarReaderTest {
 
-  @Test
-  void readPlainJarWithManifestAndNoPomProperties() throws IOException {
-    String jarPath = getJar("bson-4.2.0.jar").getAbsolutePath();
-
-    JarReader.Extracted result = JarReader.readJarFile(jarPath);
-
-    assertEquals("bson-4.2.0.jar", result.jarName);
-    assertTrue(result.pomProperties.isEmpty());
-    assertNotNull(result.manifest);
-    assertEquals("bson", result.manifest.getValue("Bundle-Name"));
-  }
-
-  @Test
-  void readJarWithoutManifest() throws IOException {
-    String jarPath = getJar("groovy-no-manifest-info.jar").getAbsolutePath();
-
-    JarReader.Extracted result = JarReader.readJarFile(jarPath);
-
-    assertEquals("groovy-no-manifest-info.jar", result.jarName);
-    assertTrue(result.pomProperties.isEmpty());
-    assertNotNull(result.manifest);
-    assertTrue(result.manifest.isEmpty());
-  }
-
-  @Test
-  void readPlainJarWithManifestAndPomProperties() throws IOException {
-    String jarPath = getJar("commons-logging-1.2.jar").getAbsolutePath();
-
-    JarReader.Extracted result = JarReader.readJarFile(jarPath);
-
-    assertEquals("commons-logging-1.2.jar", result.jarName);
-    assertEquals(1, result.pomProperties.size());
-    Properties properties =
-        result.pomProperties.get("META-INF/maven/commons-logging/commons-logging/pom.properties");
-    assertNotNull(properties);
-    assertEquals("commons-logging", properties.getProperty("groupId"));
-    assertEquals("commons-logging", properties.getProperty("artifactId"));
-    assertEquals("1.2", properties.getProperty("version"));
-    assertNotNull(result.manifest);
-    assertEquals("Apache Commons Logging", result.manifest.getValue("Bundle-Name"));
-  }
-
-  @Test
-  void readNestedJar() throws IOException {
-    String outerPath = getJar("spring-boot-app.jar").getAbsolutePath();
-
-    JarReader.Extracted result =
-        JarReader.readNestedJarFile(outerPath, "BOOT-INF/lib/opentracing-util-0.33.0.jar");
-
-    assertEquals("opentracing-util-0.33.0.jar", result.jarName);
-    assertEquals(1, result.pomProperties.size());
-    Properties properties =
-        result.pomProperties.get("META-INF/maven/io.opentracing/opentracing-util/pom.properties");
-    assertNotNull(properties);
-    assertEquals("io.opentracing", properties.getProperty("groupId"));
-    assertEquals("opentracing-util", properties.getProperty("artifactId"));
-    assertEquals("0.33.0", properties.getProperty("version"));
-    assertNotNull(result.manifest);
-    assertEquals("io.opentracing.util", result.manifest.getValue("Automatic-Module-Name"));
-  }
-
-  @Test
-  void nonExistentSimpleJar() {
-    assertThrows(IOException.class, () -> JarReader.readJarFile("non-existent.jar"));
-  }
-
-  @Test
-  void nonExistentOuterJarForNestedJar() {
-    assertThrows(
-        IOException.class,
-        () ->
-            JarReader.readNestedJarFile(
-                "non-existent.jar", "BOOT-INF/lib/opentracing-util-0.33.0.jar"));
-  }
-
-  @Test
-  void nonExistentInnerJarForNestedJar() throws IOException {
-    String outerPath = getJar("spring-boot-app.jar").getAbsolutePath();
-
-    assertThrows(
-        IOException.class,
-        () -> JarReader.readNestedJarFile(outerPath, "BOOT-INF/lib/non-existent.jar"));
-  }
-
-  @Test
-  void doublyNestedJarPath() {
-    assertThrows(
-        IOException.class,
-        () ->
-            JarReader.readNestedJarFile(
-                "non-existent.jar", "BOOT-INF/lib/opentracing-util-0.33.0.jar/third"));
-  }
-
-  @Test
-  void emptyNestedJarPath() {
-    assertThrows(IOException.class, () -> JarReader.readNestedJarFile("non-existent.jar", ""));
-  }
+    @Test
+    void readPlainJarWithManifestAndNoPomProperties() throws IOException {
+        String jarPath = getJar("bson-4.2.0.jar").getAbsolutePath();
+
+        JarReader.Extracted result = JarReader.readJarFile(jarPath);
+
+        assertEquals("bson-4.2.0.jar", result.jarName);
+        assertTrue(result.pomProperties.isEmpty());
+        assertNotNull(result.manifest);
+        assertEquals("bson", result.manifest.getValue("Bundle-Name"));
+    }
+
+    @Test
+    void readJarWithoutManifest() throws IOException {
+        String jarPath = getJar("groovy-no-manifest-info.jar").getAbsolutePath();
+
+        JarReader.Extracted result = JarReader.readJarFile(jarPath);
+
+        assertEquals("groovy-no-manifest-info.jar", result.jarName);
+        assertTrue(result.pomProperties.isEmpty());
+        assertNotNull(result.manifest);
+        assertTrue(result.manifest.isEmpty());
+    }
+
+    @Test
+    void readPlainJarWithManifestAndPomProperties() throws IOException {
+        String jarPath = getJar("commons-logging-1.2.jar").getAbsolutePath();
+
+        JarReader.Extracted result = JarReader.readJarFile(jarPath);
+
+        assertEquals("commons-logging-1.2.jar", result.jarName);
+        assertEquals(1, result.pomProperties.size());
+        Properties properties =
+                result.pomProperties.get("META-INF/maven/commons-logging/commons-logging/pom.properties");
+        assertNotNull(properties);
+        assertEquals("commons-logging", properties.getProperty("groupId"));
+        assertEquals("commons-logging", properties.getProperty("artifactId"));
+        assertEquals("1.2", properties.getProperty("version"));
+        assertNotNull(result.manifest);
+        assertEquals("Apache Commons Logging", result.manifest.getValue("Bundle-Name"));
+    }
+
+    @Test
+    void readNestedJar() throws IOException {
+        String outerPath = getJar("spring-boot-app.jar").getAbsolutePath();
+
+        JarReader.Extracted result = JarReader.readNestedJarFile(outerPath, "BOOT-INF/lib/opentracing-util-0.33.0.jar");
+
+        assertEquals("opentracing-util-0.33.0.jar", result.jarName);
+        assertEquals(1, result.pomProperties.size());
+        Properties properties =
+                result.pomProperties.get("META-INF/maven/io.opentracing/opentracing-util/pom.properties");
+        assertNotNull(properties);
+        assertEquals("io.opentracing", properties.getProperty("groupId"));
+        assertEquals("opentracing-util", properties.getProperty("artifactId"));
+        assertEquals("0.33.0", properties.getProperty("version"));
+        assertNotNull(result.manifest);
+        assertEquals("io.opentracing.util", result.manifest.getValue("Automatic-Module-Name"));
+    }
+
+    @Test
+    void nonExistentSimpleJar() {
+        assertThrows(IOException.class, () -> JarReader.readJarFile("non-existent.jar"));
+    }
+
+    @Test
+    void nonExistentOuterJarForNestedJar() {
+        assertThrows(
+                IOException.class,
+                () -> JarReader.readNestedJarFile("non-existent.jar", "BOOT-INF/lib/opentracing-util-0.33.0.jar"));
+    }
+
+    @Test
+    void nonExistentInnerJarForNestedJar() throws IOException {
+        String outerPath = getJar("spring-boot-app.jar").getAbsolutePath();
+
+        assertThrows(IOException.class, () -> JarReader.readNestedJarFile(outerPath, "BOOT-INF/lib/non-existent.jar"));
+    }
+
+    @Test
+    void doublyNestedJarPath() {
+        assertThrows(
+                IOException.class,
+                () -> JarReader.readNestedJarFile(
+                        "non-existent.jar", "BOOT-INF/lib/opentracing-util-0.33.0.jar/third"));
+    }
+
+    @Test
+    void emptyNestedJarPath() {
+        assertThrows(IOException.class, () -> JarReader.readNestedJarFile("non-existent.jar", ""));
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/dependency/LocationsCollectingTransformerTest.java b/telemetry/src/test/java/datadog/telemetry/dependency/LocationsCollectingTransformerTest.java
index 32cebec980f..f8c42c29d0c 100644
--- a/telemetry/src/test/java/datadog/telemetry/dependency/LocationsCollectingTransformerTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/dependency/LocationsCollectingTransformerTest.java
@@ -31,181 +31,169 @@
 
 class LocationsCollectingTransformerTest {
 
-  private final DependencyService depService = new DependencyService();
-  private final LocationsCollectingTransformer transformer =
-      new LocationsCollectingTransformer(depService);
-
-  @Test
-  void noDependencyIfNullProtectionDomain() {
-    transformer.transform(null, null, null, null, null);
-
-    depService.resolveOneDependency();
-    Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
-
-    assertTrue(dependencies.isEmpty());
-  }
-
-  @Test
-  void noDependencyIfNullCodeSource() {
-    ProtectionDomain domain = new ProtectionDomain(null, null);
-    transformer.transform(null, null, null, domain, null);
-
-    depService.resolveOneDependency();
-    Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
-
-    assertTrue(dependencies.isEmpty());
-  }
-
-  @Test
-  void noDependencyIfNullLocation() {
-    CodeSource source = new CodeSource(null, (Certificate[]) null);
-    ProtectionDomain domain = new ProtectionDomain(source, null);
-    transformer.transform(null, null, null, domain, null);
-
-    depService.resolveOneDependency();
-    Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
-
-    assertTrue(dependencies.isEmpty());
-  }
-
-  @Test
-  void oneDependencyIfNormalUrl() throws IOException {
-    CodeSource source =
-        new CodeSource(getJar("bson-4.2.0.jar").toURI().toURL(), (Certificate[]) null);
-    ProtectionDomain domain = new ProtectionDomain(source, null);
-    transformer.transform(null, null, null, domain, null);
-
-    depService.resolveOneDependency();
-    Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
-
-    assertEquals(1, dependencies.size());
-  }
-
-  @Test
-  void singleDependencyIfRepeatedProtectionDomain() throws IOException {
-    CodeSource source =
-        new CodeSource(getJar("bson-4.2.0.jar").toURI().toURL(), (Certificate[]) null);
-    ProtectionDomain domain = new ProtectionDomain(source, null);
-    transformer.transform(null, null, null, domain, null);
-    transformer.transform(null, null, null, domain, null);
-
-    depService.resolveOneDependency();
-    Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
-
-    assertEquals(1, dependencies.size());
-  }
-
-  @Test
-  void multipleDependencies() throws MalformedURLException {
-    int domainCount = 1000;
-    List<ProtectionDomain> domains = new ArrayList<>();
-    for (int i = 1; i <= domainCount; i++) {
-      CodeSource source =
-          new CodeSource(new URL("file:///bson-" + i + ".jar"), (Certificate[]) null);
-      domains.add(new ProtectionDomain(source, null));
+    private final DependencyService depService = new DependencyService();
+    private final LocationsCollectingTransformer transformer = new LocationsCollectingTransformer(depService);
+
+    @Test
+    void noDependencyIfNullProtectionDomain() {
+        transformer.transform(null, null, null, null, null);
+
+        depService.resolveOneDependency();
+        Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
+
+        assertTrue(dependencies.isEmpty());
+    }
+
+    @Test
+    void noDependencyIfNullCodeSource() {
+        ProtectionDomain domain = new ProtectionDomain(null, null);
+        transformer.transform(null, null, null, domain, null);
+
+        depService.resolveOneDependency();
+        Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
+
+        assertTrue(dependencies.isEmpty());
+    }
+
+    @Test
+    void noDependencyIfNullLocation() {
+        CodeSource source = new CodeSource(null, (Certificate[]) null);
+        ProtectionDomain domain = new ProtectionDomain(source, null);
+        transformer.transform(null, null, null, domain, null);
+
+        depService.resolveOneDependency();
+        Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
+
+        assertTrue(dependencies.isEmpty());
     }
 
-    DependencyService mockDepService = mock(DependencyService.class);
-    LocationsCollectingTransformer mockTransformer =
-        new LocationsCollectingTransformer(mockDepService);
+    @Test
+    void oneDependencyIfNormalUrl() throws IOException {
+        CodeSource source = new CodeSource(getJar("bson-4.2.0.jar").toURI().toURL(), (Certificate[]) null);
+        ProtectionDomain domain = new ProtectionDomain(source, null);
+        transformer.transform(null, null, null, domain, null);
 
-    for (ProtectionDomain domain : domains) {
-      mockTransformer.transform(null, null, null, domain, null);
+        depService.resolveOneDependency();
+        Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
+
+        assertEquals(1, dependencies.size());
+    }
+
+    @Test
+    void singleDependencyIfRepeatedProtectionDomain() throws IOException {
+        CodeSource source = new CodeSource(getJar("bson-4.2.0.jar").toURI().toURL(), (Certificate[]) null);
+        ProtectionDomain domain = new ProtectionDomain(source, null);
+        transformer.transform(null, null, null, domain, null);
+        transformer.transform(null, null, null, domain, null);
+
+        depService.resolveOneDependency();
+        Collection<Dependency> dependencies = depService.drainDeterminedDependencies();
+
+        assertEquals(1, dependencies.size());
     }
 
-    verify(mockDepService, times(domainCount)).addURL(any(URL.class));
-    verifyNoMoreInteractions(mockDepService);
-  }
-
-  @Test
-  @Timeout(10)
-  void multipleDependenciesWithConcurrency() throws Exception {
-    int threads = 16;
-    ExecutorService executor = Executors.newFixedThreadPool(threads);
-    CountDownLatch latch = new CountDownLatch(threads);
-    try {
-      int domainCount = 3000;
-      BlockingQueue<ProtectionDomain> domains = new ArrayBlockingQueue<>(domainCount);
-      for (int i = 1; i <= domainCount; i++) {
-        CodeSource source =
-            new CodeSource(new URL("file:///bson-" + i + ".jar"), (Certificate[]) null);
-        domains.add(new ProtectionDomain(source, null));
-      }
-
-      DependencyService mockDepService = mock(DependencyService.class);
-      LocationsCollectingTransformer mockTransformer =
-          new LocationsCollectingTransformer(mockDepService);
-
-      List<Future<?>> futures = new ArrayList<>();
-      for (int i = 0; i < threads; i++) {
-        futures.add(
-            executor.submit(
-                () -> {
-                  latch.countDown();
-                  awaitUninterruptibly(latch);
-                  ProtectionDomain domain;
-                  while ((domain = domains.poll()) != null) {
-                    mockTransformer.transform(null, null, null, domain, null);
-                  }
+    @Test
+    void multipleDependencies() throws MalformedURLException {
+        int domainCount = 1000;
+        List<ProtectionDomain> domains = new ArrayList<>();
+        for (int i = 1; i <= domainCount; i++) {
+            CodeSource source = new CodeSource(new URL("file:///bson-" + i + ".jar"), (Certificate[]) null);
+            domains.add(new ProtectionDomain(source, null));
+        }
+
+        DependencyService mockDepService = mock(DependencyService.class);
+        LocationsCollectingTransformer mockTransformer = new LocationsCollectingTransformer(mockDepService);
+
+        for (ProtectionDomain domain : domains) {
+            mockTransformer.transform(null, null, null, domain, null);
+        }
+
+        verify(mockDepService, times(domainCount)).addURL(any(URL.class));
+        verifyNoMoreInteractions(mockDepService);
+    }
+
+    @Test
+    @Timeout(10)
+    void multipleDependenciesWithConcurrency() throws Exception {
+        int threads = 16;
+        ExecutorService executor = Executors.newFixedThreadPool(threads);
+        CountDownLatch latch = new CountDownLatch(threads);
+        try {
+            int domainCount = 3000;
+            BlockingQueue<ProtectionDomain> domains = new ArrayBlockingQueue<>(domainCount);
+            for (int i = 1; i <= domainCount; i++) {
+                CodeSource source = new CodeSource(new URL("file:///bson-" + i + ".jar"), (Certificate[]) null);
+                domains.add(new ProtectionDomain(source, null));
+            }
+
+            DependencyService mockDepService = mock(DependencyService.class);
+            LocationsCollectingTransformer mockTransformer = new LocationsCollectingTransformer(mockDepService);
+
+            List<Future<?>> futures = new ArrayList<>();
+            for (int i = 0; i < threads; i++) {
+                futures.add(executor.submit(() -> {
+                    latch.countDown();
+                    awaitUninterruptibly(latch);
+                    ProtectionDomain domain;
+                    while ((domain = domains.poll()) != null) {
+                        mockTransformer.transform(null, null, null, domain, null);
+                    }
                 }));
-      }
-      for (Future<?> future : futures) {
-        future.get();
-      }
-
-      verify(mockDepService, times(domainCount)).addURL(any(URL.class));
-      verifyNoMoreInteractions(mockDepService);
-    } finally {
-      executor.shutdownNow();
+            }
+            for (Future<?> future : futures) {
+                future.get();
+            }
+
+            verify(mockDepService, times(domainCount)).addURL(any(URL.class));
+            verifyNoMoreInteractions(mockDepService);
+        } finally {
+            executor.shutdownNow();
+        }
     }
-  }
-
-  @Test
-  @Timeout(10)
-  void singleDependenciesWithConcurrency() throws Exception {
-    int threads = 16;
-    ExecutorService executor = Executors.newFixedThreadPool(threads);
-    CountDownLatch latch = new CountDownLatch(threads);
-    try {
-      int iterationsPerThread = 3000;
-      CodeSource source = new CodeSource(new URL("file:///bson-1.jar"), (Certificate[]) null);
-      ProtectionDomain domain = new ProtectionDomain(source, null);
-
-      DependencyService mockDepService = mock(DependencyService.class);
-      LocationsCollectingTransformer mockTransformer =
-          new LocationsCollectingTransformer(mockDepService);
-
-      List<Future<?>> futures = new ArrayList<>();
-      for (int i = 0; i < threads; i++) {
-        futures.add(
-            executor.submit(
-                () -> {
-                  latch.countDown();
-                  awaitUninterruptibly(latch);
-                  for (int j = 0; j < iterationsPerThread; j++) {
-                    mockTransformer.transform(null, null, null, domain, null);
-                  }
+
+    @Test
+    @Timeout(10)
+    void singleDependenciesWithConcurrency() throws Exception {
+        int threads = 16;
+        ExecutorService executor = Executors.newFixedThreadPool(threads);
+        CountDownLatch latch = new CountDownLatch(threads);
+        try {
+            int iterationsPerThread = 3000;
+            CodeSource source = new CodeSource(new URL("file:///bson-1.jar"), (Certificate[]) null);
+            ProtectionDomain domain = new ProtectionDomain(source, null);
+
+            DependencyService mockDepService = mock(DependencyService.class);
+            LocationsCollectingTransformer mockTransformer = new LocationsCollectingTransformer(mockDepService);
+
+            List<Future<?>> futures = new ArrayList<>();
+            for (int i = 0; i < threads; i++) {
+                futures.add(executor.submit(() -> {
+                    latch.countDown();
+                    awaitUninterruptibly(latch);
+                    for (int j = 0; j < iterationsPerThread; j++) {
+                        mockTransformer.transform(null, null, null, domain, null);
+                    }
                 }));
-      }
-      for (Future<?> future : futures) {
-        future.get();
-      }
-
-      // the shared protection domain is cached, so addURL should be called only once, but the
-      // cache population race allows up to one call per racing thread
-      verify(mockDepService, atLeastOnce()).addURL(any(URL.class));
-      verify(mockDepService, atMost(threads)).addURL(any(URL.class));
-      verifyNoMoreInteractions(mockDepService);
-    } finally {
-      executor.shutdownNow();
+            }
+            for (Future<?> future : futures) {
+                future.get();
+            }
+
+            // the shared protection domain is cached, so addURL should be called only once, but the
+            // cache population race allows up to one call per racing thread
+            verify(mockDepService, atLeastOnce()).addURL(any(URL.class));
+            verify(mockDepService, atMost(threads)).addURL(any(URL.class));
+            verifyNoMoreInteractions(mockDepService);
+        } finally {
+            executor.shutdownNow();
+        }
     }
-  }
 
-  private static void awaitUninterruptibly(CountDownLatch latch) {
-    try {
-      latch.await();
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
+    private static void awaitUninterruptibly(CountDownLatch latch) {
+        try {
+            latch.await();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
     }
-  }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/endpoint/EndpointPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/endpoint/EndpointPeriodicActionTest.java
index f04bfeec3d6..e6a5077115e 100644
--- a/telemetry/src/test/java/datadog/telemetry/endpoint/EndpointPeriodicActionTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/endpoint/EndpointPeriodicActionTest.java
@@ -19,56 +19,59 @@
 
 class EndpointPeriodicActionTest {
 
-  @Test
-  void testThatEndpointsAreCapturedByThePeriodicAction() {
-    Endpoint endpoint =
-        new Endpoint().first(true).type(REST).method(GET).operation(HTTP_REQUEST).path("/test");
-    TelemetryService service = mock(TelemetryService.class);
-    EndpointCollector endpointCollector = new EndpointCollector();
-    endpointCollector.supplier(singletonList(endpoint).iterator());
-    EndpointPeriodicAction action = new EndpointPeriodicAction(endpointCollector);
-
-    action.doIteration(service);
-
-    verify(service).addEndpoint(endpoint);
-    verifyNoMoreInteractions(service);
-  }
-
-  @Test
-  void testThatEndpointsAreNotLostIfTheServiceIsAtCapacity() {
-    List<Endpoint> endpoints =
-        asList(
-            new Endpoint()
+    @Test
+    void testThatEndpointsAreCapturedByThePeriodicAction() {
+        Endpoint endpoint = new Endpoint()
                 .first(true)
                 .type(REST)
                 .method(GET)
                 .operation(HTTP_REQUEST)
-                .path("/test1"),
-            new Endpoint().type(REST).method(GET).operation(HTTP_REQUEST).path("/test2"),
-            new Endpoint().type(REST).method(GET).operation(HTTP_REQUEST).path("/test3"));
-    TelemetryService service = mock(TelemetryService.class);
-    EndpointCollector endpointCollector = new EndpointCollector();
-    endpointCollector.supplier(endpoints.iterator());
-    EndpointPeriodicAction action = new EndpointPeriodicAction(endpointCollector);
+                .path("/test");
+        TelemetryService service = mock(TelemetryService.class);
+        EndpointCollector endpointCollector = new EndpointCollector();
+        endpointCollector.supplier(singletonList(endpoint).iterator());
+        EndpointPeriodicAction action = new EndpointPeriodicAction(endpointCollector);
+
+        action.doIteration(service);
+
+        verify(service).addEndpoint(endpoint);
+        verifyNoMoreInteractions(service);
+    }
+
+    @Test
+    void testThatEndpointsAreNotLostIfTheServiceIsAtCapacity() {
+        List<Endpoint> endpoints = asList(
+                new Endpoint()
+                        .first(true)
+                        .type(REST)
+                        .method(GET)
+                        .operation(HTTP_REQUEST)
+                        .path("/test1"),
+                new Endpoint().type(REST).method(GET).operation(HTTP_REQUEST).path("/test2"),
+                new Endpoint().type(REST).method(GET).operation(HTTP_REQUEST).path("/test3"));
+        TelemetryService service = mock(TelemetryService.class);
+        EndpointCollector endpointCollector = new EndpointCollector();
+        endpointCollector.supplier(endpoints.iterator());
+        EndpointPeriodicAction action = new EndpointPeriodicAction(endpointCollector);
 
-    // first iteration: the service accepts endpoints[0] but rejects endpoints[1] (at capacity)
-    when(service.addEndpoint(endpoints.get(0))).thenReturn(true);
-    when(service.addEndpoint(endpoints.get(1))).thenReturn(false);
+        // first iteration: the service accepts endpoints[0] but rejects endpoints[1] (at capacity)
+        when(service.addEndpoint(endpoints.get(0))).thenReturn(true);
+        when(service.addEndpoint(endpoints.get(1))).thenReturn(false);
 
-    action.doIteration(service);
+        action.doIteration(service);
 
-    verify(service).addEndpoint(endpoints.get(0));
-    verify(service).addEndpoint(endpoints.get(1));
-    verifyNoMoreInteractions(service);
+        verify(service).addEndpoint(endpoints.get(0));
+        verify(service).addEndpoint(endpoints.get(1));
+        verifyNoMoreInteractions(service);
 
-    // second iteration: the rejected endpoints[1] is retried first, then endpoints[2] follows
-    when(service.addEndpoint(endpoints.get(1))).thenReturn(true);
-    when(service.addEndpoint(endpoints.get(2))).thenReturn(true);
+        // second iteration: the rejected endpoints[1] is retried first, then endpoints[2] follows
+        when(service.addEndpoint(endpoints.get(1))).thenReturn(true);
+        when(service.addEndpoint(endpoints.get(2))).thenReturn(true);
 
-    action.doIteration(service);
+        action.doIteration(service);
 
-    verify(service, times(2)).addEndpoint(endpoints.get(1));
-    verify(service).addEndpoint(endpoints.get(2));
-    verifyNoMoreInteractions(service);
-  }
+        verify(service, times(2)).addEndpoint(endpoints.get(1));
+        verify(service).addEndpoint(endpoints.get(2));
+        verifyNoMoreInteractions(service);
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/integration/IntegrationPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/integration/IntegrationPeriodicActionTest.java
index 91fc3fe4904..dfb2b05a6f2 100644
--- a/telemetry/src/test/java/datadog/telemetry/integration/IntegrationPeriodicActionTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/integration/IntegrationPeriodicActionTest.java
@@ -19,30 +19,29 @@
 
 class IntegrationPeriodicActionTest {
 
-  private final IntegrationPeriodicAction periodicAction = new IntegrationPeriodicAction();
-  private final TelemetryService telemetryService = mock(TelemetryService.class);
-
-  @Test
-  void pushIntegrationsIntoTheTelemetryService() {
-    IntegrationsCollector.get().update(Arrays.asList("web", "jdbc"), true);
-
-    periodicAction.doIteration(telemetryService);
-
-    ArgumentCaptor<Integration> captor = forClass(Integration.class);
-    verify(telemetryService, times(2)).addIntegration(captor.capture());
-    verifyNoMoreInteractions(telemetryService);
-
-    List<Integration> integrations = captor.getAllValues();
-    assertMatchingIntegration(integrations, "web");
-    assertMatchingIntegration(integrations, "jdbc");
-  }
-
-  private void assertMatchingIntegration(List<Integration> integrations, String name) {
-    List<Integration> matches =
-        integrations.stream()
-            .filter(integration -> integration.name.equals(name))
-            .collect(Collectors.toList());
-    assertEquals(1, matches.size(), "expected exactly one match for " + name);
-    assertTrue(matches.get(0).enabled);
-  }
+    private final IntegrationPeriodicAction periodicAction = new IntegrationPeriodicAction();
+    private final TelemetryService telemetryService = mock(TelemetryService.class);
+
+    @Test
+    void pushIntegrationsIntoTheTelemetryService() {
+        IntegrationsCollector.get().update(Arrays.asList("web", "jdbc"), true);
+
+        periodicAction.doIteration(telemetryService);
+
+        ArgumentCaptor<Integration> captor = forClass(Integration.class);
+        verify(telemetryService, times(2)).addIntegration(captor.capture());
+        verifyNoMoreInteractions(telemetryService);
+
+        List<Integration> integrations = captor.getAllValues();
+        assertMatchingIntegration(integrations, "web");
+        assertMatchingIntegration(integrations, "jdbc");
+    }
+
+    private void assertMatchingIntegration(List<Integration> integrations, String name) {
+        List<Integration> matches = integrations.stream()
+                .filter(integration -> integration.name.equals(name))
+                .collect(Collectors.toList());
+        assertEquals(1, matches.size(), "expected exactly one match for " + name);
+        assertTrue(matches.get(0).enabled);
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/log/LogPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/log/LogPeriodicActionTest.java
index 8104a5d679e..b5bf1b4ff86 100644
--- a/telemetry/src/test/java/datadog/telemetry/log/LogPeriodicActionTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/log/LogPeriodicActionTest.java
@@ -20,293 +20,277 @@
 @WithConfig(key = "instrumentation.telemetry.debug", value = "true")
 class LogPeriodicActionTest {
 
-  private final LogPeriodicAction periodicAction = new LogPeriodicAction();
-  private final TelemetryService telemetryService = mock(TelemetryService.class);
-
-  @BeforeEach
-  void setup() {
-    LogCollector.get().drain();
-  }
-
-  @AfterEach
-  void cleanup() {
-    LogCollector.get().drain();
-  }
-
-  @Test
-  void logWithTags() {
-    LogCollector.get().addLogMessage("ERROR", "test", null, "tag1:value1,tag2:value2");
-    periodicAction.doIteration(telemetryService);
-
-    LogMessage logMessage = captureSingleLogMessage();
-    assertEquals(ERROR, logMessage.getLevel());
-    assertEquals("test", logMessage.getMessage());
-    assertEquals("tag1:value1,tag2:value2", logMessage.getTags());
-  }
-
-  @Test
-  void logWithDatadogThrowable() {
-    Throwable throwable = throwable("exception", stacktrace(frame("datadog.MyClass")));
-
-    LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable);
-    periodicAction.doIteration(telemetryService);
-
-    LogMessage logMessage = captureSingleLogMessage();
-    assertEquals("test", logMessage.getMessage());
-    assertEquals(
-        MutableException.class.getCanonicalName() + "\n" + "  at datadog.MyClass.method(file:42)\n",
-        logMessage.getStackTrace());
-  }
-
-  @Test
-  void logWithNonDatadogThrowable() {
-    Throwable throwable = throwable("exception", stacktrace(frame("java.MyClass")));
-
-    LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable);
-    periodicAction.doIteration(telemetryService);
-
-    LogMessage logMessage = captureSingleLogMessage();
-    assertEquals("test", logMessage.getMessage());
-    assertEquals(
-        MutableException.class.getCanonicalName() + "\n" + "  at java.MyClass.method(file:42)\n",
-        logMessage.getStackTrace());
-  }
-
-  @Test
-  void logWithDatadogThrowableWithoutStacktrace() {
-    Throwable throwable = throwable("exception", new StackTraceElement[0]);
-
-    LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable);
-    periodicAction.doIteration(telemetryService);
-
-    LogMessage logMessage = captureSingleLogMessage();
-    assertEquals("test", logMessage.getMessage());
-    assertEquals(MutableException.class.getCanonicalName() + "\n", logMessage.getStackTrace());
-  }
-
-  @Test
-  void deduplicationOfLogMessagesWithoutException() {
-    LogCollector.get().addLogMessage(ERROR.toString(), "test", null);
-    LogCollector.get().addLogMessage(ERROR.toString(), "test", null);
-    periodicAction.doIteration(telemetryService);
-
-    LogMessage logMessage = captureSingleLogMessage();
-    assertEquals("test", logMessage.getMessage());
-    assertEquals(2, logMessage.getCount());
-  }
-
-  @Test
-  void deduplicationOfLogMessagesWithException() {
-    Throwable throwable1 = throwable("exception", stacktrace(frame("datadog.MyClass")));
-    Throwable throwable2 = throwable("exception", stacktrace(frame("datadog.MyClass")));
-
-    LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable1);
-    LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable2);
-    periodicAction.doIteration(telemetryService);
-
-    LogMessage logMessage = captureSingleLogMessage();
-    assertEquals("test", logMessage.getMessage());
-    assertNotNull(logMessage.getStackTrace());
-    assertEquals(2, logMessage.getCount());
-  }
-
-  @Test
-  void stacktraceRedaction() {
-    Throwable throwable =
-        throwable(
-            "exception",
-            stacktrace(
-                frame(""),
-                frame("java.MyClass"),
-                frame("mycorp.MyClass"),
-                frame("datadog.MyClass"),
-                frame("mycorp.MyClass"),
-                frame("mycorp.MyClass")));
-
-    LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable);
-    periodicAction.doIteration(telemetryService);
-
-    LogMessage logMessage = captureSingleLogMessage();
-    assertEquals("test", logMessage.getMessage());
-    assertEquals(
-        MutableException.class.getCanonicalName()
-            + "\n"
-            + "  at (redacted)\n"
-            + "  at java.MyClass.method(file:42)\n"
-            + "  at (redacted)\n"
-            + "  at datadog.MyClass.method(file:42)\n"
-            + "  at (redacted: 2 frames)\n",
-        logMessage.getStackTrace());
-  }
-
-  @Test
-  void stacktraceWithMultipleFramesAndCommonFrames() {
-    Throwable cause =
-        throwable(
-            "exception 2",
-            stacktrace(
-                frame("java.MyClass"),
-                frame("mycorp.MyClass"),
-                frame("datadog.MyClass"),
-                frame("mycorp.MyClass"),
-                frame("mycorp.MyClass")));
-    Throwable throwable =
-        throwable(
-            "exception",
-            stacktrace(
-                frame(""),
-                frame("datadog.MyClass"),
-                frame("mycorp.MyClass"),
-                frame("mycorp.MyClass")),
-            cause);
-
-    LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable);
-    periodicAction.doIteration(telemetryService);
-
-    LogMessage logMessage = captureSingleLogMessage();
-    assertEquals("test", logMessage.getMessage());
-    assertEquals(
-        MutableException.class.getCanonicalName()
-            + "\n"
-            + "  at (redacted)\n"
-            + "  at datadog.MyClass.method(file:42)\n"
-            + "  at (redacted: 2 frames)\n"
-            + "Caused by: "
-            + MutableException.class.getCanonicalName()
-            + "\n"
-            + "  at java.MyClass.method(file:42)\n"
-            + "  at (redacted)\n"
-            + "  ... 3 more\n",
-        logMessage.getStackTrace());
-  }
-
-  @Test
-  void stacktraceWithCommonFramesOnly() {
-    Throwable innerCause =
-        throwable(
-            "exception 3",
-            stacktrace(
-                frame("java.MyClass"),
-                frame("mycorp.MyClass"),
-                frame("datadog.MyClass"),
-                frame("mycorp.MyClass"),
-                frame("mycorp.MyClass")));
-    Throwable cause =
-        throwable(
-            "exception 2",
-            stacktrace(
-                frame("java.MyClass"),
-                frame("mycorp.MyClass"),
-                frame("datadog.MyClass"),
-                frame("mycorp.MyClass"),
-                frame("mycorp.MyClass")),
-            innerCause);
-    Throwable throwable =
-        throwable(
-            "exception",
-            stacktrace(
-                frame("java.MyClass"),
-                frame("mycorp.MyClass"),
-                frame("datadog.MyClass"),
-                frame("mycorp.MyClass"),
-                frame("mycorp.MyClass")),
-            cause);
-
-    LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable);
-    periodicAction.doIteration(telemetryService);
-
-    LogMessage logMessage = captureSingleLogMessage();
-    assertEquals("test", logMessage.getMessage());
-    assertEquals(
-        MutableException.class.getCanonicalName()
-            + "\n"
-            + "  at java.MyClass.method(file:42)\n"
-            + "  at (redacted)\n"
-            + "  at datadog.MyClass.method(file:42)\n"
-            + "  at (redacted: 2 frames)\n"
-            + "Caused by: "
-            + MutableException.class.getCanonicalName()
-            + "\n"
-            + "  ... 5 more\n"
-            + "Caused by: "
-            + MutableException.class.getCanonicalName()
-            + "\n"
-            + "  ... 5 more\n",
-        logMessage.getStackTrace());
-  }
-
-  @Test
-  void stacktraceWithoutCommonFrames() {
-    Throwable cause =
-        throwable(
-            "exception 2",
-            stacktrace(
-                frame("java.MyClass"),
-                frame("org.datadog.Test"),
-                frame("io.DataTest"),
-                frame("dd.MainClass")));
-    Throwable throwable =
-        throwable(
-            "exception",
-            stacktrace(
-                frame("java.MyClass"),
-                frame("mycorp.MyClass"),
-                frame("datadog.MyClass"),
-                frame("mycorp.MyClass"),
-                frame("mycorp.MyClass")),
-            cause);
-
-    LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable);
-    periodicAction.doIteration(telemetryService);
-
-    LogMessage logMessage = captureSingleLogMessage();
-    assertEquals("test", logMessage.getMessage());
-    assertEquals(
-        MutableException.class.getCanonicalName()
-            + "\n"
-            + "  at java.MyClass.method(file:42)\n"
-            + "  at (redacted)\n"
-            + "  at datadog.MyClass.method(file:42)\n"
-            + "  at (redacted: 2 frames)\n"
-            + "Caused by: "
-            + MutableException.class.getCanonicalName()
-            + "\n"
-            + "  at java.MyClass.method(file:42)\n"
-            + "  at (redacted: 3 frames)\n",
-        logMessage.getStackTrace());
-  }
-
-  private LogMessage captureSingleLogMessage() {
-    ArgumentCaptor<LogMessage> captor = ArgumentCaptor.forClass(LogMessage.class);
-    verify(telemetryService, times(1)).addLogMessage(captor.capture());
-    verifyNoMoreInteractions(telemetryService);
-    return captor.getValue();
-  }
-
-  private static Throwable throwable(String message, StackTraceElement[] stacktrace) {
-    MutableException exception = new MutableException(message, null);
-    exception.setStackTrace(stacktrace);
-    return exception;
-  }
-
-  private static Throwable throwable(
-      String message, StackTraceElement[] stacktrace, Throwable cause) {
-    MutableException exception = new MutableException(message, cause);
-    exception.setStackTrace(stacktrace);
-    return exception;
-  }
-
-  private static StackTraceElement[] stacktrace(StackTraceElement... frames) {
-    return frames;
-  }
-
-  private static StackTraceElement frame(String className) {
-    return new StackTraceElement(className, "method", "file", 42);
-  }
-
-  private static final class MutableException extends Exception {
-    MutableException(String message, Throwable cause) {
-      super(message, cause, true, true);
+    private final LogPeriodicAction periodicAction = new LogPeriodicAction();
+    private final TelemetryService telemetryService = mock(TelemetryService.class);
+
+    @BeforeEach
+    void setup() {
+        LogCollector.get().drain();
+    }
+
+    @AfterEach
+    void cleanup() {
+        LogCollector.get().drain();
+    }
+
+    @Test
+    void logWithTags() {
+        LogCollector.get().addLogMessage("ERROR", "test", null, "tag1:value1,tag2:value2");
+        periodicAction.doIteration(telemetryService);
+
+        LogMessage logMessage = captureSingleLogMessage();
+        assertEquals(ERROR, logMessage.getLevel());
+        assertEquals("test", logMessage.getMessage());
+        assertEquals("tag1:value1,tag2:value2", logMessage.getTags());
+    }
+
+    @Test
+    void logWithDatadogThrowable() {
+        Throwable throwable = throwable("exception", stacktrace(frame("datadog.MyClass")));
+
+        LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable);
+        periodicAction.doIteration(telemetryService);
+
+        LogMessage logMessage = captureSingleLogMessage();
+        assertEquals("test", logMessage.getMessage());
+        assertEquals(
+                MutableException.class.getCanonicalName() + "\n" + "  at datadog.MyClass.method(file:42)\n",
+                logMessage.getStackTrace());
+    }
+
+    @Test
+    void logWithNonDatadogThrowable() {
+        Throwable throwable = throwable("exception", stacktrace(frame("java.MyClass")));
+
+        LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable);
+        periodicAction.doIteration(telemetryService);
+
+        LogMessage logMessage = captureSingleLogMessage();
+        assertEquals("test", logMessage.getMessage());
+        assertEquals(
+                MutableException.class.getCanonicalName() + "\n" + "  at java.MyClass.method(file:42)\n",
+                logMessage.getStackTrace());
+    }
+
+    @Test
+    void logWithDatadogThrowableWithoutStacktrace() {
+        Throwable throwable = throwable("exception", new StackTraceElement[0]);
+
+        LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable);
+        periodicAction.doIteration(telemetryService);
+
+        LogMessage logMessage = captureSingleLogMessage();
+        assertEquals("test", logMessage.getMessage());
+        assertEquals(MutableException.class.getCanonicalName() + "\n", logMessage.getStackTrace());
+    }
+
+    @Test
+    void deduplicationOfLogMessagesWithoutException() {
+        LogCollector.get().addLogMessage(ERROR.toString(), "test", null);
+        LogCollector.get().addLogMessage(ERROR.toString(), "test", null);
+        periodicAction.doIteration(telemetryService);
+
+        LogMessage logMessage = captureSingleLogMessage();
+        assertEquals("test", logMessage.getMessage());
+        assertEquals(2, logMessage.getCount());
+    }
+
+    @Test
+    void deduplicationOfLogMessagesWithException() {
+        Throwable throwable1 = throwable("exception", stacktrace(frame("datadog.MyClass")));
+        Throwable throwable2 = throwable("exception", stacktrace(frame("datadog.MyClass")));
+
+        LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable1);
+        LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable2);
+        periodicAction.doIteration(telemetryService);
+
+        LogMessage logMessage = captureSingleLogMessage();
+        assertEquals("test", logMessage.getMessage());
+        assertNotNull(logMessage.getStackTrace());
+        assertEquals(2, logMessage.getCount());
+    }
+
+    @Test
+    void stacktraceRedaction() {
+        Throwable throwable = throwable(
+                "exception",
+                stacktrace(
+                        frame(""),
+                        frame("java.MyClass"),
+                        frame("mycorp.MyClass"),
+                        frame("datadog.MyClass"),
+                        frame("mycorp.MyClass"),
+                        frame("mycorp.MyClass")));
+
+        LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable);
+        periodicAction.doIteration(telemetryService);
+
+        LogMessage logMessage = captureSingleLogMessage();
+        assertEquals("test", logMessage.getMessage());
+        assertEquals(
+                MutableException.class.getCanonicalName()
+                        + "\n"
+                        + "  at (redacted)\n"
+                        + "  at java.MyClass.method(file:42)\n"
+                        + "  at (redacted)\n"
+                        + "  at datadog.MyClass.method(file:42)\n"
+                        + "  at (redacted: 2 frames)\n",
+                logMessage.getStackTrace());
+    }
+
+    @Test
+    void stacktraceWithMultipleFramesAndCommonFrames() {
+        Throwable cause = throwable(
+                "exception 2",
+                stacktrace(
+                        frame("java.MyClass"),
+                        frame("mycorp.MyClass"),
+                        frame("datadog.MyClass"),
+                        frame("mycorp.MyClass"),
+                        frame("mycorp.MyClass")));
+        Throwable throwable = throwable(
+                "exception",
+                stacktrace(frame(""), frame("datadog.MyClass"), frame("mycorp.MyClass"), frame("mycorp.MyClass")),
+                cause);
+
+        LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable);
+        periodicAction.doIteration(telemetryService);
+
+        LogMessage logMessage = captureSingleLogMessage();
+        assertEquals("test", logMessage.getMessage());
+        assertEquals(
+                MutableException.class.getCanonicalName()
+                        + "\n"
+                        + "  at (redacted)\n"
+                        + "  at datadog.MyClass.method(file:42)\n"
+                        + "  at (redacted: 2 frames)\n"
+                        + "Caused by: "
+                        + MutableException.class.getCanonicalName()
+                        + "\n"
+                        + "  at java.MyClass.method(file:42)\n"
+                        + "  at (redacted)\n"
+                        + "  ... 3 more\n",
+                logMessage.getStackTrace());
+    }
+
+    @Test
+    void stacktraceWithCommonFramesOnly() {
+        Throwable innerCause = throwable(
+                "exception 3",
+                stacktrace(
+                        frame("java.MyClass"),
+                        frame("mycorp.MyClass"),
+                        frame("datadog.MyClass"),
+                        frame("mycorp.MyClass"),
+                        frame("mycorp.MyClass")));
+        Throwable cause = throwable(
+                "exception 2",
+                stacktrace(
+                        frame("java.MyClass"),
+                        frame("mycorp.MyClass"),
+                        frame("datadog.MyClass"),
+                        frame("mycorp.MyClass"),
+                        frame("mycorp.MyClass")),
+                innerCause);
+        Throwable throwable = throwable(
+                "exception",
+                stacktrace(
+                        frame("java.MyClass"),
+                        frame("mycorp.MyClass"),
+                        frame("datadog.MyClass"),
+                        frame("mycorp.MyClass"),
+                        frame("mycorp.MyClass")),
+                cause);
+
+        LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable);
+        periodicAction.doIteration(telemetryService);
+
+        LogMessage logMessage = captureSingleLogMessage();
+        assertEquals("test", logMessage.getMessage());
+        assertEquals(
+                MutableException.class.getCanonicalName()
+                        + "\n"
+                        + "  at java.MyClass.method(file:42)\n"
+                        + "  at (redacted)\n"
+                        + "  at datadog.MyClass.method(file:42)\n"
+                        + "  at (redacted: 2 frames)\n"
+                        + "Caused by: "
+                        + MutableException.class.getCanonicalName()
+                        + "\n"
+                        + "  ... 5 more\n"
+                        + "Caused by: "
+                        + MutableException.class.getCanonicalName()
+                        + "\n"
+                        + "  ... 5 more\n",
+                logMessage.getStackTrace());
+    }
+
+    @Test
+    void stacktraceWithoutCommonFrames() {
+        Throwable cause = throwable(
+                "exception 2",
+                stacktrace(
+                        frame("java.MyClass"), frame("org.datadog.Test"), frame("io.DataTest"), frame("dd.MainClass")));
+        Throwable throwable = throwable(
+                "exception",
+                stacktrace(
+                        frame("java.MyClass"),
+                        frame("mycorp.MyClass"),
+                        frame("datadog.MyClass"),
+                        frame("mycorp.MyClass"),
+                        frame("mycorp.MyClass")),
+                cause);
+
+        LogCollector.get().addLogMessage(ERROR.toString(), "test", throwable);
+        periodicAction.doIteration(telemetryService);
+
+        LogMessage logMessage = captureSingleLogMessage();
+        assertEquals("test", logMessage.getMessage());
+        assertEquals(
+                MutableException.class.getCanonicalName()
+                        + "\n"
+                        + "  at java.MyClass.method(file:42)\n"
+                        + "  at (redacted)\n"
+                        + "  at datadog.MyClass.method(file:42)\n"
+                        + "  at (redacted: 2 frames)\n"
+                        + "Caused by: "
+                        + MutableException.class.getCanonicalName()
+                        + "\n"
+                        + "  at java.MyClass.method(file:42)\n"
+                        + "  at (redacted: 3 frames)\n",
+                logMessage.getStackTrace());
+    }
+
+    private LogMessage captureSingleLogMessage() {
+        ArgumentCaptor<LogMessage> captor = ArgumentCaptor.forClass(LogMessage.class);
+        verify(telemetryService, times(1)).addLogMessage(captor.capture());
+        verifyNoMoreInteractions(telemetryService);
+        return captor.getValue();
+    }
+
+    private static Throwable throwable(String message, StackTraceElement[] stacktrace) {
+        MutableException exception = new MutableException(message, null);
+        exception.setStackTrace(stacktrace);
+        return exception;
+    }
+
+    private static Throwable throwable(String message, StackTraceElement[] stacktrace, Throwable cause) {
+        MutableException exception = new MutableException(message, cause);
+        exception.setStackTrace(stacktrace);
+        return exception;
+    }
+
+    private static StackTraceElement[] stacktrace(StackTraceElement... frames) {
+        return frames;
+    }
+
+    private static StackTraceElement frame(String className) {
+        return new StackTraceElement(className, "method", "file", 42);
+    }
+
+    private static final class MutableException extends Exception {
+        MutableException(String message, Throwable cause) {
+            super(message, cause, true, true);
+        }
     }
-  }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/metric/ConfigInversionMetricPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/metric/ConfigInversionMetricPeriodicActionTest.java
index 56a2ec80d52..18ae5501189 100644
--- a/telemetry/src/test/java/datadog/telemetry/metric/ConfigInversionMetricPeriodicActionTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/metric/ConfigInversionMetricPeriodicActionTest.java
@@ -16,27 +16,25 @@
 
 class ConfigInversionMetricPeriodicActionTest {
 
-  private final TelemetryService telemetryService = mock(TelemetryService.class);
-  private final ConfigInversionMetricPeriodicAction action =
-      new ConfigInversionMetricPeriodicAction();
-  private final ConfigInversionMetricCollectorImpl collector =
-      ConfigInversionMetricCollectorImpl.getInstance();
+    private final TelemetryService telemetryService = mock(TelemetryService.class);
+    private final ConfigInversionMetricPeriodicAction action = new ConfigInversionMetricPeriodicAction();
+    private final ConfigInversionMetricCollectorImpl collector = ConfigInversionMetricCollectorImpl.getInstance();
 
-  @Test
-  void testUndocumentedEnvVarMetric() {
-    collector.setUndocumentedEnvVarMetric("DD_ENV_VAR");
-    collector.prepareMetrics();
-    action.doIteration(telemetryService);
+    @Test
+    void testUndocumentedEnvVarMetric() {
+        collector.setUndocumentedEnvVarMetric("DD_ENV_VAR");
+        collector.prepareMetrics();
+        action.doIteration(telemetryService);
 
-    ArgumentCaptor<Metric> captor = forClass(Metric.class);
-    verify(telemetryService, times(1)).addMetric(captor.capture());
-    verifyNoMoreInteractions(telemetryService);
+        ArgumentCaptor<Metric> captor = forClass(Metric.class);
+        verify(telemetryService, times(1)).addMetric(captor.capture());
+        verifyNoMoreInteractions(telemetryService);
 
-    Metric metric = captor.getValue();
-    assertEquals("tracers", metric.getNamespace());
-    assertEquals("untracked.config.detected", metric.getMetric());
-    assertEquals(1L, metric.getPoints().get(0).get(1).longValue());
-    assertEquals(Arrays.asList("config_name:DD_ENV_VAR"), metric.getTags());
-    assertEquals(Metric.TypeEnum.COUNT, metric.getType());
-  }
+        Metric metric = captor.getValue();
+        assertEquals("tracers", metric.getNamespace());
+        assertEquals("untracked.config.detected", metric.getMetric());
+        assertEquals(1L, metric.getPoints().get(0).get(1).longValue());
+        assertEquals(Arrays.asList("config_name:DD_ENV_VAR"), metric.getTags());
+        assertEquals(Metric.TypeEnum.COUNT, metric.getType());
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/metric/CoreMetricsPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/metric/CoreMetricsPeriodicActionTest.java
index fff8fc144c7..a620934adb9 100644
--- a/telemetry/src/test/java/datadog/telemetry/metric/CoreMetricsPeriodicActionTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/metric/CoreMetricsPeriodicActionTest.java
@@ -19,138 +19,135 @@
 
 class CoreMetricsPeriodicActionTest {
 
-  private final TelemetryService telemetryService = mock(TelemetryService.class);
-  private final CoreMetricsPeriodicAction action = new CoreMetricsPeriodicAction();
-  private final SpanMetricRegistry spanMetricRegistry = SpanMetricRegistry.getInstance();
-
-  @Test
-  void testSpanMetricsWithMultipleOccurrenceEvents() {
-    SpanMetrics instr1SpanMetric = spanMetricRegistry.get("instr-1");
-    SpanMetrics instr2SpanMetric = spanMetricRegistry.get("instr-2");
-
-    instr1SpanMetric.onSpanCreated();
-    instr2SpanMetric.onSpanCreated();
-    instr1SpanMetric.onSpanCreated();
-    instr2SpanMetric.onSpanCreated();
-    instr2SpanMetric.onSpanCreated();
-    instr2SpanMetric.onSpanFinished();
-    instr2SpanMetric.onSpanFinished();
-    instr2SpanMetric.onSpanFinished();
-    instr2SpanMetric.onSpanFinished();
-
-    action.collector().prepareMetrics();
-    action.doIteration(telemetryService);
-
-    ArgumentCaptor<Metric> captor = forClass(Metric.class);
-    verify(telemetryService, times(3)).addMetric(captor.capture());
-    verifyNoMoreInteractions(telemetryService);
-
-    List<Metric> metrics = captor.getAllValues();
-    assertMetric(metrics, "spans_created", "instr-1", 2);
-    assertMetric(metrics, "spans_created", "instr-2", 3);
-    assertMetric(metrics, "spans_finished", "instr-2", 4);
-  }
-
-  @Test
-  void testSpanMetricsWithInterleavedEvents() {
-    SpanMetrics instr1SpanMetric = spanMetricRegistry.get("instr-1");
-    SpanMetrics instr2SpanMetric = spanMetricRegistry.get("instr-2");
-    SpanMetrics instr3SpanMetric = spanMetricRegistry.get("instr-3");
-    SpanMetrics instrASpanMetric = spanMetricRegistry.get("instr-a");
-    SpanMetrics instrBSpanMetric = spanMetricRegistry.get("instr-b");
-
-    instr1SpanMetric.onSpanCreated();
-    instr2SpanMetric.onSpanCreated();
-    instr3SpanMetric.onSpanCreated();
-    instr3SpanMetric.onSpanFinished();
-    instrASpanMetric.onSpanCreated();
-    instrBSpanMetric.onSpanCreated();
-    instrBSpanMetric.onSpanFinished();
-    instr2SpanMetric.onSpanFinished();
-    instrASpanMetric.onSpanFinished();
-    instr1SpanMetric.onSpanFinished();
-
-    action.collector().prepareMetrics();
-    action.doIteration(telemetryService);
-
-    ArgumentCaptor<Metric> captor = forClass(Metric.class);
-    verify(telemetryService, times(10)).addMetric(captor.capture());
-    verifyNoMoreInteractions(telemetryService);
-
-    List<Metric> metrics = captor.getAllValues();
-    assertMetric(metrics, "spans_created", "instr-1", 1);
-    assertMetric(metrics, "spans_created", "instr-2", 1);
-    assertMetric(metrics, "spans_created", "instr-3", 1);
-    assertMetric(metrics, "spans_finished", "instr-3", 1);
-    assertMetric(metrics, "spans_created", "instr-a", 1);
-    assertMetric(metrics, "spans_created", "instr-b", 1);
-    assertMetric(metrics, "spans_finished", "instr-b", 1);
-    assertMetric(metrics, "spans_finished", "instr-2", 1);
-    assertMetric(metrics, "spans_finished", "instr-a", 1);
-    assertMetric(metrics, "spans_finished", "instr-1", 1);
-  }
-
-  @Test
-  void testSpanMetrics() {
-    SpanMetrics instr1SpanMetric = spanMetricRegistry.get("instr-1");
-    SpanMetrics instr2SpanMetric = spanMetricRegistry.get("instr-2");
-    SpanMetrics instr3SpanMetric = spanMetricRegistry.get("instr-3");
-    SpanMetrics instrASpanMetric = spanMetricRegistry.get("instr-a");
-    SpanMetrics instrBSpanMetric = spanMetricRegistry.get("instr-b");
-
-    instr1SpanMetric.onSpanCreated();
-    instr2SpanMetric.onSpanCreated();
-    instr3SpanMetric.onSpanCreated();
-    instr3SpanMetric.onSpanFinished();
-    instrASpanMetric.onSpanCreated();
-    instrBSpanMetric.onSpanCreated();
-    instrBSpanMetric.onSpanFinished();
-    instr2SpanMetric.onSpanFinished();
-    instrASpanMetric.onSpanFinished();
-    instr1SpanMetric.onSpanFinished();
-
-    action.collector().prepareMetrics();
-    action.doIteration(telemetryService);
-
-    ArgumentCaptor<Metric> captor = forClass(Metric.class);
-    verify(telemetryService, times(10)).addMetric(captor.capture());
-    verifyNoMoreInteractions(telemetryService);
-
-    List<Metric> metrics = captor.getAllValues();
-    assertMetric(metrics, "spans_created", "instr-1", 1);
-    assertMetric(metrics, "spans_created", "instr-2", 1);
-    assertMetric(metrics, "spans_created", "instr-3", 1);
-    assertMetric(metrics, "spans_finished", "instr-3", 1);
-    assertMetric(metrics, "spans_created", "instr-a", 1);
-    assertMetric(metrics, "spans_created", "instr-b", 1);
-    assertMetric(metrics, "spans_finished", "instr-b", 1);
-    assertMetric(metrics, "spans_finished", "instr-2", 1);
-    assertMetric(metrics, "spans_finished", "instr-a", 1);
-    assertMetric(metrics, "spans_finished", "instr-1", 1);
-  }
-
-  /**
-   * MetricPeriodicAction aggregates metrics through a HashMap, so the emission order is not
-   * guaranteed; match each expected metric by its metric name and instrumentation tag rather than
-   * by capture position.
-   */
-  private void assertMetric(
-      List<Metric> metrics, String metricName, String instrumentationName, long count) {
-    List<String> expectedTags = Arrays.asList("integration_name:" + instrumentationName);
-    List<Metric> matches =
-        metrics.stream()
-            .filter(metric -> metric.getMetric().equals(metricName))
-            .filter(metric -> expectedTags.equals(metric.getTags()))
-            .collect(Collectors.toList());
-    assertEquals(
-        1, matches.size(), "expected exactly one match for " + metricName + " " + expectedTags);
-
-    Metric metric = matches.get(0);
-    assertEquals("tracers", metric.getNamespace());
-    assertEquals(true, metric.getCommon());
-    assertEquals(1, metric.getPoints().size());
-    assertEquals(2, metric.getPoints().get(0).size());
-    assertEquals(count, metric.getPoints().get(0).get(1).longValue());
-    assertEquals(Metric.TypeEnum.COUNT, metric.getType());
-  }
+    private final TelemetryService telemetryService = mock(TelemetryService.class);
+    private final CoreMetricsPeriodicAction action = new CoreMetricsPeriodicAction();
+    private final SpanMetricRegistry spanMetricRegistry = SpanMetricRegistry.getInstance();
+
+    @Test
+    void testSpanMetricsWithMultipleOccurrenceEvents() {
+        SpanMetrics instr1SpanMetric = spanMetricRegistry.get("instr-1");
+        SpanMetrics instr2SpanMetric = spanMetricRegistry.get("instr-2");
+
+        instr1SpanMetric.onSpanCreated();
+        instr2SpanMetric.onSpanCreated();
+        instr1SpanMetric.onSpanCreated();
+        instr2SpanMetric.onSpanCreated();
+        instr2SpanMetric.onSpanCreated();
+        instr2SpanMetric.onSpanFinished();
+        instr2SpanMetric.onSpanFinished();
+        instr2SpanMetric.onSpanFinished();
+        instr2SpanMetric.onSpanFinished();
+
+        action.collector().prepareMetrics();
+        action.doIteration(telemetryService);
+
+        ArgumentCaptor<Metric> captor = forClass(Metric.class);
+        verify(telemetryService, times(3)).addMetric(captor.capture());
+        verifyNoMoreInteractions(telemetryService);
+
+        List<Metric> metrics = captor.getAllValues();
+        assertMetric(metrics, "spans_created", "instr-1", 2);
+        assertMetric(metrics, "spans_created", "instr-2", 3);
+        assertMetric(metrics, "spans_finished", "instr-2", 4);
+    }
+
+    @Test
+    void testSpanMetricsWithInterleavedEvents() {
+        SpanMetrics instr1SpanMetric = spanMetricRegistry.get("instr-1");
+        SpanMetrics instr2SpanMetric = spanMetricRegistry.get("instr-2");
+        SpanMetrics instr3SpanMetric = spanMetricRegistry.get("instr-3");
+        SpanMetrics instrASpanMetric = spanMetricRegistry.get("instr-a");
+        SpanMetrics instrBSpanMetric = spanMetricRegistry.get("instr-b");
+
+        instr1SpanMetric.onSpanCreated();
+        instr2SpanMetric.onSpanCreated();
+        instr3SpanMetric.onSpanCreated();
+        instr3SpanMetric.onSpanFinished();
+        instrASpanMetric.onSpanCreated();
+        instrBSpanMetric.onSpanCreated();
+        instrBSpanMetric.onSpanFinished();
+        instr2SpanMetric.onSpanFinished();
+        instrASpanMetric.onSpanFinished();
+        instr1SpanMetric.onSpanFinished();
+
+        action.collector().prepareMetrics();
+        action.doIteration(telemetryService);
+
+        ArgumentCaptor<Metric> captor = forClass(Metric.class);
+        verify(telemetryService, times(10)).addMetric(captor.capture());
+        verifyNoMoreInteractions(telemetryService);
+
+        List<Metric> metrics = captor.getAllValues();
+        assertMetric(metrics, "spans_created", "instr-1", 1);
+        assertMetric(metrics, "spans_created", "instr-2", 1);
+        assertMetric(metrics, "spans_created", "instr-3", 1);
+        assertMetric(metrics, "spans_finished", "instr-3", 1);
+        assertMetric(metrics, "spans_created", "instr-a", 1);
+        assertMetric(metrics, "spans_created", "instr-b", 1);
+        assertMetric(metrics, "spans_finished", "instr-b", 1);
+        assertMetric(metrics, "spans_finished", "instr-2", 1);
+        assertMetric(metrics, "spans_finished", "instr-a", 1);
+        assertMetric(metrics, "spans_finished", "instr-1", 1);
+    }
+
+    @Test
+    void testSpanMetrics() {
+        SpanMetrics instr1SpanMetric = spanMetricRegistry.get("instr-1");
+        SpanMetrics instr2SpanMetric = spanMetricRegistry.get("instr-2");
+        SpanMetrics instr3SpanMetric = spanMetricRegistry.get("instr-3");
+        SpanMetrics instrASpanMetric = spanMetricRegistry.get("instr-a");
+        SpanMetrics instrBSpanMetric = spanMetricRegistry.get("instr-b");
+
+        instr1SpanMetric.onSpanCreated();
+        instr2SpanMetric.onSpanCreated();
+        instr3SpanMetric.onSpanCreated();
+        instr3SpanMetric.onSpanFinished();
+        instrASpanMetric.onSpanCreated();
+        instrBSpanMetric.onSpanCreated();
+        instrBSpanMetric.onSpanFinished();
+        instr2SpanMetric.onSpanFinished();
+        instrASpanMetric.onSpanFinished();
+        instr1SpanMetric.onSpanFinished();
+
+        action.collector().prepareMetrics();
+        action.doIteration(telemetryService);
+
+        ArgumentCaptor<Metric> captor = forClass(Metric.class);
+        verify(telemetryService, times(10)).addMetric(captor.capture());
+        verifyNoMoreInteractions(telemetryService);
+
+        List<Metric> metrics = captor.getAllValues();
+        assertMetric(metrics, "spans_created", "instr-1", 1);
+        assertMetric(metrics, "spans_created", "instr-2", 1);
+        assertMetric(metrics, "spans_created", "instr-3", 1);
+        assertMetric(metrics, "spans_finished", "instr-3", 1);
+        assertMetric(metrics, "spans_created", "instr-a", 1);
+        assertMetric(metrics, "spans_created", "instr-b", 1);
+        assertMetric(metrics, "spans_finished", "instr-b", 1);
+        assertMetric(metrics, "spans_finished", "instr-2", 1);
+        assertMetric(metrics, "spans_finished", "instr-a", 1);
+        assertMetric(metrics, "spans_finished", "instr-1", 1);
+    }
+
+    /**
+     * MetricPeriodicAction aggregates metrics through a HashMap, so the emission order is not
+     * guaranteed; match each expected metric by its metric name and instrumentation tag rather than
+     * by capture position.
+     */
+    private void assertMetric(List<Metric> metrics, String metricName, String instrumentationName, long count) {
+        List<String> expectedTags = Arrays.asList("integration_name:" + instrumentationName);
+        List<Metric> matches = metrics.stream()
+                .filter(metric -> metric.getMetric().equals(metricName))
+                .filter(metric -> expectedTags.equals(metric.getTags()))
+                .collect(Collectors.toList());
+        assertEquals(1, matches.size(), "expected exactly one match for " + metricName + " " + expectedTags);
+
+        Metric metric = matches.get(0);
+        assertEquals("tracers", metric.getNamespace());
+        assertEquals(true, metric.getCommon());
+        assertEquals(1, metric.getPoints().size());
+        assertEquals(2, metric.getPoints().get(0).size());
+        assertEquals(count, metric.getPoints().get(0).get(1).longValue());
+        assertEquals(Metric.TypeEnum.COUNT, metric.getType());
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/metric/IastMetricPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/metric/IastMetricPeriodicActionTest.java
index 2189035dd78..55254a27910 100644
--- a/telemetry/src/test/java/datadog/telemetry/metric/IastMetricPeriodicActionTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/metric/IastMetricPeriodicActionTest.java
@@ -22,70 +22,70 @@
 
 class IastMetricPeriodicActionTest {
 
-  private static final IastMetricCollector ORIGINAL_COLLECTOR = IastMetricCollector.get();
-
-  private final IastMetricPeriodicAction action = new IastMetricPeriodicAction();
-  private final TelemetryService telemetryService = mock(TelemetryService.class);
-
-  @BeforeEach
-  void setUp() {
-    IastMetricCollector.register(new IastMetricCollector());
-  }
-
-  @AfterEach
-  void tearDown() {
-    IastMetricCollector.register(ORIGINAL_COLLECTOR);
-  }
-
-  @Test
-  void testMetric() {
-    IastMetric iastMetric = IastMetric.EXECUTED_TAINTED;
-    int value = 23;
-
-    IastMetricCollector.add(iastMetric, value);
-    IastMetricCollector.get().prepareMetrics();
-    action.doIteration(telemetryService);
-
-    ArgumentCaptor<Metric> captor = forClass(Metric.class);
-    verify(telemetryService, times(1)).addMetric(captor.capture());
-    verifyNoMoreInteractions(telemetryService);
-
-    assertMetric(captor.getValue(), iastMetric, value, Collections.emptyList());
-  }
-
-  @Test
-  void testTaggedMetric() {
-    IastMetric iastMetric = IastMetric.INSTRUMENTED_SOURCE;
-    byte tag = SourceTypes.REQUEST_PARAMETER_VALUE;
-    String tagString = SourceTypes.toString(tag);
-    int value = 23;
-
-    IastMetricCollector.add(iastMetric, tag, value);
-    IastMetricCollector.get().prepareMetrics();
-    action.doIteration(telemetryService);
-
-    ArgumentCaptor<Metric> captor = forClass(Metric.class);
-    verify(telemetryService, times(1)).addMetric(captor.capture());
-    verifyNoMoreInteractions(telemetryService);
-
-    assertMetric(
-        captor.getValue(),
-        iastMetric,
-        value,
-        Arrays.asList(iastMetric.getTag().getName() + ":" + tagString));
-  }
-
-  @Test
-  void testWithNoMetrics() {
-    action.doIteration(telemetryService);
-
-    verifyNoMoreInteractions(telemetryService);
-  }
-
-  private void assertMetric(Metric metric, IastMetric iastMetric, long value, List<String> tags) {
-    assertEquals("iast", metric.getNamespace());
-    assertEquals(iastMetric.getName(), metric.getMetric());
-    assertEquals(tags, metric.getTags());
-    assertEquals(value, metric.getPoints().get(0).get(1).longValue());
-  }
+    private static final IastMetricCollector ORIGINAL_COLLECTOR = IastMetricCollector.get();
+
+    private final IastMetricPeriodicAction action = new IastMetricPeriodicAction();
+    private final TelemetryService telemetryService = mock(TelemetryService.class);
+
+    @BeforeEach
+    void setUp() {
+        IastMetricCollector.register(new IastMetricCollector());
+    }
+
+    @AfterEach
+    void tearDown() {
+        IastMetricCollector.register(ORIGINAL_COLLECTOR);
+    }
+
+    @Test
+    void testMetric() {
+        IastMetric iastMetric = IastMetric.EXECUTED_TAINTED;
+        int value = 23;
+
+        IastMetricCollector.add(iastMetric, value);
+        IastMetricCollector.get().prepareMetrics();
+        action.doIteration(telemetryService);
+
+        ArgumentCaptor<Metric> captor = forClass(Metric.class);
+        verify(telemetryService, times(1)).addMetric(captor.capture());
+        verifyNoMoreInteractions(telemetryService);
+
+        assertMetric(captor.getValue(), iastMetric, value, Collections.emptyList());
+    }
+
+    @Test
+    void testTaggedMetric() {
+        IastMetric iastMetric = IastMetric.INSTRUMENTED_SOURCE;
+        byte tag = SourceTypes.REQUEST_PARAMETER_VALUE;
+        String tagString = SourceTypes.toString(tag);
+        int value = 23;
+
+        IastMetricCollector.add(iastMetric, tag, value);
+        IastMetricCollector.get().prepareMetrics();
+        action.doIteration(telemetryService);
+
+        ArgumentCaptor<Metric> captor = forClass(Metric.class);
+        verify(telemetryService, times(1)).addMetric(captor.capture());
+        verifyNoMoreInteractions(telemetryService);
+
+        assertMetric(
+                captor.getValue(),
+                iastMetric,
+                value,
+                Arrays.asList(iastMetric.getTag().getName() + ":" + tagString));
+    }
+
+    @Test
+    void testWithNoMetrics() {
+        action.doIteration(telemetryService);
+
+        verifyNoMoreInteractions(telemetryService);
+    }
+
+    private void assertMetric(Metric metric, IastMetric iastMetric, long value, List<String> tags) {
+        assertEquals("iast", metric.getNamespace());
+        assertEquals(iastMetric.getName(), metric.getMetric());
+        assertEquals(tags, metric.getTags());
+        assertEquals(value, metric.getPoints().get(0).get(1).longValue());
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/metric/LLMObsMetricPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/metric/LLMObsMetricPeriodicActionTest.java
index 271bd4a2cd8..b0ae736bf90 100644
--- a/telemetry/src/test/java/datadog/telemetry/metric/LLMObsMetricPeriodicActionTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/metric/LLMObsMetricPeriodicActionTest.java
@@ -19,102 +19,98 @@
 import org.mockito.ArgumentCaptor;
 
 class LLMObsMetricPeriodicActionTest {
-  private final LLMObsMetricPeriodicAction periodicAction = new LLMObsMetricPeriodicAction();
-  private final LLMObsMetricCollector collector = LLMObsMetricCollector.get();
-  private TelemetryService telemetryService;
+    private final LLMObsMetricPeriodicAction periodicAction = new LLMObsMetricPeriodicAction();
+    private final LLMObsMetricCollector collector = LLMObsMetricCollector.get();
+    private TelemetryService telemetryService;
 
-  @BeforeEach
-  void setUp() {
-    collector.resetForTesting();
-    telemetryService = mock(TelemetryService.class);
-  }
+    @BeforeEach
+    void setUp() {
+        collector.resetForTesting();
+        telemetryService = mock(TelemetryService.class);
+    }
 
-  @AfterEach
-  void tearDown() {
-    collector.resetForTesting();
-  }
+    @AfterEach
+    void tearDown() {
+        collector.resetForTesting();
+    }
 
-  @Test
-  void emitsOneMetricPerDistinctTagCombination() {
-    collector.recordSpanFinished("openai", "llm", true, true, false, true);
-    collector.recordSpanFinished("openai", "llm", false, true, false, false);
-    collector.recordSpanFinished("anthropic", "embedding", true, false, true, false);
+    @Test
+    void emitsOneMetricPerDistinctTagCombination() {
+        collector.recordSpanFinished("openai", "llm", true, true, false, true);
+        collector.recordSpanFinished("openai", "llm", false, true, false, false);
+        collector.recordSpanFinished("anthropic", "embedding", true, false, true, false);
 
-    collector.prepareMetrics();
-    periodicAction.doIteration(telemetryService);
+        collector.prepareMetrics();
+        periodicAction.doIteration(telemetryService);
 
-    ArgumentCaptor<Metric> captor = forClass(Metric.class);
-    verify(telemetryService, times(3)).addMetric(captor.capture());
-    verifyNoMoreInteractions(telemetryService);
+        ArgumentCaptor<Metric> captor = forClass(Metric.class);
+        verify(telemetryService, times(3)).addMetric(captor.capture());
+        verifyNoMoreInteractions(telemetryService);
 
-    HashSet<HashSet<String>> tagSets = new HashSet<>();
-    for (Metric metric : captor.getAllValues()) {
-      assertEquals("mlobs", metric.getNamespace());
-      assertEquals("span.finished", metric.getMetric());
-      assertEquals(1, metric.getPoints().size());
-      assertEquals(1L, metric.getPoints().get(0).get(1).longValue());
-      tagSets.add(new HashSet<>(metric.getTags()));
+        HashSet<HashSet<String>> tagSets = new HashSet<>();
+        for (Metric metric : captor.getAllValues()) {
+            assertEquals("mlobs", metric.getNamespace());
+            assertEquals("span.finished", metric.getMetric());
+            assertEquals(1, metric.getPoints().size());
+            assertEquals(1L, metric.getPoints().get(0).get(1).longValue());
+            tagSets.add(new HashSet<>(metric.getTags()));
+        }
+        assertEquals(
+                new HashSet<>(Arrays.asList(
+                        new HashSet<>(Arrays.asList(
+                                "integration:openai",
+                                "span_kind:llm",
+                                "is_root_span:1",
+                                "autoinstrumented:1",
+                                "error:0",
+                                "has_session_id:1")),
+                        new HashSet<>(Arrays.asList(
+                                "integration:openai",
+                                "span_kind:llm",
+                                "is_root_span:0",
+                                "autoinstrumented:1",
+                                "error:0",
+                                "has_session_id:0")),
+                        new HashSet<>(Arrays.asList(
+                                "integration:anthropic",
+                                "span_kind:embedding",
+                                "is_root_span:1",
+                                "autoinstrumented:0",
+                                "error:1",
+                                "has_session_id:0")))),
+                tagSets);
     }
-    assertEquals(
-        new HashSet<>(
-            Arrays.asList(
-                new HashSet<>(
-                    Arrays.asList(
-                        "integration:openai",
-                        "span_kind:llm",
-                        "is_root_span:1",
-                        "autoinstrumented:1",
-                        "error:0",
-                        "has_session_id:1")),
-                new HashSet<>(
-                    Arrays.asList(
-                        "integration:openai",
-                        "span_kind:llm",
-                        "is_root_span:0",
-                        "autoinstrumented:1",
-                        "error:0",
-                        "has_session_id:0")),
-                new HashSet<>(
-                    Arrays.asList(
-                        "integration:anthropic",
-                        "span_kind:embedding",
-                        "is_root_span:1",
-                        "autoinstrumented:0",
-                        "error:1",
-                        "has_session_id:0")))),
-        tagSets);
-  }
 
-  /**
-   * Identical spans must produce a single point carrying the summed count. Emitting one point of
-   * value 1 per span instead loses all but one of the points that share a second-granularity
-   * timestamp once they reach the metrics intake.
-   */
-  @Test
-  void emitsASinglePointCarryingTheAggregatedCount() {
-    for (int i = 0; i < 5000; i++) {
-      collector.recordSpanFinished("openai", "llm", true, true, false, false);
-    }
+    /**
+     * Identical spans must produce a single point carrying the summed count. Emitting one point of
+     * value 1 per span instead loses all but one of the points that share a second-granularity
+     * timestamp once they reach the metrics intake.
+     */
+    @Test
+    void emitsASinglePointCarryingTheAggregatedCount() {
+        for (int i = 0; i < 5000; i++) {
+            collector.recordSpanFinished("openai", "llm", true, true, false, false);
+        }
 
-    collector.prepareMetrics();
-    periodicAction.doIteration(telemetryService);
+        collector.prepareMetrics();
+        periodicAction.doIteration(telemetryService);
 
-    ArgumentCaptor<Metric> captor = forClass(Metric.class);
-    verify(telemetryService).addMetric(captor.capture());
-    verifyNoMoreInteractions(telemetryService);
+        ArgumentCaptor<Metric> captor = forClass(Metric.class);
+        verify(telemetryService).addMetric(captor.capture());
+        verifyNoMoreInteractions(telemetryService);
 
-    Metric metric = captor.getValue();
-    assertEquals(Metric.TypeEnum.COUNT, metric.getType());
-    List<List<Number>> points = metric.getPoints();
-    assertEquals(1, points.size());
-    assertEquals(5000L, points.get(0).get(1).longValue());
-  }
+        Metric metric = captor.getValue();
+        assertEquals(Metric.TypeEnum.COUNT, metric.getType());
+        List<List<Number>> points = metric.getPoints();
+        assertEquals(1, points.size());
+        assertEquals(5000L, points.get(0).get(1).longValue());
+    }
 
-  @Test
-  void emitsNothingWhenNoSpansFinished() {
-    collector.prepareMetrics();
-    periodicAction.doIteration(telemetryService);
+    @Test
+    void emitsNothingWhenNoSpansFinished() {
+        collector.prepareMetrics();
+        periodicAction.doIteration(telemetryService);
 
-    verifyNoMoreInteractions(telemetryService);
-  }
+        verifyNoMoreInteractions(telemetryService);
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/metric/MetricPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/metric/MetricPeriodicActionTest.java
index bd90a582f65..2a20ecdfd0c 100644
--- a/telemetry/src/test/java/datadog/telemetry/metric/MetricPeriodicActionTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/metric/MetricPeriodicActionTest.java
@@ -26,296 +26,286 @@
 
 public class MetricPeriodicActionTest {
 
-  private ArgumentCaptor<Metric> metricCaptor = forClass(Metric.class);
-  private ArgumentCaptor<DistributionSeries> distributionSeriesCaptor =
-      forClass(DistributionSeries.class);
-
-  @TableTest({
-    "scenario                                                   | metrics                                                                    | expected                                                          ",
-    "single raw metric produces a single telemetry point        | ['col(counter: 2)']                                                        | ['tel(points: [2])']                                              ",
-    "two raw metrics with the same identity are joined          | ['col(counter: 2)', 'col(counter: 6)']                                     | ['tel(points: [2, 6])']                                           ",
-    "different namespace produces a distinct telemetry metric   | ['col(counter: 2)', 'col(namespace: \"other\", counter: 6)']               | ['tel(points: [2])', 'tel(namespace: \"other\", points: [6])']    ",
-    "different common flag produces a distinct telemetry metric | ['col(counter: 2)', 'col(common: false, counter: 6)']                      | ['tel(points: [2])', 'tel(common: false, points: [6])']           ",
-    "different metric name produces a distinct telemetry metric | ['col(counter: 2)', 'col(metric: \"other\", counter: 6)']                  | ['tel(points: [2])', 'tel(metric: \"other\", points: [6])']       ",
-    "different tags produce a distinct telemetry metric         | ['col(counter: 2)', 'col(tags: [a:b], counter: 6)']                        | ['tel(points: [2])', 'tel(tags: [a:b], points: [6])']             ",
-    "distinct tags on both raw metrics stay distinct            | ['col(counter: 2, tags: [a:b])', 'col(counter: 6, tags: [c:d])']           | ['tel(points: [2], tags: [a:b])', 'tel(points: [6], tags: [c:d])']",
-    "same tags on both raw metrics are joined                   | ['col(counter: 2, tags: [a:b, c:d])', 'col(counter: 6, tags: [a:b, c:d])'] | ['tel(points: [2, 6], tags: [a:b, c:d])']                         "
-  })
-  void testCommonMetricsAreJoinedBeforeBeingSentToTelemetry(
-      List<MetricCollector.Metric> metrics, List<ExpectedMetric> expected) {
-    TelemetryService telemetryService = mock(TelemetryService.class);
-    MetricCollector<MetricCollector.Metric> metricCollector = mock(MetricCollector.class);
-    when(metricCollector.drain()).thenReturn(metrics);
-    when(metricCollector.drainDistributionSeries()).thenReturn(emptyList());
-    DefaultMetricPeriodicAction action = new DefaultMetricPeriodicAction(metricCollector);
-
-    action.doIteration(telemetryService);
-
-    verify(telemetryService, times(expected.size())).addMetric(metricCaptor.capture());
-    verifyNoMoreInteractions(ignoreStubs(telemetryService, metricCollector));
-
-    List<Metric> actualMetrics = metricCaptor.getAllValues();
-    for (ExpectedMetric expectedMetric : expected) {
-      assertMatchingMetric(actualMetrics, expectedMetric);
+    private ArgumentCaptor<Metric> metricCaptor = forClass(Metric.class);
+    private ArgumentCaptor<DistributionSeries> distributionSeriesCaptor = forClass(DistributionSeries.class);
+
+    @TableTest({
+      "scenario                                                   | metrics                                                                    | expected                                                          ",
+      "single raw metric produces a single telemetry point        | ['col(counter: 2)']                                                        | ['tel(points: [2])']                                              ",
+      "two raw metrics with the same identity are joined          | ['col(counter: 2)', 'col(counter: 6)']                                     | ['tel(points: [2, 6])']                                           ",
+      "different namespace produces a distinct telemetry metric   | ['col(counter: 2)', 'col(namespace: \"other\", counter: 6)']               | ['tel(points: [2])', 'tel(namespace: \"other\", points: [6])']    ",
+      "different common flag produces a distinct telemetry metric | ['col(counter: 2)', 'col(common: false, counter: 6)']                      | ['tel(points: [2])', 'tel(common: false, points: [6])']           ",
+      "different metric name produces a distinct telemetry metric | ['col(counter: 2)', 'col(metric: \"other\", counter: 6)']                  | ['tel(points: [2])', 'tel(metric: \"other\", points: [6])']       ",
+      "different tags produce a distinct telemetry metric         | ['col(counter: 2)', 'col(tags: [a:b], counter: 6)']                        | ['tel(points: [2])', 'tel(tags: [a:b], points: [6])']             ",
+      "distinct tags on both raw metrics stay distinct            | ['col(counter: 2, tags: [a:b])', 'col(counter: 6, tags: [c:d])']           | ['tel(points: [2], tags: [a:b])', 'tel(points: [6], tags: [c:d])']",
+      "same tags on both raw metrics are joined                   | ['col(counter: 2, tags: [a:b, c:d])', 'col(counter: 6, tags: [a:b, c:d])'] | ['tel(points: [2, 6], tags: [a:b, c:d])']                         "
+    })
+    void testCommonMetricsAreJoinedBeforeBeingSentToTelemetry(
+            List<MetricCollector.Metric> metrics, List<ExpectedMetric> expected) {
+        TelemetryService telemetryService = mock(TelemetryService.class);
+        MetricCollector<MetricCollector.Metric> metricCollector = mock(MetricCollector.class);
+        when(metricCollector.drain()).thenReturn(metrics);
+        when(metricCollector.drainDistributionSeries()).thenReturn(emptyList());
+        DefaultMetricPeriodicAction action = new DefaultMetricPeriodicAction(metricCollector);
+
+        action.doIteration(telemetryService);
+
+        verify(telemetryService, times(expected.size())).addMetric(metricCaptor.capture());
+        verifyNoMoreInteractions(ignoreStubs(telemetryService, metricCollector));
+
+        List<Metric> actualMetrics = metricCaptor.getAllValues();
+        for (ExpectedMetric expectedMetric : expected) {
+            assertMatchingMetric(actualMetrics, expectedMetric);
+        }
     }
-  }
-
-  @TableTest({
-    "scenario                                                   | distributionSeries                                                                 | expected                                                                ",
-    "single raw series point produces a single telemetry series | ['rawSeries(value: 2)']                                                            | ['series(points: [2])']                                                 ",
-    "two raw series points with the same identity are joined    | ['rawSeries(value: 2)', 'rawSeries(value: 6)']                                     | ['series(points: [2, 6])']                                              ",
-    "different namespace produces a distinct telemetry series   | ['rawSeries(value: 2)', 'rawSeries(namespace: \"other\", value: 6)']               | ['series(points: [2])', 'series(namespace: \"other\", points: [6])']    ",
-    "different common flag produces a distinct telemetry series | ['rawSeries(value: 2)', 'rawSeries(common: false, value: 6)']                      | ['series(points: [2])', 'series(common: false, points: [6])']           ",
-    "different metric name produces a distinct telemetry series | ['rawSeries(value: 2)', 'rawSeries(metric: \"other\", value: 6)']                  | ['series(points: [2])', 'series(metric: \"other\", points: [6])']       ",
-    "different tags produce a distinct telemetry series         | ['rawSeries(value: 2)', 'rawSeries(tags: [a:b], value: 6)']                        | ['series(points: [2])', 'series(tags: [a:b], points: [6])']             ",
-    "distinct tags on both raw series points stay distinct      | ['rawSeries(value: 2, tags: [a:b])', 'rawSeries(value: 6, tags: [c:d])']           | ['series(points: [2], tags: [a:b])', 'series(points: [6], tags: [c:d])']",
-    "same tags on both raw series points are joined             | ['rawSeries(value: 2, tags: [a:b, c:d])', 'rawSeries(value: 6, tags: [a:b, c:d])'] | ['series(points: [2, 6], tags: [a:b, c:d])']                            "
-  })
-  void testCommonDistributionSeriesAreJoinedBeforeBeingSentToTelemetry(
-      List<MetricCollector.DistributionSeriesPoint> distributionSeries,
-      List<ExpectedSeries> expected) {
-    TelemetryService telemetryService = mock(TelemetryService.class);
-    MetricCollector<MetricCollector.Metric> metricCollector = mock(MetricCollector.class);
-    when(metricCollector.drain()).thenReturn(emptyList());
-    when(metricCollector.drainDistributionSeries()).thenReturn(distributionSeries);
-    DefaultMetricPeriodicAction action = new DefaultMetricPeriodicAction(metricCollector);
-
-    action.doIteration(telemetryService);
-
-    verify(telemetryService, times(expected.size()))
-        .addDistributionSeries(distributionSeriesCaptor.capture());
-    verifyNoMoreInteractions(ignoreStubs(telemetryService, metricCollector));
-
-    List<DistributionSeries> actualSeries = distributionSeriesCaptor.getAllValues();
-    for (ExpectedSeries expectedSeries : expected) {
-      assertMatchingSeries(actualSeries, expectedSeries);
+
+    @TableTest({
+      "scenario                                                   | distributionSeries                                                                 | expected                                                                ",
+      "single raw series point produces a single telemetry series | ['rawSeries(value: 2)']                                                            | ['series(points: [2])']                                                 ",
+      "two raw series points with the same identity are joined    | ['rawSeries(value: 2)', 'rawSeries(value: 6)']                                     | ['series(points: [2, 6])']                                              ",
+      "different namespace produces a distinct telemetry series   | ['rawSeries(value: 2)', 'rawSeries(namespace: \"other\", value: 6)']               | ['series(points: [2])', 'series(namespace: \"other\", points: [6])']    ",
+      "different common flag produces a distinct telemetry series | ['rawSeries(value: 2)', 'rawSeries(common: false, value: 6)']                      | ['series(points: [2])', 'series(common: false, points: [6])']           ",
+      "different metric name produces a distinct telemetry series | ['rawSeries(value: 2)', 'rawSeries(metric: \"other\", value: 6)']                  | ['series(points: [2])', 'series(metric: \"other\", points: [6])']       ",
+      "different tags produce a distinct telemetry series         | ['rawSeries(value: 2)', 'rawSeries(tags: [a:b], value: 6)']                        | ['series(points: [2])', 'series(tags: [a:b], points: [6])']             ",
+      "distinct tags on both raw series points stay distinct      | ['rawSeries(value: 2, tags: [a:b])', 'rawSeries(value: 6, tags: [c:d])']           | ['series(points: [2], tags: [a:b])', 'series(points: [6], tags: [c:d])']",
+      "same tags on both raw series points are joined             | ['rawSeries(value: 2, tags: [a:b, c:d])', 'rawSeries(value: 6, tags: [a:b, c:d])'] | ['series(points: [2, 6], tags: [a:b, c:d])']                            "
+    })
+    void testCommonDistributionSeriesAreJoinedBeforeBeingSentToTelemetry(
+            List<MetricCollector.DistributionSeriesPoint> distributionSeries, List<ExpectedSeries> expected) {
+        TelemetryService telemetryService = mock(TelemetryService.class);
+        MetricCollector<MetricCollector.Metric> metricCollector = mock(MetricCollector.class);
+        when(metricCollector.drain()).thenReturn(emptyList());
+        when(metricCollector.drainDistributionSeries()).thenReturn(distributionSeries);
+        DefaultMetricPeriodicAction action = new DefaultMetricPeriodicAction(metricCollector);
+
+        action.doIteration(telemetryService);
+
+        verify(telemetryService, times(expected.size())).addDistributionSeries(distributionSeriesCaptor.capture());
+        verifyNoMoreInteractions(ignoreStubs(telemetryService, metricCollector));
+
+        List<DistributionSeries> actualSeries = distributionSeriesCaptor.getAllValues();
+        for (ExpectedSeries expectedSeries : expected) {
+            assertMatchingSeries(actualSeries, expectedSeries);
+        }
+    }
+
+    /** Parses a {@code col(key: value, ...)} cell into the raw metric it describes. */
+    @TypeConverter
+    public static MetricCollector.Metric col(String token) {
+        Map<String, String> args = parseArgs(token);
+        String namespace = stringArg(args, "namespace", "namespace");
+        String metricName = stringArg(args, "metric", "metric");
+        boolean common = booleanArg(args, "common", true);
+        List<String> tags = tagsArg(args);
+        long counter = Long.parseLong(args.get("counter"));
+        return new MetricCollector.Metric(namespace, common, metricName, "count", counter, tags);
+    }
+
+    /** Parses a {@code tel(key: value, ...)} cell into the expected telemetry metric. */
+    @TypeConverter
+    public static ExpectedMetric tel(String token) {
+        Map<String, String> args = parseArgs(token);
+        String namespace = stringArg(args, "namespace", "namespace");
+        String metricName = stringArg(args, "metric", "metric");
+        boolean common = booleanArg(args, "common", true);
+        List<String> tags = tagsArg(args);
+        List<Long> points = longListArg(args, "points");
+        return new ExpectedMetric(namespace, metricName, common, tags, points);
+    }
+
+    /** Parses a {@code rawSeries(key: value, ...)} cell into the raw distribution series point. */
+    @TypeConverter
+    public static MetricCollector.DistributionSeriesPoint rawSeries(String token) {
+        Map<String, String> args = parseArgs(token);
+        String namespace = stringArg(args, "namespace", "namespace");
+        String metricName = stringArg(args, "metric", "metric");
+        boolean common = booleanArg(args, "common", true);
+        List<String> tags = tagsArg(args);
+        int value = Integer.parseInt(args.get("value"));
+        return new MetricCollector.DistributionSeriesPoint(metricName, common, namespace, value, tags);
+    }
+
+    /** Parses a {@code series(key: value, ...)} cell into the expected telemetry series. */
+    @TypeConverter
+    public static ExpectedSeries series(String token) {
+        Map<String, String> args = parseArgs(token);
+        String namespace = stringArg(args, "namespace", "namespace");
+        String metricName = stringArg(args, "metric", "metric");
+        boolean common = booleanArg(args, "common", true);
+        List<String> tags = tagsArg(args);
+        List<Integer> points = intListArg(args, "points");
+        return new ExpectedSeries(namespace, metricName, common, tags, points);
+    }
+
+    /**
+     * Splits the {@code (key: value, ...)} argument list of a builder cell such as {@code col(...)}
+     * into a name-to-raw-value map, honouring nested {@code [...]} tag/point lists.
+     */
+    private static Map<String, String> parseArgs(String token) {
+        String content =
+                token.substring(token.indexOf('(') + 1, token.lastIndexOf(')')).trim();
+        Map<String, String> args = new LinkedHashMap<>();
+        if (content.isEmpty()) {
+            return args;
+        }
+        int depth = 0;
+        int start = 0;
+        for (int i = 0; i <= content.length(); i++) {
+            char c = i == content.length() ? ',' : content.charAt(i);
+            if (c == '[') {
+                depth++;
+            } else if (c == ']') {
+                depth--;
+            } else if (c == ',' && depth == 0) {
+                String pair = content.substring(start, i).trim();
+                int colon = pair.indexOf(':');
+                args.put(
+                        pair.substring(0, colon).trim(),
+                        pair.substring(colon + 1).trim());
+                start = i + 1;
+            }
+        }
+        return args;
     }
-  }
-
-  /** Parses a {@code col(key: value, ...)} cell into the raw metric it describes. */
-  @TypeConverter
-  public static MetricCollector.Metric col(String token) {
-    Map<String, String> args = parseArgs(token);
-    String namespace = stringArg(args, "namespace", "namespace");
-    String metricName = stringArg(args, "metric", "metric");
-    boolean common = booleanArg(args, "common", true);
-    List<String> tags = tagsArg(args);
-    long counter = Long.parseLong(args.get("counter"));
-    return new MetricCollector.Metric(namespace, common, metricName, "count", counter, tags);
-  }
-
-  /** Parses a {@code tel(key: value, ...)} cell into the expected telemetry metric. */
-  @TypeConverter
-  public static ExpectedMetric tel(String token) {
-    Map<String, String> args = parseArgs(token);
-    String namespace = stringArg(args, "namespace", "namespace");
-    String metricName = stringArg(args, "metric", "metric");
-    boolean common = booleanArg(args, "common", true);
-    List<String> tags = tagsArg(args);
-    List<Long> points = longListArg(args, "points");
-    return new ExpectedMetric(namespace, metricName, common, tags, points);
-  }
-
-  /** Parses a {@code rawSeries(key: value, ...)} cell into the raw distribution series point. */
-  @TypeConverter
-  public static MetricCollector.DistributionSeriesPoint rawSeries(String token) {
-    Map<String, String> args = parseArgs(token);
-    String namespace = stringArg(args, "namespace", "namespace");
-    String metricName = stringArg(args, "metric", "metric");
-    boolean common = booleanArg(args, "common", true);
-    List<String> tags = tagsArg(args);
-    int value = Integer.parseInt(args.get("value"));
-    return new MetricCollector.DistributionSeriesPoint(metricName, common, namespace, value, tags);
-  }
-
-  /** Parses a {@code series(key: value, ...)} cell into the expected telemetry series. */
-  @TypeConverter
-  public static ExpectedSeries series(String token) {
-    Map<String, String> args = parseArgs(token);
-    String namespace = stringArg(args, "namespace", "namespace");
-    String metricName = stringArg(args, "metric", "metric");
-    boolean common = booleanArg(args, "common", true);
-    List<String> tags = tagsArg(args);
-    List<Integer> points = intListArg(args, "points");
-    return new ExpectedSeries(namespace, metricName, common, tags, points);
-  }
-
-  /**
-   * Splits the {@code (key: value, ...)} argument list of a builder cell such as {@code col(...)}
-   * into a name-to-raw-value map, honouring nested {@code [...]} tag/point lists.
-   */
-  private static Map<String, String> parseArgs(String token) {
-    String content = token.substring(token.indexOf('(') + 1, token.lastIndexOf(')')).trim();
-    Map<String, String> args = new LinkedHashMap<>();
-    if (content.isEmpty()) {
-      return args;
+
+    private static String stringArg(Map<String, String> args, String key, String defaultValue) {
+        String raw = args.get(key);
+        return raw == null ? defaultValue : unquote(raw);
     }
-    int depth = 0;
-    int start = 0;
-    for (int i = 0; i <= content.length(); i++) {
-      char c = i == content.length() ? ',' : content.charAt(i);
-      if (c == '[') {
-        depth++;
-      } else if (c == ']') {
-        depth--;
-      } else if (c == ',' && depth == 0) {
-        String pair = content.substring(start, i).trim();
-        int colon = pair.indexOf(':');
-        args.put(pair.substring(0, colon).trim(), pair.substring(colon + 1).trim());
-        start = i + 1;
-      }
+
+    private static String unquote(String value) {
+        return value.charAt(0) == '"' ? value.substring(1, value.length() - 1) : value;
     }
-    return args;
-  }
-
-  private static String stringArg(Map<String, String> args, String key, String defaultValue) {
-    String raw = args.get(key);
-    return raw == null ? defaultValue : unquote(raw);
-  }
-
-  private static String unquote(String value) {
-    return value.charAt(0) == '"' ? value.substring(1, value.length() - 1) : value;
-  }
-
-  private static boolean booleanArg(Map<String, String> args, String key, boolean defaultValue) {
-    String raw = args.get(key);
-    return raw == null ? defaultValue : Boolean.parseBoolean(raw);
-  }
-
-  private static List<String> tagsArg(Map<String, String> args) {
-    String raw = args.get("tags");
-    return raw == null ? emptyList() : splitBracketedList(raw);
-  }
-
-  private static List<String> splitBracketedList(String raw) {
-    String inner = raw.substring(raw.indexOf('[') + 1, raw.lastIndexOf(']')).trim();
-    if (inner.isEmpty()) {
-      return emptyList();
+
+    private static boolean booleanArg(Map<String, String> args, String key, boolean defaultValue) {
+        String raw = args.get(key);
+        return raw == null ? defaultValue : Boolean.parseBoolean(raw);
     }
-    List<String> values = new ArrayList<>();
-    for (String part : inner.split(",")) {
-      values.add(part.trim());
+
+    private static List<String> tagsArg(Map<String, String> args) {
+        String raw = args.get("tags");
+        return raw == null ? emptyList() : splitBracketedList(raw);
     }
-    return values;
-  }
 
-  private static List<Long> longListArg(Map<String, String> args, String key) {
-    List<Long> values = new ArrayList<>();
-    for (String value : splitBracketedList(args.get(key))) {
-      values.add(Long.parseLong(value));
+    private static List<String> splitBracketedList(String raw) {
+        String inner = raw.substring(raw.indexOf('[') + 1, raw.lastIndexOf(']')).trim();
+        if (inner.isEmpty()) {
+            return emptyList();
+        }
+        List<String> values = new ArrayList<>();
+        for (String part : inner.split(",")) {
+            values.add(part.trim());
+        }
+        return values;
     }
-    return values;
-  }
 
-  private static List<Integer> intListArg(Map<String, String> args, String key) {
-    List<Integer> values = new ArrayList<>();
-    for (String value : splitBracketedList(args.get(key))) {
-      values.add(Integer.parseInt(value));
+    private static List<Long> longListArg(Map<String, String> args, String key) {
+        List<Long> values = new ArrayList<>();
+        for (String value : splitBracketedList(args.get(key))) {
+            values.add(Long.parseLong(value));
+        }
+        return values;
     }
-    return values;
-  }
-
-  private static void assertMatchingMetric(List<Metric> actualMetrics, ExpectedMetric expected) {
-    List<Metric> matches =
-        actualMetrics.stream()
-            .filter(metric -> metric.getNamespace().equals(expected.namespace))
-            .filter(metric -> metric.getMetric().equals(expected.metricName))
-            .filter(metric -> metric.getCommon().equals(expected.common))
-            .filter(metric -> metric.getTags().equals(expected.tags))
-            .collect(Collectors.toList());
-    assertEquals(
-        1,
-        matches.size(),
-        "expected exactly one match for "
-            + expected.namespace
-            + "/"
-            + expected.metricName
-            + " "
-            + expected.tags);
-
-    Metric metric = matches.get(0);
-    assertEquals(Metric.TypeEnum.COUNT, metric.getType());
-    List<Long> actualPoints =
-        metric.getPoints().stream()
-            .map(point -> point.get(1).longValue())
-            .collect(Collectors.toList());
-    assertEquals(expected.points.size(), actualPoints.size());
-    assertEquals(true, actualPoints.containsAll(expected.points));
-  }
-
-  private static void assertMatchingSeries(
-      List<DistributionSeries> actualSeries, ExpectedSeries expected) {
-    List<DistributionSeries> matches =
-        actualSeries.stream()
-            .filter(series -> series.getNamespace().equals(expected.namespace))
-            .filter(series -> series.getMetric().equals(expected.metricName))
-            .filter(series -> series.getCommon().equals(expected.common))
-            .filter(series -> series.getTags().equals(expected.tags))
-            .collect(Collectors.toList());
-    assertEquals(
-        1,
-        matches.size(),
-        "expected exactly one match for "
-            + expected.namespace
-            + "/"
-            + expected.metricName
-            + " "
-            + expected.tags);
-
-    DistributionSeries series = matches.get(0);
-    assertEquals(expected.points.size(), series.getPoints().size());
-    assertEquals(true, series.getPoints().containsAll(expected.points));
-  }
-
-  private static class ExpectedMetric {
-    private final String namespace;
-    private final String metricName;
-    private final boolean common;
-    private final List<String> tags;
-    private final List<Long> points;
-
-    ExpectedMetric(
-        String namespace, String metricName, boolean common, List<String> tags, List<Long> points) {
-      this.namespace = namespace;
-      this.metricName = metricName;
-      this.common = common;
-      this.tags = tags;
-      this.points = points;
+
+    private static List<Integer> intListArg(Map<String, String> args, String key) {
+        List<Integer> values = new ArrayList<>();
+        for (String value : splitBracketedList(args.get(key))) {
+            values.add(Integer.parseInt(value));
+        }
+        return values;
     }
-  }
-
-  private static class ExpectedSeries {
-    private final String namespace;
-    private final String metricName;
-    private final boolean common;
-    private final List<String> tags;
-    private final List<Integer> points;
-
-    ExpectedSeries(
-        String namespace,
-        String metricName,
-        boolean common,
-        List<String> tags,
-        List<Integer> points) {
-      this.namespace = namespace;
-      this.metricName = metricName;
-      this.common = common;
-      this.tags = tags;
-      this.points = points;
+
+    private static void assertMatchingMetric(List<Metric> actualMetrics, ExpectedMetric expected) {
+        List<Metric> matches = actualMetrics.stream()
+                .filter(metric -> metric.getNamespace().equals(expected.namespace))
+                .filter(metric -> metric.getMetric().equals(expected.metricName))
+                .filter(metric -> metric.getCommon().equals(expected.common))
+                .filter(metric -> metric.getTags().equals(expected.tags))
+                .collect(Collectors.toList());
+        assertEquals(
+                1,
+                matches.size(),
+                "expected exactly one match for "
+                        + expected.namespace
+                        + "/"
+                        + expected.metricName
+                        + " "
+                        + expected.tags);
+
+        Metric metric = matches.get(0);
+        assertEquals(Metric.TypeEnum.COUNT, metric.getType());
+        List<Long> actualPoints = metric.getPoints().stream()
+                .map(point -> point.get(1).longValue())
+                .collect(Collectors.toList());
+        assertEquals(expected.points.size(), actualPoints.size());
+        assertEquals(true, actualPoints.containsAll(expected.points));
     }
-  }
 
-  private static class DefaultMetricPeriodicAction extends MetricPeriodicAction {
-    private final MetricCollector<MetricCollector.Metric> collector;
+    private static void assertMatchingSeries(List<DistributionSeries> actualSeries, ExpectedSeries expected) {
+        List<DistributionSeries> matches = actualSeries.stream()
+                .filter(series -> series.getNamespace().equals(expected.namespace))
+                .filter(series -> series.getMetric().equals(expected.metricName))
+                .filter(series -> series.getCommon().equals(expected.common))
+                .filter(series -> series.getTags().equals(expected.tags))
+                .collect(Collectors.toList());
+        assertEquals(
+                1,
+                matches.size(),
+                "expected exactly one match for "
+                        + expected.namespace
+                        + "/"
+                        + expected.metricName
+                        + " "
+                        + expected.tags);
+
+        DistributionSeries series = matches.get(0);
+        assertEquals(expected.points.size(), series.getPoints().size());
+        assertEquals(true, series.getPoints().containsAll(expected.points));
+    }
+
+    private static class ExpectedMetric {
+        private final String namespace;
+        private final String metricName;
+        private final boolean common;
+        private final List<String> tags;
+        private final List<Long> points;
+
+        ExpectedMetric(String namespace, String metricName, boolean common, List<String> tags, List<Long> points) {
+            this.namespace = namespace;
+            this.metricName = metricName;
+            this.common = common;
+            this.tags = tags;
+            this.points = points;
+        }
+    }
 
-    DefaultMetricPeriodicAction(@Nonnull MetricCollector<MetricCollector.Metric> collector) {
-      this.collector = collector;
+    private static class ExpectedSeries {
+        private final String namespace;
+        private final String metricName;
+        private final boolean common;
+        private final List<String> tags;
+        private final List<Integer> points;
+
+        ExpectedSeries(String namespace, String metricName, boolean common, List<String> tags, List<Integer> points) {
+            this.namespace = namespace;
+            this.metricName = metricName;
+            this.common = common;
+            this.tags = tags;
+            this.points = points;
+        }
     }
 
-    @Override
-    @Nonnull
-    public MetricCollector<MetricCollector.Metric> collector() {
-      return collector;
+    private static class DefaultMetricPeriodicAction extends MetricPeriodicAction {
+        private final MetricCollector<MetricCollector.Metric> collector;
+
+        DefaultMetricPeriodicAction(@Nonnull MetricCollector<MetricCollector.Metric> collector) {
+            this.collector = collector;
+        }
+
+        @Override
+        @Nonnull
+        public MetricCollector<MetricCollector.Metric> collector() {
+            return collector;
+        }
     }
-  }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/metric/OtelEnvMetricPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/metric/OtelEnvMetricPeriodicActionTest.java
index dff54f9d7c6..efc5e38dc02 100644
--- a/telemetry/src/test/java/datadog/telemetry/metric/OtelEnvMetricPeriodicActionTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/metric/OtelEnvMetricPeriodicActionTest.java
@@ -18,108 +18,104 @@
 
 class OtelEnvMetricPeriodicActionTest {
 
-  private final TelemetryService telemetryService = mock(TelemetryService.class);
-  private final OtelEnvMetricPeriodicAction action = new OtelEnvMetricPeriodicAction();
-  private final OtelEnvMetricCollectorImpl collector = OtelEnvMetricCollectorImpl.getInstance();
-  private ArgumentCaptor<Metric> metricCaptor = forClass(Metric.class);
-
-  @Test
-  void testOtelEnvVarHidingMetric() {
-    collector.setHidingOtelEnvVarMetric("otel_service_name", "dd_service_name");
-    collector.prepareMetrics();
-    action.doIteration(telemetryService);
-
-    verify(telemetryService, times(1)).addMetric(metricCaptor.capture());
-    verifyNoMoreInteractions(telemetryService);
-
-    Metric metric = metricCaptor.getValue();
-    assertEquals("tracers", metric.getNamespace());
-    assertEquals("otel.env.hiding", metric.getMetric());
-    assertEquals(1L, metric.getPoints().get(0).get(1).longValue());
-    assertEquals(
-        Arrays.asList("config_opentelemetry:otel_service_name", "config_datadog:dd_service_name"),
-        metric.getTags());
-    assertEquals(Metric.TypeEnum.COUNT, metric.getType());
-  }
-
-  @Test
-  void testOtelEnvVarUnsupportedMetric() {
-    collector.setUnsupportedOtelEnvVarMetric("unsupported_env_var");
-    collector.prepareMetrics();
-    action.doIteration(telemetryService);
-
-    verify(telemetryService, times(1)).addMetric(metricCaptor.capture());
-    verifyNoMoreInteractions(telemetryService);
-
-    Metric metric = metricCaptor.getValue();
-    assertEquals("tracers", metric.getNamespace());
-    assertEquals("otel.env.unsupported", metric.getMetric());
-    assertEquals(1L, metric.getPoints().get(0).get(1).longValue());
-    assertEquals(Arrays.asList("config_opentelemetry:unsupported_env_var"), metric.getTags());
-    assertEquals(Metric.TypeEnum.COUNT, metric.getType());
-  }
-
-  @Test
-  void testOtelEnvVarInvalidMetric() {
-    collector.setInvalidOtelEnvVarMetric("otel_env_var", "dd_env_var");
-    collector.prepareMetrics();
-    action.doIteration(telemetryService);
-
-    verify(telemetryService, times(1)).addMetric(metricCaptor.capture());
-    verifyNoMoreInteractions(telemetryService);
-
-    Metric metric = metricCaptor.getValue();
-    assertEquals("tracers", metric.getNamespace());
-    assertEquals("otel.env.invalid", metric.getMetric());
-    assertEquals(1L, metric.getPoints().get(0).get(1).longValue());
-    assertEquals(
-        Arrays.asList("config_opentelemetry:otel_env_var", "config_datadog:dd_env_var"),
-        metric.getTags());
-    assertEquals(Metric.TypeEnum.COUNT, metric.getType());
-  }
-
-  @Test
-  void testOtelEnvVarMultipleMetrics() {
-    collector.setInvalidOtelEnvVarMetric("otel_env_var", "dd_env_var");
-    collector.setInvalidOtelEnvVarMetric("otel_env_var2", "dd_env_var2");
-    collector.setHidingOtelEnvVarMetric("otel_service_name", "dd_service_name");
-    collector.setUnsupportedOtelEnvVarMetric("unsupported_env_var");
-    collector.prepareMetrics();
-    action.doIteration(telemetryService);
-
-    verify(telemetryService, times(4)).addMetric(metricCaptor.capture());
-    verifyNoMoreInteractions(telemetryService);
-
-    // MetricPeriodicAction aggregates metrics through a HashMap, so the emission order is not
-    // guaranteed; match each expected metric by its tags rather than by capture position.
-    List<Metric> metrics = metricCaptor.getAllValues();
-    assertMetric(
-        metrics,
-        "otel.env.invalid",
-        Arrays.asList("config_opentelemetry:otel_env_var", "config_datadog:dd_env_var"));
-    assertMetric(
-        metrics,
-        "otel.env.invalid",
-        Arrays.asList("config_opentelemetry:otel_env_var2", "config_datadog:dd_env_var2"));
-    assertMetric(
-        metrics,
-        "otel.env.hiding",
-        Arrays.asList("config_opentelemetry:otel_service_name", "config_datadog:dd_service_name"));
-    assertMetric(
-        metrics, "otel.env.unsupported", Arrays.asList("config_opentelemetry:unsupported_env_var"));
-  }
-
-  private void assertMetric(List<Metric> metrics, String metricName, List<String> tags) {
-    List<Metric> matches =
-        metrics.stream()
-            .filter(metric -> metric.getMetric().equals(metricName))
-            .filter(metric -> tags.equals(metric.getTags()))
-            .collect(Collectors.toList());
-    assertEquals(1, matches.size(), "expected exactly one match for " + metricName + " " + tags);
-
-    Metric metric = matches.get(0);
-    assertEquals("tracers", metric.getNamespace());
-    assertEquals(1L, metric.getPoints().get(0).get(1).longValue());
-    assertEquals(Metric.TypeEnum.COUNT, metric.getType());
-  }
+    private final TelemetryService telemetryService = mock(TelemetryService.class);
+    private final OtelEnvMetricPeriodicAction action = new OtelEnvMetricPeriodicAction();
+    private final OtelEnvMetricCollectorImpl collector = OtelEnvMetricCollectorImpl.getInstance();
+    private ArgumentCaptor<Metric> metricCaptor = forClass(Metric.class);
+
+    @Test
+    void testOtelEnvVarHidingMetric() {
+        collector.setHidingOtelEnvVarMetric("otel_service_name", "dd_service_name");
+        collector.prepareMetrics();
+        action.doIteration(telemetryService);
+
+        verify(telemetryService, times(1)).addMetric(metricCaptor.capture());
+        verifyNoMoreInteractions(telemetryService);
+
+        Metric metric = metricCaptor.getValue();
+        assertEquals("tracers", metric.getNamespace());
+        assertEquals("otel.env.hiding", metric.getMetric());
+        assertEquals(1L, metric.getPoints().get(0).get(1).longValue());
+        assertEquals(
+                Arrays.asList("config_opentelemetry:otel_service_name", "config_datadog:dd_service_name"),
+                metric.getTags());
+        assertEquals(Metric.TypeEnum.COUNT, metric.getType());
+    }
+
+    @Test
+    void testOtelEnvVarUnsupportedMetric() {
+        collector.setUnsupportedOtelEnvVarMetric("unsupported_env_var");
+        collector.prepareMetrics();
+        action.doIteration(telemetryService);
+
+        verify(telemetryService, times(1)).addMetric(metricCaptor.capture());
+        verifyNoMoreInteractions(telemetryService);
+
+        Metric metric = metricCaptor.getValue();
+        assertEquals("tracers", metric.getNamespace());
+        assertEquals("otel.env.unsupported", metric.getMetric());
+        assertEquals(1L, metric.getPoints().get(0).get(1).longValue());
+        assertEquals(Arrays.asList("config_opentelemetry:unsupported_env_var"), metric.getTags());
+        assertEquals(Metric.TypeEnum.COUNT, metric.getType());
+    }
+
+    @Test
+    void testOtelEnvVarInvalidMetric() {
+        collector.setInvalidOtelEnvVarMetric("otel_env_var", "dd_env_var");
+        collector.prepareMetrics();
+        action.doIteration(telemetryService);
+
+        verify(telemetryService, times(1)).addMetric(metricCaptor.capture());
+        verifyNoMoreInteractions(telemetryService);
+
+        Metric metric = metricCaptor.getValue();
+        assertEquals("tracers", metric.getNamespace());
+        assertEquals("otel.env.invalid", metric.getMetric());
+        assertEquals(1L, metric.getPoints().get(0).get(1).longValue());
+        assertEquals(Arrays.asList("config_opentelemetry:otel_env_var", "config_datadog:dd_env_var"), metric.getTags());
+        assertEquals(Metric.TypeEnum.COUNT, metric.getType());
+    }
+
+    @Test
+    void testOtelEnvVarMultipleMetrics() {
+        collector.setInvalidOtelEnvVarMetric("otel_env_var", "dd_env_var");
+        collector.setInvalidOtelEnvVarMetric("otel_env_var2", "dd_env_var2");
+        collector.setHidingOtelEnvVarMetric("otel_service_name", "dd_service_name");
+        collector.setUnsupportedOtelEnvVarMetric("unsupported_env_var");
+        collector.prepareMetrics();
+        action.doIteration(telemetryService);
+
+        verify(telemetryService, times(4)).addMetric(metricCaptor.capture());
+        verifyNoMoreInteractions(telemetryService);
+
+        // MetricPeriodicAction aggregates metrics through a HashMap, so the emission order is not
+        // guaranteed; match each expected metric by its tags rather than by capture position.
+        List<Metric> metrics = metricCaptor.getAllValues();
+        assertMetric(
+                metrics,
+                "otel.env.invalid",
+                Arrays.asList("config_opentelemetry:otel_env_var", "config_datadog:dd_env_var"));
+        assertMetric(
+                metrics,
+                "otel.env.invalid",
+                Arrays.asList("config_opentelemetry:otel_env_var2", "config_datadog:dd_env_var2"));
+        assertMetric(
+                metrics,
+                "otel.env.hiding",
+                Arrays.asList("config_opentelemetry:otel_service_name", "config_datadog:dd_service_name"));
+        assertMetric(metrics, "otel.env.unsupported", Arrays.asList("config_opentelemetry:unsupported_env_var"));
+    }
+
+    private void assertMetric(List<Metric> metrics, String metricName, List<String> tags) {
+        List<Metric> matches = metrics.stream()
+                .filter(metric -> metric.getMetric().equals(metricName))
+                .filter(metric -> tags.equals(metric.getTags()))
+                .collect(Collectors.toList());
+        assertEquals(1, matches.size(), "expected exactly one match for " + metricName + " " + tags);
+
+        Metric metric = matches.get(0);
+        assertEquals("tracers", metric.getNamespace());
+        assertEquals(1L, metric.getPoints().get(0).get(1).longValue());
+        assertEquals(Metric.TypeEnum.COUNT, metric.getType());
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/metric/WafMetricPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/metric/WafMetricPeriodicActionTest.java
index 6340d95bdc0..b55f6b9a864 100644
--- a/telemetry/src/test/java/datadog/telemetry/metric/WafMetricPeriodicActionTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/metric/WafMetricPeriodicActionTest.java
@@ -19,178 +19,151 @@
 
 class WafMetricPeriodicActionTest {
 
-  private final WafMetricPeriodicAction periodicAction = new WafMetricPeriodicAction();
-  private final TelemetryService telemetryService = mock(TelemetryService.class);
-
-  @Test
-  void pushWafMetricsIntoTheTelemetryService() {
-    WafMetricCollector.get().wafInit("0.0.0", "rules_ver_1", true);
-    WafMetricCollector.get().wafUpdates("rules_ver_2", true);
-    WafMetricCollector.get().wafUpdates("rules_ver_3", true);
-
-    periodicAction.doIteration(telemetryService);
-
-    ArgumentCaptor<Metric> captor = forClass(Metric.class);
-    verify(telemetryService, times(3)).addMetric(captor.capture());
-    verifyNoMoreInteractions(telemetryService);
-
-    List<Metric> metrics = captor.getAllValues();
-    assertMetric(
-        metrics,
-        "waf.init",
-        1L,
-        Arrays.asList("waf_version:0.0.0", "event_rules_version:rules_ver_1", "success:true"));
-    assertMetric(
-        metrics,
-        "waf.updates",
-        1L,
-        Arrays.asList("waf_version:0.0.0", "event_rules_version:rules_ver_2", "success:true"));
-    assertMetric(
-        metrics,
-        "waf.updates",
-        1L,
-        Arrays.asList("waf_version:0.0.0", "event_rules_version:rules_ver_3", "success:true"));
-  }
-
-  @Test
-  void pushWafRequestMetricsAndPushIntoTheTelemetry() {
-    WafMetricCollector.get().wafInit("0.0.0", "rules_ver_1", true);
-    WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false, false);
-    WafMetricCollector.get().wafRequest(true, false, false, false, false, false, false, false);
-    WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false, false);
-    WafMetricCollector.get().wafRequest(false, true, false, false, false, false, false, false);
-    WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false, false);
-    WafMetricCollector.get().wafRequest(false, false, false, true, false, false, false, false);
-    WafMetricCollector.get().wafRequest(false, false, true, false, false, false, false, false);
-    WafMetricCollector.get().wafRequest(false, false, false, false, false, true, false, false);
-    WafMetricCollector.get().wafRequest(false, false, false, false, true, false, false, false);
-    WafMetricCollector.get().wafRequest(false, false, false, false, false, false, true, false);
-    WafMetricCollector.get().prepareMetrics();
-    periodicAction.doIteration(telemetryService);
-
-    ArgumentCaptor<Metric> firstBatchCaptor = forClass(Metric.class);
-    verify(telemetryService, times(9)).addMetric(firstBatchCaptor.capture());
-    verifyNoMoreInteractions(telemetryService);
-
-    List<Metric> firstBatch = firstBatchCaptor.getAllValues();
-    assertMetric(firstBatch, "waf.init", 1L, null);
-    assertRequestMetric(
-        firstBatch,
-        3L,
-        requestTags("rules_ver_1", false, false, false, false, false, false, false));
-    assertRequestMetric(
-        firstBatch, 1L, requestTags("rules_ver_1", true, false, false, false, false, false, false));
-    assertRequestMetric(
-        firstBatch, 1L, requestTags("rules_ver_1", false, true, false, false, false, false, false));
-    assertRequestMetric(
-        firstBatch, 1L, requestTags("rules_ver_1", false, false, true, false, false, false, false));
-    assertRequestMetric(
-        firstBatch, 1L, requestTags("rules_ver_1", false, false, false, true, false, false, false));
-    assertRequestMetric(
-        firstBatch, 1L, requestTags("rules_ver_1", false, false, false, false, true, false, false));
-    assertRequestMetric(
-        firstBatch, 1L, requestTags("rules_ver_1", false, false, false, false, false, true, false));
-    assertRequestMetric(
-        firstBatch, 1L, requestTags("rules_ver_1", false, false, false, false, false, false, true));
-
-    clearInvocations(telemetryService);
-
-    // waf.updates happens
-    WafMetricCollector.get().wafUpdates("rules_ver_2", true);
-    WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false, false);
-    WafMetricCollector.get().wafRequest(true, false, false, false, false, false, false, false);
-    WafMetricCollector.get().wafRequest(false, true, false, false, false, false, false, false);
-    WafMetricCollector.get().wafRequest(false, false, false, true, false, false, false, false);
-    WafMetricCollector.get().wafRequest(false, false, true, false, false, false, false, false);
-    WafMetricCollector.get().wafRequest(false, false, false, false, false, true, false, false);
-    WafMetricCollector.get().wafRequest(false, false, false, false, true, false, false, false);
-    WafMetricCollector.get().wafRequest(false, false, false, false, false, false, true, false);
-    WafMetricCollector.get().prepareMetrics();
-    periodicAction.doIteration(telemetryService);
-
-    // following waf.request have a new event_rules_version tag
-    ArgumentCaptor<Metric> secondBatchCaptor = forClass(Metric.class);
-    verify(telemetryService, times(9)).addMetric(secondBatchCaptor.capture());
-    verifyNoMoreInteractions(telemetryService);
-
-    List<Metric> secondBatch = secondBatchCaptor.getAllValues();
-    assertMetric(secondBatch, "waf.updates", 1L, null);
-    assertRequestMetric(
-        secondBatch,
-        1L,
-        requestTags("rules_ver_2", false, false, false, false, false, false, false));
-    assertRequestMetric(
-        secondBatch,
-        1L,
-        requestTags("rules_ver_2", true, false, false, false, false, false, false));
-    assertRequestMetric(
-        secondBatch,
-        1L,
-        requestTags("rules_ver_2", false, true, false, false, false, false, false));
-    assertRequestMetric(
-        secondBatch,
-        1L,
-        requestTags("rules_ver_2", false, false, true, false, false, false, false));
-    assertRequestMetric(
-        secondBatch,
-        1L,
-        requestTags("rules_ver_2", false, false, false, true, false, false, false));
-    assertRequestMetric(
-        secondBatch,
-        1L,
-        requestTags("rules_ver_2", false, false, false, false, true, false, false));
-    assertRequestMetric(
-        secondBatch,
-        1L,
-        requestTags("rules_ver_2", false, false, false, false, false, true, false));
-    assertRequestMetric(
-        secondBatch,
-        1L,
-        requestTags("rules_ver_2", false, false, false, false, false, false, true));
-  }
-
-  private void assertRequestMetric(List<Metric> metrics, long expectedCount, List<String> tags) {
-    assertMetric(metrics, "waf.requests", expectedCount, tags);
-  }
-
-  /**
-   * Metrics with equal tags are aggregated into a single point by production code, but ones with
-   * distinct tags land in a HashMap keyed by content, so their relative order in the captured list
-   * is not guaranteed. Match by (metric name, tags) rather than by position.
-   */
-  private void assertMetric(
-      List<Metric> metrics, String metricName, long expectedCount, List<String> tags) {
-    List<Metric> matches =
-        metrics.stream()
-            .filter(metric -> metric.getMetric().equals(metricName))
-            .filter(metric -> tags == null || tags.equals(metric.getTags()))
-            .collect(Collectors.toList());
-    assertEquals(1, matches.size(), "expected exactly one match for " + metricName + " " + tags);
-
-    Metric metric = matches.get(0);
-    assertEquals("appsec", metric.getNamespace());
-    assertEquals(expectedCount, metric.getPoints().get(0).get(1).longValue());
-  }
-
-  private List<String> requestTags(
-      String rulesVersion,
-      boolean ruleTriggered,
-      boolean requestBlocked,
-      boolean wafError,
-      boolean wafTimeout,
-      boolean blockFailure,
-      boolean rateLimited,
-      boolean inputTruncated) {
-    return Arrays.asList(
-        "waf_version:0.0.0",
-        "event_rules_version:" + rulesVersion,
-        "rule_triggered:" + ruleTriggered,
-        "request_blocked:" + requestBlocked,
-        "waf_error:" + wafError,
-        "waf_timeout:" + wafTimeout,
-        "block_failure:" + blockFailure,
-        "rate_limited:" + rateLimited,
-        "input_truncated:" + inputTruncated,
-        "request_excluded:none");
-  }
+    private final WafMetricPeriodicAction periodicAction = new WafMetricPeriodicAction();
+    private final TelemetryService telemetryService = mock(TelemetryService.class);
+
+    @Test
+    void pushWafMetricsIntoTheTelemetryService() {
+        WafMetricCollector.get().wafInit("0.0.0", "rules_ver_1", true);
+        WafMetricCollector.get().wafUpdates("rules_ver_2", true);
+        WafMetricCollector.get().wafUpdates("rules_ver_3", true);
+
+        periodicAction.doIteration(telemetryService);
+
+        ArgumentCaptor<Metric> captor = forClass(Metric.class);
+        verify(telemetryService, times(3)).addMetric(captor.capture());
+        verifyNoMoreInteractions(telemetryService);
+
+        List<Metric> metrics = captor.getAllValues();
+        assertMetric(
+                metrics,
+                "waf.init",
+                1L,
+                Arrays.asList("waf_version:0.0.0", "event_rules_version:rules_ver_1", "success:true"));
+        assertMetric(
+                metrics,
+                "waf.updates",
+                1L,
+                Arrays.asList("waf_version:0.0.0", "event_rules_version:rules_ver_2", "success:true"));
+        assertMetric(
+                metrics,
+                "waf.updates",
+                1L,
+                Arrays.asList("waf_version:0.0.0", "event_rules_version:rules_ver_3", "success:true"));
+    }
+
+    @Test
+    void pushWafRequestMetricsAndPushIntoTheTelemetry() {
+        WafMetricCollector.get().wafInit("0.0.0", "rules_ver_1", true);
+        WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false, false);
+        WafMetricCollector.get().wafRequest(true, false, false, false, false, false, false, false);
+        WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false, false);
+        WafMetricCollector.get().wafRequest(false, true, false, false, false, false, false, false);
+        WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false, false);
+        WafMetricCollector.get().wafRequest(false, false, false, true, false, false, false, false);
+        WafMetricCollector.get().wafRequest(false, false, true, false, false, false, false, false);
+        WafMetricCollector.get().wafRequest(false, false, false, false, false, true, false, false);
+        WafMetricCollector.get().wafRequest(false, false, false, false, true, false, false, false);
+        WafMetricCollector.get().wafRequest(false, false, false, false, false, false, true, false);
+        WafMetricCollector.get().prepareMetrics();
+        periodicAction.doIteration(telemetryService);
+
+        ArgumentCaptor<Metric> firstBatchCaptor = forClass(Metric.class);
+        verify(telemetryService, times(9)).addMetric(firstBatchCaptor.capture());
+        verifyNoMoreInteractions(telemetryService);
+
+        List<Metric> firstBatch = firstBatchCaptor.getAllValues();
+        assertMetric(firstBatch, "waf.init", 1L, null);
+        assertRequestMetric(
+                firstBatch, 3L, requestTags("rules_ver_1", false, false, false, false, false, false, false));
+        assertRequestMetric(firstBatch, 1L, requestTags("rules_ver_1", true, false, false, false, false, false, false));
+        assertRequestMetric(firstBatch, 1L, requestTags("rules_ver_1", false, true, false, false, false, false, false));
+        assertRequestMetric(firstBatch, 1L, requestTags("rules_ver_1", false, false, true, false, false, false, false));
+        assertRequestMetric(firstBatch, 1L, requestTags("rules_ver_1", false, false, false, true, false, false, false));
+        assertRequestMetric(firstBatch, 1L, requestTags("rules_ver_1", false, false, false, false, true, false, false));
+        assertRequestMetric(firstBatch, 1L, requestTags("rules_ver_1", false, false, false, false, false, true, false));
+        assertRequestMetric(firstBatch, 1L, requestTags("rules_ver_1", false, false, false, false, false, false, true));
+
+        clearInvocations(telemetryService);
+
+        // waf.updates happens
+        WafMetricCollector.get().wafUpdates("rules_ver_2", true);
+        WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false, false);
+        WafMetricCollector.get().wafRequest(true, false, false, false, false, false, false, false);
+        WafMetricCollector.get().wafRequest(false, true, false, false, false, false, false, false);
+        WafMetricCollector.get().wafRequest(false, false, false, true, false, false, false, false);
+        WafMetricCollector.get().wafRequest(false, false, true, false, false, false, false, false);
+        WafMetricCollector.get().wafRequest(false, false, false, false, false, true, false, false);
+        WafMetricCollector.get().wafRequest(false, false, false, false, true, false, false, false);
+        WafMetricCollector.get().wafRequest(false, false, false, false, false, false, true, false);
+        WafMetricCollector.get().prepareMetrics();
+        periodicAction.doIteration(telemetryService);
+
+        // following waf.request have a new event_rules_version tag
+        ArgumentCaptor<Metric> secondBatchCaptor = forClass(Metric.class);
+        verify(telemetryService, times(9)).addMetric(secondBatchCaptor.capture());
+        verifyNoMoreInteractions(telemetryService);
+
+        List<Metric> secondBatch = secondBatchCaptor.getAllValues();
+        assertMetric(secondBatch, "waf.updates", 1L, null);
+        assertRequestMetric(
+                secondBatch, 1L, requestTags("rules_ver_2", false, false, false, false, false, false, false));
+        assertRequestMetric(
+                secondBatch, 1L, requestTags("rules_ver_2", true, false, false, false, false, false, false));
+        assertRequestMetric(
+                secondBatch, 1L, requestTags("rules_ver_2", false, true, false, false, false, false, false));
+        assertRequestMetric(
+                secondBatch, 1L, requestTags("rules_ver_2", false, false, true, false, false, false, false));
+        assertRequestMetric(
+                secondBatch, 1L, requestTags("rules_ver_2", false, false, false, true, false, false, false));
+        assertRequestMetric(
+                secondBatch, 1L, requestTags("rules_ver_2", false, false, false, false, true, false, false));
+        assertRequestMetric(
+                secondBatch, 1L, requestTags("rules_ver_2", false, false, false, false, false, true, false));
+        assertRequestMetric(
+                secondBatch, 1L, requestTags("rules_ver_2", false, false, false, false, false, false, true));
+    }
+
+    private void assertRequestMetric(List<Metric> metrics, long expectedCount, List<String> tags) {
+        assertMetric(metrics, "waf.requests", expectedCount, tags);
+    }
+
+    /**
+     * Metrics with equal tags are aggregated into a single point by production code, but ones with
+     * distinct tags land in a HashMap keyed by content, so their relative order in the captured list
+     * is not guaranteed. Match by (metric name, tags) rather than by position.
+     */
+    private void assertMetric(List<Metric> metrics, String metricName, long expectedCount, List<String> tags) {
+        List<Metric> matches = metrics.stream()
+                .filter(metric -> metric.getMetric().equals(metricName))
+                .filter(metric -> tags == null || tags.equals(metric.getTags()))
+                .collect(Collectors.toList());
+        assertEquals(1, matches.size(), "expected exactly one match for " + metricName + " " + tags);
+
+        Metric metric = matches.get(0);
+        assertEquals("appsec", metric.getNamespace());
+        assertEquals(expectedCount, metric.getPoints().get(0).get(1).longValue());
+    }
+
+    private List<String> requestTags(
+            String rulesVersion,
+            boolean ruleTriggered,
+            boolean requestBlocked,
+            boolean wafError,
+            boolean wafTimeout,
+            boolean blockFailure,
+            boolean rateLimited,
+            boolean inputTruncated) {
+        return Arrays.asList(
+                "waf_version:0.0.0",
+                "event_rules_version:" + rulesVersion,
+                "rule_triggered:" + ruleTriggered,
+                "request_blocked:" + requestBlocked,
+                "waf_error:" + wafError,
+                "waf_timeout:" + wafTimeout,
+                "block_failure:" + blockFailure,
+                "rate_limited:" + rateLimited,
+                "input_truncated:" + inputTruncated,
+                "request_excluded:none");
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/products/ProductChangeActionTest.java b/telemetry/src/test/java/datadog/telemetry/products/ProductChangeActionTest.java
index d9fcdfad876..4a4c552964e 100644
--- a/telemetry/src/test/java/datadog/telemetry/products/ProductChangeActionTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/products/ProductChangeActionTest.java
@@ -16,22 +16,22 @@
 
 class ProductChangeActionTest {
 
-  private final ProductChangeAction action = new ProductChangeAction();
-  private final TelemetryService telemetryService = mock(TelemetryService.class);
+    private final ProductChangeAction action = new ProductChangeAction();
+    private final TelemetryService telemetryService = mock(TelemetryService.class);
 
-  @Test
-  void pushProductChangesIntoTheTelemetryService() {
-    ProductChangeCollector.get().update(new ProductChange().productType(APPSEC).enabled(true));
+    @Test
+    void pushProductChangesIntoTheTelemetryService() {
+        ProductChangeCollector.get()
+                .update(new ProductChange().productType(APPSEC).enabled(true));
 
-    action.doIteration(telemetryService);
+        action.doIteration(telemetryService);
 
-    ArgumentCaptor<ProductChange> productChangeCaptor =
-        ArgumentCaptor.forClass(ProductChange.class);
-    verify(telemetryService, times(1)).addProductChange(productChangeCaptor.capture());
-    ProductChange productChange = productChangeCaptor.getValue();
-    assertEquals(APPSEC, productChange.getProductType());
-    assertTrue(productChange.isEnabled());
+        ArgumentCaptor<ProductChange> productChangeCaptor = ArgumentCaptor.forClass(ProductChange.class);
+        verify(telemetryService, times(1)).addProductChange(productChangeCaptor.capture());
+        ProductChange productChange = productChangeCaptor.getValue();
+        assertEquals(APPSEC, productChange.getProductType());
+        assertTrue(productChange.isEnabled());
 
-    verifyNoMoreInteractions(telemetryService);
-  }
+        verifyNoMoreInteractions(telemetryService);
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/rum/RumPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/rum/RumPeriodicActionTest.java
index 83af780c9c5..09f3a6ad04f 100644
--- a/telemetry/src/test/java/datadog/telemetry/rum/RumPeriodicActionTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/rum/RumPeriodicActionTest.java
@@ -19,48 +19,48 @@
 
 class RumPeriodicActionTest {
 
-  private final TelemetryService telemetryService = mock(TelemetryService.class);
+    private final TelemetryService telemetryService = mock(TelemetryService.class);
 
-  @Test
-  void pushRumMetricsIntoTheTelemetryService() {
-    RumInjectorMetrics metricsCollector = new RumInjectorMetrics();
-    metricsCollector.onInjectionSucceed("3");
-    metricsCollector.onInjectionFailed("5", "gzip");
-    metricsCollector.onInjectionResponseSize("3", 1024);
+    @Test
+    void pushRumMetricsIntoTheTelemetryService() {
+        RumInjectorMetrics metricsCollector = new RumInjectorMetrics();
+        metricsCollector.onInjectionSucceed("3");
+        metricsCollector.onInjectionFailed("5", "gzip");
+        metricsCollector.onInjectionResponseSize("3", 1024);
 
-    RumPeriodicAction periodicAction = new RumPeriodicAction(metricsCollector);
+        RumPeriodicAction periodicAction = new RumPeriodicAction(metricsCollector);
 
-    periodicAction.doIteration(telemetryService);
+        periodicAction.doIteration(telemetryService);
 
-    ArgumentCaptor<Metric> metricCaptor = forClass(Metric.class);
-    verify(telemetryService, times(2)).addMetric(metricCaptor.capture());
-    Metric succeedMetric = metricCaptor.getAllValues().get(0);
-    assertEquals("rum", succeedMetric.getNamespace());
-    assertEquals("injection.succeed", succeedMetric.getMetric());
-    assertEquals(Metric.TypeEnum.COUNT, succeedMetric.getType());
+        ArgumentCaptor<Metric> metricCaptor = forClass(Metric.class);
+        verify(telemetryService, times(2)).addMetric(metricCaptor.capture());
+        Metric succeedMetric = metricCaptor.getAllValues().get(0);
+        assertEquals("rum", succeedMetric.getNamespace());
+        assertEquals("injection.succeed", succeedMetric.getMetric());
+        assertEquals(Metric.TypeEnum.COUNT, succeedMetric.getType());
 
-    Metric failedMetric = metricCaptor.getAllValues().get(1);
-    assertEquals("rum", failedMetric.getNamespace());
-    assertEquals("injection.failed", failedMetric.getMetric());
-    assertEquals(Metric.TypeEnum.COUNT, failedMetric.getType());
+        Metric failedMetric = metricCaptor.getAllValues().get(1);
+        assertEquals("rum", failedMetric.getNamespace());
+        assertEquals("injection.failed", failedMetric.getMetric());
+        assertEquals(Metric.TypeEnum.COUNT, failedMetric.getType());
 
-    ArgumentCaptor<DistributionSeries> distributionCaptor = forClass(DistributionSeries.class);
-    verify(telemetryService, times(1)).addDistributionSeries(distributionCaptor.capture());
-    DistributionSeries distribution = distributionCaptor.getValue();
-    assertEquals("rum", distribution.getNamespace());
-    assertEquals("injection.response.bytes", distribution.getMetric());
+        ArgumentCaptor<DistributionSeries> distributionCaptor = forClass(DistributionSeries.class);
+        verify(telemetryService, times(1)).addDistributionSeries(distributionCaptor.capture());
+        DistributionSeries distribution = distributionCaptor.getValue();
+        assertEquals("rum", distribution.getNamespace());
+        assertEquals("injection.response.bytes", distribution.getMetric());
 
-    verifyNoMoreInteractions(telemetryService);
-  }
+        verifyNoMoreInteractions(telemetryService);
+    }
 
-  @Test
-  void pushNothingWhenNoMetricsCollectorIsSet() {
-    RumPeriodicAction periodicAction = new RumPeriodicAction(RumTelemetryCollector.NO_OP);
+    @Test
+    void pushNothingWhenNoMetricsCollectorIsSet() {
+        RumPeriodicAction periodicAction = new RumPeriodicAction(RumTelemetryCollector.NO_OP);
 
-    periodicAction.doIteration(telemetryService);
+        periodicAction.doIteration(telemetryService);
 
-    verify(telemetryService, never()).addMetric(any());
-    verify(telemetryService, never()).addDistributionSeries(any());
-    verifyNoMoreInteractions(telemetryService);
-  }
+        verify(telemetryService, never()).addMetric(any());
+        verify(telemetryService, never()).addDistributionSeries(any());
+        verifyNoMoreInteractions(telemetryService);
+    }
 }
diff --git a/telemetry/src/test/java/datadog/telemetry/sca/ScaReachabilityPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/sca/ScaReachabilityPeriodicActionTest.java
index 4037e73286c..966327ff637 100644
--- a/telemetry/src/test/java/datadog/telemetry/sca/ScaReachabilityPeriodicActionTest.java
+++ b/telemetry/src/test/java/datadog/telemetry/sca/ScaReachabilityPeriodicActionTest.java
@@ -27,648 +27,617 @@
 
 class ScaReachabilityPeriodicActionTest {
 
-  private TelemetryService telService;
-  private ScaReachabilityPeriodicAction action;
-
-  @BeforeEach
-  void setUp() {
-    ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
-    telService = mock(TelemetryService.class);
-    DependencyService depService = mock(DependencyService.class);
-    when(depService.drainDeterminedDependencies()).thenReturn(Collections.emptyList());
-    action = new ScaReachabilityPeriodicAction(depService);
-    // Pre-populate knownDeps with the common test dep so registry-only tests can emit via Step 3.
-    // This simulates the dep having been resolved by DependencyService in a prior heartbeat.
-    action.addKnownDepForTesting("com.example:lib", "1.0.0");
-    action.addKnownDepForTesting("com.example:lib-a", "1.0.0");
-    action.addKnownDepForTesting("com.example:lib-b", "2.0.0");
-    action.addKnownDepForTesting("com.other:lib", "2.0.0");
-  }
-
-  @Test
-  void doesNothingWhenNoPendingDependencies() {
-    action.doIteration(telService);
-    verify(telService, never()).addDependency(org.mockito.Mockito.any());
-  }
-
-  @Test
-  void reportsRegisteredCveWithEmptyReached() {
-    // CVE registered but no hit yet → metadata: [{cve-1, reached:[]}]
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-xxx");
-
-    action.doIteration(telService);
-
-    ArgumentCaptor<Dependency> captor = forClass(Dependency.class);
-    verify(telService, times(1)).addDependency(captor.capture());
-    Dependency dep = captor.getValue();
-    assertEquals("com.example:lib", dep.name);
-    assertEquals(1, dep.reachabilityMetadata.size());
-    assertTrue(
-        dep.reachabilityMetadata.get(0).contains("\"reached\":[]"),
-        "CVE with no hit must have reached:[]");
-    assertTrue(dep.reachabilityMetadata.get(0).contains("\"id\":\"GHSA-xxx\""));
-  }
-
-  @Test
-  void reportsRegisteredCveWithCallsiteAfterHit() {
-    // CVE registered, then hit → metadata: [{cve-1, reached:[callsite]}]
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-xxx");
-    ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-        "com.example:lib", "1.0.0", "GHSA-xxx", "com.myapp.Service", "process", 42);
-
-    action.doIteration(telService);
-
-    ArgumentCaptor<Dependency> captor = forClass(Dependency.class);
-    verify(telService, times(1)).addDependency(captor.capture());
-    String metaValue = captor.getValue().reachabilityMetadata.get(0);
-    assertTrue(metaValue.contains("\"path\":\"com.myapp.Service\""));
-    assertTrue(metaValue.contains("\"symbol\":\"process\""));
-    assertTrue(metaValue.contains("\"line\":42"));
-    assertFalse(metaValue.contains("\"reached\":[]"), "Hit must not produce empty reached");
-  }
-
-  @Test
-  void groupsTwoCvesForSameArtifactIntoOneEntry() {
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve(
-        "com.example:lib", "1.0.0", "GHSA-cve-1");
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve(
-        "com.example:lib", "1.0.0", "GHSA-cve-2");
-
-    action.doIteration(telService);
-
-    ArgumentCaptor<Dependency> captor = forClass(Dependency.class);
-    verify(telService, times(1)).addDependency(captor.capture());
-    Dependency dep = captor.getValue();
-    assertEquals(2, dep.reachabilityMetadata.size());
-    assertTrue(dep.reachabilityMetadata.stream().anyMatch(v -> v.contains("GHSA-cve-1")));
-    assertTrue(dep.reachabilityMetadata.stream().anyMatch(v -> v.contains("GHSA-cve-2")));
-  }
-
-  @Test
-  void reportsAllCvesWhenOneIsHit() {
-    // RFC requirement: when cve-1 is hit, re-report BOTH cve-1 (with callsite) and cve-2 (empty)
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve(
-        "com.example:lib", "1.0.0", "GHSA-cve-1");
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve(
-        "com.example:lib", "1.0.0", "GHSA-cve-2");
-    // First heartbeat: both sent with empty reached
-    action.doIteration(telService);
-
-    // Now hit cve-1
-    ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-        "com.example:lib", "1.0.0", "GHSA-cve-1", "com.myapp.Svc", "call", 10);
-
-    // Second heartbeat: BOTH CVEs re-reported — cve-1 with callsite, cve-2 still empty
-    action.doIteration(telService);
-
-    ArgumentCaptor<Dependency> captor = forClass(Dependency.class);
-    verify(telService, times(2)).addDependency(captor.capture());
-    List<Dependency> reported = captor.getAllValues();
-    Dependency secondReport = reported.get(1);
-    assertEquals(2, secondReport.reachabilityMetadata.size());
-    // cve-1 now has a callsite
-    assertTrue(
-        secondReport.reachabilityMetadata.stream()
-            .anyMatch(v -> v.contains("GHSA-cve-1") && v.contains("\"path\"")));
-    // cve-2 still has empty reached
-    assertTrue(
-        secondReport.reachabilityMetadata.stream()
-            .anyMatch(v -> v.contains("GHSA-cve-2") && v.contains("\"reached\":[]")));
-  }
-
-  @Test
-  void separateEntriesForDifferentArtifacts() {
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib-a", "1.0.0", "GHSA-a");
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib-b", "2.0.0", "GHSA-b");
-
-    action.doIteration(telService);
-
-    verify(telService, times(2)).addDependency(org.mockito.Mockito.any());
-  }
-
-  @Test
-  void drainsClearsPendingState() {
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-x");
-
-    action.doIteration(telService);
-    verify(telService, times(1)).addDependency(org.mockito.Mockito.any());
-
-    // Second iteration with no new state — nothing to report
-    TelemetryService telService2 = mock(TelemetryService.class);
-    action.doIteration(telService2);
-    verify(telService2, never()).addDependency(org.mockito.Mockito.any());
-  }
-
-  /**
-   * Validates the full RFC heartbeat flow (Heartbeats #2–#6 from the spec):
-   *
-   * <ol>
-   *   <li>Heartbeat after CVE registration: both CVEs reported with reached:[]
-   *   <li>Heartbeat with no changes: nothing reported
-   *   <li>Heartbeat after first CVE hit: both CVEs reported (one with callsite, one empty)
-   *   <li>Heartbeat with no changes: nothing reported
-   *   <li>Heartbeat after second CVE hit: both CVEs reported with their respective callsites
-   * </ol>
-   */
-  @Test
-  void rfcFullHeartbeatFlow_twoCveSameDepBothHitSequentially() {
-    // Phase 1 — CVE registration (Heartbeat #2)
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve(
-        "com.example:lib", "1.0.0", "GHSA-cve-1");
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve(
-        "com.example:lib", "1.0.0", "GHSA-cve-2");
-
-    action.doIteration(telService);
-
-    ArgumentCaptor<Dependency> captor1 = ArgumentCaptor.forClass(Dependency.class);
-    verify(telService, times(1)).addDependency(captor1.capture());
-    Dependency hb2 = captor1.getValue();
-    assertEquals(2, hb2.reachabilityMetadata.size());
-    assertTrue(
-        hb2.reachabilityMetadata.stream().allMatch(v -> v.contains("\"reached\":[]")),
-        "Heartbeat #2: both CVEs must have reached:[]");
-
-    // Phase 2 — No changes (Heartbeat #3)
-    TelemetryService telService3 = mock(TelemetryService.class);
-    action.doIteration(telService3);
-    verify(telService3, never()).addDependency(org.mockito.Mockito.any());
-
-    // Phase 3 — First CVE hit (Heartbeat #4)
-    ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-        "com.example:lib", "1.0.0", "GHSA-cve-1", "com.myapp.Controller", "handleRequest", 10);
-
-    TelemetryService telService4 = mock(TelemetryService.class);
-    action.doIteration(telService4);
-
-    ArgumentCaptor<Dependency> captor4 = ArgumentCaptor.forClass(Dependency.class);
-    verify(telService4, times(1)).addDependency(captor4.capture());
-    Dependency hb4 = captor4.getValue();
-    assertEquals(2, hb4.reachabilityMetadata.size());
-    assertTrue(
-        hb4.reachabilityMetadata.stream()
-            .anyMatch(v -> v.contains("GHSA-cve-1") && v.contains("\"path\"")),
-        "Heartbeat #4: cve-1 must have callsite");
-    assertTrue(
-        hb4.reachabilityMetadata.stream()
-            .anyMatch(v -> v.contains("GHSA-cve-2") && v.contains("\"reached\":[]")),
-        "Heartbeat #4: cve-2 must still have reached:[]");
-
-    // Phase 4 — No changes (Heartbeat #5)
-    TelemetryService telService5 = mock(TelemetryService.class);
-    action.doIteration(telService5);
-    verify(telService5, never()).addDependency(org.mockito.Mockito.any());
-
-    // Phase 5 — Second CVE hit (Heartbeat #6)
-    ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-        "com.example:lib", "1.0.0", "GHSA-cve-2", "com.myapp.Service", "processData", 44);
-
-    TelemetryService telService6 = mock(TelemetryService.class);
-    action.doIteration(telService6);
-
-    ArgumentCaptor<Dependency> captor6 = ArgumentCaptor.forClass(Dependency.class);
-    verify(telService6, times(1)).addDependency(captor6.capture());
-    Dependency hb6 = captor6.getValue();
-    assertEquals(2, hb6.reachabilityMetadata.size());
-    assertTrue(
-        hb6.reachabilityMetadata.stream()
-            .anyMatch(v -> v.contains("GHSA-cve-1") && v.contains("\"path\"")),
-        "Heartbeat #6: cve-1 must retain callsite");
-    assertTrue(
-        hb6.reachabilityMetadata.stream()
-            .anyMatch(v -> v.contains("GHSA-cve-2") && v.contains("\"path\"")),
-        "Heartbeat #6: cve-2 must now have callsite");
-  }
-
-  @Test
-  void buildMetadataValue_emptyReachedWhenNoHit() {
-    ScaReachabilityDependencyRegistry.CveSnapshot cve =
-        new ScaReachabilityDependencyRegistry.CveSnapshot("GHSA-645p-88qh-w398", null);
-
-    String value = ScaReachabilityPeriodicAction.buildMetadataValue(cve);
-
-    assertEquals(
-        "{\"id\":\"GHSA-645p-88qh-w398\",\"reached\":[]}",
-        value,
-        "CVE with no hit must produce reached:[]");
-  }
-
-  @Test
-  void buildMetadataValue_includesCallsiteWhenHit() {
-    ScaReachabilityHit hit =
-        new ScaReachabilityHit(
-            "GHSA-645p-88qh-w398",
-            "com.fasterxml.jackson.core:jackson-databind",
-            "2.8.5",
-            "com.fasterxml.jackson.databind.ObjectMapper",
-            "<clinit>",
-            1);
-    ScaReachabilityDependencyRegistry.CveSnapshot cve =
-        new ScaReachabilityDependencyRegistry.CveSnapshot("GHSA-645p-88qh-w398", hit);
-
-    String value = ScaReachabilityPeriodicAction.buildMetadataValue(cve);
-
-    assertEquals(
-        "{\"id\":\"GHSA-645p-88qh-w398\","
-            + "\"reached\":[{"
-            + "\"path\":\"com.fasterxml.jackson.databind.ObjectMapper\","
-            + "\"symbol\":\"<clinit>\","
-            + "\"line\":1}]}",
-        value);
-  }
-
-  // ---------------------------------------------------------------------------
-  // Merge logic: DependencyService + ScaReachabilityDependencyRegistry
-  // ---------------------------------------------------------------------------
-
-  private static ScaReachabilityPeriodicAction actionWithDeps(Dependency... deps) {
-    DependencyService svc = mock(DependencyService.class);
-    org.mockito.Mockito.when(svc.drainDeterminedDependencies())
-        .thenReturn(java.util.Arrays.asList(deps));
-    return new ScaReachabilityPeriodicAction(svc);
-  }
-
-  @Test
-  void newDep_noCveState_emitsWithEmptyMetadata() {
-    // DependencyService returns a new dep; registry has nothing for it.
-    // Expected: one entry with metadata:[] (SCA-active signal, no CVE data yet).
-    Dependency incoming = new Dependency("com.example:lib", "1.0.0", "lib-1.0.0.jar", null);
-    ScaReachabilityPeriodicAction merged = actionWithDeps(incoming);
-
-    merged.doIteration(telService);
-
-    ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
-    verify(telService, times(1)).addDependency(captor.capture());
-    Dependency emitted = captor.getValue();
-    assertEquals("com.example:lib", emitted.name);
-    assertEquals("1.0.0", emitted.version);
-    assertNotNull(emitted.reachabilityMetadata, "metadata must not be null when SCA active");
-    assertTrue(emitted.reachabilityMetadata.isEmpty(), "metadata must be [] when no CVE state");
-  }
-
-  @Test
-  void newDep_withCveState_emitsMergedSingleEntry() {
-    // DependencyService returns dep X; registry has a pending CVE state for the same dep.
-    // Expected: ONE entry with the CVE metadata merged in — no separate dep:[] entry.
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve(
-        "com.example:lib", "1.0.0", "GHSA-test-1234");
-    ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-        "com.example:lib", "1.0.0", "GHSA-test-1234", "com.myapp.Ctrl", "handle", 10);
-
-    Dependency incoming = new Dependency("com.example:lib", "1.0.0", "lib-1.0.0.jar", "ABCD");
-    ScaReachabilityPeriodicAction merged = actionWithDeps(incoming);
-
-    merged.doIteration(telService);
-
-    ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
-    verify(telService, times(1)).addDependency(captor.capture());
-    Dependency emitted = captor.getValue();
-    assertEquals("com.example:lib", emitted.name);
-    assertEquals("1.0.0", emitted.version);
-    assertEquals("ABCD", emitted.hash, "source/hash from DependencyService must be preserved");
-    assertEquals(1, emitted.reachabilityMetadata.size());
-    assertTrue(emitted.reachabilityMetadata.get(0).contains("GHSA-test-1234"));
-    assertTrue(
-        emitted.reachabilityMetadata.get(0).contains("\"path\""),
-        "merged entry must include callsite");
-  }
-
-  @Test
-  void newDepAndUnrelatedCveState_emitsTwoIndependentEntries() {
-    // DependencyService returns depA; registry has pending state for depB (different dep).
-    // Expected: two separate entries — one for depA (metadata:[]), one for depB (CVE metadata).
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve(
-        "com.other:lib", "2.0.0", "GHSA-other-5678");
-
-    Dependency incomingA = new Dependency("com.example:lib", "1.0.0", "lib-1.0.0.jar", null);
-    ScaReachabilityPeriodicAction merged = actionWithDeps(incomingA);
-    // Simulate com.other:lib having been resolved by DependencyService in a prior heartbeat
-    merged.addKnownDepForTesting("com.other:lib", "2.0.0");
-
-    merged.doIteration(telService);
-
-    ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
-    verify(telService, times(2)).addDependency(captor.capture());
-    java.util.List<Dependency> emitted = captor.getAllValues();
-
-    Dependency depA =
-        emitted.stream()
-            .filter(d -> "com.example:lib".equals(d.name))
-            .findFirst()
-            .orElseThrow(() -> new AssertionError("dep not found"));
-    Dependency depB =
-        emitted.stream()
-            .filter(d -> "com.other:lib".equals(d.name))
-            .findFirst()
-            .orElseThrow(() -> new AssertionError("dep not found"));
-
-    assertTrue(depA.reachabilityMetadata.isEmpty(), "depA: no CVE state → metadata:[]");
-    assertTrue(
-        depB.reachabilityMetadata.get(0).contains("GHSA-other-5678"), "depB: must carry CVE state");
-  }
-
-  // ---------------------------------------------------------------------------
-  // knownDeps / timing invariant tests
-  // ---------------------------------------------------------------------------
-
-  /**
-   * Dep resolved by DependencyService in heartbeat N; CVE fires in heartbeat N+1. The dep is
-   * already in knownDeps, so Step 3 emits it with source/hash.
-   */
-  @Test
-  void cveFiresAfterDepResolved_usesKnownDepsForSourceHash() {
-    DependencyService svc = mock(DependencyService.class);
-    // Heartbeat 1: DependencyService returns the dep, no CVE yet
-    when(svc.drainDeterminedDependencies())
-        .thenReturn(
-            Collections.singletonList(
-                new Dependency("com.example:lib", "1.0.0", "lib.jar", "ABCD")))
-        .thenReturn(Collections.emptyList()); // heartbeat 2: nothing new
-    ScaReachabilityPeriodicAction merged = new ScaReachabilityPeriodicAction(svc);
-
-    // Heartbeat 1: dep detected, no CVE → emits metadata:[]
-    merged.doIteration(telService);
-
-    // CVE fires between heartbeat 1 and 2
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-late");
-
-    // Heartbeat 2: DependencyService is empty, but CVE is pending
-    TelemetryService telService2 = mock(TelemetryService.class);
-    merged.doIteration(telService2);
-
-    ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
-    verify(telService2, times(1)).addDependency(captor.capture());
-    Dependency emitted = captor.getValue();
-    assertEquals("lib.jar", emitted.source, "source from knownDeps must be preserved");
-    assertEquals("ABCD", emitted.hash, "hash from knownDeps must be preserved");
-    assertTrue(emitted.reachabilityMetadata.get(0).contains("GHSA-late"));
-  }
-
-  /**
-   * CVE fires before DependencyService has resolved the dep (timing race).
-   *
-   * <p>Step 3 emits immediately without source/hash so CVE data is never delayed (system tests need
-   * data within seconds). When the dep is later resolved and stored in knownDeps, subsequent CVE
-   * emissions (e.g., after a method hit) carry source/hash automatically.
-   */
-  @Test
-  void cveFiresBeforeDepResolved_emitsImmediatelyWithoutSourceHash() {
-    DependencyService svc = mock(DependencyService.class);
-    // Heartbeat 1: DependencyService is empty (dep not yet resolved)
-    when(svc.drainDeterminedDependencies()).thenReturn(Collections.emptyList());
-    ScaReachabilityPeriodicAction merged = new ScaReachabilityPeriodicAction(svc);
-
-    // CVE fires before DependencyService resolves the dep
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-race");
-    ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-        "com.example:lib", "1.0.0", "GHSA-race", "com.app.Ctrl", "handle", 10);
-
-    // Heartbeat 1: emits immediately without source/hash — CVE data is not delayed
-    merged.doIteration(telService);
-
-    ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
-    verify(telService, times(1)).addDependency(captor.capture());
-    Dependency emitted = captor.getValue();
-    assertNull(emitted.source, "source is null when dep not yet in knownDeps");
-    assertNull(emitted.hash, "hash is null when dep not yet in knownDeps");
-    assertTrue(emitted.reachabilityMetadata.get(0).contains("GHSA-race"));
-    assertTrue(emitted.reachabilityMetadata.get(0).contains("\"path\""), "must include callsite");
-  }
-
-  /**
-   * Regression test for the Codex P2 race condition: CVE registered in HB1 (dep not yet resolved),
-   * emitted immediately without source/hash. In HB2 DependencyService resolves the JAR — if we
-   * naively emit metadata:[] because there is no pending snapshot, the backend overwrites the CVE
-   * state it already received. The fix uses peekSnapshot so HB2 emits the CVE metadata together
-   * with the now-known source/hash.
-   */
-  @Test
-  void cveRegisteredBeforeDepResolved_step2PeeksCveStateInLaterHeartbeat() {
-    DependencyService svc = mock(DependencyService.class);
-
-    // HB1: CVE registered, dep not yet resolved by DependencyService
-    when(svc.drainDeterminedDependencies()).thenReturn(Collections.emptyList());
-    ScaReachabilityPeriodicAction action = new ScaReachabilityPeriodicAction(svc);
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-peek");
-
-    action.doIteration(telService);
-
-    // HB1 emits once: CVE state without source/hash (dep not yet resolved)
-    verify(telService, times(1)).addDependency(any(Dependency.class));
-    reset(telService);
-
-    // HB2: DependencyService now resolves the JAR; no new CVE activity (pendingReport=false)
-    Dependency resolved = new Dependency("com.example:lib", "1.0.0", "lib-1.0.0.jar", "CAFEBABE");
-    when(svc.drainDeterminedDependencies()).thenReturn(Collections.singletonList(resolved));
-
-    action.doIteration(telService);
-
-    ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
-    verify(telService, times(1)).addDependency(captor.capture());
-    Dependency emitted = captor.getValue();
-    assertEquals("lib-1.0.0.jar", emitted.source, "HB2 must include resolved source");
-    assertEquals("CAFEBABE", emitted.hash, "HB2 must include resolved hash");
-    assertFalse(
-        emitted.reachabilityMetadata.isEmpty(),
-        "HB2 must not emit metadata:[] — CVE state must be preserved via peekSnapshot");
-    assertTrue(
-        emitted.reachabilityMetadata.get(0).contains("GHSA-peek"),
-        "HB2 metadata must contain the CVE id");
-  }
-
-  /**
-   * Regression test for the multi-classloader re-detection bug.
-   *
-   * <p>{@link DependencyService} can report the same JAR on consecutive heartbeats when it
-   * discovers it from multiple classloaders in the same application. The CVE hit must be emitted
-   * exactly once — on the heartbeat where the CVE state is pending or first detected via {@code
-   * peekSnapshot}. Re-detections of the same JAR with no new CVE activity must produce no emission.
-   *
-   * <p>Without the fix, Step 2 called {@code peekSnapshot} unconditionally when {@code
-   * snapshotByKey} had no entry, causing the hit to be re-emitted on every subsequent heartbeat
-   * where {@code DependencyService} reported the JAR again (e.g. from a different classloader).
-   */
-  @Test
-  void depReDetectedByDependencyService_hitNotReEmittedOnSubsequentDetection() {
-    DependencyService svc = mock(DependencyService.class);
-    Dependency dep = new Dependency("com.example:lib", "1.0.0", "lib.jar", "HASH");
-    // Same dep returned on both heartbeats (simulates multiple classloaders detecting the same JAR)
-    when(svc.drainDeterminedDependencies())
-        .thenReturn(Collections.singletonList(dep)) // HB1: first detection
-        .thenReturn(Collections.singletonList(dep)); // HB2: re-detected from another classloader
-    ScaReachabilityPeriodicAction merged = new ScaReachabilityPeriodicAction(svc);
-
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-dup");
-    ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-        "com.example:lib", "1.0.0", "GHSA-dup", "com.app.Ctrl", "handle", 10);
-
-    // HB1: first detection, CVE is pending → emit merged entry with hit
-    merged.doIteration(telService);
-    ArgumentCaptor<Dependency> captor1 = ArgumentCaptor.forClass(Dependency.class);
-    verify(telService, times(1)).addDependency(captor1.capture());
-    assertTrue(
-        captor1.getValue().reachabilityMetadata.get(0).contains("\"path\""),
-        "HB1 must include the callsite hit");
-    reset(telService);
-
-    // HB2: same JAR re-detected, no new CVE activity → must NOT re-emit the hit
-    merged.doIteration(telService);
-    verify(telService, never()).addDependency(any());
-  }
-
-  /**
-   * Companion to {@link #depReDetectedByDependencyService_hitNotReEmittedOnSubsequentDetection}:
-   * verifies that a REAL new CVE state change (hit arriving between heartbeats) is still emitted
-   * correctly even when DependencyService also reports the dep again on the same heartbeat.
-   */
-  @Test
-  void depReDetectedWithNewHit_emitsOnceWithNewHit() {
-    DependencyService svc = mock(DependencyService.class);
-    Dependency dep = new Dependency("com.example:lib", "1.0.0", "lib.jar", "HASH");
-    when(svc.drainDeterminedDependencies())
-        .thenReturn(Collections.singletonList(dep)) // HB1
-        .thenReturn(Collections.singletonList(dep)); // HB2
-    ScaReachabilityPeriodicAction merged = new ScaReachabilityPeriodicAction(svc);
-
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-new");
-
-    // HB1: first detection, CVE pending with reached:[] → emitted once
-    merged.doIteration(telService);
-    verify(telService, times(1)).addDependency(any());
-    reset(telService);
-
-    // Hit recorded between HB1 and HB2
-    ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
-        "com.example:lib", "1.0.0", "GHSA-new", "com.app.Svc", "exec", 7);
-
-    // HB2: re-detection AND new hit pending (snapshotByKey has the entry) → emit once with hit
-    merged.doIteration(telService);
-    ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
-    verify(telService, times(1)).addDependency(captor.capture());
-    assertTrue(
-        captor.getValue().reachabilityMetadata.get(0).contains("\"path\""),
-        "HB2 must include the new callsite hit");
-  }
-
-  /**
-   * Dep and CVE arrive simultaneously (same heartbeat) — existing Step 2 merge path. This existing
-   * behavior must still work after the knownDeps refactor.
-   */
-  @Test
-  void cveAndDepArriveSameHeartbeat_step2MergeStillWorks() {
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve(
-        "com.example:lib", "1.0.0", "GHSA-simultaneous");
-
-    Dependency incoming = new Dependency("com.example:lib", "1.0.0", "lib.jar", "HASH");
-    ScaReachabilityPeriodicAction merged = actionWithDeps(incoming);
-
-    merged.doIteration(telService);
-
-    ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
-    verify(telService, times(1)).addDependency(captor.capture());
-    Dependency emitted = captor.getValue();
-    assertEquals("lib.jar", emitted.source, "Step 2 merge must preserve source");
-    assertTrue(emitted.reachabilityMetadata.get(0).contains("GHSA-simultaneous"));
-  }
-
-  /**
-   * Regression test for the registry key mismatch for JARs without pom.properties (PR #11614).
-   *
-   * <p>For JARs without {@code pom.properties}, {@code DependencyResolver.guessFallbackNoPom}
-   * produces an artifact-ID-only name (e.g. {@code "junrar"} instead of {@code
-   * "com.github.junrar:junrar"}). The transformer must register the CVE under the same name so that
-   * the registry key matches what {@code DependencyService} will report.
-   *
-   * <p>Without the fix, {@code registerCve} was called with {@code entry.artifact()} = {@code
-   * "com.github.junrar:junrar"}, while {@code DependencyService} reported {@code dep.name} = {@code
-   * "junrar"}. The result: two separate telemetry entries for the same physical JAR — one with
-   * {@code metadata:[]} (from Step 2, carrying source/hash but no CVE) and one with the CVE
-   * metadata (from Step 3, without source/hash).
-   *
-   * <p>With the fix, the transformer uses the resolved {@code dep.name} from {@code matchDep} (i.e.
-   * {@code "junrar"}) for {@code registerCve}, so the registry and {@code DependencyService} keys
-   * match. Step 2 merges them into a single emission with both the CVE metadata and source/hash.
-   */
-  @Test
-  void noPomJar_artifactIdOnlyName_cveAndSourceHashMergedIntoSingleEntry() {
-    // Simulates what ScaReachabilityTransformer.processClass() now does after the fix:
-    // registerCve with the artifactId-only name that DependencyService will also report.
-    ScaReachabilityDependencyRegistry.INSTANCE.registerCve("junrar", "7.5.5", "GHSA-hf5p-test");
-
-    // DependencyService returns the dep with the same artifactId-only name (guessFallbackNoPom).
-    Dependency incoming = new Dependency("junrar", "7.5.5", "junrar-7.5.5.jar", "CAFEBABE");
-    ScaReachabilityPeriodicAction merged = actionWithDeps(incoming);
-
-    merged.doIteration(telService);
-
-    // Must produce exactly ONE emission with BOTH the CVE metadata AND source/hash — not two
-    // separate entries (one with CVE but no source/hash, one with source/hash but no CVE).
-    ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
-    verify(telService, times(1)).addDependency(captor.capture());
-    Dependency emitted = captor.getValue();
-    assertEquals(
-        "junrar", emitted.name, "name must be the artifactId-only name from DependencyService");
-    assertEquals("7.5.5", emitted.version);
-    assertEquals(
-        "junrar-7.5.5.jar", emitted.source, "source/hash from DependencyService must be preserved");
-    assertEquals("CAFEBABE", emitted.hash, "hash from DependencyService must be preserved");
-    assertFalse(
-        emitted.reachabilityMetadata.isEmpty(),
-        "CVE metadata must NOT be lost — a single merged entry must carry both CVE data and source/hash");
-    assertTrue(emitted.reachabilityMetadata.get(0).contains("GHSA-hf5p-test"));
-  }
-
-  /**
-   * Same physical copy (identical source/hash) re-detected on a later heartbeat must NOT be
-   * re-emitted — the backend already received it. Mirrors a Spring Boot {@code
-   * LaunchedURLClassLoader} reporting the same nested JAR (same URI) again.
-   */
-  @Test
-  void sameSourceHashReDetected_doesNotReEmit() {
-    DependencyService svc = mock(DependencyService.class);
-    Dependency dep = new Dependency("com.example:lib", "1.0", "lib.jar", "AABB");
-    when(svc.drainDeterminedDependencies())
-        .thenReturn(Collections.singletonList(dep)) // HB1: first detection
-        .thenReturn(Collections.singletonList(dep)); // HB2: same physical copy re-detected
-    ScaReachabilityPeriodicAction merged = new ScaReachabilityPeriodicAction(svc);
-
-    // HB1: first detection → emits metadata:[] (SCA monitoring signal)
-    merged.doIteration(telService);
-    verify(telService, times(1)).addDependency(any(Dependency.class));
-    reset(telService);
-
-    // HB2: same source/hash → backend already knows it → no emission
-    merged.doIteration(telService);
-    verify(telService, never()).addDependency(any());
-  }
-
-  /**
-   * Two physical copies of the same {@code name@version} but with different source/hash (e.g. two
-   * Tomcat webapps each shipping their own copy of the artifact) must BOTH be emitted, matching the
-   * legacy {@code DependencyPeriodicAction} behavior.
-   */
-  @Test
-  void differentSourceHashSameKey_emitsBothPhysicalCopies() {
-    DependencyService svc = mock(DependencyService.class);
-    Dependency copy1 = new Dependency("com.example:lib", "1.0", "/app1/lib.jar", "AABB");
-    Dependency copy2 = new Dependency("com.example:lib", "1.0", "/app2/lib.jar", "CCDD");
-    when(svc.drainDeterminedDependencies())
-        .thenReturn(Collections.singletonList(copy1)) // HB1: first physical copy
-        .thenReturn(Collections.singletonList(copy2)); // HB2: distinct physical copy
-    ScaReachabilityPeriodicAction merged = new ScaReachabilityPeriodicAction(svc);
-
-    // HB1: first copy → emitted
-    merged.doIteration(telService);
-    ArgumentCaptor<Dependency> captor1 = ArgumentCaptor.forClass(Dependency.class);
-    verify(telService, times(1)).addDependency(captor1.capture());
-    assertEquals("/app1/lib.jar", captor1.getValue().source);
-    assertEquals("AABB", captor1.getValue().hash);
-    reset(telService);
-
-    // HB2: different source/hash → new physical copy → also emitted
-    merged.doIteration(telService);
-    ArgumentCaptor<Dependency> captor2 = ArgumentCaptor.forClass(Dependency.class);
-    verify(telService, times(1)).addDependency(captor2.capture());
-    assertEquals("/app2/lib.jar", captor2.getValue().source);
-    assertEquals("CCDD", captor2.getValue().hash);
-  }
+    private TelemetryService telService;
+    private ScaReachabilityPeriodicAction action;
+
+    @BeforeEach
+    void setUp() {
+        ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting();
+        telService = mock(TelemetryService.class);
+        DependencyService depService = mock(DependencyService.class);
+        when(depService.drainDeterminedDependencies()).thenReturn(Collections.emptyList());
+        action = new ScaReachabilityPeriodicAction(depService);
+        // Pre-populate knownDeps with the common test dep so registry-only tests can emit via Step 3.
+        // This simulates the dep having been resolved by DependencyService in a prior heartbeat.
+        action.addKnownDepForTesting("com.example:lib", "1.0.0");
+        action.addKnownDepForTesting("com.example:lib-a", "1.0.0");
+        action.addKnownDepForTesting("com.example:lib-b", "2.0.0");
+        action.addKnownDepForTesting("com.other:lib", "2.0.0");
+    }
+
+    @Test
+    void doesNothingWhenNoPendingDependencies() {
+        action.doIteration(telService);
+        verify(telService, never()).addDependency(org.mockito.Mockito.any());
+    }
+
+    @Test
+    void reportsRegisteredCveWithEmptyReached() {
+        // CVE registered but no hit yet → metadata: [{cve-1, reached:[]}]
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-xxx");
+
+        action.doIteration(telService);
+
+        ArgumentCaptor<Dependency> captor = forClass(Dependency.class);
+        verify(telService, times(1)).addDependency(captor.capture());
+        Dependency dep = captor.getValue();
+        assertEquals("com.example:lib", dep.name);
+        assertEquals(1, dep.reachabilityMetadata.size());
+        assertTrue(dep.reachabilityMetadata.get(0).contains("\"reached\":[]"), "CVE with no hit must have reached:[]");
+        assertTrue(dep.reachabilityMetadata.get(0).contains("\"id\":\"GHSA-xxx\""));
+    }
+
+    @Test
+    void reportsRegisteredCveWithCallsiteAfterHit() {
+        // CVE registered, then hit → metadata: [{cve-1, reached:[callsite]}]
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-xxx");
+        ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                "com.example:lib", "1.0.0", "GHSA-xxx", "com.myapp.Service", "process", 42);
+
+        action.doIteration(telService);
+
+        ArgumentCaptor<Dependency> captor = forClass(Dependency.class);
+        verify(telService, times(1)).addDependency(captor.capture());
+        String metaValue = captor.getValue().reachabilityMetadata.get(0);
+        assertTrue(metaValue.contains("\"path\":\"com.myapp.Service\""));
+        assertTrue(metaValue.contains("\"symbol\":\"process\""));
+        assertTrue(metaValue.contains("\"line\":42"));
+        assertFalse(metaValue.contains("\"reached\":[]"), "Hit must not produce empty reached");
+    }
+
+    @Test
+    void groupsTwoCvesForSameArtifactIntoOneEntry() {
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-cve-1");
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-cve-2");
+
+        action.doIteration(telService);
+
+        ArgumentCaptor<Dependency> captor = forClass(Dependency.class);
+        verify(telService, times(1)).addDependency(captor.capture());
+        Dependency dep = captor.getValue();
+        assertEquals(2, dep.reachabilityMetadata.size());
+        assertTrue(dep.reachabilityMetadata.stream().anyMatch(v -> v.contains("GHSA-cve-1")));
+        assertTrue(dep.reachabilityMetadata.stream().anyMatch(v -> v.contains("GHSA-cve-2")));
+    }
+
+    @Test
+    void reportsAllCvesWhenOneIsHit() {
+        // RFC requirement: when cve-1 is hit, re-report BOTH cve-1 (with callsite) and cve-2 (empty)
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-cve-1");
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-cve-2");
+        // First heartbeat: both sent with empty reached
+        action.doIteration(telService);
+
+        // Now hit cve-1
+        ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                "com.example:lib", "1.0.0", "GHSA-cve-1", "com.myapp.Svc", "call", 10);
+
+        // Second heartbeat: BOTH CVEs re-reported — cve-1 with callsite, cve-2 still empty
+        action.doIteration(telService);
+
+        ArgumentCaptor<Dependency> captor = forClass(Dependency.class);
+        verify(telService, times(2)).addDependency(captor.capture());
+        List<Dependency> reported = captor.getAllValues();
+        Dependency secondReport = reported.get(1);
+        assertEquals(2, secondReport.reachabilityMetadata.size());
+        // cve-1 now has a callsite
+        assertTrue(secondReport.reachabilityMetadata.stream()
+                .anyMatch(v -> v.contains("GHSA-cve-1") && v.contains("\"path\"")));
+        // cve-2 still has empty reached
+        assertTrue(secondReport.reachabilityMetadata.stream()
+                .anyMatch(v -> v.contains("GHSA-cve-2") && v.contains("\"reached\":[]")));
+    }
+
+    @Test
+    void separateEntriesForDifferentArtifacts() {
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib-a", "1.0.0", "GHSA-a");
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib-b", "2.0.0", "GHSA-b");
+
+        action.doIteration(telService);
+
+        verify(telService, times(2)).addDependency(org.mockito.Mockito.any());
+    }
+
+    @Test
+    void drainsClearsPendingState() {
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-x");
+
+        action.doIteration(telService);
+        verify(telService, times(1)).addDependency(org.mockito.Mockito.any());
+
+        // Second iteration with no new state — nothing to report
+        TelemetryService telService2 = mock(TelemetryService.class);
+        action.doIteration(telService2);
+        verify(telService2, never()).addDependency(org.mockito.Mockito.any());
+    }
+
+    /**
+     * Validates the full RFC heartbeat flow (Heartbeats #2–#6 from the spec):
+     *
+     * <ol>
+     *   <li>Heartbeat after CVE registration: both CVEs reported with reached:[]
+     *   <li>Heartbeat with no changes: nothing reported
+     *   <li>Heartbeat after first CVE hit: both CVEs reported (one with callsite, one empty)
+     *   <li>Heartbeat with no changes: nothing reported
+     *   <li>Heartbeat after second CVE hit: both CVEs reported with their respective callsites
+     * </ol>
+     */
+    @Test
+    void rfcFullHeartbeatFlow_twoCveSameDepBothHitSequentially() {
+        // Phase 1 — CVE registration (Heartbeat #2)
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-cve-1");
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-cve-2");
+
+        action.doIteration(telService);
+
+        ArgumentCaptor<Dependency> captor1 = ArgumentCaptor.forClass(Dependency.class);
+        verify(telService, times(1)).addDependency(captor1.capture());
+        Dependency hb2 = captor1.getValue();
+        assertEquals(2, hb2.reachabilityMetadata.size());
+        assertTrue(
+                hb2.reachabilityMetadata.stream().allMatch(v -> v.contains("\"reached\":[]")),
+                "Heartbeat #2: both CVEs must have reached:[]");
+
+        // Phase 2 — No changes (Heartbeat #3)
+        TelemetryService telService3 = mock(TelemetryService.class);
+        action.doIteration(telService3);
+        verify(telService3, never()).addDependency(org.mockito.Mockito.any());
+
+        // Phase 3 — First CVE hit (Heartbeat #4)
+        ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                "com.example:lib", "1.0.0", "GHSA-cve-1", "com.myapp.Controller", "handleRequest", 10);
+
+        TelemetryService telService4 = mock(TelemetryService.class);
+        action.doIteration(telService4);
+
+        ArgumentCaptor<Dependency> captor4 = ArgumentCaptor.forClass(Dependency.class);
+        verify(telService4, times(1)).addDependency(captor4.capture());
+        Dependency hb4 = captor4.getValue();
+        assertEquals(2, hb4.reachabilityMetadata.size());
+        assertTrue(
+                hb4.reachabilityMetadata.stream().anyMatch(v -> v.contains("GHSA-cve-1") && v.contains("\"path\"")),
+                "Heartbeat #4: cve-1 must have callsite");
+        assertTrue(
+                hb4.reachabilityMetadata.stream()
+                        .anyMatch(v -> v.contains("GHSA-cve-2") && v.contains("\"reached\":[]")),
+                "Heartbeat #4: cve-2 must still have reached:[]");
+
+        // Phase 4 — No changes (Heartbeat #5)
+        TelemetryService telService5 = mock(TelemetryService.class);
+        action.doIteration(telService5);
+        verify(telService5, never()).addDependency(org.mockito.Mockito.any());
+
+        // Phase 5 — Second CVE hit (Heartbeat #6)
+        ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                "com.example:lib", "1.0.0", "GHSA-cve-2", "com.myapp.Service", "processData", 44);
+
+        TelemetryService telService6 = mock(TelemetryService.class);
+        action.doIteration(telService6);
+
+        ArgumentCaptor<Dependency> captor6 = ArgumentCaptor.forClass(Dependency.class);
+        verify(telService6, times(1)).addDependency(captor6.capture());
+        Dependency hb6 = captor6.getValue();
+        assertEquals(2, hb6.reachabilityMetadata.size());
+        assertTrue(
+                hb6.reachabilityMetadata.stream().anyMatch(v -> v.contains("GHSA-cve-1") && v.contains("\"path\"")),
+                "Heartbeat #6: cve-1 must retain callsite");
+        assertTrue(
+                hb6.reachabilityMetadata.stream().anyMatch(v -> v.contains("GHSA-cve-2") && v.contains("\"path\"")),
+                "Heartbeat #6: cve-2 must now have callsite");
+    }
+
+    @Test
+    void buildMetadataValue_emptyReachedWhenNoHit() {
+        ScaReachabilityDependencyRegistry.CveSnapshot cve =
+                new ScaReachabilityDependencyRegistry.CveSnapshot("GHSA-645p-88qh-w398", null);
+
+        String value = ScaReachabilityPeriodicAction.buildMetadataValue(cve);
+
+        assertEquals(
+                "{\"id\":\"GHSA-645p-88qh-w398\",\"reached\":[]}", value, "CVE with no hit must produce reached:[]");
+    }
+
+    @Test
+    void buildMetadataValue_includesCallsiteWhenHit() {
+        ScaReachabilityHit hit = new ScaReachabilityHit(
+                "GHSA-645p-88qh-w398",
+                "com.fasterxml.jackson.core:jackson-databind",
+                "2.8.5",
+                "com.fasterxml.jackson.databind.ObjectMapper",
+                "<clinit>",
+                1);
+        ScaReachabilityDependencyRegistry.CveSnapshot cve =
+                new ScaReachabilityDependencyRegistry.CveSnapshot("GHSA-645p-88qh-w398", hit);
+
+        String value = ScaReachabilityPeriodicAction.buildMetadataValue(cve);
+
+        assertEquals(
+                "{\"id\":\"GHSA-645p-88qh-w398\","
+                        + "\"reached\":[{"
+                        + "\"path\":\"com.fasterxml.jackson.databind.ObjectMapper\","
+                        + "\"symbol\":\"<clinit>\","
+                        + "\"line\":1}]}",
+                value);
+    }
+
+    // ---------------------------------------------------------------------------
+    // Merge logic: DependencyService + ScaReachabilityDependencyRegistry
+    // ---------------------------------------------------------------------------
+
+    private static ScaReachabilityPeriodicAction actionWithDeps(Dependency... deps) {
+        DependencyService svc = mock(DependencyService.class);
+        org.mockito.Mockito.when(svc.drainDeterminedDependencies()).thenReturn(java.util.Arrays.asList(deps));
+        return new ScaReachabilityPeriodicAction(svc);
+    }
+
+    @Test
+    void newDep_noCveState_emitsWithEmptyMetadata() {
+        // DependencyService returns a new dep; registry has nothing for it.
+        // Expected: one entry with metadata:[] (SCA-active signal, no CVE data yet).
+        Dependency incoming = new Dependency("com.example:lib", "1.0.0", "lib-1.0.0.jar", null);
+        ScaReachabilityPeriodicAction merged = actionWithDeps(incoming);
+
+        merged.doIteration(telService);
+
+        ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
+        verify(telService, times(1)).addDependency(captor.capture());
+        Dependency emitted = captor.getValue();
+        assertEquals("com.example:lib", emitted.name);
+        assertEquals("1.0.0", emitted.version);
+        assertNotNull(emitted.reachabilityMetadata, "metadata must not be null when SCA active");
+        assertTrue(emitted.reachabilityMetadata.isEmpty(), "metadata must be [] when no CVE state");
+    }
+
+    @Test
+    void newDep_withCveState_emitsMergedSingleEntry() {
+        // DependencyService returns dep X; registry has a pending CVE state for the same dep.
+        // Expected: ONE entry with the CVE metadata merged in — no separate dep:[] entry.
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-test-1234");
+        ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                "com.example:lib", "1.0.0", "GHSA-test-1234", "com.myapp.Ctrl", "handle", 10);
+
+        Dependency incoming = new Dependency("com.example:lib", "1.0.0", "lib-1.0.0.jar", "ABCD");
+        ScaReachabilityPeriodicAction merged = actionWithDeps(incoming);
+
+        merged.doIteration(telService);
+
+        ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
+        verify(telService, times(1)).addDependency(captor.capture());
+        Dependency emitted = captor.getValue();
+        assertEquals("com.example:lib", emitted.name);
+        assertEquals("1.0.0", emitted.version);
+        assertEquals("ABCD", emitted.hash, "source/hash from DependencyService must be preserved");
+        assertEquals(1, emitted.reachabilityMetadata.size());
+        assertTrue(emitted.reachabilityMetadata.get(0).contains("GHSA-test-1234"));
+        assertTrue(emitted.reachabilityMetadata.get(0).contains("\"path\""), "merged entry must include callsite");
+    }
+
+    @Test
+    void newDepAndUnrelatedCveState_emitsTwoIndependentEntries() {
+        // DependencyService returns depA; registry has pending state for depB (different dep).
+        // Expected: two separate entries — one for depA (metadata:[]), one for depB (CVE metadata).
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.other:lib", "2.0.0", "GHSA-other-5678");
+
+        Dependency incomingA = new Dependency("com.example:lib", "1.0.0", "lib-1.0.0.jar", null);
+        ScaReachabilityPeriodicAction merged = actionWithDeps(incomingA);
+        // Simulate com.other:lib having been resolved by DependencyService in a prior heartbeat
+        merged.addKnownDepForTesting("com.other:lib", "2.0.0");
+
+        merged.doIteration(telService);
+
+        ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
+        verify(telService, times(2)).addDependency(captor.capture());
+        java.util.List<Dependency> emitted = captor.getAllValues();
+
+        Dependency depA = emitted.stream()
+                .filter(d -> "com.example:lib".equals(d.name))
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("dep not found"));
+        Dependency depB = emitted.stream()
+                .filter(d -> "com.other:lib".equals(d.name))
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("dep not found"));
+
+        assertTrue(depA.reachabilityMetadata.isEmpty(), "depA: no CVE state → metadata:[]");
+        assertTrue(depB.reachabilityMetadata.get(0).contains("GHSA-other-5678"), "depB: must carry CVE state");
+    }
+
+    // ---------------------------------------------------------------------------
+    // knownDeps / timing invariant tests
+    // ---------------------------------------------------------------------------
+
+    /**
+     * Dep resolved by DependencyService in heartbeat N; CVE fires in heartbeat N+1. The dep is
+     * already in knownDeps, so Step 3 emits it with source/hash.
+     */
+    @Test
+    void cveFiresAfterDepResolved_usesKnownDepsForSourceHash() {
+        DependencyService svc = mock(DependencyService.class);
+        // Heartbeat 1: DependencyService returns the dep, no CVE yet
+        when(svc.drainDeterminedDependencies())
+                .thenReturn(Collections.singletonList(new Dependency("com.example:lib", "1.0.0", "lib.jar", "ABCD")))
+                .thenReturn(Collections.emptyList()); // heartbeat 2: nothing new
+        ScaReachabilityPeriodicAction merged = new ScaReachabilityPeriodicAction(svc);
+
+        // Heartbeat 1: dep detected, no CVE → emits metadata:[]
+        merged.doIteration(telService);
+
+        // CVE fires between heartbeat 1 and 2
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-late");
+
+        // Heartbeat 2: DependencyService is empty, but CVE is pending
+        TelemetryService telService2 = mock(TelemetryService.class);
+        merged.doIteration(telService2);
+
+        ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
+        verify(telService2, times(1)).addDependency(captor.capture());
+        Dependency emitted = captor.getValue();
+        assertEquals("lib.jar", emitted.source, "source from knownDeps must be preserved");
+        assertEquals("ABCD", emitted.hash, "hash from knownDeps must be preserved");
+        assertTrue(emitted.reachabilityMetadata.get(0).contains("GHSA-late"));
+    }
+
+    /**
+     * CVE fires before DependencyService has resolved the dep (timing race).
+     *
+     * <p>Step 3 emits immediately without source/hash so CVE data is never delayed (system tests need
+     * data within seconds). When the dep is later resolved and stored in knownDeps, subsequent CVE
+     * emissions (e.g., after a method hit) carry source/hash automatically.
+     */
+    @Test
+    void cveFiresBeforeDepResolved_emitsImmediatelyWithoutSourceHash() {
+        DependencyService svc = mock(DependencyService.class);
+        // Heartbeat 1: DependencyService is empty (dep not yet resolved)
+        when(svc.drainDeterminedDependencies()).thenReturn(Collections.emptyList());
+        ScaReachabilityPeriodicAction merged = new ScaReachabilityPeriodicAction(svc);
+
+        // CVE fires before DependencyService resolves the dep
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-race");
+        ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                "com.example:lib", "1.0.0", "GHSA-race", "com.app.Ctrl", "handle", 10);
+
+        // Heartbeat 1: emits immediately without source/hash — CVE data is not delayed
+        merged.doIteration(telService);
+
+        ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
+        verify(telService, times(1)).addDependency(captor.capture());
+        Dependency emitted = captor.getValue();
+        assertNull(emitted.source, "source is null when dep not yet in knownDeps");
+        assertNull(emitted.hash, "hash is null when dep not yet in knownDeps");
+        assertTrue(emitted.reachabilityMetadata.get(0).contains("GHSA-race"));
+        assertTrue(emitted.reachabilityMetadata.get(0).contains("\"path\""), "must include callsite");
+    }
+
+    /**
+     * Regression test for the Codex P2 race condition: CVE registered in HB1 (dep not yet resolved),
+     * emitted immediately without source/hash. In HB2 DependencyService resolves the JAR — if we
+     * naively emit metadata:[] because there is no pending snapshot, the backend overwrites the CVE
+     * state it already received. The fix uses peekSnapshot so HB2 emits the CVE metadata together
+     * with the now-known source/hash.
+     */
+    @Test
+    void cveRegisteredBeforeDepResolved_step2PeeksCveStateInLaterHeartbeat() {
+        DependencyService svc = mock(DependencyService.class);
+
+        // HB1: CVE registered, dep not yet resolved by DependencyService
+        when(svc.drainDeterminedDependencies()).thenReturn(Collections.emptyList());
+        ScaReachabilityPeriodicAction action = new ScaReachabilityPeriodicAction(svc);
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-peek");
+
+        action.doIteration(telService);
+
+        // HB1 emits once: CVE state without source/hash (dep not yet resolved)
+        verify(telService, times(1)).addDependency(any(Dependency.class));
+        reset(telService);
+
+        // HB2: DependencyService now resolves the JAR; no new CVE activity (pendingReport=false)
+        Dependency resolved = new Dependency("com.example:lib", "1.0.0", "lib-1.0.0.jar", "CAFEBABE");
+        when(svc.drainDeterminedDependencies()).thenReturn(Collections.singletonList(resolved));
+
+        action.doIteration(telService);
+
+        ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
+        verify(telService, times(1)).addDependency(captor.capture());
+        Dependency emitted = captor.getValue();
+        assertEquals("lib-1.0.0.jar", emitted.source, "HB2 must include resolved source");
+        assertEquals("CAFEBABE", emitted.hash, "HB2 must include resolved hash");
+        assertFalse(
+                emitted.reachabilityMetadata.isEmpty(),
+                "HB2 must not emit metadata:[] — CVE state must be preserved via peekSnapshot");
+        assertTrue(emitted.reachabilityMetadata.get(0).contains("GHSA-peek"), "HB2 metadata must contain the CVE id");
+    }
+
+    /**
+     * Regression test for the multi-classloader re-detection bug.
+     *
+     * <p>{@link DependencyService} can report the same JAR on consecutive heartbeats when it
+     * discovers it from multiple classloaders in the same application. The CVE hit must be emitted
+     * exactly once — on the heartbeat where the CVE state is pending or first detected via {@code
+     * peekSnapshot}. Re-detections of the same JAR with no new CVE activity must produce no emission.
+     *
+     * <p>Without the fix, Step 2 called {@code peekSnapshot} unconditionally when {@code
+     * snapshotByKey} had no entry, causing the hit to be re-emitted on every subsequent heartbeat
+     * where {@code DependencyService} reported the JAR again (e.g. from a different classloader).
+     */
+    @Test
+    void depReDetectedByDependencyService_hitNotReEmittedOnSubsequentDetection() {
+        DependencyService svc = mock(DependencyService.class);
+        Dependency dep = new Dependency("com.example:lib", "1.0.0", "lib.jar", "HASH");
+        // Same dep returned on both heartbeats (simulates multiple classloaders detecting the same JAR)
+        when(svc.drainDeterminedDependencies())
+                .thenReturn(Collections.singletonList(dep)) // HB1: first detection
+                .thenReturn(Collections.singletonList(dep)); // HB2: re-detected from another classloader
+        ScaReachabilityPeriodicAction merged = new ScaReachabilityPeriodicAction(svc);
+
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-dup");
+        ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                "com.example:lib", "1.0.0", "GHSA-dup", "com.app.Ctrl", "handle", 10);
+
+        // HB1: first detection, CVE is pending → emit merged entry with hit
+        merged.doIteration(telService);
+        ArgumentCaptor<Dependency> captor1 = ArgumentCaptor.forClass(Dependency.class);
+        verify(telService, times(1)).addDependency(captor1.capture());
+        assertTrue(
+                captor1.getValue().reachabilityMetadata.get(0).contains("\"path\""),
+                "HB1 must include the callsite hit");
+        reset(telService);
+
+        // HB2: same JAR re-detected, no new CVE activity → must NOT re-emit the hit
+        merged.doIteration(telService);
+        verify(telService, never()).addDependency(any());
+    }
+
+    /**
+     * Companion to {@link #depReDetectedByDependencyService_hitNotReEmittedOnSubsequentDetection}:
+     * verifies that a REAL new CVE state change (hit arriving between heartbeats) is still emitted
+     * correctly even when DependencyService also reports the dep again on the same heartbeat.
+     */
+    @Test
+    void depReDetectedWithNewHit_emitsOnceWithNewHit() {
+        DependencyService svc = mock(DependencyService.class);
+        Dependency dep = new Dependency("com.example:lib", "1.0.0", "lib.jar", "HASH");
+        when(svc.drainDeterminedDependencies())
+                .thenReturn(Collections.singletonList(dep)) // HB1
+                .thenReturn(Collections.singletonList(dep)); // HB2
+        ScaReachabilityPeriodicAction merged = new ScaReachabilityPeriodicAction(svc);
+
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-new");
+
+        // HB1: first detection, CVE pending with reached:[] → emitted once
+        merged.doIteration(telService);
+        verify(telService, times(1)).addDependency(any());
+        reset(telService);
+
+        // Hit recorded between HB1 and HB2
+        ScaReachabilityDependencyRegistry.INSTANCE.recordHit(
+                "com.example:lib", "1.0.0", "GHSA-new", "com.app.Svc", "exec", 7);
+
+        // HB2: re-detection AND new hit pending (snapshotByKey has the entry) → emit once with hit
+        merged.doIteration(telService);
+        ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
+        verify(telService, times(1)).addDependency(captor.capture());
+        assertTrue(
+                captor.getValue().reachabilityMetadata.get(0).contains("\"path\""),
+                "HB2 must include the new callsite hit");
+    }
+
+    /**
+     * Dep and CVE arrive simultaneously (same heartbeat) — existing Step 2 merge path. This existing
+     * behavior must still work after the knownDeps refactor.
+     */
+    @Test
+    void cveAndDepArriveSameHeartbeat_step2MergeStillWorks() {
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-simultaneous");
+
+        Dependency incoming = new Dependency("com.example:lib", "1.0.0", "lib.jar", "HASH");
+        ScaReachabilityPeriodicAction merged = actionWithDeps(incoming);
+
+        merged.doIteration(telService);
+
+        ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
+        verify(telService, times(1)).addDependency(captor.capture());
+        Dependency emitted = captor.getValue();
+        assertEquals("lib.jar", emitted.source, "Step 2 merge must preserve source");
+        assertTrue(emitted.reachabilityMetadata.get(0).contains("GHSA-simultaneous"));
+    }
+
+    /**
+     * Regression test for the registry key mismatch for JARs without pom.properties (PR #11614).
+     *
+     * <p>For JARs without {@code pom.properties}, {@code DependencyResolver.guessFallbackNoPom}
+     * produces an artifact-ID-only name (e.g. {@code "junrar"} instead of {@code
+     * "com.github.junrar:junrar"}). The transformer must register the CVE under the same name so that
+     * the registry key matches what {@code DependencyService} will report.
+     *
+     * <p>Without the fix, {@code registerCve} was called with {@code entry.artifact()} = {@code
+     * "com.github.junrar:junrar"}, while {@code DependencyService} reported {@code dep.name} = {@code
+     * "junrar"}. The result: two separate telemetry entries for the same physical JAR — one with
+     * {@code metadata:[]} (from Step 2, carrying source/hash but no CVE) and one with the CVE
+     * metadata (from Step 3, without source/hash).
+     *
+     * <p>With the fix, the transformer uses the resolved {@code dep.name} from {@code matchDep} (i.e.
+     * {@code "junrar"}) for {@code registerCve}, so the registry and {@code DependencyService} keys
+     * match. Step 2 merges them into a single emission with both the CVE metadata and source/hash.
+     */
+    @Test
+    void noPomJar_artifactIdOnlyName_cveAndSourceHashMergedIntoSingleEntry() {
+        // Simulates what ScaReachabilityTransformer.processClass() now does after the fix:
+        // registerCve with the artifactId-only name that DependencyService will also report.
+        ScaReachabilityDependencyRegistry.INSTANCE.registerCve("junrar", "7.5.5", "GHSA-hf5p-test");
+
+        // DependencyService returns the dep with the same artifactId-only name (guessFallbackNoPom).
+        Dependency incoming = new Dependency("junrar", "7.5.5", "junrar-7.5.5.jar", "CAFEBABE");
+        ScaReachabilityPeriodicAction merged = actionWithDeps(incoming);
+
+        merged.doIteration(telService);
+
+        // Must produce exactly ONE emission with BOTH the CVE metadata AND source/hash — not two
+        // separate entries (one with CVE but no source/hash, one with source/hash but no CVE).
+        ArgumentCaptor<Dependency> captor = ArgumentCaptor.forClass(Dependency.class);
+        verify(telService, times(1)).addDependency(captor.capture());
+        Dependency emitted = captor.getValue();
+        assertEquals("junrar", emitted.name, "name must be the artifactId-only name from DependencyService");
+        assertEquals("7.5.5", emitted.version);
+        assertEquals("junrar-7.5.5.jar", emitted.source, "source/hash from DependencyService must be preserved");
+        assertEquals("CAFEBABE", emitted.hash, "hash from DependencyService must be preserved");
+        assertFalse(
+                emitted.reachabilityMetadata.isEmpty(),
+                "CVE metadata must NOT be lost — a single merged entry must carry both CVE data and source/hash");
+        assertTrue(emitted.reachabilityMetadata.get(0).contains("GHSA-hf5p-test"));
+    }
+
+    /**
+     * Same physical copy (identical source/hash) re-detected on a later heartbeat must NOT be
+     * re-emitted — the backend already received it. Mirrors a Spring Boot {@code
+     * LaunchedURLClassLoader} reporting the same nested JAR (same URI) again.
+     */
+    @Test
+    void sameSourceHashReDetected_doesNotReEmit() {
+        DependencyService svc = mock(DependencyService.class);
+        Dependency dep = new Dependency("com.example:lib", "1.0", "lib.jar", "AABB");
+        when(svc.drainDeterminedDependencies())
+                .thenReturn(Collections.singletonList(dep)) // HB1: first detection
+                .thenReturn(Collections.singletonList(dep)); // HB2: same physical copy re-detected
+        ScaReachabilityPeriodicAction merged = new ScaReachabilityPeriodicAction(svc);
+
+        // HB1: first detection → emits metadata:[] (SCA monitoring signal)
+        merged.doIteration(telService);
+        verify(telService, times(1)).addDependency(any(Dependency.class));
+        reset(telService);
+
+        // HB2: same source/hash → backend already knows it → no emission
+        merged.doIteration(telService);
+        verify(telService, never()).addDependency(any());
+    }
+
+    /**
+     * Two physical copies of the same {@code name@version} but with different source/hash (e.g. two
+     * Tomcat webapps each shipping their own copy of the artifact) must BOTH be emitted, matching the
+     * legacy {@code DependencyPeriodicAction} behavior.
+     */
+    @Test
+    void differentSourceHashSameKey_emitsBothPhysicalCopies() {
+        DependencyService svc = mock(DependencyService.class);
+        Dependency copy1 = new Dependency("com.example:lib", "1.0", "/app1/lib.jar", "AABB");
+        Dependency copy2 = new Dependency("com.example:lib", "1.0", "/app2/lib.jar", "CCDD");
+        when(svc.drainDeterminedDependencies())
+                .thenReturn(Collections.singletonList(copy1)) // HB1: first physical copy
+                .thenReturn(Collections.singletonList(copy2)); // HB2: distinct physical copy
+        ScaReachabilityPeriodicAction merged = new ScaReachabilityPeriodicAction(svc);
+
+        // HB1: first copy → emitted
+        merged.doIteration(telService);
+        ArgumentCaptor<Dependency> captor1 = ArgumentCaptor.forClass(Dependency.class);
+        verify(telService, times(1)).addDependency(captor1.capture());
+        assertEquals("/app1/lib.jar", captor1.getValue().source);
+        assertEquals("AABB", captor1.getValue().hash);
+        reset(telService);
+
+        // HB2: different source/hash → new physical copy → also emitted
+        merged.doIteration(telService);
+        ArgumentCaptor<Dependency> captor2 = ArgumentCaptor.forClass(Dependency.class);
+        verify(telService, times(1)).addDependency(captor2.capture());
+        assertEquals("/app2/lib.jar", captor2.getValue().source);
+        assertEquals("CCDD", captor2.getValue().hash);
+    }
 }
diff --git a/test-published-dependencies/agent-logs-on-java-7/src/main/java/test/published/dependencies/App.java b/test-published-dependencies/agent-logs-on-java-7/src/main/java/test/published/dependencies/App.java
index b0db71e7a9c..889d770b586 100644
--- a/test-published-dependencies/agent-logs-on-java-7/src/main/java/test/published/dependencies/App.java
+++ b/test-published-dependencies/agent-logs-on-java-7/src/main/java/test/published/dependencies/App.java
@@ -1,10 +1,10 @@
 package test.published.dependencies;
 
 public class App {
-  public static void main(String[] args) {
-    System.out.println("Hello World!");
-    for (String s : args) {
-      System.out.println(s);
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
+        for (String s : args) {
+            System.out.println(s);
+        }
     }
-  }
 }
diff --git a/test-published-dependencies/agent-logs-on-java-7/src/test/java/StartWithAgentTest.java b/test-published-dependencies/agent-logs-on-java-7/src/test/java/StartWithAgentTest.java
index 4d5fcc59e0e..585459bbcd4 100644
--- a/test-published-dependencies/agent-logs-on-java-7/src/test/java/StartWithAgentTest.java
+++ b/test-published-dependencies/agent-logs-on-java-7/src/test/java/StartWithAgentTest.java
@@ -17,101 +17,91 @@
 
 public class StartWithAgentTest {
 
-  private static final Pattern WARNING_PATTERN =
-      Pattern.compile(
-          "^Warning: Version [^ ]+ of dd-java-agent is not compatible with Java [^ ]+ found at [^ ]+ and is effectively disabled\\.$");
-  private static final String UPGRADE_MESSAGE = "Please upgrade your Java version to 8+";
+    private static final Pattern WARNING_PATTERN = Pattern.compile(
+            "^Warning: Version [^ ]+ of dd-java-agent is not compatible with Java [^ ]+ found at [^ ]+ and is effectively disabled\\.$");
+    private static final String UPGRADE_MESSAGE = "Please upgrade your Java version to 8+";
 
-  @Test
-  void ensureThatApplicationStartsWithAgentOnJava7() throws InterruptedException, IOException {
-    String expectedMessage = "Woho! Started on Java 7";
-    Process process = startAndWaitForJvmWithAgentForJava("JAVA_7_HOME", expectedMessage);
-    int exitCode = process.waitFor();
-    List<String> output = getLines(process.getInputStream());
-    List<String> errors = getLines(process.getErrorStream());
-    logProcessOutput(output, errors);
-    assertEquals(0, exitCode, "Command failed with unexpected exit code");
-    assertTrue(
-        output.contains(expectedMessage), "Output does not contain '" + expectedMessage + "'");
-    assertTrue(
-        errors.stream().anyMatch(WARNING_PATTERN.asPredicate()),
-        "Output does not contain line matching '" + WARNING_PATTERN + "'");
-    assertTrue(
-        errors.contains(UPGRADE_MESSAGE), "Output does not contain '" + UPGRADE_MESSAGE + "'");
-  }
+    @Test
+    void ensureThatApplicationStartsWithAgentOnJava7() throws InterruptedException, IOException {
+        String expectedMessage = "Woho! Started on Java 7";
+        Process process = startAndWaitForJvmWithAgentForJava("JAVA_7_HOME", expectedMessage);
+        int exitCode = process.waitFor();
+        List<String> output = getLines(process.getInputStream());
+        List<String> errors = getLines(process.getErrorStream());
+        logProcessOutput(output, errors);
+        assertEquals(0, exitCode, "Command failed with unexpected exit code");
+        assertTrue(output.contains(expectedMessage), "Output does not contain '" + expectedMessage + "'");
+        assertTrue(
+                errors.stream().anyMatch(WARNING_PATTERN.asPredicate()),
+                "Output does not contain line matching '" + WARNING_PATTERN + "'");
+        assertTrue(errors.contains(UPGRADE_MESSAGE), "Output does not contain '" + UPGRADE_MESSAGE + "'");
+    }
 
-  @Test
-  void ensureThatApplicationStartsWithAgentOnJava8() throws InterruptedException, IOException {
-    ensureThatApplicationStartsWithoutWarning("8");
-  }
+    @Test
+    void ensureThatApplicationStartsWithAgentOnJava8() throws InterruptedException, IOException {
+        ensureThatApplicationStartsWithoutWarning("8");
+    }
 
-  @Test
-  void ensureThatApplicationStartsWithAgentOnJava11() throws InterruptedException, IOException {
-    ensureThatApplicationStartsWithoutWarning("11");
-  }
+    @Test
+    void ensureThatApplicationStartsWithAgentOnJava11() throws InterruptedException, IOException {
+        ensureThatApplicationStartsWithoutWarning("11");
+    }
 
-  private static void ensureThatApplicationStartsWithoutWarning(String version)
-      throws InterruptedException, IOException {
-    String expectedMessage = "Woho! Started on Java " + version;
-    Process process =
-        startAndWaitForJvmWithAgentForJava("JAVA_" + version + "_HOME", expectedMessage);
-    int exitCode = process.waitFor();
-    List<String> output = getLines(process.getInputStream());
-    List<String> errors = getLines(process.getErrorStream());
-    logProcessOutput(output, errors);
-    assertEquals(0, exitCode, "Command failed with unexpected exit code");
-    assertTrue(
-        output.contains(expectedMessage), "Output does not contain '" + expectedMessage + "'");
-    assertFalse(
-        errors.stream().anyMatch(WARNING_PATTERN.asPredicate()),
-        "Output contains unexpected line matching '" + WARNING_PATTERN + "'");
-    assertFalse(
-        errors.contains(UPGRADE_MESSAGE),
-        "Output contains unexpected line '" + UPGRADE_MESSAGE + "'");
-  }
+    private static void ensureThatApplicationStartsWithoutWarning(String version)
+            throws InterruptedException, IOException {
+        String expectedMessage = "Woho! Started on Java " + version;
+        Process process = startAndWaitForJvmWithAgentForJava("JAVA_" + version + "_HOME", expectedMessage);
+        int exitCode = process.waitFor();
+        List<String> output = getLines(process.getInputStream());
+        List<String> errors = getLines(process.getErrorStream());
+        logProcessOutput(output, errors);
+        assertEquals(0, exitCode, "Command failed with unexpected exit code");
+        assertTrue(output.contains(expectedMessage), "Output does not contain '" + expectedMessage + "'");
+        assertFalse(
+                errors.stream().anyMatch(WARNING_PATTERN.asPredicate()),
+                "Output contains unexpected line matching '" + WARNING_PATTERN + "'");
+        assertFalse(errors.contains(UPGRADE_MESSAGE), "Output contains unexpected line '" + UPGRADE_MESSAGE + "'");
+    }
 
-  private static Process startAndWaitForJvmWithAgentForJava(String javaHomeEnv, String message)
-      throws IOException {
-    String javaHome = System.getenv(javaHomeEnv);
-    checkFile(javaHome, javaHomeEnv);
-    String javaAgent = System.getProperty("test.published.dependencies.agent");
-    checkFile(javaAgent, "test.published.dependencies.agent");
-    String jarFile = System.getProperty("test.published.dependencies.jar");
-    checkFile(jarFile, "test.published.dependencies.jar");
+    private static Process startAndWaitForJvmWithAgentForJava(String javaHomeEnv, String message) throws IOException {
+        String javaHome = System.getenv(javaHomeEnv);
+        checkFile(javaHome, javaHomeEnv);
+        String javaAgent = System.getProperty("test.published.dependencies.agent");
+        checkFile(javaAgent, "test.published.dependencies.agent");
+        String jarFile = System.getProperty("test.published.dependencies.jar");
+        checkFile(jarFile, "test.published.dependencies.jar");
 
-    List<String> commandLine = new ArrayList<>();
-    commandLine.add(Paths.get(javaHome).resolve("bin").resolve("java").toString());
-    commandLine.add("-Xmx256M");
-    commandLine.add("-javaagent:" + javaAgent);
-    commandLine.add("-jar");
-    commandLine.add(jarFile);
-    commandLine.add(message);
-    ProcessBuilder builder = new ProcessBuilder(commandLine);
-    builder.environment().put("JAVA_HOME", javaHome);
-    Process process = builder.start();
-    return process;
-  }
+        List<String> commandLine = new ArrayList<>();
+        commandLine.add(Paths.get(javaHome).resolve("bin").resolve("java").toString());
+        commandLine.add("-Xmx256M");
+        commandLine.add("-javaagent:" + javaAgent);
+        commandLine.add("-jar");
+        commandLine.add(jarFile);
+        commandLine.add(message);
+        ProcessBuilder builder = new ProcessBuilder(commandLine);
+        builder.environment().put("JAVA_HOME", javaHome);
+        Process process = builder.start();
+        return process;
+    }
 
-  private static void checkFile(String file, String name) {
-    assertNotNull(file, name + " should be set");
-    assertFalse(file.isEmpty(), name + " should not be empty ");
-    assertTrue(Files.exists(Paths.get(file)), name + " [" + file + "] should be an existing path");
-  }
+    private static void checkFile(String file, String name) {
+        assertNotNull(file, name + " should be set");
+        assertFalse(file.isEmpty(), name + " should not be empty ");
+        assertTrue(Files.exists(Paths.get(file)), name + " [" + file + "] should be an existing path");
+    }
 
-  private static List<String> getLines(InputStream inputStream) {
-    return new BufferedReader(new InputStreamReader(inputStream))
-        .lines()
-        .collect(Collectors.toList());
-  }
+    private static List<String> getLines(InputStream inputStream) {
+        return new BufferedReader(new InputStreamReader(inputStream)).lines().collect(Collectors.toList());
+    }
 
-  private static void logProcessOutput(List<String> output, List<String> errors) {
-    System.out.println("-------------------");
-    System.out.println("Sub process output:");
-    output.forEach(System.out::println);
-    System.out.println("-------------------");
-    System.out.println("Sub process errors:");
-    errors.forEach(System.out::println);
-    System.out.println("-------------------");
-    System.out.println("Sub process done.");
-  }
+    private static void logProcessOutput(List<String> output, List<String> errors) {
+        System.out.println("-------------------");
+        System.out.println("Sub process output:");
+        output.forEach(System.out::println);
+        System.out.println("-------------------");
+        System.out.println("Sub process errors:");
+        errors.forEach(System.out::println);
+        System.out.println("-------------------");
+        System.out.println("Sub process done.");
+    }
 }
diff --git a/test-published-dependencies/all-deps-exist/src/main/java/test/published/dependencies/App.java b/test-published-dependencies/all-deps-exist/src/main/java/test/published/dependencies/App.java
index 341942ce9ca..d44c1903c0f 100644
--- a/test-published-dependencies/all-deps-exist/src/main/java/test/published/dependencies/App.java
+++ b/test-published-dependencies/all-deps-exist/src/main/java/test/published/dependencies/App.java
@@ -5,13 +5,13 @@
 import io.opentracing.util.GlobalTracer;
 
 public class App {
-  public static void main(String[] args) {
-    DDTracer tracer = DDTracer.builder().serviceName("TestService").build();
-    GlobalTracer.registerIfAbsent(tracer);
-    datadog.trace.api.GlobalTracer.registerIfAbsent(tracer);
-    new App().tracedMethod();
-  }
+    public static void main(String[] args) {
+        DDTracer tracer = DDTracer.builder().serviceName("TestService").build();
+        GlobalTracer.registerIfAbsent(tracer);
+        datadog.trace.api.GlobalTracer.registerIfAbsent(tracer);
+        new App().tracedMethod();
+    }
 
-  @Trace
-  void tracedMethod() {}
+    @Trace
+    void tracedMethod() {}
 }
diff --git a/test-published-dependencies/ot-pulls-in-api/src/main/java/test/published/dependencies/App.java b/test-published-dependencies/ot-pulls-in-api/src/main/java/test/published/dependencies/App.java
index 341942ce9ca..d44c1903c0f 100644
--- a/test-published-dependencies/ot-pulls-in-api/src/main/java/test/published/dependencies/App.java
+++ b/test-published-dependencies/ot-pulls-in-api/src/main/java/test/published/dependencies/App.java
@@ -5,13 +5,13 @@
 import io.opentracing.util.GlobalTracer;
 
 public class App {
-  public static void main(String[] args) {
-    DDTracer tracer = DDTracer.builder().serviceName("TestService").build();
-    GlobalTracer.registerIfAbsent(tracer);
-    datadog.trace.api.GlobalTracer.registerIfAbsent(tracer);
-    new App().tracedMethod();
-  }
+    public static void main(String[] args) {
+        DDTracer tracer = DDTracer.builder().serviceName("TestService").build();
+        GlobalTracer.registerIfAbsent(tracer);
+        datadog.trace.api.GlobalTracer.registerIfAbsent(tracer);
+        new App().tracedMethod();
+    }
 
-  @Trace
-  void tracedMethod() {}
+    @Trace
+    void tracedMethod() {}
 }
diff --git a/test-published-dependencies/ot-pulls-in-api/src/test/java/CreateTracerTest.java b/test-published-dependencies/ot-pulls-in-api/src/test/java/CreateTracerTest.java
index a6f1224ec73..41a4238c593 100644
--- a/test-published-dependencies/ot-pulls-in-api/src/test/java/CreateTracerTest.java
+++ b/test-published-dependencies/ot-pulls-in-api/src/test/java/CreateTracerTest.java
@@ -6,27 +6,28 @@
 
 public class CreateTracerTest {
 
-  @Test
-  void createTracer() throws InterruptedException {
-    DDTracer tracer = DDTracer.builder().serviceName("TestService").build();
-    GlobalTracer.registerIfAbsent(tracer);
-    datadog.trace.api.GlobalTracer.registerIfAbsent(tracer);
-    tracer.activateSpan(tracer.buildSpan("test-span").start()).close();
-    // Sleep a bit so the trace sending machinery has a chance to start
-    Thread.sleep(1000);
-  }
+    @Test
+    void createTracer() throws InterruptedException {
+        DDTracer tracer = DDTracer.builder().serviceName("TestService").build();
+        GlobalTracer.registerIfAbsent(tracer);
+        datadog.trace.api.GlobalTracer.registerIfAbsent(tracer);
+        tracer.activateSpan(tracer.buildSpan("test-span").start()).close();
+        // Sleep a bit so the trace sending machinery has a chance to start
+        Thread.sleep(1000);
+    }
 
-  @Test
-  void buildTracerWithUDS() throws Exception {
-    // trigger use of JNR and JFFI to validate native method linking
-    Path fakeSocketPath = Files.createTempFile("dd-java", "test-uds");
-    System.setProperty("dd.trace.agent.url", "unix://" + fakeSocketPath.toUri().getPath());
-    try {
-      // we don't need to actually use the tracer, just build it
-      DDTracer.builder().serviceName("TestServiceWithUDS").build();
-    } finally {
-      System.clearProperty("dd.trace.agent.url");
-      Files.delete(fakeSocketPath);
+    @Test
+    void buildTracerWithUDS() throws Exception {
+        // trigger use of JNR and JFFI to validate native method linking
+        Path fakeSocketPath = Files.createTempFile("dd-java", "test-uds");
+        System.setProperty(
+                "dd.trace.agent.url", "unix://" + fakeSocketPath.toUri().getPath());
+        try {
+            // we don't need to actually use the tracer, just build it
+            DDTracer.builder().serviceName("TestServiceWithUDS").build();
+        } finally {
+            System.clearProperty("dd.trace.agent.url");
+            Files.delete(fakeSocketPath);
+        }
     }
-  }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/api/ConfigCollector.java b/utils/config-utils/src/main/java/datadog/trace/api/ConfigCollector.java
index a7ec9a83265..6872fb8e6ae 100644
--- a/utils/config-utils/src/main/java/datadog/trace/api/ConfigCollector.java
+++ b/utils/config-utils/src/main/java/datadog/trace/api/ConfigCollector.java
@@ -17,89 +17,87 @@
  * consumers. So this is based on a ConcurrentHashMap to deal with it.
  */
 public class ConfigCollector {
-  private static final ConfigCollector INSTANCE = new ConfigCollector();
-
-  private ConfigCollector() {}
-
-  private static final AtomicReferenceFieldUpdater<ConfigCollector, Map> COLLECTED_UPDATER =
-      AtomicReferenceFieldUpdater.newUpdater(ConfigCollector.class, Map.class, "collected");
-
-  private static final Function<ConfigOrigin, Map<String, ConfigSetting>> NEW_SUB_MAP =
-      k -> new ConcurrentHashMap<>();
-
-  private volatile Map<ConfigOrigin, Map<String, ConfigSetting>> collected =
-      new ConcurrentHashMap<>();
-
-  public static ConfigCollector get() {
-    return INSTANCE;
-  }
-
-  public void put(String key, Object value, ConfigOrigin origin, int seqId) {
-    put(key, value, origin, seqId, null);
-  }
-
-  public void put(String key, Object value, ConfigOrigin origin, int seqId, String configId) {
-    ConfigSetting setting = ConfigSetting.of(key, value, origin, seqId, configId);
-    Map<String, ConfigSetting> configMap = collected.computeIfAbsent(origin, NEW_SUB_MAP);
-    configMap.put(key, setting); // replaces any previous value for this key at origin
-  }
-
-  // put method specifically for DEFAULT origins. We don't allow overrides for configs from DEFAULT
-  // origins
-  public void putDefault(String key, Object value) {
-    ConfigSetting setting = ConfigSetting.of(key, value, DEFAULT, DEFAULT_SEQ_ID);
-    Map<String, ConfigSetting> configMap = collected.computeIfAbsent(DEFAULT, NEW_SUB_MAP);
-    configMap.putIfAbsent(key, setting); // don't replace previous default for this key
-  }
-
-  /**
-   * Report single configuration setting with REMOTE origin.
-   *
-   * @param key configuration key to report
-   * @param value configuration value to report
-   */
-  public void putRemote(String key, Object value) {
-    put(key, value, REMOTE, ABSENT_SEQ_ID);
-  }
-
-  /**
-   * Report multiple configuration settings with REMOTE origin.
-   *
-   * @param configMap map of configuration key-value pairs to report
-   */
-  public void putRemote(Map<String, Object> configMap) {
-    // attempt merge+replace to avoid collector seeing partial update
-    Map<String, ConfigSetting> merged = new ConcurrentHashMap<>();
-
-    // prepare update
-    for (Map.Entry<String, Object> entry : configMap.entrySet()) {
-      ConfigSetting setting =
-          ConfigSetting.of(entry.getKey(), entry.getValue(), REMOTE, ABSENT_SEQ_ID);
-      merged.put(entry.getKey(), setting);
+    private static final ConfigCollector INSTANCE = new ConfigCollector();
+
+    private ConfigCollector() {}
+
+    private static final AtomicReferenceFieldUpdater<ConfigCollector, Map> COLLECTED_UPDATER =
+            AtomicReferenceFieldUpdater.newUpdater(ConfigCollector.class, Map.class, "collected");
+
+    private static final Function<ConfigOrigin, Map<String, ConfigSetting>> NEW_SUB_MAP =
+            k -> new ConcurrentHashMap<>();
+
+    private volatile Map<ConfigOrigin, Map<String, ConfigSetting>> collected = new ConcurrentHashMap<>();
+
+    public static ConfigCollector get() {
+        return INSTANCE;
+    }
+
+    public void put(String key, Object value, ConfigOrigin origin, int seqId) {
+        put(key, value, origin, seqId, null);
     }
 
-    while (true) {
-      // first try adding our update to the map
-      Map<String, ConfigSetting> current = collected.putIfAbsent(REMOTE, merged);
-      if (current == null) {
-        break; // success, no merging required
-      }
-      // merge existing entries with updated entries
-      current.forEach(merged::putIfAbsent);
-      if (collected.replace(REMOTE, current, merged)) {
-        break; // success, atomically swapped in merged map
-      }
-      // roll back to original update before next attempt
-      merged.keySet().retainAll(configMap.keySet());
+    public void put(String key, Object value, ConfigOrigin origin, int seqId, String configId) {
+        ConfigSetting setting = ConfigSetting.of(key, value, origin, seqId, configId);
+        Map<String, ConfigSetting> configMap = collected.computeIfAbsent(origin, NEW_SUB_MAP);
+        configMap.put(key, setting); // replaces any previous value for this key at origin
     }
-  }
-
-  @SuppressWarnings("unchecked")
-  public Map<ConfigOrigin, Map<String, ConfigSetting>> collect() {
-    if (!collected.isEmpty()) {
-      return COLLECTED_UPDATER.getAndSet(this, new ConcurrentHashMap<>());
-    } else {
-      return Collections.emptyMap();
+
+    // put method specifically for DEFAULT origins. We don't allow overrides for configs from DEFAULT
+    // origins
+    public void putDefault(String key, Object value) {
+        ConfigSetting setting = ConfigSetting.of(key, value, DEFAULT, DEFAULT_SEQ_ID);
+        Map<String, ConfigSetting> configMap = collected.computeIfAbsent(DEFAULT, NEW_SUB_MAP);
+        configMap.putIfAbsent(key, setting); // don't replace previous default for this key
+    }
+
+    /**
+     * Report single configuration setting with REMOTE origin.
+     *
+     * @param key configuration key to report
+     * @param value configuration value to report
+     */
+    public void putRemote(String key, Object value) {
+        put(key, value, REMOTE, ABSENT_SEQ_ID);
+    }
+
+    /**
+     * Report multiple configuration settings with REMOTE origin.
+     *
+     * @param configMap map of configuration key-value pairs to report
+     */
+    public void putRemote(Map<String, Object> configMap) {
+        // attempt merge+replace to avoid collector seeing partial update
+        Map<String, ConfigSetting> merged = new ConcurrentHashMap<>();
+
+        // prepare update
+        for (Map.Entry<String, Object> entry : configMap.entrySet()) {
+            ConfigSetting setting = ConfigSetting.of(entry.getKey(), entry.getValue(), REMOTE, ABSENT_SEQ_ID);
+            merged.put(entry.getKey(), setting);
+        }
+
+        while (true) {
+            // first try adding our update to the map
+            Map<String, ConfigSetting> current = collected.putIfAbsent(REMOTE, merged);
+            if (current == null) {
+                break; // success, no merging required
+            }
+            // merge existing entries with updated entries
+            current.forEach(merged::putIfAbsent);
+            if (collected.replace(REMOTE, current, merged)) {
+                break; // success, atomically swapped in merged map
+            }
+            // roll back to original update before next attempt
+            merged.keySet().retainAll(configMap.keySet());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public Map<ConfigOrigin, Map<String, ConfigSetting>> collect() {
+        if (!collected.isEmpty()) {
+            return COLLECTED_UPDATER.getAndSet(this, new ConcurrentHashMap<>());
+        } else {
+            return Collections.emptyMap();
+        }
     }
-  }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/api/ConfigOrigin.java b/utils/config-utils/src/main/java/datadog/trace/api/ConfigOrigin.java
index 850c39c9dea..4c5f2655a31 100644
--- a/utils/config-utils/src/main/java/datadog/trace/api/ConfigOrigin.java
+++ b/utils/config-utils/src/main/java/datadog/trace/api/ConfigOrigin.java
@@ -3,30 +3,30 @@
 // https://github.com/DataDog/instrumentation-telemetry-api-docs/blob/main/
 // GeneratedDocumentation/ApiDocs/v2/SchemaDocumentation/Schemas/conf_key_value.md
 public enum ConfigOrigin {
-  /** configurations that are set through environment variables */
-  ENV("env_var"),
-  /** values that are set using remote config */
-  REMOTE("remote_config"),
-  /** configurations that are set through JVM properties */
-  JVM_PROP("jvm_prop"),
-  /** configuration read in the stable config file, managed by users */
-  LOCAL_STABLE_CONFIG("local_stable_config"),
-  /** configuration read in the stable config file, managed by fleet */
-  FLEET_STABLE_CONFIG("fleet_stable_config"),
-  /** configurations that are set through the customer application */
-  CODE("code"),
-  /** set by the dd.yaml file or json */
-  DD_CONFIG("dd_config"),
-  /** set for cases where it is difficult/not possible to determine the source of a config. */
-  UNKNOWN("unknown"),
-  /** set when the config is calculated from multiple configs */
-  CALCULATED("calculated"),
-  /** set when the user has not set any configuration for the key (defaults to a value) */
-  DEFAULT("default");
+    /** configurations that are set through environment variables */
+    ENV("env_var"),
+    /** values that are set using remote config */
+    REMOTE("remote_config"),
+    /** configurations that are set through JVM properties */
+    JVM_PROP("jvm_prop"),
+    /** configuration read in the stable config file, managed by users */
+    LOCAL_STABLE_CONFIG("local_stable_config"),
+    /** configuration read in the stable config file, managed by fleet */
+    FLEET_STABLE_CONFIG("fleet_stable_config"),
+    /** configurations that are set through the customer application */
+    CODE("code"),
+    /** set by the dd.yaml file or json */
+    DD_CONFIG("dd_config"),
+    /** set for cases where it is difficult/not possible to determine the source of a config. */
+    UNKNOWN("unknown"),
+    /** set when the config is calculated from multiple configs */
+    CALCULATED("calculated"),
+    /** set when the user has not set any configuration for the key (defaults to a value) */
+    DEFAULT("default");
 
-  public final String value;
+    public final String value;
 
-  ConfigOrigin(String value) {
-    this.value = value;
-  }
+    ConfigOrigin(String value) {
+        this.value = value;
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/api/ConfigSetting.java b/utils/config-utils/src/main/java/datadog/trace/api/ConfigSetting.java
index 43ec0e34353..a470892b95e 100644
--- a/utils/config-utils/src/main/java/datadog/trace/api/ConfigSetting.java
+++ b/utils/config-utils/src/main/java/datadog/trace/api/ConfigSetting.java
@@ -8,139 +8,138 @@
 import java.util.Objects;
 
 public final class ConfigSetting {
-  public static final int DEFAULT_SEQ_ID = 1;
-  public static final int NON_DEFAULT_SEQ_ID = DEFAULT_SEQ_ID + 1;
-  public static final int ABSENT_SEQ_ID = 0;
-
-  public final String key;
-  public final Object value;
-  public final ConfigOrigin origin;
-  public final int seqId;
-
-  /** The config ID associated with this setting, or {@code null} if not applicable. */
-  public final String configId;
-
-  public static ConfigSetting of(String key, Object value, ConfigOrigin origin) {
-    return new ConfigSetting(key, value, origin, ABSENT_SEQ_ID, null);
-  }
-
-  public static ConfigSetting of(String key, Object value, ConfigOrigin origin, int seqId) {
-    return new ConfigSetting(key, value, origin, seqId, null);
-  }
-
-  // No usages of this function
-  public static ConfigSetting of(String key, Object value, ConfigOrigin origin, String configId) {
-    return new ConfigSetting(key, value, origin, ABSENT_SEQ_ID, configId);
-  }
-
-  public static ConfigSetting of(
-      String key, Object value, ConfigOrigin origin, int seqId, String configId) {
-    return new ConfigSetting(key, value, origin, seqId, configId);
-  }
-
-  private ConfigSetting(String key, Object value, ConfigOrigin origin, int seqId, String configId) {
-    this.key = toCanonicalEnvVar(key);
-    this.value = (value != null && SENSITIVE_KEYS.contains(this.key)) ? "<hidden>" : value;
-    this.origin = origin;
-    this.seqId = seqId;
-    this.configId = configId;
-  }
-
-  public String stringValue() {
-    if (value == null) {
-      return null;
-    } else if (value instanceof BitSet) {
-      return renderIntegerRange((BitSet) value);
-    } else if (value instanceof Map) {
-      return renderMap((Map<Object, Object>) value);
-    } else if (value instanceof Iterable) {
-      return renderIterable((Iterable) value);
-    } else {
-      return value.toString();
+    public static final int DEFAULT_SEQ_ID = 1;
+    public static final int NON_DEFAULT_SEQ_ID = DEFAULT_SEQ_ID + 1;
+    public static final int ABSENT_SEQ_ID = 0;
+
+    public final String key;
+    public final Object value;
+    public final ConfigOrigin origin;
+    public final int seqId;
+
+    /** The config ID associated with this setting, or {@code null} if not applicable. */
+    public final String configId;
+
+    public static ConfigSetting of(String key, Object value, ConfigOrigin origin) {
+        return new ConfigSetting(key, value, origin, ABSENT_SEQ_ID, null);
+    }
+
+    public static ConfigSetting of(String key, Object value, ConfigOrigin origin, int seqId) {
+        return new ConfigSetting(key, value, origin, seqId, null);
+    }
+
+    // No usages of this function
+    public static ConfigSetting of(String key, Object value, ConfigOrigin origin, String configId) {
+        return new ConfigSetting(key, value, origin, ABSENT_SEQ_ID, configId);
+    }
+
+    public static ConfigSetting of(String key, Object value, ConfigOrigin origin, int seqId, String configId) {
+        return new ConfigSetting(key, value, origin, seqId, configId);
+    }
+
+    private ConfigSetting(String key, Object value, ConfigOrigin origin, int seqId, String configId) {
+        this.key = toCanonicalEnvVar(key);
+        this.value = (value != null && SENSITIVE_KEYS.contains(this.key)) ? "<hidden>" : value;
+        this.origin = origin;
+        this.seqId = seqId;
+        this.configId = configId;
     }
-  }
-
-  private static String renderIntegerRange(BitSet bitset) {
-    StringBuilder sb = new StringBuilder();
-    int start = 0;
-    while (true) {
-      start = bitset.nextSetBit(start);
-      if (start < 0) {
-        break;
-      }
-      int end = bitset.nextClearBit(start);
-      if (sb.length() > 0) {
-        sb.append(',');
-      }
-      if (start < end - 1) {
-        // interval
-        sb.append(start);
-        sb.append('-');
-        sb.append(end);
-      } else {
-        // single value
-        sb.append(start);
-      }
-      start = end;
+
+    public String stringValue() {
+        if (value == null) {
+            return null;
+        } else if (value instanceof BitSet) {
+            return renderIntegerRange((BitSet) value);
+        } else if (value instanceof Map) {
+            return renderMap((Map<Object, Object>) value);
+        } else if (value instanceof Iterable) {
+            return renderIterable((Iterable) value);
+        } else {
+            return value.toString();
+        }
+    }
+
+    private static String renderIntegerRange(BitSet bitset) {
+        StringBuilder sb = new StringBuilder();
+        int start = 0;
+        while (true) {
+            start = bitset.nextSetBit(start);
+            if (start < 0) {
+                break;
+            }
+            int end = bitset.nextClearBit(start);
+            if (sb.length() > 0) {
+                sb.append(',');
+            }
+            if (start < end - 1) {
+                // interval
+                sb.append(start);
+                sb.append('-');
+                sb.append(end);
+            } else {
+                // single value
+                sb.append(start);
+            }
+            start = end;
+        }
+        return sb.toString();
     }
-    return sb.toString();
-  }
-
-  private static String renderMap(Map<Object, Object> merged) {
-    StringBuilder result = new StringBuilder();
-    for (Map.Entry entry : merged.entrySet()) {
-      if (result.length() > 0) {
-        result.append(',');
-      }
-      result.append(entry.getKey());
-      result.append(':');
-      result.append(entry.getValue());
+
+    private static String renderMap(Map<Object, Object> merged) {
+        StringBuilder result = new StringBuilder();
+        for (Map.Entry entry : merged.entrySet()) {
+            if (result.length() > 0) {
+                result.append(',');
+            }
+            result.append(entry.getKey());
+            result.append(':');
+            result.append(entry.getValue());
+        }
+        return result.toString();
+    }
+
+    private static String renderIterable(Iterable iterable) {
+        StringBuilder result = new StringBuilder();
+        for (Object entry : iterable) {
+            if (result.length() > 0) {
+                result.append(',');
+            }
+            result.append(entry);
+        }
+        return result.toString();
     }
-    return result.toString();
-  }
-
-  private static String renderIterable(Iterable iterable) {
-    StringBuilder result = new StringBuilder();
-    for (Object entry : iterable) {
-      if (result.length() > 0) {
-        result.append(',');
-      }
-      result.append(entry);
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ConfigSetting that = (ConfigSetting) o;
+        return key.equals(that.key)
+                && Objects.equals(value, that.value)
+                && origin == that.origin
+                && seqId == that.seqId
+                && Objects.equals(configId, that.configId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(key, value, origin, seqId, configId);
+    }
+
+    @Override
+    public String toString() {
+        return "ConfigSetting{"
+                + "key='"
+                + key
+                + '\''
+                + ", value="
+                + stringValue()
+                + ", origin="
+                + origin
+                + ", seqId="
+                + seqId
+                + ", configId="
+                + configId
+                + '}';
     }
-    return result.toString();
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    ConfigSetting that = (ConfigSetting) o;
-    return key.equals(that.key)
-        && Objects.equals(value, that.value)
-        && origin == that.origin
-        && seqId == that.seqId
-        && Objects.equals(configId, that.configId);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(key, value, origin, seqId, configId);
-  }
-
-  @Override
-  public String toString() {
-    return "ConfigSetting{"
-        + "key='"
-        + key
-        + '\''
-        + ", value="
-        + stringValue()
-        + ", origin="
-        + origin
-        + ", seqId="
-        + seqId
-        + ", configId="
-        + configId
-        + '}';
-  }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/api/env/CapturedEnvironment.java b/utils/config-utils/src/main/java/datadog/trace/api/env/CapturedEnvironment.java
index 2db02edd88a..180e330745d 100644
--- a/utils/config-utils/src/main/java/datadog/trace/api/env/CapturedEnvironment.java
+++ b/utils/config-utils/src/main/java/datadog/trace/api/env/CapturedEnvironment.java
@@ -15,74 +15,74 @@
  */
 public class CapturedEnvironment {
 
-  public static class ProcessInfo {
-    public String mainClass;
-    public File jarFile;
-
-    public ProcessInfo() {
-      String jarName = JavaVirtualMachine.getJarFile();
-      jarFile = jarName == null ? null : new File(jarName);
-      mainClass = JavaVirtualMachine.getMainClass();
+    public static class ProcessInfo {
+        public String mainClass;
+        public File jarFile;
+
+        public ProcessInfo() {
+            String jarName = JavaVirtualMachine.getJarFile();
+            jarFile = jarName == null ? null : new File(jarName);
+            mainClass = JavaVirtualMachine.getMainClass();
+        }
+
+        @VisibleForTesting
+        ProcessInfo(String mainClass, File jarFile) {
+            this.mainClass = mainClass;
+            this.jarFile = jarFile;
+        }
+    }
+
+    private static final CapturedEnvironment INSTANCE = new CapturedEnvironment();
+
+    private final Map<String, String> properties;
+    private ProcessInfo processInfo;
+
+    private CapturedEnvironment() {
+        properties = new HashMap<>();
+        processInfo = new ProcessInfo();
+        properties.put(GeneralConfig.SERVICE_NAME, autodetectServiceName());
+    }
+
+    public Map<String, String> getProperties() {
+        return properties;
+    }
+
+    public ProcessInfo getProcessInfo() {
+        return processInfo;
     }
 
     @VisibleForTesting
-    ProcessInfo(String mainClass, File jarFile) {
-      this.mainClass = mainClass;
-      this.jarFile = jarFile;
+    static void useFixedEnv(final Map<String, String> props) {
+        INSTANCE.properties.clear();
+        INSTANCE.properties.putAll(props);
     }
-  }
-
-  private static final CapturedEnvironment INSTANCE = new CapturedEnvironment();
-
-  private final Map<String, String> properties;
-  private ProcessInfo processInfo;
-
-  private CapturedEnvironment() {
-    properties = new HashMap<>();
-    processInfo = new ProcessInfo();
-    properties.put(GeneralConfig.SERVICE_NAME, autodetectServiceName());
-  }
-
-  public Map<String, String> getProperties() {
-    return properties;
-  }
-
-  public ProcessInfo getProcessInfo() {
-    return processInfo;
-  }
-
-  @VisibleForTesting
-  static void useFixedEnv(final Map<String, String> props) {
-    INSTANCE.properties.clear();
-    INSTANCE.properties.putAll(props);
-  }
-
-  @VisibleForTesting
-  static void useFixedProcessInfo(final ProcessInfo processInfo) {
-    INSTANCE.processInfo = processInfo;
-  }
-
-  /**
-   * Returns autodetected service name based on the java process command line. Typically, the
-   * autodetection will return either the JAR filename or the java main class.
-   */
-  private String autodetectServiceName() {
-    String inAas = ConfigHelper.env("DD_AZURE_APP_SERVICES");
-    String siteName = ConfigHelper.env("WEBSITE_SITE_NAME");
-
-    if (("true".equalsIgnoreCase(inAas) || "1".equals(inAas)) && siteName != null) {
-      return siteName;
+
+    @VisibleForTesting
+    static void useFixedProcessInfo(final ProcessInfo processInfo) {
+        INSTANCE.processInfo = processInfo;
     }
 
-    // preserve the original logic that is case sensitive on the .jar extension
-    if (processInfo.jarFile != null && processInfo.jarFile.getName().endsWith(".jar")) {
-      return processInfo.jarFile.getName().replace(".jar", "");
-    } else {
-      return processInfo.mainClass;
+    /**
+     * Returns autodetected service name based on the java process command line. Typically, the
+     * autodetection will return either the JAR filename or the java main class.
+     */
+    private String autodetectServiceName() {
+        String inAas = ConfigHelper.env("DD_AZURE_APP_SERVICES");
+        String siteName = ConfigHelper.env("WEBSITE_SITE_NAME");
+
+        if (("true".equalsIgnoreCase(inAas) || "1".equals(inAas)) && siteName != null) {
+            return siteName;
+        }
+
+        // preserve the original logic that is case sensitive on the .jar extension
+        if (processInfo.jarFile != null && processInfo.jarFile.getName().endsWith(".jar")) {
+            return processInfo.jarFile.getName().replace(".jar", "");
+        } else {
+            return processInfo.mainClass;
+        }
     }
-  }
 
-  public static CapturedEnvironment get() {
-    return INSTANCE;
-  }
+    public static CapturedEnvironment get() {
+        return INSTANCE;
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/api/telemetry/ConfigInversionMetricCollector.java b/utils/config-utils/src/main/java/datadog/trace/api/telemetry/ConfigInversionMetricCollector.java
index e36045d7836..0f12a62f250 100644
--- a/utils/config-utils/src/main/java/datadog/trace/api/telemetry/ConfigInversionMetricCollector.java
+++ b/utils/config-utils/src/main/java/datadog/trace/api/telemetry/ConfigInversionMetricCollector.java
@@ -1,5 +1,5 @@
 package datadog.trace.api.telemetry;
 
 public interface ConfigInversionMetricCollector {
-  void setUndocumentedEnvVarMetric(String configName);
+    void setUndocumentedEnvVarMetric(String configName);
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/api/telemetry/ConfigInversionMetricCollectorProvider.java b/utils/config-utils/src/main/java/datadog/trace/api/telemetry/ConfigInversionMetricCollectorProvider.java
index 1170ef70ebc..d69e0c8d6d5 100644
--- a/utils/config-utils/src/main/java/datadog/trace/api/telemetry/ConfigInversionMetricCollectorProvider.java
+++ b/utils/config-utils/src/main/java/datadog/trace/api/telemetry/ConfigInversionMetricCollectorProvider.java
@@ -1,16 +1,15 @@
 package datadog.trace.api.telemetry;
 
 public final class ConfigInversionMetricCollectorProvider {
-  private static ConfigInversionMetricCollector INSTANCE =
-      NoOpConfigInversionMetricCollector.getInstance();
+    private static ConfigInversionMetricCollector INSTANCE = NoOpConfigInversionMetricCollector.getInstance();
 
-  private ConfigInversionMetricCollectorProvider() {}
+    private ConfigInversionMetricCollectorProvider() {}
 
-  public static ConfigInversionMetricCollector get() {
-    return INSTANCE;
-  }
+    public static ConfigInversionMetricCollector get() {
+        return INSTANCE;
+    }
 
-  public static void register(ConfigInversionMetricCollector instance) {
-    INSTANCE = instance;
-  }
+    public static void register(ConfigInversionMetricCollector instance) {
+        INSTANCE = instance;
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/api/telemetry/NoOpConfigInversionMetricCollector.java b/utils/config-utils/src/main/java/datadog/trace/api/telemetry/NoOpConfigInversionMetricCollector.java
index 002ae7d6198..16cb50bf37a 100644
--- a/utils/config-utils/src/main/java/datadog/trace/api/telemetry/NoOpConfigInversionMetricCollector.java
+++ b/utils/config-utils/src/main/java/datadog/trace/api/telemetry/NoOpConfigInversionMetricCollector.java
@@ -8,20 +8,18 @@
  * is not registered during build tasks like instrumentJava.
  */
 public final class NoOpConfigInversionMetricCollector implements ConfigInversionMetricCollector {
-  private static final NoOpConfigInversionMetricCollector INSTANCE =
-      new NoOpConfigInversionMetricCollector();
+    private static final NoOpConfigInversionMetricCollector INSTANCE = new NoOpConfigInversionMetricCollector();
 
-  private static final Logger log =
-      LoggerFactory.getLogger(NoOpConfigInversionMetricCollector.class);
+    private static final Logger log = LoggerFactory.getLogger(NoOpConfigInversionMetricCollector.class);
 
-  private NoOpConfigInversionMetricCollector() {}
+    private NoOpConfigInversionMetricCollector() {}
 
-  public static NoOpConfigInversionMetricCollector getInstance() {
-    return INSTANCE;
-  }
+    public static NoOpConfigInversionMetricCollector getInstance() {
+        return INSTANCE;
+    }
 
-  @Override
-  public void setUndocumentedEnvVarMetric(String configName) {
-    log.debug("Environment variable {} is undocumented", configName);
-  }
+    @Override
+    public void setUndocumentedEnvVarMetric(String configName) {
+        log.debug("Environment variable {} is undocumented", configName);
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/api/telemetry/OtelEnvMetricCollector.java b/utils/config-utils/src/main/java/datadog/trace/api/telemetry/OtelEnvMetricCollector.java
index 13cf568ddff..738cd718917 100644
--- a/utils/config-utils/src/main/java/datadog/trace/api/telemetry/OtelEnvMetricCollector.java
+++ b/utils/config-utils/src/main/java/datadog/trace/api/telemetry/OtelEnvMetricCollector.java
@@ -1,9 +1,9 @@
 package datadog.trace.api.telemetry;
 
 public interface OtelEnvMetricCollector {
-  void setHidingOtelEnvVarMetric(String otelName, String ddName);
+    void setHidingOtelEnvVarMetric(String otelName, String ddName);
 
-  void setInvalidOtelEnvVarMetric(String otelName, String ddName);
+    void setInvalidOtelEnvVarMetric(String otelName, String ddName);
 
-  void setUnsupportedOtelEnvVarMetric(String otelName);
+    void setUnsupportedOtelEnvVarMetric(String otelName);
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/api/telemetry/OtelEnvMetricCollectorProvider.java b/utils/config-utils/src/main/java/datadog/trace/api/telemetry/OtelEnvMetricCollectorProvider.java
index 7e55ff3819b..55c03fba486 100644
--- a/utils/config-utils/src/main/java/datadog/trace/api/telemetry/OtelEnvMetricCollectorProvider.java
+++ b/utils/config-utils/src/main/java/datadog/trace/api/telemetry/OtelEnvMetricCollectorProvider.java
@@ -1,18 +1,18 @@
 package datadog.trace.api.telemetry;
 
 public final class OtelEnvMetricCollectorProvider {
-  private static OtelEnvMetricCollector INSTANCE = null;
+    private static OtelEnvMetricCollector INSTANCE = null;
 
-  private OtelEnvMetricCollectorProvider() {}
+    private OtelEnvMetricCollectorProvider() {}
 
-  public static OtelEnvMetricCollector get() {
-    if (INSTANCE == null) {
-      throw new IllegalStateException("OtelEnvMetricCollectorService has not been registered.");
+    public static OtelEnvMetricCollector get() {
+        if (INSTANCE == null) {
+            throw new IllegalStateException("OtelEnvMetricCollectorService has not been registered.");
+        }
+        return INSTANCE;
     }
-    return INSTANCE;
-  }
 
-  public static void register(OtelEnvMetricCollector instance) {
-    INSTANCE = instance;
-  }
+    public static void register(OtelEnvMetricCollector instance) {
+        INSTANCE = instance;
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/AgentArgsInjector.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/AgentArgsInjector.java
index 7a5a3c44883..d5a98e23f78 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/AgentArgsInjector.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/AgentArgsInjector.java
@@ -8,37 +8,37 @@
 
 public class AgentArgsInjector {
 
-  /**
-   * Parses agent arguments and sets corresponding system properties.
-   *
-   * @param agentArgs Agent arguments to be parsed and set
-   */
-  public static void injectAgentArgsConfig(String agentArgs) {
-    Map<String, String> args = ConfigConverter.parseMap(agentArgs, "javaagent arguments", '=');
-    injectAgentArgsConfig(args);
-  }
-
-  public static void injectAgentArgsConfig(Map<String, String> args) {
-    if (args == null) {
-      return;
+    /**
+     * Parses agent arguments and sets corresponding system properties.
+     *
+     * @param agentArgs Agent arguments to be parsed and set
+     */
+    public static void injectAgentArgsConfig(String agentArgs) {
+        Map<String, String> args = ConfigConverter.parseMap(agentArgs, "javaagent arguments", '=');
+        injectAgentArgsConfig(args);
     }
-    for (Map.Entry<String, String> e : args.entrySet()) {
-      String propertyName = e.getKey();
-      String existingPropertyValue = SystemProperties.get(propertyName);
-      if (existingPropertyValue != null) {
-        // system properties should have higher priority than agent arguments
-        continue;
-      }
 
-      String envVarName = toEnvVar(propertyName);
-      String envVarValue = ConfigHelper.env(envVarName);
-      if (envVarValue != null) {
-        // env variables should have higher priority than agent arguments
-        continue;
-      }
+    public static void injectAgentArgsConfig(Map<String, String> args) {
+        if (args == null) {
+            return;
+        }
+        for (Map.Entry<String, String> e : args.entrySet()) {
+            String propertyName = e.getKey();
+            String existingPropertyValue = SystemProperties.get(propertyName);
+            if (existingPropertyValue != null) {
+                // system properties should have higher priority than agent arguments
+                continue;
+            }
+
+            String envVarName = toEnvVar(propertyName);
+            String envVarValue = ConfigHelper.env(envVarName);
+            if (envVarValue != null) {
+                // env variables should have higher priority than agent arguments
+                continue;
+            }
 
-      String propertyValue = e.getValue();
-      System.setProperty(propertyName, propertyValue);
+            String propertyValue = e.getValue();
+            System.setProperty(propertyName, propertyValue);
+        }
     }
-  }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/AgentArgsParser.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/AgentArgsParser.java
index c5faef4219f..c6f85828661 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/AgentArgsParser.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/AgentArgsParser.java
@@ -8,36 +8,36 @@
 
 public class AgentArgsParser {
 
-  private static final Logger log = LoggerFactory.getLogger(AgentArgsParser.class);
+    private static final Logger log = LoggerFactory.getLogger(AgentArgsParser.class);
 
-  /**
-   * Parses agent arguments. Key-value pairs should be separated with ',' character. Key and value
-   * within a pair should be separated with '=' character. For simplicity quoting is not supported
-   *
-   * @param agentArgs in form "key1=value1,key2=value2,..."
-   * @return parsed arguments
-   */
-  public static Map<String, String> parseAgentArgs(String agentArgs) {
-    if (agentArgs == null || agentArgs.isEmpty()) {
-      return null;
-    }
-    try {
-      Map<String, String> args = new HashMap<>();
+    /**
+     * Parses agent arguments. Key-value pairs should be separated with ',' character. Key and value
+     * within a pair should be separated with '=' character. For simplicity quoting is not supported
+     *
+     * @param agentArgs in form "key1=value1,key2=value2,..."
+     * @return parsed arguments
+     */
+    public static Map<String, String> parseAgentArgs(String agentArgs) {
+        if (agentArgs == null || agentArgs.isEmpty()) {
+            return null;
+        }
+        try {
+            Map<String, String> args = new HashMap<>();
 
-      Scanner scanner = new Scanner(agentArgs);
-      scanner.useDelimiter(",");
-      while (scanner.hasNext()) {
-        String arg = scanner.next();
-        int idx = arg.indexOf('=');
-        String key = arg.substring(0, idx);
-        String value = arg.substring(idx + 1);
-        args.put(key, value);
-      }
-      return args;
+            Scanner scanner = new Scanner(agentArgs);
+            scanner.useDelimiter(",");
+            while (scanner.hasNext()) {
+                String arg = scanner.next();
+                int idx = arg.indexOf('=');
+                String key = arg.substring(0, idx);
+                String value = arg.substring(idx + 1);
+                args.put(key, value);
+            }
+            return args;
 
-    } catch (Exception ex) {
-      log.error("Error parsing agent args: {}", agentArgs, ex);
-      return null;
+        } catch (Exception ex) {
+            log.error("Error parsing agent args: {}", agentArgs, ex);
+            return null;
+        }
     }
-  }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/CapturedEnvironmentConfigSource.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/CapturedEnvironmentConfigSource.java
index 56bfb0ad547..fa40c78c5e9 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/CapturedEnvironmentConfigSource.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/CapturedEnvironmentConfigSource.java
@@ -4,23 +4,23 @@
 import datadog.trace.api.env.CapturedEnvironment;
 
 public final class CapturedEnvironmentConfigSource extends ConfigProvider.Source {
-  private final CapturedEnvironment env;
+    private final CapturedEnvironment env;
 
-  public CapturedEnvironmentConfigSource() {
-    this(CapturedEnvironment.get());
-  }
+    public CapturedEnvironmentConfigSource() {
+        this(CapturedEnvironment.get());
+    }
 
-  public CapturedEnvironmentConfigSource(CapturedEnvironment env) {
-    this.env = env;
-  }
+    public CapturedEnvironmentConfigSource(CapturedEnvironment env) {
+        this.env = env;
+    }
 
-  @Override
-  protected String get(String key) {
-    return env.getProperties().get(key);
-  }
+    @Override
+    protected String get(String key) {
+        return env.getProperties().get(key);
+    }
 
-  @Override
-  public ConfigOrigin origin() {
-    return ConfigOrigin.ENV;
-  }
+    @Override
+    public ConfigOrigin origin() {
+        return ConfigOrigin.ENV;
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/ConfigConverter.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/ConfigConverter.java
index 53024a3273a..e72408ce586 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/ConfigConverter.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/ConfigConverter.java
@@ -21,443 +21,422 @@
 
 final class ConfigConverter {
 
-  private static final Logger log = LoggerFactory.getLogger(ConfigConverter.class);
+    private static final Logger log = LoggerFactory.getLogger(ConfigConverter.class);
 
-  /**
-   * Custom exception for invalid boolean values to maintain backward compatibility. When caught in
-   * ConfigProvider, boolean methods should return false instead of default value.
-   */
-  static class InvalidBooleanValueException extends IllegalArgumentException {
-    public InvalidBooleanValueException(String message) {
-      super(message);
+    /**
+     * Custom exception for invalid boolean values to maintain backward compatibility. When caught in
+     * ConfigProvider, boolean methods should return false instead of default value.
+     */
+    static class InvalidBooleanValueException extends IllegalArgumentException {
+        public InvalidBooleanValueException(String message) {
+            super(message);
+        }
     }
-  }
 
-  private static final ValueOfLookup LOOKUP = new ValueOfLookup();
+    private static final ValueOfLookup LOOKUP = new ValueOfLookup();
 
-  /**
-   * @param value to parse by tClass::valueOf
-   * @param tClass should contain static parsing method "T valueOf(String)"
-   * @param <T>
-   * @return value == null || value.trim().isEmpty() ? defaultValue : tClass.valueOf(value)
-   * @throws NumberFormatException
-   */
-  static <T> T valueOf(final String value, @Nonnull final Class<T> tClass) {
-    Objects.requireNonNull(tClass, "tClass is marked non-null but is null");
-    if (value == null || value.trim().isEmpty()) {
-      return null;
+    /**
+     * @param value to parse by tClass::valueOf
+     * @param tClass should contain static parsing method "T valueOf(String)"
+     * @param <T>
+     * @return value == null || value.trim().isEmpty() ? defaultValue : tClass.valueOf(value)
+     * @throws NumberFormatException
+     */
+    static <T> T valueOf(final String value, @Nonnull final Class<T> tClass) {
+        Objects.requireNonNull(tClass, "tClass is marked non-null but is null");
+        if (value == null || value.trim().isEmpty()) {
+            return null;
+        }
+        try {
+            return (T) LOOKUP.get(tClass).invoke(value);
+        } catch (final NumberFormatException e) {
+            throw e;
+        } catch (final IllegalArgumentException e) {
+            throw e;
+        } catch (final Throwable e) {
+            log.debug("Can't parse: ", e);
+            throw new NumberFormatException(e.toString());
+        }
     }
-    try {
-      return (T) LOOKUP.get(tClass).invoke(value);
-    } catch (final NumberFormatException e) {
-      throw e;
-    } catch (final IllegalArgumentException e) {
-      throw e;
-    } catch (final Throwable e) {
-      log.debug("Can't parse: ", e);
-      throw new NumberFormatException(e.toString());
+
+    @Nonnull
+    static List<String> parseList(final String str) {
+        return parseList(str, ",");
     }
-  }
 
-  @Nonnull
-  static List<String> parseList(final String str) {
-    return parseList(str, ",");
-  }
+    @Nonnull
+    @SuppressForbidden
+    static List<String> parseList(final String str, final String separator) {
+        String trimmed = trim(str);
+        if (trimmed.isEmpty()) {
+            return Collections.emptyList();
+        }
 
-  @Nonnull
-  @SuppressForbidden
-  static List<String> parseList(final String str, final String separator) {
-    String trimmed = trim(str);
-    if (trimmed.isEmpty()) {
-      return Collections.emptyList();
+        final String[] tokens = trimmed.split(separator, -1);
+        // Remove whitespace from each item.
+        for (int i = 0; i < tokens.length; i++) {
+            tokens[i] = tokens[i].trim();
+        }
+        return Collections.unmodifiableList(Arrays.asList(tokens));
     }
 
-    final String[] tokens = trimmed.split(separator, -1);
-    // Remove whitespace from each item.
-    for (int i = 0; i < tokens.length; i++) {
-      tokens[i] = tokens[i].trim();
+    @Nonnull
+    static Map<String, String> parseMap(final String str, final String settingName) {
+        return parseMap(str, settingName, ':');
     }
-    return Collections.unmodifiableList(Arrays.asList(tokens));
-  }
-
-  @Nonnull
-  static Map<String, String> parseMap(final String str, final String settingName) {
-    return parseMap(str, settingName, ':');
-  }
 
-  @Nonnull
-  static Map<String, String> parseMap(
-      final String str, final String settingName, final char keyValueSeparator) {
-    // If we ever want to have default values besides an empty map, this will need to change.
-    String trimmed = trim(str);
-    if (trimmed.isEmpty()) {
-      return Collections.emptyMap();
+    @Nonnull
+    static Map<String, String> parseMap(final String str, final String settingName, final char keyValueSeparator) {
+        // If we ever want to have default values besides an empty map, this will need to change.
+        String trimmed = trim(str);
+        if (trimmed.isEmpty()) {
+            return Collections.emptyMap();
+        }
+        Map<String, String> map = new HashMap<>();
+        loadMap(map, trimmed, settingName, keyValueSeparator);
+        return map;
     }
-    Map<String, String> map = new HashMap<>();
-    loadMap(map, trimmed, settingName, keyValueSeparator);
-    return map;
-  }
 
-  @Nonnull
-  static Map<String, String> parseTraceTagsMap(
-      final String str, final char keyValueSeparator, final List<Character> argSeparators) {
-    // If we ever want to have default values besides an empty map, this will need to change.
-    String trimmed = trim(str);
-    if (trimmed.isEmpty()) {
-      return Collections.emptyMap();
+    @Nonnull
+    static Map<String, String> parseTraceTagsMap(
+            final String str, final char keyValueSeparator, final List<Character> argSeparators) {
+        // If we ever want to have default values besides an empty map, this will need to change.
+        String trimmed = trim(str);
+        if (trimmed.isEmpty()) {
+            return Collections.emptyMap();
+        }
+        Map<String, String> map = new HashMap<>();
+        loadTraceTagsMap(map, trimmed, keyValueSeparator, argSeparators);
+        return map;
     }
-    Map<String, String> map = new HashMap<>();
-    loadTraceTagsMap(map, trimmed, keyValueSeparator, argSeparators);
-    return map;
-  }
 
-  /**
-   * This parses a mixed map that can have both key value pairs, and also keys only, that will get
-   * values on the form "defaultPrefix.key". For keys without a value, the corresponding value will
-   * be normalized by converting the key to lower case and replacing all non alphanumeric
-   * characters, except '_', '-', '/' with '_'.
-   *
-   * <p>The allowed format is "(key:value|key)([ ,](key:value|key))*", where you have to choose
-   * between ',' or ' ' as the separator.
-   *
-   * @param str String to parse
-   * @param settingName Name of the setting being parsed
-   * @param defaultPrefix Default prefix to add to key ony items
-   * @param lowercaseKeys Should the keys be converted to lowercase
-   * @return A map containing the parsed key value pairs
-   */
-  @Nonnull
-  static Map<String, String> parseMapWithOptionalMappings(
-      final String str,
-      final String settingName,
-      final String defaultPrefix,
-      boolean lowercaseKeys) {
-    String trimmed = trim(str);
-    if (trimmed.isEmpty()) {
-      return Collections.emptyMap();
+    /**
+     * This parses a mixed map that can have both key value pairs, and also keys only, that will get
+     * values on the form "defaultPrefix.key". For keys without a value, the corresponding value will
+     * be normalized by converting the key to lower case and replacing all non alphanumeric
+     * characters, except '_', '-', '/' with '_'.
+     *
+     * <p>The allowed format is "(key:value|key)([ ,](key:value|key))*", where you have to choose
+     * between ',' or ' ' as the separator.
+     *
+     * @param str String to parse
+     * @param settingName Name of the setting being parsed
+     * @param defaultPrefix Default prefix to add to key ony items
+     * @param lowercaseKeys Should the keys be converted to lowercase
+     * @return A map containing the parsed key value pairs
+     */
+    @Nonnull
+    static Map<String, String> parseMapWithOptionalMappings(
+            final String str, final String settingName, final String defaultPrefix, boolean lowercaseKeys) {
+        String trimmed = trim(str);
+        if (trimmed.isEmpty()) {
+            return Collections.emptyMap();
+        }
+        Map<String, String> map = new HashMap<>();
+        loadMapWithOptionalMapping(map, trimmed, settingName, defaultPrefix, lowercaseKeys);
+        return map;
     }
-    Map<String, String> map = new HashMap<>();
-    loadMapWithOptionalMapping(map, trimmed, settingName, defaultPrefix, lowercaseKeys);
-    return map;
-  }
 
-  @Nonnull
-  static Map<String, String> parseOrderedMap(final String str, final String settingName) {
-    // If we ever want to have default values besides an empty map, this will need to change.
-    String trimmed = trim(str);
-    if (trimmed.isEmpty()) {
-      return Collections.emptyMap();
+    @Nonnull
+    static Map<String, String> parseOrderedMap(final String str, final String settingName) {
+        // If we ever want to have default values besides an empty map, this will need to change.
+        String trimmed = trim(str);
+        if (trimmed.isEmpty()) {
+            return Collections.emptyMap();
+        }
+        Map<String, String> map = new LinkedHashMap<>();
+        loadMap(map, trimmed, settingName, ':');
+        return map;
     }
-    Map<String, String> map = new LinkedHashMap<>();
-    loadMap(map, trimmed, settingName, ':');
-    return map;
-  }
 
-  private static final class BadFormatException extends Exception {
-    public BadFormatException(String message) {
-      super(message);
+    private static final class BadFormatException extends Exception {
+        public BadFormatException(String message) {
+            super(message);
+        }
     }
-  }
 
-  private static void loadMap(
-      Map<String, String> map, String str, String settingName, char keyValueSeparator) {
-    // we know that the str is trimmed and rely on that there is no leading/trailing whitespace
-    try {
-      int start = 0;
-      int splitter = str.indexOf(keyValueSeparator, start);
-      while (splitter != -1) {
-        int nextSplitter = str.indexOf(keyValueSeparator, splitter + 1);
-        int nextComma = str.indexOf(',', splitter + 1);
-        nextComma = nextComma == -1 ? str.length() : nextComma;
-        int nextSpace = str.indexOf(' ', splitter + 1);
-        nextSpace = nextSpace == -1 ? str.length() : nextSpace;
-        // if we have a delimiter after this splitter, then try to move the splitter forward to
-        // allow for tags with ':' in them
-        int end = nextComma < str.length() ? nextComma : nextSpace;
-        while (nextSplitter != -1 && nextSplitter < end) {
-          nextSplitter = str.indexOf(keyValueSeparator, nextSplitter + 1);
-        }
-        if (nextSplitter == -1) {
-          // this is either the end of the string or the next position where the value should be
-          // trimmed
-          end = nextComma;
-          if (nextComma < str.length() - 1) {
-            // there are non-space characters after the ','
-            throw new BadFormatException("Non white space characters after trailing ','");
-          }
-        } else {
-          if (nextComma < str.length()) {
-            end = nextComma;
-          } else if (nextSpace < str.length()) {
-            end = nextSpace;
-          } else {
-            // this should not happen
-            throw new BadFormatException("Illegal position of split character ':'");
-          }
-        }
-        String key = str.substring(start, splitter).trim();
-        if (key.indexOf(',') != -1) {
-          throw new BadFormatException("Illegal ',' character in key '" + key + "'");
-        }
-        String value = str.substring(splitter + 1, end).trim();
-        if (value.indexOf(' ') != -1) {
-          throw new BadFormatException("Illegal ' ' character in value for key '" + key + "'");
-        }
-        if (!key.isEmpty() && !value.isEmpty()) {
-          map.put(key, value);
+    private static void loadMap(Map<String, String> map, String str, String settingName, char keyValueSeparator) {
+        // we know that the str is trimmed and rely on that there is no leading/trailing whitespace
+        try {
+            int start = 0;
+            int splitter = str.indexOf(keyValueSeparator, start);
+            while (splitter != -1) {
+                int nextSplitter = str.indexOf(keyValueSeparator, splitter + 1);
+                int nextComma = str.indexOf(',', splitter + 1);
+                nextComma = nextComma == -1 ? str.length() : nextComma;
+                int nextSpace = str.indexOf(' ', splitter + 1);
+                nextSpace = nextSpace == -1 ? str.length() : nextSpace;
+                // if we have a delimiter after this splitter, then try to move the splitter forward to
+                // allow for tags with ':' in them
+                int end = nextComma < str.length() ? nextComma : nextSpace;
+                while (nextSplitter != -1 && nextSplitter < end) {
+                    nextSplitter = str.indexOf(keyValueSeparator, nextSplitter + 1);
+                }
+                if (nextSplitter == -1) {
+                    // this is either the end of the string or the next position where the value should be
+                    // trimmed
+                    end = nextComma;
+                    if (nextComma < str.length() - 1) {
+                        // there are non-space characters after the ','
+                        throw new BadFormatException("Non white space characters after trailing ','");
+                    }
+                } else {
+                    if (nextComma < str.length()) {
+                        end = nextComma;
+                    } else if (nextSpace < str.length()) {
+                        end = nextSpace;
+                    } else {
+                        // this should not happen
+                        throw new BadFormatException("Illegal position of split character ':'");
+                    }
+                }
+                String key = str.substring(start, splitter).trim();
+                if (key.indexOf(',') != -1) {
+                    throw new BadFormatException("Illegal ',' character in key '" + key + "'");
+                }
+                String value = str.substring(splitter + 1, end).trim();
+                if (value.indexOf(' ') != -1) {
+                    throw new BadFormatException("Illegal ' ' character in value for key '" + key + "'");
+                }
+                if (!key.isEmpty() && !value.isEmpty()) {
+                    map.put(key, value);
+                }
+                splitter = nextSplitter;
+                start = end + 1;
+            }
+        } catch (Throwable t) {
+            if (t instanceof BadFormatException) {
+                log.warn(
+                        "Invalid config for {}. {}. Must match "
+                                + "'key1{}value1,key2{}value2' or "
+                                + "'key1{}value1 key2{}value2'.",
+                        settingName,
+                        t.getMessage(),
+                        keyValueSeparator,
+                        keyValueSeparator,
+                        keyValueSeparator,
+                        keyValueSeparator);
+            } else {
+                log.warn("Unexpected exception during config parsing of {}.", settingName, t);
+            }
+            map.clear();
         }
-        splitter = nextSplitter;
-        start = end + 1;
-      }
-    } catch (Throwable t) {
-      if (t instanceof BadFormatException) {
-        log.warn(
-            "Invalid config for {}. {}. Must match "
-                + "'key1{}value1,key2{}value2' or "
-                + "'key1{}value1 key2{}value2'.",
-            settingName,
-            t.getMessage(),
-            keyValueSeparator,
-            keyValueSeparator,
-            keyValueSeparator,
-            keyValueSeparator);
-      } else {
-        log.warn("Unexpected exception during config parsing of {}.", settingName, t);
-      }
-      map.clear();
     }
-  }
 
-  private static void loadTraceTagsMap(
-      Map<String, String> map,
-      String str,
-      char keyValueSeparator,
-      final List<Character> argSeparators) {
-    int start = 0;
-    int splitter = str.indexOf(keyValueSeparator, start);
-    char argSeparator = '\0';
-    int argSeparatorInd = -1;
+    private static void loadTraceTagsMap(
+            Map<String, String> map, String str, char keyValueSeparator, final List<Character> argSeparators) {
+        int start = 0;
+        int splitter = str.indexOf(keyValueSeparator, start);
+        char argSeparator = '\0';
+        int argSeparatorInd = -1;
 
-    // Given a list of separators ordered by priority, find the first (highest priority) separator
-    // that appears in the string and store its value and first occurrence in the string
-    for (Character sep : argSeparators) {
-      argSeparatorInd = str.indexOf(sep);
-      if (argSeparatorInd != -1) {
-        argSeparator = sep;
-        break;
-      }
-    }
-    while (start < str.length()) {
-      int nextSplitter =
-          argSeparatorInd == -1
-              ? -1
-              : str.indexOf(
-                  keyValueSeparator,
-                  argSeparatorInd + 1); // next splitter after the next argSeparator
-      int nextArgSeparator =
-          argSeparatorInd == -1 ? -1 : str.indexOf(argSeparator, argSeparatorInd + 1);
-      int end = argSeparatorInd == -1 ? str.length() : argSeparatorInd;
+        // Given a list of separators ordered by priority, find the first (highest priority) separator
+        // that appears in the string and store its value and first occurrence in the string
+        for (Character sep : argSeparators) {
+            argSeparatorInd = str.indexOf(sep);
+            if (argSeparatorInd != -1) {
+                argSeparator = sep;
+                break;
+            }
+        }
+        while (start < str.length()) {
+            int nextSplitter = argSeparatorInd == -1
+                    ? -1
+                    : str.indexOf(keyValueSeparator, argSeparatorInd + 1); // next splitter after the next argSeparator
+            int nextArgSeparator = argSeparatorInd == -1 ? -1 : str.indexOf(argSeparator, argSeparatorInd + 1);
+            int end = argSeparatorInd == -1 ? str.length() : argSeparatorInd;
 
-      if (start >= end) { // the character is only the delimiter
-        start = end + 1;
-        splitter = nextSplitter;
-        argSeparatorInd = nextArgSeparator;
-        continue;
-      }
+            if (start >= end) { // the character is only the delimiter
+                start = end + 1;
+                splitter = nextSplitter;
+                argSeparatorInd = nextArgSeparator;
+                continue;
+            }
 
-      String key, value;
-      if (splitter >= end
-          || splitter
-              == -1) { // only key, no value; either due end of string or substring not having
-        // splitter
-        key = str.substring(start, end).trim();
-        value = "";
-      } else {
-        key = str.substring(start, splitter).trim();
-        value = str.substring(splitter + 1, end).trim();
-      }
-      if (!key.isEmpty()) {
-        map.put(key, value);
-      }
-      splitter = nextSplitter;
-      argSeparatorInd = nextArgSeparator;
-      start = end + 1;
+            String key, value;
+            if (splitter >= end
+                    || splitter == -1) { // only key, no value; either due end of string or substring not having
+                // splitter
+                key = str.substring(start, end).trim();
+                value = "";
+            } else {
+                key = str.substring(start, splitter).trim();
+                value = str.substring(splitter + 1, end).trim();
+            }
+            if (!key.isEmpty()) {
+                map.put(key, value);
+            }
+            splitter = nextSplitter;
+            argSeparatorInd = nextArgSeparator;
+            start = end + 1;
+        }
     }
-  }
 
-  private static void loadMapWithOptionalMapping(
-      Map<String, String> map,
-      String str,
-      String settingName,
-      String defaultPrefix,
-      boolean lowercaseKeys) {
-    try {
-      defaultPrefix = null == defaultPrefix ? "" : defaultPrefix;
-      if (!defaultPrefix.isEmpty() && !defaultPrefix.endsWith(".")) {
-        defaultPrefix = defaultPrefix + ".";
-      }
-      int start = 0;
-      int len = str.length();
-      char listChar = str.indexOf(',') == -1 ? ' ' : ',';
-      while (start < len) {
-        int end = len;
-        int listPos = str.indexOf(listChar, start);
-        int mapPos = str.indexOf(':', start);
-        int delimiter = listPos == -1 ? mapPos : mapPos == -1 ? listPos : Math.min(listPos, mapPos);
-        if (delimiter == -1) {
-          delimiter = end;
-        } else if (delimiter == mapPos) {
-          // we're in a mapping, so let's find the next part
-          int nextList = str.indexOf(listChar, delimiter + 1);
-          if (mapPos == start) {
-            // can't have an empty key
-            throw new BadFormatException("Illegal empty key at position " + start);
-          } else if (nextList != -1) {
-            end = nextList;
-          }
-        } else {
-          // delimiter is at listPos, so set end to delimiter
-          end = delimiter;
-        }
+    private static void loadMapWithOptionalMapping(
+            Map<String, String> map, String str, String settingName, String defaultPrefix, boolean lowercaseKeys) {
+        try {
+            defaultPrefix = null == defaultPrefix ? "" : defaultPrefix;
+            if (!defaultPrefix.isEmpty() && !defaultPrefix.endsWith(".")) {
+                defaultPrefix = defaultPrefix + ".";
+            }
+            int start = 0;
+            int len = str.length();
+            char listChar = str.indexOf(',') == -1 ? ' ' : ',';
+            while (start < len) {
+                int end = len;
+                int listPos = str.indexOf(listChar, start);
+                int mapPos = str.indexOf(':', start);
+                int delimiter = listPos == -1 ? mapPos : mapPos == -1 ? listPos : Math.min(listPos, mapPos);
+                if (delimiter == -1) {
+                    delimiter = end;
+                } else if (delimiter == mapPos) {
+                    // we're in a mapping, so let's find the next part
+                    int nextList = str.indexOf(listChar, delimiter + 1);
+                    if (mapPos == start) {
+                        // can't have an empty key
+                        throw new BadFormatException("Illegal empty key at position " + start);
+                    } else if (nextList != -1) {
+                        end = nextList;
+                    }
+                } else {
+                    // delimiter is at listPos, so set end to delimiter
+                    end = delimiter;
+                }
 
-        if (start != end) {
-          String key = trimmedHeader(str, start, delimiter, lowercaseKeys);
-          if (!key.isEmpty()) {
-            String value;
-            if (delimiter == mapPos) {
-              value = trimmedHeader(str, delimiter + 1, end, false);
-              // tags must start with a letter
-              if (!value.isEmpty() && !Character.isLetter(value.charAt(0))) {
-                throw new BadFormatException(
-                    "Illegal tag starting with non letter for key '" + key + "'");
-              }
-            } else {
-              // If wildcard exists, we do not allow other header mappings
-              if (key.charAt(0) == '*') {
-                map.clear();
-                map.put(key, defaultPrefix);
-                return;
-              }
-              if (Character.isLetter(key.charAt(0))) {
-                value = defaultPrefix + normalizedHeaderTag(key);
-              } else {
-                // tags must start with a letter
-                throw new BadFormatException(
-                    "Illegal key only tag starting with non letter '" + key + "'");
-              }
+                if (start != end) {
+                    String key = trimmedHeader(str, start, delimiter, lowercaseKeys);
+                    if (!key.isEmpty()) {
+                        String value;
+                        if (delimiter == mapPos) {
+                            value = trimmedHeader(str, delimiter + 1, end, false);
+                            // tags must start with a letter
+                            if (!value.isEmpty() && !Character.isLetter(value.charAt(0))) {
+                                throw new BadFormatException(
+                                        "Illegal tag starting with non letter for key '" + key + "'");
+                            }
+                        } else {
+                            // If wildcard exists, we do not allow other header mappings
+                            if (key.charAt(0) == '*') {
+                                map.clear();
+                                map.put(key, defaultPrefix);
+                                return;
+                            }
+                            if (Character.isLetter(key.charAt(0))) {
+                                value = defaultPrefix + normalizedHeaderTag(key);
+                            } else {
+                                // tags must start with a letter
+                                throw new BadFormatException(
+                                        "Illegal key only tag starting with non letter '" + key + "'");
+                            }
+                        }
+                        if (!value.isEmpty()) {
+                            map.put(key, value);
+                        }
+                    }
+                }
+                start = end + 1;
             }
-            if (!value.isEmpty()) {
-              map.put(key, value);
+        } catch (Throwable t) {
+            if (t instanceof BadFormatException) {
+                log.warn(
+                        "Invalid config for {}. {}. Must match '(key:value|key)([ ,](key:value|key))*'.",
+                        settingName,
+                        t.getMessage());
+            } else {
+                log.warn("Unexpected exception during config parsing of {}.", settingName, t);
             }
-          }
+            map.clear();
         }
-        start = end + 1;
-      }
-    } catch (Throwable t) {
-      if (t instanceof BadFormatException) {
-        log.warn(
-            "Invalid config for {}. {}. Must match '(key:value|key)([ ,](key:value|key))*'.",
-            settingName,
-            t.getMessage());
-      } else {
-        log.warn("Unexpected exception during config parsing of {}.", settingName, t);
-      }
-      map.clear();
     }
-  }
 
-  @Nonnull
-  private static String trimmedHeader(String str, int start, int end, boolean lowercase) {
-    if (start >= end) {
-      return "";
-    }
-    StringBuilder builder = new StringBuilder(end - start);
-    int firstNonWhiteSpace = -1;
-    int lastNonWhitespace = -1;
-    for (int i = start; i < end; i++) {
-      char c = lowercase ? Character.toLowerCase(str.charAt(i)) : str.charAt(i);
-      if (Character.isWhitespace(c)) {
-        builder.append(' ');
-      } else {
-        firstNonWhiteSpace = firstNonWhiteSpace == -1 ? i : firstNonWhiteSpace;
-        lastNonWhitespace = i;
-        builder.append(c);
-      }
-    }
-    if (firstNonWhiteSpace == -1) {
-      return "";
-    } else {
-      str = builder.substring(firstNonWhiteSpace - start, lastNonWhitespace - start + 1);
-      return str;
+    @Nonnull
+    private static String trimmedHeader(String str, int start, int end, boolean lowercase) {
+        if (start >= end) {
+            return "";
+        }
+        StringBuilder builder = new StringBuilder(end - start);
+        int firstNonWhiteSpace = -1;
+        int lastNonWhitespace = -1;
+        for (int i = start; i < end; i++) {
+            char c = lowercase ? Character.toLowerCase(str.charAt(i)) : str.charAt(i);
+            if (Character.isWhitespace(c)) {
+                builder.append(' ');
+            } else {
+                firstNonWhiteSpace = firstNonWhiteSpace == -1 ? i : firstNonWhiteSpace;
+                lastNonWhitespace = i;
+                builder.append(c);
+            }
+        }
+        if (firstNonWhiteSpace == -1) {
+            return "";
+        } else {
+            str = builder.substring(firstNonWhiteSpace - start, lastNonWhitespace - start + 1);
+            return str;
+        }
     }
-  }
 
-  @Nonnull
-  @SuppressForbidden
-  static BitSet parseIntegerRangeSet(@Nonnull String str, final String settingName)
-      throws NumberFormatException {
-    str = str.replaceAll("\\s", "");
-    if (!str.matches("\\d{1,3}(?:-\\d{1,3})?(?:,\\d{1,3}(?:-\\d{1,3})?)*")) {
-      log.warn(
-          "Invalid config for {}: '{}'. Must be formatted like '400-403,405,410-499'.",
-          settingName,
-          str);
-      throw new NumberFormatException();
-    }
+    @Nonnull
+    @SuppressForbidden
+    static BitSet parseIntegerRangeSet(@Nonnull String str, final String settingName) throws NumberFormatException {
+        str = str.replaceAll("\\s", "");
+        if (!str.matches("\\d{1,3}(?:-\\d{1,3})?(?:,\\d{1,3}(?:-\\d{1,3})?)*")) {
+            log.warn("Invalid config for {}: '{}'. Must be formatted like '400-403,405,410-499'.", settingName, str);
+            throw new NumberFormatException();
+        }
 
-    final int lastSeparator = Math.max(str.lastIndexOf(','), str.lastIndexOf('-'));
-    final int maxValue = Integer.parseInt(str.substring(lastSeparator + 1));
-    final BitSet set = new BitSet(maxValue);
-    final String[] tokens = str.split(",", -1);
-    for (final String token : tokens) {
-      final int separator = token.indexOf('-');
-      if (separator == -1) {
-        set.set(Integer.parseInt(token));
-      } else if (separator > 0) {
-        final int left = Integer.parseInt(token.substring(0, separator));
-        final int right = Integer.parseInt(token.substring(separator + 1));
-        final int min = Math.min(left, right);
-        final int max = Math.max(left, right);
-        set.set(min, max + 1);
-      }
+        final int lastSeparator = Math.max(str.lastIndexOf(','), str.lastIndexOf('-'));
+        final int maxValue = Integer.parseInt(str.substring(lastSeparator + 1));
+        final BitSet set = new BitSet(maxValue);
+        final String[] tokens = str.split(",", -1);
+        for (final String token : tokens) {
+            final int separator = token.indexOf('-');
+            if (separator == -1) {
+                set.set(Integer.parseInt(token));
+            } else if (separator > 0) {
+                final int left = Integer.parseInt(token.substring(0, separator));
+                final int right = Integer.parseInt(token.substring(separator + 1));
+                final int min = Math.min(left, right);
+                final int max = Math.max(left, right);
+                set.set(min, max + 1);
+            }
+        }
+        return set;
     }
-    return set;
-  }
 
-  public static Boolean booleanValueOf(String value) {
-    if ("1".equals(value)) {
-      return Boolean.TRUE;
-    } else if ("0".equals(value)) {
-      return Boolean.FALSE;
-    } else if ("true".equalsIgnoreCase(value)) {
-      return Boolean.TRUE;
-    } else if ("false".equalsIgnoreCase(value)) {
-      return Boolean.FALSE;
-    } else {
-      // Throw custom exception for invalid boolean values to maintain backward compatibility
-      throw new InvalidBooleanValueException("Invalid boolean value: " + value);
+    public static Boolean booleanValueOf(String value) {
+        if ("1".equals(value)) {
+            return Boolean.TRUE;
+        } else if ("0".equals(value)) {
+            return Boolean.FALSE;
+        } else if ("true".equalsIgnoreCase(value)) {
+            return Boolean.TRUE;
+        } else if ("false".equalsIgnoreCase(value)) {
+            return Boolean.FALSE;
+        } else {
+            // Throw custom exception for invalid boolean values to maintain backward compatibility
+            throw new InvalidBooleanValueException("Invalid boolean value: " + value);
+        }
     }
-  }
 
-  private static class ValueOfLookup extends ClassValue<MethodHandle> {
-    private static final MethodHandles.Lookup PUBLIC_LOOKUP = MethodHandles.publicLookup();
+    private static class ValueOfLookup extends ClassValue<MethodHandle> {
+        private static final MethodHandles.Lookup PUBLIC_LOOKUP = MethodHandles.publicLookup();
 
-    @Override
-    protected MethodHandle computeValue(Class<?> type) {
-      try {
-        if (Boolean.class.equals(type)) {
-          return MethodHandles.lookup()
-              .findStatic(
-                  ConfigConverter.class,
-                  "booleanValueOf",
-                  MethodType.methodType(Boolean.class, String.class));
-        }
+        @Override
+        protected MethodHandle computeValue(Class<?> type) {
+            try {
+                if (Boolean.class.equals(type)) {
+                    return MethodHandles.lookup()
+                            .findStatic(
+                                    ConfigConverter.class,
+                                    "booleanValueOf",
+                                    MethodType.methodType(Boolean.class, String.class));
+                }
 
-        return PUBLIC_LOOKUP.findStatic(type, "valueOf", MethodType.methodType(type, String.class));
-      } catch (final NoSuchMethodException | IllegalAccessException e) {
-        log.debug("Can't invoke or access 'valueOf': ", e);
-        throw new RuntimeException(e);
-      }
+                return PUBLIC_LOOKUP.findStatic(type, "valueOf", MethodType.methodType(type, String.class));
+            } catch (final NoSuchMethodException | IllegalAccessException e) {
+                log.debug("Can't invoke or access 'valueOf': ", e);
+                throw new RuntimeException(e);
+            }
+        }
     }
-  }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java
index f8187b546d2..f8842ccc949 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java
@@ -30,715 +30,694 @@
 import org.slf4j.LoggerFactory;
 
 public final class ConfigProvider {
-  private static final class Singleton {
-    private static final ConfigProvider INSTANCE = ConfigProvider.createDefault();
-  }
-
-  private static final Logger log = LoggerFactory.getLogger(ConfigProvider.class);
-
-  private final boolean collectConfig;
-
-  private final ConfigProvider.Source[] sources;
-
-  private ConfigProvider(ConfigProvider.Source... sources) {
-    this(true, sources);
-  }
-
-  private ConfigProvider(boolean collectConfig, ConfigProvider.Source... sources) {
-    this.collectConfig = collectConfig;
-    this.sources = sources;
-  }
-
-  public String getConfigFileStatus() {
-    for (ConfigProvider.Source source : sources) {
-      if (source instanceof PropertiesConfigSource) {
-        String configFileStatus = ((PropertiesConfigSource) source).getConfigFileStatus();
-        if (null != configFileStatus) {
-          return configFileStatus;
-        }
-      }
-    }
-    return "no config file present";
-  }
-
-  // Gets a string value when there is no default value.
-  public String getString(String key) {
-    return getString(key, null);
-  }
-
-  /**
-   * Gets a string value with a default fallback and optional aliases. Use for configs with
-   * meaningful defaults. Reports default to telemetry.
-   */
-  public String getString(String key, String defaultValue, String... aliases) {
-    if (collectConfig) {
-      reportDefault(key, defaultValue);
-    }
-    String value = getStringInternal(key, aliases);
-
-    return value != null ? value : defaultValue;
-  }
-
-  // Internal helper that performs configuration source lookup and reports values from non-default
-  // sources to telemetry.
-  private String getStringInternal(String key, String... aliases) {
-    ConfigValueResolver<String> resolver = null;
-    int seqId = NON_DEFAULT_SEQ_ID;
-
-    for (int i = sources.length - 1; i >= 0; i--) {
-      ConfigProvider.Source source = sources[i];
-      String candidate = source.get(key, aliases);
-      // Create resolver if we have a valid candidate
-      if (candidate != null) {
-        resolver = ConfigValueResolver.of(candidate);
-        // And report to telemetry
-        if (collectConfig) {
-          ConfigCollector.get()
-              .put(key, candidate, source.origin(), seqId, getConfigIdFromSource(source));
-        }
-      }
-
-      seqId++;
+    private static final class Singleton {
+        private static final ConfigProvider INSTANCE = ConfigProvider.createDefault();
     }
 
-    return resolver != null ? resolver.value : null;
-  }
+    private static final Logger log = LoggerFactory.getLogger(ConfigProvider.class);
 
-  public <T extends Enum<T>> T getEnum(String key, Class<T> enumType, T defaultValue) {
-    if (collectConfig) {
-      String defaultValueString = defaultValue == null ? null : defaultValue.name();
-      reportDefault(key, defaultValueString);
-    }
-    String value = getStringInternal(key);
-    if (null != value) {
-      try {
-        // replace invalid characters with _ and make sure it's upper-case before converting
-        return Enum.valueOf(enumType, value.replace('/', '_').toUpperCase(Locale.ROOT));
-      } catch (Exception ignoreAndUseDefault) {
-        log.debug("failed to parse {} for {}, defaulting to {}", value, key, defaultValue);
-      }
+    private final boolean collectConfig;
+
+    private final ConfigProvider.Source[] sources;
+
+    private ConfigProvider(ConfigProvider.Source... sources) {
+        this(true, sources);
     }
-    return defaultValue;
-  }
 
-  /**
-   * Like {@link #getString(String, String, String...)} but falls back to next source if a value is
-   * an empty or blank string.
-   */
-  public String getStringNotEmpty(String key, String defaultValue, String... aliases) {
-    if (collectConfig) {
-      reportDefault(key, defaultValue);
+    private ConfigProvider(boolean collectConfig, ConfigProvider.Source... sources) {
+        this.collectConfig = collectConfig;
+        this.sources = sources;
     }
 
-    ConfigValueResolver<String> resolver = null;
-    int seqId = NON_DEFAULT_SEQ_ID;
+    public String getConfigFileStatus() {
+        for (ConfigProvider.Source source : sources) {
+            if (source instanceof PropertiesConfigSource) {
+                String configFileStatus = ((PropertiesConfigSource) source).getConfigFileStatus();
+                if (null != configFileStatus) {
+                    return configFileStatus;
+                }
+            }
+        }
+        return "no config file present";
+    }
 
-    for (int i = sources.length - 1; i >= 0; i--) {
-      ConfigProvider.Source source = sources[i];
-      String candidateValue = source.get(key, aliases);
+    // Gets a string value when there is no default value.
+    public String getString(String key) {
+        return getString(key, null);
+    }
 
-      // Report any non-null values to telemetry
-      if (candidateValue != null) {
+    /**
+     * Gets a string value with a default fallback and optional aliases. Use for configs with
+     * meaningful defaults. Reports default to telemetry.
+     */
+    public String getString(String key, String defaultValue, String... aliases) {
         if (collectConfig) {
-          ConfigCollector.get()
-              .put(key, candidateValue, source.origin(), seqId, getConfigIdFromSource(source));
-        }
-        // Create resolver only if candidate is not empty or blank
-        if (!candidateValue.trim().isEmpty()) {
-          resolver =
-              ConfigValueResolver.of(
-                  candidateValue, source.origin(), seqId, getConfigIdFromSource(source));
+            reportDefault(key, defaultValue);
         }
-      }
+        String value = getStringInternal(key, aliases);
 
-      seqId++;
+        return value != null ? value : defaultValue;
     }
 
-    // Re-report the chosen value with the highest seqId
-    if (resolver != null && collectConfig) {
-      resolver.reReportToCollector(key, seqId + 1);
-    }
+    // Internal helper that performs configuration source lookup and reports values from non-default
+    // sources to telemetry.
+    private String getStringInternal(String key, String... aliases) {
+        ConfigValueResolver<String> resolver = null;
+        int seqId = NON_DEFAULT_SEQ_ID;
 
-    return resolver != null ? resolver.value : defaultValue;
-  }
+        for (int i = sources.length - 1; i >= 0; i--) {
+            ConfigProvider.Source source = sources[i];
+            String candidate = source.get(key, aliases);
+            // Create resolver if we have a valid candidate
+            if (candidate != null) {
+                resolver = ConfigValueResolver.of(candidate);
+                // And report to telemetry
+                if (collectConfig) {
+                    ConfigCollector.get().put(key, candidate, source.origin(), seqId, getConfigIdFromSource(source));
+                }
+            }
 
-  public String getStringExcludingSource(
-      String key,
-      String defaultValue,
-      Class<? extends ConfigProvider.Source> excludedSource,
-      String... aliases) {
-    if (collectConfig) {
-      reportDefault(key, defaultValue);
+            seqId++;
+        }
+
+        return resolver != null ? resolver.value : null;
     }
-    ConfigValueResolver<String> resolver = null;
-    int seqId = NON_DEFAULT_SEQ_ID;
-    for (int i = sources.length - 1; i >= 0; i--) {
-      ConfigProvider.Source source = sources[i];
-      String candidate = source.get(key, aliases);
 
-      // Skip excluded source types
-      if (excludedSource.isAssignableFrom(source.getClass())) {
-        seqId++;
-        continue;
-      }
-      if (candidate != null) {
-        resolver = ConfigValueResolver.of(candidate);
+    public <T extends Enum<T>> T getEnum(String key, Class<T> enumType, T defaultValue) {
         if (collectConfig) {
-          ConfigCollector.get()
-              .put(key, candidate, source.origin(), seqId, getConfigIdFromSource(source));
+            String defaultValueString = defaultValue == null ? null : defaultValue.name();
+            reportDefault(key, defaultValueString);
+        }
+        String value = getStringInternal(key);
+        if (null != value) {
+            try {
+                // replace invalid characters with _ and make sure it's upper-case before converting
+                return Enum.valueOf(enumType, value.replace('/', '_').toUpperCase(Locale.ROOT));
+            } catch (Exception ignoreAndUseDefault) {
+                log.debug("failed to parse {} for {}, defaulting to {}", value, key, defaultValue);
+            }
         }
-      }
-      seqId++;
+        return defaultValue;
     }
-    return resolver != null ? resolver.value : defaultValue;
-  }
 
-  public boolean isSet(String key) {
-    String value = getString(key);
-    return value != null && !value.isEmpty();
-  }
+    /**
+     * Like {@link #getString(String, String, String...)} but falls back to next source if a value is
+     * an empty or blank string.
+     */
+    public String getStringNotEmpty(String key, String defaultValue, String... aliases) {
+        if (collectConfig) {
+            reportDefault(key, defaultValue);
+        }
 
-  public Boolean getBoolean(String key) {
-    return get(key, null, Boolean.class);
-  }
+        ConfigValueResolver<String> resolver = null;
+        int seqId = NON_DEFAULT_SEQ_ID;
+
+        for (int i = sources.length - 1; i >= 0; i--) {
+            ConfigProvider.Source source = sources[i];
+            String candidateValue = source.get(key, aliases);
+
+            // Report any non-null values to telemetry
+            if (candidateValue != null) {
+                if (collectConfig) {
+                    ConfigCollector.get()
+                            .put(key, candidateValue, source.origin(), seqId, getConfigIdFromSource(source));
+                }
+                // Create resolver only if candidate is not empty or blank
+                if (!candidateValue.trim().isEmpty()) {
+                    resolver = ConfigValueResolver.of(
+                            candidateValue, source.origin(), seqId, getConfigIdFromSource(source));
+                }
+            }
 
-  public Boolean getBoolean(String key, String... aliases) {
-    return get(key, null, Boolean.class, aliases);
-  }
+            seqId++;
+        }
 
-  public boolean getBoolean(String key, boolean defaultValue, String... aliases) {
-    return get(key, defaultValue, Boolean.class, aliases);
-  }
+        // Re-report the chosen value with the highest seqId
+        if (resolver != null && collectConfig) {
+            resolver.reReportToCollector(key, seqId + 1);
+        }
 
-  public Integer getInteger(String key) {
-    return get(key, null, Integer.class);
-  }
+        return resolver != null ? resolver.value : defaultValue;
+    }
 
-  public Integer getInteger(String key, String... aliases) {
-    return get(key, null, Integer.class, aliases);
-  }
+    public String getStringExcludingSource(
+            String key, String defaultValue, Class<? extends ConfigProvider.Source> excludedSource, String... aliases) {
+        if (collectConfig) {
+            reportDefault(key, defaultValue);
+        }
+        ConfigValueResolver<String> resolver = null;
+        int seqId = NON_DEFAULT_SEQ_ID;
+        for (int i = sources.length - 1; i >= 0; i--) {
+            ConfigProvider.Source source = sources[i];
+            String candidate = source.get(key, aliases);
+
+            // Skip excluded source types
+            if (excludedSource.isAssignableFrom(source.getClass())) {
+                seqId++;
+                continue;
+            }
+            if (candidate != null) {
+                resolver = ConfigValueResolver.of(candidate);
+                if (collectConfig) {
+                    ConfigCollector.get().put(key, candidate, source.origin(), seqId, getConfigIdFromSource(source));
+                }
+            }
+            seqId++;
+        }
+        return resolver != null ? resolver.value : defaultValue;
+    }
+
+    public boolean isSet(String key) {
+        String value = getString(key);
+        return value != null && !value.isEmpty();
+    }
+
+    public Boolean getBoolean(String key) {
+        return get(key, null, Boolean.class);
+    }
+
+    public Boolean getBoolean(String key, String... aliases) {
+        return get(key, null, Boolean.class, aliases);
+    }
 
-  public int getInteger(String key, int defaultValue, String... aliases) {
-    return get(key, defaultValue, Integer.class, aliases);
-  }
+    public boolean getBoolean(String key, boolean defaultValue, String... aliases) {
+        return get(key, defaultValue, Boolean.class, aliases);
+    }
 
-  public Long getLong(String key) {
-    return get(key, null, Long.class);
-  }
+    public Integer getInteger(String key) {
+        return get(key, null, Integer.class);
+    }
 
-  public Long getLong(String key, String... aliases) {
-    return get(key, null, Long.class, aliases);
-  }
+    public Integer getInteger(String key, String... aliases) {
+        return get(key, null, Integer.class, aliases);
+    }
 
-  public long getLong(String key, long defaultValue, String... aliases) {
-    return get(key, defaultValue, Long.class, aliases);
-  }
+    public int getInteger(String key, int defaultValue, String... aliases) {
+        return get(key, defaultValue, Integer.class, aliases);
+    }
 
-  public Float getFloat(String key, String... aliases) {
-    return get(key, null, Float.class, aliases);
-  }
+    public Long getLong(String key) {
+        return get(key, null, Long.class);
+    }
+
+    public Long getLong(String key, String... aliases) {
+        return get(key, null, Long.class, aliases);
+    }
 
-  public float getFloat(String key, float defaultValue) {
-    return get(key, defaultValue, Float.class);
-  }
+    public long getLong(String key, long defaultValue, String... aliases) {
+        return get(key, defaultValue, Long.class, aliases);
+    }
 
-  public Double getDouble(String key) {
-    return get(key, null, Double.class);
-  }
+    public Float getFloat(String key, String... aliases) {
+        return get(key, null, Float.class, aliases);
+    }
 
-  public double getDouble(String key, double defaultValue) {
-    return get(key, defaultValue, Double.class);
-  }
+    public float getFloat(String key, float defaultValue) {
+        return get(key, defaultValue, Float.class);
+    }
 
-  public double getDouble(String key, double defaultValue, String... aliases) {
-    return get(key, defaultValue, Double.class, aliases);
-  }
+    public Double getDouble(String key) {
+        return get(key, null, Double.class);
+    }
 
-  private <T> T get(String key, T defaultValue, Class<T> type, String... aliases) {
-    if (collectConfig) {
-      reportDefault(key, defaultValue);
+    public double getDouble(String key, double defaultValue) {
+        return get(key, defaultValue, Double.class);
     }
 
-    ConfigValueResolver<T> resolver = null;
-    int seqId = NON_DEFAULT_SEQ_ID;
+    public double getDouble(String key, double defaultValue, String... aliases) {
+        return get(key, defaultValue, Double.class, aliases);
+    }
 
-    for (int i = sources.length - 1; i >= 0; i--) {
-      String sourceValue = sources[i].get(key, aliases);
-      String configId = getConfigIdFromSource(sources[i]);
+    private <T> T get(String key, T defaultValue, Class<T> type, String... aliases) {
+        if (collectConfig) {
+            reportDefault(key, defaultValue);
+        }
 
-      // Always report raw value to telemetry
-      if (sourceValue != null && collectConfig) {
-        ConfigCollector.get().put(key, sourceValue, sources[i].origin(), seqId, configId);
-      }
+        ConfigValueResolver<T> resolver = null;
+        int seqId = NON_DEFAULT_SEQ_ID;
+
+        for (int i = sources.length - 1; i >= 0; i--) {
+            String sourceValue = sources[i].get(key, aliases);
+            String configId = getConfigIdFromSource(sources[i]);
+
+            // Always report raw value to telemetry
+            if (sourceValue != null && collectConfig) {
+                ConfigCollector.get().put(key, sourceValue, sources[i].origin(), seqId, configId);
+            }
+
+            try {
+                T candidate = ConfigConverter.valueOf(sourceValue, type);
+                if (candidate != null) {
+                    resolver = ConfigValueResolver.of(candidate, sources[i].origin(), seqId, configId);
+                }
+            } catch (ConfigConverter.InvalidBooleanValueException ex) {
+                // For backward compatibility: invalid boolean values should return false, not default
+                // Store the invalid sourceValue for telemetry, but return false
+                if (Boolean.class.equals(type)) {
+                    resolver = ConfigValueResolver.of((T) Boolean.FALSE, ConfigOrigin.CALCULATED, seqId, configId);
+                }
+                // For non-boolean types, continue to next source
+            } catch (IllegalArgumentException ex) {
+                // continue - covers both NumberFormatException and other IllegalArgumentException
+            }
 
-      try {
-        T candidate = ConfigConverter.valueOf(sourceValue, type);
-        if (candidate != null) {
-          resolver = ConfigValueResolver.of(candidate, sources[i].origin(), seqId, configId);
+            seqId++;
         }
-      } catch (ConfigConverter.InvalidBooleanValueException ex) {
-        // For backward compatibility: invalid boolean values should return false, not default
-        // Store the invalid sourceValue for telemetry, but return false
-        if (Boolean.class.equals(type)) {
-          resolver =
-              ConfigValueResolver.of((T) Boolean.FALSE, ConfigOrigin.CALCULATED, seqId, configId);
+
+        // Re-report the chosen value and origin to ensure its seqId is higher than any error configs
+        if (resolver != null && collectConfig) {
+            resolver.reReportToCollector(key, seqId + 1);
         }
-        // For non-boolean types, continue to next source
-      } catch (IllegalArgumentException ex) {
-        // continue - covers both NumberFormatException and other IllegalArgumentException
-      }
 
-      seqId++;
+        return resolver != null ? resolver.value : defaultValue;
     }
 
-    // Re-report the chosen value and origin to ensure its seqId is higher than any error configs
-    if (resolver != null && collectConfig) {
-      resolver.reReportToCollector(key, seqId + 1);
+    public List<String> getList(String key) {
+        return ConfigConverter.parseList(getString(key));
     }
 
-    return resolver != null ? resolver.value : defaultValue;
-  }
-
-  public List<String> getList(String key) {
-    return ConfigConverter.parseList(getString(key));
-  }
-
-  public List<String> getList(String key, List<String> defaultValue, String... aliases) {
-    // Ensure the first item at DEFAULT is the accurate one
-    if (collectConfig) {
-      reportDefault(key, defaultValue);
+    public List<String> getList(String key, List<String> defaultValue, String... aliases) {
+        // Ensure the first item at DEFAULT is the accurate one
+        if (collectConfig) {
+            reportDefault(key, defaultValue);
+        }
+        String list = getStringInternal(key, aliases);
+        if (null == list) {
+            return defaultValue;
+        } else {
+            return ConfigConverter.parseList(list);
+        }
     }
-    String list = getStringInternal(key, aliases);
-    if (null == list) {
-      return defaultValue;
-    } else {
-      return ConfigConverter.parseList(list);
+
+    public Set<String> getSet(String key, Set<String> defaultValue) {
+        // Ensure the first item at DEFAULT is the most accurate one
+        if (collectConfig) {
+            reportDefault(key, defaultValue);
+        }
+        String list = getStringInternal(key);
+        if (null == list) {
+            return defaultValue;
+        } else {
+            return new HashSet(ConfigConverter.parseList(list));
+        }
     }
-  }
 
-  public Set<String> getSet(String key, Set<String> defaultValue) {
-    // Ensure the first item at DEFAULT is the most accurate one
-    if (collectConfig) {
-      reportDefault(key, defaultValue);
+    public List<String> getSpacedList(String key) {
+        return ConfigConverter.parseList(getString(key), " ");
     }
-    String list = getStringInternal(key);
-    if (null == list) {
-      return defaultValue;
-    } else {
-      return new HashSet(ConfigConverter.parseList(list));
+
+    public Map<String, String> getMergedMap(String key, String... aliases) {
+        return getMergedMap(key, ':', aliases);
     }
-  }
 
-  public List<String> getSpacedList(String key) {
-    return ConfigConverter.parseList(getString(key), " ");
-  }
+    public Map<String, String> getMergedMap(String key, char keyValueDelimiter, String... aliases) {
+        ConfigMergeResolver mergeResolver = new ConfigMergeResolver(new HashMap<>());
+        int seqId = NON_DEFAULT_SEQ_ID;
+
+        // System properties take precedence over env
+        // prior art:
+        // https://docs.spring.io/spring-boot/docs/1.5.6.RELEASE/reference/html/boot-features-external-config.html
+        // We reverse iterate to allow overrides
+        for (int i = sources.length - 1; 0 <= i; i--) {
+            String value = sources[i].get(key, aliases);
+            Map<String, String> parsedMap = ConfigConverter.parseMap(value, key, keyValueDelimiter);
 
-  public Map<String, String> getMergedMap(String key, String... aliases) {
-    return getMergedMap(key, ':', aliases);
-  }
+            if (!parsedMap.isEmpty()) {
+                if (collectConfig) {
+                    seqId++;
+                    ConfigCollector.get()
+                            .put(key, parsedMap, sources[i].origin(), seqId, getConfigIdFromSource(sources[i]));
+                }
+                mergeResolver.addContribution(parsedMap, sources[i].origin());
+            }
+        }
 
-  public Map<String, String> getMergedMap(String key, char keyValueDelimiter, String... aliases) {
-    ConfigMergeResolver mergeResolver = new ConfigMergeResolver(new HashMap<>());
-    int seqId = NON_DEFAULT_SEQ_ID;
+        if (collectConfig) {
+            reportDefault(key, Collections.emptyMap());
+            mergeResolver.reReportFinalResult(key, seqId);
+        }
 
-    // System properties take precedence over env
-    // prior art:
-    // https://docs.spring.io/spring-boot/docs/1.5.6.RELEASE/reference/html/boot-features-external-config.html
-    // We reverse iterate to allow overrides
-    for (int i = sources.length - 1; 0 <= i; i--) {
-      String value = sources[i].get(key, aliases);
-      Map<String, String> parsedMap = ConfigConverter.parseMap(value, key, keyValueDelimiter);
+        return mergeResolver.getMergedValue();
+    }
+
+    public Map<String, String> getMergedTagsMap(String key, String... aliases) {
+        ConfigMergeResolver mergeResolver = new ConfigMergeResolver(new HashMap<>());
+        int seqId = NON_DEFAULT_SEQ_ID;
+
+        // System properties take precedence over env
+        // prior art:
+        // https://docs.spring.io/spring-boot/docs/1.5.6.RELEASE/reference/html/boot-features-external-config.html
+        // We reverse iterate to allow overrides
+        for (int i = sources.length - 1; 0 <= i; i--) {
+            String value = sources[i].get(key, aliases);
+            Map<String, String> parsedMap = ConfigConverter.parseTraceTagsMap(value, ':', Arrays.asList(',', ' '));
+
+            if (!parsedMap.isEmpty()) {
+                if (collectConfig) {
+                    seqId++;
+                    ConfigCollector.get()
+                            .put(key, parsedMap, sources[i].origin(), seqId, getConfigIdFromSource(sources[i]));
+                }
+                mergeResolver.addContribution(parsedMap, sources[i].origin());
+            }
+        }
 
-      if (!parsedMap.isEmpty()) {
         if (collectConfig) {
-          seqId++;
-          ConfigCollector.get()
-              .put(key, parsedMap, sources[i].origin(), seqId, getConfigIdFromSource(sources[i]));
+            reportDefault(key, Collections.emptyMap());
+            mergeResolver.reReportFinalResult(key, seqId);
         }
-        mergeResolver.addContribution(parsedMap, sources[i].origin());
-      }
-    }
 
-    if (collectConfig) {
-      reportDefault(key, Collections.emptyMap());
-      mergeResolver.reReportFinalResult(key, seqId);
-    }
+        return mergeResolver.getMergedValue();
+    }
+
+    public Map<String, String> getOrderedMap(String key) {
+        // Use LinkedHashMap to preserve insertion order of map entries
+        ConfigMergeResolver mergeResolver = new ConfigMergeResolver(new LinkedHashMap<>());
+        int seqId = NON_DEFAULT_SEQ_ID;
+
+        // System properties take precedence over env
+        // prior art:
+        // https://docs.spring.io/spring-boot/docs/1.5.6.RELEASE/reference/html/boot-features-external-config.html
+        // We reverse iterate to allow overrides
+        for (int i = sources.length - 1; 0 <= i; i--) {
+            String value = sources[i].get(key);
+            Map<String, String> parsedMap = ConfigConverter.parseOrderedMap(value, key);
+
+            if (!parsedMap.isEmpty()) {
+                if (collectConfig) {
+                    seqId++;
+                    ConfigCollector.get()
+                            .put(key, parsedMap, sources[i].origin(), seqId, getConfigIdFromSource(sources[i]));
+                }
+                mergeResolver.addContribution(parsedMap, sources[i].origin());
+            }
+        }
 
-    return mergeResolver.getMergedValue();
-  }
+        if (collectConfig) {
+            reportDefault(key, Collections.emptyMap());
+            mergeResolver.reReportFinalResult(key, seqId);
+        }
 
-  public Map<String, String> getMergedTagsMap(String key, String... aliases) {
-    ConfigMergeResolver mergeResolver = new ConfigMergeResolver(new HashMap<>());
-    int seqId = NON_DEFAULT_SEQ_ID;
+        return mergeResolver.getMergedValue();
+    }
+
+    public Map<String, String> getMergedMapWithOptionalMappings(
+            String defaultPrefix, boolean lowercaseKeys, String... keys) {
+        ConfigMergeResolver mergeResolver = new ConfigMergeResolver(new HashMap<>());
+        int seqId = NON_DEFAULT_SEQ_ID;
+
+        // System properties take precedence over env
+        // prior art:
+        // https://docs.spring.io/spring-boot/docs/1.5.6.RELEASE/reference/html/boot-features-external-config.html
+        // We reverse iterate to allow overrides
+        for (String key : keys) {
+            for (int i = sources.length - 1; 0 <= i; i--) {
+                String value = sources[i].get(key);
+                Map<String, String> parsedMap =
+                        ConfigConverter.parseMapWithOptionalMappings(value, key, defaultPrefix, lowercaseKeys);
+
+                if (!parsedMap.isEmpty()) {
+                    if (collectConfig) {
+                        seqId++;
+                        ConfigCollector.get()
+                                .put(key, parsedMap, sources[i].origin(), seqId, getConfigIdFromSource(sources[i]));
+                    }
+                    mergeResolver.addContribution(parsedMap, sources[i].origin());
+                }
+            }
+
+            if (collectConfig) {
+                reportDefault(key, Collections.emptyMap());
+                mergeResolver.reReportFinalResult(key, seqId);
+            }
+        }
 
-    // System properties take precedence over env
-    // prior art:
-    // https://docs.spring.io/spring-boot/docs/1.5.6.RELEASE/reference/html/boot-features-external-config.html
-    // We reverse iterate to allow overrides
-    for (int i = sources.length - 1; 0 <= i; i--) {
-      String value = sources[i].get(key, aliases);
-      Map<String, String> parsedMap =
-          ConfigConverter.parseTraceTagsMap(value, ':', Arrays.asList(',', ' '));
+        return mergeResolver.getMergedValue();
+    }
 
-      if (!parsedMap.isEmpty()) {
+    public BitSet getIntegerRange(final String key, final BitSet defaultValue, String... aliases) {
+        // Ensure the first item at DEFAULT is the most accurate one
         if (collectConfig) {
-          seqId++;
-          ConfigCollector.get()
-              .put(key, parsedMap, sources[i].origin(), seqId, getConfigIdFromSource(sources[i]));
+            reportDefault(key, defaultValue);
+        }
+        final String value = getStringInternal(key, aliases);
+        try {
+            if (value != null) {
+                return ConfigConverter.parseIntegerRangeSet(value, key);
+            }
+        } catch (final NumberFormatException e) {
+            log.warn("Invalid configuration for {}", key, e);
         }
-        mergeResolver.addContribution(parsedMap, sources[i].origin());
-      }
+        return defaultValue;
+    }
+
+    public boolean isEnabled(
+            final Iterable<String> settingNames,
+            final String settingPrefix,
+            final String settingSuffix,
+            final boolean defaultEnabled) {
+        // If default is enabled, we want to disable individually.
+        // If default is disabled, we want to enable individually.
+        boolean anyEnabled = defaultEnabled;
+        for (final String name : settingNames) {
+            final String configKey = settingPrefix + name + settingSuffix;
+            final String fullKey = configKey.startsWith("trace.") ? configKey : "trace." + configKey;
+            final boolean configEnabled = getBoolean(fullKey, defaultEnabled, configKey);
+            if (defaultEnabled) {
+                anyEnabled &= configEnabled;
+            } else {
+                anyEnabled |= configEnabled;
+            }
+        }
+        return anyEnabled;
     }
 
-    if (collectConfig) {
-      reportDefault(key, Collections.emptyMap());
-      mergeResolver.reReportFinalResult(key, seqId);
+    public static ConfigProvider getInstance() {
+        return Singleton.INSTANCE;
     }
 
-    return mergeResolver.getMergedValue();
-  }
-
-  public Map<String, String> getOrderedMap(String key) {
-    // Use LinkedHashMap to preserve insertion order of map entries
-    ConfigMergeResolver mergeResolver = new ConfigMergeResolver(new LinkedHashMap<>());
-    int seqId = NON_DEFAULT_SEQ_ID;
+    public static ConfigProvider createDefault() {
+        Properties configProperties = loadConfigurationFile(
+                new ConfigProvider(new SystemPropertiesConfigSource(), new EnvironmentConfigSource()));
+        ConfigProvider.Source propertiesSource =
+                !configProperties.isEmpty() ? new PropertiesConfigSource(configProperties, true) : null;
 
-    // System properties take precedence over env
-    // prior art:
-    // https://docs.spring.io/spring-boot/docs/1.5.6.RELEASE/reference/html/boot-features-external-config.html
-    // We reverse iterate to allow overrides
-    for (int i = sources.length - 1; 0 <= i; i--) {
-      String value = sources[i].get(key);
-      Map<String, String> parsedMap = ConfigConverter.parseOrderedMap(value, key);
+        Map<String, String> ciEnvironmentVariables = CiEnvironmentVariables.getAll();
+        ConfigProvider.Source ciEnvironmentSource = ciEnvironmentVariables != null
+                ? new MapConfigSource(
+                        ciEnvironmentVariables, ConfigStrings::propertyNameToEnvironmentVariableName, ConfigOrigin.ENV)
+                : null;
 
-      if (!parsedMap.isEmpty()) {
-        if (collectConfig) {
-          seqId++;
-          ConfigCollector.get()
-              .put(key, parsedMap, sources[i].origin(), seqId, getConfigIdFromSource(sources[i]));
+        return new ConfigProvider(filterNonNull(
+                new SystemPropertiesConfigSource(),
+                StableConfigSource.FLEET,
+                ciEnvironmentSource,
+                new EnvironmentConfigSource(),
+                propertiesSource,
+                new OtelEnvironmentConfigSource(),
+                StableConfigSource.LOCAL,
+                new CapturedEnvironmentConfigSource()));
+    }
+
+    private static ConfigProvider.Source[] filterNonNull(ConfigProvider.Source... values) {
+        return Arrays.stream(values).filter(Objects::nonNull).toArray(Source[]::new);
+    }
+
+    public static ConfigProvider withoutCollector() {
+        Properties configProperties = loadConfigurationFile(
+                new ConfigProvider(false, new SystemPropertiesConfigSource(), new EnvironmentConfigSource()));
+        if (configProperties.isEmpty()) {
+            return new ConfigProvider(
+                    false,
+                    new SystemPropertiesConfigSource(),
+                    StableConfigSource.FLEET,
+                    new EnvironmentConfigSource(),
+                    new OtelEnvironmentConfigSource(),
+                    StableConfigSource.LOCAL,
+                    new CapturedEnvironmentConfigSource());
+        } else {
+            return new ConfigProvider(
+                    false,
+                    new SystemPropertiesConfigSource(),
+                    StableConfigSource.FLEET,
+                    new EnvironmentConfigSource(),
+                    new PropertiesConfigSource(configProperties, true),
+                    new OtelEnvironmentConfigSource(configProperties),
+                    StableConfigSource.LOCAL,
+                    new CapturedEnvironmentConfigSource());
         }
-        mergeResolver.addContribution(parsedMap, sources[i].origin());
-      }
     }
 
-    if (collectConfig) {
-      reportDefault(key, Collections.emptyMap());
-      mergeResolver.reReportFinalResult(key, seqId);
+    public static ConfigProvider withPropertiesOverride(Properties properties) {
+        PropertiesConfigSource providedConfigSource = new PropertiesConfigSource(properties, false);
+        Properties configProperties = loadConfigurationFile(new ConfigProvider(
+                new SystemPropertiesConfigSource(), new EnvironmentConfigSource(), providedConfigSource));
+        if (configProperties.isEmpty()) {
+            return new ConfigProvider(
+                    new SystemPropertiesConfigSource(),
+                    StableConfigSource.FLEET,
+                    new EnvironmentConfigSource(),
+                    providedConfigSource,
+                    new OtelEnvironmentConfigSource(),
+                    StableConfigSource.LOCAL,
+                    new CapturedEnvironmentConfigSource());
+        } else {
+            return new ConfigProvider(
+                    providedConfigSource,
+                    new SystemPropertiesConfigSource(),
+                    StableConfigSource.FLEET,
+                    new EnvironmentConfigSource(),
+                    new PropertiesConfigSource(configProperties, true),
+                    new OtelEnvironmentConfigSource(configProperties),
+                    StableConfigSource.LOCAL,
+                    new CapturedEnvironmentConfigSource());
+        }
     }
 
-    return mergeResolver.getMergedValue();
-  }
+    /**
+     * Loads the optional configuration properties file into the global {@link Properties} object.
+     *
+     * @return The {@link Properties} object. the returned instance might be empty of file does not
+     *     exist or if it is in a wrong format.
+     * @param configProvider
+     */
+    @SuppressForbidden
+    private static Properties loadConfigurationFile(ConfigProvider configProvider) {
+        final Properties properties = new Properties();
+
+        // Reading from system property first and from env after
+        String configurationFilePath = configProvider.getString(CONFIGURATION_FILE);
+        if (null == configurationFilePath) {
+            return properties;
+        }
+
+        // Normalizing tilde (~) paths for unix systems
+        String home;
+        if (configurationFilePath.charAt(0) == '~' && (home = SystemProperties.get("user.home")) != null) {
+            configurationFilePath = home + configurationFilePath.substring(1);
+        }
 
-  public Map<String, String> getMergedMapWithOptionalMappings(
-      String defaultPrefix, boolean lowercaseKeys, String... keys) {
-    ConfigMergeResolver mergeResolver = new ConfigMergeResolver(new HashMap<>());
-    int seqId = NON_DEFAULT_SEQ_ID;
+        // Configuration properties file is optional
+        final File configurationFile = new File(configurationFilePath);
+        if (!configurationFile.exists()) {
+            log.error("Configuration file '{}' not found.", configurationFilePath);
+            return properties;
+        }
 
-    // System properties take precedence over env
-    // prior art:
-    // https://docs.spring.io/spring-boot/docs/1.5.6.RELEASE/reference/html/boot-features-external-config.html
-    // We reverse iterate to allow overrides
-    for (String key : keys) {
-      for (int i = sources.length - 1; 0 <= i; i--) {
-        String value = sources[i].get(key);
-        Map<String, String> parsedMap =
-            ConfigConverter.parseMapWithOptionalMappings(value, key, defaultPrefix, lowercaseKeys);
+        try (final FileReader fileReader = new FileReader(configurationFile)) {
+            properties.load(fileReader);
+        } catch (final FileNotFoundException fnf) {
+            log.error("Configuration file '{}' not found.", configurationFilePath);
+        } catch (final IOException ioe) {
+            log.error("Configuration file '{}' cannot be accessed or correctly parsed.", configurationFilePath);
+        }
 
-        if (!parsedMap.isEmpty()) {
-          if (collectConfig) {
-            seqId++;
-            ConfigCollector.get()
-                .put(key, parsedMap, sources[i].origin(), seqId, getConfigIdFromSource(sources[i]));
-          }
-          mergeResolver.addContribution(parsedMap, sources[i].origin());
-        }
-      }
-
-      if (collectConfig) {
-        reportDefault(key, Collections.emptyMap());
-        mergeResolver.reReportFinalResult(key, seqId);
-      }
-    }
-
-    return mergeResolver.getMergedValue();
-  }
-
-  public BitSet getIntegerRange(final String key, final BitSet defaultValue, String... aliases) {
-    // Ensure the first item at DEFAULT is the most accurate one
-    if (collectConfig) {
-      reportDefault(key, defaultValue);
-    }
-    final String value = getStringInternal(key, aliases);
-    try {
-      if (value != null) {
-        return ConfigConverter.parseIntegerRangeSet(value, key);
-      }
-    } catch (final NumberFormatException e) {
-      log.warn("Invalid configuration for {}", key, e);
-    }
-    return defaultValue;
-  }
-
-  public boolean isEnabled(
-      final Iterable<String> settingNames,
-      final String settingPrefix,
-      final String settingSuffix,
-      final boolean defaultEnabled) {
-    // If default is enabled, we want to disable individually.
-    // If default is disabled, we want to enable individually.
-    boolean anyEnabled = defaultEnabled;
-    for (final String name : settingNames) {
-      final String configKey = settingPrefix + name + settingSuffix;
-      final String fullKey = configKey.startsWith("trace.") ? configKey : "trace." + configKey;
-      final boolean configEnabled = getBoolean(fullKey, defaultEnabled, configKey);
-      if (defaultEnabled) {
-        anyEnabled &= configEnabled;
-      } else {
-        anyEnabled |= configEnabled;
-      }
-    }
-    return anyEnabled;
-  }
-
-  public static ConfigProvider getInstance() {
-    return Singleton.INSTANCE;
-  }
-
-  public static ConfigProvider createDefault() {
-    Properties configProperties =
-        loadConfigurationFile(
-            new ConfigProvider(new SystemPropertiesConfigSource(), new EnvironmentConfigSource()));
-    ConfigProvider.Source propertiesSource =
-        !configProperties.isEmpty() ? new PropertiesConfigSource(configProperties, true) : null;
-
-    Map<String, String> ciEnvironmentVariables = CiEnvironmentVariables.getAll();
-    ConfigProvider.Source ciEnvironmentSource =
-        ciEnvironmentVariables != null
-            ? new MapConfigSource(
-                ciEnvironmentVariables,
-                ConfigStrings::propertyNameToEnvironmentVariableName,
-                ConfigOrigin.ENV)
-            : null;
-
-    return new ConfigProvider(
-        filterNonNull(
-            new SystemPropertiesConfigSource(),
-            StableConfigSource.FLEET,
-            ciEnvironmentSource,
-            new EnvironmentConfigSource(),
-            propertiesSource,
-            new OtelEnvironmentConfigSource(),
-            StableConfigSource.LOCAL,
-            new CapturedEnvironmentConfigSource()));
-  }
-
-  private static ConfigProvider.Source[] filterNonNull(ConfigProvider.Source... values) {
-    return Arrays.stream(values).filter(Objects::nonNull).toArray(Source[]::new);
-  }
-
-  public static ConfigProvider withoutCollector() {
-    Properties configProperties =
-        loadConfigurationFile(
-            new ConfigProvider(
-                false, new SystemPropertiesConfigSource(), new EnvironmentConfigSource()));
-    if (configProperties.isEmpty()) {
-      return new ConfigProvider(
-          false,
-          new SystemPropertiesConfigSource(),
-          StableConfigSource.FLEET,
-          new EnvironmentConfigSource(),
-          new OtelEnvironmentConfigSource(),
-          StableConfigSource.LOCAL,
-          new CapturedEnvironmentConfigSource());
-    } else {
-      return new ConfigProvider(
-          false,
-          new SystemPropertiesConfigSource(),
-          StableConfigSource.FLEET,
-          new EnvironmentConfigSource(),
-          new PropertiesConfigSource(configProperties, true),
-          new OtelEnvironmentConfigSource(configProperties),
-          StableConfigSource.LOCAL,
-          new CapturedEnvironmentConfigSource());
-    }
-  }
-
-  public static ConfigProvider withPropertiesOverride(Properties properties) {
-    PropertiesConfigSource providedConfigSource = new PropertiesConfigSource(properties, false);
-    Properties configProperties =
-        loadConfigurationFile(
-            new ConfigProvider(
-                new SystemPropertiesConfigSource(),
-                new EnvironmentConfigSource(),
-                providedConfigSource));
-    if (configProperties.isEmpty()) {
-      return new ConfigProvider(
-          new SystemPropertiesConfigSource(),
-          StableConfigSource.FLEET,
-          new EnvironmentConfigSource(),
-          providedConfigSource,
-          new OtelEnvironmentConfigSource(),
-          StableConfigSource.LOCAL,
-          new CapturedEnvironmentConfigSource());
-    } else {
-      return new ConfigProvider(
-          providedConfigSource,
-          new SystemPropertiesConfigSource(),
-          StableConfigSource.FLEET,
-          new EnvironmentConfigSource(),
-          new PropertiesConfigSource(configProperties, true),
-          new OtelEnvironmentConfigSource(configProperties),
-          StableConfigSource.LOCAL,
-          new CapturedEnvironmentConfigSource());
-    }
-  }
-
-  /**
-   * Loads the optional configuration properties file into the global {@link Properties} object.
-   *
-   * @return The {@link Properties} object. the returned instance might be empty of file does not
-   *     exist or if it is in a wrong format.
-   * @param configProvider
-   */
-  @SuppressForbidden
-  private static Properties loadConfigurationFile(ConfigProvider configProvider) {
-    final Properties properties = new Properties();
-
-    // Reading from system property first and from env after
-    String configurationFilePath = configProvider.getString(CONFIGURATION_FILE);
-    if (null == configurationFilePath) {
-      return properties;
-    }
-
-    // Normalizing tilde (~) paths for unix systems
-    String home;
-    if (configurationFilePath.charAt(0) == '~'
-        && (home = SystemProperties.get("user.home")) != null) {
-      configurationFilePath = home + configurationFilePath.substring(1);
-    }
-
-    // Configuration properties file is optional
-    final File configurationFile = new File(configurationFilePath);
-    if (!configurationFile.exists()) {
-      log.error("Configuration file '{}' not found.", configurationFilePath);
-      return properties;
-    }
-
-    try (final FileReader fileReader = new FileReader(configurationFile)) {
-      properties.load(fileReader);
-    } catch (final FileNotFoundException fnf) {
-      log.error("Configuration file '{}' not found.", configurationFilePath);
-    } catch (final IOException ioe) {
-      log.error(
-          "Configuration file '{}' cannot be accessed or correctly parsed.", configurationFilePath);
-    }
-
-    properties.setProperty(PropertiesConfigSource.CONFIG_FILE_STATUS, configurationFilePath);
-
-    return properties;
-  }
-
-  private static String getConfigIdFromSource(Source source) {
-    if (source instanceof StableConfigSource) {
-      return ((StableConfigSource) source).getConfigId();
-    }
-    return null;
-  }
-
-  private static <T> void reportDefault(String key, T defaultValue) {
-    ConfigCollector.get().putDefault(key, defaultValue);
-  }
-
-  /** Helper class to store resolved configuration values with their metadata */
-  static final class ConfigValueResolver<T> {
-    final T value;
-    final ConfigOrigin origin;
-    final int seqId;
-    final String configId;
-
-    // Single constructor that takes all fields
-    private ConfigValueResolver(T value, ConfigOrigin origin, int seqId, String configId) {
-      this.value = value;
-      this.origin = origin;
-      this.seqId = seqId;
-      this.configId = configId;
-    }
-
-    // Factory method for cases where we only care about the value (e.g., getString)
-    static <T> ConfigValueResolver<T> of(T value) {
-      return new ConfigValueResolver<>(value, null, ABSENT_SEQ_ID, null);
-    }
-
-    // Factory method for cases where we need to re-report (e.g., getStringNotEmpty, get<T>)
-    static <T> ConfigValueResolver<T> of(T value, ConfigOrigin origin, int seqId, String configId) {
-      return new ConfigValueResolver<>(value, origin, seqId, configId);
-    }
-
-    /** Re-reports this resolved value to ConfigCollector with the specified seqId */
-    void reReportToCollector(String key, int finalSeqId) {
-      // Value should never be null if there is an initialized ConfigValueResolver
-      if (origin != null) {
-        ConfigCollector.get().put(key, value, origin, finalSeqId, configId);
-      }
+        properties.setProperty(PropertiesConfigSource.CONFIG_FILE_STATUS, configurationFilePath);
+
+        return properties;
     }
-  }
 
-  /** Helper class for methods that merge map values from multiple sources (e.g., getMergedMap) */
-  private static final class ConfigMergeResolver {
-    private final Map<String, String> mergedValue;
-    private ConfigOrigin currentOrigin;
+    private static String getConfigIdFromSource(Source source) {
+        if (source instanceof StableConfigSource) {
+            return ((StableConfigSource) source).getConfigId();
+        }
+        return null;
+    }
 
-    ConfigMergeResolver(Map<String, String> initialValue) {
-      this.mergedValue = initialValue;
-      this.currentOrigin = ConfigOrigin.DEFAULT;
+    private static <T> void reportDefault(String key, T defaultValue) {
+        ConfigCollector.get().putDefault(key, defaultValue);
     }
 
-    /** Adds a contribution from a source and updates the origin tracking */
-    void addContribution(Map<String, String> contribution, ConfigOrigin sourceOrigin) {
-      mergedValue.putAll(contribution);
+    /** Helper class to store resolved configuration values with their metadata */
+    static final class ConfigValueResolver<T> {
+        final T value;
+        final ConfigOrigin origin;
+        final int seqId;
+        final String configId;
 
-      // Update origin: DEFAULT -> source origin -> CALCULATED if multiple sources
-      if (currentOrigin != ConfigOrigin.DEFAULT) {
-        // if we already have a non-default origin, the value is calculated from multiple sources
-        currentOrigin = ConfigOrigin.CALCULATED;
-      } else {
-        currentOrigin = sourceOrigin;
-      }
-    }
+        // Single constructor that takes all fields
+        private ConfigValueResolver(T value, ConfigOrigin origin, int seqId, String configId) {
+            this.value = value;
+            this.origin = origin;
+            this.seqId = seqId;
+            this.configId = configId;
+        }
 
-    /**
-     * Re-reports the final merged result to ConfigCollector if it has actual contributions. Does
-     * NOT re-report when no contributions were made since defaults are reported separately.
-     */
-    void reReportFinalResult(String key, int finalSeqId) {
-      if (currentOrigin != ConfigOrigin.DEFAULT && !mergedValue.isEmpty()) {
-        ConfigCollector.get().put(key, mergedValue, currentOrigin, finalSeqId);
-      }
-    }
+        // Factory method for cases where we only care about the value (e.g., getString)
+        static <T> ConfigValueResolver<T> of(T value) {
+            return new ConfigValueResolver<>(value, null, ABSENT_SEQ_ID, null);
+        }
+
+        // Factory method for cases where we need to re-report (e.g., getStringNotEmpty, get<T>)
+        static <T> ConfigValueResolver<T> of(T value, ConfigOrigin origin, int seqId, String configId) {
+            return new ConfigValueResolver<>(value, origin, seqId, configId);
+        }
 
-    /** Gets the final merged value */
-    Map<String, String> getMergedValue() {
-      return mergedValue;
+        /** Re-reports this resolved value to ConfigCollector with the specified seqId */
+        void reReportToCollector(String key, int finalSeqId) {
+            // Value should never be null if there is an initialized ConfigValueResolver
+            if (origin != null) {
+                ConfigCollector.get().put(key, value, origin, finalSeqId, configId);
+            }
+        }
     }
-  }
 
-  public abstract static class Source {
-    public final String get(String key, String... aliases) {
-      String value = get(key);
-      if (value != null) {
-        return value;
-      }
-      for (String alias : aliases) {
-        value = get(alias);
-        if (value != null) {
-          return value;
+    /** Helper class for methods that merge map values from multiple sources (e.g., getMergedMap) */
+    private static final class ConfigMergeResolver {
+        private final Map<String, String> mergedValue;
+        private ConfigOrigin currentOrigin;
+
+        ConfigMergeResolver(Map<String, String> initialValue) {
+            this.mergedValue = initialValue;
+            this.currentOrigin = ConfigOrigin.DEFAULT;
+        }
+
+        /** Adds a contribution from a source and updates the origin tracking */
+        void addContribution(Map<String, String> contribution, ConfigOrigin sourceOrigin) {
+            mergedValue.putAll(contribution);
+
+            // Update origin: DEFAULT -> source origin -> CALCULATED if multiple sources
+            if (currentOrigin != ConfigOrigin.DEFAULT) {
+                // if we already have a non-default origin, the value is calculated from multiple sources
+                currentOrigin = ConfigOrigin.CALCULATED;
+            } else {
+                currentOrigin = sourceOrigin;
+            }
+        }
+
+        /**
+         * Re-reports the final merged result to ConfigCollector if it has actual contributions. Does
+         * NOT re-report when no contributions were made since defaults are reported separately.
+         */
+        void reReportFinalResult(String key, int finalSeqId) {
+            if (currentOrigin != ConfigOrigin.DEFAULT && !mergedValue.isEmpty()) {
+                ConfigCollector.get().put(key, mergedValue, currentOrigin, finalSeqId);
+            }
+        }
+
+        /** Gets the final merged value */
+        Map<String, String> getMergedValue() {
+            return mergedValue;
         }
-      }
-      return null;
     }
 
-    protected abstract String get(String key);
+    public abstract static class Source {
+        public final String get(String key, String... aliases) {
+            String value = get(key);
+            if (value != null) {
+                return value;
+            }
+            for (String alias : aliases) {
+                value = get(alias);
+                if (value != null) {
+                    return value;
+                }
+            }
+            return null;
+        }
+
+        protected abstract String get(String key);
 
-    public abstract ConfigOrigin origin();
-  }
+        public abstract ConfigOrigin origin();
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/EnvironmentConfigSource.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/EnvironmentConfigSource.java
index 3c34ed15c38..1ce5bfde79e 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/EnvironmentConfigSource.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/EnvironmentConfigSource.java
@@ -7,13 +7,13 @@
 import datadog.trace.config.inversion.ConfigHelper;
 
 final class EnvironmentConfigSource extends ConfigProvider.Source {
-  @Override
-  protected String get(String key) {
-    return ConfigHelper.env(propertyNameToEnvironmentVariableName(key));
-  }
+    @Override
+    protected String get(String key) {
+        return ConfigHelper.env(propertyNameToEnvironmentVariableName(key));
+    }
 
-  @Override
-  public ConfigOrigin origin() {
-    return ENV;
-  }
+    @Override
+    public ConfigOrigin origin() {
+        return ENV;
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/MapConfigSource.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/MapConfigSource.java
index 00490b50819..240e5b59d12 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/MapConfigSource.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/MapConfigSource.java
@@ -6,26 +6,23 @@
 
 final class MapConfigSource extends ConfigProvider.Source {
 
-  private final Map<String, String> properties;
-  private final Function<String, String> keyTransformer;
-  private final ConfigOrigin origin;
+    private final Map<String, String> properties;
+    private final Function<String, String> keyTransformer;
+    private final ConfigOrigin origin;
 
-  MapConfigSource(
-      Map<String, String> properties,
-      Function<String, String> keyTransformer,
-      ConfigOrigin origin) {
-    this.properties = properties;
-    this.keyTransformer = keyTransformer;
-    this.origin = origin;
-  }
+    MapConfigSource(Map<String, String> properties, Function<String, String> keyTransformer, ConfigOrigin origin) {
+        this.properties = properties;
+        this.keyTransformer = keyTransformer;
+        this.origin = origin;
+    }
 
-  @Override
-  protected String get(String key) {
-    return properties.get(keyTransformer.apply(key));
-  }
+    @Override
+    protected String get(String key) {
+        return properties.get(keyTransformer.apply(key));
+    }
 
-  @Override
-  public ConfigOrigin origin() {
-    return origin;
-  }
+    @Override
+    public ConfigOrigin origin() {
+        return origin;
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java
index 67dd95eab2d..34c899dc32e 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java
@@ -70,522 +70,482 @@
 
 /** Maps OpenTelemetry system properties and environment variables to their Datadog equivalents. */
 final class OtelEnvironmentConfigSource extends ConfigProvider.Source {
-  private static final Logger log = LoggerFactory.getLogger(OtelEnvironmentConfigSource.class);
+    private static final Logger log = LoggerFactory.getLogger(OtelEnvironmentConfigSource.class);
 
-  private final boolean enabled;
+    private final boolean enabled;
 
-  private final Map<String, String> otelEnvironment = new HashMap<>();
+    private final Map<String, String> otelEnvironment = new HashMap<>();
 
-  private final Properties otelConfigFile = loadOtelConfigFile();
+    private final Properties otelConfigFile = loadOtelConfigFile();
 
-  private final Properties datadogConfigFile;
+    private final Properties datadogConfigFile;
 
-  @Override
-  protected String get(String key) {
-    if (!enabled) {
-      return null;
-    }
+    @Override
+    protected String get(String key) {
+        if (!enabled) {
+            return null;
+        }
 
-    String value = otelEnvironment.get(key);
-    if (null == value && key.startsWith("otel.")) {
-      value = getOtelProperty(key);
+        String value = otelEnvironment.get(key);
+        if (null == value && key.startsWith("otel.")) {
+            value = getOtelProperty(key);
+        }
+        return value;
     }
-    return value;
-  }
 
-  @Override
-  public ConfigOrigin origin() {
-    return ConfigOrigin.ENV;
-  }
+    @Override
+    public ConfigOrigin origin() {
+        return ConfigOrigin.ENV;
+    }
 
-  OtelEnvironmentConfigSource() {
-    this(null);
-  }
+    OtelEnvironmentConfigSource() {
+        this(null);
+    }
 
-  OtelEnvironmentConfigSource(Properties datadogConfigFile) {
-    this.datadogConfigFile = datadogConfigFile;
-    this.enabled = traceOtelEnabled() || metricsOtelEnabled() || logsOtelEnabled();
+    OtelEnvironmentConfigSource(Properties datadogConfigFile) {
+        this.datadogConfigFile = datadogConfigFile;
+        this.enabled = traceOtelEnabled() || metricsOtelEnabled() || logsOtelEnabled();
 
-    if (enabled) {
-      setupOtelEnvironment();
+        if (enabled) {
+            setupOtelEnvironment();
+        }
     }
-  }
 
-  private void setupOtelEnvironment() {
+    private void setupOtelEnvironment() {
 
-    // only applies when OTEL is enabled by default
-    String sdkDisabled = getOtelProperty("otel.sdk.disabled", "dd." + TRACE_OTEL_ENABLED);
-    if ("true".equalsIgnoreCase(sdkDisabled)) {
-      capture(TRACE_OTEL_ENABLED, "false");
-      capture(METRICS_OTEL_ENABLED, "false");
-      capture(LOGS_OTEL_ENABLED, "false");
-      return;
-    }
-    String logLevel = getOtelProperty("otel.log.level", "dd." + LOG_LEVEL);
-    String resourceAttributes = getOtelProperty("otel.resource.attributes", "dd." + TAGS);
-    String serviceName = getOtelProperty("otel.service.name", "dd." + SERVICE_NAME);
-    if (null != resourceAttributes) {
-      Map<String, String> attributeMap = parseOtelMap(resourceAttributes);
-      capture(SERVICE_NAME, attributeMap.remove("service.name"));
-      capture(VERSION, attributeMap.remove("service.version"));
-      String environment = attributeMap.remove("deployment.environment");
-      String namedEnvironment = attributeMap.remove("deployment.environment.name");
-      capture(ENV, namedEnvironment != null ? namedEnvironment : environment);
-      capture(TAGS, renderDatadogMap(attributeMap, 10));
-    }
-    capture(LOG_LEVEL, logLevel);
-    capture(SERVICE_NAME, serviceName);
+        // only applies when OTEL is enabled by default
+        String sdkDisabled = getOtelProperty("otel.sdk.disabled", "dd." + TRACE_OTEL_ENABLED);
+        if ("true".equalsIgnoreCase(sdkDisabled)) {
+            capture(TRACE_OTEL_ENABLED, "false");
+            capture(METRICS_OTEL_ENABLED, "false");
+            capture(LOGS_OTEL_ENABLED, "false");
+            return;
+        }
+        String logLevel = getOtelProperty("otel.log.level", "dd." + LOG_LEVEL);
+        String resourceAttributes = getOtelProperty("otel.resource.attributes", "dd." + TAGS);
+        String serviceName = getOtelProperty("otel.service.name", "dd." + SERVICE_NAME);
+        if (null != resourceAttributes) {
+            Map<String, String> attributeMap = parseOtelMap(resourceAttributes);
+            capture(SERVICE_NAME, attributeMap.remove("service.name"));
+            capture(VERSION, attributeMap.remove("service.version"));
+            String environment = attributeMap.remove("deployment.environment");
+            String namedEnvironment = attributeMap.remove("deployment.environment.name");
+            capture(ENV, namedEnvironment != null ? namedEnvironment : environment);
+            capture(TAGS, renderDatadogMap(attributeMap, 10));
+        }
+        capture(LOG_LEVEL, logLevel);
+        capture(SERVICE_NAME, serviceName);
 
-    if (traceOtelEnabled()) {
-      setupTraceOtelEnvironment();
-    }
+        if (traceOtelEnabled()) {
+            setupTraceOtelEnvironment();
+        }
 
-    if (metricsOtelEnabled()) {
-      setupMetricsOtelEnvironment();
-    } else {
-      capture(RUNTIME_METRICS_ENABLED, mapDataCollection("metrics"));
-    }
+        if (metricsOtelEnabled()) {
+            setupMetricsOtelEnvironment();
+        } else {
+            capture(RUNTIME_METRICS_ENABLED, mapDataCollection("metrics"));
+        }
 
-    if (logsOtelEnabled()) {
-      setupLogsOtelEnvironment();
-    } else {
-      mapDataCollection("logs");
-    }
-  }
-
-  private void setupTraceOtelEnvironment() {
-    String propagators = getOtelProperty("otel.propagators", "dd." + TRACE_PROPAGATION_STYLE);
-    String tracesSampler = getOtelProperty("otel.traces.sampler", "dd." + TRACE_SAMPLE_RATE);
-    String requestHeaders = getOtelHeaders("request-headers", "dd." + REQUEST_HEADER_TAGS);
-    String responseHeaders = getOtelHeaders("response-headers", "dd." + RESPONSE_HEADER_TAGS);
-    String extensions = getOtelProperty("otel.javaagent.extensions", "dd." + TRACE_EXTENSIONS_PATH);
-    capture(TRACE_PROPAGATION_STYLE, mapPropagationStyle(propagators));
-    capture(TRACE_SAMPLE_RATE, mapSampleRate(tracesSampler));
-    capture(REQUEST_HEADER_TAGS, mapHeaderTags("http.request.header.", requestHeaders));
-    capture(RESPONSE_HEADER_TAGS, mapHeaderTags("http.response.header.", responseHeaders));
-    capture(TRACE_EXTENSIONS_PATH, extensions);
-    capture(
-        OTEL_TRACES_SPAN_METRICS_ENABLED,
-        getOtelProperty(
-            "otel.traces.span.metrics.enabled", "dd." + OTEL_TRACES_SPAN_METRICS_ENABLED));
-
-    String exporter = getOtelProperty("otel.traces.exporter");
-    if ("otlp".equalsIgnoreCase(exporter)) { // traces defaults to non-OTLP (i.e. datadog)
-      capture(TRACE_OTEL_EXPORTER, "otlp");
-      capture(
-          OTLP_TRACES_HEADERS,
-          getOtelOtlpProperty("traces", "headers", "dd." + OTLP_TRACES_HEADERS));
-      capture(
-          OTLP_TRACES_PROTOCOL,
-          getOtelOtlpProperty("traces", "protocol", "dd." + OTLP_TRACES_PROTOCOL));
-      capture(
-          OTLP_TRACES_COMPRESSION,
-          getOtelOtlpProperty("traces", "compression", "dd." + OTLP_TRACES_COMPRESSION));
-      capture(
-          OTLP_TRACES_TIMEOUT,
-          getOtelOtlpProperty("traces", "timeout", "dd." + OTLP_TRACES_TIMEOUT));
-      capture(
-          OTLP_TRACES_ENDPOINT,
-          getOtelOtlpProperty("traces", "endpoint", "dd." + OTLP_TRACES_ENDPOINT));
-    } else {
-      capture(TRACE_ENABLED, mapDataCollection("traces"));
-    }
-  }
-
-  private void setupMetricsOtelEnvironment() {
-    capture(
-        METRICS_OTEL_INTERVAL,
-        getOtelProperty("otel.metric.export.interval", "dd." + METRICS_OTEL_INTERVAL));
-    capture(
-        METRICS_OTEL_TIMEOUT,
-        getOtelProperty("otel.metric.export.timeout", "dd." + METRICS_OTEL_TIMEOUT));
-    capture(
-        METRICS_OTEL_CARDINALITY_LIMIT,
-        getOtelProperty(
-            "otel.java.metrics.cardinality.limit", "dd." + METRICS_OTEL_CARDINALITY_LIMIT));
-    capture(
-        METRICS_OTEL_EXPERIMENTAL_ENABLED,
-        getOtelProperty(
-            "otel.instrumentation.runtime-telemetry.emit-experimental-metrics",
-            "dd." + METRICS_OTEL_EXPERIMENTAL_ENABLED));
-
-    String exporter = getOtelProperty("otel.metrics.exporter");
-    if (exporter == null || "otlp".equalsIgnoreCase(exporter)) { // metrics defaults to OTLP
-      capture(METRICS_OTEL_EXPORTER, "otlp");
-      capture(
-          OTLP_METRICS_HEADERS,
-          getOtelOtlpProperty("metrics", "headers", "dd." + OTLP_METRICS_HEADERS));
-      capture(
-          OTLP_METRICS_PROTOCOL,
-          getOtelOtlpProperty("metrics", "protocol", "dd." + OTLP_METRICS_PROTOCOL));
-      capture(
-          OTLP_METRICS_COMPRESSION,
-          getOtelOtlpProperty("metrics", "compression", "dd." + OTLP_METRICS_COMPRESSION));
-      capture(
-          OTLP_METRICS_TIMEOUT,
-          getOtelOtlpProperty("metrics", "timeout", "dd." + OTLP_METRICS_TIMEOUT));
-      capture(
-          OTLP_METRICS_ENDPOINT,
-          getOtelOtlpProperty("metrics", "endpoint", "dd." + OTLP_METRICS_ENDPOINT));
-      capture(
-          OTLP_METRICS_TEMPORALITY_PREFERENCE,
-          getOtelProperty(
-              "otel.exporter.otlp.metrics.temporality.preference",
-              "dd." + OTLP_METRICS_TEMPORALITY_PREFERENCE));
-    } else {
-      capture(RUNTIME_METRICS_ENABLED, mapDataCollection("metrics"));
-    }
-  }
-
-  private void setupLogsOtelEnvironment() {
-    capture(
-        LOGS_OTEL_INTERVAL,
-        getOtelProperty("otel.blrp.schedule.delay", "dd." + LOGS_OTEL_INTERVAL));
-    capture(
-        LOGS_OTEL_TIMEOUT, getOtelProperty("otel.blrp.export.timeout", "dd." + LOGS_OTEL_TIMEOUT));
-    capture(
-        LOGS_OTEL_QUEUE_SIZE,
-        getOtelProperty("otel.blrp.max.queue.size", "dd." + LOGS_OTEL_QUEUE_SIZE));
-    capture(
-        LOGS_OTEL_BATCH_SIZE,
-        getOtelProperty("otel.blrp.max.export.batch.size", "dd." + LOGS_OTEL_BATCH_SIZE));
-    String exporter = getOtelProperty("otel.logs.exporter");
-    if (exporter == null || "otlp".equalsIgnoreCase(exporter)) { // logs defaults to OTLP
-      capture(LOGS_OTEL_EXPORTER, "otlp");
-      capture(OTLP_LOGS_HEADERS, getOtelOtlpProperty("logs", "headers", "dd." + OTLP_LOGS_HEADERS));
-      capture(
-          OTLP_LOGS_PROTOCOL, getOtelOtlpProperty("logs", "protocol", "dd." + OTLP_LOGS_PROTOCOL));
-      capture(
-          OTLP_LOGS_COMPRESSION,
-          getOtelOtlpProperty("logs", "compression", "dd." + OTLP_LOGS_COMPRESSION));
-      capture(OTLP_LOGS_TIMEOUT, getOtelOtlpProperty("logs", "timeout", "dd." + OTLP_LOGS_TIMEOUT));
-      capture(
-          OTLP_LOGS_ENDPOINT, getOtelOtlpProperty("logs", "endpoint", "dd." + OTLP_LOGS_ENDPOINT));
-    } else {
-      mapDataCollection("logs");
-    }
-  }
-
-  private boolean traceOtelEnabled() {
-    String enabled = getDatadogProperty("dd." + TRACE_OTEL_ENABLED);
-    if (null != enabled) {
-      return Boolean.parseBoolean(enabled);
-    } else {
-      return DEFAULT_TRACE_OTEL_ENABLED;
-    }
-  }
-
-  private boolean metricsOtelEnabled() {
-    String enabled = getDatadogProperty("dd." + METRICS_OTEL_ENABLED);
-    if (null != enabled) {
-      return Boolean.parseBoolean(enabled);
-    } else {
-      return DEFAULT_METRICS_OTEL_ENABLED;
-    }
-  }
-
-  private boolean logsOtelEnabled() {
-    String enabled = getDatadogProperty("dd." + LOGS_OTEL_ENABLED);
-    if (null != enabled) {
-      return Boolean.parseBoolean(enabled);
-    } else {
-      return DEFAULT_LOGS_OTEL_ENABLED;
-    }
-  }
-
-  /**
-   * Gets an OpenTelemetry property.
-   *
-   * <p>Checks system properties, environment variables, and the optional OpenTelemetry config file.
-   * If the equivalent Datadog property is also set then log a warning and return {@code null}.
-   */
-  private String getOtelProperty(String otelSysProp, String ddSysProp) {
-    String otelValue = getOtelProperty(otelSysProp);
-    if (null == otelValue) {
-      return null;
-    }
-    String ddValue = getDatadogProperty(ddSysProp);
-    if (null != ddValue) {
-      String otelEnvVar = toEnvVar(otelSysProp);
-      log.warn("Both {} and {} are set, ignoring {}", toEnvVar(ddSysProp), otelEnvVar, otelEnvVar);
-      OtelEnvMetricCollectorProvider.get()
-          .setHidingOtelEnvVarMetric(toEnvVarLowerCase(otelSysProp), toEnvVarLowerCase(ddSysProp));
-      return null;
-    }
-    return otelValue;
-  }
-
-  /**
-   * Gets an OpenTelemetry property.
-   *
-   * <p>Checks system properties, environment variables, and the optional OpenTelemetry config file.
-   */
-  private String getOtelProperty(String sysProp) {
-    String value = getProperty(sysProp);
-    if (null == value && null != otelConfigFile) {
-      value = otelConfigFile.getProperty(sysProp);
-    }
-    return value;
-  }
-
-  /**
-   * Gets an OpenTelemetry OTLP property, checking the signal specific key before the general one.
-   *
-   * <p>Checks system properties, environment variables, and the optional OpenTelemetry config file.
-   * If the equivalent Datadog property is also set then log a warning and return {@code null}.
-   */
-  private String getOtelOtlpProperty(String signal, String subkey, String ddSysProp) {
-    String otelKey = "otel.exporter.otlp." + signal + "." + subkey;
-    String otelValue = getOtelProperty(otelKey);
-    if (null == otelValue) {
-      // fall back to general configuration
-      otelKey = "otel.exporter.otlp." + subkey;
-      otelValue = getOtelProperty(otelKey);
-      // special case when using general endpoint as fallback: append appropriate suffix
-      if ("endpoint".equals(subkey) && otelValue != null && !otelValue.startsWith("unix://")) {
-        if ("logs".equals(signal)
-            && !"grpc".equalsIgnoreCase(otelEnvironment.get(OTLP_LOGS_PROTOCOL))) {
-          otelValue = otelValue + (otelValue.endsWith("/") ? "v1/logs" : "/v1/logs");
-        }
-        if ("metrics".equals(signal)
-            && !"grpc".equalsIgnoreCase(otelEnvironment.get(OTLP_METRICS_PROTOCOL))) {
-          otelValue = otelValue + (otelValue.endsWith("/") ? "v1/metrics" : "/v1/metrics");
-        }
-        if ("traces".equals(signal)
-            && !"grpc".equalsIgnoreCase(otelEnvironment.get(OTLP_TRACES_PROTOCOL))) {
-          otelValue = otelValue + (otelValue.endsWith("/") ? "v1/traces" : "/v1/traces");
-        }
-      }
+        if (logsOtelEnabled()) {
+            setupLogsOtelEnvironment();
+        } else {
+            mapDataCollection("logs");
+        }
     }
-    if (null == otelValue) {
-      return null;
+
+    private void setupTraceOtelEnvironment() {
+        String propagators = getOtelProperty("otel.propagators", "dd." + TRACE_PROPAGATION_STYLE);
+        String tracesSampler = getOtelProperty("otel.traces.sampler", "dd." + TRACE_SAMPLE_RATE);
+        String requestHeaders = getOtelHeaders("request-headers", "dd." + REQUEST_HEADER_TAGS);
+        String responseHeaders = getOtelHeaders("response-headers", "dd." + RESPONSE_HEADER_TAGS);
+        String extensions = getOtelProperty("otel.javaagent.extensions", "dd." + TRACE_EXTENSIONS_PATH);
+        capture(TRACE_PROPAGATION_STYLE, mapPropagationStyle(propagators));
+        capture(TRACE_SAMPLE_RATE, mapSampleRate(tracesSampler));
+        capture(REQUEST_HEADER_TAGS, mapHeaderTags("http.request.header.", requestHeaders));
+        capture(RESPONSE_HEADER_TAGS, mapHeaderTags("http.response.header.", responseHeaders));
+        capture(TRACE_EXTENSIONS_PATH, extensions);
+        capture(
+                OTEL_TRACES_SPAN_METRICS_ENABLED,
+                getOtelProperty("otel.traces.span.metrics.enabled", "dd." + OTEL_TRACES_SPAN_METRICS_ENABLED));
+
+        String exporter = getOtelProperty("otel.traces.exporter");
+        if ("otlp".equalsIgnoreCase(exporter)) { // traces defaults to non-OTLP (i.e. datadog)
+            capture(TRACE_OTEL_EXPORTER, "otlp");
+            capture(OTLP_TRACES_HEADERS, getOtelOtlpProperty("traces", "headers", "dd." + OTLP_TRACES_HEADERS));
+            capture(OTLP_TRACES_PROTOCOL, getOtelOtlpProperty("traces", "protocol", "dd." + OTLP_TRACES_PROTOCOL));
+            capture(
+                    OTLP_TRACES_COMPRESSION,
+                    getOtelOtlpProperty("traces", "compression", "dd." + OTLP_TRACES_COMPRESSION));
+            capture(OTLP_TRACES_TIMEOUT, getOtelOtlpProperty("traces", "timeout", "dd." + OTLP_TRACES_TIMEOUT));
+            capture(OTLP_TRACES_ENDPOINT, getOtelOtlpProperty("traces", "endpoint", "dd." + OTLP_TRACES_ENDPOINT));
+        } else {
+            capture(TRACE_ENABLED, mapDataCollection("traces"));
+        }
     }
-    String ddValue = getDatadogProperty(ddSysProp);
-    if (null != ddValue) {
-      String otelEnvVar = toEnvVar(otelKey);
-      log.warn("Both {} and {} are set, ignoring {}", toEnvVar(ddSysProp), otelEnvVar, otelEnvVar);
-      OtelEnvMetricCollectorProvider.get()
-          .setHidingOtelEnvVarMetric(toEnvVarLowerCase(otelKey), toEnvVarLowerCase(ddSysProp));
-      return null;
+
+    private void setupMetricsOtelEnvironment() {
+        capture(METRICS_OTEL_INTERVAL, getOtelProperty("otel.metric.export.interval", "dd." + METRICS_OTEL_INTERVAL));
+        capture(METRICS_OTEL_TIMEOUT, getOtelProperty("otel.metric.export.timeout", "dd." + METRICS_OTEL_TIMEOUT));
+        capture(
+                METRICS_OTEL_CARDINALITY_LIMIT,
+                getOtelProperty("otel.java.metrics.cardinality.limit", "dd." + METRICS_OTEL_CARDINALITY_LIMIT));
+        capture(
+                METRICS_OTEL_EXPERIMENTAL_ENABLED,
+                getOtelProperty(
+                        "otel.instrumentation.runtime-telemetry.emit-experimental-metrics",
+                        "dd." + METRICS_OTEL_EXPERIMENTAL_ENABLED));
+
+        String exporter = getOtelProperty("otel.metrics.exporter");
+        if (exporter == null || "otlp".equalsIgnoreCase(exporter)) { // metrics defaults to OTLP
+            capture(METRICS_OTEL_EXPORTER, "otlp");
+            capture(OTLP_METRICS_HEADERS, getOtelOtlpProperty("metrics", "headers", "dd." + OTLP_METRICS_HEADERS));
+            capture(OTLP_METRICS_PROTOCOL, getOtelOtlpProperty("metrics", "protocol", "dd." + OTLP_METRICS_PROTOCOL));
+            capture(
+                    OTLP_METRICS_COMPRESSION,
+                    getOtelOtlpProperty("metrics", "compression", "dd." + OTLP_METRICS_COMPRESSION));
+            capture(OTLP_METRICS_TIMEOUT, getOtelOtlpProperty("metrics", "timeout", "dd." + OTLP_METRICS_TIMEOUT));
+            capture(OTLP_METRICS_ENDPOINT, getOtelOtlpProperty("metrics", "endpoint", "dd." + OTLP_METRICS_ENDPOINT));
+            capture(
+                    OTLP_METRICS_TEMPORALITY_PREFERENCE,
+                    getOtelProperty(
+                            "otel.exporter.otlp.metrics.temporality.preference",
+                            "dd." + OTLP_METRICS_TEMPORALITY_PREFERENCE));
+        } else {
+            capture(RUNTIME_METRICS_ENABLED, mapDataCollection("metrics"));
+        }
     }
-    return otelValue;
-  }
-
-  /**
-   * Gets a Datadog property.
-   *
-   * <p>Checks system properties, environment variables, and the optional Datadog config file.
-   */
-  private String getDatadogProperty(String sysProp) {
-    String value = getProperty(sysProp);
-    if (null == value && null != datadogConfigFile) {
-      value = datadogConfigFile.getProperty(sysProp);
+
+    private void setupLogsOtelEnvironment() {
+        capture(LOGS_OTEL_INTERVAL, getOtelProperty("otel.blrp.schedule.delay", "dd." + LOGS_OTEL_INTERVAL));
+        capture(LOGS_OTEL_TIMEOUT, getOtelProperty("otel.blrp.export.timeout", "dd." + LOGS_OTEL_TIMEOUT));
+        capture(LOGS_OTEL_QUEUE_SIZE, getOtelProperty("otel.blrp.max.queue.size", "dd." + LOGS_OTEL_QUEUE_SIZE));
+        capture(LOGS_OTEL_BATCH_SIZE, getOtelProperty("otel.blrp.max.export.batch.size", "dd." + LOGS_OTEL_BATCH_SIZE));
+        String exporter = getOtelProperty("otel.logs.exporter");
+        if (exporter == null || "otlp".equalsIgnoreCase(exporter)) { // logs defaults to OTLP
+            capture(LOGS_OTEL_EXPORTER, "otlp");
+            capture(OTLP_LOGS_HEADERS, getOtelOtlpProperty("logs", "headers", "dd." + OTLP_LOGS_HEADERS));
+            capture(OTLP_LOGS_PROTOCOL, getOtelOtlpProperty("logs", "protocol", "dd." + OTLP_LOGS_PROTOCOL));
+            capture(OTLP_LOGS_COMPRESSION, getOtelOtlpProperty("logs", "compression", "dd." + OTLP_LOGS_COMPRESSION));
+            capture(OTLP_LOGS_TIMEOUT, getOtelOtlpProperty("logs", "timeout", "dd." + OTLP_LOGS_TIMEOUT));
+            capture(OTLP_LOGS_ENDPOINT, getOtelOtlpProperty("logs", "endpoint", "dd." + OTLP_LOGS_ENDPOINT));
+        } else {
+            mapDataCollection("logs");
+        }
     }
-    return value;
-  }
-
-  /**
-   * Gets a general property.
-   *
-   * <p>Checks system properties and environment variables.
-   */
-  private static String getProperty(String sysProp) {
-    // Always validate through ConfigHelper so STRICT_TEST mode can detect unsupported configs
-    String value = ConfigHelper.env(toEnvVar(sysProp));
-    // System property takes precedence over environment variable
-    String sysPropValue = SystemProperties.get(sysProp);
-    if (sysPropValue != null) {
-      value = sysPropValue;
+
+    private boolean traceOtelEnabled() {
+        String enabled = getDatadogProperty("dd." + TRACE_OTEL_ENABLED);
+        if (null != enabled) {
+            return Boolean.parseBoolean(enabled);
+        } else {
+            return DEFAULT_TRACE_OTEL_ENABLED;
+        }
     }
-    return value;
-  }
 
-  /** Captures a mapped OpenTelemetry property. */
-  private void capture(String key, String value) {
-    if (null != value) {
-      otelEnvironment.put(key, value);
+    private boolean metricsOtelEnabled() {
+        String enabled = getDatadogProperty("dd." + METRICS_OTEL_ENABLED);
+        if (null != enabled) {
+            return Boolean.parseBoolean(enabled);
+        } else {
+            return DEFAULT_METRICS_OTEL_ENABLED;
+        }
     }
-  }
-
-  /** Loads the optional OpenTelemetry configuration file. */
-  private static Properties loadOtelConfigFile() {
-    String path = getProperty("otel.javaagent.configuration-file");
-    if (null != path && !path.isEmpty()) {
-      // Inflate '~' prefix as home folder
-      String home;
-      if (path.charAt(0) == '~' && (home = SystemProperties.get("user.home")) != null) {
-        path = home + path.substring(1);
-      }
-      File file = new File(path);
-      if (file.exists()) {
-        try (InputStream in = new BufferedInputStream(new FileInputStream(file))) {
-          Properties properties = new Properties();
-          properties.load(in);
-          return properties;
-        } catch (Throwable e) {
-          log.warn("Problem reading OTEL_JAVAAGENT_CONFIGURATION_FILE {} - {}", path, e.toString());
-        }
-      }
+
+    private boolean logsOtelEnabled() {
+        String enabled = getDatadogProperty("dd." + LOGS_OTEL_ENABLED);
+        if (null != enabled) {
+            return Boolean.parseBoolean(enabled);
+        } else {
+            return DEFAULT_LOGS_OTEL_ENABLED;
+        }
     }
-    return null;
-  }
-
-  /** Parses a comma-separated list of items. */
-  private static List<String> parseOtelList(String value) {
-    List<String> list = new ArrayList<>();
-    int start = 0;
-    while (start < value.length()) {
-      int end = value.indexOf(',', start);
-      if (end < 0) {
-        end = value.length();
-      }
-      if (end > start) {
-        list.add(value.substring(start, end));
-      }
-      start = end + 1;
+
+    /**
+     * Gets an OpenTelemetry property.
+     *
+     * <p>Checks system properties, environment variables, and the optional OpenTelemetry config file.
+     * If the equivalent Datadog property is also set then log a warning and return {@code null}.
+     */
+    private String getOtelProperty(String otelSysProp, String ddSysProp) {
+        String otelValue = getOtelProperty(otelSysProp);
+        if (null == otelValue) {
+            return null;
+        }
+        String ddValue = getDatadogProperty(ddSysProp);
+        if (null != ddValue) {
+            String otelEnvVar = toEnvVar(otelSysProp);
+            log.warn("Both {} and {} are set, ignoring {}", toEnvVar(ddSysProp), otelEnvVar, otelEnvVar);
+            OtelEnvMetricCollectorProvider.get()
+                    .setHidingOtelEnvVarMetric(toEnvVarLowerCase(otelSysProp), toEnvVarLowerCase(ddSysProp));
+            return null;
+        }
+        return otelValue;
+    }
+
+    /**
+     * Gets an OpenTelemetry property.
+     *
+     * <p>Checks system properties, environment variables, and the optional OpenTelemetry config file.
+     */
+    private String getOtelProperty(String sysProp) {
+        String value = getProperty(sysProp);
+        if (null == value && null != otelConfigFile) {
+            value = otelConfigFile.getProperty(sysProp);
+        }
+        return value;
+    }
+
+    /**
+     * Gets an OpenTelemetry OTLP property, checking the signal specific key before the general one.
+     *
+     * <p>Checks system properties, environment variables, and the optional OpenTelemetry config file.
+     * If the equivalent Datadog property is also set then log a warning and return {@code null}.
+     */
+    private String getOtelOtlpProperty(String signal, String subkey, String ddSysProp) {
+        String otelKey = "otel.exporter.otlp." + signal + "." + subkey;
+        String otelValue = getOtelProperty(otelKey);
+        if (null == otelValue) {
+            // fall back to general configuration
+            otelKey = "otel.exporter.otlp." + subkey;
+            otelValue = getOtelProperty(otelKey);
+            // special case when using general endpoint as fallback: append appropriate suffix
+            if ("endpoint".equals(subkey) && otelValue != null && !otelValue.startsWith("unix://")) {
+                if ("logs".equals(signal) && !"grpc".equalsIgnoreCase(otelEnvironment.get(OTLP_LOGS_PROTOCOL))) {
+                    otelValue = otelValue + (otelValue.endsWith("/") ? "v1/logs" : "/v1/logs");
+                }
+                if ("metrics".equals(signal) && !"grpc".equalsIgnoreCase(otelEnvironment.get(OTLP_METRICS_PROTOCOL))) {
+                    otelValue = otelValue + (otelValue.endsWith("/") ? "v1/metrics" : "/v1/metrics");
+                }
+                if ("traces".equals(signal) && !"grpc".equalsIgnoreCase(otelEnvironment.get(OTLP_TRACES_PROTOCOL))) {
+                    otelValue = otelValue + (otelValue.endsWith("/") ? "v1/traces" : "/v1/traces");
+                }
+            }
+        }
+        if (null == otelValue) {
+            return null;
+        }
+        String ddValue = getDatadogProperty(ddSysProp);
+        if (null != ddValue) {
+            String otelEnvVar = toEnvVar(otelKey);
+            log.warn("Both {} and {} are set, ignoring {}", toEnvVar(ddSysProp), otelEnvVar, otelEnvVar);
+            OtelEnvMetricCollectorProvider.get()
+                    .setHidingOtelEnvVarMetric(toEnvVarLowerCase(otelKey), toEnvVarLowerCase(ddSysProp));
+            return null;
+        }
+        return otelValue;
+    }
+
+    /**
+     * Gets a Datadog property.
+     *
+     * <p>Checks system properties, environment variables, and the optional Datadog config file.
+     */
+    private String getDatadogProperty(String sysProp) {
+        String value = getProperty(sysProp);
+        if (null == value && null != datadogConfigFile) {
+            value = datadogConfigFile.getProperty(sysProp);
+        }
+        return value;
+    }
+
+    /**
+     * Gets a general property.
+     *
+     * <p>Checks system properties and environment variables.
+     */
+    private static String getProperty(String sysProp) {
+        // Always validate through ConfigHelper so STRICT_TEST mode can detect unsupported configs
+        String value = ConfigHelper.env(toEnvVar(sysProp));
+        // System property takes precedence over environment variable
+        String sysPropValue = SystemProperties.get(sysProp);
+        if (sysPropValue != null) {
+            value = sysPropValue;
+        }
+        return value;
     }
-    return list;
-  }
-
-  /** Parses a comma-separated list of key=value entries. */
-  private static Map<String, String> parseOtelMap(String value) {
-    Map<String, String> map = new LinkedHashMap<>();
-    int start = 0;
-    while (start < value.length()) {
-      int end = value.indexOf(',', start);
-      if (end < 0) {
-        end = value.length();
-      }
-      if (end > start) {
-        String entry = value.substring(start, end);
-        int eq = entry.indexOf('=');
-        if (eq > 0) {
-          map.put(entry.substring(0, eq), entry.substring(eq + 1));
-        }
-      }
-      start = end + 1;
+
+    /** Captures a mapped OpenTelemetry property. */
+    private void capture(String key, String value) {
+        if (null != value) {
+            otelEnvironment.put(key, value);
+        }
     }
-    return map;
-  }
-
-  /** Renders the map as a comma-separated list of key:value entries. */
-  private static String renderDatadogMap(Map<String, String> map, int maxEntries) {
-    StringBuilder buf = new StringBuilder();
-
-    int entries = 0;
-    for (Map.Entry<String, String> entry : map.entrySet()) {
-      buf.append(entry.getKey()).append(':').append(entry.getValue()).append(',');
-      if (++entries >= maxEntries) {
-        break;
-      }
+
+    /** Loads the optional OpenTelemetry configuration file. */
+    private static Properties loadOtelConfigFile() {
+        String path = getProperty("otel.javaagent.configuration-file");
+        if (null != path && !path.isEmpty()) {
+            // Inflate '~' prefix as home folder
+            String home;
+            if (path.charAt(0) == '~' && (home = SystemProperties.get("user.home")) != null) {
+                path = home + path.substring(1);
+            }
+            File file = new File(path);
+            if (file.exists()) {
+                try (InputStream in = new BufferedInputStream(new FileInputStream(file))) {
+                    Properties properties = new Properties();
+                    properties.load(in);
+                    return properties;
+                } catch (Throwable e) {
+                    log.warn("Problem reading OTEL_JAVAAGENT_CONFIGURATION_FILE {} - {}", path, e.toString());
+                }
+            }
+        }
+        return null;
+    }
+
+    /** Parses a comma-separated list of items. */
+    private static List<String> parseOtelList(String value) {
+        List<String> list = new ArrayList<>();
+        int start = 0;
+        while (start < value.length()) {
+            int end = value.indexOf(',', start);
+            if (end < 0) {
+                end = value.length();
+            }
+            if (end > start) {
+                list.add(value.substring(start, end));
+            }
+            start = end + 1;
+        }
+        return list;
+    }
+
+    /** Parses a comma-separated list of key=value entries. */
+    private static Map<String, String> parseOtelMap(String value) {
+        Map<String, String> map = new LinkedHashMap<>();
+        int start = 0;
+        while (start < value.length()) {
+            int end = value.indexOf(',', start);
+            if (end < 0) {
+                end = value.length();
+            }
+            if (end > start) {
+                String entry = value.substring(start, end);
+                int eq = entry.indexOf('=');
+                if (eq > 0) {
+                    map.put(entry.substring(0, eq), entry.substring(eq + 1));
+                }
+            }
+            start = end + 1;
+        }
+        return map;
     }
 
-    // remove trailing comma, mapping empty conversion to null
-    return buf.length() > 1 ? buf.substring(0, buf.length() - 1) : null;
-  }
+    /** Renders the map as a comma-separated list of key:value entries. */
+    private static String renderDatadogMap(Map<String, String> map, int maxEntries) {
+        StringBuilder buf = new StringBuilder();
 
-  /** Maps OpenTelemetry propagators to a list of accepted propagation styles. */
-  private static String mapPropagationStyle(String propagators) {
-    if (null == propagators) {
-      return null;
-    }
+        int entries = 0;
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            buf.append(entry.getKey()).append(':').append(entry.getValue()).append(',');
+            if (++entries >= maxEntries) {
+                break;
+            }
+        }
 
-    StringBuilder buf = new StringBuilder();
-    for (String style : parseOtelList(propagators)) {
-      if ("b3".equalsIgnoreCase(style)) {
-        buf.append("b3single,"); // force use of OpenTelemetry alias
-      } else {
-        try {
-          buf.append(TracePropagationStyle.valueOfDisplayName(style)).append(',');
-        } catch (IllegalArgumentException e) {
-          log.warn("OTEL_PROPAGATORS={} is not supported", style);
-          OtelEnvMetricCollectorProvider.get()
-              .setInvalidOtelEnvVarMetric("otel_propagators", "dd_trace_propagation_style");
-        }
-      }
+        // remove trailing comma, mapping empty conversion to null
+        return buf.length() > 1 ? buf.substring(0, buf.length() - 1) : null;
     }
 
-    // remove trailing comma, mapping empty conversion to null
-    return buf.length() > 1 ? buf.substring(0, buf.length() - 1) : null;
-  }
+    /** Maps OpenTelemetry propagators to a list of accepted propagation styles. */
+    private static String mapPropagationStyle(String propagators) {
+        if (null == propagators) {
+            return null;
+        }
 
-  /** Maps known OpenTelemetry samplers to a trace sample rate. */
-  private String mapSampleRate(String tracesSampler) {
-    if (null == tracesSampler) {
-      return null;
-    }
+        StringBuilder buf = new StringBuilder();
+        for (String style : parseOtelList(propagators)) {
+            if ("b3".equalsIgnoreCase(style)) {
+                buf.append("b3single,"); // force use of OpenTelemetry alias
+            } else {
+                try {
+                    buf.append(TracePropagationStyle.valueOfDisplayName(style)).append(',');
+                } catch (IllegalArgumentException e) {
+                    log.warn("OTEL_PROPAGATORS={} is not supported", style);
+                    OtelEnvMetricCollectorProvider.get()
+                            .setInvalidOtelEnvVarMetric("otel_propagators", "dd_trace_propagation_style");
+                }
+            }
+        }
 
-    if ("traceidratio".equalsIgnoreCase(tracesSampler)
-        || "always_on".equalsIgnoreCase(tracesSampler)
-        || "always_off".equalsIgnoreCase(tracesSampler)) {
-      log.warn(
-          "OTEL_TRACES_SAMPLER changed from {} to parentbased_{}; only parent based sampling is supported.",
-          tracesSampler,
-          tracesSampler);
-      tracesSampler = "parentbased_" + tracesSampler;
+        // remove trailing comma, mapping empty conversion to null
+        return buf.length() > 1 ? buf.substring(0, buf.length() - 1) : null;
     }
 
-    if ("parentbased_traceidratio".equalsIgnoreCase(tracesSampler)) {
-      return getOtelProperty("otel.traces.sampler.arg");
-    } else if ("parentbased_always_on".equalsIgnoreCase(tracesSampler)) {
-      return "1.0";
-    } else if ("parentbased_always_off".equalsIgnoreCase(tracesSampler)) {
-      return "0.0";
-    }
+    /** Maps known OpenTelemetry samplers to a trace sample rate. */
+    private String mapSampleRate(String tracesSampler) {
+        if (null == tracesSampler) {
+            return null;
+        }
 
-    log.warn("OTEL_TRACES_SAMPLER={} is not supported", tracesSampler);
-    OtelEnvMetricCollectorProvider.get()
-        .setInvalidOtelEnvVarMetric("otel_traces_sampler", "dd_trace_sample_rate");
-    return null;
-  }
-
-  /** Maps an OpenTelemetry exporter setting to the equivalent Datadog collection setting. */
-  private String mapDataCollection(String signal) {
-    String exporter = getOtelProperty("otel." + signal + ".exporter");
-    if (null == exporter) {
-      return null;
-    }
+        if ("traceidratio".equalsIgnoreCase(tracesSampler)
+                || "always_on".equalsIgnoreCase(tracesSampler)
+                || "always_off".equalsIgnoreCase(tracesSampler)) {
+            log.warn(
+                    "OTEL_TRACES_SAMPLER changed from {} to parentbased_{}; only parent based sampling is supported.",
+                    tracesSampler,
+                    tracesSampler);
+            tracesSampler = "parentbased_" + tracesSampler;
+        }
 
-    if ("none".equalsIgnoreCase(exporter)) {
-      return "false"; // "none" maps to disable data collection
-    }
+        if ("parentbased_traceidratio".equalsIgnoreCase(tracesSampler)) {
+            return getOtelProperty("otel.traces.sampler.arg");
+        } else if ("parentbased_always_on".equalsIgnoreCase(tracesSampler)) {
+            return "1.0";
+        } else if ("parentbased_always_off".equalsIgnoreCase(tracesSampler)) {
+            return "0.0";
+        }
 
-    log.warn("OTEL_{}_EXPORTER={} is not supported", signal, exporter.toUpperCase(Locale.ROOT));
-    OtelEnvMetricCollectorProvider.get()
-        .setUnsupportedOtelEnvVarMetric("otel_" + signal + "_exporter");
-
-    return null;
-  }
-
-  /** Merges the OpenTelemetry client and server headers to capture into a single list. */
-  private String getOtelHeaders(String otelSuffix, String ddSysProp) {
-    String clientTags =
-        getOtelProperty("otel.instrumentation.http.client.capture-" + otelSuffix, ddSysProp);
-    String serverTags =
-        getOtelProperty("otel.instrumentation.http.server.capture-" + otelSuffix, ddSysProp);
-    if (null == clientTags) {
-      return serverTags;
-    } else if (null == serverTags) {
-      return clientTags;
-    } else {
-      return clientTags + ',' + serverTags;
+        log.warn("OTEL_TRACES_SAMPLER={} is not supported", tracesSampler);
+        OtelEnvMetricCollectorProvider.get().setInvalidOtelEnvVarMetric("otel_traces_sampler", "dd_trace_sample_rate");
+        return null;
     }
-  }
-
-  /**
-   * Maps OpenTelemetry list of headers to Datadog header tags, preserving the expected tag name.
-   */
-  private static String mapHeaderTags(String tagPrefix, String headers) {
-    if (null == headers) {
-      return null;
+
+    /** Maps an OpenTelemetry exporter setting to the equivalent Datadog collection setting. */
+    private String mapDataCollection(String signal) {
+        String exporter = getOtelProperty("otel." + signal + ".exporter");
+        if (null == exporter) {
+            return null;
+        }
+
+        if ("none".equalsIgnoreCase(exporter)) {
+            return "false"; // "none" maps to disable data collection
+        }
+
+        log.warn("OTEL_{}_EXPORTER={} is not supported", signal, exporter.toUpperCase(Locale.ROOT));
+        OtelEnvMetricCollectorProvider.get().setUnsupportedOtelEnvVarMetric("otel_" + signal + "_exporter");
+
+        return null;
     }
 
-    StringBuilder buf = new StringBuilder();
-    for (String header : parseOtelList(headers)) {
-      buf.append(header).append(':').append(tagPrefix).append(header).append(',');
+    /** Merges the OpenTelemetry client and server headers to capture into a single list. */
+    private String getOtelHeaders(String otelSuffix, String ddSysProp) {
+        String clientTags = getOtelProperty("otel.instrumentation.http.client.capture-" + otelSuffix, ddSysProp);
+        String serverTags = getOtelProperty("otel.instrumentation.http.server.capture-" + otelSuffix, ddSysProp);
+        if (null == clientTags) {
+            return serverTags;
+        } else if (null == serverTags) {
+            return clientTags;
+        } else {
+            return clientTags + ',' + serverTags;
+        }
     }
 
-    // remove trailing comma, mapping empty conversion to null
-    return buf.length() > 1 ? buf.substring(0, buf.length() - 1) : null;
-  }
+    /**
+     * Maps OpenTelemetry list of headers to Datadog header tags, preserving the expected tag name.
+     */
+    private static String mapHeaderTags(String tagPrefix, String headers) {
+        if (null == headers) {
+            return null;
+        }
+
+        StringBuilder buf = new StringBuilder();
+        for (String header : parseOtelList(headers)) {
+            buf.append(header).append(':').append(tagPrefix).append(header).append(',');
+        }
+
+        // remove trailing comma, mapping empty conversion to null
+        return buf.length() > 1 ? buf.substring(0, buf.length() - 1) : null;
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/PropertiesConfigSource.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/PropertiesConfigSource.java
index 77d48385905..bff148c4eca 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/PropertiesConfigSource.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/PropertiesConfigSource.java
@@ -6,29 +6,29 @@
 import java.util.Properties;
 
 final class PropertiesConfigSource extends ConfigProvider.Source {
-  // start key with underscore, so it isn't visible using the public 'get' method
-  static final String CONFIG_FILE_STATUS = "_dd.config.file.status";
-
-  private final Properties props;
-  private final boolean useSystemPropertyFormat;
-
-  public PropertiesConfigSource(Properties props, boolean useSystemPropertyFormat) {
-    assert props != null;
-    this.props = props;
-    this.useSystemPropertyFormat = useSystemPropertyFormat;
-  }
-
-  public String getConfigFileStatus() {
-    return props.getProperty(CONFIG_FILE_STATUS);
-  }
-
-  @Override
-  protected String get(String key) {
-    return props.getProperty(useSystemPropertyFormat ? propertyNameToSystemPropertyName(key) : key);
-  }
-
-  @Override
-  public ConfigOrigin origin() {
-    return ConfigOrigin.JVM_PROP;
-  }
+    // start key with underscore, so it isn't visible using the public 'get' method
+    static final String CONFIG_FILE_STATUS = "_dd.config.file.status";
+
+    private final Properties props;
+    private final boolean useSystemPropertyFormat;
+
+    public PropertiesConfigSource(Properties props, boolean useSystemPropertyFormat) {
+        assert props != null;
+        this.props = props;
+        this.useSystemPropertyFormat = useSystemPropertyFormat;
+    }
+
+    public String getConfigFileStatus() {
+        return props.getProperty(CONFIG_FILE_STATUS);
+    }
+
+    @Override
+    protected String get(String key) {
+        return props.getProperty(useSystemPropertyFormat ? propertyNameToSystemPropertyName(key) : key);
+    }
+
+    @Override
+    public ConfigOrigin origin() {
+        return ConfigOrigin.JVM_PROP;
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/StableConfigParser.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/StableConfigParser.java
index 90fc10f10ac..27e6663259c 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/StableConfigParser.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/StableConfigParser.java
@@ -21,251 +21,248 @@
 import org.slf4j.LoggerFactory;
 
 public class StableConfigParser {
-  private static final Logger log = LoggerFactory.getLogger(StableConfigParser.class);
+    private static final Logger log = LoggerFactory.getLogger(StableConfigParser.class);
 
-  private static final String ENVIRONMENT_VARIABLES_PREFIX = "environment_variables['";
-  private static final String PROCESS_ARGUMENTS_PREFIX = "process_arguments['";
-  static final int MAX_FILE_SIZE_BYTES = 256 * 1024; // 256 KB in bytes;
-  private static final String UNDEFINED_VALUE = "";
+    private static final String ENVIRONMENT_VARIABLES_PREFIX = "environment_variables['";
+    private static final String PROCESS_ARGUMENTS_PREFIX = "process_arguments['";
+    static final int MAX_FILE_SIZE_BYTES = 256 * 1024; // 256 KB in bytes;
+    private static final String UNDEFINED_VALUE = "";
 
-  /**
-   * Parses a configuration file and returns a stable configuration object.
-   *
-   * <p>This method reads a configuration file from the given file path, parses the YAML content,
-   * and identifies configurations for the process using a combination of apm_configuration_default
-   * and apm_configuration_rules. If a matching rule is found in apm_configuration_rules, it returns
-   * a {@link StableConfigSource.StableConfig} object with the merged configuration. If no matching
-   * rule is found, it returns the default configuration. If neither a matching rule nor a default
-   * configuration is found, an empty configuration is returned.
-   *
-   * @param filePath The path to the YAML configuration file to be parsed.
-   * @return A {@link StableConfigSource.StableConfig} object containing the stable configuration.
-   * @throws IOException If there is an error reading the file or parsing the YAML content.
-   */
-  public static StableConfigSource.StableConfig parse(String filePath) throws IOException {
-    try {
-      Path path = Paths.get(filePath);
+    /**
+     * Parses a configuration file and returns a stable configuration object.
+     *
+     * <p>This method reads a configuration file from the given file path, parses the YAML content,
+     * and identifies configurations for the process using a combination of apm_configuration_default
+     * and apm_configuration_rules. If a matching rule is found in apm_configuration_rules, it returns
+     * a {@link StableConfigSource.StableConfig} object with the merged configuration. If no matching
+     * rule is found, it returns the default configuration. If neither a matching rule nor a default
+     * configuration is found, an empty configuration is returned.
+     *
+     * @param filePath The path to the YAML configuration file to be parsed.
+     * @return A {@link StableConfigSource.StableConfig} object containing the stable configuration.
+     * @throws IOException If there is an error reading the file or parsing the YAML content.
+     */
+    public static StableConfigSource.StableConfig parse(String filePath) throws IOException {
+        try {
+            Path path = Paths.get(filePath);
 
-      // If file is over size limit, drop
-      if (Files.size(path) > MAX_FILE_SIZE_BYTES) {
-        log.warn(
-            "Configuration file {} exceeds max size {} bytes; dropping.",
-            filePath,
-            MAX_FILE_SIZE_BYTES);
-        return StableConfigSource.StableConfig.EMPTY;
-      }
-
-      String content = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
+            // If file is over size limit, drop
+            if (Files.size(path) > MAX_FILE_SIZE_BYTES) {
+                log.warn("Configuration file {} exceeds max size {} bytes; dropping.", filePath, MAX_FILE_SIZE_BYTES);
+                return StableConfigSource.StableConfig.EMPTY;
+            }
 
-      String processedContent = processTemplate(content);
-      Object parsedYaml = YamlParser.parse(processedContent);
-      StableConfig data = new StableConfig(parsedYaml);
+            String content = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
 
-      String configId = data.getConfigId();
-      Map<String, Object> configMap = data.getApmConfigurationDefault();
-      List<Rule> rules = data.getApmConfigurationRules();
-
-      if (!rules.isEmpty()) {
-        for (Rule rule : rules) {
-          // Use the first matching rule
-          if (doesRuleMatch(rule)) {
-            // Merge configs found in apm_configuration_rules with those found in
-            // apm_configuration_default
-            Map<String, Object> mergedConfigMap = new LinkedHashMap<>(configMap);
-            mergedConfigMap.putAll(rule.getConfiguration());
-            return new StableConfigSource.StableConfig(configId, mergedConfigMap);
-          }
-        }
-        log.debug("No matching rule found in stable configuration file {}", filePath);
-      }
-      // If configs were found in apm_configuration_default, use them
-      if (!configMap.isEmpty()) {
-        return new StableConfigSource.StableConfig(configId, configMap);
-      }
+            String processedContent = processTemplate(content);
+            Object parsedYaml = YamlParser.parse(processedContent);
+            StableConfig data = new StableConfig(parsedYaml);
 
-      // If there's a configId but no configMap, use configId but return an empty map
-      if (configId != null) {
-        return new StableConfigSource.StableConfig(configId, Collections.emptyMap());
-      }
-    } catch (IOException e) {
-      log.debug("Failed to read the stable configuration file: {}", filePath, e);
-    }
-    return StableConfigSource.StableConfig.EMPTY;
-  }
-
-  /**
-   * Checks if the rule's selectors match the current process. All must match for a "true" return
-   * value.
-   */
-  private static boolean doesRuleMatch(Rule rule) {
-    for (Selector selector : rule.getSelectors()) {
-      if (!selectorMatch(
-          selector.getOrigin(), selector.getMatches(), selector.getOperator(), selector.getKey())) {
-        return false; // Return false immediately if any selector doesn't match
-      }
-    }
-    return true; // Return true if all selectors match
-  }
+            String configId = data.getConfigId();
+            Map<String, Object> configMap = data.getApmConfigurationDefault();
+            List<Rule> rules = data.getApmConfigurationRules();
 
-  private static boolean matchOperator(String value, String operator, List<String> matches) {
-    if (value == null || operator == null) {
-      return false;
-    }
-    if ("exists".equals(operator)) {
-      return true;
-    }
-    if (matches == null || matches.isEmpty()) {
-      return false;
-    }
-    value = value.toLowerCase(Locale.ROOT);
+            if (!rules.isEmpty()) {
+                for (Rule rule : rules) {
+                    // Use the first matching rule
+                    if (doesRuleMatch(rule)) {
+                        // Merge configs found in apm_configuration_rules with those found in
+                        // apm_configuration_default
+                        Map<String, Object> mergedConfigMap = new LinkedHashMap<>(configMap);
+                        mergedConfigMap.putAll(rule.getConfiguration());
+                        return new StableConfigSource.StableConfig(configId, mergedConfigMap);
+                    }
+                }
+                log.debug("No matching rule found in stable configuration file {}", filePath);
+            }
+            // If configs were found in apm_configuration_default, use them
+            if (!configMap.isEmpty()) {
+                return new StableConfigSource.StableConfig(configId, configMap);
+            }
 
-    Predicate<String> comparator;
-    switch (operator) {
-      case "equals":
-        comparator = value::equals;
-        break;
-      case "starts_with":
-        comparator = value::startsWith;
-        break;
-      case "ends_with":
-        comparator = value::endsWith;
-        break;
-      case "contains":
-        comparator = value::contains;
-        break;
-      default:
-        return false;
+            // If there's a configId but no configMap, use configId but return an empty map
+            if (configId != null) {
+                return new StableConfigSource.StableConfig(configId, Collections.emptyMap());
+            }
+        } catch (IOException e) {
+            log.debug("Failed to read the stable configuration file: {}", filePath, e);
+        }
+        return StableConfigSource.StableConfig.EMPTY;
     }
 
-    for (String match : matches) {
-      if (match == null) {
-        continue;
-      }
-      match = match.toLowerCase(Locale.ROOT);
-      if (comparator.test(match)) {
-        return true;
-      }
+    /**
+     * Checks if the rule's selectors match the current process. All must match for a "true" return
+     * value.
+     */
+    private static boolean doesRuleMatch(Rule rule) {
+        for (Selector selector : rule.getSelectors()) {
+            if (!selectorMatch(
+                    selector.getOrigin(), selector.getMatches(), selector.getOperator(), selector.getKey())) {
+                return false; // Return false immediately if any selector doesn't match
+            }
+        }
+        return true; // Return true if all selectors match
     }
-    return false;
-  }
 
-  // We do all the case insensitivity modifications in this function, because each selector will
-  // be viewed just once
-  static boolean selectorMatch(String origin, List<String> matches, String operator, String key) {
-    if (operator == null) {
-      return false;
-    }
-    operator = operator.toLowerCase(Locale.ROOT);
-    switch (origin.toLowerCase(Locale.ROOT)) {
-      case "language":
+    private static boolean matchOperator(String value, String operator, List<String> matches) {
+        if (value == null || operator == null) {
+            return false;
+        }
         if ("exists".equals(operator)) {
-          return false;
+            return true;
         }
-        return matchOperator("java", operator, matches);
-      case "environment_variables":
-        if (key == null) {
-          return false;
+        if (matches == null || matches.isEmpty()) {
+            return false;
         }
-        String envValue = ConfigHelper.env(key.toUpperCase(Locale.ROOT));
-        return matchOperator(envValue, operator, matches);
-      case "process_arguments":
-        if (key == null) {
-          return false;
+        value = value.toLowerCase(Locale.ROOT);
+
+        Predicate<String> comparator;
+        switch (operator) {
+            case "equals":
+                comparator = value::equals;
+                break;
+            case "starts_with":
+                comparator = value::startsWith;
+                break;
+            case "ends_with":
+                comparator = value::endsWith;
+                break;
+            case "contains":
+                comparator = value::contains;
+                break;
+            default:
+                return false;
         }
-        // TODO: flesh out the meaning of each operator for process_arguments
-        if (!key.startsWith("-D")) {
-          log.warn(
-              "Ignoring unsupported process_arguments entry in selector match, '{}'. Only system properties specified with the '-D' prefix are supported.",
-              key);
-          return false;
+
+        for (String match : matches) {
+            if (match == null) {
+                continue;
+            }
+            match = match.toLowerCase(Locale.ROOT);
+            if (comparator.test(match)) {
+                return true;
+            }
         }
-        String argValue = SystemProperties.get(key.substring(2));
-        return matchOperator(argValue, operator, matches);
-      case "tags":
-        // TODO: Support this down the line (Must define the source of "tags" first)
-        return false;
-      default:
         return false;
     }
-  }
 
-  static String processTemplate(String content) throws IOException {
-    // Do nothing if there are no variables to process
-    int openIndex = content.indexOf("{{");
-    if (openIndex == -1) {
-      return content;
+    // We do all the case insensitivity modifications in this function, because each selector will
+    // be viewed just once
+    static boolean selectorMatch(String origin, List<String> matches, String operator, String key) {
+        if (operator == null) {
+            return false;
+        }
+        operator = operator.toLowerCase(Locale.ROOT);
+        switch (origin.toLowerCase(Locale.ROOT)) {
+            case "language":
+                if ("exists".equals(operator)) {
+                    return false;
+                }
+                return matchOperator("java", operator, matches);
+            case "environment_variables":
+                if (key == null) {
+                    return false;
+                }
+                String envValue = ConfigHelper.env(key.toUpperCase(Locale.ROOT));
+                return matchOperator(envValue, operator, matches);
+            case "process_arguments":
+                if (key == null) {
+                    return false;
+                }
+                // TODO: flesh out the meaning of each operator for process_arguments
+                if (!key.startsWith("-D")) {
+                    log.warn(
+                            "Ignoring unsupported process_arguments entry in selector match, '{}'. Only system properties specified with the '-D' prefix are supported.",
+                            key);
+                    return false;
+                }
+                String argValue = SystemProperties.get(key.substring(2));
+                return matchOperator(argValue, operator, matches);
+            case "tags":
+                // TODO: Support this down the line (Must define the source of "tags" first)
+                return false;
+            default:
+                return false;
+        }
     }
 
-    StringBuilder result = new StringBuilder(content.length());
+    static String processTemplate(String content) throws IOException {
+        // Do nothing if there are no variables to process
+        int openIndex = content.indexOf("{{");
+        if (openIndex == -1) {
+            return content;
+        }
 
-    // Add everything before the opening braces
-    result.append(content, 0, openIndex);
+        StringBuilder result = new StringBuilder(content.length());
 
-    while (true) {
+        // Add everything before the opening braces
+        result.append(content, 0, openIndex);
 
-      // Find the closing braces
-      int closeIndex = content.indexOf("}}", openIndex);
-      if (closeIndex == -1) {
-        throw new IOException("Unterminated template in config");
-      }
+        while (true) {
 
-      // Extract the template variable
-      String templateVar = content.substring(openIndex + 2, closeIndex).trim();
+            // Find the closing braces
+            int closeIndex = content.indexOf("}}", openIndex);
+            if (closeIndex == -1) {
+                throw new IOException("Unterminated template in config");
+            }
 
-      // Process the template variable and get its value
-      String value = processTemplateVar(templateVar);
+            // Extract the template variable
+            String templateVar = content.substring(openIndex + 2, closeIndex).trim();
 
-      // Add the processed value
-      result.append(value);
+            // Process the template variable and get its value
+            String value = processTemplateVar(templateVar);
 
-      // Continue with the next template variable
-      openIndex = content.indexOf("{{", closeIndex);
-      if (openIndex == -1) {
-        // Stop and add everything left after the final closing braces
-        result.append(content, closeIndex + 2, content.length());
-        break;
-      } else {
-        // Add everything between the last braces and the next
-        result.append(content, closeIndex + 2, openIndex);
-      }
-    }
+            // Add the processed value
+            result.append(value);
+
+            // Continue with the next template variable
+            openIndex = content.indexOf("{{", closeIndex);
+            if (openIndex == -1) {
+                // Stop and add everything left after the final closing braces
+                result.append(content, closeIndex + 2, content.length());
+                break;
+            } else {
+                // Add everything between the last braces and the next
+                result.append(content, closeIndex + 2, openIndex);
+            }
+        }
 
-    return result.toString();
-  }
+        return result.toString();
+    }
 
-  private static String processTemplateVar(String templateVar) throws IOException {
-    if (templateVar.startsWith(ENVIRONMENT_VARIABLES_PREFIX) && templateVar.endsWith("']")) {
-      String envVar =
-          templateVar
-              .substring(ENVIRONMENT_VARIABLES_PREFIX.length(), templateVar.length() - 2)
-              .trim();
-      if (envVar.isEmpty()) {
-        throw new IOException("Empty environment variable name in template");
-      }
-      String value = ConfigHelper.env(envVar.toUpperCase(Locale.ROOT));
-      if (value == null || value.isEmpty()) {
-        return UNDEFINED_VALUE;
-      }
-      return value;
-    } else if (templateVar.startsWith(PROCESS_ARGUMENTS_PREFIX) && templateVar.endsWith("']")) {
-      String processArg =
-          templateVar.substring(PROCESS_ARGUMENTS_PREFIX.length(), templateVar.length() - 2).trim();
-      if (processArg.isEmpty()) {
-        throw new IOException("Empty process argument in template");
-      }
-      if (!processArg.startsWith("-D")) {
-        log.warn(
-            "Ignoring unsupported process_arguments entry in template variable, '{}'. Only system properties specified with the '-D' prefix are supported.",
-            processArg);
-        return UNDEFINED_VALUE;
-      }
-      String value = SystemProperties.get(processArg.substring(2));
-      if (value == null || value.isEmpty()) {
-        return UNDEFINED_VALUE;
-      }
-      return value;
-    } else {
-      return UNDEFINED_VALUE;
+    private static String processTemplateVar(String templateVar) throws IOException {
+        if (templateVar.startsWith(ENVIRONMENT_VARIABLES_PREFIX) && templateVar.endsWith("']")) {
+            String envVar = templateVar
+                    .substring(ENVIRONMENT_VARIABLES_PREFIX.length(), templateVar.length() - 2)
+                    .trim();
+            if (envVar.isEmpty()) {
+                throw new IOException("Empty environment variable name in template");
+            }
+            String value = ConfigHelper.env(envVar.toUpperCase(Locale.ROOT));
+            if (value == null || value.isEmpty()) {
+                return UNDEFINED_VALUE;
+            }
+            return value;
+        } else if (templateVar.startsWith(PROCESS_ARGUMENTS_PREFIX) && templateVar.endsWith("']")) {
+            String processArg = templateVar
+                    .substring(PROCESS_ARGUMENTS_PREFIX.length(), templateVar.length() - 2)
+                    .trim();
+            if (processArg.isEmpty()) {
+                throw new IOException("Empty process argument in template");
+            }
+            if (!processArg.startsWith("-D")) {
+                log.warn(
+                        "Ignoring unsupported process_arguments entry in template variable, '{}'. Only system properties specified with the '-D' prefix are supported.",
+                        processArg);
+                return UNDEFINED_VALUE;
+            }
+            String value = SystemProperties.get(processArg.substring(2));
+            if (value == null || value.isEmpty()) {
+                return UNDEFINED_VALUE;
+            }
+            return value;
+        } else {
+            return UNDEFINED_VALUE;
+        }
     }
-  }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/StableConfigSource.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/StableConfigSource.java
index 84d0835f984..21ded20e743 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/StableConfigSource.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/StableConfigSource.java
@@ -13,93 +13,88 @@
 import org.slf4j.LoggerFactory;
 
 public final class StableConfigSource extends ConfigProvider.Source {
-  private static final Logger log = LoggerFactory.getLogger(StableConfigSource.class);
+    private static final Logger log = LoggerFactory.getLogger(StableConfigSource.class);
 
-  public static final String LOCAL_STABLE_CONFIG_PATH =
-      "/etc/datadog-agent/application_monitoring.yaml";
-  public static final String FLEET_STABLE_CONFIG_PATH =
-      "/etc/datadog-agent/managed/datadog-agent/stable/application_monitoring.yaml";
-  public static final StableConfigSource LOCAL =
-      new StableConfigSource(LOCAL_STABLE_CONFIG_PATH, ConfigOrigin.LOCAL_STABLE_CONFIG);
-  public static final StableConfigSource FLEET =
-      new StableConfigSource(
-          StableConfigSource.FLEET_STABLE_CONFIG_PATH, ConfigOrigin.FLEET_STABLE_CONFIG);
+    public static final String LOCAL_STABLE_CONFIG_PATH = "/etc/datadog-agent/application_monitoring.yaml";
+    public static final String FLEET_STABLE_CONFIG_PATH =
+            "/etc/datadog-agent/managed/datadog-agent/stable/application_monitoring.yaml";
+    public static final StableConfigSource LOCAL =
+            new StableConfigSource(LOCAL_STABLE_CONFIG_PATH, ConfigOrigin.LOCAL_STABLE_CONFIG);
+    public static final StableConfigSource FLEET =
+            new StableConfigSource(StableConfigSource.FLEET_STABLE_CONFIG_PATH, ConfigOrigin.FLEET_STABLE_CONFIG);
 
-  private final ConfigOrigin fileOrigin;
-  private final StableConfig config;
+    private final ConfigOrigin fileOrigin;
+    private final StableConfig config;
 
-  StableConfigSource(String filePath, ConfigOrigin origin) {
-    StableConfig cfg = StableConfig.EMPTY;
-    this.fileOrigin = origin;
-    try {
-      File file = new File(filePath);
-      log.debug("Stable configuration file found at path: {}", file);
-      if (Files.exists(file)) {
-        cfg = StableConfigParser.parse(filePath);
-      }
-    } catch (Throwable e) {
-      if (e instanceof StableConfigMappingException
-          || e instanceof IllegalArgumentException
-          || e instanceof ClassCastException
-          || e instanceof NullPointerException) {
-        log.warn(
-            "YAML mapping error in stable configuration file: {}, error: {}",
-            filePath,
-            e.getMessage());
-      } else if (log.isDebugEnabled()) {
-        log.error("Unexpected error while reading stable configuration file: {}", filePath, e);
-      } else {
-        log.error(
-            "Unexpected error while reading stable configuration file: {}, error: {}",
-            filePath,
-            e.getMessage());
-      }
+    StableConfigSource(String filePath, ConfigOrigin origin) {
+        StableConfig cfg = StableConfig.EMPTY;
+        this.fileOrigin = origin;
+        try {
+            File file = new File(filePath);
+            log.debug("Stable configuration file found at path: {}", file);
+            if (Files.exists(file)) {
+                cfg = StableConfigParser.parse(filePath);
+            }
+        } catch (Throwable e) {
+            if (e instanceof StableConfigMappingException
+                    || e instanceof IllegalArgumentException
+                    || e instanceof ClassCastException
+                    || e instanceof NullPointerException) {
+                log.warn("YAML mapping error in stable configuration file: {}, error: {}", filePath, e.getMessage());
+            } else if (log.isDebugEnabled()) {
+                log.error("Unexpected error while reading stable configuration file: {}", filePath, e);
+            } else {
+                log.error(
+                        "Unexpected error while reading stable configuration file: {}, error: {}",
+                        filePath,
+                        e.getMessage());
+            }
+        }
+        this.config = cfg;
     }
-    this.config = cfg;
-  }
 
-  @Override
-  public String get(String key) {
-    if (this.config == StableConfig.EMPTY) {
-      return null;
+    @Override
+    public String get(String key) {
+        if (this.config == StableConfig.EMPTY) {
+            return null;
+        }
+        return this.config.get(propertyNameToEnvironmentVariableName(key));
     }
-    return this.config.get(propertyNameToEnvironmentVariableName(key));
-  }
 
-  @Override
-  public ConfigOrigin origin() {
-    return fileOrigin;
-  }
+    @Override
+    public ConfigOrigin origin() {
+        return fileOrigin;
+    }
 
-  public Set<String> getKeys() {
-    return this.config.getKeys();
-  }
+    public Set<String> getKeys() {
+        return this.config.getKeys();
+    }
 
-  public String getConfigId() {
-    return this.config.getConfigId();
-  }
+    public String getConfigId() {
+        return this.config.getConfigId();
+    }
 
-  public static class StableConfig {
-    public static final StableConfig EMPTY = new StableConfig(null, Collections.emptyMap());
-    private final Map<String, Object> apmConfiguration;
-    private final String configId;
+    public static class StableConfig {
+        public static final StableConfig EMPTY = new StableConfig(null, Collections.emptyMap());
+        private final Map<String, Object> apmConfiguration;
+        private final String configId;
 
-    public StableConfig(String configId, Map<String, Object> configMap) {
-      this.configId = configId;
-      this.apmConfiguration = configMap;
-    }
+        public StableConfig(String configId, Map<String, Object> configMap) {
+            this.configId = configId;
+            this.apmConfiguration = configMap;
+        }
 
-    public String get(String key) {
-      Object value = this.apmConfiguration.get(key);
-      return (value == null) ? null : String.valueOf(value);
-    }
+        public String get(String key) {
+            Object value = this.apmConfiguration.get(key);
+            return (value == null) ? null : String.valueOf(value);
+        }
 
-    public Set<String> getKeys() {
-      return this.apmConfiguration.keySet();
-    }
+        public Set<String> getKeys() {
+            return this.apmConfiguration.keySet();
+        }
 
-    public String getConfigId() {
-      return this.configId;
+        public String getConfigId() {
+            return this.configId;
+        }
     }
-  }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/SystemPropertiesConfigSource.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/SystemPropertiesConfigSource.java
index 853c74c3285..0e00ca70b0e 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/SystemPropertiesConfigSource.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/SystemPropertiesConfigSource.java
@@ -7,13 +7,13 @@
 import datadog.trace.api.ConfigOrigin;
 
 public final class SystemPropertiesConfigSource extends ConfigProvider.Source {
-  @Override
-  protected String get(String key) {
-    return SystemProperties.get(propertyNameToSystemPropertyName(key));
-  }
+    @Override
+    protected String get(String key) {
+        return SystemProperties.get(propertyNameToSystemPropertyName(key));
+    }
 
-  @Override
-  public ConfigOrigin origin() {
-    return JVM_PROP;
-  }
+    @Override
+    public ConfigOrigin origin() {
+        return JVM_PROP;
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/civisibility/CiEnvironmentVariables.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/civisibility/CiEnvironmentVariables.java
index c8208ee709e..a64477e53fc 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/civisibility/CiEnvironmentVariables.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/civisibility/CiEnvironmentVariables.java
@@ -21,139 +21,133 @@
 
 public class CiEnvironmentVariables {
 
-  private static final Logger logger = LoggerFactory.getLogger(CiEnvironmentVariables.class);
+    private static final Logger logger = LoggerFactory.getLogger(CiEnvironmentVariables.class);
 
-  static final String CIVISIBILITY_REMOTE_ENV_VARS_PROVIDER_URL =
-      "dd.civisibility.remote.env.vars.provider.url";
-  static final String CIVISIBILITY_REMOTE_ENV_VARS_PROVIDER_KEY =
-      "dd.civisibility.remote.env.vars.provider.key";
+    static final String CIVISIBILITY_REMOTE_ENV_VARS_PROVIDER_URL = "dd.civisibility.remote.env.vars.provider.url";
+    static final String CIVISIBILITY_REMOTE_ENV_VARS_PROVIDER_KEY = "dd.civisibility.remote.env.vars.provider.key";
 
-  static final String DD_ENV_VARS_PROVIDER_KEY_HEADER = "DD-Env-Vars-Provider-Key";
-  static final String ACCEPT_HEADER = "Accept";
+    static final String DD_ENV_VARS_PROVIDER_KEY_HEADER = "DD-Env-Vars-Provider-Key";
+    static final String ACCEPT_HEADER = "Accept";
 
-  private static final int CONNECT_TIMEOUT_MILLIS = 5000;
-  private static final int READ_TIMEOUT_MILLIS = 10000;
+    private static final int CONNECT_TIMEOUT_MILLIS = 5000;
+    private static final int READ_TIMEOUT_MILLIS = 10000;
 
-  private static final Map<String, String> REMOTE_ENVIRONMENT;
+    private static final Map<String, String> REMOTE_ENVIRONMENT;
 
-  static {
-    String url = getConfigValue(CIVISIBILITY_REMOTE_ENV_VARS_PROVIDER_URL);
-    String key = getConfigValue(CIVISIBILITY_REMOTE_ENV_VARS_PROVIDER_KEY);
-    if (url != null && key != null) {
-      REMOTE_ENVIRONMENT =
-          getRemoteEnvironmentWithRetries(url, key, new RetryPolicy(500, 5, 2), null);
-    } else {
-      REMOTE_ENVIRONMENT = null;
+    static {
+        String url = getConfigValue(CIVISIBILITY_REMOTE_ENV_VARS_PROVIDER_URL);
+        String key = getConfigValue(CIVISIBILITY_REMOTE_ENV_VARS_PROVIDER_KEY);
+        if (url != null && key != null) {
+            REMOTE_ENVIRONMENT = getRemoteEnvironmentWithRetries(url, key, new RetryPolicy(500, 5, 2), null);
+        } else {
+            REMOTE_ENVIRONMENT = null;
+        }
     }
-  }
 
-  private static String getConfigValue(String propertyName) {
-    String propertyValue = System.getProperty(propertyName);
-    if (propertyValue != null) {
-      return propertyValue;
-    }
-    return ConfigHelper.get().getEnvironmentVariable(ConfigStrings.toEnvVar(propertyName));
-  }
-
-  static Map<String, String> getRemoteEnvironmentWithRetries(
-      String url, String key, RetryPolicy retryPolicy, Map<String, String> fallbackValue) {
-    return doWithBackoffRetries(() -> getRemoteEnvironment(url, key), retryPolicy, fallbackValue);
-  }
-
-  static final class RetryPolicy {
-    long delayMillis;
-    int maxAttempts;
-    double backoffFactor;
-
-    public RetryPolicy(long delayMillis, int maxAttempts, double backoffFactor) {
-      this.delayMillis = delayMillis;
-      this.maxAttempts = maxAttempts;
-      this.backoffFactor = backoffFactor;
+    private static String getConfigValue(String propertyName) {
+        String propertyValue = System.getProperty(propertyName);
+        if (propertyValue != null) {
+            return propertyValue;
+        }
+        return ConfigHelper.get().getEnvironmentVariable(ConfigStrings.toEnvVar(propertyName));
     }
-  }
-
-  private static <T> T doWithBackoffRetries(
-      Callable<T> action, RetryPolicy retryPolicy, T fallbackValue) {
-    long delayMillis = retryPolicy.delayMillis;
-    for (int i = 0; i < retryPolicy.maxAttempts; i++) {
-      if (Thread.currentThread().isInterrupted()) {
-        logger.warn("Interrupted while trying to read remote environment");
-        return fallbackValue;
-      }
-      try {
-        return action.call();
-
-      } catch (Exception e) {
-        logger.warn("Error while trying to read remote environment", e);
-        sleep(delayMillis);
-        delayMillis = Math.round(delayMillis * retryPolicy.backoffFactor);
-      }
+
+    static Map<String, String> getRemoteEnvironmentWithRetries(
+            String url, String key, RetryPolicy retryPolicy, Map<String, String> fallbackValue) {
+        return doWithBackoffRetries(() -> getRemoteEnvironment(url, key), retryPolicy, fallbackValue);
     }
-    return fallbackValue;
-  }
-
-  private static void sleep(long delayMillis) {
-    try {
-      Thread.sleep(delayMillis);
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
+
+    static final class RetryPolicy {
+        long delayMillis;
+        int maxAttempts;
+        double backoffFactor;
+
+        public RetryPolicy(long delayMillis, int maxAttempts, double backoffFactor) {
+            this.delayMillis = delayMillis;
+            this.maxAttempts = maxAttempts;
+            this.backoffFactor = backoffFactor;
+        }
     }
-  }
-
-  private static Map<String, String> getRemoteEnvironment(String url, String key) throws Exception {
-    HttpURLConnection conn = null;
-    try {
-      URL target = new URL(url);
-      conn = (HttpURLConnection) target.openConnection();
-      conn.setRequestMethod("GET");
-      conn.setRequestProperty(DD_ENV_VARS_PROVIDER_KEY_HEADER, key);
-      conn.setRequestProperty(ACCEPT_HEADER, "text/plain");
-      conn.setConnectTimeout(CONNECT_TIMEOUT_MILLIS);
-      conn.setReadTimeout(READ_TIMEOUT_MILLIS);
-
-      int code = conn.getResponseCode();
-      if (code >= 200 && code < 300) {
-        Properties properties = new Properties();
-        try (Reader r = new InputStreamReader(conn.getInputStream(), StandardCharsets.ISO_8859_1)) {
-          properties.load(r);
+
+    private static <T> T doWithBackoffRetries(Callable<T> action, RetryPolicy retryPolicy, T fallbackValue) {
+        long delayMillis = retryPolicy.delayMillis;
+        for (int i = 0; i < retryPolicy.maxAttempts; i++) {
+            if (Thread.currentThread().isInterrupted()) {
+                logger.warn("Interrupted while trying to read remote environment");
+                return fallbackValue;
+            }
+            try {
+                return action.call();
+
+            } catch (Exception e) {
+                logger.warn("Error while trying to read remote environment", e);
+                sleep(delayMillis);
+                delayMillis = Math.round(delayMillis * retryPolicy.backoffFactor);
+            }
         }
-        return asMap(properties);
-
-      } else {
-        try (BufferedReader r =
-            new BufferedReader(
-                new InputStreamReader(conn.getErrorStream(), StandardCharsets.UTF_8))) {
-          String body = r.lines().collect(Collectors.joining("\n"));
-          throw new IOException(
-              String.format("Remote environment request failed (HTTP %d) %s", code, body));
+        return fallbackValue;
+    }
+
+    private static void sleep(long delayMillis) {
+        try {
+            Thread.sleep(delayMillis);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
         }
-      }
+    }
 
-    } finally {
-      if (conn != null) {
-        conn.disconnect();
-      }
+    private static Map<String, String> getRemoteEnvironment(String url, String key) throws Exception {
+        HttpURLConnection conn = null;
+        try {
+            URL target = new URL(url);
+            conn = (HttpURLConnection) target.openConnection();
+            conn.setRequestMethod("GET");
+            conn.setRequestProperty(DD_ENV_VARS_PROVIDER_KEY_HEADER, key);
+            conn.setRequestProperty(ACCEPT_HEADER, "text/plain");
+            conn.setConnectTimeout(CONNECT_TIMEOUT_MILLIS);
+            conn.setReadTimeout(READ_TIMEOUT_MILLIS);
+
+            int code = conn.getResponseCode();
+            if (code >= 200 && code < 300) {
+                Properties properties = new Properties();
+                try (Reader r = new InputStreamReader(conn.getInputStream(), StandardCharsets.ISO_8859_1)) {
+                    properties.load(r);
+                }
+                return asMap(properties);
+
+            } else {
+                try (BufferedReader r =
+                        new BufferedReader(new InputStreamReader(conn.getErrorStream(), StandardCharsets.UTF_8))) {
+                    String body = r.lines().collect(Collectors.joining("\n"));
+                    throw new IOException(String.format("Remote environment request failed (HTTP %d) %s", code, body));
+                }
+            }
+
+        } finally {
+            if (conn != null) {
+                conn.disconnect();
+            }
+        }
     }
-  }
 
-  private static Map<String, String> asMap(Properties properties) {
-    Map<String, String> map = new HashMap<>();
-    for (String name : properties.stringPropertyNames()) {
-      map.put(name, properties.getProperty(name));
+    private static Map<String, String> asMap(Properties properties) {
+        Map<String, String> map = new HashMap<>();
+        for (String name : properties.stringPropertyNames()) {
+            map.put(name, properties.getProperty(name));
+        }
+        return map;
     }
-    return map;
-  }
 
-  @Nullable
-  public static String get(String name) {
-    if (REMOTE_ENVIRONMENT == null) {
-      return null;
+    @Nullable
+    public static String get(String name) {
+        if (REMOTE_ENVIRONMENT == null) {
+            return null;
+        }
+        return REMOTE_ENVIRONMENT.get(name);
     }
-    return REMOTE_ENVIRONMENT.get(name);
-  }
 
-  @Nullable
-  public static Map<String, String> getAll() {
-    return REMOTE_ENVIRONMENT != null ? Collections.unmodifiableMap(REMOTE_ENVIRONMENT) : null;
-  }
+    @Nullable
+    public static Map<String, String> getAll() {
+        return REMOTE_ENVIRONMENT != null ? Collections.unmodifiableMap(REMOTE_ENVIRONMENT) : null;
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/Rule.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/Rule.java
index 4c62baf6069..86f636360eb 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/Rule.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/Rule.java
@@ -15,67 +15,67 @@
  * configuration files
  */
 public final class Rule {
-  private final List<Selector> selectors;
-  private final Map<String, Object> configuration;
+    private final List<Selector> selectors;
+    private final Map<String, Object> configuration;
 
-  public Rule() {
-    this.selectors = emptyList();
-    this.configuration = emptyMap();
-  }
-
-  public Rule(List<Selector> selectors, Map<String, Object> configuration) {
-    this.selectors = selectors;
-    this.configuration = configuration;
-  }
-
-  public static Rule from(Map<?, ?> map) {
-    Object selectorsObj = map.get("selectors");
-    if (selectorsObj == null) {
-      throwStableConfigMappingException("Missing 'selectors' in rule:", map);
+    public Rule() {
+        this.selectors = emptyList();
+        this.configuration = emptyMap();
     }
 
-    if (!(selectorsObj instanceof List)) {
-      throwStableConfigMappingException(
-          "'selectors' must be a list, but got: " + selectorsObj.getClass().getSimpleName() + ": ",
-          selectorsObj);
+    public Rule(List<Selector> selectors, Map<String, Object> configuration) {
+        this.selectors = selectors;
+        this.configuration = configuration;
     }
 
-    Object configObj = map.get("configuration");
-    if (configObj == null) {
-      throwStableConfigMappingException("Missing 'configuration' in rule:", map);
-    }
-    if (!(configObj instanceof Map)) {
-      throwStableConfigMappingException(
-          "'configuration' must be a map, but got: " + configObj.getClass().getSimpleName() + ": ",
-          configObj);
-    }
+    public static Rule from(Map<?, ?> map) {
+        Object selectorsObj = map.get("selectors");
+        if (selectorsObj == null) {
+            throwStableConfigMappingException("Missing 'selectors' in rule:", map);
+        }
 
-    List<Selector> selectors =
-        ((List<?>) selectorsObj)
-            .stream()
-                .filter(Objects::nonNull)
-                .map(
-                    s -> {
-                      if (!(s instanceof Map)) {
-                        throwStableConfigMappingException(
-                            "Each selector must be a map, but got: "
-                                + s.getClass().getSimpleName()
-                                + ": ",
-                            s);
-                      }
+        if (!(selectorsObj instanceof List)) {
+            throwStableConfigMappingException(
+                    "'selectors' must be a list, but got: "
+                            + selectorsObj.getClass().getSimpleName() + ": ",
+                    selectorsObj);
+        }
 
-                      return Selector.from((Map<?, ?>) s);
-                    })
-                .collect(toList());
+        Object configObj = map.get("configuration");
+        if (configObj == null) {
+            throwStableConfigMappingException("Missing 'configuration' in rule:", map);
+        }
+        if (!(configObj instanceof Map)) {
+            throwStableConfigMappingException(
+                    "'configuration' must be a map, but got: "
+                            + configObj.getClass().getSimpleName() + ": ",
+                    configObj);
+        }
 
-    return new Rule(unmodifiableList(selectors), (Map<String, Object>) configObj);
-  }
+        List<Selector> selectors = ((List<?>) selectorsObj)
+                .stream()
+                        .filter(Objects::nonNull)
+                        .map(s -> {
+                            if (!(s instanceof Map)) {
+                                throwStableConfigMappingException(
+                                        "Each selector must be a map, but got: "
+                                                + s.getClass().getSimpleName()
+                                                + ": ",
+                                        s);
+                            }
 
-  public List<Selector> getSelectors() {
-    return selectors;
-  }
+                            return Selector.from((Map<?, ?>) s);
+                        })
+                        .collect(toList());
 
-  public Map<String, Object> getConfiguration() {
-    return configuration;
-  }
+        return new Rule(unmodifiableList(selectors), (Map<String, Object>) configObj);
+    }
+
+    public List<Selector> getSelectors() {
+        return selectors;
+    }
+
+    public Map<String, Object> getConfiguration() {
+        return configuration;
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/Selector.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/Selector.java
index b06362cd0cd..5cb3aa9347f 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/Selector.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/Selector.java
@@ -7,70 +7,72 @@
 import java.util.Map;
 
 public final class Selector {
-  private final String origin;
-  private final String key;
-  private final List<String> matches;
-  private final String operator;
+    private final String origin;
+    private final String key;
+    private final List<String> matches;
+    private final String operator;
 
-  public Selector(String origin, String key, List<String> matches, String operator) {
-    this.origin = origin;
-    this.key = key;
-    this.matches = matches;
-    this.operator = operator;
-  }
-
-  public static Selector from(Map<?, ?> map) {
-    Object originObj = map.get("origin");
-    if (originObj == null) {
-      throwStableConfigMappingException("Missing 'origin' in selector:", map);
-    }
-    if (!(originObj instanceof String)) {
-      throwStableConfigMappingException(
-          "'origin' must be a string, but got: " + originObj.getClass().getSimpleName() + ": ",
-          originObj);
+    public Selector(String origin, String key, List<String> matches, String operator) {
+        this.origin = origin;
+        this.key = key;
+        this.matches = matches;
+        this.operator = operator;
     }
-    String origin = (String) originObj;
 
-    Object keyObj = map.get("key");
-    String key = (keyObj instanceof String) ? (String) keyObj : null;
+    public static Selector from(Map<?, ?> map) {
+        Object originObj = map.get("origin");
+        if (originObj == null) {
+            throwStableConfigMappingException("Missing 'origin' in selector:", map);
+        }
+        if (!(originObj instanceof String)) {
+            throwStableConfigMappingException(
+                    "'origin' must be a string, but got: "
+                            + originObj.getClass().getSimpleName() + ": ",
+                    originObj);
+        }
+        String origin = (String) originObj;
 
-    Object matchesObj = map.get("matches");
-    if (matchesObj != null && !(matchesObj instanceof List)) {
-      throwStableConfigMappingException(
-          "'matches' must be a list, but got: " + matchesObj.getClass().getSimpleName() + ": ",
-          matchesObj);
-    }
-    List<String> rawMatches = (List<String>) matchesObj;
-    List<String> matches =
-        rawMatches != null ? Collections.unmodifiableList(rawMatches) : Collections.emptyList();
+        Object keyObj = map.get("key");
+        String key = (keyObj instanceof String) ? (String) keyObj : null;
 
-    Object operatorObj = map.get("operator");
-    if (operatorObj == null) {
-      throwStableConfigMappingException("Missing 'operator' in selector:", map);
-    }
-    if (!(operatorObj instanceof String)) {
-      throwStableConfigMappingException(
-          "'operator' must be a string, but got: " + operatorObj.getClass().getSimpleName() + ": ",
-          operatorObj);
-    }
-    String operator = (String) operatorObj;
+        Object matchesObj = map.get("matches");
+        if (matchesObj != null && !(matchesObj instanceof List)) {
+            throwStableConfigMappingException(
+                    "'matches' must be a list, but got: "
+                            + matchesObj.getClass().getSimpleName() + ": ",
+                    matchesObj);
+        }
+        List<String> rawMatches = (List<String>) matchesObj;
+        List<String> matches = rawMatches != null ? Collections.unmodifiableList(rawMatches) : Collections.emptyList();
 
-    return new Selector(origin, key, matches, operator);
-  }
+        Object operatorObj = map.get("operator");
+        if (operatorObj == null) {
+            throwStableConfigMappingException("Missing 'operator' in selector:", map);
+        }
+        if (!(operatorObj instanceof String)) {
+            throwStableConfigMappingException(
+                    "'operator' must be a string, but got: "
+                            + operatorObj.getClass().getSimpleName() + ": ",
+                    operatorObj);
+        }
+        String operator = (String) operatorObj;
 
-  public String getOrigin() {
-    return origin;
-  }
+        return new Selector(origin, key, matches, operator);
+    }
 
-  public String getKey() {
-    return key;
-  }
+    public String getOrigin() {
+        return origin;
+    }
 
-  public List<String> getMatches() {
-    return matches;
-  }
+    public String getKey() {
+        return key;
+    }
 
-  public String getOperator() {
-    return operator;
-  }
+    public List<String> getMatches() {
+        return matches;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/StableConfig.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/StableConfig.java
index acac0da93dc..bbe5cb91570 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/StableConfig.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/StableConfig.java
@@ -11,58 +11,56 @@
 import java.util.Map;
 
 public final class StableConfig {
-  private final String configId;
-  private final Map<String, Object> apmConfigurationDefault;
-  private final List<Rule> apmConfigurationRules;
+    private final String configId;
+    private final Map<String, Object> apmConfigurationDefault;
+    private final List<Rule> apmConfigurationRules;
 
-  public StableConfig(Object yaml) {
-    Map<Object, Object> map = (Map<Object, Object>) yaml;
-    this.configId = map.get("config_id") == null ? null : String.valueOf(map.get("config_id"));
+    public StableConfig(Object yaml) {
+        Map<Object, Object> map = (Map<Object, Object>) yaml;
+        this.configId = map.get("config_id") == null ? null : String.valueOf(map.get("config_id"));
 
-    // getOrDefault returns null if key exists with null value, so we need explicit null check
-    Map<String, Object> apmConfigDefault =
-        (Map<String, Object>) map.get("apm_configuration_default");
-    this.apmConfigurationDefault =
-        unmodifiableMap(apmConfigDefault != null ? apmConfigDefault : emptyMap());
+        // getOrDefault returns null if key exists with null value, so we need explicit null check
+        Map<String, Object> apmConfigDefault = (Map<String, Object>) map.get("apm_configuration_default");
+        this.apmConfigurationDefault = unmodifiableMap(apmConfigDefault != null ? apmConfigDefault : emptyMap());
 
-    this.apmConfigurationRules = parseRules(map);
-  }
+        this.apmConfigurationRules = parseRules(map);
+    }
 
-  // test only
-  private StableConfig(String configId, Map<String, Object> apmConfigurationDefault) {
-    this.configId = configId;
-    this.apmConfigurationDefault = apmConfigurationDefault;
-    this.apmConfigurationRules = new ArrayList<>();
-  }
+    // test only
+    private StableConfig(String configId, Map<String, Object> apmConfigurationDefault) {
+        this.configId = configId;
+        this.apmConfigurationDefault = apmConfigurationDefault;
+        this.apmConfigurationRules = new ArrayList<>();
+    }
 
-  public String getConfigId() {
-    return configId;
-  }
+    public String getConfigId() {
+        return configId;
+    }
 
-  public Map<String, Object> getApmConfigurationDefault() {
-    return apmConfigurationDefault;
-  }
+    public Map<String, Object> getApmConfigurationDefault() {
+        return apmConfigurationDefault;
+    }
 
-  public List<Rule> getApmConfigurationRules() {
-    return apmConfigurationRules;
-  }
+    public List<Rule> getApmConfigurationRules() {
+        return apmConfigurationRules;
+    }
 
-  private List<Rule> parseRules(Map<?, ?> map) {
-    Object rulesObj = map.get("apm_configuration_rules");
-    if (rulesObj instanceof List) {
-      List<?> rulesList = (List<?>) rulesObj;
-      List<Rule> rules = new ArrayList<>();
-      for (Object ruleObj : rulesList) {
-        if (ruleObj instanceof Map) {
-          rules.add(Rule.from((Map<?, ?>) ruleObj));
-        } else {
-          throwStableConfigMappingException(
-              "Rule must be a map, but got: " + ruleObj.getClass().getSimpleName() + ": ", ruleObj);
-          return emptyList();
+    private List<Rule> parseRules(Map<?, ?> map) {
+        Object rulesObj = map.get("apm_configuration_rules");
+        if (rulesObj instanceof List) {
+            List<?> rulesList = (List<?>) rulesObj;
+            List<Rule> rules = new ArrayList<>();
+            for (Object ruleObj : rulesList) {
+                if (ruleObj instanceof Map) {
+                    rules.add(Rule.from((Map<?, ?>) ruleObj));
+                } else {
+                    throwStableConfigMappingException(
+                            "Rule must be a map, but got: " + ruleObj.getClass().getSimpleName() + ": ", ruleObj);
+                    return emptyList();
+                }
+            }
+            return unmodifiableList(rules);
         }
-      }
-      return unmodifiableList(rules);
+        return emptyList();
     }
-    return emptyList();
-  }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/StableConfigMappingException.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/StableConfigMappingException.java
index 5b0f10a3cda..cadca318252 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/StableConfigMappingException.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/StableConfigMappingException.java
@@ -1,40 +1,38 @@
 package datadog.trace.bootstrap.config.provider.stableconfig;
 
 public class StableConfigMappingException extends RuntimeException {
-  private static final int MAX_LEN = 100;
+    private static final int MAX_LEN = 100;
 
-  public StableConfigMappingException(String message) {
-    super(message);
-  }
+    public StableConfigMappingException(String message) {
+        super(message);
+    }
 
-  /**
-   * Safely converts an object to a string for error reporting, truncating the result if it exceeds
-   * a maximum length.
-   *
-   * @param value the object to convert to a string
-   * @return a string representation of the object, truncated if necessary
-   */
-  static String safeToString(Object value) {
-    if (value == null) return "null";
-    String str = value.toString();
-    if (str.length() > MAX_LEN) {
-      int partLen = MAX_LEN / 2;
-      return str.substring(0, partLen)
-          + "...(truncated)..."
-          + str.substring(str.length() - partLen);
+    /**
+     * Safely converts an object to a string for error reporting, truncating the result if it exceeds
+     * a maximum length.
+     *
+     * @param value the object to convert to a string
+     * @return a string representation of the object, truncated if necessary
+     */
+    static String safeToString(Object value) {
+        if (value == null) return "null";
+        String str = value.toString();
+        if (str.length() > MAX_LEN) {
+            int partLen = MAX_LEN / 2;
+            return str.substring(0, partLen) + "...(truncated)..." + str.substring(str.length() - partLen);
+        }
+        return str;
     }
-    return str;
-  }
 
-  /**
-   * Throws a StableConfigMappingException with a message that includes a safe string representation
-   * of the provided value.
-   *
-   * @param message the error message to include
-   * @param value the value to include in the error message, safely stringified
-   * @throws StableConfigMappingException always thrown by this method
-   */
-  public static void throwStableConfigMappingException(String message, Object value) {
-    throw new StableConfigMappingException(message + " " + safeToString(value));
-  }
+    /**
+     * Throws a StableConfigMappingException with a message that includes a safe string representation
+     * of the provided value.
+     *
+     * @param message the error message to include
+     * @param value the value to include in the error message, safely stringified
+     * @throws StableConfigMappingException always thrown by this method
+     */
+    public static void throwStableConfigMappingException(String message, Object value) {
+        throw new StableConfigMappingException(message + " " + safeToString(value));
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/config/inversion/ConfigHelper.java b/utils/config-utils/src/main/java/datadog/trace/config/inversion/ConfigHelper.java
index e58c71fa664..71becdd695f 100644
--- a/utils/config-utils/src/main/java/datadog/trace/config/inversion/ConfigHelper.java
+++ b/utils/config-utils/src/main/java/datadog/trace/config/inversion/ConfigHelper.java
@@ -14,169 +14,167 @@
 import org.slf4j.LoggerFactory;
 
 public class ConfigHelper {
-  private ConfigHelper() {}
+    private ConfigHelper() {}
 
-  /** Config Inversion strictness policy for enforcement of undocumented environment variables */
-  public enum StrictnessPolicy {
-    STRICT_TEST,
-    WARNING,
-    TEST;
+    /** Config Inversion strictness policy for enforcement of undocumented environment variables */
+    public enum StrictnessPolicy {
+        STRICT_TEST,
+        WARNING,
+        TEST;
 
-    private String displayName;
+        private String displayName;
 
-    StrictnessPolicy() {
-      this.displayName = name().toLowerCase(Locale.ROOT);
-    }
+        StrictnessPolicy() {
+            this.displayName = name().toLowerCase(Locale.ROOT);
+        }
 
-    @Override
-    public String toString() {
-      if (displayName == null) {
-        displayName = name().toLowerCase(Locale.ROOT);
-      }
-      return displayName;
+        @Override
+        public String toString() {
+            if (displayName == null) {
+                displayName = name().toLowerCase(Locale.ROOT);
+            }
+            return displayName;
+        }
     }
-  }
-
-  private static final Logger log = LoggerFactory.getLogger(ConfigHelper.class);
 
-  private static final ConfigHelper INSTANCE = new ConfigHelper();
+    private static final Logger log = LoggerFactory.getLogger(ConfigHelper.class);
 
-  private StrictnessPolicy configInversionStrict = StrictnessPolicy.WARNING;
+    private static final ConfigHelper INSTANCE = new ConfigHelper();
 
-  private static final String DD_PREFIX = "DD_";
-  private static final String OTEL_PREFIX = "OTEL_";
+    private StrictnessPolicy configInversionStrict = StrictnessPolicy.WARNING;
 
-  // Cache for configs, init value is EmptyMap
-  private Map<String, String> configs = Collections.emptyMap();
+    private static final String DD_PREFIX = "DD_";
+    private static final String OTEL_PREFIX = "OTEL_";
 
-  // Default to production source
-  private SupportedConfigurationSource configSource = new SupportedConfigurationSource();
+    // Cache for configs, init value is EmptyMap
+    private Map<String, String> configs = Collections.emptyMap();
 
-  // Collects unsupported config keys encountered in STRICT_TEST mode
-  private final Set<String> unsupportedConfigs = ConcurrentHashMap.newKeySet();
+    // Default to production source
+    private SupportedConfigurationSource configSource = new SupportedConfigurationSource();
 
-  public static ConfigHelper get() {
-    return INSTANCE;
-  }
+    // Collects unsupported config keys encountered in STRICT_TEST mode
+    private final Set<String> unsupportedConfigs = ConcurrentHashMap.newKeySet();
 
-  public void setConfigInversionStrict(StrictnessPolicy configInversionStrict) {
-    this.configInversionStrict = configInversionStrict;
-  }
+    public static ConfigHelper get() {
+        return INSTANCE;
+    }
 
-  public StrictnessPolicy configInversionStrictFlag() {
-    return configInversionStrict;
-  }
+    public void setConfigInversionStrict(StrictnessPolicy configInversionStrict) {
+        this.configInversionStrict = configInversionStrict;
+    }
 
-  // Used only for testing purposes
-  void setConfigurationSource(SupportedConfigurationSource testSource) {
-    configSource = testSource;
-  }
+    public StrictnessPolicy configInversionStrictFlag() {
+        return configInversionStrict;
+    }
 
-  /** Resetting config cache. Useful for cleaning up after tests. */
-  void resetCache() {
-    configs = Collections.emptyMap();
-  }
+    // Used only for testing purposes
+    void setConfigurationSource(SupportedConfigurationSource testSource) {
+        configSource = testSource;
+    }
 
-  /** Reset all configuration data to the generated defaults. Useful for cleaning up after tests. */
-  void resetToDefaults() {
-    configSource = new SupportedConfigurationSource();
-    this.configInversionStrict = StrictnessPolicy.WARNING;
-    unsupportedConfigs.clear();
-    resetCache();
-  }
+    /** Resetting config cache. Useful for cleaning up after tests. */
+    void resetCache() {
+        configs = Collections.emptyMap();
+    }
 
-  /** Returns and clears the set of unsupported config keys encountered in STRICT_TEST mode. */
-  public List<String> drainUnsupportedConfigs() {
-    List<String> result = new ArrayList<>(unsupportedConfigs);
-    unsupportedConfigs.clear();
-    Collections.sort(result);
-    return result;
-  }
+    /** Reset all configuration data to the generated defaults. Useful for cleaning up after tests. */
+    void resetToDefaults() {
+        configSource = new SupportedConfigurationSource();
+        this.configInversionStrict = StrictnessPolicy.WARNING;
+        unsupportedConfigs.clear();
+        resetCache();
+    }
 
-  public static Map<String, String> env() {
-    return get().getEnvironmentVariables();
-  }
+    /** Returns and clears the set of unsupported config keys encountered in STRICT_TEST mode. */
+    public List<String> drainUnsupportedConfigs() {
+        List<String> result = new ArrayList<>(unsupportedConfigs);
+        unsupportedConfigs.clear();
+        Collections.sort(result);
+        return result;
+    }
 
-  public static String env(String key) {
-    return get().getEnvironmentVariable(key);
-  }
+    public static Map<String, String> env() {
+        return get().getEnvironmentVariables();
+    }
 
-  public Map<String, String> getEnvironmentVariables() {
-    if (!configs.isEmpty()) {
-      return configs;
+    public static String env(String key) {
+        return get().getEnvironmentVariable(key);
     }
 
-    // Initial value is EmptyMap
-    configs = new HashMap<>();
-
-    Map<String, String> env = EnvironmentVariables.getAll();
-    for (Map.Entry<String, String> entry : env.entrySet()) {
-      String key = entry.getKey();
-      String value = entry.getValue();
-      String primaryEnv = configSource.primaryEnvFromAlias(key);
-      if (key.startsWith(DD_PREFIX) || key.startsWith(OTEL_PREFIX) || primaryEnv != null) {
-        if (configSource.supported(key)) {
-          configs.put(key, value);
-          // If this environment variable is the alias of another, and we haven't processed the
-          // original environment variable yet, handle it here.
-        } else if (primaryEnv != null && !configs.containsKey(primaryEnv)) {
-          List<String> aliases = configSource.getAliases(primaryEnv);
-          for (String alias : aliases) {
-            if (env.containsKey(alias)) {
-              configs.put(primaryEnv, env.get(alias));
-              break;
-            }
-          }
+    public Map<String, String> getEnvironmentVariables() {
+        if (!configs.isEmpty()) {
+            return configs;
         }
-        String envFromDeprecated = configSource.primaryEnvFromDeprecated(key);
-        if (envFromDeprecated != null) {
-          String warning =
-              "Environment variable "
-                  + key
-                  + " is deprecated. Please use "
-                  + (primaryEnv != null ? primaryEnv : envFromDeprecated)
-                  + " instead.";
-          log.warn(warning);
+
+        // Initial value is EmptyMap
+        configs = new HashMap<>();
+
+        Map<String, String> env = EnvironmentVariables.getAll();
+        for (Map.Entry<String, String> entry : env.entrySet()) {
+            String key = entry.getKey();
+            String value = entry.getValue();
+            String primaryEnv = configSource.primaryEnvFromAlias(key);
+            if (key.startsWith(DD_PREFIX) || key.startsWith(OTEL_PREFIX) || primaryEnv != null) {
+                if (configSource.supported(key)) {
+                    configs.put(key, value);
+                    // If this environment variable is the alias of another, and we haven't processed the
+                    // original environment variable yet, handle it here.
+                } else if (primaryEnv != null && !configs.containsKey(primaryEnv)) {
+                    List<String> aliases = configSource.getAliases(primaryEnv);
+                    for (String alias : aliases) {
+                        if (env.containsKey(alias)) {
+                            configs.put(primaryEnv, env.get(alias));
+                            break;
+                        }
+                    }
+                }
+                String envFromDeprecated = configSource.primaryEnvFromDeprecated(key);
+                if (envFromDeprecated != null) {
+                    String warning = "Environment variable "
+                            + key
+                            + " is deprecated. Please use "
+                            + (primaryEnv != null ? primaryEnv : envFromDeprecated)
+                            + " instead.";
+                    log.warn(warning);
+                }
+            } else {
+                configs.put(key, value);
+            }
         }
-      } else {
-        configs.put(key, value);
-      }
+        return configs;
     }
-    return configs;
-  }
 
-  public String getEnvironmentVariable(String name) {
-    if (configs != null && configs.containsKey(name)) {
-      return configs.get(name);
-    }
+    public String getEnvironmentVariable(String name) {
+        if (configs != null && configs.containsKey(name)) {
+            return configs.get(name);
+        }
 
-    if ((name.startsWith(DD_PREFIX) || name.startsWith(OTEL_PREFIX))
-        && configSource.primaryEnvFromAlias(name) == null
-        && !configSource.supported(name)) {
-      if (configInversionStrict != StrictnessPolicy.TEST) {
-        ConfigInversionMetricCollectorProvider.get().setUndocumentedEnvVarMetric(name);
-      }
-
-      if (configInversionStrict == StrictnessPolicy.STRICT_TEST) {
-        unsupportedConfigs.add(name);
-        throw new IllegalArgumentException(
-            "Unsupported configuration: "
-                + name
-                + " is not in GeneratedSupportedConfigurations. "
-                + "Add it to metadata/supported-configurations.json or remove the usage.");
-      }
-    }
+        if ((name.startsWith(DD_PREFIX) || name.startsWith(OTEL_PREFIX))
+                && configSource.primaryEnvFromAlias(name) == null
+                && !configSource.supported(name)) {
+            if (configInversionStrict != StrictnessPolicy.TEST) {
+                ConfigInversionMetricCollectorProvider.get().setUndocumentedEnvVarMetric(name);
+            }
+
+            if (configInversionStrict == StrictnessPolicy.STRICT_TEST) {
+                unsupportedConfigs.add(name);
+                throw new IllegalArgumentException("Unsupported configuration: "
+                        + name
+                        + " is not in GeneratedSupportedConfigurations. "
+                        + "Add it to metadata/supported-configurations.json or remove the usage.");
+            }
+        }
 
-    String config = EnvironmentVariables.get(name);
-    List<String> aliases;
-    if (config == null && (aliases = configSource.getAliases(name)) != null) {
-      for (String alias : aliases) {
-        String aliasValue = EnvironmentVariables.get(alias);
-        if (aliasValue != null) {
-          return aliasValue;
+        String config = EnvironmentVariables.get(name);
+        List<String> aliases;
+        if (config == null && (aliases = configSource.getAliases(name)) != null) {
+            for (String alias : aliases) {
+                String aliasValue = EnvironmentVariables.get(alias);
+                if (aliasValue != null) {
+                    return aliasValue;
+                }
+            }
         }
-      }
+        return config;
     }
-    return config;
-  }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/config/inversion/SupportedConfiguration.java b/utils/config-utils/src/main/java/datadog/trace/config/inversion/SupportedConfiguration.java
index dfee6583d55..0a27e4276a5 100644
--- a/utils/config-utils/src/main/java/datadog/trace/config/inversion/SupportedConfiguration.java
+++ b/utils/config-utils/src/main/java/datadog/trace/config/inversion/SupportedConfiguration.java
@@ -3,42 +3,38 @@
 import java.util.List;
 
 public class SupportedConfiguration {
-  private final String version;
-  private final String type;
-  private final String defaultValue;
-  private final List<String> aliases;
-  private final List<String> propertyKeys;
-
-  public SupportedConfiguration(
-      String version,
-      String type,
-      String defaultValue,
-      List<String> aliases,
-      List<String> propertyKeys) {
-    this.version = version;
-    this.type = type;
-    this.defaultValue = defaultValue;
-    this.aliases = aliases;
-    this.propertyKeys = propertyKeys;
-  }
-
-  public String version() {
-    return version;
-  }
-
-  public String type() {
-    return type;
-  }
-
-  public String defaultValue() {
-    return defaultValue;
-  }
-
-  public List<String> aliases() {
-    return aliases;
-  }
-
-  public List<String> propertyKeys() {
-    return propertyKeys;
-  }
+    private final String version;
+    private final String type;
+    private final String defaultValue;
+    private final List<String> aliases;
+    private final List<String> propertyKeys;
+
+    public SupportedConfiguration(
+            String version, String type, String defaultValue, List<String> aliases, List<String> propertyKeys) {
+        this.version = version;
+        this.type = type;
+        this.defaultValue = defaultValue;
+        this.aliases = aliases;
+        this.propertyKeys = propertyKeys;
+    }
+
+    public String version() {
+        return version;
+    }
+
+    public String type() {
+        return type;
+    }
+
+    public String defaultValue() {
+        return defaultValue;
+    }
+
+    public List<String> aliases() {
+        return aliases;
+    }
+
+    public List<String> propertyKeys() {
+        return propertyKeys;
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/config/inversion/SupportedConfigurationSource.java b/utils/config-utils/src/main/java/datadog/trace/config/inversion/SupportedConfigurationSource.java
index 6fda26a93d2..175b5a7aeb2 100644
--- a/utils/config-utils/src/main/java/datadog/trace/config/inversion/SupportedConfigurationSource.java
+++ b/utils/config-utils/src/main/java/datadog/trace/config/inversion/SupportedConfigurationSource.java
@@ -9,39 +9,38 @@
  */
 class SupportedConfigurationSource {
 
-  /**
-   * @return Set of supported environment variable keys
-   */
-  public boolean supported(String env) {
-    return GeneratedSupportedConfigurations.SUPPORTED.containsKey(env);
-  }
+    /**
+     * @return Set of supported environment variable keys
+     */
+    public boolean supported(String env) {
+        return GeneratedSupportedConfigurations.SUPPORTED.containsKey(env);
+    }
 
-  /**
-   * @return List of aliases for an environment variable
-   */
-  public List<String> getAliases(String env) {
-    return GeneratedSupportedConfigurations.ALIASES.getOrDefault(env, Collections.emptyList());
-  }
+    /**
+     * @return List of aliases for an environment variable
+     */
+    public List<String> getAliases(String env) {
+        return GeneratedSupportedConfigurations.ALIASES.getOrDefault(env, Collections.emptyList());
+    }
 
-  /**
-   * @return Primary environment variable for a queried alias
-   */
-  public String primaryEnvFromAlias(String alias) {
-    return GeneratedSupportedConfigurations.ALIAS_MAPPING.getOrDefault(alias, null);
-  }
+    /**
+     * @return Primary environment variable for a queried alias
+     */
+    public String primaryEnvFromAlias(String alias) {
+        return GeneratedSupportedConfigurations.ALIAS_MAPPING.getOrDefault(alias, null);
+    }
 
-  /**
-   * @return Map of deprecated configurations
-   */
-  public String primaryEnvFromDeprecated(String deprecated) {
-    return GeneratedSupportedConfigurations.DEPRECATED.getOrDefault(deprecated, null);
-  }
+    /**
+     * @return Map of deprecated configurations
+     */
+    public String primaryEnvFromDeprecated(String deprecated) {
+        return GeneratedSupportedConfigurations.DEPRECATED.getOrDefault(deprecated, null);
+    }
 
-  /**
-   * @return Mapping from propertyKey to configuration
-   */
-  public String envFromTelemetryKey(String telemetryKey) {
-    return GeneratedSupportedConfigurations.REVERSE_PROPERTY_KEYS_MAP.getOrDefault(
-        telemetryKey, null);
-  }
+    /**
+     * @return Mapping from propertyKey to configuration
+     */
+    public String envFromTelemetryKey(String telemetryKey) {
+        return GeneratedSupportedConfigurations.REVERSE_PROPERTY_KEYS_MAP.getOrDefault(telemetryKey, null);
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/util/ConfigStrings.java b/utils/config-utils/src/main/java/datadog/trace/util/ConfigStrings.java
index e9d38ea4c72..3feb8311c82 100644
--- a/utils/config-utils/src/main/java/datadog/trace/util/ConfigStrings.java
+++ b/utils/config-utils/src/main/java/datadog/trace/util/ConfigStrings.java
@@ -5,87 +5,87 @@
 
 public final class ConfigStrings {
 
-  private ConfigStrings() {}
+    private ConfigStrings() {}
 
-  public static String toEnvVar(String string) {
-    return string.replace('.', '_').replace('-', '_').toUpperCase(Locale.ROOT);
-  }
-
-  public static String toEnvVarLowerCase(String string) {
-    return string.replace('.', '_').replace('-', '_').toLowerCase(Locale.ROOT);
-  }
+    public static String toEnvVar(String string) {
+        return string.replace('.', '_').replace('-', '_').toUpperCase(Locale.ROOT);
+    }
 
-  /**
-   * Converts the property name, e.g. 'service.name' into a public environment variable name, e.g.
-   * `DD_SERVICE_NAME`.
-   *
-   * @param setting The setting name, e.g. `service.name`
-   * @return The public facing environment variable name
-   */
-  @Nonnull
-  public static String propertyNameToEnvironmentVariableName(final String setting) {
-    return "DD_" + toEnvVar(setting);
-  }
+    public static String toEnvVarLowerCase(String string) {
+        return string.replace('.', '_').replace('-', '_').toLowerCase(Locale.ROOT);
+    }
 
-  /**
-   * Converts a config key to its canonical {@code DD_} or {@code OTEL_} environment-variable form.
-   *
-   * @param key The config key in any form
-   * @return The canonical environment variable name
-   */
-  @Nonnull
-  public static String toCanonicalEnvVar(final String key) {
-    if (key.startsWith("otel.") || key.startsWith("OTEL_")) {
-      return toEnvVar(key);
+    /**
+     * Converts the property name, e.g. 'service.name' into a public environment variable name, e.g.
+     * `DD_SERVICE_NAME`.
+     *
+     * @param setting The setting name, e.g. `service.name`
+     * @return The public facing environment variable name
+     */
+    @Nonnull
+    public static String propertyNameToEnvironmentVariableName(final String setting) {
+        return "DD_" + toEnvVar(setting);
     }
-    final String env = toEnvVar(key);
-    return env.startsWith("DD_") ? env : "DD_" + env;
-  }
 
-  /**
-   * Converts the property name, e.g. 'service.name' into a public system property name, e.g.
-   * `dd.service.name`.
-   *
-   * @param setting The setting name, e.g. `service.name`
-   * @return The public facing system property name
-   */
-  @Nonnull
-  public static String propertyNameToSystemPropertyName(final String setting) {
-    return "dd." + setting;
-  }
+    /**
+     * Converts a config key to its canonical {@code DD_} or {@code OTEL_} environment-variable form.
+     *
+     * @param key The config key in any form
+     * @return The canonical environment variable name
+     */
+    @Nonnull
+    public static String toCanonicalEnvVar(final String key) {
+        if (key.startsWith("otel.") || key.startsWith("OTEL_")) {
+            return toEnvVar(key);
+        }
+        final String env = toEnvVar(key);
+        return env.startsWith("DD_") ? env : "DD_" + env;
+    }
 
-  @Nonnull
-  public static String normalizedHeaderTag(String str) {
-    if (str.isEmpty()) {
-      return "";
+    /**
+     * Converts the property name, e.g. 'service.name' into a public system property name, e.g.
+     * `dd.service.name`.
+     *
+     * @param setting The setting name, e.g. `service.name`
+     * @return The public facing system property name
+     */
+    @Nonnull
+    public static String propertyNameToSystemPropertyName(final String setting) {
+        return "dd." + setting;
     }
-    StringBuilder builder = new StringBuilder(str.length());
-    int firstNonWhiteSpace = -1;
-    int lastNonWhitespace = -1;
-    for (int i = 0; i < str.length(); i++) {
-      char c = str.charAt(i);
-      if (Character.isWhitespace(c)) {
-        builder.append('_');
-      } else {
-        firstNonWhiteSpace = firstNonWhiteSpace == -1 ? i : firstNonWhiteSpace;
-        lastNonWhitespace = i;
-        if (Character.isLetterOrDigit(c) || c == '_' || c == '-' || c == '/') {
-          builder.append(Character.toLowerCase(c));
+
+    @Nonnull
+    public static String normalizedHeaderTag(String str) {
+        if (str.isEmpty()) {
+            return "";
+        }
+        StringBuilder builder = new StringBuilder(str.length());
+        int firstNonWhiteSpace = -1;
+        int lastNonWhitespace = -1;
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            if (Character.isWhitespace(c)) {
+                builder.append('_');
+            } else {
+                firstNonWhiteSpace = firstNonWhiteSpace == -1 ? i : firstNonWhiteSpace;
+                lastNonWhitespace = i;
+                if (Character.isLetterOrDigit(c) || c == '_' || c == '-' || c == '/') {
+                    builder.append(Character.toLowerCase(c));
+                } else {
+                    builder.append('_');
+                }
+            }
+        }
+        if (firstNonWhiteSpace == -1) {
+            return "";
         } else {
-          builder.append('_');
+            str = builder.substring(firstNonWhiteSpace, lastNonWhitespace + 1);
+            return str;
         }
-      }
     }
-    if (firstNonWhiteSpace == -1) {
-      return "";
-    } else {
-      str = builder.substring(firstNonWhiteSpace, lastNonWhitespace + 1);
-      return str;
-    }
-  }
 
-  @Nonnull
-  public static String trim(final String string) {
-    return null == string ? "" : string.trim();
-  }
+    @Nonnull
+    public static String trim(final String string) {
+        return null == string ? "" : string.trim();
+    }
 }
diff --git a/utils/config-utils/src/main/java/datadog/yaml/YamlParser.java b/utils/config-utils/src/main/java/datadog/yaml/YamlParser.java
index 1284ef0833a..44c76eff243 100644
--- a/utils/config-utils/src/main/java/datadog/yaml/YamlParser.java
+++ b/utils/config-utils/src/main/java/datadog/yaml/YamlParser.java
@@ -4,15 +4,15 @@
 import org.snakeyaml.engine.v2.api.LoadSettings;
 
 public class YamlParser {
-  /**
-   * Parses YAML content. Duplicate keys are not allowed and will result in a runtime exception..
-   *
-   * @param content - text context to be parsed as YAML
-   * @return - a parsed representation as a composition of map and list objects.
-   */
-  public static Object parse(String content) {
-    LoadSettings settings = LoadSettings.builder().build();
-    Load yaml = new Load(settings);
-    return yaml.loadFromString(content);
-  }
+    /**
+     * Parses YAML content. Duplicate keys are not allowed and will result in a runtime exception..
+     *
+     * @param content - text context to be parsed as YAML
+     * @return - a parsed representation as a composition of map and list objects.
+     */
+    public static Object parse(String content) {
+        LoadSettings settings = LoadSettings.builder().build();
+        Load yaml = new Load(settings);
+        return yaml.loadFromString(content);
+    }
 }
diff --git a/utils/config-utils/src/test/java/datadog/trace/api/ConfigSettingTest.java b/utils/config-utils/src/test/java/datadog/trace/api/ConfigSettingTest.java
index 0b40400d963..78a9e1961d7 100644
--- a/utils/config-utils/src/test/java/datadog/trace/api/ConfigSettingTest.java
+++ b/utils/config-utils/src/test/java/datadog/trace/api/ConfigSettingTest.java
@@ -10,93 +10,96 @@
 
 public class ConfigSettingTest {
 
-  @TableTest({
-    "scenario         | key1 | value1 | origin1  | key2 | value2 | origin2  | expectedEqual",
-    "equal            | key  | value  | DEFAULT  | key  | value  | DEFAULT  | true         ",
-    "different key    | key  | value  | ENV      | key2 | value  | ENV      | false        ",
-    "different value  | key  | value2 | JVM_PROP | key  | value  | JVM_PROP | false        ",
-    "different origin | key  | value  | ENV      | key  | value  | DEFAULT  | false        "
-  })
-  void supportsEqualityCheck(
-      String key1,
-      Object value1,
-      ConfigOrigin origin1,
-      String key2,
-      Object value2,
-      ConfigOrigin origin2,
-      boolean expectedEqual) {
-    ConfigSetting cs1 = ConfigSetting.of(key1, value1, origin1);
-    ConfigSetting cs2 = ConfigSetting.of(key2, value2, origin2);
+    @TableTest({
+      "scenario         | key1 | value1 | origin1  | key2 | value2 | origin2  | expectedEqual",
+      "equal            | key  | value  | DEFAULT  | key  | value  | DEFAULT  | true         ",
+      "different key    | key  | value  | ENV      | key2 | value  | ENV      | false        ",
+      "different value  | key  | value2 | JVM_PROP | key  | value  | JVM_PROP | false        ",
+      "different origin | key  | value  | ENV      | key  | value  | DEFAULT  | false        "
+    })
+    void supportsEqualityCheck(
+            String key1,
+            Object value1,
+            ConfigOrigin origin1,
+            String key2,
+            Object value2,
+            ConfigOrigin origin2,
+            boolean expectedEqual) {
+        ConfigSetting cs1 = ConfigSetting.of(key1, value1, origin1);
+        ConfigSetting cs2 = ConfigSetting.of(key2, value2, origin2);
 
-    if (expectedEqual) {
-      assertEquals(cs1.hashCode(), cs2.hashCode());
-      assertEquals(cs1, cs2);
-      assertEquals(cs2, cs1);
-      assertEquals(cs1.toString(), cs2.toString());
-    } else {
-      assertNotEquals(cs1.hashCode(), cs2.hashCode());
-      assertNotEquals(cs1, cs2);
-      assertNotEquals(cs2, cs1);
-      assertNotEquals(cs1.toString(), cs2.toString());
+        if (expectedEqual) {
+            assertEquals(cs1.hashCode(), cs2.hashCode());
+            assertEquals(cs1, cs2);
+            assertEquals(cs2, cs1);
+            assertEquals(cs1.toString(), cs2.toString());
+        } else {
+            assertNotEquals(cs1.hashCode(), cs2.hashCode());
+            assertNotEquals(cs1, cs2);
+            assertNotEquals(cs2, cs1);
+            assertNotEquals(cs1.toString(), cs2.toString());
+        }
     }
-  }
 
-  @TableTest({
-    "scenario             | key                         | value     | filteredValue",
-    "api key property     | api-key                     | somevalue | <hidden>     ",
-    "api key system prop  | dd.api-key                  | somevalue | <hidden>     ",
-    "api key env var      | DD_API_KEY                  | somevalue | <hidden>     ",
-    "application key      | application-key             | somevalue | <hidden>     ",
-    "application alias    | DD_APP_KEY                  | somevalue | <hidden>     ",
-    "otlp traces headers  | otlp.traces.headers         | somevalue | <hidden>     ",
-    "profiling API key    | profiling.api-key           | somevalue | <hidden>     ",
-    "profiling APIKEY     | profiling.apikey            | somevalue | <hidden>     ",
-    "profiling API env    | DD_PROFILING_API_KEY        | somevalue | <hidden>     ",
-    "profiling APIKEY env | DD_PROFILING_APIKEY         | somevalue | <hidden>     ",
-    "proxy password       | profiling.proxy.password    | somevalue | <hidden>     ",
-    "session token prop   | test.agent.session.token    | somevalue | <hidden>     ",
-    "session token env    | DD_TEST_AGENT_SESSION_TOKEN | somevalue | <hidden>     ",
-    "non-sensitive key    | some.other.key              | somevalue | somevalue    "
-  })
-  void filtersKeyValues(String key, String value, String filteredValue) {
-    assertEquals(filteredValue, ConfigSetting.of(key, value, ConfigOrigin.DEFAULT).stringValue());
-  }
+    @TableTest({
+      "scenario             | key                         | value     | filteredValue",
+      "api key property     | api-key                     | somevalue | <hidden>     ",
+      "api key system prop  | dd.api-key                  | somevalue | <hidden>     ",
+      "api key env var      | DD_API_KEY                  | somevalue | <hidden>     ",
+      "application key      | application-key             | somevalue | <hidden>     ",
+      "application alias    | DD_APP_KEY                  | somevalue | <hidden>     ",
+      "otlp traces headers  | otlp.traces.headers         | somevalue | <hidden>     ",
+      "profiling API key    | profiling.api-key           | somevalue | <hidden>     ",
+      "profiling APIKEY     | profiling.apikey            | somevalue | <hidden>     ",
+      "profiling API env    | DD_PROFILING_API_KEY        | somevalue | <hidden>     ",
+      "profiling APIKEY env | DD_PROFILING_APIKEY         | somevalue | <hidden>     ",
+      "proxy password       | profiling.proxy.password    | somevalue | <hidden>     ",
+      "session token prop   | test.agent.session.token    | somevalue | <hidden>     ",
+      "session token env    | DD_TEST_AGENT_SESSION_TOKEN | somevalue | <hidden>     ",
+      "non-sensitive key    | some.other.key              | somevalue | somevalue    "
+    })
+    void filtersKeyValues(String key, String value, String filteredValue) {
+        assertEquals(
+                filteredValue,
+                ConfigSetting.of(key, value, ConfigOrigin.DEFAULT).stringValue());
+    }
 
-  @TableTest({
-    "scenario      | key                  | normalized          ",
-    "property name | api-key              | DD_API_KEY          ",
-    "dd env var    | DD_PROFILING_API_KEY | DD_PROFILING_API_KEY",
-    "otel env var  | OTEL_SERVICE_NAME    | OTEL_SERVICE_NAME   "
-  })
-  void storesNormalizedKeyName(String key, String normalized) {
-    assertEquals(normalized, ConfigSetting.of(key, "v", ConfigOrigin.DEFAULT).key);
-  }
+    @TableTest({
+      "scenario      | key                  | normalized          ",
+      "property name | api-key              | DD_API_KEY          ",
+      "dd env var    | DD_PROFILING_API_KEY | DD_PROFILING_API_KEY",
+      "otel env var  | OTEL_SERVICE_NAME    | OTEL_SERVICE_NAME   "
+    })
+    void storesNormalizedKeyName(String key, String normalized) {
+        assertEquals(normalized, ConfigSetting.of(key, "v", ConfigOrigin.DEFAULT).key);
+    }
 
-  @TableTest({
-    "scenario | value  | rendered",
-    "null     |        |         ",
-    "boolean  | true   | true    ",
-    "boolean  | false  | false   ",
-    "integer  | 1      | 1       ",
-    "double   | 1.0    | 1.0     ",
-    "float    | 2.33f  | 2.33    ",
-    "string   | string | string  "
-  })
-  void supportBasicTypes(@ConvertWith(BoxedValueConverter.class) Object value, String rendered) {
-    assertEquals(rendered, ConfigSetting.of("key", value, ConfigOrigin.DEFAULT).stringValue());
-  }
+    @TableTest({
+      "scenario | value  | rendered",
+      "null     |        |         ",
+      "boolean  | true   | true    ",
+      "boolean  | false  | false   ",
+      "integer  | 1      | 1       ",
+      "double   | 1.0    | 1.0     ",
+      "float    | 2.33f  | 2.33    ",
+      "string   | string | string  "
+    })
+    void supportBasicTypes(@ConvertWith(BoxedValueConverter.class) Object value, String rendered) {
+        assertEquals(
+                rendered, ConfigSetting.of("key", value, ConfigOrigin.DEFAULT).stringValue());
+    }
 
-  @TableTest({
-    "scenario      | value                           | rendered              ",
-    "iterable      | [1, 2, 3]                       | 1,2,3                 ",
-    "decimals      | [1.0, 22.23, 3.1415]            | 1.0,22.23,3.1415      ",
-    "map           | [a: 1, b: 2]                    | a:1,b:2               ",
-    "empty list    | []                              | ''                    ",
-    "empty map     | [:]                             | ''                    ",
-    "bitset ranges | bits(33, 200-300, 303, 400-500) | 33,200-300,303,400-500"
-  })
-  void convertIterableMapAndBitSetToString(
-      @ConvertWith(ConfigValueConverter.class) Object value, String rendered) {
-    assertEquals(rendered, ConfigSetting.of("key", value, ConfigOrigin.DEFAULT).stringValue());
-  }
+    @TableTest({
+      "scenario      | value                           | rendered              ",
+      "iterable      | [1, 2, 3]                       | 1,2,3                 ",
+      "decimals      | [1.0, 22.23, 3.1415]            | 1.0,22.23,3.1415      ",
+      "map           | [a: 1, b: 2]                    | a:1,b:2               ",
+      "empty list    | []                              | ''                    ",
+      "empty map     | [:]                             | ''                    ",
+      "bitset ranges | bits(33, 200-300, 303, 400-500) | 33,200-300,303,400-500"
+    })
+    void convertIterableMapAndBitSetToString(@ConvertWith(ConfigValueConverter.class) Object value, String rendered) {
+        assertEquals(
+                rendered, ConfigSetting.of("key", value, ConfigOrigin.DEFAULT).stringValue());
+    }
 }
diff --git a/utils/config-utils/src/test/java/datadog/trace/api/env/CapturedEnvironmentTest.java b/utils/config-utils/src/test/java/datadog/trace/api/env/CapturedEnvironmentTest.java
index 4b0c22204b7..00dfdc12f11 100644
--- a/utils/config-utils/src/test/java/datadog/trace/api/env/CapturedEnvironmentTest.java
+++ b/utils/config-utils/src/test/java/datadog/trace/api/env/CapturedEnvironmentTest.java
@@ -14,91 +14,87 @@
 
 public class CapturedEnvironmentTest {
 
-  @TableTest({
-    "scenario           | sunJavaCommand                          | envVars                                                    | expectedServiceName                                             ",
-    "null command       | null                                    | [:]                                                        |                                                                 ",
-    "empty command      | ''                                      | [:]                                                        |                                                                 ",
-    "all blanks         | ' '                                     | [:]                                                        |                                                                 ",
-    "class in command   | org.example.App -Dfoo=bar arg2 arg3     | [:]                                                        | org.example.App                                                 ",
-    "jar in command     | foo/bar/example.jar -Dfoo=bar arg2 arg3 | [:]                                                        | example                                                         ",
-    "real sun command   |                                         | [:]                                                        | datadog.trace.api.env.CapturedEnvironmentTest$ServiceNamePrinter",
-    "azure site name    | foo/bar/example.jar -Dfoo=bar arg2 arg3 | [DD_AZURE_APP_SERVICES: 1, WEBSITE_SITE_NAME: siteService] | siteService                                                     ",
-    "site name no azure | foo/bar/example.jar -Dfoo=bar arg2 arg3 | [WEBSITE_SITE_NAME: siteService]                           | example                                                         ",
-    "azure flag no site | foo/bar/example.jar -Dfoo=bar arg2 arg3 | [DD_AZURE_APP_SERVICES: true]                              | example                                                         "
-  })
-  void capturesServiceName(
-      String sunJavaCommand, Map<String, String> envVars, String expectedServiceName)
-      throws IOException, InterruptedException {
-    assertEquals(expectedServiceName, forkAndRunProperties(sunJavaCommand, envVars));
-  }
-
-  private static String forkAndRunProperties(String arg, Map<String, String> envVars)
-      throws IOException, InterruptedException {
-    // Build the command to run a new Java process
-    List<String> command = new ArrayList<>();
-    command.add(System.getProperty("java.home") + separator + "bin" + separator + "java");
-    command.add("-cp");
-    command.add(System.getProperty("java.class.path"));
-    command.add(ServiceNamePrinter.class.getName());
-    if (arg != null) {
-      command.add(arg);
+    @TableTest({
+      "scenario           | sunJavaCommand                          | envVars                                                    | expectedServiceName                                             ",
+      "null command       | null                                    | [:]                                                        |                                                                 ",
+      "empty command      | ''                                      | [:]                                                        |                                                                 ",
+      "all blanks         | ' '                                     | [:]                                                        |                                                                 ",
+      "class in command   | org.example.App -Dfoo=bar arg2 arg3     | [:]                                                        | org.example.App                                                 ",
+      "jar in command     | foo/bar/example.jar -Dfoo=bar arg2 arg3 | [:]                                                        | example                                                         ",
+      "real sun command   |                                         | [:]                                                        | datadog.trace.api.env.CapturedEnvironmentTest$ServiceNamePrinter",
+      "azure site name    | foo/bar/example.jar -Dfoo=bar arg2 arg3 | [DD_AZURE_APP_SERVICES: 1, WEBSITE_SITE_NAME: siteService] | siteService                                                     ",
+      "site name no azure | foo/bar/example.jar -Dfoo=bar arg2 arg3 | [WEBSITE_SITE_NAME: siteService]                           | example                                                         ",
+      "azure flag no site | foo/bar/example.jar -Dfoo=bar arg2 arg3 | [DD_AZURE_APP_SERVICES: true]                              | example                                                         "
+    })
+    void capturesServiceName(String sunJavaCommand, Map<String, String> envVars, String expectedServiceName)
+            throws IOException, InterruptedException {
+        assertEquals(expectedServiceName, forkAndRunProperties(sunJavaCommand, envVars));
     }
-    // Start the process
-    ProcessBuilder processBuilder = new ProcessBuilder(command);
-    processBuilder.environment().putAll(envVars);
-    Process process = processBuilder.start();
-    // Read and parse output and error streams
-    String serviceName = "";
-    try (BufferedReader reader =
-        new BufferedReader(new InputStreamReader(process.getInputStream()))) {
-      String line;
-      while ((line = reader.readLine()) != null) {
-        if (!serviceName.isEmpty()) {
-          serviceName += "\n";
+
+    private static String forkAndRunProperties(String arg, Map<String, String> envVars)
+            throws IOException, InterruptedException {
+        // Build the command to run a new Java process
+        List<String> command = new ArrayList<>();
+        command.add(System.getProperty("java.home") + separator + "bin" + separator + "java");
+        command.add("-cp");
+        command.add(System.getProperty("java.class.path"));
+        command.add(ServiceNamePrinter.class.getName());
+        if (arg != null) {
+            command.add(arg);
         }
-        serviceName += line;
-      }
-    }
-    if ("null".equals(serviceName)) {
-      serviceName = null;
-    }
-    String error = "";
-    try (BufferedReader reader =
-        new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
-      String line;
-      while ((line = reader.readLine()) != null) {
-        error += line + "\n";
-      }
-    }
-    // Wait for the process to complete
-    int exitCode = process.waitFor();
-    // Dumping state on error
-    if (exitCode != 0) {
-      System.out.println(
-          "Error printing service name. Exit code "
-              + exitCode
-              + " with service name: '"
-              + serviceName
-              + "' and error:\n"
-              + error);
-      throw new IllegalStateException("Process should exit without error");
+        // Start the process
+        ProcessBuilder processBuilder = new ProcessBuilder(command);
+        processBuilder.environment().putAll(envVars);
+        Process process = processBuilder.start();
+        // Read and parse output and error streams
+        String serviceName = "";
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (!serviceName.isEmpty()) {
+                    serviceName += "\n";
+                }
+                serviceName += line;
+            }
+        }
+        if ("null".equals(serviceName)) {
+            serviceName = null;
+        }
+        String error = "";
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                error += line + "\n";
+            }
+        }
+        // Wait for the process to complete
+        int exitCode = process.waitFor();
+        // Dumping state on error
+        if (exitCode != 0) {
+            System.out.println("Error printing service name. Exit code "
+                    + exitCode
+                    + " with service name: '"
+                    + serviceName
+                    + "' and error:\n"
+                    + error);
+            throw new IllegalStateException("Process should exit without error");
+        }
+        return serviceName;
     }
-    return serviceName;
-  }
 
-  public static class ServiceNamePrinter {
-    public static void main(String[] args) {
-      if (args.length > 0) {
-        String sunJavaCommand = args[0];
-        if ("null".equals(sunJavaCommand)) {
-          System.clearProperty("sun.java.command");
-        } else {
-          System.setProperty("sun.java.command", sunJavaCommand);
+    public static class ServiceNamePrinter {
+        public static void main(String[] args) {
+            if (args.length > 0) {
+                String sunJavaCommand = args[0];
+                if ("null".equals(sunJavaCommand)) {
+                    System.clearProperty("sun.java.command");
+                } else {
+                    System.setProperty("sun.java.command", sunJavaCommand);
+                }
+            }
+            CapturedEnvironment capturedEnv = CapturedEnvironment.get();
+            Map<String, String> props = capturedEnv.getProperties();
+            System.out.println(props.get(GeneralConfig.SERVICE_NAME));
         }
-      }
-      CapturedEnvironment capturedEnv = CapturedEnvironment.get();
-      Map<String, String> props = capturedEnv.getProperties();
-      System.out.println(props.get(GeneralConfig.SERVICE_NAME));
     }
-  }
 }
diff --git a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/AgentArgsInjectorTest.java b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/AgentArgsInjectorTest.java
index f70c00fce02..19ad6acf342 100644
--- a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/AgentArgsInjectorTest.java
+++ b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/AgentArgsInjectorTest.java
@@ -7,19 +7,19 @@
 
 public class AgentArgsInjectorTest {
 
-  @AfterEach
-  void clearInjectedProperties() {
-    System.clearProperty("arg1");
-    System.clearProperty("arg2");
-  }
+    @AfterEach
+    void clearInjectedProperties() {
+        System.clearProperty("arg1");
+        System.clearProperty("arg2");
+    }
 
-  @Test
-  void injectsAgentArgumentsAsSystemProperties() {
-    String agentArgs = "arg1=value1,arg2=value2";
+    @Test
+    void injectsAgentArgumentsAsSystemProperties() {
+        String agentArgs = "arg1=value1,arg2=value2";
 
-    AgentArgsInjector.injectAgentArgsConfig(agentArgs);
+        AgentArgsInjector.injectAgentArgsConfig(agentArgs);
 
-    assertEquals("value1", System.getProperty("arg1"));
-    assertEquals("value2", System.getProperty("arg2"));
-  }
+        assertEquals("value1", System.getProperty("arg1"));
+        assertEquals("value2", System.getProperty("arg2"));
+    }
 }
diff --git a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/AgentArgsParserTest.java b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/AgentArgsParserTest.java
index f89dd8025b5..fcf23a093d1 100644
--- a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/AgentArgsParserTest.java
+++ b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/AgentArgsParserTest.java
@@ -9,27 +9,27 @@
 
 public class AgentArgsParserTest {
 
-  @TableTest({
-    "scenario             | args                    | size | key  | expectedValue    ",
-    "single argument      | key1=value1             | 1    | key1 | value1           ",
-    "multiple arguments   | key1=value1,key2=value2 | 2    | key2 | value2           ",
-    "argument with spaces | key=value with spaces   | 1    | key  | value with spaces"
-  })
-  void parsesArguments(String args, int size, String key, String expectedValue) {
-    Map<String, String> properties = AgentArgsParser.parseAgentArgs(args);
+    @TableTest({
+      "scenario             | args                    | size | key  | expectedValue    ",
+      "single argument      | key1=value1             | 1    | key1 | value1           ",
+      "multiple arguments   | key1=value1,key2=value2 | 2    | key2 | value2           ",
+      "argument with spaces | key=value with spaces   | 1    | key  | value with spaces"
+    })
+    void parsesArguments(String args, int size, String key, String expectedValue) {
+        Map<String, String> properties = AgentArgsParser.parseAgentArgs(args);
 
-    assertNotNull(properties);
-    assertEquals(size, properties.size());
-    assertEquals(expectedValue, properties.get(key));
-  }
+        assertNotNull(properties);
+        assertEquals(size, properties.size());
+        assertEquals(expectedValue, properties.get(key));
+    }
 
-  @TableTest({
-    "scenario     | args          ",
-    "null string  |               ",
-    "empty string | ''            ",
-    "malformed    | key=value,,,=="
-  })
-  void returnsNullForInvalidArguments(String args) {
-    assertNull(AgentArgsParser.parseAgentArgs(args));
-  }
+    @TableTest({
+      "scenario     | args          ",
+      "null string  |               ",
+      "empty string | ''            ",
+      "malformed    | key=value,,,=="
+    })
+    void returnsNullForInvalidArguments(String args) {
+        assertNull(AgentArgsParser.parseAgentArgs(args));
+    }
 }
diff --git a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/ConfigConverterTest.java b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/ConfigConverterTest.java
index 863902ece26..6d067de8c18 100644
--- a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/ConfigConverterTest.java
+++ b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/ConfigConverterTest.java
@@ -11,155 +11,153 @@
 
 public class ConfigConverterTest {
 
-  @TableTest({
-    "scenario     | stringValue | expectedConvertedValue",
-    "true         | true        | true                  ",
-    "TRUE         | TRUE        | true                  ",
-    "True         | True        | true                  ",
-    "1            | 1           | true                  ",
-    "false        | false       | false                 ",
-    "null         |             |                       ",
-    "empty string | ''          |                       ",
-    "0            | 0           | false                 "
-  })
-  void convertBooleanProperties(String stringValue, Boolean expectedConvertedValue) {
-    assertEquals(expectedConvertedValue, ConfigConverter.valueOf(stringValue, Boolean.class));
-  }
+    @TableTest({
+      "scenario     | stringValue | expectedConvertedValue",
+      "true         | true        | true                  ",
+      "TRUE         | TRUE        | true                  ",
+      "True         | True        | true                  ",
+      "1            | 1           | true                  ",
+      "false        | false       | false                 ",
+      "null         |             |                       ",
+      "empty string | ''          |                       ",
+      "0            | 0           | false                 "
+    })
+    void convertBooleanProperties(String stringValue, Boolean expectedConvertedValue) {
+        assertEquals(expectedConvertedValue, ConfigConverter.valueOf(stringValue, Boolean.class));
+    }
 
-  @TableTest({
-    "invalidValue",
-    "42.42       ",
-    "tru         ",
-    "truee       ",
-    "'true '     ",
-    "' true'     ",
-    "' true '    ",
-    "'   true  ' ",
-    "notABool    ",
-    "yes         ",
-    "no          ",
-    "on          ",
-    "off         "
-  })
-  void convertBooleanPropertiesThrowsExceptionForInvalidValues(String invalidValue) {
-    ConfigConverter.InvalidBooleanValueException exception =
-        assertThrows(
-            ConfigConverter.InvalidBooleanValueException.class,
-            () -> ConfigConverter.valueOf(invalidValue, Boolean.class));
-    assertTrue(exception.getMessage().contains("Invalid boolean value:"));
-  }
+    @TableTest({
+      "invalidValue",
+      "42.42       ",
+      "tru         ",
+      "truee       ",
+      "'true '     ",
+      "' true'     ",
+      "' true '    ",
+      "'   true  ' ",
+      "notABool    ",
+      "yes         ",
+      "no          ",
+      "on          ",
+      "off         "
+    })
+    void convertBooleanPropertiesThrowsExceptionForInvalidValues(String invalidValue) {
+        ConfigConverter.InvalidBooleanValueException exception = assertThrows(
+                ConfigConverter.InvalidBooleanValueException.class,
+                () -> ConfigConverter.valueOf(invalidValue, Boolean.class));
+        assertTrue(exception.getMessage().contains("Invalid boolean value:"));
+    }
 
-  @TableTest({
-    "mapString                                     | expected                                        ",
-    "a:1, a:2, a:3                                 | [a: '3']                                        ",
-    "a:b,c:d,e:                                    | [a: b, c: d]                                    ",
-    "a:1  a:2  a:3                                 | [a: '3']                                        ",
-    "a:b c:d e:                                    | [a: b, c: d]                                    ",
-    "a:a;                                          | [a: a;]                                         ",
-    "a:1, a:2, a:3                                 | [a: '3']                                        ",
-    "a:1  a:2  a:3                                 | [a: '3']                                        ",
-    "a:b,c:d,e:                                    | [a: b, c: d]                                    ",
-    "a:b c:d e:                                    | [a: b, c: d]                                    ",
-    "'key 1!:va|ue_1,'                             | [key 1!: 'va|ue_1']                             ",
-    "'key 1!:va|ue_1 '                             | [key 1!: 'va|ue_1']                             ",
-    "' key1 :value1 ,\t key2:  value2'             | [key1: value1, key2: value2]                    ",
-    "a:b, b:c, c:d, d: e                           | [a: b, b: c, c: d, d: e]                        ",
-    "key1 :value1  \t key2:  value2                | [key1: value1, key2: value2]                    ",
-    "dyno:web.1 dynotype:web appname:******        | [dyno: web.1, dynotype: web, appname: ******]   ",
-    "is:val:id                                     | [is: 'val:id']                                  ",
-    "a:b,is:val:id,x:y                             | [a: b, is: 'val:id', x: y]                      ",
-    "a:b:c:d                                       | [a: 'b:c:d']                                    ",
-    "fooa:barb, foob:barc, fooc: bard, food: bare, | [fooa: barb, foob: barc, fooc: bard, food: bare]",
-    "a:b=c=d                                       | [a: b=c=d]                                      ",
-    "a:                                            | [:]                                             ",
-    "a:b,c,d                                       | [:]                                             ",
-    "a:b,c,d,k:v                                   | [:]                                             ",
-    "''                                            | [:]                                             ",
-    "1                                             | [:]                                             ",
-    "a                                             | [:]                                             ",
-    "a,1                                           | [:]                                             ",
-    "!a                                            | [:]                                             ",
-    "'    '                                        | [:]                                             ",
-    ",,,,                                          | [:]                                             ",
-    ":,:,:,:                                       | [:]                                             ",
-    "': : : : '                                    | [:]                                             ",
-    "::::                                          | [:]                                             ",
-    "key1:val1 with_space:and_colon, key2:val2     | [:]                                             "
-  })
-  void parseMapProperly(String mapString, Map<String, String> expected) {
-    assertEquals(expected, ConfigConverter.parseMap(mapString, "test"));
-  }
+    @TableTest({
+      "mapString                                     | expected                                        ",
+      "a:1, a:2, a:3                                 | [a: '3']                                        ",
+      "a:b,c:d,e:                                    | [a: b, c: d]                                    ",
+      "a:1  a:2  a:3                                 | [a: '3']                                        ",
+      "a:b c:d e:                                    | [a: b, c: d]                                    ",
+      "a:a;                                          | [a: a;]                                         ",
+      "a:1, a:2, a:3                                 | [a: '3']                                        ",
+      "a:1  a:2  a:3                                 | [a: '3']                                        ",
+      "a:b,c:d,e:                                    | [a: b, c: d]                                    ",
+      "a:b c:d e:                                    | [a: b, c: d]                                    ",
+      "'key 1!:va|ue_1,'                             | [key 1!: 'va|ue_1']                             ",
+      "'key 1!:va|ue_1 '                             | [key 1!: 'va|ue_1']                             ",
+      "' key1 :value1 ,\t key2:  value2'             | [key1: value1, key2: value2]                    ",
+      "a:b, b:c, c:d, d: e                           | [a: b, b: c, c: d, d: e]                        ",
+      "key1 :value1  \t key2:  value2                | [key1: value1, key2: value2]                    ",
+      "dyno:web.1 dynotype:web appname:******        | [dyno: web.1, dynotype: web, appname: ******]   ",
+      "is:val:id                                     | [is: 'val:id']                                  ",
+      "a:b,is:val:id,x:y                             | [a: b, is: 'val:id', x: y]                      ",
+      "a:b:c:d                                       | [a: 'b:c:d']                                    ",
+      "fooa:barb, foob:barc, fooc: bard, food: bare, | [fooa: barb, foob: barc, fooc: bard, food: bare]",
+      "a:b=c=d                                       | [a: b=c=d]                                      ",
+      "a:                                            | [:]                                             ",
+      "a:b,c,d                                       | [:]                                             ",
+      "a:b,c,d,k:v                                   | [:]                                             ",
+      "''                                            | [:]                                             ",
+      "1                                             | [:]                                             ",
+      "a                                             | [:]                                             ",
+      "a,1                                           | [:]                                             ",
+      "!a                                            | [:]                                             ",
+      "'    '                                        | [:]                                             ",
+      ",,,,                                          | [:]                                             ",
+      ":,:,:,:                                       | [:]                                             ",
+      "': : : : '                                    | [:]                                             ",
+      "::::                                          | [:]                                             ",
+      "key1:val1 with_space:and_colon, key2:val2     | [:]                                             "
+    })
+    void parseMapProperly(String mapString, Map<String, String> expected) {
+        assertEquals(expected, ConfigConverter.parseMap(mapString, "test"));
+    }
 
-  @TableTest({
-    "mapString                                     | separator | expected                                        ",
-    "a=1, a=2, a=3                                 | =         | [a: '3']                                        ",
-    "a=b,c=d,e=                                    | =         | [a: b, c: d]                                    ",
-    "a;b,c;d,e;                                    | ;         | [a: b, c: d]                                    ",
-    "a=1  a=2  a=3                                 | =         | [a: '3']                                        ",
-    "a=b c=d e=                                    | =         | [a: b, c: d]                                    ",
-    "a=b=c=d                                       | =         | [a: b=c=d]                                      ",
-    "fooa=barb, foob=barc, fooc= bard, food= bare, | =         | [fooa: barb, foob: barc, fooc: bard, food: bare]",
-    "a=b:c:d                                       | =         | [a: 'b:c:d']                                    ",
-    "a=                                            | =         | [:]                                             ",
-    "====                                          | =         | [:]                                             "
-  })
-  void parseMapWithSeparator(String mapString, char separator, Map<String, String> expected) {
-    assertEquals(expected, ConfigConverter.parseMap(mapString, "test", separator));
-  }
+    @TableTest({
+      "mapString                                     | separator | expected                                        ",
+      "a=1, a=2, a=3                                 | =         | [a: '3']                                        ",
+      "a=b,c=d,e=                                    | =         | [a: b, c: d]                                    ",
+      "a;b,c;d,e;                                    | ;         | [a: b, c: d]                                    ",
+      "a=1  a=2  a=3                                 | =         | [a: '3']                                        ",
+      "a=b c=d e=                                    | =         | [a: b, c: d]                                    ",
+      "a=b=c=d                                       | =         | [a: b=c=d]                                      ",
+      "fooa=barb, foob=barc, fooc= bard, food= bare, | =         | [fooa: barb, foob: barc, fooc: bard, food: bare]",
+      "a=b:c:d                                       | =         | [a: 'b:c:d']                                    ",
+      "a=                                            | =         | [:]                                             ",
+      "====                                          | =         | [:]                                             "
+    })
+    void parseMapWithSeparator(String mapString, char separator, Map<String, String> expected) {
+        assertEquals(expected, ConfigConverter.parseMap(mapString, "test", separator));
+    }
 
-  @TableTest({
-    "mapString                                | separator | expected                                           ",
-    "key1:value1,key2:value2                  | :         | [key1: value1, key2: value2]                       ",
-    "key1:value1 key2:value2                  | :         | [key1: value1, key2: value2]                       ",
-    "env:test aKey:aVal bKey:bVal cKey:       | :         | [env: test, aKey: aVal, bKey: bVal, cKey: '']      ",
-    "env:test,aKey:aVal,bKey:bVal,cKey:       | :         | [env: test, aKey: aVal, bKey: bVal, cKey: '']      ",
-    "env:test,aKey:aVal bKey:bVal cKey:       | :         | [env: test, aKey: 'aVal bKey:bVal cKey:']          ",
-    "env:test     bKey :bVal dKey: dVal cKey: | :         | [env: test, bKey: '', dKey: '', dVal: '', cKey: '']",
-    "env :test, aKey : aVal bKey:bVal cKey:   | :         | [env: test, aKey: 'aVal bKey:bVal cKey:']          ",
-    "env:keyWithA:Semicolon bKey:bVal cKey    | :         | [env: 'keyWithA:Semicolon', bKey: bVal, cKey: '']  ",
-    "env:keyWith:  , ,   Lots:Of:Semicolons   | :         | [env: 'keyWith:', Lots: 'Of:Semicolons']           ",
-    "a:b,c,d                                  | :         | [a: b, c: '', d: '']                               ",
-    "a,1                                      | :         | [a: '', 1: '']                                     ",
-    "a:b:c:d                                  | :         | [a: 'b:c:d']                                       ",
-    "noDelimiters                             | :         | [noDelimiters: '']                                 ",
-    "'            '                           | :         | [:]                                                ",
-    ",,,,,,,,,,,,                             | :         | [:]                                                ",
-    "', , , , , , '                           | :         | [:]                                                "
-  })
-  void parsingMapWithListOfArgSeparatorsForWithKeyValueSeparator(
-      String mapString, char separator, Map<String, String> expected) {
-    // testing parsing for DD_TAGS
-    List<Character> separatorList = Arrays.asList(',', ' ');
-    assertEquals(expected, ConfigConverter.parseTraceTagsMap(mapString, separator, separatorList));
-  }
+    @TableTest({
+      "mapString                                | separator | expected                                           ",
+      "key1:value1,key2:value2                  | :         | [key1: value1, key2: value2]                       ",
+      "key1:value1 key2:value2                  | :         | [key1: value1, key2: value2]                       ",
+      "env:test aKey:aVal bKey:bVal cKey:       | :         | [env: test, aKey: aVal, bKey: bVal, cKey: '']      ",
+      "env:test,aKey:aVal,bKey:bVal,cKey:       | :         | [env: test, aKey: aVal, bKey: bVal, cKey: '']      ",
+      "env:test,aKey:aVal bKey:bVal cKey:       | :         | [env: test, aKey: 'aVal bKey:bVal cKey:']          ",
+      "env:test     bKey :bVal dKey: dVal cKey: | :         | [env: test, bKey: '', dKey: '', dVal: '', cKey: '']",
+      "env :test, aKey : aVal bKey:bVal cKey:   | :         | [env: test, aKey: 'aVal bKey:bVal cKey:']          ",
+      "env:keyWithA:Semicolon bKey:bVal cKey    | :         | [env: 'keyWithA:Semicolon', bKey: bVal, cKey: '']  ",
+      "env:keyWith:  , ,   Lots:Of:Semicolons   | :         | [env: 'keyWith:', Lots: 'Of:Semicolons']           ",
+      "a:b,c,d                                  | :         | [a: b, c: '', d: '']                               ",
+      "a,1                                      | :         | [a: '', 1: '']                                     ",
+      "a:b:c:d                                  | :         | [a: 'b:c:d']                                       ",
+      "noDelimiters                             | :         | [noDelimiters: '']                                 ",
+      "'            '                           | :         | [:]                                                ",
+      ",,,,,,,,,,,,                             | :         | [:]                                                ",
+      "', , , , , , '                           | :         | [:]                                                "
+    })
+    void parsingMapWithListOfArgSeparatorsForWithKeyValueSeparator(
+            String mapString, char separator, Map<String, String> expected) {
+        // testing parsing for DD_TAGS
+        List<Character> separatorList = Arrays.asList(',', ' ');
+        assertEquals(expected, ConfigConverter.parseTraceTagsMap(mapString, separator, separatorList));
+    }
 
-  @TableTest({
-    "mapString                     | expected                             | lowercaseKeys | defaultPrefix           ",
-    "header1:one,header2:two       | [header1: one, header2: two]         | false         | ''                      ",
-    "header1:one, header2:two      | [header1: one, header2: two]         | false         | ''                      ",
-    "header1,header2:two           | [header1: header1, header2: two]     | false         | ''                      ",
-    "Header1:one,header2:two       | [header1: one, header2: two]         | true          | ''                      ",
-    "'\"header1:one,header2:two\"' | ['\"header1': one, header2: 'two\"'] | true          | ''                      ",
-    "header1                       | [header1: header1]                   | true          | ''                      ",
-    ",header1:tag                  | [header1: tag]                       | true          | ''                      ",
-    "header1:tag,                  | [header1: tag]                       | true          | ''                      ",
-    "header:tag:value              | [header: 'tag:value']                | true          | ''                      ",
-    "''                            | [:]                                  | true          | ''                      ",
-    "                              | [:]                                  | true          | ''                      ",
-    "*                             | [*: 'datadog.response.headers.']     | true          | datadog.response.headers",
-    "*:                            | [:]                                  | true          | datadog.response.headers",
-    "*,header1:tag                 | [*: 'datadog.response.headers.']     | true          | datadog.response.headers",
-    "header1:tag,*                 | [*: 'datadog.response.headers.']     | true          | datadog.response.headers",
-    "1header,header2:two           | [:]                                  | true          | ''                      ",
-    "header::tag                   | [:]                                  | true          | ''                      ",
-    ":tag                          | [:]                                  | true          | ''                      ",
-    "header:tag,:tag               | [:]                                  | true          | ''                      "
-  })
-  void testParseMapWithOptionalMappings(
-      String mapString, Map<String, String> expected, boolean lowercaseKeys, String defaultPrefix) {
-    assertEquals(
-        expected,
-        ConfigConverter.parseMapWithOptionalMappings(
-            mapString, "test", defaultPrefix, lowercaseKeys));
-  }
+    @TableTest({
+      "mapString                     | expected                             | lowercaseKeys | defaultPrefix           ",
+      "header1:one,header2:two       | [header1: one, header2: two]         | false         | ''                      ",
+      "header1:one, header2:two      | [header1: one, header2: two]         | false         | ''                      ",
+      "header1,header2:two           | [header1: header1, header2: two]     | false         | ''                      ",
+      "Header1:one,header2:two       | [header1: one, header2: two]         | true          | ''                      ",
+      "'\"header1:one,header2:two\"' | ['\"header1': one, header2: 'two\"'] | true          | ''                      ",
+      "header1                       | [header1: header1]                   | true          | ''                      ",
+      ",header1:tag                  | [header1: tag]                       | true          | ''                      ",
+      "header1:tag,                  | [header1: tag]                       | true          | ''                      ",
+      "header:tag:value              | [header: 'tag:value']                | true          | ''                      ",
+      "''                            | [:]                                  | true          | ''                      ",
+      "                              | [:]                                  | true          | ''                      ",
+      "*                             | [*: 'datadog.response.headers.']     | true          | datadog.response.headers",
+      "*:                            | [:]                                  | true          | datadog.response.headers",
+      "*,header1:tag                 | [*: 'datadog.response.headers.']     | true          | datadog.response.headers",
+      "header1:tag,*                 | [*: 'datadog.response.headers.']     | true          | datadog.response.headers",
+      "1header,header2:two           | [:]                                  | true          | ''                      ",
+      "header::tag                   | [:]                                  | true          | ''                      ",
+      ":tag                          | [:]                                  | true          | ''                      ",
+      "header:tag,:tag               | [:]                                  | true          | ''                      "
+    })
+    void testParseMapWithOptionalMappings(
+            String mapString, Map<String, String> expected, boolean lowercaseKeys, String defaultPrefix) {
+        assertEquals(
+                expected,
+                ConfigConverter.parseMapWithOptionalMappings(mapString, "test", defaultPrefix, lowercaseKeys));
+    }
 }
diff --git a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/PropertiesConfigSourceTest.java b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/PropertiesConfigSourceTest.java
index cbfdc31c3d5..4b34b41d3d6 100644
--- a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/PropertiesConfigSourceTest.java
+++ b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/PropertiesConfigSourceTest.java
@@ -10,24 +10,24 @@
 
 public class PropertiesConfigSourceTest extends DDJavaSpecification {
 
-  @Test
-  void throwsWhenPropertiesAreNull() {
-    assertThrows(AssertionError.class, () -> new PropertiesConfigSource(null, true));
-  }
+    @Test
+    void throwsWhenPropertiesAreNull() {
+        assertThrows(AssertionError.class, () -> new PropertiesConfigSource(null, true));
+    }
 
-  @TableTest({
-    "scenario    | usePrefix | abc | ddAbc | missing",
-    "no prefix   | false     | def | xyz   |        ",
-    "with prefix | true      | xyz |       |        "
-  })
-  void configPulledFromProperties(boolean usePrefix, String abc, String ddAbc, String missing) {
-    Properties props = new Properties();
-    props.put("abc", "def");
-    props.put("dd.abc", "xyz");
-    PropertiesConfigSource source = new PropertiesConfigSource(props, usePrefix);
+    @TableTest({
+      "scenario    | usePrefix | abc | ddAbc | missing",
+      "no prefix   | false     | def | xyz   |        ",
+      "with prefix | true      | xyz |       |        "
+    })
+    void configPulledFromProperties(boolean usePrefix, String abc, String ddAbc, String missing) {
+        Properties props = new Properties();
+        props.put("abc", "def");
+        props.put("dd.abc", "xyz");
+        PropertiesConfigSource source = new PropertiesConfigSource(props, usePrefix);
 
-    assertEquals(abc, source.get("abc"));
-    assertEquals(ddAbc, source.get("dd.abc"));
-    assertEquals(missing, source.get("missing"));
-  }
+        assertEquals(abc, source.get("abc"));
+        assertEquals(ddAbc, source.get("dd.abc"));
+        assertEquals(missing, source.get("missing"));
+    }
 }
diff --git a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/StableConfigMappingExceptionTest.java b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/StableConfigMappingExceptionTest.java
index 8b2476197f3..535d73c16c2 100644
--- a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/StableConfigMappingExceptionTest.java
+++ b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/StableConfigMappingExceptionTest.java
@@ -11,50 +11,45 @@
 
 public class StableConfigMappingExceptionTest {
 
-  @Test
-  void constructorsWorkAsExpected() {
-    StableConfigMappingException ex1 = new StableConfigMappingException("msg");
-    StableConfigMappingException ex2 = new StableConfigMappingException("msg2");
-
-    assertEquals("msg", ex1.getMessage());
-    assertNull(ex1.getCause());
-    assertEquals("msg2", ex2.getMessage());
-  }
-
-  @Test
-  void safeToStringHandlesNull() {
-    StableConfigMappingException ex =
-        assertThrows(
-            StableConfigMappingException.class,
-            () -> StableConfigMappingException.throwStableConfigMappingException("msg", null));
-    assertTrue(ex.getMessage().endsWith(" null"));
-  }
-
-  @Test
-  void safeToStringHandlesShortString() {
-    StableConfigMappingException ex =
-        assertThrows(
-            StableConfigMappingException.class,
-            () ->
-                StableConfigMappingException.throwStableConfigMappingException(
-                    "msg", "short string"));
-    assertTrue(ex.getMessage().endsWith(" short string"));
-  }
-
-  @Test
-  void safeToStringHandlesLongString() {
-    char[] chars = new char[101];
-    Arrays.fill(chars, 'a');
-    String longStr = new String(chars);
-
-    StableConfigMappingException ex =
-        assertThrows(
-            StableConfigMappingException.class,
-            () -> StableConfigMappingException.throwStableConfigMappingException("msg", longStr));
-
-    char[] halfChars = new char[50];
-    Arrays.fill(halfChars, 'a');
-    String half = new String(halfChars);
-    assertTrue(ex.getMessage().endsWith(" " + half + "...(truncated)..." + half));
-  }
+    @Test
+    void constructorsWorkAsExpected() {
+        StableConfigMappingException ex1 = new StableConfigMappingException("msg");
+        StableConfigMappingException ex2 = new StableConfigMappingException("msg2");
+
+        assertEquals("msg", ex1.getMessage());
+        assertNull(ex1.getCause());
+        assertEquals("msg2", ex2.getMessage());
+    }
+
+    @Test
+    void safeToStringHandlesNull() {
+        StableConfigMappingException ex = assertThrows(
+                StableConfigMappingException.class,
+                () -> StableConfigMappingException.throwStableConfigMappingException("msg", null));
+        assertTrue(ex.getMessage().endsWith(" null"));
+    }
+
+    @Test
+    void safeToStringHandlesShortString() {
+        StableConfigMappingException ex = assertThrows(
+                StableConfigMappingException.class,
+                () -> StableConfigMappingException.throwStableConfigMappingException("msg", "short string"));
+        assertTrue(ex.getMessage().endsWith(" short string"));
+    }
+
+    @Test
+    void safeToStringHandlesLongString() {
+        char[] chars = new char[101];
+        Arrays.fill(chars, 'a');
+        String longStr = new String(chars);
+
+        StableConfigMappingException ex = assertThrows(
+                StableConfigMappingException.class,
+                () -> StableConfigMappingException.throwStableConfigMappingException("msg", longStr));
+
+        char[] halfChars = new char[50];
+        Arrays.fill(halfChars, 'a');
+        String half = new String(halfChars);
+        assertTrue(ex.getMessage().endsWith(" " + half + "...(truncated)..." + half));
+    }
 }
diff --git a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/StableConfigSourceTest.java b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/StableConfigSourceTest.java
index 8ca3989ba7f..33691e87f7e 100644
--- a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/StableConfigSourceTest.java
+++ b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/StableConfigSourceTest.java
@@ -36,315 +36,305 @@
 @SuppressForbidden
 public class StableConfigSourceTest extends DDJavaSpecification {
 
-  @Test
-  void testFileDoesntExist() {
-    StableConfigSource config =
-        new StableConfigSource(
-            StableConfigSource.LOCAL_STABLE_CONFIG_PATH, ConfigOrigin.LOCAL_STABLE_CONFIG);
-
-    assertEquals(0, config.getKeys().size());
-    assertNull(config.getConfigId());
-  }
-
-  @Test
-  void testEmptyFile() throws IOException {
-    Path filePath = Files.createTempFile("testFile_", ".yaml");
-    try {
-      StableConfigSource config =
-          new StableConfigSource(filePath.toString(), ConfigOrigin.LOCAL_STABLE_CONFIG);
-      assertEquals(0, config.getKeys().size());
-      assertNull(config.getConfigId());
-    } finally {
-      Files.delete(filePath);
+    @Test
+    void testFileDoesntExist() {
+        StableConfigSource config =
+                new StableConfigSource(StableConfigSource.LOCAL_STABLE_CONFIG_PATH, ConfigOrigin.LOCAL_STABLE_CONFIG);
+
+        assertEquals(0, config.getKeys().size());
+        assertNull(config.getConfigId());
     }
-  }
-
-  @TableTest({
-    "scenario       | configId | data                    ",
-    "corrupt yaml   |          | not_valid_stable_config ",
-    "invalid format | 12345    | this is not yaml format!"
-  })
-  void testFileInvalidFormat(String configId, String data) throws IOException {
-    Path filePath = Files.createTempFile("testFile_", ".yaml");
-    assertNotNull(filePath, "Failed to create: " + filePath);
-    try {
-      writeFileRaw(filePath, configId, data);
-      StableConfigSource stableCfg =
-          new StableConfigSource(filePath.toString(), ConfigOrigin.LOCAL_STABLE_CONFIG);
-
-      assertNull(stableCfg.getConfigId());
-      assertEquals(0, stableCfg.getKeys().size());
-    } finally {
-      Files.delete(filePath);
+
+    @Test
+    void testEmptyFile() throws IOException {
+        Path filePath = Files.createTempFile("testFile_", ".yaml");
+        try {
+            StableConfigSource config = new StableConfigSource(filePath.toString(), ConfigOrigin.LOCAL_STABLE_CONFIG);
+            assertEquals(0, config.getKeys().size());
+            assertNull(config.getConfigId());
+        } finally {
+            Files.delete(filePath);
+        }
     }
-  }
-
-  @Test
-  void testNullValuesInYaml() throws IOException {
-    Path filePath = Files.createTempFile("testFile_", ".yaml");
-    assertNotNull(filePath, "Failed to create: " + filePath);
-    try {
-      // Test the scenario where YAML contains null values for apm_configuration_default and
-      // apm_configuration_rules
-      String yaml = "config_id: \"12345\"\napm_configuration_default:\napm_configuration_rules:\n";
-      Files.write(filePath, yaml.getBytes());
-
-      StableConfigSource stableCfg =
-          new StableConfigSource(filePath.toString(), ConfigOrigin.LOCAL_STABLE_CONFIG);
-
-      // Should not throw NullPointerException and should handle null values gracefully
-      assertEquals("12345", stableCfg.getConfigId());
-      assertEquals(0, stableCfg.getKeys().size());
-    } finally {
-      Files.delete(filePath);
+
+    @TableTest({
+      "scenario       | configId | data                    ",
+      "corrupt yaml   |          | not_valid_stable_config ",
+      "invalid format | 12345    | this is not yaml format!"
+    })
+    void testFileInvalidFormat(String configId, String data) throws IOException {
+        Path filePath = Files.createTempFile("testFile_", ".yaml");
+        assertNotNull(filePath, "Failed to create: " + filePath);
+        try {
+            writeFileRaw(filePath, configId, data);
+            StableConfigSource stableCfg =
+                    new StableConfigSource(filePath.toString(), ConfigOrigin.LOCAL_STABLE_CONFIG);
+
+            assertNull(stableCfg.getConfigId());
+            assertEquals(0, stableCfg.getKeys().size());
+        } finally {
+            Files.delete(filePath);
+        }
     }
-  }
-
-  @TableTest({
-    "configId | defaultConfigs                    ",
-    "''       | [:]                               ",
-    "12345    | [DD_KEY_ONE: one, DD_KEY_TWO: two]"
-  })
-  void testFileValidFormat(String configId, Map<String, String> defaultConfigs) throws IOException {
-    Path filePath = Files.createTempFile("testFile_", ".yaml");
-    try {
-      writeFileYaml(filePath, configId, defaultConfigs);
-      StableConfigSource stableCfg =
-          new StableConfigSource(filePath.toString(), ConfigOrigin.LOCAL_STABLE_CONFIG);
-
-      assertEquals(configId.isEmpty() ? null : configId, stableCfg.getConfigId());
-      assertEquals(defaultConfigs.keySet(), stableCfg.getKeys());
-      defaultConfigs.forEach(
-          (key, value) -> assertEquals(value, stableCfg.get(key.substring("DD_".length()))));
-    } finally {
-      Files.delete(filePath);
+
+    @Test
+    void testNullValuesInYaml() throws IOException {
+        Path filePath = Files.createTempFile("testFile_", ".yaml");
+        assertNotNull(filePath, "Failed to create: " + filePath);
+        try {
+            // Test the scenario where YAML contains null values for apm_configuration_default and
+            // apm_configuration_rules
+            String yaml = "config_id: \"12345\"\napm_configuration_default:\napm_configuration_rules:\n";
+            Files.write(filePath, yaml.getBytes());
+
+            StableConfigSource stableCfg =
+                    new StableConfigSource(filePath.toString(), ConfigOrigin.LOCAL_STABLE_CONFIG);
+
+            // Should not throw NullPointerException and should handle null values gracefully
+            assertEquals("12345", stableCfg.getConfigId());
+            assertEquals(0, stableCfg.getKeys().size());
+        } finally {
+            Files.delete(filePath);
+        }
     }
-  }
-
-  @ParameterizedTest
-  @MethodSource("testParseInvalidLogsMappingErrorsArguments")
-  void testParseInvalidLogsMappingErrors(String yaml, String expectedLogSubstring)
-      throws IOException {
-    Logger logbackLogger = (Logger) LoggerFactory.getLogger(StableConfigSource.class);
-    ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
-    listAppender.start();
-    logbackLogger.addAppender(listAppender);
-
-    File tempFile = File.createTempFile("testFile_", ".yaml");
-    try {
-      Files.write(tempFile.toPath(), yaml.getBytes());
-
-      StableConfigSource stableCfg =
-          new StableConfigSource(tempFile.getAbsolutePath(), ConfigOrigin.LOCAL_STABLE_CONFIG);
-
-      assertNull(stableCfg.getConfigId());
-      assertEquals(0, stableCfg.getKeys().size());
-      boolean hasExpectedLog =
-          listAppender.list.stream()
-              .anyMatch(
-                  event ->
-                      "WARN".equals(event.getLevel().toString())
-                          && event.getFormattedMessage().contains(expectedLogSubstring));
-      assertTrue(hasExpectedLog, "Expected WARN log containing: " + expectedLogSubstring);
-    } finally {
-      tempFile.delete();
-      logbackLogger.detachAppender(listAppender);
+
+    @TableTest({
+      "configId | defaultConfigs                    ",
+      "''       | [:]                               ",
+      "12345    | [DD_KEY_ONE: one, DD_KEY_TWO: two]"
+    })
+    void testFileValidFormat(String configId, Map<String, String> defaultConfigs) throws IOException {
+        Path filePath = Files.createTempFile("testFile_", ".yaml");
+        try {
+            writeFileYaml(filePath, configId, defaultConfigs);
+            StableConfigSource stableCfg =
+                    new StableConfigSource(filePath.toString(), ConfigOrigin.LOCAL_STABLE_CONFIG);
+
+            assertEquals(configId.isEmpty() ? null : configId, stableCfg.getConfigId());
+            assertEquals(defaultConfigs.keySet(), stableCfg.getKeys());
+            defaultConfigs.forEach((key, value) -> assertEquals(value, stableCfg.get(key.substring("DD_".length()))));
+        } finally {
+            Files.delete(filePath);
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("testParseInvalidLogsMappingErrorsArguments")
+    void testParseInvalidLogsMappingErrors(String yaml, String expectedLogSubstring) throws IOException {
+        Logger logbackLogger = (Logger) LoggerFactory.getLogger(StableConfigSource.class);
+        ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
+        listAppender.start();
+        logbackLogger.addAppender(listAppender);
+
+        File tempFile = File.createTempFile("testFile_", ".yaml");
+        try {
+            Files.write(tempFile.toPath(), yaml.getBytes());
+
+            StableConfigSource stableCfg =
+                    new StableConfigSource(tempFile.getAbsolutePath(), ConfigOrigin.LOCAL_STABLE_CONFIG);
+
+            assertNull(stableCfg.getConfigId());
+            assertEquals(0, stableCfg.getKeys().size());
+            boolean hasExpectedLog = listAppender.list.stream()
+                    .anyMatch(event -> "WARN".equals(event.getLevel().toString())
+                            && event.getFormattedMessage().contains(expectedLogSubstring));
+            assertTrue(hasExpectedLog, "Expected WARN log containing: " + expectedLogSubstring);
+        } finally {
+            tempFile.delete();
+            logbackLogger.detachAppender(listAppender);
+        }
+    }
+
+    static Stream<Arguments> testParseInvalidLogsMappingErrorsArguments() {
+        return Stream.of(
+                arguments(
+                        "apm_configuration_rules:\n"
+                                + "      - selectors:\n"
+                                + "          - key: \"someKey\"\n"
+                                + "            matches: [\"someValue\"]\n"
+                                + "            operator: equals\n"
+                                + "        configuration:\n"
+                                + "          DD_SERVICE: \"test\"\n",
+                        "Missing 'origin' in selector"),
+                arguments(
+                        "apm_configuration_rules:\n"
+                                + "      - selectors:\n"
+                                + "          - origin: process_arguments\n"
+                                + "            key: \"-Dfoo\"\n"
+                                + "            matches: [\"bar\"]\n"
+                                + "            operator: equals\n",
+                        "Missing 'configuration' in rule"),
+                arguments(
+                        "apm_configuration_rules:\n"
+                                + "       - configuration:\n"
+                                + "           DD_SERVICE: \"test\"\n",
+                        "Missing 'selectors' in rule"),
+                arguments(
+                        "apm_configuration_rules:\n"
+                                + "      - selectors: \"not-a-list\"\n"
+                                + "        configuration:\n"
+                                + "          DD_SERVICE: \"test\"\n",
+                        "'selectors' must be a list, but got: String"),
+                arguments(
+                        "apm_configuration_rules:\n"
+                                + "       - selectors:\n"
+                                + "           - \"not-a-map\"\n"
+                                + "         configuration:\n"
+                                + "           DD_SERVICE: \"test\"\n",
+                        "Each selector must be a map, but got: String"),
+                arguments(
+                        "apm_configuration_rules:\n"
+                                + "      - selectors:\n"
+                                + "          - origin: process_arguments\n"
+                                + "            key: \"-Dfoo\"\n"
+                                + "            matches: [\"bar\"]\n"
+                                + "            operator: equals\n"
+                                + "        configuration: \"not-a-map\"\n",
+                        "'configuration' must be a map, but got: String"),
+                arguments(
+                        "apm_configuration_rules:\n"
+                                + "      - selectors:\n"
+                                + "          - origin: process_arguments\n"
+                                + "            key: \"-Dfoo\"\n"
+                                + "            matches: [\"bar\"]\n"
+                                + "            operator: equals\n"
+                                + "        configuration: 12345\n",
+                        "'configuration' must be a map, but got: Integer"),
+                arguments(
+                        "apm_configuration_rules:\n" + "      - \"not-a-map\"\n",
+                        "Rule must be a map, but got: String"),
+                arguments(
+                        "apm_configuration_rules:\n"
+                                + "     - selectors:\n"
+                                + "         - origin: process_arguments\n"
+                                + "           key: \"-Dfoo\"\n"
+                                + "           matches: \"not-a-list\"\n"
+                                + "           operator: equals\n"
+                                + "       configuration:\n"
+                                + "         DD_SERVICE: \"test\"\n",
+                        "'matches' must be a list, but got: String"),
+                arguments(
+                        "apm_configuration_rules:\n"
+                                + "     - selectors:\n"
+                                + "         - origin: process_arguments\n"
+                                + "           key: \"-Dfoo\"\n"
+                                + "           matches: [\"bar\"]\n"
+                                + "       configuration:\n"
+                                + "         DD_SERVICE: \"test\"\n",
+                        "Missing 'operator' in selector"),
+                arguments(
+                        "apm_configuration_rules:\n"
+                                + "     - selectors:\n"
+                                + "         - origin: process_arguments\n"
+                                + "           key: \"-Dfoo\"\n"
+                                + "           matches: [\"bar\"]\n"
+                                + "           operator: 12345\n"
+                                + "       configuration:\n"
+                                + "         DD_SERVICE: \"test\"\n",
+                        "'operator' must be a string, but got: Integer"),
+                arguments(
+                        "apm_configuration_rules:\n"
+                                + "      - selectors:\n"
+                                + "          # origin is missing entirely, should trigger NullPointerException\n"
+                                + "          - key: \"-Dfoo\"\n"
+                                + "            matches: [\"bar\"]\n"
+                                + "            operator: equals\n",
+                        "YAML mapping error in stable configuration file"));
     }
-  }
-
-  static Stream<Arguments> testParseInvalidLogsMappingErrorsArguments() {
-    return Stream.of(
-        arguments(
-            "apm_configuration_rules:\n"
-                + "      - selectors:\n"
-                + "          - key: \"someKey\"\n"
-                + "            matches: [\"someValue\"]\n"
-                + "            operator: equals\n"
-                + "        configuration:\n"
-                + "          DD_SERVICE: \"test\"\n",
-            "Missing 'origin' in selector"),
-        arguments(
-            "apm_configuration_rules:\n"
-                + "      - selectors:\n"
-                + "          - origin: process_arguments\n"
-                + "            key: \"-Dfoo\"\n"
-                + "            matches: [\"bar\"]\n"
-                + "            operator: equals\n",
-            "Missing 'configuration' in rule"),
-        arguments(
-            "apm_configuration_rules:\n"
-                + "       - configuration:\n"
-                + "           DD_SERVICE: \"test\"\n",
-            "Missing 'selectors' in rule"),
-        arguments(
-            "apm_configuration_rules:\n"
-                + "      - selectors: \"not-a-list\"\n"
-                + "        configuration:\n"
-                + "          DD_SERVICE: \"test\"\n",
-            "'selectors' must be a list, but got: String"),
-        arguments(
-            "apm_configuration_rules:\n"
-                + "       - selectors:\n"
-                + "           - \"not-a-map\"\n"
-                + "         configuration:\n"
-                + "           DD_SERVICE: \"test\"\n",
-            "Each selector must be a map, but got: String"),
-        arguments(
-            "apm_configuration_rules:\n"
-                + "      - selectors:\n"
-                + "          - origin: process_arguments\n"
-                + "            key: \"-Dfoo\"\n"
-                + "            matches: [\"bar\"]\n"
-                + "            operator: equals\n"
-                + "        configuration: \"not-a-map\"\n",
-            "'configuration' must be a map, but got: String"),
-        arguments(
-            "apm_configuration_rules:\n"
-                + "      - selectors:\n"
-                + "          - origin: process_arguments\n"
-                + "            key: \"-Dfoo\"\n"
-                + "            matches: [\"bar\"]\n"
-                + "            operator: equals\n"
-                + "        configuration: 12345\n",
-            "'configuration' must be a map, but got: Integer"),
-        arguments(
-            "apm_configuration_rules:\n" + "      - \"not-a-map\"\n",
-            "Rule must be a map, but got: String"),
-        arguments(
-            "apm_configuration_rules:\n"
-                + "     - selectors:\n"
-                + "         - origin: process_arguments\n"
-                + "           key: \"-Dfoo\"\n"
-                + "           matches: \"not-a-list\"\n"
-                + "           operator: equals\n"
-                + "       configuration:\n"
-                + "         DD_SERVICE: \"test\"\n",
-            "'matches' must be a list, but got: String"),
-        arguments(
-            "apm_configuration_rules:\n"
-                + "     - selectors:\n"
-                + "         - origin: process_arguments\n"
-                + "           key: \"-Dfoo\"\n"
-                + "           matches: [\"bar\"]\n"
-                + "       configuration:\n"
-                + "         DD_SERVICE: \"test\"\n",
-            "Missing 'operator' in selector"),
-        arguments(
-            "apm_configuration_rules:\n"
-                + "     - selectors:\n"
-                + "         - origin: process_arguments\n"
-                + "           key: \"-Dfoo\"\n"
-                + "           matches: [\"bar\"]\n"
-                + "           operator: 12345\n"
-                + "       configuration:\n"
-                + "         DD_SERVICE: \"test\"\n",
-            "'operator' must be a string, but got: Integer"),
-        arguments(
-            "apm_configuration_rules:\n"
-                + "      - selectors:\n"
-                + "          # origin is missing entirely, should trigger NullPointerException\n"
-                + "          - key: \"-Dfoo\"\n"
-                + "            matches: [\"bar\"]\n"
-                + "            operator: equals\n",
-            "YAML mapping error in stable configuration file"));
-  }
-
-  @Test
-  @SuppressForbidden
-  void testConfigIdExistsInConfigCollectorWhenUsingStableConfigSource() throws Exception {
-    Path filePath = Files.createTempFile("testFile_", ".yaml");
-    String expectedConfigId = "123";
-
-    // Create YAML content with config_id and some configuration
-    String yamlContent =
-        "config_id: "
-            + expectedConfigId
-            + "\napm_configuration_default:\n  DD_SERVICE: test-service\n  DD_ENV: test-env\n";
-    Files.write(filePath, yamlContent.getBytes());
-
-    // Clear any existing collected config
-    ConfigCollector.get().collect();
-
-    try {
-      StableConfigSource stableConfigSource =
-          new StableConfigSource(filePath.toString(), ConfigOrigin.LOCAL_STABLE_CONFIG);
-
-      // Create ConfigProvider via reflection (constructor is private)
-      Constructor<ConfigProvider> constructor =
-          ConfigProvider.class.getDeclaredConstructor(ConfigProvider.Source[].class);
-      constructor.setAccessible(true);
-      ConfigProvider configProvider =
-          constructor.newInstance((Object) new ConfigProvider.Source[] {stableConfigSource});
-
-      // Trigger config collection by getting a value
-      configProvider.getString("SERVICE", "default-service");
-
-      Map<ConfigOrigin, Map<String, ConfigSetting>> collectedConfigs =
-          ConfigCollector.get().collect();
-      Map<String, ConfigSetting> localStableConfigs =
-          collectedConfigs.get(ConfigOrigin.LOCAL_STABLE_CONFIG);
-      assertNotNull(localStableConfigs, "No configs collected for LOCAL_STABLE_CONFIG origin");
-      ConfigSetting serviceSetting = localStableConfigs.get("SERVICE");
-      assertNotNull(serviceSetting, "No SERVICE setting collected");
-      assertEquals(expectedConfigId, serviceSetting.configId);
-      assertEquals("test-service", serviceSetting.value);
-      assertEquals(ConfigOrigin.LOCAL_STABLE_CONFIG, serviceSetting.origin);
-    } finally {
-      Files.delete(filePath);
+
+    @Test
+    @SuppressForbidden
+    void testConfigIdExistsInConfigCollectorWhenUsingStableConfigSource() throws Exception {
+        Path filePath = Files.createTempFile("testFile_", ".yaml");
+        String expectedConfigId = "123";
+
+        // Create YAML content with config_id and some configuration
+        String yamlContent = "config_id: "
+                + expectedConfigId
+                + "\napm_configuration_default:\n  DD_SERVICE: test-service\n  DD_ENV: test-env\n";
+        Files.write(filePath, yamlContent.getBytes());
+
+        // Clear any existing collected config
+        ConfigCollector.get().collect();
+
+        try {
+            StableConfigSource stableConfigSource =
+                    new StableConfigSource(filePath.toString(), ConfigOrigin.LOCAL_STABLE_CONFIG);
+
+            // Create ConfigProvider via reflection (constructor is private)
+            Constructor<ConfigProvider> constructor =
+                    ConfigProvider.class.getDeclaredConstructor(ConfigProvider.Source[].class);
+            constructor.setAccessible(true);
+            ConfigProvider configProvider =
+                    constructor.newInstance((Object) new ConfigProvider.Source[] {stableConfigSource});
+
+            // Trigger config collection by getting a value
+            configProvider.getString("SERVICE", "default-service");
+
+            Map<ConfigOrigin, Map<String, ConfigSetting>> collectedConfigs =
+                    ConfigCollector.get().collect();
+            Map<String, ConfigSetting> localStableConfigs = collectedConfigs.get(ConfigOrigin.LOCAL_STABLE_CONFIG);
+            assertNotNull(localStableConfigs, "No configs collected for LOCAL_STABLE_CONFIG origin");
+            ConfigSetting serviceSetting = localStableConfigs.get("SERVICE");
+            assertNotNull(serviceSetting, "No SERVICE setting collected");
+            assertEquals(expectedConfigId, serviceSetting.configId);
+            assertEquals("test-service", serviceSetting.value);
+            assertEquals(ConfigOrigin.LOCAL_STABLE_CONFIG, serviceSetting.origin);
+        } finally {
+            Files.delete(filePath);
+        }
     }
-  }
-
-  @Test
-  void testStableConfigGetHandlesPresentAndMissingKeys() {
-    Map<String, Object> configMap = new HashMap<>();
-    configMap.put("DD_SERVICE", "test-service");
-    configMap.put("DD_PORT", 8126);
-
-    StableConfigSource.StableConfig config =
-        new StableConfigSource.StableConfig("config-123", configMap);
-
-    // Present String value: hits the non-null branch of the ternary in get()
-    assertEquals("test-service", config.get("DD_SERVICE"));
-    // Present non-String value: exercises String.valueOf on a non-null, non-String object
-    assertEquals("8126", config.get("DD_PORT"));
-    // Missing key: hits the null branch of the ternary in get()
-    assertNull(config.get("DD_MISSING"));
-
-    assertEquals("config-123", config.getConfigId());
-    assertEquals(configMap.keySet(), config.getKeys());
-  }
-
-  @Test
-  void testStableConfigEmpty() {
-    StableConfigSource.StableConfig empty = StableConfigSource.StableConfig.EMPTY;
-    assertNull(empty.get("DD_SERVICE"));
-    assertNull(empty.getConfigId());
-    assertEquals(0, empty.getKeys().size());
-  }
-
-  private static void writeFileYaml(
-      Path filePath, String configId, Map<String, String> defaultConfigs) throws IOException {
-    Map<String, Object> yamlData = new HashMap<>();
-
-    if (configId != null && !configId.isEmpty()) {
-      yamlData.put("config_id", configId);
+
+    @Test
+    void testStableConfigGetHandlesPresentAndMissingKeys() {
+        Map<String, Object> configMap = new HashMap<>();
+        configMap.put("DD_SERVICE", "test-service");
+        configMap.put("DD_PORT", 8126);
+
+        StableConfigSource.StableConfig config = new StableConfigSource.StableConfig("config-123", configMap);
+
+        // Present String value: hits the non-null branch of the ternary in get()
+        assertEquals("test-service", config.get("DD_SERVICE"));
+        // Present non-String value: exercises String.valueOf on a non-null, non-String object
+        assertEquals("8126", config.get("DD_PORT"));
+        // Missing key: hits the null branch of the ternary in get()
+        assertNull(config.get("DD_MISSING"));
+
+        assertEquals("config-123", config.getConfigId());
+        assertEquals(configMap.keySet(), config.getKeys());
     }
 
-    if (defaultConfigs != null && !defaultConfigs.isEmpty()) {
-      yamlData.put("apm_configuration_default", defaultConfigs);
+    @Test
+    void testStableConfigEmpty() {
+        StableConfigSource.StableConfig empty = StableConfigSource.StableConfig.EMPTY;
+        assertNull(empty.get("DD_SERVICE"));
+        assertNull(empty.getConfigId());
+        assertEquals(0, empty.getKeys().size());
     }
 
-    DumpSettings settings = DumpSettings.builder().build();
-    Dump dump = new Dump(settings);
-    String yamlContent = dump.dumpToString(yamlData);
+    private static void writeFileYaml(Path filePath, String configId, Map<String, String> defaultConfigs)
+            throws IOException {
+        Map<String, Object> yamlData = new HashMap<>();
 
-    try (FileWriter writer = new FileWriter(filePath.toFile())) {
-      writer.write(yamlContent);
+        if (configId != null && !configId.isEmpty()) {
+            yamlData.put("config_id", configId);
+        }
+
+        if (defaultConfigs != null && !defaultConfigs.isEmpty()) {
+            yamlData.put("apm_configuration_default", defaultConfigs);
+        }
+
+        DumpSettings settings = DumpSettings.builder().build();
+        Dump dump = new Dump(settings);
+        String yamlContent = dump.dumpToString(yamlData);
+
+        try (FileWriter writer = new FileWriter(filePath.toFile())) {
+            writer.write(yamlContent);
+        }
     }
-  }
 
-  private static void writeFileRaw(Path filePath, String configId, String data) throws IOException {
-    String content = configId + "\n" + data;
-    Files.write(filePath, content.getBytes(), StandardOpenOption.WRITE);
-  }
+    private static void writeFileRaw(Path filePath, String configId, String data) throws IOException {
+        String content = configId + "\n" + data;
+        Files.write(filePath, content.getBytes(), StandardOpenOption.WRITE);
+    }
 }
diff --git a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/civisibility/CiEnvironmentVariablesTest.java b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/civisibility/CiEnvironmentVariablesTest.java
index 8a913b0901b..972d78e767f 100644
--- a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/civisibility/CiEnvironmentVariablesTest.java
+++ b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/civisibility/CiEnvironmentVariablesTest.java
@@ -15,62 +15,52 @@
 
 public class CiEnvironmentVariablesTest {
 
-  private static final String SECRET_KEY = "secret-key";
+    private static final String SECRET_KEY = "secret-key";
 
-  private static MockWebServer server;
+    private static MockWebServer server;
 
-  private static final AtomicInteger failedResponses = new AtomicInteger(0);
+    private static final AtomicInteger failedResponses = new AtomicInteger(0);
 
-  @BeforeAll
-  public static void startServer() throws Exception {
-    server = new MockWebServer();
-    server.setDispatcher(
-        new Dispatcher() {
-          @Override
-          public MockResponse dispatch(RecordedRequest req) {
-            if (failedResponses.getAndDecrement() > 0) {
-              return new MockResponse().setResponseCode(500);
+    @BeforeAll
+    public static void startServer() throws Exception {
+        server = new MockWebServer();
+        server.setDispatcher(new Dispatcher() {
+            @Override
+            public MockResponse dispatch(RecordedRequest req) {
+                if (failedResponses.getAndDecrement() > 0) {
+                    return new MockResponse().setResponseCode(500);
+                }
+                if (SECRET_KEY.equals(req.getHeader(CiEnvironmentVariables.DD_ENV_VARS_PROVIDER_KEY_HEADER))) {
+                    return new MockResponse().setResponseCode(200).setBody("a=1\nb=2");
+                }
+                return new MockResponse().setResponseCode(403);
             }
-            if (SECRET_KEY.equals(
-                req.getHeader(CiEnvironmentVariables.DD_ENV_VARS_PROVIDER_KEY_HEADER))) {
-              return new MockResponse().setResponseCode(200).setBody("a=1\nb=2");
-            }
-            return new MockResponse().setResponseCode(403);
-          }
         });
-    server.start();
-  }
+        server.start();
+    }
 
-  @AfterAll
-  public static void stopServer() throws Exception {
-    server.shutdown();
-  }
+    @AfterAll
+    public static void stopServer() throws Exception {
+        server.shutdown();
+    }
 
-  @Test
-  void testGetEnvironment() {
-    failedResponses.set(1); // to test retries
+    @Test
+    void testGetEnvironment() {
+        failedResponses.set(1); // to test retries
 
-    Map<String, String> env =
-        CiEnvironmentVariables.getRemoteEnvironmentWithRetries(
-            server.url("/").toString(),
-            SECRET_KEY,
-            new CiEnvironmentVariables.RetryPolicy(2, 3, 2),
-            null);
-    assertEquals(2, env.size());
-    assertEquals("1", env.get("a"));
-    assertEquals("2", env.get("b"));
-  }
+        Map<String, String> env = CiEnvironmentVariables.getRemoteEnvironmentWithRetries(
+                server.url("/").toString(), SECRET_KEY, new CiEnvironmentVariables.RetryPolicy(2, 3, 2), null);
+        assertEquals(2, env.size());
+        assertEquals("1", env.get("a"));
+        assertEquals("2", env.get("b"));
+    }
 
-  @Test
-  void testFailedGetEnvironment() {
-    failedResponses.set(3);
+    @Test
+    void testFailedGetEnvironment() {
+        failedResponses.set(3);
 
-    Map<String, String> env =
-        CiEnvironmentVariables.getRemoteEnvironmentWithRetries(
-            server.url("/").toString(),
-            SECRET_KEY,
-            new CiEnvironmentVariables.RetryPolicy(2, 3, 2),
-            null);
-    assertNull(env);
-  }
+        Map<String, String> env = CiEnvironmentVariables.getRemoteEnvironmentWithRetries(
+                server.url("/").toString(), SECRET_KEY, new CiEnvironmentVariables.RetryPolicy(2, 3, 2), null);
+        assertNull(env);
+    }
 }
diff --git a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/stableconfig/RuleTest.java b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/stableconfig/RuleTest.java
index d84c653f3d4..157b824d69c 100644
--- a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/stableconfig/RuleTest.java
+++ b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/stableconfig/RuleTest.java
@@ -13,73 +13,73 @@
 
 class RuleTest {
 
-  @Test
-  void testNoArgConstructorYieldsEmptyState() {
-    Rule rule = new Rule();
-    assertTrue(rule.getSelectors().isEmpty());
-    assertTrue(rule.getConfiguration().isEmpty());
-  }
-
-  @Test
-  void testConstructorExposesValuesViaGetters() {
-    Selector selector = new Selector("process_arguments", "-Dfoo", asList("bar"), "equals");
-    Map<String, Object> configuration = new HashMap<>();
-    configuration.put("DD_SERVICE", "test");
-
-    Rule rule = new Rule(asList(selector), configuration);
-
-    assertEquals(1, rule.getSelectors().size());
-    assertSame(selector, rule.getSelectors().get(0));
-    assertSame(configuration, rule.getConfiguration());
-  }
-
-  @Test
-  void testFromParsesValidRule() {
-    Map<String, Object> selectorMap = new LinkedHashMap<>();
-    selectorMap.put("origin", "process_arguments");
-    selectorMap.put("key", "-Dfoo");
-    selectorMap.put("matches", asList("bar"));
-    selectorMap.put("operator", "equals");
-
-    Map<String, Object> configuration = new LinkedHashMap<>();
-    configuration.put("DD_SERVICE", "test");
-
-    Map<String, Object> ruleMap = new LinkedHashMap<>();
-    ruleMap.put("selectors", asList(selectorMap));
-    ruleMap.put("configuration", configuration);
-
-    Rule rule = Rule.from(ruleMap);
-
-    List<Selector> selectors = rule.getSelectors();
-    assertEquals(1, selectors.size());
-    Selector selector = selectors.get(0);
-    assertEquals("process_arguments", selector.getOrigin());
-    assertEquals("-Dfoo", selector.getKey());
-    assertEquals(asList("bar"), selector.getMatches());
-    assertEquals("equals", selector.getOperator());
-
-    assertEquals("test", rule.getConfiguration().get("DD_SERVICE"));
-  }
-
-  @Test
-  void testFromSkipsNullSelectorEntries() {
-    Map<String, Object> selectorMap = new LinkedHashMap<>();
-    selectorMap.put("origin", "process_arguments");
-    selectorMap.put("key", "-Dfoo");
-    selectorMap.put("matches", asList("bar"));
-    selectorMap.put("operator", "equals");
-
-    Map<String, Object> configuration = new LinkedHashMap<>();
-    configuration.put("DD_SERVICE", "test");
-
-    Map<String, Object> ruleMap = new LinkedHashMap<>();
-    ruleMap.put("selectors", asList(null, selectorMap));
-    ruleMap.put("configuration", configuration);
-
-    Rule rule = Rule.from(ruleMap);
-
-    // The null entry is filtered out, leaving only the valid selector.
-    assertEquals(1, rule.getSelectors().size());
-    assertEquals("process_arguments", rule.getSelectors().get(0).getOrigin());
-  }
+    @Test
+    void testNoArgConstructorYieldsEmptyState() {
+        Rule rule = new Rule();
+        assertTrue(rule.getSelectors().isEmpty());
+        assertTrue(rule.getConfiguration().isEmpty());
+    }
+
+    @Test
+    void testConstructorExposesValuesViaGetters() {
+        Selector selector = new Selector("process_arguments", "-Dfoo", asList("bar"), "equals");
+        Map<String, Object> configuration = new HashMap<>();
+        configuration.put("DD_SERVICE", "test");
+
+        Rule rule = new Rule(asList(selector), configuration);
+
+        assertEquals(1, rule.getSelectors().size());
+        assertSame(selector, rule.getSelectors().get(0));
+        assertSame(configuration, rule.getConfiguration());
+    }
+
+    @Test
+    void testFromParsesValidRule() {
+        Map<String, Object> selectorMap = new LinkedHashMap<>();
+        selectorMap.put("origin", "process_arguments");
+        selectorMap.put("key", "-Dfoo");
+        selectorMap.put("matches", asList("bar"));
+        selectorMap.put("operator", "equals");
+
+        Map<String, Object> configuration = new LinkedHashMap<>();
+        configuration.put("DD_SERVICE", "test");
+
+        Map<String, Object> ruleMap = new LinkedHashMap<>();
+        ruleMap.put("selectors", asList(selectorMap));
+        ruleMap.put("configuration", configuration);
+
+        Rule rule = Rule.from(ruleMap);
+
+        List<Selector> selectors = rule.getSelectors();
+        assertEquals(1, selectors.size());
+        Selector selector = selectors.get(0);
+        assertEquals("process_arguments", selector.getOrigin());
+        assertEquals("-Dfoo", selector.getKey());
+        assertEquals(asList("bar"), selector.getMatches());
+        assertEquals("equals", selector.getOperator());
+
+        assertEquals("test", rule.getConfiguration().get("DD_SERVICE"));
+    }
+
+    @Test
+    void testFromSkipsNullSelectorEntries() {
+        Map<String, Object> selectorMap = new LinkedHashMap<>();
+        selectorMap.put("origin", "process_arguments");
+        selectorMap.put("key", "-Dfoo");
+        selectorMap.put("matches", asList("bar"));
+        selectorMap.put("operator", "equals");
+
+        Map<String, Object> configuration = new LinkedHashMap<>();
+        configuration.put("DD_SERVICE", "test");
+
+        Map<String, Object> ruleMap = new LinkedHashMap<>();
+        ruleMap.put("selectors", asList(null, selectorMap));
+        ruleMap.put("configuration", configuration);
+
+        Rule rule = Rule.from(ruleMap);
+
+        // The null entry is filtered out, leaving only the valid selector.
+        assertEquals(1, rule.getSelectors().size());
+        assertEquals("process_arguments", rule.getSelectors().get(0).getOrigin());
+    }
 }
diff --git a/utils/config-utils/src/test/java/datadog/trace/config/inversion/ConfigHelperTest.java b/utils/config-utils/src/test/java/datadog/trace/config/inversion/ConfigHelperTest.java
index 357da91fa64..2d8c645c74b 100644
--- a/utils/config-utils/src/test/java/datadog/trace/config/inversion/ConfigHelperTest.java
+++ b/utils/config-utils/src/test/java/datadog/trace/config/inversion/ConfigHelperTest.java
@@ -19,186 +19,184 @@
 import org.junit.jupiter.api.Test;
 
 public class ConfigHelperTest {
-  // Test environment variables
-  private static final String DD_VAR = "DD_TEST_CONFIG";
-  private static final String DD_VAR_VAL = "test_dd_var";
-  private static final String OTEL_VAR = "OTEL_TEST_CONFIG";
-  private static final String OTEL_VAR_VAL = "test_otel_var";
-  private static final String REGULAR_VAR = "REGULAR_TEST_CONFIG";
-  private static final String REGULAR_VAR_VAL = "test_regular_var";
-
-  private static final String ALIAS_DD_VAR = "DD_TEST_CONFIG_ALIAS";
-  private static final String ALIAS_DD_VAL = "test_alias_val";
-  private static final String NON_DD_ALIAS_VAR = "TEST_CONFIG_ALIAS";
-  private static final String NON_DD_ALIAS_VAL = "test_alias_val_non_dd";
-
-  private static final String NEW_ALIAS_TARGET = "DD_NEW_ALIAS_TARGET";
-  private static final String NEW_ALIAS_KEY_1 = "DD_NEW_ALIAS_KEY_1";
-  private static final String NEW_ALIAS_KEY_2 = "DD_NEW_ALIAS_KEY_2";
-
-  private static ControllableEnvironmentVariables env;
-
-  private static ConfigHelper.StrictnessPolicy strictness;
-  private static TestSupportedConfigurationSource testSource;
-
-  @BeforeAll
-  static void setUp() {
-    env = ControllableEnvironmentVariables.setup();
-
-    // Set up test configurations using SupportedConfigurationSource
-    Set<String> testSupported = new HashSet<>(Arrays.asList(DD_VAR, OTEL_VAR, REGULAR_VAR));
-
-    Map<String, List<String>> testAliases = new HashMap<>();
-    testAliases.put(DD_VAR, Arrays.asList(ALIAS_DD_VAR, NON_DD_ALIAS_VAR));
-    testAliases.put(NEW_ALIAS_TARGET, Arrays.asList(NEW_ALIAS_KEY_1));
-
-    Map<String, String> testAliasMapping = new HashMap<>();
-    testAliasMapping.put(ALIAS_DD_VAR, DD_VAR);
-    testAliasMapping.put(NON_DD_ALIAS_VAR, DD_VAR);
-    testAliasMapping.put(NEW_ALIAS_KEY_2, NEW_ALIAS_TARGET);
-
-    // Create and set test configuration source
-    testSource =
-        new TestSupportedConfigurationSource(
-            testSupported, testAliases, testAliasMapping, new HashMap<>());
-    ConfigHelper.get().setConfigurationSource(testSource);
-    strictness = ConfigHelper.get().configInversionStrictFlag();
-    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.STRICT_TEST);
-  }
-
-  @AfterAll
-  static void tearDown() {
-    ConfigHelper.get().resetToDefaults();
-    ConfigHelper.get().setConfigInversionStrict(strictness);
-  }
-
-  @AfterEach
-  void reset() {
-    ConfigHelper.get().resetCache();
-    env.clear();
-  }
-
-  @Test
-  void testBasicConfigHelper() {
-    env.set(DD_VAR, DD_VAR_VAL);
-    env.set(OTEL_VAR, OTEL_VAR_VAL);
-    env.set(REGULAR_VAR, REGULAR_VAR_VAL);
-
-    assertEquals(DD_VAR_VAL, ConfigHelper.env(DD_VAR));
-    assertEquals(OTEL_VAR_VAL, ConfigHelper.env(OTEL_VAR));
-    assertEquals(REGULAR_VAR_VAL, ConfigHelper.env(REGULAR_VAR));
-
-    Map<String, String> result = ConfigHelper.env();
-    assertEquals(DD_VAR_VAL, result.get(DD_VAR));
-    assertEquals(OTEL_VAR_VAL, result.get(OTEL_VAR));
-    assertEquals(REGULAR_VAR_VAL, result.get(REGULAR_VAR));
-  }
-
-  @Test
-  void testAliasSupport() {
-    env.set(ALIAS_DD_VAR, ALIAS_DD_VAL);
-
-    assertEquals(ALIAS_DD_VAL, ConfigHelper.env(DD_VAR));
-    Map<String, String> result = ConfigHelper.env();
-    assertEquals(ALIAS_DD_VAL, result.get(DD_VAR));
-    assertFalse(result.containsKey(ALIAS_DD_VAR));
-  }
-
-  @Test
-  void testMainConfigPrecedence() {
-    // When both main variable and alias are set, main should take precedence
-    env.set(DD_VAR, DD_VAR_VAL);
-    env.set(ALIAS_DD_VAR, ALIAS_DD_VAL);
-
-    assertEquals(DD_VAR_VAL, ConfigHelper.env(DD_VAR));
-    Map<String, String> result = ConfigHelper.env();
-    assertEquals(DD_VAR_VAL, result.get(DD_VAR));
-    assertFalse(result.containsKey(ALIAS_DD_VAR));
-  }
-
-  @Test
-  void testNonDDAliases() {
-    env.set(NON_DD_ALIAS_VAR, NON_DD_ALIAS_VAL);
-
-    assertEquals(NON_DD_ALIAS_VAL, ConfigHelper.env(DD_VAR));
-    Map<String, String> result = ConfigHelper.env();
-    assertEquals(NON_DD_ALIAS_VAL, result.get(DD_VAR));
-    assertFalse(result.containsKey(NON_DD_ALIAS_VAR));
-  }
-
-  @Test
-  void testAliasesWithoutPresentAliases() {
-    Map<String, String> result = ConfigHelper.env();
-    assertFalse(result.containsKey(ALIAS_DD_VAR));
-  }
-
-  @Test
-  void testAliasWithEmptyList() {
-    Map<String, List<String>> aliasMap = new HashMap<>();
-    aliasMap.put("EMPTY_ALIAS_CONFIG", new ArrayList<>());
-
-    ConfigHelper.get()
-        .setConfigurationSource(
-            new TestSupportedConfigurationSource(
-                new HashSet<>(), aliasMap, new HashMap<>(), new HashMap<>()));
-
-    assertNull(ConfigHelper.env("EMPTY_ALIAS_CONFIG"));
-
-    // Cleanup
-    ConfigHelper.get().setConfigurationSource(testSource);
-  }
-
-  @Test
-  void testAliasSkippedWhenBaseAlreadyPresent() {
-    env.set(DD_VAR, DD_VAR_VAL);
-    env.set(NON_DD_ALIAS_VAR, NON_DD_ALIAS_VAL);
-
-    Map<String, String> result = ConfigHelper.env();
-    assertEquals(DD_VAR_VAL, result.get(DD_VAR));
-    assertFalse(result.containsKey(NON_DD_ALIAS_VAR));
-  }
-
-  @Test
-  void testInconsistentAliasesAndAliasMapping() {
-    env.set(NEW_ALIAS_KEY_2, "some_value");
-
-    Map<String, String> result = ConfigHelper.env();
-
-    assertFalse(result.containsKey(NEW_ALIAS_KEY_2));
-    assertFalse(result.containsKey(NEW_ALIAS_TARGET));
-  }
-
-  @Test
-  void testStrictTestThrowsForUnsupportedConfig() {
-    env.set("DD_FAKE_VAR", "banana");
-
-    // STRICT_TEST mode should throw for unsupported DD_ variables
-    assertThrows(IllegalArgumentException.class, () -> ConfigHelper.env("DD_FAKE_VAR"));
-  }
-
-  @Test
-  void testUnsupportedEnvWarningNotInTestMode() {
-    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST);
-
-    env.set("DD_FAKE_VAR", "banana");
-
-    // Should allow unsupported variable in TEST mode
-    assertEquals("banana", ConfigHelper.env("DD_FAKE_VAR"));
-
-    // Cleanup
-    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.STRICT_TEST);
-  }
-
-  @Test
-  void testCache() {
-    env.set(DD_VAR, DD_VAR_VAL);
-
-    Map<String, String> result = ConfigHelper.env();
-    assertEquals(DD_VAR_VAL, result.get(DD_VAR));
-
-    // Ensure that the cached value is returned
-    env.set(DD_VAR, ALIAS_DD_VAL);
-    assertEquals(DD_VAR_VAL, result.get(DD_VAR));
-    assertEquals(DD_VAR_VAL, ConfigHelper.env(DD_VAR));
-  }
+    // Test environment variables
+    private static final String DD_VAR = "DD_TEST_CONFIG";
+    private static final String DD_VAR_VAL = "test_dd_var";
+    private static final String OTEL_VAR = "OTEL_TEST_CONFIG";
+    private static final String OTEL_VAR_VAL = "test_otel_var";
+    private static final String REGULAR_VAR = "REGULAR_TEST_CONFIG";
+    private static final String REGULAR_VAR_VAL = "test_regular_var";
+
+    private static final String ALIAS_DD_VAR = "DD_TEST_CONFIG_ALIAS";
+    private static final String ALIAS_DD_VAL = "test_alias_val";
+    private static final String NON_DD_ALIAS_VAR = "TEST_CONFIG_ALIAS";
+    private static final String NON_DD_ALIAS_VAL = "test_alias_val_non_dd";
+
+    private static final String NEW_ALIAS_TARGET = "DD_NEW_ALIAS_TARGET";
+    private static final String NEW_ALIAS_KEY_1 = "DD_NEW_ALIAS_KEY_1";
+    private static final String NEW_ALIAS_KEY_2 = "DD_NEW_ALIAS_KEY_2";
+
+    private static ControllableEnvironmentVariables env;
+
+    private static ConfigHelper.StrictnessPolicy strictness;
+    private static TestSupportedConfigurationSource testSource;
+
+    @BeforeAll
+    static void setUp() {
+        env = ControllableEnvironmentVariables.setup();
+
+        // Set up test configurations using SupportedConfigurationSource
+        Set<String> testSupported = new HashSet<>(Arrays.asList(DD_VAR, OTEL_VAR, REGULAR_VAR));
+
+        Map<String, List<String>> testAliases = new HashMap<>();
+        testAliases.put(DD_VAR, Arrays.asList(ALIAS_DD_VAR, NON_DD_ALIAS_VAR));
+        testAliases.put(NEW_ALIAS_TARGET, Arrays.asList(NEW_ALIAS_KEY_1));
+
+        Map<String, String> testAliasMapping = new HashMap<>();
+        testAliasMapping.put(ALIAS_DD_VAR, DD_VAR);
+        testAliasMapping.put(NON_DD_ALIAS_VAR, DD_VAR);
+        testAliasMapping.put(NEW_ALIAS_KEY_2, NEW_ALIAS_TARGET);
+
+        // Create and set test configuration source
+        testSource =
+                new TestSupportedConfigurationSource(testSupported, testAliases, testAliasMapping, new HashMap<>());
+        ConfigHelper.get().setConfigurationSource(testSource);
+        strictness = ConfigHelper.get().configInversionStrictFlag();
+        ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.STRICT_TEST);
+    }
+
+    @AfterAll
+    static void tearDown() {
+        ConfigHelper.get().resetToDefaults();
+        ConfigHelper.get().setConfigInversionStrict(strictness);
+    }
+
+    @AfterEach
+    void reset() {
+        ConfigHelper.get().resetCache();
+        env.clear();
+    }
+
+    @Test
+    void testBasicConfigHelper() {
+        env.set(DD_VAR, DD_VAR_VAL);
+        env.set(OTEL_VAR, OTEL_VAR_VAL);
+        env.set(REGULAR_VAR, REGULAR_VAR_VAL);
+
+        assertEquals(DD_VAR_VAL, ConfigHelper.env(DD_VAR));
+        assertEquals(OTEL_VAR_VAL, ConfigHelper.env(OTEL_VAR));
+        assertEquals(REGULAR_VAR_VAL, ConfigHelper.env(REGULAR_VAR));
+
+        Map<String, String> result = ConfigHelper.env();
+        assertEquals(DD_VAR_VAL, result.get(DD_VAR));
+        assertEquals(OTEL_VAR_VAL, result.get(OTEL_VAR));
+        assertEquals(REGULAR_VAR_VAL, result.get(REGULAR_VAR));
+    }
+
+    @Test
+    void testAliasSupport() {
+        env.set(ALIAS_DD_VAR, ALIAS_DD_VAL);
+
+        assertEquals(ALIAS_DD_VAL, ConfigHelper.env(DD_VAR));
+        Map<String, String> result = ConfigHelper.env();
+        assertEquals(ALIAS_DD_VAL, result.get(DD_VAR));
+        assertFalse(result.containsKey(ALIAS_DD_VAR));
+    }
+
+    @Test
+    void testMainConfigPrecedence() {
+        // When both main variable and alias are set, main should take precedence
+        env.set(DD_VAR, DD_VAR_VAL);
+        env.set(ALIAS_DD_VAR, ALIAS_DD_VAL);
+
+        assertEquals(DD_VAR_VAL, ConfigHelper.env(DD_VAR));
+        Map<String, String> result = ConfigHelper.env();
+        assertEquals(DD_VAR_VAL, result.get(DD_VAR));
+        assertFalse(result.containsKey(ALIAS_DD_VAR));
+    }
+
+    @Test
+    void testNonDDAliases() {
+        env.set(NON_DD_ALIAS_VAR, NON_DD_ALIAS_VAL);
+
+        assertEquals(NON_DD_ALIAS_VAL, ConfigHelper.env(DD_VAR));
+        Map<String, String> result = ConfigHelper.env();
+        assertEquals(NON_DD_ALIAS_VAL, result.get(DD_VAR));
+        assertFalse(result.containsKey(NON_DD_ALIAS_VAR));
+    }
+
+    @Test
+    void testAliasesWithoutPresentAliases() {
+        Map<String, String> result = ConfigHelper.env();
+        assertFalse(result.containsKey(ALIAS_DD_VAR));
+    }
+
+    @Test
+    void testAliasWithEmptyList() {
+        Map<String, List<String>> aliasMap = new HashMap<>();
+        aliasMap.put("EMPTY_ALIAS_CONFIG", new ArrayList<>());
+
+        ConfigHelper.get()
+                .setConfigurationSource(new TestSupportedConfigurationSource(
+                        new HashSet<>(), aliasMap, new HashMap<>(), new HashMap<>()));
+
+        assertNull(ConfigHelper.env("EMPTY_ALIAS_CONFIG"));
+
+        // Cleanup
+        ConfigHelper.get().setConfigurationSource(testSource);
+    }
+
+    @Test
+    void testAliasSkippedWhenBaseAlreadyPresent() {
+        env.set(DD_VAR, DD_VAR_VAL);
+        env.set(NON_DD_ALIAS_VAR, NON_DD_ALIAS_VAL);
+
+        Map<String, String> result = ConfigHelper.env();
+        assertEquals(DD_VAR_VAL, result.get(DD_VAR));
+        assertFalse(result.containsKey(NON_DD_ALIAS_VAR));
+    }
+
+    @Test
+    void testInconsistentAliasesAndAliasMapping() {
+        env.set(NEW_ALIAS_KEY_2, "some_value");
+
+        Map<String, String> result = ConfigHelper.env();
+
+        assertFalse(result.containsKey(NEW_ALIAS_KEY_2));
+        assertFalse(result.containsKey(NEW_ALIAS_TARGET));
+    }
+
+    @Test
+    void testStrictTestThrowsForUnsupportedConfig() {
+        env.set("DD_FAKE_VAR", "banana");
+
+        // STRICT_TEST mode should throw for unsupported DD_ variables
+        assertThrows(IllegalArgumentException.class, () -> ConfigHelper.env("DD_FAKE_VAR"));
+    }
+
+    @Test
+    void testUnsupportedEnvWarningNotInTestMode() {
+        ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST);
+
+        env.set("DD_FAKE_VAR", "banana");
+
+        // Should allow unsupported variable in TEST mode
+        assertEquals("banana", ConfigHelper.env("DD_FAKE_VAR"));
+
+        // Cleanup
+        ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.STRICT_TEST);
+    }
+
+    @Test
+    void testCache() {
+        env.set(DD_VAR, DD_VAR_VAL);
+
+        Map<String, String> result = ConfigHelper.env();
+        assertEquals(DD_VAR_VAL, result.get(DD_VAR));
+
+        // Ensure that the cached value is returned
+        env.set(DD_VAR, ALIAS_DD_VAL);
+        assertEquals(DD_VAR_VAL, result.get(DD_VAR));
+        assertEquals(DD_VAR_VAL, ConfigHelper.env(DD_VAR));
+    }
 }
diff --git a/utils/config-utils/src/test/java/datadog/trace/config/inversion/TestSupportedConfigurationSource.java b/utils/config-utils/src/test/java/datadog/trace/config/inversion/TestSupportedConfigurationSource.java
index 3dee8925dd1..6b91990dd3e 100644
--- a/utils/config-utils/src/test/java/datadog/trace/config/inversion/TestSupportedConfigurationSource.java
+++ b/utils/config-utils/src/test/java/datadog/trace/config/inversion/TestSupportedConfigurationSource.java
@@ -7,39 +7,39 @@
 
 /** Test implementation of SupportedConfigurationSource that uses custom configuration data */
 class TestSupportedConfigurationSource extends SupportedConfigurationSource {
-  private final Set<String> supported;
-  private final Map<String, List<String>> aliases;
-  private final Map<String, String> aliasMapping;
-  private final Map<String, String> deprecated;
+    private final Set<String> supported;
+    private final Map<String, List<String>> aliases;
+    private final Map<String, String> aliasMapping;
+    private final Map<String, String> deprecated;
 
-  public TestSupportedConfigurationSource(
-      Set<String> supported,
-      Map<String, List<String>> aliases,
-      Map<String, String> aliasMapping,
-      Map<String, String> deprecated) {
-    this.supported = supported;
-    this.aliases = aliases;
-    this.aliasMapping = aliasMapping;
-    this.deprecated = deprecated;
-  }
+    public TestSupportedConfigurationSource(
+            Set<String> supported,
+            Map<String, List<String>> aliases,
+            Map<String, String> aliasMapping,
+            Map<String, String> deprecated) {
+        this.supported = supported;
+        this.aliases = aliases;
+        this.aliasMapping = aliasMapping;
+        this.deprecated = deprecated;
+    }
 
-  @Override
-  public boolean supported(String env) {
-    return supported.contains(env);
-  }
+    @Override
+    public boolean supported(String env) {
+        return supported.contains(env);
+    }
 
-  @Override
-  public List<String> getAliases(String env) {
-    return aliases.getOrDefault(env, Collections.emptyList());
-  }
+    @Override
+    public List<String> getAliases(String env) {
+        return aliases.getOrDefault(env, Collections.emptyList());
+    }
 
-  @Override
-  public String primaryEnvFromAlias(String alias) {
-    return aliasMapping.getOrDefault(alias, null);
-  }
+    @Override
+    public String primaryEnvFromAlias(String alias) {
+        return aliasMapping.getOrDefault(alias, null);
+    }
 
-  @Override
-  public String primaryEnvFromDeprecated(String deprecated) {
-    return this.deprecated.getOrDefault(deprecated, null);
-  }
+    @Override
+    public String primaryEnvFromDeprecated(String deprecated) {
+        return this.deprecated.getOrDefault(deprecated, null);
+    }
 }
diff --git a/utils/config-utils/src/test/java/datadog/trace/util/ConfigStringsTest.java b/utils/config-utils/src/test/java/datadog/trace/util/ConfigStringsTest.java
index d87c5581426..1bee54ee9df 100644
--- a/utils/config-utils/src/test/java/datadog/trace/util/ConfigStringsTest.java
+++ b/utils/config-utils/src/test/java/datadog/trace/util/ConfigStringsTest.java
@@ -9,41 +9,41 @@
 
 class ConfigStringsTest {
 
-  /** Dotted capital I (U+0130) that a Turkish-locale {@code toUpperCase()} produces from 'i'. */
-  private static final char DOTTED_CAPITAL_I = 'İ';
+    /** Dotted capital I (U+0130) that a Turkish-locale {@code toUpperCase()} produces from 'i'. */
+    private static final char DOTTED_CAPITAL_I = 'İ';
 
-  @Test
-  void toEnvVarUppercasesLowerIToAsciiIOnTurkishLocale() {
-    // Turkish is the locale where a locale-sensitive toUpperCase() maps 'i' -> 'İ'
-    // Forcing it as the default locale here proves the conversions are
-    // locale-independent (pinned to Locale.ROOT) rather than relying on the machine's locale.
-    Locale previousDefault = Locale.getDefault();
-    Locale.setDefault(new Locale("tr", "TR"));
-    try {
-      String result = ConfigStrings.toEnvVar("dd.profiling.i");
+    @Test
+    void toEnvVarUppercasesLowerIToAsciiIOnTurkishLocale() {
+        // Turkish is the locale where a locale-sensitive toUpperCase() maps 'i' -> 'İ'
+        // Forcing it as the default locale here proves the conversions are
+        // locale-independent (pinned to Locale.ROOT) rather than relying on the machine's locale.
+        Locale previousDefault = Locale.getDefault();
+        Locale.setDefault(new Locale("tr", "TR"));
+        try {
+            String result = ConfigStrings.toEnvVar("dd.profiling.i");
 
-      // Must be the plain ASCII 'I' (U+0049), not the Turkish dotted 'İ' (U+0130).
-      assertEquals("DD_PROFILING_I", result);
-      assertFalse(
-          result.indexOf(DOTTED_CAPITAL_I) >= 0,
-          "env var name must not contain the dotted capital I (U+0130)");
-    } finally {
-      Locale.setDefault(previousDefault);
+            // Must be the plain ASCII 'I' (U+0049), not the Turkish dotted 'İ' (U+0130).
+            assertEquals("DD_PROFILING_I", result);
+            assertFalse(
+                    result.indexOf(DOTTED_CAPITAL_I) >= 0,
+                    "env var name must not contain the dotted capital I (U+0130)");
+        } finally {
+            Locale.setDefault(previousDefault);
+        }
     }
-  }
 
-  @TableTest({
-    "scenario           | key                        | canonical                  ",
-    "property name      | api-key                    | DD_API_KEY                 ",
-    "dotted property    | profiling.proxy.password   | DD_PROFILING_PROXY_PASSWORD",
-    "dd system property | dd.api-key                 | DD_API_KEY                 ",
-    "raw env var        | DD_API_KEY                 | DD_API_KEY                 ",
-    "alias env var      | DD_APP_KEY                 | DD_APP_KEY                 ",
-    "otel property      | otel.exporter.otlp.headers | OTEL_EXPORTER_OTLP_HEADERS ",
-    "otel env var       | OTEL_EXPORTER_OTLP_HEADERS | OTEL_EXPORTER_OTLP_HEADERS ",
-    "non-dd env var     | AWS_LAMBDA_FUNCTION_NAME   | DD_AWS_LAMBDA_FUNCTION_NAME"
-  })
-  void canonicalizesKeysToEnvVarForm(String key, String canonical) {
-    assertEquals(canonical, ConfigStrings.toCanonicalEnvVar(key));
-  }
+    @TableTest({
+      "scenario           | key                        | canonical                  ",
+      "property name      | api-key                    | DD_API_KEY                 ",
+      "dotted property    | profiling.proxy.password   | DD_PROFILING_PROXY_PASSWORD",
+      "dd system property | dd.api-key                 | DD_API_KEY                 ",
+      "raw env var        | DD_API_KEY                 | DD_API_KEY                 ",
+      "alias env var      | DD_APP_KEY                 | DD_APP_KEY                 ",
+      "otel property      | otel.exporter.otlp.headers | OTEL_EXPORTER_OTLP_HEADERS ",
+      "otel env var       | OTEL_EXPORTER_OTLP_HEADERS | OTEL_EXPORTER_OTLP_HEADERS ",
+      "non-dd env var     | AWS_LAMBDA_FUNCTION_NAME   | DD_AWS_LAMBDA_FUNCTION_NAME"
+    })
+    void canonicalizesKeysToEnvVarForm(String key, String canonical) {
+        assertEquals(canonical, ConfigStrings.toCanonicalEnvVar(key));
+    }
 }
diff --git a/utils/config-utils/src/testFixtures/java/datadog/trace/test/ConfigInversionExtension.java b/utils/config-utils/src/testFixtures/java/datadog/trace/test/ConfigInversionExtension.java
index d8ba0035cd2..366f928f8f1 100644
--- a/utils/config-utils/src/testFixtures/java/datadog/trace/test/ConfigInversionExtension.java
+++ b/utils/config-utils/src/testFixtures/java/datadog/trace/test/ConfigInversionExtension.java
@@ -17,24 +17,23 @@
  */
 public class ConfigInversionExtension implements BeforeAllCallback, AfterAllCallback {
 
-  private StrictnessPolicy previousPolicy;
+    private StrictnessPolicy previousPolicy;
 
-  @Override
-  public void beforeAll(ExtensionContext ctx) {
-    previousPolicy = ConfigHelper.get().configInversionStrictFlag();
-    ConfigHelper.get().setConfigInversionStrict(StrictnessPolicy.STRICT_TEST);
-  }
+    @Override
+    public void beforeAll(ExtensionContext ctx) {
+        previousPolicy = ConfigHelper.get().configInversionStrictFlag();
+        ConfigHelper.get().setConfigInversionStrict(StrictnessPolicy.STRICT_TEST);
+    }
 
-  @Override
-  public void afterAll(ExtensionContext ctx) {
-    List<String> unsupported = ConfigHelper.get().drainUnsupportedConfigs();
-    ConfigHelper.get().setConfigInversionStrict(previousPolicy);
+    @Override
+    public void afterAll(ExtensionContext ctx) {
+        List<String> unsupported = ConfigHelper.get().drainUnsupportedConfigs();
+        ConfigHelper.get().setConfigInversionStrict(previousPolicy);
 
-    if (!unsupported.isEmpty()) {
-      throw new AssertionError(
-          "Unsupported configurations found during test. "
-              + "Add these to metadata/supported-configurations.json or opt out with StrictnessPolicy.TEST:\n  "
-              + String.join("\n  ", unsupported));
+        if (!unsupported.isEmpty()) {
+            throw new AssertionError("Unsupported configurations found during test. "
+                    + "Add these to metadata/supported-configurations.json or opt out with StrictnessPolicy.TEST:\n  "
+                    + String.join("\n  ", unsupported));
+        }
     }
-  }
 }
diff --git a/utils/container-utils/src/main/java/datadog/common/container/ContainerInfo.java b/utils/container-utils/src/main/java/datadog/common/container/ContainerInfo.java
index 61d174e97c5..2f48b6cb0af 100644
--- a/utils/container-utils/src/main/java/datadog/common/container/ContainerInfo.java
+++ b/utils/container-utils/src/main/java/datadog/common/container/ContainerInfo.java
@@ -21,296 +21,291 @@
  * Qard/container-info
  */
 @SuppressForbidden
-@SuppressFBWarnings(
-    value = "DMI_HARDCODED_ABSOLUTE_FILENAME",
-    justification = "DEFAULT_CGROUP_MOUNT_PATH")
+@SuppressFBWarnings(value = "DMI_HARDCODED_ABSOLUTE_FILENAME", justification = "DEFAULT_CGROUP_MOUNT_PATH")
 public class ContainerInfo {
 
-  private static final Logger log = LoggerFactory.getLogger(ContainerInfo.class);
-
-  private static final Path CGROUP_DEFAULT_PROCFILE = Paths.get("/proc/self/cgroup");
-  private static final Path DEFAULT_CGROUP_MOUNT_PATH = Paths.get("/sys/fs/cgroup");
-  private static final Path HOST_GROUP_NAMESPACE = Paths.get("/proc/self/ns/cgroup");
-
-  // The second part is the PCF/Garden regexp. We assume no suffix ($) to avoid matching pod UIDs
-  // See https://github.com/DataDog/datadog-agent/blob/7.40.x/pkg/util/cgroups/reader.go#L50
-  private static final String UUID_REGEX =
-      "[0-9a-f]{8}[-_][0-9a-f]{4}[-_][0-9a-f]{4}[-_][0-9a-f]{4}[-_][0-9a-f]{12}|[0-9a-f]{8}(?:-[0-9a-f]{4}){4}$";
-  private static final String CONTAINER_REGEX = "[0-9a-f]{64}";
-  private static final String TASK_REGEX = "[0-9a-f]{32}-\\d+";
-  private static final Pattern LINE_PATTERN = Pattern.compile("(\\d+):([^:]*):(.+)$");
-  private static final Pattern POD_PATTERN =
-      Pattern.compile("(?:.+)?pod(" + UUID_REGEX + ")(?:.slice)?$");
-  private static final Pattern CONTAINER_PATTERN =
-      Pattern.compile(
-          "(?:.+)?(" + UUID_REGEX + "|" + CONTAINER_REGEX + "|" + TASK_REGEX + ")(?:.scope)?$");
-
-  private static final ContainerInfo INSTANCE;
-
-  private static final long PROC_CGROUP_INIT_INO = 0xEFFFFFFBL;
-  private static final String CGROUPV1_BASE_CONTROLLER = "memory";
-  private static final String CGROUPV2_BASE_CONTROLLER = "";
-
-  private static final String ENTITY_ID;
-
-  @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
-  public String containerId;
-
-  @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
-  public String containerTagsHash;
-
-  @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
-  public String podId;
-
-  @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
-  public List<CGroupInfo> cGroups = new ArrayList<>();
-
-  public String getContainerId() {
-    return containerId;
-  }
-
-  public void setContainerId(String containerId) {
-    this.containerId = containerId;
-  }
-
-  public String getContainerTagsHash() {
-    return containerTagsHash;
-  }
-
-  public void setContainerTagsHash(String containerTagsHash) {
-    this.containerTagsHash = containerTagsHash;
-  }
-
-  public String getPodId() {
-    return podId;
-  }
-
-  public void setPodId(String podId) {
-    this.podId = podId;
-  }
-
-  public List<CGroupInfo> getCGroups() {
-    return cGroups;
-  }
-
-  public void setcGroups(List<CGroupInfo> cGroups) {
-    this.cGroups = cGroups;
-  }
-
-  static {
-    ContainerInfo containerInfo = new ContainerInfo();
-    if (ContainerInfo.isRunningInContainer()) {
-      try {
-        containerInfo = ContainerInfo.fromDefaultProcFile();
-      } catch (final IOException | ParseException e) {
-        log.error("Unable to parse proc file");
-      }
-    }
+    private static final Logger log = LoggerFactory.getLogger(ContainerInfo.class);
 
-    INSTANCE = containerInfo;
+    private static final Path CGROUP_DEFAULT_PROCFILE = Paths.get("/proc/self/cgroup");
+    private static final Path DEFAULT_CGROUP_MOUNT_PATH = Paths.get("/sys/fs/cgroup");
+    private static final Path HOST_GROUP_NAMESPACE = Paths.get("/proc/self/ns/cgroup");
 
-    ENTITY_ID = readEntityID(containerInfo, isHostCgroupNamespace(), DEFAULT_CGROUP_MOUNT_PATH);
-  }
+    // The second part is the PCF/Garden regexp. We assume no suffix ($) to avoid matching pod UIDs
+    // See https://github.com/DataDog/datadog-agent/blob/7.40.x/pkg/util/cgroups/reader.go#L50
+    private static final String UUID_REGEX =
+            "[0-9a-f]{8}[-_][0-9a-f]{4}[-_][0-9a-f]{4}[-_][0-9a-f]{4}[-_][0-9a-f]{12}|[0-9a-f]{8}(?:-[0-9a-f]{4}){4}$";
+    private static final String CONTAINER_REGEX = "[0-9a-f]{64}";
+    private static final String TASK_REGEX = "[0-9a-f]{32}-\\d+";
+    private static final Pattern LINE_PATTERN = Pattern.compile("(\\d+):([^:]*):(.+)$");
+    private static final Pattern POD_PATTERN = Pattern.compile("(?:.+)?pod(" + UUID_REGEX + ")(?:.slice)?$");
+    private static final Pattern CONTAINER_PATTERN =
+            Pattern.compile("(?:.+)?(" + UUID_REGEX + "|" + CONTAINER_REGEX + "|" + TASK_REGEX + ")(?:.scope)?$");
 
-  static @Nullable String readEntityID(
-      ContainerInfo containerInfo, boolean isHostCgroupNamespace, Path cgroupMountPath) {
-    String cid = containerInfo.getContainerId();
-    if (cid != null && !cid.isEmpty()) {
-      return "cid-" + cid;
-    }
-    if (isHostCgroupNamespace) {
-      return null;
-    }
-    return getCgroupInode(cgroupMountPath, containerInfo.getCGroups());
-  }
-
-  /** Checks if the agent is running in the host cgroup namespace. */
-  static boolean isHostCgroupNamespace() {
-    // Currently, host namespace inode number is hardcoded, which can be used to detect if it's
-    // running in host namespace or not (does not work when running in DinD)
-    // https://github.com/torvalds/linux/blob/5859a2b1991101d6b978f3feb5325dad39421f29/include/linux/proc_ns.h#L41-L49
-    return readInode(HOST_GROUP_NAMESPACE) == PROC_CGROUP_INIT_INO;
-  }
-
-  /**
-   * Returns the inode of the cgroup controller if it exists, otherwise an empty string. The inode
-   * is prefixed with "in-" and is used by the agent to retrieve the container ID.
-   */
-  static @Nullable String getCgroupInode(Path cgroupMountPath, List<CGroupInfo> cgroups) {
-    // It first tries to get the cGroupV1 "memory" controller inode, and if that fails, it tries to
-    // get the cGroupV2 inode.
-    for (String controller : Arrays.asList(CGROUPV1_BASE_CONTROLLER, CGROUPV2_BASE_CONTROLLER)) {
-      for (CGroupInfo cgroup : cgroups) {
-        if (cgroup.getControllers().contains(controller)) {
-          Path path = Paths.get(cgroupMountPath.toString(), controller, cgroup.getPath());
-          long inode = readInode(path);
-          // ignore invalid and root inode
-          if (inode > 2) {
-            return "in-" + inode;
-          }
-        }
-      }
-    }
-    return null;
-  }
-
-  /**
-   * @return 0 - if it couldn't read inode
-   */
-  static long readInode(Path path) {
-    try {
-      return (long) Files.getAttribute(path, "unix:ino");
-    } catch (Exception e) {
-      log.debug("Unable to read cgroup inode of {} because of {}", path, e.getClass());
-    }
-    return 0;
-  }
+    private static final ContainerInfo INSTANCE;
+
+    private static final long PROC_CGROUP_INIT_INO = 0xEFFFFFFBL;
+    private static final String CGROUPV1_BASE_CONTROLLER = "memory";
+    private static final String CGROUPV2_BASE_CONTROLLER = "";
 
-  public static class CGroupInfo {
-    public int id;
-    public String path;
-    public List<String> controllers;
+    private static final String ENTITY_ID;
+
+    @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
     public String containerId;
+
+    @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
+    public String containerTagsHash;
+
+    @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
     public String podId;
 
-    public int getId() {
-      return id;
+    @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
+    public List<CGroupInfo> cGroups = new ArrayList<>();
+
+    public String getContainerId() {
+        return containerId;
     }
 
-    public void setId(int id) {
-      this.id = id;
+    public void setContainerId(String containerId) {
+        this.containerId = containerId;
     }
 
-    public String getPath() {
-      return path;
+    public String getContainerTagsHash() {
+        return containerTagsHash;
     }
 
-    public void setPath(String path) {
-      this.path = path;
+    public void setContainerTagsHash(String containerTagsHash) {
+        this.containerTagsHash = containerTagsHash;
     }
 
-    public List<String> getControllers() {
-      return controllers;
+    public String getPodId() {
+        return podId;
     }
 
-    public void setControllers(List<String> controllers) {
-      this.controllers = controllers;
+    public void setPodId(String podId) {
+        this.podId = podId;
     }
 
-    public String getContainerId() {
-      return containerId;
+    public List<CGroupInfo> getCGroups() {
+        return cGroups;
     }
 
-    public void setContainerId(String containerId) {
-      this.containerId = containerId;
+    public void setcGroups(List<CGroupInfo> cGroups) {
+        this.cGroups = cGroups;
     }
 
-    public String getPodId() {
-      return podId;
+    static {
+        ContainerInfo containerInfo = new ContainerInfo();
+        if (ContainerInfo.isRunningInContainer()) {
+            try {
+                containerInfo = ContainerInfo.fromDefaultProcFile();
+            } catch (final IOException | ParseException e) {
+                log.error("Unable to parse proc file");
+            }
+        }
+
+        INSTANCE = containerInfo;
+
+        ENTITY_ID = readEntityID(containerInfo, isHostCgroupNamespace(), DEFAULT_CGROUP_MOUNT_PATH);
     }
 
-    public void setPodId(String podId) {
-      this.podId = podId;
+    static @Nullable String readEntityID(
+            ContainerInfo containerInfo, boolean isHostCgroupNamespace, Path cgroupMountPath) {
+        String cid = containerInfo.getContainerId();
+        if (cid != null && !cid.isEmpty()) {
+            return "cid-" + cid;
+        }
+        if (isHostCgroupNamespace) {
+            return null;
+        }
+        return getCgroupInode(cgroupMountPath, containerInfo.getCGroups());
     }
-  }
 
-  public static ContainerInfo get() {
-    return INSTANCE;
-  }
+    /** Checks if the agent is running in the host cgroup namespace. */
+    static boolean isHostCgroupNamespace() {
+        // Currently, host namespace inode number is hardcoded, which can be used to detect if it's
+        // running in host namespace or not (does not work when running in DinD)
+        // https://github.com/torvalds/linux/blob/5859a2b1991101d6b978f3feb5325dad39421f29/include/linux/proc_ns.h#L41-L49
+        return readInode(HOST_GROUP_NAMESPACE) == PROC_CGROUP_INIT_INO;
+    }
 
-  public static String getEntityId() {
-    return ENTITY_ID;
-  }
+    /**
+     * Returns the inode of the cgroup controller if it exists, otherwise an empty string. The inode
+     * is prefixed with "in-" and is used by the agent to retrieve the container ID.
+     */
+    static @Nullable String getCgroupInode(Path cgroupMountPath, List<CGroupInfo> cgroups) {
+        // It first tries to get the cGroupV1 "memory" controller inode, and if that fails, it tries to
+        // get the cGroupV2 inode.
+        for (String controller : Arrays.asList(CGROUPV1_BASE_CONTROLLER, CGROUPV2_BASE_CONTROLLER)) {
+            for (CGroupInfo cgroup : cgroups) {
+                if (cgroup.getControllers().contains(controller)) {
+                    Path path = Paths.get(cgroupMountPath.toString(), controller, cgroup.getPath());
+                    long inode = readInode(path);
+                    // ignore invalid and root inode
+                    if (inode > 2) {
+                        return "in-" + inode;
+                    }
+                }
+            }
+        }
+        return null;
+    }
 
-  public static boolean isRunningInContainer() {
-    return Files.isReadable(CGROUP_DEFAULT_PROCFILE);
-  }
+    /**
+     * @return 0 - if it couldn't read inode
+     */
+    static long readInode(Path path) {
+        try {
+            return (long) Files.getAttribute(path, "unix:ino");
+        } catch (Exception e) {
+            log.debug("Unable to read cgroup inode of {} because of {}", path, e.getClass());
+        }
+        return 0;
+    }
 
-  public static ContainerInfo fromDefaultProcFile() throws IOException, ParseException {
-    return fromProcFile(CGROUP_DEFAULT_PROCFILE);
-  }
+    public static class CGroupInfo {
+        public int id;
+        public String path;
+        public List<String> controllers;
+        public String containerId;
+        public String podId;
 
-  static ContainerInfo fromProcFile(Path path) throws IOException, ParseException {
-    final String content = new String(Files.readAllBytes(path));
-    if (content.isEmpty()) {
-      log.debug("Proc file is empty");
-      return new ContainerInfo();
-    }
-    return parse(content);
-  }
+        public int getId() {
+            return id;
+        }
 
-  public static ContainerInfo parse(final String cgroupsContent) throws ParseException {
-    final ContainerInfo containerInfo = new ContainerInfo();
+        public void setId(int id) {
+            this.id = id;
+        }
 
-    final String[] lines = cgroupsContent.split("\n");
-    for (final String line : lines) {
-      final CGroupInfo cGroupInfo = parseLine(line);
+        public String getPath() {
+            return path;
+        }
 
-      containerInfo.getCGroups().add(cGroupInfo);
+        public void setPath(String path) {
+            this.path = path;
+        }
+
+        public List<String> getControllers() {
+            return controllers;
+        }
+
+        public void setControllers(List<String> controllers) {
+            this.controllers = controllers;
+        }
+
+        public String getContainerId() {
+            return containerId;
+        }
+
+        public void setContainerId(String containerId) {
+            this.containerId = containerId;
+        }
+
+        public String getPodId() {
+            return podId;
+        }
 
-      if (cGroupInfo.getPodId() != null) {
-        containerInfo.setPodId(cGroupInfo.getPodId());
-      }
+        public void setPodId(String podId) {
+            this.podId = podId;
+        }
+    }
 
-      replaceContainerIdIfBetter(containerInfo, cGroupInfo);
+    public static ContainerInfo get() {
+        return INSTANCE;
     }
 
-    return containerInfo;
-  }
-
-  /**
-   * Keeps the best available container id candidate across cgroup lines.
-   *
-   * <p>Some environments expose both detailed cgroup-v1 controller paths and a cgroup-v2 membership
-   * path (0::...) where the tail can be task-level and less specific.
-   */
-  private static void replaceContainerIdIfBetter(
-      ContainerInfo currentContainerInfo, CGroupInfo candidate) {
-    String candidateContainerId = candidate.getContainerId();
-    if (candidateContainerId == null) return;
-
-    String currentContainerId = currentContainerInfo.getContainerId();
-    if (currentContainerId != null
-        && currentContainerId.matches(CONTAINER_REGEX)
-        && candidateContainerId.matches(TASK_REGEX)
-        && currentContainerInfo.getPodId() != null
-        && candidate.getPodId() == null) {
-      // Do not replace a pod-scoped container id with a task-scoped id from a less specific path.
-      // This protects hybrid cgroup output where trailing 0:: lines contain only task ids.
-      return;
+    public static String getEntityId() {
+        return ENTITY_ID;
     }
 
-    currentContainerInfo.setContainerId(candidateContainerId);
-  }
+    public static boolean isRunningInContainer() {
+        return Files.isReadable(CGROUP_DEFAULT_PROCFILE);
+    }
 
-  static CGroupInfo parseLine(final String line) throws ParseException {
-    final Matcher matcher = LINE_PATTERN.matcher(line);
+    public static ContainerInfo fromDefaultProcFile() throws IOException, ParseException {
+        return fromProcFile(CGROUP_DEFAULT_PROCFILE);
+    }
 
-    if (!matcher.matches()) {
-      throw new ParseException("Unable to match cgroup", 0);
+    static ContainerInfo fromProcFile(Path path) throws IOException, ParseException {
+        final String content = new String(Files.readAllBytes(path));
+        if (content.isEmpty()) {
+            log.debug("Proc file is empty");
+            return new ContainerInfo();
+        }
+        return parse(content);
     }
 
-    final CGroupInfo cGroupInfo = new CGroupInfo();
-    cGroupInfo.setId(Integer.parseInt(matcher.group(1)));
-    cGroupInfo.setControllers(Arrays.asList(matcher.group(2).split(",")));
+    public static ContainerInfo parse(final String cgroupsContent) throws ParseException {
+        final ContainerInfo containerInfo = new ContainerInfo();
 
-    final String path = matcher.group(3);
-    final String[] pathParts = path.split("/");
+        final String[] lines = cgroupsContent.split("\n");
+        for (final String line : lines) {
+            final CGroupInfo cGroupInfo = parseLine(line);
 
-    cGroupInfo.setPath(path);
+            containerInfo.getCGroups().add(cGroupInfo);
 
-    if (pathParts.length >= 1) {
-      final Matcher containerIdMatcher = CONTAINER_PATTERN.matcher(pathParts[pathParts.length - 1]);
-      final String containerId = containerIdMatcher.matches() ? containerIdMatcher.group(1) : null;
-      cGroupInfo.setContainerId(containerId);
+            if (cGroupInfo.getPodId() != null) {
+                containerInfo.setPodId(cGroupInfo.getPodId());
+            }
+
+            replaceContainerIdIfBetter(containerInfo, cGroupInfo);
+        }
+
+        return containerInfo;
     }
 
-    if (pathParts.length >= 2) {
-      final Matcher podIdMatcher = POD_PATTERN.matcher(pathParts[pathParts.length - 2]);
-      final String podId = podIdMatcher.matches() ? podIdMatcher.group(1) : null;
-      cGroupInfo.setPodId(podId);
+    /**
+     * Keeps the best available container id candidate across cgroup lines.
+     *
+     * <p>Some environments expose both detailed cgroup-v1 controller paths and a cgroup-v2 membership
+     * path (0::...) where the tail can be task-level and less specific.
+     */
+    private static void replaceContainerIdIfBetter(ContainerInfo currentContainerInfo, CGroupInfo candidate) {
+        String candidateContainerId = candidate.getContainerId();
+        if (candidateContainerId == null) return;
+
+        String currentContainerId = currentContainerInfo.getContainerId();
+        if (currentContainerId != null
+                && currentContainerId.matches(CONTAINER_REGEX)
+                && candidateContainerId.matches(TASK_REGEX)
+                && currentContainerInfo.getPodId() != null
+                && candidate.getPodId() == null) {
+            // Do not replace a pod-scoped container id with a task-scoped id from a less specific path.
+            // This protects hybrid cgroup output where trailing 0:: lines contain only task ids.
+            return;
+        }
+
+        currentContainerInfo.setContainerId(candidateContainerId);
     }
 
-    return cGroupInfo;
-  }
+    static CGroupInfo parseLine(final String line) throws ParseException {
+        final Matcher matcher = LINE_PATTERN.matcher(line);
+
+        if (!matcher.matches()) {
+            throw new ParseException("Unable to match cgroup", 0);
+        }
+
+        final CGroupInfo cGroupInfo = new CGroupInfo();
+        cGroupInfo.setId(Integer.parseInt(matcher.group(1)));
+        cGroupInfo.setControllers(Arrays.asList(matcher.group(2).split(",")));
+
+        final String path = matcher.group(3);
+        final String[] pathParts = path.split("/");
+
+        cGroupInfo.setPath(path);
+
+        if (pathParts.length >= 1) {
+            final Matcher containerIdMatcher = CONTAINER_PATTERN.matcher(pathParts[pathParts.length - 1]);
+            final String containerId = containerIdMatcher.matches() ? containerIdMatcher.group(1) : null;
+            cGroupInfo.setContainerId(containerId);
+        }
+
+        if (pathParts.length >= 2) {
+            final Matcher podIdMatcher = POD_PATTERN.matcher(pathParts[pathParts.length - 2]);
+            final String podId = podIdMatcher.matches() ? podIdMatcher.group(1) : null;
+            cGroupInfo.setPodId(podId);
+        }
+
+        return cGroupInfo;
+    }
 }
diff --git a/utils/container-utils/src/main/java/datadog/common/container/ServerlessInfo.java b/utils/container-utils/src/main/java/datadog/common/container/ServerlessInfo.java
index 8603deac8cf..89cccef7305 100644
--- a/utils/container-utils/src/main/java/datadog/common/container/ServerlessInfo.java
+++ b/utils/container-utils/src/main/java/datadog/common/container/ServerlessInfo.java
@@ -5,46 +5,43 @@
 import java.io.File;
 
 public class ServerlessInfo {
-  private static final String AWS_FUNCTION_VARIABLE = "AWS_LAMBDA_FUNCTION_NAME";
-  private static final String EXTENSION_PATH = "/opt/extensions/datadog-agent";
-  private static final ServerlessInfo INSTANCE = new ServerlessInfo();
-
-  private final String functionName;
-  private final boolean hasExtension;
-
-  private ServerlessInfo(final String extensionPath) {
-    this.functionName = ConfigHelper.env(AWS_FUNCTION_VARIABLE);
-    if (null == extensionPath) {
-      this.hasExtension = false;
-    } else {
-      File f = new File(extensionPath);
-      this.hasExtension = (f.exists() && !f.isDirectory());
+    private static final String AWS_FUNCTION_VARIABLE = "AWS_LAMBDA_FUNCTION_NAME";
+    private static final String EXTENSION_PATH = "/opt/extensions/datadog-agent";
+    private static final ServerlessInfo INSTANCE = new ServerlessInfo();
+
+    private final String functionName;
+    private final boolean hasExtension;
+
+    private ServerlessInfo(final String extensionPath) {
+        this.functionName = ConfigHelper.env(AWS_FUNCTION_VARIABLE);
+        if (null == extensionPath) {
+            this.hasExtension = false;
+        } else {
+            File f = new File(extensionPath);
+            this.hasExtension = (f.exists() && !f.isDirectory());
+        }
+    }
+
+    @SuppressFBWarnings({"DMI_HARDCODED_ABSOLUTE_FILENAME", "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR"})
+    public ServerlessInfo() {
+        // TODO add more serverless configuration properties
+        // support envs other than AWS lambda
+        this(EXTENSION_PATH);
+    }
+
+    public static ServerlessInfo get() {
+        return INSTANCE;
+    }
+
+    public boolean isRunningInServerlessEnvironment() {
+        return functionName != null && !functionName.isEmpty();
+    }
+
+    public boolean hasExtension() {
+        return hasExtension;
+    }
+
+    public String getFunctionName() {
+        return functionName;
     }
-  }
-
-  @SuppressFBWarnings({
-    "DMI_HARDCODED_ABSOLUTE_FILENAME",
-    "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR"
-  })
-  public ServerlessInfo() {
-    // TODO add more serverless configuration properties
-    // support envs other than AWS lambda
-    this(EXTENSION_PATH);
-  }
-
-  public static ServerlessInfo get() {
-    return INSTANCE;
-  }
-
-  public boolean isRunningInServerlessEnvironment() {
-    return functionName != null && !functionName.isEmpty();
-  }
-
-  public boolean hasExtension() {
-    return hasExtension;
-  }
-
-  public String getFunctionName() {
-    return functionName;
-  }
 }
diff --git a/utils/container-utils/src/test/java/datadog/common/container/ContainerInfoTest.java b/utils/container-utils/src/test/java/datadog/common/container/ContainerInfoTest.java
index cb6fe8bf0d9..2e5b7470dca 100644
--- a/utils/container-utils/src/test/java/datadog/common/container/ContainerInfoTest.java
+++ b/utils/container-utils/src/test/java/datadog/common/container/ContainerInfoTest.java
@@ -27,7 +27,7 @@
 @SuppressForbidden
 public class ContainerInfoTest extends DDJavaSpecification {
 
-  // spotless:off
+    // spotless:off
   @TableTest({
     "id | controllers           | path                                                                                                                            | containerId                                                        | podId                                  | line",
     // Docker examples
@@ -99,19 +99,19 @@ void cGroupInfoIsParsedFromIndividualLines(
   }
   // spotless:on
 
-  @ParameterizedTest
-  @MethodSource("containerInfoParsedFromFileContentArguments")
-  void containerInfoParsedFromFileContent(
-      String containerId, String podId, int size, String content) throws Exception {
-    ContainerInfo containerInfo = ContainerInfo.parse(content);
+    @ParameterizedTest
+    @MethodSource("containerInfoParsedFromFileContentArguments")
+    void containerInfoParsedFromFileContent(String containerId, String podId, int size, String content)
+            throws Exception {
+        ContainerInfo containerInfo = ContainerInfo.parse(content);
 
-    assertEquals(containerId, containerInfo.getContainerId());
-    assertEquals(podId, containerInfo.getPodId());
-    assertEquals(size, containerInfo.getCGroups().size());
-  }
+        assertEquals(containerId, containerInfo.getContainerId());
+        assertEquals(podId, containerInfo.getPodId());
+        assertEquals(size, containerInfo.getCGroups().size());
+    }
 
-  static Stream<Arguments> containerInfoParsedFromFileContentArguments() {
-    // spotless:off
+    static Stream<Arguments> containerInfoParsedFromFileContentArguments() {
+        // spotless:off
     return Stream.of(
         // Docker
         arguments("3726184226f5d3147c25fdeab5b60097e378e8a720503a5e19ecfdf29f869860", null, 13,
@@ -211,55 +211,55 @@ static Stream<Arguments> containerInfoParsedFromFileContentArguments() {
             + "1:name=systemd:/system.slice/garden.service/garden/6f265890-5165-7fab-6b52-18d1")
     );
     // spotless:on
-  }
+    }
 
-  @Test
-  void containerInfoFromEmptyFileIsEmpty() throws Exception {
-    File f = File.createTempFile("container-info-test-", "-empty-file");
-    f.deleteOnExit();
-    Path p = Paths.get(f.getPath());
+    @Test
+    void containerInfoFromEmptyFileIsEmpty() throws Exception {
+        File f = File.createTempFile("container-info-test-", "-empty-file");
+        f.deleteOnExit();
+        Path p = Paths.get(f.getPath());
 
-    ContainerInfo containerInfo = ContainerInfo.fromProcFile(p);
+        ContainerInfo containerInfo = ContainerInfo.fromProcFile(p);
 
-    assertNull(containerInfo.getContainerId());
-    assertNull(containerInfo.getPodId());
-    assertEquals(0, containerInfo.getCGroups().size());
-  }
+        assertNull(containerInfo.getContainerId());
+        assertNull(containerInfo.getPodId());
+        assertEquals(0, containerInfo.getCGroups().size());
+    }
 
-  @Test
-  void containerInfoThrowsParseExceptionWhenGivenMalformedProcfile() throws Exception {
-    File f = File.createTempFile("container-info-test-", "-malformed-file");
-    f.deleteOnExit();
-    Files.write(f.toPath(), "This is not valid".getBytes());
-    Path p = Paths.get(f.getPath());
+    @Test
+    void containerInfoThrowsParseExceptionWhenGivenMalformedProcfile() throws Exception {
+        File f = File.createTempFile("container-info-test-", "-malformed-file");
+        f.deleteOnExit();
+        Files.write(f.toPath(), "This is not valid".getBytes());
+        Path p = Paths.get(f.getPath());
 
-    assertThrows(ParseException.class, () -> ContainerInfo.fromProcFile(p));
-  }
+        assertThrows(ParseException.class, () -> ContainerInfo.fromProcFile(p));
+    }
 
-  @Test
-  void containerInfoToleratesMissingContainerIdAndPodIdInProcfile() throws Exception {
-    File f = File.createTempFile("container-info-test-", "-missing-container-id");
-    f.deleteOnExit();
-    Files.write(f.toPath(), "1:cpuset:fake-path".getBytes());
-    Path p = Paths.get(f.getPath());
+    @Test
+    void containerInfoToleratesMissingContainerIdAndPodIdInProcfile() throws Exception {
+        File f = File.createTempFile("container-info-test-", "-missing-container-id");
+        f.deleteOnExit();
+        Files.write(f.toPath(), "1:cpuset:fake-path".getBytes());
+        Path p = Paths.get(f.getPath());
 
-    ContainerInfo containerInfo = ContainerInfo.fromProcFile(p);
+        ContainerInfo containerInfo = ContainerInfo.fromProcFile(p);
 
-    assertNull(containerInfo.getContainerId());
-    assertNull(containerInfo.getPodId());
-    assertEquals(1, containerInfo.getCGroups().size());
-  }
+        assertNull(containerInfo.getContainerId());
+        assertNull(containerInfo.getPodId());
+        assertEquals(1, containerInfo.getCGroups().size());
+    }
 
-  @Test
-  void getInoPathShouldReturnSameValueAsLsIdPath() throws Exception {
-    File f = File.createTempFile("container-info-test-", "-inode-file");
-    f.deleteOnExit();
-    Path path = f.toPath();
+    @Test
+    void getInoPathShouldReturnSameValueAsLsIdPath() throws Exception {
+        File f = File.createTempFile("container-info-test-", "-inode-file");
+        f.deleteOnExit();
+        Path path = f.toPath();
 
-    assertEquals(readInode(path), ContainerInfo.readInode(path));
-  }
+        assertEquals(readInode(path), ContainerInfo.readInode(path));
+    }
 
-  // spotless:off
+    // spotless:off
   @TableTest({
     "cid          | isHostCgroupNamespace",
     "cid          | true                 ",
@@ -275,19 +275,19 @@ void readEntityIDReturnCidContainerIdIfContainerIdIsDefined(
   }
   // spotless:on
 
-  @TableTest({
-    "cid",
-    "   ",
-    "'' "
-  })
-  void readEntityIDReturnNullIfContainerIdIsNotDefinedAndIsHostCgroupNamespace(String cid) {
-    ContainerInfo containerInfo = new ContainerInfo();
-    containerInfo.setContainerId(cid);
+    @TableTest({
+      "cid",
+      "   ",
+      "'' "
+    })
+    void readEntityIDReturnNullIfContainerIdIsNotDefinedAndIsHostCgroupNamespace(String cid) {
+        ContainerInfo containerInfo = new ContainerInfo();
+        containerInfo.setContainerId(cid);
 
-    assertNull(ContainerInfo.readEntityID(containerInfo, true, Paths.get("/sys/fs/cgroup")));
-  }
+        assertNull(ContainerInfo.readEntityID(containerInfo, true, Paths.get("/sys/fs/cgroup")));
+    }
 
-  // spotless:off
+    // spotless:off
   @TableTest({
     "controllers          | hasEntityId",
     "['', memory]         | true       ",
@@ -340,37 +340,38 @@ void readEntityIDReturnIdInoForMemoryController(
   }
   // spotless:on
 
-  @Test
-  void readEntityIDReturnIdInoForParentWhenPathIsSlash() throws Exception {
-    File mountPath = createTempDir();
-    File memoryController = Files.createDirectory(mountPath.toPath().resolve("memory")).toFile();
-    memoryController.deleteOnExit();
-    long ino = readInode(memoryController.toPath());
-
-    ContainerInfo containerInfo = new ContainerInfo();
-    ContainerInfo.CGroupInfo cGroupInfo = new ContainerInfo.CGroupInfo();
-    cGroupInfo.setControllers(Arrays.asList("memory"));
-    cGroupInfo.setPath("/");
-    containerInfo.setcGroups(Arrays.asList(cGroupInfo));
-
-    assertEquals("in-" + ino, ContainerInfo.readEntityID(containerInfo, false, mountPath.toPath()));
-  }
+    @Test
+    void readEntityIDReturnIdInoForParentWhenPathIsSlash() throws Exception {
+        File mountPath = createTempDir();
+        File memoryController =
+                Files.createDirectory(mountPath.toPath().resolve("memory")).toFile();
+        memoryController.deleteOnExit();
+        long ino = readInode(memoryController.toPath());
+
+        ContainerInfo containerInfo = new ContainerInfo();
+        ContainerInfo.CGroupInfo cGroupInfo = new ContainerInfo.CGroupInfo();
+        cGroupInfo.setControllers(Arrays.asList("memory"));
+        cGroupInfo.setPath("/");
+        containerInfo.setcGroups(Arrays.asList(cGroupInfo));
+
+        assertEquals("in-" + ino, ContainerInfo.readEntityID(containerInfo, false, mountPath.toPath()));
+    }
 
-  private static File createTempDir() throws IOException {
-    File dir = File.createTempFile("container-info-test-", "-sys-fs-cgroup");
-    dir.delete();
-    dir.mkdirs();
-    dir.deleteOnExit();
-    return dir;
-  }
+    private static File createTempDir() throws IOException {
+        File dir = File.createTempFile("container-info-test-", "-sys-fs-cgroup");
+        dir.delete();
+        dir.mkdirs();
+        dir.deleteOnExit();
+        return dir;
+    }
 
-  private static long readInode(Path path) throws IOException, InterruptedException {
-    ProcessBuilder pb = new ProcessBuilder("ls", "-id", path.toString());
-    Process ps = pb.start();
-    try (BufferedReader reader = new BufferedReader(new InputStreamReader(ps.getInputStream()))) {
-      String line = reader.readLine();
-      ps.waitFor();
-      return Long.parseLong(line.substring(0, line.indexOf(' ')));
+    private static long readInode(Path path) throws IOException, InterruptedException {
+        ProcessBuilder pb = new ProcessBuilder("ls", "-id", path.toString());
+        Process ps = pb.start();
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(ps.getInputStream()))) {
+            String line = reader.readLine();
+            ps.waitFor();
+            return Long.parseLong(line.substring(0, line.indexOf(' ')));
+        }
     }
-  }
 }
diff --git a/utils/container-utils/src/test/java/datadog/common/container/ServerlessInfoTest.java b/utils/container-utils/src/test/java/datadog/common/container/ServerlessInfoTest.java
index 059a69424f5..c0beaa2bfa8 100644
--- a/utils/container-utils/src/test/java/datadog/common/container/ServerlessInfoTest.java
+++ b/utils/container-utils/src/test/java/datadog/common/container/ServerlessInfoTest.java
@@ -14,60 +14,58 @@
 
 public class ServerlessInfoTest extends DDJavaSpecification {
 
-  // AWS_LAMBDA_FUNCTION_NAME is ServerlessInfo.AWS_FUNCTION_VARIABLE (private constant)
-  private static final String AWS_FUNCTION_VARIABLE = "AWS_LAMBDA_FUNCTION_NAME";
-
-  private static final ControllableEnvironmentVariables environmentVariables =
-      ControllableEnvironmentVariables.setup();
-
-  @AfterEach
-  void clearEnvVars() {
-    environmentVariables.clear();
-  }
-
-  @TableTest({
-    "functionName | serverlessEnv",
-    "             | false        ",
-    "''           | false        ",
-    "someName     | true         "
-  })
-  void testServerlessDetection(String functionName, boolean serverlessEnv) {
-    environmentVariables.set(AWS_FUNCTION_VARIABLE, functionName);
-
-    ServerlessInfo info = new ServerlessInfo();
-
-    assertEquals(serverlessEnv, info.isRunningInServerlessEnvironment());
-    assertEquals(functionName, info.getFunctionName());
-  }
-
-  @Test
-  void testServerlessHasExtensionFalse() {
-    ServerlessInfo info = new ServerlessInfo();
-
-    assertFalse(info.hasExtension());
-  }
-
-  @Test
-  void testServerlessHasExtensionFalseSinceExtensionPathIsNull() throws Exception {
-    // ServerlessInfo(String extensionPath) is private — access via reflection
-    Constructor<ServerlessInfo> constructor =
-        ServerlessInfo.class.getDeclaredConstructor(String.class);
-    constructor.setAccessible(true);
-    ServerlessInfo info = constructor.newInstance((Object) null);
-
-    assertFalse(info.hasExtension());
-  }
-
-  @Test
-  void testServerlessHasExtensionTrue() throws Exception {
-    File f = File.createTempFile("fake-", "extension");
-    f.deleteOnExit();
-
-    Constructor<ServerlessInfo> constructor =
-        ServerlessInfo.class.getDeclaredConstructor(String.class);
-    constructor.setAccessible(true);
-    ServerlessInfo info = constructor.newInstance(f.getAbsolutePath());
-
-    assertTrue(info.hasExtension());
-  }
+    // AWS_LAMBDA_FUNCTION_NAME is ServerlessInfo.AWS_FUNCTION_VARIABLE (private constant)
+    private static final String AWS_FUNCTION_VARIABLE = "AWS_LAMBDA_FUNCTION_NAME";
+
+    private static final ControllableEnvironmentVariables environmentVariables =
+            ControllableEnvironmentVariables.setup();
+
+    @AfterEach
+    void clearEnvVars() {
+        environmentVariables.clear();
+    }
+
+    @TableTest({
+      "functionName | serverlessEnv",
+      "             | false        ",
+      "''           | false        ",
+      "someName     | true         "
+    })
+    void testServerlessDetection(String functionName, boolean serverlessEnv) {
+        environmentVariables.set(AWS_FUNCTION_VARIABLE, functionName);
+
+        ServerlessInfo info = new ServerlessInfo();
+
+        assertEquals(serverlessEnv, info.isRunningInServerlessEnvironment());
+        assertEquals(functionName, info.getFunctionName());
+    }
+
+    @Test
+    void testServerlessHasExtensionFalse() {
+        ServerlessInfo info = new ServerlessInfo();
+
+        assertFalse(info.hasExtension());
+    }
+
+    @Test
+    void testServerlessHasExtensionFalseSinceExtensionPathIsNull() throws Exception {
+        // ServerlessInfo(String extensionPath) is private — access via reflection
+        Constructor<ServerlessInfo> constructor = ServerlessInfo.class.getDeclaredConstructor(String.class);
+        constructor.setAccessible(true);
+        ServerlessInfo info = constructor.newInstance((Object) null);
+
+        assertFalse(info.hasExtension());
+    }
+
+    @Test
+    void testServerlessHasExtensionTrue() throws Exception {
+        File f = File.createTempFile("fake-", "extension");
+        f.deleteOnExit();
+
+        Constructor<ServerlessInfo> constructor = ServerlessInfo.class.getDeclaredConstructor(String.class);
+        constructor.setAccessible(true);
+        ServerlessInfo info = constructor.newInstance(f.getAbsolutePath());
+
+        assertTrue(info.hasExtension());
+    }
 }
diff --git a/utils/filesystem-utils/src/main/java/datadog/common/filesystem/Files.java b/utils/filesystem-utils/src/main/java/datadog/common/filesystem/Files.java
index c0ebf34bc45..c820aff8172 100644
--- a/utils/filesystem-utils/src/main/java/datadog/common/filesystem/Files.java
+++ b/utils/filesystem-utils/src/main/java/datadog/common/filesystem/Files.java
@@ -6,25 +6,25 @@
 /** Utility methods related to file operations. */
 public final class Files {
 
-  private Files() {
-    // Prevent instantiation
-  }
+    private Files() {
+        // Prevent instantiation
+    }
 
-  /**
-   * Determines whether the given file exists on the filesystem.
-   *
-   * <p>This method wraps {@link File#exists()} and safely handles {@link SecurityException}s that
-   * may occur if the caller does not have the required permissions to examine the file. In such
-   * cases, this method returns {@code false}.
-   *
-   * @param file the file to check for existence; must not be {@code null}
-   * @return {@code true} if the file exists and can be queried, {@code false} otherwise
-   */
-  public static boolean exists(@Nonnull File file) {
-    try {
-      return file.exists();
-    } catch (SecurityException ignored) {
-      return false;
+    /**
+     * Determines whether the given file exists on the filesystem.
+     *
+     * <p>This method wraps {@link File#exists()} and safely handles {@link SecurityException}s that
+     * may occur if the caller does not have the required permissions to examine the file. In such
+     * cases, this method returns {@code false}.
+     *
+     * @param file the file to check for existence; must not be {@code null}
+     * @return {@code true} if the file exists and can be queried, {@code false} otherwise
+     */
+    public static boolean exists(@Nonnull File file) {
+        try {
+            return file.exists();
+        } catch (SecurityException ignored) {
+            return false;
+        }
     }
-  }
 }
diff --git a/utils/filesystem-utils/src/test/java/datadog/common/filesystem/FilesTest.java b/utils/filesystem-utils/src/test/java/datadog/common/filesystem/FilesTest.java
index daa50573910..88d94e432f1 100644
--- a/utils/filesystem-utils/src/test/java/datadog/common/filesystem/FilesTest.java
+++ b/utils/filesystem-utils/src/test/java/datadog/common/filesystem/FilesTest.java
@@ -12,64 +12,63 @@
 
 public class FilesTest {
 
-  private SecurityManager originalSM;
+    private SecurityManager originalSM;
 
-  @Test
-  void existsReturnsTrueWhenFileExistsAndIsAccessible() throws IOException {
-    File file = File.createTempFile("test", "txt");
-    file.deleteOnExit();
+    @Test
+    void existsReturnsTrueWhenFileExistsAndIsAccessible() throws IOException {
+        File file = File.createTempFile("test", "txt");
+        file.deleteOnExit();
 
-    assertTrue(Files.exists(file));
-  }
+        assertTrue(Files.exists(file));
+    }
 
-  @Test
-  void existsReturnsFalseWhenFileDoesNotExist() throws IOException {
-    File file = File.createTempFile("missing", "txt");
-    assertTrue(file.delete()); // ensure it does not exist
+    @Test
+    void existsReturnsFalseWhenFileDoesNotExist() throws IOException {
+        File file = File.createTempFile("missing", "txt");
+        assertTrue(file.delete()); // ensure it does not exist
 
-    assertFalse(Files.exists(file));
-  }
+        assertFalse(Files.exists(file));
+    }
 
-  @Test
-  @DisabledIf("isJava18OrLater")
-  void existsReturnsFalseWhenSecurityManagerForbidsFileAccess() throws IOException {
-    File file = File.createTempFile("test", "txt");
-    file.deleteOnExit();
+    @Test
+    @DisabledIf("isJava18OrLater")
+    void existsReturnsFalseWhenSecurityManagerForbidsFileAccess() throws IOException {
+        File file = File.createTempFile("test", "txt");
+        file.deleteOnExit();
 
-    // --- install restrictive SecurityManager only in this test ---
-    SecurityManager originalSM = System.getSecurityManager();
+        // --- install restrictive SecurityManager only in this test ---
+        SecurityManager originalSM = System.getSecurityManager();
 
-    System.setSecurityManager(
-        new SecurityManager() {
-          @Override
-          public void checkRead(String filePath) {
-            // Deny only THIS file so classloading still works
-            if (filePath.equals(file.getAbsolutePath())) {
-              throw new SecurityException("Access denied");
+        System.setSecurityManager(new SecurityManager() {
+            @Override
+            public void checkRead(String filePath) {
+                // Deny only THIS file so classloading still works
+                if (filePath.equals(file.getAbsolutePath())) {
+                    throw new SecurityException("Access denied");
+                }
             }
-          }
 
-          @Override
-          public void checkPermission(Permission perm) {
-            // allow everything else
-          }
+            @Override
+            public void checkPermission(Permission perm) {
+                // allow everything else
+            }
 
-          @Override
-          public void checkPermission(Permission perm, Object context) {
-            // allow everything else
-          }
+            @Override
+            public void checkPermission(Permission perm, Object context) {
+                // allow everything else
+            }
         });
 
-    try {
-      boolean result = Files.exists(file);
-      assertFalse(result);
-    } finally {
-      // --- restore original security manager ---
-      System.setSecurityManager(originalSM);
+        try {
+            boolean result = Files.exists(file);
+            assertFalse(result);
+        } finally {
+            // --- restore original security manager ---
+            System.setSecurityManager(originalSM);
+        }
     }
-  }
 
-  static boolean isJava18OrLater() {
-    return JavaVirtualMachine.isJavaVersionAtLeast(18);
-  }
+    static boolean isJava18OrLater() {
+        return JavaVirtualMachine.isJavaVersionAtLeast(18);
+    }
 }
diff --git a/utils/flare-utils/src/main/java/datadog/flare/TracerFlarePoller.java b/utils/flare-utils/src/main/java/datadog/flare/TracerFlarePoller.java
index 49755cf24d0..19f1491c243 100644
--- a/utils/flare-utils/src/main/java/datadog/flare/TracerFlarePoller.java
+++ b/utils/flare-utils/src/main/java/datadog/flare/TracerFlarePoller.java
@@ -17,169 +17,164 @@
 import okio.Okio;
 
 public final class TracerFlarePoller {
-  private static final String FLARE_LOG_LEVEL = "flare-log-level";
+    private static final String FLARE_LOG_LEVEL = "flare-log-level";
 
-  private Runnable stopPreparer;
-  private Runnable stopSubmitter;
+    private Runnable stopPreparer;
+    private Runnable stopSubmitter;
 
-  private TracerFlareService tracerFlareService;
+    private TracerFlareService tracerFlareService;
 
-  private final Map<String, String> configAction = new HashMap<>();
-  private static TracerFlarePoller INSTANCE;
+    private final Map<String, String> configAction = new HashMap<>();
+    private static TracerFlarePoller INSTANCE;
 
-  public static void start(SharedCommunicationObjects sco) {
-    if (null == INSTANCE) {
-      INSTANCE = new TracerFlarePoller();
+    public static void start(SharedCommunicationObjects sco) {
+        if (null == INSTANCE) {
+            INSTANCE = new TracerFlarePoller();
+        }
+        INSTANCE.doStart(sco);
     }
-    INSTANCE.doStart(sco);
-  }
 
-  public static void stop() {
-    if (null != INSTANCE) {
-      INSTANCE.doStop();
+    public static void stop() {
+        if (null != INSTANCE) {
+            INSTANCE.doStop();
+        }
     }
-  }
-
-  private void doStart(SharedCommunicationObjects sco) {
-    Config config = Config.get();
-    stopPreparer = new Preparer().register(config, sco);
-    stopSubmitter = new Submitter().register(config, sco);
-    tracerFlareService = new TracerFlareService(config, sco.agentHttpClient, sco.agentUrl);
-  }
-
-  private void doStop() {
-    if (null != stopPreparer) {
-      stopPreparer.run();
-    }
-    if (null != stopSubmitter) {
-      stopSubmitter.run();
-    }
-  }
 
-  final class Preparer implements ProductListener {
-    private final JsonAdapter<AgentConfigLayer> AGENT_CONFIG_LAYER_ADAPTER;
-
-    {
-      Moshi MOSHI = new Moshi.Builder().build();
-      AGENT_CONFIG_LAYER_ADAPTER = MOSHI.adapter(AgentConfigLayer.class);
+    private void doStart(SharedCommunicationObjects sco) {
+        Config config = Config.get();
+        stopPreparer = new Preparer().register(config, sco);
+        stopSubmitter = new Submitter().register(config, sco);
+        tracerFlareService = new TracerFlareService(config, sco.agentHttpClient, sco.agentUrl);
     }
 
-    public Runnable register(Config config, SharedCommunicationObjects sco) {
-      ConfigurationPoller poller = sco.configurationPoller(config);
-      if (null != poller) {
-        poller.addListener(Product.AGENT_CONFIG, this);
-        return poller::stop;
-      } else {
-        return null;
-      }
+    private void doStop() {
+        if (null != stopPreparer) {
+            stopPreparer.run();
+        }
+        if (null != stopSubmitter) {
+            stopSubmitter.run();
+        }
     }
 
-    @Override
-    public void accept(ConfigKey configKey, byte[] content, PollingRateHinter hinter)
-        throws IOException {
-      AgentConfigLayer agentConfigLayer =
-          AGENT_CONFIG_LAYER_ADAPTER.fromJson(
-              Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
-      if (null != agentConfigLayer
-          && null != agentConfigLayer.config
-          && null != agentConfigLayer.config.logLevel) {
-        configAction.put(configKey.getConfigId(), FLARE_LOG_LEVEL);
-        prepareForFlare(agentConfigLayer.config.logLevel);
-      } else {
-        cleanupAfterFlare();
-      }
+    final class Preparer implements ProductListener {
+        private final JsonAdapter<AgentConfigLayer> AGENT_CONFIG_LAYER_ADAPTER;
+
+        {
+            Moshi MOSHI = new Moshi.Builder().build();
+            AGENT_CONFIG_LAYER_ADAPTER = MOSHI.adapter(AgentConfigLayer.class);
+        }
+
+        public Runnable register(Config config, SharedCommunicationObjects sco) {
+            ConfigurationPoller poller = sco.configurationPoller(config);
+            if (null != poller) {
+                poller.addListener(Product.AGENT_CONFIG, this);
+                return poller::stop;
+            } else {
+                return null;
+            }
+        }
+
+        @Override
+        public void accept(ConfigKey configKey, byte[] content, PollingRateHinter hinter) throws IOException {
+            AgentConfigLayer agentConfigLayer =
+                    AGENT_CONFIG_LAYER_ADAPTER.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
+            if (null != agentConfigLayer
+                    && null != agentConfigLayer.config
+                    && null != agentConfigLayer.config.logLevel) {
+                configAction.put(configKey.getConfigId(), FLARE_LOG_LEVEL);
+                prepareForFlare(agentConfigLayer.config.logLevel);
+            } else {
+                cleanupAfterFlare();
+            }
+        }
+
+        @Override
+        public void remove(ConfigKey configKey, PollingRateHinter hinter) {
+            if (configAction.remove(configKey.getConfigId(), FLARE_LOG_LEVEL)) {
+                cleanupAfterFlare();
+            }
+        }
+
+        @Override
+        public void commit(PollingRateHinter hinter) {}
     }
 
-    @Override
-    public void remove(ConfigKey configKey, PollingRateHinter hinter) {
-      if (configAction.remove(configKey.getConfigId(), FLARE_LOG_LEVEL)) {
-        cleanupAfterFlare();
-      }
+    final class Submitter implements ProductListener {
+        private final JsonAdapter<AgentTask> AGENT_TASK_ADAPTER;
+
+        {
+            Moshi MOSHI = new Moshi.Builder().build();
+            AGENT_TASK_ADAPTER = MOSHI.adapter(AgentTask.class);
+        }
+
+        public Runnable register(Config config, SharedCommunicationObjects sco) {
+            ConfigurationPoller poller = sco.configurationPoller(config);
+            if (null != poller) {
+                poller.addListener(Product.AGENT_TASK, this);
+                return poller::stop;
+            } else {
+                return null;
+            }
+        }
+
+        @Override
+        public void accept(ConfigKey configKey, byte[] content, PollingRateHinter hinter) throws IOException {
+            AgentTask agentTask =
+                    AGENT_TASK_ADAPTER.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
+
+            if (null != agentTask && null != agentTask.args && "tracer_flare".equals(agentTask.taskType)) {
+                sendFlare(agentTask.args);
+            }
+        }
+
+        @Override
+        public void remove(ConfigKey configKey, PollingRateHinter hinter) {}
+
+        @Override
+        public void commit(PollingRateHinter hinter) {}
     }
 
-    @Override
-    public void commit(PollingRateHinter hinter) {}
-  }
-
-  final class Submitter implements ProductListener {
-    private final JsonAdapter<AgentTask> AGENT_TASK_ADAPTER;
-
-    {
-      Moshi MOSHI = new Moshi.Builder().build();
-      AGENT_TASK_ADAPTER = MOSHI.adapter(AgentTask.class);
+    void prepareForFlare(String logLevel) {
+        tracerFlareService.prepareForFlare(logLevel);
     }
 
-    public Runnable register(Config config, SharedCommunicationObjects sco) {
-      ConfigurationPoller poller = sco.configurationPoller(config);
-      if (null != poller) {
-        poller.addListener(Product.AGENT_TASK, this);
-        return poller::stop;
-      } else {
-        return null;
-      }
+    void cleanupAfterFlare() {
+        tracerFlareService.cleanupAfterFlare();
     }
 
-    @Override
-    public void accept(ConfigKey configKey, byte[] content, PollingRateHinter hinter)
-        throws IOException {
-      AgentTask agentTask =
-          AGENT_TASK_ADAPTER.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
-
-      if (null != agentTask
-          && null != agentTask.args
-          && "tracer_flare".equals(agentTask.taskType)) {
-        sendFlare(agentTask.args);
-      }
+    void sendFlare(AgentTaskArgs args) {
+        tracerFlareService.sendFlare(args.caseId, args.userHandle, args.hostname);
     }
 
-    @Override
-    public void remove(ConfigKey configKey, PollingRateHinter hinter) {}
-
-    @Override
-    public void commit(PollingRateHinter hinter) {}
-  }
-
-  void prepareForFlare(String logLevel) {
-    tracerFlareService.prepareForFlare(logLevel);
-  }
+    static final class AgentConfigLayer {
+        @Json(name = "name")
+        public String name;
 
-  void cleanupAfterFlare() {
-    tracerFlareService.cleanupAfterFlare();
-  }
-
-  void sendFlare(AgentTaskArgs args) {
-    tracerFlareService.sendFlare(args.caseId, args.userHandle, args.hostname);
-  }
-
-  static final class AgentConfigLayer {
-    @Json(name = "name")
-    public String name;
-
-    @Json(name = "config")
-    public AgentConfig config;
-  }
+        @Json(name = "config")
+        public AgentConfig config;
+    }
 
-  static final class AgentConfig {
-    @Json(name = "log_level")
-    public String logLevel;
-  }
+    static final class AgentConfig {
+        @Json(name = "log_level")
+        public String logLevel;
+    }
 
-  static final class AgentTask {
-    @Json(name = "task_type")
-    public String taskType;
+    static final class AgentTask {
+        @Json(name = "task_type")
+        public String taskType;
 
-    @Json(name = "args")
-    public AgentTaskArgs args;
-  }
+        @Json(name = "args")
+        public AgentTaskArgs args;
+    }
 
-  static final class AgentTaskArgs {
-    @Json(name = "case_id")
-    public String caseId;
+    static final class AgentTaskArgs {
+        @Json(name = "case_id")
+        public String caseId;
 
-    @Json(name = "user_handle")
-    public String userHandle;
+        @Json(name = "user_handle")
+        public String userHandle;
 
-    @Json(name = "hostname")
-    public String hostname;
-  }
+        @Json(name = "hostname")
+        public String hostname;
+    }
 }
diff --git a/utils/flare-utils/src/main/java/datadog/flare/TracerFlareService.java b/utils/flare-utils/src/main/java/datadog/flare/TracerFlareService.java
index dcb097287a3..40d9f47afc8 100644
--- a/utils/flare-utils/src/main/java/datadog/flare/TracerFlareService.java
+++ b/utils/flare-utils/src/main/java/datadog/flare/TracerFlareService.java
@@ -37,237 +37,232 @@
 import org.slf4j.LoggerFactory;
 
 final class TracerFlareService {
-  private static final Logger log = LoggerFactory.getLogger(TracerFlareService.class);
+    private static final Logger log = LoggerFactory.getLogger(TracerFlareService.class);
 
-  private static final String FLARE_ENDPOINT = "tracer_flare/v1";
+    private static final String FLARE_ENDPOINT = "tracer_flare/v1";
 
-  private static final String REPORT_PREFIX = "dd-java-flare-";
+    private static final String REPORT_PREFIX = "dd-java-flare-";
 
-  private static final MediaType OCTET_STREAM = MediaType.get("application/octet-stream");
+    private static final MediaType OCTET_STREAM = MediaType.get("application/octet-stream");
 
-  private static final int MAX_LOGFILE_SIZE_MB = 15;
+    private static final int MAX_LOGFILE_SIZE_MB = 15;
 
-  private static final int MAX_LOGFILE_SIZE_BYTES = MAX_LOGFILE_SIZE_MB << 20;
+    private static final int MAX_LOGFILE_SIZE_BYTES = MAX_LOGFILE_SIZE_MB << 20;
 
-  private final AgentTaskScheduler scheduler = new AgentTaskScheduler(TRACER_FLARE);
+    private final AgentTaskScheduler scheduler = new AgentTaskScheduler(TRACER_FLARE);
 
-  private final Config config;
-  private final OkHttpClient okHttpClient;
-  private final HttpUrl flareUrl;
+    private final Config config;
+    private final OkHttpClient okHttpClient;
+    private final HttpUrl flareUrl;
 
-  private boolean logLevelOverridden;
-  private volatile long flareStartMillis;
+    private boolean logLevelOverridden;
+    private volatile long flareStartMillis;
 
-  private Scheduled<Runnable> scheduledCleanup;
+    private Scheduled<Runnable> scheduledCleanup;
 
-  TracerFlareService(Config config, OkHttpClient okHttpClient, HttpUrl agentUrl) {
-    this.config = config;
-    this.okHttpClient = okHttpClient;
-    this.flareUrl = agentUrl.newBuilder().addPathSegments(FLARE_ENDPOINT).build();
+    TracerFlareService(Config config, OkHttpClient okHttpClient, HttpUrl agentUrl) {
+        this.config = config;
+        this.okHttpClient = okHttpClient;
+        this.flareUrl = agentUrl.newBuilder().addPathSegments(FLARE_ENDPOINT).build();
 
-    applyTriageReportTrigger(config.getTriageReportTrigger());
-  }
+        applyTriageReportTrigger(config.getTriageReportTrigger());
+    }
+
+    private void applyTriageReportTrigger(String triageTrigger) {
+        if (null != triageTrigger && !triageTrigger.isEmpty()) {
+            long delay = TimeUtils.parseSimpleDelay(triageTrigger);
+            if (delay < 0) {
+                log.info("Unrecognized triage trigger {}", triageTrigger);
+            } else {
+                scheduleTriageReport(delay);
+            }
+        }
+    }
+
+    private void scheduleTriageReport(long delayInSeconds) {
+        Path triagePath = Paths.get(config.getTriageReportDir());
+        // prepare at most 10 minutes before collection of the report, to match remote flare behaviour
+        scheduler.schedule(() -> prepareForFlare("triage"), delayInSeconds - 600, TimeUnit.SECONDS);
+        scheduler.schedule(
+                () -> {
+                    try {
+                        if (!Files.isDirectory(triagePath)) {
+                            Files.createDirectories(triagePath);
+                        }
+                        long flareEndMillis = System.currentTimeMillis();
+                        Path reportPath = triagePath.resolve(getFlareName(flareEndMillis));
+                        log.info("Writing triage report to {}", reportPath);
+                        Files.write(reportPath, buildFlareZip(flareStartMillis, flareEndMillis, true));
+                    } catch (Throwable e) {
+                        log.info("Problem writing triage report", e);
+                    } finally {
+                        cleanupAfterFlare();
+                    }
+                },
+                delayInSeconds,
+                TimeUnit.SECONDS);
+    }
+
+    public synchronized void prepareForFlare(String logLevel) {
+        // allow turning on debug even part way through preparation
+
+        if (!log.isDebugEnabled() && "debug".equalsIgnoreCase(logLevel)) {
+            GlobalLogLevelSwitcher.get().switchLevel(LogLevel.DEBUG);
+            logLevelOverridden = true;
+        }
+        Scheduled<Runnable> oldSchedule = scheduledCleanup;
+        if (null != oldSchedule) {
+            // already preparing, just cancel old schedule in favour of new one
+            oldSchedule.cancel();
+        } else {
+            flareStartMillis = System.currentTimeMillis();
+            log.debug("Preparing for tracer flare, logLevel={}", logLevel);
+            TracerFlare.prepareForFlare();
+        }
+        // always schedule fresh clean-up 20 minutes from last prepare request
+        scheduledCleanup = scheduler.schedule(new CleanupTask(), 20, TimeUnit.MINUTES);
+    }
 
-  private void applyTriageReportTrigger(String triageTrigger) {
-    if (null != triageTrigger && !triageTrigger.isEmpty()) {
-      long delay = TimeUtils.parseSimpleDelay(triageTrigger);
-      if (delay < 0) {
-        log.info("Unrecognized triage trigger {}", triageTrigger);
-      } else {
-        scheduleTriageReport(delay);
-      }
+    public void cleanupAfterFlare() {
+        doCleanup(null);
     }
-  }
-
-  private void scheduleTriageReport(long delayInSeconds) {
-    Path triagePath = Paths.get(config.getTriageReportDir());
-    // prepare at most 10 minutes before collection of the report, to match remote flare behaviour
-    scheduler.schedule(() -> prepareForFlare("triage"), delayInSeconds - 600, TimeUnit.SECONDS);
-    scheduler.schedule(
-        () -> {
-          try {
-            if (!Files.isDirectory(triagePath)) {
-              Files.createDirectories(triagePath);
+
+    synchronized void doCleanup(CleanupTask fromTask) {
+        Scheduled<Runnable> oldSchedule = scheduledCleanup;
+        if (null != oldSchedule) {
+            if (null == fromTask) {
+                // explicit clean-up request, cancel current schedule
+                oldSchedule.cancel();
+            } else if (oldSchedule.get() != fromTask) {
+                // ignore clean-up requests from tasks which aren't currently scheduled
+                return;
             }
-            long flareEndMillis = System.currentTimeMillis();
-            Path reportPath = triagePath.resolve(getFlareName(flareEndMillis));
-            log.info("Writing triage report to {}", reportPath);
-            Files.write(reportPath, buildFlareZip(flareStartMillis, flareEndMillis, true));
-          } catch (Throwable e) {
-            log.info("Problem writing triage report", e);
-          } finally {
-            cleanupAfterFlare();
-          }
-        },
-        delayInSeconds,
-        TimeUnit.SECONDS);
-  }
-
-  public synchronized void prepareForFlare(String logLevel) {
-    // allow turning on debug even part way through preparation
-
-    if (!log.isDebugEnabled() && "debug".equalsIgnoreCase(logLevel)) {
-      GlobalLogLevelSwitcher.get().switchLevel(LogLevel.DEBUG);
-      logLevelOverridden = true;
+            flareStartMillis = 0;
+            scheduledCleanup = null;
+            log.debug("Cleaning up after tracer flare");
+            TracerFlare.cleanupAfterFlare();
+            if (logLevelOverridden) {
+                GlobalLogLevelSwitcher.get().restore();
+                logLevelOverridden = false;
+            }
+        }
     }
-    Scheduled<Runnable> oldSchedule = scheduledCleanup;
-    if (null != oldSchedule) {
-      // already preparing, just cancel old schedule in favour of new one
-      oldSchedule.cancel();
-    } else {
-      flareStartMillis = System.currentTimeMillis();
-      log.debug("Preparing for tracer flare, logLevel={}", logLevel);
-      TracerFlare.prepareForFlare();
+
+    public void sendFlare(String caseId, String email, String hostname) {
+        boolean dumpThreads = config.isTriageEnabled() || log.isDebugEnabled();
+        scheduler.execute(() -> doSend(caseId, email, hostname, dumpThreads));
     }
-    // always schedule fresh clean-up 20 minutes from last prepare request
-    scheduledCleanup = scheduler.schedule(new CleanupTask(), 20, TimeUnit.MINUTES);
-  }
-
-  public void cleanupAfterFlare() {
-    doCleanup(null);
-  }
-
-  synchronized void doCleanup(CleanupTask fromTask) {
-    Scheduled<Runnable> oldSchedule = scheduledCleanup;
-    if (null != oldSchedule) {
-      if (null == fromTask) {
-        // explicit clean-up request, cancel current schedule
-        oldSchedule.cancel();
-      } else if (oldSchedule.get() != fromTask) {
-        // ignore clean-up requests from tasks which aren't currently scheduled
-        return;
-      }
-      flareStartMillis = 0;
-      scheduledCleanup = null;
-      log.debug("Cleaning up after tracer flare");
-      TracerFlare.cleanupAfterFlare();
-      if (logLevelOverridden) {
-        GlobalLogLevelSwitcher.get().restore();
-        logLevelOverridden = false;
-      }
+
+    void doSend(String caseId, String email, String hostname, boolean dumpThreads) {
+        log.debug("Sending tracer flare");
+        try {
+            long flareEndMillis = System.currentTimeMillis();
+
+            RequestBody report =
+                    RequestBody.create(OCTET_STREAM, buildFlareZip(flareStartMillis, flareEndMillis, dumpThreads));
+
+            RequestBody form = new MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .addFormDataPart("source", "tracer_java")
+                    .addFormDataPart("case_id", caseId)
+                    .addFormDataPart("email", email)
+                    .addFormDataPart("hostname", hostname)
+                    .addFormDataPart("flare_file", getFlareName(flareEndMillis), report)
+                    .build();
+
+            Request flareRequest = OkHttpUtils.prepareRequest(flareUrl, Collections.emptyMap())
+                    .post(form)
+                    .build();
+
+            try (Response response = okHttpClient.newCall(flareRequest).execute()) {
+                if (response.code() == 404) {
+                    log.debug("Tracer flare endpoint is disabled, ignoring request");
+                } else if (!response.isSuccessful()) {
+                    log.warn("Tracer flare failed with: {} {}", response.code(), response.message());
+                } else {
+                    log.debug("Tracer flare sent successfully");
+                }
+            }
+
+        } catch (IOException e) {
+            log.warn("Tracer flare failed with exception: {}", e.toString());
+        }
     }
-  }
-
-  public void sendFlare(String caseId, String email, String hostname) {
-    boolean dumpThreads = config.isTriageEnabled() || log.isDebugEnabled();
-    scheduler.execute(() -> doSend(caseId, email, hostname, dumpThreads));
-  }
-
-  void doSend(String caseId, String email, String hostname, boolean dumpThreads) {
-    log.debug("Sending tracer flare");
-    try {
-      long flareEndMillis = System.currentTimeMillis();
-
-      RequestBody report =
-          RequestBody.create(
-              OCTET_STREAM, buildFlareZip(flareStartMillis, flareEndMillis, dumpThreads));
-
-      RequestBody form =
-          new MultipartBody.Builder()
-              .setType(MultipartBody.FORM)
-              .addFormDataPart("source", "tracer_java")
-              .addFormDataPart("case_id", caseId)
-              .addFormDataPart("email", email)
-              .addFormDataPart("hostname", hostname)
-              .addFormDataPart("flare_file", getFlareName(flareEndMillis), report)
-              .build();
-
-      Request flareRequest =
-          OkHttpUtils.prepareRequest(flareUrl, Collections.emptyMap()).post(form).build();
-
-      try (Response response = okHttpClient.newCall(flareRequest).execute()) {
-        if (response.code() == 404) {
-          log.debug("Tracer flare endpoint is disabled, ignoring request");
-        } else if (!response.isSuccessful()) {
-          log.warn("Tracer flare failed with: {} {}", response.code(), response.message());
-        } else {
-          log.debug("Tracer flare sent successfully");
+
+    private String getFlareName(long endMillis) {
+        return REPORT_PREFIX + config.getRuntimeId() + "-" + endMillis + ".zip";
+    }
+
+    private byte[] buildFlareZip(long startMillis, long endMillis, boolean dumpThreads) throws IOException {
+        try (ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+                ZipOutputStream zip = new ZipOutputStream(bytes)) {
+
+            addPrelude(zip, startMillis, endMillis);
+            addConfig(zip);
+            addRuntime(zip);
+            TracerFlare.addReportsToFlare(zip);
+            if (dumpThreads) {
+                addThreadDump(zip);
+            }
+            zip.finish();
+
+            return bytes.toByteArray();
         }
-      }
+    }
 
-    } catch (IOException e) {
-      log.warn("Tracer flare failed with exception: {}", e.toString());
+    private void addPrelude(ZipOutputStream zip, long startMillis, long endMillis) throws IOException {
+        TracerFlare.addText(zip, "flare_info.txt", flareInfo(startMillis, endMillis));
+        TracerFlare.addText(zip, "tracer_version.txt", VERSION);
     }
-  }
-
-  private String getFlareName(long endMillis) {
-    return REPORT_PREFIX + config.getRuntimeId() + "-" + endMillis + ".zip";
-  }
-
-  private byte[] buildFlareZip(long startMillis, long endMillis, boolean dumpThreads)
-      throws IOException {
-    try (ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-        ZipOutputStream zip = new ZipOutputStream(bytes)) {
-
-      addPrelude(zip, startMillis, endMillis);
-      addConfig(zip);
-      addRuntime(zip);
-      TracerFlare.addReportsToFlare(zip);
-      if (dumpThreads) {
-        addThreadDump(zip);
-      }
-      zip.finish();
-
-      return bytes.toByteArray();
+
+    private void addConfig(ZipOutputStream zip) throws IOException {
+        TracerFlare.addText(zip, "initial_config.txt", config.toString());
     }
-  }
-
-  private void addPrelude(ZipOutputStream zip, long startMillis, long endMillis)
-      throws IOException {
-    TracerFlare.addText(zip, "flare_info.txt", flareInfo(startMillis, endMillis));
-    TracerFlare.addText(zip, "tracer_version.txt", VERSION);
-  }
-
-  private void addConfig(ZipOutputStream zip) throws IOException {
-    TracerFlare.addText(zip, "initial_config.txt", config.toString());
-  }
-
-  private void addRuntime(ZipOutputStream zip) throws IOException {
-    try {
-      RuntimeMXBean runtimeMXBean = ManagementFactory.getRuntimeMXBean();
-      TracerFlare.addText(zip, "jvm_args.txt", String.join(" ", runtimeMXBean.getInputArguments()));
-      TracerFlare.addText(zip, "classpath.txt", runtimeMXBean.getClassPath());
-      TracerFlare.addText(zip, "library_path.txt", runtimeMXBean.getLibraryPath());
-      if (runtimeMXBean.isBootClassPathSupported()) {
-        TracerFlare.addText(zip, "boot_classpath.txt", runtimeMXBean.getBootClassPath());
-      }
-    } catch (RuntimeException e) {
-      TracerFlare.addText(zip, "classpath.txt", System.getProperty("java.class.path"));
+
+    private void addRuntime(ZipOutputStream zip) throws IOException {
+        try {
+            RuntimeMXBean runtimeMXBean = ManagementFactory.getRuntimeMXBean();
+            TracerFlare.addText(zip, "jvm_args.txt", String.join(" ", runtimeMXBean.getInputArguments()));
+            TracerFlare.addText(zip, "classpath.txt", runtimeMXBean.getClassPath());
+            TracerFlare.addText(zip, "library_path.txt", runtimeMXBean.getLibraryPath());
+            if (runtimeMXBean.isBootClassPathSupported()) {
+                TracerFlare.addText(zip, "boot_classpath.txt", runtimeMXBean.getBootClassPath());
+            }
+        } catch (RuntimeException e) {
+            TracerFlare.addText(zip, "classpath.txt", System.getProperty("java.class.path"));
+        }
+    }
+
+    private String flareInfo(long startMillis, long endMillis) {
+        StringBuilder buf = new StringBuilder();
+        if (startMillis > 0) {
+            buf.append("Requested: ").append(toDateTime(startMillis)).append('\n');
+        }
+        return buf.append("Completed: ").append(toDateTime(endMillis)).toString();
     }
-  }
 
-  private String flareInfo(long startMillis, long endMillis) {
-    StringBuilder buf = new StringBuilder();
-    if (startMillis > 0) {
-      buf.append("Requested: ").append(toDateTime(startMillis)).append('\n');
+    private static ZonedDateTime toDateTime(long millis) {
+        return ZonedDateTime.ofInstant(Instant.ofEpochMilli(millis), ZoneOffset.UTC);
     }
-    return buf.append("Completed: ").append(toDateTime(endMillis)).toString();
-  }
-
-  private static ZonedDateTime toDateTime(long millis) {
-    return ZonedDateTime.ofInstant(Instant.ofEpochMilli(millis), ZoneOffset.UTC);
-  }
-
-  private void addThreadDump(ZipOutputStream zip) throws IOException {
-    StringBuilder buf = new StringBuilder();
-    try {
-      ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
-      for (ThreadInfo threadInfo :
-          threadMXBean.dumpAllThreads(
-              threadMXBean.isObjectMonitorUsageSupported(),
-              threadMXBean.isSynchronizerUsageSupported())) {
-        buf.append(threadInfo);
-      }
-    } catch (RuntimeException e) {
-      buf.append("Problem collecting thread dump: ").append(e);
+
+    private void addThreadDump(ZipOutputStream zip) throws IOException {
+        StringBuilder buf = new StringBuilder();
+        try {
+            ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+            for (ThreadInfo threadInfo : threadMXBean.dumpAllThreads(
+                    threadMXBean.isObjectMonitorUsageSupported(), threadMXBean.isSynchronizerUsageSupported())) {
+                buf.append(threadInfo);
+            }
+        } catch (RuntimeException e) {
+            buf.append("Problem collecting thread dump: ").append(e);
+        }
+        TracerFlare.addText(zip, "threads.txt", buf.toString());
     }
-    TracerFlare.addText(zip, "threads.txt", buf.toString());
-  }
 
-  final class CleanupTask implements Runnable {
-    @Override
-    public void run() {
-      doCleanup(this);
+    final class CleanupTask implements Runnable {
+        @Override
+        public void run() {
+            doCleanup(this);
+        }
     }
-  }
 }
diff --git a/utils/logging-utils/src/main/java/datadog/logging/IOLogger.java b/utils/logging-utils/src/main/java/datadog/logging/IOLogger.java
index af21f4a0c57..7c22ee6705d 100644
--- a/utils/logging-utils/src/main/java/datadog/logging/IOLogger.java
+++ b/utils/logging-utils/src/main/java/datadog/logging/IOLogger.java
@@ -8,131 +8,125 @@
 
 /** Logger specialized on logging IO-related activity */
 public class IOLogger {
-  private boolean logNextSuccess = false;
-  private final Logger log;
-  private final RatelimitedLogger ratelimitedLogger;
-
-  public IOLogger(final Logger log) {
-    this(log, new RatelimitedLogger(log, 5, TimeUnit.MINUTES));
-  }
-
-  @VisibleForTesting
-  IOLogger(final Logger log, final RatelimitedLogger ratelimitedLogger) {
-    this.log = log;
-    this.ratelimitedLogger = ratelimitedLogger;
-  }
-
-  /**
-   * @return true if actually logged the message, false otherwise
-   */
-  public boolean success(final String format, final Object... arguments) {
-    if (log.isDebugEnabled()) {
-      log.debug(EXCLUDE_TELEMETRY, format, arguments);
-      return true;
-    }
+    private boolean logNextSuccess = false;
+    private final Logger log;
+    private final RatelimitedLogger ratelimitedLogger;
 
-    if (this.logNextSuccess) {
-      this.logNextSuccess = false;
-      if (log.isInfoEnabled()) {
-        log.info(EXCLUDE_TELEMETRY, format, arguments);
-        return true;
-      }
+    public IOLogger(final Logger log) {
+        this(log, new RatelimitedLogger(log, 5, TimeUnit.MINUTES));
     }
 
-    return false;
-  }
-
-  /**
-   * @return true if actually logged the message, false otherwise
-   */
-  public boolean error(final String message) {
-    return error(message, null, null);
-  }
-
-  /**
-   * @return true if actually logged the message, false otherwise
-   */
-  public boolean error(final String message, Exception exception) {
-    return error(message, null, exception);
-  }
-
-  /**
-   * @return true if actually logged the message, false otherwise
-   */
-  public boolean error(final String message, Response response) {
-    return error(message, response, null);
-  }
-
-  /**
-   * @return true if actually logged the message, false otherwise
-   */
-  public boolean error(final String message, Response response, Exception exception) {
-    if (log.isDebugEnabled()) {
-      if (response != null) {
-        log.debug(
-            EXCLUDE_TELEMETRY,
-            "{} Status: {}, Response: {}, Body: {}",
-            message,
-            response.getStatusCode(),
-            response.getMessage(),
-            response.getBody());
-      } else if (exception != null) {
-        log.debug(EXCLUDE_TELEMETRY, message, exception);
-      } else {
-        log.debug(EXCLUDE_TELEMETRY, message);
-      }
-      return true;
-    }
-    boolean hasLogged;
-    if (response != null) {
-      hasLogged =
-          ratelimitedLogger.warn(
-              EXCLUDE_TELEMETRY,
-              "{} Status: {} {}",
-              message,
-              response.getStatusCode(),
-              response.getMessage());
-    } else if (exception != null) {
-      // NOTE: We do not pass the full exception to warn on purpose. We don't want to
-      //       print a full stacktrace unless we're in debug mode
-      hasLogged =
-          ratelimitedLogger.warn(
-              EXCLUDE_TELEMETRY,
-              "{} {}: {}",
-              message,
-              exception.getClass().getName(),
-              exception.getMessage());
-    } else {
-      hasLogged = ratelimitedLogger.warn(message);
-    }
-    if (hasLogged) {
-      this.logNextSuccess = true;
+    @VisibleForTesting
+    IOLogger(final Logger log, final RatelimitedLogger ratelimitedLogger) {
+        this.log = log;
+        this.ratelimitedLogger = ratelimitedLogger;
     }
 
-    return hasLogged;
-  }
+    /**
+     * @return true if actually logged the message, false otherwise
+     */
+    public boolean success(final String format, final Object... arguments) {
+        if (log.isDebugEnabled()) {
+            log.debug(EXCLUDE_TELEMETRY, format, arguments);
+            return true;
+        }
+
+        if (this.logNextSuccess) {
+            this.logNextSuccess = false;
+            if (log.isInfoEnabled()) {
+                log.info(EXCLUDE_TELEMETRY, format, arguments);
+                return true;
+            }
+        }
+
+        return false;
+    }
 
-  public static final class Response {
-    private final int statusCode;
-    private final String message;
-    private final String body;
+    /**
+     * @return true if actually logged the message, false otherwise
+     */
+    public boolean error(final String message) {
+        return error(message, null, null);
+    }
 
-    public Response(int statusCode, String message, String body) {
-      this.statusCode = statusCode;
-      this.message = message;
-      this.body = body;
+    /**
+     * @return true if actually logged the message, false otherwise
+     */
+    public boolean error(final String message, Exception exception) {
+        return error(message, null, exception);
     }
 
-    public int getStatusCode() {
-      return statusCode;
+    /**
+     * @return true if actually logged the message, false otherwise
+     */
+    public boolean error(final String message, Response response) {
+        return error(message, response, null);
     }
 
-    public String getMessage() {
-      return message;
+    /**
+     * @return true if actually logged the message, false otherwise
+     */
+    public boolean error(final String message, Response response, Exception exception) {
+        if (log.isDebugEnabled()) {
+            if (response != null) {
+                log.debug(
+                        EXCLUDE_TELEMETRY,
+                        "{} Status: {}, Response: {}, Body: {}",
+                        message,
+                        response.getStatusCode(),
+                        response.getMessage(),
+                        response.getBody());
+            } else if (exception != null) {
+                log.debug(EXCLUDE_TELEMETRY, message, exception);
+            } else {
+                log.debug(EXCLUDE_TELEMETRY, message);
+            }
+            return true;
+        }
+        boolean hasLogged;
+        if (response != null) {
+            hasLogged = ratelimitedLogger.warn(
+                    EXCLUDE_TELEMETRY, "{} Status: {} {}", message, response.getStatusCode(), response.getMessage());
+        } else if (exception != null) {
+            // NOTE: We do not pass the full exception to warn on purpose. We don't want to
+            //       print a full stacktrace unless we're in debug mode
+            hasLogged = ratelimitedLogger.warn(
+                    EXCLUDE_TELEMETRY,
+                    "{} {}: {}",
+                    message,
+                    exception.getClass().getName(),
+                    exception.getMessage());
+        } else {
+            hasLogged = ratelimitedLogger.warn(message);
+        }
+        if (hasLogged) {
+            this.logNextSuccess = true;
+        }
+
+        return hasLogged;
     }
 
-    public String getBody() {
-      return body;
+    public static final class Response {
+        private final int statusCode;
+        private final String message;
+        private final String body;
+
+        public Response(int statusCode, String message, String body) {
+            this.statusCode = statusCode;
+            this.message = message;
+            this.body = body;
+        }
+
+        public int getStatusCode() {
+            return statusCode;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public String getBody() {
+            return body;
+        }
     }
-  }
 }
diff --git a/utils/logging-utils/src/main/java/datadog/logging/RatelimitedLogger.java b/utils/logging-utils/src/main/java/datadog/logging/RatelimitedLogger.java
index b88505c1e59..81789b60d93 100644
--- a/utils/logging-utils/src/main/java/datadog/logging/RatelimitedLogger.java
+++ b/utils/logging-utils/src/main/java/datadog/logging/RatelimitedLogger.java
@@ -15,62 +15,57 @@
  */
 public class RatelimitedLogger {
 
-  private final Logger log;
-  private final long delayNanos;
-  private final String noLogMessage;
-  private final TimeSource timeSource;
+    private final Logger log;
+    private final long delayNanos;
+    private final String noLogMessage;
+    private final TimeSource timeSource;
 
-  private final AtomicLong nextLogNanos;
+    private final AtomicLong nextLogNanos;
 
-  public RatelimitedLogger(final Logger log, final int delay, final TimeUnit timeUnit) {
-    this(log, delay, timeUnit, SystemTimeSource.INSTANCE);
-  }
-
-  @VisibleForTesting
-  RatelimitedLogger(
-      final Logger log, final int delay, final TimeUnit timeUnit, final TimeSource timeSource) {
-    this.log = log;
-    this.delayNanos = timeUnit.toNanos(delay);
-    this.noLogMessage = createNoLogMessage(" (Will not log warnings for ", ")", delay, timeUnit);
-    this.timeSource = timeSource;
-    nextLogNanos = new AtomicLong(timeSource.getNanoTicks());
-  }
+    public RatelimitedLogger(final Logger log, final int delay, final TimeUnit timeUnit) {
+        this(log, delay, timeUnit, SystemTimeSource.INSTANCE);
+    }
 
-  /**
-   * @return true if actually logged the message, false otherwise
-   */
-  public boolean warn(final String format, final Object... arguments) {
-    return warn(null, format, arguments);
-  }
+    @VisibleForTesting
+    RatelimitedLogger(final Logger log, final int delay, final TimeUnit timeUnit, final TimeSource timeSource) {
+        this.log = log;
+        this.delayNanos = timeUnit.toNanos(delay);
+        this.noLogMessage = createNoLogMessage(" (Will not log warnings for ", ")", delay, timeUnit);
+        this.timeSource = timeSource;
+        nextLogNanos = new AtomicLong(timeSource.getNanoTicks());
+    }
 
-  public boolean warn(Marker marker, final String format, final Object... arguments) {
-    if (log.isDebugEnabled()) {
-      log.warn(marker, format, arguments);
-      return true;
+    /**
+     * @return true if actually logged the message, false otherwise
+     */
+    public boolean warn(final String format, final Object... arguments) {
+        return warn(null, format, arguments);
     }
-    if (log.isWarnEnabled()) {
-      final long next = nextLogNanos.get();
-      final long now = timeSource.getNanoTicks();
-      if (now - next >= 0 && nextLogNanos.compareAndSet(next, now + delayNanos)) {
-        log.warn(marker, format + noLogMessage, arguments);
-        return true;
-      }
+
+    public boolean warn(Marker marker, final String format, final Object... arguments) {
+        if (log.isDebugEnabled()) {
+            log.warn(marker, format, arguments);
+            return true;
+        }
+        if (log.isWarnEnabled()) {
+            final long next = nextLogNanos.get();
+            final long now = timeSource.getNanoTicks();
+            if (now - next >= 0 && nextLogNanos.compareAndSet(next, now + delayNanos)) {
+                log.warn(marker, format + noLogMessage, arguments);
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 
-  private static String createNoLogMessage(
-      String prefix, String postfix, int delay, TimeUnit timeUnit) {
-    StringBuilder noLogStringBuilder = new StringBuilder(prefix);
-    noLogStringBuilder.append(delay);
-    noLogStringBuilder.append(' ');
-    String unit = timeUnit.name().toLowerCase(Locale.ROOT);
-    unit =
-        delay == 1
-            ? unit.substring(0, unit.length() - 1)
-            : unit; // should we drop the plural s or not?
-    noLogStringBuilder.append(unit);
-    noLogStringBuilder.append(postfix);
-    return noLogStringBuilder.toString();
-  }
+    private static String createNoLogMessage(String prefix, String postfix, int delay, TimeUnit timeUnit) {
+        StringBuilder noLogStringBuilder = new StringBuilder(prefix);
+        noLogStringBuilder.append(delay);
+        noLogStringBuilder.append(' ');
+        String unit = timeUnit.name().toLowerCase(Locale.ROOT);
+        unit = delay == 1 ? unit.substring(0, unit.length() - 1) : unit; // should we drop the plural s or not?
+        noLogStringBuilder.append(unit);
+        noLogStringBuilder.append(postfix);
+        return noLogStringBuilder.toString();
+    }
 }
diff --git a/utils/logging-utils/src/test/java/datadog/logging/IOLoggerTest.java b/utils/logging-utils/src/test/java/datadog/logging/IOLoggerTest.java
index f8824d713fe..93f9775d199 100644
--- a/utils/logging-utils/src/test/java/datadog/logging/IOLoggerTest.java
+++ b/utils/logging-utils/src/test/java/datadog/logging/IOLoggerTest.java
@@ -16,135 +16,134 @@
 import org.slf4j.Marker;
 
 class IOLoggerTest {
-  private final IOLogger.Response response =
-      new IOLogger.Response(404, "Not Found", "The thing you were looking for does not exist");
-  private final RuntimeException exception = new RuntimeException("Something went wrong!");
+    private final IOLogger.Response response =
+            new IOLogger.Response(404, "Not Found", "The thing you were looking for does not exist");
+    private final RuntimeException exception = new RuntimeException("Something went wrong!");
 
-  private Logger log;
-  private RatelimitedLogger rateLimitedLogger;
-  private IOLogger ioLogger;
+    private Logger log;
+    private RatelimitedLogger rateLimitedLogger;
+    private IOLogger ioLogger;
 
-  @BeforeEach
-  void setUp() {
-    this.log = mock(Logger.class);
-    this.rateLimitedLogger = mock(RatelimitedLogger.class);
-    this.ioLogger = new IOLogger(this.log, this.rateLimitedLogger);
-  }
+    @BeforeEach
+    void setUp() {
+        this.log = mock(Logger.class);
+        this.rateLimitedLogger = mock(RatelimitedLogger.class);
+        this.ioLogger = new IOLogger(this.log, this.rateLimitedLogger);
+    }
 
-  @Test
-  void successDebugLevel() {
-    when(this.log.isDebugEnabled()).thenReturn(true);
+    @Test
+    void successDebugLevel() {
+        when(this.log.isDebugEnabled()).thenReturn(true);
 
-    this.ioLogger.success("test {}", "message");
+        this.ioLogger.success("test {}", "message");
 
-    verify(this.log).debug(eq(EXCLUDE_TELEMETRY), eq("test {}"), (Object[]) any());
-  }
+        verify(this.log).debug(eq(EXCLUDE_TELEMETRY), eq("test {}"), (Object[]) any());
+    }
 
-  @Test
-  void successInfoLevel() {
-    when(this.log.isDebugEnabled()).thenReturn(false);
+    @Test
+    void successInfoLevel() {
+        when(this.log.isDebugEnabled()).thenReturn(false);
 
-    this.ioLogger.success("test {}", "message");
+        this.ioLogger.success("test {}", "message");
 
-    verify(this.log, never()).debug(nullable(Marker.class), anyString(), (Object[]) any());
-    verify(this.log, never()).info(nullable(Marker.class), anyString(), (Object[]) any());
-  }
+        verify(this.log, never()).debug(nullable(Marker.class), anyString(), (Object[]) any());
+        verify(this.log, never()).info(nullable(Marker.class), anyString(), (Object[]) any());
+    }
 
-  @Test
-  void errorDebugLevelMessage() {
-    when(this.log.isDebugEnabled()).thenReturn(true);
+    @Test
+    void errorDebugLevelMessage() {
+        when(this.log.isDebugEnabled()).thenReturn(true);
 
-    this.ioLogger.error("test message");
+        this.ioLogger.error("test message");
 
-    verify(this.log).debug(EXCLUDE_TELEMETRY, "test message");
-  }
+        verify(this.log).debug(EXCLUDE_TELEMETRY, "test message");
+    }
 
-  @Test
-  void errorDebugLevelResponse() {
-    when(this.log.isDebugEnabled()).thenReturn(true);
+    @Test
+    void errorDebugLevelResponse() {
+        when(this.log.isDebugEnabled()).thenReturn(true);
 
-    this.ioLogger.error("test message", this.response);
+        this.ioLogger.error("test message", this.response);
 
-    verify(this.log)
-        .debug(
-            eq(EXCLUDE_TELEMETRY),
-            anyString(),
-            eq("test message"),
-            eq(404),
-            eq("Not Found"),
-            eq("The thing you were looking for does not exist"));
-  }
+        verify(this.log)
+                .debug(
+                        eq(EXCLUDE_TELEMETRY),
+                        anyString(),
+                        eq("test message"),
+                        eq(404),
+                        eq("Not Found"),
+                        eq("The thing you were looking for does not exist"));
+    }
 
-  @Test
-  void errorDebugLevelException() {
-    when(this.log.isDebugEnabled()).thenReturn(true);
+    @Test
+    void errorDebugLevelException() {
+        when(this.log.isDebugEnabled()).thenReturn(true);
 
-    this.ioLogger.error("test message", this.exception);
+        this.ioLogger.error("test message", this.exception);
 
-    verify(this.log).debug(EXCLUDE_TELEMETRY, "test message", this.exception);
-  }
+        verify(this.log).debug(EXCLUDE_TELEMETRY, "test message", this.exception);
+    }
 
-  @Test
-  void errorInfoLevelMessage() {
-    when(this.log.isDebugEnabled()).thenReturn(false);
+    @Test
+    void errorInfoLevelMessage() {
+        when(this.log.isDebugEnabled()).thenReturn(false);
 
-    this.ioLogger.error("test message");
+        this.ioLogger.error("test message");
 
-    verify(this.rateLimitedLogger).warn("test message");
-  }
+        verify(this.rateLimitedLogger).warn("test message");
+    }
 
-  @Test
-  void errorInfoLevelResponse() {
-    when(this.log.isDebugEnabled()).thenReturn(false);
+    @Test
+    void errorInfoLevelResponse() {
+        when(this.log.isDebugEnabled()).thenReturn(false);
 
-    this.ioLogger.error("test message", this.response);
+        this.ioLogger.error("test message", this.response);
 
-    verify(this.rateLimitedLogger)
-        .warn(eq(EXCLUDE_TELEMETRY), anyString(), eq("test message"), eq(404), eq("Not Found"));
-  }
+        verify(this.rateLimitedLogger)
+                .warn(eq(EXCLUDE_TELEMETRY), anyString(), eq("test message"), eq(404), eq("Not Found"));
+    }
 
-  @Test
-  void errorInfoLevelException() {
-    when(this.log.isDebugEnabled()).thenReturn(false);
+    @Test
+    void errorInfoLevelException() {
+        when(this.log.isDebugEnabled()).thenReturn(false);
 
-    this.ioLogger.error("test message", this.exception);
+        this.ioLogger.error("test message", this.exception);
 
-    verify(this.rateLimitedLogger)
-        .warn(
-            eq(EXCLUDE_TELEMETRY),
-            anyString(),
-            eq("test message"),
-            eq("java.lang.RuntimeException"),
-            eq("Something went wrong!"));
-  }
+        verify(this.rateLimitedLogger)
+                .warn(
+                        eq(EXCLUDE_TELEMETRY),
+                        anyString(),
+                        eq("test message"),
+                        eq("java.lang.RuntimeException"),
+                        eq("Something went wrong!"));
+    }
 
-  @Test
-  void loggedErrorThenSuccessInfoLevel() {
-    when(this.log.isDebugEnabled()).thenReturn(false);
-    when(this.log.isInfoEnabled()).thenReturn(true);
-    when(this.rateLimitedLogger.warn("test message")).thenReturn(true);
+    @Test
+    void loggedErrorThenSuccessInfoLevel() {
+        when(this.log.isDebugEnabled()).thenReturn(false);
+        when(this.log.isInfoEnabled()).thenReturn(true);
+        when(this.rateLimitedLogger.warn("test message")).thenReturn(true);
 
-    this.ioLogger.error("test message");
-    this.ioLogger.success("very successful");
-    this.ioLogger.success("very successful again");
+        this.ioLogger.error("test message");
+        this.ioLogger.success("very successful");
+        this.ioLogger.success("very successful again");
 
-    verify(this.rateLimitedLogger).warn("test message");
-    verify(this.log).info(eq(EXCLUDE_TELEMETRY), eq("very successful"), (Object[]) any());
-    verify(this.log, never())
-        .info(eq(EXCLUDE_TELEMETRY), eq("very successful again"), (Object[]) any());
-  }
+        verify(this.rateLimitedLogger).warn("test message");
+        verify(this.log).info(eq(EXCLUDE_TELEMETRY), eq("very successful"), (Object[]) any());
+        verify(this.log, never()).info(eq(EXCLUDE_TELEMETRY), eq("very successful again"), (Object[]) any());
+    }
 
-  @Test
-  void unloggedErrorThenSuccessInfoLevel() {
-    when(this.log.isDebugEnabled()).thenReturn(false);
-    when(this.log.isInfoEnabled()).thenReturn(true);
-    when(this.rateLimitedLogger.warn("test message")).thenReturn(false);
+    @Test
+    void unloggedErrorThenSuccessInfoLevel() {
+        when(this.log.isDebugEnabled()).thenReturn(false);
+        when(this.log.isInfoEnabled()).thenReturn(true);
+        when(this.rateLimitedLogger.warn("test message")).thenReturn(false);
 
-    this.ioLogger.error("test message");
-    this.ioLogger.success("very successful");
-    this.ioLogger.success("very successful again");
+        this.ioLogger.error("test message");
+        this.ioLogger.success("very successful");
+        this.ioLogger.success("very successful again");
 
-    verify(this.rateLimitedLogger).warn("test message");
-    verify(this.log, never()).info(nullable(Marker.class), anyString(), (Object[]) any());
-  }
+        verify(this.rateLimitedLogger).warn("test message");
+        verify(this.log, never()).info(nullable(Marker.class), anyString(), (Object[]) any());
+    }
 }
diff --git a/utils/logging-utils/src/test/java/datadog/logging/RateLimitedLoggerTest.java b/utils/logging-utils/src/test/java/datadog/logging/RateLimitedLoggerTest.java
index 11519ad2d9f..395940ba745 100644
--- a/utils/logging-utils/src/test/java/datadog/logging/RateLimitedLoggerTest.java
+++ b/utils/logging-utils/src/test/java/datadog/logging/RateLimitedLoggerTest.java
@@ -22,168 +22,147 @@
 import org.slf4j.Marker;
 
 class RateLimitedLoggerTest {
-  private static final RuntimeException EXCEPTION = new RuntimeException("bad thing");
-
-  private Logger log;
-  private ControllableTimeSource timeSource;
-
-  @BeforeEach
-  void setUp() {
-    this.log = mock(Logger.class);
-    this.timeSource = new ControllableTimeSource();
-  }
-
-  @Test
-  void debugLevel() {
-    when(this.log.isDebugEnabled()).thenReturn(true);
-    RatelimitedLogger rateLimitedLog = new RatelimitedLogger(this.log, 5, MINUTES, this.timeSource);
-
-    rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
-    rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
-
-    verify(this.log, times(2)).warn(nullable(Marker.class), eq("test {} {}"), (Object[]) any());
-  }
-
-  @Test
-  void defaultWarningOnce() {
-    when(this.log.isWarnEnabled()).thenReturn(true);
-    when(this.log.isDebugEnabled()).thenReturn(false);
-    RatelimitedLogger defaultRateLimitedLog = new RatelimitedLogger(this.log, 5, MINUTES);
-
-    boolean firstLog = defaultRateLimitedLog.warn("test {} {}", "message", EXCEPTION);
-    boolean secondLog = defaultRateLimitedLog.warn("test {} {}", "message", EXCEPTION);
-
-    verify(this.log)
-        .warn(
-            nullable(Marker.class),
-            eq("test {} {} (Will not log warnings for 5 minutes)"),
-            (Object[]) any());
-    assertTrue(firstLog);
-    assertFalse(secondLog);
-  }
-
-  @Test
-  void warningOnce() {
-    when(this.log.isWarnEnabled()).thenReturn(true);
-    when(this.log.isDebugEnabled()).thenReturn(false);
-    RatelimitedLogger rateLimitedLog = new RatelimitedLogger(this.log, 1, MINUTES, this.timeSource);
-
-    boolean firstLog = rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
-    assertTrue(firstLog);
-
-    boolean secondLog = rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
-    assertFalse(secondLog);
-
-    verify(this.log)
-        .warn(
-            nullable(Marker.class),
-            eq("test {} {} (Will not log warnings for 1 minute)"),
-            (Object[]) any());
-  }
-
-  @Test
-  void warningDisabled() {
-    when(this.log.isWarnEnabled()).thenReturn(false);
-    when(this.log.isDebugEnabled()).thenReturn(false);
-    RatelimitedLogger rateLimitedLog = new RatelimitedLogger(this.log, 1, MINUTES, this.timeSource);
-
-    assertFalse(rateLimitedLog.warn("test {} {}", "message", EXCEPTION));
-    verify(this.log, never()).warn(nullable(Marker.class), any(String.class), (Object[]) any());
-  }
-
-  @Test
-  void warningOnceNegativeTime() {
-    this.timeSource.set(Long.MIN_VALUE);
-    when(this.log.isWarnEnabled()).thenReturn(true);
-    when(this.log.isDebugEnabled()).thenReturn(false);
-    RatelimitedLogger rateLimitedLog =
-        new RatelimitedLogger(this.log, 5, NANOSECONDS, this.timeSource);
-
-    boolean firstLog = rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
-    assertTrue(firstLog);
-
-    this.timeSource.advance(5 - 1);
-    boolean secondLog = rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
-    assertFalse(secondLog);
-
-    verify(this.log)
-        .warn(
-            nullable(Marker.class),
-            eq("test {} {} (Will not log warnings for 5 nanoseconds)"),
-            (Object[]) any());
-  }
-
-  @Test
-  void warningOnceZeroTime() {
-    this.timeSource.set(0);
-    when(this.log.isWarnEnabled()).thenReturn(true);
-    when(this.log.isDebugEnabled()).thenReturn(false);
-    RatelimitedLogger rateLimitedLog =
-        new RatelimitedLogger(this.log, 5, NANOSECONDS, this.timeSource);
-
-    boolean firstLog = rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
-    assertTrue(firstLog);
-
-    this.timeSource.advance(1);
-    boolean secondLog = rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
-    assertFalse(secondLog);
-
-    verify(this.log)
-        .warn(
-            nullable(Marker.class),
-            eq("test {} {} (Will not log warnings for 5 nanoseconds)"),
-            (Object[]) any());
-  }
-
-  @Test
-  void warningTwice() {
-    when(this.log.isWarnEnabled()).thenReturn(true);
-    when(this.log.isDebugEnabled()).thenReturn(false);
-    RatelimitedLogger rateLimitedLog =
-        new RatelimitedLogger(this.log, 7, NANOSECONDS, this.timeSource);
-
-    boolean firstLog = rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
-    assertTrue(firstLog);
-
-    this.timeSource.advance(7);
-    boolean secondLog = rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
-    assertTrue(secondLog);
-
-    verify(this.log, times(2))
-        .warn(
-            nullable(Marker.class),
-            eq("test {} {} (Will not log warnings for 7 nanoseconds)"),
-            (Object[]) any());
-  }
-
-  @Test
-  void noArgs() {
-    when(this.log.isWarnEnabled()).thenReturn(true);
-    when(this.log.isDebugEnabled()).thenReturn(false);
-    RatelimitedLogger rateLimitedLog = new RatelimitedLogger(log, 1, MILLISECONDS, this.timeSource);
-
-    rateLimitedLog.warn("test");
-
-    verify(this.log)
-        .warn(
-            nullable(Marker.class),
-            eq("test (Will not log warnings for 1 millisecond)"),
-            (Object[]) any());
-  }
-
-  @Test
-  void withMarker() {
-    when(this.log.isWarnEnabled()).thenReturn(true);
-    when(this.log.isDebugEnabled()).thenReturn(false);
-    RatelimitedLogger rateLimitedLog =
-        new RatelimitedLogger(this.log, 1, MILLISECONDS, this.timeSource);
-
-    rateLimitedLog.warn(LogCollector.SEND_TELEMETRY, "test");
-
-    verify(this.log)
-        .warn(
-            eq(LogCollector.SEND_TELEMETRY),
-            eq("test (Will not log warnings for 1 millisecond)"),
-            (Object[]) any());
-  }
+    private static final RuntimeException EXCEPTION = new RuntimeException("bad thing");
+
+    private Logger log;
+    private ControllableTimeSource timeSource;
+
+    @BeforeEach
+    void setUp() {
+        this.log = mock(Logger.class);
+        this.timeSource = new ControllableTimeSource();
+    }
+
+    @Test
+    void debugLevel() {
+        when(this.log.isDebugEnabled()).thenReturn(true);
+        RatelimitedLogger rateLimitedLog = new RatelimitedLogger(this.log, 5, MINUTES, this.timeSource);
+
+        rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
+        rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
+
+        verify(this.log, times(2)).warn(nullable(Marker.class), eq("test {} {}"), (Object[]) any());
+    }
+
+    @Test
+    void defaultWarningOnce() {
+        when(this.log.isWarnEnabled()).thenReturn(true);
+        when(this.log.isDebugEnabled()).thenReturn(false);
+        RatelimitedLogger defaultRateLimitedLog = new RatelimitedLogger(this.log, 5, MINUTES);
+
+        boolean firstLog = defaultRateLimitedLog.warn("test {} {}", "message", EXCEPTION);
+        boolean secondLog = defaultRateLimitedLog.warn("test {} {}", "message", EXCEPTION);
+
+        verify(this.log)
+                .warn(nullable(Marker.class), eq("test {} {} (Will not log warnings for 5 minutes)"), (Object[]) any());
+        assertTrue(firstLog);
+        assertFalse(secondLog);
+    }
+
+    @Test
+    void warningOnce() {
+        when(this.log.isWarnEnabled()).thenReturn(true);
+        when(this.log.isDebugEnabled()).thenReturn(false);
+        RatelimitedLogger rateLimitedLog = new RatelimitedLogger(this.log, 1, MINUTES, this.timeSource);
+
+        boolean firstLog = rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
+        assertTrue(firstLog);
+
+        boolean secondLog = rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
+        assertFalse(secondLog);
+
+        verify(this.log)
+                .warn(nullable(Marker.class), eq("test {} {} (Will not log warnings for 1 minute)"), (Object[]) any());
+    }
+
+    @Test
+    void warningDisabled() {
+        when(this.log.isWarnEnabled()).thenReturn(false);
+        when(this.log.isDebugEnabled()).thenReturn(false);
+        RatelimitedLogger rateLimitedLog = new RatelimitedLogger(this.log, 1, MINUTES, this.timeSource);
+
+        assertFalse(rateLimitedLog.warn("test {} {}", "message", EXCEPTION));
+        verify(this.log, never()).warn(nullable(Marker.class), any(String.class), (Object[]) any());
+    }
+
+    @Test
+    void warningOnceNegativeTime() {
+        this.timeSource.set(Long.MIN_VALUE);
+        when(this.log.isWarnEnabled()).thenReturn(true);
+        when(this.log.isDebugEnabled()).thenReturn(false);
+        RatelimitedLogger rateLimitedLog = new RatelimitedLogger(this.log, 5, NANOSECONDS, this.timeSource);
+
+        boolean firstLog = rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
+        assertTrue(firstLog);
+
+        this.timeSource.advance(5 - 1);
+        boolean secondLog = rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
+        assertFalse(secondLog);
+
+        verify(this.log)
+                .warn(nullable(Marker.class), eq("test {} {} (Will not log warnings for 5 nanoseconds)"), (Object[])
+                        any());
+    }
+
+    @Test
+    void warningOnceZeroTime() {
+        this.timeSource.set(0);
+        when(this.log.isWarnEnabled()).thenReturn(true);
+        when(this.log.isDebugEnabled()).thenReturn(false);
+        RatelimitedLogger rateLimitedLog = new RatelimitedLogger(this.log, 5, NANOSECONDS, this.timeSource);
+
+        boolean firstLog = rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
+        assertTrue(firstLog);
+
+        this.timeSource.advance(1);
+        boolean secondLog = rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
+        assertFalse(secondLog);
+
+        verify(this.log)
+                .warn(nullable(Marker.class), eq("test {} {} (Will not log warnings for 5 nanoseconds)"), (Object[])
+                        any());
+    }
+
+    @Test
+    void warningTwice() {
+        when(this.log.isWarnEnabled()).thenReturn(true);
+        when(this.log.isDebugEnabled()).thenReturn(false);
+        RatelimitedLogger rateLimitedLog = new RatelimitedLogger(this.log, 7, NANOSECONDS, this.timeSource);
+
+        boolean firstLog = rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
+        assertTrue(firstLog);
+
+        this.timeSource.advance(7);
+        boolean secondLog = rateLimitedLog.warn("test {} {}", "message", EXCEPTION);
+        assertTrue(secondLog);
+
+        verify(this.log, times(2))
+                .warn(nullable(Marker.class), eq("test {} {} (Will not log warnings for 7 nanoseconds)"), (Object[])
+                        any());
+    }
+
+    @Test
+    void noArgs() {
+        when(this.log.isWarnEnabled()).thenReturn(true);
+        when(this.log.isDebugEnabled()).thenReturn(false);
+        RatelimitedLogger rateLimitedLog = new RatelimitedLogger(log, 1, MILLISECONDS, this.timeSource);
+
+        rateLimitedLog.warn("test");
+
+        verify(this.log)
+                .warn(nullable(Marker.class), eq("test (Will not log warnings for 1 millisecond)"), (Object[]) any());
+    }
+
+    @Test
+    void withMarker() {
+        when(this.log.isWarnEnabled()).thenReturn(true);
+        when(this.log.isDebugEnabled()).thenReturn(false);
+        RatelimitedLogger rateLimitedLog = new RatelimitedLogger(this.log, 1, MILLISECONDS, this.timeSource);
+
+        rateLimitedLog.warn(LogCollector.SEND_TELEMETRY, "test");
+
+        verify(this.log)
+                .warn(eq(LogCollector.SEND_TELEMETRY), eq("test (Will not log warnings for 1 millisecond)"), (Object[])
+                        any());
+    }
 }
diff --git a/utils/queue-utils/src/main/java/datadog/common/queue/MpscBlockingConsumerArrayQueue.java b/utils/queue-utils/src/main/java/datadog/common/queue/MpscBlockingConsumerArrayQueue.java
index b5a8c43c6fc..810e59167c4 100644
--- a/utils/queue-utils/src/main/java/datadog/common/queue/MpscBlockingConsumerArrayQueue.java
+++ b/utils/queue-utils/src/main/java/datadog/common/queue/MpscBlockingConsumerArrayQueue.java
@@ -1,10 +1,9 @@
 package datadog.common.queue;
 
-public final class MpscBlockingConsumerArrayQueue<E>
-    extends org.jctools.queues.MpscBlockingConsumerArrayQueue<E>
-    implements MessagePassingBlockingQueue<E> {
+public final class MpscBlockingConsumerArrayQueue<E> extends org.jctools.queues.MpscBlockingConsumerArrayQueue<E>
+        implements MessagePassingBlockingQueue<E> {
 
-  public MpscBlockingConsumerArrayQueue(int capacity) {
-    super(capacity);
-  }
+    public MpscBlockingConsumerArrayQueue(int capacity) {
+        super(capacity);
+    }
 }
diff --git a/utils/queue-utils/src/main/java/datadog/common/queue/MpscBlockingConsumerVarHandleArrayQueue.java b/utils/queue-utils/src/main/java/datadog/common/queue/MpscBlockingConsumerVarHandleArrayQueue.java
index 9ceb56a2a2f..c65ac788c06 100644
--- a/utils/queue-utils/src/main/java/datadog/common/queue/MpscBlockingConsumerVarHandleArrayQueue.java
+++ b/utils/queue-utils/src/main/java/datadog/common/queue/MpscBlockingConsumerVarHandleArrayQueue.java
@@ -1,10 +1,10 @@
 package datadog.common.queue;
 
 public final class MpscBlockingConsumerVarHandleArrayQueue<E>
-    extends org.jctools.queues.varhandle.MpscBlockingConsumerVarHandleArrayQueue<E>
-    implements MessagePassingBlockingQueue<E> {
+        extends org.jctools.queues.varhandle.MpscBlockingConsumerVarHandleArrayQueue<E>
+        implements MessagePassingBlockingQueue<E> {
 
-  public MpscBlockingConsumerVarHandleArrayQueue(int capacity) {
-    super(capacity);
-  }
+    public MpscBlockingConsumerVarHandleArrayQueue(int capacity) {
+        super(capacity);
+    }
 }
diff --git a/utils/queue-utils/src/main/java/datadog/common/queue/Queues.java b/utils/queue-utils/src/main/java/datadog/common/queue/Queues.java
index 9c3de5fac8a..cddddbd3f2a 100644
--- a/utils/queue-utils/src/main/java/datadog/common/queue/Queues.java
+++ b/utils/queue-utils/src/main/java/datadog/common/queue/Queues.java
@@ -25,68 +25,67 @@
  */
 public final class Queues {
 
-  private static final boolean CAN_USE_VARHANDLES = JavaVirtualMachine.isJavaVersionAtLeast(25);
+    private static final boolean CAN_USE_VARHANDLES = JavaVirtualMachine.isJavaVersionAtLeast(25);
 
-  private Queues() {}
+    private Queues() {}
 
-  /**
-   * Creates a Multiple Producer, Single Consumer (MPSC) array-backed queue.
-   *
-   * @param requestedCapacity the requested capacity of the queue. Will be rounded to the next power
-   *     of two.
-   * @return a new {@link MessagePassingQueue} instance suitable for MPSC usage
-   */
-  public static <E> MessagePassingQueue<E> mpscArrayQueue(int requestedCapacity) {
-    if (CAN_USE_VARHANDLES) {
-      return new MpscVarHandleArrayQueue<>(requestedCapacity);
+    /**
+     * Creates a Multiple Producer, Single Consumer (MPSC) array-backed queue.
+     *
+     * @param requestedCapacity the requested capacity of the queue. Will be rounded to the next power
+     *     of two.
+     * @return a new {@link MessagePassingQueue} instance suitable for MPSC usage
+     */
+    public static <E> MessagePassingQueue<E> mpscArrayQueue(int requestedCapacity) {
+        if (CAN_USE_VARHANDLES) {
+            return new MpscVarHandleArrayQueue<>(requestedCapacity);
+        }
+        return new MpscArrayQueue<>(requestedCapacity);
     }
-    return new MpscArrayQueue<>(requestedCapacity);
-  }
 
-  /**
-   * Creates a Single Producer, Multiple Consumer (SPMC) array-backed queue.
-   *
-   * <p>\ * @param requestedCapacity the requested capacity of the queue. Will be rounded to the
-   * next power of two.
-   *
-   * @return a new {@link MessagePassingQueue} instance suitable for SPMC usage
-   */
-  public static <E> MessagePassingQueue<E> spmcArrayQueue(int requestedCapacity) {
-    if (CAN_USE_VARHANDLES) {
-      return new SpmcVarHandleArrayQueue<>(requestedCapacity);
-    } else {
-      return new SpmcArrayQueue<>(requestedCapacity);
+    /**
+     * Creates a Single Producer, Multiple Consumer (SPMC) array-backed queue.
+     *
+     * <p>\ * @param requestedCapacity the requested capacity of the queue. Will be rounded to the
+     * next power of two.
+     *
+     * @return a new {@link MessagePassingQueue} instance suitable for SPMC usage
+     */
+    public static <E> MessagePassingQueue<E> spmcArrayQueue(int requestedCapacity) {
+        if (CAN_USE_VARHANDLES) {
+            return new SpmcVarHandleArrayQueue<>(requestedCapacity);
+        } else {
+            return new SpmcArrayQueue<>(requestedCapacity);
+        }
     }
-  }
 
-  /**
-   * Creates a Multiple Producer, Single Consumer (MPSC) array-backed queue that allows blocking
-   * behavior for the consumer.
-   *
-   * @param requestedCapacity the requested capacity of the queue. Will be rounded to the next power
-   *     of two.
-   * @return a new {@link MessagePassingBlockingQueue} instance suitable for MPSC usage with
-   *     blocking consumption
-   */
-  public static <E> MessagePassingBlockingQueue<E> mpscBlockingConsumerArrayQueue(
-      int requestedCapacity) {
-    if (CAN_USE_VARHANDLES) {
-      return new MpscBlockingConsumerVarHandleArrayQueue<>(requestedCapacity);
+    /**
+     * Creates a Multiple Producer, Single Consumer (MPSC) array-backed queue that allows blocking
+     * behavior for the consumer.
+     *
+     * @param requestedCapacity the requested capacity of the queue. Will be rounded to the next power
+     *     of two.
+     * @return a new {@link MessagePassingBlockingQueue} instance suitable for MPSC usage with
+     *     blocking consumption
+     */
+    public static <E> MessagePassingBlockingQueue<E> mpscBlockingConsumerArrayQueue(int requestedCapacity) {
+        if (CAN_USE_VARHANDLES) {
+            return new MpscBlockingConsumerVarHandleArrayQueue<>(requestedCapacity);
+        }
+        return new MpscBlockingConsumerArrayQueue<>(requestedCapacity);
     }
-    return new MpscBlockingConsumerArrayQueue<>(requestedCapacity);
-  }
 
-  /**
-   * Creates a Single Producer, Single Consumer (SPSC) array-backed queue.
-   *
-   * @param requestedCapacity the requested capacity of the queue. Will be rounded to the next power
-   *     of two.
-   * @return a new {@link MessagePassingQueue} instance suitable for SPSC usage
-   */
-  public static <E> MessagePassingQueue<E> spscArrayQueue(int requestedCapacity) {
-    if (CAN_USE_VARHANDLES) {
-      return new SpscVarHandleArrayQueue<>(requestedCapacity);
+    /**
+     * Creates a Single Producer, Single Consumer (SPSC) array-backed queue.
+     *
+     * @param requestedCapacity the requested capacity of the queue. Will be rounded to the next power
+     *     of two.
+     * @return a new {@link MessagePassingQueue} instance suitable for SPSC usage
+     */
+    public static <E> MessagePassingQueue<E> spscArrayQueue(int requestedCapacity) {
+        if (CAN_USE_VARHANDLES) {
+            return new SpscVarHandleArrayQueue<>(requestedCapacity);
+        }
+        return new SpscArrayQueue<>(requestedCapacity);
     }
-    return new SpscArrayQueue<>(requestedCapacity);
-  }
 }
diff --git a/utils/socket-utils/src/jmh/java/datadog/common/socket/TunnelingJdkSocketBenchmark.java b/utils/socket-utils/src/jmh/java/datadog/common/socket/TunnelingJdkSocketBenchmark.java
index c977ed3db8d..1d900a89f96 100644
--- a/utils/socket-utils/src/jmh/java/datadog/common/socket/TunnelingJdkSocketBenchmark.java
+++ b/utils/socket-utils/src/jmh/java/datadog/common/socket/TunnelingJdkSocketBenchmark.java
@@ -42,143 +42,141 @@
 @Measurement(iterations = 5, time = 1)
 @Fork(2)
 public class TunnelingJdkSocketBenchmark {
-  private static final InetSocketAddress ENDPOINT = new InetSocketAddress("localhost", 0);
+    private static final InetSocketAddress ENDPOINT = new InetSocketAddress("localhost", 0);
 
-  @Benchmark
-  public void connectAndClose(Listener listener, Blackhole blackhole) throws IOException {
-    try (TunnelingJdkSocket socket = new TunnelingJdkSocket(listener.path)) {
-      socket.connect(ENDPOINT);
-      try (SocketChannel peer = listener.server.accept()) {
-        blackhole.consume(socket.getInputStream());
-        blackhole.consume(socket.getOutputStream());
-      }
+    @Benchmark
+    public void connectAndClose(Listener listener, Blackhole blackhole) throws IOException {
+        try (TunnelingJdkSocket socket = new TunnelingJdkSocket(listener.path)) {
+            socket.connect(ENDPOINT);
+            try (SocketChannel peer = listener.server.accept()) {
+                blackhole.consume(socket.getInputStream());
+                blackhole.consume(socket.getOutputStream());
+            }
+        }
     }
-  }
 
-  @Benchmark
-  public byte roundTrip(Connection connection) throws IOException {
-    connection.output.write(connection.request);
-    int received = 0;
-    while (received < connection.response.length) {
-      int count =
-          connection.input.read(
-              connection.response, received, connection.response.length - received);
-      if (count <= 0) {
-        throw new IOException("Peer closed or timed out", connection.peerFailure);
-      }
-      received += count;
+    @Benchmark
+    public byte roundTrip(Connection connection) throws IOException {
+        connection.output.write(connection.request);
+        int received = 0;
+        while (received < connection.response.length) {
+            int count = connection.input.read(connection.response, received, connection.response.length - received);
+            if (count <= 0) {
+                throw new IOException("Peer closed or timed out", connection.peerFailure);
+            }
+            received += count;
+        }
+        return connection.response[received - 1];
     }
-    return connection.response[received - 1];
-  }
 
-  @State(Scope.Thread)
-  public static class Listener {
-    private Path path;
-    private ServerSocketChannel server;
+    @State(Scope.Thread)
+    public static class Listener {
+        private Path path;
+        private ServerSocketChannel server;
 
-    @Setup
-    public void setup() throws IOException {
-      // Gradle's JMH temp directory can exceed the Unix-domain socket path limit.
-      path = Files.createTempFile(Paths.get("/tmp"), "uds-jmh-", ".sock");
-      Files.delete(path);
-      server = ServerSocketChannel.open(StandardProtocolFamily.UNIX);
-      try {
-        server.bind(UnixDomainSocketAddress.of(path));
-      } catch (IOException | RuntimeException e) {
-        close();
-        throw e;
-      }
-    }
+        @Setup
+        public void setup() throws IOException {
+            // Gradle's JMH temp directory can exceed the Unix-domain socket path limit.
+            path = Files.createTempFile(Paths.get("/tmp"), "uds-jmh-", ".sock");
+            Files.delete(path);
+            server = ServerSocketChannel.open(StandardProtocolFamily.UNIX);
+            try {
+                server.bind(UnixDomainSocketAddress.of(path));
+            } catch (IOException | RuntimeException e) {
+                close();
+                throw e;
+            }
+        }
 
-    @TearDown
-    public void close() throws IOException {
-      try {
-        server.close();
-      } finally {
-        Files.deleteIfExists(path);
-      }
+        @TearDown
+        public void close() throws IOException {
+            try {
+                server.close();
+            } finally {
+                Files.deleteIfExists(path);
+            }
+        }
     }
-  }
 
-  @State(Scope.Thread)
-  public static class Connection {
-    @Param({"256", "8192", "65536"})
-    public int bytes;
+    @State(Scope.Thread)
+    public static class Connection {
+        @Param({"256", "8192", "65536"})
+        public int bytes;
 
-    private Socket socket;
-    private SocketChannel peer;
-    private InputStream input;
-    private OutputStream output;
-    private byte[] request;
-    private byte[] response;
-    private Thread responder;
-    private volatile IOException peerFailure;
+        private Socket socket;
+        private SocketChannel peer;
+        private InputStream input;
+        private OutputStream output;
+        private byte[] request;
+        private byte[] response;
+        private Thread responder;
+        private volatile IOException peerFailure;
 
-    @Setup
-    public void setup(Listener listener) throws IOException {
-      request = new byte[bytes];
-      Arrays.fill(request, (byte) 1);
-      response = new byte[bytes];
-      socket = new TunnelingJdkSocket(listener.path);
-      try {
-        socket.connect(ENDPOINT);
-        peer = listener.server.accept();
-        socket.setSoTimeout(5000);
-        input = socket.getInputStream();
-        output = socket.getOutputStream();
-      } catch (IOException | RuntimeException e) {
-        socket.close();
-        if (peer != null) {
-          peer.close();
+        @Setup
+        public void setup(Listener listener) throws IOException {
+            request = new byte[bytes];
+            Arrays.fill(request, (byte) 1);
+            response = new byte[bytes];
+            socket = new TunnelingJdkSocket(listener.path);
+            try {
+                socket.connect(ENDPOINT);
+                peer = listener.server.accept();
+                socket.setSoTimeout(5000);
+                input = socket.getInputStream();
+                output = socket.getOutputStream();
+            } catch (IOException | RuntimeException e) {
+                socket.close();
+                if (peer != null) {
+                    peer.close();
+                }
+                throw e;
+            }
+            responder = new Thread(this::echo, "uds-jmh-peer");
+            responder.setDaemon(true);
+            responder.start();
         }
-        throw e;
-      }
-      responder = new Thread(this::echo, "uds-jmh-peer");
-      responder.setDaemon(true);
-      responder.start();
-    }
 
-    private void echo() {
-      ByteBuffer buffer = ByteBuffer.allocate(bytes);
-      try {
-        while (true) {
-          buffer.clear();
-          while (buffer.hasRemaining()) {
-            if (peer.read(buffer) == -1) {
-              return;
+        private void echo() {
+            ByteBuffer buffer = ByteBuffer.allocate(bytes);
+            try {
+                while (true) {
+                    buffer.clear();
+                    while (buffer.hasRemaining()) {
+                        if (peer.read(buffer) == -1) {
+                            return;
+                        }
+                    }
+                    buffer.flip();
+                    while (buffer.hasRemaining()) {
+                        peer.write(buffer);
+                    }
+                }
+            } catch (IOException e) {
+                if (peer.isOpen()) {
+                    peerFailure = e;
+                    try {
+                        socket.close();
+                    } catch (IOException closeFailure) {
+                        e.addSuppressed(closeFailure);
+                    }
+                }
             }
-          }
-          buffer.flip();
-          while (buffer.hasRemaining()) {
-            peer.write(buffer);
-          }
         }
-      } catch (IOException e) {
-        if (peer.isOpen()) {
-          peerFailure = e;
-          try {
-            socket.close();
-          } catch (IOException closeFailure) {
-            e.addSuppressed(closeFailure);
-          }
-        }
-      }
-    }
 
-    @TearDown
-    public void close() throws IOException, InterruptedException {
-      try {
-        peer.close();
-      } finally {
-        socket.close();
-      }
-      responder.join(TimeUnit.SECONDS.toMillis(5));
-      if (responder.isAlive()) {
-        throw new IllegalStateException("Peer did not terminate");
-      }
-      if (peerFailure != null) {
-        throw peerFailure;
-      }
+        @TearDown
+        public void close() throws IOException, InterruptedException {
+            try {
+                peer.close();
+            } finally {
+                socket.close();
+            }
+            responder.join(TimeUnit.SECONDS.toMillis(5));
+            if (responder.isAlive()) {
+                throw new IllegalStateException("Peer did not terminate");
+            }
+            if (peerFailure != null) {
+                throw peerFailure;
+            }
+        }
     }
-  }
 }
diff --git a/utils/socket-utils/src/main/java/com/kenai/jffi/PatchInit.java b/utils/socket-utils/src/main/java/com/kenai/jffi/PatchInit.java
index 049d3ca481c..3e47410f8b4 100644
--- a/utils/socket-utils/src/main/java/com/kenai/jffi/PatchInit.java
+++ b/utils/socket-utils/src/main/java/com/kenai/jffi/PatchInit.java
@@ -6,27 +6,27 @@
 
 /** Replacement Init class that loads StubLoader from the same (isolating) class-loader. */
 final class PatchInit {
-  private static volatile boolean loaded;
+    private static volatile boolean loaded;
 
-  private PatchInit() {}
+    private PatchInit() {}
 
-  static void load() {
-    if (loaded) {
-      return;
+    static void load() {
+        if (loaded) {
+            return;
+        }
+        if (JavaVirtualMachine.isJavaVersionAtLeast(25)) {
+            SystemProperties.set("jffi.unsafe.disabled", "true");
+        }
+        try {
+            if (StubLoader.isLoaded()) {
+                loaded = true;
+            } else {
+                throw StubLoader.getFailureCause();
+            }
+        } catch (UnsatisfiedLinkError e) {
+            throw e;
+        } catch (Throwable e) {
+            throw (UnsatisfiedLinkError) new UnsatisfiedLinkError(e.getLocalizedMessage()).initCause(e);
+        }
     }
-    if (JavaVirtualMachine.isJavaVersionAtLeast(25)) {
-      SystemProperties.set("jffi.unsafe.disabled", "true");
-    }
-    try {
-      if (StubLoader.isLoaded()) {
-        loaded = true;
-      } else {
-        throw StubLoader.getFailureCause();
-      }
-    } catch (UnsatisfiedLinkError e) {
-      throw e;
-    } catch (Throwable e) {
-      throw (UnsatisfiedLinkError) new UnsatisfiedLinkError(e.getLocalizedMessage()).initCause(e);
-    }
-  }
 }
diff --git a/utils/socket-utils/src/main/java/datadog/common/socket/NamedPipeSocket.java b/utils/socket-utils/src/main/java/datadog/common/socket/NamedPipeSocket.java
index 34b254d13bb..52be2d80f87 100644
--- a/utils/socket-utils/src/main/java/datadog/common/socket/NamedPipeSocket.java
+++ b/utils/socket-utils/src/main/java/datadog/common/socket/NamedPipeSocket.java
@@ -18,148 +18,148 @@
  * the context of a named pipe and therefore implemented as no-ops
  */
 public class NamedPipeSocket extends Socket {
-  private final InputStream inputStream;
-  private final OutputStream outputStream;
-  private final RandomAccessFile randomAccessFile;
-  private final FileChannel fileChannel;
-
-  public NamedPipeSocket(File pipe) throws FileNotFoundException {
-    randomAccessFile = new RandomAccessFile(pipe, "rw");
-    fileChannel = randomAccessFile.getChannel();
-    inputStream = Channels.newInputStream(fileChannel);
-    outputStream = Channels.newOutputStream(fileChannel);
-  }
-
-  @Override
-  public InputStream getInputStream() throws IOException {
-    if (randomAccessFile.getChannel().isOpen()) {
-      return inputStream;
-    } else {
-      throw new IOException("Pipe closed");
-    }
-  }
-
-  @Override
-  public OutputStream getOutputStream() throws IOException {
-    if (randomAccessFile.getChannel().isOpen()) {
-      return outputStream;
-    } else {
-      throw new IOException("Pipe closed");
-    }
-  }
-
-  @Override
-  public void close() throws IOException {
-    randomAccessFile.close();
-  }
-
-  @Override
-  public boolean isClosed() {
-    return !fileChannel.isOpen();
-  }
-
-  @Override
-  public boolean isBound() {
-    return !isClosed();
-  }
-
-  @Override
-  public boolean isConnected() {
-    return !isClosed();
-  }
-
-  @Override
-  public boolean isInputShutdown() {
-    return isClosed();
-  }
-
-  @Override
-  public boolean isOutputShutdown() {
-    return isClosed();
-  }
-
-  @Override
-  public void shutdownInput() throws IOException {
-    close();
-  }
-
-  @Override
-  public void shutdownOutput() throws IOException {
-    close();
-  }
-
-  @Override
-  public void bind(SocketAddress local) {
-    // do nothing
-  }
-
-  @Override
-  public void connect(SocketAddress addr) {
-    // do nothing
-  }
-
-  @Override
-  public void connect(SocketAddress addr, int timeout) {
-    // do nothing
-  }
-
-  @Override
-  public SocketChannel getChannel() {
-    return null;
-  }
-
-  @Override
-  public InetAddress getInetAddress() {
-    return null;
-  }
-
-  @Override
-  public SocketAddress getLocalSocketAddress() {
-    return null;
-  }
-
-  @Override
-  public SocketAddress getRemoteSocketAddress() {
-    return null;
-  }
-
-  @Override
-  public boolean getKeepAlive() {
-    return true;
-  }
-
-  @Override
-  public int getReceiveBufferSize() {
-    return 0;
-  }
-
-  @Override
-  public int getSendBufferSize() {
-    return 0;
-  }
-
-  @Override
-  public int getSoTimeout() {
-    return 0;
-  }
-
-  @Override
-  public void setKeepAlive(boolean on) {
-    // do nothing
-  }
-
-  @Override
-  public void setReceiveBufferSize(int size) {
-    // do nothing
-  }
-
-  @Override
-  public void setSendBufferSize(int size) {
-    // do nothing
-  }
-
-  @Override
-  public void setSoTimeout(int timeout) {
-    // do nothing
-  }
+    private final InputStream inputStream;
+    private final OutputStream outputStream;
+    private final RandomAccessFile randomAccessFile;
+    private final FileChannel fileChannel;
+
+    public NamedPipeSocket(File pipe) throws FileNotFoundException {
+        randomAccessFile = new RandomAccessFile(pipe, "rw");
+        fileChannel = randomAccessFile.getChannel();
+        inputStream = Channels.newInputStream(fileChannel);
+        outputStream = Channels.newOutputStream(fileChannel);
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException {
+        if (randomAccessFile.getChannel().isOpen()) {
+            return inputStream;
+        } else {
+            throw new IOException("Pipe closed");
+        }
+    }
+
+    @Override
+    public OutputStream getOutputStream() throws IOException {
+        if (randomAccessFile.getChannel().isOpen()) {
+            return outputStream;
+        } else {
+            throw new IOException("Pipe closed");
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+        randomAccessFile.close();
+    }
+
+    @Override
+    public boolean isClosed() {
+        return !fileChannel.isOpen();
+    }
+
+    @Override
+    public boolean isBound() {
+        return !isClosed();
+    }
+
+    @Override
+    public boolean isConnected() {
+        return !isClosed();
+    }
+
+    @Override
+    public boolean isInputShutdown() {
+        return isClosed();
+    }
+
+    @Override
+    public boolean isOutputShutdown() {
+        return isClosed();
+    }
+
+    @Override
+    public void shutdownInput() throws IOException {
+        close();
+    }
+
+    @Override
+    public void shutdownOutput() throws IOException {
+        close();
+    }
+
+    @Override
+    public void bind(SocketAddress local) {
+        // do nothing
+    }
+
+    @Override
+    public void connect(SocketAddress addr) {
+        // do nothing
+    }
+
+    @Override
+    public void connect(SocketAddress addr, int timeout) {
+        // do nothing
+    }
+
+    @Override
+    public SocketChannel getChannel() {
+        return null;
+    }
+
+    @Override
+    public InetAddress getInetAddress() {
+        return null;
+    }
+
+    @Override
+    public SocketAddress getLocalSocketAddress() {
+        return null;
+    }
+
+    @Override
+    public SocketAddress getRemoteSocketAddress() {
+        return null;
+    }
+
+    @Override
+    public boolean getKeepAlive() {
+        return true;
+    }
+
+    @Override
+    public int getReceiveBufferSize() {
+        return 0;
+    }
+
+    @Override
+    public int getSendBufferSize() {
+        return 0;
+    }
+
+    @Override
+    public int getSoTimeout() {
+        return 0;
+    }
+
+    @Override
+    public void setKeepAlive(boolean on) {
+        // do nothing
+    }
+
+    @Override
+    public void setReceiveBufferSize(int size) {
+        // do nothing
+    }
+
+    @Override
+    public void setSendBufferSize(int size) {
+        // do nothing
+    }
+
+    @Override
+    public void setSoTimeout(int timeout) {
+        // do nothing
+    }
 }
diff --git a/utils/socket-utils/src/main/java/datadog/common/socket/NamedPipeSocketFactory.java b/utils/socket-utils/src/main/java/datadog/common/socket/NamedPipeSocketFactory.java
index 02fe777d130..4b1e5fd1186 100644
--- a/utils/socket-utils/src/main/java/datadog/common/socket/NamedPipeSocketFactory.java
+++ b/utils/socket-utils/src/main/java/datadog/common/socket/NamedPipeSocketFactory.java
@@ -9,50 +9,48 @@
 import javax.net.SocketFactory;
 
 public class NamedPipeSocketFactory extends SocketFactory {
-  private static final String NAMED_PIPE_PREFIX = "\\\\.\\pipe\\";
-  private static final Map<File, NamedPipeSocket> fileToSocket = new HashMap<>();
-  private final File pipe;
-
-  public NamedPipeSocketFactory(String pipeName) {
-    String pipeNameWithPrefix =
-        pipeName.startsWith(NAMED_PIPE_PREFIX) ? pipeName : NAMED_PIPE_PREFIX + pipeName;
-    this.pipe = new File(pipeNameWithPrefix);
-  }
-
-  @Override
-  public Socket createSocket() throws IOException {
-    // Getting a new socket is rare enough that simple synchronization is sufficient
-    synchronized (fileToSocket) {
-      NamedPipeSocket socket = fileToSocket.get(pipe);
-
-      if (socket == null || socket.isClosed()) {
-        socket = new NamedPipeSocket(pipe);
-        fileToSocket.put(pipe, socket);
-      }
-
-      return socket;
+    private static final String NAMED_PIPE_PREFIX = "\\\\.\\pipe\\";
+    private static final Map<File, NamedPipeSocket> fileToSocket = new HashMap<>();
+    private final File pipe;
+
+    public NamedPipeSocketFactory(String pipeName) {
+        String pipeNameWithPrefix = pipeName.startsWith(NAMED_PIPE_PREFIX) ? pipeName : NAMED_PIPE_PREFIX + pipeName;
+        this.pipe = new File(pipeNameWithPrefix);
+    }
+
+    @Override
+    public Socket createSocket() throws IOException {
+        // Getting a new socket is rare enough that simple synchronization is sufficient
+        synchronized (fileToSocket) {
+            NamedPipeSocket socket = fileToSocket.get(pipe);
+
+            if (socket == null || socket.isClosed()) {
+                socket = new NamedPipeSocket(pipe);
+                fileToSocket.put(pipe, socket);
+            }
+
+            return socket;
+        }
+    }
+
+    @Override
+    public Socket createSocket(String host, int port) throws IOException {
+        return createSocket();
+    }
+
+    @Override
+    public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException {
+        return createSocket();
+    }
+
+    @Override
+    public Socket createSocket(InetAddress host, int port) throws IOException {
+        return createSocket();
+    }
+
+    @Override
+    public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort)
+            throws IOException {
+        return createSocket();
     }
-  }
-
-  @Override
-  public Socket createSocket(String host, int port) throws IOException {
-    return createSocket();
-  }
-
-  @Override
-  public Socket createSocket(String host, int port, InetAddress localHost, int localPort)
-      throws IOException {
-    return createSocket();
-  }
-
-  @Override
-  public Socket createSocket(InetAddress host, int port) throws IOException {
-    return createSocket();
-  }
-
-  @Override
-  public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort)
-      throws IOException {
-    return createSocket();
-  }
 }
diff --git a/utils/socket-utils/src/main/java/datadog/common/socket/TunnelingUnixSocket.java b/utils/socket-utils/src/main/java/datadog/common/socket/TunnelingUnixSocket.java
index 1c37e93dddd..60a503de70a 100644
--- a/utils/socket-utils/src/main/java/datadog/common/socket/TunnelingUnixSocket.java
+++ b/utils/socket-utils/src/main/java/datadog/common/socket/TunnelingUnixSocket.java
@@ -18,34 +18,33 @@
  * examples</a>.
  */
 final class TunnelingUnixSocket extends UnixSocket {
-  private final File path;
-  private InetSocketAddress inetSocketAddress;
+    private final File path;
+    private InetSocketAddress inetSocketAddress;
 
-  TunnelingUnixSocket(final File path, final UnixSocketChannel channel) {
-    super(channel);
-    this.path = path;
-  }
+    TunnelingUnixSocket(final File path, final UnixSocketChannel channel) {
+        super(channel);
+        this.path = path;
+    }
 
-  TunnelingUnixSocket(
-      final File path, final UnixSocketChannel channel, final InetSocketAddress address) {
-    this(path, channel);
-    inetSocketAddress = address;
-  }
+    TunnelingUnixSocket(final File path, final UnixSocketChannel channel, final InetSocketAddress address) {
+        this(path, channel);
+        inetSocketAddress = address;
+    }
 
-  @Override
-  public void connect(final SocketAddress endpoint) throws IOException {
-    inetSocketAddress = (InetSocketAddress) endpoint;
-    super.connect(new UnixSocketAddress(path), 0);
-  }
+    @Override
+    public void connect(final SocketAddress endpoint) throws IOException {
+        inetSocketAddress = (InetSocketAddress) endpoint;
+        super.connect(new UnixSocketAddress(path), 0);
+    }
 
-  @Override
-  public void connect(final SocketAddress endpoint, final int timeout) throws IOException {
-    inetSocketAddress = (InetSocketAddress) endpoint;
-    super.connect(new UnixSocketAddress(path), timeout);
-  }
+    @Override
+    public void connect(final SocketAddress endpoint, final int timeout) throws IOException {
+        inetSocketAddress = (InetSocketAddress) endpoint;
+        super.connect(new UnixSocketAddress(path), timeout);
+    }
 
-  @Override
-  public InetAddress getInetAddress() {
-    return inetSocketAddress.getAddress();
-  }
+    @Override
+    public InetAddress getInetAddress() {
+        return inetSocketAddress.getAddress();
+    }
 }
diff --git a/utils/socket-utils/src/main/java/datadog/common/socket/UnixDomainSocketFactory.java b/utils/socket-utils/src/main/java/datadog/common/socket/UnixDomainSocketFactory.java
index 09d03d1325d..5c25807a11d 100644
--- a/utils/socket-utils/src/main/java/datadog/common/socket/UnixDomainSocketFactory.java
+++ b/utils/socket-utils/src/main/java/datadog/common/socket/UnixDomainSocketFactory.java
@@ -22,73 +22,71 @@
  * examples</a>.
  */
 public final class UnixDomainSocketFactory extends SocketFactory {
-  private static final Logger log = LoggerFactory.getLogger(UnixDomainSocketFactory.class);
+    private static final Logger log = LoggerFactory.getLogger(UnixDomainSocketFactory.class);
 
-  private static final boolean JDK_SUPPORTS_UDS = JavaVirtualMachine.isJavaVersionAtLeast(16);
+    private static final boolean JDK_SUPPORTS_UDS = JavaVirtualMachine.isJavaVersionAtLeast(16);
 
-  private final RatelimitedLogger rlLog = new RatelimitedLogger(log, 5, MINUTES);
+    private final RatelimitedLogger rlLog = new RatelimitedLogger(log, 5, MINUTES);
 
-  private final File path;
-  private final boolean useJdkUdsSocket;
-  private final boolean agentConfiguredUsingDefault;
+    private final File path;
+    private final boolean useJdkUdsSocket;
+    private final boolean agentConfiguredUsingDefault;
 
-  public UnixDomainSocketFactory(
-      final File path, boolean isJdkSocketEnabled, boolean agentConfiguredUsingDefault) {
-    this.path = path;
-    this.useJdkUdsSocket = isJdkSocketEnabled && JavaVirtualMachine.isJavaVersionAtLeast(16);
-    this.agentConfiguredUsingDefault = agentConfiguredUsingDefault;
-  }
+    public UnixDomainSocketFactory(final File path, boolean isJdkSocketEnabled, boolean agentConfiguredUsingDefault) {
+        this.path = path;
+        this.useJdkUdsSocket = isJdkSocketEnabled && JavaVirtualMachine.isJavaVersionAtLeast(16);
+        this.agentConfiguredUsingDefault = agentConfiguredUsingDefault;
+    }
 
-  @Override
-  public Socket createSocket() throws IOException {
-    try {
-      if (this.useJdkUdsSocket) {
+    @Override
+    public Socket createSocket() throws IOException {
         try {
-          return new TunnelingJdkSocket(this.path.toPath());
-        } catch (IOException | UnsupportedOperationException ignore) {
-          // fall back to jnr-unixsocket library
-        }
-      }
-      return new TunnelingUnixSocket(this.path, UnixSocketChannel.open());
-    } catch (Throwable e) {
-      if (this.agentConfiguredUsingDefault) {
-        // fall back to port if we previously auto-discovered this socket file
-        if (log.isDebugEnabled()) {
-          rlLog.warn("Problem opening {}, using port instead", path, e);
-        } else {
-          rlLog.warn("Problem opening {}, using port instead: " + e, path);
+            if (this.useJdkUdsSocket) {
+                try {
+                    return new TunnelingJdkSocket(this.path.toPath());
+                } catch (IOException | UnsupportedOperationException ignore) {
+                    // fall back to jnr-unixsocket library
+                }
+            }
+            return new TunnelingUnixSocket(this.path, UnixSocketChannel.open());
+        } catch (Throwable e) {
+            if (this.agentConfiguredUsingDefault) {
+                // fall back to port if we previously auto-discovered this socket file
+                if (log.isDebugEnabled()) {
+                    rlLog.warn("Problem opening {}, using port instead", path, e);
+                } else {
+                    rlLog.warn("Problem opening {}, using port instead: " + e, path);
+                }
+                return getDefault().createSocket();
+            }
+            throw e;
         }
-        return getDefault().createSocket();
-      }
-      throw e;
     }
-  }
 
-  @Override
-  public Socket createSocket(final String host, final int port) throws IOException {
-    final Socket result = createSocket();
-    result.connect(new InetSocketAddress(host, port));
-    return result;
-  }
+    @Override
+    public Socket createSocket(final String host, final int port) throws IOException {
+        final Socket result = createSocket();
+        result.connect(new InetSocketAddress(host, port));
+        return result;
+    }
 
-  @Override
-  public Socket createSocket(
-      final String host, final int port, final InetAddress localHost, final int localPort)
-      throws IOException {
-    return createSocket(host, port);
-  }
+    @Override
+    public Socket createSocket(final String host, final int port, final InetAddress localHost, final int localPort)
+            throws IOException {
+        return createSocket(host, port);
+    }
 
-  @Override
-  public Socket createSocket(final InetAddress host, final int port) throws IOException {
-    final Socket result = createSocket();
-    result.connect(new InetSocketAddress(host, port));
-    return result;
-  }
+    @Override
+    public Socket createSocket(final InetAddress host, final int port) throws IOException {
+        final Socket result = createSocket();
+        result.connect(new InetSocketAddress(host, port));
+        return result;
+    }
 
-  @Override
-  public Socket createSocket(
-      final InetAddress host, final int port, final InetAddress localAddress, final int localPort)
-      throws IOException {
-    return createSocket(host, port);
-  }
+    @Override
+    public Socket createSocket(
+            final InetAddress host, final int port, final InetAddress localAddress, final int localPort)
+            throws IOException {
+        return createSocket(host, port);
+    }
 }
diff --git a/utils/socket-utils/src/main/java17/datadog/common/socket/TunnelingJdkSocket.java b/utils/socket-utils/src/main/java17/datadog/common/socket/TunnelingJdkSocket.java
index a0487a4e944..77723161cef 100644
--- a/utils/socket-utils/src/main/java17/datadog/common/socket/TunnelingJdkSocket.java
+++ b/utils/socket-utils/src/main/java17/datadog/common/socket/TunnelingJdkSocket.java
@@ -30,372 +30,374 @@
  * 16.
  */
 final class TunnelingJdkSocket extends Socket {
-  private final UnixDomainSocketAddress unixSocketAddress;
-  private final SocketChannel unixSocketChannel;
-
-  private volatile InetSocketAddress inetSocketAddress;
-  @VisibleForTesting Selector selector;
-
-  private volatile int timeout;
-  private volatile boolean shutIn;
-  private volatile boolean shutOut;
-  private volatile boolean closed;
-
-  static final int DEFAULT_BUFFER_SIZE = 8192;
-  // Indicate that the buffer size is not set by initializing to -1
-  private int sendBufferSize = -1;
-  private int receiveBufferSize = -1;
-
-  TunnelingJdkSocket(final Path path) throws IOException, UnsupportedOperationException {
-    this.unixSocketAddress = UnixDomainSocketAddress.of(path);
-    this.unixSocketChannel = SocketChannel.open(StandardProtocolFamily.UNIX);
-  }
-
-  @Override
-  public boolean isConnected() {
-    return inetSocketAddress != null;
-  }
-
-  @Override
-  public boolean isInputShutdown() {
-    return shutIn;
-  }
-
-  @Override
-  public boolean isOutputShutdown() {
-    return shutOut;
-  }
-
-  @Override
-  public boolean isClosed() {
-    return closed;
-  }
-
-  @Override
-  public void setSoTimeout(int timeout) throws SocketException {
-    if (isClosed()) {
-      throw new SocketException("Socket is closed");
-    }
-    if (timeout < 0) {
-      throw new IllegalArgumentException("Socket timeout can't be negative");
-    }
-    this.timeout = timeout;
-  }
+    private final UnixDomainSocketAddress unixSocketAddress;
+    private final SocketChannel unixSocketChannel;
 
-  @Override
-  public int getSoTimeout() throws SocketException {
-    if (isClosed()) {
-      throw new SocketException("Socket is closed");
-    }
-    return timeout;
-  }
-
-  @Override
-  public void connect(final SocketAddress endpoint) throws IOException {
-    connect(endpoint, 0);
-  }
-
-  // `timeout` is intentionally ignored here, like in the jnr-unixsocket implementation.
-  // See:
-  // https://github.com/jnr/jnr-unixsocket/blob/master/src/main/java/jnr/unixsocket/UnixSocket.java#L89-L97
-  @Override
-  public void connect(final SocketAddress endpoint, final int timeout) throws IOException {
-    if (endpoint == null) {
-      throw new IllegalArgumentException("Endpoint cannot be null");
-    }
-    if (timeout < 0) {
-      throw new IllegalArgumentException("Timeout cannot be negative");
-    }
-    if (isClosed()) {
-      throw new SocketException("Socket is closed");
-    }
-    if (isConnected()) {
-      throw new SocketException("Socket is already connected");
-    }
-    InetSocketAddress inetSocketAddress = (InetSocketAddress) endpoint;
-    try {
-      unixSocketChannel.connect(unixSocketAddress);
-      this.inetSocketAddress = inetSocketAddress;
-    } catch (IOException e) {
-      close();
-      throw e;
-    }
-  }
+    private volatile InetSocketAddress inetSocketAddress;
 
-  @Override
-  public SocketChannel getChannel() {
-    return unixSocketChannel;
-  }
+    @VisibleForTesting
+    Selector selector;
 
-  @Override
-  public void setSendBufferSize(int size) throws SocketException {
-    if (size <= 0) {
-      throw new IllegalArgumentException("Invalid send buffer size");
-    }
-    if (isClosed()) {
-      throw new SocketException("Socket is closed");
+    private volatile int timeout;
+    private volatile boolean shutIn;
+    private volatile boolean shutOut;
+    private volatile boolean closed;
+
+    static final int DEFAULT_BUFFER_SIZE = 8192;
+    // Indicate that the buffer size is not set by initializing to -1
+    private int sendBufferSize = -1;
+    private int receiveBufferSize = -1;
+
+    TunnelingJdkSocket(final Path path) throws IOException, UnsupportedOperationException {
+        this.unixSocketAddress = UnixDomainSocketAddress.of(path);
+        this.unixSocketChannel = SocketChannel.open(StandardProtocolFamily.UNIX);
     }
-    sendBufferSize = size;
-    try {
-      unixSocketChannel.setOption(StandardSocketOptions.SO_SNDBUF, size);
-    } catch (IOException e) {
-      SocketException se = new SocketException("Failed to set send buffer size socket option");
-      se.initCause(e);
-      throw se;
+
+    @Override
+    public boolean isConnected() {
+        return inetSocketAddress != null;
     }
-  }
 
-  @Override
-  public int getSendBufferSize() throws SocketException {
-    if (isClosed()) {
-      throw new SocketException("Socket is closed");
+    @Override
+    public boolean isInputShutdown() {
+        return shutIn;
     }
-    if (sendBufferSize == -1) {
-      return DEFAULT_BUFFER_SIZE;
+
+    @Override
+    public boolean isOutputShutdown() {
+        return shutOut;
     }
-    return sendBufferSize;
-  }
 
-  @Override
-  public void setReceiveBufferSize(int size) throws SocketException {
-    if (size <= 0) {
-      throw new IllegalArgumentException("Invalid receive buffer size");
+    @Override
+    public boolean isClosed() {
+        return closed;
     }
-    if (isClosed()) {
-      throw new SocketException("Socket is closed");
+
+    @Override
+    public void setSoTimeout(int timeout) throws SocketException {
+        if (isClosed()) {
+            throw new SocketException("Socket is closed");
+        }
+        if (timeout < 0) {
+            throw new IllegalArgumentException("Socket timeout can't be negative");
+        }
+        this.timeout = timeout;
     }
-    receiveBufferSize = size;
-    try {
-      unixSocketChannel.setOption(StandardSocketOptions.SO_RCVBUF, size);
-    } catch (IOException e) {
-      SocketException se = new SocketException("Failed to set receive buffer size socket option");
-      se.initCause(e);
-      throw se;
+
+    @Override
+    public int getSoTimeout() throws SocketException {
+        if (isClosed()) {
+            throw new SocketException("Socket is closed");
+        }
+        return timeout;
     }
-  }
 
-  @Override
-  public int getReceiveBufferSize() throws SocketException {
-    if (isClosed()) {
-      throw new SocketException("Socket is closed");
+    @Override
+    public void connect(final SocketAddress endpoint) throws IOException {
+        connect(endpoint, 0);
     }
-    if (receiveBufferSize == -1) {
-      return DEFAULT_BUFFER_SIZE;
+
+    // `timeout` is intentionally ignored here, like in the jnr-unixsocket implementation.
+    // See:
+    // https://github.com/jnr/jnr-unixsocket/blob/master/src/main/java/jnr/unixsocket/UnixSocket.java#L89-L97
+    @Override
+    public void connect(final SocketAddress endpoint, final int timeout) throws IOException {
+        if (endpoint == null) {
+            throw new IllegalArgumentException("Endpoint cannot be null");
+        }
+        if (timeout < 0) {
+            throw new IllegalArgumentException("Timeout cannot be negative");
+        }
+        if (isClosed()) {
+            throw new SocketException("Socket is closed");
+        }
+        if (isConnected()) {
+            throw new SocketException("Socket is already connected");
+        }
+        InetSocketAddress inetSocketAddress = (InetSocketAddress) endpoint;
+        try {
+            unixSocketChannel.connect(unixSocketAddress);
+            this.inetSocketAddress = inetSocketAddress;
+        } catch (IOException e) {
+            close();
+            throw e;
+        }
     }
-    return receiveBufferSize;
-  }
 
-  public int getStreamBufferSize() throws SocketException {
-    if (isClosed()) {
-      throw new SocketException("Socket is closed");
+    @Override
+    public SocketChannel getChannel() {
+        return unixSocketChannel;
     }
-    if (sendBufferSize == -1 && receiveBufferSize == -1) {
-      return DEFAULT_BUFFER_SIZE;
+
+    @Override
+    public void setSendBufferSize(int size) throws SocketException {
+        if (size <= 0) {
+            throw new IllegalArgumentException("Invalid send buffer size");
+        }
+        if (isClosed()) {
+            throw new SocketException("Socket is closed");
+        }
+        sendBufferSize = size;
+        try {
+            unixSocketChannel.setOption(StandardSocketOptions.SO_SNDBUF, size);
+        } catch (IOException e) {
+            SocketException se = new SocketException("Failed to set send buffer size socket option");
+            se.initCause(e);
+            throw se;
+        }
     }
-    return Math.max(sendBufferSize, receiveBufferSize);
-  }
-
-  @Override
-  public InputStream getInputStream() throws IOException {
-    // Configuring the channel can wait for a blocked write. Let close() interrupt that write.
-    if (!isClosed() && isConnected() && !isInputShutdown() && unixSocketChannel.isBlocking()) {
-      unixSocketChannel.configureBlocking(false);
+
+    @Override
+    public int getSendBufferSize() throws SocketException {
+        if (isClosed()) {
+            throw new SocketException("Socket is closed");
+        }
+        if (sendBufferSize == -1) {
+            return DEFAULT_BUFFER_SIZE;
+        }
+        return sendBufferSize;
     }
-    // Serialize validation and selector publication with close() so close cannot miss a selector
-    // that is still being initialized.
-    synchronized (this) {
-      if (isClosed()) {
-        throw new SocketException("Socket is closed");
-      }
-      if (!isConnected()) {
-        throw new SocketException("Socket is not connected");
-      }
-      if (isInputShutdown()) {
-        throw new SocketException("Socket input is shutdown");
-      }
-
-      if (selector == null) {
-        Selector newSelector = Selector.open();
+
+    @Override
+    public void setReceiveBufferSize(int size) throws SocketException {
+        if (size <= 0) {
+            throw new IllegalArgumentException("Invalid receive buffer size");
+        }
+        if (isClosed()) {
+            throw new SocketException("Socket is closed");
+        }
+        receiveBufferSize = size;
         try {
-          unixSocketChannel.register(newSelector, SelectionKey.OP_READ);
-          selector = newSelector;
-        } catch (IOException | RuntimeException e) {
-          try {
-            newSelector.close();
-          } catch (IOException closeException) {
-            e.addSuppressed(closeException);
-          }
-          throw e;
+            unixSocketChannel.setOption(StandardSocketOptions.SO_RCVBUF, size);
+        } catch (IOException e) {
+            SocketException se = new SocketException("Failed to set receive buffer size socket option");
+            se.initCause(e);
+            throw se;
         }
-      }
+    }
 
-      final Selector readSelector = selector;
-      return new InputStream() {
-        private final ByteBuffer buffer = ByteBuffer.allocate(getStreamBufferSize());
+    @Override
+    public int getReceiveBufferSize() throws SocketException {
+        if (isClosed()) {
+            throw new SocketException("Socket is closed");
+        }
+        if (receiveBufferSize == -1) {
+            return DEFAULT_BUFFER_SIZE;
+        }
+        return receiveBufferSize;
+    }
 
-        @Override
-        public int read() throws IOException {
-          byte[] nextByte = new byte[1];
-          return (read(nextByte, 0, 1) == -1) ? -1 : (nextByte[0] & 0xFF);
+    public int getStreamBufferSize() throws SocketException {
+        if (isClosed()) {
+            throw new SocketException("Socket is closed");
         }
+        if (sendBufferSize == -1 && receiveBufferSize == -1) {
+            return DEFAULT_BUFFER_SIZE;
+        }
+        return Math.max(sendBufferSize, receiveBufferSize);
+    }
 
-        @Override
-        public int read(byte[] b, int off, int len) throws IOException {
-          if (isInputShutdown()) {
-            return -1;
-          }
-          buffer.clear();
-
-          try {
-            int readyChannels = readSelector.select(timeout);
-            if (readyChannels == 0) {
-              if (isClosed() || !readSelector.isOpen()) {
+    @Override
+    public InputStream getInputStream() throws IOException {
+        // Configuring the channel can wait for a blocked write. Let close() interrupt that write.
+        if (!isClosed() && isConnected() && !isInputShutdown() && unixSocketChannel.isBlocking()) {
+            unixSocketChannel.configureBlocking(false);
+        }
+        // Serialize validation and selector publication with close() so close cannot miss a selector
+        // that is still being initialized.
+        synchronized (this) {
+            if (isClosed()) {
                 throw new SocketException("Socket is closed");
-              }
-              return 0;
+            }
+            if (!isConnected()) {
+                throw new SocketException("Socket is not connected");
+            }
+            if (isInputShutdown()) {
+                throw new SocketException("Socket input is shutdown");
             }
 
-            Set<SelectionKey> selectedKeys = readSelector.selectedKeys();
-            // Multiple input streams share this selector, so serialize iteration and removal from
-            // its non-thread-safe selected-key set.
-            synchronized (selectedKeys) {
-              Iterator<SelectionKey> keyIterator = selectedKeys.iterator();
-              while (keyIterator.hasNext()) {
-                SelectionKey key = keyIterator.next();
-                keyIterator.remove();
-                if (key.isReadable()) {
-                  int r = unixSocketChannel.read(buffer);
-                  if (r == -1) {
-                    return -1;
-                  }
-                  buffer.flip();
-                  len = Math.min(r, len);
-                  buffer.get(b, off, len);
-                  return len;
+            if (selector == null) {
+                Selector newSelector = Selector.open();
+                try {
+                    unixSocketChannel.register(newSelector, SelectionKey.OP_READ);
+                    selector = newSelector;
+                } catch (IOException | RuntimeException e) {
+                    try {
+                        newSelector.close();
+                    } catch (IOException closeException) {
+                        e.addSuppressed(closeException);
+                    }
+                    throw e;
                 }
-              }
             }
-            return 0;
-          } catch (ClosedSelectorException | CancelledKeyException e) {
-            SocketException socketException = new SocketException("Socket is closed");
-            socketException.initCause(e);
-            throw socketException;
-          }
-        }
 
-        @Override
-        public void close() throws IOException {
-          TunnelingJdkSocket.this.close();
-        }
-      };
-    }
-  }
+            final Selector readSelector = selector;
+            return new InputStream() {
+                private final ByteBuffer buffer = ByteBuffer.allocate(getStreamBufferSize());
 
-  @Override
-  public OutputStream getOutputStream() throws IOException {
-    if (isClosed()) {
-      throw new SocketException("Socket is closed");
-    }
-    if (!isConnected()) {
-      throw new SocketException("Socket is not connected");
-    }
-    if (isOutputShutdown()) {
-      throw new SocketException("Socket output is shutdown");
-    }
+                @Override
+                public int read() throws IOException {
+                    byte[] nextByte = new byte[1];
+                    return (read(nextByte, 0, 1) == -1) ? -1 : (nextByte[0] & 0xFF);
+                }
 
-    return new OutputStream() {
-      @Override
-      public void write(int b) throws IOException {
-        byte[] array = ByteBuffer.allocate(4).putInt(b).array();
-        write(array, 0, 4);
-      }
+                @Override
+                public int read(byte[] b, int off, int len) throws IOException {
+                    if (isInputShutdown()) {
+                        return -1;
+                    }
+                    buffer.clear();
+
+                    try {
+                        int readyChannels = readSelector.select(timeout);
+                        if (readyChannels == 0) {
+                            if (isClosed() || !readSelector.isOpen()) {
+                                throw new SocketException("Socket is closed");
+                            }
+                            return 0;
+                        }
+
+                        Set<SelectionKey> selectedKeys = readSelector.selectedKeys();
+                        // Multiple input streams share this selector, so serialize iteration and removal from
+                        // its non-thread-safe selected-key set.
+                        synchronized (selectedKeys) {
+                            Iterator<SelectionKey> keyIterator = selectedKeys.iterator();
+                            while (keyIterator.hasNext()) {
+                                SelectionKey key = keyIterator.next();
+                                keyIterator.remove();
+                                if (key.isReadable()) {
+                                    int r = unixSocketChannel.read(buffer);
+                                    if (r == -1) {
+                                        return -1;
+                                    }
+                                    buffer.flip();
+                                    len = Math.min(r, len);
+                                    buffer.get(b, off, len);
+                                    return len;
+                                }
+                            }
+                        }
+                        return 0;
+                    } catch (ClosedSelectorException | CancelledKeyException e) {
+                        SocketException socketException = new SocketException("Socket is closed");
+                        socketException.initCause(e);
+                        throw socketException;
+                    }
+                }
 
-      @Override
-      public void write(byte[] b, int off, int len) throws IOException {
-        if (isOutputShutdown()) {
-          throw new IOException("Stream closed");
-        }
-        ByteBuffer buffer = ByteBuffer.wrap(b, off, len);
-        while (buffer.hasRemaining()) {
-          unixSocketChannel.write(buffer);
+                @Override
+                public void close() throws IOException {
+                    TunnelingJdkSocket.this.close();
+                }
+            };
         }
-      }
-
-      @Override
-      public void close() throws IOException {
-        TunnelingJdkSocket.this.close();
-      }
-    };
-  }
-
-  @Override
-  public void shutdownInput() throws IOException {
-    // Keep validation, channel shutdown, and state publication atomic with close().
-    synchronized (this) {
-      if (isClosed()) {
-        throw new SocketException("Socket is closed");
-      }
-      if (!isConnected()) {
-        throw new SocketException("Socket is not connected");
-      }
-      if (isInputShutdown()) {
-        throw new SocketException("Socket input is already shutdown");
-      }
-      unixSocketChannel.shutdownInput();
-      shutIn = true;
     }
-  }
-
-  @Override
-  public void shutdownOutput() throws IOException {
-    // Keep validation, channel shutdown, and state publication atomic with close().
-    synchronized (this) {
-      if (isClosed()) {
-        throw new SocketException("Socket is closed");
-      }
-      if (!isConnected()) {
-        throw new SocketException("Socket is not connected");
-      }
-      if (isOutputShutdown()) {
-        throw new SocketException("Socket output is already shutdown");
-      }
-      unixSocketChannel.shutdownOutput();
-      shutOut = true;
+
+    @Override
+    public OutputStream getOutputStream() throws IOException {
+        if (isClosed()) {
+            throw new SocketException("Socket is closed");
+        }
+        if (!isConnected()) {
+            throw new SocketException("Socket is not connected");
+        }
+        if (isOutputShutdown()) {
+            throw new SocketException("Socket output is shutdown");
+        }
+
+        return new OutputStream() {
+            @Override
+            public void write(int b) throws IOException {
+                byte[] array = ByteBuffer.allocate(4).putInt(b).array();
+                write(array, 0, 4);
+            }
+
+            @Override
+            public void write(byte[] b, int off, int len) throws IOException {
+                if (isOutputShutdown()) {
+                    throw new IOException("Stream closed");
+                }
+                ByteBuffer buffer = ByteBuffer.wrap(b, off, len);
+                while (buffer.hasRemaining()) {
+                    unixSocketChannel.write(buffer);
+                }
+            }
+
+            @Override
+            public void close() throws IOException {
+                TunnelingJdkSocket.this.close();
+            }
+        };
     }
-  }
 
-  @Override
-  public InetAddress getInetAddress() {
-    if (!isConnected()) {
-      return null;
+    @Override
+    public void shutdownInput() throws IOException {
+        // Keep validation, channel shutdown, and state publication atomic with close().
+        synchronized (this) {
+            if (isClosed()) {
+                throw new SocketException("Socket is closed");
+            }
+            if (!isConnected()) {
+                throw new SocketException("Socket is not connected");
+            }
+            if (isInputShutdown()) {
+                throw new SocketException("Socket input is already shutdown");
+            }
+            unixSocketChannel.shutdownInput();
+            shutIn = true;
+        }
     }
-    return inetSocketAddress.getAddress();
-  }
-
-  @Override
-  public void close() {
-    Selector currentSelector;
-    // Publish the terminal state and snapshot the selector atomically with selector creation and
-    // half-close operations. The resources are closed after releasing this monitor.
-    synchronized (this) {
-      if (isClosed()) {
-        return;
-      }
-      shutIn = true;
-      shutOut = true;
-      closed = true;
-      currentSelector = selector;
+
+    @Override
+    public void shutdownOutput() throws IOException {
+        // Keep validation, channel shutdown, and state publication atomic with close().
+        synchronized (this) {
+            if (isClosed()) {
+                throw new SocketException("Socket is closed");
+            }
+            if (!isConnected()) {
+                throw new SocketException("Socket is not connected");
+            }
+            if (isOutputShutdown()) {
+                throw new SocketException("Socket output is already shutdown");
+            }
+            unixSocketChannel.shutdownOutput();
+            shutOut = true;
+        }
     }
-    // Ignore possible exceptions so that we continue closing the socket
-    try {
-      if (currentSelector != null) {
-        currentSelector.close();
-      }
-    } catch (IOException ignored) {
+
+    @Override
+    public InetAddress getInetAddress() {
+        if (!isConnected()) {
+            return null;
+        }
+        return inetSocketAddress.getAddress();
     }
-    try {
-      unixSocketChannel.close();
-    } catch (IOException ignored) {
+
+    @Override
+    public void close() {
+        Selector currentSelector;
+        // Publish the terminal state and snapshot the selector atomically with selector creation and
+        // half-close operations. The resources are closed after releasing this monitor.
+        synchronized (this) {
+            if (isClosed()) {
+                return;
+            }
+            shutIn = true;
+            shutOut = true;
+            closed = true;
+            currentSelector = selector;
+        }
+        // Ignore possible exceptions so that we continue closing the socket
+        try {
+            if (currentSelector != null) {
+                currentSelector.close();
+            }
+        } catch (IOException ignored) {
+        }
+        try {
+            unixSocketChannel.close();
+        } catch (IOException ignored) {
+        }
     }
-  }
 }
diff --git a/utils/socket-utils/src/test/java/datadog/common/socket/TunnelingJdkSocketTest.java b/utils/socket-utils/src/test/java/datadog/common/socket/TunnelingJdkSocketTest.java
index ef6741e35bb..9628ca47121 100644
--- a/utils/socket-utils/src/test/java/datadog/common/socket/TunnelingJdkSocketTest.java
+++ b/utils/socket-utils/src/test/java/datadog/common/socket/TunnelingJdkSocketTest.java
@@ -48,671 +48,656 @@
 @EnabledForJreRange(min = JAVA_16)
 public class TunnelingJdkSocketTest {
 
-  private TestUnixSocketServer server;
-
-  @BeforeAll
-  static void assumeUnixDomainSocketsAreSupported() {
-    Assumptions.assumeTrue(udsSupported());
-  }
-
-  @AfterEach
-  void closeServer() throws Exception {
-    if (server != null) {
-      server.close();
-      server = null;
+    private TestUnixSocketServer server;
+
+    @BeforeAll
+    static void assumeUnixDomainSocketsAreSupported() {
+        Assumptions.assumeTrue(udsSupported());
+    }
+
+    @AfterEach
+    void closeServer() throws Exception {
+        if (server != null) {
+            server.close();
+            server = null;
+        }
     }
-  }
-
-  @Test
-  public void testSocketConnectAndClose() throws Exception {
-    Path socketPath = getSocketPath();
-    UnixDomainSocketAddress socketAddress = UnixDomainSocketAddress.of(socketPath);
-    startServer(socketAddress);
-    TunnelingJdkSocket clientSocket = new TunnelingJdkSocket(socketPath);
-
-    assertNotNull(clientSocket.getChannel());
-    assertTrue(clientSocket.getChannel().isOpen());
-    assertFalse(clientSocket.isConnected());
-    assertFalse(clientSocket.isClosed());
-
-    clientSocket.connect(new InetSocketAddress("localhost", 0));
-    InputStream inputStream = clientSocket.getInputStream();
-    OutputStream outputStream = clientSocket.getOutputStream();
-
-    assertTrue(clientSocket.isConnected());
-    assertFalse(clientSocket.isClosed());
-    assertFalse(clientSocket.isInputShutdown());
-    assertFalse(clientSocket.isOutputShutdown());
-    assertThrows(
-        SocketException.class, () -> clientSocket.connect(new InetSocketAddress("localhost", 0)));
-
-    clientSocket.close();
-
-    assertTrue(clientSocket.isConnected());
-    assertTrue(clientSocket.isClosed());
-    assertFalse(clientSocket.getChannel().isOpen());
-    assertTrue(clientSocket.isInputShutdown());
-    assertTrue(clientSocket.isOutputShutdown());
-    assertEquals(-1, inputStream.read());
-    assertThrows(IOException.class, () -> outputStream.write(1));
-    assertThrows(SocketException.class, clientSocket::getInputStream);
-    assertThrows(SocketException.class, clientSocket::getOutputStream);
-    clientSocket.close();
-  }
-
-  @Test
-  public void testConnectFailureClosesSocket() throws Exception {
-    Path missingSocketPath = getSocketPath();
-    TunnelingJdkSocket clientSocket = new TunnelingJdkSocket(missingSocketPath);
-
-    assertThrows(
-        IOException.class, () -> clientSocket.connect(new InetSocketAddress("localhost", 0)));
-
-    assertFalse(clientSocket.isConnected());
-    assertTrue(clientSocket.isClosed());
-    assertTrue(clientSocket.isInputShutdown());
-    assertTrue(clientSocket.isOutputShutdown());
-    assertFalse(clientSocket.getChannel().isOpen());
-    assertThrows(
-        SocketException.class, () -> clientSocket.connect(new InetSocketAddress("localhost", 0)));
-  }
-
-  @Test
-  public void testInputStreamClose() throws Exception {
-    TunnelingJdkSocket clientSocket = createClient();
-    InputStream inputStream = clientSocket.getInputStream();
-    OutputStream outputStream = clientSocket.getOutputStream();
-
-    assertFalse(clientSocket.isClosed());
-    assertFalse(clientSocket.isInputShutdown());
-    assertFalse(clientSocket.isOutputShutdown());
-
-    inputStream.close();
-
-    assertTrue(clientSocket.isClosed());
-    assertTrue(clientSocket.isInputShutdown());
-    assertTrue(clientSocket.isOutputShutdown());
-    assertEquals(-1, inputStream.read());
-    assertThrows(IOException.class, () -> outputStream.write(1));
-    assertThrows(SocketException.class, clientSocket::getInputStream);
-    assertThrows(SocketException.class, clientSocket::getOutputStream);
-  }
-
-  @Test
-  public void testOutputStreamClose() throws Exception {
-    TunnelingJdkSocket clientSocket = createClient();
-    InputStream inputStream = clientSocket.getInputStream();
-    OutputStream outputStream = clientSocket.getOutputStream();
-
-    assertFalse(clientSocket.isClosed());
-    assertFalse(clientSocket.isInputShutdown());
-    assertFalse(clientSocket.isOutputShutdown());
-
-    outputStream.close();
-
-    assertTrue(clientSocket.isClosed());
-    assertTrue(clientSocket.isInputShutdown());
-    assertTrue(clientSocket.isOutputShutdown());
-    assertEquals(-1, inputStream.read());
-    assertThrows(IOException.class, () -> outputStream.write(1));
-    assertThrows(SocketException.class, clientSocket::getInputStream);
-    assertThrows(SocketException.class, clientSocket::getOutputStream);
-  }
-
-  @Test
-  public void testTimeout() throws Exception {
-    TunnelingJdkSocket clientSocket = createClient();
-    InputStream inputStream = clientSocket.getInputStream();
-
-    int testTimeout = 1000;
-    clientSocket.setSoTimeout(testTimeout);
-    assertEquals(testTimeout, clientSocket.getSoTimeout());
-
-    long startTime = System.currentTimeMillis();
-    int readResult = inputStream.read();
-    long endTime = System.currentTimeMillis();
-    long readDuration = endTime - startTime;
-    int timeVariance = 100;
-    assertTrue(readDuration >= testTimeout && readDuration <= testTimeout + timeVariance);
-    assertEquals(0, readResult);
-
-    int newTimeout = testTimeout / 2;
-    clientSocket.setSoTimeout(newTimeout);
-    assertEquals(newTimeout, clientSocket.getSoTimeout());
-    assertTimeoutPreemptively(Duration.ofMillis(testTimeout), () -> inputStream.read());
-
-    // The socket should block indefinitely when timeout is set to 0, per
-    // https://docs.oracle.com/en/java/javase/16/docs/api//java.base/java/net/Socket.html#setSoTimeout(int).
-    int infiniteTimeout = 0;
-    clientSocket.setSoTimeout(infiniteTimeout);
-    assertEquals(infiniteTimeout, clientSocket.getSoTimeout());
-    try {
-      assertTimeoutPreemptively(Duration.ofMillis(testTimeout), () -> inputStream.read());
-      fail("Read should block indefinitely with infinite timeout");
-    } catch (AssertionError e) {
-      // Expected
+
+    @Test
+    public void testSocketConnectAndClose() throws Exception {
+        Path socketPath = getSocketPath();
+        UnixDomainSocketAddress socketAddress = UnixDomainSocketAddress.of(socketPath);
+        startServer(socketAddress);
+        TunnelingJdkSocket clientSocket = new TunnelingJdkSocket(socketPath);
+
+        assertNotNull(clientSocket.getChannel());
+        assertTrue(clientSocket.getChannel().isOpen());
+        assertFalse(clientSocket.isConnected());
+        assertFalse(clientSocket.isClosed());
+
+        clientSocket.connect(new InetSocketAddress("localhost", 0));
+        InputStream inputStream = clientSocket.getInputStream();
+        OutputStream outputStream = clientSocket.getOutputStream();
+
+        assertTrue(clientSocket.isConnected());
+        assertFalse(clientSocket.isClosed());
+        assertFalse(clientSocket.isInputShutdown());
+        assertFalse(clientSocket.isOutputShutdown());
+        assertThrows(SocketException.class, () -> clientSocket.connect(new InetSocketAddress("localhost", 0)));
+
+        clientSocket.close();
+
+        assertTrue(clientSocket.isConnected());
+        assertTrue(clientSocket.isClosed());
+        assertFalse(clientSocket.getChannel().isOpen());
+        assertTrue(clientSocket.isInputShutdown());
+        assertTrue(clientSocket.isOutputShutdown());
+        assertEquals(-1, inputStream.read());
+        assertThrows(IOException.class, () -> outputStream.write(1));
+        assertThrows(SocketException.class, clientSocket::getInputStream);
+        assertThrows(SocketException.class, clientSocket::getOutputStream);
+        clientSocket.close();
     }
 
-    int invalidTimeout = -1;
-    assertThrows(IllegalArgumentException.class, () -> clientSocket.setSoTimeout(invalidTimeout));
-
-    clientSocket.close();
-    assertThrows(SocketException.class, () -> clientSocket.setSoTimeout(testTimeout));
-    assertThrows(SocketException.class, clientSocket::getSoTimeout);
-  }
-
-  @Test
-  public void testBufferSizes() throws Exception {
-    TunnelingJdkSocket clientSocket = createClient();
-
-    assertEquals(TunnelingJdkSocket.DEFAULT_BUFFER_SIZE, clientSocket.getSendBufferSize());
-    assertEquals(TunnelingJdkSocket.DEFAULT_BUFFER_SIZE, clientSocket.getReceiveBufferSize());
-    assertEquals(TunnelingJdkSocket.DEFAULT_BUFFER_SIZE, clientSocket.getStreamBufferSize());
-
-    int newBufferSize = TunnelingJdkSocket.DEFAULT_BUFFER_SIZE / 2;
-    clientSocket.setSendBufferSize(newBufferSize);
-    clientSocket.setReceiveBufferSize(newBufferSize / 2);
-    assertEquals(newBufferSize, clientSocket.getSendBufferSize());
-    assertEquals(newBufferSize / 2, clientSocket.getReceiveBufferSize());
-    assertEquals(newBufferSize, clientSocket.getStreamBufferSize());
-
-    int invalidBufferSize = -1;
-    assertThrows(
-        IllegalArgumentException.class, () -> clientSocket.setSendBufferSize(invalidBufferSize));
-    assertThrows(
-        IllegalArgumentException.class, () -> clientSocket.setReceiveBufferSize(invalidBufferSize));
-
-    clientSocket.close();
-    assertThrows(
-        SocketException.class,
-        () -> clientSocket.setSendBufferSize(TunnelingJdkSocket.DEFAULT_BUFFER_SIZE));
-    assertThrows(
-        SocketException.class,
-        () -> clientSocket.setReceiveBufferSize(TunnelingJdkSocket.DEFAULT_BUFFER_SIZE));
-    assertThrows(SocketException.class, clientSocket::getSendBufferSize);
-    assertThrows(SocketException.class, clientSocket::getReceiveBufferSize);
-    assertThrows(SocketException.class, clientSocket::getStreamBufferSize);
-  }
-
-  @Test
-  public void testFileDescriptorLeak() throws Exception {
-    long initialCount = getFileDescriptorCount();
-
-    TunnelingJdkSocket clientSocket = createClient();
-
-    for (int i = 0; i < 100; i++) {
-      @SuppressWarnings("unused")
-      InputStream inputStream = clientSocket.getInputStream();
-      long currentCount = getFileDescriptorCount();
-      assertTrue(currentCount <= initialCount + 7);
+    @Test
+    public void testConnectFailureClosesSocket() throws Exception {
+        Path missingSocketPath = getSocketPath();
+        TunnelingJdkSocket clientSocket = new TunnelingJdkSocket(missingSocketPath);
+
+        assertThrows(IOException.class, () -> clientSocket.connect(new InetSocketAddress("localhost", 0)));
+
+        assertFalse(clientSocket.isConnected());
+        assertTrue(clientSocket.isClosed());
+        assertTrue(clientSocket.isInputShutdown());
+        assertTrue(clientSocket.isOutputShutdown());
+        assertFalse(clientSocket.getChannel().isOpen());
+        assertThrows(SocketException.class, () -> clientSocket.connect(new InetSocketAddress("localhost", 0)));
     }
 
-    clientSocket.close();
-    closeServer();
+    @Test
+    public void testInputStreamClose() throws Exception {
+        TunnelingJdkSocket clientSocket = createClient();
+        InputStream inputStream = clientSocket.getInputStream();
+        OutputStream outputStream = clientSocket.getOutputStream();
+
+        assertFalse(clientSocket.isClosed());
+        assertFalse(clientSocket.isInputShutdown());
+        assertFalse(clientSocket.isOutputShutdown());
+
+        inputStream.close();
+
+        assertTrue(clientSocket.isClosed());
+        assertTrue(clientSocket.isInputShutdown());
+        assertTrue(clientSocket.isOutputShutdown());
+        assertEquals(-1, inputStream.read());
+        assertThrows(IOException.class, () -> outputStream.write(1));
+        assertThrows(SocketException.class, clientSocket::getInputStream);
+        assertThrows(SocketException.class, clientSocket::getOutputStream);
+    }
 
-    long finalCount = getFileDescriptorCount();
-    assertTrue(finalCount <= initialCount + 3);
-  }
+    @Test
+    public void testOutputStreamClose() throws Exception {
+        TunnelingJdkSocket clientSocket = createClient();
+        InputStream inputStream = clientSocket.getInputStream();
+        OutputStream outputStream = clientSocket.getOutputStream();
+
+        assertFalse(clientSocket.isClosed());
+        assertFalse(clientSocket.isInputShutdown());
+        assertFalse(clientSocket.isOutputShutdown());
+
+        outputStream.close();
+
+        assertTrue(clientSocket.isClosed());
+        assertTrue(clientSocket.isInputShutdown());
+        assertTrue(clientSocket.isOutputShutdown());
+        assertEquals(-1, inputStream.read());
+        assertThrows(IOException.class, () -> outputStream.write(1));
+        assertThrows(SocketException.class, clientSocket::getInputStream);
+        assertThrows(SocketException.class, clientSocket::getOutputStream);
+    }
 
-  @Test
-  public void testClosedSelectorIsReportedAsSocketException() throws Exception {
-    try (TunnelingJdkSocket clientSocket = createClient()) {
-      InputStream inputStream = clientSocket.getInputStream();
-      clientSocket.selector.close();
+    @Test
+    public void testTimeout() throws Exception {
+        TunnelingJdkSocket clientSocket = createClient();
+        InputStream inputStream = clientSocket.getInputStream();
+
+        int testTimeout = 1000;
+        clientSocket.setSoTimeout(testTimeout);
+        assertEquals(testTimeout, clientSocket.getSoTimeout());
+
+        long startTime = System.currentTimeMillis();
+        int readResult = inputStream.read();
+        long endTime = System.currentTimeMillis();
+        long readDuration = endTime - startTime;
+        int timeVariance = 100;
+        assertTrue(readDuration >= testTimeout && readDuration <= testTimeout + timeVariance);
+        assertEquals(0, readResult);
+
+        int newTimeout = testTimeout / 2;
+        clientSocket.setSoTimeout(newTimeout);
+        assertEquals(newTimeout, clientSocket.getSoTimeout());
+        assertTimeoutPreemptively(Duration.ofMillis(testTimeout), () -> inputStream.read());
+
+        // The socket should block indefinitely when timeout is set to 0, per
+        // https://docs.oracle.com/en/java/javase/16/docs/api//java.base/java/net/Socket.html#setSoTimeout(int).
+        int infiniteTimeout = 0;
+        clientSocket.setSoTimeout(infiniteTimeout);
+        assertEquals(infiniteTimeout, clientSocket.getSoTimeout());
+        try {
+            assertTimeoutPreemptively(Duration.ofMillis(testTimeout), () -> inputStream.read());
+            fail("Read should block indefinitely with infinite timeout");
+        } catch (AssertionError e) {
+            // Expected
+        }
 
-      SocketException exception = assertThrows(SocketException.class, inputStream::read);
+        int invalidTimeout = -1;
+        assertThrows(IllegalArgumentException.class, () -> clientSocket.setSoTimeout(invalidTimeout));
 
-      assertInstanceOf(ClosedSelectorException.class, exception.getCause());
+        clientSocket.close();
+        assertThrows(SocketException.class, () -> clientSocket.setSoTimeout(testTimeout));
+        assertThrows(SocketException.class, clientSocket::getSoTimeout);
     }
-  }
-
-  @Test
-  public void testSelectorClosedBetweenSelectAndSelectedKeysIsReportedAsSocketException()
-      throws Exception {
-    try (TunnelingJdkSocket clientSocket = createClient()) {
-      clientSocket.selector = new ClosedAfterSelectSelector();
-      assertTrue(
-          clientSocket.getChannel().isBlocking(),
-          "The channel should be blocking before getInputStream()");
-      InputStream inputStream = clientSocket.getInputStream();
-      assertFalse(
-          clientSocket.getChannel().isBlocking(),
-          "getInputStream() should switch the channel to nonblocking mode");
-
-      SocketException exception = assertThrows(SocketException.class, inputStream::read);
-
-      assertInstanceOf(ClosedSelectorException.class, exception.getCause());
+
+    @Test
+    public void testBufferSizes() throws Exception {
+        TunnelingJdkSocket clientSocket = createClient();
+
+        assertEquals(TunnelingJdkSocket.DEFAULT_BUFFER_SIZE, clientSocket.getSendBufferSize());
+        assertEquals(TunnelingJdkSocket.DEFAULT_BUFFER_SIZE, clientSocket.getReceiveBufferSize());
+        assertEquals(TunnelingJdkSocket.DEFAULT_BUFFER_SIZE, clientSocket.getStreamBufferSize());
+
+        int newBufferSize = TunnelingJdkSocket.DEFAULT_BUFFER_SIZE / 2;
+        clientSocket.setSendBufferSize(newBufferSize);
+        clientSocket.setReceiveBufferSize(newBufferSize / 2);
+        assertEquals(newBufferSize, clientSocket.getSendBufferSize());
+        assertEquals(newBufferSize / 2, clientSocket.getReceiveBufferSize());
+        assertEquals(newBufferSize, clientSocket.getStreamBufferSize());
+
+        int invalidBufferSize = -1;
+        assertThrows(IllegalArgumentException.class, () -> clientSocket.setSendBufferSize(invalidBufferSize));
+        assertThrows(IllegalArgumentException.class, () -> clientSocket.setReceiveBufferSize(invalidBufferSize));
+
+        clientSocket.close();
+        assertThrows(
+                SocketException.class, () -> clientSocket.setSendBufferSize(TunnelingJdkSocket.DEFAULT_BUFFER_SIZE));
+        assertThrows(
+                SocketException.class, () -> clientSocket.setReceiveBufferSize(TunnelingJdkSocket.DEFAULT_BUFFER_SIZE));
+        assertThrows(SocketException.class, clientSocket::getSendBufferSize);
+        assertThrows(SocketException.class, clientSocket::getReceiveBufferSize);
+        assertThrows(SocketException.class, clientSocket::getStreamBufferSize);
     }
-  }
 
-  @Test
-  public void testCancelledKeyIsReportedAsSocketException() throws Exception {
-    try (TunnelingJdkSocket clientSocket = createClient()) {
-      clientSocket.selector = new CancelledKeyAfterSelectionSelector();
-      InputStream inputStream = clientSocket.getInputStream();
+    @Test
+    public void testFileDescriptorLeak() throws Exception {
+        long initialCount = getFileDescriptorCount();
 
-      SocketException exception = assertThrows(SocketException.class, inputStream::read);
+        TunnelingJdkSocket clientSocket = createClient();
 
-      assertInstanceOf(CancelledKeyException.class, exception.getCause());
+        for (int i = 0; i < 100; i++) {
+            @SuppressWarnings("unused")
+            InputStream inputStream = clientSocket.getInputStream();
+            long currentCount = getFileDescriptorCount();
+            assertTrue(currentCount <= initialCount + 7);
+        }
+
+        clientSocket.close();
+        closeServer();
+
+        long finalCount = getFileDescriptorCount();
+        assertTrue(finalCount <= initialCount + 3);
     }
-  }
-
-  @Test
-  public void testAsynchronousCloseInterruptsBlockedReadWithIOException() throws Exception {
-    TunnelingJdkSocket clientSocket = createClient();
-    Thread reader = null;
-    try {
-      BlockingCloseSelector blockingCloseSelector = new BlockingCloseSelector();
-      clientSocket.selector = blockingCloseSelector;
-      InputStream inputStream = clientSocket.getInputStream();
-      AtomicReference<Throwable> readFailure = new AtomicReference<>();
-
-      reader =
-          new Thread(
-              () -> {
-                try {
-                  inputStream.read();
-                } catch (Throwable t) {
-                  readFailure.set(t);
-                }
-              },
-              "tunneling-jdk-socket-reader");
-      reader.setDaemon(true);
-      reader.start();
-
-      assertTrue(
-          blockingCloseSelector.awaitSelectStarted(5, TimeUnit.SECONDS),
-          "The reader did not block in Selector.select");
-      clientSocket.close();
-      reader.join(TimeUnit.SECONDS.toMillis(5));
-
-      assertFalse(reader.isAlive(), "The blocked read did not terminate after close");
-      Throwable failure = readFailure.get();
-      assertNotNull(failure, "The blocked read should fail when the socket is closed");
-      assertInstanceOf(
-          IOException.class,
-          failure,
-          () -> "Expected an IOException, but got " + failure.getClass().getName());
-    } finally {
-      clientSocket.close();
-      if (reader != null && reader.isAlive()) {
-        reader.interrupt();
-        reader.join(TimeUnit.SECONDS.toMillis(5));
-      }
+
+    @Test
+    public void testClosedSelectorIsReportedAsSocketException() throws Exception {
+        try (TunnelingJdkSocket clientSocket = createClient()) {
+            InputStream inputStream = clientSocket.getInputStream();
+            clientSocket.selector.close();
+
+            SocketException exception = assertThrows(SocketException.class, inputStream::read);
+
+            assertInstanceOf(ClosedSelectorException.class, exception.getCause());
+        }
+    }
+
+    @Test
+    public void testSelectorClosedBetweenSelectAndSelectedKeysIsReportedAsSocketException() throws Exception {
+        try (TunnelingJdkSocket clientSocket = createClient()) {
+            clientSocket.selector = new ClosedAfterSelectSelector();
+            assertTrue(
+                    clientSocket.getChannel().isBlocking(), "The channel should be blocking before getInputStream()");
+            InputStream inputStream = clientSocket.getInputStream();
+            assertFalse(
+                    clientSocket.getChannel().isBlocking(),
+                    "getInputStream() should switch the channel to nonblocking mode");
+
+            SocketException exception = assertThrows(SocketException.class, inputStream::read);
+
+            assertInstanceOf(ClosedSelectorException.class, exception.getCause());
+        }
+    }
+
+    @Test
+    public void testCancelledKeyIsReportedAsSocketException() throws Exception {
+        try (TunnelingJdkSocket clientSocket = createClient()) {
+            clientSocket.selector = new CancelledKeyAfterSelectionSelector();
+            InputStream inputStream = clientSocket.getInputStream();
+
+            SocketException exception = assertThrows(SocketException.class, inputStream::read);
+
+            assertInstanceOf(CancelledKeyException.class, exception.getCause());
+        }
     }
-  }
-
-  @Test
-  public void testCloseInterruptsWriteWhileInputStreamIsBeingCreated() throws Exception {
-    TunnelingJdkSocket clientSocket = createClient();
-    ExecutorService executor = Executors.newFixedThreadPool(3);
-    try {
-      clientSocket.setSendBufferSize(4096);
-      OutputStream output = clientSocket.getOutputStream();
-      CountDownLatch writing = new CountDownLatch(1);
-      Future<?> writer =
-          executor.submit(
-              () -> {
+
+    @Test
+    public void testAsynchronousCloseInterruptsBlockedReadWithIOException() throws Exception {
+        TunnelingJdkSocket clientSocket = createClient();
+        Thread reader = null;
+        try {
+            BlockingCloseSelector blockingCloseSelector = new BlockingCloseSelector();
+            clientSocket.selector = blockingCloseSelector;
+            InputStream inputStream = clientSocket.getInputStream();
+            AtomicReference<Throwable> readFailure = new AtomicReference<>();
+
+            reader = new Thread(
+                    () -> {
+                        try {
+                            inputStream.read();
+                        } catch (Throwable t) {
+                            readFailure.set(t);
+                        }
+                    },
+                    "tunneling-jdk-socket-reader");
+            reader.setDaemon(true);
+            reader.start();
+
+            assertTrue(
+                    blockingCloseSelector.awaitSelectStarted(5, TimeUnit.SECONDS),
+                    "The reader did not block in Selector.select");
+            clientSocket.close();
+            reader.join(TimeUnit.SECONDS.toMillis(5));
+
+            assertFalse(reader.isAlive(), "The blocked read did not terminate after close");
+            Throwable failure = readFailure.get();
+            assertNotNull(failure, "The blocked read should fail when the socket is closed");
+            assertInstanceOf(
+                    IOException.class,
+                    failure,
+                    () -> "Expected an IOException, but got "
+                            + failure.getClass().getName());
+        } finally {
+            clientSocket.close();
+            if (reader != null && reader.isAlive()) {
+                reader.interrupt();
+                reader.join(TimeUnit.SECONDS.toMillis(5));
+            }
+        }
+    }
+
+    @Test
+    public void testCloseInterruptsWriteWhileInputStreamIsBeingCreated() throws Exception {
+        TunnelingJdkSocket clientSocket = createClient();
+        ExecutorService executor = Executors.newFixedThreadPool(3);
+        try {
+            clientSocket.setSendBufferSize(4096);
+            OutputStream output = clientSocket.getOutputStream();
+            CountDownLatch writing = new CountDownLatch(1);
+            Future<?> writer = executor.submit(() -> {
                 writing.countDown();
                 // The server accepts but does not read, so this exceeds the socket's send buffer.
                 output.write(new byte[1024 * 1024]);
                 return null;
-              });
-      assertTrue(writing.await(5, TimeUnit.SECONDS));
-      assertThrows(TimeoutException.class, () -> writer.get(100, TimeUnit.MILLISECONDS));
-
-      AtomicReference<Thread> inputThread = new AtomicReference<>();
-      Future<InputStream> input =
-          executor.submit(
-              () -> {
+            });
+            assertTrue(writing.await(5, TimeUnit.SECONDS));
+            assertThrows(TimeoutException.class, () -> writer.get(100, TimeUnit.MILLISECONDS));
+
+            AtomicReference<Thread> inputThread = new AtomicReference<>();
+            Future<InputStream> input = executor.submit(() -> {
                 inputThread.set(Thread.currentThread());
                 return clientSocket.getInputStream();
-              });
-      // Wait until input setup is waiting for the channel's blocked writer before closing.
-      assertTimeoutPreemptively(
-          Duration.ofSeconds(5),
-          () -> {
-            while (inputThread.get() == null
-                || inputThread.get().getState() != Thread.State.WAITING) {
-              assertFalse(input.isDone(), "Input setup should wait for the blocked writer");
-              Thread.sleep(1);
-            }
-          });
-
-      executor.submit(clientSocket::close).get(5, TimeUnit.SECONDS);
-
-      assertTrue(clientSocket.isClosed());
-      assertFalse(clientSocket.getChannel().isOpen());
-      assertInstanceOf(
-          IOException.class,
-          assertThrows(ExecutionException.class, () -> writer.get(5, TimeUnit.SECONDS)).getCause());
-      assertInstanceOf(
-          IOException.class,
-          assertThrows(ExecutionException.class, () -> input.get(5, TimeUnit.SECONDS)).getCause());
-    } finally {
-      // Also release the writer if the regression prevents socket.close() from taking its monitor.
-      clientSocket.getChannel().close();
-      executor.shutdownNow();
-      assertTrue(executor.awaitTermination(5, TimeUnit.SECONDS));
-      clientSocket.close();
-    }
-  }
-
-  private long getFileDescriptorCount() {
-    try {
-      Process process = Runtime.getRuntime().exec("lsof -p " + ProcessHandle.current().pid());
-      int count = 0;
-      try (java.io.BufferedReader reader =
-          new java.io.BufferedReader(new java.io.InputStreamReader(process.getInputStream()))) {
-        while (reader.readLine() != null) {
-          count++;
+            });
+            // Wait until input setup is waiting for the channel's blocked writer before closing.
+            assertTimeoutPreemptively(Duration.ofSeconds(5), () -> {
+                while (inputThread.get() == null || inputThread.get().getState() != Thread.State.WAITING) {
+                    assertFalse(input.isDone(), "Input setup should wait for the blocked writer");
+                    Thread.sleep(1);
+                }
+            });
+
+            executor.submit(clientSocket::close).get(5, TimeUnit.SECONDS);
+
+            assertTrue(clientSocket.isClosed());
+            assertFalse(clientSocket.getChannel().isOpen());
+            assertInstanceOf(
+                    IOException.class,
+                    assertThrows(ExecutionException.class, () -> writer.get(5, TimeUnit.SECONDS))
+                            .getCause());
+            assertInstanceOf(
+                    IOException.class,
+                    assertThrows(ExecutionException.class, () -> input.get(5, TimeUnit.SECONDS))
+                            .getCause());
+        } finally {
+            // Also release the writer if the regression prevents socket.close() from taking its monitor.
+            clientSocket.getChannel().close();
+            executor.shutdownNow();
+            assertTrue(executor.awaitTermination(5, TimeUnit.SECONDS));
+            clientSocket.close();
         }
-      }
-      return count;
-    } catch (IOException e) {
-      throw new RuntimeException("Failed to get file descriptor count", e);
     }
-  }
-
-  private void startServer(UnixDomainSocketAddress socketAddress) throws IOException {
-    server = new TestUnixSocketServer(socketAddress);
-  }
-
-  private Path getSocketPath() throws IOException {
-    Path socketPath = Files.createTempFile("testSocket", null);
-    Files.delete(socketPath);
-    socketPath.toFile().deleteOnExit();
-    return socketPath;
-  }
-
-  private TunnelingJdkSocket createClient() throws IOException {
-    Path socketPath = getSocketPath();
-    UnixDomainSocketAddress socketAddress = UnixDomainSocketAddress.of(socketPath);
-    startServer(socketAddress);
-    TunnelingJdkSocket clientSocket = new TunnelingJdkSocket(socketPath);
-    clientSocket.connect(new InetSocketAddress("localhost", 0));
-    return clientSocket;
-  }
-
-  private static final class TestUnixSocketServer implements AutoCloseable {
-    private final Path socketPath;
-    private final ServerSocketChannel serverChannel;
-    private final AtomicReference<SocketChannel> acceptedChannel = new AtomicReference<>();
-    private final AtomicReference<Throwable> serverFailure = new AtomicReference<>();
-    private final Thread serverThread;
-
-    private TestUnixSocketServer(UnixDomainSocketAddress socketAddress) throws IOException {
-      socketPath = socketAddress.getPath();
-      serverChannel = ServerSocketChannel.open(StandardProtocolFamily.UNIX);
-      boolean bound = false;
-      try {
-        serverChannel.bind(socketAddress);
-        bound = true;
-      } finally {
-        if (!bound) {
-          serverChannel.close();
-        }
-      }
 
-      serverThread =
-          new Thread(
-              () -> {
-                try {
-                  acceptedChannel.set(serverChannel.accept());
-                } catch (IOException e) {
-                  if (serverChannel.isOpen()) {
-                    serverFailure.set(e);
-                  }
+    private long getFileDescriptorCount() {
+        try {
+            Process process = Runtime.getRuntime()
+                    .exec("lsof -p " + ProcessHandle.current().pid());
+            int count = 0;
+            try (java.io.BufferedReader reader =
+                    new java.io.BufferedReader(new java.io.InputStreamReader(process.getInputStream()))) {
+                while (reader.readLine() != null) {
+                    count++;
                 }
-              },
-              "tunneling-jdk-socket-test-server");
-      serverThread.setDaemon(true);
-      serverThread.start();
+            }
+            return count;
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to get file descriptor count", e);
+        }
     }
 
-    @Override
-    public void close() throws Exception {
-      serverChannel.close();
-      serverThread.join(TimeUnit.SECONDS.toMillis(5));
-      if (serverThread.isAlive()) {
-        serverThread.interrupt();
-        throw new AssertionError("The Unix-domain test server did not terminate");
-      }
-
-      SocketChannel clientChannel = acceptedChannel.get();
-      if (clientChannel != null) {
-        clientChannel.close();
-      }
-      Files.deleteIfExists(socketPath);
-
-      Throwable failure = serverFailure.get();
-      if (failure != null) {
-        throw new AssertionError("The Unix-domain test server failed", failure);
-      }
+    private void startServer(UnixDomainSocketAddress socketAddress) throws IOException {
+        server = new TestUnixSocketServer(socketAddress);
     }
-  }
 
-  private abstract static class SelectorAdapter extends Selector {
-    private volatile boolean open = true;
-
-    @Override
-    public final boolean isOpen() {
-      return open;
+    private Path getSocketPath() throws IOException {
+        Path socketPath = Files.createTempFile("testSocket", null);
+        Files.delete(socketPath);
+        socketPath.toFile().deleteOnExit();
+        return socketPath;
     }
 
-    @Override
-    public final SelectorProvider provider() {
-      return SelectorProvider.provider();
+    private TunnelingJdkSocket createClient() throws IOException {
+        Path socketPath = getSocketPath();
+        UnixDomainSocketAddress socketAddress = UnixDomainSocketAddress.of(socketPath);
+        startServer(socketAddress);
+        TunnelingJdkSocket clientSocket = new TunnelingJdkSocket(socketPath);
+        clientSocket.connect(new InetSocketAddress("localhost", 0));
+        return clientSocket;
     }
 
-    @Override
-    public final int selectNow() {
-      return doSelect();
-    }
+    private static final class TestUnixSocketServer implements AutoCloseable {
+        private final Path socketPath;
+        private final ServerSocketChannel serverChannel;
+        private final AtomicReference<SocketChannel> acceptedChannel = new AtomicReference<>();
+        private final AtomicReference<Throwable> serverFailure = new AtomicReference<>();
+        private final Thread serverThread;
+
+        private TestUnixSocketServer(UnixDomainSocketAddress socketAddress) throws IOException {
+            socketPath = socketAddress.getPath();
+            serverChannel = ServerSocketChannel.open(StandardProtocolFamily.UNIX);
+            boolean bound = false;
+            try {
+                serverChannel.bind(socketAddress);
+                bound = true;
+            } finally {
+                if (!bound) {
+                    serverChannel.close();
+                }
+            }
 
-    @Override
-    public final int select(long timeout) {
-      return doSelect();
-    }
+            serverThread = new Thread(
+                    () -> {
+                        try {
+                            acceptedChannel.set(serverChannel.accept());
+                        } catch (IOException e) {
+                            if (serverChannel.isOpen()) {
+                                serverFailure.set(e);
+                            }
+                        }
+                    },
+                    "tunneling-jdk-socket-test-server");
+            serverThread.setDaemon(true);
+            serverThread.start();
+        }
 
-    @Override
-    public final int select() {
-      return doSelect();
-    }
+        @Override
+        public void close() throws Exception {
+            serverChannel.close();
+            serverThread.join(TimeUnit.SECONDS.toMillis(5));
+            if (serverThread.isAlive()) {
+                serverThread.interrupt();
+                throw new AssertionError("The Unix-domain test server did not terminate");
+            }
 
-    @Override
-    public final Selector wakeup() {
-      return this;
-    }
+            SocketChannel clientChannel = acceptedChannel.get();
+            if (clientChannel != null) {
+                clientChannel.close();
+            }
+            Files.deleteIfExists(socketPath);
 
-    @Override
-    public final void close() {
-      if (open) {
-        open = false;
-        onClose();
-      }
+            Throwable failure = serverFailure.get();
+            if (failure != null) {
+                throw new AssertionError("The Unix-domain test server failed", failure);
+            }
+        }
     }
 
-    abstract int doSelect();
-
-    void onClose() {}
-  }
-
-  /**
-   * Models another thread closing a selector while a socket read is blocked:
-   *
-   * <ol>
-   *   <li>Signals when {@code select()} is entered.
-   *   <li>Blocks until another thread closes the selector.
-   *   <li>Throws {@link ClosedSelectorException} after closure.
-   *   <li>Lets the test verify that the reader receives an {@link IOException} and terminates.
-   * </ol>
-   */
-  private static final class BlockingCloseSelector extends SelectorAdapter {
-    private final CountDownLatch selectStarted = new CountDownLatch(1);
-    private final CountDownLatch closed = new CountDownLatch(1);
-
-    @Override
-    public Set<SelectionKey> keys() {
-      return Collections.emptySet();
-    }
+    private abstract static class SelectorAdapter extends Selector {
+        private volatile boolean open = true;
 
-    @Override
-    public Set<SelectionKey> selectedKeys() {
-      return Collections.emptySet();
-    }
+        @Override
+        public final boolean isOpen() {
+            return open;
+        }
 
-    @Override
-    int doSelect() {
-      selectStarted.countDown();
-      try {
-        if (!closed.await(5, TimeUnit.SECONDS)) {
-          throw new AssertionError("Selector was not closed");
+        @Override
+        public final SelectorProvider provider() {
+            return SelectorProvider.provider();
         }
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-        throw new AssertionError("Interrupted while waiting for the selector to close", e);
-      }
-      throw new ClosedSelectorException();
-    }
 
-    @Override
-    void onClose() {
-      closed.countDown();
-    }
+        @Override
+        public final int selectNow() {
+            return doSelect();
+        }
 
-    boolean awaitSelectStarted(long timeout, TimeUnit unit) throws InterruptedException {
-      return selectStarted.await(timeout, unit);
-    }
-  }
-
-  /**
-   * Models a selector closing between selection and selected-key processing:
-   *
-   * <ol>
-   *   <li>Closes itself during {@code select()} and reports one ready channel.
-   *   <li>Throws {@link ClosedSelectorException} when the selected keys are requested.
-   *   <li>Lets the test verify that the exception is reported as a {@link SocketException}.
-   * </ol>
-   */
-  private static final class ClosedAfterSelectSelector extends SelectorAdapter {
-    @Override
-    public Set<SelectionKey> keys() {
-      return Collections.emptySet();
-    }
+        @Override
+        public final int select(long timeout) {
+            return doSelect();
+        }
 
-    @Override
-    public Set<SelectionKey> selectedKeys() {
-      if (!isOpen()) {
-        throw new ClosedSelectorException();
-      }
-      return Collections.emptySet();
-    }
+        @Override
+        public final int select() {
+            return doSelect();
+        }
 
-    @Override
-    int doSelect() {
-      close();
-      return 1;
-    }
-  }
-
-  /**
-   * Models a key being canceled after selection, before selected-key processing:
-   *
-   * <ol>
-   *   <li>Reports one ready channel from {@code select()}.
-   *   <li>Cancels the selected key before returning it.
-   *   <li>Throws {@link CancelledKeyException} when the read checks whether the key is readable.
-   *   <li>Lets the test verify that the exception is reported as a {@link SocketException}.
-   * </ol>
-   */
-  private static final class CancelledKeyAfterSelectionSelector extends SelectorAdapter {
-    private final CancelledSelectionKey key = new CancelledSelectionKey(this);
-    private final Set<SelectionKey> selectedKeys = new HashSet<>(Collections.singleton(key));
-
-    @Override
-    public Set<SelectionKey> keys() {
-      return selectedKeys;
+        @Override
+        public final Selector wakeup() {
+            return this;
+        }
+
+        @Override
+        public final void close() {
+            if (open) {
+                open = false;
+                onClose();
+            }
+        }
+
+        abstract int doSelect();
+
+        void onClose() {}
     }
 
-    @Override
-    public Set<SelectionKey> selectedKeys() {
-      key.cancel();
-      return selectedKeys;
+    /**
+     * Models another thread closing a selector while a socket read is blocked:
+     *
+     * <ol>
+     *   <li>Signals when {@code select()} is entered.
+     *   <li>Blocks until another thread closes the selector.
+     *   <li>Throws {@link ClosedSelectorException} after closure.
+     *   <li>Lets the test verify that the reader receives an {@link IOException} and terminates.
+     * </ol>
+     */
+    private static final class BlockingCloseSelector extends SelectorAdapter {
+        private final CountDownLatch selectStarted = new CountDownLatch(1);
+        private final CountDownLatch closed = new CountDownLatch(1);
+
+        @Override
+        public Set<SelectionKey> keys() {
+            return Collections.emptySet();
+        }
+
+        @Override
+        public Set<SelectionKey> selectedKeys() {
+            return Collections.emptySet();
+        }
+
+        @Override
+        int doSelect() {
+            selectStarted.countDown();
+            try {
+                if (!closed.await(5, TimeUnit.SECONDS)) {
+                    throw new AssertionError("Selector was not closed");
+                }
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new AssertionError("Interrupted while waiting for the selector to close", e);
+            }
+            throw new ClosedSelectorException();
+        }
+
+        @Override
+        void onClose() {
+            closed.countDown();
+        }
+
+        boolean awaitSelectStarted(long timeout, TimeUnit unit) throws InterruptedException {
+            return selectStarted.await(timeout, unit);
+        }
     }
 
-    @Override
-    int doSelect() {
-      return 1;
+    /**
+     * Models a selector closing between selection and selected-key processing:
+     *
+     * <ol>
+     *   <li>Closes itself during {@code select()} and reports one ready channel.
+     *   <li>Throws {@link ClosedSelectorException} when the selected keys are requested.
+     *   <li>Lets the test verify that the exception is reported as a {@link SocketException}.
+     * </ol>
+     */
+    private static final class ClosedAfterSelectSelector extends SelectorAdapter {
+        @Override
+        public Set<SelectionKey> keys() {
+            return Collections.emptySet();
+        }
+
+        @Override
+        public Set<SelectionKey> selectedKeys() {
+            if (!isOpen()) {
+                throw new ClosedSelectorException();
+            }
+            return Collections.emptySet();
+        }
+
+        @Override
+        int doSelect() {
+            close();
+            return 1;
+        }
     }
 
-    private static final class CancelledSelectionKey extends SelectionKey {
-      private final Selector selector;
-      private boolean valid = true;
-
-      private CancelledSelectionKey(Selector selector) {
-        this.selector = selector;
-      }
-
-      @Override
-      public SelectableChannel channel() {
-        return null;
-      }
-
-      @Override
-      public Selector selector() {
-        return selector;
-      }
-
-      @Override
-      public boolean isValid() {
-        return valid;
-      }
-
-      @Override
-      public void cancel() {
-        valid = false;
-      }
-
-      @Override
-      public int interestOps() {
-        return OP_READ;
-      }
-
-      @Override
-      public SelectionKey interestOps(int ops) {
-        return this;
-      }
-
-      @Override
-      public int readyOps() {
-        if (!valid) {
-          throw new CancelledKeyException();
+    /**
+     * Models a key being canceled after selection, before selected-key processing:
+     *
+     * <ol>
+     *   <li>Reports one ready channel from {@code select()}.
+     *   <li>Cancels the selected key before returning it.
+     *   <li>Throws {@link CancelledKeyException} when the read checks whether the key is readable.
+     *   <li>Lets the test verify that the exception is reported as a {@link SocketException}.
+     * </ol>
+     */
+    private static final class CancelledKeyAfterSelectionSelector extends SelectorAdapter {
+        private final CancelledSelectionKey key = new CancelledSelectionKey(this);
+        private final Set<SelectionKey> selectedKeys = new HashSet<>(Collections.singleton(key));
+
+        @Override
+        public Set<SelectionKey> keys() {
+            return selectedKeys;
+        }
+
+        @Override
+        public Set<SelectionKey> selectedKeys() {
+            key.cancel();
+            return selectedKeys;
+        }
+
+        @Override
+        int doSelect() {
+            return 1;
+        }
+
+        private static final class CancelledSelectionKey extends SelectionKey {
+            private final Selector selector;
+            private boolean valid = true;
+
+            private CancelledSelectionKey(Selector selector) {
+                this.selector = selector;
+            }
+
+            @Override
+            public SelectableChannel channel() {
+                return null;
+            }
+
+            @Override
+            public Selector selector() {
+                return selector;
+            }
+
+            @Override
+            public boolean isValid() {
+                return valid;
+            }
+
+            @Override
+            public void cancel() {
+                valid = false;
+            }
+
+            @Override
+            public int interestOps() {
+                return OP_READ;
+            }
+
+            @Override
+            public SelectionKey interestOps(int ops) {
+                return this;
+            }
+
+            @Override
+            public int readyOps() {
+                if (!valid) {
+                    throw new CancelledKeyException();
+                }
+                return OP_READ;
+            }
         }
-        return OP_READ;
-      }
     }
-  }
-
-  private static boolean udsSupported() {
-    Path socketPath = null;
-    try {
-      socketPath = Files.createTempFile("testSocketSupport", null);
-      Files.delete(socketPath);
-      try (ServerSocketChannel serverChannel =
-          ServerSocketChannel.open(StandardProtocolFamily.UNIX)) {
-        serverChannel.bind(UnixDomainSocketAddress.of(socketPath));
-      }
-      return true;
-    } catch (IOException | UnsupportedOperationException e) {
-      return false;
-    } finally {
-      if (socketPath != null) {
+
+    private static boolean udsSupported() {
+        Path socketPath = null;
         try {
-          Files.deleteIfExists(socketPath);
-        } catch (IOException ignored) {
+            socketPath = Files.createTempFile("testSocketSupport", null);
+            Files.delete(socketPath);
+            try (ServerSocketChannel serverChannel = ServerSocketChannel.open(StandardProtocolFamily.UNIX)) {
+                serverChannel.bind(UnixDomainSocketAddress.of(socketPath));
+            }
+            return true;
+        } catch (IOException | UnsupportedOperationException e) {
+            return false;
+        } finally {
+            if (socketPath != null) {
+                try {
+                    Files.deleteIfExists(socketPath);
+                } catch (IOException ignored) {
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedMessage.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedMessage.java
index 68f7dfc897d..e8df6bbcc57 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedMessage.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedMessage.java
@@ -3,5 +3,5 @@
 import java.util.List;
 
 public interface DecodedMessage {
-  List<DecodedTrace> getTraces();
+    List<DecodedTrace> getTraces();
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedSpan.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedSpan.java
index 355863e3924..aff91f0ea72 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedSpan.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedSpan.java
@@ -4,41 +4,41 @@
 import java.util.Map;
 
 public interface DecodedSpan {
-  String getService();
+    String getService();
 
-  String getName();
+    String getName();
 
-  String getResource();
+    String getResource();
 
-  /**
-   * Returns the span 64-bit trace identifier, dropping high-order bits if present.
-   *
-   * @return The span 64-bit trace identifier.
-   */
-  long getTraceId();
+    /**
+     * Returns the span 64-bit trace identifier, dropping high-order bits if present.
+     *
+     * @return The span 64-bit trace identifier.
+     */
+    long getTraceId();
 
-  long getSpanId();
+    long getSpanId();
 
-  long getParentId();
+    long getParentId();
 
-  long getStart();
+    long getStart();
 
-  long getDuration();
+    long getDuration();
 
-  int getError();
+    int getError();
 
-  Map<String, String> getMeta();
+    Map<String, String> getMeta();
 
-  Map<String, Object> getMetaStruct();
+    Map<String, Object> getMetaStruct();
 
-  Map<String, Number> getMetrics();
+    Map<String, Number> getMetrics();
 
-  String getType();
+    String getType();
 
-  /**
-   * Returns the links.
-   *
-   * @return The span links, empty when the span carries none.
-   */
-  List<DecodedSpanLink> getLinks();
+    /**
+     * Returns the links.
+     *
+     * @return The span links, empty when the span carries none.
+     */
+    List<DecodedSpanLink> getLinks();
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedSpanLink.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedSpanLink.java
index 4f016f84f8f..b0ae728854b 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedSpanLink.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedSpanLink.java
@@ -11,43 +11,43 @@
  * absent trace state to {@code ""}, and absent attributes to an empty map.
  */
 public interface DecodedSpanLink {
-  /**
-   * Returns the identifier of the trace this link refers to, on the same 64 bits as {@link
-   * DecodedSpan#getTraceId()} so the two compare directly.
-   *
-   * <p>The wire carries 128 bits, but the decoder narrows a trace identifier to its low-order half
-   * everywhere — see {@link DecodedSpan#getTraceId()} — so a link is narrowed the same way rather
-   * than modelling a width no span can be compared against.
-   *
-   * @return The identifier of the trace this link refers to.
-   */
-  long getTraceId();
+    /**
+     * Returns the identifier of the trace this link refers to, on the same 64 bits as {@link
+     * DecodedSpan#getTraceId()} so the two compare directly.
+     *
+     * <p>The wire carries 128 bits, but the decoder narrows a trace identifier to its low-order half
+     * everywhere — see {@link DecodedSpan#getTraceId()} — so a link is narrowed the same way rather
+     * than modelling a width no span can be compared against.
+     *
+     * @return The identifier of the trace this link refers to.
+     */
+    long getTraceId();
 
-  /**
-   * Returns the identifier of the span this link refers to.
-   *
-   * @return The unsigned 64-bit span identifier this link refers to.
-   */
-  long getSpanId();
+    /**
+     * Returns the identifier of the span this link refers to.
+     *
+     * @return The unsigned 64-bit span identifier this link refers to.
+     */
+    long getSpanId();
 
-  /**
-   * Returns the W3C trace flags of the linked span.
-   *
-   * @return The trace flags, {@code 0} if the tracer sent none.
-   */
-  byte getTraceFlags();
+    /**
+     * Returns the W3C trace flags of the linked span.
+     *
+     * @return The trace flags, {@code 0} if the tracer sent none.
+     */
+    byte getTraceFlags();
 
-  /**
-   * Returns the W3C trace state of the linked span.
-   *
-   * @return The trace state, empty if the tracer sent none.
-   */
-  String getTraceState();
+    /**
+     * Returns the W3C trace state of the linked span.
+     *
+     * @return The trace state, empty if the tracer sent none.
+     */
+    String getTraceState();
 
-  /**
-   * Returns the attributes attached to this link.
-   *
-   * @return The link attributes, empty if the tracer sent none.
-   */
-  Map<String, String> getAttributes();
+    /**
+     * Returns the attributes attached to this link.
+     *
+     * @return The link attributes, empty if the tracer sent none.
+     */
+    Map<String, String> getAttributes();
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedSpanLinks.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedSpanLinks.java
index 657582d8e74..6bcaa42600c 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedSpanLinks.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedSpanLinks.java
@@ -24,172 +24,161 @@
  * {@code v1} span decoder through {@link #link}.
  */
 public final class DecodedSpanLinks {
-  private static final String SPAN_LINKS_TAG = "_dd.span_links";
-  private static final int TRACE_ID_HEX_LENGTH = 16;
-  private static final Type LIST_OF_LINKS =
-      Types.newParameterizedType(List.class, SpanLinkJson.class);
-  private static final JsonAdapter<List<SpanLinkJson>> ADAPTER =
-      new Moshi.Builder().build().adapter(LIST_OF_LINKS);
-
-  private DecodedSpanLinks() {}
-
-  /**
-   * Decodes the value of meta tags.
-   *
-   * @param meta The span meta collection.
-   * @return The decoded links, in the order the tracer serialized them; empty if the tag is absent
-   *     or holds no link.
-   * @throws IllegalStateException If the tag value is not a well-formed span-link array.
-   */
-  public static List<DecodedSpanLink> fromMeta(Map<String, String> meta) {
-    String tagValue = meta.get(SPAN_LINKS_TAG);
-    if (tagValue == null || tagValue.isEmpty()) {
-      return emptyList();
-    }
-    List<SpanLinkJson> rawLinks;
-    try {
-      rawLinks = ADAPTER.fromJson(tagValue);
-    } catch (IOException | JsonDataException e) {
-      throw new IllegalStateException("Failed to parse span links: " + tagValue, e);
-    }
-    if (rawLinks == null || rawLinks.isEmpty()) {
-      return emptyList();
-    }
-    List<DecodedSpanLink> links = new ArrayList<>(rawLinks.size());
-    for (SpanLinkJson rawLink : rawLinks) {
-      if (rawLink == null) {
-        throw new IllegalStateException("Malformed span links with a null link: " + tagValue);
-      }
-      links.add(toLink(rawLink, tagValue));
-    }
-    return unmodifiableList(links);
-  }
-
-  /**
-   * Builds a link from already decoded values, for the structured {@code v1.0} payload field.
-   *
-   * @param traceId The linked trace identifier.
-   * @param spanId The linked span identifier.
-   * @param traceFlags The W3C trace flags.
-   * @param traceState The W3C trace state, {@code null} for none.
-   * @param attributes The link attributes, {@code null} for none.
-   * @return The link.
-   */
-  public static DecodedSpanLink link(
-      long traceId,
-      long spanId,
-      byte traceFlags,
-      String traceState,
-      Map<String, String> attributes) {
-    return new SpanLink(traceId, spanId, traceFlags, traceState, attributes);
-  }
-
-  private static DecodedSpanLink toLink(SpanLinkJson rawLink, String tagValue) {
-    if (rawLink.traceId == null || rawLink.spanId == null) {
-      throw new IllegalStateException(
-          "Span link missing a required field (trace_id, span_id): " + tagValue);
-    }
-    try {
-      return new SpanLink(
-          Long.parseUnsignedLong(lowOrderTraceId(rawLink.traceId), 16),
-          Long.parseUnsignedLong(rawLink.spanId, 16),
-          rawLink.flags == null ? 0 : (byte) rawLink.flags.intValue(),
-          rawLink.traceState,
-          rawLink.attributes);
-    } catch (NumberFormatException e) {
-      throw new IllegalStateException("Span link with a malformed identifier: " + tagValue, e);
-    }
-  }
-
-  /**
-   * Keeps the low-order 64 bits of a serialized trace identifier. The tracer always emits the full
-   * 128-bit width, of which the decoder models the low-order half.
-   */
-  private static String lowOrderTraceId(String traceId) {
-    return traceId.length() > TRACE_ID_HEX_LENGTH
-        ? traceId.substring(traceId.length() - TRACE_ID_HEX_LENGTH)
-        : traceId;
-  }
-
-  /** The serialized shape of a single link, as the tracer's {@code DDSpanLink} writes it. */
-  private static final class SpanLinkJson {
-    @Json(name = "trace_id")
-    String traceId;
-
-    @Json(name = "span_id")
-    String spanId;
-
-    // Read as an Integer, then narrowed, mirroring how the tracer writes `traceFlags() & 0xFF`.
-    Integer flags;
-
-    @Json(name = "tracestate")
-    String traceState;
-
-    Map<String, String> attributes;
-  }
-
-  private static final class SpanLink implements DecodedSpanLink {
-    private final long traceId;
-    private final long spanId;
-    private final byte traceFlags;
-    private final String traceState;
-    private final Map<String, String> attributes;
-
-    private SpanLink(
-        long traceId,
-        long spanId,
-        byte traceFlags,
-        String traceState,
-        Map<String, String> attributes) {
-      this.traceId = traceId;
-      this.spanId = spanId;
-      this.traceFlags = traceFlags;
-      this.traceState = traceState == null ? "" : traceState;
-      this.attributes =
-          attributes == null || attributes.isEmpty()
-              ? emptyMap()
-              : unmodifiableMap(new HashMap<>(attributes));
+    private static final String SPAN_LINKS_TAG = "_dd.span_links";
+    private static final int TRACE_ID_HEX_LENGTH = 16;
+    private static final Type LIST_OF_LINKS = Types.newParameterizedType(List.class, SpanLinkJson.class);
+    private static final JsonAdapter<List<SpanLinkJson>> ADAPTER =
+            new Moshi.Builder().build().adapter(LIST_OF_LINKS);
+
+    private DecodedSpanLinks() {}
+
+    /**
+     * Decodes the value of meta tags.
+     *
+     * @param meta The span meta collection.
+     * @return The decoded links, in the order the tracer serialized them; empty if the tag is absent
+     *     or holds no link.
+     * @throws IllegalStateException If the tag value is not a well-formed span-link array.
+     */
+    public static List<DecodedSpanLink> fromMeta(Map<String, String> meta) {
+        String tagValue = meta.get(SPAN_LINKS_TAG);
+        if (tagValue == null || tagValue.isEmpty()) {
+            return emptyList();
+        }
+        List<SpanLinkJson> rawLinks;
+        try {
+            rawLinks = ADAPTER.fromJson(tagValue);
+        } catch (IOException | JsonDataException e) {
+            throw new IllegalStateException("Failed to parse span links: " + tagValue, e);
+        }
+        if (rawLinks == null || rawLinks.isEmpty()) {
+            return emptyList();
+        }
+        List<DecodedSpanLink> links = new ArrayList<>(rawLinks.size());
+        for (SpanLinkJson rawLink : rawLinks) {
+            if (rawLink == null) {
+                throw new IllegalStateException("Malformed span links with a null link: " + tagValue);
+            }
+            links.add(toLink(rawLink, tagValue));
+        }
+        return unmodifiableList(links);
     }
 
-    @Override
-    public long getTraceId() {
-      return this.traceId;
+    /**
+     * Builds a link from already decoded values, for the structured {@code v1.0} payload field.
+     *
+     * @param traceId The linked trace identifier.
+     * @param spanId The linked span identifier.
+     * @param traceFlags The W3C trace flags.
+     * @param traceState The W3C trace state, {@code null} for none.
+     * @param attributes The link attributes, {@code null} for none.
+     * @return The link.
+     */
+    public static DecodedSpanLink link(
+            long traceId, long spanId, byte traceFlags, String traceState, Map<String, String> attributes) {
+        return new SpanLink(traceId, spanId, traceFlags, traceState, attributes);
     }
 
-    @Override
-    public long getSpanId() {
-      return this.spanId;
+    private static DecodedSpanLink toLink(SpanLinkJson rawLink, String tagValue) {
+        if (rawLink.traceId == null || rawLink.spanId == null) {
+            throw new IllegalStateException("Span link missing a required field (trace_id, span_id): " + tagValue);
+        }
+        try {
+            return new SpanLink(
+                    Long.parseUnsignedLong(lowOrderTraceId(rawLink.traceId), 16),
+                    Long.parseUnsignedLong(rawLink.spanId, 16),
+                    rawLink.flags == null ? 0 : (byte) rawLink.flags.intValue(),
+                    rawLink.traceState,
+                    rawLink.attributes);
+        } catch (NumberFormatException e) {
+            throw new IllegalStateException("Span link with a malformed identifier: " + tagValue, e);
+        }
     }
 
-    @Override
-    public byte getTraceFlags() {
-      return this.traceFlags;
+    /**
+     * Keeps the low-order 64 bits of a serialized trace identifier. The tracer always emits the full
+     * 128-bit width, of which the decoder models the low-order half.
+     */
+    private static String lowOrderTraceId(String traceId) {
+        return traceId.length() > TRACE_ID_HEX_LENGTH
+                ? traceId.substring(traceId.length() - TRACE_ID_HEX_LENGTH)
+                : traceId;
     }
 
-    @Override
-    public String getTraceState() {
-      return this.traceState;
-    }
+    /** The serialized shape of a single link, as the tracer's {@code DDSpanLink} writes it. */
+    private static final class SpanLinkJson {
+        @Json(name = "trace_id")
+        String traceId;
+
+        @Json(name = "span_id")
+        String spanId;
+
+        // Read as an Integer, then narrowed, mirroring how the tracer writes `traceFlags() & 0xFF`.
+        Integer flags;
+
+        @Json(name = "tracestate")
+        String traceState;
 
-    @Override
-    public Map<String, String> getAttributes() {
-      return this.attributes;
+        Map<String, String> attributes;
     }
 
-    @Override
-    public String toString() {
-      // Renders the identifiers the way the wire carries them, so failures read wire-faithfully.
-      return "SpanLink{traceId="
-          + Long.toHexString(this.traceId)
-          + ", spanId="
-          + Long.toHexString(this.spanId)
-          + ", traceFlags="
-          + this.traceFlags
-          + ", traceState='"
-          + this.traceState
-          + "', attributes="
-          + this.attributes
-          + '}';
+    private static final class SpanLink implements DecodedSpanLink {
+        private final long traceId;
+        private final long spanId;
+        private final byte traceFlags;
+        private final String traceState;
+        private final Map<String, String> attributes;
+
+        private SpanLink(
+                long traceId, long spanId, byte traceFlags, String traceState, Map<String, String> attributes) {
+            this.traceId = traceId;
+            this.spanId = spanId;
+            this.traceFlags = traceFlags;
+            this.traceState = traceState == null ? "" : traceState;
+            this.attributes = attributes == null || attributes.isEmpty()
+                    ? emptyMap()
+                    : unmodifiableMap(new HashMap<>(attributes));
+        }
+
+        @Override
+        public long getTraceId() {
+            return this.traceId;
+        }
+
+        @Override
+        public long getSpanId() {
+            return this.spanId;
+        }
+
+        @Override
+        public byte getTraceFlags() {
+            return this.traceFlags;
+        }
+
+        @Override
+        public String getTraceState() {
+            return this.traceState;
+        }
+
+        @Override
+        public Map<String, String> getAttributes() {
+            return this.attributes;
+        }
+
+        @Override
+        public String toString() {
+            // Renders the identifiers the way the wire carries them, so failures read wire-faithfully.
+            return "SpanLink{traceId="
+                    + Long.toHexString(this.traceId)
+                    + ", spanId="
+                    + Long.toHexString(this.spanId)
+                    + ", traceFlags="
+                    + this.traceFlags
+                    + ", traceState='"
+                    + this.traceState
+                    + "', attributes="
+                    + this.attributes
+                    + '}';
+        }
     }
-  }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedTrace.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedTrace.java
index 63df7a68ca1..90b2047b117 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedTrace.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedTrace.java
@@ -3,10 +3,10 @@
 import java.util.List;
 
 public interface DecodedTrace {
-  List<DecodedSpan> getSpans();
+    List<DecodedSpan> getSpans();
 
-  // Payload v1.0 has sampling priority on trace level.
-  default Integer getSamplingPriority() {
-    return null;
-  }
+    // Payload v1.0 has sampling priority on trace level.
+    default Integer getSamplingPriority() {
+        return null;
+    }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/Decoder.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/Decoder.java
index 313584518a3..8511d12576f 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/Decoder.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/Decoder.java
@@ -9,32 +9,30 @@
 import java.util.List;
 
 public class Decoder {
-  public static DecodedMessage decodeV1(byte[] buffer) {
-    return MessageV1.unpack(buffer);
-  }
+    public static DecodedMessage decodeV1(byte[] buffer) {
+        return MessageV1.unpack(buffer);
+    }
 
-  /** Decodes the JSON trace format exposed by the dd-apm-test-agent. */
-  public static DecodedMessage decodeJson(String json) {
-    return MessageJson.fromJson(json);
-  }
+    /** Decodes the JSON trace format exposed by the dd-apm-test-agent. */
+    public static DecodedMessage decodeJson(String json) {
+        return MessageJson.fromJson(json);
+    }
 
-  public static DecodedMessage decodeV05(byte[] buffer) {
-    return MessageV05.unpack(buffer);
-  }
+    public static DecodedMessage decodeV05(byte[] buffer) {
+        return MessageV05.unpack(buffer);
+    }
 
-  public static DecodedMessage decodeV04(byte[] buffer) {
-    return MessageV04.unpack(buffer);
-  }
+    public static DecodedMessage decodeV04(byte[] buffer) {
+        return MessageV04.unpack(buffer);
+    }
 
-  public static List<DecodedSpan> sortByStart(Collection<DecodedSpan> spans) {
-    DecodedSpan[] spanArray = new DecodedSpan[spans.size()];
-    spanArray = spans.toArray(spanArray);
-    Arrays.sort(
-        spanArray,
-        (o1, o2) -> {
-          long res = o1.getStart() - o2.getStart();
-          return res == 0 ? 0 : res > 0 ? 1 : -1;
+    public static List<DecodedSpan> sortByStart(Collection<DecodedSpan> spans) {
+        DecodedSpan[] spanArray = new DecodedSpan[spans.size()];
+        spanArray = spans.toArray(spanArray);
+        Arrays.sort(spanArray, (o1, o2) -> {
+            long res = o1.getStart() - o2.getStart();
+            return res == 0 ? 0 : res > 0 ? 1 : -1;
         });
-    return Arrays.asList(spanArray);
-  }
+        return Arrays.asList(spanArray);
+    }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/json/raw/MessageJson.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/json/raw/MessageJson.java
index 42e8971cf06..9d7b02be7eb 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/json/raw/MessageJson.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/json/raw/MessageJson.java
@@ -28,168 +28,163 @@
  * the list of traces.
  */
 public final class MessageJson implements DecodedMessage {
-  private static final Type LIST_OF_TRACES =
-      Types.newParameterizedType(
-          List.class, Types.newParameterizedType(List.class, SpanJson.class));
-  private static final JsonAdapter<List<List<SpanJson>>> ADAPTER =
-      new Moshi.Builder()
-          .add(new MetricNumberAdapter())
-          .add(new MetaStructObjectAdapter())
-          .build()
-          .adapter(LIST_OF_TRACES);
+    private static final Type LIST_OF_TRACES =
+            Types.newParameterizedType(List.class, Types.newParameterizedType(List.class, SpanJson.class));
+    private static final JsonAdapter<List<List<SpanJson>>> ADAPTER = new Moshi.Builder()
+            .add(new MetricNumberAdapter())
+            .add(new MetaStructObjectAdapter())
+            .build()
+            .adapter(LIST_OF_TRACES);
 
-  private final List<DecodedTrace> traces;
+    private final List<DecodedTrace> traces;
 
-  private MessageJson(List<DecodedTrace> traces) {
-    this.traces = unmodifiableList(traces);
-  }
-
-  /** Decodes a JSON trace payload into a {@link MessageJson}. */
-  public static MessageJson fromJson(String json) {
-    List<List<SpanJson>> rawTraces;
-    try {
-      rawTraces = ADAPTER.fromJson(json);
-    } catch (IOException | JsonDataException e) {
-      throw new IllegalStateException("Failed to parse JSON traces: " + json, e);
+    private MessageJson(List<DecodedTrace> traces) {
+        this.traces = unmodifiableList(traces);
     }
-    List<DecodedTrace> traces = new ArrayList<>();
-    if (rawTraces != null) {
-      for (List<SpanJson> spans : rawTraces) {
-        if (spans == null) {
-          throw new IllegalStateException("Malformed JSON trace with a null trace: " + json);
+
+    /** Decodes a JSON trace payload into a {@link MessageJson}. */
+    public static MessageJson fromJson(String json) {
+        List<List<SpanJson>> rawTraces;
+        try {
+            rawTraces = ADAPTER.fromJson(json);
+        } catch (IOException | JsonDataException e) {
+            throw new IllegalStateException("Failed to parse JSON traces: " + json, e);
         }
-        List<DecodedSpan> decodedSpans = new ArrayList<>(spans.size());
-        for (SpanJson span : spans) {
-          if (span == null) {
-            throw new IllegalStateException("Malformed JSON trace with a null span: " + json);
-          }
-          if (span.name == null
-              || span.traceId == null
-              || span.spanId == null
-              || span.start == null
-              || span.duration == null) {
-            throw new IllegalStateException(
-                "JSON span missing a required v0.4 field "
-                    + "(name, trace_id, span_id, start, duration): "
-                    + span);
-          }
-          span.resolveLinks();
-          decodedSpans.add(span);
+        List<DecodedTrace> traces = new ArrayList<>();
+        if (rawTraces != null) {
+            for (List<SpanJson> spans : rawTraces) {
+                if (spans == null) {
+                    throw new IllegalStateException("Malformed JSON trace with a null trace: " + json);
+                }
+                List<DecodedSpan> decodedSpans = new ArrayList<>(spans.size());
+                for (SpanJson span : spans) {
+                    if (span == null) {
+                        throw new IllegalStateException("Malformed JSON trace with a null span: " + json);
+                    }
+                    if (span.name == null
+                            || span.traceId == null
+                            || span.spanId == null
+                            || span.start == null
+                            || span.duration == null) {
+                        throw new IllegalStateException("JSON span missing a required v0.4 field "
+                                + "(name, trace_id, span_id, start, duration): "
+                                + span);
+                    }
+                    span.resolveLinks();
+                    decodedSpans.add(span);
+                }
+                traces.add(new TraceJson(decodedSpans));
+            }
         }
-        traces.add(new TraceJson(decodedSpans));
-      }
+        return new MessageJson(traces);
     }
-    return new MessageJson(traces);
-  }
 
-  /**
-   * Decodes the numeric values of the {@code metrics} map. Moshi coerces every JSON number to
-   * {@code Double}; this adapter instead reads the number from its literal form and preserves the
-   * integral vs. fractional distinction the msgpack decoders produce (see {@code
-   * SpanV04.unpackNumber}): integral values become {@code Integer} (or {@code Long} when they
-   * overflow {@code int}, or {@code BigInteger} beyond {@code long} range), fractional values
-   * become {@code Double}. Reading the literal rather than coercing through {@code double} keeps
-   * every integral value exact — including those above 2^53 and above {@code Long.MAX_VALUE}.
-   */
-  static final class MetricNumberAdapter {
-    @FromJson
-    Number fromJson(JsonReader reader) throws IOException {
-      String literal = reader.nextString();
-      boolean fractional =
-          literal.indexOf('.') >= 0 || literal.indexOf('e') >= 0 || literal.indexOf('E') >= 0;
-      if (!fractional) {
-        try {
-          return Integer.valueOf(literal);
-        } catch (NumberFormatException overflowsInt) {
-          try {
-            return Long.valueOf(literal);
-          } catch (NumberFormatException overflowsLong) {
-            // Integral magnitude beyond long range: keep it exact as a BigInteger.
-            return new BigInteger(literal);
-          }
+    /**
+     * Decodes the numeric values of the {@code metrics} map. Moshi coerces every JSON number to
+     * {@code Double}; this adapter instead reads the number from its literal form and preserves the
+     * integral vs. fractional distinction the msgpack decoders produce (see {@code
+     * SpanV04.unpackNumber}): integral values become {@code Integer} (or {@code Long} when they
+     * overflow {@code int}, or {@code BigInteger} beyond {@code long} range), fractional values
+     * become {@code Double}. Reading the literal rather than coercing through {@code double} keeps
+     * every integral value exact — including those above 2^53 and above {@code Long.MAX_VALUE}.
+     */
+    static final class MetricNumberAdapter {
+        @FromJson
+        Number fromJson(JsonReader reader) throws IOException {
+            String literal = reader.nextString();
+            boolean fractional = literal.indexOf('.') >= 0 || literal.indexOf('e') >= 0 || literal.indexOf('E') >= 0;
+            if (!fractional) {
+                try {
+                    return Integer.valueOf(literal);
+                } catch (NumberFormatException overflowsInt) {
+                    try {
+                        return Long.valueOf(literal);
+                    } catch (NumberFormatException overflowsLong) {
+                        // Integral magnitude beyond long range: keep it exact as a BigInteger.
+                        return new BigInteger(literal);
+                    }
+                }
+            }
+            return Double.valueOf(literal);
         }
-      }
-      return Double.valueOf(literal);
-    }
 
-    @ToJson
-    void toJson(JsonWriter writer, Number value) throws IOException {
-      writer.value(value);
+        @ToJson
+        void toJson(JsonWriter writer, Number value) throws IOException {
+            writer.value(value);
+        }
     }
-  }
 
-  /**
-   * Decodes the arbitrarily-nested values of the {@code meta_struct} map. Moshi's generic {@code
-   * Object} adapter materializes every JSON number as {@code Double}, every object as a map, and
-   * every array as a list; this adapter instead mirrors the msgpack decoder (see {@code
-   * SpanV04.convertValueToObject}) so both backends expose the same types for a nested leaf:
-   *
-   * <ul>
-   *   <li>integers become {@code Long} (reading the literal keeps values above 2^53 exact, and
-   *       values beyond {@code long} range become {@code BigInteger} rather than a lossy {@code
-   *       Double}),
-   *   <li>floating-point numbers become {@code Float},
-   *   <li>objects become {@code Map<String, Object>} and arrays {@code List<Object>}, recursively,
-   *   <li>strings, booleans, and JSON {@code null} are preserved as {@code String}/{@code
-   *       Boolean}/{@code null}.
-   * </ul>
-   *
-   * <p>Keeping the representations identical means a {@code metaStruct(...)} assertion behaves the
-   * same whether the span came from the in-process msgpack backend or the dd-apm-test-agent JSON
-   * backend. Binary leaves ({@code byte[]} on the msgpack side) have no JSON representation — the
-   * agent fails to serialize them (HTTP 400) so they never reach this decoder; in practice {@code
-   * meta_struct} carries only JSON-serializable data.
-   */
-  static final class MetaStructObjectAdapter {
-    @FromJson
-    Object fromJson(JsonReader reader) throws IOException {
-      switch (reader.peek()) {
-        case BEGIN_OBJECT:
-          Map<String, Object> object = new LinkedHashMap<>();
-          reader.beginObject();
-          while (reader.hasNext()) {
-            object.put(reader.nextName(), fromJson(reader));
-          }
-          reader.endObject();
-          return object;
-        case BEGIN_ARRAY:
-          List<Object> array = new ArrayList<>();
-          reader.beginArray();
-          while (reader.hasNext()) {
-            array.add(fromJson(reader));
-          }
-          reader.endArray();
-          return array;
-        case STRING:
-          return reader.nextString();
-        case NUMBER:
-          return parseNumber(reader.nextString());
-        case BOOLEAN:
-          return reader.nextBoolean();
-        case NULL:
-          return reader.nextNull();
-        default:
-          throw new JsonDataException("Unexpected meta_struct token: " + reader.peek());
-      }
-    }
+    /**
+     * Decodes the arbitrarily-nested values of the {@code meta_struct} map. Moshi's generic {@code
+     * Object} adapter materializes every JSON number as {@code Double}, every object as a map, and
+     * every array as a list; this adapter instead mirrors the msgpack decoder (see {@code
+     * SpanV04.convertValueToObject}) so both backends expose the same types for a nested leaf:
+     *
+     * <ul>
+     *   <li>integers become {@code Long} (reading the literal keeps values above 2^53 exact, and
+     *       values beyond {@code long} range become {@code BigInteger} rather than a lossy {@code
+     *       Double}),
+     *   <li>floating-point numbers become {@code Float},
+     *   <li>objects become {@code Map<String, Object>} and arrays {@code List<Object>}, recursively,
+     *   <li>strings, booleans, and JSON {@code null} are preserved as {@code String}/{@code
+     *       Boolean}/{@code null}.
+     * </ul>
+     *
+     * <p>Keeping the representations identical means a {@code metaStruct(...)} assertion behaves the
+     * same whether the span came from the in-process msgpack backend or the dd-apm-test-agent JSON
+     * backend. Binary leaves ({@code byte[]} on the msgpack side) have no JSON representation — the
+     * agent fails to serialize them (HTTP 400) so they never reach this decoder; in practice {@code
+     * meta_struct} carries only JSON-serializable data.
+     */
+    static final class MetaStructObjectAdapter {
+        @FromJson
+        Object fromJson(JsonReader reader) throws IOException {
+            switch (reader.peek()) {
+                case BEGIN_OBJECT:
+                    Map<String, Object> object = new LinkedHashMap<>();
+                    reader.beginObject();
+                    while (reader.hasNext()) {
+                        object.put(reader.nextName(), fromJson(reader));
+                    }
+                    reader.endObject();
+                    return object;
+                case BEGIN_ARRAY:
+                    List<Object> array = new ArrayList<>();
+                    reader.beginArray();
+                    while (reader.hasNext()) {
+                        array.add(fromJson(reader));
+                    }
+                    reader.endArray();
+                    return array;
+                case STRING:
+                    return reader.nextString();
+                case NUMBER:
+                    return parseNumber(reader.nextString());
+                case BOOLEAN:
+                    return reader.nextBoolean();
+                case NULL:
+                    return reader.nextNull();
+                default:
+                    throw new JsonDataException("Unexpected meta_struct token: " + reader.peek());
+            }
+        }
 
-    private static Number parseNumber(String literal) {
-      boolean fractional =
-          literal.indexOf('.') >= 0 || literal.indexOf('e') >= 0 || literal.indexOf('E') >= 0;
-      if (fractional) {
-        return Float.valueOf(literal);
-      }
-      try {
-        return Long.valueOf(literal);
-      } catch (NumberFormatException overflowsLong) {
-        // Integral magnitude beyond long range: keep it exact as a BigInteger.
-        return new BigInteger(literal);
-      }
+        private static Number parseNumber(String literal) {
+            boolean fractional = literal.indexOf('.') >= 0 || literal.indexOf('e') >= 0 || literal.indexOf('E') >= 0;
+            if (fractional) {
+                return Float.valueOf(literal);
+            }
+            try {
+                return Long.valueOf(literal);
+            } catch (NumberFormatException overflowsLong) {
+                // Integral magnitude beyond long range: keep it exact as a BigInteger.
+                return new BigInteger(literal);
+            }
+        }
     }
-  }
 
-  @Override
-  public List<DecodedTrace> getTraces() {
-    return this.traces;
-  }
+    @Override
+    public List<DecodedTrace> getTraces() {
+        return this.traces;
+    }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/json/raw/SpanJson.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/json/raw/SpanJson.java
index 8c59fd6835b..8b20ed0c4e4 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/json/raw/SpanJson.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/json/raw/SpanJson.java
@@ -19,162 +19,162 @@
  * start/duration/error, meta, metrics, and meta_struct.
  */
 public final class SpanJson implements DecodedSpan {
-  String service;
-  String name;
-  String resource;
-  String type;
-
-  // IDs are unsigned 64-bit; read as decimal strings and parsed with Long.parseUnsignedLong, since
-  // Moshi's long adapter rejects values above Long.MAX_VALUE (the agent emits them as JSON numbers,
-  // which Moshi coerces to their string form).
-  @Json(name = "trace_id")
-  String traceId;
-
-  @Json(name = "span_id")
-  String spanId;
-
-  @Json(name = "parent_id")
-  String parentId;
-
-  // start and duration are required v0.4 fields; boxed so a missing value decodes to null (and is
-  // rejected by MessageJson) instead of a silent 0. error is optional per the agent's Span schema
-  // (absent => 0, i.e. no error), so it stays a primitive.
-  Long start;
-  Long duration;
-  int error;
-  Map<String, String> meta;
-
-  @Json(name = "meta_struct")
-  Map<String, Object> metaStruct;
-
-  Map<String, Number> metrics;
-
-  // Ony present in V1 payload. Decoded from meta by #resolveLinks otherwise
-  @Json(name = "span_links")
-  List<SpanLinkJson> spanLinks;
-
-  // Decoded from span links meta tag or #spanLinks
-  // transient so Moshi does not try to decode it
-  transient List<DecodedSpanLink> links;
-
-  @Override
-  public String getService() {
-    return this.service;
-  }
-
-  @Override
-  public String getName() {
-    return this.name;
-  }
-
-  @Override
-  public String getResource() {
-    return this.resource;
-  }
-
-  @Override
-  public long getTraceId() {
-    return this.traceId == null ? 0L : Long.parseUnsignedLong(this.traceId);
-  }
-
-  @Override
-  public long getSpanId() {
-    return this.spanId == null ? 0L : Long.parseUnsignedLong(this.spanId);
-  }
-
-  @Override
-  public long getParentId() {
-    return this.parentId == null ? 0L : Long.parseUnsignedLong(this.parentId);
-  }
-
-  @Override
-  public long getStart() {
-    return this.start == null ? 0L : this.start;
-  }
-
-  @Override
-  public long getDuration() {
-    return this.duration == null ? 0L : this.duration;
-  }
-
-  @Override
-  public int getError() {
-    return this.error;
-  }
-
-  @Override
-  public Map<String, String> getMeta() {
-    return this.meta == null ? emptyMap() : unmodifiableMap(this.meta);
-  }
-
-  @Override
-  public Map<String, Object> getMetaStruct() {
-    return this.metaStruct == null ? emptyMap() : unmodifiableMap(this.metaStruct);
-  }
-
-  @Override
-  public Map<String, Number> getMetrics() {
-    return this.metrics == null ? emptyMap() : unmodifiableMap(this.metrics);
-  }
-
-  @Override
-  public String getType() {
-    return this.type;
-  }
-
-  @Override
-  public List<DecodedSpanLink> getLinks() {
-    return this.links;
-  }
-
-  /**
-   * Decodes the span links, from the {@code span_links} field when the agent filled it (the tracer
-   * submitted a {@code v1.0} payload) and from the meta tag otherwise.
-   */
-  void resolveLinks() {
-    if (this.spanLinks == null) {
-      this.links = DecodedSpanLinks.fromMeta(getMeta());
-      return;
-    }
-    List<DecodedSpanLink> decoded = new ArrayList<>(this.spanLinks.size());
-    for (SpanLinkJson spanLink : this.spanLinks) {
-      if (spanLink == null) {
-        throw new IllegalStateException("Malformed span_links with a null link: " + this);
-      }
-      decoded.add(spanLink.toDecodedSpanLink());
-    }
-    this.links = unmodifiableList(decoded);
-  }
-
-  @Override
-  public String toString() {
-    return "SpanJson{"
-        + "service='"
-        + this.service
-        + "', name='"
-        + this.name
-        + "', resource='"
-        + this.resource
-        + "', type='"
-        + this.type
-        + "', traceId="
-        + this.traceId
-        + ", spanId="
-        + this.spanId
-        + ", parentId="
-        + this.parentId
-        + ", start="
-        + this.start
-        + ", duration="
-        + this.duration
-        + ", error="
-        + this.error
-        + ", meta="
-        + this.meta
-        + ", metaStruct="
-        + this.metaStruct
-        + ", metrics="
-        + this.metrics
-        + '}';
-  }
+    String service;
+    String name;
+    String resource;
+    String type;
+
+    // IDs are unsigned 64-bit; read as decimal strings and parsed with Long.parseUnsignedLong, since
+    // Moshi's long adapter rejects values above Long.MAX_VALUE (the agent emits them as JSON numbers,
+    // which Moshi coerces to their string form).
+    @Json(name = "trace_id")
+    String traceId;
+
+    @Json(name = "span_id")
+    String spanId;
+
+    @Json(name = "parent_id")
+    String parentId;
+
+    // start and duration are required v0.4 fields; boxed so a missing value decodes to null (and is
+    // rejected by MessageJson) instead of a silent 0. error is optional per the agent's Span schema
+    // (absent => 0, i.e. no error), so it stays a primitive.
+    Long start;
+    Long duration;
+    int error;
+    Map<String, String> meta;
+
+    @Json(name = "meta_struct")
+    Map<String, Object> metaStruct;
+
+    Map<String, Number> metrics;
+
+    // Ony present in V1 payload. Decoded from meta by #resolveLinks otherwise
+    @Json(name = "span_links")
+    List<SpanLinkJson> spanLinks;
+
+    // Decoded from span links meta tag or #spanLinks
+    // transient so Moshi does not try to decode it
+    transient List<DecodedSpanLink> links;
+
+    @Override
+    public String getService() {
+        return this.service;
+    }
+
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    @Override
+    public String getResource() {
+        return this.resource;
+    }
+
+    @Override
+    public long getTraceId() {
+        return this.traceId == null ? 0L : Long.parseUnsignedLong(this.traceId);
+    }
+
+    @Override
+    public long getSpanId() {
+        return this.spanId == null ? 0L : Long.parseUnsignedLong(this.spanId);
+    }
+
+    @Override
+    public long getParentId() {
+        return this.parentId == null ? 0L : Long.parseUnsignedLong(this.parentId);
+    }
+
+    @Override
+    public long getStart() {
+        return this.start == null ? 0L : this.start;
+    }
+
+    @Override
+    public long getDuration() {
+        return this.duration == null ? 0L : this.duration;
+    }
+
+    @Override
+    public int getError() {
+        return this.error;
+    }
+
+    @Override
+    public Map<String, String> getMeta() {
+        return this.meta == null ? emptyMap() : unmodifiableMap(this.meta);
+    }
+
+    @Override
+    public Map<String, Object> getMetaStruct() {
+        return this.metaStruct == null ? emptyMap() : unmodifiableMap(this.metaStruct);
+    }
+
+    @Override
+    public Map<String, Number> getMetrics() {
+        return this.metrics == null ? emptyMap() : unmodifiableMap(this.metrics);
+    }
+
+    @Override
+    public String getType() {
+        return this.type;
+    }
+
+    @Override
+    public List<DecodedSpanLink> getLinks() {
+        return this.links;
+    }
+
+    /**
+     * Decodes the span links, from the {@code span_links} field when the agent filled it (the tracer
+     * submitted a {@code v1.0} payload) and from the meta tag otherwise.
+     */
+    void resolveLinks() {
+        if (this.spanLinks == null) {
+            this.links = DecodedSpanLinks.fromMeta(getMeta());
+            return;
+        }
+        List<DecodedSpanLink> decoded = new ArrayList<>(this.spanLinks.size());
+        for (SpanLinkJson spanLink : this.spanLinks) {
+            if (spanLink == null) {
+                throw new IllegalStateException("Malformed span_links with a null link: " + this);
+            }
+            decoded.add(spanLink.toDecodedSpanLink());
+        }
+        this.links = unmodifiableList(decoded);
+    }
+
+    @Override
+    public String toString() {
+        return "SpanJson{"
+                + "service='"
+                + this.service
+                + "', name='"
+                + this.name
+                + "', resource='"
+                + this.resource
+                + "', type='"
+                + this.type
+                + "', traceId="
+                + this.traceId
+                + ", spanId="
+                + this.spanId
+                + ", parentId="
+                + this.parentId
+                + ", start="
+                + this.start
+                + ", duration="
+                + this.duration
+                + ", error="
+                + this.error
+                + ", meta="
+                + this.meta
+                + ", metaStruct="
+                + this.metaStruct
+                + ", metrics="
+                + this.metrics
+                + '}';
+    }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/json/raw/SpanLinkJson.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/json/raw/SpanLinkJson.java
index 0c3b72ce60d..073110c6604 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/json/raw/SpanLinkJson.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/json/raw/SpanLinkJson.java
@@ -15,58 +15,57 @@
  * identifier is split into its low and high halves.
  */
 final class SpanLinkJson {
-  // Identifiers are unsigned 64-bit, read as decimal strings and parsed with
-  // Long.parseUnsignedLong for the same reason as SpanJson: Moshi's long adapter rejects values
-  // above Long.MAX_VALUE.
-  @Json(name = "trace_id")
-  String traceId;
+    // Identifiers are unsigned 64-bit, read as decimal strings and parsed with
+    // Long.parseUnsignedLong for the same reason as SpanJson: Moshi's long adapter rejects values
+    // above Long.MAX_VALUE.
+    @Json(name = "trace_id")
+    String traceId;
 
-  // The high-order half of a 128-bit trace identifier. Not modeled by DecodedSpanLink, which
-  // narrows a trace identifier to its low-order half like the rest of the decoder.
-  @Json(name = "trace_id_high")
-  String traceIdHigh;
+    // The high-order half of a 128-bit trace identifier. Not modeled by DecodedSpanLink, which
+    // narrows a trace identifier to its low-order half like the rest of the decoder.
+    @Json(name = "trace_id_high")
+    String traceIdHigh;
 
-  @Json(name = "span_id")
-  String spanId;
+    @Json(name = "span_id")
+    String spanId;
 
-  Integer flags;
+    Integer flags;
 
-  String tracestate;
+    String tracestate;
 
-  Map<String, String> attributes;
+    Map<String, String> attributes;
 
-  DecodedSpanLink toDecodedSpanLink() {
-    if (this.traceId == null || this.spanId == null) {
-      throw new IllegalStateException(
-          "JSON span link missing a required field (trace_id, span_id): " + this);
+    DecodedSpanLink toDecodedSpanLink() {
+        if (this.traceId == null || this.spanId == null) {
+            throw new IllegalStateException("JSON span link missing a required field (trace_id, span_id): " + this);
+        }
+        try {
+            return DecodedSpanLinks.link(
+                    Long.parseUnsignedLong(this.traceId),
+                    Long.parseUnsignedLong(this.spanId),
+                    this.flags == null ? 0 : (byte) this.flags.intValue(),
+                    this.tracestate,
+                    this.attributes);
+        } catch (NumberFormatException e) {
+            throw new IllegalStateException("JSON span link with a malformed identifier: " + this, e);
+        }
     }
-    try {
-      return DecodedSpanLinks.link(
-          Long.parseUnsignedLong(this.traceId),
-          Long.parseUnsignedLong(this.spanId),
-          this.flags == null ? 0 : (byte) this.flags.intValue(),
-          this.tracestate,
-          this.attributes);
-    } catch (NumberFormatException e) {
-      throw new IllegalStateException("JSON span link with a malformed identifier: " + this, e);
-    }
-  }
 
-  @Override
-  public String toString() {
-    return "SpanLinkJson{"
-        + "traceId="
-        + this.traceId
-        + ", traceIdHigh="
-        + this.traceIdHigh
-        + ", spanId="
-        + this.spanId
-        + ", flags="
-        + this.flags
-        + ", tracestate='"
-        + this.tracestate
-        + "', attributes="
-        + this.attributes
-        + '}';
-  }
+    @Override
+    public String toString() {
+        return "SpanLinkJson{"
+                + "traceId="
+                + this.traceId
+                + ", traceIdHigh="
+                + this.traceIdHigh
+                + ", spanId="
+                + this.spanId
+                + ", flags="
+                + this.flags
+                + ", tracestate='"
+                + this.tracestate
+                + "', attributes="
+                + this.attributes
+                + '}';
+    }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/json/raw/TraceJson.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/json/raw/TraceJson.java
index feaa991632d..3a01377be0a 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/json/raw/TraceJson.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/json/raw/TraceJson.java
@@ -8,19 +8,19 @@
 
 /** TraceJson is a single trace (an ordered list of {@link SpanJson}) from the JSON trace format. */
 public final class TraceJson implements DecodedTrace {
-  private final List<DecodedSpan> spans;
+    private final List<DecodedSpan> spans;
 
-  TraceJson(List<DecodedSpan> spans) {
-    this.spans = unmodifiableList(spans);
-  }
+    TraceJson(List<DecodedSpan> spans) {
+        this.spans = unmodifiableList(spans);
+    }
 
-  @Override
-  public List<DecodedSpan> getSpans() {
-    return this.spans;
-  }
+    @Override
+    public List<DecodedSpan> getSpans() {
+        return this.spans;
+    }
 
-  @Override
-  public String toString() {
-    return this.spans.toString();
-  }
+    @Override
+    public String toString() {
+        return this.spans.toString();
+    }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v04/raw/MessageV04.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v04/raw/MessageV04.java
index ffc7e6d8df4..127486dfd95 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v04/raw/MessageV04.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v04/raw/MessageV04.java
@@ -10,38 +10,38 @@
 import org.msgpack.core.MessageUnpacker;
 
 public class MessageV04 implements DecodedMessage {
-  public static MessageV04 unpack(ByteBuffer buffer) {
-    return unpack(MessagePack.DEFAULT_UNPACKER_CONFIG.newUnpacker(buffer));
-  }
+    public static MessageV04 unpack(ByteBuffer buffer) {
+        return unpack(MessagePack.DEFAULT_UNPACKER_CONFIG.newUnpacker(buffer));
+    }
 
-  public static MessageV04 unpack(byte[] buffer) {
-    return unpack(MessagePack.DEFAULT_UNPACKER_CONFIG.newUnpacker(buffer));
-  }
+    public static MessageV04 unpack(byte[] buffer) {
+        return unpack(MessagePack.DEFAULT_UNPACKER_CONFIG.newUnpacker(buffer));
+    }
 
-  static MessageV04 unpack(MessageUnpacker unpacker) {
-    try {
-      DecodedTrace[] traces = TraceV04.unpackTraces(unpacker);
-      return new MessageV04(traces);
-    } catch (Throwable t) {
-      if (t instanceof RuntimeException) {
-        throw (RuntimeException) t;
-      } else {
-        throw new IllegalArgumentException(t);
-      }
+    static MessageV04 unpack(MessageUnpacker unpacker) {
+        try {
+            DecodedTrace[] traces = TraceV04.unpackTraces(unpacker);
+            return new MessageV04(traces);
+        } catch (Throwable t) {
+            if (t instanceof RuntimeException) {
+                throw (RuntimeException) t;
+            } else {
+                throw new IllegalArgumentException(t);
+            }
+        }
     }
-  }
 
-  private final DecodedTrace[] traces;
+    private final DecodedTrace[] traces;
 
-  private MessageV04(DecodedTrace[] traces) {
-    this.traces = traces;
-  }
+    private MessageV04(DecodedTrace[] traces) {
+        this.traces = traces;
+    }
 
-  @Override
-  public List<DecodedTrace> getTraces() {
-    if (traces.length == 0) {
-      return Collections.emptyList();
+    @Override
+    public List<DecodedTrace> getTraces() {
+        if (traces.length == 0) {
+            return Collections.emptyList();
+        }
+        return Collections.unmodifiableList(Arrays.asList(traces));
     }
-    return Collections.unmodifiableList(Arrays.asList(traces));
-  }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v04/raw/SpanV04.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v04/raw/SpanV04.java
index cbaeb2af1ed..186ffd8d1a7 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v04/raw/SpanV04.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v04/raw/SpanV04.java
@@ -18,360 +18,349 @@
 import org.msgpack.value.ValueType;
 
 public class SpanV04 implements DecodedSpan {
-  static DecodedSpan[] unpackSpans(MessageUnpacker unpacker) {
-    try {
-      int size = unpacker.unpackArrayHeader();
-      if (size < 0) {
-        throw new IllegalArgumentException("Negative span array size " + size);
-      }
-      DecodedSpan[] spans = new DecodedSpan[size];
-      for (int i = 0; i < size; i++) {
-        spans[i] = unpack(unpacker);
-      }
-      return spans;
-    } catch (Throwable t) {
-      if (t instanceof RuntimeException) {
-        throw (RuntimeException) t;
-      } else {
-        throw new IllegalArgumentException(t);
-      }
-    }
-  }
-
-  static SpanV04 unpack(MessageUnpacker unpacker) {
-    try {
-      int size = unpacker.unpackMapHeader();
-      if (size != 12 && size != 13) {
-        throw new IllegalArgumentException(
-            "Wrong span element map size "
-                + size
-                + ". Expected 12 (plain) or 13 (with meta_struct).");
-      }
-
-      String service = unpackString("service", unpacker);
-      String name = unpackString("name", unpacker);
-      String resource = unpackString("resource", unpacker);
-      long traceId = unpackLong("trace_id", unpacker);
-      long spanId = unpackLong("span_id", unpacker);
-      long parentId = unpackLong("parent_id", unpacker);
-      long start = unpackLong("start", unpacker);
-      long duration = unpackLong("duration", unpacker);
-      String type = unpackString("type", unpacker);
-      int error = unpackInt("error", unpacker);
-
-      unpackKey("metrics", unpacker);
-      Map<String, Number> metrics = unpackMetrics(unpacker, spanId);
-
-      unpackKey("meta", unpacker);
-      Map<String, String> meta = unpackMeta(unpacker, spanId);
-
-      Map<String, Object> metaStruct = null;
-      if (size > 12) {
-        unpackKey("meta_struct", unpacker);
-        metaStruct = unpackMetaStruct(unpacker, spanId);
-      }
-
-      List<DecodedSpanLink> links = DecodedSpanLinks.fromMeta(meta);
-
-      return new SpanV04(
-          service,
-          name,
-          resource,
-          traceId,
-          spanId,
-          parentId,
-          start,
-          duration,
-          error,
-          type,
-          metrics,
-          meta,
-          metaStruct,
-          links);
-    } catch (Throwable t) {
-      if (t instanceof RuntimeException) {
-        throw (RuntimeException) t;
-      } else {
-        throw new IllegalArgumentException(t);
-      }
-    }
-  }
-
-  private static Map<String, Number> unpackMetrics(MessageUnpacker unpacker, long spanId)
-      throws IOException {
-    int metricsSize = unpacker.unpackMapHeader();
-    if (metricsSize < 0) {
-      throw new IllegalArgumentException(
-          "Negative meta map size " + metricsSize + " for span " + spanId);
+    static DecodedSpan[] unpackSpans(MessageUnpacker unpacker) {
+        try {
+            int size = unpacker.unpackArrayHeader();
+            if (size < 0) {
+                throw new IllegalArgumentException("Negative span array size " + size);
+            }
+            DecodedSpan[] spans = new DecodedSpan[size];
+            for (int i = 0; i < size; i++) {
+                spans[i] = unpack(unpacker);
+            }
+            return spans;
+        } catch (Throwable t) {
+            if (t instanceof RuntimeException) {
+                throw (RuntimeException) t;
+            } else {
+                throw new IllegalArgumentException(t);
+            }
+        }
     }
-    Map<String, Number> metrics = new HashMap<>(metricsSize);
-    for (int i = 0; i < metricsSize; i++) {
-      metrics.put(unpacker.unpackString(), unpackNumber(unpacker));
+
+    static SpanV04 unpack(MessageUnpacker unpacker) {
+        try {
+            int size = unpacker.unpackMapHeader();
+            if (size != 12 && size != 13) {
+                throw new IllegalArgumentException(
+                        "Wrong span element map size " + size + ". Expected 12 (plain) or 13 (with meta_struct).");
+            }
+
+            String service = unpackString("service", unpacker);
+            String name = unpackString("name", unpacker);
+            String resource = unpackString("resource", unpacker);
+            long traceId = unpackLong("trace_id", unpacker);
+            long spanId = unpackLong("span_id", unpacker);
+            long parentId = unpackLong("parent_id", unpacker);
+            long start = unpackLong("start", unpacker);
+            long duration = unpackLong("duration", unpacker);
+            String type = unpackString("type", unpacker);
+            int error = unpackInt("error", unpacker);
+
+            unpackKey("metrics", unpacker);
+            Map<String, Number> metrics = unpackMetrics(unpacker, spanId);
+
+            unpackKey("meta", unpacker);
+            Map<String, String> meta = unpackMeta(unpacker, spanId);
+
+            Map<String, Object> metaStruct = null;
+            if (size > 12) {
+                unpackKey("meta_struct", unpacker);
+                metaStruct = unpackMetaStruct(unpacker, spanId);
+            }
+
+            List<DecodedSpanLink> links = DecodedSpanLinks.fromMeta(meta);
+
+            return new SpanV04(
+                    service,
+                    name,
+                    resource,
+                    traceId,
+                    spanId,
+                    parentId,
+                    start,
+                    duration,
+                    error,
+                    type,
+                    metrics,
+                    meta,
+                    metaStruct,
+                    links);
+        } catch (Throwable t) {
+            if (t instanceof RuntimeException) {
+                throw (RuntimeException) t;
+            } else {
+                throw new IllegalArgumentException(t);
+            }
+        }
     }
-    return metrics;
-  }
-
-  private static Map<String, String> unpackMeta(MessageUnpacker unpacker, long spanId)
-      throws IOException {
-    int metaSize = unpacker.unpackMapHeader();
-    if (metaSize < 0) {
-      throw new IllegalArgumentException(
-          "Negative meta map size " + metaSize + " for span " + spanId);
+
+    private static Map<String, Number> unpackMetrics(MessageUnpacker unpacker, long spanId) throws IOException {
+        int metricsSize = unpacker.unpackMapHeader();
+        if (metricsSize < 0) {
+            throw new IllegalArgumentException("Negative meta map size " + metricsSize + " for span " + spanId);
+        }
+        Map<String, Number> metrics = new HashMap<>(metricsSize);
+        for (int i = 0; i < metricsSize; i++) {
+            metrics.put(unpacker.unpackString(), unpackNumber(unpacker));
+        }
+        return metrics;
     }
-    Map<String, String> meta = new HashMap<>(metaSize);
-    for (int i = 0; i < metaSize; i++) {
-      meta.put(unpacker.unpackString(), unpacker.unpackString());
+
+    private static Map<String, String> unpackMeta(MessageUnpacker unpacker, long spanId) throws IOException {
+        int metaSize = unpacker.unpackMapHeader();
+        if (metaSize < 0) {
+            throw new IllegalArgumentException("Negative meta map size " + metaSize + " for span " + spanId);
+        }
+        Map<String, String> meta = new HashMap<>(metaSize);
+        for (int i = 0; i < metaSize; i++) {
+            meta.put(unpacker.unpackString(), unpacker.unpackString());
+        }
+        return meta;
     }
-    return meta;
-  }
-
-  private static Map<String, Object> unpackMetaStruct(MessageUnpacker unpacker, long spanId)
-      throws IOException {
-    int metaSize = unpacker.unpackMapHeader();
-    if (metaSize < 0) {
-      throw new IllegalArgumentException(
-          "Negative meta map size " + metaSize + " for span " + spanId);
+
+    private static Map<String, Object> unpackMetaStruct(MessageUnpacker unpacker, long spanId) throws IOException {
+        int metaSize = unpacker.unpackMapHeader();
+        if (metaSize < 0) {
+            throw new IllegalArgumentException("Negative meta map size " + metaSize + " for span " + spanId);
+        }
+        Map<String, Object> result = new HashMap<>(metaSize);
+        for (int i = 0; i < metaSize; i++) {
+            final String key = unpacker.unpackString();
+            final int payloadSize = unpacker.unpackBinaryHeader();
+            final byte[] payload = unpacker.readPayload(payloadSize);
+            result.put(key, decodeObject(payload));
+        }
+        return result;
     }
-    Map<String, Object> result = new HashMap<>(metaSize);
-    for (int i = 0; i < metaSize; i++) {
-      final String key = unpacker.unpackString();
-      final int payloadSize = unpacker.unpackBinaryHeader();
-      final byte[] payload = unpacker.readPayload(payloadSize);
-      result.put(key, decodeObject(payload));
+
+    private static String unpackString(String expectedKey, MessageUnpacker unpacker) throws IOException {
+        unpackKey(expectedKey, unpacker);
+        if (unpacker.tryUnpackNil()) {
+            return null;
+        }
+        return unpacker.unpackString();
     }
-    return result;
-  }
-
-  private static String unpackString(String expectedKey, MessageUnpacker unpacker)
-      throws IOException {
-    unpackKey(expectedKey, unpacker);
-    if (unpacker.tryUnpackNil()) {
-      return null;
+
+    private static long unpackLong(String expectedKey, MessageUnpacker unpacker) throws IOException {
+        unpackKey(expectedKey, unpacker);
+        return unpacker.unpackLong();
     }
-    return unpacker.unpackString();
-  }
-
-  private static long unpackLong(String expectedKey, MessageUnpacker unpacker) throws IOException {
-    unpackKey(expectedKey, unpacker);
-    return unpacker.unpackLong();
-  }
-
-  private static int unpackInt(String expectedKey, MessageUnpacker unpacker) throws IOException {
-    unpackKey(expectedKey, unpacker);
-    return unpacker.unpackInt();
-  }
-
-  private static void unpackKey(String expectedKey, MessageUnpacker unpacker) throws IOException {
-    assert expectedKey.equals(unpacker.unpackString());
-  }
-
-  static Number unpackNumber(MessageUnpacker unpacker) {
-    Number result = null;
-    try {
-      ValueType valueType = unpacker.getNextFormat().getValueType();
-      switch (valueType) {
-        case INTEGER:
-          try {
-            result = unpacker.unpackInt();
-          } catch (MessageIntegerOverflowException e) {
-            result = unpacker.unpackLong();
-          }
-          break;
-        case FLOAT:
-          result = unpacker.unpackDouble();
-          break;
-        default:
-          throw new IllegalArgumentException(
-              "Failed to decode number. Unexpected value type " + valueType);
-      }
-    } catch (IOException e) {
-      throw new IllegalArgumentException("Failed to decode number.", e);
+
+    private static int unpackInt(String expectedKey, MessageUnpacker unpacker) throws IOException {
+        unpackKey(expectedKey, unpacker);
+        return unpacker.unpackInt();
     }
-    return result;
-  }
-
-  private static Object decodeObject(final byte[] input) {
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(input);
-    try {
-      final Value value = unpacker.unpackValue();
-      return convertValueToObject(value);
-    } catch (IOException e) {
-      throw new IllegalArgumentException("Failed to decode object.", e);
+
+    private static void unpackKey(String expectedKey, MessageUnpacker unpacker) throws IOException {
+        assert expectedKey.equals(unpacker.unpackString());
     }
-  }
-
-  private static Object convertValueToObject(final Value value) {
-    switch (value.getValueType()) {
-      case NIL:
-        return null;
-      case BOOLEAN:
-        return value.asBooleanValue().getBoolean();
-      case INTEGER:
-        return value.asIntegerValue().toLong();
-      case FLOAT:
-        return value.asFloatValue().toFloat();
-      case BINARY:
-        return value.asBinaryValue().asByteArray();
-      case STRING:
-        return value.asStringValue().asString();
-      case ARRAY:
-        final List<Value> array = value.asArrayValue().list();
-        final List<Object> result = new ArrayList<>(array.size());
-        for (final Value element : array) {
-          result.add(convertValueToObject(element));
+
+    static Number unpackNumber(MessageUnpacker unpacker) {
+        Number result = null;
+        try {
+            ValueType valueType = unpacker.getNextFormat().getValueType();
+            switch (valueType) {
+                case INTEGER:
+                    try {
+                        result = unpacker.unpackInt();
+                    } catch (MessageIntegerOverflowException e) {
+                        result = unpacker.unpackLong();
+                    }
+                    break;
+                case FLOAT:
+                    result = unpacker.unpackDouble();
+                    break;
+                default:
+                    throw new IllegalArgumentException("Failed to decode number. Unexpected value type " + valueType);
+            }
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Failed to decode number.", e);
         }
         return result;
-      case MAP:
-        final Map<Value, Value> map = value.asMapValue().map();
-        final Map<String, Object> resultMap = new HashMap<>(map.size());
-        for (final Map.Entry<Value, Value> entry : map.entrySet()) {
-          resultMap.put(
-              entry.getKey().asStringValue().asString(), convertValueToObject(entry.getValue()));
+    }
+
+    private static Object decodeObject(final byte[] input) {
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(input);
+        try {
+            final Value value = unpacker.unpackValue();
+            return convertValueToObject(value);
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Failed to decode object.", e);
+        }
+    }
+
+    private static Object convertValueToObject(final Value value) {
+        switch (value.getValueType()) {
+            case NIL:
+                return null;
+            case BOOLEAN:
+                return value.asBooleanValue().getBoolean();
+            case INTEGER:
+                return value.asIntegerValue().toLong();
+            case FLOAT:
+                return value.asFloatValue().toFloat();
+            case BINARY:
+                return value.asBinaryValue().asByteArray();
+            case STRING:
+                return value.asStringValue().asString();
+            case ARRAY:
+                final List<Value> array = value.asArrayValue().list();
+                final List<Object> result = new ArrayList<>(array.size());
+                for (final Value element : array) {
+                    result.add(convertValueToObject(element));
+                }
+                return result;
+            case MAP:
+                final Map<Value, Value> map = value.asMapValue().map();
+                final Map<String, Object> resultMap = new HashMap<>(map.size());
+                for (final Map.Entry<Value, Value> entry : map.entrySet()) {
+                    resultMap.put(entry.getKey().asStringValue().asString(), convertValueToObject(entry.getValue()));
+                }
+                return resultMap;
+            default:
+                throw new IllegalArgumentException(
+                        "Failed to convert value to object. Unexpected value type " + value.getValueType());
         }
-        return resultMap;
-      default:
-        throw new IllegalArgumentException(
-            "Failed to convert value to object. Unexpected value type " + value.getValueType());
     }
-  }
-
-  private final String service;
-  private final String name;
-  private final String resource;
-  private final long traceId;
-  private final long spanId;
-  private final long parentId;
-  private final long start;
-  private final long duration;
-  private final int error;
-  private final Map<String, String> meta;
-  private final Map<String, Object> metaStruct;
-  private final Map<String, Number> metrics;
-  private final String type;
-  private final List<DecodedSpanLink> links;
-
-  public SpanV04(
-      String service,
-      String name,
-      String resource,
-      long traceId,
-      long spanId,
-      long parentId,
-      long start,
-      long duration,
-      int error,
-      String type,
-      Map<String, Number> metrics,
-      Map<String, String> meta,
-      Map<String, Object> metaStruct,
-      List<DecodedSpanLink> links) {
-    this.service = service;
-    this.name = name;
-    this.resource = resource;
-    this.traceId = traceId;
-    this.spanId = spanId;
-    this.parentId = parentId;
-    this.start = start;
-    this.duration = duration;
-    this.error = error;
-    this.meta = unmodifiableMap(meta);
-    this.metaStruct = metaStruct == null ? emptyMap() : unmodifiableMap(metaStruct);
-    this.metrics = unmodifiableMap(metrics);
-    this.type = type;
-    this.links = links;
-  }
-
-  public String getService() {
-    return service;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public String getResource() {
-    return resource;
-  }
-
-  public long getTraceId() {
-    return traceId;
-  }
-
-  public long getSpanId() {
-    return spanId;
-  }
-
-  public long getParentId() {
-    return parentId;
-  }
-
-  public long getStart() {
-    return start;
-  }
-
-  public long getDuration() {
-    return duration;
-  }
-
-  public int getError() {
-    return error;
-  }
-
-  public Map<String, String> getMeta() {
-    return meta;
-  }
-
-  public Map<String, Object> getMetaStruct() {
-    return metaStruct;
-  }
-
-  public Map<String, Number> getMetrics() {
-    return metrics;
-  }
-
-  public String getType() {
-    return type;
-  }
-
-  @Override
-  public List<DecodedSpanLink> getLinks() {
-    return links;
-  }
-
-  @Override
-  public String toString() {
-    return "SpanV04{"
-        + "service='"
-        + service
-        + '\''
-        + ", name='"
-        + name
-        + '\''
-        + ", resource='"
-        + resource
-        + '\''
-        + ", traceId="
-        + traceId
-        + ", spanId="
-        + spanId
-        + ", parentId="
-        + parentId
-        + ", start="
-        + start
-        + ", duration="
-        + duration
-        + ", error="
-        + error
-        + ", meta="
-        + meta
-        + ", metaStruct="
-        + metaStruct
-        + ", metrics="
-        + metrics
-        + ", type='"
-        + type
-        + "', links="
-        + links
-        + '}';
-  }
+
+    private final String service;
+    private final String name;
+    private final String resource;
+    private final long traceId;
+    private final long spanId;
+    private final long parentId;
+    private final long start;
+    private final long duration;
+    private final int error;
+    private final Map<String, String> meta;
+    private final Map<String, Object> metaStruct;
+    private final Map<String, Number> metrics;
+    private final String type;
+    private final List<DecodedSpanLink> links;
+
+    public SpanV04(
+            String service,
+            String name,
+            String resource,
+            long traceId,
+            long spanId,
+            long parentId,
+            long start,
+            long duration,
+            int error,
+            String type,
+            Map<String, Number> metrics,
+            Map<String, String> meta,
+            Map<String, Object> metaStruct,
+            List<DecodedSpanLink> links) {
+        this.service = service;
+        this.name = name;
+        this.resource = resource;
+        this.traceId = traceId;
+        this.spanId = spanId;
+        this.parentId = parentId;
+        this.start = start;
+        this.duration = duration;
+        this.error = error;
+        this.meta = unmodifiableMap(meta);
+        this.metaStruct = metaStruct == null ? emptyMap() : unmodifiableMap(metaStruct);
+        this.metrics = unmodifiableMap(metrics);
+        this.type = type;
+        this.links = links;
+    }
+
+    public String getService() {
+        return service;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getResource() {
+        return resource;
+    }
+
+    public long getTraceId() {
+        return traceId;
+    }
+
+    public long getSpanId() {
+        return spanId;
+    }
+
+    public long getParentId() {
+        return parentId;
+    }
+
+    public long getStart() {
+        return start;
+    }
+
+    public long getDuration() {
+        return duration;
+    }
+
+    public int getError() {
+        return error;
+    }
+
+    public Map<String, String> getMeta() {
+        return meta;
+    }
+
+    public Map<String, Object> getMetaStruct() {
+        return metaStruct;
+    }
+
+    public Map<String, Number> getMetrics() {
+        return metrics;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public List<DecodedSpanLink> getLinks() {
+        return links;
+    }
+
+    @Override
+    public String toString() {
+        return "SpanV04{"
+                + "service='"
+                + service
+                + '\''
+                + ", name='"
+                + name
+                + '\''
+                + ", resource='"
+                + resource
+                + '\''
+                + ", traceId="
+                + traceId
+                + ", spanId="
+                + spanId
+                + ", parentId="
+                + parentId
+                + ", start="
+                + start
+                + ", duration="
+                + duration
+                + ", error="
+                + error
+                + ", meta="
+                + meta
+                + ", metaStruct="
+                + metaStruct
+                + ", metrics="
+                + metrics
+                + ", type='"
+                + type
+                + "', links="
+                + links
+                + '}';
+    }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v04/raw/TraceV04.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v04/raw/TraceV04.java
index 1eccc685c5c..0885e517b69 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v04/raw/TraceV04.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v04/raw/TraceV04.java
@@ -8,41 +8,41 @@
 import org.msgpack.core.MessageUnpacker;
 
 public class TraceV04 implements DecodedTrace {
-  public static DecodedTrace[] unpackTraces(MessageUnpacker unpacker) {
-    try {
-      int size = unpacker.unpackArrayHeader();
-      if (size < 0) {
-        throw new IllegalArgumentException("Negative trace array size " + size);
-      }
-      DecodedTrace[] traces = new TraceV04[size];
-      for (int i = 0; i < size; i++) {
-        traces[i] = unpack(unpacker);
-      }
-      return traces;
-    } catch (Throwable t) {
-      if (t instanceof RuntimeException) {
-        throw (RuntimeException) t;
-      } else {
-        throw new IllegalArgumentException(t);
-      }
+    public static DecodedTrace[] unpackTraces(MessageUnpacker unpacker) {
+        try {
+            int size = unpacker.unpackArrayHeader();
+            if (size < 0) {
+                throw new IllegalArgumentException("Negative trace array size " + size);
+            }
+            DecodedTrace[] traces = new TraceV04[size];
+            for (int i = 0; i < size; i++) {
+                traces[i] = unpack(unpacker);
+            }
+            return traces;
+        } catch (Throwable t) {
+            if (t instanceof RuntimeException) {
+                throw (RuntimeException) t;
+            } else {
+                throw new IllegalArgumentException(t);
+            }
+        }
     }
-  }
 
-  public static TraceV04 unpack(MessageUnpacker unpacker) {
-    return new TraceV04(SpanV04.unpackSpans(unpacker));
-  }
+    public static TraceV04 unpack(MessageUnpacker unpacker) {
+        return new TraceV04(SpanV04.unpackSpans(unpacker));
+    }
 
-  private final DecodedSpan[] spans;
+    private final DecodedSpan[] spans;
 
-  private TraceV04(DecodedSpan[] spans) {
-    this.spans = spans;
-  }
+    private TraceV04(DecodedSpan[] spans) {
+        this.spans = spans;
+    }
 
-  @Override
-  public List<DecodedSpan> getSpans() {
-    if (spans.length == 0) {
-      return Collections.emptyList();
+    @Override
+    public List<DecodedSpan> getSpans() {
+        if (spans.length == 0) {
+            return Collections.emptyList();
+        }
+        return Collections.unmodifiableList(Arrays.asList(spans));
     }
-    return Collections.unmodifiableList(Arrays.asList(spans));
-  }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v05/raw/DictionaryV05.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v05/raw/DictionaryV05.java
index 5e431c84166..ecf6b9eb62d 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v05/raw/DictionaryV05.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v05/raw/DictionaryV05.java
@@ -3,33 +3,33 @@
 import org.msgpack.core.MessageUnpacker;
 
 public class DictionaryV05 {
-  static DictionaryV05 unpack(MessageUnpacker unpacker) {
-    try {
-      int size = unpacker.unpackArrayHeader();
-      if (size < 0) {
-        throw new IllegalArgumentException("Negative dictionary size " + size);
-      }
-      String[] strings = new String[size];
-      for (int i = 0; i < size; i++) {
-        strings[i] = unpacker.unpackString();
-      }
-      return new DictionaryV05(strings);
-    } catch (Throwable t) {
-      if (t instanceof RuntimeException) {
-        throw (RuntimeException) t;
-      } else {
-        throw new IllegalArgumentException(t);
-      }
+    static DictionaryV05 unpack(MessageUnpacker unpacker) {
+        try {
+            int size = unpacker.unpackArrayHeader();
+            if (size < 0) {
+                throw new IllegalArgumentException("Negative dictionary size " + size);
+            }
+            String[] strings = new String[size];
+            for (int i = 0; i < size; i++) {
+                strings[i] = unpacker.unpackString();
+            }
+            return new DictionaryV05(strings);
+        } catch (Throwable t) {
+            if (t instanceof RuntimeException) {
+                throw (RuntimeException) t;
+            } else {
+                throw new IllegalArgumentException(t);
+            }
+        }
     }
-  }
 
-  private final String[] strings;
+    private final String[] strings;
 
-  public DictionaryV05(String[] strings) {
-    this.strings = strings;
-  }
+    public DictionaryV05(String[] strings) {
+        this.strings = strings;
+    }
 
-  public String at(int index) {
-    return strings[index];
-  }
+    public String at(int index) {
+        return strings[index];
+    }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v05/raw/MessageV05.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v05/raw/MessageV05.java
index 77264136d39..b2b5cbdc1ec 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v05/raw/MessageV05.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v05/raw/MessageV05.java
@@ -10,43 +10,43 @@
 import org.msgpack.core.MessageUnpacker;
 
 public class MessageV05 implements DecodedMessage {
-  public static MessageV05 unpack(ByteBuffer buffer) {
-    return unpack(MessagePack.DEFAULT_UNPACKER_CONFIG.newUnpacker(buffer));
-  }
+    public static MessageV05 unpack(ByteBuffer buffer) {
+        return unpack(MessagePack.DEFAULT_UNPACKER_CONFIG.newUnpacker(buffer));
+    }
 
-  public static MessageV05 unpack(byte[] buffer) {
-    return unpack(MessagePack.DEFAULT_UNPACKER_CONFIG.newUnpacker(buffer));
-  }
+    public static MessageV05 unpack(byte[] buffer) {
+        return unpack(MessagePack.DEFAULT_UNPACKER_CONFIG.newUnpacker(buffer));
+    }
 
-  static MessageV05 unpack(MessageUnpacker unpacker) {
-    try {
-      int size = unpacker.unpackArrayHeader();
-      if (size != 2) {
-        throw new IllegalArgumentException("MessageV05 array size " + size + " != 2");
-      }
-      DictionaryV05 dictionary = DictionaryV05.unpack(unpacker);
-      DecodedTrace[] traces = TraceV05.unpackTraces(unpacker, dictionary);
-      return new MessageV05(traces);
-    } catch (Throwable t) {
-      if (t instanceof RuntimeException) {
-        throw (RuntimeException) t;
-      } else {
-        throw new IllegalArgumentException(t);
-      }
+    static MessageV05 unpack(MessageUnpacker unpacker) {
+        try {
+            int size = unpacker.unpackArrayHeader();
+            if (size != 2) {
+                throw new IllegalArgumentException("MessageV05 array size " + size + " != 2");
+            }
+            DictionaryV05 dictionary = DictionaryV05.unpack(unpacker);
+            DecodedTrace[] traces = TraceV05.unpackTraces(unpacker, dictionary);
+            return new MessageV05(traces);
+        } catch (Throwable t) {
+            if (t instanceof RuntimeException) {
+                throw (RuntimeException) t;
+            } else {
+                throw new IllegalArgumentException(t);
+            }
+        }
     }
-  }
 
-  private final DecodedTrace[] traces;
+    private final DecodedTrace[] traces;
 
-  private MessageV05(DecodedTrace[] traces) {
-    this.traces = traces;
-  }
+    private MessageV05(DecodedTrace[] traces) {
+        this.traces = traces;
+    }
 
-  @Override
-  public List<DecodedTrace> getTraces() {
-    if (traces.length == 0) {
-      return Collections.emptyList();
+    @Override
+    public List<DecodedTrace> getTraces() {
+        if (traces.length == 0) {
+            return Collections.emptyList();
+        }
+        return Collections.unmodifiableList(Arrays.asList(traces));
     }
-    return Collections.unmodifiableList(Arrays.asList(traces));
-  }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v05/raw/SpanV05.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v05/raw/SpanV05.java
index 1a3c0b4333b..715dbd7f730 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v05/raw/SpanV05.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v05/raw/SpanV05.java
@@ -15,239 +15,234 @@
 import org.msgpack.value.ValueType;
 
 public class SpanV05 implements DecodedSpan {
-  static DecodedSpan[] unpackSpans(MessageUnpacker unpacker, DictionaryV05 dictionary) {
-    try {
-      int size = unpacker.unpackArrayHeader();
-      if (size < 0) {
-        throw new IllegalArgumentException("Negative span array size " + size);
-      }
-      DecodedSpan[] spans = new DecodedSpan[size];
-      for (int i = 0; i < size; i++) {
-        spans[i] = unpack(unpacker, dictionary);
-      }
-      return spans;
-    } catch (Throwable t) {
-      if (t instanceof RuntimeException) {
-        throw (RuntimeException) t;
-      } else {
-        throw new IllegalArgumentException(t);
-      }
-    }
-  }
-
-  static SpanV05 unpack(MessageUnpacker unpacker, DictionaryV05 dictionary) {
-    try {
-      int size = unpacker.unpackArrayHeader();
-      if (size != 12) {
-        throw new IllegalArgumentException(
-            "Wrong span element array size " + size + ". Expected 12.");
-      }
-      String service = unpackString(unpacker, dictionary); // index into dictionary
-      String name = unpackString(unpacker, dictionary); // index into dictionary
-      String resource = unpackString(unpacker, dictionary); // index into dictionary
-      long traceId = unpacker.unpackLong();
-      long spanId = unpacker.unpackLong();
-      long parentId = unpacker.unpackLong();
-      long start = unpacker.unpackLong();
-      long duration = unpacker.unpackLong();
-      int error = unpacker.unpackInt();
-      int metaSize = unpacker.unpackMapHeader();
-      if (metaSize < 0) {
-        throw new IllegalArgumentException(
-            "Negative meta map size " + metaSize + " for span " + spanId);
-      }
-      Map<String, String> meta = new HashMap<>(metaSize);
-      for (int i = 0; i < metaSize; i++) {
-        meta.put(unpackString(unpacker, dictionary), unpackString(unpacker, dictionary));
-      }
-      int metricsSize = unpacker.unpackMapHeader();
-      if (metricsSize < 0) {
-        throw new IllegalArgumentException(
-            "Negative metrics map size " + metaSize + " for span " + spanId);
-      }
-      Map<String, Number> metrics = new HashMap<>(metricsSize);
-      for (int i = 0; i < metricsSize; i++) {
-        metrics.put(unpackString(unpacker, dictionary), unpackNumber(unpacker));
-      }
-      String type = unpackString(unpacker, dictionary); // index into dictionary
-
-      List<DecodedSpanLink> links = DecodedSpanLinks.fromMeta(meta);
-
-      return new SpanV05(
-          service, name, resource, traceId, spanId, parentId, start, duration, error, meta, metrics,
-          type, links);
-    } catch (Throwable t) {
-      if (t instanceof RuntimeException) {
-        throw (RuntimeException) t;
-      } else {
-        throw new IllegalArgumentException(t);
-      }
-    }
-  }
-
-  static String unpackString(MessageUnpacker unpacker, DictionaryV05 dictionary)
-      throws IOException {
-    return dictionary.at(unpacker.unpackInt());
-  }
-
-  static Number unpackNumber(MessageUnpacker unpacker) {
-    Number result = null;
-    try {
-      ValueType valueType = unpacker.getNextFormat().getValueType();
-      switch (valueType) {
-        case INTEGER:
-          try {
-            result = unpacker.unpackInt();
-          } catch (MessageIntegerOverflowException e) {
-            result = unpacker.unpackLong();
-          }
-          break;
-        case FLOAT:
-          result = unpacker.unpackDouble();
-          break;
-        default:
-          throw new IllegalArgumentException(
-              "Failed to decode number. Unexpected value type " + valueType);
-      }
-    } catch (IOException e) {
-      throw new IllegalArgumentException("Failed to decode number.", e);
-    }
-    return result;
-  }
-
-  private final String service; // index into dictionary
-  private final String name; // index into dictionary
-  private final String resource; // index into dictionary
-  private final long traceId;
-  private final long spanId;
-  private final long parentId;
-  private final long start;
-  private final long duration;
-  private final int error;
-  private final Map<String, String> meta; // index -> index
-  private final Map<String, Number> metrics; // index -> metric
-  private final String type; // index into dictionary
-  private final List<DecodedSpanLink> links;
-
-  public SpanV05(
-      String service,
-      String name,
-      String resource,
-      long traceId,
-      long spanId,
-      long parentId,
-      long start,
-      long duration,
-      int error,
-      Map<String, String> meta,
-      Map<String, Number> metrics,
-      String type,
-      List<DecodedSpanLink> links) {
-    this.service = service;
-    this.name = name;
-    this.resource = resource;
-    this.traceId = traceId;
-    this.spanId = spanId;
-    this.parentId = parentId;
-    this.start = start;
-    this.duration = duration;
-    this.error = error;
-    this.meta = Collections.unmodifiableMap(meta);
-    this.metrics = Collections.unmodifiableMap(metrics);
-    this.type = type;
-    this.links = links;
-  }
-
-  public String getService() {
-    return service;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public String getResource() {
-    return resource;
-  }
-
-  public long getTraceId() {
-    return traceId;
-  }
-
-  public long getSpanId() {
-    return spanId;
-  }
-
-  public long getParentId() {
-    return parentId;
-  }
-
-  public long getStart() {
-    return start;
-  }
-
-  public long getDuration() {
-    return duration;
-  }
-
-  public int getError() {
-    return error;
-  }
-
-  public Map<String, String> getMeta() {
-    return meta;
-  }
-
-  public Map<String, Object> getMetaStruct() {
-    // XXX: meta_struct is not supported in v0.5.
-    return emptyMap();
-  }
-
-  public Map<String, Number> getMetrics() {
-    return metrics;
-  }
-
-  public String getType() {
-    return type;
-  }
-
-  @Override
-  public List<DecodedSpanLink> getLinks() {
-    return links;
-  }
-
-  @Override
-  public String toString() {
-    return "SpanV05{"
-        + "service='"
-        + service
-        + '\''
-        + ", name='"
-        + name
-        + '\''
-        + ", resource='"
-        + resource
-        + '\''
-        + ", traceId="
-        + traceId
-        + ", spanId="
-        + spanId
-        + ", parentId="
-        + parentId
-        + ", start="
-        + start
-        + ", duration="
-        + duration
-        + ", error="
-        + error
-        + ", meta="
-        + meta
-        + ", metrics="
-        + metrics
-        + ", type='"
-        + type
-        + "', links="
-        + links
-        + '}';
-  }
+    static DecodedSpan[] unpackSpans(MessageUnpacker unpacker, DictionaryV05 dictionary) {
+        try {
+            int size = unpacker.unpackArrayHeader();
+            if (size < 0) {
+                throw new IllegalArgumentException("Negative span array size " + size);
+            }
+            DecodedSpan[] spans = new DecodedSpan[size];
+            for (int i = 0; i < size; i++) {
+                spans[i] = unpack(unpacker, dictionary);
+            }
+            return spans;
+        } catch (Throwable t) {
+            if (t instanceof RuntimeException) {
+                throw (RuntimeException) t;
+            } else {
+                throw new IllegalArgumentException(t);
+            }
+        }
+    }
+
+    static SpanV05 unpack(MessageUnpacker unpacker, DictionaryV05 dictionary) {
+        try {
+            int size = unpacker.unpackArrayHeader();
+            if (size != 12) {
+                throw new IllegalArgumentException("Wrong span element array size " + size + ". Expected 12.");
+            }
+            String service = unpackString(unpacker, dictionary); // index into dictionary
+            String name = unpackString(unpacker, dictionary); // index into dictionary
+            String resource = unpackString(unpacker, dictionary); // index into dictionary
+            long traceId = unpacker.unpackLong();
+            long spanId = unpacker.unpackLong();
+            long parentId = unpacker.unpackLong();
+            long start = unpacker.unpackLong();
+            long duration = unpacker.unpackLong();
+            int error = unpacker.unpackInt();
+            int metaSize = unpacker.unpackMapHeader();
+            if (metaSize < 0) {
+                throw new IllegalArgumentException("Negative meta map size " + metaSize + " for span " + spanId);
+            }
+            Map<String, String> meta = new HashMap<>(metaSize);
+            for (int i = 0; i < metaSize; i++) {
+                meta.put(unpackString(unpacker, dictionary), unpackString(unpacker, dictionary));
+            }
+            int metricsSize = unpacker.unpackMapHeader();
+            if (metricsSize < 0) {
+                throw new IllegalArgumentException("Negative metrics map size " + metaSize + " for span " + spanId);
+            }
+            Map<String, Number> metrics = new HashMap<>(metricsSize);
+            for (int i = 0; i < metricsSize; i++) {
+                metrics.put(unpackString(unpacker, dictionary), unpackNumber(unpacker));
+            }
+            String type = unpackString(unpacker, dictionary); // index into dictionary
+
+            List<DecodedSpanLink> links = DecodedSpanLinks.fromMeta(meta);
+
+            return new SpanV05(
+                    service, name, resource, traceId, spanId, parentId, start, duration, error, meta, metrics, type,
+                    links);
+        } catch (Throwable t) {
+            if (t instanceof RuntimeException) {
+                throw (RuntimeException) t;
+            } else {
+                throw new IllegalArgumentException(t);
+            }
+        }
+    }
+
+    static String unpackString(MessageUnpacker unpacker, DictionaryV05 dictionary) throws IOException {
+        return dictionary.at(unpacker.unpackInt());
+    }
+
+    static Number unpackNumber(MessageUnpacker unpacker) {
+        Number result = null;
+        try {
+            ValueType valueType = unpacker.getNextFormat().getValueType();
+            switch (valueType) {
+                case INTEGER:
+                    try {
+                        result = unpacker.unpackInt();
+                    } catch (MessageIntegerOverflowException e) {
+                        result = unpacker.unpackLong();
+                    }
+                    break;
+                case FLOAT:
+                    result = unpacker.unpackDouble();
+                    break;
+                default:
+                    throw new IllegalArgumentException("Failed to decode number. Unexpected value type " + valueType);
+            }
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Failed to decode number.", e);
+        }
+        return result;
+    }
+
+    private final String service; // index into dictionary
+    private final String name; // index into dictionary
+    private final String resource; // index into dictionary
+    private final long traceId;
+    private final long spanId;
+    private final long parentId;
+    private final long start;
+    private final long duration;
+    private final int error;
+    private final Map<String, String> meta; // index -> index
+    private final Map<String, Number> metrics; // index -> metric
+    private final String type; // index into dictionary
+    private final List<DecodedSpanLink> links;
+
+    public SpanV05(
+            String service,
+            String name,
+            String resource,
+            long traceId,
+            long spanId,
+            long parentId,
+            long start,
+            long duration,
+            int error,
+            Map<String, String> meta,
+            Map<String, Number> metrics,
+            String type,
+            List<DecodedSpanLink> links) {
+        this.service = service;
+        this.name = name;
+        this.resource = resource;
+        this.traceId = traceId;
+        this.spanId = spanId;
+        this.parentId = parentId;
+        this.start = start;
+        this.duration = duration;
+        this.error = error;
+        this.meta = Collections.unmodifiableMap(meta);
+        this.metrics = Collections.unmodifiableMap(metrics);
+        this.type = type;
+        this.links = links;
+    }
+
+    public String getService() {
+        return service;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getResource() {
+        return resource;
+    }
+
+    public long getTraceId() {
+        return traceId;
+    }
+
+    public long getSpanId() {
+        return spanId;
+    }
+
+    public long getParentId() {
+        return parentId;
+    }
+
+    public long getStart() {
+        return start;
+    }
+
+    public long getDuration() {
+        return duration;
+    }
+
+    public int getError() {
+        return error;
+    }
+
+    public Map<String, String> getMeta() {
+        return meta;
+    }
+
+    public Map<String, Object> getMetaStruct() {
+        // XXX: meta_struct is not supported in v0.5.
+        return emptyMap();
+    }
+
+    public Map<String, Number> getMetrics() {
+        return metrics;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public List<DecodedSpanLink> getLinks() {
+        return links;
+    }
+
+    @Override
+    public String toString() {
+        return "SpanV05{"
+                + "service='"
+                + service
+                + '\''
+                + ", name='"
+                + name
+                + '\''
+                + ", resource='"
+                + resource
+                + '\''
+                + ", traceId="
+                + traceId
+                + ", spanId="
+                + spanId
+                + ", parentId="
+                + parentId
+                + ", start="
+                + start
+                + ", duration="
+                + duration
+                + ", error="
+                + error
+                + ", meta="
+                + meta
+                + ", metrics="
+                + metrics
+                + ", type='"
+                + type
+                + "', links="
+                + links
+                + '}';
+    }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v05/raw/TraceV05.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v05/raw/TraceV05.java
index eb8f26e08bb..828896ecd26 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v05/raw/TraceV05.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v05/raw/TraceV05.java
@@ -8,41 +8,41 @@
 import org.msgpack.core.MessageUnpacker;
 
 public class TraceV05 implements DecodedTrace {
-  public static DecodedTrace[] unpackTraces(MessageUnpacker unpacker, DictionaryV05 dictionary) {
-    try {
-      int size = unpacker.unpackArrayHeader();
-      if (size < 0) {
-        throw new IllegalArgumentException("Negative trace array size " + size);
-      }
-      DecodedTrace[] traces = new TraceV05[size];
-      for (int i = 0; i < size; i++) {
-        traces[i] = unpack(unpacker, dictionary);
-      }
-      return traces;
-    } catch (Throwable t) {
-      if (t instanceof RuntimeException) {
-        throw (RuntimeException) t;
-      } else {
-        throw new IllegalArgumentException(t);
-      }
+    public static DecodedTrace[] unpackTraces(MessageUnpacker unpacker, DictionaryV05 dictionary) {
+        try {
+            int size = unpacker.unpackArrayHeader();
+            if (size < 0) {
+                throw new IllegalArgumentException("Negative trace array size " + size);
+            }
+            DecodedTrace[] traces = new TraceV05[size];
+            for (int i = 0; i < size; i++) {
+                traces[i] = unpack(unpacker, dictionary);
+            }
+            return traces;
+        } catch (Throwable t) {
+            if (t instanceof RuntimeException) {
+                throw (RuntimeException) t;
+            } else {
+                throw new IllegalArgumentException(t);
+            }
+        }
     }
-  }
 
-  public static TraceV05 unpack(MessageUnpacker unpacker, DictionaryV05 dictionary) {
-    return new TraceV05(SpanV05.unpackSpans(unpacker, dictionary));
-  }
+    public static TraceV05 unpack(MessageUnpacker unpacker, DictionaryV05 dictionary) {
+        return new TraceV05(SpanV05.unpackSpans(unpacker, dictionary));
+    }
 
-  private final DecodedSpan[] spans;
+    private final DecodedSpan[] spans;
 
-  private TraceV05(DecodedSpan[] spans) {
-    this.spans = spans;
-  }
+    private TraceV05(DecodedSpan[] spans) {
+        this.spans = spans;
+    }
 
-  @Override
-  public List<DecodedSpan> getSpans() {
-    if (spans.length == 0) {
-      return Collections.emptyList();
+    @Override
+    public List<DecodedSpan> getSpans() {
+        if (spans.length == 0) {
+            return Collections.emptyList();
+        }
+        return Collections.unmodifiableList(Arrays.asList(spans));
     }
-    return Collections.unmodifiableList(Arrays.asList(spans));
-  }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/MessageV1.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/MessageV1.java
index 6bde9aa851d..339ddc1efda 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/MessageV1.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/MessageV1.java
@@ -14,98 +14,97 @@
 
 /** MessageV1 decodes V1.0 trace payload format. */
 public class MessageV1 implements DecodedMessage {
-  // Tracer Payload field IDs
-  static final int FIELD_CHUNKS = 11;
+    // Tracer Payload field IDs
+    static final int FIELD_CHUNKS = 11;
 
-  public static MessageV1 unpack(ByteBuffer buffer) {
-    return unpack(MessagePack.DEFAULT_UNPACKER_CONFIG.newUnpacker(buffer));
-  }
+    public static MessageV1 unpack(ByteBuffer buffer) {
+        return unpack(MessagePack.DEFAULT_UNPACKER_CONFIG.newUnpacker(buffer));
+    }
+
+    public static MessageV1 unpack(byte[] buffer) {
+        return unpack(MessagePack.DEFAULT_UNPACKER_CONFIG.newUnpacker(buffer));
+    }
 
-  public static MessageV1 unpack(byte[] buffer) {
-    return unpack(MessagePack.DEFAULT_UNPACKER_CONFIG.newUnpacker(buffer));
-  }
+    static MessageV1 unpack(MessageUnpacker unpacker) {
+        try {
+            // Initialize string table for streaming string decoding
+            // Index 0 is reserved for empty string
+            List<String> stringTable = new ArrayList<>();
+            stringTable.add("");
 
-  static MessageV1 unpack(MessageUnpacker unpacker) {
-    try {
-      // Initialize string table for streaming string decoding
-      // Index 0 is reserved for empty string
-      List<String> stringTable = new ArrayList<>();
-      stringTable.add("");
+            // Check what format we have
+            if (!unpacker.hasNext()) {
+                return new MessageV1(new DecodedTrace[0]);
+            }
 
-      // Check what format we have
-      if (!unpacker.hasNext()) {
-        return new MessageV1(new DecodedTrace[0]);
-      }
+            ValueType firstType = unpacker.getNextFormat().getValueType();
+            List<DecodedTrace> traces = new ArrayList<>();
 
-      ValueType firstType = unpacker.getNextFormat().getValueType();
-      List<DecodedTrace> traces = new ArrayList<>();
+            if (firstType == ValueType.MAP) {
+                // Full payload format: map with FIELD_CHUNKS containing trace chunks.
+                int mapSize = unpacker.unpackMapHeader();
 
-      if (firstType == ValueType.MAP) {
-        // Full payload format: map with FIELD_CHUNKS containing trace chunks.
-        int mapSize = unpacker.unpackMapHeader();
+                for (int i = 0; i < mapSize; i++) {
+                    int fieldId = unpacker.unpackInt();
+                    if (fieldId == FIELD_CHUNKS) {
+                        // This is an array of traces
+                        DecodedTrace[] traceArray = TraceV1.unpackTraces(unpacker, stringTable);
+                        traces.addAll(Arrays.asList(traceArray));
+                    } else {
+                        // Keep string table aligned while skipping known header fields.
+                        skipPayloadField(unpacker, fieldId, stringTable);
+                    }
+                }
+            } else {
+                throw new IllegalArgumentException("Expected Map at start of V1.0 payload, got: " + firstType);
+            }
 
-        for (int i = 0; i < mapSize; i++) {
-          int fieldId = unpacker.unpackInt();
-          if (fieldId == FIELD_CHUNKS) {
-            // This is an array of traces
-            DecodedTrace[] traceArray = TraceV1.unpackTraces(unpacker, stringTable);
-            traces.addAll(Arrays.asList(traceArray));
-          } else {
-            // Keep string table aligned while skipping known header fields.
-            skipPayloadField(unpacker, fieldId, stringTable);
-          }
+            return new MessageV1(traces.toArray(new DecodedTrace[0]));
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Failed to decode V1.0 message", e);
+        } catch (Throwable t) {
+            if (t instanceof RuntimeException) {
+                throw (RuntimeException) t;
+            } else {
+                throw new IllegalArgumentException(t);
+            }
         }
-      } else {
-        throw new IllegalArgumentException(
-            "Expected Map at start of V1.0 payload, got: " + firstType);
-      }
-
-      return new MessageV1(traces.toArray(new DecodedTrace[0]));
-    } catch (IOException e) {
-      throw new IllegalArgumentException("Failed to decode V1.0 message", e);
-    } catch (Throwable t) {
-      if (t instanceof RuntimeException) {
-        throw (RuntimeException) t;
-      } else {
-        throw new IllegalArgumentException(t);
-      }
     }
-  }
 
-  private final DecodedTrace[] traces;
+    private final DecodedTrace[] traces;
 
-  private static void skipPayloadField(
-      MessageUnpacker unpacker, int fieldId, List<String> stringTable) throws IOException {
-    switch (fieldId) {
-      case 2:
-      case 3:
-      case 4:
-      case 5:
-      case 6:
-      case 7:
-      case 8:
-      case 9:
-        SpanV1.unpackStreamingString(unpacker, stringTable);
-        break;
-      case 10:
-        // Header-level attributes: same triplet encoding as span attributes.
-        SpanV1.skipAttributes(unpacker, stringTable);
-        break;
-      default:
-        unpacker.skipValue();
-        break;
+    private static void skipPayloadField(MessageUnpacker unpacker, int fieldId, List<String> stringTable)
+            throws IOException {
+        switch (fieldId) {
+            case 2:
+            case 3:
+            case 4:
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+                SpanV1.unpackStreamingString(unpacker, stringTable);
+                break;
+            case 10:
+                // Header-level attributes: same triplet encoding as span attributes.
+                SpanV1.skipAttributes(unpacker, stringTable);
+                break;
+            default:
+                unpacker.skipValue();
+                break;
+        }
     }
-  }
 
-  private MessageV1(DecodedTrace[] traces) {
-    this.traces = traces;
-  }
+    private MessageV1(DecodedTrace[] traces) {
+        this.traces = traces;
+    }
 
-  @Override
-  public List<DecodedTrace> getTraces() {
-    if (traces.length == 0) {
-      return Collections.emptyList();
+    @Override
+    public List<DecodedTrace> getTraces() {
+        if (traces.length == 0) {
+            return Collections.emptyList();
+        }
+        return Collections.unmodifiableList(Arrays.asList(traces));
     }
-    return Collections.unmodifiableList(Arrays.asList(traces));
-  }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/SpanV1.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/SpanV1.java
index c4ec1e4b6b9..3b8e11d1d78 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/SpanV1.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/SpanV1.java
@@ -34,741 +34,727 @@
  * </ul>
  */
 public class SpanV1 implements DecodedSpan {
-  // Span field IDs (from TraceMapperV1)
-  static final int SPAN_FIELD_SERVICE = 1;
-  static final int SPAN_FIELD_NAME = 2;
-  static final int SPAN_FIELD_RESOURCE = 3;
-  static final int SPAN_FIELD_SPAN_ID = 4;
-  static final int SPAN_FIELD_PARENT_ID = 5;
-  static final int SPAN_FIELD_START = 6;
-  static final int SPAN_FIELD_DURATION = 7;
-  static final int SPAN_FIELD_ERROR = 8;
-  static final int SPAN_FIELD_ATTRIBUTES = 9;
-  static final int SPAN_FIELD_TYPE = 10;
-  static final int SPAN_FIELD_SPAN_LINKS = 11;
-  static final int SPAN_FIELD_SPAN_EVENTS = 12;
-  static final int SPAN_FIELD_ENV = 13;
-  static final int SPAN_FIELD_VERSION = 14;
-  static final int SPAN_FIELD_COMPONENT = 15;
-  static final int SPAN_FIELD_SPAN_KIND = 16;
-
-  // Span link field IDs (from TraceMapperV1.encodeSpanLinks)
-  static final int LINK_FIELD_TRACE_ID = 1;
-  static final int LINK_FIELD_SPAN_ID = 2;
-  static final int LINK_FIELD_ATTRIBUTES = 3;
-  static final int LINK_FIELD_TRACE_STATE = 4;
-  static final int LINK_FIELD_TRACE_FLAGS = 5;
-
-  // Attribute value types
-  static final int STRING_VALUE_TYPE = 1;
-  static final int BOOL_VALUE_TYPE = 2;
-  static final int FLOAT_VALUE_TYPE = 3;
-  static final int INT_VALUE_TYPE = 4;
-  static final int BYTES_VALUE_TYPE = 5;
-  static final int ARRAY_VALUE_TYPE = 6;
-  static final int KEY_VALUE_LIST_TYPE = 7;
-
-  /**
-   * Unpacks an array of spans from the unpacker.
-   *
-   * @param unpacker the message unpacker
-   * @param stringTable the shared string table for streaming string decoding
-   * @return array of decoded spans
-   */
-  static DecodedSpan[] unpackSpans(MessageUnpacker unpacker, List<String> stringTable) {
-    return unpackSpans(unpacker, stringTable, 0);
-  }
-
-  static DecodedSpan[] unpackSpans(
-      MessageUnpacker unpacker, List<String> stringTable, long traceId) {
-    try {
-      int size = unpacker.unpackArrayHeader();
-      if (size < 0) {
-        throw new IllegalArgumentException("Negative span array size " + size);
-      }
-      DecodedSpan[] spans = new DecodedSpan[size];
-      for (int i = 0; i < size; i++) {
-        spans[i] = unpack(unpacker, stringTable, traceId);
-      }
-      return spans;
-    } catch (Throwable t) {
-      if (t instanceof RuntimeException) {
-        throw (RuntimeException) t;
-      } else {
-        throw new IllegalArgumentException(t);
-      }
-    }
-  }
-
-  /**
-   * Unpacks a single span from the unpacker.
-   *
-   * @param unpacker the message unpacker
-   * @param stringTable the shared string table for streaming string decoding
-   * @return the decoded span
-   */
-  static SpanV1 unpack(MessageUnpacker unpacker, List<String> stringTable) {
-    return unpack(unpacker, stringTable, 0);
-  }
-
-  static SpanV1 unpack(MessageUnpacker unpacker, List<String> stringTable, long traceId) {
-    try {
-      int mapSize = unpacker.unpackMapHeader();
-
-      String service = "";
-      String name = "";
-      String resource = "";
-      long spanId = 0;
-      long parentId = 0;
-      long start = 0;
-      long duration = 0;
-      int error = 0;
-      String type = "";
-      String env = "";
-      String version = "";
-      String component = "";
-      int spanKind = 0;
-      Map<String, String> meta = new HashMap<>();
-      Map<String, Number> metrics = new HashMap<>();
-      Map<String, Object> metaStruct = new HashMap<>();
-      List<DecodedSpanLink> links = emptyList();
-
-      for (int i = 0; i < mapSize; i++) {
-        int fieldId = unpacker.unpackInt();
-
-        switch (fieldId) {
-          case SPAN_FIELD_SERVICE:
-            service = unpackStreamingString(unpacker, stringTable);
-            break;
-          case SPAN_FIELD_NAME:
-            name = unpackStreamingString(unpacker, stringTable);
-            break;
-          case SPAN_FIELD_RESOURCE:
-            resource = unpackStreamingString(unpacker, stringTable);
-            break;
-          case SPAN_FIELD_SPAN_ID:
-            spanId = unpackUnsignedLong(unpacker);
-            break;
-          case SPAN_FIELD_PARENT_ID:
-            parentId = unpackUnsignedLong(unpacker);
-            break;
-          case SPAN_FIELD_START:
-            start = unpacker.unpackLong();
-            break;
-          case SPAN_FIELD_DURATION:
-            duration = unpacker.unpackLong();
-            break;
-          case SPAN_FIELD_ERROR:
-            // V1.0 uses boolean for error
-            error = unpacker.unpackBoolean() ? 1 : 0;
-            break;
-          case SPAN_FIELD_ATTRIBUTES:
-            unpackAttributes(unpacker, stringTable, meta, metrics, metaStruct);
-            break;
-          case SPAN_FIELD_TYPE:
-            type = unpackStreamingString(unpacker, stringTable);
-            break;
-          case SPAN_FIELD_SPAN_LINKS:
-            links = unpackSpanLinks(unpacker, stringTable);
-            break;
-          case SPAN_FIELD_SPAN_EVENTS:
-            // TODO Span events are not decoded yet. This blind skip also consumes any streaming
-            // string the events introduced without registering it, desynchronizing the string
-            // table for the rest of the payload (see unpackSpanLinks for the table-aware pattern).
-            unpacker.skipValue();
-            break;
-          case SPAN_FIELD_ENV:
-            env = unpackStreamingString(unpacker, stringTable);
-            break;
-          case SPAN_FIELD_VERSION:
-            version = unpackStreamingString(unpacker, stringTable);
-            break;
-          case SPAN_FIELD_COMPONENT:
-            component = unpackStreamingString(unpacker, stringTable);
-            break;
-          case SPAN_FIELD_SPAN_KIND:
-            spanKind = unpacker.unpackInt();
-            break;
-          default:
-            // Skip unknown fields
-            unpacker.skipValue();
-            break;
+    // Span field IDs (from TraceMapperV1)
+    static final int SPAN_FIELD_SERVICE = 1;
+    static final int SPAN_FIELD_NAME = 2;
+    static final int SPAN_FIELD_RESOURCE = 3;
+    static final int SPAN_FIELD_SPAN_ID = 4;
+    static final int SPAN_FIELD_PARENT_ID = 5;
+    static final int SPAN_FIELD_START = 6;
+    static final int SPAN_FIELD_DURATION = 7;
+    static final int SPAN_FIELD_ERROR = 8;
+    static final int SPAN_FIELD_ATTRIBUTES = 9;
+    static final int SPAN_FIELD_TYPE = 10;
+    static final int SPAN_FIELD_SPAN_LINKS = 11;
+    static final int SPAN_FIELD_SPAN_EVENTS = 12;
+    static final int SPAN_FIELD_ENV = 13;
+    static final int SPAN_FIELD_VERSION = 14;
+    static final int SPAN_FIELD_COMPONENT = 15;
+    static final int SPAN_FIELD_SPAN_KIND = 16;
+
+    // Span link field IDs (from TraceMapperV1.encodeSpanLinks)
+    static final int LINK_FIELD_TRACE_ID = 1;
+    static final int LINK_FIELD_SPAN_ID = 2;
+    static final int LINK_FIELD_ATTRIBUTES = 3;
+    static final int LINK_FIELD_TRACE_STATE = 4;
+    static final int LINK_FIELD_TRACE_FLAGS = 5;
+
+    // Attribute value types
+    static final int STRING_VALUE_TYPE = 1;
+    static final int BOOL_VALUE_TYPE = 2;
+    static final int FLOAT_VALUE_TYPE = 3;
+    static final int INT_VALUE_TYPE = 4;
+    static final int BYTES_VALUE_TYPE = 5;
+    static final int ARRAY_VALUE_TYPE = 6;
+    static final int KEY_VALUE_LIST_TYPE = 7;
+
+    /**
+     * Unpacks an array of spans from the unpacker.
+     *
+     * @param unpacker the message unpacker
+     * @param stringTable the shared string table for streaming string decoding
+     * @return array of decoded spans
+     */
+    static DecodedSpan[] unpackSpans(MessageUnpacker unpacker, List<String> stringTable) {
+        return unpackSpans(unpacker, stringTable, 0);
+    }
+
+    static DecodedSpan[] unpackSpans(MessageUnpacker unpacker, List<String> stringTable, long traceId) {
+        try {
+            int size = unpacker.unpackArrayHeader();
+            if (size < 0) {
+                throw new IllegalArgumentException("Negative span array size " + size);
+            }
+            DecodedSpan[] spans = new DecodedSpan[size];
+            for (int i = 0; i < size; i++) {
+                spans[i] = unpack(unpacker, stringTable, traceId);
+            }
+            return spans;
+        } catch (Throwable t) {
+            if (t instanceof RuntimeException) {
+                throw (RuntimeException) t;
+            } else {
+                throw new IllegalArgumentException(t);
+            }
+        }
+    }
+
+    /**
+     * Unpacks a single span from the unpacker.
+     *
+     * @param unpacker the message unpacker
+     * @param stringTable the shared string table for streaming string decoding
+     * @return the decoded span
+     */
+    static SpanV1 unpack(MessageUnpacker unpacker, List<String> stringTable) {
+        return unpack(unpacker, stringTable, 0);
+    }
+
+    static SpanV1 unpack(MessageUnpacker unpacker, List<String> stringTable, long traceId) {
+        try {
+            int mapSize = unpacker.unpackMapHeader();
+
+            String service = "";
+            String name = "";
+            String resource = "";
+            long spanId = 0;
+            long parentId = 0;
+            long start = 0;
+            long duration = 0;
+            int error = 0;
+            String type = "";
+            String env = "";
+            String version = "";
+            String component = "";
+            int spanKind = 0;
+            Map<String, String> meta = new HashMap<>();
+            Map<String, Number> metrics = new HashMap<>();
+            Map<String, Object> metaStruct = new HashMap<>();
+            List<DecodedSpanLink> links = emptyList();
+
+            for (int i = 0; i < mapSize; i++) {
+                int fieldId = unpacker.unpackInt();
+
+                switch (fieldId) {
+                    case SPAN_FIELD_SERVICE:
+                        service = unpackStreamingString(unpacker, stringTable);
+                        break;
+                    case SPAN_FIELD_NAME:
+                        name = unpackStreamingString(unpacker, stringTable);
+                        break;
+                    case SPAN_FIELD_RESOURCE:
+                        resource = unpackStreamingString(unpacker, stringTable);
+                        break;
+                    case SPAN_FIELD_SPAN_ID:
+                        spanId = unpackUnsignedLong(unpacker);
+                        break;
+                    case SPAN_FIELD_PARENT_ID:
+                        parentId = unpackUnsignedLong(unpacker);
+                        break;
+                    case SPAN_FIELD_START:
+                        start = unpacker.unpackLong();
+                        break;
+                    case SPAN_FIELD_DURATION:
+                        duration = unpacker.unpackLong();
+                        break;
+                    case SPAN_FIELD_ERROR:
+                        // V1.0 uses boolean for error
+                        error = unpacker.unpackBoolean() ? 1 : 0;
+                        break;
+                    case SPAN_FIELD_ATTRIBUTES:
+                        unpackAttributes(unpacker, stringTable, meta, metrics, metaStruct);
+                        break;
+                    case SPAN_FIELD_TYPE:
+                        type = unpackStreamingString(unpacker, stringTable);
+                        break;
+                    case SPAN_FIELD_SPAN_LINKS:
+                        links = unpackSpanLinks(unpacker, stringTable);
+                        break;
+                    case SPAN_FIELD_SPAN_EVENTS:
+                        // TODO Span events are not decoded yet. This blind skip also consumes any streaming
+                        // string the events introduced without registering it, desynchronizing the string
+                        // table for the rest of the payload (see unpackSpanLinks for the table-aware pattern).
+                        unpacker.skipValue();
+                        break;
+                    case SPAN_FIELD_ENV:
+                        env = unpackStreamingString(unpacker, stringTable);
+                        break;
+                    case SPAN_FIELD_VERSION:
+                        version = unpackStreamingString(unpacker, stringTable);
+                        break;
+                    case SPAN_FIELD_COMPONENT:
+                        component = unpackStreamingString(unpacker, stringTable);
+                        break;
+                    case SPAN_FIELD_SPAN_KIND:
+                        spanKind = unpacker.unpackInt();
+                        break;
+                    default:
+                        // Skip unknown fields
+                        unpacker.skipValue();
+                        break;
+                }
+            }
+
+            // Add promoted fields to meta if non-empty
+            if (env != null && !env.isEmpty()) {
+                meta.put("env", env);
+            }
+            if (version != null && !version.isEmpty()) {
+                meta.put("version", version);
+            }
+            if (component != null && !component.isEmpty()) {
+                meta.put("component", component);
+            }
+            if (spanKind > 0) {
+                meta.put("span.kind", getSpanKindString(spanKind));
+            }
+
+            return new SpanV1(
+                    service,
+                    name,
+                    resource,
+                    traceId,
+                    spanId,
+                    parentId,
+                    start,
+                    duration,
+                    error,
+                    type,
+                    metrics,
+                    meta,
+                    metaStruct.isEmpty() ? null : metaStruct,
+                    links);
+        } catch (Throwable t) {
+            if (t instanceof RuntimeException) {
+                throw (RuntimeException) t;
+            } else {
+                throw new IllegalArgumentException(t);
+            }
         }
-      }
-
-      // Add promoted fields to meta if non-empty
-      if (env != null && !env.isEmpty()) {
-        meta.put("env", env);
-      }
-      if (version != null && !version.isEmpty()) {
-        meta.put("version", version);
-      }
-      if (component != null && !component.isEmpty()) {
-        meta.put("component", component);
-      }
-      if (spanKind > 0) {
-        meta.put("span.kind", getSpanKindString(spanKind));
-      }
-
-      return new SpanV1(
-          service,
-          name,
-          resource,
-          traceId,
-          spanId,
-          parentId,
-          start,
-          duration,
-          error,
-          type,
-          metrics,
-          meta,
-          metaStruct.isEmpty() ? null : metaStruct,
-          links);
-    } catch (Throwable t) {
-      if (t instanceof RuntimeException) {
-        throw (RuntimeException) t;
-      } else {
-        throw new IllegalArgumentException(t);
-      }
-    }
-  }
-
-  /**
-   * Unpacks a streaming string value.
-   *
-   * <p>In V1.0 format, strings use streaming encoding:
-   *
-   * <ul>
-   *   <li>First occurrence: actual string is written and added to table
-   *   <li>Subsequent occurrences: integer index is written
-   *   <li>Index 0 is reserved for empty string
-   * </ul>
-   *
-   * @param unpacker the message unpacker
-   * @param stringTable the string table to use/update
-   * @return the decoded string
-   * @throws IOException if unpacking fails
-   */
-  static String unpackStreamingString(MessageUnpacker unpacker, List<String> stringTable)
-      throws IOException {
-    ValueType valueType = unpacker.getNextFormat().getValueType();
-    if (valueType == ValueType.INTEGER) {
-      // Reference to existing string in table
-      int index = unpacker.unpackInt();
-      if (index < 0 || index >= stringTable.size()) {
-        throw new IllegalArgumentException(
-            "Invalid string table index: " + index + ", table size: " + stringTable.size());
-      }
-      return stringTable.get(index);
-    } else if (valueType == ValueType.STRING) {
-      // New string, add to table
-      String str = unpacker.unpackString();
-      stringTable.add(str);
-      return str;
-    } else {
-      throw new IllegalArgumentException(
-          "Expected string or integer for streaming string, got: " + valueType);
-    }
-  }
-
-  /**
-   * Unpacks attributes array into meta and metrics maps.
-   *
-   * <p>Attributes are encoded as a flat array of triplets: (key, type, value)
-   *
-   * @param unpacker the message unpacker
-   * @param stringTable the string table
-   * @param meta output map for string attributes
-   * @param metrics output map for numeric attributes
-   * @throws IOException if unpacking fails
-   */
-  private static void unpackAttributes(
-      MessageUnpacker unpacker,
-      List<String> stringTable,
-      Map<String, String> meta,
-      Map<String, Number> metrics,
-      Map<String, Object> metaStruct)
-      throws IOException {
-    int arraySize = unpacker.unpackArrayHeader();
-    // Array contains triplets (key, type, value), so size must be divisible by 3
-    if (arraySize % 3 != 0) {
-      throw new IllegalArgumentException(
-          "Attributes array size must be divisible by 3, got: " + arraySize);
-    }
-
-    int tripletCount = arraySize / 3;
-    for (int i = 0; i < tripletCount; i++) {
-      // Key is a streaming string
-      String key = unpackStreamingString(unpacker, stringTable);
-      // Type is an integer
-      int valueType = unpacker.unpackInt();
-      // Value depends on type
-      switch (valueType) {
-        case STRING_VALUE_TYPE:
-          String strValue = unpackStreamingString(unpacker, stringTable);
-          meta.put(key, strValue);
-          break;
-        case BOOL_VALUE_TYPE:
-          boolean boolValue = unpacker.unpackBoolean();
-          // Store booleans as strings in meta for compatibility
-          meta.put(key, String.valueOf(boolValue));
-          break;
-        case FLOAT_VALUE_TYPE:
-          double floatValue = unpacker.unpackDouble();
-          metrics.put(key, normalizeMetricValue(key, floatValue));
-          break;
-        case INT_VALUE_TYPE:
-          long intValue = unpacker.unpackLong();
-          metrics.put(key, intValue);
-          break;
-        case BYTES_VALUE_TYPE:
-          int payloadSize = unpacker.unpackBinaryHeader();
-          byte[] payload = unpacker.readPayload(payloadSize);
-          metaStruct.put(key, decodeObject(payload));
-          break;
-        case ARRAY_VALUE_TYPE:
-          // Skip array values
-          unpacker.skipValue();
-          break;
-        case KEY_VALUE_LIST_TYPE:
-          // Skip key-value list
-          unpacker.skipValue();
-          break;
-        default:
-          throw new IllegalArgumentException("Unknown attribute value type: " + valueType);
-      }
-    }
-  }
-
-  /**
-   * Unpacks the structured span links of field {@value #SPAN_FIELD_SPAN_LINKS}, as {@code
-   * TraceMapperV1.encodeSpanLinks} writes them.
-   *
-   * <p>Link attributes and trace states are streaming strings, so they must be read through the
-   * table-aware helpers: skipping them blindly would consume the strings without registering them
-   * and desynchronize every later string index in the payload.
-   *
-   * @param unpacker The message unpacker.
-   * @param stringTable The shared string table for streaming string decoding.
-   * @return The decoded links.
-   * @throws IOException If unpacking fails.
-   */
-  static List<DecodedSpanLink> unpackSpanLinks(MessageUnpacker unpacker, List<String> stringTable)
-      throws IOException {
-    int linkCount = unpacker.unpackArrayHeader();
-    if (linkCount == 0) {
-      return emptyList();
-    }
-    List<DecodedSpanLink> links = new ArrayList<>(linkCount);
-    for (int i = 0; i < linkCount; i++) {
-      int fieldCount = unpacker.unpackMapHeader();
-      long traceId = 0;
-      long spanId = 0;
-      byte traceFlags = 0;
-      String traceState = "";
-      Map<String, String> attributes = new HashMap<>();
-      for (int field = 0; field < fieldCount; field++) {
-        switch (unpacker.unpackInt()) {
-          case LINK_FIELD_TRACE_ID:
-            traceId = unpackTraceId(unpacker);
-            break;
-          case LINK_FIELD_SPAN_ID:
-            spanId = unpackUnsignedLong(unpacker);
-            break;
-          case LINK_FIELD_ATTRIBUTES:
-            unpackLinkAttributes(unpacker, stringTable, attributes);
-            break;
-          case LINK_FIELD_TRACE_STATE:
-            traceState = unpackStreamingString(unpacker, stringTable);
-            break;
-          case LINK_FIELD_TRACE_FLAGS:
-            traceFlags = (byte) unpacker.unpackInt();
-            break;
-          default:
-            // Unknown link field; numeric or binary, so it cannot hold a streaming string.
-            unpacker.skipValue();
-            break;
+    }
+
+    /**
+     * Unpacks a streaming string value.
+     *
+     * <p>In V1.0 format, strings use streaming encoding:
+     *
+     * <ul>
+     *   <li>First occurrence: actual string is written and added to table
+     *   <li>Subsequent occurrences: integer index is written
+     *   <li>Index 0 is reserved for empty string
+     * </ul>
+     *
+     * @param unpacker the message unpacker
+     * @param stringTable the string table to use/update
+     * @return the decoded string
+     * @throws IOException if unpacking fails
+     */
+    static String unpackStreamingString(MessageUnpacker unpacker, List<String> stringTable) throws IOException {
+        ValueType valueType = unpacker.getNextFormat().getValueType();
+        if (valueType == ValueType.INTEGER) {
+            // Reference to existing string in table
+            int index = unpacker.unpackInt();
+            if (index < 0 || index >= stringTable.size()) {
+                throw new IllegalArgumentException(
+                        "Invalid string table index: " + index + ", table size: " + stringTable.size());
+            }
+            return stringTable.get(index);
+        } else if (valueType == ValueType.STRING) {
+            // New string, add to table
+            String str = unpacker.unpackString();
+            stringTable.add(str);
+            return str;
+        } else {
+            throw new IllegalArgumentException("Expected string or integer for streaming string, got: " + valueType);
         }
-      }
-      links.add(DecodedSpanLinks.link(traceId, spanId, traceFlags, traceState, attributes));
-    }
-    return unmodifiableList(links);
-  }
-
-  /**
-   * Unpacks an identifier the writer emitted as an unsigned 64-bit value.
-   *
-   * <p>{@code TraceMapperV1} writes span and parent identifiers with {@code writeUnsignedLong}, so
-   * any identifier with its high bit set arrives as a msgpack {@code UINT64}. {@link
-   * MessageUnpacker#unpackLong()} rejects those, so read them through a {@link
-   * java.math.BigInteger} and keep the low-order 64 bits, which is the same two's-complement value
-   * the writer had.
-   *
-   * @param unpacker The message unpacker.
-   * @return The identifier.
-   * @throws IOException If unpacking fails.
-   */
-  private static long unpackUnsignedLong(MessageUnpacker unpacker) throws IOException {
-    if (unpacker.getNextFormat() == MessageFormat.UINT64) {
-      return unpacker.unpackBigInteger().longValue();
-    }
-    return unpacker.unpackLong();
-  }
-
-  /**
-   * Unpacks the low-order 64 bits of a 16-byte big-endian trace identifier, narrowing it the same
-   * way {@code TraceV1} narrows a chunk's trace identifier.
-   */
-  private static long unpackTraceId(MessageUnpacker unpacker) throws IOException {
-    int payloadSize = unpacker.unpackBinaryHeader();
-    byte[] payload = unpacker.readPayload(payloadSize);
-    long id = 0;
-    for (int i = Math.max(0, payloadSize - Long.BYTES); i < payloadSize; i++) {
-      id = (id << 8) | (payload[i] & 0xffL);
-    }
-    return id;
-  }
-
-  /** Collects link attributes as strings, keeping the string table in sync. */
-  private static void unpackLinkAttributes(
-      MessageUnpacker unpacker, List<String> stringTable, Map<String, String> attributes)
-      throws IOException {
-    forEachAttribute(
-        unpacker,
-        stringTable,
-        (attributeUnpacker, table, key, valueType) -> {
-          switch (valueType) {
-            case STRING_VALUE_TYPE:
-              attributes.put(key, unpackStreamingString(attributeUnpacker, table));
-              break;
-            case BOOL_VALUE_TYPE:
-              attributes.put(key, String.valueOf(attributeUnpacker.unpackBoolean()));
-              break;
-            case FLOAT_VALUE_TYPE:
-              attributes.put(key, String.valueOf(attributeUnpacker.unpackDouble()));
-              break;
-            case INT_VALUE_TYPE:
-              attributes.put(key, String.valueOf(attributeUnpacker.unpackLong()));
-              break;
-            default:
-              attributeUnpacker.skipValue();
-              break;
-          }
+    }
+
+    /**
+     * Unpacks attributes array into meta and metrics maps.
+     *
+     * <p>Attributes are encoded as a flat array of triplets: (key, type, value)
+     *
+     * @param unpacker the message unpacker
+     * @param stringTable the string table
+     * @param meta output map for string attributes
+     * @param metrics output map for numeric attributes
+     * @throws IOException if unpacking fails
+     */
+    private static void unpackAttributes(
+            MessageUnpacker unpacker,
+            List<String> stringTable,
+            Map<String, String> meta,
+            Map<String, Number> metrics,
+            Map<String, Object> metaStruct)
+            throws IOException {
+        int arraySize = unpacker.unpackArrayHeader();
+        // Array contains triplets (key, type, value), so size must be divisible by 3
+        if (arraySize % 3 != 0) {
+            throw new IllegalArgumentException("Attributes array size must be divisible by 3, got: " + arraySize);
+        }
+
+        int tripletCount = arraySize / 3;
+        for (int i = 0; i < tripletCount; i++) {
+            // Key is a streaming string
+            String key = unpackStreamingString(unpacker, stringTable);
+            // Type is an integer
+            int valueType = unpacker.unpackInt();
+            // Value depends on type
+            switch (valueType) {
+                case STRING_VALUE_TYPE:
+                    String strValue = unpackStreamingString(unpacker, stringTable);
+                    meta.put(key, strValue);
+                    break;
+                case BOOL_VALUE_TYPE:
+                    boolean boolValue = unpacker.unpackBoolean();
+                    // Store booleans as strings in meta for compatibility
+                    meta.put(key, String.valueOf(boolValue));
+                    break;
+                case FLOAT_VALUE_TYPE:
+                    double floatValue = unpacker.unpackDouble();
+                    metrics.put(key, normalizeMetricValue(key, floatValue));
+                    break;
+                case INT_VALUE_TYPE:
+                    long intValue = unpacker.unpackLong();
+                    metrics.put(key, intValue);
+                    break;
+                case BYTES_VALUE_TYPE:
+                    int payloadSize = unpacker.unpackBinaryHeader();
+                    byte[] payload = unpacker.readPayload(payloadSize);
+                    metaStruct.put(key, decodeObject(payload));
+                    break;
+                case ARRAY_VALUE_TYPE:
+                    // Skip array values
+                    unpacker.skipValue();
+                    break;
+                case KEY_VALUE_LIST_TYPE:
+                    // Skip key-value list
+                    unpacker.skipValue();
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unknown attribute value type: " + valueType);
+            }
+        }
+    }
+
+    /**
+     * Unpacks the structured span links of field {@value #SPAN_FIELD_SPAN_LINKS}, as {@code
+     * TraceMapperV1.encodeSpanLinks} writes them.
+     *
+     * <p>Link attributes and trace states are streaming strings, so they must be read through the
+     * table-aware helpers: skipping them blindly would consume the strings without registering them
+     * and desynchronize every later string index in the payload.
+     *
+     * @param unpacker The message unpacker.
+     * @param stringTable The shared string table for streaming string decoding.
+     * @return The decoded links.
+     * @throws IOException If unpacking fails.
+     */
+    static List<DecodedSpanLink> unpackSpanLinks(MessageUnpacker unpacker, List<String> stringTable)
+            throws IOException {
+        int linkCount = unpacker.unpackArrayHeader();
+        if (linkCount == 0) {
+            return emptyList();
+        }
+        List<DecodedSpanLink> links = new ArrayList<>(linkCount);
+        for (int i = 0; i < linkCount; i++) {
+            int fieldCount = unpacker.unpackMapHeader();
+            long traceId = 0;
+            long spanId = 0;
+            byte traceFlags = 0;
+            String traceState = "";
+            Map<String, String> attributes = new HashMap<>();
+            for (int field = 0; field < fieldCount; field++) {
+                switch (unpacker.unpackInt()) {
+                    case LINK_FIELD_TRACE_ID:
+                        traceId = unpackTraceId(unpacker);
+                        break;
+                    case LINK_FIELD_SPAN_ID:
+                        spanId = unpackUnsignedLong(unpacker);
+                        break;
+                    case LINK_FIELD_ATTRIBUTES:
+                        unpackLinkAttributes(unpacker, stringTable, attributes);
+                        break;
+                    case LINK_FIELD_TRACE_STATE:
+                        traceState = unpackStreamingString(unpacker, stringTable);
+                        break;
+                    case LINK_FIELD_TRACE_FLAGS:
+                        traceFlags = (byte) unpacker.unpackInt();
+                        break;
+                    default:
+                        // Unknown link field; numeric or binary, so it cannot hold a streaming string.
+                        unpacker.skipValue();
+                        break;
+                }
+            }
+            links.add(DecodedSpanLinks.link(traceId, spanId, traceFlags, traceState, attributes));
+        }
+        return unmodifiableList(links);
+    }
+
+    /**
+     * Unpacks an identifier the writer emitted as an unsigned 64-bit value.
+     *
+     * <p>{@code TraceMapperV1} writes span and parent identifiers with {@code writeUnsignedLong}, so
+     * any identifier with its high bit set arrives as a msgpack {@code UINT64}. {@link
+     * MessageUnpacker#unpackLong()} rejects those, so read them through a {@link
+     * java.math.BigInteger} and keep the low-order 64 bits, which is the same two's-complement value
+     * the writer had.
+     *
+     * @param unpacker The message unpacker.
+     * @return The identifier.
+     * @throws IOException If unpacking fails.
+     */
+    private static long unpackUnsignedLong(MessageUnpacker unpacker) throws IOException {
+        if (unpacker.getNextFormat() == MessageFormat.UINT64) {
+            return unpacker.unpackBigInteger().longValue();
+        }
+        return unpacker.unpackLong();
+    }
+
+    /**
+     * Unpacks the low-order 64 bits of a 16-byte big-endian trace identifier, narrowing it the same
+     * way {@code TraceV1} narrows a chunk's trace identifier.
+     */
+    private static long unpackTraceId(MessageUnpacker unpacker) throws IOException {
+        int payloadSize = unpacker.unpackBinaryHeader();
+        byte[] payload = unpacker.readPayload(payloadSize);
+        long id = 0;
+        for (int i = Math.max(0, payloadSize - Long.BYTES); i < payloadSize; i++) {
+            id = (id << 8) | (payload[i] & 0xffL);
+        }
+        return id;
+    }
+
+    /** Collects link attributes as strings, keeping the string table in sync. */
+    private static void unpackLinkAttributes(
+            MessageUnpacker unpacker, List<String> stringTable, Map<String, String> attributes) throws IOException {
+        forEachAttribute(unpacker, stringTable, (attributeUnpacker, table, key, valueType) -> {
+            switch (valueType) {
+                case STRING_VALUE_TYPE:
+                    attributes.put(key, unpackStreamingString(attributeUnpacker, table));
+                    break;
+                case BOOL_VALUE_TYPE:
+                    attributes.put(key, String.valueOf(attributeUnpacker.unpackBoolean()));
+                    break;
+                case FLOAT_VALUE_TYPE:
+                    attributes.put(key, String.valueOf(attributeUnpacker.unpackDouble()));
+                    break;
+                case INT_VALUE_TYPE:
+                    attributes.put(key, String.valueOf(attributeUnpacker.unpackLong()));
+                    break;
+                default:
+                    attributeUnpacker.skipValue();
+                    break;
+            }
         });
-  }
+    }
+
+    static void skipAttributes(MessageUnpacker unpacker, List<String> stringTable) throws IOException {
+        forEachAttribute(unpacker, stringTable, AttributeSkipper.INSTANCE);
+    }
 
-  static void skipAttributes(MessageUnpacker unpacker, List<String> stringTable)
-      throws IOException {
-    forEachAttribute(unpacker, stringTable, AttributeSkipper.INSTANCE);
-  }
+    private static void forEachAttribute(MessageUnpacker unpacker, List<String> stringTable, AttributeConsumer consumer)
+            throws IOException {
+        int arraySize = unpacker.unpackArrayHeader();
+        // Array contains triplets (key, type, value), so size must be divisible by 3
+        if (arraySize % 3 != 0) {
+            throw new IllegalArgumentException("Attributes array size must be divisible by 3, got: " + arraySize);
+        }
 
-  private static void forEachAttribute(
-      MessageUnpacker unpacker, List<String> stringTable, AttributeConsumer consumer)
-      throws IOException {
-    int arraySize = unpacker.unpackArrayHeader();
-    // Array contains triplets (key, type, value), so size must be divisible by 3
-    if (arraySize % 3 != 0) {
-      throw new IllegalArgumentException(
-          "Attributes array size must be divisible by 3, got: " + arraySize);
+        int tripletCount = arraySize / 3;
+        for (int i = 0; i < tripletCount; i++) {
+            String key = unpackStreamingString(unpacker, stringTable);
+            int valueType = unpacker.unpackInt();
+            consumer.accept(unpacker, stringTable, key, valueType);
+        }
     }
 
-    int tripletCount = arraySize / 3;
-    for (int i = 0; i < tripletCount; i++) {
-      String key = unpackStreamingString(unpacker, stringTable);
-      int valueType = unpacker.unpackInt();
-      consumer.accept(unpacker, stringTable, key, valueType);
+    private interface AttributeConsumer {
+        void accept(MessageUnpacker unpacker, List<String> stringTable, String key, int valueType) throws IOException;
     }
-  }
 
-  private interface AttributeConsumer {
-    void accept(MessageUnpacker unpacker, List<String> stringTable, String key, int valueType)
-        throws IOException;
-  }
+    private enum AttributeSkipper implements AttributeConsumer {
+        INSTANCE;
+
+        @Override
+        public void accept(MessageUnpacker unpacker, List<String> stringTable, String key, int valueType)
+                throws IOException {
+            switch (valueType) {
+                case STRING_VALUE_TYPE:
+                    unpackStreamingString(unpacker, stringTable);
+                    break;
+                case BOOL_VALUE_TYPE:
+                    unpacker.unpackBoolean();
+                    break;
+                case FLOAT_VALUE_TYPE:
+                    unpacker.unpackDouble();
+                    break;
+                default:
+                    unpacker.skipValue();
+                    break;
+            }
+        }
+    }
 
-  private enum AttributeSkipper implements AttributeConsumer {
-    INSTANCE;
+    /**
+     * Converts span kind integer to string representation.
+     *
+     * @param spanKind the OTEL span kind value
+     * @return the string representation
+     */
+    private static String getSpanKindString(int spanKind) {
+        switch (spanKind) {
+            case 1:
+                return "internal";
+            case 2:
+                return "server";
+            case 3:
+                return "client";
+            case 4:
+                return "producer";
+            case 5:
+                return "consumer";
+            default:
+                return "internal";
+        }
+    }
 
-    @Override
-    public void accept(
-        MessageUnpacker unpacker, List<String> stringTable, String key, int valueType)
-        throws IOException {
-      switch (valueType) {
-        case STRING_VALUE_TYPE:
-          unpackStreamingString(unpacker, stringTable);
-          break;
-        case BOOL_VALUE_TYPE:
-          unpacker.unpackBoolean();
-          break;
-        case FLOAT_VALUE_TYPE:
-          unpacker.unpackDouble();
-          break;
-        default:
-          unpacker.skipValue();
-          break;
-      }
-    }
-  }
-
-  /**
-   * Converts span kind integer to string representation.
-   *
-   * @param spanKind the OTEL span kind value
-   * @return the string representation
-   */
-  private static String getSpanKindString(int spanKind) {
-    switch (spanKind) {
-      case 1:
-        return "internal";
-      case 2:
-        return "server";
-      case 3:
-        return "client";
-      case 4:
-        return "producer";
-      case 5:
-        return "consumer";
-      default:
-        return "internal";
-    }
-  }
-
-  private static Number normalizeMetricValue(String key, double value) {
-    if (("_dd.measured".equals(key) || "_dd.top_level".equals(key)) && value % 1 == 0) {
-      long whole = (long) value;
-      if (whole >= Integer.MIN_VALUE && whole <= Integer.MAX_VALUE) {
-        return (int) whole;
-      }
-      return whole;
-    }
-    return value;
-  }
-
-  private static Object decodeObject(final byte[] input) {
-    MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(input);
-    try {
-      final Value value = unpacker.unpackValue();
-      return convertValueToObject(value);
-    } catch (IOException e) {
-      throw new IllegalArgumentException("Failed to decode object.", e);
-    }
-  }
-
-  private static Object convertValueToObject(final Value value) {
-    switch (value.getValueType()) {
-      case NIL:
-        return null;
-      case BOOLEAN:
-        return value.asBooleanValue().getBoolean();
-      case INTEGER:
-        return value.asIntegerValue().toLong();
-      case FLOAT:
-        return value.asFloatValue().toFloat();
-      case BINARY:
-        return value.asBinaryValue().asByteArray();
-      case STRING:
-        return value.asStringValue().asString();
-      case ARRAY:
-        final List<Value> array = value.asArrayValue().list();
-        final List<Object> result = new ArrayList<>(array.size());
-        for (final Value element : array) {
-          result.add(convertValueToObject(element));
+    private static Number normalizeMetricValue(String key, double value) {
+        if (("_dd.measured".equals(key) || "_dd.top_level".equals(key)) && value % 1 == 0) {
+            long whole = (long) value;
+            if (whole >= Integer.MIN_VALUE && whole <= Integer.MAX_VALUE) {
+                return (int) whole;
+            }
+            return whole;
         }
-        return result;
-      case MAP:
-        final Map<Value, Value> map = value.asMapValue().map();
-        final Map<String, Object> resultMap = new HashMap<>(map.size());
-        for (final Map.Entry<Value, Value> entry : map.entrySet()) {
-          resultMap.put(
-              entry.getKey().asStringValue().asString(), convertValueToObject(entry.getValue()));
+        return value;
+    }
+
+    private static Object decodeObject(final byte[] input) {
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(input);
+        try {
+            final Value value = unpacker.unpackValue();
+            return convertValueToObject(value);
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Failed to decode object.", e);
         }
-        return resultMap;
-      default:
-        throw new IllegalArgumentException(
-            "Failed to convert value to object. Unexpected value type " + value.getValueType());
-    }
-  }
-
-  private final String service;
-  private final String name;
-  private final String resource;
-  private final long traceId;
-  private final long spanId;
-  private final long parentId;
-  private final long start;
-  private final long duration;
-  private final int error;
-  private final Map<String, String> meta;
-  private final Map<String, Object> metaStruct;
-  private final Map<String, Number> metrics;
-  private final String type;
-  private final List<DecodedSpanLink> links;
-
-  public SpanV1(
-      String service,
-      String name,
-      String resource,
-      long traceId,
-      long spanId,
-      long parentId,
-      long start,
-      long duration,
-      int error,
-      String type,
-      Map<String, Number> metrics,
-      Map<String, String> meta,
-      Map<String, Object> metaStruct) {
-    this(
-        service,
-        name,
-        resource,
-        traceId,
-        spanId,
-        parentId,
-        start,
-        duration,
-        error,
-        type,
-        metrics,
-        meta,
-        metaStruct,
-        emptyList());
-  }
-
-  public SpanV1(
-      String service,
-      String name,
-      String resource,
-      long traceId,
-      long spanId,
-      long parentId,
-      long start,
-      long duration,
-      int error,
-      String type,
-      Map<String, Number> metrics,
-      Map<String, String> meta,
-      Map<String, Object> metaStruct,
-      List<DecodedSpanLink> links) {
-    this.links = links == null ? emptyList() : links;
-    this.service = service;
-    this.name = name;
-    this.resource = resource;
-    this.traceId = traceId;
-    this.spanId = spanId;
-    this.parentId = parentId;
-    this.start = start;
-    this.duration = duration;
-    this.error = error;
-    this.meta = unmodifiableMap(meta);
-    this.metaStruct = metaStruct == null ? emptyMap() : unmodifiableMap(metaStruct);
-    this.metrics = unmodifiableMap(metrics);
-    this.type = type;
-  }
-
-  @Override
-  public List<DecodedSpanLink> getLinks() {
-    return this.links;
-  }
-
-  @Override
-  public String getService() {
-    return service;
-  }
-
-  @Override
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public String getResource() {
-    return resource;
-  }
-
-  @Override
-  public long getTraceId() {
-    return traceId;
-  }
-
-  @Override
-  public long getSpanId() {
-    return spanId;
-  }
-
-  @Override
-  public long getParentId() {
-    return parentId;
-  }
-
-  @Override
-  public long getStart() {
-    return start;
-  }
-
-  @Override
-  public long getDuration() {
-    return duration;
-  }
-
-  @Override
-  public int getError() {
-    return error;
-  }
-
-  @Override
-  public Map<String, String> getMeta() {
-    return meta;
-  }
-
-  @Override
-  public Map<String, Object> getMetaStruct() {
-    return metaStruct;
-  }
-
-  @Override
-  public Map<String, Number> getMetrics() {
-    return metrics;
-  }
-
-  @Override
-  public String getType() {
-    return type;
-  }
-
-  @Override
-  public String toString() {
-    return "SpanV1{"
-        + "service='"
-        + service
-        + '\''
-        + ", name='"
-        + name
-        + '\''
-        + ", resource='"
-        + resource
-        + '\''
-        + ", traceId="
-        + traceId
-        + ", spanId="
-        + spanId
-        + ", parentId="
-        + parentId
-        + ", start="
-        + start
-        + ", duration="
-        + duration
-        + ", error="
-        + error
-        + ", meta="
-        + meta
-        + ", metaStruct="
-        + metaStruct
-        + ", metrics="
-        + metrics
-        + ", type='"
-        + type
-        + '\''
-        + '}';
-  }
+    }
+
+    private static Object convertValueToObject(final Value value) {
+        switch (value.getValueType()) {
+            case NIL:
+                return null;
+            case BOOLEAN:
+                return value.asBooleanValue().getBoolean();
+            case INTEGER:
+                return value.asIntegerValue().toLong();
+            case FLOAT:
+                return value.asFloatValue().toFloat();
+            case BINARY:
+                return value.asBinaryValue().asByteArray();
+            case STRING:
+                return value.asStringValue().asString();
+            case ARRAY:
+                final List<Value> array = value.asArrayValue().list();
+                final List<Object> result = new ArrayList<>(array.size());
+                for (final Value element : array) {
+                    result.add(convertValueToObject(element));
+                }
+                return result;
+            case MAP:
+                final Map<Value, Value> map = value.asMapValue().map();
+                final Map<String, Object> resultMap = new HashMap<>(map.size());
+                for (final Map.Entry<Value, Value> entry : map.entrySet()) {
+                    resultMap.put(entry.getKey().asStringValue().asString(), convertValueToObject(entry.getValue()));
+                }
+                return resultMap;
+            default:
+                throw new IllegalArgumentException(
+                        "Failed to convert value to object. Unexpected value type " + value.getValueType());
+        }
+    }
+
+    private final String service;
+    private final String name;
+    private final String resource;
+    private final long traceId;
+    private final long spanId;
+    private final long parentId;
+    private final long start;
+    private final long duration;
+    private final int error;
+    private final Map<String, String> meta;
+    private final Map<String, Object> metaStruct;
+    private final Map<String, Number> metrics;
+    private final String type;
+    private final List<DecodedSpanLink> links;
+
+    public SpanV1(
+            String service,
+            String name,
+            String resource,
+            long traceId,
+            long spanId,
+            long parentId,
+            long start,
+            long duration,
+            int error,
+            String type,
+            Map<String, Number> metrics,
+            Map<String, String> meta,
+            Map<String, Object> metaStruct) {
+        this(
+                service,
+                name,
+                resource,
+                traceId,
+                spanId,
+                parentId,
+                start,
+                duration,
+                error,
+                type,
+                metrics,
+                meta,
+                metaStruct,
+                emptyList());
+    }
+
+    public SpanV1(
+            String service,
+            String name,
+            String resource,
+            long traceId,
+            long spanId,
+            long parentId,
+            long start,
+            long duration,
+            int error,
+            String type,
+            Map<String, Number> metrics,
+            Map<String, String> meta,
+            Map<String, Object> metaStruct,
+            List<DecodedSpanLink> links) {
+        this.links = links == null ? emptyList() : links;
+        this.service = service;
+        this.name = name;
+        this.resource = resource;
+        this.traceId = traceId;
+        this.spanId = spanId;
+        this.parentId = parentId;
+        this.start = start;
+        this.duration = duration;
+        this.error = error;
+        this.meta = unmodifiableMap(meta);
+        this.metaStruct = metaStruct == null ? emptyMap() : unmodifiableMap(metaStruct);
+        this.metrics = unmodifiableMap(metrics);
+        this.type = type;
+    }
+
+    @Override
+    public List<DecodedSpanLink> getLinks() {
+        return this.links;
+    }
+
+    @Override
+    public String getService() {
+        return service;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getResource() {
+        return resource;
+    }
+
+    @Override
+    public long getTraceId() {
+        return traceId;
+    }
+
+    @Override
+    public long getSpanId() {
+        return spanId;
+    }
+
+    @Override
+    public long getParentId() {
+        return parentId;
+    }
+
+    @Override
+    public long getStart() {
+        return start;
+    }
+
+    @Override
+    public long getDuration() {
+        return duration;
+    }
+
+    @Override
+    public int getError() {
+        return error;
+    }
+
+    @Override
+    public Map<String, String> getMeta() {
+        return meta;
+    }
+
+    @Override
+    public Map<String, Object> getMetaStruct() {
+        return metaStruct;
+    }
+
+    @Override
+    public Map<String, Number> getMetrics() {
+        return metrics;
+    }
+
+    @Override
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public String toString() {
+        return "SpanV1{"
+                + "service='"
+                + service
+                + '\''
+                + ", name='"
+                + name
+                + '\''
+                + ", resource='"
+                + resource
+                + '\''
+                + ", traceId="
+                + traceId
+                + ", spanId="
+                + spanId
+                + ", parentId="
+                + parentId
+                + ", start="
+                + start
+                + ", duration="
+                + duration
+                + ", error="
+                + error
+                + ", meta="
+                + meta
+                + ", metaStruct="
+                + metaStruct
+                + ", metrics="
+                + metrics
+                + ", type='"
+                + type
+                + '\''
+                + '}';
+    }
 }
diff --git a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/TraceV1.java b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/TraceV1.java
index 5c23f0e1fb2..4cd10ccaa6b 100644
--- a/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/TraceV1.java
+++ b/utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/TraceV1.java
@@ -18,136 +18,131 @@
  */
 public class TraceV1 implements DecodedTrace {
 
-  /**
-   * Unpacks an array of traces from the unpacker.
-   *
-   * @param unpacker the message unpacker
-   * @param stringTable the shared string table for streaming string decoding
-   * @return array of decoded traces
-   */
-  public static DecodedTrace[] unpackTraces(MessageUnpacker unpacker, List<String> stringTable) {
-    try {
-      int size = unpacker.unpackArrayHeader();
-      if (size < 0) {
-        throw new IllegalArgumentException("Negative trace array size " + size);
-      }
-      DecodedTrace[] traces = new TraceV1[size];
-      for (int i = 0; i < size; i++) {
-        traces[i] = unpackChunk(unpacker, stringTable);
-      }
-      return traces;
-    } catch (Throwable t) {
-      if (t instanceof RuntimeException) {
-        throw (RuntimeException) t;
-      } else {
-        throw new IllegalArgumentException(t);
-      }
+    /**
+     * Unpacks an array of traces from the unpacker.
+     *
+     * @param unpacker the message unpacker
+     * @param stringTable the shared string table for streaming string decoding
+     * @return array of decoded traces
+     */
+    public static DecodedTrace[] unpackTraces(MessageUnpacker unpacker, List<String> stringTable) {
+        try {
+            int size = unpacker.unpackArrayHeader();
+            if (size < 0) {
+                throw new IllegalArgumentException("Negative trace array size " + size);
+            }
+            DecodedTrace[] traces = new TraceV1[size];
+            for (int i = 0; i < size; i++) {
+                traces[i] = unpackChunk(unpacker, stringTable);
+            }
+            return traces;
+        } catch (Throwable t) {
+            if (t instanceof RuntimeException) {
+                throw (RuntimeException) t;
+            } else {
+                throw new IllegalArgumentException(t);
+            }
+        }
     }
-  }
 
-  private static TraceV1 unpackChunk(MessageUnpacker unpacker, List<String> stringTable)
-      throws IOException {
-    int fieldCount = unpacker.unpackMapHeader();
-    DecodedSpan[] spans = new DecodedSpan[0];
-    Integer samplingPriority = null;
-    long traceId = 0;
+    private static TraceV1 unpackChunk(MessageUnpacker unpacker, List<String> stringTable) throws IOException {
+        int fieldCount = unpacker.unpackMapHeader();
+        DecodedSpan[] spans = new DecodedSpan[0];
+        Integer samplingPriority = null;
+        long traceId = 0;
 
-    for (int i = 0; i < fieldCount; i++) {
-      int fieldId = unpacker.unpackInt();
-      switch (fieldId) {
-        case 1:
-          // chunk sampling priority
-          samplingPriority = unpacker.unpackInt();
-          break;
-        case 2:
-          // origin (streaming string)
-          SpanV1.unpackStreamingString(unpacker, stringTable);
-          break;
-        case 3:
-          // chunk attributes (triplets array)
-          SpanV1.skipAttributes(unpacker, stringTable);
-          break;
-        case 4:
-          spans = SpanV1.unpackSpans(unpacker, stringTable, traceId);
-          break;
-        case 6:
-          traceId = unpackTraceId(unpacker);
-          break;
-        default:
-          // numeric or binary fields that don't affect the string table.
-          unpacker.skipValue();
-          break;
-      }
-    }
-
-    return new TraceV1(withChunkFields(spans, traceId, samplingPriority), samplingPriority);
-  }
+        for (int i = 0; i < fieldCount; i++) {
+            int fieldId = unpacker.unpackInt();
+            switch (fieldId) {
+                case 1:
+                    // chunk sampling priority
+                    samplingPriority = unpacker.unpackInt();
+                    break;
+                case 2:
+                    // origin (streaming string)
+                    SpanV1.unpackStreamingString(unpacker, stringTable);
+                    break;
+                case 3:
+                    // chunk attributes (triplets array)
+                    SpanV1.skipAttributes(unpacker, stringTable);
+                    break;
+                case 4:
+                    spans = SpanV1.unpackSpans(unpacker, stringTable, traceId);
+                    break;
+                case 6:
+                    traceId = unpackTraceId(unpacker);
+                    break;
+                default:
+                    // numeric or binary fields that don't affect the string table.
+                    unpacker.skipValue();
+                    break;
+            }
+        }
 
-  private static long unpackTraceId(MessageUnpacker unpacker) throws IOException {
-    int payloadSize = unpacker.unpackBinaryHeader();
-    byte[] payload = unpacker.readPayload(payloadSize);
-    if (payloadSize < Long.BYTES) {
-      return 0;
-    }
-    long id = 0;
-    for (int i = payloadSize - Long.BYTES; i < payloadSize; i++) {
-      id = (id << 8) | (payload[i] & 0xffL);
+        return new TraceV1(withChunkFields(spans, traceId, samplingPriority), samplingPriority);
     }
-    return id;
-  }
 
-  private static DecodedSpan[] withChunkFields(
-      DecodedSpan[] spans, long traceId, Integer samplingPriority) {
-    if (spans.length == 0) {
-      return spans;
+    private static long unpackTraceId(MessageUnpacker unpacker) throws IOException {
+        int payloadSize = unpacker.unpackBinaryHeader();
+        byte[] payload = unpacker.readPayload(payloadSize);
+        if (payloadSize < Long.BYTES) {
+            return 0;
+        }
+        long id = 0;
+        for (int i = payloadSize - Long.BYTES; i < payloadSize; i++) {
+            id = (id << 8) | (payload[i] & 0xffL);
+        }
+        return id;
     }
-    DecodedSpan[] updated = new DecodedSpan[spans.length];
-    for (int i = 0; i < spans.length; i++) {
-      DecodedSpan span = spans[i];
-      final Map<String, Number> metrics = new HashMap<>(span.getMetrics());
-      if (samplingPriority != null
-          && span.getParentId() == 0
-          && !metrics.containsKey("_sampling_priority_v1")) {
-        metrics.put("_sampling_priority_v1", samplingPriority);
-      }
-      updated[i] =
-          new SpanV1(
-              span.getService(),
-              span.getName(),
-              span.getResource(),
-              traceId == 0 ? span.getTraceId() : traceId,
-              span.getSpanId(),
-              span.getParentId(),
-              span.getStart(),
-              span.getDuration(),
-              span.getError(),
-              span.getType(),
-              metrics,
-              span.getMeta(),
-              span.getMetaStruct(),
-              span.getLinks());
+
+    private static DecodedSpan[] withChunkFields(DecodedSpan[] spans, long traceId, Integer samplingPriority) {
+        if (spans.length == 0) {
+            return spans;
+        }
+        DecodedSpan[] updated = new DecodedSpan[spans.length];
+        for (int i = 0; i < spans.length; i++) {
+            DecodedSpan span = spans[i];
+            final Map<String, Number> metrics = new HashMap<>(span.getMetrics());
+            if (samplingPriority != null && span.getParentId() == 0 && !metrics.containsKey("_sampling_priority_v1")) {
+                metrics.put("_sampling_priority_v1", samplingPriority);
+            }
+            updated[i] = new SpanV1(
+                    span.getService(),
+                    span.getName(),
+                    span.getResource(),
+                    traceId == 0 ? span.getTraceId() : traceId,
+                    span.getSpanId(),
+                    span.getParentId(),
+                    span.getStart(),
+                    span.getDuration(),
+                    span.getError(),
+                    span.getType(),
+                    metrics,
+                    span.getMeta(),
+                    span.getMetaStruct(),
+                    span.getLinks());
+        }
+        return updated;
     }
-    return updated;
-  }
 
-  private final DecodedSpan[] spans;
-  private final Integer chunkSamplingPriority;
+    private final DecodedSpan[] spans;
+    private final Integer chunkSamplingPriority;
 
-  private TraceV1(DecodedSpan[] spans, Integer chunkSamplingPriority) {
-    this.spans = spans;
-    this.chunkSamplingPriority = chunkSamplingPriority;
-  }
+    private TraceV1(DecodedSpan[] spans, Integer chunkSamplingPriority) {
+        this.spans = spans;
+        this.chunkSamplingPriority = chunkSamplingPriority;
+    }
 
-  @Override
-  public List<DecodedSpan> getSpans() {
-    if (spans.length == 0) {
-      return Collections.emptyList();
+    @Override
+    public List<DecodedSpan> getSpans() {
+        if (spans.length == 0) {
+            return Collections.emptyList();
+        }
+        return Collections.unmodifiableList(Arrays.asList(spans));
     }
-    return Collections.unmodifiableList(Arrays.asList(spans));
-  }
 
-  @Override
-  public Integer getSamplingPriority() {
-    return chunkSamplingPriority;
-  }
+    @Override
+    public Integer getSamplingPriority() {
+        return chunkSamplingPriority;
+    }
 }
diff --git a/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/DecoderTest.java b/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/DecoderTest.java
index 4acea005e87..0b8abb19f20 100644
--- a/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/DecoderTest.java
+++ b/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/DecoderTest.java
@@ -18,162 +18,162 @@
 
 public class DecoderTest {
 
-  @Test
-  public void decodeV05() throws Throwable {
-    String resourceName = "/greeting.msgpack";
-    byte[] buffer = readResourceFile(resourceName);
-    DecodedMessage message = Decoder.decodeV05(buffer);
-    List<DecodedTrace> traces = message.getTraces();
-    assertEquals(1, traces.size());
-    assertNull(traces.get(0).getSamplingPriority());
-    List<DecodedSpan> spans = traces.get(0).getSpans();
-    assertEquals(2, spans.size());
-    List<DecodedSpan> sorted = Decoder.sortByStart(spans);
-    DecodedSpan first = sorted.get(0);
-    long traceId = first.getTraceId();
-    validateSpan(
-        first,
-        traceId,
-        0,
-        "servlet.request",
-        "GET /greeting",
-        "smoke-test-java-app",
-        "web",
-        singletonMap("component", "tomcat-server"),
-        singletonMap("_dd.top_level", 1));
-    DecodedSpan second = sorted.get(1);
-    validateSpan(
-        second,
-        traceId,
-        first.getSpanId(),
-        "spring.handler",
-        "WebController.greeting",
-        "smoke-test-java-app",
-        "web",
-        singletonMap("component", "spring-web-controller"),
-        singletonMap("_dd.measured", 1));
-  }
+    @Test
+    public void decodeV05() throws Throwable {
+        String resourceName = "/greeting.msgpack";
+        byte[] buffer = readResourceFile(resourceName);
+        DecodedMessage message = Decoder.decodeV05(buffer);
+        List<DecodedTrace> traces = message.getTraces();
+        assertEquals(1, traces.size());
+        assertNull(traces.get(0).getSamplingPriority());
+        List<DecodedSpan> spans = traces.get(0).getSpans();
+        assertEquals(2, spans.size());
+        List<DecodedSpan> sorted = Decoder.sortByStart(spans);
+        DecodedSpan first = sorted.get(0);
+        long traceId = first.getTraceId();
+        validateSpan(
+                first,
+                traceId,
+                0,
+                "servlet.request",
+                "GET /greeting",
+                "smoke-test-java-app",
+                "web",
+                singletonMap("component", "tomcat-server"),
+                singletonMap("_dd.top_level", 1));
+        DecodedSpan second = sorted.get(1);
+        validateSpan(
+                second,
+                traceId,
+                first.getSpanId(),
+                "spring.handler",
+                "WebController.greeting",
+                "smoke-test-java-app",
+                "web",
+                singletonMap("component", "spring-web-controller"),
+                singletonMap("_dd.measured", 1));
+    }
 
-  @Test
-  public void decodeV04() throws Throwable {
-    byte[] buffer = readResourceFile("/webflux.04.msgpack");
+    @Test
+    public void decodeV04() throws Throwable {
+        byte[] buffer = readResourceFile("/webflux.04.msgpack");
 
-    DecodedMessage message = Decoder.decodeV04(buffer);
-    List<DecodedTrace> traces = message.getTraces();
-    assertEquals(1, traces.size());
-    assertNull(traces.get(0).getSamplingPriority());
-    List<DecodedSpan> spans = traces.get(0).getSpans();
-    assertEquals(2, spans.size());
-    List<DecodedSpan> sorted = Decoder.sortByStart(spans);
+        DecodedMessage message = Decoder.decodeV04(buffer);
+        List<DecodedTrace> traces = message.getTraces();
+        assertEquals(1, traces.size());
+        assertNull(traces.get(0).getSamplingPriority());
+        List<DecodedSpan> spans = traces.get(0).getSpans();
+        assertEquals(2, spans.size());
+        List<DecodedSpan> sorted = Decoder.sortByStart(spans);
 
-    DecodedSpan first = sorted.get(0);
-    long traceId = first.getTraceId();
-    validateSpan(
-        first,
-        traceId,
-        0,
-        "netty.request",
-        "GET /hello",
-        "smoke-test-java-app",
-        "web",
-        singletonMap("component", "netty"),
-        singletonMap("_dd.agent_psr", 1.0));
+        DecodedSpan first = sorted.get(0);
+        long traceId = first.getTraceId();
+        validateSpan(
+                first,
+                traceId,
+                0,
+                "netty.request",
+                "GET /hello",
+                "smoke-test-java-app",
+                "web",
+                singletonMap("component", "netty"),
+                singletonMap("_dd.agent_psr", 1.0));
 
-    DecodedSpan second = sorted.get(1);
-    validateSpan(
-        second,
-        traceId,
-        first.getSpanId(),
-        "WebController.hello",
-        "WebController.hello",
-        "smoke-test-java-app",
-        "web",
-        singletonMap("component", "spring-webflux-controller"),
-        singletonMap("_dd.measured", 1));
-  }
+        DecodedSpan second = sorted.get(1);
+        validateSpan(
+                second,
+                traceId,
+                first.getSpanId(),
+                "WebController.hello",
+                "WebController.hello",
+                "smoke-test-java-app",
+                "web",
+                singletonMap("component", "spring-webflux-controller"),
+                singletonMap("_dd.measured", 1));
+    }
 
-  @Test
-  public void decodeV1() throws Throwable {
-    byte[] buffer = readResourceFile("/sample_v1.msgpack");
+    @Test
+    public void decodeV1() throws Throwable {
+        byte[] buffer = readResourceFile("/sample_v1.msgpack");
 
-    DecodedMessage message = Decoder.decodeV1(buffer);
-    List<DecodedTrace> traces = message.getTraces();
-    assertEquals(1, traces.size());
-    assertEquals(1, traces.get(0).getSamplingPriority());
-    List<DecodedSpan> spans = traces.get(0).getSpans();
-    assertEquals(2, spans.size());
-    List<DecodedSpan> sorted = Decoder.sortByStart(spans);
+        DecodedMessage message = Decoder.decodeV1(buffer);
+        List<DecodedTrace> traces = message.getTraces();
+        assertEquals(1, traces.size());
+        assertEquals(1, traces.get(0).getSamplingPriority());
+        List<DecodedSpan> spans = traces.get(0).getSpans();
+        assertEquals(2, spans.size());
+        List<DecodedSpan> sorted = Decoder.sortByStart(spans);
 
-    DecodedSpan first = sorted.get(0);
-    long traceId = first.getTraceId();
-    validateSpan(
-        first,
-        traceId,
-        0,
-        "netty.request",
-        "GET /hello",
-        "smoke-test-java-app",
-        "web",
-        singletonMap("component", "netty"),
-        singletonMap("_dd.agent_psr", 1.0));
+        DecodedSpan first = sorted.get(0);
+        long traceId = first.getTraceId();
+        validateSpan(
+                first,
+                traceId,
+                0,
+                "netty.request",
+                "GET /hello",
+                "smoke-test-java-app",
+                "web",
+                singletonMap("component", "netty"),
+                singletonMap("_dd.agent_psr", 1.0));
 
-    DecodedSpan second = sorted.get(1);
-    validateSpan(
-        second,
-        traceId,
-        first.getSpanId(),
-        "WebController.hello",
-        "WebController.hello",
-        "smoke-test-java-app",
-        "web",
-        singletonMap("component", "spring-webflux-controller"),
-        singletonMap("_dd.measured", 1));
-  }
+        DecodedSpan second = sorted.get(1);
+        validateSpan(
+                second,
+                traceId,
+                first.getSpanId(),
+                "WebController.hello",
+                "WebController.hello",
+                "smoke-test-java-app",
+                "web",
+                singletonMap("component", "spring-webflux-controller"),
+                singletonMap("_dd.measured", 1));
+    }
 
-  @Test
-  public void sortByStart() throws Throwable {
-    byte[] buffer = readResourceFile("/greeting.msgpack");
-    DecodedMessage message = Decoder.decodeV05(buffer);
-    List<DecodedTrace> traces = message.getTraces();
-    assertEquals(1, traces.size());
-    final List<DecodedSpan> spans = traces.get(0).getSpans();
-    assertEquals(2, spans.size());
-    final List<DecodedSpan> sorted = Decoder.sortByStart(spans);
-    assertTrue(sorted.get(0).getStart() < sorted.get(1).getStart());
-    // Ensure that we cover all the branches
-    List<DecodedSpan> tmp = Decoder.sortByStart(sorted);
-    assertIterableEquals(sorted, tmp);
-    Collections.reverse(tmp);
-    tmp = Decoder.sortByStart(tmp);
-    assertIterableEquals(sorted, tmp);
-    tmp.set(1, tmp.get(0));
-    assertIterableEquals(tmp, Decoder.sortByStart(tmp));
-  }
+    @Test
+    public void sortByStart() throws Throwable {
+        byte[] buffer = readResourceFile("/greeting.msgpack");
+        DecodedMessage message = Decoder.decodeV05(buffer);
+        List<DecodedTrace> traces = message.getTraces();
+        assertEquals(1, traces.size());
+        final List<DecodedSpan> spans = traces.get(0).getSpans();
+        assertEquals(2, spans.size());
+        final List<DecodedSpan> sorted = Decoder.sortByStart(spans);
+        assertTrue(sorted.get(0).getStart() < sorted.get(1).getStart());
+        // Ensure that we cover all the branches
+        List<DecodedSpan> tmp = Decoder.sortByStart(sorted);
+        assertIterableEquals(sorted, tmp);
+        Collections.reverse(tmp);
+        tmp = Decoder.sortByStart(tmp);
+        assertIterableEquals(sorted, tmp);
+        tmp.set(1, tmp.get(0));
+        assertIterableEquals(tmp, Decoder.sortByStart(tmp));
+    }
 
-  private byte[] readResourceFile(String resourceName) throws IOException {
-    Path path = new File(getClass().getResource(resourceName).getFile()).toPath();
-    return Files.readAllBytes(path);
-  }
+    private byte[] readResourceFile(String resourceName) throws IOException {
+        Path path = new File(getClass().getResource(resourceName).getFile()).toPath();
+        return Files.readAllBytes(path);
+    }
 
-  public static void validateSpan(
-      DecodedSpan span,
-      long traceId,
-      long parentId,
-      String name,
-      String resource,
-      String service,
-      String type,
-      Map<String, String> meta,
-      Map<String, ? extends Number> metrics) {
-    assertEquals(traceId, span.getTraceId());
-    assertEquals(parentId, span.getParentId());
-    assertEquals(name, span.getName());
-    assertEquals(resource, span.getResource());
-    assertEquals(service, span.getService());
-    assertTrue(span.getDuration() > 0);
-    assertEquals(0, span.getError());
-    assertEquals(type, span.getType());
-    assertMapContainsKeyValues(span.getMeta(), meta);
-    assertMapContainsKeyValues(span.getMetrics(), metrics);
-  }
+    public static void validateSpan(
+            DecodedSpan span,
+            long traceId,
+            long parentId,
+            String name,
+            String resource,
+            String service,
+            String type,
+            Map<String, String> meta,
+            Map<String, ? extends Number> metrics) {
+        assertEquals(traceId, span.getTraceId());
+        assertEquals(parentId, span.getParentId());
+        assertEquals(name, span.getName());
+        assertEquals(resource, span.getResource());
+        assertEquals(service, span.getService());
+        assertTrue(span.getDuration() > 0);
+        assertEquals(0, span.getError());
+        assertEquals(type, span.getType());
+        assertMapContainsKeyValues(span.getMeta(), meta);
+        assertMapContainsKeyValues(span.getMetrics(), metrics);
+    }
 }
diff --git a/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/JsonDecoderTest.java b/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/JsonDecoderTest.java
index 78d60bf8e0f..c4724b41cb8 100644
--- a/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/JsonDecoderTest.java
+++ b/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/JsonDecoderTest.java
@@ -21,265 +21,261 @@
  */
 class JsonDecoderTest {
 
-  // A representative JSON trace body (an array of traces, each an array of v0.4-shaped spans), kept
-  // as a resource file rather than an inline literal for readability (folding, syntax
-  // highlighting).
-  private static final String TWO_TRACES = loadJson("/two-traces.json");
+    // A representative JSON trace body (an array of traces, each an array of v0.4-shaped spans), kept
+    // as a resource file rather than an inline literal for readability (folding, syntax
+    // highlighting).
+    private static final String TWO_TRACES = loadJson("/two-traces.json");
 
-  @Test
-  void decodesTraceAndSpanStructure() {
-    List<DecodedTrace> traces = Decoder.decodeJson(TWO_TRACES).getTraces();
+    @Test
+    void decodesTraceAndSpanStructure() {
+        List<DecodedTrace> traces = Decoder.decodeJson(TWO_TRACES).getTraces();
 
-    assertEquals(2, traces.size(), "trace count");
-    assertEquals(2, traces.get(0).getSpans().size(), "spans in first trace");
-    assertEquals(1, traces.get(1).getSpans().size(), "spans in second trace");
+        assertEquals(2, traces.size(), "trace count");
+        assertEquals(2, traces.get(0).getSpans().size(), "spans in first trace");
+        assertEquals(1, traces.get(1).getSpans().size(), "spans in second trace");
 
-    DecodedSpan root = traces.get(0).getSpans().get(0);
-    assertEquals("my-service", root.getService());
-    assertEquals("servlet.request", root.getName());
-    assertEquals("GET /greeting", root.getResource());
-    assertEquals("web", root.getType());
-    assertEquals(1234567890L, root.getTraceId());
-    assertEquals(111L, root.getSpanId());
-    assertEquals(0L, root.getParentId());
-    assertEquals(1600000000000000000L, root.getStart());
-    assertEquals(500000L, root.getDuration());
-    assertEquals(0, root.getError());
-  }
+        DecodedSpan root = traces.get(0).getSpans().get(0);
+        assertEquals("my-service", root.getService());
+        assertEquals("servlet.request", root.getName());
+        assertEquals("GET /greeting", root.getResource());
+        assertEquals("web", root.getType());
+        assertEquals(1234567890L, root.getTraceId());
+        assertEquals(111L, root.getSpanId());
+        assertEquals(0L, root.getParentId());
+        assertEquals(1600000000000000000L, root.getStart());
+        assertEquals(500000L, root.getDuration());
+        assertEquals(0, root.getError());
+    }
 
-  @Test
-  void mapsMetaAsStringsAndMetricsAsNumbers() {
-    List<DecodedSpan> spans = Decoder.decodeJson(TWO_TRACES).getTraces().get(0).getSpans();
+    @Test
+    void mapsMetaAsStringsAndMetricsAsNumbers() {
+        List<DecodedSpan> spans =
+                Decoder.decodeJson(TWO_TRACES).getTraces().get(0).getSpans();
 
-    Map<String, String> meta = spans.get(0).getMeta();
-    assertEquals("GET", meta.get("http.method"));
-    assertEquals("200", meta.get("http.status_code"));
+        Map<String, String> meta = spans.get(0).getMeta();
+        assertEquals("GET", meta.get("http.method"));
+        assertEquals("200", meta.get("http.status_code"));
 
-    Map<String, Number> metrics = spans.get(0).getMetrics();
-    // Integral metrics decode to Integer and fractional metrics to Double, matching the msgpack
-    // decoders (SpanV04.unpackNumber) so an assertion behaves identically across both backends.
-    assertEquals(1, metrics.get("_dd.top_level"));
-    assertEquals(0.75, metrics.get("_dd.agent_psr"));
+        Map<String, Number> metrics = spans.get(0).getMetrics();
+        // Integral metrics decode to Integer and fractional metrics to Double, matching the msgpack
+        // decoders (SpanV04.unpackNumber) so an assertion behaves identically across both backends.
+        assertEquals(1, metrics.get("_dd.top_level"));
+        assertEquals(0.75, metrics.get("_dd.agent_psr"));
 
-    // A serialized error span carries error != 0; the parent link is the enclosing root span id.
-    DecodedSpan child = spans.get(1);
-    assertEquals(1, child.getError());
-    assertEquals(111L, child.getParentId());
-    assertEquals("postgres", child.getMeta().get("db.type"));
-  }
+        // A serialized error span carries error != 0; the parent link is the enclosing root span id.
+        DecodedSpan child = spans.get(1);
+        assertEquals(1, child.getError());
+        assertEquals(111L, child.getParentId());
+        assertEquals("postgres", child.getMeta().get("db.type"));
+    }
 
-  @Test
-  void metaStructEmptyWhenAbsentAndAMapWhenPresent() {
-    // Absent meta_struct decodes to an empty map, matching the msgpack decoders (SpanV04).
-    DecodedSpan withoutMetaStruct =
-        Decoder.decodeJson(TWO_TRACES).getTraces().get(0).getSpans().get(0);
-    assertTrue(withoutMetaStruct.getMetaStruct().isEmpty());
+    @Test
+    void metaStructEmptyWhenAbsentAndAMapWhenPresent() {
+        // Absent meta_struct decodes to an empty map, matching the msgpack decoders (SpanV04).
+        DecodedSpan withoutMetaStruct =
+                Decoder.decodeJson(TWO_TRACES).getTraces().get(0).getSpans().get(0);
+        assertTrue(withoutMetaStruct.getMetaStruct().isEmpty());
 
-    String withMetaStruct = loadJson("/with-meta-struct.json");
-    Map<String, Object> metaStruct =
-        Decoder.decodeJson(withMetaStruct).getTraces().get(0).getSpans().get(0).getMetaStruct();
-    assertTrue(metaStruct.containsKey("appsec"));
-  }
+        String withMetaStruct = loadJson("/with-meta-struct.json");
+        Map<String, Object> metaStruct = Decoder.decodeJson(withMetaStruct)
+                .getTraces()
+                .get(0)
+                .getSpans()
+                .get(0)
+                .getMetaStruct();
+        assertTrue(metaStruct.containsKey("appsec"));
+    }
 
-  @Test
-  void emptyAndNullBodiesYieldNoTraces() {
-    assertTrue(Decoder.decodeJson("[]").getTraces().isEmpty(), "empty array => no traces");
-    // Moshi parses the JSON literal null as a null document; decode tolerates it.
-    assertTrue(Decoder.decodeJson("null").getTraces().isEmpty(), "null body => no traces");
+    @Test
+    void emptyAndNullBodiesYieldNoTraces() {
+        assertTrue(Decoder.decodeJson("[]").getTraces().isEmpty(), "empty array => no traces");
+        // Moshi parses the JSON literal null as a null document; decode tolerates it.
+        assertTrue(Decoder.decodeJson("null").getTraces().isEmpty(), "null body => no traces");
 
-    List<DecodedTrace> oneEmptyTrace = Decoder.decodeJson("[[]]").getTraces();
-    assertEquals(1, oneEmptyTrace.size());
-    assertTrue(oneEmptyTrace.get(0).getSpans().isEmpty(), "empty trace => no spans");
-  }
+        List<DecodedTrace> oneEmptyTrace = Decoder.decodeJson("[[]]").getTraces();
+        assertEquals(1, oneEmptyTrace.size());
+        assertTrue(oneEmptyTrace.get(0).getSpans().isEmpty(), "empty trace => no spans");
+    }
 
-  @Test
-  void decodesUnsignedIds() {
-    // Trace/span IDs are unsigned 64-bit; the agent emits them as JSON numbers that can exceed
-    // Long.MAX_VALUE. They must be parsed unsigned and kept as the signed bit pattern.
-    String maxUnsigned = Long.toUnsignedString(-1L); // 18446744073709551615 == 2^64 - 1
-    String json =
-        "[[{"
-            + "\"service\": \"s\", \"name\": \"n\", \"resource\": \"r\", \"type\": \"web\","
-            + "\"trace_id\": "
-            + maxUnsigned
-            + ", \"span_id\": "
-            + maxUnsigned
-            + ", \"parent_id\": 0, \"start\": 0, \"duration\": 0, \"error\": 0,"
-            + "\"meta\": {}, \"metrics\": {}"
-            + "}]]";
-    DecodedSpan span = Decoder.decodeJson(json).getTraces().get(0).getSpans().get(0);
-    assertEquals(-1L, span.getTraceId(), "unsigned 2^64-1 kept as its signed bit pattern");
-    assertEquals(-1L, span.getSpanId());
-    assertEquals(0L, span.getParentId());
-  }
+    @Test
+    void decodesUnsignedIds() {
+        // Trace/span IDs are unsigned 64-bit; the agent emits them as JSON numbers that can exceed
+        // Long.MAX_VALUE. They must be parsed unsigned and kept as the signed bit pattern.
+        String maxUnsigned = Long.toUnsignedString(-1L); // 18446744073709551615 == 2^64 - 1
+        String json = "[[{"
+                + "\"service\": \"s\", \"name\": \"n\", \"resource\": \"r\", \"type\": \"web\","
+                + "\"trace_id\": "
+                + maxUnsigned
+                + ", \"span_id\": "
+                + maxUnsigned
+                + ", \"parent_id\": 0, \"start\": 0, \"duration\": 0, \"error\": 0,"
+                + "\"meta\": {}, \"metrics\": {}"
+                + "}]]";
+        DecodedSpan span =
+                Decoder.decodeJson(json).getTraces().get(0).getSpans().get(0);
+        assertEquals(-1L, span.getTraceId(), "unsigned 2^64-1 kept as its signed bit pattern");
+        assertEquals(-1L, span.getSpanId());
+        assertEquals(0L, span.getParentId());
+    }
 
-  @Test
-  void preservesIntegralMetricTypesAndPrecision() {
-    // Integral metrics that fit an int stay Integer; larger integrals stay Long (exact, not rounded
-    // through Double); integrals beyond long range stay BigInteger (still exact, not Double);
-    // fractional metrics stay Double — matching SpanV04/SpanV05.unpackNumber so a metric assertion
-    // behaves identically whether the span came from the msgpack or JSON backend.
-    long aboveDoublePrecision = (1L << 53) + 1; // 9007199254740993, not representable as a double
-    BigInteger beyondLong = BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE); // 2^63
-    String json =
-        "[[{"
-            + "\"service\": \"s\", \"name\": \"n\", \"resource\": \"r\","
-            + "\"trace_id\": 1, \"span_id\": 1, \"parent_id\": 0, \"start\": 0, \"duration\": 0,"
-            + "\"error\": 0, \"meta\": {},"
-            + "\"metrics\": {\"small\": 1, \"big\": "
-            + aboveDoublePrecision
-            + ", \"huge\": "
-            + beyondLong
-            + ", \"ratio\": 0.5}"
-            + "}]]";
-    Map<String, Number> metrics =
-        Decoder.decodeJson(json).getTraces().get(0).getSpans().get(0).getMetrics();
+    @Test
+    void preservesIntegralMetricTypesAndPrecision() {
+        // Integral metrics that fit an int stay Integer; larger integrals stay Long (exact, not rounded
+        // through Double); integrals beyond long range stay BigInteger (still exact, not Double);
+        // fractional metrics stay Double — matching SpanV04/SpanV05.unpackNumber so a metric assertion
+        // behaves identically whether the span came from the msgpack or JSON backend.
+        long aboveDoublePrecision = (1L << 53) + 1; // 9007199254740993, not representable as a double
+        BigInteger beyondLong = BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE); // 2^63
+        String json = "[[{"
+                + "\"service\": \"s\", \"name\": \"n\", \"resource\": \"r\","
+                + "\"trace_id\": 1, \"span_id\": 1, \"parent_id\": 0, \"start\": 0, \"duration\": 0,"
+                + "\"error\": 0, \"meta\": {},"
+                + "\"metrics\": {\"small\": 1, \"big\": "
+                + aboveDoublePrecision
+                + ", \"huge\": "
+                + beyondLong
+                + ", \"ratio\": 0.5}"
+                + "}]]";
+        Map<String, Number> metrics =
+                Decoder.decodeJson(json).getTraces().get(0).getSpans().get(0).getMetrics();
 
-    assertEquals(1, metrics.get("small"), "int-range integral stays Integer");
-    assertEquals(aboveDoublePrecision, metrics.get("big"), "large integral stays Long, exact");
-    assertEquals(beyondLong, metrics.get("huge"), "beyond-long integral stays BigInteger, exact");
-    assertEquals(0.5, metrics.get("ratio"), "fractional stays Double");
-  }
+        assertEquals(1, metrics.get("small"), "int-range integral stays Integer");
+        assertEquals(aboveDoublePrecision, metrics.get("big"), "large integral stays Long, exact");
+        assertEquals(beyondLong, metrics.get("huge"), "beyond-long integral stays BigInteger, exact");
+        assertEquals(0.5, metrics.get("ratio"), "fractional stays Double");
+    }
 
-  @Test
-  void rejectsSpansMissingRequiredV04Fields() {
-    // The agent's Span schema marks name/trace_id/span_id/start/duration as required; a truncated
-    // or
-    // schema-mismatched response omitting any of them must fail loudly rather than decode into a
-    // span whose fields silently default to 0/null.
-    assertThrows(
-        IllegalStateException.class,
-        () ->
-            Decoder.decodeJson(oneSpan("\"trace_id\":1,\"span_id\":1,\"start\":0,\"duration\":0")),
-        "missing name");
-    assertThrows(
-        IllegalStateException.class,
-        () ->
-            Decoder.decodeJson(oneSpan("\"name\":\"n\",\"span_id\":1,\"start\":0,\"duration\":0")),
-        "missing trace_id");
-    assertThrows(
-        IllegalStateException.class,
-        () ->
-            Decoder.decodeJson(oneSpan("\"name\":\"n\",\"trace_id\":1,\"start\":0,\"duration\":0")),
-        "missing span_id");
-    assertThrows(
-        IllegalStateException.class,
-        () ->
-            Decoder.decodeJson(
-                oneSpan("\"name\":\"n\",\"trace_id\":1,\"span_id\":1,\"duration\":0")),
-        "missing start");
-    assertThrows(
-        IllegalStateException.class,
-        () ->
-            Decoder.decodeJson(oneSpan("\"name\":\"n\",\"trace_id\":1,\"span_id\":1,\"start\":0")),
-        "missing duration");
+    @Test
+    void rejectsSpansMissingRequiredV04Fields() {
+        // The agent's Span schema marks name/trace_id/span_id/start/duration as required; a truncated
+        // or
+        // schema-mismatched response omitting any of them must fail loudly rather than decode into a
+        // span whose fields silently default to 0/null.
+        assertThrows(
+                IllegalStateException.class,
+                () -> Decoder.decodeJson(oneSpan("\"trace_id\":1,\"span_id\":1,\"start\":0,\"duration\":0")),
+                "missing name");
+        assertThrows(
+                IllegalStateException.class,
+                () -> Decoder.decodeJson(oneSpan("\"name\":\"n\",\"span_id\":1,\"start\":0,\"duration\":0")),
+                "missing trace_id");
+        assertThrows(
+                IllegalStateException.class,
+                () -> Decoder.decodeJson(oneSpan("\"name\":\"n\",\"trace_id\":1,\"start\":0,\"duration\":0")),
+                "missing span_id");
+        assertThrows(
+                IllegalStateException.class,
+                () -> Decoder.decodeJson(oneSpan("\"name\":\"n\",\"trace_id\":1,\"span_id\":1,\"duration\":0")),
+                "missing start");
+        assertThrows(
+                IllegalStateException.class,
+                () -> Decoder.decodeJson(oneSpan("\"name\":\"n\",\"trace_id\":1,\"span_id\":1,\"start\":0")),
+                "missing duration");
 
-    // error and parent_id are optional per the agent schema: a span omitting both still decodes,
-    // with error defaulting to 0 (no error) and parent_id to 0 (root).
-    DecodedSpan span =
-        Decoder.decodeJson(
-                oneSpan("\"name\":\"n\",\"trace_id\":1,\"span_id\":1,\"start\":0,\"duration\":0"))
-            .getTraces()
-            .get(0)
-            .getSpans()
-            .get(0);
-    assertEquals(0, span.getError(), "absent error => 0");
-    assertEquals(0L, span.getParentId(), "absent parent_id => 0 (root)");
-  }
+        // error and parent_id are optional per the agent schema: a span omitting both still decodes,
+        // with error defaulting to 0 (no error) and parent_id to 0 (root).
+        DecodedSpan span = Decoder.decodeJson(
+                        oneSpan("\"name\":\"n\",\"trace_id\":1,\"span_id\":1,\"start\":0,\"duration\":0"))
+                .getTraces()
+                .get(0)
+                .getSpans()
+                .get(0);
+        assertEquals(0, span.getError(), "absent error => 0");
+        assertEquals(0L, span.getParentId(), "absent parent_id => 0 (root)");
+    }
 
-  @Test
-  void rejectsNullTraceEntry() {
-    // A null trace element ([null]) is corruption, not an empty trace; fail rather than silently
-    // decode it into an empty trace that still inflates the trace count.
-    assertThrows(IllegalStateException.class, () -> Decoder.decodeJson("[null]"));
-  }
+    @Test
+    void rejectsNullTraceEntry() {
+        // A null trace element ([null]) is corruption, not an empty trace; fail rather than silently
+        // decode it into an empty trace that still inflates the trace count.
+        assertThrows(IllegalStateException.class, () -> Decoder.decodeJson("[null]"));
+    }
 
-  @Test
-  void decodedTraceListIsUnmodifiable() {
-    // Matches the msgpack DecodedMessage implementations, which all expose an unmodifiable list.
-    List<DecodedTrace> traces = Decoder.decodeJson(TWO_TRACES).getTraces();
-    assertThrows(UnsupportedOperationException.class, traces::clear);
-  }
+    @Test
+    void decodedTraceListIsUnmodifiable() {
+        // Matches the msgpack DecodedMessage implementations, which all expose an unmodifiable list.
+        List<DecodedTrace> traces = Decoder.decodeJson(TWO_TRACES).getTraces();
+        assertThrows(UnsupportedOperationException.class, traces::clear);
+    }
 
-  /** Wraps a single span's JSON fields into a one-trace, one-span payload. */
-  private static String oneSpan(String fields) {
-    return "[[{" + fields + "}]]";
-  }
+    /** Wraps a single span's JSON fields into a one-trace, one-span payload. */
+    private static String oneSpan(String fields) {
+        return "[[{" + fields + "}]]";
+    }
 
-  /** Reads a JSON test fixture from the classpath (kept as a resource for readability). */
-  private static String loadJson(String resourceName) {
-    try (InputStream in = JsonDecoderTest.class.getResourceAsStream(resourceName)) {
-      if (in == null) {
-        throw new IllegalStateException("Missing test resource: " + resourceName);
-      }
-      ByteArrayOutputStream out = new ByteArrayOutputStream();
-      byte[] buffer = new byte[4096];
-      int read;
-      while ((read = in.read(buffer)) != -1) {
-        out.write(buffer, 0, read);
-      }
-      return out.toString("UTF-8");
-    } catch (IOException e) {
-      throw new UncheckedIOException("Failed to read test resource: " + resourceName, e);
+    /** Reads a JSON test fixture from the classpath (kept as a resource for readability). */
+    private static String loadJson(String resourceName) {
+        try (InputStream in = JsonDecoderTest.class.getResourceAsStream(resourceName)) {
+            if (in == null) {
+                throw new IllegalStateException("Missing test resource: " + resourceName);
+            }
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            byte[] buffer = new byte[4096];
+            int read;
+            while ((read = in.read(buffer)) != -1) {
+                out.write(buffer, 0, read);
+            }
+            return out.toString("UTF-8");
+        } catch (IOException e) {
+            throw new UncheckedIOException("Failed to read test resource: " + resourceName, e);
+        }
     }
-  }
 
-  @Test
-  void preservesMetaStructNumericTypesAcrossNesting() {
-    // meta_struct numeric leaves must decode to the same types the msgpack decoder produces
-    // (SpanV04.convertValueToObject): integers -> Long, floating-point -> Float, recursively
-    // through
-    // nested objects and arrays, with strings/booleans/null preserved. Otherwise an exact
-    // metaStruct(...) assertion or a leaf cast would behave differently across the two backends.
-    long aboveDoublePrecision = (1L << 53) + 1; // 9007199254740993, not representable as a double
-    BigInteger beyondLong = BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE); // 2^63
-    String json =
-        "[[{"
-            + "\"service\": \"s\", \"name\": \"n\", \"resource\": \"r\","
-            + "\"trace_id\": 1, \"span_id\": 1, \"parent_id\": 0, \"start\": 0, \"duration\": 0,"
-            + "\"error\": 0, \"meta\": {}, \"metrics\": {},"
-            + "\"meta_struct\": {\"appsec\": {"
-            + "  \"count\": 3,"
-            + "  \"rate\": 0.5,"
-            + "  \"whole\": 3.0,"
-            + "  \"nested\": {\"big\": "
-            + aboveDoublePrecision
-            + ", \"huge\": "
-            + beyondLong
-            + "},"
-            + "  \"list\": [1, 2.5, \"x\", true, null]"
-            + "}}"
-            + "}]]";
-    Map<String, Object> metaStruct =
-        Decoder.decodeJson(json).getTraces().get(0).getSpans().get(0).getMetaStruct();
+    @Test
+    void preservesMetaStructNumericTypesAcrossNesting() {
+        // meta_struct numeric leaves must decode to the same types the msgpack decoder produces
+        // (SpanV04.convertValueToObject): integers -> Long, floating-point -> Float, recursively
+        // through
+        // nested objects and arrays, with strings/booleans/null preserved. Otherwise an exact
+        // metaStruct(...) assertion or a leaf cast would behave differently across the two backends.
+        long aboveDoublePrecision = (1L << 53) + 1; // 9007199254740993, not representable as a double
+        BigInteger beyondLong = BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE); // 2^63
+        String json = "[[{"
+                + "\"service\": \"s\", \"name\": \"n\", \"resource\": \"r\","
+                + "\"trace_id\": 1, \"span_id\": 1, \"parent_id\": 0, \"start\": 0, \"duration\": 0,"
+                + "\"error\": 0, \"meta\": {}, \"metrics\": {},"
+                + "\"meta_struct\": {\"appsec\": {"
+                + "  \"count\": 3,"
+                + "  \"rate\": 0.5,"
+                + "  \"whole\": 3.0,"
+                + "  \"nested\": {\"big\": "
+                + aboveDoublePrecision
+                + ", \"huge\": "
+                + beyondLong
+                + "},"
+                + "  \"list\": [1, 2.5, \"x\", true, null]"
+                + "}}"
+                + "}]]";
+        Map<String, Object> metaStruct =
+                Decoder.decodeJson(json).getTraces().get(0).getSpans().get(0).getMetaStruct();
 
-    @SuppressWarnings("unchecked")
-    Map<String, Object> appsec = (Map<String, Object>) metaStruct.get("appsec");
-    assertEquals(3L, appsec.get("count"), "integer leaf -> Long");
-    assertEquals(0.5F, appsec.get("rate"), "float leaf -> Float");
-    // A whole-number float: the live agent emits it as "3.0" (json.dumps keeps the decimal point),
-    // so it must box to Float like the msgpack FLOAT leaf, not Long. Verified via a real
-    // round-trip.
-    assertEquals(3.0F, appsec.get("whole"), "whole-number float keeps .0 -> Float");
+        @SuppressWarnings("unchecked")
+        Map<String, Object> appsec = (Map<String, Object>) metaStruct.get("appsec");
+        assertEquals(3L, appsec.get("count"), "integer leaf -> Long");
+        assertEquals(0.5F, appsec.get("rate"), "float leaf -> Float");
+        // A whole-number float: the live agent emits it as "3.0" (json.dumps keeps the decimal point),
+        // so it must box to Float like the msgpack FLOAT leaf, not Long. Verified via a real
+        // round-trip.
+        assertEquals(3.0F, appsec.get("whole"), "whole-number float keeps .0 -> Float");
 
-    @SuppressWarnings("unchecked")
-    Map<String, Object> nested = (Map<String, Object>) appsec.get("nested");
-    assertEquals(aboveDoublePrecision, nested.get("big"), "large integer stays Long, exact");
-    assertEquals(beyondLong, nested.get("huge"), "beyond-long integer stays BigInteger, exact");
+        @SuppressWarnings("unchecked")
+        Map<String, Object> nested = (Map<String, Object>) appsec.get("nested");
+        assertEquals(aboveDoublePrecision, nested.get("big"), "large integer stays Long, exact");
+        assertEquals(beyondLong, nested.get("huge"), "beyond-long integer stays BigInteger, exact");
 
-    @SuppressWarnings("unchecked")
-    List<Object> list = (List<Object>) appsec.get("list");
-    assertEquals(1L, list.get(0), "integer in array -> Long");
-    assertEquals(2.5F, list.get(1), "float in array -> Float");
-    assertEquals("x", list.get(2), "string in array preserved");
-    assertEquals(Boolean.TRUE, list.get(3), "boolean in array preserved");
-    assertNull(list.get(4), "null leaf preserved");
-  }
+        @SuppressWarnings("unchecked")
+        List<Object> list = (List<Object>) appsec.get("list");
+        assertEquals(1L, list.get(0), "integer in array -> Long");
+        assertEquals(2.5F, list.get(1), "float in array -> Float");
+        assertEquals("x", list.get(2), "string in array preserved");
+        assertEquals(Boolean.TRUE, list.get(3), "boolean in array preserved");
+        assertNull(list.get(4), "null leaf preserved");
+    }
 
-  @Test
-  void malformedJsonThrows() {
-    IllegalStateException e =
-        assertThrows(IllegalStateException.class, () -> Decoder.decodeJson("{ not valid json"));
-    assertTrue(e.getMessage().contains("{ not valid json"), "message should include the body");
-  }
+    @Test
+    void malformedJsonThrows() {
+        IllegalStateException e =
+                assertThrows(IllegalStateException.class, () -> Decoder.decodeJson("{ not valid json"));
+        assertTrue(e.getMessage().contains("{ not valid json"), "message should include the body");
+    }
 }
diff --git a/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/SpanLinksDecoderTest.java b/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/SpanLinksDecoderTest.java
index 19f12012dba..8cdf2f718cb 100644
--- a/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/SpanLinksDecoderTest.java
+++ b/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/SpanLinksDecoderTest.java
@@ -13,221 +13,214 @@
 import org.junit.jupiter.api.Test;
 
 class SpanLinksDecoderTest {
-  // The decoder keeps the tag name private, so spell it out the way the tracer writes it.
-  private static final String SPAN_LINKS_TAG = "_dd.span_links";
-  private static final String TRACE_ID_128 = "11223344556677889900aabbccddeeff";
-  private static final long TRACE_ID_LOW = 0x9900aabbccddeeffL;
-
-  @Test
-  void absentOrEmptyTagYieldsNoLink() {
-    assertTrue(DecodedSpanLinks.fromMeta(emptyMap()).isEmpty(), "no tag in meta");
-    assertTrue(fromTag(null).isEmpty(), "null tag");
-    assertTrue(fromTag("").isEmpty(), "empty tag");
-    assertTrue(fromTag("[]").isEmpty(), "empty array");
-    assertTrue(fromTag("null").isEmpty(), "JSON null");
-  }
-
-  @Test
-  void decodesMinimalLinkApplyingDefaults() {
-    List<DecodedSpanLink> links =
-        fromTag("[{\"span_id\":\"123456789abcdef0\",\"trace_id\":\"" + TRACE_ID_128 + "\"}]");
-
-    assertEquals(1, links.size());
-    DecodedSpanLink link = links.get(0);
-    assertEquals(TRACE_ID_LOW, link.getTraceId(), "a 128-bit id narrows to its low-order half");
-    assertEquals(0x123456789abcdef0L, link.getSpanId());
-    assertEquals((byte) 0, link.getTraceFlags(), "absent flags default to 0");
-    assertEquals("", link.getTraceState(), "absent tracestate defaults to empty");
-    assertTrue(link.getAttributes().isEmpty(), "absent attributes default to empty");
-  }
-
-  @Test
-  void decodesFullLink() {
-    List<DecodedSpanLink> links =
-        fromTag(
-            "[{\"trace_id\":\""
+    // The decoder keeps the tag name private, so spell it out the way the tracer writes it.
+    private static final String SPAN_LINKS_TAG = "_dd.span_links";
+    private static final String TRACE_ID_128 = "11223344556677889900aabbccddeeff";
+    private static final long TRACE_ID_LOW = 0x9900aabbccddeeffL;
+
+    @Test
+    void absentOrEmptyTagYieldsNoLink() {
+        assertTrue(DecodedSpanLinks.fromMeta(emptyMap()).isEmpty(), "no tag in meta");
+        assertTrue(fromTag(null).isEmpty(), "null tag");
+        assertTrue(fromTag("").isEmpty(), "empty tag");
+        assertTrue(fromTag("[]").isEmpty(), "empty array");
+        assertTrue(fromTag("null").isEmpty(), "JSON null");
+    }
+
+    @Test
+    void decodesMinimalLinkApplyingDefaults() {
+        List<DecodedSpanLink> links =
+                fromTag("[{\"span_id\":\"123456789abcdef0\",\"trace_id\":\"" + TRACE_ID_128 + "\"}]");
+
+        assertEquals(1, links.size());
+        DecodedSpanLink link = links.get(0);
+        assertEquals(TRACE_ID_LOW, link.getTraceId(), "a 128-bit id narrows to its low-order half");
+        assertEquals(0x123456789abcdef0L, link.getSpanId());
+        assertEquals((byte) 0, link.getTraceFlags(), "absent flags default to 0");
+        assertEquals("", link.getTraceState(), "absent tracestate defaults to empty");
+        assertTrue(link.getAttributes().isEmpty(), "absent attributes default to empty");
+    }
+
+    @Test
+    void decodesFullLink() {
+        List<DecodedSpanLink> links = fromTag("[{\"trace_id\":\""
                 + TRACE_ID_128
                 + "\",\"span_id\":\"a\",\"flags\":1,"
                 + "\"tracestate\":\"dd=s:1\","
                 + "\"attributes\":{\"link.kind\":\"span-pointer\",\"ptr.dir\":\"d\"}}]");
 
-    DecodedSpanLink link = links.get(0);
-    assertEquals(0xaL, link.getSpanId(), "an unpadded span id decodes");
-    assertEquals((byte) 1, link.getTraceFlags());
-    assertEquals("dd=s:1", link.getTraceState());
-    Map<String, String> expected = new HashMap<>();
-    expected.put("link.kind", "span-pointer");
-    expected.put("ptr.dir", "d");
-    assertEquals(expected, link.getAttributes());
-  }
-
-  @Test
-  void preservesLinkOrderAndDecodesUnsignedSpanIds() {
-    List<DecodedSpanLink> links =
-        fromTag(
-            "[{\"trace_id\":\"0\",\"span_id\":\"1\"},"
+        DecodedSpanLink link = links.get(0);
+        assertEquals(0xaL, link.getSpanId(), "an unpadded span id decodes");
+        assertEquals((byte) 1, link.getTraceFlags());
+        assertEquals("dd=s:1", link.getTraceState());
+        Map<String, String> expected = new HashMap<>();
+        expected.put("link.kind", "span-pointer");
+        expected.put("ptr.dir", "d");
+        assertEquals(expected, link.getAttributes());
+    }
+
+    @Test
+    void preservesLinkOrderAndDecodesUnsignedSpanIds() {
+        List<DecodedSpanLink> links = fromTag("[{\"trace_id\":\"0\",\"span_id\":\"1\"},"
                 + "{\"trace_id\":\"0\",\"span_id\":\"ffffffffffffffff\"},"
                 + "{\"trace_id\":\"0\",\"span_id\":\"2\"}]");
 
-    assertEquals(3, links.size());
-    assertEquals(1L, links.get(0).getSpanId());
-    assertEquals(-1L, links.get(1).getSpanId(), "an unsigned span id above Long.MAX_VALUE");
-    assertEquals(2L, links.get(2).getSpanId());
-  }
-
-  @Test
-  void decodesAShortTraceId() {
-    DecodedSpanLink link = fromTag("[{\"trace_id\":\"abcd\",\"span_id\":\"1\"}]").get(0);
-
-    assertEquals(0xabcdL, link.getTraceId());
-  }
-
-  @Test
-  void unknownKeysAreIgnored() {
-    DecodedSpanLink link =
-        fromTag("[{\"trace_id\":\"1\",\"span_id\":\"1\",\"something_new\":\"whatever\"}]").get(0);
-
-    assertEquals(1L, link.getTraceId());
-  }
-
-  @Test
-  void malformedTagsThrow() {
-    assertThrows(IllegalStateException.class, () -> fromTag("not json"), "malformed JSON");
-    assertThrows(
-        IllegalStateException.class, () -> fromTag("[{\"span_id\":\"1\"}]"), "missing trace_id");
-    assertThrows(
-        IllegalStateException.class, () -> fromTag("[{\"trace_id\":\"1\"}]"), "missing span_id");
-    assertThrows(
-        IllegalStateException.class,
-        () -> fromTag("[{\"trace_id\":\"1\",\"span_id\":\"zz\"}]"),
-        "malformed span id");
-    assertThrows(IllegalStateException.class, () -> fromTag("[null]"), "null link entry");
-  }
-
-  @Test
-  void linkFactoryNormalizesAbsentValues() {
-    DecodedSpanLink link = DecodedSpanLinks.link(2L, 3L, (byte) 4, null, null);
-
-    assertEquals(2L, link.getTraceId());
-    assertEquals(3L, link.getSpanId());
-    assertEquals((byte) 4, link.getTraceFlags());
-    assertEquals("", link.getTraceState());
-    assertTrue(link.getAttributes().isEmpty());
-
-    DecodedSpanLink withValues =
-        DecodedSpanLinks.link(0L, 0L, (byte) 0, "dd=s:2", singletonMap("k", "v"));
-    assertEquals("dd=s:2", withValues.getTraceState());
-    assertEquals(singletonMap("k", "v"), withValues.getAttributes());
-  }
-
-  @Test
-  void rendersIdentifiersAsHexadecimal() {
-    String rendered = DecodedSpanLinks.link(TRACE_ID_LOW, 0xaL, (byte) 0, "", null).toString();
-
-    assertTrue(rendered.contains("traceId=9900aabbccddeeff"), "renders the trace id: " + rendered);
-    assertTrue(rendered.contains("spanId=a"), "renders the span id: " + rendered);
-  }
-
-  @Test
-  void treatsAnExplicitlyEmptyAttributeMapAsNone() {
-    DecodedSpanLink link =
-        DecodedSpanLinks.link(0L, 0L, (byte) 0, "", java.util.Collections.emptyMap());
-
-    assertTrue(link.getAttributes().isEmpty());
-  }
-
-  private static List<DecodedSpanLink> fromTag(String tagValue) {
-    return DecodedSpanLinks.fromMeta(singletonMap(SPAN_LINKS_TAG, tagValue));
-  }
-
-  @Test
-  void decodedSpanExposesLinksAndKeepsTheTagVisible() {
-    String tag = "[{\\\"trace_id\\\":\\\"" + TRACE_ID_128 + "\\\",\\\"span_id\\\":\\\"a\\\"}]";
-    String json =
-        "[[{\"service\":\"s\",\"name\":\"n\",\"resource\":\"r\","
-            + "\"trace_id\":1,\"span_id\":1,\"parent_id\":0,\"start\":0,\"duration\":1,\"error\":0,"
-            + "\"metrics\":{},\"meta\":{\""
-            + SPAN_LINKS_TAG
-            + "\":\""
-            + tag
-            + "\"}}]]";
-
-    DecodedSpan span = Decoder.decodeJson(json).getTraces().get(0).getSpans().get(0);
-
-    assertEquals(1, span.getLinks().size());
-    assertEquals(0xaL, span.getLinks().get(0).getSpanId());
-    assertNotNull(
-        span.getMeta().get(SPAN_LINKS_TAG), "the tag stays visible as the untyped meta entry");
-  }
-
-  @Test
-  void decodesStructuredSpanLinksFieldFromAV1Payload() {
-    // The agent converts a v1.0 payload's structured links into a top-level span_links field,
-    // with decimal identifiers, rather than into the meta tag.
-    String json =
-        "[[{\"service\":\"s\",\"name\":\"n\",\"resource\":\"r\","
-            + "\"trace_id\":1,\"span_id\":1,\"parent_id\":0,\"start\":0,\"duration\":1,\"error\":0,"
-            + "\"metrics\":{},\"meta\":{},"
-            + "\"span_links\":[{\"trace_id\":11068046444225730559,\"trace_id_high\":1234,"
-            + "\"span_id\":10,\"flags\":1,\"tracestate\":\"dd=s:1\","
-            + "\"attributes\":{\"link.kind\":\"span-pointer\"}}]}]]";
-
-    DecodedSpan span = Decoder.decodeJson(json).getTraces().get(0).getSpans().get(0);
-
-    assertEquals(1, span.getLinks().size());
-    DecodedSpanLink link = span.getLinks().get(0);
-    assertEquals(
-        Long.parseUnsignedLong("11068046444225730559"),
-        link.getTraceId(),
-        "an unsigned id above Long.MAX_VALUE survives");
-    assertEquals(10L, link.getSpanId());
-    assertEquals((byte) 1, link.getTraceFlags());
-    assertEquals("dd=s:1", link.getTraceState());
-    assertEquals(singletonMap("link.kind", "span-pointer"), link.getAttributes());
-  }
-
-  @Test
-  void structuredSpanLinksFieldWinsOverTheMetaTag() {
-    String json =
-        "[[{\"service\":\"s\",\"name\":\"n\",\"resource\":\"r\","
-            + "\"trace_id\":1,\"span_id\":1,\"parent_id\":0,\"start\":0,\"duration\":1,\"error\":0,"
-            + "\"metrics\":{},\"meta\":{\""
-            + SPAN_LINKS_TAG
-            + "\":\"[{\\\"trace_id\\\":\\\"1\\\",\\\"span_id\\\":\\\"99\\\"}]\"},"
-            + "\"span_links\":[{\"trace_id\":1,\"span_id\":7}]}]]";
-
-    DecodedSpan span = Decoder.decodeJson(json).getTraces().get(0).getSpans().get(0);
-
-    assertEquals(1, span.getLinks().size());
-    assertEquals(7L, span.getLinks().get(0).getSpanId(), "the structured field is preferred");
-  }
-
-  @Test
-  void anEmptyStructuredSpanLinksFieldWinsOverTheMetaTag() {
-    // A v1.0 payload always carries the span_links field, so an empty one means the span has no
-    // link, whichever legacy meta tag the payload also holds.
-    String json =
-        "[[{\"service\":\"s\",\"name\":\"n\",\"resource\":\"r\","
-            + "\"trace_id\":1,\"span_id\":1,\"parent_id\":0,\"start\":0,\"duration\":1,\"error\":0,"
-            + "\"metrics\":{},\"meta\":{\""
-            + SPAN_LINKS_TAG
-            + "\":\"[{\\\"trace_id\\\":\\\"1\\\",\\\"span_id\\\":\\\"99\\\"}]\"},"
-            + "\"span_links\":[]}]]";
-
-    DecodedSpan span = Decoder.decodeJson(json).getTraces().get(0).getSpans().get(0);
-
-    assertTrue(span.getLinks().isEmpty(), "the structured field is preferred, even when empty");
-  }
-
-  @Test
-  void decodedSpanWithoutTheTagExposesNoLink() {
-    String json =
-        "[[{\"service\":\"s\",\"name\":\"n\",\"resource\":\"r\","
-            + "\"trace_id\":1,\"span_id\":1,\"parent_id\":0,\"start\":0,\"duration\":1,\"error\":0,"
-            + "\"metrics\":{},\"meta\":{}}]]";
-
-    DecodedSpan span = Decoder.decodeJson(json).getTraces().get(0).getSpans().get(0);
-
-    assertTrue(span.getLinks().isEmpty());
-  }
+        assertEquals(3, links.size());
+        assertEquals(1L, links.get(0).getSpanId());
+        assertEquals(-1L, links.get(1).getSpanId(), "an unsigned span id above Long.MAX_VALUE");
+        assertEquals(2L, links.get(2).getSpanId());
+    }
+
+    @Test
+    void decodesAShortTraceId() {
+        DecodedSpanLink link =
+                fromTag("[{\"trace_id\":\"abcd\",\"span_id\":\"1\"}]").get(0);
+
+        assertEquals(0xabcdL, link.getTraceId());
+    }
+
+    @Test
+    void unknownKeysAreIgnored() {
+        DecodedSpanLink link = fromTag("[{\"trace_id\":\"1\",\"span_id\":\"1\",\"something_new\":\"whatever\"}]")
+                .get(0);
+
+        assertEquals(1L, link.getTraceId());
+    }
+
+    @Test
+    void malformedTagsThrow() {
+        assertThrows(IllegalStateException.class, () -> fromTag("not json"), "malformed JSON");
+        assertThrows(IllegalStateException.class, () -> fromTag("[{\"span_id\":\"1\"}]"), "missing trace_id");
+        assertThrows(IllegalStateException.class, () -> fromTag("[{\"trace_id\":\"1\"}]"), "missing span_id");
+        assertThrows(
+                IllegalStateException.class,
+                () -> fromTag("[{\"trace_id\":\"1\",\"span_id\":\"zz\"}]"),
+                "malformed span id");
+        assertThrows(IllegalStateException.class, () -> fromTag("[null]"), "null link entry");
+    }
+
+    @Test
+    void linkFactoryNormalizesAbsentValues() {
+        DecodedSpanLink link = DecodedSpanLinks.link(2L, 3L, (byte) 4, null, null);
+
+        assertEquals(2L, link.getTraceId());
+        assertEquals(3L, link.getSpanId());
+        assertEquals((byte) 4, link.getTraceFlags());
+        assertEquals("", link.getTraceState());
+        assertTrue(link.getAttributes().isEmpty());
+
+        DecodedSpanLink withValues = DecodedSpanLinks.link(0L, 0L, (byte) 0, "dd=s:2", singletonMap("k", "v"));
+        assertEquals("dd=s:2", withValues.getTraceState());
+        assertEquals(singletonMap("k", "v"), withValues.getAttributes());
+    }
+
+    @Test
+    void rendersIdentifiersAsHexadecimal() {
+        String rendered =
+                DecodedSpanLinks.link(TRACE_ID_LOW, 0xaL, (byte) 0, "", null).toString();
+
+        assertTrue(rendered.contains("traceId=9900aabbccddeeff"), "renders the trace id: " + rendered);
+        assertTrue(rendered.contains("spanId=a"), "renders the span id: " + rendered);
+    }
+
+    @Test
+    void treatsAnExplicitlyEmptyAttributeMapAsNone() {
+        DecodedSpanLink link = DecodedSpanLinks.link(0L, 0L, (byte) 0, "", java.util.Collections.emptyMap());
+
+        assertTrue(link.getAttributes().isEmpty());
+    }
+
+    private static List<DecodedSpanLink> fromTag(String tagValue) {
+        return DecodedSpanLinks.fromMeta(singletonMap(SPAN_LINKS_TAG, tagValue));
+    }
+
+    @Test
+    void decodedSpanExposesLinksAndKeepsTheTagVisible() {
+        String tag = "[{\\\"trace_id\\\":\\\"" + TRACE_ID_128 + "\\\",\\\"span_id\\\":\\\"a\\\"}]";
+        String json = "[[{\"service\":\"s\",\"name\":\"n\",\"resource\":\"r\","
+                + "\"trace_id\":1,\"span_id\":1,\"parent_id\":0,\"start\":0,\"duration\":1,\"error\":0,"
+                + "\"metrics\":{},\"meta\":{\""
+                + SPAN_LINKS_TAG
+                + "\":\""
+                + tag
+                + "\"}}]]";
+
+        DecodedSpan span =
+                Decoder.decodeJson(json).getTraces().get(0).getSpans().get(0);
+
+        assertEquals(1, span.getLinks().size());
+        assertEquals(0xaL, span.getLinks().get(0).getSpanId());
+        assertNotNull(span.getMeta().get(SPAN_LINKS_TAG), "the tag stays visible as the untyped meta entry");
+    }
+
+    @Test
+    void decodesStructuredSpanLinksFieldFromAV1Payload() {
+        // The agent converts a v1.0 payload's structured links into a top-level span_links field,
+        // with decimal identifiers, rather than into the meta tag.
+        String json = "[[{\"service\":\"s\",\"name\":\"n\",\"resource\":\"r\","
+                + "\"trace_id\":1,\"span_id\":1,\"parent_id\":0,\"start\":0,\"duration\":1,\"error\":0,"
+                + "\"metrics\":{},\"meta\":{},"
+                + "\"span_links\":[{\"trace_id\":11068046444225730559,\"trace_id_high\":1234,"
+                + "\"span_id\":10,\"flags\":1,\"tracestate\":\"dd=s:1\","
+                + "\"attributes\":{\"link.kind\":\"span-pointer\"}}]}]]";
+
+        DecodedSpan span =
+                Decoder.decodeJson(json).getTraces().get(0).getSpans().get(0);
+
+        assertEquals(1, span.getLinks().size());
+        DecodedSpanLink link = span.getLinks().get(0);
+        assertEquals(
+                Long.parseUnsignedLong("11068046444225730559"),
+                link.getTraceId(),
+                "an unsigned id above Long.MAX_VALUE survives");
+        assertEquals(10L, link.getSpanId());
+        assertEquals((byte) 1, link.getTraceFlags());
+        assertEquals("dd=s:1", link.getTraceState());
+        assertEquals(singletonMap("link.kind", "span-pointer"), link.getAttributes());
+    }
+
+    @Test
+    void structuredSpanLinksFieldWinsOverTheMetaTag() {
+        String json = "[[{\"service\":\"s\",\"name\":\"n\",\"resource\":\"r\","
+                + "\"trace_id\":1,\"span_id\":1,\"parent_id\":0,\"start\":0,\"duration\":1,\"error\":0,"
+                + "\"metrics\":{},\"meta\":{\""
+                + SPAN_LINKS_TAG
+                + "\":\"[{\\\"trace_id\\\":\\\"1\\\",\\\"span_id\\\":\\\"99\\\"}]\"},"
+                + "\"span_links\":[{\"trace_id\":1,\"span_id\":7}]}]]";
+
+        DecodedSpan span =
+                Decoder.decodeJson(json).getTraces().get(0).getSpans().get(0);
+
+        assertEquals(1, span.getLinks().size());
+        assertEquals(7L, span.getLinks().get(0).getSpanId(), "the structured field is preferred");
+    }
+
+    @Test
+    void anEmptyStructuredSpanLinksFieldWinsOverTheMetaTag() {
+        // A v1.0 payload always carries the span_links field, so an empty one means the span has no
+        // link, whichever legacy meta tag the payload also holds.
+        String json = "[[{\"service\":\"s\",\"name\":\"n\",\"resource\":\"r\","
+                + "\"trace_id\":1,\"span_id\":1,\"parent_id\":0,\"start\":0,\"duration\":1,\"error\":0,"
+                + "\"metrics\":{},\"meta\":{\""
+                + SPAN_LINKS_TAG
+                + "\":\"[{\\\"trace_id\\\":\\\"1\\\",\\\"span_id\\\":\\\"99\\\"}]\"},"
+                + "\"span_links\":[]}]]";
+
+        DecodedSpan span =
+                Decoder.decodeJson(json).getTraces().get(0).getSpans().get(0);
+
+        assertTrue(span.getLinks().isEmpty(), "the structured field is preferred, even when empty");
+    }
+
+    @Test
+    void decodedSpanWithoutTheTagExposesNoLink() {
+        String json = "[[{\"service\":\"s\",\"name\":\"n\",\"resource\":\"r\","
+                + "\"trace_id\":1,\"span_id\":1,\"parent_id\":0,\"start\":0,\"duration\":1,\"error\":0,"
+                + "\"metrics\":{},\"meta\":{}}]]";
+
+        DecodedSpan span =
+                Decoder.decodeJson(json).getTraces().get(0).getSpans().get(0);
+
+        assertTrue(span.getLinks().isEmpty());
+    }
 }
diff --git a/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/v1/raw/SpanV1Test.java b/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/v1/raw/SpanV1Test.java
index 03e4ece9d6e..174ea1c9920 100644
--- a/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/v1/raw/SpanV1Test.java
+++ b/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/v1/raw/SpanV1Test.java
@@ -19,77 +19,77 @@
  * {@code UINT64} — a shape the {@code sample_v1.msgpack} fixture never produces.
  */
 class SpanV1Test {
-  // 0xfedcba9876543210: an unsigned 64-bit identifier above Long.MAX_VALUE.
-  private static final String UNSIGNED_ID = "18364758544493064720";
-  private static final long UNSIGNED_ID_BITS = 0xfedcba9876543210L;
+    // 0xfedcba9876543210: an unsigned 64-bit identifier above Long.MAX_VALUE.
+    private static final String UNSIGNED_ID = "18364758544493064720";
+    private static final long UNSIGNED_ID_BITS = 0xfedcba9876543210L;
 
-  @Test
-  void decodesUnsignedSpanAndParentIds() throws IOException {
-    MessageBufferPacker packer = MessagePack.newDefaultBufferPacker();
-    packer.packMapHeader(2);
-    packer.packInt(SpanV1.SPAN_FIELD_SPAN_ID);
-    packer.packBigInteger(new BigInteger(UNSIGNED_ID));
-    packer.packInt(SpanV1.SPAN_FIELD_PARENT_ID);
-    packer.packBigInteger(new BigInteger(UNSIGNED_ID));
+    @Test
+    void decodesUnsignedSpanAndParentIds() throws IOException {
+        MessageBufferPacker packer = MessagePack.newDefaultBufferPacker();
+        packer.packMapHeader(2);
+        packer.packInt(SpanV1.SPAN_FIELD_SPAN_ID);
+        packer.packBigInteger(new BigInteger(UNSIGNED_ID));
+        packer.packInt(SpanV1.SPAN_FIELD_PARENT_ID);
+        packer.packBigInteger(new BigInteger(UNSIGNED_ID));
 
-    SpanV1 span = SpanV1.unpack(unpacker(packer), new ArrayList<>());
+        SpanV1 span = SpanV1.unpack(unpacker(packer), new ArrayList<>());
 
-    assertEquals(UNSIGNED_ID_BITS, span.getSpanId(), "span id above Long.MAX_VALUE");
-    assertEquals(UNSIGNED_ID_BITS, span.getParentId(), "parent id above Long.MAX_VALUE");
-  }
+        assertEquals(UNSIGNED_ID_BITS, span.getSpanId(), "span id above Long.MAX_VALUE");
+        assertEquals(UNSIGNED_ID_BITS, span.getParentId(), "parent id above Long.MAX_VALUE");
+    }
 
-  @Test
-  void decodesUnsignedSignedAndZeroSpanIdsAlike() throws IOException {
-    assertEquals(UNSIGNED_ID_BITS, spanIdOf(new BigInteger(UNSIGNED_ID)));
-    assertEquals(42L, spanIdOf(BigInteger.valueOf(42)));
-    assertEquals(0L, spanIdOf(BigInteger.ZERO));
-  }
+    @Test
+    void decodesUnsignedSignedAndZeroSpanIdsAlike() throws IOException {
+        assertEquals(UNSIGNED_ID_BITS, spanIdOf(new BigInteger(UNSIGNED_ID)));
+        assertEquals(42L, spanIdOf(BigInteger.valueOf(42)));
+        assertEquals(0L, spanIdOf(BigInteger.ZERO));
+    }
 
-  @Test
-  void decodesUnsignedLinkSpanId() throws IOException {
-    MessageBufferPacker packer = MessagePack.newDefaultBufferPacker();
-    packer.packArrayHeader(1);
-    packer.packMapHeader(2);
-    packer.packInt(SpanV1.LINK_FIELD_TRACE_ID);
-    packer.packBinaryHeader(16);
-    packer.writePayload(traceIdBytes());
-    packer.packInt(SpanV1.LINK_FIELD_SPAN_ID);
-    packer.packBigInteger(new BigInteger(UNSIGNED_ID));
+    @Test
+    void decodesUnsignedLinkSpanId() throws IOException {
+        MessageBufferPacker packer = MessagePack.newDefaultBufferPacker();
+        packer.packArrayHeader(1);
+        packer.packMapHeader(2);
+        packer.packInt(SpanV1.LINK_FIELD_TRACE_ID);
+        packer.packBinaryHeader(16);
+        packer.writePayload(traceIdBytes());
+        packer.packInt(SpanV1.LINK_FIELD_SPAN_ID);
+        packer.packBigInteger(new BigInteger(UNSIGNED_ID));
 
-    List<DecodedSpanLink> links = SpanV1.unpackSpanLinks(unpacker(packer), new ArrayList<>());
+        List<DecodedSpanLink> links = SpanV1.unpackSpanLinks(unpacker(packer), new ArrayList<>());
 
-    assertEquals(1, links.size());
-    assertEquals(UNSIGNED_ID_BITS, links.get(0).getSpanId(), "link span id above Long.MAX_VALUE");
-    assertEquals(UNSIGNED_ID_BITS, links.get(0).getTraceId(), "link trace id low-order half");
-  }
+        assertEquals(1, links.size());
+        assertEquals(UNSIGNED_ID_BITS, links.get(0).getSpanId(), "link span id above Long.MAX_VALUE");
+        assertEquals(UNSIGNED_ID_BITS, links.get(0).getTraceId(), "link trace id low-order half");
+    }
 
-  @Test
-  void noSpanLinksDecodeToAnEmptyList() throws IOException {
-    MessageBufferPacker packer = MessagePack.newDefaultBufferPacker();
-    packer.packArrayHeader(0);
+    @Test
+    void noSpanLinksDecodeToAnEmptyList() throws IOException {
+        MessageBufferPacker packer = MessagePack.newDefaultBufferPacker();
+        packer.packArrayHeader(0);
 
-    assertEquals(emptyList(), SpanV1.unpackSpanLinks(unpacker(packer), new ArrayList<>()));
-  }
+        assertEquals(emptyList(), SpanV1.unpackSpanLinks(unpacker(packer), new ArrayList<>()));
+    }
 
-  private static long spanIdOf(BigInteger id) throws IOException {
-    MessageBufferPacker packer = MessagePack.newDefaultBufferPacker();
-    packer.packMapHeader(1);
-    packer.packInt(SpanV1.SPAN_FIELD_SPAN_ID);
-    packer.packBigInteger(id);
-    return SpanV1.unpack(unpacker(packer), new ArrayList<>()).getSpanId();
-  }
+    private static long spanIdOf(BigInteger id) throws IOException {
+        MessageBufferPacker packer = MessagePack.newDefaultBufferPacker();
+        packer.packMapHeader(1);
+        packer.packInt(SpanV1.SPAN_FIELD_SPAN_ID);
+        packer.packBigInteger(id);
+        return SpanV1.unpack(unpacker(packer), new ArrayList<>()).getSpanId();
+    }
 
-  /** A 16-byte trace identifier whose low-order half is {@link #UNSIGNED_ID_BITS}. */
-  private static byte[] traceIdBytes() {
-    byte[] bytes = new byte[16];
-    for (int i = 0; i < 8; i++) {
-      bytes[8 + i] = (byte) (UNSIGNED_ID_BITS >>> (8 * (7 - i)));
+    /** A 16-byte trace identifier whose low-order half is {@link #UNSIGNED_ID_BITS}. */
+    private static byte[] traceIdBytes() {
+        byte[] bytes = new byte[16];
+        for (int i = 0; i < 8; i++) {
+            bytes[8 + i] = (byte) (UNSIGNED_ID_BITS >>> (8 * (7 - i)));
+        }
+        return bytes;
     }
-    return bytes;
-  }
 
-  private static MessageUnpacker unpacker(MessageBufferPacker packer) throws IOException {
-    packer.close();
-    return MessagePack.newDefaultUnpacker(packer.toByteArray());
-  }
+    private static MessageUnpacker unpacker(MessageBufferPacker packer) throws IOException {
+        packer.close();
+        return MessagePack.newDefaultUnpacker(packer.toByteArray());
+    }
 }
diff --git a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/AbstractClassConstantConvertor.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/AbstractClassConstantConvertor.java
index f68d4f813c0..87c5380ecbf 100644
--- a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/AbstractClassConstantConvertor.java
+++ b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/AbstractClassConstantConvertor.java
@@ -6,61 +6,59 @@
 import org.junit.jupiter.params.converter.ArgumentConverter;
 
 public abstract class AbstractClassConstantConvertor<T> implements ArgumentConverter {
-  /**
-   * Returns the class name (simple class name, not fully qualified) of the constants to convert.
-   *
-   * @return The simple class name.
-   */
-  protected abstract String className();
+    /**
+     * Returns the class name (simple class name, not fully qualified) of the constants to convert.
+     *
+     * @return The simple class name.
+     */
+    protected abstract String className();
 
-  /**
-   * Returns the constant mapping between their string representations to their values.
-   *
-   * @return The constant mapping between their string representations to their values.
-   */
-  protected abstract Map<String, T> mapping();
+    /**
+     * Returns the constant mapping between their string representations to their values.
+     *
+     * @return The constant mapping between their string representations to their values.
+     */
+    protected abstract Map<String, T> mapping();
 
-  @Override
-  public T convert(Object source, ParameterContext context) {
-    if (source == null) {
-      return null;
-    }
-    String className = className();
-    int length = className.length();
-    String s = source.toString();
-    if (s.startsWith(className) && s.charAt(length) == '.') {
-      s = s.substring(length + 1);
-    }
-    T mappedValue = mapping().get(s);
-    if (mappedValue == null) {
-      if (throwsOnUnsupportedValue()) {
-        throw new ArgumentConversionException(
-            "Unsupported constant " + source + " from " + className);
-      }
-      return convertWhenNoMapping(source);
+    @Override
+    public T convert(Object source, ParameterContext context) {
+        if (source == null) {
+            return null;
+        }
+        String className = className();
+        int length = className.length();
+        String s = source.toString();
+        if (s.startsWith(className) && s.charAt(length) == '.') {
+            s = s.substring(length + 1);
+        }
+        T mappedValue = mapping().get(s);
+        if (mappedValue == null) {
+            if (throwsOnUnsupportedValue()) {
+                throw new ArgumentConversionException("Unsupported constant " + source + " from " + className);
+            }
+            return convertWhenNoMapping(source);
+        }
+        return mappedValue;
     }
-    return mappedValue;
-  }
 
-  protected boolean throwsOnUnsupportedValue() {
-    return true;
-  }
-
-  protected T convertWhenNoMapping(Object source) {
-    return null;
-  }
+    protected boolean throwsOnUnsupportedValue() {
+        return true;
+    }
 
-  public abstract static class AbstractStringFallThruConverter
-      extends AbstractClassConstantConvertor<String> {
-    @Override
-    public String convert(Object source, ParameterContext context) {
-      String convert = super.convert(source, context);
-      return convert == null ? source.toString() : convert;
+    protected T convertWhenNoMapping(Object source) {
+        return null;
     }
 
-    @Override
-    protected boolean throwsOnUnsupportedValue() {
-      return false;
+    public abstract static class AbstractStringFallThruConverter extends AbstractClassConstantConvertor<String> {
+        @Override
+        public String convert(Object source, ParameterContext context) {
+            String convert = super.convert(source, context);
+            return convert == null ? source.toString() : convert;
+        }
+
+        @Override
+        protected boolean throwsOnUnsupportedValue() {
+            return false;
+        }
     }
-  }
 }
diff --git a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/ConfigDefaultsConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/ConfigDefaultsConverter.java
index 856b73ebbba..c803698ca8b 100644
--- a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/ConfigDefaultsConverter.java
+++ b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/ConfigDefaultsConverter.java
@@ -8,22 +8,21 @@
 import java.util.Map;
 
 public class ConfigDefaultsConverter extends AbstractStringFallThruConverter {
-  private static final Map<String, String> MAPPING;
+    private static final Map<String, String> MAPPING;
 
-  static {
-    MAPPING = new HashMap<>();
-    MAPPING.put("DEFAULT_SERVICE_NAME", DEFAULT_SERVICE_NAME);
-    MAPPING.put(
-        "DEFAULT_SERVLET_ROOT_CONTEXT_SERVICE_NAME", DEFAULT_SERVLET_ROOT_CONTEXT_SERVICE_NAME);
-  }
+    static {
+        MAPPING = new HashMap<>();
+        MAPPING.put("DEFAULT_SERVICE_NAME", DEFAULT_SERVICE_NAME);
+        MAPPING.put("DEFAULT_SERVLET_ROOT_CONTEXT_SERVICE_NAME", DEFAULT_SERVLET_ROOT_CONTEXT_SERVICE_NAME);
+    }
 
-  @Override
-  protected String className() {
-    return "ConfigDefaults";
-  }
+    @Override
+    protected String className() {
+        return "ConfigDefaults";
+    }
 
-  @Override
-  protected Map<String, String> mapping() {
-    return MAPPING;
-  }
+    @Override
+    protected Map<String, String> mapping() {
+        return MAPPING;
+    }
 }
diff --git a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/DDSpanTypesConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/DDSpanTypesConverter.java
index 24cc9190908..01f4c18f589 100644
--- a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/DDSpanTypesConverter.java
+++ b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/DDSpanTypesConverter.java
@@ -37,51 +37,51 @@
 import java.util.Map;
 
 public class DDSpanTypesConverter extends AbstractClassConstantConvertor<String> {
-  private static final Map<String, String> MAPPING;
+    private static final Map<String, String> MAPPING;
 
-  static {
-    MAPPING = new HashMap<>();
-    MAPPING.put("HTTP_CLIENT", HTTP_CLIENT);
-    MAPPING.put("HTTP_SERVER", HTTP_SERVER);
-    MAPPING.put("RPC", RPC);
-    MAPPING.put("CACHE", CACHE);
-    MAPPING.put("SOAP", SOAP);
-    MAPPING.put("SQL", SQL);
-    MAPPING.put("MONGO", MONGO);
-    MAPPING.put("CASSANDRA", CASSANDRA);
-    MAPPING.put("COUCHBASE", COUCHBASE);
-    MAPPING.put("REDIS", REDIS);
-    MAPPING.put("MEMCACHED", MEMCACHED);
-    MAPPING.put("ELASTICSEARCH", ELASTICSEARCH);
-    MAPPING.put("OPENSEARCH", OPENSEARCH);
-    MAPPING.put("HIBERNATE", HIBERNATE);
-    MAPPING.put("AEROSPIKE", AEROSPIKE);
-    MAPPING.put("DATANUCLEUS", DATANUCLEUS);
-    MAPPING.put("MESSAGE_CLIENT", MESSAGE_CLIENT);
-    MAPPING.put("MESSAGE_CONSUMER", MESSAGE_CONSUMER);
-    MAPPING.put("MESSAGE_PRODUCER", MESSAGE_PRODUCER);
-    MAPPING.put("MESSAGE_BROKER", MESSAGE_BROKER);
-    MAPPING.put("GRAPHQL", GRAPHQL);
-    MAPPING.put("TEST", TEST);
-    MAPPING.put("TEST_SUITE_END", TEST_SUITE_END);
-    MAPPING.put("TEST_MODULE_END", TEST_MODULE_END);
-    MAPPING.put("TEST_SESSION_END", TEST_SESSION_END);
-    MAPPING.put("VULNERABILITY", VULNERABILITY);
-    MAPPING.put("PROTOBUF", PROTOBUF);
-    MAPPING.put("MULE", MULE);
-    MAPPING.put("VALKEY", VALKEY);
-    MAPPING.put("WEBSOCKET", WEBSOCKET);
-    MAPPING.put("SERVERLESS", SERVERLESS);
-    MAPPING.put("LLMOBS", LLMOBS);
-  }
+    static {
+        MAPPING = new HashMap<>();
+        MAPPING.put("HTTP_CLIENT", HTTP_CLIENT);
+        MAPPING.put("HTTP_SERVER", HTTP_SERVER);
+        MAPPING.put("RPC", RPC);
+        MAPPING.put("CACHE", CACHE);
+        MAPPING.put("SOAP", SOAP);
+        MAPPING.put("SQL", SQL);
+        MAPPING.put("MONGO", MONGO);
+        MAPPING.put("CASSANDRA", CASSANDRA);
+        MAPPING.put("COUCHBASE", COUCHBASE);
+        MAPPING.put("REDIS", REDIS);
+        MAPPING.put("MEMCACHED", MEMCACHED);
+        MAPPING.put("ELASTICSEARCH", ELASTICSEARCH);
+        MAPPING.put("OPENSEARCH", OPENSEARCH);
+        MAPPING.put("HIBERNATE", HIBERNATE);
+        MAPPING.put("AEROSPIKE", AEROSPIKE);
+        MAPPING.put("DATANUCLEUS", DATANUCLEUS);
+        MAPPING.put("MESSAGE_CLIENT", MESSAGE_CLIENT);
+        MAPPING.put("MESSAGE_CONSUMER", MESSAGE_CONSUMER);
+        MAPPING.put("MESSAGE_PRODUCER", MESSAGE_PRODUCER);
+        MAPPING.put("MESSAGE_BROKER", MESSAGE_BROKER);
+        MAPPING.put("GRAPHQL", GRAPHQL);
+        MAPPING.put("TEST", TEST);
+        MAPPING.put("TEST_SUITE_END", TEST_SUITE_END);
+        MAPPING.put("TEST_MODULE_END", TEST_MODULE_END);
+        MAPPING.put("TEST_SESSION_END", TEST_SESSION_END);
+        MAPPING.put("VULNERABILITY", VULNERABILITY);
+        MAPPING.put("PROTOBUF", PROTOBUF);
+        MAPPING.put("MULE", MULE);
+        MAPPING.put("VALKEY", VALKEY);
+        MAPPING.put("WEBSOCKET", WEBSOCKET);
+        MAPPING.put("SERVERLESS", SERVERLESS);
+        MAPPING.put("LLMOBS", LLMOBS);
+    }
 
-  @Override
-  protected String className() {
-    return "DDSpanTypes";
-  }
+    @Override
+    protected String className() {
+        return "DDSpanTypes";
+    }
 
-  @Override
-  protected Map<String, String> mapping() {
-    return MAPPING;
-  }
+    @Override
+    protected Map<String, String> mapping() {
+        return MAPPING;
+    }
 }
diff --git a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/PrioritySamplingConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/PrioritySamplingConverter.java
index 958d114048e..4afc870a7c8 100644
--- a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/PrioritySamplingConverter.java
+++ b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/PrioritySamplingConverter.java
@@ -10,24 +10,24 @@
 import java.util.Map;
 
 public class PrioritySamplingConverter extends AbstractClassConstantConvertor<Byte> {
-  private static final Map<String, Byte> MAPPING;
+    private static final Map<String, Byte> MAPPING;
 
-  static {
-    MAPPING = new HashMap<>();
-    MAPPING.put("UNSET", UNSET);
-    MAPPING.put("SAMPLER_KEEP", SAMPLER_KEEP);
-    MAPPING.put("SAMPLER_DROP", SAMPLER_DROP);
-    MAPPING.put("USER_DROP", USER_DROP);
-    MAPPING.put("USER_KEEP", USER_KEEP);
-  }
+    static {
+        MAPPING = new HashMap<>();
+        MAPPING.put("UNSET", UNSET);
+        MAPPING.put("SAMPLER_KEEP", SAMPLER_KEEP);
+        MAPPING.put("SAMPLER_DROP", SAMPLER_DROP);
+        MAPPING.put("USER_DROP", USER_DROP);
+        MAPPING.put("USER_KEEP", USER_KEEP);
+    }
 
-  @Override
-  protected String className() {
-    return "PrioritySampling";
-  }
+    @Override
+    protected String className() {
+        return "PrioritySampling";
+    }
 
-  @Override
-  protected Map<String, Byte> mapping() {
-    return MAPPING;
-  }
+    @Override
+    protected Map<String, Byte> mapping() {
+        return MAPPING;
+    }
 }
diff --git a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/ProductTraceSourceConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/ProductTraceSourceConverter.java
index e41876d964f..f964672a48c 100644
--- a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/ProductTraceSourceConverter.java
+++ b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/ProductTraceSourceConverter.java
@@ -10,24 +10,24 @@
 import java.util.Map;
 
 public class ProductTraceSourceConverter extends AbstractClassConstantConvertor<Integer> {
-  private static final Map<String, Integer> MAPPING;
+    private static final Map<String, Integer> MAPPING;
 
-  static {
-    MAPPING = new HashMap<>();
-    MAPPING.put("UNSET", UNSET);
-    MAPPING.put("APM", APM);
-    MAPPING.put("ASM", ASM);
-    MAPPING.put("DSM", DSM);
-    MAPPING.put("DBM", DBM);
-  }
+    static {
+        MAPPING = new HashMap<>();
+        MAPPING.put("UNSET", UNSET);
+        MAPPING.put("APM", APM);
+        MAPPING.put("ASM", ASM);
+        MAPPING.put("DSM", DSM);
+        MAPPING.put("DBM", DBM);
+    }
 
-  @Override
-  protected String className() {
-    return "ProductTraceSource";
-  }
+    @Override
+    protected String className() {
+        return "ProductTraceSource";
+    }
 
-  @Override
-  protected Map<String, Integer> mapping() {
-    return MAPPING;
-  }
+    @Override
+    protected Map<String, Integer> mapping() {
+        return MAPPING;
+    }
 }
diff --git a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/SamplingMechanismConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/SamplingMechanismConverter.java
index 2b30a4e82dd..d8b49f609ea 100644
--- a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/SamplingMechanismConverter.java
+++ b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/SamplingMechanismConverter.java
@@ -19,43 +19,43 @@
 import java.util.Map;
 
 public class SamplingMechanismConverter extends AbstractClassConstantConvertor<Byte> {
-  private static final Map<String, Byte> MAPPING;
-
-  static {
-    MAPPING = new HashMap<>();
-    MAPPING.put("UNKNOWN", UNKNOWN);
-    MAPPING.put("DEFAULT", DEFAULT);
-    MAPPING.put("AGENT_RATE", AGENT_RATE);
-    MAPPING.put("REMOTE_AUTO_RATE", REMOTE_AUTO_RATE);
-    MAPPING.put("LOCAL_USER_RULE", LOCAL_USER_RULE);
-    MAPPING.put("MANUAL", MANUAL);
-    MAPPING.put("APPSEC", APPSEC);
-    MAPPING.put("REMOTE_USER_RATE", REMOTE_USER_RATE);
-    MAPPING.put("SPAN_SAMPLING_RATE", SPAN_SAMPLING_RATE);
-    MAPPING.put("DATA_JOBS", DATA_JOBS);
-    MAPPING.put("REMOTE_USER_RULE", REMOTE_USER_RULE);
-    MAPPING.put("REMOTE_ADAPTIVE_RULE", REMOTE_ADAPTIVE_RULE);
-    MAPPING.put("AI_GUARD", AI_GUARD);
-    MAPPING.put("EXTERNAL_OVERRIDE", EXTERNAL_OVERRIDE);
-  }
-
-  @Override
-  protected String className() {
-    return "SamplingMechanism";
-  }
-
-  @Override
-  protected Map<String, Byte> mapping() {
-    return MAPPING;
-  }
-
-  @Override
-  protected boolean throwsOnUnsupportedValue() {
-    return false;
-  }
-
-  @Override
-  protected Byte convertWhenNoMapping(Object source) {
-    return Byte.parseByte((String) source);
-  }
+    private static final Map<String, Byte> MAPPING;
+
+    static {
+        MAPPING = new HashMap<>();
+        MAPPING.put("UNKNOWN", UNKNOWN);
+        MAPPING.put("DEFAULT", DEFAULT);
+        MAPPING.put("AGENT_RATE", AGENT_RATE);
+        MAPPING.put("REMOTE_AUTO_RATE", REMOTE_AUTO_RATE);
+        MAPPING.put("LOCAL_USER_RULE", LOCAL_USER_RULE);
+        MAPPING.put("MANUAL", MANUAL);
+        MAPPING.put("APPSEC", APPSEC);
+        MAPPING.put("REMOTE_USER_RATE", REMOTE_USER_RATE);
+        MAPPING.put("SPAN_SAMPLING_RATE", SPAN_SAMPLING_RATE);
+        MAPPING.put("DATA_JOBS", DATA_JOBS);
+        MAPPING.put("REMOTE_USER_RULE", REMOTE_USER_RULE);
+        MAPPING.put("REMOTE_ADAPTIVE_RULE", REMOTE_ADAPTIVE_RULE);
+        MAPPING.put("AI_GUARD", AI_GUARD);
+        MAPPING.put("EXTERNAL_OVERRIDE", EXTERNAL_OVERRIDE);
+    }
+
+    @Override
+    protected String className() {
+        return "SamplingMechanism";
+    }
+
+    @Override
+    protected Map<String, Byte> mapping() {
+        return MAPPING;
+    }
+
+    @Override
+    protected boolean throwsOnUnsupportedValue() {
+        return false;
+    }
+
+    @Override
+    protected Byte convertWhenNoMapping(Object source) {
+        return Byte.parseByte((String) source);
+    }
 }
diff --git a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/TagsConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/TagsConverter.java
index ad5ab38402f..5e4b58bcd6f 100644
--- a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/TagsConverter.java
+++ b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/TagsConverter.java
@@ -22,45 +22,45 @@
 import java.util.Map;
 
 public class TagsConverter extends AbstractStringFallThruConverter {
-  private static final Map<String, String> MAPPING;
+    private static final Map<String, String> MAPPING;
 
-  static {
-    MAPPING = new HashMap<>();
-    // Tags mapping (class name will be trimmed)
-    MAPPING.put("SPAN_KIND_SERVER", SPAN_KIND_SERVER);
-    MAPPING.put("SPAN_KIND_CLIENT", SPAN_KIND_CLIENT);
-    MAPPING.put("SPAN_KIND_PRODUCER", SPAN_KIND_PRODUCER);
-    MAPPING.put("SPAN_KIND_CONSUMER", SPAN_KIND_CONSUMER);
-    MAPPING.put("SPAN_KIND_BROKER", SPAN_KIND_BROKER);
-    MAPPING.put("PEER_SERVICE", PEER_SERVICE);
-    MAPPING.put("HTTP_URL", HTTP_URL);
-    MAPPING.put("HTTP_STATUS", HTTP_STATUS);
-    MAPPING.put("HTTP_METHOD", HTTP_METHOD);
-    // DDTags mapping with class name
-    MAPPING.put("DDTags.SPAN_TYPE", SPAN_TYPE);
-    MAPPING.put("DDTags.SERVICE_NAME", SERVICE_NAME);
-    MAPPING.put("DDTags.RESOURCE_NAME", RESOURCE_NAME);
-    MAPPING.put("DDTags.THREAD_NAME", THREAD_NAME);
-    MAPPING.put("DDTags.THREAD_ID", THREAD_ID);
-    MAPPING.put("DDTags.MANUAL_KEEP", MANUAL_KEEP);
-    MAPPING.put("DDTags.MANUAL_DROP", MANUAL_DROP);
-    // DDTags mapping with direct field name
-    MAPPING.put("SPAN_TYPE", SPAN_TYPE);
-    MAPPING.put("SERVICE_NAME", SERVICE_NAME);
-    MAPPING.put("RESOURCE_NAME", RESOURCE_NAME);
-    MAPPING.put("THREAD_NAME", THREAD_NAME);
-    MAPPING.put("THREAD_ID", THREAD_ID);
-    MAPPING.put("MANUAL_KEEP", MANUAL_KEEP);
-    MAPPING.put("MANUAL_DROP", MANUAL_DROP);
-  }
+    static {
+        MAPPING = new HashMap<>();
+        // Tags mapping (class name will be trimmed)
+        MAPPING.put("SPAN_KIND_SERVER", SPAN_KIND_SERVER);
+        MAPPING.put("SPAN_KIND_CLIENT", SPAN_KIND_CLIENT);
+        MAPPING.put("SPAN_KIND_PRODUCER", SPAN_KIND_PRODUCER);
+        MAPPING.put("SPAN_KIND_CONSUMER", SPAN_KIND_CONSUMER);
+        MAPPING.put("SPAN_KIND_BROKER", SPAN_KIND_BROKER);
+        MAPPING.put("PEER_SERVICE", PEER_SERVICE);
+        MAPPING.put("HTTP_URL", HTTP_URL);
+        MAPPING.put("HTTP_STATUS", HTTP_STATUS);
+        MAPPING.put("HTTP_METHOD", HTTP_METHOD);
+        // DDTags mapping with class name
+        MAPPING.put("DDTags.SPAN_TYPE", SPAN_TYPE);
+        MAPPING.put("DDTags.SERVICE_NAME", SERVICE_NAME);
+        MAPPING.put("DDTags.RESOURCE_NAME", RESOURCE_NAME);
+        MAPPING.put("DDTags.THREAD_NAME", THREAD_NAME);
+        MAPPING.put("DDTags.THREAD_ID", THREAD_ID);
+        MAPPING.put("DDTags.MANUAL_KEEP", MANUAL_KEEP);
+        MAPPING.put("DDTags.MANUAL_DROP", MANUAL_DROP);
+        // DDTags mapping with direct field name
+        MAPPING.put("SPAN_TYPE", SPAN_TYPE);
+        MAPPING.put("SERVICE_NAME", SERVICE_NAME);
+        MAPPING.put("RESOURCE_NAME", RESOURCE_NAME);
+        MAPPING.put("THREAD_NAME", THREAD_NAME);
+        MAPPING.put("THREAD_ID", THREAD_ID);
+        MAPPING.put("MANUAL_KEEP", MANUAL_KEEP);
+        MAPPING.put("MANUAL_DROP", MANUAL_DROP);
+    }
 
-  @Override
-  protected String className() {
-    return "Tags";
-  }
+    @Override
+    protected String className() {
+        return "Tags";
+    }
 
-  @Override
-  protected Map<String, String> mapping() {
-    return MAPPING;
-  }
+    @Override
+    protected Map<String, String> mapping() {
+        return MAPPING;
+    }
 }
diff --git a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/TraceIdConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/TraceIdConverter.java
index db2ec553dbe..da7cb55b305 100644
--- a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/TraceIdConverter.java
+++ b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/converter/TraceIdConverter.java
@@ -22,42 +22,42 @@
  * <p>All other values are passed through unchanged.
  */
 public class TraceIdConverter implements ArgumentConverter {
-  // 2^64 - 1
-  public static final String TRACE_ID_MAX = Long.toUnsignedString(-1L);
-  // 2^64 - 2
-  public static final String TRACE_ID_MAX_MINUS_1 = Long.toUnsignedString(-2L);
-  // 2^64 (first out-of-range value)
-  public static final String TRACE_ID_MAX_PLUS_1 = new BigInteger(TRACE_ID_MAX).add(ONE).toString();
+    // 2^64 - 1
+    public static final String TRACE_ID_MAX = Long.toUnsignedString(-1L);
+    // 2^64 - 2
+    public static final String TRACE_ID_MAX_MINUS_1 = Long.toUnsignedString(-2L);
+    // 2^64 (first out-of-range value)
+    public static final String TRACE_ID_MAX_PLUS_1 =
+            new BigInteger(TRACE_ID_MAX).add(ONE).toString();
 
-  @Override
-  public Object convert(Object source, ParameterContext context)
-      throws ArgumentConversionException {
-    if (source == null) {
-      return null;
-    }
-    String s = source.toString();
-    String traceId;
-    switch (s) {
-      case "MAX":
-        traceId = TRACE_ID_MAX;
-        break;
-      case "MAX-1":
-        traceId = TRACE_ID_MAX_MINUS_1;
-        break;
-      case "MAX+1":
-        traceId = TRACE_ID_MAX_PLUS_1;
-        break;
-      default:
-        traceId = s;
-    }
+    @Override
+    public Object convert(Object source, ParameterContext context) throws ArgumentConversionException {
+        if (source == null) {
+            return null;
+        }
+        String s = source.toString();
+        String traceId;
+        switch (s) {
+            case "MAX":
+                traceId = TRACE_ID_MAX;
+                break;
+            case "MAX-1":
+                traceId = TRACE_ID_MAX_MINUS_1;
+                break;
+            case "MAX+1":
+                traceId = TRACE_ID_MAX_PLUS_1;
+                break;
+            default:
+                traceId = s;
+        }
 
-    Class<?> parameterType = context.getParameter().getType();
-    if (parameterType.isAssignableFrom(DDTraceId.class)) {
-      return DDTraceId.from(s);
-    } else if (parameterType.isAssignableFrom(Long.class)) {
-      return DDTraceId.from(s).toLong();
-    } else {
-      return traceId;
+        Class<?> parameterType = context.getParameter().getType();
+        if (parameterType.isAssignableFrom(DDTraceId.class)) {
+            return DDTraceId.from(s);
+        } else if (parameterType.isAssignableFrom(Long.class)) {
+            return DDTraceId.from(s).toLong();
+        } else {
+            return traceId;
+        }
     }
-  }
 }
diff --git a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/tabletest/BoxedValueConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/tabletest/BoxedValueConverter.java
index c91eeb62daf..ab3b8d5d616 100644
--- a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/tabletest/BoxedValueConverter.java
+++ b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/tabletest/BoxedValueConverter.java
@@ -22,39 +22,38 @@
  */
 public class BoxedValueConverter implements ArgumentConverter {
 
-  @Override
-  public Object convert(Object source, ParameterContext context)
-      throws ArgumentConversionException {
-    if (source == null) {
-      return null;
-    }
+    @Override
+    public Object convert(Object source, ParameterContext context) throws ArgumentConversionException {
+        if (source == null) {
+            return null;
+        }
 
-    String s = source.toString();
-    switch (s) {
-      case "":
-        return null;
-      case "true":
-        return Boolean.TRUE;
-      case "false":
-        return Boolean.FALSE;
-    }
-    if (s.endsWith("f")) {
-      try {
-        return Float.parseFloat(s.substring(0, s.length() - 1));
-      } catch (NumberFormatException ignored) {
-      }
-    }
+        String s = source.toString();
+        switch (s) {
+            case "":
+                return null;
+            case "true":
+                return Boolean.TRUE;
+            case "false":
+                return Boolean.FALSE;
+        }
+        if (s.endsWith("f")) {
+            try {
+                return Float.parseFloat(s.substring(0, s.length() - 1));
+            } catch (NumberFormatException ignored) {
+            }
+        }
 
-    if (s.contains(".")) {
-      try {
-        return Double.parseDouble(s);
-      } catch (NumberFormatException ignored) {
-      }
-    }
-    try {
-      return Integer.parseInt(s);
-    } catch (NumberFormatException ignored) {
+        if (s.contains(".")) {
+            try {
+                return Double.parseDouble(s);
+            } catch (NumberFormatException ignored) {
+            }
+        }
+        try {
+            return Integer.parseInt(s);
+        } catch (NumberFormatException ignored) {
+        }
+        return s;
     }
-    return s;
-  }
 }
diff --git a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/tabletest/ConfigValueConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/tabletest/ConfigValueConverter.java
index 7ccf1ff9df3..fe32e08ca5a 100644
--- a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/tabletest/ConfigValueConverter.java
+++ b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/tabletest/ConfigValueConverter.java
@@ -20,39 +20,38 @@
  */
 public class ConfigValueConverter implements ArgumentConverter {
 
-  private static final String BITSET_PREFIX = "bits(";
-  private static final Pattern COMMA = Pattern.compile(",");
+    private static final String BITSET_PREFIX = "bits(";
+    private static final Pattern COMMA = Pattern.compile(",");
 
-  @Override
-  public Object convert(Object source, ParameterContext context)
-      throws ArgumentConversionException {
-    if (source == null) return null;
-    if (source instanceof String) {
-      String s = ((String) source).trim();
-      if (s.startsWith(BITSET_PREFIX) && s.endsWith(")")) {
-        return parseBitSet(s.substring(BITSET_PREFIX.length(), s.length() - 1));
-      }
+    @Override
+    public Object convert(Object source, ParameterContext context) throws ArgumentConversionException {
+        if (source == null) return null;
+        if (source instanceof String) {
+            String s = ((String) source).trim();
+            if (s.startsWith(BITSET_PREFIX) && s.endsWith(")")) {
+                return parseBitSet(s.substring(BITSET_PREFIX.length(), s.length() - 1));
+            }
+        }
+        // Lists and maps are already parsed by TableTest
+        return source;
     }
-    // Lists and maps are already parsed by TableTest
-    return source;
-  }
 
-  private static BitSet parseBitSet(String intervals) {
-    BitSet bitSet = new BitSet();
-    for (String token : COMMA.split(intervals)) {
-      String trimmed = token.trim();
-      if (trimmed.isEmpty()) {
-        continue;
-      }
-      int dash = trimmed.indexOf('-');
-      if (dash > 0) {
-        int start = Integer.parseInt(trimmed.substring(0, dash).trim());
-        int end = Integer.parseInt(trimmed.substring(dash + 1).trim());
-        bitSet.set(start, end);
-      } else {
-        bitSet.set(Integer.parseInt(trimmed));
-      }
+    private static BitSet parseBitSet(String intervals) {
+        BitSet bitSet = new BitSet();
+        for (String token : COMMA.split(intervals)) {
+            String trimmed = token.trim();
+            if (trimmed.isEmpty()) {
+                continue;
+            }
+            int dash = trimmed.indexOf('-');
+            if (dash > 0) {
+                int start = Integer.parseInt(trimmed.substring(0, dash).trim());
+                int end = Integer.parseInt(trimmed.substring(dash + 1).trim());
+                bitSet.set(start, end);
+            } else {
+                bitSet.set(Integer.parseInt(trimmed));
+            }
+        }
+        return bitSet;
     }
-    return bitSet;
-  }
 }
diff --git a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/tabletest/TableTestTypeConverters.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/tabletest/TableTestTypeConverters.java
index 72b8e3a129b..ff3323cdf89 100644
--- a/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/tabletest/TableTestTypeConverters.java
+++ b/utils/test-junit-converter-utils/src/main/java/datadog/trace/test/junit/utils/tabletest/TableTestTypeConverters.java
@@ -7,94 +7,94 @@
 /** Shared converters for JUnit 5 TableTest tests that use unparsable constants. */
 public final class TableTestTypeConverters {
 
-  private TableTestTypeConverters() {}
+    private TableTestTypeConverters() {}
 
-  @TypeConverter
-  public static TrackType toTrackType(String value) {
-    if (value == null) {
-      return null;
-    }
-    String token = value.trim();
-    if (token.startsWith("TrackType.")) {
-      token = token.substring("TrackType.".length());
+    @TypeConverter
+    public static TrackType toTrackType(String value) {
+        if (value == null) {
+            return null;
+        }
+        String token = value.trim();
+        if (token.startsWith("TrackType.")) {
+            token = token.substring("TrackType.".length());
+        }
+        return TrackType.valueOf(token);
     }
-    return TrackType.valueOf(token);
-  }
 
-  @TypeConverter
-  public static ProtocolVersion toProtocolVersion(String value) {
-    if (value == null) {
-      return null;
-    }
-    String token = value.trim();
-    if (token.startsWith("ProtocolVersion.")) {
-      token = token.substring("ProtocolVersion.".length());
+    @TypeConverter
+    public static ProtocolVersion toProtocolVersion(String value) {
+        if (value == null) {
+            return null;
+        }
+        String token = value.trim();
+        if (token.startsWith("ProtocolVersion.")) {
+            token = token.substring("ProtocolVersion.".length());
+        }
+        return ProtocolVersion.valueOf(token);
     }
-    return ProtocolVersion.valueOf(token);
-  }
 
-  @TypeConverter
-  public static long toLong(String value) {
-    if (value == null) {
-      throw new IllegalArgumentException("Value cannot be null");
-    }
-    String token = value.trim();
-    switch (token) {
-      case "Long.MAX_VALUE":
-        return Long.MAX_VALUE;
-      case "Long.MIN_VALUE":
-        return Long.MIN_VALUE;
-      default:
-        return Long.decode(token);
+    @TypeConverter
+    public static long toLong(String value) {
+        if (value == null) {
+            throw new IllegalArgumentException("Value cannot be null");
+        }
+        String token = value.trim();
+        switch (token) {
+            case "Long.MAX_VALUE":
+                return Long.MAX_VALUE;
+            case "Long.MIN_VALUE":
+                return Long.MIN_VALUE;
+            default:
+                return Long.decode(token);
+        }
     }
-  }
 
-  @TypeConverter
-  public static int toInt(String value) {
-    if (value == null) {
-      throw new IllegalArgumentException("Value cannot be null");
-    }
-    String token = value.trim();
-    switch (token) {
-      case "Integer.MAX_VALUE":
-        return Integer.MAX_VALUE;
-      case "Integer.MIN_VALUE":
-        return Integer.MIN_VALUE;
-      default:
-        return Integer.decode(token);
+    @TypeConverter
+    public static int toInt(String value) {
+        if (value == null) {
+            throw new IllegalArgumentException("Value cannot be null");
+        }
+        String token = value.trim();
+        switch (token) {
+            case "Integer.MAX_VALUE":
+                return Integer.MAX_VALUE;
+            case "Integer.MIN_VALUE":
+                return Integer.MIN_VALUE;
+            default:
+                return Integer.decode(token);
+        }
     }
-  }
 
-  @TypeConverter
-  public static Number toNumber(String value) {
-    if (value == null) {
-      throw new IllegalArgumentException("Value cannot be null");
-    }
-    switch (value) {
-      case "Integer.MAX_VALUE":
-        return Integer.MAX_VALUE;
-      case "Integer.MIN_VALUE":
-        return Integer.MIN_VALUE;
-      case "Short.MAX_VALUE":
-        return Short.MAX_VALUE;
-      case "Short.MIN_VALUE":
-        return Short.MIN_VALUE;
-      case "Float.MAX_VALUE":
-        return Float.MAX_VALUE;
-      case "Float.MIN_VALUE":
-        return Float.MIN_VALUE;
-      case "Double.MAX_VALUE":
-        return Double.MAX_VALUE;
-      case "Double.MIN_VALUE":
-        return Double.MIN_VALUE;
-      default:
-        if (value.endsWith("f")) {
-          return Float.parseFloat(value);
+    @TypeConverter
+    public static Number toNumber(String value) {
+        if (value == null) {
+            throw new IllegalArgumentException("Value cannot be null");
         }
-        if (value.endsWith("d") || value.contains(".")) {
-          return Double.parseDouble(value);
+        switch (value) {
+            case "Integer.MAX_VALUE":
+                return Integer.MAX_VALUE;
+            case "Integer.MIN_VALUE":
+                return Integer.MIN_VALUE;
+            case "Short.MAX_VALUE":
+                return Short.MAX_VALUE;
+            case "Short.MIN_VALUE":
+                return Short.MIN_VALUE;
+            case "Float.MAX_VALUE":
+                return Float.MAX_VALUE;
+            case "Float.MIN_VALUE":
+                return Float.MIN_VALUE;
+            case "Double.MAX_VALUE":
+                return Double.MAX_VALUE;
+            case "Double.MIN_VALUE":
+                return Double.MIN_VALUE;
+            default:
+                if (value.endsWith("f")) {
+                    return Float.parseFloat(value);
+                }
+                if (value.endsWith("d") || value.contains(".")) {
+                    return Double.parseDouble(value);
+                }
+                return Integer.decode(value);
         }
-        return Integer.decode(value);
     }
-  }
 }
diff --git a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Any.java b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Any.java
index a7a506f9457..f309ee75a38 100644
--- a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Any.java
+++ b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Any.java
@@ -11,20 +11,20 @@
  * @param <T> the type of the value being matched
  */
 public class Any<T> implements Matcher<T> {
-  Any() {}
+    Any() {}
 
-  @Override
-  public Optional<T> expected() {
-    return Optional.empty();
-  }
+    @Override
+    public Optional<T> expected() {
+        return Optional.empty();
+    }
 
-  @Override
-  public String failureReason() {
-    return "";
-  }
+    @Override
+    public String failureReason() {
+        return "";
+    }
 
-  @Override
-  public boolean test(T t) {
-    return true;
-  }
+    @Override
+    public boolean test(T t) {
+        return true;
+    }
 }
diff --git a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Is.java b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Is.java
index f7a3346e64e..ecd114119bd 100644
--- a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Is.java
+++ b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Is.java
@@ -9,24 +9,24 @@
  * @param <T> The type of the value being matched.
  */
 public class Is<T> implements Matcher<T> {
-  private final T expected;
+    private final T expected;
 
-  Is(T expected) {
-    this.expected = expected;
-  }
+    Is(T expected) {
+        this.expected = expected;
+    }
 
-  @Override
-  public Optional<T> expected() {
-    return Optional.of(this.expected);
-  }
+    @Override
+    public Optional<T> expected() {
+        return Optional.of(this.expected);
+    }
 
-  @Override
-  public String failureReason() {
-    return "Unexpected value";
-  }
+    @Override
+    public String failureReason() {
+        return "Unexpected value";
+    }
 
-  @Override
-  public boolean test(T t) {
-    return this.expected.equals(t);
-  }
+    @Override
+    public boolean test(T t) {
+        return this.expected.equals(t);
+    }
 }
diff --git a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/IsFalse.java b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/IsFalse.java
index a22a746a69b..75156d84bca 100644
--- a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/IsFalse.java
+++ b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/IsFalse.java
@@ -4,20 +4,20 @@
 
 /** A {@link Matcher} implementation that checks if a given boolean value is {@code false}. */
 public class IsFalse implements Matcher<Boolean> {
-  IsFalse() {}
+    IsFalse() {}
 
-  @Override
-  public Optional<Boolean> expected() {
-    return Optional.of(false);
-  }
+    @Override
+    public Optional<Boolean> expected() {
+        return Optional.of(false);
+    }
 
-  @Override
-  public String failureReason() {
-    return "False expected";
-  }
+    @Override
+    public String failureReason() {
+        return "False expected";
+    }
 
-  @Override
-  public boolean test(Boolean t) {
-    return !t;
-  }
+    @Override
+    public boolean test(Boolean t) {
+        return !t;
+    }
 }
diff --git a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/IsNonNull.java b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/IsNonNull.java
index 91246e13b40..d74ac5941e5 100644
--- a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/IsNonNull.java
+++ b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/IsNonNull.java
@@ -8,20 +8,20 @@
  * @param <T> The type of the value being matched.
  */
 public class IsNonNull<T> implements Matcher<T> {
-  IsNonNull() {}
+    IsNonNull() {}
 
-  @Override
-  public Optional<T> expected() {
-    return Optional.empty();
-  }
+    @Override
+    public Optional<T> expected() {
+        return Optional.empty();
+    }
 
-  @Override
-  public String failureReason() {
-    return "Non-null value expected";
-  }
+    @Override
+    public String failureReason() {
+        return "Non-null value expected";
+    }
 
-  @Override
-  public boolean test(T t) {
-    return t != null;
-  }
+    @Override
+    public boolean test(T t) {
+        return t != null;
+    }
 }
diff --git a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/IsNull.java b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/IsNull.java
index 5a4a4b32892..b26a8696b76 100644
--- a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/IsNull.java
+++ b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/IsNull.java
@@ -8,20 +8,20 @@
  * @param <T> The type of the value being matched.
  */
 public class IsNull<T> implements Matcher<T> {
-  IsNull() {}
+    IsNull() {}
 
-  @Override
-  public Optional<T> expected() {
-    return Optional.empty();
-  }
+    @Override
+    public Optional<T> expected() {
+        return Optional.empty();
+    }
 
-  @Override
-  public String failureReason() {
-    return "Null value expected";
-  }
+    @Override
+    public String failureReason() {
+        return "Null value expected";
+    }
 
-  @Override
-  public boolean test(T t) {
-    return t == null;
-  }
+    @Override
+    public boolean test(T t) {
+        return t == null;
+    }
 }
diff --git a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/IsTrue.java b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/IsTrue.java
index e56f0c97d37..4841455b9e9 100644
--- a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/IsTrue.java
+++ b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/IsTrue.java
@@ -4,20 +4,20 @@
 
 /** A {@link Matcher} implementation that checks if a given boolean value is {@code true}. */
 public class IsTrue implements Matcher<Boolean> {
-  IsTrue() {}
+    IsTrue() {}
 
-  @Override
-  public Optional<Boolean> expected() {
-    return Optional.of(true);
-  }
+    @Override
+    public Optional<Boolean> expected() {
+        return Optional.of(true);
+    }
 
-  @Override
-  public String failureReason() {
-    return "True expected";
-  }
+    @Override
+    public String failureReason() {
+        return "True expected";
+    }
 
-  @Override
-  public boolean test(Boolean t) {
-    return t;
-  }
+    @Override
+    public boolean test(Boolean t) {
+        return t;
+    }
 }
diff --git a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Matcher.java b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Matcher.java
index 9395097e35a..a54ca0353b5 100644
--- a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Matcher.java
+++ b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Matcher.java
@@ -10,18 +10,18 @@
  * @param <T> the type of the value being matched.
  */
 public interface Matcher<T> extends Predicate<T> {
-  /**
-   * Gets the expected value for this matcher, if any.
-   *
-   * @return The expected value wrapped into an {@link Optional}, or {@link Optional#empty()} if no
-   *     specific value is expected.
-   */
-  Optional<T> expected();
+    /**
+     * Gets the expected value for this matcher, if any.
+     *
+     * @return The expected value wrapped into an {@link Optional}, or {@link Optional#empty()} if no
+     *     specific value is expected.
+     */
+    Optional<T> expected();
 
-  /**
-   * Explains the reason why the value does not match the expectation.
-   *
-   * @return The failure reason.
-   */
-  String failureReason();
+    /**
+     * Explains the reason why the value does not match the expectation.
+     *
+     * @return The failure reason.
+     */
+    String failureReason();
 }
diff --git a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Matchers.java b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Matchers.java
index 8be26fd99ce..82bf48835ec 100644
--- a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Matchers.java
+++ b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Matchers.java
@@ -9,118 +9,117 @@
 
 /** This class is a utility class to create generic matchers. */
 public final class Matchers {
-  private Matchers() {}
+    private Matchers() {}
 
-  /**
-   * Creates a matcher that checks if the provided value is equal to the expected value.
-   *
-   * @param <T> The type of the value being matched.
-   * @param expected The value to compare against
-   * @return A {@link Matcher} that verifies equality with the expected value.
-   */
-  public static <T> Matcher<T> is(T expected) {
-    return new Is<>(expected);
-  }
+    /**
+     * Creates a matcher that checks if the provided value is equal to the expected value.
+     *
+     * @param <T> The type of the value being matched.
+     * @param expected The value to compare against
+     * @return A {@link Matcher} that verifies equality with the expected value.
+     */
+    public static <T> Matcher<T> is(T expected) {
+        return new Is<>(expected);
+    }
 
-  /**
-   * Creates a matcher that checks if a given value is {@code null}.
-   *
-   * @param <T> The type of the value being matched.
-   * @return A {@link Matcher} that verifies the value is {@code null}.
-   */
-  public static <T> Matcher<T> isNull() {
-    return new IsNull<>();
-  }
+    /**
+     * Creates a matcher that checks if a given value is {@code null}.
+     *
+     * @param <T> The type of the value being matched.
+     * @return A {@link Matcher} that verifies the value is {@code null}.
+     */
+    public static <T> Matcher<T> isNull() {
+        return new IsNull<>();
+    }
 
-  /**
-   * Creates a matcher that checks if a given value is not {@code null}.
-   *
-   * @param <T> The type of the value being matched.
-   * @return A {@link Matcher} that verifies the value is not {@code null}.
-   */
-  public static <T> Matcher<T> isNonNull() {
-    return new IsNonNull<>();
-  }
+    /**
+     * Creates a matcher that checks if a given value is not {@code null}.
+     *
+     * @param <T> The type of the value being matched.
+     * @return A {@link Matcher} that verifies the value is not {@code null}.
+     */
+    public static <T> Matcher<T> isNonNull() {
+        return new IsNonNull<>();
+    }
 
-  /**
-   * Creates a matcher that checks if a given boolean value is {@code true}.
-   *
-   * @return A {@link Matcher} that verifies the value is {@code true}.
-   */
-  public static Matcher<Boolean> isTrue() {
-    return new IsTrue();
-  }
+    /**
+     * Creates a matcher that checks if a given boolean value is {@code true}.
+     *
+     * @return A {@link Matcher} that verifies the value is {@code true}.
+     */
+    public static Matcher<Boolean> isTrue() {
+        return new IsTrue();
+    }
 
-  /**
-   * Creates a matcher that checks if a given boolean value is {@code false}.
-   *
-   * @return A {@link Matcher} that verifies the value is {@code false}.
-   */
-  public static Matcher<Boolean> isFalse() {
-    return new IsFalse();
-  }
+    /**
+     * Creates a matcher that checks if a given boolean value is {@code false}.
+     *
+     * @return A {@link Matcher} that verifies the value is {@code false}.
+     */
+    public static Matcher<Boolean> isFalse() {
+        return new IsFalse();
+    }
 
-  /**
-   * Creates a {@link Matcher} that checks if a given string matches a specified regular expression.
-   *
-   * @param regex The regular expression pattern used for matching.
-   * @return A {@link Matcher} that validates if a string matches the provided regular expression.
-   */
-  public static Matcher<CharSequence> matches(String regex) {
-    return new Matches(Pattern.compile(regex));
-  }
+    /**
+     * Creates a {@link Matcher} that checks if a given string matches a specified regular expression.
+     *
+     * @param regex The regular expression pattern used for matching.
+     * @return A {@link Matcher} that validates if a string matches the provided regular expression.
+     */
+    public static Matcher<CharSequence> matches(String regex) {
+        return new Matches(Pattern.compile(regex));
+    }
 
-  /**
-   * Creates a {@link Matcher} that checks if a given string matches a specified {@link Pattern}.
-   *
-   * @param pattern The regular expression pattern used for matching.
-   * @return A {@link Matcher} that validates if a string matches the provided {@link Pattern}.
-   */
-  public static Matcher<CharSequence> matches(Pattern pattern) {
-    return new Matches(pattern);
-  }
+    /**
+     * Creates a {@link Matcher} that checks if a given string matches a specified {@link Pattern}.
+     *
+     * @param pattern The regular expression pattern used for matching.
+     * @return A {@link Matcher} that validates if a string matches the provided {@link Pattern}.
+     */
+    public static Matcher<CharSequence> matches(Pattern pattern) {
+        return new Matches(pattern);
+    }
 
-  /**
-   * Creates a {@link Matcher} that validates a given value based on the provided {@link Predicate}.
-   * This method allows specifying custom validation logic for matching input values.
-   *
-   * @param <T> The type of the value being validated.
-   * @param validator A {@link Predicate} representing the custom validation logic to be applied.
-   * @return A {@link Matcher} that uses the provided {@link Predicate} to validate input values.
-   */
-  public static <T> Matcher<T> validates(Predicate<T> validator) {
-    return new Validates<>(validator);
-  }
+    /**
+     * Creates a {@link Matcher} that validates a given value based on the provided {@link Predicate}.
+     * This method allows specifying custom validation logic for matching input values.
+     *
+     * @param <T> The type of the value being validated.
+     * @param validator A {@link Predicate} representing the custom validation logic to be applied.
+     * @return A {@link Matcher} that uses the provided {@link Predicate} to validate input values.
+     */
+    public static <T> Matcher<T> validates(Predicate<T> validator) {
+        return new Validates<>(validator);
+    }
 
-  /**
-   * Creates a matcher that always accepts any input value.
-   *
-   * @param <T> The type of the value being matched.
-   * @return A {@link Matcher} that accepts any value and always matches.
-   */
-  public static <T> Matcher<T> any() {
-    return new Any<>();
-  }
+    /**
+     * Creates a matcher that always accepts any input value.
+     *
+     * @param <T> The type of the value being matched.
+     * @return A {@link Matcher} that accepts any value and always matches.
+     */
+    public static <T> Matcher<T> any() {
+        return new Any<>();
+    }
 
-  /**
-   * Asserts that a value matches a given matcher. If the value does not match, an assertion error
-   * is thrown.
-   *
-   * @param matcher The matcher to test the value against, {@code null} if no validation is
-   *     required.
-   * @param value The value to be tested, {@code null} if no value is available.
-   * @param message The error message to include in the assertion failure.
-   * @param <T> The type of the value being tested.
-   */
-  public static <T> void assertValue(
-      @Nullable Matcher<T> matcher, @Nullable T value, String message) {
-    if (matcher != null && !matcher.test(value)) {
-      Optional<T> expected = matcher.expected();
-      assertionFailure()
-          .message(message + ". " + matcher.failureReason())
-          .expected(expected.orElse(null))
-          .actual(value)
-          .buildAndThrow();
+    /**
+     * Asserts that a value matches a given matcher. If the value does not match, an assertion error
+     * is thrown.
+     *
+     * @param matcher The matcher to test the value against, {@code null} if no validation is
+     *     required.
+     * @param value The value to be tested, {@code null} if no value is available.
+     * @param message The error message to include in the assertion failure.
+     * @param <T> The type of the value being tested.
+     */
+    public static <T> void assertValue(@Nullable Matcher<T> matcher, @Nullable T value, String message) {
+        if (matcher != null && !matcher.test(value)) {
+            Optional<T> expected = matcher.expected();
+            assertionFailure()
+                    .message(message + ". " + matcher.failureReason())
+                    .expected(expected.orElse(null))
+                    .actual(value)
+                    .buildAndThrow();
+        }
     }
-  }
 }
diff --git a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Matches.java b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Matches.java
index e19dfa7554f..b3be11dacd9 100644
--- a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Matches.java
+++ b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Matches.java
@@ -9,24 +9,24 @@
  * regular expression.
  */
 public class Matches implements Matcher<CharSequence> {
-  private final Pattern pattern;
+    private final Pattern pattern;
 
-  Matches(Pattern pattern) {
-    this.pattern = pattern;
-  }
+    Matches(Pattern pattern) {
+        this.pattern = pattern;
+    }
 
-  @Override
-  public Optional<CharSequence> expected() {
-    return Optional.empty();
-  }
+    @Override
+    public Optional<CharSequence> expected() {
+        return Optional.empty();
+    }
 
-  @Override
-  public String failureReason() {
-    return "Non matching value";
-  }
+    @Override
+    public String failureReason() {
+        return "Non matching value";
+    }
 
-  @Override
-  public boolean test(CharSequence s) {
-    return this.pattern.matcher(s).matches();
-  }
+    @Override
+    public boolean test(CharSequence s) {
+        return this.pattern.matcher(s).matches();
+    }
 }
diff --git a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Validates.java b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Validates.java
index ffa0773dab5..529babfe0d3 100644
--- a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Validates.java
+++ b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/assertions/Validates.java
@@ -11,24 +11,24 @@
  * @param <T> The type of the value being validated.
  */
 public class Validates<T> implements Matcher<T> {
-  private final Predicate<T> validator;
+    private final Predicate<T> validator;
 
-  Validates(Predicate<T> validator) {
-    this.validator = validator;
-  }
+    Validates(Predicate<T> validator) {
+        this.validator = validator;
+    }
 
-  @Override
-  public Optional<T> expected() {
-    return Optional.empty();
-  }
+    @Override
+    public Optional<T> expected() {
+        return Optional.empty();
+    }
 
-  @Override
-  public String failureReason() {
-    return "Invalid value";
-  }
+    @Override
+    public String failureReason() {
+        return "Invalid value";
+    }
 
-  @Override
-  public boolean test(T t) {
-    return this.validator.test(t);
-  }
+    @Override
+    public boolean test(T t) {
+        return this.validator.test(t);
+    }
 }
diff --git a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/config/WithConfig.java b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/config/WithConfig.java
index 61dfb4b1d99..be7ca4c34ff 100644
--- a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/config/WithConfig.java
+++ b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/config/WithConfig.java
@@ -34,18 +34,18 @@
 @Repeatable(WithConfigs.class)
 @ExtendWith(WithConfigExtension.class)
 public @interface WithConfig {
-  /**
-   * Config key (e.g. {@code "trace.resolver.enabled"}). The {@code dd.}/{@code DD_} prefix is
-   * auto-added unless {@link #addPrefix()} is {@code false}.
-   */
-  String key();
+    /**
+     * Config key (e.g. {@code "trace.resolver.enabled"}). The {@code dd.}/{@code DD_} prefix is
+     * auto-added unless {@link #addPrefix()} is {@code false}.
+     */
+    String key();
 
-  /** Config value. */
-  String value();
+    /** Config value. */
+    String value();
 
-  /** If {@code true}, sets an environment variable instead of a system property. */
-  boolean env() default false;
+    /** If {@code true}, sets an environment variable instead of a system property. */
+    boolean env() default false;
 
-  /** If {@code false}, the key is used as-is without adding the {@code dd.}/{@code DD_} prefix. */
-  boolean addPrefix() default true;
+    /** If {@code false}, the key is used as-is without adding the {@code dd.}/{@code DD_} prefix. */
+    boolean addPrefix() default true;
 }
diff --git a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/config/WithConfigExtension.java b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/config/WithConfigExtension.java
index 0e8857a9f4d..3927f69df09 100644
--- a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/config/WithConfigExtension.java
+++ b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/config/WithConfigExtension.java
@@ -35,271 +35,261 @@
  * used explicitly via {@code @ExtendWith(WithConfigExtension.class)}.
  */
 @SuppressForbidden
-public class WithConfigExtension
-    implements BeforeAllCallback, BeforeEachCallback, AfterEachCallback, AfterAllCallback {
-
-  static final String INST_CONFIG = "datadog.trace.api.InstrumenterConfig";
-  static final String CONFIG = "datadog.trace.api.Config";
-
-  private static final Field instConfigInstanceField;
-  private static final Constructor<?> instConfigConstructor;
-  private static final Field configInstanceField;
-  private static final Constructor<?> configConstructor;
-
-  static {
-    ensureConfigInstrumentationHasBeenApplied();
-    try {
-      Class<?> instCfg = Class.forName(INST_CONFIG);
-      instConfigInstanceField = instCfg.getDeclaredField("INSTANCE");
-      instConfigConstructor = instCfg.getDeclaredConstructor();
-      instConfigConstructor.setAccessible(true);
-      Class<?> cfg = Class.forName(CONFIG);
-      configInstanceField = cfg.getDeclaredField("INSTANCE");
-      configConstructor = cfg.getDeclaredConstructor();
-      configConstructor.setAccessible(true);
-    } catch (ReflectiveOperationException e) {
-      throw new ExceptionInInitializerError(e);
+public class WithConfigExtension implements BeforeAllCallback, BeforeEachCallback, AfterEachCallback, AfterAllCallback {
+
+    static final String INST_CONFIG = "datadog.trace.api.InstrumenterConfig";
+    static final String CONFIG = "datadog.trace.api.Config";
+
+    private static final Field instConfigInstanceField;
+    private static final Constructor<?> instConfigConstructor;
+    private static final Field configInstanceField;
+    private static final Constructor<?> configConstructor;
+
+    static {
+        ensureConfigInstrumentationHasBeenApplied();
+        try {
+            Class<?> instCfg = Class.forName(INST_CONFIG);
+            instConfigInstanceField = instCfg.getDeclaredField("INSTANCE");
+            instConfigConstructor = instCfg.getDeclaredConstructor();
+            instConfigConstructor.setAccessible(true);
+            Class<?> cfg = Class.forName(CONFIG);
+            configInstanceField = cfg.getDeclaredField("INSTANCE");
+            configConstructor = cfg.getDeclaredConstructor();
+            configConstructor.setAccessible(true);
+        } catch (ReflectiveOperationException e) {
+            throw new ExceptionInInitializerError(e);
+        }
     }
-  }
 
-  static final TestEnvironmentVariables environmentVariables = TestEnvironmentVariables.setup();
+    static final TestEnvironmentVariables environmentVariables = TestEnvironmentVariables.setup();
 
-  private static Properties originalSystemProperties;
+    private static Properties originalSystemProperties;
 
-  // region JUnit lifecycle callbacks
+    // region JUnit lifecycle callbacks
 
-  @Override
-  public void beforeAll(ExtensionContext context) {
-    // Back up config and apply class-level config values.
-    if (originalSystemProperties == null) {
-      saveProperties();
-    }
-    // Apply class-level @WithConfig so config is available before @BeforeAll methods
-    applyClassLevelConfig(context);
-    rebuildConfig();
-  }
-
-  @Override
-  public void beforeEach(ExtensionContext context) {
-    restoreProperties();
-    environmentVariables.clear();
-    applyDeclaredConfig(context);
-    rebuildConfig();
-  }
-
-  @Override
-  public void afterEach(ExtensionContext context) {
-    environmentVariables.clear();
-    restoreProperties();
-    rebuildConfig();
-  }
-
-  @Override
-  public void afterAll(ExtensionContext context) {
-    restoreProperties();
-    rebuildConfig();
-  }
-
-  private static void applyDeclaredConfig(ExtensionContext context) {
-    applyClassLevelConfig(context);
-    applyMethodLevelConfig(context);
-  }
-
-  private static void applyClassLevelConfig(ExtensionContext context) {
-    // Walk the entire class hierarchy so annotations on superclasses and apply topmost first, then
-    // subclass overrides.
-    Class<?> testClass = context.getRequiredTestClass();
-    List<Class<?>> hierarchy = new ArrayList<>();
-    for (Class<?> cls = testClass; cls != null; cls = cls.getSuperclass()) {
-      hierarchy.add(cls);
+    @Override
+    public void beforeAll(ExtensionContext context) {
+        // Back up config and apply class-level config values.
+        if (originalSystemProperties == null) {
+            saveProperties();
+        }
+        // Apply class-level @WithConfig so config is available before @BeforeAll methods
+        applyClassLevelConfig(context);
+        rebuildConfig();
     }
-    for (int i = hierarchy.size() - 1; i >= 0; i--) {
-      List<WithConfig> classConfigs =
-          AnnotationSupport.findRepeatableAnnotations(hierarchy.get(i), WithConfig.class);
-      for (WithConfig cfg : classConfigs) {
-        applyConfig(cfg);
-      }
+
+    @Override
+    public void beforeEach(ExtensionContext context) {
+        restoreProperties();
+        environmentVariables.clear();
+        applyDeclaredConfig(context);
+        rebuildConfig();
     }
-  }
-
-  private static void applyMethodLevelConfig(ExtensionContext context) {
-    // Method-level @WithConfig annotations (supports composed/meta-annotations)
-    context
-        .getTestMethod()
-        .ifPresent(
-            method -> {
-              List<WithConfig> methodConfigs =
-                  AnnotationSupport.findRepeatableAnnotations(method, WithConfig.class);
-              for (WithConfig cfg : methodConfigs) {
-                applyConfig(cfg);
-              }
-            });
-  }
-
-  private static void applyConfig(WithConfig cfg) {
-    if (cfg.env()) {
-      setEnvVariable(cfg.key(), cfg.value(), cfg.addPrefix());
-    } else {
-      setSysProperty(cfg.key(), cfg.value(), cfg.addPrefix());
+
+    @Override
+    public void afterEach(ExtensionContext context) {
+        environmentVariables.clear();
+        restoreProperties();
+        rebuildConfig();
     }
-  }
 
-  private static void setSysProperty(String name, String value, boolean addPrefix) {
-    String prefixedName = addPrefix && !name.startsWith("dd.") ? "dd." + name : name;
-    System.setProperty(prefixedName, value);
-  }
+    @Override
+    public void afterAll(ExtensionContext context) {
+        restoreProperties();
+        rebuildConfig();
+    }
 
-  private static void setEnvVariable(String name, String value, boolean addPrefix) {
-    String prefixedName = addPrefix && !name.startsWith("DD_") ? "DD_" + name : name;
-    environmentVariables.set(prefixedName, value);
-  }
+    private static void applyDeclaredConfig(ExtensionContext context) {
+        applyClassLevelConfig(context);
+        applyMethodLevelConfig(context);
+    }
 
-  // endregion
+    private static void applyClassLevelConfig(ExtensionContext context) {
+        // Walk the entire class hierarchy so annotations on superclasses and apply topmost first, then
+        // subclass overrides.
+        Class<?> testClass = context.getRequiredTestClass();
+        List<Class<?>> hierarchy = new ArrayList<>();
+        for (Class<?> cls = testClass; cls != null; cls = cls.getSuperclass()) {
+            hierarchy.add(cls);
+        }
+        for (int i = hierarchy.size() - 1; i >= 0; i--) {
+            List<WithConfig> classConfigs =
+                    AnnotationSupport.findRepeatableAnnotations(hierarchy.get(i), WithConfig.class);
+            for (WithConfig cfg : classConfigs) {
+                applyConfig(cfg);
+            }
+        }
+    }
 
-  // region Public static API for imperative config injection
+    private static void applyMethodLevelConfig(ExtensionContext context) {
+        // Method-level @WithConfig annotations (supports composed/meta-annotations)
+        context.getTestMethod().ifPresent(method -> {
+            List<WithConfig> methodConfigs = AnnotationSupport.findRepeatableAnnotations(method, WithConfig.class);
+            for (WithConfig cfg : methodConfigs) {
+                applyConfig(cfg);
+            }
+        });
+    }
 
-  public static void injectSysConfig(String name, String value) {
-    injectSysConfig(name, value, true);
-  }
+    private static void applyConfig(WithConfig cfg) {
+        if (cfg.env()) {
+            setEnvVariable(cfg.key(), cfg.value(), cfg.addPrefix());
+        } else {
+            setSysProperty(cfg.key(), cfg.value(), cfg.addPrefix());
+        }
+    }
 
-  public static void injectSysConfig(String name, String value, boolean addPrefix) {
-    setSysProperty(name, value, addPrefix);
-    rebuildConfig();
-  }
+    private static void setSysProperty(String name, String value, boolean addPrefix) {
+        String prefixedName = addPrefix && !name.startsWith("dd.") ? "dd." + name : name;
+        System.setProperty(prefixedName, value);
+    }
 
-  public static void removeSysConfig(String name) {
-    removeSysConfig(name, true);
-  }
+    private static void setEnvVariable(String name, String value, boolean addPrefix) {
+        String prefixedName = addPrefix && !name.startsWith("DD_") ? "DD_" + name : name;
+        environmentVariables.set(prefixedName, value);
+    }
 
-  public static void removeSysConfig(String name, boolean addPrefix) {
-    String prefixedName = addPrefix && !name.startsWith("dd.") ? "dd." + name : name;
-    System.clearProperty(prefixedName);
-    rebuildConfig();
-  }
+    // endregion
 
-  public static void injectEnvConfig(String name, String value) {
-    injectEnvConfig(name, value, true);
-  }
+    // region Public static API for imperative config injection
 
-  public static void injectEnvConfig(String name, String value, boolean addPrefix) {
-    setEnvVariable(name, value, addPrefix);
-    rebuildConfig();
-  }
+    public static void injectSysConfig(String name, String value) {
+        injectSysConfig(name, value, true);
+    }
 
-  public static void removeEnvConfig(String name) {
-    removeEnvConfig(name, true);
-  }
+    public static void injectSysConfig(String name, String value, boolean addPrefix) {
+        setSysProperty(name, value, addPrefix);
+        rebuildConfig();
+    }
 
-  public static void removeEnvConfig(String name, boolean addPrefix) {
-    String prefixedName = addPrefix && !name.startsWith("DD_") ? "DD_" + name : name;
-    environmentVariables.removePrefixed(prefixedName);
-    rebuildConfig();
-  }
+    public static void removeSysConfig(String name) {
+        removeSysConfig(name, true);
+    }
 
-  // endregion
+    public static void removeSysConfig(String name, boolean addPrefix) {
+        String prefixedName = addPrefix && !name.startsWith("dd.") ? "dd." + name : name;
+        System.clearProperty(prefixedName);
+        rebuildConfig();
+    }
 
-  // region Config infrastructure setup
+    public static void injectEnvConfig(String name, String value) {
+        injectEnvConfig(name, value, true);
+    }
 
-  private static void ensureConfigInstrumentationHasBeenApplied() {
-    if (isWritableInstance(CONFIG) && isWritableInstance(INST_CONFIG)) {
-      return;
+    public static void injectEnvConfig(String name, String value, boolean addPrefix) {
+        setEnvVariable(name, value, addPrefix);
+        rebuildConfig();
     }
-    throw new IllegalStateException(
-        "Config/InstrumenterConfig INSTANCE fields are not modifiable. "
-            + "Need the '-javaagent:modifiable-config-agent.jar' on the test JVM "
-            + "(the dd-trace-java.configure-tests Gradle convention plugin wires this automatically).");
-  }
-
-  private static boolean isWritableInstance(String className) {
-    try {
-      int m = Class.forName(className).getDeclaredField("INSTANCE").getModifiers();
-      return Modifier.isPublic(m)
-          && Modifier.isStatic(m)
-          && Modifier.isVolatile(m)
-          && !Modifier.isFinal(m);
-    } catch (ClassNotFoundException | NoSuchFieldException e) {
-      return false;
+
+    public static void removeEnvConfig(String name) {
+        removeEnvConfig(name, true);
     }
-  }
-
-  private static void rebuildConfig() {
-    synchronized (WithConfigExtension.class) {
-      try {
-        Object newInstConfig = instConfigConstructor.newInstance();
-        instConfigInstanceField.set(null, newInstConfig);
-        Object newConfig = configConstructor.newInstance();
-        configInstanceField.set(null, newConfig);
-      } catch (ReflectiveOperationException e) {
-        throw new AssertionError("Failed to rebuild config", e);
-      }
+
+    public static void removeEnvConfig(String name, boolean addPrefix) {
+        String prefixedName = addPrefix && !name.startsWith("DD_") ? "DD_" + name : name;
+        environmentVariables.removePrefixed(prefixedName);
+        rebuildConfig();
     }
-  }
 
-  // endregion
+    // endregion
 
-  // region Property management
+    // region Config infrastructure setup
 
-  static void saveProperties() {
-    originalSystemProperties = new Properties();
-    originalSystemProperties.putAll(System.getProperties());
-  }
+    private static void ensureConfigInstrumentationHasBeenApplied() {
+        if (isWritableInstance(CONFIG) && isWritableInstance(INST_CONFIG)) {
+            return;
+        }
+        throw new IllegalStateException("Config/InstrumenterConfig INSTANCE fields are not modifiable. "
+                + "Need the '-javaagent:modifiable-config-agent.jar' on the test JVM "
+                + "(the dd-trace-java.configure-tests Gradle convention plugin wires this automatically).");
+    }
 
-  static void restoreProperties() {
-    if (originalSystemProperties != null) {
-      Properties copy = new Properties();
-      copy.putAll(originalSystemProperties);
-      System.setProperties(copy);
+    private static boolean isWritableInstance(String className) {
+        try {
+            int m = Class.forName(className).getDeclaredField("INSTANCE").getModifiers();
+            return Modifier.isPublic(m) && Modifier.isStatic(m) && Modifier.isVolatile(m) && !Modifier.isFinal(m);
+        } catch (ClassNotFoundException | NoSuchFieldException e) {
+            return false;
+        }
     }
-  }
 
-  // endregion
+    private static void rebuildConfig() {
+        synchronized (WithConfigExtension.class) {
+            try {
+                Object newInstConfig = instConfigConstructor.newInstance();
+                instConfigInstanceField.set(null, newInstConfig);
+                Object newConfig = configConstructor.newInstance();
+                configInstanceField.set(null, newConfig);
+            } catch (ReflectiveOperationException e) {
+                throw new AssertionError("Failed to rebuild config", e);
+            }
+        }
+    }
 
-  /** Test-only environment variable provider that replaces the real one during tests. */
-  public static class TestEnvironmentVariables
-      extends EnvironmentVariables.EnvironmentVariablesProvider {
-    private final Map<String, String> env = new HashMap<>();
+    // endregion
 
-    TestEnvironmentVariables(String... kv) {
-      for (int i = 0; i + 1 < kv.length; i += 2) {
-        this.env.put(kv[i], kv[i + 1]);
-      }
-    }
+    // region Property management
 
-    @Override
-    public String get(String name) {
-      return env.get(name);
+    static void saveProperties() {
+        originalSystemProperties = new Properties();
+        originalSystemProperties.putAll(System.getProperties());
     }
 
-    @Override
-    public Map<String, String> getAll() {
-      return env;
+    static void restoreProperties() {
+        if (originalSystemProperties != null) {
+            Properties copy = new Properties();
+            copy.putAll(originalSystemProperties);
+            System.setProperties(copy);
+        }
     }
 
-    public void set(String name, String value) {
-      env.put(name, value);
-    }
+    // endregion
 
-    public void removePrefixed(String prefix) {
-      env.keySet().removeIf(k -> k.startsWith(prefix));
-    }
+    /** Test-only environment variable provider that replaces the real one during tests. */
+    public static class TestEnvironmentVariables extends EnvironmentVariables.EnvironmentVariablesProvider {
+        private final Map<String, String> env = new HashMap<>();
 
-    public void clear() {
-      env.clear();
-    }
+        TestEnvironmentVariables(String... kv) {
+            for (int i = 0; i + 1 < kv.length; i += 2) {
+                this.env.put(kv[i], kv[i + 1]);
+            }
+        }
 
-    @SuppressForbidden
-    static TestEnvironmentVariables setup(String... kv) {
-      TestEnvironmentVariables provider = new TestEnvironmentVariables(kv);
-      EnvironmentVariables.provider = provider;
+        @Override
+        public String get(String name) {
+            return env.get(name);
+        }
 
-      String propagateVars = System.getenv("TEST_ENV_PROPAGATE_VARS");
-      if (propagateVars != null) {
-        for (String envVar : propagateVars.split(",")) {
-          provider.env.put(envVar, System.getenv(envVar));
+        @Override
+        public Map<String, String> getAll() {
+            return env;
         }
-      }
 
-      return provider;
+        public void set(String name, String value) {
+            env.put(name, value);
+        }
+
+        public void removePrefixed(String prefix) {
+            env.keySet().removeIf(k -> k.startsWith(prefix));
+        }
+
+        public void clear() {
+            env.clear();
+        }
+
+        @SuppressForbidden
+        static TestEnvironmentVariables setup(String... kv) {
+            TestEnvironmentVariables provider = new TestEnvironmentVariables(kv);
+            EnvironmentVariables.provider = provider;
+
+            String propagateVars = System.getenv("TEST_ENV_PROPAGATE_VARS");
+            if (propagateVars != null) {
+                for (String envVar : propagateVars.split(",")) {
+                    provider.env.put(envVar, System.getenv(envVar));
+                }
+            }
+
+            return provider;
+        }
     }
-  }
 }
diff --git a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/config/WithConfigs.java b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/config/WithConfigs.java
index 55681b56857..130b665c7d1 100644
--- a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/config/WithConfigs.java
+++ b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/config/WithConfigs.java
@@ -13,5 +13,5 @@
 @Target({TYPE, METHOD})
 @ExtendWith(WithConfigExtension.class)
 public @interface WithConfigs {
-  WithConfig[] value();
+    WithConfig[] value();
 }
diff --git a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/context/AllowContextTestingExtension.java b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/context/AllowContextTestingExtension.java
index a9b9c44861c..a3217d6f512 100644
--- a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/context/AllowContextTestingExtension.java
+++ b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/context/AllowContextTestingExtension.java
@@ -15,13 +15,17 @@
 @SuppressForbidden
 public class AllowContextTestingExtension implements BeforeAllCallback {
 
-  @Override
-  public void beforeAll(ExtensionContext context) {
-    try {
-      Class.forName("datadog.context.ContextManager").getMethod("allowTesting").invoke(null);
-      Class.forName("datadog.context.ContextBinder").getMethod("allowTesting").invoke(null);
-    } catch (Throwable ignore) {
-      // don't block testing if context types aren't available
+    @Override
+    public void beforeAll(ExtensionContext context) {
+        try {
+            Class.forName("datadog.context.ContextManager")
+                    .getMethod("allowTesting")
+                    .invoke(null);
+            Class.forName("datadog.context.ContextBinder")
+                    .getMethod("allowTesting")
+                    .invoke(null);
+        } catch (Throwable ignore) {
+            // don't block testing if context types aren't available
+        }
     }
-  }
 }
diff --git a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/context/LegacyContextTestingExtension.java b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/context/LegacyContextTestingExtension.java
index 0b51926c5ce..acf58edc46d 100644
--- a/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/context/LegacyContextTestingExtension.java
+++ b/utils/test-junit-utils/src/main/java/datadog/trace/test/junit/utils/context/LegacyContextTestingExtension.java
@@ -7,14 +7,14 @@
 /** JUnit 5 extension that decides whether to register the legacy approach to managing contexts. */
 @SuppressForbidden
 public class LegacyContextTestingExtension implements BeforeAllCallback {
-  @Override
-  public void beforeAll(ExtensionContext context) {
-    try {
-      Class.forName("datadog.trace.bootstrap.instrumentation.api.AgentTracer")
-          .getMethod("maybeInstallLegacyContextManager")
-          .invoke(null);
-    } catch (Throwable ignore) {
-      // don't block testing if the legacy approach to managing contexts isn't available
+    @Override
+    public void beforeAll(ExtensionContext context) {
+        try {
+            Class.forName("datadog.trace.bootstrap.instrumentation.api.AgentTracer")
+                    .getMethod("maybeInstallLegacyContextManager")
+                    .invoke(null);
+        } catch (Throwable ignore) {
+            // don't block testing if the legacy approach to managing contexts isn't available
+        }
     }
-  }
 }
diff --git a/utils/test-utils/src/main/groovy/datadog/trace/test/util/Flaky.java b/utils/test-utils/src/main/groovy/datadog/trace/test/util/Flaky.java
index c4625a3de38..66f1a04d8e7 100644
--- a/utils/test-utils/src/main/groovy/datadog/trace/test/util/Flaky.java
+++ b/utils/test-utils/src/main/groovy/datadog/trace/test/util/Flaky.java
@@ -15,26 +15,26 @@
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Tag("flaky")
 public @interface Flaky {
-  /** Reason why the test is flaky (optional). */
-  String value() default "";
+    /** Reason why the test is flaky (optional). */
+    String value() default "";
 
-  /**
-   * Fully qualified name of the test suite classes where this test is flaky. Only required when the
-   * test is flaky only when run in a subclass.
-   */
-  String[] suites() default {};
+    /**
+     * Fully qualified name of the test suite classes where this test is flaky. Only required when the
+     * test is flaky only when run in a subclass.
+     */
+    String[] suites() default {};
 
-  /**
-   * Closure with a predicate to test at runtime if the actual spec is flaky (e.g. check the JVM
-   * vendor), the parameter is the actual name of the spec under test
-   */
-  Class<? extends Predicate<String>> condition() default True.class;
+    /**
+     * Closure with a predicate to test at runtime if the actual spec is flaky (e.g. check the JVM
+     * vendor), the parameter is the actual name of the spec under test
+     */
+    Class<? extends Predicate<String>> condition() default True.class;
 
-  class True implements Predicate<String> {
+    class True implements Predicate<String> {
 
-    @Override
-    public boolean test(final String spec) {
-      return true;
+        @Override
+        public boolean test(final String spec) {
+            return true;
+        }
     }
-  }
 }
diff --git a/utils/test-utils/src/main/groovy/datadog/trace/test/util/NonRetryable.java b/utils/test-utils/src/main/groovy/datadog/trace/test/util/NonRetryable.java
index ecfb3cf3179..0e70ce6c9a9 100644
--- a/utils/test-utils/src/main/groovy/datadog/trace/test/util/NonRetryable.java
+++ b/utils/test-utils/src/main/groovy/datadog/trace/test/util/NonRetryable.java
@@ -16,6 +16,6 @@
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Tag("NonRetryable")
 public @interface NonRetryable {
-  /** Reason why the test is non-retryable (optional). */
-  String value() default "";
+    /** Reason why the test is non-retryable (optional). */
+    String value() default "";
 }
diff --git a/utils/test-utils/src/main/java/datadog/trace/test/logging/CapturedLog.java b/utils/test-utils/src/main/java/datadog/trace/test/logging/CapturedLog.java
index 93664924bb4..6638ad2610a 100644
--- a/utils/test-utils/src/main/java/datadog/trace/test/logging/CapturedLog.java
+++ b/utils/test-utils/src/main/java/datadog/trace/test/logging/CapturedLog.java
@@ -5,46 +5,46 @@
 import org.slf4j.Marker;
 
 public final class CapturedLog {
-  public final Marker marker;
-  public final String level;
-  public final String template;
-  public final Object[] arguments;
-  public final String message;
+    public final Marker marker;
+    public final String level;
+    public final String template;
+    public final Object[] arguments;
+    public final String message;
 
-  public CapturedLog(
-      final Marker marker,
-      final String level,
-      final String template,
-      final Object[] arguments,
-      final String message) {
-    this.marker = marker;
-    this.level = level;
-    this.template = template;
-    this.arguments = arguments;
-    this.message = message;
-  }
+    public CapturedLog(
+            final Marker marker,
+            final String level,
+            final String template,
+            final Object[] arguments,
+            final String message) {
+        this.marker = marker;
+        this.level = level;
+        this.template = template;
+        this.arguments = arguments;
+        this.message = message;
+    }
 
-  @Override
-  public String toString() {
-    return "CapturedLog{"
-        + "marker="
-        + marker
-        + ", level='"
-        + level
-        + '\''
-        + ", template='"
-        + template
-        + '\''
-        + ", arguments=..."
-        + ", message='"
-        + message
-        + '\''
-        + '}';
-  }
+    @Override
+    public String toString() {
+        return "CapturedLog{"
+                + "marker="
+                + marker
+                + ", level='"
+                + level
+                + '\''
+                + ", template='"
+                + template
+                + '\''
+                + ", arguments=..."
+                + ", message='"
+                + message
+                + '\''
+                + '}';
+    }
 
-  @Override
-  public int hashCode() {
-    final int argsHash = arguments == null ? 0 : Arrays.hashCode(arguments);
-    return Objects.hash(marker, level, template, argsHash, message);
-  }
+    @Override
+    public int hashCode() {
+        final int argsHash = arguments == null ? 0 : Arrays.hashCode(arguments);
+        return Objects.hash(marker, level, template, argsHash, message);
+    }
 }
diff --git a/utils/test-utils/src/main/java/datadog/trace/test/logging/TestLogCollector.java b/utils/test-utils/src/main/java/datadog/trace/test/logging/TestLogCollector.java
index 9f5571ae063..8efade41fe4 100644
--- a/utils/test-utils/src/main/java/datadog/trace/test/logging/TestLogCollector.java
+++ b/utils/test-utils/src/main/java/datadog/trace/test/logging/TestLogCollector.java
@@ -6,63 +6,62 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 public final class TestLogCollector {
-  static final TestLogCollector INSTANCE = new TestLogCollector();
+    static final TestLogCollector INSTANCE = new TestLogCollector();
 
-  private final AtomicReference<LinkedBlockingDeque<CapturedLog>> logs =
-      new AtomicReference<>(null);
+    private final AtomicReference<LinkedBlockingDeque<CapturedLog>> logs = new AtomicReference<>(null);
 
-  private TestLogCollector() {}
+    private TestLogCollector() {}
 
-  /**
-   * Enable the test log collector. This should be called before any test that needs the logs.
-   * {@link #disable()} must always be called at cleanup.
-   */
-  public static void enable() {
-    INSTANCE._enable();
-  }
+    /**
+     * Enable the test log collector. This should be called before any test that needs the logs.
+     * {@link #disable()} must always be called at cleanup.
+     */
+    public static void enable() {
+        INSTANCE._enable();
+    }
 
-  /** Must be called at least once after {@link #enable()} to cleanup the test log collector. */
-  public static void disable() {
-    INSTANCE._disable();
-  }
+    /** Must be called at least once after {@link #enable()} to cleanup the test log collector. */
+    public static void disable() {
+        INSTANCE._disable();
+    }
 
-  /**
-   * Get all captured logs and clear the internal buffer. {@link #enable()} must have been called
-   * before.
-   */
-  public static List<CapturedLog> drainCapturedLogs() {
-    return INSTANCE._drainCapturedLogs();
-  }
+    /**
+     * Get all captured logs and clear the internal buffer. {@link #enable()} must have been called
+     * before.
+     */
+    public static List<CapturedLog> drainCapturedLogs() {
+        return INSTANCE._drainCapturedLogs();
+    }
 
-  private void _enable() {
-    final LinkedBlockingDeque<CapturedLog> logs = new LinkedBlockingDeque<>();
-    if (!this.logs.compareAndSet(null, logs)) {
-      throw new IllegalStateException("TestLogCollector was enabled without prior cleanup");
+    private void _enable() {
+        final LinkedBlockingDeque<CapturedLog> logs = new LinkedBlockingDeque<>();
+        if (!this.logs.compareAndSet(null, logs)) {
+            throw new IllegalStateException("TestLogCollector was enabled without prior cleanup");
+        }
     }
-  }
 
-  private List<CapturedLog> _drainCapturedLogs() {
-    final List<CapturedLog> result = new ArrayList<>();
-    final LinkedBlockingDeque<CapturedLog> logs = this.logs.get();
-    if (logs == null) {
-      throw new IllegalStateException("TestLogCollector was not enabled before draining logs");
+    private List<CapturedLog> _drainCapturedLogs() {
+        final List<CapturedLog> result = new ArrayList<>();
+        final LinkedBlockingDeque<CapturedLog> logs = this.logs.get();
+        if (logs == null) {
+            throw new IllegalStateException("TestLogCollector was not enabled before draining logs");
+        }
+        logs.drainTo(result);
+        return result;
     }
-    logs.drainTo(result);
-    return result;
-  }
 
-  private void _disable() {
-    final LinkedBlockingDeque<CapturedLog> logs = this.logs.getAndSet(null);
-    if (logs == null) {
-      return;
+    private void _disable() {
+        final LinkedBlockingDeque<CapturedLog> logs = this.logs.getAndSet(null);
+        if (logs == null) {
+            return;
+        }
+        logs.clear();
     }
-    logs.clear();
-  }
 
-  void addLog(final CapturedLog log) {
-    final LinkedBlockingDeque<CapturedLog> logs = this.logs.get();
-    if (logs != null) {
-      logs.add(log);
+    void addLog(final CapturedLog log) {
+        final LinkedBlockingDeque<CapturedLog> logs = this.logs.get();
+        if (logs != null) {
+            logs.add(log);
+        }
     }
-  }
 }
diff --git a/utils/test-utils/src/main/java/datadog/trace/test/logging/TestLogbackAppender.java b/utils/test-utils/src/main/java/datadog/trace/test/logging/TestLogbackAppender.java
index 3afbda23bae..6ed12abd6d8 100644
--- a/utils/test-utils/src/main/java/datadog/trace/test/logging/TestLogbackAppender.java
+++ b/utils/test-utils/src/main/java/datadog/trace/test/logging/TestLogbackAppender.java
@@ -25,15 +25,14 @@
  */
 public final class TestLogbackAppender extends AppenderBase<ILoggingEvent> {
 
-  @Override
-  protected void append(final ILoggingEvent event) {
-    final CapturedLog log =
-        new CapturedLog(
-            event.getMarker(),
-            event.getLevel().levelStr,
-            event.getMessage(),
-            event.getArgumentArray(),
-            event.getFormattedMessage());
-    TestLogCollector.INSTANCE.addLog(log);
-  }
+    @Override
+    protected void append(final ILoggingEvent event) {
+        final CapturedLog log = new CapturedLog(
+                event.getMarker(),
+                event.getLevel().levelStr,
+                event.getMessage(),
+                event.getArgumentArray(),
+                event.getFormattedMessage());
+        TestLogCollector.INSTANCE.addLog(log);
+    }
 }
diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/AnyStackRunner.java b/utils/test-utils/src/main/java/datadog/trace/test/util/AnyStackRunner.java
index 051d58ee59a..15ec5afa823 100644
--- a/utils/test-utils/src/main/java/datadog/trace/test/util/AnyStackRunner.java
+++ b/utils/test-utils/src/main/java/datadog/trace/test/util/AnyStackRunner.java
@@ -9,40 +9,39 @@
  */
 public class AnyStackRunner {
 
-  /**
-   * Call the given runnable from a class with the given name.
-   *
-   * @param parentClass Caller class.
-   * @param runnable Runnable to call.
-   */
-  public static void callWithinStack(final String parentClass, final Runnable runnable) {
-    // Create a copy of the RunnerRunner template class with the given name.
-    final Class<?> dynamicType =
-        new ByteBuddy()
-            .redefine(RunnerRunner.class)
-            .name(parentClass)
-            .make()
-            .load(AnyStackRunner.class.getClassLoader())
-            .getLoaded();
-    try {
-      Consumer<Runnable> obj =
-          (Consumer<Runnable>) dynamicType.getDeclaredConstructor().newInstance();
-      obj.accept(runnable);
-    } catch (ReflectiveOperationException ex) {
-      throw new RuntimeException(ex);
+    /**
+     * Call the given runnable from a class with the given name.
+     *
+     * @param parentClass Caller class.
+     * @param runnable Runnable to call.
+     */
+    public static void callWithinStack(final String parentClass, final Runnable runnable) {
+        // Create a copy of the RunnerRunner template class with the given name.
+        final Class<?> dynamicType = new ByteBuddy()
+                .redefine(RunnerRunner.class)
+                .name(parentClass)
+                .make()
+                .load(AnyStackRunner.class.getClassLoader())
+                .getLoaded();
+        try {
+            Consumer<Runnable> obj =
+                    (Consumer<Runnable>) dynamicType.getDeclaredConstructor().newInstance();
+            obj.accept(runnable);
+        } catch (ReflectiveOperationException ex) {
+            throw new RuntimeException(ex);
+        }
     }
-  }
 
-  /** Public to ease code-generation. Not meant to be used out of the parent class. */
-  public interface Consumer<T> {
-    void accept(T arg);
-  }
+    /** Public to ease code-generation. Not meant to be used out of the parent class. */
+    public interface Consumer<T> {
+        void accept(T arg);
+    }
 
-  /** Public to ease code-generation. Not meant to be used out of the parent class. */
-  public static class RunnerRunner implements Consumer<Runnable> {
-    @Override
-    public void accept(final Runnable runnable) {
-      runnable.run();
+    /** Public to ease code-generation. Not meant to be used out of the parent class. */
+    public static class RunnerRunner implements Consumer<Runnable> {
+        @Override
+        public void accept(final Runnable runnable) {
+            runnable.run();
+        }
     }
-  }
 }
diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/AssertionsUtils.java b/utils/test-utils/src/main/java/datadog/trace/test/util/AssertionsUtils.java
index d846b61bcc3..79a17bc797d 100644
--- a/utils/test-utils/src/main/java/datadog/trace/test/util/AssertionsUtils.java
+++ b/utils/test-utils/src/main/java/datadog/trace/test/util/AssertionsUtils.java
@@ -5,16 +5,12 @@
 import java.util.Map;
 
 public class AssertionsUtils {
-  private AssertionsUtils() {
-    // No-op.
-  }
+    private AssertionsUtils() {
+        // No-op.
+    }
 
-  public static void assertMapContainsKeyValues(Map<?, ?> actual, Map<?, ?> expectedSubset) {
-    expectedSubset.forEach(
-        (k, v) ->
-            assertEquals(
-                v,
-                actual.get(k),
-                () -> "Mismatch for key [" + k + "]: expected=" + v + ", actual=" + actual.get(k)));
-  }
+    public static void assertMapContainsKeyValues(Map<?, ?> actual, Map<?, ?> expectedSubset) {
+        expectedSubset.forEach((k, v) -> assertEquals(
+                v, actual.get(k), () -> "Mismatch for key [" + k + "]: expected=" + v + ", actual=" + actual.get(k)));
+    }
 }
diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/CircularBuffer.java b/utils/test-utils/src/main/java/datadog/trace/test/util/CircularBuffer.java
index 585b2d376c0..fc296b81cd3 100644
--- a/utils/test-utils/src/main/java/datadog/trace/test/util/CircularBuffer.java
+++ b/utils/test-utils/src/main/java/datadog/trace/test/util/CircularBuffer.java
@@ -9,41 +9,41 @@
  * Iterable by insertion order. The iterator omits nulls.
  */
 public class CircularBuffer<T> implements Iterable<T> {
-  private int index;
-  private final int lengthMask;
-  private final T[] buffer;
+    private int index;
+    private final int lengthMask;
+    private final T[] buffer;
 
-  public CircularBuffer(final int capacity) {
-    assert capacity > 0;
-    // Stick to power of 2
-    assert (capacity & (capacity - 1)) == 0;
-    lengthMask = capacity - 1;
-    index = 0;
-    buffer = createBuffer(capacity);
-  }
+    public CircularBuffer(final int capacity) {
+        assert capacity > 0;
+        // Stick to power of 2
+        assert (capacity & (capacity - 1)) == 0;
+        lengthMask = capacity - 1;
+        index = 0;
+        buffer = createBuffer(capacity);
+    }
 
-  public T add(final T obj) {
-    final T current = buffer[index];
-    buffer[index] = obj;
-    index = (index + 1) & lengthMask;
-    return current;
-  }
+    public T add(final T obj) {
+        final T current = buffer[index];
+        buffer[index] = obj;
+        index = (index + 1) & lengthMask;
+        return current;
+    }
 
-  public Iterator<T> iterator() {
-    final List<T> list = new ArrayList<>();
-    int iterIndex = (index + 1) & lengthMask;
-    for (int i = 0; i < buffer.length; i++) {
-      final T el = buffer[iterIndex];
-      if (el != null) {
-        list.add(el);
-      }
-      iterIndex = (iterIndex + 1) & lengthMask;
+    public Iterator<T> iterator() {
+        final List<T> list = new ArrayList<>();
+        int iterIndex = (index + 1) & lengthMask;
+        for (int i = 0; i < buffer.length; i++) {
+            final T el = buffer[iterIndex];
+            if (el != null) {
+                list.add(el);
+            }
+            iterIndex = (iterIndex + 1) & lengthMask;
+        }
+        return list.iterator();
     }
-    return list.iterator();
-  }
 
-  @SuppressWarnings("unchecked")
-  private T[] createBuffer(final int capacity) {
-    return (T[]) new Object[capacity];
-  }
+    @SuppressWarnings("unchecked")
+    private T[] createBuffer(final int capacity) {
+        return (T[]) new Object[capacity];
+    }
 }
diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/CleanConfigStateExtension.java b/utils/test-utils/src/main/java/datadog/trace/test/util/CleanConfigStateExtension.java
index 09c18ced5a4..2df35750471 100644
--- a/utils/test-utils/src/main/java/datadog/trace/test/util/CleanConfigStateExtension.java
+++ b/utils/test-utils/src/main/java/datadog/trace/test/util/CleanConfigStateExtension.java
@@ -22,59 +22,55 @@
 @SuppressForbidden
 public class CleanConfigStateExtension implements BeforeAllCallback, AfterAllCallback {
 
-  private static final List<String> ALLOWED_SYS_PROPS =
-      Arrays.asList(
-          "dd.appsec.enabled", "dd.iast.enabled", "dd.integration.grizzly-filterchain.enabled");
+    private static final List<String> ALLOWED_SYS_PROPS =
+            Arrays.asList("dd.appsec.enabled", "dd.iast.enabled", "dd.integration.grizzly-filterchain.enabled");
 
-  private static final Predicate<String> DATADOG_ENV_VAR_FILTER = k -> k.startsWith("DD_");
-  private static final Predicate<Object> DATADOG_SYS_PROPERTIES_FILTER =
-      o -> {
+    private static final Predicate<String> DATADOG_ENV_VAR_FILTER = k -> k.startsWith("DD_");
+    private static final Predicate<Object> DATADOG_SYS_PROPERTIES_FILTER = o -> {
         String key = (String) o;
         return key.startsWith("DD_") && !ALLOWED_SYS_PROPS.contains(key);
-      };
+    };
 
-  @Override
-  public void beforeAll(ExtensionContext context) {
-    assertClean("before");
-  }
-
-  @Override
-  public void afterAll(ExtensionContext context) {
-    assertClean("after");
-  }
+    @Override
+    public void beforeAll(ExtensionContext context) {
+        assertClean("before");
+    }
 
-  private static void assertClean(String phase) {
-    Map<String, String> leakedEnv =
-        filterMap(EnvironmentVariables.getAll(), DATADOG_ENV_VAR_FILTER);
-    Map<Object, Object> leakedSys =
-        filterMap(System.getProperties(), DATADOG_SYS_PROPERTIES_FILTER);
-    if (!leakedEnv.isEmpty() || !leakedSys.isEmpty()) {
-      assertionFailure()
-          .message("Leaked Datadog configuration detected " + phase + " test class")
-          .reason(formatLeaks(leakedEnv, leakedSys))
-          .buildAndThrow();
+    @Override
+    public void afterAll(ExtensionContext context) {
+        assertClean("after");
     }
-  }
 
-  private static <T> Map<T, T> filterMap(Map<T, T> map, Predicate<T> keyFilter) {
-    return map.entrySet().stream()
-        .filter(e -> keyFilter.test(e.getKey()))
-        .collect(Collectors.toMap(Entry::getKey, Entry::getValue, (a, b) -> a, TreeMap::new));
-  }
+    private static void assertClean(String phase) {
+        Map<String, String> leakedEnv = filterMap(EnvironmentVariables.getAll(), DATADOG_ENV_VAR_FILTER);
+        Map<Object, Object> leakedSys = filterMap(System.getProperties(), DATADOG_SYS_PROPERTIES_FILTER);
+        if (!leakedEnv.isEmpty() || !leakedSys.isEmpty()) {
+            assertionFailure()
+                    .message("Leaked Datadog configuration detected " + phase + " test class")
+                    .reason(formatLeaks(leakedEnv, leakedSys))
+                    .buildAndThrow();
+        }
+    }
 
-  private static String formatLeaks(Map<String, String> env, Map<Object, Object> sys) {
-    StringBuilder sb = new StringBuilder();
-    if (!env.isEmpty()) {
-      sb.append("environment variables:");
-      env.forEach((k, v) -> sb.append("\n  ").append(k).append('=').append(v));
+    private static <T> Map<T, T> filterMap(Map<T, T> map, Predicate<T> keyFilter) {
+        return map.entrySet().stream()
+                .filter(e -> keyFilter.test(e.getKey()))
+                .collect(Collectors.toMap(Entry::getKey, Entry::getValue, (a, b) -> a, TreeMap::new));
     }
-    if (!sys.isEmpty()) {
-      if (sb.length() > 0) {
-        sb.append('\n');
-      }
-      sb.append("system properties:");
-      sys.forEach((k, v) -> sb.append("\n  ").append(k).append('=').append(v));
+
+    private static String formatLeaks(Map<String, String> env, Map<Object, Object> sys) {
+        StringBuilder sb = new StringBuilder();
+        if (!env.isEmpty()) {
+            sb.append("environment variables:");
+            env.forEach((k, v) -> sb.append("\n  ").append(k).append('=').append(v));
+        }
+        if (!sys.isEmpty()) {
+            if (sb.length() > 0) {
+                sb.append('\n');
+            }
+            sb.append("system properties:");
+            sys.forEach((k, v) -> sb.append("\n  ").append(k).append('=').append(v));
+        }
+        return sb.toString();
     }
-    return sb.toString();
-  }
 }
diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/DDJavaSpecification.java b/utils/test-utils/src/main/java/datadog/trace/test/util/DDJavaSpecification.java
index d4780e89098..dd518695c39 100644
--- a/utils/test-utils/src/main/java/datadog/trace/test/util/DDJavaSpecification.java
+++ b/utils/test-utils/src/main/java/datadog/trace/test/util/DDJavaSpecification.java
@@ -11,74 +11,67 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-@ExtendWith({
-  CleanConfigStateExtension.class,
-  WithConfigExtension.class,
-  AllowContextTestingExtension.class
-})
+@ExtendWith({CleanConfigStateExtension.class, WithConfigExtension.class, AllowContextTestingExtension.class})
 @SuppressForbidden
 public class DDJavaSpecification {
 
-  private static final long CHECK_TIMEOUT_MS = 3000;
+    private static final long CHECK_TIMEOUT_MS = 3000;
 
-  protected boolean assertThreadsEachCleanup = true;
-  private static volatile boolean ignoreThreadCleanup;
+    protected boolean assertThreadsEachCleanup = true;
+    private static volatile boolean ignoreThreadCleanup;
 
-  @BeforeAll
-  static void beforeAll() {
-    if (getDDThreads().isEmpty()) {
-      ignoreThreadCleanup = false;
-    } else {
-      System.out.println(
-          "Found DD threads before test started. Ignoring thread cleanup for this test class");
-      ignoreThreadCleanup = true;
+    @BeforeAll
+    static void beforeAll() {
+        if (getDDThreads().isEmpty()) {
+            ignoreThreadCleanup = false;
+        } else {
+            System.out.println("Found DD threads before test started. Ignoring thread cleanup for this test class");
+            ignoreThreadCleanup = true;
+        }
     }
-  }
 
-  @AfterAll
-  static void afterAll() {
-    checkThreads();
-  }
-
-  @AfterEach
-  void cleanup() {
-    if (assertThreadsEachCleanup) {
-      checkThreads();
+    @AfterAll
+    static void afterAll() {
+        checkThreads();
     }
-  }
 
-  static Set<Thread> getDDThreads() {
-    return Thread.getAllStackTraces().keySet().stream()
-        .filter(
-            t ->
-                t.getName().startsWith("dd-")
-                    && !t.getName().equals("dd-task-scheduler")
-                    && !t.getName().equals("dd-cassandra-session-executor"))
-        .collect(Collectors.toSet());
-  }
+    @AfterEach
+    void cleanup() {
+        if (assertThreadsEachCleanup) {
+            checkThreads();
+        }
+    }
 
-  static void checkThreads() {
-    if (ignoreThreadCleanup) {
-      return;
+    static Set<Thread> getDDThreads() {
+        return Thread.getAllStackTraces().keySet().stream()
+                .filter(t -> t.getName().startsWith("dd-")
+                        && !t.getName().equals("dd-task-scheduler")
+                        && !t.getName().equals("dd-cassandra-session-executor"))
+                .collect(Collectors.toSet());
     }
 
-    long deadline = System.currentTimeMillis() + CHECK_TIMEOUT_MS;
+    static void checkThreads() {
+        if (ignoreThreadCleanup) {
+            return;
+        }
 
-    Set<Thread> threads = getDDThreads();
-    while (System.currentTimeMillis() < deadline && !threads.isEmpty()) {
-      try {
-        Thread.sleep(100);
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-        break;
-      }
-      threads = getDDThreads();
-    }
+        long deadline = System.currentTimeMillis() + CHECK_TIMEOUT_MS;
+
+        Set<Thread> threads = getDDThreads();
+        while (System.currentTimeMillis() < deadline && !threads.isEmpty()) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                break;
+            }
+            threads = getDDThreads();
+        }
 
-    if (!threads.isEmpty()) {
-      System.out.println("WARNING: DD threads still active. Forget to close() a tracer?");
-      List<String> names = threads.stream().map(Thread::getName).collect(Collectors.toList());
-      System.out.println(names);
+        if (!threads.isEmpty()) {
+            System.out.println("WARNING: DD threads still active. Forget to close() a tracer?");
+            List<String> names = threads.stream().map(Thread::getName).collect(Collectors.toList());
+            System.out.println(names);
+        }
     }
-  }
 }
diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/ForkedTestUtils.java b/utils/test-utils/src/main/java/datadog/trace/test/util/ForkedTestUtils.java
index 03e8a279ad5..f4b17b3889a 100644
--- a/utils/test-utils/src/main/java/datadog/trace/test/util/ForkedTestUtils.java
+++ b/utils/test-utils/src/main/java/datadog/trace/test/util/ForkedTestUtils.java
@@ -1,11 +1,11 @@
 package datadog.trace.test.util;
 
 public class ForkedTestUtils {
-  public static String getMaxMemoryArgumentForFork() {
-    return "-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "1024M");
-  }
+    public static String getMaxMemoryArgumentForFork() {
+        return "-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "1024M");
+    }
 
-  public static String getMinMemoryArgumentForFork() {
-    return "-Xms" + System.getProperty("datadog.forkedMinHeapSize", "64M");
-  }
+    public static String getMinMemoryArgumentForFork() {
+        return "-Xms" + System.getProperty("datadog.forkedMinHeapSize", "64M");
+    }
 }
diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/GCUtils.java b/utils/test-utils/src/main/java/datadog/trace/test/util/GCUtils.java
index 93683ee22b2..ae26aef1872 100644
--- a/utils/test-utils/src/main/java/datadog/trace/test/util/GCUtils.java
+++ b/utils/test-utils/src/main/java/datadog/trace/test/util/GCUtils.java
@@ -7,38 +7,38 @@
 
 public abstract class GCUtils {
 
-  public static void awaitGC() throws InterruptedException {
-    Object obj = new Object();
-    final WeakReference<Object> ref = new WeakReference<>(obj);
-    obj = null;
-    awaitGC(ref);
-  }
+    public static void awaitGC() throws InterruptedException {
+        Object obj = new Object();
+        final WeakReference<Object> ref = new WeakReference<>(obj);
+        obj = null;
+        awaitGC(ref);
+    }
 
-  public static void awaitGC(final WeakReference<?> ref) throws InterruptedException {
-    awaitGC(ref, 1, MINUTES);
-  }
+    public static void awaitGC(final WeakReference<?> ref) throws InterruptedException {
+        awaitGC(ref, 1, MINUTES);
+    }
 
-  public static void awaitGC(final WeakReference<?> ref, final long duration, final TimeUnit unit)
-      throws InterruptedException {
-    System.gc();
-    System.runFinalization();
-    final long waitNanos = unit.toNanos(duration);
-    final long start = System.nanoTime();
-    while (System.nanoTime() - start < waitNanos) {
-      if (ref.get() == null) {
-        return;
-      }
-      if (Thread.interrupted()) {
-        throw new InterruptedException();
-      }
-      System.gc();
-      System.runFinalization();
-      try {
-        Thread.sleep(100);
-      } catch (final InterruptedException e) {
-        throw new RuntimeException("Interrupted while waiting for " + ref.get() + " to be GCed");
-      }
+    public static void awaitGC(final WeakReference<?> ref, final long duration, final TimeUnit unit)
+            throws InterruptedException {
+        System.gc();
+        System.runFinalization();
+        final long waitNanos = unit.toNanos(duration);
+        final long start = System.nanoTime();
+        while (System.nanoTime() - start < waitNanos) {
+            if (ref.get() == null) {
+                return;
+            }
+            if (Thread.interrupted()) {
+                throw new InterruptedException();
+            }
+            System.gc();
+            System.runFinalization();
+            try {
+                Thread.sleep(100);
+            } catch (final InterruptedException e) {
+                throw new RuntimeException("Interrupted while waiting for " + ref.get() + " to be GCed");
+            }
+        }
+        throw new RuntimeException("Timed out waiting for " + ref.get() + " to be GCed");
     }
-    throw new RuntimeException("Timed out waiting for " + ref.get() + " to be GCed");
-  }
 }
diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/PollingConditions.java b/utils/test-utils/src/main/java/datadog/trace/test/util/PollingConditions.java
index 654bcc758b7..436439e5897 100644
--- a/utils/test-utils/src/main/java/datadog/trace/test/util/PollingConditions.java
+++ b/utils/test-utils/src/main/java/datadog/trace/test/util/PollingConditions.java
@@ -26,116 +26,113 @@
  * }</pre>
  */
 public class PollingConditions {
-  private double timeout = 1; // seconds
-  private double initialDelay = 0; // seconds
-  private double delay = 0.1; // seconds
-  private double factor = 1.0; // delay multiplier between attempts
+    private double timeout = 1; // seconds
+    private double initialDelay = 0; // seconds
+    private double delay = 0.1; // seconds
+    private double factor = 1.0; // delay multiplier between attempts
 
-  public PollingConditions() {}
+    public PollingConditions() {}
 
-  /**
-   * @param timeoutSeconds the timeout in seconds (the most common single setting).
-   * @throws IllegalArgumentException if {@code timeoutSeconds} is negative.
-   */
-  public PollingConditions(double timeoutSeconds) {
-    this.timeout = requireNonNegative(timeoutSeconds, "timeout");
-  }
-
-  /**
-   * @param seconds how long to keep retrying before failing. Defaults to {@code 1}.
-   */
-  public PollingConditions timeout(double seconds) {
-    this.timeout = requireNonNegative(seconds, "timeout");
-    return this;
-  }
+    /**
+     * @param timeoutSeconds the timeout in seconds (the most common single setting).
+     * @throws IllegalArgumentException if {@code timeoutSeconds} is negative.
+     */
+    public PollingConditions(double timeoutSeconds) {
+        this.timeout = requireNonNegative(timeoutSeconds, "timeout");
+    }
 
-  /**
-   * @param seconds how long to wait before the very first attempt. Defaults to {@code 0}.
-   */
-  public PollingConditions initialDelay(double seconds) {
-    this.initialDelay = requireNonNegative(seconds, "initialDelay");
-    return this;
-  }
+    /**
+     * @param seconds how long to keep retrying before failing. Defaults to {@code 1}.
+     */
+    public PollingConditions timeout(double seconds) {
+        this.timeout = requireNonNegative(seconds, "timeout");
+        return this;
+    }
 
-  /**
-   * @param seconds how long to wait between attempts. Defaults to {@code 0.1}.
-   */
-  public PollingConditions delay(double seconds) {
-    this.delay = requireNonNegative(seconds, "delay");
-    return this;
-  }
+    /**
+     * @param seconds how long to wait before the very first attempt. Defaults to {@code 0}.
+     */
+    public PollingConditions initialDelay(double seconds) {
+        this.initialDelay = requireNonNegative(seconds, "initialDelay");
+        return this;
+    }
 
-  /**
-   * @param factor multiplier applied to the delay after each attempt (exponential back-off).
-   *     Defaults to {@code 1.0} (constant delay).
-   */
-  public PollingConditions factor(double factor) {
-    this.factor = requireNonNegative(factor, "factor");
-    return this;
-  }
+    /**
+     * @param seconds how long to wait between attempts. Defaults to {@code 0.1}.
+     */
+    public PollingConditions delay(double seconds) {
+        this.delay = requireNonNegative(seconds, "delay");
+        return this;
+    }
 
-  /** Retries {@code conditions} until it passes or the configured {@link #timeout} elapses. */
-  public void eventually(ThrowingRunnable conditions) {
-    within(this.timeout, conditions);
-  }
+    /**
+     * @param factor multiplier applied to the delay after each attempt (exponential back-off).
+     *     Defaults to {@code 1.0} (constant delay).
+     */
+    public PollingConditions factor(double factor) {
+        this.factor = requireNonNegative(factor, "factor");
+        return this;
+    }
 
-  /**
-   * Retries {@code conditions} until it passes or {@code seconds} elapse, overriding the configured
-   * {@link #timeout} for this call.
-   */
-  public void within(double seconds, ThrowingRunnable conditions) {
-    final long timeoutMillis = toMillis(requireNonNegative(seconds, "timeout"));
-    final long start = System.currentTimeMillis();
-    if (this.initialDelay > 0) {
-      sleep(toMillis(this.initialDelay));
+    /** Retries {@code conditions} until it passes or the configured {@link #timeout} elapses. */
+    public void eventually(ThrowingRunnable conditions) {
+        within(this.timeout, conditions);
     }
-    long currDelay = toMillis(this.delay);
-    int attempts = 0;
-    long elapsed = 0;
-    Throwable lastFailure = null;
-    while (elapsed <= timeoutMillis) {
-      try {
-        attempts++;
-        conditions.run();
-        return;
-      } catch (final Throwable e) {
-        elapsed = System.currentTimeMillis() - start;
-        lastFailure = e;
-        // Never sleep past the deadline.
-        final long sleepMillis =
-            Math.min(currDelay, start + timeoutMillis - System.currentTimeMillis());
-        if (sleepMillis > 0) {
-          sleep(sleepMillis);
+
+    /**
+     * Retries {@code conditions} until it passes or {@code seconds} elapse, overriding the configured
+     * {@link #timeout} for this call.
+     */
+    public void within(double seconds, ThrowingRunnable conditions) {
+        final long timeoutMillis = toMillis(requireNonNegative(seconds, "timeout"));
+        final long start = System.currentTimeMillis();
+        if (this.initialDelay > 0) {
+            sleep(toMillis(this.initialDelay));
+        }
+        long currDelay = toMillis(this.delay);
+        int attempts = 0;
+        long elapsed = 0;
+        Throwable lastFailure = null;
+        while (elapsed <= timeoutMillis) {
+            try {
+                attempts++;
+                conditions.run();
+                return;
+            } catch (final Throwable e) {
+                elapsed = System.currentTimeMillis() - start;
+                lastFailure = e;
+                // Never sleep past the deadline.
+                final long sleepMillis = Math.min(currDelay, start + timeoutMillis - System.currentTimeMillis());
+                if (sleepMillis > 0) {
+                    sleep(sleepMillis);
+                }
+                currDelay = (long) (currDelay * factor);
+            }
         }
-        currDelay = (long) (currDelay * factor);
-      }
+        throw new AssertionError(
+                String.format("Condition not satisfied after %1.2f seconds and %d attempts", elapsed / 1000d, attempts),
+                lastFailure);
     }
-    throw new AssertionError(
-        String.format(
-            "Condition not satisfied after %1.2f seconds and %d attempts",
-            elapsed / 1000d, attempts),
-        lastFailure);
-  }
 
-  private static long toMillis(final double seconds) {
-    return Math.round(seconds * 1000);
-  }
+    private static long toMillis(final double seconds) {
+        return Math.round(seconds * 1000);
+    }
 
-  private static double requireNonNegative(double value, String name) {
-    if (value < 0) {
-      throw new IllegalArgumentException(name + " must be >= 0 but was " + value);
+    private static double requireNonNegative(double value, String name) {
+        if (value < 0) {
+            throw new IllegalArgumentException(name + " must be >= 0 but was " + value);
+        }
+        return value;
     }
-    return value;
-  }
 
-  // VisibleForTesting to allow test code to override it and avoid flaky timing-based assertions.
-  @VisibleForTesting
-  void sleep(final long millis) {
-    try {
-      Thread.sleep(millis);
-    } catch (final InterruptedException e) {
-      Thread.currentThread().interrupt();
-      throw new AssertionError("Interrupted while waiting for condition", e);
+    // VisibleForTesting to allow test code to override it and avoid flaky timing-based assertions.
+    @VisibleForTesting
+    void sleep(final long millis) {
+        try {
+            Thread.sleep(millis);
+        } catch (final InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new AssertionError("Interrupted while waiting for condition", e);
+        }
     }
-  }
 }
diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/PortableCommand.java b/utils/test-utils/src/main/java/datadog/trace/test/util/PortableCommand.java
index aa1c90bc73d..79ea80d6b5d 100644
--- a/utils/test-utils/src/main/java/datadog/trace/test/util/PortableCommand.java
+++ b/utils/test-utils/src/main/java/datadog/trace/test/util/PortableCommand.java
@@ -19,96 +19,93 @@
  * </ul>
  */
 public final class PortableCommand {
-  private static final String MIN_HEAP = "-Xms8m";
-  private static final String MAX_HEAP = "-Xmx16m";
+    private static final String MIN_HEAP = "-Xms8m";
+    private static final String MAX_HEAP = "-Xmx16m";
 
-  /** Windows has no usable native equivalent for any of these commands. */
-  private static final boolean EMULATED = OperatingSystem.isWindows();
+    /** Windows has no usable native equivalent for any of these commands. */
+    private static final boolean EMULATED = OperatingSystem.isWindows();
 
-  private PortableCommand() {}
+    private PortableCommand() {}
 
-  public static String[] echo(String value) {
-    return echo(value, EMULATED);
-  }
+    public static String[] echo(String value) {
+        return echo(value, EMULATED);
+    }
+
+    public static String[] cat() {
+        return cat(EMULATED);
+    }
+
+    public static String[] sleep(long durationSec) {
+        return sleep(durationSec, EMULATED);
+    }
+
+    public static String[] runForever() {
+        return runForever(EMULATED);
+    }
 
-  public static String[] cat() {
-    return cat(EMULATED);
-  }
+    @VisibleForTesting
+    static String[] echo(String value, boolean emulated) {
+        return emulated ? emulate("echo", value) : new String[] {"echo", value};
+    }
 
-  public static String[] sleep(long durationSec) {
-    return sleep(durationSec, EMULATED);
-  }
+    @VisibleForTesting
+    static String[] cat(boolean emulated) {
+        return emulated ? emulate("cat") : new String[] {"cat"};
+    }
 
-  public static String[] runForever() {
-    return runForever(EMULATED);
-  }
+    @VisibleForTesting
+    static String[] sleep(long durationSec, boolean emulated) {
+        if (durationSec < 0) {
+            throw new IllegalArgumentException("Sleep duration must not be negative: " + durationSec);
+        }
+        // The native sleep takes seconds; the emulated runner takes milliseconds.
+        return emulated
+                ? emulate("sleep", Long.toString(durationSec * 1000))
+                : new String[] {"sleep", Long.toString(durationSec)};
+    }
 
-  @VisibleForTesting
-  static String[] echo(String value, boolean emulated) {
-    return emulated ? emulate("echo", value) : new String[] {"echo", value};
-  }
+    @VisibleForTesting
+    static String[] runForever(boolean emulated) {
+        return emulated ? emulate("sleep", Long.toString(Long.MAX_VALUE)) : new String[] {"tail", "-f", "/dev/null"};
+    }
 
-  @VisibleForTesting
-  static String[] cat(boolean emulated) {
-    return emulated ? emulate("cat") : new String[] {"cat"};
-  }
+    private static String[] emulate(String... arguments) {
+        Path executable = javaExecutable();
+        Path classpath = classpathEntry();
+
+        List<String> command = new ArrayList<>();
+        command.add(executable.toString());
+        command.add(MIN_HEAP);
+        command.add(MAX_HEAP);
+        command.add("-cp");
+        command.add(classpath.toString());
+        command.add(PortableCommandRunner.class.getName());
+        command.addAll(Arrays.asList(arguments));
+        return command.toArray(new String[0]);
+    }
 
-  @VisibleForTesting
-  static String[] sleep(long durationSec, boolean emulated) {
-    if (durationSec < 0) {
-      throw new IllegalArgumentException("Sleep duration must not be negative: " + durationSec);
+    private static Path javaExecutable() {
+        return javaExecutable(Paths.get(System.getProperty("java.home")));
     }
-    // The native sleep takes seconds; the emulated runner takes milliseconds.
-    return emulated
-        ? emulate("sleep", Long.toString(durationSec * 1000))
-        : new String[] {"sleep", Long.toString(durationSec)};
-  }
-
-  @VisibleForTesting
-  static String[] runForever(boolean emulated) {
-    return emulated
-        ? emulate("sleep", Long.toString(Long.MAX_VALUE))
-        : new String[] {"tail", "-f", "/dev/null"};
-  }
-
-  private static String[] emulate(String... arguments) {
-    Path executable = javaExecutable();
-    Path classpath = classpathEntry();
-
-    List<String> command = new ArrayList<>();
-    command.add(executable.toString());
-    command.add(MIN_HEAP);
-    command.add(MAX_HEAP);
-    command.add("-cp");
-    command.add(classpath.toString());
-    command.add(PortableCommandRunner.class.getName());
-    command.addAll(Arrays.asList(arguments));
-    return command.toArray(new String[0]);
-  }
-
-  private static Path javaExecutable() {
-    return javaExecutable(Paths.get(System.getProperty("java.home")));
-  }
-
-  @VisibleForTesting
-  static Path javaExecutable(Path javaHome) {
-    Path bin = javaHome.resolve("bin");
-    for (String name : new String[] {"java", "java.exe"}) {
-      Path candidate = bin.resolve(name);
-      if (Files.isRegularFile(candidate)) {
-        return candidate;
-      }
+
+    @VisibleForTesting
+    static Path javaExecutable(Path javaHome) {
+        Path bin = javaHome.resolve("bin");
+        for (String name : new String[] {"java", "java.exe"}) {
+            Path candidate = bin.resolve(name);
+            if (Files.isRegularFile(candidate)) {
+                return candidate;
+            }
+        }
+        throw new IllegalStateException("Could not find a Java executable under " + bin);
     }
-    throw new IllegalStateException("Could not find a Java executable under " + bin);
-  }
-
-  private static Path classpathEntry() {
-    CodeSource source = PortableCommand.class.getProtectionDomain().getCodeSource();
-    try {
-      return Paths.get(source.getLocation().toURI());
-    } catch (Exception e) {
-      throw new IllegalStateException(
-          "Cannot determine the classpath of " + PortableCommand.class.getName(), e);
+
+    private static Path classpathEntry() {
+        CodeSource source = PortableCommand.class.getProtectionDomain().getCodeSource();
+        try {
+            return Paths.get(source.getLocation().toURI());
+        } catch (Exception e) {
+            throw new IllegalStateException("Cannot determine the classpath of " + PortableCommand.class.getName(), e);
+        }
     }
-  }
 }
diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/PortableCommandRunner.java b/utils/test-utils/src/main/java/datadog/trace/test/util/PortableCommandRunner.java
index db47270f6ec..0df32cfae28 100644
--- a/utils/test-utils/src/main/java/datadog/trace/test/util/PortableCommandRunner.java
+++ b/utils/test-utils/src/main/java/datadog/trace/test/util/PortableCommandRunner.java
@@ -13,43 +13,43 @@
  * no usable native equivalent. Spawned as a child process; not meant to be called directly.
  */
 public final class PortableCommandRunner {
-  private PortableCommandRunner() {}
+    private PortableCommandRunner() {}
 
-  @SuppressForbidden
-  public static void main(String[] arguments) throws IOException, InterruptedException {
-    execute(arguments, System.in, System.out);
-    System.out.flush();
-  }
-
-  @VisibleForTesting
-  static void execute(String[] arguments, InputStream input, OutputStream output)
-      throws IOException, InterruptedException {
-    if (arguments.length == 0) {
-      throw new IllegalArgumentException("Missing command");
+    @SuppressForbidden
+    public static void main(String[] arguments) throws IOException, InterruptedException {
+        execute(arguments, System.in, System.out);
+        System.out.flush();
     }
-    switch (arguments[0]) {
-      case "echo":
-        output.write((argument(arguments) + System.lineSeparator()).getBytes(defaultCharset()));
-        break;
-      case "cat":
-        byte[] buffer = new byte[8192];
-        int read;
-        while ((read = input.read(buffer)) != -1) {
-          output.write(buffer, 0, read);
+
+    @VisibleForTesting
+    static void execute(String[] arguments, InputStream input, OutputStream output)
+            throws IOException, InterruptedException {
+        if (arguments.length == 0) {
+            throw new IllegalArgumentException("Missing command");
+        }
+        switch (arguments[0]) {
+            case "echo":
+                output.write((argument(arguments) + System.lineSeparator()).getBytes(defaultCharset()));
+                break;
+            case "cat":
+                byte[] buffer = new byte[8192];
+                int read;
+                while ((read = input.read(buffer)) != -1) {
+                    output.write(buffer, 0, read);
+                }
+                break;
+            case "sleep":
+                Thread.sleep(Long.parseLong(argument(arguments)));
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown command: " + arguments[0]);
         }
-        break;
-      case "sleep":
-        Thread.sleep(Long.parseLong(argument(arguments)));
-        break;
-      default:
-        throw new IllegalArgumentException("Unknown command: " + arguments[0]);
     }
-  }
 
-  private static String argument(String[] arguments) {
-    if (arguments.length < 2) {
-      throw new IllegalArgumentException("Command '" + arguments[0] + "' requires an argument");
+    private static String argument(String[] arguments) {
+        if (arguments.length < 2) {
+            throw new IllegalArgumentException("Command '" + arguments[0] + "' requires an argument");
+        }
+        return arguments[1];
     }
-    return arguments[1];
-  }
 }
diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/ThreadUtils.java b/utils/test-utils/src/main/java/datadog/trace/test/util/ThreadUtils.java
index 8439c2c038a..b4c723c078a 100644
--- a/utils/test-utils/src/main/java/datadog/trace/test/util/ThreadUtils.java
+++ b/utils/test-utils/src/main/java/datadog/trace/test/util/ThreadUtils.java
@@ -9,109 +9,103 @@
 
 public class ThreadUtils {
 
-  /** A {@link Runnable} whose {@link #run()} may throw a checked exception. */
-  @FunctionalInterface
-  public interface ThrowingRunnable {
-    void run() throws Throwable;
-  }
+    /** A {@link Runnable} whose {@link #run()} may throw a checked exception. */
+    @FunctionalInterface
+    public interface ThrowingRunnable {
+        void run() throws Throwable;
+    }
 
-  /**
-   * Utility to easily run a piece of code in parallel, e.g. in a JUnit test like this:
-   *
-   * <pre>{@code
-   * runConcurrently(
-   *     10,
-   *     100,
-   *     () -> {
-   *       Object something = computeSomething();
-   *       Object other = computeOther();
-   *       assertEquals(something, other);
-   *     });
-   * }</pre>
-   *
-   * @param concurrency the number of concurrent invocations
-   * @param totalInvocations the total number of invocations
-   * @param runnable the code to run
-   * @return {@code true} if everything went well
-   * @throws Throwable if anything went wrong
-   */
-  public static boolean runConcurrently(
-      final int concurrency, final int totalInvocations, final ThrowingRunnable runnable)
-      throws Throwable {
-    return runConcurrently(
-        concurrency,
-        totalInvocations,
-        new Closure<Void>(null) {
-          @Override
-          public Void call() {
-            try {
-              runnable.run();
-            } catch (RuntimeException | Error e) {
-              throw e;
-            } catch (Throwable t) {
-              throw new RuntimeException(t);
+    /**
+     * Utility to easily run a piece of code in parallel, e.g. in a JUnit test like this:
+     *
+     * <pre>{@code
+     * runConcurrently(
+     *     10,
+     *     100,
+     *     () -> {
+     *       Object something = computeSomething();
+     *       Object other = computeOther();
+     *       assertEquals(something, other);
+     *     });
+     * }</pre>
+     *
+     * @param concurrency the number of concurrent invocations
+     * @param totalInvocations the total number of invocations
+     * @param runnable the code to run
+     * @return {@code true} if everything went well
+     * @throws Throwable if anything went wrong
+     */
+    public static boolean runConcurrently(
+            final int concurrency, final int totalInvocations, final ThrowingRunnable runnable) throws Throwable {
+        return runConcurrently(concurrency, totalInvocations, new Closure<Void>(null) {
+            @Override
+            public Void call() {
+                try {
+                    runnable.run();
+                } catch (RuntimeException | Error e) {
+                    throw e;
+                } catch (Throwable t) {
+                    throw new RuntimeException(t);
+                }
+                return null;
             }
-            return null;
-          }
         });
-  }
+    }
 
-  public static boolean runConcurrently(
-      final int concurrency, final int totalInvocations, final Closure<Void> closure)
-      throws Throwable {
-    // There is no reason in creating more threads than invocations
-    int poolSize = Math.min(concurrency, totalInvocations);
+    public static boolean runConcurrently(
+            final int concurrency, final int totalInvocations, final Closure<Void> closure) throws Throwable {
+        // There is no reason in creating more threads than invocations
+        int poolSize = Math.min(concurrency, totalInvocations);
 
-    // If we are not running anything concurrently, then just call the closure directly
-    if (poolSize == 1) {
-      for (int c = 0; c < totalInvocations; c++) {
-        closure.call();
-      }
-      return true;
-    }
+        // If we are not running anything concurrently, then just call the closure directly
+        if (poolSize == 1) {
+            for (int c = 0; c < totalInvocations; c++) {
+                closure.call();
+            }
+            return true;
+        }
 
-    ExecutorService executor = Executors.newFixedThreadPool(poolSize);
-    final AtomicReference<Throwable> throwable = new AtomicReference<>();
-    int each = totalInvocations / poolSize;
-    int remainder = totalInvocations % poolSize;
-    final CountDownLatch startBarrier = new CountDownLatch(poolSize + 1);
-    final CountDownLatch endBarrier = new CountDownLatch(poolSize + 1);
-    for (int i = 0; i < poolSize; i++) {
-      final int invocations = each + (remainder <= 0 ? 0 : 1);
-      executor.execute(
-          () -> {
-            try {
-              startBarrier.countDown();
-              startBarrier.await();
-              for (int c = 0; c < invocations && throwable.get() == null; c++) {
+        ExecutorService executor = Executors.newFixedThreadPool(poolSize);
+        final AtomicReference<Throwable> throwable = new AtomicReference<>();
+        int each = totalInvocations / poolSize;
+        int remainder = totalInvocations % poolSize;
+        final CountDownLatch startBarrier = new CountDownLatch(poolSize + 1);
+        final CountDownLatch endBarrier = new CountDownLatch(poolSize + 1);
+        for (int i = 0; i < poolSize; i++) {
+            final int invocations = each + (remainder <= 0 ? 0 : 1);
+            executor.execute(() -> {
                 try {
-                  closure.call();
+                    startBarrier.countDown();
+                    startBarrier.await();
+                    for (int c = 0; c < invocations && throwable.get() == null; c++) {
+                        try {
+                            closure.call();
+                        } catch (Throwable t) {
+                            throwable.compareAndSet(null, t);
+                        }
+                    }
                 } catch (Throwable t) {
-                  throwable.compareAndSet(null, t);
+                    throwable.compareAndSet(null, t);
+                } finally {
+                    try {
+                        endBarrier.countDown();
+                    } catch (Throwable t) {
+                        throwable.compareAndSet(null, t);
+                    }
                 }
-              }
-            } catch (Throwable t) {
-              throwable.compareAndSet(null, t);
-            } finally {
-              try {
-                endBarrier.countDown();
-              } catch (Throwable t) {
-                throwable.compareAndSet(null, t);
-              }
-            }
-          });
-      remainder--;
-    }
-    startBarrier.countDown();
-    startBarrier.await();
-    endBarrier.countDown();
-    endBarrier.await();
-    executor.shutdownNow();
-    executor.awaitTermination(30, TimeUnit.SECONDS);
-    Throwable t = throwable.get();
-    if (t != null) {
-      throw t;
+            });
+            remainder--;
+        }
+        startBarrier.countDown();
+        startBarrier.await();
+        endBarrier.countDown();
+        endBarrier.await();
+        executor.shutdownNow();
+        executor.awaitTermination(30, TimeUnit.SECONDS);
+        Throwable t = throwable.get();
+        if (t != null) {
+            throw t;
+        }
+        return true;
     }
-    return true;
-  }
 }
diff --git a/utils/test-utils/src/main/java/external/util/stacktrace/RecursiveRunner.java b/utils/test-utils/src/main/java/external/util/stacktrace/RecursiveRunner.java
index 3c1900c64b3..0721bccf87d 100644
--- a/utils/test-utils/src/main/java/external/util/stacktrace/RecursiveRunner.java
+++ b/utils/test-utils/src/main/java/external/util/stacktrace/RecursiveRunner.java
@@ -3,24 +3,24 @@
 /** This class is used to generate stacks not filtered by StackWalker in jmh benchmarks */
 public class RecursiveRunner {
 
-  private final int deep;
+    private final int deep;
 
-  private final Runnable runnable;
+    private final Runnable runnable;
 
-  public RecursiveRunner(int deep, final Runnable runnable) {
-    this.deep = deep;
-    this.runnable = runnable;
-  }
+    public RecursiveRunner(int deep, final Runnable runnable) {
+        this.deep = deep;
+        this.runnable = runnable;
+    }
 
-  public void run() {
-    recursiveRun(0);
-  }
+    public void run() {
+        recursiveRun(0);
+    }
 
-  private void recursiveRun(int reps) {
-    if (reps > deep) {
-      runnable.run();
-    } else {
-      recursiveRun(++reps);
+    private void recursiveRun(int reps) {
+        if (reps > deep) {
+            runnable.run();
+        } else {
+            recursiveRun(++reps);
+        }
     }
-  }
 }
diff --git a/utils/test-utils/src/test/java/datadog/trace/test/util/PollingConditionsTest.java b/utils/test-utils/src/test/java/datadog/trace/test/util/PollingConditionsTest.java
index 64ea4c5fe7e..8e8b024d383 100644
--- a/utils/test-utils/src/test/java/datadog/trace/test/util/PollingConditionsTest.java
+++ b/utils/test-utils/src/test/java/datadog/trace/test/util/PollingConditionsTest.java
@@ -15,152 +15,137 @@
 
 class PollingConditionsTest {
 
-  @Test
-  void passesOnFirstAttempt() {
-    AtomicInteger attempts = new AtomicInteger();
-    new PollingConditions().eventually(attempts::incrementAndGet);
-    assertEquals(1, attempts.get());
-  }
-
-  @Test
-  void succeedsAfterSeveralRetries() {
-    AtomicInteger attempts = new AtomicInteger();
-    new PollingConditions(2)
-        .delay(0.01)
-        .eventually(
-            () -> {
-              if (attempts.incrementAndGet() < 5) {
+    @Test
+    void passesOnFirstAttempt() {
+        AtomicInteger attempts = new AtomicInteger();
+        new PollingConditions().eventually(attempts::incrementAndGet);
+        assertEquals(1, attempts.get());
+    }
+
+    @Test
+    void succeedsAfterSeveralRetries() {
+        AtomicInteger attempts = new AtomicInteger();
+        new PollingConditions(2).delay(0.01).eventually(() -> {
+            if (attempts.incrementAndGet() < 5) {
                 fail("not yet");
-              }
-            });
-    assertEquals(5, attempts.get());
-  }
-
-  @Test
-  void timesOutWithFormattedMessageAndUnderlyingCause() {
-    AssertionError error =
+            }
+        });
+        assertEquals(5, attempts.get());
+    }
+
+    @Test
+    void timesOutWithFormattedMessageAndUnderlyingCause() {
+        AssertionError error = assertThrows(
+                AssertionError.class,
+                () -> new PollingConditions(0.1).delay(0.01).eventually(() -> assertEquals(1, 2, "still wrong")));
+
+        assertTrue(error.getMessage().startsWith("Condition not satisfied after"), error.getMessage());
+        assertTrue(error.getMessage().contains("attempts"), error.getMessage());
+
+        Throwable cause = error.getCause();
+        assertInstanceOf(AssertionError.class, cause);
+        assertTrue(cause.getMessage().contains("still wrong"), cause.getMessage());
+    }
+
+    @Test
+    void withinOverridesConfiguredTimeout() {
+        // The instance timeout is huge, but within() must use its own (tiny) timeout and fail fast.
+        long start = System.currentTimeMillis();
         assertThrows(
-            AssertionError.class,
-            () ->
-                new PollingConditions(0.1)
-                    .delay(0.01)
-                    .eventually(() -> assertEquals(1, 2, "still wrong")));
-
-    assertTrue(error.getMessage().startsWith("Condition not satisfied after"), error.getMessage());
-    assertTrue(error.getMessage().contains("attempts"), error.getMessage());
-
-    Throwable cause = error.getCause();
-    assertInstanceOf(AssertionError.class, cause);
-    assertTrue(cause.getMessage().contains("still wrong"), cause.getMessage());
-  }
-
-  @Test
-  void withinOverridesConfiguredTimeout() {
-    // The instance timeout is huge, but within() must use its own (tiny) timeout and fail fast.
-    long start = System.currentTimeMillis();
-    assertThrows(
-        AssertionError.class,
-        () -> new PollingConditions(60).delay(0.01).within(0.1, () -> fail("never")));
-    long elapsed = System.currentTimeMillis() - start;
-    assertTrue(
-        elapsed < 5_000, "within() should honor its own short timeout, took " + elapsed + "ms");
-  }
-
-  @Test
-  void retriesWhenConditionThrowsCheckedException() {
-    AtomicInteger attempts = new AtomicInteger();
-    new PollingConditions(2)
-        .delay(0.01)
-        .eventually(
-            () -> {
-              if (attempts.incrementAndGet() < 3) {
+                AssertionError.class,
+                () -> new PollingConditions(60).delay(0.01).within(0.1, () -> fail("never")));
+        long elapsed = System.currentTimeMillis() - start;
+        assertTrue(elapsed < 5_000, "within() should honor its own short timeout, took " + elapsed + "ms");
+    }
+
+    @Test
+    void retriesWhenConditionThrowsCheckedException() {
+        AtomicInteger attempts = new AtomicInteger();
+        new PollingConditions(2).delay(0.01).eventually(() -> {
+            if (attempts.incrementAndGet() < 3) {
                 throw new IOException("not ready");
-              }
-            });
-    assertEquals(3, attempts.get());
-  }
-
-  @Test
-  void factorMultipliesDelayBetweenAttempts() {
-    // Large timeout so the run ends by success (after 4 attempts), never by the deadline; the
-    // recording subclass captures the requested delays without actually sleeping, so this is
-    // deterministic rather than dependent on wall-clock scheduling.
-    RecordingPollingConditions conditions = new RecordingPollingConditions(100);
-    conditions.delay(0.02).factor(4); // 20ms base delay, multiplied by 4 after each attempt
-
-    AtomicInteger attempts = new AtomicInteger();
-    conditions.eventually(
-        () -> {
-          if (attempts.incrementAndGet() < 4) {
-            fail("not yet");
-          }
+            }
+        });
+        assertEquals(3, attempts.get());
+    }
+
+    @Test
+    void factorMultipliesDelayBetweenAttempts() {
+        // Large timeout so the run ends by success (after 4 attempts), never by the deadline; the
+        // recording subclass captures the requested delays without actually sleeping, so this is
+        // deterministic rather than dependent on wall-clock scheduling.
+        RecordingPollingConditions conditions = new RecordingPollingConditions(100);
+        conditions.delay(0.02).factor(4); // 20ms base delay, multiplied by 4 after each attempt
+
+        AtomicInteger attempts = new AtomicInteger();
+        conditions.eventually(() -> {
+            if (attempts.incrementAndGet() < 4) {
+                fail("not yet");
+            }
         });
 
-    assertEquals(4, attempts.get());
-    // Three failed attempts -> three delays, each 4x the previous.
-    assertEquals(Arrays.asList(20L, 80L, 320L), conditions.requestedSleeps);
-  }
-
-  @Test
-  void appliesInitialDelayBeforeFirstAttempt() {
-    AtomicInteger attempts = new AtomicInteger();
-    long start = System.currentTimeMillis();
-    new PollingConditions()
-        .timeout(2)
-        .initialDelay(0.05)
-        .delay(0.01)
-        .factor(1)
-        .eventually(attempts::incrementAndGet);
-    long elapsed = System.currentTimeMillis() - start;
-    assertEquals(1, attempts.get());
-    assertTrue(elapsed >= 40, "initial delay should have been applied, took " + elapsed + "ms");
-  }
-
-  @Test
-  void interruptedWhileWaitingFailsAndRestoresInterruptFlag() {
-    // Pre-interrupt so the first inter-attempt sleep throws InterruptedException immediately.
-    Thread.currentThread().interrupt();
-    try {
-      AssertionError error =
-          assertThrows(
-              AssertionError.class,
-              () -> new PollingConditions(2).delay(0.05).eventually(() -> fail("retry")));
-      assertEquals("Interrupted while waiting for condition", error.getMessage());
-      assertTrue(
-          Thread.currentThread().isInterrupted(), "interrupt flag should have been restored");
-    } finally {
-      // Clear the flag so it does not leak into other tests sharing this thread.
-      Thread.interrupted();
+        assertEquals(4, attempts.get());
+        // Three failed attempts -> three delays, each 4x the previous.
+        assertEquals(Arrays.asList(20L, 80L, 320L), conditions.requestedSleeps);
     }
-  }
-
-  @Test
-  void rejectsNegativeOrNanConfiguration() {
-    // Check conditions parameters
-    assertThrows(IllegalArgumentException.class, () -> new PollingConditions(-1));
-    assertThrows(IllegalArgumentException.class, () -> new PollingConditions().timeout(-1));
-    assertThrows(IllegalArgumentException.class, () -> new PollingConditions().initialDelay(-1));
-    assertThrows(IllegalArgumentException.class, () -> new PollingConditions().factor(-2));
-    // Check delay and within
-    IllegalArgumentException error =
-        assertThrows(IllegalArgumentException.class, () -> new PollingConditions().delay(-0.5));
-    assertTrue(error.getMessage().contains("delay"), error.getMessage());
-    assertTrue(error.getMessage().contains("-0.5"), error.getMessage());
-    assertThrows(
-        IllegalArgumentException.class, () -> new PollingConditions().within(-1, () -> {}));
-  }
-
-  /** Captures the requested delays instead of sleeping, for deterministic back-off assertions. */
-  private static final class RecordingPollingConditions extends PollingConditions {
-    final List<Long> requestedSleeps = new ArrayList<>();
-
-    RecordingPollingConditions(double timeoutSeconds) {
-      super(timeoutSeconds);
+
+    @Test
+    void appliesInitialDelayBeforeFirstAttempt() {
+        AtomicInteger attempts = new AtomicInteger();
+        long start = System.currentTimeMillis();
+        new PollingConditions()
+                .timeout(2)
+                .initialDelay(0.05)
+                .delay(0.01)
+                .factor(1)
+                .eventually(attempts::incrementAndGet);
+        long elapsed = System.currentTimeMillis() - start;
+        assertEquals(1, attempts.get());
+        assertTrue(elapsed >= 40, "initial delay should have been applied, took " + elapsed + "ms");
     }
 
-    @Override
-    void sleep(long millis) {
-      requestedSleeps.add(millis);
+    @Test
+    void interruptedWhileWaitingFailsAndRestoresInterruptFlag() {
+        // Pre-interrupt so the first inter-attempt sleep throws InterruptedException immediately.
+        Thread.currentThread().interrupt();
+        try {
+            AssertionError error = assertThrows(
+                    AssertionError.class,
+                    () -> new PollingConditions(2).delay(0.05).eventually(() -> fail("retry")));
+            assertEquals("Interrupted while waiting for condition", error.getMessage());
+            assertTrue(Thread.currentThread().isInterrupted(), "interrupt flag should have been restored");
+        } finally {
+            // Clear the flag so it does not leak into other tests sharing this thread.
+            Thread.interrupted();
+        }
+    }
+
+    @Test
+    void rejectsNegativeOrNanConfiguration() {
+        // Check conditions parameters
+        assertThrows(IllegalArgumentException.class, () -> new PollingConditions(-1));
+        assertThrows(IllegalArgumentException.class, () -> new PollingConditions().timeout(-1));
+        assertThrows(IllegalArgumentException.class, () -> new PollingConditions().initialDelay(-1));
+        assertThrows(IllegalArgumentException.class, () -> new PollingConditions().factor(-2));
+        // Check delay and within
+        IllegalArgumentException error =
+                assertThrows(IllegalArgumentException.class, () -> new PollingConditions().delay(-0.5));
+        assertTrue(error.getMessage().contains("delay"), error.getMessage());
+        assertTrue(error.getMessage().contains("-0.5"), error.getMessage());
+        assertThrows(IllegalArgumentException.class, () -> new PollingConditions().within(-1, () -> {}));
+    }
+
+    /** Captures the requested delays instead of sleeping, for deterministic back-off assertions. */
+    private static final class RecordingPollingConditions extends PollingConditions {
+        final List<Long> requestedSleeps = new ArrayList<>();
+
+        RecordingPollingConditions(double timeoutSeconds) {
+            super(timeoutSeconds);
+        }
+
+        @Override
+        void sleep(long millis) {
+            requestedSleeps.add(millis);
+        }
     }
-  }
 }
diff --git a/utils/test-utils/src/test/java/datadog/trace/test/util/PortableCommandRunnerTest.java b/utils/test-utils/src/test/java/datadog/trace/test/util/PortableCommandRunnerTest.java
index 610e5dad584..07fc01cae0c 100644
--- a/utils/test-utils/src/test/java/datadog/trace/test/util/PortableCommandRunnerTest.java
+++ b/utils/test-utils/src/test/java/datadog/trace/test/util/PortableCommandRunnerTest.java
@@ -17,63 +17,56 @@
  * about why a command misbehaved, so the dispatch is driven directly here.
  */
 class PortableCommandRunnerTest {
-  @Test
-  void echoes() throws Exception {
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
+    @Test
+    void echoes() throws Exception {
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
 
-    PortableCommandRunner.execute(new String[] {"echo", "value"}, emptyInput(), output);
+        PortableCommandRunner.execute(new String[] {"echo", "value"}, emptyInput(), output);
 
-    assertEquals("value" + System.lineSeparator(), new String(output.toByteArray(), UTF_8));
-  }
+        assertEquals("value" + System.lineSeparator(), new String(output.toByteArray(), UTF_8));
+    }
 
-  @Test
-  void copiesInput() throws Exception {
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    InputStream input = new ByteArrayInputStream("payload".getBytes(UTF_8));
+    @Test
+    void copiesInput() throws Exception {
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        InputStream input = new ByteArrayInputStream("payload".getBytes(UTF_8));
 
-    PortableCommandRunner.execute(new String[] {"cat"}, input, output);
+        PortableCommandRunner.execute(new String[] {"cat"}, input, output);
 
-    assertEquals("payload", new String(output.toByteArray(), UTF_8));
-  }
+        assertEquals("payload", new String(output.toByteArray(), UTF_8));
+    }
 
-  @Test
-  void sleeps() throws Exception {
-    long start = System.nanoTime();
+    @Test
+    void sleeps() throws Exception {
+        long start = System.nanoTime();
 
-    PortableCommandRunner.execute(
-        new String[] {"sleep", "50"}, emptyInput(), new ByteArrayOutputStream());
+        PortableCommandRunner.execute(new String[] {"sleep", "50"}, emptyInput(), new ByteArrayOutputStream());
 
-    assertTrue((System.nanoTime() - start) / 1_000_000 >= 40, "sleep returned immediately");
-  }
+        assertTrue((System.nanoTime() - start) / 1_000_000 >= 40, "sleep returned immediately");
+    }
 
-  @Test
-  void rejectsMissingCommand() {
-    assertThrows(
-        IllegalArgumentException.class,
-        () ->
-            PortableCommandRunner.execute(
-                new String[0], emptyInput(), new ByteArrayOutputStream()));
-  }
+    @Test
+    void rejectsMissingCommand() {
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> PortableCommandRunner.execute(new String[0], emptyInput(), new ByteArrayOutputStream()));
+    }
 
-  @Test
-  void rejectsUnknownCommand() {
-    assertThrows(
-        IllegalArgumentException.class,
-        () ->
-            PortableCommandRunner.execute(
-                new String[] {"rm"}, emptyInput(), new ByteArrayOutputStream()));
-  }
+    @Test
+    void rejectsUnknownCommand() {
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> PortableCommandRunner.execute(new String[] {"rm"}, emptyInput(), new ByteArrayOutputStream()));
+    }
 
-  @Test
-  void rejectsMissingArgument() {
-    assertThrows(
-        IllegalArgumentException.class,
-        () ->
-            PortableCommandRunner.execute(
-                new String[] {"echo"}, emptyInput(), new ByteArrayOutputStream()));
-  }
+    @Test
+    void rejectsMissingArgument() {
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> PortableCommandRunner.execute(new String[] {"echo"}, emptyInput(), new ByteArrayOutputStream()));
+    }
 
-  private static InputStream emptyInput() {
-    return new ByteArrayInputStream(new byte[0]);
-  }
+    private static InputStream emptyInput() {
+        return new ByteArrayInputStream(new byte[0]);
+    }
 }
diff --git a/utils/test-utils/src/test/java/datadog/trace/test/util/PortableCommandTest.java b/utils/test-utils/src/test/java/datadog/trace/test/util/PortableCommandTest.java
index 784145e8c8b..067e6272ba2 100644
--- a/utils/test-utils/src/test/java/datadog/trace/test/util/PortableCommandTest.java
+++ b/utils/test-utils/src/test/java/datadog/trace/test/util/PortableCommandTest.java
@@ -22,191 +22,188 @@
 import org.tabletest.junit.TableTest;
 
 class PortableCommandTest {
-  private static final long TIMEOUT_SECONDS = 20;
-
-  // Both strategies are exercised on every platform so that the emulated path, which only ships
-  // on Windows, is still verified by a POSIX CI run.
-
-  @TableTest({
-    "scenario           | emulated",
-    "native command     | false   ",
-    "emulated child JVM | true    "
-  })
-  void testEcho(boolean emulated) throws Exception {
-    assumeStrategySupported(emulated);
-
-    Result result = run(PortableCommand.echo("hello", emulated), null);
-
-    assertEquals(0, result.exitCode, result.error);
-    assertEquals("hello" + System.lineSeparator(), result.output);
-  }
-
-  @TableTest({
-    "scenario           | emulated",
-    "native command     | false   ",
-    "emulated child JVM | true    "
-  })
-  void testCat(boolean emulated) throws Exception {
-    assumeStrategySupported(emulated);
-
-    Result result = run(PortableCommand.cat(emulated), "copied".getBytes(UTF_8));
-
-    assertEquals(0, result.exitCode, result.error);
-    assertEquals("copied", result.output);
-  }
-
-  @TableTest({
-    "scenario           | emulated",
-    "native command     | false   ",
-    "emulated child JVM | true    "
-  })
-  void testSleep(boolean emulated) throws Exception {
-    assumeStrategySupported(emulated);
-
-    long start = System.nanoTime();
-    Result result = run(PortableCommand.sleep(1, emulated), null);
-    long elapsedMillis = (System.nanoTime() - start) / 1_000_000;
-
-    assertEquals(0, result.exitCode, result.error);
-    // A floor slightly below the requested duration keeps this robust against clock granularity
-    // while still failing if sleep is a no-op.
-    assertTrue(elapsedMillis >= 900, "slept for only " + elapsedMillis + "ms");
-  }
-
-  @TableTest({
-    "scenario           | emulated",
-    "native command     | false   ",
-    "emulated child JVM | true    "
-  })
-  void testRunForever(boolean emulated) throws Exception {
-    assumeStrategySupported(emulated);
-
-    Process process = new ProcessBuilder(PortableCommand.runForever(emulated)).start();
-    try {
-      assertFalse(process.waitFor(1, SECONDS), "runForever() must not exit on its own");
-
-      process.destroyForcibly();
-
-      assertTrue(process.waitFor(TIMEOUT_SECONDS, SECONDS), "process outlived destroyForcibly()");
-    } finally {
-      process.destroyForcibly();
+    private static final long TIMEOUT_SECONDS = 20;
+
+    // Both strategies are exercised on every platform so that the emulated path, which only ships
+    // on Windows, is still verified by a POSIX CI run.
+
+    @TableTest({
+      "scenario           | emulated",
+      "native command     | false   ",
+      "emulated child JVM | true    "
+    })
+    void testEcho(boolean emulated) throws Exception {
+        assumeStrategySupported(emulated);
+
+        Result result = run(PortableCommand.echo("hello", emulated), null);
+
+        assertEquals(0, result.exitCode, result.error);
+        assertEquals("hello" + System.lineSeparator(), result.output);
     }
-  }
-
-  @Test
-  void publicApiSelectsStrategyForCurrentPlatform() {
-    boolean emulated = OperatingSystem.isWindows();
-
-    assertArrayEquals(PortableCommand.echo("v", emulated), PortableCommand.echo("v"));
-    assertArrayEquals(PortableCommand.cat(emulated), PortableCommand.cat());
-    assertArrayEquals(PortableCommand.sleep(10, emulated), PortableCommand.sleep(10));
-    assertArrayEquals(PortableCommand.runForever(emulated), PortableCommand.runForever());
-  }
-
-  @Test
-  void rejectsNegativeSleep() {
-    assertThrows(IllegalArgumentException.class, () -> PortableCommand.sleep(-1, false));
-    assertThrows(IllegalArgumentException.class, () -> PortableCommand.sleep(-1, true));
-  }
-
-  @Test
-  void locatesJavaExecutableOfRunningJvm() {
-    Path executable = PortableCommand.javaExecutable(Paths.get(System.getProperty("java.home")));
-
-    assertTrue(Files.isRegularFile(executable), executable + " is not a file");
-  }
-
-  @Test
-  void locatesWindowsJavaExecutable(@TempDir Path javaHome) throws Exception {
-    Path bin = Files.createDirectory(javaHome.resolve("bin"));
-    Path executable = Files.createFile(bin.resolve("java.exe"));
-
-    assertEquals(executable, PortableCommand.javaExecutable(javaHome));
-  }
-
-  @Test
-  void failsWhenJavaExecutableIsMissing(@TempDir Path javaHome) throws Exception {
-    Files.createDirectory(javaHome.resolve("bin"));
-
-    assertThrows(IllegalStateException.class, () -> PortableCommand.javaExecutable(javaHome));
-  }
-
-  private static void assumeStrategySupported(boolean emulated) {
-    assumeTrue(
-        emulated || !OperatingSystem.isWindows(),
-        "native commands are only available on POSIX platforms");
-  }
-
-  private static Result run(String[] command, byte[] input) throws Exception {
-    Process process = new ProcessBuilder(command).start();
-    try {
-      // Both streams are drained concurrently: waiting for the process to exit before reading
-      // deadlocks as soon as either pipe buffer fills.
-      Drain output = Drain.of(process.getInputStream());
-      Drain error = Drain.of(process.getErrorStream());
-
-      try (OutputStream stdin = process.getOutputStream()) {
-        if (input != null) {
-          stdin.write(input);
+
+    @TableTest({
+      "scenario           | emulated",
+      "native command     | false   ",
+      "emulated child JVM | true    "
+    })
+    void testCat(boolean emulated) throws Exception {
+        assumeStrategySupported(emulated);
+
+        Result result = run(PortableCommand.cat(emulated), "copied".getBytes(UTF_8));
+
+        assertEquals(0, result.exitCode, result.error);
+        assertEquals("copied", result.output);
+    }
+
+    @TableTest({
+      "scenario           | emulated",
+      "native command     | false   ",
+      "emulated child JVM | true    "
+    })
+    void testSleep(boolean emulated) throws Exception {
+        assumeStrategySupported(emulated);
+
+        long start = System.nanoTime();
+        Result result = run(PortableCommand.sleep(1, emulated), null);
+        long elapsedMillis = (System.nanoTime() - start) / 1_000_000;
+
+        assertEquals(0, result.exitCode, result.error);
+        // A floor slightly below the requested duration keeps this robust against clock granularity
+        // while still failing if sleep is a no-op.
+        assertTrue(elapsedMillis >= 900, "slept for only " + elapsedMillis + "ms");
+    }
+
+    @TableTest({
+      "scenario           | emulated",
+      "native command     | false   ",
+      "emulated child JVM | true    "
+    })
+    void testRunForever(boolean emulated) throws Exception {
+        assumeStrategySupported(emulated);
+
+        Process process = new ProcessBuilder(PortableCommand.runForever(emulated)).start();
+        try {
+            assertFalse(process.waitFor(1, SECONDS), "runForever() must not exit on its own");
+
+            process.destroyForcibly();
+
+            assertTrue(process.waitFor(TIMEOUT_SECONDS, SECONDS), "process outlived destroyForcibly()");
+        } finally {
+            process.destroyForcibly();
         }
-      }
-
-      assertTrue(
-          process.waitFor(TIMEOUT_SECONDS, SECONDS),
-          () -> "command timed out: " + String.join(" ", command));
-      return new Result(process.exitValue(), output.text(), error.text());
-    } finally {
-      process.destroyForcibly();
     }
-  }
 
-  private static final class Result {
-    final int exitCode;
-    final String output;
-    final String error;
+    @Test
+    void publicApiSelectsStrategyForCurrentPlatform() {
+        boolean emulated = OperatingSystem.isWindows();
+
+        assertArrayEquals(PortableCommand.echo("v", emulated), PortableCommand.echo("v"));
+        assertArrayEquals(PortableCommand.cat(emulated), PortableCommand.cat());
+        assertArrayEquals(PortableCommand.sleep(10, emulated), PortableCommand.sleep(10));
+        assertArrayEquals(PortableCommand.runForever(emulated), PortableCommand.runForever());
+    }
+
+    @Test
+    void rejectsNegativeSleep() {
+        assertThrows(IllegalArgumentException.class, () -> PortableCommand.sleep(-1, false));
+        assertThrows(IllegalArgumentException.class, () -> PortableCommand.sleep(-1, true));
+    }
+
+    @Test
+    void locatesJavaExecutableOfRunningJvm() {
+        Path executable = PortableCommand.javaExecutable(Paths.get(System.getProperty("java.home")));
+
+        assertTrue(Files.isRegularFile(executable), executable + " is not a file");
+    }
+
+    @Test
+    void locatesWindowsJavaExecutable(@TempDir Path javaHome) throws Exception {
+        Path bin = Files.createDirectory(javaHome.resolve("bin"));
+        Path executable = Files.createFile(bin.resolve("java.exe"));
 
-    Result(int exitCode, String output, String error) {
-      this.exitCode = exitCode;
-      this.output = output;
-      this.error = error;
+        assertEquals(executable, PortableCommand.javaExecutable(javaHome));
     }
-  }
 
-  private static final class Drain extends Thread {
-    private final InputStream input;
-    private final ByteArrayOutputStream output = new ByteArrayOutputStream();
-    private volatile IOException failure;
+    @Test
+    void failsWhenJavaExecutableIsMissing(@TempDir Path javaHome) throws Exception {
+        Files.createDirectory(javaHome.resolve("bin"));
 
-    private Drain(InputStream input) {
-      this.input = input;
-      setDaemon(true);
+        assertThrows(IllegalStateException.class, () -> PortableCommand.javaExecutable(javaHome));
     }
 
-    static Drain of(InputStream input) {
-      Drain drain = new Drain(input);
-      drain.start();
-      return drain;
+    private static void assumeStrategySupported(boolean emulated) {
+        assumeTrue(emulated || !OperatingSystem.isWindows(), "native commands are only available on POSIX platforms");
     }
 
-    @Override
-    public void run() {
-      byte[] buffer = new byte[8192];
-      try {
-        int read;
-        while ((read = input.read(buffer)) != -1) {
-          output.write(buffer, 0, read);
+    private static Result run(String[] command, byte[] input) throws Exception {
+        Process process = new ProcessBuilder(command).start();
+        try {
+            // Both streams are drained concurrently: waiting for the process to exit before reading
+            // deadlocks as soon as either pipe buffer fills.
+            Drain output = Drain.of(process.getInputStream());
+            Drain error = Drain.of(process.getErrorStream());
+
+            try (OutputStream stdin = process.getOutputStream()) {
+                if (input != null) {
+                    stdin.write(input);
+                }
+            }
+
+            assertTrue(
+                    process.waitFor(TIMEOUT_SECONDS, SECONDS), () -> "command timed out: " + String.join(" ", command));
+            return new Result(process.exitValue(), output.text(), error.text());
+        } finally {
+            process.destroyForcibly();
+        }
+    }
+
+    private static final class Result {
+        final int exitCode;
+        final String output;
+        final String error;
+
+        Result(int exitCode, String output, String error) {
+            this.exitCode = exitCode;
+            this.output = output;
+            this.error = error;
         }
-      } catch (IOException e) {
-        failure = e;
-      }
     }
 
-    String text() throws Exception {
-      join(SECONDS.toMillis(TIMEOUT_SECONDS));
-      if (failure != null) {
-        throw failure;
-      }
-      return new String(output.toByteArray(), UTF_8);
+    private static final class Drain extends Thread {
+        private final InputStream input;
+        private final ByteArrayOutputStream output = new ByteArrayOutputStream();
+        private volatile IOException failure;
+
+        private Drain(InputStream input) {
+            this.input = input;
+            setDaemon(true);
+        }
+
+        static Drain of(InputStream input) {
+            Drain drain = new Drain(input);
+            drain.start();
+            return drain;
+        }
+
+        @Override
+        public void run() {
+            byte[] buffer = new byte[8192];
+            try {
+                int read;
+                while ((read = input.read(buffer)) != -1) {
+                    output.write(buffer, 0, read);
+                }
+            } catch (IOException e) {
+                failure = e;
+            }
+        }
+
+        String text() throws Exception {
+            join(SECONDS.toMillis(TIMEOUT_SECONDS));
+            if (failure != null) {
+                throw failure;
+            }
+            return new String(output.toByteArray(), UTF_8);
+        }
     }
-  }
 }
diff --git a/utils/time-utils/src/main/java/datadog/trace/api/time/ControllableTimeSource.java b/utils/time-utils/src/main/java/datadog/trace/api/time/ControllableTimeSource.java
index 833314da88e..394ac8d074d 100644
--- a/utils/time-utils/src/main/java/datadog/trace/api/time/ControllableTimeSource.java
+++ b/utils/time-utils/src/main/java/datadog/trace/api/time/ControllableTimeSource.java
@@ -3,33 +3,33 @@
 import java.util.concurrent.TimeUnit;
 
 public class ControllableTimeSource implements TimeSource {
-  private long currentTime = 0;
-
-  public void advance(long nanosIncrement) {
-    currentTime += nanosIncrement;
-  }
-
-  public void set(long nanos) {
-    currentTime = nanos;
-  }
-
-  @Override
-  public long getNanoTicks() {
-    return currentTime;
-  }
-
-  @Override
-  public long getCurrentTimeMillis() {
-    return TimeUnit.NANOSECONDS.toMillis(currentTime);
-  }
-
-  @Override
-  public long getCurrentTimeMicros() {
-    return TimeUnit.NANOSECONDS.toMicros(currentTime);
-  }
-
-  @Override
-  public long getCurrentTimeNanos() {
-    return currentTime;
-  }
+    private long currentTime = 0;
+
+    public void advance(long nanosIncrement) {
+        currentTime += nanosIncrement;
+    }
+
+    public void set(long nanos) {
+        currentTime = nanos;
+    }
+
+    @Override
+    public long getNanoTicks() {
+        return currentTime;
+    }
+
+    @Override
+    public long getCurrentTimeMillis() {
+        return TimeUnit.NANOSECONDS.toMillis(currentTime);
+    }
+
+    @Override
+    public long getCurrentTimeMicros() {
+        return TimeUnit.NANOSECONDS.toMicros(currentTime);
+    }
+
+    @Override
+    public long getCurrentTimeNanos() {
+        return currentTime;
+    }
 }
diff --git a/utils/time-utils/src/main/java/datadog/trace/api/time/SystemTimeSource.java b/utils/time-utils/src/main/java/datadog/trace/api/time/SystemTimeSource.java
index dfa5139056b..aebb9dc476f 100644
--- a/utils/time-utils/src/main/java/datadog/trace/api/time/SystemTimeSource.java
+++ b/utils/time-utils/src/main/java/datadog/trace/api/time/SystemTimeSource.java
@@ -3,27 +3,27 @@
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 public class SystemTimeSource implements TimeSource {
-  public static final TimeSource INSTANCE = new SystemTimeSource();
+    public static final TimeSource INSTANCE = new SystemTimeSource();
 
-  private SystemTimeSource() {}
+    private SystemTimeSource() {}
 
-  @Override
-  public long getNanoTicks() {
-    return System.nanoTime();
-  }
+    @Override
+    public long getNanoTicks() {
+        return System.nanoTime();
+    }
 
-  @Override
-  public long getCurrentTimeMillis() {
-    return System.currentTimeMillis();
-  }
+    @Override
+    public long getCurrentTimeMillis() {
+        return System.currentTimeMillis();
+    }
 
-  @Override
-  public long getCurrentTimeMicros() {
-    return MILLISECONDS.toMicros(getCurrentTimeMillis());
-  }
+    @Override
+    public long getCurrentTimeMicros() {
+        return MILLISECONDS.toMicros(getCurrentTimeMillis());
+    }
 
-  @Override
-  public long getCurrentTimeNanos() {
-    return MILLISECONDS.toNanos(getCurrentTimeMillis());
-  }
+    @Override
+    public long getCurrentTimeNanos() {
+        return MILLISECONDS.toNanos(getCurrentTimeMillis());
+    }
 }
diff --git a/utils/time-utils/src/main/java/datadog/trace/api/time/TimeSource.java b/utils/time-utils/src/main/java/datadog/trace/api/time/TimeSource.java
index dc785661fb0..8da682359ec 100644
--- a/utils/time-utils/src/main/java/datadog/trace/api/time/TimeSource.java
+++ b/utils/time-utils/src/main/java/datadog/trace/api/time/TimeSource.java
@@ -5,18 +5,18 @@
  * platform.
  */
 public interface TimeSource {
-  /**
-   * Returns monotonically increasing ticks from some arbitrary start point. Should only be used to
-   * measure durations. Negative numbers and zero are both valid return values
-   */
-  long getNanoTicks();
+    /**
+     * Returns monotonically increasing ticks from some arbitrary start point. Should only be used to
+     * measure durations. Negative numbers and zero are both valid return values
+     */
+    long getNanoTicks();
 
-  /** Milliseconds since the start of the epoch */
-  long getCurrentTimeMillis();
+    /** Milliseconds since the start of the epoch */
+    long getCurrentTimeMillis();
 
-  /** Microseconds since the start of the epoch */
-  long getCurrentTimeMicros();
+    /** Microseconds since the start of the epoch */
+    long getCurrentTimeMicros();
 
-  /** Nanoseconds since the start of the epoch. Valid for the time range 1/1/1970 +/- 270 years */
-  long getCurrentTimeNanos();
+    /** Nanoseconds since the start of the epoch. Valid for the time range 1/1/1970 +/- 270 years */
+    long getCurrentTimeNanos();
 }
diff --git a/utils/time-utils/src/main/java/datadog/trace/api/time/TimeUtils.java b/utils/time-utils/src/main/java/datadog/trace/api/time/TimeUtils.java
index 89b5a6176b8..d120fbbb3bd 100644
--- a/utils/time-utils/src/main/java/datadog/trace/api/time/TimeUtils.java
+++ b/utils/time-utils/src/main/java/datadog/trace/api/time/TimeUtils.java
@@ -6,32 +6,32 @@
 
 public abstract class TimeUtils {
 
-  /** Number followed by an optional time unit of hours (h), minutes (m), or seconds (s). */
-  private static final Pattern SIMPLE_DELAY_PATTERN = Pattern.compile("(\\d+)([HhMmSs]?)");
+    /** Number followed by an optional time unit of hours (h), minutes (m), or seconds (s). */
+    private static final Pattern SIMPLE_DELAY_PATTERN = Pattern.compile("(\\d+)([HhMmSs]?)");
 
-  /**
-   * Parses the string as a simple delay, such as "30s" or "10m".
-   *
-   * @param delayString number followed by an optional time unit
-   * @return delay in seconds; -1 if the string cannot be parsed
-   */
-  public static long parseSimpleDelay(String delayString) {
-    if (null != delayString) {
-      Matcher delayMatcher = SIMPLE_DELAY_PATTERN.matcher(delayString);
-      if (delayMatcher.matches()) {
-        long delay = Integer.parseInt(delayMatcher.group(1));
-        String unit = delayMatcher.group(2);
-        if ("H".equalsIgnoreCase(unit)) {
-          return TimeUnit.HOURS.toSeconds(delay);
-        } else if ("M".equalsIgnoreCase(unit)) {
-          return TimeUnit.MINUTES.toSeconds(delay);
-        } else {
-          return delay; // already in seconds
+    /**
+     * Parses the string as a simple delay, such as "30s" or "10m".
+     *
+     * @param delayString number followed by an optional time unit
+     * @return delay in seconds; -1 if the string cannot be parsed
+     */
+    public static long parseSimpleDelay(String delayString) {
+        if (null != delayString) {
+            Matcher delayMatcher = SIMPLE_DELAY_PATTERN.matcher(delayString);
+            if (delayMatcher.matches()) {
+                long delay = Integer.parseInt(delayMatcher.group(1));
+                String unit = delayMatcher.group(2);
+                if ("H".equalsIgnoreCase(unit)) {
+                    return TimeUnit.HOURS.toSeconds(delay);
+                } else if ("M".equalsIgnoreCase(unit)) {
+                    return TimeUnit.MINUTES.toSeconds(delay);
+                } else {
+                    return delay; // already in seconds
+                }
+            }
         }
-      }
+        return -1; // unrecognized
     }
-    return -1; // unrecognized
-  }
 
-  private TimeUtils() {}
+    private TimeUtils() {}
 }
diff --git a/utils/time-utils/src/test/java/datadog/trace/api/time/TimeUtilsTest.java b/utils/time-utils/src/test/java/datadog/trace/api/time/TimeUtilsTest.java
index 819c7e0c00f..9a3869e708d 100644
--- a/utils/time-utils/src/test/java/datadog/trace/api/time/TimeUtilsTest.java
+++ b/utils/time-utils/src/test/java/datadog/trace/api/time/TimeUtilsTest.java
@@ -7,43 +7,43 @@
 
 public class TimeUtilsTest extends DDJavaSpecification {
 
-  @TableTest({
-    "delayString | expected",
-    "            | -1      ",
-    "''          | -1      ",
-    "foo         | -1      ",
-    "-8          | -1      ",
-    "-1          | -1      ",
-    "0           | 0       ",
-    "1           | 1       ",
-    "2           | 2       ",
-    "3           | 3       ",
-    "0s          | 0       ",
-    "1s          | 1       ",
-    "2s          | 2       ",
-    "3s          | 3       ",
-    "0m          | 0       ",
-    "1m          | 60      ",
-    "2m          | 120     ",
-    "3m          | 180     ",
-    "0h          | 0       ",
-    "1h          | 3600    ",
-    "2h          | 7200    ",
-    "3h          | 10800   ",
-    "0S          | 0       ",
-    "1S          | 1       ",
-    "2S          | 2       ",
-    "3S          | 3       ",
-    "0M          | 0       ",
-    "1M          | 60      ",
-    "2M          | 120     ",
-    "3M          | 180     ",
-    "0H          | 0       ",
-    "1H          | 3600    ",
-    "2H          | 7200    ",
-    "3H          | 10800   "
-  })
-  void testSimpleDelayParsing(String delayString, long expected) {
-    assertEquals(expected, TimeUtils.parseSimpleDelay(delayString));
-  }
+    @TableTest({
+      "delayString | expected",
+      "            | -1      ",
+      "''          | -1      ",
+      "foo         | -1      ",
+      "-8          | -1      ",
+      "-1          | -1      ",
+      "0           | 0       ",
+      "1           | 1       ",
+      "2           | 2       ",
+      "3           | 3       ",
+      "0s          | 0       ",
+      "1s          | 1       ",
+      "2s          | 2       ",
+      "3s          | 3       ",
+      "0m          | 0       ",
+      "1m          | 60      ",
+      "2m          | 120     ",
+      "3m          | 180     ",
+      "0h          | 0       ",
+      "1h          | 3600    ",
+      "2h          | 7200    ",
+      "3h          | 10800   ",
+      "0S          | 0       ",
+      "1S          | 1       ",
+      "2S          | 2       ",
+      "3S          | 3       ",
+      "0M          | 0       ",
+      "1M          | 60      ",
+      "2M          | 120     ",
+      "3M          | 180     ",
+      "0H          | 0       ",
+      "1H          | 3600    ",
+      "2H          | 7200    ",
+      "3H          | 10800   "
+    })
+    void testSimpleDelayParsing(String delayString, long expected) {
+        assertEquals(expected, TimeUtils.parseSimpleDelay(delayString));
+    }
 }
diff --git a/utils/version-utils/src/main/java/datadog/common/version/VersionInfo.java b/utils/version-utils/src/main/java/datadog/common/version/VersionInfo.java
index eb6829883b6..8291e45b854 100644
--- a/utils/version-utils/src/main/java/datadog/common/version/VersionInfo.java
+++ b/utils/version-utils/src/main/java/datadog/common/version/VersionInfo.java
@@ -10,32 +10,31 @@
 @SuppressFBWarnings("OS_OPEN_STREAM")
 public class VersionInfo {
 
-  private static final Logger log = LoggerFactory.getLogger(VersionInfo.class);
+    private static final Logger log = LoggerFactory.getLogger(VersionInfo.class);
 
-  public static final String LIBRARY_VERSION_TAG = "library_version";
-  public static final String PROFILER_VERSION_TAG = "profiler_version";
-  public static final String VERSION;
+    public static final String LIBRARY_VERSION_TAG = "library_version";
+    public static final String PROFILER_VERSION_TAG = "profiler_version";
+    public static final String VERSION;
 
-  static {
-    String version = "unknown";
-    try {
-      final InputStream is =
-          VersionInfo.class.getClassLoader().getResourceAsStream("version-utils.version");
-      if (is != null) {
-        final BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-        final StringBuilder sb = new StringBuilder();
-        final char[] buffer = new char[1 << 8];
-        int read;
-        while ((read = reader.read(buffer, 0, buffer.length)) > 0) {
-          sb.append(buffer, 0, read);
+    static {
+        String version = "unknown";
+        try {
+            final InputStream is = VersionInfo.class.getClassLoader().getResourceAsStream("version-utils.version");
+            if (is != null) {
+                final BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+                final StringBuilder sb = new StringBuilder();
+                final char[] buffer = new char[1 << 8];
+                int read;
+                while ((read = reader.read(buffer, 0, buffer.length)) > 0) {
+                    sb.append(buffer, 0, read);
+                }
+                version = sb.toString().trim();
+            } else {
+                log.error("No version file found");
+            }
+        } catch (final Exception e) {
+            log.error("Cannot read version file", e);
         }
-        version = sb.toString().trim();
-      } else {
-        log.error("No version file found");
-      }
-    } catch (final Exception e) {
-      log.error("Cannot read version file", e);
+        VERSION = version;
     }
-    VERSION = version;
-  }
 }